From mclasen at fedoraproject.org  Tue Dec  1 00:19:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 00:19:25 +0000 (UTC)
Subject: File glib-2.23.0.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091201001925.1F86810F802@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for glib2:

75909517629c54e5c5b36d8e233915a9  glib-2.23.0.tar.bz2



From mclasen at fedoraproject.org  Tue Dec  1 00:21:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 00:21:41 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.116, 1.117 glib2.spec, 1.223,
	1.224 sources, 1.118, 1.119
Message-ID: <20091201002141.AD21F11C00D3@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.23.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- .cvsignore	22 Sep 2009 23:37:28 -0000	1.116
+++ .cvsignore	1 Dec 2009 00:21:41 -0000	1.117
@@ -1 +1 @@
-glib-2.22.0.tar.bz2
+glib-2.23.0.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- glib2.spec	25 Sep 2009 15:04:59 -0000	1.223
+++ glib2.spec	1 Dec 2009 00:21:41 -0000	1.224
@@ -2,12 +2,12 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.22.0
-Release: 4%{?dist}
+Version: 2.23.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/glib/2.22/glib-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/glib/2.23/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Nov 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.23.0-1
+- Update to 2.23.0
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.0-4
 - Avoid multilib conflicts even harder
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- sources	22 Sep 2009 23:37:28 -0000	1.118
+++ sources	1 Dec 2009 00:21:41 -0000	1.119
@@ -1 +1 @@
-e0bc5b08d467cc3763550923087772d3  glib-2.22.0.tar.bz2
+75909517629c54e5c5b36d8e233915a9  glib-2.23.0.tar.bz2



From mclasen at fedoraproject.org  Tue Dec  1 00:32:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 00:32:14 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.224,1.225
Message-ID: <20091201003214.A79D211C00D3@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Log Message:
drop upstreamed patch



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- glib2.spec	1 Dec 2009 00:21:41 -0000	1.224
+++ glib2.spec	1 Dec 2009 00:32:14 -0000	1.225
@@ -21,8 +21,6 @@ BuildRequires: glibc-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 
-Patch0: pyloc.patch
-
 %description
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -54,7 +52,6 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1 -b .pyloc
 
 autoreconf -f -i
 



From mclasen at fedoraproject.org  Tue Dec  1 00:38:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 00:38:59 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.225,1.226
Message-ID: <20091201003859.89A3C11C00D3@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Log Message:
cleanup



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- glib2.spec	1 Dec 2009 00:32:14 -0000	1.225
+++ glib2.spec	1 Dec 2009 00:38:59 -0000	1.226
@@ -53,8 +53,6 @@ of version 2 of the GLib library.
 %prep
 %setup -q -n glib-%{version}
 
-autoreconf -f -i
-
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
 make %{?_smp_mflags}



From mclasen at fedoraproject.org  Tue Dec  1 00:48:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 00:48:45 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.226,1.227
Message-ID: <20091201004845.E611211C00D3@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Log Message:
Add zlib-devel BR



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- glib2.spec	1 Dec 2009 00:38:59 -0000	1.226
+++ glib2.spec	1 Dec 2009 00:48:45 -0000	1.227
@@ -18,6 +18,7 @@ BuildRequires: libattr-devel
 BuildRequires: libselinux-devel
 # for sys/inotify.h
 BuildRequires: glibc-devel
+BuildRequires: zlib-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 



From jgarzik at fedoraproject.org  Tue Dec  1 00:53:43 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue,  1 Dec 2009 00:53:43 +0000 (UTC)
Subject: File chunkd-0.6git.tar.gz uploaded to lookaside cache by jgarzik
Message-ID: <20091201005343.7FDAE10F802@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for chunkd:

e59ea0d92bcd9b435de9b5bd3d640439  chunkd-0.6git.tar.gz



From jgarzik at fedoraproject.org  Tue Dec  1 00:54:44 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue,  1 Dec 2009 00:54:44 +0000 (UTC)
Subject: rpms/chunkd/devel .cvsignore, 1.5, 1.6 chunkd.spec, 1.23,
	1.24 sources, 1.16, 1.17
Message-ID: <20091201005444.1FC9A11C00D3@cvs1.fedora.phx.redhat.com>

Author: jgarzik

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

Modified Files:
	.cvsignore chunkd.spec sources 
Log Message:
update to upstream commit cf9b95c883437690793976564936c1ef0b249368


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Nov 2009 23:01:50 -0000	1.5
+++ .cvsignore	1 Dec 2009 00:54:43 -0000	1.6
@@ -1 +1 @@
-chunkd-0.5.tar.gz
+chunkd-0.6git.tar.gz


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- chunkd.spec	13 Nov 2009 23:01:50 -0000	1.23
+++ chunkd.spec	1 Dec 2009 00:54:43 -0000	1.24
@@ -1,13 +1,15 @@
 Name:		chunkd
-Version:	0.5
-Release:	1%{?dist}
+Version:	0.6
+Release:	0.1.gcf9b95c8%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-Source0:	chunkd-%{version}.tar.gz
+# pulled from upstream git, commit cf9b95c883437690793976564936c1ef0b249368
+# to recreate tarball, check out commit, then run "make dist"
+Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
 Source3:	chunkd.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,7 +41,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n chunkd-0.6git
 
 %build
 %configure --disable-static
@@ -97,6 +99,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Mon Nov 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.6-0.1.gcf9b95c8
+- update source to commit cf9b95c883437690793976564936c1ef0b249368
+
 * Fri Nov 13 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-1
 - update source to release version 0.5
 - BuildRequires tokyocabinet


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 Nov 2009 23:01:50 -0000	1.16
+++ sources	1 Dec 2009 00:54:43 -0000	1.17
@@ -1 +1 @@
-2dd24c339d9459e69b50373f9bff035f  chunkd-0.5.tar.gz
+e59ea0d92bcd9b435de9b5bd3d640439  chunkd-0.6git.tar.gz



From mclasen at fedoraproject.org  Tue Dec  1 00:58:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 00:58:30 +0000 (UTC)
Subject: File gtk+-2.19.1.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091201005830.4D1E010F802@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gtk2:

d11e2044aedc49e155832c54dc9ac548  gtk+-2.19.1.tar.bz2



From dchen at fedoraproject.org  Tue Dec  1 01:00:30 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  1 Dec 2009 01:00:30 +0000 (UTC)
Subject: File fbterm-1.6.tar.gz uploaded to lookaside cache by dchen
Message-ID: <20091201010030.7CA3F10F802@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fbterm:

531ea0984836b58fd123e6a97a4228c6  fbterm-1.6.tar.gz



From airlied at fedoraproject.org  Tue Dec  1 01:05:00 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  1 Dec 2009 01:05:00 +0000 (UTC)
Subject: File libdrm-20091201.tar.bz2 uploaded to lookaside cache by airlied
Message-ID: <20091201010500.A1BFD10F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libdrm:

c4dbb62bfdfb4c5a1121f55b6049c2fa  libdrm-20091201.tar.bz2



From airlied at fedoraproject.org  Tue Dec  1 01:10:24 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  1 Dec 2009 01:10:24 +0000 (UTC)
Subject: rpms/libdrm/devel .cvsignore, 1.27, 1.28 libdrm-2.4.0-no-bc.patch,
	1.3, 
	1.4 libdrm-make-dri-perms-okay.patch, 1.1, 1.2 libdrm.spec, 1.88,
	1.89 sources, 1.27, 1.28
Message-ID: <20091201011024.2BD2611C00D3@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore libdrm-2.4.0-no-bc.patch 
	libdrm-make-dri-perms-okay.patch libdrm.spec sources 
Log Message:
* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.4.16-0.1
- rebase to pre-snapshot of 2.4.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	25 Sep 2009 01:58:04 -0000	1.27
+++ .cvsignore	1 Dec 2009 01:10:23 -0000	1.28
@@ -1 +1 @@
-libdrm-2.4.14.tar.bz2
+libdrm-20091201.tar.bz2

libdrm-2.4.0-no-bc.patch:
 xf86drm.c |   37 -------------------------------------
 1 file changed, 37 deletions(-)

Index: libdrm-2.4.0-no-bc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-2.4.0-no-bc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libdrm-2.4.0-no-bc.patch	14 Aug 2008 05:51:06 -0000	1.3
+++ libdrm-2.4.0-no-bc.patch	1 Dec 2009 01:10:23 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up libdrm-20080814/libdrm/xf86drm.c.no-bc libdrm-20080814/libdrm/xf86drm.c
---- libdrm-20080814/libdrm/xf86drm.c.no-bc	2008-08-14 15:43:09.000000000 +1000
-+++ libdrm-20080814/libdrm/xf86drm.c	2008-08-14 15:45:09.000000000 +1000
+diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c
+--- libdrm-20080814/xf86drm.c.no-bc	2008-08-14 15:43:09.000000000 +1000
++++ libdrm-20080814/xf86drm.c	2008-08-14 15:45:09.000000000 +1000
 @@ -396,11 +396,6 @@ int drmAvailable(void)
      int           fd;
  

libdrm-make-dri-perms-okay.patch:
 xf86drm.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libdrm-make-dri-perms-okay.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-make-dri-perms-okay.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libdrm-make-dri-perms-okay.patch	19 Mar 2008 05:32:35 -0000	1.1
+++ libdrm-make-dri-perms-okay.patch	1 Dec 2009 01:10:23 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up libdrm-20080303/libdrm/xf86drm.h.da libdrm-20080303/libdrm/xf86drm.h
---- libdrm-20080303/libdrm/xf86drm.h.da	2008-03-19 15:26:31.000000000 +1000
-+++ libdrm-20080303/libdrm/xf86drm.h	2008-03-19 15:26:46.000000000 +1000
+diff -up libdrm-20080303/xf86drm.h.da libdrm-20080303/xf86drm.h
+--- libdrm-20080303/xf86drm.h.da	2008-03-19 15:26:31.000000000 +1000
++++ libdrm-20080303/xf86drm.h	2008-03-19 15:26:46.000000000 +1000
 @@ -45,7 +45,7 @@
  /* Default /dev/dri directory permissions 0755 */
  #define DRM_DEV_DIRMODE	 	\


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- libdrm.spec	25 Sep 2009 02:03:11 -0000	1.88
+++ libdrm.spec	1 Dec 2009 01:10:23 -0000	1.89
@@ -1,14 +1,14 @@
-%define gitdate 20090820
+%define gitdate 20091201
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.14
-Release: 1%{?dist}
+Version: 2.4.16
+Release: 0.1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
-Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
-#Source0: %{name}-%{gitdate}.tar.bz2
+#Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.bz2
 Source1: make-git-snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +27,6 @@ Patch3: libdrm-make-dri-perms-okay.patch
 # remove backwards compat not needed on Fedora
 Patch4: libdrm-2.4.0-no-bc.patch
 
-Patch5: libdrm-page-flip.patch
-
 
 %description
 Direct Rendering Manager runtime library
@@ -44,11 +42,10 @@ Requires: pkgconfig
 Direct Rendering Manager development package
 
 %prep
-#%setup -q -n %{name}-%{gitdate}
-%setup -q 
+%setup -q -n %{name}-%{gitdate}
+#%setup -q 
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
-%patch5 -p1 -b .page-flip
 
 %build
 autoreconf -v --install || exit 1
@@ -108,6 +105,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.4.16-0.1
+- rebase to pre-snapshot of 2.4.16
+
+* Sat Nov 28 2009 Dave Airlie <airlied at redhat.com> 2.4.15-6
+- add new upstream API for drivers.
+
+* Fri Nov 20 2009 Dave Airlie <airlied at redhat.com> 2.4.15-5
+- update radeon API to upstream fixes
+
+* Thu Nov 05 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.15-4
+- nouveau: improve reloc API to allow better error handling
+
+* Wed Nov 04 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.15-3
+- nouveau: drop rendering on floor rather than asserting if flush fails
+
+* Tue Oct 27 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.15-2
+- nouveau: retry pushbuf ioctl if interrupted by signal
+
+* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 2.4.15-1
+- rebase to latest upstream release
+
 * Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.4.14-1
 - rebase to latest upstream release - drop carried patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	25 Sep 2009 01:58:05 -0000	1.27
+++ sources	1 Dec 2009 01:10:23 -0000	1.28
@@ -1 +1 @@
-e785b6a6ebd6b8a49dd8210cd8742842  libdrm-2.4.14.tar.bz2
+c4dbb62bfdfb4c5a1121f55b6049c2fa  libdrm-20091201.tar.bz2



From dchen at fedoraproject.org  Tue Dec  1 01:13:38 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  1 Dec 2009 01:13:38 +0000 (UTC)
Subject: rpms/fbterm/devel fbterm-1.6-el5.patch, NONE,
	1.1 fbterm-1.6-rpmpack.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 fbterm.spec, 1.11, 1.12 import.log, 1.8, 1.9 sources, 1.6,
	1.7 fbterm-1.5-rpmpack.patch, 1.1, NONE
Message-ID: <20091201011338.AB9EE11C00D3@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.6-el5.patch fbterm-1.6-rpmpack.patch 
Removed Files:
	fbterm-1.5-rpmpack.patch 
Log Message:
Upstream update

fbterm-1.6-el5.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fbterm-1.6-el5.patch ---
diff -up ./configure.ac.el5 ./configure.ac
--- ./configure.ac.el5	2009-11-14 11:00:00.000000000 +1000
+++ ./configure.ac	2009-11-30 17:57:01.000000000 +1000
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.59])
 AC_INIT([FbTerm], [1.6])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/fbterm.cpp])

fbterm-1.6-rpmpack.patch:
 Makefile.am |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

--- NEW FILE fbterm-1.6-rpmpack.patch ---
diff -up ./src/Makefile.am.orig ./src/Makefile.am
--- ./src/Makefile.am.orig	2009-11-30 17:35:25.000000000 +1000
+++ ./src/Makefile.am	2009-11-30 17:41:56.000000000 +1000
@@ -10,24 +10,10 @@ EXTRA_fbterm_SOURCES = signalfd.h
 fbterm_CXXFLAGS = -fno-exceptions -fno-rtti -Ilib @FT2_INC@ @FC_INC@
 fbterm_LDADD = lib/libshell.a @FT2_LIB@ @FC_LIB@ @X86_LIB@ -lutil
 
-if VESA
-install-exec-hook:
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-else
 install-exec-hook:
 	KERV=`uname -r | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/'`; \
 	[[ $$KERV -lt 20615 ]] && exit 0; \
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		[[ $$KERV -ge 20627 ]] && \
+	[[ $$KERV -ge 20627 ]] && \
 		setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null || \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-endif
+		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	15 May 2009 05:02:32 -0000	1.6
+++ .cvsignore	1 Dec 2009 01:13:38 -0000	1.7
@@ -1 +1 @@
-fbterm-1.5.tar.gz
+fbterm-1.6.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/fbterm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fbterm.spec	24 Jul 2009 22:32:47 -0000	1.11
+++ fbterm.spec	1 Dec 2009 01:13:38 -0000	1.12
@@ -1,6 +1,6 @@
 Name:       fbterm
-Version:    1.5
-Release:    2%{?dist}
+Version:    1.6
+Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
@@ -8,7 +8,8 @@ Source0:    http://fbterm.googlecode.com
 #Patch0:    %{name}-1.2-kernel-header.patch
 #Patch1:    %{name}-1.3-setcap.patch
 #Patch2:    %{name}-1.4-iminput.patch
-Patch3:    %{name}-1.5-rpmpack.patch
+Patch3:    %{name}-1.6-rpmpack.patch
+Patch4:    %{name}-1.6-el5.patch
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): ??????????????
 Summary(zh_TW): ???Framebuffer????????
@@ -43,6 +44,10 @@ Features include: 
 #%patch1 -p0 -b .setcap
 #%patch2 -p0 -b .iminput
 %patch3 -p0 -b .rpmpack
+%if 0%{?fedora} >= 9
+%else
+%patch4 -p0 -b .el5
+%endif
 
 %build
 autoreconf -iv
@@ -76,6 +81,18 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
 
 
 %changelog
+* Mon Nov 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.6-1
+- Fixed [Bug 539186] FTBFS fbterm-1.5-2.fc12
+- Upstream fixed [Bug 542284] terminfo file for fbterm not included with fbterm package in fedora.
+- Patch for EL-5
+- Upstream update:
+  1. added VESA video card support 
+  2. added rendering messages for IM server development 
+  3. fixed a bug where Ctrl+Space is a shortcut even user run FbTerm without "input-method" option 
+  4. fixed a bug where user compile FbTerm without gpm mouse support but run it in a gpm server enabled environment 
+  5. fixed a IM program dead loop bug triggered by FbTerm's crash 
+  6. fixed several spelling errors in FbTerm's help message and man-page
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -90,6 +107,8 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
   7. fixed a bug where screen is cleared on startup even in inactive tty 
   8. fixed a bug where variable HOME is not defined
 - rpmpack.patch is to allow rpm buildable for non-root account.
+- Add BuildRequires automake, autoconf to "refresh" src/Makefile,
+  otherwise, the above patch is not effective for a weird reason.
 
 * Mon Mar 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.4-1
 - Upstream update:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	15 May 2009 05:02:32 -0000	1.8
+++ import.log	1 Dec 2009 01:13:38 -0000	1.9
@@ -6,3 +6,4 @@ fbterm-1_3-0_fc10:HEAD:fbterm-1.3-0.fc10
 fbterm-1_3-1_fc10:HEAD:fbterm-1.3-1.fc10.src.rpm:1231208300
 fbterm-1_4-1_fc10:HEAD:fbterm-1.4-1.fc10.src.rpm:1237784276
 fbterm-1_5-1_fc11:HEAD:fbterm-1.5-1.fc11.src.rpm:1242363702
+fbterm-1_6-1_fc12:HEAD:fbterm-1.6-1.fc12.src.rpm:1259629240


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 May 2009 05:02:32 -0000	1.6
+++ sources	1 Dec 2009 01:13:38 -0000	1.7
@@ -1 +1 @@
-8f4eb318718aac9f16bf3bd4e401c936  fbterm-1.5.tar.gz
+531ea0984836b58fd123e6a97a4228c6  fbterm-1.6.tar.gz


--- fbterm-1.5-rpmpack.patch DELETED ---



From mclasen at fedoraproject.org  Tue Dec  1 01:13:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 01:13:45 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.117, 1.118 fresh-tooltips.patch, 1.1, 
	1.2 gtk2.spec, 1.410, 1.411 sources, 1.127, 1.128
Message-ID: <20091201011345.C887F11C00D3@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore fresh-tooltips.patch gtk2.spec sources 
Log Message:
2.19.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- .cvsignore	23 Sep 2009 05:33:38 -0000	1.117
+++ .cvsignore	1 Dec 2009 01:13:45 -0000	1.118
@@ -1 +1 @@
-gtk+-2.18.0.tar.bz2
+gtk+-2.19.1.tar.bz2

fresh-tooltips.patch:
 gtktooltip.c |  264 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 gtkwidget.c  |    8 +
 2 files changed, 260 insertions(+), 12 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/fresh-tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fresh-tooltips.patch	2 Nov 2009 04:22:13 -0000	1.1
+++ fresh-tooltips.patch	1 Dec 2009 01:13:45 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gtk+-2.18.3/gtk/gtktooltip.c.fresh-tooltips gtk+-2.18.3/gtk/gtktooltip.c
---- gtk+-2.18.3/gtk/gtktooltip.c.fresh-tooltips	2009-10-16 10:35:45.000000000 -0400
-+++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-31 14:53:37.120183113 -0400
+diff -up gtk+-2.19.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.19.1/gtk/gtktooltip.c
+--- gtk+-2.19.1/gtk/gtktooltip.c.fresh-tooltips	2009-11-26 23:54:55.000000000 -0500
++++ gtk+-2.19.1/gtk/gtktooltip.c	2009-11-30 20:06:37.539580221 -0500
 @@ -29,6 +29,10 @@
  #include "gtkhbox.h"
  #include "gtkalignment.h"
@@ -100,33 +100,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    tooltip->custom_widget = NULL;
  }
  
-@@ -318,9 +369,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
-  * Since: 2.14
-  */
- void
--gtk_tooltip_set_icon_from_icon_name(GtkTooltip  *tooltip,
--				    const gchar *icon_name,
--				    GtkIconSize  size)
-+gtk_tooltip_set_icon_from_icon_name (GtkTooltip  *tooltip,
-+				     const gchar *icon_name,
-+				     GtkIconSize  size)
- {
-   g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
- 
-@@ -471,27 +522,217 @@ static void
- gtk_tooltip_window_style_set (GtkTooltip *tooltip)
- {
-   gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
--			     tooltip->window->style->ythickness,
--			     tooltip->window->style->ythickness,
--			     tooltip->window->style->xthickness,
-+	                     tooltip->window->style->ythickness,
-+	                     tooltip->window->style->ythickness,
-+		             tooltip->window->style->xthickness,
- 			     tooltip->window->style->xthickness);
--
-+  gtk_box_set_spacing (GTK_BOX (tooltip->box),
-+                       tooltip->window->style->xthickness);
+@@ -508,19 +559,208 @@ gtk_tooltip_window_style_set (GtkTooltip
    gtk_widget_queue_draw (tooltip->window);
  }
  
@@ -259,7 +233,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +          wm = gdk_x11_screen_get_window_manager_name (screen);
 +          if (g_strcmp0 (wm, "Metacity") == 0)
 +            gtk_window_set_type_hint (GTK_WINDOW (tooltip->window),
-+			              GDK_WINDOW_TYPE_HINT_DND);
++                                     GDK_WINDOW_TYPE_HINT_DND);
 +        }
 +#endif
 +      return;
@@ -345,7 +319,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
    return FALSE;
  }
-@@ -631,7 +872,7 @@ find_widget_under_pointer (GdkWindow *wi
+@@ -660,7 +900,7 @@ find_widget_under_pointer (GdkWindow *wi
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
@@ -354,10 +328,10 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  	   *x, *y);
  #endif
  
-diff -up gtk+-2.18.3/gtk/gtkwidget.c.fresh-tooltips gtk+-2.18.3/gtk/gtkwidget.c
---- gtk+-2.18.3/gtk/gtkwidget.c.fresh-tooltips	2009-10-09 01:00:44.000000000 -0400
-+++ gtk+-2.18.3/gtk/gtkwidget.c	2009-10-31 14:27:50.333957199 -0400
-@@ -2386,6 +2386,14 @@ gtk_widget_class_init (GtkWidgetClass *k
+diff -up gtk+-2.19.1/gtk/gtkwidget.c.fresh-tooltips gtk+-2.19.1/gtk/gtkwidget.c
+--- gtk+-2.19.1/gtk/gtkwidget.c.fresh-tooltips	2009-11-27 20:59:42.000000000 -0500
++++ gtk+-2.19.1/gtk/gtkwidget.c	2009-11-30 20:00:23.425825787 -0500
+@@ -2557,6 +2557,14 @@ gtk_widget_class_init (GtkWidgetClass *k
                                                               P_("The length of vertical scroll arrows"),
                                                               1, G_MAXINT, 16,
                                                               GTK_PARAM_READABLE));


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- gtk2.spec	25 Nov 2009 06:16:45 -0000	1.410
+++ gtk2.spec	1 Dec 2009 01:13:45 -0000	1.411
@@ -11,13 +11,13 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.18.3
+%define base_version 2.19.1
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 22%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -30,32 +30,16 @@ Patch0: gtk+-2.13.5-lib64.patch
 Patch1: system-python.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
 Patch2: icon-padding.patch
-# from upstream
-Patch3: image-size-alloc.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599617
 Patch4: fresh-tooltips.patch
-# from upstream
-Patch5: allow-set-hint.patch
-# from upstream
-Patch6: compose-sequences.patch
-# from upstream
-Patch7: symbolic-color-parsing.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599618
 Patch8: tooltip-positioning.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=581150
-Patch9: iconview-hang.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=599446
-Patch10: toolbutton-assert.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=529364
 Patch11: gtk2-remove-connecting-reason.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=592582
-Patch12: gtk2-preview.patch
-Patch13: gtk2-rotate-layout.patch
 Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=600992
 Patch15: filesystemref.patch
-# fixed upstream
-Patch16: 0001-Make-level3-keys-work-again.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -169,20 +153,11 @@ This package contains developer document
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .system-python
 %patch2 -p1 -b .icon-padding
-%patch3 -p1 -b .image-size-alloc
 %patch4 -p1 -b .fresh-tooltips
-%patch5 -p1 -b .allow-set-hint
-%patch6 -p1 -b .compose-sequences
-%patch7 -p1 -b .symbolic-color-parsing
 %patch8 -p1 -b .tooltip-positioning
-%patch9 -p1 -b .iconview-hang
-%patch10 -p1 -b .toolbutton-assert
 %patch11 -p1 -b .remove-connecting-reason
-%patch12 -p1 -b .preview
-%patch13 -p1 -b .rotate-layout
 %patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .filesystemref
-%patch16 -p1 -b .level3
 
 %build
 libtoolize --force --copy


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- sources	11 Nov 2009 02:51:27 -0000	1.127
+++ sources	1 Dec 2009 01:13:45 -0000	1.128
@@ -1 +1 @@
-369e173600efc272131b53b1902679e8  gtk+-2.18.3.tar.bz2
+d11e2044aedc49e155832c54dc9ac548  gtk+-2.19.1.tar.bz2



From jgarzik at fedoraproject.org  Tue Dec  1 01:16:17 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue,  1 Dec 2009 01:16:17 +0000 (UTC)
Subject: File tabled-0.5git.tar.gz uploaded to lookaside cache by jgarzik
Message-ID: <20091201011617.3F67610F802@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tabled:

54aa9526bc572e0a858ba62f16a9ae63  tabled-0.5git.tar.gz



From jgarzik at fedoraproject.org  Tue Dec  1 01:16:37 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue,  1 Dec 2009 01:16:37 +0000 (UTC)
Subject: rpms/tabled/devel .cvsignore, 1.5, 1.6 sources, 1.14,
	1.15 tabled.spec, 1.23, 1.24
Message-ID: <20091201011637.E4CD411C00D3@cvs1.fedora.phx.redhat.com>

Author: jgarzik

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

Modified Files:
	.cvsignore sources tabled.spec 
Log Message:
update to upstream commit 26571e40570dfb0d0fc69507cbe8386e65252ff8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Nov 2009 23:20:15 -0000	1.5
+++ .cvsignore	1 Dec 2009 01:16:37 -0000	1.6
@@ -1 +1 @@
-tabled-0.4.tar.gz
+tabled-0.5git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	13 Nov 2009 23:20:15 -0000	1.14
+++ sources	1 Dec 2009 01:16:37 -0000	1.15
@@ -1 +1 @@
-75a90465db6427ce66d972ea4a588072  tabled-0.4.tar.gz
+54aa9526bc572e0a858ba62f16a9ae63  tabled-0.5git.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- tabled.spec	13 Nov 2009 23:20:15 -0000	1.23
+++ tabled.spec	1 Dec 2009 01:16:37 -0000	1.24
@@ -1,13 +1,15 @@
 Name:		tabled
-Version:	0.4
-Release:	1%{?dist}
+Version:	0.5
+Release:	0.1.g26571e40%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-Source0:	tabled-%{version}.tar.gz
+# pulled from upstream git, commit 26571e40570dfb0d0fc69507cbe8386e65252ff8
+# to recreate tarball, check out commit, then run "make dist"
+Source0:	tabled-%{version}git.tar.gz
 Source2:	tabled.init
 Source3:	tabled.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +44,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n tabled-0.5git
 
 %build
 %configure --disable-static
@@ -100,6 +102,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Mon Nov 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.1.g26571e40
+- add sources for git commit 26571e40570dfb0d0fc69507cbe8386e65252ff8
+
 * Fri Nov 13 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-1
 - upstream release v0.4
 



From dchen at fedoraproject.org  Tue Dec  1 01:17:58 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  1 Dec 2009 01:17:58 +0000 (UTC)
Subject: rpms/fbterm/F-12 fbterm-1.6-el5.patch, NONE,
	1.1 fbterm-1.6-rpmpack.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 fbterm.spec, 1.11, 1.12 import.log, 1.8, 1.9 sources, 1.6,
	1.7 fbterm-1.5-rpmpack.patch, 1.1, NONE
Message-ID: <20091201011758.BD25811C00D3@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/fbterm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26776/F-12

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.6-el5.patch fbterm-1.6-rpmpack.patch 
Removed Files:
	fbterm-1.5-rpmpack.patch 
Log Message:
Upstream update

fbterm-1.6-el5.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fbterm-1.6-el5.patch ---
diff -up ./configure.ac.el5 ./configure.ac
--- ./configure.ac.el5	2009-11-14 11:00:00.000000000 +1000
+++ ./configure.ac	2009-11-30 17:57:01.000000000 +1000
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.59])
 AC_INIT([FbTerm], [1.6])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/fbterm.cpp])

fbterm-1.6-rpmpack.patch:
 Makefile.am |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

--- NEW FILE fbterm-1.6-rpmpack.patch ---
diff -up ./src/Makefile.am.orig ./src/Makefile.am
--- ./src/Makefile.am.orig	2009-11-30 17:35:25.000000000 +1000
+++ ./src/Makefile.am	2009-11-30 17:41:56.000000000 +1000
@@ -10,24 +10,10 @@ EXTRA_fbterm_SOURCES = signalfd.h
 fbterm_CXXFLAGS = -fno-exceptions -fno-rtti -Ilib @FT2_INC@ @FC_INC@
 fbterm_LDADD = lib/libshell.a @FT2_LIB@ @FC_LIB@ @X86_LIB@ -lutil
 
-if VESA
-install-exec-hook:
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-else
 install-exec-hook:
 	KERV=`uname -r | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/'`; \
 	[[ $$KERV -lt 20615 ]] && exit 0; \
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		[[ $$KERV -ge 20627 ]] && \
+	[[ $$KERV -ge 20627 ]] && \
 		setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null || \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-endif
+		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	15 May 2009 05:02:32 -0000	1.6
+++ .cvsignore	1 Dec 2009 01:17:58 -0000	1.7
@@ -1 +1 @@
-fbterm-1.5.tar.gz
+fbterm-1.6.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-12/fbterm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fbterm.spec	24 Jul 2009 22:32:47 -0000	1.11
+++ fbterm.spec	1 Dec 2009 01:17:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:       fbterm
-Version:    1.5
-Release:    2%{?dist}
+Version:    1.6
+Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
@@ -8,7 +8,8 @@ Source0:    http://fbterm.googlecode.com
 #Patch0:    %{name}-1.2-kernel-header.patch
 #Patch1:    %{name}-1.3-setcap.patch
 #Patch2:    %{name}-1.4-iminput.patch
-Patch3:    %{name}-1.5-rpmpack.patch
+Patch3:    %{name}-1.6-rpmpack.patch
+Patch4:    %{name}-1.6-el5.patch
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): ??????????????
 Summary(zh_TW): ???Framebuffer????????
@@ -43,6 +44,10 @@ Features include: 
 #%patch1 -p0 -b .setcap
 #%patch2 -p0 -b .iminput
 %patch3 -p0 -b .rpmpack
+%if 0%{?fedora} >= 9
+%else
+%patch4 -p0 -b .el5
+%endif
 
 %build
 autoreconf -iv
@@ -76,6 +81,18 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
 
 
 %changelog
+* Mon Nov 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.6-1
+- Fixed [Bug 539186] FTBFS fbterm-1.5-2.fc12
+- Upstream fixed [Bug 542284] terminfo file for fbterm not included with fbterm package in fedora.
+- Patch for EL-5
+- Upstream update:
+  1. added VESA video card support 
+  2. added rendering messages for IM server development 
+  3. fixed a bug where Ctrl+Space is a shortcut even user run FbTerm without "input-method" option 
+  4. fixed a bug where user compile FbTerm without gpm mouse support but run it in a gpm server enabled environment 
+  5. fixed a IM program dead loop bug triggered by FbTerm's crash 
+  6. fixed several spelling errors in FbTerm's help message and man-page
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -90,6 +107,8 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
   7. fixed a bug where screen is cleared on startup even in inactive tty 
   8. fixed a bug where variable HOME is not defined
 - rpmpack.patch is to allow rpm buildable for non-root account.
+- Add BuildRequires automake, autoconf to "refresh" src/Makefile,
+  otherwise, the above patch is not effective for a weird reason.
 
 * Mon Mar 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.4-1
 - Upstream update:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-12/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	15 May 2009 05:02:32 -0000	1.8
+++ import.log	1 Dec 2009 01:17:58 -0000	1.9
@@ -6,3 +6,4 @@ fbterm-1_3-0_fc10:HEAD:fbterm-1.3-0.fc10
 fbterm-1_3-1_fc10:HEAD:fbterm-1.3-1.fc10.src.rpm:1231208300
 fbterm-1_4-1_fc10:HEAD:fbterm-1.4-1.fc10.src.rpm:1237784276
 fbterm-1_5-1_fc11:HEAD:fbterm-1.5-1.fc11.src.rpm:1242363702
+fbterm-1_6-1_fc12:F-12:fbterm-1.6-1.fc12.src.rpm:1259630149


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 May 2009 05:02:32 -0000	1.6
+++ sources	1 Dec 2009 01:17:58 -0000	1.7
@@ -1 +1 @@
-8f4eb318718aac9f16bf3bd4e401c936  fbterm-1.5.tar.gz
+531ea0984836b58fd123e6a97a4228c6  fbterm-1.6.tar.gz


--- fbterm-1.5-rpmpack.patch DELETED ---



From dchen at fedoraproject.org  Tue Dec  1 01:36:40 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  1 Dec 2009 01:36:40 +0000 (UTC)
Subject: rpms/fbterm/F-11 fbterm-1.6-el5.patch, NONE,
	1.1 fbterm-1.6-rpmpack.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 fbterm.spec, 1.10, 1.11 import.log, 1.8, 1.9 sources, 1.6,
	1.7 fbterm-1.5-rpmpack.patch, 1.1, NONE
Message-ID: <20091201013640.9FDA211C00D3@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.6-el5.patch fbterm-1.6-rpmpack.patch 
Removed Files:
	fbterm-1.5-rpmpack.patch 
Log Message:
Upstream update

fbterm-1.6-el5.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fbterm-1.6-el5.patch ---
diff -up ./configure.ac.el5 ./configure.ac
--- ./configure.ac.el5	2009-11-14 11:00:00.000000000 +1000
+++ ./configure.ac	2009-11-30 17:57:01.000000000 +1000
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.59])
 AC_INIT([FbTerm], [1.6])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/fbterm.cpp])

fbterm-1.6-rpmpack.patch:
 Makefile.am |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

--- NEW FILE fbterm-1.6-rpmpack.patch ---
diff -up ./src/Makefile.am.orig ./src/Makefile.am
--- ./src/Makefile.am.orig	2009-11-30 17:35:25.000000000 +1000
+++ ./src/Makefile.am	2009-11-30 17:41:56.000000000 +1000
@@ -10,24 +10,10 @@ EXTRA_fbterm_SOURCES = signalfd.h
 fbterm_CXXFLAGS = -fno-exceptions -fno-rtti -Ilib @FT2_INC@ @FC_INC@
 fbterm_LDADD = lib/libshell.a @FT2_LIB@ @FC_LIB@ @X86_LIB@ -lutil
 
-if VESA
-install-exec-hook:
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-else
 install-exec-hook:
 	KERV=`uname -r | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/'`; \
 	[[ $$KERV -lt 20615 ]] && exit 0; \
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		[[ $$KERV -ge 20627 ]] && \
+	[[ $$KERV -ge 20627 ]] && \
 		setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null || \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-endif
+		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	15 May 2009 05:04:57 -0000	1.6
+++ .cvsignore	1 Dec 2009 01:36:39 -0000	1.7
@@ -1 +1 @@
-fbterm-1.5.tar.gz
+fbterm-1.6.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-11/fbterm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fbterm.spec	15 May 2009 05:04:58 -0000	1.10
+++ fbterm.spec	1 Dec 2009 01:36:39 -0000	1.11
@@ -1,5 +1,5 @@
 Name:       fbterm
-Version:    1.5
+Version:    1.6
 Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
@@ -8,7 +8,8 @@ Source0:    http://fbterm.googlecode.com
 #Patch0:    %{name}-1.2-kernel-header.patch
 #Patch1:    %{name}-1.3-setcap.patch
 #Patch2:    %{name}-1.4-iminput.patch
-Patch3:    %{name}-1.5-rpmpack.patch
+Patch3:    %{name}-1.6-rpmpack.patch
+Patch4:    %{name}-1.6-el5.patch
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): ??????????????
 Summary(zh_TW): ???Framebuffer????????
@@ -43,6 +44,10 @@ Features include: 
 #%patch1 -p0 -b .setcap
 #%patch2 -p0 -b .iminput
 %patch3 -p0 -b .rpmpack
+%if 0%{?fedora} >= 9
+%else
+%patch4 -p0 -b .el5
+%endif
 
 %build
 autoreconf -iv
@@ -76,6 +81,21 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
 
 
 %changelog
+* Mon Nov 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.6-1
+- Fixed [Bug 539186] FTBFS fbterm-1.5-2.fc12
+- Upstream fixed [Bug 542284] terminfo file for fbterm not included with fbterm package in fedora.
+- Patch for EL-5
+- Upstream update:
+  1. added VESA video card support 
+  2. added rendering messages for IM server development 
+  3. fixed a bug where Ctrl+Space is a shortcut even user run FbTerm without "input-method" option 
+  4. fixed a bug where user compile FbTerm without gpm mouse support but run it in a gpm server enabled environment 
+  5. fixed a IM program dead loop bug triggered by FbTerm's crash 
+  6. fixed several spelling errors in FbTerm's help message and man-page
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 15 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.5-1
 - Upstream update:  
   1. added support for text rendering with backround image 
@@ -87,6 +107,8 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
   7. fixed a bug where screen is cleared on startup even in inactive tty 
   8. fixed a bug where variable HOME is not defined
 - rpmpack.patch is to allow rpm buildable for non-root account.
+- Add BuildRequires automake, autoconf to "refresh" src/Makefile,
+  otherwise, the above patch is not effective for a weird reason.
 
 * Mon Mar 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.4-1
 - Upstream update:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-11/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	15 May 2009 05:04:58 -0000	1.8
+++ import.log	1 Dec 2009 01:36:39 -0000	1.9
@@ -6,3 +6,4 @@ fbterm-1_3-0_fc10:HEAD:fbterm-1.3-0.fc10
 fbterm-1_3-1_fc10:HEAD:fbterm-1.3-1.fc10.src.rpm:1231208300
 fbterm-1_4-1_fc10:HEAD:fbterm-1.4-1.fc10.src.rpm:1237784276
 fbterm-1_5-1_fc11:F-11:fbterm-1.5-1.fc11.src.rpm:1242363834
+fbterm-1_6-1_fc12:F-11:fbterm-1.6-1.fc12.src.rpm:1259630892


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 May 2009 05:04:58 -0000	1.6
+++ sources	1 Dec 2009 01:36:39 -0000	1.7
@@ -1 +1 @@
-8f4eb318718aac9f16bf3bd4e401c936  fbterm-1.5.tar.gz
+531ea0984836b58fd123e6a97a4228c6  fbterm-1.6.tar.gz


--- fbterm-1.5-rpmpack.patch DELETED ---



From dchen at fedoraproject.org  Tue Dec  1 02:01:41 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  1 Dec 2009 02:01:41 +0000 (UTC)
Subject: rpms/fbterm/F-10 fbterm-1.6-el5.patch, NONE,
	1.1 fbterm-1.6-rpmpack.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 fbterm.spec, 1.7, 1.8 import.log, 1.7, 1.8 sources, 1.6,
	1.7 fbterm-1.5-rpmpack.patch, 1.1, NONE
Message-ID: <20091201020141.28E5F11C00D3@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.6-el5.patch fbterm-1.6-rpmpack.patch 
Removed Files:
	fbterm-1.5-rpmpack.patch 
Log Message:
Upstream update

fbterm-1.6-el5.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fbterm-1.6-el5.patch ---
diff -up ./configure.ac.el5 ./configure.ac
--- ./configure.ac.el5	2009-11-14 11:00:00.000000000 +1000
+++ ./configure.ac	2009-11-30 17:57:01.000000000 +1000
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.59])
 AC_INIT([FbTerm], [1.6])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/fbterm.cpp])

fbterm-1.6-rpmpack.patch:
 Makefile.am |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

--- NEW FILE fbterm-1.6-rpmpack.patch ---
diff -up ./src/Makefile.am.orig ./src/Makefile.am
--- ./src/Makefile.am.orig	2009-11-30 17:35:25.000000000 +1000
+++ ./src/Makefile.am	2009-11-30 17:41:56.000000000 +1000
@@ -10,24 +10,10 @@ EXTRA_fbterm_SOURCES = signalfd.h
 fbterm_CXXFLAGS = -fno-exceptions -fno-rtti -Ilib @FT2_INC@ @FC_INC@
 fbterm_LDADD = lib/libshell.a @FT2_LIB@ @FC_LIB@ @X86_LIB@ -lutil
 
-if VESA
-install-exec-hook:
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-else
 install-exec-hook:
 	KERV=`uname -r | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/'`; \
 	[[ $$KERV -lt 20615 ]] && exit 0; \
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		[[ $$KERV -ge 20627 ]] && \
+	[[ $$KERV -ge 20627 ]] && \
 		setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null || \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-endif
+		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	15 May 2009 05:06:23 -0000	1.6
+++ .cvsignore	1 Dec 2009 02:01:40 -0000	1.7
@@ -1 +1 @@
-fbterm-1.5.tar.gz
+fbterm-1.6.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/fbterm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fbterm.spec	15 May 2009 05:06:24 -0000	1.7
+++ fbterm.spec	1 Dec 2009 02:01:40 -0000	1.8
@@ -1,5 +1,5 @@
 Name:       fbterm
-Version:    1.5
+Version:    1.6
 Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
@@ -8,7 +8,8 @@ Source0:    http://fbterm.googlecode.com
 #Patch0:    %{name}-1.2-kernel-header.patch
 #Patch1:    %{name}-1.3-setcap.patch
 #Patch2:    %{name}-1.4-iminput.patch
-Patch3:    %{name}-1.5-rpmpack.patch
+Patch3:    %{name}-1.6-rpmpack.patch
+Patch4:    %{name}-1.6-el5.patch
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): ??????????????
 Summary(zh_TW): ???Framebuffer????????
@@ -43,6 +44,10 @@ Features include: 
 #%patch1 -p0 -b .setcap
 #%patch2 -p0 -b .iminput
 %patch3 -p0 -b .rpmpack
+%if 0%{?fedora} >= 9
+%else
+%patch4 -p0 -b .el5
+%endif
 
 %build
 autoreconf -iv
@@ -76,6 +81,21 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
 
 
 %changelog
+* Mon Nov 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.6-1
+- Fixed [Bug 539186] FTBFS fbterm-1.5-2.fc12
+- Upstream fixed [Bug 542284] terminfo file for fbterm not included with fbterm package in fedora.
+- Patch for EL-5
+- Upstream update:
+  1. added VESA video card support 
+  2. added rendering messages for IM server development 
+  3. fixed a bug where Ctrl+Space is a shortcut even user run FbTerm without "input-method" option 
+  4. fixed a bug where user compile FbTerm without gpm mouse support but run it in a gpm server enabled environment 
+  5. fixed a IM program dead loop bug triggered by FbTerm's crash 
+  6. fixed several spelling errors in FbTerm's help message and man-page
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 15 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.5-1
 - Upstream update:  
   1. added support for text rendering with backround image 
@@ -87,6 +107,8 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
   7. fixed a bug where screen is cleared on startup even in inactive tty 
   8. fixed a bug where variable HOME is not defined
 - rpmpack.patch is to allow rpm buildable for non-root account.
+- Add BuildRequires automake, autoconf to "refresh" src/Makefile,
+  otherwise, the above patch is not effective for a weird reason.
 
 * Mon Mar 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.4-1
 - Upstream update:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	15 May 2009 05:06:24 -0000	1.7
+++ import.log	1 Dec 2009 02:01:40 -0000	1.8
@@ -5,3 +5,4 @@ fbterm-1_3-0_fc10:F-10:fbterm-1.3-0.fc10
 fbterm-1_3-1_fc10:F-10:fbterm-1.3-1.fc10.src.rpm:1231208373
 fbterm-1_4-1_fc10:F-10:fbterm-1.4-1.fc10.src.rpm:1237784391
 fbterm-1_5-1_fc11:F-10:fbterm-1.5-1.fc11.src.rpm:1242363964
+fbterm-1_6-1_fc12:F-10:fbterm-1.6-1.fc12.src.rpm:1259631480


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 May 2009 05:06:24 -0000	1.6
+++ sources	1 Dec 2009 02:01:40 -0000	1.7
@@ -1 +1 @@
-8f4eb318718aac9f16bf3bd4e401c936  fbterm-1.5.tar.gz
+531ea0984836b58fd123e6a97a4228c6  fbterm-1.6.tar.gz


--- fbterm-1.5-rpmpack.patch DELETED ---



From toshio at fedoraproject.org  Tue Dec  1 02:03:02 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 02:03:02 +0000 (UTC)
Subject: rpms/TurboGears/devel turbogears-sqlcreate.patch, NONE,
	1.1 TurboGears.spec, 1.49, 1.50
Message-ID: <20091201020302.25AAF11C00D3@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	TurboGears.spec 
Added Files:
	turbogears-sqlcreate.patch 
Log Message:

* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
- Fix problem with sql create and sqlobject


turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE turbogears-sqlcreate.patch ---
Index: TurboGears-1.0.8/turbogears/command/base.py
===================================================================
--- TurboGears-1.0.8.orig/turbogears/command/base.py
+++ TurboGears-1.0.8/turbogears/command/base.py
@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
                     if not eggname or not os.path.exists(
                             os.path.join(eggname[0], "sqlobject.txt")):
                         eggname = self.fix_egginfo(eggname)
+                    # Turn the egg directory name into a package name
                     eggname = eggname[0].replace(".egg-info", "")
+                    pkgname = '-'.join(eggname.split('-')[:-2])
+                    pkgversion = eggname.split('-')[-2]
+                    pkgname = '%s == %s' % (pkgname, pkgversion)
                     if not "." in sys.path:
                         sys.path.append(".")
                         pkg_resources.working_set.add_entry(".")
-                    sys.argv.insert(2, eggname)
+                    sys.argv.insert(2, pkgname)
                     sys.argv.insert(2, "--egg")
 
             command.the_runner.run(sys.argv)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- TurboGears.spec	17 Aug 2009 20:56:29 -0000	1.49
+++ TurboGears.spec	1 Dec 2009 02:03:01 -0000	1.50
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -17,6 +17,8 @@ Patch2:         %{name}-%{version}-pagin
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
+# Reported upstream
+Patch4: turbogears-sqlcreate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -76,6 +78,7 @@ TurboGears is easy to use for a wide ran
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
+%patch4 -p1 -b .sqlcreate
 
 %build
 %{__python} setup.py build
@@ -98,6 +101,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
+- Fix problem with sql create and sqlobject
+
 * Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
 - Update Requires conditionals so we can share with EPEL
 



From dchen at fedoraproject.org  Tue Dec  1 02:04:18 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  1 Dec 2009 02:04:18 +0000 (UTC)
Subject: rpms/fbterm/EL-5 fbterm-1.6-el5.patch, NONE,
	1.1 fbterm-1.6-rpmpack.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 fbterm.spec, 1.6, 1.7 import.log, 1.6, 1.7 sources, 1.6,
	1.7 fbterm-1.5-rpmpack.patch, 1.1, NONE
Message-ID: <20091201020418.D6DD311C00D3@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.6-el5.patch fbterm-1.6-rpmpack.patch 
Removed Files:
	fbterm-1.5-rpmpack.patch 
Log Message:
Upstream update

fbterm-1.6-el5.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fbterm-1.6-el5.patch ---
diff -up ./configure.ac.el5 ./configure.ac
--- ./configure.ac.el5	2009-11-14 11:00:00.000000000 +1000
+++ ./configure.ac	2009-11-30 17:57:01.000000000 +1000
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.59])
 AC_INIT([FbTerm], [1.6])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/fbterm.cpp])

fbterm-1.6-rpmpack.patch:
 Makefile.am |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

--- NEW FILE fbterm-1.6-rpmpack.patch ---
diff -up ./src/Makefile.am.orig ./src/Makefile.am
--- ./src/Makefile.am.orig	2009-11-30 17:35:25.000000000 +1000
+++ ./src/Makefile.am	2009-11-30 17:41:56.000000000 +1000
@@ -10,24 +10,10 @@ EXTRA_fbterm_SOURCES = signalfd.h
 fbterm_CXXFLAGS = -fno-exceptions -fno-rtti -Ilib @FT2_INC@ @FC_INC@
 fbterm_LDADD = lib/libshell.a @FT2_LIB@ @FC_LIB@ @X86_LIB@ -lutil
 
-if VESA
-install-exec-hook:
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-else
 install-exec-hook:
 	KERV=`uname -r | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/'`; \
 	[[ $$KERV -lt 20615 ]] && exit 0; \
-	[[ "`id -u`" != "0" ]] && { \
-		echo "run 'make install' as root!"; \
-		exit 1; \
-	} || { \
-		[[ $$KERV -ge 20627 ]] && \
+	[[ $$KERV -ge 20627 ]] && \
 		setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null || \
-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
-	}
-endif
+		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	15 May 2009 05:09:43 -0000	1.6
+++ .cvsignore	1 Dec 2009 02:04:18 -0000	1.7
@@ -1 +1 @@
-fbterm-1.5.tar.gz
+fbterm-1.6.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/fbterm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fbterm.spec	15 May 2009 05:09:43 -0000	1.6
+++ fbterm.spec	1 Dec 2009 02:04:18 -0000	1.7
@@ -1,5 +1,5 @@
 Name:       fbterm
-Version:    1.5
+Version:    1.6
 Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
@@ -8,7 +8,8 @@ Source0:    http://fbterm.googlecode.com
 #Patch0:    %{name}-1.2-kernel-header.patch
 #Patch1:    %{name}-1.3-setcap.patch
 #Patch2:    %{name}-1.4-iminput.patch
-Patch3:    %{name}-1.5-rpmpack.patch
+Patch3:    %{name}-1.6-rpmpack.patch
+Patch4:    %{name}-1.6-el5.patch
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): ??????????????
 Summary(zh_TW): ???Framebuffer????????
@@ -43,6 +44,10 @@ Features include: 
 #%patch1 -p0 -b .setcap
 #%patch2 -p0 -b .iminput
 %patch3 -p0 -b .rpmpack
+%if 0%{?fedora} >= 9
+%else
+%patch4 -p0 -b .el5
+%endif
 
 %build
 autoreconf -iv
@@ -76,6 +81,21 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
 
 
 %changelog
+* Mon Nov 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.6-1
+- Fixed [Bug 539186] FTBFS fbterm-1.5-2.fc12
+- Upstream fixed [Bug 542284] terminfo file for fbterm not included with fbterm package in fedora.
+- Patch for EL-5
+- Upstream update:
+  1. added VESA video card support 
+  2. added rendering messages for IM server development 
+  3. fixed a bug where Ctrl+Space is a shortcut even user run FbTerm without "input-method" option 
+  4. fixed a bug where user compile FbTerm without gpm mouse support but run it in a gpm server enabled environment 
+  5. fixed a IM program dead loop bug triggered by FbTerm's crash 
+  6. fixed several spelling errors in FbTerm's help message and man-page
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 15 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.5-1
 - Upstream update:  
   1. added support for text rendering with backround image 
@@ -87,6 +107,8 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
   7. fixed a bug where screen is cleared on startup even in inactive tty 
   8. fixed a bug where variable HOME is not defined
 - rpmpack.patch is to allow rpm buildable for non-root account.
+- Add BuildRequires automake, autoconf to "refresh" src/Makefile,
+  otherwise, the above patch is not effective for a weird reason.
 
 * Mon Mar 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.4-1
 - Upstream update:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	15 May 2009 05:09:43 -0000	1.6
+++ import.log	1 Dec 2009 02:04:18 -0000	1.7
@@ -4,3 +4,4 @@ fbterm-1_3-0_fc10:EL-5:fbterm-1.3-0.fc10
 fbterm-1_3-1_fc10:EL-5:fbterm-1.3-1.fc10.src.rpm:1231211081
 fbterm-1_4-1_fc10:EL-5:fbterm-1.4-1.fc10.src.rpm:1237789310
 fbterm-1_5-1_fc11:EL-5:fbterm-1.5-1.fc11.src.rpm:1242364149
+fbterm-1_6-1_fc12:EL-5:fbterm-1.6-1.fc12.src.rpm:1259633026


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 May 2009 05:09:43 -0000	1.6
+++ sources	1 Dec 2009 02:04:18 -0000	1.7
@@ -1 +1 @@
-8f4eb318718aac9f16bf3bd4e401c936  fbterm-1.5.tar.gz
+531ea0984836b58fd123e6a97a4228c6  fbterm-1.6.tar.gz


--- fbterm-1.5-rpmpack.patch DELETED ---



From toshio at fedoraproject.org  Tue Dec  1 02:10:17 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 02:10:17 +0000 (UTC)
Subject: rpms/TurboGears/EL-5 turbogears-sqlcreate.patch, NONE,
	1.1 TurboGears.spec, 1.27, 1.28
Message-ID: <20091201021017.9E33111C03E3@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	TurboGears.spec 
Added Files:
	turbogears-sqlcreate.patch 
Log Message:

* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
- Fix problem with sql create and sqlobject


turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE turbogears-sqlcreate.patch ---
Index: TurboGears-1.0.8/turbogears/command/base.py
===================================================================
--- TurboGears-1.0.8.orig/turbogears/command/base.py
+++ TurboGears-1.0.8/turbogears/command/base.py
@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
                     if not eggname or not os.path.exists(
                             os.path.join(eggname[0], "sqlobject.txt")):
                         eggname = self.fix_egginfo(eggname)
+                    # Turn the egg directory name into a package name
                     eggname = eggname[0].replace(".egg-info", "")
+                    pkgname = '-'.join(eggname.split('-')[:-2])
+                    pkgversion = eggname.split('-')[-2]
+                    pkgname = '%s == %s' % (pkgname, pkgversion)
                     if not "." in sys.path:
                         sys.path.append(".")
                         pkg_resources.working_set.add_entry(".")
-                    sys.argv.insert(2, eggname)
+                    sys.argv.insert(2, pkgname)
                     sys.argv.insert(2, "--egg")
 
             command.the_runner.run(sys.argv)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- TurboGears.spec	17 Aug 2009 20:56:28 -0000	1.27
+++ TurboGears.spec	1 Dec 2009 02:10:17 -0000	1.28
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -17,6 +17,8 @@ Patch2:         %{name}-%{version}-pagin
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
+# Reported upstream
+Patch4: turbogears-sqlcreate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -76,6 +78,7 @@ TurboGears is easy to use for a wide ran
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
+%patch4 -p1 -b .sqlcreate
 
 %build
 %{__python} setup.py build
@@ -98,6 +101,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
+- Fix problem with sql create and sqlobject
+
 * Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
 - Update Requires conditionals so we can share with EPEL
 
@@ -114,24 +120,57 @@ rm -rf %{buildroot}
 * Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-3
 - Fix from upstream for pagination problem.
 
-* Sat Mar 07 2009 Luke Macken <lmacken at redhat.com> 1.0.8-3
-- Update our setup.py patch to work with the 0.9 branch of SQLObject
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 03 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-1
+- Latest upstream release.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.7-3
+- Rebuild for Python 2.6
 
-* Tue Mar 3 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0.8-2
-- Add the correct patches to cvs
+* Wed Sep 17 2008 Luke Macken <lmacken at redhat.com> 1.0.7-2
+- Add a patch to allow newer versions of TurboJson
 
-* Tue Mar 3 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0.8-1
-- 1.0.8 release
-- Remove ez_setup from setup.py so setup will run with lesser setuptools.
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> 1.0.7-1
+- Update to the latest upstream release
+- Utilize the test suite
+- Remove the setup.py patch
 
-* Mon Aug 18 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-2
-- Make our SQLObject requirement less strict, to match the latest TG upstream.
-  Fixes bug #459268.
+* Tue May 27 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-3
+- Patch our setup.py to remove the hard version requirements for SQLObject.
+  This has changed upstream as well.
 
-* Wed May 14 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-1
+* Tue Mar 11 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-2
+- Add TurboGears-1.0.4.4-cherrypyreq.patch to explicitly require the
+  appropriate version of CherryPy when necessary.
+
+* Fri Mar  7 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-1
 - Update to 1.0.4.4
-- Remove now upstream paginate patch
-- Add cherrypyreq patch
+- Remove the setuptools and sqlalchemy-backport patches
+
+* Fri Feb 29 2008 Luke Macken <lmacken at redhat.com> 1.0.4.3-3
+- Require python-paste-script >= 1.6.2 (Bug #435525)
+
+* Thu Feb 21 2008 Toshio Kuratomi <tkuratom at redhat.com> 1.0.4.3-2
+- Fixes for SQLAlchemy-0.4 and exceptions.  Upstream Bug #1721.
+
+* Fri Feb  1 2008 Luke Macken <lmacken at redhat.com> 1.0.4.3-1
+- 1.0.4.3
+
+* Sat Jan 26 2008 Luke Macken <lmacken at redhat.com> 1.0.4.2-3
+- Require Genshi and Elixir
+
+* Wed Jan 23 2008 Luke Macken <lmacken at redhat.com> 1.0.4.2-2
+- Update setuptools patch to work with the CherryPy egg_info
+
+* Tue Jan 22 2008 Luke Macken <lmacken at redhat.com> 1.0.4.2-1
+- 1.0.4.2
+
+* Sun Jan 20 2008 Luke Macken <lmacken at redhat.com> 1.0.4-1
+- 1.0.4
+- Remove paginate patch
+- Update setuptools patch
 
 * Sat Dec 15 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-7
 - Add TurboGears-1.0.3.2-paginate.patch backported from upstream



From toshio at fedoraproject.org  Tue Dec  1 02:10:17 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 02:10:17 +0000 (UTC)
Subject: rpms/TurboGears/F-11 turbogears-sqlcreate.patch, NONE,
	1.1 TurboGears.spec, 1.46, 1.47
Message-ID: <20091201021017.F339C11C03E3@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	TurboGears.spec 
Added Files:
	turbogears-sqlcreate.patch 
Log Message:

* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
- Fix problem with sql create and sqlobject


turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE turbogears-sqlcreate.patch ---
Index: TurboGears-1.0.8/turbogears/command/base.py
===================================================================
--- TurboGears-1.0.8.orig/turbogears/command/base.py
+++ TurboGears-1.0.8/turbogears/command/base.py
@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
                     if not eggname or not os.path.exists(
                             os.path.join(eggname[0], "sqlobject.txt")):
                         eggname = self.fix_egginfo(eggname)
+                    # Turn the egg directory name into a package name
                     eggname = eggname[0].replace(".egg-info", "")
+                    pkgname = '-'.join(eggname.split('-')[:-2])
+                    pkgversion = eggname.split('-')[-2]
+                    pkgname = '%s == %s' % (pkgname, pkgversion)
                     if not "." in sys.path:
                         sys.path.append(".")
                         pkg_resources.working_set.add_entry(".")
-                    sys.argv.insert(2, eggname)
+                    sys.argv.insert(2, pkgname)
                     sys.argv.insert(2, "--egg")
 
             command.the_runner.run(sys.argv)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- TurboGears.spec	17 Aug 2009 20:56:28 -0000	1.46
+++ TurboGears.spec	1 Dec 2009 02:10:17 -0000	1.47
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -17,6 +17,8 @@ Patch2:         %{name}-%{version}-pagin
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
+# Reported upstream
+Patch4: turbogears-sqlcreate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -76,6 +78,7 @@ TurboGears is easy to use for a wide ran
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
+%patch4 -p1 -b .sqlcreate
 
 %build
 %{__python} setup.py build
@@ -98,6 +101,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
+- Fix problem with sql create and sqlobject
+
 * Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
 - Update Requires conditionals so we can share with EPEL
 



From toshio at fedoraproject.org  Tue Dec  1 02:10:32 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 02:10:32 +0000 (UTC)
Subject: File TurboGears-1.0.9.tar.gz uploaded to lookaside cache by toshio
Message-ID: <20091201021032.8EE0C10F802@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for TurboGears:

aa10271f3d29c716e9d63b3264dca944  TurboGears-1.0.9.tar.gz



From toshio at fedoraproject.org  Tue Dec  1 02:10:18 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 02:10:18 +0000 (UTC)
Subject: rpms/TurboGears/F-12 turbogears-sqlcreate.patch, NONE,
	1.1 TurboGears.spec, 1.49, 1.50
Message-ID: <20091201021018.6117B11C03E3@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9395/F-12

Modified Files:
	TurboGears.spec 
Added Files:
	turbogears-sqlcreate.patch 
Log Message:

* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
- Fix problem with sql create and sqlobject


turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE turbogears-sqlcreate.patch ---
Index: TurboGears-1.0.8/turbogears/command/base.py
===================================================================
--- TurboGears-1.0.8.orig/turbogears/command/base.py
+++ TurboGears-1.0.8/turbogears/command/base.py
@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
                     if not eggname or not os.path.exists(
                             os.path.join(eggname[0], "sqlobject.txt")):
                         eggname = self.fix_egginfo(eggname)
+                    # Turn the egg directory name into a package name
                     eggname = eggname[0].replace(".egg-info", "")
+                    pkgname = '-'.join(eggname.split('-')[:-2])
+                    pkgversion = eggname.split('-')[-2]
+                    pkgname = '%s == %s' % (pkgname, pkgversion)
                     if not "." in sys.path:
                         sys.path.append(".")
                         pkg_resources.working_set.add_entry(".")
-                    sys.argv.insert(2, eggname)
+                    sys.argv.insert(2, pkgname)
                     sys.argv.insert(2, "--egg")
 
             command.the_runner.run(sys.argv)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-12/TurboGears.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- TurboGears.spec	17 Aug 2009 20:56:29 -0000	1.49
+++ TurboGears.spec	1 Dec 2009 02:10:18 -0000	1.50
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -17,6 +17,8 @@ Patch2:         %{name}-%{version}-pagin
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
+# Reported upstream
+Patch4: turbogears-sqlcreate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -76,6 +78,7 @@ TurboGears is easy to use for a wide ran
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
+%patch4 -p1 -b .sqlcreate
 
 %build
 %{__python} setup.py build
@@ -98,6 +101,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
+- Fix problem with sql create and sqlobject
+
 * Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
 - Update Requires conditionals so we can share with EPEL
 



From toshio at fedoraproject.org  Tue Dec  1 02:27:27 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 02:27:27 +0000 (UTC)
Subject: rpms/TurboGears/devel .cvsignore, 1.13,
	1.14 TurboGears-1.0.8-setup.patch, 1.1, 1.2 TurboGears.spec,
	1.50, 1.51 sources, 1.13, 1.14 turbogears-sqlcreate.patch, 1.1, 1.2
Message-ID: <20091201022728.2650F11C00D3@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	.cvsignore TurboGears-1.0.8-setup.patch TurboGears.spec 
	sources turbogears-sqlcreate.patch 
Log Message:

* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
- Update to 1.0.9 bugfix release.
- Paginate fix is in upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Jan 2009 06:54:07 -0000	1.13
+++ .cvsignore	1 Dec 2009 02:27:26 -0000	1.14
@@ -1 +1 @@
-TurboGears-1.0.8.tar.gz
+TurboGears-1.0.9.tar.gz

TurboGears-1.0.8-setup.patch:
 setup.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: TurboGears-1.0.8-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.8-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- TurboGears-1.0.8-setup.patch	3 Jan 2009 06:36:17 -0000	1.1
+++ TurboGears-1.0.8-setup.patch	1 Dec 2009 02:27:26 -0000	1.2
@@ -1,6 +1,8 @@
---- setup.py.setup	2008-09-15 16:30:30.000000000 -0400
-+++ setup.py	2008-09-18 03:01:12.000000000 -0400
-@@ -14,7 +14,6 @@
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -20,7 +20,6 @@ execfile(os.path.join("turbogears", "rel
  # setup params
  install_requires = [
      "CherryPy >= 2.3.0, < 3.0.0alpha",
@@ -8,7 +10,7 @@
      "DecoratorTools >= 1.4",
      "FormEncode >= 0.7.1",
      "PasteScript >= 1.6.2",
-@@ -23,7 +22,7 @@
+@@ -29,7 +28,7 @@ install_requires = [
      "simplejson >= 1.3",
      "TurboCheetah >= 1.0",
      # TurboJson >= 1.2 uses PEAK-Rules


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- TurboGears.spec	1 Dec 2009 02:03:01 -0000	1.50
+++ TurboGears.spec	1 Dec 2009 02:27:26 -0000	1.51
@@ -2,18 +2,16 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.8
-Release:        8%{?dist}
+Version:        1.0.9
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-cherrypyreq.patch
-Patch1:         %{name}-%{version}-setup.patch
-# From upstream changeset r6575
-Patch2:         %{name}-%{version}-paginate.patch
+Patch0:         %{name}-1.0.8-cherrypyreq.patch
+Patch1:         %{name}-1.0.8-setup.patch
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
@@ -76,7 +74,6 @@ TurboGears is easy to use for a wide ran
 %setup -q
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
-%patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
 %patch4 -p1 -b .sqlcreate
 
@@ -101,6 +98,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
+- Update to 1.0.9 bugfix release.
+- Paginate fix is in upstream.
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
 - Fix problem with sql create and sqlobject
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Jan 2009 06:54:07 -0000	1.13
+++ sources	1 Dec 2009 02:27:26 -0000	1.14
@@ -1 +1 @@
-845b29a588ae8d4e7591c7226daa6f98  TurboGears-1.0.8.tar.gz
+aa10271f3d29c716e9d63b3264dca944  TurboGears-1.0.9.tar.gz

turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/turbogears-sqlcreate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- turbogears-sqlcreate.patch	1 Dec 2009 02:03:02 -0000	1.1
+++ turbogears-sqlcreate.patch	1 Dec 2009 02:27:26 -0000	1.2
@@ -1,8 +1,8 @@
-Index: TurboGears-1.0.8/turbogears/command/base.py
+Index: TurboGears-1.0.9/turbogears/command/base.py
 ===================================================================
---- TurboGears-1.0.8.orig/turbogears/command/base.py
-+++ TurboGears-1.0.8/turbogears/command/base.py
-@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
+--- TurboGears-1.0.9.orig/turbogears/command/base.py
++++ TurboGears-1.0.9/turbogears/command/base.py
+@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
@@ -18,4 +18,4 @@ Index: TurboGears-1.0.8/turbogears/comma
 +                    sys.argv.insert(2, pkgname)
                      sys.argv.insert(2, "--egg")
  
-             command.the_runner.run(sys.argv)
+             socommand.the_runner.run(sys.argv)



From mclasen at fedoraproject.org  Tue Dec  1 02:34:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 02:34:02 +0000 (UTC)
Subject: rpms/gtk2/devel gtk-lib64.patch,NONE,1.1 gtk2.spec,1.411,1.412
Message-ID: <20091201023402.A793B11C00D3@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Added Files:
	gtk-lib64.patch 
Log Message:
avoid autoreconf


gtk-lib64.patch:
 gdk-pixbuf/Makefile.am     |    1 +
 gdk-pixbuf/Makefile.in     |    1 +
 gdk-pixbuf/gdk-pixbuf-io.c |   12 +++++++++++-
 gtk/gtkrc.c                |   12 +++++++++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

--- NEW FILE gtk-lib64.patch ---
diff -up gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64 gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c
--- gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64	2009-11-30 13:10:35.000000000 -0500
+++ gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c	2009-11-30 20:54:21.842859303 -0500
@@ -305,7 +305,17 @@ gdk_pixbuf_get_module_file (void)
   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
 
   if (!result)
-	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+  {
+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+				     HOST, "gdk-pixbuf.loaders", NULL);
+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
+	  {
+		  g_free (result);
+		  
+		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+					     "gdk-pixbuf.loaders", NULL);
+	  }
+  }
 
   return result;
 }
diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.am
--- gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64	2009-11-26 01:35:49.000000000 -0500
+++ gtk+-2.19.1/gdk-pixbuf/Makefile.am	2009-11-30 20:54:21.842859303 -0500
@@ -521,6 +521,7 @@ INCLUDES = \
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_builddir)/gdk-pixbuf 		\
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
+	-DHOST=\"$(host_triplet)\"              \
 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
 	-DGTK_PREFIX=\"$(prefix)\"		\
diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.in
--- gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64	2009-11-30 20:54:58.058857713 -0500
+++ gtk+-2.19.1/gdk-pixbuf/Makefile.in	2009-11-30 20:55:21.902591753 -0500
@@ -1344,6 +1344,7 @@ INCLUDES = \
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_builddir)/gdk-pixbuf 		\
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
+	-DHOST=\"$(host_triplet)\"              \
 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
 	-DGTK_PREFIX=\"$(prefix)\"		\
diff -up gtk+-2.19.1/gtk/gtkrc.c.lib64 gtk+-2.19.1/gtk/gtkrc.c
--- gtk+-2.19.1/gtk/gtkrc.c.lib64	2009-11-26 01:35:50.000000000 -0500
+++ gtk+-2.19.1/gtk/gtkrc.c	2009-11-30 20:54:21.844826383 -0500
@@ -450,7 +450,17 @@ gtk_rc_get_im_module_file (void)
       if (im_module_file)
 	result = g_strdup (im_module_file);
       else
-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+        {
+          result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, 
+                                     "gtk.immodules", NULL);
+          if (!g_file_test (result, G_FILE_TEST_EXISTS))
+            {
+              g_free (result);
+             
+              result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+                                        "gtk.immodules", NULL);
+            }
+        }
     }
 
   return result;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- gtk2.spec	1 Dec 2009 01:13:45 -0000	1.411
+++ gtk2.spec	1 Dec 2009 02:34:02 -0000	1.412
@@ -26,7 +26,7 @@ Source2: update-gtk-immodules
 Source3: im-cedilla.conf
 
 # Biarch changes
-Patch0: gtk+-2.13.5-lib64.patch
+Patch0: gtk-lib64.patch
 Patch1: system-python.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
 Patch2: icon-padding.patch
@@ -160,16 +160,6 @@ This package contains developer document
 %patch15 -p1 -b .filesystemref
 
 %build
-libtoolize --force --copy
-
-# Patch0 modifies gdk-pixbuf/Makefile.am
-autoreconf
-
-if ! pkg-config --exists pangoxft ; then
-        echo "No pangoxft.pc!"
-        exit 1
-fi
-
 %configure --with-xinput=xfree 		\
 	   --enable-debug		\
 	   --disable-gtk-doc 		\



From mstone at fedoraproject.org  Tue Dec  1 02:35:23 2009
From: mstone at fedoraproject.org (Michael Stone)
Date: Tue,  1 Dec 2009 02:35:23 +0000 (UTC)
Subject: rpms/rainbow/devel rainbow.spec,1.6,1.7
Message-ID: <20091201023523.ACF7011C00D3@cvs1.fedora.phx.redhat.com>

Author: mstone

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

Modified Files:
	rainbow.spec 
Log Message:
- rhbz#542699: build with %%{optflags}



Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/devel/rainbow.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rainbow.spec	28 Nov 2009 22:30:22 -0000	1.6
+++ rainbow.spec	1 Dec 2009 02:35:23 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           rainbow
 Version:        0.8.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An isolation shell
 
 Group:          System Environment/Daemons
@@ -27,7 +27,9 @@ An isolation shell based on the Bitfrost
 
 
 %build
-make %{?_smp_mflags}
+make \
+	CFLAGS="%{optflags}" \
+	%{?_smp_mflags} 
 
 
 %install
@@ -40,6 +42,7 @@ make install \
 	LIBDIR="$RPM_BUILD_ROOT/%{_lib}" \
 	SYSCONFDIR="$RPM_BUILD_ROOT/%{_sysconfdir}" \
 	LOCALSTATEDIR="$RPM_BUILD_ROOT/%{_localstatedir}" \
+	CFLAGS="%{optflags}" \
 	%{?_smp_mflags}
 
 
@@ -68,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libnss_rainbow.so.2
 
 %changelog
+* Mon Nov 30 2009 Michael Stone <michael at laptop.org> - 0.8.5-2
+- rhbz#542699: build with %%{optflags}
+
 * Sat Nov 28 2009 Michael Stone <michael at laptop.org> - 0.8.5-1
 - Michael Stone (many):
     Outline network and X11 isolation strategies.



From mclasen at fedoraproject.org  Tue Dec  1 02:41:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 02:41:36 +0000 (UTC)
Subject: File atk-1.29.3.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091201024136.84E9B10F802@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for atk:

caf6364ebf59c1b77ac052f42b7a2f43  atk-1.29.3.tar.bz2



From mclasen at fedoraproject.org  Tue Dec  1 02:43:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 02:43:44 +0000 (UTC)
Subject: rpms/atk/devel .cvsignore, 1.42, 1.43 atk.spec, 1.67, 1.68 sources, 
	1.42, 1.43
Message-ID: <20091201024344.E887511C00D3@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
1.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	23 Sep 2009 23:56:24 -0000	1.42
+++ .cvsignore	1 Dec 2009 02:43:44 -0000	1.43
@@ -1 +1 @@
-atk-1.28.0.tar.bz2
+atk-1.29.3.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/atk.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- atk.spec	7 Oct 2009 19:07:07 -0000	1.67
+++ atk.spec	1 Dec 2009 02:43:44 -0000	1.68
@@ -2,11 +2,11 @@
 
 Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.28.0
+Version: 1.29.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/atk/1.28/atk-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/atk/1.29/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}
@@ -29,7 +29,7 @@ Requires: glib2-devel >= %{glib2_version
 Requires: pkgconfig
 
 %description devel
-This package includes libraries, header files, and developer documentation 
+This package includes libraries, header files, and developer documentation
 needed for development of applications or toolkits which use ATK.
 
 %prep
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Mon Nov 30 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-1
+- Update to 1.29.3
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28.0-2
 - drop gtk-doc requirement from atk-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	23 Sep 2009 23:56:24 -0000	1.42
+++ sources	1 Dec 2009 02:43:44 -0000	1.43
@@ -1 +1 @@
-010a85478adc053c016a0a5c9bb52004  atk-1.28.0.tar.bz2
+caf6364ebf59c1b77ac052f42b7a2f43  atk-1.29.3.tar.bz2



From mclasen at fedoraproject.org  Tue Dec  1 02:50:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 02:50:13 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.412,1.413
Message-ID: <20091201025013.3BDEE11C0396@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Log Message:
 bump atk br



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- gtk2.spec	1 Dec 2009 02:34:02 -0000	1.412
+++ gtk2.spec	1 Dec 2009 02:50:12 -0000	1.413
@@ -4,7 +4,7 @@
 %define glib2_version %{glib2_base_version}-1
 %define pango_base_version 1.20.0
 %define pango_version %{pango_base_version}-1
-%define atk_base_version 1.13.0
+%define atk_base_version 1.29.2
 %define atk_version %{atk_base_version}-1
 %define cairo_base_version 1.6.0
 %define cairo_version %{cairo_base_version}-1



From whot at fedoraproject.org  Tue Dec  1 03:51:49 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  1 Dec 2009 03:51:49 +0000 (UTC)
Subject: File xf86-input-wacom-0.10.2.tar.bz2 uploaded to lookaside cache by
	whot
Message-ID: <20091201035149.6DD1810F802@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xorg-x11-drv-wacom:

86e5a1446d15bd47cd302a18033bb5e8  xf86-input-wacom-0.10.2.tar.bz2



From whot at fedoraproject.org  Tue Dec  1 03:53:28 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  1 Dec 2009 03:53:28 +0000 (UTC)
Subject: rpms/xorg-x11-drv-wacom/F-12 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xorg-x11-drv-wacom.spec, 1.3, 1.4
Message-ID: <20091201035328.E7F7511C00D3@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6132

Modified Files:
	.cvsignore sources xorg-x11-drv-wacom.spec 
Log Message:
* Tue Dec 01 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.2-1
- wacom 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Nov 2009 04:46:42 -0000	1.3
+++ .cvsignore	1 Dec 2009 03:53:27 -0000	1.4
@@ -1 +1 @@
-xf86-input-wacom-0.10.1.tar.bz2
+xf86-input-wacom-0.10.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Nov 2009 04:46:42 -0000	1.3
+++ sources	1 Dec 2009 03:53:28 -0000	1.4
@@ -1 +1 @@
-544f40bb5bcdd8538c248c4067f3848f  xf86-input-wacom-0.10.1.tar.bz2
+86e5a1446d15bd47cd302a18033bb5e8  xf86-input-wacom-0.10.2.tar.bz2


Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/xorg-x11-drv-wacom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xorg-x11-drv-wacom.spec	23 Nov 2009 07:02:44 -0000	1.3
+++ xorg-x11-drv-wacom.spec	1 Dec 2009 03:53:28 -0000	1.4
@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
-Version:    0.10.1
-Release:    2%{?dist}
+Version:    0.10.2
+Release:    1%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -75,6 +75,9 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Tue Dec 01 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.2-1
+- wacom 0.10.2
+
 * Mon Nov 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.1-2
 - 10-linuxwacom.fdi: squash extra entry for bluetooth tablet into general
   Wacom match. 



From airlied at fedoraproject.org  Tue Dec  1 04:13:24 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  1 Dec 2009 04:13:24 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-b390f944.patch, NONE, 1.1 kernel.spec,
	1.1942, 1.1943 drm-next-4e16e5a5.patch, 1.1, NONE
Message-ID: <20091201041324.399BF11C02A3@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	kernel.spec 
Added Files:
	drm-next-b390f944.patch 
Removed Files:
	drm-next-4e16e5a5.patch 
Log Message:
* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-157
- div/0 fix harder (#540593) - also ignore unposted GPUs with no BIOS


drm-next-b390f944.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  308 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  557 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 | 1030 
 b/drivers/gpu/drm/drm_gem.c                       |   13 
 b/drivers/gpu/drm/drm_mm.c                        |   30 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   65 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  139 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  608 
 b/drivers/gpu/drm/i915/intel_drv.h                |    9 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  748 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  239 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atom.c                   |    1 
 b/drivers/gpu/drm/radeon/atombios.h               |   13 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  366 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1768 +
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  714 
 b/drivers/gpu/drm/radeon/r200.c                   |  454 
 b/drivers/gpu/drm/radeon/r300.c                   |  985 
 b/drivers/gpu/drm/radeon/r300d.h                  |  306 
 b/drivers/gpu/drm/radeon/r420.c                   |  305 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r500_reg.h               |   12 
 b/drivers/gpu/drm/radeon/r520.c                   |  286 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1847 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  858 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  783 
 b/drivers/gpu/drm/radeon/r600d.h                  |  667 
 b/drivers/gpu/drm/radeon/radeon.h                 |  454 
 b/drivers/gpu/drm/radeon/radeon_agp.c             |   12 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  386 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  434 
 b/drivers/gpu/drm/radeon/radeon_benchmark.c       |    4 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   46 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   28 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |  717 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  751 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  104 
 b/drivers/gpu/drm/radeon/radeon_cursor.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  352 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  193 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  309 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  701 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |   29 
 b/drivers/gpu/drm/radeon/radeon_gem.c             |   10 
 b/drivers/gpu/drm/radeon/radeon_i2c.c             |  109 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |   16 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |  152 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  505 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |  170 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   28 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_pm.c              |   65 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |  126 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_test.c            |    6 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |  101 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs100d.h                 |   40 
 b/drivers/gpu/drm/radeon/rs400.c                  |  331 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  610 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  359 
 b/drivers/gpu/drm/radeon/rs690d.h                 |  307 
 b/drivers/gpu/drm/radeon/rv200d.h                 |   36 
 b/drivers/gpu/drm/radeon/rv250d.h                 |  123 
 b/drivers/gpu/drm/radeon/rv350d.h                 |   52 
 b/drivers/gpu/drm/radeon/rv515.c                  |  882 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1063 -
 b/drivers/gpu/drm/radeon/rv770d.h                 |  346 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    6 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  105 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |   10 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  111 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_pciids.h                        |    4 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs690r.h                   |   99 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 189 files changed, 42507 insertions(+), 44062 deletions(-)

--- NEW FILE drm-next-b390f944.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d..e4d971c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
 	  details.  You should also select and configure AGP
 	  (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+	tristate
+	depends on DRM
+	select FB
+	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	help
+	  FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
 	tristate
 	depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
 	tristate "ATI Rage 128"
 	depends on DRM && PCI
+	select FW_LOADER
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
 	  is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
 	help
 	  Choose this option if you have an ATI Radeon graphics card.  There
 	  are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	# i915 depends on ACPI_VIDEO when ACPI is enabled
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 	select VIDEO_OUTPUT_CONTROL if ACPI
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
+	select FW_LOADER
 	help
 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
 	  card.  If M is selected, the module will be called mga.  AGP
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index fe23f29..3c8827a 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -10,11 +10,15 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-		drm_info.o drm_debugfs.o
+		drm_crtc.o drm_modes.o drm_edid.o \
+		drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)	+= drm.o
 obj-$(CONFIG_DRM_TTM)	+= ttm/
 obj-$(CONFIG_DRM_TDFX)	+= tdfx/
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 6246e3f..3d09e30 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 			  (unsigned long long)map->offset, map->size);
 
 		break;
+	}
 	case _DRM_GEM:
-		DRM_ERROR("tried to rmmap GEM object\n");
+		DRM_ERROR("tried to addmap GEM object\n");
 		break;
-	}
 	case _DRM_SCATTER_GATHER:
 		if (!dev->sg) {
 			kfree(map);
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e994a0..0e3bd5b 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -45,6 +45,23 @@ drm_clflush_page(struct page *page)
 		clflush(page_virtual + i);
 	kunmap_atomic(page_virtual, KM_USER0);
 }
+
+static void drm_cache_flush_clflush(struct page *pages[],
+				    unsigned long num_pages)
+{
+	unsigned long i;
+
+	mb();
+	for (i = 0; i < num_pages; i++)
+		drm_clflush_page(*pages++);
+	mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+	wbinvd();
+}
 #endif
 
 void
@@ -53,17 +70,30 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 #if defined(CONFIG_X86)
 	if (cpu_has_clflush) {
-		unsigned long i;
-
-		mb();
-		for (i = 0; i < num_pages; ++i)
-			drm_clflush_page(*pages++);
-		mb();
-
+		drm_cache_flush_clflush(pages, num_pages);
 		return;
 	}
 
-	wbinvd();
+	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+		printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+	unsigned long i;
+	for (i = 0; i < num_pages; i++) {
+		struct page *page = pages[i];
+		void *page_virtual;
+
+		if (unlikely(page == NULL))
+			continue;
+
+		page_virtual = kmap_atomic(page, KM_USER0);
+		flush_dcache_range((unsigned long)page_virtual,
+				   (unsigned long)page_virtual + PAGE_SIZE);
+		kunmap_atomic(page_virtual, KM_USER0);
+	}
+#else
+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+	WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2f631c7..5cae0b3 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-	{ DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-	{ DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-	{ DRM_MODE_SCALE_NO_SCALE, "No scale" },
-	{ DRM_MODE_SCALE_ASPECT, "Aspect" },
+	{ DRM_MODE_SCALE_NONE, "None" },
+	{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
+	{ DRM_MODE_SCALE_CENTER, "Center" },
+	{ DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
[...95922 lines suppressed...]
+ */
+
+struct ttm_bo_global {
+
+	/**
+	 * Constant after init.
+	 */
+
+	struct kobject kobj;
+	struct ttm_mem_global *mem_glob;
+	struct page *dummy_read_page;
+	struct ttm_mem_shrink shrink;
+	size_t ttm_bo_extra_size;
+	size_t ttm_bo_size;
+	struct mutex device_list_mutex;
+	spinlock_t lru_lock;
+
+	/**
+	 * Protected by device_list_mutex.
+	 */
+	struct list_head device_list;
+
+	/**
+	 * Protected by the lru_lock.
+	 */
+	struct list_head swap_lru;
+
+	/**
+	 * Internal protection.
+	 */
+	atomic_t bo_count;
+};
+
+
+#define TTM_NUM_MEM_TYPES 8
+
+#define TTM_BO_PRIV_FLAG_MOVING  0	/* Buffer object is moving and needs
+					   idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
  * @man: An array of mem_type_managers.
  * @addr_space_mm: Range manager for the device address space.
  * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
 	/*
 	 * Constant after bo device init / atomic.
 	 */
-
-	struct ttm_mem_global *mem_glob;
+	struct list_head device_list;
+	struct ttm_bo_global *glob;
 	struct ttm_bo_driver *driver;
-	struct page *dummy_read_page;
-	struct ttm_mem_shrink shrink;
-
-	size_t ttm_bo_extra_size;
-	size_t ttm_bo_size;
-
 	rwlock_t vm_lock;
+	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by the vm lock.
 	 */
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	struct rb_root addr_space_rb;
 	struct drm_mm addr_space_mm;
 
 	/*
-	 * Might want to change this to one lock per manager.
-	 */
-	spinlock_t lru_lock;
-	/*
-	 * Protected by the lru lock.
+	 * Protected by the global:lru lock.
 	 */
 	struct list_head ddestroy;
-	struct list_head swap_lru;
 
 	/*
 	 * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
 			     unsigned long *bus_offset,
 			     unsigned long *bus_size);
 
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
+
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
  * !0: Failure.
  */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-			      struct ttm_mem_global *mem_glob,
+			      struct ttm_bo_global *glob,
 			      struct ttm_bo_driver *driver,
 			      uint64_t file_page_offset, bool need_dma32);
 
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index d8b8f04..6983a7c 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 
 /**
  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
  * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
- * @max_memory: Lowmem memory limit available for non-root.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
- * @used_memory: Currently used lowmem memory.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
+ * @zones: Array of pointers to accounting zones.
+ * @num_zones: Number of populated entries in the @zones array.
+ * @zone_kernel: Pointer to the kernel zone.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
  *
  * Note that this structure is not per device. It should be global for all
  * graphics devices.
  */
 
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+	struct kobject kobj;
 	struct ttm_mem_shrink *shrink;
 	struct workqueue_struct *swap_queue;
 	struct work_struct work;
 	wait_queue_head_t queue;
 	spinlock_t lock;
-	uint64_t emer_memory;
-	uint64_t max_memory;
-	uint64_t swap_limit;
-	uint64_t used_memory;
-	uint64_t used_total_memory;
-	uint64_t total_memory_swap_limit;
-	uint64_t max_total_memory;
-	uint64_t emer_total_memory;
+	struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
+	unsigned int num_zones;
+	struct ttm_mem_zone *zone_kernel;
+#ifdef CONFIG_HIGHMEM
+	struct ttm_mem_zone *zone_highmem;
+#else
+	struct ttm_mem_zone *zone_dma32;
+#endif
 };
 
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-				bool no_wait, bool interruptible, bool himem);
+				bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-				uint64_t amount, bool himem);
+				uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+				     struct page *page,
+				     bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+				     struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h
index d1d4338..cf416ae 100644
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
+struct kobject;
 
 #define TTM_PFX "[TTM] "
 
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 
 #endif /* _TTM_MODULE_H_ */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1942
retrieving revision 1.1943
diff -u -p -r1.1942 -r1.1943
--- kernel.spec	30 Nov 2009 23:59:38 -0000	1.1942
+++ kernel.spec	1 Dec 2009 04:13:23 -0000	1.1943
@@ -710,7 +710,7 @@ Patch1586: linux-2.6-virtio_blk-add-supp
 
 # nouveau + drm fixes
 Patch1810: kms-offb-handoff.patch
-Patch1812: drm-next-4e16e5a5.patch
+Patch1812: drm-next-b390f944.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1420,7 +1420,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch kms-offb-handoff.patch
-ApplyPatch drm-next-4e16e5a5.patch
+ApplyPatch drm-next-b390f944.patch
 ApplyPatch drm-conservative-fallback-modes.patch
 ApplyPatch drm-edid-retry.patch
 ApplyPatch drm-edid-header-fixup.patch
@@ -2153,6 +2153,9 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-157
+- div/0 fix harder (#540593) - also ignore unposted GPUs with no BIOS
+
 * Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-156
 - drm-next: fixes LVDS resume on r4xx, div/0 on no bios (#540593)
   lockup on tv-out only startup.


--- drm-next-4e16e5a5.patch DELETED ---



From huzaifas at fedoraproject.org  Tue Dec  1 05:03:26 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue,  1 Dec 2009 05:03:26 +0000 (UTC)
Subject: File goffice-0.7.16.tar.bz2 uploaded to lookaside cache by huzaifas
Message-ID: <20091201050326.847C010FC47@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for goffice:

cbd33205a734c7eb857d892f91a4fe33  goffice-0.7.16.tar.bz2



From huzaifas at fedoraproject.org  Tue Dec  1 05:03:53 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue,  1 Dec 2009 05:03:53 +0000 (UTC)
Subject: rpms/goffice/devel sources,1.10,1.11 goffice.spec,1.25,1.26
Message-ID: <20091201050353.BBE5011C00DE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Modified Files:
	sources goffice.spec 
Log Message:
new version upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	31 Jan 2009 13:09:48 -0000	1.10
+++ sources	1 Dec 2009 05:03:53 -0000	1.11
@@ -1 +1 @@
-92e51878b9cd9c2fa954953d708f2c47  goffice-0.6.6.tar.bz2
+cbd33205a734c7eb857d892f91a4fe33  goffice-0.7.16.tar.bz2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- goffice.spec	21 Oct 2009 09:41:10 -0000	1.25
+++ goffice.spec	1 Dec 2009 05:03:53 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           goffice         
-Version:        0.6.6
-Release:        4%{?dist}
+Version:        0.7.16
+Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -8,9 +8,6 @@ Group:          System Environment/Libra
 License:        GPLv2
 URL:            http://freshmeat.net/projects/goffice/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
-Patch0:         goffice-0.6.6-backport-20090219.patch
-Patch1:         goffice-0.6.6-backport-20090306.patch
-Patch2:         goffice-0.6.6-backport-20090501.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgsf-gnome-devel     >= 1.13.3
 BuildRequires:  libgnomeui-devel       >= 2.0.0
@@ -38,9 +35,6 @@ Development libraries for goffice
 
 %prep
 %setup -q
-%patch0 -p1 -b .backport-20090219
-%patch1 -p1 -b .backport-20090306
-%patch2 -p1 -b .backport-20090501
 
 
 %build
@@ -76,13 +70,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/goffice/
 
 %files devel
-%{_includedir}/libgoffice-0.6/
-%{_libdir}/pkgconfig/libgoffice-0.6.pc
+%{_includedir}/libgoffice-0.8/
+%{_libdir}/pkgconfig/libgoffice-0.8.pc
 %{_libdir}/*.so
-%{_datadir}/gtk-doc/html/goffice-0.6/
+%{_datadir}/gtk-doc/html/goffice-0.8/
 
 
 %changelog
+* Mon Nov 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 0.7.16-1
+New build
 * Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> - 0.6.6-4
 - Applied 3 patches from the 0.6 branch (#503068, #505001)
 



From huzaifas at fedoraproject.org  Tue Dec  1 05:06:51 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue,  1 Dec 2009 05:06:51 +0000 (UTC)
Subject: rpms/goffice/devel goffice-0.6.6-backport-20090219.patch, 1.1,
	NONE goffice-0.6.6-backport-20090306.patch, 1.1,
	NONE goffice-0.6.6-backport-20090501.patch, 1.1, NONE
Message-ID: <20091201050651.B7A2111C00DE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Removed Files:
	goffice-0.6.6-backport-20090219.patch 
	goffice-0.6.6-backport-20090306.patch 
	goffice-0.6.6-backport-20090501.patch 
Log Message:
new upstream version


--- goffice-0.6.6-backport-20090219.patch DELETED ---


--- goffice-0.6.6-backport-20090306.patch DELETED ---


--- goffice-0.6.6-backport-20090501.patch DELETED ---



From huzaifas at fedoraproject.org  Tue Dec  1 05:11:20 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue,  1 Dec 2009 05:11:20 +0000 (UTC)
Subject: rpms/goffice/devel goffice.spec,1.26,1.27
Message-ID: <20091201051120.84A5111C00DE@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Modified Files:
	goffice.spec 
Log Message:
version bump


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- goffice.spec	1 Dec 2009 05:03:53 -0000	1.26
+++ goffice.spec	1 Dec 2009 05:11:20 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           goffice         
 Version:        0.7.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -77,8 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Nov 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 0.7.16-1
-New build
+* Tue Dec 01 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 0.7.16-2
+- New build
+- Version bump
 * Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> - 0.6.6-4
 - Applied 3 patches from the 0.6 branch (#503068, #505001)
 



From pbrobinson at fedoraproject.org  Tue Dec  1 05:35:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  1 Dec 2009 05:35:13 +0000 (UTC)
Subject: File tangogps-0.99.1.tar.gz uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091201053513.BC1D310F8DA@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tangogps:

bf99c9510481681651434eb943fe3294  tangogps-0.99.1.tar.gz



From pbrobinson at fedoraproject.org  Tue Dec  1 05:36:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  1 Dec 2009 05:36:45 +0000 (UTC)
Subject: rpms/tangogps/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 tangogps.spec, 1.9, 1.10
Message-ID: <20091201053645.EDB9911C00DE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
 - New upstream 0.99.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Nov 2009 09:21:17 -0000	1.7
+++ .cvsignore	1 Dec 2009 05:36:45 -0000	1.8
@@ -1 +1 @@
-tangogps-0.9.9.tar.gz
+tangogps-0.99.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Nov 2009 09:21:17 -0000	1.7
+++ sources	1 Dec 2009 05:36:45 -0000	1.8
@@ -1 +1 @@
-0ff6bde0f33b712d066cea08934d4808  tangogps-0.9.9.tar.gz
+bf99c9510481681651434eb943fe3294  tangogps-0.99.1.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/tangogps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tangogps.spec	5 Nov 2009 09:21:17 -0000	1.9
+++ tangogps.spec	1 Dec 2009 05:36:45 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           tangogps
-Version:        0.9.9
+Version:        0.99.1
 Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Mon Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.1-1
+- New upstream 0.99.1 release
+
 * Thu Nov  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.9-1
 - New upstream 0.9.9 release
 



From kevin at fedoraproject.org  Tue Dec  1 05:47:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  1 Dec 2009 05:47:05 +0000 (UTC)
Subject: File munin_1.4.0.tar.gz uploaded to lookaside cache by kevin
Message-ID: <20091201054705.D1FB910F886@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for munin:

95be0e6eb98c4c7b2a4f2f922b358414  munin_1.4.0.tar.gz



From kevin at fedoraproject.org  Tue Dec  1 05:47:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  1 Dec 2009 05:47:51 +0000 (UTC)
Subject: rpms/munin/devel munin-1.4.0-config.patch, NONE, 1.1 munin.spec,
	1.27, 1.28 sources, 1.4, 1.5 .cvsignore, 1.4,
	1.5 munin-1.2.4-conf.patch, 1.1, NONE munin-1.2.4-cron.patch,
	1.1, NONE munin-1.2.5-amp-degree.patch, 1.1,
	NONE munin-1.2.5-nf-conntrack.patch, 1.1,
	NONE munin-1.2.6-hddtemp_smartctl-spinup.patch, 1.1,
	NONE munin-1.2.6-ntp_offset.patch, 1.1, NONE
Message-ID: <20091201054751.2981411C00DE@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.4.0-config.patch 
Removed Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
	munin-1.2.5-amp-degree.patch munin-1.2.5-nf-conntrack.patch 
	munin-1.2.6-hddtemp_smartctl-spinup.patch 
	munin-1.2.6-ntp_offset.patch 
Log Message:
Update to 1.4.0


munin-1.4.0-config.patch:
 dists/redhat/Makefile.config |    2 +-
 master/munin.conf.in         |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE munin-1.4.0-config.patch ---
diff -Nur munin-1.4.0.orig/dists/redhat/Makefile.config munin-1.4.0/dists/redhat/Makefile.config
--- munin-1.4.0.orig/dists/redhat/Makefile.config	2009-11-27 04:17:14.000000000 -0700
+++ munin-1.4.0/dists/redhat/Makefile.config	2009-11-30 22:28:20.000000000 -0700
@@ -23,7 +23,7 @@
 VERSION    = $(shell cat RELEASE)
 USER       = munin
 GROUP      = munin
-PLUGINUSER = nobody
+PLUGINUSER = munin
 GETENT     = $(shell which getent || which true 2>/dev/null)
 CHECKUSER  = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
 CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
diff -Nur munin-1.4.0.orig/master/munin.conf.in munin-1.4.0/master/munin.conf.in
--- munin-1.4.0.orig/master/munin.conf.in	2009-11-27 04:17:18.000000000 -0700
+++ munin-1.4.0/master/munin.conf.in	2009-11-30 22:28:20.000000000 -0700
@@ -15,7 +15,7 @@
 
 # (Exactly one) directory to include all files from.
 #
-includedir @@CONFDIR@@/munin-conf.d
+# includedir @@CONFDIR@@/munin-conf.d
 
 # Make graphs show values per minute instead of per second
 #graph_period minute
@@ -57,7 +57,7 @@
 #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- munin.spec	25 Jul 2009 15:24:58 -0000	1.27
+++ munin.spec	1 Dec 2009 05:47:50 -0000	1.28
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.6
-Release:   10%{?dist}
+Version:   1.4.0
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -8,19 +8,28 @@ URL:       http://munin.projects.linpro.
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+
+Patch1: munin-1.4.0-config.patch
+
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
 Source3: munin-node.logrotate
 Source4: munin.logrotate
 Source5: nf_conntrack
 Source6: munin-1.2.6-postfix-config
-Patch1: munin-1.2.4-conf.patch
-Patch2: munin-1.2.5-nf-conntrack.patch
-Patch3: munin-1.2.5-amp-degree.patch
-Patch4: munin-1.2.6-ntp_offset.patch
-Patch5: munin-1.2.6-hddtemp_smartctl-spinup.patch
+
 BuildArchitectures: noarch
+
+BuildRequires: perl-Module-Build
+# needed for hostname for the defaut config
+BuildRequires: net-tools
+BuildRequires: java-devel >= 1.6
+BuildRequires: mx4j
+BuildRequires: jpackage-utils
+BuildRequires: perl-Net-SNMP
+
+Requires: %{name}-common = %{version}
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
@@ -46,6 +55,7 @@ RRDtool. 
 Group: System Environment/Daemons
 Summary: Network-wide graphing framework (node)
 BuildArchitectures: noarch
+Requires: %{name}-common = %{version}
 Requires: perl-Net-Server
 Requires: procps >= 2.0.7
 Requires: sysstat, /usr/bin/which, hdparm
@@ -76,30 +86,47 @@ SNMP or similar technology.
 Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
 RRDtool. 
 
+%package common
+Group: System Environment/Daemons
+Summary: Network-wide graphing framework (common files)
+BuildArchitectures: noarch
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description common
+Munin is a highly flexible and powerful solution used to create graphs of
+virtually everything imaginable throughout your network, while still
+maintaining a rattling ease of installation and configuration.
+
+This package contains common files that are used by both the server (munin)
+and node (munin-node) packages. 
+
+%package java-plugins
+Group: System Environment/Daemons
+Summary: java-plugins for munin
+Requires: %{name}-node = %{version}
+BuildArchitectures: noarch
+
+%description java-plugins
+java-plugins for munin-node. 
+
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
-
-# htmldoc and html2text are not available for Red Hat. Quick hack with perl:
-# Skip the PDFs.
-perl -pi -e 's,htmldoc munin,cat munin, or s,html(2text|doc),# $&,' Makefile
-perl -pi -e 's,\$\(INSTALL.+\.(pdf|txt) \$\(DOCDIR,# $&,' Makefile
-make 	CONFIG=dists/redhat/Makefile.config build
+export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
+make 	CONFIG=dists/redhat/Makefile.config
 
 %install
 
 ## Node
-make 	CONFIG=dists/redhat/Makefile.config \
-	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
+make	CONFIG=dists/redhat/Makefile.config \
+	JAVALIBDIR=%{buildroot}%{_datadir}/java \
+	PREFIX=%{buildroot}%{_prefix} \
+ 	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
 	MANDIR=%{buildroot}%{_mandir} \
 	DESTDIR=%{buildroot} \
-    	install-main install-node install-node-plugins install-doc install-man
+	install
 
 mkdir -p %{buildroot}/etc/rc.d/init.d
 mkdir -p %{buildroot}/etc/munin/plugins
@@ -123,17 +150,16 @@ install -m0644 dists/tarball/plugins.con
 rm -f %{buildroot}/usr/share/munin/plugins/sybase_space
 
 ## Server
-make 	CONFIG=dists/redhat/Makefile.config \
-	DESTDIR=%{buildroot} \
-	install-main
 
 mkdir -p %{buildroot}/var/www/html/munin
 mkdir -p %{buildroot}/var/log/munin
 mkdir -p %{buildroot}/etc/cron.d
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
 
 install -m 0644 dists/redhat/munin.cron.d %{buildroot}/etc/cron.d/munin
-install -m 0644 server/style.css %{buildroot}/var/www/html/munin
 install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog
+cp -a master/www/* %{buildroot}/var/www/html/munin/
+
 # install config for sendmail under fedora
 install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
 # install config for hddtemp_smartctl
@@ -146,15 +172,11 @@ install -m 0644 %{SOURCE5} %{buildroot}/
 # install config for postfix under fedora
 install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
 
-# fix MUNIN_LIBDIR issue. 
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/ps_
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/multips
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/df_abs
-
 # Use font from bitstream-vera-fonts-sans-mono
 rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
 ln -s /usr/share/fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,33 +213,27 @@ exit 0
 %doc %{_docdir}/%{name}-%{version}/
 %{_bindir}/munin-cron
 %{_bindir}/munindoc
+%{_bindir}/munin-check
 %dir %{_datadir}/munin
 %{_datadir}/munin/munin-graph
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
 %{_datadir}/munin/VeraMono.ttf
-%{perl_vendorlib}/Munin.pm
-%dir %{perl_vendorlib}/Munin
-/var/www/html/munin/cgi/munin-cgi-graph
+%{perl_vendorlib}/Munin/Master
 %dir /etc/munin/templates
 %dir /etc/munin
 %config(noreplace) /etc/munin/templates/*
 %config(noreplace) /etc/cron.d/munin
 %config(noreplace) /etc/munin/munin.conf
 %config(noreplace) /etc/logrotate.d/munin
-
 %attr(-, munin, munin) %dir /var/lib/munin
+%attr(-, nobody, munin) %dir /var/lib/munin/plugin-state
 %attr(-, munin, munin) %dir /var/run/munin
 %attr(-, munin, munin) %dir /var/log/munin
-%attr(-, munin, munin) %dir /var/www/html/munin
+%attr(-, munin, munin) /var/www/html/munin
 %attr(-, root, root) %dir /var/www/html/munin/cgi
-%attr(-, root, root) /var/www/html/munin/style.css
-%doc %{_mandir}/man8/munin-graph*
-%doc %{_mandir}/man8/munin-update*
-%doc %{_mandir}/man8/munin-limits*
-%doc %{_mandir}/man8/munin-html*
-%doc %{_mandir}/man8/munin-cron*
+%doc %{_mandir}/man8/munin*
 %doc %{_mandir}/man5/munin.conf*
 
 %files node
@@ -230,12 +246,10 @@ exit 0
 %config(noreplace) /etc/munin/plugin-conf.d/nf_conntrack
 %config(noreplace) /etc/munin/plugin-conf.d/postfix
 %config(noreplace) /etc/logrotate.d/munin-node
-%{perl_vendorlib}/Munin/Plugin.pm
 /etc/rc.d/init.d/munin-node
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%{_sbindir}/munin-node-configure-snmp
 %attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
@@ -244,11 +258,32 @@ exit 0
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/
 %doc %{_docdir}/%{name}-%{version}/
-%doc %{_mandir}/man8/munin-run*
-%doc %{_mandir}/man8/munin-node*
 %doc %{_mandir}/man5/munin-node*
+%doc %{_mandir}/man3/Munin*
+%doc %{_mandir}/man1/munin*
+%{perl_vendorlib}/Munin/Node
+%{perl_vendorlib}/Munin/Plugin*
+
+%files common
+%defattr(-, root, root)
+%dir %{perl_vendorlib}/Munin
+%{perl_vendorlib}/Munin/Common
+
+%files java-plugins
+%defattr(-, root, root)
+%{_datadir}/java/%{name}-jmx-plugins.jar
 
 %changelog
+* Sat Nov 28 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-1
+- Update to final 1.4.0 version
+
+* Sat Nov 21 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-0.1.beta
+- Update to beta 1.4.0 version. 
+- Add common subpackage for common files. 
+
+* Sun Nov 08 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-0.1.alpha
+- Initial alpha version of 1.4.0 
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Jun 2008 21:42:17 -0000	1.4
+++ sources	1 Dec 2009 05:47:50 -0000	1.5
@@ -1 +1 @@
-45f84d58f80642ce914f147232f0d396  munin_1.2.6.tar.gz
+95be0e6eb98c4c7b2a4f2f922b358414  munin_1.4.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Jun 2008 21:42:17 -0000	1.4
+++ .cvsignore	1 Dec 2009 05:47:50 -0000	1.5
@@ -1 +1 @@
-munin_1.2.6.tar.gz
+munin_1.4.0.tar.gz


--- munin-1.2.4-conf.patch DELETED ---


--- munin-1.2.4-cron.patch DELETED ---


--- munin-1.2.5-amp-degree.patch DELETED ---


--- munin-1.2.5-nf-conntrack.patch DELETED ---


--- munin-1.2.6-hddtemp_smartctl-spinup.patch DELETED ---


--- munin-1.2.6-ntp_offset.patch DELETED ---



From pbrobinson at fedoraproject.org  Tue Dec  1 06:16:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  1 Dec 2009 06:16:01 +0000 (UTC)
Subject: File nbtk-1.2.3.tar.bz2 uploaded to lookaside cache by pbrobinson
Message-ID: <20091201061601.A257310F926@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nbtk:

f33f8178d837a62b8954e1789ea32810  nbtk-1.2.3.tar.bz2



From kyle at fedoraproject.org  Tue Dec  1 06:17:13 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  1 Dec 2009 06:17:13 +0000 (UTC)
Subject: File patch-2.6.32-rc8-git2.bz2 uploaded to lookaside cache by kyle
Message-ID: <20091201061713.B2DBE10F927@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kernel:

4d90333761ee4d8318a0c3415452304b  patch-2.6.32-rc8-git2.bz2



From pbrobinson at fedoraproject.org  Tue Dec  1 06:18:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  1 Dec 2009 06:18:03 +0000 (UTC)
Subject: rpms/nbtk/devel .cvsignore, 1.13, 1.14 nbtk.spec, 1.35, 1.36 sources,
	1.14, 1.15
Message-ID: <20091201061803.BA59111C00DE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore nbtk.spec sources 
Log Message:
- New upstream 1.2.3 stable release, move to a proper tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	19 Nov 2009 12:20:47 -0000	1.13
+++ .cvsignore	1 Dec 2009 06:18:02 -0000	1.14
@@ -1 +1 @@
-nbtk-1.2.1.tar.bz2
+nbtk-1.2.3.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nbtk.spec	19 Nov 2009 12:20:48 -0000	1.35
+++ nbtk.spec	1 Dec 2009 06:18:02 -0000	1.36
@@ -1,12 +1,12 @@
 Name:           nbtk
-Version:        1.2.1
+Version:        1.2.3
 Release:        1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://moblin.org/projects/netbook-toolkit-nbtk
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Source0:        http://idownload.moblin.org/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel >= 1.0.0
@@ -15,14 +15,10 @@ BuildRequires: gobject-introspection-dev
 BuildRequires: gir-repository-devel
 BuildRequires: gtk2-devel
 BuildRequires: libccss-devel
-BuildRequires: pkgconfig
 BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: gtk-doc
 
-# Require these because the git tarball doesn't have the configure built
-BuildRequires: libtool
-
 Obsoletes: mux < 0.4
 Provides: mux = 0.4
 
@@ -44,10 +40,6 @@ Files for development with %{name}.
 %prep
 %setup -q
 
-# Don't run configure from autogen.sh
-sed -i '/configure/d' autogen.sh
-./autogen.sh
-
 %build
 autoreconf
 %configure --enable-gtk-doc --disable-static
@@ -86,6 +78,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 1.2.3-1
+- New upstream 1.2.3 stable release, move to a proper tarball
+
 * Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 1.2.1-1
 - New upstream 1.2.1 stable release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	19 Nov 2009 12:20:48 -0000	1.14
+++ sources	1 Dec 2009 06:18:02 -0000	1.15
@@ -1 +1 @@
-19670da5ae1633a54c80b9b712c7dbce  nbtk-1.2.1.tar.bz2
+f33f8178d837a62b8954e1789ea32810  nbtk-1.2.3.tar.bz2



From kyle at fedoraproject.org  Tue Dec  1 06:28:51 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  1 Dec 2009 06:28:51 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc8-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1145, 1.1146 config-generic, 1.339, 1.340 kernel.spec, 1.1857,
	1.1858 sources, 1.1104, 1.1105 upstream, 1.1017,
	1.1018 crypto-2.6.git-e8edb3cbd7dd8acf6c748a02d06ec1d82c4124ea.patch, 
	1.1, NONE patch-2.6.32-rc8-git1.bz2.sign, 1.1, NONE
Message-ID: <20091201062851.49DBD11C00DE@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc8-git2.bz2.sign 
Removed Files:
	crypto-2.6.git-e8edb3cbd7dd8acf6c748a02d06ec1d82c4124ea.patch 
	patch-2.6.32-rc8-git1.bz2.sign 
Log Message:
* Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.60.rc8.git2
- 2.6.32-rc8-git2 daily snapshot
- nuke include/generated nuke-age since the patch was reverted upstream
- config changes:
 - generic:
  +CONFIG_FSCACHE_OBJECT_LIST=y
  +CONFIG_SLOW_WORK_PROC=y



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

iD8DBQBLFFzayGugalF9Dw4RAsPbAJ40nM85iM+SsOaF3x14RWv4F4ChZACfVmGz
ifu5XVMiHG/Za1Ed68oVIxE=
=DiJa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1145
retrieving revision 1.1146
diff -u -p -r1.1145 -r1.1146
--- .cvsignore	20 Nov 2009 23:02:09 -0000	1.1145
+++ .cvsignore	1 Dec 2009 06:28:49 -0000	1.1146
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc8.bz2
-patch-2.6.32-rc8-git1.bz2
+patch-2.6.32-rc8-git2.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -p -r1.339 -r1.340
--- config-generic	28 Nov 2009 06:49:32 -0000	1.339
+++ config-generic	1 Dec 2009 06:28:50 -0000	1.340
@@ -3190,6 +3190,7 @@ CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
 # CONFIG_FSCACHE_HISTOGRAM is not set
 # CONFIG_FSCACHE_DEBUG is not set
+CONFIG_FSCACHE_OBJECT_LIST=y
 
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
@@ -4094,6 +4095,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_PAGE_POISONING is not set
 
 CONFIG_SLOW_WORK=y
+CONFIG_SLOW_WORK_PROC=y
 
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRASH is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1857
retrieving revision 1.1858
diff -u -p -r1.1857 -r1.1858
--- kernel.spec	30 Nov 2009 19:20:53 -0000	1.1857
+++ kernel.spec	1 Dec 2009 06:28:50 -0000	1.1858
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # 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
@@ -719,9 +719,6 @@ Patch12010: linux-2.6-dell-laptop-rfkill
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
-# Fix oops in VIA Padlock driver.
-Patch12020: crypto-2.6.git-e8edb3cbd7dd8acf6c748a02d06ec1d82c4124ea.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1328,9 +1325,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 # Patches headed upstream
 ApplyPatch linux-2.6-rfkill-all.patch
 
-# Fix oops in VIA Padlock driver.
-ApplyPatch crypto-2.6.git-e8edb3cbd7dd8acf6c748a02d06ec1d82c4124ea.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1363,8 +1357,6 @@ do
   make ARCH=$Arch %{oldconfig_target} > /dev/null
   echo "# $Arch" > configs/$i
   cat .config >> configs/$i
-  rm -f include/generated/kernel.arch
-  rm -f include/generated/kernel.cross
 done
 # end of kernel config
 %endif
@@ -1988,6 +1980,14 @@ fi
 # and build.
 
 %changelog
+* Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.60.rc8.git2
+- 2.6.32-rc8-git2 daily snapshot
+- nuke include/generated nuke-age since the patch was reverted upstream
+- config changes:
+ - generic:
+  +CONFIG_FSCACHE_OBJECT_LIST=y
+  +CONFIG_SLOW_WORK_PROC=y
+
 * Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com>
 - drm-i915-fix-sync-to-vbl-when-vga-is-off.patch: add, (rhbz#541670) 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1104
retrieving revision 1.1105
diff -u -p -r1.1104 -r1.1105
--- sources	20 Nov 2009 23:02:10 -0000	1.1104
+++ sources	1 Dec 2009 06:28:50 -0000	1.1105
@@ -1,3 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 043dae863c41ea8d56dc3da55e241069  patch-2.6.32-rc8.bz2
-9c35d36a789f0ac712f3b0139f73ad6c  patch-2.6.32-rc8-git1.bz2
+4d90333761ee4d8318a0c3415452304b  patch-2.6.32-rc8-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1017
retrieving revision 1.1018
diff -u -p -r1.1017 -r1.1018
--- upstream	20 Nov 2009 23:02:10 -0000	1.1017
+++ upstream	1 Dec 2009 06:28:50 -0000	1.1018
@@ -1,3 +1,3 @@
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc8.bz2
-patch-2.6.32-rc8-git1.bz2
+patch-2.6.32-rc8-git2.bz2


--- crypto-2.6.git-e8edb3cbd7dd8acf6c748a02d06ec1d82c4124ea.patch DELETED ---


--- patch-2.6.32-rc8-git1.bz2.sign DELETED ---



From pbrobinson at fedoraproject.org  Tue Dec  1 06:33:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  1 Dec 2009 06:33:12 +0000 (UTC)
Subject: rpms/tangogps/F-12 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 tangogps.spec, 1.9, 1.10
Message-ID: <20091201063312.E05D011C00DE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10910

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
 - New upstream 0.99.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Nov 2009 09:40:56 -0000	1.7
+++ .cvsignore	1 Dec 2009 06:33:12 -0000	1.8
@@ -1 +1 @@
-tangogps-0.9.9.tar.gz
+tangogps-0.99.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Nov 2009 09:40:56 -0000	1.7
+++ sources	1 Dec 2009 06:33:12 -0000	1.8
@@ -1 +1 @@
-0ff6bde0f33b712d066cea08934d4808  tangogps-0.9.9.tar.gz
+bf99c9510481681651434eb943fe3294  tangogps-0.99.1.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-12/tangogps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tangogps.spec	5 Nov 2009 09:40:56 -0000	1.9
+++ tangogps.spec	1 Dec 2009 06:33:12 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           tangogps
-Version:        0.9.9
+Version:        0.99.1
 Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Mon Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.1-1
+- New upstream 0.99.1 release
+
 * Thu Nov  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.9-1
 - New upstream 0.9.9 release
 



From pbrobinson at fedoraproject.org  Tue Dec  1 06:41:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  1 Dec 2009 06:41:37 +0000 (UTC)
Subject: rpms/tangogps/F-11 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 tangogps.spec, 1.8, 1.9
Message-ID: <20091201064138.2252C11C00DE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
 - New upstream 0.99.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Nov 2009 09:48:41 -0000	1.7
+++ .cvsignore	1 Dec 2009 06:41:36 -0000	1.8
@@ -1 +1 @@
-tangogps-0.9.9.tar.gz
+tangogps-0.99.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Nov 2009 09:48:41 -0000	1.7
+++ sources	1 Dec 2009 06:41:36 -0000	1.8
@@ -1 +1 @@
-0ff6bde0f33b712d066cea08934d4808  tangogps-0.9.9.tar.gz
+bf99c9510481681651434eb943fe3294  tangogps-0.99.1.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/tangogps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tangogps.spec	5 Nov 2009 09:48:41 -0000	1.8
+++ tangogps.spec	1 Dec 2009 06:41:36 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           tangogps
-Version:        0.9.9
+Version:        0.99.1
 Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Mon Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.1-1
+- New upstream 0.99.1 release
+
 * Thu Nov  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.9-1
 - New upstream 0.9.9 release
 



From pbrobinson at fedoraproject.org  Tue Dec  1 06:52:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  1 Dec 2009 06:52:27 +0000 (UTC)
Subject: rpms/nbtk/F-12 .cvsignore, 1.12, 1.13 nbtk.spec, 1.34, 1.35 sources,
	1.13, 1.14
Message-ID: <20091201065227.4A57011C00DE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16364

Modified Files:
	.cvsignore nbtk.spec sources 
Log Message:
- New upstream 1.2.3 stable release, move to a proper tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Nov 2009 12:48:01 -0000	1.12
+++ .cvsignore	1 Dec 2009 06:52:26 -0000	1.13
@@ -1 +1 @@
-nbtk-1.2.1.tar.bz2
+nbtk-1.2.3.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/nbtk.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- nbtk.spec	19 Nov 2009 12:48:01 -0000	1.34
+++ nbtk.spec	1 Dec 2009 06:52:26 -0000	1.35
@@ -1,12 +1,12 @@
 Name:           nbtk
-Version:        1.2.1
+Version:        1.2.3
 Release:        1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://moblin.org/projects/netbook-toolkit-nbtk
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Source0:        http://download.moblin.org/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel >= 1.0.0
@@ -15,14 +15,10 @@ BuildRequires: gobject-introspection-dev
 BuildRequires: gir-repository-devel
 BuildRequires: gtk2-devel
 BuildRequires: libccss-devel
-BuildRequires: pkgconfig
 BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: gtk-doc
 
-# Require these because the git tarball doesn't have the configure built
-BuildRequires: libtool
-
 Obsoletes: mux < 0.4
 Provides: mux = 0.4
 
@@ -44,10 +40,6 @@ Files for development with %{name}.
 %prep
 %setup -q
 
-# Don't run configure from autogen.sh
-sed -i '/configure/d' autogen.sh
-./autogen.sh
-
 %build
 autoreconf
 %configure --enable-gtk-doc --disable-static
@@ -86,6 +78,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 1.2.3-1
+- New upstream 1.2.3 stable release, move to a proper tarball
+
 * Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 1.2.1-1
 - New upstream 1.2.1 stable release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	19 Nov 2009 12:48:01 -0000	1.13
+++ sources	1 Dec 2009 06:52:26 -0000	1.14
@@ -1 +1 @@
-19670da5ae1633a54c80b9b712c7dbce  nbtk-1.2.1.tar.bz2
+f33f8178d837a62b8954e1789ea32810  nbtk-1.2.3.tar.bz2



From kyle at fedoraproject.org  Tue Dec  1 06:58:36 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  1 Dec 2009 06:58:36 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1858,1.1859
Message-ID: <20091201065836.CD33B11C00DE@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	kernel.spec 
Log Message:
* Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.61.rc8.git2
- fix-9p-fscache.patch: fix build.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1858
retrieving revision 1.1859
diff -u -p -r1.1858 -r1.1859
--- kernel.spec	1 Dec 2009 06:28:50 -0000	1.1858
+++ kernel.spec	1 Dec 2009 06:58:35 -0000	1.1859
@@ -719,6 +719,8 @@ Patch12010: linux-2.6-dell-laptop-rfkill
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
+Patch12014: fix-9p-fscache.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1325,6 +1327,9 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 # Patches headed upstream
 ApplyPatch linux-2.6-rfkill-all.patch
 
+# fix 9p compile
+ApplyPatch fix-9p-fscache.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1980,6 +1985,9 @@ fi
 # and build.
 
 %changelog
+* Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.61.rc8.git2
+- fix-9p-fscache.patch: fix build.
+
 * Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.60.rc8.git2
 - 2.6.32-rc8-git2 daily snapshot
 - nuke include/generated nuke-age since the patch was reverted upstream



From kyle at fedoraproject.org  Tue Dec  1 07:00:10 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  1 Dec 2009 07:00:10 +0000 (UTC)
Subject: rpms/kernel/devel fix-9p-fscache.patch,NONE,1.1
Message-ID: <20091201070010.E1FAA11C0376@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Added Files:
	fix-9p-fscache.patch 
Log Message:
actually add the sodding patch

fix-9p-fscache.patch:
 cache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-9p-fscache.patch ---
Subject: [PATCH] 9p: fscache: fix build breakage introduced by 201a15428bd54f83eccec8b7c64a04b8f9431204

While building 2.6.32-rc8-git2 for Fedora I noticed the following thinko in
201a15428bd54f83eccec8b7c64a04b8f9431204. Patch below looks to be correct?

Signed-off-by: Kyle McMartin <kyle at redhat.com>

---
diff --git a/fs/9p/cache.c b/fs/9p/cache.c
index bcc5357..e777961 100644
--- a/fs/9p/cache.c
+++ b/fs/9p/cache.c
@@ -343,7 +343,7 @@ int __v9fs_fscache_release_page(struct page *page, gfp_t gfp)
 
 	BUG_ON(!vcookie->fscache);
 
-	return fscache_maybe_release_page(vnode->cache, page, gfp);
+	return fscache_maybe_release_page(vcookie->fscache, page, gfp);
 }
 
 void __v9fs_fscache_invalidate_page(struct page *page)



From cchance at fedoraproject.org  Tue Dec  1 07:13:55 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  1 Dec 2009 07:13:55 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.17,1.18
Message-ID: <20091201071355.BB34711C00DE@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22675

Modified Files:
	cjkuni-fonts.spec 
Log Message:
fixes to Mailhot's font audit



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cjkuni-fonts.spec	11 Nov 2009 04:19:33 -0000	1.17
+++ cjkuni-fonts.spec	1 Dec 2009 07:13:53 -0000	1.18
@@ -23,8 +23,8 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     31%{?dist}
-Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
+Release:     32%{?dist}
+Summary:     Chinese Unicode TrueType fonts in Ming and Kai face
 License:     Arphic
 Group:       User Interface/X
 URL:         http://www.freedesktop.org/wiki/Software/CJKUnifonts
@@ -47,7 +47,7 @@ BuildRequires:    fontpackages-devel >= 
 %package -n %{fontname}-uming-fonts
 Summary:      Chinese Unicode TrueType font in Ming face.
 Group:        User Interface/X
-Obsoletes:    %{fontname}-fonts-common
+Obsoletes:    %{fontname}-fonts-common < 0.2.20080216.1-32
 Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
@@ -56,6 +56,7 @@ Obsoletes:    cjkunifonts-uming < 0.2.20
 CJK Unifonts in Ming face.
 
 %files -n %{fontname}-uming-fonts
+%defattr(0644,root,root,0755)
 %doc ../%{umingbuilddir}/license
 %doc ../%{umingbuilddir}/CONTRIBUTERS
 %doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
@@ -80,7 +81,7 @@ CJK Unifonts in Ming face.
 %package -n %{fontname}-ukai-fonts
 Summary:      Chinese Unicode TrueType font in Kai face.
 Group:        User Interface/X
-Obsoletes:    %{fontname}-fonts-common
+Obsoletes:    %{fontname}-fonts-common < 0.2.20080216.1-32
 Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
@@ -89,6 +90,7 @@ Obsoletes:    cjkunifonts-ukai < 0.2.200
 CJK Unifonts in Kai face.
 
 %files -n %{fontname}-ukai-fonts
+%defattr(0644,root,root,0755)
 %doc ../%{ukaibuilddir}/license
 %doc ../%{ukaibuilddir}/CONTRIBUTERS
 %doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
@@ -118,7 +120,7 @@ Requires:     ghostscript >= 8.63-4
 Requires:     %{fontname}-uming-fonts = %{version}-%{release}
 Requires:     %{fontname}-ukai-fonts = %{version}-%{release}
 Conflicts:    cjkuni-fonts-common <= 0.2.20080216.1-19
-Obsoletes:    cjkuni-fonts-common
+Obsoletes:    cjkuni-fonts-common < 0.2.20080216.1-32
 
 %description -n %{fontname}-fonts-ghostscript
 %common_desc
@@ -237,19 +239,25 @@ cd ../
 %__ln_s %{ukaidir}/ %{buildroot}%{catalogue}/%{name}-ukai
 
 # backward compat to obsoleted ttf
-%__install -m 0755 -d %{buildroot}%{cncompatdir}
-%__install -m 0755 -d %{buildroot}%{twcompatdir}
-%__ln_s %{umingdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
-%__ln_s %{umingdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
+#%__install -m 0755 -d %{buildroot}%{cncompatdir}
+#%__install -m 0755 -d %{buildroot}%{twcompatdir}
+#%__ln_s %{umingdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
+#%__ln_s %{umingdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
 
 # backward compt to transition dir
-%__ln_s %{umingdir}/ %{buildroot}%{umingtransdir}
-%__ln_s %{ukaidir}/ %{buildroot}%{ukaitransdir}
+#%__ln_s %{umingdir}/ %{buildroot}%{umingtransdir}
+#%__ln_s %{ukaidir}/ %{buildroot}%{ukaitransdir}
 
 %clean
 %__rm -fr %{buildroot}
 
 %changelog
+* Wed Dec 01 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-32
+- Mailhot's font audit:
+ - Add obsolete package versions.
+ - Add default attributes.
+ - Remove symlinks.
+
 * Wed Nov 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 0.2.20080216.1-31
 - Use latin font to display common ascii in Chinese string 
 



From cchance at fedoraproject.org  Tue Dec  1 07:29:30 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  1 Dec 2009 07:29:30 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.18,1.19
Message-ID: <20091201072930.A914111C00DE@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27289

Modified Files:
	cjkuni-fonts.spec 
Log Message:
remove -compat



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- cjkuni-fonts.spec	1 Dec 2009 07:13:53 -0000	1.18
+++ cjkuni-fonts.spec	1 Dec 2009 07:29:29 -0000	1.19
@@ -23,7 +23,7 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     32%{?dist}
+Release:     33%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face
 License:     Arphic
 Group:       User Interface/X
@@ -137,25 +137,25 @@ CJK Unifonts ghostscript files.
 %{gsdir}/CIDFnmap.zh_TW
 %{gsdir}/CIDFnmap.zh_CN
 
-%package -n %{fontname}-fonts-compat
-Summary:      Chinese Unicode TrueType font compatibility files.
-Group:        User Interface/X
-Requires:     %{fontname}-uming-fonts = %{version}-%{release}
-Obsoletes:    cjkunifonts-compat < 0.2.20080216.1-16 
-
-%description -n %{fontname}-fonts-compat
-%common_desc
-
-CJK Unifonts compatibility files.
-
-%files -n %{fontname}-fonts-compat
-%defattr(0644,root,root,0755)
-%dir %{cncompatdir}
-%dir %{twcompatdir}
-%{cncompatdir}/zysong.ttf
-%{twcompatdir}/bsmi00lp.ttf
-%{umingtransdir}
-%{ukaitransdir}
+#%package -n %{fontname}-fonts-compat
+#Summary:      Chinese Unicode TrueType font compatibility files.
+#Group:        User Interface/X
+#Requires:     %{fontname}-uming-fonts = %{version}-%{release}
+#Obsoletes:    cjkunifonts-compat < 0.2.20080216.1-16 
+#
+#%description -n %{fontname}-fonts-compat
+#%common_desc
+#
+#CJK Unifonts compatibility files.
+#
+#%files -n %{fontname}-fonts-compat
+#%defattr(0644,root,root,0755)
+#%dir %{cncompatdir}
+#%dir %{twcompatdir}
+#%{cncompatdir}/zysong.ttf
+#%{twcompatdir}/bsmi00lp.ttf
+#%{umingtransdir}
+#%{ukaitransdir}
 
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
@@ -252,6 +252,9 @@ cd ../
 %__rm -fr %{buildroot}
 
 %changelog
+* Wed Dec 01 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-33
+- Remove -compat.
+
 * Wed Dec 01 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-32
 - Mailhot's font audit:
  - Add obsolete package versions.



From cchance at fedoraproject.org  Tue Dec  1 07:30:44 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  1 Dec 2009 07:30:44 +0000 (UTC)
Subject: rpms/taipeifonts/devel taipeifonts.spec,1.6,1.7
Message-ID: <20091201073044.0EF2211C0299@cvs1.fedora.phx.redhat.com>

Author: cchance

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

Modified Files:
	taipeifonts.spec 
Log Message:
fixes to Mailhots font audit


Index: taipeifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taipeifonts/devel/taipeifonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- taipeifonts.spec	25 Sep 2009 00:55:49 -0000	1.6
+++ taipeifonts.spec	1 Dec 2009 07:30:43 -0000	1.7
@@ -1,10 +1,13 @@
+%define fontname taipeifonts
+%define common_desc Traditional Chinese Bitmap fonts
+
 %define bmpfontdir    %{_datadir}/fonts/%{name}
 %define catalogue     /etc/X11/fontpath.d
 
-Name:       taipeifonts
+Name:       %{fontname}
 Version:    1.2
-Release:    9%{?dist}
-Summary:    Chinese Bitmap Fonts
+Release:    10%{?dist}
+Summary:    %common_desc
 
 Group:      User Interface/X
 License:    Public Domain
@@ -19,7 +22,7 @@ Source1:    ftp://cle.linux.org.tw/pub/C
 Source2:    ftp://cle.linux.org.tw/pub/CLE/devel/wjwu/slackware/slackware-10.0/source/%{name}-%{version}/re-build.readme
 
 %description
-Traditional Chinese bitmap fonts.
+%common_desc
 
 %prep
 %setup -q
@@ -62,7 +65,7 @@ if [ "$1" = "0" ]; then
 fi
 
 %files
-%defattr(-, root, root)
+%defattr(0644,root,root,0755)
 %doc README
 %dir %{bmpfontdir}
 %{bmpfontdir}/*.gz
@@ -72,6 +75,11 @@ fi
 %{catalogue}/%{name}
 
 %changelog
+* Wed Dec 01 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.2-10.fc12
+- Fixes to Mailhot's font audit.
+ - Add metadata.
+ - Add default attributes.
+
 * Fri Sep 25 2009 Caius 'kaio' Chance <cchance at redhat.com> - 1.2-9.fc12
 - rebuild on dist-f12
 



From cchance at fedoraproject.org  Tue Dec  1 07:41:49 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  1 Dec 2009 07:41:49 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.19,1.20
Message-ID: <20091201074149.2964E11C00DE@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30643

Modified Files:
	cjkuni-fonts.spec 
Log Message:
rebuilt


Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cjkuni-fonts.spec	1 Dec 2009 07:29:29 -0000	1.19
+++ cjkuni-fonts.spec	1 Dec 2009 07:41:47 -0000	1.20
@@ -23,7 +23,7 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     33%{?dist}
+Release:     34%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face
 License:     Arphic
 Group:       User Interface/X
@@ -144,7 +144,7 @@ CJK Unifonts ghostscript files.
 #Obsoletes:    cjkunifonts-compat < 0.2.20080216.1-16 
 #
 #%description -n %{fontname}-fonts-compat
-#%common_desc
+#common_desc
 #
 #CJK Unifonts compatibility files.
 #
@@ -252,6 +252,9 @@ cd ../
 %__rm -fr %{buildroot}
 
 %changelog
+* Wed Dec 01 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-34
+- rebuild
+
 * Wed Dec 01 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-33
 - Remove -compat.
 



From belegdol at fedoraproject.org  Tue Dec  1 08:03:43 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Tue,  1 Dec 2009 08:03:43 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel gnome-chemistry-utils.spec, 1.42, 
	1.43
Message-ID: <20091201080343.528E111C00DE@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4829

Modified Files:
	gnome-chemistry-utils.spec 
Log Message:
* Tue Dec 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.9-2
- Rebuilt for new goffice



Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gnome-chemistry-utils.spec	14 Nov 2009 13:20:42 -0000	1.42
+++ gnome-chemistry-utils.spec	1 Dec 2009 08:03:41 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
 Version:        0.10.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -101,7 +101,7 @@ chrpath --delete  $RPM_BUILD_ROOT%{_bind
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gcrystal-0.10
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gspectrum-0.10
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gchemtable-0.10
-chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.6.6/plugins/gchemutils/gchemutils.so
+chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.7.16/plugins/gchemutils/gchemutils.so
 chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/libgchempaint-0.10.so.%{version}
 chrpath --delete  $RPM_BUILD_ROOT%{_libexecdir}/chem-viewer
 chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.10/plugins/cdx/cdx.so
@@ -193,7 +193,7 @@ scrollkeeper-update -q || :
 %{_bindir}/gspectrum
 %{_bindir}/gspectrum-0.10
 %{_libdir}/gchemutils
-%{_libdir}/goffice/0.6.6/plugins/gchemutils
+%{_libdir}/goffice/0.7.16/plugins/gchemutils
 %{_libdir}/libgchempaint-0.10.so.*
 %{_libdir}/libgcpcanvas-0.10.so.*
 %{_libdir}/libgcu-0.10.so.*
@@ -234,6 +234,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Tue Dec 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.9-2
+- Rebuilt for new goffice
+
 * Sat Nov 14 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.9-1
 - Updated to 0.10.9
 



From jsafrane at fedoraproject.org  Tue Dec  1 08:13:12 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 08:13:12 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi.spec, 1.27,
	1.28 freeipmi-0.4.6-daemon.patch, 1.1,
	NONE freeipmi-0.4.6-open.patch, 1.1,
	NONE freeipmi-0.4.6-rpmlint.patch, 1.1,
	NONE freeipmi-0.5.1-regex.patch, 1.2,
	NONE freeipmi-0.6.4-argmax.patch, 1.2, NONE
Message-ID: <20091201081312.764AB11C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	freeipmi.spec 
Removed Files:
	freeipmi-0.4.6-daemon.patch freeipmi-0.4.6-open.patch 
	freeipmi-0.4.6-rpmlint.patch freeipmi-0.5.1-regex.patch 
	freeipmi-0.6.4-argmax.patch 
Log Message:
Update to freeipmi-0.7.16
Remove unnecessary patches


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- freeipmi.spec	26 Oct 2009 08:56:49 -0000	1.27
+++ freeipmi.spec	1 Dec 2009 08:13:12 -0000	1.28
@@ -5,16 +5,14 @@
 Release: 1%{?dist}
 
 Name: freeipmi
-Version: 0.7.14
+Version: 0.7.16
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
 Source: ftp://ftp.gluster.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz
-Patch1: freeipmi-0.5.1-regex.patch
-Patch2: freeipmi-0.6.4-silent.patch
-Patch3: freeipmi-0.6.4-argmax.patch
-Patch4: freeipmi-0.6.4-pathsep.patch
-Patch5: freeipmi-0.7.12-lsb.patch
+Patch1: freeipmi-0.6.4-silent.patch
+Patch2: freeipmi-0.6.4-pathsep.patch
+Patch3: freeipmi-0.7.12-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel texinfo
 Requires(pre): chkconfig
@@ -65,11 +63,9 @@ Provides a tool and a daemon for IPMI no
 
 %prep
 %setup -q
-%patch1 -p1 -b .regex
-%patch2 -p1 -b .silent
-%patch3 -p1 -b .argmax
-%patch4 -p1 -b .pathsep
-%patch5 -p1 -b .lsb
+%patch1 -p1 -b .silent
+%patch2 -p1 -b .pathsep
+%patch3 -p1 -b .lsb
 
 %build
 export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
@@ -293,6 +289,9 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Tue Dec  1 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.16-1
+- Update to freeipmi-0.7.16
+
 * Mon Oct 26 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.14-1
 - Update to freeipmi-0.7.14
 


--- freeipmi-0.4.6-daemon.patch DELETED ---


--- freeipmi-0.4.6-open.patch DELETED ---


--- freeipmi-0.4.6-rpmlint.patch DELETED ---


--- freeipmi-0.5.1-regex.patch DELETED ---


--- freeipmi-0.6.4-argmax.patch DELETED ---



From jsafrane at fedoraproject.org  Tue Dec  1 08:13:50 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 08:13:50 +0000 (UTC)
Subject: File freeipmi-0.7.16.tar.gz uploaded to lookaside cache by jsafrane
Message-ID: <20091201081350.6CF3C10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for freeipmi:

8c4349ac302951d6cb2c896f28c6d7b9  freeipmi-0.7.16.tar.gz



From jsafrane at fedoraproject.org  Tue Dec  1 08:14:07 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 08:14:07 +0000 (UTC)
Subject: rpms/freeipmi/devel .cvsignore,1.14,1.15 sources,1.14,1.15
Message-ID: <20091201081407.DA77211C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	.cvsignore sources 
Log Message:
Update to freeipmi-0.7.16
Remove unnecessary patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	26 Oct 2009 08:56:49 -0000	1.14
+++ .cvsignore	1 Dec 2009 08:14:07 -0000	1.15
@@ -1 +1 @@
-freeipmi-0.7.14.tar.gz
+freeipmi-0.7.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	26 Oct 2009 08:56:49 -0000	1.14
+++ sources	1 Dec 2009 08:14:07 -0000	1.15
@@ -1 +1 @@
-591496e9906a876408983c6e47abfe1f  freeipmi-0.7.14.tar.gz
+8c4349ac302951d6cb2c896f28c6d7b9  freeipmi-0.7.16.tar.gz



From lucilanga at fedoraproject.org  Tue Dec  1 08:28:27 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  1 Dec 2009 08:28:27 +0000 (UTC)
Subject: rpms/cpmtools/devel cpmtools-2.11-overflow.patch, NONE,
	1.1 cpmtools.spec, 1.4, 1.5
Message-ID: <20091201082828.3D19C11C00DE@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	cpmtools.spec 
Added Files:
	cpmtools-2.11-overflow.patch 
Log Message:
patch to fix crash in cpmcp

cpmtools-2.11-overflow.patch:
 cpmcp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cpmtools-2.11-overflow.patch ---
diff -Naur cpmtools-2.11/cpmcp.c cpmtools-2.11-mod/cpmcp.c
--- cpmtools-2.11/cpmcp.c	2009-07-27 21:38:57.000000000 +0300
+++ cpmtools-2.11-mod/cpmcp.c	2009-12-01 10:24:51.000000000 +0200
@@ -225,7 +225,7 @@
       else
       {
         struct cpmInode ino;
-        char cpmname[2+8+3+1]; /* 00foobarxy.zzy\0 */
+        char cpmname[2+8+1+3+1]; /* 00foobarxy.zzy\0 */
 
         if (todir)
         {


Index: cpmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/devel/cpmtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cpmtools.spec	29 Nov 2009 20:09:07 -0000	1.4
+++ cpmtools.spec	1 Dec 2009 08:28:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		cpmtools
 Version:	2.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Programs for accessing CP/M disks
 
 Group:		Applications/System
@@ -8,6 +8,7 @@ License:	GPLv3+
 URL:		http://www.moria.de/~michael/cpmtools/
 Source0:	http://www.moria.de/~michael/cpmtools/cpmtools-%{version}.tar.gz
 Patch0:		cpmtools-2.11-nostrip.patch
+Patch1:		cpmtools-2.11-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -22,6 +23,7 @@ exchange with a Z80-PC simulator, but it
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .nostrip
+%patch1 -p1 -b .overflow
 sed -i -e "s!@datarootdir@/diskdefs!\$\(DATADIR\)/diskdefs!" Makefile.in
 #modify path contained in man files
 sed -i -e "s!@DATADIR@!%{_datadir}/%{name}!" *.1.in
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 01 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-2
+- patch to fix crash in cpmcp
+
 * Sun Nov 29 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-1
 - new upstream release
 



From jwrdegoede at fedoraproject.org  Tue Dec  1 08:35:02 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 08:35:02 +0000 (UTC)
Subject: rpms/ClanLib06/F-12 ClanLib-0.6.5-extra-keys.patch, NONE,
	1.1 ClanLib-0.6.5-iterator-abuse.patch, NONE,
	1.1 ClanLib-0.6.5-xev-keycodes.patch, NONE, 1.1 ClanLib06.spec,
	1.16, 1.17
Message-ID: <20091201083502.5D51011C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib06/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14040

Modified Files:
	ClanLib06.spec 
Added Files:
	ClanLib-0.6.5-extra-keys.patch 
	ClanLib-0.6.5-iterator-abuse.patch 
	ClanLib-0.6.5-xev-keycodes.patch 
Log Message:
* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 0.6.5-16
- ClanLib06 used a hardcoded keycode table (lame), these have changed for some
  keys with us moving over to evdev, breaking the usage of these keys. Fix this
  by switching over to dynamically querying the X-server for keycodes
- Add a number of missing defines for non alpha-numerical keys
- Fix some abuse of iterators
- Remove smpflags, as that results in somehow broken libs (apps using them
  crash on exit ?)


ClanLib-0.6.5-extra-keys.patch:
 API/Display/Input/key.h            |   17 ++++++++++++++
 Display/Input/X11/keyboard_x11.cpp |   44 +++++++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 11 deletions(-)

--- NEW FILE ClanLib-0.6.5-extra-keys.patch ---
diff -up ClanLib-0.6.5/Sources/API/Display/Input/key.h~ ClanLib-0.6.5/Sources/API/Display/Input/key.h
--- ClanLib-0.6.5/Sources/API/Display/Input/key.h~	2001-10-18 11:23:04.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Display/Input/key.h	2009-11-29 20:44:19.000000000 +0100
@@ -56,6 +56,23 @@ enum
 	CL_MOUSE_WHEELDOWN,
 	CL_MOUSE_WHEELBUTTON,
 
+	/* Additional key enums added by Fedora for complete keyb coverage */
+	CL_KEY_GRAVE,
+	CL_KEY_SUBTRACT,
+	CL_KEY_EQUALS,
+	CL_KEY_LEFT_BRACKET,
+	CL_KEY_RIGHT_BRACKET,
+	CL_KEY_SEMICOLON,
+	CL_KEY_QUOTE,
+	CL_KEY_COMMA,
+	CL_KEY_PERIOD,
+	CL_KEY_DIVIDE,
+	CL_KEY_BACKSLASH,
+	CL_KEY_LWIN,
+	CL_KEY_RWIN,
+	CL_KEY_APPS,
+	CL_KEY_COMPOSE,
+
 	CL_NUM_KEYS
 };
 
diff -up ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp~ ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp
--- ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp~	2002-03-02 17:43:48.000000000 +0100
+++ ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp	2009-11-29 20:56:59.000000000 +0100
@@ -197,7 +197,7 @@ int CL_XWindowKeyboard::map_keysym_to_id
 //	case XK_Clear: return CL_KEY_CLEAR;
 	case XK_Return: return CL_KEY_ENTER;
 	case XK_Pause: return CL_KEY_PAUSE;
-//	case XK_Scroll_Lock: return CL_KEY_SCROLL;
+	case XK_Scroll_Lock: return CL_KEY_SCRLOCK;
 	case XK_Escape: return CL_KEY_ESCAPE;
 	case XK_Delete: return CL_KEY_DELETE;
 //	case XK_Kanji: return CL_KEY_KANJI;
@@ -243,12 +243,11 @@ int CL_XWindowKeyboard::map_keysym_to_id
 	case XK_Meta_R: return CL_KEY_ALTGR;
 	case XK_Alt_L: return CL_KEY_ALT;
 	case XK_Alt_R: return CL_KEY_ALTGR;
-
+	case XK_Super_L: return CL_KEY_LWIN;
+	case XK_Super_R: return CL_KEY_RWIN;
+	case XK_Menu: return CL_KEY_APPS;
+	case XK_Multi_key: return CL_KEY_COMPOSE;
 	case XK_space: return CL_KEY_SPACE;
-//	case XK_comma: return CL_KEY_COMMA;
-//	case XK_minus: return CL_KEY_MINUS;
-//	case XK_period: return CL_KEY_PERIOD;
-//	case XK_slash: return CL_KEY_SLASH;
 	case XK_0: return CL_KEY_0;
 	case XK_1: return CL_KEY_1;
 	case XK_2: return CL_KEY_2;
@@ -259,11 +258,6 @@ int CL_XWindowKeyboard::map_keysym_to_id
 	case XK_7: return CL_KEY_7;
 	case XK_8: return CL_KEY_8;
 	case XK_9: return CL_KEY_9;
-//	case XK_semicolon: return CL_KEY_PUNKTUM;
-//	case XK_equal: return CL_KEY_EQUAL;
-//	case XK_bracketleft: return CL_KEY_BRACKETLEFT;
-//	case XK_backslash: return CL_KEY_BACKSLASH;
-//	case XK_bracketright: return CL_KEY_BRACKETRIGHT;
 	case XK_a: return CL_KEY_A;
 	case XK_b: return CL_KEY_B;
 	case XK_c: return CL_KEY_C;
@@ -290,6 +284,17 @@ int CL_XWindowKeyboard::map_keysym_to_id
 	case XK_x: return CL_KEY_X;
 	case XK_y: return CL_KEY_Y;
 	case XK_z: return CL_KEY_Z;
+	case XK_grave: return CL_KEY_GRAVE;
+	case XK_minus: return CL_KEY_SUBTRACT;
+	case XK_equal: return CL_KEY_EQUALS;
+	case XK_bracketleft: return CL_KEY_LEFT_BRACKET;
+	case XK_bracketright: return CL_KEY_RIGHT_BRACKET;
+	case XK_semicolon: return CL_KEY_SEMICOLON;
+	case XK_apostrophe: return CL_KEY_QUOTE;
+	case XK_comma: return CL_KEY_COMMA;
+	case XK_period: return CL_KEY_PERIOD;
+	case XK_slash: return CL_KEY_DIVIDE;
+	case XK_backslash: return CL_KEY_BACKSLASH;
 	}
 
 	return CL_KEY_NONE_OF_THE_ABOVE;
@@ -386,6 +386,7 @@ int CL_XWindowKeyboard::map_id_to_keysym
 	case CL_KEY_KP_MINUS: return 82;
 	case CL_KEY_KP_PLUS: return 86;
 	case CL_KEY_KP_ENTER: return 108;
+	case CL_KEY_KP_DECIMAL: return 91;
  
  	/* Found these codes in /usr/X11R6/lib/X11/xkb/keycodes/xfree86
  	 * from an XFree86 4.0.1 installation. 
@@ -401,6 +402,22 @@ int CL_XWindowKeyboard::map_id_to_keysym
  	case CL_KEY_KP_7: return 79;
  	case CL_KEY_KP_8: return 80;
  	case CL_KEY_KP_9: return 81;
+
+	case CL_KEY_GRAVE: return 49;
+	case CL_KEY_SUBTRACT: return 20;
+	case CL_KEY_EQUALS: return 21;
+	case CL_KEY_LEFT_BRACKET: return 34;
+	case CL_KEY_RIGHT_BRACKET: return 35;
+	case CL_KEY_SEMICOLON: return 47;
+	case CL_KEY_QUOTE: return 48;
+	case CL_KEY_COMMA: return 59;
+	case CL_KEY_PERIOD: return 60;
+	case CL_KEY_DIVIDE: return 61;
+	case CL_KEY_BACKSLASH: return 51;
+	case CL_KEY_LWIN: return 133;
+	case CL_KEY_RWIN: return 134;
+	case CL_KEY_APPS: return 135;
+	case CL_KEY_COMPOSE: return 108;
 	}
 	
 	return -1;

ClanLib-0.6.5-iterator-abuse.patch:
 signal_v0.h |   22 ++++++----------------
 signal_v1.h |   27 +++++++++------------------
 signal_v2.h |   27 +++++++++------------------
 signal_v3.h |   27 +++++++++------------------
 signal_v4.h |   27 +++++++++------------------
 signal_v5.h |   27 +++++++++------------------
 6 files changed, 51 insertions(+), 106 deletions(-)

--- NEW FILE ClanLib-0.6.5-iterator-abuse.patch ---
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v0.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v0.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v0.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v0.h	2009-11-29 23:30:39.000000000 +0100
@@ -62,33 +62,23 @@ public:
 	//: Call
 	void call()
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
 		CL_SlotParent_v0 super(slots.begin(), slots.end());
 		super();
 
 		// find slots to be removed:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
 			}
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
+			else
+				slot_it++;
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v1.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v1.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v1.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v1.h	2009-11-29 23:24:20.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1);
+				slot_it++;
 			}
-			
-			slot->call(param1);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v2.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v2.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v2.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v2.h	2009-11-29 23:29:03.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1, PARAM2 param2)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1, param2);
+				slot_it++;
 			}
-			
-			slot->call(param1, param2);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v3.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v3.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v3.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v3.h	2009-11-29 23:25:00.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1, PARAM2 param2, PARAM3 param3)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1, param2, param3);
+				slot_it++;
 			}
-			
-			slot->call(param1, param2, param3);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v4.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v4.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v4.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v4.h	2009-11-29 23:23:14.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1, PARAM2 param2, PARAM3 param3, PARAM4 param4)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1, param2, param3, param4);
+				slot_it++;
 			}
-			
-			slot->call(param1, param2, param3, param4);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v5.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v5.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v5.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v5.h	2009-11-29 23:16:15.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1, PARAM2 param2, PARAM3 param3, PARAM4 param4, PARAM5 param5)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1, param2, param3, param4, param5);
+				slot_it++;
 			}
-			
-			slot->call(param1, param2, param3, param4, param5);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 

ClanLib-0.6.5-xev-keycodes.patch:
 keyboard_x11.cpp |  135 +++++--------------------------------------------------
 keyboard_x11.h   |    4 +
 2 files changed, 16 insertions(+), 123 deletions(-)

--- NEW FILE ClanLib-0.6.5-xev-keycodes.patch ---
diff -up ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp.keycode ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp
--- ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp.keycode	2009-11-30 16:13:22.000000000 +0100
+++ ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp	2009-11-30 16:15:11.000000000 +0100
@@ -50,6 +50,16 @@ CL_XWindowKeyboard::CL_XWindowKeyboard(
 {
 	card = _card;
 
+	memset(keycodes, 0, sizeof(keycodes));
+	for (int i=0; i<256; i++)
+	{
+		KeySym sym = XKeycodeToKeysym(card->get_display(), i, 0);
+		int id = map_keysym_to_id(sym);
+
+		if (id != CL_KEY_NONE_OF_THE_ABOVE)
+			keycodes[id] = i;
+	}
+
 	for (int j=0; j<X_KEYBOARD_BUFFERSIZE; j++) keys_return[j]=0;
 
 	buttons = new CL_InputButton_XKeyboard*[CL_NUM_KEYS];
@@ -147,7 +157,7 @@ CL_InputButton *CL_XWindowKeyboard::get_
 {
 	if (buttons[button_num] != NULL) return buttons[button_num];
 
-	int translate_key = map_id_to_keysym(button_num);
+	int translate_key = map_id_to_keycode(button_num);
 	if (translate_key == -1) return NULL;
 
 	buttons[button_num] = 
@@ -205,7 +205,6 @@ int CL_XWindowKeyboard::map_keysym_to_id
 {
 	switch (keysym)
 	{
-	case 269025062: return CL_KEY_ESCAPE;
 	case XK_Select: return CL_KEY_ENTER;
 	case XK_BackSpace: return CL_KEY_BACKSPACE;
 	case XK_Tab: return CL_KEY_TAB;
@@ -300,127 +309,9 @@ int CL_XWindowKeyboard::map_keysym_to_id
 	return CL_KEY_NONE_OF_THE_ABOVE;
 }
 
-int CL_XWindowKeyboard::map_id_to_keysym(int id)
+int CL_XWindowKeyboard::map_id_to_keycode(int id)
 {
-	switch (id)
-	{
-	case CL_KEY_A: return 38;
-	case CL_KEY_B: return 56;
-	case CL_KEY_C: return 54;
-	case CL_KEY_D: return 40;
-	case CL_KEY_E: return 26;
-	case CL_KEY_F: return 41;
-	case CL_KEY_G: return 42;
-	case CL_KEY_H: return 43;
-	case CL_KEY_I: return 31;
-	case CL_KEY_J: return 44;
-	case CL_KEY_K: return 45;
-	case CL_KEY_L: return 46;
-	case CL_KEY_M: return 58;
-	case CL_KEY_N: return 57;
-	case CL_KEY_O: return 32;
-	case CL_KEY_P: return 33;
-	case CL_KEY_Q: return 24;
-	case CL_KEY_R: return 27;
-	case CL_KEY_S: return 39;
-	case CL_KEY_T: return 28;
-	case CL_KEY_U: return 30;
-	case CL_KEY_V: return 55;
-	case CL_KEY_W: return 25;
-	case CL_KEY_X: return 53;
-	case CL_KEY_Y: return 29;
-	case CL_KEY_Z: return 52;
-
-	case CL_KEY_0: return 19;
-	case CL_KEY_1: return 10;
-	case CL_KEY_2: return 11;
-	case CL_KEY_3: return 12;
-	case CL_KEY_4: return 13;
-	case CL_KEY_5: return 14;
-	case CL_KEY_6: return 15;
-	case CL_KEY_7: return 16;
-	case CL_KEY_8: return 17;
-	case CL_KEY_9: return 18;
-
-	case CL_KEY_F1: return 67;
-	case CL_KEY_F2: return 68;
-	case CL_KEY_F3: return 69;
-	case CL_KEY_F4: return 70;
-	case CL_KEY_F5: return 71;
-	case CL_KEY_F6: return 72;
-	case CL_KEY_F7: return 73;
-	case CL_KEY_F8: return 74;
-	case CL_KEY_F9: return 75;
-	case CL_KEY_F10: return 76;
-	case CL_KEY_F11: return 95;
-	case CL_KEY_F12: return 96;
-
-	case CL_KEY_ESCAPE: return 9; 
-	case CL_KEY_LEFT: return 100;
-	case CL_KEY_RIGHT: return 102;
-	case CL_KEY_UP: return 98;
-	case CL_KEY_DOWN: return 104;
-	case CL_KEY_LCTRL: return 37;
-	case CL_KEY_RCTRL: return 109;
-	case CL_KEY_LSHIFT: return 50;
-	case CL_KEY_RSHIFT: return 62;
-	case CL_KEY_ALT: return 64;
-	case CL_KEY_ALTGR: return 113;
-	case CL_KEY_TAB: return 23;
-	case CL_KEY_ENTER: return 36;
-	case CL_KEY_SPACE: return 65;
-	case CL_KEY_BACKSPACE: return 22;
-	case CL_KEY_INSERT: return 106;
-	case CL_KEY_DELETE: return 107;
-	case CL_KEY_HOME: return 97;
-	case CL_KEY_END: return 98;
-	case CL_KEY_PAGEUP: return 99;
-	case CL_KEY_PAGEDOWN: return 105;
-	case CL_KEY_CAPSLOCK: return 66;
-	case CL_KEY_NUMLOCK: return 77;
-	case CL_KEY_SCRLOCK: return 78;
-	case CL_KEY_PRINT: return 111;
-	case CL_KEY_PAUSE: return 110;
-	case CL_KEY_KP_DIV: return 112;
-	case CL_KEY_KP_MULT: return 63;
-	case CL_KEY_KP_MINUS: return 82;
-	case CL_KEY_KP_PLUS: return 86;
-	case CL_KEY_KP_ENTER: return 108;
-	case CL_KEY_KP_DECIMAL: return 91;
- 
- 	/* Found these codes in /usr/X11R6/lib/X11/xkb/keycodes/xfree86
- 	 * from an XFree86 4.0.1 installation. 
- 	 * Tested on US 105 key keyboard. <timcr038 at student.otago.ac.nz>
- 	 */
- 	case CL_KEY_KP_0: return 90;
- 	case CL_KEY_KP_1: return 87;
- 	case CL_KEY_KP_2: return 88;
- 	case CL_KEY_KP_3: return 89;
- 	case CL_KEY_KP_4: return 83;
- 	case CL_KEY_KP_5: return 84;
- 	case CL_KEY_KP_6: return 85;
- 	case CL_KEY_KP_7: return 79;
- 	case CL_KEY_KP_8: return 80;
- 	case CL_KEY_KP_9: return 81;
-
-	case CL_KEY_GRAVE: return 49;
-	case CL_KEY_SUBTRACT: return 20;
-	case CL_KEY_EQUALS: return 21;
-	case CL_KEY_LEFT_BRACKET: return 34;
-	case CL_KEY_RIGHT_BRACKET: return 35;
-	case CL_KEY_SEMICOLON: return 47;
-	case CL_KEY_QUOTE: return 48;
-	case CL_KEY_COMMA: return 59;
-	case CL_KEY_PERIOD: return 60;
-	case CL_KEY_DIVIDE: return 61;
-	case CL_KEY_BACKSLASH: return 51;
-	case CL_KEY_LWIN: return 133;
-	case CL_KEY_RWIN: return 134;
-	case CL_KEY_APPS: return 135;
-	case CL_KEY_COMPOSE: return 108;
-	}
-	
-	return -1;
+	return keycodes[id];
 }
 
 /***************************
diff -up ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.h.keycode ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.h
--- ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.h.keycode	2001-11-30 23:38:42.000000000 +0100
+++ ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.h	2009-11-30 16:15:41.000000000 +0100
@@ -19,6 +19,7 @@
 
 #include "API/Display/Input/inputbutton.h"
 #include "API/Display/Input/keyboard.h"
+#include "API/Display/Input/key.h"
 #include "Core/System/Unix/init_linux.h"
 #include "API/Core/System/keep_alive.h"
 #include "API/signals.h"
@@ -64,12 +65,13 @@ public:
 
 private:
 	static int map_keysym_to_id(int keysym);
-	static int map_id_to_keysym(int id);
+	int map_id_to_keycode(int id);
 	
 	void on_xevent(XEvent &event);
 	CL_Slot slot_xevent;
 
 	char keys_return[X_KEYBOARD_BUFFERSIZE];
+	int keycodes[CL_NUM_KEYS];
 	
 	CL_InputButton_XKeyboard **buttons;
 	CL_XWindow_CompatibleCard *card;


Index: ClanLib06.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/F-12/ClanLib06.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ClanLib06.spec	24 Jul 2009 15:04:30 -0000	1.16
+++ ClanLib06.spec	1 Dec 2009 08:35:02 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:        Version 0.6 of this Cross platform C++ game library
 Name:           ClanLib06
 Version:        0.6.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.clanlib.org/
@@ -17,6 +17,9 @@ Patch3:         ClanLib-0.6.5-smalljpg.p
 Patch4:         ClanLib-0.6.5-gcc4.3.patch
 Patch5:         ClanLib-0.6.5-mikmod32.patch
 Patch6:         ClanLib-0.6.5-alsa.patch
+Patch7:         ClanLib-0.6.5-extra-keys.patch
+Patch8:         ClanLib-0.6.5-xev-keycodes.patch
+Patch9:         ClanLib-0.6.5-iterator-abuse.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXext-devel libXt-devel libGLU-devel
 BuildRequires:  libICE-devel libXxf86vm-devel xorg-x11-proto-devel
@@ -50,6 +53,9 @@ ClanLib 0.6 development headers and libr
 %patch4 -p1 -z .gcc43
 %patch5 -p1 -z .mikmod32
 %patch6 -p1 -z .alsa
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 # mark asm files as NOT needing execstack
 for i in `find Sources -name '*.s'`; do
   echo '.section .note.GNU-stack,"", at progbits' >> $i
@@ -62,10 +68,10 @@ autoconf
 ARCH_CONFIG_FLAGS=--enable-asm386
 %endif
 cp -a -f /usr/lib/rpm/redhat/config.sub .
-%configure --disable-dependency-tracking --disable-debug --enable-dyn \
-  --disable-directfb $ARCH_CONFIG_FLAGS
+%configure --disable-debug --enable-dyn --disable-directfb $ARCH_CONFIG_FLAGS
 tolua++ -o Sources/Lua/clanbindings.cpp Sources/Lua/clanbindings.pkg
-make %{?_smp_mflags}
+# no smpflags, it somehow brakes the libs (apps using them crash on exit ?)
+make
 
 
 %install
@@ -99,6 +105,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 0.6.5-16
+- ClanLib06 used a hardcoded keycode table (lame), these have changed for some
+  keys with us moving over to evdev, breaking the usage of these keys. Fix this
+  by switching over to dynamically querying the X-server for keycodes
+- Add a number of missing defines for non alpha-numerical keys
+- Fix some abuse of iterators
+- Remove smpflags, as that results in somehow broken libs (apps using them
+  crash on exit ?)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Tue Dec  1 08:36:34 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  1 Dec 2009 08:36:34 +0000 (UTC)
Subject: rpms/cpmtools/F-12 cpmtools-2.11-overflow.patch, NONE,
	1.1 cpmtools.spec, 1.5, 1.6
Message-ID: <20091201083634.54D1511C00DE@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/cpmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14554

Modified Files:
	cpmtools.spec 
Added Files:
	cpmtools-2.11-overflow.patch 
Log Message:
patch to fix crash in cpmcp

cpmtools-2.11-overflow.patch:
 cpmcp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cpmtools-2.11-overflow.patch ---
diff -Naur cpmtools-2.11/cpmcp.c cpmtools-2.11-mod/cpmcp.c
--- cpmtools-2.11/cpmcp.c	2009-07-27 21:38:57.000000000 +0300
+++ cpmtools-2.11-mod/cpmcp.c	2009-12-01 10:24:51.000000000 +0200
@@ -225,7 +225,7 @@
       else
       {
         struct cpmInode ino;
-        char cpmname[2+8+3+1]; /* 00foobarxy.zzy\0 */
+        char cpmname[2+8+1+3+1]; /* 00foobarxy.zzy\0 */
 
         if (todir)
         {


Index: cpmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/F-12/cpmtools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cpmtools.spec	29 Nov 2009 20:36:11 -0000	1.5
+++ cpmtools.spec	1 Dec 2009 08:36:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		cpmtools
 Version:	2.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Programs for accessing CP/M disks
 
 Group:		Applications/System
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 01 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-2
+- new upstream release
+
 * Sun Nov 29 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-1
 - new upstream release
 



From jwrdegoede at fedoraproject.org  Tue Dec  1 08:37:31 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 08:37:31 +0000 (UTC)
Subject: rpms/ClanLib06/F-11 ClanLib-0.6.5-extra-keys.patch, NONE,
	1.1 ClanLib-0.6.5-iterator-abuse.patch, NONE,
	1.1 ClanLib-0.6.5-xev-keycodes.patch, NONE, 1.1 ClanLib06.spec,
	1.15, 1.16
Message-ID: <20091201083731.BA11211C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib06/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14903

Modified Files:
	ClanLib06.spec 
Added Files:
	ClanLib-0.6.5-extra-keys.patch 
	ClanLib-0.6.5-iterator-abuse.patch 
	ClanLib-0.6.5-xev-keycodes.patch 
Log Message:
* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 0.6.5-16
- ClanLib06 used a hardcoded keycode table (lame), these have changed for some
  keys with us moving over to evdev, breaking the usage of these keys. Fix this
  by switching over to dynamically querying the X-server for keycodes
- Add a number of missing defines for non alpha-numerical keys
- Fix some abuse of iterators
- Remove smpflags, as that results in somehow broken libs (apps using them
  crash on exit ?)


ClanLib-0.6.5-extra-keys.patch:
 API/Display/Input/key.h            |   17 ++++++++++++++
 Display/Input/X11/keyboard_x11.cpp |   44 +++++++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 11 deletions(-)

--- NEW FILE ClanLib-0.6.5-extra-keys.patch ---
diff -up ClanLib-0.6.5/Sources/API/Display/Input/key.h~ ClanLib-0.6.5/Sources/API/Display/Input/key.h
--- ClanLib-0.6.5/Sources/API/Display/Input/key.h~	2001-10-18 11:23:04.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Display/Input/key.h	2009-11-29 20:44:19.000000000 +0100
@@ -56,6 +56,23 @@ enum
 	CL_MOUSE_WHEELDOWN,
 	CL_MOUSE_WHEELBUTTON,
 
+	/* Additional key enums added by Fedora for complete keyb coverage */
+	CL_KEY_GRAVE,
+	CL_KEY_SUBTRACT,
+	CL_KEY_EQUALS,
+	CL_KEY_LEFT_BRACKET,
+	CL_KEY_RIGHT_BRACKET,
+	CL_KEY_SEMICOLON,
+	CL_KEY_QUOTE,
+	CL_KEY_COMMA,
+	CL_KEY_PERIOD,
+	CL_KEY_DIVIDE,
+	CL_KEY_BACKSLASH,
+	CL_KEY_LWIN,
+	CL_KEY_RWIN,
+	CL_KEY_APPS,
+	CL_KEY_COMPOSE,
+
 	CL_NUM_KEYS
 };
 
diff -up ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp~ ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp
--- ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp~	2002-03-02 17:43:48.000000000 +0100
+++ ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp	2009-11-29 20:56:59.000000000 +0100
@@ -197,7 +197,7 @@ int CL_XWindowKeyboard::map_keysym_to_id
 //	case XK_Clear: return CL_KEY_CLEAR;
 	case XK_Return: return CL_KEY_ENTER;
 	case XK_Pause: return CL_KEY_PAUSE;
-//	case XK_Scroll_Lock: return CL_KEY_SCROLL;
+	case XK_Scroll_Lock: return CL_KEY_SCRLOCK;
 	case XK_Escape: return CL_KEY_ESCAPE;
 	case XK_Delete: return CL_KEY_DELETE;
 //	case XK_Kanji: return CL_KEY_KANJI;
@@ -243,12 +243,11 @@ int CL_XWindowKeyboard::map_keysym_to_id
 	case XK_Meta_R: return CL_KEY_ALTGR;
 	case XK_Alt_L: return CL_KEY_ALT;
 	case XK_Alt_R: return CL_KEY_ALTGR;
-
+	case XK_Super_L: return CL_KEY_LWIN;
+	case XK_Super_R: return CL_KEY_RWIN;
+	case XK_Menu: return CL_KEY_APPS;
+	case XK_Multi_key: return CL_KEY_COMPOSE;
 	case XK_space: return CL_KEY_SPACE;
-//	case XK_comma: return CL_KEY_COMMA;
-//	case XK_minus: return CL_KEY_MINUS;
-//	case XK_period: return CL_KEY_PERIOD;
-//	case XK_slash: return CL_KEY_SLASH;
 	case XK_0: return CL_KEY_0;
 	case XK_1: return CL_KEY_1;
 	case XK_2: return CL_KEY_2;
@@ -259,11 +258,6 @@ int CL_XWindowKeyboard::map_keysym_to_id
 	case XK_7: return CL_KEY_7;
 	case XK_8: return CL_KEY_8;
 	case XK_9: return CL_KEY_9;
-//	case XK_semicolon: return CL_KEY_PUNKTUM;
-//	case XK_equal: return CL_KEY_EQUAL;
-//	case XK_bracketleft: return CL_KEY_BRACKETLEFT;
-//	case XK_backslash: return CL_KEY_BACKSLASH;
-//	case XK_bracketright: return CL_KEY_BRACKETRIGHT;
 	case XK_a: return CL_KEY_A;
 	case XK_b: return CL_KEY_B;
 	case XK_c: return CL_KEY_C;
@@ -290,6 +284,17 @@ int CL_XWindowKeyboard::map_keysym_to_id
 	case XK_x: return CL_KEY_X;
 	case XK_y: return CL_KEY_Y;
 	case XK_z: return CL_KEY_Z;
+	case XK_grave: return CL_KEY_GRAVE;
+	case XK_minus: return CL_KEY_SUBTRACT;
+	case XK_equal: return CL_KEY_EQUALS;
+	case XK_bracketleft: return CL_KEY_LEFT_BRACKET;
+	case XK_bracketright: return CL_KEY_RIGHT_BRACKET;
+	case XK_semicolon: return CL_KEY_SEMICOLON;
+	case XK_apostrophe: return CL_KEY_QUOTE;
+	case XK_comma: return CL_KEY_COMMA;
+	case XK_period: return CL_KEY_PERIOD;
+	case XK_slash: return CL_KEY_DIVIDE;
+	case XK_backslash: return CL_KEY_BACKSLASH;
 	}
 
 	return CL_KEY_NONE_OF_THE_ABOVE;
@@ -386,6 +386,7 @@ int CL_XWindowKeyboard::map_id_to_keysym
 	case CL_KEY_KP_MINUS: return 82;
 	case CL_KEY_KP_PLUS: return 86;
 	case CL_KEY_KP_ENTER: return 108;
+	case CL_KEY_KP_DECIMAL: return 91;
  
  	/* Found these codes in /usr/X11R6/lib/X11/xkb/keycodes/xfree86
  	 * from an XFree86 4.0.1 installation. 
@@ -401,6 +402,22 @@ int CL_XWindowKeyboard::map_id_to_keysym
  	case CL_KEY_KP_7: return 79;
  	case CL_KEY_KP_8: return 80;
  	case CL_KEY_KP_9: return 81;
+
+	case CL_KEY_GRAVE: return 49;
+	case CL_KEY_SUBTRACT: return 20;
+	case CL_KEY_EQUALS: return 21;
+	case CL_KEY_LEFT_BRACKET: return 34;
+	case CL_KEY_RIGHT_BRACKET: return 35;
+	case CL_KEY_SEMICOLON: return 47;
+	case CL_KEY_QUOTE: return 48;
+	case CL_KEY_COMMA: return 59;
+	case CL_KEY_PERIOD: return 60;
+	case CL_KEY_DIVIDE: return 61;
+	case CL_KEY_BACKSLASH: return 51;
+	case CL_KEY_LWIN: return 133;
+	case CL_KEY_RWIN: return 134;
+	case CL_KEY_APPS: return 135;
+	case CL_KEY_COMPOSE: return 108;
 	}
 	
 	return -1;

ClanLib-0.6.5-iterator-abuse.patch:
 signal_v0.h |   22 ++++++----------------
 signal_v1.h |   27 +++++++++------------------
 signal_v2.h |   27 +++++++++------------------
 signal_v3.h |   27 +++++++++------------------
 signal_v4.h |   27 +++++++++------------------
 signal_v5.h |   27 +++++++++------------------
 6 files changed, 51 insertions(+), 106 deletions(-)

--- NEW FILE ClanLib-0.6.5-iterator-abuse.patch ---
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v0.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v0.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v0.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v0.h	2009-11-29 23:30:39.000000000 +0100
@@ -62,33 +62,23 @@ public:
 	//: Call
 	void call()
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
 		CL_SlotParent_v0 super(slots.begin(), slots.end());
 		super();
 
 		// find slots to be removed:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
 			}
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
+			else
+				slot_it++;
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v1.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v1.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v1.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v1.h	2009-11-29 23:24:20.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1);
+				slot_it++;
 			}
-			
-			slot->call(param1);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v2.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v2.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v2.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v2.h	2009-11-29 23:29:03.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1, PARAM2 param2)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1, param2);
+				slot_it++;
 			}
-			
-			slot->call(param1, param2);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v3.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v3.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v3.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v3.h	2009-11-29 23:25:00.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1, PARAM2 param2, PARAM3 param3)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1, param2, param3);
+				slot_it++;
 			}
-			
-			slot->call(param1, param2, param3);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v4.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v4.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v4.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v4.h	2009-11-29 23:23:14.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1, PARAM2 param2, PARAM3 param3, PARAM4 param4)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1, param2, param3, param4);
+				slot_it++;
 			}
-			
-			slot->call(param1, param2, param3, param4);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 
diff -up ClanLib-0.6.5/Sources/API/Signals/signal_v5.h~ ClanLib-0.6.5/Sources/API/Signals/signal_v5.h
--- ClanLib-0.6.5/Sources/API/Signals/signal_v5.h~	2002-06-13 16:43:17.000000000 +0200
+++ ClanLib-0.6.5/Sources/API/Signals/signal_v5.h	2009-11-29 23:16:15.000000000 +0100
@@ -63,31 +63,22 @@ public:
 	//: Call
 	void call(PARAM1 param1, PARAM2 param2, PARAM3 param3, PARAM4 param4, PARAM5 param5)
 	{
-		std::list<SlotIterator> remove_slots;
-
 		// call slots connected to signal:
-		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); slot_it++)
+		for (SlotIterator slot_it = slots.begin(); slot_it != slots.end(); )
 		{
 			Slot slot = *slot_it;
 
-			// skip slot if it has no more references left in application.
-			// (make it pending for removal)
+			// remove slot if it has no more references left in application.
 			if (slot->get_slot_ref() == 0)
 			{
-				remove_slots.push_back(slot_it);
-				continue;
+				slot->release_signal_ref();
+				slot_it = slots.erase(slot_it);
+			}
+			else
+			{
+				slot->call(param1, param2, param3, param4, param5);
+				slot_it++;
 			}
-			
-			slot->call(param1, param2, param3, param4, param5);
-		}
-
-		// remove all slots no longer connected to any CL_Slot.
-		typename std::list<SlotIterator>::iterator remove_it;
-		for (remove_it = remove_slots.begin(); remove_it != remove_slots.end(); remove_it++)
-		{
-			Slot slot = **remove_it;
-			slot->release_signal_ref();
-			slots.erase(*remove_it);
 		}
 	}
 

ClanLib-0.6.5-xev-keycodes.patch:
 keyboard_x11.cpp |  135 +++++--------------------------------------------------
 keyboard_x11.h   |    4 +
 2 files changed, 16 insertions(+), 123 deletions(-)

--- NEW FILE ClanLib-0.6.5-xev-keycodes.patch ---
diff -up ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp.keycode ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp
--- ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp.keycode	2009-11-30 16:13:22.000000000 +0100
+++ ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.cpp	2009-11-30 16:15:11.000000000 +0100
@@ -50,6 +50,16 @@ CL_XWindowKeyboard::CL_XWindowKeyboard(
 {
 	card = _card;
 
+	memset(keycodes, 0, sizeof(keycodes));
+	for (int i=0; i<256; i++)
+	{
+		KeySym sym = XKeycodeToKeysym(card->get_display(), i, 0);
+		int id = map_keysym_to_id(sym);
+
+		if (id != CL_KEY_NONE_OF_THE_ABOVE)
+			keycodes[id] = i;
+	}
+
 	for (int j=0; j<X_KEYBOARD_BUFFERSIZE; j++) keys_return[j]=0;
 
 	buttons = new CL_InputButton_XKeyboard*[CL_NUM_KEYS];
@@ -147,7 +157,7 @@ CL_InputButton *CL_XWindowKeyboard::get_
 {
 	if (buttons[button_num] != NULL) return buttons[button_num];
 
-	int translate_key = map_id_to_keysym(button_num);
+	int translate_key = map_id_to_keycode(button_num);
 	if (translate_key == -1) return NULL;
 
 	buttons[button_num] = 
@@ -205,7 +205,6 @@ int CL_XWindowKeyboard::map_keysym_to_id
 {
 	switch (keysym)
 	{
-	case 269025062: return CL_KEY_ESCAPE;
 	case XK_Select: return CL_KEY_ENTER;
 	case XK_BackSpace: return CL_KEY_BACKSPACE;
 	case XK_Tab: return CL_KEY_TAB;
@@ -300,127 +309,9 @@ int CL_XWindowKeyboard::map_keysym_to_id
 	return CL_KEY_NONE_OF_THE_ABOVE;
 }
 
-int CL_XWindowKeyboard::map_id_to_keysym(int id)
+int CL_XWindowKeyboard::map_id_to_keycode(int id)
 {
-	switch (id)
-	{
-	case CL_KEY_A: return 38;
-	case CL_KEY_B: return 56;
-	case CL_KEY_C: return 54;
-	case CL_KEY_D: return 40;
-	case CL_KEY_E: return 26;
-	case CL_KEY_F: return 41;
-	case CL_KEY_G: return 42;
-	case CL_KEY_H: return 43;
-	case CL_KEY_I: return 31;
-	case CL_KEY_J: return 44;
-	case CL_KEY_K: return 45;
-	case CL_KEY_L: return 46;
-	case CL_KEY_M: return 58;
-	case CL_KEY_N: return 57;
-	case CL_KEY_O: return 32;
-	case CL_KEY_P: return 33;
-	case CL_KEY_Q: return 24;
-	case CL_KEY_R: return 27;
-	case CL_KEY_S: return 39;
-	case CL_KEY_T: return 28;
-	case CL_KEY_U: return 30;
-	case CL_KEY_V: return 55;
-	case CL_KEY_W: return 25;
-	case CL_KEY_X: return 53;
-	case CL_KEY_Y: return 29;
-	case CL_KEY_Z: return 52;
-
-	case CL_KEY_0: return 19;
-	case CL_KEY_1: return 10;
-	case CL_KEY_2: return 11;
-	case CL_KEY_3: return 12;
-	case CL_KEY_4: return 13;
-	case CL_KEY_5: return 14;
-	case CL_KEY_6: return 15;
-	case CL_KEY_7: return 16;
-	case CL_KEY_8: return 17;
-	case CL_KEY_9: return 18;
-
-	case CL_KEY_F1: return 67;
-	case CL_KEY_F2: return 68;
-	case CL_KEY_F3: return 69;
-	case CL_KEY_F4: return 70;
-	case CL_KEY_F5: return 71;
-	case CL_KEY_F6: return 72;
-	case CL_KEY_F7: return 73;
-	case CL_KEY_F8: return 74;
-	case CL_KEY_F9: return 75;
-	case CL_KEY_F10: return 76;
-	case CL_KEY_F11: return 95;
-	case CL_KEY_F12: return 96;
-
-	case CL_KEY_ESCAPE: return 9; 
-	case CL_KEY_LEFT: return 100;
-	case CL_KEY_RIGHT: return 102;
-	case CL_KEY_UP: return 98;
-	case CL_KEY_DOWN: return 104;
-	case CL_KEY_LCTRL: return 37;
-	case CL_KEY_RCTRL: return 109;
-	case CL_KEY_LSHIFT: return 50;
-	case CL_KEY_RSHIFT: return 62;
-	case CL_KEY_ALT: return 64;
-	case CL_KEY_ALTGR: return 113;
-	case CL_KEY_TAB: return 23;
-	case CL_KEY_ENTER: return 36;
-	case CL_KEY_SPACE: return 65;
-	case CL_KEY_BACKSPACE: return 22;
-	case CL_KEY_INSERT: return 106;
-	case CL_KEY_DELETE: return 107;
-	case CL_KEY_HOME: return 97;
-	case CL_KEY_END: return 98;
-	case CL_KEY_PAGEUP: return 99;
-	case CL_KEY_PAGEDOWN: return 105;
-	case CL_KEY_CAPSLOCK: return 66;
-	case CL_KEY_NUMLOCK: return 77;
-	case CL_KEY_SCRLOCK: return 78;
-	case CL_KEY_PRINT: return 111;
-	case CL_KEY_PAUSE: return 110;
-	case CL_KEY_KP_DIV: return 112;
-	case CL_KEY_KP_MULT: return 63;
-	case CL_KEY_KP_MINUS: return 82;
-	case CL_KEY_KP_PLUS: return 86;
-	case CL_KEY_KP_ENTER: return 108;
-	case CL_KEY_KP_DECIMAL: return 91;
- 
- 	/* Found these codes in /usr/X11R6/lib/X11/xkb/keycodes/xfree86
- 	 * from an XFree86 4.0.1 installation. 
- 	 * Tested on US 105 key keyboard. <timcr038 at student.otago.ac.nz>
- 	 */
- 	case CL_KEY_KP_0: return 90;
- 	case CL_KEY_KP_1: return 87;
- 	case CL_KEY_KP_2: return 88;
- 	case CL_KEY_KP_3: return 89;
- 	case CL_KEY_KP_4: return 83;
- 	case CL_KEY_KP_5: return 84;
- 	case CL_KEY_KP_6: return 85;
- 	case CL_KEY_KP_7: return 79;
- 	case CL_KEY_KP_8: return 80;
- 	case CL_KEY_KP_9: return 81;
-
-	case CL_KEY_GRAVE: return 49;
-	case CL_KEY_SUBTRACT: return 20;
-	case CL_KEY_EQUALS: return 21;
-	case CL_KEY_LEFT_BRACKET: return 34;
-	case CL_KEY_RIGHT_BRACKET: return 35;
-	case CL_KEY_SEMICOLON: return 47;
-	case CL_KEY_QUOTE: return 48;
-	case CL_KEY_COMMA: return 59;
-	case CL_KEY_PERIOD: return 60;
-	case CL_KEY_DIVIDE: return 61;
-	case CL_KEY_BACKSLASH: return 51;
-	case CL_KEY_LWIN: return 133;
-	case CL_KEY_RWIN: return 134;
-	case CL_KEY_APPS: return 135;
-	case CL_KEY_COMPOSE: return 108;
-	}
-	
-	return -1;
+	return keycodes[id];
 }
 
 /***************************
diff -up ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.h.keycode ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.h
--- ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.h.keycode	2001-11-30 23:38:42.000000000 +0100
+++ ClanLib-0.6.5/Sources/Display/Input/X11/keyboard_x11.h	2009-11-30 16:15:41.000000000 +0100
@@ -19,6 +19,7 @@
 
 #include "API/Display/Input/inputbutton.h"
 #include "API/Display/Input/keyboard.h"
+#include "API/Display/Input/key.h"
 #include "Core/System/Unix/init_linux.h"
 #include "API/Core/System/keep_alive.h"
 #include "API/signals.h"
@@ -64,12 +65,13 @@ public:
 
 private:
 	static int map_keysym_to_id(int keysym);
-	static int map_id_to_keysym(int id);
+	int map_id_to_keycode(int id);
 	
 	void on_xevent(XEvent &event);
 	CL_Slot slot_xevent;
 
 	char keys_return[X_KEYBOARD_BUFFERSIZE];
+	int keycodes[CL_NUM_KEYS];
 	
 	CL_InputButton_XKeyboard **buttons;
 	CL_XWindow_CompatibleCard *card;


Index: ClanLib06.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/F-11/ClanLib06.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ClanLib06.spec	23 Feb 2009 20:10:11 -0000	1.15
+++ ClanLib06.spec	1 Dec 2009 08:37:31 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:        Version 0.6 of this Cross platform C++ game library
 Name:           ClanLib06
 Version:        0.6.5
-Release:        14%{?dist}
+Release:        16%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.clanlib.org/
@@ -17,6 +17,9 @@ Patch3:         ClanLib-0.6.5-smalljpg.p
 Patch4:         ClanLib-0.6.5-gcc4.3.patch
 Patch5:         ClanLib-0.6.5-mikmod32.patch
 Patch6:         ClanLib-0.6.5-alsa.patch
+Patch7:         ClanLib-0.6.5-extra-keys.patch
+Patch8:         ClanLib-0.6.5-xev-keycodes.patch
+Patch9:         ClanLib-0.6.5-iterator-abuse.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXext-devel libXt-devel libGLU-devel
 BuildRequires:  libICE-devel libXxf86vm-devel xorg-x11-proto-devel
@@ -50,6 +53,9 @@ ClanLib 0.6 development headers and libr
 %patch4 -p1 -z .gcc43
 %patch5 -p1 -z .mikmod32
 %patch6 -p1 -z .alsa
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 # mark asm files as NOT needing execstack
 for i in `find Sources -name '*.s'`; do
   echo '.section .note.GNU-stack,"", at progbits' >> $i
@@ -62,10 +68,10 @@ autoconf
 ARCH_CONFIG_FLAGS=--enable-asm386
 %endif
 cp -a -f /usr/lib/rpm/redhat/config.sub .
-%configure --disable-dependency-tracking --disable-debug --enable-dyn \
-  --disable-directfb $ARCH_CONFIG_FLAGS
+%configure --disable-debug --enable-dyn --disable-directfb $ARCH_CONFIG_FLAGS
 tolua++ -o Sources/Lua/clanbindings.cpp Sources/Lua/clanbindings.pkg
-make %{?_smp_mflags}
+# no smpflags, it somehow brakes the libs (apps using them crash on exit ?)
+make
 
 
 %install
@@ -99,6 +105,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 0.6.5-16
+- ClanLib06 used a hardcoded keycode table (lame), these have changed for some
+  keys with us moving over to evdev, breaking the usage of these keys. Fix this
+  by switching over to dynamically querying the X-server for keycodes
+- Add a number of missing defines for non alpha-numerical keys
+- Fix some abuse of iterators
+- Remove smpflags, as that results in somehow broken libs (apps using them
+  crash on exit ?)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dsd at fedoraproject.org  Tue Dec  1 08:38:32 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 08:38:32 +0000 (UTC)
Subject: File etoys-4.0.2339.tar.gz uploaded to lookaside cache by dsd
Message-ID: <20091201083832.ED7C810F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for etoys:

724dab8825ea535bb2c89e7b19db01f2  etoys-4.0.2339.tar.gz



From sharkcz at fedoraproject.org  Tue Dec  1 08:39:44 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  1 Dec 2009 08:39:44 +0000 (UTC)
Subject: rpms/mt-st/F-12 mt-st.spec,1.30,1.31 stinit.init,1.1,1.2
Message-ID: <20091201083944.CA62611C00DE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/mt-st/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15640

Modified Files:
	mt-st.spec stinit.init 
Log Message:
* Thu Nov 26 2009 Dan Hor?k <dan[at]danny.cz> - 1.1-4
- stinit initscript updated (#541592)
- fixed License



Index: mt-st.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mt-st/F-12/mt-st.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mt-st.spec	25 Jul 2009 15:19:18 -0000	1.30
+++ mt-st.spec	1 Dec 2009 08:39:44 -0000	1.31
@@ -1,8 +1,8 @@
 Summary: Tool for controlling tape drives
 Name: mt-st
 Version: 1.1
-Release: 3%{?dist}
-License: GPLv2
+Release: 4%{?dist}
+License: GPL+
 Group: Applications/System
 URL: ftp://ftp.ibiblio.org/pub/linux/system/backup
 Source0: ftp://metalab.unc.edu/pub/Linux/system/backup/mt-st-%{version}.tar.gz
@@ -13,8 +13,8 @@ Patch2: mt-st-0.7-config-files.patch
 Patch3: mt-st-0.9b-manfix.patch
 Patch4: mt-st-1.1-mtio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
+Requires(post): chkconfig
+Requires(preun): chkconfig
 
 %description
 The mt-st package contains the mt and st tape drive management
@@ -23,6 +23,7 @@ can control rewinding, ejecting, skippin
 
 Install mt-st if you need a tool to  manage tape drives.
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .redhat
@@ -37,16 +38,20 @@ iconv -f ISO8859-1 -t UTF-8 -o $f.new $f
 touch -r $f $f.new
 mv $f.new $f
 
+
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
 
+
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 make install mandir=%{_mandir}
 install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/stinit
 
+
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post
 /sbin/chkconfig --add stinit
@@ -56,15 +61,21 @@ if [ $1 -eq 0 ]; then
     /sbin/chkconfig --del stinit
 fi
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README README.stinit mt-st-1.1.lsm stinit.def.examples
 /bin/mt
 /sbin/stinit
 %{_mandir}/man[18]/*
 %{_initddir}/stinit
 
+
 %changelog
+* Thu Nov 26 2009 Dan Hor?k <dan[at]danny.cz> - 1.1-4
+- stinit initscript updated (#541592)
+- fixed License
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: stinit.init
===================================================================
RCS file: /cvs/pkgs/rpms/mt-st/F-12/stinit.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- stinit.init	26 May 2008 12:57:18 -0000	1.1
+++ stinit.init	1 Dec 2009 08:39:44 -0000	1.2
@@ -1,21 +1,35 @@
 #!/bin/bash
 #
-# stinit	This calls /sbin/stinit if /etc/stinit.def exists
+# stinit	Initialize SCSI tape drives
 # 
-# chkconfig: 2345 40 99
-# description: calls stinit if /etc/stinit.def exists
+# chkconfig: - 90 10
+# description: Initialize SCSI tape drives with /sbin/stinit
+# config: /etc/stinit.def
+
+# BEGIN INIT INFO
+# Provides:          stinit
+# Default-Start:
+# Default-Stop:      0 1 2 3 4 5 6
+# Short-Description: Initialize SCSI tape drives
+# Description:       Initialize SCSI tape drives
+# END INIT INFO
 
 . /etc/init.d/functions
 
+exec=/sbin/stinit
+config=/etc/stinit.def
+
 # See how we were called.
 case "$1" in
   start)
-	[ -f /etc/stinit.def ] && /sbin/stinit
+        [ -x $exec ] || exit 5
+        [ -f $config ] || exit 6
+	$exec
         ;;
   stop)
 	;;
   *)
         echo $"Usage: $0 {start}"
-        exit 1
+        exit 2
 esac
 exit 0



From sharkcz at fedoraproject.org  Tue Dec  1 08:48:49 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  1 Dec 2009 08:48:49 +0000 (UTC)
Subject: rpms/atari++/F-12 .cvsignore, 1.3, 1.4 atari++-verbose.patch, 1.1, 
	1.2 atari++.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20091201084849.7316A11C00DE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atari++/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18257

Modified Files:
	.cvsignore atari++-verbose.patch atari++.spec sources 
Log Message:
* Mon Nov 30 2009 Dan Hor?k <dan[at]danny.cz> 1.58-1
- updated to version 1.58
- used better patch for the making the build output verbose



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2009 10:45:25 -0000	1.3
+++ .cvsignore	1 Dec 2009 08:48:48 -0000	1.4
@@ -1 +1 @@
-atari++_1.57.tar.gz
+atari++_1.58.tar.gz

atari++-verbose.patch:
 Makefile.atari |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Index: atari++-verbose.patch
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-12/atari++-verbose.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- atari++-verbose.patch	23 Nov 2008 20:32:02 -0000	1.1
+++ atari++-verbose.patch	1 Dec 2009 08:48:48 -0000	1.2
@@ -1,37 +1,44 @@
---- atari++/Makefile.atari.orig	2008-11-19 16:20:08.000000000 +0100
-+++ atari++/Makefile.atari	2008-11-19 16:21:07.000000000 +0100
-@@ -141,28 +141,24 @@ config.status:	configure
+diff -up atari++/Makefile.atari.SILENTose atari++/Makefile.atari
+--- atari++/Makefile.atari.SILENTose	2009-11-30 12:11:59.000000000 +0100
++++ atari++/Makefile.atari	2009-11-30 12:19:27.000000000 +0100
+@@ -71,6 +71,12 @@ INCLUDES	=	types.h $(foreach file,$(FILE
+ SOURCES		=	$(foreach file,$(FILES),$(file).cpp)
+ OBJECTS		=	$(foreach file,$(FILES),$(file).o)
+ 
++ifeq ($(V),1)
++SILENT=
++else
++SILENT=@
++endif
++
  ###################################################################################
  
- %.d: %.cpp
--	@ $(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
-+	$(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
- 		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
- 		[ -s $@ ] || rm -f $@'
+ debug	:	
+@@ -147,22 +153,22 @@ config.status:	configure
  
  %.o: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.o: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.s: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  %.s: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  atari++		:	$(OBJECTS)
 -	@ $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
-+	$(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
++	$(SILENT) $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
  
  dox		:	$(SOURCES) $(INCLUDES)
  	doxygen Doxyfile


Index: atari++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-12/atari++.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- atari++.spec	25 Aug 2009 10:45:25 -0000	1.6
+++ atari++.spec	1 Dec 2009 08:48:48 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           atari++
-Version:        1.57
+Version:        1.58
 Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
@@ -36,7 +36,7 @@ mv $f.new $f
 
 %build
 %configure
-make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0"
+make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0" V=1
 
 
 %install
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 30 2009 Dan Hor?k <dan[at]danny.cz> 1.58-1
+- updated to version 1.58
+- used better patch for the making the build output verbose
+
 * Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
 - update to version 1.57
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 10:45:26 -0000	1.4
+++ sources	1 Dec 2009 08:48:48 -0000	1.5
@@ -1 +1 @@
-4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz
+acb7c15fc2a848440d62252661ac2b97  atari++_1.58.tar.gz



From sharkcz at fedoraproject.org  Tue Dec  1 08:49:39 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  1 Dec 2009 08:49:39 +0000 (UTC)
Subject: rpms/atari++/F-11 .cvsignore, 1.3, 1.4 atari++-verbose.patch, 1.1, 
	1.2 atari++.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091201084939.A4DBF11C00DE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atari++/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18598

Modified Files:
	.cvsignore atari++-verbose.patch atari++.spec sources 
Log Message:
* Mon Nov 30 2009 Dan Hor?k <dan[at]danny.cz> 1.58-1
- updated to version 1.58
- used better patch for the making the build output verbose



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2009 10:49:14 -0000	1.3
+++ .cvsignore	1 Dec 2009 08:49:39 -0000	1.4
@@ -1 +1 @@
-atari++_1.57.tar.gz
+atari++_1.58.tar.gz

atari++-verbose.patch:
 Makefile.atari |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Index: atari++-verbose.patch
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-11/atari++-verbose.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- atari++-verbose.patch	23 Nov 2008 20:32:02 -0000	1.1
+++ atari++-verbose.patch	1 Dec 2009 08:49:39 -0000	1.2
@@ -1,37 +1,44 @@
---- atari++/Makefile.atari.orig	2008-11-19 16:20:08.000000000 +0100
-+++ atari++/Makefile.atari	2008-11-19 16:21:07.000000000 +0100
-@@ -141,28 +141,24 @@ config.status:	configure
+diff -up atari++/Makefile.atari.SILENTose atari++/Makefile.atari
+--- atari++/Makefile.atari.SILENTose	2009-11-30 12:11:59.000000000 +0100
++++ atari++/Makefile.atari	2009-11-30 12:19:27.000000000 +0100
+@@ -71,6 +71,12 @@ INCLUDES	=	types.h $(foreach file,$(FILE
+ SOURCES		=	$(foreach file,$(FILES),$(file).cpp)
+ OBJECTS		=	$(foreach file,$(FILES),$(file).o)
+ 
++ifeq ($(V),1)
++SILENT=
++else
++SILENT=@
++endif
++
  ###################################################################################
  
- %.d: %.cpp
--	@ $(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
-+	$(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
- 		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
- 		[ -s $@ ] || rm -f $@'
+ debug	:	
+@@ -147,22 +153,22 @@ config.status:	configure
  
  %.o: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.o: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.s: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  %.s: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  atari++		:	$(OBJECTS)
 -	@ $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
-+	$(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
++	$(SILENT) $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
  
  dox		:	$(SOURCES) $(INCLUDES)
  	doxygen Doxyfile


Index: atari++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-11/atari++.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- atari++.spec	25 Aug 2009 10:49:15 -0000	1.5
+++ atari++.spec	1 Dec 2009 08:49:39 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           atari++
-Version:        1.57
+Version:        1.58
 Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
@@ -36,7 +36,7 @@ mv $f.new $f
 
 %build
 %configure
-make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0"
+make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0" V=1
 
 
 %install
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 30 2009 Dan Hor?k <dan[at]danny.cz> 1.58-1
+- updated to version 1.58
+- used better patch for the making the build output verbose
+
 * Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
 - update to version 1.57
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 10:49:15 -0000	1.4
+++ sources	1 Dec 2009 08:49:39 -0000	1.5
@@ -1 +1 @@
-4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz
+acb7c15fc2a848440d62252661ac2b97  atari++_1.58.tar.gz



From sharkcz at fedoraproject.org  Tue Dec  1 08:50:33 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  1 Dec 2009 08:50:33 +0000 (UTC)
Subject: rpms/atari++/F-10 .cvsignore, 1.3, 1.4 atari++-verbose.patch, 1.1, 
	1.2 atari++.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091201085033.7738511C03DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atari++/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18845

Modified Files:
	.cvsignore atari++-verbose.patch atari++.spec sources 
Log Message:
* Mon Nov 30 2009 Dan Hor?k <dan[at]danny.cz> 1.58-1
- updated to version 1.58
- used better patch for the making the build output verbose



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2009 10:50:42 -0000	1.3
+++ .cvsignore	1 Dec 2009 08:50:33 -0000	1.4
@@ -1 +1 @@
-atari++_1.57.tar.gz
+atari++_1.58.tar.gz

atari++-verbose.patch:
 Makefile.atari |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Index: atari++-verbose.patch
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-10/atari++-verbose.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- atari++-verbose.patch	23 Nov 2008 21:01:45 -0000	1.1
+++ atari++-verbose.patch	1 Dec 2009 08:50:33 -0000	1.2
@@ -1,37 +1,44 @@
---- atari++/Makefile.atari.orig	2008-11-19 16:20:08.000000000 +0100
-+++ atari++/Makefile.atari	2008-11-19 16:21:07.000000000 +0100
-@@ -141,28 +141,24 @@ config.status:	configure
+diff -up atari++/Makefile.atari.SILENTose atari++/Makefile.atari
+--- atari++/Makefile.atari.SILENTose	2009-11-30 12:11:59.000000000 +0100
++++ atari++/Makefile.atari	2009-11-30 12:19:27.000000000 +0100
+@@ -71,6 +71,12 @@ INCLUDES	=	types.h $(foreach file,$(FILE
+ SOURCES		=	$(foreach file,$(FILES),$(file).cpp)
+ OBJECTS		=	$(foreach file,$(FILES),$(file).o)
+ 
++ifeq ($(V),1)
++SILENT=
++else
++SILENT=@
++endif
++
  ###################################################################################
  
- %.d: %.cpp
--	@ $(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
-+	$(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
- 		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
- 		[ -s $@ ] || rm -f $@'
+ debug	:	
+@@ -147,22 +153,22 @@ config.status:	configure
  
  %.o: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.o: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.s: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  %.s: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  atari++		:	$(OBJECTS)
 -	@ $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
-+	$(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
++	$(SILENT) $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
  
  dox		:	$(SOURCES) $(INCLUDES)
  	doxygen Doxyfile


Index: atari++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-10/atari++.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- atari++.spec	25 Aug 2009 10:50:42 -0000	1.3
+++ atari++.spec	1 Dec 2009 08:50:33 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           atari++
-Version:        1.57
+Version:        1.58
 Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
@@ -36,7 +36,7 @@ mv $f.new $f
 
 %build
 %configure
-make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0"
+make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0" V=1
 
 
 %install
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 30 2009 Dan Hor?k <dan[at]danny.cz> 1.58-1
+- updated to version 1.58
+- used better patch for the making the build output verbose
+
 * Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
 - update to version 1.57
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 10:50:42 -0000	1.4
+++ sources	1 Dec 2009 08:50:33 -0000	1.5
@@ -1 +1 @@
-4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz
+acb7c15fc2a848440d62252661ac2b97  atari++_1.58.tar.gz



From sharkcz at fedoraproject.org  Tue Dec  1 08:53:06 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  1 Dec 2009 08:53:06 +0000 (UTC)
Subject: rpms/atari++/EL-5 .cvsignore, 1.3, 1.4 atari++-verbose.patch, 1.1, 
	1.2 atari++.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091201085306.8C43511C00DE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atari++/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19695

Modified Files:
	.cvsignore atari++-verbose.patch atari++.spec sources 
Log Message:
* Mon Nov 30 2009 Dan Hor?k <dan[at]danny.cz> 1.58-1
- updated to version 1.58
- used better patch for the making the build output verbose



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2009 10:51:34 -0000	1.3
+++ .cvsignore	1 Dec 2009 08:53:06 -0000	1.4
@@ -1 +1 @@
-atari++_1.57.tar.gz
+atari++_1.58.tar.gz

atari++-verbose.patch:
 Makefile.atari |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Index: atari++-verbose.patch
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/EL-5/atari++-verbose.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- atari++-verbose.patch	23 Nov 2008 20:32:02 -0000	1.1
+++ atari++-verbose.patch	1 Dec 2009 08:53:06 -0000	1.2
@@ -1,37 +1,44 @@
---- atari++/Makefile.atari.orig	2008-11-19 16:20:08.000000000 +0100
-+++ atari++/Makefile.atari	2008-11-19 16:21:07.000000000 +0100
-@@ -141,28 +141,24 @@ config.status:	configure
+diff -up atari++/Makefile.atari.SILENTose atari++/Makefile.atari
+--- atari++/Makefile.atari.SILENTose	2009-11-30 12:11:59.000000000 +0100
++++ atari++/Makefile.atari	2009-11-30 12:19:27.000000000 +0100
+@@ -71,6 +71,12 @@ INCLUDES	=	types.h $(foreach file,$(FILE
+ SOURCES		=	$(foreach file,$(FILES),$(file).cpp)
+ OBJECTS		=	$(foreach file,$(FILES),$(file).o)
+ 
++ifeq ($(V),1)
++SILENT=
++else
++SILENT=@
++endif
++
  ###################################################################################
  
- %.d: %.cpp
--	@ $(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
-+	$(SHELL) -ec '$(CC) $(CFLAGS) -MM $< \
- 		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
- 		[ -s $@ ] || rm -f $@'
+ debug	:	
+@@ -147,22 +153,22 @@ config.status:	configure
  
  %.o: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.o: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $*.cpp
  
  %.s: %.cpp %.hpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  %.s: %.cpp
--	@ $(ECHO) "Compiling" $*.cpp
+ 	@ $(ECHO) "Compiling" $*.cpp
 -	@ $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
-+	$(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
++	$(SILENT) $(CXX) $(CFLAGS) $(ADDFLAGS) $(OPTIMIZER) $(TOASM) $*.cpp
  
  atari++		:	$(OBJECTS)
 -	@ $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
-+	$(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
++	$(SILENT) $(LD) $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(ADDLIBS) -o atari++
  
  dox		:	$(SOURCES) $(INCLUDES)
  	doxygen Doxyfile


Index: atari++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/EL-5/atari++.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- atari++.spec	25 Aug 2009 10:51:34 -0000	1.3
+++ atari++.spec	1 Dec 2009 08:53:06 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           atari++
-Version:        1.57
+Version:        1.58
 Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
@@ -36,7 +36,7 @@ mv $f.new $f
 
 %build
 %configure
-make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0"
+make %{?_smp_mflags} OPTIMIZER="$RPM_OPT_FLAGS -DDEBUG_LEVEL=0 -DCHECK_LEVEL=0" V=1
 
 
 %install
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 30 2009 Dan Hor?k <dan[at]danny.cz> 1.58-1
+- updated to version 1.58
+- used better patch for the making the build output verbose
+
 * Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
 - update to version 1.57
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 10:51:34 -0000	1.4
+++ sources	1 Dec 2009 08:53:06 -0000	1.5
@@ -1 +1 @@
-4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz
+acb7c15fc2a848440d62252661ac2b97  atari++_1.58.tar.gz



From arbiter at fedoraproject.org  Tue Dec  1 08:54:46 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 08:54:46 +0000 (UTC)
Subject: File cherokee-0.99.30.tar.gz uploaded to lookaside cache by arbiter
Message-ID: <20091201085446.A4A4F10F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for cherokee:

a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz



From lucilanga at fedoraproject.org  Tue Dec  1 08:55:35 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  1 Dec 2009 08:55:35 +0000 (UTC)
Subject: rpms/cpmtools/F-11 cpmtools-2.11-overflow.patch, NONE,
	1.1 cpmtools.spec, 1.3, 1.4
Message-ID: <20091201085535.987A011C00DE@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	cpmtools.spec 
Added Files:
	cpmtools-2.11-overflow.patch 
Log Message:
patch to fix crash in cpmcp

cpmtools-2.11-overflow.patch:
 cpmcp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cpmtools-2.11-overflow.patch ---
diff -Naur cpmtools-2.11/cpmcp.c cpmtools-2.11-mod/cpmcp.c
--- cpmtools-2.11/cpmcp.c	2009-07-27 21:38:57.000000000 +0300
+++ cpmtools-2.11-mod/cpmcp.c	2009-12-01 10:24:51.000000000 +0200
@@ -225,7 +225,7 @@
       else
       {
         struct cpmInode ino;
-        char cpmname[2+8+3+1]; /* 00foobarxy.zzy\0 */
+        char cpmname[2+8+1+3+1]; /* 00foobarxy.zzy\0 */
 
         if (todir)
         {


Index: cpmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/F-11/cpmtools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpmtools.spec	29 Nov 2009 20:53:00 -0000	1.3
+++ cpmtools.spec	1 Dec 2009 08:55:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		cpmtools
 Version:	2.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Programs for accessing CP/M disks
 
 Group:		Applications/System
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 01 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-2
+- new upstream release
+
 * Sun Nov 29 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-1
 - new upstream release
 



From arbiter at fedoraproject.org  Tue Dec  1 08:55:55 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 08:55:55 +0000 (UTC)
Subject: rpms/cherokee/devel .cvsignore, 1.13, 1.14 cherokee.spec, 1.23,
	1.24 sources, 1.13, 1.14
Message-ID: <20091201085555.EB4D011C00DE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
- 0.99.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Nov 2009 14:35:26 -0000	1.13
+++ .cvsignore	1 Dec 2009 08:55:55 -0000	1.14
@@ -1 +1 @@
-cherokee-0.99.29.tar.gz
+cherokee-0.99.30.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- cherokee.spec	22 Nov 2009 14:35:26 -0000	1.23
+++ cherokee.spec	1 Dec 2009 08:55:55 -0000	1.24
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.29
+Version:        0.99.30
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -27,8 +27,8 @@ BuildRequires:  openssl-devel pam-devel 
 # BuildRequires:  pcre-devel
 BuildRequires:  gettext
 # For spawn-fcgi
-Requires:	    spawn-fcgi
-Requires(post): chkconfig
+Requires:	 spawn-fcgi
+Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
+- 0.99.30
+
 * Sun Nov 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.29-1
 - 0.99.29
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 Nov 2009 14:35:26 -0000	1.13
+++ sources	1 Dec 2009 08:55:55 -0000	1.14
@@ -1 +1 @@
-236f17981c0c8908f6911fda239fc3a4  cherokee-0.99.29.tar.gz
+a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz



From dsd at fedoraproject.org  Tue Dec  1 08:57:07 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 08:57:07 +0000 (UTC)
Subject: File olpc-library-2.0.3.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091201085707.29C0110F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for olpc-library:

78da576486a364caf3b8d489662fb55d  olpc-library-2.0.3.tar.bz2



From kaigai at fedoraproject.org  Tue Dec  1 09:00:03 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue,  1 Dec 2009 09:00:03 +0000 (UTC)
Subject: rpms/mod_selinux/devel mod_selinux.spec,1.4,1.5
Message-ID: <20091201090003.4450711C03F6@cvs1.fedora.phx.redhat.com>

Author: kaigai

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

Modified Files:
	mod_selinux.spec 
Log Message:
rebuild for rawhide due to the new base security policy



Index: mod_selinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_selinux/devel/mod_selinux.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mod_selinux.spec	25 Jul 2009 14:55:29 -0000	1.4
+++ mod_selinux.spec	1 Dec 2009 09:00:02 -0000	1.5
@@ -1,15 +1,15 @@
 %define selinux_policy_types targeted mls
 
 Name: mod_selinux
-Version: 2.2.2015
-Release: 2%{?dist}
+Version: 2.2.2454
+Release: 1%{?dist}
 Summary: Apache/SELinux plus module
 Group: System Environment/Daemons
 License: ASL 2.0
 URL: http://code.google.com/p/sepgsql/
 Source0: http://sepgsql.googlecode.com/files/%{name}-%{version}.tgz
 Source1: %{name}.conf
-BuildRequires: httpd-devel >= 2.2.0 libselinux-devel checkpolicy >= 2.0.19 selinux-policy
+BuildRequires: httpd-devel >= 2.2.0 libselinux-devel checkpolicy >= 2.0.19 policycoreutils selinux-policy
 Requires: kernel >= 2.6.28 httpd >= 2.2.0 policycoreutils selinux-policy
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -84,6 +84,9 @@ fi
 %{_datadir}/selinux/*/%{name}.pp
 
 %changelog
+* Fri Dec  4 2009 KaiGai Kohei <kaigai at ak.jp.nec.com> - 2.2.2454-1
+- rebuild for the base policy of F-13
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2015-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dsd at fedoraproject.org  Tue Dec  1 09:03:06 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:03:06 +0000 (UTC)
Subject: rpms/etoys/devel .cvsignore, 1.10, 1.11 etoys.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <20091201090306.18C5311C00DE@cvs1.fedora.phx.redhat.com>

Author: dsd

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

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
v4.0.2339


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Oct 2009 16:38:57 -0000	1.10
+++ .cvsignore	1 Dec 2009 09:03:05 -0000	1.11
@@ -1 +1 @@
-etoys-4.0.2332.tar.gz
+etoys-4.0.2339.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- etoys.spec	23 Nov 2009 13:05:36 -0000	1.12
+++ etoys.spec	1 Dec 2009 09:03:05 -0000	1.13
@@ -1,6 +1,6 @@
 %define name    etoys
-%define version 4.0.2332
-%define release 2%{?dist}
+%define version 4.0.2339
+%define release 1%{?dist}
 %define source  %{name}-%{version}
 
 Name:           %{name}
@@ -44,6 +44,7 @@ be done over the Internet.
 Summary: Sugar activity wrapper for Etoys
 Group:   Sugar/Activities
 Requires: sugar
+Requires: etoys
 
 %description sugar
 A Sugar activity that launches Etoys within the Sugar environment.
@@ -143,9 +144,13 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %files sugar
+%defattr(-,root,root,-)
 %{_datadir}/sugar/activities/*
 
 %changelog
+* Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 4.0.2339-1
+- new upstream release
+
 * Mon Nov 23 2009 Daniel Drake <dsd at laptop.org> - 4.0.2332-2
 - don't own /usr/share/sugar/activities and move sugar activity to subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Oct 2009 16:38:57 -0000	1.10
+++ sources	1 Dec 2009 09:03:05 -0000	1.11
@@ -1 +1 @@
-8802636e2ea8e55ec2487dc209cf7ff2  etoys-4.0.2332.tar.gz
+724dab8825ea535bb2c89e7b19db01f2  etoys-4.0.2339.tar.gz



From kaigai at fedoraproject.org  Tue Dec  1 09:03:54 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue,  1 Dec 2009 09:03:54 +0000 (UTC)
Subject: File mod_selinux-2.2.2454.tgz uploaded to lookaside cache by kaigai
Message-ID: <20091201090354.05C3A10F867@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mod_selinux:

ce5c6838b52eac9e998bbbf90d717083  mod_selinux-2.2.2454.tgz



From kaigai at fedoraproject.org  Tue Dec  1 09:04:51 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue,  1 Dec 2009 09:04:51 +0000 (UTC)
Subject: rpms/mod_selinux/devel .cvsignore, 1.4, 1.5 mod_selinux.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20091201090451.4615C11C00DE@cvs1.fedora.phx.redhat.com>

Author: kaigai

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

Modified Files:
	.cvsignore mod_selinux.spec sources 
Log Message:
forgot to upload the new source tarball...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_selinux/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jun 2009 04:07:15 -0000	1.4
+++ .cvsignore	1 Dec 2009 09:04:50 -0000	1.5
@@ -1 +1 @@
-mod_selinux-2.2.2015.tgz
+mod_selinux-2.2.2454.tgz


Index: mod_selinux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_selinux/devel/mod_selinux.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mod_selinux.spec	1 Dec 2009 09:00:02 -0000	1.5
+++ mod_selinux.spec	1 Dec 2009 09:04:50 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: mod_selinux
 Version: 2.2.2454
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Apache/SELinux plus module
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -84,7 +84,7 @@ fi
 %{_datadir}/selinux/*/%{name}.pp
 
 %changelog
-* Fri Dec  4 2009 KaiGai Kohei <kaigai at ak.jp.nec.com> - 2.2.2454-1
+* Fri Dec  4 2009 KaiGai Kohei <kaigai at ak.jp.nec.com> - 2.2.2454-2
 - rebuild for the base policy of F-13
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2015-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_selinux/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jun 2009 04:07:15 -0000	1.4
+++ sources	1 Dec 2009 09:04:50 -0000	1.5
@@ -1 +1 @@
-b07b69aa7587e9b183aac2a5e3f3b540  mod_selinux-2.2.2015.tgz
+ce5c6838b52eac9e998bbbf90d717083  mod_selinux-2.2.2454.tgz



From dsd at fedoraproject.org  Tue Dec  1 09:09:18 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:09:18 +0000 (UTC)
Subject: rpms/olpc-library/devel .cvsignore, 1.2, 1.3 olpc-library.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091201090918.90CAD11C00DE@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-library/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25589

Modified Files:
	.cvsignore olpc-library.spec sources 
Log Message:
v2.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Jul 2009 22:38:43 -0000	1.2
+++ .cvsignore	1 Dec 2009 09:09:18 -0000	1.3
@@ -1 +1 @@
-olpc-library-2.0.2.tar.bz2
+olpc-library-2.0.3.tar.bz2


Index: olpc-library.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/devel/olpc-library.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- olpc-library.spec	25 Jul 2009 20:39:25 -0000	1.2
+++ olpc-library.spec	1 Dec 2009 09:09:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           olpc-library
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        OLPC library files and scripts 
 
 # library.js is AGPLv1
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 2.0.3-1
+- new version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Jul 2009 22:38:44 -0000	1.2
+++ sources	1 Dec 2009 09:09:18 -0000	1.3
@@ -1 +1 @@
-7816169b15abd4ea14d56beed3afb065  olpc-library-2.0.2.tar.bz2
+78da576486a364caf3b8d489662fb55d  olpc-library-2.0.3.tar.bz2



From jsafrane at fedoraproject.org  Tue Dec  1 09:14:17 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 09:14:17 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.redhat.conf,1.3,1.4
Message-ID: <20091201091417.2E88D11C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26972

Modified Files:
	net-snmp.redhat.conf 
Log Message:
Remove support of /usr/bin/ucd5820stat


Index: net-snmp.redhat.conf
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.redhat.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- net-snmp.redhat.conf	1 Jul 2009 11:03:31 -0000	1.3
+++ net-snmp.redhat.conf	1 Dec 2009 09:14:16 -0000	1.4
@@ -456,9 +456,6 @@ dontLogTCPWrappersConnects yes
 # For specific usage information, see the man/snmpd.conf.5 manual page
 # as well as the local/passtest script used in the above example.
 
-# Added for support of bcm5820 cards.
-pass .1.3.6.1.4.1.4413.4.1 /usr/bin/ucd5820stat
-
 ###############################################################################
 # Further Information
 #



From dsd at fedoraproject.org  Tue Dec  1 09:15:34 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:15:34 +0000 (UTC)
Subject: rpms/olpc-library/F-12 .cvsignore, 1.2, 1.3 olpc-library.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <20091201091534.0F27511C00DE@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-library/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27330

Modified Files:
	.cvsignore olpc-library.spec sources 
Log Message:
v2.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Jul 2009 22:38:43 -0000	1.2
+++ .cvsignore	1 Dec 2009 09:15:33 -0000	1.3
@@ -1 +1 @@
-olpc-library-2.0.2.tar.bz2
+olpc-library-2.0.3.tar.bz2


Index: olpc-library.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/F-12/olpc-library.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- olpc-library.spec	25 Jul 2009 20:39:25 -0000	1.2
+++ olpc-library.spec	1 Dec 2009 09:15:33 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           olpc-library
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        OLPC library files and scripts 
 
 # library.js is AGPLv1
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 2.0.3-1
+- new version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Jul 2009 22:38:44 -0000	1.2
+++ sources	1 Dec 2009 09:15:33 -0000	1.3
@@ -1 +1 @@
-7816169b15abd4ea14d56beed3afb065  olpc-library-2.0.2.tar.bz2
+78da576486a364caf3b8d489662fb55d  olpc-library-2.0.3.tar.bz2



From dsd at fedoraproject.org  Tue Dec  1 09:16:22 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:16:22 +0000 (UTC)
Subject: rpms/etoys/F-12 .cvsignore, 1.9, 1.10 etoys.spec, 1.12, 1.13 sources,
	1.10, 1.11
Message-ID: <20091201091622.2630611C00DE@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/etoys/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27524

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
v4.0.2339


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 Oct 2009 16:15:23 -0000	1.9
+++ .cvsignore	1 Dec 2009 09:16:21 -0000	1.10
@@ -1 +1 @@
-etoys-4.0.2332.tar.gz
+etoys-4.0.2339.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-12/etoys.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- etoys.spec	23 Nov 2009 13:16:33 -0000	1.12
+++ etoys.spec	1 Dec 2009 09:16:21 -0000	1.13
@@ -1,6 +1,6 @@
 %define name    etoys
-%define version 4.0.2332
-%define release 2%{?dist}
+%define version 4.0.2339
+%define release 1%{?dist}
 %define source  %{name}-%{version}
 
 Name:           %{name}
@@ -44,6 +44,7 @@ be done over the Internet.
 Summary: Sugar activity wrapper for Etoys
 Group:   Sugar/Activities
 Requires: sugar
+Requires: etoys
 
 %description sugar
 A Sugar activity that launches Etoys within the Sugar environment.
@@ -143,9 +144,13 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %files sugar
+%defattr(-,root,root,-)
 %{_datadir}/sugar/activities/*
 
 %changelog
+* Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 4.0.2339-1
+- new upstream release
+
 * Mon Nov 23 2009 Daniel Drake <dsd at laptop.org> - 4.0.2332-2
 - don't own /usr/share/sugar/activities and move sugar activity to subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Oct 2009 16:15:23 -0000	1.10
+++ sources	1 Dec 2009 09:16:21 -0000	1.11
@@ -1 +1 @@
-8802636e2ea8e55ec2487dc209cf7ff2  etoys-4.0.2332.tar.gz
+724dab8825ea535bb2c89e7b19db01f2  etoys-4.0.2339.tar.gz



From dsd at fedoraproject.org  Tue Dec  1 09:17:10 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:17:10 +0000 (UTC)
Subject: File olpc-utils-1.0.12.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091201091710.5C08810F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for olpc-utils:

b12a2ae5b1ad4a7fea518a7626150476  olpc-utils-1.0.12.tar.bz2



From dsd at fedoraproject.org  Tue Dec  1 09:19:04 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:19:04 +0000 (UTC)
Subject: rpms/etoys/F-11 .cvsignore, 1.10, 1.11 etoys.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <20091201091904.7CCBA11C00DE@cvs1.fedora.phx.redhat.com>

Author: dsd

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

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
v4.0.2339


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Oct 2009 16:25:27 -0000	1.10
+++ .cvsignore	1 Dec 2009 09:19:04 -0000	1.11
@@ -1 +1 @@
-etoys-4.0.2332.tar.gz
+etoys-4.0.2339.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/etoys.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- etoys.spec	23 Nov 2009 13:30:05 -0000	1.11
+++ etoys.spec	1 Dec 2009 09:19:04 -0000	1.12
@@ -1,6 +1,6 @@
 %define name    etoys
-%define version 4.0.2332
-%define release 2%{?dist}
+%define version 4.0.2339
+%define release 1%{?dist}
 %define source  %{name}-%{version}
 
 Name:           %{name}
@@ -44,6 +44,7 @@ be done over the Internet.
 Summary: Sugar activity wrapper for Etoys
 Group:   Sugar/Activities
 Requires: sugar
+Requires: etoys
 
 %description sugar
 A Sugar activity that launches Etoys within the Sugar environment.
@@ -143,9 +144,13 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %files sugar
+%defattr(-,root,root,-)
 %{_datadir}/sugar/activities/*
 
 %changelog
+* Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 4.0.2339-1
+- new upstream release
+
 * Mon Nov 23 2009 Daniel Drake <dsd at laptop.org> - 4.0.2332-2
 - don't own /usr/share/sugar/activities and move sugar activity to subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Oct 2009 16:25:27 -0000	1.10
+++ sources	1 Dec 2009 09:19:04 -0000	1.11
@@ -1 +1 @@
-8802636e2ea8e55ec2487dc209cf7ff2  etoys-4.0.2332.tar.gz
+724dab8825ea535bb2c89e7b19db01f2  etoys-4.0.2339.tar.gz



From plindner at fedoraproject.org  Tue Dec  1 09:19:28 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Tue,  1 Dec 2009 09:19:28 +0000 (UTC)
Subject: rpms/memcached/F-11 memcached-1.2.8_proper_vlen_fix.patch, NONE,
	1.1 memcached.spec, 1.15, 1.16
Message-ID: <20091201091928.6265111C00DE@cvs1.fedora.phx.redhat.com>

Author: plindner

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

Modified Files:
	memcached.spec 
Added Files:
	memcached-1.2.8_proper_vlen_fix.patch 
Log Message:
CVE-2009-2415, Resolve 542058

memcached-1.2.8_proper_vlen_fix.patch:
 memcached.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE memcached-1.2.8_proper_vlen_fix.patch ---
diff --git a/memcached.c b/memcached.c
index 097588a..cbbbf48 100644
--- a/memcached.c
+++ b/memcached.c
@@ -1388,7 +1388,7 @@ static void process_update_command(conn *c, token_t *tokens, const size_t ntoken
 
     flags = strtoul(tokens[2].value, NULL, 10);
     exptime = strtol(tokens[3].value, NULL, 10);
-    vlen = strtol(tokens[4].value, NULL, 10);
+    vlen = strtol(tokens[4].value, NULL, 10) + 2;
 
     // does cas value exist?
     if(handle_cas)
@@ -1397,7 +1397,7 @@ static void process_update_command(conn *c, token_t *tokens, const size_t ntoken
     }
 
     if(errno == ERANGE || ((flags == 0 || exptime == 0) && errno == EINVAL)
-       || vlen < 0) {
+       || vlen < 0 || vlen - 2 < 0) {
         out_string(c, "CLIENT_ERROR bad command line format");
         return;
     }
@@ -1406,16 +1406,16 @@ static void process_update_command(conn *c, token_t *tokens, const size_t ntoken
         stats_prefix_record_set(key);
     }
 
-    it = item_alloc(key, nkey, flags, realtime(exptime), vlen+2);
+    it = item_alloc(key, nkey, flags, realtime(exptime), vlen);
 
     if (it == 0) {
-        if (! item_size_ok(nkey, flags, vlen + 2))
+        if (! item_size_ok(nkey, flags, vlen))
             out_string(c, "SERVER_ERROR object too large for cache");
         else
             out_string(c, "SERVER_ERROR out of memory storing object");
         /* swallow the data line */
         c->write_and_go = conn_swallow;
-        c->sbytes = vlen + 2;
+        c->sbytes = vlen;
 
         /* Avoid stale data persisting in cache because we failed alloc.
          * Unacceptable for SET. Anywhere else too? */


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-11/memcached.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- memcached.spec	30 Apr 2009 13:06:52 -0000	1.15
+++ memcached.spec	1 Dec 2009 09:19:28 -0000	1.16
@@ -7,7 +7,7 @@
 
 Name:           memcached
 Version:        1.2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
 Group:          System Environment/Daemons
@@ -18,6 +18,9 @@ Source0:        http://www.danga.com/mem
 # custom init script
 Source1:        memcached.sysv
 
+# Patch
+Patch:         http://consoleninja.net/code/memcached/memcached-1.2.8_proper_vlen_fix.patch
+
 # SELinux files
 Source10:       %{modulename}.te
 Source11:       %{modulename}.fc
@@ -63,7 +66,7 @@ SELinux policy module supporting memcach
 mkdir SELinux
 cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} SELinux/
 
-
+%patch -p1
 %build
 %configure --enable-threads
 
@@ -196,6 +199,11 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Paul Lindner <lindner at mirth.inuus.com> - 1.2.8-2
+- Apply patch memcached-1.2.8_proper_vlen_fix.patch
+- Addresses CVE-2009-2415
+- Resolves 542058
+
 * Wed Apr 29 2009 Paul Lindner <lindner at inuus.com> - 1.2.8-1
 - Upgrade to memcached-1.2.8
 - Addresses CVE-2009-1255



From dsd at fedoraproject.org  Tue Dec  1 09:23:11 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:23:11 +0000 (UTC)
Subject: rpms/olpc-library/F-11 .cvsignore, 1.2, 1.3 olpc-library.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20091201092311.DA80C11C00DE@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-library/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29788

Modified Files:
	.cvsignore olpc-library.spec sources 
Log Message:
v2.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Jul 2009 22:55:44 -0000	1.2
+++ .cvsignore	1 Dec 2009 09:23:11 -0000	1.3
@@ -1 +1 @@
-olpc-library-2.0.2.tar.bz2
+olpc-library-2.0.3.tar.bz2


Index: olpc-library.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/F-11/olpc-library.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- olpc-library.spec	11 Jul 2009 22:55:44 -0000	1.1
+++ olpc-library.spec	1 Dec 2009 09:23:11 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           olpc-library
-Version:        2.0.2
+Version:        2.0.3
 Release:        1%{?dist}
 Summary:        OLPC library files and scripts 
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 2.0.3-1
+- new version
+
 * Sat Jul 11 2009 Daniel Drake <dsd at laptop.org> - 2.0.2-1
 - Initial import
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-library/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Jul 2009 22:55:44 -0000	1.2
+++ sources	1 Dec 2009 09:23:11 -0000	1.3
@@ -1 +1 @@
-7816169b15abd4ea14d56beed3afb065  olpc-library-2.0.2.tar.bz2
+78da576486a364caf3b8d489662fb55d  olpc-library-2.0.3.tar.bz2



From dsd at fedoraproject.org  Tue Dec  1 09:35:14 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:35:14 +0000 (UTC)
Subject: rpms/olpc-utils/devel .cvsignore, 1.11, 1.12 olpc-utils.spec, 1.20, 
	1.21 sources, 1.13, 1.14
Message-ID: <20091201093514.E2D2711C00DE@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1905

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	26 Nov 2009 16:44:24 -0000	1.11
+++ .cvsignore	1 Dec 2009 09:35:14 -0000	1.12
@@ -1 +1 @@
-olpc-utils-1.0.11.tar.bz2
+olpc-utils-1.0.12.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- olpc-utils.spec	26 Nov 2009 16:44:24 -0000	1.20
+++ olpc-utils.spec	1 Dec 2009 09:35:14 -0000	1.21
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.11
+Version:    1.0.12
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Tue Dec  2 2009 Daniel Drake <dsd at laptop.org> - 1.0.12-1
+- Bump to v1.0.12
+
 * Thu Nov 26 2009 Daniel Drake <dsd at laptop.org> - 1.0.11-1
 - Bump to v1.0.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Nov 2009 16:44:24 -0000	1.13
+++ sources	1 Dec 2009 09:35:14 -0000	1.14
@@ -1 +1 @@
-2a3ac6dc7530ea5742ecc789198c58e0  olpc-utils-1.0.11.tar.bz2
+b12a2ae5b1ad4a7fea518a7626150476  olpc-utils-1.0.12.tar.bz2



From varekova at fedoraproject.org  Tue Dec  1 09:37:43 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue,  1 Dec 2009 09:37:43 +0000 (UTC)
Subject: rpms/man/devel man-1.6f-diff.patch,NONE,1.1 man.spec,1.84,1.85
Message-ID: <20091201093743.B148511C00DE@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	man.spec 
Added Files:
	man-1.6f-diff.patch 
Log Message:
- fix the problem: #542852 -  'man cut cut' throws an error


man-1.6f-diff.patch:
 different.c |   35 +++++++++++++++++++++++++++++++++++
 different.h |    3 +++
 man.c       |    5 +++++
 3 files changed, 43 insertions(+)

--- NEW FILE man-1.6f-diff.patch ---
diff -up man-1.6f/src/different.c.orig man-1.6f/src/different.c
--- man-1.6f/src/different.c.orig	2009-12-01 09:48:00.000000000 +0100
+++ man-1.6f/src/different.c	2009-12-01 09:53:28.000000000 +0100
@@ -35,6 +35,41 @@ is_different(const char *file, struct fi
     return 1;
 }
 
+int free_cat_filelist(void) {
+    struct filelist *acct, *next;
+
+    acct = &cat_list;
+    while (acct->next != NULL) {
+	next = acct->next;
+	if (acct != &cat_list)
+	    free(acct);
+	acct = next;
+    }
+
+    if (acct != &cat_list)
+	free(acct);
+    cat_list.next = NULL;
+
+    return 0;
+}
+
+int free_man_filelist(void) {
+    struct filelist *acct, *next;
+
+    acct = &man_list;
+    while (acct->next != NULL) {
+	next = acct->next;
+	if (acct != &man_list)
+	    free(acct);
+	acct = next;
+    }
+    if (acct != &man_list)
+	free(acct);
+    man_list.next = NULL;
+
+    return 0;
+}
+
 int
 different_cat_file (const char *file) {
     return is_different (file, &cat_list);
diff -up man-1.6f/src/different.h.orig man-1.6f/src/different.h
--- man-1.6f/src/different.h.orig	2009-12-01 09:48:00.000000000 +0100
+++ man-1.6f/src/different.h	2009-12-01 09:42:59.000000000 +0100
@@ -1,2 +1,5 @@
 int different_cat_file (const char *file);
 int different_man_file (const char *file);
+int free_cat_filelist(void);
+int free_man_filelist(void);
+
diff -up man-1.6f/src/man.c.orig man-1.6f/src/man.c
--- man-1.6f/src/man.c.orig	2009-12-01 09:48:00.000000000 +0100
+++ man-1.6f/src/man.c	2009-12-01 09:56:33.000000000 +0100
@@ -1410,6 +1410,11 @@ main (int argc, char **argv) {
 			 gripe (NO_SUCH_ENTRY, nextarg);
 	       }
 	  }
+	/* it is necessary to free the lists of found man pages
+	   #542852 - 'man cut cut' throws an error */
+	free_cat_filelist();
+	free_man_filelist();
+
      }
      return status ? EXIT_SUCCESS : EXIT_FAILURE;
 }


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- man.spec	12 Oct 2009 08:10:04 -0000	1.84
+++ man.spec	1 Dec 2009 09:37:43 -0000	1.85
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 23%{?dist}
+Release: 24%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -40,6 +40,8 @@ Patch36: man-1.6f-makewhatis_update.patc
 Patch37: man-1.6f-makewhatis_perf.patch
 Patch38: man-1.6f-makewhatis_use.patch
 Patch39: man-1.6f-man2html-suffixes.patch
+# 542852 -  'man cut cut' throws an error
+Patch40: man-1.6f-diff.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -86,6 +88,7 @@ primary way to find documentation on a L
 %patch37 -p1 -b .perf
 %patch38 -p1 -b .use
 %patch39 -p1 -b .suff
+%patch40 -p1 -b .diff
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -269,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-24
+- fix the problem: #542852 -  'man cut cut' throws an error
+
 * Mon Oct 12 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-23
 - fix man2html to enable to use longer suffixes (#526112)
 



From dsd at fedoraproject.org  Tue Dec  1 09:42:28 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  1 Dec 2009 09:42:28 +0000 (UTC)
Subject: rpms/olpc-utils/F-11 .cvsignore, 1.9, 1.10 olpc-utils.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20091201094228.D284111C00DE@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4524

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Nov 2009 16:44:49 -0000	1.9
+++ .cvsignore	1 Dec 2009 09:42:28 -0000	1.10
@@ -1 +1 @@
-olpc-utils-1.0.11.tar.bz2
+olpc-utils-1.0.12.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- olpc-utils.spec	26 Nov 2009 16:44:49 -0000	1.18
+++ olpc-utils.spec	1 Dec 2009 09:42:28 -0000	1.19
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.11
+Version:    1.0.12
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Tue Dec  2 2009 Daniel Drake <dsd at laptop.org> - 1.0.12-1
+- Bump to v1.0.12
+
 * Thu Nov 26 2009 Daniel Drake <dsd at laptop.org> - 1.0.11-1
 - Bump to v1.0.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	26 Nov 2009 16:44:49 -0000	1.12
+++ sources	1 Dec 2009 09:42:28 -0000	1.13
@@ -1 +1 @@
-2a3ac6dc7530ea5742ecc789198c58e0  olpc-utils-1.0.11.tar.bz2
+b12a2ae5b1ad4a7fea518a7626150476  olpc-utils-1.0.12.tar.bz2



From jwrdegoede at fedoraproject.org  Tue Dec  1 09:50:01 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 09:50:01 +0000 (UTC)
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.46, 
	1.47
Message-ID: <20091201095001.5577D11C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7731

Modified Files:
	iscsi-initiator-utils.spec 
Log Message:
* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-11
- Own /etc/iscsi (#542849)
- Do not own /etc/NetworkManager/dispatcher.d (#533700)



Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- iscsi-initiator-utils.spec	25 Jul 2009 03:38:16 -0000	1.46
+++ iscsi-initiator-utils.spec	1 Dec 2009 09:50:01 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 10%{?dist}.1
+Release: 11%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -26,6 +26,8 @@ License: GPLv2+
 URL: http://www.open-iscsi.org
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel flex bison python-devel doxygen glibc-static
+# For dir ownership
+Requires: initscripts
 Requires(post): chkconfig
 Requires(preun): chkconfig /sbin/service
 
@@ -147,7 +149,8 @@ fi
 %dir %{_var}/lock/iscsi
 %{_initrddir}/iscsi
 %{_initrddir}/iscsid
-%{_sysconfdir}/NetworkManager
+%{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi
+%dir %{_sysconfdir}/iscsi
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
 /sbin/*
 %{_libdir}/libiscsi.so.0
@@ -161,6 +164,10 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-11
+- Own /etc/iscsi (#542849)
+- Do not own /etc/NetworkManager/dispatcher.d (#533700)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2.0.870-10.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Tue Dec  1 09:59:31 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  1 Dec 2009 09:59:31 +0000 (UTC)
Subject: rpms/s390utils/F-12 cpi.initd, 1.1, 1.2 s390utils.spec, 1.14,
	1.15 zfcpconf.sh, 1.2, 1.3
Message-ID: <20091201095931.A206711C00DE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11448

Modified Files:
	cpi.initd s390utils.spec zfcpconf.sh 
Log Message:
* Tue Dec  1 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
- fixed return value in cpi initscript (#541389)
- updated zfcpconf.sh script from dracut



Index: cpi.initd
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/cpi.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpi.initd	9 Nov 2009 19:28:41 -0000	1.1
+++ cpi.initd	1 Dec 2009 09:59:31 -0000	1.2
@@ -33,6 +33,8 @@ prog="cpi"
 cpipath=/sys/firmware/cpi
 
 start() {
+    [ `id -u` -eq 0 ] || return 4
+    
     echo -n $"Starting $prog: "
 
     if [ -d $cpipath ]; then


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/s390utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- s390utils.spec	13 Nov 2009 10:21:17 -0000	1.14
+++ s390utils.spec	1 Dec 2009 09:59:31 -0000	1.15
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -798,6 +798,10 @@ User-space development files for the s39
 
 
 %changelog
+* Tue Dec  1 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
+- fixed return value in cpi initscript (#541389)
+- updated zfcpconf.sh script from dracut
+
 * Fri Nov 13 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-5
 - added multiple fixes from IBM (#533955, #537142, #537144)
 


Index: zfcpconf.sh
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/zfcpconf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zfcpconf.sh	30 Sep 2009 20:10:50 -0000	1.2
+++ zfcpconf.sh	1 Dec 2009 09:59:31 -0000	1.3
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # config file syntax:
 # deviceno   WWPN   FCPLUN
@@ -22,22 +22,34 @@ CONFIG=/etc/zfcp.conf
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 if [ -f "$CONFIG" ]; then
-
    if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
       modprobe zfcp
    fi
    if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
       return
    fi
-   cat $CONFIG | grep -v "^#" | tr "A-Z" "a-z" | while read line; do
-      numparams=$(echo $line | wc -w)
-      if [ $numparams == 5 ]; then
-         read DEVICE SCSIID WWPN SCSILUN FCPLUN < <(echo $line)
-         echo "Warning: Deprecated values in /etc/zfcp.conf, ignoring SCSI ID $SCSIID and SCSI LUN $SCSILUN"
-      elif [ $numparams == 3 ]; then
-         read DEVICE WWPN FCPLUN < <(echo $line)
-      fi
-      echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online
-      [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/$FCPLUN ] && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
+   tr "A-Z" "a-z" < $CONFIG| while read line; do
+       case $line in
+	   \#*) ;;
+	   *)
+	       [ -z "$line" ] && continue
+	       set $line
+	       if [ $# -eq 5 ]; then
+		   DEVICE=$1
+		   SCSIID=$2
+		   WWPN=$3
+		   SCSILUN=$4
+		   FCPLUN=$5
+		   echo "Warning: Deprecated values in /etc/zfcp.conf, ignoring SCSI ID $SCSIID and SCSI LUN $SCSILUN"
+	       elif [ $# -eq 3 ]; then
+		   DEVICE=${1##*0x}
+		   WWPN=$2
+		   FCPLUN=$3
+	       fi
+	       echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE}/online
+	       [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/${FCPLUN} ] \
+		   && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/unit_add
+	       ;;
+       esac
    done
 fi



From mcrha at fedoraproject.org  Tue Dec  1 10:13:40 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue,  1 Dec 2009 10:13:40 +0000 (UTC)
Subject: rpms/evolution-mapi/devel evolution-mapi.spec,1.20,1.21
Message-ID: <20091201101340.DE98611C00DE@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-mapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17572

Modified Files:
	evolution-mapi.spec 
Log Message:
Update version numbers in spec file too.



Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- evolution-mapi.spec	30 Nov 2009 14:49:52 -0000	1.20
+++ evolution-mapi.spec	1 Dec 2009 10:13:40 -0000	1.21
@@ -1,9 +1,9 @@
-%define evo_version 2.28.0
-%define eds_version 2.28.0
+%define evo_version 2.29.3
+%define eds_version 2.29.3
 %define libmapi_version 0.8
 %define intltool_version 0.35.5
 
-%define evo_major 2.28
+%define evo_major 2.30
 %define eds_major 1.2
 
 %define strict_build_settings 0
@@ -17,7 +17,7 @@ Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
 License: LGPLv2+
 URL: http://www.gnome.org/projects/evolution-mapi/
-Source: http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/0.25/evolution-mapi-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/0.29/evolution-mapi-%{version}.tar.bz2
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Dependencies ###



From dnovotny at fedoraproject.org  Tue Dec  1 10:14:31 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue,  1 Dec 2009 10:14:31 +0000 (UTC)
Subject: rpms/logrotate/F-11 logrotate-3.7.8-devnull.patch, NONE,
	1.1 logrotate.spec, 1.79, 1.80
Message-ID: <20091201101431.99C4B11C00DE@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/logrotate/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18103

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.8-devnull.patch 
Log Message:
- fix #542538 -  logrotate seems to hang every few days.


logrotate-3.7.8-devnull.patch:
 logrotate.cron |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logrotate-3.7.8-devnull.patch ---
diff -up logrotate-3.7.8/examples/logrotate.cron.devnull logrotate-3.7.8/examples/logrotate.cron
--- logrotate-3.7.8/examples/logrotate.cron.devnull	2009-09-17 11:29:19.000000000 +0200
+++ logrotate-3.7.8/examples/logrotate.cron	2009-09-17 11:29:40.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/usr/sbin/logrotate /etc/logrotate.conf
+/usr/sbin/logrotate /etc/logrotate.conf >/dev/null 2>&1
 EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"


Index: logrotate.spec
===================================================================
RCS file: /cvs/extras/rpms/logrotate/F-11/logrotate.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- logrotate.spec	25 Feb 2009 20:53:35 -0000	1.79
+++ logrotate.spec	1 Dec 2009 10:14:31 -0000	1.80
@@ -1,12 +1,13 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
 Patch1: logrotate-3.7.7-curdir2.patch
 Patch2: logrotate-3.7.7-toolarge.patch
+Patch3: logrotate-3.7.8-devnull.patch
 
 Requires: coreutils >= 5.92 libsepol libselinux popt
 BuildRequires: libselinux-devel popt-devel
@@ -27,6 +28,7 @@ log files on your system.
 %setup -q
 %patch1 -p1 -b .curdir
 %patch2 -p1 -b .toolarge
+%patch3 -p1 -b .devnull
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Tue Dec 01 2009 Daniel Novotny <dnovotny at redhat.com> 3.7.8-3
+- fix #542538 -  logrotate seems to hang every few days.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dnovotny at fedoraproject.org  Tue Dec  1 10:20:11 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue,  1 Dec 2009 10:20:11 +0000 (UTC)
Subject: rpms/logrotate/F-10 logrotate-3.7.7-devnull.patch, NONE,
	1.1 logrotate.spec, 1.74, 1.75
Message-ID: <20091201102011.EDA8011C00DE@cvs1.fedora.phx.redhat.com>

Author: dnovotny

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

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.7-devnull.patch 
Log Message:
fix #542538


logrotate-3.7.7-devnull.patch:
 logrotate.cron |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logrotate-3.7.7-devnull.patch ---
diff -up logrotate-3.7.8/examples/logrotate.cron.devnull logrotate-3.7.8/examples/logrotate.cron
--- logrotate-3.7.7/examples/logrotate.cron.devnull	2009-09-17 11:29:19.000000000 +0200
+++ logrotate-3.7.7/examples/logrotate.cron	2009-09-17 11:29:40.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/usr/sbin/logrotate /etc/logrotate.conf
+/usr/sbin/logrotate /etc/logrotate.conf >/dev/null 2>&1
 EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"


Index: logrotate.spec
===================================================================
RCS file: /cvs/extras/rpms/logrotate/F-10/logrotate.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- logrotate.spec	19 May 2008 10:30:05 -0000	1.74
+++ logrotate.spec	1 Dec 2009 10:20:11 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
@@ -9,6 +9,7 @@ Source: https://fedorahosted.org/release
 Requires: coreutils >= 5.92 libsepol libselinux popt
 BuildRequires: libselinux-devel popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: logrotate-3.7.7-devnull.patch
 
 %description
 The logrotate utility is designed to simplify the administration of
@@ -23,6 +24,7 @@ log files on your system.
 
 %prep
 %setup -q
+%patch0 -p1 -b .devnull
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Tue Dec 01 2009 Daniel Novotny <dnovotny at redhat.com> 3.7.7-2
+- fix #542538 -  logrotate seems to hang every few days
+
 * Mon May 19 2008 Tomas Smetana <tsmetana at redhat.com> 3.7.7-1
 - new upstream version
 



From jwrdegoede at fedoraproject.org  Tue Dec  1 10:30:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 10:30:23 +0000 (UTC)
Subject: rpms/maniadrive/devel maniadrive.spec,1.17,1.18
Message-ID: <20091201103023.8B11511C0396@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	maniadrive.spec 
Log Message:
* Fri Nov 20 2009 Remi Collet <Fedora at famillecollet.com> 1.2-19
- Rebuild for new php 5.3.1



Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- maniadrive.spec	17 Aug 2009 08:57:08 -0000	1.17
+++ maniadrive.spec	1 Dec 2009 10:30:23 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -166,6 +166,9 @@ fi
 
 
 %changelog
+* Fri Nov 20 2009 Remi Collet <Fedora at famillecollet.com> 1.2-19
+- Rebuild for new php 5.3.1
+
 * Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.2-18
 - Switch to openal-soft
 



From mcrha at fedoraproject.org  Tue Dec  1 10:44:39 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue,  1 Dec 2009 10:44:39 +0000 (UTC)
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.29.3-add-ldap-libs.patch, NONE,
	1.1 evolution-exchange.spec, 1.80, 1.81
Message-ID: <20091201104439.47EAD11C00DE@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29192

Modified Files:
	evolution-exchange.spec 
Added Files:
	evolution-exchange-2.29.3-add-ldap-libs.patch 
Log Message:
- Add patch for missing ldap libs.


evolution-exchange-2.29.3-add-ldap-libs.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE evolution-exchange-2.29.3-add-ldap-libs.patch ---
diff -up evolution-exchange-2.29.3/addressbook/Makefile.am.add-ldap-libs evolution-exchange-2.29.3/addressbook/Makefile.am
--- evolution-exchange-2.29.3/addressbook/Makefile.am.add-ldap-libs	2009-12-01 11:39:23.000000000 +0100
+++ evolution-exchange-2.29.3/addressbook/Makefile.am	2009-12-01 11:39:41.000000000 +0100
@@ -53,6 +53,7 @@ libebookbackendexchange_la_LDFLAGS = \
 
 libebookbackendexchange_la_LIBADD = \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
+	$(LDAP_LIBS) \
 	$(DB_LIBS) \
 	$(top_builddir)/tools/libevolution-exchange-shared.la
 


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- evolution-exchange.spec	30 Nov 2009 14:39:58 -0000	1.80
+++ evolution-exchange.spec	1 Dec 2009 10:44:39 -0000	1.81
@@ -31,6 +31,7 @@ Obsoletes: evolution-connector < %{versi
 ### Patches ###
 
 Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
+Patch12: evolution-exchange-2.29.3-add-ldap-libs.patch
 
 ### Dependencies ###
 
@@ -62,6 +63,7 @@ Microsoft Exchange Server.
 %setup -q -n evolution-exchange-%{version}
 
 %patch11 -p1 -b .fix-64bit-acinclude.m4
+%patch12 -p1 -b .add-ldap-libs
 
 %build
 export CPPFLAGS="-I%{_includedir}/et"
@@ -122,6 +124,7 @@ gconftool-2 --makefile-install-rule %{_s
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13
 - Update to 2.29.3
 - Remove patch to work around intltool issue (fixed upstream).
+- Add patch for missing ldap libs.
 
 * Mon Nov 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.2-1.fc13
 - Update to 2.29.2



From jwrdegoede at fedoraproject.org  Tue Dec  1 10:55:04 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 10:55:04 +0000 (UTC)
Subject: rpms/auriferous/devel auriferous-1.0.1-silence-looping-warn.patch, 
	NONE, 1.1 auriferous-1.0.1-fixes.patch, 1.2,
	1.3 auriferous.desktop, 1.2, 1.3 auriferous.spec, 1.9, 1.10
Message-ID: <20091201105504.4865F11C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	auriferous-1.0.1-fixes.patch auriferous.desktop 
	auriferous.spec 
Added Files:
	auriferous-1.0.1-silence-looping-warn.patch 
Log Message:
* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
- Fix levels not loading
- Fix getting stuck at top of ladder below bar (in level 2)
- Add support for several non alpha numeric keys in key bindings dialog
- Silence ClanLib warning about sound stream looping not being implemented
- Fix crash on exit (real fix is in ClanLib06, #542178)


auriferous-1.0.1-silence-looping-warn.patch:
 resources.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE auriferous-1.0.1-silence-looping-warn.patch ---
diff -up auriferous-1.0.1/auriferous/resources.cpp~ auriferous-1.0.1/auriferous/resources.cpp
--- auriferous-1.0.1/auriferous/resources.cpp~	2002-05-30 15:23:11.000000000 +0200
+++ auriferous-1.0.1/auriferous/resources.cpp	2009-12-01 11:54:56.000000000 +0100
@@ -489,7 +489,7 @@ CL_SoundBuffer_Session* Resources::Jungl
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/jungle.ogg", res), true);
     jungle = new CL_SoundBuffer_Session(sample->prepare());
-    jungle->set_looping(true);
+    //jungle->set_looping(true);
   }
 	return jungle;
 }
@@ -499,7 +499,7 @@ CL_SoundBuffer_Session* Resources::Tech(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/tech.ogg", res), true);
     tech = new CL_SoundBuffer_Session(sample->prepare());
-    tech->set_looping(true);
+    //tech->set_looping(true);
   }
 	return tech;
 }
@@ -509,7 +509,7 @@ CL_SoundBuffer_Session* Resources::Lava(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/lava.ogg", res), true);
     lava = new CL_SoundBuffer_Session(sample->prepare());
-    lava->set_looping(true);
+    //lava->set_looping(true);
   }
 	return lava;
 }
@@ -519,7 +519,7 @@ CL_SoundBuffer_Session* Resources::Ice()
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/ice.ogg", res), true);
     ice = new CL_SoundBuffer_Session(sample->prepare());
-    ice->set_looping(true);
+    //ice->set_looping(true);
   }
 	return ice;
 }
@@ -529,7 +529,7 @@ CL_SoundBuffer_Session* Resources::Aqua(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/aqua.ogg", res), true);
     aqua = new CL_SoundBuffer_Session(sample->prepare());
-    aqua->set_looping(true);
+    //aqua->set_looping(true);
   }
 	return aqua;
 }

auriferous-1.0.1-fixes.patch:
 auriferous-1.0.1/auriferous/auriferous.cpp |    6 ++-
 auriferous-1.0.1/auriferous/config.cpp     |    4 +-
 auriferous-1.0.1/auriferous/editor.cpp     |    5 ++
 auriferous-1.0.1/auriferous/game.cpp       |    5 ++
 auriferous-1.0.1/auriferous/game.h         |    4 ++
 auriferous-1.0.1/auriferous/global_types.h |    1 
 auriferous-1.0.1/auriferous/mainscreen.cpp |   50 +++++++++++++++++++----------
 auriferous-1.0.1/auriferous/map.cpp        |   18 +++++-----
 auriferous-1.0.1/auriferous/map_sample.cpp |   32 +++++++++++-------
 auriferous-1.0.1/auriferous/menu.cpp       |   13 ++++---
 auriferous-1.0.1/auriferous/monk_ai.cpp    |    6 +--
 auriferous-1.0.1/auriferous/resources.scr  |   10 ++---
 auriferous-1.0.1/auriferous/submenu.cpp    |    8 ++--
 auriferous-1.0.1/auriferous/submenu.h      |    2 -
 auriferous/player.cpp                      |    3 +
 15 files changed, 107 insertions(+), 60 deletions(-)

Index: auriferous-1.0.1-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/auriferous-1.0.1-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- auriferous-1.0.1-fixes.patch	30 Nov 2009 19:12:13 -0000	1.2
+++ auriferous-1.0.1-fixes.patch	1 Dec 2009 10:55:03 -0000	1.3
@@ -448,3 +448,15 @@ diff -ur auriferous-1.0.1.orig/auriferou
  
  		if(!in.eof())
  		{
+--- auriferous-1.0.1/auriferous/player.cpp	2002-05-30 18:38:35.000000000 +0200
++++ auriferous-1.0.1.new/auriferous/player.cpp	2009-11-30 23:52:58.000000000 +0100
+@@ -344,7 +346,8 @@
+ 			if(sample->map->get_maptile(map_x(16), map_y(16))->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(16)+32)->get_type()==LADDER)
+ 			y=sample->map->get_maptile(map_x(16), map_y(16))->get_y();
+ 		}
+-		else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking())
++		else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking() &&
++		        (sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed())+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed()))->get_type()==LADDER))
+ 		{
+ 			x=sample->map->get_maptile(map_x(16), map_y(16))->get_x();
+ 			sprite->set_new(0.2f, 22, 27);


Index: auriferous.desktop
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/auriferous.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- auriferous.desktop	5 Aug 2007 18:36:27 -0000	1.2
+++ auriferous.desktop	1 Dec 2009 10:55:03 -0000	1.3
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Auriferous
 Comment=Game inspired by the classic Loderunner
 Exec=auriferous
-Icon=auriferous.png
+Icon=auriferous
 Terminal=false
 StartupNotify=false
 Type=Application


Index: auriferous.spec
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/auriferous.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- auriferous.spec	30 Nov 2009 19:12:13 -0000	1.9
+++ auriferous.spec	1 Dec 2009 10:55:03 -0000	1.10
@@ -16,8 +16,10 @@ Source2:        auriferous.desktop
 Patch0:         auriferous-1.0.1-fixes.patch
 Patch1:         auriferous-1.0.1-destdir.patch
 Patch2:         auriferous-1.0.1-extra-keys.patch
+Patch3:         auriferous-1.0.1-silence-looping-warn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ClanLib06-devel ImageMagick desktop-file-utils
+BuildRequires:  ClanLib06-devel >= ClanLib06-0.6.5-16, desktop-file-utils
+Requires:       hicolor-icon-theme
 
 %description
 An arcade style like game. The goal is to fight out all gold from the caves and
@@ -35,8 +37,9 @@ display cannot handle this you are out o
 %patch0 -p1 -z .fix
 %patch1 -p1 -z .destdir
 %patch2 -p1 -z .keys
+%patch3 -p1
 touch -r configure.in auriferous/Makefile.am
-cp %{SOURCE1} auriferous/pics/game
+cp -a %{SOURCE1} auriferous/pics/game
 
 
 %build
@@ -67,17 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -91,7 +94,10 @@ fi
 %changelog
 * Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
 - Fix levels not loading
+- Fix getting stuck at top of ladder below bar (in level 2)
 - Add support for several non alpha numeric keys in key bindings dialog
+- Silence ClanLib warning about sound stream looping not being implemented
+- Fix crash on exit (real fix is in ClanLib06, #542178)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From jsafrane at fedoraproject.org  Tue Dec  1 10:58:29 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 10:58:29 +0000 (UTC)
Subject: rpms/freeipmi/F-12 .cvsignore, 1.12, 1.13 freeipmi.spec, 1.25,
	1.26 sources, 1.12, 1.13
Message-ID: <20091201105829.773F311C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2024

Modified Files:
	.cvsignore freeipmi.spec sources 
Log Message:
Update to freeipmi-0.7.16
Remove unnecesary patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Sep 2009 07:18:31 -0000	1.12
+++ .cvsignore	1 Dec 2009 10:58:29 -0000	1.13
@@ -1 +1 @@
-freeipmi-0.7.12.tar.gz
+freeipmi-0.7.16.tar.gz


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/F-12/freeipmi.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- freeipmi.spec	5 Oct 2009 10:57:36 -0000	1.25
+++ freeipmi.spec	1 Dec 2009 10:58:29 -0000	1.26
@@ -2,19 +2,17 @@
 # Copyright (c) 2003 FreeIPMI Core Team
 #
 
-Release: 4%{?dist}
+Release: 1%{?dist}
 
 Name: freeipmi
-Version: 0.7.12
+Version: 0.7.16
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
 Source: ftp://ftp.gluster.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz
-Patch1: freeipmi-0.5.1-regex.patch
-Patch2: freeipmi-0.6.4-silent.patch
-Patch3: freeipmi-0.6.4-argmax.patch
-Patch4: freeipmi-0.6.4-pathsep.patch
-Patch5: freeipmi-0.7.12-lsb.patch
+Patch1: freeipmi-0.6.4-silent.patch
+Patch2: freeipmi-0.6.4-pathsep.patch
+Patch3: freeipmi-0.7.12-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel texinfo
 Requires(pre): chkconfig
@@ -65,11 +63,9 @@ Provides a tool and a daemon for IPMI no
 
 %prep
 %setup -q
-%patch1 -p1 -b .regex
-%patch2 -p1 -b .silent
-%patch3 -p1 -b .argmax
-%patch4 -p1 -b .pathsep
-%patch5 -p1 -b .lsb
+%patch1 -p1 -b .silent
+%patch2 -p1 -b .pathsep
+%patch3 -p1 -b .lsb
 
 %build
 export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
@@ -293,6 +289,9 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Tue Dec  1 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.16-1
+- Update to freeipmi-0.7.16
+
 * Mon Oct  5 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12-4
 - Fix package source URL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Sep 2009 07:18:31 -0000	1.12
+++ sources	1 Dec 2009 10:58:29 -0000	1.13
@@ -1 +1 @@
-881bd09c66767051cab94eda032d7039  freeipmi-0.7.12.tar.gz
+8c4349ac302951d6cb2c896f28c6d7b9  freeipmi-0.7.16.tar.gz



From jwrdegoede at fedoraproject.org  Tue Dec  1 11:03:29 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 11:03:29 +0000 (UTC)
Subject: rpms/frozen-bubble/devel frozen-bubble.desktop, 1.2,
	1.3 frozen-bubble.spec, 1.15, 1.16
Message-ID: <20091201110329.67DAB11C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/frozen-bubble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4416

Modified Files:
	frozen-bubble.desktop frozen-bubble.spec 
Log Message:
* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 2.2.0-4
- Do not remove server user (#542423), per:
  http://fedoraproject.org/wiki/Packaging/UsersAndGroups



Index: frozen-bubble.desktop
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- frozen-bubble.desktop	22 Jun 2007 12:19:48 -0000	1.2
+++ frozen-bubble.desktop	1 Dec 2009 11:03:29 -0000	1.3
@@ -5,5 +5,4 @@ Exec=frozen-bubble
 Icon=frozen-bubble
 Terminal=false
 Type=Application
-Encoding=UTF-8
 Categories=Game;ArcadeGame;


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- frozen-bubble.spec	24 Jul 2009 23:13:45 -0000	1.15
+++ frozen-bubble.spec	1 Dec 2009 11:03:29 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Frozen Bubble arcade game
 Name: frozen-bubble
 Version: 2.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.frozen-bubble.org/
@@ -15,6 +15,7 @@ BuildRequires: perl-SDL >= 2.1.3, SDL_mi
 BuildRequires: glib2-devel, gettext, desktop-file-utils
 Requires: perl-SDL >= 2.1.3
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: hicolor-icon-theme
 
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
@@ -110,17 +111,17 @@ desktop-file-install \
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %post server
 /usr/sbin/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} fbubble \
@@ -134,7 +135,6 @@ if [ $1 -eq 0 ]; then
 fi
 
 %postun server
-/usr/sbin/userdel fbubble || :
 if [ $1 -ge 1 ]; then
     /sbin/service fb-server condrestart &>/dev/null || :
 fi
@@ -161,6 +161,10 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 2.2.0-4
+- Do not remove server user (#542423), per:
+  http://fedoraproject.org/wiki/Packaging/UsersAndGroups
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From alexl at fedoraproject.org  Tue Dec  1 11:04:17 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Tue,  1 Dec 2009 11:04:17 +0000 (UTC)
Subject: rpms/gvfs/F-12 gvfs-1.4.3-ftp-fixes.patch, NONE,
	1.1 gvfs-1.4.3-metadata-free.patch, NONE, 1.1 gvfs.spec, 1.173, 1.174
Message-ID: <20091201110417.6E3F411C00DE@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4795

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.4.3-ftp-fixes.patch gvfs-1.4.3-metadata-free.patch 
Log Message:
* Tue Dec  1 2009 Alexander Larsson <alexl at redhat.com> - 1.4.2-2
- Backport fixes from git:
- Don't leak metadata strings
- Don't access uninitialized data in ftp backend


gvfs-1.4.3-ftp-fixes.patch:
 gvfsbackendftp.c  |    3 +++
 gvfsftpdircache.c |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE gvfs-1.4.3-ftp-fixes.patch ---
commit b98c2a479110b37802bcd9c9ecd7f0298bf33c56
Author: Alexander Larsson <alexl at redhat.com>
Date:   Tue Dec 1 11:14:48 2009 +0100

    Ensure timer_cancel is initialized
    
    Otherwise it may be used uninitialized if progress_callback is NULL
    (cherry picked from commit 2f86e533d18c67c5e820d08d53769d82884bff71)

diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
index 41eb493..5dfaa4c 100644
--- a/daemon/gvfsbackendftp.c
+++ b/daemon/gvfsbackendftp.c
@@ -1167,6 +1167,9 @@ ftp_output_stream_splice (GOutputStream *output,
   GCancellable *current, *timer_cancel;
   gulong cancel_cb_id;
 
+  timer_cancel = NULL;
+  cancel_cb_id = 0;
+
   bytes_copied = 0;
   if (progress_callback)
     {

commit eff994cc20d177113989aa3a2160a9a30b70f4bc
Author: Alexander Larsson <alexl at redhat.com>
Date:   Tue Dec 1 11:15:47 2009 +0100

    Handle error case in cache lookup correctly
    
    If we're in error, we should return NULL, not an uninitialized info.
    (cherry picked from commit a17a5d9e3a13c0bf516a0955e79a1620efa00c6d)

diff --git a/daemon/gvfsftpdircache.c b/daemon/gvfsftpdircache.c
index e357edd..dffebbc 100644
--- a/daemon/gvfsftpdircache.c
+++ b/daemon/gvfsftpdircache.c
@@ -216,10 +216,10 @@ g_vfs_ftp_dir_cache_lookup_file_internal (GVfsFtpDirCache *  cache,
       g_vfs_ftp_dir_cache_entry_unref (entry);
     }
 
-  if (!g_vfs_ftp_task_is_in_error (task))
-    info = cache->funcs->lookup_uncached (task, file);
+  if (g_vfs_ftp_task_is_in_error (task))
+    return NULL;
 
-  return info;
+  return cache->funcs->lookup_uncached (task, file);
 }
 
 static GFileInfo *

gvfs-1.4.3-metadata-free.patch:
 client/gdaemonvfs.c |    1 +
 metadata/metatree.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gvfs-1.4.3-metadata-free.patch ---
commit 58df41d09a14104304b3df3580a61408d262fa02
Author: Alexander Larsson <alexl at redhat.com>
Date:   Tue Dec 1 11:04:36 2009 +0100

    Correctly dup strings in meta_tree_lookup_stringv
    
    Also, make sure to free that in all callers.
    (cherry picked from commit b2984619f1fa9ed1f73bafb3d749f322e17bb605)

diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index 7479bde..b1b223d 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -1267,6 +1267,7 @@ _g_daemon_vfs_append_metadata_for_set (DBusMessage *message,
 				       DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &val, g_strv_length (val),
 				       0);
 	}
+      g_strfreev (current);
     }
   else if (type == G_FILE_ATTRIBUTE_TYPE_INVALID)
     {
diff --git a/metadata/metatree.c b/metadata/metatree.c
index 4a0e5f5..2820fb5 100644
--- a/metadata/metatree.c
+++ b/metadata/metatree.c
@@ -1657,7 +1657,7 @@ meta_tree_lookup_stringv   (MetaTree                         *tree,
       num_strings = GUINT32_FROM_BE (stringv->num_strings);
       res = g_new (char *, num_strings + 1);
       for (i = 0; i < num_strings; i++)
-	res[i] = verify_string (tree, stringv->strings[i]);
+	res[i] = g_strdup (verify_string (tree, stringv->strings[i]));
       res[i] = NULL;
     }
 


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- gvfs.spec	30 Nov 2009 14:45:56 -0000	1.173
+++ gvfs.spec	1 Dec 2009 11:04:17 -0000	1.174
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -40,6 +40,10 @@ Patch1: 0001-Add-AFC-backend.patch
 # from upstream
 Patch2: gvfs-1.4.3-smb-queryfs-old-samba.patch
 # from upstream
+Patch3: gvfs-1.4.3-metadata-free.patch
+# from upstream
+Patch4: gvfs-1.4.3-ftp-fixes.patch 
+# from upstream
 Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch
 Patch13: gvfs-1.4.1-http-soup-header-parsing.patch
 
@@ -140,6 +144,8 @@ and iPod Touches to applications using g
 %patch0 -p1 -b .archive-integration
 %patch1 -p1 -b .afc
 %patch2 -p1 -b .samba-queryfs-older
+%patch3 -p1 -b .metadata-free
+%patch4 -p1 -b .ftp-fix
 %patch12 -p1 -b .http-query-info
 %patch13 -p1 -b .http-headers
 
@@ -307,6 +313,11 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Dec  1 2009 Alexander Larsson <alexl at redhat.com> - 1.4.2-2
+- Backport fixes from git:
+- Don't leak metadata strings
+- Don't access uninitialized data in ftp backend
+
 * Mon Nov 30 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.2-1
 - Update to 1.4.2
 



From jwrdegoede at fedoraproject.org  Tue Dec  1 11:04:31 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 11:04:31 +0000 (UTC)
Subject: rpms/frozen-bubble/F-12 frozen-bubble.spec,1.15,1.16
Message-ID: <20091201110431.6DB6211C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/frozen-bubble/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4898

Modified Files:
	frozen-bubble.spec 
Log Message:
* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 2.2.0-4
- Do not remove server user (#542423), per:
  http://fedoraproject.org/wiki/Packaging/UsersAndGroups



Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/F-12/frozen-bubble.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- frozen-bubble.spec	24 Jul 2009 23:13:45 -0000	1.15
+++ frozen-bubble.spec	1 Dec 2009 11:04:31 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Frozen Bubble arcade game
 Name: frozen-bubble
 Version: 2.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.frozen-bubble.org/
@@ -15,6 +15,7 @@ BuildRequires: perl-SDL >= 2.1.3, SDL_mi
 BuildRequires: glib2-devel, gettext, desktop-file-utils
 Requires: perl-SDL >= 2.1.3
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: hicolor-icon-theme
 
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
@@ -110,17 +111,17 @@ desktop-file-install \
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %post server
 /usr/sbin/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} fbubble \
@@ -134,7 +135,6 @@ if [ $1 -eq 0 ]; then
 fi
 
 %postun server
-/usr/sbin/userdel fbubble || :
 if [ $1 -ge 1 ]; then
     /sbin/service fb-server condrestart &>/dev/null || :
 fi
@@ -161,6 +161,10 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 2.2.0-4
+- Do not remove server user (#542423), per:
+  http://fedoraproject.org/wiki/Packaging/UsersAndGroups
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcrha at fedoraproject.org  Tue Dec  1 11:07:56 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue,  1 Dec 2009 11:07:56 +0000 (UTC)
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.81,1.82
Message-ID: <20091201110756.90B6011C00DE@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6154

Modified Files:
	evolution-exchange.spec 
Log Message:
No glade dirs any more.



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- evolution-exchange.spec	1 Dec 2009 10:44:39 -0000	1.81
+++ evolution-exchange.spec	1 Dec 2009 11:07:56 -0000	1.82
@@ -112,10 +112,8 @@ gconftool-2 --makefile-install-rule %{_s
 %{_datadir}/gtk-doc/html/evolution-exchange
 %dir %{_datadir}/evolution-exchange
 %dir %{_datadir}/evolution-exchange/%{evo_major}
-%dir %{_datadir}/evolution-exchange/%{evo_major}/glade
 %dir %{_datadir}/evolution-exchange/%{evo_major}/images
 %dir %{_datadir}/evolution-exchange/%{evo_major}/ui
-%{_datadir}/evolution-exchange/%{evo_major}/glade/*
 %{_datadir}/evolution-exchange/%{evo_major}/images/*
 %{_datadir}/evolution-exchange/%{evo_major}/ui/*
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas



From pkgdb at fedoraproject.org  Tue Dec  1 11:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 11:08:55 +0000
Subject: [pkgdb] gstreamer: bodong has given up watchcommits
Message-ID: <20091201110855.9A1FA10F886@bastion2.fedora.phx.redhat.com>

bodong has given up the watchcommits acl on gstreamer (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 11:08:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 11:08:47 +0000
Subject: [pkgdb] gstreamer: bodong has given up watchcommits
Message-ID: <20091201110848.3451310F85F@bastion2.fedora.phx.redhat.com>

bodong has given up the watchcommits acl on gstreamer (Fedora 12)

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



From alexl at fedoraproject.org  Tue Dec  1 11:10:02 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Tue,  1 Dec 2009 11:10:02 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.293,1.294 sources,1.107,1.108
Message-ID: <20091201111002.97F5511C0396@cvs1.fedora.phx.redhat.com>

Author: alexl

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

Modified Files:
	nautilus.spec sources 
Log Message:
* Mon Nov 30 2009 Alexander Larsson <alexl at redhat.com> - 2.28.2-1
- Update to 2.28.2



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- nautilus.spec	18 Nov 2009 16:35:52 -0000	1.293
+++ nautilus.spec	1 Dec 2009 11:10:02 -0000	1.294
@@ -14,8 +14,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.28.1
-Release:	4%{?dist}
+Version: 	2.28.2
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -75,7 +75,6 @@ Patch1:         nautilus-config.patch
 Patch4:		nautilus-2.23.5-selinux.patch
 
 # from upstream
-Patch5:		nautilus-2.28.1-tracker-0.7-failed-connection.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=589345
 Patch6:		nautilus-2.28.1-dynamic-search.patch
 
@@ -90,11 +89,6 @@ Patch17:	nautilus-filetype-symlink-fix.p
 # Need to file upstream and investigate a real fix
 Patch18:	nautilus-2.28.0-revert-bg-fade-break.patch
 
-# nautilus crashed with SIGSEGV in nautilus_file_peek_display_name()
-# https://bugzilla.gnome.org/show_bug.cgi?id=590591
-# https://bugzilla.redhat.com/show_bug.cgi?id=531826
-Patch19:	nautilus-2.28.2-listview-unfreeze-after-rename.patch
-
 # https://bugzilla.gnome.org/show_bug.cgi?id=147808
 Patch20:	nautilus-monitor-change.patch
 
@@ -129,14 +123,12 @@ for developing nautilus extensions.
 
 %patch1 -p1 -b .config
 %patch4 -p1 -b .selinux
-%patch5 -p1 -b .tracker-0.7
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .revert-bg-fade-break
-%patch19 -p1 -b .listview-unfreeze
 %patch20 -p1 -b .nautilus-monitor-change
 
 %build
@@ -273,6 +265,9 @@ fi
 
 
 %changelog
+* Mon Nov 30 2009 Alexander Larsson <alexl at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+
 * Wed Nov 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-4
 - Proper fix for crash in the infopanel (#531826)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- sources	2 Nov 2009 16:33:12 -0000	1.107
+++ sources	1 Dec 2009 11:10:02 -0000	1.108
@@ -1 +1 @@
-e759af11a0844828e2b484ff42ee0498  nautilus-2.28.1.tar.bz2
+872ac5a2b875a85473266aa540926596  nautilus-2.28.2.tar.bz2



From jsafrane at fedoraproject.org  Tue Dec  1 11:18:01 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 11:18:01 +0000 (UTC)
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.71,1.72
Message-ID: <20091201111801.8F85911C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	OpenIPMI.spec 
Log Message:
fix package compilation to remove rpmlint errors


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- OpenIPMI.spec	30 Sep 2009 06:54:01 -0000	1.71
+++ OpenIPMI.spec	1 Dec 2009 11:18:01 -0000	1.72
@@ -4,7 +4,7 @@
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.16
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -84,11 +84,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-# Remove python cruft in 32bit libdir on 64bit archs...
-%ifarch ppc64 s390x x86_64
-rm -rf $RPM_BUILD_ROOT/usr/lib
-%endif
-
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
 install -d ${RPM_BUILD_ROOT}%{_initrddir}
@@ -165,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Tue Dec  1 2009 Jan Safranek <jsafrane at redhat.com> - 2.0.16-6
+- fix package compilation to remove rpmlint errors
+
 * Wed Sep 30 2009 Jan Safranek <jsafrane at redhat.com> - 2.0.16-5
 - rebuilt with new net-snmp
 



From jsafrane at fedoraproject.org  Tue Dec  1 11:26:56 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 11:26:56 +0000 (UTC)
Subject: rpms/OpenIPMI/F-12 OpenIPMI.spec,1.70,1.71
Message-ID: <20091201112656.4218411C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/OpenIPMI/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12615

Modified Files:
	OpenIPMI.spec 
Log Message:
fix rpmlint errors


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/F-12/OpenIPMI.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- OpenIPMI.spec	21 Aug 2009 12:18:18 -0000	1.70
+++ OpenIPMI.spec	1 Dec 2009 11:26:55 -0000	1.71
@@ -4,7 +4,7 @@
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.16
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -84,11 +84,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-# Remove python cruft in 32bit libdir on 64bit archs...
-%ifarch ppc64 s390x x86_64
-rm -rf $RPM_BUILD_ROOT/usr/lib
-%endif
-
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
 install -d ${RPM_BUILD_ROOT}%{_initrddir}
@@ -165,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Tue Dec  1 2009 Jan Safranek <jsafrane at redhat.com> - 2.0.16-5
+- fix rpmlint errors
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.16-4
 - rebuilt with new openssl
 



From ovasik at fedoraproject.org  Tue Dec  1 11:41:49 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  1 Dec 2009 11:41:49 +0000 (UTC)
Subject: rpms/cpio/F-11 cpio-fortifysources.patch, NONE, 1.1 cpio.spec, 1.65,
	1.66
Message-ID: <20091201114149.74EC911C00DE@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/cpio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18685

Modified Files:
	cpio.spec 
Added Files:
	cpio-fortifysources.patch 
Log Message:
fix buffer overflow detection by fortify sources (#542389)

cpio-fortifysources.patch:
 tar.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cpio-fortifysources.patch ---
diff -urNp cpio-2.9.90-orig/src/tar.c cpio-2.9.90/src/tar.c
--- cpio-2.9.90-orig/src/tar.c	2007-06-27 16:00:13.000000000 +0200
+++ cpio-2.9.90/src/tar.c	2009-12-01 12:33:51.000000000 +0100
@@ -217,7 +217,7 @@ write_out_tar_header (struct cpio_file_s
       char *name;
 
       strncpy (tar_hdr->magic, TMAGIC, TMAGLEN);
-      strncpy (tar_hdr->magic + TMAGLEN, TVERSION, TVERSLEN);
+      strncpy (tar_hdr->version, TVERSION, TVERSLEN);
 
       name = getuser (file_hdr->c_uid);
       if (name)
Bin?rn? soubory cpio-2.9.90-orig/src/.tar.c.swp a cpio-2.9.90/src/.tar.c.swp jsou r?zn?
Bin?rn? soubory cpio-2.9.90-orig/src/.tarhdr.h.swp a cpio-2.9.90/src/.tarhdr.h.swp jsou r?zn?
Bin?rn? soubory cpio-2.9.90-orig/src/.tar.h.swp a cpio-2.9.90/src/.tar.h.swp jsou r?zn?


Index: cpio.spec
===================================================================
RCS file: /cvs/extras/rpms/cpio/F-11/cpio.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- cpio.spec	9 Mar 2009 17:38:01 -0000	1.65
+++ cpio.spec	1 Dec 2009 11:41:49 -0000	1.66
@@ -3,7 +3,7 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.9.90
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -18,6 +18,7 @@ Patch5: cpio-2.9-dir_perm.patch
 Patch6: cpio-2.9-dev_number.patch
 Patch7: cpio-2.9-sys_umask.patch
 Patch8: cpio-2.9.90-defaultremoteshell.patch
+Patch9: cpio-fortifysources.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: texinfo, autoconf, gettext, rmt
@@ -47,6 +48,7 @@ Install cpio if you need a program to ma
 %patch6  -p1 -b .dev_number
 %patch7  -p1 -b .sys_umask
 %patch8  -p1 -b .defaultremote
+%patch9  -p1 -b .fortify
 
 autoheader
 
@@ -87,6 +89,9 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Tue Dec  1 2009 Ondrej Vasik <ovasik at redhat.com> 2.9.90-6
+- fix buffer overflow detection by fortify sources (#542389)
+
 * Mon Mar  9 2009 Ondrej Vasik <ovasik at redhat.com> 2.9.90-5
 - define default remote shell as /usr/bin/ssh(#452904)
 - use /etc/rmt as default rmt command



From than at fedoraproject.org  Tue Dec  1 11:43:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 11:43:45 +0000 (UTC)
Subject: File qt-everywhere-opensource-src-4.6.0.tar.gz uploaded to lookaside
	cache by than
Message-ID: <20091201114345.9305010F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qt:

2a7b5126f2450d8525af355fc4c12ad6  qt-everywhere-opensource-src-4.6.0.tar.gz



From mcrha at fedoraproject.org  Tue Dec  1 11:48:11 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue,  1 Dec 2009 11:48:11 +0000 (UTC)
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.82,1.83
Message-ID: <20091201114811.6281211C00DE@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21043

Modified Files:
	evolution-exchange.spec 
Log Message:
Add missing files to .spec file and rm .la files.



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- evolution-exchange.spec	1 Dec 2009 11:07:56 -0000	1.82
+++ evolution-exchange.spec	1 Dec 2009 11:48:11 -0000	1.83
@@ -90,7 +90,11 @@ make %{?_smp_mflags} LDFLAGS="-R %{plibd
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/libebookbackendexchange.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/camel-providers/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/%{evo_major}/plugins/liborg-gnome-exchange-operations.la
+
 %find_lang evolution-exchange-%{evo_major}
 
 %post
@@ -109,6 +113,12 @@ gconftool-2 --makefile-install-rule %{_s
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.so
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.la
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.urls
+%{_libdir}/evolution-data-server-1.2/extensions/libebookbackendexchange.so
+%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.so
+%{_libdir}/evolution/%{evo_major}/plugins/liborg-gnome-exchange-operations.so
+%{_libdir}/evolution/%{evo_major}/plugins/org-gnome-exchange-operations.eplug
+%{_libdir}/evolution/%{evo_major}/errors/org-gnome-exchange-operations.error
+
 %{_datadir}/gtk-doc/html/evolution-exchange
 %dir %{_datadir}/evolution-exchange
 %dir %{_datadir}/evolution-exchange/%{evo_major}



From ovasik at fedoraproject.org  Tue Dec  1 11:49:32 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  1 Dec 2009 11:49:32 +0000 (UTC)
Subject: rpms/cpio/F-11 cpio-fortifysources.patch,1.1,1.2
Message-ID: <20091201114932.8F57211C00DE@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/cpio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21825

Modified Files:
	cpio-fortifysources.patch 
Log Message:
Remove czech diff rubbish from patch

cpio-fortifysources.patch:
 tar.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: cpio-fortifysources.patch
===================================================================
RCS file: /cvs/extras/rpms/cpio/F-11/cpio-fortifysources.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpio-fortifysources.patch	1 Dec 2009 11:41:49 -0000	1.1
+++ cpio-fortifysources.patch	1 Dec 2009 11:49:32 -0000	1.2
@@ -10,6 +10,3 @@ diff -urNp cpio-2.9.90-orig/src/tar.c cp
  
        name = getuser (file_hdr->c_uid);
        if (name)
-Bin?rn? soubory cpio-2.9.90-orig/src/.tar.c.swp a cpio-2.9.90/src/.tar.c.swp jsou r?zn?
-Bin?rn? soubory cpio-2.9.90-orig/src/.tarhdr.h.swp a cpio-2.9.90/src/.tarhdr.h.swp jsou r?zn?
-Bin?rn? soubory cpio-2.9.90-orig/src/.tar.h.swp a cpio-2.9.90/src/.tar.h.swp jsou r?zn?



From than at fedoraproject.org  Tue Dec  1 11:50:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 11:50:54 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.66, 1.67 qt.spec, 1.355, 1.356 sources, 
	1.67, 1.68
Message-ID: <20091201115054.2A30C11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
4.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	17 Nov 2009 18:41:21 -0000	1.66
+++ .cvsignore	1 Dec 2009 11:50:53 -0000	1.67
@@ -8,3 +8,4 @@ hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
 qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
+qt-everywhere-opensource-src-4.6.0.tar.gz


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -p -r1.355 -r1.356
--- qt.spec	17 Nov 2009 18:41:21 -0000	1.355
+++ qt.spec	1 Dec 2009 11:50:53 -0000	1.356
@@ -6,7 +6,6 @@
 
 %define _default_patch_fuzz 3 
 
-%define pre rc1 
 # enable kde-qt integration/patches (currently a no-op)
 %define kde_qt 1
 
@@ -14,13 +13,13 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 0.6.%{pre}%{?dist}
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Group: System Environment/Libraries
 Url: http://www.qtsoftware.com/
-Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}.tar.gz
+Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
@@ -388,7 +387,7 @@ Qt libraries used for drawing widgets an
 
 
 %prep
-%setup -q -n qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}
+%setup -q -n qt-everywhere-opensource-src-%{version}
 
 # don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
@@ -1018,6 +1017,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.6.0-1
+- 4.6.0
+
 * Tue Nov 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-0.6.rc1
 - qt-4.6.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	17 Nov 2009 18:41:21 -0000	1.67
+++ sources	1 Dec 2009 11:50:54 -0000	1.68
@@ -7,4 +7,4 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-56772a3f9128f00504d2b21dbe4186b3  qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
+2a7b5126f2450d8525af355fc4c12ad6  qt-everywhere-opensource-src-4.6.0.tar.gz



From plautrba at fedoraproject.org  Tue Dec  1 11:53:24 2009
From: plautrba at fedoraproject.org (Petr Lautrbach)
Date: Tue,  1 Dec 2009 11:53:24 +0000 (UTC)
Subject: rpms/upstart/devel upstart-remove-tests.patch, NONE, 1.1 sources,
	1.11, 1.12
Message-ID: <20091201115324.CC3D111C00DE@cvs1.fedora.phx.redhat.com>

Author: plautrba

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

Modified Files:
	sources 
Added Files:
	upstart-remove-tests.patch 
Log Message:
upstart-remove-tests.patch moved to cvs from sources


upstart-remove-tests.patch:
 nih-dbus/tests/test_dbus_connection.c |    1 
 nih/tests/test_child.c                |  180 ----------------------------------
 2 files changed, 181 deletions(-)

--- NEW FILE upstart-remove-tests.patch ---
diff --git a/nih-dbus/tests/test_dbus_connection.c b/nih-dbus/tests/test_dbus_connection.c
index 68074b2..498f4e5 100644
--- a/nih-dbus/tests/test_dbus_connection.c
+++ b/nih-dbus/tests/test_dbus_connection.c
@@ -1521,7 +1521,6 @@ main (int   argc,
 	nih_error_init ();
 
 	test_connect ();
-	test_bus ();
 	test_setup ();
 	test_server ();
 
diff --git a/nih/tests/test_child.c b/nih/tests/test_child.c
index 4c8c760..5ec8501 100644
--- a/nih/tests/test_child.c
+++ b/nih/tests/test_child.c
@@ -328,186 +328,6 @@ test_poll (void)
 	nih_free (watch);
 
 
-	/* Check that a signal raised from a traced child causes the reaper
-	 * to be called with a traced event and the event in the status
-	 * field.  It should not be removed from the list since the child
-	 * hasn't gone away.
-	 */
-	TEST_FEATURE ("with signal from traced child");
-
-	TEST_CHILD (pid) {
-		assert0 (ptrace (PTRACE_TRACEME, 0, NULL, NULL));
-
-		raise (SIGSTOP);
-		raise (SIGCHLD);
-		pause ();
-		exit (0);
-	}
-
-	waitid (P_PID, pid, &siginfo, WSTOPPED);
-
-	assert0 (ptrace (PTRACE_SETOPTIONS, pid, NULL, PTRACE_O_TRACESYSGOOD));
-	assert0 (ptrace (PTRACE_CONT, pid, NULL, SIGCONT));
-
-	waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-
-	watch = nih_child_add_watch (NULL, pid, NIH_CHILD_TRAPPED,
-				     my_handler, &watch);
-
-	TEST_FREE_TAG (watch);
-
-	handler_called = 0;
-	last_data = NULL;
-	last_pid = 0;
-	last_event = -1;
-	last_status = 0;
-
-	nih_child_poll ();
-
-	TEST_TRUE (handler_called);
-	TEST_EQ (last_pid, pid);
-	TEST_EQ (last_event, NIH_CHILD_TRAPPED);
-	TEST_EQ (last_status, SIGCHLD);
-	TEST_NOT_FREE (watch);
-
-	assert0 (ptrace (PTRACE_DETACH, pid, NULL, 0));
-
-	kill (pid, SIGTERM);
-	waitid (P_PID, pid, &siginfo, WEXITED);
-	nih_free (watch);
-
-
-#if HAVE_VALGRIND_VALGRIND_H
-	/* These tests fail when running under valgrind.
-	 */
-	if (! RUNNING_ON_VALGRIND) {
-#endif
-	/* Check that when a traced child forks it causes the reaper
-	 * to be called with a ptrace event and the fork event in the
-	 * status field.  It should not be removed from the list since the
-	 * child hasn't gone away.
-	 */
-	TEST_FEATURE ("with fork by traced child");
-
-	TEST_CHILD (pid) {
-		assert0 (ptrace (PTRACE_TRACEME, 0, NULL, NULL));
-
-		raise (SIGSTOP);
-
-		child = fork ();
-		assert (child >= 0);
-
-		pause ();
-
-		exit (0);
-	}
-
-	waitid (P_PID, pid, &siginfo, WSTOPPED);
-
-	assert0 (ptrace (PTRACE_SETOPTIONS, pid, NULL,
-			 PTRACE_O_TRACESYSGOOD | PTRACE_O_TRACEFORK));
-	assert0 (ptrace (PTRACE_CONT, pid, NULL, SIGCONT));
-
-	/* Wait for ptrace to stop the parent (signalling the fork) */
-	waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-
-	/* Will be able to get the child pid now, we have to do it here
-	 * because we want to wait on it to ensure the test is synchronous;
-	 * otherwise nih_child_poll() could actually eat the child event
-	 * before it returns -- normally we'd do this inside the handler,
-	 * so things would probably work (we iter the handlers for each
-	 * event, so you can add one).
-	 */
-	data = 0;
-	assert0 (ptrace (PTRACE_GETEVENTMSG, pid, NULL, &data));
-	assert (data != 0);
-	child = (pid_t)data;
-
-	/* Wait for ptrace to stop the child, otherwise it might not be
-	 * ready for us to actually detach from.
-	 */
-	waitid (P_PID, child, &siginfo, WSTOPPED | WNOWAIT);
-
-	watch = nih_child_add_watch (NULL, pid, NIH_CHILD_PTRACE,
-				     my_handler, &watch);
-
-	TEST_FREE_TAG (watch);
-
-	handler_called = 0;
-	last_data = NULL;
-	last_pid = 0;
-	last_event = -1;
-	last_status = 0;
-
-	nih_child_poll ();
-
-	TEST_TRUE (handler_called);
-	TEST_EQ (last_pid, pid);
-	TEST_EQ (last_event, NIH_CHILD_PTRACE);
-	TEST_EQ (last_status, PTRACE_EVENT_FORK);
-	TEST_NOT_FREE (watch);
-
-	assert0 (ptrace (PTRACE_DETACH, child, NULL, SIGCONT));
-	kill (child, SIGTERM);
-
-	assert0 (ptrace (PTRACE_DETACH, pid, NULL, SIGCONT));
-	kill (pid, SIGTERM);
-	waitid (P_PID, pid, &siginfo, WEXITED);
-	nih_free (watch);
-
-
-	/* Check that when a traced child execs it causes the reaper
-	 * to be called with a ptrace event and the exec event in the
-	 * status field.  It should not be removed from the list since the
-	 * child hasn't gone away.
-	 */
-	TEST_FEATURE ("with exec by traced child");
-
-	TEST_CHILD (pid) {
-		assert0 (ptrace (PTRACE_TRACEME, 0, NULL, NULL));
-
-		raise (SIGSTOP);
-
-		execl ("/bin/true", "true", NULL);
-		exit (255);
-	}
-
-	waitid (P_PID, pid, &siginfo, WSTOPPED);
-
-	assert0 (ptrace (PTRACE_SETOPTIONS, pid, NULL,
-			 PTRACE_O_TRACESYSGOOD | PTRACE_O_TRACEEXEC));
-	assert0 (ptrace (PTRACE_CONT, pid, NULL, SIGCONT));
-
-	waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-
-	watch = nih_child_add_watch (NULL, pid, NIH_CHILD_PTRACE,
-				     my_handler, &watch);
-
-	TEST_FREE_TAG (watch);
-
-	handler_called = 0;
-	last_data = NULL;
-	last_pid = 0;
-	last_event = -1;
-	last_status = 0;
-
-	nih_child_poll ();
-
-	TEST_TRUE (handler_called);
-	TEST_EQ (last_pid, pid);
-	TEST_EQ (last_event, NIH_CHILD_PTRACE);
-	TEST_EQ (last_status, PTRACE_EVENT_EXEC);
-	TEST_NOT_FREE (watch);
-
-	assert0 (ptrace (PTRACE_DETACH, pid, NULL, SIGCONT));
-
-	waitid (P_PID, pid, &siginfo, WEXITED);
-	nih_free (watch);
-#if HAVE_VALGRIND_VALGRIND_H
-	}
-#endif
-
-
 	/* Check that we can watch for events from any process, which
 	 * shouldn't be freed when the child dies.
 	 */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Nov 2009 14:26:05 -0000	1.11
+++ sources	1 Dec 2009 11:53:24 -0000	1.12
@@ -1,2 +1 @@
 ef9d2704426423f75d1e0c309ecfceb4  upstart-0.6.3.tar.bz2
-c99c8dd6a238ec43243ad8cf3aa51837  upstart-remove-tests.patch



From mcrha at fedoraproject.org  Tue Dec  1 12:01:18 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue,  1 Dec 2009 12:01:18 +0000 (UTC)
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.29.3-add-ldap-libs.patch, 1.1, 1.2
Message-ID: <20091201120118.B139211C00DE@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25386

Modified Files:
	evolution-exchange-2.29.3-add-ldap-libs.patch 
Log Message:
Add more libs to server/lib/Makefile.am


evolution-exchange-2.29.3-add-ldap-libs.patch:
 addressbook/Makefile.am |    1 +
 server/lib/Makefile.am  |    7 +++++++
 2 files changed, 8 insertions(+)

Index: evolution-exchange-2.29.3-add-ldap-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange-2.29.3-add-ldap-libs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- evolution-exchange-2.29.3-add-ldap-libs.patch	1 Dec 2009 10:44:39 -0000	1.1
+++ evolution-exchange-2.29.3-add-ldap-libs.patch	1 Dec 2009 12:01:18 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up evolution-exchange-2.29.3/addressbook/Makefile.am.add-ldap-libs evolution-exchange-2.29.3/addressbook/Makefile.am
---- evolution-exchange-2.29.3/addressbook/Makefile.am.add-ldap-libs	2009-12-01 11:39:23.000000000 +0100
-+++ evolution-exchange-2.29.3/addressbook/Makefile.am	2009-12-01 11:39:41.000000000 +0100
+--- evolution-exchange-2.29.3/addressbook/Makefile.am.add-ldap-libs	2009-11-30 10:45:51.000000000 +0100
++++ evolution-exchange-2.29.3/addressbook/Makefile.am	2009-12-01 12:56:48.000000000 +0100
 @@ -53,6 +53,7 @@ libebookbackendexchange_la_LDFLAGS = \
  
  libebookbackendexchange_la_LIBADD = \
@@ -9,3 +9,20 @@ diff -up evolution-exchange-2.29.3/addre
  	$(DB_LIBS) \
  	$(top_builddir)/tools/libevolution-exchange-shared.la
  
+diff -up evolution-exchange-2.29.3/server/lib/Makefile.am.add-ldap-libs evolution-exchange-2.29.3/server/lib/Makefile.am
+--- evolution-exchange-2.29.3/server/lib/Makefile.am.add-ldap-libs	2009-12-01 12:58:27.000000000 +0100
++++ evolution-exchange-2.29.3/server/lib/Makefile.am	2009-12-01 13:00:05.000000000 +0100
+@@ -70,6 +70,13 @@ libexchange_la_CPPFLAGS = \
+ 	$(GNOME_PLATFORM_CFLAGS) \
+ 	$(EVOLUTION_DATA_SERVER_CFLAGS)
+ 
++libexchange_la_LIBADD = \
++	$(LDAP_LIBS) \
++	$(KRB5_LIBSS) \
++	$(SOUP_LIBSS) \
++	$(GNOME_PLATFORM_LIBSS) \
++	$(EVOLUTION_DATA_SERVER_LIBSS)
++
+ libexchange_la_SOURCES = \
+ 	$(MARSHAL_GENERATED) \
+ 	e2k-propnames.h \



From mhlavink at fedoraproject.org  Tue Dec  1 12:10:18 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  1 Dec 2009 12:10:18 +0000 (UTC)
Subject: rpms/nmap/F-12 nmap.spec,1.61,1.62
Message-ID: <20091201121018.2D87611C0396@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/nmap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28863

Modified Files:
	nmap.spec 
Log Message:
* Mon Dec 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 2:5.00-5
- spec cleanup



Index: nmap.spec
===================================================================
RCS file: /cvs/extras/rpms/nmap/F-12/nmap.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- nmap.spec	2 Nov 2009 15:51:22 -0000	1.61
+++ nmap.spec	1 Dec 2009 12:10:17 -0000	1.62
@@ -1,11 +1,16 @@
+#TODO: stop using local copy of libdnet, once system distributed version supports sctp (grep sctp /usr/include/dnet.h)
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 5.00
-Release: 4%{?dist}
-# libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999)
-License: GPLv2
+Release: 5%{?dist}
+# nmap is GPLv2
+# zenmap is GPLv2 and LGPLv2+ (zenmap/higwidgets) and GPLv2+ (zenmap/radialnet)
+# libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999) with some parts as Public Domain (crc32)
+# openssl is OpenSSL
+# openssl and libdnet-striped is removed in %%prep section
+License: GPLv2 and LGPLv2+ and GPLv2+ and BSD
 Group: Applications/System
 Source0: http://nmap.org/dist/%{name}-%{version}.tar.bz2
 Source1: zenmap.desktop
@@ -52,7 +57,8 @@ be installed before installing nmap fron
 %patch2 -p1 -b .noms
 %patch3 -p1 -b .nostrip
 
-rm -rf liblua libpcap libpcre
+#be sure we're not using tarballed copies of some libraries
+rm -rf liblua libpcap libpcre macosx mswin32
 
 #fix locale dir
 mv zenmap/share/zenmap/locale zenmap/share
@@ -144,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Mon Dec 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 2:5.00-5
+- spec cleanup
+
 * Mon Nov 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 2:5.00-4
 - spec cleanup
 



From jsafrane at fedoraproject.org  Tue Dec  1 12:17:41 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 12:17:41 +0000 (UTC)
Subject: File lksctp-tools-1.0.11.tar.gz uploaded to lookaside cache by
	jsafrane
Message-ID: <20091201121741.D29C210F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lksctp-tools:

e9cf6c57402c9d4f1173a9529466e16d  lksctp-tools-1.0.11.tar.gz



From arbiter at fedoraproject.org  Tue Dec  1 12:18:17 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 12:18:17 +0000 (UTC)
Subject: File kdeaccessibility-4.3.80.tar.bz2 uploaded to lookaside cache by
	arbiter
Message-ID: <20091201121817.3EFC710F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qt:

e551da9e742bb0230dca51df2b1e78ce  kdeaccessibility-4.3.80.tar.bz2



From arbiter at fedoraproject.org  Tue Dec  1 12:19:06 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 12:19:06 +0000 (UTC)
Subject: File kdeadmin-4.3.80.tar.bz2 uploaded to lookaside cache by arbiter
Message-ID: <20091201121906.1ECC910F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qt:

47eedddda68a60f77dafbc3717e256c5  kdeadmin-4.3.80.tar.bz2



From pkgdb at fedoraproject.org  Tue Dec  1 12:19:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:19:21 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20091201121921.47A2C10F878@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora devel is now owned by jsafrane

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:19:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:19:26 +0000
Subject: [pkgdb] lksctp-tools ownership updated
Message-ID: <20091201121926.E959610F881@bastion2.fedora.phx.redhat.com>

Package lksctp-tools in Fedora 11 is now owned by jsafrane

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:19:37 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has given up watchcommits
Message-ID: <20091201121937.44ACD10F878@bastion2.fedora.phx.redhat.com>

jsafrane has given up the watchcommits acl on lksctp-tools (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:19:37 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has given up watchbugzilla
Message-ID: <20091201121937.6F4EC10F887@bastion2.fedora.phx.redhat.com>

jsafrane has given up the watchbugzilla acl on lksctp-tools (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:19:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:19:38 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has requested approveacls
Message-ID: <20091201121938.C095210F88E@bastion2.fedora.phx.redhat.com>

jsafrane has requested the approveacls acl on lksctp-tools (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:19:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:19:39 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has requested commit
Message-ID: <20091201121939.6AEE110F892@bastion2.fedora.phx.redhat.com>

jsafrane has requested the commit acl on lksctp-tools (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:20:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:20:11 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has given up commit
Message-ID: <20091201122011.3EC8510F886@bastion2.fedora.phx.redhat.com>

jsafrane has given up the commit acl on lksctp-tools (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:20:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:20:12 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has given up approveacls
Message-ID: <20091201122012.E145310F88E@bastion2.fedora.phx.redhat.com>

jsafrane has given up the approveacls acl on lksctp-tools (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:20:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:20:13 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has given up watchcommits
Message-ID: <20091201122013.9162A10F894@bastion2.fedora.phx.redhat.com>

jsafrane has given up the watchcommits acl on lksctp-tools (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:20:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:20:14 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has given up watchbugzilla
Message-ID: <20091201122014.60CCD10F899@bastion2.fedora.phx.redhat.com>

jsafrane has given up the watchbugzilla acl on lksctp-tools (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 12:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 12:24:46 +0000
Subject: [pkgdb] lksctp-tools: jsafrane has given up watchbugzilla
Message-ID: <20091201122446.12FFE10F886@bastion2.fedora.phx.redhat.com>

jsafrane has given up the watchbugzilla acl on lksctp-tools (Fedora 12)

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



From jsafrane at fedoraproject.org  Tue Dec  1 12:25:33 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 12:25:33 +0000 (UTC)
Subject: rpms/lksctp-tools/devel .cvsignore, 1.8, 1.9 lksctp-tools.spec, 1.24,
	1.25 sources, 1.8, 1.9
Message-ID: <20091201122533.E6ADA11C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	.cvsignore lksctp-tools.spec sources 
Log Message:
Update to 1.0.11
Remove rpath from compiled binaries


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lksctp-tools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Apr 2009 07:18:04 -0000	1.8
+++ .cvsignore	1 Dec 2009 12:25:33 -0000	1.9
@@ -1 +1 @@
-lksctp-tools-1.0.10.tar.gz
+lksctp-tools-1.0.11.tar.gz


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lksctp-tools/devel/lksctp-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lksctp-tools.spec	25 Jul 2009 11:11:25 -0000	1.24
+++ lksctp-tools.spec	1 Dec 2009 12:25:33 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
-Version: 1.0.10
-Release: 2%{?dist}
+Version: 1.0.11
+Release: 1%{?dist}
 # src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification
 License: GPLv2 and GPLv2+ and LGPLv2 and MIT
 Group: System Environment/Libraries
@@ -51,6 +51,10 @@ Drafts).
 %build
 [ ! -x ./configure ] && sh bootstrap
 %configure
+# remove rpath from libtool
+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
@@ -92,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*.txt
 
 %changelog
+* Tue Dec  1 2009 Jan Safranek <jsafrane at redhat.com> 1.0.11-1
+- Update to 1.0.11
+- Remove rpath from compiled binaries
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lksctp-tools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Apr 2009 07:18:04 -0000	1.8
+++ sources	1 Dec 2009 12:25:33 -0000	1.9
@@ -1 +1 @@
-cbcb78adc6ba251a99d45e78470b5571  lksctp-tools-1.0.10.tar.gz
+e9cf6c57402c9d4f1173a9529466e16d  lksctp-tools-1.0.11.tar.gz



From kdudka at fedoraproject.org  Tue Dec  1 12:26:27 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 12:26:27 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.126,1.127
Message-ID: <20091201122627.1C65611C00DE@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	curl.spec 
Log Message:
- do not require valgrind on s390 and s390x
- temporarily disabled SCP/SFTP test-suite (#539444)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- curl.spec	12 Nov 2009 12:04:26 -0000	1.126
+++ curl.spec	1 Dec 2009 12:26:26 -0000	1.127
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -23,11 +23,21 @@ BuildRequires: libidn-devel
 BuildRequires: libssh2-devel >= 1.2
 BuildRequires: nss-devel
 BuildRequires: openldap-devel
-BuildRequires: openssh-clients
-BuildRequires: openssh-server
+
+# SCP/SFTP test suite temporarily disabled (#539444)
+
+#BuildRequires: openssh-clients
+#BuildRequires: openssh-server
+
 BuildRequires: pkgconfig
 BuildRequires: stunnel
+
+# valgrind is not available on some architectures, however it's going to be
+# used only by the test-suite anyway
+%ifnarch s390 s390x
 BuildRequires: valgrind
+%endif
+
 BuildRequires: zlib-devel
 Requires: libcurl = %{version}-%{release}
 
@@ -162,6 +172,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
+- do not require valgrind on s390 and s390x
+- temporarily disabled SCP/SFTP test-suite (#539444)
+
 * Thu Nov 12 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-3
 - fix crash on doubly closed NSPR descriptor, patch contributed
   by Kevin Baughman (#534176)



From kdudka at fedoraproject.org  Tue Dec  1 12:26:51 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 12:26:51 +0000 (UTC)
Subject: rpms/curl/F-12 curl.spec,1.122,1.123
Message-ID: <20091201122651.F1C1E11C00DE@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1120

Modified Files:
	curl.spec 
Log Message:
- do not require valgrind on s390 and s390x


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- curl.spec	26 Nov 2009 20:01:00 -0000	1.122
+++ curl.spec	1 Dec 2009 12:26:51 -0000	1.123
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -29,7 +29,13 @@ BuildRequires: openldap-devel
 
 BuildRequires: pkgconfig
 BuildRequires: stunnel
+
+# valgrind is not available on some architectures, however it's going to be
+# used only by the test-suite anyway
+%ifnarch s390 s390x
 BuildRequires: valgrind
+%endif
+
 BuildRequires: zlib-devel
 Requires: libcurl = %{version}-%{release}
 
@@ -163,6 +169,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-3
+- do not require valgrind on s390 and s390x
+- temporarily disabled SCP/SFTP test-suite (#539444)
+
 * Thu Nov 26 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-2
 - workaround for broken TLS servers (#525496, #527771)
 



From than at fedoraproject.org  Tue Dec  1 12:31:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 12:31:32 +0000 (UTC)
Subject: rpms/qt/devel
	qt-everywhere-opensource-src-4.6.0-gst-pulsaudio.patch, 
	NONE, 1.1 qt.spec, 1.356,
	1.357 qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch, 1.1, NONE
Message-ID: <20091201123132.5EE2F11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.6.0-gst-pulsaudio.patch 
Removed Files:
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
adapt gst-pulsaudio patch


qt-everywhere-opensource-src-4.6.0-gst-pulsaudio.patch:
 audiooutput.cpp   |    4 +++-
 devicemanager.cpp |   22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

--- NEW FILE qt-everywhere-opensource-src-4.6.0-gst-pulsaudio.patch ---
diff -up qt-everywhere-opensource-src-4.6.0/src/3rdparty/phonon/gstreamer/audiooutput.cpp.gst-pulsaudio qt-everywhere-opensource-src-4.6.0/src/3rdparty/phonon/gstreamer/audiooutput.cpp
--- qt-everywhere-opensource-src-4.6.0/src/3rdparty/phonon/gstreamer/audiooutput.cpp.gst-pulsaudio	2009-11-27 02:27:50.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.0/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2009-12-01 13:36:43.000000000 +0100
@@ -148,7 +148,9 @@ bool AudioOutput::setOutputDevice(int ne
         // Save previous state
         GstState oldState = GST_STATE(m_audioSink);
         const QByteArray oldDeviceValue = GstHelper::property(m_audioSink, "device");
-        const QByteArray deviceId = deviceList.at(deviceIdx).gstId;
+        const QByteArray deviceId = (deviceList.at(deviceIdx).gstId == "PulseAudio"
+                                    ? "default"
+                                    : deviceList.at(deviceIdx).gstId);
         m_device = newDevice;
 
         // We test if the device can be opened by checking if it can go from NULL to READY state
diff -up qt-everywhere-opensource-src-4.6.0/src/3rdparty/phonon/gstreamer/devicemanager.cpp.gst-pulsaudio qt-everywhere-opensource-src-4.6.0/src/3rdparty/phonon/gstreamer/devicemanager.cpp
--- qt-everywhere-opensource-src-4.6.0/src/3rdparty/phonon/gstreamer/devicemanager.cpp.gst-pulsaudio	2009-11-27 02:27:50.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.0/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2009-12-01 13:04:18.000000000 +0100
@@ -50,6 +50,8 @@ AudioDevice::AudioDevice(DeviceManager *
     //get name from device
     if (gstId == "default") {
         description = "Default audio device";
+    } else if (gstId == "PulseAudio") {
+        description = QObject::tr("Pass all audio through the PulseAudio Sound Server.\n").toUtf8();
     } else {
         GstElement *aSink= manager->createAudioSink();
 
@@ -178,6 +180,18 @@ GstElement *DeviceManager::createAudioSi
                 }
             }
 
+            if (!sink) {
+                sink = gst_element_factory_make ("pulsesink", NULL);
+                if (canOpenDevice(sink)) {
+                    m_backend->logMessage("AudioOutput using pulse audio sink");
+                    m_audioSink = "pulsesink";
+                }
+                else if (sink) {
+                    gst_object_unref(sink);
+                    sink = 0;
+                }
+            }
+
 #ifdef USE_ALSASINK2
             if (!sink) {
                 sink = gst_element_factory_make ("_k_alsasink", NULL);
@@ -311,8 +325,12 @@ void DeviceManager::updateDeviceList()
     QList<QByteArray> list;
 
     if (audioSink) {
-        list = GstHelper::extractProperties(audioSink, "device");
-        list.prepend("default");
+        if (m_audioSink == "pulsesink") {
+            list.append("PulseAudio");
+        } else {
+            list = GstHelper::extractProperties(audioSink, "device");
+            list.prepend("default");
+        }
 
         for (int i = 0 ; i < list.size() ; ++i) {
             QByteArray gstId = list.at(i);


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -p -r1.356 -r1.357
--- qt.spec	1 Dec 2009 11:50:53 -0000	1.356
+++ qt.spec	1 Dec 2009 12:31:32 -0000	1.357
@@ -43,7 +43,7 @@ Patch16: qt-x11-opensource-src-4.5.1-kde
 # make PulseAudio the default device in Phonon
 Patch17: qt-x11-opensource-src-4.5.2-pulseaudio.patch
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
-Patch21: qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
+Patch21: qt-everywhere-opensource-src-4.6.0-gst-pulsaudio.patch
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
 Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
 Requires: ca-certificates


--- qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch DELETED ---



From mhlavink at fedoraproject.org  Tue Dec  1 12:36:35 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  1 Dec 2009 12:36:35 +0000 (UTC)
Subject: rpms/nmap/devel nmap.spec,1.59,1.60
Message-ID: <20091201123635.98FAC11C00DE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	nmap.spec 
Log Message:
* Mon Dec 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 2:5.00-5
- spec cleanup



Index: nmap.spec
===================================================================
RCS file: /cvs/extras/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- nmap.spec	2 Nov 2009 16:50:34 -0000	1.59
+++ nmap.spec	1 Dec 2009 12:36:35 -0000	1.60
@@ -1,11 +1,16 @@
+#TODO: stop using local copy of libdnet, once system distributed version supports sctp (grep sctp /usr/include/dnet.h)
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 5.00
-Release: 4%{?dist}
-# libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999)
-License: GPLv2
+Release: 5%{?dist}
+# nmap is GPLv2
+# zenmap is GPLv2 and LGPLv2+ (zenmap/higwidgets) and GPLv2+ (zenmap/radialnet)
+# libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999) with some parts as Public Domain (crc32)
+# openssl is OpenSSL
+# openssl and libdnet-striped is removed in %%prep section
+License: GPLv2 and LGPLv2+ and GPLv2+ and BSD
 Group: Applications/System
 Source0: http://nmap.org/dist/%{name}-%{version}.tar.bz2
 Source1: zenmap.desktop
@@ -52,7 +57,8 @@ be installed before installing nmap fron
 %patch2 -p1 -b .noms
 %patch3 -p1 -b .nostrip
 
-rm -rf liblua libpcap libpcre
+#be sure we're not using tarballed copies of some libraries
+rm -rf liblua libpcap libpcre macosx mswin32
 
 #fix locale dir
 mv zenmap/share/zenmap/locale zenmap/share
@@ -144,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Mon Dec 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 2:5.00-5
+- spec cleanup
+
 * Mon Nov 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 2:5.00-4
 - spec cleanup
 



From jsafrane at fedoraproject.org  Tue Dec  1 12:39:52 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 12:39:52 +0000 (UTC)
Subject: rpms/lksctp-tools/devel lksctp-tools.spec,1.25,1.26
Message-ID: <20091201123952.3CABF11C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	lksctp-tools.spec 
Log Message:
Remove static libraries


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lksctp-tools/devel/lksctp-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- lksctp-tools.spec	1 Dec 2009 12:25:33 -0000	1.25
+++ lksctp-tools.spec	1 Dec 2009 12:39:52 -0000	1.26
@@ -50,7 +50,7 @@ Drafts).
 
 %build
 [ ! -x ./configure ] && sh bootstrap
-%configure
+%configure --disable-static
 # remove rpath from libtool
 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
@@ -62,6 +62,8 @@ rm -rf $RPM_BUILD_ROOT
 rm -f doc/rfc2960.txt doc/states.txt
 make install DESTDIR="$RPM_BUILD_ROOT"
 
+find $RPM_BUILD_ROOT/%{_libdir}/ -name "*.la"  | xargs rm -f
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,12 +83,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,0755)
 %{_includedir}/*
-%{_libdir}/libsctp.a
-%exclude %{_libdir}/libsctp.la
 %{_libdir}/libsctp.so
 %dir %{_libdir}/lksctp-tools/
-%{_libdir}/lksctp-tools/libwithsctp.a
-%exclude %{_libdir}/lksctp-tools/libwithsctp.la
 %{_libdir}/lksctp-tools/libwithsctp.so
 %{_datadir}/lksctp-tools/
 %{_mandir}/man3/*
@@ -99,6 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Dec  1 2009 Jan Safranek <jsafrane at redhat.com> 1.0.11-1
 - Update to 1.0.11
 - Remove rpath from compiled binaries
+- Remove static libraries
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From arbiter at fedoraproject.org  Tue Dec  1 12:45:41 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 12:45:41 +0000 (UTC)
Subject: File kdeartwork-4.3.80.tar.bz2 uploaded to lookaside cache by
	arbiter
Message-ID: <20091201124541.2047710F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qt:

7b5c22f34a4c7c4f73e8fb7e35d2de4b  kdeartwork-4.3.80.tar.bz2



From arbiter at fedoraproject.org  Tue Dec  1 12:47:21 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 12:47:21 +0000 (UTC)
Subject: File kdebase-4.3.80.tar.bz2 uploaded to lookaside cache by arbiter
Message-ID: <20091201124721.23ECF10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qt:

83af816034448c0b21667457efe1a455  kdebase-4.3.80.tar.bz2



From jsafrane at fedoraproject.org  Tue Dec  1 12:47:44 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 12:47:44 +0000 (UTC)
Subject: rpms/lksctp-tools/devel lksctp-tools-1.0.6-libdir.patch,1.4,1.5
Message-ID: <20091201124744.3E57211C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	lksctp-tools-1.0.6-libdir.patch 
Log Message:
Update to 1.0.11

lksctp-tools-1.0.6-libdir.patch:
 withsctp.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: lksctp-tools-1.0.6-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lksctp-tools/devel/lksctp-tools-1.0.6-libdir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lksctp-tools-1.0.6-libdir.patch	14 Apr 2009 07:18:04 -0000	1.4
+++ lksctp-tools-1.0.6-libdir.patch	1 Dec 2009 12:47:44 -0000	1.5
@@ -1,10 +1,11 @@
---- lksctp-tools-1.0.6/src/withsctp/withsctp.in.libdir	2006-09-19 15:10:53.000000000 +0200
-+++ lksctp-tools-1.0.6/src/withsctp/withsctp.in	2006-09-19 15:12:50.000000000 +0200
+diff -up lksctp-tools-1.0.11/src/withsctp/withsctp.in.orig lksctp-tools-1.0.11/src/withsctp/withsctp.in
+--- lksctp-tools-1.0.11/src/withsctp/withsctp.in.orig	2009-10-24 02:49:15.000000000 +0200
++++ lksctp-tools-1.0.11/src/withsctp/withsctp.in	2009-12-01 13:46:30.000000000 +0100
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # -*- sh -*-
 -LIBDIR=@libdir@/@PACKAGE@
 +LIBDIR=`rpm --eval "%{_libdir}"`/@PACKAGE@
  BINDIR=@bindir@
- export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.10
+ export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.11
  if ! ${BINDIR}/checksctp 2> /dev/null



From jsafrane at fedoraproject.org  Tue Dec  1 12:48:52 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  1 Dec 2009 12:48:52 +0000 (UTC)
Subject: rpms/lksctp-tools/F-12 lksctp-tools.spec,1.24,1.25
Message-ID: <20091201124852.4838311C00DE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/lksctp-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6907

Modified Files:
	lksctp-tools.spec 
Log Message:
Remove static libraries
Remove rpath from binaries


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lksctp-tools/F-12/lksctp-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lksctp-tools.spec	25 Jul 2009 11:11:25 -0000	1.24
+++ lksctp-tools.spec	1 Dec 2009 12:48:52 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
 Version: 1.0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 # src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification
 License: GPLv2 and GPLv2+ and LGPLv2 and MIT
 Group: System Environment/Libraries
@@ -50,7 +50,10 @@ Drafts).
 
 %build
 [ ! -x ./configure ] && sh bootstrap
-%configure
+%configure --disable-static
+# remove rpath from libtool
+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
@@ -58,6 +61,8 @@ rm -rf $RPM_BUILD_ROOT
 rm -f doc/rfc2960.txt doc/states.txt
 make install DESTDIR="$RPM_BUILD_ROOT"
 
+find $RPM_BUILD_ROOT/%{_libdir}/ -name "*.la"  | xargs rm -f
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,12 +82,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,0755)
 %{_includedir}/*
-%{_libdir}/libsctp.a
-%exclude %{_libdir}/libsctp.la
 %{_libdir}/libsctp.so
 %dir %{_libdir}/lksctp-tools/
-%{_libdir}/lksctp-tools/libwithsctp.a
-%exclude %{_libdir}/lksctp-tools/libwithsctp.la
 %{_libdir}/lksctp-tools/libwithsctp.so
 %{_datadir}/lksctp-tools/
 %{_mandir}/man3/*
@@ -92,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*.txt
 
 %changelog
+* Tue Dec  1 2009 Jan Safranek <jsafrane at redhat.com> 1.0.10-3
+- Remove static libraries
+- Remove rpath from binaries
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From arbiter at fedoraproject.org  Tue Dec  1 12:50:25 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 12:50:25 +0000 (UTC)
Subject: File kdebase-runtime-4.3.80.tar.bz2 uploaded to lookaside cache by
	arbiter
Message-ID: <20091201125025.6C00F10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qt:

a7e0ce1a6c1c58821566502e6c5dd58c  kdebase-runtime-4.3.80.tar.bz2



From mlichvar at fedoraproject.org  Tue Dec  1 12:57:07 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  1 Dec 2009 12:57:07 +0000 (UTC)
Subject: File adjtimex_1.28.orig.tar.gz uploaded to lookaside cache by
	mlichvar
Message-ID: <20091201125707.54A9A10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for adjtimex:

dda82922374230dbd9475c79c79ac909  adjtimex_1.28.orig.tar.gz



From mlichvar at fedoraproject.org  Tue Dec  1 12:58:13 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  1 Dec 2009 12:58:13 +0000 (UTC)
Subject: rpms/adjtimex/devel .cvsignore, 1.9, 1.10 adjtimex.spec, 1.29,
	1.30 sources, 1.9, 1.10
Message-ID: <20091201125813.7D9E911C00DE@cvs1.fedora.phx.redhat.com>

Author: mlichvar

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

Modified Files:
	.cvsignore adjtimex.spec sources 
Log Message:
- update to 1.28



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/adjtimex/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Jun 2009 14:41:21 -0000	1.9
+++ .cvsignore	1 Dec 2009 12:58:13 -0000	1.10
@@ -1 +1 @@
-adjtimex_1.27.1.orig.tar.gz
+adjtimex_1.28.orig.tar.gz


Index: adjtimex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/adjtimex/devel/adjtimex.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- adjtimex.spec	24 Jul 2009 16:35:50 -0000	1.29
+++ adjtimex.spec	1 Dec 2009 12:58:13 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A utility for adjusting kernel time variables
 Name: adjtimex
-Version: 1.27.1
-Release: 2%{?dist}
+Version: 1.28
+Release: 1%{?dist}
 ExclusiveOS: Linux
 License: GPLv2+
 Group: System Environment/Base
@@ -40,6 +40,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/adjtimex.8*
 
 %changelog
+* Tue Dec 01 2009 Miroslav Lichvar <mlichvar at redhat.com> 1.28-1
+- update to 1.28
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/adjtimex/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Jun 2009 14:41:21 -0000	1.9
+++ sources	1 Dec 2009 12:58:13 -0000	1.10
@@ -1 +1 @@
-1891a33ff0f19920b5d2b64267e93166  adjtimex_1.27.1.orig.tar.gz
+dda82922374230dbd9475c79c79ac909  adjtimex_1.28.orig.tar.gz



From arbiter at fedoraproject.org  Tue Dec  1 13:09:06 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 13:09:06 +0000 (UTC)
Subject: rpms/cherokee/EL-5 .cvsignore, 1.11, 1.12 cherokee.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <20091201130906.A0CBC11C00DE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
- 0.99.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 Nov 2009 16:21:45 -0000	1.11
+++ .cvsignore	1 Dec 2009 13:09:06 -0000	1.12
@@ -1 +1 @@
-cherokee-0.99.29.tar.gz
+cherokee-0.99.30.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/cherokee.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- cherokee.spec	22 Nov 2009 16:21:45 -0000	1.14
+++ cherokee.spec	1 Dec 2009 13:09:06 -0000	1.15
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.29
+Version:        0.99.30
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -27,8 +27,8 @@ BuildRequires:  openssl-devel pam-devel 
 # BuildRequires:  pcre-devel
 BuildRequires:  gettext
 # For spawn-fcgi
-Requires:	    spawn-fcgi
-Requires(post): chkconfig
+Requires:	 spawn-fcgi
+Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
+- 0.99.30
+
 * Sun Nov 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.29-1
 - 0.99.29
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 Nov 2009 16:21:45 -0000	1.11
+++ sources	1 Dec 2009 13:09:06 -0000	1.12
@@ -1 +1 @@
-236f17981c0c8908f6911fda239fc3a4  cherokee-0.99.29.tar.gz
+a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz



From arbiter at fedoraproject.org  Tue Dec  1 13:09:11 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 13:09:11 +0000 (UTC)
Subject: rpms/cherokee/F-11 .cvsignore, 1.11, 1.12 cherokee.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20091201130911.AFEA811C00DE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
- 0.99.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 Nov 2009 14:49:37 -0000	1.11
+++ .cvsignore	1 Dec 2009 13:09:11 -0000	1.12
@@ -1 +1 @@
-cherokee-0.99.29.tar.gz
+cherokee-0.99.30.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/cherokee.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cherokee.spec	22 Nov 2009 14:49:37 -0000	1.17
+++ cherokee.spec	1 Dec 2009 13:09:11 -0000	1.18
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.29
+Version:        0.99.30
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -27,8 +27,8 @@ BuildRequires:  openssl-devel pam-devel 
 # BuildRequires:  pcre-devel
 BuildRequires:  gettext
 # For spawn-fcgi
-Requires:	    spawn-fcgi
-Requires(post): chkconfig
+Requires:	 spawn-fcgi
+Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
+- 0.99.30
+
 * Sun Nov 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.29-1
 - 0.99.29
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 Nov 2009 14:49:37 -0000	1.11
+++ sources	1 Dec 2009 13:09:11 -0000	1.12
@@ -1 +1 @@
-236f17981c0c8908f6911fda239fc3a4  cherokee-0.99.29.tar.gz
+a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz



From arbiter at fedoraproject.org  Tue Dec  1 13:09:18 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 13:09:18 +0000 (UTC)
Subject: rpms/cherokee/F-12 .cvsignore, 1.12, 1.13 cherokee.spec, 1.23,
	1.24 sources, 1.13, 1.14
Message-ID: <20091201130918.60D4411C00DE@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11932

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
- 0.99.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	22 Nov 2009 14:48:30 -0000	1.12
+++ .cvsignore	1 Dec 2009 13:09:18 -0000	1.13
@@ -1 +1 @@
-cherokee-0.99.29.tar.gz
+cherokee-0.99.30.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/cherokee.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- cherokee.spec	22 Nov 2009 14:48:30 -0000	1.23
+++ cherokee.spec	1 Dec 2009 13:09:18 -0000	1.24
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.29
+Version:        0.99.30
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -27,8 +27,8 @@ BuildRequires:  openssl-devel pam-devel 
 # BuildRequires:  pcre-devel
 BuildRequires:  gettext
 # For spawn-fcgi
-Requires:	    spawn-fcgi
-Requires(post): chkconfig
+Requires:	 spawn-fcgi
+Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
+- 0.99.30
+
 * Sun Nov 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.29-1
 - 0.99.29
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 Nov 2009 14:48:30 -0000	1.13
+++ sources	1 Dec 2009 13:09:18 -0000	1.14
@@ -1 +1 @@
-236f17981c0c8908f6911fda239fc3a4  cherokee-0.99.29.tar.gz
+a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz



From kdudka at fedoraproject.org  Tue Dec  1 13:09:33 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 13:09:33 +0000 (UTC)
Subject: File nano-2.2.0.tar.gz uploaded to lookaside cache by kdudka
Message-ID: <20091201130933.6849F10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nano:

b34ea8fac9563b0485f39a065b5893bf  nano-2.2.0.tar.gz



From kdudka at fedoraproject.org  Tue Dec  1 13:11:48 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 13:11:48 +0000 (UTC)
Subject: rpms/nano/devel nano-2.2.0-warnings.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 nano.spec, 1.34, 1.35 sources, 1.11,
	1.12 nano-2.0.9-warnings.patch, 1.3, NONE
Message-ID: <20091201131148.2D7A511C0426@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	.cvsignore nano.spec sources 
Added Files:
	nano-2.2.0-warnings.patch 
Removed Files:
	nano-2.0.9-warnings.patch 
Log Message:
- new upstream release

nano-2.2.0-warnings.patch:
 chars.c |   40 +++++++++++++++++++++++++---------------
 files.c |    3 +--
 nano.h  |    3 +++
 3 files changed, 29 insertions(+), 17 deletions(-)

--- NEW FILE nano-2.2.0-warnings.patch ---
diff --git a/src/chars.c b/src/chars.c
index beb88ca..1d73b81 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -79,6 +79,16 @@ bool is_byte(int c)
     return ((unsigned int)c == (unsigned char)c);
 }
 
+static void mbtowc_reset(void)
+{
+    IGNORE_CALL_RESULT(mbtowc(NULL, NULL, 0));
+}
+
+static void wctomb_reset(void)
+{
+    IGNORE_CALL_RESULT(wctomb(NULL, 0));
+}
+
 /* This function is equivalent to isalnum() for multibyte characters. */
 bool is_alnum_mbchar(const char *c)
 {
@@ -89,7 +99,7 @@ bool is_alnum_mbchar(const char *c)
 	wchar_t wc;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    int shutup = mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -109,7 +119,7 @@ bool is_blank_mbchar(const char *c)
 	wchar_t wc;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    int shutup = mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -156,7 +166,7 @@ bool is_cntrl_mbchar(const char *c)
 	wchar_t wc;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    int shutup = mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -177,7 +187,7 @@ bool is_punct_mbchar(const char *c)
 	int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX);
 
 	if (c_mb_len < 0) {
-	    int shutup = mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -243,14 +253,14 @@ char *control_mbrep(const char *c, char *crep, int *crep_len)
 	wchar_t wc;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    int shutup = mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    *crep_len = bad_mbchar_len;
 	    strncpy(crep, bad_mbchar, *crep_len);
 	} else {
 	    *crep_len = wctomb(crep, control_wrep(wc));
 
 	    if (*crep_len < 0) {
-		int shutup = wctomb(NULL, 0);
+		wctomb_reset();
 		*crep_len = 0;
 	    }
 	}
@@ -278,14 +288,14 @@ char *mbrep(const char *c, char *crep, int *crep_len)
 
 	/* Reject invalid Unicode characters. */
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0 || !is_valid_unicode(wc)) {
-	    int shutup = mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    *crep_len = bad_mbchar_len;
 	    strncpy(crep, bad_mbchar, *crep_len);
 	} else {
 	    *crep_len = wctomb(crep, wc);
 
 	    if (*crep_len < 0) {
-		int shutup = wctomb(NULL, 0);
+		wctomb_reset();
 		*crep_len = 0;
 	    }
 	}
@@ -311,7 +321,7 @@ int mbwidth(const char *c)
 	int width;
 
 	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
-	    int shutup = mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
 
@@ -356,7 +366,7 @@ char *make_mbchar(long chr, int *chr_mb_len)
 
 	/* Reject invalid Unicode characters. */
 	if (*chr_mb_len < 0 || !is_valid_unicode((wchar_t)chr)) {
-	    int shutup = wctomb(NULL, 0);
+	    wctomb_reset();
 	    *chr_mb_len = 0;
 	}
     } else {
@@ -388,7 +398,7 @@ int parse_mbchar(const char *buf, char *chr, size_t *col)
 	/* If buf contains an invalid multibyte character, only
 	 * interpret buf's first byte. */
 	if (buf_mb_len < 0) {
-	    int shutup = mblen(NULL, 0);
+	    IGNORE_CALL_RESULT(mblen(NULL, 0));
 	    buf_mb_len = 1;
 	} else if (buf_mb_len == 0)
 	    buf_mb_len++;
@@ -545,7 +555,7 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 	    s1_mb_len = parse_mbchar(s1, s1_mb, NULL);
 
 	    if (mbtowc(&ws1, s1_mb, s1_mb_len) < 0) {
-		int shutup = mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws1 = (unsigned char)*s1_mb;
 		bad_s1_mb = TRUE;
 	    }
@@ -553,7 +563,7 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 	    s2_mb_len = parse_mbchar(s2, s2_mb, NULL);
 
 	    if (mbtowc(&ws2, s2_mb, s2_mb_len) < 0) {
-		int shutup = mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws2 = (unsigned char)*s2_mb;
 		bad_s2_mb = TRUE;
 	    }
@@ -781,7 +791,7 @@ char *mbstrchr(const char *s, const char *c)
 	int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX);
 
 	if (c_mb_len < 0) {
-	    int shutup = mbtowc(NULL, NULL, 0);
+	    mbtowc_reset();
 	    wc = (unsigned char)*c;
 	    bad_c_mb = TRUE;
 	}
@@ -790,7 +800,7 @@ char *mbstrchr(const char *s, const char *c)
 	    int s_mb_len = parse_mbchar(s, s_mb, NULL);
 
 	    if (mbtowc(&ws, s_mb, s_mb_len) < 0) {
-		int shutup = mbtowc(NULL, NULL, 0);
+		mbtowc_reset();
 		ws = (unsigned char)*s;
 		bad_s_mb = TRUE;
 	    }
diff --git a/src/files.c b/src/files.c
index 17eb431..92d6d88 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1092,7 +1092,6 @@ char *get_full_path(const char *origpath)
     char *d_here, *d_there, *d_there_file = NULL;
     const char *last_slash;
     bool path_only;
-    int shutup;
 
     if (origpath == NULL)
     	return NULL;
@@ -1191,7 +1190,7 @@ char *get_full_path(const char *origpath)
 	    /* Finally, go back to the path specified in d_here,
 	     * where we were before.  We don't check for a chdir()
 	     * error, since we can do nothing if we get one. */
-	    shutup = chdir(d_here);
+	    IGNORE_CALL_RESULT(chdir(d_here));
 
 	    /* Free d_here, since we're done using it. */
 	    free(d_here);
diff --git a/src/nano.h b/src/nano.h
index 0cc8f22..2fe383f 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -54,6 +54,9 @@
 #include <stdarg.h>
 #endif
 
+/* Suppress warnings for __attribute__((warn_unused_result)) */
+#define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
+
 /* Macros for flags. */
 #define FLAGOFF(flag) ((flag) / (sizeof(unsigned) * 8))
 #define FLAGMASK(flag) (1 << ((flag) % (sizeof(unsigned) * 8)))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	18 Sep 2009 18:14:09 -0000	1.11
+++ .cvsignore	1 Dec 2009 13:11:47 -0000	1.12
@@ -1 +1 @@
-nano-2.0.9.tar.gz
+nano-2.2.0.tar.gz


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- nano.spec	25 Nov 2009 17:57:33 -0000	1.34
+++ nano.spec	1 Dec 2009 13:11:47 -0000	1.35
@@ -1,13 +1,13 @@
 Summary:         A small text editor
 Name:            nano
-Version:         2.0.9
-Release:         7%{?dist}
+Version:         2.2.0
+Release:         1%{?dist}
 License:         GPLv3+
 Group:           Applications/Editors
 URL:             http://www.nano-editor.org
-Source:          http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+Source:          http://www.nano-editor.org/dist/v2.2/%{name}-%{version}.tar.gz
 Source2:         nanorc
-Patch1:          nano-2.0.9-warnings.patch
+Patch1:          nano-2.2.0-warnings.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   autoconf
 BuildRequires:   gettext-devel
@@ -29,7 +29,7 @@ for f in doc/man/fr/{nano.1,nanorc.5,rna
 done
 
 %build
-%configure --enable-all --bindir=/bin
+%configure --bindir=/bin
 make %{?_smp_mflags}
 
 %install
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> - 2.2.0-1
+- new upstream release
+
 * Wed Nov 25 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-7
 - sanitize specfile according to Fedora Packaging Guidelines 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	18 Sep 2009 18:14:09 -0000	1.11
+++ sources	1 Dec 2009 13:11:47 -0000	1.12
@@ -1 +1 @@
-2be94dc43fb60fff4626a2401a977220  nano-2.0.9.tar.gz
+b34ea8fac9563b0485f39a065b5893bf  nano-2.2.0.tar.gz


--- nano-2.0.9-warnings.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Dec  1 13:12:23 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 13:12:23 +0000 (UTC)
Subject: File kdeaccessibility-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091201131223.B37C310F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeaccessibility:

e551da9e742bb0230dca51df2b1e78ce  kdeaccessibility-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Tue Dec  1 13:13:06 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 13:13:06 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.50,
	1.51 kdeaccessibility.spec, 1.95, 1.96 sources, 1.50, 1.51
Message-ID: <20091201131306.284D411C00DE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
- KDE 4.4 beta1 (4.3.80)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	24 Nov 2009 16:19:40 -0000	1.50
+++ .cvsignore	1 Dec 2009 13:13:05 -0000	1.51
@@ -1 +1 @@
-kdeaccessibility-4.3.75svn1048496.tar.bz2
+kdeaccessibility-4.3.80.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kdeaccessibility.spec	24 Nov 2009 16:19:40 -0000	1.95
+++ kdeaccessibility.spec	1 Dec 2009 13:13:05 -0000	1.96
@@ -1,10 +1,10 @@
-%define alphatag svn1048496
+#%define alphatag svn1048496
 
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.75
-Release:        0.1.%{alphatag}%{?dist}
+Version:        4.3.80
+Release:        1.%{?alphatag}%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -146,6 +146,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	24 Nov 2009 16:19:40 -0000	1.50
+++ sources	1 Dec 2009 13:13:06 -0000	1.51
@@ -1 +1 @@
-4e9dd3c1e40074463ced5718ae7a3ab7  kdeaccessibility-4.3.75svn1048496.tar.bz2
+e551da9e742bb0230dca51df2b1e78ce  kdeaccessibility-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Tue Dec  1 13:14:01 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 13:14:01 +0000 (UTC)
Subject: File kdeadmin-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091201131401.D949910F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeadmin:

47eedddda68a60f77dafbc3717e256c5  kdeadmin-4.3.80.tar.bz2



From than at fedoraproject.org  Tue Dec  1 13:17:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:17:42 +0000 (UTC)
Subject: File kdelibs-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201131742.C7E5110F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdelibs:

bc781838ad8cafa479e99139f7f403f3  kdelibs-4.3.4.tar.bz2



From ltinkl at fedoraproject.org  Tue Dec  1 13:18:56 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 13:18:56 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore, 1.71, 1.72 kdeadmin.spec, 1.151,
	1.152 sources, 1.71, 1.72
Message-ID: <20091201131856.AD55B11C00DE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
- KDE 4.4 beta1 (4.3.80)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	24 Nov 2009 16:59:32 -0000	1.71
+++ .cvsignore	1 Dec 2009 13:18:56 -0000	1.72
@@ -1 +1 @@
-kdeadmin-4.3.75svn1048496.tar.bz2
+kdeadmin-4.3.80.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kdeadmin.spec	24 Nov 2009 16:59:32 -0000	1.151
+++ kdeadmin.spec	1 Dec 2009 13:18:56 -0000	1.152
@@ -1,4 +1,4 @@
-%define alphatag svn1048496
+#%define alphatag svn1048496
 
 %if 0%{?fedora}
 %define system_config_printer_kde 1
@@ -8,8 +8,8 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.75
-Release:        0.1.%{alphatag}%{?dist}
+Version:        4.3.80
+Release:        1.%{?alphatag}%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -161,6 +161,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	24 Nov 2009 16:59:32 -0000	1.71
+++ sources	1 Dec 2009 13:18:56 -0000	1.72
@@ -1 +1 @@
-fec9d217243b3fcac9cdac4845ff455b  kdeadmin-4.3.75svn1048496.tar.bz2
+47eedddda68a60f77dafbc3717e256c5  kdeadmin-4.3.80.tar.bz2



From than at fedoraproject.org  Tue Dec  1 13:19:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:19:33 +0000 (UTC)
Subject: rpms/kdelibs/F-12 .cvsignore, 1.81, 1.82 kdelibs.spec, 1.529,
	1.530 sources, 1.97, 1.98
Message-ID: <20091201131933.731AC11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14213

Modified Files:
	.cvsignore kdelibs.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	10 Nov 2009 15:10:12 -0000	1.81
+++ .cvsignore	1 Dec 2009 13:19:32 -0000	1.82
@@ -1 +1,2 @@
 kdelibs-4.3.3.tar.bz2
+kdelibs-4.3.4.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -p -r1.529 -r1.530
--- kdelibs.spec	16 Nov 2009 16:50:35 -0000	1.529
+++ kdelibs.spec	1 Dec 2009 13:19:33 -0000	1.530
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.3
-Release: 5%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -408,6 +408,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Mon Nov 16 2009 Than Ngo <than at redhat.com> - 4.3.3-5
 - fix conditional
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- sources	10 Nov 2009 15:10:12 -0000	1.97
+++ sources	1 Dec 2009 13:19:33 -0000	1.98
@@ -1 +1 @@
-20fd3793d9d23088ecb1d5aed0254216  kdelibs-4.3.3.tar.bz2
+bc781838ad8cafa479e99139f7f403f3  kdelibs-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 13:21:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:21:52 +0000 (UTC)
Subject: File kdeaccessibility-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201132152.1A49110F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeaccessibility:

00adeff7e2441fdc7959644cefb07967  kdeaccessibility-4.3.4.tar.bz2



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:16 +0000
Subject: [pkgdb] qt-creator: arbiter has requested commit
Message-ID: <20091201132316.3F12110F878@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on qt-creator (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:18 +0000
Subject: [pkgdb] qt-creator: arbiter has given up watchcommits
Message-ID: <20091201132318.AF67D10F886@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchcommits acl on qt-creator (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:21 +0000
Subject: [pkgdb] qt-creator: arbiter has given up watchbugzilla
Message-ID: <20091201132321.7A61110F89F@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchbugzilla acl on qt-creator (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:30 +0000
Subject: [pkgdb] qt-creator: arbiter has given up watchcommits
Message-ID: <20091201132330.4B3DE10F891@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchcommits acl on qt-creator (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:34 +0000
Subject: [pkgdb] qt-creator: arbiter has requested commit
Message-ID: <20091201132334.700BB10F899@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on qt-creator (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:37 +0000
Subject: [pkgdb] qt-creator: arbiter has given up watchbugzilla
Message-ID: <20091201132337.31E0810F89D@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchbugzilla acl on qt-creator (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:43 +0000
Subject: [pkgdb] qt-creator: arbiter has given up watchbugzilla
Message-ID: <20091201132343.3A13510F8A0@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchbugzilla acl on qt-creator (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:43 +0000
Subject: [pkgdb] qt-creator: arbiter has given up watchcommits
Message-ID: <20091201132343.E87F710F8A4@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchcommits acl on qt-creator (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:23:45 +0000
Subject: [pkgdb] qt-creator: arbiter has requested commit
Message-ID: <20091201132345.3E40110F84E@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on qt-creator (Fedora 11)

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



From caolanm at fedoraproject.org  Tue Dec  1 13:24:58 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  1 Dec 2009 13:24:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.pythonssldedux.patch, NONE,
	1.1 openoffice.org.spec, 1.2091, 1.2092
Message-ID: <20091201132458.530EE11C00DE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15416

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.pythonssldedux.patch 
Log Message:
get cram-md5 authentication working in emailmerge

workspace.pythonssldedux.patch:
 mailmerge.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE workspace.pythonssldedux.patch ---
diff -r ccdb8c85656c scripting/source/pyprov/mailmerge.py
--- a/scripting/source/pyprov/mailmerge.py	Wed Oct 28 09:17:36 2009 +0000
+++ b/scripting/source/pyprov/mailmerge.py	Tue Dec 01 13:21:47 2009 +0000
@@ -85,8 +85,8 @@
 			self.server.starttls()
 			self.server.ehlo()
 
-		user = xAuthenticator.getUserName()
-		password = xAuthenticator.getPassword()
+		user = xAuthenticator.getUserName().encode('ascii')
+		password = xAuthenticator.getPassword().encode('ascii')
 		if user != '':
 			if dbg:
 				print >> sys.stderr, 'Logging in, username of', user
@@ -234,8 +234,8 @@
 			self.server = imaplib.IMAP4(server, port)
 		print >> sys.stderr, "AFTER"
 			
-		user = xAuthenticator.getUserName()
-		password = xAuthenticator.getPassword()
+		user = xAuthenticator.getUserName().encode('ascii')
+		password = xAuthenticator.getPassword().encode('ascii')
 		if user != '':
 			if dbg:
 				print >> sys.stderr, 'Logging in, username of', user
@@ -302,8 +302,8 @@
 			self.server = poplib.POP3(server, port)
 		print >> sys.stderr, "AFTER"
 			
-		user = xAuthenticator.getUserName()
-		password = xAuthenticator.getPassword()
+		user = xAuthenticator.getUserName().encode('ascii')
+		password = xAuthenticator.getPassword().encode('ascii')
 		if dbg:
 			print >> sys.stderr, 'Logging in, username of', user
 		self.server.user(user)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2091
retrieving revision 1.2092
diff -u -p -r1.2091 -r1.2092
--- openoffice.org.spec	27 Nov 2009 13:10:04 -0000	1.2091
+++ openoffice.org.spec	1 Dec 2009 13:24:57 -0000	1.2092
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 6
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -131,6 +131,7 @@ Patch53: openoffice.org-3.2.0.ooo107137.
 Patch54: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 Patch55: openoffice.org-3.3.0.ooo102645.fix.es.patch
 Patch56: workspace.vcl108.patch
+Patch57: workspace.pythonssldedux.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1656,6 +1657,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch54 -p1 -b .ooo107151.sc.pop-empty-cell.patch
 %patch55 -p0 -b .ooo102645.fix.es.patch
 %patch56 -p0 -b .workspace.vcl108.patch
+%patch57 -p1 -b .workspace.pythonssldedux.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4162,6 +4164,10 @@ fi
 %endif
 
 %changelog
+* Tue Dec 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-6.3
+- add workspace.pythonssldedux.patch to get CRAM-MD5 working from
+  emailmerge
+
 * Fri Nov 27 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-6.2
 - Resolves: rhbz#541222 add 
   openoffice.org-3.2.0.ooo107260.vcl.clipboard.shutdown.patch (caolanm)



From caolanm at fedoraproject.org  Tue Dec  1 13:27:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  1 Dec 2009 13:27:20 +0000 (UTC)
Subject: rpms/log4cxx/devel log4cxx.spec,1.4,1.5
Message-ID: <20091201132720.CDBA411C00DE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	log4cxx.spec 
Log Message:
Rebuild for new db4


Index: log4cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4cxx/devel/log4cxx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- log4cxx.spec	25 Jul 2009 11:14:01 -0000	1.4
+++ log4cxx.spec	1 Dec 2009 13:27:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name: log4cxx
 Version: 0.10.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A port to C++ of the Log4j project
 
 Group: System Environment/Libraries
@@ -69,6 +69,9 @@ Header files and documentation you can u
 %doc html/
 
 %changelog
+* Tue Dec 01 2009 Caol?n McNamara <caolanm at redhat.com> - 0.10.0-9
+- Rebuild for new db4
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kdudka at fedoraproject.org  Tue Dec  1 13:29:27 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 13:29:27 +0000 (UTC)
Subject: rpms/curl/F-12 curl.spec,1.123,1.124
Message-ID: <20091201132928.010D711C00DE@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16567

Modified Files:
	curl.spec 
Log Message:
silence rpmlint


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- curl.spec	1 Dec 2009 12:26:51 -0000	1.123
+++ curl.spec	1 Dec 2009 13:29:27 -0000	1.124
@@ -145,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n libcurl -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGES README* COPYING
 %doc docs/BUGS docs/FAQ docs/FEATURES
 %doc docs/MANUAL docs/RESOURCES
@@ -154,10 +154,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/curl.1*
 
 %files -n libcurl
+%defattr(-,root,root,-)
 %{_libdir}/libcurl.so.*
 
 %files -n libcurl-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS
 %doc docs/CONTRIBUTE docs/libcurl/ABI
 %{_bindir}/curl-config*



From than at fedoraproject.org  Tue Dec  1 13:29:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:29:34 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-12 .cvsignore, 1.49,
	1.50 kdeaccessibility.spec, 1.95, 1.96 sources, 1.49, 1.50
Message-ID: <20091201132934.8630411C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeaccessibility/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15784

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-12/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	10 Nov 2009 14:06:21 -0000	1.49
+++ .cvsignore	1 Dec 2009 13:29:34 -0000	1.50
@@ -1 +1,2 @@
 kdeaccessibility-4.3.3.tar.bz2
+kdeaccessibility-4.3.4.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-12/kdeaccessibility.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kdeaccessibility.spec	11 Nov 2009 10:37:14 -0000	1.95
+++ kdeaccessibility.spec	1 Dec 2009 13:29:34 -0000	1.96
@@ -1,8 +1,8 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.3
-Release:        2%{?dist}
+Version:        4.3.4
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -143,6 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup, drop BR on flite-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	10 Nov 2009 14:06:21 -0000	1.49
+++ sources	1 Dec 2009 13:29:34 -0000	1.50
@@ -1 +1 @@
-401e733b42d34580b36a9ffe59e5aeba  kdeaccessibility-4.3.3.tar.bz2
+00adeff7e2441fdc7959644cefb07967  kdeaccessibility-4.3.4.tar.bz2



From kdudka at fedoraproject.org  Tue Dec  1 13:30:20 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 13:30:20 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.127,1.128
Message-ID: <20091201133020.415F311C0396@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	curl.spec 
Log Message:
silence rpmlint


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- curl.spec	1 Dec 2009 12:26:26 -0000	1.127
+++ curl.spec	1 Dec 2009 13:30:20 -0000	1.128
@@ -148,7 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n libcurl -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGES README* COPYING
 %doc docs/BUGS docs/FAQ docs/FEATURES
 %doc docs/MANUAL docs/RESOURCES
@@ -157,10 +157,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/curl.1*
 
 %files -n libcurl
+%defattr(-,root,root,-)
 %{_libdir}/libcurl.so.*
 
 %files -n libcurl-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS
 %doc docs/CONTRIBUTE docs/libcurl/ABI
 %{_bindir}/curl-config*



From than at fedoraproject.org  Tue Dec  1 13:30:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:30:24 +0000 (UTC)
Subject: File kdeadmin-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201133024.3102110F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeadmin:

718e117023e93862bed23182b7d1c5d6  kdeadmin-4.3.4.tar.bz2



From mauelsha at fedoraproject.org  Tue Dec  1 13:34:01 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Tue,  1 Dec 2009 13:34:01 +0000 (UTC)
Subject: rpms/dmraid/devel fix_sil_jbod.patch, NONE, 1.1 dmraid.spec, 1.112, 
	1.113
Message-ID: <20091201133401.8DE4C11C00DE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

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

Modified Files:
	dmraid.spec 
Added Files:
	fix_sil_jbod.patch 
Log Message:
bz542898: fix Silicon Image JBOD support

fix_sil_jbod.patch:
 sil.c |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE fix_sil_jbod.patch ---
diff --git a/lib/format/ataraid/sil.c.fix_sil_jbod b/lib/format/ataraid/sil.c
index 6089682..8c3df38 100644
--- a/lib/format/ataraid/sil.c.fix_sil_jbod
+++ b/lib/format/ataraid/sil.c
@@ -1,8 +1,8 @@
 /*
  * Silicon Image Medley ATARAID metadata format handler.
  *
- * Copyright (C) 2004,2005  Heinz Mauelshagen, Red Hat GmbH.
- *                          All rights reserved.
+ * Copyright (C) 2004,2005,2009  Heinz Mauelshagen, Red Hat GmbH.
+ *				 All rights reserved.
  *
  * See file LICENSE at the top of this source tree for license information.
  */
@@ -166,6 +166,16 @@ sil_valid(struct lib_context *lc, struct dev_info *di,
 	return 1;
 }
 
+/* Return number of array sectors. */
+static uint64_t
+array_size(struct raid_dev *rd)
+{
+	struct sil *sil = META(rd, sil);
+
+	return (((uint64_t) sil->array_sectors_high) << 32) +
+	       sil->array_sectors_low;
+}
+
 static void
 free_sils(struct sil **sils, unsigned int i)
 {
@@ -381,6 +391,10 @@ devices(struct raid_dev *rd, void *context)
 	struct sil *sil = META(rd, sil);
 
 	switch (sil->type) {
+	case SIL_T_JBOD:
+		ret = array_size(rd) < rd->sectors ?
+		      1 : sil->drives_per_striped_set;
+		break;
 	case SIL_T_RAID0:
 	case SIL_T_RAID10:
 		ret = sil->drives_per_striped_set;
@@ -519,12 +533,9 @@ stripes(struct sil *sil)
 static uint64_t
 sectors(struct raid_dev *rd)
 {
-	uint64_t array_sectors, ret = 0;
+	uint64_t array_sectors = array_size(rd), ret = 0;
 	struct sil *sil = META(rd, sil);
 
-	array_sectors = (((uint64_t) sil->array_sectors_high) << 32) +
-		sil->array_sectors_low;
-
 	switch (sil->type) {
 	case SIL_T_SPARE:
 		/* Cook them up... */


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- dmraid.spec	5 Nov 2009 11:43:14 -0000	1.112
+++ dmraid.spec	1 Dec 2009 13:34:01 -0000	1.113
@@ -27,6 +27,7 @@ Patch0: dmraid-1.0.0.rc16-test_devices.p
 Patch1: ddf1_lsi_persistent_name.patch
 Patch2: pdc_raid10_failure.patch
 Patch3: return_error_wo_disks.patch
+Patch4: fix_sil_jbod.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -70,6 +71,7 @@ Device failure reporting has to be activ
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %define _libdir /%{_lib}
@@ -141,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Fri Dec 1 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-7
+- bz542898: fix Silicon Image JBOD support
+
 * Fri Oct 16 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-6
 - Fix manual path in specfile
 



From than at fedoraproject.org  Tue Dec  1 13:39:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:39:03 +0000 (UTC)
Subject: rpms/kdeadmin/F-12 .cvsignore, 1.69, 1.70 kdeadmin.spec, 1.150,
	1.151 sources, 1.70, 1.71
Message-ID: <20091201133903.4D88811C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19560

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-12/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	10 Nov 2009 14:32:15 -0000	1.69
+++ .cvsignore	1 Dec 2009 13:39:03 -0000	1.70
@@ -1 +1,2 @@
 kdeadmin-4.3.3.tar.bz2
+kdeadmin-4.3.4.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-12/kdeadmin.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- kdeadmin.spec	10 Nov 2009 14:32:15 -0000	1.150
+++ kdeadmin.spec	1 Dec 2009 13:39:03 -0000	1.151
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora}
 %define system_config_printer_kde 1
 %define include_kpackage 1
@@ -7,7 +6,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -160,6 +159,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-12/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	10 Nov 2009 14:32:15 -0000	1.70
+++ sources	1 Dec 2009 13:39:03 -0000	1.71
@@ -1 +1 @@
-f83af0034fd1f040ec8eb8b3baa3301a  kdeadmin-4.3.3.tar.bz2
+718e117023e93862bed23182b7d1c5d6  kdeadmin-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 13:42:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:42:07 +0000 (UTC)
Subject: File kdeartwork-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201134207.EE28E10F867@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeartwork:

e3c5bb7fbc5b4fb8a5485d8e616f75f6  kdeartwork-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 13:46:11 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:46:11 +0000 (UTC)
Subject: rpms/kdeartwork/F-12 .cvsignore, 1.67, 1.68 kdeartwork.spec, 1.122, 
	1.123 sources, 1.68, 1.69
Message-ID: <20091201134611.8C1CA11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20872

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-12/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	10 Nov 2009 14:42:29 -0000	1.67
+++ .cvsignore	1 Dec 2009 13:46:11 -0000	1.68
@@ -1 +1,2 @@
 kdeartwork-4.3.3.tar.bz2
+kdeartwork-4.3.4.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-12/kdeartwork.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- kdeartwork.spec	13 Nov 2009 15:33:50 -0000	1.122
+++ kdeartwork.spec	1 Dec 2009 13:46:11 -0000	1.123
@@ -1,6 +1,6 @@
 Name:           kdeartwork
-Version:        4.3.3
-Release:        2%{?dist}
+Version:        4.3.4
+Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -214,6 +214,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup, fix conditional for RHEL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-12/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	10 Nov 2009 14:42:29 -0000	1.68
+++ sources	1 Dec 2009 13:46:11 -0000	1.69
@@ -1 +1 @@
-8f6c152530f272dd073753e1b7fc4259  kdeartwork-4.3.3.tar.bz2
+e3c5bb7fbc5b4fb8a5485d8e616f75f6  kdeartwork-4.3.4.tar.bz2



From pkgdb at fedoraproject.org  Tue Dec  1 13:46:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:46:30 +0000
Subject: [pkgdb] qt-creator had acl change status
Message-ID: <20091201134630.5615E10F867@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on qt-creator (Fedora devel) to Approved for arbiter

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:46:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:46:35 +0000
Subject: [pkgdb] qt-creator had acl change status
Message-ID: <20091201134635.E4A1F10F886@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on qt-creator (Fedora 11) to Approved for arbiter

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



From pkgdb at fedoraproject.org  Tue Dec  1 13:46:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 13:46:49 +0000
Subject: [pkgdb] qt-creator had acl change status
Message-ID: <20091201134649.30F7110F892@bastion2.fedora.phx.redhat.com>

itamarjp has set the commit acl on qt-creator (Fedora 12) to Approved for arbiter

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



From than at fedoraproject.org  Tue Dec  1 13:47:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:47:21 +0000 (UTC)
Subject: File kdebase-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201134721.C7AFD10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebase:

e71b470a1846ad29d45d03aae65518c1  kdebase-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 13:50:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:50:06 +0000 (UTC)
Subject: rpms/kdebase/F-12 .cvsignore, 1.95, 1.96 kdebase.spec, 1.402,
	1.403 sources, 1.117, 1.118
Message-ID: <20091201135006.9238211C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21733

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-12/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- .cvsignore	10 Nov 2009 14:55:23 -0000	1.95
+++ .cvsignore	1 Dec 2009 13:50:06 -0000	1.96
@@ -1 +1,2 @@
 kdebase-4.3.3.tar.bz2
+kdebase-4.3.4.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-12/kdebase.spec,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- kdebase.spec	11 Nov 2009 12:37:06 -0000	1.402
+++ kdebase.spec	1 Dec 2009 13:50:06 -0000	1.403
@@ -1,9 +1,8 @@
-
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Epoch: 6
-Version: 4.3.3
-Release: 3%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -237,6 +236,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Wed Nov 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-3
 - allow 'Open Folder in Tabs' in Konsole to support SSH bookmarks (kde#177637)
   (upstream patch backported from 4.4)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-12/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- sources	10 Nov 2009 14:55:23 -0000	1.117
+++ sources	1 Dec 2009 13:50:06 -0000	1.118
@@ -1 +1 @@
-8072ce9848af28c75c5af2d8c832f985  kdebase-4.3.3.tar.bz2
+e71b470a1846ad29d45d03aae65518c1  kdebase-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 13:53:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:53:34 +0000 (UTC)
Subject: File kdebase-runtime-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201135334.25CCE10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebase-runtime:

6f5beaaf4ff8f7441113d3236ab6316f  kdebase-runtime-4.3.4.tar.bz2



From kklic at fedoraproject.org  Tue Dec  1 13:53:34 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Tue,  1 Dec 2009 13:53:34 +0000 (UTC)
Subject: rpms/gzip/F-12 gzip-1.3.12-close-stdout.patch, NONE, 1.1 gzip.spec, 
	1.50, 1.51
Message-ID: <20091201135334.595E411C00DE@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/gzip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22589

Modified Files:
	gzip.spec 
Added Files:
	gzip-1.3.12-close-stdout.patch 
Log Message:
Fixed silent data loss due to unchecked close of stdout

gzip-1.3.12-close-stdout.patch:
 Makefile.in        |  506 ++-
 configure          | 6859 ++++++++++++++++++++++++++++++++++-------------------
 gzip.c             |    3 
 lib/Makefile.in    |  372 ++
 lib/close-stream.c |   76 
 lib/close-stream.h |    2 
 lib/closein.c      |  112 
 lib/closein.h      |   33 
 lib/closeout.c     |   86 
 lib/closeout.h     |   33 
 lib/fcntl_.h       |   13 
 lib/fflush.c       |  110 
 lib/fpending.c     |   30 
 lib/fpending.h     |   34 
 lib/fpurge.c       |  112 
 lib/fpurge.h       |   39 
 lib/freadahead.c   |   62 
 lib/freadahead.h   |   37 
 lib/freading.c     |   48 
 lib/freading.h     |   53 
 lib/fseeko.c       |  116 
 lib/ftello.c       |   55 
 lib/gnulib.mk      |  265 +-
 lib/lseek.c        |   62 
 lib/quotearg.c     |  697 +++++
 lib/quotearg.h     |  140 +
 lib/stdio_.h       |  353 ++
 lib/stdlib_.h      |   77 
 lib/sys_stat_.h    |  280 ++
 lib/time_.h        |  100 
 lib/unistd_.h      |   78 
 lib/wchar_.h       |   82 
 lib/wctype_.h      |  161 +
 m4/close-stream.m4 |   13 
 m4/closein.m4      |   13 
 m4/closeout.m4     |   13 
 m4/extensions.m4   |   54 
 m4/fcntl_h.m4      |    6 
 m4/fflush.m4       |   52 
 m4/fpending.m4     |   78 
 m4/fpurge.m4       |   12 
 m4/freading.m4     |   10 
 m4/fseeko.m4       |   30 
 m4/ftello.m4       |   30 
 m4/gnulib-comp.m4  |   66 
 m4/include_next.m4 |  107 
 m4/lseek.m4        |   50 
 m4/mbrtowc.m4      |   31 
 m4/mbstate_t.m4    |   30 
 m4/quotearg.m4     |   15 
 m4/stdio_h.m4      |   82 
 m4/stdlib_h.m4     |   24 
 m4/sys_stat_h.m4   |   26 
 m4/time_h.m4       |    6 
 m4/unistd_h.m4     |   13 
 m4/wchar.m4        |   54 
 m4/wctype.m4       |   44 
 m4/wint_t.m4       |   28 
 58 files changed, 9239 insertions(+), 2734 deletions(-)

--- NEW FILE gzip-1.3.12-close-stdout.patch ---
diff -up gzip-1.3.12/configure.close-stdout gzip-1.3.12/configure
--- gzip-1.3.12/configure.close-stdout	2007-04-13 23:39:49.000000000 +0200
+++ gzip-1.3.12/configure	2009-12-01 10:04:19.891388375 +0100
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for gzip 1.3.12.
+# Generated by GNU Autoconf 2.63 for gzip 1.3.12.
 #
 # Report bugs to <bug-gzip at gnu.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -65,8 +93,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -89,7 +115,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -102,17 +128,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -160,7 +179,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -242,7 +261,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -263,7 +282,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -343,10 +362,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -415,9 +434,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -453,7 +473,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -481,7 +501,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
[...17464 lines suppressed...]
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -692,6 +872,14 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -718,6 +906,10 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -729,9 +921,11 @@ distcheck: dist
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -753,13 +947,15 @@ distcheck: dist
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -806,6 +1002,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -828,6 +1025,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -836,20 +1035,29 @@ install-data-am: install-man
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS install-binSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man: install-man1
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am: installcheck-binPROGRAMS installcheck-binSCRIPTS
 
 maintainer-clean: maintainer-clean-recursive
@@ -876,22 +1084,23 @@ uninstall-am: uninstall-binPROGRAMS unin
 
 uninstall-man: uninstall-man1
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-exec-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
+	ctags-recursive install-am install-exec-am install-strip \
+	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am check-local clean \
 	clean-binPROGRAMS clean-generic ctags ctags-recursive dist \
-	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-	distcheck distclean distclean-compile distclean-generic \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am \
+	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-binSCRIPTS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installcheck-binPROGRAMS installcheck-binSCRIPTS installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
@@ -951,6 +1160,7 @@ install-exec-hook remove-installed-links
 	done
 
 uninstall-local: remove-installed-links
+
 # 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:


Index: gzip.spec
===================================================================
RCS file: /cvs/extras/rpms/gzip/F-12/gzip.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gzip.spec	9 Oct 2009 10:04:29 -0000	1.50
+++ gzip.spec	1 Dec 2009 13:53:34 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.3.12
-Release: 12%{?dist}
+Release: 13%{?dist}
 # info pages are under GFDL license
 License: GPLv2 and GFDL
 Group: Applications/File
@@ -17,6 +17,8 @@ Patch15: gzip-1.3.9-cve-2006-4337.patch
 Patch16: gzip-1.3.5-cve-2006-4337_len.patch
 Patch17: gzip-1.3.12-futimens.patch
 Patch18: gzip-1.3.12-zdiff.patch
+# Fixed in upstream 1.3.13
+Patch19: gzip-1.3.12-close-stdout.patch
 URL: http://www.gzip.org/
 Requires: /sbin/install-info
 Requires: mktemp less
@@ -43,6 +45,8 @@ very commonly used data compression prog
 %patch16 -p1 -b .4337l
 %patch17 -p1 -b .futimens
 %patch18 -p1 -b .ret
+%patch19 -p1 -b .close-stdout
+
 %build
 export DEFS="NO_ASM"
 export CPPFLAGS="-DHAVE_LSTAT"
@@ -93,6 +97,9 @@ fi
 %{_infodir}/gzip.info*
 
 %changelog
+* Mon Nov 30 2009 Karel Klic <kklic at redhat.com> - 1.3.12-13
+- Fixed silent data loss due to unchecked close of stdout (rhbz#514562)
+
 * Fri Oct  9 2009 Ivana Varekova <varekova at redhat.com> - 1.3.12-12
 - change the source tag
 



From ltinkl at fedoraproject.org  Tue Dec  1 13:55:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 13:55:14 +0000 (UTC)
Subject: File kdeartwork-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091201135514.1AC5710F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeartwork:

7b5c22f34a4c7c4f73e8fb7e35d2de4b  kdeartwork-4.3.80.tar.bz2



From than at fedoraproject.org  Tue Dec  1 13:55:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 13:55:13 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12 .cvsignore, 1.40,
	1.41 kdebase-runtime.spec, 1.153, 1.154 sources, 1.41, 1.42
Message-ID: <20091201135513.89F5D11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22868

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	10 Nov 2009 14:58:01 -0000	1.40
+++ .cvsignore	1 Dec 2009 13:55:13 -0000	1.41
@@ -1 +1,2 @@
 kdebase-runtime-4.3.3.tar.bz2
+kdebase-runtime-4.3.4.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- kdebase-runtime.spec	15 Nov 2009 00:46:33 -0000	1.153
+++ kdebase-runtime.spec	1 Dec 2009 13:55:13 -0000	1.154
@@ -4,8 +4,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.3
-Release:       5%{?dist}
+Version:       4.3.4
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -227,6 +227,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-5
 - disable manpath patch for now, does more harm than good (#532071)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-12/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	10 Nov 2009 14:58:01 -0000	1.41
+++ sources	1 Dec 2009 13:55:13 -0000	1.42
@@ -1 +1 @@
-88bf28d42d326c16abceaf3f1c6bffde  kdebase-runtime-4.3.3.tar.bz2
+6f5beaaf4ff8f7441113d3236ab6316f  kdebase-runtime-4.3.4.tar.bz2



From ltinkl at fedoraproject.org  Tue Dec  1 14:00:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 14:00:27 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore, 1.69, 1.70 kdeartwork.spec, 1.123,
	1.124 sources, 1.69, 1.70
Message-ID: <20091201140027.328CD11C0396@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
- KDE 4.4 beta1 (4.3.80)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	24 Nov 2009 18:27:18 -0000	1.69
+++ .cvsignore	1 Dec 2009 14:00:26 -0000	1.70
@@ -1 +1 @@
-kdeartwork-4.3.75svn1048496.tar.bz2
+kdeartwork-4.3.80.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- kdeartwork.spec	24 Nov 2009 18:27:19 -0000	1.123
+++ kdeartwork.spec	1 Dec 2009 14:00:26 -0000	1.124
@@ -1,8 +1,8 @@
-%define alphatag svn1048496
+#%define alphatag svn1048496
 
 Name:           kdeartwork
-Version:        4.3.75
-Release:        0.1.%{alphatag}%{?dist}
+Version:        4.3.80
+Release:        1.%{?alphatag}%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -216,6 +216,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	24 Nov 2009 18:27:19 -0000	1.69
+++ sources	1 Dec 2009 14:00:26 -0000	1.70
@@ -1 +1 @@
-c86f6704a22c7834e5756a4b1ac43dec  kdeartwork-4.3.75svn1048496.tar.bz2
+7b5c22f34a4c7c4f73e8fb7e35d2de4b  kdeartwork-4.3.80.tar.bz2



From than at fedoraproject.org  Tue Dec  1 14:02:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 14:02:31 +0000 (UTC)
Subject: File kdebase-workspace-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201140231.8663A10F867@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebase-workspace:

5ae53ccb3c7783d466b353bdf7a6e532  kdebase-workspace-4.3.4.tar.bz2



From ltinkl at fedoraproject.org  Tue Dec  1 14:03:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 14:03:55 +0000 (UTC)
Subject: File kdebase-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091201140355.7CE2410F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebase:

83af816034448c0b21667457efe1a455  kdebase-4.3.80.tar.bz2



From bkearney at fedoraproject.org  Tue Dec  1 14:10:06 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Tue,  1 Dec 2009 14:10:06 +0000 (UTC)
Subject: File libvirt-java-0.4.0.tar.gz uploaded to lookaside cache by
	bkearney
Message-ID: <20091201141006.AD1D310F867@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libvirt-java:

d285105168b720a75bd23efd2adfb799  libvirt-java-0.4.0.tar.gz



From bkearney at fedoraproject.org  Tue Dec  1 14:10:49 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Tue,  1 Dec 2009 14:10:49 +0000 (UTC)
Subject: rpms/libvirt-java/devel import.log, 1.3, 1.4 libvirt-java.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20091201141049.38F1411C0396@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/libvirt-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26832/devel

Modified Files:
	import.log libvirt-java.spec sources 
Log Message:
Modify the dependency on libvirt-client



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	24 Nov 2009 15:22:34 -0000	1.3
+++ import.log	1 Dec 2009 14:10:48 -0000	1.4
@@ -1,3 +1,4 @@
 libvirt-java-0_3_0-1_fc10:HEAD:libvirt-java-0.3.0-1.fc10.src.rpm:1248884790
 libvirt-java-0_3_1-1_fc11:HEAD:libvirt-java-0.3.1-1.fc11.src.rpm:1256846079
 libvirt-java-0_4_0-1_fc12:HEAD:libvirt-java-0.4.0-1.fc12.src.rpm:1259076139
+libvirt-java-0_4_0-2_fc12:HEAD:libvirt-java-0.4.0-2.fc12.src.rpm:1259676627


Index: libvirt-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/devel/libvirt-java.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libvirt-java.spec	24 Nov 2009 15:22:35 -0000	1.8
+++ libvirt-java.spec	1 Dec 2009 14:10:48 -0000	1.9
@@ -2,7 +2,7 @@ Summary:    Java bindings for the libvir
 Name:       libvirt-java
 Version:    0.4.0
 Prefix:     libvirt
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    LGPLv2+
 BuildArch:  noarch
 Group:      Development/Libraries
@@ -11,7 +11,7 @@ URL:        http://libvirt.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires:   jna
-Requires:   libvirt >= 0.7.0
+Requires:   libvirt-client >= 0.7.0
 Requires:   java >= 1:1.6.0
 Requires:   jpackage-utils
 BuildRequires:  ant
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Dec 1 2009 Bryan Kearney <bkearney at redhat.com> - 0.4.0-2
+- Modified the dependency to be libvirt-client instead of libvirt.
+
 * Tue Nov 24 2009 Bryan Kearney <bkearney at redhat.com> - 0.4.0-1
 - Added libvirt APIs up through 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Nov 2009 15:22:35 -0000	1.6
+++ sources	1 Dec 2009 14:10:48 -0000	1.7
@@ -1 +1 @@
-cbc2816199fcfab75b2e8c4ac41905c9  libvirt-java-0.4.0.tar.gz
+d285105168b720a75bd23efd2adfb799  libvirt-java-0.4.0.tar.gz



From varekova at fedoraproject.org  Tue Dec  1 14:11:05 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue,  1 Dec 2009 14:11:05 +0000 (UTC)
Subject: rpms/aspell/devel aspell.spec,1.50,1.51
Message-ID: <20091201141105.8C33711C00DE@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	aspell.spec 
Log Message:
- add --disable-rpath to configure part
  remove remanent obsolete tags
  fix license field



Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- aspell.spec	27 Nov 2009 11:03:34 -0000	1.50
+++ aspell.spec	1 Dec 2009 14:11:05 -0000	1.51
@@ -1,9 +1,11 @@
 Summary: Spell checker
 Name: aspell
 Version: 0.60.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 12
-License: LGPLv2 and MIT
+# LGPLv2+ .. aspell-0.60.6/misc/po-filter.c, ltmain.sh,
+# GPLv2+  .. aspell-0.60.6/misc/po-filter.c, aspell-0.60.6/ltmain.sh
+License: LGPLv2 and LGPLv2+ and GPLv2+ and MIT
 Group: Applications/Text
 URL: http://aspell.net/
 Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz
@@ -34,8 +36,6 @@ Requires: aspell = %{epoch}:%{version}-%
 Requires: pkgconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Provides: pspell-devel < 0.13
-Obsoletes: pspell-devel < 0.13
 
 %description	devel
 Aspell is a spelling checker. The aspell-devel package includes the
@@ -52,9 +52,10 @@ iconv -f windows-1252 -t utf-8 manual/as
 mv manual/aspell.info.aux manual/aspell.info
 
 %build
-%configure
+%configure --disable-rpath
 make %{?_smp_mflags}
 cp scripts/aspell-import examples/aspell-import
+chmod 644 examples/aspell-import
 cp manual/aspell-import.1 examples/aspell-import.1
 
 
@@ -106,7 +107,7 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO COPYING examples/aspell-import examples/aspell-import.1
 %dir %{_libdir}/aspell-0.60
 %{_bindir}/a*
@@ -117,7 +118,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/word-list-compress
 %{_libdir}/lib*.so.*
 %{_libdir}/aspell-0.60/*
-%{_datadir}/locale/*/LC_MESSAGES/aspell.mo
 %{_infodir}/aspell.*
 %{_mandir}/man1/aspell.1.*
 %{_mandir}/man1/run-with-aspell.1*
@@ -125,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/prezip-bin.1.*
 
 %files		devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{_includedir}/pspell
 %{_bindir}/pspell-config
 %{_includedir}/aspell.h
@@ -136,6 +136,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Tue Dec  1 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-9
+- add --disable-rpath to configure part
+  remove remanent obsolete tags
+  fix license field
+
 * Fri Nov 27 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-8
 - change summary name
   remove outdated Obsoletes, Conflicts and Provides flag



From jwrdegoede at fedoraproject.org  Tue Dec  1 14:11:26 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 14:11:26 +0000 (UTC)
Subject: rpms/hedgewars/devel hedgewars-0.9.0-debuginfo.patch, 1.4,
	1.5 hedgewars.spec, 1.24, 1.25
Message-ID: <20091201141126.39E1911C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	hedgewars-0.9.0-debuginfo.patch hedgewars.spec 
Log Message:
* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 0.9.12-2
- Use RPM_OPT_FLAGS when building c++ code and pass -g to fpc (#542000)


hedgewars-0.9.0-debuginfo.patch:
 hedgewars-src-0.9.12/hedgewars/CMakeLists.txt |    2 +-
 hedgewars-src-0.9.7/CMakeLists.txt            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: hedgewars-0.9.0-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars-0.9.0-debuginfo.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hedgewars-0.9.0-debuginfo.patch	4 Nov 2008 10:11:49 -0000	1.4
+++ hedgewars-0.9.0-debuginfo.patch	1 Dec 2009 14:11:25 -0000	1.5
@@ -10,3 +10,15 @@ diff -up hedgewars-src-0.9.7/CMakeLists.
  endif(WIN32 AND NOT UNIX)
  
  set(CPACK_SOURCE_IGNORE_FILES
+diff -up hedgewars-src-0.9.12/hedgewars/CMakeLists.txt~ hedgewars-src-0.9.12/hedgewars/CMakeLists.txt
+--- hedgewars-src-0.9.12/hedgewars/CMakeLists.txt~	2009-10-18 18:55:53.000000000 +0200
++++ hedgewars-src-0.9.12/hedgewars/CMakeLists.txt	2009-12-01 15:06:23.000000000 +0100
+@@ -96,7 +96,7 @@ endif (NOT pascal_compiler)
+ set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi" ${hwengine_project})
+ 
+ if(OPTIMIZATIONS)
+-	set(pascal_compiler_flags "-O2" "-Xs" "-Nu" ${pascal_compiler_flags})
++	set(pascal_compiler_flags "-g" "-O2" "-Xs" "-Nu" ${pascal_compiler_flags})
+ 	if(APPLE AND NOT universal_build)
+ 		set(pascal_compiler_flags "-fPIC" "-CfSSE2" ${pascal_compiler_flags})	#instruction set for ppc is 7400
+ 	endif()			


Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- hedgewars.spec	23 Nov 2009 22:45:16 -0000	1.24
+++ hedgewars.spec	1 Dec 2009 14:11:26 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -31,6 +31,7 @@ such as the "Rope" or "Parachute", to mo
 %prep
 %setup -q -n %{name}-src-%{version}
 %patch0 -p1
+sed -i "s/-w -O2 -fomit-frame-pointer/$RPM_OPT_FLAGS/" CMakeLists.txt
 
 
 %build
@@ -88,6 +89,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 0.9.12-2
+- Use RPM_OPT_FLAGS when building c++ code and pass -g to fpc (#542000)
+
 * Mon Nov 23 2009 Hans de Goede <hdegoede at redhat.com> 0.9.12-1
 - New upstream release 0.9.12
 - Remove included google-droid font, use the font from the



From mclasen at fedoraproject.org  Tue Dec  1 14:18:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 14:18:30 +0000 (UTC)
Subject: File gtk+-2.18.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091201141830.C722A10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gtk2:

311ec49d7cae0c0b431ab6235579f5a4  gtk+-2.18.4.tar.bz2



From bkearney at fedoraproject.org  Tue Dec  1 14:19:05 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Tue,  1 Dec 2009 14:19:05 +0000 (UTC)
Subject: rpms/libvirt-java/F-12 import.log, 1.2, 1.3 libvirt-java.spec, 1.7, 
	1.8 sources, 1.5, 1.6
Message-ID: <20091201141905.30EBE11C00DE@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/libvirt-java/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28562/F-12

Modified Files:
	import.log libvirt-java.spec sources 
Log Message:
Change the dependency to be libvirt-client



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Nov 2009 15:37:43 -0000	1.2
+++ import.log	1 Dec 2009 14:19:04 -0000	1.3
@@ -1,2 +1,3 @@
 libvirt-java-0_3_0-1_fc10:HEAD:libvirt-java-0.3.0-1.fc10.src.rpm:1248884790
 libvirt-java-0_4_0-1_fc12:F-12:libvirt-java-0.4.0-1.fc12.src.rpm:1259076897
+libvirt-java-0_4_0-2_fc12:F-12:libvirt-java-0.4.0-2.fc12.src.rpm:1259677128


Index: libvirt-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/F-12/libvirt-java.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libvirt-java.spec	24 Nov 2009 15:37:43 -0000	1.7
+++ libvirt-java.spec	1 Dec 2009 14:19:04 -0000	1.8
@@ -2,7 +2,7 @@ Summary:    Java bindings for the libvir
 Name:       libvirt-java
 Version:    0.4.0
 Prefix:     libvirt
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    LGPLv2+
 BuildArch:  noarch
 Group:      Development/Libraries
@@ -11,7 +11,7 @@ URL:        http://libvirt.org/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires:   jna
-Requires:   libvirt >= 0.7.0
+Requires:   libvirt-client >= 0.7.0
 Requires:   java >= 1:1.6.0
 Requires:   jpackage-utils
 BuildRequires:  ant
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Dec 1 2009 Bryan Kearney <bkearney at redhat.com> - 0.4.0-2
+- Modified the dependency to be libvirt-client instead of libvirt.
+
 * Tue Nov 24 2009 Bryan Kearney <bkearney at redhat.com> - 0.4.0-1
 - Added libvirt APIs up through 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Nov 2009 15:37:43 -0000	1.5
+++ sources	1 Dec 2009 14:19:04 -0000	1.6
@@ -1 +1 @@
-cbc2816199fcfab75b2e8c4ac41905c9  libvirt-java-0.4.0.tar.gz
+d285105168b720a75bd23efd2adfb799  libvirt-java-0.4.0.tar.gz



From varekova at fedoraproject.org  Tue Dec  1 14:19:38 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue,  1 Dec 2009 14:19:38 +0000 (UTC)
Subject: rpms/aspell/F-12 aspell.spec,1.50,1.51
Message-ID: <20091201141938.9208811C00DE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28775

Modified Files:
	aspell.spec 
Log Message:
- add --disable-rpath to configure part
  remove remanent obsolete tags
  fix license field



Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/F-12/aspell.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- aspell.spec	27 Nov 2009 11:25:47 -0000	1.50
+++ aspell.spec	1 Dec 2009 14:19:38 -0000	1.51
@@ -1,9 +1,11 @@
 Summary: Spell checker
 Name: aspell
 Version: 0.60.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 12
-License: LGPLv2 and MIT
+# LGPLv2+ .. aspell-0.60.6/misc/po-filter.c, ltmain.sh,
+# GPLv2+  .. aspell-0.60.6/misc/po-filter.c, aspell-0.60.6/ltmain.sh
+License: LGPLv2 and LGPLv2+ and GPLv2+ and MIT
 Group: Applications/Text
 URL: http://aspell.net/
 Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz
@@ -34,8 +36,6 @@ Requires: aspell = %{epoch}:%{version}-%
 Requires: pkgconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Provides: pspell-devel < 0.13
-Obsoletes: pspell-devel < 0.13
 
 %description	devel
 Aspell is a spelling checker. The aspell-devel package includes the
@@ -52,9 +52,10 @@ iconv -f windows-1252 -t utf-8 manual/as
 mv manual/aspell.info.aux manual/aspell.info
 
 %build
-%configure
+%configure --disable-rpath
 make %{?_smp_mflags}
 cp scripts/aspell-import examples/aspell-import
+chmod 644 examples/aspell-import
 cp manual/aspell-import.1 examples/aspell-import.1
 
 
@@ -106,7 +107,7 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README TODO COPYING examples/aspell-import examples/aspell-import.1
 %dir %{_libdir}/aspell-0.60
 %{_bindir}/a*
@@ -117,7 +118,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/word-list-compress
 %{_libdir}/lib*.so.*
 %{_libdir}/aspell-0.60/*
-%{_datadir}/locale/*/LC_MESSAGES/aspell.mo
 %{_infodir}/aspell.*
 %{_mandir}/man1/aspell.1.*
 %{_mandir}/man1/run-with-aspell.1*
@@ -125,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/prezip-bin.1.*
 
 %files		devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{_includedir}/pspell
 %{_bindir}/pspell-config
 %{_includedir}/aspell.h
@@ -136,6 +136,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Tue Dec  1 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-9
+- add --disable-rpath to configure part
+  remove remanent obsolete tags
+  fix license field
+
 * Fri Nov 27 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-8
 - change summary name
   remove outdated Obsoletes, Conflicts and Provides flag



From sdz at fedoraproject.org  Tue Dec  1 14:21:20 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:21:20 +0000 (UTC)
Subject: File sugar-toolkit-0.87.1.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091201142120.1E8F110F867@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-toolkit:

904b2c25bd052c4e02cc0d799b7dbf44  sugar-toolkit-0.87.1.tar.bz2



From sdz at fedoraproject.org  Tue Dec  1 14:22:33 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:22:33 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.41, 1.42 sources, 1.45,
	1.46 sugar-toolkit.spec, 1.59, 1.60
Message-ID: <20091201142233.AB87511C00DE@cvs1.fedora.phx.redhat.com>

Author: sdz

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

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	21 Oct 2009 15:06:34 -0000	1.41
+++ .cvsignore	1 Dec 2009 14:22:33 -0000	1.42
@@ -1 +1 @@
-sugar-toolkit-0.86.2.tar.bz2
+sugar-toolkit-0.87.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	21 Oct 2009 15:06:34 -0000	1.45
+++ sources	1 Dec 2009 14:22:33 -0000	1.46
@@ -1 +1 @@
-d6b5890cf7f4106423ba17917c69c816  sugar-toolkit-0.86.2.tar.bz2
+904b2c25bd052c4e02cc0d799b7dbf44  sugar-toolkit-0.87.1.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sugar-toolkit.spec	21 Oct 2009 15:06:34 -0000	1.59
+++ sugar-toolkit.spec	1 Dec 2009 14:22:33 -0000	1.60
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.86.2
+Version: 0.87.1
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
+- New upstream release
+
 * Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.2-1
 - Do not stop processing motion-notify-event #1507
 



From atkac at fedoraproject.org  Tue Dec  1 14:23:39 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  1 Dec 2009 14:23:39 +0000 (UTC)
Subject: File bind-9.7.0b3.tar.gz uploaded to lookaside cache by atkac
Message-ID: <20091201142339.0C7C910F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for bind:

9d375b157acf123a81f62bd9e4acb531  bind-9.7.0b3.tar.gz



From sdz at fedoraproject.org  Tue Dec  1 14:24:33 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:24:33 +0000 (UTC)
Subject: File sugar-base-0.87.1.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091201142433.B36E410F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-base:

57b1fab0ee6dbc78ce64ded9dfb03233  sugar-base-0.87.1.tar.bz2



From sdz at fedoraproject.org  Tue Dec  1 14:25:41 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:25:41 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 sugar-base.spec, 1.24, 1.25
Message-ID: <20091201142541.787DF11C00DE@cvs1.fedora.phx.redhat.com>

Author: sdz

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

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	25 Sep 2009 18:41:30 -0000	1.18
+++ .cvsignore	1 Dec 2009 14:25:41 -0000	1.19
@@ -1 +1 @@
-sugar-base-0.86.0.tar.bz2
+sugar-base-0.87.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	25 Sep 2009 18:41:31 -0000	1.18
+++ sources	1 Dec 2009 14:25:41 -0000	1.19
@@ -1 +1 @@
-320f418a4f38d4c15402ff80b7845ab1  sugar-base-0.86.0.tar.bz2
+57b1fab0ee6dbc78ce64ded9dfb03233  sugar-base-0.87.1.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sugar-base.spec	25 Sep 2009 18:41:31 -0000	1.24
+++ sugar-base.spec	1 Dec 2009 14:25:41 -0000	1.25
@@ -2,7 +2,7 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.86.0
+Version: 0.87.1
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
+- New upstream release
+
 * Fri Sep 25 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.86.0-1
 - New upstream release
 



From ltinkl at fedoraproject.org  Tue Dec  1 14:26:36 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 14:26:36 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore, 1.97, 1.98 kdebase.spec, 1.405,
	1.406 sources, 1.118, 1.119
Message-ID: <20091201142636.8034911C00DE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
- KDE 4.4 beta1 (4.3.80)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- .cvsignore	24 Nov 2009 16:25:03 -0000	1.97
+++ .cvsignore	1 Dec 2009 14:26:36 -0000	1.98
@@ -1 +1 @@
-kdebase-4.3.75svn1048496.tar.bz2
+kdebase-4.3.80.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- kdebase.spec	24 Nov 2009 23:36:20 -0000	1.405
+++ kdebase.spec	1 Dec 2009 14:26:36 -0000	1.406
@@ -1,17 +1,15 @@
-%define alphatag svn1048496
-
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Epoch: 6
-Version: 4.3.75
-Release: 0.2.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
@@ -230,6 +228,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.2.svn1048496
 - Fix webkitkde version requirement
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- sources	24 Nov 2009 16:25:03 -0000	1.118
+++ sources	1 Dec 2009 14:26:36 -0000	1.119
@@ -1 +1 @@
-e2d6388a484bb431d0753e1022e7d0bf  kdebase-4.3.75svn1048496.tar.bz2
+83af816034448c0b21667457efe1a455  kdebase-4.3.80.tar.bz2



From mclasen at fedoraproject.org  Tue Dec  1 14:27:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 14:27:13 +0000 (UTC)
Subject: rpms/gtk2/F-12 .cvsignore, 1.120, 1.121 fresh-tooltips.patch, 1.8, 
	1.9 gtk2.spec, 1.437, 1.438 sources, 1.129,
	1.130 0001-Make-level3-keys-work-again.patch, 1.1,
	NONE iconview-hang.patch, 1.1, NONE image-size-alloc.patch, 1.1,
	NONE symbolic-color-parsing.patch, 1.1,
	NONE toolbutton-assert.patch, 1.2, NONE
Message-ID: <20091201142713.9D2AC11C00DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30623

Modified Files:
	.cvsignore fresh-tooltips.patch gtk2.spec sources 
Removed Files:
	0001-Make-level3-keys-work-again.patch iconview-hang.patch 
	image-size-alloc.patch symbolic-color-parsing.patch 
	toolbutton-assert.patch 
Log Message:
2.18.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/.cvsignore,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- .cvsignore	17 Oct 2009 05:29:18 -0000	1.120
+++ .cvsignore	1 Dec 2009 14:27:13 -0000	1.121
@@ -1 +1 @@
-gtk+-2.18.3.tar.bz2
+gtk+-2.18.4.tar.bz2

fresh-tooltips.patch:
 gtktooltip.c |  264 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 gtkwidget.c  |    8 +
 2 files changed, 260 insertions(+), 12 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fresh-tooltips.patch	31 Oct 2009 19:06:13 -0000	1.8
+++ fresh-tooltips.patch	1 Dec 2009 14:27:13 -0000	1.9
@@ -1,6 +1,6 @@
-diff -up gtk+-2.18.3/gtk/gtktooltip.c.fresh-tooltips gtk+-2.18.3/gtk/gtktooltip.c
---- gtk+-2.18.3/gtk/gtktooltip.c.fresh-tooltips	2009-10-16 10:35:45.000000000 -0400
-+++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-31 14:53:37.120183113 -0400
+diff -up gtk+-2.19.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.19.1/gtk/gtktooltip.c
+--- gtk+-2.19.1/gtk/gtktooltip.c.fresh-tooltips	2009-11-26 23:54:55.000000000 -0500
++++ gtk+-2.19.1/gtk/gtktooltip.c	2009-11-30 20:06:37.539580221 -0500
 @@ -29,6 +29,10 @@
  #include "gtkhbox.h"
  #include "gtkalignment.h"
@@ -100,33 +100,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    tooltip->custom_widget = NULL;
  }
  
-@@ -318,9 +369,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
-  * Since: 2.14
-  */
- void
--gtk_tooltip_set_icon_from_icon_name(GtkTooltip  *tooltip,
--				    const gchar *icon_name,
--				    GtkIconSize  size)
-+gtk_tooltip_set_icon_from_icon_name (GtkTooltip  *tooltip,
-+				     const gchar *icon_name,
-+				     GtkIconSize  size)
- {
-   g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
- 
-@@ -471,27 +522,217 @@ static void
- gtk_tooltip_window_style_set (GtkTooltip *tooltip)
- {
-   gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
--			     tooltip->window->style->ythickness,
--			     tooltip->window->style->ythickness,
--			     tooltip->window->style->xthickness,
-+	                     tooltip->window->style->ythickness,
-+	                     tooltip->window->style->ythickness,
-+		             tooltip->window->style->xthickness,
- 			     tooltip->window->style->xthickness);
--
-+  gtk_box_set_spacing (GTK_BOX (tooltip->box),
-+                       tooltip->window->style->xthickness);
+@@ -508,19 +559,208 @@ gtk_tooltip_window_style_set (GtkTooltip
    gtk_widget_queue_draw (tooltip->window);
  }
  
@@ -259,7 +233,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +          wm = gdk_x11_screen_get_window_manager_name (screen);
 +          if (g_strcmp0 (wm, "Metacity") == 0)
 +            gtk_window_set_type_hint (GTK_WINDOW (tooltip->window),
-+			              GDK_WINDOW_TYPE_HINT_DND);
++                                     GDK_WINDOW_TYPE_HINT_DND);
 +        }
 +#endif
 +      return;
@@ -345,7 +319,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
    return FALSE;
  }
-@@ -631,7 +872,7 @@ find_widget_under_pointer (GdkWindow *wi
+@@ -660,7 +900,7 @@ find_widget_under_pointer (GdkWindow *wi
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
@@ -354,10 +328,10 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  	   *x, *y);
  #endif
  
-diff -up gtk+-2.18.3/gtk/gtkwidget.c.fresh-tooltips gtk+-2.18.3/gtk/gtkwidget.c
---- gtk+-2.18.3/gtk/gtkwidget.c.fresh-tooltips	2009-10-09 01:00:44.000000000 -0400
-+++ gtk+-2.18.3/gtk/gtkwidget.c	2009-10-31 14:27:50.333957199 -0400
-@@ -2386,6 +2386,14 @@ gtk_widget_class_init (GtkWidgetClass *k
+diff -up gtk+-2.19.1/gtk/gtkwidget.c.fresh-tooltips gtk+-2.19.1/gtk/gtkwidget.c
+--- gtk+-2.19.1/gtk/gtkwidget.c.fresh-tooltips	2009-11-27 20:59:42.000000000 -0500
++++ gtk+-2.19.1/gtk/gtkwidget.c	2009-11-30 20:00:23.425825787 -0500
+@@ -2557,6 +2557,14 @@ gtk_widget_class_init (GtkWidgetClass *k
                                                               P_("The length of vertical scroll arrows"),
                                                               1, G_MAXINT, 16,
                                                               GTK_PARAM_READABLE));


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -p -r1.437 -r1.438
--- gtk2.spec	25 Nov 2009 06:24:12 -0000	1.437
+++ gtk2.spec	1 Dec 2009 14:27:13 -0000	1.438
@@ -11,13 +11,13 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.18.3
+%define base_version 2.18.4
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 22%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -30,22 +30,12 @@ Patch0: gtk+-2.13.5-lib64.patch
 Patch1: system-python.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
 Patch2: icon-padding.patch
-# from upstream
-Patch3: image-size-alloc.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599617
 Patch4: fresh-tooltips.patch
 # from upstream
 Patch5: allow-set-hint.patch
-# from upstream
-Patch6: compose-sequences.patch
-# from upstream
-Patch7: symbolic-color-parsing.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599618
 Patch8: tooltip-positioning.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=581150
-Patch9: iconview-hang.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=599446
-Patch10: toolbutton-assert.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=529364
 Patch11: gtk2-remove-connecting-reason.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=592582
@@ -54,8 +44,6 @@ Patch13: gtk2-rotate-layout.patch
 Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=600992
 Patch15: filesystemref.patch
-# fixed upstream
-Patch16: 0001-Make-level3-keys-work-again.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -169,20 +157,14 @@ This package contains developer document
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .system-python
 %patch2 -p1 -b .icon-padding
-%patch3 -p1 -b .image-size-alloc
 %patch4 -p1 -b .fresh-tooltips
 %patch5 -p1 -b .allow-set-hint
-%patch6 -p1 -b .compose-sequences
-%patch7 -p1 -b .symbolic-color-parsing
 %patch8 -p1 -b .tooltip-positioning
-%patch9 -p1 -b .iconview-hang
-%patch10 -p1 -b .toolbutton-assert
 %patch11 -p1 -b .remove-connecting-reason
 %patch12 -p1 -b .preview
 %patch13 -p1 -b .rotate-layout
 %patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .filesystemref
-%patch16 -p1 -b .level3
 
 %build
 libtoolize --force --copy
@@ -420,6 +402,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-1
+- Update to 2.18.4
+
 * Wed Nov 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-22
 - Make level3 keys work again (#537567)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- sources	17 Oct 2009 05:29:18 -0000	1.129
+++ sources	1 Dec 2009 14:27:13 -0000	1.130
@@ -1 +1 @@
-369e173600efc272131b53b1902679e8  gtk+-2.18.3.tar.bz2
+311ec49d7cae0c0b431ab6235579f5a4  gtk+-2.18.4.tar.bz2


--- 0001-Make-level3-keys-work-again.patch DELETED ---


--- iconview-hang.patch DELETED ---


--- image-size-alloc.patch DELETED ---


--- symbolic-color-parsing.patch DELETED ---


--- toolbutton-assert.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Dec  1 14:27:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 14:27:26 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.124,1.125
Message-ID: <20091201142726.739E511C00DE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	kdeartwork.spec 
Log Message:
remove alpha tag



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- kdeartwork.spec	1 Dec 2009 14:00:26 -0000	1.124
+++ kdeartwork.spec	1 Dec 2009 14:27:26 -0000	1.125
@@ -1,14 +1,12 @@
-#%define alphatag svn1048496
-
 Name:           kdeartwork
 Version:        4.3.80
-Release:        1.%{?alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
 Group:          User Interface/Desktops
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:         kdeartwork-4.3.75-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From hadess at fedoraproject.org  Tue Dec  1 14:28:13 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:28:13 +0000 (UTC)
Subject: rpms/libfprint/F-12 libfprint-aes1610-driver.patch, 1.1,
	1.2 libfprint.spec, 1.27, 1.28
Message-ID: <20091201142813.12EE411C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libfprint/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30877

Modified Files:
	libfprint-aes1610-driver.patch libfprint.spec 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-14.pre2
- Update AES1610 patch (#499732)


libfprint-aes1610-driver.patch:
 configure.ac                |    2 
 libfprint/Makefile.am       |    6 
 libfprint/core.c            |    4 
 libfprint/drivers/aes1610.c | 1040 ++++++++++++++++++++++++++++++++++----------
 4 files changed, 815 insertions(+), 237 deletions(-)

Index: libfprint-aes1610-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/F-12/libfprint-aes1610-driver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libfprint-aes1610-driver.patch	30 Nov 2009 11:07:29 -0000	1.1
+++ libfprint-aes1610-driver.patch	1 Dec 2009 14:28:12 -0000	1.2
@@ -0,0 +1,1254 @@
+diff --git a/configure.ac b/configure.ac
+index 052ef0e..a892a96 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,7 +89,7 @@ AM_CONDITIONAL([ENABLE_UPEKSONLY], [test "$enable_upeksonly" != "no"])
+ AM_CONDITIONAL([ENABLE_VCOM5S], [test "$enable_vcom5s" != "no"])
+ AM_CONDITIONAL([ENABLE_URU4000], [test "$enable_uru4000" != "no"])
+ #AM_CONDITIONAL([ENABLE_FDU2000], [test "$enable_fdu2000" != "no"])
+-#AM_CONDITIONAL([ENABLE_AES1610], [test "$enable_aes1610" != "no"])
++AM_CONDITIONAL([ENABLE_AES1610], [test "$enable_aes1610" != "no"])
+ AM_CONDITIONAL([ENABLE_AES2501], [test "$enable_aes2501" != "no"])
+ AM_CONDITIONAL([ENABLE_AES4000], [test "$enable_aes4000" != "no"])
+ AM_CONDITIONAL([REQUIRE_AESLIB], [test "$require_aeslib" != "no"])
+diff --git a/libfprint/Makefile.am b/libfprint/Makefile.am
+index c79012b..8316796 100644
+--- a/libfprint/Makefile.am
++++ b/libfprint/Makefile.am
+@@ -100,9 +100,9 @@ endif
+ #DRIVER_SRC += $(FDU2000_SRC)
+ #endif
+ 
+-#if ENABLE_AES1610
+-#DRIVER_SRC += $(AES1610_SRC)
+-#endif
++if ENABLE_AES1610
++DRIVER_SRC += $(AES1610_SRC)
++endif
+ 
+ if ENABLE_AES2501
+ DRIVER_SRC += $(AES2501_SRC)
+diff --git a/libfprint/core.c b/libfprint/core.c
+index 37a4e03..724d5e5 100644
+--- a/libfprint/core.c
++++ b/libfprint/core.c
+@@ -361,11 +361,11 @@ static struct fp_img_driver * const img_drivers[] = {
+ #ifdef ENABLE_UPEKSONLY
+ 	&upeksonly_driver,
+ #endif
+-	/*
++	
+ #ifdef ENABLE_AES1610
+ 	&aes1610_driver,
+ #endif
+-#ifdef ENABLE_UPEKTC
++/*#ifdef ENABLE_UPEKTC
+ 	&upektc_driver,
+ #endif
+ #ifdef ENABLE_FDU2000
+diff --git a/libfprint/drivers/aes1610.c b/libfprint/drivers/aes1610.c
+index 318195f..8b81a80 100644
+--- a/libfprint/drivers/aes1610.c
++++ b/libfprint/drivers/aes1610.c
+@@ -1,11 +1,11 @@
+ /*
+  * AuthenTec AES1610 driver for libfprint
+- * Copyright (C) 2007 Anthony Bretaudeau <wxcover at users.sourceforge.net>
+- * Copyright (C) 2007 Daniel Drake <dsd at gentoo.org>
++ * Copyright (C) 2007-2008 Daniel Drake <dsd at gentoo.org>
+  * Copyright (C) 2007 Cyrille Bagard
+  * Copyright (C) 2007 Vasily Khoruzhick
++ * Copyright (C) 2009 Guido Grazioli <guido.grazioli at gmail.com>
+  *
+- * Based on code from http://home.gna.org/aes2501, relicensed with permission
++ * Based on code from libfprint aes2501 driver.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -32,15 +32,22 @@
+ #include <aeslib.h>
+ #include <fp_internal.h>
+ 
++static void start_capture(struct fp_img_dev *dev);
++static void complete_deactivation(struct fp_img_dev *dev);
++static int adjust_gain(unsigned char *buffer, int status);
++
++#define FIRST_AES1610_REG	0x1B
++#define LAST_AES1610_REG	0xFF
++
++#define GAIN_STATUS_FIRST 1
++#define GAIN_STATUS_NORMAL 2
++
+ /* FIXME these need checking */
+ #define EP_IN			(1 | LIBUSB_ENDPOINT_IN)
+ #define EP_OUT			(2 | LIBUSB_ENDPOINT_OUT)
+ 
+ #define BULK_TIMEOUT 4000
+ 
+-#define FIRST_AES1610_REG	0x1B
+-#define LAST_AES1610_REG	0xFF
+-
+ /*
+  * The AES1610 is an imaging device using a swipe-type sensor. It samples
+  * the finger at preprogrammed intervals, sending a 128x8 frame to the
+@@ -53,140 +60,212 @@
+  * images returned from this driver vary in height.
+  */
+ 
+-#define FRAME_WIDTH		128
++#define FRAME_WIDTH	128
+ #define FRAME_HEIGHT	8
+-#define FRAME_SIZE		(FRAME_WIDTH * FRAME_HEIGHT)
++#define FRAME_SIZE	(FRAME_WIDTH * FRAME_HEIGHT)
+ /* maximum number of frames to read during a scan */
+ /* FIXME reduce substantially */
+ #define MAX_FRAMES		350
+ 
+-static int read_data(struct fp_img_dev *dev, unsigned char *data, size_t len)
++/****** GENERAL FUNCTIONS ******/
++
++struct aes1610_dev {
++	uint8_t read_regs_retry_count;
++	GSList *strips;
++	size_t strips_len;
++	gboolean deactivating;
++	uint8_t blanks_count;
++};
++
++typedef void (*aes1610_read_regs_cb)(struct fp_img_dev *dev, int status,
++	unsigned char *regs, void *user_data);
++
++struct aes1610_read_regs {
++	struct fp_img_dev *dev;
++	aes1610_read_regs_cb callback;
++	struct aes_regwrite *regwrite;
++	void *user_data;
++};
++
++/* FIXME: what to do here? */
++static void stub_capture_stop_cb(struct fp_img_dev *dev, int result, void *user_data)
+ {
+-	int r;
+-	int transferred;
+-	struct libusb_bulk_transfer msg = {
+-		.endpoint = EP_IN,
+-		.data = data,
+-		.length = len,
+-	};
+-	fp_dbg("len=%zd", len);
+ 
+-	r = libusb_bulk_transfer(dev->udev, &msg, &transferred, BULK_TIMEOUT);
+-	if (r < 0) {
+-		fp_err("bulk read error %d", r);
+-		return r;
+-	} else if (transferred < len) {
+-		fp_err("unexpected short read %d/%zd", r, len);
+-		return -EIO;
+-	}
+-	return 0;
+ }
+ 
+-static const struct aes_regwrite init[] = {
+-	{ 0x82, 0x00 }
+-};
+ 
+-static const struct aes_regwrite stop_reader[] = {
+-	{ 0xFF, 0x00 }
+-};
++/* check that read succeeded but ignore all data */
++static void generic_ignore_data_cb(struct libusb_transfer *transfer)
++{
++	struct fpi_ssm *ssm = transfer->user_data;
+ 
+-static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
++	if (transfer->status != LIBUSB_TRANSFER_COMPLETED)
++		fpi_ssm_mark_aborted(ssm, -EIO);
++	else if (transfer->length != transfer->actual_length)
++		fpi_ssm_mark_aborted(ssm, -EPROTO);
++	else
++		fpi_ssm_next_state(ssm);
++
++	g_free(transfer->buffer);
++	libusb_free_transfer(transfer);
++}
++
++
++static void read_regs_data_cb(struct libusb_transfer *transfer)
+ {
++	struct aes1610_read_regs *rdata = transfer->user_data;
++	unsigned char *retdata = NULL;
+ 	int r;
+ 
+-	r = libusb_claim_interface(dev->udev, 0);
++	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
++		r = -EIO;
++	} else if (transfer->length != transfer->actual_length) {
++		r = -EPROTO;
++	} else {
++		r = 0;
++		retdata = transfer->buffer;
++	}
++
++	rdata->callback(rdata->dev, r, retdata, rdata->user_data);
++	g_free(rdata);
++	g_free(transfer->buffer);
++	libusb_free_transfer(transfer);
++}
++
++static void read_regs_rq_cb(struct fp_img_dev *dev, int result, void *user_data)
++{
++	struct aes1610_read_regs *rdata = user_data;
++	struct libusb_transfer *transfer;
++	unsigned char *data;
++	int r;
++
++	g_free(rdata->regwrite);
++	if (result != 0)
++		goto err;
++
++	transfer = libusb_alloc_transfer(0);
++	if (!transfer) {
++		result = -ENOMEM;
++		goto err;
++	}
++
++	data = g_malloc(126);
++	libusb_fill_bulk_transfer(transfer, dev->udev, EP_IN, data, 126,
++		read_regs_data_cb, rdata, BULK_TIMEOUT);
++
++	r = libusb_submit_transfer(transfer);
+ 	if (r < 0) {
+-		fp_err("could not claim interface 0");
+-		return r;
++		g_free(data);
++		libusb_free_transfer(transfer);
++		result = -EIO;
++		goto err;
+ 	}
+ 
+-	/* FIXME check endpoints */
++	return;
++err:
++	rdata->callback(dev, result, NULL, rdata->user_data);
++	g_free(rdata);
++}
+ 
+-	return aes_write_regv(dev, init, G_N_ELEMENTS(init));
++
++// XXX: this comes from aes2501 driver but it is unused here
++static void read_regs(struct fp_img_dev *dev, aes1610_read_regs_cb callback,
++	void *user_data)
++{
++	/* FIXME: regwrite is dynamic because of asynchronity. is this really
++	 * required? */
++	struct aes_regwrite *regwrite = g_malloc(sizeof(*regwrite));
++	struct aes1610_read_regs *rdata = g_malloc(sizeof(*rdata));
++
++	fp_dbg("");
++	//regwrite->reg = AES1610_REG_CTRL2;
++	//regwrite->value = AES1610_CTRL2_READ_REGS;
++	rdata->dev = dev;
++	rdata->callback = callback;
++	rdata->user_data = user_data;
++	rdata->regwrite = regwrite;
++
++	//aes_write_regv(dev, (const struct aes_regwrite *) regwrite, 1,
++	//	read_regs_rq_cb, rdata);
+ }
+ 
+-static int do_exit(struct fp_img_dev *dev)
++/* Read the value of a specific register from a register dump */
++static int regval_from_dump(unsigned char *data, uint8_t target)
+ {
+-	return aes_write_regv(dev, stop_reader, G_N_ELEMENTS(stop_reader));
++	if (*data != FIRST_AES1610_REG) {
++		fp_err("not a register dump");
++		return -EILSEQ;
++	}
++
++	if (!(FIRST_AES1610_REG <= target && target <= LAST_AES1610_REG)) {
++		fp_err("out of range");
++		return -EINVAL;
++	}
++
++	target -= FIRST_AES1610_REG;
++	target *= 2;
++	return data[target + 1];
+ }
+ 
+-static void dev_exit(struct fp_img_dev *dev)
++static void generic_write_regv_cb(struct fp_img_dev *dev, int result,
++	void *user_data)
+ {
+-	do_exit(dev);
+-	libusb_release_interface(dev->udev, 0);
++	struct fpi_ssm *ssm = user_data;
++	if (result == 0)
++		fpi_ssm_next_state(ssm);
++	else
++		fpi_ssm_mark_aborted(ssm, result);
+ }
+ 
+-static const struct aes_regwrite finger_det_reqs[] = {
+-	{ 0x80, 0x01 },
+-	{ 0x80, 0x12 }, 
+-	{ 0x85, 0x00 }, 
+-	{ 0x8A, 0x00 },
+-	{ 0x8B, 0x0E },
+-	{ 0x8C, 0x90 }, 
+-	{ 0x8D, 0x83 }, 
+-	{ 0x8E, 0x07 }, 
+-	{ 0x8F, 0x07 }, 
+-	{ 0x96, 0x00 },
+-	{ 0x97, 0x48 }, 
+-	{ 0xA1, 0x00 }, 
+-	{ 0xA2, 0x50 }, 
+-	{ 0xA6, 0xE4 }, 
+-	{ 0xAD, 0x08 },
+-	{ 0xAE, 0x5B }, 
+-	{ 0xAF, 0x54 }, 
+-	{ 0xB1, 0x28 }, 
+-	{ 0xB5, 0xAB }, 
+-	{ 0xB6, 0x0E },
+-	{ 0x1B, 0x2D }, 
+-	{ 0x81, 0x04 }
+-};
+ 
+-static const struct aes_regwrite finger_det_none[] = {
+-	{ 0x80, 0x01 },
+-	{ 0x82, 0x00 }, 
+-	{ 0x86, 0x00 }, 
+-	{ 0xB1, 0x28 }, 
+-	{ 0x1D, 0x00 }
+-};
+ 
+-static int detect_finger(struct fp_img_dev *dev)
++/* read the specified number of bytes from the IN endpoint but throw them
++ * away, then increment the SSM */
++static void generic_read_ignore_data(struct fpi_ssm *ssm, size_t bytes)
+ {
+-	unsigned char buffer[19];
++	struct libusb_transfer *transfer = libusb_alloc_transfer(0);
++	unsigned char *data;
+ 	int r;
+-	int i;
+-	int sum = 0;
+ 
+-	r = aes_write_regv(dev, finger_det_reqs, G_N_ELEMENTS(finger_det_reqs));
+-	if (r < 0)
+-		return r;
++	if (!transfer) {
++		fpi_ssm_mark_aborted(ssm, -ENOMEM);
++		return;
++	}
+ 
+-	r = read_data(dev, buffer, 19);
+-	if (r < 0)
+-		return r;
++	data = g_malloc(bytes);
++	libusb_fill_bulk_transfer(transfer, ssm->dev->udev, EP_IN, data, bytes,
++		generic_ignore_data_cb, ssm, BULK_TIMEOUT);
+ 
+-	for (i = 3; i < 17; i++)
+-		sum += (buffer[i] & 0xf) + (buffer[i] >> 4);
+-		
+-	/* We need to answer something if no finger has been detected */
+-	if (sum <= 20) {
+-		r = aes_write_regv(dev, finger_det_none, G_N_ELEMENTS(finger_det_none));
+-		if (r < 0)
+-			return r;
++	r = libusb_submit_transfer(transfer);
++	if (r < 0) {
++		g_free(data);
++		libusb_free_transfer(transfer);
++		fpi_ssm_mark_aborted(ssm, r);
+ 	}
+-	
+-	return sum > 20;
+ }
+ 
+-static int await_finger_on(struct fp_img_dev *dev)
++/****** IMAGE PROCESSING ******/
++
++static int sum_histogram_values(unsigned char *data, uint8_t threshold)
+ {
+-	int r;
+-	do {
+-		r = detect_finger(dev);
+-	} while (r == 0);
+-	return (r < 0) ? r : 0;
++	int r = 0;
++	int i;
++	uint16_t *histogram = (uint16_t *)(data + 1);
++
++	if (*data != 0xde)
++		return -EILSEQ;
++
++	if (threshold > 0x0f)
++		return -EINVAL;
++
++	/* FIXME endianness */
++	for (i = threshold; i < 16; i++)
++		r += histogram[i];
++
++	return r;
+ }
+ 
+-/* find overlapping parts of frames */
++/* find overlapping parts of  frames */
+ static unsigned int find_overlap(unsigned char *first_frame,
+ 	unsigned char *second_frame, unsigned int *min_error)
+ {
+@@ -199,11 +278,11 @@ static unsigned int find_overlap(unsigned char *first_frame,
+ 		unsigned int error = 0;
+ 		for (i = 0; i < FRAME_WIDTH * (FRAME_HEIGHT - dy); i++) {
+ 			/* Using ? operator to avoid abs function */
+-			error += first_frame[i] > second_frame[i] ? 
+-					(first_frame[i] - second_frame[i]) :
+-					(second_frame[i] - first_frame[i]); 
++			error += first_frame[i] > second_frame[i] ?
++				(first_frame[i] - second_frame[i]) :
++				(second_frame[i] - first_frame[i]);
+ 		}
+-		
++
+ 		/* Normalize error */
+ 		error *= 15;
+ 		error /= i;
+@@ -213,37 +292,39 @@ static unsigned int find_overlap(unsigned char *first_frame,
+ 		}
+ 		first_frame += FRAME_WIDTH;
+ 	}
+-	
+-	return not_overlapped_height; 
++
++	return not_overlapped_height;
+ }
+ 
+ /* assemble a series of frames into a single image */
+-static unsigned int assemble(unsigned char *input, unsigned char *output,
+-	int num_strips, gboolean reverse, unsigned int *errors_sum)
++static unsigned int assemble(struct aes1610_dev *aesdev, unsigned char *output,
++	gboolean reverse, unsigned int *errors_sum)
+ {
+ 	uint8_t *assembled = output;
+ 	int frame;
+ 	uint32_t image_height = FRAME_HEIGHT;
+ 	unsigned int min_error;
++	size_t num_strips = aesdev->strips_len;
++	GSList *list_entry = aesdev->strips;
+ 	*errors_sum = 0;
+ 
+ 	if (num_strips < 1)
+ 		return 0;
+-	
+-	/* Rotating given data by 90 degrees 
++
++	/* Rotating given data by 90 degrees
+ 	 * Taken from document describing aes1610 image format
+ 	 * TODO: move reversing detection here */
+-	
++
+ 	if (reverse)
+ 		output += (num_strips - 1) * FRAME_SIZE;
+ 	for (frame = 0; frame < num_strips; frame++) {
+-		aes_assemble_image(input, FRAME_WIDTH, FRAME_HEIGHT, output);
+-		input += FRAME_WIDTH * (FRAME_HEIGHT / 2);
++		aes_assemble_image(list_entry->data, FRAME_WIDTH, FRAME_HEIGHT, output);
+ 
+ 		if (reverse)
+-			output -= FRAME_SIZE;
++		    output -= FRAME_SIZE;
+ 		else
+-			output += FRAME_SIZE;
++		    output += FRAME_SIZE;
++		list_entry = g_slist_next(list_entry);
+ 	}
+ 
+ 	/* Detecting where frames overlaped */
+@@ -256,12 +337,183 @@ static unsigned int assemble(unsigned char *input, unsigned char *output,
+ 		*errors_sum += min_error;
+ 		image_height += not_overlapped;
+ 		assembled += FRAME_WIDTH * not_overlapped;
+-		memcpy(assembled, output, FRAME_SIZE); 
++		memcpy(assembled, output, FRAME_SIZE);
+ 	}
+ 	return image_height;
+ }
+ 
+-static const struct aes_regwrite capture_reqs[] = {
++static void assemble_and_submit_image(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	size_t final_size;
++	struct fp_img *img;
++	unsigned int errors_sum, r_errors_sum;
++
++	fp_dbg("");
++
++	BUG_ON(aesdev->strips_len == 0);
++
++	/* reverse list */
++	aesdev->strips = g_slist_reverse(aesdev->strips);
++
++	/* create buffer big enough for max image */
++	img = fpi_img_new(aesdev->strips_len * FRAME_SIZE);
++
++	img->flags = FP_IMG_COLORS_INVERTED;
++	img->height = assemble(aesdev, img->data, FALSE, &errors_sum);
++	img->height = assemble(aesdev, img->data, TRUE, &r_errors_sum);
++
++	if (r_errors_sum > errors_sum) {
++	    img->height = assemble(aesdev, img->data, FALSE, &errors_sum);
++		img->flags |= FP_IMG_V_FLIPPED | FP_IMG_H_FLIPPED;
++		fp_dbg("normal scan direction");
++	} else {
++		fp_dbg("reversed scan direction");
++	}
++
++	/* now that overlap has been removed, resize output image buffer */
++	final_size = img->height * FRAME_WIDTH;
++	img = fpi_img_resize(img, final_size);
++	/* FIXME: ugly workaround */
++	if (img->height < 12)
++		img->height = 12;
++	fpi_imgdev_image_captured(dev, img);
++
++	/* free strips and strip list */
++	g_slist_foreach(aesdev->strips, (GFunc) g_free, NULL);
++	g_slist_free(aesdev->strips);
++	aesdev->strips = NULL;
++	aesdev->strips_len = 0;
++	aesdev->blanks_count = 0;
++}
++
++
++/****** FINGER PRESENCE DETECTION ******/
++
++
++static const struct aes_regwrite finger_det_reqs[] = {
++	{ 0x80, 0x01 },
++	{ 0x80, 0x12 },
++	{ 0x85, 0x00 },
++	{ 0x8A, 0x00 },
++	{ 0x8B, 0x0E },
++	{ 0x8C, 0x90 },
++	{ 0x8D, 0x83 },
++	{ 0x8E, 0x07 },
++	{ 0x8F, 0x07 },
++	{ 0x96, 0x00 },
++	{ 0x97, 0x48 },
++	{ 0xA1, 0x00 },
++	{ 0xA2, 0x50 },
++	{ 0xA6, 0xE4 },
++	{ 0xAD, 0x08 },
++	{ 0xAE, 0x5B },
++	{ 0xAF, 0x54 },
++	{ 0xB1, 0x28 },
++	{ 0xB5, 0xAB },
++	{ 0xB6, 0x0E },
++	{ 0x1B, 0x2D },
++	{ 0x81, 0x04 }
++};
++
++static const struct aes_regwrite finger_det_none[] = {
++	{ 0x80, 0x01 },
++	{ 0x82, 0x00 },
++	{ 0x86, 0x00 },
++	{ 0xB1, 0x28 },
++	{ 0x1D, 0x00 }
++};
++
++
++static void start_finger_detection(struct fp_img_dev *dev);
++
++static void finger_det_data_cb(struct libusb_transfer *transfer)
++{
++	struct fp_img_dev *dev = transfer->user_data;
++	unsigned char *data = transfer->buffer;
++	int i;
++	int sum = 0;
++
++	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
++		fpi_imgdev_session_error(dev, -EIO);
++		goto out;
++	} else if (transfer->length != transfer->actual_length) {
++		fpi_imgdev_session_error(dev, -EPROTO);
++		goto out;
++	}
++
++	/* examine histogram to determine finger presence */
++	for (i = 3; i < 17; i++)
++		sum += (data[i] & 0xf) + (data[i] >> 4);
++	if (sum > 20) {
++		/* reset default gain */
++		adjust_gain(data,GAIN_STATUS_FIRST);
++		/* finger present, start capturing */
++		fpi_imgdev_report_finger_status(dev, TRUE);
++		start_capture(dev);
++	} else {
++		/* no finger, poll for a new histogram */
++		start_finger_detection(dev);
++	}
++
++out:
++	g_free(data);
++	libusb_free_transfer(transfer);
++}
++
++
++static void finger_det_none_cb(struct fp_img_dev *dev, int result, void *user_data)
++	fpi_imgdev_report_finger_status(dev, FALSE);
++	start_finger_detection(dev);
++}
++
++static void finger_det_reqs_cb(struct fp_img_dev *dev, int result, void *user_data)
++{
++	struct libusb_transfer *transfer;
++	unsigned char *data;
++	int r;
++
++	if (result) {
++		fpi_imgdev_session_error(dev, result);
++		return;
++	}
++
++	transfer = libusb_alloc_transfer(0);
++	if (!transfer) {
++		fpi_imgdev_session_error(dev, -ENOMEM);
++		return;
++	}
++
++	data = g_malloc(19);
++	libusb_fill_bulk_transfer(transfer, dev->udev, EP_IN, data, 19,
++		finger_det_data_cb, dev, BULK_TIMEOUT);
++
++	r = libusb_submit_transfer(transfer);
++	if (r < 0) {
++		g_free(data);
++		libusb_free_transfer(transfer);
++		fpi_imgdev_session_error(dev, r);
++	}
++
++}
++
++static void start_finger_detection(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	struct libusb_transfer *transfer;
++
++	if (aesdev->deactivating) {
++		complete_deactivation(dev);
++		return;
++	}
++
++	aes_write_regv(dev, finger_det_reqs, G_N_ELEMENTS(finger_det_reqs), finger_det_reqs_cb, NULL);
++
++}
++
++/****** CAPTURE ******/
++
++static struct aes_regwrite capture_reqs[] = {
+ 	{ 0x80, 0x01 },
+ 	{ 0x80, 0x12 },
+ 	{ 0x84, 0x01 },
+@@ -271,8 +523,8 @@ static const struct aes_regwrite capture_reqs[] = {
+ 	{ 0x8B, 0x0E },
+ 	{ 0x8C, 0x90 },
+ 	{ 0xBE, 0x23 },
+-	{ 0x29, 0x06 },
+-	{ 0x2A, 0x35 },
++	{ 0x29, 0x04 },
++	{ 0x2A, 0xFF },
+ 	{ 0x96, 0x00 },
+ 	{ 0x98, 0x03 },
+ 	{ 0x99, 0x00 },
+@@ -387,10 +639,10 @@ static const struct aes_regwrite capture_reqs[] = {
+ 	{ 0x81, 0x01 }
+ };
+ 
+-static const struct aes_regwrite strip_scan_reqs[] = {
++static struct aes_regwrite strip_scan_reqs[] = {
+ 	{ 0xBE, 0x23 },
+-	{ 0x29, 0x06 },
+-	{ 0x2A, 0x35 },
++	{ 0x29, 0x04 },
++	{ 0x2A, 0xFF },
+ 	{ 0xBD, 0x4F },
+ 	{ 0xFF, 0x00 }
+ };
+@@ -399,130 +651,456 @@ static const struct aes_regwrite capture_stop[] = {
+ 	{ 0x81,0x00 }
+ };
+ 
+-static int capture(struct fp_img_dev *dev, gboolean unconditional,
+-	struct fp_img **ret)
++/*
++ * The different possible values for 0xBE register */
++static unsigned char list_BE_values[10] = {
++	0x23, 0x43, 0x63, 0x64, 0x65, 0x67, 0x6A, 0x6B
++};
++
++/*
++ * The different possible values for 0xBD register */
++static unsigned char list_BD_values[10] = {
++	0x48, 0x4B, 0x4F, 0x52, 0x57, 0x59, 0x5B
++};
++
++/*
++ * Adjust the gain according to the histogram data
++ * 0xbd, 0xbe, 0x29 and 0x2A registers are affected
++ * Returns 0 if no problem occured
++ * TODO: This is a basic support for gain. It needs testing/tweaking.  */
++static int adjust_gain(unsigned char *buffer, int status)
+ {
+-	int r;
+-	struct fp_img *img;
+-	unsigned int nstrips;
+-	unsigned int errors_sum, r_errors_sum;
+-	unsigned char *cooked;
+-	unsigned char *imgptr;
+-	unsigned char buf[665];
+-	int final_size;
+-	int sum;
+-	unsigned int count_blank = 0;
+-	int i;
++	// The position in the array of possible values for 0xBE and 0xBD registers
++	static int pos_list_BE = 0;
++	static int pos_list_BD = 0;
+ 
+-	/* FIXME can do better here in terms of buffer management? */
+-	fp_dbg("");
++	// This is the first adjustement (we begin acquisition)
++	// We adjust strip_scan_reqs for future strips and capture_reqs that is sent just after this step
++	if (status == GAIN_STATUS_FIRST) {
++		if (buffer[1] > 0x78) { // maximum gain needed
++			strip_scan_reqs[0].value = 0x6B;
++			strip_scan_reqs[1].value = 0x06;
++			strip_scan_reqs[2].value = 0x35;
++			strip_scan_reqs[3].value = 0x5B;
++		}
++		else if (buffer[1] > 0x55) {
++			strip_scan_reqs[0].value = 0x63;
++			strip_scan_reqs[1].value = 0x15;
++			strip_scan_reqs[2].value = 0x35;
++			strip_scan_reqs[3].value = 0x4F;
++		}
++		else if (buffer[1] > 0x40 || buffer[16] > 0x19) {
++			strip_scan_reqs[0].value = 0x43;
++			strip_scan_reqs[1].value = 0x13;
++			strip_scan_reqs[2].value = 0x35;
++			strip_scan_reqs[3].value = 0x4B;
++		}
++		else { // minimum gain needed
++			strip_scan_reqs[0].value = 0x23;
++			strip_scan_reqs[1].value = 0x07;
++			strip_scan_reqs[2].value = 0x35;
++			strip_scan_reqs[3].value = 0x48;
++		}
+ 
+-	r = aes_write_regv(dev, capture_reqs, G_N_ELEMENTS(capture_reqs));
+-	if (r < 0)
+-		return r;
+-  
+-	/* FIXME: use histogram data above for gain calibration (0x8e xx) */
++		// Now copy this values in capture_reqs
++		capture_reqs[8].value = strip_scan_reqs[0].value;
++		capture_reqs[9].value = strip_scan_reqs[1].value;
++		capture_reqs[10].value = strip_scan_reqs[2].value;
++		capture_reqs[21].value = strip_scan_reqs[3].value;
+ 
+-	img = fpi_img_new((3 * MAX_FRAMES * FRAME_SIZE) / 2);
+-	imgptr = img->data;
+-	cooked = imgptr + (MAX_FRAMES * FRAME_SIZE) / 2;
++		fp_dbg("first gain: %x %x %x %x %x %x %x %x", strip_scan_reqs[0].reg, strip_scan_reqs[0].value, strip_scan_reqs[1].reg, strip_scan_reqs[1].value, strip_scan_reqs[2].reg, strip_scan_reqs[2].value, strip_scan_reqs[3].reg, strip_scan_reqs[3].value);
++	}
+ 
+-	r = read_data(dev, buf, 665);
+-	if (r < 0)
+-		goto err;
+-	memcpy(imgptr, buf + 1, 128*4);
+-	imgptr += 128*4;
++	// Every 2/3 strips
++	// We try to soften big changes of the gain (at least for 0xBE and 0xBD
++	// FIXME: This softenning will need testing and tweaking too
++	else if (status == GAIN_STATUS_NORMAL) {
++		if (buffer[514] > 0x78) { // maximum gain needed
++			if (pos_list_BE < 7)
++				pos_list_BE++;
+ 
+-	r = read_data(dev, buf, 665);
+-	if (r < 0)
+-		goto err;
+-	memcpy(imgptr, buf + 1, 128*4);
+-	imgptr += 128*4;
+-
+-	/* we start at 2 because we captured 2 frames above. the above captures
+-	 * should possibly be moved into the loop below, or discarded altogether */
+-	for (nstrips = 2; nstrips < MAX_FRAMES - 2; nstrips++) {
+-		r = aes_write_regv(dev, strip_scan_reqs, G_N_ELEMENTS(strip_scan_reqs));
+-		if (r < 0)
+-			goto err;
+-		r = read_data(dev, buf, 665);
+-		if (r < 0)
+-			goto err;
+-		memcpy(imgptr, buf + 1, 128*4);
+-		imgptr += 128*4;
+-
+-		r = read_data(dev, buf, 665);
+-		if (r < 0)
+-			goto err;
+-		memcpy(imgptr, buf + 1, 128*4);
+-		imgptr += 128*4;
+-
+-		sum = 0;
+-		for (i = 515; i != 530; i++)
+-		{
+-			/* histogram[i] = number of pixels of value i
+-			   Only the pixel values from 10 to 15 are used to detect finger. */
+-			sum += buf[i];
++			if (pos_list_BD < 6)
++				pos_list_BD++;
++
++			strip_scan_reqs[1].value = 0x04;
++			strip_scan_reqs[2].value = 0x35;
++		}
++		else if (buffer[514] > 0x55) {
++			if (pos_list_BE < 2)
++				pos_list_BE++;
++			else if (pos_list_BE > 2)
++				pos_list_BE--;
++
++			if (pos_list_BD < 2)
++				pos_list_BD++;
++			else if (pos_list_BD > 2)
++				pos_list_BD--;
++
++			strip_scan_reqs[1].value = 0x15;
++			strip_scan_reqs[2].value = 0x35;
+ 		}
+-		if (sum < 0) {
+-			r = sum;
+-			goto err;
++		else if (buffer[514] > 0x40 || buffer[529] > 0x19) {
++			if (pos_list_BE < 1)
++				pos_list_BE++;
++			else if (pos_list_BE > 1)
++				pos_list_BE--;
++
++			if (pos_list_BD < 1)
++				pos_list_BD++;
++			else if (pos_list_BD > 1)
++				pos_list_BD--;
++
++			strip_scan_reqs[1].value = 0x13;
++			strip_scan_reqs[2].value = 0x35;
+ 		}
+-		fp_dbg("sum=%d", sum);
+-		if (sum == 0)
+-			count_blank++;
++		else { // minimum gain needed
++			if (pos_list_BE > 0)
++				pos_list_BE--;
++
++			if (pos_list_BD > 0)
++				pos_list_BD--;
++
++			strip_scan_reqs[1].value = 0x07;
++			strip_scan_reqs[2].value = 0x35;
++		}
++
++		strip_scan_reqs[0].value = list_BE_values[pos_list_BE];
++		strip_scan_reqs[3].value = list_BD_values[pos_list_BD];
++
++		fp_dbg("gain: %x %x %x %x %x %x %x %x", strip_scan_reqs[0].reg, strip_scan_reqs[0].value, strip_scan_reqs[1].reg, strip_scan_reqs[1].value, strip_scan_reqs[2].reg, strip_scan_reqs[2].value, strip_scan_reqs[3].reg, strip_scan_reqs[3].value);
++	}
++	// Unknown status
++	else {
++		fp_err("Unexpected gain status.");
++		return 1;
++	}
++
++	return 0;
++}
++
++/*
++ * Restore the default gain values */
++static void restore_gain()
++{
++	strip_scan_reqs[0].value = list_BE_values[0];
++	strip_scan_reqs[1].value = 0x04;
++	strip_scan_reqs[2].value = 0xFF;
++	strip_scan_reqs[3].value = list_BD_values[0];
++
++	capture_reqs[8].value = list_BE_values[0];
++	capture_reqs[9].value = 0x04;
++	capture_reqs[10].value = 0xFF;
++	capture_reqs[21].value = list_BD_values[0];
++}
++
++
++/* capture SM movement:
++ * request and read strip,
++ * jump back to request UNLESS theres no finger, in which case exit SM,
++ * report lack of finger presence, and move to finger detection */
++
++enum capture_states {
++	CAPTURE_WRITE_REQS,
++	CAPTURE_READ_DATA,
++	CAPTURE_REQUEST_STRIP,
++	CAPTURE_READ_STRIP,
++	CAPTURE_NUM_STATES,
++};
++
++static void capture_read_strip_cb(struct libusb_transfer *transfer)
++{
++	unsigned char *stripdata;
++	struct fpi_ssm *ssm = transfer->user_data;
++	struct fp_img_dev *dev = ssm->priv;
++	struct aes1610_dev *aesdev = dev->priv;
++	unsigned char *data = transfer->buffer;
++	int sum, i;
++	int threshold;
++
++	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
++		fpi_ssm_mark_aborted(ssm, -EIO);
++		goto out;
++	} else if (transfer->length != transfer->actual_length) {
++		fpi_ssm_mark_aborted(ssm, -EPROTO);
++		goto out;
++	}
++
++	/* FIXME: would preallocating strip buffers be a decent optimization? */
++	//stripdata = g_malloc(128 * 4);
++	//memcpy(stripdata, data + 1, 128 * 4);
++	//aesdev->strips = g_slist_prepend(aesdev->strips, stripdata);
++	//aesdev->strips_len++;
++
++	/*threshold = regval_from_dump(data + 1 + 128*8 + 1 + 16*2 + 1 + 8,
++		0x97);
++	if (threshold < 0) {
++		fpi_ssm_mark_aborted(ssm, threshold);
++		goto out;
++	}*/
++
++	sum = 0;
++	for (i = 516; i < 530; i++)
++	{
++		/* histogram[i] = number of pixels of value i
++		   Only the pixel values from 10 to 15 are used to detect finger. */
++		sum += data[i];
++	}
++
++	if (sum > 0) {
++	        /* FIXME: would preallocating strip buffers be a decent optimization? */
++	        stripdata = g_malloc(128 * 4);
++	        memcpy(stripdata, data + 1, 128 * 4);
++	        aesdev->strips = g_slist_prepend(aesdev->strips, stripdata);
++	        aesdev->strips_len++;
++		aesdev->blanks_count = 0;
++	}
++
++	if (sum < 0) {
++		fpi_ssm_mark_aborted(ssm, sum);
++		goto out;
++	}
++	fp_dbg("sum=%d", sum);
++
++	/* FIXME: 0 might be too low as a threshold */
++	/* FIXME: sometimes we get 0 in the middle of a scan, should we wait for
++	 * a few consecutive zeroes? */
++
++	/* If sum is 0 for a reasonable # of frames, finger has been removed */
++	if (sum == 0) {
++		aesdev->blanks_count++;
++		fp_dbg("got blank frame");
++	}
++
++	/* use histogram data above for gain calibration (0xbd, 0xbe, 0x29 and 0x2A ) */
++	adjust_gain(data, GAIN_STATUS_NORMAL);
++
++	/* stop capturing if MAX_FRAMES is reached */
++	if (aesdev->blanks_count > 10 || g_slist_length(aesdev->strips) >= MAX_FRAMES) {
++		fp_dbg("sending stop capture.... blanks=%d  frames=%d", aesdev->blanks_count, g_slist_length(aesdev->strips));
++		/* send stop capture bits */
++		aes_write_regv(dev, capture_stop, G_N_ELEMENTS(capture_stop), stub_capture_stop_cb, NULL);
++		/* assemble image and submit it to library */
++		assemble_and_submit_image(dev);
++		fpi_imgdev_report_finger_status(dev, FALSE);
++		/* marking machine complete will re-trigger finger detection loop */
++		fpi_ssm_mark_completed(ssm);
++		/* Acquisition finished: restore default gain values */
++		restore_gain();
++	} else {
++		/* obtain next strip */
++		fpi_ssm_jump_to_state(ssm, CAPTURE_REQUEST_STRIP);
++	}
++
++out:
++	g_free(data);
++	libusb_free_transfer(transfer);
++}
++
++static void capture_run_state(struct fpi_ssm *ssm)
++{
++	struct fp_img_dev *dev = ssm->priv;
++	struct aes1610_dev *aesdev = dev->priv;
++	int r;
++
++	switch (ssm->cur_state) {
++	case CAPTURE_WRITE_REQS:
++		fp_dbg("write reqs");
++		aes_write_regv(dev, capture_reqs, G_N_ELEMENTS(capture_reqs),
++			generic_write_regv_cb, ssm);
++		break;
++	case CAPTURE_READ_DATA:
++		fp_dbg("read data");
++		generic_read_ignore_data(ssm, 665);
++		break;
++	case CAPTURE_REQUEST_STRIP:
++		fp_dbg("request strip");
++		if (aesdev->deactivating)
++			fpi_ssm_mark_completed(ssm);
+ 		else
+-			count_blank = 0;
+-			
+-		/* if we got 50 blank frames, assume scan has ended. */
+-		if (count_blank >= 50)
++			aes_write_regv(dev, strip_scan_reqs, G_N_ELEMENTS(strip_scan_reqs),
++				generic_write_regv_cb, ssm);
++		break;
++	case CAPTURE_READ_STRIP: ;
++		struct libusb_transfer *transfer = libusb_alloc_transfer(0);
++		unsigned char *data;
++
++		if (!transfer) {
++			fpi_ssm_mark_aborted(ssm, -ENOMEM);
+ 			break;
++		}
++
++		data = g_malloc(665);
++		libusb_fill_bulk_transfer(transfer, dev->udev, EP_IN, data, 665,
++			capture_read_strip_cb, ssm, BULK_TIMEOUT);
++
++		r = libusb_submit_transfer(transfer);
++		if (r < 0) {
++			g_free(data);
++			libusb_free_transfer(transfer);
++			fpi_ssm_mark_aborted(ssm, r);
++		}
++		break;
++	};
++}
++
++static void capture_sm_complete(struct fpi_ssm *ssm)
++{
++	struct fp_img_dev *dev = ssm->priv;
++	struct aes1610_dev *aesdev = dev->priv;
++
++	fp_dbg("");
++	if (aesdev->deactivating)
++		complete_deactivation(dev);
++	else if (ssm->error)
++		fpi_imgdev_session_error(dev, ssm->error);
++	else
++		start_finger_detection(dev);
++	fpi_ssm_free(ssm);
++}
++
++static void start_capture(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	struct fpi_ssm *ssm;
++
++	if (aesdev->deactivating) {
++		complete_deactivation(dev);
++		return;
+ 	}
+-	
+-	r = aes_write_regv(dev, capture_stop, G_N_ELEMENTS(capture_stop));
+-	if (r < 0)
+-		goto err;
+-	r = read_data(dev, buf, 665);
+-	if (r < 0)
+-		goto err;
+-	memcpy(imgptr, buf + 1, 128*4);
+-	imgptr += 128*4;
+-	nstrips++;
+ 
+-	r = read_data(dev, buf, 665);
+-	if (r < 0)
+-		goto err;
+-	memcpy(imgptr, buf + 1, 128*4);
+-	imgptr += 128*4;
+-	nstrips++;
+-	
+-	if (nstrips == MAX_FRAMES)
+-		fp_warn("swiping finger too slow?");
++	ssm = fpi_ssm_new(dev->dev, capture_run_state, CAPTURE_NUM_STATES);
++	fp_dbg("");
++	ssm->priv = dev;
++	fpi_ssm_start(ssm, capture_sm_complete);
++}
+ 
+-	img->flags = FP_IMG_COLORS_INVERTED;
+-	img->height = assemble(img->data, cooked, nstrips, FALSE, &errors_sum);
+-	img->height = assemble(img->data, cooked, nstrips, TRUE, &r_errors_sum);
+-	
+-	if (r_errors_sum > errors_sum) {
+-		img->height = assemble(img->data, cooked, nstrips, FALSE, &errors_sum);
+-		img->flags |= FP_IMG_V_FLIPPED | FP_IMG_H_FLIPPED;
+-		fp_dbg("normal scan direction");
++/****** INITIALIZATION/DEINITIALIZATION ******/
++
++static const struct aes_regwrite init[] = {
++	{ 0x82, 0x00 }
++};
++
++static const struct aes_regwrite stop_reader[] = {
++	{ 0xFF, 0x00 }
++};
++
++
++enum activate_states {
++	WRITE_INIT,
++//	READ_DATA,
++//	READ_REGS,
++	ACTIVATE_NUM_STATES,
++};
++
++/* this come from aes2501 and is unused here
++void activate_read_regs_cb(struct fp_img_dev *dev, int status,
++	unsigned char *regs, void *user_data)
++{
++	struct fpi_ssm *ssm = user_data;
++	struct aes1610_dev *aesdev = dev->priv;
++
++	if (status != 0) {
++		fpi_ssm_mark_aborted(ssm, status);
+ 	} else {
+-		fp_dbg("reversed scan direction");
++		fpi_ssm_next_state(ssm);
+ 	}
++}
++*/
+ 
+-	final_size = img->height * FRAME_WIDTH;
+-	memcpy(img->data, cooked, final_size);
+-	img = fpi_img_resize(img, final_size);
+-	*ret = img;
++static void activate_run_state(struct fpi_ssm *ssm)
++{
++	struct fp_img_dev *dev = ssm->priv;
++
++	/* activation on aes1610 seems much more straightforward compared to aes2501 */
++	/* verify theres anything missing here */
++	switch (ssm->cur_state) {
++	case WRITE_INIT:
++		fp_dbg("write init");
++		aes_write_regv(dev, init, G_N_ELEMENTS(init), generic_write_regv_cb, ssm);
++		break;
++/*	case READ_DATA:
++		fp_dbg("read data");
++		generic_read_ignore_data(ssm, 20);
++		break;
++	case READ_REGS:
++		fp_dbg("read regs");
++		read_regs(dev, activate_read_regs_cb, ssm);
++		break;*/
++	}
++}
++
++/* jump to finger detection */
++static void activate_sm_complete(struct fpi_ssm *ssm)
++{
++	struct fp_img_dev *dev = ssm->priv;
++	fp_dbg("status %d", ssm->error);
++	fpi_imgdev_activate_complete(dev, ssm->error);
++
++	if (!ssm->error)
++		start_finger_detection(dev);
++	fpi_ssm_free(ssm);
++}
++
++static int dev_activate(struct fp_img_dev *dev, enum fp_imgdev_state state)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	struct fpi_ssm *ssm = fpi_ssm_new(dev->dev, activate_run_state,
++		ACTIVATE_NUM_STATES);
++	ssm->priv = dev;
++	aesdev->read_regs_retry_count = 0;
++	fpi_ssm_start(ssm, activate_sm_complete);
+ 	return 0;
+-err:
+-	fp_img_free(img);
+-	return r;
++}
++
++static void dev_deactivate(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	/* FIXME: audit cancellation points, probably need more, specifically
++	 * in error handling paths? */
++	aesdev->deactivating = TRUE;
++}
++
++static void complete_deactivation(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	fp_dbg("");
++
++	/* FIXME: if we're in the middle of a scan, we should cancel the scan.
++	 * maybe we can do this with a master reset, unconditionally? */
++
++	aesdev->deactivating = FALSE;
++	g_slist_free(aesdev->strips);
++	aesdev->strips = NULL;
++	aesdev->strips_len = 0;
++	aesdev->blanks_count = 0;
++	fpi_imgdev_deactivate_complete(dev);
++}
++
++static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
++{
++	/* FIXME check endpoints */
++	int r;
++
++	r = libusb_claim_interface(dev->udev, 0);
++	if (r < 0) {
++		fp_err("could not claim interface 0");
++		return r;
++	}
++
++	dev->priv = g_malloc0(sizeof(struct aes1610_dev));
++	fpi_imgdev_open_complete(dev, 0);
++	return 0;
++}
++
++static void dev_deinit(struct fp_img_dev *dev)
++{
++	g_free(dev->priv);
++	libusb_release_interface(dev->udev, 0);
++	fpi_imgdev_close_complete(dev);
+ }
+ 
+ static const struct usb_id id_table[] = {
+-	{ .vendor = 0x08ff, .product = 0x1600 },
++	{ .vendor = 0x08ff, .product = 0x1600 }, /* AES1600 */
+ 	{ 0, 0, 0, },
+ };
+ 
+@@ -544,9 +1122,9 @@ struct fp_img_driver aes1610_driver = {
+ 	 * area) */
+ 	.bz3_threshold = 10,
+ 
+-	.init = dev_init,
+-	.exit = dev_exit,
+-	.await_finger_on = await_finger_on,
+-	.capture = capture,
++	.open = dev_init,
++	.close = dev_deinit,
++	.activate = dev_activate,
++	.deactivate = dev_deactivate,
+ };
+ 


Index: libfprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/F-12/libfprint.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libfprint.spec	30 Nov 2009 11:07:29 -0000	1.27
+++ libfprint.spec	1 Dec 2009 14:28:12 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.1.0
-Release:        13.pre2%{?dist}
+Release:        14.pre2%{?dist}
 Summary:        Tool kit for fingerprint scanner
 
 Group:          System Environment/Libraries
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-14.pre2
+- Update AES1610 patch (#499732)
+
 * Mon Nov 30 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-13.pre2
 - Add aes1610 driver (#499732)
 



From sdz at fedoraproject.org  Tue Dec  1 14:28:46 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:28:46 +0000 (UTC)
Subject: File hulahop-0.7.1.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091201142846.A9C8910F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hulahop:

e616e18c86dc3286a00550fa09e687eb  hulahop-0.7.1.tar.bz2



From arbiter at fedoraproject.org  Tue Dec  1 14:29:39 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 14:29:39 +0000 (UTC)
Subject: File qt-creator-1.3.0-src.tar.gz uploaded to lookaside cache by
	arbiter
Message-ID: <20091201142939.5897610F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qt-creator:

52abe3574b58db23dd875f64b125b841  qt-creator-1.3.0-src.tar.gz



From atkac at fedoraproject.org  Tue Dec  1 14:29:42 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  1 Dec 2009 14:29:42 +0000 (UTC)
Subject: rpms/bind/devel .cvsignore, 1.59, 1.60 bind.spec, 1.332,
	1.333 sources, 1.68, 1.69
Message-ID: <20091201142942.CA79E11C00DE@cvs1.fedora.phx.redhat.com>

Author: atkac

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

Modified Files:
	.cvsignore bind.spec sources 
Log Message:
- update to 9.7.0b3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	6 Nov 2009 11:46:06 -0000	1.59
+++ .cvsignore	1 Dec 2009 14:29:42 -0000	1.60
@@ -1,2 +1,2 @@
 config-4.tar.bz2
-bind-9.7.0b2.tar.gz
+bind-9.7.0b3.tar.gz


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -p -r1.332 -r1.333
--- bind.spec	26 Nov 2009 09:26:43 -0000	1.332
+++ bind.spec	1 Dec 2009 14:29:42 -0000	1.333
@@ -5,7 +5,7 @@
 #%define PATCHVER P1
 #%define PREVER rc1
 #%define VERSION %{version}-%{PATCHVER}
-%define PREVER b2
+%define PREVER b3
 %define VERSION %{version}%{PREVER}
 
 %{?!SDB:       %define SDB       1}
@@ -21,7 +21,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.8.%{PREVER}%{?dist}
+Release:  0.9.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -624,6 +624,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Dec 01 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.9.b3
+- update to 9.7.0b3
+
 * Thu Nov 26 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.8.b2
 - install isc/namespace.h header
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	6 Nov 2009 11:46:06 -0000	1.68
+++ sources	1 Dec 2009 14:29:42 -0000	1.69
@@ -1,2 +1,2 @@
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
-986eea7e3f31c2b822425c1efbc9bd60  bind-9.7.0b2.tar.gz
+9d375b157acf123a81f62bd9e4acb531  bind-9.7.0b3.tar.gz



From arbiter at fedoraproject.org  Tue Dec  1 14:29:58 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 14:29:58 +0000 (UTC)
Subject: rpms/qt-creator/devel .cvsignore, 1.9, 1.10 qt-creator.spec, 1.14, 
	1.15 sources, 1.9, 1.10
Message-ID: <20091201142958.EE2B411C00DE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	.cvsignore qt-creator.spec sources 
Log Message:
* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.0-1
- 1.3.0 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 Nov 2009 01:59:10 -0000	1.9
+++ .cvsignore	1 Dec 2009 14:29:58 -0000	1.10
@@ -1 +1 @@
-qt-creator-qt-creator-1.3.0.tar.gz
+qt-creator-1.3.0-src.tar.gz


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- qt-creator.spec	22 Nov 2009 19:26:54 -0000	1.14
+++ qt-creator.spec	1 Dec 2009 14:29:58 -0000	1.15
@@ -1,14 +1,12 @@
 Name:           qt-creator
 Version:        1.3.0
-Release:        0.4.rc%{?dist}
+Release:        1%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
 License:        LGPLv2 with exceptions
 URL:            http://www.qtsoftware.com/developer/qt-creator
-#Source0:        http://download.qtsoftware.com/qtcreator/%name-%version-src.tar.gz
-#source0 from http://qt.gitorious.org/qt-creator/qt-creator/archive-tarball/1.3.0
-Source0:        qt-creator-qt-creator-1.3.0.tar.gz
+Source0:        http://download.qtsoftware.com/qtcreator/%name-%version-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:       qtcreator.desktop
@@ -95,6 +93,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/doc/qtcreator/qtcreator.qch
 
 %changelog
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.0-1
+- 1.3.0 final
+
 * Sun Nov 22 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.0-0.4.rc
 - include demos/examples.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	18 Nov 2009 01:59:10 -0000	1.9
+++ sources	1 Dec 2009 14:29:58 -0000	1.10
@@ -1 +1 @@
-68497c4dc327df0eadefab2ce7bd5683  qt-creator-qt-creator-1.3.0.tar.gz
+52abe3574b58db23dd875f64b125b841  qt-creator-1.3.0-src.tar.gz



From mclasen at fedoraproject.org  Tue Dec  1 14:30:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 14:30:13 +0000 (UTC)
Subject: rpms/gtk2/F-12 gtk2.spec,1.438,1.439
Message-ID: <20091201143013.A010711C0396@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31468

Modified Files:
	gtk2.spec 
Log Message:
Add news link



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -p -r1.438 -r1.439
--- gtk2.spec	1 Dec 2009 14:27:13 -0000	1.438
+++ gtk2.spec	1 Dec 2009 14:30:13 -0000	1.439
@@ -404,6 +404,7 @@ fi
 %changelog
 * Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-1
 - Update to 2.18.4
+- See http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.4.news
 
 * Wed Nov 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-22
 - Make level3 keys work again (#537567)



From ltinkl at fedoraproject.org  Tue Dec  1 14:30:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 14:30:26 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.96,1.97
Message-ID: <20091201143026.E84D711C0396@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	kdeaccessibility.spec 
Log Message:
remove alpha tag



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kdeaccessibility.spec	1 Dec 2009 13:13:05 -0000	1.96
+++ kdeaccessibility.spec	1 Dec 2009 14:30:26 -0000	1.97
@@ -1,15 +1,13 @@
-#%define alphatag svn1048496
-
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.3.80
-Release:        1.%{?alphatag}%{?dist}
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://accessibility.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeaccessibility-%{version}%{?alphatag}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeaccessibility-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel



From sdz at fedoraproject.org  Tue Dec  1 14:30:57 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:30:57 +0000 (UTC)
Subject: rpms/hulahop/devel .cvsignore, 1.7, 1.8 hulahop.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <20091201143057.92F9A11C00DE@cvs1.fedora.phx.redhat.com>

Author: sdz

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

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Sep 2009 18:11:03 -0000	1.7
+++ .cvsignore	1 Dec 2009 14:30:57 -0000	1.8
@@ -1 +1 @@
-hulahop-0.6.0.tar.bz2
+hulahop-0.7.1.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/hulahop.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- hulahop.spec	29 Nov 2009 22:32:32 -0000	1.19
+++ hulahop.spec	1 Dec 2009 14:30:57 -0000	1.20
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: hulahop
-Version: 0.6.0
-Release: 3%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.7.1-1
+- New upstream release
+
 * Sun Nov 29 2009 Bernie Innocenti <bernie at codewiz.org> - 0.6.0-3
 - Rebuild against latest xulrunner
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Sep 2009 18:11:04 -0000	1.9
+++ sources	1 Dec 2009 14:30:57 -0000	1.10
@@ -1 +1 @@
-72104085814008bbe914a248594f0b49  hulahop-0.6.0.tar.bz2
+e616e18c86dc3286a00550fa09e687eb  hulahop-0.7.1.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:33:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:33:12 +0000 (UTC)
Subject: File brasero-2.29.3.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201143312.E0B3B10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for brasero:

e8ee3842e598aca54ed74b7bb78aba8f  brasero-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:33:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:33:28 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.30, 1.31 brasero.spec, 1.66,
	1.67 sources, 1.31, 1.32
Message-ID: <20091201143328.5700811C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	7 Oct 2009 08:34:12 -0000	1.30
+++ .cvsignore	1 Dec 2009 14:33:27 -0000	1.31
@@ -1 +1 @@
-brasero-2.28.1.tar.bz2
+brasero-2.29.3.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- brasero.spec	12 Nov 2009 17:57:51 -0000	1.66
+++ brasero.spec	1 Dec 2009 14:33:28 -0000	1.67
@@ -1,6 +1,6 @@
 Name:      brasero
-Version:   2.28.2
-Release:   3%{?dist}
+Version:   2.29.3
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -210,6 +210,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-3
 - Obsolete nautilus-cd-burner-devel and -libs as well
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	12 Nov 2009 17:57:51 -0000	1.31
+++ sources	1 Dec 2009 14:33:28 -0000	1.32
@@ -1 +1 @@
-7a6ab4befeadbc2ad21bd1195a840097  brasero-2.28.2.tar.bz2
+e8ee3842e598aca54ed74b7bb78aba8f  brasero-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:33:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:33:43 +0000 (UTC)
Subject: rpms/libfprint/devel libfprint-aes1610-driver.patch,1.1,1.2
Message-ID: <20091201143343.47C8E11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	libfprint-aes1610-driver.patch 
Log Message:
* Mon Nov 30 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-13.pre2
- Add aes1610 driver (#499732)


libfprint-aes1610-driver.patch:
 configure.ac                |    2 
 libfprint/Makefile.am       |    6 
 libfprint/core.c            |    4 
 libfprint/drivers/aes1610.c | 1040 ++++++++++++++++++++++++++++++++++----------
 4 files changed, 815 insertions(+), 237 deletions(-)

Index: libfprint-aes1610-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/devel/libfprint-aes1610-driver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libfprint-aes1610-driver.patch	30 Nov 2009 10:59:07 -0000	1.1
+++ libfprint-aes1610-driver.patch	1 Dec 2009 14:33:43 -0000	1.2
@@ -0,0 +1,1254 @@
+diff --git a/configure.ac b/configure.ac
+index 052ef0e..a892a96 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,7 +89,7 @@ AM_CONDITIONAL([ENABLE_UPEKSONLY], [test "$enable_upeksonly" != "no"])
+ AM_CONDITIONAL([ENABLE_VCOM5S], [test "$enable_vcom5s" != "no"])
+ AM_CONDITIONAL([ENABLE_URU4000], [test "$enable_uru4000" != "no"])
+ #AM_CONDITIONAL([ENABLE_FDU2000], [test "$enable_fdu2000" != "no"])
+-#AM_CONDITIONAL([ENABLE_AES1610], [test "$enable_aes1610" != "no"])
++AM_CONDITIONAL([ENABLE_AES1610], [test "$enable_aes1610" != "no"])
+ AM_CONDITIONAL([ENABLE_AES2501], [test "$enable_aes2501" != "no"])
+ AM_CONDITIONAL([ENABLE_AES4000], [test "$enable_aes4000" != "no"])
+ AM_CONDITIONAL([REQUIRE_AESLIB], [test "$require_aeslib" != "no"])
+diff --git a/libfprint/Makefile.am b/libfprint/Makefile.am
+index c79012b..8316796 100644
+--- a/libfprint/Makefile.am
++++ b/libfprint/Makefile.am
+@@ -100,9 +100,9 @@ endif
+ #DRIVER_SRC += $(FDU2000_SRC)
+ #endif
+ 
+-#if ENABLE_AES1610
+-#DRIVER_SRC += $(AES1610_SRC)
+-#endif
++if ENABLE_AES1610
++DRIVER_SRC += $(AES1610_SRC)
++endif
+ 
+ if ENABLE_AES2501
+ DRIVER_SRC += $(AES2501_SRC)
+diff --git a/libfprint/core.c b/libfprint/core.c
+index 37a4e03..724d5e5 100644
+--- a/libfprint/core.c
++++ b/libfprint/core.c
+@@ -361,11 +361,11 @@ static struct fp_img_driver * const img_drivers[] = {
+ #ifdef ENABLE_UPEKSONLY
+ 	&upeksonly_driver,
+ #endif
+-	/*
++	
+ #ifdef ENABLE_AES1610
+ 	&aes1610_driver,
+ #endif
+-#ifdef ENABLE_UPEKTC
++/*#ifdef ENABLE_UPEKTC
+ 	&upektc_driver,
+ #endif
+ #ifdef ENABLE_FDU2000
+diff --git a/libfprint/drivers/aes1610.c b/libfprint/drivers/aes1610.c
+index 318195f..8b81a80 100644
+--- a/libfprint/drivers/aes1610.c
++++ b/libfprint/drivers/aes1610.c
+@@ -1,11 +1,11 @@
+ /*
+  * AuthenTec AES1610 driver for libfprint
+- * Copyright (C) 2007 Anthony Bretaudeau <wxcover at users.sourceforge.net>
+- * Copyright (C) 2007 Daniel Drake <dsd at gentoo.org>
++ * Copyright (C) 2007-2008 Daniel Drake <dsd at gentoo.org>
+  * Copyright (C) 2007 Cyrille Bagard
+  * Copyright (C) 2007 Vasily Khoruzhick
++ * Copyright (C) 2009 Guido Grazioli <guido.grazioli at gmail.com>
+  *
+- * Based on code from http://home.gna.org/aes2501, relicensed with permission
++ * Based on code from libfprint aes2501 driver.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -32,15 +32,22 @@
+ #include <aeslib.h>
+ #include <fp_internal.h>
+ 
++static void start_capture(struct fp_img_dev *dev);
++static void complete_deactivation(struct fp_img_dev *dev);
++static int adjust_gain(unsigned char *buffer, int status);
++
++#define FIRST_AES1610_REG	0x1B
++#define LAST_AES1610_REG	0xFF
++
++#define GAIN_STATUS_FIRST 1
++#define GAIN_STATUS_NORMAL 2
++
+ /* FIXME these need checking */
+ #define EP_IN			(1 | LIBUSB_ENDPOINT_IN)
+ #define EP_OUT			(2 | LIBUSB_ENDPOINT_OUT)
+ 
+ #define BULK_TIMEOUT 4000
+ 
+-#define FIRST_AES1610_REG	0x1B
+-#define LAST_AES1610_REG	0xFF
+-
+ /*
+  * The AES1610 is an imaging device using a swipe-type sensor. It samples
+  * the finger at preprogrammed intervals, sending a 128x8 frame to the
+@@ -53,140 +60,212 @@
+  * images returned from this driver vary in height.
+  */
+ 
+-#define FRAME_WIDTH		128
++#define FRAME_WIDTH	128
+ #define FRAME_HEIGHT	8
+-#define FRAME_SIZE		(FRAME_WIDTH * FRAME_HEIGHT)
++#define FRAME_SIZE	(FRAME_WIDTH * FRAME_HEIGHT)
+ /* maximum number of frames to read during a scan */
+ /* FIXME reduce substantially */
+ #define MAX_FRAMES		350
+ 
+-static int read_data(struct fp_img_dev *dev, unsigned char *data, size_t len)
++/****** GENERAL FUNCTIONS ******/
++
++struct aes1610_dev {
++	uint8_t read_regs_retry_count;
++	GSList *strips;
++	size_t strips_len;
++	gboolean deactivating;
++	uint8_t blanks_count;
++};
++
++typedef void (*aes1610_read_regs_cb)(struct fp_img_dev *dev, int status,
++	unsigned char *regs, void *user_data);
++
++struct aes1610_read_regs {
++	struct fp_img_dev *dev;
++	aes1610_read_regs_cb callback;
++	struct aes_regwrite *regwrite;
++	void *user_data;
++};
++
++/* FIXME: what to do here? */
++static void stub_capture_stop_cb(struct fp_img_dev *dev, int result, void *user_data)
+ {
+-	int r;
+-	int transferred;
+-	struct libusb_bulk_transfer msg = {
+-		.endpoint = EP_IN,
+-		.data = data,
+-		.length = len,
+-	};
+-	fp_dbg("len=%zd", len);
+ 
+-	r = libusb_bulk_transfer(dev->udev, &msg, &transferred, BULK_TIMEOUT);
+-	if (r < 0) {
+-		fp_err("bulk read error %d", r);
+-		return r;
+-	} else if (transferred < len) {
+-		fp_err("unexpected short read %d/%zd", r, len);
+-		return -EIO;
+-	}
+-	return 0;
+ }
+ 
+-static const struct aes_regwrite init[] = {
+-	{ 0x82, 0x00 }
+-};
+ 
+-static const struct aes_regwrite stop_reader[] = {
+-	{ 0xFF, 0x00 }
+-};
++/* check that read succeeded but ignore all data */
++static void generic_ignore_data_cb(struct libusb_transfer *transfer)
++{
++	struct fpi_ssm *ssm = transfer->user_data;
+ 
+-static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
++	if (transfer->status != LIBUSB_TRANSFER_COMPLETED)
++		fpi_ssm_mark_aborted(ssm, -EIO);
++	else if (transfer->length != transfer->actual_length)
++		fpi_ssm_mark_aborted(ssm, -EPROTO);
++	else
++		fpi_ssm_next_state(ssm);
++
++	g_free(transfer->buffer);
++	libusb_free_transfer(transfer);
++}
++
++
++static void read_regs_data_cb(struct libusb_transfer *transfer)
+ {
++	struct aes1610_read_regs *rdata = transfer->user_data;
++	unsigned char *retdata = NULL;
+ 	int r;
+ 
+-	r = libusb_claim_interface(dev->udev, 0);
++	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
++		r = -EIO;
++	} else if (transfer->length != transfer->actual_length) {
++		r = -EPROTO;
++	} else {
++		r = 0;
++		retdata = transfer->buffer;
++	}
++
++	rdata->callback(rdata->dev, r, retdata, rdata->user_data);
++	g_free(rdata);
++	g_free(transfer->buffer);
++	libusb_free_transfer(transfer);
++}
++
++static void read_regs_rq_cb(struct fp_img_dev *dev, int result, void *user_data)
++{
++	struct aes1610_read_regs *rdata = user_data;
++	struct libusb_transfer *transfer;
++	unsigned char *data;
++	int r;
++
++	g_free(rdata->regwrite);
++	if (result != 0)
++		goto err;
++
++	transfer = libusb_alloc_transfer(0);
++	if (!transfer) {
++		result = -ENOMEM;
++		goto err;
++	}
++
++	data = g_malloc(126);
++	libusb_fill_bulk_transfer(transfer, dev->udev, EP_IN, data, 126,
++		read_regs_data_cb, rdata, BULK_TIMEOUT);
++
++	r = libusb_submit_transfer(transfer);
+ 	if (r < 0) {
+-		fp_err("could not claim interface 0");
+-		return r;
++		g_free(data);
++		libusb_free_transfer(transfer);
++		result = -EIO;
++		goto err;
+ 	}
+ 
+-	/* FIXME check endpoints */
++	return;
++err:
++	rdata->callback(dev, result, NULL, rdata->user_data);
++	g_free(rdata);
++}
+ 
+-	return aes_write_regv(dev, init, G_N_ELEMENTS(init));
++
++// XXX: this comes from aes2501 driver but it is unused here
++static void read_regs(struct fp_img_dev *dev, aes1610_read_regs_cb callback,
++	void *user_data)
++{
++	/* FIXME: regwrite is dynamic because of asynchronity. is this really
++	 * required? */
++	struct aes_regwrite *regwrite = g_malloc(sizeof(*regwrite));
++	struct aes1610_read_regs *rdata = g_malloc(sizeof(*rdata));
++
++	fp_dbg("");
++	//regwrite->reg = AES1610_REG_CTRL2;
++	//regwrite->value = AES1610_CTRL2_READ_REGS;
++	rdata->dev = dev;
++	rdata->callback = callback;
++	rdata->user_data = user_data;
++	rdata->regwrite = regwrite;
++
++	//aes_write_regv(dev, (const struct aes_regwrite *) regwrite, 1,
++	//	read_regs_rq_cb, rdata);
+ }
+ 
+-static int do_exit(struct fp_img_dev *dev)
++/* Read the value of a specific register from a register dump */
++static int regval_from_dump(unsigned char *data, uint8_t target)
+ {
+-	return aes_write_regv(dev, stop_reader, G_N_ELEMENTS(stop_reader));
++	if (*data != FIRST_AES1610_REG) {
++		fp_err("not a register dump");
++		return -EILSEQ;
++	}
++
++	if (!(FIRST_AES1610_REG <= target && target <= LAST_AES1610_REG)) {
++		fp_err("out of range");
++		return -EINVAL;
++	}
++
++	target -= FIRST_AES1610_REG;
++	target *= 2;
++	return data[target + 1];
+ }
+ 
+-static void dev_exit(struct fp_img_dev *dev)
++static void generic_write_regv_cb(struct fp_img_dev *dev, int result,
++	void *user_data)
+ {
+-	do_exit(dev);
+-	libusb_release_interface(dev->udev, 0);
++	struct fpi_ssm *ssm = user_data;
++	if (result == 0)
++		fpi_ssm_next_state(ssm);
++	else
++		fpi_ssm_mark_aborted(ssm, result);
+ }
+ 
+-static const struct aes_regwrite finger_det_reqs[] = {
+-	{ 0x80, 0x01 },
+-	{ 0x80, 0x12 }, 
+-	{ 0x85, 0x00 }, 
+-	{ 0x8A, 0x00 },
+-	{ 0x8B, 0x0E },
+-	{ 0x8C, 0x90 }, 
+-	{ 0x8D, 0x83 }, 
+-	{ 0x8E, 0x07 }, 
+-	{ 0x8F, 0x07 }, 
+-	{ 0x96, 0x00 },
+-	{ 0x97, 0x48 }, 
+-	{ 0xA1, 0x00 }, 
+-	{ 0xA2, 0x50 }, 
+-	{ 0xA6, 0xE4 }, 
+-	{ 0xAD, 0x08 },
+-	{ 0xAE, 0x5B }, 
+-	{ 0xAF, 0x54 }, 
+-	{ 0xB1, 0x28 }, 
+-	{ 0xB5, 0xAB }, 
+-	{ 0xB6, 0x0E },
+-	{ 0x1B, 0x2D }, 
+-	{ 0x81, 0x04 }
+-};
+ 
+-static const struct aes_regwrite finger_det_none[] = {
+-	{ 0x80, 0x01 },
+-	{ 0x82, 0x00 }, 
+-	{ 0x86, 0x00 }, 
+-	{ 0xB1, 0x28 }, 
+-	{ 0x1D, 0x00 }
+-};
+ 
+-static int detect_finger(struct fp_img_dev *dev)
++/* read the specified number of bytes from the IN endpoint but throw them
++ * away, then increment the SSM */
++static void generic_read_ignore_data(struct fpi_ssm *ssm, size_t bytes)
+ {
+-	unsigned char buffer[19];
++	struct libusb_transfer *transfer = libusb_alloc_transfer(0);
++	unsigned char *data;
+ 	int r;
+-	int i;
+-	int sum = 0;
+ 
+-	r = aes_write_regv(dev, finger_det_reqs, G_N_ELEMENTS(finger_det_reqs));
+-	if (r < 0)
+-		return r;
++	if (!transfer) {
++		fpi_ssm_mark_aborted(ssm, -ENOMEM);
++		return;
++	}
+ 
+-	r = read_data(dev, buffer, 19);
+-	if (r < 0)
+-		return r;
++	data = g_malloc(bytes);
++	libusb_fill_bulk_transfer(transfer, ssm->dev->udev, EP_IN, data, bytes,
++		generic_ignore_data_cb, ssm, BULK_TIMEOUT);
+ 
+-	for (i = 3; i < 17; i++)
+-		sum += (buffer[i] & 0xf) + (buffer[i] >> 4);
+-		
+-	/* We need to answer something if no finger has been detected */
+-	if (sum <= 20) {
+-		r = aes_write_regv(dev, finger_det_none, G_N_ELEMENTS(finger_det_none));
+-		if (r < 0)
+-			return r;
++	r = libusb_submit_transfer(transfer);
++	if (r < 0) {
++		g_free(data);
++		libusb_free_transfer(transfer);
++		fpi_ssm_mark_aborted(ssm, r);
+ 	}
+-	
+-	return sum > 20;
+ }
+ 
+-static int await_finger_on(struct fp_img_dev *dev)
++/****** IMAGE PROCESSING ******/
++
++static int sum_histogram_values(unsigned char *data, uint8_t threshold)
+ {
+-	int r;
+-	do {
+-		r = detect_finger(dev);
+-	} while (r == 0);
+-	return (r < 0) ? r : 0;
++	int r = 0;
++	int i;
++	uint16_t *histogram = (uint16_t *)(data + 1);
++
++	if (*data != 0xde)
++		return -EILSEQ;
++
++	if (threshold > 0x0f)
++		return -EINVAL;
++
++	/* FIXME endianness */
++	for (i = threshold; i < 16; i++)
++		r += histogram[i];
++
++	return r;
+ }
+ 
+-/* find overlapping parts of frames */
++/* find overlapping parts of  frames */
+ static unsigned int find_overlap(unsigned char *first_frame,
+ 	unsigned char *second_frame, unsigned int *min_error)
+ {
+@@ -199,11 +278,11 @@ static unsigned int find_overlap(unsigned char *first_frame,
+ 		unsigned int error = 0;
+ 		for (i = 0; i < FRAME_WIDTH * (FRAME_HEIGHT - dy); i++) {
+ 			/* Using ? operator to avoid abs function */
+-			error += first_frame[i] > second_frame[i] ? 
+-					(first_frame[i] - second_frame[i]) :
+-					(second_frame[i] - first_frame[i]); 
++			error += first_frame[i] > second_frame[i] ?
++				(first_frame[i] - second_frame[i]) :
++				(second_frame[i] - first_frame[i]);
+ 		}
+-		
++
+ 		/* Normalize error */
+ 		error *= 15;
+ 		error /= i;
+@@ -213,37 +292,39 @@ static unsigned int find_overlap(unsigned char *first_frame,
+ 		}
+ 		first_frame += FRAME_WIDTH;
+ 	}
+-	
+-	return not_overlapped_height; 
++
++	return not_overlapped_height;
+ }
+ 
+ /* assemble a series of frames into a single image */
+-static unsigned int assemble(unsigned char *input, unsigned char *output,
+-	int num_strips, gboolean reverse, unsigned int *errors_sum)
++static unsigned int assemble(struct aes1610_dev *aesdev, unsigned char *output,
++	gboolean reverse, unsigned int *errors_sum)
+ {
+ 	uint8_t *assembled = output;
+ 	int frame;
+ 	uint32_t image_height = FRAME_HEIGHT;
+ 	unsigned int min_error;
++	size_t num_strips = aesdev->strips_len;
++	GSList *list_entry = aesdev->strips;
+ 	*errors_sum = 0;
+ 
+ 	if (num_strips < 1)
+ 		return 0;
+-	
+-	/* Rotating given data by 90 degrees 
++
++	/* Rotating given data by 90 degrees
+ 	 * Taken from document describing aes1610 image format
+ 	 * TODO: move reversing detection here */
+-	
++
+ 	if (reverse)
+ 		output += (num_strips - 1) * FRAME_SIZE;
+ 	for (frame = 0; frame < num_strips; frame++) {
+-		aes_assemble_image(input, FRAME_WIDTH, FRAME_HEIGHT, output);
+-		input += FRAME_WIDTH * (FRAME_HEIGHT / 2);
++		aes_assemble_image(list_entry->data, FRAME_WIDTH, FRAME_HEIGHT, output);
+ 
+ 		if (reverse)
+-			output -= FRAME_SIZE;
++		    output -= FRAME_SIZE;
+ 		else
+-			output += FRAME_SIZE;
++		    output += FRAME_SIZE;
++		list_entry = g_slist_next(list_entry);
+ 	}
+ 
+ 	/* Detecting where frames overlaped */
+@@ -256,12 +337,183 @@ static unsigned int assemble(unsigned char *input, unsigned char *output,
+ 		*errors_sum += min_error;
+ 		image_height += not_overlapped;
+ 		assembled += FRAME_WIDTH * not_overlapped;
+-		memcpy(assembled, output, FRAME_SIZE); 
++		memcpy(assembled, output, FRAME_SIZE);
+ 	}
+ 	return image_height;
+ }
+ 
+-static const struct aes_regwrite capture_reqs[] = {
++static void assemble_and_submit_image(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	size_t final_size;
++	struct fp_img *img;
++	unsigned int errors_sum, r_errors_sum;
++
++	fp_dbg("");
++
++	BUG_ON(aesdev->strips_len == 0);
++
++	/* reverse list */
++	aesdev->strips = g_slist_reverse(aesdev->strips);
++
++	/* create buffer big enough for max image */
++	img = fpi_img_new(aesdev->strips_len * FRAME_SIZE);
++
++	img->flags = FP_IMG_COLORS_INVERTED;
++	img->height = assemble(aesdev, img->data, FALSE, &errors_sum);
++	img->height = assemble(aesdev, img->data, TRUE, &r_errors_sum);
++
++	if (r_errors_sum > errors_sum) {
++	    img->height = assemble(aesdev, img->data, FALSE, &errors_sum);
++		img->flags |= FP_IMG_V_FLIPPED | FP_IMG_H_FLIPPED;
++		fp_dbg("normal scan direction");
++	} else {
++		fp_dbg("reversed scan direction");
++	}
++
++	/* now that overlap has been removed, resize output image buffer */
++	final_size = img->height * FRAME_WIDTH;
++	img = fpi_img_resize(img, final_size);
++	/* FIXME: ugly workaround */
++	if (img->height < 12)
++		img->height = 12;
++	fpi_imgdev_image_captured(dev, img);
++
++	/* free strips and strip list */
++	g_slist_foreach(aesdev->strips, (GFunc) g_free, NULL);
++	g_slist_free(aesdev->strips);
++	aesdev->strips = NULL;
++	aesdev->strips_len = 0;
++	aesdev->blanks_count = 0;
++}
++
++
++/****** FINGER PRESENCE DETECTION ******/
++
++
++static const struct aes_regwrite finger_det_reqs[] = {
++	{ 0x80, 0x01 },
++	{ 0x80, 0x12 },
++	{ 0x85, 0x00 },
++	{ 0x8A, 0x00 },
++	{ 0x8B, 0x0E },
++	{ 0x8C, 0x90 },
++	{ 0x8D, 0x83 },
++	{ 0x8E, 0x07 },
++	{ 0x8F, 0x07 },
++	{ 0x96, 0x00 },
++	{ 0x97, 0x48 },
++	{ 0xA1, 0x00 },
++	{ 0xA2, 0x50 },
++	{ 0xA6, 0xE4 },
++	{ 0xAD, 0x08 },
++	{ 0xAE, 0x5B },
++	{ 0xAF, 0x54 },
++	{ 0xB1, 0x28 },
++	{ 0xB5, 0xAB },
++	{ 0xB6, 0x0E },
++	{ 0x1B, 0x2D },
++	{ 0x81, 0x04 }
++};
++
++static const struct aes_regwrite finger_det_none[] = {
++	{ 0x80, 0x01 },
++	{ 0x82, 0x00 },
++	{ 0x86, 0x00 },
++	{ 0xB1, 0x28 },
++	{ 0x1D, 0x00 }
++};
++
++
++static void start_finger_detection(struct fp_img_dev *dev);
++
++static void finger_det_data_cb(struct libusb_transfer *transfer)
++{
++	struct fp_img_dev *dev = transfer->user_data;
++	unsigned char *data = transfer->buffer;
++	int i;
++	int sum = 0;
++
++	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
++		fpi_imgdev_session_error(dev, -EIO);
++		goto out;
++	} else if (transfer->length != transfer->actual_length) {
++		fpi_imgdev_session_error(dev, -EPROTO);
++		goto out;
++	}
++
++	/* examine histogram to determine finger presence */
++	for (i = 3; i < 17; i++)
++		sum += (data[i] & 0xf) + (data[i] >> 4);
++	if (sum > 20) {
++		/* reset default gain */
++		adjust_gain(data,GAIN_STATUS_FIRST);
++		/* finger present, start capturing */
++		fpi_imgdev_report_finger_status(dev, TRUE);
++		start_capture(dev);
++	} else {
++		/* no finger, poll for a new histogram */
++		start_finger_detection(dev);
++	}
++
++out:
++	g_free(data);
++	libusb_free_transfer(transfer);
++}
++
++
++static void finger_det_none_cb(struct fp_img_dev *dev, int result, void *user_data)
++	fpi_imgdev_report_finger_status(dev, FALSE);
++	start_finger_detection(dev);
++}
++
++static void finger_det_reqs_cb(struct fp_img_dev *dev, int result, void *user_data)
++{
++	struct libusb_transfer *transfer;
++	unsigned char *data;
++	int r;
++
++	if (result) {
++		fpi_imgdev_session_error(dev, result);
++		return;
++	}
++
++	transfer = libusb_alloc_transfer(0);
++	if (!transfer) {
++		fpi_imgdev_session_error(dev, -ENOMEM);
++		return;
++	}
++
++	data = g_malloc(19);
++	libusb_fill_bulk_transfer(transfer, dev->udev, EP_IN, data, 19,
++		finger_det_data_cb, dev, BULK_TIMEOUT);
++
++	r = libusb_submit_transfer(transfer);
++	if (r < 0) {
++		g_free(data);
++		libusb_free_transfer(transfer);
++		fpi_imgdev_session_error(dev, r);
++	}
++
++}
++
++static void start_finger_detection(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	struct libusb_transfer *transfer;
++
++	if (aesdev->deactivating) {
++		complete_deactivation(dev);
++		return;
++	}
++
++	aes_write_regv(dev, finger_det_reqs, G_N_ELEMENTS(finger_det_reqs), finger_det_reqs_cb, NULL);
++
++}
++
++/****** CAPTURE ******/
++
++static struct aes_regwrite capture_reqs[] = {
+ 	{ 0x80, 0x01 },
+ 	{ 0x80, 0x12 },
+ 	{ 0x84, 0x01 },
+@@ -271,8 +523,8 @@ static const struct aes_regwrite capture_reqs[] = {
+ 	{ 0x8B, 0x0E },
+ 	{ 0x8C, 0x90 },
+ 	{ 0xBE, 0x23 },
+-	{ 0x29, 0x06 },
+-	{ 0x2A, 0x35 },
++	{ 0x29, 0x04 },
++	{ 0x2A, 0xFF },
+ 	{ 0x96, 0x00 },
+ 	{ 0x98, 0x03 },
+ 	{ 0x99, 0x00 },
+@@ -387,10 +639,10 @@ static const struct aes_regwrite capture_reqs[] = {
+ 	{ 0x81, 0x01 }
+ };
+ 
+-static const struct aes_regwrite strip_scan_reqs[] = {
++static struct aes_regwrite strip_scan_reqs[] = {
+ 	{ 0xBE, 0x23 },
+-	{ 0x29, 0x06 },
+-	{ 0x2A, 0x35 },
++	{ 0x29, 0x04 },
++	{ 0x2A, 0xFF },
+ 	{ 0xBD, 0x4F },
+ 	{ 0xFF, 0x00 }
+ };
+@@ -399,130 +651,456 @@ static const struct aes_regwrite capture_stop[] = {
+ 	{ 0x81,0x00 }
+ };
+ 
+-static int capture(struct fp_img_dev *dev, gboolean unconditional,
+-	struct fp_img **ret)
++/*
++ * The different possible values for 0xBE register */
++static unsigned char list_BE_values[10] = {
++	0x23, 0x43, 0x63, 0x64, 0x65, 0x67, 0x6A, 0x6B
++};
++
++/*
++ * The different possible values for 0xBD register */
++static unsigned char list_BD_values[10] = {
++	0x48, 0x4B, 0x4F, 0x52, 0x57, 0x59, 0x5B
++};
++
++/*
++ * Adjust the gain according to the histogram data
++ * 0xbd, 0xbe, 0x29 and 0x2A registers are affected
++ * Returns 0 if no problem occured
++ * TODO: This is a basic support for gain. It needs testing/tweaking.  */
++static int adjust_gain(unsigned char *buffer, int status)
+ {
+-	int r;
+-	struct fp_img *img;
+-	unsigned int nstrips;
+-	unsigned int errors_sum, r_errors_sum;
+-	unsigned char *cooked;
+-	unsigned char *imgptr;
+-	unsigned char buf[665];
+-	int final_size;
+-	int sum;
+-	unsigned int count_blank = 0;
+-	int i;
++	// The position in the array of possible values for 0xBE and 0xBD registers
++	static int pos_list_BE = 0;
++	static int pos_list_BD = 0;
+ 
+-	/* FIXME can do better here in terms of buffer management? */
+-	fp_dbg("");
++	// This is the first adjustement (we begin acquisition)
++	// We adjust strip_scan_reqs for future strips and capture_reqs that is sent just after this step
++	if (status == GAIN_STATUS_FIRST) {
++		if (buffer[1] > 0x78) { // maximum gain needed
++			strip_scan_reqs[0].value = 0x6B;
++			strip_scan_reqs[1].value = 0x06;
++			strip_scan_reqs[2].value = 0x35;
++			strip_scan_reqs[3].value = 0x5B;
++		}
++		else if (buffer[1] > 0x55) {
++			strip_scan_reqs[0].value = 0x63;
++			strip_scan_reqs[1].value = 0x15;
++			strip_scan_reqs[2].value = 0x35;
++			strip_scan_reqs[3].value = 0x4F;
++		}
++		else if (buffer[1] > 0x40 || buffer[16] > 0x19) {
++			strip_scan_reqs[0].value = 0x43;
++			strip_scan_reqs[1].value = 0x13;
++			strip_scan_reqs[2].value = 0x35;
++			strip_scan_reqs[3].value = 0x4B;
++		}
++		else { // minimum gain needed
++			strip_scan_reqs[0].value = 0x23;
++			strip_scan_reqs[1].value = 0x07;
++			strip_scan_reqs[2].value = 0x35;
++			strip_scan_reqs[3].value = 0x48;
++		}
+ 
+-	r = aes_write_regv(dev, capture_reqs, G_N_ELEMENTS(capture_reqs));
+-	if (r < 0)
+-		return r;
+-  
+-	/* FIXME: use histogram data above for gain calibration (0x8e xx) */
++		// Now copy this values in capture_reqs
++		capture_reqs[8].value = strip_scan_reqs[0].value;
++		capture_reqs[9].value = strip_scan_reqs[1].value;
++		capture_reqs[10].value = strip_scan_reqs[2].value;
++		capture_reqs[21].value = strip_scan_reqs[3].value;
+ 
+-	img = fpi_img_new((3 * MAX_FRAMES * FRAME_SIZE) / 2);
+-	imgptr = img->data;
+-	cooked = imgptr + (MAX_FRAMES * FRAME_SIZE) / 2;
++		fp_dbg("first gain: %x %x %x %x %x %x %x %x", strip_scan_reqs[0].reg, strip_scan_reqs[0].value, strip_scan_reqs[1].reg, strip_scan_reqs[1].value, strip_scan_reqs[2].reg, strip_scan_reqs[2].value, strip_scan_reqs[3].reg, strip_scan_reqs[3].value);
++	}
+ 
+-	r = read_data(dev, buf, 665);
+-	if (r < 0)
+-		goto err;
+-	memcpy(imgptr, buf + 1, 128*4);
+-	imgptr += 128*4;
++	// Every 2/3 strips
++	// We try to soften big changes of the gain (at least for 0xBE and 0xBD
++	// FIXME: This softenning will need testing and tweaking too
++	else if (status == GAIN_STATUS_NORMAL) {
++		if (buffer[514] > 0x78) { // maximum gain needed
++			if (pos_list_BE < 7)
++				pos_list_BE++;
+ 
+-	r = read_data(dev, buf, 665);
+-	if (r < 0)
+-		goto err;
+-	memcpy(imgptr, buf + 1, 128*4);
+-	imgptr += 128*4;
+-
+-	/* we start at 2 because we captured 2 frames above. the above captures
+-	 * should possibly be moved into the loop below, or discarded altogether */
+-	for (nstrips = 2; nstrips < MAX_FRAMES - 2; nstrips++) {
+-		r = aes_write_regv(dev, strip_scan_reqs, G_N_ELEMENTS(strip_scan_reqs));
+-		if (r < 0)
+-			goto err;
+-		r = read_data(dev, buf, 665);
+-		if (r < 0)
+-			goto err;
+-		memcpy(imgptr, buf + 1, 128*4);
+-		imgptr += 128*4;
+-
+-		r = read_data(dev, buf, 665);
+-		if (r < 0)
+-			goto err;
+-		memcpy(imgptr, buf + 1, 128*4);
+-		imgptr += 128*4;
+-
+-		sum = 0;
+-		for (i = 515; i != 530; i++)
+-		{
+-			/* histogram[i] = number of pixels of value i
+-			   Only the pixel values from 10 to 15 are used to detect finger. */
+-			sum += buf[i];
++			if (pos_list_BD < 6)
++				pos_list_BD++;
++
++			strip_scan_reqs[1].value = 0x04;
++			strip_scan_reqs[2].value = 0x35;
++		}
++		else if (buffer[514] > 0x55) {
++			if (pos_list_BE < 2)
++				pos_list_BE++;
++			else if (pos_list_BE > 2)
++				pos_list_BE--;
++
++			if (pos_list_BD < 2)
++				pos_list_BD++;
++			else if (pos_list_BD > 2)
++				pos_list_BD--;
++
++			strip_scan_reqs[1].value = 0x15;
++			strip_scan_reqs[2].value = 0x35;
+ 		}
+-		if (sum < 0) {
+-			r = sum;
+-			goto err;
++		else if (buffer[514] > 0x40 || buffer[529] > 0x19) {
++			if (pos_list_BE < 1)
++				pos_list_BE++;
++			else if (pos_list_BE > 1)
++				pos_list_BE--;
++
++			if (pos_list_BD < 1)
++				pos_list_BD++;
++			else if (pos_list_BD > 1)
++				pos_list_BD--;
++
++			strip_scan_reqs[1].value = 0x13;
++			strip_scan_reqs[2].value = 0x35;
+ 		}
+-		fp_dbg("sum=%d", sum);
+-		if (sum == 0)
+-			count_blank++;
++		else { // minimum gain needed
++			if (pos_list_BE > 0)
++				pos_list_BE--;
++
++			if (pos_list_BD > 0)
++				pos_list_BD--;
++
++			strip_scan_reqs[1].value = 0x07;
++			strip_scan_reqs[2].value = 0x35;
++		}
++
++		strip_scan_reqs[0].value = list_BE_values[pos_list_BE];
++		strip_scan_reqs[3].value = list_BD_values[pos_list_BD];
++
++		fp_dbg("gain: %x %x %x %x %x %x %x %x", strip_scan_reqs[0].reg, strip_scan_reqs[0].value, strip_scan_reqs[1].reg, strip_scan_reqs[1].value, strip_scan_reqs[2].reg, strip_scan_reqs[2].value, strip_scan_reqs[3].reg, strip_scan_reqs[3].value);
++	}
++	// Unknown status
++	else {
++		fp_err("Unexpected gain status.");
++		return 1;
++	}
++
++	return 0;
++}
++
++/*
++ * Restore the default gain values */
++static void restore_gain()
++{
++	strip_scan_reqs[0].value = list_BE_values[0];
++	strip_scan_reqs[1].value = 0x04;
++	strip_scan_reqs[2].value = 0xFF;
++	strip_scan_reqs[3].value = list_BD_values[0];
++
++	capture_reqs[8].value = list_BE_values[0];
++	capture_reqs[9].value = 0x04;
++	capture_reqs[10].value = 0xFF;
++	capture_reqs[21].value = list_BD_values[0];
++}
++
++
++/* capture SM movement:
++ * request and read strip,
++ * jump back to request UNLESS theres no finger, in which case exit SM,
++ * report lack of finger presence, and move to finger detection */
++
++enum capture_states {
++	CAPTURE_WRITE_REQS,
++	CAPTURE_READ_DATA,
++	CAPTURE_REQUEST_STRIP,
++	CAPTURE_READ_STRIP,
++	CAPTURE_NUM_STATES,
++};
++
++static void capture_read_strip_cb(struct libusb_transfer *transfer)
++{
++	unsigned char *stripdata;
++	struct fpi_ssm *ssm = transfer->user_data;
++	struct fp_img_dev *dev = ssm->priv;
++	struct aes1610_dev *aesdev = dev->priv;
++	unsigned char *data = transfer->buffer;
++	int sum, i;
++	int threshold;
++
++	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
++		fpi_ssm_mark_aborted(ssm, -EIO);
++		goto out;
++	} else if (transfer->length != transfer->actual_length) {
++		fpi_ssm_mark_aborted(ssm, -EPROTO);
++		goto out;
++	}
++
++	/* FIXME: would preallocating strip buffers be a decent optimization? */
++	//stripdata = g_malloc(128 * 4);
++	//memcpy(stripdata, data + 1, 128 * 4);
++	//aesdev->strips = g_slist_prepend(aesdev->strips, stripdata);
++	//aesdev->strips_len++;
++
++	/*threshold = regval_from_dump(data + 1 + 128*8 + 1 + 16*2 + 1 + 8,
++		0x97);
++	if (threshold < 0) {
++		fpi_ssm_mark_aborted(ssm, threshold);
++		goto out;
++	}*/
++
++	sum = 0;
++	for (i = 516; i < 530; i++)
++	{
++		/* histogram[i] = number of pixels of value i
++		   Only the pixel values from 10 to 15 are used to detect finger. */
++		sum += data[i];
++	}
++
++	if (sum > 0) {
++	        /* FIXME: would preallocating strip buffers be a decent optimization? */
++	        stripdata = g_malloc(128 * 4);
++	        memcpy(stripdata, data + 1, 128 * 4);
++	        aesdev->strips = g_slist_prepend(aesdev->strips, stripdata);
++	        aesdev->strips_len++;
++		aesdev->blanks_count = 0;
++	}
++
++	if (sum < 0) {
++		fpi_ssm_mark_aborted(ssm, sum);
++		goto out;
++	}
++	fp_dbg("sum=%d", sum);
++
++	/* FIXME: 0 might be too low as a threshold */
++	/* FIXME: sometimes we get 0 in the middle of a scan, should we wait for
++	 * a few consecutive zeroes? */
++
++	/* If sum is 0 for a reasonable # of frames, finger has been removed */
++	if (sum == 0) {
++		aesdev->blanks_count++;
++		fp_dbg("got blank frame");
++	}
++
++	/* use histogram data above for gain calibration (0xbd, 0xbe, 0x29 and 0x2A ) */
++	adjust_gain(data, GAIN_STATUS_NORMAL);
++
++	/* stop capturing if MAX_FRAMES is reached */
++	if (aesdev->blanks_count > 10 || g_slist_length(aesdev->strips) >= MAX_FRAMES) {
++		fp_dbg("sending stop capture.... blanks=%d  frames=%d", aesdev->blanks_count, g_slist_length(aesdev->strips));
++		/* send stop capture bits */
++		aes_write_regv(dev, capture_stop, G_N_ELEMENTS(capture_stop), stub_capture_stop_cb, NULL);
++		/* assemble image and submit it to library */
++		assemble_and_submit_image(dev);
++		fpi_imgdev_report_finger_status(dev, FALSE);
++		/* marking machine complete will re-trigger finger detection loop */
++		fpi_ssm_mark_completed(ssm);
++		/* Acquisition finished: restore default gain values */
++		restore_gain();
++	} else {
++		/* obtain next strip */
++		fpi_ssm_jump_to_state(ssm, CAPTURE_REQUEST_STRIP);
++	}
++
++out:
++	g_free(data);
++	libusb_free_transfer(transfer);
++}
++
++static void capture_run_state(struct fpi_ssm *ssm)
++{
++	struct fp_img_dev *dev = ssm->priv;
++	struct aes1610_dev *aesdev = dev->priv;
++	int r;
++
++	switch (ssm->cur_state) {
++	case CAPTURE_WRITE_REQS:
++		fp_dbg("write reqs");
++		aes_write_regv(dev, capture_reqs, G_N_ELEMENTS(capture_reqs),
++			generic_write_regv_cb, ssm);
++		break;
++	case CAPTURE_READ_DATA:
++		fp_dbg("read data");
++		generic_read_ignore_data(ssm, 665);
++		break;
++	case CAPTURE_REQUEST_STRIP:
++		fp_dbg("request strip");
++		if (aesdev->deactivating)
++			fpi_ssm_mark_completed(ssm);
+ 		else
+-			count_blank = 0;
+-			
+-		/* if we got 50 blank frames, assume scan has ended. */
+-		if (count_blank >= 50)
++			aes_write_regv(dev, strip_scan_reqs, G_N_ELEMENTS(strip_scan_reqs),
++				generic_write_regv_cb, ssm);
++		break;
++	case CAPTURE_READ_STRIP: ;
++		struct libusb_transfer *transfer = libusb_alloc_transfer(0);
++		unsigned char *data;
++
++		if (!transfer) {
++			fpi_ssm_mark_aborted(ssm, -ENOMEM);
+ 			break;
++		}
++
++		data = g_malloc(665);
++		libusb_fill_bulk_transfer(transfer, dev->udev, EP_IN, data, 665,
++			capture_read_strip_cb, ssm, BULK_TIMEOUT);
++
++		r = libusb_submit_transfer(transfer);
++		if (r < 0) {
++			g_free(data);
++			libusb_free_transfer(transfer);
++			fpi_ssm_mark_aborted(ssm, r);
++		}
++		break;
++	};
++}
++
++static void capture_sm_complete(struct fpi_ssm *ssm)
++{
++	struct fp_img_dev *dev = ssm->priv;
++	struct aes1610_dev *aesdev = dev->priv;
++
++	fp_dbg("");
++	if (aesdev->deactivating)
++		complete_deactivation(dev);
++	else if (ssm->error)
++		fpi_imgdev_session_error(dev, ssm->error);
++	else
++		start_finger_detection(dev);
++	fpi_ssm_free(ssm);
++}
++
++static void start_capture(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	struct fpi_ssm *ssm;
++
++	if (aesdev->deactivating) {
++		complete_deactivation(dev);
++		return;
+ 	}
+-	
+-	r = aes_write_regv(dev, capture_stop, G_N_ELEMENTS(capture_stop));
+-	if (r < 0)
+-		goto err;
+-	r = read_data(dev, buf, 665);
+-	if (r < 0)
+-		goto err;
+-	memcpy(imgptr, buf + 1, 128*4);
+-	imgptr += 128*4;
+-	nstrips++;
+ 
+-	r = read_data(dev, buf, 665);
+-	if (r < 0)
+-		goto err;
+-	memcpy(imgptr, buf + 1, 128*4);
+-	imgptr += 128*4;
+-	nstrips++;
+-	
+-	if (nstrips == MAX_FRAMES)
+-		fp_warn("swiping finger too slow?");
++	ssm = fpi_ssm_new(dev->dev, capture_run_state, CAPTURE_NUM_STATES);
++	fp_dbg("");
++	ssm->priv = dev;
++	fpi_ssm_start(ssm, capture_sm_complete);
++}
+ 
+-	img->flags = FP_IMG_COLORS_INVERTED;
+-	img->height = assemble(img->data, cooked, nstrips, FALSE, &errors_sum);
+-	img->height = assemble(img->data, cooked, nstrips, TRUE, &r_errors_sum);
+-	
+-	if (r_errors_sum > errors_sum) {
+-		img->height = assemble(img->data, cooked, nstrips, FALSE, &errors_sum);
+-		img->flags |= FP_IMG_V_FLIPPED | FP_IMG_H_FLIPPED;
+-		fp_dbg("normal scan direction");
++/****** INITIALIZATION/DEINITIALIZATION ******/
++
++static const struct aes_regwrite init[] = {
++	{ 0x82, 0x00 }
++};
++
++static const struct aes_regwrite stop_reader[] = {
++	{ 0xFF, 0x00 }
++};
++
++
++enum activate_states {
++	WRITE_INIT,
++//	READ_DATA,
++//	READ_REGS,
++	ACTIVATE_NUM_STATES,
++};
++
++/* this come from aes2501 and is unused here
++void activate_read_regs_cb(struct fp_img_dev *dev, int status,
++	unsigned char *regs, void *user_data)
++{
++	struct fpi_ssm *ssm = user_data;
++	struct aes1610_dev *aesdev = dev->priv;
++
++	if (status != 0) {
++		fpi_ssm_mark_aborted(ssm, status);
+ 	} else {
+-		fp_dbg("reversed scan direction");
++		fpi_ssm_next_state(ssm);
+ 	}
++}
++*/
+ 
+-	final_size = img->height * FRAME_WIDTH;
+-	memcpy(img->data, cooked, final_size);
+-	img = fpi_img_resize(img, final_size);
+-	*ret = img;
++static void activate_run_state(struct fpi_ssm *ssm)
++{
++	struct fp_img_dev *dev = ssm->priv;
++
++	/* activation on aes1610 seems much more straightforward compared to aes2501 */
++	/* verify theres anything missing here */
++	switch (ssm->cur_state) {
++	case WRITE_INIT:
++		fp_dbg("write init");
++		aes_write_regv(dev, init, G_N_ELEMENTS(init), generic_write_regv_cb, ssm);
++		break;
++/*	case READ_DATA:
++		fp_dbg("read data");
++		generic_read_ignore_data(ssm, 20);
++		break;
++	case READ_REGS:
++		fp_dbg("read regs");
++		read_regs(dev, activate_read_regs_cb, ssm);
++		break;*/
++	}
++}
++
++/* jump to finger detection */
++static void activate_sm_complete(struct fpi_ssm *ssm)
++{
++	struct fp_img_dev *dev = ssm->priv;
++	fp_dbg("status %d", ssm->error);
++	fpi_imgdev_activate_complete(dev, ssm->error);
++
++	if (!ssm->error)
++		start_finger_detection(dev);
++	fpi_ssm_free(ssm);
++}
++
++static int dev_activate(struct fp_img_dev *dev, enum fp_imgdev_state state)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	struct fpi_ssm *ssm = fpi_ssm_new(dev->dev, activate_run_state,
++		ACTIVATE_NUM_STATES);
++	ssm->priv = dev;
++	aesdev->read_regs_retry_count = 0;
++	fpi_ssm_start(ssm, activate_sm_complete);
+ 	return 0;
+-err:
+-	fp_img_free(img);
+-	return r;
++}
++
++static void dev_deactivate(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	/* FIXME: audit cancellation points, probably need more, specifically
++	 * in error handling paths? */
++	aesdev->deactivating = TRUE;
++}
++
++static void complete_deactivation(struct fp_img_dev *dev)
++{
++	struct aes1610_dev *aesdev = dev->priv;
++	fp_dbg("");
++
++	/* FIXME: if we're in the middle of a scan, we should cancel the scan.
++	 * maybe we can do this with a master reset, unconditionally? */
++
++	aesdev->deactivating = FALSE;
++	g_slist_free(aesdev->strips);
++	aesdev->strips = NULL;
++	aesdev->strips_len = 0;
++	aesdev->blanks_count = 0;
++	fpi_imgdev_deactivate_complete(dev);
++}
++
++static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
++{
++	/* FIXME check endpoints */
++	int r;
++
++	r = libusb_claim_interface(dev->udev, 0);
++	if (r < 0) {
++		fp_err("could not claim interface 0");
++		return r;
++	}
++
++	dev->priv = g_malloc0(sizeof(struct aes1610_dev));
++	fpi_imgdev_open_complete(dev, 0);
++	return 0;
++}
++
++static void dev_deinit(struct fp_img_dev *dev)
++{
++	g_free(dev->priv);
++	libusb_release_interface(dev->udev, 0);
++	fpi_imgdev_close_complete(dev);
+ }
+ 
+ static const struct usb_id id_table[] = {
+-	{ .vendor = 0x08ff, .product = 0x1600 },
++	{ .vendor = 0x08ff, .product = 0x1600 }, /* AES1600 */
+ 	{ 0, 0, 0, },
+ };
+ 
+@@ -544,9 +1122,9 @@ struct fp_img_driver aes1610_driver = {
+ 	 * area) */
+ 	.bz3_threshold = 10,
+ 
+-	.init = dev_init,
+-	.exit = dev_exit,
+-	.await_finger_on = await_finger_on,
+-	.capture = capture,
++	.open = dev_init,
++	.close = dev_deinit,
++	.activate = dev_activate,
++	.deactivate = dev_deactivate,
+ };
+ 



From kklic at fedoraproject.org  Tue Dec  1 14:34:56 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Tue,  1 Dec 2009 14:34:56 +0000 (UTC)
Subject: rpms/gzip/F-12 gzip-1.3.12-close-stdout.patch,1.1,1.2
Message-ID: <20091201143456.9E77311C00DE@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/gzip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32751

Modified Files:
	gzip-1.3.12-close-stdout.patch 
Log Message:
Fixed silent data loss due to unchecked close of stdout: fixed patch

gzip-1.3.12-close-stdout.patch:
 gzip.c |  157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gzip-1.3.12-close-stdout.patchIndex: gzip-1.3.12-close-stdout.patch
===================================================================
RCS file: /cvs/extras/rpms/gzip/F-12/gzip-1.3.12-close-stdout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gzip-1.3.12-close-stdout.patch	1 Dec 2009 13:53:33 -0000	1.1
+++ gzip-1.3.12-close-stdout.patch	1 Dec 2009 14:34:56 -0000	1.2
@@ -1,17863 +1,181 @@
-diff -up gzip-1.3.12/configure.close-stdout gzip-1.3.12/configure
---- gzip-1.3.12/configure.close-stdout	2007-04-13 23:39:49.000000000 +0200
-+++ gzip-1.3.12/configure	2009-12-01 10:04:19.891388375 +0100
-@@ -1,11 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61 for gzip 1.3.12.
-+# Generated by GNU Autoconf 2.63 for gzip 1.3.12.
- #
- # Report bugs to <bug-gzip at gnu.org>.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-   else
--    PATH_SEPARATOR=:
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-   fi
--  rm -f conf$$.sh
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
- fi
- 
- # Support unset when possible.
-@@ -65,8 +93,6 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
--as_nl='
--'
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
-@@ -89,7 +115,7 @@ if test "x$as_myself" = x; then
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
- fi
- 
-@@ -102,17 +128,10 @@ PS2='> '
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
--do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--  fi
--done
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -160,7 +179,7 @@ else
-   as_have_required=no
- fi
- 
--  if test $as_have_required = yes && 	 (eval ":
-+  if test $as_have_required = yes &&	 (eval ":
- (as_func_return () {
-   (exit \$1)
- }
-@@ -242,7 +261,7 @@ IFS=$as_save_IFS
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -263,7 +282,7 @@ _ASEOF
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -343,10 +362,10 @@ fi
- 
-       if test "x$CONFIG_SHELL" != x; then
-   for as_var in BASH_ENV ENV
--        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--        done
--        export CONFIG_SHELL
--        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+	done
-+	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
- 
- 
-@@ -415,9 +434,10 @@ fi
- 
- test \$exitcode = 0") || {
-   echo No shell found that supports shell functions.
--  echo Please tell autoconf at gnu.org about your system,
--  echo including any error possibly output before this
--  echo message
-+  echo Please tell bug-autoconf at gnu.org about your system,
-+  echo including any error possibly output before this message.
-+  echo This can help us improve future autoconf versions.
-+  echo Configuration will now proceed without shell functions.
- }
- 
- 
-@@ -453,7 +473,7 @@ test \$exitcode = 0") || {
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
[...17617 lines suppressed...]
-+	        distdir="$$new_distdir" \
- 		am__remove_distdir=: \
- 		am__skip_length_check=: \
-+		am__skip_mode_fix=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
- 	done
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-test -n "$(am__skip_mode_fix)" \
-+	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
--	|| chmod -R a+r $(distdir)
-+	|| chmod -R a+r "$(distdir)"
- dist-gzip: distdir
- 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- 	$(am__remove_distdir)
-@@ -692,6 +872,14 @@ dist-bzip2: distdir
- 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- 	$(am__remove_distdir)
- 
-+dist-lzma: distdir
-+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+	$(am__remove_distdir)
-+
-+dist-xz: distdir
-+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-+	$(am__remove_distdir)
-+
- dist-tarZ: distdir
- 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- 	$(am__remove_distdir)
-@@ -718,6 +906,10 @@ distcheck: dist
- 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
- 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.lzma*) \
-+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+	*.tar.xz*) \
-+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
-@@ -729,9 +921,11 @@ distcheck: dist
- 	mkdir $(distdir)/_build
- 	mkdir $(distdir)/_inst
- 	chmod a-w $(distdir)
-+	test -d $(distdir)/_build || exit 0; \
- 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
--	  && cd $(distdir)/_build \
-+	  && am__cwd=`pwd` \
-+	  && $(am__cd) $(distdir)/_build \
- 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- 	    $(DISTCHECK_CONFIGURE_FLAGS) \
- 	  && $(MAKE) $(AM_MAKEFLAGS) \
-@@ -753,13 +947,15 @@ distcheck: dist
- 	  && rm -rf "$$dc_destdir" \
- 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
- 	  && rm -rf $(DIST_ARCHIVES) \
--	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-+	  && cd "$$am__cwd" \
-+	  || exit 1
- 	$(am__remove_distdir)
- 	@(echo "$(distdir) archives ready for distribution: "; \
- 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
--	@cd $(distuninstallcheck_dir) \
-+	@$(am__cd) '$(distuninstallcheck_dir)' \
- 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- 	   || { echo "ERROR: files left after uninstall:" ; \
- 	        if test -n "$(DESTDIR)"; then \
-@@ -806,6 +1002,7 @@ clean-generic:
- 
- distclean-generic:
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -828,6 +1025,8 @@ dvi-am:
- 
- html: html-recursive
- 
-+html-am:
-+
- info: info-recursive
- 
- info-am:
-@@ -836,20 +1035,29 @@ install-data-am: install-man
- 
- install-dvi: install-dvi-recursive
- 
-+install-dvi-am:
-+
- install-exec-am: install-binPROGRAMS install-binSCRIPTS
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
--
- install-html: install-html-recursive
- 
-+install-html-am:
-+
- install-info: install-info-recursive
- 
-+install-info-am:
++  /* There is no need to flush stdin if we can determine quickly that stdin's
++     input buffer is empty; in this case we know that if stdin is seekable,
++     fseeko (stdin, 0, SEEK_CUR) == lseek (0, 0, SEEK_CUR).  */
++  if (freadahead (stdin) > 0)
++    {
++      /* Only attempt flush if stdin is seekable, as fflush is entitled to
++	 fail on non-seekable streams.  */
++      if (fseeko (stdin, 0, SEEK_CUR) == 0 && fflush (stdin) != 0)
++	fail = 1;
++    }
++  if (close_stream (stdin) != 0)
++    fail = 1;
++  if (fail)
++    {
++      /* Report failure, but defer exit until after closing stdout,
++	 since the failure report should still be flushed.  */
++      fprintf(stderr, "%d: error closing file\n", errno);
++    }
 +
- install-man: install-man1
- 
- install-pdf: install-pdf-recursive
- 
-+install-pdf-am:
++  close_stdout ();
 +
- install-ps: install-ps-recursive
- 
-+install-ps-am:
++  if (fail)
++    _exit (ERROR);
++}
 +
- installcheck-am: installcheck-binPROGRAMS installcheck-binSCRIPTS
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -876,22 +1084,23 @@ uninstall-am: uninstall-binPROGRAMS unin
- 
- uninstall-man: uninstall-man1
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
--	install-exec-am install-strip
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
-+	ctags-recursive install-am install-exec-am install-strip \
-+	tags-recursive
- 
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- 	all all-am am--refresh check check-am check-local clean \
- 	clean-binPROGRAMS clean-generic ctags ctags-recursive dist \
--	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
--	distcheck distclean distclean-compile distclean-generic \
--	distclean-tags distcleancheck distdir distuninstallcheck dvi \
--	dvi-am html html-am info info-am install install-am \
--	install-binPROGRAMS install-binSCRIPTS install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-exec-hook install-html install-html-am \
--	install-info install-info-am install-man install-man1 \
--	install-pdf install-pdf-am install-ps install-ps-am \
--	install-strip installcheck installcheck-am \
-+	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
-+	dist-xz dist-zip distcheck distclean distclean-compile \
-+	distclean-generic distclean-tags distcleancheck distdir \
-+	distuninstallcheck dvi dvi-am html html-am info info-am \
-+	install install-am install-binPROGRAMS install-binSCRIPTS \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-exec-hook install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-man1 install-pdf install-pdf-am install-ps \
-+	install-ps-am install-strip installcheck installcheck-am \
- 	installcheck-binPROGRAMS installcheck-binSCRIPTS installdirs \
- 	installdirs-am maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-@@ -951,6 +1160,7 @@ install-exec-hook remove-installed-links
- 	done
+ /* ======================================================================== */
+ int main (argc, argv)
+     int argc;
+@@ -396,6 +551,8 @@ int main (argc, argv)
+     program_name = gzip_base_name (argv[0]);
+     proglen = strlen (program_name);
  
- uninstall-local: remove-installed-links
++    atexit(close_stdin);
 +
- # 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:
+     /* Suppress .exe for MSDOS, OS/2 and VMS: */
+     if (4 < proglen && strequ (program_name + proglen - 4, ".exe"))
+       program_name[proglen - 4] = '\0';



From hadess at fedoraproject.org  Tue Dec  1 14:35:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:35:11 +0000 (UTC)
Subject: File hamster-applet-2.29.3.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091201143511.B62F010F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hamster-applet:

915c86c8a9ed933bb284f1fd180c2c21  hamster-applet-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:35:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:35:28 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.25, 1.26 hamster-applet.spec,
	1.34, 1.35 sources, 1.25, 1.26
Message-ID: <20091201143528.4BFC211C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv622

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	18 Nov 2009 15:47:15 -0000	1.25
+++ .cvsignore	1 Dec 2009 14:35:28 -0000	1.26
@@ -1 +1 @@
-hamster-applet-2.29.2.tar.bz2
+hamster-applet-2.29.3.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- hamster-applet.spec	18 Nov 2009 15:47:15 -0000	1.34
+++ hamster-applet.spec	1 Dec 2009 14:35:28 -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:           hamster-applet
-Version:        2.29.2
+Version:        2.29.3
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Wed Nov 18 2009 Mads Villadsen <maxx at krakoa.dk> - 2.29.2-1
 - Update to latest upstream development release
 - Change RPM Group to Applications/Productivity


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	18 Nov 2009 15:47:15 -0000	1.25
+++ sources	1 Dec 2009 14:35:28 -0000	1.26
@@ -1 +1 @@
-26f0d8332267428f3f3d9a9760532d23  hamster-applet-2.29.2.tar.bz2
+915c86c8a9ed933bb284f1fd180c2c21  hamster-applet-2.29.3.tar.bz2



From arbiter at fedoraproject.org  Tue Dec  1 14:37:06 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 14:37:06 +0000 (UTC)
Subject: rpms/qt-creator/devel qt-creator.spec,1.15,1.16
Message-ID: <20091201143706.7CA2011C00DE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	qt-creator.spec 
Log Message:
Fix %setup


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qt-creator.spec	1 Dec 2009 14:29:58 -0000	1.15
+++ qt-creator.spec	1 Dec 2009 14:37:06 -0000	1.16
@@ -28,8 +28,7 @@ designed to make development with the Qt
 even faster and easier.
 
 %prep
-%setup -q -n qt-creator-qt-creator
-# -n %name-%version-src
+%setup -q -n %name-%version-src
 
 %build
 QTDIR="%{_qt4_prefix}" ; export QTDIR ; \



From hadess at fedoraproject.org  Tue Dec  1 14:37:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:37:10 +0000 (UTC)
Subject: rpms/libfprint/devel libfprint.spec,1.27,1.28
Message-ID: <20091201143710.ED6AE11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	libfprint.spec 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-14.pre2
- Update AES1610 patch



Index: libfprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/devel/libfprint.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libfprint.spec	30 Nov 2009 10:59:07 -0000	1.27
+++ libfprint.spec	1 Dec 2009 14:37:10 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.1.0
-Release:        13.pre2%{?dist}
+Release:        14.pre2%{?dist}
 Summary:        Tool kit for fingerprint scanner
 
 Group:          System Environment/Libraries
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-14.pre2
+- Update AES1610 patch
+
 * Mon Nov 30 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-13.pre2
 - Add aes1610 driver (#499732)
 



From hadess at fedoraproject.org  Tue Dec  1 14:38:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:38:09 +0000 (UTC)
Subject: File eog-2.29.3.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201143809.8619510F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eog:

09b671901d849cb68e2313a989c3d9c6  eog-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:38:25 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:38:25 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.90, 1.91 eog.spec, 1.153, 1.154 sources,
	1.90, 1.91
Message-ID: <20091201143825.95BBF11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	22 Sep 2009 03:05:52 -0000	1.90
+++ .cvsignore	1 Dec 2009 14:38:25 -0000	1.91
@@ -1 +1 @@
-eog-2.28.0.tar.bz2
+eog-2.29.3.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- eog.spec	22 Sep 2009 03:05:52 -0000	1.153
+++ eog.spec	1 Dec 2009 14:38:25 -0000	1.154
@@ -11,7 +11,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.28.0
+Version: 2.29.3
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.28/%{name}-%{version}.tar.bz2
@@ -170,6 +170,9 @@ fi
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	22 Sep 2009 03:05:52 -0000	1.90
+++ sources	1 Dec 2009 14:38:25 -0000	1.91
@@ -1 +1 @@
-d36efde32f6669864023ebe838590a32  eog-2.28.0.tar.bz2
+09b671901d849cb68e2313a989c3d9c6  eog-2.29.3.tar.bz2



From ltinkl at fedoraproject.org  Tue Dec  1 14:38:46 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 14:38:46 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.152,1.153
Message-ID: <20091201143846.07A4C11C00DE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	kdeadmin.spec 
Log Message:
- KDE 4.4 beta1 (4.3.80)



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- kdeadmin.spec	1 Dec 2009 13:18:56 -0000	1.152
+++ kdeadmin.spec	1 Dec 2009 14:38:45 -0000	1.153
@@ -1,5 +1,3 @@
-#%define alphatag svn1048496
-
 %if 0%{?fedora}
 %define system_config_printer_kde 1
 %define include_kpackage 1
@@ -9,12 +7,12 @@ Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
 Version:        4.3.80
-Release:        1.%{?alphatag}%{?dist}
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:        kuser.pam



From hadess at fedoraproject.org  Tue Dec  1 14:38:55 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:38:55 +0000 (UTC)
Subject: File gnote-0.6.3.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201143855.C1B3C10F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnote:

930f1ad17c8856ae3ac1e53b9f436cbe  gnote-0.6.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:39:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:39:11 +0000 (UTC)
Subject: rpms/gnote/devel .cvsignore, 1.9, 1.10 gnote.spec, 1.15,
	1.16 sources, 1.10, 1.11
Message-ID: <20091201143911.A05DC11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gnote.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 0.6.3-1
- Update to 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnote/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 Aug 2009 00:38:17 -0000	1.9
+++ .cvsignore	1 Dec 2009 14:39:11 -0000	1.10
@@ -1 +1 @@
-gnote-0.6.2.tar.bz2
+gnote-0.6.3.tar.bz2


Index: gnote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnote/devel/gnote.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gnote.spec	13 Aug 2009 00:38:17 -0000	1.15
+++ gnote.spec	1 Dec 2009 14:39:11 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           gnote
-Version:        0.6.2
+Version:        0.6.3
 Release:        1%{?dist}
 Summary:        Note-taking application
 Group:          User Interface/Desktops
@@ -92,6 +92,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Gnote.service
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 0.6.3-1
+- Update to 0.6.3
+
 * Thu Aug 13 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.6.2-1
 - Very minor bug fixes
 - http://mail.gnome.org/archives/gnote-list/2009-August/msg00006.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnote/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	13 Aug 2009 00:38:17 -0000	1.10
+++ sources	1 Dec 2009 14:39:11 -0000	1.11
@@ -1 +1 @@
-f58bbfd7f1665690198a07499556290a  gnote-0.6.2.tar.bz2
+930f1ad17c8856ae3ac1e53b9f436cbe  gnote-0.6.3.tar.bz2



From mclasen at fedoraproject.org  Tue Dec  1 14:39:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 14:39:53 +0000 (UTC)
Subject: rpms/gtk2/F-12 gtk2.spec,1.439,1.440
Message-ID: <20091201143953.1C1D711C00DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2782

Modified Files:
	gtk2.spec 
Log Message:
dont autoreconf



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -p -r1.439 -r1.440
--- gtk2.spec	1 Dec 2009 14:30:13 -0000	1.439
+++ gtk2.spec	1 Dec 2009 14:39:52 -0000	1.440
@@ -26,7 +26,7 @@ Source2: update-gtk-immodules
 Source3: im-cedilla.conf
 
 # Biarch changes
-Patch0: gtk+-2.13.5-lib64.patch
+Patch0: gtk-lib64.patch
 Patch1: system-python.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
 Patch2: icon-padding.patch
@@ -167,16 +167,6 @@ This package contains developer document
 %patch15 -p1 -b .filesystemref
 
 %build
-libtoolize --force --copy
-
-# Patch0 modifies gdk-pixbuf/Makefile.am
-autoreconf
-
-if ! pkg-config --exists pangoxft ; then
-        echo "No pangoxft.pc!"
-        exit 1
-fi
-
 %configure --with-xinput=xfree 		\
 	   --enable-debug		\
 	   --disable-gtk-doc 		\



From arbiter at fedoraproject.org  Tue Dec  1 14:41:17 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 14:41:17 +0000 (UTC)
Subject: rpms/qt-creator/devel qt-creator.spec,1.16,1.17
Message-ID: <20091201144117.2397B11C00DE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	qt-creator.spec 
Log Message:
Fix %setup again


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- qt-creator.spec	1 Dec 2009 14:37:06 -0000	1.16
+++ qt-creator.spec	1 Dec 2009 14:41:17 -0000	1.17
@@ -28,7 +28,7 @@ designed to make development with the Qt
 even faster and easier.
 
 %prep
-%setup -q -n %name-%version-src
+%setup -q
 
 %build
 QTDIR="%{_qt4_prefix}" ; export QTDIR ; \



From than at fedoraproject.org  Tue Dec  1 14:42:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 14:42:51 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-12 .cvsignore, 1.40,
	1.41 kdebase-workspace.spec, 1.309, 1.310 sources, 1.49, 1.50
Message-ID: <20091201144251.8D41E11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3338

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	10 Nov 2009 14:58:43 -0000	1.40
+++ .cvsignore	1 Dec 2009 14:42:51 -0000	1.41
@@ -1 +1,2 @@
 kdebase-workspace-4.3.3.tar.bz2
+kdebase-workspace-4.3.4.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -p -r1.309 -r1.310
--- kdebase-workspace.spec	25 Nov 2009 00:54:14 -0000	1.309
+++ kdebase-workspace.spec	1 Dec 2009 14:42:51 -0000	1.310
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora} && 0%{?fedora} < 12
 %define with_polkit_09 1
 %endif
@@ -7,8 +6,8 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.3
-Release: 7%{?dist}.1
+Version: 4.3.4
+Release: 1%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -613,6 +612,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7.1
 - Requires: PolicyKit-authentication-agent unconditionally (ie, in F-12 too)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	10 Nov 2009 14:58:43 -0000	1.49
+++ sources	1 Dec 2009 14:42:51 -0000	1.50
@@ -1 +1 @@
-0af67c6ee6385cc86f694bc8e1675ddb  kdebase-workspace-4.3.3.tar.bz2
+5ae53ccb3c7783d466b353bdf7a6e532  kdebase-workspace-4.3.4.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:43:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:43:20 +0000 (UTC)
Subject: File mousetweaks-2.29.3.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091201144320.AF6D410F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mousetweaks:

a8f5a6e7447f6dc72ff46d1592e20ddb  mousetweaks-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:43:36 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:43:36 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.29, 1.30 mousetweaks.spec, 1.36,
	1.37 sources, 1.29, 1.30
Message-ID: <20091201144336.D268411C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	22 Sep 2009 05:26:50 -0000	1.29
+++ .cvsignore	1 Dec 2009 14:43:36 -0000	1.30
@@ -1 +1 @@
-mousetweaks-2.28.0.tar.bz2
+mousetweaks-2.29.3.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- mousetweaks.spec	22 Sep 2009 05:26:50 -0000	1.36
+++ mousetweaks.spec	1 Dec 2009 14:43:36 -0000	1.37
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.28.0
+Version:	2.29.3
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -108,6 +108,9 @@ fi
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Mon Sep 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	22 Sep 2009 05:26:50 -0000	1.29
+++ sources	1 Dec 2009 14:43:36 -0000	1.30
@@ -1 +1 @@
-92038b98c3d6815fc6c3699485bd04e1  mousetweaks-2.28.0.tar.bz2
+a8f5a6e7447f6dc72ff46d1592e20ddb  mousetweaks-2.29.3.tar.bz2



From atkac at fedoraproject.org  Tue Dec  1 14:43:55 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  1 Dec 2009 14:43:55 +0000 (UTC)
Subject: rpms/dnsperf/devel dnsperf.spec,1.12,1.13
Message-ID: <20091201144355.C57C111C00DE@cvs1.fedora.phx.redhat.com>

Author: atkac

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

Modified Files:
	dnsperf.spec 
Log Message:
- rebuild against new bind



Index: dnsperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsperf/devel/dnsperf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dnsperf.spec	26 Nov 2009 14:07:44 -0000	1.12
+++ dnsperf.spec	1 Dec 2009 14:43:55 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Benchmarking authorative and recursing DNS servers
 Name: dnsperf
 Version: 1.0.1.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: MIT
 Url: http://www.nominum.com/services/measurement_tools.php
 Source: ftp://ftp.nominum.com/pub/nominum/dnsperf/%{version}/dnsperf-src-%{version}-1.tar.gz
@@ -42,6 +42,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Dec 01 2009 Adam Tkac <atkac redhat com> - 1.0.1.0-14
+- rebuild against new bind
+
 * Thu Nov 26 2009 Adam Tkac <atkac redhat com> - 1.0.1.0-13
 - rebuild against new bind
 



From ltinkl at fedoraproject.org  Tue Dec  1 14:44:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 14:44:30 +0000 (UTC)
Subject: File kdebase-runtime-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091201144430.5E7AB10F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebase-runtime:

a7e0ce1a6c1c58821566502e6c5dd58c  kdebase-runtime-4.3.80.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:44:49 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:44:49 +0000 (UTC)
Subject: File devhelp-2.29.3.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201144449.BBB2B10F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for devhelp:

bbfed37e8c44ba678e55b562ab962a03  devhelp-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:45:05 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:45:05 +0000 (UTC)
Subject: rpms/devhelp/devel .cvsignore, 1.26, 1.27 devhelp.spec, 1.117,
	1.118 sources, 1.26, 1.27
Message-ID: <20091201144505.598C811C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	22 Sep 2009 03:09:58 -0000	1.26
+++ .cvsignore	1 Dec 2009 14:45:05 -0000	1.27
@@ -1 +1 @@
-devhelp-2.28.0.tar.bz2
+devhelp-2.29.3.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- devhelp.spec	24 Sep 2009 01:35:41 -0000	1.117
+++ devhelp.spec	1 Dec 2009 14:45:05 -0000	1.118
@@ -5,7 +5,7 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 2.28.0
+Version: 2.29.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -141,6 +141,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	22 Sep 2009 03:09:58 -0000	1.26
+++ sources	1 Dec 2009 14:45:05 -0000	1.27
@@ -1 +1 @@
-43de66cd3a0ce498aa78a5e3f97395c5  devhelp-2.28.0.tar.bz2
+bbfed37e8c44ba678e55b562ab962a03  devhelp-2.29.3.tar.bz2



From atkac at fedoraproject.org  Tue Dec  1 14:45:18 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  1 Dec 2009 14:45:18 +0000 (UTC)
Subject: rpms/bind-dyndb-ldap/devel bind-dyndb-ldap.spec,1.4,1.5
Message-ID: <20091201144518.631FD11C00DE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind-dyndb-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4533

Modified Files:
	bind-dyndb-ldap.spec 
Log Message:
- rebuild against new bind



Index: bind-dyndb-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind-dyndb-ldap/devel/bind-dyndb-ldap.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bind-dyndb-ldap.spec	26 Nov 2009 09:26:57 -0000	1.4
+++ bind-dyndb-ldap.spec	1 Dec 2009 14:45:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           bind-dyndb-ldap
 Version:        0.1.0
-Release:        0.4.a1%{?dist}
+Release:        0.5.a1%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 Group:          System Environment/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Adam Tkac <atkac redhat com> - 0.1.0-0.5.a1
+- rebuild against new bind
+
 * Thu Nov 26 2009 Adam Tkac <atkac redhat com> - 0.1.0-0.4.a1
 - rebuild against new bind
 



From hadess at fedoraproject.org  Tue Dec  1 14:47:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:47:12 +0000 (UTC)
Subject: File epiphany-2.29.3.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201144712.D807710F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for epiphany:

c8b6a1e06f2f50f66cd33588459c8dc8  epiphany-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:47:39 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:47:39 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.88, 1.89 epiphany.spec, 1.246,
	1.247 sources, 1.91, 1.92
Message-ID: <20091201144739.81EA011C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- .cvsignore	24 Sep 2009 02:32:19 -0000	1.88
+++ .cvsignore	1 Dec 2009 14:47:39 -0000	1.89
@@ -1 +1 @@
-epiphany-2.28.0.tar.bz2
+epiphany-2.29.3.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- epiphany.spec	24 Sep 2009 02:58:04 -0000	1.246
+++ epiphany.spec	1 Dec 2009 14:47:39 -0000	1.247
@@ -7,7 +7,7 @@
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.28.0
+Version: 2.29.3
 Release: 1%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
@@ -245,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	24 Sep 2009 02:32:19 -0000	1.91
+++ sources	1 Dec 2009 14:47:39 -0000	1.92
@@ -1 +1 @@
-b88ac1168fc271892cabf73b749cac16  epiphany-2.28.0.tar.bz2
+c8b6a1e06f2f50f66cd33588459c8dc8  epiphany-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:47:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:47:46 +0000 (UTC)
Subject: File evince-2.29.3.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201144746.DBC6210F887@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for evince:

ddeeb84ac55cb3deaf588c3dde10195d  evince-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:48:08 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:48:08 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.67, 1.68 evince.spec, 1.169,
	1.170 sources, 1.66, 1.67
Message-ID: <20091201144808.079E111C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	22 Sep 2009 03:22:12 -0000	1.67
+++ .cvsignore	1 Dec 2009 14:48:07 -0000	1.68
@@ -1 +1 @@
-evince-2.28.0.tar.bz2
+evince-2.29.3.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- evince.spec	22 Sep 2009 03:22:12 -0000	1.169
+++ evince.spec	1 Dec 2009 14:48:07 -0000	1.170
@@ -5,7 +5,7 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.28.0
+Version:	2.29.3
 Release:	1%{?dist}
 Summary:	Document viewer
 
@@ -257,6 +257,9 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	22 Sep 2009 03:22:12 -0000	1.66
+++ sources	1 Dec 2009 14:48:07 -0000	1.67
@@ -1 +1 @@
-66548bf1467f92924a7230869139adb5  evince-2.28.0.tar.bz2
+ddeeb84ac55cb3deaf588c3dde10195d  evince-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:48:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:48:20 +0000 (UTC)
Subject: File file-roller-2.29.2.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091201144820.95F5C10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for file-roller:

c05b45ee5d1c7068a2835c9fee1594f4  file-roller-2.29.2.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:48:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:48:32 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec, 1.67, 1.68 last_unsaved.patch, 1.1,
	NONE
Message-ID: <20091201144832.B75E711C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	brasero.spec 
Removed Files:
	last_unsaved.patch 
Log Message:
remove obsolete patch


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- brasero.spec	1 Dec 2009 14:33:28 -0000	1.67
+++ brasero.spec	1 Dec 2009 14:48:32 -0000	1.68
@@ -7,9 +7,6 @@ License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.28/%{name}-%{version}.tar.bz2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=599620
-Patch0: last_unsaved.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.15.6
@@ -92,7 +89,6 @@ developing brasero applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .last_unsaved
 
 %build
 %configure \


--- last_unsaved.patch DELETED ---



From hadess at fedoraproject.org  Tue Dec  1 14:48:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:48:37 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.93, 1.94 file-roller.spec,
	1.157, 1.158 sources, 1.94, 1.95
Message-ID: <20091201144837.055CF11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5810

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.2-1
- Update to 2.29.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- .cvsignore	22 Sep 2009 00:51:25 -0000	1.93
+++ .cvsignore	1 Dec 2009 14:48:36 -0000	1.94
@@ -1 +1 @@
-file-roller-2.28.0.tar.bz2
+file-roller-2.29.2.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- file-roller.spec	2 Nov 2009 05:55:51 -0000	1.157
+++ file-roller.spec	1 Dec 2009 14:48:36 -0000	1.158
@@ -10,8 +10,8 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.28.1
-Release: 	2%{?dist}
+Version:	2.29.2
+Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -131,6 +131,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.2-1
+- Update to 2.29.2
+
 * Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
 - Fix sticky DND
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	2 Nov 2009 05:55:52 -0000	1.94
+++ sources	1 Dec 2009 14:48:36 -0000	1.95
@@ -1 +1 @@
-fcba40a9aa04386dec961a2f776777c5  file-roller-2.28.1.tar.bz2
+c05b45ee5d1c7068a2835c9fee1594f4  file-roller-2.29.2.tar.bz2



From sdz at fedoraproject.org  Tue Dec  1 14:48:51 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:48:51 +0000 (UTC)
Subject: File sugar-0.87.1.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091201144851.01FBD10F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar:

31d123dff7ddfb18134537ca9d40fc66  sugar-0.87.1.tar.bz2



From sdz at fedoraproject.org  Tue Dec  1 14:50:18 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:50:18 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.47, 1.48 sources, 1.49,
	1.50 sugar.spec, 1.79, 1.80
Message-ID: <20091201145018.E53DA11C00DE@cvs1.fedora.phx.redhat.com>

Author: sdz

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

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	21 Oct 2009 15:10:57 -0000	1.47
+++ .cvsignore	1 Dec 2009 14:50:18 -0000	1.48
@@ -1 +1 @@
-sugar-0.86.3.tar.bz2
+sugar-0.87.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	21 Oct 2009 15:10:58 -0000	1.49
+++ sources	1 Dec 2009 14:50:18 -0000	1.50
@@ -1 +1 @@
-3ba8a6133540bb1037396adf552af52f  sugar-0.86.3.tar.bz2
+31d123dff7ddfb18134537ca9d40fc66  sugar-0.87.1.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sugar.spec	20 Nov 2009 11:49:48 -0000	1.79
+++ sugar.spec	1 Dec 2009 14:50:18 -0000	1.80
@@ -5,8 +5,8 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.86.3
-Release: 5%{?dist}
+Version: 0.87.1
+Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -45,6 +45,8 @@ Requires: openssh
 Obsoletes: sugar-journal <= 99
 Obsoletes: sugar-update-control <= 99
 
+BuildArch: noarch
+
 %description
 
 Sugar provides simple yet powerful means of engaging young
@@ -146,6 +148,10 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
+- New upstream release
+- Make this noarch again
+
 * Fri Nov 20 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.86.3-5
 - One more try
 



From hadess at fedoraproject.org  Tue Dec  1 14:54:04 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:54:04 +0000 (UTC)
Subject: File gnome-games-2.29.3.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091201145404.8DBC110F887@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-games:

2fcbf4795c8520d5453a4a1aecc20803  gnome-games-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:54:17 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:54:17 +0000 (UTC)
Subject: File gtksourceview-2.9.3.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091201145417.E1EDC10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gtksourceview2:

14e2a838c0a2e5e602103f6715948084  gtksourceview-2.9.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:54:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:54:29 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.105, 1.106 gnome-games.spec,
	1.232, 1.233 sources, 1.111, 1.112
Message-ID: <20091201145429.BE09911C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- .cvsignore	22 Sep 2009 04:57:14 -0000	1.105
+++ .cvsignore	1 Dec 2009 14:54:29 -0000	1.106
@@ -1 +1 @@
-gnome-games-2.28.0.tar.bz2
+gnome-games-2.29.3.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- gnome-games.spec	2 Nov 2009 05:14:57 -0000	1.232
+++ gnome-games.spec	1 Dec 2009 14:54:29 -0000	1.233
@@ -45,7 +45,7 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.28.1
+Version: 2.29.3
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -502,6 +502,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	2 Nov 2009 05:14:57 -0000	1.111
+++ sources	1 Dec 2009 14:54:29 -0000	1.112
@@ -1 +1 @@
-c67497debd70aa8847874616660dae48  gnome-games-2.28.1.tar.bz2
+2fcbf4795c8520d5453a4a1aecc20803  gnome-games-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:54:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:54:33 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.32, 1.33 gtksourceview2.spec,
	1.39, 1.40 sources, 1.32, 1.33
Message-ID: <20091201145433.C3EF411C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.9.3-1
- Update to 2.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	24 Sep 2009 01:50:35 -0000	1.32
+++ .cvsignore	1 Dec 2009 14:54:33 -0000	1.33
@@ -1 +1 @@
-gtksourceview-2.8.0.tar.bz2
+gtksourceview-2.9.3.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gtksourceview2.spec	24 Sep 2009 01:50:35 -0000	1.39
+++ gtksourceview2.spec	1 Dec 2009 14:54:33 -0000	1.40
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.8.0
+Version: 2.9.3
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.9.3-1
+- Update to 2.9.3
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.0-1
 - Update to 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	24 Sep 2009 01:50:35 -0000	1.32
+++ sources	1 Dec 2009 14:54:33 -0000	1.33
@@ -1 +1 @@
-b8456e21357bdffe5adb17b76d7e99a3  gtksourceview-2.8.0.tar.bz2
+14e2a838c0a2e5e602103f6715948084  gtksourceview-2.9.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:55:34 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:55:34 +0000 (UTC)
Subject: File gedit-2.29.3.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201145534.785BE10F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gedit:

51e58d48e99862899a93d6aea4afc7b0  gedit-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:55:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:55:54 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.97, 1.98 gedit.spec, 1.205,
	1.206 sources, 1.99, 1.100
Message-ID: <20091201145554.83FC711C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- .cvsignore	24 Sep 2009 01:47:04 -0000	1.97
+++ .cvsignore	1 Dec 2009 14:55:54 -0000	1.98
@@ -1 +1 @@
-gedit-2.28.0.tar.bz2
+gedit-2.29.3.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- gedit.spec	24 Sep 2009 01:47:04 -0000	1.205
+++ gedit.spec	1 Dec 2009 14:55:54 -0000	1.206
@@ -17,7 +17,7 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.28.0
+Version: 	2.29.3
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -230,6 +230,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- sources	24 Sep 2009 01:47:04 -0000	1.99
+++ sources	1 Dec 2009 14:55:54 -0000	1.100
@@ -1 +1 @@
-d5e8f9f2806c9662693f292b155dd238  gedit-2.28.0.tar.bz2
+51e58d48e99862899a93d6aea4afc7b0  gedit-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:56:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:56:11 +0000 (UTC)
Subject: File gdm-2.29.1.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201145611.E556210F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gdm:

99ace289f55145a9222856db212ac4f3  gdm-2.29.1.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:56:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:56:28 +0000 (UTC)
Subject: rpms/gdm/devel .cvsignore, 1.79, 1.80 gdm.spec, 1.492, 1.493 sources,
	1.115, 1.116
Message-ID: <20091201145628.AB61311C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.1-1
- Update to 2.29.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	23 Sep 2009 22:34:44 -0000	1.79
+++ .cvsignore	1 Dec 2009 14:56:28 -0000	1.80
@@ -1 +1 @@
-gdm-2.28.0.tar.bz2
+gdm-2.29.1.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- gdm.spec	2 Nov 2009 05:38:10 -0000	1.492
+++ gdm.spec	1 Dec 2009 14:56:28 -0000	1.493
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.28.1
-Release: 20%{?dist}
+Version: 2.29.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -419,6 +419,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.1-1
+- Update to 2.29.1
+
 * Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-20
 - Don't show 'Lock Screen' in the user switcher if locked down
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	2 Nov 2009 05:38:10 -0000	1.115
+++ sources	1 Dec 2009 14:56:28 -0000	1.116
@@ -1 +1 @@
-917dc80f5ef6adcdc15193de238476db  gdm-2.28.1.tar.bz2
+99ace289f55145a9222856db212ac4f3  gdm-2.29.1.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:56:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:56:37 +0000 (UTC)
Subject: File libsoup-2.29.3.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091201145637.94C5110F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libsoup:

f2b0f1bfd1657b74f6dfbec20bb94e08  libsoup-2.29.3.tar.bz2



From cwickert at fedoraproject.org  Tue Dec  1 14:56:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  1 Dec 2009 14:56:56 +0000 (UTC)
Subject: File parole-0.1.99.tar.bz2 uploaded to lookaside cache by cwickert
Message-ID: <20091201145656.7EA8610F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for parole:

83acd1287953d077e88048064fe33d40  parole-0.1.99.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:56:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:56:53 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.57, 1.58 libsoup.spec, 1.102,
	1.103 sources, 1.57, 1.58
Message-ID: <20091201145653.882CB11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	22 Sep 2009 01:15:39 -0000	1.57
+++ .cvsignore	1 Dec 2009 14:56:53 -0000	1.58
@@ -1 +1 @@
-libsoup-2.28.0.tar.bz2
+libsoup-2.29.3.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- libsoup.spec	22 Sep 2009 01:15:39 -0000	1.102
+++ libsoup.spec	1 Dec 2009 14:56:53 -0000	1.103
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.28.0
+Version: 2.29.3
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	22 Sep 2009 01:15:40 -0000	1.57
+++ sources	1 Dec 2009 14:56:53 -0000	1.58
@@ -1 +1 @@
-013831a13584e876f419d8059f73637b  libsoup-2.28.0.tar.bz2
+f2b0f1bfd1657b74f6dfbec20bb94e08  libsoup-2.29.3.tar.bz2



From mclasen at fedoraproject.org  Tue Dec  1 14:57:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 14:57:10 +0000 (UTC)
Subject: rpms/gtk2/F-12 gtk-lib64.patch,NONE,1.1
Message-ID: <20091201145710.2476811C00DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8944

Added Files:
	gtk-lib64.patch 
Log Message:
Add patch


gtk-lib64.patch:
 gdk-pixbuf/Makefile.am     |    1 +
 gdk-pixbuf/Makefile.in     |    1 +
 gdk-pixbuf/gdk-pixbuf-io.c |   12 +++++++++++-
 gtk/gtkrc.c                |   12 +++++++++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

--- NEW FILE gtk-lib64.patch ---
diff -up gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64 gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c
--- gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64	2009-11-30 13:10:35.000000000 -0500
+++ gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c	2009-11-30 20:54:21.842859303 -0500
@@ -305,7 +305,17 @@ gdk_pixbuf_get_module_file (void)
   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
 
   if (!result)
-	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+  {
+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+				     HOST, "gdk-pixbuf.loaders", NULL);
+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
+	  {
+		  g_free (result);
+		  
+		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+					     "gdk-pixbuf.loaders", NULL);
+	  }
+  }
 
   return result;
 }
diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.am
--- gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64	2009-11-26 01:35:49.000000000 -0500
+++ gtk+-2.19.1/gdk-pixbuf/Makefile.am	2009-11-30 20:54:21.842859303 -0500
@@ -521,6 +521,7 @@ INCLUDES = \
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_builddir)/gdk-pixbuf 		\
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
+	-DHOST=\"$(host_triplet)\"              \
 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
 	-DGTK_PREFIX=\"$(prefix)\"		\
diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.in
--- gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64	2009-11-30 20:54:58.058857713 -0500
+++ gtk+-2.19.1/gdk-pixbuf/Makefile.in	2009-11-30 20:55:21.902591753 -0500
@@ -1344,6 +1344,7 @@ INCLUDES = \
 	-I$(top_srcdir)/gdk-pixbuf 		\
 	-I$(top_builddir)/gdk-pixbuf 		\
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
+	-DHOST=\"$(host_triplet)\"              \
 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
 	-DGTK_PREFIX=\"$(prefix)\"		\
diff -up gtk+-2.19.1/gtk/gtkrc.c.lib64 gtk+-2.19.1/gtk/gtkrc.c
--- gtk+-2.19.1/gtk/gtkrc.c.lib64	2009-11-26 01:35:50.000000000 -0500
+++ gtk+-2.19.1/gtk/gtkrc.c	2009-11-30 20:54:21.844826383 -0500
@@ -450,7 +450,17 @@ gtk_rc_get_im_module_file (void)
       if (im_module_file)
 	result = g_strdup (im_module_file);
       else
-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+        {
+          result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, 
+                                     "gtk.immodules", NULL);
+          if (!g_file_test (result, G_FILE_TEST_EXISTS))
+            {
+              g_free (result);
+             
+              result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
+                                        "gtk.immodules", NULL);
+            }
+        }
     }
 
   return result;



From hadess at fedoraproject.org  Tue Dec  1 14:57:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:57:16 +0000 (UTC)
Subject: File gnome-desktop-2.29.3.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091201145716.ABDB410F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-desktop:

70b481fd9dee9a4863b3fe0824e6e4e7  gnome-desktop-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:57:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:57:32 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.90, 1.91 gnome-desktop.spec, 
	1.230, 1.231 sources, 1.91, 1.92
Message-ID: <20091201145732.C842611C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
- Update to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	22 Sep 2009 01:59:39 -0000	1.90
+++ .cvsignore	1 Dec 2009 14:57:32 -0000	1.91
@@ -1 +1 @@
-gnome-desktop-2.28.0.tar.bz2
+gnome-desktop-2.29.3.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- gnome-desktop.spec	12 Nov 2009 23:40:37 -0000	1.230
+++ gnome-desktop.spec	1 Dec 2009 14:57:32 -0000	1.231
@@ -11,8 +11,8 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.28.1
-Release: 5%{?dist}
+Version: 2.29.3
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-5
 - Make slideshows work again (gnome #601753)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	2 Nov 2009 05:25:53 -0000	1.91
+++ sources	1 Dec 2009 14:57:32 -0000	1.92
@@ -1 +1 @@
-6870b71b564dc902af65ddee176e603f  gnome-desktop-2.28.1.tar.bz2
+70b481fd9dee9a4863b3fe0824e6e4e7  gnome-desktop-2.29.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 14:58:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 14:58:51 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec,1.68,1.69
Message-ID: <20091201145851.006BA11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	brasero.spec 
Log Message:
add missing BR


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- brasero.spec	1 Dec 2009 14:48:32 -0000	1.68
+++ brasero.spec	1 Dec 2009 14:58:50 -0000	1.69
@@ -31,6 +31,7 @@ BuildRequires:  libisofs-devel >= 0.6.4
 BuildRequires:  nautilus-devel >= 2.22.2
 BuildRequires:  libSM-devel
 BuildRequires:  unique-devel
+BuildRequires:  libcanberra-devel
 
 Requires:  dvd+rw-tools
 Requires:  cdrecord



From mmcgrath at fedoraproject.org  Tue Dec  1 14:59:05 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 14:59:05 +0000 (UTC)
Subject: rpms/cacti/devel cacti.spec,1.29,1.30
Message-ID: <20091201145905.B3A9E11C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Log Message:
Applying upstream patches


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- cacti.spec	17 Aug 2009 02:00:41 -0000	1.29
+++ cacti.spec	1 Dec 2009 14:59:05 -0000	1.30
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7e
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,11 @@ Source0: http://www.cacti.net/downloads/
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Patch0: cli_add_graph.patch
+Patch1: snmp_invalid_response.patch
+Patch2: template_duplication.patch
+Patch3: cross_site_fix.patchcross_site_fix.patch
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +35,10 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +114,11 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-2
+- Pulling in some official patches
+- #541279
+- #541962
+
 * Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
 - Upstream released new version
 



From sdz at fedoraproject.org  Tue Dec  1 14:59:22 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 14:59:22 +0000 (UTC)
Subject: File sugar-presence-service-0.87.1.tar.bz2 uploaded to lookaside
	cache by sdz
Message-ID: <20091201145922.E67AD10F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-presence-service:

93beec602711d88d34409a5e7a86ed82  sugar-presence-service-0.87.1.tar.bz2



From mmcgrath at fedoraproject.org  Tue Dec  1 14:59:24 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 14:59:24 +0000 (UTC)
Subject: rpms/cacti/devel cli_add_graph.patch, NONE, 1.1 cross_site_fix.patch,
	NONE, 1.1 snmp_invalid_response.patch, NONE,
	1.1 template_duplication.patch, NONE, 1.1
Message-ID: <20091201145924.735D511C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Added Files:
	cli_add_graph.patch cross_site_fix.patch 
	snmp_invalid_response.patch template_duplication.patch 
Log Message:
Adding upstream patches

cli_add_graph.patch:
 add_graphs.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cli_add_graph.patch ---
--- ../tags/0.8.7e/cli/add_graphs.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/cli/add_graphs.php	2009-08-18 20:04:44.000000000 -0400
@@ -570,7 +570,7 @@
 	echo "                    3|Fields = Verify all Fields\n";
 	echo "List Options:\n";
 	echo "    --list-hosts\n";
-	echo "    --list-graph-templates [--host_template=[ID]]\n";
+	echo "    --list-graph-templates [--host-template-id=[ID]]\n";
 	echo "    --list-input-fields --graph-template-id=[ID]\n";
 	echo "    --list-snmp-queries\n";
 	echo "    --list-query-types  --snmp-query-id [ID]\n";

cross_site_fix.patch:
 graph.php                    |    2 +
 include/top_graph_header.php |    6 +--
 lib/html_form.php            |   75 ++++++++++++++++++++++++++++++++++++++++---
 lib/timespan_settings.php    |    8 ++--
 4 files changed, 80 insertions(+), 11 deletions(-)

--- NEW FILE cross_site_fix.patch ---
--- cacti-0.8.7e/graph.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/graph.php	2009-11-21 23:10:16.000000000 -0500
@@ -35,6 +35,8 @@
 /* ================= input validation ================= */
 input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
 input_validate_input_number(get_request_var("local_graph_id"));
+input_validate_input_number(get_request_var("graph_end"));
+input_validate_input_number(get_request_var("graph_start"));
 input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$");
 /* ==================================================== */
 
--- cacti-0.8.7e/include/top_graph_header.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/include/top_graph_header.php	2009-11-21 23:15:27.000000000 -0500
@@ -58,7 +58,7 @@
 		if ($_SESSION["custom"]) {
 			print "<meta http-equiv=refresh content='99999'>\r\n";
 		}else{
-			print "<meta http-equiv=refresh content='" . read_graph_config_option("page_refresh") . "'>\r\n";
+			print "<meta http-equiv=refresh content='" . htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES) . "'>\r\n";
 		}
 	}
 	?>
@@ -113,7 +113,7 @@
 	</tr>
 	<tr class="noprint">
 		<td bgcolor="#efefef" colspan="1" height="8" style="background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-			<img src="images/transparent_line.gif" width="<?php print read_graph_config_option("default_dual_pane_width");?>" height="2" border="0"><br>
+			<img src="images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" height="2" border="0"><br>
 		</td>
 		<td bgcolor="#ffffff" colspan="1" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;">
 
@@ -144,7 +144,7 @@
 
 	<tr>
 		<?php if ((read_graph_config_option("default_tree_view_mode") == "2") && (($_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
-		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print read_graph_config_option("default_dual_pane_width");?>' class='noprint'>
+		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>' class='noprint'>
 			<table border=0 cellpadding=0 cellspacing=0><tr><td><font size=-2><a style="font-size:7pt;text-decoration:none;color:silver" href="http://www.treemenu.net/" target=_blank></a></font></td></tr></table>
 			<?php grow_dhtml_trees(); ?>
 			<script type="text/javascript">initializeDocument();</script>
--- cacti-0.8.7e/lib/html_form.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/html_form.php	2009-11-21 23:15:40.000000000 -0500
@@ -235,13 +235,21 @@
 
 		if (sizeof($items) > 0) {
 		foreach ($items as $item) {
-			print $item["name"] . "<br>";
+			print htmlspecialchars($item["name"],ENT_QUOTES) . "<br>";
 		}
 		}
 
 		break;
+	case 'font':
+		form_font_box($field_name, $field_array["value"],
+			((isset($field_array["default"])) ? $field_array["default"] : ""),
+			$field_array["max_length"],
+			((isset($field_array["size"])) ? $field_array["size"] : "40"), "text",
+			((isset($field_array["form_id"])) ? $field_array["form_id"] : ""));
+
+		break;
 	default:
-		print "<em>" . $field_array["value"] . "</em>";
+		print "<em>" . htmlspecialchars($field_array["value"],ENT_QUOTES) . "</em>";
 
 		form_hidden_box($field_name, $field_array["value"], "");
 
@@ -384,7 +392,7 @@
 		$form_previous_value = $form_default_value;
 	}
 
-	print "<input type='hidden' id='$form_name' name='$form_name' value='$form_previous_value'>\n";
+	print "<input type='hidden' id='$form_name' name='$form_name' value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>\n";
 }
 
 /* form_dropdown - draws a standard html dropdown box
@@ -568,7 +576,7 @@
 			}
 		}
 
-		print ">". $array_display[$id];
+		print ">". htmlspecialchars($array_display[$id],ENT_QUOTES);
 		print "</option>\n";
 	}
 
@@ -627,6 +635,65 @@
 	print "</select>\n";
 }
 
+/* form_font_box - draws a standard html textbox and provides status of a fonts existence
+   @arg $form_name - the name of this form element
+   @arg $form_previous_value - the current value of this form element
+   @arg $form_default_value - the value of this form element to use if there is
+     no current value available
+   @arg $form_max_length - the maximum number of characters that can be entered
+     into this textbox
+   @arg $form_size - the size (width) of the textbox
+   @arg $type - the type of textbox, either 'text' or 'password'
+   @arg $current_id - used to determine if a current value for this form element
+     exists or not. a $current_id of '0' indicates that no current value exists,
+     a non-zero value indicates that a current value does exist */
+function form_font_box($form_name, $form_previous_value, $form_default_value, $form_max_length, $form_size = 30, $type = "text", $current_id = 0) {
+	if (($form_previous_value == "") && (empty($current_id))) {
+		$form_previous_value = $form_default_value;
+	}
+
+	print "<input type='$type'";
+
+	if (isset($_SESSION["sess_error_fields"])) {
+		if (!empty($_SESSION["sess_error_fields"][$form_name])) {
+			print "class='txtErrorTextBox'";
+			unset($_SESSION["sess_error_fields"][$form_name]);
+		}
+	}
+
+	if (isset($_SESSION["sess_field_values"])) {
+		if (!empty($_SESSION["sess_field_values"][$form_name])) {
+			$form_previous_value = $_SESSION["sess_field_values"][$form_name];
+		}
+	}
+
+	if (strlen($form_previous_value) == 0) { # no data: defaults are used; everythings fine
+			$extra_data = "";
+	} else {
+		if (read_config_option("rrdtool_version") == "rrd-1.3.x") {	# rrdtool 1.3 uses fontconfig
+			$font = '"' . $form_previous_value . '"';
+			$out_array = array();
+			exec('fc-list ' . $font, $out_array);
+			if (sizeof($out_array) == 0) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FONT NOT FOUND" . "]</span>";
+			} else {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FONT FOUND" . "]</span>";
+			}
+		} elseif (read_config_option("rrdtool_version") == "rrd-1.0.x" ||
+				  read_config_option("rrdtool_version") == "rrd-1.2.x") { # rrdtool 1.0 and 1.2 use font files
+			if (is_file($form_previous_value)) {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FILE FOUND" . "]</span>";
+			}else if (is_dir($form_previous_value)) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: IS DIR" . "]</span>";
+			}else{
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FILE NOT FOUND" . "]</span>";
+			}
+		} # will be used for future versions of rrdtool
+	}
+
+	print " id='$form_name' name='$form_name' size='$form_size'" . (!empty($form_max_length) ? " maxlength='$form_max_length'" : "") . " value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>" . $extra_data;
+}
+
 /* form_confirm - draws a table presenting the user with some choice and allowing
      them to either proceed (delete) or cancel
    @arg $body_text - the text to prompt the user with on this form
--- cacti-0.8.7e/lib/timespan_settings.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/timespan_settings.php	2009-11-21 23:15:49.000000000 -0500
@@ -125,9 +125,9 @@
 	if (isset($_POST["date1"])) {
 		/* the dates have changed, therefore, I am now custom */
 		if (($_SESSION["sess_current_date1"] != $_POST["date1"]) || ($_SESSION["sess_current_date2"] != $_POST["date2"])) {
-			$timespan["current_value_date1"] = $_POST["date1"];
+			$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
 			$timespan["begin_now"] =strtotime($timespan["current_value_date1"]);
-			$timespan["current_value_date2"] = $_POST["date2"];
+			$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 			$timespan["end_now"]=strtotime($timespan["current_value_date2"]);
 			$_SESSION["sess_current_timespan"] = GT_CUSTOM;
 			$_SESSION["custom"] = 1;
@@ -135,8 +135,8 @@
 		}else {
 			/* the default button wasn't pushed */
 			if (!isset($_POST["button_clear_x"])) {
-				$timespan["current_value_date1"] = $_POST["date1"];
-				$timespan["current_value_date2"] = $_POST["date2"];
+				$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
+				$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 				$timespan["begin_now"] = $_SESSION["sess_current_timespan_begin_now"];
 				$timespan["end_now"] = $_SESSION["sess_current_timespan_end_now"];
 

snmp_invalid_response.patch:
 include/global_arrays.php |    4 ++++
 lib/snmp.php              |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE snmp_invalid_response.patch ---
--- ../tags/0.8.7e/include/global_arrays.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/include/global_arrays.php	2009-08-18 20:04:44.000000000 -0400
@@ -174,6 +174,10 @@
 	"DES" => "DES (default)",
 	"AES128" => "AES");
 
+$banned_snmp_strings = array(
+	"End of MIB",
+	"No Such");
+
 $logfile_options = array(1 =>
 	"Logfile Only",
 	"Logfile and Syslog/Eventlog",
--- ../tags/0.8.7e/lib/snmp.php	2009-06-28 12:34:30.000000000 -0400
+++ 0.8.7/lib/snmp.php	2009-08-18 20:04:44.000000000 -0400
@@ -27,9 +27,6 @@
 define("SNMP_METHOD_PHP", 1);
 define("SNMP_METHOD_BINARY", 2);
 
-/* declare once, use many times */
-$banned_snmp_strings = array("End of MIB", "No Such");
-
 /* we must use an apostrophe to escape community names under Unix in case the user uses
 characters that the shell might interpret. the ucd-snmp binaries on Windows flip out when
 you do this, but are perfectly happy with a quotation mark. */

template_duplication.patch:
 cli/repair_templates.php |  135 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/README              |    3 +
 lib/export.php           |    5 +
 lib/import.php           |   10 +--
 lib/utility.php          |    6 ++
 5 files changed, 153 insertions(+), 6 deletions(-)

--- NEW FILE template_duplication.patch ---
diff -ruBbd 0.8.7e/cli/repair_templates.php 0.8.7/cli/repair_templates.php
--- 0.8.7e/cli/repair_templates.php	2009-08-18 22:03:22.000000000 -0400
+++ 0.8.7/cli/repair_templates.php	2009-08-20 07:43:54.000000000 -0400
@@ -0,0 +1,135 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2009 The Cacti Group                                 |
+ |                                                                         |
+ | 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.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/* do NOT run this script through a web browser */
+if (!isset($_SERVER["argv"][0]) || isset($_SERVER['REQUEST_METHOD'])  || isset($_SERVER['REMOTE_ADDR'])) {
+	die("<br><strong>This script is only meant to run at the command line.</strong>");
+}
+
+$no_http_headers = true;
+
+include(dirname(__FILE__) . "/../include/global.php");
+include_once("../lib/utility.php");
+include_once("../lib/template.php");
+
+/* process calling arguments */
+$parms = $_SERVER["argv"];
+array_shift($parms);
+
+$execute = FALSE;
+
+foreach($parms as $parameter) {
+	@list($arg, $value) = @explode("=", $parameter);
+
+	switch ($arg) {
+	case "--execute":
+		$execute = TRUE;
+		break;
+	case "-h":
+	case "-v":
+	case "-V":
+	case "--version":
+	case "--help":
+		display_help();
+		exit;
+	default:
+		print "ERROR: Invalid Parameter " . $parameter . "\n\n";
+		display_help();
+		exit;
+	}
+}
+
+if ($execute) {
+	echo "NOTE: Repairing All Duplicated Templates\n";
+} else {
+	echo "NOTE: Performing Check of Templates\n";
+}
+
+/* repair data templates first */
+if ($execute) {
+	echo "NOTE: Repairing Data Templates\n";
+} else {
+	echo "NOTE: Performing Check of Data Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT data_template_id FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
		$template_name = db_fetch_cell("SELECT name FROM data_template WHERE id=" . $id["data_template_id"]);
+		echo "NOTE: Data Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Data Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_data_template($template["local_data_template_rrd_id"], "data_template_item");
+				db_execute("UPDATE data_template_rrd SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Data Templates Found\n";
+}
+
+/* reset the array */
+$damaged_templates = array();
+
+/* repair graph templates */
+if ($execute) {
+	echo "NOTE: Repairing Graph Templates\n";
+} else {
+	echo "NOTE: Performing Check of Graph Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT graph_template_id FROM graph_template_input WHERE hash=''");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
+		$template_name = db_fetch_cell("SELECT name FROM graph_templates WHERE id=" . $id["graph_template_id"]);
+		echo "NOTE: Graph Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM graph_template_input WHERE hash=''");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Graph Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_graph_template(0, "graph_template_input");
+				db_execute("UPDATE graph_template_input SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Graph Templates Found\n";
+}
+
+
+/* display_help - displays the usage of the function */
+function display_help () {
+	print "Cacti Database Template Repair Tool v1.0, Copyright 2004-2009 - The Cacti Group\n\n";
+	print "usage: repair_templates.php --execute [--help]\n\n";
+	print "--execute        - Perform the repair\n";
+	print "--help           - display this help message\n";
+}
+?>
diff -ruBbd 0.8.7e/docs/README 0.8.7/docs/README
--- 0.8.7e/docs/README	2009-08-18 21:57:30.000000000 -0400
+++ 0.8.7/docs/README	2009-08-18 21:58:09.000000000 -0400
@@ -90,6 +90,9 @@
                             table
   poller_reindex_hosts.php - Cause data query reindex on hosts
   rebuild_poller_cache.php - Rebuilds the poller cache
+  repair_templates.php     - Certain templates, when created using the "duplicate"
+      function in Cacti, do not import/export well.  This utility repairs 
+      those templates.
 
 
 
diff -ruBbd 0.8.7e/lib/export.php 0.8.7/lib/export.php
--- 0.8.7e/lib/export.php	2009-08-18 21:56:47.000000000 -0400
+++ 0.8.7/lib/export.php	2009-08-18 21:57:50.000000000 -0400
@@ -811,7 +811,9 @@
 }
 
 function xml_character_encode($text) {
-
+	if (function_exists("htmlspecialchars")) {
+		return htmlspecialchars($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$text = str_replace("&", "&amp;", $text);
 	$text = str_replace(">", "&gt;", $text);
 	$text = str_replace("<", "&lt;", $text);
@@ -819,6 +821,7 @@
 	$text = str_replace("\'", "&apos;", $text);
 
 	return $text;
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/import.php 0.8.7/lib/import.php
--- 0.8.7e/lib/import.php	2009-08-18 21:56:59.000000000 -0400
+++ 0.8.7/lib/import.php	2009-08-18 21:57:55.000000000 -0400
@@ -36,10 +36,6 @@
 		return $info_array;
 	}
 
-	if (isset($xml_array["name"])) {
-		$xml_array["name"] = htmlspecialchars($xml_array["name"]);
-	}
-
 	while (list($hash, $hash_array) = each($xml_array)) {
 		/* parse information from the hash */
 		$parsed_hash = parse_xml_hash($hash);
@@ -115,7 +111,7 @@
 	$_graph_template_id = db_fetch_cell("select id from graph_templates where hash='$hash'");
 	$save["id"] = (empty($_graph_template_id) ? "0" : $_graph_template_id);
 	$save["hash"] = $hash;
-	$save["name"] = htmlspecialchars($xml_array["name"]);
+	$save["name"] = $xml_array["name"];
 	$graph_template_id = sql_save($save, "graph_templates");
 
 	$hash_cache["graph_template"][$hash] = $graph_template_id;
@@ -914,9 +910,13 @@
 }
 
 function xml_character_decode($text) {
+	if (function_exists("html_entity_decode")) {
+		return html_entity_decode($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$trans_tbl = get_html_translation_table(HTML_ENTITIES);
 	$trans_tbl = array_flip($trans_tbl);
 	return strtr($text, $trans_tbl);
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/utility.php 0.8.7/lib/utility.php
--- 0.8.7e/lib/utility.php	2009-08-18 21:57:08.000000000 -0400
+++ 0.8.7/lib/utility.php	2009-08-18 21:58:00.000000000 -0400
@@ -346,6 +346,7 @@
 			$save["name"] = $graph_template_input["name"];
 			$save["description"] = $graph_template_input["description"];
 			$save["column_name"] = $graph_template_input["column_name"];
+			$save["hash"]              = get_hash_graph_template(0, "graph_template_input");
 
 			$graph_template_input_id = sql_save($save, "graph_template_input");
 
@@ -436,6 +437,11 @@
 		$save["local_data_id"] = (isset($local_data_id) ? $local_data_id : 0);
 		$save["local_data_template_rrd_id"] = (isset($data_template_rrd["local_data_template_rrd_id"]) ? $data_template_rrd["local_data_template_rrd_id"] : 0);
 		$save["data_template_id"] = (!empty($_local_data_id) ? $data_template_rrd["data_template_id"] : $data_template_id);
+		if ($save["local_data_id"] == 0) {
+			$save["hash"]                   = get_hash_data_template($data_template_rrd["local_data_template_rrd_id"], "data_template_item");
+		} else {
+			$save["hash"] = '';
+		}
 
 		while (list($field, $array) = each($struct_data_source_item)) {
 			$save{$field} = $data_template_rrd{$field};



From rrakus at fedoraproject.org  Tue Dec  1 15:00:26 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue,  1 Dec 2009 15:00:26 +0000 (UTC)
Subject: rpms/yaboot/F-12 yaboot.spec,1.74,1.75
Message-ID: <20091201150026.D669B11C0396@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10249

Modified Files:
	yaboot.spec 
Log Message:
Changes for merge review


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- yaboot.spec	29 Oct 2009 10:58:41 -0000	1.74
+++ yaboot.spec	1 Dec 2009 15:00:26 -0000	1.75
@@ -1,7 +1,7 @@
-Summary: Linux bootloader for Power Macintosh "New World" computers.
+Summary: Linux bootloader for Power Macintosh "New World" computers
 Name: yaboot
 Version: 1.3.14
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -44,8 +44,7 @@ Patch38: yaboot-1.3.14-better_netboot2.p
 Patch39: yaboot-1.3.14-move_kernel.patch
 
 URL: http://yaboot.ozlabs.org/
-BuildRoot: %{_tmppath}/%{name}-root
-Obsoletes: ybin
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ExclusiveArch: ppc
 
 # hfsutils will not be in RHEL6.
@@ -96,18 +95,24 @@ yaboot can also bootload IBM pSeries mac
 %patch39 -p1 -b .movekernel
 
 %build
+iconv -f ISO88592 -t utf-8 -o doc/yaboot-howto.de.try.sgml \
+    doc/yaboot-howto.de.sgml && mv -f doc/yaboot-howto.de.try.sgml \
+    doc/yaboot-howto.de.sgml
 make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
 cp -a second/yaboot{,.debug}
 make clean
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %makeinstall ROOT=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=share/man SBINDIR=/sbin
 rm -f $RPM_BUILD_ROOT/etc/yaboot.conf
 touch $RPM_BUILD_ROOT/etc/yaboot.conf
 mkdir -p $RPM_BUILD_ROOT/boot
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT/boot/efika.forth
 install -m0644 second/yaboot.debug $RPM_BUILD_ROOT/usr/lib/yaboot/
+rm -f $RPM_BUILD_ROOT/usr/share/doc/yaboot-1.3.14/README.man.patch
+rm -f $RPM_BUILD_ROOT/usr/share/doc/yaboot-1.3.14/Makefile
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -120,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ybin
 /sbin/yabootconfig
 /sbin/mkofboot
+/usr/lib/yaboot/
 /usr/lib/yaboot/addnote
 /usr/lib/yaboot/ofboot
 /usr/lib/yaboot/yaboot
@@ -134,6 +140,14 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Tue Dec 01 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-24
+- Fixed summary, buildroot
+- Converted doc/yaboot-howto.de.sgml to utf8
+- Clear buildroot before install
+- Removed README.man.patch and Makefile from doc dir
+- Own /usr/lib/yaboot/
+- Fixes (#226661)
+
 * Thu Oct 29 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-23
 - When netbooting "clobber" the LOAD_BUFFER and move the kernel into it to make
   room for RTAS (#530330)



From hadess at fedoraproject.org  Tue Dec  1 15:02:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:02:45 +0000 (UTC)
Subject: rpms/evince/devel evince.spec,1.170,1.171
Message-ID: <20091201150245.CD48D11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	evince.spec 
Log Message:
Update API version for backends


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- evince.spec	1 Dec 2009 14:48:07 -0000	1.170
+++ evince.spec	1 Dec 2009 15:02:45 -0000	1.171
@@ -223,16 +223,16 @@ fi
 %{_libdir}/libevview.so.*
 %{_libdir}/libevdocument.so.*
 %dir %{_libdir}/evince
-%dir %{_libdir}/evince/1
-%dir %{_libdir}/evince/1/backends
-%{_libdir}/evince/1/backends/libpdfdocument.so
-%{_libdir}/evince/1/backends/pdfdocument.evince-backend
-%{_libdir}/evince/1/backends/libpsdocument.so
-%{_libdir}/evince/1/backends/psdocument.evince-backend
-%{_libdir}/evince/1/backends/libtiffdocument.so
-%{_libdir}/evince/1/backends/tiffdocument.evince-backend
-%{_libdir}/evince/1/backends/libcomicsdocument.so
-%{_libdir}/evince/1/backends/comicsdocument.evince-backend
+%dir %{_libdir}/evince/2
+%dir %{_libdir}/evince/2/backends
+%{_libdir}/evince/2/backends/libpdfdocument.so
+%{_libdir}/evince/2/backends/pdfdocument.evince-backend
+%{_libdir}/evince/2/backends/libpsdocument.so
+%{_libdir}/evince/2/backends/psdocument.evince-backend
+%{_libdir}/evince/2/backends/libtiffdocument.so
+%{_libdir}/evince/2/backends/tiffdocument.evince-backend
+%{_libdir}/evince/2/backends/libcomicsdocument.so
+%{_libdir}/evince/2/backends/comicsdocument.evince-backend
 
 %files devel
 %defattr(-,root,root,-)
@@ -248,13 +248,13 @@ fi
 
 %files dvi
 %defattr(-,root,root,-)
-%{_libdir}/evince/1/backends/libdvidocument.so*
-%{_libdir}/evince/1/backends/dvidocument.evince-backend
+%{_libdir}/evince/2/backends/libdvidocument.so*
+%{_libdir}/evince/2/backends/dvidocument.evince-backend
 
 %files djvu
 %defattr(-,root,root,-)
-%{_libdir}/evince/1/backends/libdjvudocument.so
-%{_libdir}/evince/1/backends/djvudocument.evince-backend
+%{_libdir}/evince/2/backends/libdjvudocument.so
+%{_libdir}/evince/2/backends/djvudocument.evince-backend
 
 %changelog
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1



From arbiter at fedoraproject.org  Tue Dec  1 15:02:49 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue,  1 Dec 2009 15:02:49 +0000 (UTC)
Subject: rpms/qt-creator/devel qt-creator.spec,1.17,1.18
Message-ID: <20091201150249.331EC11C00DE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	qt-creator.spec 
Log Message:
* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.0-2
- Force dependency on Qt >= 4.6.0



Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- qt-creator.spec	1 Dec 2009 14:41:17 -0000	1.17
+++ qt-creator.spec	1 Dec 2009 15:02:49 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           qt-creator
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -18,7 +18,7 @@ Requires:       hicolor-icon-theme
 Requires:       qt-demos
 Requires:       qt-examples
 
-BuildRequires:  qt4-devel >= 4.5.0
+BuildRequires:  qt4-devel >= 4.6.0
 BuildRequires:  desktop-file-utils
 
 %description
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/doc/qtcreator/qtcreator.qch
 
 %changelog
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.0-2
+- Force dependency on Qt >= 4.6.0
+
 * Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.0-1
 - 1.3.0 final
 



From mmcgrath at fedoraproject.org  Tue Dec  1 15:03:27 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 15:03:27 +0000 (UTC)
Subject: rpms/cacti/devel cacti.spec,1.30,1.31
Message-ID: <20091201150327.54FE711C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Log Message:
fixing patch name


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- cacti.spec	1 Dec 2009 14:59:05 -0000	1.30
+++ cacti.spec	1 Dec 2009 15:03:27 -0000	1.31
@@ -14,8 +14,7 @@ Source3: cacti.README.Fedora
 Patch0: cli_add_graph.patch
 Patch1: snmp_invalid_response.patch
 Patch2: template_duplication.patch
-Patch3: cross_site_fix.patchcross_site_fix.patch
-
+Patch3: cross_site_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From hadess at fedoraproject.org  Tue Dec  1 15:04:07 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:04:07 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec, 1.158,
	1.159 sticky-dnd.patch, 1.1, NONE
Message-ID: <20091201150407.BDF6511C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11300

Modified Files:
	file-roller.spec 
Removed Files:
	sticky-dnd.patch 
Log Message:
remove obsoleted patch


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- file-roller.spec	1 Dec 2009 14:48:36 -0000	1.158
+++ file-roller.spec	1 Dec 2009 15:04:07 -0000	1.159
@@ -17,9 +17,6 @@ Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
 Source:		http://download.gnome.org/sources/file-roller/2.28/file-roller-%{version}.tar.bz2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=590606
-Patch0:		sticky-dnd.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -54,7 +51,6 @@ such as tar or zip files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .sticky-dnd
 
 %build
 %configure --disable-scrollkeeper --disable-static


--- sticky-dnd.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Dec  1 15:05:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 15:05:08 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.42,
	1.43 kdebase-runtime.spec, 1.159, 1.160 sources, 1.42, 1.43
Message-ID: <20091201150508.7814E11C00DE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
- KDE 4.4 beta1 (4.3.80)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	24 Nov 2009 16:26:38 -0000	1.42
+++ .cvsignore	1 Dec 2009 15:05:08 -0000	1.43
@@ -1 +1 @@
-kdebase-runtime-4.3.75svn1048496.tar.bz2
+kdebase-runtime-4.3.80.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- kdebase-runtime.spec	30 Nov 2009 13:47:31 -0000	1.159
+++ kdebase-runtime.spec	1 Dec 2009 15:05:08 -0000	1.160
@@ -1,13 +1,11 @@
-%define alphatag svn1048496
-
 %if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.75
-Release:       0.2.%{alphatag}%{?dist}
+Version:       4.3.80
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -15,7 +13,7 @@ Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}%{?alphatag}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
 
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
@@ -228,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Mon Nov 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.2.svn1048496
 - BR libssh-devel >= 0.3.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	24 Nov 2009 16:26:39 -0000	1.42
+++ sources	1 Dec 2009 15:05:08 -0000	1.43
@@ -1 +1 @@
-60ee3045945de672bf593ddaab3dab32  kdebase-runtime-4.3.75svn1048496.tar.bz2
+a7e0ce1a6c1c58821566502e6c5dd58c  kdebase-runtime-4.3.80.tar.bz2



From mmcgrath at fedoraproject.org  Tue Dec  1 15:07:10 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 15:07:10 +0000 (UTC)
Subject: rpms/cacti/devel cacti.spec,1.31,1.32
Message-ID: <20091201150710.E9D2C11C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Log Message:
release bump


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- cacti.spec	1 Dec 2009 15:03:27 -0000	1.31
+++ cacti.spec	1 Dec 2009 15:07:10 -0000	1.32
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7e
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -113,7 +113,7 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-2
+* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-3
 - Pulling in some official patches
 - #541279
 - #541962



From hadess at fedoraproject.org  Tue Dec  1 15:08:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:08:32 +0000 (UTC)
Subject: File webkit-1.1.17.tar.gz uploaded to lookaside cache by hadess
Message-ID: <20091201150832.C9E0C10F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for webkitgtk:

9609c9b0f54c9f044177702d6006c359  webkit-1.1.17.tar.gz



From hadess at fedoraproject.org  Tue Dec  1 15:08:48 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:08:48 +0000 (UTC)
Subject: rpms/webkitgtk/devel .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 webkitgtk.spec, 1.25, 1.26
Message-ID: <20091201150848.A29BF11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore sources webkitgtk.spec 
Log Message:
* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 1.1.17-1
- Update to 1.1.17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 Sep 2009 03:20:20 -0000	1.11
+++ .cvsignore	1 Dec 2009 15:08:48 -0000	1.12
@@ -1 +1 @@
-webkit-1.1.15.1.tar.gz
+webkit-1.1.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Nov 2009 04:24:09 -0000	1.12
+++ sources	1 Dec 2009 15:08:48 -0000	1.13
@@ -1 +1 @@
-18736af3c751eb078fa3f4a7393cc864  webkit-1.1.15.3.tar.gz
+9609c9b0f54c9f044177702d6006c359  webkit-1.1.17.tar.gz


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- webkitgtk.spec	2 Nov 2009 04:24:09 -0000	1.25
+++ webkitgtk.spec	1 Dec 2009 15:08:48 -0000	1.26
@@ -34,7 +34,7 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.15.3
+Version:	1.1.17
 Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
@@ -197,6 +197,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 1.1.17-1
+- Update to 1.1.17
+
 * Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.3-1
 - Update to 1.1.15.3, more crash fixes and important media player fixes
 - See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000047.html



From hadess at fedoraproject.org  Tue Dec  1 15:09:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:09:09 +0000 (UTC)
Subject: rpms/gtksourceview2/devel gtksourceview2.spec,1.40,1.41
Message-ID: <20091201150909.AF72111C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gtksourceview2.spec 
Log Message:
add missing BR


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gtksourceview2.spec	1 Dec 2009 14:54:33 -0000	1.40
+++ gtksourceview2.spec	1 Dec 2009 15:09:09 -0000	1.41
@@ -14,6 +14,7 @@ URL: http://gtksourceview.sourceforge.ne
 Source0: http://download.gnome.org/sources/gtksourceview/2.8/gtksourceview-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel
+BuildRequires: GConf2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: intltool >= 0.35



From karsten at fedoraproject.org  Tue Dec  1 15:09:12 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  1 Dec 2009 15:09:12 +0000 (UTC)
Subject: rpms/automake/devel automake.spec,1.46,1.47
Message-ID: <20091201150912.9C78D11C00DE@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	automake.spec 
Log Message:
- preserve time stamps of man pages (#225302)
- drop MIT from list of licenses




Index: automake.spec
===================================================================
RCS file: /cvs/extras/rpms/automake/devel/automake.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- automake.spec	4 Nov 2009 17:40:13 -0000	1.46
+++ automake.spec	1 Dec 2009 15:09:12 -0000	1.47
@@ -3,8 +3,8 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
 Version:    %{api_version}
-Release:    5%{?dist}
-License:    GPLv2+ and GFDL and MIT 
+Release:    6%{?dist}
+License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
 Source1:    filter-provides-automake.sh
@@ -53,8 +53,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_mandir}/man1/automake.1
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man1/aclocal.1
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_mandir}/man1/automake.1
+install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man1/aclocal.1
 
 # create this dir empty so we can own it
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
@@ -85,6 +85,10 @@ fi
 %dir %{_datadir}/aclocal
 
 %changelog
+* Tue Dec 01 2009 Karsten Hopp <karsten at redhat.com> 1.11-6
+- preserve time stamps of man pages (#225302)
+- drop MIT from list of licenses
+
 * Wed Nov  4 2009 Stepan Kasal <skasal at redhat.com> - 1.11-5
 - add even more testsuite build requires
 



From sdz at fedoraproject.org  Tue Dec  1 15:09:40 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 15:09:40 +0000 (UTC)
Subject: rpms/sugar-presence-service/devel .cvsignore, 1.17, 1.18 sources,
	1.17, 1.18 sugar-presence-service.spec, 1.24, 1.25
Message-ID: <20091201150940.D910511C00DE@cvs1.fedora.phx.redhat.com>

Author: sdz

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

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	27 Sep 2009 17:22:06 -0000	1.17
+++ .cvsignore	1 Dec 2009 15:09:40 -0000	1.18
@@ -1 +1 @@
-sugar-presence-service-0.86.0.tar.bz2
+sugar-presence-service-0.87.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	27 Sep 2009 17:22:07 -0000	1.17
+++ sources	1 Dec 2009 15:09:40 -0000	1.18
@@ -1 +1 @@
-744c0486d7acdccbb0b6331827a1c165  sugar-presence-service-0.86.0.tar.bz2
+93beec602711d88d34409a5e7a86ed82  sugar-presence-service-0.87.1.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sugar-presence-service.spec	27 Sep 2009 17:22:07 -0000	1.24
+++ sugar-presence-service.spec	1 Dec 2009 15:09:40 -0000	1.25
@@ -1,5 +1,5 @@
 Name: sugar-presence-service
-Version: 0.86.0
+Version: 0.87.1
 Release: 1%{?dist}
 Summary: The Sugar presence service
 
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
+- New upstream release
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
 - New upstream release
 



From jussilehtola at fedoraproject.org  Tue Dec  1 15:11:05 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue,  1 Dec 2009 15:11:05 +0000 (UTC)
Subject: rpms/gromacs/devel gromacs.spec,1.14,1.15
Message-ID: <20091201151105.B602E11C00DE@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	gromacs.spec 
Log Message:
Enable mpich2.


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gromacs.spec	30 Nov 2009 16:11:19 -0000	1.14
+++ gromacs.spec	1 Dec 2009 15:11:05 -0000	1.15
@@ -118,39 +118,39 @@ This package contains development librar
 You need it if you want to write your own analysis programs.
 
 
-#%package mpich2
-#Summary:	GROMACS MPICH2 binaries and libraries
-#Group:		Applications/Engineering
-#Requires:	gromacs-common = %{version}-%{release}
-#Requires:	mpich2
-#
-#%description mpich2
-#GROMACS is a versatile and extremely well optimized package to perform
-#molecular dynamics computer simulations and subsequent trajectory analysis.
-#It is developed for biomolecules like proteins, but the extremely high
-#performance means it is used also in several other field like polymer chemistry
-#and solid state physics.
-#
-#This package provides MPICH2 single precision and double precision binaries
-#and libraries.
-
-
-#%package mpich2-devel
-#Summary:	GROMACS MPICH2 development libraries
-#Group:		Applications/Engineering
-#Requires:	gromacs-devel = %{version}-%{release}
-#BuildRequires:	mpich2-devel
-#Requires:	mpich2-devel
-#
-#%description mpich2-devel
-#GROMACS is a versatile and extremely well optimized package to perform
-#molecular dynamics computer simulations and subsequent trajectory analysis.
-#It is developed for biomolecules like proteins, but the extremely high
-#performance means it is used also in several other field like polymer chemistry
-#and solid state physics.
-#
-#This package contains development libraries for GROMACS MPICH2.
-#You need it if you want to write your own analysis programs.
+%package mpich2
+Summary:	GROMACS MPICH2 binaries and libraries
+Group:		Applications/Engineering
+Requires:	gromacs-common = %{version}-%{release}
+Requires:	mpich2
+
+%description mpich2
+GROMACS is a versatile and extremely well optimized package to perform
+molecular dynamics computer simulations and subsequent trajectory analysis.
+It is developed for biomolecules like proteins, but the extremely high
+performance means it is used also in several other field like polymer chemistry
+and solid state physics.
+
+This package provides MPICH2 single precision and double precision binaries
+and libraries.
+
+
+%package mpich2-devel
+Summary:	GROMACS MPICH2 development libraries
+Group:		Applications/Engineering
+Requires:	gromacs-devel = %{version}-%{release}
+BuildRequires:	mpich2-devel
+Requires:	mpich2-devel
+
+%description mpich2-devel
+GROMACS is a versatile and extremely well optimized package to perform
+molecular dynamics computer simulations and subsequent trajectory analysis.
+It is developed for biomolecules like proteins, but the extremely high
+performance means it is used also in several other field like polymer chemistry
+and solid state physics.
+
+This package contains development libraries for GROMACS MPICH2.
+You need it if you want to write your own analysis programs.
 
 
 
@@ -314,26 +314,26 @@ cd ..
 %{_openmpi_unload}
 
 ## MPICH2
-#{_mpich2_load}
+%{_mpich2_load}
 # single precision
-#mkdir mpich2-single
-#cd mpich2-single
-#sed "s|@LIBSUFFIX@|_mpi|g" < ../configure > configure; chmod 777 configure
-#configure $DEFOPTS $SINGLE $MPI --program-suffix=${MPI_SUFFIX} --bindir=${MPI_BIN} --libdir=${MPI_LIB}
-#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} mdrun
-#cd ..
+mkdir mpich2-single
+cd mpich2-single
+sed "s|@LIBSUFFIX@|_mpi|g" < ../configure > configure; chmod 777 configure
+%configure $DEFOPTS $SINGLE $MPI --program-suffix=${MPI_SUFFIX} --bindir=${MPI_BIN} --libdir=${MPI_LIB}
+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} mdrun
+cd ..
 # double precision
-#mkdir mpich2-double
-#cd mpich2-double
-#sed "s|@LIBSUFFIX@|_mpi_d|g" < ../configure > configure; chmod 777 configure
-#configure $DEFOPTS $DOUBLE $MPI --program-suffix=${MPI_SUFFIX}_d --bindir=${MPI_BIN} --libdir=${MPI_LIB}
-#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} mdrun
-#cd ..
-#{_mpich2_unload}
+mkdir mpich2-double
+cd mpich2-double
+sed "s|@LIBSUFFIX@|_mpi_d|g" < ../configure > configure; chmod 777 configure
+%configure $DEFOPTS $DOUBLE $MPI --program-suffix=${MPI_SUFFIX}_d --bindir=${MPI_BIN} --libdir=${MPI_LIB}
+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} mdrun
+cd ..
+%{_mpich2_unload}
 
 
 %install
@@ -353,16 +353,16 @@ cd ..
 %{_openmpi_unload}
 
 ## MPICH 2
-#{_mpich2_load}
+%{_mpich2_load}
 # single precision
-#cd mpich2-single
-#make DESTDIR=%{buildroot} INSTALL="install -p" BINDIR=${MPI_BIN} LIBDIR=${MPI_LIB} install-mdrun
-#cd ..
+cd mpich2-single
+make DESTDIR=%{buildroot} INSTALL="install -p" BINDIR=${MPI_BIN} LIBDIR=${MPI_LIB} install-mdrun
+cd ..
 # double precision
-#cd mpich2-double
-#make DESTDIR=%{buildroot} INSTALL="install -p" BINDIR=${MPI_BIN} LIBDIR=${MPI_LIB} install-mdrun
-#cd ..
-#{_mpich2_unload}
+cd mpich2-double
+make DESTDIR=%{buildroot} INSTALL="install -p" BINDIR=${MPI_BIN} LIBDIR=${MPI_LIB} install-mdrun
+cd ..
+%{_mpich2_unload}
 
 
 ## Serial versions
@@ -485,14 +485,14 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/openmpi/lib/lib*.so
 
-#%files mpich2
-#%defattr(-,root,root,-)
-#%{_libdir}/mpich2/bin/g_mdrun*
-#%{_libdir}/mpich2/lib/lib*.so.*
-
-#%files mpich2-devel
-#%defattr(-,root,root,-)
-#%{_libdir}/mpich2/lib/lib*.so
+%files mpich2
+%defattr(-,root,root,-)
+%{_libdir}/mpich2/bin/g_mdrun*
+%{_libdir}/mpich2/lib/lib*.so.*
+
+%files mpich2-devel
+%defattr(-,root,root,-)
+%{_libdir}/mpich2/lib/lib*.so
 
 %files zsh
 %defattr(-,root,root,-)
@@ -517,8 +517,7 @@ rm -rf %{buildroot}
 * Mon Nov 30 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-3
 - Combine libs with binaries and drop debug packages to avoid explosion of
   number of packages.
-- Adopt use of MPI guidelines. MPICH2 support still missing due to broken
-  mpich2 package.
+- Adopt use of MPI guidelines.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pbrobinson at fedoraproject.org  Tue Dec  1 15:11:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  1 Dec 2009 15:11:29 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.36,1.37
Message-ID: <20091201151129.A5CD711C00DE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	nbtk.spec 
Log Message:
- Bump release


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- nbtk.spec	1 Dec 2009 06:18:02 -0000	1.36
+++ nbtk.spec	1 Dec 2009 15:11:29 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        1.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -41,7 +41,6 @@ Files for development with %{name}.
 %setup -q
 
 %build
-autoreconf
 %configure --enable-gtk-doc --disable-static
 make %{?_smp_mflags} V=1
 
@@ -78,7 +77,10 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
-* Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 1.2.3-1
+* Tue Dec  1 2009 Peter Robinson <pbrobinson at gmail.com> 1.2.3-2
+- Bump release
+
+* Tue Dec  1 2009 Peter Robinson <pbrobinson at gmail.com> 1.2.3-1
 - New upstream 1.2.3 stable release, move to a proper tarball
 
 * Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 1.2.1-1



From kasal at fedoraproject.org  Tue Dec  1 15:14:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  1 Dec 2009 15:14:57 +0000 (UTC)
Subject: rpms/perl/devel perl-update-Compress-Raw-Zlib.patch, NONE,
	1.1 perl-update-IO-Compress-Base.patch, NONE,
	1.1 perl-update-IO-Compress-Zlib.patch, NONE, 1.1 perl.spec,
	1.236, 1.237 perl-update-Compress_Raw_Zlib.patch, 1.1, NONE
Message-ID: <20091201151457.1632611C00DE@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	perl.spec 
Added Files:
	perl-update-Compress-Raw-Zlib.patch 
	perl-update-IO-Compress-Base.patch 
	perl-update-IO-Compress-Zlib.patch 
Removed Files:
	perl-update-Compress_Raw_Zlib.patch 
Log Message:
- fix patch-update-Compress-Raw-Zlib.patch (did not patch Zlib.pm)
- update Compress::Raw::Zlib to 2.023
- update IO::Compress::Base, and IO::Compress::Zlib to 2.015 (#542645)

perl-update-Compress-Raw-Zlib.patch:
 MANIFEST                                       |    1 
 ext/Compress/Raw/Zlib/Changes                  |   67 +++++
 ext/Compress/Raw/Zlib/Makefile.PL              |   13 -
 ext/Compress/Raw/Zlib/README                   |   83 ++----
 ext/Compress/Raw/Zlib/Zlib.xs                  |  116 +++++++--
 ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm |  307 +++++++++++++++++++++----
 ext/Compress/Raw/Zlib/t/02zlib.t               |  157 ++++++++++++
 ext/Compress/Raw/Zlib/t/09limitoutput.t        |  129 ++++++++++
 8 files changed, 728 insertions(+), 145 deletions(-)

--- NEW FILE perl-update-Compress-Raw-Zlib.patch ---
Compress-Raw-Zlib-2.023
(omitting changes to private/MakeUtil.pm)
(omitting changes to perl-5.10.0/t/lib/compress; these are in
IO-Compress-Base 2.015 update)

diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2009-12-01 14:46:37.000000000 +0100
+++ perl-5.10.0/MANIFEST	2009-12-01 15:43:34.000000000 +0100
@@ -124,6 +124,7 @@
 ext/Compress/Raw/Zlib/t/01version.t	Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/t/02zlib.t	Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/t/07bufsize.t	Compress::Raw::Zlib
+ext/Compress/Raw/Zlib/t/09limitoutput.t	Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/t/18lvalue.t	Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/typemap		Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/zlib-src/adler32.c	Compress::Raw::Zlib
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Changes perl-5.10.0/ext/Compress/Raw/Zlib/Changes
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Changes	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/Changes	2009-12-01 15:38:24.000000000 +0100
@@ -1,6 +1,73 @@
 CHANGES
 -------
 
+  2.023 9 November 2009
+
+      * fixed instance where $[ should have been $] in t/02zlib.t
+        Thanks to Robin Barker and zefram [RT #50765] for independantly
+        spotting the issue.
+
+  2.021 30 August 2009
+
+      * Changed test harness so that it can cope with PERL5OPT=-MCarp=verbose
+        [RT# 47225]
+
+  2.020 3 June 2009
+
+      * Minor documentation update.
+
+  2.019 4 May 2009
+
+      * No Changes
+
+  2.018 3 May 2009
+
+      * No Changes
+
+  2.017 28 March 2009
+
+      * Added 'LimitOutput' option
+
+      * Removed MAN3PODS from Makefile.PL
+
+      * Fixed coring issue when LimitOutput was used.
+
+      * Documented Compress::Raw::Zlib::zlib_version()
+
+      * Documented Compress::Raw::Zlib::deflateReset()
+        [RT #40566]
+
+  2.015 3 September 2008
+
+      * Makefile.PL
+        Backout changes made in 2.014
+
+  2.014 2 September 2008
+
+      * Makefile.PL
+        Updated to check for indirect dependencies.
+
+  2.012 15 July 2008
+
+      * Document the gzip flags that WindowBits can take.
+
+      * Allow a dictionary to be used with a raw inflate. 
+        Needs zlib 1.2.2.1 or better.
+        [RT #36046]
+      
+  2.011 5 May 2008
+
+      * A C++-style comment sneaked in with the last update. Fixed.
+        [core patch #33828]
+
+  2.010 5 May 2008
+
+      * No Changes
+
+  2.009 20 April 2008
+
+      * No Changes
+
   2.008 2 November 2007
 
       * Minor documentation changes in README
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Makefile.PL perl-5.10.0/ext/Compress/Raw/Zlib/Makefile.PL
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Makefile.PL	2009-12-01 14:47:16.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/Makefile.PL	2009-12-01 15:38:24.000000000 +0100
@@ -77,24 +77,11 @@
                     },
 
     (
-      $ENV{SKIP_FOR_CORE}
-        ? (MAN3PODS    => {})
-        : ()
-    ),
-       
-    (
       $BUILD_ZLIB
         ? zlib_files($ZLIB_LIB)
         : (LIBS => [ "-L$ZLIB_LIB -lz " ])
     ),
       
-    (
-      $] >= 5.005
-        ? (ABSTRACT_FROM => 'lib/Compress/Raw/Zlib.pm',
-            AUTHOR       => 'Paul Marquess <pmqs at cpan.org>')
-        : ()
-    ),
-
     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
 
     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/README perl-5.10.0/ext/Compress/Raw/Zlib/README
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/README	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/README	2009-12-01 15:38:24.000000000 +0100
@@ -1,16 +1,14 @@
 
                              Compress-Raw-Zlib
 
-                             Version 2.008
+                             Version 2.023
 
-                             2nd November 2007
+                             9th November 2009
 
-
-       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+       Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
            and/or modify it under the same terms as Perl itself.
 
-
               The directory zlib-src contains a subset of the 
              source files copied directly from zlib version 1.2.3.
                   These files are Copyright(C) 1995-2005
@@ -18,39 +16,27 @@
              Full source for the zlib library is available at
                             http://www.zlib.org
 
-
-
 DESCRIPTION
 -----------
 
-
 This module provides a Perl interface to the zlib compression library.  
 
-
-
-
-
 PREREQUISITES
 -------------
 
 Before you can build Compress-Raw-Zlib you need to have the following
 installed on your system:
 
-
     * A C compiler
 
     * Perl 5.004 or better. 
 
-
-
 By default, Compress-Raw-Zlib will build its own private copy of the 
 zlib library. If you want to use a different version of 
 zlib, follow the instructions in the section called 
 "Controlling the version of zlib used by Compress-Raw-Zlib" 
 later in this document.
 
-
-
 BUILDING THE MODULE
 -------------------
 
@@ -61,8 +47,6 @@
     make
     make test
 
-
-
 INSTALLATION
 ------------
 
@@ -70,9 +54,6 @@
 
     make install
 
-
-
-
 Controlling the version of zlib used by Compress-Raw-Zlib 
 ----------------------------------------------------------
 
@@ -92,7 +73,6 @@
 Note that if you intend to use either Option 2 or 3, you need to have
 zlib version 1.0.5 or better.
 
-
 The contents of the file config.in are used to control which of the
 three options is actually used. This file is read during the
 
@@ -101,8 +81,6 @@
 step of the build, so remember to make any required changes to config.in
 before building this module.
 
-
-
   Option 1
   --------
   
@@ -169,10 +147,9 @@
 ------------------------
 
 Every gzip stream stores a byte in its header to identify the Operating
-System that was used to create the gzip stream. When you build
-Compress-Raw-Zlib it will attempt to determine the value that is correct for
-your Operating System. This will then be used by IO::Gzip as the default
-value for the OS byte in all gzip headers it creates. 
+System that was used to create the gzip stream. When you build Compress-Raw-Zlib it will attempt to determine the value that is correct for
+your Operating System. This will then be used by IO::Compress::Gzip as the
+default value for the OS byte in all gzip headers it creates. 
  
 The variable GZIP_OS_CODE in the config.in file controls the setting of
 this value when building Compress-Raw-Zlib. If GZIP_OS_CODE is set to
@@ -197,16 +174,37 @@
 detected is incorrect, please take a few moments to contact the author of
 this module.
 
-
-
 TROUBLESHOOTING
 ---------------
 
+Undefined Symbol gzsetparams
+----------------------------
 
+If you get the error shown below when you run the Compress-Raw-Zlib test
+harness it probably means you are running a copy of zlib that is
+version 1.0.5 or older.
 
+t/01version.........Can't load 'blib/arch/auto/Compress/Zlib/Zlib.so' for 
+                    module Compress::Raw::Zlib: blib/arch/auto/Compress/Raw/Zlib/Zlib.so:
+                    undefined symbol: gzsetparams at ...
 
+There are two ways to fix this problem:
 
+    1. Upgrade to the latest version of zlib.
 
+    2. Edit config.in and set the OLD_ZLIB variable to True.
+
+Test Harness 01version fails
+----------------------------
+If the 01version test harness fails, and the problem isn't covered by the
+scenario above, it probably means that you have two versions of 
+zlib installed on your system.
+
+Run the command below to see if this is indeed the case
+
+    make test TEST_VERBOSE=1 TEST_FILES=t/01version.t 
+
+Try removing the one you don't want to use and rebuild.   
 
 Solaris build fails with "language optional software package not installed"
 ---------------------------------------------------------------------------
@@ -245,9 +243,6 @@
 If that doesn't work for you, it's time to make changes to the Makefile
 by hand. Good luck!
 
-
-
-
 Solaris build fails with "gcc: unrecognized option `-KPIC'"
 -----------------------------------------------------------
 
@@ -285,10 +280,6 @@
 is necessary to have first built the zlib library with the -fpic
 option.
 
-
-
-
-
 Linux Notes
 -----------
 
@@ -307,9 +298,6 @@
 for zlib. Check for an RPM that start with "zlib-devel" in your Linux
 distribution.
 
-
-
-
 Win32 Notes
 -----------
 
@@ -318,15 +306,11 @@
 newer version of Compress-Raw-Zlib is available run this from the command
 prompt
 
-    C:\> ppm verify -upgrade Compress-Zlib
-
+    C:\> ppm verify -upgrade Compress-Raw-Zlib
 
 If you are not running Activestate Perl and you don't have access
 to a C compiler, you will not be able to build and install this module.
 
-
-
-
 Win32 & Cygwin Notes
 --------------------
 
@@ -338,7 +322,6 @@
 The workaround is to install Compress-Raw-Zlib manually using the
 instructions given at the start of this file.
 
-
 FEEDBACK
 --------
 
@@ -372,8 +355,7 @@
         If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm
         for a line like this:
 
-          $VERSION = "2.008" ;
-
+          $VERSION = "2.023" ;
 
      c. The version of zlib you have used.
         If you have successfully installed Compress-Raw-Zlib, this one-liner
@@ -381,10 +363,8 @@
 
           perl -MCompress::Raw::Zlib -e "print q[zlib ver ]. Compress::Raw::Zlib::ZLIB_VERSION.qq[\n]" 
 
-
         If not, look at the beginning of the file zlib.h. 
 
-
  2. If you are having problems building Compress-Raw-Zlib, send me a
     complete log of what happened. Start by unpacking the Compress-Raw-Zlib
     module into a fresh directory and keep a log of all the steps
@@ -394,5 +374,4 @@
         make
         make test TEST_VERBOSE=1          
 
-
 Paul Marquess <pmqs at cpan.org>
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Zlib.xs perl-5.10.0/ext/Compress/Raw/Zlib/Zlib.xs
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Zlib.xs	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/Zlib.xs	2009-12-01 15:38:24.000000000 +0100
@@ -3,7 +3,7 @@
  * Created : 22nd January 1996
  * Version : 2.000
  *
- *   Copyright (c) 1995-2007 Paul Marquess. All rights reserved.
+ *   Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
  *   This program is free software; you can redistribute it and/or
  *   modify it under the same terms as Perl itself.
  *
@@ -50,6 +50,10 @@
 #  define AT_LEAST_ZLIB_1_2_2_1
 #endif
 
+#if  defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1222
+#  define AT_LEAST_ZLIB_1_2_2_2
+#endif
+
 #if  defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1223
 #  define AT_LEAST_ZLIB_1_2_2_3
 #endif
@@ -64,6 +68,11 @@
 #  include "ppport.h"
 #endif
 
+#if PERL_REVISION == 5 && PERL_VERSION == 9
+    /* For Andreas */
+#   define sv_pvbyte_force(sv,lp) sv_pvbyten_force(sv,lp)
+#endif
+
 #if PERL_REVISION == 5 && (PERL_VERSION < 8 || (PERL_VERSION == 8 && PERL_SUBVERSION < 4 ))
 
 #    ifdef SvPVbyte_force
@@ -103,6 +112,7 @@
 #define FLAG_CRC32              2
 #define FLAG_ADLER32            4
 #define FLAG_CONSUME_INPUT      8
+#define FLAG_LIMIT_OUTPUT       16
     uLong    crc32 ;
     uLong    adler32 ;
     z_stream stream;
@@ -228,7 +238,8 @@
 #define adlerInitial adler32(0L, Z_NULL, 0)
 #define crcInitial crc32(0L, Z_NULL, 0)
 
-static const char * const my_z_errmsg[] = {
+/* static const char * const my_z_errmsg[] = { */
+static const char my_z_errmsg[][32] = {
     "need dictionary",     /* Z_NEED_DICT     2 */
     "stream end",          /* Z_STREAM_END    1 */
     "",                    /* Z_OK            0 */
@@ -460,6 +471,8 @@
         printf("           CRC32     %s\n",   EnDis(FLAG_CRC32));
         printf("           ADLER32   %s\n",   EnDis(FLAG_ADLER32));
         printf("           CONSUME   %s\n",   EnDis(FLAG_CONSUME_INPUT));
+        printf("           LIMIT     %s\n",   EnDis(FLAG_LIMIT_OUTPUT));
+
 
 #ifdef MAGIC_APPEND
         printf("    window           0x%p\n", s->window);
@@ -510,7 +523,7 @@
 
 static SV* 
 #ifdef CAN_PROTOTYPE
-deRef(SV * sv, char * string)
+deRef(SV * sv, const char * string)
 #else
 deRef(sv, string)
 SV * sv ;
@@ -528,6 +541,8 @@
             case SVt_PVHV:
             case SVt_PVCV:
                 croak("%s: buffer parameter is not a SCALAR reference", string);
+            default:
+                break;
         }
         if (SvROK(sv))
             croak("%s: buffer parameter is a reference to a reference", string) ;
@@ -542,7 +557,7 @@
 
 static SV*
 #ifdef CAN_PROTOTYPE
-deRef_l(SV * sv, char * string)
+deRef_l(SV * sv, const char * string)
 #else
 deRef_l(sv, string)
 SV * sv ;
@@ -565,6 +580,8 @@
             case SVt_PVHV:
             case SVt_PVCV:
                 croak("%s: buffer parameter is not a SCALAR reference", string);
+            default:
+                break;
         }
         if (SvROK(sv))
             croak("%s: buffer parameter is a reference to a reference", string) ;
@@ -802,6 +819,19 @@
             s = NULL ;
 	}
 	else if (SvCUR(dictionary)) {
+#ifdef AT_LEAST_ZLIB_1_2_2_1
+        /* Zlib 1.2.2.1 or better allows a dictionary with raw inflate */
+        if (s->WindowBits < 0) {
+            err = inflateSetDictionary(&(s->stream), 
+                (const Bytef*)SvPVbyte_nolen(dictionary),
+                SvCUR(dictionary));
+            if (err != Z_OK) {
+                Safefree(s) ;
+                s = NULL ;
+            }
+        }
+        else
+#endif   
             /* Dictionary specified - take a copy for use in inflate */
 	    s->dictionary = newSVsv(dictionary) ;
 	}
@@ -1246,7 +1276,7 @@
     bool 	eof 
     uInt	cur_length = 0;
     uInt	prefix_length = 0;
-    uInt	increment = 0;
+    int	    increment = 0;
     STRLEN  stmp    = NO_INIT
     uLong     bufinc = NO_INIT
   PREINIT:
@@ -1280,22 +1310,39 @@
     if((s->flags & FLAG_APPEND) != FLAG_APPEND) {
         SvCUR_set(output, 0);
     }
+   
+    /* Assume no output buffer - the code below will update if there is any available */
+    s->stream.avail_out = 0;
+
+
     if (SvLEN(output)) {
         prefix_length = cur_length =  SvCUR(output) ;
-        s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length;
-        increment = SvLEN(output) -  cur_length - 1;
-        s->stream.avail_out = increment;
-    }
-    else {
-        s->stream.avail_out = 0;
+    
+        if (s->flags & FLAG_LIMIT_OUTPUT && SvLEN(output) - cur_length - 1 < bufinc)
+        {
+            Sv_Grow(output, bufinc + cur_length + 1) ;
+        }
+    
+        /* Only setup the stream output pointers if there is spare 
+           capacity in the outout SV
+        */
+        if (SvLEN(output) > cur_length + 1)
+        {
+            s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length;
+            increment = SvLEN(output) -  cur_length - 1;
+            s->stream.avail_out = increment;
+        }
     }
+    
+
     s->bytesInflated = 0;
     
-    while (1) {
+    RETVAL = Z_OK;
 
-        if (s->stream.avail_out == 0 ) {
+    while (RETVAL == Z_OK) {
+        if (s->stream.avail_out == 0) {
 	    /* out of space in the output buffer so make it bigger */
-            Sv_Grow(output, SvLEN(output) + bufinc) ;
+            Sv_Grow(output, SvLEN(output) + bufinc +1) ;
             cur_length += increment ;
             s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length ;
             increment = bufinc ;
@@ -1303,10 +1350,30 @@
             bufinc *= 2 ; 
         }
 
+        /* printf("INFLATE Availl In %d, Out %d\n", s->stream.avail_in,
+ s->stream.avail_out); 
+DispStream(s, "BEFORE");
+Perl_sv_dump(output); */
         RETVAL = inflate(&(s->stream), Z_SYNC_FLUSH);
+        /* printf("INFLATE returned %d %s, avail in %d, out %d\n", RETVAL,
+ GetErrorString(RETVAL), s->stream.avail_in, s->stream.avail_out); */
+
+    
+        if (RETVAL == Z_NEED_DICT && s->dictionary) {
+            s->dict_adler = s->stream.adler ;
+            RETVAL = inflateSetDictionary(&(s->stream), 
+            (const Bytef*)SvPVbyte_nolen(s->dictionary),
+            SvCUR(s->dictionary));
+            if (RETVAL == Z_OK)
+                continue;
+        }
+        
+        if (s->flags & FLAG_LIMIT_OUTPUT && 
+                (RETVAL == Z_OK || RETVAL == Z_BUF_ERROR ))
+            break;
 
         if (RETVAL == Z_STREAM_ERROR || RETVAL == Z_MEM_ERROR ||
-            RETVAL == Z_DATA_ERROR  || RETVAL == Z_STREAM_END )
+            RETVAL == Z_DATA_ERROR   || RETVAL == Z_STREAM_END )
             break ;
 
         if (RETVAL == Z_BUF_ERROR) {
@@ -1317,19 +1384,9 @@
                 break ;
             }
         }
-	
-        if (RETVAL == Z_NEED_DICT && s->dictionary) {
-            s->dict_adler = s->stream.adler ;
-            RETVAL = inflateSetDictionary(&(s->stream), 
-            (const Bytef*)SvPVbyte_nolen(s->dictionary),
-            SvCUR(s->dictionary));
-        }
-
-        if (RETVAL != Z_OK) 
-            break;
     }
 #ifdef NEED_DUMMY_BYTE_AT_END 
-    if (eof && RETVAL == Z_OK) {
+    if (eof && RETVAL == Z_OK && s->flags & FLAG_LIMIT_OUTPUT == 0) {
         Bytef* nextIn =  s->stream.next_in;
         uInt availIn =  s->stream.avail_in;
         s->stream.next_in = (Bytef*) " ";
@@ -1350,8 +1407,8 @@
 #endif
     
     s->last_error = RETVAL ;
-    if (RETVAL == Z_OK || RETVAL == Z_STREAM_END || RETVAL == Z_DATA_ERROR) {
-	unsigned in ;
+    if (RETVAL == Z_OK || RETVAL == Z_STREAM_END || RETVAL == Z_BUF_ERROR || RETVAL == Z_DATA_ERROR) {
+	   unsigned in ;
 
         s->bytesInflated = cur_length + increment - s->stream.avail_out - prefix_length;
         s->uncompressedBytes += s->bytesInflated ;
@@ -1377,7 +1434,7 @@
             			SvCUR(output)-prefix_length) ;
 
 	/* fix the input buffer */
-	if (s->flags & FLAG_CONSUME_INPUT) {
+	if (s->flags & FLAG_CONSUME_INPUT || s->flags & FLAG_LIMIT_OUTPUT) {
 	    in = s->stream.avail_in ;
 	    SvCUR_set(buf, in) ;
 	    if (in)
@@ -1385,6 +1442,7 @@
             *SvEND(buf) = '\0';
             SvSETMAGIC(buf);
 	}
+
     }
     OUTPUT:
 	RETVAL
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm perl-5.10.0/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm	2009-12-01 15:38:24.000000000 +0100
@@ -13,7 +13,7 @@
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.008';
+$VERSION = '2.023';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -62,8 +62,13 @@
         Z_SYNC_FLUSH
         Z_UNKNOWN
         Z_VERSION_ERROR
+
+        WANT_GZIP
+        WANT_GZIP_OR_ZLIB
 );
 
+use constant WANT_GZIP           => 16;
+use constant WANT_GZIP_OR_ZLIB   => 32;
 
 sub AUTOLOAD {
     my($constname);
@@ -79,6 +84,7 @@
 use constant FLAG_CRC                => 2 ;
 use constant FLAG_ADLER              => 4 ;
 use constant FLAG_CONSUME_INPUT      => 8 ;
+use constant FLAG_LIMIT_OUTPUT       => 16 ;
 
 eval {
     require XSLoader;
@@ -361,10 +367,14 @@
     $flags |= FLAG_CRC    if $got->value('CRC32') ;
     $flags |= FLAG_ADLER  if $got->value('ADLER32') ;
 
+    my $windowBits =  $got->value('WindowBits');
+    $windowBits += MAX_WBITS()
+        if ($windowBits & MAX_WBITS()) == 0 ;
+
     _deflateInit($flags,
                 $got->value('Level'), 
                 $got->value('Method'), 
-                $got->value('WindowBits'), 
+                $windowBits, 
                 $got->value('MemLevel'), 
                 $got->value('Strategy'), 
                 $got->value('Bufsize'),
@@ -378,6 +388,7 @@
     my ($got) = ParseParameters(0,
                     {
                         'AppendOutput'  => [1, 1, Parse_boolean,  0],
+                        'LimitOutput'   => [1, 1, Parse_boolean,  0],
                         'CRC32'         => [1, 1, Parse_boolean,  0],
                         'ADLER32'       => [1, 1, Parse_boolean,  0],
                         'ConsumeInput'  => [1, 1, Parse_boolean,  1],
@@ -397,8 +408,14 @@
     $flags |= FLAG_CRC    if $got->value('CRC32') ;
     $flags |= FLAG_ADLER  if $got->value('ADLER32') ;
     $flags |= FLAG_CONSUME_INPUT if $got->value('ConsumeInput') ;
+    $flags |= FLAG_LIMIT_OUTPUT if $got->value('LimitOutput') ;
+
+
+    my $windowBits =  $got->value('WindowBits');
+    $windowBits += MAX_WBITS()
+        if ($windowBits & MAX_WBITS()) == 0 ;
 
-    _inflateInit($flags, $got->value('WindowBits'), $got->value('Bufsize'), 
+    _inflateInit($flags, $windowBits, $got->value('Bufsize'), 
                  $got->value('Dictionary')) ;
 }
 
@@ -530,6 +547,7 @@
     ($d, $status) = new Compress::Raw::Zlib::Deflate( [OPT] ) ;
     $status = $d->deflate($input, $output) ;
     $status = $d->flush($output [, $flush_type]) ;
+    $d->deflateReset() ;
     $d->deflateParams(OPTS) ;
     $d->deflateTune(OPTS) ;
     $d->dict_adler() ;
@@ -559,8 +577,7 @@
     $crc = adler32_combine($crc1, $crc2, $len2)l
     $crc = crc32_combine($adler1, $adler2, $len2)
 
-    ZLIB_VERSION
-    ZLIB_VERNUM
+    my $version = Compress::Raw::Zlib::zlib_version();
 
 =head1 DESCRIPTION
 
@@ -568,8 +585,6 @@
 compression library (see L</AUTHOR> for details about where to get
 I<zlib>). 
 
-
-
 =head1 Compress::Raw::Zlib::Deflate
 
 This section defines an interface that allows in-memory compression using
@@ -577,7 +592,6 @@
 
 Here is a definition of the interface available:
 
-
 =head2 B<($d, $status) = new Compress::Raw::Zlib::Deflate( [OPT] ) >
 
 Initialises a deflation object. 
@@ -610,7 +624,7 @@
 C<Z_NO_COMPRESSION>, C<Z_BEST_SPEED>, C<Z_BEST_COMPRESSION>, and
 C<Z_DEFAULT_COMPRESSION>.
 
-The default is Z_DEFAULT_COMPRESSION.
+The default is C<Z_DEFAULT_COMPRESSION>.
 
 =item B<-Method>
 
@@ -619,10 +633,18 @@
 
 =item B<-WindowBits>
 
+To compress an RFC 1950 data stream, set C<WindowBits> to a positive
+number between 8 and 15.
+
+To compress an RFC 1951 data stream, set C<WindowBits> to C<-MAX_WBITS>.
+
+To compress an RFC 1952 data stream (i.e. gzip), set C<WindowBits> to
+C<WANT_GZIP>.
+
 For a definition of the meaning and valid values for C<WindowBits>
 refer to the I<zlib> documentation for I<deflateInit2>.
 
-Defaults to MAX_WBITS.
+Defaults to C<MAX_WBITS>.
 
 =item B<-MemLevel>
 
@@ -678,7 +700,6 @@
 
 This option defaults to false.
 
-
 =item B<-ADLER32>
 
 If set to true, an adler32 checksum of the uncompressed data will be
@@ -686,7 +707,6 @@
 
 This option defaults to false.
 
-
 =back
 
 Here is an example of using the C<Compress::Raw::Zlib::Deflate> optional
@@ -696,7 +716,6 @@
     my $d = new Compress::Raw::Zlib::Deflate ( -Bufsize => 300, 
                                                -Level   => Z_BEST_SPEED ) ;
 
-
 =head2 B<$status = $d-E<gt>deflate($input, $output)>
 
 Deflates the contents of C<$input> and writes the compressed data to
@@ -744,6 +763,16 @@
 it is false, C<$output> will be truncated before any compressed data is
 written to it.
 
+=head2 B<$status = $d-E<gt>deflateReset() >
+
+This method will reset the deflation object C<$d>. It can be used when you
+are compressing multiple data streams and want to use the same object to
+compress each of them. It should only be used once the previous data stream
+has been flushed successfully, i.e. a call to C<< $d->flush(Z_FINISH) >> has
+returned C<Z_OK>.
+
+Returns C<Z_OK> if successful.
+
 =head2 B<$status = $d-E<gt>deflateParams([OPT])>
 
 Change settings for the deflate object C<$d>.
@@ -751,7 +780,6 @@
 The list of the valid options is shown below. Options not specified
 will remain unchanged.
 
-
 =over 5
 
 =item B<-Level>
@@ -772,7 +800,6 @@
 reallocated to increase the size, it will grow in increments of
 C<Bufsize>.
 
-
 =back
 
 =head2 B<$status = $d-E<gt>deflateTune($good_length, $max_lazy, $nice_length, $max_chain)>
@@ -815,7 +842,6 @@
 Returns the deflation strategy currently used. Valid values are
 C<Z_DEFAULT_STRATEGY>, C<Z_FILTERED> and C<Z_HUFFMAN_ONLY>. 
 
-
 =head2 B<$d-E<gt>get_Level()>
 
 Returns the compression level being used. 
@@ -826,7 +852,6 @@
 
 =head2 Example
 
-
 Here is a trivial example of using C<deflate>. It simply reads standard
 input, deflates it and writes it to standard output.
 
@@ -865,7 +890,6 @@
 
 Here is a definition of the interface:
 
-
 =head2 B< ($i, $status) = new Compress::Raw::Zlib::Inflate( [OPT] ) >
 
 Initialises an inflation object. 
@@ -894,14 +918,20 @@
 =item B<-WindowBits>
 
 To uncompress an RFC 1950 data stream, set C<WindowBits> to a positive
-number.
+number between 8 and 15.
 
 To uncompress an RFC 1951 data stream, set C<WindowBits> to C<-MAX_WBITS>.
 
+To uncompress an RFC 1952 data stream (i.e. gzip), set C<WindowBits> to
+C<WANT_GZIP>.
+
+To auto-detect and uncompress an RFC 1950 or RFC 1952 data stream (i.e.
+gzip), set C<WindowBits> to C<WANT_GZIP_OR_ZLIB>.
+
 For a full definition of the meaning and valid values for C<WindowBits>
 refer to the I<zlib> documentation for I<inflateInit2>.
 
-Defaults to MAX_WBITS.
+Defaults to C<MAX_WBITS>.
 
 =item B<-Bufsize>
 
@@ -928,7 +958,6 @@
 
 This option defaults to false.
 
-
 =item B<-CRC32>
 
 If set to true, a crc32 checksum of the uncompressed data will be
@@ -946,7 +975,7 @@
 =item B<-ConsumeInput>
 
 If set to true, this option will remove compressed data from the input
-buffer of the the C< $i-E<gt>inflate > method as the inflate progresses.
+buffer of the C<< $i->inflate >> method as the inflate progresses.
 
 This option can be useful when you are processing compressed data that is
 embedded in another file/buffer. In this case the data that immediately
@@ -954,6 +983,29 @@
 
 This option defaults to true.
 
+=item B<-LimitOutput>
+
+The C<LimitOutput> option changes the behavior of the C<< $i->inflate >>
+method so that the amount of memory used by the output buffer can be
+limited. 
+
+When C<LimitOutput> is used the size of the output buffer used will either
+be the value of the C<Bufsize> option or the amount of memory already
+allocated to C<$output>, whichever is larger. Predicting the output size
+available is tricky, so don't rely on getting an exact output buffer size.
+
+When C<LimitOutout> is not specified C<< $i->inflate >> will use as much
+memory as it takes to write all the uncompressed data it creates by
+uncompressing the input buffer.
+
+If C<LimitOutput> is enabled, the C<ConsumeInput> option will also be
+enabled.
+
+This option defaults to false.
+
+See L</The LimitOutput option> for a discussion on why C<LimitOutput> is
+needed and how to use it.
+
 =back
 
 Here is an example of using an optional parameter to override the default
@@ -1048,7 +1100,6 @@
 data streams. They must have been added explicitly when the data stream
 was created by calling C<Compress::Deflate::flush>  with C<Z_FULL_FLUSH>.
 
-
 =head2 B<$i-E<gt>dict_adler()>
 
 Returns the adler32 value for the dictionary.
@@ -1083,7 +1134,7 @@
 
 Returns the buffer size used to carry out the decompression.
 
-=head2 Example
+=head2 Examples
 
 Here is an example of using C<inflate>.
 
@@ -1102,10 +1153,9 @@
     my ($output, $status) ;
     while (read(STDIN, $input, 4096))
     {
-        $status = $x->inflate(\$input, $output) ;
+        $status = $x->inflate($input, $output) ;
     
-        print $output 
-            if $status == Z_OK or $status == Z_STREAM_END ;
+        print $output ;
     
         last if $status != Z_OK ;
     }
@@ -1113,6 +1163,46 @@
     die "inflation failed\n"
         unless $status == Z_STREAM_END ;
 
+The next example show how to use the C<LimitOutput> option. Notice the use
+of two nested loops in this case. The outer loop reads the data from the
+input source - STDIN and the inner loop repeatedly calls C<inflate> until
+C<$input> is exhausted, we get an error, or the end of the stream is
+reached. One point worth remembering is by using the C<LimitOutput> option
+you also get C<ConsumeInput> set as well - this makes the code below much
+simpler.
+
+    use strict ;
+    use warnings ;
+    
+    use Compress::Raw::Zlib;
+    
+    my $x = new Compress::Raw::Zlib::Inflate(LimitOutput => 1)
+       or die "Cannot create a inflation stream\n" ;
+    
+    my $input = '' ;
+    binmode STDIN;
+    binmode STDOUT;
+    
+    my ($output, $status) ;
+
+  OUTER:
+    while (read(STDIN, $input, 4096))
+    {
+        do
+        {
+            $status = $x->inflate($input, $output) ;
+
+            print $output ;
+
+            last OUTER
+                unless $status == Z_OK || $status == Z_BUF_ERROR ;
+        }
+        while ($status == Z_OK && length $input);
+    }
+    
+    die "inflation failed\n"
+        unless $status == Z_STREAM_END ;
+
 =head1 CHECKSUM FUNCTIONS
 
 Two functions are provided by I<zlib> to calculate checksums. For the
@@ -1135,24 +1225,163 @@
 
 These functions allow checksums to be merged.
 
-=head1 ACCESSING ZIP FILES
+=head1 Misc
+
+=head2 my $version = Compress::Raw::Zlib::zlib_version();
+
+Returns the version of the zlib library.
+
+=head1 The LimitOutput option.
+
+By default C<< $i->inflate($input, $output) >> will uncompress I<all> data
+in C<$input> and write I<all> of the uncompressed data it has generated to
+C<$output>. This makes the interface to C<inflate> much simpler - if the
+method has uncompressed C<$input> successfully I<all> compressed data in
+C<$input> will have been dealt with. So if you are reading from an input
+source and uncompressing as you go the code will look something like this
+
+    use strict ;
+    use warnings ;
+    
+    use Compress::Raw::Zlib;
+    
+    my $x = new Compress::Raw::Zlib::Inflate()
+       or die "Cannot create a inflation stream\n" ;
+    
+    my $input = '' ;
+    
+    my ($output, $status) ;
+    while (read(STDIN, $input, 4096))
+    {
+        $status = $x->inflate($input, $output) ;
+    
+        print $output ;
+    
+        last if $status != Z_OK ;
+    }
+    
+    die "inflation failed\n"
+        unless $status == Z_STREAM_END ;
+
+The points to note are 
+
+=over 5
+
+=item *
+
+The main processing loop in the code handles reading of compressed data
+from STDIN.
+
+=item *
+
+The status code returned from C<inflate> will only trigger termination of
+the main processing loop if it isn't C<Z_OK>. When C<LimitOutput> has not
+been used the C<Z_OK> status means means that the end of the compressed
+data stream has been reached or there has been an error in uncompression.
+
+=item *
+
+After the call to C<inflate> I<all> of the uncompressed data in C<$input>
+will have been processed. This means the subsequent call to C<read> can
+overwrite it's contents without any problem.
+
+=back
+
+For most use-cases the behavior described above is acceptable (this module
+and it's predecessor, C<Compress::Zlib>, have used it for over 10 years
+without an issue), but in a few very specific use-cases the amount of
+memory required for C<$output> can prohibitively large. For example, if the
+compressed data stream contains the same pattern repeated thousands of
+times, a relatively small compressed data stream can uncompress into
+hundreds of megabytes.  Remember C<inflate> will keep allocating memory
+until I<all> the uncompressed data has been written to the output buffer -
+the size of C<$output> is unbounded. 
+
+The C<LimitOutput> option is designed to help with this use-case.
+
+The main difference in your code when using C<LimitOutput> is having to
+deal with cases where the C<$input> parameter still contains some
+uncompressed data that C<inflate> hasn't processed yet. The status code
+returned from C<inflate> will be C<Z_OK> if uncompression took place and
+C<Z_BUF_ERROR> if the output buffer is full.
+
+Below is typical code that shows how to use C<LimitOutput>.
+
+    use strict ;
+    use warnings ;
+    
+    use Compress::Raw::Zlib;
+    
+    my $x = new Compress::Raw::Zlib::Inflate(LimitOutput => 1)
+       or die "Cannot create a inflation stream\n" ;
+    
+    my $input = '' ;
+    binmode STDIN;
+    binmode STDOUT;
+    
+    my ($output, $status) ;
+
+  OUTER:
+    while (read(STDIN, $input, 4096))
+    {
+        do
+        {
+            $status = $x->inflate($input, $output) ;
 
-Although it is possible (with some effort on your part) to use this
-module to access .zip files, there is a module on CPAN that will do all
-the hard work for you. Check out the C<Archive::Zip> module on CPAN at
+            print $output ;
 
-    http://www.cpan.org/modules/by-module/Archive/Archive-Zip-*.tar.gz    
+            last OUTER
+                unless $status == Z_OK || $status == Z_BUF_ERROR ;
+        }
+        while ($status == Z_OK && length $input);
+    }
+    
+    die "inflation failed\n"
+        unless $status == Z_STREAM_END ;
 
+Points to note this time:
+
+=over 5
+
+=item *
+
+There are now two nested loops in the code: the outer loop for reading the
+compressed data from STDIN, as before; and the inner loop to carry out the
+uncompression.
+
+=item *
+
+There are two exit points from the inner uncompression loop.
+
+Firstly when C<inflate> has returned a status other than C<Z_OK> or
+C<Z_BUF_ERROR>.  This means that either the end of the compressed data
+stream has been reached (C<Z_STREAM_END>) or there is an error in the
+compressed data. In either of these cases there is no point in continuing
+with reading the compressed data, so both loops are terminated.
+
+The second exit point tests if there is any data left in the input buffer,
+C<$input> - remember that the C<ConsumeInput> option is automatically
+enabled when C<LimitOutput> is used.  When the input buffer has been
+exhausted, the outer loop can run again and overwrite a now empty
+C<$input>.
+
+=back
+
+=head1 ACCESSING ZIP FILES
+
+Although it is possible (with some effort on your part) to use this module
+to access .zip files, there are other perl modules available that will
+do all the hard work for you. Check out C<Archive::Zip>,
+C<IO::Compress::Zip> and C<IO::Uncompress::Unzip>.
 
 =head1 CONSTANTS
 
 All the I<zlib> constants are automatically imported when you make use
 of I<Compress::Raw::Zlib>.
 
-
 =head1 SEE ALSO
 
-L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
+L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzma>, L<IO::Uncompress::UnLzma>, L<IO::Compress::Xz>, L<IO::Uncompress::UnXz>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
 
 L<Compress::Zlib::FAQ|Compress::Zlib::FAQ>
 
@@ -1160,7 +1389,6 @@
 L<Archive::Tar|Archive::Tar>,
 L<IO::Zlib|IO::Zlib>
 
-
 For RFC 1950, 1951 and 1952 see 
 F<http://www.faqs.org/rfcs/rfc1950.html>,
 F<http://www.faqs.org/rfcs/rfc1951.html> and
@@ -1174,25 +1402,18 @@
 
 The primary site for gzip is F<http://www.gzip.org>.
 
-
-
-
 =head1 AUTHOR
 
 This module was written by Paul Marquess, F<pmqs at cpan.org>. 
 
-
-
 =head1 MODIFICATION HISTORY
 
 See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
-
-
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/02zlib.t perl-5.10.0/ext/Compress/Raw/Zlib/t/02zlib.t
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/02zlib.t	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/t/02zlib.t	2009-12-01 15:38:24.000000000 +0100
@@ -24,13 +24,13 @@
 
     my $count = 0 ;
     if ($] < 5.005) {
-        $count = 189 ;
+        $count = 230 ;
     }
     elsif ($] >= 5.006) {
-        $count = 243 ;
+        $count = 300 ;
     }
     else {
-        $count = 201 ;
+        $count = 258 ;
     }
 
     plan tests => $count + $extra;
@@ -443,10 +443,13 @@
     
     # create a flush point
     cmp_ok $x->flush($Answer, Z_FULL_FLUSH), '==', Z_OK ;
+    
+    my $len1 = length $Answer;
      
     cmp_ok $x->deflate($goodbye, $Answer), '==', Z_OK;
     
     cmp_ok $x->flush($Answer), '==', Z_OK ;
+    my $len2 = length($Answer) - $len1 ;
      
     my ($first, @Answer) = split('', $Answer) ;
      
@@ -475,7 +478,6 @@
         $GOT .= $Z if defined $Z ;
         # print "x $status\n";
         last if $status == Z_STREAM_END or $status != Z_OK ;
-     
     }
      
     cmp_ok $status, '==', Z_DATA_ERROR ;
@@ -488,7 +490,7 @@
     my $initial = $1 ;
 
     
-    ok(($k, $err) = new Compress::Raw::Zlib::Inflate(-ConsumeInput => 0)) ;
+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate(ConsumeInput => 0)) ;
     ok $k ;
     cmp_ok $err, '==', Z_OK ;
      
@@ -499,8 +501,11 @@
     cmp_ok $status, '==', Z_OK
      or diag "status '$status'\nlength rest is " . length($rest) . "\n" ;
      
-    cmp_ok $k->inflate($rest, $GOT), '==', Z_DATA_ERROR;
-    is $Z . $GOT, $goodbye ;
+    is length($rest), $len2, "expected compressed output";
+    
+    $GOT = ''; 
+    cmp_ok $k->inflate($rest, $GOT), '==', Z_DATA_ERROR, "inflate returns Z_DATA_ERROR";
+    is $GOT, $goodbye ;
 }
 
 {
@@ -598,7 +603,7 @@
 
 foreach (1 .. 2)
 {
-    next if $[ < 5.005 ;
+    next if $] < 5.005 ;
 
     title 'test inflate/deflate with a substr';
 
@@ -726,6 +731,142 @@
     ok 1, "resetLastBlockByte(undef) is ok" ;
 }
 
+{
+
+    title "gzip mode";
+    # ================
+
+    my $hello = "I am a HAL 9000 computer" ;
+    my @hello = split('', $hello) ;
+    my ($err, $x, $X, $status); 
+ 
+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
+            WindowBits => WANT_GZIP ,
+            AppendOutput => 1
+        ), "Create deflate object" );
+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $x->deflate($hello, $X) ;
+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
+    
+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
+     
+    my ($k, $GOT); 
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP ,
+            ConsumeInput => 0 ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
+    is $GOT, $hello, "uncompressed data matches ok" ;
+
+    $GOT = '';
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP_OR_ZLIB ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
+    is $GOT, $hello, "uncompressed data matches ok" ;
+}
+
+{
+
+    title "gzip error mode";
+    # Create gzip -
+    # read with no special windowbits setting - this will fail
+    # then read with WANT_GZIP_OR_ZLIB - thi swill work
+    # ================
+
+    my $hello = "I am a HAL 9000 computer" ;
+    my ($err, $x, $X, $status); 
+ 
+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
+            WindowBits => WANT_GZIP ,
+            AppendOutput => 1
+        ), "Create deflate object" );
+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $x->deflate($hello, $X) ;
+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
+    
+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
+     
+    my ($k, $GOT); 
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => MAX_WBITS ,
+            ConsumeInput => 0 ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_DATA_ERROR, "Got Z_DATA_ERROR" ;
+
+    $GOT = '';
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP_OR_ZLIB ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
+    is $GOT, $hello, "uncompressed data matches ok" ;
+}
+
+{
+
+    title "gzip/zlib error mode";
+    # Create zlib -
+    # read with no WANT_GZIP windowbits setting - this will fail
+    # then read with WANT_GZIP_OR_ZLIB - thi swill work
+    # ================
+
+    my $hello = "I am a HAL 9000 computer" ;
+    my ($err, $x, $X, $status); 
+ 
+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
+            AppendOutput => 1
+        ), "Create deflate object" );
+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $x->deflate($hello, $X) ;
+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
+    
+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
+     
+    my ($k, $GOT); 
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP ,
+            ConsumeInput => 0 ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_DATA_ERROR, "Got Z_DATA_ERROR" ;
+
+    $GOT = '';
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP_OR_ZLIB ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
+    is $GOT, $hello, "uncompressed data matches ok" ;
+}
+
 exit if $] < 5.006 ;
 
 title 'Looping Append test with substr output - substr the end of the string';
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/09limitoutput.t perl-5.10.0/ext/Compress/Raw/Zlib/t/09limitoutput.t
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/09limitoutput.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/t/09limitoutput.t	2009-03-25 12:14:56.000000000 +0100
@@ -0,0 +1,129 @@
+BEGIN {
+    if ($ENV{PERL_CORE}) {
+	chdir 't' if -d 't';
+	@INC = ("../lib", "lib/compress");
+    }
+}
+
+use lib qw(t t/compress);
+use strict;
+use warnings;
+use bytes;
+
+use Test::More ;
+use CompTestUtils;
+
+BEGIN 
+{ 
+    # use Test::NoWarnings, if available
+    my $extra = 0 ;
+    $extra = 1
+        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+
+    plan tests => 98 + $extra ;
+
+    use_ok('Compress::Raw::Zlib', 2) ; 
+}
+
+
+
+my $hello = "I am a HAL 9000 computer" x 2001;
+my $tmp = $hello ;
+
+my ($err, $x, $X, $status); 
+
+ok( ($x, $err) = new Compress::Raw::Zlib::Deflate (-AppendOutput => 1));
+ok $x ;
+cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
+
+my $out ;
+$status = $x->deflate($tmp, $out) ;
+cmp_ok $status, '==', Z_OK, "  status is Z_OK" ;
+
+cmp_ok $x->flush($out), '==', Z_OK, "  flush returned Z_OK" ;
+     
+     
+sub getOut { my $x = ''; return \$x }
+
+for my $bufsize (1, 2, 3, 13, 4096, 1024*10)
+{
+    print "#\n#Bufsize $bufsize\n#\n";
+    $tmp = $out;
+
+    my $k;
+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate( AppendOutput => 1,
+                                                      LimitOutput => 1,
+                                                      Bufsize => $bufsize
+                                                    ));
+    ok $k ;
+    cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
+ 
+    ok ! defined $k->msg(), "  no msg" ;
+    is $k->total_in(), 0, "  total_in == 0" ;
+    is $k->total_out(), 0, "  total_out == 0" ;
+    my $GOT = getOut();
+    my $prev;
+    my $deltaOK = 1;
+    my $looped = 0;
+    while (length $tmp)
+    {
+        ++ $looped;
+        my $prev = length $GOT;
+        $status = $k->inflate($tmp, $GOT) ;
+        last if $status == Z_STREAM_END || $status == Z_DATA_ERROR || $status == Z_STREAM_ERROR ;
+        $deltaOK = 0 if length($GOT) - $prev > $bufsize;
+    }
+     
+    ok $deltaOK, "  Output Delta never > $bufsize";
+    cmp_ok $looped, '>=', 1, "  looped $looped";
+    is length($tmp), 0, "  length of input buffer is zero";
+
+    cmp_ok $status, '==', Z_STREAM_END, "  status is Z_STREAM_END" ;
+    is $$GOT, $hello, "  got expected output" ;
+    ok ! defined $k->msg(), "  no msg" ;
+    is $k->total_in(), length $out, "  length total_in ok" ;
+    is $k->total_out(), length $hello, "  length total_out ok " .  $k->total_out() ;
+}
+
+sub getit
+{
+    my $obj = shift ;
+    my $input = shift;
+    
+    my $data ;
+    1 while $obj->inflate($input, $data) != Z_STREAM_END ;
+    return \$data ;
+}
+
+{
+    title "regression test";
+    
+    my ($err, $x, $X, $status); 
+    
+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate (-AppendOutput => 1));
+    ok $x ;
+    cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
+
+    my $line1 = ("abcdefghijklmnopq" x 1000) . "\n" ;
+    my $line2 = "second line\n" ;
+    my $text = $line1 . $line2 ;
+    my $tmp = $text;
+   
+    my $out ;
+    $status = $x->deflate($tmp, $out) ;
+    cmp_ok $status, '==', Z_OK, "  status is Z_OK" ;
+    
+    cmp_ok $x->flush($out), '==', Z_OK, "  flush returned Z_OK" ;
+
+    my $k;
+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate( AppendOutput => 1,
+                                                      LimitOutput => 1
+                                                    ));
+
+                                                        
+    my $c = getit($k, $out);
+    is $$c, $text;
+    
+                                              
+}
+

perl-update-IO-Compress-Base.patch:
 ext/IO_Compress_Base/Changes                            |   68 +++++++
 ext/IO_Compress_Base/Makefile.PL                        |    6 
 ext/IO_Compress_Base/README                             |   42 ----
 ext/IO_Compress_Base/lib/File/GlobMapper.pm             |   20 --
 ext/IO_Compress_Base/lib/IO/Compress/Base.pm            |   47 +---
 ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm     |   51 ++++-
 ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm |  152 ++--------------
 ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm          |   85 ++++++--
 ext/IO_Compress_Base/t/01misc.t                         |   38 +++-
 t/lib/compress/CompTestUtils.pm                         |   20 ++
 t/lib/compress/destroy.pl                               |   39 ++++
 t/lib/compress/generic.pl                               |   19 --
 12 files changed, 318 insertions(+), 269 deletions(-)

--- NEW FILE perl-update-IO-Compress-Base.patch ---
IO-Compress-Base-2.015
(omitting changes to private/MakeUtil.pm)

diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/Changes perl-5.10.0/ext/IO_Compress_Base/Changes
--- perl-5.10.0.orig/ext/IO_Compress_Base/Changes	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/Changes	2009-12-01 11:17:37.000000000 +0100
@@ -1,6 +1,74 @@
 CHANGES
 -------
 
+  2.015 3 September 2008
+
+      * Makefile.PL
+        Backout changes made in 2.014
+
+  2.014 2 September 2008
+
+      * Makefile.PL
+        Updated to check for indirect dependencies.
+
+  2.013 18 July 2008
+
+      * IO::Compress::Base 
+        - Allow IO::Compress::Base::Parameters::parse to accept an IO::Compress::Base::Parameters object.
+
+  2.012 15 July 2008
+
+      * IO::Compress::Base 
+        - Silenced an uninitialised value warning when reading a line
+          at a time from a zip file where the content uses ZIP_CM_STORE. 
+          [Problem spotted & fixed by Jeff Holt]
+
+      * IO::Compress::Base & IO::Uncompress::Base
+        - local-ise $!, $? et al in the DESTROY methods.
+          
+  2.011 17 May 2008
+
+      * IO::Compress::Base
+        - Fixed problem that prevented the creation of a zip file that
+          contained more than one compression method.
+
+      * IO::Compress::Base::Common
+        - The private Validator class in this module clashes with another
+          CPAN module. Moved Validator into the IO::Compress::Base::Common
+          namespace.
+          [RT #35954]
+
+  2.010 5 May 2008
+
+      * Fixed problem that meant Perl 5.10 could not upgrade this module.
+        [RT #35342]
+
+  2.009 20 April 2008
+
+      * Removed the alpha status from File::GlobMapper
+      
+      * IO::Compress::Base 
+        When writing output never output a zero length buffer.
+        Done to improve interoperability with other tied filenandle
+        modules.
+
+      * Changed IO::Uncompress::Base to not use the offset parameter of
+        the read method when reading from a filehandle. 
+
+        The object returned from Net::FTP::retr implements a non-standard
+        read method. The third parameter is used for a timeout value
+        rather than an offset.  
+        [rt.cpan#33231]
+        
+      * Changed IO::Uncompress::Base to not use the eof method when
+        reading from a filehandle. 
+
+        The object returned from Net::FTP::retr implements both the read
+        method and the eof method. Unfortunately the implementation of
+        the read method uses non-buffered IO (by using sysread) while
+        the eof method uses buffered IO. Mixing buffered and non-buffered
+        IO results in data corruption.
+
   2.008 2 November 2007
 
       * Minor documentation changes in README
diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/Makefile.PL perl-5.10.0/ext/IO_Compress_Base/Makefile.PL
--- perl-5.10.0.orig/ext/IO_Compress_Base/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/Makefile.PL	2009-12-01 11:17:37.000000000 +0100
@@ -37,6 +37,12 @@
 
     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
 
+    (
+    $] >= 5.009 && ! $ENV{PERL_CORE}
+        ? (INST_LIB    => 'blib/arch')
+        : ()
+    ),
+
     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
         ('LICENSE'  => 'perl')         : ()),
     
diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/README perl-5.10.0/ext/IO_Compress_Base/README
--- perl-5.10.0.orig/ext/IO_Compress_Base/README	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/README	2009-12-01 11:17:37.000000000 +0100
@@ -1,42 +1,28 @@
 
                              IO-Compress-Base
 
-                             Version 2.008
+                             Version 2.015
 
-                             2nd November 2007
+                            2nd September 2008
 
-
-       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+       Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
            and/or modify it under the same terms as Perl itself.
 
-
-
-
 DESCRIPTION
 -----------
 
-
 This module is the base class for all IO::Compress and IO::Uncompress
 modules.
 
-
-
-
-
 PREREQUISITES
 -------------
 
 Before you can build IO-Compress-Base you need to have the following
 installed on your system:
 
-
     * Perl 5.004 or better. 
 
-
-
-
-
 BUILDING THE MODULE
 -------------------
 
@@ -47,8 +33,6 @@
     make
     make test
 
-
-
 INSTALLATION
 ------------
 
@@ -56,24 +40,9 @@
 
     make install
 
-
-
-
-
 TROUBLESHOOTING
 ---------------
 
-
-
-
-
-
-
-
-
-
-
-
 FEEDBACK
 --------
 
@@ -107,9 +76,7 @@
         If you haven't installed IO-Compress-Base then search IO::Compress::Base.pm
         for a line like this:
 
-          $VERSION = "2.008" ;
-
-
+          $VERSION = "2.015" ;
 
  2. If you are having problems building IO-Compress-Base, send me a
     complete log of what happened. Start by unpacking the IO-Compress-Base
@@ -120,5 +87,4 @@
         make
         make test TEST_VERBOSE=1          
 
-
 Paul Marquess <pmqs at cpan.org>
diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/File/GlobMapper.pm perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm
--- perl-5.10.0.orig/ext/IO_Compress_Base/lib/File/GlobMapper.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm	2009-12-01 11:17:37.000000000 +0100
@@ -26,7 +26,7 @@
 our ($Error);
 
 our ($VERSION, @EXPORT_OK);
-$VERSION = '0.000_02';
+$VERSION = '1.000';
 @EXPORT_OK = qw( globmap );
 
 
@@ -389,24 +389,6 @@
 
 =head1 DESCRIPTION
 
-B<WARNING Alpha Release Alert!> 
-
-=over 5
-
-=item * This code is a work in progress. 
-
-=item * There are known bugs. 
-
-=item * The interface defined here is tentative. 
-
-=item * There are portability issues. 
-
-=item * Do not use in production code.
-
-=item * Consider yourself warned!
-
-=back
-
 This module needs Perl5.005 or better.
 
 This module takes the existing C<File::Glob> module as a starting point and
diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm
--- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm	2009-12-01 11:17:37.000000000 +0100
@@ -11,7 +11,7 @@
 require Exporter;
 our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
 @ISA = qw(Exporter);
-$VERSION = '2.008';
+$VERSION = '2.015';
 
 @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput 
               isaFileGlobString cleanFileGlobString oneTarget
@@ -192,7 +192,7 @@
     return $_[0] =~ /^(code|handle|buffer|filename)$/;
 }
 
-sub Validator::new
+sub IO::Compress::Base::Validator::new
 {
     my $class = shift ;
 
@@ -320,7 +320,7 @@
     return $obj ;
 }
 
-sub Validator::saveErrorString
+sub IO::Compress::Base::Validator::saveErrorString
 {
     my $self   = shift ;
     ${ $self->{Error} } = shift ;
@@ -328,7 +328,7 @@
     
 }
 
-sub Validator::croakError
+sub IO::Compress::Base::Validator::croakError
 {
     my $self   = shift ;
     $self->saveErrorString($_[0]);
@@ -337,7 +337,7 @@
 
 
 
-sub Validator::validateInputFilenames
+sub IO::Compress::Base::Validator::validateInputFilenames
 {
     my $self = shift ;
 
@@ -367,7 +367,7 @@
     return 1 ;
 }
 
-sub Validator::validateInputArray
+sub IO::Compress::Base::Validator::validateInputArray
 {
     my $self = shift ;
 
@@ -398,7 +398,7 @@
     return 1 ;
 }
 
-#sub Validator::validateHash
+#sub IO::Compress::Base::Validator::validateHash
 #{
 #    my $self = shift ;
 #    my $href = shift ;
@@ -485,7 +485,11 @@
 
     my $sub = (caller($level + 1))[3] ;
     local $Carp::CarpLevel = 1 ;
-    my $p = new IO::Compress::Base::Parameters() ;
+    
+    return $_[1]
+        if @_ == 2 && defined $_[1] && UNIVERSAL::isa($_[1], "IO::Compress::Base::Parameters");
+    
+    my $p = new IO::Compress::Base::Parameters() ;            
     $p->parse(@_)
         or croak "$sub: $p->{Error}" ;
 
@@ -534,6 +538,7 @@
 
     my $got = $self->{Got} ;
     my $firstTime = keys %{ $got } == 0 ;
+    my $other;
 
     my (@Bad) ;
     my @entered = () ;
@@ -544,7 +549,8 @@
         @entered = () ;
     }
     elsif (@_ == 1) {
-        my $href = $_[0] ;    
+        my $href = $_[0] ;
+    
         return $self->setError("Expected even number of parameters, got 1")
             if ! defined $href or ! ref $href or ref $href ne "HASH" ;
  
@@ -559,8 +565,13 @@
             if $count % 2 != 0 ;
         
         for my $i (0.. $count / 2 - 1) {
-            push @entered, $_[2* $i] ;
-            push @entered, \$_[2* $i+1] ;
+            if ($_[2 * $i] eq '__xxx__') {
+                $other = $_[2 * $i + 1] ;
+            }
+            else {
+                push @entered, $_[2 * $i] ;
+                push @entered, \$_[2 * $i + 1] ;
+            }
         }
     }
 
@@ -588,6 +599,24 @@
     }
 
     my %parsed = ();
+    
+    if ($other) 
+    {
+        for my $key (keys %$default)  
+        {
+            my $canonkey = lc $key;
+            if ($other->parsed($canonkey))
+            {
+                my $value = $other->value($canonkey);
+#print "SET '$canonkey' to $value [$$value]\n";
+                ++ $parsed{$canonkey};
+                $got->{$canonkey}[OFF_PARSED]  = 1;
+                $got->{$canonkey}[OFF_DEFAULT] = $value;
+                $got->{$canonkey}[OFF_FIXED]   = $value;
+            }
+        }
+    }
+    
     for my $i (0.. @entered / 2 - 1) {
         my $key = $entered[2* $i] ;
         my $value = $entered[2* $i+1] ;
diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base.pm
--- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base.pm	2009-12-01 11:17:37.000000000 +0100
@@ -6,7 +6,7 @@
 use strict ;
 use warnings;
 
-use IO::Compress::Base::Common 2.008 ;
+use IO::Compress::Base::Common 2.015 ;
 
 use IO::File ;
 use Scalar::Util qw(blessed readonly);
@@ -20,7 +20,7 @@
 our (@ISA, $VERSION);
 @ISA    = qw(Exporter IO::File);
 
-$VERSION = '2.008';
+$VERSION = '2.015';
 
 #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16.
 
@@ -120,12 +120,14 @@
         &{ *$self->{FilterEnvelope} }();
     }
 
-    if ( defined *$self->{FH} ) {
-        defined *$self->{FH}->write( $data, length $data )
-          or return $self->saveErrorString(0, $!, $!); 
-    }
-    else {
-        ${ *$self->{Buffer} } .= $data ;
+    if (length $data) {
+        if ( defined *$self->{FH} ) {
+                defined *$self->{FH}->write( $data, length $data )
+                or return $self->saveErrorString(0, $!, $!); 
+        }
+        else {
+                ${ *$self->{Buffer} } .= $data ;
+        }
     }
 
     return 1;
@@ -234,7 +236,7 @@
     my $status ;
     if (! $merge)
     {
-        *$obj->{Compress} = $obj->mkComp($class, $got)
+        *$obj->{Compress} = $obj->mkComp($got)
             or return undef;
         
         *$obj->{UnCompSize} = new U64 ;
@@ -321,7 +323,7 @@
     my $haveOut = @_ ;
     my $output = shift ;
 
-    my $x = new Validator($class, *$obj->{Error}, $name, $input, $output)
+    my $x = new IO::Compress::Base::Validator($class, *$obj->{Error}, $name, $input, $output)
         or return undef ;
 
     push @_, $output if $haveOut && $x->{Hash};
@@ -545,6 +547,8 @@
 sub DESTROY
 {
     my $self = shift ;
+    local ($., $@, $!, $^E, $?);
+    
     $self->close() ;
 
     # TODO - memory leak with 5.8.0 - this isn't called until 
@@ -697,15 +701,13 @@
     $self->ckParams($got)
         or $self->croakError("newStream: $self->{Error}");
 
+    *$self->{Compress} = $self->mkComp($got)
+        or return 0;
+
     *$self->{Header} = $self->mkHeader($got) ;
     $self->output(*$self->{Header} )
         or return 0;
     
-    my $status = $self->reset() ;
-    return $self->saveErrorString(0, *$self->{Compress}{Error}, 
-                                  *$self->{Compress}{ErrorNo})
-        if $status == STATUS_ERROR;
-
     *$self->{UnCompSize}->reset();
     *$self->{CompSize}->reset();
 
@@ -939,23 +941,17 @@
 
 =head1 NAME
 
-
 IO::Compress::Base - Base Class for IO::Compress modules 
 
-
 =head1 SYNOPSIS
 
     use IO::Compress::Base ;
 
 =head1 DESCRIPTION
 
-
 This module is not intended for direct use in application code. Its sole
 purpose if to to be sub-classed by IO::Compress modules.
 
-
-
-
 =head1 SEE ALSO
 
 L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
@@ -966,25 +962,18 @@
 L<Archive::Tar|Archive::Tar>,
 L<IO::Zlib|IO::Zlib>
 
-
-
-
-
 =head1 AUTHOR
 
 This module was written by Paul Marquess, F<pmqs at cpan.org>. 
 
-
-
 =head1 MODIFICATION HISTORY
 
 See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
-
diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm
--- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm	2009-12-01 11:17:37.000000000 +0100
@@ -4,16 +4,16 @@
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.008 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.015 qw(createSelfTiedObject);
 
-use IO::Uncompress::Base 2.008 ;
+use IO::Uncompress::Base 2.015 ;
 
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
 
-$VERSION = '2.008';
+$VERSION = '2.015';
 $AnyUncompressError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,18 +27,18 @@
 
 BEGIN
 {
-   eval ' use IO::Uncompress::Adapter::Inflate 2.008 ;';
-   eval ' use IO::Uncompress::Adapter::Bunzip2 2.008 ;';
-   eval ' use IO::Uncompress::Adapter::LZO 2.008 ;';
-   eval ' use IO::Uncompress::Adapter::Lzf 2.008 ;';
-
-   eval ' use IO::Uncompress::Bunzip2 2.008 ;';
-   eval ' use IO::Uncompress::UnLzop 2.008 ;';
-   eval ' use IO::Uncompress::Gunzip 2.008 ;';
-   eval ' use IO::Uncompress::Inflate 2.008 ;';
-   eval ' use IO::Uncompress::RawInflate 2.008 ;';
-   eval ' use IO::Uncompress::Unzip 2.008 ;';
-   eval ' use IO::Uncompress::UnLzf 2.008 ;';
+   eval ' use IO::Uncompress::Adapter::Inflate 2.015 ;';
+   eval ' use IO::Uncompress::Adapter::Bunzip2 2.015 ;';
+   eval ' use IO::Uncompress::Adapter::LZO 2.015 ;';
+   eval ' use IO::Uncompress::Adapter::Lzf 2.015 ;';
+
+   eval ' use IO::Uncompress::Bunzip2 2.015 ;';
+   eval ' use IO::Uncompress::UnLzop 2.015 ;';
+   eval ' use IO::Uncompress::Gunzip 2.015 ;';
+   eval ' use IO::Uncompress::Inflate 2.015 ;';
+   eval ' use IO::Uncompress::RawInflate 2.015 ;';
+   eval ' use IO::Uncompress::Unzip 2.015 ;';
+   eval ' use IO::Uncompress::UnLzf 2.015 ;';
 }
 
 sub new
@@ -56,7 +56,7 @@
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common 2.008 qw(:Parse);
+    use IO::Compress::Base::Common 2.015 qw(:Parse);
     return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ) ;
 }
 
@@ -75,7 +75,6 @@
 sub mkUncomp
 {
     my $self = shift ;
-    my $class = shift ;
     my $got = shift ;
 
     my $magic ;
@@ -188,10 +187,8 @@
 
 =head1 NAME
 
-
 IO::Uncompress::AnyUncompress - Uncompress gzip, zip, bzip2 or lzop file/buffer
 
-
 =head1 SYNOPSIS
 
     use IO::Uncompress::AnyUncompress qw(anyuncompress $AnyUncompressError) ;
@@ -235,10 +232,8 @@
     eof($z)
     close($z)
 
-
 =head1 DESCRIPTION
 
-
 This module provides a Perl interface that allows the reading of
 files/buffers that have been compressed with a variety of compression
 libraries.
@@ -266,9 +261,6 @@
 The module will auto-detect which, if any, of the supported
 compression formats is being used.
 
-
-
-
 =head1 Functional Interface
 
 A top-level function, C<anyuncompress>, is provided to carry out
@@ -281,14 +273,10 @@
     anyuncompress $input => $output [,OPTS] 
         or die "anyuncompress failed: $AnyUncompressError\n";
 
-
-
 The functional interface needs Perl5.005 or better.
 
-
 =head2 anyuncompress $input => $output [, OPTS]
 
-
 C<anyuncompress> expects at least two parameters, C<$input> and C<$output>.
 
 =head3 The C<$input> parameter
@@ -327,8 +315,6 @@
 The complete array will be walked to ensure that it only
 contains valid filenames before any data is uncompressed.
 
-
-
 =item An Input FileGlob string
 
 If C<$input> is a string that is delimited by the characters "<" and ">"
@@ -339,13 +325,10 @@
 
 See L<File::GlobMapper|File::GlobMapper> for more details.
 
-
 =back
 
 If the C<$input> parameter is any other type, C<undef> will be returned.
 
-
-
 =head3 The C<$output> parameter
 
 The parameter C<$output> is used to control the destination of the
@@ -365,14 +348,11 @@
 will be written to it.
 The string '-' can be used as an alias for standard output.
 
-
 =item A scalar reference 
 
 If C<$output> is a scalar reference, the uncompressed data will be
 stored in C<$$output>.
 
-
-
 =item An Array Reference
 
 If C<$output> is an array reference, the uncompressed data will be
@@ -391,20 +371,13 @@
 
 If the C<$output> parameter is any other type, C<undef> will be returned.
 
-
-
 =head2 Notes
 
-
 When C<$input> maps to multiple compressed files/buffers and C<$output> is
 a single file/buffer, after uncompression C<$output> will contain a
 concatenation of all the uncompressed data from each of the input
 files/buffers.
 
-
-
-
-
 =head2 Optional Parameters
 
 Unless specified below, the optional parameters for C<anyuncompress>,
@@ -424,7 +397,6 @@
 
 This parameter defaults to 0.
 
-
 =item C<< BinModeOut => 0|1 >>
 
 When writing to a file or filehandle, set C<binmode> before writing to the
@@ -432,26 +404,17 @@
 
 Defaults to 0.
 
-
-
-
-
 =item C<< Append => 0|1 >>
 
 TODO
 
 =item C<< MultiStream => 0|1 >>
 
-
 If the input file/buffer contains multiple compressed data streams, this
 option will uncompress the whole lot as a single data stream.
 
 Defaults to 0.
 
-
-
-
-
 =item C<< TrailingData => $scalar >>
 
 Returns the data, if any, that is present immediately after the compressed
@@ -471,19 +434,12 @@
 
 Don't bother using C<trailingData> if the input is a filename.
 
-
-
 If you know the length of the compressed data stream before you start
 uncompressing, you can avoid having to use C<trailingData> by setting the
 C<InputLength> option.
 
-
-
 =back
 
-
-
-
 =head2 Examples
 
 To read the contents of the file C<file1.txt.Compressed> and write the
@@ -498,7 +454,6 @@
     anyuncompress $input => $output
         or die "anyuncompress failed: $AnyUncompressError\n";
 
-
 To read from an existing Perl filehandle, C<$input>, and write the
 uncompressed data to a buffer, C<$buffer>.
 
@@ -542,7 +497,6 @@
 
 The format of the constructor for IO::Uncompress::AnyUncompress is shown below
 
-
     my $z = new IO::Uncompress::AnyUncompress $input [OPTS]
         or die "IO::Uncompress::AnyUncompress failed: $AnyUncompressError\n";
 
@@ -574,7 +528,6 @@
 read from it.
 The string '-' can be used as an alias for standard input.
 
-
 =item A scalar reference 
 
 If C<$input> is a scalar reference, the compressed data will be read from
@@ -584,7 +537,6 @@
 
 =head2 Constructor Options
 
-
 The option names defined below are case insensitive and can be optionally
 prefixed by a '-'.  So all of the following are valid
 
@@ -608,8 +560,6 @@
 
 =item C<< MultiStream => 0|1 >>
 
-
-
 Allows multiple concatenated compressed streams to be treated as a single
 compressed stream. Decompression will stop once either the end of the
 file/buffer is reached, an error is encountered (premature eof, corrupt
@@ -618,7 +568,6 @@
 
 This parameter defaults to 0.
 
-
 =item C<< Prime => $string >>
 
 This option will uncompress the contents of C<$string> before processing the
@@ -660,8 +609,6 @@
 the file pointer will be left pointing to the first byte directly after the
 compressed data stream.
 
-
-
 This option defaults to off.
 
 =item C<< Append => 0|1 >>
@@ -678,24 +625,12 @@
 
 =item C<< Strict => 0|1 >>
 
-
-
 This option controls whether the extra checks defined below are used when
 carrying out the decompression. When Strict is on, the extra tests are
 carried out, when Strict is off they are not.
 
 The default for this option is off.
 
-
-
-
-
-
-
-
-
-
-
 =item C<< RawInflate => 0|1 >>
 
 When auto-detecting the compressed format, try to test for raw-deflate (RFC
@@ -707,11 +642,6 @@
 
 Defaults to 0.
 
-
-
-
-
-
 =back
 
 =head2 Examples
@@ -755,7 +685,6 @@
 Returns the number of uncompressed bytes written to C<$buffer>, zero if eof
 or a negative number on error.
 
-
 =head2 getline
 
 Usage is
@@ -770,7 +699,6 @@
 determine what constitutes an end of line. Paragraph mode, record mode and
 file slurp mode are all supported. 
 
-
 =head2 getc
 
 Usage is 
@@ -785,9 +713,6 @@
 
     $char = $z->ungetc($string)
 
-
-
-
 =head2 getHeaderInfo
 
 Usage is
@@ -799,9 +724,6 @@
 or hash references (in array context) that contains information about each
 of the header fields in the compressed data stream(s).
 
-
-
-
 =head2 tell
 
 Usage is
@@ -818,26 +740,17 @@
     $z->eof();
     eof($z);
 
-
-
 Returns true if the end of the compressed input stream has been reached.
 
-
-
 =head2 seek
 
     $z->seek($position, $whence);
     seek($z, $position, $whence);
 
-
-
-
 Provides a sub-set of the C<seek> functionality, with the restriction
 that it is only legal to seek forward in the input file/buffer.
 It is a fatal error to attempt to seek backward.
 
-
-
 The C<$whence> parameter takes one the usual values, namely SEEK_SET,
 SEEK_CUR or SEEK_END.
 
@@ -879,8 +792,6 @@
     $z->input_line_number()
     $z->input_line_number(EXPR)
 
-
-
 Returns the current uncompressed line number. If C<EXPR> is present it has
 the effect of setting the line number. Note that setting the line number
 does not change the current position within the file/buffer being read.
@@ -888,30 +799,25 @@
 The contents of C<$/> are used to to determine what constitutes a line
 terminator.
 
-
-
 =head2 fileno
 
     $z->fileno()
     fileno($z)
 
-If the C<$z> object is associated with a file or a filehandle, this method
-will return the underlying file descriptor.
+If the C<$z> object is associated with a file or a filehandle, C<fileno>
+will return the underlying file descriptor. Once the C<close> method is
+called C<fileno> will return C<undef>.
 
-If the C<$z> object is is associated with a buffer, this method will
-return undef.
+If the C<$z> object is is associated with a buffer, this method will return
+C<undef>.
 
 =head2 close
 
     $z->close() ;
     close $z ;
 
-
-
 Closes the output file/buffer. 
 
-
-
 For most versions of Perl this method will be automatically invoked if
 the IO::Uncompress::AnyUncompress object is destroyed (either explicitly or by the
 variable with the reference to the object going out of scope). The
@@ -930,9 +836,6 @@
 object was created, and the object is associated with a file, the
 underlying file will also be closed.
 
-
-
-
 =head2 nextStream
 
 Usage is
@@ -971,8 +874,6 @@
 
 Don't bother using C<trailingData> if the input is a filename.
 
-
-
 If you know the length of the compressed data stream before you start
 uncompressing, you can avoid having to use C<trailingData> by setting the
 C<InputLength> option in the constructor.
@@ -994,9 +895,6 @@
 
 =head1 EXAMPLES
 
-
-
-
 =head1 SEE ALSO
 
 L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>
@@ -1007,23 +905,17 @@
 L<Archive::Tar|Archive::Tar>,
 L<IO::Zlib|IO::Zlib>
 
-
-
-
-
 =head1 AUTHOR
 
 This module was written by Paul Marquess, F<pmqs at cpan.org>. 
 
-
-
 =head1 MODIFICATION HISTORY
 
 See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm
--- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm	2009-12-01 11:17:37.000000000 +0100
@@ -9,12 +9,12 @@
 @ISA    = qw(Exporter IO::File);
 
 
-$VERSION = '2.008';
+$VERSION = '2.015';
 
 use constant G_EOF => 0 ;
 use constant G_ERR => -1 ;
 
-use IO::Compress::Base::Common 2.008 ;
+use IO::Compress::Base::Common 2.015 ;
 #use Parse::Parameters ;
 
 use IO::File ;
@@ -28,6 +28,7 @@
 #Exporter::export_ok_tags('all') ;
 
 
+
 sub smartRead
 {
     my $self = $_[0];
@@ -59,12 +60,21 @@
 
     my $get_size = $size - $offset ;
 
-    #if ( defined *$self->{InputLength} ) {
-    #    $get_size = min($get_size, *$self->{InputLengthRemaining});
-    #}
-
-    if (defined *$self->{FH})
-      { *$self->{FH}->read($$out, $get_size, $offset) }
+    if (defined *$self->{FH}) {
+        if ($offset) {
+            # Not using this 
+            #
+            #  *$self->{FH}->read($$out, $get_size, $offset);
+            #
+            # because the filehandle may not support the offset parameter
+            # An example is Net::FTP
+            my $tmp = '';
+            *$self->{FH}->read($tmp, $get_size) > 0 &&
+                (substr($$out, $offset) = $tmp);
+        }
+        else
+          { *$self->{FH}->read($$out, $get_size) }
+    }
     elsif (defined *$self->{InputEvent}) {
         my $got = 1 ;
         while (length $$out < $size) {
@@ -174,7 +184,24 @@
     return 0 if length *$self->{Prime} || *$self->{PushMode};
 
     if (defined *$self->{FH})
-     { *$self->{FH}->eof() }
+    {
+        # Could use
+        #
+        #  *$self->{FH}->eof() 
+        #
+        # here, but this can cause trouble if
+        # the filehandle is itself a tied handle, but it uses sysread.
+        # Then we get into mixing buffered & non-buffered IO, which will cause trouble
+
+        my $info = $self->getErrInfo();
+        
+        my $buffer = '';
+        my $status = $self->smartRead(\$buffer, 1);
+        $self->pushBack($buffer) if length $buffer;
+        $self->setErrInfo($info);
+        
+        return $status == 0 ;
+    }
     elsif (defined *$self->{InputEvent})
      { *$self->{EventEof} }
     else 
@@ -189,6 +216,22 @@
     ${ *$self->{Error} } = '' ;
 }
 
+sub getErrInfo
+{
+    my $self   = shift ;
+
+    return [ *$self->{ErrorNo}, ${ *$self->{Error} } ] ;
+}
+
+sub setErrInfo
+{
+    my $self   = shift ;
+    my $ref    = shift;
+
+    *$self->{ErrorNo}  =  $ref->[0] ;
+    ${ *$self->{Error} } = $ref->[1] ;
+}
+
 sub saveStatus
 {
     my $self   = shift ;
@@ -425,7 +468,7 @@
         return $obj
     }
 
-    my $status = $obj->mkUncomp($class, $got);
+    my $status = $obj->mkUncomp($got);
 
     return undef
         unless defined $status;
@@ -490,7 +533,7 @@
     my $output = shift ;
 
 
-    my $x = new Validator($class, *$obj->{Error}, $name, $input, $output)
+    my $x = new IO::Compress::Base::Validator($class, *$obj->{Error}, $name, $input, $output)
         or return undef ;
     
     push @_, $output if $haveOut && $x->{Hash};
@@ -813,7 +856,7 @@
         $self->postBlockChk($buffer, $before_len) == STATUS_OK
             or return G_ERR;
 
-        $buf_len = length($$buffer) - $before_len;
+        $buf_len = defined $$buffer ? length($$buffer) - $before_len : 0;
     
         *$self->{CompSize}->add($beforeC_len - length $temp_buf) ;
 
@@ -929,7 +972,7 @@
     my $magic = $self->ckMagic();
     #*$self->{EndStream} = 0 ;
 
-    if ( ! $magic) {
+    if ( ! defined $magic) {
         if (! *$self->{Transparent} )
         {
             *$self->{EndStream} = 1 ;
@@ -1247,6 +1290,8 @@
 sub DESTROY
 {
     my $self = shift ;
+    local ($., $@, $!, $^E, $?);
+
     $self->close() ;
 }
 
@@ -1372,23 +1417,17 @@
 
 =head1 NAME
 
-
 IO::Uncompress::Base - Base Class for IO::Uncompress modules 
 
-
 =head1 SYNOPSIS
 
     use IO::Uncompress::Base ;
 
 =head1 DESCRIPTION
 
-
 This module is not intended for direct use in application code. Its sole
 purpose if to to be sub-classed by IO::Unompress modules.
 
-
-
-
 =head1 SEE ALSO
 
 L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
@@ -1399,23 +1438,17 @@
 L<Archive::Tar|Archive::Tar>,
 L<IO::Zlib|IO::Zlib>
 
-
-
-
-
 =head1 AUTHOR
 
 This module was written by Paul Marquess, F<pmqs at cpan.org>. 
 
-
-
 =head1 MODIFICATION HISTORY
 
 See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/t/01misc.t perl-5.10.0/ext/IO_Compress_Base/t/01misc.t
--- perl-5.10.0.orig/ext/IO_Compress_Base/t/01misc.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Base/t/01misc.t	2009-12-01 11:17:37.000000000 +0100
@@ -19,7 +19,7 @@
     $extra = 1
         if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
 
-    plan tests => 78 + $extra ;
+    plan tests => 88 + $extra ;
 
     use_ok('Scalar::Util');
     use_ok('IO::Compress::Base::Common');
@@ -95,13 +95,11 @@
     my $got = ParseParameters(1, {'Fred' => [1, 1, 0x1000000, 0]}, Fred => 'abc') ;
     is $got->value('Fred'), "abc", "other" ;
 
-    $got = ParseParameters(1, {'Fred' => [0, 1, Parse_any, undef]}, Fred =>
-undef) ;
+    $got = ParseParameters(1, {'Fred' => [0, 1, Parse_any, undef]}, Fred => undef) ;
     ok $got->parsed('Fred'), "undef" ;
     ok ! defined $got->value('Fred'), "undef" ;
 
-    $got = ParseParameters(1, {'Fred' => [0, 1, Parse_string, undef]}, Fred =>
-undef) ;
+    $got = ParseParameters(1, {'Fred' => [0, 1, Parse_string, undef]}, Fred => undef) ;
     ok $got->parsed('Fred'), "undef" ;
     is $got->value('Fred'), "", "empty string" ;
 
@@ -117,11 +115,41 @@
 
     ok $got->parsed('Fred'), "parsed" ;
     $xx_ref = $got->value('Fred');
+
     $$xx_ref = 666 ;
     is $xx, 666;
 
+    {
+        my $got1 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, $got) ;
+        is $got1, $got, "Same object";
+    
+        ok $got1->parsed('Fred'), "parsed" ;
+        $xx_ref = $got1->value('Fred');
+        
+        $$xx_ref = 777 ;
+        is $xx, 777;
+    }
+    
+    my $got2 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, '__xxx__' => $got) ;
+    isnt $got2, $got, "not the Same object";
+
+    ok $got2->parsed('Fred'), "parsed" ;
+    $xx_ref = $got2->value('Fred');
+    $$xx_ref = 888 ;
+    is $xx, 888;  
+      
+    my $other;
+    my $got3 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, '__xxx__' => $got, Fred => \$other) ;
+    isnt $got3, $got, "not the Same object";
+
+    ok $got3->parsed('Fred'), "parsed" ;
+    $xx_ref = $got3->value('Fred');
+    $$xx_ref = 999 ;
+    is $other, 999;  
+    is $xx, 888;  
 }
 
+
 My::testParseParameters();
 
 
diff -urN perl-5.10.0.orig/t/lib/compress/CompTestUtils.pm perl-5.10.0/t/lib/compress/CompTestUtils.pm
--- perl-5.10.0.orig/t/lib/compress/CompTestUtils.pm	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/lib/compress/CompTestUtils.pm	2009-12-01 11:18:49.000000000 +0100
@@ -203,6 +203,14 @@
     return readFile($filename) eq unpack("u", $uue) ;
 }
 
+sub isRawFormat
+{
+    my $class = shift;
+    my %raw = map { $_ => 1 } qw( RawDeflate );
+
+    return defined $raw{$class};
+}
+
 sub uncompressBuffer
 {
     my $compWith = shift ;
@@ -222,6 +230,8 @@
                     'IO::Compress::Lzop::lzop'               => 'IO::Uncompress::UnLzop',
                     'IO::Compress::Lzf'                      => 'IO::Uncompress::UnLzf' ,
                     'IO::Compress::Lzf::lzf'                 => 'IO::Uncompress::UnLzf',
+                    'IO::Compress::PPMd'                     => 'IO::Uncompress::UnPPMd' ,
+                    'IO::Compress::PPMd::ppmd'               => 'IO::Uncompress::UnPPMd',
                     'IO::Compress::DummyComp'                => 'IO::Uncompress::DummyUncomp',
                     'IO::Compress::DummyComp::dummycomp'     => 'IO::Uncompress::DummyUncomp',
                 );
@@ -265,6 +275,10 @@
                     'IO::Compress::Lzf::lzf'            => \$IO::Compress::Lzf::LzfError,
                     'IO::Uncompress::UnLzf'             => \$IO::Uncompress::UnLzf::UnLzfError,
                     'IO::Uncompress::UnLzf::unlzf'      => \$IO::Uncompress::UnLzf::UnLzfError,
+                    'IO::Compress::PPMd'                 => \$IO::Compress::PPMd::PPMdError,
+                    'IO::Compress::PPMd::ppmd'            => \$IO::Compress::PPMd::PPMdError,
+                    'IO::Uncompress::UnPPMd'             => \$IO::Uncompress::UnPPMd::UnPPMdError,
+                    'IO::Uncompress::UnPPMd::unppmd'      => \$IO::Uncompress::UnPPMd::UnPPMdError,
 
                     'IO::Compress::DummyComp'           => \$IO::Compress::DummyComp::DummyCompError,
                     'IO::Compress::DummyComp::dummycomp'=> \$IO::Compress::DummyComp::DummyCompError,
@@ -293,6 +307,8 @@
                     'IO::Uncompress::UnLzop'      => 'IO::Uncompress::UnLzop::unlzop',
                     'IO::Compress::Lzf'           => 'IO::Compress::Lzf::lzf',
                     'IO::Uncompress::UnLzf'       => 'IO::Uncompress::UnLzf::unlzf',
+                    'IO::Compress::PPMd'           => 'IO::Compress::PPMd::ppmd',
+                    'IO::Uncompress::UnPPMd'       => 'IO::Uncompress::UnPPMd::unppmd',
                     'IO::Compress::DummyComp'     => 'IO::Compress::DummyComp::dummyuncomp',
                     'IO::Uncompress::DummyUncomp' => 'IO::Uncompress::DummyUncomp::dummyuncomp',
                  );
@@ -319,6 +335,8 @@
                  'IO::Compress::Lzop'                    => 'IO::Uncompress::UnLzop',
                  'IO::Compress::Lzf::lzf'                => 'IO::Uncompress::UnLzf::unlzf',
                  'IO::Compress::Lzf'                     => 'IO::Uncompress::UnLzf',
+                 'IO::Compress::PPMd::ppmd'              => 'IO::Uncompress::UnPPMd::unppmd',
+                 'IO::Compress::PPMd'                    => 'IO::Uncompress::UnPPMd',
                  'IO::Compress::DummyComp::dummycomp'    => 'IO::Uncompress::DummyUncomp::dummyuncomp',
                  'IO::Compress::DummyComp'               => 'IO::Uncompress::DummyUncomp',
              );
@@ -372,6 +390,8 @@
                     'IO::Uncompress::UnLzop::unlzop'          => 'IO::Compress::Lzop',
                     'IO::Uncompress::UnLzp'                   => 'IO::Compress::Lzf',
                     'IO::Uncompress::UnLzf::unlzf'            => 'IO::Compress::Lzf',
+                    'IO::Uncompress::UnPPMd'                  => 'IO::Compress::PPMd',
+                    'IO::Uncompress::UnPPMd::unppmd'          => 'IO::Compress::PPMd',
                     'IO::Uncompress::AnyInflate'              => 'IO::Compress::Gzip',
                     'IO::Uncompress::AnyInflate::anyinflate'  => 'IO::Compress::Gzip',
                     'IO::Uncompress::AnyUncompress'           => 'IO::Compress::Gzip',
diff -urN perl-5.10.0.orig/t/lib/compress/destroy.pl perl-5.10.0/t/lib/compress/destroy.pl
--- perl-5.10.0.orig/t/lib/compress/destroy.pl	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/lib/compress/destroy.pl	2009-12-01 11:18:49.000000000 +0100
@@ -17,7 +17,7 @@
     $extra = 1
         if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
 
-    plan tests => 7 + $extra ;
+    plan tests => 15 + $extra ;
 
     use_ok('IO::File') ;
 }
@@ -73,6 +73,43 @@
 
         ok anyUncompress($name) eq $hello ;
     }
+    
+    {
+        title "Testing DESTROY doesn't clobber \$! etc ";
+
+        my $lex = new LexFile my $name ;
+
+        my $out;
+        my $result;
+        
+        {
+            ok my $z = new $CompressClass($name); 
+            $z->write("abc") ;
+            $! = 22 ;
+
+            cmp_ok $!, '==', 22, '  $! is 22';
+        }
+        
+        cmp_ok $!, '==', 22, "  \$! has not been changed by $CompressClass destructor";
+
+                
+        {
+                my $uncomp;
+                ok my $x = new $UncompressClass($name, -Append => 1)  ;
+                
+                my $len ;
+                1 while ($len = $x->read($result)) > 0 ;
+                
+                $! = 22 ;
+
+                cmp_ok $!, '==', 22, '  $! is 22';
+        }    
+           
+        cmp_ok $!, '==', 22, "  \$! has not been changed by $UncompressClass destructor";
+                
+        is $result, "abc", "  Got uncompressed content ok";
+ 
+    }
 }
 
 1;
diff -urN perl-5.10.0.orig/t/lib/compress/generic.pl perl-5.10.0/t/lib/compress/generic.pl
--- perl-5.10.0.orig/t/lib/compress/generic.pl	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/lib/compress/generic.pl	2009-12-01 11:18:49.000000000 +0100
@@ -47,6 +47,7 @@
     my $Error           = getErrorRef($CompressClass);
     my $UnError         = getErrorRef($UncompressClass);
 
+    if(1)
     {
 
         title "Testing $CompressClass Errors";
@@ -81,7 +82,7 @@
         like $@, mkEvalErr("^${CompressClass}::write: offset outside string");
 
         eval ' $gz->syswrite("abc", 1, -4)' ;
-        like $@, mkEvalErr("^${CompressClass}::write: offset outside string");
+        like $@, mkEvalErr("^${CompressClass}::write: offset outside string"), "write outside string";
     }
 
 
@@ -118,6 +119,7 @@
 
     }
 
+
     {
         title "Testing $CompressClass and $UncompressClass";
 
@@ -161,7 +163,6 @@
 
 
             my $lex = new LexFile my $name ;
-            #my $name = "/tmp/try.lzf";
 
             my $hello = <<EOM ;
 hello world
@@ -322,7 +323,6 @@
 
               ok $x->close, "  close" ;
             }
-            #exit;
 
             is $uncomp, $hello, "  expected output" ;
         }
@@ -419,11 +419,11 @@
               ok ! defined $x->fileno() ;
               1 while $x->read($uncomp) > 0  ;
 
-              ok $x->close ;
+              ok $x->close, "closed" ;
             }
 
-            is $uncomp, $hello ;
-            ok $buffer eq $keep ;
+            is $uncomp, $hello, "got expected uncompressed data" ;
+            ok $buffer eq $keep, "compressed input not changed" ;
         }
 
         if ($CompressClass ne 'RawDeflate')
@@ -434,8 +434,9 @@
             my $buffer = '';
             {
               my $x ;
-              ok $x = new $CompressClass(\$buffer) ;
-              ok $x->close ;
+              $x = new $CompressClass(\$buffer);
+              ok $x, "new $CompressClass" ;
+              ok $x->close, "close ok" ;
           
             }
 
@@ -541,7 +542,6 @@
             read($fh1, $rest, 5000);
             is $x->trailingData() . $rest, $trailer ;
             #print "# [".$x->trailingData() . "][$rest]\n" ;
-            #exit;
 
         }
 
@@ -1416,7 +1416,6 @@
             }
         }
 
-
         {
             title "write tests - invalid data" ;
 

perl-update-IO-Compress-Zlib.patch:
 MANIFEST                                                   |    1 
 ext/IO_Compress_Zlib/Changes                               |   38 +
 ext/IO_Compress_Zlib/Makefile.PL                           |    9 
 ext/IO_Compress_Zlib/README                                |   44 --
 ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm    |    6 
 ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm   |    4 
 ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm            |  143 ------
 ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm               |  148 ------
 ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm     |    2 
 ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm         |  146 ------
 ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm                |  226 +++-------
 ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm      |   18 
 ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm     |    2 
 ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm         |    4 
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm |    6 
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm  |    6 
 ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm       |  143 ------
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm           |  141 ------
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm          |  131 ------
 ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm       |  126 -----
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm            |  204 +++------
 ext/IO_Compress_Zlib/t/006zip.t                            |  276 +++++++++++++
 22 files changed, 614 insertions(+), 1210 deletions(-)

--- NEW FILE perl-update-IO-Compress-Zlib.patch ---
IO-Compress-Zlib-2.015
(omitting changes to private/MakeUtil.pm)
(omitting changes to perl-5.10.0/t/lib/compress; these are in
IO-Compress-Base 2.015 update)

diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2009-12-01 11:02:59.000000000 +0100
+++ perl-5.10.0/MANIFEST	2009-12-01 12:10:21.000000000 +0100
@@ -736,6 +736,7 @@
 ext/IO_Compress_Zlib/t/002any-zip.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/004gziphdr.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/005defhdr.t	IO::Compress::Zlib
+ext/IO_Compress_Zlib/t/006zip.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/010examples.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/020isize.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/050interop-gzip.t	IO::Compress::Zlib
diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/Changes perl-5.10.0/ext/IO_Compress_Zlib/Changes
--- perl-5.10.0.orig/ext/IO_Compress_Zlib/Changes	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Zlib/Changes	2009-12-01 12:05:25.000000000 +0100
@@ -1,6 +1,44 @@
 CHANGES
 -------
 
+  2.015 3 September 2008
+
+      * Makefile.PL
+        Backout changes made in 2.014
+
+  2.014 2 September 2008
+
+      * Makefile.PL
+        Updated to check for indirect dependencies.
+
+  2.012 15 July 2008
+
+      * No Changes
+
+  2.011 17 May 2008
+
+      * IO::Uncompress::Unzip 
+        - Print an error message if the zip file contains a
+          member compressed with bzip2 and IO::Uncompress::Bunzip2 is 
+          not available.
+        - Could not cope with mixed compression zip files. For example a
+          zip file that contains both STORED and DEFLATED content.
+          [RT #35573]
+
+  2.010 5 May 2008
+
+      * Fixed problem that meant Perl 5.10 could not upgrade this module.
+        [RT #35343]
+
+  2.009 20 April 2008
+
+      * IO::Compress::Zip 
+
+        - Added exUnix2 option to allow storing of UID & GID.
+        - When running on a Unix derivative the ExtAttr option now defaults
+          to the equivalent of 0666. For all other systems the default
+          remains 0.
+
   2.008 2 November 2007
 
       * Minor documentation changes in README
diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/Makefile.PL perl-5.10.0/ext/IO_Compress_Zlib/Makefile.PL
--- perl-5.10.0.orig/ext/IO_Compress_Zlib/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Zlib/Makefile.PL	2009-12-01 12:05:35.000000000 +0100
@@ -3,7 +3,7 @@
 use strict ;
 require 5.004 ;
 
-$::VERSION = '2.008' ;
+$::VERSION = '2.015' ;
 
 use private::MakeUtil;
 use ExtUtils::MakeMaker 5.16 ;
@@ -51,6 +51,13 @@
 
     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
 
+    (
+    $] >= 5.009 && ! $ENV{PERL_CORE}
+        ? (INST_LIB    => 'blib/arch')
+        : ()
+    ),
+
+
     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
         ('LICENSE'  => 'perl')         : ()),    
 
diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/README perl-5.10.0/ext/IO_Compress_Zlib/README
--- perl-5.10.0.orig/ext/IO_Compress_Zlib/README	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Zlib/README	2009-12-01 12:05:41.000000000 +0100
@@ -1,44 +1,30 @@
 
                              IO-Compress-Zlib
 
-                             Version 2.008
+                             Version 2.015
 
-                             2nd November 2007
+                            2nd September 2008
 
-
-       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+       Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
            and/or modify it under the same terms as Perl itself.
 
-
-
-
 DESCRIPTION
 -----------
 
-
 This module provides a Perl interface to allow reading and writing of RFC
 1950, 1951, 1952 (i.e. gzip) and zip files/buffers.
 
-
-
-
-
 PREREQUISITES
 -------------
 
 Before you can build IO-Compress-Zlib you need to have the following
 installed on your system:
 
-
     * Perl 5.004 or better. 
     * Compress::Raw::Zlib
     * IO::Compress::Base
 
-
-
-
-
 BUILDING THE MODULE
 -------------------
 
@@ -49,8 +35,6 @@
     make
     make test
 
-
-
 INSTALLATION
 ------------
 
@@ -58,28 +42,16 @@
 
     make install
 
-
-
-
-
 TROUBLESHOOTING
 ---------------
 
-
-
-
-
-
-
-
-
 The t/020isize Test Suite
 ------------------------
 
 This test suite checks that IO-Compress-Zlib can cope with gzip files
 that are larger than 2^32 bytes.
 
-By default these test are NOT run when you do a "make test". If you
+By default these tests are NOT run when you do a "make test". If you
 really want to run them, you need to execute "make longtest".
 
 Be warned though -- this test suite can take hours to run on a slow box.
@@ -88,9 +60,6 @@
 run out of memory during this test. This should not be considered a bug
 in the IO-Compress-Zlib module.
 
-
-
-
 FEEDBACK
 --------
 
@@ -124,9 +93,7 @@
         If you haven't installed IO-Compress-Zlib then search IO::Compress::Gzip.pm
         for a line like this:
 
-          $VERSION = "2.008" ;
-
-
+          $VERSION = "2.015" ;
 
[...4833 lines suppressed...]
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+SKIP:
+{
+    title "Create a simple zip - All Bzip2";
+
+    skip "IO::Compress::Bzip2 not available", 9
+        unless defined $IO::Compress::Bzip2::VERSION;
+
+    my $lex = new LexFile my $file1;
+
+    my @content = (
+                   'hello',
+                   '',
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_BZIP2, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_BZIP2);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+SKIP:
+{
+    title "Create a simple zip - Deflate + Bzip2";
+
+    skip "IO::Compress::Bzip2 not available", 9
+        unless $IO::Compress::Bzip2::VERSION;
+
+    my $lex = new LexFile my $file1;
+
+    my @content = (
+                   'hello',
+                   'and',
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+    title "Create a simple zip - All STORE";
+
+    my $lex = new LexFile my $file1;
+
+    my @content = (
+                   'hello',
+                   '',
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_STORE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_STORE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+    title "Create a simple zip - Deflate + STORE";
+
+    my $lex = new LexFile my $file1;
+
+    my @content = qw(
+                   hello 
+                       and
+                   goodbye 
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+    title "Create a simple zip - Deflate + zero length STORE";
+
+    my $lex = new LexFile my $file1;
+
+    my @content = (
+                   'hello ',
+                   '',
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    ok $got[1] eq $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+
+SKIP:
+for my $method (ZIP_CM_DEFLATE, ZIP_CM_STORE, ZIP_CM_BZIP2)
+{
+    title "Read a line from zip, Method $method";
+
+    skip "IO::Compress::Bzip2 not available", 14
+        unless defined $IO::Compress::Bzip2::VERSION;
+
+    my $content = "a single line\n";
+    my $zip ;
+
+    my $status = zip \$content => \$zip, 
+                    Method => $method, 
+                    Stream => 0, 
+                    Name => "123";
+    is $status, 1, "  Created a zip file";
+
+    my $u = new IO::Uncompress::Unzip \$zip;
+    isa_ok $u, "IO::Uncompress::Unzip";
+
+    is $u->getline, $content, "  Read first line ok";
+    ok ! $u->getline, "  Second line doesn't exist";
+
+
+}


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- perl.spec	24 Nov 2009 13:12:49 -0000	1.236
+++ perl.spec	1 Dec 2009 15:14:56 -0000	1.237
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        85%{?dist}
+Release:        87%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -239,15 +239,19 @@ Patch118:	perl-update-autodie.patch
 # cpan has it under PathTools-3.30
 Patch119:	perl-update-FileSpec.patch
 %define			    File_Spec_version 3.30
-Patch120:	perl-update-Compress_Raw_Zlib.patch
-%define			    Compress_Raw_Zlib 2.020
+Patch120:	perl-update-Compress-Raw-Zlib.patch
+%define			    Compress_Raw_Zlib_version 2.023
 Patch121:	perl-update-Scalar-List-Utils.patch
 %define			    Scalar_List_Utils 1.21
 Patch122:	perl-update-Module-Pluggable.patch
-%define             Module_Pluggable_version 3.90
+%define			    Module_Pluggable_version 3.90
 # Also fixes segfault when objects are reblessed (rt#33242, rhbz#459918)
 Patch123:	perl-update-Storable.patch
-%define             Storable_version 2.21
+%define			    Storable_version 2.21
+Patch124:	perl-update-IO-Compress-Base.patch
+%define			    IO_Compress_Base_version 2.015
+Patch125:	perl-update-IO-Compress-Zlib.patch
+%define			    IO_Compress_Zlib_version 2.015
 
 # Fedora uses links instead of lynx
 # patches File-Fetch and CPAN
@@ -423,7 +427,7 @@ Summary:        Low-Level Interface to t
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        2.008
+Version:        %{Compress_Raw_Zlib_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Compress-Raw-Zlib
@@ -577,7 +581,7 @@ Summary:        Base Class for IO::Compr
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        2.008
+Version:        %{IO_Compress_Base_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description IO-Compress-Base
@@ -592,8 +596,7 @@ Summary:        Perl interface to allow 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-# Really 1.23_01, but we drop the _01.
-Version:        2.008
+Version:        %{IO_Compress_Zlib_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description IO-Compress-Zlib
@@ -1029,10 +1032,12 @@ upstream tarball from perl.org.
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1
-%patch123 -p1
 # 0-byte files and patch don't seem to agree
 mkdir t/Module_Pluggable/lib/Zot/
 touch t/Module_Pluggable/lib/Zot/.Zork.pm
+%patch123 -p1
+%patch124 -p1
+%patch125 -p1
 
 
 %patch201 -p1
@@ -1312,10 +1317,12 @@ perl -x patchlevel.h \
 	'Fedora Patch117: Update Digest::SHA to %{Digest_SHA_version}' \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch119: Update File::Spec to %{File_Spec_version}' \
-	'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib}' \
+	'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib_version}' \
 	'Fedora Patch121: Update Scalar-List-Utils to %{Scalar_List_Utils}' \
 	'Fedora Patch122: Update Module-Pluggable to %{Module_Pluggable_version}' \
 	'Fedora Patch123: Update Storable to %{Storable_version}' \
+	'Fedora Patch124: Update IO::Compress::Base to %{IO_Compress_Base_version}' \
+	'Fedora Patch125: Update IO::Compress::Zlib to %{IO_Compress_Zlib_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
 	%{nil}
 
@@ -1942,6 +1949,14 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Dec  1 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-87
+- fix patch-update-Compress-Raw-Zlib.patch (did not patch Zlib.pm)
+- update Compress::Raw::Zlib to 2.023
+- update IO::Compress::Base, and IO::Compress::Zlib to 2.015 (#542645)
+
+* Mon Nov 30 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.0-86
+- 542645 update IO-Compress-Base
+
 * Tue Nov 24 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-85
 - back out perl-5.10.0-spamassassin.patch (#528572)
 


--- perl-update-Compress_Raw_Zlib.patch DELETED ---



From kasal at fedoraproject.org  Tue Dec  1 15:15:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  1 Dec 2009 15:15:30 +0000 (UTC)
Subject: rpms/perl/F-12 perl-update-Compress-Raw-Zlib.patch, NONE,
	1.1 perl-update-IO-Compress-Zlib.patch, NONE,
	1.1 perl-update-IO-Compress-Base.patch, 1.1, 1.2 perl.spec,
	1.235, 1.236 perl-update-Compress_Raw_Zlib.patch, 1.1, NONE
Message-ID: <20091201151530.5F1A311C00DE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14830

Modified Files:
	perl-update-IO-Compress-Base.patch perl.spec 
Added Files:
	perl-update-Compress-Raw-Zlib.patch 
	perl-update-IO-Compress-Zlib.patch 
Removed Files:
	perl-update-Compress_Raw_Zlib.patch 
Log Message:
sync with devel

perl-update-Compress-Raw-Zlib.patch:
 MANIFEST                                       |    1 
 ext/Compress/Raw/Zlib/Changes                  |   67 +++++
 ext/Compress/Raw/Zlib/Makefile.PL              |   13 -
 ext/Compress/Raw/Zlib/README                   |   83 ++----
 ext/Compress/Raw/Zlib/Zlib.xs                  |  116 +++++++--
 ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm |  307 +++++++++++++++++++++----
 ext/Compress/Raw/Zlib/t/02zlib.t               |  157 ++++++++++++
 ext/Compress/Raw/Zlib/t/09limitoutput.t        |  129 ++++++++++
 8 files changed, 728 insertions(+), 145 deletions(-)

--- NEW FILE perl-update-Compress-Raw-Zlib.patch ---
Compress-Raw-Zlib-2.023
(omitting changes to private/MakeUtil.pm)
(omitting changes to perl-5.10.0/t/lib/compress; these are in
IO-Compress-Base 2.015 update)

diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2009-12-01 14:46:37.000000000 +0100
+++ perl-5.10.0/MANIFEST	2009-12-01 15:43:34.000000000 +0100
@@ -124,6 +124,7 @@
 ext/Compress/Raw/Zlib/t/01version.t	Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/t/02zlib.t	Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/t/07bufsize.t	Compress::Raw::Zlib
+ext/Compress/Raw/Zlib/t/09limitoutput.t	Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/t/18lvalue.t	Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/typemap		Compress::Raw::Zlib
 ext/Compress/Raw/Zlib/zlib-src/adler32.c	Compress::Raw::Zlib
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Changes perl-5.10.0/ext/Compress/Raw/Zlib/Changes
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Changes	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/Changes	2009-12-01 15:38:24.000000000 +0100
@@ -1,6 +1,73 @@
 CHANGES
 -------
 
+  2.023 9 November 2009
+
+      * fixed instance where $[ should have been $] in t/02zlib.t
+        Thanks to Robin Barker and zefram [RT #50765] for independantly
+        spotting the issue.
+
+  2.021 30 August 2009
+
+      * Changed test harness so that it can cope with PERL5OPT=-MCarp=verbose
+        [RT# 47225]
+
+  2.020 3 June 2009
+
+      * Minor documentation update.
+
+  2.019 4 May 2009
+
+      * No Changes
+
+  2.018 3 May 2009
+
+      * No Changes
+
+  2.017 28 March 2009
+
+      * Added 'LimitOutput' option
+
+      * Removed MAN3PODS from Makefile.PL
+
+      * Fixed coring issue when LimitOutput was used.
+
+      * Documented Compress::Raw::Zlib::zlib_version()
+
+      * Documented Compress::Raw::Zlib::deflateReset()
+        [RT #40566]
+
+  2.015 3 September 2008
+
+      * Makefile.PL
+        Backout changes made in 2.014
+
+  2.014 2 September 2008
+
+      * Makefile.PL
+        Updated to check for indirect dependencies.
+
+  2.012 15 July 2008
+
+      * Document the gzip flags that WindowBits can take.
+
+      * Allow a dictionary to be used with a raw inflate. 
+        Needs zlib 1.2.2.1 or better.
+        [RT #36046]
+      
+  2.011 5 May 2008
+
+      * A C++-style comment sneaked in with the last update. Fixed.
+        [core patch #33828]
+
+  2.010 5 May 2008
+
+      * No Changes
+
+  2.009 20 April 2008
+
+      * No Changes
+
   2.008 2 November 2007
 
       * Minor documentation changes in README
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Makefile.PL perl-5.10.0/ext/Compress/Raw/Zlib/Makefile.PL
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Makefile.PL	2009-12-01 14:47:16.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/Makefile.PL	2009-12-01 15:38:24.000000000 +0100
@@ -77,24 +77,11 @@
                     },
 
     (
-      $ENV{SKIP_FOR_CORE}
-        ? (MAN3PODS    => {})
-        : ()
-    ),
-       
-    (
       $BUILD_ZLIB
         ? zlib_files($ZLIB_LIB)
         : (LIBS => [ "-L$ZLIB_LIB -lz " ])
     ),
       
-    (
-      $] >= 5.005
-        ? (ABSTRACT_FROM => 'lib/Compress/Raw/Zlib.pm',
-            AUTHOR       => 'Paul Marquess <pmqs at cpan.org>')
-        : ()
-    ),
-
     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
 
     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/README perl-5.10.0/ext/Compress/Raw/Zlib/README
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/README	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/README	2009-12-01 15:38:24.000000000 +0100
@@ -1,16 +1,14 @@
 
                              Compress-Raw-Zlib
 
-                             Version 2.008
+                             Version 2.023
 
-                             2nd November 2007
+                             9th November 2009
 
-
-       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+       Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
            and/or modify it under the same terms as Perl itself.
 
-
               The directory zlib-src contains a subset of the 
              source files copied directly from zlib version 1.2.3.
                   These files are Copyright(C) 1995-2005
@@ -18,39 +16,27 @@
              Full source for the zlib library is available at
                             http://www.zlib.org
 
-
-
 DESCRIPTION
 -----------
 
-
 This module provides a Perl interface to the zlib compression library.  
 
-
-
-
-
 PREREQUISITES
 -------------
 
 Before you can build Compress-Raw-Zlib you need to have the following
 installed on your system:
 
-
     * A C compiler
 
     * Perl 5.004 or better. 
 
-
-
 By default, Compress-Raw-Zlib will build its own private copy of the 
 zlib library. If you want to use a different version of 
 zlib, follow the instructions in the section called 
 "Controlling the version of zlib used by Compress-Raw-Zlib" 
 later in this document.
 
-
-
 BUILDING THE MODULE
 -------------------
 
@@ -61,8 +47,6 @@
     make
     make test
 
-
-
 INSTALLATION
 ------------
 
@@ -70,9 +54,6 @@
 
     make install
 
-
-
-
 Controlling the version of zlib used by Compress-Raw-Zlib 
 ----------------------------------------------------------
 
@@ -92,7 +73,6 @@
 Note that if you intend to use either Option 2 or 3, you need to have
 zlib version 1.0.5 or better.
 
-
 The contents of the file config.in are used to control which of the
 three options is actually used. This file is read during the
 
@@ -101,8 +81,6 @@
 step of the build, so remember to make any required changes to config.in
 before building this module.
 
-
-
   Option 1
   --------
   
@@ -169,10 +147,9 @@
 ------------------------
 
 Every gzip stream stores a byte in its header to identify the Operating
-System that was used to create the gzip stream. When you build
-Compress-Raw-Zlib it will attempt to determine the value that is correct for
-your Operating System. This will then be used by IO::Gzip as the default
-value for the OS byte in all gzip headers it creates. 
+System that was used to create the gzip stream. When you build Compress-Raw-Zlib it will attempt to determine the value that is correct for
+your Operating System. This will then be used by IO::Compress::Gzip as the
+default value for the OS byte in all gzip headers it creates. 
  
 The variable GZIP_OS_CODE in the config.in file controls the setting of
 this value when building Compress-Raw-Zlib. If GZIP_OS_CODE is set to
@@ -197,16 +174,37 @@
 detected is incorrect, please take a few moments to contact the author of
 this module.
 
-
-
 TROUBLESHOOTING
 ---------------
 
+Undefined Symbol gzsetparams
+----------------------------
 
+If you get the error shown below when you run the Compress-Raw-Zlib test
+harness it probably means you are running a copy of zlib that is
+version 1.0.5 or older.
 
+t/01version.........Can't load 'blib/arch/auto/Compress/Zlib/Zlib.so' for 
+                    module Compress::Raw::Zlib: blib/arch/auto/Compress/Raw/Zlib/Zlib.so:
+                    undefined symbol: gzsetparams at ...
 
+There are two ways to fix this problem:
 
+    1. Upgrade to the latest version of zlib.
 
+    2. Edit config.in and set the OLD_ZLIB variable to True.
+
+Test Harness 01version fails
+----------------------------
+If the 01version test harness fails, and the problem isn't covered by the
+scenario above, it probably means that you have two versions of 
+zlib installed on your system.
+
+Run the command below to see if this is indeed the case
+
+    make test TEST_VERBOSE=1 TEST_FILES=t/01version.t 
+
+Try removing the one you don't want to use and rebuild.   
 
 Solaris build fails with "language optional software package not installed"
 ---------------------------------------------------------------------------
@@ -245,9 +243,6 @@
 If that doesn't work for you, it's time to make changes to the Makefile
 by hand. Good luck!
 
-
-
-
 Solaris build fails with "gcc: unrecognized option `-KPIC'"
 -----------------------------------------------------------
 
@@ -285,10 +280,6 @@
 is necessary to have first built the zlib library with the -fpic
 option.
 
-
-
-
-
 Linux Notes
 -----------
 
@@ -307,9 +298,6 @@
 for zlib. Check for an RPM that start with "zlib-devel" in your Linux
 distribution.
 
-
-
-
 Win32 Notes
 -----------
 
@@ -318,15 +306,11 @@
 newer version of Compress-Raw-Zlib is available run this from the command
 prompt
 
-    C:\> ppm verify -upgrade Compress-Zlib
-
+    C:\> ppm verify -upgrade Compress-Raw-Zlib
 
 If you are not running Activestate Perl and you don't have access
 to a C compiler, you will not be able to build and install this module.
 
-
-
-
 Win32 & Cygwin Notes
 --------------------
 
@@ -338,7 +322,6 @@
 The workaround is to install Compress-Raw-Zlib manually using the
 instructions given at the start of this file.
 
-
 FEEDBACK
 --------
 
@@ -372,8 +355,7 @@
         If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm
         for a line like this:
 
-          $VERSION = "2.008" ;
-
+          $VERSION = "2.023" ;
 
      c. The version of zlib you have used.
         If you have successfully installed Compress-Raw-Zlib, this one-liner
@@ -381,10 +363,8 @@
 
           perl -MCompress::Raw::Zlib -e "print q[zlib ver ]. Compress::Raw::Zlib::ZLIB_VERSION.qq[\n]" 
 
-
         If not, look at the beginning of the file zlib.h. 
 
-
  2. If you are having problems building Compress-Raw-Zlib, send me a
     complete log of what happened. Start by unpacking the Compress-Raw-Zlib
     module into a fresh directory and keep a log of all the steps
@@ -394,5 +374,4 @@
         make
         make test TEST_VERBOSE=1          
 
-
 Paul Marquess <pmqs at cpan.org>
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Zlib.xs perl-5.10.0/ext/Compress/Raw/Zlib/Zlib.xs
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Zlib.xs	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/Zlib.xs	2009-12-01 15:38:24.000000000 +0100
@@ -3,7 +3,7 @@
  * Created : 22nd January 1996
  * Version : 2.000
  *
- *   Copyright (c) 1995-2007 Paul Marquess. All rights reserved.
+ *   Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
  *   This program is free software; you can redistribute it and/or
  *   modify it under the same terms as Perl itself.
  *
@@ -50,6 +50,10 @@
 #  define AT_LEAST_ZLIB_1_2_2_1
 #endif
 
+#if  defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1222
+#  define AT_LEAST_ZLIB_1_2_2_2
+#endif
+
 #if  defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1223
 #  define AT_LEAST_ZLIB_1_2_2_3
 #endif
@@ -64,6 +68,11 @@
 #  include "ppport.h"
 #endif
 
+#if PERL_REVISION == 5 && PERL_VERSION == 9
+    /* For Andreas */
+#   define sv_pvbyte_force(sv,lp) sv_pvbyten_force(sv,lp)
+#endif
+
 #if PERL_REVISION == 5 && (PERL_VERSION < 8 || (PERL_VERSION == 8 && PERL_SUBVERSION < 4 ))
 
 #    ifdef SvPVbyte_force
@@ -103,6 +112,7 @@
 #define FLAG_CRC32              2
 #define FLAG_ADLER32            4
 #define FLAG_CONSUME_INPUT      8
+#define FLAG_LIMIT_OUTPUT       16
     uLong    crc32 ;
     uLong    adler32 ;
     z_stream stream;
@@ -228,7 +238,8 @@
 #define adlerInitial adler32(0L, Z_NULL, 0)
 #define crcInitial crc32(0L, Z_NULL, 0)
 
-static const char * const my_z_errmsg[] = {
+/* static const char * const my_z_errmsg[] = { */
+static const char my_z_errmsg[][32] = {
     "need dictionary",     /* Z_NEED_DICT     2 */
     "stream end",          /* Z_STREAM_END    1 */
     "",                    /* Z_OK            0 */
@@ -460,6 +471,8 @@
         printf("           CRC32     %s\n",   EnDis(FLAG_CRC32));
         printf("           ADLER32   %s\n",   EnDis(FLAG_ADLER32));
         printf("           CONSUME   %s\n",   EnDis(FLAG_CONSUME_INPUT));
+        printf("           LIMIT     %s\n",   EnDis(FLAG_LIMIT_OUTPUT));
+
 
 #ifdef MAGIC_APPEND
         printf("    window           0x%p\n", s->window);
@@ -510,7 +523,7 @@
 
 static SV* 
 #ifdef CAN_PROTOTYPE
-deRef(SV * sv, char * string)
+deRef(SV * sv, const char * string)
 #else
 deRef(sv, string)
 SV * sv ;
@@ -528,6 +541,8 @@
             case SVt_PVHV:
             case SVt_PVCV:
                 croak("%s: buffer parameter is not a SCALAR reference", string);
+            default:
+                break;
         }
         if (SvROK(sv))
             croak("%s: buffer parameter is a reference to a reference", string) ;
@@ -542,7 +557,7 @@
 
 static SV*
 #ifdef CAN_PROTOTYPE
-deRef_l(SV * sv, char * string)
+deRef_l(SV * sv, const char * string)
 #else
 deRef_l(sv, string)
 SV * sv ;
@@ -565,6 +580,8 @@
             case SVt_PVHV:
             case SVt_PVCV:
                 croak("%s: buffer parameter is not a SCALAR reference", string);
+            default:
+                break;
         }
         if (SvROK(sv))
             croak("%s: buffer parameter is a reference to a reference", string) ;
@@ -802,6 +819,19 @@
             s = NULL ;
 	}
 	else if (SvCUR(dictionary)) {
+#ifdef AT_LEAST_ZLIB_1_2_2_1
+        /* Zlib 1.2.2.1 or better allows a dictionary with raw inflate */
+        if (s->WindowBits < 0) {
+            err = inflateSetDictionary(&(s->stream), 
+                (const Bytef*)SvPVbyte_nolen(dictionary),
+                SvCUR(dictionary));
+            if (err != Z_OK) {
+                Safefree(s) ;
+                s = NULL ;
+            }
+        }
+        else
+#endif   
             /* Dictionary specified - take a copy for use in inflate */
 	    s->dictionary = newSVsv(dictionary) ;
 	}
@@ -1246,7 +1276,7 @@
     bool 	eof 
     uInt	cur_length = 0;
     uInt	prefix_length = 0;
-    uInt	increment = 0;
+    int	    increment = 0;
     STRLEN  stmp    = NO_INIT
     uLong     bufinc = NO_INIT
   PREINIT:
@@ -1280,22 +1310,39 @@
     if((s->flags & FLAG_APPEND) != FLAG_APPEND) {
         SvCUR_set(output, 0);
     }
+   
+    /* Assume no output buffer - the code below will update if there is any available */
+    s->stream.avail_out = 0;
+
+
     if (SvLEN(output)) {
         prefix_length = cur_length =  SvCUR(output) ;
-        s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length;
-        increment = SvLEN(output) -  cur_length - 1;
-        s->stream.avail_out = increment;
-    }
-    else {
-        s->stream.avail_out = 0;
+    
+        if (s->flags & FLAG_LIMIT_OUTPUT && SvLEN(output) - cur_length - 1 < bufinc)
+        {
+            Sv_Grow(output, bufinc + cur_length + 1) ;
+        }
+    
+        /* Only setup the stream output pointers if there is spare 
+           capacity in the outout SV
+        */
+        if (SvLEN(output) > cur_length + 1)
+        {
+            s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length;
+            increment = SvLEN(output) -  cur_length - 1;
+            s->stream.avail_out = increment;
+        }
     }
+    
+
     s->bytesInflated = 0;
     
-    while (1) {
+    RETVAL = Z_OK;
 
-        if (s->stream.avail_out == 0 ) {
+    while (RETVAL == Z_OK) {
+        if (s->stream.avail_out == 0) {
 	    /* out of space in the output buffer so make it bigger */
-            Sv_Grow(output, SvLEN(output) + bufinc) ;
+            Sv_Grow(output, SvLEN(output) + bufinc +1) ;
             cur_length += increment ;
             s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length ;
             increment = bufinc ;
@@ -1303,10 +1350,30 @@
             bufinc *= 2 ; 
         }
 
+        /* printf("INFLATE Availl In %d, Out %d\n", s->stream.avail_in,
+ s->stream.avail_out); 
+DispStream(s, "BEFORE");
+Perl_sv_dump(output); */
         RETVAL = inflate(&(s->stream), Z_SYNC_FLUSH);
+        /* printf("INFLATE returned %d %s, avail in %d, out %d\n", RETVAL,
+ GetErrorString(RETVAL), s->stream.avail_in, s->stream.avail_out); */
+
+    
+        if (RETVAL == Z_NEED_DICT && s->dictionary) {
+            s->dict_adler = s->stream.adler ;
+            RETVAL = inflateSetDictionary(&(s->stream), 
+            (const Bytef*)SvPVbyte_nolen(s->dictionary),
+            SvCUR(s->dictionary));
+            if (RETVAL == Z_OK)
+                continue;
+        }
+        
+        if (s->flags & FLAG_LIMIT_OUTPUT && 
+                (RETVAL == Z_OK || RETVAL == Z_BUF_ERROR ))
+            break;
 
         if (RETVAL == Z_STREAM_ERROR || RETVAL == Z_MEM_ERROR ||
-            RETVAL == Z_DATA_ERROR  || RETVAL == Z_STREAM_END )
+            RETVAL == Z_DATA_ERROR   || RETVAL == Z_STREAM_END )
             break ;
 
         if (RETVAL == Z_BUF_ERROR) {
@@ -1317,19 +1384,9 @@
                 break ;
             }
         }
-	
-        if (RETVAL == Z_NEED_DICT && s->dictionary) {
-            s->dict_adler = s->stream.adler ;
-            RETVAL = inflateSetDictionary(&(s->stream), 
-            (const Bytef*)SvPVbyte_nolen(s->dictionary),
-            SvCUR(s->dictionary));
-        }
-
-        if (RETVAL != Z_OK) 
-            break;
     }
 #ifdef NEED_DUMMY_BYTE_AT_END 
-    if (eof && RETVAL == Z_OK) {
+    if (eof && RETVAL == Z_OK && s->flags & FLAG_LIMIT_OUTPUT == 0) {
         Bytef* nextIn =  s->stream.next_in;
         uInt availIn =  s->stream.avail_in;
         s->stream.next_in = (Bytef*) " ";
@@ -1350,8 +1407,8 @@
 #endif
     
     s->last_error = RETVAL ;
-    if (RETVAL == Z_OK || RETVAL == Z_STREAM_END || RETVAL == Z_DATA_ERROR) {
-	unsigned in ;
+    if (RETVAL == Z_OK || RETVAL == Z_STREAM_END || RETVAL == Z_BUF_ERROR || RETVAL == Z_DATA_ERROR) {
+	   unsigned in ;
 
         s->bytesInflated = cur_length + increment - s->stream.avail_out - prefix_length;
         s->uncompressedBytes += s->bytesInflated ;
@@ -1377,7 +1434,7 @@
             			SvCUR(output)-prefix_length) ;
 
 	/* fix the input buffer */
-	if (s->flags & FLAG_CONSUME_INPUT) {
+	if (s->flags & FLAG_CONSUME_INPUT || s->flags & FLAG_LIMIT_OUTPUT) {
 	    in = s->stream.avail_in ;
 	    SvCUR_set(buf, in) ;
 	    if (in)
@@ -1385,6 +1442,7 @@
             *SvEND(buf) = '\0';
             SvSETMAGIC(buf);
 	}
+
     }
     OUTPUT:
 	RETVAL
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm perl-5.10.0/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm	2009-12-01 15:38:24.000000000 +0100
@@ -13,7 +13,7 @@
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.008';
+$VERSION = '2.023';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -62,8 +62,13 @@
         Z_SYNC_FLUSH
         Z_UNKNOWN
         Z_VERSION_ERROR
+
+        WANT_GZIP
+        WANT_GZIP_OR_ZLIB
 );
 
+use constant WANT_GZIP           => 16;
+use constant WANT_GZIP_OR_ZLIB   => 32;
 
 sub AUTOLOAD {
     my($constname);
@@ -79,6 +84,7 @@
 use constant FLAG_CRC                => 2 ;
 use constant FLAG_ADLER              => 4 ;
 use constant FLAG_CONSUME_INPUT      => 8 ;
+use constant FLAG_LIMIT_OUTPUT       => 16 ;
 
 eval {
     require XSLoader;
@@ -361,10 +367,14 @@
     $flags |= FLAG_CRC    if $got->value('CRC32') ;
     $flags |= FLAG_ADLER  if $got->value('ADLER32') ;
 
+    my $windowBits =  $got->value('WindowBits');
+    $windowBits += MAX_WBITS()
+        if ($windowBits & MAX_WBITS()) == 0 ;
+
     _deflateInit($flags,
                 $got->value('Level'), 
                 $got->value('Method'), 
-                $got->value('WindowBits'), 
+                $windowBits, 
                 $got->value('MemLevel'), 
                 $got->value('Strategy'), 
                 $got->value('Bufsize'),
@@ -378,6 +388,7 @@
     my ($got) = ParseParameters(0,
                     {
                         'AppendOutput'  => [1, 1, Parse_boolean,  0],
+                        'LimitOutput'   => [1, 1, Parse_boolean,  0],
                         'CRC32'         => [1, 1, Parse_boolean,  0],
                         'ADLER32'       => [1, 1, Parse_boolean,  0],
                         'ConsumeInput'  => [1, 1, Parse_boolean,  1],
@@ -397,8 +408,14 @@
     $flags |= FLAG_CRC    if $got->value('CRC32') ;
     $flags |= FLAG_ADLER  if $got->value('ADLER32') ;
     $flags |= FLAG_CONSUME_INPUT if $got->value('ConsumeInput') ;
+    $flags |= FLAG_LIMIT_OUTPUT if $got->value('LimitOutput') ;
+
+
+    my $windowBits =  $got->value('WindowBits');
+    $windowBits += MAX_WBITS()
+        if ($windowBits & MAX_WBITS()) == 0 ;
 
-    _inflateInit($flags, $got->value('WindowBits'), $got->value('Bufsize'), 
+    _inflateInit($flags, $windowBits, $got->value('Bufsize'), 
                  $got->value('Dictionary')) ;
 }
 
@@ -530,6 +547,7 @@
     ($d, $status) = new Compress::Raw::Zlib::Deflate( [OPT] ) ;
     $status = $d->deflate($input, $output) ;
     $status = $d->flush($output [, $flush_type]) ;
+    $d->deflateReset() ;
     $d->deflateParams(OPTS) ;
     $d->deflateTune(OPTS) ;
     $d->dict_adler() ;
@@ -559,8 +577,7 @@
     $crc = adler32_combine($crc1, $crc2, $len2)l
     $crc = crc32_combine($adler1, $adler2, $len2)
 
-    ZLIB_VERSION
-    ZLIB_VERNUM
+    my $version = Compress::Raw::Zlib::zlib_version();
 
 =head1 DESCRIPTION
 
@@ -568,8 +585,6 @@
 compression library (see L</AUTHOR> for details about where to get
 I<zlib>). 
 
-
-
 =head1 Compress::Raw::Zlib::Deflate
 
 This section defines an interface that allows in-memory compression using
@@ -577,7 +592,6 @@
 
 Here is a definition of the interface available:
 
-
 =head2 B<($d, $status) = new Compress::Raw::Zlib::Deflate( [OPT] ) >
 
 Initialises a deflation object. 
@@ -610,7 +624,7 @@
 C<Z_NO_COMPRESSION>, C<Z_BEST_SPEED>, C<Z_BEST_COMPRESSION>, and
 C<Z_DEFAULT_COMPRESSION>.
 
-The default is Z_DEFAULT_COMPRESSION.
+The default is C<Z_DEFAULT_COMPRESSION>.
 
 =item B<-Method>
 
@@ -619,10 +633,18 @@
 
 =item B<-WindowBits>
 
+To compress an RFC 1950 data stream, set C<WindowBits> to a positive
+number between 8 and 15.
+
+To compress an RFC 1951 data stream, set C<WindowBits> to C<-MAX_WBITS>.
+
+To compress an RFC 1952 data stream (i.e. gzip), set C<WindowBits> to
+C<WANT_GZIP>.
+
 For a definition of the meaning and valid values for C<WindowBits>
 refer to the I<zlib> documentation for I<deflateInit2>.
 
-Defaults to MAX_WBITS.
+Defaults to C<MAX_WBITS>.
 
 =item B<-MemLevel>
 
@@ -678,7 +700,6 @@
 
 This option defaults to false.
 
-
 =item B<-ADLER32>
 
 If set to true, an adler32 checksum of the uncompressed data will be
@@ -686,7 +707,6 @@
 
 This option defaults to false.
 
-
 =back
 
 Here is an example of using the C<Compress::Raw::Zlib::Deflate> optional
@@ -696,7 +716,6 @@
     my $d = new Compress::Raw::Zlib::Deflate ( -Bufsize => 300, 
                                                -Level   => Z_BEST_SPEED ) ;
 
-
 =head2 B<$status = $d-E<gt>deflate($input, $output)>
 
 Deflates the contents of C<$input> and writes the compressed data to
@@ -744,6 +763,16 @@
 it is false, C<$output> will be truncated before any compressed data is
 written to it.
 
+=head2 B<$status = $d-E<gt>deflateReset() >
+
+This method will reset the deflation object C<$d>. It can be used when you
+are compressing multiple data streams and want to use the same object to
+compress each of them. It should only be used once the previous data stream
+has been flushed successfully, i.e. a call to C<< $d->flush(Z_FINISH) >> has
+returned C<Z_OK>.
+
+Returns C<Z_OK> if successful.
+
 =head2 B<$status = $d-E<gt>deflateParams([OPT])>
 
 Change settings for the deflate object C<$d>.
@@ -751,7 +780,6 @@
 The list of the valid options is shown below. Options not specified
 will remain unchanged.
 
-
 =over 5
 
 =item B<-Level>
@@ -772,7 +800,6 @@
 reallocated to increase the size, it will grow in increments of
 C<Bufsize>.
 
-
 =back
 
 =head2 B<$status = $d-E<gt>deflateTune($good_length, $max_lazy, $nice_length, $max_chain)>
@@ -815,7 +842,6 @@
 Returns the deflation strategy currently used. Valid values are
 C<Z_DEFAULT_STRATEGY>, C<Z_FILTERED> and C<Z_HUFFMAN_ONLY>. 
 
-
 =head2 B<$d-E<gt>get_Level()>
 
 Returns the compression level being used. 
@@ -826,7 +852,6 @@
 
 =head2 Example
 
-
 Here is a trivial example of using C<deflate>. It simply reads standard
 input, deflates it and writes it to standard output.
 
@@ -865,7 +890,6 @@
 
 Here is a definition of the interface:
 
-
 =head2 B< ($i, $status) = new Compress::Raw::Zlib::Inflate( [OPT] ) >
 
 Initialises an inflation object. 
@@ -894,14 +918,20 @@
 =item B<-WindowBits>
 
 To uncompress an RFC 1950 data stream, set C<WindowBits> to a positive
-number.
+number between 8 and 15.
 
 To uncompress an RFC 1951 data stream, set C<WindowBits> to C<-MAX_WBITS>.
 
+To uncompress an RFC 1952 data stream (i.e. gzip), set C<WindowBits> to
+C<WANT_GZIP>.
+
+To auto-detect and uncompress an RFC 1950 or RFC 1952 data stream (i.e.
+gzip), set C<WindowBits> to C<WANT_GZIP_OR_ZLIB>.
+
 For a full definition of the meaning and valid values for C<WindowBits>
 refer to the I<zlib> documentation for I<inflateInit2>.
 
-Defaults to MAX_WBITS.
+Defaults to C<MAX_WBITS>.
 
 =item B<-Bufsize>
 
@@ -928,7 +958,6 @@
 
 This option defaults to false.
 
-
 =item B<-CRC32>
 
 If set to true, a crc32 checksum of the uncompressed data will be
@@ -946,7 +975,7 @@
 =item B<-ConsumeInput>
 
 If set to true, this option will remove compressed data from the input
-buffer of the the C< $i-E<gt>inflate > method as the inflate progresses.
+buffer of the C<< $i->inflate >> method as the inflate progresses.
 
 This option can be useful when you are processing compressed data that is
 embedded in another file/buffer. In this case the data that immediately
@@ -954,6 +983,29 @@
 
 This option defaults to true.
 
+=item B<-LimitOutput>
+
+The C<LimitOutput> option changes the behavior of the C<< $i->inflate >>
+method so that the amount of memory used by the output buffer can be
+limited. 
+
+When C<LimitOutput> is used the size of the output buffer used will either
+be the value of the C<Bufsize> option or the amount of memory already
+allocated to C<$output>, whichever is larger. Predicting the output size
+available is tricky, so don't rely on getting an exact output buffer size.
+
+When C<LimitOutout> is not specified C<< $i->inflate >> will use as much
+memory as it takes to write all the uncompressed data it creates by
+uncompressing the input buffer.
+
+If C<LimitOutput> is enabled, the C<ConsumeInput> option will also be
+enabled.
+
+This option defaults to false.
+
+See L</The LimitOutput option> for a discussion on why C<LimitOutput> is
+needed and how to use it.
+
 =back
 
 Here is an example of using an optional parameter to override the default
@@ -1048,7 +1100,6 @@
 data streams. They must have been added explicitly when the data stream
 was created by calling C<Compress::Deflate::flush>  with C<Z_FULL_FLUSH>.
 
-
 =head2 B<$i-E<gt>dict_adler()>
 
 Returns the adler32 value for the dictionary.
@@ -1083,7 +1134,7 @@
 
 Returns the buffer size used to carry out the decompression.
 
-=head2 Example
+=head2 Examples
 
 Here is an example of using C<inflate>.
 
@@ -1102,10 +1153,9 @@
     my ($output, $status) ;
     while (read(STDIN, $input, 4096))
     {
-        $status = $x->inflate(\$input, $output) ;
+        $status = $x->inflate($input, $output) ;
     
-        print $output 
-            if $status == Z_OK or $status == Z_STREAM_END ;
+        print $output ;
     
         last if $status != Z_OK ;
     }
@@ -1113,6 +1163,46 @@
     die "inflation failed\n"
         unless $status == Z_STREAM_END ;
 
+The next example show how to use the C<LimitOutput> option. Notice the use
+of two nested loops in this case. The outer loop reads the data from the
+input source - STDIN and the inner loop repeatedly calls C<inflate> until
+C<$input> is exhausted, we get an error, or the end of the stream is
+reached. One point worth remembering is by using the C<LimitOutput> option
+you also get C<ConsumeInput> set as well - this makes the code below much
+simpler.
+
+    use strict ;
+    use warnings ;
+    
+    use Compress::Raw::Zlib;
+    
+    my $x = new Compress::Raw::Zlib::Inflate(LimitOutput => 1)
+       or die "Cannot create a inflation stream\n" ;
+    
+    my $input = '' ;
+    binmode STDIN;
+    binmode STDOUT;
+    
+    my ($output, $status) ;
+
+  OUTER:
+    while (read(STDIN, $input, 4096))
+    {
+        do
+        {
+            $status = $x->inflate($input, $output) ;
+
+            print $output ;
+
+            last OUTER
+                unless $status == Z_OK || $status == Z_BUF_ERROR ;
+        }
+        while ($status == Z_OK && length $input);
+    }
+    
+    die "inflation failed\n"
+        unless $status == Z_STREAM_END ;
+
 =head1 CHECKSUM FUNCTIONS
 
 Two functions are provided by I<zlib> to calculate checksums. For the
@@ -1135,24 +1225,163 @@
 
 These functions allow checksums to be merged.
 
-=head1 ACCESSING ZIP FILES
+=head1 Misc
+
+=head2 my $version = Compress::Raw::Zlib::zlib_version();
+
+Returns the version of the zlib library.
+
+=head1 The LimitOutput option.
+
+By default C<< $i->inflate($input, $output) >> will uncompress I<all> data
+in C<$input> and write I<all> of the uncompressed data it has generated to
+C<$output>. This makes the interface to C<inflate> much simpler - if the
+method has uncompressed C<$input> successfully I<all> compressed data in
+C<$input> will have been dealt with. So if you are reading from an input
+source and uncompressing as you go the code will look something like this
+
+    use strict ;
+    use warnings ;
+    
+    use Compress::Raw::Zlib;
+    
+    my $x = new Compress::Raw::Zlib::Inflate()
+       or die "Cannot create a inflation stream\n" ;
+    
+    my $input = '' ;
+    
+    my ($output, $status) ;
+    while (read(STDIN, $input, 4096))
+    {
+        $status = $x->inflate($input, $output) ;
+    
+        print $output ;
+    
+        last if $status != Z_OK ;
+    }
+    
+    die "inflation failed\n"
+        unless $status == Z_STREAM_END ;
+
+The points to note are 
+
+=over 5
+
+=item *
+
+The main processing loop in the code handles reading of compressed data
+from STDIN.
+
+=item *
+
+The status code returned from C<inflate> will only trigger termination of
+the main processing loop if it isn't C<Z_OK>. When C<LimitOutput> has not
+been used the C<Z_OK> status means means that the end of the compressed
+data stream has been reached or there has been an error in uncompression.
+
+=item *
+
+After the call to C<inflate> I<all> of the uncompressed data in C<$input>
+will have been processed. This means the subsequent call to C<read> can
+overwrite it's contents without any problem.
+
+=back
+
+For most use-cases the behavior described above is acceptable (this module
+and it's predecessor, C<Compress::Zlib>, have used it for over 10 years
+without an issue), but in a few very specific use-cases the amount of
+memory required for C<$output> can prohibitively large. For example, if the
+compressed data stream contains the same pattern repeated thousands of
+times, a relatively small compressed data stream can uncompress into
+hundreds of megabytes.  Remember C<inflate> will keep allocating memory
+until I<all> the uncompressed data has been written to the output buffer -
+the size of C<$output> is unbounded. 
+
+The C<LimitOutput> option is designed to help with this use-case.
+
+The main difference in your code when using C<LimitOutput> is having to
+deal with cases where the C<$input> parameter still contains some
+uncompressed data that C<inflate> hasn't processed yet. The status code
+returned from C<inflate> will be C<Z_OK> if uncompression took place and
+C<Z_BUF_ERROR> if the output buffer is full.
+
+Below is typical code that shows how to use C<LimitOutput>.
+
+    use strict ;
+    use warnings ;
+    
+    use Compress::Raw::Zlib;
+    
+    my $x = new Compress::Raw::Zlib::Inflate(LimitOutput => 1)
+       or die "Cannot create a inflation stream\n" ;
+    
+    my $input = '' ;
+    binmode STDIN;
+    binmode STDOUT;
+    
+    my ($output, $status) ;
+
+  OUTER:
+    while (read(STDIN, $input, 4096))
+    {
+        do
+        {
+            $status = $x->inflate($input, $output) ;
 
-Although it is possible (with some effort on your part) to use this
-module to access .zip files, there is a module on CPAN that will do all
-the hard work for you. Check out the C<Archive::Zip> module on CPAN at
+            print $output ;
 
-    http://www.cpan.org/modules/by-module/Archive/Archive-Zip-*.tar.gz    
+            last OUTER
+                unless $status == Z_OK || $status == Z_BUF_ERROR ;
+        }
+        while ($status == Z_OK && length $input);
+    }
+    
+    die "inflation failed\n"
+        unless $status == Z_STREAM_END ;
 
+Points to note this time:
+
+=over 5
+
+=item *
+
+There are now two nested loops in the code: the outer loop for reading the
+compressed data from STDIN, as before; and the inner loop to carry out the
+uncompression.
+
+=item *
+
+There are two exit points from the inner uncompression loop.
+
+Firstly when C<inflate> has returned a status other than C<Z_OK> or
+C<Z_BUF_ERROR>.  This means that either the end of the compressed data
+stream has been reached (C<Z_STREAM_END>) or there is an error in the
+compressed data. In either of these cases there is no point in continuing
+with reading the compressed data, so both loops are terminated.
+
+The second exit point tests if there is any data left in the input buffer,
+C<$input> - remember that the C<ConsumeInput> option is automatically
+enabled when C<LimitOutput> is used.  When the input buffer has been
+exhausted, the outer loop can run again and overwrite a now empty
+C<$input>.
+
+=back
+
+=head1 ACCESSING ZIP FILES
+
+Although it is possible (with some effort on your part) to use this module
+to access .zip files, there are other perl modules available that will
+do all the hard work for you. Check out C<Archive::Zip>,
+C<IO::Compress::Zip> and C<IO::Uncompress::Unzip>.
 
 =head1 CONSTANTS
 
 All the I<zlib> constants are automatically imported when you make use
 of I<Compress::Raw::Zlib>.
 
-
 =head1 SEE ALSO
 
-L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
+L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzma>, L<IO::Uncompress::UnLzma>, L<IO::Compress::Xz>, L<IO::Uncompress::UnXz>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
 
 L<Compress::Zlib::FAQ|Compress::Zlib::FAQ>
 
@@ -1160,7 +1389,6 @@
 L<Archive::Tar|Archive::Tar>,
 L<IO::Zlib|IO::Zlib>
 
-
 For RFC 1950, 1951 and 1952 see 
 F<http://www.faqs.org/rfcs/rfc1950.html>,
 F<http://www.faqs.org/rfcs/rfc1951.html> and
@@ -1174,25 +1402,18 @@
 
 The primary site for gzip is F<http://www.gzip.org>.
 
-
-
-
 =head1 AUTHOR
 
 This module was written by Paul Marquess, F<pmqs at cpan.org>. 
 
-
-
 =head1 MODIFICATION HISTORY
 
 See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
-
-
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/02zlib.t perl-5.10.0/ext/Compress/Raw/Zlib/t/02zlib.t
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/02zlib.t	2009-12-01 15:36:07.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/t/02zlib.t	2009-12-01 15:38:24.000000000 +0100
@@ -24,13 +24,13 @@
 
     my $count = 0 ;
     if ($] < 5.005) {
-        $count = 189 ;
+        $count = 230 ;
     }
     elsif ($] >= 5.006) {
-        $count = 243 ;
+        $count = 300 ;
     }
     else {
-        $count = 201 ;
+        $count = 258 ;
     }
 
     plan tests => $count + $extra;
@@ -443,10 +443,13 @@
     
     # create a flush point
     cmp_ok $x->flush($Answer, Z_FULL_FLUSH), '==', Z_OK ;
+    
+    my $len1 = length $Answer;
      
     cmp_ok $x->deflate($goodbye, $Answer), '==', Z_OK;
     
     cmp_ok $x->flush($Answer), '==', Z_OK ;
+    my $len2 = length($Answer) - $len1 ;
      
     my ($first, @Answer) = split('', $Answer) ;
      
@@ -475,7 +478,6 @@
         $GOT .= $Z if defined $Z ;
         # print "x $status\n";
         last if $status == Z_STREAM_END or $status != Z_OK ;
-     
     }
      
     cmp_ok $status, '==', Z_DATA_ERROR ;
@@ -488,7 +490,7 @@
     my $initial = $1 ;
 
     
-    ok(($k, $err) = new Compress::Raw::Zlib::Inflate(-ConsumeInput => 0)) ;
+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate(ConsumeInput => 0)) ;
     ok $k ;
     cmp_ok $err, '==', Z_OK ;
      
@@ -499,8 +501,11 @@
     cmp_ok $status, '==', Z_OK
      or diag "status '$status'\nlength rest is " . length($rest) . "\n" ;
      
-    cmp_ok $k->inflate($rest, $GOT), '==', Z_DATA_ERROR;
-    is $Z . $GOT, $goodbye ;
+    is length($rest), $len2, "expected compressed output";
+    
+    $GOT = ''; 
+    cmp_ok $k->inflate($rest, $GOT), '==', Z_DATA_ERROR, "inflate returns Z_DATA_ERROR";
+    is $GOT, $goodbye ;
 }
 
 {
@@ -598,7 +603,7 @@
 
 foreach (1 .. 2)
 {
-    next if $[ < 5.005 ;
+    next if $] < 5.005 ;
 
     title 'test inflate/deflate with a substr';
 
@@ -726,6 +731,142 @@
     ok 1, "resetLastBlockByte(undef) is ok" ;
 }
 
+{
+
+    title "gzip mode";
+    # ================
+
+    my $hello = "I am a HAL 9000 computer" ;
+    my @hello = split('', $hello) ;
+    my ($err, $x, $X, $status); 
+ 
+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
+            WindowBits => WANT_GZIP ,
+            AppendOutput => 1
+        ), "Create deflate object" );
+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $x->deflate($hello, $X) ;
+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
+    
+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
+     
+    my ($k, $GOT); 
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP ,
+            ConsumeInput => 0 ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
+    is $GOT, $hello, "uncompressed data matches ok" ;
+
+    $GOT = '';
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP_OR_ZLIB ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
+    is $GOT, $hello, "uncompressed data matches ok" ;
+}
+
+{
+
+    title "gzip error mode";
+    # Create gzip -
+    # read with no special windowbits setting - this will fail
+    # then read with WANT_GZIP_OR_ZLIB - thi swill work
+    # ================
+
+    my $hello = "I am a HAL 9000 computer" ;
+    my ($err, $x, $X, $status); 
+ 
+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
+            WindowBits => WANT_GZIP ,
+            AppendOutput => 1
+        ), "Create deflate object" );
+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $x->deflate($hello, $X) ;
+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
+    
+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
+     
+    my ($k, $GOT); 
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => MAX_WBITS ,
+            ConsumeInput => 0 ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_DATA_ERROR, "Got Z_DATA_ERROR" ;
+
+    $GOT = '';
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP_OR_ZLIB ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
+    is $GOT, $hello, "uncompressed data matches ok" ;
+}
+
+{
+
+    title "gzip/zlib error mode";
+    # Create zlib -
+    # read with no WANT_GZIP windowbits setting - this will fail
+    # then read with WANT_GZIP_OR_ZLIB - thi swill work
+    # ================
+
+    my $hello = "I am a HAL 9000 computer" ;
+    my ($err, $x, $X, $status); 
+ 
+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
+            AppendOutput => 1
+        ), "Create deflate object" );
+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $x->deflate($hello, $X) ;
+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
+    
+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
+     
+    my ($k, $GOT); 
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP ,
+            ConsumeInput => 0 ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_DATA_ERROR, "Got Z_DATA_ERROR" ;
+
+    $GOT = '';
+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
+            WindowBits => WANT_GZIP_OR_ZLIB ,
+            AppendOutput => 1);
+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+ 
+    $status = $k->inflate($X, $GOT) ;
+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
+    is $GOT, $hello, "uncompressed data matches ok" ;
+}
+
 exit if $] < 5.006 ;
 
 title 'Looping Append test with substr output - substr the end of the string';
diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/09limitoutput.t perl-5.10.0/ext/Compress/Raw/Zlib/t/09limitoutput.t
--- perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/09limitoutput.t	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/Compress/Raw/Zlib/t/09limitoutput.t	2009-03-25 12:14:56.000000000 +0100
@@ -0,0 +1,129 @@
+BEGIN {
+    if ($ENV{PERL_CORE}) {
+	chdir 't' if -d 't';
+	@INC = ("../lib", "lib/compress");
+    }
+}
+
+use lib qw(t t/compress);
+use strict;
+use warnings;
+use bytes;
+
+use Test::More ;
+use CompTestUtils;
+
+BEGIN 
+{ 
+    # use Test::NoWarnings, if available
+    my $extra = 0 ;
+    $extra = 1
+        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+
+    plan tests => 98 + $extra ;
+
+    use_ok('Compress::Raw::Zlib', 2) ; 
+}
+
+
+
+my $hello = "I am a HAL 9000 computer" x 2001;
+my $tmp = $hello ;
+
+my ($err, $x, $X, $status); 
+
+ok( ($x, $err) = new Compress::Raw::Zlib::Deflate (-AppendOutput => 1));
+ok $x ;
+cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
+
+my $out ;
+$status = $x->deflate($tmp, $out) ;
+cmp_ok $status, '==', Z_OK, "  status is Z_OK" ;
+
+cmp_ok $x->flush($out), '==', Z_OK, "  flush returned Z_OK" ;
+     
+     
+sub getOut { my $x = ''; return \$x }
+
+for my $bufsize (1, 2, 3, 13, 4096, 1024*10)
+{
+    print "#\n#Bufsize $bufsize\n#\n";
+    $tmp = $out;
+
+    my $k;
+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate( AppendOutput => 1,
+                                                      LimitOutput => 1,
+                                                      Bufsize => $bufsize
+                                                    ));
+    ok $k ;
+    cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
+ 
+    ok ! defined $k->msg(), "  no msg" ;
+    is $k->total_in(), 0, "  total_in == 0" ;
+    is $k->total_out(), 0, "  total_out == 0" ;
+    my $GOT = getOut();
+    my $prev;
+    my $deltaOK = 1;
+    my $looped = 0;
+    while (length $tmp)
+    {
+        ++ $looped;
+        my $prev = length $GOT;
+        $status = $k->inflate($tmp, $GOT) ;
+        last if $status == Z_STREAM_END || $status == Z_DATA_ERROR || $status == Z_STREAM_ERROR ;
+        $deltaOK = 0 if length($GOT) - $prev > $bufsize;
+    }
+     
+    ok $deltaOK, "  Output Delta never > $bufsize";
+    cmp_ok $looped, '>=', 1, "  looped $looped";
+    is length($tmp), 0, "  length of input buffer is zero";
+
+    cmp_ok $status, '==', Z_STREAM_END, "  status is Z_STREAM_END" ;
+    is $$GOT, $hello, "  got expected output" ;
+    ok ! defined $k->msg(), "  no msg" ;
+    is $k->total_in(), length $out, "  length total_in ok" ;
+    is $k->total_out(), length $hello, "  length total_out ok " .  $k->total_out() ;
+}
+
+sub getit
+{
+    my $obj = shift ;
+    my $input = shift;
+    
+    my $data ;
+    1 while $obj->inflate($input, $data) != Z_STREAM_END ;
+    return \$data ;
+}
+
+{
+    title "regression test";
+    
+    my ($err, $x, $X, $status); 
+    
+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate (-AppendOutput => 1));
+    ok $x ;
+    cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
+
+    my $line1 = ("abcdefghijklmnopq" x 1000) . "\n" ;
+    my $line2 = "second line\n" ;
+    my $text = $line1 . $line2 ;
+    my $tmp = $text;
+   
+    my $out ;
+    $status = $x->deflate($tmp, $out) ;
+    cmp_ok $status, '==', Z_OK, "  status is Z_OK" ;
+    
+    cmp_ok $x->flush($out), '==', Z_OK, "  flush returned Z_OK" ;
+
+    my $k;
+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate( AppendOutput => 1,
+                                                      LimitOutput => 1
+                                                    ));
+
+                                                        
+    my $c = getit($k, $out);
+    is $$c, $text;
+    
+                                              
+}
+

perl-update-IO-Compress-Zlib.patch:
 MANIFEST                                                   |    1 
 ext/IO_Compress_Zlib/Changes                               |   38 +
 ext/IO_Compress_Zlib/Makefile.PL                           |    9 
 ext/IO_Compress_Zlib/README                                |   44 --
 ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm    |    6 
 ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm   |    4 
 ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm            |  143 ------
 ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm               |  148 ------
 ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm     |    2 
 ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm         |  146 ------
 ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm                |  226 +++-------
 ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm      |   18 
 ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm     |    2 
 ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm         |    4 
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm |    6 
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm  |    6 
 ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm       |  143 ------
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm           |  141 ------
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm          |  131 ------
 ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm       |  126 -----
 ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm            |  204 +++------
 ext/IO_Compress_Zlib/t/006zip.t                            |  276 +++++++++++++
 22 files changed, 614 insertions(+), 1210 deletions(-)

--- NEW FILE perl-update-IO-Compress-Zlib.patch ---
IO-Compress-Zlib-2.015
(omitting changes to private/MakeUtil.pm)
(omitting changes to perl-5.10.0/t/lib/compress; these are in
IO-Compress-Base 2.015 update)

diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2009-12-01 11:02:59.000000000 +0100
+++ perl-5.10.0/MANIFEST	2009-12-01 12:10:21.000000000 +0100
@@ -736,6 +736,7 @@
 ext/IO_Compress_Zlib/t/002any-zip.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/004gziphdr.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/005defhdr.t	IO::Compress::Zlib
+ext/IO_Compress_Zlib/t/006zip.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/010examples.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/020isize.t	IO::Compress::Zlib
 ext/IO_Compress_Zlib/t/050interop-gzip.t	IO::Compress::Zlib
diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/Changes perl-5.10.0/ext/IO_Compress_Zlib/Changes
--- perl-5.10.0.orig/ext/IO_Compress_Zlib/Changes	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Zlib/Changes	2009-12-01 12:05:25.000000000 +0100
@@ -1,6 +1,44 @@
 CHANGES
 -------
 
+  2.015 3 September 2008
+
+      * Makefile.PL
+        Backout changes made in 2.014
+
+  2.014 2 September 2008
+
+      * Makefile.PL
+        Updated to check for indirect dependencies.
+
+  2.012 15 July 2008
+
+      * No Changes
+
+  2.011 17 May 2008
+
+      * IO::Uncompress::Unzip 
+        - Print an error message if the zip file contains a
+          member compressed with bzip2 and IO::Uncompress::Bunzip2 is 
+          not available.
+        - Could not cope with mixed compression zip files. For example a
+          zip file that contains both STORED and DEFLATED content.
+          [RT #35573]
+
+  2.010 5 May 2008
+
+      * Fixed problem that meant Perl 5.10 could not upgrade this module.
+        [RT #35343]
+
+  2.009 20 April 2008
+
+      * IO::Compress::Zip 
+
+        - Added exUnix2 option to allow storing of UID & GID.
+        - When running on a Unix derivative the ExtAttr option now defaults
+          to the equivalent of 0666. For all other systems the default
+          remains 0.
+
   2.008 2 November 2007
 
       * Minor documentation changes in README
diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/Makefile.PL perl-5.10.0/ext/IO_Compress_Zlib/Makefile.PL
--- perl-5.10.0.orig/ext/IO_Compress_Zlib/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Zlib/Makefile.PL	2009-12-01 12:05:35.000000000 +0100
@@ -3,7 +3,7 @@
 use strict ;
 require 5.004 ;
 
-$::VERSION = '2.008' ;
+$::VERSION = '2.015' ;
 
 use private::MakeUtil;
 use ExtUtils::MakeMaker 5.16 ;
@@ -51,6 +51,13 @@
 
     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
 
+    (
+    $] >= 5.009 && ! $ENV{PERL_CORE}
+        ? (INST_LIB    => 'blib/arch')
+        : ()
+    ),
+
+
     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
         ('LICENSE'  => 'perl')         : ()),    
 
diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/README perl-5.10.0/ext/IO_Compress_Zlib/README
--- perl-5.10.0.orig/ext/IO_Compress_Zlib/README	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/IO_Compress_Zlib/README	2009-12-01 12:05:41.000000000 +0100
@@ -1,44 +1,30 @@
 
                              IO-Compress-Zlib
 
-                             Version 2.008
+                             Version 2.015
 
-                             2nd November 2007
+                            2nd September 2008
 
-
-       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
+       Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
            and/or modify it under the same terms as Perl itself.
 
-
-
-
 DESCRIPTION
 -----------
 
-
 This module provides a Perl interface to allow reading and writing of RFC
 1950, 1951, 1952 (i.e. gzip) and zip files/buffers.
 
-
-
-
-
 PREREQUISITES
 -------------
 
 Before you can build IO-Compress-Zlib you need to have the following
 installed on your system:
 
-
     * Perl 5.004 or better. 
     * Compress::Raw::Zlib
     * IO::Compress::Base
 
-
-
-
-
 BUILDING THE MODULE
 -------------------
 
@@ -49,8 +35,6 @@
     make
     make test
 
-
-
 INSTALLATION
 ------------
 
@@ -58,28 +42,16 @@
 
     make install
 
-
-
-
-
 TROUBLESHOOTING
 ---------------
 
-
-
-
-
-
-
-
-
 The t/020isize Test Suite
 ------------------------
 
 This test suite checks that IO-Compress-Zlib can cope with gzip files
 that are larger than 2^32 bytes.
 
-By default these test are NOT run when you do a "make test". If you
+By default these tests are NOT run when you do a "make test". If you
 really want to run them, you need to execute "make longtest".
 
 Be warned though -- this test suite can take hours to run on a slow box.
@@ -88,9 +60,6 @@
 run out of memory during this test. This should not be considered a bug
 in the IO-Compress-Zlib module.
 
-
-
-
 FEEDBACK
 --------
 
@@ -124,9 +93,7 @@
         If you haven't installed IO-Compress-Zlib then search IO::Compress::Gzip.pm
         for a line like this:
 
-          $VERSION = "2.008" ;
-
-
+          $VERSION = "2.015" ;
 
[...4833 lines suppressed...]
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+SKIP:
+{
+    title "Create a simple zip - All Bzip2";
+
+    skip "IO::Compress::Bzip2 not available", 9
+        unless defined $IO::Compress::Bzip2::VERSION;
+
+    my $lex = new LexFile my $file1;
+
+    my @content = (
+                   'hello',
+                   '',
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_BZIP2, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_BZIP2);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+SKIP:
+{
+    title "Create a simple zip - Deflate + Bzip2";
+
+    skip "IO::Compress::Bzip2 not available", 9
+        unless $IO::Compress::Bzip2::VERSION;
+
+    my $lex = new LexFile my $file1;
+
+    my @content = (
+                   'hello',
+                   'and',
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+    title "Create a simple zip - All STORE";
+
+    my $lex = new LexFile my $file1;
+
+    my @content = (
+                   'hello',
+                   '',
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_STORE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_STORE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+    title "Create a simple zip - Deflate + STORE";
+
+    my $lex = new LexFile my $file1;
+
+    my @content = qw(
+                   hello 
+                       and
+                   goodbye 
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    is $got[1], $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+    title "Create a simple zip - Deflate + zero length STORE";
+
+    my $lex = new LexFile my $file1;
+
+    my @content = (
+                   'hello ',
+                   '',
+                   'goodbye ',
+                   );
+
+    my $zip = new IO::Compress::Zip $file1,
+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+    isa_ok $zip, "IO::Compress::Zip";
+
+    is $zip->write($content[0]), length($content[0]), "write"; 
+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+    is $zip->write($content[1]), length($content[1]), "write"; 
+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+    is $zip->write($content[2]), length($content[2]), "write"; 
+    ok $zip->close(), "closed";                    
+
+    my @got = getContent($file1);
+
+    is $got[0], $content[0], "Got 1st entry";
+    ok $got[1] eq $content[1], "Got 2nd entry";
+    is $got[2], $content[2], "Got 3nd entry";
+}
+
+
+SKIP:
+for my $method (ZIP_CM_DEFLATE, ZIP_CM_STORE, ZIP_CM_BZIP2)
+{
+    title "Read a line from zip, Method $method";
+
+    skip "IO::Compress::Bzip2 not available", 14
+        unless defined $IO::Compress::Bzip2::VERSION;
+
+    my $content = "a single line\n";
+    my $zip ;
+
+    my $status = zip \$content => \$zip, 
+                    Method => $method, 
+                    Stream => 0, 
+                    Name => "123";
+    is $status, 1, "  Created a zip file";
+
+    my $u = new IO::Uncompress::Unzip \$zip;
+    isa_ok $u, "IO::Uncompress::Unzip";
+
+    is $u->getline, $content, "  Read first line ok";
+    ok ! $u->getline, "  Second line doesn't exist";
+
+
+}

perl-update-IO-Compress-Base.patch:
 ext/IO_Compress_Base/Changes                            |   68 +++++++
 ext/IO_Compress_Base/Makefile.PL                        |    6 
 ext/IO_Compress_Base/README                             |   42 ----
 ext/IO_Compress_Base/lib/File/GlobMapper.pm             |   20 --
 ext/IO_Compress_Base/lib/IO/Compress/Base.pm            |   47 +---
 ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm     |   51 ++++-
 ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm |  152 ++--------------
 ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm          |   85 ++++++--
 ext/IO_Compress_Base/t/01misc.t                         |   38 +++-
 t/lib/compress/CompTestUtils.pm                         |   20 ++
 t/lib/compress/destroy.pl                               |   39 ++++
 t/lib/compress/generic.pl                               |   19 --
 12 files changed, 318 insertions(+), 269 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 perl-update-IO-Compress-Base.patchIndex: perl-update-IO-Compress-Base.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/F-12/perl-update-IO-Compress-Base.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-update-IO-Compress-Base.patch	30 Nov 2009 14:01:23 -0000	1.1
+++ perl-update-IO-Compress-Base.patch	1 Dec 2009 15:15:30 -0000	1.2
@@ -1,6 +1,9 @@
-diff -up perl-5.10.0/ext/IO_Compress_Base/Changes.xxx perl-5.10.0/ext/IO_Compress_Base/Changes
---- perl-5.10.0/ext/IO_Compress_Base/Changes.xxx	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/Changes	2008-09-03 15:12:46.000000000 +0200
+IO-Compress-Base-2.015
+(omitting changes to private/MakeUtil.pm)
+
+diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/Changes perl-5.10.0/ext/IO_Compress_Base/Changes
+--- perl-5.10.0.orig/ext/IO_Compress_Base/Changes	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/ext/IO_Compress_Base/Changes	2009-12-01 11:17:37.000000000 +0100
 @@ -1,6 +1,74 @@
  CHANGES
  -------
@@ -76,10 +79,126 @@ diff -up perl-5.10.0/ext/IO_Compress_Bas
    2.008 2 November 2007
  
        * Minor documentation changes in README
-diff -up perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm.xxx perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm
---- perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm.xxx	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm	2008-02-18 23:23:15.000000000 +0100
-@@ -26,7 +26,7 @@ BEGIN
+diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/Makefile.PL perl-5.10.0/ext/IO_Compress_Base/Makefile.PL
+--- perl-5.10.0.orig/ext/IO_Compress_Base/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/ext/IO_Compress_Base/Makefile.PL	2009-12-01 11:17:37.000000000 +0100
+@@ -37,6 +37,12 @@
+ 
+     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
+ 
++    (
++    $] >= 5.009 && ! $ENV{PERL_CORE}
++        ? (INST_LIB    => 'blib/arch')
++        : ()
++    ),
++
+     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
+         ('LICENSE'  => 'perl')         : ()),
+     
+diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/README perl-5.10.0/ext/IO_Compress_Base/README
+--- perl-5.10.0.orig/ext/IO_Compress_Base/README	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/ext/IO_Compress_Base/README	2009-12-01 11:17:37.000000000 +0100
+@@ -1,42 +1,28 @@
+ 
+                              IO-Compress-Base
+ 
+-                             Version 2.008
++                             Version 2.015
+ 
+-                             2nd November 2007
++                            2nd September 2008
+ 
+-
+-       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
++       Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
+           This program is free software; you can redistribute it
+            and/or modify it under the same terms as Perl itself.
+ 
+-
+-
+-
+ DESCRIPTION
+ -----------
+ 
+-
+ This module is the base class for all IO::Compress and IO::Uncompress
+ modules.
+ 
+-
+-
+-
+-
+ PREREQUISITES
+ -------------
+ 
+ Before you can build IO-Compress-Base you need to have the following
+ installed on your system:
+ 
+-
+     * Perl 5.004 or better. 
+ 
+-
+-
+-
+-
+ BUILDING THE MODULE
+ -------------------
+ 
+@@ -47,8 +33,6 @@
+     make
+     make test
+ 
+-
+-
+ INSTALLATION
+ ------------
+ 
+@@ -56,24 +40,9 @@
+ 
+     make install
+ 
+-
+-
+-
+-
+ TROUBLESHOOTING
+ ---------------
+ 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ FEEDBACK
+ --------
+ 
+@@ -107,9 +76,7 @@
+         If you haven't installed IO-Compress-Base then search IO::Compress::Base.pm
+         for a line like this:
+ 
+-          $VERSION = "2.008" ;
+-
+-
++          $VERSION = "2.015" ;
+ 
+  2. If you are having problems building IO-Compress-Base, send me a
+     complete log of what happened. Start by unpacking the IO-Compress-Base
+@@ -120,5 +87,4 @@
+         make
+         make test TEST_VERBOSE=1          
+ 
+-
+ Paul Marquess <pmqs at cpan.org>
+diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/File/GlobMapper.pm perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm
+--- perl-5.10.0.orig/ext/IO_Compress_Base/lib/File/GlobMapper.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm	2009-12-01 11:17:37.000000000 +0100
+@@ -26,7 +26,7 @@
  our ($Error);
  
  our ($VERSION, @EXPORT_OK);
@@ -88,7 +207,7 @@ diff -up perl-5.10.0/ext/IO_Compress_Bas
  @EXPORT_OK = qw( globmap );
  
  
-@@ -389,24 +389,6 @@ File::GlobMapper - Extend File Glob to A
+@@ -389,24 +389,6 @@
  
  =head1 DESCRIPTION
  
@@ -113,10 +232,10 @@ diff -up perl-5.10.0/ext/IO_Compress_Bas
  This module needs Perl5.005 or better.
  
  This module takes the existing C<File::Glob> module as a starting point and
-diff -up perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm.xxx perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm
---- perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm.xxx	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm	2008-09-03 15:17:32.000000000 +0200
-@@ -11,7 +11,7 @@ use File::GlobMapper;
+diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm
+--- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm	2009-12-01 11:17:37.000000000 +0100
+@@ -11,7 +11,7 @@
  require Exporter;
  our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
  @ISA = qw(Exporter);
@@ -125,7 +244,7 @@ diff -up perl-5.10.0/ext/IO_Compress_Bas
  
  @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput 
                isaFileGlobString cleanFileGlobString oneTarget
-@@ -192,7 +192,7 @@ sub oneTarget
+@@ -192,7 +192,7 @@
      return $_[0] =~ /^(code|handle|buffer|filename)$/;
  }
  
@@ -134,7 +253,7 @@ diff -up perl-5.10.0/ext/IO_Compress_Bas
  {
      my $class = shift ;
  
-@@ -320,7 +320,7 @@ sub Validator::new
+@@ -320,7 +320,7 @@
      return $obj ;
  }
  
@@ -143,7 +262,7 @@ diff -up perl-5.10.0/ext/IO_Compress_Bas
  {
      my $self   = shift ;
      ${ $self->{Error} } = shift ;
-@@ -328,7 +328,7 @@ sub Validator::saveErrorString
+@@ -328,7 +328,7 @@
[...10861 lines suppressed...]
-+If all your tests passed, Test::Simple will exit with zero (which is
-+normal).  If anything failed it will exit with how many failed.  If
-+you run less (or more) tests than you planned, the missing (or extras)
-+will be considered failures.  If no tests were ever run Test::Simple
-+will throw a warning and exit with 255.  If the test died, even after
-+having successfully completed all its tests, it will still be
-+considered a failure and will exit with 255.
-+
-+So the exit codes are...
-+
-+    0                   all tests successful
-+    255                 test died
-+    any other number    how many failed (including missing or extras)
-+
-+If you fail more than 254 tests, it will be reported as 254.
-+
-+This module is by no means trying to be a complete testing system.
-+It's just to get you started.  Once you're off the ground its
-+recommended you look at L<Test::More>.
-+
-+
-+=head1 EXAMPLE
-+
-+Here's an example of a simple .t file for the fictional Film module.
-+
-+    use Test::Simple tests => 5;
-+
-+    use Film;  # What you're testing.
-+
-+    my $btaste = Film->new({ Title    => 'Bad Taste',
-+                             Director => 'Peter Jackson',
-+                             Rating   => 'R',
-+                             NumExplodingSheep => 1
-+                           });
-+    ok( defined($btaste) && ref $btaste eq 'Film,     'new() works' );
-+
-+    ok( $btaste->Title      eq 'Bad Taste',     'Title() get'    );
-+    ok( $btaste->Director   eq 'Peter Jackson', 'Director() get' );
-+    ok( $btaste->Rating     eq 'R',             'Rating() get'   );
-+    ok( $btaste->NumExplodingSheep == 1,        'NumExplodingSheep() get' );
-+
-+It will produce output like this:
-+
-+    1..5
-+    ok 1 - new() works
-+    ok 2 - Title() get
-+    ok 3 - Director() get
-+    not ok 4 - Rating() get
-+    #    Failed test (t/film.t at line 14)
-+    ok 5 - NumExplodingSheep() get
-+    # Looks like you failed 1 tests of 5
-+
-+Indicating the Film::Rating() method is broken.
-+
-+
-+=head1 CAVEATS
-+
-+Test::Simple will only report a maximum of 254 failures in its exit
-+code.  If this is a problem, you probably have a huge test script.
-+Split it into multiple files.  (Otherwise blame the Unix folks for
-+using an unsigned short integer as the exit status).
-+
-+Because VMS's exit codes are much, much different than the rest of the
-+universe, and perl does horrible mangling to them that gets in my way,
-+it works like this on VMS.
-+
-+    0     SS$_NORMAL        all tests successful
-+    4     SS$_ABORT         something went wrong
-+
-+Unfortunately, I can't differentiate any further.
-+
-+
-+=head1 NOTES
-+
-+Test::Simple is B<explicitly> tested all the way back to perl 5.004.
-+
-+Test::Simple is thread-safe in perl 5.8.0 and up.
-+
-+=head1 HISTORY
-+
-+This module was conceived while talking with Tony Bowden in his
-+kitchen one night about the problems I was having writing some really
-+complicated feature into the new Testing module.  He observed that the
-+main problem is not dealing with these edge cases but that people hate
-+to write tests B<at all>.  What was needed was a dead simple module
-+that took all the hard work out of testing and was really, really easy
-+to learn.  Paul Johnson simultaneously had this idea (unfortunately,
-+he wasn't in Tony's kitchen).  This is it.
-+
-+
-+=head1 SEE ALSO
-+
-+=over 4
-+
-+=item L<Test::More>
-+
-+More testing functions!  Once you outgrow Test::Simple, look at
-+Test::More.  Test::Simple is 100% forward compatible with Test::More
-+(i.e. you can just use Test::More instead of Test::Simple in your
-+programs and things will still work).
-+
-+=item L<Test>
-+
-+The original Perl testing module.
-+
-+=item L<Test::Unit>
-+
-+Elaborate unit testing.
-+
-+=item L<Test::Inline>, L<SelfTest>
-+
-+Embed tests in your code!
-+
-+=item L<Test::Harness>
-+
-+Interprets the output of your test program.
-+
-+=back
-+
-+
-+=head1 AUTHORS
-+
-+Idea by Tony Bowden and Paul Johnson, code by Michael G Schwern
-+E<lt>schwern at pobox.comE<gt>, wardrobe by Calvin Klein.
-+
-+
-+=head1 COPYRIGHT
-+
-+Copyright 2001, 2002, 2004 by Michael G Schwern E<lt>schwern at pobox.comE<gt>.
-+
-+This program is free software; you can redistribute it and/or 
-+modify it under the same terms as Perl itself.
-+
-+See F<http://www.perl.com/perl/misc/Artistic.html>
-+
-+=cut
-+
-+1;
+     {
+         title "Testing $CompressClass and $UncompressClass";
+ 
+@@ -161,7 +163,6 @@
+ 
+ 
+             my $lex = new LexFile my $name ;
+-            #my $name = "/tmp/try.lzf";
+ 
+             my $hello = <<EOM ;
+ hello world
+@@ -322,7 +323,6 @@
+ 
+               ok $x->close, "  close" ;
+             }
+-            #exit;
+ 
+             is $uncomp, $hello, "  expected output" ;
+         }
+@@ -419,11 +419,11 @@
+               ok ! defined $x->fileno() ;
+               1 while $x->read($uncomp) > 0  ;
+ 
+-              ok $x->close ;
++              ok $x->close, "closed" ;
+             }
+ 
+-            is $uncomp, $hello ;
+-            ok $buffer eq $keep ;
++            is $uncomp, $hello, "got expected uncompressed data" ;
++            ok $buffer eq $keep, "compressed input not changed" ;
+         }
+ 
+         if ($CompressClass ne 'RawDeflate')
+@@ -434,8 +434,9 @@
+             my $buffer = '';
+             {
+               my $x ;
+-              ok $x = new $CompressClass(\$buffer) ;
+-              ok $x->close ;
++              $x = new $CompressClass(\$buffer);
++              ok $x, "new $CompressClass" ;
++              ok $x->close, "close ok" ;
+           
+             }
+ 
+@@ -541,7 +542,6 @@
+             read($fh1, $rest, 5000);
+             is $x->trailingData() . $rest, $trailer ;
+             #print "# [".$x->trailingData() . "][$rest]\n" ;
+-            #exit;
+ 
+         }
+ 
+@@ -1416,7 +1416,6 @@
+             }
+         }
+ 
+-
+         {
+             title "write tests - invalid data" ;
+ 


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-12/perl.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- perl.spec	30 Nov 2009 17:29:49 -0000	1.235
+++ perl.spec	1 Dec 2009 15:15:30 -0000	1.236
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        86%{?dist}
+Release:        87%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -239,17 +239,19 @@ Patch118:	perl-update-autodie.patch
 # cpan has it under PathTools-3.30
 Patch119:	perl-update-FileSpec.patch
 %define			    File_Spec_version 3.30
-Patch120:	perl-update-Compress_Raw_Zlib.patch
-%define			    Compress_Raw_Zlib 2.020
+Patch120:	perl-update-Compress-Raw-Zlib.patch
+%define			    Compress_Raw_Zlib_version 2.023
 Patch121:	perl-update-Scalar-List-Utils.patch
 %define			    Scalar_List_Utils 1.21
 Patch122:	perl-update-Module-Pluggable.patch
-%define             Module_Pluggable_version 3.90
+%define			    Module_Pluggable_version 3.90
 # Also fixes segfault when objects are reblessed (rt#33242, rhbz#459918)
 Patch123:	perl-update-Storable.patch
-%define             Storable_version 2.21
+%define			    Storable_version 2.21
 Patch124:	perl-update-IO-Compress-Base.patch
-%define             IO_Compress_Base 2.015
+%define			    IO_Compress_Base_version 2.015
+Patch125:	perl-update-IO-Compress-Zlib.patch
+%define			    IO_Compress_Zlib_version 2.015
 
 # Fedora uses links instead of lynx
 # patches File-Fetch and CPAN
@@ -425,7 +427,7 @@ Summary:        Low-Level Interface to t
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        2.008
+Version:        %{Compress_Raw_Zlib_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Compress-Raw-Zlib
@@ -579,7 +581,7 @@ Summary:        Base Class for IO::Compr
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        2.015
+Version:        %{IO_Compress_Base_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description IO-Compress-Base
@@ -594,8 +596,7 @@ Summary:        Perl interface to allow 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-# Really 1.23_01, but we drop the _01.
-Version:        2.008
+Version:        %{IO_Compress_Zlib_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description IO-Compress-Zlib
@@ -1031,11 +1032,12 @@ upstream tarball from perl.org.
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1
-%patch123 -p1
-#%patch124 -p1
 # 0-byte files and patch don't seem to agree
 mkdir t/Module_Pluggable/lib/Zot/
 touch t/Module_Pluggable/lib/Zot/.Zork.pm
+%patch123 -p1
+%patch124 -p1
+%patch125 -p1
 
 
 %patch201 -p1
@@ -1315,11 +1317,12 @@ perl -x patchlevel.h \
 	'Fedora Patch117: Update Digest::SHA to %{Digest_SHA_version}' \
 	'Fedora Patch117: Update module autodie to %{autodie_version}' \
 	'Fedora Patch119: Update File::Spec to %{File_Spec_version}' \
-	'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib}' \
+	'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib_version}' \
 	'Fedora Patch121: Update Scalar-List-Utils to %{Scalar_List_Utils}' \
 	'Fedora Patch122: Update Module-Pluggable to %{Module_Pluggable_version}' \
 	'Fedora Patch123: Update Storable to %{Storable_version}' \
-        'Fedora Patch124: Update IO::Compress::Base to %{IO_Compress_Base}' \
+	'Fedora Patch124: Update IO::Compress::Base to %{IO_Compress_Base_version}' \
+	'Fedora Patch125: Update IO::Compress::Zlib to %{IO_Compress_Zlib_version}' \
 	'Fedora Patch201: Fedora uses links instead of lynx' \
 	%{nil}
 
@@ -1333,7 +1336,7 @@ rm -rf $RPM_BUILD_ROOT
 # work around a bug in Module::Build tests by setting TMPDIR to a directory
 # inside the source tree
 mkdir "$PWD/tmp"
-#TMPDIR="$PWD/tmp" make test
+TMPDIR="$PWD/tmp" make test
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -1946,6 +1949,11 @@ mkdir "$PWD/tmp"
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Dec  1 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-87
+- fix patch-update-Compress-Raw-Zlib.patch (did not patch Zlib.pm)
+- update Compress::Raw::Zlib to 2.023
+- update IO::Compress::Base, and IO::Compress::Zlib to 2.015 (#542645)
+
 * Mon Nov 30 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.0-86
 - 542645 update IO-Compress-Base
 


--- perl-update-Compress_Raw_Zlib.patch DELETED ---



From hadess at fedoraproject.org  Tue Dec  1 15:17:17 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:17:17 +0000 (UTC)
Subject: rpms/evince/devel evince.spec,1.171,1.172
Message-ID: <20091201151717.5E2FA11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	evince.spec 
Log Message:
Update API version for backends (more)


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- evince.spec	1 Dec 2009 15:02:45 -0000	1.171
+++ evince.spec	1 Dec 2009 15:17:17 -0000	1.172
@@ -130,7 +130,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/appl
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 # Get rid of static libs and .la files.
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/evince/1/backends/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/evince/2/backends/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # don't ship icon caches
@@ -240,11 +240,11 @@ fi
 %{_datadir}/gtk-doc/html/libevdocument/
 %{_datadir}/gtk-doc/html/libevview/
 %dir %{_includedir}/evince
-%{_includedir}/evince/2.25
+%{_includedir}/evince/2.29
 %{_libdir}/libevview.so
 %{_libdir}/libevdocument.so
-%{_libdir}/pkgconfig/evince-view-2.25.pc
-%{_libdir}/pkgconfig/evince-document-2.25.pc
+%{_libdir}/pkgconfig/evince-view-2.29.pc
+%{_libdir}/pkgconfig/evince-document-2.29.pc
 
 %files dvi
 %defattr(-,root,root,-)



From spot at fedoraproject.org  Tue Dec  1 15:17:46 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 15:17:46 +0000 (UTC)
Subject: File Coccinella-0.96.16Src.tar.gz uploaded to lookaside cache by
	spot
Message-ID: <20091201151746.2BCAE10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for coccinella:

0e9841cba70584af72fbc152c052c370  Coccinella-0.96.16Src.tar.gz



From ltinkl at fedoraproject.org  Tue Dec  1 15:17:47 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 15:17:47 +0000 (UTC)
Subject: File kdebase-workspace-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091201151747.99AC310F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebase-workspace:

68177b5c0dd8ab4bebe682393871f82c  kdebase-workspace-4.3.80.tar.bz2



From spot at fedoraproject.org  Tue Dec  1 15:18:16 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 15:18:16 +0000 (UTC)
Subject: rpms/coccinella/devel .cvsignore, 1.3, 1.4 coccinella.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091201151816.D41DF11C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore coccinella.spec sources 
Log Message:
0.96.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/coccinella/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2009 18:02:59 -0000	1.3
+++ .cvsignore	1 Dec 2009 15:18:16 -0000	1.4
@@ -1 +1 @@
-Coccinella-0.96.14Src.tar.gz
+Coccinella-0.96.16Src.tar.gz


Index: coccinella.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coccinella/devel/coccinella.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- coccinella.spec	24 Nov 2009 18:03:00 -0000	1.3
+++ coccinella.spec	1 Dec 2009 15:18:16 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		coccinella
-Version:	0.96.14
+Version:	0.96.16
 Release:	1%{?dist}
 Summary:	Chat client with whiteboard
 Group:		Applications/Internet
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.96.16-1
+- update to 0.96.16
+
 * Tue Nov 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.96.14-1
 - update to 0.96.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coccinella/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2009 18:03:00 -0000	1.3
+++ sources	1 Dec 2009 15:18:16 -0000	1.4
@@ -1 +1 @@
-31e693c75a069165ccef05d6dd21ddae  Coccinella-0.96.14Src.tar.gz
+0e9841cba70584af72fbc152c052c370  Coccinella-0.96.16Src.tar.gz



From jpopelka at fedoraproject.org  Tue Dec  1 15:18:49 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue,  1 Dec 2009 15:18:49 +0000 (UTC)
Subject: rpms/lockdev/devel lockdev.spec,1.34,1.35
Message-ID: <20091201151849.47CBD11C00DE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

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

Modified Files:
	lockdev.spec 
Log Message:
* Tue Dec 01 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-19
- Added license text to package



Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- lockdev.spec	2 Oct 2009 15:13:45 -0000	1.34
+++ lockdev.spec	1 Dec 2009 15:18:49 -0000	1.35
@@ -1,8 +1,8 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 18%{?dist}
-License: LGPLv2+
+Release: 19%{?dist}
+License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
 Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
@@ -82,6 +82,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc LICENSE
 %attr(2711,root,lock)  %{_sbindir}/lockdev
 %{_libdir}/*.so.*
 %{_mandir}/man8/*
@@ -94,6 +95,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Tue Dec 01 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-19
+- Added license text to package
+
 * Fri Oct 02 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-18
 - Fixed mixed-use-of-spaces-and-tabs
 



From than at fedoraproject.org  Tue Dec  1 15:18:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:18:59 +0000 (UTC)
Subject: File kdebindings-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201151859.BD21710F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebindings:

a89db14d6db8c7783862d385bfb86e9e  kdebindings-4.3.4.tar.bz2



From jpopelka at fedoraproject.org  Tue Dec  1 15:19:18 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue,  1 Dec 2009 15:19:18 +0000 (UTC)
Subject: rpms/lockdev/F-12 lockdev.spec,1.33,1.34
Message-ID: <20091201151918.DA99E11C00DE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/lockdev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15898

Modified Files:
	lockdev.spec 
Log Message:
* Tue Dec 01 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-18
- Added license text to package



Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/F-12/lockdev.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- lockdev.spec	19 Nov 2009 13:08:46 -0000	1.33
+++ lockdev.spec	1 Dec 2009 15:19:18 -0000	1.34
@@ -1,8 +1,8 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 17%{?dist}
-License: LGPLv2+
+Release: 18%{?dist}
+License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
 Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
@@ -82,6 +82,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc LICENSE
 %attr(2711,root,lock)   %{_sbindir}/lockdev
 %{_libdir}/*.so.*
 %{_mandir}/man8/*
@@ -94,6 +95,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Tue Dec 01 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-18
+- Added license text to package
+
 * Thu Nov 19 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-17
 - Fixed mixed-use-of-spaces-and-tabs
 - Removed PreReq tag



From mmcgrath at fedoraproject.org  Tue Dec  1 15:19:47 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 15:19:47 +0000 (UTC)
Subject: rpms/cacti/EL-5 cli_add_graph.patch, NONE, 1.1 cross_site_fix.patch,
	NONE, 1.1 snmp_invalid_response.patch, NONE,
	1.1 template_duplication.patch, NONE, 1.1 cacti.spec, 1.19, 1.20
Message-ID: <20091201151947.2AC0911C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Added Files:
	cli_add_graph.patch cross_site_fix.patch 
	snmp_invalid_response.patch template_duplication.patch 
Log Message:
official patches

cli_add_graph.patch:
 add_graphs.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cli_add_graph.patch ---
--- ../tags/0.8.7e/cli/add_graphs.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/cli/add_graphs.php	2009-08-18 20:04:44.000000000 -0400
@@ -570,7 +570,7 @@
 	echo "                    3|Fields = Verify all Fields\n";
 	echo "List Options:\n";
 	echo "    --list-hosts\n";
-	echo "    --list-graph-templates [--host_template=[ID]]\n";
+	echo "    --list-graph-templates [--host-template-id=[ID]]\n";
 	echo "    --list-input-fields --graph-template-id=[ID]\n";
 	echo "    --list-snmp-queries\n";
 	echo "    --list-query-types  --snmp-query-id [ID]\n";

cross_site_fix.patch:
 graph.php                    |    2 +
 include/top_graph_header.php |    6 +--
 lib/html_form.php            |   75 ++++++++++++++++++++++++++++++++++++++++---
 lib/timespan_settings.php    |    8 ++--
 4 files changed, 80 insertions(+), 11 deletions(-)

--- NEW FILE cross_site_fix.patch ---
--- cacti-0.8.7e/graph.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/graph.php	2009-11-21 23:10:16.000000000 -0500
@@ -35,6 +35,8 @@
 /* ================= input validation ================= */
 input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
 input_validate_input_number(get_request_var("local_graph_id"));
+input_validate_input_number(get_request_var("graph_end"));
+input_validate_input_number(get_request_var("graph_start"));
 input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$");
 /* ==================================================== */
 
--- cacti-0.8.7e/include/top_graph_header.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/include/top_graph_header.php	2009-11-21 23:15:27.000000000 -0500
@@ -58,7 +58,7 @@
 		if ($_SESSION["custom"]) {
 			print "<meta http-equiv=refresh content='99999'>\r\n";
 		}else{
-			print "<meta http-equiv=refresh content='" . read_graph_config_option("page_refresh") . "'>\r\n";
+			print "<meta http-equiv=refresh content='" . htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES) . "'>\r\n";
 		}
 	}
 	?>
@@ -113,7 +113,7 @@
 	</tr>
 	<tr class="noprint">
 		<td bgcolor="#efefef" colspan="1" height="8" style="background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-			<img src="images/transparent_line.gif" width="<?php print read_graph_config_option("default_dual_pane_width");?>" height="2" border="0"><br>
+			<img src="images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" height="2" border="0"><br>
 		</td>
 		<td bgcolor="#ffffff" colspan="1" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;">
 
@@ -144,7 +144,7 @@
 
 	<tr>
 		<?php if ((read_graph_config_option("default_tree_view_mode") == "2") && (($_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
-		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print read_graph_config_option("default_dual_pane_width");?>' class='noprint'>
+		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>' class='noprint'>
 			<table border=0 cellpadding=0 cellspacing=0><tr><td><font size=-2><a style="font-size:7pt;text-decoration:none;color:silver" href="http://www.treemenu.net/" target=_blank></a></font></td></tr></table>
 			<?php grow_dhtml_trees(); ?>
 			<script type="text/javascript">initializeDocument();</script>
--- cacti-0.8.7e/lib/html_form.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/html_form.php	2009-11-21 23:15:40.000000000 -0500
@@ -235,13 +235,21 @@
 
 		if (sizeof($items) > 0) {
 		foreach ($items as $item) {
-			print $item["name"] . "<br>";
+			print htmlspecialchars($item["name"],ENT_QUOTES) . "<br>";
 		}
 		}
 
 		break;
+	case 'font':
+		form_font_box($field_name, $field_array["value"],
+			((isset($field_array["default"])) ? $field_array["default"] : ""),
+			$field_array["max_length"],
+			((isset($field_array["size"])) ? $field_array["size"] : "40"), "text",
+			((isset($field_array["form_id"])) ? $field_array["form_id"] : ""));
+
+		break;
 	default:
-		print "<em>" . $field_array["value"] . "</em>";
+		print "<em>" . htmlspecialchars($field_array["value"],ENT_QUOTES) . "</em>";
 
 		form_hidden_box($field_name, $field_array["value"], "");
 
@@ -384,7 +392,7 @@
 		$form_previous_value = $form_default_value;
 	}
 
-	print "<input type='hidden' id='$form_name' name='$form_name' value='$form_previous_value'>\n";
+	print "<input type='hidden' id='$form_name' name='$form_name' value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>\n";
 }
 
 /* form_dropdown - draws a standard html dropdown box
@@ -568,7 +576,7 @@
 			}
 		}
 
-		print ">". $array_display[$id];
+		print ">". htmlspecialchars($array_display[$id],ENT_QUOTES);
 		print "</option>\n";
 	}
 
@@ -627,6 +635,65 @@
 	print "</select>\n";
 }
 
+/* form_font_box - draws a standard html textbox and provides status of a fonts existence
+   @arg $form_name - the name of this form element
+   @arg $form_previous_value - the current value of this form element
+   @arg $form_default_value - the value of this form element to use if there is
+     no current value available
+   @arg $form_max_length - the maximum number of characters that can be entered
+     into this textbox
+   @arg $form_size - the size (width) of the textbox
+   @arg $type - the type of textbox, either 'text' or 'password'
+   @arg $current_id - used to determine if a current value for this form element
+     exists or not. a $current_id of '0' indicates that no current value exists,
+     a non-zero value indicates that a current value does exist */
+function form_font_box($form_name, $form_previous_value, $form_default_value, $form_max_length, $form_size = 30, $type = "text", $current_id = 0) {
+	if (($form_previous_value == "") && (empty($current_id))) {
+		$form_previous_value = $form_default_value;
+	}
+
+	print "<input type='$type'";
+
+	if (isset($_SESSION["sess_error_fields"])) {
+		if (!empty($_SESSION["sess_error_fields"][$form_name])) {
+			print "class='txtErrorTextBox'";
+			unset($_SESSION["sess_error_fields"][$form_name]);
+		}
+	}
+
+	if (isset($_SESSION["sess_field_values"])) {
+		if (!empty($_SESSION["sess_field_values"][$form_name])) {
+			$form_previous_value = $_SESSION["sess_field_values"][$form_name];
+		}
+	}
+
+	if (strlen($form_previous_value) == 0) { # no data: defaults are used; everythings fine
+			$extra_data = "";
+	} else {
+		if (read_config_option("rrdtool_version") == "rrd-1.3.x") {	# rrdtool 1.3 uses fontconfig
+			$font = '"' . $form_previous_value . '"';
+			$out_array = array();
+			exec('fc-list ' . $font, $out_array);
+			if (sizeof($out_array) == 0) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FONT NOT FOUND" . "]</span>";
+			} else {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FONT FOUND" . "]</span>";
+			}
+		} elseif (read_config_option("rrdtool_version") == "rrd-1.0.x" ||
+				  read_config_option("rrdtool_version") == "rrd-1.2.x") { # rrdtool 1.0 and 1.2 use font files
+			if (is_file($form_previous_value)) {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FILE FOUND" . "]</span>";
+			}else if (is_dir($form_previous_value)) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: IS DIR" . "]</span>";
+			}else{
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FILE NOT FOUND" . "]</span>";
+			}
+		} # will be used for future versions of rrdtool
+	}
+
+	print " id='$form_name' name='$form_name' size='$form_size'" . (!empty($form_max_length) ? " maxlength='$form_max_length'" : "") . " value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>" . $extra_data;
+}
+
 /* form_confirm - draws a table presenting the user with some choice and allowing
      them to either proceed (delete) or cancel
    @arg $body_text - the text to prompt the user with on this form
--- cacti-0.8.7e/lib/timespan_settings.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/timespan_settings.php	2009-11-21 23:15:49.000000000 -0500
@@ -125,9 +125,9 @@
 	if (isset($_POST["date1"])) {
 		/* the dates have changed, therefore, I am now custom */
 		if (($_SESSION["sess_current_date1"] != $_POST["date1"]) || ($_SESSION["sess_current_date2"] != $_POST["date2"])) {
-			$timespan["current_value_date1"] = $_POST["date1"];
+			$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
 			$timespan["begin_now"] =strtotime($timespan["current_value_date1"]);
-			$timespan["current_value_date2"] = $_POST["date2"];
+			$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 			$timespan["end_now"]=strtotime($timespan["current_value_date2"]);
 			$_SESSION["sess_current_timespan"] = GT_CUSTOM;
 			$_SESSION["custom"] = 1;
@@ -135,8 +135,8 @@
 		}else {
 			/* the default button wasn't pushed */
 			if (!isset($_POST["button_clear_x"])) {
-				$timespan["current_value_date1"] = $_POST["date1"];
-				$timespan["current_value_date2"] = $_POST["date2"];
+				$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
+				$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 				$timespan["begin_now"] = $_SESSION["sess_current_timespan_begin_now"];
 				$timespan["end_now"] = $_SESSION["sess_current_timespan_end_now"];
 

snmp_invalid_response.patch:
 include/global_arrays.php |    4 ++++
 lib/snmp.php              |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE snmp_invalid_response.patch ---
--- ../tags/0.8.7e/include/global_arrays.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/include/global_arrays.php	2009-08-18 20:04:44.000000000 -0400
@@ -174,6 +174,10 @@
 	"DES" => "DES (default)",
 	"AES128" => "AES");
 
+$banned_snmp_strings = array(
+	"End of MIB",
+	"No Such");
+
 $logfile_options = array(1 =>
 	"Logfile Only",
 	"Logfile and Syslog/Eventlog",
--- ../tags/0.8.7e/lib/snmp.php	2009-06-28 12:34:30.000000000 -0400
+++ 0.8.7/lib/snmp.php	2009-08-18 20:04:44.000000000 -0400
@@ -27,9 +27,6 @@
 define("SNMP_METHOD_PHP", 1);
 define("SNMP_METHOD_BINARY", 2);
 
-/* declare once, use many times */
-$banned_snmp_strings = array("End of MIB", "No Such");
-
 /* we must use an apostrophe to escape community names under Unix in case the user uses
 characters that the shell might interpret. the ucd-snmp binaries on Windows flip out when
 you do this, but are perfectly happy with a quotation mark. */

template_duplication.patch:
 cli/repair_templates.php |  135 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/README              |    3 +
 lib/export.php           |    5 +
 lib/import.php           |   10 +--
 lib/utility.php          |    6 ++
 5 files changed, 153 insertions(+), 6 deletions(-)

--- NEW FILE template_duplication.patch ---
diff -ruBbd 0.8.7e/cli/repair_templates.php 0.8.7/cli/repair_templates.php
--- 0.8.7e/cli/repair_templates.php	2009-08-18 22:03:22.000000000 -0400
+++ 0.8.7/cli/repair_templates.php	2009-08-20 07:43:54.000000000 -0400
@@ -0,0 +1,135 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2009 The Cacti Group                                 |
+ |                                                                         |
+ | 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.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/* do NOT run this script through a web browser */
+if (!isset($_SERVER["argv"][0]) || isset($_SERVER['REQUEST_METHOD'])  || isset($_SERVER['REMOTE_ADDR'])) {
+	die("<br><strong>This script is only meant to run at the command line.</strong>");
+}
+
+$no_http_headers = true;
+
+include(dirname(__FILE__) . "/../include/global.php");
+include_once("../lib/utility.php");
+include_once("../lib/template.php");
+
+/* process calling arguments */
+$parms = $_SERVER["argv"];
+array_shift($parms);
+
+$execute = FALSE;
+
+foreach($parms as $parameter) {
+	@list($arg, $value) = @explode("=", $parameter);
+
+	switch ($arg) {
+	case "--execute":
+		$execute = TRUE;
+		break;
+	case "-h":
+	case "-v":
+	case "-V":
+	case "--version":
+	case "--help":
+		display_help();
+		exit;
+	default:
+		print "ERROR: Invalid Parameter " . $parameter . "\n\n";
+		display_help();
+		exit;
+	}
+}
+
+if ($execute) {
+	echo "NOTE: Repairing All Duplicated Templates\n";
+} else {
+	echo "NOTE: Performing Check of Templates\n";
+}
+
+/* repair data templates first */
+if ($execute) {
+	echo "NOTE: Repairing Data Templates\n";
+} else {
+	echo "NOTE: Performing Check of Data Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT data_template_id FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
		$template_name = db_fetch_cell("SELECT name FROM data_template WHERE id=" . $id["data_template_id"]);
+		echo "NOTE: Data Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Data Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_data_template($template["local_data_template_rrd_id"], "data_template_item");
+				db_execute("UPDATE data_template_rrd SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Data Templates Found\n";
+}
+
+/* reset the array */
+$damaged_templates = array();
+
+/* repair graph templates */
+if ($execute) {
+	echo "NOTE: Repairing Graph Templates\n";
+} else {
+	echo "NOTE: Performing Check of Graph Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT graph_template_id FROM graph_template_input WHERE hash=''");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
+		$template_name = db_fetch_cell("SELECT name FROM graph_templates WHERE id=" . $id["graph_template_id"]);
+		echo "NOTE: Graph Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM graph_template_input WHERE hash=''");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Graph Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_graph_template(0, "graph_template_input");
+				db_execute("UPDATE graph_template_input SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Graph Templates Found\n";
+}
+
+
+/* display_help - displays the usage of the function */
+function display_help () {
+	print "Cacti Database Template Repair Tool v1.0, Copyright 2004-2009 - The Cacti Group\n\n";
+	print "usage: repair_templates.php --execute [--help]\n\n";
+	print "--execute        - Perform the repair\n";
+	print "--help           - display this help message\n";
+}
+?>
diff -ruBbd 0.8.7e/docs/README 0.8.7/docs/README
--- 0.8.7e/docs/README	2009-08-18 21:57:30.000000000 -0400
+++ 0.8.7/docs/README	2009-08-18 21:58:09.000000000 -0400
@@ -90,6 +90,9 @@
                             table
   poller_reindex_hosts.php - Cause data query reindex on hosts
   rebuild_poller_cache.php - Rebuilds the poller cache
+  repair_templates.php     - Certain templates, when created using the "duplicate"
+      function in Cacti, do not import/export well.  This utility repairs 
+      those templates.
 
 
 
diff -ruBbd 0.8.7e/lib/export.php 0.8.7/lib/export.php
--- 0.8.7e/lib/export.php	2009-08-18 21:56:47.000000000 -0400
+++ 0.8.7/lib/export.php	2009-08-18 21:57:50.000000000 -0400
@@ -811,7 +811,9 @@
 }
 
 function xml_character_encode($text) {
-
+	if (function_exists("htmlspecialchars")) {
+		return htmlspecialchars($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$text = str_replace("&", "&amp;", $text);
 	$text = str_replace(">", "&gt;", $text);
 	$text = str_replace("<", "&lt;", $text);
@@ -819,6 +821,7 @@
 	$text = str_replace("\'", "&apos;", $text);
 
 	return $text;
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/import.php 0.8.7/lib/import.php
--- 0.8.7e/lib/import.php	2009-08-18 21:56:59.000000000 -0400
+++ 0.8.7/lib/import.php	2009-08-18 21:57:55.000000000 -0400
@@ -36,10 +36,6 @@
 		return $info_array;
 	}
 
-	if (isset($xml_array["name"])) {
-		$xml_array["name"] = htmlspecialchars($xml_array["name"]);
-	}
-
 	while (list($hash, $hash_array) = each($xml_array)) {
 		/* parse information from the hash */
 		$parsed_hash = parse_xml_hash($hash);
@@ -115,7 +111,7 @@
 	$_graph_template_id = db_fetch_cell("select id from graph_templates where hash='$hash'");
 	$save["id"] = (empty($_graph_template_id) ? "0" : $_graph_template_id);
 	$save["hash"] = $hash;
-	$save["name"] = htmlspecialchars($xml_array["name"]);
+	$save["name"] = $xml_array["name"];
 	$graph_template_id = sql_save($save, "graph_templates");
 
 	$hash_cache["graph_template"][$hash] = $graph_template_id;
@@ -914,9 +910,13 @@
 }
 
 function xml_character_decode($text) {
+	if (function_exists("html_entity_decode")) {
+		return html_entity_decode($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$trans_tbl = get_html_translation_table(HTML_ENTITIES);
 	$trans_tbl = array_flip($trans_tbl);
 	return strtr($text, $trans_tbl);
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/utility.php 0.8.7/lib/utility.php
--- 0.8.7e/lib/utility.php	2009-08-18 21:57:08.000000000 -0400
+++ 0.8.7/lib/utility.php	2009-08-18 21:58:00.000000000 -0400
@@ -346,6 +346,7 @@
 			$save["name"] = $graph_template_input["name"];
 			$save["description"] = $graph_template_input["description"];
 			$save["column_name"] = $graph_template_input["column_name"];
+			$save["hash"]              = get_hash_graph_template(0, "graph_template_input");
 
 			$graph_template_input_id = sql_save($save, "graph_template_input");
 
@@ -436,6 +437,11 @@
 		$save["local_data_id"] = (isset($local_data_id) ? $local_data_id : 0);
 		$save["local_data_template_rrd_id"] = (isset($data_template_rrd["local_data_template_rrd_id"]) ? $data_template_rrd["local_data_template_rrd_id"] : 0);
 		$save["data_template_id"] = (!empty($_local_data_id) ? $data_template_rrd["data_template_id"] : $data_template_id);
+		if ($save["local_data_id"] == 0) {
+			$save["hash"]                   = get_hash_data_template($data_template_rrd["local_data_template_rrd_id"], "data_template_item");
+		} else {
+			$save["hash"] = '';
+		}
 
 		while (list($field, $array) = each($struct_data_source_item)) {
 			$save{$field} = $data_template_rrd{$field};


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cacti.spec	17 Aug 2009 02:14:37 -0000	1.19
+++ cacti.spec	1 Dec 2009 15:19:46 -0000	1.20
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7e
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,10 @@ Source0: http://www.cacti.net/downloads/
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Patch0: cli_add_graph.patch
+Patch1: snmp_invalid_response.patch
+Patch2: template_duplication.patch
+Patch3: cross_site_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +34,10 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +113,11 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-3
+- Pulling in some official patches
+- #541279
+- #541962
+
 * Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
 - Upstream released new version
 



From mmcgrath at fedoraproject.org  Tue Dec  1 15:19:46 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 15:19:46 +0000 (UTC)
Subject: rpms/cacti/EL-4 cli_add_graph.patch, NONE, 1.1 cross_site_fix.patch,
	NONE, 1.1 snmp_invalid_response.patch, NONE,
	1.1 template_duplication.patch, NONE, 1.1 cacti.spec, 1.19, 1.20
Message-ID: <20091201151946.ECD4E11C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Added Files:
	cli_add_graph.patch cross_site_fix.patch 
	snmp_invalid_response.patch template_duplication.patch 
Log Message:
official patches

cli_add_graph.patch:
 add_graphs.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cli_add_graph.patch ---
--- ../tags/0.8.7e/cli/add_graphs.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/cli/add_graphs.php	2009-08-18 20:04:44.000000000 -0400
@@ -570,7 +570,7 @@
 	echo "                    3|Fields = Verify all Fields\n";
 	echo "List Options:\n";
 	echo "    --list-hosts\n";
-	echo "    --list-graph-templates [--host_template=[ID]]\n";
+	echo "    --list-graph-templates [--host-template-id=[ID]]\n";
 	echo "    --list-input-fields --graph-template-id=[ID]\n";
 	echo "    --list-snmp-queries\n";
 	echo "    --list-query-types  --snmp-query-id [ID]\n";

cross_site_fix.patch:
 graph.php                    |    2 +
 include/top_graph_header.php |    6 +--
 lib/html_form.php            |   75 ++++++++++++++++++++++++++++++++++++++++---
 lib/timespan_settings.php    |    8 ++--
 4 files changed, 80 insertions(+), 11 deletions(-)

--- NEW FILE cross_site_fix.patch ---
--- cacti-0.8.7e/graph.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/graph.php	2009-11-21 23:10:16.000000000 -0500
@@ -35,6 +35,8 @@
 /* ================= input validation ================= */
 input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
 input_validate_input_number(get_request_var("local_graph_id"));
+input_validate_input_number(get_request_var("graph_end"));
+input_validate_input_number(get_request_var("graph_start"));
 input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$");
 /* ==================================================== */
 
--- cacti-0.8.7e/include/top_graph_header.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/include/top_graph_header.php	2009-11-21 23:15:27.000000000 -0500
@@ -58,7 +58,7 @@
 		if ($_SESSION["custom"]) {
 			print "<meta http-equiv=refresh content='99999'>\r\n";
 		}else{
-			print "<meta http-equiv=refresh content='" . read_graph_config_option("page_refresh") . "'>\r\n";
+			print "<meta http-equiv=refresh content='" . htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES) . "'>\r\n";
 		}
 	}
 	?>
@@ -113,7 +113,7 @@
 	</tr>
 	<tr class="noprint">
 		<td bgcolor="#efefef" colspan="1" height="8" style="background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-			<img src="images/transparent_line.gif" width="<?php print read_graph_config_option("default_dual_pane_width");?>" height="2" border="0"><br>
+			<img src="images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" height="2" border="0"><br>
 		</td>
 		<td bgcolor="#ffffff" colspan="1" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;">
 
@@ -144,7 +144,7 @@
 
 	<tr>
 		<?php if ((read_graph_config_option("default_tree_view_mode") == "2") && (($_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
-		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print read_graph_config_option("default_dual_pane_width");?>' class='noprint'>
+		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>' class='noprint'>
 			<table border=0 cellpadding=0 cellspacing=0><tr><td><font size=-2><a style="font-size:7pt;text-decoration:none;color:silver" href="http://www.treemenu.net/" target=_blank></a></font></td></tr></table>
 			<?php grow_dhtml_trees(); ?>
 			<script type="text/javascript">initializeDocument();</script>
--- cacti-0.8.7e/lib/html_form.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/html_form.php	2009-11-21 23:15:40.000000000 -0500
@@ -235,13 +235,21 @@
 
 		if (sizeof($items) > 0) {
 		foreach ($items as $item) {
-			print $item["name"] . "<br>";
+			print htmlspecialchars($item["name"],ENT_QUOTES) . "<br>";
 		}
 		}
 
 		break;
+	case 'font':
+		form_font_box($field_name, $field_array["value"],
+			((isset($field_array["default"])) ? $field_array["default"] : ""),
+			$field_array["max_length"],
+			((isset($field_array["size"])) ? $field_array["size"] : "40"), "text",
+			((isset($field_array["form_id"])) ? $field_array["form_id"] : ""));
+
+		break;
 	default:
-		print "<em>" . $field_array["value"] . "</em>";
+		print "<em>" . htmlspecialchars($field_array["value"],ENT_QUOTES) . "</em>";
 
 		form_hidden_box($field_name, $field_array["value"], "");
 
@@ -384,7 +392,7 @@
 		$form_previous_value = $form_default_value;
 	}
 
-	print "<input type='hidden' id='$form_name' name='$form_name' value='$form_previous_value'>\n";
+	print "<input type='hidden' id='$form_name' name='$form_name' value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>\n";
 }
 
 /* form_dropdown - draws a standard html dropdown box
@@ -568,7 +576,7 @@
 			}
 		}
 
-		print ">". $array_display[$id];
+		print ">". htmlspecialchars($array_display[$id],ENT_QUOTES);
 		print "</option>\n";
 	}
 
@@ -627,6 +635,65 @@
 	print "</select>\n";
 }
 
+/* form_font_box - draws a standard html textbox and provides status of a fonts existence
+   @arg $form_name - the name of this form element
+   @arg $form_previous_value - the current value of this form element
+   @arg $form_default_value - the value of this form element to use if there is
+     no current value available
+   @arg $form_max_length - the maximum number of characters that can be entered
+     into this textbox
+   @arg $form_size - the size (width) of the textbox
+   @arg $type - the type of textbox, either 'text' or 'password'
+   @arg $current_id - used to determine if a current value for this form element
+     exists or not. a $current_id of '0' indicates that no current value exists,
+     a non-zero value indicates that a current value does exist */
+function form_font_box($form_name, $form_previous_value, $form_default_value, $form_max_length, $form_size = 30, $type = "text", $current_id = 0) {
+	if (($form_previous_value == "") && (empty($current_id))) {
+		$form_previous_value = $form_default_value;
+	}
+
+	print "<input type='$type'";
+
+	if (isset($_SESSION["sess_error_fields"])) {
+		if (!empty($_SESSION["sess_error_fields"][$form_name])) {
+			print "class='txtErrorTextBox'";
+			unset($_SESSION["sess_error_fields"][$form_name]);
+		}
+	}
+
+	if (isset($_SESSION["sess_field_values"])) {
+		if (!empty($_SESSION["sess_field_values"][$form_name])) {
+			$form_previous_value = $_SESSION["sess_field_values"][$form_name];
+		}
+	}
+
+	if (strlen($form_previous_value) == 0) { # no data: defaults are used; everythings fine
+			$extra_data = "";
+	} else {
+		if (read_config_option("rrdtool_version") == "rrd-1.3.x") {	# rrdtool 1.3 uses fontconfig
+			$font = '"' . $form_previous_value . '"';
+			$out_array = array();
+			exec('fc-list ' . $font, $out_array);
+			if (sizeof($out_array) == 0) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FONT NOT FOUND" . "]</span>";
+			} else {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FONT FOUND" . "]</span>";
+			}
+		} elseif (read_config_option("rrdtool_version") == "rrd-1.0.x" ||
+				  read_config_option("rrdtool_version") == "rrd-1.2.x") { # rrdtool 1.0 and 1.2 use font files
+			if (is_file($form_previous_value)) {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FILE FOUND" . "]</span>";
+			}else if (is_dir($form_previous_value)) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: IS DIR" . "]</span>";
+			}else{
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FILE NOT FOUND" . "]</span>";
+			}
+		} # will be used for future versions of rrdtool
+	}
+
+	print " id='$form_name' name='$form_name' size='$form_size'" . (!empty($form_max_length) ? " maxlength='$form_max_length'" : "") . " value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>" . $extra_data;
+}
+
 /* form_confirm - draws a table presenting the user with some choice and allowing
      them to either proceed (delete) or cancel
    @arg $body_text - the text to prompt the user with on this form
--- cacti-0.8.7e/lib/timespan_settings.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/timespan_settings.php	2009-11-21 23:15:49.000000000 -0500
@@ -125,9 +125,9 @@
 	if (isset($_POST["date1"])) {
 		/* the dates have changed, therefore, I am now custom */
 		if (($_SESSION["sess_current_date1"] != $_POST["date1"]) || ($_SESSION["sess_current_date2"] != $_POST["date2"])) {
-			$timespan["current_value_date1"] = $_POST["date1"];
+			$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
 			$timespan["begin_now"] =strtotime($timespan["current_value_date1"]);
-			$timespan["current_value_date2"] = $_POST["date2"];
+			$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 			$timespan["end_now"]=strtotime($timespan["current_value_date2"]);
 			$_SESSION["sess_current_timespan"] = GT_CUSTOM;
 			$_SESSION["custom"] = 1;
@@ -135,8 +135,8 @@
 		}else {
 			/* the default button wasn't pushed */
 			if (!isset($_POST["button_clear_x"])) {
-				$timespan["current_value_date1"] = $_POST["date1"];
-				$timespan["current_value_date2"] = $_POST["date2"];
+				$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
+				$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 				$timespan["begin_now"] = $_SESSION["sess_current_timespan_begin_now"];
 				$timespan["end_now"] = $_SESSION["sess_current_timespan_end_now"];
 

snmp_invalid_response.patch:
 include/global_arrays.php |    4 ++++
 lib/snmp.php              |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE snmp_invalid_response.patch ---
--- ../tags/0.8.7e/include/global_arrays.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/include/global_arrays.php	2009-08-18 20:04:44.000000000 -0400
@@ -174,6 +174,10 @@
 	"DES" => "DES (default)",
 	"AES128" => "AES");
 
+$banned_snmp_strings = array(
+	"End of MIB",
+	"No Such");
+
 $logfile_options = array(1 =>
 	"Logfile Only",
 	"Logfile and Syslog/Eventlog",
--- ../tags/0.8.7e/lib/snmp.php	2009-06-28 12:34:30.000000000 -0400
+++ 0.8.7/lib/snmp.php	2009-08-18 20:04:44.000000000 -0400
@@ -27,9 +27,6 @@
 define("SNMP_METHOD_PHP", 1);
 define("SNMP_METHOD_BINARY", 2);
 
-/* declare once, use many times */
-$banned_snmp_strings = array("End of MIB", "No Such");
-
 /* we must use an apostrophe to escape community names under Unix in case the user uses
 characters that the shell might interpret. the ucd-snmp binaries on Windows flip out when
 you do this, but are perfectly happy with a quotation mark. */

template_duplication.patch:
 cli/repair_templates.php |  135 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/README              |    3 +
 lib/export.php           |    5 +
 lib/import.php           |   10 +--
 lib/utility.php          |    6 ++
 5 files changed, 153 insertions(+), 6 deletions(-)

--- NEW FILE template_duplication.patch ---
diff -ruBbd 0.8.7e/cli/repair_templates.php 0.8.7/cli/repair_templates.php
--- 0.8.7e/cli/repair_templates.php	2009-08-18 22:03:22.000000000 -0400
+++ 0.8.7/cli/repair_templates.php	2009-08-20 07:43:54.000000000 -0400
@@ -0,0 +1,135 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2009 The Cacti Group                                 |
+ |                                                                         |
+ | 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.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/* do NOT run this script through a web browser */
+if (!isset($_SERVER["argv"][0]) || isset($_SERVER['REQUEST_METHOD'])  || isset($_SERVER['REMOTE_ADDR'])) {
+	die("<br><strong>This script is only meant to run at the command line.</strong>");
+}
+
+$no_http_headers = true;
+
+include(dirname(__FILE__) . "/../include/global.php");
+include_once("../lib/utility.php");
+include_once("../lib/template.php");
+
+/* process calling arguments */
+$parms = $_SERVER["argv"];
+array_shift($parms);
+
+$execute = FALSE;
+
+foreach($parms as $parameter) {
+	@list($arg, $value) = @explode("=", $parameter);
+
+	switch ($arg) {
+	case "--execute":
+		$execute = TRUE;
+		break;
+	case "-h":
+	case "-v":
+	case "-V":
+	case "--version":
+	case "--help":
+		display_help();
+		exit;
+	default:
+		print "ERROR: Invalid Parameter " . $parameter . "\n\n";
+		display_help();
+		exit;
+	}
+}
+
+if ($execute) {
+	echo "NOTE: Repairing All Duplicated Templates\n";
+} else {
+	echo "NOTE: Performing Check of Templates\n";
+}
+
+/* repair data templates first */
+if ($execute) {
+	echo "NOTE: Repairing Data Templates\n";
+} else {
+	echo "NOTE: Performing Check of Data Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT data_template_id FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
		$template_name = db_fetch_cell("SELECT name FROM data_template WHERE id=" . $id["data_template_id"]);
+		echo "NOTE: Data Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Data Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_data_template($template["local_data_template_rrd_id"], "data_template_item");
+				db_execute("UPDATE data_template_rrd SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Data Templates Found\n";
+}
+
+/* reset the array */
+$damaged_templates = array();
+
+/* repair graph templates */
+if ($execute) {
+	echo "NOTE: Repairing Graph Templates\n";
+} else {
+	echo "NOTE: Performing Check of Graph Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT graph_template_id FROM graph_template_input WHERE hash=''");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
+		$template_name = db_fetch_cell("SELECT name FROM graph_templates WHERE id=" . $id["graph_template_id"]);
+		echo "NOTE: Graph Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM graph_template_input WHERE hash=''");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Graph Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_graph_template(0, "graph_template_input");
+				db_execute("UPDATE graph_template_input SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Graph Templates Found\n";
+}
+
+
+/* display_help - displays the usage of the function */
+function display_help () {
+	print "Cacti Database Template Repair Tool v1.0, Copyright 2004-2009 - The Cacti Group\n\n";
+	print "usage: repair_templates.php --execute [--help]\n\n";
+	print "--execute        - Perform the repair\n";
+	print "--help           - display this help message\n";
+}
+?>
diff -ruBbd 0.8.7e/docs/README 0.8.7/docs/README
--- 0.8.7e/docs/README	2009-08-18 21:57:30.000000000 -0400
+++ 0.8.7/docs/README	2009-08-18 21:58:09.000000000 -0400
@@ -90,6 +90,9 @@
                             table
   poller_reindex_hosts.php - Cause data query reindex on hosts
   rebuild_poller_cache.php - Rebuilds the poller cache
+  repair_templates.php     - Certain templates, when created using the "duplicate"
+      function in Cacti, do not import/export well.  This utility repairs 
+      those templates.
 
 
 
diff -ruBbd 0.8.7e/lib/export.php 0.8.7/lib/export.php
--- 0.8.7e/lib/export.php	2009-08-18 21:56:47.000000000 -0400
+++ 0.8.7/lib/export.php	2009-08-18 21:57:50.000000000 -0400
@@ -811,7 +811,9 @@
 }
 
 function xml_character_encode($text) {
-
+	if (function_exists("htmlspecialchars")) {
+		return htmlspecialchars($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$text = str_replace("&", "&amp;", $text);
 	$text = str_replace(">", "&gt;", $text);
 	$text = str_replace("<", "&lt;", $text);
@@ -819,6 +821,7 @@
 	$text = str_replace("\'", "&apos;", $text);
 
 	return $text;
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/import.php 0.8.7/lib/import.php
--- 0.8.7e/lib/import.php	2009-08-18 21:56:59.000000000 -0400
+++ 0.8.7/lib/import.php	2009-08-18 21:57:55.000000000 -0400
@@ -36,10 +36,6 @@
 		return $info_array;
 	}
 
-	if (isset($xml_array["name"])) {
-		$xml_array["name"] = htmlspecialchars($xml_array["name"]);
-	}
-
 	while (list($hash, $hash_array) = each($xml_array)) {
 		/* parse information from the hash */
 		$parsed_hash = parse_xml_hash($hash);
@@ -115,7 +111,7 @@
 	$_graph_template_id = db_fetch_cell("select id from graph_templates where hash='$hash'");
 	$save["id"] = (empty($_graph_template_id) ? "0" : $_graph_template_id);
 	$save["hash"] = $hash;
-	$save["name"] = htmlspecialchars($xml_array["name"]);
+	$save["name"] = $xml_array["name"];
 	$graph_template_id = sql_save($save, "graph_templates");
 
 	$hash_cache["graph_template"][$hash] = $graph_template_id;
@@ -914,9 +910,13 @@
 }
 
 function xml_character_decode($text) {
+	if (function_exists("html_entity_decode")) {
+		return html_entity_decode($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$trans_tbl = get_html_translation_table(HTML_ENTITIES);
 	$trans_tbl = array_flip($trans_tbl);
 	return strtr($text, $trans_tbl);
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/utility.php 0.8.7/lib/utility.php
--- 0.8.7e/lib/utility.php	2009-08-18 21:57:08.000000000 -0400
+++ 0.8.7/lib/utility.php	2009-08-18 21:58:00.000000000 -0400
@@ -346,6 +346,7 @@
 			$save["name"] = $graph_template_input["name"];
 			$save["description"] = $graph_template_input["description"];
 			$save["column_name"] = $graph_template_input["column_name"];
+			$save["hash"]              = get_hash_graph_template(0, "graph_template_input");
 
 			$graph_template_input_id = sql_save($save, "graph_template_input");
 
@@ -436,6 +437,11 @@
 		$save["local_data_id"] = (isset($local_data_id) ? $local_data_id : 0);
 		$save["local_data_template_rrd_id"] = (isset($data_template_rrd["local_data_template_rrd_id"]) ? $data_template_rrd["local_data_template_rrd_id"] : 0);
 		$save["data_template_id"] = (!empty($_local_data_id) ? $data_template_rrd["data_template_id"] : $data_template_id);
+		if ($save["local_data_id"] == 0) {
+			$save["hash"]                   = get_hash_data_template($data_template_rrd["local_data_template_rrd_id"], "data_template_item");
+		} else {
+			$save["hash"] = '';
+		}
 
 		while (list($field, $array) = each($struct_data_source_item)) {
 			$save{$field} = $data_template_rrd{$field};


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-4/cacti.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cacti.spec	17 Aug 2009 02:15:04 -0000	1.19
+++ cacti.spec	1 Dec 2009 15:19:46 -0000	1.20
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7e
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,10 @@ Source0: http://www.cacti.net/downloads/
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Patch0: cli_add_graph.patch
+Patch1: snmp_invalid_response.patch
+Patch2: template_duplication.patch
+Patch3: cross_site_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +34,10 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +113,11 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-3
+- Pulling in some official patches
+- #541279
+- #541962
+
 * Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
 - Upstream released new version
 



From mmcgrath at fedoraproject.org  Tue Dec  1 15:19:47 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 15:19:47 +0000 (UTC)
Subject: rpms/cacti/F-10 cli_add_graph.patch, NONE, 1.1 cross_site_fix.patch,
	NONE, 1.1 snmp_invalid_response.patch, NONE,
	1.1 template_duplication.patch, NONE, 1.1 cacti.spec, 1.26, 1.27
Message-ID: <20091201151947.83DFE11C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Added Files:
	cli_add_graph.patch cross_site_fix.patch 
	snmp_invalid_response.patch template_duplication.patch 
Log Message:
official patches

cli_add_graph.patch:
 add_graphs.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cli_add_graph.patch ---
--- ../tags/0.8.7e/cli/add_graphs.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/cli/add_graphs.php	2009-08-18 20:04:44.000000000 -0400
@@ -570,7 +570,7 @@
 	echo "                    3|Fields = Verify all Fields\n";
 	echo "List Options:\n";
 	echo "    --list-hosts\n";
-	echo "    --list-graph-templates [--host_template=[ID]]\n";
+	echo "    --list-graph-templates [--host-template-id=[ID]]\n";
 	echo "    --list-input-fields --graph-template-id=[ID]\n";
 	echo "    --list-snmp-queries\n";
 	echo "    --list-query-types  --snmp-query-id [ID]\n";

cross_site_fix.patch:
 graph.php                    |    2 +
 include/top_graph_header.php |    6 +--
 lib/html_form.php            |   75 ++++++++++++++++++++++++++++++++++++++++---
 lib/timespan_settings.php    |    8 ++--
 4 files changed, 80 insertions(+), 11 deletions(-)

--- NEW FILE cross_site_fix.patch ---
--- cacti-0.8.7e/graph.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/graph.php	2009-11-21 23:10:16.000000000 -0500
@@ -35,6 +35,8 @@
 /* ================= input validation ================= */
 input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
 input_validate_input_number(get_request_var("local_graph_id"));
+input_validate_input_number(get_request_var("graph_end"));
+input_validate_input_number(get_request_var("graph_start"));
 input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$");
 /* ==================================================== */
 
--- cacti-0.8.7e/include/top_graph_header.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/include/top_graph_header.php	2009-11-21 23:15:27.000000000 -0500
@@ -58,7 +58,7 @@
 		if ($_SESSION["custom"]) {
 			print "<meta http-equiv=refresh content='99999'>\r\n";
 		}else{
-			print "<meta http-equiv=refresh content='" . read_graph_config_option("page_refresh") . "'>\r\n";
+			print "<meta http-equiv=refresh content='" . htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES) . "'>\r\n";
 		}
 	}
 	?>
@@ -113,7 +113,7 @@
 	</tr>
 	<tr class="noprint">
 		<td bgcolor="#efefef" colspan="1" height="8" style="background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-			<img src="images/transparent_line.gif" width="<?php print read_graph_config_option("default_dual_pane_width");?>" height="2" border="0"><br>
+			<img src="images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" height="2" border="0"><br>
 		</td>
 		<td bgcolor="#ffffff" colspan="1" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;">
 
@@ -144,7 +144,7 @@
 
 	<tr>
 		<?php if ((read_graph_config_option("default_tree_view_mode") == "2") && (($_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
-		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print read_graph_config_option("default_dual_pane_width");?>' class='noprint'>
+		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>' class='noprint'>
 			<table border=0 cellpadding=0 cellspacing=0><tr><td><font size=-2><a style="font-size:7pt;text-decoration:none;color:silver" href="http://www.treemenu.net/" target=_blank></a></font></td></tr></table>
 			<?php grow_dhtml_trees(); ?>
 			<script type="text/javascript">initializeDocument();</script>
--- cacti-0.8.7e/lib/html_form.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/html_form.php	2009-11-21 23:15:40.000000000 -0500
@@ -235,13 +235,21 @@
 
 		if (sizeof($items) > 0) {
 		foreach ($items as $item) {
-			print $item["name"] . "<br>";
+			print htmlspecialchars($item["name"],ENT_QUOTES) . "<br>";
 		}
 		}
 
 		break;
+	case 'font':
+		form_font_box($field_name, $field_array["value"],
+			((isset($field_array["default"])) ? $field_array["default"] : ""),
+			$field_array["max_length"],
+			((isset($field_array["size"])) ? $field_array["size"] : "40"), "text",
+			((isset($field_array["form_id"])) ? $field_array["form_id"] : ""));
+
+		break;
 	default:
-		print "<em>" . $field_array["value"] . "</em>";
+		print "<em>" . htmlspecialchars($field_array["value"],ENT_QUOTES) . "</em>";
 
 		form_hidden_box($field_name, $field_array["value"], "");
 
@@ -384,7 +392,7 @@
 		$form_previous_value = $form_default_value;
 	}
 
-	print "<input type='hidden' id='$form_name' name='$form_name' value='$form_previous_value'>\n";
+	print "<input type='hidden' id='$form_name' name='$form_name' value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>\n";
 }
 
 /* form_dropdown - draws a standard html dropdown box
@@ -568,7 +576,7 @@
 			}
 		}
 
-		print ">". $array_display[$id];
+		print ">". htmlspecialchars($array_display[$id],ENT_QUOTES);
 		print "</option>\n";
 	}
 
@@ -627,6 +635,65 @@
 	print "</select>\n";
 }
 
+/* form_font_box - draws a standard html textbox and provides status of a fonts existence
+   @arg $form_name - the name of this form element
+   @arg $form_previous_value - the current value of this form element
+   @arg $form_default_value - the value of this form element to use if there is
+     no current value available
+   @arg $form_max_length - the maximum number of characters that can be entered
+     into this textbox
+   @arg $form_size - the size (width) of the textbox
+   @arg $type - the type of textbox, either 'text' or 'password'
+   @arg $current_id - used to determine if a current value for this form element
+     exists or not. a $current_id of '0' indicates that no current value exists,
+     a non-zero value indicates that a current value does exist */
+function form_font_box($form_name, $form_previous_value, $form_default_value, $form_max_length, $form_size = 30, $type = "text", $current_id = 0) {
+	if (($form_previous_value == "") && (empty($current_id))) {
+		$form_previous_value = $form_default_value;
+	}
+
+	print "<input type='$type'";
+
+	if (isset($_SESSION["sess_error_fields"])) {
+		if (!empty($_SESSION["sess_error_fields"][$form_name])) {
+			print "class='txtErrorTextBox'";
+			unset($_SESSION["sess_error_fields"][$form_name]);
+		}
+	}
+
+	if (isset($_SESSION["sess_field_values"])) {
+		if (!empty($_SESSION["sess_field_values"][$form_name])) {
+			$form_previous_value = $_SESSION["sess_field_values"][$form_name];
+		}
+	}
+
+	if (strlen($form_previous_value) == 0) { # no data: defaults are used; everythings fine
+			$extra_data = "";
+	} else {
+		if (read_config_option("rrdtool_version") == "rrd-1.3.x") {	# rrdtool 1.3 uses fontconfig
+			$font = '"' . $form_previous_value . '"';
+			$out_array = array();
+			exec('fc-list ' . $font, $out_array);
+			if (sizeof($out_array) == 0) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FONT NOT FOUND" . "]</span>";
+			} else {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FONT FOUND" . "]</span>";
+			}
+		} elseif (read_config_option("rrdtool_version") == "rrd-1.0.x" ||
+				  read_config_option("rrdtool_version") == "rrd-1.2.x") { # rrdtool 1.0 and 1.2 use font files
+			if (is_file($form_previous_value)) {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FILE FOUND" . "]</span>";
+			}else if (is_dir($form_previous_value)) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: IS DIR" . "]</span>";
+			}else{
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FILE NOT FOUND" . "]</span>";
+			}
+		} # will be used for future versions of rrdtool
+	}
+
+	print " id='$form_name' name='$form_name' size='$form_size'" . (!empty($form_max_length) ? " maxlength='$form_max_length'" : "") . " value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>" . $extra_data;
+}
+
 /* form_confirm - draws a table presenting the user with some choice and allowing
      them to either proceed (delete) or cancel
    @arg $body_text - the text to prompt the user with on this form
--- cacti-0.8.7e/lib/timespan_settings.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/timespan_settings.php	2009-11-21 23:15:49.000000000 -0500
@@ -125,9 +125,9 @@
 	if (isset($_POST["date1"])) {
 		/* the dates have changed, therefore, I am now custom */
 		if (($_SESSION["sess_current_date1"] != $_POST["date1"]) || ($_SESSION["sess_current_date2"] != $_POST["date2"])) {
-			$timespan["current_value_date1"] = $_POST["date1"];
+			$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
 			$timespan["begin_now"] =strtotime($timespan["current_value_date1"]);
-			$timespan["current_value_date2"] = $_POST["date2"];
+			$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 			$timespan["end_now"]=strtotime($timespan["current_value_date2"]);
 			$_SESSION["sess_current_timespan"] = GT_CUSTOM;
 			$_SESSION["custom"] = 1;
@@ -135,8 +135,8 @@
 		}else {
 			/* the default button wasn't pushed */
 			if (!isset($_POST["button_clear_x"])) {
-				$timespan["current_value_date1"] = $_POST["date1"];
-				$timespan["current_value_date2"] = $_POST["date2"];
+				$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
+				$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 				$timespan["begin_now"] = $_SESSION["sess_current_timespan_begin_now"];
 				$timespan["end_now"] = $_SESSION["sess_current_timespan_end_now"];
 

snmp_invalid_response.patch:
 include/global_arrays.php |    4 ++++
 lib/snmp.php              |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE snmp_invalid_response.patch ---
--- ../tags/0.8.7e/include/global_arrays.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/include/global_arrays.php	2009-08-18 20:04:44.000000000 -0400
@@ -174,6 +174,10 @@
 	"DES" => "DES (default)",
 	"AES128" => "AES");
 
+$banned_snmp_strings = array(
+	"End of MIB",
+	"No Such");
+
 $logfile_options = array(1 =>
 	"Logfile Only",
 	"Logfile and Syslog/Eventlog",
--- ../tags/0.8.7e/lib/snmp.php	2009-06-28 12:34:30.000000000 -0400
+++ 0.8.7/lib/snmp.php	2009-08-18 20:04:44.000000000 -0400
@@ -27,9 +27,6 @@
 define("SNMP_METHOD_PHP", 1);
 define("SNMP_METHOD_BINARY", 2);
 
-/* declare once, use many times */
-$banned_snmp_strings = array("End of MIB", "No Such");
-
 /* we must use an apostrophe to escape community names under Unix in case the user uses
 characters that the shell might interpret. the ucd-snmp binaries on Windows flip out when
 you do this, but are perfectly happy with a quotation mark. */

template_duplication.patch:
 cli/repair_templates.php |  135 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/README              |    3 +
 lib/export.php           |    5 +
 lib/import.php           |   10 +--
 lib/utility.php          |    6 ++
 5 files changed, 153 insertions(+), 6 deletions(-)

--- NEW FILE template_duplication.patch ---
diff -ruBbd 0.8.7e/cli/repair_templates.php 0.8.7/cli/repair_templates.php
--- 0.8.7e/cli/repair_templates.php	2009-08-18 22:03:22.000000000 -0400
+++ 0.8.7/cli/repair_templates.php	2009-08-20 07:43:54.000000000 -0400
@@ -0,0 +1,135 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2009 The Cacti Group                                 |
+ |                                                                         |
+ | 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.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/* do NOT run this script through a web browser */
+if (!isset($_SERVER["argv"][0]) || isset($_SERVER['REQUEST_METHOD'])  || isset($_SERVER['REMOTE_ADDR'])) {
+	die("<br><strong>This script is only meant to run at the command line.</strong>");
+}
+
+$no_http_headers = true;
+
+include(dirname(__FILE__) . "/../include/global.php");
+include_once("../lib/utility.php");
+include_once("../lib/template.php");
+
+/* process calling arguments */
+$parms = $_SERVER["argv"];
+array_shift($parms);
+
+$execute = FALSE;
+
+foreach($parms as $parameter) {
+	@list($arg, $value) = @explode("=", $parameter);
+
+	switch ($arg) {
+	case "--execute":
+		$execute = TRUE;
+		break;
+	case "-h":
+	case "-v":
+	case "-V":
+	case "--version":
+	case "--help":
+		display_help();
+		exit;
+	default:
+		print "ERROR: Invalid Parameter " . $parameter . "\n\n";
+		display_help();
+		exit;
+	}
+}
+
+if ($execute) {
+	echo "NOTE: Repairing All Duplicated Templates\n";
+} else {
+	echo "NOTE: Performing Check of Templates\n";
+}
+
+/* repair data templates first */
+if ($execute) {
+	echo "NOTE: Repairing Data Templates\n";
+} else {
+	echo "NOTE: Performing Check of Data Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT data_template_id FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
		$template_name = db_fetch_cell("SELECT name FROM data_template WHERE id=" . $id["data_template_id"]);
+		echo "NOTE: Data Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Data Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_data_template($template["local_data_template_rrd_id"], "data_template_item");
+				db_execute("UPDATE data_template_rrd SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Data Templates Found\n";
+}
+
+/* reset the array */
+$damaged_templates = array();
+
+/* repair graph templates */
+if ($execute) {
+	echo "NOTE: Repairing Graph Templates\n";
+} else {
+	echo "NOTE: Performing Check of Graph Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT graph_template_id FROM graph_template_input WHERE hash=''");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
+		$template_name = db_fetch_cell("SELECT name FROM graph_templates WHERE id=" . $id["graph_template_id"]);
+		echo "NOTE: Graph Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM graph_template_input WHERE hash=''");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Graph Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_graph_template(0, "graph_template_input");
+				db_execute("UPDATE graph_template_input SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Graph Templates Found\n";
+}
+
+
+/* display_help - displays the usage of the function */
+function display_help () {
+	print "Cacti Database Template Repair Tool v1.0, Copyright 2004-2009 - The Cacti Group\n\n";
+	print "usage: repair_templates.php --execute [--help]\n\n";
+	print "--execute        - Perform the repair\n";
+	print "--help           - display this help message\n";
+}
+?>
diff -ruBbd 0.8.7e/docs/README 0.8.7/docs/README
--- 0.8.7e/docs/README	2009-08-18 21:57:30.000000000 -0400
+++ 0.8.7/docs/README	2009-08-18 21:58:09.000000000 -0400
@@ -90,6 +90,9 @@
                             table
   poller_reindex_hosts.php - Cause data query reindex on hosts
   rebuild_poller_cache.php - Rebuilds the poller cache
+  repair_templates.php     - Certain templates, when created using the "duplicate"
+      function in Cacti, do not import/export well.  This utility repairs 
+      those templates.
 
 
 
diff -ruBbd 0.8.7e/lib/export.php 0.8.7/lib/export.php
--- 0.8.7e/lib/export.php	2009-08-18 21:56:47.000000000 -0400
+++ 0.8.7/lib/export.php	2009-08-18 21:57:50.000000000 -0400
@@ -811,7 +811,9 @@
 }
 
 function xml_character_encode($text) {
-
+	if (function_exists("htmlspecialchars")) {
+		return htmlspecialchars($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$text = str_replace("&", "&amp;", $text);
 	$text = str_replace(">", "&gt;", $text);
 	$text = str_replace("<", "&lt;", $text);
@@ -819,6 +821,7 @@
 	$text = str_replace("\'", "&apos;", $text);
 
 	return $text;
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/import.php 0.8.7/lib/import.php
--- 0.8.7e/lib/import.php	2009-08-18 21:56:59.000000000 -0400
+++ 0.8.7/lib/import.php	2009-08-18 21:57:55.000000000 -0400
@@ -36,10 +36,6 @@
 		return $info_array;
 	}
 
-	if (isset($xml_array["name"])) {
-		$xml_array["name"] = htmlspecialchars($xml_array["name"]);
-	}
-
 	while (list($hash, $hash_array) = each($xml_array)) {
 		/* parse information from the hash */
 		$parsed_hash = parse_xml_hash($hash);
@@ -115,7 +111,7 @@
 	$_graph_template_id = db_fetch_cell("select id from graph_templates where hash='$hash'");
 	$save["id"] = (empty($_graph_template_id) ? "0" : $_graph_template_id);
 	$save["hash"] = $hash;
-	$save["name"] = htmlspecialchars($xml_array["name"]);
+	$save["name"] = $xml_array["name"];
 	$graph_template_id = sql_save($save, "graph_templates");
 
 	$hash_cache["graph_template"][$hash] = $graph_template_id;
@@ -914,9 +910,13 @@
 }
 
 function xml_character_decode($text) {
+	if (function_exists("html_entity_decode")) {
+		return html_entity_decode($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$trans_tbl = get_html_translation_table(HTML_ENTITIES);
 	$trans_tbl = array_flip($trans_tbl);
 	return strtr($text, $trans_tbl);
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/utility.php 0.8.7/lib/utility.php
--- 0.8.7e/lib/utility.php	2009-08-18 21:57:08.000000000 -0400
+++ 0.8.7/lib/utility.php	2009-08-18 21:58:00.000000000 -0400
@@ -346,6 +346,7 @@
 			$save["name"] = $graph_template_input["name"];
 			$save["description"] = $graph_template_input["description"];
 			$save["column_name"] = $graph_template_input["column_name"];
+			$save["hash"]              = get_hash_graph_template(0, "graph_template_input");
 
 			$graph_template_input_id = sql_save($save, "graph_template_input");
 
@@ -436,6 +437,11 @@
 		$save["local_data_id"] = (isset($local_data_id) ? $local_data_id : 0);
 		$save["local_data_template_rrd_id"] = (isset($data_template_rrd["local_data_template_rrd_id"]) ? $data_template_rrd["local_data_template_rrd_id"] : 0);
 		$save["data_template_id"] = (!empty($_local_data_id) ? $data_template_rrd["data_template_id"] : $data_template_id);
+		if ($save["local_data_id"] == 0) {
+			$save["hash"]                   = get_hash_data_template($data_template_rrd["local_data_template_rrd_id"], "data_template_item");
+		} else {
+			$save["hash"] = '';
+		}
 
 		while (list($field, $array) = each($struct_data_source_item)) {
 			$save{$field} = $data_template_rrd{$field};


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/F-10/cacti.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- cacti.spec	17 Aug 2009 02:14:38 -0000	1.26
+++ cacti.spec	1 Dec 2009 15:19:47 -0000	1.27
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7e
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,10 @@ Source0: http://www.cacti.net/downloads/
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Patch0: cli_add_graph.patch
+Patch1: snmp_invalid_response.patch
+Patch2: template_duplication.patch
+Patch3: cross_site_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +34,10 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +113,11 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-3
+- Pulling in some official patches
+- #541279
+- #541962
+
 * Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
 - Upstream released new version
 



From mmcgrath at fedoraproject.org  Tue Dec  1 15:19:48 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 15:19:48 +0000 (UTC)
Subject: rpms/cacti/F-12 cli_add_graph.patch, NONE, 1.1 cross_site_fix.patch,
	NONE, 1.1 snmp_invalid_response.patch, NONE,
	1.1 template_duplication.patch, NONE, 1.1 cacti.spec, 1.29, 1.30
Message-ID: <20091201151948.051B311C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15958/F-12

Modified Files:
	cacti.spec 
Added Files:
	cli_add_graph.patch cross_site_fix.patch 
	snmp_invalid_response.patch template_duplication.patch 
Log Message:
official patches

cli_add_graph.patch:
 add_graphs.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cli_add_graph.patch ---
--- ../tags/0.8.7e/cli/add_graphs.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/cli/add_graphs.php	2009-08-18 20:04:44.000000000 -0400
@@ -570,7 +570,7 @@
 	echo "                    3|Fields = Verify all Fields\n";
 	echo "List Options:\n";
 	echo "    --list-hosts\n";
-	echo "    --list-graph-templates [--host_template=[ID]]\n";
+	echo "    --list-graph-templates [--host-template-id=[ID]]\n";
 	echo "    --list-input-fields --graph-template-id=[ID]\n";
 	echo "    --list-snmp-queries\n";
 	echo "    --list-query-types  --snmp-query-id [ID]\n";

cross_site_fix.patch:
 graph.php                    |    2 +
 include/top_graph_header.php |    6 +--
 lib/html_form.php            |   75 ++++++++++++++++++++++++++++++++++++++++---
 lib/timespan_settings.php    |    8 ++--
 4 files changed, 80 insertions(+), 11 deletions(-)

--- NEW FILE cross_site_fix.patch ---
--- cacti-0.8.7e/graph.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/graph.php	2009-11-21 23:10:16.000000000 -0500
@@ -35,6 +35,8 @@
 /* ================= input validation ================= */
 input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
 input_validate_input_number(get_request_var("local_graph_id"));
+input_validate_input_number(get_request_var("graph_end"));
+input_validate_input_number(get_request_var("graph_start"));
 input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$");
 /* ==================================================== */
 
--- cacti-0.8.7e/include/top_graph_header.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/include/top_graph_header.php	2009-11-21 23:15:27.000000000 -0500
@@ -58,7 +58,7 @@
 		if ($_SESSION["custom"]) {
 			print "<meta http-equiv=refresh content='99999'>\r\n";
 		}else{
-			print "<meta http-equiv=refresh content='" . read_graph_config_option("page_refresh") . "'>\r\n";
+			print "<meta http-equiv=refresh content='" . htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES) . "'>\r\n";
 		}
 	}
 	?>
@@ -113,7 +113,7 @@
 	</tr>
 	<tr class="noprint">
 		<td bgcolor="#efefef" colspan="1" height="8" style="background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-			<img src="images/transparent_line.gif" width="<?php print read_graph_config_option("default_dual_pane_width");?>" height="2" border="0"><br>
+			<img src="images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" height="2" border="0"><br>
 		</td>
 		<td bgcolor="#ffffff" colspan="1" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;">
 
@@ -144,7 +144,7 @@
 
 	<tr>
 		<?php if ((read_graph_config_option("default_tree_view_mode") == "2") && (($_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
-		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print read_graph_config_option("default_dual_pane_width");?>' class='noprint'>
+		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>' class='noprint'>
 			<table border=0 cellpadding=0 cellspacing=0><tr><td><font size=-2><a style="font-size:7pt;text-decoration:none;color:silver" href="http://www.treemenu.net/" target=_blank></a></font></td></tr></table>
 			<?php grow_dhtml_trees(); ?>
 			<script type="text/javascript">initializeDocument();</script>
--- cacti-0.8.7e/lib/html_form.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/html_form.php	2009-11-21 23:15:40.000000000 -0500
@@ -235,13 +235,21 @@
 
 		if (sizeof($items) > 0) {
 		foreach ($items as $item) {
-			print $item["name"] . "<br>";
+			print htmlspecialchars($item["name"],ENT_QUOTES) . "<br>";
 		}
 		}
 
 		break;
+	case 'font':
+		form_font_box($field_name, $field_array["value"],
+			((isset($field_array["default"])) ? $field_array["default"] : ""),
+			$field_array["max_length"],
+			((isset($field_array["size"])) ? $field_array["size"] : "40"), "text",
+			((isset($field_array["form_id"])) ? $field_array["form_id"] : ""));
+
+		break;
 	default:
-		print "<em>" . $field_array["value"] . "</em>";
+		print "<em>" . htmlspecialchars($field_array["value"],ENT_QUOTES) . "</em>";
 
 		form_hidden_box($field_name, $field_array["value"], "");
 
@@ -384,7 +392,7 @@
 		$form_previous_value = $form_default_value;
 	}
 
-	print "<input type='hidden' id='$form_name' name='$form_name' value='$form_previous_value'>\n";
+	print "<input type='hidden' id='$form_name' name='$form_name' value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>\n";
 }
 
 /* form_dropdown - draws a standard html dropdown box
@@ -568,7 +576,7 @@
 			}
 		}
 
-		print ">". $array_display[$id];
+		print ">". htmlspecialchars($array_display[$id],ENT_QUOTES);
 		print "</option>\n";
 	}
 
@@ -627,6 +635,65 @@
 	print "</select>\n";
 }
 
+/* form_font_box - draws a standard html textbox and provides status of a fonts existence
+   @arg $form_name - the name of this form element
+   @arg $form_previous_value - the current value of this form element
+   @arg $form_default_value - the value of this form element to use if there is
+     no current value available
+   @arg $form_max_length - the maximum number of characters that can be entered
+     into this textbox
+   @arg $form_size - the size (width) of the textbox
+   @arg $type - the type of textbox, either 'text' or 'password'
+   @arg $current_id - used to determine if a current value for this form element
+     exists or not. a $current_id of '0' indicates that no current value exists,
+     a non-zero value indicates that a current value does exist */
+function form_font_box($form_name, $form_previous_value, $form_default_value, $form_max_length, $form_size = 30, $type = "text", $current_id = 0) {
+	if (($form_previous_value == "") && (empty($current_id))) {
+		$form_previous_value = $form_default_value;
+	}
+
+	print "<input type='$type'";
+
+	if (isset($_SESSION["sess_error_fields"])) {
+		if (!empty($_SESSION["sess_error_fields"][$form_name])) {
+			print "class='txtErrorTextBox'";
+			unset($_SESSION["sess_error_fields"][$form_name]);
+		}
+	}
+
+	if (isset($_SESSION["sess_field_values"])) {
+		if (!empty($_SESSION["sess_field_values"][$form_name])) {
+			$form_previous_value = $_SESSION["sess_field_values"][$form_name];
+		}
+	}
+
+	if (strlen($form_previous_value) == 0) { # no data: defaults are used; everythings fine
+			$extra_data = "";
+	} else {
+		if (read_config_option("rrdtool_version") == "rrd-1.3.x") {	# rrdtool 1.3 uses fontconfig
+			$font = '"' . $form_previous_value . '"';
+			$out_array = array();
+			exec('fc-list ' . $font, $out_array);
+			if (sizeof($out_array) == 0) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FONT NOT FOUND" . "]</span>";
+			} else {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FONT FOUND" . "]</span>";
+			}
+		} elseif (read_config_option("rrdtool_version") == "rrd-1.0.x" ||
+				  read_config_option("rrdtool_version") == "rrd-1.2.x") { # rrdtool 1.0 and 1.2 use font files
+			if (is_file($form_previous_value)) {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FILE FOUND" . "]</span>";
+			}else if (is_dir($form_previous_value)) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: IS DIR" . "]</span>";
+			}else{
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FILE NOT FOUND" . "]</span>";
+			}
+		} # will be used for future versions of rrdtool
+	}
+
+	print " id='$form_name' name='$form_name' size='$form_size'" . (!empty($form_max_length) ? " maxlength='$form_max_length'" : "") . " value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>" . $extra_data;
+}
+
 /* form_confirm - draws a table presenting the user with some choice and allowing
      them to either proceed (delete) or cancel
    @arg $body_text - the text to prompt the user with on this form
--- cacti-0.8.7e/lib/timespan_settings.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/timespan_settings.php	2009-11-21 23:15:49.000000000 -0500
@@ -125,9 +125,9 @@
 	if (isset($_POST["date1"])) {
 		/* the dates have changed, therefore, I am now custom */
 		if (($_SESSION["sess_current_date1"] != $_POST["date1"]) || ($_SESSION["sess_current_date2"] != $_POST["date2"])) {
-			$timespan["current_value_date1"] = $_POST["date1"];
+			$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
 			$timespan["begin_now"] =strtotime($timespan["current_value_date1"]);
-			$timespan["current_value_date2"] = $_POST["date2"];
+			$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 			$timespan["end_now"]=strtotime($timespan["current_value_date2"]);
 			$_SESSION["sess_current_timespan"] = GT_CUSTOM;
 			$_SESSION["custom"] = 1;
@@ -135,8 +135,8 @@
 		}else {
 			/* the default button wasn't pushed */
 			if (!isset($_POST["button_clear_x"])) {
-				$timespan["current_value_date1"] = $_POST["date1"];
-				$timespan["current_value_date2"] = $_POST["date2"];
+				$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
+				$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 				$timespan["begin_now"] = $_SESSION["sess_current_timespan_begin_now"];
 				$timespan["end_now"] = $_SESSION["sess_current_timespan_end_now"];
 

snmp_invalid_response.patch:
 include/global_arrays.php |    4 ++++
 lib/snmp.php              |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE snmp_invalid_response.patch ---
--- ../tags/0.8.7e/include/global_arrays.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/include/global_arrays.php	2009-08-18 20:04:44.000000000 -0400
@@ -174,6 +174,10 @@
 	"DES" => "DES (default)",
 	"AES128" => "AES");
 
+$banned_snmp_strings = array(
+	"End of MIB",
+	"No Such");
+
 $logfile_options = array(1 =>
 	"Logfile Only",
 	"Logfile and Syslog/Eventlog",
--- ../tags/0.8.7e/lib/snmp.php	2009-06-28 12:34:30.000000000 -0400
+++ 0.8.7/lib/snmp.php	2009-08-18 20:04:44.000000000 -0400
@@ -27,9 +27,6 @@
 define("SNMP_METHOD_PHP", 1);
 define("SNMP_METHOD_BINARY", 2);
 
-/* declare once, use many times */
-$banned_snmp_strings = array("End of MIB", "No Such");
-
 /* we must use an apostrophe to escape community names under Unix in case the user uses
 characters that the shell might interpret. the ucd-snmp binaries on Windows flip out when
 you do this, but are perfectly happy with a quotation mark. */

template_duplication.patch:
 cli/repair_templates.php |  135 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/README              |    3 +
 lib/export.php           |    5 +
 lib/import.php           |   10 +--
 lib/utility.php          |    6 ++
 5 files changed, 153 insertions(+), 6 deletions(-)

--- NEW FILE template_duplication.patch ---
diff -ruBbd 0.8.7e/cli/repair_templates.php 0.8.7/cli/repair_templates.php
--- 0.8.7e/cli/repair_templates.php	2009-08-18 22:03:22.000000000 -0400
+++ 0.8.7/cli/repair_templates.php	2009-08-20 07:43:54.000000000 -0400
@@ -0,0 +1,135 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2009 The Cacti Group                                 |
+ |                                                                         |
+ | 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.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/* do NOT run this script through a web browser */
+if (!isset($_SERVER["argv"][0]) || isset($_SERVER['REQUEST_METHOD'])  || isset($_SERVER['REMOTE_ADDR'])) {
+	die("<br><strong>This script is only meant to run at the command line.</strong>");
+}
+
+$no_http_headers = true;
+
+include(dirname(__FILE__) . "/../include/global.php");
+include_once("../lib/utility.php");
+include_once("../lib/template.php");
+
+/* process calling arguments */
+$parms = $_SERVER["argv"];
+array_shift($parms);
+
+$execute = FALSE;
+
+foreach($parms as $parameter) {
+	@list($arg, $value) = @explode("=", $parameter);
+
+	switch ($arg) {
+	case "--execute":
+		$execute = TRUE;
+		break;
+	case "-h":
+	case "-v":
+	case "-V":
+	case "--version":
+	case "--help":
+		display_help();
+		exit;
+	default:
+		print "ERROR: Invalid Parameter " . $parameter . "\n\n";
+		display_help();
+		exit;
+	}
+}
+
+if ($execute) {
+	echo "NOTE: Repairing All Duplicated Templates\n";
+} else {
+	echo "NOTE: Performing Check of Templates\n";
+}
+
+/* repair data templates first */
+if ($execute) {
+	echo "NOTE: Repairing Data Templates\n";
+} else {
+	echo "NOTE: Performing Check of Data Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT data_template_id FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
		$template_name = db_fetch_cell("SELECT name FROM data_template WHERE id=" . $id["data_template_id"]);
+		echo "NOTE: Data Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Data Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_data_template($template["local_data_template_rrd_id"], "data_template_item");
+				db_execute("UPDATE data_template_rrd SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Data Templates Found\n";
+}
+
+/* reset the array */
+$damaged_templates = array();
+
+/* repair graph templates */
+if ($execute) {
+	echo "NOTE: Repairing Graph Templates\n";
+} else {
+	echo "NOTE: Performing Check of Graph Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT graph_template_id FROM graph_template_input WHERE hash=''");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
+		$template_name = db_fetch_cell("SELECT name FROM graph_templates WHERE id=" . $id["graph_template_id"]);
+		echo "NOTE: Graph Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM graph_template_input WHERE hash=''");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Graph Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_graph_template(0, "graph_template_input");
+				db_execute("UPDATE graph_template_input SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Graph Templates Found\n";
+}
+
+
+/* display_help - displays the usage of the function */
+function display_help () {
+	print "Cacti Database Template Repair Tool v1.0, Copyright 2004-2009 - The Cacti Group\n\n";
+	print "usage: repair_templates.php --execute [--help]\n\n";
+	print "--execute        - Perform the repair\n";
+	print "--help           - display this help message\n";
+}
+?>
diff -ruBbd 0.8.7e/docs/README 0.8.7/docs/README
--- 0.8.7e/docs/README	2009-08-18 21:57:30.000000000 -0400
+++ 0.8.7/docs/README	2009-08-18 21:58:09.000000000 -0400
@@ -90,6 +90,9 @@
                             table
   poller_reindex_hosts.php - Cause data query reindex on hosts
   rebuild_poller_cache.php - Rebuilds the poller cache
+  repair_templates.php     - Certain templates, when created using the "duplicate"
+      function in Cacti, do not import/export well.  This utility repairs 
+      those templates.
 
 
 
diff -ruBbd 0.8.7e/lib/export.php 0.8.7/lib/export.php
--- 0.8.7e/lib/export.php	2009-08-18 21:56:47.000000000 -0400
+++ 0.8.7/lib/export.php	2009-08-18 21:57:50.000000000 -0400
@@ -811,7 +811,9 @@
 }
 
 function xml_character_encode($text) {
-
+	if (function_exists("htmlspecialchars")) {
+		return htmlspecialchars($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$text = str_replace("&", "&amp;", $text);
 	$text = str_replace(">", "&gt;", $text);
 	$text = str_replace("<", "&lt;", $text);
@@ -819,6 +821,7 @@
 	$text = str_replace("\'", "&apos;", $text);
 
 	return $text;
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/import.php 0.8.7/lib/import.php
--- 0.8.7e/lib/import.php	2009-08-18 21:56:59.000000000 -0400
+++ 0.8.7/lib/import.php	2009-08-18 21:57:55.000000000 -0400
@@ -36,10 +36,6 @@
 		return $info_array;
 	}
 
-	if (isset($xml_array["name"])) {
-		$xml_array["name"] = htmlspecialchars($xml_array["name"]);
-	}
-
 	while (list($hash, $hash_array) = each($xml_array)) {
 		/* parse information from the hash */
 		$parsed_hash = parse_xml_hash($hash);
@@ -115,7 +111,7 @@
 	$_graph_template_id = db_fetch_cell("select id from graph_templates where hash='$hash'");
 	$save["id"] = (empty($_graph_template_id) ? "0" : $_graph_template_id);
 	$save["hash"] = $hash;
-	$save["name"] = htmlspecialchars($xml_array["name"]);
+	$save["name"] = $xml_array["name"];
 	$graph_template_id = sql_save($save, "graph_templates");
 
 	$hash_cache["graph_template"][$hash] = $graph_template_id;
@@ -914,9 +910,13 @@
 }
 
 function xml_character_decode($text) {
+	if (function_exists("html_entity_decode")) {
+		return html_entity_decode($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$trans_tbl = get_html_translation_table(HTML_ENTITIES);
 	$trans_tbl = array_flip($trans_tbl);
 	return strtr($text, $trans_tbl);
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/utility.php 0.8.7/lib/utility.php
--- 0.8.7e/lib/utility.php	2009-08-18 21:57:08.000000000 -0400
+++ 0.8.7/lib/utility.php	2009-08-18 21:58:00.000000000 -0400
@@ -346,6 +346,7 @@
 			$save["name"] = $graph_template_input["name"];
 			$save["description"] = $graph_template_input["description"];
 			$save["column_name"] = $graph_template_input["column_name"];
+			$save["hash"]              = get_hash_graph_template(0, "graph_template_input");
 
 			$graph_template_input_id = sql_save($save, "graph_template_input");
 
@@ -436,6 +437,11 @@
 		$save["local_data_id"] = (isset($local_data_id) ? $local_data_id : 0);
 		$save["local_data_template_rrd_id"] = (isset($data_template_rrd["local_data_template_rrd_id"]) ? $data_template_rrd["local_data_template_rrd_id"] : 0);
 		$save["data_template_id"] = (!empty($_local_data_id) ? $data_template_rrd["data_template_id"] : $data_template_id);
+		if ($save["local_data_id"] == 0) {
+			$save["hash"]                   = get_hash_data_template($data_template_rrd["local_data_template_rrd_id"], "data_template_item");
+		} else {
+			$save["hash"] = '';
+		}
 
 		while (list($field, $array) = each($struct_data_source_item)) {
 			$save{$field} = $data_template_rrd{$field};


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/F-12/cacti.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- cacti.spec	17 Aug 2009 02:00:41 -0000	1.29
+++ cacti.spec	1 Dec 2009 15:19:47 -0000	1.30
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7e
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,10 @@ Source0: http://www.cacti.net/downloads/
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Patch0: cli_add_graph.patch
+Patch1: snmp_invalid_response.patch
+Patch2: template_duplication.patch
+Patch3: cross_site_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +34,10 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +113,11 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-3
+- Pulling in some official patches
+- #541279
+- #541962
+
 * Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
 - Upstream released new version
 



From mmcgrath at fedoraproject.org  Tue Dec  1 15:19:47 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue,  1 Dec 2009 15:19:47 +0000 (UTC)
Subject: rpms/cacti/F-11 cli_add_graph.patch, NONE, 1.1 cross_site_fix.patch,
	NONE, 1.1 snmp_invalid_response.patch, NONE,
	1.1 template_duplication.patch, NONE, 1.1 cacti.spec, 1.28, 1.29
Message-ID: <20091201151947.BD18211C00DE@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Added Files:
	cli_add_graph.patch cross_site_fix.patch 
	snmp_invalid_response.patch template_duplication.patch 
Log Message:
official patches

cli_add_graph.patch:
 add_graphs.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cli_add_graph.patch ---
--- ../tags/0.8.7e/cli/add_graphs.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/cli/add_graphs.php	2009-08-18 20:04:44.000000000 -0400
@@ -570,7 +570,7 @@
 	echo "                    3|Fields = Verify all Fields\n";
 	echo "List Options:\n";
 	echo "    --list-hosts\n";
-	echo "    --list-graph-templates [--host_template=[ID]]\n";
+	echo "    --list-graph-templates [--host-template-id=[ID]]\n";
 	echo "    --list-input-fields --graph-template-id=[ID]\n";
 	echo "    --list-snmp-queries\n";
 	echo "    --list-query-types  --snmp-query-id [ID]\n";

cross_site_fix.patch:
 graph.php                    |    2 +
 include/top_graph_header.php |    6 +--
 lib/html_form.php            |   75 ++++++++++++++++++++++++++++++++++++++++---
 lib/timespan_settings.php    |    8 ++--
 4 files changed, 80 insertions(+), 11 deletions(-)

--- NEW FILE cross_site_fix.patch ---
--- cacti-0.8.7e/graph.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/graph.php	2009-11-21 23:10:16.000000000 -0500
@@ -35,6 +35,8 @@
 /* ================= input validation ================= */
 input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
 input_validate_input_number(get_request_var("local_graph_id"));
+input_validate_input_number(get_request_var("graph_end"));
+input_validate_input_number(get_request_var("graph_start"));
 input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$");
 /* ==================================================== */
 
--- cacti-0.8.7e/include/top_graph_header.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/include/top_graph_header.php	2009-11-21 23:15:27.000000000 -0500
@@ -58,7 +58,7 @@
 		if ($_SESSION["custom"]) {
 			print "<meta http-equiv=refresh content='99999'>\r\n";
 		}else{
-			print "<meta http-equiv=refresh content='" . read_graph_config_option("page_refresh") . "'>\r\n";
+			print "<meta http-equiv=refresh content='" . htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES) . "'>\r\n";
 		}
 	}
 	?>
@@ -113,7 +113,7 @@
 	</tr>
 	<tr class="noprint">
 		<td bgcolor="#efefef" colspan="1" height="8" style="background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
-			<img src="images/transparent_line.gif" width="<?php print read_graph_config_option("default_dual_pane_width");?>" height="2" border="0"><br>
+			<img src="images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" height="2" border="0"><br>
 		</td>
 		<td bgcolor="#ffffff" colspan="1" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;">
 
@@ -144,7 +144,7 @@
 
 	<tr>
 		<?php if ((read_graph_config_option("default_tree_view_mode") == "2") && (($_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
-		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print read_graph_config_option("default_dual_pane_width");?>' class='noprint'>
+		<td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>' class='noprint'>
 			<table border=0 cellpadding=0 cellspacing=0><tr><td><font size=-2><a style="font-size:7pt;text-decoration:none;color:silver" href="http://www.treemenu.net/" target=_blank></a></font></td></tr></table>
 			<?php grow_dhtml_trees(); ?>
 			<script type="text/javascript">initializeDocument();</script>
--- cacti-0.8.7e/lib/html_form.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/html_form.php	2009-11-21 23:15:40.000000000 -0500
@@ -235,13 +235,21 @@
 
 		if (sizeof($items) > 0) {
 		foreach ($items as $item) {
-			print $item["name"] . "<br>";
+			print htmlspecialchars($item["name"],ENT_QUOTES) . "<br>";
 		}
 		}
 
 		break;
+	case 'font':
+		form_font_box($field_name, $field_array["value"],
+			((isset($field_array["default"])) ? $field_array["default"] : ""),
+			$field_array["max_length"],
+			((isset($field_array["size"])) ? $field_array["size"] : "40"), "text",
+			((isset($field_array["form_id"])) ? $field_array["form_id"] : ""));
+
+		break;
 	default:
-		print "<em>" . $field_array["value"] . "</em>";
+		print "<em>" . htmlspecialchars($field_array["value"],ENT_QUOTES) . "</em>";
 
 		form_hidden_box($field_name, $field_array["value"], "");
 
@@ -384,7 +392,7 @@
 		$form_previous_value = $form_default_value;
 	}
 
-	print "<input type='hidden' id='$form_name' name='$form_name' value='$form_previous_value'>\n";
+	print "<input type='hidden' id='$form_name' name='$form_name' value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>\n";
 }
 
 /* form_dropdown - draws a standard html dropdown box
@@ -568,7 +576,7 @@
 			}
 		}
 
-		print ">". $array_display[$id];
+		print ">". htmlspecialchars($array_display[$id],ENT_QUOTES);
 		print "</option>\n";
 	}
 
@@ -627,6 +635,65 @@
 	print "</select>\n";
 }
 
+/* form_font_box - draws a standard html textbox and provides status of a fonts existence
+   @arg $form_name - the name of this form element
+   @arg $form_previous_value - the current value of this form element
+   @arg $form_default_value - the value of this form element to use if there is
+     no current value available
+   @arg $form_max_length - the maximum number of characters that can be entered
+     into this textbox
+   @arg $form_size - the size (width) of the textbox
+   @arg $type - the type of textbox, either 'text' or 'password'
+   @arg $current_id - used to determine if a current value for this form element
+     exists or not. a $current_id of '0' indicates that no current value exists,
+     a non-zero value indicates that a current value does exist */
+function form_font_box($form_name, $form_previous_value, $form_default_value, $form_max_length, $form_size = 30, $type = "text", $current_id = 0) {
+	if (($form_previous_value == "") && (empty($current_id))) {
+		$form_previous_value = $form_default_value;
+	}
+
+	print "<input type='$type'";
+
+	if (isset($_SESSION["sess_error_fields"])) {
+		if (!empty($_SESSION["sess_error_fields"][$form_name])) {
+			print "class='txtErrorTextBox'";
+			unset($_SESSION["sess_error_fields"][$form_name]);
+		}
+	}
+
+	if (isset($_SESSION["sess_field_values"])) {
+		if (!empty($_SESSION["sess_field_values"][$form_name])) {
+			$form_previous_value = $_SESSION["sess_field_values"][$form_name];
+		}
+	}
+
+	if (strlen($form_previous_value) == 0) { # no data: defaults are used; everythings fine
+			$extra_data = "";
+	} else {
+		if (read_config_option("rrdtool_version") == "rrd-1.3.x") {	# rrdtool 1.3 uses fontconfig
+			$font = '"' . $form_previous_value . '"';
+			$out_array = array();
+			exec('fc-list ' . $font, $out_array);
+			if (sizeof($out_array) == 0) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FONT NOT FOUND" . "]</span>";
+			} else {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FONT FOUND" . "]</span>";
+			}
+		} elseif (read_config_option("rrdtool_version") == "rrd-1.0.x" ||
+				  read_config_option("rrdtool_version") == "rrd-1.2.x") { # rrdtool 1.0 and 1.2 use font files
+			if (is_file($form_previous_value)) {
+				$extra_data = "<span style='color:green'><br>[" . "OK: FILE FOUND" . "]</span>";
+			}else if (is_dir($form_previous_value)) {
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: IS DIR" . "]</span>";
+			}else{
+				$extra_data = "<span style='color:red'><br>[" . "ERROR: FILE NOT FOUND" . "]</span>";
+			}
+		} # will be used for future versions of rrdtool
+	}
+
+	print " id='$form_name' name='$form_name' size='$form_size'" . (!empty($form_max_length) ? " maxlength='$form_max_length'" : "") . " value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>" . $extra_data;
+}
+
 /* form_confirm - draws a table presenting the user with some choice and allowing
      them to either proceed (delete) or cancel
    @arg $body_text - the text to prompt the user with on this form
--- cacti-0.8.7e/lib/timespan_settings.php	2009-06-28 12:07:11.000000000 -0400
+++ cacti-0.8.7e-patched/lib/timespan_settings.php	2009-11-21 23:15:49.000000000 -0500
@@ -125,9 +125,9 @@
 	if (isset($_POST["date1"])) {
 		/* the dates have changed, therefore, I am now custom */
 		if (($_SESSION["sess_current_date1"] != $_POST["date1"]) || ($_SESSION["sess_current_date2"] != $_POST["date2"])) {
-			$timespan["current_value_date1"] = $_POST["date1"];
+			$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
 			$timespan["begin_now"] =strtotime($timespan["current_value_date1"]);
-			$timespan["current_value_date2"] = $_POST["date2"];
+			$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 			$timespan["end_now"]=strtotime($timespan["current_value_date2"]);
 			$_SESSION["sess_current_timespan"] = GT_CUSTOM;
 			$_SESSION["custom"] = 1;
@@ -135,8 +135,8 @@
 		}else {
 			/* the default button wasn't pushed */
 			if (!isset($_POST["button_clear_x"])) {
-				$timespan["current_value_date1"] = $_POST["date1"];
-				$timespan["current_value_date2"] = $_POST["date2"];
+				$timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
+				$timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
 				$timespan["begin_now"] = $_SESSION["sess_current_timespan_begin_now"];
 				$timespan["end_now"] = $_SESSION["sess_current_timespan_end_now"];
 

snmp_invalid_response.patch:
 include/global_arrays.php |    4 ++++
 lib/snmp.php              |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE snmp_invalid_response.patch ---
--- ../tags/0.8.7e/include/global_arrays.php	2009-06-28 12:34:31.000000000 -0400
+++ 0.8.7/include/global_arrays.php	2009-08-18 20:04:44.000000000 -0400
@@ -174,6 +174,10 @@
 	"DES" => "DES (default)",
 	"AES128" => "AES");
 
+$banned_snmp_strings = array(
+	"End of MIB",
+	"No Such");
+
 $logfile_options = array(1 =>
 	"Logfile Only",
 	"Logfile and Syslog/Eventlog",
--- ../tags/0.8.7e/lib/snmp.php	2009-06-28 12:34:30.000000000 -0400
+++ 0.8.7/lib/snmp.php	2009-08-18 20:04:44.000000000 -0400
@@ -27,9 +27,6 @@
 define("SNMP_METHOD_PHP", 1);
 define("SNMP_METHOD_BINARY", 2);
 
-/* declare once, use many times */
-$banned_snmp_strings = array("End of MIB", "No Such");
-
 /* we must use an apostrophe to escape community names under Unix in case the user uses
 characters that the shell might interpret. the ucd-snmp binaries on Windows flip out when
 you do this, but are perfectly happy with a quotation mark. */

template_duplication.patch:
 cli/repair_templates.php |  135 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/README              |    3 +
 lib/export.php           |    5 +
 lib/import.php           |   10 +--
 lib/utility.php          |    6 ++
 5 files changed, 153 insertions(+), 6 deletions(-)

--- NEW FILE template_duplication.patch ---
diff -ruBbd 0.8.7e/cli/repair_templates.php 0.8.7/cli/repair_templates.php
--- 0.8.7e/cli/repair_templates.php	2009-08-18 22:03:22.000000000 -0400
+++ 0.8.7/cli/repair_templates.php	2009-08-20 07:43:54.000000000 -0400
@@ -0,0 +1,135 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2009 The Cacti Group                                 |
+ |                                                                         |
+ | 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.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/* do NOT run this script through a web browser */
+if (!isset($_SERVER["argv"][0]) || isset($_SERVER['REQUEST_METHOD'])  || isset($_SERVER['REMOTE_ADDR'])) {
+	die("<br><strong>This script is only meant to run at the command line.</strong>");
+}
+
+$no_http_headers = true;
+
+include(dirname(__FILE__) . "/../include/global.php");
+include_once("../lib/utility.php");
+include_once("../lib/template.php");
+
+/* process calling arguments */
+$parms = $_SERVER["argv"];
+array_shift($parms);
+
+$execute = FALSE;
+
+foreach($parms as $parameter) {
+	@list($arg, $value) = @explode("=", $parameter);
+
+	switch ($arg) {
+	case "--execute":
+		$execute = TRUE;
+		break;
+	case "-h":
+	case "-v":
+	case "-V":
+	case "--version":
+	case "--help":
+		display_help();
+		exit;
+	default:
+		print "ERROR: Invalid Parameter " . $parameter . "\n\n";
+		display_help();
+		exit;
+	}
+}
+
+if ($execute) {
+	echo "NOTE: Repairing All Duplicated Templates\n";
+} else {
+	echo "NOTE: Performing Check of Templates\n";
+}
+
+/* repair data templates first */
+if ($execute) {
+	echo "NOTE: Repairing Data Templates\n";
+} else {
+	echo "NOTE: Performing Check of Data Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT data_template_id FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
		$template_name = db_fetch_cell("SELECT name FROM data_template WHERE id=" . $id["data_template_id"]);
+		echo "NOTE: Data Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM data_template_rrd WHERE hash='' AND local_data_id=0");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Data Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_data_template($template["local_data_template_rrd_id"], "data_template_item");
+				db_execute("UPDATE data_template_rrd SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Data Templates Found\n";
+}
+
+/* reset the array */
+$damaged_templates = array();
+
+/* repair graph templates */
+if ($execute) {
+	echo "NOTE: Repairing Graph Templates\n";
+} else {
+	echo "NOTE: Performing Check of Graph Templates\n";
+}
+
+$damaged_template_ids = db_fetch_assoc("SELECT DISTINCT graph_template_id FROM graph_template_input WHERE hash=''");
+if (sizeof($damaged_template_ids)) {
+	foreach($damaged_template_ids as $id) {
+		$template_name = db_fetch_cell("SELECT name FROM graph_templates WHERE id=" . $id["graph_template_id"]);
+		echo "NOTE: Graph Template '$template_name' is Damaged and can be repaired\n";
+	}
+
+	$damaged_templates = db_fetch_assoc("SELECT * FROM graph_template_input WHERE hash=''");
+	if (sizeof($damaged_templates)) {
+		echo "NOTE: -- Damaged Graph Templates Objects Found is '" . sizeof($damaged_templates) . "'\n";
+		if ($execute) {
+			foreach($damaged_templates as $template) {
+				$hash = get_hash_graph_template(0, "graph_template_input");
+				db_execute("UPDATE graph_template_input SET hash='$hash' WHERE id=" . $template["id"]);
+			}
+		}
+	}
+} else {
+	echo "NOTE: No Damaged Graph Templates Found\n";
+}
+
+
+/* display_help - displays the usage of the function */
+function display_help () {
+	print "Cacti Database Template Repair Tool v1.0, Copyright 2004-2009 - The Cacti Group\n\n";
+	print "usage: repair_templates.php --execute [--help]\n\n";
+	print "--execute        - Perform the repair\n";
+	print "--help           - display this help message\n";
+}
+?>
diff -ruBbd 0.8.7e/docs/README 0.8.7/docs/README
--- 0.8.7e/docs/README	2009-08-18 21:57:30.000000000 -0400
+++ 0.8.7/docs/README	2009-08-18 21:58:09.000000000 -0400
@@ -90,6 +90,9 @@
                             table
   poller_reindex_hosts.php - Cause data query reindex on hosts
   rebuild_poller_cache.php - Rebuilds the poller cache
+  repair_templates.php     - Certain templates, when created using the "duplicate"
+      function in Cacti, do not import/export well.  This utility repairs 
+      those templates.
 
 
 
diff -ruBbd 0.8.7e/lib/export.php 0.8.7/lib/export.php
--- 0.8.7e/lib/export.php	2009-08-18 21:56:47.000000000 -0400
+++ 0.8.7/lib/export.php	2009-08-18 21:57:50.000000000 -0400
@@ -811,7 +811,9 @@
 }
 
 function xml_character_encode($text) {
-
+	if (function_exists("htmlspecialchars")) {
+		return htmlspecialchars($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$text = str_replace("&", "&amp;", $text);
 	$text = str_replace(">", "&gt;", $text);
 	$text = str_replace("<", "&lt;", $text);
@@ -819,6 +821,7 @@
 	$text = str_replace("\'", "&apos;", $text);
 
 	return $text;
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/import.php 0.8.7/lib/import.php
--- 0.8.7e/lib/import.php	2009-08-18 21:56:59.000000000 -0400
+++ 0.8.7/lib/import.php	2009-08-18 21:57:55.000000000 -0400
@@ -36,10 +36,6 @@
 		return $info_array;
 	}
 
-	if (isset($xml_array["name"])) {
-		$xml_array["name"] = htmlspecialchars($xml_array["name"]);
-	}
-
 	while (list($hash, $hash_array) = each($xml_array)) {
 		/* parse information from the hash */
 		$parsed_hash = parse_xml_hash($hash);
@@ -115,7 +111,7 @@
 	$_graph_template_id = db_fetch_cell("select id from graph_templates where hash='$hash'");
 	$save["id"] = (empty($_graph_template_id) ? "0" : $_graph_template_id);
 	$save["hash"] = $hash;
-	$save["name"] = htmlspecialchars($xml_array["name"]);
+	$save["name"] = $xml_array["name"];
 	$graph_template_id = sql_save($save, "graph_templates");
 
 	$hash_cache["graph_template"][$hash] = $graph_template_id;
@@ -914,9 +910,13 @@
 }
 
 function xml_character_decode($text) {
+	if (function_exists("html_entity_decode")) {
+		return html_entity_decode($text, ENT_QUOTES, "UTF-8");
+	} else {
 	$trans_tbl = get_html_translation_table(HTML_ENTITIES);
 	$trans_tbl = array_flip($trans_tbl);
 	return strtr($text, $trans_tbl);
+	}
 }
 
 ?>
diff -ruBbd 0.8.7e/lib/utility.php 0.8.7/lib/utility.php
--- 0.8.7e/lib/utility.php	2009-08-18 21:57:08.000000000 -0400
+++ 0.8.7/lib/utility.php	2009-08-18 21:58:00.000000000 -0400
@@ -346,6 +346,7 @@
 			$save["name"] = $graph_template_input["name"];
 			$save["description"] = $graph_template_input["description"];
 			$save["column_name"] = $graph_template_input["column_name"];
+			$save["hash"]              = get_hash_graph_template(0, "graph_template_input");
 
 			$graph_template_input_id = sql_save($save, "graph_template_input");
 
@@ -436,6 +437,11 @@
 		$save["local_data_id"] = (isset($local_data_id) ? $local_data_id : 0);
 		$save["local_data_template_rrd_id"] = (isset($data_template_rrd["local_data_template_rrd_id"]) ? $data_template_rrd["local_data_template_rrd_id"] : 0);
 		$save["data_template_id"] = (!empty($_local_data_id) ? $data_template_rrd["data_template_id"] : $data_template_id);
+		if ($save["local_data_id"] == 0) {
+			$save["hash"]                   = get_hash_data_template($data_template_rrd["local_data_template_rrd_id"], "data_template_item");
+		} else {
+			$save["hash"] = '';
+		}
 
 		while (list($field, $array) = each($struct_data_source_item)) {
 			$save{$field} = $data_template_rrd{$field};


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/F-11/cacti.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- cacti.spec	17 Aug 2009 02:14:38 -0000	1.28
+++ cacti.spec	1 Dec 2009 15:19:47 -0000	1.29
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7e
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,10 @@ Source0: http://www.cacti.net/downloads/
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Patch0: cli_add_graph.patch
+Patch1: snmp_invalid_response.patch
+Patch2: template_duplication.patch
+Patch3: cross_site_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +34,10 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +113,11 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-3
+- Pulling in some official patches
+- #541279
+- #541962
+
 * Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
 - Upstream released new version
 



From than at fedoraproject.org  Tue Dec  1 15:20:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:20:10 +0000 (UTC)
Subject: rpms/kdebindings/F-12 .cvsignore, 1.65, 1.66 kdebindings.spec, 1.250,
	1.251 sources, 1.73, 1.74
Message-ID: <20091201152010.1EE6311C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16126

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	10 Nov 2009 15:02:09 -0000	1.65
+++ .cvsignore	1 Dec 2009 15:20:09 -0000	1.66
@@ -1 +1,2 @@
 kdebindings-4.3.3.tar.bz2
+kdebindings-4.3.4.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/kdebindings.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- kdebindings.spec	16 Nov 2009 21:21:13 -0000	1.250
+++ kdebindings.spec	1 Dec 2009 15:20:09 -0000	1.251
@@ -52,8 +52,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.3
-Release: 4%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -545,6 +545,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-4
 - Requires: sip-api(%%_sip_api_major) >= %%_sip_api
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	10 Nov 2009 15:02:09 -0000	1.73
+++ sources	1 Dec 2009 15:20:09 -0000	1.74
@@ -1 +1 @@
-4bc76f60e2c175d4e413a374c87f0e19  kdebindings-4.3.3.tar.bz2
+a89db14d6db8c7783862d385bfb86e9e  kdebindings-4.3.4.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 15:20:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:20:22 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.159,1.160
Message-ID: <20091201152022.9E8E911C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16172

Modified Files:
	file-roller.spec 
Log Message:
add dbus-glib BR for PK integration


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- file-roller.spec	1 Dec 2009 15:04:07 -0000	1.159
+++ file-roller.spec	1 Dec 2009 15:20:22 -0000	1.160
@@ -30,6 +30,7 @@ BuildRequires: libSM-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: GConf2-devel
+BuildRequires: dbus-glib-devel
 BuildRequires: scrollkeeper
 BuildRequires: intltool
 



From mclasen at fedoraproject.org  Tue Dec  1 15:22:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 15:22:13 +0000 (UTC)
Subject: File glib-2.22.3.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091201152213.58F9410F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for glib2:

25b043b208883194c57219e41a230a29  glib-2.22.3.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 15:23:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:23:47 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkit-1.1.14-nspluginwrapper.patch,1.1,1.2
Message-ID: <20091201152347.BE8E211C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	webkit-1.1.14-nspluginwrapper.patch 
Log Message:
update nspluginwrapper patch

webkit-1.1.14-nspluginwrapper.patch:
 PluginDatabase.cpp |    3 +++
 1 file changed, 3 insertions(+)

Index: webkit-1.1.14-nspluginwrapper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkit-1.1.14-nspluginwrapper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webkit-1.1.14-nspluginwrapper.patch	14 Sep 2009 17:56:11 -0000	1.1
+++ webkit-1.1.14-nspluginwrapper.patch	1 Dec 2009 15:23:47 -0000	1.2
@@ -1,9 +1,9 @@
---- webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp.orig	2009-09-14 17:48:44.000000000 +0100
-+++ webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp	2009-09-14 17:50:28.000000000 +0100
-@@ -355,6 +355,9 @@ Vector<String> PluginDatabase::defaultPl
-     paths.append("/usr/lib/netscape/plugins-libc6");
-     paths.append("/usr/lib64/netscape/plugins");
+--- webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp.old	2009-12-01 15:22:10.000000000 +0000
++++ webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp	2009-12-01 15:22:21.000000000 +0000
+@@ -357,6 +357,9 @@ Vector<String> PluginDatabase::defaultPl
      paths.append("/usr/lib64/mozilla/plugins");
+     paths.append("/usr/lib/nsbrowser/plugins");
+     paths.append("/usr/lib64/nsbrowser/plugins");
 +    /* And for nspluginwrapper */
 +    paths.append("/usr/lib64/mozilla/plugins-wrapped");
 +    paths.append("/usr/lib/mozilla/plugins-wrapped");



From ltinkl at fedoraproject.org  Tue Dec  1 15:23:47 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 15:23:47 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore, 1.42,
	1.43 kdebase-workspace.spec, 1.318, 1.319 sources, 1.50, 1.51
Message-ID: <20091201152347.1102711C00DE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
- KDE 4.4 beta1 (4.3.80)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	24 Nov 2009 16:34:31 -0000	1.42
+++ .cvsignore	1 Dec 2009 15:23:46 -0000	1.43
@@ -1 +1 @@
-kdebase-workspace-4.3.75svn1048496.tar.bz2
+kdebase-workspace-4.3.80.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- kdebase-workspace.spec	28 Nov 2009 01:44:15 -0000	1.318
+++ kdebase-workspace.spec	1 Dec 2009 15:23:46 -0000	1.319
@@ -1,5 +1,3 @@
-%define alphatag svn1048496
-
 %if 0%{?fedora} && 0%{?fedora} < 12
 %define with_polkit_09 1
 %endif
@@ -8,10 +6,10 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.75
-Release: 0.4.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
@@ -622,6 +620,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sat Nov 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.4.svn1048496
 - backport battery plasmoid from current pre-4.3.80 trunk for showremainingtime
 - rebase battery-plasmoid-showremainingtime patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	24 Nov 2009 16:34:32 -0000	1.50
+++ sources	1 Dec 2009 15:23:46 -0000	1.51
@@ -1 +1 @@
-6086e8256f7e57e105eae4439e9c5045  kdebase-workspace-4.3.75svn1048496.tar.bz2
+68177b5c0dd8ab4bebe682393871f82c  kdebase-workspace-4.3.80.tar.bz2



From than at fedoraproject.org  Tue Dec  1 15:28:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:28:20 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs.spec, 1.530,
	1.531 kdelibs-4.3.1-ossl-1.x.patch, 1.1,
	NONE kdelibs-4.3.3-fix-kdefakes-build.patch, 1.1, NONE
Message-ID: <20091201152820.CC8E011C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17934

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.3.1-ossl-1.x.patch 
	kdelibs-4.3.3-fix-kdefakes-build.patch 
Log Message:
drop it. it's included in upstream



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -p -r1.530 -r1.531
--- kdelibs.spec	1 Dec 2009 13:19:33 -0000	1.530
+++ kdelibs.spec	1 Dec 2009 15:28:20 -0000	1.531
@@ -72,12 +72,9 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
-Patch21: kdelibs-4.3.1-ossl-1.x.patch
 # patch to fix keditbookmarks crash (kde#160679)
 Patch22: kdelibs-4.3.0-bookmarks.patch
 Patch24: kdelibs-4.3.1-drkonq.patch
-# fix build of fakes.c due to missing #include <string.h>
-Patch25: kdelibs-4.3.3-fix-kdefakes-build.patch
 # use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
 # workaound for low-mem systems (ppc64)
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
@@ -202,12 +199,10 @@ format for easy browsing.
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
-%patch25 -p1 -b .fix-kdefakes-build
 %ifarch ppc64
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
 %endif


--- kdelibs-4.3.1-ossl-1.x.patch DELETED ---


--- kdelibs-4.3.3-fix-kdefakes-build.patch DELETED ---



From mclasen at fedoraproject.org  Tue Dec  1 15:28:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 15:28:52 +0000 (UTC)
Subject: rpms/glib2/F-12 .cvsignore, 1.118, 1.119 glib2.spec, 1.229,
	1.230 sources, 1.120,
	1.121 0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch, 1.1,
	NONE 0007-Don-t-give-up-too-early-when-collecting-mime-types.patch,
	1.1, NONE fix-runtime-libdir.patch, 1.1,
	NONE glib-2.22.3-metadata-symlink-device.patch, 1.1,
	NONE pyloc.patch, 1.1, NONE
Message-ID: <20091201152852.32D0C11C00DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17449

Modified Files:
	.cvsignore glib2.spec sources 
Removed Files:
	0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch 
	0007-Don-t-give-up-too-early-when-collecting-mime-types.patch 
	fix-runtime-libdir.patch 
	glib-2.22.3-metadata-symlink-device.patch pyloc.patch 
Log Message:
2.22.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- .cvsignore	7 Oct 2009 14:51:00 -0000	1.118
+++ .cvsignore	1 Dec 2009 15:28:51 -0000	1.119
@@ -1 +1 @@
-glib-2.22.2.tar.bz2
+glib-2.22.3.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- glib2.spec	30 Nov 2009 17:29:13 -0000	1.229
+++ glib2.spec	1 Dec 2009 15:28:51 -0000	1.230
@@ -2,8 +2,8 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.22.2
-Release: 3%{?dist}
+Version: 2.22.3
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -21,14 +21,6 @@ BuildRequires: glibc-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 
-# from upstream
-Patch0: 0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch
-Patch1: 0007-Don-t-give-up-too-early-when-collecting-mime-types.patch
-
-# [nautilus] symlink icons aren't appearing on the desktop in the right place
-# https://bugzilla.redhat.com/show_bug.cgi?id=529329
-Patch2: glib-2.22.3-metadata-symlink-device.patch
-
 %description
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -60,9 +52,6 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1 -b .mime-weight
-%patch1 -p1 -b .mime-matches
-%patch2 -p1 -b .metadata-symlink-device
 
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
@@ -133,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.3-1
+- Update to 2.22.2
+- See http://download.gnome.org/sources/glib/2.22/glib-2.22.3.news
+
 * Mon Nov 30 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.22.2-3
 - Fix metadata setting for symlinks (#529329)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- sources	7 Oct 2009 14:51:00 -0000	1.120
+++ sources	1 Dec 2009 15:28:52 -0000	1.121
@@ -1 +1 @@
-846a86c74b74d5b16826aa5508940f9b  glib-2.22.2.tar.bz2
+25b043b208883194c57219e41a230a29  glib-2.22.3.tar.bz2


--- 0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch DELETED ---


--- 0007-Don-t-give-up-too-early-when-collecting-mime-types.patch DELETED ---


--- fix-runtime-libdir.patch DELETED ---


--- glib-2.22.3-metadata-symlink-device.patch DELETED ---


--- pyloc.patch DELETED ---



From notting at fedoraproject.org  Tue Dec  1 15:30:00 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  1 Dec 2009 15:30:00 +0000 (UTC)
Subject: rpms/gnucash/devel gnucash.spec,1.102,1.103
Message-ID: <20091201153000.CA70311C00DE@cvs1.fedora.phx.redhat.com>

Author: notting

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

Modified Files:
	gnucash.spec 
Log Message:
* Tue Dec  1 2009 Bill Nottingham <notting at redhat.com> - 2.2.9-4
- Rebuild against new goffice



Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gnucash.spec	12 Aug 2009 17:09:01 -0000	1.102
+++ gnucash.spec	1 Dec 2009 15:30:00 -0000	1.103
@@ -4,7 +4,7 @@ Name: gnucash
 Summary: Finance management application
 Version: 2.2.9
 URL: http://gnucash.org/
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.lzma
@@ -128,6 +128,9 @@ fi
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Dec  1 2009 Bill Nottingham <notting at redhat.com> - 2.2.9-4
+- Rebuild against new goffice
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.9-3
 - Use lzma compressed upstream tarball.
 



From jussilehtola at fedoraproject.org  Tue Dec  1 15:31:50 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue,  1 Dec 2009 15:31:50 +0000 (UTC)
Subject: rpms/gromacs/devel gromacs.spec,1.15,1.16
Message-ID: <20091201153150.EFCBD11C00DE@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	gromacs.spec 
Log Message:
Add missing obsoletes.


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gromacs.spec	1 Dec 2009 15:11:05 -0000	1.15
+++ gromacs.spec	1 Dec 2009 15:31:50 -0000	1.16
@@ -30,7 +30,7 @@ BuildRequires:	libX11-devel
 
 
 Requires:	gromacs-common = %{version}-%{release}
-
+Obsoletes:	gromacs-libs < %{version}-%{release}
 
 %description
 GROMACS is a versatile and extremely well optimized package to perform
@@ -84,6 +84,7 @@ programs.
 Summary:	GROMACS Open MPI binaries and libraries
 Group:		Applications/Engineering
 Obsoletes:	gromacs-mpi < %{version}-%{release}
+Obsoletes:	gromacs-mpi-libs < %{version}-%{release}
 Requires:	gromacs-common = %{version}-%{release}
 BuildRequires:	openmpi-devel
 Requires:	openmpi
@@ -460,9 +461,9 @@ rm -rf %{buildroot}
 %{_bindir}/GMXRC
 %{_bindir}/GMXRC.bash
 %{_mandir}/man1/*
-%{_datadir}/%{name}
-%exclude %{_datadir}/%{name}/template
-%exclude %{_datadir}/%{name}/tutor
+%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/template/
+%exclude %{_datadir}/%{name}/tutor/
 
 %files devel
 %defattr(-,root,root,-)
@@ -473,7 +474,7 @@ rm -rf %{buildroot}
 %{_libdir}/libgmxana_d.so
 %{_libdir}/libmd.so
 %{_libdir}/libmd_d.so
-%{_datadir}/%{name}/template
+%{_datadir}/%{name}/template/
 %exclude %{_datadir}/%{name}/template/Makefile.mpi.*
 
 %files openmpi
@@ -510,7 +511,7 @@ rm -rf %{buildroot}
 
 %files tutor
 %defattr(-,root,root,-)
-%{_datadir}/%{name}/tutor
+%{_datadir}/%{name}/tutor/
 
 
 %changelog



From pkgdb at fedoraproject.org  Tue Dec  1 15:34:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 15:34:56 +0000
Subject: [pkgdb] nfs-utils had acl change status
Message-ID: <20091201153456.9808410F886@bastion2.fedora.phx.redhat.com>

steved has set the watchbugzilla acl on nfs-utils (Fedora devel) to Approved for jlayton

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



From pkgdb at fedoraproject.org  Tue Dec  1 15:35:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 15:35:00 +0000
Subject: [pkgdb] nfs-utils had acl change status
Message-ID: <20091201153500.B9F8310F892@bastion2.fedora.phx.redhat.com>

steved has set the watchcommits acl on nfs-utils (Fedora devel) to Approved for jlayton

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



From pkgdb at fedoraproject.org  Tue Dec  1 15:35:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 15:35:15 +0000
Subject: [pkgdb] nfs-utils had acl change status
Message-ID: <20091201153515.BE91610F899@bastion2.fedora.phx.redhat.com>

steved has set the commit acl on nfs-utils (Fedora devel) to Approved for jlayton

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



From than at fedoraproject.org  Tue Dec  1 15:35:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:35:38 +0000 (UTC)
Subject: File kdeedu-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201153538.8CD6C10F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeedu:

2dfdf596efcbc8464afce6a439f32878  kdeedu-4.3.4.tar.bz2



From mhlavink at fedoraproject.org  Tue Dec  1 15:36:13 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  1 Dec 2009 15:36:13 +0000 (UTC)
Subject: rpms/ecryptfs-utils/F-12 ecryptfs-utils-81-getext.patch,1.1,NONE
Message-ID: <20091201153613.8F86E11C00DE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19938

Removed Files:
	ecryptfs-utils-81-getext.patch 
Log Message:
remove obsoleted patch



--- ecryptfs-utils-81-getext.patch DELETED ---



From than at fedoraproject.org  Tue Dec  1 15:36:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:36:57 +0000 (UTC)
Subject: rpms/kdeedu/F-12 .cvsignore, 1.72, 1.73 kdeedu.spec, 1.213,
	1.214 sources, 1.73, 1.74
Message-ID: <20091201153657.67C3711C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeedu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20124

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	10 Nov 2009 15:04:54 -0000	1.72
+++ .cvsignore	1 Dec 2009 15:36:56 -0000	1.73
@@ -1 +1,2 @@
 kdeedu-4.3.3.tar.bz2
+kdeedu-4.3.4.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/kdeedu.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- kdeedu.spec	11 Nov 2009 11:17:55 -0000	1.213
+++ kdeedu.spec	1 Dec 2009 15:36:56 -0000	1.214
@@ -7,8 +7,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.3
-Release: 2%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -488,6 +488,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	10 Nov 2009 15:04:54 -0000	1.73
+++ sources	1 Dec 2009 15:36:57 -0000	1.74
@@ -1 +1 @@
-9d9d7a34bccb0880d1cdf181f92da217  kdeedu-4.3.3.tar.bz2
+2dfdf596efcbc8464afce6a439f32878  kdeedu-4.3.4.tar.bz2



From kklic at fedoraproject.org  Tue Dec  1 15:38:27 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Tue,  1 Dec 2009 15:38:27 +0000 (UTC)
Subject: File gzip-1.3.13.tar.gz uploaded to lookaside cache by kklic
Message-ID: <20091201153827.BAF4310F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gzip:

c54a31b93e865f6a4410b2dc64662706  gzip-1.3.13.tar.gz



From kdudka at fedoraproject.org  Tue Dec  1 15:40:26 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 15:40:26 +0000 (UTC)
Subject: rpms/units/devel units-1.87-gcc-warnings-1.patch, NONE,
	1.1 units-1.87-gcc-warnings-2.patch, NONE, 1.1 units.spec, 1.29, 1.30
Message-ID: <20091201154026.4DDEC11C0396@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	units.spec 
Added Files:
	units-1.87-gcc-warnings-1.patch 
	units-1.87-gcc-warnings-2.patch 
Log Message:
- update license to GPLv3+, sanitize specfile
- fix tons of gcc warnings

units-1.87-gcc-warnings-1.patch:
 parse.y |    8 +++++---
 units.c |   49 ++++++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 26 deletions(-)

--- NEW FILE units-1.87-gcc-warnings-1.patch ---
diff --git a/parse.y b/parse.y
index 89a05b1..0bdd8a3 100644
--- a/parse.y
+++ b/parse.y
@@ -29,6 +29,8 @@
 
 #include "units.h"
 
+int yylex();
+void yyerror(char *);
 
 static int err;  /* value used by parser to store return values */
 
@@ -114,7 +116,7 @@ funcunit(struct unittype *theunit, struct function *fun)
     if (err)
       return err;
   } else if (fun->type==ANGLEOUT || fun->type == DIMENSIONLESS) {
-    if (err=unit2num(theunit))
+    if ((err=unit2num(theunit)))
       return err;
     
   } else 
@@ -278,7 +280,7 @@ struct {
                  "per" , DIVIDE, 
                  0, 0 };
 
-yylex(YYSTYPE *lvalp, struct commtype *comm)
+int yylex(YYSTYPE *lvalp, struct commtype *comm)
 {
   int length, count;
   struct unittype *output;
@@ -414,7 +416,7 @@ yylex(YYSTYPE *lvalp, struct commtype *comm)
 }
 
 
-yyerror(char *s){}
+void yyerror(char *s){}
 
 void
 freelist(int startunit)
diff --git a/units.c b/units.c
index f5416b0..2cd6765 100644
--- a/units.c
+++ b/units.c
@@ -29,6 +29,7 @@
 
 #ifdef READLINE
 #  include <readline/readline.h>
+#  include <readline/history.h>
 #  define RVERSTR "with readline"
 #else
 #  define RVERSTR "without readline"
@@ -489,7 +490,7 @@ readunits(char *file, FILE *errfile,
       }	
       if (wronglocale)
 	continue;
-      if (lineptr = strchr(line,COMMENTCHAR))
+      if ((lineptr = strchr(line,COMMENTCHAR)))
          *lineptr = 0;
       unitname = strtok(line, WHITE);
       if (!unitname || !*unitname) 
@@ -519,9 +520,9 @@ readunits(char *file, FILE *errfile,
   	     goterr=1;
 	     continue;
 	 }
-	 if (pfxptr = plookup(unitname)) {  /* already there: redefinition */
+	 if ((pfxptr = plookup(unitname))) {  /* already there: redefinition */
  	    goterr=1;
-            if (errfile)
+            if (errfile) {
 	      if (!strcmp(pfxptr->name, unitname))
 		fprintf(errfile,
    	        "%s: redefinition of prefix '%s-' on line %d of '%s' ignored.\n",
@@ -529,6 +530,7 @@ readunits(char *file, FILE *errfile,
 	      else
 	         fprintf(errfile, "%s: prefix '%s-' on line %d of '%s' is hidden by earlier definition of '%s-'.\n",
 		       progname, unitname, linenum, file, pfxptr->name);
+            }
 	    continue;
 	 } 
 
@@ -948,7 +950,7 @@ lookupunit(char *unit,int prefixok)
    struct prefixlist *pfxptr;
    struct unitlist *uptr;
 
-   if (uptr = ulookup(unit))
+   if ((uptr = ulookup(unit)))
       return uptr->value;
 
    if (strlen(unit)>2 && unit[strlen(unit) - 1] == 's') {
@@ -1278,7 +1280,7 @@ completereduce(struct unittype *unit)
 {
    int err;
 
-   if (err=reduceunit(unit))
+   if ((err=reduceunit(unit)))
      return err;
    sortunit(unit);
    cancelunit(unit);
@@ -1340,7 +1342,7 @@ unit2num(struct unittype *input)
   int err;
 
   initializeunit(&one);
-  if (err=completereduce(input))
+  if ((err=completereduce(input)))
     return err;
   if (compareunits(input,&one,ignore_nothing))
     return E_NOTANUMBER;
@@ -1404,13 +1406,13 @@ rootunit(struct unittype *inunit,int n)
    int err; 
 
    initializeunit(&outunit);
-   if (err=completereduce(inunit))
+   if ((err=completereduce(inunit)))
      return err;
-   if ((n & 1==0) && (inunit->factor<0)) return E_NOTROOT;
+   if (((n & 1)==0) && (inunit->factor<0)) return E_NOTROOT;
    outunit.factor = pow(inunit->factor,1.0/(double)n);
-   if (err = subunitroot(n, inunit->numerator, outunit.numerator))
+   if ((err = subunitroot(n, inunit->numerator, outunit.numerator)))
      return err;
-   if (err = subunitroot(n, inunit->denominator, outunit.denominator))
+   if ((err = subunitroot(n, inunit->denominator, outunit.denominator)))
      return err;
    freeunit(inunit);
    initializeunit(inunit);
@@ -1482,9 +1484,9 @@ addunit(struct unittype *unita, struct unittype *unitb)
 {
   int err;
 
-  if (err=completereduce(unita))
+  if ((err=completereduce(unita)))
     return err;
-  if (err=completereduce(unitb))
+  if ((err=completereduce(unitb)))
     return err;
   if (compareunits(unita,unitb,ignore_nothing))
     return E_BADSUM;
@@ -1723,7 +1725,7 @@ showanswer(char *havestr,struct unittype *have,
 {
    struct unittype invhave;
    int doingrec;  /* reciprocal conversion? */
-   char *sep, *right, *left;
+   char *sep = NULL, *right = NULL, *left = NULL;
 
    doingrec=0;
    havestr = removepadding(havestr);
@@ -1970,7 +1972,8 @@ addtolist(struct unittype *have, char *searchstring, char *rname, char *name, ch
 	       int *count, int searchtype)
 {
   struct unittype want;
-  int len,keepit;
+  int len = 0;
+  int keepit = 0;
 
   if (!name) 
     return;
@@ -2243,7 +2246,7 @@ completeunits(char *text, int state)
       curunit = utab[uhash];
     }
     if (!curunit && !curprefix){
-      if (curprefix = plookup(text)){
+      if ((curprefix = plookup(text))){
         if (strlen(curprefix->name)>1 && strlen(curprefix->name)<strlen(text)){
           uhash = 0;
           curunit = utab[uhash];
@@ -2481,7 +2484,7 @@ processunit(struct unittype *theunit, char *unitstr, char *prompt, int pointer)
   char *errmsg;
   int errloc,err;
 
-  if (err=parseunit(theunit, unitstr, &errmsg, &errloc)){
+  if ((err=parseunit(theunit, unitstr, &errmsg, &errloc))){
     if (pointer){
       if (err!=E_UNKNOWNUNIT || !irreducible){
 	if (!quiet) {
@@ -2501,7 +2504,7 @@ processunit(struct unittype *theunit, char *unitstr, char *prompt, int pointer)
 
     return 1;
   }
-  if (err=completereduce(theunit)){
+  if ((err=completereduce(theunit))){
     printf("%s",errormsg[err]);
     if (err==E_UNKNOWNUNIT)
       printf(" '%s'", irreducible);
@@ -2584,11 +2587,11 @@ Typing 'search text' will show units whose names contain 'text'.\n\n",
              UNITMATCH);
       return 1;
     }
-    if (function = isfunction(str)){
+    if ((function = isfunction(str))){
       file = function->file;
       unitline = function->linenumber;
     }
-    else if (unit = ulookup(str)){
+    else if ((unit = ulookup(str))){
       unitline = unit->linenumber;
       file = unit->file;
     }
@@ -2678,7 +2681,7 @@ main(int argc, char **argv)
    }
 
    if (!interactive) {
-      if (funcval = isfunction(havestr)){
+      if ((funcval = isfunction(havestr))){
 	showfuncdefinition(funcval);
   	exit(0);
       }
@@ -2688,7 +2691,7 @@ main(int argc, char **argv)
          showdefinition(havestr,&have);
          exit(0);
       }
-      if (funcval = isfunction(wantstr)){
+      if ((funcval = isfunction(wantstr))){
          if (showfunc(havestr, &have, funcval))
 	   exit(1);
 	 else
@@ -2710,7 +2713,7 @@ main(int argc, char **argv)
 	 } while (isblankstr(havestr) || ishelpquery(havestr,0) ||
 		  (isfunction(havestr)==0 
 		  && processunit(&have, havestr, queryhave, POINT)));
-         if (funcval = isfunction(havestr)){
+         if ((funcval = isfunction(havestr))){
 	   showfuncdefinition(funcval);
 	   continue;
 	 }
@@ -2728,7 +2731,7 @@ main(int argc, char **argv)
 		  && processunit(&want, wantstr, querywant, POINT));
          if (isblankstr(wantstr))
            showdefinition(havestr,&have);
-         else if (funcval = isfunction(wantstr))
+         else if ((funcval = isfunction(wantstr)))
            showfunc(havestr, &have, funcval);
 	 else {
            showanswer(havestr,&have,wantstr, &want);

units-1.87-gcc-warnings-2.patch:
 parse.y |   48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE units-1.87-gcc-warnings-2.patch ---
diff --git a/parse.y b/parse.y
index 0bdd8a3..3d2c8c2 100644
--- a/parse.y
+++ b/parse.y
@@ -247,38 +247,38 @@ double strtod();
 
 
 struct function 
-  realfunctions[] = { "sin", sin,    ANGLEIN,
-                      "cos", cos,    ANGLEIN,
-                      "tan", tan,    ANGLEIN,
-                      "ln", log,     DIMENSIONLESS,
-                      "log", log10,  DIMENSIONLESS,
-                      "log2", logb2, DIMENSIONLESS,
-                      "exp", exp,    DIMENSIONLESS,
-                      "acos", acos,  ANGLEOUT,
-                      "atan", atan,  ANGLEOUT,
-                      "asin", asin,  ANGLEOUT,
-                      0, 0, 0};
+  realfunctions[] = { {"sin", sin,    ANGLEIN},
+                      {"cos", cos,    ANGLEIN},
+                      {"tan", tan,    ANGLEIN},
+                      {"ln", log,     DIMENSIONLESS},
+                      {"log", log10,  DIMENSIONLESS},
+                      {"log2", logb2, DIMENSIONLESS},
+                      {"exp", exp,    DIMENSIONLESS},
+                      {"acos", acos,  ANGLEOUT},
+                      {"atan", atan,  ANGLEOUT},
+                      {"asin", asin,  ANGLEOUT},
+                      {0, 0, 0}};
 
 struct {
   char op;
   int value;
-} optable[] = { '*', MULTIPLY,
-            	'/', DIVIDE, 
-            	'|', NUMDIV, 
-            	'+', ADD, 
-            	'(', '(', 
-            	')', ')', 
-            	'^', EXPONENT, 
-                '~', FUNCINV,
-            	0, 0 };
+} optable[] = { {'*', MULTIPLY},
+                {'/', DIVIDE},
+                {'|', NUMDIV},
+                {'+', ADD},
+                {'(', '('},
+                {')', ')'},
+                {'^', EXPONENT},
+                {'~', FUNCINV},
+                {0, 0}};
 
 struct {
   char *name;
   int value;
-} strtable[] = { "sqrt", SQRT, 
-                 "cuberoot", CUBEROOT, 
-                 "per" , DIVIDE, 
-                 0, 0 };
+} strtable[] = { {"sqrt", SQRT},
+                 {"cuberoot", CUBEROOT},
+                 {"per" , DIVIDE},
+                 {0, 0}};
 
 int yylex(YYSTYPE *lvalp, struct commtype *comm)
 {


Index: units.spec
===================================================================
RCS file: /cvs/extras/rpms/units/devel/units.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- units.spec	20 Aug 2009 07:41:11 -0000	1.29
+++ units.spec	1 Dec 2009 15:40:25 -0000	1.30
@@ -1,15 +1,18 @@
 Summary: A utility for converting amounts from one unit to another
 Name: units
 Version: 1.87
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
+Patch1: units-1.87-gcc-warnings-1.patch
+Patch2: units-1.87-gcc-warnings-2.patch
 URL: http://www.gnu.org/software/units/units.html
-License: GPLv2+
+License: GPLv3+
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-BuildRequires: readline-devel ncurses-devel
+BuildRequires: ncurses-devel
+BuildRequires: readline-devel
 
 %description
 Units converts an amount from one unit to another, or tells you what
@@ -19,10 +22,12 @@ well as conversions such as Fahrenheit t
 
 %prep
 %setup -q 
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,7 +50,7 @@ if [ $1 = 0 -a -e %{_infodir}/units.info
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/units.dat
@@ -53,6 +58,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> - 1.87-6
+- update license to GPLv3+, sanitize specfile
+- fix tons of gcc warnings
+
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> - 1.87-5
 - Don't complain if installing with --excludedocs (#515941)
 



From hadess at fedoraproject.org  Tue Dec  1 15:41:21 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:41:21 +0000 (UTC)
Subject: rpms/evince/devel evince.spec,1.172,1.173
Message-ID: <20091201154121.C6BF711C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	evince.spec 
Log Message:
Add mising files to the list


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- evince.spec	1 Dec 2009 15:17:17 -0000	1.172
+++ evince.spec	1 Dec 2009 15:41:21 -0000	1.173
@@ -217,6 +217,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/icons/hicolor/*/apps/evince.*
 %{_mandir}/man1/evince.1.gz
+%{_libexecdir}/evince-convert-metadata
+%{_libexecdir}/evinced
+%{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service
 
 %files libs
 %defattr(-,root,root,-)



From than at fedoraproject.org  Tue Dec  1 15:42:44 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:42:44 +0000 (UTC)
Subject: File kdegames-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201154244.7100A10F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdegames:

6273502fdfb0c0ad604a1b96d79ef34b  kdegames-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 15:43:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:43:24 +0000 (UTC)
Subject: rpms/kdegames/F-12 .cvsignore, 1.74, 1.75 kdegames.spec, 1.150,
	1.151 sources, 1.77, 1.78
Message-ID: <20091201154324.592C711C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22384

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-12/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	10 Nov 2009 15:06:19 -0000	1.74
+++ .cvsignore	1 Dec 2009 15:43:24 -0000	1.75
@@ -1 +1,2 @@
 kdegames-4.3.3.tar.bz2
+kdegames-4.3.4.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-12/kdegames.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- kdegames.spec	11 Nov 2009 11:38:13 -0000	1.150
+++ kdegames.spec	1 Dec 2009 15:43:24 -0000	1.151
@@ -2,8 +2,8 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.3
-Release: 2%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -230,6 +230,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rebase kdegames-4.3.3-trademarks.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-12/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	10 Nov 2009 15:06:19 -0000	1.77
+++ sources	1 Dec 2009 15:43:24 -0000	1.78
@@ -1 +1 @@
-2e35ec4b2b26b7e7e32712a35cef8912  kdegames-4.3.3.tar.bz2
+6273502fdfb0c0ad604a1b96d79ef34b  kdegames-4.3.4.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 15:43:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 15:43:54 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.160,1.161
Message-ID: <20091201154354.D66A311C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22494

Modified Files:
	file-roller.spec 
Log Message:
fix dbus-glib linkage


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- file-roller.spec	1 Dec 2009 15:20:22 -0000	1.160
+++ file-roller.spec	1 Dec 2009 15:43:54 -0000	1.161
@@ -56,6 +56,8 @@ such as tar or zip files.
 %build
 %configure --disable-scrollkeeper --disable-static
 export tagname=CC
+# https://bugzilla.gnome.org/show_bug.cgi?id=603492
+sed -i -e 's/DBUS_LIBS = /DBUS_LIBS = -ldbus-glib-1/' src/Makefile
 make LIBTOOL=/usr/bin/libtool
 
 %install



From than at fedoraproject.org  Tue Dec  1 15:47:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:47:40 +0000 (UTC)
Subject: File kdegraphics-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201154740.64CE610F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdegraphics:

a8c0569f7f11f22a5038ede85b5db77a  kdegraphics-4.3.4.tar.bz2



From ltinkl at fedoraproject.org  Tue Dec  1 15:47:50 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 15:47:50 +0000 (UTC)
Subject: File kdebindings-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091201154750.62B6F10F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebindings:

dc060b2d2c88cf5860dc60d563396f17  kdebindings-4.3.80.tar.bz2



From kklic at fedoraproject.org  Tue Dec  1 15:50:18 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Tue,  1 Dec 2009 15:50:18 +0000 (UTC)
Subject: rpms/gzip/devel gzip-1.3.13-cve-2006-4337.patch, NONE,
	1.1 gzip-1.3.13-rsync.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 gzip.spec, 1.50, 1.51 sources, 1.9,
	1.10 gzip-1.3.12-futimens.patch, 1.1,
	NONE gzip-1.3.9-cve-2006-4337.patch, 1.1,
	NONE gzip-1.3.9-rsync.patch, 1.2, NONE
Message-ID: <20091201155018.0B89C11C00DE@cvs1.fedora.phx.redhat.com>

Author: kklic

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

Modified Files:
	.cvsignore gzip.spec sources 
Added Files:
	gzip-1.3.13-cve-2006-4337.patch gzip-1.3.13-rsync.patch 
Removed Files:
	gzip-1.3.12-futimens.patch gzip-1.3.9-cve-2006-4337.patch 
	gzip-1.3.9-rsync.patch 
Log Message:
New upstream version

gzip-1.3.13-cve-2006-4337.patch:
 gzip.h   |    2 ++
 unlzh.c  |   24 ++++++++++++------------
 unpack.c |    3 ---
 3 files changed, 14 insertions(+), 15 deletions(-)

--- NEW FILE gzip-1.3.13-cve-2006-4337.patch ---
--- gzip-1.3.9/unlzh.c.4337	2007-01-15 16:31:53.000000000 +0100
+++ gzip-1.3.9/unlzh.c	2007-01-15 16:38:08.000000000 +0100
@@ -154,8 +154,8 @@
     start[1] = 0;
     for (i = 1; i <= 16; i++)
 	start[i + 1] = start[i] + (count[i] << (16 - i));
-    if ((start[17] & 0xffff) != 0)
-      gzip_error ("Bad table\n");
+    if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
+      gzip_error ("Bad table (case b)\n"); 
 
     jutbits = 16 - tablebits;
     for (i = 1; i <= (unsigned)tablebits; i++) {
@@ -169,15 +169,15 @@
 
     i = start[tablebits + 1] >> jutbits;
     if (i != 0) {
-	k = 1 << tablebits;
-	while (i != k) table[i++] = 0;
+        k = MIN(1 << tablebits, DIST_BUFSIZE);
+        while (i < k) table[i++] = 0;
     }
 
     avail = nchar;
     mask = (unsigned) 1 << (15 - tablebits);
     for (ch = 0; ch < (unsigned)nchar; ch++) {
 	if ((len = bitlen[ch]) == 0) continue;
-	nextcode = start[len] + weight[len];
+	nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE);
 	if (len <= (unsigned)tablebits) {
 	    if ((unsigned) 1 << tablebits < nextcode)
 	      gzip_error ("Bad table\n");
@@ -220,7 +220,7 @@
 	for (i = 0; i < 256; i++) pt_table[i] = c;
     } else {
 	i = 0;
-	while (i < n) {
+	while (i < MIN(n,NPT)) {
 	    c = bitbuf >> (BITBUFSIZ - 3);
 	    if (c == 7) {
 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
@@ -232,7 +232,7 @@
 	    pt_len[i++] = c;
 	    if (i == i_special) {
 		c = getbits(2);
-		while (--c >= 0) pt_len[i++] = 0;
+		while (--c >= 0 && i < NPT) pt_len[i++] = 0; 
 	    }
 	}
 	while (i < nn) pt_len[i++] = 0;
@@ -252,7 +252,7 @@
 	for (i = 0; i < 4096; i++) c_table[i] = c;
     } else {
 	i = 0;
-	while (i < n) {
+	while (i < MIN(n,NC)) { 
 	    c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
 	    if (c >= NT) {
 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
@@ -267,7 +267,7 @@
 		if      (c == 0) c = 1;
 		else if (c == 1) c = getbits(4) + 3;
 		else             c = getbits(CBIT) + 20;
-		while (--c >= 0) c_len[i++] = 0;
+		while (--c >= 0 && i < NC) c_len[i++] = 0; 
 	    } else c_len[i++] = c - 2;
 	}
 	while (i < NC) c_len[i++] = 0;
@@ -360,7 +360,7 @@
     while (--j >= 0) {
 	buffer[r] = buffer[i];
 	i = (i + 1) & (DICSIZ - 1);
-	if (++r == count) return r;
+	if (++r >= count) return r;
     }
     for ( ; ; ) {
 	c = decode_c();
@@ -370,14 +370,14 @@
 	}
 	if (c <= UCHAR_MAX) {
 	    buffer[r] = c;
-	    if (++r == count) return r;
+	    if (++r >= count) return r;
 	} else {
 	    j = c - (UCHAR_MAX + 1 - THRESHOLD);
 	    i = (r - decode_p() - 1) & (DICSIZ - 1);
 	    while (--j >= 0) {
 		buffer[r] = buffer[i];
 		i = (i + 1) & (DICSIZ - 1);
-		if (++r == count) return r;
+		if (++r >= count) return r;
 	    }
 	}
     }
--- gzip-1.3.9/gzip.h.4337	2007-01-15 16:31:53.000000000 +0100
+++ gzip-1.3.9/gzip.h	2007-01-15 16:38:52.000000000 +0100
@@ -224,6 +224,8 @@
 #define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
 #define try_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
 
+#define MIN(a,b) ((a) <= (b) ? (a) : (b)) 
+
 /* put_byte is used for the compressed output, put_ubyte for the
  * uncompressed output. However unlzw() uses window for its
  * suffix table instead of its output buffer, so it does not use put_ubyte
--- gzip-1.3.9/unpack.c.4337	2007-01-15 16:31:53.000000000 +0100
+++ gzip-1.3.9/unpack.c	2007-01-15 16:39:12.000000000 +0100
@@ -26,9 +26,6 @@
 #include "gzip.h"
 #include "crypt.h"
 
-#define MIN(a,b) ((a) <= (b) ? (a) : (b))
-/* The arguments must not have side effects. */
-
 #define MAX_BITLEN 25
 /* Maximum length of Huffman codes. (Minor modifications to the code
  * would be needed to support 32 bits codes, but pack never generates

gzip-1.3.13-rsync.patch:
 deflate.c     |   82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 doc/gzip.texi |    8 +++++
 gzip.c        |    6 ++++
 gzip.h        |    3 +-
 trees.c       |    7 ++++
 5 files changed, 99 insertions(+), 7 deletions(-)

--- NEW FILE gzip-1.3.13-rsync.patch ---
diff -up gzip-1.3.13/deflate.c.rsync gzip-1.3.13/deflate.c
--- gzip-1.3.13/deflate.c.rsync	2009-09-26 20:43:28.000000000 +0200
+++ gzip-1.3.13/deflate.c	2009-12-01 16:14:24.656387546 +0100
@@ -131,6 +131,14 @@
 #endif
 /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
 
+#ifndef RSYNC_WIN
+#  define RSYNC_WIN 4096
+#endif
+/* Size of rsync window, must be < MAX_DIST */
+
+#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
+/* Whether window sum matches magic value */
+
 /* ===========================================================================
  * Local data used by the "longest match" routines.
  */
@@ -212,6 +220,8 @@ local int compr_level;
 unsigned near good_match;
 /* Use a faster search when the previous match is longer than this */
 
+local ulg rsync_sum;  /* rolling sum of rsync window */
+local ulg rsync_chunk_end; /* next rsync sequence point */
 
 /* Values for max_lazy_match, good_match and max_chain_length, depending on
  * the desired pack level (0..9). The values given below have been tuned to
@@ -310,6 +320,10 @@ void lm_init (pack_level, flags)
 #endif
     /* prev will be initialized on the fly */
 
+    /* rsync params */
+    rsync_chunk_end = 0xFFFFFFFFUL;
+    rsync_sum = 0;
+
     /* Set the default configuration parameters:
      */
     max_lazy_match   = configuration_table[pack_level].max_lazy;
@@ -546,6 +560,8 @@ local void fill_window()
         memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
         match_start -= WSIZE;
         strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
+        if (rsync_chunk_end != 0xFFFFFFFFUL)
+            rsync_chunk_end -= WSIZE;
 
         block_start -= (long) WSIZE;
 
@@ -573,13 +589,46 @@ local void fill_window()
     }
 }
 
+local void rsync_roll(start, num)
+    unsigned start;
+    unsigned num;
+{
+    unsigned i;
+
+    if (start < RSYNC_WIN) {
+       /* before window fills. */
+       for (i = start; i < RSYNC_WIN; i++) {
+           if (i == start + num) return;
+           rsync_sum += (ulg)window[i];
+       }
+       num -= (RSYNC_WIN - start);
+       start = RSYNC_WIN;
+    }
+
+    /* buffer after window full */
+    for (i = start; i < start+num; i++) {
+       /* New character in */
+       rsync_sum += (ulg)window[i];
+       /* Old character out */
+       rsync_sum -= (ulg)window[i - RSYNC_WIN];
+       if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
+           rsync_chunk_end = i;
+    }
+}
+
+/* ===========================================================================
+ * Set rsync_chunk_end if window sum matches magic value.
+ */
+#define RSYNC_ROLL(s, n) \
+   do { if (rsync) rsync_roll((s), (n)); } while(0)
+
 /* ===========================================================================
  * Flush the current block, with given end-of-file flag.
  * IN assertion: strstart is set to the end of the current match.
  */
 #define FLUSH_BLOCK(eof) \
    flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
-                (char*)NULL, (long)strstart - block_start, (eof))
+                (char*)NULL, (long)strstart - block_start, flush-1, (eof)) 
 
 /* ===========================================================================
  * Processes a new input file and return its compressed length. This
@@ -590,7 +639,7 @@ local void fill_window()
 local off_t deflate_fast()
 {
     IPos hash_head; /* head of the hash chain */
-    int flush;      /* set if current block must be flushed */
+    int flush;      /* set if current block must be flushed, 2=>and padded  */ 
     unsigned match_length = 0;  /* length of best match */
 
     prev_length = MIN_MATCH-1;
@@ -620,6 +669,7 @@ local off_t deflate_fast()
 
             lookahead -= match_length;
 
+	    RSYNC_ROLL(strstart, match_length); 
 	    /* Insert new strings in the hash table only if the match length
              * is not too large. This saves time but degrades compression.
              */
@@ -648,9 +698,14 @@ local off_t deflate_fast()
             /* No match, output a literal byte */
             Tracevv((stderr,"%c",window[strstart]));
             flush = ct_tally (0, window[strstart]);
+            RSYNC_ROLL(strstart, 1);
             lookahead--;
 	    strstart++;
         }
+	if (rsync && strstart > rsync_chunk_end) {                                                        
+            rsync_chunk_end = 0xFFFFFFFFUL;                                                               
+            flush = 2;                                                                                    
+        }  
         if (flush) FLUSH_BLOCK(0), block_start = strstart;
 
         /* Make sure that we always have enough lookahead, except
@@ -724,6 +779,7 @@ off_t deflate()
              */
             lookahead -= prev_length-1;
             prev_length -= 2;
+            RSYNC_ROLL(strstart, prev_length+1);
             do {
                 strstart++;
                 INSERT_STRING(strstart, hash_head);
@@ -736,24 +792,40 @@ off_t deflate()
             match_available = 0;
             match_length = MIN_MATCH-1;
             strstart++;
-            if (flush) FLUSH_BLOCK(0), block_start = strstart;
 
+            if (rsync && strstart > rsync_chunk_end) {
+                rsync_chunk_end = 0xFFFFFFFFUL;
+                flush = 2;
+            }
+            if (flush) FLUSH_BLOCK(0), block_start = strstart;
         } else if (match_available) {
             /* If there was no match at the previous position, output a
              * single literal. If there was a match but the current match
              * is longer, truncate the previous match to a single literal.
              */
             Tracevv((stderr,"%c",window[strstart-1]));
-            if (ct_tally (0, window[strstart-1])) {
-                FLUSH_BLOCK(0), block_start = strstart;
+            flush = ct_tally (0, window[strstart-1]);
+            if (rsync && strstart > rsync_chunk_end) {
+                rsync_chunk_end = 0xFFFFFFFFUL;
+                flush = 2;
             }
+            if (flush) FLUSH_BLOCK(0), block_start = strstart;
+            RSYNC_ROLL(strstart, 1);
             strstart++;
             lookahead--;
         } else {
             /* There is no previous match to compare with, wait for
              * the next step to decide.
              */
+            if (rsync && strstart > rsync_chunk_end) {
+                /* Reset huffman tree */
+                rsync_chunk_end = 0xFFFFFFFFUL;
+                flush = 2;
+                FLUSH_BLOCK(0), block_start = strstart;
+            }             
+             
             match_available = 1;
+            RSYNC_ROLL(strstart, 1);  
             strstart++;
             lookahead--;
         }
diff -up gzip-1.3.13/doc/gzip.texi.rsync gzip-1.3.13/doc/gzip.texi
--- gzip-1.3.13/doc/gzip.texi.rsync	2009-09-28 11:08:16.000000000 +0200
+++ gzip-1.3.13/doc/gzip.texi	2009-12-01 16:14:24.664394713 +0100
@@ -353,6 +353,14 @@ specified on the command line are direct
 into the directory and compress all the files it finds there (or
 decompress them in the case of @command{gunzip}).
 
+ at item --rsyncable
+While compressing, synchronize the output occasionally based on the
+input.  This reduces compression by about 1 percent most cases, but
+means that the @code{rsync} program can take advantage of similarities
+in the uncompressed input when syncronizing two files compressed with
+this flag.  @code{gunzip} cannot tell the difference between a
+compressed file created with this option, and one created without it.
+
 @item --suffix @var{suf}
 @itemx -S @var{suf}
 Use suffix @var{suf} instead of @samp{.gz}.  Any suffix can be
diff -up gzip-1.3.13/gzip.c.rsync gzip-1.3.13/gzip.c
--- gzip-1.3.13/gzip.c.rsync	2009-09-26 20:56:02.000000000 +0200
+++ gzip-1.3.13/gzip.c	2009-12-01 16:18:17.121387126 +0100
@@ -229,6 +229,7 @@ int  ofd;                  /* output fil
 unsigned insize;           /* valid bytes in inbuf */
 unsigned inptr;            /* index of next byte to be processed in inbuf */
 unsigned outcnt;           /* bytes in output buffer */
+int rsync = 0;             /* make ryncable chunks */
 
 static int handled_sig[] =
   {
@@ -282,6 +283,7 @@ struct option longopts[] =
     {"best",       0, 0, '9'}, /* compress better */
     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
+    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */      
     { 0, 0, 0, 0 }
 };
 
@@ -363,6 +365,7 @@ local void help()
  "  -Z, --lzw         produce output compatible with old compress",
  "  -b, --bits=BITS   max number of bits per code (implies -Z)",
 #endif
+ "    --rsyncable   Make rsync-friendly archive",  
  "",
  "With no FILE, or when FILE is -, read standard input.",
  "",
@@ -493,6 +496,9 @@ int main (argc, argv)
 	    recursive = 1;
 #endif
 	    break;
+
+        case 'R':
+	    rsync = 1; break;
 	case 'S':
 #ifdef NO_MULTIPLE_DOTS
             if (*optarg == '.') optarg++;
diff -up gzip-1.3.13/gzip.h.rsync gzip-1.3.13/gzip.h
--- gzip-1.3.13/gzip.h.rsync	2009-09-26 20:43:28.000000000 +0200
+++ gzip-1.3.13/gzip.h	2009-12-01 16:14:24.664394713 +0100
@@ -158,6 +158,7 @@ EXTERN(uch, window);         /* Sliding 
 extern unsigned insize; /* valid bytes in inbuf */
 extern unsigned inptr;  /* index of next byte to be processed in inbuf */
 extern unsigned outcnt; /* bytes in output buffer */
+extern int rsync;  /* deflate into rsyncable chunks */ 
 
 extern off_t bytes_in;   /* number of input bytes */
 extern off_t bytes_out;  /* number of output bytes */
@@ -306,7 +307,7 @@ off_t deflate OF((void));
         /* in trees.c */
 void ct_init     OF((ush *attr, int *method));
 int  ct_tally    OF((int dist, int lc));
-off_t flush_block OF((char *buf, ulg stored_len, int eof));
+off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof)); 
 
         /* in bits.c */
 void     bi_init    OF((file_t zipfile));
diff -up gzip-1.3.13/trees.c.rsync gzip-1.3.13/trees.c
--- gzip-1.3.13/trees.c.rsync	2009-09-26 20:43:28.000000000 +0200
+++ gzip-1.3.13/trees.c	2009-12-01 16:14:24.655388257 +0100
@@ -856,9 +856,10 @@ local void send_all_trees(lcodes, dcodes
  * trees or store, and output the encoded block to the zip file. This function
  * returns the total compressed length for the file so far.
  */
-off_t flush_block(buf, stored_len, eof)
+off_t flush_block(buf, stored_len, pad, eof)  
     char *buf;        /* input block, or NULL if too old */
     ulg stored_len;   /* length of input block */
+    int pad;          /* pad output to byte boundary */ 
     int eof;          /* true if this is the last block for a file */
 {
     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
@@ -951,6 +952,10 @@ off_t flush_block(buf, stored_len, eof)
         Assert (input_len == bytes_in, "bad input size");
         bi_windup();
         compressed_len += 7;  /* align on byte boundary */
+    } else if (pad && (compressed_len % 8) != 0) {
+        send_bits((STORED_BLOCK<<1)+eof, 3);  /* send block type */
+        compressed_len = (compressed_len + 3 + 7) & ~7L;
+        copy_block(buf, 0, 1); /* with header */
     }
 
     return compressed_len >> 3;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gzip/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Jun 2007 07:28:11 -0000	1.9
+++ .cvsignore	1 Dec 2009 15:50:17 -0000	1.10
@@ -1 +1 @@
-gzip-1.3.12.tar.gz
+gzip-1.3.13.tar.gz


Index: gzip.spec
===================================================================
RCS file: /cvs/extras/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gzip.spec	9 Oct 2009 09:57:43 -0000	1.50
+++ gzip.spec	1 Dec 2009 15:50:17 -0000	1.51
@@ -1,21 +1,20 @@
 Summary: The GNU data compression program
 Name: gzip
-Version: 1.3.12
-Release: 12%{?dist}
+Version: 1.3.13
+Release: 1%{?dist}
 # info pages are under GFDL license
-License: GPLv2 and GFDL
+License: GPLv3+ and GFDL
 Group: Applications/File
 Source: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
 Patch0: gzip-1.3.12-openbsd-owl-tmp.patch
 Patch1: gzip-1.3.5-zforce.patch
 Patch3: gzip-1.3.9-stderr.patch
 Patch4: gzip-1.3.10-zgreppipe.patch
-Patch5: gzip-1.3.9-rsync.patch
+Patch5: gzip-1.3.13-rsync.patch
 Patch7: gzip-1.3.9-addsuffix.patch
 Patch14: gzip-1.3.5-cve-2006-4338.patch
-Patch15: gzip-1.3.9-cve-2006-4337.patch
+Patch15: gzip-1.3.13-cve-2006-4337.patch
 Patch16: gzip-1.3.5-cve-2006-4337_len.patch
-Patch17: gzip-1.3.12-futimens.patch
 Patch18: gzip-1.3.12-zdiff.patch
 URL: http://www.gzip.org/
 Requires: /sbin/install-info
@@ -41,8 +40,8 @@ very commonly used data compression prog
 %patch14 -p1 -b .4338
 %patch15 -p1 -b .4337
 %patch16 -p1 -b .4337l
-%patch17 -p1 -b .futimens
 %patch18 -p1 -b .ret
+
 %build
 export DEFS="NO_ASM"
 export CPPFLAGS="-DHAVE_LSTAT"
@@ -93,6 +92,13 @@ fi
 %{_infodir}/gzip.info*
 
 %changelog
+* Tue Dec  1 2009 Karel Klic <kklic at redhat.com> - 1.3.13-1
+- New upstream version
+- Updated license from GPLv2 to GPLv3+
+- Removed gzip-1.3.12-futimens.patch, as it is fixed in the new version 
+- Updated rsync patch to the new upstream version
+- Updated cve-2006-4337 patch to use gzip_error instead of error
+
 * Fri Oct  9 2009 Ivana Varekova <varekova at redhat.com> - 1.3.12-12
 - change the source tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gzip/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Jun 2007 07:28:11 -0000	1.9
+++ sources	1 Dec 2009 15:50:17 -0000	1.10
@@ -1 +1 @@
-b5bac2d21840ae077e0217bc5e4845b1  gzip-1.3.12.tar.gz
+c54a31b93e865f6a4410b2dc64662706  gzip-1.3.13.tar.gz


--- gzip-1.3.12-futimens.patch DELETED ---


--- gzip-1.3.9-cve-2006-4337.patch DELETED ---


--- gzip-1.3.9-rsync.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Dec  1 15:50:22 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  1 Dec 2009 15:50:22 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore, 1.67, 1.68 kdebindings.spec,
	1.263, 1.264 sources, 1.74, 1.75
Message-ID: <20091201155022.70E4511C00DE@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
- KDE 4.4 beta1 (4.3.80)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	24 Nov 2009 16:36:03 -0000	1.67
+++ .cvsignore	1 Dec 2009 15:50:22 -0000	1.68
@@ -1 +1 @@
-kdebindings-4.3.75svn1048496.tar.bz2
+kdebindings-4.3.80.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- kdebindings.spec	26 Nov 2009 18:15:03 -0000	1.263
+++ kdebindings.spec	1 Dec 2009 15:50:22 -0000	1.264
@@ -1,5 +1,3 @@
-%define alphatag svn1048496
-
 # define to enable these optional bits
 ## arch'es matching mono's ExclusiveArch set
 %if 0%{?fedora} > 11
@@ -53,15 +51,15 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.75
-Release: 0.4.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
 Group: User Interface/Desktops
 URL: http://developer.kde.org/language-bindings/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # patch to disable examples (trouble with them installing to the buildroot)
@@ -560,6 +558,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Thu Nov 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.4.svn1048496
 - update generator and smoke to the current trunk for more fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	24 Nov 2009 16:36:03 -0000	1.74
+++ sources	1 Dec 2009 15:50:22 -0000	1.75
@@ -1 +1 @@
-59ef291c80442ac5f15618b44c265d53  kdebindings-4.3.75svn1048496.tar.bz2
+dc060b2d2c88cf5860dc60d563396f17  kdebindings-4.3.80.tar.bz2



From limb at fedoraproject.org  Tue Dec  1 15:51:57 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  1 Dec 2009 15:51:57 +0000 (UTC)
Subject: File views-6.x-2.7.tar.gz uploaded to lookaside cache by limb
Message-ID: <20091201155157.E76BB10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for drupal-views:

993a4ce82f5eb6f3f2166de7aa5edbce  views-6.x-2.7.tar.gz



From than at fedoraproject.org  Tue Dec  1 15:52:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:52:40 +0000 (UTC)
Subject: rpms/kdegraphics/F-12 .cvsignore, 1.69, 1.70 kdegraphics.spec, 1.216,
	1.217 sources, 1.74, 1.75
Message-ID: <20091201155240.5BCFF11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24334

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-12/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	10 Nov 2009 15:07:13 -0000	1.69
+++ .cvsignore	1 Dec 2009 15:52:40 -0000	1.70
@@ -1 +1,2 @@
 kdegraphics-4.3.3.tar.bz2
+kdegraphics-4.3.4.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-12/kdegraphics.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- kdegraphics.spec	10 Nov 2009 15:07:13 -0000	1.216
+++ kdegraphics.spec	1 Dec 2009 15:52:40 -0000	1.217
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -233,6 +233,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-12/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	10 Nov 2009 15:07:13 -0000	1.74
+++ sources	1 Dec 2009 15:52:40 -0000	1.75
@@ -1 +1 @@
-e150a9538133a359e3e2e8ccf0c58575  kdegraphics-4.3.3.tar.bz2
+a8c0569f7f11f22a5038ede85b5db77a  kdegraphics-4.3.4.tar.bz2



From toshio at fedoraproject.org  Tue Dec  1 15:52:49 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 15:52:49 +0000 (UTC)
Subject: rpms/TurboGears/EL-5 .cvsignore, 1.9,
	1.10 TurboGears-1.0.8-setup.patch, 1.2, 1.3 TurboGears.spec,
	1.28, 1.29 sources, 1.9, 1.10 turbogears-sqlcreate.patch, 1.1, 1.2
Message-ID: <20091201155249.63EB311C00DE@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	.cvsignore TurboGears-1.0.8-setup.patch TurboGears.spec 
	sources turbogears-sqlcreate.patch 
Log Message:

* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
- Update to 1.0.9 bugfix release.
- Paginate fix is in upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Mar 2009 02:58:19 -0000	1.9
+++ .cvsignore	1 Dec 2009 15:52:49 -0000	1.10
@@ -1 +1 @@
-TurboGears-1.0.8.tar.gz
+TurboGears-1.0.9.tar.gz

TurboGears-1.0.8-setup.patch:
 setup.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Index: TurboGears-1.0.8-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears-1.0.8-setup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- TurboGears-1.0.8-setup.patch	7 Mar 2009 23:34:24 -0000	1.2
+++ TurboGears-1.0.8-setup.patch	1 Dec 2009 15:52:49 -0000	1.3
@@ -1,12 +1,14 @@
---- setup.py.orig	2009-03-07 17:39:25.000000000 -0500
-+++ setup.py	2009-03-07 17:47:10.000000000 -0500
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
 @@ -1,5 +1,3 @@
 -from ez_setup import use_setuptools
 -use_setuptools()
  from setuptools import setup, find_packages
- from pkg_resources import DistributionNotFound
  
-@@ -14,7 +12,6 @@
+ import sys
+@@ -20,7 +18,6 @@ execfile(os.path.join("turbogears", "rel
  # setup params
  install_requires = [
      "CherryPy >= 2.3.0, < 3.0.0alpha",
@@ -14,7 +16,7 @@
      "DecoratorTools >= 1.4",
      "FormEncode >= 0.7.1",
      "PasteScript >= 1.6.2",
-@@ -22,8 +19,7 @@
+@@ -28,8 +25,7 @@ install_requires = [
      "setuptools >= 0.6c2",
      "simplejson >= 1.3",
      "TurboCheetah >= 1.0",
@@ -24,12 +26,12 @@
      "TurboKid >= 1.0.4",
  ]
  
-@@ -35,7 +31,7 @@
- ]
- 
- sqlobject = [
--    "SQLObject >= 0.10.1",
-+    "SQLObject >= 0.9.7",
- ]
- 
+@@ -43,7 +39,7 @@ future = [
  if sys.version_info < (2, 4):
+     sqlobject = [
+         # SQLObject >= 0.11 does not support Py 2.3
+-        "SQLObject >= 0.10.1, < 0.11.0alpha",
++        "SQLObject >= 0.9.7, < 0.11.0alpha",
+         ]
+     sqlalchemy = [
+         # SQLAlchemy >= 0.5 does not support Py 2.3


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- TurboGears.spec	1 Dec 2009 02:10:17 -0000	1.28
+++ TurboGears.spec	1 Dec 2009 15:52:49 -0000	1.29
@@ -2,18 +2,16 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.8
-Release:        8%{?dist}
+Version:        1.0.9
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-cherrypyreq.patch
-Patch1:         %{name}-%{version}-setup.patch
-# From upstream changeset r6575
-Patch2:         %{name}-%{version}-paginate.patch
+Patch0:         %{name}-1.0.8-cherrypyreq.patch
+Patch1:         %{name}-1.0.8-setup.patch
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
@@ -76,7 +74,6 @@ TurboGears is easy to use for a wide ran
 %setup -q
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
-%patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
 %patch4 -p1 -b .sqlcreate
 
@@ -101,6 +98,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
+- Update to 1.0.9 bugfix release.
+- Paginate fix is in upstream.
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
 - Fix problem with sql create and sqlobject
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Mar 2009 02:58:19 -0000	1.9
+++ sources	1 Dec 2009 15:52:49 -0000	1.10
@@ -1 +1 @@
-845b29a588ae8d4e7591c7226daa6f98  TurboGears-1.0.8.tar.gz
+aa10271f3d29c716e9d63b3264dca944  TurboGears-1.0.9.tar.gz

turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/turbogears-sqlcreate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- turbogears-sqlcreate.patch	1 Dec 2009 02:10:17 -0000	1.1
+++ turbogears-sqlcreate.patch	1 Dec 2009 15:52:49 -0000	1.2
@@ -1,8 +1,8 @@
-Index: TurboGears-1.0.8/turbogears/command/base.py
+Index: TurboGears-1.0.9/turbogears/command/base.py
 ===================================================================
---- TurboGears-1.0.8.orig/turbogears/command/base.py
-+++ TurboGears-1.0.8/turbogears/command/base.py
-@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
+--- TurboGears-1.0.9.orig/turbogears/command/base.py
++++ TurboGears-1.0.9/turbogears/command/base.py
+@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
@@ -18,4 +18,4 @@ Index: TurboGears-1.0.8/turbogears/comma
 +                    sys.argv.insert(2, pkgname)
                      sys.argv.insert(2, "--egg")
  
-             command.the_runner.run(sys.argv)
+             socommand.the_runner.run(sys.argv)



From ajax at fedoraproject.org  Tue Dec  1 15:53:39 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  1 Dec 2009 15:53:39 +0000 (UTC)
Subject: File xf86-video-dummy-0.3.3.tar.bz2 uploaded to lookaside cache by
	ajax
Message-ID: <20091201155339.EA8E410F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xorg-x11-drv-dummy:

3ffe3a28f4452e66bf56180e7da9cbc5  xf86-video-dummy-0.3.3.tar.bz2



From ajax at fedoraproject.org  Tue Dec  1 15:54:14 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  1 Dec 2009 15:54:14 +0000 (UTC)
Subject: rpms/xorg-x11-drv-dummy/devel .cvsignore, 1.10, 1.11 sources, 1.10, 
	1.11 xorg-x11-drv-dummy.spec, 1.25, 1.26
Message-ID: <20091201155414.C4DF711C00DE@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	.cvsignore sources xorg-x11-drv-dummy.spec 
Log Message:
* Tue Dec 01 2009 Adam Jackson <ajax at redhat.com> 0.3.3-1
- dummy 0.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-dummy/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Jul 2009 15:10:03 -0000	1.10
+++ .cvsignore	1 Dec 2009 15:54:14 -0000	1.11
@@ -1,2 +1 @@
-xf86-video-dummy-0.3.1.tar.bz2
-xf86-video-dummy-0.3.2.tar.bz2
+xf86-video-dummy-0.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-dummy/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 15:10:03 -0000	1.10
+++ sources	1 Dec 2009 15:54:14 -0000	1.11
@@ -1 +1 @@
-2a6f1f07462fbe336865068cd69c8593  xf86-video-dummy-0.3.2.tar.bz2
+3ffe3a28f4452e66bf56180e7da9cbc5  xf86-video-dummy-0.3.3.tar.bz2


Index: xorg-x11-drv-dummy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-dummy/devel/xorg-x11-drv-dummy.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xorg-x11-drv-dummy.spec	27 Jul 2009 08:24:35 -0000	1.25
+++ xorg-x11-drv-dummy.spec	1 Dec 2009 15:54:14 -0000	1.26
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
-Version:   0.3.2
-Release:   2%{?dist}.1
+Version:   0.3.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/dummy_drv.so
 
 %changelog
+* Tue Dec 01 2009 Adam Jackson <ajax at redhat.com> 0.3.3-1
+- dummy 0.3.3
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kdudka at fedoraproject.org  Tue Dec  1 15:54:24 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 15:54:24 +0000 (UTC)
Subject: rpms/units/devel units.spec,1.30,1.31
Message-ID: <20091201155424.5C87211C00DE@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	units.spec 
Log Message:
- add BuildRequires for bison


Index: units.spec
===================================================================
RCS file: /cvs/extras/rpms/units/devel/units.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- units.spec	1 Dec 2009 15:40:25 -0000	1.30
+++ units.spec	1 Dec 2009 15:54:24 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A utility for converting amounts from one unit to another
 Name: units
 Version: 1.87
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
 Patch1: units-1.87-gcc-warnings-1.patch
 Patch2: units-1.87-gcc-warnings-2.patch
@@ -11,6 +11,7 @@ Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+BuildRequires: bison
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
 
@@ -58,6 +59,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> - 1.87-7
+- add BuildRequires for bison
+
 * Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> - 1.87-6
 - update license to GPLv3+, sanitize specfile
 - fix tons of gcc warnings



From limb at fedoraproject.org  Tue Dec  1 15:54:56 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  1 Dec 2009 15:54:56 +0000 (UTC)
Subject: rpms/drupal-views/devel .cvsignore, 1.5, 1.6 drupal-views.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091201155456.8A20D11C00DE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-views/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25192

Modified Files:
	.cvsignore drupal-views.spec sources 
Log Message:
New upstream, BZ 541440.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-views/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jun 2009 13:01:02 -0000	1.5
+++ .cvsignore	1 Dec 2009 15:54:56 -0000	1.6
@@ -1 +1 @@
-views-6.x-2.6.tar.gz
+views-6.x-2.7.tar.gz


Index: drupal-views.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-views/devel/drupal-views.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drupal-views.spec	24 Jul 2009 20:34:48 -0000	1.7
+++ drupal-views.spec	1 Dec 2009 15:54:56 -0000	1.8
@@ -1,13 +1,13 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-views
-Version:  6.x.2.6
-Release:  2%{?dist}
+Version:  6.x.2.7
+Release:  1%{?dist}
 Summary: Provides a method for site designers to control content presentation
 
 Group: Applications/Publishing
 License: GPLv2
 URL: http://drupal.org/project/views
-Source0: http://ftp.drupal.org/files/projects/views-6.x-2.6.tar.gz
+Source0: http://ftp.drupal.org/files/projects/views-6.x-2.7.tar.gz
 Source1: drupal-views-fedora-README.txt
 
 BuildArch: noarch
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/modules/views/drupal-views-fedora-README.txt
 
 %changelog
+* Tue Dec 01 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.7-1
+- New upstream, BZ 541440.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-views/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jun 2009 13:01:02 -0000	1.5
+++ sources	1 Dec 2009 15:54:56 -0000	1.6
@@ -1 +1 @@
-a39827a5430373ab8508f2773b0bc6ea  views-6.x-2.6.tar.gz
+993a4ce82f5eb6f3f2166de7aa5edbce  views-6.x-2.7.tar.gz



From than at fedoraproject.org  Tue Dec  1 15:55:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:55:03 +0000 (UTC)
Subject: File kdelibs-experimental-4.3.4.tar.bz2 uploaded to lookaside cache
	by than
Message-ID: <20091201155503.C9B6810F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdelibs-experimental:

ee3eb713d703b8bba9de61197f6943c4  kdelibs-experimental-4.3.4.tar.bz2



From ajax at fedoraproject.org  Tue Dec  1 15:54:58 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  1 Dec 2009 15:54:58 +0000 (UTC)
Subject: rpms/xorg-x11-drv-dummy/F-12 sources, 1.10,
	1.11 xorg-x11-drv-dummy.spec, 1.26, 1.27
Message-ID: <20091201155458.BAEB011C00DE@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-dummy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25234

Modified Files:
	sources xorg-x11-drv-dummy.spec 
Log Message:
* Tue Dec 01 2009 Adam Jackson <ajax at redhat.com> 0.3.3-1
- dummy 0.3.3



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-dummy/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 15:10:03 -0000	1.10
+++ sources	1 Dec 2009 15:54:58 -0000	1.11
@@ -1 +1 @@
-2a6f1f07462fbe336865068cd69c8593  xf86-video-dummy-0.3.2.tar.bz2
+3ffe3a28f4452e66bf56180e7da9cbc5  xf86-video-dummy-0.3.3.tar.bz2


Index: xorg-x11-drv-dummy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-dummy/F-12/xorg-x11-drv-dummy.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xorg-x11-drv-dummy.spec	30 Sep 2009 05:21:24 -0000	1.26
+++ xorg-x11-drv-dummy.spec	1 Dec 2009 15:54:58 -0000	1.27
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
-Version:   0.3.2
-Release:   3%{?dist}
+Version:   0.3.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -47,8 +47,8 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/dummy_drv.so
 
 %changelog
-* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 0.3.2-3
-- rebuild for new ABI
+* Tue Dec 01 2009 Adam Jackson <ajax at redhat.com> 0.3.3-1
+- dummy 0.3.3
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From mclasen at fedoraproject.org  Tue Dec  1 15:55:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 15:55:12 +0000 (UTC)
Subject: rpms/htmlview/devel dead.package, NONE, 1.1 Makefile, 1.3,
	NONE htmlview, 1.17, NONE htmlview.spec, 1.32, NONE launchmail,
	1.6, NONE sources, 1.1, NONE
Message-ID: <20091201155512.86D4011C00DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Added Files:
	dead.package 
Removed Files:
	Makefile htmlview htmlview.spec launchmail sources 
Log Message:
htmlview ?



--- NEW FILE dead.package ---
Obsoleted by xdg-utils.


--- Makefile DELETED ---


--- htmlview DELETED ---


--- htmlview.spec DELETED ---


--- launchmail DELETED ---


--- sources DELETED ---



From than at fedoraproject.org  Tue Dec  1 15:55:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:55:45 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-12 .cvsignore, 1.11,
	1.12 kdelibs-experimental.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20091201155545.1751E11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs-experimental/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25449

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	10 Nov 2009 15:12:33 -0000	1.11
+++ .cvsignore	1 Dec 2009 15:55:44 -0000	1.12
@@ -1 +1,2 @@
 kdelibs-experimental-4.3.3.tar.bz2
+kdelibs-experimental-4.3.4.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-12/kdelibs-experimental.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kdelibs-experimental.spec	10 Nov 2009 15:12:33 -0000	1.13
+++ kdelibs-experimental.spec	1 Dec 2009 15:55:44 -0000	1.14
@@ -1,6 +1,6 @@
 
 Name:    kdelibs-experimental
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -62,6 +62,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Nov 2009 15:12:33 -0000	1.10
+++ sources	1 Dec 2009 15:55:44 -0000	1.11
@@ -1 +1 @@
-b9a048ccf15e90dcfd4790f65e6b54b9  kdelibs-experimental-4.3.3.tar.bz2
+ee3eb713d703b8bba9de61197f6943c4  kdelibs-experimental-4.3.4.tar.bz2



From toshio at fedoraproject.org  Tue Dec  1 15:55:53 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 15:55:53 +0000 (UTC)
Subject: rpms/TurboGears/F-11 .cvsignore, 1.13,
	1.14 TurboGears-1.0.8-setup.patch, 1.1, 1.2 TurboGears.spec,
	1.47, 1.48 sources, 1.13, 1.14 turbogears-sqlcreate.patch, 1.1, 1.2
Message-ID: <20091201155553.6C69811C00DE@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	.cvsignore TurboGears-1.0.8-setup.patch TurboGears.spec 
	sources turbogears-sqlcreate.patch 
Log Message:
* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
- Update to 1.0.9 bugfix release.
  + Fixes hard to reproduce errors when using SQLObject
- Paginate fix is in upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Jan 2009 06:54:07 -0000	1.13
+++ .cvsignore	1 Dec 2009 15:55:53 -0000	1.14
@@ -1 +1 @@
-TurboGears-1.0.8.tar.gz
+TurboGears-1.0.9.tar.gz

TurboGears-1.0.8-setup.patch:
 setup.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: TurboGears-1.0.8-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears-1.0.8-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- TurboGears-1.0.8-setup.patch	3 Jan 2009 06:36:17 -0000	1.1
+++ TurboGears-1.0.8-setup.patch	1 Dec 2009 15:55:53 -0000	1.2
@@ -1,6 +1,8 @@
---- setup.py.setup	2008-09-15 16:30:30.000000000 -0400
-+++ setup.py	2008-09-18 03:01:12.000000000 -0400
-@@ -14,7 +14,6 @@
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -20,7 +20,6 @@ execfile(os.path.join("turbogears", "rel
  # setup params
  install_requires = [
      "CherryPy >= 2.3.0, < 3.0.0alpha",
@@ -8,7 +10,7 @@
      "DecoratorTools >= 1.4",
      "FormEncode >= 0.7.1",
      "PasteScript >= 1.6.2",
-@@ -23,7 +22,7 @@
+@@ -29,7 +28,7 @@ install_requires = [
      "simplejson >= 1.3",
      "TurboCheetah >= 1.0",
      # TurboJson >= 1.2 uses PEAK-Rules


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- TurboGears.spec	1 Dec 2009 02:10:17 -0000	1.47
+++ TurboGears.spec	1 Dec 2009 15:55:53 -0000	1.48
@@ -2,18 +2,16 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.8
-Release:        8%{?dist}
+Version:        1.0.9
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-cherrypyreq.patch
-Patch1:         %{name}-%{version}-setup.patch
-# From upstream changeset r6575
-Patch2:         %{name}-%{version}-paginate.patch
+Patch0:         %{name}-1.0.8-cherrypyreq.patch
+Patch1:         %{name}-1.0.8-setup.patch
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
@@ -76,7 +74,6 @@ TurboGears is easy to use for a wide ran
 %setup -q
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
-%patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
 %patch4 -p1 -b .sqlcreate
 
@@ -101,6 +98,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
+- Update to 1.0.9 bugfix release.
+- Paginate fix is in upstream.
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
 - Fix problem with sql create and sqlobject
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Jan 2009 06:54:07 -0000	1.13
+++ sources	1 Dec 2009 15:55:53 -0000	1.14
@@ -1 +1 @@
-845b29a588ae8d4e7591c7226daa6f98  TurboGears-1.0.8.tar.gz
+aa10271f3d29c716e9d63b3264dca944  TurboGears-1.0.9.tar.gz

turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/turbogears-sqlcreate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- turbogears-sqlcreate.patch	1 Dec 2009 02:10:17 -0000	1.1
+++ turbogears-sqlcreate.patch	1 Dec 2009 15:55:53 -0000	1.2
@@ -1,8 +1,8 @@
-Index: TurboGears-1.0.8/turbogears/command/base.py
+Index: TurboGears-1.0.9/turbogears/command/base.py
 ===================================================================
---- TurboGears-1.0.8.orig/turbogears/command/base.py
-+++ TurboGears-1.0.8/turbogears/command/base.py
-@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
+--- TurboGears-1.0.9.orig/turbogears/command/base.py
++++ TurboGears-1.0.9/turbogears/command/base.py
+@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
@@ -18,4 +18,4 @@ Index: TurboGears-1.0.8/turbogears/comma
 +                    sys.argv.insert(2, pkgname)
                      sys.argv.insert(2, "--egg")
  
-             command.the_runner.run(sys.argv)
+             socommand.the_runner.run(sys.argv)



From toshio at fedoraproject.org  Tue Dec  1 15:55:53 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  1 Dec 2009 15:55:53 +0000 (UTC)
Subject: rpms/TurboGears/F-12 .cvsignore, 1.13,
	1.14 TurboGears-1.0.8-setup.patch, 1.1, 1.2 TurboGears.spec,
	1.50, 1.51 sources, 1.13, 1.14 turbogears-sqlcreate.patch, 1.1, 1.2
Message-ID: <20091201155553.F119511C00DE@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25367/F-12

Modified Files:
	.cvsignore TurboGears-1.0.8-setup.patch TurboGears.spec 
	sources turbogears-sqlcreate.patch 
Log Message:
* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
- Update to 1.0.9 bugfix release.
  + Fixes hard to reproduce errors when using SQLObject
- Paginate fix is in upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Jan 2009 06:54:07 -0000	1.13
+++ .cvsignore	1 Dec 2009 15:55:53 -0000	1.14
@@ -1 +1 @@
-TurboGears-1.0.8.tar.gz
+TurboGears-1.0.9.tar.gz

TurboGears-1.0.8-setup.patch:
 setup.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: TurboGears-1.0.8-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-12/TurboGears-1.0.8-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- TurboGears-1.0.8-setup.patch	3 Jan 2009 06:36:17 -0000	1.1
+++ TurboGears-1.0.8-setup.patch	1 Dec 2009 15:55:53 -0000	1.2
@@ -1,6 +1,8 @@
---- setup.py.setup	2008-09-15 16:30:30.000000000 -0400
-+++ setup.py	2008-09-18 03:01:12.000000000 -0400
-@@ -14,7 +14,6 @@
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -20,7 +20,6 @@ execfile(os.path.join("turbogears", "rel
  # setup params
  install_requires = [
      "CherryPy >= 2.3.0, < 3.0.0alpha",
@@ -8,7 +10,7 @@
      "DecoratorTools >= 1.4",
      "FormEncode >= 0.7.1",
      "PasteScript >= 1.6.2",
-@@ -23,7 +22,7 @@
+@@ -29,7 +28,7 @@ install_requires = [
      "simplejson >= 1.3",
      "TurboCheetah >= 1.0",
      # TurboJson >= 1.2 uses PEAK-Rules


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-12/TurboGears.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- TurboGears.spec	1 Dec 2009 02:10:18 -0000	1.50
+++ TurboGears.spec	1 Dec 2009 15:55:53 -0000	1.51
@@ -2,18 +2,16 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.8
-Release:        8%{?dist}
+Version:        1.0.9
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-cherrypyreq.patch
-Patch1:         %{name}-%{version}-setup.patch
-# From upstream changeset r6575
-Patch2:         %{name}-%{version}-paginate.patch
+Patch0:         %{name}-1.0.8-cherrypyreq.patch
+Patch1:         %{name}-1.0.8-setup.patch
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
@@ -76,7 +74,6 @@ TurboGears is easy to use for a wide ran
 %setup -q
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
-%patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
 %patch4 -p1 -b .sqlcreate
 
@@ -101,6 +98,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
+- Update to 1.0.9 bugfix release.
+- Paginate fix is in upstream.
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
 - Fix problem with sql create and sqlobject
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Jan 2009 06:54:07 -0000	1.13
+++ sources	1 Dec 2009 15:55:53 -0000	1.14
@@ -1 +1 @@
-845b29a588ae8d4e7591c7226daa6f98  TurboGears-1.0.8.tar.gz
+aa10271f3d29c716e9d63b3264dca944  TurboGears-1.0.9.tar.gz

turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-12/turbogears-sqlcreate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- turbogears-sqlcreate.patch	1 Dec 2009 02:10:18 -0000	1.1
+++ turbogears-sqlcreate.patch	1 Dec 2009 15:55:53 -0000	1.2
@@ -1,8 +1,8 @@
-Index: TurboGears-1.0.8/turbogears/command/base.py
+Index: TurboGears-1.0.9/turbogears/command/base.py
 ===================================================================
---- TurboGears-1.0.8.orig/turbogears/command/base.py
-+++ TurboGears-1.0.8/turbogears/command/base.py
-@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
+--- TurboGears-1.0.9.orig/turbogears/command/base.py
++++ TurboGears-1.0.9/turbogears/command/base.py
+@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
@@ -18,4 +18,4 @@ Index: TurboGears-1.0.8/turbogears/comma
 +                    sys.argv.insert(2, pkgname)
                      sys.argv.insert(2, "--egg")
  
-             command.the_runner.run(sys.argv)
+             socommand.the_runner.run(sys.argv)



From than at fedoraproject.org  Tue Dec  1 15:56:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:56:37 +0000 (UTC)
Subject: File kdemultimedia-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201155637.5C19910F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdemultimedia:

4fa908d0215051e11b6972537cda6333  kdemultimedia-4.3.4.tar.bz2



From kdudka at fedoraproject.org  Tue Dec  1 15:58:30 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  1 Dec 2009 15:58:30 +0000 (UTC)
Subject: rpms/units/F-12 units-1.87-gcc-warnings-1.patch, NONE,
	1.1 units-1.87-gcc-warnings-2.patch, NONE, 1.1 units.spec, 1.29, 1.30
Message-ID: <20091201155830.9F97F11C00DE@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/units/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26150

Modified Files:
	units.spec 
Added Files:
	units-1.87-gcc-warnings-1.patch 
	units-1.87-gcc-warnings-2.patch 
Log Message:
- update license to GPLv3+, sanitize specfile
- fix tons of gcc warnings

units-1.87-gcc-warnings-1.patch:
 parse.y |    8 +++++---
 units.c |   49 ++++++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 26 deletions(-)

--- NEW FILE units-1.87-gcc-warnings-1.patch ---
diff --git a/parse.y b/parse.y
index 89a05b1..0bdd8a3 100644
--- a/parse.y
+++ b/parse.y
@@ -29,6 +29,8 @@
 
 #include "units.h"
 
+int yylex();
+void yyerror(char *);
 
 static int err;  /* value used by parser to store return values */
 
@@ -114,7 +116,7 @@ funcunit(struct unittype *theunit, struct function *fun)
     if (err)
       return err;
   } else if (fun->type==ANGLEOUT || fun->type == DIMENSIONLESS) {
-    if (err=unit2num(theunit))
+    if ((err=unit2num(theunit)))
       return err;
     
   } else 
@@ -278,7 +280,7 @@ struct {
                  "per" , DIVIDE, 
                  0, 0 };
 
-yylex(YYSTYPE *lvalp, struct commtype *comm)
+int yylex(YYSTYPE *lvalp, struct commtype *comm)
 {
   int length, count;
   struct unittype *output;
@@ -414,7 +416,7 @@ yylex(YYSTYPE *lvalp, struct commtype *comm)
 }
 
 
-yyerror(char *s){}
+void yyerror(char *s){}
 
 void
 freelist(int startunit)
diff --git a/units.c b/units.c
index f5416b0..2cd6765 100644
--- a/units.c
+++ b/units.c
@@ -29,6 +29,7 @@
 
 #ifdef READLINE
 #  include <readline/readline.h>
+#  include <readline/history.h>
 #  define RVERSTR "with readline"
 #else
 #  define RVERSTR "without readline"
@@ -489,7 +490,7 @@ readunits(char *file, FILE *errfile,
       }	
       if (wronglocale)
 	continue;
-      if (lineptr = strchr(line,COMMENTCHAR))
+      if ((lineptr = strchr(line,COMMENTCHAR)))
          *lineptr = 0;
       unitname = strtok(line, WHITE);
       if (!unitname || !*unitname) 
@@ -519,9 +520,9 @@ readunits(char *file, FILE *errfile,
   	     goterr=1;
 	     continue;
 	 }
-	 if (pfxptr = plookup(unitname)) {  /* already there: redefinition */
+	 if ((pfxptr = plookup(unitname))) {  /* already there: redefinition */
  	    goterr=1;
-            if (errfile)
+            if (errfile) {
 	      if (!strcmp(pfxptr->name, unitname))
 		fprintf(errfile,
    	        "%s: redefinition of prefix '%s-' on line %d of '%s' ignored.\n",
@@ -529,6 +530,7 @@ readunits(char *file, FILE *errfile,
 	      else
 	         fprintf(errfile, "%s: prefix '%s-' on line %d of '%s' is hidden by earlier definition of '%s-'.\n",
 		       progname, unitname, linenum, file, pfxptr->name);
+            }
 	    continue;
 	 } 
 
@@ -948,7 +950,7 @@ lookupunit(char *unit,int prefixok)
    struct prefixlist *pfxptr;
    struct unitlist *uptr;
 
-   if (uptr = ulookup(unit))
+   if ((uptr = ulookup(unit)))
       return uptr->value;
 
    if (strlen(unit)>2 && unit[strlen(unit) - 1] == 's') {
@@ -1278,7 +1280,7 @@ completereduce(struct unittype *unit)
 {
    int err;
 
-   if (err=reduceunit(unit))
+   if ((err=reduceunit(unit)))
      return err;
    sortunit(unit);
    cancelunit(unit);
@@ -1340,7 +1342,7 @@ unit2num(struct unittype *input)
   int err;
 
   initializeunit(&one);
-  if (err=completereduce(input))
+  if ((err=completereduce(input)))
     return err;
   if (compareunits(input,&one,ignore_nothing))
     return E_NOTANUMBER;
@@ -1404,13 +1406,13 @@ rootunit(struct unittype *inunit,int n)
    int err; 
 
    initializeunit(&outunit);
-   if (err=completereduce(inunit))
+   if ((err=completereduce(inunit)))
      return err;
-   if ((n & 1==0) && (inunit->factor<0)) return E_NOTROOT;
+   if (((n & 1)==0) && (inunit->factor<0)) return E_NOTROOT;
    outunit.factor = pow(inunit->factor,1.0/(double)n);
-   if (err = subunitroot(n, inunit->numerator, outunit.numerator))
+   if ((err = subunitroot(n, inunit->numerator, outunit.numerator)))
      return err;
-   if (err = subunitroot(n, inunit->denominator, outunit.denominator))
+   if ((err = subunitroot(n, inunit->denominator, outunit.denominator)))
      return err;
    freeunit(inunit);
    initializeunit(inunit);
@@ -1482,9 +1484,9 @@ addunit(struct unittype *unita, struct unittype *unitb)
 {
   int err;
 
-  if (err=completereduce(unita))
+  if ((err=completereduce(unita)))
     return err;
-  if (err=completereduce(unitb))
+  if ((err=completereduce(unitb)))
     return err;
   if (compareunits(unita,unitb,ignore_nothing))
     return E_BADSUM;
@@ -1723,7 +1725,7 @@ showanswer(char *havestr,struct unittype *have,
 {
    struct unittype invhave;
    int doingrec;  /* reciprocal conversion? */
-   char *sep, *right, *left;
+   char *sep = NULL, *right = NULL, *left = NULL;
 
    doingrec=0;
    havestr = removepadding(havestr);
@@ -1970,7 +1972,8 @@ addtolist(struct unittype *have, char *searchstring, char *rname, char *name, ch
 	       int *count, int searchtype)
 {
   struct unittype want;
-  int len,keepit;
+  int len = 0;
+  int keepit = 0;
 
   if (!name) 
     return;
@@ -2243,7 +2246,7 @@ completeunits(char *text, int state)
       curunit = utab[uhash];
     }
     if (!curunit && !curprefix){
-      if (curprefix = plookup(text)){
+      if ((curprefix = plookup(text))){
         if (strlen(curprefix->name)>1 && strlen(curprefix->name)<strlen(text)){
           uhash = 0;
           curunit = utab[uhash];
@@ -2481,7 +2484,7 @@ processunit(struct unittype *theunit, char *unitstr, char *prompt, int pointer)
   char *errmsg;
   int errloc,err;
 
-  if (err=parseunit(theunit, unitstr, &errmsg, &errloc)){
+  if ((err=parseunit(theunit, unitstr, &errmsg, &errloc))){
     if (pointer){
       if (err!=E_UNKNOWNUNIT || !irreducible){
 	if (!quiet) {
@@ -2501,7 +2504,7 @@ processunit(struct unittype *theunit, char *unitstr, char *prompt, int pointer)
 
     return 1;
   }
-  if (err=completereduce(theunit)){
+  if ((err=completereduce(theunit))){
     printf("%s",errormsg[err]);
     if (err==E_UNKNOWNUNIT)
       printf(" '%s'", irreducible);
@@ -2584,11 +2587,11 @@ Typing 'search text' will show units whose names contain 'text'.\n\n",
              UNITMATCH);
       return 1;
     }
-    if (function = isfunction(str)){
+    if ((function = isfunction(str))){
       file = function->file;
       unitline = function->linenumber;
     }
-    else if (unit = ulookup(str)){
+    else if ((unit = ulookup(str))){
       unitline = unit->linenumber;
       file = unit->file;
     }
@@ -2678,7 +2681,7 @@ main(int argc, char **argv)
    }
 
    if (!interactive) {
-      if (funcval = isfunction(havestr)){
+      if ((funcval = isfunction(havestr))){
 	showfuncdefinition(funcval);
   	exit(0);
       }
@@ -2688,7 +2691,7 @@ main(int argc, char **argv)
          showdefinition(havestr,&have);
          exit(0);
       }
-      if (funcval = isfunction(wantstr)){
+      if ((funcval = isfunction(wantstr))){
          if (showfunc(havestr, &have, funcval))
 	   exit(1);
 	 else
@@ -2710,7 +2713,7 @@ main(int argc, char **argv)
 	 } while (isblankstr(havestr) || ishelpquery(havestr,0) ||
 		  (isfunction(havestr)==0 
 		  && processunit(&have, havestr, queryhave, POINT)));
-         if (funcval = isfunction(havestr)){
+         if ((funcval = isfunction(havestr))){
 	   showfuncdefinition(funcval);
 	   continue;
 	 }
@@ -2728,7 +2731,7 @@ main(int argc, char **argv)
 		  && processunit(&want, wantstr, querywant, POINT));
          if (isblankstr(wantstr))
            showdefinition(havestr,&have);
-         else if (funcval = isfunction(wantstr))
+         else if ((funcval = isfunction(wantstr)))
            showfunc(havestr, &have, funcval);
 	 else {
            showanswer(havestr,&have,wantstr, &want);

units-1.87-gcc-warnings-2.patch:
 parse.y |   48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE units-1.87-gcc-warnings-2.patch ---
diff --git a/parse.y b/parse.y
index 0bdd8a3..3d2c8c2 100644
--- a/parse.y
+++ b/parse.y
@@ -247,38 +247,38 @@ double strtod();
 
 
 struct function 
-  realfunctions[] = { "sin", sin,    ANGLEIN,
-                      "cos", cos,    ANGLEIN,
-                      "tan", tan,    ANGLEIN,
-                      "ln", log,     DIMENSIONLESS,
-                      "log", log10,  DIMENSIONLESS,
-                      "log2", logb2, DIMENSIONLESS,
-                      "exp", exp,    DIMENSIONLESS,
-                      "acos", acos,  ANGLEOUT,
-                      "atan", atan,  ANGLEOUT,
-                      "asin", asin,  ANGLEOUT,
-                      0, 0, 0};
+  realfunctions[] = { {"sin", sin,    ANGLEIN},
+                      {"cos", cos,    ANGLEIN},
+                      {"tan", tan,    ANGLEIN},
+                      {"ln", log,     DIMENSIONLESS},
+                      {"log", log10,  DIMENSIONLESS},
+                      {"log2", logb2, DIMENSIONLESS},
+                      {"exp", exp,    DIMENSIONLESS},
+                      {"acos", acos,  ANGLEOUT},
+                      {"atan", atan,  ANGLEOUT},
+                      {"asin", asin,  ANGLEOUT},
+                      {0, 0, 0}};
 
 struct {
   char op;
   int value;
-} optable[] = { '*', MULTIPLY,
-            	'/', DIVIDE, 
-            	'|', NUMDIV, 
-            	'+', ADD, 
-            	'(', '(', 
-            	')', ')', 
-            	'^', EXPONENT, 
-                '~', FUNCINV,
-            	0, 0 };
+} optable[] = { {'*', MULTIPLY},
+                {'/', DIVIDE},
+                {'|', NUMDIV},
+                {'+', ADD},
+                {'(', '('},
+                {')', ')'},
+                {'^', EXPONENT},
+                {'~', FUNCINV},
+                {0, 0}};
 
 struct {
   char *name;
   int value;
-} strtable[] = { "sqrt", SQRT, 
-                 "cuberoot", CUBEROOT, 
-                 "per" , DIVIDE, 
-                 0, 0 };
+} strtable[] = { {"sqrt", SQRT},
+                 {"cuberoot", CUBEROOT},
+                 {"per" , DIVIDE},
+                 {0, 0}};
 
 int yylex(YYSTYPE *lvalp, struct commtype *comm)
 {


Index: units.spec
===================================================================
RCS file: /cvs/extras/rpms/units/F-12/units.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- units.spec	20 Aug 2009 07:41:11 -0000	1.29
+++ units.spec	1 Dec 2009 15:58:30 -0000	1.30
@@ -1,15 +1,19 @@
 Summary: A utility for converting amounts from one unit to another
 Name: units
 Version: 1.87
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
+Patch1: units-1.87-gcc-warnings-1.patch
+Patch2: units-1.87-gcc-warnings-2.patch
 URL: http://www.gnu.org/software/units/units.html
-License: GPLv2+
+License: GPLv3+
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-BuildRequires: readline-devel ncurses-devel
+BuildRequires: bison
+BuildRequires: ncurses-devel
+BuildRequires: readline-devel
 
 %description
 Units converts an amount from one unit to another, or tells you what
@@ -19,10 +23,12 @@ well as conversions such as Fahrenheit t
 
 %prep
 %setup -q 
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,7 +51,7 @@ if [ $1 = 0 -a -e %{_infodir}/units.info
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/units.dat
@@ -53,6 +59,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> - 1.87-6
+- update license to GPLv3+, sanitize specfile
+- fix tons of gcc warnings
+
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> - 1.87-5
 - Don't complain if installing with --excludedocs (#515941)
 



From than at fedoraproject.org  Tue Dec  1 15:58:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 15:58:59 +0000 (UTC)
Subject: rpms/kdemultimedia/F-12 .cvsignore, 1.71, 1.72 kdemultimedia.spec, 
	1.160, 1.161 sources, 1.72, 1.73
Message-ID: <20091201155859.D1B0311C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26243

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-12/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	10 Nov 2009 15:13:53 -0000	1.71
+++ .cvsignore	1 Dec 2009 15:58:59 -0000	1.72
@@ -1 +1,2 @@
 kdemultimedia-4.3.3.tar.bz2
+kdemultimedia-4.3.4.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-12/kdemultimedia.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- kdemultimedia.spec	11 Nov 2009 16:11:21 -0000	1.160
+++ kdemultimedia.spec	1 Dec 2009 15:58:59 -0000	1.161
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.3
-Release: 2%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -170,6 +170,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Tue Nov 10 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup
 - don't install kscd doc if it's not built


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-12/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	10 Nov 2009 15:13:53 -0000	1.72
+++ sources	1 Dec 2009 15:58:59 -0000	1.73
@@ -1 +1 @@
-854ddc7057cac4b8bf8d7aa4b7f57516  kdemultimedia-4.3.3.tar.bz2
+4fa908d0215051e11b6972537cda6333  kdemultimedia-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 16:00:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:00:45 +0000 (UTC)
Subject: File kdenetwork-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201160045.3AE7D10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdenetwork:

71de592596681fc59c5bc0a679703fd2  kdenetwork-4.3.4.tar.bz2



From cwickert at fedoraproject.org  Tue Dec  1 16:01:18 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  1 Dec 2009 16:01:18 +0000 (UTC)
Subject: rpms/parole/devel .cvsignore, 1.5, 1.6 parole.spec, 1.7, 1.8 sources,
	1.5, 1.6 parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch, 1.1,
	NONE parole-0.1.98-fix-vbox-crash.patch, 1.1,
	NONE parole-0.1.98-interface.patch, 1.1,
	NONE parole-0.1.98-memleak.patch, 1.1, NONE
Message-ID: <20091201160118.2D40C11C00DE@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore parole.spec sources 
Removed Files:
	parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch 
	parole-0.1.98-fix-vbox-crash.patch 
	parole-0.1.98-interface.patch parole-0.1.98-memleak.patch 
Log Message:
* Tue Dec 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.99-1
- Update to 0.1.99 and drop all patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Nov 2009 00:17:45 -0000	1.5
+++ .cvsignore	1 Dec 2009 16:01:17 -0000	1.6
@@ -1 +1 @@
-parole-0.1.98.tar.bz2
+parole-0.1.99.tar.bz2


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/parole.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- parole.spec	29 Nov 2009 00:17:45 -0000	1.7
+++ parole.spec	1 Dec 2009 16:01:17 -0000	1.8
@@ -3,7 +3,7 @@
 %bcond_without mozilla
 
 Name:           parole
-Version:        0.1.98
+Version:        0.1.99
 Release:        1%{?dist}
 Summary:        Media player for the Xfce desktop
 
@@ -11,14 +11,6 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/parole
 Source0:        http://archive.xfce.org/src/apps/parole/0.1/%{name}-%{version}.tar.bz2
-# http://git.xfce.org/apps/parole/commit/?id=c621509e57d326d3134ea61cf783f2d9d311e5db
-Patch0:         parole-0.1.98-fix-vbox-crash.patch
-# http://git.xfce.org/apps/parole/commit/?id=3a276b624edbbe9b6e72101ec8d1893fc854b0af
-Patch1:         parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch
-# http://git.xfce.org/apps/parole/commit/?id=d61475feacd41630cb481f10dbebbb3865a40f61
-Patch2:         parole-0.1.98-interface.patch
-# http://git.xfce.org/apps/parole/patch/?id=aa68a2cb5e6c8162679992b5f979bf4b1d24001c
-Patch3:         parole-0.1.98-memleak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -74,10 +66,7 @@ The %{name}-devel package contains heade
 
 %prep
 %setup -q
-%patch0 -p1 -b .vbox
-%patch1 -p1 -b .192
-%patch2 -p1 -b .interface
-%patch3 -p1 -b .leak
+
 
 %build
 %configure --disable-static --enable-gtk-doc \
@@ -148,6 +137,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.99-1
+- Update to 0.1.99 and drop all patches
+
 * Sun Nov 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.98-1
 - Update to 0.1.98
 - Cherry pick some patches to build the browser plugin with xulrunner 1.9.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Nov 2009 00:17:45 -0000	1.5
+++ sources	1 Dec 2009 16:01:17 -0000	1.6
@@ -1 +1 @@
-62fc89acb02052de585e7c2f2618198f  parole-0.1.98.tar.bz2
+83acd1287953d077e88048064fe33d40  parole-0.1.99.tar.bz2


--- parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch DELETED ---


--- parole-0.1.98-fix-vbox-crash.patch DELETED ---


--- parole-0.1.98-interface.patch DELETED ---


--- parole-0.1.98-memleak.patch DELETED ---



From spot at fedoraproject.org  Tue Dec  1 16:03:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:03:58 +0000 (UTC)
Subject: rpms/mono/devel mono.snk,NONE,1.1 mono.spec,1.141,1.142
Message-ID: <20091201160358.BE03E11C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	mono.spec 
Added Files:
	mono.snk 
Log Message:
mono.snk in -devel


--- NEW FILE mono.snk ---

?&??B?O???r????Fn??	??L?}r??
?IE??*z]?oRn?l??{Ma2?,Yd???~?????Da`}????aTP????`??&??)??r??Hxw????a+?T????LG2p+??F?8J??}^pn???#????9??;?2Cg?D??&1d?!?/Wx}????p?2B???B?	H>?4-?"??5\ ?Z?J?7???T??.?<?"-!__)}?????MMr???0n??c?
*?m???9X?H??$N???t?@?q??C??&0?Q?1?'-s???cv1*<O
/p?euS?r?"????7?n????u?(^??4m??p>/ ^S??7?qG??1|+?J>?-Y??7?.}n?HuH?$??H??l?H?????J?f
lO?????E??7]R?`>lW????
?????_??4?I??????????p???o?y???E}??A?5&??c??XL??

Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- mono.spec	4 Oct 2009 15:17:20 -0000	1.141
+++ mono.spec	1 Dec 2009 16:03:58 -0000	1.142
@@ -2,7 +2,7 @@
 
 Name:           mono
 Version:        2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -12,6 +12,11 @@ URL:            http://www.mono-project.
 # http://mono.ximian.com/monobuild/preview/sources-preview/
 Source0:        http://mono.ximian.com/monobuild/snapshot/sources-trunk/%name-%version.tar.bz2
 Source1:        monodir.c
+# This key was generated by Tom "spot" Callaway <tcallawa at redhat.com> on Dec 1, 2009
+# by running the following command:
+# sn -k mono.snk
+# You should not regenerate this unless you have a really, really, really good reason.
+Source2:	mono.snk
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison 
@@ -331,6 +336,10 @@ make
 make DESTDIR=%{buildroot} install
 install monodir %{buildroot}%{_bindir}
 
+# copy the mono.snk key into /etc/pki/mono
+mkdir -p %{buildroot}%{_sysconfdir}/pki/mono
+install -p -m0600 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
+
 %{__rm} %{buildroot}%{_libdir}/*.la
 %{__rm} %{buildroot}%{_libdir}/*.a
 
@@ -453,6 +462,7 @@ install monodir %{buildroot}%{_bindir}
 
 %files devel
 %defattr(-,root,root,-)
+%{_sysconfdir}/pki/mono/
 %{_bindir}/mono-api-*
 %{monodir}/?.0/mono-api-info*
 %{_bindir}/monodis
@@ -725,6 +735,11 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.6-2
+- generate and package mono.snk for packages without bundled keys to use
+- put mono.snk in /etc/pki/mono/
+- package /etc/pki/mono/* in mono-devel
+
 * Wed Sep 30 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
 - Bump to 2.6
 - Fix metadata makefiles patch



From rstrode at fedoraproject.org  Tue Dec  1 16:04:53 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue,  1 Dec 2009 16:04:53 +0000 (UTC)
Subject: rpms/gdm/F-12 dont-crash-with-invalid-utf8.patch, NONE, 1.1 gdm.spec,
	1.521, 1.522
Message-ID: <20091201160453.9EA7311C00DE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27466

Modified Files:
	gdm.spec 
Added Files:
	dont-crash-with-invalid-utf8.patch 
Log Message:
- Don't crash if /etc/passwd contains invalid utf8 (bug 539737)


dont-crash-with-invalid-utf8.patch:
 gdm-user.c |   27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

--- NEW FILE dont-crash-with-invalid-utf8.patch ---
>From 8b8521dd83637d4e83d67adddefba4f30c99715c Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar at redhat.com>
Date: Thu, 22 Oct 2009 15:20:49 +0900
Subject: [PATCH] Fix real names not to crash greeter. Bug #594270

Reviewed by Ray Strode
---
 gui/simple-greeter/gdm-user.c |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
index 79d8628..31ae696 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
@@ -415,7 +415,7 @@ void
 _gdm_user_update (GdmUser             *user,
                   const struct passwd *pwent)
 {
-        gchar *real_name;
+        gchar *real_name = NULL;
 
         g_return_if_fail (GDM_IS_USER (user));
         g_return_if_fail (pwent != NULL);
@@ -424,20 +424,28 @@ _gdm_user_update (GdmUser             *user,
 
         /* Display Name */
         if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') {
-                gchar *first_comma;
-                gchar *real_name_utf8;
+                gchar *first_comma = NULL;
+                gchar *valid_utf8_name = NULL;
 
-                real_name_utf8 = g_locale_to_utf8 (pwent->pw_gecos, -1, NULL, NULL, NULL);
+                if (g_utf8_validate (pwent->pw_gecos, -1, NULL)) {
+                        valid_utf8_name = pwent->pw_gecos;
+                        first_comma = g_utf8_strchr (valid_utf8_name, -1, ',');
+                } else {
+                        g_warning ("User %s has invalid UTF-8 in GECOS field. "
+                                   "It would be a good thing to check /etc/passwd.",
+                                   pwent->pw_name ? pwent->pw_name : "");
+                }
 
-                first_comma = strchr (real_name_utf8, ',');
                 if (first_comma) {
-                        real_name = g_strndup (real_name_utf8, first_comma - real_name_utf8);
-                        g_free (real_name_utf8);
+                        real_name = g_strndup (valid_utf8_name,
+                                                  (first_comma - valid_utf8_name));
+                } else if (valid_utf8_name) {
+                        real_name = g_strdup (valid_utf8_name);
                 } else {
-                        real_name = real_name_utf8;
+                        real_name = NULL;
                 }
 
-                if (real_name[0] == '\0') {
+                if (real_name && real_name[0] == '\0') {
                         g_free (real_name);
                         real_name = NULL;
                 }
-- 
1.6.5.2



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -p -r1.521 -r1.522
--- gdm.spec	6 Nov 2009 18:45:32 -0000	1.521
+++ gdm.spec	1 Dec 2009 16:04:53 -0000	1.522
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 24%{?dist}
+Release: 25%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -109,6 +109,8 @@ Patch25: fix-run-dir-permissions.patch
 Patch26: make-user-list-animation-smoother.patch
 Patch27: 0001-Don-t-show-lock-screen-option-if-locked-down.patch
 Patch28: hide-search-entry.patch
+# http://bugzilla.redhat.com/539737
+Patch29: dont-crash-with-invalid-utf8.patch
 
 Patch96: gdm-multistack.patch
 Patch100: gdm-2.28.1-eviction-notice.patch
@@ -165,6 +167,7 @@ The GDM fingerprint plugin provides func
 %patch26 -p1 -b .make-user-list-animation-smoother
 %patch27 -p1 -b .dont-show-lock-screen-if-locked-down
 %patch28 -p1 -b .hide-search-entry
+%patch29 -p1 -b .dont-crash-with-invalid-utf8
 
 %patch96 -p1 -b .multistack
 %patch100 -p1 -b .eviction-notice
@@ -423,6 +426,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Dec 01 2009 Ray Strode <rstrode at redhat.com> 2.28.1-25
+- Don't crash if /etc/passwd contains invalid utf8 (bug 539737)
+
 * Fri Nov 06 2009 Ray Strode <rstrode at redhat.com> 2.28.1-24
 - Fix login button after cancel on livecd
 



From than at fedoraproject.org  Tue Dec  1 16:05:36 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:05:36 +0000 (UTC)
Subject: rpms/kdenetwork/F-12 .cvsignore, 1.75, 1.76 kdenetwork.spec, 1.209, 
	1.210 sources, 1.81, 1.82 kdenetwork-4.3.4-webkitkde.patch, 1.1,
	NONE
Message-ID: <20091201160536.9B6B811C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27697

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-4.3.4-webkitkde.patch 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	10 Nov 2009 15:15:45 -0000	1.75
+++ .cvsignore	1 Dec 2009 16:05:36 -0000	1.76
@@ -1,2 +1,3 @@
 krdc-icons.tar.bz2
 kdenetwork-4.3.3.tar.bz2
+kdenetwork-4.3.4.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/kdenetwork.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- kdenetwork.spec	25 Nov 2009 11:53:54 -0000	1.209
+++ kdenetwork.spec	1 Dec 2009 16:05:36 -0000	1.210
@@ -2,8 +2,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.3
-Release: 6%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -17,7 +17,6 @@ Patch1: kdenetwork-4.2.98-kdrc-icon.patc
 Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
 
 # upstream patches (4.3 branch):
-Patch100: kdenetwork-4.3.4-webkitkde.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -199,6 +198,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Mon Nov 23 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.3-6
 - KPPP fix to read resolv.conf from /var/run/ppp (#540433)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	10 Nov 2009 15:15:46 -0000	1.81
+++ sources	1 Dec 2009 16:05:36 -0000	1.82
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-bb9a20da6e18a4952f7001b581aa9a1d  kdenetwork-4.3.3.tar.bz2
+71de592596681fc59c5bc0a679703fd2  kdenetwork-4.3.4.tar.bz2


--- kdenetwork-4.3.4-webkitkde.patch DELETED ---



From orion at fedoraproject.org  Tue Dec  1 16:06:18 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  1 Dec 2009 16:06:18 +0000 (UTC)
Subject: File lucene-2.4.1-src.tar.gz uploaded to lookaside cache by orion
Message-ID: <20091201160618.2B7C710F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lucene:

ad46595439240e10387fcbf7647705db  lucene-2.4.1-src.tar.gz



From than at fedoraproject.org  Tue Dec  1 16:06:46 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:06:46 +0000 (UTC)
Subject: File kdepim-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201160646.A5C9810F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdepim:

a4f32a268802be8eb852d1de00cbd2f6  kdepim-4.3.4.tar.bz2



From orion at fedoraproject.org  Tue Dec  1 16:07:27 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  1 Dec 2009 16:07:27 +0000 (UTC)
Subject: rpms/lucene/devel lucene-2.4.1-Xmax.patch, NONE,
	1.1 lucene-2.4.1-db-javadoc.patch, NONE,
	1.1 lucene-2.4.1-fixmanifests.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 lucene.spec, 1.42, 1.43 sources, 1.5,
	1.6 lucene-2.3.0-db-javadoc.patch, 1.1,
	NONE lucene-2.3.1-fixmanifests.patch, 1.1, NONE
Message-ID: <20091201160727.47D0211C00DE@cvs1.fedora.phx.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore lucene.spec sources 
Added Files:
	lucene-2.4.1-Xmax.patch lucene-2.4.1-db-javadoc.patch 
	lucene-2.4.1-fixmanifests.patch 
Removed Files:
	lucene-2.3.0-db-javadoc.patch lucene-2.3.1-fixmanifests.patch 
Log Message:
* Tue Dec  1 2009 Orion Poplawski <orion at cora.nwra.com> - 0:2.4.1-1
- Update to 2.4.1


lucene-2.4.1-Xmax.patch:
 common-build.xml |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE lucene-2.4.1-Xmax.patch ---
--- lucene-2.4.1/common-build.xml.Xmax	2009-10-16 11:40:25.093879193 -0600
+++ lucene-2.4.1/common-build.xml	2009-10-16 11:44:34.401817699 -0600
@@ -480,8 +480,6 @@
         source="${javac.source}"
         target="${javac.target}">
         <nested/>
-        <compilerarg line="-Xmaxwarns 10000000"/>
-        <compilerarg line="-Xmaxerrs 10000000"/>
       </javac>
     </sequential>
   </macrodef>

lucene-2.4.1-db-javadoc.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lucene-2.4.1-db-javadoc.patch ---
--- lucene-2.4.1/build.xml.db-javadoc	2009-03-02 10:11:17.000000000 -0700
+++ lucene-2.4.1/build.xml	2009-10-16 11:49:42.745817428 -0600
@@ -239,8 +239,8 @@
           <packageset dir="contrib/analyzers/src/java"/>
           <packageset dir="contrib/ant/src/java"/>
           <packageset dir="contrib/benchmark/src/java"/>
-          <packageset dir="contrib/db/bdb-je/src/java"/>
-          <packageset dir="contrib/db/bdb/src/java"/>
+          <!---<packageset dir="contrib/db/bdb-je/src/java"/> -->
+          <!---<packageset dir="contrib/db/bdb/src/java"/> -->
           <packageset dir="contrib/highlighter/src/java"/>
           <packageset dir="contrib/instantiated/src/java"/>
           <packageset dir="contrib/lucli/src/java"/>

lucene-2.4.1-fixmanifests.patch:
 common-build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lucene-2.4.1-fixmanifests.patch ---
--- lucene-2.4.1/common-build.xml.fixmanifests	2009-03-02 10:11:17.000000000 -0700
+++ lucene-2.4.1/common-build.xml	2009-10-16 11:39:18.387815444 -0600
@@ -281,7 +281,7 @@
 		<attribute name="Implementation-Title" value="org.apache.lucene"/>
 		<!-- impl version can be any string -->
 		<attribute name="Implementation-Version"
-		           value="${version} ${svnversion} - ${DSTAMP} ${TSTAMP}"/>
+		           value="${version} - ${DSTAMP} ${TSTAMP}"/>
 		<attribute name="Implementation-Vendor"
 		           value="The Apache Software Foundation"/>
 		<attribute name="X-Compile-Source-JDK" 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 May 2008 08:21:13 -0000	1.5
+++ .cvsignore	1 Dec 2009 16:07:26 -0000	1.6
@@ -1 +1 @@
-lucene-2.3.1-src.tar.gz
+lucene-2.4.1-src.tar.gz


Index: lucene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- lucene.spec	25 Jul 2009 11:26:19 -0000	1.42
+++ lucene.spec	1 Dec 2009 16:07:26 -0000	1.43
@@ -35,17 +35,19 @@
 
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
-Version:        2.3.1
-Release:        5.5%{?dist}
+Version:        2.4.1
+Release:        1%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
 Group:          Internet/WWW/Indexing/Search
-Source0:        http://www.apache.org/dist/lucene/java/%{name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/lucene/java/%{name}-%{version}-src.tar.gz
 Source1:	lucene-1.9-OSGi-MANIFEST.MF
 Source2:	lucene-1.9-analysis-OSGi-MANIFEST.MF
-Patch1:         lucene-2.3.0-db-javadoc.patch
-Patch2:         %{name}-%{version}-fixmanifests.patch
+Patch1:         lucene-2.4.1-db-javadoc.patch
+Patch2:         %{name}-2.4.1-fixmanifests.patch
+# Remove -Xmaxwarns, -Xmaxerrs that gcj does not support
+Patch3:         %{name}-2.4.1-Xmax.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
@@ -116,6 +118,7 @@ find . -name "*.jar" -exec rm -f {} \;
 
 %patch1 -p1 -b .db-javadoc
 %patch2 -p1 -b .fixmanifests
+%patch3 -p1 -b .Xmax
 
 %build
 mkdir -p docs
@@ -243,7 +246,6 @@ fi
 %{_libdir}/gcj/%{name}/lucene-ant-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-highlighter-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-lucli-%{version}.jar.*
-%{_libdir}/gcj/%{name}/lucene-memory-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-misc-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-queries-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-snowball-%{version}.jar.*
@@ -272,6 +274,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Orion Poplawski <orion at cora.nwra.com> - 0:2.4.1-1
+- Update to 2.4.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.1-5.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 May 2008 08:21:13 -0000	1.5
+++ sources	1 Dec 2009 16:07:26 -0000	1.6
@@ -1 +1 @@
-ad034c84f85dbbf383b26d85fe697bbf  lucene-2.3.1-src.tar.gz
+ad46595439240e10387fcbf7647705db  lucene-2.4.1-src.tar.gz


--- lucene-2.3.0-db-javadoc.patch DELETED ---


--- lucene-2.3.1-fixmanifests.patch DELETED ---



From limb at fedoraproject.org  Tue Dec  1 16:07:47 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  1 Dec 2009 16:07:47 +0000 (UTC)
Subject: File cck-6.x-2.6.tar.gz uploaded to lookaside cache by limb
Message-ID: <20091201160747.2FBC310F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for drupal-cck:

3e719a786f7fed2c6e7bd341a508ca60  cck-6.x-2.6.tar.gz



From than at fedoraproject.org  Tue Dec  1 16:07:46 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:07:46 +0000 (UTC)
Subject: rpms/kdepim/F-12 .cvsignore, 1.71, 1.72 kdepim.spec, 1.243,
	1.244 sources, 1.78, 1.79
Message-ID: <20091201160746.C10A311C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28225

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-12/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	10 Nov 2009 15:16:54 -0000	1.71
+++ .cvsignore	1 Dec 2009 16:07:46 -0000	1.72
@@ -1 +1,2 @@
 kdepim-4.3.3.tar.bz2
+kdepim-4.3.4.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-12/kdepim.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- kdepim.spec	27 Nov 2009 12:52:03 -0000	1.243
+++ kdepim.spec	1 Dec 2009 16:07:46 -0000	1.244
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.3
-Release: 3%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -217,6 +217,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Fri Nov 27 2009 Than Ngo <than at redhat.com> - 4.3.3-3
 - fix build issue on s390
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-12/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	10 Nov 2009 15:16:54 -0000	1.78
+++ sources	1 Dec 2009 16:07:46 -0000	1.79
@@ -1 +1 @@
-3a3c01abd6571cc337fa22d1c3601fe7  kdepim-4.3.3.tar.bz2
+a4f32a268802be8eb852d1de00cbd2f6  kdepim-4.3.4.tar.bz2



From mtasaka at fedoraproject.org  Tue Dec  1 16:07:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  1 Dec 2009 16:07:53 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel ruby-RMagick.spec,1.36,1.37
Message-ID: <20091201160753.BFBEB11C00DE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28403

Modified Files:
	ruby-RMagick.spec 
Log Message:
* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-2
- Set ImageMagick dependency correctly again



Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ruby-RMagick.spec	30 Oct 2009 19:44:49 -0000	1.36
+++ ruby-RMagick.spec	1 Dec 2009 16:07:53 -0000	1.37
@@ -15,7 +15,7 @@ Requires:		ImageMagick = %2\
 
 %define		mainver		2.12.2
 %undefine		betaver		
-%define		fedorarel	1
+%define		fedorarel	2
 
 
 Name:		ruby-%{modname}
@@ -39,6 +39,7 @@ BuildRequires:	%{_bindir}/wmf2eps
 BuildRequires:	ImageMagick-devel
 Requires:	ImageMagick
 
+%setIMver 13 6.5.4.7
 %setIMver 12 6.5.4.7
 %setIMver 11 6.5.1.2
 %setIMver 10 6.4.0.10
@@ -106,6 +107,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-2
+- Set ImageMagick dependency correctly again
+
 * Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
 - 2.12.2
 



From limb at fedoraproject.org  Tue Dec  1 16:08:19 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  1 Dec 2009 16:08:19 +0000 (UTC)
Subject: rpms/drupal-cck/devel .cvsignore, 1.5, 1.6 drupal-cck.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091201160819.B844311C00DE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-cck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28525

Modified Files:
	.cvsignore drupal-cck.spec sources 
Log Message:
New upstream, BZ 541439.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-cck/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Mar 2009 14:10:53 -0000	1.5
+++ .cvsignore	1 Dec 2009 16:08:19 -0000	1.6
@@ -1 +1 @@
-cck-6.x-2.2.tar.gz
+cck-6.x-2.6.tar.gz


Index: drupal-cck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-cck/devel/drupal-cck.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drupal-cck.spec	24 Jul 2009 20:34:05 -0000	1.7
+++ drupal-cck.spec	1 Dec 2009 16:08:19 -0000	1.8
@@ -1,13 +1,13 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-cck
-Version:  6.x.2.2
-Release:  2%{?dist}
+Version:  6.x.2.6
+Release:  1%{?dist}
 Summary:  Allows you create and customize fields using a web browser
 
 Group: Applications/Publishing
 License: GPLv2
 URL: http://drupal.org/project/cck
-Source0: http://ftp.drupal.org/files/projects/cck-6.x-2.2.tar.gz
+Source0: http://ftp.drupal.org/files/projects/cck-6.x-2.6.tar.gz
 Source1: drupal-cck-fedora-README.txt
 
 BuildArch: noarch
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{drupaldir}/modules/cck
 
 %changelog
+* Tue Dec 01 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.6-1
+- New upstream, BZ 541439.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-cck/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Mar 2009 14:10:53 -0000	1.5
+++ sources	1 Dec 2009 16:08:19 -0000	1.6
@@ -1 +1 @@
-0fe5f8e6d1292fcfe98530a3dea0a1a1  cck-6.x-2.2.tar.gz
+3e719a786f7fed2c6e7bd341a508ca60  cck-6.x-2.6.tar.gz



From cwickert at fedoraproject.org  Tue Dec  1 16:10:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  1 Dec 2009 16:10:05 +0000 (UTC)
Subject: rpms/parole/devel parole.spec,1.8,1.9
Message-ID: <20091201161005.514AD11C0396@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	parole.spec 
Log Message:
make plugin require mozilla-filesystem


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/parole.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- parole.spec	1 Dec 2009 16:01:17 -0000	1.8
+++ parole.spec	1 Dec 2009 16:10:05 -0000	1.9
@@ -45,6 +45,7 @@ following features:
 %package        mozplugin
 Summary:        Browser plugin for for %{name}
 Requires:       %{name} = %{version}-%{release}
+Requires:       mozilla-filesystem
 
 %description    mozplugin
 Parole is a modern simple media player based on the GStreamer framework and 
@@ -139,6 +140,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %changelog
 * Tue Dec 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.99-1
 - Update to 0.1.99 and drop all patches
+- Make the plugin require mozilla-filesystem
 
 * Sun Nov 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.98-1
 - Update to 0.1.98



From limb at fedoraproject.org  Tue Dec  1 16:11:11 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  1 Dec 2009 16:11:11 +0000 (UTC)
Subject: rpms/drupal-views/F-12 drupal-views.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <20091201161111.EABE611C00DE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-views/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29349

Modified Files:
	drupal-views.spec sources 
Log Message:
New upstream, BZ 541440.



Index: drupal-views.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-views/F-12/drupal-views.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drupal-views.spec	24 Jul 2009 20:34:48 -0000	1.7
+++ drupal-views.spec	1 Dec 2009 16:11:11 -0000	1.8
@@ -1,13 +1,13 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-views
-Version:  6.x.2.6
-Release:  2%{?dist}
+Version:  6.x.2.7
+Release:  1%{?dist}
 Summary: Provides a method for site designers to control content presentation
 
 Group: Applications/Publishing
 License: GPLv2
 URL: http://drupal.org/project/views
-Source0: http://ftp.drupal.org/files/projects/views-6.x-2.6.tar.gz
+Source0: http://ftp.drupal.org/files/projects/views-6.x-2.7.tar.gz
 Source1: drupal-views-fedora-README.txt
 
 BuildArch: noarch
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/modules/views/drupal-views-fedora-README.txt
 
 %changelog
+* Tue Dec 01 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.7-1
+- New upstream, BZ 541440.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-views/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jun 2009 13:01:02 -0000	1.5
+++ sources	1 Dec 2009 16:11:11 -0000	1.6
@@ -1 +1 @@
-a39827a5430373ab8508f2773b0bc6ea  views-6.x-2.6.tar.gz
+993a4ce82f5eb6f3f2166de7aa5edbce  views-6.x-2.7.tar.gz



From than at fedoraproject.org  Tue Dec  1 16:11:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:11:30 +0000 (UTC)
Subject: File kdepimlibs-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201161130.0F9CD10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdepimlibs:

c3aa4a290c3e3b718efc41a60442b57c  kdepimlibs-4.3.4.tar.bz2



From limb at fedoraproject.org  Tue Dec  1 16:13:28 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  1 Dec 2009 16:13:28 +0000 (UTC)
Subject: rpms/drupal-cck/F-12 drupal-cck.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <20091201161329.016A111C00DE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-cck/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30525

Modified Files:
	drupal-cck.spec sources 
Log Message:
New upstream, BZ 541439.



Index: drupal-cck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-cck/F-12/drupal-cck.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drupal-cck.spec	24 Jul 2009 20:34:05 -0000	1.7
+++ drupal-cck.spec	1 Dec 2009 16:13:28 -0000	1.8
@@ -1,13 +1,13 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-cck
-Version:  6.x.2.2
-Release:  2%{?dist}
+Version:  6.x.2.6
+Release:  1%{?dist}
 Summary:  Allows you create and customize fields using a web browser
 
 Group: Applications/Publishing
 License: GPLv2
 URL: http://drupal.org/project/cck
-Source0: http://ftp.drupal.org/files/projects/cck-6.x-2.2.tar.gz
+Source0: http://ftp.drupal.org/files/projects/cck-6.x-2.6.tar.gz
 Source1: drupal-cck-fedora-README.txt
 
 BuildArch: noarch
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{drupaldir}/modules/cck
 
 %changelog
+* Tue Dec 01 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.2.6-1
+- New upstream, BZ 541439.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-cck/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Mar 2009 14:10:53 -0000	1.5
+++ sources	1 Dec 2009 16:13:28 -0000	1.6
@@ -1 +1 @@
-0fe5f8e6d1292fcfe98530a3dea0a1a1  cck-6.x-2.2.tar.gz
+3e719a786f7fed2c6e7bd341a508ca60  cck-6.x-2.6.tar.gz



From dwalsh at fedoraproject.org  Tue Dec  1 16:14:39 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 16:14:39 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.142,
	1.143 selinux-policy.spec, 1.972, 1.973
Message-ID: <20091201161439.6368711C00DE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30807

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-52
- Major fixup of ntop policy
- Fix label on /usr/lib/xorg/modules/extensions/libglx.so.195.22
- Allow xdm to signal session bus
- Allow modemmanager to use generic ptys, and sys_tty_config capability
- Allow abrt_helper chown access, dontaudit leaks
- Allow logwatch to list cifs and nfs file systems
- Allow kismet to read network state
- Allow cupsd_config_t to connecto unconfined unix_stream
- Fix avahi labeling and allow avahi to manage /etc/resolv.conf
- Allow sshd to read usr_t files
- Allow login programs to manage pcscd_var_run_t files
- Allow tor to read usr_t files


policy-F12.patch:
 Makefile                                                     |    2 
 policy/flask/access_vectors                                  |    1 
 policy/global_tunables                                       |   24 
 policy/mcs                                                   |   10 
 policy/modules/admin/alsa.te                                 |    2 
 policy/modules/admin/anaconda.te                             |    3 
 policy/modules/admin/brctl.te                                |    2 
 policy/modules/admin/certwatch.te                            |    2 
 policy/modules/admin/consoletype.te                          |    1 
 policy/modules/admin/dmesg.fc                                |    2 
 policy/modules/admin/dmesg.te                                |   10 
 policy/modules/admin/firstboot.te                            |    6 
 policy/modules/admin/kismet.fc                               |    2 
 policy/modules/admin/kismet.te                               |   13 
 policy/modules/admin/logrotate.te                            |   21 
 policy/modules/admin/logwatch.te                             |    8 
 policy/modules/admin/mrtg.te                                 |    1 
 policy/modules/admin/netutils.te                             |    2 
 policy/modules/admin/ntop.fc                                 |    5 
 policy/modules/admin/ntop.if                                 |  158 +
 policy/modules/admin/ntop.te                                 |   40 
 policy/modules/admin/portage.te                              |    2 
 policy/modules/admin/prelink.fc                              |    1 
 policy/modules/admin/prelink.if                              |    4 
 policy/modules/admin/prelink.te                              |   75 
 policy/modules/admin/readahead.te                            |    1 
 policy/modules/admin/rpm.fc                                  |   20 
 policy/modules/admin/rpm.if                                  |  344 ++
 policy/modules/admin/rpm.te                                  |   98 
 policy/modules/admin/shorewall.fc                            |    6 
 policy/modules/admin/shorewall.if                            |   40 
 policy/modules/admin/shorewall.te                            |    9 
 policy/modules/admin/smoltclient.fc                          |    4 
 policy/modules/admin/smoltclient.if                          |    1 
 policy/modules/admin/smoltclient.te                          |   66 
 policy/modules/admin/sudo.if                                 |   13 
 policy/modules/admin/tmpreaper.te                            |    9 
 policy/modules/admin/tzdata.te                               |    2 
 policy/modules/admin/usermanage.if                           |   11 
 policy/modules/admin/usermanage.te                           |   35 
 policy/modules/admin/vbetool.te                              |   14 
 policy/modules/admin/vpn.te                                  |    4 
 policy/modules/apps/calamaris.te                             |    7 
 policy/modules/apps/chrome.fc                                |    2 
 policy/modules/apps/chrome.if                                |   86 
 policy/modules/apps/chrome.te                                |   78 
 policy/modules/apps/cpufreqselector.te                       |    2 
 policy/modules/apps/execmem.fc                               |   42 
 policy/modules/apps/execmem.if                               |   80 
 policy/modules/apps/execmem.te                               |   11 
 policy/modules/apps/firewallgui.fc                           |    3 
 policy/modules/apps/firewallgui.if                           |    3 
 policy/modules/apps/firewallgui.te                           |   64 
 policy/modules/apps/gitosis.if                               |   45 
 policy/modules/apps/gnome.fc                                 |   12 
 policy/modules/apps/gnome.if                                 |  170 +
 policy/modules/apps/gnome.te                                 |   99 
 policy/modules/apps/gpg.te                                   |   20 
 policy/modules/apps/java.fc                                  |   24 
 policy/modules/apps/java.if                                  |  114 
 policy/modules/apps/java.te                                  |   19 
 policy/modules/apps/kdumpgui.fc                              |    2 
 policy/modules/apps/kdumpgui.if                              |    2 
 policy/modules/apps/kdumpgui.te                              |   67 
 policy/modules/apps/livecd.fc                                |    2 
 policy/modules/apps/livecd.if                                |   52 
 policy/modules/apps/livecd.te                                |   27 
 policy/modules/apps/loadkeys.te                              |    6 
 policy/modules/apps/mono.fc                                  |    2 
 policy/modules/apps/mono.if                                  |  101 
 policy/modules/apps/mono.te                                  |    9 
 policy/modules/apps/mozilla.fc                               |    1 
 policy/modules/apps/mozilla.if                               |   68 
 policy/modules/apps/mozilla.te                               |   23 
 policy/modules/apps/nsplugin.fc                              |   11 
 policy/modules/apps/nsplugin.if                              |  323 ++
 policy/modules/apps/nsplugin.te                              |  295 +
 policy/modules/apps/openoffice.fc                            |    3 
 policy/modules/apps/openoffice.if                            |   93 
 policy/modules/apps/openoffice.te                            |   11 
 policy/modules/apps/podsleuth.te                             |    3 
 policy/modules/apps/ptchown.if                               |   25 
 policy/modules/apps/pulseaudio.if                            |    2 
 policy/modules/apps/pulseaudio.te                            |   13 
 policy/modules/apps/qemu.fc                                  |    4 
 policy/modules/apps/qemu.if                                  |  189 +
 policy/modules/apps/qemu.te                                  |   84 
 policy/modules/apps/sambagui.fc                              |    1 
 policy/modules/apps/sambagui.if                              |    2 
 policy/modules/apps/sambagui.te                              |   60 
 policy/modules/apps/sandbox.fc                               |    1 
 policy/modules/apps/sandbox.if                               |  188 +
 policy/modules/apps/sandbox.te                               |  331 ++
 policy/modules/apps/screen.if                                |    7 
 policy/modules/apps/sectoolm.fc                              |    6 
 policy/modules/apps/sectoolm.if                              |    3 
 policy/modules/apps/sectoolm.te                              |  120 
 policy/modules/apps/selinux-policy-3.6.32-41.fc12.noarch.rpm |binary
 policy/modules/apps/seunshare.fc                             |    2 
 policy/modules/apps/seunshare.if                             |   81 
 policy/modules/apps/seunshare.te                             |   43 
 policy/modules/apps/vmware.te                                |    1 
 policy/modules/apps/wine.fc                                  |   24 
 policy/modules/apps/wine.if                                  |  115 
 policy/modules/apps/wine.te                                  |   34 
 policy/modules/kernel/corecommands.fc                        |   42 
 policy/modules/kernel/corecommands.if                        |   21 
 policy/modules/kernel/corecommands.pp                        |binary
 policy/modules/kernel/corenetwork.te.in                      |   46 
 policy/modules/kernel/devices.fc                             |   13 
 policy/modules/kernel/devices.if                             |  273 +
 policy/modules/kernel/devices.te                             |   25 
 policy/modules/kernel/domain.if                              |  170 -
 policy/modules/kernel/domain.te                              |   89 
 policy/modules/kernel/files.fc                               |    3 
 policy/modules/kernel/files.if                               |  379 ++
 policy/modules/kernel/files.te                               |    6 
 policy/modules/kernel/filesystem.fc                          |    2 
 policy/modules/kernel/filesystem.if                          |  256 +
 policy/modules/kernel/filesystem.te                          |   16 
 policy/modules/kernel/kernel.if                              |   98 
 policy/modules/kernel/kernel.te                              |   32 
 policy/modules/kernel/selinux.if                             |   25 
 policy/modules/kernel/storage.fc                             |    2 
 policy/modules/kernel/storage.if                             |    3 
 policy/modules/kernel/terminal.fc                            |    1 
 policy/modules/kernel/terminal.if                            |   44 
 policy/modules/kernel/terminal.te                            |    1 
 policy/modules/roles/guest.te                                |    8 
 policy/modules/roles/staff.te                                |  126 
 policy/modules/roles/sysadm.te                               |  126 
 policy/modules/roles/unconfineduser.fc                       |    8 
 policy/modules/roles/unconfineduser.if                       |  667 ++++
 policy/modules/roles/unconfineduser.te                       |  448 ++
 policy/modules/roles/unprivuser.te                           |  127 
 policy/modules/roles/xguest.te                               |   74 
 policy/modules/services/abrt.fc                              |    6 
 policy/modules/services/abrt.if                              |  102 
 policy/modules/services/abrt.te                              |   99 
 policy/modules/services/afs.fc                               |    1 
 policy/modules/services/afs.te                               |    3 
 policy/modules/services/aisexec.fc                           |   12 
 policy/modules/services/aisexec.if                           |  106 
 policy/modules/services/aisexec.te                           |  112 
 policy/modules/services/amavis.te                            |    2 
 policy/modules/services/apache.fc                            |   50 
 policy/modules/services/apache.if                            |  410 +-
 policy/modules/services/apache.te                            |  452 ++
 policy/modules/services/apm.te                               |    6 
 policy/modules/services/arpwatch.te                          |    2 
 policy/modules/services/asterisk.if                          |   21 
 policy/modules/services/asterisk.te                          |   20 
 policy/modules/services/automount.te                         |    2 
 policy/modules/services/avahi.te                             |   10 
 policy/modules/services/bind.if                              |   40 
 policy/modules/services/bitlbee.te                           |    2 
 policy/modules/services/bluetooth.if                         |   21 
 policy/modules/services/bluetooth.te                         |   11 
 policy/modules/services/ccs.fc                               |    8 
 policy/modules/services/ccs.te                               |   33 
 policy/modules/services/certmaster.te                        |    2 
 policy/modules/services/chronyd.fc                           |   11 
 policy/modules/services/chronyd.if                           |  105 
 policy/modules/services/chronyd.te                           |   67 
 policy/modules/services/clamav.te                            |   18 
 policy/modules/services/clogd.fc                             |    4 
 policy/modules/services/clogd.if                             |   98 
 policy/modules/services/clogd.te                             |   62 
 policy/modules/services/cobbler.fc                           |    2 
 policy/modules/services/cobbler.if                           |   44 
 policy/modules/services/cobbler.te                           |    5 
 policy/modules/services/consolekit.fc                        |    3 
 policy/modules/services/consolekit.if                        |   39 
 policy/modules/services/consolekit.te                        |   23 
 policy/modules/services/corosync.fc                          |   13 
 policy/modules/services/corosync.if                          |  108 
 policy/modules/services/corosync.te                          |  109 
 policy/modules/services/courier.if                           |   18 
 policy/modules/services/courier.te                           |    1 
 policy/modules/services/cron.fc                              |    6 
 policy/modules/services/cron.if                              |   74 
 policy/modules/services/cron.te                              |   82 
 policy/modules/services/cups.fc                              |   13 
 policy/modules/services/cups.te                              |   49 
 policy/modules/services/cvs.te                               |    1 
 policy/modules/services/cyrus.te                             |    1 
 policy/modules/services/dbus.if                              |   49 
 policy/modules/services/dbus.te                              |   25 
 policy/modules/services/dcc.te                               |    8 
 policy/modules/services/ddclient.if                          |   25 
 policy/modules/services/devicekit.fc                         |    2 
 policy/modules/services/devicekit.if                         |   22 
 policy/modules/services/devicekit.te                         |   60 
 policy/modules/services/dnsmasq.te                           |   12 
 policy/modules/services/dovecot.te                           |   24 
 policy/modules/services/exim.te                              |    5 
 policy/modules/services/fail2ban.te                          |    2 
 policy/modules/services/fetchmail.te                         |    3 
 policy/modules/services/fprintd.te                           |    4 
 policy/modules/services/ftp.te                               |   60 
 policy/modules/services/git.fc                               |    8 
 policy/modules/services/git.if                               |  286 +
 policy/modules/services/git.te                               |  166 +
 policy/modules/services/gpm.te                               |    3 
 policy/modules/services/gpsd.fc                              |    5 
 policy/modules/services/gpsd.if                              |   27 
 policy/modules/services/gpsd.te                              |   14 
 policy/modules/services/hal.fc                               |    1 
 policy/modules/services/hal.if                               |   18 
 policy/modules/services/hal.te                               |   49 
 policy/modules/services/howl.te                              |    2 
 policy/modules/services/inetd.fc                             |    2 
 policy/modules/services/inetd.te                             |    4 
 policy/modules/services/irqbalance.te                        |    4 
 policy/modules/services/kerberos.if                          |    6 
 policy/modules/services/kerberos.te                          |   16 
 policy/modules/services/kerneloops.te                        |    2 
 policy/modules/services/ktalk.te                             |    1 
 policy/modules/services/lircd.fc                             |    2 
 policy/modules/services/lircd.if                             |    9 
 policy/modules/services/lircd.te                             |   23 
 policy/modules/services/mailman.te                           |    4 
 policy/modules/services/memcached.te                         |    2 
 policy/modules/services/milter.if                            |    2 
 policy/modules/services/modemmanager.te                      |    5 
 policy/modules/services/mta.fc                               |    2 
 policy/modules/services/mta.if                               |   13 
 policy/modules/services/mta.te                               |   36 
 policy/modules/services/munin.fc                             |    3 
 policy/modules/services/munin.te                             |    3 
 policy/modules/services/mysql.te                             |    9 
 policy/modules/services/nagios.fc                            |   20 
 policy/modules/services/nagios.if                            |   89 
 policy/modules/services/nagios.te                            |  106 
 policy/modules/services/networkmanager.fc                    |   15 
 policy/modules/services/networkmanager.if                    |   65 
 policy/modules/services/networkmanager.te                    |  117 
 policy/modules/services/nis.fc                               |    5 
 policy/modules/services/nis.if                               |   87 
 policy/modules/services/nis.te                               |   13 
 policy/modules/services/nscd.if                              |   18 
 policy/modules/services/nscd.te                              |   21 
 policy/modules/services/nslcd.if                             |    8 
 policy/modules/services/ntop.te                              |   14 
 policy/modules/services/ntp.if                               |   46 
 policy/modules/services/ntp.te                               |    8 
 policy/modules/services/nut.fc                               |   15 
 policy/modules/services/nut.if                               |   82 
 policy/modules/services/nut.te                               |  138 
 policy/modules/services/nx.fc                                |    7 
 policy/modules/services/nx.if                                |   67 
 policy/modules/services/nx.te                                |   13 
 policy/modules/services/oddjob.if                            |    1 
 policy/modules/services/openvpn.te                           |    2 
 policy/modules/services/pcscd.if                             |   22 
 policy/modules/services/pcscd.te                             |    4 
 policy/modules/services/pegasus.te                           |   28 
 policy/modules/services/plymouth.fc                          |    5 
 policy/modules/services/plymouth.if                          |  286 +
 policy/modules/services/plymouth.te                          |  101 
 policy/modules/services/policykit.fc                         |    5 
 policy/modules/services/policykit.if                         |   48 
 policy/modules/services/policykit.te                         |   64 
 policy/modules/services/portreserve.te                       |    1 
 policy/modules/services/postfix.fc                           |    2 
 policy/modules/services/postfix.if                           |  150 
 policy/modules/services/postfix.te                           |  142 
 policy/modules/services/postgresql.fc                        |   16 
 policy/modules/services/postgresql.if                        |   43 
 policy/modules/services/postgresql.te                        |    9 
 policy/modules/services/ppp.if                               |    6 
 policy/modules/services/ppp.te                               |   16 
 policy/modules/services/prelude.te                           |    3 
 policy/modules/services/privoxy.fc                           |    3 
 policy/modules/services/privoxy.te                           |    3 
 policy/modules/services/procmail.te                          |   12 
 policy/modules/services/pyzor.fc                             |    4 
 policy/modules/services/pyzor.if                             |   47 
 policy/modules/services/pyzor.te                             |   37 
 policy/modules/services/radvd.te                             |    1 
 policy/modules/services/razor.fc                             |    1 
 policy/modules/services/razor.if                             |   42 
 policy/modules/services/razor.te                             |   32 
 policy/modules/services/rgmanager.fc                         |    8 
 policy/modules/services/rgmanager.if                         |   59 
 policy/modules/services/rgmanager.te                         |   83 
 policy/modules/services/rhcs.fc                              |   22 
 policy/modules/services/rhcs.if                              |  348 ++
 policy/modules/services/rhcs.te                              |  394 ++
 policy/modules/services/ricci.te                             |   30 
 policy/modules/services/rpc.if                               |    7 
 policy/modules/services/rpc.te                               |   17 
 policy/modules/services/rpcbind.if                           |   20 
 policy/modules/services/rpcbind.te                           |    1 
 policy/modules/services/rsync.te                             |   23 
 policy/modules/services/rtkit.if                             |   20 
 policy/modules/services/rtkit.te                             |    4 
 policy/modules/services/samba.fc                             |    4 
 policy/modules/services/samba.if                             |  104 
 policy/modules/services/samba.te                             |   89 
 policy/modules/services/sasl.te                              |   15 
 policy/modules/services/sendmail.if                          |  137 
 policy/modules/services/sendmail.te                          |   87 
 policy/modules/services/setroubleshoot.fc                    |    2 
 policy/modules/services/setroubleshoot.if                    |  123 
 policy/modules/services/setroubleshoot.te                    |   82 
 policy/modules/services/smartmon.te                          |   15 
 policy/modules/services/snmp.if                              |   38 
 policy/modules/services/snmp.te                              |    4 
 policy/modules/services/snort.te                             |    1 
 policy/modules/services/spamassassin.fc                      |   15 
 policy/modules/services/spamassassin.if                      |   89 
 policy/modules/services/spamassassin.te                      |  139 
 policy/modules/services/squid.te                             |    9 
 policy/modules/services/ssh.fc                               |    2 
 policy/modules/services/ssh.if                               |  207 +
 policy/modules/services/ssh.te                               |  155 -
 policy/modules/services/sssd.fc                              |    5 
 policy/modules/services/sssd.if                              |   62 
 policy/modules/services/sssd.te                              |   14 
 policy/modules/services/sysstat.te                           |    5 
 policy/modules/services/tftp.fc                              |    2 
 policy/modules/services/tor.te                               |    1 
 policy/modules/services/tuned.fc                             |    6 
 policy/modules/services/tuned.if                             |  140 
 policy/modules/services/tuned.te                             |   58 
 policy/modules/services/uucp.te                              |   10 
 policy/modules/services/virt.fc                              |   14 
 policy/modules/services/virt.if                              |  210 +
 policy/modules/services/virt.te                              |  276 +
 policy/modules/services/w3c.te                               |    7 
 policy/modules/services/xserver.fc                           |   45 
 policy/modules/services/xserver.if                           |  633 +++-
 policy/modules/services/xserver.te                           |  363 +-
 policy/modules/system/application.if                         |   20 
 policy/modules/system/application.te                         |   12 
 policy/modules/system/authlogin.fc                           |    9 
 policy/modules/system/authlogin.if                           |  209 +
 policy/modules/system/authlogin.te                           |   10 
 policy/modules/system/fstools.fc                             |    3 
 policy/modules/system/fstools.te                             |    7 
 policy/modules/system/init.fc                                |    7 
 policy/modules/system/init.if                                |  163 +
 policy/modules/system/init.te                                |  290 +
 policy/modules/system/ipsec.fc                               |    7 
 policy/modules/system/ipsec.if                               |   25 
 policy/modules/system/ipsec.te                               |   66 
 policy/modules/system/iptables.fc                            |   17 
 policy/modules/system/iptables.if                            |   97 
 policy/modules/system/iptables.te                            |   20 
 policy/modules/system/iscsi.if                               |   40 
 policy/modules/system/iscsi.te                               |    6 
 policy/modules/system/kdump.te                               |    5 
 policy/modules/system/libraries.fc                           |  182 -
 policy/modules/system/libraries.if                           |    5 
 policy/modules/system/libraries.te                           |   18 
 policy/modules/system/locallogin.te                          |   30 
 policy/modules/system/logging.fc                             |   12 
 policy/modules/system/logging.if                             |   18 
 policy/modules/system/logging.te                             |   38 
 policy/modules/system/lvm.if                                 |   39 
 policy/modules/system/lvm.te                                 |   31 
 policy/modules/system/miscfiles.fc                           |    1 
 policy/modules/system/miscfiles.if                           |   60 
 policy/modules/system/miscfiles.te                           |    2 
 policy/modules/system/modutils.fc                            |    1 
 policy/modules/system/modutils.if                            |   46 
 policy/modules/system/modutils.te                            |   56 
 policy/modules/system/mount.fc                               |    7 
 policy/modules/system/mount.if                               |    2 
 policy/modules/system/mount.te                               |   83 
 policy/modules/system/raid.fc                                |    2 
 policy/modules/system/raid.te                                |    8 
 policy/modules/system/selinuxutil.fc                         |   17 
 policy/modules/system/selinuxutil.if                         |  309 ++
 policy/modules/system/selinuxutil.te                         |  229 -
 policy/modules/system/setrans.if                             |   20 
 policy/modules/system/sysnetwork.fc                          |    9 
 policy/modules/system/sysnetwork.if                          |  117 
 policy/modules/system/sysnetwork.te                          |   77 
 policy/modules/system/udev.fc                                |    3 
 policy/modules/system/udev.if                                |   39 
 policy/modules/system/udev.te                                |   39 
 policy/modules/system/unconfined.fc                          |   15 
 policy/modules/system/unconfined.if                          |  443 --
 policy/modules/system/unconfined.te                          |  224 -
 policy/modules/system/userdomain.fc                          |    7 
 policy/modules/system/userdomain.if                          | 1665 ++++++++---
 policy/modules/system/userdomain.te                          |   51 
 policy/modules/system/xen.fc                                 |    6 
 policy/modules/system/xen.if                                 |   28 
 policy/modules/system/xen.te                                 |  137 
 policy/support/obj_perm_sets.spt                             |   28 
 policy/users                                                 |   13 
 394 files changed, 19652 insertions(+), 2812 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.142 -r 1.143 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- policy-F12.patch	25 Nov 2009 20:29:59 -0000	1.142
+++ policy-F12.patch	1 Dec 2009 16:14:38 -0000	1.143
@@ -250,7 +250,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/kismet(/.*)?			gen_context(system_u:object_r:kismet_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.32/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-11-09 13:10:35.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-01 08:03:22.000000000 -0500
 @@ -26,6 +26,9 @@
  type kismet_var_run_t;
  files_pid_file(kismet_var_run_t)
@@ -261,7 +261,17 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # kismet local policy
-@@ -59,6 +62,12 @@
+@@ -45,7 +48,8 @@
+ 
+ manage_dirs_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
+ manage_files_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
+-files_tmp_filetrans(kismet_t, kismet_tmp_t, { file dir })
++manage_sock_files_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
++files_tmp_filetrans(kismet_t, kismet_tmp_t, { file dir sock_file })
+ 
+ manage_dirs_pattern(kismet_t, kismet_tmpfs_t, kismet_tmpfs_t)
+ manage_files_pattern(kismet_t, kismet_tmpfs_t, kismet_tmpfs_t)
+@@ -59,8 +63,15 @@
  allow kismet_t kismet_var_run_t:dir manage_dir_perms;
  files_pid_filetrans(kismet_t, kismet_var_run_t, { file dir })
  
@@ -273,6 +283,9 @@ diff -b -B --ignore-all-space --exclude-
 +
  kernel_search_debugfs(kismet_t)
  kernel_read_system_state(kismet_t)
++kernel_read_network_state(kismet_t)
+ 
+ corecmd_exec_bin(kismet_t)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-09-16 10:01:19.000000000 -0400
@@ -336,8 +349,22 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-09-30 16:12:48.000000000 -0400
-@@ -136,4 +136,5 @@
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-12-01 10:47:58.000000000 -0500
+@@ -93,6 +93,13 @@
+ sysnet_exec_ifconfig(logwatch_t)
+ 
+ userdom_dontaudit_search_user_home_dirs(logwatch_t)
++tunable_policy(`use_nfs_home_dirs',`
++	fs_list_nfs(logwatch_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++	fs_list_cifs(logwatch_t)
++')
+ 
+ mta_send_mail(logwatch_t)
+ 
+@@ -136,4 +143,5 @@
  
  optional_policy(`
  	samba_read_log(logwatch_t)
@@ -627,7 +654,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.32/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-11-18 10:29:18.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-11-30 11:31:33.000000000 -0500
 @@ -21,8 +21,23 @@
  type prelink_tmp_t;
  files_tmp_file(prelink_tmp_t)
@@ -693,7 +720,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	amanda_manage_lib(prelink_t)
-@@ -99,5 +119,53 @@
+@@ -99,5 +119,54 @@
  ')
  
  optional_policy(`
@@ -721,7 +748,8 @@ diff -b -B --ignore-all-space --exclude-
 +# This sucks: can it not just append?
 +rw_files_pattern(prelink_cron_system_t, prelink_log_t, prelink_log_t)
 +
-+write_files_pattern(prelink_cron_system_t, prelink_var_lib_t, prelink_var_lib_t)
++manage_files_pattern(prelink_cron_system_t, prelink_var_lib_t, prelink_var_lib_t)
++files_var_lib_filetrans(prelink_cron_system_t, prelink_var_lib_t, file)
 +
 +corecmd_exec_bin(prelink_cron_system_t)
 +corecmd_exec_shell(prelink_cron_system_t)
@@ -812,7 +840,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/online_update		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.32/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-11-24 07:36:02.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-11-30 16:00:40.000000000 -0500
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -860,7 +888,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_run_loadpolicy(rpm_script_t, $2)
  	seutil_run_semanage(rpm_script_t, $2)
  	seutil_run_setfiles(rpm_script_t, $2)
-@@ -146,6 +174,42 @@
+@@ -146,6 +174,41 @@
  
  ########################################
  ## <summary>
@@ -874,11 +902,9 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +interface(`rpm_dontaudit_leaks',`
 +	gen_require(`
-+		type rpm_t;
-+		type rpm_script_t;
-+		type rpm_var_run_t;
-+		type rpm_tmp_t;
-+		type rpm_tmpfs_t;
++		type rpm_t, rpm_var_cache_t;
++		type rpm_script_t, rpm_var_run_t, rpm_tmp_t;
++		type rpm_tmpfs_t, rpm_script_tmp_t, rpm_var_lib_t;
 +	')
 +
 +	dontaudit $1 rpm_t:fifo_file rw_fifo_file_perms;
@@ -896,6 +922,7 @@ diff -b -B --ignore-all-space --exclude-
 + 	dontaudit $1 rpm_tmpfs_t:file write_file_perms;
 +	dontaudit $1 rpm_script_tmp_t:file write_file_perms;
 +	dontaudit $1 rpm_var_lib_t:file { read write };
++	dontaudit $1 rpm_var_cache_t:file  { read write };
 +')
 +
 +########################################
@@ -903,7 +930,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send and receive messages from
  ##	rpm over dbus.
  ## </summary>
-@@ -167,6 +231,68 @@
+@@ -167,6 +230,68 @@
  
  ########################################
  ## <summary>
@@ -972,7 +999,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create, read, write, and delete the RPM log.
  ## </summary>
  ## <param name="domain">
-@@ -186,6 +312,24 @@
+@@ -186,6 +311,24 @@
  
  ########################################
  ## <summary>
@@ -997,7 +1024,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -219,7 +363,51 @@
+@@ -219,7 +362,51 @@
  	')
  
  	files_search_tmp($1)
@@ -1049,7 +1076,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -241,6 +429,25 @@
+@@ -241,6 +428,25 @@
  	allow $1 rpm_var_lib_t:dir list_dir_perms;
  	read_files_pattern($1, rpm_var_lib_t, rpm_var_lib_t)
  	read_lnk_files_pattern($1, rpm_var_lib_t, rpm_var_lib_t)
@@ -1075,7 +1102,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -265,6 +472,48 @@
+@@ -265,6 +471,48 @@
  
  ########################################
  ## <summary>
@@ -1124,7 +1151,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to create, read, 
  ##	write, and delete the RPM package database.
  ## </summary>
-@@ -283,3 +532,99 @@
+@@ -283,3 +531,99 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -1503,8 +1530,8 @@ diff -b -B --ignore-all-space --exclude-
  		java_domtrans_unconfined(rpm_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.fc serefpolicy-3.6.32/policy/modules/admin/shorewall.fc
 --- nsaserefpolicy/policy/modules/admin/shorewall.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/shorewall.fc	2009-10-27 09:33:16.000000000 -0400
-@@ -4,8 +4,9 @@
[...1901 lines suppressed...]
  # 	HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
 -/usr/lib(64)?/gstreamer-.*/[^/]*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 -HOME_DIR/.*/\.gstreamer-.*/plugins/*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-
 +HOME_DIR/.*/plugins/nppdf\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
 +/usr/lib/firefox-[^/]*/extensions(/.*)?/libqfaservices.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/firefox-[^/]*/plugins/nppdf.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/libFLAC\.so.*			--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -28635,7 +29050,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib/maxima/[^/]+/binary-gcl/maxima	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/mozilla/plugins/libvlcplugin\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/nx/libXcomp\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -185,15 +199,10 @@
+@@ -185,15 +201,10 @@
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -28652,7 +29067,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -228,31 +237,17 @@
+@@ -228,31 +239,17 @@
  /usr/lib(64)?/ladspa/sc3_1427\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/sc4_1882\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/se4_1883\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -28688,7 +29103,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Jai, Sun Microsystems (Jpackage SPRM)
  /usr/lib(64)?/libmlib_jai\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -267,9 +262,10 @@
+@@ -267,9 +264,10 @@
  /usr/lib(64)?/vmware/lib(/.*)?/libgdk-x11-.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -28701,7 +29116,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -295,6 +291,8 @@
+@@ -295,6 +293,8 @@
  /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/.+\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/(.*/)?ADMPlugin\.apl	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -28710,7 +29125,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +305,108 @@
+@@ -307,10 +307,106 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -28812,8 +29227,6 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/dri/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/httpd/modules/libphp5\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +')
 +/opt/Komodo-Edit-5/lib/python/lib/python2.6/lib-dynload/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
@@ -30843,7 +31256,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.32/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-01 09:38:51.000000000 -0500
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -32186,7 +32599,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-11-25 12:24:26.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-01 07:56:40.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -33884,7 +34297,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3396,619 @@
+@@ -3064,3 +3396,638 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -34182,10 +34595,10 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +interface(`userdom_execmod_user_home_files',`
 +	gen_require(`
-+		type user_home_t;
++		attribute user_home_type;
 +	')
 +
-+	allow $1 user_home_t:file execmod;
++	allow $1 user_home_type:file execmod;
 +')
 +
 +########################################
@@ -34312,6 +34725,25 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	Append files inherited
++##	in the /root directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_inherit_append_admin_home_files',`
++	gen_require(`
++		type admin_home_t;
++	')
++
++	allow $1 admin_home_t:file { getattr append };
++')
++
++########################################
++## <summary>
 +##	Send signull to unprivileged user domains.
 +## </summary>
 +## <param name="domain">
@@ -34980,17 +35412,35 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-09-30 16:12:48.000000000 -0400
-@@ -201,7 +201,7 @@
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-11-30 15:49:46.000000000 -0500
+@@ -181,7 +181,7 @@
+ #
+ define(`getattr_dir_perms',`{ getattr }')
+ define(`setattr_dir_perms',`{ setattr }')
+-define(`search_dir_perms',`{ getattr search }')
++define(`search_dir_perms',`{ getattr search open }')
+ define(`list_dir_perms',`{ getattr search open read lock ioctl }')
+ define(`add_entry_dir_perms',`{ getattr search open lock ioctl write add_name }')
+ define(`del_entry_dir_perms',`{ getattr search open lock ioctl write remove_name }')
+@@ -199,12 +199,14 @@
+ #
+ define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
- define(`read_file_perms',`{ getattr open read lock ioctl }')
+-define(`read_file_perms',`{ getattr open read lock ioctl }')
++define(`read_inherited_file_perms',`{ getattr read ioctl lock }')
++define(`read_file_perms',`{ open read_inherited_file_perms }')
  define(`mmap_file_perms',`{ getattr open read execute ioctl }')
 -define(`exec_file_perms',`{ getattr open read execute execute_no_trans }')
 +define(`exec_file_perms',`{ getattr open read execute ioctl execute_no_trans }')
  define(`append_file_perms',`{ getattr open append lock ioctl }')
  define(`write_file_perms',`{ getattr open write append lock ioctl }')
- define(`rw_file_perms',`{ getattr open read write append ioctl lock }')
-@@ -225,7 +225,7 @@
+-define(`rw_file_perms',`{ getattr open read write append ioctl lock }')
++define(`rw_inherited_file_perms',`{ getattr read write append ioctl lock }')
++define(`rw_file_perms',`{ open rw_inherited_file_perms }')
+ define(`create_file_perms',`{ getattr create open }')
+ define(`rename_file_perms',`{ getattr rename }')
+ define(`delete_file_perms',`{ getattr unlink }')
+@@ -225,7 +227,7 @@
  define(`create_lnk_file_perms',`{ create getattr }')
  define(`rename_lnk_file_perms',`{ getattr rename }')
  define(`delete_lnk_file_perms',`{ getattr unlink }')
@@ -34999,11 +35449,19 @@ diff -b -B --ignore-all-space --exclude-
  define(`relabelfrom_lnk_file_perms',`{ getattr relabelfrom }')
  define(`relabelto_lnk_file_perms',`{ getattr relabelto }')
  define(`relabel_lnk_file_perms',`{ getattr relabelfrom relabelto }')
-@@ -312,3 +312,13 @@
+@@ -312,3 +314,19 @@
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
  define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }')
 +
++#
++# Keys
++#
++define(`manage_key_perms', `{ create link read search setattr view write } ')
++
++#
++# All 
++#
 +define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap }
 +')
 +
@@ -35011,8 +35469,6 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_dbus_perms', `{ acquire_svc send_msg } ')
 +define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ')
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
-+
-+define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
 --- nsaserefpolicy/policy/users	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/users	2009-09-30 16:12:48.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.972
retrieving revision 1.973
diff -u -p -r1.972 -r1.973
--- selinux-policy.spec	25 Nov 2009 20:30:00 -0000	1.972
+++ selinux-policy.spec	1 Dec 2009 16:14:39 -0000	1.973
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 51%{?dist}
+Release: 52%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,20 @@ exit 0
 %endif
 
 %changelog
+* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-52
+- Major fixup of ntop policy
+- Fix label on /usr/lib/xorg/modules/extensions/libglx.so.195.22
+- Allow xdm to signal session bus
+- Allow modemmanager to use generic ptys, and sys_tty_config capability
+- Allow abrt_helper chown access, dontaudit leaks
+- Allow logwatch to list cifs and nfs file systems
+- Allow kismet to read network state
+- Allow cupsd_config_t to connecto unconfined unix_stream
+- Fix avahi labeling and allow avahi to manage /etc/resolv.conf
+- Allow sshd to read usr_t files
+- Allow login programs to manage pcscd_var_run_t files
+- Allow tor to read usr_t files
+
 * Wed Nov 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-51
 - Mark google shared libraries as requiring textrel_shlib
 - Allow svirt to bind/connect to network ports



From spot at fedoraproject.org  Tue Dec  1 16:18:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:18:35 +0000 (UTC)
Subject: rpms/nant/devel nant.spec,1.37,1.38
Message-ID: <20091201161835.5DD5811C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	nant.spec 
Log Message:
nant bootstrap, again


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- nant.spec	29 Oct 2009 18:43:45 -0000	1.37
+++ nant.spec	1 Dec 2009 16:18:35 -0000	1.38
@@ -1,12 +1,12 @@
 %global debug_package %{nil}
 %global monodir %{_libdir}
 %global mlib %{_lib}
-%global bootstrap 0
+%global bootstrap 1
 
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 31%{?dist}
+Release: 32%{?dist}.1
 Epoch: 1
 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch0: nant-build.patch
@@ -131,6 +131,9 @@ scrollkeeper-update -q || :
 %doc examples/* doc/help/*
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:0.85-32.1
+- bootstrap again
+
 * Thu Oct 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.85-31
 - rebuild because mono-ndoc "cleverly" encodes its build date into its ABI ver
 



From cwickert at fedoraproject.org  Tue Dec  1 16:18:28 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  1 Dec 2009 16:18:28 +0000 (UTC)
Subject: rpms/parole/F-11 .cvsignore, 1.5, 1.6 parole.spec, 1.4, 1.5 sources,
	1.5, 1.6 parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch, 1.1,
	NONE parole-0.1.98-fix-vbox-crash.patch, 1.1,
	NONE parole-0.1.98-interface.patch, 1.1,
	NONE parole-0.1.98-memleak.patch, 1.1, NONE
Message-ID: <20091201161828.D308211C00DE@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore parole.spec sources 
Removed Files:
	parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch 
	parole-0.1.98-fix-vbox-crash.patch 
	parole-0.1.98-interface.patch parole-0.1.98-memleak.patch 
Log Message:
* Tue Dec 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.99-1
- Update to 0.1.99 and drop all patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Nov 2009 00:25:28 -0000	1.5
+++ .cvsignore	1 Dec 2009 16:18:27 -0000	1.6
@@ -1 +1 @@
-parole-0.1.98.tar.bz2
+parole-0.1.99.tar.bz2


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/parole.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- parole.spec	29 Nov 2009 00:17:44 -0000	1.4
+++ parole.spec	1 Dec 2009 16:18:28 -0000	1.5
@@ -3,7 +3,7 @@
 %bcond_without mozilla
 
 Name:           parole
-Version:        0.1.98
+Version:        0.1.99
 Release:        1%{?dist}
 Summary:        Media player for the Xfce desktop
 
@@ -11,14 +11,6 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/parole
 Source0:        http://archive.xfce.org/src/apps/parole/0.1/%{name}-%{version}.tar.bz2
-# http://git.xfce.org/apps/parole/commit/?id=c621509e57d326d3134ea61cf783f2d9d311e5db
-Patch0:         parole-0.1.98-fix-vbox-crash.patch
-# http://git.xfce.org/apps/parole/commit/?id=3a276b624edbbe9b6e72101ec8d1893fc854b0af
-Patch1:         parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch
-# http://git.xfce.org/apps/parole/commit/?id=d61475feacd41630cb481f10dbebbb3865a40f61
-Patch2:         parole-0.1.98-interface.patch
-# http://git.xfce.org/apps/parole/patch/?id=aa68a2cb5e6c8162679992b5f979bf4b1d24001c
-Patch3:         parole-0.1.98-memleak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -53,6 +45,7 @@ following features:
 %package        mozplugin
 Summary:        Browser plugin for for %{name}
 Requires:       %{name} = %{version}-%{release}
+Requires:       mozilla-filesystem
 
 %description    mozplugin
 Parole is a modern simple media player based on the GStreamer framework and 
@@ -74,10 +67,7 @@ The %{name}-devel package contains heade
 
 %prep
 %setup -q
-%patch0 -p1 -b .vbox
-%patch1 -p1 -b .192
-%patch2 -p1 -b .interface
-%patch3 -p1 -b .leak
+
 
 %build
 %configure --disable-static --enable-gtk-doc \
@@ -148,6 +138,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.99-1
+- Update to 0.1.99 and drop all patches
+- Make the plugin require mozilla-filesystem
+
 * Sun Nov 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.98-1
 - Update to 0.1.98
 - Cherry pick some patches to build the browser plugin with xulrunner 1.9.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Nov 2009 00:25:28 -0000	1.5
+++ sources	1 Dec 2009 16:18:28 -0000	1.6
@@ -1 +1 @@
-62fc89acb02052de585e7c2f2618198f  parole-0.1.98.tar.bz2
+83acd1287953d077e88048064fe33d40  parole-0.1.99.tar.bz2


--- parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch DELETED ---


--- parole-0.1.98-fix-vbox-crash.patch DELETED ---


--- parole-0.1.98-interface.patch DELETED ---


--- parole-0.1.98-memleak.patch DELETED ---



From cwickert at fedoraproject.org  Tue Dec  1 16:18:29 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  1 Dec 2009 16:18:29 +0000 (UTC)
Subject: rpms/parole/F-12 .cvsignore, 1.5, 1.6 parole.spec, 1.4, 1.5 sources,
	1.5, 1.6 parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch, 1.1,
	NONE parole-0.1.98-fix-vbox-crash.patch, 1.1,
	NONE parole-0.1.98-interface.patch, 1.1,
	NONE parole-0.1.98-memleak.patch, 1.1, NONE
Message-ID: <20091201161829.38F2011C00DE@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31409/F-12

Modified Files:
	.cvsignore parole.spec sources 
Removed Files:
	parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch 
	parole-0.1.98-fix-vbox-crash.patch 
	parole-0.1.98-interface.patch parole-0.1.98-memleak.patch 
Log Message:
* Tue Dec 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.99-1
- Update to 0.1.99 and drop all patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Nov 2009 00:25:29 -0000	1.5
+++ .cvsignore	1 Dec 2009 16:18:28 -0000	1.6
@@ -1 +1 @@
-parole-0.1.98.tar.bz2
+parole-0.1.99.tar.bz2


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/parole.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- parole.spec	29 Nov 2009 00:17:45 -0000	1.4
+++ parole.spec	1 Dec 2009 16:18:29 -0000	1.5
@@ -3,7 +3,7 @@
 %bcond_without mozilla
 
 Name:           parole
-Version:        0.1.98
+Version:        0.1.99
 Release:        1%{?dist}
 Summary:        Media player for the Xfce desktop
 
@@ -11,14 +11,6 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/parole
 Source0:        http://archive.xfce.org/src/apps/parole/0.1/%{name}-%{version}.tar.bz2
-# http://git.xfce.org/apps/parole/commit/?id=c621509e57d326d3134ea61cf783f2d9d311e5db
-Patch0:         parole-0.1.98-fix-vbox-crash.patch
-# http://git.xfce.org/apps/parole/commit/?id=3a276b624edbbe9b6e72101ec8d1893fc854b0af
-Patch1:         parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch
-# http://git.xfce.org/apps/parole/commit/?id=d61475feacd41630cb481f10dbebbb3865a40f61
-Patch2:         parole-0.1.98-interface.patch
-# http://git.xfce.org/apps/parole/patch/?id=aa68a2cb5e6c8162679992b5f979bf4b1d24001c
-Patch3:         parole-0.1.98-memleak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -53,6 +45,7 @@ following features:
 %package        mozplugin
 Summary:        Browser plugin for for %{name}
 Requires:       %{name} = %{version}-%{release}
+Requires:       mozilla-filesystem
 
 %description    mozplugin
 Parole is a modern simple media player based on the GStreamer framework and 
@@ -74,10 +67,7 @@ The %{name}-devel package contains heade
 
 %prep
 %setup -q
-%patch0 -p1 -b .vbox
-%patch1 -p1 -b .192
-%patch2 -p1 -b .interface
-%patch3 -p1 -b .leak
+
 
 %build
 %configure --disable-static --enable-gtk-doc \
@@ -148,6 +138,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.99-1
+- Update to 0.1.99 and drop all patches
+- Make the plugin require mozilla-filesystem
+
 * Sun Nov 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.98-1
 - Update to 0.1.98
 - Cherry pick some patches to build the browser plugin with xulrunner 1.9.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Nov 2009 00:25:29 -0000	1.5
+++ sources	1 Dec 2009 16:18:29 -0000	1.6
@@ -1 +1 @@
-62fc89acb02052de585e7c2f2618198f  parole-0.1.98.tar.bz2
+83acd1287953d077e88048064fe33d40  parole-0.1.99.tar.bz2


--- parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch DELETED ---


--- parole-0.1.98-fix-vbox-crash.patch DELETED ---


--- parole-0.1.98-interface.patch DELETED ---


--- parole-0.1.98-memleak.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Dec  1 16:22:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 16:22:01 +0000
Subject: [pkgdb] htmlview ownership updated
Message-ID: <20091201162202.1320310F865@bastion2.fedora.phx.redhat.com>

Package htmlview in Fedora devel is now owned by wtogami

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



From pkgdb at fedoraproject.org  Tue Dec  1 16:22:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 16:22:02 +0000
Subject: [pkgdb] htmlview (un)retirement
Message-ID: <20091201162202.52E0C10F8A9@bastion2.fedora.phx.redhat.com>

Package htmlview in Fedora devel has been retired by caillon

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



From jjames at fedoraproject.org  Tue Dec  1 16:28:30 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 16:28:30 +0000 (UTC)
Subject: File latexmk-411.zip uploaded to lookaside cache by jjames
Message-ID: <20091201162830.8A08410F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for latexmk:

6f2dedf6192a8bbc9be7a86f4cde2a3b  latexmk-411.zip



From jjames at fedoraproject.org  Tue Dec  1 16:32:28 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 16:32:28 +0000 (UTC)
Subject: rpms/latexmk/devel .cvsignore, 1.10, 1.11 latexmk-conf.patch, 1.7, 
	1.8 latexmk.conf, 1.4, 1.5 latexmk.spec, 1.13, 1.14 sources,
	1.10, 1.11
Message-ID: <20091201163228.2A4F711C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

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

Modified Files:
	.cvsignore latexmk-conf.patch latexmk.conf latexmk.spec 
	sources 
Log Message:
* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
- Update to 4.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	24 Aug 2009 20:15:53 -0000	1.10
+++ .cvsignore	1 Dec 2009 16:32:27 -0000	1.11
@@ -1 +1 @@
-latexmk-410.zip
+latexmk-411.zip

latexmk-conf.patch:
 latexmk.1  |    1 +
 latexmk.pl |    6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-conf.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- latexmk-conf.patch	13 Apr 2009 21:03:00 -0000	1.7
+++ latexmk-conf.patch	1 Dec 2009 16:32:27 -0000	1.8
@@ -1,6 +1,6 @@
---- latexmk.1.ORIG	2009-04-10 15:49:52.000000000 -0600
-+++ latexmk.1	2009-04-13 14:54:50.000000000 -0600
-@@ -479,6 +479,7 @@
+--- latexmk.1.ORIG	2009-11-24 11:14:22.000000000 -0700
++++ latexmk.1	2009-12-01 08:38:29.251961734 -0700
+@@ -494,6 +494,7 @@
     "/opt/local/share/latexmk/LatexMk",
     "/usr/local/share/latexmk/LatexMk",
     "/usr/local/lib/latexmk/LatexMk".
@@ -8,9 +8,9 @@
     On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
  .PP
  2) The user's RC file, "$HOME/.latexmkrc", if it exists.  Here $HOME
---- latexmk.pl.ORIG	2009-04-10 15:49:17.000000000 -0600
-+++ latexmk.pl	2009-04-13 14:55:40.000000000 -0600
-@@ -725,10 +725,8 @@
+--- latexmk.pl.ORIG	2009-11-27 12:40:48.000000000 -0700
++++ latexmk.pl	2009-12-01 08:39:24.877857354 -0700
+@@ -673,10 +673,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.
@@ -18,8 +18,8 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+	## Fedora change: only look in /etc
-+	@rc_system_files = ( '/etc/latexmk.conf' );
++    ## Fedora change: only look in /etc
++    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path
  


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- latexmk.conf	13 Oct 2008 18:33:12 -0000	1.4
+++ latexmk.conf	1 Dec 2009 16:32:27 -0000	1.5
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk version 4.01.
+# This is the system-wide configuration file for latexmk version 4.11.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -20,8 +20,8 @@
 # The size of the banner message (about 1100 divided by the message length)
 # $banner_scale = 220;
 
-# An array of directory names where BibTeX should look for .bib files.
-# @BIBINPUTS = $ENV('BIBINPUTS') converted to an array of strings
+# Directories where BibTeX should look for .bib files.
+# $BIBINPUTS = $ENV('BIBINPUTS') || '.'
 
 # The name of the BibTeX executable
 # $bibtex = 'bibtex %O %B';
@@ -35,18 +35,21 @@
 # Extra file extensions to remove when doing a full clean
 # $clean_full_ext = "";
 
-# Whether to just cleanup, or also generate files
-# $cleanup_only = 0;
-
 # Whether to clean latexmk's file database too
 # $cleanup_fdb = 0;
 
+# Whether cleanup deletes files generated by (pdf)latex, found from \openout
+# lines in the log file.
+# $cleanup_includes_generated = 0
+
 # How much cleaning to do: 0 specifies normal operation (no cleaning),
-# 1 specifies a full cleanup, 2 specifies a cleanup that leaves DVI,
-# PostScript, and PDF files, and 3 specifies a cleanup that also leaves dep
-# and aux files.  You probably should not set this option.
+# 1 specifies a full cleanup, and 2 specifies a cleanup that leaves DVI,
+# PostScript, and PDF files.
 # $cleanup_mode = 0;
 
+# Whether to just cleanup, or also generate files
+# $cleanup_only = 0;
+
 # A custom dependency list; see the man page for details
 # @cus_dep_list = ();
 
@@ -79,6 +82,17 @@ $dvi_previewer = 'xdg-open %O %S';
 # $dvi_previewer_landscape = 'start xdvi -paper usr %O %S';
 $dvi_previewer_landscape = 'xdg-open %O %S';
 
+# 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 = $signo{USR1}
+
 # The command to convert a DVI file into a PDF file.
 # See the warnings on the man page
 # $dvipdf = 'dvipdf %O %S %D';
@@ -94,20 +108,9 @@ $dvi_previewer_landscape = 'xdg-open %O 
 # 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 = $signo{USR1}
-
 # Which treatment of default extension and filenames with multiple extensions
 # is used.  The possibilities are:
-#   - miktex_old, for Miktex version 1.20d or earlier
+#   - miktex_old, for MikTeX version 1.20d or earlier
 #   - unix, for web2c 7.3.1 or later
 # $extension_treatment = 'unix';
 
@@ -150,6 +153,11 @@ $dvi_update_method = 1;
 # The command line switch to make LaTeX run in silent mode
 # $latex_silent_switch = '-interaction=batchmode';
 
+# Whether to treat log files as binary (1) or text (0).  This is normally only
+# necessary on Windows platforms with MikTeX, where some control characters are
+# embedded in the log file.
+# $log_file_binary = 0
+
 # The program that prints PostScript files
 # $lpr = 'lpr %O %S';
 
@@ -169,6 +177,10 @@ $dvi_update_method = 1;
 # references.
 # $max_repeat = 5;
 
+# Set to 1 to give special treatment to Ctrl-c and Ctrl-Break in -pvc mode on
+# Windows.  This is unnecessary on Unix platforms.
+$MSWin_fudge_break = 0
+
 # This variable is used only when running in continuous-preview mode.  If zero,
 # check for a previously running previewer on the same file and update it.  If
 # nonzero, always start a new previewer.
@@ -180,12 +192,6 @@ $dvi_update_method = 1;
 # 3 = Create a PDF file with dvipdf
 # $pdf_mode = 0;
 
-# The name of the LaTeX program that produces PDF files by default
-# $pdflatex = 'pdflatex %O %S';
-
-# The command line switch to make pdflatex run in silent mode
-# $pdflatex_silent_switch = '-interaction=batchmode';
-
 # The command to invoke a PDF previewer
 # $pdf_previewer = 'start acroread %O %S';
 $pdf_previewer = 'xdg-open %O %S';
@@ -200,6 +206,12 @@ $pdf_previewer = 'xdg-open %O %S';
 # When PDF update method 2 is used, the number of the Unix signal to send
 # $pdf_update_signal = $signo{HUP}
 
+# The name of the LaTeX program that produces PDF files by default
+# $pdflatex = 'pdflatex %O %S';
+
+# The command line switch to make pdflatex run in silent mode
+# $pdflatex_silent_switch = '-interaction=batchmode';
+
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
 
@@ -213,17 +225,11 @@ $pdf_previewer = 'xdg-open %O %S';
 # If nonzero, run a previewer to preview the document
 # $preview_mode = 0;
 
-# If nonzero, print the document using lpr each time it is created
-# $printout_mode = 0;
-
 # The type of file to printout: 'dvi', 'none', 'pdf', or 'ps'
 # $print_type = 'ps';
 
-# Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
-
-# Command to convert a PostScript file to a PDF file
-# $ps2pdf = 'ps2pdf %O %S %D';
+# If nonzero, print the document using lpr each time it is created
+# $printout_mode = 0;
 
 # Filter to run on newly created PostScript files
 # $ps_filter = '';
@@ -249,6 +255,12 @@ $ps_update_method = 1;
 # send
 # $ps_update_signal = $signo{HUP}
 
+# Command to convert a PostScript file to a PDF file
+# $ps2pdf = 'ps2pdf %O %S %D';
+
+# Command used to list all the processes currently run by the user
+# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+
 # When previewing in -pvc mode, whether to make the viewer read from the
 # generated file or from a temporary copy
 # $pvc_view_file_via_temporary = 1;
@@ -272,6 +284,9 @@ $ps_update_method = 1;
 # allowed.  These files are in addition to *.tex in the current directory.
 # $texfile_search = "";
 
+# Directories where BibTeX should look for .bib files.
+# $TEXINPUTS = $ENV('TEXINPUTS') || '.'
+
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = $ENV{TMPDIR} || '/tmp';
 


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- latexmk.spec	24 Aug 2009 20:15:54 -0000	1.13
+++ latexmk.spec	1 Dec 2009 16:32:27 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.10
+Version:        4.11
 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-410.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-411.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
+- Update to 4.11.
+
 * Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
 - Update to 4.10 to correctly handle files produced by epstopdf.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Aug 2009 20:15:54 -0000	1.10
+++ sources	1 Dec 2009 16:32:27 -0000	1.11
@@ -1 +1 @@
-cda2adc346f130bd6a503710fb20b0ed  latexmk-410.zip
+6f2dedf6192a8bbc9be7a86f4cde2a3b  latexmk-411.zip



From jjames at fedoraproject.org  Tue Dec  1 16:32:27 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 16:32:27 +0000 (UTC)
Subject: rpms/latexmk/F-11 .cvsignore, 1.10, 1.11 latexmk-conf.patch, 1.7,
	1.8 latexmk.conf, 1.4, 1.5 latexmk.spec, 1.12, 1.13 sources,
	1.10, 1.11
Message-ID: <20091201163227.9BEF411C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

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

Modified Files:
	.cvsignore latexmk-conf.patch latexmk.conf latexmk.spec 
	sources 
Log Message:
* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
- Update to 4.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	24 Aug 2009 20:15:53 -0000	1.10
+++ .cvsignore	1 Dec 2009 16:32:27 -0000	1.11
@@ -1 +1 @@
-latexmk-410.zip
+latexmk-411.zip

latexmk-conf.patch:
 latexmk.1  |    1 +
 latexmk.pl |    6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/latexmk-conf.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- latexmk-conf.patch	13 Apr 2009 21:03:00 -0000	1.7
+++ latexmk-conf.patch	1 Dec 2009 16:32:27 -0000	1.8
@@ -1,6 +1,6 @@
---- latexmk.1.ORIG	2009-04-10 15:49:52.000000000 -0600
-+++ latexmk.1	2009-04-13 14:54:50.000000000 -0600
-@@ -479,6 +479,7 @@
+--- latexmk.1.ORIG	2009-11-24 11:14:22.000000000 -0700
++++ latexmk.1	2009-12-01 08:38:29.251961734 -0700
+@@ -494,6 +494,7 @@
     "/opt/local/share/latexmk/LatexMk",
     "/usr/local/share/latexmk/LatexMk",
     "/usr/local/lib/latexmk/LatexMk".
@@ -8,9 +8,9 @@
     On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
  .PP
  2) The user's RC file, "$HOME/.latexmkrc", if it exists.  Here $HOME
---- latexmk.pl.ORIG	2009-04-10 15:49:17.000000000 -0600
-+++ latexmk.pl	2009-04-13 14:55:40.000000000 -0600
-@@ -725,10 +725,8 @@
+--- latexmk.pl.ORIG	2009-11-27 12:40:48.000000000 -0700
++++ latexmk.pl	2009-12-01 08:39:24.877857354 -0700
+@@ -673,10 +673,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.
@@ -18,8 +18,8 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+	## Fedora change: only look in /etc
-+	@rc_system_files = ( '/etc/latexmk.conf' );
++    ## Fedora change: only look in /etc
++    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path
  


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/latexmk.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- latexmk.conf	13 Oct 2008 18:33:12 -0000	1.4
+++ latexmk.conf	1 Dec 2009 16:32:27 -0000	1.5
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk version 4.01.
+# This is the system-wide configuration file for latexmk version 4.11.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -20,8 +20,8 @@
 # The size of the banner message (about 1100 divided by the message length)
 # $banner_scale = 220;
 
-# An array of directory names where BibTeX should look for .bib files.
-# @BIBINPUTS = $ENV('BIBINPUTS') converted to an array of strings
+# Directories where BibTeX should look for .bib files.
+# $BIBINPUTS = $ENV('BIBINPUTS') || '.'
 
 # The name of the BibTeX executable
 # $bibtex = 'bibtex %O %B';
@@ -35,18 +35,21 @@
 # Extra file extensions to remove when doing a full clean
 # $clean_full_ext = "";
 
-# Whether to just cleanup, or also generate files
-# $cleanup_only = 0;
-
 # Whether to clean latexmk's file database too
 # $cleanup_fdb = 0;
 
+# Whether cleanup deletes files generated by (pdf)latex, found from \openout
+# lines in the log file.
+# $cleanup_includes_generated = 0
+
 # How much cleaning to do: 0 specifies normal operation (no cleaning),
-# 1 specifies a full cleanup, 2 specifies a cleanup that leaves DVI,
-# PostScript, and PDF files, and 3 specifies a cleanup that also leaves dep
-# and aux files.  You probably should not set this option.
+# 1 specifies a full cleanup, and 2 specifies a cleanup that leaves DVI,
+# PostScript, and PDF files.
 # $cleanup_mode = 0;
 
+# Whether to just cleanup, or also generate files
+# $cleanup_only = 0;
+
 # A custom dependency list; see the man page for details
 # @cus_dep_list = ();
 
@@ -79,6 +82,17 @@ $dvi_previewer = 'xdg-open %O %S';
 # $dvi_previewer_landscape = 'start xdvi -paper usr %O %S';
 $dvi_previewer_landscape = 'xdg-open %O %S';
 
+# 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 = $signo{USR1}
+
 # The command to convert a DVI file into a PDF file.
 # See the warnings on the man page
 # $dvipdf = 'dvipdf %O %S %D';
@@ -94,20 +108,9 @@ $dvi_previewer_landscape = 'xdg-open %O 
 # 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 = $signo{USR1}
-
 # Which treatment of default extension and filenames with multiple extensions
 # is used.  The possibilities are:
-#   - miktex_old, for Miktex version 1.20d or earlier
+#   - miktex_old, for MikTeX version 1.20d or earlier
 #   - unix, for web2c 7.3.1 or later
 # $extension_treatment = 'unix';
 
@@ -150,6 +153,11 @@ $dvi_update_method = 1;
 # The command line switch to make LaTeX run in silent mode
 # $latex_silent_switch = '-interaction=batchmode';
 
+# Whether to treat log files as binary (1) or text (0).  This is normally only
+# necessary on Windows platforms with MikTeX, where some control characters are
+# embedded in the log file.
+# $log_file_binary = 0
+
 # The program that prints PostScript files
 # $lpr = 'lpr %O %S';
 
@@ -169,6 +177,10 @@ $dvi_update_method = 1;
 # references.
 # $max_repeat = 5;
 
+# Set to 1 to give special treatment to Ctrl-c and Ctrl-Break in -pvc mode on
+# Windows.  This is unnecessary on Unix platforms.
+$MSWin_fudge_break = 0
+
 # This variable is used only when running in continuous-preview mode.  If zero,
 # check for a previously running previewer on the same file and update it.  If
 # nonzero, always start a new previewer.
@@ -180,12 +192,6 @@ $dvi_update_method = 1;
 # 3 = Create a PDF file with dvipdf
 # $pdf_mode = 0;
 
-# The name of the LaTeX program that produces PDF files by default
-# $pdflatex = 'pdflatex %O %S';
-
-# The command line switch to make pdflatex run in silent mode
-# $pdflatex_silent_switch = '-interaction=batchmode';
-
 # The command to invoke a PDF previewer
 # $pdf_previewer = 'start acroread %O %S';
 $pdf_previewer = 'xdg-open %O %S';
@@ -200,6 +206,12 @@ $pdf_previewer = 'xdg-open %O %S';
 # When PDF update method 2 is used, the number of the Unix signal to send
 # $pdf_update_signal = $signo{HUP}
 
+# The name of the LaTeX program that produces PDF files by default
+# $pdflatex = 'pdflatex %O %S';
+
+# The command line switch to make pdflatex run in silent mode
+# $pdflatex_silent_switch = '-interaction=batchmode';
+
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
 
@@ -213,17 +225,11 @@ $pdf_previewer = 'xdg-open %O %S';
 # If nonzero, run a previewer to preview the document
 # $preview_mode = 0;
 
-# If nonzero, print the document using lpr each time it is created
-# $printout_mode = 0;
-
 # The type of file to printout: 'dvi', 'none', 'pdf', or 'ps'
 # $print_type = 'ps';
 
-# Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
-
-# Command to convert a PostScript file to a PDF file
-# $ps2pdf = 'ps2pdf %O %S %D';
+# If nonzero, print the document using lpr each time it is created
+# $printout_mode = 0;
 
 # Filter to run on newly created PostScript files
 # $ps_filter = '';
@@ -249,6 +255,12 @@ $ps_update_method = 1;
 # send
 # $ps_update_signal = $signo{HUP}
 
+# Command to convert a PostScript file to a PDF file
+# $ps2pdf = 'ps2pdf %O %S %D';
+
+# Command used to list all the processes currently run by the user
+# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+
 # When previewing in -pvc mode, whether to make the viewer read from the
 # generated file or from a temporary copy
 # $pvc_view_file_via_temporary = 1;
@@ -272,6 +284,9 @@ $ps_update_method = 1;
 # allowed.  These files are in addition to *.tex in the current directory.
 # $texfile_search = "";
 
+# Directories where BibTeX should look for .bib files.
+# $TEXINPUTS = $ENV('TEXINPUTS') || '.'
+
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = $ENV{TMPDIR} || '/tmp';
 


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/latexmk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- latexmk.spec	24 Aug 2009 20:15:53 -0000	1.12
+++ latexmk.spec	1 Dec 2009 16:32:27 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.10
+Version:        4.11
 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-410.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-411.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
+- Update to 4.11.
+
 * Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
 - Update to 4.10 to correctly handle files produced by epstopdf.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Aug 2009 20:15:53 -0000	1.10
+++ sources	1 Dec 2009 16:32:27 -0000	1.11
@@ -1 +1 @@
-cda2adc346f130bd6a503710fb20b0ed  latexmk-410.zip
+6f2dedf6192a8bbc9be7a86f4cde2a3b  latexmk-411.zip



From jjames at fedoraproject.org  Tue Dec  1 16:32:27 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 16:32:27 +0000 (UTC)
Subject: rpms/latexmk/F-12 .cvsignore, 1.10, 1.11 latexmk-conf.patch, 1.7,
	1.8 latexmk.conf, 1.4, 1.5 latexmk.spec, 1.13, 1.14 sources,
	1.10, 1.11
Message-ID: <20091201163227.D576411C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1546/F-12

Modified Files:
	.cvsignore latexmk-conf.patch latexmk.conf latexmk.spec 
	sources 
Log Message:
* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
- Update to 4.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	24 Aug 2009 20:15:53 -0000	1.10
+++ .cvsignore	1 Dec 2009 16:32:27 -0000	1.11
@@ -1 +1 @@
-latexmk-410.zip
+latexmk-411.zip

latexmk-conf.patch:
 latexmk.1  |    1 +
 latexmk.pl |    6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/latexmk-conf.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- latexmk-conf.patch	13 Apr 2009 21:03:00 -0000	1.7
+++ latexmk-conf.patch	1 Dec 2009 16:32:27 -0000	1.8
@@ -1,6 +1,6 @@
---- latexmk.1.ORIG	2009-04-10 15:49:52.000000000 -0600
-+++ latexmk.1	2009-04-13 14:54:50.000000000 -0600
-@@ -479,6 +479,7 @@
+--- latexmk.1.ORIG	2009-11-24 11:14:22.000000000 -0700
++++ latexmk.1	2009-12-01 08:38:29.251961734 -0700
+@@ -494,6 +494,7 @@
     "/opt/local/share/latexmk/LatexMk",
     "/usr/local/share/latexmk/LatexMk",
     "/usr/local/lib/latexmk/LatexMk".
@@ -8,9 +8,9 @@
     On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
  .PP
  2) The user's RC file, "$HOME/.latexmkrc", if it exists.  Here $HOME
---- latexmk.pl.ORIG	2009-04-10 15:49:17.000000000 -0600
-+++ latexmk.pl	2009-04-13 14:55:40.000000000 -0600
-@@ -725,10 +725,8 @@
+--- latexmk.pl.ORIG	2009-11-27 12:40:48.000000000 -0700
++++ latexmk.pl	2009-12-01 08:39:24.877857354 -0700
+@@ -673,10 +673,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.
@@ -18,8 +18,8 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+	## Fedora change: only look in /etc
-+	@rc_system_files = ( '/etc/latexmk.conf' );
++    ## Fedora change: only look in /etc
++    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path
  


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/latexmk.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- latexmk.conf	13 Oct 2008 18:33:12 -0000	1.4
+++ latexmk.conf	1 Dec 2009 16:32:27 -0000	1.5
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk version 4.01.
+# This is the system-wide configuration file for latexmk version 4.11.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -20,8 +20,8 @@
 # The size of the banner message (about 1100 divided by the message length)
 # $banner_scale = 220;
 
-# An array of directory names where BibTeX should look for .bib files.
-# @BIBINPUTS = $ENV('BIBINPUTS') converted to an array of strings
+# Directories where BibTeX should look for .bib files.
+# $BIBINPUTS = $ENV('BIBINPUTS') || '.'
 
 # The name of the BibTeX executable
 # $bibtex = 'bibtex %O %B';
@@ -35,18 +35,21 @@
 # Extra file extensions to remove when doing a full clean
 # $clean_full_ext = "";
 
-# Whether to just cleanup, or also generate files
-# $cleanup_only = 0;
-
 # Whether to clean latexmk's file database too
 # $cleanup_fdb = 0;
 
+# Whether cleanup deletes files generated by (pdf)latex, found from \openout
+# lines in the log file.
+# $cleanup_includes_generated = 0
+
 # How much cleaning to do: 0 specifies normal operation (no cleaning),
-# 1 specifies a full cleanup, 2 specifies a cleanup that leaves DVI,
-# PostScript, and PDF files, and 3 specifies a cleanup that also leaves dep
-# and aux files.  You probably should not set this option.
+# 1 specifies a full cleanup, and 2 specifies a cleanup that leaves DVI,
+# PostScript, and PDF files.
 # $cleanup_mode = 0;
 
+# Whether to just cleanup, or also generate files
+# $cleanup_only = 0;
+
 # A custom dependency list; see the man page for details
 # @cus_dep_list = ();
 
@@ -79,6 +82,17 @@ $dvi_previewer = 'xdg-open %O %S';
 # $dvi_previewer_landscape = 'start xdvi -paper usr %O %S';
 $dvi_previewer_landscape = 'xdg-open %O %S';
 
+# 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 = $signo{USR1}
+
 # The command to convert a DVI file into a PDF file.
 # See the warnings on the man page
 # $dvipdf = 'dvipdf %O %S %D';
@@ -94,20 +108,9 @@ $dvi_previewer_landscape = 'xdg-open %O 
 # 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 = $signo{USR1}
-
 # Which treatment of default extension and filenames with multiple extensions
 # is used.  The possibilities are:
-#   - miktex_old, for Miktex version 1.20d or earlier
+#   - miktex_old, for MikTeX version 1.20d or earlier
 #   - unix, for web2c 7.3.1 or later
 # $extension_treatment = 'unix';
 
@@ -150,6 +153,11 @@ $dvi_update_method = 1;
 # The command line switch to make LaTeX run in silent mode
 # $latex_silent_switch = '-interaction=batchmode';
 
+# Whether to treat log files as binary (1) or text (0).  This is normally only
+# necessary on Windows platforms with MikTeX, where some control characters are
+# embedded in the log file.
+# $log_file_binary = 0
+
 # The program that prints PostScript files
 # $lpr = 'lpr %O %S';
 
@@ -169,6 +177,10 @@ $dvi_update_method = 1;
 # references.
 # $max_repeat = 5;
 
+# Set to 1 to give special treatment to Ctrl-c and Ctrl-Break in -pvc mode on
+# Windows.  This is unnecessary on Unix platforms.
+$MSWin_fudge_break = 0
+
 # This variable is used only when running in continuous-preview mode.  If zero,
 # check for a previously running previewer on the same file and update it.  If
 # nonzero, always start a new previewer.
@@ -180,12 +192,6 @@ $dvi_update_method = 1;
 # 3 = Create a PDF file with dvipdf
 # $pdf_mode = 0;
 
-# The name of the LaTeX program that produces PDF files by default
-# $pdflatex = 'pdflatex %O %S';
-
-# The command line switch to make pdflatex run in silent mode
-# $pdflatex_silent_switch = '-interaction=batchmode';
-
 # The command to invoke a PDF previewer
 # $pdf_previewer = 'start acroread %O %S';
 $pdf_previewer = 'xdg-open %O %S';
@@ -200,6 +206,12 @@ $pdf_previewer = 'xdg-open %O %S';
 # When PDF update method 2 is used, the number of the Unix signal to send
 # $pdf_update_signal = $signo{HUP}
 
+# The name of the LaTeX program that produces PDF files by default
+# $pdflatex = 'pdflatex %O %S';
+
+# The command line switch to make pdflatex run in silent mode
+# $pdflatex_silent_switch = '-interaction=batchmode';
+
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
 
@@ -213,17 +225,11 @@ $pdf_previewer = 'xdg-open %O %S';
 # If nonzero, run a previewer to preview the document
 # $preview_mode = 0;
 
-# If nonzero, print the document using lpr each time it is created
-# $printout_mode = 0;
-
 # The type of file to printout: 'dvi', 'none', 'pdf', or 'ps'
 # $print_type = 'ps';
 
-# Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
-
-# Command to convert a PostScript file to a PDF file
-# $ps2pdf = 'ps2pdf %O %S %D';
+# If nonzero, print the document using lpr each time it is created
+# $printout_mode = 0;
 
 # Filter to run on newly created PostScript files
 # $ps_filter = '';
@@ -249,6 +255,12 @@ $ps_update_method = 1;
 # send
 # $ps_update_signal = $signo{HUP}
 
+# Command to convert a PostScript file to a PDF file
+# $ps2pdf = 'ps2pdf %O %S %D';
+
+# Command used to list all the processes currently run by the user
+# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+
 # When previewing in -pvc mode, whether to make the viewer read from the
 # generated file or from a temporary copy
 # $pvc_view_file_via_temporary = 1;
@@ -272,6 +284,9 @@ $ps_update_method = 1;
 # allowed.  These files are in addition to *.tex in the current directory.
 # $texfile_search = "";
 
+# Directories where BibTeX should look for .bib files.
+# $TEXINPUTS = $ENV('TEXINPUTS') || '.'
+
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = $ENV{TMPDIR} || '/tmp';
 


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/latexmk.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- latexmk.spec	24 Aug 2009 20:15:54 -0000	1.13
+++ latexmk.spec	1 Dec 2009 16:32:27 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.10
+Version:        4.11
 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-410.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-411.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
+- Update to 4.11.
+
 * Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
 - Update to 4.10 to correctly handle files produced by epstopdf.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Aug 2009 20:15:54 -0000	1.10
+++ sources	1 Dec 2009 16:32:27 -0000	1.11
@@ -1 +1 @@
-cda2adc346f130bd6a503710fb20b0ed  latexmk-410.zip
+6f2dedf6192a8bbc9be7a86f4cde2a3b  latexmk-411.zip



From dwayne at fedoraproject.org  Tue Dec  1 16:33:12 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Tue,  1 Dec 2009 16:33:12 +0000 (UTC)
Subject: rpms/virtaal/devel virtaal.spec,1.14,1.15
Message-ID: <20091201163312.C02BC11C00DE@cvs1.fedora.phx.redhat.com>

Author: dwayne

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

Modified Files:
	virtaal.spec 
Log Message:
* Tue Dec 1 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.2.rc1
- Typo in postun



Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/virtaal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- virtaal.spec	27 Nov 2009 12:57:07 -0000	1.14
+++ virtaal.spec	1 Dec 2009 16:33:12 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           virtaal
 Version:        0.5.0
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
@@ -135,7 +135,7 @@ touch --no-create %{_datadir}/icons/hico
 %postun
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-ff [ $1 -eq 0 ] ; then
+if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
@@ -163,6 +163,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 1 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.2.rc1
+- Typo in postun
+
 * Fri Nov 27 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.1.rc1
 - Update to 0.5.0 rc1
    - Autoterm: Virtaal can now automatically download terminology files



From belegdol at fedoraproject.org  Tue Dec  1 16:38:03 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Tue,  1 Dec 2009 16:38:03 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel
	gnome-chemistry-utils-0.10.9-goffice0716.patch, NONE,
	1.1 gnome-chemistry-utils.spec, 1.43, 1.44
Message-ID: <20091201163803.69C4F11C00DE@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2694

Modified Files:
	gnome-chemistry-utils.spec 
Added Files:
	gnome-chemistry-utils-0.10.9-goffice0716.patch 
Log Message:
Added patch from to allow building with goffice 0.7.16

gnome-chemistry-utils-0.10.9-goffice0716.patch:
 cmd-context.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-chemistry-utils-0.10.9-goffice0716.patch ---
diff -up gnome-chemistry-utils-0.10.9/libs/gcu/cmd-context.cc.goffice0716 gnome-chemistry-utils-0.10.9/libs/gcu/cmd-context.cc
--- gnome-chemistry-utils-0.10.9/libs/gcu/cmd-context.cc.goffice0716	2009-11-14 11:30:39.000000000 +0100
+++ gnome-chemistry-utils-0.10.9/libs/gcu/cmd-context.cc	2009-12-01 17:26:54.000000000 +0100
@@ -62,7 +62,7 @@ gcu_cc_set_sensitive (G_GNUC_UNUSED GOCm
 }
 
 static void
-gcu_cc_progress_set (GOCmdContext *cc, gfloat val)
+gcu_cc_progress_set (GOCmdContext *cc, double val)
 {
 }
 


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gnome-chemistry-utils.spec	1 Dec 2009 08:03:41 -0000	1.43
+++ gnome-chemistry-utils.spec	1 Dec 2009 16:38:03 -0000	1.44
@@ -7,6 +7,7 @@ Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/0.10/%{name}-%{version}.tar.bz2
+Patch0:         gnome-chemistry-utils-0.10.9-goffice0716.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bodr
@@ -70,6 +71,7 @@ This package contains the mozilla plugin
 
 %prep
 %setup -q
+%patch0 -p1 -b .goffice0716
 
 
 %build
@@ -236,6 +238,7 @@ scrollkeeper-update -q || :
 %changelog
 * Tue Dec 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.9-2
 - Rebuilt for new goffice
+- Added patch from to allow such build
 
 * Sat Nov 14 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.9-1
 - Updated to 0.10.9



From mtasaka at fedoraproject.org  Tue Dec  1 16:42:26 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  1 Dec 2009 16:42:26 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-11 rubygem-nokogiri.spec,1.9,1.10
Message-ID: <20091201164226.9A1E211C00DE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3401/F-11

Modified Files:
	rubygem-nokogiri.spec 
Log Message:
* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-3
- Rebuild against libxml2 again (bug 537303)



Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-11/rubygem-nokogiri.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-nokogiri.spec	28 Jul 2009 18:13:48 -0000	1.9
+++ rubygem-nokogiri.spec	1 Dec 2009 16:42:26 -0000	1.10
@@ -13,7 +13,7 @@
 Summary:	An HTML, XML, SAX, and Reader parser
 Name:		rubygem-%{gemname}
 Version:	1.3.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://nokogiri.rubyforge.org/nokogiri/
@@ -169,6 +169,10 @@ create_symlink_rec %{geminstdir}/lib %{r
 rm -rf %{buildroot}
 
 %check
+# test_exslt(TestXsltTransforms) [./test/test_xslt_transforms.rb:93]
+# fails without TZ on sparc
+export TZ="Asia/Tokyo"
+
 pushd ./%{geminstdir}
 rake test --trace
 popd
@@ -198,6 +202,12 @@ popd
 %{ruby_sitelib}/xsd/
 
 %changelog
+* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-3
+- Rebuild against libxml2 again (bug 537303)
+
+* Sat Aug 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-2
+- Fix test failure on sparc
+
 * Wed Jul 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-1
 - 1.3.3
 



From mtasaka at fedoraproject.org  Tue Dec  1 16:42:26 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  1 Dec 2009 16:42:26 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-12 rubygem-nokogiri.spec,1.12,1.13
Message-ID: <20091201164226.BC82311C00DE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3401/F-12

Modified Files:
	rubygem-nokogiri.spec 
Log Message:
* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-3
- Rebuild against libxml2 again (bug 537303)



Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-12/rubygem-nokogiri.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-nokogiri.spec	21 Aug 2009 17:33:20 -0000	1.12
+++ rubygem-nokogiri.spec	1 Dec 2009 16:42:26 -0000	1.13
@@ -13,7 +13,7 @@
 Summary:	An HTML, XML, SAX, and Reader parser
 Name:		rubygem-%{gemname}
 Version:	1.3.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://nokogiri.rubyforge.org/nokogiri/
@@ -202,6 +202,9 @@ popd
 %{ruby_sitelib}/xsd/
 
 %changelog
+* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-3
+- Rebuild against libxml2 again (bug 537303)
+
 * Sat Aug 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-2
 - Fix test failure on sparc
 



From than at fedoraproject.org  Tue Dec  1 16:42:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:42:35 +0000 (UTC)
Subject: rpms/kdepimlibs/F-12 .cvsignore, 1.45, 1.46 kdepimlibs.spec, 1.103, 
	1.104 sources, 1.44, 1.45
Message-ID: <20091201164235.7641F11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3477

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-12/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	10 Nov 2009 15:18:17 -0000	1.45
+++ .cvsignore	1 Dec 2009 16:42:35 -0000	1.46
@@ -1 +1,2 @@
 kdepimlibs-4.3.3.tar.bz2
+kdepimlibs-4.3.4.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-12/kdepimlibs.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- kdepimlibs.spec	13 Nov 2009 16:07:18 -0000	1.103
+++ kdepimlibs.spec	1 Dec 2009 16:42:35 -0000	1.104
@@ -3,8 +3,8 @@
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.3
-Release: 2%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -197,6 +197,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup, remove Fedora<=9 conditionals
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-12/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	10 Nov 2009 15:18:17 -0000	1.44
+++ sources	1 Dec 2009 16:42:35 -0000	1.45
@@ -1 +1 @@
-ff83c198e0dc8be77c4099c82daae021  kdepimlibs-4.3.3.tar.bz2
+c3aa4a290c3e3b718efc41a60442b57c  kdepimlibs-4.3.4.tar.bz2



From rrix at fedoraproject.org  Tue Dec  1 16:43:35 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue,  1 Dec 2009 16:43:35 +0000 (UTC)
Subject: rpms/kmagnet/F-11 kmagnet.spec,1.2,1.3
Message-ID: <20091201164335.6004811C00DE@cvs1.fedora.phx.redhat.com>

Author: rrix

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

Modified Files:
	kmagnet.spec 
Log Message:
* Tue Dec 1  2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.04-3
- Bumping spec for F-11 build                                          




Index: kmagnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-11/kmagnet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kmagnet.spec	25 Nov 2009 01:24:45 -0000	1.2
+++ kmagnet.spec	1 Dec 2009 16:43:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kmagnet
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple puzzle game with a built-in puzzle editor
 
 Group:          Amusements/Games
@@ -73,6 +73,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Dec 1  2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.04-3
+- Bumping spec for F-11 build
+
 * Tue Nov 24 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.04-2
 - Rebuilding against latest Qt.
 



From than at fedoraproject.org  Tue Dec  1 16:44:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:44:25 +0000 (UTC)
Subject: File kdepim-runtime-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201164425.733E710F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdepim-runtime:

e6fe3a639f4ab878dba2e84fd974e872  kdepim-runtime-4.3.4.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 16:45:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 16:45:15 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec, 1.233,
	1.234 ggz-api-changes.patch, 1.1,
	NONE gnome-games-2.19.4-gnometris-rebrand.patch, 1.2, NONE
Message-ID: <20091201164515.24CBF11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-games.spec 
Removed Files:
	ggz-api-changes.patch 
	gnome-games-2.19.4-gnometris-rebrand.patch 
Log Message:
remove obsolete patches


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- gnome-games.spec	1 Dec 2009 14:54:29 -0000	1.233
+++ gnome-games.spec	1 Dec 2009 16:45:14 -0000	1.234
@@ -51,9 +51,6 @@ Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
 Source: http://download.gnome.org/sources/gnome-games/2.28/gnome-games-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=551455
-Patch0: ggz-api-changes.patch
-Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-games-devel
@@ -129,17 +126,6 @@ This package contains user documentation
 
 %prep
 %setup -q
-%patch0 -p1 -b .ggz-api-changes
-# rebrand gnometris as some think the name is to similar to a trademark
-%patch1 -p1 -b .rebrand
-
-sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
-  -e 's/GNOMEtris/GnomeFallingBlocks/g' \
-  po/*.po gnometris/help/*/*.po gnometris/help/C/gnometris.xml \
-  gnometris/*.cpp gnometris/gnometris.desktop.in.in
-
-#cp -f gnometris/sounds/gameover.wav gnobots2/bad.wav
-#cp -f gnometris/sounds/gameover.wav gnibbles/sounds/pop.wav
 
 %build
 


--- ggz-api-changes.patch DELETED ---


--- gnome-games-2.19.4-gnometris-rebrand.patch DELETED ---



From than at fedoraproject.org  Tue Dec  1 16:45:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:45:22 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-12 .cvsignore, 1.8, 1.9 kdepim-runtime.spec, 
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20091201164522.BF61711C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4629

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	11 Nov 2009 01:51:59 -0000	1.8
+++ .cvsignore	1 Dec 2009 16:45:22 -0000	1.9
@@ -1 +1,2 @@
 kdepim-runtime-4.3.3.tar.bz2
+kdepim-runtime-4.3.4.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-12/kdepim-runtime.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kdepim-runtime.spec	11 Nov 2009 01:52:00 -0000	1.10
+++ kdepim-runtime.spec	1 Dec 2009 16:45:22 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 
 License: GPLv2
@@ -131,6 +131,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Nov 2009 01:52:00 -0000	1.8
+++ sources	1 Dec 2009 16:45:22 -0000	1.9
@@ -1 +1 @@
-025bbb82f273d28c7507b5b366000b3f  kdepim-runtime-4.3.3.tar.bz2
+e6fe3a639f4ab878dba2e84fd974e872  kdepim-runtime-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 16:46:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:46:37 +0000 (UTC)
Subject: File kdeplasma-addons-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201164637.4B21010F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeplasma-addons:

c03ab7099a8064ca85bb804408052a2b  kdeplasma-addons-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 16:48:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:48:03 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-12 .cvsignore, 1.22,
	1.23 kdeplasma-addons.spec, 1.67, 1.68 sources, 1.22, 1.23
Message-ID: <20091201164803.33A2411C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5416

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	10 Nov 2009 15:19:53 -0000	1.22
+++ .cvsignore	1 Dec 2009 16:48:02 -0000	1.23
@@ -1 +1,2 @@
 kdeplasma-addons-4.3.3.tar.bz2
+kdeplasma-addons-4.3.4.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-12/kdeplasma-addons.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- kdeplasma-addons.spec	10 Nov 2009 15:19:53 -0000	1.67
+++ kdeplasma-addons.spec	1 Dec 2009 16:48:02 -0000	1.68
@@ -1,6 +1,6 @@
 
 Name:           kdeplasma-addons
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -163,6 +163,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	10 Nov 2009 15:19:53 -0000	1.22
+++ sources	1 Dec 2009 16:48:02 -0000	1.23
@@ -1 +1 @@
-f034c8ded22fd0029b3b4b687774c757  kdeplasma-addons-4.3.3.tar.bz2
+c03ab7099a8064ca85bb804408052a2b  kdeplasma-addons-4.3.4.tar.bz2



From bpepple at fedoraproject.org  Tue Dec  1 16:48:30 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  1 Dec 2009 16:48:30 +0000 (UTC)
Subject: rpms/gedit/devel gedit-2.25.5-fix-python-path.patch, 1.2,
	1.3 gedit.spec, 1.206, 1.207
Message-ID: <20091201164830.6F44411C00DE@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	gedit-2.25.5-fix-python-path.patch gedit.spec 
Log Message:
* Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:2.29.3-2
- Rebase fix python path patch.


gedit-2.25.5-fix-python-path.patch:
 Makefile.am                  |    1 +
 gedit-plugin-loader-python.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: gedit-2.25.5-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit-2.25.5-fix-python-path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gedit-2.25.5-fix-python-path.patch	26 Jan 2009 20:52:25 -0000	1.2
+++ gedit-2.25.5-fix-python-path.patch	1 Dec 2009 16:48:30 -0000	1.3
@@ -1,18 +1,18 @@
-diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
---- gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path	2009-01-12 11:23:48.000000000 -0500
-+++ gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c	2009-01-26 15:35:30.672713673 -0500
-@@ -488,7 +488,7 @@ gedit_python_init (GeditPluginLoaderPyth
+diff -urp gedit-2.29.3.orig/plugin-loaders/python/gedit-plugin-loader-python.c gedit-2.29.3/plugin-loaders/python/gedit-plugin-loader-python.c
+--- gedit-2.29.3.orig/plugin-loaders/python/gedit-plugin-loader-python.c	2009-11-28 13:47:48.000000000 -0500
++++ gedit-2.29.3/plugin-loaders/python/gedit-plugin-loader-python.c	2009-12-01 11:33:02.635871946 -0500
+@@ -486,7 +486,7 @@ gedit_python_init (GeditPluginLoaderPyth
+ 	PyObject *mdict, *tuple;
+ 	PyObject *gedit, *geditutils, *geditcommands, *geditplugins;
  	PyObject *gettext, *install, *gettext_args;
- 	struct sigaction old_sigint;
- 	gint res;
 -	char *argv[] = { "gedit", NULL };
 +	char *argv[] = { GEDIT_PLUGINS_LIBS_DIR, NULL };
- 
- 	if (loader->priv->init_failed)
- 	{
-diff -up gedit-2.25.5/plugin-loaders/python/Makefile.am.fix-python-path gedit-2.25.5/plugin-loaders/python/Makefile.am
---- gedit-2.25.5/plugin-loaders/python/Makefile.am.fix-python-path	2009-01-26 15:51:12.102965135 -0500
-+++ gedit-2.25.5/plugin-loaders/python/Makefile.am	2009-01-26 15:35:49.978712718 -0500
+ #ifdef HAVE_SIGACTION
+ 	gint res;
+ 	struct sigaction old_sigint;
+diff -urp gedit-2.29.3.orig/plugin-loaders/python/Makefile.am gedit-2.29.3/plugin-loaders/python/Makefile.am
+--- gedit-2.29.3.orig/plugin-loaders/python/Makefile.am	2009-09-20 13:43:50.000000000 -0400
++++ gedit-2.29.3/plugin-loaders/python/Makefile.am	2009-12-01 11:33:44.012872511 -0500
 @@ -13,6 +13,7 @@ INCLUDES = \
  	$(DISABLE_DEPRECATED_CFLAGS)					\
  	$(PYGTK_CFLAGS)							\


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- gedit.spec	1 Dec 2009 14:55:54 -0000	1.206
+++ gedit.spec	1 Dec 2009 16:48:30 -0000	1.207
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.29.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -230,6 +230,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:2.29.3-2
+- Rebase fix python path patch.
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From spot at fedoraproject.org  Tue Dec  1 16:48:31 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:48:31 +0000 (UTC)
Subject: File c-ares-1.7.0.tar.gz uploaded to lookaside cache by spot
Message-ID: <20091201164831.65C7410F885@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for c-ares:

15ab7852306b554b0b1145f41005a3bb  c-ares-1.7.0.tar.gz



From than at fedoraproject.org  Tue Dec  1 16:49:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:49:07 +0000 (UTC)
Subject: File kdesdk-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201164907.302E710F885@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdesdk:

9fff7911d3234d29d9073ee83d7e3a64  kdesdk-4.3.4.tar.bz2



From spot at fedoraproject.org  Tue Dec  1 16:49:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:49:12 +0000 (UTC)
Subject: rpms/c-ares/devel c-ares-1.7.0-optflags.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 c-ares.spec, 1.17, 1.18 sources, 1.9,
	1.10 c-ares-1.6.0-optflags.patch, 1.1, NONE
Message-ID: <20091201164912.4F83011C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/c-ares/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5891

Modified Files:
	.cvsignore c-ares.spec sources 
Added Files:
	c-ares-1.7.0-optflags.patch 
Removed Files:
	c-ares-1.6.0-optflags.patch 
Log Message:
update to 1.7.0

c-ares-1.7.0-optflags.patch:
 configure |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE c-ares-1.7.0-optflags.patch ---
diff -up c-ares-1.7.0/configure.optflags c-ares-1.7.0/configure
--- c-ares-1.7.0/configure.optflags	2009-11-30 16:10:42.000000000 -0500
+++ c-ares-1.7.0/configure	2009-12-01 11:36:41.154374899 -0500
@@ -13988,7 +13988,7 @@ $as_echo "$as_me: WARNING: compiler opti
     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
-    for word2 in $flags_dbg_all; do
+    for word2 in ""; do
       if test "$word1" = "$word2"; then
         ac_var_strip_word="yes"
       fi
@@ -14004,7 +14004,7 @@ $as_echo "$as_me: WARNING: compiler opti
     ac_var_stripped=""
   for word1 in $tmp_CPPFLAGS; do
     ac_var_strip_word="no"
-    for word2 in $flags_dbg_all; do
+    for word2 in ""; do
       if test "$word1" = "$word2"; then
         ac_var_strip_word="yes"
       fi
@@ -14020,12 +14020,12 @@ $as_echo "$as_me: WARNING: compiler opti
     if test "$want_debug" = "yes"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug enabling options" >&5
 $as_echo_n "checking if compiler accepts debug enabling options... " >&6; }
-      tmp_options="$flags_dbg_yes"
+      tmp_options=""
     fi
     if test "$want_debug" = "no"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug disabling options" >&5
 $as_echo_n "checking if compiler accepts debug disabling options... " >&6; }
-      tmp_options="$flags_dbg_off"
+      tmp_options=""
     fi
     #
     CPPFLAGS="$tmp_CPPFLAGS"
@@ -14181,7 +14181,7 @@ $as_echo_n "checking if compiler optimiz
 
   ac_var_match_word="no"
   for word1 in $tmp_CFLAGS; do
-    for word2 in $flags_opt_all; do
+    for word2 in ""; do
       if test "$word1" = "$word2"; then
         ac_var_match_word="yes"
       fi
@@ -14199,7 +14199,7 @@ $as_echo_n "checking if compiler optimiz
 
   ac_var_match_word="no"
   for word1 in $tmp_CPPFLAGS; do
-    for word2 in $flags_opt_all; do
+    for word2 in ""; do
       if test "$word1" = "$word2"; then
         ac_var_match_word="yes"
       fi
@@ -14230,7 +14230,7 @@ $as_echo "$honor_optimize_option" >&6; }
     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
-    for word2 in $flags_opt_all; do
+    for word2 in ""; do
       if test "$word1" = "$word2"; then
         ac_var_strip_word="yes"
       fi
@@ -14246,7 +14246,7 @@ $as_echo "$honor_optimize_option" >&6; }
     ac_var_stripped=""
   for word1 in $tmp_CPPFLAGS; do
     ac_var_strip_word="no"
-    for word2 in $flags_opt_all; do
+    for word2 in ""; do
       if test "$word1" = "$word2"; then
         ac_var_strip_word="yes"
       fi
@@ -14261,12 +14261,12 @@ $as_echo "$honor_optimize_option" >&6; }
       if test "$want_optimize" = "yes"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
 $as_echo_n "checking if compiler accepts optimizer enabling options... " >&6; }
-        tmp_options="$flags_opt_yes"
+        tmp_options=""
       fi
       if test "$want_optimize" = "no"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer disabling options" >&5
 $as_echo_n "checking if compiler accepts optimizer disabling options... " >&6; }
-        tmp_options="$flags_opt_off"
+        tmp_options=""
       fi
       CPPFLAGS="$tmp_CPPFLAGS"
       CFLAGS="$tmp_CFLAGS $tmp_options"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/c-ares/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Jul 2009 22:54:50 -0000	1.9
+++ .cvsignore	1 Dec 2009 16:49:12 -0000	1.10
@@ -1 +1 @@
-c-ares-1.6.0.tar.gz
+c-ares-1.7.0.tar.gz


Index: c-ares.spec
===================================================================
RCS file: /cvs/pkgs/rpms/c-ares/devel/c-ares.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- c-ares.spec	27 Jul 2009 16:39:49 -0000	1.17
+++ c-ares.spec	1 Dec 2009 16:49:12 -0000	1.18
@@ -1,13 +1,13 @@
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
-Version: 1.6.0
-Release: 3%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://c-ares.haxx.se/
 Source0: http://c-ares.haxx.se/c-ares-%{version}.tar.gz
 Source1: LICENSE
-Patch0: %{name}-1.6.0-optflags.patch
+Patch0: %{name}-1.7.0-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -55,13 +55,18 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-, root, root, 0755)
 %{_includedir}/ares.h
+%{_includedir}/ares_build.h
 %{_includedir}/ares_dns.h
+%{_includedir}/ares_rules.h
 %{_includedir}/ares_version.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libcares.pc
 %{_mandir}/man3/ares_*
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.0-1
+- update to 1.7.0
+
 * Sat Jul 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.0-3
 - Patch to make upstream build system honor our CFLAGS and friends.
 - Don't bother building throwaway static libs.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/c-ares/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Jul 2009 22:54:50 -0000	1.9
+++ sources	1 Dec 2009 16:49:12 -0000	1.10
@@ -1 +1 @@
-4503b0db3dd79d3c1f58d87722dbab46  c-ares-1.6.0.tar.gz
+15ab7852306b554b0b1145f41005a3bb  c-ares-1.7.0.tar.gz


--- c-ares-1.6.0-optflags.patch DELETED ---



From than at fedoraproject.org  Tue Dec  1 16:49:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:49:52 +0000 (UTC)
Subject: rpms/kdesdk/F-12 .cvsignore, 1.66, 1.67 kdesdk.spec, 1.153,
	1.154 sources, 1.67, 1.68
Message-ID: <20091201164952.A5B9411C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdesdk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6080

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-12/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	10 Nov 2009 15:21:36 -0000	1.66
+++ .cvsignore	1 Dec 2009 16:49:52 -0000	1.67
@@ -1 +1,2 @@
 kdesdk-4.3.3.tar.bz2
+kdesdk-4.3.4.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-12/kdesdk.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- kdesdk.spec	10 Nov 2009 15:21:36 -0000	1.153
+++ kdesdk.spec	1 Dec 2009 16:49:52 -0000	1.154
@@ -1,6 +1,6 @@
 
 Name:           kdesdk
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-12/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	10 Nov 2009 15:21:36 -0000	1.67
+++ sources	1 Dec 2009 16:49:52 -0000	1.68
@@ -1 +1 @@
-0e0aca0f1f13d877918fb49540443e1b  kdesdk-4.3.3.tar.bz2
+9fff7911d3234d29d9073ee83d7e3a64  kdesdk-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 16:51:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:51:49 +0000 (UTC)
Subject: File kdetoys-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201165149.2845310F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdetoys:

d823f25bfe8f419923b98be04564e975  kdetoys-4.3.4.tar.bz2



From spot at fedoraproject.org  Tue Dec  1 16:52:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:52:22 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.142,1.143
Message-ID: <20091201165222.35A6211C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	mono.spec 
Log Message:
proper perms on mono.snk


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- mono.spec	1 Dec 2009 16:03:58 -0000	1.142
+++ mono.spec	1 Dec 2009 16:52:21 -0000	1.143
@@ -2,7 +2,7 @@
 
 Name:           mono
 Version:        2.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -338,7 +338,7 @@ install monodir %{buildroot}%{_bindir}
 
 # copy the mono.snk key into /etc/pki/mono
 mkdir -p %{buildroot}%{_sysconfdir}/pki/mono
-install -p -m0600 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
+install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 
 %{__rm} %{buildroot}%{_libdir}/*.la
 %{__rm} %{buildroot}%{_libdir}/*.a
@@ -735,6 +735,9 @@ install -p -m0600 %{SOURCE2} %{buildroot
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.6-3
+- perms on mono.snk should be 0644
+
 * Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.6-2
 - generate and package mono.snk for packages without bundled keys to use
 - put mono.snk in /etc/pki/mono/



From than at fedoraproject.org  Tue Dec  1 16:52:36 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:52:36 +0000 (UTC)
Subject: rpms/kdetoys/F-12 .cvsignore, 1.43, 1.44 kdetoys.spec, 1.61,
	1.62 sources, 1.40, 1.41
Message-ID: <20091201165236.6953C11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdetoys/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6685

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-12/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	10 Nov 2009 15:22:08 -0000	1.43
+++ .cvsignore	1 Dec 2009 16:52:36 -0000	1.44
@@ -1 +1,2 @@
 kdetoys-4.3.3.tar.bz2
+kdetoys-4.3.4.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-12/kdetoys.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- kdetoys.spec	10 Nov 2009 15:22:08 -0000	1.61
+++ kdetoys.spec	1 Dec 2009 16:52:36 -0000	1.62
@@ -2,7 +2,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -83,6 +83,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-12/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	10 Nov 2009 15:22:08 -0000	1.40
+++ sources	1 Dec 2009 16:52:36 -0000	1.41
@@ -1 +1 @@
-1a40a60cc6712b744bd987b9278c9b27  kdetoys-4.3.3.tar.bz2
+d823f25bfe8f419923b98be04564e975  kdetoys-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 16:55:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:55:57 +0000 (UTC)
Subject: File kdeutils-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201165557.A216F10F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeutils:

576852bb88515ccbbb859e245c939d31  kdeutils-4.3.4.tar.bz2



From notting at fedoraproject.org  Tue Dec  1 16:55:54 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  1 Dec 2009 16:55:54 +0000 (UTC)
Subject: rpms/gnucash/devel gnucash.spec,1.103,1.104
Message-ID: <20091201165554.CA08211C00DE@cvs1.fedora.phx.redhat.com>

Author: notting

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

Modified Files:
	gnucash.spec 
Log Message:
Update to 2.3.x.



Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gnucash.spec	1 Dec 2009 15:30:00 -0000	1.103
+++ gnucash.spec	1 Dec 2009 16:55:54 -0000	1.104
@@ -1,20 +1,21 @@
-%define schemas /etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas /etc/gconf/schemas/apps_gnucash_dialog_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_hbci.schemas /etc/gconf/schemas/apps_gnucash_dialog_prices.schemas /etc/gconf/schemas/apps_gnucash_dialog_print_checks.schemas /etc/gconf/schemas/apps_gnucash_dialog_reconcile.schemas /etc/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas /etc/gconf/schemas/apps_gnucash_dialog_totd.schemas /etc/gconf/schemas/apps_gnucash_general.schemas /etc/gconf/schemas/apps_gnucash_history.schemas /etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas /etc/gconf/schemas/apps_gnucash_warnings.schemas /etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas /etc/gconf/schemas/apps_gnucash_window_pages_register.schemas /etc/gconf/schemas/apps_gnucash_import_qif.schemas
+%define schemas /etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas /etc/gconf/schemas/apps_gnucash_dialog_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_hbci.schemas /etc/gconf/schemas/apps_gnucash_dialog_prices.schemas /etc/gconf/schemas/apps_gnucash_dialog_print_checks.schemas /etc/gconf/schemas/apps_gnucash_dialog_reconcile.schemas /etc/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas /etc/gconf/schemas/apps_gnucash_dialog_totd.schemas /etc/gconf/schemas/apps_gnucash_general.schemas /etc/gconf/schemas/apps_gnucash_history.schemas /etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas /etc/gconf/schemas/apps_gnucash_import_qif.schemas /etc/gconf/schemas/apps_gnucash_warnings.schemas /etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas /etc/gconf/schemas/apps_gnucash_window_pages_register.schemas 
 
 Name: gnucash
 Summary: Finance management application
-Version: 2.2.9
+Version: 2.3.7
 URL: http://gnucash.org/
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
-Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.lzma
+Source: http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/gnucash-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtkhtml3-devel
+BuildRequires: webkitgtk-devel, libxml2 >= 2.5.10, zlib-devel
 BuildRequires: libgsf-devel >= 1.12.2, goffice-devel, swig
-BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
+BuildRequires: libglade2-devel >= 2.4, libgnomeui >= 2.4
 BuildRequires: libofx-devel, aqbanking-devel, guile-devel
 BuildRequires: desktop-file-utils, texinfo
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
+BuildRequires: python-devel, libdbi-devel
 Patch0: gnucash-quiet.patch
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
@@ -42,10 +43,14 @@ find src/quotes -name "*.in" -exec sed -
 %build
 chmod 644 src/import-export/import-commodity-matcher.c
 
-%configure --disable-sql --enable-error-on-warning=no \
+%configure  --enable-error-on-warning=no \
 	--enable-ofx \
 	--enable-hbci \
-	--disable-static
+	--with-html-engine=webkit \
+	--enable-locale-specific-tax \
+	--enable-dbi \
+ 	--disable-static
+#	--enable-python-bindings \ this is broken
 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|^link_all_deplibs=no|link_all_deplibs=unknown|g' libtool
@@ -62,10 +67,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
 desktop-file-install --vendor gnome --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--remove-category Application \
-	--add-category Office \
 	$RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop
-echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop
+#echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop
 
 mv $RPM_BUILD_ROOT/%{_libdir}/lib* $RPM_BUILD_ROOT/%{_libdir}/gnucash
 
@@ -74,9 +77,6 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \
 	$RPM_BUILD_ROOT/%{_datadir}/aclocal \
 	$RPM_BUILD_ROOT/%{_libdir}/lib*.a \
 	$RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a \
-	$RPM_BUILD_ROOT/%{_datadir}/gnome/apps \
-	$RPM_BUILD_ROOT/%{_libdir}/pkgconfig \
-	$RPM_BUILD_ROOT/%{_bindir}/gnucash-config
 
 find $RPM_BUILD_ROOT/%{_libdir} -name *.la -exec rm -f {} \;
 
@@ -124,12 +124,12 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 %{_mandir}/man*/*
 %config(noreplace) %{_sysconfdir}/gnucash/*
-%doc AUTHORS COPYING ChangeLog* HACKING NEWS README README.patches
-%doc doc/README.german doc/README.francais doc/guile-hackers.txt
+%doc AUTHORS COPYING ChangeLog* HACKING NEWS README
+%doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI
 
 %changelog
-* Tue Dec  1 2009 Bill Nottingham <notting at redhat.com> - 2.2.9-4
-- Rebuild against new goffice
+* Tue Dec  1 2009 Bill Nottingham <notting at redhat.com> - 2.3.7-1
+- Update to development version.
 
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.9-3
 - Use lzma compressed upstream tarball.



From spot at fedoraproject.org  Tue Dec  1 16:56:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:56:14 +0000 (UTC)
Subject: rpms/mono-cecil-flowanalysis/devel mono-cecil-flowanalysis.spec,
	1.10, 1.11
Message-ID: <20091201165614.25F1311C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mono-cecil-flowanalysis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7370

Modified Files:
	mono-cecil-flowanalysis.spec 
Log Message:
rebuild to use system key


Index: mono-cecil-flowanalysis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-cecil-flowanalysis/devel/mono-cecil-flowanalysis.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mono-cecil-flowanalysis.spec	26 Oct 2009 20:35:37 -0000	1.10
+++ mono-cecil-flowanalysis.spec	1 Dec 2009 16:56:14 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:	 	mono-cecil-flowanalysis
 Version:	0.1
-Release:	0.10.20080409svn100264%{?dist}
+Release:	0.11.20080409svn100264%{?dist}
 Summary:	Flowanalysis engine for Cecil
 URL:		http://anonsvn.mono-project.com/viewcvs/trunk/cecil/flowanalysis/
 License:	MIT
@@ -34,7 +34,8 @@ Development files for mono-cecil-flowana
 %patch0 -p1
 
 %build
-sn -k Cecil.FlowAnalysis.snk
+# Use the mono system key instead of generating our own here.
+cp -a /etc/pki/mono/mono.snk Cecil.FlowAnalysis.snk
 make LIBDIR=%{_libdir}
 
 %install
@@ -59,6 +60,9 @@ gacutil -i bin/Cecil.FlowAnalysis.dll -f
 %{_libdir}/pkgconfig/cecil-flowanalysis.pc
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1-0.11.20080409svn100264
+- use the system mono.snk key instead of regenerating on every build
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.1-0.10.20080409svn100264
 - ExcludeArch sparc64
 



From spot at fedoraproject.org  Tue Dec  1 16:56:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:56:41 +0000 (UTC)
Subject: rpms/mono-sharpcvslib/devel mono-sharpcvslib.spec,1.11,1.12
Message-ID: <20091201165641.6240E11C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mono-sharpcvslib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7518

Modified Files:
	mono-sharpcvslib.spec 
Log Message:
rebuild to use system key


Index: mono-sharpcvslib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-sharpcvslib/devel/mono-sharpcvslib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mono-sharpcvslib.spec	26 Oct 2009 20:38:31 -0000	1.11
+++ mono-sharpcvslib.spec	1 Dec 2009 16:56:41 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:	 	mono-sharpcvslib
 Version:	0.35
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Client cvs library written in C#
 URL:		http://sharpcvslib.sourceforge.net/
 # Exception: Permission is given to use this library in commercial closed-source applications
@@ -50,8 +50,8 @@ cp %{_libdir}/mono/nunit22/nunit.framewo
 %{__sed} -i 's/\r//' src/doc/COPYING.txt
 
 %build
-# create a Strong Name key to allow build to run
-sn -k SharpCvsLib.snk
+# Use the mono system key instead of generating our own here.
+cp -a /etc/pki/mono/mono.snk SharpCvsLib.snk
 cd src/build
 nant -buildfile:SharpCvsLib.build build.all
 # This command works mostly, but fails at the end trying to talk to the Windows registry.
@@ -95,6 +95,9 @@ mv src/doc/api/msdn/tree.js{.utf8,}
 %{_libdir}/pkgconfig/sharpcvslib.pc
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.35-13
+- use the system mono.snk key instead of regenerating on every build
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.35-12
 - ExcludeArch sparc64
 



From than at fedoraproject.org  Tue Dec  1 16:56:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 16:56:54 +0000 (UTC)
Subject: rpms/kdeutils/F-12 .cvsignore, 1.71, 1.72 kdeutils.spec, 1.198,
	1.199 sources, 1.71, 1.72
Message-ID: <20091201165654.4F23D11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7604

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-12/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	10 Nov 2009 15:22:42 -0000	1.71
+++ .cvsignore	1 Dec 2009 16:56:54 -0000	1.72
@@ -1 +1,2 @@
 kdeutils-4.3.3.tar.bz2
+kdeutils-4.3.4.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-12/kdeutils.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- kdeutils.spec	13 Nov 2009 15:45:16 -0000	1.198
+++ kdeutils.spec	1 Dec 2009 16:56:54 -0000	1.199
@@ -4,8 +4,8 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.3
-Release:        2%{?dist}
+Version:        4.3.4
+Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -215,6 +215,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup, Fix conditional for RHEL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-12/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	10 Nov 2009 15:22:42 -0000	1.71
+++ sources	1 Dec 2009 16:56:54 -0000	1.72
@@ -1 +1 @@
-f3a587fa319d01f5305ef746933f3fb3  kdeutils-4.3.3.tar.bz2
+576852bb88515ccbbb859e245c939d31  kdeutils-4.3.4.tar.bz2



From spot at fedoraproject.org  Tue Dec  1 16:57:06 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:57:06 +0000 (UTC)
Subject: rpms/log4net/devel log4net.spec,1.8,1.9
Message-ID: <20091201165706.19FBA11C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	log4net.spec 
Log Message:
rebuild to use system key


Index: log4net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4net/devel/log4net.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- log4net.spec	29 Nov 2009 19:48:15 -0000	1.8
+++ log4net.spec	1 Dec 2009 16:57:05 -0000	1.9
@@ -12,7 +12,7 @@ URL:		http://logging.apache.org/log4net/
 License:	ASL 2.0
 Group:		System Environment/Libraries
 Version:	1.2.10
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	A .NET framework for logging
 Source:		http://cvs.apache.org/dist/incubator/log4net/1.2.10/incubating-log4net-1.2.10.zip
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -46,8 +46,8 @@ framework to the .NET runtime
 rm -rf bin/
 
 %build
-# create a Strong Name key to allow build to run
-sn -k log4net.snk
+# Use system mono.snk key
+ln -s /etc/pki/mono/mono.snk log4net.snk
 # ASF recommend using nant to build log4net
 nant -buildfile:log4net.build compile-all
 
@@ -84,6 +84,9 @@ gacutil -i bin/mono/1.0/release/log4net.
 
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.10-10
+- use system mono.snk key instead of generating our own on each build
+
 * Sun Nov 29 2009 Christopher Brown <snecklifter at gmail.com> - 1.2.10-9
 - Fix pkg-config file location
 



From spot at fedoraproject.org  Tue Dec  1 16:59:48 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 16:59:48 +0000 (UTC)
Subject: rpms/mono-ndoc/devel mono-ndoc.spec,1.6,1.7
Message-ID: <20091201165949.062C811C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mono-ndoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8388

Modified Files:
	mono-ndoc.spec 
Log Message:
rebuild to use system key


Index: mono-ndoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-ndoc/devel/mono-ndoc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mono-ndoc.spec	26 Oct 2009 20:23:20 -0000	1.6
+++ mono-ndoc.spec	1 Dec 2009 16:59:48 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:	 	mono-ndoc
 Version:	1.3.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Code Documentation Generator for .NET
 URL:		http://ndoc.sourceforge.net/
 License:	GPLv2+
@@ -39,8 +39,8 @@ Development files for mono-ndoc.
 %{__sed} -i 's/\r//' README.txt
 
 %build
-# create a Strong Name key to allow build to run
-sn -k NDoc.snk
+# Use the mono system key instead of generating our own here.
+cp -a /etc/pki/mono/mono.snk NDoc.snk
 nant -t:mono-1.0
 # This one gets far enough, before throwing an odd windows error.
 nant -t:mono-1.0 sdkdoc ||:
@@ -90,6 +90,9 @@ rm -rf -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndoc.pc
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.1-8
+- use the system mono.snk key instead of regenerating on every build
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.1-7
 - ExcludeArch sparc64 no mono available
 



From than at fedoraproject.org  Tue Dec  1 17:00:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:00:52 +0000 (UTC)
Subject: File kde-l10n-ar-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170052.362A910F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

2d73adb358b1f3eb0eeec4f0c919ffed  kde-l10n-ar-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:00:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:00:53 +0000 (UTC)
Subject: File oxygen-icons-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170053.C513C10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for oxygen-icon-theme:

8029e49f68f38f808e4aff16e491c3cb  oxygen-icons-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:01:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:01:06 +0000 (UTC)
Subject: File kde-l10n-bg-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170106.A20D410F885@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

d468203ae533fb59f74f5cc71405d763  kde-l10n-bg-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:01:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:01:16 +0000 (UTC)
Subject: File kde-l10n-bn_IN-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201170116.C757D10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

cd9d9380d430c9ba3598bccae28b40f7  kde-l10n-bn_IN-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:01:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:01:31 +0000 (UTC)
Subject: File kde-l10n-ca-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170131.70AD010F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

7dabd7c092d4c166ad3aec4959085f50  kde-l10n-ca-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:01:44 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:01:44 +0000 (UTC)
Subject: File kde-l10n-cs-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170144.EF8D710F895@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

4f214f3ea3d989c7be118ab81169d180  kde-l10n-cs-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:01:55 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:01:55 +0000 (UTC)
Subject: File kde-l10n-csb-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170155.73ADB10F899@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

add6a35d71363fd302f2e70f6527dc65  kde-l10n-csb-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:02:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:02:21 +0000 (UTC)
Subject: File kde-l10n-da-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170221.E823F10F885@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

80ebea9a323b082a3f9a6b02a3eeb405  kde-l10n-da-4.3.4.tar.bz2



From spot at fedoraproject.org  Tue Dec  1 17:02:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 17:02:29 +0000 (UTC)
Subject: rpms/mono-nunit22/devel mono-nunit22.spec,1.15,1.16
Message-ID: <20091201170229.2350F11C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mono-nunit22/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9094

Modified Files:
	mono-nunit22.spec 
Log Message:
rebuild to use system key


Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mono-nunit22.spec	26 Oct 2009 19:11:20 -0000	1.15
+++ mono-nunit22.spec	1 Dec 2009 17:02:28 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:	 	mono-nunit22
 Version:	2.2.10
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Unit-testing framework for .NET
 URL:		http://www.nunit.org/
 License:	MIT with acknowledgement
@@ -42,7 +42,8 @@ Development files for mono-nunit22.
 %patch1 -p1 -b .key
 
 %build
-sn -k nunit.snk
+# Use the mono system key instead of generating our own here.
+cp -a /etc/pki/mono/mono.snk nunit.snk
 cd src
 nant mono-2.0 release build-all
 
@@ -78,6 +79,9 @@ rm -rf -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.2.10-12
+- use the system mono.snk key instead of regenerating on every build
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1:2.2.10-11
 - ExcludeArch sparc64  no mono
 



From than at fedoraproject.org  Tue Dec  1 17:02:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:02:50 +0000 (UTC)
Subject: File kde-l10n-de-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170250.437AA10F885@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

ba476ae2c6417b7122d5b9bac250171d  kde-l10n-de-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:03:02 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:03:02 +0000 (UTC)
Subject: File kde-l10n-el-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170302.F1F8310F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

6d3d77b85ea7d4c9d1f8fe115d618290  kde-l10n-el-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:03:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:03:04 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-12 .cvsignore, 1.12,
	1.13 oxygen-icon-theme.spec, 1.11, 1.12 sources, 1.11, 1.12
Message-ID: <20091201170304.3985B11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/oxygen-icon-theme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9259

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	10 Nov 2009 15:28:09 -0000	1.12
+++ .cvsignore	1 Dec 2009 17:03:04 -0000	1.13
@@ -1 +1,2 @@
 oxygen-icons-4.3.3.tar.bz2
+oxygen-icons-4.3.4.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-12/oxygen-icon-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- oxygen-icon-theme.spec	10 Nov 2009 15:28:09 -0000	1.11
+++ oxygen-icon-theme.spec	1 Dec 2009 17:03:04 -0000	1.12
@@ -1,7 +1,7 @@
 
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.3
+Version:       4.3.4
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -14,9 +14,6 @@ BuildArch:     noarch
 BuildRequires: cmake
 BuildRequires: kde-filesystem
 
-# some icons moved here in older kdepim's...
-#Conflicts: kdepim < 4.2.85
-
 Obsoletes: oxygen-icon-theme-scalable < 4.2.85 
 
 
@@ -67,6 +64,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	10 Nov 2009 15:28:09 -0000	1.11
+++ sources	1 Dec 2009 17:03:04 -0000	1.12
@@ -1 +1 @@
-4eabdae208de4f9bb49e9049237adfa4  oxygen-icons-4.3.3.tar.bz2
+8029e49f68f38f808e4aff16e491c3cb  oxygen-icons-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:03:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:03:16 +0000 (UTC)
Subject: File kde-l10n-en_GB-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201170316.4F57810F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

2ea3bae93419d93c2faac7840a9a27f4  kde-l10n-en_GB-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:03:46 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:03:46 +0000 (UTC)
Subject: File kde-l10n-es-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170346.A76D710F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

24b340a3cfa79b1b4899c84d1f0ad230  kde-l10n-es-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:04:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:04:04 +0000 (UTC)
Subject: File kde-l10n-et-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170404.D525E10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

f5932ae6ed6aec29579ba595c8e3334e  kde-l10n-et-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:04:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:04:16 +0000 (UTC)
Subject: File kde-l10n-eu-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170416.8D21310F886@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

7d892b41f864dfaf4d6e9b8cce005395  kde-l10n-eu-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:04:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:04:28 +0000 (UTC)
Subject: File kde-l10n-fi-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170428.8A95410F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

38d66cd08bf356133b4986a7fa63812f  kde-l10n-fi-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:04:58 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:04:58 +0000 (UTC)
Subject: File kde-l10n-fr-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170458.9D26910F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

61ed95c6bb94bbf72154e9a0f431dee8  kde-l10n-fr-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:05:09 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:05:09 +0000 (UTC)
Subject: File kde-l10n-fy-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170509.9738E10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

18fefb04c19f853857608e76ac92d347  kde-l10n-fy-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:05:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:05:22 +0000 (UTC)
Subject: File kde-l10n-ga-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170522.656AE10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

cb1a76b150ebe92e5ad525e6ad73120c  kde-l10n-ga-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:05:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:05:35 +0000 (UTC)
Subject: File kde-l10n-gl-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170535.811C210F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

d9c2b86c480331baacc5fe2c41dd3ae9  kde-l10n-gl-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:05:46 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:05:46 +0000 (UTC)
Subject: File kde-l10n-gu-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170546.1901510F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

bc9ae9382884c0d47dd78f0337269aa1  kde-l10n-gu-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:05:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:05:57 +0000 (UTC)
Subject: File kde-l10n-he-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170557.DDCF210F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

1ce3ad54d4c326dc0baf8c93eedad6c3  kde-l10n-he-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:06:09 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:06:09 +0000 (UTC)
Subject: File kde-l10n-hi-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170609.6D2C110F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

cfb080c77df6786af13ff5f941249dc7  kde-l10n-hi-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:06:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:06:21 +0000 (UTC)
Subject: File kde-l10n-hne-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170621.B4D0B10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

97b855ed04401232870b10850caf3206  kde-l10n-hne-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:06:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:06:33 +0000 (UTC)
Subject: File kde-l10n-hr-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170633.6265410F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

41783012c413f2c48e56fcff617cf6d4  kde-l10n-hr-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:06:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:06:47 +0000 (UTC)
Subject: File kde-l10n-hu-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170647.4B13510F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

0df236588e7e23eccb0076cec1108053  kde-l10n-hu-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:06:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:06:59 +0000 (UTC)
Subject: File kde-l10n-is-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170659.7126610F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

d1bfab3e284d7c410880edf3340af209  kde-l10n-is-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:07:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:07:22 +0000 (UTC)
Subject: File kde-l10n-it-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170722.8F83010F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

b86e79c9ac034377db708fb4ca2f9b72  kde-l10n-it-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:07:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:07:34 +0000 (UTC)
Subject: File kde-l10n-ja-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170734.AF7D810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

1580ec2c425326dd8f950ff0dd00ca87  kde-l10n-ja-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:07:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:07:45 +0000 (UTC)
Subject: File kde-l10n-kk-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170745.E453A10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

8d4937b8f9930b131a5f3c5a4e6e3478  kde-l10n-kk-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:07:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:07:57 +0000 (UTC)
Subject: File kde-l10n-km-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170757.AC1DD10F886@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

4050dd1076eda5be70c2020471935705  kde-l10n-km-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:08:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:08:07 +0000 (UTC)
Subject: File kde-l10n-kn-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170807.D493610F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

266540f3cb982d9db697393710d2daba  kde-l10n-kn-4.3.4.tar.bz2



From jussilehtola at fedoraproject.org  Tue Dec  1 17:08:13 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue,  1 Dec 2009 17:08:13 +0000 (UTC)
Subject: rpms/gromacs/devel gromacs.spec,1.16,1.17
Message-ID: <20091201170813.5253111C00DE@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	gromacs.spec 
Log Message:
Fix obsoletes.


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gromacs.spec	1 Dec 2009 15:31:50 -0000	1.16
+++ gromacs.spec	1 Dec 2009 17:08:13 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -161,7 +161,7 @@ Group:		Applications/Engineering
 Requires:	bash-completion
 BuildArch:	noarch
 # Due to switch to noarch package
-Obsoletes:	gromacs-common < %{version}-%{release}
+Obsoletes:	gromacs-bash < %{version}-%{release}
 
 
 %description bash
@@ -180,7 +180,7 @@ Group:		Applications/Engineering
 Requires:	zsh
 BuildArch:	noarch
 # Due to switch to noarch package
-Obsoletes:	gromacs-common < %{version}-%{release}
+Obsoletes:	gromacs-zsh < %{version}-%{release}
 
 
 %description zsh
@@ -200,7 +200,7 @@ Group:		Applications/Engineering
 Requires:	csh
 BuildArch:	noarch
 # Due to switch to noarch package
-Obsoletes:	gromacs-common < %{version}-%{release}
+Obsoletes:	gromacs-csh < %{version}-%{release}
 
 
 %description csh
@@ -219,7 +219,7 @@ Group:		Applications/Engineering
 Requires:	gromacs-common = %{version}-%{release}
 BuildArch:	noarch
 # Due to switch to noarch package
-Obsoletes:	gromacs-common < %{version}-%{release}
+Obsoletes:	gromacs-tutor < %{version}-%{release}
 
 %description tutor
 GROMACS is a versatile and extremely well optimized package to perform
@@ -515,6 +515,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-4
+- Fix obsoletes.
+
 * Mon Nov 30 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-3
 - Combine libs with binaries and drop debug packages to avoid explosion of
   number of packages.



From than at fedoraproject.org  Tue Dec  1 17:08:19 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:08:19 +0000 (UTC)
Subject: File kde-l10n-ko-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170819.F0A4B10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

0202b9ebb86cc26a36384bd598afeb5e  kde-l10n-ko-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:08:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:08:30 +0000 (UTC)
Subject: File kde-l10n-ku-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170830.7CE4110F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

ab7a052798fc51faa0a94a01dd1e1fc3  kde-l10n-ku-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:08:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:08:42 +0000 (UTC)
Subject: File kde-l10n-lt-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170842.4873110F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

5efb2bc39d2fa08220897b0f57d6c7ae  kde-l10n-lt-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:08:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:08:53 +0000 (UTC)
Subject: File kde-l10n-lv-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170853.D738A10F887@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

8ded0ecb924727cbda41cc7c5dd22658  kde-l10n-lv-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:09:05 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:09:05 +0000 (UTC)
Subject: File kde-l10n-mai-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170905.4DDCE10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

f9fce92ec2e11282a8f84a5b8f569cf2  kde-l10n-mai-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:09:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:09:16 +0000 (UTC)
Subject: File kde-l10n-mk-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170916.A87F910F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

5b2ea5d30b4663d6e7a5a1339bd4ddfd  kde-l10n-mk-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:09:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:09:45 +0000 (UTC)
Subject: File kde-l10n-ml-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170945.43BBA10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

42e04d77fa45304a5a9e13bd7162473a  kde-l10n-ml-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:09:55 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:09:55 +0000 (UTC)
Subject: File kde-l10n-mr-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201170955.9776A10F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

516925365fcb2a3352ac980528a3326b  kde-l10n-mr-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:10:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:10:08 +0000 (UTC)
Subject: File kde-l10n-nb-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171008.3C2E810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

9946e4b4effae6b828e9d862f61c842f  kde-l10n-nb-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:10:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:10:21 +0000 (UTC)
Subject: File kde-l10n-nds-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171021.7E08A10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

da4c91959f13d388e6abe5d1a94d8abe  kde-l10n-nds-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:10:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:10:45 +0000 (UTC)
Subject: File kde-l10n-nl-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171045.E6A1D10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

5d12c9bda8a0391c9eade78d182c3fc0  kde-l10n-nl-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:10:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:10:57 +0000 (UTC)
Subject: File kde-l10n-nn-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171057.CF00A10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

9b0bf27b084abbd255f0f6ee054db683  kde-l10n-nn-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:11:09 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:11:09 +0000 (UTC)
Subject: File kde-l10n-pa-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171109.34DE010F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

ae1ed2219ef4cdee675cb82096d054db  kde-l10n-pa-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:11:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:11:24 +0000 (UTC)
Subject: File kde-l10n-pl-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171124.63DC210F885@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

7ec3ee455517911a26cb1cba5128622c  kde-l10n-pl-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:11:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:11:40 +0000 (UTC)
Subject: File kde-l10n-pt-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171140.6E2D310F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

bbeee1f64ba93fbcf79e120c04227b40  kde-l10n-pt-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:12:09 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:12:09 +0000 (UTC)
Subject: File kde-l10n-pt_BR-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201171209.53EB210F886@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

3d1067f90b936d23bb94caab66a135d9  kde-l10n-pt_BR-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:12:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:12:22 +0000 (UTC)
Subject: File kde-l10n-ro-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171222.4AC6410F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

8e425bb165cc1d02ec93f849999aa4c6  kde-l10n-ro-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:12:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:12:37 +0000 (UTC)
Subject: File kde-l10n-ru-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171237.D3BE910F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

18ca5f88ca87fc5d99ed72147b43a93c  kde-l10n-ru-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:12:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:12:49 +0000 (UTC)
Subject: File kde-l10n-sk-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171249.A400710F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

634dc5ce6ea811f84fa56a0d5db70a07  kde-l10n-sk-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:13:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:13:03 +0000 (UTC)
Subject: File kde-l10n-sl-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171303.8493710F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

61c80e183aef028b2905a5421ee56347  kde-l10n-sl-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:13:17 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:13:17 +0000 (UTC)
Subject: File kde-l10n-sr-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171317.B85EB10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

bba4106c38955957a423fb8a6439a5ae  kde-l10n-sr-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:13:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:13:45 +0000 (UTC)
Subject: File kde-l10n-sv-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171345.1169610F886@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

bb62f00e607cb1e765e391880851e55e  kde-l10n-sv-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:13:56 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:13:56 +0000 (UTC)
Subject: File kde-l10n-tg-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171356.D201D10F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

d2fd9ef0ab4c6d4d6c60e7d36d6d761e  kde-l10n-tg-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:14:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:14:07 +0000 (UTC)
Subject: File kde-l10n-th-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171407.DB8C210F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

88b9a1d879a604df38457010b1a5b0bb  kde-l10n-th-4.3.4.tar.bz2



From hadess at fedoraproject.org  Tue Dec  1 17:14:17 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 17:14:17 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.234,1.235
Message-ID: <20091201171417.D1DE111C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-games.spec 
Log Message:
rename gnometris files to quadrapassel


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- gnome-games.spec	1 Dec 2009 16:45:14 -0000	1.234
+++ gnome-games.spec	1 Dec 2009 17:14:17 -0000	1.235
@@ -400,7 +400,7 @@ fi
 %{_datadir}/applications/gnome-gnotski.desktop
 %{_datadir}/applications/gnome-gtali.desktop
 %{_datadir}/applications/gnome-mahjongg.desktop
-%{_datadir}/applications/gnometris.desktop
+%{_datadir}/applications/quadrapassel.desktop
 
 %{_mandir}/man6/blackjack.6.gz
 %{_mandir}/man6/glchess.6.gz
@@ -408,7 +408,7 @@ fi
 %{_mandir}/man6/gnect.6.gz
 %{_mandir}/man6/gnibbles.6.gz
 %{_mandir}/man6/gnobots2.6.gz
-%{_mandir}/man6/gnometris.6.gz
+%{_mandir}/man6/quadrapassel.6.gz
 %{_mandir}/man6/gnotravex.6.gz
 %{_mandir}/man6/gnotski.6.gz
 %{_mandir}/man6/gtali.6.gz
@@ -417,7 +417,7 @@ fi
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/glines.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnibbles.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnobots2.*
-%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnometris.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/quadrapassel.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnotravex.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnotski.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gtali.*
@@ -451,7 +451,7 @@ fi
 %{_sysconfdir}/gconf/schemas/gnect.schemas
 %{_sysconfdir}/gconf/schemas/gnibbles.schemas
 %{_sysconfdir}/gconf/schemas/gnobots2.schemas
-%{_sysconfdir}/gconf/schemas/gnometris.schemas
+%{_sysconfdir}/gconf/schemas/quadrapassel.schemas
 %{_sysconfdir}/gconf/schemas/gnotravex.schemas
 %{_sysconfdir}/gconf/schemas/gnotski.schemas
 %if %{build_tali}
@@ -465,7 +465,7 @@ fi
 %{_datadir}/gnome-games/gnect
 %{_datadir}/gnome-games/gnibbles
 %{_datadir}/gnome-games/gnobots2
-%{_datadir}/gnome-games/gnometris
+%{_datadir}/gnome-games/quadrapassel
 %{_datadir}/gnome-games/gtali
 %{_datadir}/gnome-games/mahjongg
 %{_datadir}/gnome-games/gnotski
@@ -479,7 +479,7 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-glines.*
 %{_datadir}/icons/hicolor/*/apps/gnome-gnect.*
 %{_datadir}/icons/hicolor/*/apps/gnome-gnibbles.*
-%{_datadir}/icons/hicolor/*/apps/gnome-gnometris.*
+%{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
 %{_datadir}/icons/hicolor/*/apps/gnome-klotski.*
 %{_datadir}/icons/hicolor/*/apps/gnome-mahjongg.*
 %{_datadir}/icons/hicolor/*/apps/gnome-robots.*



From than at fedoraproject.org  Tue Dec  1 17:14:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:14:20 +0000 (UTC)
Subject: File kde-l10n-tr-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171420.53C0910F887@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

c57769548d09e1bd36893c2487de86b3  kde-l10n-tr-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:14:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:14:38 +0000 (UTC)
Subject: File kde-l10n-uk-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171438.D7BB410F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

4b3e975d13f18cc8e69956f28e4fd362  kde-l10n-uk-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:14:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:14:50 +0000 (UTC)
Subject: File kde-l10n-wa-4.3.4.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091201171450.679DB10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

9346dfae4b59c53412f6edb42687f071  kde-l10n-wa-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:15:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:15:03 +0000 (UTC)
Subject: File kde-l10n-zh_CN-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201171503.A560C10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

9656da04c983c795f1af7f41a853b3f2  kde-l10n-zh_CN-4.3.4.tar.bz2



From than at fedoraproject.org  Tue Dec  1 17:15:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 17:15:16 +0000 (UTC)
Subject: File kde-l10n-zh_TW-4.3.4.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091201171516.7D5EF10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-l10n:

f3d9dfe4e387bfed94ad0b6f8cd191d7  kde-l10n-zh_TW-4.3.4.tar.bz2



From snirkel at fedoraproject.org  Tue Dec  1 17:16:07 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Tue,  1 Dec 2009 17:16:07 +0000 (UTC)
Subject: rpms/libmtp/devel libmtp.spec,1.36,1.37
Message-ID: <20091201171607.9DFBA11C00DE@cvs1.fedora.phx.redhat.com>

Author: snirkel

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

Modified Files:
	libmtp.spec 
Log Message:
Patch from Dan Nicholson to make udev rules unconfigurable



Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libmtp.spec	12 Sep 2009 10:57:05 -0000	1.36
+++ libmtp.spec	1 Dec 2009 17:16:07 -0000	1.37
@@ -70,8 +70,8 @@ ln -sf mtp-connect mtp-sendfile
 ln -sf mtp-connect mtp-sendtr
 popd
 # Install udev rules file.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules
+mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d
+install -p -m 644 libmtp.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-libmtp.rules
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
 install -p -m 644 libmtp.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
 # Copy documentation to a good place
@@ -100,8 +100,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root,root,-)
 %{_libdir}/*.so.*
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*
-%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+/lib/udev/rules.d/*
+%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
 
 %files examples
 %defattr(-,root,root,-)



From snirkel at fedoraproject.org  Tue Dec  1 17:18:22 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Tue,  1 Dec 2009 17:18:22 +0000 (UTC)
Subject: rpms/libmtp/F-12 libmtp.spec,1.36,1.37
Message-ID: <20091201171822.C65C511C0382@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14139

Modified Files:
	libmtp.spec 
Log Message:
Patch from Dan Nicholson to make the udev rules unconfigurable



Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/F-12/libmtp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libmtp.spec	12 Sep 2009 10:57:05 -0000	1.36
+++ libmtp.spec	1 Dec 2009 17:18:22 -0000	1.37
@@ -70,8 +70,8 @@ ln -sf mtp-connect mtp-sendfile
 ln -sf mtp-connect mtp-sendtr
 popd
 # Install udev rules file.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules
+mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d
+install -p -m 644 libmtp.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-libmtp.rules
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
 install -p -m 644 libmtp.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
 # Copy documentation to a good place
@@ -100,8 +100,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root,root,-)
 %{_libdir}/*.so.*
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*
-%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+/lib/udev/rules.d/*
+%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
 
 %files examples
 %defattr(-,root,root,-)



From cjb at fedoraproject.org  Tue Dec  1 17:18:29 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Tue,  1 Dec 2009 17:18:29 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091202git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091201171829.8A81D10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

f156588b671a62617d9514aec73300e3  ohm-0.1.1-1.20091202git.tar.gz



From snirkel at fedoraproject.org  Tue Dec  1 17:21:42 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Tue,  1 Dec 2009 17:21:42 +0000 (UTC)
Subject: rpms/libmtp/devel libmtp.spec,1.37,1.38
Message-ID: <20091201172142.CE08F11C00DE@cvs1.fedora.phx.redhat.com>

Author: snirkel

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

Modified Files:
	libmtp.spec 
Log Message:
Another patch from Dan, rolling a new release.



Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libmtp.spec	1 Dec 2009 17:16:07 -0000	1.37
+++ libmtp.spec	1 Dec 2009 17:21:42 -0000	1.38
@@ -3,7 +3,7 @@
 
 Name:           libmtp
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -47,9 +47,8 @@ library for MTP media players.
 %build
 %configure --disable-static --program-prefix=mtp-
 make %{?_smp_mflags}
-# Remove permissions from symlink in udev script, we use
-# HALd rules to fix the permissions instead.
-examples/hotplug -a"SYMLINK+=\"libmtp-%k\"" > libmtp.rules
+# Remove permissions from udev rules, but register for ACL management
+examples/hotplug -a"SYMLINK+=\"libmtp-%k\", ENV{ACL_MANAGE}=\"1\"" > libmtp.rules
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -117,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 1 2009 Linus Walleij <triad at df.lth.se> 1.0.1-2
+- Two patches from Dan Nicholson to fix up the udev rules a bit.
+
 * Sat Sep 12 2009 Linus Walleij <triad at df.lth.se> 1.0.1-1
 - New upstream release. No interface changes!
 



From cjb at fedoraproject.org  Tue Dec  1 17:21:54 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Tue,  1 Dec 2009 17:21:54 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore,1.4,1.5 ohm.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <20091201172154.A63C411C00DE@cvs1.fedora.phx.redhat.com>

Author: cjb

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

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
Fade backlight down, but go back up straight away.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Nov 2009 16:43:38 -0000	1.4
+++ .cvsignore	1 Dec 2009 17:21:54 -0000	1.5
@@ -1 +1 @@
-ohm-0.1.1-1.20091201git.tar.gz
+ohm-0.1.1-1.20091202git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ohm.spec	30 Nov 2009 16:43:39 -0000	1.8
+++ ohm.spec	1 Dec 2009 17:21:54 -0000	1.9
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091201git
+%define alphatag                20091202git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.26.%{alphatag}%{?dist}
+Release: 9.27.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,6 +139,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Dec 1 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.27.20091202git.olpc
+- Fade backlight down, but go back up straight away.
+
 * Mon Nov 30 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.26.20091201git.olpc
 - Trac #9772: Update dbus config for the deny-by-default semantics
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Nov 2009 16:43:39 -0000	1.6
+++ sources	1 Dec 2009 17:21:54 -0000	1.7
@@ -1 +1 @@
-7082ce632d4c70cbfdafd026e057dc34  ohm-0.1.1-1.20091201git.tar.gz
+f156588b671a62617d9514aec73300e3  ohm-0.1.1-1.20091202git.tar.gz



From snirkel at fedoraproject.org  Tue Dec  1 17:22:53 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Tue,  1 Dec 2009 17:22:53 +0000 (UTC)
Subject: rpms/libmtp/F-12 libmtp.spec,1.37,1.38
Message-ID: <20091201172253.D8CEC11C00DE@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15049

Modified Files:
	libmtp.spec 
Log Message:
Patches from Dan to fix udev rules.



Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/F-12/libmtp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libmtp.spec	1 Dec 2009 17:18:22 -0000	1.37
+++ libmtp.spec	1 Dec 2009 17:22:53 -0000	1.38
@@ -3,7 +3,7 @@
 
 Name:           libmtp
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -47,9 +47,8 @@ library for MTP media players.
 %build
 %configure --disable-static --program-prefix=mtp-
 make %{?_smp_mflags}
-# Remove permissions from symlink in udev script, we use
-# HALd rules to fix the permissions instead.
-examples/hotplug -a"SYMLINK+=\"libmtp-%k\"" > libmtp.rules
+# Remove permissions from udev rules, but register for ACL management
+examples/hotplug -a"SYMLINK+=\"libmtp-%k\", ENV{ACL_MANAGE}=\"1\"" > libmtp.rules
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -117,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 1 2009 Linus Walleij <triad at df.lth.se> 1.0.1-2
+- Two patches from Dan Nicholson to fix up the udev rules a bit.
+
 * Sat Sep 12 2009 Linus Walleij <triad at df.lth.se> 1.0.1-1
 - New upstream release. No interface changes!
 



From cjb at fedoraproject.org  Tue Dec  1 17:23:21 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Tue,  1 Dec 2009 17:23:21 +0000 (UTC)
Subject: rpms/ohm/F-11 ohm.spec,1.9,1.10
Message-ID: <20091201172321.DD4CC11C00DE@cvs1.fedora.phx.redhat.com>

Author: cjb

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

Modified Files:
	ohm.spec 
Log Message:
Bump version; did make tag before commit.



Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ohm.spec	1 Dec 2009 17:21:54 -0000	1.9
+++ ohm.spec	1 Dec 2009 17:23:21 -0000	1.10
@@ -7,7 +7,7 @@
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.27.%{alphatag}%{?dist}
+Release: 9.28.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,7 +139,7 @@ fi
 %{_includedir}/*
 
 %changelog
-* Tue Dec 1 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.27.20091202git.olpc
+* Tue Dec 1 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.28.20091202git.olpc
 - Fade backlight down, but go back up straight away.
 
 * Mon Nov 30 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.26.20091201git.olpc



From hadess at fedoraproject.org  Tue Dec  1 17:34:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 17:34:20 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.235,1.236
Message-ID: <20091201173421.00F6D11C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-games.spec 
Log Message:
fix schemas and install for gnometris again


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- gnome-games.spec	1 Dec 2009 17:14:17 -0000	1.235
+++ gnome-games.spec	1 Dec 2009 17:34:20 -0000	1.236
@@ -157,9 +157,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INS
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-mv $RPM_BUILD_ROOT%{_bindir}/gnometris \
-  $RPM_BUILD_ROOT%{_bindir}/gnome-falling-blocks
-
 ## things we just don't want in the package
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgdkcardimage.*a
@@ -226,7 +223,7 @@ gconftool-2 --makefile-install-rule \
 	gnect.schemas               \
 	gnibbles.schemas            \
 	gnobots2.schemas            \
-	gnometris.schemas           \
+	quadrapassel.schemas        \
 	gnotravex.schemas           \
 	gnotski.schemas             \
 	mahjongg.schemas            \
@@ -257,6 +254,8 @@ fi
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
+  if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
+  if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
@@ -265,7 +264,6 @@ if [ "$1" -gt 1 ]; then
 	gnect.schemas               \
 	gnibbles.schemas            \
 	gnobots2.schemas            \
-	gnometris.schemas           \
 	gnotravex.schemas           \
 	gnotski.schemas             \
 	mahjongg.schemas            \
@@ -291,6 +289,8 @@ fi
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
+  if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
+  if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
@@ -299,7 +299,6 @@ if [ "$1" -eq 0 ]; then
 	gnect.schemas               \
 	gnibbles.schemas            \
 	gnobots2.schemas            \
-	gnometris.schemas           \
 	gnotravex.schemas           \
 	gnotski.schemas             \
 	mahjongg.schemas            \



From notting at fedoraproject.org  Tue Dec  1 17:35:16 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  1 Dec 2009 17:35:16 +0000 (UTC)
Subject: rpms/gnucash/devel gnucash-2.3.7-label.patch, NONE, 1.1 gnucash.spec,
	1.104, 1.105
Message-ID: <20091201173516.B9D2511C00DE@cvs1.fedora.phx.redhat.com>

Author: notting

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

Modified Files:
	gnucash.spec 
Added Files:
	gnucash-2.3.7-label.patch 
Log Message:
- Fix accelerators (#533019, #541915)



gnucash-2.3.7-label.patch:
 dialog-utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnucash-2.3.7-label.patch ---
diff -up gnucash-2.3.7/src/gnome-utils/dialog-utils.c.foo gnucash-2.3.7/src/gnome-utils/dialog-utils.c
--- gnucash-2.3.7/src/gnome-utils/dialog-utils.c.foo	2009-12-01 12:13:08.000000000 -0500
+++ gnucash-2.3.7/src/gnome-utils/dialog-utils.c	2009-12-01 12:13:33.000000000 -0500
@@ -907,7 +907,7 @@ gnc_gtk_dialog_add_button (GtkWidget *di
 {
   GtkWidget *button;
 
-  button = gtk_button_new_with_label(label);
+  button = gtk_button_new_with_mnemonic(label);
   if (stock_id) {
     GtkWidget *image;
 


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gnucash.spec	1 Dec 2009 16:55:54 -0000	1.104
+++ gnucash.spec	1 Dec 2009 17:35:16 -0000	1.105
@@ -17,6 +17,7 @@ BuildRequires: desktop-file-utils, texin
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 BuildRequires: python-devel, libdbi-devel
 Patch0: gnucash-quiet.patch
+Patch1: gnucash-2.3.7-label.patch
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
 Requires: perl(Finance::Quote)
@@ -38,6 +39,7 @@ balanced books.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
@@ -130,6 +132,7 @@ fi
 %changelog
 * Tue Dec  1 2009 Bill Nottingham <notting at redhat.com> - 2.3.7-1
 - Update to development version.
+- Fix accelerators (#533019, #541915)
 
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.9-3
 - Use lzma compressed upstream tarball.



From mcrha at fedoraproject.org  Tue Dec  1 17:39:36 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue,  1 Dec 2009 17:39:36 +0000 (UTC)
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.29.3-add-ldap-libs.patch, 1.2,
	1.3 evolution-exchange.spec, 1.83, 1.84
Message-ID: <20091201173936.2EA5F11C00DE@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18157

Modified Files:
	evolution-exchange-2.29.3-add-ldap-libs.patch 
	evolution-exchange.spec 
Log Message:
Fix xxx_LIBS in Makefile.am and delete camel's .la file.


evolution-exchange-2.29.3-add-ldap-libs.patch:
 addressbook/Makefile.am |    1 +
 server/lib/Makefile.am  |    7 +++++++
 2 files changed, 8 insertions(+)

Index: evolution-exchange-2.29.3-add-ldap-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange-2.29.3-add-ldap-libs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- evolution-exchange-2.29.3-add-ldap-libs.patch	1 Dec 2009 12:01:18 -0000	1.2
+++ evolution-exchange-2.29.3-add-ldap-libs.patch	1 Dec 2009 17:39:35 -0000	1.3
@@ -18,10 +18,10 @@ diff -up evolution-exchange-2.29.3/serve
  
 +libexchange_la_LIBADD = \
 +	$(LDAP_LIBS) \
-+	$(KRB5_LIBSS) \
-+	$(SOUP_LIBSS) \
-+	$(GNOME_PLATFORM_LIBSS) \
-+	$(EVOLUTION_DATA_SERVER_LIBSS)
++	$(KRB5_LIBS) \
++	$(SOUP_LIBS) \
++	$(GNOME_PLATFORM_LIBS) \
++	$(EVOLUTION_DATA_SERVER_LIBS)
 +
  libexchange_la_SOURCES = \
  	$(MARSHAL_GENERATED) \


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- evolution-exchange.spec	1 Dec 2009 11:48:11 -0000	1.83
+++ evolution-exchange.spec	1 Dec 2009 17:39:35 -0000	1.84
@@ -93,6 +93,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/libebookbackendexchange.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/camel-providers/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/%{evo_major}/plugins/liborg-gnome-exchange-operations.la
 
 %find_lang evolution-exchange-%{evo_major}
@@ -111,7 +112,6 @@ gconftool-2 --makefile-install-rule %{_s
 %doc docs/http
 %{_bindir}/exchange-connector-setup-%{evo_major}
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.so
-%{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.la
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.urls
 %{_libdir}/evolution-data-server-1.2/extensions/libebookbackendexchange.so
 %{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.so



From sergiopr at fedoraproject.org  Tue Dec  1 17:40:29 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue,  1 Dec 2009 17:40:29 +0000 (UTC)
Subject: rpms/gedit-latex-plugin/devel gedit-latex-plugin.spec,1.5,1.6
Message-ID: <20091201174029.744DE11C0396@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/gedit-latex-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18608

Modified Files:
	gedit-latex-plugin.spec 
Log Message:
* Mon Nov 30 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.4.rc2
- Using virtual requires to pull in the TeX packages (bz #542611)



Index: gedit-latex-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-latex-plugin/devel/gedit-latex-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gedit-latex-plugin.spec	10 Nov 2009 15:03:43 -0000	1.5
+++ gedit-latex-plugin.spec	1 Dec 2009 17:40:29 -0000	1.6
@@ -1,6 +1,6 @@
 Name: gedit-latex-plugin
 Version: 0.2
-Release: 0.3.rc2%{?dist}
+Release: 0.4.rc2%{?dist}
 Summary: Gedit plugin for composing and compiling LaTeX documents
 
 %define upname LaTeXPlugin
@@ -11,7 +11,7 @@ URL: http://live.gnome.org/Gedit/LaTeXPl
 Source0: http://downloads.sourceforge.com/gedit-latex/%{upname}-%{version}rc2.tar.gz
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires: gedit rubber texlive-texmf pypoppler
+Requires: gedit rubber pypoppler tex(latex)
 
 # This package should be noarch, but gedit doesn't load plugins from noarch dirs
 # Bug filled http://bugzilla.gnome.org/show_bug.cgi?id=554535
@@ -54,7 +54,10 @@ rm -rf %{buildroot}
 %{_libdir}/gedit-2/plugins/*
 
 %changelog
-* Tue Nov 10 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-0.3.rc2
+* Mon Nov 30 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.4.rc2
+- Using virtual requires to pull in the TeX packages (bz #542611)
+
+* Tue Nov 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.3.rc2
 - Adding a dependency on pypoppler (bz #509484)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-0.2.rc2



From gd at fedoraproject.org  Tue Dec  1 17:40:38 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Tue,  1 Dec 2009 17:40:38 +0000 (UTC)
Subject: rpms/samba/F-12 samba-3.3.5-schannel_pipe.patch, NONE,
	1.1 samba.spec, 1.201, 1.202
Message-ID: <20091201174038.05A4D11C0396@cvs1.fedora.phx.redhat.com>

Author: gd

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

Modified Files:
	samba.spec 
Added Files:
	samba-3.3.5-schannel_pipe.patch 
Log Message:
Fix uninitialized rpc client pipe, causing winbind to crash
resolves: #541328

Guenther


samba-3.3.5-schannel_pipe.patch:
 cli_pipe.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE samba-3.3.5-schannel_pipe.patch ---
>From bc0dc5a452f52df76d3f6bbd119acd8476afe9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd at samba.org>
Date: Tue, 10 Nov 2009 13:10:12 +0100
Subject: [PATCH] s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.

Guenther
(cherry picked from commit d241b9ae4c9b520406aac98e24d078f2d4fd4ae5)
---
 source3/rpc_client/cli_pipe.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 9ff84f8..28d9d99 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -4123,6 +4123,8 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli,
 	struct rpc_pipe_client *result = NULL;
 	NTSTATUS status;
 
+	*presult = NULL;
+
 	status = get_schannel_session_key(cli, domain, &neg_flags,
 					  &netlogon_pipe);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -4143,7 +4145,7 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli,
 		*presult = result;
 	}
 
-	return NT_STATUS_OK;
+	return status;
 }
 
 /****************************************************************************
-- 
1.6.5.2



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/samba.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- samba.spec	25 Nov 2009 14:56:15 -0000	1.201
+++ samba.spec	1 Dec 2009 17:40:37 -0000	1.202
@@ -1,4 +1,4 @@
-%define main_release 49
+%define main_release 50
 %define samba_version 3.4.3
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
@@ -45,6 +45,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
+Patch201: samba-3.3.5-schannel_pipe.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -202,6 +203,7 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
+%patch201 -p1 -b .schannel_pipe
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -654,6 +656,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Tue Dec 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-50
+- Fix uninitialized rpc client pipe, causing winbind to crash
+- resolves: #541328
+
 * Wed Nov 25 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-49
 - Various updates to inline documentation in default smb.conf file
 - resolves: #483703



From sergiopr at fedoraproject.org  Tue Dec  1 17:45:40 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue,  1 Dec 2009 17:45:40 +0000 (UTC)
Subject: rpms/gedit-latex-plugin/F-12 gedit-latex-plugin.spec,1.5,1.6
Message-ID: <20091201174540.4119111C00DE@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/gedit-latex-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20355

Modified Files:
	gedit-latex-plugin.spec 
Log Message:
* Mon Nov 30 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.4.rc2
- Using virtual requires to pull in the TeX packages (bz #542611)



Index: gedit-latex-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-latex-plugin/F-12/gedit-latex-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gedit-latex-plugin.spec	10 Nov 2009 15:10:19 -0000	1.5
+++ gedit-latex-plugin.spec	1 Dec 2009 17:45:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name: gedit-latex-plugin
 Version: 0.2
-Release: 0.3.rc2%{?dist}
+Release: 0.4.rc2%{?dist}
 Summary: Gedit plugin for composing and compiling LaTeX documents
 
 %define upname LaTeXPlugin
@@ -11,7 +11,7 @@ URL: http://live.gnome.org/Gedit/LaTeXPl
 Source0: http://downloads.sourceforge.com/gedit-latex/%{upname}-%{version}rc2.tar.gz
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires: gedit rubber texlive-texmf pypoppler
+Requires: gedit rubber pypoppler tex(latex)
 
 # This package should be noarch, but gedit doesn't load plugins from noarch dirs
 # Bug filled http://bugzilla.gnome.org/show_bug.cgi?id=554535
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_libdir}/gedit-2/plugins/*
 
 %changelog
+* Mon Nov 30 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.4.rc2
+- Using virtual requires to pull in the TeX packages (bz #542611)
+
 * Tue Nov 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.3.rc2
 - Adding a dependency on pypoppler (bz #509484)
 



From sergiopr at fedoraproject.org  Tue Dec  1 17:47:40 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue,  1 Dec 2009 17:47:40 +0000 (UTC)
Subject: rpms/gedit-latex-plugin/F-11 gedit-latex-plugin.spec,1.3,1.4
Message-ID: <20091201174740.CDF4911C00DE@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/gedit-latex-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20753

Modified Files:
	gedit-latex-plugin.spec 
Log Message:
* Mon Nov 30 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.2.rc2
- Using virtual requires to pull in the TeX packages (bz #542611)



Index: gedit-latex-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-latex-plugin/F-11/gedit-latex-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gedit-latex-plugin.spec	10 Nov 2009 15:15:41 -0000	1.3
+++ gedit-latex-plugin.spec	1 Dec 2009 17:47:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name: gedit-latex-plugin
 Version: 0.2
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 Summary: Gedit plugin for composing and compiling LaTeX documents
 
 %define upname LaTeXPlugin
@@ -11,7 +11,7 @@ URL: http://live.gnome.org/Gedit/LaTeXPl
 Source0: http://downloads.sourceforge.com/gedit-latex/%{upname}-%{version}rc2.tar.gz
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires: gedit rubber texlive-texmf pypoppler
+Requires: gedit rubber tex(latex) pypoppler
 
 # This package should be noarch, but gedit doesn't load plugins from noarch dirs
 # Bug filled http://bugzilla.gnome.org/show_bug.cgi?id=554535
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_libdir}/gedit-2/plugins/*
 
 %changelog
+* Mon Nov 30 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.2.rc2
+- Using virtual requires to pull in the TeX packages (bz #542611)
+
 * Tue Nov 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.2-0.1.rc2
 - New upstream source
 



From mclasen at fedoraproject.org  Tue Dec  1 17:54:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 17:54:14 +0000 (UTC)
Subject: rpms/gtk2/F-12 o-minus.patch,NONE,1.1 gtk2.spec,1.440,1.441
Message-ID: <20091201175414.7D33311C00DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21817

Modified Files:
	gtk2.spec 
Added Files:
	o-minus.patch 
Log Message:
Make compose sequences more consistent


o-minus.patch:
 gtk-compose-lookaside.txt |    8 ++++----
 gtkimcontextsimpleseqs.h  |   14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE o-minus.patch ---
diff --git a/gtk/gtk-compose-lookaside.txt b/gtk/gtk-compose-lookaside.txt
index d222101..df0367b 100644
--- a/gtk/gtk-compose-lookaside.txt
+++ b/gtk/gtk-compose-lookaside.txt
@@ -186,8 +186,8 @@
 <Multi_key> <greater> <a> 			: "?" U00E2
 <Multi_key> <a> <greater> 			: "?" U00E2
 <Multi_key> <a> <asciicircum> 			: "?" U00E2
-<Multi_key> <minus> <a> 			: "?" U00E3
-<Multi_key> <a> <minus> 			: "?" U00E3
+<Multi_key> <minus> <a> 			: "?" U0101
+<Multi_key> <a> <minus> 			: "?" U0101
 <Multi_key> <a> <asciitilde> 			: "?" U00E3
 <Multi_key> <a> <quotedbl> 			: "?" U00E4
 <Multi_key> <a> <diaeresis> 			: "?" U00E4
@@ -223,8 +223,8 @@
 <Multi_key> <greater> <o> 			: "?" U00F4
 <Multi_key> <o> <greater> 			: "?" U00F4
 <Multi_key> <o> <asciicircum> 			: "?" U00F4
-<Multi_key> <minus> <o> 			: "?" U00F5
-<Multi_key> <o> <minus> 			: "?" U00F5
+<Multi_key> <minus> <o> 			: "?" U014D
+<Multi_key> <o> <minus> 			: "?" U014D
 <Multi_key> <o> <asciitilde> 			: "?" U00F5
 <Multi_key> <o> <quotedbl> 			: "?" U00F6
 <Multi_key> <o> <diaeresis> 			: "?" U00F6
diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h
index 131b3db..6cf3cc4 100644
--- a/gtk/gtkimcontextsimpleseqs.h
+++ b/gtk/gtkimcontextsimpleseqs.h
@@ -90,7 +90,7 @@ GDK_dead_hook, 3454, 3532, 3532, 3588, 3588,
 GDK_dead_horn, 3588, 3598, 3598, 3598, 3598, 
 GDK_dead_psili, 3598, 3626, 3626, 3626, 3626, 
 GDK_dead_dasia, 3626, 3658, 3658, 3658, 3658, 
-GDK_Multi_key, 3658, 3658, 9658, 13366, 15231, 
+GDK_Multi_key, 3658, 3658, 9664, 13372, 15237, 
 GDK_space, 0x002F, 
 GDK_2, 0x01BB, 
 GDK_A, 0x023A, 
@@ -781,7 +781,7 @@ GDK_5, 0x2085,
 GDK_6, 0x2086, 
 GDK_7, 0x2087, 
 GDK_8, 0x2088, 
-GDK_9, 0x2088, 
+GDK_9, 0x2089, 
 GDK_equal, 0x208C, 
 GDK_V, 0x01D9, 
 GDK_v, 0x01DA, 
@@ -1561,13 +1561,13 @@ GDK_minus, GDK_O, 0x00D5,
 GDK_minus, GDK_U, 0x016A, 
 GDK_minus, GDK_Y, 0x00A5, 
 GDK_minus, GDK_asciicircum, 0x00AF, 
-GDK_minus, GDK_a, 0x00E3, 
+GDK_minus, GDK_a, 0x0101, 
 GDK_minus, GDK_d, 0x0111, 
 GDK_minus, GDK_e, 0x0113, 
 GDK_minus, GDK_i, 0x012B, 
 GDK_minus, GDK_l, 0x00A3, 
 GDK_minus, GDK_n, 0x00F1, 
-GDK_minus, GDK_o, 0x00F5, 
+GDK_minus, GDK_o, 0x014D, 
 GDK_minus, GDK_u, 0x016B, 
 GDK_minus, GDK_y, 0x00A5, 
 GDK_period, GDK_minus, 0x00B7, 
@@ -1691,6 +1691,8 @@ GDK_4, GDK_5, 0x2158,
 GDK_5, GDK_6, 0x215A, 
 GDK_5, GDK_8, 0x215D, 
 GDK_7, GDK_8, 0x215E, 
+GDK_colon, GDK_parenleft, 0x2639, 
+GDK_colon, GDK_parenright, 0x263A, 
 GDK_colon, GDK_minus, 0x00F7, 
 GDK_semicolon, GDK_A, 0x0104, 
 GDK_semicolon, GDK_E, 0x0118, 
@@ -2223,7 +2225,7 @@ GDK_a, GDK_apostrophe, 0x00E1,
 GDK_a, GDK_parenleft, 0x0103, 
 GDK_a, GDK_asterisk, 0x00E5, 
 GDK_a, GDK_comma, 0x0105, 
-GDK_a, GDK_minus, 0x00E3, 
+GDK_a, GDK_minus, 0x0101, 
 GDK_a, GDK_greater, 0x00E2, 
 GDK_a, GDK_asciicircum, 0x00E2, 
 GDK_a, GDK_underscore, 0x00AA, 
@@ -2369,7 +2371,7 @@ GDK_n, GDK_g, 0x014B,
 GDK_n, GDK_asciitilde, 0x00F1, 
 GDK_o, GDK_quotedbl, 0x00F6, 
 GDK_o, GDK_apostrophe, 0x00F3, 
-GDK_o, GDK_minus, 0x00F5, 
+GDK_o, GDK_minus, 0x014D, 
 GDK_o, GDK_slash, 0x00F8, 
 GDK_o, GDK_greater, 0x00F4, 
 GDK_o, GDK_A, 0x00C5, 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -p -r1.440 -r1.441
--- gtk2.spec	1 Dec 2009 14:39:52 -0000	1.440
+++ gtk2.spec	1 Dec 2009 17:54:14 -0000	1.441
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -44,6 +44,8 @@ Patch13: gtk2-rotate-layout.patch
 Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=600992
 Patch15: filesystemref.patch
+# from upstream
+Patch16: o-minus.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -165,6 +167,7 @@ This package contains developer document
 %patch13 -p1 -b .rotate-layout
 %patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .filesystemref
+%patch16 -p1 -b .o-minus
 
 %build
 %configure --with-xinput=xfree 		\
@@ -392,6 +395,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-2
+- Make compose sequences for ?? consistent (#510741)
+
 * Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-1
 - Update to 2.18.4
 - See http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.4.news



From notting at fedoraproject.org  Tue Dec  1 17:55:46 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  1 Dec 2009 17:55:46 +0000 (UTC)
Subject: File gnucash-2.3.7.tar.bz2 uploaded to lookaside cache by notting
Message-ID: <20091201175546.6D21410F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnucash:

28de0a77decdffe78cd7ae3aea24a02b  gnucash-2.3.7.tar.bz2



From mtasaka at fedoraproject.org  Tue Dec  1 17:55:43 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  1 Dec 2009 17:55:43 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-11
	rubygem-nokogiri-1.3.3-optional_attr-test.patch, NONE,
	1.1 rubygem-nokogiri.spec, 1.10, 1.11
Message-ID: <20091201175543.E185211C00DE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22246/F-11

Modified Files:
	rubygem-nokogiri.spec 
Added Files:
	rubygem-nokogiri-1.3.3-optional_attr-test.patch 
Log Message:
Fix test failure

rubygem-nokogiri-1.3.3-optional_attr-test.patch:
 test_element_description.rb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE rubygem-nokogiri-1.3.3-optional_attr-test.patch ---
--- test/html/test_element_description.rb.debug	2009-12-02 02:06:03.000000000 +0900
+++ test/html/test_element_description.rb	2009-12-02 02:48:44.000000000 +0900
@@ -66,7 +66,10 @@
       def test_optional_attributes
         attrs = ElementDescription['table'].optional_attributes
         assert attrs
-        assert_equal 22, attrs.length
+        # Actually 23, not 22 (with libxml2 2.7.6). "22" was due to
+        # bug in libxml2 2.7.3 (GNOME bug 581803)
+        # Anyway no longer check this (as nokogiri 1.4.0 does not check this)
+        # assert_equal 22, attrs.length
       end
 
       def test_deprecated_attributes


Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-11/rubygem-nokogiri.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-nokogiri.spec	1 Dec 2009 16:42:26 -0000	1.10
+++ rubygem-nokogiri.spec	1 Dec 2009 17:55:43 -0000	1.11
@@ -18,6 +18,8 @@ Group:		Development/Languages
 License:	MIT
 URL:		http://nokogiri.rubyforge.org/nokogiri/
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+# Not needed with nokogiri 1.4.0
+Patch0:		rubygem-nokogiri-1.3.3-optional_attr-test.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -71,6 +73,10 @@ gem install \
 	-V --force \
 	%{SOURCE0}
 
+pushd .%{geminstdir}
+%patch0 -p0
+popd
+
 %build
 # cflags wrong (-O3 passed), recompiling
 pushd ./%{geminstdir}
@@ -204,6 +210,7 @@ popd
 %changelog
 * Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-3
 - Rebuild against libxml2 again (bug 537303)
+- And add patch to make test pass (related to GNOME bug 581803)
 
 * Sat Aug 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-2
 - Fix test failure on sparc



From notting at fedoraproject.org  Tue Dec  1 17:56:00 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  1 Dec 2009 17:56:00 +0000 (UTC)
Subject: rpms/gnucash/devel .cvsignore,1.38,1.39 sources,1.40,1.41
Message-ID: <20091201175600.0538511C00DE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/cow/gnucash/devel

Modified Files:
	.cvsignore sources 
Log Message:
Fix sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	12 Aug 2009 17:09:01 -0000	1.38
+++ .cvsignore	1 Dec 2009 17:55:59 -0000	1.39
@@ -1 +1 @@
-gnucash-2.2.9.tar.lzma
+gnucash-2.3.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	12 Aug 2009 17:09:02 -0000	1.40
+++ sources	1 Dec 2009 17:55:59 -0000	1.41
@@ -1 +1 @@
-b83c188506f749929a69b48c0632d3b8  gnucash-2.2.9.tar.lzma
+28de0a77decdffe78cd7ae3aea24a02b  gnucash-2.3.7.tar.bz2



From mtasaka at fedoraproject.org  Tue Dec  1 17:55:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  1 Dec 2009 17:55:44 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-12
	rubygem-nokogiri-1.3.3-optional_attr-test.patch, NONE,
	1.1 rubygem-nokogiri.spec, 1.13, 1.14
Message-ID: <20091201175544.2597011C00DE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22246/F-12

Modified Files:
	rubygem-nokogiri.spec 
Added Files:
	rubygem-nokogiri-1.3.3-optional_attr-test.patch 
Log Message:
Fix test failure

rubygem-nokogiri-1.3.3-optional_attr-test.patch:
 test_element_description.rb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE rubygem-nokogiri-1.3.3-optional_attr-test.patch ---
--- test/html/test_element_description.rb.debug	2009-12-02 02:06:03.000000000 +0900
+++ test/html/test_element_description.rb	2009-12-02 02:48:44.000000000 +0900
@@ -66,7 +66,10 @@
       def test_optional_attributes
         attrs = ElementDescription['table'].optional_attributes
         assert attrs
-        assert_equal 22, attrs.length
+        # Actually 23, not 22 (with libxml2 2.7.6). "22" was due to
+        # bug in libxml2 2.7.3 (GNOME bug 581803)
+        # Anyway no longer check this (as nokogiri 1.4.0 does not check this)
+        # assert_equal 22, attrs.length
       end
 
       def test_deprecated_attributes


Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-12/rubygem-nokogiri.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-nokogiri.spec	1 Dec 2009 16:42:26 -0000	1.13
+++ rubygem-nokogiri.spec	1 Dec 2009 17:55:44 -0000	1.14
@@ -18,6 +18,8 @@ Group:		Development/Languages
 License:	MIT
 URL:		http://nokogiri.rubyforge.org/nokogiri/
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+# Not needed with nokogiri 1.4.0
+Patch0:		rubygem-nokogiri-1.3.3-optional_attr-test.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -71,6 +73,10 @@ gem install \
 	-V --force \
 	%{SOURCE0}
 
+pushd .%{geminstdir}
+%patch0 -p0
+popd
+
 %build
 # cflags wrong (-O3 passed), recompiling
 pushd ./%{geminstdir}
@@ -204,6 +210,7 @@ popd
 %changelog
 * Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-3
 - Rebuild against libxml2 again (bug 537303)
+- And add patch to make test pass (related to GNOME bug 581803)
 
 * Sat Aug 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-2
 - Fix test failure on sparc



From nhorman at fedoraproject.org  Tue Dec  1 17:56:44 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  1 Dec 2009 17:56:44 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec, 1.155, 1.156 mkdumprd, 1.28,
	1.29
Message-ID: <20091201175644.9AD8B11C00DE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23588

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz519767


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kexec-tools.spec	23 Nov 2009 16:17:42 -0000	1.155
+++ kexec-tools.spec	1 Dec 2009 17:56:44 -0000	1.156
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -264,6 +264,9 @@ done
 
 
 %changelog
+* Tue Dec 01 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-30
+- Fix raid support in mkdumprd (bz 519767)
+
 * Mon Nov 23 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-29
 - Updating firstboot script to RHEL-6 version (bz 539812)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mkdumprd	15 Jun 2009 16:58:42 -0000	1.28
+++ mkdumprd	1 Dec 2009 17:56:44 -0000	1.29
@@ -188,6 +188,9 @@ findmodule() {
 	findmodule ieee1394
 	findmodule ohci1394
 	modName="sbp2"
+    elif [ "$modName" = "raid6" ]; then
+	findmodule raid456
+        modName="raid456"
     else
 	moduledep $modName
 	for i in $deps; do



From jjames at fedoraproject.org  Tue Dec  1 17:58:49 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 17:58:49 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-11
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,
	1.1, 1.2 xemacs-packages-extra.spec, 1.12, 1.13
Message-ID: <20091201175849.D439611C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24137/F-11

Modified Files:
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch 
	xemacs-packages-extra.spec 
Log Message:
* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
- The last ediff fix included more Emacs-specific code (bz 537531).
- Don't package x-symbol fonts, which are only needed on Windows anyway.


xemacs-packages-extra-20091103-ediff-coding-system-532620.patch:
 ChangeLog     |   45 +++++++++++
 Makefile      |    2 
 ediff-diff.el |   45 +++++------
 ediff-help.el |    6 -
 ediff-hook.el |  137 ++++++++++++++++++-----------------
 ediff-init.el |   67 +++++++++--------
 ediff-merg.el |   36 ++++-----
 ediff-mult.el |  130 +++++++++++++++++++++++++--------
 ediff-ptch.el |   22 ++---
 ediff-util.el |   38 ++++-----
 ediff-vers.el |   27 +++---
 ediff-wind.el |   30 +++----
 ediff.el      |  225 +++++++++++++++++++++++++++++++++++-----------------------
 ediff.texi    |  224 ++++++++++++++++++++++++++++++---------------------------
 14 files changed, 606 insertions(+), 428 deletions(-)

Index: xemacs-packages-extra-20091103-ediff-coding-system-532620.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	3 Nov 2009 17:51:01 -0000	1.1
+++ xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	1 Dec 2009 17:58:49 -0000	1.2
@@ -1,7 +1,34 @@
 diff -dur xemacs-packages.ORIG/ediff/ChangeLog xemacs-packages/ediff/ChangeLog
 --- xemacs-packages.ORIG/ediff/ChangeLog	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/ChangeLog	2009-08-17 13:40:49.458796934 -0600
-@@ -1,3 +1,21 @@
++++ xemacs-packages/ediff/ChangeLog	2009-12-01 09:39:07.126858310 -0700
+@@ -1,3 +1,48 @@
++2009-11-27  Norbert Koch  <viteno at xemacs.org>
++
++	* Makefile (VERSION): XEmacs package 1.79 released.
++
++2009-11-26  Adrian Aichner  <adrian at xemacs.org>
++
++	* ediff.el (ediff-buffers-internal): Delete temporary files in
++	case of non-local exit, like C-g (keyboard-quit), as well.
++	* ediff.el (ediff-regions-internal): Ditto.
++
++2009-11-26  Michael Kifer <kifer at cs.stonybrook.edu>
++	
++	* ediff-init.el, ediff-mult.el, ediff-util.el: relpace
++	last-command-char and last-command-event with (ediff-last-command-char) everywhere.
++	
++	* ediff.el (ediff-version): revert change made in Emacs tree.
++	
++	* ediff-menu.el: use purecopy in Emacs menus.
++	
++	* ediff-diff.el, ediff-merge.el, ediff-mult.el, ediff-util.el,
++	ediff.el, ediff-vers.el: use with-current-buffer instead of
++	save-excursion/set-buffer whenever possible. Other cosmetic changes
++	from the Emacs tree.
++	
++	* ediff-mult.el: apply Dan Nicolaescu's patch that adds a menu in
++	ediff-meta mode.
++	
 +2009-08-16  Norbert Koch  <viteno at xemacs.org>
 +
 +	* Makefile (VERSION): XEmacs package 1.78 released.
@@ -25,7 +52,7 @@ diff -dur xemacs-packages.ORIG/ediff/Cha
  	* Makefile (VERSION): XEmacs package 1.77 released.
 diff -dur xemacs-packages.ORIG/ediff/ediff-diff.el xemacs-packages/ediff/ediff-diff.el
 --- xemacs-packages.ORIG/ediff/ediff-diff.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-diff.el	2009-08-17 13:40:49.543789080 -0600
++++ xemacs-packages/ediff/ediff-diff.el	2009-12-01 09:39:07.132860465 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-diff.el --- diff-related utilities
  
@@ -131,7 +158,37 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  Lines that do not match are assumed to be error messages."
    :type 'regexp
    :group 'ediff-diff)
-@@ -1529,11 +1529,11 @@
+@@ -1225,8 +1225,7 @@
+     (unwind-protect
+ 	(let ((directory default-directory)
+ 	      proc)
+-	  (save-excursion
+-	    (set-buffer buffer)
++	  (with-current-buffer buffer
+ 	    (erase-buffer)
+ 	    (setq default-directory directory)
+ 	    (if (or (memq system-type '(emx ms-dos windows-nt windows-95))
+@@ -1283,8 +1282,7 @@
+   (if (and (memq (process-status process) '(exit signal))
+            (buffer-name (process-buffer process)))
+       (progn
+-        (save-excursion
+-          (set-buffer (process-buffer process))
++        (with-current-buffer (process-buffer process)
+           (setq mode-line-process nil))
+         (delete-process process))))
+ 
+@@ -1354,8 +1352,7 @@
+ 	       ediff-forward-word-function)
+ 	   ediff-forward-word-function))
+ 	inbuf-syntax-tbl sv-point diff-string)
+-    (save-excursion
+-     (set-buffer in-buffer)
++    (with-current-buffer in-buffer
+      (setq inbuf-syntax-tbl
+ 	   (if control-buf
+ 	       (ediff-with-current-buffer control-buf
+@@ -1529,11 +1526,11 @@
  
  
  
@@ -150,7 +207,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-diff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.el xemacs-packages/ediff/ediff.el
 --- xemacs-packages.ORIG/ediff/ediff.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff.el	2009-08-17 13:40:50.479789989 -0600
++++ xemacs-packages/ediff/ediff.el	2009-12-01 09:39:07.214982518 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff.el --- a comprehensive visual interface to diff & patch
  
@@ -166,8 +223,8 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 -(defconst ediff-version "2.81.2" "The current version of Ediff")
 -(defconst ediff-date "November 22, 2008" "Date of last update")
-+(defconst ediff-version "2.81.3" "The current version of Ediff")
-+(defconst ediff-date "August 15, 2009" "Date of last update")
++(defconst ediff-version "2.81.4" "The current version of Ediff")
++(defconst ediff-date "November 26, 2009" "Date of last update")
  
  
  ;; This file is part of GNU Emacs.
@@ -251,7 +308,194 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  (defun ediff-backup (file)
    "Run Ediff on FILE and its backup file.
  Uses the latest backup, if there are several numerical backups.
-@@ -1504,11 +1542,11 @@
+@@ -437,37 +475,45 @@
+ 	 (buf-C-file-name (if buf-C-is-alive
+ 			      (buffer-file-name (get-buffer buf-B))))
+ 	 file-A file-B file-C)
+-    (if (not (ediff-buffer-live-p buf-A))
+-	(error "Buffer %S doesn't exist" buf-A))
+-    (if (not (ediff-buffer-live-p buf-B))
+-	(error "Buffer %S doesn't exist" buf-B))
+-    (let ((ediff-job-name job-name))
+-      (if (and ediff-3way-comparison-job
+-	       (not buf-C-is-alive))
+-	  (error "Buffer %S doesn't exist" buf-C)))
+-    (if (stringp buf-A-file-name)
+-	(setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
+-    (if (stringp buf-B-file-name)
+-	(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
+-    (if (stringp buf-C-file-name)
+-	(setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
+-
+-    (setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
+-	  file-B (ediff-make-temp-file buf-B buf-B-file-name))
+-    (if buf-C-is-alive
+-	(setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
+-
+-    (ediff-setup (get-buffer buf-A) file-A
+-		 (get-buffer buf-B) file-B
+-		 (if buf-C-is-alive (get-buffer buf-C))
+-		 file-C
+-		 (cons `(lambda ()
+-			  (delete-file ,file-A)
+-			  (delete-file ,file-B)
+-			  (if (stringp ,file-C) (delete-file ,file-C)))
+-		       startup-hooks)
+-		 (list (cons 'ediff-job-name job-name))
+-		 merge-buffer-file)))
++    (unwind-protect
++	(progn
++	  (if (not (ediff-buffer-live-p buf-A))
++	      (error "Buffer %S doesn't exist" buf-A))
++	  (if (not (ediff-buffer-live-p buf-B))
++	      (error "Buffer %S doesn't exist" buf-B))
++	  (let ((ediff-job-name job-name))
++	    (if (and ediff-3way-comparison-job
++		     (not buf-C-is-alive))
++		(error "Buffer %S doesn't exist" buf-C)))
++	  (if (stringp buf-A-file-name)
++	      (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
++	  (if (stringp buf-B-file-name)
++	      (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
++	  (if (stringp buf-C-file-name)
++	      (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
++	  
++	  (setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
++		file-B (ediff-make-temp-file buf-B buf-B-file-name))
++	  (if buf-C-is-alive
++	      (setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
++	  
++	  (ediff-setup (get-buffer buf-A) file-A
++		       (get-buffer buf-B) file-B
++		       (if buf-C-is-alive (get-buffer buf-C))
++		       file-C
++		       (cons `(lambda ()
++				(delete-file ,file-A)
++				(delete-file ,file-B)
++				(if (stringp ,file-C) (delete-file ,file-C)))
++			     startup-hooks)
++		       (list (cons 'ediff-job-name job-name))
++		       merge-buffer-file))
++      (if (and (stringp file-A) (file-exists-p file-A))
++	  (delete-file file-A))
++      (if (and (stringp file-B) (file-exists-p file-B))
++	  (delete-file file-B))
++      (if (and (stringp file-C) (file-exists-p file-C))
++	  (delete-file file-C)))))
+ 
+ 
+ ;;; Directory and file group operations
+@@ -939,8 +985,7 @@
+ 	(buffer-B
+          (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
+         reg-A-beg reg-A-end reg-B-beg reg-B-end)
+-    (save-excursion
+-      (set-buffer buffer-A)
++    (with-current-buffer buffer-A
+       (setq reg-A-beg (region-beginning)
+ 	    reg-A-end (region-end))
+       (set-buffer buffer-B)
+@@ -980,8 +1025,7 @@
+ 	(buffer-B
+          (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
+         reg-A-beg reg-A-end reg-B-beg reg-B-end)
+-    (save-excursion
+-      (set-buffer buffer-A)
++    (with-current-buffer buffer-A
+       (setq reg-A-beg (region-beginning)
+ 	    reg-A-end (region-end))
+       ;; enlarge the region to hold full lines
+@@ -1019,41 +1063,46 @@
+   (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
+ 	overl-A overl-B
+ 	file-A file-B)
++    (unwind-protect
++	(progn
++	  ;; in case beg/end-A/B aren't markers--make them into markers
++	  (ediff-with-current-buffer buffer-A
++	    (setq beg-A (move-marker (make-marker) beg-A)
++		  end-A (move-marker (make-marker) end-A)))
++	  (ediff-with-current-buffer buffer-B
++	    (setq beg-B (move-marker (make-marker) beg-B)
++		  end-B (move-marker (make-marker) end-B)))
++	  
++	  ;; make file-A
++	  (if word-mode
++	      (ediff-wordify beg-A end-A buffer-A tmp-buffer)
++	    (ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
++	  (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
+ 
+-    ;; in case beg/end-A/B aren't markers--make them into markers
+-    (ediff-with-current-buffer buffer-A
+-      (setq beg-A (move-marker (make-marker) beg-A)
+-	    end-A (move-marker (make-marker) end-A)))
+-    (ediff-with-current-buffer buffer-B
+-      (setq beg-B (move-marker (make-marker) beg-B)
+-	    end-B (move-marker (make-marker) end-B)))
+-
+-    ;; make file-A
+-    (if word-mode
+-	(ediff-wordify beg-A end-A buffer-A tmp-buffer)
+-      (ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
+-    (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
+-
+-    ;; make file-B
+-    (if word-mode
+-	(ediff-wordify beg-B end-B buffer-B tmp-buffer)
+-      (ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
+-    (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
+-
+-    (setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
+-    (setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
+-    (ediff-setup buffer-A file-A
+-		 buffer-B file-B
+-		 nil nil	    ; buffer & file C
+-		 (cons `(lambda ()
+-			    (delete-file ,file-A)
+-			    (delete-file ,file-B))
+-		       startup-hooks)
+-		 (append
+-		  (list (cons 'ediff-word-mode  word-mode)
+-			(cons 'ediff-narrow-bounds (list overl-A overl-B))
+-			(cons 'ediff-job-name job-name))
+-		  setup-parameters))
++	  ;; make file-B
++	  (if word-mode
++	      (ediff-wordify beg-B end-B buffer-B tmp-buffer)
++	    (ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
++	  (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
++	  
++	  (setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
++	  (setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
++	  (ediff-setup buffer-A file-A
++		       buffer-B file-B
++		       nil nil	    ; buffer & file C
++		       (cons `(lambda ()
++				(delete-file ,file-A)
++				(delete-file ,file-B))
++			     startup-hooks)
++		       (append
++			(list (cons 'ediff-word-mode  word-mode)
++			      (cons 'ediff-narrow-bounds (list overl-A overl-B))
++			      (cons 'ediff-job-name job-name))
++			setup-parameters)))
++      (if (and (stringp file-A) (file-exists-p file-A))
++	  (delete-file file-A))
++      (if (and (stringp file-B) (file-exists-p file-B))
++	  (delete-file file-B)))
+     ))
+ 
+ 
+@@ -1415,6 +1464,8 @@
+   "Return string describing the version of Ediff.
+ When called interactively, displays the version."
+   (interactive)
++  ;; called-interactively-p - not in XEmacs
++  ;; (if (called-interactively-p 'interactive)
+   (if (interactive-p)
+       (message "%s" (ediff-version))
+     (format "Ediff %s of %s" ediff-version ediff-date)))
+@@ -1504,11 +1555,11 @@
  (run-hooks 'ediff-load-hook)
  
  
@@ -270,7 +514,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-help.el xemacs-packages/ediff/ediff-help.el
 --- xemacs-packages.ORIG/ediff/ediff-help.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-help.el	2009-08-17 13:40:49.621819245 -0600
++++ xemacs-packages/ediff/ediff-help.el	2009-08-15 00:16:33.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
  
@@ -300,7 +544,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-hook.el xemacs-packages/ediff/ediff-hook.el
 --- xemacs-packages.ORIG/ediff/ediff-hook.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff-hook.el	2009-08-17 13:40:49.629790560 -0600
++++ xemacs-packages/ediff/ediff-hook.el	2009-12-01 09:39:07.134857315 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
  
@@ -310,9 +554,204 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
  ;; Author: Michael Kifer <kifer at cs.stonybrook.edu>
  
+@@ -123,7 +123,7 @@
+ 	   :style toggle
+ 	   :selected (if (featurep 'ediff-tbar)
+ 			 (ediff-use-toolbar-p))]))
+-      
++
+       ;; put these menus before Object-Oriented-Browser in Tools menu
+       (if (and (featurep 'menubar) (not (featurep 'infodock))
+ 	       (not (featurep 'ediff-hook)))
+@@ -141,117 +141,120 @@
+ 	(symbol-value 'menu-bar-ediff-merge-menu))
+   (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
+   (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
+-  
++
+   ;; define ediff compare menu
++  (define-key menu-bar-ediff-menu [ediff-misc]
++    `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu))
++  (define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [window]
+-    '(menu-item "This Window and Next Window" compare-windows
+-		:help "Compare the current window and the next window"))
++    `(menu-item ,(purecopy "This Window and Next Window") compare-windows
++		:help ,(purecopy "Compare the current window and the next window")))
+   (define-key menu-bar-ediff-menu [ediff-windows-linewise]
+-    '(menu-item "Windows Line-by-line..." ediff-windows-linewise
+-		:help "Compare windows line-wise"))
++    `(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise
++		:help ,(purecopy "Compare windows line-wise")))
+   (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
+-    '(menu-item "Windows Word-by-word..." ediff-windows-wordwise
+-		:help "Compare windows word-wise"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
++    `(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise
++		:help ,(purecopy "Compare windows word-wise")))
++  (define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-regions-linewise]
+-    '(menu-item "Regions Line-by-line..." ediff-regions-linewise
+-		:help "Compare regions line-wise"))
++    `(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise
++		:help ,(purecopy "Compare regions line-wise")))
+   (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
+-    '(menu-item "Regions Word-by-word..." ediff-regions-wordwise
+-		:help "Compare regions word-wise"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
++    `(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise
++		:help ,(purecopy "Compare regions word-wise")))
++  (define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-dir-revision]
+-    '(menu-item "Directory Revisions..." ediff-directory-revisions
+-		:help "Compare directory files with their older versions"))
++    `(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions
++		:help ,(purecopy "Compare directory files with their older versions")))
+   (define-key menu-bar-ediff-menu [ediff-revision]
+-    '(menu-item "File with Revision..." ediff-revision
+-		:help "Compare file with its older versions"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
++    `(menu-item ,(purecopy "File with Revision...") ediff-revision
++		:help ,(purecopy "Compare file with its older versions")))
++  (define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-directories3]
+-    '(menu-item "Three Directories..." ediff-directories3
+-		:help "Compare files common to three directories simultaneously"))
++    `(menu-item ,(purecopy "Three Directories...") ediff-directories3
++		:help ,(purecopy "Compare files common to three directories simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-directories]
+-    '(menu-item "Two Directories..." ediff-directories
+-		:help "Compare files common to two directories simultaneously"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
++    `(menu-item ,(purecopy "Two Directories...") ediff-directories
++		:help ,(purecopy "Compare files common to two directories simultaneously")))
++  (define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-buffers3]
+-    '(menu-item "Three Buffers..." ediff-buffers3
+-		:help "Compare three buffers simultaneously"))
++    `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3
++		:help ,(purecopy "Compare three buffers simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-files3]
+-    '(menu-item "Three Files..." ediff-files3
+-		:help "Compare three files simultaneously"))
++    `(menu-item ,(purecopy "Three Files...") ediff-files3
++		:help ,(purecopy "Compare three files simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-buffers]
+-    '(menu-item "Two Buffers..." ediff-buffers
+-		:help "Compare two buffers simultaneously"))
++    `(menu-item ,(purecopy "Two Buffers...") ediff-buffers
++		:help ,(purecopy "Compare two buffers simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-files]
+-    '(menu-item "Two Files..." ediff-files
+-		:help "Compare two files simultaneously"))
++    `(menu-item ,(purecopy "Two Files...") ediff-files
++		:help ,(purecopy "Compare two files simultaneously")))
+ 
+   ;; define ediff merge menu
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
+-    '(menu-item "Directory Revisions with Ancestor..."
++    `(menu-item ,(purecopy "Directory Revisions with Ancestor...")
+       ediff-merge-directory-revisions-with-ancestor
+-      :help "Merge versions of the files in the same directory by comparing the files with common ancestors"))
++      :help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors")))
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
+-    '(menu-item "Directory Revisions..." ediff-merge-directory-revisions
+-      :help "Merge versions of the files in the same directory (without using ancestor information)"))
++    `(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions
++      :help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)")))
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
+-    '(menu-item "Revisions with Ancestor..."
++    `(menu-item ,(purecopy "Revisions with Ancestor...")
+       ediff-merge-revisions-with-ancestor
+-      :help "Merge versions of the same file by comparing them with a common ancestor"))
++      :help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
+-    '(menu-item "Revisions..." ediff-merge-revisions
+-      :help "Merge versions of the same file (without using ancestor information)"))
+-  (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
++    `(menu-item ,(purecopy "Revisions...") ediff-merge-revisions
++      :help ,(purecopy "Merge versions of the same file (without using ancestor information)")))
++  (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] menu-bar-separator)
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
+-    '(menu-item "Directories with Ancestor..."
++    `(menu-item ,(purecopy "Directories with Ancestor...")
+       ediff-merge-directories-with-ancestor
+-      :help "Merge files common to a pair of directories by comparing the files with common ancestors"))
++      :help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
+-    '(menu-item "Directories..." ediff-merge-directories
+-		:help "Merge files common to a pair of directories"))
++    `(menu-item ,(purecopy "Directories...") ediff-merge-directories
++		:help ,(purecopy "Merge files common to a pair of directories")))
+   (define-key
+-    menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
++    menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] menu-bar-separator)
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
+-    '(menu-item "Buffers with Ancestor..." ediff-merge-buffers-with-ancestor
+-      :help "Merge buffers by comparing their contents with a common ancestor"))
++    `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor
++      :help ,(purecopy "Merge buffers by comparing their contents with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
+-    '(menu-item "Buffers..." ediff-merge-buffers
+-      :help "Merge buffers (without using ancestor information)"))
++    `(menu-item ,(purecopy "Buffers...") ediff-merge-buffers
++      :help ,(purecopy "Merge buffers (without using ancestor information)")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
+-    '(menu-item "Files with Ancestor..." ediff-merge-files-with-ancestor
+-      :help "Merge files by comparing them with a common ancestor"))
++    `(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor
++      :help ,(purecopy "Merge files by comparing them with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
+-    '(menu-item "Files..." ediff-merge-files
+-      :help "Merge files (without using ancestor information)"))
++    `(menu-item ,(purecopy "Files...") ediff-merge-files
++      :help ,(purecopy "Merge files (without using ancestor information)")))
+ 
+   ;; define epatch menu
+   (define-key menu-bar-epatch-menu [ediff-patch-buffer]
+-    '(menu-item "To a Buffer..." ediff-patch-buffer
+-      :help "Apply a patch to the contents of a buffer"))
++    `(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer
++      :help ,(purecopy "Apply a patch to the contents of a buffer")))
+   (define-key menu-bar-epatch-menu [ediff-patch-file]
+-    '(menu-item "To a File..." ediff-patch-file
+-      :help "Apply a patch to a file"))
++    `(menu-item ,(purecopy "To a File...") ediff-patch-file
++      :help ,(purecopy "Apply a patch to a file")))
+ 
+   ;; define ediff miscellanea
+   (define-key menu-bar-ediff-misc-menu [emultiframe]
+-    '(menu-item "Toggle use of separate control buffer frame"
++    `(menu-item ,(purecopy "Use separate control buffer frame")
+       ediff-toggle-multiframe
+-      :help "Switch between the single-frame presentation mode and the multi-frame mode"))
++      :help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode")))
+   (define-key menu-bar-ediff-misc-menu [eregistry]
+-    '(menu-item "List Ediff Sessions" ediff-show-registry
+-		:help "List all active Ediff sessions; it is a convenient way to find and resume such a session"))
++    `(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry
++		:help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session")))
+   (define-key menu-bar-ediff-misc-menu [ediff-cust]
+-    '(menu-item "Customize Ediff" ediff-customize
+-		:help "Change some of the parameters that govern the behavior of Ediff"))
++    `(menu-item ,(purecopy "Customize Ediff") ediff-customize
++		:help ,(purecopy "Change some of the parameters that govern the behavior of Ediff")))
+   (define-key menu-bar-ediff-misc-menu [ediff-doc]
+-    '(menu-item "Ediff Manual" ediff-documentation
+-		:help "Bring up the Ediff manual")))
++    `(menu-item ,(purecopy "Ediff Manual") ediff-documentation
++		:help ,(purecopy "Bring up the Ediff manual"))))
+ 
+ (provide 'ediff-hook)
+ 
 diff -dur xemacs-packages.ORIG/ediff/ediff-init.el xemacs-packages/ediff/ediff-init.el
 --- xemacs-packages.ORIG/ediff/ediff-init.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-init.el	2009-08-17 13:40:49.708789986 -0600
++++ xemacs-packages/ediff/ediff-init.el	2009-12-01 09:39:07.140861277 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
  
@@ -530,9 +969,19 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    :type 'integer
    :group 'ediff)
  
+@@ -1549,6 +1551,9 @@
+       (if (eventp event-or-key) (event-key event-or-key) event-or-key)
+     event-or-key))
+ 
++(defun ediff-last-command-char ()
++  (ediff-event-key last-command-event))
++
+ 
+ (defsubst ediff-frame-iconified-p (frame)
+   (and (ediff-window-display-p) (frame-live-p frame)
 diff -dur xemacs-packages.ORIG/ediff/ediff-merg.el xemacs-packages/ediff/ediff-merg.el
 --- xemacs-packages.ORIG/ediff/ediff-merg.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-merg.el	2009-08-17 13:40:49.712766807 -0600
++++ xemacs-packages/ediff/ediff-merg.el	2009-12-01 09:39:07.142859733 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-merg.el --- merging utilities
  
@@ -616,6 +1065,15 @@ diff -dur xemacs-packages.ORIG/ediff/edi
         (ediff-merge-changed-from-default-p n 'prefers-too)))
  
  
+@@ -224,7 +226,7 @@
+ 	  ;;(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))
+ 	  ;;	(reg-B (ediff-get-region-contents n 'B ediff-control-buffer))
+ 	  ;;	(reg-C (ediff-get-region-contents n 'C ediff-control-buffer)))
+-	  (let ()
++	  (progn
+ 
+ 	    ;; if region was edited since it was first set by default
+ 	    (if (or (ediff-merge-changed-from-default-p n)
 @@ -385,11 +387,11 @@
  (provide 'ediff-merg)
  
@@ -635,7 +1093,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-merg.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-mult.el xemacs-packages/ediff/ediff-mult.el
 --- xemacs-packages.ORIG/ediff/ediff-mult.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-mult.el	2009-08-17 13:40:49.846074731 -0600
++++ xemacs-packages/ediff/ediff-mult.el	2009-12-01 09:39:07.149875626 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
  
@@ -702,20 +1160,158 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  This keymap controls key bindings in the meta buffer and is a local variable.
  This means that you can set different bindings for different kinds of meta
  buffers."
-@@ -2344,10 +2344,10 @@
+@@ -392,12 +392,40 @@
+   (define-key ediff-meta-buffer-map  "p"  'ediff-previous-meta-item)
+   (define-key ediff-meta-buffer-map  [delete]  'ediff-previous-meta-item)
+   (define-key ediff-meta-buffer-map  [backspace]  'ediff-previous-meta-item)
+-  (or (ediff-one-filegroup-metajob)
+-      (progn
+-	(define-key ediff-meta-buffer-map "=" nil)
+-	(define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
+-	(define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
+-	(define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
++
++  (let ((menu-map (make-sparse-keymap "Ediff-Meta")))
++    (define-key ediff-meta-buffer-map [menu-bar ediff-meta-mode]
++      (cons "Ediff-Meta" menu-map))
++    (define-key menu-map [ediff-quit-meta-buffer]
++      '(menu-item "Quit" ediff-quit-meta-buffer
++		  :help "Quit the meta buffer"))
++    (define-key menu-map [ediff-toggle-filename-truncation]
++      '(menu-item "Truncate filenames" ediff-toggle-filename-truncation
++	      :help "Toggle truncation of long file names in session group buffers"
++	      :button (:toggle . ediff-meta-truncate-filenames)))
++    (define-key menu-map [ediff-show-registry]
++      '(menu-item "Display Ediff Registry" ediff-show-registry
++		  :help "Display Ediff's registry"))
++    (define-key menu-map [ediff-documentation]
++      '(menu-item "Show Manual" ediff-documentation
++		  :help "Display Ediff's manual"))
++
++    (or (ediff-one-filegroup-metajob)
++	(progn
++	  (define-key ediff-meta-buffer-map "=" nil)
++	  (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
++	  (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
++	  (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
++
++
++    (define-key menu-map [ediff-next-meta-item]
++      '(menu-item "Next" ediff-next-meta-item
++		  :help "Move to the next item in Ediff registry or session group buffer"))
++    (define-key menu-map [ediff-previous-meta-item]
++      '(menu-item "Previous" ediff-previous-meta-item
++		  :help "Move to the previous item in Ediff registry or session group buffer")))
++
++
+   (if ediff-no-emacs-help-in-control-buffer
+       (define-key ediff-meta-buffer-map  "\C-h"  'ediff-previous-meta-item))
+   (if (featurep 'emacs)
+@@ -837,14 +865,58 @@
+ 	      ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation)
+ 	    (define-key
+ 	      ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding)
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-hide-marked-sessions]
++	      '(menu-item "Hide marked" ediff-hide-marked-sessions
++		  :help "Hide marked sessions.  With prefix arg, unhide"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-mark-for-hiding-at-pos]
++	      '(menu-item "Mark for hiding" ediff-mark-for-hiding-at-pos
++		  :help "Mark session for hiding.  With prefix arg, unmark"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos]
++	      '(menu-item "Mark for group operation" ediff-mark-for-operation-at-pos
++		  :help "Mark session for a group operation.  With prefix arg, unmark."))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding]
++	      '(menu-item "Unmark all for hiding" ediff-unmark-all-for-hiding
++		  :help "Unmark all sessions marked for hiding"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-unmark-all-for-operation]
++	      '(menu-item "Unmark all for group operation" ediff-unmark-all-for-operation
++		  :help "Unmark all sessions marked for operation"))
++
+ 	    (cond ((ediff-collect-diffs-metajob jobname)
++		   (define-key ediff-meta-buffer-map
++		     [menu-bar ediff-meta-mode ediff-collect-custom-diffs]
++		     '(menu-item "Collect diffs" ediff-collect-custom-diffs
++				 :help "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'"))
+ 		   (define-key
+ 		     ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
+ 		  ((ediff-patch-metajob jobname)
++		   (define-key ediff-meta-buffer-map
++		     [menu-bar ediff-meta-mode ediff-meta-show-patch]
++		     '(menu-item "Show multi-file patch" ediff-meta-show-patch
++				 :help "Show the multi-file patch associated with this group session"))
+ 		   (define-key
+ 		     ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))
+ 	    (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy)
+-	    (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
++	    (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-up-meta-hierarchy]
++	      '(menu-item "Go to parent session" ediff-up-meta-hierarchy
++			  :help "Go to the parent session group buffer"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-show-dir-diffs]
++	      '(menu-item "Diff directories" ediff-show-dir-diffs
++			  :help "Display differences among the directories involved in session group"))))
+ 
+       (if (eq ediff-metajob-name 'ediff-registry)
+ 	  (run-hooks 'ediff-registry-setup-hook)
+@@ -1639,8 +1711,7 @@
+     (cond ((ediff-buffer-live-p custom-diff-buf)
+ 	   ;; for live session buffers we do them first because the user may
+ 	   ;; have changed them with respect to the underlying files
+-	   (save-excursion
+-	     (set-buffer meta-diff-buff)
++	   (with-current-buffer meta-diff-buff
+ 	     (goto-char (point-max))
+ 	     (insert-buffer-substring custom-diff-buf)
+ 	     (insert "\n")))
+@@ -1649,8 +1720,8 @@
+ 			   ediff-merge-directories
+ 			   ediff-merge-directories-with-ancestor))
+ 	   ;; get diffs by calling shell command on ediff-custom-diff-program
+-	   (save-excursion
+-	     (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
++	   (with-current-buffer
++               (setq tmp-buf (get-buffer-create ediff-tmp-buffer))
+ 	     (erase-buffer)
+ 	     (shell-command
+ 	      (format
+@@ -1662,8 +1733,7 @@
+ 	       )
+ 	      t)
+ 	     )
+-	   (save-excursion
+-	     (set-buffer meta-diff-buff)
++	   (with-current-buffer meta-diff-buff
+ 	     (goto-char (point-max))
+ 	     (insert-buffer-substring tmp-buf)
+ 	     (insert "\n")))
+@@ -2344,10 +2414,10 @@
  This is used only for sessions that involve 2 or 3 files at the same time.
  ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark
  for operation, or simply indicate which are equal files.  If it is nil, then
 -`last-command-char' is used to decide which action to take."
-+`last-command-event' is used to decide which action to take."
++`(ediff-last-command-char)' is used to decide which action to take."
    (interactive)
    (if (null action)
 -      (setq action last-command-char))
-+      (setq action last-command-event))
++      (setq action (ediff-last-command-char)))
    (let ((list (cdr ediff-meta-list))
  	marked1 marked2 marked3
  	fileinfo1 fileinfo2 fileinfo3 elt)
-@@ -2396,11 +2396,11 @@
+@@ -2396,11 +2466,11 @@
  
  
  
@@ -734,7 +1330,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-mult.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-ptch.el xemacs-packages/ediff/ediff-ptch.el
 --- xemacs-packages.ORIG/ediff/ediff-ptch.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-ptch.el	2009-08-17 13:40:49.978036743 -0600
++++ xemacs-packages/ediff/ediff-ptch.el	2009-08-15 00:16:34.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-ptch.el --- Ediff's  patch support
  
@@ -805,7 +1401,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-ptch.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.texi xemacs-packages/ediff/ediff.texi
 --- xemacs-packages.ORIG/ediff/ediff.texi	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff.texi	2009-08-17 13:40:50.672791252 -0600
++++ xemacs-packages/ediff/ediff.texi	2009-08-15 00:16:35.000000000 -0600
 @@ -25,12 +25,12 @@
  This file documents Ediff, a comprehensive visual interface to Unix diff
  and patch utilities.
@@ -1092,7 +1688,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  @ignore
 diff -dur xemacs-packages.ORIG/ediff/ediff-util.el xemacs-packages/ediff/ediff-util.el
 --- xemacs-packages.ORIG/ediff/ediff-util.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-util.el	2009-08-17 13:40:50.241789378 -0600
++++ xemacs-packages/ediff/ediff-util.el	2009-12-01 09:39:07.203961749 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-util.el --- the core commands and utilities of ediff
  
@@ -1102,99 +1698,109 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
  ;; Author: Michael Kifer <kifer at cs.stonybrook.edu>
  
-@@ -1012,7 +1012,7 @@
+@@ -343,8 +343,7 @@
+ 	    (setq buffer-C
+ 		  (get-buffer-create
+ 		   (ediff-unique-buffer-name "*ediff-merge" "*")))
+-	    (save-excursion
+-	      (set-buffer buffer-C)
++	    (with-current-buffer buffer-C
+ 	      (insert-buffer-substring buf)
+ 	      (goto-char (point-min))
+ 	      (funcall (ediff-with-current-buffer buf major-mode))
+@@ -1012,7 +1011,7 @@
    (interactive)
    (ediff-barf-if-not-control-buffer)
    (let ((ctl-buf (if (null buf) (current-buffer)))
 -	(buf-type (ediff-char-to-buftype last-command-char)))
-+	(buf-type (ediff-char-to-buftype last-command-event)))
++	(buf-type (ediff-char-to-buftype (ediff-last-command-char))))
      (or buf (ediff-recenter))
      (or buf
  	(setq buf (ediff-get-buffer buf-type)))
-@@ -1514,7 +1514,7 @@
+@@ -1514,7 +1513,7 @@
        (error ediff-KILLED-VITAL-BUFFER))
  
    (ediff-operate-on-windows
 -   (if (memq last-command-char '(?v ?\C-v))
-+   (if (memq last-command-event '(?v ?\C-v))
++   (if (memq (ediff-last-command-char) '(?v ?\C-v))
         'scroll-up
       'scroll-down)
     ;; calculate argument to scroll-up/down
-@@ -1562,7 +1562,7 @@
+@@ -1562,7 +1561,7 @@
     ;; interactively so that they set the window's min_hscroll.
     ;; Otherwise, automatic hscrolling will undo the effect of
     ;; hscrolling.
 -   (if (= last-command-char ?<)
-+   (if (= last-command-event ?<)
++   (if (= (ediff-last-command-char) ?<)
         (lambda (arg)
  	 (let ((prefix-arg arg))
  	   (call-interactively 'scroll-left)))
-@@ -1826,7 +1826,7 @@
+@@ -1826,7 +1825,7 @@
  in the specified buffer."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
 -  (let* ((buf-type (ediff-char-to-buftype last-command-char))
-+  (let* ((buf-type (ediff-char-to-buftype last-command-event))
++  (let* ((buf-type (ediff-char-to-buftype (ediff-last-command-char)))
  	 (buffer (ediff-get-buffer buf-type))
  	 (pt (ediff-with-current-buffer buffer (point)))
  	 (diff-no (ediff-diff-at-point buf-type nil (if arg 'after)))
-@@ -2162,13 +2162,13 @@
+@@ -2162,13 +2161,13 @@
    "Restore ARGth diff from `ediff-killed-diffs-alist'.
  ARG is a prefix argument.  If ARG is nil, restore the current-difference.
  If the second optional argument, a character, is given, use it to
 -determine the target buffer instead of last-command-char"
-+determine the target buffer instead of last-command-event"
++determine the target buffer instead of (ediff-last-command-char)"
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
    (if (numberp arg)
        (ediff-jump-to-difference arg))
    (ediff-pop-diff ediff-current-difference
 -		  (ediff-char-to-buftype (or key last-command-char)))
-+		  (ediff-char-to-buftype (or key last-command-event)))
++		  (ediff-char-to-buftype (or key (ediff-last-command-char))))
    ;; recenter with rehighlighting, but no messages
    (let (ediff-verbose-p)
      (ediff-recenter)))
-@@ -2192,13 +2192,13 @@
+@@ -2192,13 +2191,13 @@
      (cond
       ((or (and (eq ediff-skip-diff-region-function
  		   ediff-focus-on-regexp-matches-function)
 -	       (eq last-command-char ?f))
-+	       (eq last-command-event ?f))
++	       (eq (ediff-last-command-char) ?f))
  	  (and (eq ediff-skip-diff-region-function
  		   ediff-hide-regexp-matches-function)
 -	       (eq last-command-char ?h)))
-+	       (eq last-command-event ?h)))
++	       (eq (ediff-last-command-char) ?h)))
        (message "Selective browsing by regexp turned off")
        (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
 -     ((eq last-command-char ?h)
-+     ((eq last-command-event ?h)
++     ((eq (ediff-last-command-char) ?h)
        (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
  	    regexp-A
  	    (read-string
-@@ -2236,7 +2236,7 @@
+@@ -2236,7 +2235,7 @@
        (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
        (or (string= regexp-C "") (setq ediff-regexp-hide-C regexp-C)))
  
 -     ((eq last-command-char ?f)
-+     ((eq last-command-event ?f)
++     ((eq (ediff-last-command-char) ?f)
        (setq ediff-skip-diff-region-function
  	    ediff-focus-on-regexp-matches-function
  	    regexp-A
-@@ -3302,10 +3302,10 @@
+@@ -3302,10 +3301,10 @@
    (ediff-barf-if-not-control-buffer)
    (ediff-compute-custom-diffs-maybe)
    (ediff-with-current-buffer
 -      (cond ((memq last-command-char '(?a ?b ?c))
-+      (cond ((memq last-command-event '(?a ?b ?c))
++      (cond ((memq (ediff-last-command-char) '(?a ?b ?c))
  	     (ediff-get-buffer
 -	      (ediff-char-to-buftype last-command-char)))
 -	    ((eq last-command-char ?d)
-+	      (ediff-char-to-buftype last-command-event)))
-+	    ((eq last-command-event ?d)
++	      (ediff-char-to-buftype (ediff-last-command-char))))
++	    ((eq (ediff-last-command-char) ?d)
  	     (message "Saving diff output ...")
  	     (sit-for 1) ; let the user see the message
  	     (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
-@@ -3416,11 +3416,8 @@
+@@ -3416,11 +3415,8 @@
      (ediff-exec-process
       ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
       ediff-custom-diff-options
@@ -1210,7 +1816,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	(with-current-buffer ediff-custom-diff-buffer
 diff -dur xemacs-packages.ORIG/ediff/ediff-vers.el xemacs-packages/ediff/ediff-vers.el
 --- xemacs-packages.ORIG/ediff/ediff-vers.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-vers.el	2009-08-17 13:40:50.284889800 -0600
++++ xemacs-packages/ediff/ediff-vers.el	2009-12-01 09:39:07.212891653 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-vers.el --- version control interface to Ediff
  
@@ -1242,7 +1848,30 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	      (t (error "File %s is not under version control" file))))
      ))
  
-@@ -232,11 +232,11 @@
+@@ -123,8 +123,7 @@
+ 	(fundamental-mode))
+       (let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
+ 	(delete-windows-on output-buffer)
+-	(save-excursion
+-	  (set-buffer output-buffer)
++	(with-current-buffer output-buffer
+ 	  (apply 'call-process "co" nil t nil
+ 		 ;; -q: quiet (no diagnostics)
+ 		 (append switches rcs-default-co-switches
+@@ -137,10 +136,8 @@
+   ;; Optional NAME is name to use instead of `*RCS-output*'.
+   ;; This is a modified version from rcs.el v1.1.  I use it here to make
+   ;; Ediff immune to changes in rcs.el
+-  (let* ((default-major-mode 'fundamental-mode) ; no frills!
+-	 (buf (get-buffer-create name)))
+-    (save-excursion
+-      (set-buffer buf)
++  (let ((buf (get-buffer-create name)))
++    (with-current-buffer buf
+       (setq buffer-read-only nil
+ 	    default-directory (file-name-directory (expand-file-name file)))
+       (erase-buffer))
+@@ -232,11 +229,11 @@
  (provide 'ediff-vers)
  
  
@@ -1261,7 +1890,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-vers.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-wind.el xemacs-packages/ediff/ediff-wind.el
 --- xemacs-packages.ORIG/ediff/ediff-wind.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-wind.el	2009-08-17 13:40:50.393889478 -0600
++++ xemacs-packages/ediff/ediff-wind.el	2009-08-15 00:16:35.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-wind.el --- window manipulation utilities
  
@@ -1371,13 +2000,13 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-wind.el ends here
 diff -dur xemacs-packages.ORIG/ediff/Makefile xemacs-packages/ediff/Makefile
 --- xemacs-packages.ORIG/ediff/Makefile	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/Makefile	2009-08-17 13:40:49.470802803 -0600
++++ xemacs-packages/ediff/Makefile	2009-12-01 09:39:07.130861623 -0700
 @@ -17,7 +17,7 @@
  # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  # Boston, MA 02111-1307, USA.
  
 -VERSION = 1.77
-+VERSION = 1.78
++VERSION = 1.79
  AUTHOR_VERSION = 2.75
  MAINTAINER = Michael Kifer <kifer at cs.sunysb.edu>
  PACKAGE = ediff


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xemacs-packages-extra.spec	3 Nov 2009 17:51:02 -0000	1.12
+++ xemacs-packages-extra.spec	1 Dec 2009 17:58:49 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -134,6 +134,10 @@ chmod +x make.sh
 sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
   xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer
 
+# The X-Symbol font files are only needed on Windows
+rm -fr xemacs-packages/x-symbol/fonts
+rm -fr xemacs-packages/x-symbol/origfonts
+
 
 %build
 cd xemacs-packages/xslt-process/java
@@ -244,6 +248,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-5
+- The last ediff fix included more Emacs-specific code (bz 537531).
+- Don't package x-symbol fonts, which are only needed on Windows anyway.
+
 * Tue Nov  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
 - Fix Emacs-only coding system in ediff (bz 532620).
 



From jjames at fedoraproject.org  Tue Dec  1 17:58:50 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 17:58:50 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-12
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,
	1.1, 1.2 xemacs-packages-extra.spec, 1.13, 1.14
Message-ID: <20091201175850.009F511C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24137/F-12

Modified Files:
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch 
	xemacs-packages-extra.spec 
Log Message:
* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
- The last ediff fix included more Emacs-specific code (bz 537531).
- Don't package x-symbol fonts, which are only needed on Windows anyway.


xemacs-packages-extra-20091103-ediff-coding-system-532620.patch:
 ChangeLog     |   45 +++++++++++
 Makefile      |    2 
 ediff-diff.el |   45 +++++------
 ediff-help.el |    6 -
 ediff-hook.el |  137 ++++++++++++++++++-----------------
 ediff-init.el |   67 +++++++++--------
 ediff-merg.el |   36 ++++-----
 ediff-mult.el |  130 +++++++++++++++++++++++++--------
 ediff-ptch.el |   22 ++---
 ediff-util.el |   38 ++++-----
 ediff-vers.el |   27 +++---
 ediff-wind.el |   30 +++----
 ediff.el      |  225 +++++++++++++++++++++++++++++++++++-----------------------
 ediff.texi    |  224 ++++++++++++++++++++++++++++++---------------------------
 14 files changed, 606 insertions(+), 428 deletions(-)

Index: xemacs-packages-extra-20091103-ediff-coding-system-532620.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-12/xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	3 Nov 2009 17:51:02 -0000	1.1
+++ xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	1 Dec 2009 17:58:49 -0000	1.2
@@ -1,7 +1,34 @@
 diff -dur xemacs-packages.ORIG/ediff/ChangeLog xemacs-packages/ediff/ChangeLog
 --- xemacs-packages.ORIG/ediff/ChangeLog	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/ChangeLog	2009-08-17 13:40:49.458796934 -0600
-@@ -1,3 +1,21 @@
++++ xemacs-packages/ediff/ChangeLog	2009-12-01 09:39:07.126858310 -0700
+@@ -1,3 +1,48 @@
++2009-11-27  Norbert Koch  <viteno at xemacs.org>
++
++	* Makefile (VERSION): XEmacs package 1.79 released.
++
++2009-11-26  Adrian Aichner  <adrian at xemacs.org>
++
++	* ediff.el (ediff-buffers-internal): Delete temporary files in
++	case of non-local exit, like C-g (keyboard-quit), as well.
++	* ediff.el (ediff-regions-internal): Ditto.
++
++2009-11-26  Michael Kifer <kifer at cs.stonybrook.edu>
++	
++	* ediff-init.el, ediff-mult.el, ediff-util.el: relpace
++	last-command-char and last-command-event with (ediff-last-command-char) everywhere.
++	
++	* ediff.el (ediff-version): revert change made in Emacs tree.
++	
++	* ediff-menu.el: use purecopy in Emacs menus.
++	
++	* ediff-diff.el, ediff-merge.el, ediff-mult.el, ediff-util.el,
++	ediff.el, ediff-vers.el: use with-current-buffer instead of
++	save-excursion/set-buffer whenever possible. Other cosmetic changes
++	from the Emacs tree.
++	
++	* ediff-mult.el: apply Dan Nicolaescu's patch that adds a menu in
++	ediff-meta mode.
++	
 +2009-08-16  Norbert Koch  <viteno at xemacs.org>
 +
 +	* Makefile (VERSION): XEmacs package 1.78 released.
@@ -25,7 +52,7 @@ diff -dur xemacs-packages.ORIG/ediff/Cha
  	* Makefile (VERSION): XEmacs package 1.77 released.
 diff -dur xemacs-packages.ORIG/ediff/ediff-diff.el xemacs-packages/ediff/ediff-diff.el
 --- xemacs-packages.ORIG/ediff/ediff-diff.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-diff.el	2009-08-17 13:40:49.543789080 -0600
++++ xemacs-packages/ediff/ediff-diff.el	2009-12-01 09:39:07.132860465 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-diff.el --- diff-related utilities
  
@@ -131,7 +158,37 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  Lines that do not match are assumed to be error messages."
    :type 'regexp
    :group 'ediff-diff)
-@@ -1529,11 +1529,11 @@
+@@ -1225,8 +1225,7 @@
+     (unwind-protect
+ 	(let ((directory default-directory)
+ 	      proc)
+-	  (save-excursion
+-	    (set-buffer buffer)
++	  (with-current-buffer buffer
+ 	    (erase-buffer)
+ 	    (setq default-directory directory)
+ 	    (if (or (memq system-type '(emx ms-dos windows-nt windows-95))
+@@ -1283,8 +1282,7 @@
+   (if (and (memq (process-status process) '(exit signal))
+            (buffer-name (process-buffer process)))
+       (progn
+-        (save-excursion
+-          (set-buffer (process-buffer process))
++        (with-current-buffer (process-buffer process)
+           (setq mode-line-process nil))
+         (delete-process process))))
+ 
+@@ -1354,8 +1352,7 @@
+ 	       ediff-forward-word-function)
+ 	   ediff-forward-word-function))
+ 	inbuf-syntax-tbl sv-point diff-string)
+-    (save-excursion
+-     (set-buffer in-buffer)
++    (with-current-buffer in-buffer
+      (setq inbuf-syntax-tbl
+ 	   (if control-buf
+ 	       (ediff-with-current-buffer control-buf
+@@ -1529,11 +1526,11 @@
  
  
  
@@ -150,7 +207,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-diff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.el xemacs-packages/ediff/ediff.el
 --- xemacs-packages.ORIG/ediff/ediff.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff.el	2009-08-17 13:40:50.479789989 -0600
++++ xemacs-packages/ediff/ediff.el	2009-12-01 09:39:07.214982518 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff.el --- a comprehensive visual interface to diff & patch
  
@@ -166,8 +223,8 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 -(defconst ediff-version "2.81.2" "The current version of Ediff")
 -(defconst ediff-date "November 22, 2008" "Date of last update")
-+(defconst ediff-version "2.81.3" "The current version of Ediff")
-+(defconst ediff-date "August 15, 2009" "Date of last update")
++(defconst ediff-version "2.81.4" "The current version of Ediff")
++(defconst ediff-date "November 26, 2009" "Date of last update")
  
  
  ;; This file is part of GNU Emacs.
@@ -251,7 +308,194 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  (defun ediff-backup (file)
    "Run Ediff on FILE and its backup file.
  Uses the latest backup, if there are several numerical backups.
-@@ -1504,11 +1542,11 @@
+@@ -437,37 +475,45 @@
+ 	 (buf-C-file-name (if buf-C-is-alive
+ 			      (buffer-file-name (get-buffer buf-B))))
+ 	 file-A file-B file-C)
+-    (if (not (ediff-buffer-live-p buf-A))
+-	(error "Buffer %S doesn't exist" buf-A))
+-    (if (not (ediff-buffer-live-p buf-B))
+-	(error "Buffer %S doesn't exist" buf-B))
+-    (let ((ediff-job-name job-name))
+-      (if (and ediff-3way-comparison-job
+-	       (not buf-C-is-alive))
+-	  (error "Buffer %S doesn't exist" buf-C)))
+-    (if (stringp buf-A-file-name)
+-	(setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
+-    (if (stringp buf-B-file-name)
+-	(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
+-    (if (stringp buf-C-file-name)
+-	(setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
+-
+-    (setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
+-	  file-B (ediff-make-temp-file buf-B buf-B-file-name))
+-    (if buf-C-is-alive
+-	(setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
+-
+-    (ediff-setup (get-buffer buf-A) file-A
+-		 (get-buffer buf-B) file-B
+-		 (if buf-C-is-alive (get-buffer buf-C))
+-		 file-C
+-		 (cons `(lambda ()
+-			  (delete-file ,file-A)
+-			  (delete-file ,file-B)
+-			  (if (stringp ,file-C) (delete-file ,file-C)))
+-		       startup-hooks)
+-		 (list (cons 'ediff-job-name job-name))
+-		 merge-buffer-file)))
++    (unwind-protect
++	(progn
++	  (if (not (ediff-buffer-live-p buf-A))
++	      (error "Buffer %S doesn't exist" buf-A))
++	  (if (not (ediff-buffer-live-p buf-B))
++	      (error "Buffer %S doesn't exist" buf-B))
++	  (let ((ediff-job-name job-name))
++	    (if (and ediff-3way-comparison-job
++		     (not buf-C-is-alive))
++		(error "Buffer %S doesn't exist" buf-C)))
++	  (if (stringp buf-A-file-name)
++	      (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
++	  (if (stringp buf-B-file-name)
++	      (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
++	  (if (stringp buf-C-file-name)
++	      (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
++	  
++	  (setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
++		file-B (ediff-make-temp-file buf-B buf-B-file-name))
++	  (if buf-C-is-alive
++	      (setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
++	  
++	  (ediff-setup (get-buffer buf-A) file-A
++		       (get-buffer buf-B) file-B
++		       (if buf-C-is-alive (get-buffer buf-C))
++		       file-C
++		       (cons `(lambda ()
++				(delete-file ,file-A)
++				(delete-file ,file-B)
++				(if (stringp ,file-C) (delete-file ,file-C)))
++			     startup-hooks)
++		       (list (cons 'ediff-job-name job-name))
++		       merge-buffer-file))
++      (if (and (stringp file-A) (file-exists-p file-A))
++	  (delete-file file-A))
++      (if (and (stringp file-B) (file-exists-p file-B))
++	  (delete-file file-B))
++      (if (and (stringp file-C) (file-exists-p file-C))
++	  (delete-file file-C)))))
+ 
+ 
+ ;;; Directory and file group operations
+@@ -939,8 +985,7 @@
+ 	(buffer-B
+          (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
+         reg-A-beg reg-A-end reg-B-beg reg-B-end)
+-    (save-excursion
+-      (set-buffer buffer-A)
++    (with-current-buffer buffer-A
+       (setq reg-A-beg (region-beginning)
+ 	    reg-A-end (region-end))
+       (set-buffer buffer-B)
+@@ -980,8 +1025,7 @@
+ 	(buffer-B
+          (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
+         reg-A-beg reg-A-end reg-B-beg reg-B-end)
+-    (save-excursion
+-      (set-buffer buffer-A)
++    (with-current-buffer buffer-A
+       (setq reg-A-beg (region-beginning)
+ 	    reg-A-end (region-end))
+       ;; enlarge the region to hold full lines
+@@ -1019,41 +1063,46 @@
+   (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
+ 	overl-A overl-B
+ 	file-A file-B)
++    (unwind-protect
++	(progn
++	  ;; in case beg/end-A/B aren't markers--make them into markers
++	  (ediff-with-current-buffer buffer-A
++	    (setq beg-A (move-marker (make-marker) beg-A)
++		  end-A (move-marker (make-marker) end-A)))
++	  (ediff-with-current-buffer buffer-B
++	    (setq beg-B (move-marker (make-marker) beg-B)
++		  end-B (move-marker (make-marker) end-B)))
++	  
++	  ;; make file-A
++	  (if word-mode
++	      (ediff-wordify beg-A end-A buffer-A tmp-buffer)
++	    (ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
++	  (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
+ 
+-    ;; in case beg/end-A/B aren't markers--make them into markers
+-    (ediff-with-current-buffer buffer-A
+-      (setq beg-A (move-marker (make-marker) beg-A)
+-	    end-A (move-marker (make-marker) end-A)))
+-    (ediff-with-current-buffer buffer-B
+-      (setq beg-B (move-marker (make-marker) beg-B)
+-	    end-B (move-marker (make-marker) end-B)))
+-
+-    ;; make file-A
+-    (if word-mode
+-	(ediff-wordify beg-A end-A buffer-A tmp-buffer)
+-      (ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
+-    (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
+-
+-    ;; make file-B
+-    (if word-mode
+-	(ediff-wordify beg-B end-B buffer-B tmp-buffer)
+-      (ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
+-    (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
+-
+-    (setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
+-    (setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
+-    (ediff-setup buffer-A file-A
+-		 buffer-B file-B
+-		 nil nil	    ; buffer & file C
+-		 (cons `(lambda ()
+-			    (delete-file ,file-A)
+-			    (delete-file ,file-B))
+-		       startup-hooks)
+-		 (append
+-		  (list (cons 'ediff-word-mode  word-mode)
+-			(cons 'ediff-narrow-bounds (list overl-A overl-B))
+-			(cons 'ediff-job-name job-name))
+-		  setup-parameters))
++	  ;; make file-B
++	  (if word-mode
++	      (ediff-wordify beg-B end-B buffer-B tmp-buffer)
++	    (ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
++	  (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
++	  
++	  (setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
++	  (setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
++	  (ediff-setup buffer-A file-A
++		       buffer-B file-B
++		       nil nil	    ; buffer & file C
++		       (cons `(lambda ()
++				(delete-file ,file-A)
++				(delete-file ,file-B))
++			     startup-hooks)
++		       (append
++			(list (cons 'ediff-word-mode  word-mode)
++			      (cons 'ediff-narrow-bounds (list overl-A overl-B))
++			      (cons 'ediff-job-name job-name))
++			setup-parameters)))
++      (if (and (stringp file-A) (file-exists-p file-A))
++	  (delete-file file-A))
++      (if (and (stringp file-B) (file-exists-p file-B))
++	  (delete-file file-B)))
+     ))
+ 
+ 
+@@ -1415,6 +1464,8 @@
+   "Return string describing the version of Ediff.
+ When called interactively, displays the version."
+   (interactive)
++  ;; called-interactively-p - not in XEmacs
++  ;; (if (called-interactively-p 'interactive)
+   (if (interactive-p)
+       (message "%s" (ediff-version))
+     (format "Ediff %s of %s" ediff-version ediff-date)))
+@@ -1504,11 +1555,11 @@
  (run-hooks 'ediff-load-hook)
  
  
@@ -270,7 +514,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-help.el xemacs-packages/ediff/ediff-help.el
 --- xemacs-packages.ORIG/ediff/ediff-help.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-help.el	2009-08-17 13:40:49.621819245 -0600
++++ xemacs-packages/ediff/ediff-help.el	2009-08-15 00:16:33.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
  
@@ -300,7 +544,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-hook.el xemacs-packages/ediff/ediff-hook.el
 --- xemacs-packages.ORIG/ediff/ediff-hook.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff-hook.el	2009-08-17 13:40:49.629790560 -0600
++++ xemacs-packages/ediff/ediff-hook.el	2009-12-01 09:39:07.134857315 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
  
@@ -310,9 +554,204 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
  ;; Author: Michael Kifer <kifer at cs.stonybrook.edu>
  
+@@ -123,7 +123,7 @@
+ 	   :style toggle
+ 	   :selected (if (featurep 'ediff-tbar)
+ 			 (ediff-use-toolbar-p))]))
+-      
++
+       ;; put these menus before Object-Oriented-Browser in Tools menu
+       (if (and (featurep 'menubar) (not (featurep 'infodock))
+ 	       (not (featurep 'ediff-hook)))
+@@ -141,117 +141,120 @@
+ 	(symbol-value 'menu-bar-ediff-merge-menu))
+   (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
+   (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
+-  
++
+   ;; define ediff compare menu
++  (define-key menu-bar-ediff-menu [ediff-misc]
++    `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu))
++  (define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [window]
+-    '(menu-item "This Window and Next Window" compare-windows
+-		:help "Compare the current window and the next window"))
++    `(menu-item ,(purecopy "This Window and Next Window") compare-windows
++		:help ,(purecopy "Compare the current window and the next window")))
+   (define-key menu-bar-ediff-menu [ediff-windows-linewise]
+-    '(menu-item "Windows Line-by-line..." ediff-windows-linewise
+-		:help "Compare windows line-wise"))
++    `(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise
++		:help ,(purecopy "Compare windows line-wise")))
+   (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
+-    '(menu-item "Windows Word-by-word..." ediff-windows-wordwise
+-		:help "Compare windows word-wise"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
++    `(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise
++		:help ,(purecopy "Compare windows word-wise")))
++  (define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-regions-linewise]
+-    '(menu-item "Regions Line-by-line..." ediff-regions-linewise
+-		:help "Compare regions line-wise"))
++    `(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise
++		:help ,(purecopy "Compare regions line-wise")))
+   (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
+-    '(menu-item "Regions Word-by-word..." ediff-regions-wordwise
+-		:help "Compare regions word-wise"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
++    `(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise
++		:help ,(purecopy "Compare regions word-wise")))
++  (define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-dir-revision]
+-    '(menu-item "Directory Revisions..." ediff-directory-revisions
+-		:help "Compare directory files with their older versions"))
++    `(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions
++		:help ,(purecopy "Compare directory files with their older versions")))
+   (define-key menu-bar-ediff-menu [ediff-revision]
+-    '(menu-item "File with Revision..." ediff-revision
+-		:help "Compare file with its older versions"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
++    `(menu-item ,(purecopy "File with Revision...") ediff-revision
++		:help ,(purecopy "Compare file with its older versions")))
++  (define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-directories3]
+-    '(menu-item "Three Directories..." ediff-directories3
+-		:help "Compare files common to three directories simultaneously"))
++    `(menu-item ,(purecopy "Three Directories...") ediff-directories3
++		:help ,(purecopy "Compare files common to three directories simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-directories]
+-    '(menu-item "Two Directories..." ediff-directories
+-		:help "Compare files common to two directories simultaneously"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
++    `(menu-item ,(purecopy "Two Directories...") ediff-directories
++		:help ,(purecopy "Compare files common to two directories simultaneously")))
++  (define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-buffers3]
+-    '(menu-item "Three Buffers..." ediff-buffers3
+-		:help "Compare three buffers simultaneously"))
++    `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3
++		:help ,(purecopy "Compare three buffers simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-files3]
+-    '(menu-item "Three Files..." ediff-files3
+-		:help "Compare three files simultaneously"))
++    `(menu-item ,(purecopy "Three Files...") ediff-files3
++		:help ,(purecopy "Compare three files simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-buffers]
+-    '(menu-item "Two Buffers..." ediff-buffers
+-		:help "Compare two buffers simultaneously"))
++    `(menu-item ,(purecopy "Two Buffers...") ediff-buffers
++		:help ,(purecopy "Compare two buffers simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-files]
+-    '(menu-item "Two Files..." ediff-files
+-		:help "Compare two files simultaneously"))
++    `(menu-item ,(purecopy "Two Files...") ediff-files
++		:help ,(purecopy "Compare two files simultaneously")))
+ 
+   ;; define ediff merge menu
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
+-    '(menu-item "Directory Revisions with Ancestor..."
++    `(menu-item ,(purecopy "Directory Revisions with Ancestor...")
+       ediff-merge-directory-revisions-with-ancestor
+-      :help "Merge versions of the files in the same directory by comparing the files with common ancestors"))
++      :help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors")))
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
+-    '(menu-item "Directory Revisions..." ediff-merge-directory-revisions
+-      :help "Merge versions of the files in the same directory (without using ancestor information)"))
++    `(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions
++      :help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)")))
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
+-    '(menu-item "Revisions with Ancestor..."
++    `(menu-item ,(purecopy "Revisions with Ancestor...")
+       ediff-merge-revisions-with-ancestor
+-      :help "Merge versions of the same file by comparing them with a common ancestor"))
++      :help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
+-    '(menu-item "Revisions..." ediff-merge-revisions
+-      :help "Merge versions of the same file (without using ancestor information)"))
+-  (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
++    `(menu-item ,(purecopy "Revisions...") ediff-merge-revisions
++      :help ,(purecopy "Merge versions of the same file (without using ancestor information)")))
++  (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] menu-bar-separator)
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
+-    '(menu-item "Directories with Ancestor..."
++    `(menu-item ,(purecopy "Directories with Ancestor...")
+       ediff-merge-directories-with-ancestor
+-      :help "Merge files common to a pair of directories by comparing the files with common ancestors"))
++      :help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
+-    '(menu-item "Directories..." ediff-merge-directories
+-		:help "Merge files common to a pair of directories"))
++    `(menu-item ,(purecopy "Directories...") ediff-merge-directories
++		:help ,(purecopy "Merge files common to a pair of directories")))
+   (define-key
+-    menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
++    menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] menu-bar-separator)
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
+-    '(menu-item "Buffers with Ancestor..." ediff-merge-buffers-with-ancestor
+-      :help "Merge buffers by comparing their contents with a common ancestor"))
++    `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor
++      :help ,(purecopy "Merge buffers by comparing their contents with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
+-    '(menu-item "Buffers..." ediff-merge-buffers
+-      :help "Merge buffers (without using ancestor information)"))
++    `(menu-item ,(purecopy "Buffers...") ediff-merge-buffers
++      :help ,(purecopy "Merge buffers (without using ancestor information)")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
+-    '(menu-item "Files with Ancestor..." ediff-merge-files-with-ancestor
+-      :help "Merge files by comparing them with a common ancestor"))
++    `(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor
++      :help ,(purecopy "Merge files by comparing them with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
+-    '(menu-item "Files..." ediff-merge-files
+-      :help "Merge files (without using ancestor information)"))
++    `(menu-item ,(purecopy "Files...") ediff-merge-files
++      :help ,(purecopy "Merge files (without using ancestor information)")))
+ 
+   ;; define epatch menu
+   (define-key menu-bar-epatch-menu [ediff-patch-buffer]
+-    '(menu-item "To a Buffer..." ediff-patch-buffer
+-      :help "Apply a patch to the contents of a buffer"))
++    `(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer
++      :help ,(purecopy "Apply a patch to the contents of a buffer")))
+   (define-key menu-bar-epatch-menu [ediff-patch-file]
+-    '(menu-item "To a File..." ediff-patch-file
+-      :help "Apply a patch to a file"))
++    `(menu-item ,(purecopy "To a File...") ediff-patch-file
++      :help ,(purecopy "Apply a patch to a file")))
+ 
+   ;; define ediff miscellanea
+   (define-key menu-bar-ediff-misc-menu [emultiframe]
+-    '(menu-item "Toggle use of separate control buffer frame"
++    `(menu-item ,(purecopy "Use separate control buffer frame")
+       ediff-toggle-multiframe
+-      :help "Switch between the single-frame presentation mode and the multi-frame mode"))
++      :help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode")))
+   (define-key menu-bar-ediff-misc-menu [eregistry]
+-    '(menu-item "List Ediff Sessions" ediff-show-registry
+-		:help "List all active Ediff sessions; it is a convenient way to find and resume such a session"))
++    `(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry
++		:help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session")))
+   (define-key menu-bar-ediff-misc-menu [ediff-cust]
+-    '(menu-item "Customize Ediff" ediff-customize
+-		:help "Change some of the parameters that govern the behavior of Ediff"))
++    `(menu-item ,(purecopy "Customize Ediff") ediff-customize
++		:help ,(purecopy "Change some of the parameters that govern the behavior of Ediff")))
+   (define-key menu-bar-ediff-misc-menu [ediff-doc]
+-    '(menu-item "Ediff Manual" ediff-documentation
+-		:help "Bring up the Ediff manual")))
++    `(menu-item ,(purecopy "Ediff Manual") ediff-documentation
++		:help ,(purecopy "Bring up the Ediff manual"))))
+ 
+ (provide 'ediff-hook)
+ 
 diff -dur xemacs-packages.ORIG/ediff/ediff-init.el xemacs-packages/ediff/ediff-init.el
 --- xemacs-packages.ORIG/ediff/ediff-init.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-init.el	2009-08-17 13:40:49.708789986 -0600
++++ xemacs-packages/ediff/ediff-init.el	2009-12-01 09:39:07.140861277 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
  
@@ -530,9 +969,19 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    :type 'integer
    :group 'ediff)
  
+@@ -1549,6 +1551,9 @@
+       (if (eventp event-or-key) (event-key event-or-key) event-or-key)
+     event-or-key))
+ 
++(defun ediff-last-command-char ()
++  (ediff-event-key last-command-event))
++
+ 
+ (defsubst ediff-frame-iconified-p (frame)
+   (and (ediff-window-display-p) (frame-live-p frame)
 diff -dur xemacs-packages.ORIG/ediff/ediff-merg.el xemacs-packages/ediff/ediff-merg.el
 --- xemacs-packages.ORIG/ediff/ediff-merg.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-merg.el	2009-08-17 13:40:49.712766807 -0600
++++ xemacs-packages/ediff/ediff-merg.el	2009-12-01 09:39:07.142859733 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-merg.el --- merging utilities
  
@@ -616,6 +1065,15 @@ diff -dur xemacs-packages.ORIG/ediff/edi
         (ediff-merge-changed-from-default-p n 'prefers-too)))
  
  
+@@ -224,7 +226,7 @@
+ 	  ;;(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))
+ 	  ;;	(reg-B (ediff-get-region-contents n 'B ediff-control-buffer))
+ 	  ;;	(reg-C (ediff-get-region-contents n 'C ediff-control-buffer)))
+-	  (let ()
++	  (progn
+ 
+ 	    ;; if region was edited since it was first set by default
+ 	    (if (or (ediff-merge-changed-from-default-p n)
 @@ -385,11 +387,11 @@
  (provide 'ediff-merg)
  
@@ -635,7 +1093,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-merg.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-mult.el xemacs-packages/ediff/ediff-mult.el
 --- xemacs-packages.ORIG/ediff/ediff-mult.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-mult.el	2009-08-17 13:40:49.846074731 -0600
++++ xemacs-packages/ediff/ediff-mult.el	2009-12-01 09:39:07.149875626 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
  
@@ -702,20 +1160,158 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  This keymap controls key bindings in the meta buffer and is a local variable.
  This means that you can set different bindings for different kinds of meta
  buffers."
-@@ -2344,10 +2344,10 @@
+@@ -392,12 +392,40 @@
+   (define-key ediff-meta-buffer-map  "p"  'ediff-previous-meta-item)
+   (define-key ediff-meta-buffer-map  [delete]  'ediff-previous-meta-item)
+   (define-key ediff-meta-buffer-map  [backspace]  'ediff-previous-meta-item)
+-  (or (ediff-one-filegroup-metajob)
+-      (progn
+-	(define-key ediff-meta-buffer-map "=" nil)
+-	(define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
+-	(define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
+-	(define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
++
++  (let ((menu-map (make-sparse-keymap "Ediff-Meta")))
++    (define-key ediff-meta-buffer-map [menu-bar ediff-meta-mode]
++      (cons "Ediff-Meta" menu-map))
++    (define-key menu-map [ediff-quit-meta-buffer]
++      '(menu-item "Quit" ediff-quit-meta-buffer
++		  :help "Quit the meta buffer"))
++    (define-key menu-map [ediff-toggle-filename-truncation]
++      '(menu-item "Truncate filenames" ediff-toggle-filename-truncation
++	      :help "Toggle truncation of long file names in session group buffers"
++	      :button (:toggle . ediff-meta-truncate-filenames)))
++    (define-key menu-map [ediff-show-registry]
++      '(menu-item "Display Ediff Registry" ediff-show-registry
++		  :help "Display Ediff's registry"))
++    (define-key menu-map [ediff-documentation]
++      '(menu-item "Show Manual" ediff-documentation
++		  :help "Display Ediff's manual"))
++
++    (or (ediff-one-filegroup-metajob)
++	(progn
++	  (define-key ediff-meta-buffer-map "=" nil)
++	  (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
++	  (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
++	  (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
++
++
++    (define-key menu-map [ediff-next-meta-item]
++      '(menu-item "Next" ediff-next-meta-item
++		  :help "Move to the next item in Ediff registry or session group buffer"))
++    (define-key menu-map [ediff-previous-meta-item]
++      '(menu-item "Previous" ediff-previous-meta-item
++		  :help "Move to the previous item in Ediff registry or session group buffer")))
++
++
+   (if ediff-no-emacs-help-in-control-buffer
+       (define-key ediff-meta-buffer-map  "\C-h"  'ediff-previous-meta-item))
+   (if (featurep 'emacs)
+@@ -837,14 +865,58 @@
+ 	      ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation)
+ 	    (define-key
+ 	      ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding)
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-hide-marked-sessions]
++	      '(menu-item "Hide marked" ediff-hide-marked-sessions
++		  :help "Hide marked sessions.  With prefix arg, unhide"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-mark-for-hiding-at-pos]
++	      '(menu-item "Mark for hiding" ediff-mark-for-hiding-at-pos
++		  :help "Mark session for hiding.  With prefix arg, unmark"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos]
++	      '(menu-item "Mark for group operation" ediff-mark-for-operation-at-pos
++		  :help "Mark session for a group operation.  With prefix arg, unmark."))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding]
++	      '(menu-item "Unmark all for hiding" ediff-unmark-all-for-hiding
++		  :help "Unmark all sessions marked for hiding"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-unmark-all-for-operation]
++	      '(menu-item "Unmark all for group operation" ediff-unmark-all-for-operation
++		  :help "Unmark all sessions marked for operation"))
++
+ 	    (cond ((ediff-collect-diffs-metajob jobname)
++		   (define-key ediff-meta-buffer-map
++		     [menu-bar ediff-meta-mode ediff-collect-custom-diffs]
++		     '(menu-item "Collect diffs" ediff-collect-custom-diffs
++				 :help "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'"))
+ 		   (define-key
+ 		     ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
+ 		  ((ediff-patch-metajob jobname)
++		   (define-key ediff-meta-buffer-map
++		     [menu-bar ediff-meta-mode ediff-meta-show-patch]
++		     '(menu-item "Show multi-file patch" ediff-meta-show-patch
++				 :help "Show the multi-file patch associated with this group session"))
+ 		   (define-key
+ 		     ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))
+ 	    (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy)
+-	    (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
++	    (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-up-meta-hierarchy]
++	      '(menu-item "Go to parent session" ediff-up-meta-hierarchy
++			  :help "Go to the parent session group buffer"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-show-dir-diffs]
++	      '(menu-item "Diff directories" ediff-show-dir-diffs
++			  :help "Display differences among the directories involved in session group"))))
+ 
+       (if (eq ediff-metajob-name 'ediff-registry)
+ 	  (run-hooks 'ediff-registry-setup-hook)
+@@ -1639,8 +1711,7 @@
+     (cond ((ediff-buffer-live-p custom-diff-buf)
+ 	   ;; for live session buffers we do them first because the user may
+ 	   ;; have changed them with respect to the underlying files
+-	   (save-excursion
+-	     (set-buffer meta-diff-buff)
++	   (with-current-buffer meta-diff-buff
+ 	     (goto-char (point-max))
+ 	     (insert-buffer-substring custom-diff-buf)
+ 	     (insert "\n")))
+@@ -1649,8 +1720,8 @@
+ 			   ediff-merge-directories
+ 			   ediff-merge-directories-with-ancestor))
+ 	   ;; get diffs by calling shell command on ediff-custom-diff-program
+-	   (save-excursion
+-	     (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
++	   (with-current-buffer
++               (setq tmp-buf (get-buffer-create ediff-tmp-buffer))
+ 	     (erase-buffer)
+ 	     (shell-command
+ 	      (format
+@@ -1662,8 +1733,7 @@
+ 	       )
+ 	      t)
+ 	     )
+-	   (save-excursion
+-	     (set-buffer meta-diff-buff)
++	   (with-current-buffer meta-diff-buff
+ 	     (goto-char (point-max))
+ 	     (insert-buffer-substring tmp-buf)
+ 	     (insert "\n")))
+@@ -2344,10 +2414,10 @@
  This is used only for sessions that involve 2 or 3 files at the same time.
  ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark
  for operation, or simply indicate which are equal files.  If it is nil, then
 -`last-command-char' is used to decide which action to take."
-+`last-command-event' is used to decide which action to take."
++`(ediff-last-command-char)' is used to decide which action to take."
    (interactive)
    (if (null action)
 -      (setq action last-command-char))
-+      (setq action last-command-event))
++      (setq action (ediff-last-command-char)))
    (let ((list (cdr ediff-meta-list))
  	marked1 marked2 marked3
  	fileinfo1 fileinfo2 fileinfo3 elt)
-@@ -2396,11 +2396,11 @@
+@@ -2396,11 +2466,11 @@
  
  
  
@@ -734,7 +1330,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-mult.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-ptch.el xemacs-packages/ediff/ediff-ptch.el
 --- xemacs-packages.ORIG/ediff/ediff-ptch.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-ptch.el	2009-08-17 13:40:49.978036743 -0600
++++ xemacs-packages/ediff/ediff-ptch.el	2009-08-15 00:16:34.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-ptch.el --- Ediff's  patch support
  
@@ -805,7 +1401,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-ptch.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.texi xemacs-packages/ediff/ediff.texi
 --- xemacs-packages.ORIG/ediff/ediff.texi	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff.texi	2009-08-17 13:40:50.672791252 -0600
++++ xemacs-packages/ediff/ediff.texi	2009-08-15 00:16:35.000000000 -0600
 @@ -25,12 +25,12 @@
  This file documents Ediff, a comprehensive visual interface to Unix diff
  and patch utilities.
@@ -1092,7 +1688,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  @ignore
 diff -dur xemacs-packages.ORIG/ediff/ediff-util.el xemacs-packages/ediff/ediff-util.el
 --- xemacs-packages.ORIG/ediff/ediff-util.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-util.el	2009-08-17 13:40:50.241789378 -0600
++++ xemacs-packages/ediff/ediff-util.el	2009-12-01 09:39:07.203961749 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-util.el --- the core commands and utilities of ediff
  
@@ -1102,99 +1698,109 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
  ;; Author: Michael Kifer <kifer at cs.stonybrook.edu>
  
-@@ -1012,7 +1012,7 @@
+@@ -343,8 +343,7 @@
+ 	    (setq buffer-C
+ 		  (get-buffer-create
+ 		   (ediff-unique-buffer-name "*ediff-merge" "*")))
+-	    (save-excursion
+-	      (set-buffer buffer-C)
++	    (with-current-buffer buffer-C
+ 	      (insert-buffer-substring buf)
+ 	      (goto-char (point-min))
+ 	      (funcall (ediff-with-current-buffer buf major-mode))
+@@ -1012,7 +1011,7 @@
    (interactive)
    (ediff-barf-if-not-control-buffer)
    (let ((ctl-buf (if (null buf) (current-buffer)))
 -	(buf-type (ediff-char-to-buftype last-command-char)))
-+	(buf-type (ediff-char-to-buftype last-command-event)))
++	(buf-type (ediff-char-to-buftype (ediff-last-command-char))))
      (or buf (ediff-recenter))
      (or buf
  	(setq buf (ediff-get-buffer buf-type)))
-@@ -1514,7 +1514,7 @@
+@@ -1514,7 +1513,7 @@
        (error ediff-KILLED-VITAL-BUFFER))
  
    (ediff-operate-on-windows
 -   (if (memq last-command-char '(?v ?\C-v))
-+   (if (memq last-command-event '(?v ?\C-v))
++   (if (memq (ediff-last-command-char) '(?v ?\C-v))
         'scroll-up
       'scroll-down)
     ;; calculate argument to scroll-up/down
-@@ -1562,7 +1562,7 @@
+@@ -1562,7 +1561,7 @@
     ;; interactively so that they set the window's min_hscroll.
     ;; Otherwise, automatic hscrolling will undo the effect of
     ;; hscrolling.
 -   (if (= last-command-char ?<)
-+   (if (= last-command-event ?<)
++   (if (= (ediff-last-command-char) ?<)
         (lambda (arg)
  	 (let ((prefix-arg arg))
  	   (call-interactively 'scroll-left)))
-@@ -1826,7 +1826,7 @@
+@@ -1826,7 +1825,7 @@
  in the specified buffer."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
 -  (let* ((buf-type (ediff-char-to-buftype last-command-char))
-+  (let* ((buf-type (ediff-char-to-buftype last-command-event))
++  (let* ((buf-type (ediff-char-to-buftype (ediff-last-command-char)))
  	 (buffer (ediff-get-buffer buf-type))
  	 (pt (ediff-with-current-buffer buffer (point)))
  	 (diff-no (ediff-diff-at-point buf-type nil (if arg 'after)))
-@@ -2162,13 +2162,13 @@
+@@ -2162,13 +2161,13 @@
    "Restore ARGth diff from `ediff-killed-diffs-alist'.
  ARG is a prefix argument.  If ARG is nil, restore the current-difference.
  If the second optional argument, a character, is given, use it to
 -determine the target buffer instead of last-command-char"
-+determine the target buffer instead of last-command-event"
++determine the target buffer instead of (ediff-last-command-char)"
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
    (if (numberp arg)
        (ediff-jump-to-difference arg))
    (ediff-pop-diff ediff-current-difference
 -		  (ediff-char-to-buftype (or key last-command-char)))
-+		  (ediff-char-to-buftype (or key last-command-event)))
++		  (ediff-char-to-buftype (or key (ediff-last-command-char))))
    ;; recenter with rehighlighting, but no messages
    (let (ediff-verbose-p)
      (ediff-recenter)))
-@@ -2192,13 +2192,13 @@
+@@ -2192,13 +2191,13 @@
      (cond
       ((or (and (eq ediff-skip-diff-region-function
  		   ediff-focus-on-regexp-matches-function)
 -	       (eq last-command-char ?f))
-+	       (eq last-command-event ?f))
++	       (eq (ediff-last-command-char) ?f))
  	  (and (eq ediff-skip-diff-region-function
  		   ediff-hide-regexp-matches-function)
 -	       (eq last-command-char ?h)))
-+	       (eq last-command-event ?h)))
++	       (eq (ediff-last-command-char) ?h)))
        (message "Selective browsing by regexp turned off")
        (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
 -     ((eq last-command-char ?h)
-+     ((eq last-command-event ?h)
++     ((eq (ediff-last-command-char) ?h)
        (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
  	    regexp-A
  	    (read-string
-@@ -2236,7 +2236,7 @@
+@@ -2236,7 +2235,7 @@
        (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
        (or (string= regexp-C "") (setq ediff-regexp-hide-C regexp-C)))
  
 -     ((eq last-command-char ?f)
-+     ((eq last-command-event ?f)
++     ((eq (ediff-last-command-char) ?f)
        (setq ediff-skip-diff-region-function
  	    ediff-focus-on-regexp-matches-function
  	    regexp-A
-@@ -3302,10 +3302,10 @@
+@@ -3302,10 +3301,10 @@
    (ediff-barf-if-not-control-buffer)
    (ediff-compute-custom-diffs-maybe)
    (ediff-with-current-buffer
 -      (cond ((memq last-command-char '(?a ?b ?c))
-+      (cond ((memq last-command-event '(?a ?b ?c))
++      (cond ((memq (ediff-last-command-char) '(?a ?b ?c))
  	     (ediff-get-buffer
 -	      (ediff-char-to-buftype last-command-char)))
 -	    ((eq last-command-char ?d)
-+	      (ediff-char-to-buftype last-command-event)))
-+	    ((eq last-command-event ?d)
++	      (ediff-char-to-buftype (ediff-last-command-char))))
++	    ((eq (ediff-last-command-char) ?d)
  	     (message "Saving diff output ...")
  	     (sit-for 1) ; let the user see the message
  	     (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
-@@ -3416,11 +3416,8 @@
+@@ -3416,11 +3415,8 @@
      (ediff-exec-process
       ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
       ediff-custom-diff-options
@@ -1210,7 +1816,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	(with-current-buffer ediff-custom-diff-buffer
 diff -dur xemacs-packages.ORIG/ediff/ediff-vers.el xemacs-packages/ediff/ediff-vers.el
 --- xemacs-packages.ORIG/ediff/ediff-vers.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-vers.el	2009-08-17 13:40:50.284889800 -0600
++++ xemacs-packages/ediff/ediff-vers.el	2009-12-01 09:39:07.212891653 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-vers.el --- version control interface to Ediff
  
@@ -1242,7 +1848,30 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	      (t (error "File %s is not under version control" file))))
      ))
  
-@@ -232,11 +232,11 @@
+@@ -123,8 +123,7 @@
+ 	(fundamental-mode))
+       (let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
+ 	(delete-windows-on output-buffer)
+-	(save-excursion
+-	  (set-buffer output-buffer)
++	(with-current-buffer output-buffer
+ 	  (apply 'call-process "co" nil t nil
+ 		 ;; -q: quiet (no diagnostics)
+ 		 (append switches rcs-default-co-switches
+@@ -137,10 +136,8 @@
+   ;; Optional NAME is name to use instead of `*RCS-output*'.
+   ;; This is a modified version from rcs.el v1.1.  I use it here to make
+   ;; Ediff immune to changes in rcs.el
+-  (let* ((default-major-mode 'fundamental-mode) ; no frills!
+-	 (buf (get-buffer-create name)))
+-    (save-excursion
+-      (set-buffer buf)
++  (let ((buf (get-buffer-create name)))
++    (with-current-buffer buf
+       (setq buffer-read-only nil
+ 	    default-directory (file-name-directory (expand-file-name file)))
+       (erase-buffer))
+@@ -232,11 +229,11 @@
  (provide 'ediff-vers)
  
  
@@ -1261,7 +1890,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-vers.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-wind.el xemacs-packages/ediff/ediff-wind.el
 --- xemacs-packages.ORIG/ediff/ediff-wind.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-wind.el	2009-08-17 13:40:50.393889478 -0600
++++ xemacs-packages/ediff/ediff-wind.el	2009-08-15 00:16:35.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-wind.el --- window manipulation utilities
  
@@ -1371,13 +2000,13 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-wind.el ends here
 diff -dur xemacs-packages.ORIG/ediff/Makefile xemacs-packages/ediff/Makefile
 --- xemacs-packages.ORIG/ediff/Makefile	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/Makefile	2009-08-17 13:40:49.470802803 -0600
++++ xemacs-packages/ediff/Makefile	2009-12-01 09:39:07.130861623 -0700
 @@ -17,7 +17,7 @@
  # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  # Boston, MA 02111-1307, USA.
  
 -VERSION = 1.77
-+VERSION = 1.78
++VERSION = 1.79
  AUTHOR_VERSION = 2.75
  MAINTAINER = Michael Kifer <kifer at cs.sunysb.edu>
  PACKAGE = ediff


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-12/xemacs-packages-extra.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xemacs-packages-extra.spec	3 Nov 2009 17:51:02 -0000	1.13
+++ xemacs-packages-extra.spec	1 Dec 2009 17:58:49 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -134,6 +134,10 @@ chmod +x make.sh
 sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
   xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer
 
+# The X-Symbol font files are only needed on Windows
+rm -fr xemacs-packages/x-symbol/fonts
+rm -fr xemacs-packages/x-symbol/origfonts
+
 
 %build
 cd xemacs-packages/xslt-process/java
@@ -244,6 +248,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
+- The last ediff fix included more Emacs-specific code (bz 537531).
+- Don't package x-symbol fonts, which are only needed on Windows anyway.
+
 * Tue Nov  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-5
 - Fix Emacs-only coding system in ediff (bz 532620).
 



From jjames at fedoraproject.org  Tue Dec  1 17:58:50 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 17:58:50 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/devel
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,
	1.1, 1.2 xemacs-packages-extra.spec, 1.13, 1.14
Message-ID: <20091201175850.410EB11C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24137/devel

Modified Files:
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch 
	xemacs-packages-extra.spec 
Log Message:
* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
- The last ediff fix included more Emacs-specific code (bz 537531).
- Don't package x-symbol fonts, which are only needed on Windows anyway.


xemacs-packages-extra-20091103-ediff-coding-system-532620.patch:
 ChangeLog     |   45 +++++++++++
 Makefile      |    2 
 ediff-diff.el |   45 +++++------
 ediff-help.el |    6 -
 ediff-hook.el |  137 ++++++++++++++++++-----------------
 ediff-init.el |   67 +++++++++--------
 ediff-merg.el |   36 ++++-----
 ediff-mult.el |  130 +++++++++++++++++++++++++--------
 ediff-ptch.el |   22 ++---
 ediff-util.el |   38 ++++-----
 ediff-vers.el |   27 +++---
 ediff-wind.el |   30 +++----
 ediff.el      |  225 +++++++++++++++++++++++++++++++++++-----------------------
 ediff.texi    |  224 ++++++++++++++++++++++++++++++---------------------------
 14 files changed, 606 insertions(+), 428 deletions(-)

Index: xemacs-packages-extra-20091103-ediff-coding-system-532620.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	3 Nov 2009 17:51:02 -0000	1.1
+++ xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	1 Dec 2009 17:58:49 -0000	1.2
@@ -1,7 +1,34 @@
 diff -dur xemacs-packages.ORIG/ediff/ChangeLog xemacs-packages/ediff/ChangeLog
 --- xemacs-packages.ORIG/ediff/ChangeLog	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/ChangeLog	2009-08-17 13:40:49.458796934 -0600
-@@ -1,3 +1,21 @@
++++ xemacs-packages/ediff/ChangeLog	2009-12-01 09:39:07.126858310 -0700
+@@ -1,3 +1,48 @@
++2009-11-27  Norbert Koch  <viteno at xemacs.org>
++
++	* Makefile (VERSION): XEmacs package 1.79 released.
++
++2009-11-26  Adrian Aichner  <adrian at xemacs.org>
++
++	* ediff.el (ediff-buffers-internal): Delete temporary files in
++	case of non-local exit, like C-g (keyboard-quit), as well.
++	* ediff.el (ediff-regions-internal): Ditto.
++
++2009-11-26  Michael Kifer <kifer at cs.stonybrook.edu>
++	
++	* ediff-init.el, ediff-mult.el, ediff-util.el: relpace
++	last-command-char and last-command-event with (ediff-last-command-char) everywhere.
++	
++	* ediff.el (ediff-version): revert change made in Emacs tree.
++	
++	* ediff-menu.el: use purecopy in Emacs menus.
++	
++	* ediff-diff.el, ediff-merge.el, ediff-mult.el, ediff-util.el,
++	ediff.el, ediff-vers.el: use with-current-buffer instead of
++	save-excursion/set-buffer whenever possible. Other cosmetic changes
++	from the Emacs tree.
++	
++	* ediff-mult.el: apply Dan Nicolaescu's patch that adds a menu in
++	ediff-meta mode.
++	
 +2009-08-16  Norbert Koch  <viteno at xemacs.org>
 +
 +	* Makefile (VERSION): XEmacs package 1.78 released.
@@ -25,7 +52,7 @@ diff -dur xemacs-packages.ORIG/ediff/Cha
  	* Makefile (VERSION): XEmacs package 1.77 released.
 diff -dur xemacs-packages.ORIG/ediff/ediff-diff.el xemacs-packages/ediff/ediff-diff.el
 --- xemacs-packages.ORIG/ediff/ediff-diff.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-diff.el	2009-08-17 13:40:49.543789080 -0600
++++ xemacs-packages/ediff/ediff-diff.el	2009-12-01 09:39:07.132860465 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-diff.el --- diff-related utilities
  
@@ -131,7 +158,37 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  Lines that do not match are assumed to be error messages."
    :type 'regexp
    :group 'ediff-diff)
-@@ -1529,11 +1529,11 @@
+@@ -1225,8 +1225,7 @@
+     (unwind-protect
+ 	(let ((directory default-directory)
+ 	      proc)
+-	  (save-excursion
+-	    (set-buffer buffer)
++	  (with-current-buffer buffer
+ 	    (erase-buffer)
+ 	    (setq default-directory directory)
+ 	    (if (or (memq system-type '(emx ms-dos windows-nt windows-95))
+@@ -1283,8 +1282,7 @@
+   (if (and (memq (process-status process) '(exit signal))
+            (buffer-name (process-buffer process)))
+       (progn
+-        (save-excursion
+-          (set-buffer (process-buffer process))
++        (with-current-buffer (process-buffer process)
+           (setq mode-line-process nil))
+         (delete-process process))))
+ 
+@@ -1354,8 +1352,7 @@
+ 	       ediff-forward-word-function)
+ 	   ediff-forward-word-function))
+ 	inbuf-syntax-tbl sv-point diff-string)
+-    (save-excursion
+-     (set-buffer in-buffer)
++    (with-current-buffer in-buffer
+      (setq inbuf-syntax-tbl
+ 	   (if control-buf
+ 	       (ediff-with-current-buffer control-buf
+@@ -1529,11 +1526,11 @@
  
  
  
@@ -150,7 +207,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-diff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.el xemacs-packages/ediff/ediff.el
 --- xemacs-packages.ORIG/ediff/ediff.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff.el	2009-08-17 13:40:50.479789989 -0600
++++ xemacs-packages/ediff/ediff.el	2009-12-01 09:39:07.214982518 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff.el --- a comprehensive visual interface to diff & patch
  
@@ -166,8 +223,8 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 -(defconst ediff-version "2.81.2" "The current version of Ediff")
 -(defconst ediff-date "November 22, 2008" "Date of last update")
-+(defconst ediff-version "2.81.3" "The current version of Ediff")
-+(defconst ediff-date "August 15, 2009" "Date of last update")
++(defconst ediff-version "2.81.4" "The current version of Ediff")
++(defconst ediff-date "November 26, 2009" "Date of last update")
  
  
  ;; This file is part of GNU Emacs.
@@ -251,7 +308,194 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  (defun ediff-backup (file)
    "Run Ediff on FILE and its backup file.
  Uses the latest backup, if there are several numerical backups.
-@@ -1504,11 +1542,11 @@
+@@ -437,37 +475,45 @@
+ 	 (buf-C-file-name (if buf-C-is-alive
+ 			      (buffer-file-name (get-buffer buf-B))))
+ 	 file-A file-B file-C)
+-    (if (not (ediff-buffer-live-p buf-A))
+-	(error "Buffer %S doesn't exist" buf-A))
+-    (if (not (ediff-buffer-live-p buf-B))
+-	(error "Buffer %S doesn't exist" buf-B))
+-    (let ((ediff-job-name job-name))
+-      (if (and ediff-3way-comparison-job
+-	       (not buf-C-is-alive))
+-	  (error "Buffer %S doesn't exist" buf-C)))
+-    (if (stringp buf-A-file-name)
+-	(setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
+-    (if (stringp buf-B-file-name)
+-	(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
+-    (if (stringp buf-C-file-name)
+-	(setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
+-
+-    (setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
+-	  file-B (ediff-make-temp-file buf-B buf-B-file-name))
+-    (if buf-C-is-alive
+-	(setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
+-
+-    (ediff-setup (get-buffer buf-A) file-A
+-		 (get-buffer buf-B) file-B
+-		 (if buf-C-is-alive (get-buffer buf-C))
+-		 file-C
+-		 (cons `(lambda ()
+-			  (delete-file ,file-A)
+-			  (delete-file ,file-B)
+-			  (if (stringp ,file-C) (delete-file ,file-C)))
+-		       startup-hooks)
+-		 (list (cons 'ediff-job-name job-name))
+-		 merge-buffer-file)))
++    (unwind-protect
++	(progn
++	  (if (not (ediff-buffer-live-p buf-A))
++	      (error "Buffer %S doesn't exist" buf-A))
++	  (if (not (ediff-buffer-live-p buf-B))
++	      (error "Buffer %S doesn't exist" buf-B))
++	  (let ((ediff-job-name job-name))
++	    (if (and ediff-3way-comparison-job
++		     (not buf-C-is-alive))
++		(error "Buffer %S doesn't exist" buf-C)))
++	  (if (stringp buf-A-file-name)
++	      (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
++	  (if (stringp buf-B-file-name)
++	      (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
++	  (if (stringp buf-C-file-name)
++	      (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
++	  
++	  (setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
++		file-B (ediff-make-temp-file buf-B buf-B-file-name))
++	  (if buf-C-is-alive
++	      (setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
++	  
++	  (ediff-setup (get-buffer buf-A) file-A
++		       (get-buffer buf-B) file-B
++		       (if buf-C-is-alive (get-buffer buf-C))
++		       file-C
++		       (cons `(lambda ()
++				(delete-file ,file-A)
++				(delete-file ,file-B)
++				(if (stringp ,file-C) (delete-file ,file-C)))
++			     startup-hooks)
++		       (list (cons 'ediff-job-name job-name))
++		       merge-buffer-file))
++      (if (and (stringp file-A) (file-exists-p file-A))
++	  (delete-file file-A))
++      (if (and (stringp file-B) (file-exists-p file-B))
++	  (delete-file file-B))
++      (if (and (stringp file-C) (file-exists-p file-C))
++	  (delete-file file-C)))))
+ 
+ 
+ ;;; Directory and file group operations
+@@ -939,8 +985,7 @@
+ 	(buffer-B
+          (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
+         reg-A-beg reg-A-end reg-B-beg reg-B-end)
+-    (save-excursion
+-      (set-buffer buffer-A)
++    (with-current-buffer buffer-A
+       (setq reg-A-beg (region-beginning)
+ 	    reg-A-end (region-end))
+       (set-buffer buffer-B)
+@@ -980,8 +1025,7 @@
+ 	(buffer-B
+          (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
+         reg-A-beg reg-A-end reg-B-beg reg-B-end)
+-    (save-excursion
+-      (set-buffer buffer-A)
++    (with-current-buffer buffer-A
+       (setq reg-A-beg (region-beginning)
+ 	    reg-A-end (region-end))
+       ;; enlarge the region to hold full lines
+@@ -1019,41 +1063,46 @@
+   (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
+ 	overl-A overl-B
+ 	file-A file-B)
++    (unwind-protect
++	(progn
++	  ;; in case beg/end-A/B aren't markers--make them into markers
++	  (ediff-with-current-buffer buffer-A
++	    (setq beg-A (move-marker (make-marker) beg-A)
++		  end-A (move-marker (make-marker) end-A)))
++	  (ediff-with-current-buffer buffer-B
++	    (setq beg-B (move-marker (make-marker) beg-B)
++		  end-B (move-marker (make-marker) end-B)))
++	  
++	  ;; make file-A
++	  (if word-mode
++	      (ediff-wordify beg-A end-A buffer-A tmp-buffer)
++	    (ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
++	  (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
+ 
+-    ;; in case beg/end-A/B aren't markers--make them into markers
+-    (ediff-with-current-buffer buffer-A
+-      (setq beg-A (move-marker (make-marker) beg-A)
+-	    end-A (move-marker (make-marker) end-A)))
+-    (ediff-with-current-buffer buffer-B
+-      (setq beg-B (move-marker (make-marker) beg-B)
+-	    end-B (move-marker (make-marker) end-B)))
+-
+-    ;; make file-A
+-    (if word-mode
+-	(ediff-wordify beg-A end-A buffer-A tmp-buffer)
+-      (ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
+-    (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
+-
+-    ;; make file-B
+-    (if word-mode
+-	(ediff-wordify beg-B end-B buffer-B tmp-buffer)
+-      (ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
+-    (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
+-
+-    (setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
+-    (setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
+-    (ediff-setup buffer-A file-A
+-		 buffer-B file-B
+-		 nil nil	    ; buffer & file C
+-		 (cons `(lambda ()
+-			    (delete-file ,file-A)
+-			    (delete-file ,file-B))
+-		       startup-hooks)
+-		 (append
+-		  (list (cons 'ediff-word-mode  word-mode)
+-			(cons 'ediff-narrow-bounds (list overl-A overl-B))
+-			(cons 'ediff-job-name job-name))
+-		  setup-parameters))
++	  ;; make file-B
++	  (if word-mode
++	      (ediff-wordify beg-B end-B buffer-B tmp-buffer)
++	    (ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
++	  (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
++	  
++	  (setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
++	  (setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
++	  (ediff-setup buffer-A file-A
++		       buffer-B file-B
++		       nil nil	    ; buffer & file C
++		       (cons `(lambda ()
++				(delete-file ,file-A)
++				(delete-file ,file-B))
++			     startup-hooks)
++		       (append
++			(list (cons 'ediff-word-mode  word-mode)
++			      (cons 'ediff-narrow-bounds (list overl-A overl-B))
++			      (cons 'ediff-job-name job-name))
++			setup-parameters)))
++      (if (and (stringp file-A) (file-exists-p file-A))
++	  (delete-file file-A))
++      (if (and (stringp file-B) (file-exists-p file-B))
++	  (delete-file file-B)))
+     ))
+ 
+ 
+@@ -1415,6 +1464,8 @@
+   "Return string describing the version of Ediff.
+ When called interactively, displays the version."
+   (interactive)
++  ;; called-interactively-p - not in XEmacs
++  ;; (if (called-interactively-p 'interactive)
+   (if (interactive-p)
+       (message "%s" (ediff-version))
+     (format "Ediff %s of %s" ediff-version ediff-date)))
+@@ -1504,11 +1555,11 @@
  (run-hooks 'ediff-load-hook)
  
  
@@ -270,7 +514,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-help.el xemacs-packages/ediff/ediff-help.el
 --- xemacs-packages.ORIG/ediff/ediff-help.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-help.el	2009-08-17 13:40:49.621819245 -0600
++++ xemacs-packages/ediff/ediff-help.el	2009-08-15 00:16:33.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
  
@@ -300,7 +544,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-hook.el xemacs-packages/ediff/ediff-hook.el
 --- xemacs-packages.ORIG/ediff/ediff-hook.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff-hook.el	2009-08-17 13:40:49.629790560 -0600
++++ xemacs-packages/ediff/ediff-hook.el	2009-12-01 09:39:07.134857315 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
  
@@ -310,9 +554,204 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
  ;; Author: Michael Kifer <kifer at cs.stonybrook.edu>
  
+@@ -123,7 +123,7 @@
+ 	   :style toggle
+ 	   :selected (if (featurep 'ediff-tbar)
+ 			 (ediff-use-toolbar-p))]))
+-      
++
+       ;; put these menus before Object-Oriented-Browser in Tools menu
+       (if (and (featurep 'menubar) (not (featurep 'infodock))
+ 	       (not (featurep 'ediff-hook)))
+@@ -141,117 +141,120 @@
+ 	(symbol-value 'menu-bar-ediff-merge-menu))
+   (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
+   (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
+-  
++
+   ;; define ediff compare menu
++  (define-key menu-bar-ediff-menu [ediff-misc]
++    `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu))
++  (define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [window]
+-    '(menu-item "This Window and Next Window" compare-windows
+-		:help "Compare the current window and the next window"))
++    `(menu-item ,(purecopy "This Window and Next Window") compare-windows
++		:help ,(purecopy "Compare the current window and the next window")))
+   (define-key menu-bar-ediff-menu [ediff-windows-linewise]
+-    '(menu-item "Windows Line-by-line..." ediff-windows-linewise
+-		:help "Compare windows line-wise"))
++    `(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise
++		:help ,(purecopy "Compare windows line-wise")))
+   (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
+-    '(menu-item "Windows Word-by-word..." ediff-windows-wordwise
+-		:help "Compare windows word-wise"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
++    `(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise
++		:help ,(purecopy "Compare windows word-wise")))
++  (define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-regions-linewise]
+-    '(menu-item "Regions Line-by-line..." ediff-regions-linewise
+-		:help "Compare regions line-wise"))
++    `(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise
++		:help ,(purecopy "Compare regions line-wise")))
+   (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
+-    '(menu-item "Regions Word-by-word..." ediff-regions-wordwise
+-		:help "Compare regions word-wise"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
++    `(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise
++		:help ,(purecopy "Compare regions word-wise")))
++  (define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-dir-revision]
+-    '(menu-item "Directory Revisions..." ediff-directory-revisions
+-		:help "Compare directory files with their older versions"))
++    `(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions
++		:help ,(purecopy "Compare directory files with their older versions")))
+   (define-key menu-bar-ediff-menu [ediff-revision]
+-    '(menu-item "File with Revision..." ediff-revision
+-		:help "Compare file with its older versions"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
++    `(menu-item ,(purecopy "File with Revision...") ediff-revision
++		:help ,(purecopy "Compare file with its older versions")))
++  (define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-directories3]
+-    '(menu-item "Three Directories..." ediff-directories3
+-		:help "Compare files common to three directories simultaneously"))
++    `(menu-item ,(purecopy "Three Directories...") ediff-directories3
++		:help ,(purecopy "Compare files common to three directories simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-directories]
+-    '(menu-item "Two Directories..." ediff-directories
+-		:help "Compare files common to two directories simultaneously"))
+-  (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
++    `(menu-item ,(purecopy "Two Directories...") ediff-directories
++		:help ,(purecopy "Compare files common to two directories simultaneously")))
++  (define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator)
+   (define-key menu-bar-ediff-menu [ediff-buffers3]
+-    '(menu-item "Three Buffers..." ediff-buffers3
+-		:help "Compare three buffers simultaneously"))
++    `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3
++		:help ,(purecopy "Compare three buffers simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-files3]
+-    '(menu-item "Three Files..." ediff-files3
+-		:help "Compare three files simultaneously"))
++    `(menu-item ,(purecopy "Three Files...") ediff-files3
++		:help ,(purecopy "Compare three files simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-buffers]
+-    '(menu-item "Two Buffers..." ediff-buffers
+-		:help "Compare two buffers simultaneously"))
++    `(menu-item ,(purecopy "Two Buffers...") ediff-buffers
++		:help ,(purecopy "Compare two buffers simultaneously")))
+   (define-key menu-bar-ediff-menu [ediff-files]
+-    '(menu-item "Two Files..." ediff-files
+-		:help "Compare two files simultaneously"))
++    `(menu-item ,(purecopy "Two Files...") ediff-files
++		:help ,(purecopy "Compare two files simultaneously")))
+ 
+   ;; define ediff merge menu
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
+-    '(menu-item "Directory Revisions with Ancestor..."
++    `(menu-item ,(purecopy "Directory Revisions with Ancestor...")
+       ediff-merge-directory-revisions-with-ancestor
+-      :help "Merge versions of the files in the same directory by comparing the files with common ancestors"))
++      :help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors")))
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
+-    '(menu-item "Directory Revisions..." ediff-merge-directory-revisions
+-      :help "Merge versions of the files in the same directory (without using ancestor information)"))
++    `(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions
++      :help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)")))
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
+-    '(menu-item "Revisions with Ancestor..."
++    `(menu-item ,(purecopy "Revisions with Ancestor...")
+       ediff-merge-revisions-with-ancestor
+-      :help "Merge versions of the same file by comparing them with a common ancestor"))
++      :help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
+-    '(menu-item "Revisions..." ediff-merge-revisions
+-      :help "Merge versions of the same file (without using ancestor information)"))
+-  (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
++    `(menu-item ,(purecopy "Revisions...") ediff-merge-revisions
++      :help ,(purecopy "Merge versions of the same file (without using ancestor information)")))
++  (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] menu-bar-separator)
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
+-    '(menu-item "Directories with Ancestor..."
++    `(menu-item ,(purecopy "Directories with Ancestor...")
+       ediff-merge-directories-with-ancestor
+-      :help "Merge files common to a pair of directories by comparing the files with common ancestors"))
++      :help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
+-    '(menu-item "Directories..." ediff-merge-directories
+-		:help "Merge files common to a pair of directories"))
++    `(menu-item ,(purecopy "Directories...") ediff-merge-directories
++		:help ,(purecopy "Merge files common to a pair of directories")))
+   (define-key
+-    menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
++    menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] menu-bar-separator)
+   (define-key
+     menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
+-    '(menu-item "Buffers with Ancestor..." ediff-merge-buffers-with-ancestor
+-      :help "Merge buffers by comparing their contents with a common ancestor"))
++    `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor
++      :help ,(purecopy "Merge buffers by comparing their contents with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
+-    '(menu-item "Buffers..." ediff-merge-buffers
+-      :help "Merge buffers (without using ancestor information)"))
++    `(menu-item ,(purecopy "Buffers...") ediff-merge-buffers
++      :help ,(purecopy "Merge buffers (without using ancestor information)")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
+-    '(menu-item "Files with Ancestor..." ediff-merge-files-with-ancestor
+-      :help "Merge files by comparing them with a common ancestor"))
++    `(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor
++      :help ,(purecopy "Merge files by comparing them with a common ancestor")))
+   (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
+-    '(menu-item "Files..." ediff-merge-files
+-      :help "Merge files (without using ancestor information)"))
++    `(menu-item ,(purecopy "Files...") ediff-merge-files
++      :help ,(purecopy "Merge files (without using ancestor information)")))
+ 
+   ;; define epatch menu
+   (define-key menu-bar-epatch-menu [ediff-patch-buffer]
+-    '(menu-item "To a Buffer..." ediff-patch-buffer
+-      :help "Apply a patch to the contents of a buffer"))
++    `(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer
++      :help ,(purecopy "Apply a patch to the contents of a buffer")))
+   (define-key menu-bar-epatch-menu [ediff-patch-file]
+-    '(menu-item "To a File..." ediff-patch-file
+-      :help "Apply a patch to a file"))
++    `(menu-item ,(purecopy "To a File...") ediff-patch-file
++      :help ,(purecopy "Apply a patch to a file")))
+ 
+   ;; define ediff miscellanea
+   (define-key menu-bar-ediff-misc-menu [emultiframe]
+-    '(menu-item "Toggle use of separate control buffer frame"
++    `(menu-item ,(purecopy "Use separate control buffer frame")
+       ediff-toggle-multiframe
+-      :help "Switch between the single-frame presentation mode and the multi-frame mode"))
++      :help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode")))
+   (define-key menu-bar-ediff-misc-menu [eregistry]
+-    '(menu-item "List Ediff Sessions" ediff-show-registry
+-		:help "List all active Ediff sessions; it is a convenient way to find and resume such a session"))
++    `(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry
++		:help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session")))
+   (define-key menu-bar-ediff-misc-menu [ediff-cust]
+-    '(menu-item "Customize Ediff" ediff-customize
+-		:help "Change some of the parameters that govern the behavior of Ediff"))
++    `(menu-item ,(purecopy "Customize Ediff") ediff-customize
++		:help ,(purecopy "Change some of the parameters that govern the behavior of Ediff")))
+   (define-key menu-bar-ediff-misc-menu [ediff-doc]
+-    '(menu-item "Ediff Manual" ediff-documentation
+-		:help "Bring up the Ediff manual")))
++    `(menu-item ,(purecopy "Ediff Manual") ediff-documentation
++		:help ,(purecopy "Bring up the Ediff manual"))))
+ 
+ (provide 'ediff-hook)
+ 
 diff -dur xemacs-packages.ORIG/ediff/ediff-init.el xemacs-packages/ediff/ediff-init.el
 --- xemacs-packages.ORIG/ediff/ediff-init.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-init.el	2009-08-17 13:40:49.708789986 -0600
++++ xemacs-packages/ediff/ediff-init.el	2009-12-01 09:39:07.140861277 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
  
@@ -530,9 +969,19 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    :type 'integer
    :group 'ediff)
  
+@@ -1549,6 +1551,9 @@
+       (if (eventp event-or-key) (event-key event-or-key) event-or-key)
+     event-or-key))
+ 
++(defun ediff-last-command-char ()
++  (ediff-event-key last-command-event))
++
+ 
+ (defsubst ediff-frame-iconified-p (frame)
+   (and (ediff-window-display-p) (frame-live-p frame)
 diff -dur xemacs-packages.ORIG/ediff/ediff-merg.el xemacs-packages/ediff/ediff-merg.el
 --- xemacs-packages.ORIG/ediff/ediff-merg.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-merg.el	2009-08-17 13:40:49.712766807 -0600
++++ xemacs-packages/ediff/ediff-merg.el	2009-12-01 09:39:07.142859733 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-merg.el --- merging utilities
  
@@ -616,6 +1065,15 @@ diff -dur xemacs-packages.ORIG/ediff/edi
         (ediff-merge-changed-from-default-p n 'prefers-too)))
  
  
+@@ -224,7 +226,7 @@
+ 	  ;;(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))
+ 	  ;;	(reg-B (ediff-get-region-contents n 'B ediff-control-buffer))
+ 	  ;;	(reg-C (ediff-get-region-contents n 'C ediff-control-buffer)))
+-	  (let ()
++	  (progn
+ 
+ 	    ;; if region was edited since it was first set by default
+ 	    (if (or (ediff-merge-changed-from-default-p n)
 @@ -385,11 +387,11 @@
  (provide 'ediff-merg)
  
@@ -635,7 +1093,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-merg.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-mult.el xemacs-packages/ediff/ediff-mult.el
 --- xemacs-packages.ORIG/ediff/ediff-mult.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-mult.el	2009-08-17 13:40:49.846074731 -0600
++++ xemacs-packages/ediff/ediff-mult.el	2009-12-01 09:39:07.149875626 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
  
@@ -702,20 +1160,158 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  This keymap controls key bindings in the meta buffer and is a local variable.
  This means that you can set different bindings for different kinds of meta
  buffers."
-@@ -2344,10 +2344,10 @@
+@@ -392,12 +392,40 @@
+   (define-key ediff-meta-buffer-map  "p"  'ediff-previous-meta-item)
+   (define-key ediff-meta-buffer-map  [delete]  'ediff-previous-meta-item)
+   (define-key ediff-meta-buffer-map  [backspace]  'ediff-previous-meta-item)
+-  (or (ediff-one-filegroup-metajob)
+-      (progn
+-	(define-key ediff-meta-buffer-map "=" nil)
+-	(define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
+-	(define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
+-	(define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
++
++  (let ((menu-map (make-sparse-keymap "Ediff-Meta")))
++    (define-key ediff-meta-buffer-map [menu-bar ediff-meta-mode]
++      (cons "Ediff-Meta" menu-map))
++    (define-key menu-map [ediff-quit-meta-buffer]
++      '(menu-item "Quit" ediff-quit-meta-buffer
++		  :help "Quit the meta buffer"))
++    (define-key menu-map [ediff-toggle-filename-truncation]
++      '(menu-item "Truncate filenames" ediff-toggle-filename-truncation
++	      :help "Toggle truncation of long file names in session group buffers"
++	      :button (:toggle . ediff-meta-truncate-filenames)))
++    (define-key menu-map [ediff-show-registry]
++      '(menu-item "Display Ediff Registry" ediff-show-registry
++		  :help "Display Ediff's registry"))
++    (define-key menu-map [ediff-documentation]
++      '(menu-item "Show Manual" ediff-documentation
++		  :help "Display Ediff's manual"))
++
++    (or (ediff-one-filegroup-metajob)
++	(progn
++	  (define-key ediff-meta-buffer-map "=" nil)
++	  (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
++	  (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
++	  (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
++
++
++    (define-key menu-map [ediff-next-meta-item]
++      '(menu-item "Next" ediff-next-meta-item
++		  :help "Move to the next item in Ediff registry or session group buffer"))
++    (define-key menu-map [ediff-previous-meta-item]
++      '(menu-item "Previous" ediff-previous-meta-item
++		  :help "Move to the previous item in Ediff registry or session group buffer")))
++
++
+   (if ediff-no-emacs-help-in-control-buffer
+       (define-key ediff-meta-buffer-map  "\C-h"  'ediff-previous-meta-item))
+   (if (featurep 'emacs)
+@@ -837,14 +865,58 @@
+ 	      ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation)
+ 	    (define-key
+ 	      ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding)
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-hide-marked-sessions]
++	      '(menu-item "Hide marked" ediff-hide-marked-sessions
++		  :help "Hide marked sessions.  With prefix arg, unhide"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-mark-for-hiding-at-pos]
++	      '(menu-item "Mark for hiding" ediff-mark-for-hiding-at-pos
++		  :help "Mark session for hiding.  With prefix arg, unmark"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos]
++	      '(menu-item "Mark for group operation" ediff-mark-for-operation-at-pos
++		  :help "Mark session for a group operation.  With prefix arg, unmark."))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding]
++	      '(menu-item "Unmark all for hiding" ediff-unmark-all-for-hiding
++		  :help "Unmark all sessions marked for hiding"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-unmark-all-for-operation]
++	      '(menu-item "Unmark all for group operation" ediff-unmark-all-for-operation
++		  :help "Unmark all sessions marked for operation"))
++
+ 	    (cond ((ediff-collect-diffs-metajob jobname)
++		   (define-key ediff-meta-buffer-map
++		     [menu-bar ediff-meta-mode ediff-collect-custom-diffs]
++		     '(menu-item "Collect diffs" ediff-collect-custom-diffs
++				 :help "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'"))
+ 		   (define-key
+ 		     ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
+ 		  ((ediff-patch-metajob jobname)
++		   (define-key ediff-meta-buffer-map
++		     [menu-bar ediff-meta-mode ediff-meta-show-patch]
++		     '(menu-item "Show multi-file patch" ediff-meta-show-patch
++				 :help "Show the multi-file patch associated with this group session"))
+ 		   (define-key
+ 		     ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))
+ 	    (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy)
+-	    (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
++	    (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-up-meta-hierarchy]
++	      '(menu-item "Go to parent session" ediff-up-meta-hierarchy
++			  :help "Go to the parent session group buffer"))
++
++	    (define-key ediff-meta-buffer-map
++	      [menu-bar ediff-meta-mode ediff-show-dir-diffs]
++	      '(menu-item "Diff directories" ediff-show-dir-diffs
++			  :help "Display differences among the directories involved in session group"))))
+ 
+       (if (eq ediff-metajob-name 'ediff-registry)
+ 	  (run-hooks 'ediff-registry-setup-hook)
+@@ -1639,8 +1711,7 @@
+     (cond ((ediff-buffer-live-p custom-diff-buf)
+ 	   ;; for live session buffers we do them first because the user may
+ 	   ;; have changed them with respect to the underlying files
+-	   (save-excursion
+-	     (set-buffer meta-diff-buff)
++	   (with-current-buffer meta-diff-buff
+ 	     (goto-char (point-max))
+ 	     (insert-buffer-substring custom-diff-buf)
+ 	     (insert "\n")))
+@@ -1649,8 +1720,8 @@
+ 			   ediff-merge-directories
+ 			   ediff-merge-directories-with-ancestor))
+ 	   ;; get diffs by calling shell command on ediff-custom-diff-program
+-	   (save-excursion
+-	     (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
++	   (with-current-buffer
++               (setq tmp-buf (get-buffer-create ediff-tmp-buffer))
+ 	     (erase-buffer)
+ 	     (shell-command
+ 	      (format
+@@ -1662,8 +1733,7 @@
+ 	       )
+ 	      t)
+ 	     )
+-	   (save-excursion
+-	     (set-buffer meta-diff-buff)
++	   (with-current-buffer meta-diff-buff
+ 	     (goto-char (point-max))
+ 	     (insert-buffer-substring tmp-buf)
+ 	     (insert "\n")))
+@@ -2344,10 +2414,10 @@
  This is used only for sessions that involve 2 or 3 files at the same time.
  ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark
  for operation, or simply indicate which are equal files.  If it is nil, then
 -`last-command-char' is used to decide which action to take."
-+`last-command-event' is used to decide which action to take."
++`(ediff-last-command-char)' is used to decide which action to take."
    (interactive)
    (if (null action)
 -      (setq action last-command-char))
-+      (setq action last-command-event))
++      (setq action (ediff-last-command-char)))
    (let ((list (cdr ediff-meta-list))
  	marked1 marked2 marked3
  	fileinfo1 fileinfo2 fileinfo3 elt)
-@@ -2396,11 +2396,11 @@
+@@ -2396,11 +2466,11 @@
  
  
  
@@ -734,7 +1330,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-mult.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-ptch.el xemacs-packages/ediff/ediff-ptch.el
 --- xemacs-packages.ORIG/ediff/ediff-ptch.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-ptch.el	2009-08-17 13:40:49.978036743 -0600
++++ xemacs-packages/ediff/ediff-ptch.el	2009-08-15 00:16:34.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-ptch.el --- Ediff's  patch support
  
@@ -805,7 +1401,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-ptch.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.texi xemacs-packages/ediff/ediff.texi
 --- xemacs-packages.ORIG/ediff/ediff.texi	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff.texi	2009-08-17 13:40:50.672791252 -0600
++++ xemacs-packages/ediff/ediff.texi	2009-08-15 00:16:35.000000000 -0600
 @@ -25,12 +25,12 @@
  This file documents Ediff, a comprehensive visual interface to Unix diff
  and patch utilities.
@@ -1092,7 +1688,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  @ignore
 diff -dur xemacs-packages.ORIG/ediff/ediff-util.el xemacs-packages/ediff/ediff-util.el
 --- xemacs-packages.ORIG/ediff/ediff-util.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-util.el	2009-08-17 13:40:50.241789378 -0600
++++ xemacs-packages/ediff/ediff-util.el	2009-12-01 09:39:07.203961749 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-util.el --- the core commands and utilities of ediff
  
@@ -1102,99 +1698,109 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
  ;; Author: Michael Kifer <kifer at cs.stonybrook.edu>
  
-@@ -1012,7 +1012,7 @@
+@@ -343,8 +343,7 @@
+ 	    (setq buffer-C
+ 		  (get-buffer-create
+ 		   (ediff-unique-buffer-name "*ediff-merge" "*")))
+-	    (save-excursion
+-	      (set-buffer buffer-C)
++	    (with-current-buffer buffer-C
+ 	      (insert-buffer-substring buf)
+ 	      (goto-char (point-min))
+ 	      (funcall (ediff-with-current-buffer buf major-mode))
+@@ -1012,7 +1011,7 @@
    (interactive)
    (ediff-barf-if-not-control-buffer)
    (let ((ctl-buf (if (null buf) (current-buffer)))
 -	(buf-type (ediff-char-to-buftype last-command-char)))
-+	(buf-type (ediff-char-to-buftype last-command-event)))
++	(buf-type (ediff-char-to-buftype (ediff-last-command-char))))
      (or buf (ediff-recenter))
      (or buf
  	(setq buf (ediff-get-buffer buf-type)))
-@@ -1514,7 +1514,7 @@
+@@ -1514,7 +1513,7 @@
        (error ediff-KILLED-VITAL-BUFFER))
  
    (ediff-operate-on-windows
 -   (if (memq last-command-char '(?v ?\C-v))
-+   (if (memq last-command-event '(?v ?\C-v))
++   (if (memq (ediff-last-command-char) '(?v ?\C-v))
         'scroll-up
       'scroll-down)
     ;; calculate argument to scroll-up/down
-@@ -1562,7 +1562,7 @@
+@@ -1562,7 +1561,7 @@
     ;; interactively so that they set the window's min_hscroll.
     ;; Otherwise, automatic hscrolling will undo the effect of
     ;; hscrolling.
 -   (if (= last-command-char ?<)
-+   (if (= last-command-event ?<)
++   (if (= (ediff-last-command-char) ?<)
         (lambda (arg)
  	 (let ((prefix-arg arg))
  	   (call-interactively 'scroll-left)))
-@@ -1826,7 +1826,7 @@
+@@ -1826,7 +1825,7 @@
  in the specified buffer."
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
 -  (let* ((buf-type (ediff-char-to-buftype last-command-char))
-+  (let* ((buf-type (ediff-char-to-buftype last-command-event))
++  (let* ((buf-type (ediff-char-to-buftype (ediff-last-command-char)))
  	 (buffer (ediff-get-buffer buf-type))
  	 (pt (ediff-with-current-buffer buffer (point)))
  	 (diff-no (ediff-diff-at-point buf-type nil (if arg 'after)))
-@@ -2162,13 +2162,13 @@
+@@ -2162,13 +2161,13 @@
    "Restore ARGth diff from `ediff-killed-diffs-alist'.
  ARG is a prefix argument.  If ARG is nil, restore the current-difference.
  If the second optional argument, a character, is given, use it to
 -determine the target buffer instead of last-command-char"
-+determine the target buffer instead of last-command-event"
++determine the target buffer instead of (ediff-last-command-char)"
    (interactive "P")
    (ediff-barf-if-not-control-buffer)
    (if (numberp arg)
        (ediff-jump-to-difference arg))
    (ediff-pop-diff ediff-current-difference
 -		  (ediff-char-to-buftype (or key last-command-char)))
-+		  (ediff-char-to-buftype (or key last-command-event)))
++		  (ediff-char-to-buftype (or key (ediff-last-command-char))))
    ;; recenter with rehighlighting, but no messages
    (let (ediff-verbose-p)
      (ediff-recenter)))
-@@ -2192,13 +2192,13 @@
+@@ -2192,13 +2191,13 @@
      (cond
       ((or (and (eq ediff-skip-diff-region-function
  		   ediff-focus-on-regexp-matches-function)
 -	       (eq last-command-char ?f))
-+	       (eq last-command-event ?f))
++	       (eq (ediff-last-command-char) ?f))
  	  (and (eq ediff-skip-diff-region-function
  		   ediff-hide-regexp-matches-function)
 -	       (eq last-command-char ?h)))
-+	       (eq last-command-event ?h)))
++	       (eq (ediff-last-command-char) ?h)))
        (message "Selective browsing by regexp turned off")
        (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
 -     ((eq last-command-char ?h)
-+     ((eq last-command-event ?h)
++     ((eq (ediff-last-command-char) ?h)
        (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
  	    regexp-A
  	    (read-string
-@@ -2236,7 +2236,7 @@
+@@ -2236,7 +2235,7 @@
        (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
        (or (string= regexp-C "") (setq ediff-regexp-hide-C regexp-C)))
  
 -     ((eq last-command-char ?f)
-+     ((eq last-command-event ?f)
++     ((eq (ediff-last-command-char) ?f)
        (setq ediff-skip-diff-region-function
  	    ediff-focus-on-regexp-matches-function
  	    regexp-A
-@@ -3302,10 +3302,10 @@
+@@ -3302,10 +3301,10 @@
    (ediff-barf-if-not-control-buffer)
    (ediff-compute-custom-diffs-maybe)
    (ediff-with-current-buffer
 -      (cond ((memq last-command-char '(?a ?b ?c))
-+      (cond ((memq last-command-event '(?a ?b ?c))
++      (cond ((memq (ediff-last-command-char) '(?a ?b ?c))
  	     (ediff-get-buffer
 -	      (ediff-char-to-buftype last-command-char)))
 -	    ((eq last-command-char ?d)
-+	      (ediff-char-to-buftype last-command-event)))
-+	    ((eq last-command-event ?d)
++	      (ediff-char-to-buftype (ediff-last-command-char))))
++	    ((eq (ediff-last-command-char) ?d)
  	     (message "Saving diff output ...")
  	     (sit-for 1) ; let the user see the message
  	     (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
-@@ -3416,11 +3416,8 @@
+@@ -3416,11 +3415,8 @@
      (ediff-exec-process
       ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
       ediff-custom-diff-options
@@ -1210,7 +1816,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	(with-current-buffer ediff-custom-diff-buffer
 diff -dur xemacs-packages.ORIG/ediff/ediff-vers.el xemacs-packages/ediff/ediff-vers.el
 --- xemacs-packages.ORIG/ediff/ediff-vers.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-vers.el	2009-08-17 13:40:50.284889800 -0600
++++ xemacs-packages/ediff/ediff-vers.el	2009-12-01 09:39:07.212891653 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-vers.el --- version control interface to Ediff
  
@@ -1242,7 +1848,30 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	      (t (error "File %s is not under version control" file))))
      ))
  
-@@ -232,11 +232,11 @@
+@@ -123,8 +123,7 @@
+ 	(fundamental-mode))
+       (let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
+ 	(delete-windows-on output-buffer)
+-	(save-excursion
+-	  (set-buffer output-buffer)
++	(with-current-buffer output-buffer
+ 	  (apply 'call-process "co" nil t nil
+ 		 ;; -q: quiet (no diagnostics)
+ 		 (append switches rcs-default-co-switches
+@@ -137,10 +136,8 @@
+   ;; Optional NAME is name to use instead of `*RCS-output*'.
+   ;; This is a modified version from rcs.el v1.1.  I use it here to make
+   ;; Ediff immune to changes in rcs.el
+-  (let* ((default-major-mode 'fundamental-mode) ; no frills!
+-	 (buf (get-buffer-create name)))
+-    (save-excursion
+-      (set-buffer buf)
++  (let ((buf (get-buffer-create name)))
++    (with-current-buffer buf
+       (setq buffer-read-only nil
+ 	    default-directory (file-name-directory (expand-file-name file)))
+       (erase-buffer))
+@@ -232,11 +229,11 @@
  (provide 'ediff-vers)
  
  
@@ -1261,7 +1890,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-vers.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-wind.el xemacs-packages/ediff/ediff-wind.el
 --- xemacs-packages.ORIG/ediff/ediff-wind.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-wind.el	2009-08-17 13:40:50.393889478 -0600
++++ xemacs-packages/ediff/ediff-wind.el	2009-08-15 00:16:35.000000000 -0600
 @@ -1,7 +1,7 @@
  ;;; ediff-wind.el --- window manipulation utilities
  
@@ -1371,13 +2000,13 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-wind.el ends here
 diff -dur xemacs-packages.ORIG/ediff/Makefile xemacs-packages/ediff/Makefile
 --- xemacs-packages.ORIG/ediff/Makefile	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/Makefile	2009-08-17 13:40:49.470802803 -0600
++++ xemacs-packages/ediff/Makefile	2009-12-01 09:39:07.130861623 -0700
 @@ -17,7 +17,7 @@
  # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  # Boston, MA 02111-1307, USA.
  
 -VERSION = 1.77
-+VERSION = 1.78
++VERSION = 1.79
  AUTHOR_VERSION = 2.75
  MAINTAINER = Michael Kifer <kifer at cs.sunysb.edu>
  PACKAGE = ediff


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xemacs-packages-extra.spec	3 Nov 2009 17:51:02 -0000	1.13
+++ xemacs-packages-extra.spec	1 Dec 2009 17:58:50 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -134,6 +134,10 @@ chmod +x make.sh
 sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
   xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer
 
+# The X-Symbol font files are only needed on Windows
+rm -fr xemacs-packages/x-symbol/fonts
+rm -fr xemacs-packages/x-symbol/origfonts
+
 
 %build
 cd xemacs-packages/xslt-process/java
@@ -244,6 +248,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
+- The last ediff fix included more Emacs-specific code (bz 537531).
+- Don't package x-symbol fonts, which are only needed on Windows anyway.
+
 * Tue Nov  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-5
 - Fix Emacs-only coding system in ediff (bz 532620).
 



From bioinfornatics at fedoraproject.org  Tue Dec  1 18:02:54 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Tue,  1 Dec 2009 18:02:54 +0000 (UTC)
Subject: File earth-and-moon-backgrounds-0.2.tar.xz uploaded to lookaside
	cache by bioinfornatics
Message-ID: <20091201180254.6016A10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for earth-and-moon-backgrounds:

f0275fa0418d1a479fd4233f70375583  earth-and-moon-backgrounds-0.2.tar.xz



From bpepple at fedoraproject.org  Tue Dec  1 18:03:17 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  1 Dec 2009 18:03:17 +0000 (UTC)
Subject: File telepathy-sofiasip-0.5.19.tar.gz uploaded to lookaside cache by
	bpepple
Message-ID: <20091201180317.D455510F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for telepathy-sofiasip:

8861fc7577aa08a3712beb82a81a5e24  telepathy-sofiasip-0.5.19.tar.gz



From bioinfornatics at fedoraproject.org  Tue Dec  1 18:05:35 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Tue,  1 Dec 2009 18:05:35 +0000 (UTC)
Subject: rpms/earth-and-moon-backgrounds/devel .cvsignore, 1.2,
	1.3 earth-and-moon-backgrounds.spec, 1.2, 1.3 import.log, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091201180535.73EBD11C00DE@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/earth-and-moon-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25448/devel

Modified Files:
	.cvsignore earth-and-moon-backgrounds.spec import.log sources 
Log Message:
Update to version 0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2009 20:55:28 -0000	1.2
+++ .cvsignore	1 Dec 2009 18:05:35 -0000	1.3
@@ -1 +1 @@
-earth-and-moon-0.1.tar.gz
+earth-and-moon-backgrounds-0.2.tar.xz


Index: earth-and-moon-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/devel/earth-and-moon-backgrounds.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- earth-and-moon-backgrounds.spec	24 Jul 2009 20:45:40 -0000	1.2
+++ earth-and-moon-backgrounds.spec	1 Dec 2009 18:05:35 -0000	1.3
@@ -1,54 +1,172 @@
-%global		_appname	earth-and-moon
+Name:           earth-and-moon-backgrounds
+Version:        0.2
+Release:        1%{?dist}
+Summary:        Earth-and-moon desktop backgrounds
+
+Group:          Applications/Multimedia
+License:        CC-BY-SA
+URL:            http://bioinformatiques.free.fr/
+
+Source0:        %{name}-%{version}.tar.xz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-dual = %{version}-%{release}
 
-Name:		earth-and-moon-backgrounds
-Version:	0.1
-Release:	5%{?dist}
-Summary:	Modern background
-License:	GPL+
-Group:		User Interface/Desktops
-URL:		http://bioinformatiques.free.fr/
-Source0:	http://bioinformatiques.free.fr/%{_appname}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{_appname}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+%description
+This package contains desktop backgrounds for the earth-and-moon theme.
+
+%prep
+%setup -q
 
+%package        common
+Summary:        Earth-and-moon desktop backgrounds shared between GNOME and KDE
+Group:          Applications/Multimedia
 
-%description
+%description    common
+This package includes the common files used by both GNOME and KDE.
+
+%description -l fr common
+Ce paquet inclut les fichiers commun ? GNOME et KDE
+
+%package        kdm
+Summary:        Earth-and-moon desktop background for KDM
+Group:          Applications/Multimedia
+
+%description    kdm
+Earth-and-moon desktop background used in KDM.
+
+%description -l fr kdm
+Ce paquet inclut les fond ?crans earth-and-moon qui sont utilis?s dans KDM
+
+%package        single
+Summary:        Extra earth-and-moon desktop background with modern look
+Group:          Applications/Multimedia
+
+%description    single
 Earthlooks is beautiful theme. The background change often. You can see earth
 rotate on herself and moon rotate around earth. This theme is compatible with
-many resolution: eepc: 800x480, normalish: 1280x1024, normal: 1600x1200, wide:
-1900x1200
+many resolution: 800x600, 1280x1024, 1600x1200, 1680x1050, 1900x1200
+
+%description -l fr single
+Earthlooks est un th?me magnifique. Les fonds ?crans change r?guli?rement.
+Vous pouvez voir la Terre tourner sur elle m?me et la lune tourne autour de la
+Terre. Ce fond ?crans sont compatibles dans plusieurs r?solution: 800x600,
+1280x1024, 1680x1050, 1600x1200, 1900x1200
+
+%package        dual
+Summary:        Shared dual screen earth-and-moon desktop backgrounds
+Group:          Applications/Multimedia
+
+%description dual
+Earthlooks is beautiful theme. The background change often. You can see earth
+rotate on herself and moon rotate around earth. This theme is compatible with
+many resolution: 2560x1024, 2960x1050, 3200x1200, 3840x1200
+
+%description -l fr dual
+Earthlooks est un th?me magnifique. Les fonds ?crans change r?guli?rement.
+Vous pouvez voir la Terre tourner sur elle m?me et la lune tourne autour de la
+Terre. Ce fond ?crans sont compatibles dans plusieurs r?solution: 2560x1024,
+2960x1050, 3200x1200, 3840x1200
 
-%prep
-%setup -q -n %{_appname}-%{version}
 
 %build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-# create wallpaper directorie
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
-# copy image files
-install -p -m644 images/* $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
 
-# copy xml file
-install -p -m644 %{_appname}.xml $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
+# prepare the dir structure
+for RESOLUTION in 800x600 1280x1024 1600x1200 1680x1050 1900x1200 2560x1024 3200x1200 3840x1200;
+do mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon/$RESOLUTION;
+done;
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+
+# copy the earth-and-moon images
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon/{800x600,1280x1024,1600x1200,1680x1050,1900x1200,2560x1024,2960x1050,3200x1200,3840x1200} \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon/
+
+# copy slideshow xml files
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon-hd.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon
 
 # copy metadata xmls file
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties/
-cp -p desktop-backgrounds-earth-and-moon.xml $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties/
-
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-earth-and-moon.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-earth-and-moon-hd.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
-%doc README
-%dir %{_datadir}/gnome-background-properties/
-%{_datadir}/backgrounds/earth-and-moon/
+%doc COPYING
 %{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon.xml
+
+%files common
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/earth-and-moon
+%dir %{_datadir}/backgrounds/earth-and-moon/800x600
+%dir %{_datadir}/backgrounds/earth-and-moon/1280x1024
+%dir %{_datadir}/backgrounds/earth-and-moon/1680x1050
+%dir %{_datadir}/backgrounds/earth-and-moon/1600x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/1900x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/2560x1024
+%dir %{_datadir}/backgrounds/earth-and-moon/2960x1050
+%dir %{_datadir}/backgrounds/earth-and-moon/3200x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/3840x1200
+%{_datadir}/backgrounds/earth-and-moon/800x600/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1280x1024/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1680x1050/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1600x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1900x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/2560x1024/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/2960x1050/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/3200x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/3840x1200/01.jpeg
+
+%files dual
+%defattr(-,root,root,-)
+%doc COPYING
+%{_datadir}/backgrounds/earth-and-moon/2560x1024
+%{_datadir}/backgrounds/earth-and-moon/2960x1050
+%{_datadir}/backgrounds/earth-and-moon/3200x1200
+%{_datadir}/backgrounds/earth-and-moon/3840x1200
+%{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon-hd.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon-hd.xml
+
+%files single
+%defattr(-,root,root,-)
+%doc COPYING
+%{_datadir}/backgrounds/earth-and-moon/800x600
+%{_datadir}/backgrounds/earth-and-moon/1280x1024
+%{_datadir}/backgrounds/earth-and-moon/1680x1050
+%{_datadir}/backgrounds/earth-and-moon/1600x1200
+%{_datadir}/backgrounds/earth-and-moon/1900x1200
+%{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon.xml
+
+%files kdm
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/earth-and-moon
+%dir %{_datadir}/backgrounds/earth-and-moon/1680x1050
+%{_datadir}/backgrounds/earth-and-moon/1680x1050/01.jpeg
 
 %changelog
+* Mon Nov 30 2009  Jonathan MERCIER <bioinfornatics at gmail.com> - 0.2-1
+- Perform quality and add some new reolution such as 800x600, 1680x1050
+  2560x1024, 2960x1050, 3200x1200, 3840x1200
+- License tag change to "CC-BY-SA"
+- KDE user can now use this wallpaper
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -69,3 +187,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Oct 25 2008 Jonathan MERCIER <bioinfornatics at gmail.com> - 0.1-1
 - Initial release
+


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	13 Mar 2009 21:39:09 -0000	1.2
+++ import.log	1 Dec 2009 18:05:35 -0000	1.3
@@ -1,2 +1,3 @@
 earth-and-moon-backgrounds-0_1-4_fc10:HEAD:earth-and-moon-backgrounds-0.1-4.fc10.src.rpm:1236978139
 earth-and-moon-backgrounds-0_1-4_fc10:HEAD:earth-and-moon-backgrounds-0.1-4.fc10.src.rpm:1236980823
+earth-and-moon-backgrounds-0_2-1_fc11:HEAD:earth-and-moon-backgrounds-0.2-1.fc11.src.rpm:1259690609


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2009 20:55:28 -0000	1.2
+++ sources	1 Dec 2009 18:05:35 -0000	1.3
@@ -1 +1 @@
-f10c76967718c77406810643dcf74b22  earth-and-moon-0.1.tar.gz
+f0275fa0418d1a479fd4233f70375583  earth-and-moon-backgrounds-0.2.tar.xz



From bpepple at fedoraproject.org  Tue Dec  1 18:08:51 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  1 Dec 2009 18:08:51 +0000 (UTC)
Subject: rpms/telepathy-sofiasip/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 telepathy-sofiasip.spec, 1.10, 1.11
Message-ID: <20091201180851.CA66611C00DE@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-sofiasip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26205

Modified Files:
	.cvsignore sources telepathy-sofiasip.spec 
Log Message:
* Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.19-1
- Update to 0.5.19.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	5 Nov 2009 14:24:36 -0000	1.9
+++ .cvsignore	1 Dec 2009 18:08:51 -0000	1.10
@@ -1 +1 @@
-telepathy-sofiasip-0.5.18.1.20091102git.tar.gz
+telepathy-sofiasip-0.5.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Nov 2009 14:24:36 -0000	1.9
+++ sources	1 Dec 2009 18:08:51 -0000	1.10
@@ -1 +1 @@
-1347a7b6965823a8a1fe3393485bca12  telepathy-sofiasip-0.5.18.1.20091102git.tar.gz
+8861fc7577aa08a3712beb82a81a5e24  telepathy-sofiasip-0.5.19.tar.gz


Index: telepathy-sofiasip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/telepathy-sofiasip.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- telepathy-sofiasip.spec	5 Nov 2009 14:24:36 -0000	1.10
+++ telepathy-sofiasip.spec	1 Dec 2009 18:08:51 -0000	1.11
@@ -1,17 +1,17 @@
 Name:           telepathy-sofiasip
-Version:        0.5.18.1
-Release:        0.9.20091102git%{?dist}
+Version:        0.5.19
+Release:        1%{?dist}
 Summary:        SIP connection manager for Telepathy
 
 Group:          Applications/Communications
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/tp-sofiasip
-Source0:        http://downloads.sourceforge.net/tp-sofiasip/%{name}-%{version}.20091102git.tar.gz
+Source0:        http://downloads.sourceforge.net/tp-sofiasip/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
-BuildRequires:  telepathy-glib-devel >= 0.7.27
+BuildRequires:  telepathy-glib-devel >= 0.7.37
 BuildRequires:  sofia-sip-glib-devel >= 1.12.10
 BuildRequires:  libxslt
 BuildRequires:  python
@@ -26,7 +26,7 @@ framework based on the SofiaSIP-stack. 
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.19-1
+- Update to 0.5.19.
+
 * Tue Nov  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.18.1-0.9.20091102git
 - Grab git snapshot that fixes sip support to the Fedora asterisk server.
 



From bpepple at fedoraproject.org  Tue Dec  1 18:11:55 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  1 Dec 2009 18:11:55 +0000 (UTC)
Subject: rpms/telepathy-sofiasip/F-12 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 telepathy-sofiasip.spec, 1.10, 1.11
Message-ID: <20091201181155.6930511C00DE@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-sofiasip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26783

Modified Files:
	.cvsignore sources telepathy-sofiasip.spec 
Log Message:
* Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.19-1
- Update to 0.5.19.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Nov 2009 23:23:14 -0000	1.9
+++ .cvsignore	1 Dec 2009 18:11:55 -0000	1.10
@@ -1 +1 @@
-telepathy-sofiasip-0.5.18.1.20091102git.tar.gz
+telepathy-sofiasip-0.5.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Nov 2009 23:23:14 -0000	1.9
+++ sources	1 Dec 2009 18:11:55 -0000	1.10
@@ -1 +1 @@
-1347a7b6965823a8a1fe3393485bca12  telepathy-sofiasip-0.5.18.1.20091102git.tar.gz
+8861fc7577aa08a3712beb82a81a5e24  telepathy-sofiasip-0.5.19.tar.gz


Index: telepathy-sofiasip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/F-12/telepathy-sofiasip.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- telepathy-sofiasip.spec	3 Nov 2009 23:23:14 -0000	1.10
+++ telepathy-sofiasip.spec	1 Dec 2009 18:11:55 -0000	1.11
@@ -1,17 +1,17 @@
 Name:           telepathy-sofiasip
-Version:        0.5.18.1
-Release:        0.9.20091102git%{?dist}
+Version:        0.5.19
+Release:        1%{?dist}
 Summary:        SIP connection manager for Telepathy
 
 Group:          Applications/Communications
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/tp-sofiasip
-Source0:        http://downloads.sourceforge.net/tp-sofiasip/%{name}-%{version}.20091102git.tar.gz
+Source0:        http://downloads.sourceforge.net/tp-sofiasip/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
-BuildRequires:  telepathy-glib-devel >= 0.7.27
+BuildRequires:  telepathy-glib-devel >= 0.7.37
 BuildRequires:  sofia-sip-glib-devel >= 1.12.10
 BuildRequires:  libxslt
 BuildRequires:  python
@@ -26,7 +26,7 @@ framework based on the SofiaSIP-stack. 
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.19-1
+- Update to 0.5.19.
+
 * Tue Nov  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.18.1-0.9.20091102git
 - Grab git snapshot that fixes sip support to the Fedora asterisk server.
 



From jjames at fedoraproject.org  Tue Dec  1 18:28:52 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 18:28:52 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-11 xemacs-packages-extra.spec, 1.13,
	1.14
Message-ID: <20091201182852.4F1F811C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29577/F-11

Modified Files:
	xemacs-packages-extra.spec 
Log Message:
I tried to remove the X-Symbol font files too early.  Without a lot of
Makefile surgery, they have to stay where they are through the build and
install phases.  Remove them after they're installed.



Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xemacs-packages-extra.spec	1 Dec 2009 17:58:49 -0000	1.13
+++ xemacs-packages-extra.spec	1 Dec 2009 18:28:52 -0000	1.14
@@ -134,10 +134,6 @@ chmod +x make.sh
 sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
   xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer
 
-# The X-Symbol font files are only needed on Windows
-rm -fr xemacs-packages/x-symbol/fonts
-rm -fr xemacs-packages/x-symbol/origfonts
-
 
 %build
 cd xemacs-packages/xslt-process/java
@@ -153,6 +149,11 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pkgdir}
 ./make.sh install
 
+# The X-Symbol font files are only needed on Windows
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/fonts
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/origfonts
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/pcf
+
 cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults
 mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,sv_SE,zh_CN,zh_TW}.UTF-8 \
   ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5



From jjames at fedoraproject.org  Tue Dec  1 18:28:52 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 18:28:52 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-12 xemacs-packages-extra.spec, 1.14,
	1.15
Message-ID: <20091201182852.657DC11C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29577/F-12

Modified Files:
	xemacs-packages-extra.spec 
Log Message:
I tried to remove the X-Symbol font files too early.  Without a lot of
Makefile surgery, they have to stay where they are through the build and
install phases.  Remove them after they're installed.



Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-12/xemacs-packages-extra.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xemacs-packages-extra.spec	1 Dec 2009 17:58:49 -0000	1.14
+++ xemacs-packages-extra.spec	1 Dec 2009 18:28:52 -0000	1.15
@@ -134,10 +134,6 @@ chmod +x make.sh
 sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
   xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer
 
-# The X-Symbol font files are only needed on Windows
-rm -fr xemacs-packages/x-symbol/fonts
-rm -fr xemacs-packages/x-symbol/origfonts
-
 
 %build
 cd xemacs-packages/xslt-process/java
@@ -153,6 +149,11 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pkgdir}
 ./make.sh install
 
+# The X-Symbol font files are only needed on Windows
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/fonts
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/origfonts
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/pcf
+
 cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults
 mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,sv_SE,zh_CN,zh_TW}.UTF-8 \
   ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5



From jjames at fedoraproject.org  Tue Dec  1 18:28:52 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  1 Dec 2009 18:28:52 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/devel xemacs-packages-extra.spec, 1.14, 
	1.15
Message-ID: <20091201182852.9058311C00DE@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29577/devel

Modified Files:
	xemacs-packages-extra.spec 
Log Message:
I tried to remove the X-Symbol font files too early.  Without a lot of
Makefile surgery, they have to stay where they are through the build and
install phases.  Remove them after they're installed.



Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xemacs-packages-extra.spec	1 Dec 2009 17:58:50 -0000	1.14
+++ xemacs-packages-extra.spec	1 Dec 2009 18:28:52 -0000	1.15
@@ -134,10 +134,6 @@ chmod +x make.sh
 sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
   xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer
 
-# The X-Symbol font files are only needed on Windows
-rm -fr xemacs-packages/x-symbol/fonts
-rm -fr xemacs-packages/x-symbol/origfonts
-
 
 %build
 cd xemacs-packages/xslt-process/java
@@ -153,6 +149,11 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pkgdir}
 ./make.sh install
 
+# The X-Symbol font files are only needed on Windows
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/fonts
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/origfonts
+rm -fr $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/x-symbol/pcf
+
 cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults
 mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,sv_SE,zh_CN,zh_TW}.UTF-8 \
   ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5



From spot at fedoraproject.org  Tue Dec  1 18:41:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  1 Dec 2009 18:41:17 +0000 (UTC)
Subject: rpms/nant/devel nant.spec,1.38,1.39
Message-ID: <20091201184117.153D511C00DE@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	nant.spec 
Log Message:
disable bootstrap


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- nant.spec	1 Dec 2009 16:18:35 -0000	1.38
+++ nant.spec	1 Dec 2009 18:41:16 -0000	1.39
@@ -1,12 +1,12 @@
 %global debug_package %{nil}
 %global monodir %{_libdir}
 %global mlib %{_lib}
-%global bootstrap 1
+%global bootstrap 0
 
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 32%{?dist}.1
+Release: 33%{?dist}
 Epoch: 1
 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch0: nant-build.patch
@@ -131,6 +131,9 @@ scrollkeeper-update -q || :
 %doc examples/* doc/help/*
 
 %changelog
+* Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:0.85-33
+- disable bootstrap
+
 * Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:0.85-32.1
 - bootstrap again
 



From pkgdb at fedoraproject.org  Tue Dec  1 18:44:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:44:35 +0000
Subject: [pkgdb] eclipse-slice2java was added for mef
Message-ID: <20091201184435.335E510F874@bastion2.fedora.phx.redhat.com>

tibbs has added Package eclipse-slice2java with summary A plugin that integrates Eclipse with Ice object middleware
tibbs has approved Package eclipse-slice2java
tibbs has added a Fedora devel branch for eclipse-slice2java with an owner of mef
tibbs has approved eclipse-slice2java in Fedora devel
tibbs has approved Package eclipse-slice2java
tibbs has set commit to Approved for 107427 on eclipse-slice2java (Fedora devel)
tibbs has set checkout to Approved for 107427 on eclipse-slice2java (Fedora devel)
tibbs has set build to Approved for 107427 on eclipse-slice2java (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:44:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:44:36 +0000
Subject: [pkgdb] eclipse-slice2java summary updated by tibbs
Message-ID: <20091201184436.394B210F887@bastion2.fedora.phx.redhat.com>

tibbs set package eclipse-slice2java summary to A plugin that integrates Eclipse with Ice object middleware

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:44:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:44:36 +0000
Subject: [pkgdb] eclipse-slice2java (Fedora, 12) updated by tibbs
Message-ID: <20091201184436.445AD10F892@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for eclipse-slice2java
tibbs has set commit to Approved for 107427 on eclipse-slice2java (Fedora 12)
tibbs has set checkout to Approved for 107427 on eclipse-slice2java (Fedora 12)
tibbs has set build to Approved for 107427 on eclipse-slice2java (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:44:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:44:36 +0000
Subject: [pkgdb] eclipse-slice2java (Fedora, 11) updated by tibbs
Message-ID: <20091201184436.4EA3510F896@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for eclipse-slice2java
tibbs has set commit to Approved for 107427 on eclipse-slice2java (Fedora 11)
tibbs has set checkout to Approved for 107427 on eclipse-slice2java (Fedora 11)
tibbs has set build to Approved for 107427 on eclipse-slice2java (Fedora 11)

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



From tibbs at fedoraproject.org  Tue Dec  1 18:44:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:44:43 +0000 (UTC)
Subject: rpms/eclipse-slice2java - New directory
Message-ID: <20091201184443.1C8BA11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-slice2java
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn32134/rpms/eclipse-slice2java

Log Message:
Directory /cvs/pkgs/rpms/eclipse-slice2java added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:44:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:44:43 +0000 (UTC)
Subject: rpms/eclipse-slice2java/devel - New directory
Message-ID: <20091201184443.417AB11C029D@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-slice2java/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn32134/rpms/eclipse-slice2java/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-slice2java/devel added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:44:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:44:51 +0000 (UTC)
Subject: rpms/eclipse-slice2java Makefile,NONE,1.1
Message-ID: <20091201184451.A8E6611C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-slice2java
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn32134/rpms/eclipse-slice2java

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-slice2java


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-slice2java
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 18:44:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:44:51 +0000 (UTC)
Subject: rpms/eclipse-slice2java/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091201184451.DE3ED11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-slice2java/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn32134/rpms/eclipse-slice2java/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-slice2java
# $Id: Makefile,v 1.1 2009/12/01 18:44:51 tibbs Exp $
NAME := eclipse-slice2java
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Dec  1 18:45:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:45:12 +0000
Subject: [pkgdb] eclipse-mdt-ocl was added for mbooth
Message-ID: <20091201184512.DE6DC10F887@bastion2.fedora.phx.redhat.com>

tibbs has added Package eclipse-mdt-ocl with summary Implementation of the OCL OMG metamodel for Eclipse
tibbs has approved Package eclipse-mdt-ocl
tibbs has added a Fedora devel branch for eclipse-mdt-ocl with an owner of mbooth
tibbs has approved eclipse-mdt-ocl in Fedora devel
tibbs has approved Package eclipse-mdt-ocl
tibbs has set commit to Approved for 107427 on eclipse-mdt-ocl (Fedora devel)
tibbs has set checkout to Approved for 107427 on eclipse-mdt-ocl (Fedora devel)
tibbs has set build to Approved for 107427 on eclipse-mdt-ocl (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:45:16 +0000
Subject: [pkgdb] eclipse-mdt-ocl summary updated by tibbs
Message-ID: <20091201184517.AAC4F10F849@bastion2.fedora.phx.redhat.com>

tibbs set package eclipse-mdt-ocl summary to Implementation of the OCL OMG metamodel for Eclipse

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:45:16 +0000
Subject: [pkgdb] eclipse-mdt-ocl (Fedora, 12) updated by tibbs
Message-ID: <20091201184517.C08AE10F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for eclipse-mdt-ocl
tibbs has set commit to Approved for 107427 on eclipse-mdt-ocl (Fedora 12)
tibbs has set checkout to Approved for 107427 on eclipse-mdt-ocl (Fedora 12)
tibbs has set build to Approved for 107427 on eclipse-mdt-ocl (Fedora 12)

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



From tibbs at fedoraproject.org  Tue Dec  1 18:45:24 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:45:24 +0000 (UTC)
Subject: rpms/eclipse-mdt-ocl - New directory
Message-ID: <20091201184524.16E3411C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-mdt-ocl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsP32497/rpms/eclipse-mdt-ocl

Log Message:
Directory /cvs/pkgs/rpms/eclipse-mdt-ocl added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:45:24 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:45:24 +0000 (UTC)
Subject: rpms/eclipse-mdt-ocl/devel - New directory
Message-ID: <20091201184524.3B46C11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-mdt-ocl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsP32497/rpms/eclipse-mdt-ocl/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-mdt-ocl/devel added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:45:31 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:45:31 +0000 (UTC)
Subject: rpms/eclipse-mdt-ocl Makefile,NONE,1.1
Message-ID: <20091201184531.E706C11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-mdt-ocl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsP32497/rpms/eclipse-mdt-ocl

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-mdt-ocl


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-mdt-ocl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 18:45:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:45:32 +0000 (UTC)
Subject: rpms/eclipse-mdt-ocl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091201184532.3D64511C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-mdt-ocl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsP32497/rpms/eclipse-mdt-ocl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-mdt-ocl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-mdt-ocl
# $Id: Makefile,v 1.1 2009/12/01 18:45:32 tibbs Exp $
NAME := eclipse-mdt-ocl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From orion at fedoraproject.org  Tue Dec  1 18:45:47 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  1 Dec 2009 18:45:47 +0000 (UTC)
Subject: File netcdf-4-daily.tar.gz uploaded to lookaside cache by orion
Message-ID: <20091201184547.5387A10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for netcdf:

eea442bdfd3119dcb3d6f3e245535eda  netcdf-4-daily.tar.gz



From pkgdb at fedoraproject.org  Tue Dec  1 18:45:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:45:55 +0000
Subject: [pkgdb] eclipse-emf-query was added for mbooth
Message-ID: <20091201184555.F2CDA10F892@bastion2.fedora.phx.redhat.com>

tibbs has added Package eclipse-emf-query with summary Specify and execute queries against EMF models
tibbs has approved Package eclipse-emf-query
tibbs has added a Fedora devel branch for eclipse-emf-query with an owner of mbooth
tibbs has approved eclipse-emf-query in Fedora devel
tibbs has approved Package eclipse-emf-query
tibbs has set commit to Approved for 107427 on eclipse-emf-query (Fedora devel)
tibbs has set checkout to Approved for 107427 on eclipse-emf-query (Fedora devel)
tibbs has set build to Approved for 107427 on eclipse-emf-query (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:45:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:45:56 +0000
Subject: [pkgdb] eclipse-emf-query summary updated by tibbs
Message-ID: <20091201184556.ECED010F8A4@bastion2.fedora.phx.redhat.com>

tibbs set package eclipse-emf-query summary to Specify and execute queries against EMF models

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:45:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:45:56 +0000
Subject: [pkgdb] eclipse-emf-query (Fedora, 12) updated by tibbs
Message-ID: <20091201184557.093AA10F8A6@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for eclipse-emf-query
tibbs has set commit to Approved for 107427 on eclipse-emf-query (Fedora 12)
tibbs has set checkout to Approved for 107427 on eclipse-emf-query (Fedora 12)
tibbs has set build to Approved for 107427 on eclipse-emf-query (Fedora 12)

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



From tibbs at fedoraproject.org  Tue Dec  1 18:46:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:46:04 +0000 (UTC)
Subject: rpms/eclipse-emf-query - New directory
Message-ID: <20091201184604.2A68511C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-emf-query
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsCzN930/rpms/eclipse-emf-query

Log Message:
Directory /cvs/pkgs/rpms/eclipse-emf-query added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:46:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:46:04 +0000 (UTC)
Subject: rpms/eclipse-emf-query/devel - New directory
Message-ID: <20091201184604.47F6911C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-emf-query/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsCzN930/rpms/eclipse-emf-query/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-emf-query/devel added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:46:12 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:46:12 +0000 (UTC)
Subject: rpms/eclipse-emf-query Makefile,NONE,1.1
Message-ID: <20091201184612.DA15711C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-emf-query
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsCzN930/rpms/eclipse-emf-query

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-emf-query


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-emf-query
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 18:46:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:46:13 +0000 (UTC)
Subject: rpms/eclipse-emf-query/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091201184613.254D911C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-emf-query/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsCzN930/rpms/eclipse-emf-query/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-emf-query


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-emf-query
# $Id: Makefile,v 1.1 2009/12/01 18:46:12 tibbs Exp $
NAME := eclipse-emf-query
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From orion at fedoraproject.org  Tue Dec  1 18:46:25 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue,  1 Dec 2009 18:46:25 +0000 (UTC)
Subject: rpms/netcdf/devel netcdf.spec,1.43,1.44 sources,1.11,1.12
Message-ID: <20091201184625.72D3611C00DE@cvs1.fedora.phx.redhat.com>

Author: orion

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

Modified Files:
	netcdf.spec sources 
Log Message:
Update snapshot - hopefully will build



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- netcdf.spec	30 Nov 2009 18:27:24 -0000	1.43
+++ netcdf.spec	1 Dec 2009 18:46:25 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.1.0
-Release:        0.6.2009113000%{?dist}
+Release:        0.6.2009120100%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -73,7 +73,7 @@ This package contains the netCDF static 
 
 
 %prep
-%setup -q -n netcdf-4.1-snapshot2009113000
+%setup -q -n netcdf-4.1-snapshot2009120100
 autoreconf
 %patch2 -p1 -b .pkgconfig
 
@@ -157,7 +157,7 @@ fi
 
 
 %changelog
-* Mon Nov 30 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.6.2009113000
+* Tue Dec 1 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.6.2009120100
 - Update snapshot, removes SZIP defines from header
 
 * Fri Nov 13 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.5.2009111309


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Nov 2009 18:27:24 -0000	1.11
+++ sources	1 Dec 2009 18:46:25 -0000	1.12
@@ -1 +1 @@
-722fee0a131fdee3509ec14c58e39cf3  netcdf-4-daily.tar.gz
+eea442bdfd3119dcb3d6f3e245535eda  netcdf-4-daily.tar.gz



From pkgdb at fedoraproject.org  Tue Dec  1 18:46:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:46:31 +0000
Subject: [pkgdb] python-dmidecode was added for dsommers
Message-ID: <20091201184631.D133C10F892@bastion2.fedora.phx.redhat.com>

tibbs has added Package python-dmidecode with summary Python module to access DMI data
tibbs has approved Package python-dmidecode
tibbs has added a Fedora devel branch for python-dmidecode with an owner of dsommers
tibbs has approved python-dmidecode in Fedora devel
tibbs has approved Package python-dmidecode
tibbs has set commit to Approved for 107427 on python-dmidecode (Fedora devel)
tibbs has set checkout to Approved for 107427 on python-dmidecode (Fedora devel)
tibbs has set build to Approved for 107427 on python-dmidecode (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:46:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:46:32 +0000
Subject: [pkgdb] python-dmidecode summary updated by tibbs
Message-ID: <20091201184632.D253E10F8A9@bastion2.fedora.phx.redhat.com>

tibbs set package python-dmidecode summary to Python module to access DMI data

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:46:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:46:32 +0000
Subject: [pkgdb] python-dmidecode (Fedora, 12) updated by tibbs
Message-ID: <20091201184632.D608710F8B2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for python-dmidecode
tibbs has set commit to Approved for 107427 on python-dmidecode (Fedora 12)
tibbs has set checkout to Approved for 107427 on python-dmidecode (Fedora 12)
tibbs has set build to Approved for 107427 on python-dmidecode (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:46:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:46:32 +0000
Subject: [pkgdb] python-dmidecode (Fedora, 11) updated by tibbs
Message-ID: <20091201184632.E171E10F8B6@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for python-dmidecode
tibbs has set commit to Approved for 107427 on python-dmidecode (Fedora 11)
tibbs has set checkout to Approved for 107427 on python-dmidecode (Fedora 11)
tibbs has set build to Approved for 107427 on python-dmidecode (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:46:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:46:32 +0000
Subject: [pkgdb] python-dmidecode (Fedora EPEL, 4) updated by tibbs
Message-ID: <20091201184632.E68B010F8B8@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for python-dmidecode
tibbs has set commit to Approved for 107427 on python-dmidecode (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on python-dmidecode (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on python-dmidecode (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:46:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:46:32 +0000
Subject: [pkgdb] python-dmidecode (Fedora EPEL, 5) updated by tibbs
Message-ID: <20091201184632.F3A2310F8BB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for python-dmidecode
tibbs has set commit to Approved for 107427 on python-dmidecode (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on python-dmidecode (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on python-dmidecode (Fedora EPEL 5)

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



From tibbs at fedoraproject.org  Tue Dec  1 18:46:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:46:40 +0000 (UTC)
Subject: rpms/python-dmidecode - New directory
Message-ID: <20091201184640.184FA11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-dmidecode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvstG1213/rpms/python-dmidecode

Log Message:
Directory /cvs/pkgs/rpms/python-dmidecode added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:46:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:46:40 +0000 (UTC)
Subject: rpms/python-dmidecode/devel - New directory
Message-ID: <20091201184640.3DC6511C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvstG1213/rpms/python-dmidecode/devel

Log Message:
Directory /cvs/pkgs/rpms/python-dmidecode/devel added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:46:48 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:46:48 +0000 (UTC)
Subject: rpms/python-dmidecode Makefile,NONE,1.1
Message-ID: <20091201184648.35BCC11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-dmidecode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvstG1213/rpms/python-dmidecode

Added Files:
	Makefile 
Log Message:
Setup of module python-dmidecode


--- NEW FILE Makefile ---
# Top level Makefile for module python-dmidecode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 18:46:48 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:46:48 +0000 (UTC)
Subject: rpms/python-dmidecode/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091201184648.69FBB11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvstG1213/rpms/python-dmidecode/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-dmidecode


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-dmidecode
# $Id: Makefile,v 1.1 2009/12/01 18:46:48 tibbs Exp $
NAME := python-dmidecode
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Dec  1 18:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:48:03 +0000
Subject: [pkgdb] i3 was added for cassmodiah
Message-ID: <20091201184803.AA4CC10F89D@bastion2.fedora.phx.redhat.com>

tibbs has added Package i3 with summary Improved tiling window manager
tibbs has approved Package i3
tibbs has added a Fedora devel branch for i3 with an owner of cassmodiah
tibbs has approved i3 in Fedora devel
tibbs has approved Package i3
tibbs has set commit to Approved for 107427 on i3 (Fedora devel)
tibbs has set checkout to Approved for 107427 on i3 (Fedora devel)
tibbs has set build to Approved for 107427 on i3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:48:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:48:04 +0000
Subject: [pkgdb] i3 summary updated by tibbs
Message-ID: <20091201184804.6E4F310F8AC@bastion2.fedora.phx.redhat.com>

tibbs set package i3 summary to Improved tiling window manager

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



From tibbs at fedoraproject.org  Tue Dec  1 18:48:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:48:10 +0000 (UTC)
Subject: rpms/i3 - New directory
Message-ID: <20091201184810.14DF011C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQQ1806/rpms/i3

Log Message:
Directory /cvs/pkgs/rpms/i3 added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:48:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:48:10 +0000 (UTC)
Subject: rpms/i3/devel - New directory
Message-ID: <20091201184810.3586A11C02C8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQQ1806/rpms/i3/devel

Log Message:
Directory /cvs/pkgs/rpms/i3/devel added to the repository




From rdieter at fedoraproject.org  Tue Dec  1 18:48:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 18:48:13 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-12
	kdebase-workspace-4.3.3-kdm_plymouth.patch, NONE, 1.1
Message-ID: <20091201184813.4D4DF11C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1508

Added Files:
	kdebase-workspace-4.3.3-kdm_plymouth.patch 
Log Message:
first try at kdm/plymouth support, force use of ServerVTs (1) 
if booting with plymouth.
FIXME/TODO: query/use actually active vt, not just what's specified by ServerVTs


kdebase-workspace-4.3.3-kdm_plymouth.patch:
 dm.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE kdebase-workspace-4.3.3-kdm_plymouth.patch ---
diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
--- kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth	2008-07-21 19:03:20.000000000 -0500
+++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-01 12:26:16.435483131 -0600
@@ -1356,6 +1356,9 @@ allocateVT( struct display *d )
 						}
 					}
 				}
+				/* if using plymouth, force use of specified vt.  TODO: query/use activevt */
+				if ((open( "/var/spool/gdm/force-display-on-active-vt", O_RDONLY )) >= 0 )
+					volun = False;
 				if (!volun || !((1 << tvt) & getBusyVTs())) {
 					d->serverVT = tvt;
 					return;



From pkgdb at fedoraproject.org  Tue Dec  1 18:48:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:48:04 +0000
Subject: [pkgdb] i3 (Fedora, 12) updated by tibbs
Message-ID: <20091201184804.79F7910F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for i3
tibbs has set commit to Approved for 107427 on i3 (Fedora 12)
tibbs has set checkout to Approved for 107427 on i3 (Fedora 12)
tibbs has set build to Approved for 107427 on i3 (Fedora 12)

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



From tibbs at fedoraproject.org  Tue Dec  1 18:48:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:48:17 +0000 (UTC)
Subject: rpms/i3 Makefile,NONE,1.1
Message-ID: <20091201184817.6827211C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQQ1806/rpms/i3

Added Files:
	Makefile 
Log Message:
Setup of module i3


--- NEW FILE Makefile ---
# Top level Makefile for module i3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 18:48:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:48:17 +0000 (UTC)
Subject: rpms/i3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091201184817.9663711C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQQ1806/rpms/i3/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: i3
# $Id: Makefile,v 1.1 2009/12/01 18:48:17 tibbs Exp $
NAME := i3
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From somlo at fedoraproject.org  Tue Dec  1 18:50:39 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue,  1 Dec 2009 18:50:39 +0000 (UTC)
Subject: rpms/iperf/F-11 iperf-2.0.4-svn20091201.patch, NONE, 1.1 iperf.spec,
	1.8, 1.9
Message-ID: <20091201185039.A528B11C00DE@cvs1.fedora.phx.redhat.com>

Author: somlo

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

Modified Files:
	iperf.spec 
Added Files:
	iperf-2.0.4-svn20091201.patch 
Log Message:
patched to current svn trunk to address performance issues (#506884)


iperf-2.0.4-svn20091201.patch:
 compat/delay.cpp      |   30 +++++++------
 include/Timestamp.hpp |   29 +++++++------
 src/Client.cpp        |   18 ++++++--
 src/ReportDefault.c   |   11 ++++-
 src/main.cpp          |  108 --------------------------------------------------
 src/service.c         |  106 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 161 insertions(+), 141 deletions(-)

--- NEW FILE iperf-2.0.4-svn20091201.patch ---
diff -NarU5 iperf-2.0.4/compat/delay.cpp SVN/iperf/trunk/compat/delay.cpp
--- iperf-2.0.4/compat/delay.cpp	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/compat/delay.cpp	2009-12-01 12:28:55.796388586 -0500
@@ -49,26 +49,28 @@
  * -------------------------------------------------------------------
  * accurate microsecond delay
  * ------------------------------------------------------------------- */
 
 #include "Timestamp.hpp"
-
+#include "util.h"
 #include "delay.hpp"
 
 /* -------------------------------------------------------------------
- * A micro-second delay function. This uses gettimeofday (underneith
- * the Timestamp) which has a resolution of upto microseconds. I've
- * found it's good to within about 10 usecs.
- * I used to do calibration, but iperf automatically adjusts itself
- * so that isn't necesary, and it causes some problems if the
- * calibration adjustment is larger than your sleep time.
+ * A micro-second delay function using POSIX nanosleep(). This allows a
+ * higher timing resolution (under Linux e.g. it uses hrtimers), does not
+ * affect any signals, and will use up remaining time when interrupted.
  * ------------------------------------------------------------------- */
+void delay_loop(unsigned long usec)
+{
+    struct timespec requested, remaining;
 
-void delay_loop( unsigned long usec ) {
-    Timestamp end;
-    end.add( usec * 1e-6 );
+    requested.tv_sec  = 0;
+    requested.tv_nsec = usec * 1000L;
 
-    Timestamp now;
-    while ( now.before( end ) ) {
-        now.setnow();
-    }
+    while (nanosleep(&requested, &remaining) == -1)
+        if (errno == EINTR)
+            requested = remaining;
+        else {
+            WARN_errno(1, "nanosleep");
+            break;
+        }
 }
diff -NarU5 iperf-2.0.4/include/Timestamp.hpp SVN/iperf/trunk/include/Timestamp.hpp
--- iperf-2.0.4/include/Timestamp.hpp	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/include/Timestamp.hpp	2009-12-01 12:28:55.688355114 -0500
@@ -150,10 +150,20 @@
         return(mTime.tv_sec  - right.tv_sec) * kMillion +
         (mTime.tv_usec - right.tv_usec);
     }
 
     /* -------------------------------------------------------------------
+     * Return the number of microseconds from now to last time of setting.
+     * ------------------------------------------------------------------- */
+    long delta_usec(void) {
+        struct timeval previous = mTime;
+
+        setnow();
+        return subUsec(previous);
+    }
+
+    /* -------------------------------------------------------------------
      * subtract the right timestamp from my timestamp.
      * return the difference in seconds as a floating point.
      * ------------------------------------------------------------------- */
     double subSec( Timestamp right ) {
         return(mTime.tv_sec  - right.mTime.tv_sec) +
@@ -200,33 +210,26 @@
     }
 
     /* -------------------------------------------------------------------
      * return true if my timestamp is before the right timestamp.
      * ------------------------------------------------------------------- */
-    bool before( Timestamp right ) {
-        return mTime.tv_sec < right.mTime.tv_sec  ||
-        (mTime.tv_sec == right.mTime.tv_sec &&
-         mTime.tv_usec < right.mTime.tv_usec);
-    }
-    
-    /* -------------------------------------------------------------------
-     * return true if my timestamp is before the right timestamp.
-     * ------------------------------------------------------------------- */
     bool before( timeval right ) {
         return mTime.tv_sec < right.tv_sec  ||
         (mTime.tv_sec == right.tv_sec &&
          mTime.tv_usec < right.tv_usec);
     }
+    bool before( Timestamp right ) { return before(right.mTime); }
 
     /* -------------------------------------------------------------------
      * return true if my timestamp is after the right timestamp.
      * ------------------------------------------------------------------- */
-    bool after( Timestamp right ) {
-        return mTime.tv_sec > right.mTime.tv_sec  ||
-        (mTime.tv_sec == right.mTime.tv_sec &&
-         mTime.tv_usec > right.mTime.tv_usec);
+    bool after( timeval right ) {
+        return mTime.tv_sec > right.tv_sec  ||
+        (mTime.tv_sec == right.tv_sec &&
+         mTime.tv_usec > right.tv_usec);
     }
+    bool after( Timestamp right ) { return after(right.mTime); }
 
     /**
      * This function returns the fraction of time elapsed after the beginning 
      * till the end
      */
diff -NarU5 iperf-2.0.4/src/Client.cpp SVN/iperf/trunk/src/Client.cpp
--- iperf-2.0.4/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/Client.cpp	2009-12-01 12:28:55.922503401 -0500
@@ -114,11 +114,11 @@
 
 const double kSecs_to_usecs = 1e6; 
 const int    kBytes_to_Bits = 8; 
 
 void Client::RunTCP( void ) {
-    long currLen = 0; 
+    unsigned long currLen = 0; 
     struct itimerval it;
     max_size_t totLen = 0;
 
     int err;
 
@@ -168,11 +168,16 @@
             reportstruct->packetLen = currLen;
             ReportPacket( mSettings->reporthdr, reportstruct );
         }	
 
         if ( !mMode_Time ) {
-            mSettings->mAmount -= currLen;
+            /* mAmount may be unsigned, so don't let it underflow! */
+            if( mSettings->mAmount >= currLen ) {
+                mSettings->mAmount -= currLen;
+            } else {
+                mSettings->mAmount = 0;
+            }
         }
 
     } while ( ! (sInterupted  || 
                    (!mMode_Time  &&  0 >= mSettings->mAmount)) && canRead ); 
 
@@ -196,11 +201,11 @@
  * Does not close the socket. 
  * ------------------------------------------------------------------- */ 
 
 void Client::Run( void ) {
     struct UDP_datagram* mBuf_UDP = (struct UDP_datagram*) mBuf; 
-    long currLen = 0; 
+    unsigned long currLen = 0; 
 
     int delay_target = 0; 
     int delay = 0; 
     int adjust = 0; 
 
@@ -308,11 +313,16 @@
         
         if ( delay > 0 ) {
             delay_loop( delay ); 
         }
         if ( !mMode_Time ) {
-            mSettings->mAmount -= currLen;
+            /* mAmount may be unsigned, so don't let it underflow! */
+            if( mSettings->mAmount >= currLen ) {
+                mSettings->mAmount -= currLen;
+            } else {
+                mSettings->mAmount = 0;
+            }
         }
 
     } while ( ! (sInterupted  || 
                  (mMode_Time   &&  mEndTime.before( reportstruct->packetTime ))  || 
                  (!mMode_Time  &&  0 >= mSettings->mAmount)) && canRead ); 
diff -NarU5 iperf-2.0.4/src/main.cpp SVN/iperf/trunk/src/main.cpp
--- iperf-2.0.4/src/main.cpp	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/main.cpp	2009-12-01 12:28:55.924503012 -0500
@@ -286,118 +286,10 @@
 
     // shutdown the thread subsystem
     thread_destroy( );
 } // end cleanup
 
-#ifdef WIN32
-/*--------------------------------------------------------------------
- * ServiceStart
- *
- * each time starting the service, this is the entry point of the service.
- * Start the service, certainly it is on server-mode
- * 
- *-------------------------------------------------------------------- */
-VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) {
-    
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-
-    thread_Settings* ext_gSettings = new thread_Settings;
-
-    // Initialize settings to defaults
-    Settings_Initialize( ext_gSettings );
-    // read settings from environment variables
-    Settings_ParseEnvironment( ext_gSettings );
-    // read settings from command-line parameters
-    Settings_ParseCommandLine( dwArgc, lpszArgv, ext_gSettings );
-
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-
-    // if needed, redirect the output into a specified file
-    if ( !isSTDOUT( ext_gSettings ) ) {
-        redirect( ext_gSettings->mOutputFileName );
-    }
-
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-    
-    // initialize client(s)
-    if ( ext_gSettings->mThreadMode == kMode_Client ) {
-        client_init( ext_gSettings );
-    }
-
-    // start up the reporter and client(s) or listener
-    {
-        thread_Settings *into = NULL;
-#ifdef HAVE_THREAD
-        Settings_Copy( ext_gSettings, &into );
-        into->mThreadMode = kMode_Reporter;
-        into->runNow = ext_gSettings;
-#else
-        into = ext_gSettings;
-#endif
-        thread_start( into );
-    }
-    
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_RUNNING,       // service state
-                             NO_ERROR,              // exit code
-                             0) )                    // wait hint
-        goto clean;
-
-    clean:
-    // wait for other (client, server) threads to complete
-    thread_joinall();
-}
-
-
-//
-//  FUNCTION: ServiceStop
-//
-//  PURPOSE: Stops the service
-//
-//  PARAMETERS:
-//    none
-//
-//  RETURN VALUE:
-//    none
-//
-//  COMMENTS:
-//    If a ServiceStop procedure is going to
-//    take longer than 3 seconds to execute,
-//    it should spawn a thread to execute the
-//    stop code, and return.  Otherwise, the
-//    ServiceControlManager will believe that
-//    the service has stopped responding.
-//    
-VOID ServiceStop() {
-#ifdef HAVE_THREAD
-    Sig_Interupt( 1 );
-#else
-    sig_exit(1);
-#endif
-}
-
-#endif
 
 
 
 
 
diff -NarU5 iperf-2.0.4/src/ReportDefault.c SVN/iperf/trunk/src/ReportDefault.c
--- iperf-2.0.4/src/ReportDefault.c	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/ReportDefault.c	2009-12-01 12:28:55.923503188 -0500
@@ -65,26 +65,33 @@
 
 /*
  * Prints transfer reports in default style
  */
 void reporter_printstats( Transfer_Info *stats ) {
+    static char header_printed = 0;
 
     byte_snprintf( buffer, sizeof(buffer)/2, (double) stats->TotalLen,
                    toupper( stats->mFormat));
     byte_snprintf( &buffer[sizeof(buffer)/2], sizeof(buffer)/2,
                    stats->TotalLen / (stats->endTime - stats->startTime), 
                    stats->mFormat);
 
     if ( stats->mUDP != (char)kMode_Server ) {
         // TCP Reporting
-        printf( report_bw_header);
+        if( !header_printed ) {
+            printf( report_bw_header);
+            header_printed = 1;
+        }
         printf( report_bw_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2] );
     } else {
         // UDP Reporting
-        printf( report_bw_jitter_loss_header);
+        if( !header_printed ) {
+            printf( report_bw_jitter_loss_header);
+            header_printed = 1;
+        }
         printf( report_bw_jitter_loss_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2],
                 stats->jitter*1000.0, stats->cntError, stats->cntDatagrams,
                 (100.0 * stats->cntError) / stats->cntDatagrams );
diff -NarU5 iperf-2.0.4/src/service.c SVN/iperf/trunk/src/service.c
--- iperf-2.0.4/src/service.c	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/src/service.c	2009-12-01 12:28:55.919503097 -0500
@@ -490,6 +490,112 @@
         LocalFree((HLOCAL) lpszTemp );
 
     return lpszBuf;
 }
 
+/*--------------------------------------------------------------------
+ * ServiceStart
+ *
+ * each time starting the service, this is the entry point of the service.
+ * Start the service, certainly it is on server-mode
+ * 
+ *-------------------------------------------------------------------- */
+VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) {
+    
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+
+    thread_Settings* ext_gSettings = new thread_Settings;
+
+    // Initialize settings to defaults
+    Settings_Initialize( ext_gSettings );
+    // read settings from environment variables
+    Settings_ParseEnvironment( ext_gSettings );
+    // read settings from command-line parameters
+    Settings_ParseCommandLine( dwArgc, lpszArgv, ext_gSettings );
+
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+
+    // if needed, redirect the output into a specified file
+    if ( !isSTDOUT( ext_gSettings ) ) {
+        redirect( ext_gSettings->mOutputFileName );
+    }
+
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+    
+    // initialize client(s)
+    if ( ext_gSettings->mThreadMode == kMode_Client ) {
+        client_init( ext_gSettings );
+    }
+
+    // start up the reporter and client(s) or listener
+    {
+        thread_Settings *into = NULL;
+#ifdef HAVE_THREAD
+        Settings_Copy( ext_gSettings, &into );
+        into->mThreadMode = kMode_Reporter;
+        into->runNow = ext_gSettings;
+#else
+        into = ext_gSettings;
+#endif
+        thread_start( into );
+    }
+    
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_RUNNING,       // service state
+                             NO_ERROR,              // exit code
+                             0) )                    // wait hint
+        goto clean;
+
+    clean:
+    // wait for other (client, server) threads to complete
+    thread_joinall();
+}
+
+
+//
+//  FUNCTION: ServiceStop
+//
+//  PURPOSE: Stops the service
+//
+//  PARAMETERS:
+//    none
+//
+//  RETURN VALUE:
+//    none
+//
+//  COMMENTS:
+//    If a ServiceStop procedure is going to
+//    take longer than 3 seconds to execute,
+//    it should spawn a thread to execute the
+//    stop code, and return.  Otherwise, the
+//    ServiceControlManager will believe that
+//    the service has stopped responding.
+//    
+VOID ServiceStop() {
+#ifdef HAVE_THREAD
+    Sig_Interupt( 1 );
+#else
+    sig_exit(1);
+#endif
+}
+
 #endif


Index: iperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/F-11/iperf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- iperf.spec	25 Feb 2009 07:42:08 -0000	1.8
+++ iperf.spec	1 Dec 2009 18:50:39 -0000	1.9
@@ -1,6 +1,6 @@
 Name: iperf
 Version: 2.0.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
@@ -8,6 +8,7 @@ URL: http://iperf.sourceforge.net
 Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
 Patch0: iperf-2.0.4-debuginfo.patch
 Patch1: iperf-2.0.4-tcpdual.patch
+Patch2: iperf-2.0.4-svn20091201.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,6 +20,7 @@ jitter, datagram loss.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -37,6 +39,12 @@ jitter, datagram loss.
 %{_bindir}/iperf
 
 %changelog
+* Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-4
+- patched to current svn trunk to address performance issues (#506884)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From somlo at fedoraproject.org  Tue Dec  1 18:50:40 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue,  1 Dec 2009 18:50:40 +0000 (UTC)
Subject: rpms/iperf/devel iperf-2.0.4-svn20091201.patch, NONE, 1.1 iperf.spec,
	1.9, 1.10
Message-ID: <20091201185040.053B411C029D@cvs1.fedora.phx.redhat.com>

Author: somlo

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

Modified Files:
	iperf.spec 
Added Files:
	iperf-2.0.4-svn20091201.patch 
Log Message:
patched to current svn trunk to address performance issues (#506884)


iperf-2.0.4-svn20091201.patch:
 compat/delay.cpp      |   30 +++++++------
 include/Timestamp.hpp |   29 +++++++------
 src/Client.cpp        |   18 ++++++--
 src/ReportDefault.c   |   11 ++++-
 src/main.cpp          |  108 --------------------------------------------------
 src/service.c         |  106 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 161 insertions(+), 141 deletions(-)

--- NEW FILE iperf-2.0.4-svn20091201.patch ---
diff -NarU5 iperf-2.0.4/compat/delay.cpp SVN/iperf/trunk/compat/delay.cpp
--- iperf-2.0.4/compat/delay.cpp	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/compat/delay.cpp	2009-12-01 12:28:55.796388586 -0500
@@ -49,26 +49,28 @@
  * -------------------------------------------------------------------
  * accurate microsecond delay
  * ------------------------------------------------------------------- */
 
 #include "Timestamp.hpp"
-
+#include "util.h"
 #include "delay.hpp"
 
 /* -------------------------------------------------------------------
- * A micro-second delay function. This uses gettimeofday (underneith
- * the Timestamp) which has a resolution of upto microseconds. I've
- * found it's good to within about 10 usecs.
- * I used to do calibration, but iperf automatically adjusts itself
- * so that isn't necesary, and it causes some problems if the
- * calibration adjustment is larger than your sleep time.
+ * A micro-second delay function using POSIX nanosleep(). This allows a
+ * higher timing resolution (under Linux e.g. it uses hrtimers), does not
+ * affect any signals, and will use up remaining time when interrupted.
  * ------------------------------------------------------------------- */
+void delay_loop(unsigned long usec)
+{
+    struct timespec requested, remaining;
 
-void delay_loop( unsigned long usec ) {
-    Timestamp end;
-    end.add( usec * 1e-6 );
+    requested.tv_sec  = 0;
+    requested.tv_nsec = usec * 1000L;
 
-    Timestamp now;
-    while ( now.before( end ) ) {
-        now.setnow();
-    }
+    while (nanosleep(&requested, &remaining) == -1)
+        if (errno == EINTR)
+            requested = remaining;
+        else {
+            WARN_errno(1, "nanosleep");
+            break;
+        }
 }
diff -NarU5 iperf-2.0.4/include/Timestamp.hpp SVN/iperf/trunk/include/Timestamp.hpp
--- iperf-2.0.4/include/Timestamp.hpp	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/include/Timestamp.hpp	2009-12-01 12:28:55.688355114 -0500
@@ -150,10 +150,20 @@
         return(mTime.tv_sec  - right.tv_sec) * kMillion +
         (mTime.tv_usec - right.tv_usec);
     }
 
     /* -------------------------------------------------------------------
+     * Return the number of microseconds from now to last time of setting.
+     * ------------------------------------------------------------------- */
+    long delta_usec(void) {
+        struct timeval previous = mTime;
+
+        setnow();
+        return subUsec(previous);
+    }
+
+    /* -------------------------------------------------------------------
      * subtract the right timestamp from my timestamp.
      * return the difference in seconds as a floating point.
      * ------------------------------------------------------------------- */
     double subSec( Timestamp right ) {
         return(mTime.tv_sec  - right.mTime.tv_sec) +
@@ -200,33 +210,26 @@
     }
 
     /* -------------------------------------------------------------------
      * return true if my timestamp is before the right timestamp.
      * ------------------------------------------------------------------- */
-    bool before( Timestamp right ) {
-        return mTime.tv_sec < right.mTime.tv_sec  ||
-        (mTime.tv_sec == right.mTime.tv_sec &&
-         mTime.tv_usec < right.mTime.tv_usec);
-    }
-    
-    /* -------------------------------------------------------------------
-     * return true if my timestamp is before the right timestamp.
-     * ------------------------------------------------------------------- */
     bool before( timeval right ) {
         return mTime.tv_sec < right.tv_sec  ||
         (mTime.tv_sec == right.tv_sec &&
          mTime.tv_usec < right.tv_usec);
     }
+    bool before( Timestamp right ) { return before(right.mTime); }
 
     /* -------------------------------------------------------------------
      * return true if my timestamp is after the right timestamp.
      * ------------------------------------------------------------------- */
-    bool after( Timestamp right ) {
-        return mTime.tv_sec > right.mTime.tv_sec  ||
-        (mTime.tv_sec == right.mTime.tv_sec &&
-         mTime.tv_usec > right.mTime.tv_usec);
+    bool after( timeval right ) {
+        return mTime.tv_sec > right.tv_sec  ||
+        (mTime.tv_sec == right.tv_sec &&
+         mTime.tv_usec > right.tv_usec);
     }
+    bool after( Timestamp right ) { return after(right.mTime); }
 
     /**
      * This function returns the fraction of time elapsed after the beginning 
      * till the end
      */
diff -NarU5 iperf-2.0.4/src/Client.cpp SVN/iperf/trunk/src/Client.cpp
--- iperf-2.0.4/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/Client.cpp	2009-12-01 12:28:55.922503401 -0500
@@ -114,11 +114,11 @@
 
 const double kSecs_to_usecs = 1e6; 
 const int    kBytes_to_Bits = 8; 
 
 void Client::RunTCP( void ) {
-    long currLen = 0; 
+    unsigned long currLen = 0; 
     struct itimerval it;
     max_size_t totLen = 0;
 
     int err;
 
@@ -168,11 +168,16 @@
             reportstruct->packetLen = currLen;
             ReportPacket( mSettings->reporthdr, reportstruct );
         }	
 
         if ( !mMode_Time ) {
-            mSettings->mAmount -= currLen;
+            /* mAmount may be unsigned, so don't let it underflow! */
+            if( mSettings->mAmount >= currLen ) {
+                mSettings->mAmount -= currLen;
+            } else {
+                mSettings->mAmount = 0;
+            }
         }
 
     } while ( ! (sInterupted  || 
                    (!mMode_Time  &&  0 >= mSettings->mAmount)) && canRead ); 
 
@@ -196,11 +201,11 @@
  * Does not close the socket. 
  * ------------------------------------------------------------------- */ 
 
 void Client::Run( void ) {
     struct UDP_datagram* mBuf_UDP = (struct UDP_datagram*) mBuf; 
-    long currLen = 0; 
+    unsigned long currLen = 0; 
 
     int delay_target = 0; 
     int delay = 0; 
     int adjust = 0; 
 
@@ -308,11 +313,16 @@
         
         if ( delay > 0 ) {
             delay_loop( delay ); 
         }
         if ( !mMode_Time ) {
-            mSettings->mAmount -= currLen;
+            /* mAmount may be unsigned, so don't let it underflow! */
+            if( mSettings->mAmount >= currLen ) {
+                mSettings->mAmount -= currLen;
+            } else {
+                mSettings->mAmount = 0;
+            }
         }
 
     } while ( ! (sInterupted  || 
                  (mMode_Time   &&  mEndTime.before( reportstruct->packetTime ))  || 
                  (!mMode_Time  &&  0 >= mSettings->mAmount)) && canRead ); 
diff -NarU5 iperf-2.0.4/src/main.cpp SVN/iperf/trunk/src/main.cpp
--- iperf-2.0.4/src/main.cpp	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/main.cpp	2009-12-01 12:28:55.924503012 -0500
@@ -286,118 +286,10 @@
 
     // shutdown the thread subsystem
     thread_destroy( );
 } // end cleanup
 
-#ifdef WIN32
-/*--------------------------------------------------------------------
- * ServiceStart
- *
- * each time starting the service, this is the entry point of the service.
- * Start the service, certainly it is on server-mode
- * 
- *-------------------------------------------------------------------- */
-VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) {
-    
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-
-    thread_Settings* ext_gSettings = new thread_Settings;
-
-    // Initialize settings to defaults
-    Settings_Initialize( ext_gSettings );
-    // read settings from environment variables
-    Settings_ParseEnvironment( ext_gSettings );
-    // read settings from command-line parameters
-    Settings_ParseCommandLine( dwArgc, lpszArgv, ext_gSettings );
-
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-
-    // if needed, redirect the output into a specified file
-    if ( !isSTDOUT( ext_gSettings ) ) {
-        redirect( ext_gSettings->mOutputFileName );
-    }
-
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-    
-    // initialize client(s)
-    if ( ext_gSettings->mThreadMode == kMode_Client ) {
-        client_init( ext_gSettings );
-    }
-
-    // start up the reporter and client(s) or listener
-    {
-        thread_Settings *into = NULL;
-#ifdef HAVE_THREAD
-        Settings_Copy( ext_gSettings, &into );
-        into->mThreadMode = kMode_Reporter;
-        into->runNow = ext_gSettings;
-#else
-        into = ext_gSettings;
-#endif
-        thread_start( into );
-    }
-    
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_RUNNING,       // service state
-                             NO_ERROR,              // exit code
-                             0) )                    // wait hint
-        goto clean;
-
-    clean:
-    // wait for other (client, server) threads to complete
-    thread_joinall();
-}
-
-
-//
-//  FUNCTION: ServiceStop
-//
-//  PURPOSE: Stops the service
-//
-//  PARAMETERS:
-//    none
-//
-//  RETURN VALUE:
-//    none
-//
-//  COMMENTS:
-//    If a ServiceStop procedure is going to
-//    take longer than 3 seconds to execute,
-//    it should spawn a thread to execute the
-//    stop code, and return.  Otherwise, the
-//    ServiceControlManager will believe that
-//    the service has stopped responding.
-//    
-VOID ServiceStop() {
-#ifdef HAVE_THREAD
-    Sig_Interupt( 1 );
-#else
-    sig_exit(1);
-#endif
-}
-
-#endif
 
 
 
 
 
diff -NarU5 iperf-2.0.4/src/ReportDefault.c SVN/iperf/trunk/src/ReportDefault.c
--- iperf-2.0.4/src/ReportDefault.c	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/ReportDefault.c	2009-12-01 12:28:55.923503188 -0500
@@ -65,26 +65,33 @@
 
 /*
  * Prints transfer reports in default style
  */
 void reporter_printstats( Transfer_Info *stats ) {
+    static char header_printed = 0;
 
     byte_snprintf( buffer, sizeof(buffer)/2, (double) stats->TotalLen,
                    toupper( stats->mFormat));
     byte_snprintf( &buffer[sizeof(buffer)/2], sizeof(buffer)/2,
                    stats->TotalLen / (stats->endTime - stats->startTime), 
                    stats->mFormat);
 
     if ( stats->mUDP != (char)kMode_Server ) {
         // TCP Reporting
-        printf( report_bw_header);
+        if( !header_printed ) {
+            printf( report_bw_header);
+            header_printed = 1;
+        }
         printf( report_bw_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2] );
     } else {
         // UDP Reporting
-        printf( report_bw_jitter_loss_header);
+        if( !header_printed ) {
+            printf( report_bw_jitter_loss_header);
+            header_printed = 1;
+        }
         printf( report_bw_jitter_loss_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2],
                 stats->jitter*1000.0, stats->cntError, stats->cntDatagrams,
                 (100.0 * stats->cntError) / stats->cntDatagrams );
diff -NarU5 iperf-2.0.4/src/service.c SVN/iperf/trunk/src/service.c
--- iperf-2.0.4/src/service.c	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/src/service.c	2009-12-01 12:28:55.919503097 -0500
@@ -490,6 +490,112 @@
         LocalFree((HLOCAL) lpszTemp );
 
     return lpszBuf;
 }
 
+/*--------------------------------------------------------------------
+ * ServiceStart
+ *
+ * each time starting the service, this is the entry point of the service.
+ * Start the service, certainly it is on server-mode
+ * 
+ *-------------------------------------------------------------------- */
+VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) {
+    
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+
+    thread_Settings* ext_gSettings = new thread_Settings;
+
+    // Initialize settings to defaults
+    Settings_Initialize( ext_gSettings );
+    // read settings from environment variables
+    Settings_ParseEnvironment( ext_gSettings );
+    // read settings from command-line parameters
+    Settings_ParseCommandLine( dwArgc, lpszArgv, ext_gSettings );
+
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+
+    // if needed, redirect the output into a specified file
+    if ( !isSTDOUT( ext_gSettings ) ) {
+        redirect( ext_gSettings->mOutputFileName );
+    }
+
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+    
+    // initialize client(s)
+    if ( ext_gSettings->mThreadMode == kMode_Client ) {
+        client_init( ext_gSettings );
+    }
+
+    // start up the reporter and client(s) or listener
+    {
+        thread_Settings *into = NULL;
+#ifdef HAVE_THREAD
+        Settings_Copy( ext_gSettings, &into );
+        into->mThreadMode = kMode_Reporter;
+        into->runNow = ext_gSettings;
+#else
+        into = ext_gSettings;
+#endif
+        thread_start( into );
+    }
+    
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_RUNNING,       // service state
+                             NO_ERROR,              // exit code
+                             0) )                    // wait hint
+        goto clean;
+
+    clean:
+    // wait for other (client, server) threads to complete
+    thread_joinall();
+}
+
+
+//
+//  FUNCTION: ServiceStop
+//
+//  PURPOSE: Stops the service
+//
+//  PARAMETERS:
+//    none
+//
+//  RETURN VALUE:
+//    none
+//
+//  COMMENTS:
+//    If a ServiceStop procedure is going to
+//    take longer than 3 seconds to execute,
+//    it should spawn a thread to execute the
+//    stop code, and return.  Otherwise, the
+//    ServiceControlManager will believe that
+//    the service has stopped responding.
+//    
+VOID ServiceStop() {
+#ifdef HAVE_THREAD
+    Sig_Interupt( 1 );
+#else
+    sig_exit(1);
+#endif
+}
+
 #endif


Index: iperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/devel/iperf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- iperf.spec	25 Jul 2009 03:31:10 -0000	1.9
+++ iperf.spec	1 Dec 2009 18:50:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name: iperf
 Version: 2.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
@@ -8,6 +8,7 @@ URL: http://iperf.sourceforge.net
 Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
 Patch0: iperf-2.0.4-debuginfo.patch
 Patch1: iperf-2.0.4-tcpdual.patch
+Patch2: iperf-2.0.4-svn20091201.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,6 +20,7 @@ jitter, datagram loss.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -37,6 +39,9 @@ jitter, datagram loss.
 %{_bindir}/iperf
 
 %changelog
+* Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-4
+- patched to current svn trunk to address performance issues (#506884)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From somlo at fedoraproject.org  Tue Dec  1 18:50:39 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue,  1 Dec 2009 18:50:39 +0000 (UTC)
Subject: rpms/iperf/F-12 iperf-2.0.4-svn20091201.patch, NONE, 1.1 iperf.spec,
	1.9, 1.10
Message-ID: <20091201185039.C66B311C00DE@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/iperf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2329/F-12

Modified Files:
	iperf.spec 
Added Files:
	iperf-2.0.4-svn20091201.patch 
Log Message:
patched to current svn trunk to address performance issues (#506884)


iperf-2.0.4-svn20091201.patch:
 compat/delay.cpp      |   30 +++++++------
 include/Timestamp.hpp |   29 +++++++------
 src/Client.cpp        |   18 ++++++--
 src/ReportDefault.c   |   11 ++++-
 src/main.cpp          |  108 --------------------------------------------------
 src/service.c         |  106 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 161 insertions(+), 141 deletions(-)

--- NEW FILE iperf-2.0.4-svn20091201.patch ---
diff -NarU5 iperf-2.0.4/compat/delay.cpp SVN/iperf/trunk/compat/delay.cpp
--- iperf-2.0.4/compat/delay.cpp	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/compat/delay.cpp	2009-12-01 12:28:55.796388586 -0500
@@ -49,26 +49,28 @@
  * -------------------------------------------------------------------
  * accurate microsecond delay
  * ------------------------------------------------------------------- */
 
 #include "Timestamp.hpp"
-
+#include "util.h"
 #include "delay.hpp"
 
 /* -------------------------------------------------------------------
- * A micro-second delay function. This uses gettimeofday (underneith
- * the Timestamp) which has a resolution of upto microseconds. I've
- * found it's good to within about 10 usecs.
- * I used to do calibration, but iperf automatically adjusts itself
- * so that isn't necesary, and it causes some problems if the
- * calibration adjustment is larger than your sleep time.
+ * A micro-second delay function using POSIX nanosleep(). This allows a
+ * higher timing resolution (under Linux e.g. it uses hrtimers), does not
+ * affect any signals, and will use up remaining time when interrupted.
  * ------------------------------------------------------------------- */
+void delay_loop(unsigned long usec)
+{
+    struct timespec requested, remaining;
 
-void delay_loop( unsigned long usec ) {
-    Timestamp end;
-    end.add( usec * 1e-6 );
+    requested.tv_sec  = 0;
+    requested.tv_nsec = usec * 1000L;
 
-    Timestamp now;
-    while ( now.before( end ) ) {
-        now.setnow();
-    }
+    while (nanosleep(&requested, &remaining) == -1)
+        if (errno == EINTR)
+            requested = remaining;
+        else {
+            WARN_errno(1, "nanosleep");
+            break;
+        }
 }
diff -NarU5 iperf-2.0.4/include/Timestamp.hpp SVN/iperf/trunk/include/Timestamp.hpp
--- iperf-2.0.4/include/Timestamp.hpp	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/include/Timestamp.hpp	2009-12-01 12:28:55.688355114 -0500
@@ -150,10 +150,20 @@
         return(mTime.tv_sec  - right.tv_sec) * kMillion +
         (mTime.tv_usec - right.tv_usec);
     }
 
     /* -------------------------------------------------------------------
+     * Return the number of microseconds from now to last time of setting.
+     * ------------------------------------------------------------------- */
+    long delta_usec(void) {
+        struct timeval previous = mTime;
+
+        setnow();
+        return subUsec(previous);
+    }
+
+    /* -------------------------------------------------------------------
      * subtract the right timestamp from my timestamp.
      * return the difference in seconds as a floating point.
      * ------------------------------------------------------------------- */
     double subSec( Timestamp right ) {
         return(mTime.tv_sec  - right.mTime.tv_sec) +
@@ -200,33 +210,26 @@
     }
 
     /* -------------------------------------------------------------------
      * return true if my timestamp is before the right timestamp.
      * ------------------------------------------------------------------- */
-    bool before( Timestamp right ) {
-        return mTime.tv_sec < right.mTime.tv_sec  ||
-        (mTime.tv_sec == right.mTime.tv_sec &&
-         mTime.tv_usec < right.mTime.tv_usec);
-    }
-    
-    /* -------------------------------------------------------------------
-     * return true if my timestamp is before the right timestamp.
-     * ------------------------------------------------------------------- */
     bool before( timeval right ) {
         return mTime.tv_sec < right.tv_sec  ||
         (mTime.tv_sec == right.tv_sec &&
          mTime.tv_usec < right.tv_usec);
     }
+    bool before( Timestamp right ) { return before(right.mTime); }
 
     /* -------------------------------------------------------------------
      * return true if my timestamp is after the right timestamp.
      * ------------------------------------------------------------------- */
-    bool after( Timestamp right ) {
-        return mTime.tv_sec > right.mTime.tv_sec  ||
-        (mTime.tv_sec == right.mTime.tv_sec &&
-         mTime.tv_usec > right.mTime.tv_usec);
+    bool after( timeval right ) {
+        return mTime.tv_sec > right.tv_sec  ||
+        (mTime.tv_sec == right.tv_sec &&
+         mTime.tv_usec > right.tv_usec);
     }
+    bool after( Timestamp right ) { return after(right.mTime); }
 
     /**
      * This function returns the fraction of time elapsed after the beginning 
      * till the end
      */
diff -NarU5 iperf-2.0.4/src/Client.cpp SVN/iperf/trunk/src/Client.cpp
--- iperf-2.0.4/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/Client.cpp	2009-12-01 12:28:55.922503401 -0500
@@ -114,11 +114,11 @@
 
 const double kSecs_to_usecs = 1e6; 
 const int    kBytes_to_Bits = 8; 
 
 void Client::RunTCP( void ) {
-    long currLen = 0; 
+    unsigned long currLen = 0; 
     struct itimerval it;
     max_size_t totLen = 0;
 
     int err;
 
@@ -168,11 +168,16 @@
             reportstruct->packetLen = currLen;
             ReportPacket( mSettings->reporthdr, reportstruct );
         }	
 
         if ( !mMode_Time ) {
-            mSettings->mAmount -= currLen;
+            /* mAmount may be unsigned, so don't let it underflow! */
+            if( mSettings->mAmount >= currLen ) {
+                mSettings->mAmount -= currLen;
+            } else {
+                mSettings->mAmount = 0;
+            }
         }
 
     } while ( ! (sInterupted  || 
                    (!mMode_Time  &&  0 >= mSettings->mAmount)) && canRead ); 
 
@@ -196,11 +201,11 @@
  * Does not close the socket. 
  * ------------------------------------------------------------------- */ 
 
 void Client::Run( void ) {
     struct UDP_datagram* mBuf_UDP = (struct UDP_datagram*) mBuf; 
-    long currLen = 0; 
+    unsigned long currLen = 0; 
 
     int delay_target = 0; 
     int delay = 0; 
     int adjust = 0; 
 
@@ -308,11 +313,16 @@
         
         if ( delay > 0 ) {
             delay_loop( delay ); 
         }
         if ( !mMode_Time ) {
-            mSettings->mAmount -= currLen;
+            /* mAmount may be unsigned, so don't let it underflow! */
+            if( mSettings->mAmount >= currLen ) {
+                mSettings->mAmount -= currLen;
+            } else {
+                mSettings->mAmount = 0;
+            }
         }
 
     } while ( ! (sInterupted  || 
                  (mMode_Time   &&  mEndTime.before( reportstruct->packetTime ))  || 
                  (!mMode_Time  &&  0 >= mSettings->mAmount)) && canRead ); 
diff -NarU5 iperf-2.0.4/src/main.cpp SVN/iperf/trunk/src/main.cpp
--- iperf-2.0.4/src/main.cpp	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/main.cpp	2009-12-01 12:28:55.924503012 -0500
@@ -286,118 +286,10 @@
 
     // shutdown the thread subsystem
     thread_destroy( );
 } // end cleanup
 
-#ifdef WIN32
-/*--------------------------------------------------------------------
- * ServiceStart
- *
- * each time starting the service, this is the entry point of the service.
- * Start the service, certainly it is on server-mode
- * 
- *-------------------------------------------------------------------- */
-VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) {
-    
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-
-    thread_Settings* ext_gSettings = new thread_Settings;
-
-    // Initialize settings to defaults
-    Settings_Initialize( ext_gSettings );
-    // read settings from environment variables
-    Settings_ParseEnvironment( ext_gSettings );
-    // read settings from command-line parameters
-    Settings_ParseCommandLine( dwArgc, lpszArgv, ext_gSettings );
-
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-
-    // if needed, redirect the output into a specified file
-    if ( !isSTDOUT( ext_gSettings ) ) {
-        redirect( ext_gSettings->mOutputFileName );
-    }
-
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-    
-    // initialize client(s)
-    if ( ext_gSettings->mThreadMode == kMode_Client ) {
-        client_init( ext_gSettings );
-    }
-
-    // start up the reporter and client(s) or listener
-    {
-        thread_Settings *into = NULL;
-#ifdef HAVE_THREAD
-        Settings_Copy( ext_gSettings, &into );
-        into->mThreadMode = kMode_Reporter;
-        into->runNow = ext_gSettings;
-#else
-        into = ext_gSettings;
-#endif
-        thread_start( into );
-    }
-    
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_RUNNING,       // service state
-                             NO_ERROR,              // exit code
-                             0) )                    // wait hint
-        goto clean;
-
-    clean:
-    // wait for other (client, server) threads to complete
-    thread_joinall();
-}
-
-
-//
-//  FUNCTION: ServiceStop
-//
-//  PURPOSE: Stops the service
-//
-//  PARAMETERS:
-//    none
-//
-//  RETURN VALUE:
-//    none
-//
-//  COMMENTS:
-//    If a ServiceStop procedure is going to
-//    take longer than 3 seconds to execute,
-//    it should spawn a thread to execute the
-//    stop code, and return.  Otherwise, the
-//    ServiceControlManager will believe that
-//    the service has stopped responding.
-//    
-VOID ServiceStop() {
-#ifdef HAVE_THREAD
-    Sig_Interupt( 1 );
-#else
-    sig_exit(1);
-#endif
-}
-
-#endif
 
 
 
 
 
diff -NarU5 iperf-2.0.4/src/ReportDefault.c SVN/iperf/trunk/src/ReportDefault.c
--- iperf-2.0.4/src/ReportDefault.c	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/ReportDefault.c	2009-12-01 12:28:55.923503188 -0500
@@ -65,26 +65,33 @@
 
 /*
  * Prints transfer reports in default style
  */
 void reporter_printstats( Transfer_Info *stats ) {
+    static char header_printed = 0;
 
     byte_snprintf( buffer, sizeof(buffer)/2, (double) stats->TotalLen,
                    toupper( stats->mFormat));
     byte_snprintf( &buffer[sizeof(buffer)/2], sizeof(buffer)/2,
                    stats->TotalLen / (stats->endTime - stats->startTime), 
                    stats->mFormat);
 
     if ( stats->mUDP != (char)kMode_Server ) {
         // TCP Reporting
-        printf( report_bw_header);
+        if( !header_printed ) {
+            printf( report_bw_header);
+            header_printed = 1;
+        }
         printf( report_bw_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2] );
     } else {
         // UDP Reporting
-        printf( report_bw_jitter_loss_header);
+        if( !header_printed ) {
+            printf( report_bw_jitter_loss_header);
+            header_printed = 1;
+        }
         printf( report_bw_jitter_loss_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2],
                 stats->jitter*1000.0, stats->cntError, stats->cntDatagrams,
                 (100.0 * stats->cntError) / stats->cntDatagrams );
diff -NarU5 iperf-2.0.4/src/service.c SVN/iperf/trunk/src/service.c
--- iperf-2.0.4/src/service.c	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/src/service.c	2009-12-01 12:28:55.919503097 -0500
@@ -490,6 +490,112 @@
         LocalFree((HLOCAL) lpszTemp );
 
     return lpszBuf;
 }
 
+/*--------------------------------------------------------------------
+ * ServiceStart
+ *
+ * each time starting the service, this is the entry point of the service.
+ * Start the service, certainly it is on server-mode
+ * 
+ *-------------------------------------------------------------------- */
+VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) {
+    
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+
+    thread_Settings* ext_gSettings = new thread_Settings;
+
+    // Initialize settings to defaults
+    Settings_Initialize( ext_gSettings );
+    // read settings from environment variables
+    Settings_ParseEnvironment( ext_gSettings );
+    // read settings from command-line parameters
+    Settings_ParseCommandLine( dwArgc, lpszArgv, ext_gSettings );
+
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+
+    // if needed, redirect the output into a specified file
+    if ( !isSTDOUT( ext_gSettings ) ) {
+        redirect( ext_gSettings->mOutputFileName );
+    }
+
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+    
+    // initialize client(s)
+    if ( ext_gSettings->mThreadMode == kMode_Client ) {
+        client_init( ext_gSettings );
+    }
+
+    // start up the reporter and client(s) or listener
+    {
+        thread_Settings *into = NULL;
+#ifdef HAVE_THREAD
+        Settings_Copy( ext_gSettings, &into );
+        into->mThreadMode = kMode_Reporter;
+        into->runNow = ext_gSettings;
+#else
+        into = ext_gSettings;
+#endif
+        thread_start( into );
+    }
+    
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_RUNNING,       // service state
+                             NO_ERROR,              // exit code
+                             0) )                    // wait hint
+        goto clean;
+
+    clean:
+    // wait for other (client, server) threads to complete
+    thread_joinall();
+}
+
+
+//
+//  FUNCTION: ServiceStop
+//
+//  PURPOSE: Stops the service
+//
+//  PARAMETERS:
+//    none
+//
+//  RETURN VALUE:
+//    none
+//
+//  COMMENTS:
+//    If a ServiceStop procedure is going to
+//    take longer than 3 seconds to execute,
+//    it should spawn a thread to execute the
+//    stop code, and return.  Otherwise, the
+//    ServiceControlManager will believe that
+//    the service has stopped responding.
+//    
+VOID ServiceStop() {
+#ifdef HAVE_THREAD
+    Sig_Interupt( 1 );
+#else
+    sig_exit(1);
+#endif
+}
+
 #endif


Index: iperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/F-12/iperf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- iperf.spec	25 Jul 2009 03:31:10 -0000	1.9
+++ iperf.spec	1 Dec 2009 18:50:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name: iperf
 Version: 2.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
@@ -8,6 +8,7 @@ URL: http://iperf.sourceforge.net
 Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
 Patch0: iperf-2.0.4-debuginfo.patch
 Patch1: iperf-2.0.4-tcpdual.patch
+Patch2: iperf-2.0.4-svn20091201.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,6 +20,7 @@ jitter, datagram loss.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -37,6 +39,9 @@ jitter, datagram loss.
 %{_bindir}/iperf
 
 %changelog
+* Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-4
+- patched to current svn trunk to address performance issues (#506884)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Dec  1 18:50:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:50:49 +0000
Subject: [pkgdb] i3lock was added for cassmodiah
Message-ID: <20091201185049.4490610F892@bastion2.fedora.phx.redhat.com>

tibbs has added Package i3lock with summary Simple X display locker
tibbs has approved Package i3lock
tibbs has added a Fedora devel branch for i3lock with an owner of cassmodiah
tibbs has approved i3lock in Fedora devel
tibbs has approved Package i3lock
tibbs has set commit to Approved for 107427 on i3lock (Fedora devel)
tibbs has set checkout to Approved for 107427 on i3lock (Fedora devel)
tibbs has set build to Approved for 107427 on i3lock (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:50:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:50:50 +0000
Subject: [pkgdb] i3lock summary updated by tibbs
Message-ID: <20091201185050.73D6710F899@bastion2.fedora.phx.redhat.com>

tibbs set package i3lock summary to Simple X display locker

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



From pkgdb at fedoraproject.org  Tue Dec  1 18:50:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 18:50:50 +0000
Subject: [pkgdb] i3lock (Fedora, 12) updated by tibbs
Message-ID: <20091201185050.81B3810F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for i3lock
tibbs has set commit to Approved for 107427 on i3lock (Fedora 12)
tibbs has set checkout to Approved for 107427 on i3lock (Fedora 12)
tibbs has set build to Approved for 107427 on i3lock (Fedora 12)

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



From tibbs at fedoraproject.org  Tue Dec  1 18:50:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:50:57 +0000 (UTC)
Subject: rpms/i3lock - New directory
Message-ID: <20091201185057.20BBD11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3lock
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvszO2455/rpms/i3lock

Log Message:
Directory /cvs/pkgs/rpms/i3lock added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:50:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:50:57 +0000 (UTC)
Subject: rpms/i3lock/devel - New directory
Message-ID: <20091201185057.51C3A11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3lock/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvszO2455/rpms/i3lock/devel

Log Message:
Directory /cvs/pkgs/rpms/i3lock/devel added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 18:51:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:51:06 +0000 (UTC)
Subject: rpms/i3lock Makefile,NONE,1.1
Message-ID: <20091201185106.11D8D11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3lock
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvszO2455/rpms/i3lock

Added Files:
	Makefile 
Log Message:
Setup of module i3lock


--- NEW FILE Makefile ---
# Top level Makefile for module i3lock
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 18:51:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 18:51:06 +0000 (UTC)
Subject: rpms/i3lock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091201185106.4DDBC11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3lock/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvszO2455/rpms/i3lock/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: i3lock
# $Id: Makefile,v 1.1 2009/12/01 18:51:06 tibbs Exp $
NAME := i3lock
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rdieter at fedoraproject.org  Tue Dec  1 18:52:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 18:52:11 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-12 kdebase-workspace.spec,1.310,1.311
Message-ID: <20091201185211.1944511C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2947

Modified Files:
	kdebase-workspace.spec 
Log Message:
- force use of ServerVTs(1), if booting from plymouth (#475890)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -p -r1.310 -r1.311
--- kdebase-workspace.spec	1 Dec 2009 14:42:51 -0000	1.310
+++ kdebase-workspace.spec	1 Dec 2009 18:52:10 -0000	1.311
@@ -35,6 +35,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
 Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
+Patch18: kdebase-workspace-4.3.3-kdm_plymouth.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -274,6 +275,7 @@ Requires: akonadi
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
+%patch18 -p1 -b .kdm_plymouth
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -614,6 +616,7 @@ fi
 %changelog
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
+- force use of ServerVTs(1), if booting from plymouth (#475890)
 
 * Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7.1
 - Requires: PolicyKit-authentication-agent unconditionally (ie, in F-12 too)



From somlo at fedoraproject.org  Tue Dec  1 18:55:14 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue,  1 Dec 2009 18:55:14 +0000 (UTC)
Subject: rpms/iperf/EL-5 iperf-2.0.4-svn20091201.patch, NONE, 1.1 iperf.spec,
	1.8, 1.9
Message-ID: <20091201185514.36A5E11C00DE@cvs1.fedora.phx.redhat.com>

Author: somlo

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

Modified Files:
	iperf.spec 
Added Files:
	iperf-2.0.4-svn20091201.patch 
Log Message:
also apply patch for #506884 to EL-5


iperf-2.0.4-svn20091201.patch:
 compat/delay.cpp      |   30 +++++++------
 include/Timestamp.hpp |   29 +++++++------
 src/Client.cpp        |   18 ++++++--
 src/ReportDefault.c   |   11 ++++-
 src/main.cpp          |  108 --------------------------------------------------
 src/service.c         |  106 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 161 insertions(+), 141 deletions(-)

--- NEW FILE iperf-2.0.4-svn20091201.patch ---
diff -NarU5 iperf-2.0.4/compat/delay.cpp SVN/iperf/trunk/compat/delay.cpp
--- iperf-2.0.4/compat/delay.cpp	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/compat/delay.cpp	2009-12-01 12:28:55.796388586 -0500
@@ -49,26 +49,28 @@
  * -------------------------------------------------------------------
  * accurate microsecond delay
  * ------------------------------------------------------------------- */
 
 #include "Timestamp.hpp"
-
+#include "util.h"
 #include "delay.hpp"
 
 /* -------------------------------------------------------------------
- * A micro-second delay function. This uses gettimeofday (underneith
- * the Timestamp) which has a resolution of upto microseconds. I've
- * found it's good to within about 10 usecs.
- * I used to do calibration, but iperf automatically adjusts itself
- * so that isn't necesary, and it causes some problems if the
- * calibration adjustment is larger than your sleep time.
+ * A micro-second delay function using POSIX nanosleep(). This allows a
+ * higher timing resolution (under Linux e.g. it uses hrtimers), does not
+ * affect any signals, and will use up remaining time when interrupted.
  * ------------------------------------------------------------------- */
+void delay_loop(unsigned long usec)
+{
+    struct timespec requested, remaining;
 
-void delay_loop( unsigned long usec ) {
-    Timestamp end;
-    end.add( usec * 1e-6 );
+    requested.tv_sec  = 0;
+    requested.tv_nsec = usec * 1000L;
 
-    Timestamp now;
-    while ( now.before( end ) ) {
-        now.setnow();
-    }
+    while (nanosleep(&requested, &remaining) == -1)
+        if (errno == EINTR)
+            requested = remaining;
+        else {
+            WARN_errno(1, "nanosleep");
+            break;
+        }
 }
diff -NarU5 iperf-2.0.4/include/Timestamp.hpp SVN/iperf/trunk/include/Timestamp.hpp
--- iperf-2.0.4/include/Timestamp.hpp	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/include/Timestamp.hpp	2009-12-01 12:28:55.688355114 -0500
@@ -150,10 +150,20 @@
         return(mTime.tv_sec  - right.tv_sec) * kMillion +
         (mTime.tv_usec - right.tv_usec);
     }
 
     /* -------------------------------------------------------------------
+     * Return the number of microseconds from now to last time of setting.
+     * ------------------------------------------------------------------- */
+    long delta_usec(void) {
+        struct timeval previous = mTime;
+
+        setnow();
+        return subUsec(previous);
+    }
+
+    /* -------------------------------------------------------------------
      * subtract the right timestamp from my timestamp.
      * return the difference in seconds as a floating point.
      * ------------------------------------------------------------------- */
     double subSec( Timestamp right ) {
         return(mTime.tv_sec  - right.mTime.tv_sec) +
@@ -200,33 +210,26 @@
     }
 
     /* -------------------------------------------------------------------
      * return true if my timestamp is before the right timestamp.
      * ------------------------------------------------------------------- */
-    bool before( Timestamp right ) {
-        return mTime.tv_sec < right.mTime.tv_sec  ||
-        (mTime.tv_sec == right.mTime.tv_sec &&
-         mTime.tv_usec < right.mTime.tv_usec);
-    }
-    
-    /* -------------------------------------------------------------------
-     * return true if my timestamp is before the right timestamp.
-     * ------------------------------------------------------------------- */
     bool before( timeval right ) {
         return mTime.tv_sec < right.tv_sec  ||
         (mTime.tv_sec == right.tv_sec &&
          mTime.tv_usec < right.tv_usec);
     }
+    bool before( Timestamp right ) { return before(right.mTime); }
 
     /* -------------------------------------------------------------------
      * return true if my timestamp is after the right timestamp.
      * ------------------------------------------------------------------- */
-    bool after( Timestamp right ) {
-        return mTime.tv_sec > right.mTime.tv_sec  ||
-        (mTime.tv_sec == right.mTime.tv_sec &&
-         mTime.tv_usec > right.mTime.tv_usec);
+    bool after( timeval right ) {
+        return mTime.tv_sec > right.tv_sec  ||
+        (mTime.tv_sec == right.tv_sec &&
+         mTime.tv_usec > right.tv_usec);
     }
+    bool after( Timestamp right ) { return after(right.mTime); }
 
     /**
      * This function returns the fraction of time elapsed after the beginning 
      * till the end
      */
diff -NarU5 iperf-2.0.4/src/Client.cpp SVN/iperf/trunk/src/Client.cpp
--- iperf-2.0.4/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/Client.cpp	2009-12-01 12:28:55.922503401 -0500
@@ -114,11 +114,11 @@
 
 const double kSecs_to_usecs = 1e6; 
 const int    kBytes_to_Bits = 8; 
 
 void Client::RunTCP( void ) {
-    long currLen = 0; 
+    unsigned long currLen = 0; 
     struct itimerval it;
     max_size_t totLen = 0;
 
     int err;
 
@@ -168,11 +168,16 @@
             reportstruct->packetLen = currLen;
             ReportPacket( mSettings->reporthdr, reportstruct );
         }	
 
         if ( !mMode_Time ) {
-            mSettings->mAmount -= currLen;
+            /* mAmount may be unsigned, so don't let it underflow! */
+            if( mSettings->mAmount >= currLen ) {
+                mSettings->mAmount -= currLen;
+            } else {
+                mSettings->mAmount = 0;
+            }
         }
 
     } while ( ! (sInterupted  || 
                    (!mMode_Time  &&  0 >= mSettings->mAmount)) && canRead ); 
 
@@ -196,11 +201,11 @@
  * Does not close the socket. 
  * ------------------------------------------------------------------- */ 
 
 void Client::Run( void ) {
     struct UDP_datagram* mBuf_UDP = (struct UDP_datagram*) mBuf; 
-    long currLen = 0; 
+    unsigned long currLen = 0; 
 
     int delay_target = 0; 
     int delay = 0; 
     int adjust = 0; 
 
@@ -308,11 +313,16 @@
         
         if ( delay > 0 ) {
             delay_loop( delay ); 
         }
         if ( !mMode_Time ) {
-            mSettings->mAmount -= currLen;
+            /* mAmount may be unsigned, so don't let it underflow! */
+            if( mSettings->mAmount >= currLen ) {
+                mSettings->mAmount -= currLen;
+            } else {
+                mSettings->mAmount = 0;
+            }
         }
 
     } while ( ! (sInterupted  || 
                  (mMode_Time   &&  mEndTime.before( reportstruct->packetTime ))  || 
                  (!mMode_Time  &&  0 >= mSettings->mAmount)) && canRead ); 
diff -NarU5 iperf-2.0.4/src/main.cpp SVN/iperf/trunk/src/main.cpp
--- iperf-2.0.4/src/main.cpp	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/main.cpp	2009-12-01 12:28:55.924503012 -0500
@@ -286,118 +286,10 @@
 
     // shutdown the thread subsystem
     thread_destroy( );
 } // end cleanup
 
-#ifdef WIN32
-/*--------------------------------------------------------------------
- * ServiceStart
- *
- * each time starting the service, this is the entry point of the service.
- * Start the service, certainly it is on server-mode
- * 
- *-------------------------------------------------------------------- */
-VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) {
-    
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-
-    thread_Settings* ext_gSettings = new thread_Settings;
-
-    // Initialize settings to defaults
-    Settings_Initialize( ext_gSettings );
-    // read settings from environment variables
-    Settings_ParseEnvironment( ext_gSettings );
-    // read settings from command-line parameters
-    Settings_ParseCommandLine( dwArgc, lpszArgv, ext_gSettings );
-
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-
-    // if needed, redirect the output into a specified file
-    if ( !isSTDOUT( ext_gSettings ) ) {
-        redirect( ext_gSettings->mOutputFileName );
-    }
-
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_START_PENDING, // service state
-                             NO_ERROR,              // exit code
-                             3000) )                 // wait hint
-        goto clean;
-    
-    // initialize client(s)
-    if ( ext_gSettings->mThreadMode == kMode_Client ) {
-        client_init( ext_gSettings );
-    }
-
-    // start up the reporter and client(s) or listener
-    {
-        thread_Settings *into = NULL;
-#ifdef HAVE_THREAD
-        Settings_Copy( ext_gSettings, &into );
-        into->mThreadMode = kMode_Reporter;
-        into->runNow = ext_gSettings;
-#else
-        into = ext_gSettings;
-#endif
-        thread_start( into );
-    }
-    
-    // report the status to the service control manager.
-    //
-    if ( !ReportStatusToSCMgr(
-                             SERVICE_RUNNING,       // service state
-                             NO_ERROR,              // exit code
-                             0) )                    // wait hint
-        goto clean;
-
-    clean:
-    // wait for other (client, server) threads to complete
-    thread_joinall();
-}
-
-
-//
-//  FUNCTION: ServiceStop
-//
-//  PURPOSE: Stops the service
-//
-//  PARAMETERS:
-//    none
-//
-//  RETURN VALUE:
-//    none
-//
-//  COMMENTS:
-//    If a ServiceStop procedure is going to
-//    take longer than 3 seconds to execute,
-//    it should spawn a thread to execute the
-//    stop code, and return.  Otherwise, the
-//    ServiceControlManager will believe that
-//    the service has stopped responding.
-//    
-VOID ServiceStop() {
-#ifdef HAVE_THREAD
-    Sig_Interupt( 1 );
-#else
-    sig_exit(1);
-#endif
-}
-
-#endif
 
 
 
 
 
diff -NarU5 iperf-2.0.4/src/ReportDefault.c SVN/iperf/trunk/src/ReportDefault.c
--- iperf-2.0.4/src/ReportDefault.c	2008-04-07 22:37:54.000000000 -0400
+++ SVN/iperf/trunk/src/ReportDefault.c	2009-12-01 12:28:55.923503188 -0500
@@ -65,26 +65,33 @@
 
 /*
  * Prints transfer reports in default style
  */
 void reporter_printstats( Transfer_Info *stats ) {
+    static char header_printed = 0;
 
     byte_snprintf( buffer, sizeof(buffer)/2, (double) stats->TotalLen,
                    toupper( stats->mFormat));
     byte_snprintf( &buffer[sizeof(buffer)/2], sizeof(buffer)/2,
                    stats->TotalLen / (stats->endTime - stats->startTime), 
                    stats->mFormat);
 
     if ( stats->mUDP != (char)kMode_Server ) {
         // TCP Reporting
-        printf( report_bw_header);
+        if( !header_printed ) {
+            printf( report_bw_header);
+            header_printed = 1;
+        }
         printf( report_bw_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2] );
     } else {
         // UDP Reporting
-        printf( report_bw_jitter_loss_header);
+        if( !header_printed ) {
+            printf( report_bw_jitter_loss_header);
+            header_printed = 1;
+        }
         printf( report_bw_jitter_loss_format, stats->transferID, 
                 stats->startTime, stats->endTime, 
                 buffer, &buffer[sizeof(buffer)/2],
                 stats->jitter*1000.0, stats->cntError, stats->cntDatagrams,
                 (100.0 * stats->cntError) / stats->cntDatagrams );
diff -NarU5 iperf-2.0.4/src/service.c SVN/iperf/trunk/src/service.c
--- iperf-2.0.4/src/service.c	2007-08-29 18:06:19.000000000 -0400
+++ SVN/iperf/trunk/src/service.c	2009-12-01 12:28:55.919503097 -0500
@@ -490,6 +490,112 @@
         LocalFree((HLOCAL) lpszTemp );
 
     return lpszBuf;
 }
 
+/*--------------------------------------------------------------------
+ * ServiceStart
+ *
+ * each time starting the service, this is the entry point of the service.
+ * Start the service, certainly it is on server-mode
+ * 
+ *-------------------------------------------------------------------- */
+VOID ServiceStart (DWORD dwArgc, LPTSTR *lpszArgv) {
+    
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+
+    thread_Settings* ext_gSettings = new thread_Settings;
+
+    // Initialize settings to defaults
+    Settings_Initialize( ext_gSettings );
+    // read settings from environment variables
+    Settings_ParseEnvironment( ext_gSettings );
+    // read settings from command-line parameters
+    Settings_ParseCommandLine( dwArgc, lpszArgv, ext_gSettings );
+
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+
+    // if needed, redirect the output into a specified file
+    if ( !isSTDOUT( ext_gSettings ) ) {
+        redirect( ext_gSettings->mOutputFileName );
+    }
+
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_START_PENDING, // service state
+                             NO_ERROR,              // exit code
+                             3000) )                 // wait hint
+        goto clean;
+    
+    // initialize client(s)
+    if ( ext_gSettings->mThreadMode == kMode_Client ) {
+        client_init( ext_gSettings );
+    }
+
+    // start up the reporter and client(s) or listener
+    {
+        thread_Settings *into = NULL;
+#ifdef HAVE_THREAD
+        Settings_Copy( ext_gSettings, &into );
+        into->mThreadMode = kMode_Reporter;
+        into->runNow = ext_gSettings;
+#else
+        into = ext_gSettings;
+#endif
+        thread_start( into );
+    }
+    
+    // report the status to the service control manager.
+    //
+    if ( !ReportStatusToSCMgr(
+                             SERVICE_RUNNING,       // service state
+                             NO_ERROR,              // exit code
+                             0) )                    // wait hint
+        goto clean;
+
+    clean:
+    // wait for other (client, server) threads to complete
+    thread_joinall();
+}
+
+
+//
+//  FUNCTION: ServiceStop
+//
+//  PURPOSE: Stops the service
+//
+//  PARAMETERS:
+//    none
+//
+//  RETURN VALUE:
+//    none
+//
+//  COMMENTS:
+//    If a ServiceStop procedure is going to
+//    take longer than 3 seconds to execute,
+//    it should spawn a thread to execute the
+//    stop code, and return.  Otherwise, the
+//    ServiceControlManager will believe that
+//    the service has stopped responding.
+//    
+VOID ServiceStop() {
+#ifdef HAVE_THREAD
+    Sig_Interupt( 1 );
+#else
+    sig_exit(1);
+#endif
+}
+
 #endif


Index: iperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/EL-5/iperf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- iperf.spec	21 Jan 2009 19:37:53 -0000	1.8
+++ iperf.spec	1 Dec 2009 18:55:14 -0000	1.9
@@ -1,6 +1,6 @@
 Name: iperf
 Version: 2.0.4
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
@@ -8,6 +8,7 @@ URL: http://iperf.sourceforge.net
 Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
 Patch0: iperf-2.0.4-debuginfo.patch
 Patch1: iperf-2.0.4-tcpdual.patch
+Patch2: iperf-2.0.4-svn20091201.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,6 +20,7 @@ jitter, datagram loss.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -37,6 +39,15 @@ jitter, datagram loss.
 %{_bindir}/iperf
 
 %changelog
+* Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-4
+- patched to current svn trunk to address performance issues (#506884)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jan 21 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-1
 - update to 2.0.4
 - patch to avoid tcp/dualtest server from quitting (bugzilla #449796), also submitted to iperf sourceforge ticket tracker (#1983829)



From hadess at fedoraproject.org  Tue Dec  1 18:57:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 18:57:18 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.236,1.237
Message-ID: <20091201185719.02F2811C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-games.spec 
Log Message:
and remove ggz bits


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- gnome-games.spec	1 Dec 2009 17:34:20 -0000	1.236
+++ gnome-games.spec	1 Dec 2009 18:57:18 -0000	1.237
@@ -85,9 +85,6 @@ BuildRequires: gettext
 BuildRequires: autoconf >= 2.60
 BuildRequires: gnome-doc-utils >= 0.3.2
 
-BuildRequires: libggz-devel
-BuildRequires: ggz-client-libs-devel
-Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
 
 Provides: gnome-sudoku
@@ -179,11 +176,6 @@ desktop-file-install --vendor gnome --de
 perl -pi -e 's@<default></default>@<default>[Joe,Jim,James]</default>@g' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
 %endif
 
-# we need this in %%post
-cp gnect/data/gnect-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-cp gnibbles/gnibbles-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-cp iagno/iagno-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-
 # but we don't want this
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
 
@@ -210,8 +202,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-ggz-config -i -f -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
-
 %post extra
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 (cd %{_sysconfdir}/gconf/schemas;   \
@@ -234,9 +224,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-ggz-config -i -f -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
-ggz-config -i -f -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
-
 %pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -282,7 +269,9 @@ if [ "$1" -eq 0 ]; then
 	gnome-sudoku.schemas	    \
 > /dev/null || : )
 
-  ggz-config -r -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
+  if test -f %{_datadir}/ggz/iagno-client.dsc ; then
+    ggz-config -r -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
+  fi
 fi
 
 %preun extra
@@ -304,8 +293,12 @@ if [ "$1" -eq 0 ]; then
 	mahjongg.schemas            \
 > /dev/null || : )
 
-  ggz-config -r -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
-  ggz-config -r -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
+  if test -f %{_datadir}/ggz/gnect-client.dsc ; then
+    ggz-config -r -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
+  fi
+  if test -f %{_datadir}/ggz/gnibbles-client.dsc ; then
+    ggz-config -r -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
+  fi
 fi
 
 %postun
@@ -364,9 +357,6 @@ fi
 %{_sysconfdir}/gconf/schemas/same-gnome.schemas
 %{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
 
-%{_datadir}/ggz/gnome-games
-%{_datadir}/ggz/iagno-client.dsc
-
 # these are not setgid games
 %{_bindir}/sol
 %{_bindir}/gnome-sudoku
@@ -469,9 +459,6 @@ fi
 %{_datadir}/gnome-games/mahjongg
 %{_datadir}/gnome-games/gnotski
 
-%{_datadir}/ggz/gnect-client.dsc
-%{_datadir}/ggz/gnibbles-client.dsc
-
 %{_datadir}/icons/hicolor/*/apps/gnome-blackjack.*
 %{_datadir}/icons/hicolor/*/apps/gnome-freecell.*
 %{_datadir}/icons/hicolor/*/apps/gnome-glchess.*



From pkgdb at fedoraproject.org  Tue Dec  1 19:03:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:03:57 +0000
Subject: [pkgdb] i3status was added for cassmodiah
Message-ID: <20091201190357.367D710F856@bastion2.fedora.phx.redhat.com>

tibbs has added Package i3status with summary Generates a status line for dzen2 or wmii
tibbs has approved Package i3status
tibbs has added a Fedora devel branch for i3status with an owner of cassmodiah
tibbs has approved i3status in Fedora devel
tibbs has approved Package i3status
tibbs has set commit to Approved for 107427 on i3status (Fedora devel)
tibbs has set checkout to Approved for 107427 on i3status (Fedora devel)
tibbs has set build to Approved for 107427 on i3status (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 19:03:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:03:57 +0000
Subject: [pkgdb] i3status summary updated by tibbs
Message-ID: <20091201190357.D1B6210F886@bastion2.fedora.phx.redhat.com>

tibbs set package i3status summary to Generates a status line for dzen2 or wmii

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



From tibbs at fedoraproject.org  Tue Dec  1 19:04:05 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:04:05 +0000 (UTC)
Subject: rpms/i3status - New directory
Message-ID: <20091201190405.1903411C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3status
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsuq5128/rpms/i3status

Log Message:
Directory /cvs/pkgs/rpms/i3status added to the repository




From pkgdb at fedoraproject.org  Tue Dec  1 19:03:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:03:57 +0000
Subject: [pkgdb] i3status (Fedora, 12) updated by tibbs
Message-ID: <20091201190357.D98FC10F891@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for i3status
tibbs has set commit to Approved for 107427 on i3status (Fedora 12)
tibbs has set checkout to Approved for 107427 on i3status (Fedora 12)
tibbs has set build to Approved for 107427 on i3status (Fedora 12)

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



From tibbs at fedoraproject.org  Tue Dec  1 19:04:05 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:04:05 +0000 (UTC)
Subject: rpms/i3status/devel - New directory
Message-ID: <20091201190405.4DF2611C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3status/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsuq5128/rpms/i3status/devel

Log Message:
Directory /cvs/pkgs/rpms/i3status/devel added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 19:04:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:04:13 +0000 (UTC)
Subject: rpms/i3status Makefile,NONE,1.1
Message-ID: <20091201190413.5873511C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3status
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsuq5128/rpms/i3status

Added Files:
	Makefile 
Log Message:
Setup of module i3status


--- NEW FILE Makefile ---
# Top level Makefile for module i3status
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 19:04:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:04:13 +0000 (UTC)
Subject: rpms/i3status/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091201190413.986C811C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/i3status/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsuq5128/rpms/i3status/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: i3status
# $Id: Makefile,v 1.1 2009/12/01 19:04:13 tibbs Exp $
NAME := i3status
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From jussilehtola at fedoraproject.org  Tue Dec  1 19:06:47 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue,  1 Dec 2009 19:06:47 +0000 (UTC)
Subject: rpms/gromacs/devel gromacs.spec,1.17,1.18
Message-ID: <20091201190647.7D51E11C00DE@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	gromacs.spec 
Log Message:
Add MPI devel package requires.


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gromacs.spec	1 Dec 2009 17:08:13 -0000	1.17
+++ gromacs.spec	1 Dec 2009 19:06:47 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -105,6 +105,7 @@ Summary:	GROMACS Open MPI development li
 Group:		Applications/Engineering
 Obsoletes:	gromacs-mpi-devel < %{version}-%{release}
 Requires:	gromacs-devel = %{version}-%{release}
+Requires:	gromacs-openmpi = %{version}-%{release}
 Requires:	openmpi-devel
 
 
@@ -140,6 +141,7 @@ and libraries.
 Summary:	GROMACS MPICH2 development libraries
 Group:		Applications/Engineering
 Requires:	gromacs-devel = %{version}-%{release}
+Requires:	gromacs-mpich2 = %{version}-%{release}
 BuildRequires:	mpich2-devel
 Requires:	mpich2-devel
 
@@ -515,6 +517,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-5
+- Put correct MPI devel package requires in place.
+
 * Tue Dec 01 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-4
 - Fix obsoletes.
 



From pkgdb at fedoraproject.org  Tue Dec  1 19:06:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:06:34 +0000
Subject: [pkgdb] zfs-fuse EL-5 cloned from devel
Message-ID: <20091201190634.6F9A610F856@bastion2.fedora.phx.redhat.com>

tibbs cloned zfs-fuse EL-5 from devel

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



From pkgdb at fedoraproject.org  Tue Dec  1 19:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:08:28 +0000
Subject: [pkgdb] xfce-volumed was added for cwickert
Message-ID: <20091201190828.6253310F874@bastion2.fedora.phx.redhat.com>

tibbs has added Package xfce-volumed with summary Daemon to add additional functionality to the volume keys of the keyboard
tibbs has approved Package xfce-volumed
tibbs has added a Fedora devel branch for xfce-volumed with an owner of cwickert
tibbs has approved xfce-volumed in Fedora devel
tibbs has approved Package xfce-volumed
tibbs has set commit to Approved for 107427 on xfce-volumed (Fedora devel)
tibbs has set checkout to Approved for 107427 on xfce-volumed (Fedora devel)
tibbs has set build to Approved for 107427 on xfce-volumed (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 19:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:08:29 +0000
Subject: [pkgdb] xfce-volumed summary updated by tibbs
Message-ID: <20091201190829.5954D10F887@bastion2.fedora.phx.redhat.com>

tibbs set package xfce-volumed summary to Daemon to add additional functionality to the volume keys of the keyboard

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



From pkgdb at fedoraproject.org  Tue Dec  1 19:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:08:29 +0000
Subject: [pkgdb] xfce-volumed (Fedora, 12) updated by tibbs
Message-ID: <20091201190829.6441110F892@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for xfce-volumed
tibbs has set commit to Approved for 107427 on xfce-volumed (Fedora 12)
tibbs has set checkout to Approved for 107427 on xfce-volumed (Fedora 12)
tibbs has set build to Approved for 107427 on xfce-volumed (Fedora 12)

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



From tibbs at fedoraproject.org  Tue Dec  1 19:08:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:08:36 +0000 (UTC)
Subject: rpms/xfce-volumed - New directory
Message-ID: <20091201190836.1D67A11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xfce-volumed
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsur5937/rpms/xfce-volumed

Log Message:
Directory /cvs/pkgs/rpms/xfce-volumed added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 19:08:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:08:36 +0000 (UTC)
Subject: rpms/xfce-volumed/devel - New directory
Message-ID: <20091201190836.46B9B11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xfce-volumed/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsur5937/rpms/xfce-volumed/devel

Log Message:
Directory /cvs/pkgs/rpms/xfce-volumed/devel added to the repository




From pkgdb at fedoraproject.org  Tue Dec  1 19:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:08:29 +0000
Subject: [pkgdb] xfce-volumed (Fedora, 11) updated by tibbs
Message-ID: <20091201190829.7346410F896@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for xfce-volumed
tibbs has set commit to Approved for 107427 on xfce-volumed (Fedora 11)
tibbs has set checkout to Approved for 107427 on xfce-volumed (Fedora 11)
tibbs has set build to Approved for 107427 on xfce-volumed (Fedora 11)

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



From mclasen at fedoraproject.org  Tue Dec  1 19:08:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 19:08:41 +0000 (UTC)
Subject: rpms/gtk2/F-12 o-minus.patch,1.1,1.2
Message-ID: <20091201190841.51B3711C00DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5312

Modified Files:
	o-minus.patch 
Log Message:
make compose sequences more consistent


o-minus.patch:
 gtkimcontextsimpleseqs.h |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Index: o-minus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/o-minus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- o-minus.patch	1 Dec 2009 17:54:14 -0000	1.1
+++ o-minus.patch	1 Dec 2009 19:08:41 -0000	1.2
@@ -1,29 +1,3 @@
-diff --git a/gtk/gtk-compose-lookaside.txt b/gtk/gtk-compose-lookaside.txt
-index d222101..df0367b 100644
---- a/gtk/gtk-compose-lookaside.txt
-+++ b/gtk/gtk-compose-lookaside.txt
-@@ -186,8 +186,8 @@
- <Multi_key> <greater> <a> 			: "?" U00E2
- <Multi_key> <a> <greater> 			: "?" U00E2
- <Multi_key> <a> <asciicircum> 			: "?" U00E2
--<Multi_key> <minus> <a> 			: "?" U00E3
--<Multi_key> <a> <minus> 			: "?" U00E3
-+<Multi_key> <minus> <a> 			: "?" U0101
-+<Multi_key> <a> <minus> 			: "?" U0101
- <Multi_key> <a> <asciitilde> 			: "?" U00E3
- <Multi_key> <a> <quotedbl> 			: "?" U00E4
- <Multi_key> <a> <diaeresis> 			: "?" U00E4
-@@ -223,8 +223,8 @@
- <Multi_key> <greater> <o> 			: "?" U00F4
- <Multi_key> <o> <greater> 			: "?" U00F4
- <Multi_key> <o> <asciicircum> 			: "?" U00F4
--<Multi_key> <minus> <o> 			: "?" U00F5
--<Multi_key> <o> <minus> 			: "?" U00F5
-+<Multi_key> <minus> <o> 			: "?" U014D
-+<Multi_key> <o> <minus> 			: "?" U014D
- <Multi_key> <o> <asciitilde> 			: "?" U00F5
- <Multi_key> <o> <quotedbl> 			: "?" U00F6
- <Multi_key> <o> <diaeresis> 			: "?" U00F6
 diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h
 index 131b3db..6cf3cc4 100644
 --- a/gtk/gtkimcontextsimpleseqs.h



From tibbs at fedoraproject.org  Tue Dec  1 19:08:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:08:44 +0000 (UTC)
Subject: rpms/xfce-volumed Makefile,NONE,1.1
Message-ID: <20091201190844.60DE911C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xfce-volumed
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsur5937/rpms/xfce-volumed

Added Files:
	Makefile 
Log Message:
Setup of module xfce-volumed


--- NEW FILE Makefile ---
# Top level Makefile for module xfce-volumed
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 19:08:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:08:44 +0000 (UTC)
Subject: rpms/xfce-volumed/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091201190844.9957A11C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xfce-volumed/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsur5937/rpms/xfce-volumed/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce-volumed


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xfce-volumed
# $Id: Makefile,v 1.1 2009/12/01 19:08:44 tibbs Exp $
NAME := xfce-volumed
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Dec  1 19:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:10:00 +0000
Subject: [pkgdb] fedora-accessibility-guide-en-US was added for sparks
Message-ID: <20091201191001.1266410F886@bastion2.fedora.phx.redhat.com>

tibbs has added Package fedora-accessibility-guide-en-US with summary Fedora Accessibility Guide assists people with disabilities in using Fedora on their computers
tibbs has approved Package fedora-accessibility-guide-en-US
tibbs has added a Fedora devel branch for fedora-accessibility-guide-en-US with an owner of sparks
tibbs has approved fedora-accessibility-guide-en-US in Fedora devel
tibbs has approved Package fedora-accessibility-guide-en-US
tibbs has set commit to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora devel)
tibbs has set checkout to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora devel)
tibbs has set build to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-accessibility-guide-en-US



From pkgdb at fedoraproject.org  Tue Dec  1 19:10:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:10:01 +0000
Subject: [pkgdb] fedora-accessibility-guide-en-US summary updated by tibbs
Message-ID: <20091201191002.1E8E210F892@bastion2.fedora.phx.redhat.com>

tibbs set package fedora-accessibility-guide-en-US summary to Fedora Accessibility Guide assists people with disabilities in using Fedora on their computers

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-accessibility-guide-en-US



From pkgdb at fedoraproject.org  Tue Dec  1 19:10:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:10:02 +0000
Subject: [pkgdb] fedora-accessibility-guide-en-US (Fedora,
	11) updated by tibbs
Message-ID: <20091201191002.3022C10F896@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for fedora-accessibility-guide-en-US
tibbs has set commit to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora 11)
tibbs has set checkout to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora 11)
tibbs has set build to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-accessibility-guide-en-US



From tibbs at fedoraproject.org  Tue Dec  1 19:10:09 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:10:09 +0000 (UTC)
Subject: rpms/fedora-accessibility-guide-en-US - New directory
Message-ID: <20091201191009.1A9B211C0396@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fedora-accessibility-guide-en-US
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsfA6383/rpms/fedora-accessibility-guide-en-US

Log Message:
Directory /cvs/pkgs/rpms/fedora-accessibility-guide-en-US added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 19:10:09 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:10:09 +0000 (UTC)
Subject: rpms/fedora-accessibility-guide-en-US/devel - New directory
Message-ID: <20091201191009.45ECA11C04AE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsfA6383/rpms/fedora-accessibility-guide-en-US/devel

Log Message:
Directory /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/devel added to the repository




From pkgdb at fedoraproject.org  Tue Dec  1 19:10:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:10:02 +0000
Subject: [pkgdb] fedora-accessibility-guide-en-US (Fedora,
	12) updated by tibbs
Message-ID: <20091201191002.3D3BD10F89C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for fedora-accessibility-guide-en-US
tibbs has set commit to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora 12)
tibbs has set checkout to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora 12)
tibbs has set build to Approved for 107427 on fedora-accessibility-guide-en-US (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-accessibility-guide-en-US



From tibbs at fedoraproject.org  Tue Dec  1 19:10:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:10:17 +0000 (UTC)
Subject: rpms/fedora-accessibility-guide-en-US Makefile,NONE,1.1
Message-ID: <20091201191017.7D1AB11C0396@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fedora-accessibility-guide-en-US
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsfA6383/rpms/fedora-accessibility-guide-en-US

Added Files:
	Makefile 
Log Message:
Setup of module fedora-accessibility-guide-en-US


--- NEW FILE Makefile ---
# Top level Makefile for module fedora-accessibility-guide-en-US
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Dec  1 19:10:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:10:17 +0000 (UTC)
Subject: rpms/fedora-accessibility-guide-en-US/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091201191017.B3C1C11C0396@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsfA6383/rpms/fedora-accessibility-guide-en-US/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fedora-accessibility-guide-en-US


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fedora-accessibility-guide-en-US
# $Id: Makefile,v 1.1 2009/12/01 19:10:17 tibbs Exp $
NAME := fedora-accessibility-guide-en-US
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Dec  1 19:10:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:10:49 +0000
Subject: [pkgdb] javacsv was added for th0br0
Message-ID: <20091201191049.2ACA210F885@bastion2.fedora.phx.redhat.com>

tibbs has added Package javacsv with summary Stream-based Java library for reading and writing CSV and other delimited data
tibbs has approved Package javacsv
tibbs has added a Fedora devel branch for javacsv with an owner of th0br0
tibbs has approved javacsv in Fedora devel
tibbs has approved Package javacsv
tibbs has set commit to Approved for 107427 on javacsv (Fedora devel)
tibbs has set checkout to Approved for 107427 on javacsv (Fedora devel)
tibbs has set build to Approved for 107427 on javacsv (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 19:10:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:10:49 +0000
Subject: [pkgdb] javacsv summary updated by tibbs
Message-ID: <20091201191050.6C48610F89A@bastion2.fedora.phx.redhat.com>

tibbs set package javacsv summary to Stream-based Java library for reading and writing CSV and other delimited data

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



From pkgdb at fedoraproject.org  Tue Dec  1 19:10:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:10:49 +0000
Subject: [pkgdb] javacsv (Fedora, 12) updated by tibbs
Message-ID: <20091201191050.81C6810F89E@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for javacsv
tibbs has set commit to Approved for 107427 on javacsv (Fedora 12)
tibbs has set checkout to Approved for 107427 on javacsv (Fedora 12)
tibbs has set build to Approved for 107427 on javacsv (Fedora 12)

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



From tibbs at fedoraproject.org  Tue Dec  1 19:10:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:10:57 +0000 (UTC)
Subject: rpms/javacsv - New directory
Message-ID: <20091201191057.24F0111C0396@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/javacsv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiS6715/rpms/javacsv

Log Message:
Directory /cvs/pkgs/rpms/javacsv added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 19:10:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:10:57 +0000 (UTC)
Subject: rpms/javacsv/devel - New directory
Message-ID: <20091201191057.5AFEB11C0396@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/javacsv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiS6715/rpms/javacsv/devel

Log Message:
Directory /cvs/pkgs/rpms/javacsv/devel added to the repository




From tibbs at fedoraproject.org  Tue Dec  1 19:11:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:11:06 +0000 (UTC)
Subject: rpms/javacsv Makefile,NONE,1.1
Message-ID: <20091201191106.113A811C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/javacsv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiS6715/rpms/javacsv

Added Files:
	Makefile 
Log Message:
Setup of module javacsv


--- NEW FILE Makefile ---
# Top level Makefile for module javacsv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Tue Dec  1 19:10:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 19:10:49 +0000
Subject: [pkgdb] javacsv (Fedora, 11) updated by tibbs
Message-ID: <20091201191050.950F110F8A1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for javacsv
tibbs has set commit to Approved for 107427 on javacsv (Fedora 11)
tibbs has set checkout to Approved for 107427 on javacsv (Fedora 11)
tibbs has set build to Approved for 107427 on javacsv (Fedora 11)

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



From tibbs at fedoraproject.org  Tue Dec  1 19:11:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  1 Dec 2009 19:11:06 +0000 (UTC)
Subject: rpms/javacsv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091201191106.62B2211C00DE@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/javacsv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiS6715/rpms/javacsv/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: javacsv
# $Id: Makefile,v 1.1 2009/12/01 19:11:06 tibbs Exp $
NAME := javacsv
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From hadess at fedoraproject.org  Tue Dec  1 19:12:14 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  1 Dec 2009 19:12:14 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.237,1.238
Message-ID: <20091201191214.5678911C00DE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-games.spec 
Log Message:
same-gnome to swell-foop


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- gnome-games.spec	1 Dec 2009 18:57:18 -0000	1.237
+++ gnome-games.spec	1 Dec 2009 19:12:13 -0000	1.238
@@ -193,7 +193,7 @@ gconftool-2 --makefile-install-rule \
 	%{card_schemas}             \
 	gnomine.schemas             \
 	iagno.schemas               \
-	same-gnome.schemas          \
+	swell-foop.schemas          \
 	gnome-sudoku.schemas	    \
 > /dev/null || : )
 
@@ -228,11 +228,12 @@ fi
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
+  if test -f same-gnome.schemas ; then gconftool-2 --makefile-uninstall-rule same-gnome.schemas ; done ; \
+  if test -f swell-foop.schemas ; then gconftool-2 --makefile-uninstall-rule swell-foop.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas}             \
 	gnomine.schemas             \
 	iagno.schemas               \
-	same-gnome.schemas          \
 	gnome-sudoku.schemas	    \
 > /dev/null || : )
 fi
@@ -261,11 +262,12 @@ fi
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
+  if test -f same-gnome.schemas ; then gconftool-2 --makefile-uninstall-rule same-gnome.schemas ; done ; \
+  if test -f swell-foop.schemas ; then gconftool-2 --makefile-uninstall-rule swell-foop.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas}             \
 	gnomine.schemas             \
 	iagno.schemas               \
-	same-gnome.schemas          \
 	gnome-sudoku.schemas	    \
 > /dev/null || : )
 
@@ -321,14 +323,14 @@ fi
 %{_datadir}/applications/gnome-sol.desktop
 %{_datadir}/applications/gnome-gnomine.desktop
 %{_datadir}/applications/gnome-iagno.desktop
-%{_datadir}/applications/gnome-same-gnome.desktop
+%{_datadir}/applications/gnome-swell-foop.desktop
 %{_datadir}/applications/gnome-sudoku.desktop
 
 %dir %{_datadir}/gnome-games
 %{_datadir}/gnome-games/aisleriot
 %{_datadir}/gnome-games/gnomine
 %{_datadir}/gnome-games/iagno
-%{_datadir}/gnome-games/same-gnome
+%{_datadir}/gnome-games/swell-foop
 %{_datadir}/gnome-games/icons
 %{_datadir}/gnome-games/sounds
 %{_datadir}/gnome-games/pixmaps
@@ -338,10 +340,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-aisleriot.*
 %{_datadir}/icons/hicolor/*/apps/gnome-iagno.*
 %{_datadir}/icons/hicolor/*/apps/gnome-mines.*
-%{_datadir}/icons/hicolor/*/apps/gnome-samegnome.*
+%{_datadir}/icons/hicolor/*/apps/gnome-swellfoop.*
 %{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
 
-%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/same-gnome.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/swell-foop.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnomine.*
 
 %{_libdir}/gnome-games
@@ -354,7 +356,7 @@ fi
 %endif
 %{_sysconfdir}/gconf/schemas/gnomine.schemas
 %{_sysconfdir}/gconf/schemas/iagno.schemas
-%{_sysconfdir}/gconf/schemas/same-gnome.schemas
+%{_sysconfdir}/gconf/schemas/swell-foop.schemas
 %{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
 
 # these are not setgid games
@@ -362,11 +364,11 @@ fi
 %{_bindir}/gnome-sudoku
 
 # these are setgid games
-%attr(2551, root, games) %{_bindir}/same-gnome
+%attr(2551, root, games) %{_bindir}/swell-foop
 %attr(2551, root, games) %{_bindir}/iagno
 %attr(2551, root, games) %{_bindir}/gnomine
 
-%{_mandir}/man6/same-gnome.6.gz
+%{_mandir}/man6/swell-foop.6.gz
 %{_mandir}/man6/iagno.6.gz
 %{_mandir}/man6/gnomine.6.gz
 %{_mandir}/man6/gnome-sudoku.6.gz



From rdieter at fedoraproject.org  Tue Dec  1 19:16:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:16:09 +0000 (UTC)
Subject: File kde-settings-4.4-2.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091201191609.62AA210F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-settings:

59a385a78730b66698a3442c6cf51462  kde-settings-4.4-2.tar.bz2



From nhorman at fedoraproject.org  Tue Dec  1 19:16:30 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  1 Dec 2009 19:16:30 +0000 (UTC)
Subject: rpms/kexec-tools/F-12 kexec-tools.spec, 1.154, 1.155 mkdumprd, 1.28,
	1.29
Message-ID: <20091201191630.5EB5911C00DE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8066

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz519767


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-12/kexec-tools.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- kexec-tools.spec	23 Nov 2009 16:20:14 -0000	1.154
+++ kexec-tools.spec	1 Dec 2009 19:16:30 -0000	1.155
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -264,6 +264,9 @@ done
 
 
 %changelog
+* Tue Dec 01 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-29
+- Update to support all raid modes (bz 519767)
+
 * Mon Nov 23 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-28
 - Update firstboot_kdump.py to rawhide version (bz 539812)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-12/mkdumprd,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mkdumprd	15 Jun 2009 16:58:42 -0000	1.28
+++ mkdumprd	1 Dec 2009 19:16:30 -0000	1.29
@@ -188,6 +188,9 @@ findmodule() {
 	findmodule ieee1394
 	findmodule ohci1394
 	modName="sbp2"
+    elif [ "$modName" = "raid6" ]; then
+	findmodule raid456
+        modName="raid456"
     else
 	moduledep $modName
 	for i in $deps; do



From rdieter at fedoraproject.org  Tue Dec  1 19:16:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:16:30 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.68, 1.69 kde-settings.spec,
	1.97, 1.98 sources, 1.70, 1.71
Message-ID: <20091201191630.DA5C411C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8195

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-2
- kdmrc: revert to ServerVTs=-1 (#475890)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	30 Nov 2009 02:28:13 -0000	1.68
+++ .cvsignore	1 Dec 2009 19:16:30 -0000	1.69
@@ -1 +1 @@
-kde-settings-4.4-1.tar.bz2
+kde-settings-4.4-2.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kde-settings.spec	30 Nov 2009 02:28:13 -0000	1.97
+++ kde-settings.spec	1 Dec 2009 19:16:30 -0000	1.98
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F13 ONLY!
 
-%define rel 1
+%define rel 2 
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -160,6 +160,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-2
+- kdmrc: revert to ServerVTs=-1 (#475890)
+
 * Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-1
 - -pulseaudio: drop xine-lib-pulseaudio (subpkg no longer exists)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	30 Nov 2009 02:28:14 -0000	1.70
+++ sources	1 Dec 2009 19:16:30 -0000	1.71
@@ -1 +1 @@
-ef1256dd358820b0f81b4e58cbad6b14  kde-settings-4.4-1.tar.bz2
+59a385a78730b66698a3442c6cf51462  kde-settings-4.4-2.tar.bz2



From timfenn at fedoraproject.org  Tue Dec  1 19:17:13 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Tue,  1 Dec 2009 19:17:13 +0000 (UTC)
Subject: rpms/apbs/devel apbs.spec,1.4,1.5
Message-ID: <20091201191713.1A5AA11C00DE@cvs1.fedora.phx.redhat.com>

Author: timfenn

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

Modified Files:
	apbs.spec 
Log Message:
* Tue Dec 01 2009 Tim Fenn <fenn at stanford.edu> - 1.2.1-2
- add RPM_OPT_FLAGS




Index: apbs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/apbs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- apbs.spec	30 Nov 2009 07:24:42 -0000	1.4
+++ apbs.spec	1 Dec 2009 19:17:12 -0000	1.5
@@ -3,7 +3,7 @@
 Name: apbs
 Summary: Adaptive Poisson Boltzmann Solver
 Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # License of pmgZ, aqua and contrib/blas/mblasd.f is LGPLv2+, the rest is BSD.
 License: LGPLv2+ and BSD
 Group: Applications/Engineering
@@ -92,7 +92,7 @@ rm doc/programmer/html/vpee_8h__incl.map
 rm doc/programmer/html/dummy_8c__incl.map
 
 %build
-%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared FFLAGS="-I/usr/include/atlas" CFLAGS="-DVF77_ONEUNDERSCORE"
+%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared FFLAGS="${RPM_OPT_FLAGS} -I/usr/include/atlas" CFLAGS="${RPM_OPT_FLAGS} -DVF77_ONEUNDERSCORE"
 # die, rpath, die.
 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
@@ -173,6 +173,9 @@ rm -rf %{buildroot}
 %doc doc/programmer/
 
 %changelog
+* Tue Dec 01 2009 Tim Fenn <fenn at stanford.edu> - 1.2.1-2
+- add RPM_OPT_FLAGS
+
 * Wed Nov 25 2009 Tim Fenn <fenn at stanford.edu> - 1.2.1-1
 - update to 1.2.1
 



From rdieter at fedoraproject.org  Tue Dec  1 19:17:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:17:19 +0000 (UTC)
Subject: File kde-settings-4.3-14.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091201191719.CDADD10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-settings:

f5e751cbba0a98201be49aa11ceb355c  kde-settings-4.3-14.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:17:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:17:40 +0000 (UTC)
Subject: rpms/kde-settings/F-12 .cvsignore, 1.67, 1.68 kde-settings.spec,
	1.95, 1.96 sources, 1.69, 1.70
Message-ID: <20091201191740.97B2B11C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8840

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-14
- kdmrc: revert to ServerVTs=-1 (#475890)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	27 Oct 2009 23:33:30 -0000	1.67
+++ .cvsignore	1 Dec 2009 19:17:40 -0000	1.68
@@ -1 +1 @@
-kde-settings-4.3-12.tar.bz2
+kde-settings-4.3-14.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/kde-settings.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kde-settings.spec	29 Nov 2009 21:33:36 -0000	1.95
+++ kde-settings.spec	1 Dec 2009 19:17:40 -0000	1.96
@@ -1,11 +1,11 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 12
+%define rel 14
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}.1
+Release: %{rel}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -164,6 +164,12 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-14
+- kdmrc: revert to ServerVTs=-1 (#475890)
+
+* Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-13
+- {defaults,mimeapps}.list: application/x-bittorrent=kde4-ktorrent.desktop;kde4-kget.desktop;
+
 * Sun Nov 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3-12.1
 - -pulseaudio: Requires: xine-lib-pulseaudio
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	27 Oct 2009 23:33:30 -0000	1.69
+++ sources	1 Dec 2009 19:17:40 -0000	1.70
@@ -1 +1 @@
-6a7e966d2367c7942d9640d01dc88f20  kde-settings-4.3-12.tar.bz2
+f5e751cbba0a98201be49aa11ceb355c  kde-settings-4.3-14.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:18:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:18:41 +0000 (UTC)
Subject: File kde-settings-4.2-13.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091201191841.74CA110F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-settings:

f7b4c69721724d917bbc6b907a57ea4e  kde-settings-4.2-13.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:19:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:19:05 +0000 (UTC)
Subject: rpms/kde-settings/F-11 .cvsignore, 1.58, 1.59 kde-settings.spec,
	1.78, 1.79 sources, 1.59, 1.60
Message-ID: <20091201191905.9CAE511C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9252

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2-13
- kdmrc: revert to ServerVTs=-1 (#475890)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	18 Aug 2009 18:41:41 -0000	1.58
+++ .cvsignore	1 Dec 2009 19:19:05 -0000	1.59
@@ -1 +1 @@
-kde-settings-4.2-12.tar.bz2
+kde-settings-4.2-13.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- kde-settings.spec	31 Aug 2009 18:02:25 -0000	1.78
+++ kde-settings.spec	1 Dec 2009 19:19:05 -0000	1.79
@@ -1,11 +1,11 @@
 # THIS SPECFILE IS FOR F11 ONLY!
 
-%define rel 12
+%define rel 13
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: %{rel}.1 
+Release: %{rel}
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
@@ -154,6 +154,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2-13
+- kdmrc: revert to ServerVTs=-1 (#475890)
+
 * Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-12.1
 - drop Requires: leonidas-kde-theme (#504123)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	18 Aug 2009 18:41:41 -0000	1.59
+++ sources	1 Dec 2009 19:19:05 -0000	1.60
@@ -1 +1 @@
-c7f319fa6844425b01a5415ffd0d7857  kde-settings-4.2-12.tar.bz2
+f7b4c69721724d917bbc6b907a57ea4e  kde-settings-4.2-13.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:20:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:20:09 +0000 (UTC)
Subject: File kde-settings-4.1-9.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091201192009.1383110F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-settings:

082134a5776b9344696a169c38014d7a  kde-settings-4.1-9.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:20:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:20:22 +0000 (UTC)
Subject: rpms/kde-settings/F-10 .cvsignore, 1.50, 1.51 kde-settings.spec,
	1.68, 1.69 sources, 1.50, 1.51
Message-ID: <20091201192022.B14D811C03F6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9682

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1-9
- kdmrc: revert to ServerVTs=-1 (#475890)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	18 Aug 2009 18:42:48 -0000	1.50
+++ .cvsignore	1 Dec 2009 19:20:22 -0000	1.51
@@ -1 +1 @@
-kde-settings-4.1-8.tar.bz2
+kde-settings-4.1-9.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/kde-settings.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- kde-settings.spec	18 Aug 2009 18:42:48 -0000	1.68
+++ kde-settings.spec	1 Dec 2009 19:20:22 -0000	1.69
@@ -3,7 +3,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.1
-Release: 8 
+Release: 9 
 
 Group:   System Environment/Base
 License: Public Domain
@@ -152,6 +152,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1-9
+- kdmrc: revert to ServerVTs=-1 (#475890)
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1-8
 - KPackageKit: [CheckUpdate] interval=86400
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	18 Aug 2009 18:42:48 -0000	1.50
+++ sources	1 Dec 2009 19:20:22 -0000	1.51
@@ -1 +1 @@
-d03dca771ae57b486a2cfdfe238f4faa  kde-settings-4.1-8.tar.bz2
+082134a5776b9344696a169c38014d7a  kde-settings-4.1-9.tar.bz2



From rakesh at fedoraproject.org  Tue Dec  1 19:24:21 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue,  1 Dec 2009 19:24:21 +0000 (UTC)
Subject: File gedit-plugins-2.29.3.tar.bz2 uploaded to lookaside cache by
	rakesh
Message-ID: <20091201192421.7B5D510F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gedit-plugins:

59f0fd9e77fd4a10ad8a334f986c816f  gedit-plugins-2.29.3.tar.bz2



From rakesh at fedoraproject.org  Tue Dec  1 19:25:13 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue,  1 Dec 2009 19:25:13 +0000 (UTC)
Subject: rpms/gedit-plugins/devel .cvsignore, 1.7, 1.8 gedit-plugins.spec,
	1.12, 1.13 import.log, 1.3, 1.4 sources, 1.7, 1.8
Message-ID: <20091201192513.CD08211C00DE@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gedit-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10481/devel

Modified Files:
	.cvsignore gedit-plugins.spec import.log sources 
Log Message:
Updated to 2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Nov 2009 09:35:15 -0000	1.7
+++ .cvsignore	1 Dec 2009 19:25:13 -0000	1.8
@@ -1 +1 @@
-gedit-plugins-2.28.0.tar.bz2
+gedit-plugins-2.29.3.tar.bz2


Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/gedit-plugins.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gedit-plugins.spec	9 Nov 2009 09:35:15 -0000	1.12
+++ gedit-plugins.spec	1 Dec 2009 19:25:13 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           gedit-plugins
-Version:        2.28.0
+Version:        2.29.3
 Release:        1%{?dist}
 Summary:        Plugins for gedit
 
@@ -91,6 +91,9 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Rakesh Pandit <rakesh at fedoraproject.org> 2.29.3-1
+- Updated to 2.29.3
+
 * Mon Nov 09 2009 Rakesh Pandit <rakesh at fedoraproject.org> 2.28.0-1
 - Updated to 2.28.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Nov 2009 09:35:15 -0000	1.3
+++ import.log	1 Dec 2009 19:25:13 -0000	1.4
@@ -1,3 +1,4 @@
 gedit-plugins-2_22_3-1_fc9:HEAD:gedit-plugins-2.22.3-1.fc9.src.rpm:1222710398
 gedit-plugins-2_26_1-1_fc11:HEAD:gedit-plugins-2.26.1-1.fc11.src.rpm:1239459462
 gedit-plugins-2_28_0-1_fc11:HEAD:gedit-plugins-2.28.0-1.fc11.src.rpm:1257759946
+gedit-plugins-2_29_3-1_fc13:HEAD:gedit-plugins-2.29.3-1.fc13.src.rpm:1259696289


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Nov 2009 09:35:15 -0000	1.7
+++ sources	1 Dec 2009 19:25:13 -0000	1.8
@@ -1 +1 @@
-7a0068ef250f2cfe8d60a5cf0e7a7c93  gedit-plugins-2.28.0.tar.bz2
+59f0fd9e77fd4a10ad8a334f986c816f  gedit-plugins-2.29.3.tar.bz2



From jwrdegoede at fedoraproject.org  Tue Dec  1 19:27:01 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 19:27:01 +0000 (UTC)
Subject: rpms/auriferous/F-12 auriferous-1.0.1-extra-keys.patch, NONE,
	1.1 auriferous-1.0.1-silence-looping-warn.patch, NONE,
	1.1 auriferous-1.0.1-fixes.patch, 1.1, 1.2 auriferous.desktop,
	1.2, 1.3 auriferous.spec, 1.8, 1.9
Message-ID: <20091201192701.5475311C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/auriferous/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10762

Modified Files:
	auriferous-1.0.1-fixes.patch auriferous.desktop 
	auriferous.spec 
Added Files:
	auriferous-1.0.1-extra-keys.patch 
	auriferous-1.0.1-silence-looping-warn.patch 
Log Message:
* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
- Fix levels not loading
- Fix getting stuck at top of ladder below bar (in level 2)
- Add support for several non alpha numeric keys in key bindings dialog
- Silence ClanLib warning about sound stream looping not being implemented
- Fix crash on exit (real fix is in ClanLib06, #542178)


auriferous-1.0.1-extra-keys.patch:
 submenu.cpp |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

--- NEW FILE auriferous-1.0.1-extra-keys.patch ---
diff -up auriferous-1.0.1/auriferous/submenu.cpp~ auriferous-1.0.1/auriferous/submenu.cpp
--- auriferous-1.0.1/auriferous/submenu.cpp~	2009-11-29 11:58:15.000000000 +0100
+++ auriferous-1.0.1/auriferous/submenu.cpp	2009-11-29 21:07:24.000000000 +0100
@@ -434,6 +434,7 @@ CL_String Submenu::key_name(int k)
 	case CL_KEY_TAB: str = "Tab"; break;
 	case CL_KEY_ENTER: str = "Enter"; break;
 	case CL_KEY_SPACE: str = "Space"; break;
+	case CL_KEY_BACKSPACE: str = "Backspace"; break;
 	case CL_KEY_INSERT: str = "Insert"; break;
 	case CL_KEY_DELETE: str = "Delete"; break;
 	case CL_KEY_HOME: str = "Home"; break;
@@ -445,6 +446,7 @@ CL_String Submenu::key_name(int k)
 	case CL_KEY_SCRLOCK: str = "Scroll Lock"; break;
 	case CL_KEY_PRINT: str = "Print Screen"; break;
 	case CL_KEY_PAUSE: str = "Pause"; break;
+	case CL_KEY_KP_DECIMAL: str = "KP Period"; break;
 	case CL_KEY_KP_0: str = "KP 0"; break;
 	case CL_KEY_KP_1: str = "KP 1"; break;
 	case CL_KEY_KP_2: str = "KP 2"; break;
@@ -460,6 +462,21 @@ CL_String Submenu::key_name(int k)
 	case CL_KEY_KP_MINUS: str = "KP Minus"; break;
 	case CL_KEY_KP_PLUS: str = "KP Plus"; break;
 	case CL_KEY_KP_ENTER: str = "KP Enter"; break;
+	case CL_KEY_GRAVE: str = "Grave"; break;
+	case CL_KEY_SUBTRACT: str = "Minus"; break;
+	case CL_KEY_EQUALS: str = "Equals"; break;
+	case CL_KEY_LEFT_BRACKET: str = "Left Bracket"; break;
+	case CL_KEY_RIGHT_BRACKET: str = "Right Bracket"; break;
+	case CL_KEY_SEMICOLON: str = "Semicolon"; break;
+	case CL_KEY_QUOTE: str = "Quote"; break;
+	case CL_KEY_COMMA: str = "Comma"; break;
+	case CL_KEY_PERIOD: str = "Period"; break;
+	case CL_KEY_DIVIDE: str = "Divide"; break;
+	case CL_KEY_BACKSLASH: str = "Backslash"; break;
+	case CL_KEY_LWIN: str = "Left Win"; break;
+	case CL_KEY_RWIN: str = "Right Win"; break;
+	case CL_KEY_APPS: str = "Menu"; break;
+	case CL_KEY_COMPOSE: str = "Compose"; break;
 	case CL_NUM_KEYS: str = "CL_NUM_KEYS"; break;
 	case CL_KEY_NONE_OF_THE_ABOVE: str = "unknown"; break;
 	}

auriferous-1.0.1-silence-looping-warn.patch:
 resources.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE auriferous-1.0.1-silence-looping-warn.patch ---
diff -up auriferous-1.0.1/auriferous/resources.cpp~ auriferous-1.0.1/auriferous/resources.cpp
--- auriferous-1.0.1/auriferous/resources.cpp~	2002-05-30 15:23:11.000000000 +0200
+++ auriferous-1.0.1/auriferous/resources.cpp	2009-12-01 11:54:56.000000000 +0100
@@ -489,7 +489,7 @@ CL_SoundBuffer_Session* Resources::Jungl
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/jungle.ogg", res), true);
     jungle = new CL_SoundBuffer_Session(sample->prepare());
-    jungle->set_looping(true);
+    //jungle->set_looping(true);
   }
 	return jungle;
 }
@@ -499,7 +499,7 @@ CL_SoundBuffer_Session* Resources::Tech(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/tech.ogg", res), true);
     tech = new CL_SoundBuffer_Session(sample->prepare());
-    tech->set_looping(true);
+    //tech->set_looping(true);
   }
 	return tech;
 }
@@ -509,7 +509,7 @@ CL_SoundBuffer_Session* Resources::Lava(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/lava.ogg", res), true);
     lava = new CL_SoundBuffer_Session(sample->prepare());
-    lava->set_looping(true);
+    //lava->set_looping(true);
   }
 	return lava;
 }
@@ -519,7 +519,7 @@ CL_SoundBuffer_Session* Resources::Ice()
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/ice.ogg", res), true);
     ice = new CL_SoundBuffer_Session(sample->prepare());
-    ice->set_looping(true);
+    //ice->set_looping(true);
   }
 	return ice;
 }
@@ -529,7 +529,7 @@ CL_SoundBuffer_Session* Resources::Aqua(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/aqua.ogg", res), true);
     aqua = new CL_SoundBuffer_Session(sample->prepare());
-    aqua->set_looping(true);
+    //aqua->set_looping(true);
   }
 	return aqua;
 }

auriferous-1.0.1-fixes.patch:
 auriferous-1.0.1/auriferous/auriferous.cpp |    6 ++-
 auriferous-1.0.1/auriferous/config.cpp     |    4 +-
 auriferous-1.0.1/auriferous/editor.cpp     |    5 ++
 auriferous-1.0.1/auriferous/game.cpp       |    5 ++
 auriferous-1.0.1/auriferous/game.h         |    4 ++
 auriferous-1.0.1/auriferous/global_types.h |    1 
 auriferous-1.0.1/auriferous/mainscreen.cpp |   50 +++++++++++++++++++----------
 auriferous-1.0.1/auriferous/map.cpp        |   18 +++++-----
 auriferous-1.0.1/auriferous/map_sample.cpp |   32 +++++++++++-------
 auriferous-1.0.1/auriferous/menu.cpp       |   13 ++++---
 auriferous-1.0.1/auriferous/monk_ai.cpp    |    6 +--
 auriferous-1.0.1/auriferous/resources.scr  |   10 ++---
 auriferous-1.0.1/auriferous/submenu.cpp    |    8 ++--
 auriferous-1.0.1/auriferous/submenu.h      |    2 -
 auriferous/player.cpp                      |    3 +
 15 files changed, 107 insertions(+), 60 deletions(-)

Index: auriferous-1.0.1-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-12/auriferous-1.0.1-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- auriferous-1.0.1-fixes.patch	31 Jul 2006 18:15:03 -0000	1.1
+++ auriferous-1.0.1-fixes.patch	1 Dec 2009 19:27:01 -0000	1.2
@@ -305,6 +305,18 @@ diff -ur auriferous-1.0.1.orig/auriferou
        objects.sort();
      }
     }
+@@ -270,7 +270,10 @@
+ 	while(!in.eof())
+ 	{
+ 		last=in.get();
+-		a=&last;
++		char buf[2];
++		buf[0] = last;
++		buf[1] = 0;
++		a=buf;
+ 
+ 		if(!in.eof())
+ 		{
 diff -ur auriferous-1.0.1.orig/auriferous/menu.cpp auriferous-1.0.1/auriferous/menu.cpp
 --- auriferous-1.0.1.orig/auriferous/menu.cpp	2002-05-29 19:50:08.000000000 +0200
 +++ auriferous-1.0.1/auriferous/menu.cpp	2006-07-20 20:00:46.000000000 +0200
@@ -422,3 +434,29 @@ diff -ur auriferous-1.0.1.orig/auriferou
  
  private:
  
+--- auriferous-1.0.1/auriferous/editor.cpp~	2002-05-30 16:36:43.000000000 +0200
++++ auriferous-1.0.1/auriferous/editor.cpp	2009-11-29 21:15:28.000000000 +0100
+@@ -562,7 +562,10 @@ void Editor::load_map()
+ 	while(!in.eof())
+ 	{
+ 		last=in.get();
+-		a=&last;
++		char buf[2];
++		buf[0]=last;
++		buf[1]=0;
++		a=buf;
+ 
+ 		if(!in.eof())
+ 		{
+--- auriferous-1.0.1/auriferous/player.cpp	2002-05-30 18:38:35.000000000 +0200
++++ auriferous-1.0.1.new/auriferous/player.cpp	2009-11-30 23:52:58.000000000 +0100
+@@ -344,7 +346,8 @@
+ 			if(sample->map->get_maptile(map_x(16), map_y(16))->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(16)+32)->get_type()==LADDER)
+ 			y=sample->map->get_maptile(map_x(16), map_y(16))->get_y();
+ 		}
+-		else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking())
++		else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking() &&
++		        (sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed())+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed()))->get_type()==LADDER))
+ 		{
+ 			x=sample->map->get_maptile(map_x(16), map_y(16))->get_x();
+ 			sprite->set_new(0.2f, 22, 27);


Index: auriferous.desktop
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-12/auriferous.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- auriferous.desktop	5 Aug 2007 18:36:27 -0000	1.2
+++ auriferous.desktop	1 Dec 2009 19:27:01 -0000	1.3
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Auriferous
 Comment=Game inspired by the classic Loderunner
 Exec=auriferous
-Icon=auriferous.png
+Icon=auriferous
 Terminal=false
 StartupNotify=false
 Type=Application


Index: auriferous.spec
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-12/auriferous.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- auriferous.spec	24 Jul 2009 17:34:43 -0000	1.8
+++ auriferous.spec	1 Dec 2009 19:27:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           auriferous
 Version:        1.0.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Game inspired by the classic Loderunner
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,8 +15,11 @@ Source1:        playerr.png
 Source2:        auriferous.desktop
 Patch0:         auriferous-1.0.1-fixes.patch
 Patch1:         auriferous-1.0.1-destdir.patch
+Patch2:         auriferous-1.0.1-extra-keys.patch
+Patch3:         auriferous-1.0.1-silence-looping-warn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ClanLib06-devel ImageMagick desktop-file-utils
+BuildRequires:  ClanLib06-devel >= ClanLib06-0.6.5-16, desktop-file-utils
+Requires:       hicolor-icon-theme
 
 %description
 An arcade style like game. The goal is to fight out all gold from the caves and
@@ -33,8 +36,10 @@ display cannot handle this you are out o
 %setup -q
 %patch0 -p1 -z .fix
 %patch1 -p1 -z .destdir
+%patch2 -p1 -z .keys
+%patch3 -p1
 touch -r configure.in auriferous/Makefile.am
-cp %{SOURCE1} auriferous/pics/game
+cp -a %{SOURCE1} auriferous/pics/game
 
 
 %build
@@ -65,17 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -87,6 +92,13 @@ fi
 
 
 %changelog
+* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
+- Fix levels not loading
+- Fix getting stuck at top of ladder below bar (in level 2)
+- Add support for several non alpha numeric keys in key bindings dialog
+- Silence ClanLib warning about sound stream looping not being implemented
+- Fix crash on exit (real fix is in ClanLib06, #542178)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nhorman at fedoraproject.org  Tue Dec  1 19:30:56 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  1 Dec 2009 19:30:56 +0000 (UTC)
Subject: rpms/kexec-tools/F-12 kexec-tools.spec,1.155,1.156
Message-ID: <20091201193056.5907E11C00DE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11329

Modified Files:
	kexec-tools.spec 
Log Message:
Resolves: bz519767


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-12/kexec-tools.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kexec-tools.spec	1 Dec 2009 19:16:30 -0000	1.155
+++ kexec-tools.spec	1 Dec 2009 19:30:56 -0000	1.156
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -264,6 +264,9 @@ done
 
 
 %changelog
+* Tue Dec 01 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-30
+- Revision bump (bz 519767)
+
 * Tue Dec 01 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-29
 - Update to support all raid modes (bz 519767)
 



From rdieter at fedoraproject.org  Tue Dec  1 19:34:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:34:59 +0000 (UTC)
Subject: File kde-settings-4.4-3.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091201193459.0BDE410F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-settings:

bc7a9808f1fa21d60ffbd2ffec212bed  kde-settings-4.4-3.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:35:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:35:15 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.69, 1.70 kde-settings.spec,
	1.98, 1.99 sources, 1.71, 1.72
Message-ID: <20091201193515.DF39F11C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12022

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-3
- kdmrc: ServerArgsLocal=-nr , for better transition from plymouth



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Dec 2009 19:16:30 -0000	1.69
+++ .cvsignore	1 Dec 2009 19:35:15 -0000	1.70
@@ -1 +1 @@
-kde-settings-4.4-2.tar.bz2
+kde-settings-4.4-3.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- kde-settings.spec	1 Dec 2009 19:16:30 -0000	1.98
+++ kde-settings.spec	1 Dec 2009 19:35:15 -0000	1.99
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F13 ONLY!
 
-%define rel 2 
+%define rel 3
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -160,6 +160,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-3
+- kdmrc: ServerArgsLocal=-nr , for better transition from plymouth
+
 * Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-2
 - kdmrc: revert to ServerVTs=-1 (#475890)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	1 Dec 2009 19:16:30 -0000	1.71
+++ sources	1 Dec 2009 19:35:15 -0000	1.72
@@ -1 +1 @@
-59a385a78730b66698a3442c6cf51462  kde-settings-4.4-2.tar.bz2
+bc7a9808f1fa21d60ffbd2ffec212bed  kde-settings-4.4-3.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:35:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:35:51 +0000 (UTC)
Subject: File kde-settings-4.3-15.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091201193551.D376A10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-settings:

b1ea48bf2695dee77e6b24e511f74646  kde-settings-4.3-15.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:36:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:36:05 +0000 (UTC)
Subject: rpms/kde-settings/F-12 .cvsignore, 1.68, 1.69 kde-settings.spec,
	1.96, 1.97 sources, 1.70, 1.71
Message-ID: <20091201193605.D41A811C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12265

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-15
- kdmrc: ServerArgsLocal=-nr , for better transition from plymouth



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	1 Dec 2009 19:17:40 -0000	1.68
+++ .cvsignore	1 Dec 2009 19:36:05 -0000	1.69
@@ -1 +1 @@
-kde-settings-4.3-14.tar.bz2
+kde-settings-4.3-15.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/kde-settings.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kde-settings.spec	1 Dec 2009 19:17:40 -0000	1.96
+++ kde-settings.spec	1 Dec 2009 19:36:05 -0000	1.97
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 14
+%define rel 15
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -164,6 +164,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-15
+- kdmrc: ServerArgsLocal=-nr , for better transition from plymouth
+
 * Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-14
 - kdmrc: revert to ServerVTs=-1 (#475890)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	1 Dec 2009 19:17:40 -0000	1.70
+++ sources	1 Dec 2009 19:36:05 -0000	1.71
@@ -1 +1 @@
-f5e751cbba0a98201be49aa11ceb355c  kde-settings-4.3-14.tar.bz2
+b1ea48bf2695dee77e6b24e511f74646  kde-settings-4.3-15.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:36:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:36:49 +0000 (UTC)
Subject: File kde-settings-4.2-14.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091201193649.122E710F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-settings:

fd654a29d03266c5f064af2e0a29134c  kde-settings-4.2-14.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:37:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:37:04 +0000 (UTC)
Subject: rpms/kde-settings/F-11 .cvsignore, 1.59, 1.60 kde-settings.spec,
	1.79, 1.80 sources, 1.60, 1.61
Message-ID: <20091201193704.A108711C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12520

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2-14
- kdmrc: ServerArgsLocal=-nr , for better transition from plymouth



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	1 Dec 2009 19:19:05 -0000	1.59
+++ .cvsignore	1 Dec 2009 19:37:03 -0000	1.60
@@ -1 +1 @@
-kde-settings-4.2-13.tar.bz2
+kde-settings-4.2-14.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- kde-settings.spec	1 Dec 2009 19:19:05 -0000	1.79
+++ kde-settings.spec	1 Dec 2009 19:37:04 -0000	1.80
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F11 ONLY!
 
-%define rel 13
+%define rel 14
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -154,6 +154,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2-14
+- kdmrc: ServerArgsLocal=-nr , for better transition from plymouth
+
 * Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2-13
 - kdmrc: revert to ServerVTs=-1 (#475890)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	1 Dec 2009 19:19:05 -0000	1.60
+++ sources	1 Dec 2009 19:37:04 -0000	1.61
@@ -1 +1 @@
-f7b4c69721724d917bbc6b907a57ea4e  kde-settings-4.2-13.tar.bz2
+fd654a29d03266c5f064af2e0a29134c  kde-settings-4.2-14.tar.bz2



From djuran at fedoraproject.org  Tue Dec  1 19:37:09 2009
From: djuran at fedoraproject.org (David Juran)
Date: Tue,  1 Dec 2009 19:37:09 +0000 (UTC)
Subject: File Vuze_4.3.0.4_source.zip uploaded to lookaside cache by djuran
Message-ID: <20091201193709.0473B10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for azureus:

b5de3ffbcd16d1c69281de21c2550fc8  Vuze_4.3.0.4_source.zip



From djuran at fedoraproject.org  Tue Dec  1 19:38:03 2009
From: djuran at fedoraproject.org (David Juran)
Date: Tue,  1 Dec 2009 19:38:03 +0000 (UTC)
Subject: rpms/azureus/devel .cvsignore, 1.18, 1.19 azureus.spec, 1.81,
	1.82 sources, 1.18, 1.19
Message-ID: <20091201193803.98F2A11C00DE@cvs1.fedora.phx.redhat.com>

Author: djuran

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

Modified Files:
	.cvsignore azureus.spec sources 
Log Message:
- upgrade to 4.3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	21 Nov 2009 11:09:02 -0000	1.18
+++ .cvsignore	1 Dec 2009 19:38:03 -0000	1.19
@@ -1 +1 @@
-Vuze_4.3.0.0_source.zip
+Vuze_4.3.0.4_source.zip


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- azureus.spec	21 Nov 2009 11:09:02 -0000	1.81
+++ azureus.spec	1 Dec 2009 19:38:03 -0000	1.82
@@ -1,7 +1,7 @@
 %define		_newname Vuze
 
 Name:		azureus
-Version:	4.3.0.0
+Version:	4.3.0.4
 Release:	1%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
@@ -242,6 +242,9 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Tue Dec  1 2009 David Juran <djuran at redhat.com> - 4.3.0.4-1
+- upgrade to 4.3.0.4
+
 * Thu Nov 19 2009 David Juran <djuran at redhat.com> - 4.3.0.0-1
 - upgrade to azureus-4.3.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	21 Nov 2009 11:09:02 -0000	1.18
+++ sources	1 Dec 2009 19:38:03 -0000	1.19
@@ -1 +1 @@
-9a0a292bde55e8a90fe64e3625a174fc  Vuze_4.3.0.0_source.zip
+b5de3ffbcd16d1c69281de21c2550fc8  Vuze_4.3.0.4_source.zip



From lmacken at fedoraproject.org  Tue Dec  1 19:40:52 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Dec 2009 19:40:52 +0000 (UTC)
Subject: File liveusb-creator-3.8.8.tar.bz2 uploaded to lookaside cache by
	lmacken
Message-ID: <20091201194052.E700C10F867@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for liveusb-creator:

636ae8a65bb1da5feae29dcec2555e6a  liveusb-creator-3.8.8.tar.bz2



From lmacken at fedoraproject.org  Tue Dec  1 19:41:07 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Dec 2009 19:41:07 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.20, 1.21 import.log, 1.3, 
	1.4 liveusb-creator.spec, 1.29, 1.30 sources, 1.24, 1.25
Message-ID: <20091201194107.6B41A11C03F6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13492/devel

Modified Files:
	.cvsignore import.log liveusb-creator.spec sources 
Log Message:
v3.8.8 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	17 Nov 2009 16:52:43 -0000	1.20
+++ .cvsignore	1 Dec 2009 19:41:07 -0000	1.21
@@ -1 +1 @@
-liveusb-creator-3.8.7.tar.bz2
+liveusb-creator-3.8.8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Nov 2009 00:26:46 -0000	1.3
+++ import.log	1 Dec 2009 19:41:07 -0000	1.4
@@ -1,3 +1,4 @@
 liveusb-creator-2_7-1_fc9:HEAD:liveusb-creator-2.7-1.fc9.src.rpm:1222946226
 liveusb-creator-3_0-1_fc9:HEAD:liveusb-creator-3.0-1.fc9.src.rpm:1222946564
 liveusb-creator-3_8_6-1_fc11:HEAD:liveusb-creator-3.8.6-1.fc11.src.rpm:1257639982
+liveusb-creator-3_8_8-1_fc12:HEAD:liveusb-creator-3.8.8-1.fc12.src.rpm:1259696454


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- liveusb-creator.spec	17 Nov 2009 16:52:43 -0000	1.29
+++ liveusb-creator.spec	1 Dec 2009 19:41:07 -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:           liveusb-creator
-Version:        3.8.7
+Version:        3.8.8
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.8.8-1
+- 3.8.8, bugfix release
+
 * Tue Nov 17 2009 Luke Macken <lmacken at redhat.com> - 3.8.7-1
 - 3.8.7, containing the F12 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	17 Nov 2009 16:52:43 -0000	1.24
+++ sources	1 Dec 2009 19:41:07 -0000	1.25
@@ -1 +1 @@
-cead49aa0349d65d063dc51b8463c553  liveusb-creator-3.8.7.tar.bz2
+636ae8a65bb1da5feae29dcec2555e6a  liveusb-creator-3.8.8.tar.bz2



From rdieter at fedoraproject.org  Tue Dec  1 19:43:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:43:15 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11
	kdebase-workspace-4.3.3-kdm_plymouth.patch, NONE,
	1.1 kdebase-workspace.spec, 1.248, 1.249
Message-ID: <20091201194315.8139211C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14021

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.3-kdm_plymouth.patch 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
- force use of ServerVTs(1), if booting from plymouth (#475890)


kdebase-workspace-4.3.3-kdm_plymouth.patch:
 dm.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE kdebase-workspace-4.3.3-kdm_plymouth.patch ---
diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
--- kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth	2008-07-21 19:03:20.000000000 -0500
+++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-01 12:26:16.435483131 -0600
@@ -1356,6 +1356,9 @@ allocateVT( struct display *d )
 						}
 					}
 				}
+				/* if using plymouth, force use of specified vt.  TODO: query/use activevt */
+				if ((open( "/var/spool/gdm/force-display-on-active-vt", O_RDONLY )) >= 0 )
+					volun = False;
 				if (!volun || !((1 << tvt) & getBusyVTs())) {
 					d->serverVT = tvt;
 					return;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- kdebase-workspace.spec	14 Nov 2009 18:40:36 -0000	1.248
+++ kdebase-workspace.spec	1 Dec 2009 19:43:15 -0000	1.249
@@ -8,7 +8,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -36,6 +36,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
 Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
+Patch18: kdebase-workspace-4.3.3-kdm_plymouth.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -49,9 +50,9 @@ Patch51: http://bazaar.launchpad.net/~ku
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-%if 0%{?with_polkit_09}
 Requires: PolicyKit-authentication-agent
-%else
+
+%if ! 0%{?with_polkit_09}
 Obsoletes: PolicyKit-kde < %{version}-%{release}
 # if/when we actually create this one:
 #Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
@@ -275,6 +276,7 @@ Requires: akonadi
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
+%patch18 -p1 -b .kdm_plymouth
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -613,6 +615,12 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
+- force use of ServerVTs(1), if booting from plymouth (#475890)
+
+* Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7.1
+- Requires: PolicyKit-authentication-agent unconditionally (ie, in F-12 too)
+
 * Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7
 - kubuntu_101_brightness_fn_keys_and_osd.diff (#475247)
 



From rdieter at fedoraproject.org  Tue Dec  1 19:44:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  1 Dec 2009 19:44:01 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.3.3-kdm_plymouth.patch, NONE,
	1.1 kdebase-workspace.spec, 1.198, 1.199
Message-ID: <20091201194401.A623511C00DE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14224

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.3-kdm_plymouth.patch 
Log Message:
* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
- force use of ServerVTs(1), if booting from plymouth (#475890)


kdebase-workspace-4.3.3-kdm_plymouth.patch:
 dm.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE kdebase-workspace-4.3.3-kdm_plymouth.patch ---
diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
--- kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth	2008-07-21 19:03:20.000000000 -0500
+++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-01 12:26:16.435483131 -0600
@@ -1356,6 +1356,9 @@ allocateVT( struct display *d )
 						}
 					}
 				}
+				/* if using plymouth, force use of specified vt.  TODO: query/use activevt */
+				if ((open( "/var/spool/gdm/force-display-on-active-vt", O_RDONLY )) >= 0 )
+					volun = False;
 				if (!volun || !((1 << tvt) & getBusyVTs())) {
 					d->serverVT = tvt;
 					return;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- kdebase-workspace.spec	14 Nov 2009 20:35:39 -0000	1.198
+++ kdebase-workspace.spec	1 Dec 2009 19:44:01 -0000	1.199
@@ -8,7 +8,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -36,6 +36,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
 Patch17: kdebase-workspace-4.3.1-classicmenu-logout.patch
+Patch18: kdebase-workspace-4.3.3-kdm_plymouth.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -49,9 +50,9 @@ Patch51: http://bazaar.launchpad.net/~ku
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-%if 0%{?with_polkit_09}
 Requires: PolicyKit-authentication-agent
-%else
+
+%if ! 0%{?with_polkit_09}
 Obsoletes: PolicyKit-kde < %{version}-%{release}
 # if/when we actually create this one:
 #Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
@@ -275,6 +276,7 @@ Requires: akonadi
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
+%patch18 -p1 -b .kdm_plymouth
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -613,6 +615,12 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
+- force use of ServerVTs(1), if booting from plymouth (#475890)
+
+* Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7.1
+- Requires: PolicyKit-authentication-agent unconditionally (ie, in F-12 too)
+
 * Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7
 - kubuntu_101_brightness_fn_keys_and_osd.diff (#475247)
 



From jwrdegoede at fedoraproject.org  Tue Dec  1 19:55:12 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  1 Dec 2009 19:55:12 +0000 (UTC)
Subject: rpms/auriferous/F-11 auriferous-1.0.1-extra-keys.patch, NONE,
	1.1 auriferous-1.0.1-silence-looping-warn.patch, NONE,
	1.1 auriferous-1.0.1-fixes.patch, 1.1, 1.2 auriferous.desktop,
	1.2, 1.3 auriferous.spec, 1.6, 1.7
Message-ID: <20091201195512.AD3F611C00DE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/auriferous/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16554

Modified Files:
	auriferous-1.0.1-fixes.patch auriferous.desktop 
	auriferous.spec 
Added Files:
	auriferous-1.0.1-extra-keys.patch 
	auriferous-1.0.1-silence-looping-warn.patch 
Log Message:
* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
- Fix levels not loading
- Fix getting stuck at top of ladder below bar (in level 2)
- Add support for several non alpha numeric keys in key bindings dialog
- Silence ClanLib warning about sound stream looping not being implemented
- Fix crash on exit (real fix is in ClanLib06, #542178)


auriferous-1.0.1-extra-keys.patch:
 submenu.cpp |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

--- NEW FILE auriferous-1.0.1-extra-keys.patch ---
diff -up auriferous-1.0.1/auriferous/submenu.cpp~ auriferous-1.0.1/auriferous/submenu.cpp
--- auriferous-1.0.1/auriferous/submenu.cpp~	2009-11-29 11:58:15.000000000 +0100
+++ auriferous-1.0.1/auriferous/submenu.cpp	2009-11-29 21:07:24.000000000 +0100
@@ -434,6 +434,7 @@ CL_String Submenu::key_name(int k)
 	case CL_KEY_TAB: str = "Tab"; break;
 	case CL_KEY_ENTER: str = "Enter"; break;
 	case CL_KEY_SPACE: str = "Space"; break;
+	case CL_KEY_BACKSPACE: str = "Backspace"; break;
 	case CL_KEY_INSERT: str = "Insert"; break;
 	case CL_KEY_DELETE: str = "Delete"; break;
 	case CL_KEY_HOME: str = "Home"; break;
@@ -445,6 +446,7 @@ CL_String Submenu::key_name(int k)
 	case CL_KEY_SCRLOCK: str = "Scroll Lock"; break;
 	case CL_KEY_PRINT: str = "Print Screen"; break;
 	case CL_KEY_PAUSE: str = "Pause"; break;
+	case CL_KEY_KP_DECIMAL: str = "KP Period"; break;
 	case CL_KEY_KP_0: str = "KP 0"; break;
 	case CL_KEY_KP_1: str = "KP 1"; break;
 	case CL_KEY_KP_2: str = "KP 2"; break;
@@ -460,6 +462,21 @@ CL_String Submenu::key_name(int k)
 	case CL_KEY_KP_MINUS: str = "KP Minus"; break;
 	case CL_KEY_KP_PLUS: str = "KP Plus"; break;
 	case CL_KEY_KP_ENTER: str = "KP Enter"; break;
+	case CL_KEY_GRAVE: str = "Grave"; break;
+	case CL_KEY_SUBTRACT: str = "Minus"; break;
+	case CL_KEY_EQUALS: str = "Equals"; break;
+	case CL_KEY_LEFT_BRACKET: str = "Left Bracket"; break;
+	case CL_KEY_RIGHT_BRACKET: str = "Right Bracket"; break;
+	case CL_KEY_SEMICOLON: str = "Semicolon"; break;
+	case CL_KEY_QUOTE: str = "Quote"; break;
+	case CL_KEY_COMMA: str = "Comma"; break;
+	case CL_KEY_PERIOD: str = "Period"; break;
+	case CL_KEY_DIVIDE: str = "Divide"; break;
+	case CL_KEY_BACKSLASH: str = "Backslash"; break;
+	case CL_KEY_LWIN: str = "Left Win"; break;
+	case CL_KEY_RWIN: str = "Right Win"; break;
+	case CL_KEY_APPS: str = "Menu"; break;
+	case CL_KEY_COMPOSE: str = "Compose"; break;
 	case CL_NUM_KEYS: str = "CL_NUM_KEYS"; break;
 	case CL_KEY_NONE_OF_THE_ABOVE: str = "unknown"; break;
 	}

auriferous-1.0.1-silence-looping-warn.patch:
 resources.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE auriferous-1.0.1-silence-looping-warn.patch ---
diff -up auriferous-1.0.1/auriferous/resources.cpp~ auriferous-1.0.1/auriferous/resources.cpp
--- auriferous-1.0.1/auriferous/resources.cpp~	2002-05-30 15:23:11.000000000 +0200
+++ auriferous-1.0.1/auriferous/resources.cpp	2009-12-01 11:54:56.000000000 +0100
@@ -489,7 +489,7 @@ CL_SoundBuffer_Session* Resources::Jungl
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/jungle.ogg", res), true);
     jungle = new CL_SoundBuffer_Session(sample->prepare());
-    jungle->set_looping(true);
+    //jungle->set_looping(true);
   }
 	return jungle;
 }
@@ -499,7 +499,7 @@ CL_SoundBuffer_Session* Resources::Tech(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/tech.ogg", res), true);
     tech = new CL_SoundBuffer_Session(sample->prepare());
-    tech->set_looping(true);
+    //tech->set_looping(true);
   }
 	return tech;
 }
@@ -509,7 +509,7 @@ CL_SoundBuffer_Session* Resources::Lava(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/lava.ogg", res), true);
     lava = new CL_SoundBuffer_Session(sample->prepare());
-    lava->set_looping(true);
+    //lava->set_looping(true);
   }
 	return lava;
 }
@@ -519,7 +519,7 @@ CL_SoundBuffer_Session* Resources::Ice()
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/ice.ogg", res), true);
     ice = new CL_SoundBuffer_Session(sample->prepare());
-    ice->set_looping(true);
+    //ice->set_looping(true);
   }
 	return ice;
 }
@@ -529,7 +529,7 @@ CL_SoundBuffer_Session* Resources::Aqua(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/aqua.ogg", res), true);
     aqua = new CL_SoundBuffer_Session(sample->prepare());
-    aqua->set_looping(true);
+    //aqua->set_looping(true);
   }
 	return aqua;
 }

auriferous-1.0.1-fixes.patch:
 auriferous-1.0.1/auriferous/auriferous.cpp |    6 ++-
 auriferous-1.0.1/auriferous/config.cpp     |    4 +-
 auriferous-1.0.1/auriferous/editor.cpp     |    5 ++
 auriferous-1.0.1/auriferous/game.cpp       |    5 ++
 auriferous-1.0.1/auriferous/game.h         |    4 ++
 auriferous-1.0.1/auriferous/global_types.h |    1 
 auriferous-1.0.1/auriferous/mainscreen.cpp |   50 +++++++++++++++++++----------
 auriferous-1.0.1/auriferous/map.cpp        |   18 +++++-----
 auriferous-1.0.1/auriferous/map_sample.cpp |   32 +++++++++++-------
 auriferous-1.0.1/auriferous/menu.cpp       |   13 ++++---
 auriferous-1.0.1/auriferous/monk_ai.cpp    |    6 +--
 auriferous-1.0.1/auriferous/resources.scr  |   10 ++---
 auriferous-1.0.1/auriferous/submenu.cpp    |    8 ++--
 auriferous-1.0.1/auriferous/submenu.h      |    2 -
 auriferous/player.cpp                      |    3 +
 15 files changed, 107 insertions(+), 60 deletions(-)

Index: auriferous-1.0.1-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-11/auriferous-1.0.1-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- auriferous-1.0.1-fixes.patch	31 Jul 2006 18:15:03 -0000	1.1
+++ auriferous-1.0.1-fixes.patch	1 Dec 2009 19:55:12 -0000	1.2
@@ -305,6 +305,18 @@ diff -ur auriferous-1.0.1.orig/auriferou
        objects.sort();
      }
     }
+@@ -270,7 +270,10 @@
+ 	while(!in.eof())
+ 	{
+ 		last=in.get();
+-		a=&last;
++		char buf[2];
++		buf[0] = last;
++		buf[1] = 0;
++		a=buf;
+ 
+ 		if(!in.eof())
+ 		{
 diff -ur auriferous-1.0.1.orig/auriferous/menu.cpp auriferous-1.0.1/auriferous/menu.cpp
 --- auriferous-1.0.1.orig/auriferous/menu.cpp	2002-05-29 19:50:08.000000000 +0200
 +++ auriferous-1.0.1/auriferous/menu.cpp	2006-07-20 20:00:46.000000000 +0200
@@ -422,3 +434,29 @@ diff -ur auriferous-1.0.1.orig/auriferou
  
  private:
  
+--- auriferous-1.0.1/auriferous/editor.cpp~	2002-05-30 16:36:43.000000000 +0200
++++ auriferous-1.0.1/auriferous/editor.cpp	2009-11-29 21:15:28.000000000 +0100
+@@ -562,7 +562,10 @@ void Editor::load_map()
+ 	while(!in.eof())
+ 	{
+ 		last=in.get();
+-		a=&last;
++		char buf[2];
++		buf[0]=last;
++		buf[1]=0;
++		a=buf;
+ 
+ 		if(!in.eof())
+ 		{
+--- auriferous-1.0.1/auriferous/player.cpp	2002-05-30 18:38:35.000000000 +0200
++++ auriferous-1.0.1.new/auriferous/player.cpp	2009-11-30 23:52:58.000000000 +0100
+@@ -344,7 +346,8 @@
+ 			if(sample->map->get_maptile(map_x(16), map_y(16))->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(16)+32)->get_type()==LADDER)
+ 			y=sample->map->get_maptile(map_x(16), map_y(16))->get_y();
+ 		}
+-		else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking())
++		else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking() &&
++		        (sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed())+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed()))->get_type()==LADDER))
+ 		{
+ 			x=sample->map->get_maptile(map_x(16), map_y(16))->get_x();
+ 			sprite->set_new(0.2f, 22, 27);


Index: auriferous.desktop
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-11/auriferous.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- auriferous.desktop	5 Aug 2007 18:36:27 -0000	1.2
+++ auriferous.desktop	1 Dec 2009 19:55:12 -0000	1.3
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Auriferous
 Comment=Game inspired by the classic Loderunner
 Exec=auriferous
-Icon=auriferous.png
+Icon=auriferous
 Terminal=false
 StartupNotify=false
 Type=Application


Index: auriferous.spec
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-11/auriferous.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- auriferous.spec	10 Apr 2009 07:49:07 -0000	1.6
+++ auriferous.spec	1 Dec 2009 19:55:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           auriferous
 Version:        1.0.1
-Release:        7%{?dist}
+Release:        10%{?dist}
 Summary:        Game inspired by the classic Loderunner
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,8 +15,11 @@ Source1:        playerr.png
 Source2:        auriferous.desktop
 Patch0:         auriferous-1.0.1-fixes.patch
 Patch1:         auriferous-1.0.1-destdir.patch
+Patch2:         auriferous-1.0.1-extra-keys.patch
+Patch3:         auriferous-1.0.1-silence-looping-warn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ClanLib06-devel ImageMagick desktop-file-utils
+BuildRequires:  ClanLib06-devel >= ClanLib06-0.6.5-16, desktop-file-utils
+Requires:       hicolor-icon-theme
 
 %description
 An arcade style like game. The goal is to fight out all gold from the caves and
@@ -33,7 +36,10 @@ display cannot handle this you are out o
 %setup -q
 %patch0 -p1 -z .fix
 %patch1 -p1 -z .destdir
-cp %{SOURCE1} auriferous/pics/game
+%patch2 -p1 -z .keys
+%patch3 -p1
+touch -r configure.in auriferous/Makefile.am
+cp -a %{SOURCE1} auriferous/pics/game
 
 
 %build
@@ -64,17 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -86,6 +92,19 @@ fi
 
 
 %changelog
+* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
+- Fix levels not loading
+- Fix getting stuck at top of ladder below bar (in level 2)
+- Add support for several non alpha numeric keys in key bindings dialog
+- Silence ClanLib warning about sound stream looping not being implemented
+- Fix crash on exit (real fix is in ClanLib06, #542178)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 15 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-8
+- Fix FTBFS caused by automake input file timestamp issues (#511454)
+
 * Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-7
 - Remove non free jungle.ogg song
 



From lmacken at fedoraproject.org  Tue Dec  1 20:03:31 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Dec 2009 20:03:31 +0000 (UTC)
Subject: File liveusb-creator-3.8.9.tar.bz2 uploaded to lookaside cache by
	lmacken
Message-ID: <20091201200331.1339210F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for liveusb-creator:

ce5ff32dfdbda0efc0d3dc5f009588cd  liveusb-creator-3.8.9.tar.bz2



From mbooth at fedoraproject.org  Tue Dec  1 20:03:36 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Tue,  1 Dec 2009 20:03:36 +0000 (UTC)
Subject: File mdt-ocl-1.3.0.tar.gz uploaded to lookaside cache by mbooth
Message-ID: <20091201200336.547C610F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-mdt-ocl:

25f703eae6e4b3a4858dd546760d305f  mdt-ocl-1.3.0.tar.gz



From lmacken at fedoraproject.org  Tue Dec  1 20:04:18 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Dec 2009 20:04:18 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.21, 1.22 import.log, 1.4, 
	1.5 liveusb-creator.spec, 1.30, 1.31 sources, 1.25, 1.26
Message-ID: <20091201200418.3AED211C00DE@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18010/devel

Modified Files:
	.cvsignore import.log liveusb-creator.spec sources 
Log Message:
v3.8.9 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	1 Dec 2009 19:41:07 -0000	1.21
+++ .cvsignore	1 Dec 2009 20:04:17 -0000	1.22
@@ -1 +1 @@
-liveusb-creator-3.8.8.tar.bz2
+liveusb-creator-3.8.9.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	1 Dec 2009 19:41:07 -0000	1.4
+++ import.log	1 Dec 2009 20:04:17 -0000	1.5
@@ -2,3 +2,4 @@ liveusb-creator-2_7-1_fc9:HEAD:liveusb-c
 liveusb-creator-3_0-1_fc9:HEAD:liveusb-creator-3.0-1.fc9.src.rpm:1222946564
 liveusb-creator-3_8_6-1_fc11:HEAD:liveusb-creator-3.8.6-1.fc11.src.rpm:1257639982
 liveusb-creator-3_8_8-1_fc12:HEAD:liveusb-creator-3.8.8-1.fc12.src.rpm:1259696454
+liveusb-creator-3_8_9-1_fc12:HEAD:liveusb-creator-3.8.9-1.fc12.src.rpm:1259697812


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- liveusb-creator.spec	1 Dec 2009 19:41:07 -0000	1.30
+++ liveusb-creator.spec	1 Dec 2009 20:04:18 -0000	1.31
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.8.8
+Version:        3.8.9
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.8.9-1
+- 3.8.9, fixes bug #540255
+
 * Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.8.8-1
 - 3.8.8, bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	1 Dec 2009 19:41:07 -0000	1.25
+++ sources	1 Dec 2009 20:04:18 -0000	1.26
@@ -1 +1 @@
-636ae8a65bb1da5feae29dcec2555e6a  liveusb-creator-3.8.8.tar.bz2
+ce5ff32dfdbda0efc0d3dc5f009588cd  liveusb-creator-3.8.9.tar.bz2



From nhorman at fedoraproject.org  Tue Dec  1 20:04:37 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue,  1 Dec 2009 20:04:37 +0000 (UTC)
Subject: rpms/kexec-tools/F-12 kexec-tools.spec,1.156,1.157
Message-ID: <20091201200437.5DD7E11C00DE@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18144

Modified Files:
	kexec-tools.spec 
Log Message:
Resolves: bz519767


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-12/kexec-tools.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- kexec-tools.spec	1 Dec 2009 19:30:56 -0000	1.156
+++ kexec-tools.spec	1 Dec 2009 20:04:37 -0000	1.157
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -264,6 +264,9 @@ done
 
 
 %changelog
+* Tue Dec 01 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-31
+- Revision bump (bz 519767)
+
 * Tue Dec 01 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-30
 - Revision bump (bz 519767)
 



From mbooth at fedoraproject.org  Tue Dec  1 20:04:57 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Tue,  1 Dec 2009 20:04:57 +0000 (UTC)
Subject: rpms/eclipse-mdt-ocl/devel get-mdt-ocl.sh, NONE,
	1.1 eclipse-mdt-ocl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091201200457.D851211C00DE@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-mdt-ocl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18214/eclipse-mdt-ocl/devel

Modified Files:
	.cvsignore sources 
Added Files:
	get-mdt-ocl.sh eclipse-mdt-ocl.spec 
Log Message:
* Sun Nov 22 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-2
- Use build-classpath when symlinking to dependent bundles.
- Don't pretty-print the package description.

* Tue Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-1
- New OCL spec file based on eclipse-gef.


--- NEW FILE get-mdt-ocl.sh ---
#!/bin/bash
NAME="mdt-ocl"
VERSION=1.3.0
TAG="R200906151742"

echo "Exporting from CVS..."
mkdir $NAME-$VERSION
pushd $NAME-$VERSION >/dev/null

MAPFILE=$NAME.map
TEMPMAPFILE=temp.map
wget "http://download.eclipse.org/modeling/mdt/ocl/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE
dos2unix $MAPFILE
grep ^[a-z] $MAPFILE > $TEMPMAPFILE

gawk 'BEGIN {
	FS=","
}
{
if (NF <  4) {

	split($1, version, "=");
	split(version[1], directory, "@");
	cvsdir=split($2, dirName, ":");
	printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
}
else {

	split($1, version, "=");
	total=split($4, directory, "/");
	cvsdir=split($2, dirName, ":");
	printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
}

}' $TEMPMAPFILE

rm $TEMPMAPFILE $MAPFILE
popd >/dev/null

echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION


--- NEW FILE eclipse-mdt-ocl.spec ---
%global eclipse_base     %{_libdir}/eclipse
%global eclipse_dropin   %{_datadir}/eclipse/dropins

# Note: Use the tag in get-mdt-ocl.sh as the context qualifier because it's
#       later than the tags of the individual plugins.
%global contextQualifier v200906151742

Name:      eclipse-mdt-ocl
Version:   1.3.0
Release:   2%{?dist}
Summary:   Implementation of the OCL OMG metamodel for Eclipse
Group:     System Environment/Libraries
License:   EPL
URL:       http://www.eclipse.org/modeling/mdt/ocl

# source tarball and the script used to generate it from upstream's source control
# script usage:
# $ sh get-mdt-ocl.sh
Source0:   mdt-ocl-%{version}.tar.gz
Source1:   get-mdt-ocl.sh

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

BuildRequires:    java-devel
BuildRequires:    jpackage-utils
BuildRequires:    eclipse-pde >= 1:3.5.0
BuildRequires:    eclipse-emf >= 2.5.0
BuildRequires:    eclipse-mdt-uml2 >= 3.0.0
BuildRequires:    lpg-java-compat = 1.1.0
Requires:         java
Requires:         jpackage-utils
Requires:         eclipse-platform >= 1:3.5.0
Requires:         eclipse-emf >= 2.5.0
Requires:         eclipse-mdt-uml2 >= 3.0.0
Requires:         lpg-java-compat = 1.1.0

%description
OCL is an implementation of the Object Constraint Language (OCL) OMG standard
for EMF-based models. The objectives of the OCL component are to provide APIs
for parsing and evaluating OCL constraints and queries on EMF models, an Ecore
implementation of the OCL abstract syntax model, including support for
serialization of parsed OCL expressions, a Visitor API for analyzing/
transforming the AST model of OCL expressions and an extensibility API for
clients to customize the parsing and evaluation environments used by the
parser.

#TODO - sdk/examples subpackages?

%prep
%setup -q -n mdt-ocl-%{version}

# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
  if [ ! -L $j ]; then
    JARS="$JARS $j"
  fi
done
if [ ! -z "$JARS" ]; then
   echo "These jars should be deleted and symlinked to system jars: $JARS"
   exit 1
fi

mkdir orbitDeps
pushd orbitDeps
ln -s $(build-classpath lpgjavaruntime) net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
popd

# remove spurious exec permissions from docs
find -wholename "*/rootfiles/*" | xargs chmod -x

%build
# build mdt-ocl features
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.ocl \
  -d "emf uml2" -o `pwd`/orbitDeps -a "-DforceContextQualifier=%{contextQualifier}"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.ocl.uml \
  -d "emf uml2" -o `pwd`/orbitDeps -a "-DforceContextQualifier=%{contextQualifier}"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ocl \
  -d "emf uml2" -o `pwd`/orbitDeps -a "-DforceContextQualifier=%{contextQualifier}"

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_dropin}
unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-ocl build/rpmBuild/org.eclipse.ocl.zip
unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-ocl build/rpmBuild/org.eclipse.ocl.uml.zip
unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-ocl build/rpmBuild/org.eclipse.emf.ocl.zip

# use system bundles
pushd %{buildroot}%{eclipse_dropin}/mdt-ocl/eclipse/plugins
rm net.sourceforge.lpg.lpgjavaruntime_*.jar
ln -s ../../../../../../..$(build-classpath lpgjavaruntime) \
  net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{eclipse_dropin}/mdt-ocl
%doc org.eclipse.ocl-feature/rootfiles/*

%changelog
* Sun Nov 22 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-2
- Use build-classpath when symlinking to dependent bundles.
- Don't pretty-print the package description.

* Tue Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-1
- New OCL spec file based on eclipse-gef.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mdt-ocl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:45:32 -0000	1.1
+++ .cvsignore	1 Dec 2009 20:04:57 -0000	1.2
@@ -0,0 +1 @@
+mdt-ocl-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mdt-ocl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:45:32 -0000	1.1
+++ sources	1 Dec 2009 20:04:57 -0000	1.2
@@ -0,0 +1 @@
+25f703eae6e4b3a4858dd546760d305f  mdt-ocl-1.3.0.tar.gz



From mbooth at fedoraproject.org  Tue Dec  1 20:08:50 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Tue,  1 Dec 2009 20:08:50 +0000 (UTC)
Subject: File emf-query-1.3.0.tar.gz uploaded to lookaside cache by mbooth
Message-ID: <20091201200850.69DF310F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-emf-query:

f55ce87a31658c7316094d214054031b  emf-query-1.3.0.tar.gz



From lmacken at fedoraproject.org  Tue Dec  1 20:10:35 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Dec 2009 20:10:35 +0000 (UTC)
Subject: File liveusb-creator-3.9.tar.bz2 uploaded to lookaside cache by
	lmacken
Message-ID: <20091201201035.A716310F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for liveusb-creator:

ec6f0162528aaf51481815f6a909174c  liveusb-creator-3.9.tar.bz2



From lmacken at fedoraproject.org  Tue Dec  1 20:10:52 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Dec 2009 20:10:52 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.22, 1.23 import.log, 1.5, 
	1.6 liveusb-creator.spec, 1.31, 1.32 sources, 1.26, 1.27
Message-ID: <20091201201052.B3D2711C03F6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19191/devel

Modified Files:
	.cvsignore import.log liveusb-creator.spec sources 
Log Message:
v3.9 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	1 Dec 2009 20:04:17 -0000	1.22
+++ .cvsignore	1 Dec 2009 20:10:52 -0000	1.23
@@ -1 +1 @@
-liveusb-creator-3.8.9.tar.bz2
+liveusb-creator-3.9.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	1 Dec 2009 20:04:17 -0000	1.5
+++ import.log	1 Dec 2009 20:10:52 -0000	1.6
@@ -3,3 +3,4 @@ liveusb-creator-3_0-1_fc9:HEAD:liveusb-c
 liveusb-creator-3_8_6-1_fc11:HEAD:liveusb-creator-3.8.6-1.fc11.src.rpm:1257639982
 liveusb-creator-3_8_8-1_fc12:HEAD:liveusb-creator-3.8.8-1.fc12.src.rpm:1259696454
 liveusb-creator-3_8_9-1_fc12:HEAD:liveusb-creator-3.8.9-1.fc12.src.rpm:1259697812
+liveusb-creator-3_9-1_fc12:HEAD:liveusb-creator-3.9-1.fc12.src.rpm:1259698237


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- liveusb-creator.spec	1 Dec 2009 20:04:18 -0000	1.31
+++ liveusb-creator.spec	1 Dec 2009 20:10:52 -0000	1.32
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.8.9
+Version:        3.9
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.9-1
+- 3.9 release
+
 * Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.8.9-1
 - 3.8.9, fixes bug #540255
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	1 Dec 2009 20:04:18 -0000	1.26
+++ sources	1 Dec 2009 20:10:52 -0000	1.27
@@ -1 +1 @@
-ce5ff32dfdbda0efc0d3dc5f009588cd  liveusb-creator-3.8.9.tar.bz2
+ec6f0162528aaf51481815f6a909174c  liveusb-creator-3.9.tar.bz2



From mbooth at fedoraproject.org  Tue Dec  1 20:10:49 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Tue,  1 Dec 2009 20:10:49 +0000 (UTC)
Subject: rpms/eclipse-emf-query/devel get-emf-query.sh, NONE,
	1.1 eclipse-emf-query.spec, NONE, 1.1 sources, 1.1,
	1.2 .cvsignore, 1.1, 1.2
Message-ID: <20091201201049.A3F0011C03F6@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-emf-query/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19156/eclipse-emf-query/devel

Modified Files:
	sources .cvsignore 
Added Files:
	get-emf-query.sh eclipse-emf-query.spec 
Log Message:
* Sun Nov 22 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-2
- Don't pretty-print the package description.
- Remove spurious executable permissions from docs.

* Fri Nov 13 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-1
- New query spec file based on eclipse-gef.



--- NEW FILE get-emf-query.sh ---
#!/bin/bash
NAME="emf-query"
VERSION=1.3.0
TAG="R200906221200"

echo "Exporting from CVS..."
mkdir $NAME-$VERSION
pushd $NAME-$VERSION >/dev/null

MAPFILE=$NAME.map
TEMPMAPFILE=temp.map
wget "http://download.eclipse.org/modeling/emf/query/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE
dos2unix $MAPFILE
grep ^[a-z] $MAPFILE > $TEMPMAPFILE

gawk 'BEGIN {
	FS=","
}
{
if (NF <  4) {

	split($1, version, "=");
	split(version[1], directory, "@");
	cvsdir=split($2, dirName, ":");
	printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
}
else {

	split($1, version, "=");
	total=split($4, directory, "/");
	cvsdir=split($2, dirName, ":");
	printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
}

}' $TEMPMAPFILE

rm $TEMPMAPFILE $MAPFILE
popd >/dev/null

echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION


--- NEW FILE eclipse-emf-query.spec ---
%global eclipse_base     %{_libdir}/eclipse
%global eclipse_dropin   %{_datadir}/eclipse/dropins

# Note: Use the tag in get-mdt-ocl.sh as the context qualifier because it's
#       later than the tags of the individual plugins.
%global contextQualifier v200906221200

Name:      eclipse-emf-query
Version:   1.3.0
Release:   2%{?dist}
Summary:   Specify and execute queries against EMF models
Group:     System Environment/Libraries
License:   EPL
URL:       http://www.eclipse.org/modeling/emf/?project=query

# source tarball and the script used to generate it from upstream's source control
# script usage:
# $ sh get-emf-query.sh
Source0:   emf-query-%{version}.tar.gz
Source1:   get-emf-query.sh

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

BuildRequires:    java-devel
BuildRequires:    jpackage-utils
BuildRequires:    eclipse-pde >= 1:3.5.0
BuildRequires:    eclipse-emf >= 2.5.0
BuildRequires:    eclipse-mdt-ocl >= 1.3.0
Requires:         java
Requires:         jpackage-utils
Requires:         eclipse-platform >= 1:3.5.0
Requires:         eclipse-emf >= 2.5.0
Requires:         eclipse-mdt-ocl >= 1.3.0

%description
The query component facilitates the process of search and retrieval of model
elements of interest in a flexible yet controlled and structured manner.
Provides API support for the basic EObject based Condition objects that are
used to formulate queries for EMF models.

#TODO - sdk/examples subpackages?

%prep
%setup -q -n emf-query-%{version}

# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
  if [ ! -L $j ]; then
    JARS="$JARS $j"
  fi
done
if [ ! -z "$JARS" ]; then
   echo "These jars should be deleted and symlinked to system jars: $JARS"
   exit 1
fi

# remove spurious exec permissions from docs
find -wholename "*/rootfiles/*" | xargs chmod -x

%build
# build emf-query features
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.query \
  -d "emf ocl" -a "-DforceContextQualifier=%{contextQualifier}"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.query.ocl \
  -d "emf ocl" -a "-DforceContextQualifier=%{contextQualifier}"

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_dropin}
unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-query build/rpmBuild/org.eclipse.emf.query.zip
unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-query build/rpmBuild/org.eclipse.emf.query.ocl.zip

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{eclipse_dropin}/emf-query
%doc org.eclipse.emf.query-feature/rootfiles/*

%changelog
* Sun Nov 22 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-2
- Don't pretty-print the package description.
- Remove spurious executable permissions from docs.

* Fri Nov 13 2009 Mat Booth <fedora at matbooth.co.uk> 1.3.0-1
- New query spec file based on eclipse-gef.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf-query/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:46:13 -0000	1.1
+++ sources	1 Dec 2009 20:10:49 -0000	1.2
@@ -0,0 +1 @@
+f55ce87a31658c7316094d214054031b  emf-query-1.3.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-emf-query/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:46:12 -0000	1.1
+++ .cvsignore	1 Dec 2009 20:10:49 -0000	1.2
@@ -0,0 +1 @@
+emf-query-1.3.0.tar.gz



From lmacken at fedoraproject.org  Tue Dec  1 20:17:51 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Dec 2009 20:17:51 +0000 (UTC)
Subject: rpms/liveusb-creator/F-12 .cvsignore, 1.19, 1.20 import.log, 1.3,
	1.4 liveusb-creator.spec, 1.29, 1.30 sources, 1.24, 1.25
Message-ID: <20091201201751.8980511C00DE@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20424/F-12

Modified Files:
	.cvsignore import.log liveusb-creator.spec sources 
Log Message:
v3.9 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	8 Nov 2009 00:36:54 -0000	1.19
+++ .cvsignore	1 Dec 2009 20:17:51 -0000	1.20
@@ -1 +1 @@
-liveusb-creator-3.8.6.tar.bz2
+liveusb-creator-3.9.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Nov 2009 00:36:54 -0000	1.3
+++ import.log	1 Dec 2009 20:17:51 -0000	1.4
@@ -1,3 +1,4 @@
 liveusb-creator-2_7-1_fc9:HEAD:liveusb-creator-2.7-1.fc9.src.rpm:1222946226
 liveusb-creator-3_0-1_fc9:HEAD:liveusb-creator-3.0-1.fc9.src.rpm:1222946564
 liveusb-creator-3_8_6-1_fc11:F-12:liveusb-creator-3.8.6-1.fc11.src.rpm:1257640593
+liveusb-creator-3_9-1_fc12:F-12:liveusb-creator-3.9-1.fc12.src.rpm:1259698656


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-12/liveusb-creator.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- liveusb-creator.spec	17 Nov 2009 16:58:26 -0000	1.29
+++ liveusb-creator.spec	1 Dec 2009 20:17:51 -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:           liveusb-creator
-Version:        3.8.7
+Version:        3.9
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,15 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.9-1
+- 3.9 release
+
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.8.9-1
+- 3.8.9, fixes bug #540255
+
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.8.8-1
+- 3.8.8, bugfix release
+
 * Tue Nov 17 2009 Luke Macken <lmacken at redhat.com> - 3.8.7-1
 - 3.8.7, containing the F12 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	17 Nov 2009 16:58:26 -0000	1.24
+++ sources	1 Dec 2009 20:17:51 -0000	1.25
@@ -1 +1 @@
-cead49aa0349d65d063dc51b8463c553  liveusb-creator-3.8.7.tar.bz2
+ec6f0162528aaf51481815f6a909174c  liveusb-creator-3.9.tar.bz2



From lmacken at fedoraproject.org  Tue Dec  1 20:18:54 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  1 Dec 2009 20:18:54 +0000 (UTC)
Subject: rpms/liveusb-creator/F-11 .cvsignore, 1.18, 1.19 import.log, 1.3,
	1.4 liveusb-creator.spec, 1.26, 1.27 sources, 1.23, 1.24
Message-ID: <20091201201854.5C7FC11C00DE@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21309/F-11

Modified Files:
	.cvsignore import.log liveusb-creator.spec sources 
Log Message:
v3.9 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	8 Nov 2009 00:40:27 -0000	1.18
+++ .cvsignore	1 Dec 2009 20:18:54 -0000	1.19
@@ -1 +1 @@
-liveusb-creator-3.8.6.tar.bz2
+liveusb-creator-3.9.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Nov 2009 00:40:27 -0000	1.3
+++ import.log	1 Dec 2009 20:18:54 -0000	1.4
@@ -1,3 +1,4 @@
 liveusb-creator-2_7-1_fc9:HEAD:liveusb-creator-2.7-1.fc9.src.rpm:1222946226
 liveusb-creator-3_0-1_fc9:HEAD:liveusb-creator-3.0-1.fc9.src.rpm:1222946564
 liveusb-creator-3_8_6-1_fc11:F-11:liveusb-creator-3.8.6-1.fc11.src.rpm:1257640788
+liveusb-creator-3_9-1_fc12:F-11:liveusb-creator-3.9-1.fc12.src.rpm:1259698714


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/liveusb-creator.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- liveusb-creator.spec	17 Nov 2009 16:58:36 -0000	1.26
+++ liveusb-creator.spec	1 Dec 2009 20:18:54 -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:           liveusb-creator
-Version:        3.8.7
+Version:        3.9
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,15 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.9-1
+- 3.9 release
+
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.8.9-1
+- 3.8.9, fixes bug #540255
+
+* Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.8.8-1
+- 3.8.8, bugfix release
+
 * Tue Nov 17 2009 Luke Macken <lmacken at redhat.com> - 3.8.7-1
 - 3.8.7, containing the F12 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	17 Nov 2009 16:58:36 -0000	1.23
+++ sources	1 Dec 2009 20:18:54 -0000	1.24
@@ -1 +1 @@
-cead49aa0349d65d063dc51b8463c553  liveusb-creator-3.8.7.tar.bz2
+ec6f0162528aaf51481815f6a909174c  liveusb-creator-3.9.tar.bz2



From caolanm at fedoraproject.org  Tue Dec  1 20:19:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  1 Dec 2009 20:19:22 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.vcl108.patch,1.1,1.2
Message-ID: <20091201201922.AF10611C00DE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21474

Modified Files:
	workspace.vcl108.patch 
Log Message:
add some un-initialized variables fixes

workspace.vcl108.patch:
 source/gdi/pdfwriter_impl.hxx       |    3 +
 unx/source/dtrans/X11_selection.cxx |   92 ++++++++++++++++++++++++++++++++----
 unx/source/dtrans/X11_selection.hxx |   18 ++++++-
 util/makefile.mk                    |    1 
 4 files changed, 102 insertions(+), 12 deletions(-)

Index: workspace.vcl108.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl108.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.vcl108.patch	27 Nov 2009 13:10:04 -0000	1.1
+++ workspace.vcl108.patch	1 Dec 2009 20:19:22 -0000	1.2
@@ -212,3 +212,30 @@ diff -ru vcl/util/makefile.mk vcl/util/m
              $(CPPUHELPERLIB) \
              $(CPPULIB) \
              $(SALLIB)
+diff -ru vcl/source/gdi/pdfwriter_impl.hxx vcl/source/gdi/pdfwriter_impl.hxx
+--- vcl/source/gdi/pdfwriter_impl.hxx	2009-12-01 15:26:48.000000000 +0000
++++ vcl/source/gdi/pdfwriter_impl.hxx	2009-12-01 15:30:18.000000000 +0000
+@@ -679,6 +679,7 @@
+                 m_aOverlineColor( COL_TRANSPARENT ),
+                 m_nAntiAlias( 1 ),
+                 m_nLayoutMode( 0 ),
++                m_aDigitLanguage( 0 ),
+                 m_nTransparentPercent( 0 ),
+                 m_nFlags( 0xffff ),
+                 m_nUpdateFlags( 0xffff )
+@@ -693,6 +694,7 @@
+                 m_aClipRegion( rState.m_aClipRegion ),
+                 m_nAntiAlias( rState.m_nAntiAlias ),
+                 m_nLayoutMode( rState.m_nLayoutMode ),
++                m_aDigitLanguage( rState.m_aDigitLanguage ),
+                 m_nTransparentPercent( rState.m_nTransparentPercent ),
+                 m_nFlags( rState.m_nFlags ),
+                 m_nUpdateFlags( rState.m_nUpdateFlags )
+@@ -710,6 +712,7 @@
+             m_aClipRegion			= rState.m_aClipRegion;
+             m_nAntiAlias			= rState.m_nAntiAlias;
+             m_nLayoutMode			= rState.m_nLayoutMode;
++            m_aDigitLanguage        = rState.m_aDigitLanguage;
+             m_nTransparentPercent	= rState.m_nTransparentPercent;
+             m_nFlags				= rState.m_nFlags;
+             m_nUpdateFlags          = rState.m_nUpdateFlags;



From lucilanga at fedoraproject.org  Tue Dec  1 20:22:30 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  1 Dec 2009 20:22:30 +0000 (UTC)
Subject: rpms/cpmtools/F-12 cpmtools.spec,1.6,1.7
Message-ID: <20091201202230.4A14711C00DE@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/cpmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21904

Modified Files:
	cpmtools.spec 
Log Message:
* Tue Dec 01 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-3
- fix patch apply


Index: cpmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/F-12/cpmtools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cpmtools.spec	1 Dec 2009 08:36:34 -0000	1.6
+++ cpmtools.spec	1 Dec 2009 20:22:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		cpmtools
 Version:	2.11
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Programs for accessing CP/M disks
 
 Group:		Applications/System
@@ -8,6 +8,7 @@ License:	GPLv3+
 URL:		http://www.moria.de/~michael/cpmtools/
 Source0:	http://www.moria.de/~michael/cpmtools/cpmtools-%{version}.tar.gz
 Patch0:		cpmtools-2.11-nostrip.patch
+Patch1:		cpmtools-2.11-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -22,6 +23,7 @@ exchange with a Z80-PC simulator, but it
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .nostrip
+%patch1 -p1 -b .overflow
 sed -i -e "s!@datarootdir@/diskdefs!\$\(DATADIR\)/diskdefs!" Makefile.in
 #modify path contained in man files
 sed -i -e "s!@DATADIR@!%{_datadir}/%{name}!" *.1.in
@@ -54,8 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 01 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-3
+- fix patch apply
+
 * Tue Dec 01 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-2
-- new upstream release
+- add patch to fix a crash in cpmls
 
 * Sun Nov 29 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-1
 - new upstream release



From lucilanga at fedoraproject.org  Tue Dec  1 20:24:26 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  1 Dec 2009 20:24:26 +0000 (UTC)
Subject: rpms/cpmtools/F-11 cpmtools.spec,1.4,1.5
Message-ID: <20091201202426.4E8CA11C00DE@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	cpmtools.spec 
Log Message:
fix patch apply


Index: cpmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/F-11/cpmtools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cpmtools.spec	1 Dec 2009 08:55:35 -0000	1.4
+++ cpmtools.spec	1 Dec 2009 20:24:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		cpmtools
 Version:	2.11
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Programs for accessing CP/M disks
 
 Group:		Applications/System
@@ -8,6 +8,7 @@ License:	GPLv3+
 URL:		http://www.moria.de/~michael/cpmtools/
 Source0:	http://www.moria.de/~michael/cpmtools/cpmtools-%{version}.tar.gz
 Patch0:		cpmtools-2.11-nostrip.patch
+Patch1:		cpmtools-2.11-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -22,6 +23,7 @@ exchange with a Z80-PC simulator, but it
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .nostrip
+%patch1 -p1 -b .overflow
 sed -i -e "s!@datarootdir@/diskdefs!\$\(DATADIR\)/diskdefs!" Makefile.in
 #modify path contained in man files
 sed -i -e "s!@DATADIR@!%{_datadir}/%{name}!" *.1.in
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 01 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-3
+- fix patch apply
+
 * Tue Dec 01 2009 Lucian Langa <cooly at gnome.eu.org> - 2.11-2
 - new upstream release
 



From sailer at fedoraproject.org  Tue Dec  1 20:32:45 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue,  1 Dec 2009 20:32:45 +0000 (UTC)
Subject: File qt-everywhere-opensource-src-4.6.0.tar.gz uploaded to lookaside
	cache by sailer
Message-ID: <20091201203245.C119910F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mingw32-qt:

2a7b5126f2450d8525af355fc4c12ad6  qt-everywhere-opensource-src-4.6.0.tar.gz



From dwalsh at fedoraproject.org  Tue Dec  1 20:46:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 20:46:55 +0000 (UTC)
Subject: File libsemanage-2.0.43.tgz uploaded to lookaside cache by dwalsh
Message-ID: <20091201204655.290C910F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libsemanage:

fb11e8dfb69cefbd014419804df82294  libsemanage-2.0.43.tgz



From dwalsh at fedoraproject.org  Tue Dec  1 20:47:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 20:47:06 +0000 (UTC)
Subject: File libselinux-2.0.90.tgz uploaded to lookaside cache by dwalsh
Message-ID: <20091201204706.2A87710F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libselinux:

87c744d919d632502ca91ca213c2168f  libselinux-2.0.90.tgz



From dwalsh at fedoraproject.org  Tue Dec  1 20:47:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 20:47:15 +0000 (UTC)
Subject: File policycoreutils-2.0.78.tgz uploaded to lookaside cache by
	dwalsh
Message-ID: <20091201204715.09BB410F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for policycoreutils:

96b2e73550b7e36daee0f5d347c8a95b  policycoreutils-2.0.78.tgz



From dwalsh at fedoraproject.org  Tue Dec  1 20:47:20 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 20:47:20 +0000 (UTC)
Subject: File checkpolicy-2.0.21.tgz uploaded to lookaside cache by dwalsh
Message-ID: <20091201204720.56B7F10F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for checkpolicy:

c95a8fd53be09715f6652cc93fcd646d  checkpolicy-2.0.21.tgz



From dwalsh at fedoraproject.org  Tue Dec  1 20:49:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 20:49:26 +0000 (UTC)
Subject: File sepolgen-1.0.19.tgz uploaded to lookaside cache by dwalsh
Message-ID: <20091201204926.9EFF610F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for policycoreutils:

2ae1a9f7242e33413aae036d2edeb1d8  sepolgen-1.0.19.tgz



From pkgdb at fedoraproject.org  Tue Dec  1 20:52:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:52:21 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchbugzilla
Message-ID: <20091201205221.5B2A910F85F@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchbugzilla acl on clojure (Fedora devel)

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



From nalin at fedoraproject.org  Tue Dec  1 20:52:43 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  1 Dec 2009 20:52:43 +0000 (UTC)
Subject: rpms/cracklib/devel cracklib-2.8.15-suffix.patch, NONE,
	1.1 cracklib-2.8.13-suffix.patch, 1.1, NONE
Message-ID: <20091201205243.349CC11C00DE@cvs1.fedora.phx.redhat.com>

Author: nalin

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

Added Files:
	cracklib-2.8.15-suffix.patch 
Removed Files:
	cracklib-2.8.13-suffix.patch 
Log Message:
- report the filename we passed to lstat() when we treat its error return
  as an exception


cracklib-2.8.15-suffix.patch:
 _cracklibmodule.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cracklib-2.8.15-suffix.patch ---
Where possible, actually use the name of the file that we couldn't find.
SF#2907104.

diff -up cracklib-2.8.15/python/_cracklibmodule.c cracklib-2.8.15/python/_cracklibmodule.c
--- cracklib-2.8.15/python/_cracklibmodule.c	2009-11-18 18:58:20.000000000 -0500
+++ cracklib-2.8.15/python/_cracklibmodule.c	2009-12-01 15:14:21.000000000 -0500
@@ -101,7 +101,7 @@ _cracklib_FascistCheck(PyObject *self, P
         sprintf(dictfile, "%s" DICT_SUFFIX, dict);
         if (lstat(dictfile, &st) == -1)
         {
-            PyErr_SetFromErrnoWithFilename(PyExc_OSError, dict);
+            PyErr_SetFromErrnoWithFilename(PyExc_OSError, dictfile);
             free(dictfile);
             return NULL;
         }
@@ -123,7 +123,7 @@ _cracklib_FascistCheck(PyObject *self, P
         sprintf(dictfile, "%s" DICT_SUFFIX, defaultdict);
         if (lstat(dictfile, &st) == -1)
         {
-            PyErr_SetFromErrnoWithFilename(PyExc_OSError, defaultdict);
+            PyErr_SetFromErrnoWithFilename(PyExc_OSError, dictfile);
             free(defaultdict);
             free(dictfile);
             return NULL;


--- cracklib-2.8.13-suffix.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Dec  1 20:52:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:52:45 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchbugzilla
Message-ID: <20091201205245.8F2DA10F861@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchbugzilla acl on clojure (Fedora devel)

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



From nalin at fedoraproject.org  Tue Dec  1 20:53:07 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  1 Dec 2009 20:53:07 +0000 (UTC)
Subject: rpms/cracklib/devel cracklib-2.8.15-init.patch,NONE,1.1
Message-ID: <20091201205307.9797511C00DE@cvs1.fedora.phx.redhat.com>

Author: nalin

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

Added Files:
	cracklib-2.8.15-init.patch 
Log Message:
- don't free an uninitialized pointer


cracklib-2.8.15-init.patch:
 _cracklibmodule.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE cracklib-2.8.15-init.patch ---
Don't free an uninitialized pointer. SF#2907102

diff -up cracklib-2.8.15/python/_cracklibmodule.c cracklib-2.8.15/python/_cracklibmodule.c
--- cracklib-2.8.15/python/_cracklibmodule.c	2009-12-01 15:39:57.000000000 -0500
+++ cracklib-2.8.15/python/_cracklibmodule.c	2009-12-01 15:39:59.000000000 -0500
@@ -106,6 +106,7 @@ _cracklib_FascistCheck(PyObject *self, P
             return NULL;
         }
         free(dictfile);
+        defaultdict = NULL;
     } else
     {
         defaultdict = strdup(GetDefaultCracklibDict());



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:14 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchbugzilla
Message-ID: <20091201205414.6DB1B10F85F@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchbugzilla acl on clojure (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:16 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchcommits
Message-ID: <20091201205416.334AF10F885@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchcommits acl on clojure (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:21 +0000
Subject: [pkgdb] clojure: s4504kr has requested commit
Message-ID: <20091201205421.ECAC110F891@bastion2.fedora.phx.redhat.com>

s4504kr has requested the commit acl on clojure (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:26 +0000
Subject: [pkgdb] clojure: s4504kr has requested approveacls
Message-ID: <20091201205426.93BE510F85F@bastion2.fedora.phx.redhat.com>

s4504kr has requested the approveacls acl on clojure (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:40 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchbugzilla
Message-ID: <20091201205440.7038110F861@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchbugzilla acl on clojure (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:44 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchcommits
Message-ID: <20091201205444.08BAC10F896@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchcommits acl on clojure (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:47 +0000
Subject: [pkgdb] clojure: s4504kr has requested commit
Message-ID: <20091201205447.443F310F89E@bastion2.fedora.phx.redhat.com>

s4504kr has requested the commit acl on clojure (Fedora 11)

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



From nalin at fedoraproject.org  Tue Dec  1 20:54:54 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  1 Dec 2009 20:54:54 +0000 (UTC)
Subject: rpms/cracklib/devel cracklib-2.8.15-inttypes.patch, NONE,
	1.1 cracklib-2.8.13-inttypes.patch, 1.1, NONE
Message-ID: <20091201205454.DA92F11C00DE@cvs1.fedora.phx.redhat.com>

Author: nalin

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

Added Files:
	cracklib-2.8.15-inttypes.patch 
Removed Files:
	cracklib-2.8.13-inttypes.patch 
Log Message:
Don't depend on a consumer of <packer.h> to be using autoconf, and to be
checking for for the presence of <inttypes.h> and <stdint.h>, and including
its own "config.h" before including <packer.h>, in order for this to be
correct on 64-bit machines.


cracklib-2.8.15-inttypes.patch:
 configure.in    |   14 ++++++++++++++
 lib/packer.h.in |   16 +++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

--- NEW FILE cracklib-2.8.15-inttypes.patch ---
Don't depend on a consumer of <packer.h> to be using autoconf, and to be
checking for for the presence of <inttypes.h> and <stdint.h>, and including
its own "config.h" before including <packer.h>, in order for this to be
correct on 64-bit machines.

diff -up cracklib-2.8.15/configure.in cracklib-2.8.15/configure.in
--- cracklib-2.8.15/configure.in	2009-11-18 18:58:21.000000000 -0500
+++ cracklib-2.8.15/configure.in	2009-12-01 15:16:35.000000000 -0500
@@ -26,6 +26,19 @@ AC_CHECK_HEADERS(zlib.h, AC_DEFINE(HAVE_
 
 AC_SEARCH_LIBS(gzopen, z)
 
+if test x$ac_cv_header_inttypes_h = xyes ; then
+	CRACKLIB_INTEGER_TYPES1="#include <inttypes.h>"
+	CRACKLIB_INTEGER_TYPES2=
+elif test x$ac_cv_header_stdint_h = xyes ; then
+	CRACKLIB_INTEGER_TYPES1="#include <stdint.h>"
+	CRACKLIB_INTEGER_TYPES2=
+else
+	CRACKLIB_INTEGER_TYPES1="typedef unsigned int uint32_t;"
+	CRACKLIB_INTEGER_TYPES2="typedef unsigned short uint16_t;"
+fi
+AC_SUBST(CRACKLIB_INTEGER_TYPES1)
+AC_SUBST(CRACKLIB_INTEGER_TYPES2)
+
 dnl Cygwin workaround
 AC_MSG_CHECKING(if LINE_MAX is defined)
 AC_EGREP_CPP(yes,
@@ -92,5 +105,6 @@ AC_SUBST(CROSS_COMPILING, $cross_compili
 
 AC_OUTPUT(util/Makefile lib/Makefile doc/Makefile python/Makefile Makefile \
 		python/setup.py \
+		lib/packer.h \
 		po/Makefile.in m4/Makefile dicts/Makefile cracklib.spec)
 
diff -up cracklib-2.8.15/lib/packer.h.in cracklib-2.8.15/lib/packer.h.in
--- cracklib-2.8.15/lib/packer.h.in	2009-12-01 15:15:38.000000000 -0500
+++ cracklib-2.8.15/lib/packer.h.in	2009-12-01 15:15:38.000000000 -0500
@@ -30,17 +30,8 @@
 #define _(String) (String)
 #endif
 
-#if defined(HAVE_INTTYPES_H)
-#include <inttypes.h>
-#else
-#if defined(HAVE_STDINT_H)
-#include <stdint.h>
-#else
-typedef unsigned int uint32_t;
-typedef unsigned short uint16_t;
-#endif
-#endif
-
+ at CRACKLIB_INTEGER_TYPES1@
+ at CRACKLIB_INTEGER_TYPES2@
 
 struct pi_header
 {
@@ -83,6 +74,9 @@ typedef struct {
 	int dummy;
 } PWDICT;
 
+ at CRACKLIB_INTEGER_TYPES1@
+ at CRACKLIB_INTEGER_TYPES2@
+
 #endif
 
 extern PWDICT *PWOpen(const char *prefix, char *mode);


--- cracklib-2.8.13-inttypes.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:55 +0000
Subject: [pkgdb] clojure: s4504kr has requested approveacls
Message-ID: <20091201205455.19AC010F8A0@bastion2.fedora.phx.redhat.com>

s4504kr has requested the approveacls acl on clojure (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:54:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:54:59 +0000
Subject: [pkgdb] clojure: s4504kr has requested approveacls
Message-ID: <20091201205459.A4B0410F8A5@bastion2.fedora.phx.redhat.com>

s4504kr has requested the approveacls acl on clojure (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:55:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:55:01 +0000
Subject: [pkgdb] clojure: s4504kr has requested commit
Message-ID: <20091201205501.9BE8110F875@bastion2.fedora.phx.redhat.com>

s4504kr has requested the commit acl on clojure (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:55:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:55:06 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchcommits
Message-ID: <20091201205506.7D71D10F8A4@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchcommits acl on clojure (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:55:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:55:10 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchbugzilla
Message-ID: <20091201205510.7895810F8A9@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchbugzilla acl on clojure (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:56:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:56:25 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchbugzilla
Message-ID: <20091201205625.7563710F895@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchbugzilla acl on clojure (Fedora 12)

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



From pkgdb at fedoraproject.org  Tue Dec  1 20:56:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 01 Dec 2009 20:56:27 +0000
Subject: [pkgdb] clojure: s4504kr has given up watchbugzilla
Message-ID: <20091201205627.3D19C10F887@bastion2.fedora.phx.redhat.com>

s4504kr has given up the watchbugzilla acl on clojure (Fedora 12)

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



From nalin at fedoraproject.org  Tue Dec  1 20:57:34 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  1 Dec 2009 20:57:34 +0000 (UTC)
Subject: File cracklib-2.8.15.tar.gz uploaded to lookaside cache by nalin
Message-ID: <20091201205734.D7A4410F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for cracklib:

dd745f3daad5d4efa9b0c89d32042c33  cracklib-2.8.15.tar.gz



From nalin at fedoraproject.org  Tue Dec  1 20:57:59 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  1 Dec 2009 20:57:59 +0000 (UTC)
Subject: File cracklib-words-20080507.gz uploaded to lookaside cache by nalin
Message-ID: <20091201205759.CE95510F885@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for cracklib:

7fa6ba0cd50e7f9ccaf4707c810b14f1  cracklib-words-20080507.gz



From notting at fedoraproject.org  Tue Dec  1 20:58:07 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue,  1 Dec 2009 20:58:07 +0000 (UTC)
Subject: rpms/mash/F-12 .cvsignore, 1.46, 1.47 mash.spec, 1.60, 1.61 sources,
	1.48, 1.49
Message-ID: <20091201205807.3B5F911C00DE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27637

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.5.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/F-12/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	5 Oct 2009 17:15:25 -0000	1.46
+++ .cvsignore	1 Dec 2009 20:58:06 -0000	1.47
@@ -1 +1 @@
-mash-0.5.9.tar.gz
+mash-0.5.10.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-12/mash.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- mash.spec	5 Oct 2009 17:15:26 -0000	1.60
+++ mash.spec	1 Dec 2009 20:58:07 -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:           mash
-Version:        0.5.9
+Version:        0.5.10
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,11 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Mon Nov 16 2009 Bill Nottingham <notting at redhat.com> 0.5.10-1
+- fix up distro_tags and content_tags
+- bump rawhide version
+- there is no ppc in Fedora rawhide anymore (<jkeating at redhat.com>)
+
 * Mon Oct  5 2009 Bill Nottingham <notting at redhat.com> 0.5.9-1
 - set dist_tags & content_tags when making metadata; update rawhide config
   (<jkeating at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/F-12/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	5 Oct 2009 17:15:26 -0000	1.48
+++ sources	1 Dec 2009 20:58:07 -0000	1.49
@@ -1 +1 @@
-2e392e76d2a20caad9bb3e400916bbbb  mash-0.5.9.tar.gz
+c88ae3b5b50cac20c8e93b7d5fea389e  mash-0.5.10.tar.gz



From nalin at fedoraproject.org  Tue Dec  1 21:00:28 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  1 Dec 2009 21:00:28 +0000 (UTC)
Subject: rpms/cracklib/devel .cvsignore, 1.13, 1.14 cracklib.spec, 1.56,
	1.57 sources, 1.15, 1.16
Message-ID: <20091201210028.7A45B11C02C4@cvs1.fedora.phx.redhat.com>

Author: nalin

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

Modified Files:
	.cvsignore cracklib.spec sources 
Log Message:
- update to 2.8.15
- update cracklib-words to the current version (2008-05-07)
- fixup URLs for various dictionary sources that we use
- fix freeing-an-uninitialized-pointer in the python module (SF#2907102)
- add a disttag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Oct 2008 18:00:40 -0000	1.13
+++ .cvsignore	1 Dec 2009 21:00:27 -0000	1.14
@@ -38,3 +38,5 @@ pass_file.gz
 cracklib-2.8.10.tar.gz
 cracklib-2.8.12.tar.gz
 cracklib-2.8.13.tar.gz
+cracklib-2.8.15.tar.gz
+cracklib-words-20080507.gz


Index: cracklib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/cracklib.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- cracklib.spec	24 Jul 2009 19:36:50 -0000	1.56
+++ cracklib.spec	1 Dec 2009 21:00:28 -0000	1.57
@@ -4,48 +4,49 @@
 
 Summary: A password-checking library
 Name: cracklib
-Version: 2.8.13
-Release: 6
+Version: 2.8.15
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 
-# Retrieved at 20070213003424Z.
-Source1: http://prdownloads.sourceforge.net/cracklib/cracklib-words.gz
+# Retrieved at 20091201191719Z.
+Source1: http://iweb.dl.sourceforge.net/project/cracklib/cracklib-words/2008-05-07/cracklib-words-20080507.gz
 
-Source10: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Domains.gz
-Source11: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Dosref.gz
-Source12: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Ftpsites.gz
-Source13: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Jargon.gz
-Source14: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/common-passwords.txt.gz
-Source15: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/etc-hosts.gz
-Source16: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Movies.gz
-Source17: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Python.gz
-Source18: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Trek.gz
-Source19: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/LCarrol.gz
-Source20: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/Paradise.Lost.gz
-Source21: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/cartoon.gz
-Source22: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/myths-legends.gz
-Source23: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/sf.gz
-Source24: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/shakespeare.gz
-Source25: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/ASSurnames.gz
-Source26: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Congress.gz
-Source27: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Family-Names.gz
-Source28: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Given-Names.gz
-Source29: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/famous.gz
-Source30: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/fast-names.gz
-Source31: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/female-names.gz
-Source32: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/male-names.gz
-Source33: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.french.gz
-Source34: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.hp.gz
-Source35: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/other-names.gz
-Source36: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/surnames.finnish.gz
+Source10: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Domains.gz
+Source11: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Dosref.gz
+Source12: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Ftpsites.gz
+Source13: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Jargon.gz
+Source14: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/common-passwords.txt.gz
+Source15: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/etc-hosts.gz
+Source16: http://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Movies.gz
+Source17: http://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Python.gz
+Source18: http://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Trek.gz
+Source19: http://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/LCarrol.gz
+Source20: http://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/Paradise.Lost.gz
+Source21: http://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/cartoon.gz
+Source22: http://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/myths-legends.gz
+Source23: http://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/sf.gz
+Source24: http://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/shakespeare.gz
+Source25: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/ASSurnames.gz
+Source26: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Congress.gz
+Source27: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Family-Names.gz
+Source28: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Given-Names.gz
+Source29: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/famous.gz
+Source30: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/fast-names.gz
+Source31: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/female-names.gz
+Source32: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/male-names.gz
+Source33: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.french.gz
+Source34: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.hp.gz
+Source35: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/other-names.gz
+Source36: http://ftp.cerias.purdue.edu/pub/dict/wordlists/names/surnames.finnish.gz
 
 # No upstream source for this; it came in as a bugzilla attachment.
 Source37: pass_file.gz
 
-Patch0: cracklib-2.8.13-suffix.patch
-Patch1: cracklib-2.8.13-inttypes.patch
+Patch0: cracklib-2.8.15-suffix.patch
+Patch1: cracklib-2.8.15-inttypes.patch
 Patch2: cracklib-2.8.12-gettext.patch
+Patch3: cracklib-2.8.15-init.patch
 URL: http://sourceforge.net/projects/cracklib/
 License: GPLv2
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -112,6 +113,7 @@ If you are installing CrackLib, you shou
 cp lib/packer.h lib/packer.h.in
 %patch1 -p1 -b .inttypes
 %patch2 -p1 -b .gettext
+%patch3 -p1 -b .init
 autoreconf -f -i
 mkdir cracklib-dicts
 for dict in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \
@@ -225,6 +227,13 @@ EOF
 %{_libdir}/../lib/python*/site-packages/*.py*
 
 %changelog
+* Tue Dec  1 2009 Nalin Dahyabhai <nalin at redhat.com> - 2.8.15-1
+- update to 2.8.15
+- update cracklib-words to the current version (2008-05-07)
+- fixup URLs for various dictionary sources that we use
+- fix freeing-an-uninitialized-pointer in the python module (SF#2907102)
+- add a disttag
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.13-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	28 Oct 2008 18:00:40 -0000	1.15
+++ sources	1 Dec 2009 21:00:28 -0000	1.16
@@ -26,5 +26,5 @@ a2bd31ce25a3057b61d2e5a1182d93a9  sf.gz
 15ec61296de799eaa8111cfabbcbb44f  shakespeare.gz
 c03b38448aefcde059e6fcfb20784f2c  surnames.finnish.gz
 6e76a087a646ede5eba05e9259fd84d4  pass_file.gz
-d18e670e5df560a8745e1b4dede8f84f  cracklib-words.gz
-5beb4c6b3c31c83fc98c4c225b25cd94  cracklib-2.8.13.tar.gz
+dd745f3daad5d4efa9b0c89d32042c33  cracklib-2.8.15.tar.gz
+7fa6ba0cd50e7f9ccaf4707c810b14f1  cracklib-words-20080507.gz



From sailer at fedoraproject.org  Tue Dec  1 21:03:55 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue,  1 Dec 2009 21:03:55 +0000 (UTC)
Subject: rpms/mingw32-qt/devel .cvsignore, 1.7, 1.8 mingw32-qt.spec, 1.21,
	1.22 qt-win-configure.patch, 1.6, 1.7 qt-win-configure.sh, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <20091201210355.9A8B911C00DE@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28571

Modified Files:
	.cvsignore mingw32-qt.spec qt-win-configure.patch 
	qt-win-configure.sh sources 
Log Message:
update to 4.6.0 final



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	22 Nov 2009 11:53:04 -0000	1.7
+++ .cvsignore	1 Dec 2009 21:03:55 -0000	1.8
@@ -3,3 +3,4 @@ qt-win-opensource-src-4.5.2.zip
 qt-win-opensource-src-4.5.3.zip
 qt-everywhere-opensource-src-4.6.0-beta1.tar.gz
 qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
+qt-everywhere-opensource-src-4.6.0.tar.gz


Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/mingw32-qt.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mingw32-qt.spec	24 Nov 2009 10:26:48 -0000	1.21
+++ mingw32-qt.spec	1 Dec 2009 21:03:55 -0000	1.22
@@ -5,7 +5,7 @@
 %global __find_provides %{_mingw32_findprovides}
 %define __debug_install_post %{_mingw32_debug_install_post}
 
-%global pre rc1
+#global pre rc1
 
 %global platform win32-fedora-cross
 
@@ -26,7 +26,7 @@
 
 Name:           mingw32-qt
 Version:        4.6.0
-Release:        0.1.%{pre}%{?dist}
+Release:        1%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -288,6 +288,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-1
+- update to 4.6.0
+
 * Sun Nov 22 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-0.1.rc1
 - update to 4.6.0-rc1
 

qt-win-configure.patch:
 .qmake.cache                    |   20 ++++
 configure.cache                 |   30 +++++++
 configure.output                |  163 ++++++++++++++++++++++++++++++++++++++++
 include/Qt/qconfig.h            |    1 
 include/QtCore/qconfig.h        |    1 
 mkspecs/default/qmake.conf      |  113 +++++++++++++++++++++++++++
 mkspecs/default/qplatformdefs.h |  160 +++++++++++++++++++++++++++++++++++++++
 mkspecs/qconfig.pri             |   11 ++
 src/corelib/global/qconfig.cpp  |   31 +++++++
 src/corelib/global/qconfig.h    |  120 +++++++++++++++++++++++++++++
 10 files changed, 650 insertions(+)

Index: qt-win-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/qt-win-configure.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qt-win-configure.patch	22 Nov 2009 11:53:04 -0000	1.6
+++ qt-win-configure.patch	1 Dec 2009 21:03:55 -0000	1.7
@@ -1,6 +1,6 @@
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.cache qt-everywhere-opensource-src-4.6.0-rc1/configure.cache
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.cache	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/configure.cache	2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.cache qt-everywhere-opensource-src-4.6.0/configure.cache
+--- qt-everywhere-opensource-src-4.6.0.orig/configure.cache	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/configure.cache	2009-12-01 20:55:13.000000000 +0100
 @@ -0,0 +1,30 @@
 +-platform 
 +win32-fedora-cross 
@@ -32,10 +32,10 @@ diff -urN qt-everywhere-opensource-src-4
 +-no-sse2 
 +-release 
 +-shared 
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everywhere-opensource-src-4.6.0-rc1/configure.output
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/configure.output	2009-11-21 22:43:33.000000000 +0100
-@@ -0,0 +1,161 @@
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.output qt-everywhere-opensource-src-4.6.0/configure.output
+--- qt-everywhere-opensource-src-4.6.0.orig/configure.output	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/configure.output	2009-12-01 20:55:14.000000000 +0100
+@@ -0,0 +1,163 @@
 +err:wineboot:ProcessRunKeys Error running cmd L"C:\\WINDOWS\\SYSTEM\\mstask.exe" (2)
 +err:wineboot:ProcessRunKeys Error running cmd L"ati2evxx.exe" (2)
 +err:service:load_reg_dword Error 1804 while reading value L"Type"
@@ -51,7 +51,7 @@ diff -urN qt-everywhere-opensource-src-4
 +err:service:load_reg_dword Error 1804 while reading value L"Type"
 +err:service:scmdatabase_load_services Error 1804 reading registry key for service L"WDMFS" - skipping
 +err:winedevice:ServiceMain driver L"VIAPFD" failed to load
-+Invalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyWhich edition of Qt do you want to use ?
++Invalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyWhich edition of Qt do you want to use ?
 +Type 'c' if you want to use the Commercial Edition.
 +Type 'o' if you want to use the Open Source Edition.
 +
@@ -68,6 +68,7 @@ diff -urN qt-everywhere-opensource-src-4
 +dmoguids.lib not found
 +msdmo.lib not found
 +d3d9.h not found
++err:menubuilder:init_xdg error looking up the desktop directory
 +Environment:
 +    INCLUDE=

 +      Unset
@@ -84,9 +85,9 @@ diff -urN qt-everywhere-opensource-src-4
 +      s:\fujitsu16\bin

 +      s:\fujitsu16\flash510
 +You are licensed to use this software under the terms of the GNU GPL version 3.You are licensed to use this software under the terms of the Lesser GNU LGPL version 2.1.
-+See J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-rc13
++See J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.03
 +
-+ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-rc1L
++ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0L
 +
 +Configuration:
 +    minimal-config

@@ -108,6 +109,7 @@ diff -urN qt-everywhere-opensource-src-4
 +    scripttools

 +    xmlpatterns

 +    multimedia

++    native-gestures

 +    svg

 +    minimal-config

 +    small-config

@@ -175,8 +177,8 @@ diff -urN qt-everywhere-opensource-src-4
 +    SQLite2.................no
 +    InterBase...............no
 +
-+Sources are in..............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1
-+Build is done in............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1
++Sources are in..............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0
++Build is done in............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0
 +Install prefix............../usr/i686-pc-mingw32/sys-root/mingw
 +Headers installed to......../usr/i686-pc-mingw32/sys-root/mingw/include
 +Libraries installed to....../usr/i686-pc-mingw32/sys-root/mingw/lib
@@ -186,7 +188,7 @@ diff -urN qt-everywhere-opensource-src-4
 +Data installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share
 +Translations installed to.../usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations
 +Examples installed to......./usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples
-+err:menubuilder:init_xdg error looking up the desktop directory
++Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos
 +
 +Processing of project files have been disabled.
 +Only use this option if you really know what you're doing.
@@ -197,19 +199,19 @@ diff -urN qt-everywhere-opensource-src-4
 +Application tried to create a window, but no driver could be loaded.
 +Make sure that your X server is running and that $DISPLAY is set correctly.
 +err:rundll32:WinMain Unable to find the entry point L"LoadCurrentPwrScheme" in L"powrprof.dll"
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.0-rc1/include/Qt/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/include/Qt/qconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/include/Qt/qconfig.h	2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.0/include/Qt/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0.orig/include/Qt/qconfig.h	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/include/Qt/qconfig.h	2009-12-01 20:55:13.000000000 +0100
 @@ -0,0 +1 @@
 +#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.0-rc1/include/QtCore/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/include/QtCore/qconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/include/QtCore/qconfig.h	2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.0/include/QtCore/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0.orig/include/QtCore/qconfig.h	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/include/QtCore/qconfig.h	2009-12-01 20:55:13.000000000 +0100
 @@ -0,0 +1 @@
 +#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/default/qmake.conf
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qmake.conf	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/default/qmake.conf	2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.0/mkspecs/default/qmake.conf
+--- qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qmake.conf	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/default/qmake.conf	2009-12-01 20:55:13.000000000 +0100
 @@ -0,0 +1,113 @@
 +#
 +# qmake configuration for fedora-win32-cross
@@ -323,10 +325,10 @@ diff -urN qt-everywhere-opensource-src-4
 +QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 +load(qt_config)
 +
-+QMAKESPEC_ORIGINAL=J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/win32-fedora-cross
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/default/qplatformdefs.h
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qplatformdefs.h	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/default/qplatformdefs.h	2009-11-21 22:43:20.000000000 +0100
++QMAKESPEC_ORIGINAL=J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0/mkspecs/win32-fedora-cross
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.0/mkspecs/default/qplatformdefs.h
+--- qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qplatformdefs.h	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/default/qplatformdefs.h	2009-12-01 20:54:50.000000000 +0100
 @@ -0,0 +1,160 @@
 +/****************************************************************************
 +**
@@ -488,14 +490,14 @@ diff -urN qt-everywhere-opensource-src-4
 +
 +
 +#endif // QPLATFORMDEFS_H
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/qconfig.pri
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/qconfig.pri	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/qconfig.pri	2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.0/mkspecs/qconfig.pri
+--- qt-everywhere-opensource-src-4.6.0.orig/mkspecs/qconfig.pri	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/qconfig.pri	2009-12-01 20:55:13.000000000 +0100
 @@ -0,0 +1,11 @@
 +CONFIG+= release shared stl exceptions rtti
 +QT_ARCH = windows
 +QT_EDITION = OpenSource
-+QT_CONFIG += release zlib png accessibility qt3support opengl s60 ipv6 script scripttools xmlpatterns multimedia svg minimal-config small-config medium-config large-config full-config
++QT_CONFIG += release zlib png accessibility qt3support opengl s60 ipv6 script scripttools xmlpatterns multimedia native-gestures svg minimal-config small-config medium-config large-config full-config
 +#versioning 
 +QT_VERSION = 4.6.0
 +QT_MAJOR_VERSION = 4
@@ -503,9 +505,9 @@ diff -urN qt-everywhere-opensource-src-4
 +QT_PATCH_VERSION = 0
 +#Qt for Windows CE c-runtime deployment
 +QT_CE_C_RUNTIME = no
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/.qmake.cache qt-everywhere-opensource-src-4.6.0-rc1/.qmake.cache
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/.qmake.cache	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/.qmake.cache	2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/.qmake.cache qt-everywhere-opensource-src-4.6.0/.qmake.cache
+--- qt-everywhere-opensource-src-4.6.0.orig/.qmake.cache	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/.qmake.cache	2009-12-01 20:55:13.000000000 +0100
 @@ -0,0 +1,20 @@
 +QMAKE_QT_VERSION_OVERRIDE = 4
 +OBJECTS_DIR     = tmp\obj\release_shared
@@ -516,10 +518,10 @@ diff -urN qt-everywhere-opensource-src-4
 +imageformat-plugins += gif tiff jpeg
 +CONFIG         += minimal-config small-config medium-config large-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build
 +QT_BUILD_PARTS  = libs tools examples demos docs translations
-+QMAKESPEC       = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1\mkspecs\win32-fedora-cross
++QMAKESPEC       = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0\mkspecs\win32-fedora-cross
 +ARCH            = windows
-+QT_BUILD_TREE   = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1
-+QT_SOURCE_TREE  = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1
++QT_BUILD_TREE   = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0
++QT_SOURCE_TREE  = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0
 +QMAKE_MOC       = $$QT_BUILD_TREE\bin\moc.exe
 +QMAKE_UIC       = $$QT_BUILD_TREE\bin\uic.exe
 +QMAKE_UIC3      = $$QT_BUILD_TREE\bin\uic3.exe
@@ -527,16 +529,16 @@ diff -urN qt-everywhere-opensource-src-4
 +QMAKE_DUMPCPP   = $$QT_BUILD_TREE\bin\dumpcpp.exe
 +QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include
 +QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.0-rc1/src/corelib/global/qconfig.cpp
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/src/corelib/global/qconfig.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/src/corelib/global/qconfig.cpp	2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.0/src/corelib/global/qconfig.cpp
+--- qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.cpp	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/src/corelib/global/qconfig.cpp	2009-12-01 20:55:13.000000000 +0100
 @@ -0,0 +1,31 @@
 +/* Licensed */
 +static const char qt_configure_licensee_str          [512 + 12] = "qt_lcnsuser=Open Source";
 +static const char qt_configure_licensed_products_str [512 + 12] = "qt_lcnsprod=OpenSource";
 +
 +/* Build date */
-+static const char qt_configure_installation          [11  + 12] = "qt_instdate=2009-11-21";
++static const char qt_configure_installation          [11  + 12] = "qt_instdate=2009-12-01";
 +
 +static const char qt_configure_prefix_path_str       [512 + 12] = "qt_prfxpath=/usr/i686-pc-mingw32/sys-root/mingw";
 +static const char qt_configure_documentation_path_str[512 + 12] = "qt_docspath=/usr/i686-pc-mingw32/sys-root/mingw/share/doc";
@@ -562,9 +564,9 @@ diff -urN qt-everywhere-opensource-src-4
 +#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;
 +#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;
 +
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.0-rc1/src/corelib/global/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/src/corelib/global/qconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/src/corelib/global/qconfig.h	2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.0/src/corelib/global/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.h	1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/src/corelib/global/qconfig.h	2009-12-01 20:55:13.000000000 +0100
 @@ -0,0 +1,120 @@
 +/* Everything */
 +


Index: qt-win-configure.sh
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/qt-win-configure.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qt-win-configure.sh	22 Nov 2009 11:53:04 -0000	1.6
+++ qt-win-configure.sh	1 Dec 2009 21:03:55 -0000	1.7
@@ -15,7 +15,7 @@
 #     error: #error "MMX instruction set not enabled"
 #   . Same as above for -no-sse and -no-sse2
 
-version=4.6.0-rc1
+version=4.6.0
 platform=win32-fedora-cross
 
 set -e


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 Nov 2009 11:53:04 -0000	1.7
+++ sources	1 Dec 2009 21:03:55 -0000	1.8
@@ -1 +1 @@
-56772a3f9128f00504d2b21dbe4186b3  qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
+2a7b5126f2450d8525af355fc4c12ad6  qt-everywhere-opensource-src-4.6.0.tar.gz



From s4504kr at fedoraproject.org  Tue Dec  1 21:04:31 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  1 Dec 2009 21:04:31 +0000 (UTC)
Subject: rpms/clojure/devel clojure.spec,1.9,1.10
Message-ID: <20091201210431.07B4E11C00DE@cvs1.fedora.phx.redhat.com>

Author: s4504kr

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

Modified Files:
	clojure.spec 
Log Message:
New upstream release


Index: clojure.spec
===================================================================
RCS file: /cvs/extras/rpms/clojure/devel/clojure.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- clojure.spec	24 Jul 2009 19:06:45 -0000	1.9
+++ clojure.spec	1 Dec 2009 21:04:30 -0000	1.10
@@ -1,13 +1,17 @@
+
 Name:           clojure
-Version:     	20090320
-Release:        2%{?dist}
+Version:     	1.0.0
+Release:        1%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
-License:        CPL
+License:        EPL
 URL:            http://clojure.org/
-Source0:        http://downloads.sourceforge.net/clojure/clojure_%{version}.zip
+Source0:        http://clojure.googlecode.com/files/clojure_%{version}.zip
 Source1:        clojure.sh
+
+Patch1:		clojure-1.0.0-no_classpath.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -32,16 +36,14 @@ optional type hints and type inference, 
 can avoid reflection.
 
 %prep
-%setup -q -c -n clojure-%{version}
-cd clojure
+%setup -q -c -n clojure
 rm -f *.jar
+%patch1 -p1
 
 %build
-cd clojure
 ant jar
 
 %install
-cd clojure
 rm -rf %{buildroot}
 
 # prefix install
@@ -60,10 +62,9 @@ cp %{SOURCE1} %{buildroot}%{_bindir}/clo
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
-%doc clojure/readme.txt
+%doc readme.txt epl-v10.html
 
 %attr(0755,root,root) %{_bindir}/clojure
 %{_javadir}/%{name}.jar
@@ -71,6 +72,10 @@ rm -rf %{buildroot}
 %{_bindir}/clojure
 
 %changelog
+* Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-1
+- New upstream release
+- change license tag to EPL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090320-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From s4504kr at fedoraproject.org  Tue Dec  1 21:05:43 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  1 Dec 2009 21:05:43 +0000 (UTC)
Subject: rpms/clojure/devel clojure-1.0.0-no_classpath.patch,NONE,1.1
Message-ID: <20091201210543.D347F11C00DE@cvs1.fedora.phx.redhat.com>

Author: s4504kr

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

Added Files:
	clojure-1.0.0-no_classpath.patch 
Log Message:
Add forgotten patch

clojure-1.0.0-no_classpath.patch:
 build.xml |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE clojure-1.0.0-no_classpath.patch ---
--- richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml.no_classpath	2009-05-04 19:23:20.000000000 -0400
+++ richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml	2009-09-29 06:39:34.151649990 -0400
@@ -104,7 +104,6 @@
       </fileset>
       <manifest>
         <attribute name="Main-Class" value="clojure.main"/>
-        <attribute name="Class-Path" value="."/>
       </manifest>
     </jar>
     <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
@@ -122,7 +121,6 @@
       </fileset>
       <manifest>
         <attribute name="Main-Class" value="clojure.main"/>
-        <attribute name="Class-Path" value="."/>
       </manifest>
     </jar>
     <copy file="${slim_jar}" tofile="${slim_noversion_jar}" />



From s4504kr at fedoraproject.org  Tue Dec  1 21:11:57 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  1 Dec 2009 21:11:57 +0000 (UTC)
Subject: File clojure_1.0.0.zip uploaded to lookaside cache by s4504kr
Message-ID: <20091201211157.E4CC210F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for clojure:

e7a50129040df7fe52287006988ecbb2  clojure_1.0.0.zip



From s4504kr at fedoraproject.org  Tue Dec  1 21:13:00 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  1 Dec 2009 21:13:00 +0000 (UTC)
Subject: rpms/clojure/devel .cvsignore, 1.4, 1.5 clojure.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20091201211300.1E17611C00DE@cvs1.fedora.phx.redhat.com>

Author: s4504kr

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

Modified Files:
	.cvsignore clojure.spec sources 
Log Message:
forgottten uploading sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clojure/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Mar 2009 16:52:35 -0000	1.4
+++ .cvsignore	1 Dec 2009 21:12:59 -0000	1.5
@@ -1 +1 @@
-clojure_20090320.zip
+clojure_1.0.0.zip


Index: clojure.spec
===================================================================
RCS file: /cvs/extras/rpms/clojure/devel/clojure.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- clojure.spec	1 Dec 2009 21:04:30 -0000	1.10
+++ clojure.spec	1 Dec 2009 21:12:59 -0000	1.11
@@ -1,7 +1,7 @@
 
 Name:           clojure
 Version:     	1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_bindir}/clojure
 
 %changelog
+* Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-2
+- Forgot uploading soruces
+
 * Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-1
 - New upstream release
 - change license tag to EPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clojure/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Mar 2009 16:52:35 -0000	1.4
+++ sources	1 Dec 2009 21:12:59 -0000	1.5
@@ -1 +1 @@
-0bbd1f6f889dded06ce0fe18381f150c  clojure_20090320.zip
+e7a50129040df7fe52287006988ecbb2  clojure_1.0.0.zip



From dwalsh at fedoraproject.org  Tue Dec  1 21:17:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 21:17:47 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.206,
	1.207 policycoreutils-rhat.patch, 1.457,
	1.458 policycoreutils-sepolgen.patch, 1.28,
	1.29 policycoreutils.spec, 1.661, 1.662 sources, 1.217, 1.218
Message-ID: <20091201211747.332F311C00DE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policycoreutils-rhat.patch 
	policycoreutils-sepolgen.patch policycoreutils.spec sources 
Log Message:
* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-1
- Update to upstream
	* Remove non-working OUTFILE from fixfiles from Dan Walsh.
	* Additional exception handling in chcat from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- .cvsignore	24 Nov 2009 15:30:53 -0000	1.206
+++ .cvsignore	1 Dec 2009 21:17:45 -0000	1.207
@@ -211,3 +211,5 @@ policycoreutils-2.0.74.tgz
 policycoreutils-2.0.75.tgz
 policycoreutils-2.0.76.tgz
 policycoreutils-2.0.77.tgz
+policycoreutils-2.0.78.tgz
+sepolgen-1.0.19.tgz

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 VERSION                                     |    2 
 audit2allow/audit2allow                     |   14 
 restorecond/Makefile                        |   24 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.8                   |   15 
 restorecond/restorecond.c                   |  427 +++++-----------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 +
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 +++++++++++++++
 restorecond/watch.c                         |  253 ++++++++++++++++
 sandbox/Makefile                            |   31 ++
 sandbox/deliverables/README                 |   32 ++
 sandbox/deliverables/basicwrapper           |    4 
 sandbox/deliverables/run-in-sandbox.py      |   49 +++
 sandbox/deliverables/sandbox                |  216 ++++++++++++++
 sandbox/sandbox                             |  242 +++++++++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 +
 sandbox/seunshare.c                         |  265 +++++++++++++++++
 semanage/semanage                           |  122 ++++++--
 semanage/seobject.py                        |  397 ++++++++++++++++++++------
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 +++
 setfiles/restore.c                          |    6 
 setfiles/restorecon.8                       |    7 
 setfiles/setfiles.8                         |    3 
 setfiles/setfiles.c                         |    6 
 31 files changed, 2013 insertions(+), 482 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- policycoreutils-rhat.patch	24 Nov 2009 15:30:53 -0000	1.457
+++ policycoreutils-rhat.patch	1 Dec 2009 21:17:45 -0000	1.458
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.75/audit2allow/audit2allow
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.77/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.75/audit2allow/audit2allow	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/audit2allow/audit2allow	2009-11-24 10:27:27.000000000 -0500
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -38,18 +38,18 @@ diff --exclude-from=exclude --exclude=se
          else:
              # This is the default if no input is specified
              f = sys.stdin
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.75/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.77/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.75/Makefile	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/Makefile	2009-11-24 10:27:27.000000000 -0500
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.75/restorecond/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.77/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.75/restorecond/Makefile	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/Makefile	2009-11-24 10:27:27.000000000 -0500
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -96,16 +96,16 @@ diff --exclude-from=exclude --exclude=se
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.75/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.77/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/restorecond/org.selinux.Restorecond.service	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/org.selinux.Restorecond.service	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.75/restorecond/restorecond.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.77/restorecond/restorecond.8
 --- nsapolicycoreutils/restorecond/restorecond.8	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.75/restorecond/restorecond.8	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/restorecond.8	2009-11-24 10:27:27.000000000 -0500
 @@ -3,7 +3,7 @@
  restorecond \- daemon that watches for file creation and then sets the default SELinux file context
  
@@ -140,9 +140,9 @@ diff --exclude-from=exclude --exclude=se
  
  .SH "SEE ALSO"
  .BR restorecon (8),
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.75/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.77/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.75/restorecond/restorecond.c	2009-11-03 09:47:48.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/restorecond.c	2009-11-24 10:27:27.000000000 -0500
 @@ -30,9 +30,11 @@
   * and makes sure that there security context matches the systems defaults
   *
@@ -647,9 +647,9 @@ diff --exclude-from=exclude --exclude=se
  }
 +
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.75/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.77/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.75/restorecond/restorecond.conf	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/restorecond.conf	2009-11-24 10:27:27.000000000 -0500
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -660,9 +660,9 @@ diff --exclude-from=exclude --exclude=se
  /root/.ssh/*
 -
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.75/restorecond/restorecond.desktop
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.77/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/restorecond/restorecond.desktop	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/restorecond.desktop	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -671,9 +671,9 @@ diff --exclude-from=exclude --exclude=se
 +Encoding=UTF-8
 +Type=Application
 +StartupNotify=false
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.75/restorecond/restorecond.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.77/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.75/restorecond/restorecond.h	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/restorecond.h	2009-11-24 10:27:27.000000000 -0500
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -698,9 +698,9 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_free(int fd);
  
  #endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.75/restorecond/restorecond.init
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.77/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.75/restorecond/restorecond.init	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/restorecond.init	2009-11-24 10:27:27.000000000 -0500
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -720,15 +720,15 @@ diff --exclude-from=exclude --exclude=se
  
  exit $RETVAL
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.75/restorecond/restorecond_user.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.77/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/restorecond/restorecond_user.conf	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/restorecond_user.conf	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.75/restorecond/user.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.77/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/restorecond/user.c	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/user.c	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -967,9 +967,9 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.75/restorecond/watch.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.77/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/restorecond/watch.c	2009-11-03 09:46:05.000000000 -0500
++++ policycoreutils-2.0.77/restorecond/watch.c	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,253 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1224,17 +1224,17 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.75/sandbox/deliverables/basicwrapper
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.77/sandbox/deliverables/basicwrapper
 --- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/deliverables/basicwrapper	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/deliverables/basicwrapper	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,4 @@
 +import os, sys
 +SANDBOX_ARGS = ['-f%s' % os.environ['_CONDOR_SCRATCH_DIR']]
 +SANDBOX_ARGS.extend(sys.argv[1::])
 +os.execv('/usr/bin/sandbox',SANDBOX_ARGS)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/README policycoreutils-2.0.75/sandbox/deliverables/README
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/README policycoreutils-2.0.77/sandbox/deliverables/README
 --- nsapolicycoreutils/sandbox/deliverables/README	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/deliverables/README	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/deliverables/README	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,32 @@
 +Files:
 +run-in-sandbox.py:
@@ -1268,9 +1268,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +Thanks for a great summer.
 +Chris Pardy
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py policycoreutils-2.0.75/sandbox/deliverables/run-in-sandbox.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py policycoreutils-2.0.77/sandbox/deliverables/run-in-sandbox.py
 --- nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/deliverables/run-in-sandbox.py	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/deliverables/run-in-sandbox.py	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,49 @@
 +import os
 +import os.path
@@ -1321,9 +1321,9 @@ diff --exclude-from=exclude --exclude=se
 +    def get_background_items(self, window, file):
 +        return
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/sandbox policycoreutils-2.0.75/sandbox/deliverables/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/sandbox policycoreutils-2.0.77/sandbox/deliverables/sandbox
 --- nsapolicycoreutils/sandbox/deliverables/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/deliverables/sandbox	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/deliverables/sandbox	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,216 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1541,9 +1541,9 @@ diff --exclude-from=exclude --exclude=se
 +        
 +    sys.exit(rc)
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.75/sandbox/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.77/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/Makefile	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/Makefile	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1576,9 +1576,9 @@ diff --exclude-from=exclude --exclude=se
 +	../../scripts/Lindent $(wildcard *.[ch])
 +
 +relabel:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.75/sandbox/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.77/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/sandbox	2009-11-04 22:17:55.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/sandbox	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,242 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1822,9 +1822,9 @@ diff --exclude-from=exclude --exclude=se
 +           
 +    sys.exit(rc)
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.75/sandbox/sandbox.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.77/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/sandbox.8	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/sandbox.8	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1852,9 +1852,9 @@ diff --exclude-from=exclude --exclude=se
 +.TP
 +runcon(1)
 +.PP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.75/sandbox/sandboxX.sh
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.77/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/sandboxX.sh	2009-11-11 16:02:16.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/sandboxX.sh	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,16 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1872,9 +1872,9 @@ diff --exclude-from=exclude --exclude=se
 +    kill -HUP 0
 +    break
 +done
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.75/sandbox/seunshare.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.77/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.75/sandbox/seunshare.c	2009-11-11 16:00:27.000000000 -0500
++++ policycoreutils-2.0.77/sandbox/seunshare.c	2009-11-24 10:27:27.000000000 -0500
 @@ -0,0 +1,265 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -2141,147 +2141,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +	return status;
 +}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.75/scripts/chcat
---- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.75/scripts/chcat	2009-11-03 09:44:56.000000000 -0500
-@@ -435,6 +435,8 @@
-                     continue
-     except ValueError, e:
-         error(e)
-+    except OSError, e:
-+        error(e)
-     
-     sys.exit(errors)
-     
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.75/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2009-08-05 15:10:56.000000000 -0400
-+++ policycoreutils-2.0.75/scripts/fixfiles	2009-11-03 09:44:56.000000000 -0500
-@@ -27,7 +27,6 @@
- FORCEFLAG=""
- DIRS=""
- RPMILES=""
--OUTFILES=""
- LOGFILE=`tty`
- if [ $? != 0 ]; then
-     LOGFILE="/dev/null"
-@@ -122,7 +121,7 @@
- fi
- if [ ! -z "$RPMFILES" ]; then
-     for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
--	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -R -i -f - 2>&1 >> $LOGFILE
-+	rpmlist $i | ${RESTORECON} ${FORCEFLAG} $* -R -i -f - 2>&1 >> $LOGFILE
-     done
-     exit $?
- fi
-@@ -130,14 +129,15 @@
-     if [ -x /usr/bin/find ]; then
- 	/usr/bin/find "$FILEPATH" \
- 	    ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o -fstype btrfs \) -prune  -o -print0 | \
--	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE
-+	    ${RESTORECON} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE
-     else
--	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE
-+	${RESTORECON} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE
-     fi
-     return
- fi
-+[ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon
- LogReadOnly
--${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
-+${SETFILES} -q ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
- rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
- find /tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
- find /var/tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
-@@ -193,10 +193,15 @@
- esac
- }
- usage() {
--      	echo $"Usage: $0 [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir] ... ] "
--	echo or
--      	echo $"Usage: $0 -R rpmpackage[,rpmpackage...] -C PREVIOUS_FILECONTEXT [-l logfile ] [-o outputfile ] { check | restore }"
--      	echo $"Usage: $0 onboot"
-+      	echo $"""
-+Usage: $0 [-F] [-l logfile ] { check | restore| [-f] relabel | verify } [[dir/file] ... ] 
-+or
-+Usage: $0 [-F] -R rpmpackage[,rpmpackage...] [-l logfile ] { check | restore | verify }
-+or
-+Usage: $0 [-F] -C PREVIOUS_FILECONTEXT { check | restore | verify }
-+or
-+Usage: $0 onboot
-+"""
- }
- 
- if [ $# = 0 ]; then
-@@ -205,7 +210,7 @@
- fi
- 
- # See how we were called.
--while getopts "C:Ffo:R:l:" i; do
-+while getopts "C:FfR:l:" i; do
-     case "$i" in
- 	f)
- 		fullFlag=1
-@@ -213,9 +218,6 @@
-         R)
- 		RPMFILES=$OPTARG
- 		;;
--        o)
--		OUTFILES=$OPTARG
--		;;
-         l)
- 		LOGFILE=$OPTARG
- 		;;
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.75/scripts/fixfiles.8
---- nsapolicycoreutils/scripts/fixfiles.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.75/scripts/fixfiles.8	2009-11-03 09:44:56.000000000 -0500
-@@ -3,11 +3,18 @@
- fixfiles \- fix file SELinux security contexts.
- 
- .SH "SYNOPSIS"
--.B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel | verify }"
- 
--.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ] 
-+.B fixfiles 
-+.I [-F] [-l logfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ] 
- 
--.B fixfiles onboot
-+.B fixfiles 
-+.I [-F] [ -R rpmpackagename[,rpmpackagename...] ] [-l logfile ] { check | restore | verify }
-+
-+.B fixfiles 
-+.I [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] { check | restore | verify }
-+
-+.B fixfiles 
-+.I onboot
- 
- .SH "DESCRIPTION"
- This manual page describes the
-@@ -31,10 +38,6 @@
- .B -l logfile
- Save the output to the specified logfile
- .TP 
--.B -o outputfile
--Save all files that have file_context that differs from the default, in outputfile.
--
--.TP 
- .B -F
- Force  reset  of  context to match file_context for customizable files
- 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.75/scripts/Makefile
---- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.75/scripts/Makefile	2009-11-03 09:44:56.000000000 -0500
-@@ -5,7 +5,7 @@
- MANDIR ?= $(PREFIX)/share/man
- LOCALEDIR ?= /usr/share/locale
- 
--all: fixfiles genhomedircon
-+all: fixfiles genhomedircon chcat
- 
- install: all
- 	-mkdir -p $(BINDIR)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.75/semanage/semanage
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.77/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-11-18 17:06:03.000000000 -0500
-+++ policycoreutils-2.0.75/semanage/semanage	2009-11-24 10:18:58.000000000 -0500
++++ policycoreutils-2.0.77/semanage/semanage	2009-11-24 10:27:27.000000000 -0500
 @@ -32,23 +32,32 @@
  try:
         gettext.install(PROGNAME,
@@ -2610,9 +2472,9 @@ diff --exclude-from=exclude --exclude=se
                               process_args(mkargv(l))
                        trans.finish()
                 else:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.75/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.77/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-11-20 10:51:25.000000000 -0500
-+++ policycoreutils-2.0.75/semanage/seobject.py	2009-11-16 16:52:53.000000000 -0500
++++ policycoreutils-2.0.77/semanage/seobject.py	2009-11-24 10:27:27.000000000 -0500
 @@ -37,40 +37,6 @@
  
  import syslog
@@ -3256,9 +3118,9 @@ diff --exclude-from=exclude --exclude=se
  	def list(self, heading = True, locallist = False, use_file = False):
                  on_off = (_("off"), _("on")) 
  		if use_file:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.75/semodule/semodule.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.77/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.75/semodule/semodule.8	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/semodule/semodule.8	2009-11-24 10:27:27.000000000 -0500
 @@ -35,6 +35,12 @@
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
@@ -3272,9 +3134,9 @@ diff --exclude-from=exclude --exclude=se
  .B  \-r,\-\-remove=MODULE_NAME
  remove existing module
  .TP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.75/semodule/semodule.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.77/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.75/semodule/semodule.c	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/semodule/semodule.c	2009-11-24 10:27:27.000000000 -0500
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -3392,9 +3254,9 @@ diff --exclude-from=exclude --exclude=se
  						semanage_module_info_datum_destroy
  						    (m);
  					}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.75/setfiles/restore.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.77/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.75/setfiles/restore.c	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/setfiles/restore.c	2009-11-24 10:27:27.000000000 -0500
 @@ -303,6 +303,12 @@
  	FTS *fts_handle;
  	FTSENT *ftsent;
@@ -3408,9 +3270,9 @@ diff --exclude-from=exclude --exclude=se
  	fts_handle = fts_open((char **)namelist, r_opts->fts_flags, NULL);
  	if (fts_handle  == NULL) {
  		fprintf(stderr,
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.75/setfiles/restorecon.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.77/setfiles/restorecon.8
 --- nsapolicycoreutils/setfiles/restorecon.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.75/setfiles/restorecon.8	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/setfiles/restorecon.8	2009-11-24 10:27:27.000000000 -0500
 @@ -4,10 +4,10 @@
  
  .SH "SYNOPSIS"
@@ -3434,9 +3296,9 @@ diff --exclude-from=exclude --exclude=se
  .TP 
  .B \-v
  show changes in file labels.
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.75/setfiles/setfiles.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.77/setfiles/setfiles.8
 --- nsapolicycoreutils/setfiles/setfiles.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.75/setfiles/setfiles.8	2009-11-03 09:44:56.000000000 -0500
++++ policycoreutils-2.0.77/setfiles/setfiles.8	2009-11-24 10:27:27.000000000 -0500
 @@ -31,6 +31,9 @@
  .TP
  .B \-n
@@ -3447,9 +3309,9 @@ diff --exclude-from=exclude --exclude=se
  .TP 
  .B \-q
  suppress non-error output.
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.75/setfiles/setfiles.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.77/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.75/setfiles/setfiles.c	2009-11-03 09:48:38.000000000 -0500
++++ policycoreutils-2.0.77/setfiles/setfiles.c	2009-11-24 10:27:27.000000000 -0500
 @@ -44,13 +44,13 @@
  {
  	if (iamrestorecon) {
@@ -3475,3 +3337,9 @@ diff --exclude-from=exclude --exclude=se
  					argv[0]);
  				exit(1);
  			}
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/VERSION policycoreutils-2.0.77/VERSION
+--- nsapolicycoreutils/VERSION	2009-12-01 15:46:50.000000000 -0500
++++ policycoreutils-2.0.77/VERSION	2009-11-20 10:51:25.000000000 -0500
+@@ -1 +1 @@
+-2.0.78
++2.0.77

policycoreutils-sepolgen.patch:
 audit.py     |   32 ++++++++++++++++++++++++++++++++
 refparser.py |    2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- policycoreutils-sepolgen.patch	19 Aug 2009 19:02:29 -0000	1.28
+++ policycoreutils-sepolgen.patch	1 Dec 2009 21:17:46 -0000	1.29
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/audit.py
---- nsasepolgen/src/sepolgen/audit.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/audit.py	2009-08-18 15:21:13.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.77/sepolgen-1.0.19/src/sepolgen/audit.py
+--- nsasepolgen/src/sepolgen/audit.py	2009-12-01 15:46:50.000000000 -0500
++++ policycoreutils-2.0.77/sepolgen-1.0.19/src/sepolgen/audit.py	2009-11-24 10:27:28.000000000 -0500
 @@ -23,6 +23,27 @@
  
  # Convenience functions
@@ -47,10 +47,10 @@ diff --exclude-from=exclude -N -u -r nsa
  # Classes representing audit messages
  
  class AuditMessage:
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/refparser.py
---- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/refparser.py	2009-08-13 17:57:55.000000000 -0400
-@@ -919,7 +919,7 @@
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.77/sepolgen-1.0.19/src/sepolgen/refparser.py
+--- nsasepolgen/src/sepolgen/refparser.py	2009-10-29 15:21:39.000000000 -0400
++++ policycoreutils-2.0.77/sepolgen-1.0.19/src/sepolgen/refparser.py	2009-11-24 10:27:28.000000000 -0500
+@@ -973,7 +919,7 @@
  def list_headers(root):
      modules = []
      support_macros = None


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -p -r1.661 -r1.662
--- policycoreutils.spec	24 Nov 2009 15:30:54 -0000	1.661
+++ policycoreutils.spec	1 Dec 2009 21:17:46 -0000	1.662
@@ -2,10 +2,10 @@
 %define	libsepolver	2.0.19-1
 %define	libsemanagever	2.0.36-2
 %define	libselinuxver	2.0.46-5
-%define	sepolgenver	1.0.17
+%define	sepolgenver	1.0.19
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.77
+Version: 2.0.78
 Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
@@ -296,6 +296,15 @@ fi
 exit 0
 
 %changelog
+* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-1
+- Update to upstream
+	* Remove non-working OUTFILE from fixfiles from Dan Walsh.
+	* Additional exception handling in chcat from Dan Walsh.
+
+	* fix sepolgen to read a "type 1403" msg as a policy load by Stephen
+	  Smalley <sds at tycho.nsa.gov>
+	* Add support for Xen ocontexts from Paul Nuzzi.
+
 * Tue Nov 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.77-1
 - Update to upstream
 	* Fixed bug preventing semanage node -a from working


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- sources	24 Nov 2009 15:35:28 -0000	1.217
+++ sources	1 Dec 2009 21:17:46 -0000	1.218
@@ -1,3 +1,3 @@
-480cc64a050735fa1163a87dc89c4f49  sepolgen-1.0.17.tgz
-283c1d0d776dc9db6af9b0f02a49fccb  policycoreutils-2.0.77.tgz
+96b2e73550b7e36daee0f5d347c8a95b  policycoreutils-2.0.78.tgz
+2ae1a9f7242e33413aae036d2edeb1d8  sepolgen-1.0.19.tgz
 59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2



From dwalsh at fedoraproject.org  Tue Dec  1 21:18:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 21:18:45 +0000 (UTC)
Subject: rpms/libselinux/devel .cvsignore, 1.190, 1.191 libselinux.spec,
	1.382, 1.383 sources, 1.193, 1.194
Message-ID: <20091201211845.A4A0311C00DE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.90-1
- Update to upstream 
	* add/reformat man pages by Guido Trentalancia <guido at trentalancia.com>.
	* Change exception.sh to be called with bash by Manoj Srivastava <srivasta at debian.org>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- .cvsignore	2 Nov 2009 18:01:05 -0000	1.190
+++ .cvsignore	1 Dec 2009 21:18:45 -0000	1.191
@@ -173,3 +173,4 @@ libselinux-2.0.86.tgz
 libselinux-2.0.87.tgz
 libselinux-2.0.88.tgz
 libselinux-2.0.89.tgz
+libselinux-2.0.90.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -p -r1.382 -r1.383
--- libselinux.spec	23 Nov 2009 18:32:48 -0000	1.382
+++ libselinux.spec	1 Dec 2009 21:18:45 -0000	1.383
@@ -4,8 +4,8 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.89
-Release: 2%{?dist}
+Version: 2.0.90
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -166,6 +166,11 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.90-1
+- Update to upstream 
+	* add/reformat man pages by Guido Trentalancia <guido at trentalancia.com>.
+	* Change exception.sh to be called with bash by Manoj Srivastava <srivasta at debian.org>
+
 * Mon Nov 2 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.89-2
 - Fix selinuxdefcon man page
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- sources	2 Nov 2009 18:01:05 -0000	1.193
+++ sources	1 Dec 2009 21:18:45 -0000	1.194
@@ -1 +1 @@
-e61066e879d3fd0a61f6e09e3653b486  libselinux-2.0.89.tgz
+87c744d919d632502ca91ca213c2168f  libselinux-2.0.90.tgz



From than at fedoraproject.org  Tue Dec  1 21:20:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  1 Dec 2009 21:20:50 +0000 (UTC)
Subject: rpms/kde-l10n/F-12 .cvsignore, 1.31, 1.32 kde-l10n.spec, 1.99,
	1.100 sources, 1.35, 1.36
Message-ID: <20091201212050.E741D11C00DE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31957

Modified Files:
	.cvsignore kde-l10n.spec sources 
Log Message:
4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	10 Nov 2009 14:04:57 -0000	1.31
+++ .cvsignore	1 Dec 2009 21:20:50 -0000	1.32
@@ -57,3 +57,62 @@ kde-l10n-uk-4.3.3.tar.bz2
 kde-l10n-wa-4.3.3.tar.bz2
 kde-l10n-zh_CN-4.3.3.tar.bz2
 kde-l10n-zh_TW-4.3.3.tar.bz2
+kde-l10n-ar-4.3.4.tar.bz2
+kde-l10n-bg-4.3.4.tar.bz2
+kde-l10n-bn_IN-4.3.4.tar.bz2
+kde-l10n-ca-4.3.4.tar.bz2
+kde-l10n-cs-4.3.4.tar.bz2
+kde-l10n-csb-4.3.4.tar.bz2
+kde-l10n-da-4.3.4.tar.bz2
+kde-l10n-de-4.3.4.tar.bz2
+kde-l10n-el-4.3.4.tar.bz2
+kde-l10n-en_GB-4.3.4.tar.bz2
+kde-l10n-es-4.3.4.tar.bz2
+kde-l10n-et-4.3.4.tar.bz2
+kde-l10n-eu-4.3.4.tar.bz2
+kde-l10n-fi-4.3.4.tar.bz2
+kde-l10n-fr-4.3.4.tar.bz2
+kde-l10n-fy-4.3.4.tar.bz2
+kde-l10n-ga-4.3.4.tar.bz2
+kde-l10n-gl-4.3.4.tar.bz2
+kde-l10n-gu-4.3.4.tar.bz2
+kde-l10n-he-4.3.4.tar.bz2
+kde-l10n-hi-4.3.4.tar.bz2
+kde-l10n-hne-4.3.4.tar.bz2
+kde-l10n-hr-4.3.4.tar.bz2
+kde-l10n-hu-4.3.4.tar.bz2
+kde-l10n-is-4.3.4.tar.bz2
+kde-l10n-it-4.3.4.tar.bz2
+kde-l10n-ja-4.3.4.tar.bz2
+kde-l10n-kk-4.3.4.tar.bz2
+kde-l10n-km-4.3.4.tar.bz2
+kde-l10n-kn-4.3.4.tar.bz2
+kde-l10n-ko-4.3.4.tar.bz2
+kde-l10n-ku-4.3.4.tar.bz2
+kde-l10n-lt-4.3.4.tar.bz2
+kde-l10n-lv-4.3.4.tar.bz2
+kde-l10n-mai-4.3.4.tar.bz2
+kde-l10n-mk-4.3.4.tar.bz2
+kde-l10n-ml-4.3.4.tar.bz2
+kde-l10n-mr-4.3.4.tar.bz2
+kde-l10n-nb-4.3.4.tar.bz2
+kde-l10n-nds-4.3.4.tar.bz2
+kde-l10n-nl-4.3.4.tar.bz2
+kde-l10n-nn-4.3.4.tar.bz2
+kde-l10n-pa-4.3.4.tar.bz2
+kde-l10n-pl-4.3.4.tar.bz2
+kde-l10n-pt-4.3.4.tar.bz2
+kde-l10n-pt_BR-4.3.4.tar.bz2
+kde-l10n-ro-4.3.4.tar.bz2
+kde-l10n-ru-4.3.4.tar.bz2
+kde-l10n-sk-4.3.4.tar.bz2
+kde-l10n-sl-4.3.4.tar.bz2
+kde-l10n-sr-4.3.4.tar.bz2
+kde-l10n-sv-4.3.4.tar.bz2
+kde-l10n-tg-4.3.4.tar.bz2
+kde-l10n-th-4.3.4.tar.bz2
+kde-l10n-tr-4.3.4.tar.bz2
+kde-l10n-uk-4.3.4.tar.bz2
+kde-l10n-wa-4.3.4.tar.bz2
+kde-l10n-zh_CN-4.3.4.tar.bz2
+kde-l10n-zh_TW-4.3.4.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-12/kde-l10n.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- kde-l10n.spec	13 Nov 2009 15:11:45 -0000	1.99
+++ kde-l10n.spec	1 Dec 2009 21:20:50 -0000	1.100
@@ -2,8 +2,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.3
-Release: 2%{dist}
+Version: 4.3.4
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -1504,6 +1504,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup, remove Fedora<=9 conditionals
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-12/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	10 Nov 2009 14:04:57 -0000	1.35
+++ sources	1 Dec 2009 21:20:50 -0000	1.36
@@ -1,59 +1,59 @@
-e10628397c084460bca7689656f300ed  kde-l10n-ar-4.3.3.tar.bz2
-d6674ead4ac4eed60c3d84e7c0f8d851  kde-l10n-bg-4.3.3.tar.bz2
-2c57052b5ba91e7c8c8be5e860a55124  kde-l10n-bn_IN-4.3.3.tar.bz2
-adb193ef0a8145537dc687405b962013  kde-l10n-ca-4.3.3.tar.bz2
-b70ab6045f67331d6e87e6e4832d0230  kde-l10n-cs-4.3.3.tar.bz2
-3bd8733cc6ed8b166439f4b8ef72dce9  kde-l10n-csb-4.3.3.tar.bz2
-27f4f50c1a40d1ba5051ea79bd3680ca  kde-l10n-da-4.3.3.tar.bz2
-ceafbce8173de1b0b71ee336550a3e85  kde-l10n-de-4.3.3.tar.bz2
-ac77ebe350583e43ba5870b3f37a662a  kde-l10n-el-4.3.3.tar.bz2
-b5dfb4d185c144f23aff217699112f13  kde-l10n-en_GB-4.3.3.tar.bz2
-61f81f1a8391b84ac6296233d30986a6  kde-l10n-es-4.3.3.tar.bz2
-3ab2b6ab41990966da77d614cb032dc8  kde-l10n-et-4.3.3.tar.bz2
-9f85fafd3b82f427602cc98c0f87e471  kde-l10n-eu-4.3.3.tar.bz2
-a84e2f7795677c60b652a70886ed07c4  kde-l10n-fi-4.3.3.tar.bz2
-942561daa054a8075eddf22509ccf90b  kde-l10n-fr-4.3.3.tar.bz2
-4a33dee026f3786e921a3e894d98810b  kde-l10n-fy-4.3.3.tar.bz2
-f7e01894dd8e2bb244634bde1a3f1277  kde-l10n-ga-4.3.3.tar.bz2
-e9d530e50cfa88e2d71594f08b646348  kde-l10n-gl-4.3.3.tar.bz2
-f48d5d658fd6fcf3347bf430c5031321  kde-l10n-gu-4.3.3.tar.bz2
-b84e05b699de1144e0f709dd717c9c95  kde-l10n-he-4.3.3.tar.bz2
-df069293f0bade11079aad9104e063c8  kde-l10n-hi-4.3.3.tar.bz2
-dff839715ea7d30e74c6fc71b7156f8c  kde-l10n-hne-4.3.3.tar.bz2
-d39bdafa4f2aa3ea77c01c88863ede5c  kde-l10n-hr-4.3.3.tar.bz2
-cece9b2512bf1d735cba47388e19a9bf  kde-l10n-hu-4.3.3.tar.bz2
-92e3a8eba0e69b68d6e8d3b50b71448b  kde-l10n-is-4.3.3.tar.bz2
-c8f74e93088cf211cc23c51def0174bc  kde-l10n-it-4.3.3.tar.bz2
-42c28a67f64a3db230f94f13b03b1757  kde-l10n-ja-4.3.3.tar.bz2
-c073d5307842307b5232c283b096703c  kde-l10n-kk-4.3.3.tar.bz2
-bf99998dcabd9010f57862aae79b1be0  kde-l10n-km-4.3.3.tar.bz2
-c334eb73bd702797c89c8389b08c256d  kde-l10n-kn-4.3.3.tar.bz2
-8a966dabf4a4de53bd730aea32cb0483  kde-l10n-ko-4.3.3.tar.bz2
-cbccd72792c766517e6b0576dce0cce4  kde-l10n-ku-4.3.3.tar.bz2
-91b33909381030b15e704182108e46fc  kde-l10n-lt-4.3.3.tar.bz2
-139b89413834c4d16c2d7566add4bf89  kde-l10n-lv-4.3.3.tar.bz2
-afd970f5ffa4a92ae7ae5c6e99dd3a95  kde-l10n-mai-4.3.3.tar.bz2
-bbb7a681018bbd82fb576a15b4ba64c7  kde-l10n-mk-4.3.3.tar.bz2
-d224b44e67025f8af9b4013ecc5dd800  kde-l10n-ml-4.3.3.tar.bz2
-bcc8d552f154d6c9bff038548b57b0c2  kde-l10n-mr-4.3.3.tar.bz2
-18677afe8de233f19a3cb27d0a44c363  kde-l10n-nb-4.3.3.tar.bz2
-c1803ecd0c054c6248d241e88ec523cf  kde-l10n-nds-4.3.3.tar.bz2
-b719419f77c7ec0555ffd303d8b2680d  kde-l10n-nl-4.3.3.tar.bz2
-c063f2309cb2d5dfc6de1ae83699e72b  kde-l10n-nn-4.3.3.tar.bz2
-f629191f1d6ea55f4b92115cf4025f35  kde-l10n-pa-4.3.3.tar.bz2
-61f7fd6cb1114e7404a789cfe7a71114  kde-l10n-pl-4.3.3.tar.bz2
-ff61640a475220169e8662a1e286bdff  kde-l10n-pt-4.3.3.tar.bz2
-45c83f1230ce08ec859a32ce10fab0ad  kde-l10n-pt_BR-4.3.3.tar.bz2
-92659a0f406005a43f4d6f8b5047e587  kde-l10n-ro-4.3.3.tar.bz2
-dfe031b2aff9b1b857af536c3649adf4  kde-l10n-ru-4.3.3.tar.bz2
-e9470464392df6332bf557ec24ccc3f2  kde-l10n-sk-4.3.3.tar.bz2
-419b15bd4accd6592a84d3428c1f8567  kde-l10n-sl-4.3.3.tar.bz2
-1a3f470a429cd9bf4dd8545f9f565ad6  kde-l10n-sr-4.3.3.tar.bz2
-3a4e7644c33284431da4b3981502349c  kde-l10n-sv-4.3.3.tar.bz2
-de0b886d9e884de5471dfe4bbc80533c  kde-l10n-tg-4.3.3.tar.bz2
-ad44654afa8d389a479c09a0a6bdff11  kde-l10n-th-4.3.3.tar.bz2
-31b9493a5f4b4980430b9b73811ebb43  kde-l10n-tr-4.3.3.tar.bz2
-86f275ea91a748f3f11749267e740287  kde-l10n-uk-4.3.3.tar.bz2
-a4de975e55e4ec179a593c57ad33a1f0  kde-l10n-wa-4.3.3.tar.bz2
-b3ec7c7ac95f2b19a01675862d0087f8  kde-l10n-zh_CN-4.3.3.tar.bz2
-d1c16636ad3a72f6aab0cfb4ce7da54e  kde-l10n-zh_TW-4.3.3.tar.bz2
+2d73adb358b1f3eb0eeec4f0c919ffed  kde-l10n-ar-4.3.4.tar.bz2
+d468203ae533fb59f74f5cc71405d763  kde-l10n-bg-4.3.4.tar.bz2
+cd9d9380d430c9ba3598bccae28b40f7  kde-l10n-bn_IN-4.3.4.tar.bz2
+7dabd7c092d4c166ad3aec4959085f50  kde-l10n-ca-4.3.4.tar.bz2
+4f214f3ea3d989c7be118ab81169d180  kde-l10n-cs-4.3.4.tar.bz2
+add6a35d71363fd302f2e70f6527dc65  kde-l10n-csb-4.3.4.tar.bz2
+80ebea9a323b082a3f9a6b02a3eeb405  kde-l10n-da-4.3.4.tar.bz2
+ba476ae2c6417b7122d5b9bac250171d  kde-l10n-de-4.3.4.tar.bz2
+6d3d77b85ea7d4c9d1f8fe115d618290  kde-l10n-el-4.3.4.tar.bz2
+2ea3bae93419d93c2faac7840a9a27f4  kde-l10n-en_GB-4.3.4.tar.bz2
+24b340a3cfa79b1b4899c84d1f0ad230  kde-l10n-es-4.3.4.tar.bz2
+f5932ae6ed6aec29579ba595c8e3334e  kde-l10n-et-4.3.4.tar.bz2
+7d892b41f864dfaf4d6e9b8cce005395  kde-l10n-eu-4.3.4.tar.bz2
+38d66cd08bf356133b4986a7fa63812f  kde-l10n-fi-4.3.4.tar.bz2
+61ed95c6bb94bbf72154e9a0f431dee8  kde-l10n-fr-4.3.4.tar.bz2
+18fefb04c19f853857608e76ac92d347  kde-l10n-fy-4.3.4.tar.bz2
+cb1a76b150ebe92e5ad525e6ad73120c  kde-l10n-ga-4.3.4.tar.bz2
+d9c2b86c480331baacc5fe2c41dd3ae9  kde-l10n-gl-4.3.4.tar.bz2
+bc9ae9382884c0d47dd78f0337269aa1  kde-l10n-gu-4.3.4.tar.bz2
+1ce3ad54d4c326dc0baf8c93eedad6c3  kde-l10n-he-4.3.4.tar.bz2
+cfb080c77df6786af13ff5f941249dc7  kde-l10n-hi-4.3.4.tar.bz2
+97b855ed04401232870b10850caf3206  kde-l10n-hne-4.3.4.tar.bz2
+41783012c413f2c48e56fcff617cf6d4  kde-l10n-hr-4.3.4.tar.bz2
+0df236588e7e23eccb0076cec1108053  kde-l10n-hu-4.3.4.tar.bz2
+d1bfab3e284d7c410880edf3340af209  kde-l10n-is-4.3.4.tar.bz2
+b86e79c9ac034377db708fb4ca2f9b72  kde-l10n-it-4.3.4.tar.bz2
+1580ec2c425326dd8f950ff0dd00ca87  kde-l10n-ja-4.3.4.tar.bz2
+8d4937b8f9930b131a5f3c5a4e6e3478  kde-l10n-kk-4.3.4.tar.bz2
+4050dd1076eda5be70c2020471935705  kde-l10n-km-4.3.4.tar.bz2
+266540f3cb982d9db697393710d2daba  kde-l10n-kn-4.3.4.tar.bz2
+0202b9ebb86cc26a36384bd598afeb5e  kde-l10n-ko-4.3.4.tar.bz2
+ab7a052798fc51faa0a94a01dd1e1fc3  kde-l10n-ku-4.3.4.tar.bz2
+5efb2bc39d2fa08220897b0f57d6c7ae  kde-l10n-lt-4.3.4.tar.bz2
+8ded0ecb924727cbda41cc7c5dd22658  kde-l10n-lv-4.3.4.tar.bz2
+f9fce92ec2e11282a8f84a5b8f569cf2  kde-l10n-mai-4.3.4.tar.bz2
+5b2ea5d30b4663d6e7a5a1339bd4ddfd  kde-l10n-mk-4.3.4.tar.bz2
+42e04d77fa45304a5a9e13bd7162473a  kde-l10n-ml-4.3.4.tar.bz2
+516925365fcb2a3352ac980528a3326b  kde-l10n-mr-4.3.4.tar.bz2
+9946e4b4effae6b828e9d862f61c842f  kde-l10n-nb-4.3.4.tar.bz2
+da4c91959f13d388e6abe5d1a94d8abe  kde-l10n-nds-4.3.4.tar.bz2
+5d12c9bda8a0391c9eade78d182c3fc0  kde-l10n-nl-4.3.4.tar.bz2
+9b0bf27b084abbd255f0f6ee054db683  kde-l10n-nn-4.3.4.tar.bz2
+ae1ed2219ef4cdee675cb82096d054db  kde-l10n-pa-4.3.4.tar.bz2
+7ec3ee455517911a26cb1cba5128622c  kde-l10n-pl-4.3.4.tar.bz2
+bbeee1f64ba93fbcf79e120c04227b40  kde-l10n-pt-4.3.4.tar.bz2
+3d1067f90b936d23bb94caab66a135d9  kde-l10n-pt_BR-4.3.4.tar.bz2
+8e425bb165cc1d02ec93f849999aa4c6  kde-l10n-ro-4.3.4.tar.bz2
+18ca5f88ca87fc5d99ed72147b43a93c  kde-l10n-ru-4.3.4.tar.bz2
+634dc5ce6ea811f84fa56a0d5db70a07  kde-l10n-sk-4.3.4.tar.bz2
+61c80e183aef028b2905a5421ee56347  kde-l10n-sl-4.3.4.tar.bz2
+bba4106c38955957a423fb8a6439a5ae  kde-l10n-sr-4.3.4.tar.bz2
+bb62f00e607cb1e765e391880851e55e  kde-l10n-sv-4.3.4.tar.bz2
+d2fd9ef0ab4c6d4d6c60e7d36d6d761e  kde-l10n-tg-4.3.4.tar.bz2
+88b9a1d879a604df38457010b1a5b0bb  kde-l10n-th-4.3.4.tar.bz2
+c57769548d09e1bd36893c2487de86b3  kde-l10n-tr-4.3.4.tar.bz2
+4b3e975d13f18cc8e69956f28e4fd362  kde-l10n-uk-4.3.4.tar.bz2
+9346dfae4b59c53412f6edb42687f071  kde-l10n-wa-4.3.4.tar.bz2
+9656da04c983c795f1af7f41a853b3f2  kde-l10n-zh_CN-4.3.4.tar.bz2
+f3d9dfe4e387bfed94ad0b6f8cd191d7  kde-l10n-zh_TW-4.3.4.tar.bz2



From sdz at fedoraproject.org  Tue Dec  1 21:26:46 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 21:26:46 +0000 (UTC)
Subject: File sugar-datastore-0.87.1.tar.bz2 uploaded to lookaside cache by
	sdz
Message-ID: <20091201212646.0176010F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-datastore:

a169c6739642f20acd8074c3dac0d608  sugar-datastore-0.87.1.tar.bz2



From sdz at fedoraproject.org  Tue Dec  1 21:27:46 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue,  1 Dec 2009 21:27:46 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 sugar-datastore.spec, 1.23, 1.24
Message-ID: <20091201212746.A9CE711C00DE@cvs1.fedora.phx.redhat.com>

Author: sdz

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

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	27 Sep 2009 17:26:02 -0000	1.17
+++ .cvsignore	1 Dec 2009 21:27:46 -0000	1.18
@@ -1 +1 @@
-sugar-datastore-0.86.0.tar.bz2
+sugar-datastore-0.87.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	27 Sep 2009 17:26:02 -0000	1.17
+++ sources	1 Dec 2009 21:27:46 -0000	1.18
@@ -1 +1 @@
-4be2be494d90ccc77749c364bf757e08  sugar-datastore-0.86.0.tar.bz2
+a169c6739642f20acd8074c3dac0d608  sugar-datastore-0.87.1.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sugar-datastore.spec	27 Sep 2009 17:26:02 -0000	1.23
+++ sugar-datastore.spec	1 Dec 2009 21:27:46 -0000	1.24
@@ -4,7 +4,7 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.86.0
+Version: 0.87.1
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
+- New upstream release
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
 - New upstream release
 



From somlo at fedoraproject.org  Tue Dec  1 21:31:26 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue,  1 Dec 2009 21:31:26 +0000 (UTC)
Subject: File Catalyst-Plugin-Authorization-ACL-0.15.tar.gz uploaded to
	lookaside cache by somlo
Message-ID: <20091201213126.40FBC10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-Plugin-Authorization-ACL:

653a88331431ad2644999d8995f18fbf  Catalyst-Plugin-Authorization-ACL-0.15.tar.gz



From somlo at fedoraproject.org  Tue Dec  1 21:32:12 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue,  1 Dec 2009 21:32:12 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/F-11 .cvsignore, 1.2,
	1.3 import.log, 1.1,
	1.2 perl-Catalyst-Plugin-Authorization-ACL.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091201213212.E5F0D11C00DE@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1372/F-11

Modified Files:
	.cvsignore import.log 
	perl-Catalyst-Plugin-Authorization-ACL.spec sources 
Log Message:
update to 0.15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jan 2009 17:57:30 -0000	1.2
+++ .cvsignore	1 Dec 2009 21:32:12 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Authorization-ACL-0.10.tar.gz
+Catalyst-Plugin-Authorization-ACL-0.15.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Jan 2009 17:57:30 -0000	1.1
+++ import.log	1 Dec 2009 21:32:12 -0000	1.2
@@ -1 +1,2 @@
 perl-Catalyst-Plugin-Authorization-ACL-0_10-1:HEAD:perl-Catalyst-Plugin-Authorization-ACL-0.10-1.src.rpm:1231783028
+perl-Catalyst-Plugin-Authorization-ACL-0_15-1_fc12:F-11:perl-Catalyst-Plugin-Authorization-ACL-0.15-1.fc12.src.rpm:1259703088


Index: perl-Catalyst-Plugin-Authorization-ACL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-11/perl-Catalyst-Plugin-Authorization-ACL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Catalyst-Plugin-Authorization-ACL.spec	26 Feb 2009 12:14:29 -0000	1.3
+++ perl-Catalyst-Plugin-Authorization-ACL.spec	1 Dec 2009 21:32:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      perl-Catalyst-Plugin-Authorization-ACL
-Version:   0.10
-Release:   3%{?dist}
+Version:   0.15
+Release:   1%{?dist}
 Summary:   ACL Support for Catalyst Applications
 License:   GPL+ or Artistic
 Group:     Development/Libraries
@@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+BuildRequires:  perl(CPAN)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Catalyst::Runtime)
 BuildRequires:  perl(Class::Data::Inheritable)
@@ -78,6 +79,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 0.15-1
+- update to 0.15
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jan 2009 17:57:30 -0000	1.2
+++ sources	1 Dec 2009 21:32:12 -0000	1.3
@@ -1 +1 @@
-14e41900d89333b7f4de24309a7e40d8  Catalyst-Plugin-Authorization-ACL-0.10.tar.gz
+653a88331431ad2644999d8995f18fbf  Catalyst-Plugin-Authorization-ACL-0.15.tar.gz



From somlo at fedoraproject.org  Tue Dec  1 21:32:58 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue,  1 Dec 2009 21:32:58 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/F-12 .cvsignore, 1.2,
	1.3 import.log, 1.1,
	1.2 perl-Catalyst-Plugin-Authorization-ACL.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20091201213258.B5F2411C00DE@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1707/F-12

Modified Files:
	.cvsignore import.log 
	perl-Catalyst-Plugin-Authorization-ACL.spec sources 
Log Message:
update to 0.15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jan 2009 17:57:30 -0000	1.2
+++ .cvsignore	1 Dec 2009 21:32:58 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Authorization-ACL-0.10.tar.gz
+Catalyst-Plugin-Authorization-ACL-0.15.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Jan 2009 17:57:30 -0000	1.1
+++ import.log	1 Dec 2009 21:32:58 -0000	1.2
@@ -1 +1,2 @@
 perl-Catalyst-Plugin-Authorization-ACL-0_10-1:HEAD:perl-Catalyst-Plugin-Authorization-ACL-0.10-1.src.rpm:1231783028
+perl-Catalyst-Plugin-Authorization-ACL-0_15-1_fc12:F-12:perl-Catalyst-Plugin-Authorization-ACL-0.15-1.fc12.src.rpm:1259703153


Index: perl-Catalyst-Plugin-Authorization-ACL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-12/perl-Catalyst-Plugin-Authorization-ACL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Catalyst-Plugin-Authorization-ACL.spec	26 Jul 2009 04:12:44 -0000	1.4
+++ perl-Catalyst-Plugin-Authorization-ACL.spec	1 Dec 2009 21:32:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:      perl-Catalyst-Plugin-Authorization-ACL
-Version:   0.10
-Release:   4%{?dist}
+Version:   0.15
+Release:   1%{?dist}
 Summary:   ACL Support for Catalyst Applications
 License:   GPL+ or Artistic
 Group:     Development/Libraries
@@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+BuildRequires:  perl(CPAN)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Catalyst::Runtime)
 BuildRequires:  perl(Class::Data::Inheritable)
@@ -78,6 +79,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 0.15-1
+- update to 0.15
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jan 2009 17:57:30 -0000	1.2
+++ sources	1 Dec 2009 21:32:58 -0000	1.3
@@ -1 +1 @@
-14e41900d89333b7f4de24309a7e40d8  Catalyst-Plugin-Authorization-ACL-0.10.tar.gz
+653a88331431ad2644999d8995f18fbf  Catalyst-Plugin-Authorization-ACL-0.15.tar.gz



From ausil at fedoraproject.org  Tue Dec  1 21:33:09 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue,  1 Dec 2009 21:33:09 +0000 (UTC)
Subject: rpms/grub2/devel grub-1.97.1-initramfs.patch, NONE, 1.1 grub2.spec, 
	1.12, 1.13
Message-ID: <20091201213309.320D511C00DE@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	grub2.spec 
Added Files:
	grub-1.97.1-initramfs.patch 
Log Message:
add patch for initramfs support


grub-1.97.1-initramfs.patch:
 10_linux.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE grub-1.97.1-initramfs.patch ---
diff -uNr grub-1.97.1-orig/util/grub.d/10_linux.in grub-1.97.1/util/grub.d/10_linux.in
--- grub-1.97.1-orig/util/grub.d/10_linux.in	2009-11-09 09:48:16.000000000 -0600
+++ grub-1.97.1/util/grub.d/10_linux.in	2009-12-01 15:28:16.000000000 -0600
@@ -78,7 +78,8 @@
   initrd=
   for i in "initrd.img-${version}" "initrd-${version}.img" \
 	   "initrd-${version}" "initrd.img-${alt_version}" \
-	   "initrd-${alt_version}.img" "initrd-${alt_version}"; do
+	   "initrd-${alt_version}.img" "initrd-${alt_version}" \
+           "initramfs-${version}.img" ; do
     if test -e "${dirname}/${i}" ; then
       initrd="$i"
       break


Index: grub2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/devel/grub2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- grub2.spec	10 Nov 2009 22:54:45 -0000	1.12
+++ grub2.spec	1 Dec 2009 21:33:09 -0000	1.13
@@ -14,7 +14,7 @@
 Name:           grub2
 Epoch:          1
 Version:        1.97.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -25,7 +25,8 @@ Source1:        90_persistent
 Source2:        grub.default
 Source3:        README.Fedora
 Patch0:         grub-1.95-grubdir.patch
-Patch1:        http://fedorapeople.org/~lkundrak/grub2/grub2-dlsym-v4.patch
+Patch1:         http://fedorapeople.org/~lkundrak/grub2/grub2-dlsym-v4.patch
+Patch2:         grub-1.97.1-initramfs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +65,7 @@ file that is part of this package's docu
 
 %patch0 -p1 -b .grubdir
 %patch1 -p1 -b .dlsym
+%patch2 -p1 -b .initramfs
 
 # README.Fedora
 cp %{SOURCE3} .
@@ -202,6 +204,9 @@ exec >/dev/null 2>&1
 
 
 %changelog
+* Tue Dec 01 2009 Dennis Gilmore <dennis at ausil.us> - 1:1.97.1-4
+- add patch so that grub2 finds fedora's initramfs
+
 * Tue Nov 10 2009 Dennis Gilmore <dennis at ausil.us> - 1:1.97.1-3
 - no mkrescue on sparc arches
 - ofpathname on sparc arches



From somlo at fedoraproject.org  Tue Dec  1 21:33:49 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue,  1 Dec 2009 21:33:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/devel .cvsignore, 1.2, 
	1.3 import.log, 1.1,
	1.2 perl-Catalyst-Plugin-Authorization-ACL.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20091201213349.2D08B11C00DE@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2057/devel

Modified Files:
	.cvsignore import.log 
	perl-Catalyst-Plugin-Authorization-ACL.spec sources 
Log Message:
update to 0.15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jan 2009 17:57:30 -0000	1.2
+++ .cvsignore	1 Dec 2009 21:33:49 -0000	1.3
@@ -1 +1 @@
-Catalyst-Plugin-Authorization-ACL-0.10.tar.gz
+Catalyst-Plugin-Authorization-ACL-0.15.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Jan 2009 17:57:30 -0000	1.1
+++ import.log	1 Dec 2009 21:33:49 -0000	1.2
@@ -1 +1,2 @@
 perl-Catalyst-Plugin-Authorization-ACL-0_10-1:HEAD:perl-Catalyst-Plugin-Authorization-ACL-0.10-1.src.rpm:1231783028
+perl-Catalyst-Plugin-Authorization-ACL-0_15-1_fc12:HEAD:perl-Catalyst-Plugin-Authorization-ACL-0.15-1.fc12.src.rpm:1259703212


Index: perl-Catalyst-Plugin-Authorization-ACL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel/perl-Catalyst-Plugin-Authorization-ACL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Catalyst-Plugin-Authorization-ACL.spec	26 Jul 2009 04:12:44 -0000	1.4
+++ perl-Catalyst-Plugin-Authorization-ACL.spec	1 Dec 2009 21:33:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:      perl-Catalyst-Plugin-Authorization-ACL
-Version:   0.10
-Release:   4%{?dist}
+Version:   0.15
+Release:   1%{?dist}
 Summary:   ACL Support for Catalyst Applications
 License:   GPL+ or Artistic
 Group:     Development/Libraries
@@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+BuildRequires:  perl(CPAN)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Catalyst::Runtime)
 BuildRequires:  perl(Class::Data::Inheritable)
@@ -78,6 +79,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 0.15-1
+- update to 0.15
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jan 2009 17:57:30 -0000	1.2
+++ sources	1 Dec 2009 21:33:49 -0000	1.3
@@ -1 +1 @@
-14e41900d89333b7f4de24309a7e40d8  Catalyst-Plugin-Authorization-ACL-0.10.tar.gz
+653a88331431ad2644999d8995f18fbf  Catalyst-Plugin-Authorization-ACL-0.15.tar.gz



From nim at fedoraproject.org  Tue Dec  1 21:39:51 2009
From: nim at fedoraproject.org (nim)
Date: Tue,  1 Dec 2009 21:39:51 +0000 (UTC)
Subject: File fontpackages-1.41.tar.xz uploaded to lookaside cache by nim
Message-ID: <20091201213951.654C010F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fontpackages:

ecf45dd0564a08350b89e8895898bc42  fontpackages-1.41.tar.xz



From clumens at fedoraproject.org  Tue Dec  1 21:41:51 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue,  1 Dec 2009 21:41:51 +0000 (UTC)
Subject: File anaconda-13.9.tar.bz2 uploaded to lookaside cache by clumens
Message-ID: <20091201214151.24C4210F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for anaconda:

e7ebc2d8bf6f3ffd8f5fae0545fd6d25  anaconda-13.9.tar.bz2



From sparks at fedoraproject.org  Tue Dec  1 21:42:01 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Tue,  1 Dec 2009 21:42:01 +0000 (UTC)
Subject: File fedora-accessibility-guide-en-US-12.0-1.tgz uploaded to
	lookaside cache by sparks
Message-ID: <20091201214201.0A5BE10F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fedora-accessibility-guide-en-US:

5039fab955833ddae7250559e468c7b2  fedora-accessibility-guide-en-US-12.0-1.tgz



From clumens at fedoraproject.org  Tue Dec  1 21:42:13 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue,  1 Dec 2009 21:42:13 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.683, 1.684 anaconda.spec, 1.833, 
	1.834 sources, 1.817, 1.818
Message-ID: <20091201214213.492AA11C00DE@cvs1.fedora.phx.redhat.com>

Author: clumens

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -p -r1.683 -r1.684
--- .cvsignore	13 Nov 2009 02:21:01 -0000	1.683
+++ .cvsignore	1 Dec 2009 21:42:12 -0000	1.684
@@ -1 +1,2 @@
 anaconda-13.8.tar.bz2
+anaconda-13.9.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -p -r1.833 -r1.834
--- anaconda.spec	13 Nov 2009 02:21:01 -0000	1.833
+++ anaconda.spec	1 Dec 2009 21:42:12 -0000	1.834
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.8
+Version: 13.9
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -66,7 +66,6 @@ BuildRequires: libxml2-python
 BuildRequires: mkinitrd-devel >= %{mkinitrdver}
 BuildRequires: newt-devel
 BuildRequires: pango-devel
-BuildRequires: popt-devel
 BuildRequires: pykickstart >= %{pykickstartver}
 BuildRequires: python-devel
 BuildRequires: python-urlgrabber
@@ -218,6 +217,80 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Dec 01 2009 Chris Lumens <clumens at redhat.com> - 13.9-1
+- Improve text mode fcoe interface (hdegoede)
+- Fix udev rule to test whether we're in anaconda. (dlehman)
+- Fix devicelibs.dm.device_is_multipath support for new udev rules. (pjones)
+- Display progress or wait window when creating devices. (dlehman)
+- Display progress or wait window when formatting devices. (dlehman)
+- Add optional progress windows to devicelibs create functions. (dlehman)
+- Force mkswap to do its job. (dlehman)
+- Don't try to get dm node or update sysfs path for lvm vgs. (dlehman)
+- Log upon leaving installer steps as well as entering (a part of #524980).
+  (akozumpl)
+- An unitialized variable in iw/partition_gui.py and a typo in kickstart.py
+  (akozumpl)
+- Add DCB option to text mode FCoE setup (#513011) (hdegoede)
+- Add DCB option to GUI FCoE setup (#513011) (hdegoede)
+- Add DCB option to kickstart FCoE code (#513011) (hdegoede)
+- Add support for DCB to fcoe.py (#513011) (hdegoede)
+- Include fcoemon and dcbd in install.img for FCoE DCB support (#513011)
+  (hdegoede)
+- Add RAID4 support (#541433) (oliva)
+- Clear a partition's BOOT flag when formatting it (hdegoede)
+- Do not set boot flag when there is already a partition with the flag
+  (#533658) (hdegoede)
+- Fixes a syntax error in commit b495db2cd56c881a7e661ac55bd31069510cf662.
+  (akozumpl)
+- If /boot is too small to preupgrade, don't allow going back (#499321).
+  (clumens)
+- One reference to earlyKS somehow survived.  Kill it. (clumens)
+- Quote backticks when writing out the .bash_history file, and add another
+  cmd. (clumens)
+- Set the default keyboard based on language before showing the UI
+  (#532843). (clumens)
+- Don't attempt to get the size of a filesystem unless it's supported
+  (#540598). (clumens)
+- Require /boot to be on a GPT or MSDOS disk label on x86 (#540588).
+  (clumens)
+- Fix killall -USR2 anaconda writing out a traceback file. (clumens)
+- Only check for DEVICE_DASD in S390.diskLabelType, not for all platforms.
+  (clumens)
+- Use installclass to make the bootloader timeout 5 seconds on RHEL. (pjones)
+- Make sure we get tcp_wrappers-libs installed for stage 2 (pjones)
+- Mount usbfs before installing packages (#532397) (mmatsuya)
+- Use fs with largest amount of freespace to store install.img (hdegoede)
+- Always update booty drivelist before filling bootstore (#533335) (hdegoede)
+- Enhance drive specification for clearpart, ignoredisk, and partition.
+  (clumens)
+- Add a function that determines which devices match a given shell glob.
+  (clumens)
+- Extend udev_resolve_devspec to allow specifying devices in more ways.
+  (clumens)
+- Name log files something that doesn't conflict with the system (#539542).
+  (clumens)
+- Adds interactive install support for NFS options (#537764) (akozumpl)
+- Introduces check_asprintf macro that checks asprintfs return value and
+  terminates program in OOM scenarios. (akozumpl)
+- Sleep if the kickstart file read fails (#537361) (akozumpl)
+- Move libcurl initialization to urlinstTransfer() (#537870). (dcantrell)
+- Replace all popt use with glib's option parsing code. (dcantrell)
+- Clean up initProductInfo() in loader.c. (dcantrell)
+- Use glib string parsing functions in driverselect.c. (dcantrell)
+- If a package has %%pre/%%post scriptlet errors, abort the install
+  (#531599). (clumens)
+- If a package has a dependency problem, offer to continue/abort (#511801).
+  (clumens)
+- Generate more complete device.map grub file when upgrading grub. (#533621)
+  (rvykydal)
+- Added the libudev python bindings (mgracik)
+- If the kickstart log file's path doesn't exist, make it. (clumens)
+- Don't make chown or lsetfilecon errors fatal (#529940). (clumens)
+- Get correct boot device in reIPL code for s390 (#537390). (hamzy)
+- Expand the proxy table a little bit to reduce clutter (#537878). (clumens)
+- Use glib data structures in loader's module handling code. (dcantrell)
+- Various improvements to kickstart scriptlet reporting (#510636). (clumens)
+
 * Thu Nov 12 2009 David Cantrell <dcantrell at redhat.com> - 13.8-1
 - Ignore merge commit messages when generating the rpm changelog. (dcantrell)
 - Remove last references to hal. (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -p -r1.817 -r1.818
--- sources	13 Nov 2009 02:21:01 -0000	1.817
+++ sources	1 Dec 2009 21:42:12 -0000	1.818
@@ -1 +1 @@
-d4a3f735d41d9019600cf4d9e67290f0  anaconda-13.8.tar.bz2
+e7ebc2d8bf6f3ffd8f5fae0545fd6d25  anaconda-13.9.tar.bz2



From sparks at fedoraproject.org  Tue Dec  1 21:43:40 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Tue,  1 Dec 2009 21:43:40 +0000 (UTC)
Subject: rpms/fedora-accessibility-guide-en-US/devel
	fedora-accessibility-guide-en-US.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091201214340.9B3E811C00DE@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3877/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-accessibility-guide-en-US.spec import.log 
Log Message:
Initial release of the Accessibility Guide.



--- NEW FILE fedora-accessibility-guide-en-US.spec ---
# Documentation Specfile
%define HTMLVIEW %(eval 'if [ "%{?dist}" = ".el5" ]; then echo "1"; else echo "0"; fi')

%define viewer xdg-open

%if %{HTMLVIEW}
%define viewer htmlview
%define vendor redhat-
%define vendoropt --vendor="redhat"
%endif

Name:         fedora-accessibility-guide-en-US
Version:      12.0
Release:      1%{?dist}


Summary:       Using Fedora with a visual, hearing, or mobility impairment

Group:         Documentation
License:       CC-BY-SA
URL:           http://docs.fedoraproject.org
Source:        %{name}-%{version}-1.tgz
BuildArch:     noarch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: publican
BuildRequires: desktop-file-utils


BuildRequires:    publican-fedora

%if %{HTMLVIEW}
Requires:    htmlview
%else
Requires:    xdg-utils
%endif

%description


This document describes some of the hardware devices, applications
and utilities available to assist people with disabilities to use a
computer with the Fedora operating system.


%prep
%setup -q

%build
publican build --formats="html-desktop" --langs=en-US

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications

cat > %{name}.desktop <<'EOF'
[Desktop Entry]
Name=fedora 12: Accessibility Guide
Comment=Using Fedora with a visual, hearing, or mobility impairment
Exec=%{viewer} %{_docdir}/%{name}-%{version}/index.html
Icon=%{_docdir}/%{name}-%{version}/images/icon.svg
Categories=Documentation;X-Red-Hat-Base;
Type=Application
Encoding=UTF-8
Terminal=false
EOF

%if %{HTMLVIEW}
desktop-file-install  %{?vendoropt} --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
%else
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc tmp/en-US/html-desktop/*
%if %{HTMLVIEW}
%{_datadir}/applications/%{?vendor}%{name}.desktop
%else
%{_datadir}/applications/%{name}.desktop
%endif

%changelog
* Sat Nov 28 2009 Eric Christensen <sparks at fedoraproject.org> 12.0-1
- Commented out Emacspeak sections that still need work. 
- Changed to be the official version for Fedora 12. 

* Sat Nov 28 2009 Susan Lauber <laubersm at fedoraproject.org> 0.9-2
- Made some minor readability, grammar, and style edits. 
- Added a number of markup additions for consistancy. 
- Added information on enabling Orca in GNOME to the Screen_Readers section. 
- Added information on GNOME Magnifier to the Screen_Magnifiers section. 
- Moved On Screen Keyboards to their own section to clean up Other Tools. 
- Added information on gok (GNOME On-Screen Keyboard). 

* Sun Nov 22 2009 Eric Christensen <sparks at fedoraproject.org> 0.9-1
- Added Gnome features Dasher and Caribou. 
- Commented out dated information on how Red Hat and Fedora had or had not tested some of the FOSS solutions. 

* Mon Nov  9 2009 Eric Christensen <sparks at fedoraproject.org> 0.8-1
- Modified the "screen readers" section. 
- Removed link to KMouseTools and it was broken. 

* Sun Nov  8 2009 Susan Lauber <laubersm at fedoraproject.org> 0.7-1
- Various style edits (tense, spelling, etc.) 
- Added markup for menuitems 

* Sun Nov  8 2009 Eric Christensen <sparks at fedoraproject.org> 0.6-1
- Created "Mouse Tools" section, moved KMouseTools to that section, and added Mousetweaks. 
- Added GNOME information in the "Desktops" section. 
- Added comments to Tools.xml for further editing. 

* Sat Nov  7 2009 Eric Christensen <sparks at fedoraproject.org> 0.5-1
- Created "Other Tools" section and added BRLTTY, KMouth, and KMouseTool to that section. 
- Created "Screen Magnifiers" section and added KMagnifier. 
- Created "Desktops" section and added KDE. This section will include specific Desktop accessibility controls. 

* Wed Nov  4 2009 Eric Christensen <sparks at fedoraproject.org> 0.4-1
- Combined Speakup and Emacspeak into the Screen Readers section. 

* Thu Aug 20 2009 R?diger Landmann <rlandmann at redhat.com> 0.3-1
- Extra XML markup. 

* Thu Aug 20 2009 Eric Christensen <sparks at fedoraproject.org> 0.2-1
- Updated links and added information on Emacspeak. 

* Thu Aug  6 2009 Eric Christensen <sparks at fedoraproject.org> 0.1-1
- Publicanized all information in the Accessibility Guide 





--- NEW FILE import.log ---
fedora-accessibility-guide-en-US-12_0-1_fc12:HEAD:fedora-accessibility-guide-en-US-12.0-1.fc12.src.rpm:1259703726


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:10:17 -0000	1.1
+++ .cvsignore	1 Dec 2009 21:43:40 -0000	1.2
@@ -0,0 +1 @@
+fedora-accessibility-guide-en-US-12.0-1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:10:17 -0000	1.1
+++ sources	1 Dec 2009 21:43:40 -0000	1.2
@@ -0,0 +1 @@
+5039fab955833ddae7250559e468c7b2  fedora-accessibility-guide-en-US-12.0-1.tgz



From devrim at fedoraproject.org  Tue Dec  1 21:44:41 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:44:41 +0000 (UTC)
Subject: File pgpool-II-2.2.6.tar.gz uploaded to lookaside cache by devrim
Message-ID: <20091201214441.0ABDD10F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for postgresql-pgpool-II:

711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz



From devrim at fedoraproject.org  Tue Dec  1 21:46:23 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:46:23 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-5 .cvsignore, 1.10,
	1.11 postgresql-pgpool-II.spec, 1.17, 1.18 sources, 1.11, 1.12
Message-ID: <20091201214623.2796311C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4302/EL-5

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Oct 2009 10:39:38 -0000	1.10
+++ .cvsignore	1 Dec 2009 21:46:22 -0000	1.11
@@ -1 +1 @@
-pgpool-II-2.2.5.tar.gz
+pgpool-II-2.2.6.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/postgresql-pgpool-II.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- postgresql-pgpool-II.spec	1 Nov 2009 21:44:45 -0000	1.17
+++ postgresql-pgpool-II.spec	1 Dec 2009 21:46:22 -0000	1.18
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.5
-Release:	2%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -112,6 +112,9 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
+- Update to 2.2.6
+
 * Sun Nov 01 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.5-2
 - Remove init script from all runlevels before uninstall. Per RH Bugzilla
   #532177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Oct 2009 10:39:39 -0000	1.11
+++ sources	1 Dec 2009 21:46:22 -0000	1.12
@@ -1 +1 @@
-410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz
+711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz



From devrim at fedoraproject.org  Tue Dec  1 21:46:22 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:46:22 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-4 .cvsignore, 1.10,
	1.11 postgresql-pgpool-II.spec, 1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20091201214622.B41EE11C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4302/EL-4

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Oct 2009 10:39:38 -0000	1.10
+++ .cvsignore	1 Dec 2009 21:46:22 -0000	1.11
@@ -1 +1 @@
-pgpool-II-2.2.5.tar.gz
+pgpool-II-2.2.6.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/postgresql-pgpool-II.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- postgresql-pgpool-II.spec	4 Oct 2009 10:39:38 -0000	1.16
+++ postgresql-pgpool-II.spec	1 Dec 2009 21:46:22 -0000	1.17
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.5
+Version:	2.2.6
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -74,6 +74,12 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 chkconfig --add pgpool
 
+%preun
+if [ $1 = 0 ] ; then
+	/sbin/service pgpool condstop >/dev/null 2>&1
+	chkconfig --del pgpool
+fi
+
 %postun -p /sbin/ldconfig
 
 %files
@@ -106,6 +112,11 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
+- Update to 2.2.6
+- Remove init script from all runlevels before uninstall. Per RH Bugzilla
+  #532177
+
 * Sun Oct 4 2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.5-1
 - Update to 2.2.5, for various fixes described at 
   http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Oct 2009 10:39:38 -0000	1.11
+++ sources	1 Dec 2009 21:46:22 -0000	1.12
@@ -1 +1 @@
-410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz
+711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz



From devrim at fedoraproject.org  Tue Dec  1 21:46:23 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:46:23 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-10 .cvsignore, 1.13,
	1.14 postgresql-pgpool-II.spec, 1.29, 1.30 sources, 1.13, 1.14
Message-ID: <20091201214623.87D1F11C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4302/F-10

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Oct 2009 10:39:39 -0000	1.13
+++ .cvsignore	1 Dec 2009 21:46:23 -0000	1.14
@@ -1 +1 @@
-pgpool-II-2.2.5.tar.gz
+pgpool-II-2.2.6.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/postgresql-pgpool-II.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- postgresql-pgpool-II.spec	1 Nov 2009 21:44:45 -0000	1.29
+++ postgresql-pgpool-II.spec	1 Dec 2009 21:46:23 -0000	1.30
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.5
-Release:	2%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -112,6 +112,9 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
+- Update to 2.2.6
+
 * Sun Nov 01 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.5-2
 - Remove init script from all runlevels before uninstall. Per RH Bugzilla
   #532177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Oct 2009 10:39:39 -0000	1.13
+++ sources	1 Dec 2009 21:46:23 -0000	1.14
@@ -1 +1 @@
-410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz
+711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz



From devrim at fedoraproject.org  Tue Dec  1 21:46:24 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:46:24 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-12 .cvsignore, 1.13,
	1.14 postgresql-pgpool-II.spec, 1.37, 1.38 sources, 1.13, 1.14
Message-ID: <20091201214624.423B611C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4302/F-12

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Oct 2009 10:39:40 -0000	1.13
+++ .cvsignore	1 Dec 2009 21:46:23 -0000	1.14
@@ -1 +1 @@
-pgpool-II-2.2.5.tar.gz
+pgpool-II-2.2.6.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/postgresql-pgpool-II.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- postgresql-pgpool-II.spec	1 Nov 2009 21:44:46 -0000	1.37
+++ postgresql-pgpool-II.spec	1 Dec 2009 21:46:24 -0000	1.38
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.5
-Release:	2%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -112,6 +112,9 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
+- Update to 2.2.6
+
 * Sun Nov 01 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.5-2
 - Remove init script from all runlevels before uninstall. Per RH Bugzilla
   #532177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Oct 2009 10:39:40 -0000	1.13
+++ sources	1 Dec 2009 21:46:24 -0000	1.14
@@ -1 +1 @@
-410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz
+711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz



From devrim at fedoraproject.org  Tue Dec  1 21:46:24 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:46:24 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/devel .cvsignore, 1.13,
	1.14 postgresql-pgpool-II.spec, 1.37, 1.38 sources, 1.13, 1.14
Message-ID: <20091201214624.A831211C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4302/devel

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Oct 2009 10:39:40 -0000	1.13
+++ .cvsignore	1 Dec 2009 21:46:24 -0000	1.14
@@ -1 +1 @@
-pgpool-II-2.2.5.tar.gz
+pgpool-II-2.2.6.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/postgresql-pgpool-II.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- postgresql-pgpool-II.spec	1 Nov 2009 21:44:47 -0000	1.37
+++ postgresql-pgpool-II.spec	1 Dec 2009 21:46:24 -0000	1.38
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.5
-Release:	2%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -112,6 +112,9 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
+- Update to 2.2.6
+
 * Sun Nov 01 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.5-2
 - Remove init script from all runlevels before uninstall. Per RH Bugzilla
   #532177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Oct 2009 10:39:40 -0000	1.13
+++ sources	1 Dec 2009 21:46:24 -0000	1.14
@@ -1 +1 @@
-410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz
+711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz



From devrim at fedoraproject.org  Tue Dec  1 21:46:23 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:46:23 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-11 .cvsignore, 1.13,
	1.14 postgresql-pgpool-II.spec, 1.36, 1.37 sources, 1.13, 1.14
Message-ID: <20091201214623.DA85011C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4302/F-11

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Oct 2009 10:39:39 -0000	1.13
+++ .cvsignore	1 Dec 2009 21:46:23 -0000	1.14
@@ -1 +1 @@
-pgpool-II-2.2.5.tar.gz
+pgpool-II-2.2.6.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/postgresql-pgpool-II.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- postgresql-pgpool-II.spec	1 Nov 2009 21:44:46 -0000	1.36
+++ postgresql-pgpool-II.spec	1 Dec 2009 21:46:23 -0000	1.37
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.5
-Release:	2%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -112,6 +112,9 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
+- Update to 2.2.6
+
 * Sun Nov 01 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.5-2
 - Remove init script from all runlevels before uninstall. Per RH Bugzilla
   #532177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Oct 2009 10:39:39 -0000	1.13
+++ sources	1 Dec 2009 21:46:23 -0000	1.14
@@ -1 +1 @@
-410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz
+711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz



From devrim at fedoraproject.org  Tue Dec  1 21:54:55 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:54:55 +0000 (UTC)
Subject: File pgbouncer-1.3.1.tgz uploaded to lookaside cache by devrim
Message-ID: <20091201215455.4A9AC10F807@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pgbouncer:

ccb2dbe8b6ce505e14762712c478982e  pgbouncer-1.3.1.tgz



From devrim at fedoraproject.org  Tue Dec  1 21:55:23 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 21:55:23 +0000 (UTC)
Subject: rpms/pgbouncer/devel .cvsignore, 1.2, 1.3 pgbouncer.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091201215523.0AE9C11C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

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

Modified Files:
	.cvsignore pgbouncer.spec sources 
Log Message:
Update to 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Aug 2008 10:49:05 -0000	1.2
+++ .cvsignore	1 Dec 2009 21:55:22 -0000	1.3
@@ -1 +1 @@
-pgbouncer-1.2.3.tgz
+pgbouncer-1.3.1.tgz


Index: pgbouncer.spec
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/pgbouncer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pgbouncer.spec	26 Jul 2009 17:53:54 -0000	1.3
+++ pgbouncer.spec	1 Dec 2009 21:55:22 -0000	1.4
@@ -1,13 +1,13 @@
 %define debug 0
 
 Name:		pgbouncer
-Version:	1.2.3
-Release:	5%{?dist}
+Version:	1.3.1
+Release:	1%{?dist}
 Summary:	Lightweight connection pooler for PostgreSQL
 Group:		Applications/Databases
 License:	MIT and BSD
 URL:		http://pgfoundry.org/projects/pgbouncer/
-Source0:	http://pgfoundry.org/frs/download.php/1873/%{name}-%{version}.tgz
+Source0:	http://pgfoundry.org/frs/download.php/2284/%{name}-%{version}.tgz
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-ini.patch
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 %{_mandir}/man5/%{name}.*
 
 %changelog
+* Tue Dec 1 2009 - Devrim GUNDUZ <devrim at gunduz.org> 1.3.1-1
+- Update to 1.3.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2008 10:49:05 -0000	1.2
+++ sources	1 Dec 2009 21:55:22 -0000	1.3
@@ -1 +1 @@
-e8afc79103cd464c109a56e418a9ba24  pgbouncer-1.2.3.tgz
+ccb2dbe8b6ce505e14762712c478982e  pgbouncer-1.3.1.tgz



From sparks at fedoraproject.org  Tue Dec  1 21:57:33 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Tue,  1 Dec 2009 21:57:33 +0000 (UTC)
Subject: rpms/fedora-accessibility-guide-en-US/F-12
	fedora-accessibility-guide-en-US.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091201215734.046AA11C00DE@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6757/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-accessibility-guide-en-US.spec import.log 
Log Message:
Initial Accessibility Guide release.



--- NEW FILE fedora-accessibility-guide-en-US.spec ---
# Documentation Specfile
%define HTMLVIEW %(eval 'if [ "%{?dist}" = ".el5" ]; then echo "1"; else echo "0"; fi')

%define viewer xdg-open

%if %{HTMLVIEW}
%define viewer htmlview
%define vendor redhat-
%define vendoropt --vendor="redhat"
%endif

Name:         fedora-accessibility-guide-en-US
Version:      12.0
Release:      1%{?dist}


Summary:       Using Fedora with a visual, hearing, or mobility impairment

Group:         Documentation
License:       CC-BY-SA
URL:           http://docs.fedoraproject.org
Source:        %{name}-%{version}-1.tgz
BuildArch:     noarch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: publican
BuildRequires: desktop-file-utils


BuildRequires:    publican-fedora

%if %{HTMLVIEW}
Requires:    htmlview
%else
Requires:    xdg-utils
%endif

%description


This document describes some of the hardware devices, applications
and utilities available to assist people with disabilities to use a
computer with the Fedora operating system.


%prep
%setup -q

%build
publican build --formats="html-desktop" --langs=en-US

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications

cat > %{name}.desktop <<'EOF'
[Desktop Entry]
Name=fedora 12: Accessibility Guide
Comment=Using Fedora with a visual, hearing, or mobility impairment
Exec=%{viewer} %{_docdir}/%{name}-%{version}/index.html
Icon=%{_docdir}/%{name}-%{version}/images/icon.svg
Categories=Documentation;X-Red-Hat-Base;
Type=Application
Encoding=UTF-8
Terminal=false
EOF

%if %{HTMLVIEW}
desktop-file-install  %{?vendoropt} --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
%else
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc tmp/en-US/html-desktop/*
%if %{HTMLVIEW}
%{_datadir}/applications/%{?vendor}%{name}.desktop
%else
%{_datadir}/applications/%{name}.desktop
%endif

%changelog
* Sat Nov 28 2009 Eric Christensen <sparks at fedoraproject.org> 12.0-1
- Commented out Emacspeak sections that still need work. 
- Changed to be the official version for Fedora 12. 

* Sat Nov 28 2009 Susan Lauber <laubersm at fedoraproject.org> 0.9-2
- Made some minor readability, grammar, and style edits. 
- Added a number of markup additions for consistancy. 
- Added information on enabling Orca in GNOME to the Screen_Readers section. 
- Added information on GNOME Magnifier to the Screen_Magnifiers section. 
- Moved On Screen Keyboards to their own section to clean up Other Tools. 
- Added information on gok (GNOME On-Screen Keyboard). 

* Sun Nov 22 2009 Eric Christensen <sparks at fedoraproject.org> 0.9-1
- Added Gnome features Dasher and Caribou. 
- Commented out dated information on how Red Hat and Fedora had or had not tested some of the FOSS solutions. 

* Mon Nov  9 2009 Eric Christensen <sparks at fedoraproject.org> 0.8-1
- Modified the "screen readers" section. 
- Removed link to KMouseTools and it was broken. 

* Sun Nov  8 2009 Susan Lauber <laubersm at fedoraproject.org> 0.7-1
- Various style edits (tense, spelling, etc.) 
- Added markup for menuitems 

* Sun Nov  8 2009 Eric Christensen <sparks at fedoraproject.org> 0.6-1
- Created "Mouse Tools" section, moved KMouseTools to that section, and added Mousetweaks. 
- Added GNOME information in the "Desktops" section. 
- Added comments to Tools.xml for further editing. 

* Sat Nov  7 2009 Eric Christensen <sparks at fedoraproject.org> 0.5-1
- Created "Other Tools" section and added BRLTTY, KMouth, and KMouseTool to that section. 
- Created "Screen Magnifiers" section and added KMagnifier. 
- Created "Desktops" section and added KDE. This section will include specific Desktop accessibility controls. 

* Wed Nov  4 2009 Eric Christensen <sparks at fedoraproject.org> 0.4-1
- Combined Speakup and Emacspeak into the Screen Readers section. 

* Thu Aug 20 2009 R?diger Landmann <rlandmann at redhat.com> 0.3-1
- Extra XML markup. 

* Thu Aug 20 2009 Eric Christensen <sparks at fedoraproject.org> 0.2-1
- Updated links and added information on Emacspeak. 

* Thu Aug  6 2009 Eric Christensen <sparks at fedoraproject.org> 0.1-1
- Publicanized all information in the Accessibility Guide 





--- NEW FILE import.log ---
fedora-accessibility-guide-en-US-12_0-1_fc12:F-12:fedora-accessibility-guide-en-US-12.0-1.fc12.src.rpm:1259704620


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:10:17 -0000	1.1
+++ .cvsignore	1 Dec 2009 21:57:33 -0000	1.2
@@ -0,0 +1 @@
+fedora-accessibility-guide-en-US-12.0-1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:10:17 -0000	1.1
+++ sources	1 Dec 2009 21:57:33 -0000	1.2
@@ -0,0 +1 @@
+5039fab955833ddae7250559e468c7b2  fedora-accessibility-guide-en-US-12.0-1.tgz



From devrim at fedoraproject.org  Tue Dec  1 22:06:42 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 22:06:42 +0000 (UTC)
Subject: rpms/pgbouncer/devel pgbouncer-ini.patch,1.1,1.2
Message-ID: <20091201220642.E67B511C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

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

Modified Files:
	pgbouncer-ini.patch 
Log Message:
Update patch for 1.3.1


pgbouncer-ini.patch:
 pgbouncer.ini |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: pgbouncer-ini.patch
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/pgbouncer-ini.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgbouncer-ini.patch	31 Aug 2008 10:49:05 -0000	1.1
+++ pgbouncer-ini.patch	1 Dec 2009 22:06:42 -0000	1.2
@@ -1,6 +1,6 @@
---- etc/pgbouncer.ini.old	2008-03-07 15:04:43.000000000 -0800
-+++ etc/pgbouncer.ini	2008-03-07 15:37:18.000000000 -0800
-@@ -17,8 +17,8 @@
+--- etc/pgbouncer.ini.old	2009-03-05 13:00:29.000000000 +0200
++++ etc/pgbouncer.ini	2009-03-05 13:02:18.000000000 +0200
+@@ -22,8 +22,8 @@
  ;;; Administrative settings
  ;;;
  
@@ -11,16 +11,7 @@
  
  ;;;
  ;;; Where to wait for clients
-@@ -26,7 +26,7 @@
- 
- ; ip address or * which means all ip-s
- listen_addr = 127.0.0.1
--listen_port = 6000
-+listen_port = 5450
- unix_socket_dir = /tmp
- 
- ;;;
-@@ -35,15 +35,15 @@
+@@ -40,15 +40,15 @@
  
  ; any, trust, plain, crypt, md5
  auth_type = trust



From devrim at fedoraproject.org  Tue Dec  1 22:07:33 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 22:07:33 +0000 (UTC)
Subject: rpms/pgbouncer/devel pgbouncer.init,1.1,1.2
Message-ID: <20091201220733.CEFAF11C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

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

Modified Files:
	pgbouncer.init 
Log Message:
Use correct service name :-)




Index: pgbouncer.init
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/pgbouncer.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgbouncer.init	31 Aug 2008 10:49:05 -0000	1.1
+++ pgbouncer.init	1 Dec 2009 22:07:33 -0000	1.2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postgresql    This is the init script for starting up the pgbouncer
+# pgbouncer    This is the init script for starting up the pgbouncer
 #
 # chkconfig: - 64 36
 # description: Starts and stops the pgbouncer daemon.



From nim at fedoraproject.org  Tue Dec  1 22:07:54 2009
From: nim at fedoraproject.org (nim)
Date: Tue,  1 Dec 2009 22:07:54 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.30, 1.31 fontpackages.spec,
	1.37, 1.38 import.log, 1.33, 1.34 sources, 1.30, 1.31
Message-ID: <20091201220754.A6A7811C00DE@cvs1.fedora.phx.redhat.com>

Author: nim

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

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.41


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	28 Nov 2009 20:04:24 -0000	1.30
+++ .cvsignore	1 Dec 2009 22:07:54 -0000	1.31
@@ -1 +1 @@
-fontpackages-1.40.tar.xz
+fontpackages-1.41.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- fontpackages.spec	28 Nov 2009 20:04:24 -0000	1.37
+++ fontpackages.spec	1 Dec 2009 22:07:54 -0000	1.38
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.40
+Version: 1.41
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -134,6 +134,10 @@ rm -fr %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Tue Dec 01 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.41-1
+? Bugfix release
+
 * Sat Nov 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.40-1
 ? Bugfix release


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- import.log	28 Nov 2009 20:04:24 -0000	1.33
+++ import.log	1 Dec 2009 22:07:54 -0000	1.34
@@ -31,3 +31,4 @@ fontpackages-1_37-1_fc13:HEAD:fontpackag
 fontpackages-1_38-1_fc13:HEAD:fontpackages-1.38-1.fc13.src.rpm:1259423037
 fontpackages-1_39-1_fc13:HEAD:fontpackages-1.39-1.fc13.src.rpm:1259427747
 fontpackages-1_40-1_fc13:HEAD:fontpackages-1.40-1.fc13.src.rpm:1259438431
+fontpackages-1_41-1_fc13:HEAD:fontpackages-1.41-1.fc13.src.rpm:1259703595


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	28 Nov 2009 20:04:24 -0000	1.30
+++ sources	1 Dec 2009 22:07:54 -0000	1.31
@@ -1 +1 @@
-a0e5cc0a64a05ecbf0a4ac0f1c90d51a  fontpackages-1.40.tar.xz
+ecf45dd0564a08350b89e8895898bc42  fontpackages-1.41.tar.xz



From roland at fedoraproject.org  Tue Dec  1 22:08:40 2009
From: roland at fedoraproject.org (roland)
Date: Tue,  1 Dec 2009 22:08:40 +0000 (UTC)
Subject: rpms/binutils/devel binutils.spec,1.183,1.184
Message-ID: <20091201220840.B5D3F11C00DE@cvs1.fedora.phx.redhat.com>

Author: roland

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

Modified Files:
	binutils.spec 
Log Message:
Build gold only for x86 flavors until others are tested.


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- binutils.spec	24 Nov 2009 23:13:35 -0000	1.183
+++ binutils.spec	1 Dec 2009 22:08:40 -0000	1.184
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.20.51.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -35,7 +35,7 @@ Patch09: binutils-2.20.51.0.2-ifunc-ld-s
 Patch10: binutils-2.20.51.0.2-lwp.patch
 Patch11: binutils-2.20.51.0.2-enable-gold.patch
 
-%define gold_arches %ix86 x86_64 %sparc %arm ppc ppc64
+%define gold_arches %ix86 x86_64
 
 %ifarch %gold_arches
 %define build_gold	both
@@ -423,6 +423,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Tue Dec  1 2009 Roland McGrath <roland at redhat.com> - 2.20.51.0.2-8
+- Build gold only for x86 flavors until others are tested.
+
 * Tue Nov 24 2009 Roland McGrath <roland at redhat.com> - 2.20.51.0.2-7
 - Add support for building gold.
 



From nim at fedoraproject.org  Tue Dec  1 22:13:12 2009
From: nim at fedoraproject.org (nim)
Date: Tue,  1 Dec 2009 22:13:12 +0000 (UTC)
Subject: rpms/fontpackages/F-12 .cvsignore, 1.22, 1.23 fontpackages.spec,
	1.29, 1.30 import.log, 1.25, 1.26 sources, 1.22, 1.23
Message-ID: <20091201221312.5EEEC11C00DE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9303/F-12

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.41


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	23 Nov 2009 21:30:42 -0000	1.22
+++ .cvsignore	1 Dec 2009 22:13:11 -0000	1.23
@@ -1 +1 @@
-fontpackages-1.35.tar.xz
+fontpackages-1.41.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/fontpackages.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- fontpackages.spec	23 Nov 2009 21:30:42 -0000	1.29
+++ fontpackages.spec	1 Dec 2009 22:13:11 -0000	1.30
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.35
+Version: 1.41
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -46,8 +46,9 @@ create font packages.
 %package tools
 Summary: Tools used to check fonts and font packages
 
-Requires: fontconfig, fontforge, mutt, make
-Requires: rpmlint, yum-utils, fedora-packager
+Requires: fontconfig, fontforge
+Requires: curl, make, mutt
+Requires: fedora-packager, rpmlint, yum-utils
 
 %description tools
 This package contains tools used to check fonts and font packages
@@ -133,6 +134,14 @@ rm -fr %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Tue Dec 01 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.41-1
+? Bugfix release
+
+* Sat Nov 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.40-1
+? Bugfix release
+
 * Mon Nov 23 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.35-1
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- import.log	23 Nov 2009 21:30:42 -0000	1.25
+++ import.log	1 Dec 2009 22:13:11 -0000	1.26
@@ -23,3 +23,4 @@ fontpackages-1_30-1_fc13:F-12:fontpackag
 fontpackages-1_31-1_fc13:F-12:fontpackages-1.31-1.fc13.src.rpm:1257103098
 fontpackages-1_31-2_fc13:F-12:fontpackages-1.31-2.fc13.src.rpm:1257112403
 fontpackages-1_35-1_fc13:F-12:fontpackages-1.35-1.fc13.src.rpm:1259011802
+fontpackages-1_41-1_fc13:F-12:fontpackages-1.41-1.fc13.src.rpm:1259705577


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	23 Nov 2009 21:30:43 -0000	1.22
+++ sources	1 Dec 2009 22:13:11 -0000	1.23
@@ -1 +1 @@
-889ebe16ea65deb3e5ce14612a2f94ec  fontpackages-1.35.tar.xz
+ecf45dd0564a08350b89e8895898bc42  fontpackages-1.41.tar.xz



From nim at fedoraproject.org  Tue Dec  1 22:13:47 2009
From: nim at fedoraproject.org (nim)
Date: Tue,  1 Dec 2009 22:13:47 +0000 (UTC)
Subject: rpms/fontpackages/F-11 .cvsignore, 1.12, 1.13 fontpackages.spec,
	1.17, 1.18 import.log, 1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20091201221347.082B511C00DE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9573/F-11

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.41


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	23 Nov 2009 21:32:16 -0000	1.12
+++ .cvsignore	1 Dec 2009 22:13:46 -0000	1.13
@@ -1 +1 @@
-fontpackages-1.35.tar.xz
+fontpackages-1.41.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-11/fontpackages.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fontpackages.spec	23 Nov 2009 21:32:16 -0000	1.17
+++ fontpackages.spec	1 Dec 2009 22:13:46 -0000	1.18
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.35
+Version: 1.41
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -46,8 +46,9 @@ create font packages.
 %package tools
 Summary: Tools used to check fonts and font packages
 
-Requires: fontconfig, fontforge, mutt, make
-Requires: rpmlint, yum-utils, fedora-packager
+Requires: fontconfig, fontforge
+Requires: curl, make, mutt
+Requires: fedora-packager, rpmlint, yum-utils
 
 %description tools
 This package contains tools used to check fonts and font packages
@@ -133,6 +134,14 @@ rm -fr %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Tue Dec 01 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.41-1
+? Bugfix release
+
+* Sat Nov 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.40-1
+? Bugfix release
+
 * Mon Nov 23 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.35-1
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-11/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	23 Nov 2009 21:32:16 -0000	1.14
+++ import.log	1 Dec 2009 22:13:46 -0000	1.15
@@ -12,3 +12,4 @@ fontpackages-1_20-1_fc11:HEAD:fontpackag
 fontpackages-1_20-1_fc11:HEAD:fontpackages-1.20-1.fc11.src.rpm:1235377920
 fontpackages-1_28-1_fc13:F-11:fontpackages-1.28-1.fc13.src.rpm:1255987473
 fontpackages-1_35-1_fc13:F-11:fontpackages-1.35-1.fc13.src.rpm:1259011916
+fontpackages-1_41-1_fc13:F-11:fontpackages-1.41-1.fc13.src.rpm:1259705610


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	23 Nov 2009 21:32:16 -0000	1.12
+++ sources	1 Dec 2009 22:13:46 -0000	1.13
@@ -1 +1 @@
-889ebe16ea65deb3e5ce14612a2f94ec  fontpackages-1.35.tar.xz
+ecf45dd0564a08350b89e8895898bc42  fontpackages-1.41.tar.xz



From mclasen at fedoraproject.org  Tue Dec  1 22:15:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 22:15:22 +0000 (UTC)
Subject: rpms/gtk2/F-12 gtk2.spec,1.441,1.442
Message-ID: <20091201221522.8F13F11C00DE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9871

Modified Files:
	gtk2.spec 
Log Message:
Fix a mistranslation



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- gtk2.spec	1 Dec 2009 17:54:14 -0000	1.441
+++ gtk2.spec	1 Dec 2009 22:15:22 -0000	1.442
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -46,6 +46,8 @@ Patch14: gtk2-landscape-pdf-print.patch
 Patch15: filesystemref.patch
 # from upstream
 Patch16: o-minus.patch
+# from upstream
+Patch17: strftime-format.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -168,6 +170,7 @@ This package contains developer document
 %patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .filesystemref
 %patch16 -p1 -b .o-minus
+%patch17 -p1 -b .strftime-format
 
 %build
 %configure --with-xinput=xfree 		\
@@ -395,6 +398,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-3
+- Fix a misttranslated format string in no_NO (#500067)
+
 * Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-2
 - Make compose sequences for ?? consistent (#510741)
 



From mclasen at fedoraproject.org  Tue Dec  1 22:20:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  1 Dec 2009 22:20:34 +0000 (UTC)
Subject: rpms/gtk2/F-12 strftime-format.patch,NONE,1.1
Message-ID: <20091201222034.1A3B611C03DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10582

Added Files:
	strftime-format.patch 
Log Message:
Add patch


strftime-format.patch:
 nn.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE strftime-format.patch ---
diff -up gtk+-2.18.4/po/nn.po.strftime-format gtk+-2.18.4/po/nn.po
--- gtk+-2.18.4/po/nn.po.strftime-format	2009-12-01 17:10:57.815372584 -0500
+++ gtk+-2.18.4/po/nn.po	2009-12-01 17:11:06.121006612 -0500
@@ -1967,7 +1967,7 @@ msgstr "Ukjent"
 #
 #: gtk/gtkfilechooserdefault.c:11495
 msgid "%H:%M"
-msgstr "H:%M"
+msgstr "%H:%M"
 
 #
 #: gtk/gtkfilechooserdefault.c:11497



From sparks at fedoraproject.org  Tue Dec  1 22:21:10 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Tue,  1 Dec 2009 22:21:10 +0000 (UTC)
Subject: rpms/fedora-accessibility-guide-en-US/F-11
	fedora-accessibility-guide-en-US.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091201222110.BECD911C02C4@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10908/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-accessibility-guide-en-US.spec import.log 
Log Message:
Initial Accessibility Guide release.



--- NEW FILE fedora-accessibility-guide-en-US.spec ---
# Documentation Specfile
%define HTMLVIEW %(eval 'if [ "%{?dist}" = ".el5" ]; then echo "1"; else echo "0"; fi')

%define viewer xdg-open

%if %{HTMLVIEW}
%define viewer htmlview
%define vendor redhat-
%define vendoropt --vendor="redhat"
%endif

Name:         fedora-accessibility-guide-en-US
Version:      12.0
Release:      1%{?dist}


Summary:       Using Fedora with a visual, hearing, or mobility impairment

Group:         Documentation
License:       CC-BY-SA
URL:           http://docs.fedoraproject.org
Source:        %{name}-%{version}-1.tgz
BuildArch:     noarch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: publican
BuildRequires: desktop-file-utils


BuildRequires:    publican-fedora

%if %{HTMLVIEW}
Requires:    htmlview
%else
Requires:    xdg-utils
%endif

%description


This document describes some of the hardware devices, applications
and utilities available to assist people with disabilities to use a
computer with the Fedora operating system.


%prep
%setup -q

%build
publican build --formats="html-desktop" --langs=en-US

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications

cat > %{name}.desktop <<'EOF'
[Desktop Entry]
Name=fedora 12: Accessibility Guide
Comment=Using Fedora with a visual, hearing, or mobility impairment
Exec=%{viewer} %{_docdir}/%{name}-%{version}/index.html
Icon=%{_docdir}/%{name}-%{version}/images/icon.svg
Categories=Documentation;X-Red-Hat-Base;
Type=Application
Encoding=UTF-8
Terminal=false
EOF

%if %{HTMLVIEW}
desktop-file-install  %{?vendoropt} --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
%else
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc tmp/en-US/html-desktop/*
%if %{HTMLVIEW}
%{_datadir}/applications/%{?vendor}%{name}.desktop
%else
%{_datadir}/applications/%{name}.desktop
%endif

%changelog
* Sat Nov 28 2009 Eric Christensen <sparks at fedoraproject.org> 12.0-1
- Commented out Emacspeak sections that still need work. 
- Changed to be the official version for Fedora 12. 

* Sat Nov 28 2009 Susan Lauber <laubersm at fedoraproject.org> 0.9-2
- Made some minor readability, grammar, and style edits. 
- Added a number of markup additions for consistancy. 
- Added information on enabling Orca in GNOME to the Screen_Readers section. 
- Added information on GNOME Magnifier to the Screen_Magnifiers section. 
- Moved On Screen Keyboards to their own section to clean up Other Tools. 
- Added information on gok (GNOME On-Screen Keyboard). 

* Sun Nov 22 2009 Eric Christensen <sparks at fedoraproject.org> 0.9-1
- Added Gnome features Dasher and Caribou. 
- Commented out dated information on how Red Hat and Fedora had or had not tested some of the FOSS solutions. 

* Mon Nov  9 2009 Eric Christensen <sparks at fedoraproject.org> 0.8-1
- Modified the "screen readers" section. 
- Removed link to KMouseTools and it was broken. 

* Sun Nov  8 2009 Susan Lauber <laubersm at fedoraproject.org> 0.7-1
- Various style edits (tense, spelling, etc.) 
- Added markup for menuitems 

* Sun Nov  8 2009 Eric Christensen <sparks at fedoraproject.org> 0.6-1
- Created "Mouse Tools" section, moved KMouseTools to that section, and added Mousetweaks. 
- Added GNOME information in the "Desktops" section. 
- Added comments to Tools.xml for further editing. 

* Sat Nov  7 2009 Eric Christensen <sparks at fedoraproject.org> 0.5-1
- Created "Other Tools" section and added BRLTTY, KMouth, and KMouseTool to that section. 
- Created "Screen Magnifiers" section and added KMagnifier. 
- Created "Desktops" section and added KDE. This section will include specific Desktop accessibility controls. 

* Wed Nov  4 2009 Eric Christensen <sparks at fedoraproject.org> 0.4-1
- Combined Speakup and Emacspeak into the Screen Readers section. 

* Thu Aug 20 2009 R?diger Landmann <rlandmann at redhat.com> 0.3-1
- Extra XML markup. 

* Thu Aug 20 2009 Eric Christensen <sparks at fedoraproject.org> 0.2-1
- Updated links and added information on Emacspeak. 

* Thu Aug  6 2009 Eric Christensen <sparks at fedoraproject.org> 0.1-1
- Publicanized all information in the Accessibility Guide 





--- NEW FILE import.log ---
fedora-accessibility-guide-en-US-12_0-1_fc12:F-11:fedora-accessibility-guide-en-US-12.0-1.fc12.src.rpm:1259706048


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:10:17 -0000	1.1
+++ .cvsignore	1 Dec 2009 22:21:10 -0000	1.2
@@ -0,0 +1 @@
+fedora-accessibility-guide-en-US-12.0-1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-accessibility-guide-en-US/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:10:17 -0000	1.1
+++ sources	1 Dec 2009 22:21:10 -0000	1.2
@@ -0,0 +1 @@
+5039fab955833ddae7250559e468c7b2  fedora-accessibility-guide-en-US-12.0-1.tgz



From devrim at fedoraproject.org  Tue Dec  1 22:22:04 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 22:22:04 +0000 (UTC)
Subject: rpms/pgbouncer/F-11 .cvsignore, 1.2, 1.3 pgbouncer-ini.patch, 1.1, 
	1.2 pgbouncer.init, 1.1, 1.2 pgbouncer.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091201222204.78B5611C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgbouncer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11644/F-11

Modified Files:
	.cvsignore pgbouncer-ini.patch pgbouncer.init pgbouncer.spec 
	sources 
Log Message:
Update to 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Aug 2008 10:49:05 -0000	1.2
+++ .cvsignore	1 Dec 2009 22:22:03 -0000	1.3
@@ -1 +1 @@
-pgbouncer-1.2.3.tgz
+pgbouncer-1.3.1.tgz

pgbouncer-ini.patch:
 pgbouncer.ini |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: pgbouncer-ini.patch
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-11/pgbouncer-ini.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgbouncer-ini.patch	31 Aug 2008 10:49:05 -0000	1.1
+++ pgbouncer-ini.patch	1 Dec 2009 22:22:04 -0000	1.2
@@ -1,6 +1,6 @@
---- etc/pgbouncer.ini.old	2008-03-07 15:04:43.000000000 -0800
-+++ etc/pgbouncer.ini	2008-03-07 15:37:18.000000000 -0800
-@@ -17,8 +17,8 @@
+--- etc/pgbouncer.ini.old	2009-03-05 13:00:29.000000000 +0200
++++ etc/pgbouncer.ini	2009-03-05 13:02:18.000000000 +0200
+@@ -22,8 +22,8 @@
  ;;; Administrative settings
  ;;;
  
@@ -11,16 +11,7 @@
  
  ;;;
  ;;; Where to wait for clients
-@@ -26,7 +26,7 @@
- 
- ; ip address or * which means all ip-s
- listen_addr = 127.0.0.1
--listen_port = 6000
-+listen_port = 5450
- unix_socket_dir = /tmp
- 
- ;;;
-@@ -35,15 +35,15 @@
+@@ -40,15 +40,15 @@
  
  ; any, trust, plain, crypt, md5
  auth_type = trust


Index: pgbouncer.init
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-11/pgbouncer.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgbouncer.init	31 Aug 2008 10:49:05 -0000	1.1
+++ pgbouncer.init	1 Dec 2009 22:22:04 -0000	1.2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postgresql    This is the init script for starting up the pgbouncer
+# pgbouncer    This is the init script for starting up the pgbouncer
 #
 # chkconfig: - 64 36
 # description: Starts and stops the pgbouncer daemon.


Index: pgbouncer.spec
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-11/pgbouncer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pgbouncer.spec	26 Feb 2009 19:46:56 -0000	1.2
+++ pgbouncer.spec	1 Dec 2009 22:22:04 -0000	1.3
@@ -1,13 +1,13 @@
 %define debug 0
 
 Name:		pgbouncer
-Version:	1.2.3
-Release:	4%{?dist}
+Version:	1.3.1
+Release:	1%{?dist}
 Summary:	Lightweight connection pooler for PostgreSQL
 Group:		Applications/Databases
 License:	MIT and BSD
 URL:		http://pgfoundry.org/projects/pgbouncer/
-Source0:	http://pgfoundry.org/frs/download.php/1873/%{name}-%{version}.tgz
+Source0:	http://pgfoundry.org/frs/download.php/2284/%{name}-%{version}.tgz
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-ini.patch
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 %{_mandir}/man5/%{name}.*
 
 %changelog
+* Tue Dec 1 2009 - Devrim GUNDUZ <devrim at gunduz.org> 1.3.1-1
+- Update to 1.3.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2008 10:49:05 -0000	1.2
+++ sources	1 Dec 2009 22:22:04 -0000	1.3
@@ -1 +1 @@
-e8afc79103cd464c109a56e418a9ba24  pgbouncer-1.2.3.tgz
+ccb2dbe8b6ce505e14762712c478982e  pgbouncer-1.3.1.tgz



From devrim at fedoraproject.org  Tue Dec  1 22:22:04 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Tue,  1 Dec 2009 22:22:04 +0000 (UTC)
Subject: rpms/pgbouncer/F-12 .cvsignore, 1.2, 1.3 pgbouncer-ini.patch, 1.1, 
	1.2 pgbouncer.init, 1.1, 1.2 pgbouncer.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20091201222204.D45A811C00DE@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgbouncer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11644/F-12

Modified Files:
	.cvsignore pgbouncer-ini.patch pgbouncer.init pgbouncer.spec 
	sources 
Log Message:
Update to 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Aug 2008 10:49:05 -0000	1.2
+++ .cvsignore	1 Dec 2009 22:22:04 -0000	1.3
@@ -1 +1 @@
-pgbouncer-1.2.3.tgz
+pgbouncer-1.3.1.tgz

pgbouncer-ini.patch:
 pgbouncer.ini |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: pgbouncer-ini.patch
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-12/pgbouncer-ini.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgbouncer-ini.patch	31 Aug 2008 10:49:05 -0000	1.1
+++ pgbouncer-ini.patch	1 Dec 2009 22:22:04 -0000	1.2
@@ -1,6 +1,6 @@
---- etc/pgbouncer.ini.old	2008-03-07 15:04:43.000000000 -0800
-+++ etc/pgbouncer.ini	2008-03-07 15:37:18.000000000 -0800
-@@ -17,8 +17,8 @@
+--- etc/pgbouncer.ini.old	2009-03-05 13:00:29.000000000 +0200
++++ etc/pgbouncer.ini	2009-03-05 13:02:18.000000000 +0200
+@@ -22,8 +22,8 @@
  ;;; Administrative settings
  ;;;
  
@@ -11,16 +11,7 @@
  
  ;;;
  ;;; Where to wait for clients
-@@ -26,7 +26,7 @@
- 
- ; ip address or * which means all ip-s
- listen_addr = 127.0.0.1
--listen_port = 6000
-+listen_port = 5450
- unix_socket_dir = /tmp
- 
- ;;;
-@@ -35,15 +35,15 @@
+@@ -40,15 +40,15 @@
  
  ; any, trust, plain, crypt, md5
  auth_type = trust


Index: pgbouncer.init
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-12/pgbouncer.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgbouncer.init	31 Aug 2008 10:49:05 -0000	1.1
+++ pgbouncer.init	1 Dec 2009 22:22:04 -0000	1.2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postgresql    This is the init script for starting up the pgbouncer
+# pgbouncer    This is the init script for starting up the pgbouncer
 #
 # chkconfig: - 64 36
 # description: Starts and stops the pgbouncer daemon.


Index: pgbouncer.spec
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-12/pgbouncer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pgbouncer.spec	26 Jul 2009 17:53:54 -0000	1.3
+++ pgbouncer.spec	1 Dec 2009 22:22:04 -0000	1.4
@@ -1,13 +1,13 @@
 %define debug 0
 
 Name:		pgbouncer
-Version:	1.2.3
-Release:	5%{?dist}
+Version:	1.3.1
+Release:	1%{?dist}
 Summary:	Lightweight connection pooler for PostgreSQL
 Group:		Applications/Databases
 License:	MIT and BSD
 URL:		http://pgfoundry.org/projects/pgbouncer/
-Source0:	http://pgfoundry.org/frs/download.php/1873/%{name}-%{version}.tgz
+Source0:	http://pgfoundry.org/frs/download.php/2284/%{name}-%{version}.tgz
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-ini.patch
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 %{_mandir}/man5/%{name}.*
 
 %changelog
+* Tue Dec 1 2009 - Devrim GUNDUZ <devrim at gunduz.org> 1.3.1-1
+- Update to 1.3.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2008 10:49:05 -0000	1.2
+++ sources	1 Dec 2009 22:22:04 -0000	1.3
@@ -1 +1 @@
-e8afc79103cd464c109a56e418a9ba24  pgbouncer-1.2.3.tgz
+ccb2dbe8b6ce505e14762712c478982e  pgbouncer-1.3.1.tgz



From dledford at fedoraproject.org  Tue Dec  1 22:46:17 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Tue,  1 Dec 2009 22:46:17 +0000 (UTC)
Subject: rpms/mdadm/devel mdadm.spec,1.77,1.78 mdmonitor.init,1.10,1.11
Message-ID: <20091201224617.38FB111C00DE@cvs1.fedora.phx.redhat.com>

Author: dledford

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

Modified Files:
	mdadm.spec mdmonitor.init 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-2
- Minor tweak to init script for LSB compliance (bz527957)



Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- mdadm.spec	5 Nov 2009 21:34:56 -0000	1.77
+++ mdadm.spec	1 Dec 2009 22:46:16 -0000	1.78
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0.3
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -83,6 +83,9 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-2
+- Minor tweak to init script for LSB compliance (bz527957)
+
 * Wed Nov 04 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-1
 - New upstream release 3.0.3 (bz523320, bz527281)
 - Update a couple internal patches


Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdmonitor.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mdmonitor.init	5 Nov 2009 21:30:16 -0000	1.10
+++ mdmonitor.init	1 Dec 2009 22:46:16 -0000	1.11
@@ -68,6 +68,7 @@ stop ()
     echo -n "Killing $prog: "
     killproc mdadm
     echo
+    rm -f $PIDFILE
     rm -f /var/lock/subsys/$prog
 }
 



From sailer at fedoraproject.org  Tue Dec  1 22:46:27 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue,  1 Dec 2009 22:46:27 +0000 (UTC)
Subject: rpms/mingw32-qt-qmake/devel mingw32-qt-qmake.spec,1.10,1.11
Message-ID: <20091201224627.CF45211C00DE@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-qt-qmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15069

Modified Files:
	mingw32-qt-qmake.spec 
Log Message:
update to 4.6.0



Index: mingw32-qt-qmake.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt-qmake/devel/mingw32-qt-qmake.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-qt-qmake.spec	19 Nov 2009 09:38:28 -0000	1.10
+++ mingw32-qt-qmake.spec	1 Dec 2009 22:46:27 -0000	1.11
@@ -6,14 +6,14 @@
 
 %global debug_package %{nil}
 
-%global pre beta1
+#global pre beta1
 
 %global platform win32-fedora-cross
 %global compatplatform fedora-win32-cross
 
 Name:           mingw32-qt-qmake
 Version:        4.6.0
-Release:        0.1.%{pre}%{?dist}
+Release:        1%{?pre}%{?dist}
 Summary:        Qt for Windows Build Environment
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-1
+- update to 4.6.0
+
 * Tue Nov 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-0.1.beta1
 - update to 4.6.0beta1
 



From dwalsh at fedoraproject.org  Tue Dec  1 22:47:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 22:47:17 +0000 (UTC)
Subject: rpms/libsemanage/devel .cvsignore, 1.108, 1.109 libsemanage.spec,
	1.190, 1.191 sources, 1.111, 1.112
Message-ID: <20091201224717.80D7F11C00DE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.43-1
- Update to upstream
	* Move libsemanage.so to /usr/lib
	* Add NAME lines to man pages from Manoj Srivastava<srivasta at debian.org>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- .cvsignore	18 Nov 2009 22:19:05 -0000	1.108
+++ .cvsignore	1 Dec 2009 22:47:17 -0000	1.109
@@ -115,3 +115,4 @@ libsemanage-2.0.39.tgz
 libsemanage-2.0.40.tgz
 libsemanage-2.0.41.tgz
 libsemanage-2.0.42.tgz
+libsemanage-2.0.43.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- libsemanage.spec	18 Nov 2009 22:19:06 -0000	1.190
+++ libsemanage.spec	1 Dec 2009 22:47:17 -0000	1.191
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.42
+Version: 2.0.43
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -92,6 +92,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.43-1
+- Update to upstream
+	* Move libsemanage.so to /usr/lib
+	* Add NAME lines to man pages from Manoj Srivastava<srivasta at debian.org>
+
 * Wed Nov 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.42-1
 - Update to upstream
 	* Move load_policy from /usr/sbin to /sbin from Dan Walsh.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	18 Nov 2009 22:19:06 -0000	1.111
+++ sources	1 Dec 2009 22:47:17 -0000	1.112
@@ -1 +1 @@
-0fadd711479ed67fd8fb87bed58f1cb7  libsemanage-2.0.42.tgz
+fb11e8dfb69cefbd014419804df82294  libsemanage-2.0.43.tgz



From dwalsh at fedoraproject.org  Tue Dec  1 22:50:19 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  1 Dec 2009 22:50:19 +0000 (UTC)
Subject: rpms/checkpolicy/devel .cvsignore, 1.81, 1.82 checkpolicy.spec,
	1.136, 1.137 sources, 1.82, 1.83
Message-ID: <20091201225019.3073311C03DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Tue Nov 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.21-1
- Latest update from NSA
	* Add support for building Xen policies from Paul Nuzzi.
	* Add long options to checkpolicy and checkmodule by Guido
	  Trentalancia <guido at trentalancia.com>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	18 Feb 2009 21:54:40 -0000	1.81
+++ .cvsignore	1 Dec 2009 22:50:18 -0000	1.82
@@ -71,3 +71,5 @@ checkpolicy-2.0.16.tgz
 checkpolicy-2.0.17.tgz
 checkpolicy-2.0.18.tgz
 checkpolicy-2.0.19.tgz
+checkpolicy-2.0.20.tgz
+checkpolicy-2.0.21.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- checkpolicy.spec	24 Jul 2009 18:52:16 -0000	1.136
+++ checkpolicy.spec	1 Dec 2009 22:50:18 -0000	1.137
@@ -1,8 +1,8 @@
-%define libsepolver 2.0.35-1
+%define libsepolver 2.0.39-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 2.0.19
-Release: 3%{?dist}
+Version: 2.0.21
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -55,6 +55,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/sedispol
 
 %changelog
+* Tue Nov 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.21-1
+- Latest update from NSA
+	* Add support for building Xen policies from Paul Nuzzi.
+	* Add long options to checkpolicy and checkmodule by Guido
+	  Trentalancia <guido at trentalancia.com>
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	18 Feb 2009 21:54:40 -0000	1.82
+++ sources	1 Dec 2009 22:50:19 -0000	1.83
@@ -1 +1 @@
-7f6b0a4cb49e62f0eb1fef28e1da117e  checkpolicy-2.0.19.tgz
+c95a8fd53be09715f6652cc93fcd646d  checkpolicy-2.0.21.tgz



From dledford at fedoraproject.org  Tue Dec  1 22:54:36 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Tue,  1 Dec 2009 22:54:36 +0000 (UTC)
Subject: rpms/mdadm/F-12 mdadm.spec,1.76,1.77 mdmonitor.init,1.10,1.11
Message-ID: <20091201225436.84A7D11C00DE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17377

Modified Files:
	mdadm.spec mdmonitor.init 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-2
- Minor tweak to init script for LSB compliance (bz527957)



Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdadm.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- mdadm.spec	5 Nov 2009 22:33:08 -0000	1.76
+++ mdadm.spec	1 Dec 2009 22:54:35 -0000	1.77
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0.3
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -83,6 +83,9 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-2
+- Minor tweak to init script for LSB compliance (bz527957)
+
 * Wed Nov 04 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-1
 - New upstream release 3.0.3 (bz523320, bz527281)
 - Update a couple internal patches


Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdmonitor.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mdmonitor.init	5 Nov 2009 22:33:08 -0000	1.10
+++ mdmonitor.init	1 Dec 2009 22:54:36 -0000	1.11
@@ -68,6 +68,7 @@ stop ()
     echo -n "Killing $prog: "
     killproc mdadm
     echo
+    rm -f $PIDFILE
     rm -f /var/lock/subsys/$prog
 }
 



From bioinfornatics at fedoraproject.org  Tue Dec  1 23:10:16 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Tue,  1 Dec 2009 23:10:16 +0000 (UTC)
Subject: rpms/earth-and-moon-backgrounds/F-12 .cvsignore, 1.2,
	1.3 earth-and-moon-backgrounds.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091201231016.9369211C03F6@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/earth-and-moon-backgrounds/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20313

Modified Files:
	.cvsignore earth-and-moon-backgrounds.spec sources 
Log Message:
Perform quality,License tag change to CC-BY-SA,KDE user can now use this wallpaper


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2009 20:55:28 -0000	1.2
+++ .cvsignore	1 Dec 2009 23:10:14 -0000	1.3
@@ -1 +1 @@
-earth-and-moon-0.1.tar.gz
+earth-and-moon-backgrounds-0.2.tar.xz


Index: earth-and-moon-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/F-12/earth-and-moon-backgrounds.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- earth-and-moon-backgrounds.spec	24 Jul 2009 20:45:40 -0000	1.2
+++ earth-and-moon-backgrounds.spec	1 Dec 2009 23:10:15 -0000	1.3
@@ -1,54 +1,172 @@
-%global		_appname	earth-and-moon
+Name:           earth-and-moon-backgrounds
+Version:        0.2
+Release:        1%{?dist}
+Summary:        Earth-and-moon desktop backgrounds
+
+Group:          Applications/Multimedia
+License:        CC-BY-SA
+URL:            http://bioinformatiques.free.fr/
+
+Source0:        %{name}-%{version}.tar.xz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-dual = %{version}-%{release}
 
-Name:		earth-and-moon-backgrounds
-Version:	0.1
-Release:	5%{?dist}
-Summary:	Modern background
-License:	GPL+
-Group:		User Interface/Desktops
-URL:		http://bioinformatiques.free.fr/
-Source0:	http://bioinformatiques.free.fr/%{_appname}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{_appname}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+%description
+This package contains desktop backgrounds for the earth-and-moon theme.
+
+%prep
+%setup -q
 
+%package        common
+Summary:        Earth-and-moon desktop backgrounds shared between GNOME and KDE
+Group:          Applications/Multimedia
 
-%description
+%description    common
+This package includes the common files used by both GNOME and KDE.
+
+%description -l fr common
+Ce paquet inclut les fichiers commun ? GNOME et KDE
+
+%package        kdm
+Summary:        Earth-and-moon desktop background for KDM
+Group:          Applications/Multimedia
+
+%description    kdm
+Earth-and-moon desktop background used in KDM.
+
+%description -l fr kdm
+Ce paquet inclut les fond ?crans earth-and-moon qui sont utilis?s dans KDM
+
+%package        single
+Summary:        Extra earth-and-moon desktop background with modern look
+Group:          Applications/Multimedia
+
+%description    single
 Earthlooks is beautiful theme. The background change often. You can see earth
 rotate on herself and moon rotate around earth. This theme is compatible with
-many resolution: eepc: 800x480, normalish: 1280x1024, normal: 1600x1200, wide:
-1900x1200
+many resolution: 800x600, 1280x1024, 1600x1200, 1680x1050, 1900x1200
+
+%description -l fr single
+Earthlooks est un th?me magnifique. Les fonds ?crans change r?guli?rement.
+Vous pouvez voir la Terre tourner sur elle m?me et la lune tourne autour de la
+Terre. Ce fond ?crans sont compatibles dans plusieurs r?solution: 800x600,
+1280x1024, 1680x1050, 1600x1200, 1900x1200
+
+%package        dual
+Summary:        Shared dual screen earth-and-moon desktop backgrounds
+Group:          Applications/Multimedia
+
+%description dual
+Earthlooks is beautiful theme. The background change often. You can see earth
+rotate on herself and moon rotate around earth. This theme is compatible with
+many resolution: 2560x1024, 2960x1050, 3200x1200, 3840x1200
+
+%description -l fr dual
+Earthlooks est un th?me magnifique. Les fonds ?crans change r?guli?rement.
+Vous pouvez voir la Terre tourner sur elle m?me et la lune tourne autour de la
+Terre. Ce fond ?crans sont compatibles dans plusieurs r?solution: 2560x1024,
+2960x1050, 3200x1200, 3840x1200
 
-%prep
-%setup -q -n %{_appname}-%{version}
 
 %build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-# create wallpaper directorie
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
-# copy image files
-install -p -m644 images/* $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
 
-# copy xml file
-install -p -m644 %{_appname}.xml $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
+# prepare the dir structure
+for RESOLUTION in 800x600 1280x1024 1600x1200 1680x1050 1900x1200 2560x1024 3200x1200 3840x1200;
+do mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon/$RESOLUTION;
+done;
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+
+# copy the earth-and-moon images
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon/{800x600,1280x1024,1600x1200,1680x1050,1900x1200,2560x1024,2960x1050,3200x1200,3840x1200} \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon/
+
+# copy slideshow xml files
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon-hd.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon
 
 # copy metadata xmls file
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties/
-cp -p desktop-backgrounds-earth-and-moon.xml $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties/
-
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-earth-and-moon.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-earth-and-moon-hd.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
-%doc README
-%dir %{_datadir}/gnome-background-properties/
-%{_datadir}/backgrounds/earth-and-moon/
+%doc COPYING
 %{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon.xml
+
+%files common
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/earth-and-moon
+%dir %{_datadir}/backgrounds/earth-and-moon/800x600
+%dir %{_datadir}/backgrounds/earth-and-moon/1280x1024
+%dir %{_datadir}/backgrounds/earth-and-moon/1680x1050
+%dir %{_datadir}/backgrounds/earth-and-moon/1600x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/1900x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/2560x1024
+%dir %{_datadir}/backgrounds/earth-and-moon/2960x1050
+%dir %{_datadir}/backgrounds/earth-and-moon/3200x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/3840x1200
+%{_datadir}/backgrounds/earth-and-moon/800x600/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1280x1024/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1680x1050/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1600x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1900x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/2560x1024/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/2960x1050/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/3200x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/3840x1200/01.jpeg
+
+%files dual
+%defattr(-,root,root,-)
+%doc COPYING
+%{_datadir}/backgrounds/earth-and-moon/2560x1024
+%{_datadir}/backgrounds/earth-and-moon/2960x1050
+%{_datadir}/backgrounds/earth-and-moon/3200x1200
+%{_datadir}/backgrounds/earth-and-moon/3840x1200
+%{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon-hd.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon-hd.xml
+
+%files single
+%defattr(-,root,root,-)
+%doc COPYING
+%{_datadir}/backgrounds/earth-and-moon/800x600
+%{_datadir}/backgrounds/earth-and-moon/1280x1024
+%{_datadir}/backgrounds/earth-and-moon/1680x1050
+%{_datadir}/backgrounds/earth-and-moon/1600x1200
+%{_datadir}/backgrounds/earth-and-moon/1900x1200
+%{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon.xml
+
+%files kdm
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/earth-and-moon
+%dir %{_datadir}/backgrounds/earth-and-moon/1680x1050
+%{_datadir}/backgrounds/earth-and-moon/1680x1050/01.jpeg
 
 %changelog
+* Mon Nov 30 2009  Jonathan MERCIER <bioinfornatics at gmail.com> - 0.2-1
+- Perform quality and add some new reolution such as 800x600, 1680x1050
+  2560x1024, 2960x1050, 3200x1200, 3840x1200
+- License tag change to "CC-BY-SA"
+- KDE user can now use this wallpaper
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -69,3 +187,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Oct 25 2008 Jonathan MERCIER <bioinfornatics at gmail.com> - 0.1-1
 - Initial release
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2009 20:55:28 -0000	1.2
+++ sources	1 Dec 2009 23:10:15 -0000	1.3
@@ -1 +1 @@
-f10c76967718c77406810643dcf74b22  earth-and-moon-0.1.tar.gz
+f0275fa0418d1a479fd4233f70375583  earth-and-moon-backgrounds-0.2.tar.xz



From dledford at fedoraproject.org  Tue Dec  1 23:13:57 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Tue,  1 Dec 2009 23:13:57 +0000 (UTC)
Subject: rpms/mdadm/F-11 mdadm.spec,1.72,1.73 mdmonitor.init,1.9,1.10
Message-ID: <20091201231357.DF3A011C02A7@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20826

Modified Files:
	mdadm.spec mdmonitor.init 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-2
- Minor tweak to init script for LSB compliance (bz527957)



Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-11/mdadm.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- mdadm.spec	10 Nov 2009 13:21:36 -0000	1.72
+++ mdadm.spec	1 Dec 2009 23:13:57 -0000	1.73
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0.3
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -83,6 +83,9 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-2
+- Minor tweak to init script for LSB compliance (bz527957)
+
 * Wed Nov 04 2009 Doug Ledford <dledford at redhat.com> - 3.0.3-1
 - New upstream release 3.0.3 (bz523320, bz527281)
 - Update a couple internal patches


Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-11/mdmonitor.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mdmonitor.init	10 Nov 2009 13:21:36 -0000	1.9
+++ mdmonitor.init	1 Dec 2009 23:13:57 -0000	1.10
@@ -68,6 +68,7 @@ stop ()
     echo -n "Killing $prog: "
     killproc mdadm
     echo
+    rm -f $PIDFILE
     rm -f /var/lock/subsys/$prog
 }
 



From bskeggs at fedoraproject.org  Tue Dec  1 23:24:15 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue,  1 Dec 2009 23:24:15 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.68, 1.69 kernel.spec, 1.1943, 
	1.1944
Message-ID: <20091201232415.83FEB11C00A3@cvs1.fedora.phx.redhat.com>

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Dec 02 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-158
- nouveau: more complete lvds script selection on >=G80 (rh#522690, rh#529859)
- nouveau: more complete tmds script selection on >=G80 (rh#537853)
- nouveau: TV detection fixes



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   56 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   30 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5988 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  280 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  663 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  469 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  468 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  812 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   54 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  155 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  157 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1299 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  380 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   47 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  976 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  257 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  696 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  585 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  196 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  321 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  876 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1001 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  528 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  316 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  271 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  210 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  260 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  892 
 drivers/gpu/drm/nouveau/nv17_gpio.c         |   92 
 drivers/gpu/drm/nouveau/nv17_tv.c           |  681 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  780 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  314 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2239 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  788 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  153 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  304 
 drivers/gpu/drm/nouveau/nv50_display.c      |  994 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  273 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  494 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  479 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |26832 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  509 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  269 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  220 
 85 files changed, 64006 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- drm-nouveau.patch	19 Nov 2009 00:26:21 -0000	1.68
+++ drm-nouveau.patch	1 Dec 2009 23:24:14 -0000	1.69
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index f831ea1..a2320ac 100644
+index e4d971c..62dd13c 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -154,3 +154,59 @@ config DRM_SAVAGE
+@@ -153,3 +153,59 @@ config DRM_SAVAGE
  	help
  	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
  	  chipset. If M is selected the module will be called savage.
@@ -1450,10 +1450,10 @@ index 0000000..b06d3d9
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..e12b4ff
+index 0000000..fd75226
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,30 @@
 +#
 +# Makefile for the drm device driver.  This driver provides support for the
 +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
@@ -1475,7 +1475,8 @@ index 0000000..e12b4ff
 +             nv50_crtc.o nv50_dac.o nv50_sor.o \
 +             nv50_cursor.o nv50_display.o nv50_fbcon.o \
 +             nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \
-+             nv04_crtc.o nv04_display.o nv04_cursor.o nv04_fbcon.o
++             nv04_crtc.o nv04_display.o nv04_cursor.o nv04_fbcon.o \
++             nv17_gpio.o
 +
 +nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
@@ -1777,10 +1778,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..ba946df
+index 0000000..6ddeca2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5734 @@
+@@ -0,0 +1,5988 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -4309,6 +4310,19 @@ index 0000000..ba946df
 +}
 +
 +static bool
++init_8c(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++{
++	/*
++	 * INIT_85   opcode: 0x8C ('')
++	 *
++	 * NOP so far....
++	 *
++	 */
++
++	return true;
++}
++
++static bool
 +init_gpio(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
 +{
 +	/*
@@ -4322,7 +4336,7 @@ index 0000000..ba946df
 +
 +	const uint32_t nv50_gpio_reg[4] = { 0xe104, 0xe108, 0xe280, 0xe284 };
 +	const uint32_t nv50_gpio_ctl[2] = { 0xe100, 0xe28c };
-+	const uint8_t *gpio_table = &bios->data[bios->bdcb.init8e_table_ptr];
++	const uint8_t *gpio_table = &bios->data[bios->bdcb.gpio_table_ptr];
 +	const uint8_t *gpio_entry;
 +	int i;
 +
@@ -4331,7 +4345,7 @@ index 0000000..ba946df
 +		return false;
 +	}
 +
-+	if (!bios->bdcb.init8e_table_ptr) {
++	if (!bios->bdcb.gpio_table_ptr) {
 +		NV_WARN(bios->dev, "Invalid pointer to INIT_8E table\n");
 +		return false;
 +	}
@@ -4753,6 +4767,7 @@ index 0000000..ba946df
 +	{ "INIT_ZM_REG"                       , 0x7A, 9       , 0       , 0       , init_zm_reg                     },
 +	/* INIT_RAM_RESTRICT_PLL's length is adjusted by the BIT M table */
 +	{ "INIT_RAM_RESTRICT_PLL"             , 0x87, 2       , 0       , 0       , init_ram_restrict_pll           },
++	{ "INIT_8C"                           , 0x8C, 1       , 0       , 0       , init_8c                         },
 +	{ "INIT_GPIO"                         , 0x8E, 1       , 0       , 0       , init_gpio                       },
 +	/* INIT_RAM_RESTRICT_ZM_REG_GROUP's mult is loaded by M table in BIT */
 +	{ "INIT_RAM_RESTRICT_ZM_REG_GROUP"    , 0x8F, 7       , 6       , 0       , init_ram_restrict_zm_reg_group  },
@@ -5423,7 +5438,9 @@ index 0000000..ba946df
 +		bios->fp.duallink_transition_clk = ROM16(bios->data[bios->fp.lvdsmanufacturerpointer + 5]) * 10;
 +		break;
 +	case 0x40:
-+		/* bios->fp.dual_link = bios->data[lvdsofs] & 1; */
++		bios->fp.dual_link = bios->data[lvdsofs] & 1;
++		bios->fp.if_is_24bit = bios->data[lvdsofs] & 2;
++		bios->fp.strapless_is_24bit = bios->data[bios->fp.lvdsmanufacturerpointer + 4];
 +		bios->fp.duallink_transition_clk = ROM16(bios->data[bios->fp.lvdsmanufacturerpointer + 5]) * 10;
 +		break;
 +	}
@@ -6255,7 +6272,9 @@ index 0000000..ba946df
 +	return 0;
 +}
 +
-+static int parse_bit_M_tbl_entry(struct drm_device *dev, struct nvbios *bios, struct bit_entry *bitentry)
++static int
++parse_bit_M_tbl_entry(struct drm_device *dev, struct nvbios *bios,
++		      struct bit_entry *bitentry)
 +{
 +	/*
 +	 * offset + 2  (8  bits): number of options in an
@@ -6267,6 +6286,8 @@ index 0000000..ba946df
 +	 * stuff that we don't use - their use currently unknown
 +	 */
 +
++	uint16_t rr_strap_xlat;
++	uint8_t rr_group_count;
 +	int i;
 +
 +	/*
@@ -6276,17 +6297,24 @@ index 0000000..ba946df
 +	if (bitentry->length < 0x5)
 +		return 0;
 +
++	if (bitentry->id[1] < 2) {
++		rr_group_count = bios->data[bitentry->offset + 2];
++		rr_strap_xlat = ROM16(bios->data[bitentry->offset + 3]);
++	} else {
++		rr_group_count = bios->data[bitentry->offset + 0];
++		rr_strap_xlat = ROM16(bios->data[bitentry->offset + 1]);
++	}
++
 +	/* adjust length of INIT_87 */
 +	for (i = 0; itbl_entry[i].name && (itbl_entry[i].id != 0x87); i++);
-+	itbl_entry[i].length += bios->data[bitentry->offset + 2] * 4;
++	itbl_entry[i].length += rr_group_count * 4;
 +
 +	/* set up multiplier for INIT_RAM_RESTRICT_ZM_REG_GROUP */
 +	for (; itbl_entry[i].name && (itbl_entry[i].id != 0x8f); i++);
-+	itbl_entry[i].length_multiplier = bios->data[bitentry->offset + 2] * 4;
++	itbl_entry[i].length_multiplier = rr_group_count * 4;
 +
 +	init_ram_restrict_zm_reg_group_blocklen = itbl_entry[i].length_multiplier;
-+
-+	bios->ram_restrict_tbl_ptr = ROM16(bios->data[bitentry->offset + 3]);
++	bios->ram_restrict_tbl_ptr = rr_strap_xlat;
 +
 +	return 0;
 +}
@@ -6377,6 +6405,14 @@ index 0000000..ba946df
 +	return 0;
 +}
 +
++static int
++parse_bit_displayport_tbl_entry(struct drm_device *dev, struct nvbios *bios,
++				struct bit_entry *bitentry)
++{
++	bios->display.dp_table_ptr = ROM16(bios->data[bitentry->offset]);
++	return 0;
++}
++
 +struct bit_table {
 +	const char id;
 +	int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
@@ -6435,6 +6471,7 @@ index 0000000..ba946df
 +	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('L', lvds));
 +	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('T', tmds));
 +	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('U', U));
++	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('d', displayport));
 +
 +	return 0;
 +}
@@ -6712,10 +6749,11 @@ index 0000000..ba946df
 +		 */
 +		if (port_type == 4)	/* seen on C51 */
 +			rdofs = wrofs = 1;
-+		if (port_type == 5)	/* G80+ */
++		if (port_type >= 5)	/* G80+ */
 +			rdofs = wrofs = 0;
 +	}
-+	if (dcb_i2c_ver >= 0x40 && port_type != 5)
++
++	if (dcb_i2c_ver >= 0x40 && port_type != 5 && port_type != 6)
 +		NV_WARN(dev, "DCB I2C table has port type %d\n", port_type);
 +
 +	i2c->port_type = port_type;
@@ -6725,6 +6763,204 @@ index 0000000..ba946df
 +	return 0;
 +}
 +
++static struct dcb_gpio_entry *
++new_gpio_entry(struct nvbios *bios)
++{
++	struct parsed_dcb_gpio *gpio = &bios->bdcb.gpio;
++
++	return &gpio->entry[gpio->entries++];
++}
++
++struct dcb_gpio_entry *
++nouveau_bios_gpio_entry(struct drm_device *dev, enum dcb_gpio_tag tag)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nvbios *bios = &dev_priv->VBIOS;
++	int i;
++
++	for (i = 0; i < bios->bdcb.gpio.entries; i++) {
++		if (bios->bdcb.gpio.entry[i].tag != tag)
++			continue;
++
++		return &bios->bdcb.gpio.entry[i];
++	}
++
++	return NULL;
++}
++
++static void
++parse_dcb30_gpio_entry(struct nvbios *bios, uint16_t offset)
++{
++	struct dcb_gpio_entry *gpio;
++	uint16_t ent = ROM16(bios->data[offset]);
++	uint8_t line = ent & 0x1f,
++		tag = ent >> 5 & 0x3f,
++		flags = ent >> 11 & 0x1f;
++
++	if (tag == 0x3f)
++		return;
++
++	gpio = new_gpio_entry(bios);
++
++	gpio->tag = tag;
++	gpio->line = line;
++	gpio->invert = flags != 4;
++}
++
++static void
++parse_dcb40_gpio_entry(struct nvbios *bios, uint16_t offset)
++{
++	struct dcb_gpio_entry *gpio;
++	uint32_t ent = ROM32(bios->data[offset]);
++	uint8_t line = ent & 0x1f,
++		tag = ent >> 8 & 0xff;
++
++	if (tag == 0xff)
++		return;
++
++	gpio = new_gpio_entry(bios);
++
++	/* Currently unused, we may need more fields parsed at some
++	 * point. */
++	gpio->tag = tag;
++	gpio->line = line;
++}
++
++static void
++parse_dcb_gpio_table(struct nvbios *bios)
++{
++	struct drm_device *dev = bios->dev;
++	uint16_t gpio_table_ptr = bios->bdcb.gpio_table_ptr;
++	uint8_t *gpio_table = &bios->data[gpio_table_ptr];
++	int header_len = gpio_table[1],
++	    entries = gpio_table[2],
++	    entry_len = gpio_table[3];
++	void (*parse_entry)(struct nvbios *, uint16_t) = NULL;
++	int i;
++
++	if (bios->bdcb.version >= 0x40) {
++		if (gpio_table_ptr && entry_len != 4) {
++			NV_WARN(dev, "Invalid DCB GPIO table entry length.\n");
++			return;
++		}
++
++		parse_entry = parse_dcb40_gpio_entry;
++
++	} else if (bios->bdcb.version >= 0x30) {
++		if (gpio_table_ptr && entry_len != 2) {
++			NV_WARN(dev, "Invalid DCB GPIO table entry length.\n");
++			return;
++		}
++
++		parse_entry = parse_dcb30_gpio_entry;
++
++	} else if (bios->bdcb.version >= 0x22) {
++		/*
++		 * DCBs older than v3.0 don't really have a GPIO
++		 * table, instead they keep some GPIO info at fixed
++		 * locations.
++		 */
++		uint16_t dcbptr = ROM16(bios->data[0x36]);
++		uint8_t *tvdac_gpio = &bios->data[dcbptr - 5];
++
++		if (tvdac_gpio[0] & 1) {
++			struct dcb_gpio_entry *gpio = new_gpio_entry(bios);
++
++			gpio->tag = DCB_GPIO_TVDAC0;
++			gpio->line = tvdac_gpio[1] >> 4;
++			gpio->invert = tvdac_gpio[0] & 2;
++		}
++	}
++
++	if (!gpio_table_ptr)
++		return;
++
++	if (entries > DCB_MAX_NUM_GPIO_ENTRIES) {
++		NV_WARN(dev, "Too many entries in the DCB GPIO table.\n");
++		entries = DCB_MAX_NUM_GPIO_ENTRIES;
++	}
++
++	for (i = 0; i < entries; i++)
++		parse_entry(bios, gpio_table_ptr + header_len + entry_len * i);
++}
++
++struct dcb_connector_table_entry *
++nouveau_bios_connector_entry(struct drm_device *dev, int index)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nvbios *bios = &dev_priv->VBIOS;
++	struct dcb_connector_table_entry *cte;
++
++	if (index >= bios->bdcb.connector.entries)
++		return NULL;
++
++	cte = &bios->bdcb.connector.entry[index];
++	if (cte->type == 0xff)
++		return NULL;
++
++	return cte;
++}
++
++static void
++parse_dcb_connector_table(struct nvbios *bios)
++{
++	struct drm_device *dev = bios->dev;
++	struct dcb_connector_table *ct = &bios->bdcb.connector;
++	struct dcb_connector_table_entry *cte;
++	uint8_t *conntab = &bios->data[bios->bdcb.connector_table_ptr];
++	uint8_t *entry;
++	int i;
++
++	if (!bios->bdcb.connector_table_ptr) {
++		NV_DEBUG(dev, "No DCB connector table present\n");
++		return;
++	}
++
++	NV_INFO(dev, "DCB connector table: VHER 0x%02x %d %d %d\n",
++		conntab[0], conntab[1], conntab[2], conntab[3]);
++	if ((conntab[0] != 0x30 && conntab[0] != 0x40) ||
++	    (conntab[3] != 2 && conntab[3] != 4)) {
++		NV_ERROR(dev, "  Unknown!  Please report.\n");
++		return;
++	}
++
++	ct->entries = conntab[2];
++
++	entry = conntab + conntab[1];
++	cte = &ct->entry[0];
++	for (i = 0; i < conntab[2]; i++, entry += conntab[3], cte++) {
++		if (conntab[3] == 2)
++			cte->entry = ROM16(entry[0]);
++		else
++			cte->entry = ROM32(entry[0]);
++		cte->type  = (cte->entry & 0x000000ff) >> 0;
++		cte->index = (cte->entry & 0x00000f00) >> 8;
++		switch (cte->entry & 0x00033000) {
++		case 0x00001000:
++			cte->gpio_tag = 0x07;
++			break;
++		case 0x00002000:
++			cte->gpio_tag = 0x08;
++			break;
++		case 0x00010000:
++			cte->gpio_tag = 0x51;
++			break;
++		case 0x00020000:
++			cte->gpio_tag = 0x52;
++			break;
++		default:
++			cte->gpio_tag = 0xff;
++			break;
++		}
++
++		if (cte->type == 0xff)
++			continue;
++
++		NV_INFO(dev, "  %d: 0x%08x: type 0x%02x idx %d tag 0x%02x\n",
++			i, cte->entry, cte->type, cte->index, cte->gpio_tag);
++	}
++}
++
 +static struct dcb_entry *new_dcb_entry(struct parsed_dcb *dcb)
 +{
 +	struct dcb_entry *entry = &dcb->entry[dcb->entries];
@@ -6838,18 +7074,14 @@ index 0000000..ba946df
 +		}
 +		if (conf & mask) {
 +			/*
-+			 * I'm bored of getting this reported; left as a
-+			 * reminder for someone to fix it.
++			 * Until we even try to use these on G8x, it's
++			 * useless reporting unknown bits.  They all are.
 +			 */
-+			if (bdcb->version >= 0x40) {
-+				NV_WARN(dev, "G80+ LVDS not initialized by driver; ignoring conf bits\n");
++			if (bdcb->version >= 0x40)
 +				break;
-+			}
++
 +			NV_ERROR(dev, "Unknown LVDS configuration bits, "
-+					"please report\n");
-+			/* cause output setting to fail, so message is seen */
-+			bdcb->dcb.entries = 0;
-+			return false;
++				      "please report\n");
 +		}
 +		break;
 +		}
@@ -6862,11 +7094,29 @@ index 0000000..ba946df
 +
 +		break;
 +	}
++	case OUTPUT_DP:
++		entry->dpconf.link_bw = (conf & 0x00e00000) >> 21;
++		switch ((conf & 0x0f000000) >> 24) {
++		case 0xf:
++			entry->dpconf.link_nr = 4;
++			break;
++		case 0x3:
++			entry->dpconf.link_nr = 2;
++			break;
++		default:
++			entry->dpconf.link_nr = 1;
++			break;
++		}
++		break;
++	case OUTPUT_TMDS:
++		entry->tmdsconf.sor_link = (conf & 0x00000030) >> 4;
++		break;
 +	case 0xe:
 +		/* weird g80 mobile type that "nv" treats as a terminator */
 +		bdcb->dcb.entries--;
 +		return false;
 +	}
++
 +	/* unsure what DCB version introduces this, 3.0? */
 +	if (conf & 0x100000)
 +		entry->i2c_upper_default = true;
@@ -7054,9 +7304,8 @@ index 0000000..ba946df
 +			recordlength = dcbtable[3];
 +			i2ctabptr = ROM16(dcbtable[4]);
 +			sig = ROM32(dcbtable[6]);
-+			if (bdcb->version == 0x40)	/* G80 */
-+				bdcb->init8e_table_ptr =
-+					ROM16(dcbtable[10]);
++			bdcb->gpio_table_ptr = ROM16(dcbtable[10]);
++			bdcb->connector_table_ptr = ROM16(dcbtable[20]);
 +		} else {
 +			i2ctabptr = ROM16(dcbtable[2]);
 +			sig = ROM32(dcbtable[4]);
@@ -7121,6 +7370,9 @@ index 0000000..ba946df
 +			bdcb->i2c_default_indices = bdcb->i2c_table[4];
 +	}
 +
++	parse_dcb_gpio_table(bios);
++	parse_dcb_connector_table(bios);
++
 +	if (entries > DCB_MAX_NUM_ENTRIES)
 +		entries = DCB_MAX_NUM_ENTRIES;
 +
@@ -7327,13 +7579,16 @@ index 0000000..ba946df
 +}
 +
 +void
-+nouveau_bios_run_init_table(struct drm_device *dev, uint16_t table)
++nouveau_bios_run_init_table(struct drm_device *dev, uint16_t table,
++			    struct dcb_entry *dcbent)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nvbios *bios = &dev_priv->VBIOS;
 +	struct init_exec iexec = { true, false };
 +
++	bios->display.output = dcbent;
 +	parse_init_table(bios, table, &iexec);
++	bios->display.output = NULL;
 +}
 +
 +static bool NVInitVBIOS(struct drm_device *dev)
@@ -7517,10 +7772,10 @@ index 0000000..ba946df
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
 new file mode 100644
-index 0000000..1ffda97
+index 0000000..7cd7288
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,280 @@
 +/*
 + * Copyright 2007-2008 Nouveau Project
 + *
@@ -7552,6 +7807,8 @@ index 0000000..1ffda97
 +
 +#define DCB_MAX_NUM_ENTRIES 16
 +#define DCB_MAX_NUM_I2C_ENTRIES 16
++#define DCB_MAX_NUM_GPIO_ENTRIES 32
++#define DCB_MAX_NUM_CONNECTOR_ENTRIES 16
 +
 +#define DCB_LOC_ON_CHIP 0
 +
@@ -7576,6 +7833,13 @@ index 0000000..1ffda97
 +		struct {
 +			bool has_component_output;
 +		} tvconf;
++		struct {
++			int link_nr;
++			int link_bw;
++		} dpconf;
++		struct {
++			int sor_link;
++		} tmdsconf;
 +	};
 +	bool i2c_upper_default;
 +};
@@ -7592,14 +7856,46 @@ index 0000000..1ffda97
 +	struct dcb_i2c_entry i2c[DCB_MAX_NUM_I2C_ENTRIES];
 +};
 +
++enum dcb_gpio_tag {
++	DCB_GPIO_TVDAC0 = 0xc,
++	DCB_GPIO_TVDAC1 = 0x2d,
++};
++
++struct dcb_gpio_entry {
++	enum dcb_gpio_tag tag;
++	int line;
++	bool invert;
++};
++
++struct parsed_dcb_gpio {
++	int entries;
++	struct dcb_gpio_entry entry[DCB_MAX_NUM_GPIO_ENTRIES];
++};
++
++struct dcb_connector_table_entry {
++	uint32_t entry;
++	uint8_t type;
++	uint8_t index;
++	uint8_t gpio_tag;
++};
++
++struct dcb_connector_table {
++	int entries;
++	struct dcb_connector_table_entry entry[DCB_MAX_NUM_CONNECTOR_ENTRIES];
++};
++
 +struct bios_parsed_dcb {
 +	uint8_t version;
 +
 +	struct parsed_dcb dcb;
 +
-+	uint16_t init8e_table_ptr;
 +	uint8_t *i2c_table;
 +	uint8_t i2c_default_indices;
++
++	uint16_t gpio_table_ptr;
++	struct parsed_dcb_gpio gpio;
++	uint16_t connector_table_ptr;
++	struct dcb_connector_table connector;
 +};
 +
 +enum nouveau_encoder_type {
@@ -7715,6 +8011,7 @@ index 0000000..1ffda97
 +	struct {
 +		struct dcb_entry *output;
 +		uint16_t script_table_ptr;
++		uint16_t dp_table_ptr;
 +	} display;
 +
 +	struct {
@@ -7730,7 +8027,9 @@ index 0000000..1ffda97
 +		bool dual_link;
 +		bool link_c_increment;
 +		bool BITbit1;
++		bool if_is_24bit;
 +		int duallink_transition_clk;
++		uint8_t strapless_is_24bit;
 +		uint8_t *edid;
 +
 +		/* will need resetting after suspend */
@@ -8428,10 +8727,10 @@ index 0000000..8d1383a
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_calc.c b/drivers/gpu/drm/nouveau/nouveau_calc.c
 new file mode 100644
-index 0000000..3f80db8
+index 0000000..81271d6
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_calc.c
-@@ -0,0 +1,626 @@
+@@ -0,0 +1,469 @@
 +/*
 + * Copyright 1993-2003 NVIDIA, Corporation
 + * Copyright 2007-2009 Stuart Bennett
@@ -8468,35 +8767,31 @@ index 0000000..3f80db8
 +\****************************************************************************/
 +
 +struct nv_fifo_info {
-+	int graphics_lwm;
-+	int video_lwm;
-+	int graphics_burst_size;
-+	int video_burst_size;
-+	bool valid;
++	int lwm;
++	int burst;
 +};
 +
 +struct nv_sim_state {
 +	int pclk_khz;
 +	int mclk_khz;
 +	int nvclk_khz;
-+	int pix_bpp;
-+	bool enable_mp;
-+	bool enable_video;
++	int bpp;
 +	int mem_page_miss;
 +	int mem_latency;
 +	int memory_type;
 +	int memory_width;
++	int two_heads;
 +};
 +
 +static void
-+nv4CalcArbitration(struct nv_fifo_info *fifo, struct nv_sim_state *arb)
++nv04_calc_arb(struct nv_fifo_info *fifo, struct nv_sim_state *arb)
 +{
-+	int pagemiss, cas, width, video_enable, bpp;
-+	int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs;
++	int pagemiss, cas, width, bpp;
++	int nvclks, mclks, pclks, crtpagemiss;
 +	int found, mclk_extra, mclk_loop, cbs, m1, p1;
-+	int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
-+	int us_m, us_n, us_p, video_drain_rate, crtc_drain_rate;
-+	int vpm_us, us_video, vlwm, video_fill_us, cpm_us, us_crt, clwm;
++	int mclk_freq, pclk_freq, nvclk_freq;
++	int us_m, us_n, us_p, crtc_drain_rate;
++	int cpm_us, us_crt, clwm;
 +
 +	pclk_freq = arb->pclk_khz;
 +	mclk_freq = arb->mclk_khz;
@@ -8504,277 +8799,134 @@ index 0000000..3f80db8
 +	pagemiss = arb->mem_page_miss;
 +	cas = arb->mem_latency;
 +	width = arb->memory_width >> 6;
-+	video_enable = arb->enable_video;
-+	bpp = arb->pix_bpp;
-+	mp_enable = arb->enable_mp;
-+	clwm = 0;
-+	vlwm = 0;
++	bpp = arb->bpp;
 +	cbs = 128;
++
 +	pclks = 2;
-+	nvclks = 2;
-+	nvclks += 2;
-+	nvclks += 1;
-+	mclks = 5;
-+	mclks += 3;
-+	mclks += 1;
-+	mclks += cas;
-+	mclks += 1;
-+	mclks += 1;
-+	mclks += 1;
-+	mclks += 1;
++	nvclks = 10;
++	mclks = 13 + cas;
 +	mclk_extra = 3;
-+	nvclks += 2;
-+	nvclks += 1;
-+	nvclks += 1;
-+	nvclks += 1;
-+	if (mp_enable)
-+		mclks += 4;
-+	nvclks += 0;
-+	pclks += 0;
 +	found = 0;
-+	vbs = 0;
-+	while (found != 1) {
-+		fifo->valid = true;
++
++	while (!found) {
 +		found = 1;
++
 +		mclk_loop = mclks + mclk_extra;
 +		us_m = mclk_loop * 1000 * 1000 / mclk_freq;
 +		us_n = nvclks * 1000 * 1000 / nvclk_freq;
 +		us_p = nvclks * 1000 * 1000 / pclk_freq;
-+		if (video_enable) {
-+			video_drain_rate = pclk_freq * 2;
-+			crtc_drain_rate = pclk_freq * bpp / 8;
-+			vpagemiss = 2;
-+			vpagemiss += 1;
-+			crtpagemiss = 2;
-+			vpm_us = vpagemiss * pagemiss * 1000 * 1000 / mclk_freq;
-+			if (nvclk_freq * 2 > mclk_freq * width)
-+				video_fill_us = cbs * 1000 * 1000 / 16 / nvclk_freq;
-+			else
-+				video_fill_us = cbs * 1000 * 1000 / (8 * width) / mclk_freq;
-+			us_video = vpm_us + us_m + us_n + us_p + video_fill_us;
-+			vlwm = us_video * video_drain_rate / (1000 * 1000);
-+			vlwm++;
-+			vbs = 128;
-+			if (vlwm > 128)
-+				vbs = 64;
-+			if (vlwm > (256 - 64))
-+				vbs = 32;
-+			if (nvclk_freq * 2 > mclk_freq * width)
-+				video_fill_us = vbs * 1000 * 1000 / 16 / nvclk_freq;
-+			else
-+				video_fill_us = vbs * 1000 * 1000 / (8 * width) / mclk_freq;
-+			cpm_us = crtpagemiss * pagemiss * 1000 * 1000 / mclk_freq;
-+			us_crt = us_video + video_fill_us + cpm_us + us_m + us_n + us_p;
-+			clwm = us_crt * crtc_drain_rate / (1000 * 1000);
-+			clwm++;
-+		} else {
-+			crtc_drain_rate = pclk_freq * bpp / 8;
-+			crtpagemiss = 2;
-+			crtpagemiss += 1;
-+			cpm_us = crtpagemiss * pagemiss * 1000 * 1000 / mclk_freq;
-+			us_crt = cpm_us + us_m + us_n + us_p;
-+			clwm = us_crt * crtc_drain_rate / (1000 * 1000);
-+			clwm++;
-+		}
++
++		crtc_drain_rate = pclk_freq * bpp / 8;
++		crtpagemiss = 2;
++		crtpagemiss += 1;
++		cpm_us = crtpagemiss * pagemiss * 1000 * 1000 / mclk_freq;
++		us_crt = cpm_us + us_m + us_n + us_p;
++		clwm = us_crt * crtc_drain_rate / (1000 * 1000);
++		clwm++;
++
 +		m1 = clwm + cbs - 512;
 +		p1 = m1 * pclk_freq / mclk_freq;
 +		p1 = p1 * bpp / 8;
-+		if ((p1 < m1 && m1 > 0) ||
-+		    (video_enable && (clwm > 511 || vlwm > 255)) ||
-+		    (!video_enable && clwm > 519)) {
-+			fifo->valid = false;
++		if ((p1 < m1 && m1 > 0) || clwm > 519) {
 +			found = !mclk_extra;
 +			mclk_extra--;
 +		}
 +		if (clwm < 384)
 +			clwm = 384;
-+		if (vlwm < 128)
-+			vlwm = 128;
-+		fifo->graphics_lwm = clwm;
-+		fifo->graphics_burst_size = 128;
-+		fifo->video_lwm = vlwm + 15;
-+		fifo->video_burst_size = vbs;
++
++		fifo->lwm = clwm;
++		fifo->burst = cbs;
 +	}
 +}
 +
 +static void
-+nv10CalcArbitration(struct nv_fifo_info *fifo, struct nv_sim_state *arb)
-+{
-+	int pagemiss, width, video_enable, bpp;
-+	int nvclks, mclks, pclks, vpagemiss, crtpagemiss;
-+	int nvclk_fill;
-+	int found, mclk_extra, mclk_loop, cbs, m1;
-+	int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
-+	int us_m, us_m_min, us_n, us_p, crtc_drain_rate;
-+	int vus_m;
-+	int vpm_us, us_video, cpm_us, us_crt, clwm;
-+	int clwm_rnd_down, min_clwm;
-+	int m2us, us_pipe_min, p1clk, p2;
-+	int min_mclk_extra;
-+	int us_min_mclk_extra;
++nv10_calc_arb(struct nv_fifo_info *fifo, struct nv_sim_state *arb)
++{
++	int fill_rate, drain_rate;
++	int pclks, nvclks, mclks, xclks;
++	int pclk_freq, nvclk_freq, mclk_freq;
++	int fill_lat, extra_lat;
++	int max_burst_o, max_burst_l;
++	int fifo_len, min_lwm, max_lwm;
++	const int burst_lat = 80; /* Maximum allowable latency due
++				   * to the CRTC FIFO burst. (ns) */
 +
-+	pclk_freq = arb->pclk_khz;	/* freq in KHz */
-+	mclk_freq = arb->mclk_khz;
++	pclk_freq = arb->pclk_khz;
 +	nvclk_freq = arb->nvclk_khz;
-+	pagemiss = arb->mem_page_miss;
-+	width = arb->memory_width / 64;
-+	video_enable = arb->enable_video;
-+	bpp = arb->pix_bpp;
-+	mp_enable = arb->enable_mp;
-+	clwm = 0;
-+	cbs = 512;
-+	pclks = 4;	/* lwm detect. */
-+	nvclks = 3;	/* lwm -> sync. */
-+	nvclks += 2;	/* fbi bus cycles (1 req + 1 busy) */
-+	mclks = 1;	/* 2 edge sync.  may be very close to edge so just put one. */
-+	mclks += 1;	/* arb_hp_req */
-+	mclks += 5;	/* ap_hp_req   tiling pipeline */
-+	mclks += 2;	/* tc_req     latency fifo */
-+	mclks += 2;	/* fb_cas_n_  memory request to fbio block */
-+	mclks += 7;	/* sm_d_rdv   data returned from fbio block */
-+
-+	/* fb.rd.d.Put_gc   need to accumulate 256 bits for read */
-+	if (arb->memory_type == 0) {
-+		if (arb->memory_width == 64)	/* 64 bit bus */
-+			mclks += 4;
-+		else
-+			mclks += 2;
-+	} else if (arb->memory_width == 64)	/* 64 bit bus */
-+		mclks += 2;
-+	else
-+		mclks += 1;
++	mclk_freq = arb->mclk_khz;
 +
-+	if (!video_enable && arb->memory_width == 128) {
-+		mclk_extra = (bpp == 32) ? 31 : 42;	/* Margin of error */
-+		min_mclk_extra = 17;
-+	} else {
-+		mclk_extra = (bpp == 32) ? 8 : 4;	/* Margin of error */
-+		/* mclk_extra = 4; *//* Margin of error */
-+		min_mclk_extra = 18;
-+	}
-+
-+	nvclks += 1;	/* 2 edge sync.  may be very close to edge so just put one. */
-+	nvclks += 1;	/* fbi_d_rdv_n */
-+	nvclks += 1;	/* Fbi_d_rdata */
-+	nvclks += 1;	/* crtfifo load */
-+
-+	if (mp_enable)
-+		mclks += 4;	/* Mp can get in with a burst of 8. */
-+	/* Extra clocks determined by heuristics */
++	fill_rate = mclk_freq * arb->memory_width / 8; /* kB/s */
++	drain_rate = pclk_freq * arb->bpp / 8; /* kB/s */
 +
-+	nvclks += 0;
-+	pclks += 0;
-+	found = 0;
-+	while (found != 1) {
-+		fifo->valid = true;
-+		found = 1;
-+		mclk_loop = mclks + mclk_extra;
-+		us_m = mclk_loop * 1000 * 1000 / mclk_freq;	/* Mclk latency in us */
-+		us_m_min = mclks * 1000 * 1000 / mclk_freq;	/* Minimum Mclk latency in us */
-+		us_min_mclk_extra = min_mclk_extra * 1000 * 1000 / mclk_freq;
-+		us_n = nvclks * 1000 * 1000 / nvclk_freq;	/* nvclk latency in us */
-+		us_p = pclks * 1000 * 1000 / pclk_freq;	/* nvclk latency in us */
-+		us_pipe_min = us_m_min + us_n + us_p;
++	fifo_len = arb->two_heads ? 1536 : 1024; /* B */
 +
-+		vus_m = mclk_loop * 1000 * 1000 / mclk_freq;	/* Mclk latency in us */
++	/* Fixed FIFO refill latency. */
 +
-+		if (video_enable) {
-+			crtc_drain_rate = pclk_freq * bpp / 8;	/* MB/s */
++	pclks = 4;	/* lwm detect. */
 +
-+			vpagemiss = 1;	/* self generating page miss */
-+			vpagemiss += 1;	/* One higher priority before */
++	nvclks = 3	/* lwm -> sync. */
++		+ 2	/* fbi bus cycles (1 req + 1 busy) */
++		+ 1	/* 2 edge sync.  may be very close to edge so
++			 * just put one. */
++		+ 1	/* fbi_d_rdv_n */
++		+ 1	/* Fbi_d_rdata */
++		+ 1;	/* crtfifo load */
 +
-+			crtpagemiss = 2;	/* self generating page miss */
-+			if (mp_enable)
-+				crtpagemiss += 1;	/* if MA0 conflict */
++	mclks = 1	/* 2 edge sync.  may be very close to edge so
++			 * just put one. */
++		+ 1	/* arb_hp_req */
++		+ 5	/* tiling pipeline */
++		+ 2	/* latency fifo */
++		+ 2	/* memory request to fbio block */
++		+ 7;	/* data returned from fbio block */
 +
-+			vpm_us = vpagemiss * pagemiss * 1000 * 1000 / mclk_freq;
++	/* Need to accumulate 256 bits for read */
++	mclks += (arb->memory_type == 0 ? 2 : 1)
++		* arb->memory_width / 32;
 +
-+			us_video = vpm_us + vus_m;	/* Video has separate read return path */
++	fill_lat = mclks * 1000 * 1000 / mclk_freq   /* minimum mclk latency */
++		+ nvclks * 1000 * 1000 / nvclk_freq  /* nvclk latency */
++		+ pclks * 1000 * 1000 / pclk_freq;   /* pclk latency */
 +
-+			cpm_us = crtpagemiss * pagemiss * 1000 * 1000 / mclk_freq;
-+			us_crt = us_video	/* Wait for video */
-+				 + cpm_us	/* CRT Page miss */
-+				 + us_m + us_n + us_p;	/* other latency */
++	/* Conditional FIFO refill latency. */
 +
-+			clwm = us_crt * crtc_drain_rate / (1000 * 1000);
-+			clwm++;	/* fixed point <= float_point - 1.  Fixes that */
-+		} else {
-+			crtc_drain_rate = pclk_freq * bpp / 8;	/* bpp * pclk/8 */
++	xclks = 2 * arb->mem_page_miss + mclks /* Extra latency due to
++						* the overlay. */
++		+ 2 * arb->mem_page_miss       /* Extra pagemiss latency. */
++		+ (arb->bpp == 32 ? 8 : 4);    /* Margin of error. */
 +
-+			crtpagemiss = 1;	/* self generating page miss */
-+			crtpagemiss += 1;	/* MA0 page miss */
-+			if (mp_enable)
-+				crtpagemiss += 1;	/* if MA0 conflict */
-+			cpm_us = crtpagemiss * pagemiss * 1000 * 1000 / mclk_freq;
-+			us_crt = cpm_us + us_m + us_n + us_p;
-+			clwm = us_crt * crtc_drain_rate / (1000 * 1000);
-+			clwm++;	/* fixed point <= float_point - 1.  Fixes that */
-+
-+			/* Finally, a heuristic check when width == 64 bits */
-+			if (width == 1) {
-+				nvclk_fill = nvclk_freq * 8;
-+				if (crtc_drain_rate * 100 >= nvclk_fill * 102)
-+					clwm = 0xfff;	/* Large number to fail */
-+				else if (crtc_drain_rate * 100 >= nvclk_fill * 98) {
-+					clwm = 1024;
-+					cbs = 512;
-+				}
-+			}
-+		}
++	extra_lat = xclks * 1000 * 1000 / mclk_freq;
 +
-+		/*
-+		 * Overfill check:
-+		 */
++	if (arb->two_heads)
++		/* Account for another CRTC. */
++		extra_lat += fill_lat + extra_lat + burst_lat;
 +
-+		clwm_rnd_down = (clwm / 8) * 8;
-+		if (clwm_rnd_down < clwm)
-+			clwm += 8;
-+
-+		m1 = clwm + cbs - 1024;	/* Amount of overfill */
-+		m2us = us_pipe_min + us_min_mclk_extra;
-+
-+		/* pclk cycles to drain */
-+		p1clk = m2us * pclk_freq / (1000 * 1000);
-+		p2 = p1clk * bpp / 8;	/* bytes drained. */
-+
-+		if (p2 < m1 && m1 > 0) {
-+			fifo->valid = false;
-+			found = 0;
-+			if (min_mclk_extra == 0) {
-+				if (cbs <= 32)
-+					found = 1;	/* Can't adjust anymore! */
-+				else
-+					cbs = cbs / 2;	/* reduce the burst size */
-+			} else
-+				min_mclk_extra--;
-+		} else if (clwm > 1023) {	/* Have some margin */
-+			fifo->valid = false;
-+			found = 0;
-+			if (min_mclk_extra == 0)
-+				found = 1;	/* Can't adjust anymore! */
-+			else
-+				min_mclk_extra--;
-+		}
++	/* FIFO burst */
 +
-+		/* This correction works around a slight snow effect
-+		 * when the TV and VGA outputs are enabled simultaneously. */
-+		min_clwm = 1024 - cbs + 128 * pclk_freq / 100000;
-+		if (clwm < min_clwm)
-+			clwm = min_clwm;
++	/* Max burst not leading to overflows. */
++	max_burst_o = (1 + fifo_len - extra_lat * drain_rate / (1000 * 1000))
++		* (fill_rate / 1000) / ((fill_rate - drain_rate) / 1000);
++	fifo->burst = min(max_burst_o, 1024);
 +
-+		/*  printf("CRT LWM: prog: 0x%x, bs: 256\n", clwm); */
-+		fifo->graphics_lwm = clwm;
-+		fifo->graphics_burst_size = cbs;
++	/* Max burst value with an acceptable latency. */
++	max_burst_l = burst_lat * fill_rate / (1000 * 1000);
++	fifo->burst = min(max_burst_l, fifo->burst);
 +
-+		fifo->video_lwm = 1024;
-+		fifo->video_burst_size = 512;
-+	}
++	fifo->burst = rounddown_pow_of_two(fifo->burst);
++
++	/* FIFO low watermark */
++
++	min_lwm = (fill_lat + extra_lat) * drain_rate / (1000 * 1000) + 1;
++	max_lwm = fifo_len - fifo->burst
++		+ fill_lat * drain_rate / (1000 * 1000)
++		+ fifo->burst * drain_rate / fill_rate;
++
++	fifo->lwm = min_lwm + 10 * (max_lwm - min_lwm) / 100; /* Empirical. */
 +}
 +
 +static void
-+nv4_10UpdateArbitrationSettings(struct drm_device *dev, int VClk, int bpp,
-+				int *burst, int *lwm)
++nv04_update_arb(struct drm_device *dev, int VClk, int bpp,
++		int *burst, int *lwm)
 +{
 +	struct nv_fifo_info fifo_data;
 +	struct nv_sim_state sim_data;
@@ -8785,21 +8937,19 @@ index 0000000..3f80db8
 +	sim_data.pclk_khz = VClk;
 +	sim_data.mclk_khz = MClk;
 +	sim_data.nvclk_khz = NVClk;
-+	sim_data.pix_bpp = bpp;
-+	sim_data.enable_mp = false;
++	sim_data.bpp = bpp;
++	sim_data.two_heads = nv_two_heads(dev);
 +	if ((dev->pci_device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ ||
 +	    (dev->pci_device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) {
 +		uint32_t type;
 +
 +		pci_read_config_dword(pci_get_bus_and_slot(0, 1), 0x7c, &type);
 +
-+		sim_data.enable_video = false;
 +		sim_data.memory_type = (type >> 12) & 1;
 +		sim_data.memory_width = 64;
 +		sim_data.mem_latency = 3;
 +		sim_data.mem_page_miss = 10;
 +	} else {
-+		sim_data.enable_video = (nv_arch(dev) != NV_04);
 +		sim_data.memory_type = nvReadFB(dev, NV_PFB_CFG0) & 0x1;
 +		sim_data.memory_width = (nvReadEXTDEV(dev, NV_PEXTDEV_BOOT_0) & 0x10) ? 128 : 64;
 +		sim_data.mem_latency = cfg1 & 0xf;
@@ -8807,21 +8957,16 @@ index 0000000..3f80db8
 +	}
 +
 +	if (nv_arch(dev) == NV_04)
-+		nv4CalcArbitration(&fifo_data, &sim_data);
++		nv04_calc_arb(&fifo_data, &sim_data);
 +	else
-+		nv10CalcArbitration(&fifo_data, &sim_data);
++		nv10_calc_arb(&fifo_data, &sim_data);
 +
-+	if (fifo_data.valid) {
-+		int b = fifo_data.graphics_burst_size >> 4;
-+		*burst = 0;
-+		while (b >>= 1)
-+			(*burst)++;
-+		*lwm = fifo_data.graphics_lwm >> 3;
-+	}
++	*burst = ilog2(fifo_data.burst >> 4);
++	*lwm = fifo_data.lwm >> 3;
 +}
 +
 +static void
-+nv30UpdateArbitrationSettings(int *burst, int *lwm)
++nv30_update_arb(int *burst, int *lwm)
 +{
 +	unsigned int fifo_size, burst_size, graphics_lwm;
 +
@@ -8829,10 +8974,7 @@ index 0000000..3f80db8
 +	burst_size = 512;
 +	graphics_lwm = fifo_size - burst_size;
 +
-+	*burst = 0;
-+	burst_size >>= 5;
-+	while (burst_size >>= 1)
-+		(*burst)++;
++	*burst = ilog2(burst_size >> 5);
 +	*lwm = graphics_lwm >> 3;
 +}
 +
@@ -8840,13 +8982,13 @@ index 0000000..3f80db8
 +nouveau_calc_arb(struct drm_device *dev, int vclk, int bpp, int *burst, int *lwm)
 +{
 +	if (nv_arch(dev) < NV_30)
-+		nv4_10UpdateArbitrationSettings(dev, vclk, bpp, burst, lwm);
++		nv04_update_arb(dev, vclk, bpp, burst, lwm);
 +	else if ((dev->pci_device & 0xfff0) == 0x0240 /*CHIPSET_C51*/ ||
 +		 (dev->pci_device & 0xfff0) == 0x03d0 /*CHIPSET_C512*/) {
 +		*burst = 128;
 +		*lwm = 0x0480;
 +	} else
-+		nv30UpdateArbitrationSettings(burst, lwm);
++		nv30_update_arb(burst, lwm);
 +}
 +
 +static int
@@ -9534,10 +9676,10 @@ index 0000000..9aaa972
 +int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);
 diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
 new file mode 100644
-index 0000000..1e40ef0
+index 0000000..06d6d73
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -0,0 +1,811 @@
+@@ -0,0 +1,812 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -10203,9 +10345,9 @@ index 0000000..1e40ef0
 +	 * modeline is avalilable for the panel, set it as the panel's
 +	 * native mode and exit.
 +	 */
-+	if (!nv_connector->edid &&
-+	     nv_encoder->dcb->lvdsconf.use_straps_for_mode &&
-+	     nouveau_bios_fp_mode(dev, &native)) {
++	if (!nv_connector->edid && nouveau_bios_fp_mode(dev, &native) &&
++	     (nv_encoder->dcb->lvdsconf.use_straps_for_mode ||
++	      dev_priv->VBIOS.pub.fp_no_ddc)) {
 +		nv_connector->native_mode = drm_mode_duplicate(dev, &native);
 +		goto out;
 +	}
@@ -10258,6 +10400,7 @@ index 0000000..1e40ef0
 +	nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL);
 +	if (!nv_connector)
 +		return -ENOMEM;
++	nv_connector->dcb = nouveau_bios_connector_entry(dev, index);
 +	connector = &nv_connector->base;
 +
 +	switch (type) {
@@ -10351,10 +10494,10 @@ index 0000000..1e40ef0
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h
 new file mode 100644
-index 0000000..75dbe9b
+index 0000000..728b809
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,54 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -10390,15 +10533,14 @@ index 0000000..75dbe9b
 +struct nouveau_connector {
 +	struct drm_connector base;
 +
-+	struct drm_display_mode *native_mode;
++	struct dcb_connector_table_entry *dcb;
 +
 +	int scaling_mode;
-+
 +	bool use_dithering;
 +
 +	struct nouveau_encoder *detected_encoder;
-+
 +	struct edid *edid;
++	struct drm_display_mode *native_mode;
 +};
 +
 +static inline struct nouveau_connector *nouveau_connector(
@@ -11589,10 +11731,10 @@ index 0000000..d8de3f6
 +MODULE_LICENSE("GPL and additional rights");
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
 new file mode 100644
-index 0000000..d16c843
+index 0000000..a4ab9d1
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,1288 @@
+@@ -0,0 +1,1299 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -12081,7 +12223,9 @@ index 0000000..d16c843
 +	void __iomem *ramin;
 +	uint32_t ramin_size;
 +
++	struct workqueue_struct *wq;
 +	struct work_struct irq_work;
++
 +	struct list_head vbl_waiting;
 +
 +	struct {
@@ -12429,7 +12573,12 @@ index 0000000..d16c843
 +extern int nouveau_bios_init(struct drm_device *);
 +extern void nouveau_bios_takedown(struct drm_device *dev);
 +extern int nouveau_run_vbios_init(struct drm_device *);
-+extern void nouveau_bios_run_init_table(struct drm_device *, uint16_t table);
++extern void nouveau_bios_run_init_table(struct drm_device *, uint16_t table,
++					struct dcb_entry *);
++extern struct dcb_gpio_entry *nouveau_bios_gpio_entry(struct drm_device *,
++						      enum dcb_gpio_tag);
++extern struct dcb_connector_table_entry *
++nouveau_bios_connector_entry(struct drm_device *, int index);
 +extern int get_pll_limits(struct drm_device *, uint32_t limit_match,
 +			  struct pll_lims *);
 +extern int nouveau_bios_run_display_table(struct drm_device *,
@@ -12690,6 +12839,10 @@ index 0000000..d16c843
 +extern int nouveau_gem_ioctl_info(struct drm_device *, void *,
 +				  struct drm_file *);
 +
++/* nv17_gpio.c */
++int nv17_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);
++int nv17_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);
++
 +#ifndef ioread32_native
 +#ifdef __BIG_ENDIAN
 +#define ioread16_native ioread16be
@@ -13715,10 +13868,10 @@ index 0000000..0cff7eb
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
 new file mode 100644
-index 0000000..b8c3664
+index 0000000..f10b53b
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -0,0 +1,981 @@
+@@ -0,0 +1,976 @@
 +/*
 + * Copyright (C) 2008 Ben Skeggs.
 + * All Rights Reserved.
@@ -13825,7 +13978,7 @@ index 0000000..b8c3664
 +}
 +
 +static bool
-+nouveau_gem_tile_mode_valid(struct drm_device *dev, uint32_t tile_flags) {
++nouveau_gem_tile_flags_valid(struct drm_device *dev, uint32_t tile_flags) {
 +	switch (tile_flags) {
 +	case 0x0000:
 +	case 0x1800:
@@ -13872,12 +14025,7 @@ index 0000000..b8c3664
 +	if (!flags || req->info.domain & NOUVEAU_GEM_DOMAIN_CPU)
 +		flags |= TTM_PL_FLAG_SYSTEM;
 +
-+	if (req->info.tile_mode > 4) {
-+		NV_ERROR(dev, "bad tile mode: %d\n", req->info.tile_mode);
-+		return -EINVAL;
-+	}
-+
-+	if (!nouveau_gem_tile_mode_valid(dev, req->info.tile_flags))
++	if (!nouveau_gem_tile_flags_valid(dev, req->info.tile_flags))
 +		return -EINVAL;
 +
 +	ret = nouveau_gem_new(dev, chan, req->info.size, req->align, flags,
@@ -20548,10 +20696,10 @@ index 0000000..4c7f1e4
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..790630d
+index 0000000..205b6d9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,872 @@
+@@ -0,0 +1,876 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -21139,6 +21287,10 @@ index 0000000..790630d
 +	if (dev_priv->acpi_dsm)
 +		nouveau_hybrid_setup(dev);
 +
++	dev_priv->wq = create_workqueue("nouveau");
++	if (!dev_priv->wq)
++		return -EINVAL;
++
 +	/* resource 0 is mmio regs */
 +	/* resource 1 is linear FB */
 +	/* resource 2 is RAMIN (mmio regs + 0x1000000) */
@@ -21563,10 +21715,10 @@ index 0000000..7818981
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
 new file mode 100644
-index 0000000..2ab9f30
+index 0000000..0a5cfc1
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
-@@ -0,0 +1,992 @@
+@@ -0,0 +1,1001 @@
 +/*
 + * Copyright 1993-2003 NVIDIA, Corporation
 + * Copyright 2006 Dave Airlie
@@ -21675,10 +21827,8 @@ index 0000000..2ab9f30
 +	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
 +	struct nv04_mode_state *state = &dev_priv->mode_reg;
 +	struct nv04_crtc_reg *regp = &state->crtc_reg[nv_crtc->index];
-+	struct drm_framebuffer *fb = crtc->fb;
 +	struct nouveau_pll_vals *pv = &regp->pllvals;
 +	struct pll_lims pll_lim;
-+	int vclk, arb_burst, arb_fifo_lwm;
 +
 +	if (get_pll_limits(dev, nv_crtc->index ? VPLL2 : VPLL1, &pll_lim))
 +		return;
@@ -21699,8 +21849,7 @@ index 0000000..2ab9f30
 +	if (dev_priv->chipset > 0x40 && dot_clock <= (pll_lim.vco1.maxfreq / 2))
 +		memset(&pll_lim.vco2, 0, sizeof(pll_lim.vco2));
 +
-+	vclk = nouveau_calc_pll_mnp(dev, &pll_lim, dot_clock, pv);
-+	if (!vclk)
++	if (!nouveau_calc_pll_mnp(dev, &pll_lim, dot_clock, pv))
 +		return;
 +
 +	state->pllsel &= PLLSEL_VPLL1_MASK | PLLSEL_VPLL2_MASK | PLLSEL_TV_MASK;
@@ -21721,13 +21870,6 @@ index 0000000..2ab9f30
 +		NV_TRACE(dev, "vpll: n %d m %d log2p %d\n",
 +			 pv->N1, pv->M1, pv->log2P);
 +
-+	nouveau_calc_arb(dev, vclk, fb->bits_per_pixel, &arb_burst, &arb_fifo_lwm);
-+
-+	regp->CRTC[NV_CIO_CRE_FF_INDEX] = arb_burst;
-+	regp->CRTC[NV_CIO_CRE_FFLWM__INDEX] = arb_fifo_lwm & 0xff;
-+	if (nv_arch(dev) >= NV_30)
-+		regp->CRTC[NV_CIO_CRE_47] = arb_fifo_lwm >> 8;
-+
 +	nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);
 +}
 +
@@ -22344,10 +22486,12 @@ index 0000000..2ab9f30
 +			struct drm_framebuffer *old_fb)
 +{
 +	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
-+	struct drm_nouveau_private *dev_priv = crtc->dev->dev_private;
++	struct drm_device *dev = crtc->dev;
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nv04_crtc_reg *regp = &dev_priv->mode_reg.crtc_reg[nv_crtc->index];
 +	struct drm_framebuffer *drm_fb = nv_crtc->base.fb;
 +	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);
++	int arb_burst, arb_lwm;
 +	int ret;
 +
 +	ret = nouveau_bo_pin(fb->nvbo, TTM_PL_FLAG_VRAM);
@@ -22366,13 +22510,14 @@ index 0000000..2ab9f30
 +		nv_crtc_gamma_load(crtc);
 +	}
 +
++	/* Update the framebuffer format. */
 +	regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] &= ~3;
 +	regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] |= (crtc->fb->depth + 1) / 8;
 +	regp->ramdac_gen_ctrl &= ~NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL;
 +	if (crtc->fb->depth == 16)
 +		regp->ramdac_gen_ctrl |= NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL;
 +	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_PIXEL_INDEX);
-+	NVWriteRAMDAC(crtc->dev, nv_crtc->index, NV_PRAMDAC_GENERAL_CONTROL,
++	NVWriteRAMDAC(dev, nv_crtc->index, NV_PRAMDAC_GENERAL_CONTROL,
 +		      regp->ramdac_gen_ctrl);
 +
 +	regp->CRTC[NV_CIO_CR_OFFSET_INDEX] = drm_fb->pitch >> 3;
@@ -22381,9 +22526,25 @@ index 0000000..2ab9f30
 +	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_RPC0_INDEX);
 +	crtc_wr_cio_state(crtc, regp, NV_CIO_CR_OFFSET_INDEX);
 +
++	/* Update the framebuffer location. */
 +	regp->fb_start = nv_crtc->fb.offset & ~3;
 +	regp->fb_start += (y * drm_fb->pitch) + (x * drm_fb->bits_per_pixel / 8);
-+	NVWriteCRTC(crtc->dev, nv_crtc->index, NV_PCRTC_START, regp->fb_start);
++	NVWriteCRTC(dev, nv_crtc->index, NV_PCRTC_START, regp->fb_start);
++
++	/* Update the arbitration parameters. */
++	nouveau_calc_arb(dev, crtc->mode.clock, drm_fb->bits_per_pixel,
++			 &arb_burst, &arb_lwm);
++
++	regp->CRTC[NV_CIO_CRE_FF_INDEX] = arb_burst;
++	regp->CRTC[NV_CIO_CRE_FFLWM__INDEX] = arb_lwm & 0xff;
++	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_FF_INDEX);
++	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_FFLWM__INDEX);
++
++	if (nv_arch(dev) >= NV_30) {
++		regp->CRTC[NV_CIO_CRE_47] = arb_lwm >> 8;
++		crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_47);
++	}
++
 +	return 0;
 +}
 +
@@ -22637,10 +22798,10 @@ index 0000000..fc9156e
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
 new file mode 100644
-index 0000000..587b6f5
+index 0000000..f781761
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_dac.c
-@@ -0,0 +1,529 @@
+@@ -0,0 +1,528 @@
 +/*
 + * Copyright 2003 NVIDIA, Corporation
 + * Copyright 2006 Dave Airlie
@@ -22863,7 +23024,7 @@ index 0000000..587b6f5
 +	struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb;
 +	uint32_t testval, regoffset = nv04_dac_output_offset(encoder);
 +	uint32_t saved_powerctrl_2 = 0, saved_powerctrl_4 = 0, saved_routput,
-+		saved_rtest_ctrl, temp, saved_gpio_ext = 0, routput;
++		saved_rtest_ctrl, saved_gpio0, saved_gpio1, temp, routput;
 +	int head, present = 0;
 +
 +#define RGB_TEST_DATA(r, g, b) (r << 0 | g << 10 | b << 20)
@@ -22891,12 +23052,11 @@ index 0000000..587b6f5
 +		nvWriteMC(dev, NV_PBUS_POWERCTRL_4, saved_powerctrl_4 & 0xffffffcf);
 +	}
 +
-+	if (dev_priv->chipset >= 0x34) {
-+		saved_gpio_ext = NVReadCRTC(dev, 0, NV_PCRTC_GPIO_EXT);
++	saved_gpio1 = nv17_gpio_get(dev, DCB_GPIO_TVDAC1);
++	saved_gpio0 = nv17_gpio_get(dev, DCB_GPIO_TVDAC0);
 +
-+		NVWriteCRTC(dev, 0, NV_PCRTC_GPIO_EXT, (saved_gpio_ext & ~(3 << 20)) |
-+			    (dcb->type == OUTPUT_TV ? (1 << 20) : 0));
-+	}
++	nv17_gpio_set(dev, DCB_GPIO_TVDAC1, dcb->type == OUTPUT_TV);
++	nv17_gpio_set(dev, DCB_GPIO_TVDAC0, dcb->type == OUTPUT_TV);
 +
 +	msleep(4);
 +
@@ -22913,9 +23073,9 @@ index 0000000..587b6f5
 +
 +	if (nv_arch(dev) >= NV_40) {
 +		if (dcb->type == OUTPUT_TV)
-+			routput |= 1 << 20;
++			routput |= 0x1a << 16;
 +		else
-+			routput &= ~(1 << 20);
++			routput &= ~(0x1a << 16);
 +	}
 +
 +	NVWriteRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset, routput);
@@ -22934,7 +23094,7 @@ index 0000000..587b6f5
 +	temp = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
 +
 +	if (dcb->type == OUTPUT_TV)
-+		present = (nv17_tv_detect(encoder, connector, (temp >> 28) & 0xe)
++		present = (nv17_tv_detect(encoder, connector, temp)
 +			   == connector_status_connected);
 +	else
 +		present = temp & NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI;
@@ -22951,8 +23111,8 @@ index 0000000..587b6f5
 +		nvWriteMC(dev, NV_PBUS_POWERCTRL_4, saved_powerctrl_4);
 +	nvWriteMC(dev, NV_PBUS_POWERCTRL_2, saved_powerctrl_2);
 +
-+	if (dev_priv->chipset >= 0x34)
-+		NVWriteRAMDAC(dev, 0, NV_PCRTC_GPIO_EXT, saved_gpio_ext);
++	nv17_gpio_set(dev, DCB_GPIO_TVDAC1, saved_gpio1);
++	nv17_gpio_set(dev, DCB_GPIO_TVDAC0, saved_gpio0);
 +
 +	if (present) {
 +		NV_INFO(dev, "Load detected on output %c\n", '@' + ffs(dcb->or));
@@ -27111,12 +27271,110 @@ index 0000000..6bf6804
 +	{ 0x0099, false, NULL }, /* celcius (nv17) */
 +	{}
 +};
+diff --git a/drivers/gpu/drm/nouveau/nv17_gpio.c b/drivers/gpu/drm/nouveau/nv17_gpio.c
+new file mode 100644
+index 0000000..2e58c33
+--- /dev/null
++++ b/drivers/gpu/drm/nouveau/nv17_gpio.c
+@@ -0,0 +1,92 @@
++/*
++ * Copyright (C) 2009 Francisco Jerez.
++ * 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 "nouveau_drv.h"
++#include "nouveau_hw.h"
++
++static bool
++get_gpio_location(struct dcb_gpio_entry *ent, uint32_t *reg, uint32_t *shift,
++		  uint32_t *mask)
++{
++	if (ent->line < 2) {
++		*reg = NV_PCRTC_GPIO;
++		*shift = ent->line * 16;
++		*mask = 0x11;
++
++	} else if (ent->line < 10) {
++		*reg = NV_PCRTC_GPIO_EXT;
++		*shift = (ent->line - 2) * 4;
++		*mask = 0x3;
++
++	} else if (ent->line < 14) {
++		*reg = NV_PCRTC_850;
++		*shift = (ent->line - 10) * 4;
++		*mask = 0x3;
++
++	} else {
++		return false;
++	}
++
++	return true;
++}
++
++int
++nv17_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag)
++{
++	struct dcb_gpio_entry *ent = nouveau_bios_gpio_entry(dev, tag);
++	uint32_t reg, shift, mask, value;
++
++	if (!ent)
++		return -ENODEV;
++
++	if (!get_gpio_location(ent, &reg, &shift, &mask))
++		return -ENODEV;
++
++	value = NVReadCRTC(dev, 0, reg) >> shift;
++
++	return (ent->invert ? 1 : 0) ^ (value & 1);
++}
++
++int
++nv17_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state)
++{
++	struct dcb_gpio_entry *ent = nouveau_bios_gpio_entry(dev, tag);
++	uint32_t reg, shift, mask, value;
++
++	if (!ent)
++		return -ENODEV;
++
++	if (!get_gpio_location(ent, &reg, &shift, &mask))
++		return -ENODEV;
++
++	value = ((ent->invert ? 1 : 0) ^ (state ? 1 : 0)) << shift;
++	mask = ~(mask << shift);
++
++	NVWriteCRTC(dev, 0, reg, value | (NVReadCRTC(dev, 0, reg) & mask));
++
++	return 0;
++}
 diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
 new file mode 100644
-index 0000000..34f95c7
+index 0000000..009fa48
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv17_tv.c
-@@ -0,0 +1,689 @@
+@@ -0,0 +1,681 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -27158,9 +27416,9 @@ index 0000000..34f95c7
 +{
 +	struct nv17_tv_encoder *tv_enc = to_tv_enc(encoder);
 +
-+	tv_enc->pin_mask = pin_mask;
++	tv_enc->pin_mask = pin_mask >> 28 & 0xe;
 +
-+	switch (pin_mask) {
++	switch (tv_enc->pin_mask) {
 +	case 0x2:
 +	case 0x4:
 +		tv_enc->subconnector = DRM_MODE_SUBCONNECTOR_Composite;
@@ -27331,7 +27589,6 @@ index 0000000..34f95c7
 +static void  nv17_tv_dpms(struct drm_encoder *encoder, int mode)
 +{
 +	struct drm_device *dev = encoder->dev;
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nv17_tv_state *regs = &to_tv_enc(encoder)->state;
 +	struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);
 +
@@ -27356,15 +27613,8 @@ index 0000000..34f95c7
 +
 +	nv_load_ptv(dev, regs, 200);
 +
-+	if (dev_priv->chipset >= 0x34) {
-+		uint32_t *gpio_ext = &dev_priv->mode_reg.crtc_reg[0].gpio_ext;
-+
-+		*gpio_ext &= ~(3 << 20);
-+		if (mode == DRM_MODE_DPMS_ON)
-+			*gpio_ext |= 1 << 20;
-+
-+		NVWriteCRTC(dev, 0, NV_PCRTC_GPIO_EXT, *gpio_ext);
-+	}
++	nv17_gpio_set(dev, DCB_GPIO_TVDAC1, mode == DRM_MODE_DPMS_ON);
++	nv17_gpio_set(dev, DCB_GPIO_TVDAC0, mode == DRM_MODE_DPMS_ON);
 +
 +	nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON);
 +}
@@ -27419,7 +27669,7 @@ index 0000000..34f95c7
 +	dacclk = (NVReadRAMDAC(dev, 0, dacclk_off) & ~0x30) | 0x1;
 +
 +	if (nv_arch(dev) == NV_40)
-+		dacclk |= 1 << 20;
++		dacclk |= 0x1a << 16;
 +
 +	if (tv_norm->kind == CTV_ENC_MODE) {
 +		dacclk |=  0x20;
@@ -28559,10 +28809,10 @@ index 0000000..d64683d
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c
 new file mode 100644
-index 0000000..eeadc14
+index 0000000..18ba74f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv20_graph.c
-@@ -0,0 +1,778 @@
+@@ -0,0 +1,780 @@
 +#include "drmP.h"
 +#include "drm.h"
 +#include "nouveau_drv.h"
@@ -29326,9 +29576,11 @@ index 0000000..eeadc14
 +	{ 0x004a, false, NULL }, /* gdirect */
 +	{ 0x009f, false, NULL }, /* imageblit (nv12) */
 +	{ 0x008a, false, NULL }, /* ifc */
++	{ 0x038a, false, NULL }, /* ifc (nv30) */
 +	{ 0x0089, false, NULL }, /* sifm */
 +	{ 0x0389, false, NULL }, /* sifm (nv30) */
 +	{ 0x0062, false, NULL }, /* surf2d */
++	{ 0x0362, false, NULL }, /* surf2d (nv30) */
 +	{ 0x0043, false, NULL }, /* rop */
 +	{ 0x0012, false, NULL }, /* beta1 */
 +	{ 0x0072, false, NULL }, /* beta4 */
@@ -33283,10 +33535,10 @@ index 0000000..fb5838e
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
 new file mode 100644
-index 0000000..c95efbc
+index 0000000..8a1dd89
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_display.c
-@@ -0,0 +1,902 @@
+@@ -0,0 +1,994 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -33472,7 +33724,8 @@ index 0000000..c95efbc
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer;
 +	struct nouveau_channel *evo = dev_priv->evo;
-+	uint32_t val, ram_amount;
++	struct drm_connector *connector;
++	uint32_t val, ram_amount, hpd_en[2];
 +	uint64_t start;
 +	int ret, i;
 +
@@ -33649,9 +33902,29 @@ index 0000000..c95efbc
 +					     NV50_PDISPLAY_INTR_EN_CLK_UNK40));
 +
 +	/* enable hotplug interrupts */
-+	nv_wr32(dev, NV50_PCONNECTOR_HOTPLUG_CTRL, 0x7FFF7FFF);
-+	/* nv_wr32(dev, NV50_PCONNECTOR_HOTPLUG_INTR, 0x7FFF7FFF); */
++	hpd_en[0] = hpd_en[1] = 0;
++	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
++		struct nouveau_connector *conn = nouveau_connector(connector);
++		struct dcb_gpio_entry *gpio;
 +
++		if (connector->connector_type != DRM_MODE_CONNECTOR_DVII &&
++		    connector->connector_type != DRM_MODE_CONNECTOR_DVID &&
++		    connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
++			continue;
++
++		gpio = nouveau_bios_gpio_entry(dev, conn->dcb->gpio_tag);
++		if (!gpio)
++			continue;
++
++		hpd_en[gpio->line >> 4] |= (0x00010001 << (gpio->line & 0xf));
++	}
++
++	nv_wr32(dev, 0xe054, 0xffffffff);
++	nv_wr32(dev, 0xe050, hpd_en[0]);
++	if (dev_priv->chipset >= 0x90) {
++		nv_wr32(dev, 0xe074, 0xffffffff);
++		nv_wr32(dev, 0xe070, hpd_en[1]);
++	}
 +
 +	return 0;
 +}
@@ -33717,8 +33990,12 @@ index 0000000..c95efbc
 +	nv_wr32(dev, NV50_PDISPLAY_INTR_EN, 0x00000000);
 +
 +	/* disable hotplug interrupts */
-+	nv_wr32(dev, NV50_PCONNECTOR_HOTPLUG_INTR, 0);
-+
++	nv_wr32(dev, 0xe054, 0xffffffff);
++	nv_wr32(dev, 0xe050, 0x00000000);
++	if (dev_priv->chipset >= 0x90) {
++		nv_wr32(dev, 0xe074, 0xffffffff);
++		nv_wr32(dev, 0xe070, 0x00000000);
++	}
 +	return 0;
 +}
 +
@@ -33763,6 +34040,12 @@ index 0000000..c95efbc
 +	for (i = 0 ; i < dcb->entries; i++) {
 +		struct dcb_entry *entry = &dcb->entry[i];
 +
++		if (entry->location != DCB_LOC_ON_CHIP) {
++			NV_WARN(dev, "Off-chip encoder %d/%d unsupported\n",
++				entry->type, ffs(entry->or) - 1);
++			continue;
++		}
++
 +		switch (entry->type) {
 +		case OUTPUT_TMDS:
 +		case OUTPUT_LVDS:
@@ -33863,7 +34146,7 @@ index 0000000..c95efbc
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	uint32_t unk30 = nv_rd32(dev, NV50_PDISPLAY_UNK30_CTRL);
 +	uint32_t dac = 0, sor = 0;
-+	int head, i, or;
++	int head, i, or = 0, type = OUTPUT_ANY;
 +
 +	/* We're assuming that head 0 *or* head 1 will be active here,
 +	 * and not both.  I'm not sure if the hw will even signal both
@@ -33882,56 +34165,60 @@ index 0000000..c95efbc
 +	/* This assumes CRTCs are never bound to multiple encoders, which
 +	 * should be the case.
 +	 */
-+	for (i = 0; i < 3; i++) {
-+		if (nv50_display_mode_ctrl(dev, false, i) & (1 << head))
-+			dac |= (1 << i);
-+	}
++	for (i = 0; i < 3 && type == OUTPUT_ANY; i++) {
++		uint32_t mc = nv50_display_mode_ctrl(dev, false, i);
++		if (!(mc & (1 << head)))
++			continue;
 +
-+	for (i = 0; i < 4; i++) {
-+		if (nv50_display_mode_ctrl(dev, true, i) & (1 << head))
-+			sor |= (1 << i);
++		switch ((mc >> 8) & 0xf) {
++		case 0: type = OUTPUT_ANALOG; break;
++		case 1: type = OUTPUT_TV; break;
++		default:
++			NV_ERROR(dev, "unknown dac mode_ctrl: 0x%08x\n", dac);
++			return -1;
++		}
++
++		or = i;
 +	}
 +
-+	NV_DEBUG(dev, "dac: 0x%08x, sor: 0x%08x\n", dac, sor);
++	for (i = 0; i < 4 && type == OUTPUT_ANY; i++) {
++		uint32_t mc = nv50_display_mode_ctrl(dev, true, i);
++		if (!(mc & (1 << head)))
++			continue;
 +
-+	if (dac && sor) {
-+		NV_ERROR(dev, "multiple encoders: 0x%08x 0x%08x\n", dac, sor);
-+		return -1;
-+	} else
-+	if (dac) {
-+		or = ffs(dac) - 1;
-+		if (dac & ~(1 << or)) {
-+			NV_ERROR(dev, "multiple DAC: 0x%08x\n", dac);
-+			return -1;
-+		}
-+	} else
-+	if (sor) {
-+		or = ffs(sor) - 1;
-+		if (sor & ~(1 << or)) {
-+			NV_ERROR(dev, "multiple SOR: 0x%08x\n", sor);
++		switch ((mc >> 8) & 0xf) {
++		case 0: type = OUTPUT_LVDS; break;
++		case 1: type = OUTPUT_TMDS; break;
++		case 2: type = OUTPUT_TMDS; break;
++		case 5: type = OUTPUT_TMDS; break;
++		case 8: type = OUTPUT_DP; break;
++		case 9: type = OUTPUT_DP; break;
++		default:
++			NV_ERROR(dev, "unknown sor mode_ctrl: 0x%08x\n", sor);
 +			return -1;
 +		}
-+	} else {
-+		NV_ERROR(dev, "no encoders!\n");
++
++		or = i;
++	}
++
++	NV_DEBUG(dev, "type %d, or %d\n", type, or);
++	if (type == OUTPUT_ANY) {
++		NV_ERROR(dev, "unknown encoder!!\n");
 +		return -1;
 +	}
 +
 +	for (i = 0; i < dev_priv->vbios->dcb->entries; i++) {
 +		struct dcb_entry *dcbent = &dev_priv->vbios->dcb->entry[i];
 +
-+		if (dac && (dcbent->type != OUTPUT_ANALOG &&
-+			    dcbent->type != OUTPUT_TV))
++		if (dcbent->type != type)
 +			continue;
-+		else
-+		if (sor && (dcbent->type != OUTPUT_TMDS &&
-+			    dcbent->type != OUTPUT_LVDS))
++
++		if (!(dcbent->or & (1 << or)))
 +			continue;
 +
-+		if (dcbent->or & (1 << or)) {
-+			*phead = head;
-+			*pdcbent = dcbent;
-+			return 0;
-+		}
++		*phead = head;
++		*pdcbent = dcbent;
++		return 0;
 +	}
 +
 +	NV_ERROR(dev, "no DCB entry for %d %d\n", dac != 0, or);
@@ -33951,11 +34238,23 @@ index 0000000..c95efbc
 +	switch (dcbent->type) {
 +	case OUTPUT_LVDS:
 +		script = (mc >> 8) & 0xf;
-+		if (pxclk >= bios->fp.duallink_transition_clk)
-+			script |= 0x0100;
++		if (bios->pub.fp_no_ddc) {
++			if (bios->fp.dual_link)
++				script |= 0x0100;
++			if (bios->fp.if_is_24bit)
++				script |= 0x0200;
++		} else {
++			if (pxclk >= bios->fp.duallink_transition_clk) {
++				script |= 0x0100;
++				if (bios->fp.strapless_is_24bit & 2)
++					script |= 0x0200;
++			} else
++			if (bios->fp.strapless_is_24bit & 1)
++				script |= 0x0200;
++		}
 +
 +		if (nouveau_uscript_lvds >= 0) {
-+			NV_INFO(dev, "override script 0x%04x with 0x%04x"
++			NV_INFO(dev, "override script 0x%04x with 0x%04x "
 +				     "for output LVDS-%d\n", script,
 +				     nouveau_uscript_lvds, or);
 +			script = nouveau_uscript_lvds;
@@ -33967,7 +34266,7 @@ index 0000000..c95efbc
 +			script |= 0x0100;
 +
 +		if (nouveau_uscript_tmds >= 0) {
-+			NV_INFO(dev, "override script 0x%04x with 0x%04x"
++			NV_INFO(dev, "override script 0x%04x with 0x%04x "
 +				     "for output TMDS-%d\n", script,
 +				     nouveau_uscript_tmds, or);
 +			script = nouveau_uscript_tmds;
@@ -34139,12 +34438,57 @@ index 0000000..c95efbc
 +	nv_wr32(dev, NV50_PDISPLAY_TRAPPED_ADDR, 0x90000000);
 +}
 +
++static void
++nv50_display_irq_hotplug(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct drm_connector *connector;
++	const uint32_t gpio_reg[4] = { 0xe104, 0xe108, 0xe280, 0xe284 };
++	uint32_t unplug_mask, plug_mask, change_mask;
++	uint32_t hpd0, hpd1 = 0;
++
++	hpd0 = nv_rd32(dev, 0xe054) & nv_rd32(dev, 0xe050);
++	if (dev_priv->chipset >= 0x90)
++		hpd1 = nv_rd32(dev, 0xe074) & nv_rd32(dev, 0xe070);
++
++	plug_mask   = (hpd0 & 0x0000ffff) | (hpd1 << 16);
++	unplug_mask = (hpd0 >> 16) | (hpd1 & 0xffff0000);
++	change_mask = plug_mask | unplug_mask;
++
++	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
++		struct nouveau_connector *nv_connector =
++			nouveau_connector(connector);
++		struct dcb_gpio_entry *gpio;
++		uint32_t reg;
++		bool plugged;
++
++		if (!nv_connector->dcb)
++			continue;
++
++		gpio = nouveau_bios_gpio_entry(dev, nv_connector->dcb->gpio_tag);
++		if (!gpio || !(change_mask & (1 << gpio->line)))
++			continue;
++
++		reg = nv_rd32(dev, gpio_reg[gpio->line >> 3]);
++		plugged = !!(reg & (4 << ((gpio->line & 7) << 2)));
++		NV_INFO(dev, "%splugged %s\n", plugged ? "" : "un",
++			drm_get_connector_name(connector)) ;
++	}
++
++	nv_wr32(dev, 0xe054, nv_rd32(dev, 0xe054));
++	if (dev_priv->chipset >= 0x90)
++		nv_wr32(dev, 0xe074, nv_rd32(dev, 0xe074));
++}
++
 +void
 +nv50_display_irq_handler(struct drm_device *dev)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	uint32_t delayed = 0;
 +
++	while (nv_rd32(dev, NV50_PMC_INTR_0) & NV50_PMC_INTR_0_HOTPLUG)
++		nv50_display_irq_hotplug(dev);
++
 +	while (nv_rd32(dev, NV50_PMC_INTR_0) & NV50_PMC_INTR_0_DISPLAY) {
 +		uint32_t intr0 = nv_rd32(dev, NV50_PDISPLAY_INTR_0);
 +		uint32_t intr1 = nv_rd32(dev, NV50_PDISPLAY_INTR_1);
@@ -34171,7 +34515,7 @@ index 0000000..c95efbc
 +		if (clock) {
 +			nv_wr32(dev, NV03_PMC_INTR_EN_0, 0);
 +			if (!work_pending(&dev_priv->irq_work))
-+				schedule_work(&dev_priv->irq_work);
++				queue_work(dev_priv->wq, &dev_priv->irq_work);
 +			delayed |= clock;
 +			intr1 &= ~clock;
 +		}
@@ -63025,10 +63369,10 @@ index 0000000..e0a9c3f
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
 new file mode 100644
-index 0000000..d7fab7d
+index 0000000..019a1bf
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,265 @@
+@@ -0,0 +1,269 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -63186,9 +63530,13 @@ index 0000000..d7fab7d
 +
 +	switch (nv_encoder->dcb->type) {
 +	case OUTPUT_TMDS:
-+		mode_ctl |= NV50_EVO_SOR_MODE_CTRL_TMDS;
-+		if (adjusted_mode->clock > 165000)
-+			mode_ctl |= NV50_EVO_SOR_MODE_CTRL_TMDS_DUAL_LINK;
++		if (nv_encoder->dcb->tmdsconf.sor_link & 1) {
++			if (adjusted_mode->clock < 165000)
++				mode_ctl = 0x0100;
++			else
++				mode_ctl = 0x0500;
++		} else
++			mode_ctl = 0x0200;
 +		break;
 +	default:
 +		break;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1943
retrieving revision 1.1944
diff -u -p -r1.1943 -r1.1944
--- kernel.spec	1 Dec 2009 04:13:23 -0000	1.1943
+++ kernel.spec	1 Dec 2009 23:24:14 -0000	1.1944
@@ -2153,6 +2153,11 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 02 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-158
+- nouveau: more complete lvds script selection on >=G80 (rh#522690, rh#529859)
+- nouveau: more complete tmds script selection on >=G80 (rh#537853)
+- nouveau: TV detection fixes
+
 * Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-157
 - div/0 fix harder (#540593) - also ignore unposted GPUs with no BIOS
 



From dledford at fedoraproject.org  Wed Dec  2 00:03:13 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 00:03:13 +0000 (UTC)
Subject: rpms/rdma/devel rdma.conf, 1.1, 1.2 rdma.ifup-ib, 1.1, 1.2 rdma.init,
	1.1, 1.2 rdma.spec, 1.4, 1.5
Message-ID: <20091202000313.2C01411C00A3@cvs1.fedora.phx.redhat.com>

Author: dledford

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

Modified Files:
	rdma.conf rdma.ifup-ib rdma.init rdma.spec 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0-6
- Tweak init script for LSB compliance
- Tweak ifup-ib script to work properly with bonded slaves that need their
  MTU set
- Tweak ifup-ib script to properly change connected mode either on or off
  instead of only setting it on but not turning it off if the setting changes



Index: rdma.conf
===================================================================
RCS file: /cvs/extras/rpms/rdma/devel/rdma.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.conf	27 Jun 2008 17:53:32 -0000	1.1
+++ rdma.conf	2 Dec 2009 00:03:12 -0000	1.2
@@ -4,9 +4,12 @@ IPOIB_LOAD=yes
 SRP_LOAD=no
 # Load iSER module
 ISER_LOAD=no
-# Load QLogic VNIC module
-QLGC_VNIC_LOAD=no
+# Load RDS network protocol
+LOAD_RDS=yes
 # Should we modify the system mtrr registers?  We may need to do this if you
 # get messages from the ib_ipath driver saying that it couldn't enable
 # write combining for the PIO buffs on the card.
+#
+# Note: recent kernels should do this for us, but in case they don't, we'll
+# leave this option
 FIXUP_MTRR_REGS=no


Index: rdma.ifup-ib
===================================================================
RCS file: /cvs/extras/rpms/rdma/devel/rdma.ifup-ib,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.ifup-ib	9 Oct 2008 13:21:39 -0000	1.1
+++ rdma.ifup-ib	2 Dec 2009 00:03:12 -0000	1.2
@@ -63,8 +63,28 @@ if [ -n "${MACADDR}" ]; then
    ip link set dev ${DEVICE} address ${MACADDR}
 fi
 
-# Bonding on IPoIB interfaces doesn't work yet, but it's planned.  Leave
-# the code to handle it in place for when the kernel is ready.
+# First, do we even support setting connected mode?
+if [ -e /sys/class/net/${DEVICE}/mode ]; then
+    # OK, set the mode in all cases, that way it gets reset on a down/up
+    # cycle, allowing people to change the mode without rebooting
+    if [ "${CONNECTED_MODE}" = yes ]; then
+        echo connected > /sys/class/net/${DEVICE}/mode
+	# cap the MTU where we should based upon mode
+	if [ -n "${MTU}" -a $MTU -gt 65520 ]; then
+	    MTU=65520
+	fi
+    else
+        echo datagram > /sys/class/net/${DEVICE}/mode
+	# cap the MTU where we should based upon mode
+	if [ -n "${MTU}" -a $MTU -gt 2044 ]; then
+	    MTU=2044
+	fi
+    fi
+fi
+
+if [ -n "${MTU}" ]; then
+    ip link set dev ${DEVICE} mtu ${MTU}
+fi
 
 # slave device?
 if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
@@ -117,16 +137,6 @@ if [ "$ISALIAS" = no ] && is_bonding_dev
     done
 fi
 
-# We have to set connected mode before we set the MTU since connected mode
-# changes our maximum allowed MTU
-if [ "${CONNECTED_MODE}" = yes -a -e /sys/class/net/${DEVICE}/mode ]; then
-    echo connected > /sys/class/net/${DEVICE}/mode
-fi
-
-if [ -n "${MTU}" ]; then
-   ip link set dev ${DEVICE} mtu ${MTU}
-fi
-
 		     
 if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then
     # Remove any temporary references which were previously added to dhclient config


Index: rdma.init
===================================================================
RCS file: /cvs/extras/rpms/rdma/devel/rdma.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.init	27 Jun 2008 17:53:32 -0000	1.1
+++ rdma.init	2 Dec 2009 00:03:12 -0000	1.2
@@ -26,10 +26,18 @@ LOAD_CORE_MODULES="ib_core ib_mad ib_sa 
 if [ -f $CONFIG ]; then
     . $CONFIG
 
+    if [ "${RDS_LOAD}" == "yes" ]; then
+        IPOIB_LOAD=yes
+    fi
+
     if [ "${IPOIB_LOAD}" == "yes" ]; then
 	LOAD_ULP_MODULES="ib_ipoib"
     fi
 
+    if [ "${RDS_LOAD}" == "yes" ]; then
+	LOAD_ULP_MODULES="$LOAD_ULP_MODULES rds"
+    fi
+
     if [ "${SRP_LOAD}" == "yes" ]; then
 	LOAD_ULP_MODULES="$LOAD_ULP_MODULES ib_srp"
     fi
@@ -41,7 +49,7 @@ else
     LOAD_ULP_MODULES="ib_ipoib"
 fi
 
-UNLOAD_ULP_MODULES="ib_iser ib_srp ib_ipoib"
+UNLOAD_ULP_MODULES="ib_iser ib_srp rds ib_ipoib"
 UNLOAD_HW_MODULES="iw_c2 iw_cxgb3 iw_nes ib_ehca ib_ipath ib_mthca mlx4_ib"
 UNLOAD_CORE_USER_MODULES="rdma_ucm ib_ucm ib_uverbs ib_umad"
 UNLOAD_CORE_CM_MODULES="rdma_cm ib_cm iw_cm"
@@ -276,15 +284,6 @@ stop()
 	fi
     done
 
-    if is_module qlgc_vnic; then
-	echo
-	echo "The qlgc_vnic service is still running."
-	echo "Please stop all RDMA applications before downing the stack."
-	echo_failure
-	echo
-	return 1
-    fi
-
     if ! is_module ib_core; then
 	# Nothing to do, make sure lock file is gone and return
 	rm -f /var/lock/subsys/rdma
@@ -297,9 +296,13 @@ stop()
     if is_module ib_ipoib; then
 	for i in $interfaces
 	do
+	    . /etc/sysconfig/network-scripts/ifcfg-$i
+	    [ "${SLAVE}" = yes -a "${MASTER}" ] && ifdown ${MASTER} >/dev/null 2>&1
 	    ifdown $i > /dev/null 2>&1
 	done    
     fi
+    # Small sleep to let the ifdown settle before we remove any modules
+    sleep 1
 	
     # Unload OpenIB modules
     MODULES="$UNLOAD_ULP_MODULES $UNLOAD_CORE_USER_MODULES"
@@ -443,6 +446,11 @@ usage ()
 }
 
 case $1 in
+    start|stop|restart|condrestart|try-restart|force-reload)
+	[ `id -u` != "0" ] && exit 4 ;;
+esac
+
+case $1 in
     start) start; RC=$? ;;
     stop) stop; RC=$? ;;
     restart) restart; RC=$? ;;


Index: rdma.spec
===================================================================
RCS file: /cvs/extras/rpms/rdma/devel/rdma.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rdma.spec	27 Jul 2009 02:52:40 -0000	1.4
+++ rdma.spec	2 Dec 2009 00:03:12 -0000	1.5
@@ -6,7 +6,7 @@
 Summary: Infiniband/iWARP Kernel Module Initializer
 Name: rdma
 Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: rdma.conf
@@ -62,6 +62,13 @@ fi
 %{_sysconfdir}/sysconfig/network-scripts/ifup-ib
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0-6
+- Tweak init script for LSB compliance
+- Tweak ifup-ib script to work properly with bonded slaves that need their
+  MTU set
+- Tweak ifup-ib script to properly change connected mode either on or off
+  instead of only setting it on but not turning it off if the setting changes
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dledford at fedoraproject.org  Wed Dec  2 00:17:36 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 00:17:36 +0000 (UTC)
Subject: rpms/rdma/F-12 rdma.conf, 1.1, 1.2 rdma.ifup-ib, 1.1, 1.2 rdma.init,
	1.1, 1.2 rdma.spec, 1.4, 1.5
Message-ID: <20091202001736.37FD811C00A3@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/rdma/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28535

Modified Files:
	rdma.conf rdma.ifup-ib rdma.init rdma.spec 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0-6
- Tweak init script for LSB compliance
- Tweak ifup-ib script to work properly with bonded slaves that need their
  MTU set
- Tweak ifup-ib script to properly change connected mode either on or off
  instead of only setting it on but not turning it off if the setting changes



Index: rdma.conf
===================================================================
RCS file: /cvs/extras/rpms/rdma/F-12/rdma.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.conf	27 Jun 2008 17:53:32 -0000	1.1
+++ rdma.conf	2 Dec 2009 00:17:35 -0000	1.2
@@ -4,9 +4,12 @@ IPOIB_LOAD=yes
 SRP_LOAD=no
 # Load iSER module
 ISER_LOAD=no
-# Load QLogic VNIC module
-QLGC_VNIC_LOAD=no
+# Load RDS network protocol
+LOAD_RDS=yes
 # Should we modify the system mtrr registers?  We may need to do this if you
 # get messages from the ib_ipath driver saying that it couldn't enable
 # write combining for the PIO buffs on the card.
+#
+# Note: recent kernels should do this for us, but in case they don't, we'll
+# leave this option
 FIXUP_MTRR_REGS=no


Index: rdma.ifup-ib
===================================================================
RCS file: /cvs/extras/rpms/rdma/F-12/rdma.ifup-ib,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.ifup-ib	9 Oct 2008 13:21:39 -0000	1.1
+++ rdma.ifup-ib	2 Dec 2009 00:17:35 -0000	1.2
@@ -63,8 +63,28 @@ if [ -n "${MACADDR}" ]; then
    ip link set dev ${DEVICE} address ${MACADDR}
 fi
 
-# Bonding on IPoIB interfaces doesn't work yet, but it's planned.  Leave
-# the code to handle it in place for when the kernel is ready.
+# First, do we even support setting connected mode?
+if [ -e /sys/class/net/${DEVICE}/mode ]; then
+    # OK, set the mode in all cases, that way it gets reset on a down/up
+    # cycle, allowing people to change the mode without rebooting
+    if [ "${CONNECTED_MODE}" = yes ]; then
+        echo connected > /sys/class/net/${DEVICE}/mode
+	# cap the MTU where we should based upon mode
+	if [ -n "${MTU}" -a $MTU -gt 65520 ]; then
+	    MTU=65520
+	fi
+    else
+        echo datagram > /sys/class/net/${DEVICE}/mode
+	# cap the MTU where we should based upon mode
+	if [ -n "${MTU}" -a $MTU -gt 2044 ]; then
+	    MTU=2044
+	fi
+    fi
+fi
+
+if [ -n "${MTU}" ]; then
+    ip link set dev ${DEVICE} mtu ${MTU}
+fi
 
 # slave device?
 if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
@@ -117,16 +137,6 @@ if [ "$ISALIAS" = no ] && is_bonding_dev
     done
 fi
 
-# We have to set connected mode before we set the MTU since connected mode
-# changes our maximum allowed MTU
-if [ "${CONNECTED_MODE}" = yes -a -e /sys/class/net/${DEVICE}/mode ]; then
-    echo connected > /sys/class/net/${DEVICE}/mode
-fi
-
-if [ -n "${MTU}" ]; then
-   ip link set dev ${DEVICE} mtu ${MTU}
-fi
-
 		     
 if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then
     # Remove any temporary references which were previously added to dhclient config


Index: rdma.init
===================================================================
RCS file: /cvs/extras/rpms/rdma/F-12/rdma.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.init	27 Jun 2008 17:53:32 -0000	1.1
+++ rdma.init	2 Dec 2009 00:17:35 -0000	1.2
@@ -26,10 +26,18 @@ LOAD_CORE_MODULES="ib_core ib_mad ib_sa 
 if [ -f $CONFIG ]; then
     . $CONFIG
 
+    if [ "${RDS_LOAD}" == "yes" ]; then
+        IPOIB_LOAD=yes
+    fi
+
     if [ "${IPOIB_LOAD}" == "yes" ]; then
 	LOAD_ULP_MODULES="ib_ipoib"
     fi
 
+    if [ "${RDS_LOAD}" == "yes" ]; then
+	LOAD_ULP_MODULES="$LOAD_ULP_MODULES rds"
+    fi
+
     if [ "${SRP_LOAD}" == "yes" ]; then
 	LOAD_ULP_MODULES="$LOAD_ULP_MODULES ib_srp"
     fi
@@ -41,7 +49,7 @@ else
     LOAD_ULP_MODULES="ib_ipoib"
 fi
 
-UNLOAD_ULP_MODULES="ib_iser ib_srp ib_ipoib"
+UNLOAD_ULP_MODULES="ib_iser ib_srp rds ib_ipoib"
 UNLOAD_HW_MODULES="iw_c2 iw_cxgb3 iw_nes ib_ehca ib_ipath ib_mthca mlx4_ib"
 UNLOAD_CORE_USER_MODULES="rdma_ucm ib_ucm ib_uverbs ib_umad"
 UNLOAD_CORE_CM_MODULES="rdma_cm ib_cm iw_cm"
@@ -276,15 +284,6 @@ stop()
 	fi
     done
 
-    if is_module qlgc_vnic; then
-	echo
-	echo "The qlgc_vnic service is still running."
-	echo "Please stop all RDMA applications before downing the stack."
-	echo_failure
-	echo
-	return 1
-    fi
-
     if ! is_module ib_core; then
 	# Nothing to do, make sure lock file is gone and return
 	rm -f /var/lock/subsys/rdma
@@ -297,9 +296,13 @@ stop()
     if is_module ib_ipoib; then
 	for i in $interfaces
 	do
+	    . /etc/sysconfig/network-scripts/ifcfg-$i
+	    [ "${SLAVE}" = yes -a "${MASTER}" ] && ifdown ${MASTER} >/dev/null 2>&1
 	    ifdown $i > /dev/null 2>&1
 	done    
     fi
+    # Small sleep to let the ifdown settle before we remove any modules
+    sleep 1
 	
     # Unload OpenIB modules
     MODULES="$UNLOAD_ULP_MODULES $UNLOAD_CORE_USER_MODULES"
@@ -443,6 +446,11 @@ usage ()
 }
 
 case $1 in
+    start|stop|restart|condrestart|try-restart|force-reload)
+	[ `id -u` != "0" ] && exit 4 ;;
+esac
+
+case $1 in
     start) start; RC=$? ;;
     stop) stop; RC=$? ;;
     restart) restart; RC=$? ;;


Index: rdma.spec
===================================================================
RCS file: /cvs/extras/rpms/rdma/F-12/rdma.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rdma.spec	27 Jul 2009 02:52:40 -0000	1.4
+++ rdma.spec	2 Dec 2009 00:17:35 -0000	1.5
@@ -6,7 +6,7 @@
 Summary: Infiniband/iWARP Kernel Module Initializer
 Name: rdma
 Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: rdma.conf
@@ -62,6 +62,13 @@ fi
 %{_sysconfdir}/sysconfig/network-scripts/ifup-ib
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0-6
+- Tweak init script for LSB compliance
+- Tweak ifup-ib script to work properly with bonded slaves that need their
+  MTU set
+- Tweak ifup-ib script to properly change connected mode either on or off
+  instead of only setting it on but not turning it off if the setting changes
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dledford at fedoraproject.org  Wed Dec  2 00:23:15 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 00:23:15 +0000 (UTC)
Subject: rpms/rdma/F-11 rdma.conf, 1.1, 1.2 rdma.ifup-ib, 1.1, 1.2 rdma.init,
	1.1, 1.2 rdma.spec, 1.3, 1.4
Message-ID: <20091202002315.37C1E11C00A3@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/rdma/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29255

Modified Files:
	rdma.conf rdma.ifup-ib rdma.init rdma.spec 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0-6
- Tweak init script for LSB compliance
- Tweak ifup-ib script to work properly with bonded slaves that need their
  MTU set
- Tweak ifup-ib script to properly change connected mode either on or off
  instead of only setting it on but not turning it off if the setting changes



Index: rdma.conf
===================================================================
RCS file: /cvs/extras/rpms/rdma/F-11/rdma.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.conf	27 Jun 2008 17:53:32 -0000	1.1
+++ rdma.conf	2 Dec 2009 00:23:14 -0000	1.2
@@ -4,9 +4,12 @@ IPOIB_LOAD=yes
 SRP_LOAD=no
 # Load iSER module
 ISER_LOAD=no
-# Load QLogic VNIC module
-QLGC_VNIC_LOAD=no
+# Load RDS network protocol
+LOAD_RDS=yes
 # Should we modify the system mtrr registers?  We may need to do this if you
 # get messages from the ib_ipath driver saying that it couldn't enable
 # write combining for the PIO buffs on the card.
+#
+# Note: recent kernels should do this for us, but in case they don't, we'll
+# leave this option
 FIXUP_MTRR_REGS=no


Index: rdma.ifup-ib
===================================================================
RCS file: /cvs/extras/rpms/rdma/F-11/rdma.ifup-ib,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.ifup-ib	9 Oct 2008 13:21:39 -0000	1.1
+++ rdma.ifup-ib	2 Dec 2009 00:23:14 -0000	1.2
@@ -63,8 +63,28 @@ if [ -n "${MACADDR}" ]; then
    ip link set dev ${DEVICE} address ${MACADDR}
 fi
 
-# Bonding on IPoIB interfaces doesn't work yet, but it's planned.  Leave
-# the code to handle it in place for when the kernel is ready.
+# First, do we even support setting connected mode?
+if [ -e /sys/class/net/${DEVICE}/mode ]; then
+    # OK, set the mode in all cases, that way it gets reset on a down/up
+    # cycle, allowing people to change the mode without rebooting
+    if [ "${CONNECTED_MODE}" = yes ]; then
+        echo connected > /sys/class/net/${DEVICE}/mode
+	# cap the MTU where we should based upon mode
+	if [ -n "${MTU}" -a $MTU -gt 65520 ]; then
+	    MTU=65520
+	fi
+    else
+        echo datagram > /sys/class/net/${DEVICE}/mode
+	# cap the MTU where we should based upon mode
+	if [ -n "${MTU}" -a $MTU -gt 2044 ]; then
+	    MTU=2044
+	fi
+    fi
+fi
+
+if [ -n "${MTU}" ]; then
+    ip link set dev ${DEVICE} mtu ${MTU}
+fi
 
 # slave device?
 if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
@@ -117,16 +137,6 @@ if [ "$ISALIAS" = no ] && is_bonding_dev
     done
 fi
 
-# We have to set connected mode before we set the MTU since connected mode
-# changes our maximum allowed MTU
-if [ "${CONNECTED_MODE}" = yes -a -e /sys/class/net/${DEVICE}/mode ]; then
-    echo connected > /sys/class/net/${DEVICE}/mode
-fi
-
-if [ -n "${MTU}" ]; then
-   ip link set dev ${DEVICE} mtu ${MTU}
-fi
-
 		     
 if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then
     # Remove any temporary references which were previously added to dhclient config


Index: rdma.init
===================================================================
RCS file: /cvs/extras/rpms/rdma/F-11/rdma.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rdma.init	27 Jun 2008 17:53:32 -0000	1.1
+++ rdma.init	2 Dec 2009 00:23:14 -0000	1.2
@@ -26,10 +26,18 @@ LOAD_CORE_MODULES="ib_core ib_mad ib_sa 
 if [ -f $CONFIG ]; then
     . $CONFIG
 
+    if [ "${RDS_LOAD}" == "yes" ]; then
+        IPOIB_LOAD=yes
+    fi
+
     if [ "${IPOIB_LOAD}" == "yes" ]; then
 	LOAD_ULP_MODULES="ib_ipoib"
     fi
 
+    if [ "${RDS_LOAD}" == "yes" ]; then
+	LOAD_ULP_MODULES="$LOAD_ULP_MODULES rds"
+    fi
+
     if [ "${SRP_LOAD}" == "yes" ]; then
 	LOAD_ULP_MODULES="$LOAD_ULP_MODULES ib_srp"
     fi
@@ -41,7 +49,7 @@ else
     LOAD_ULP_MODULES="ib_ipoib"
 fi
 
-UNLOAD_ULP_MODULES="ib_iser ib_srp ib_ipoib"
+UNLOAD_ULP_MODULES="ib_iser ib_srp rds ib_ipoib"
 UNLOAD_HW_MODULES="iw_c2 iw_cxgb3 iw_nes ib_ehca ib_ipath ib_mthca mlx4_ib"
 UNLOAD_CORE_USER_MODULES="rdma_ucm ib_ucm ib_uverbs ib_umad"
 UNLOAD_CORE_CM_MODULES="rdma_cm ib_cm iw_cm"
@@ -276,15 +284,6 @@ stop()
 	fi
     done
 
-    if is_module qlgc_vnic; then
-	echo
-	echo "The qlgc_vnic service is still running."
-	echo "Please stop all RDMA applications before downing the stack."
-	echo_failure
-	echo
-	return 1
-    fi
-
     if ! is_module ib_core; then
 	# Nothing to do, make sure lock file is gone and return
 	rm -f /var/lock/subsys/rdma
@@ -297,9 +296,13 @@ stop()
     if is_module ib_ipoib; then
 	for i in $interfaces
 	do
+	    . /etc/sysconfig/network-scripts/ifcfg-$i
+	    [ "${SLAVE}" = yes -a "${MASTER}" ] && ifdown ${MASTER} >/dev/null 2>&1
 	    ifdown $i > /dev/null 2>&1
 	done    
     fi
+    # Small sleep to let the ifdown settle before we remove any modules
+    sleep 1
 	
     # Unload OpenIB modules
     MODULES="$UNLOAD_ULP_MODULES $UNLOAD_CORE_USER_MODULES"
@@ -443,6 +446,11 @@ usage ()
 }
 
 case $1 in
+    start|stop|restart|condrestart|try-restart|force-reload)
+	[ `id -u` != "0" ] && exit 4 ;;
+esac
+
+case $1 in
     start) start; RC=$? ;;
     stop) stop; RC=$? ;;
     restart) restart; RC=$? ;;


Index: rdma.spec
===================================================================
RCS file: /cvs/extras/rpms/rdma/F-11/rdma.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rdma.spec	25 Feb 2009 19:18:14 -0000	1.3
+++ rdma.spec	2 Dec 2009 00:23:14 -0000	1.4
@@ -6,7 +6,7 @@
 Summary: Infiniband/iWARP Kernel Module Initializer
 Name: rdma
 Version: 1.0
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: rdma.conf
@@ -62,6 +62,16 @@ fi
 %{_sysconfdir}/sysconfig/network-scripts/ifup-ib
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0-6
+- Tweak init script for LSB compliance
+- Tweak ifup-ib script to work properly with bonded slaves that need their
+  MTU set
+- Tweak ifup-ib script to properly change connected mode either on or off
+  instead of only setting it on but not turning it off if the setting changes
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dledford at fedoraproject.org  Wed Dec  2 00:41:51 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 00:41:51 +0000 (UTC)
Subject: File libmlx4-1.0.1.tar.gz uploaded to lookaside cache by dledford
Message-ID: <20091202004151.4B14910F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libmlx4:

044d9b1ff3b92f0331a3ee48779423ef  libmlx4-1.0.1.tar.gz



From dledford at fedoraproject.org  Wed Dec  2 00:55:07 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 00:55:07 +0000 (UTC)
Subject: rpms/libmlx4/devel
	libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch, NONE, 
	1.1
	libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch,
	NONE, 1.1 libmlx4-0003-mmap-needs-some-includes.patch, NONE, 1.1
	libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch,
	NONE, 1.1
	libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 libmlx4.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20091202005507.D7AC011C00A3@cvs1.fedora.phx.redhat.com>

Author: dledford

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

Modified Files:
	.cvsignore libmlx4.spec sources 
Added Files:
	libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch 
	libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch 
	libmlx4-0003-mmap-needs-some-includes.patch 
	libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch 
	libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-1
- Update to latest upstream release
- Add pseudo provides of libibverbs-driver
- Update buildrequires for libibverbs API change


libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch:
 mlx4.c  |    4 ++--
 mlx4.h  |    2 --
 verbs.c |   11 -----------
 3 files changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch ---
>From 09f8dcd3769a52eebceeae15e2c5a844e6ee4586 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Date: Mon, 20 Jul 2009 16:37:24 -0600
Subject: [PATCH 1/5] Remove empty stubs for detach/attach_mcast

Just use ibv_cmd_* directly.  Simplifies the code and fixes const
correctness warnings due to changes in libibverbs.

Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/mlx4.c  |    4 ++--
 src/mlx4.h  |    2 --
 src/verbs.c |   10 ----------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/mlx4.c b/src/mlx4.c
index 34ece39..1295c53 100644
--- a/src/mlx4.c
+++ b/src/mlx4.c
@@ -94,8 +94,8 @@ static struct ibv_context_ops mlx4_ctx_ops = {
 	.post_recv     = mlx4_post_recv,
 	.create_ah     = mlx4_create_ah,
 	.destroy_ah    = mlx4_destroy_ah,
-	.attach_mcast  = mlx4_attach_mcast,
-	.detach_mcast  = mlx4_detach_mcast
+	.attach_mcast  = ibv_cmd_attach_mcast,
+	.detach_mcast  = ibv_cmd_detach_mcast
 };
 
 static struct ibv_context *mlx4_alloc_context(struct ibv_device *ibdev, int cmd_fd)
diff --git a/src/mlx4.h b/src/mlx4.h
index 827a201..0c658cf 100644
--- a/src/mlx4.h
+++ b/src/mlx4.h
@@ -361,7 +361,5 @@ int mlx4_destroy_ah(struct ibv_ah *ah);
 int mlx4_alloc_av(struct mlx4_pd *pd, struct ibv_ah_attr *attr,
 		   struct mlx4_ah *ah);
 void mlx4_free_av(struct mlx4_ah *ah);
-int mlx4_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
-int mlx4_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
 
 #endif /* MLX4_H */
diff --git a/src/verbs.c b/src/verbs.c
index cc179a0..2c19d93 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -651,13 +651,3 @@ int mlx4_destroy_ah(struct ibv_ah *ah)
 
 	return 0;
 }
-
-int mlx4_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-	return ibv_cmd_attach_mcast(qp, gid, lid);
-}
-
-int mlx4_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-	return ibv_cmd_detach_mcast(qp, gid, lid);
-}
-- 
1.6.5.2


libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch:
 buf.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

--- NEW FILE libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch ---
>From 87750d1db4bc73933e92d862ff73d10d06ff4f5d Mon Sep 17 00:00:00 2001
From: Sebastien Dugue <sebastien.dugue at bull.net>
Date: Wed, 29 Jul 2009 11:45:55 -0700
Subject: [PATCH 2/5] Use mmap(MAP_ANONYMOUS) to allocate queue buffers

Internal buffers for QPs, CQs, SRQs etc. are allocated with
mlx4_alloc_buf(), which rounds the buffer's size to the page size and
then allocates page aligned memory using posix_memalign().

However, this allocation is quite wasteful on architectures using 64K
pages (ia64 for example) because we then hit glibc's MMAP_THRESHOLD
malloc parameter and chunks are allocated using mmap.  Thus we end up
allocating:

  (requested size rounded to the page size) + (page size) + (malloc overhead)

rounded internally to the page size.

So for example, if we request a buffer of page_size bytes, we end up
consuming 3 pages.  In short, for each buffer we allocate, there is an
overhead of 2 pages.  This is quite visible on large clusters where
the number of QPs can reach several thousands.

This patch replaces the call to posix_memalign() in mlx4_alloc_buf()
with a direct call to mmap().

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/buf.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/buf.c b/src/buf.c
index 0e5f9b6..bbaff12 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -61,16 +61,15 @@ int mlx4_alloc_buf(struct mlx4_buf *buf, size_t size, int page_size)
 {
 	int ret;
 
-	ret = posix_memalign(&buf->buf, page_size, align(size, page_size));
-	if (ret)
-		return ret;
+	buf->length = align(size, page_size);
+	buf->buf = mmap(NULL, buf->length, PROT_READ | PROT_WRITE,
+			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	if (buf->buf == MAP_FAILED)
+		return errno;
 
 	ret = ibv_dontfork_range(buf->buf, size);
 	if (ret)
-		free(buf->buf);
-
-	if (!ret)
-		buf->length = size;
+		munmap(buf->buf, buf->length);
 
 	return ret;
 }
@@ -78,5 +77,5 @@ int mlx4_alloc_buf(struct mlx4_buf *buf, size_t size, int page_size)
 void mlx4_free_buf(struct mlx4_buf *buf)
 {
 	ibv_dofork_range(buf->buf, buf->length);
-	free(buf->buf);
+	munmap(buf->buf, buf->length);
 }
-- 
1.6.5.2


libmlx4-0003-mmap-needs-some-includes.patch:
 buf.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE libmlx4-0003-mmap-needs-some-includes.patch ---
>From cf744a2ef8343e5f74f9c59de3990e3e46ec301c Mon Sep 17 00:00:00 2001
From: Sebastien Dugue <sebastien.dugue at bull.net>
Date: Mon, 3 Aug 2009 15:40:01 +0200
Subject: [PATCH 3/5] mmap() needs some includes

Add errno.h and sys/mman.h includes in buf.c for mmap().  The includes
were left out of 87750d1d ("Use mmap(MAP_ANONYMOUS) to allocate queue
buffers") by mistake.

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/buf.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/buf.c b/src/buf.c
index bbaff12..a80bcb1 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -35,6 +35,8 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
+#include <errno.h>
+#include <sys/mman.h>
 
 #include "mlx4.h"
 
-- 
1.6.5.2


libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch:
 libmlx4.spec.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch ---
>From ec9d1ca2fa87984d0656e811b03fa60d44459930 Mon Sep 17 00:00:00 2001
From: Sebastien Dugue <sebastien.dugue at bull.net>
Date: Mon, 3 Aug 2009 13:47:43 -0700
Subject: [PATCH 4/5] Fix version in taball filename in RPM spec file

Forgot to bump the tarball filename when releasing libmlx4-1.0.1.

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 libmlx4.spec.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libmlx4.spec.in b/libmlx4.spec.in
index 869032f..a98ca68 100644
--- a/libmlx4.spec.in
+++ b/libmlx4.spec.in
@@ -6,7 +6,7 @@ Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openfabrics.org/
-Source: http://openfabrics.org/downloads/mlx4/libmlx4-1.0.tar.gz
+Source: http://openfabrics.org/downloads/mlx4/libmlx4-1.0.1.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: libibverbs-devel >= 1.1-0.1.rc2
-- 
1.6.5.2


libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch:
 mlx4.h  |    8 ++++----
 verbs.c |    9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

--- NEW FILE libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch ---
>From 444f634f38155fa84224eaa260753811455fee71 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Date: Thu, 23 Jul 2009 10:03:12 -0600
Subject: [PATCH 5/5] Update function prototypes to match libibverbs enum type change

Change enum bit flags to int to match libibverbs prototype changes.

Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/mlx4.h  |    8 ++++----
 src/verbs.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mlx4.h b/src/mlx4.h
index 0c658cf..4445998 100644
--- a/src/mlx4.h
+++ b/src/mlx4.h
@@ -302,7 +302,7 @@ struct ibv_pd *mlx4_alloc_pd(struct ibv_context *context);
 int mlx4_free_pd(struct ibv_pd *pd);
 
 struct ibv_mr *mlx4_reg_mr(struct ibv_pd *pd, void *addr,
-			    size_t length, enum ibv_access_flags access);
+			    size_t length, int access);
 int mlx4_dereg_mr(struct ibv_mr *mr);
 
 struct ibv_cq *mlx4_create_cq(struct ibv_context *context, int cqe,
@@ -323,7 +323,7 @@ struct ibv_srq *mlx4_create_srq(struct ibv_pd *pd,
 				 struct ibv_srq_init_attr *attr);
 int mlx4_modify_srq(struct ibv_srq *srq,
 		     struct ibv_srq_attr *attr,
-		     enum ibv_srq_attr_mask mask);
+		     int mask);
 int mlx4_query_srq(struct ibv_srq *srq,
 			   struct ibv_srq_attr *attr);
 int mlx4_destroy_srq(struct ibv_srq *srq);
@@ -336,10 +336,10 @@ int mlx4_post_srq_recv(struct ibv_srq *ibsrq,
 
 struct ibv_qp *mlx4_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr);
 int mlx4_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask,
+		   int attr_mask,
 		   struct ibv_qp_init_attr *init_attr);
 int mlx4_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		    enum ibv_qp_attr_mask attr_mask);
+		    int attr_mask);
 int mlx4_destroy_qp(struct ibv_qp *qp);
 void mlx4_init_qp_indices(struct mlx4_qp *qp);
 void mlx4_qp_init_sq_ownership(struct mlx4_qp *qp);
diff --git a/src/verbs.c b/src/verbs.c
index 2c19d93..1ac1362 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -108,7 +108,7 @@ int mlx4_free_pd(struct ibv_pd *pd)
 }
 
 struct ibv_mr *mlx4_reg_mr(struct ibv_pd *pd, void *addr, size_t length,
-			   enum ibv_access_flags access)
+			   int access)
 {
 	struct ibv_mr *mr;
 	struct ibv_reg_mr cmd;
@@ -353,7 +353,7 @@ err:
 
 int mlx4_modify_srq(struct ibv_srq *srq,
 		     struct ibv_srq_attr *attr,
-		     enum ibv_srq_attr_mask attr_mask)
+		     int attr_mask)
 {
 	struct ibv_modify_srq cmd;
 
@@ -497,7 +497,7 @@ err:
 }
 
 int mlx4_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask,
+		   int attr_mask,
 		   struct ibv_qp_init_attr *init_attr)
 {
 	struct ibv_query_qp cmd;
@@ -518,7 +518,7 @@ int mlx4_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr,
 }
 
 int mlx4_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		    enum ibv_qp_attr_mask attr_mask)
+		    int attr_mask)
 {
 	struct ibv_modify_qp cmd;
 	int ret;
-- 
1.6.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Jan 2008 18:10:12 -0000	1.2
+++ .cvsignore	2 Dec 2009 00:55:07 -0000	1.3
@@ -1 +1,2 @@
 libmlx4-1.0.tar.gz
+libmlx4-1.0.1.tar.gz


Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/devel/libmlx4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libmlx4.spec	25 Jul 2009 06:06:26 -0000	1.3
+++ libmlx4.spec	2 Dec 2009 00:55:07 -0000	1.4
@@ -1,15 +1,19 @@
 Name: libmlx4
-Version: 1.0
-Release: 4%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
-
+Provides: libibverbs-driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/mlx4/libmlx4-1.0.tar.gz
+Source: http://openib.org/downloads/mlx4/%{name}-%{version}.tar.gz
+Patch0: libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch
+Patch1: libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
+Patch2: libmlx4-0003-mmap-needs-some-includes.patch
+Patch3: libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch
+Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires: libibverbs-devel >= 1.1-0.1.rc2
+BuildRequires: libibverbs-devel >= 1.1.3
 
 %description
 libmlx4 provides a device-specific userspace driver for Mellanox
@@ -26,11 +30,16 @@ Static version of libmlx4 that may be li
 application, which may be useful for debugging.
 
 %prep
-%setup -q -n %{name}-1.0
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %configure
-make %{?_smp_mflags}
+make CFLAGS="$CFLAGS -fno-strict-aliasing" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +61,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmlx4.a
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-1
+- Update to latest upstream release
+- Add pseudo provides of libibverbs-driver
+- Update buildrequires for libibverbs API change
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Jan 2008 18:10:12 -0000	1.2
+++ sources	2 Dec 2009 00:55:07 -0000	1.3
@@ -1 +1 @@
-35c4c262ec45c818ffafb5f77d68a6ed  libmlx4-1.0.tar.gz
+044d9b1ff3b92f0331a3ee48779423ef  libmlx4-1.0.1.tar.gz



From dledford at fedoraproject.org  Wed Dec  2 00:56:18 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 00:56:18 +0000 (UTC)
Subject: rpms/libmlx4/F-12
	libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch, NONE, 
	1.1
	libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch,
	NONE, 1.1 libmlx4-0003-mmap-needs-some-includes.patch, NONE, 1.1
	libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch,
	NONE, 1.1
	libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch,
	NONE, 1.1 libmlx4.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091202005618.1F7D711C00A3@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libmlx4/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv748

Modified Files:
	libmlx4.spec sources 
Added Files:
	libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch 
	libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch 
	libmlx4-0003-mmap-needs-some-includes.patch 
	libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch 
	libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-1
- Update to latest upstream release
- Add pseudo provides of libibverbs-driver
- Update buildrequires for libibverbs API change


libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch:
 mlx4.c  |    4 ++--
 mlx4.h  |    2 --
 verbs.c |   11 -----------
 3 files changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch ---
>From 09f8dcd3769a52eebceeae15e2c5a844e6ee4586 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Date: Mon, 20 Jul 2009 16:37:24 -0600
Subject: [PATCH 1/5] Remove empty stubs for detach/attach_mcast

Just use ibv_cmd_* directly.  Simplifies the code and fixes const
correctness warnings due to changes in libibverbs.

Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/mlx4.c  |    4 ++--
 src/mlx4.h  |    2 --
 src/verbs.c |   10 ----------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/mlx4.c b/src/mlx4.c
index 34ece39..1295c53 100644
--- a/src/mlx4.c
+++ b/src/mlx4.c
@@ -94,8 +94,8 @@ static struct ibv_context_ops mlx4_ctx_ops = {
 	.post_recv     = mlx4_post_recv,
 	.create_ah     = mlx4_create_ah,
 	.destroy_ah    = mlx4_destroy_ah,
-	.attach_mcast  = mlx4_attach_mcast,
-	.detach_mcast  = mlx4_detach_mcast
+	.attach_mcast  = ibv_cmd_attach_mcast,
+	.detach_mcast  = ibv_cmd_detach_mcast
 };
 
 static struct ibv_context *mlx4_alloc_context(struct ibv_device *ibdev, int cmd_fd)
diff --git a/src/mlx4.h b/src/mlx4.h
index 827a201..0c658cf 100644
--- a/src/mlx4.h
+++ b/src/mlx4.h
@@ -361,7 +361,5 @@ int mlx4_destroy_ah(struct ibv_ah *ah);
 int mlx4_alloc_av(struct mlx4_pd *pd, struct ibv_ah_attr *attr,
 		   struct mlx4_ah *ah);
 void mlx4_free_av(struct mlx4_ah *ah);
-int mlx4_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
-int mlx4_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
 
 #endif /* MLX4_H */
diff --git a/src/verbs.c b/src/verbs.c
index cc179a0..2c19d93 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -651,13 +651,3 @@ int mlx4_destroy_ah(struct ibv_ah *ah)
 
 	return 0;
 }
-
-int mlx4_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-	return ibv_cmd_attach_mcast(qp, gid, lid);
-}
-
-int mlx4_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-	return ibv_cmd_detach_mcast(qp, gid, lid);
-}
-- 
1.6.5.2


libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch:
 buf.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

--- NEW FILE libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch ---
>From 87750d1db4bc73933e92d862ff73d10d06ff4f5d Mon Sep 17 00:00:00 2001
From: Sebastien Dugue <sebastien.dugue at bull.net>
Date: Wed, 29 Jul 2009 11:45:55 -0700
Subject: [PATCH 2/5] Use mmap(MAP_ANONYMOUS) to allocate queue buffers

Internal buffers for QPs, CQs, SRQs etc. are allocated with
mlx4_alloc_buf(), which rounds the buffer's size to the page size and
then allocates page aligned memory using posix_memalign().

However, this allocation is quite wasteful on architectures using 64K
pages (ia64 for example) because we then hit glibc's MMAP_THRESHOLD
malloc parameter and chunks are allocated using mmap.  Thus we end up
allocating:

  (requested size rounded to the page size) + (page size) + (malloc overhead)

rounded internally to the page size.

So for example, if we request a buffer of page_size bytes, we end up
consuming 3 pages.  In short, for each buffer we allocate, there is an
overhead of 2 pages.  This is quite visible on large clusters where
the number of QPs can reach several thousands.

This patch replaces the call to posix_memalign() in mlx4_alloc_buf()
with a direct call to mmap().

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/buf.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/buf.c b/src/buf.c
index 0e5f9b6..bbaff12 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -61,16 +61,15 @@ int mlx4_alloc_buf(struct mlx4_buf *buf, size_t size, int page_size)
 {
 	int ret;
 
-	ret = posix_memalign(&buf->buf, page_size, align(size, page_size));
-	if (ret)
-		return ret;
+	buf->length = align(size, page_size);
+	buf->buf = mmap(NULL, buf->length, PROT_READ | PROT_WRITE,
+			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	if (buf->buf == MAP_FAILED)
+		return errno;
 
 	ret = ibv_dontfork_range(buf->buf, size);
 	if (ret)
-		free(buf->buf);
-
-	if (!ret)
-		buf->length = size;
+		munmap(buf->buf, buf->length);
 
 	return ret;
 }
@@ -78,5 +77,5 @@ int mlx4_alloc_buf(struct mlx4_buf *buf, size_t size, int page_size)
 void mlx4_free_buf(struct mlx4_buf *buf)
 {
 	ibv_dofork_range(buf->buf, buf->length);
-	free(buf->buf);
+	munmap(buf->buf, buf->length);
 }
-- 
1.6.5.2


libmlx4-0003-mmap-needs-some-includes.patch:
 buf.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE libmlx4-0003-mmap-needs-some-includes.patch ---
>From cf744a2ef8343e5f74f9c59de3990e3e46ec301c Mon Sep 17 00:00:00 2001
From: Sebastien Dugue <sebastien.dugue at bull.net>
Date: Mon, 3 Aug 2009 15:40:01 +0200
Subject: [PATCH 3/5] mmap() needs some includes

Add errno.h and sys/mman.h includes in buf.c for mmap().  The includes
were left out of 87750d1d ("Use mmap(MAP_ANONYMOUS) to allocate queue
buffers") by mistake.

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/buf.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/buf.c b/src/buf.c
index bbaff12..a80bcb1 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -35,6 +35,8 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
+#include <errno.h>
+#include <sys/mman.h>
 
 #include "mlx4.h"
 
-- 
1.6.5.2


libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch:
 libmlx4.spec.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch ---
>From ec9d1ca2fa87984d0656e811b03fa60d44459930 Mon Sep 17 00:00:00 2001
From: Sebastien Dugue <sebastien.dugue at bull.net>
Date: Mon, 3 Aug 2009 13:47:43 -0700
Subject: [PATCH 4/5] Fix version in taball filename in RPM spec file

Forgot to bump the tarball filename when releasing libmlx4-1.0.1.

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 libmlx4.spec.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libmlx4.spec.in b/libmlx4.spec.in
index 869032f..a98ca68 100644
--- a/libmlx4.spec.in
+++ b/libmlx4.spec.in
@@ -6,7 +6,7 @@ Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openfabrics.org/
-Source: http://openfabrics.org/downloads/mlx4/libmlx4-1.0.tar.gz
+Source: http://openfabrics.org/downloads/mlx4/libmlx4-1.0.1.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: libibverbs-devel >= 1.1-0.1.rc2
-- 
1.6.5.2


libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch:
 mlx4.h  |    8 ++++----
 verbs.c |    9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

--- NEW FILE libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch ---
>From 444f634f38155fa84224eaa260753811455fee71 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Date: Thu, 23 Jul 2009 10:03:12 -0600
Subject: [PATCH 5/5] Update function prototypes to match libibverbs enum type change

Change enum bit flags to int to match libibverbs prototype changes.

Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/mlx4.h  |    8 ++++----
 src/verbs.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mlx4.h b/src/mlx4.h
index 0c658cf..4445998 100644
--- a/src/mlx4.h
+++ b/src/mlx4.h
@@ -302,7 +302,7 @@ struct ibv_pd *mlx4_alloc_pd(struct ibv_context *context);
 int mlx4_free_pd(struct ibv_pd *pd);
 
 struct ibv_mr *mlx4_reg_mr(struct ibv_pd *pd, void *addr,
-			    size_t length, enum ibv_access_flags access);
+			    size_t length, int access);
 int mlx4_dereg_mr(struct ibv_mr *mr);
 
 struct ibv_cq *mlx4_create_cq(struct ibv_context *context, int cqe,
@@ -323,7 +323,7 @@ struct ibv_srq *mlx4_create_srq(struct ibv_pd *pd,
 				 struct ibv_srq_init_attr *attr);
 int mlx4_modify_srq(struct ibv_srq *srq,
 		     struct ibv_srq_attr *attr,
-		     enum ibv_srq_attr_mask mask);
+		     int mask);
 int mlx4_query_srq(struct ibv_srq *srq,
 			   struct ibv_srq_attr *attr);
 int mlx4_destroy_srq(struct ibv_srq *srq);
@@ -336,10 +336,10 @@ int mlx4_post_srq_recv(struct ibv_srq *ibsrq,
 
 struct ibv_qp *mlx4_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr);
 int mlx4_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask,
+		   int attr_mask,
 		   struct ibv_qp_init_attr *init_attr);
 int mlx4_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		    enum ibv_qp_attr_mask attr_mask);
+		    int attr_mask);
 int mlx4_destroy_qp(struct ibv_qp *qp);
 void mlx4_init_qp_indices(struct mlx4_qp *qp);
 void mlx4_qp_init_sq_ownership(struct mlx4_qp *qp);
diff --git a/src/verbs.c b/src/verbs.c
index 2c19d93..1ac1362 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -108,7 +108,7 @@ int mlx4_free_pd(struct ibv_pd *pd)
 }
 
 struct ibv_mr *mlx4_reg_mr(struct ibv_pd *pd, void *addr, size_t length,
-			   enum ibv_access_flags access)
+			   int access)
 {
 	struct ibv_mr *mr;
 	struct ibv_reg_mr cmd;
@@ -353,7 +353,7 @@ err:
 
 int mlx4_modify_srq(struct ibv_srq *srq,
 		     struct ibv_srq_attr *attr,
-		     enum ibv_srq_attr_mask attr_mask)
+		     int attr_mask)
 {
 	struct ibv_modify_srq cmd;
 
@@ -497,7 +497,7 @@ err:
 }
 
 int mlx4_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask,
+		   int attr_mask,
 		   struct ibv_qp_init_attr *init_attr)
 {
 	struct ibv_query_qp cmd;
@@ -518,7 +518,7 @@ int mlx4_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr,
 }
 
 int mlx4_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		    enum ibv_qp_attr_mask attr_mask)
+		    int attr_mask)
 {
 	struct ibv_modify_qp cmd;
 	int ret;
-- 
1.6.5.2



Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/F-12/libmlx4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libmlx4.spec	25 Jul 2009 06:06:26 -0000	1.3
+++ libmlx4.spec	2 Dec 2009 00:56:17 -0000	1.4
@@ -1,15 +1,19 @@
 Name: libmlx4
-Version: 1.0
-Release: 4%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
-
+Provides: libibverbs-driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/mlx4/libmlx4-1.0.tar.gz
+Source: http://openib.org/downloads/mlx4/%{name}-%{version}.tar.gz
+Patch0: libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch
+Patch1: libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
+Patch2: libmlx4-0003-mmap-needs-some-includes.patch
+Patch3: libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch
+Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires: libibverbs-devel >= 1.1-0.1.rc2
+BuildRequires: libibverbs-devel >= 1.1.3
 
 %description
 libmlx4 provides a device-specific userspace driver for Mellanox
@@ -26,11 +30,16 @@ Static version of libmlx4 that may be li
 application, which may be useful for debugging.
 
 %prep
-%setup -q -n %{name}-1.0
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %configure
-make %{?_smp_mflags}
+make CFLAGS="$CFLAGS -fno-strict-aliasing" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +61,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmlx4.a
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-1
+- Update to latest upstream release
+- Add pseudo provides of libibverbs-driver
+- Update buildrequires for libibverbs API change
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Jan 2008 18:10:12 -0000	1.2
+++ sources	2 Dec 2009 00:56:17 -0000	1.3
@@ -1 +1 @@
-35c4c262ec45c818ffafb5f77d68a6ed  libmlx4-1.0.tar.gz
+044d9b1ff3b92f0331a3ee48779423ef  libmlx4-1.0.1.tar.gz



From pbrobinson at fedoraproject.org  Wed Dec  2 01:01:36 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 01:01:36 +0000 (UTC)
Subject: File mojito-0.21.7.tar.bz2 uploaded to lookaside cache by pbrobinson
Message-ID: <20091202010136.E645610F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mojito:

10c8729de58e28229ee3328e3dc28190  mojito-0.21.7.tar.bz2



From pbrobinson at fedoraproject.org  Wed Dec  2 01:03:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 01:03:35 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.15, 1.16 mojito.spec, 1.25,
	1.26 sources, 1.15, 1.16
Message-ID: <20091202010335.17D4811C00A3@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Nov 2009 13:25:03 -0000	1.15
+++ .cvsignore	2 Dec 2009 01:03:34 -0000	1.16
@@ -1 +1 @@
-mojito-0.21.6.tar.bz2
+mojito-0.21.7.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mojito.spec	19 Nov 2009 13:25:03 -0000	1.25
+++ mojito.spec	2 Dec 2009 01:03:34 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.21.6
+Version:        0.21.7
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -104,6 +104,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.7-1
+- Update to 0.21.7
+
 * Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.6-1
 - Update to 0.21.6, move to the official tarball release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Nov 2009 13:25:03 -0000	1.15
+++ sources	2 Dec 2009 01:03:34 -0000	1.16
@@ -1 +1 @@
-1b6e9bb02fa86343fbabd84c0ce9bb14  mojito-0.21.6.tar.bz2
+10c8729de58e28229ee3328e3dc28190  mojito-0.21.7.tar.bz2



From kevin at fedoraproject.org  Wed Dec  2 01:04:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  2 Dec 2009 01:04:12 +0000 (UTC)
Subject: rpms/rkhunter/devel rkhunter.spec, 1.28,
	1.29 rkhunter-1.3.6-fedoraconfig.patch, 1.1, 1.2
Message-ID: <20091202010412.2859F11C00A3@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	rkhunter.spec rkhunter-1.3.6-fedoraconfig.patch 
Log Message:
Disable apps check by default - bug #543065



Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- rkhunter.spec	30 Nov 2009 05:28:17 -0000	1.28
+++ rkhunter.spec	2 Dec 2009 01:04:11 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -95,6 +95,9 @@ EOF
 %{_mandir}/man8/*
 
 %changelog
+* Tue Dec 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.6-2
+- Disable apps check by default - bug #543065
+
 * Sun Nov 29 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.6-1
 - Update to 1.3.6
 

rkhunter-1.3.6-fedoraconfig.patch:
 rkhunter.conf |   81 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

Index: rkhunter-1.3.6-fedoraconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter-1.3.6-fedoraconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rkhunter-1.3.6-fedoraconfig.patch	30 Nov 2009 05:28:17 -0000	1.1
+++ rkhunter-1.3.6-fedoraconfig.patch	2 Dec 2009 01:04:11 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Nur rkhunter-1.3.6.orig/files/rkhunter.conf rkhunter-1.3.6/files/rkhunter.conf
 --- rkhunter-1.3.6.orig/files/rkhunter.conf	2009-11-28 15:13:19.000000000 -0700
-+++ rkhunter-1.3.6/files/rkhunter.conf	2009-11-29 22:03:48.000000000 -0700
++++ rkhunter-1.3.6/files/rkhunter.conf	2009-12-01 17:43:15.000000000 -0700
 @@ -71,7 +71,7 @@
  # NOTE: This option should be present in the configuration file.
  #
@@ -65,6 +65,15 @@ diff -Nur rkhunter-1.3.6.orig/files/rkhu
  
  #
  # Set this option to '1' to allow the use of the SSH-1 protocol, but note
+@@ -236,7 +236,7 @@
+ # tests, the test names, and how rkhunter behaves when these options are used.
+ #
+ ENABLE_TESTS="all"
+-DISABLE_TESTS="suspscan hidden_procs deleted_files packet_cap_apps"
++DISABLE_TESTS="apps suspscan hidden_procs deleted_files packet_cap_apps"
+ 
+ #
+ # The HASH_FUNC option can be used to specify the command to use
 @@ -299,7 +299,7 @@
  #
  # Whenever this option is changed 'rkhunter --propupd' must be run.



From pbrobinson at fedoraproject.org  Wed Dec  2 01:07:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 01:07:25 +0000 (UTC)
Subject: rpms/mojito/F-12 .cvsignore, 1.15, 1.16 mojito.spec, 1.25,
	1.26 sources, 1.15, 1.16
Message-ID: <20091202010725.D53FF11C00A3@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2354

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Nov 2009 13:36:33 -0000	1.15
+++ .cvsignore	2 Dec 2009 01:07:24 -0000	1.16
@@ -1 +1 @@
-mojito-0.21.6.tar.bz2
+mojito-0.21.7.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/mojito.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mojito.spec	19 Nov 2009 13:36:33 -0000	1.25
+++ mojito.spec	2 Dec 2009 01:07:25 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.21.6
+Version:        0.21.7
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -104,6 +104,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.7-1
+- Update to 0.21.7
+
 * Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.6-1
 - Update to 0.21.6, move to the official tarball release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Nov 2009 13:36:33 -0000	1.15
+++ sources	2 Dec 2009 01:07:25 -0000	1.16
@@ -1 +1 @@
-1b6e9bb02fa86343fbabd84c0ce9bb14  mojito-0.21.6.tar.bz2
+10c8729de58e28229ee3328e3dc28190  mojito-0.21.7.tar.bz2



From dledford at fedoraproject.org  Wed Dec  2 01:15:13 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 01:15:13 +0000 (UTC)
Subject: rpms/libmlx4/devel libmlx4-mlx4.conf, NONE,
	1.1 libmlx4-modprobe.conf, 
	NONE, 1.1 libmlx4-setup-mlx4.awk, NONE, 1.1 libmlx4.spec, 1.4, 1.5
Message-ID: <20091202011513.6851711C00A3@cvs1.fedora.phx.redhat.com>

Author: dledford

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

Modified Files:
	libmlx4.spec 
Added Files:
	libmlx4-mlx4.conf libmlx4-modprobe.conf libmlx4-setup-mlx4.awk 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
- Merge various bits from Red Hat package into Fedora package



--- NEW FILE libmlx4-mlx4.conf ---
# Config file for mlx4 hardware port settings
# This file is read when the mlx4_core module is loaded and used to
# set the port types for any hardware found.  If a card is not listed
# in this file, then its port types are left alone.
#
# Format:
# <pci_device_of_card> <port1_type> <port2_type>
#
# Example:
# 0000:0b:00.0 eth eth
#
# You can find the right pci device to use for any given card by loading
# the mlx4_core module, then going to /sys/bus/pci/drivers/mlx4_core and
# seeing what possible PCI devices are listed there.  The possible values
# for ports are: ib, eth, and auto.  However, not all cards support all
# types, so if you get messages from the kernel that your selected port
# type isn't supported, there's nothing this script can do about it.  Also,
# some cards don't support using different types on the two ports (aka,
# both ports must be either eth or ib).  Again, we can't set what the kernel
# won't support.  Also, on single port cards, any setting for the
# second port will be ignored.


--- NEW FILE libmlx4-modprobe.conf ---
install mlx4_core /sbin/modprobe --ignore-install mlx4_core && if [ -f /etc/ofed/setup-mlx4.awk -a -f /etc/ofed/mlx4.conf ]; then awk -f /etc/ofed/setup-mlx4.awk /etc/ofed/mlx4.conf /sbin/setup-mlx4; fi; /sbin/modprobe mlx4_en; /sbin/modprobe mlx4_ib


--- NEW FILE libmlx4-setup-mlx4.awk ---
BEGIN {
	dir="/sys/bus/pci/drivers/mlx4_core"
	if (system("[ -d "dir" ]") != 0)
		exit 1
}
/^[[:xdigit:]]+:[[:xdigit:]]+:[[:xdigit:]]+\.[[:xdigit:]]([[:blank:]](ib|eth|auto))+/ {
	device=$1
	port1=$2
	port2=$3
	if (system("[ -d "dir"/"device" ]") != 0)
		next
	if (system("[ -f "dir"/"device"/port_trigger ]") == 0)
		print "all" > dir"/"device"/port_trigger"
	if (system("[ -f "dir"/"device"/mlx4_port2 ]") == 0)
		print port2 > dir"/"device"/mlx4_port2"
	if (system("[ -f "dir"/"device"/mlx4_port1 ]") == 0)
		print port1 > dir"/"device"/mlx4_port1"
}


Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/devel/libmlx4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libmlx4.spec	2 Dec 2009 00:55:07 -0000	1.4
+++ libmlx4.spec	2 Dec 2009 01:15:12 -0000	1.5
@@ -1,12 +1,15 @@
 Name: libmlx4
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
 Provides: libibverbs-driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openib.org/
 Source: http://openib.org/downloads/mlx4/%{name}-%{version}.tar.gz
+Source1: libmlx4-modprobe.conf
+Source2: libmlx4-mlx4.conf
+Source3: libmlx4-setup-mlx4.awk
 Patch0: libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch
 Patch1: libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
 Patch2: libmlx4-0003-mmap-needs-some-includes.patch
@@ -14,18 +17,22 @@ Patch3: libmlx4-0004-Fix-version-in-taba
 Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libibverbs-devel >= 1.1.3
+%ifnarch ia64
+BuildRequires: valgrind-devel
+%endif
 
 %description
 libmlx4 provides a device-specific userspace driver for Mellanox
 ConnectX HCAs for use with the libibverbs library.
 
-%package devel
-Summary: Development files for the libmlx4 driver
+%package static
+Summary: Static version of the libmlx4 driver
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: libmlx4-static = %{version}-%{release}
+Provides: libmlx4-devel = %{version}-%{release}
+Obsoletes: libmlx4-devel <= 1.0
 
-%description devel
+%description static
 Static version of libmlx4 that may be linked directly to an
 application, which may be useful for debugging.
 
@@ -38,12 +45,19 @@ application, which may be useful for deb
 %patch4 -p1
 
 %build
+%ifnarch ia64
+%configure --with-valgrind
+%else
 %configure
+%endif
 make CFLAGS="$CFLAGS -fno-strict-aliasing" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
+install -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/libmlx4.conf
+install -D -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/rdma/mlx4.conf
+install -D -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rdma/setup-mlx4.awk
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libmlx4.so
 
@@ -54,13 +68,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/libmlx4-rdmav2.so
 %{_sysconfdir}/libibverbs.d/mlx4.driver
+%{_sysconfdir}/modprobe.d/libmlx4.conf
+%config(noreplace) %{_sysconfdir}/rdma/mlx4.conf
+%{_sysconfdir}/rdma/setup-mlx4.awk
 %doc AUTHORS COPYING README
 
-%files devel
+%files static
 %defattr(-,root,root,-)
 %{_libdir}/libmlx4.a
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
+- Merge various bits from Red Hat package into Fedora package
+
 * Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-1
 - Update to latest upstream release
 - Add pseudo provides of libibverbs-driver



From dledford at fedoraproject.org  Wed Dec  2 01:17:08 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 01:17:08 +0000 (UTC)
Subject: rpms/libmlx4/F-12 libmlx4-mlx4.conf, NONE, 1.1 libmlx4-modprobe.conf,
	NONE, 1.1 libmlx4-setup-mlx4.awk, NONE, 1.1 libmlx4.spec, 1.4, 1.5
Message-ID: <20091202011708.5FB5211C00A3@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libmlx4/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3623

Modified Files:
	libmlx4.spec 
Added Files:
	libmlx4-mlx4.conf libmlx4-modprobe.conf libmlx4-setup-mlx4.awk 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
- Merge various bits from Red Hat package into Fedora package



--- NEW FILE libmlx4-mlx4.conf ---
# Config file for mlx4 hardware port settings
# This file is read when the mlx4_core module is loaded and used to
# set the port types for any hardware found.  If a card is not listed
# in this file, then its port types are left alone.
#
# Format:
# <pci_device_of_card> <port1_type> <port2_type>
#
# Example:
# 0000:0b:00.0 eth eth
#
# You can find the right pci device to use for any given card by loading
# the mlx4_core module, then going to /sys/bus/pci/drivers/mlx4_core and
# seeing what possible PCI devices are listed there.  The possible values
# for ports are: ib, eth, and auto.  However, not all cards support all
# types, so if you get messages from the kernel that your selected port
# type isn't supported, there's nothing this script can do about it.  Also,
# some cards don't support using different types on the two ports (aka,
# both ports must be either eth or ib).  Again, we can't set what the kernel
# won't support.  Also, on single port cards, any setting for the
# second port will be ignored.


--- NEW FILE libmlx4-modprobe.conf ---
install mlx4_core /sbin/modprobe --ignore-install mlx4_core && if [ -f /etc/ofed/setup-mlx4.awk -a -f /etc/ofed/mlx4.conf ]; then awk -f /etc/ofed/setup-mlx4.awk /etc/ofed/mlx4.conf /sbin/setup-mlx4; fi; /sbin/modprobe mlx4_en; /sbin/modprobe mlx4_ib


--- NEW FILE libmlx4-setup-mlx4.awk ---
BEGIN {
	dir="/sys/bus/pci/drivers/mlx4_core"
	if (system("[ -d "dir" ]") != 0)
		exit 1
}
/^[[:xdigit:]]+:[[:xdigit:]]+:[[:xdigit:]]+\.[[:xdigit:]]([[:blank:]](ib|eth|auto))+/ {
	device=$1
	port1=$2
	port2=$3
	if (system("[ -d "dir"/"device" ]") != 0)
		next
	if (system("[ -f "dir"/"device"/port_trigger ]") == 0)
		print "all" > dir"/"device"/port_trigger"
	if (system("[ -f "dir"/"device"/mlx4_port2 ]") == 0)
		print port2 > dir"/"device"/mlx4_port2"
	if (system("[ -f "dir"/"device"/mlx4_port1 ]") == 0)
		print port1 > dir"/"device"/mlx4_port1"
}


Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/F-12/libmlx4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libmlx4.spec	2 Dec 2009 00:56:17 -0000	1.4
+++ libmlx4.spec	2 Dec 2009 01:17:08 -0000	1.5
@@ -1,12 +1,15 @@
 Name: libmlx4
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
 Provides: libibverbs-driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openib.org/
 Source: http://openib.org/downloads/mlx4/%{name}-%{version}.tar.gz
+Source1: libmlx4-modprobe.conf
+Source2: libmlx4-mlx4.conf
+Source3: libmlx4-setup-mlx4.awk
 Patch0: libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch
 Patch1: libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
 Patch2: libmlx4-0003-mmap-needs-some-includes.patch
@@ -14,18 +17,22 @@ Patch3: libmlx4-0004-Fix-version-in-taba
 Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libibverbs-devel >= 1.1.3
+%ifnarch ia64
+BuildRequires: valgrind-devel
+%endif
 
 %description
 libmlx4 provides a device-specific userspace driver for Mellanox
 ConnectX HCAs for use with the libibverbs library.
 
-%package devel
-Summary: Development files for the libmlx4 driver
+%package static
+Summary: Static version of the libmlx4 driver
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: libmlx4-static = %{version}-%{release}
+Provides: libmlx4-devel = %{version}-%{release}
+Obsoletes: libmlx4-devel <= 1.0
 
-%description devel
+%description static
 Static version of libmlx4 that may be linked directly to an
 application, which may be useful for debugging.
 
@@ -38,12 +45,19 @@ application, which may be useful for deb
 %patch4 -p1
 
 %build
+%ifnarch ia64
+%configure --with-valgrind
+%else
 %configure
+%endif
 make CFLAGS="$CFLAGS -fno-strict-aliasing" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
+install -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/libmlx4.conf
+install -D -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/rdma/mlx4.conf
+install -D -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rdma/setup-mlx4.awk
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libmlx4.so
 
@@ -54,13 +68,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/libmlx4-rdmav2.so
 %{_sysconfdir}/libibverbs.d/mlx4.driver
+%{_sysconfdir}/modprobe.d/libmlx4.conf
+%config(noreplace) %{_sysconfdir}/rdma/mlx4.conf
+%{_sysconfdir}/rdma/setup-mlx4.awk
 %doc AUTHORS COPYING README
 
-%files devel
+%files static
 %defattr(-,root,root,-)
 %{_libdir}/libmlx4.a
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
+- Merge various bits from Red Hat package into Fedora package
+
 * Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-1
 - Update to latest upstream release
 - Add pseudo provides of libibverbs-driver



From sailer at fedoraproject.org  Wed Dec  2 01:22:40 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed,  2 Dec 2009 01:22:40 +0000 (UTC)
Subject: rpms/mingw32-qwt/devel qwt-qhash.patch, NONE, 1.1 .cvsignore, 1.2, 
	1.3 mingw32-qwt.spec, 1.7, 1.8 qwt-path.patch, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091202012240.0FE1611C00A3@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-qwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4336

Modified Files:
	.cvsignore mingw32-qwt.spec qwt-path.patch sources 
Added Files:
	qwt-qhash.patch 
Log Message:
make it build with Qt 4.6.0


qwt-qhash.patch:
 qwt_compass.cpp        |    2 +-
 qwt_dial.cpp           |    2 +-
 qwt_knob.cpp           |    2 +-
 qwt_plot.cpp           |    2 +-
 qwt_plot_magnifier.cpp |    2 +-
 qwt_plot_rescaler.cpp  |    2 +-
 qwt_scale_widget.cpp   |    2 +-
 qwt_slider.cpp         |    2 +-
 qwt_thermo.cpp         |    2 +-
 qwt_valuelist.h        |    4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE qwt-qhash.patch ---
--- src/qwt_compass.cpp.qhash	2009-12-02 01:07:27.000000000 +0100
+++ src/qwt_compass.cpp	2009-12-02 01:07:41.000000000 +0100
@@ -12,7 +12,6 @@
 #include <math.h>
 #include <qpainter.h>
 #include <qpixmap.h>
-#include <qevent.h>
 #include "qwt_math.h"
 #include "qwt_scale_draw.h"
 #include "qwt_paint_buffer.h"
@@ -20,6 +19,7 @@
 #include "qwt_dial_needle.h"
 #include "qwt_compass_rose.h"
 #include "qwt_compass.h"
+#include <qevent.h>
 
 class QwtCompass::PrivateData
 {
--- src/qwt_dial.cpp.qhash	2009-12-02 01:08:08.000000000 +0100
+++ src/qwt_dial.cpp	2009-12-02 01:08:26.000000000 +0100
@@ -14,7 +14,6 @@
 #include <qpalette.h>
 #endif
 #include <qpixmap.h>
-#include <qevent.h>
 #include "qwt_math.h"
 #include "qwt_scale_engine.h"
 #include "qwt_scale_map.h"
@@ -22,6 +21,7 @@
 #include "qwt_painter.h"
 #include "qwt_dial_needle.h"
 #include "qwt_dial.h"
+#include <qevent.h>
 
 class QwtDial::PrivateData
 {
--- src/qwt_knob.cpp.qhash	2009-12-02 01:30:27.000000000 +0100
+++ src/qwt_knob.cpp	2009-12-02 01:30:39.000000000 +0100
@@ -10,12 +10,12 @@
 #include <qpainter.h>
 #include <qpalette.h>
 #include <qstyle.h>
-#include <qevent.h>
 #include "qwt_round_scale_draw.h"
 #include "qwt_knob.h"
 #include "qwt_math.h"
 #include "qwt_painter.h"
 #include "qwt_paint_buffer.h"
+#include <qevent.h>
 
 class QwtKnob::PrivateData
 {
--- src/qwt_plot.cpp.qhash	2009-12-02 00:30:13.000000000 +0100
+++ src/qwt_plot.cpp	2009-12-02 00:43:08.000000000 +0100
@@ -16,7 +16,6 @@
 #include <qpaintengine.h>
 #endif
 #include <qapplication.h>
-#include <qevent.h>
 #include "qwt_plot.h"
 #include "qwt_plot_dict.h"
 #include "qwt_plot_layout.h"
@@ -27,6 +26,7 @@
 #include "qwt_dyngrid_layout.h"
 #include "qwt_plot_canvas.h"
 #include "qwt_paint_buffer.h"
+#include <qevent.h>
 
 class QwtPlot::PrivateData
 {
--- src/qwt_plot_magnifier.cpp.qhash	2009-12-02 01:06:08.000000000 +0100
+++ src/qwt_plot_magnifier.cpp	2009-12-02 01:06:20.000000000 +0100
@@ -10,11 +10,11 @@
 // vim: expandtab
 
 #include <math.h>
-#include <qevent.h>
 #include "qwt_plot.h"
 #include "qwt_plot_canvas.h"
 #include "qwt_scale_div.h"
 #include "qwt_plot_magnifier.h"
+#include <qevent.h>
 
 class QwtPlotMagnifier::PrivateData
 {
--- src/qwt_plot_rescaler.cpp.qhash	2009-12-02 00:44:10.000000000 +0100
+++ src/qwt_plot_rescaler.cpp	2009-12-02 00:44:27.000000000 +0100
@@ -9,12 +9,12 @@
 
 // vim: expandtab
 
-#include <qevent.h>
 #include "qwt_plot.h"
 #include "qwt_plot_canvas.h"
 #include "qwt_scale_div.h"
 #include "qwt_double_interval.h"
 #include "qwt_plot_rescaler.h"
+#include <qevent.h>
 
 class QwtPlotRescaler::AxisData
 {
--- src/qwt_scale_widget.cpp.qhash	2009-12-02 01:06:40.000000000 +0100
+++ src/qwt_scale_widget.cpp	2009-12-02 01:06:53.000000000 +0100
@@ -10,7 +10,6 @@
 // vim: expandtab
 
 #include <qpainter.h>
-#include <qevent.h>
 #include "qwt_painter.h"
 #include "qwt_color_map.h"
 #include "qwt_scale_widget.h"
@@ -19,6 +18,7 @@
 #include "qwt_paint_buffer.h"
 #include "qwt_scale_div.h"
 #include "qwt_text.h"
+#include <qevent.h>
 
 class QwtScaleWidget::PrivateData
 {
--- src/qwt_slider.cpp.qhash	2009-12-02 01:57:26.000000000 +0100
+++ src/qwt_slider.cpp	2009-12-02 01:57:40.000000000 +0100
@@ -10,7 +10,6 @@
 // vim: expandtab
 
 #include <math.h>
-#include <qevent.h>
 #include <qdrawutil.h>
 #include <qpainter.h>
 #include "qwt_painter.h"
@@ -18,6 +17,7 @@
 #include "qwt_scale_draw.h"
 #include "qwt_scale_map.h"
 #include "qwt_slider.h"
+#include <qevent.h>
 
 class QwtSlider::PrivateData
 {
--- src/qwt_thermo.cpp.qhash	2009-12-02 01:58:00.000000000 +0100
+++ src/qwt_thermo.cpp	2009-12-02 01:58:16.000000000 +0100
@@ -8,7 +8,6 @@
  *****************************************************************************/
 
 #include <qpainter.h>
-#include <qevent.h>
 #include <qstyle.h>
 #include <qpixmap.h>
 #include <qdrawutil.h>
@@ -18,6 +17,7 @@
 #include "qwt_scale_map.h"
 #include "qwt_paint_buffer.h"
 #include "qwt_thermo.h"
+#include <qevent.h>
 
 class QwtThermo::PrivateData
 {
--- src/qwt_valuelist.h.qhash	2009-12-02 00:40:56.000000000 +0100
+++ src/qwt_valuelist.h	2009-12-02 00:41:35.000000000 +0100
@@ -36,12 +36,12 @@
 
 #if defined(QWT_TEMPLATEDLL)
 
-#if QT_VERSION < 0x040300
+#if QT_VERSION < 0x040601
 // Some compilers have problems, 
 // without a qHash(double) implementation
+inline uint qHash(double key) { return uint(key); }
 #include <qset.h>
 #include <qvector.h>
-inline uint qHash(double key) { return uint(key); }
 #endif
 
 // MOC_SKIP_BEGIN


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qwt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Mar 2009 02:22:02 -0000	1.2
+++ .cvsignore	2 Dec 2009 01:22:39 -0000	1.3
@@ -1 +1,2 @@
 qwt-5.1.1.tar.bz2
+qwt-5.2.0.tar.bz2


Index: mingw32-qwt.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qwt/devel/mingw32-qwt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-qwt.spec	25 Jul 2009 14:30:51 -0000	1.7
+++ mingw32-qwt.spec	2 Dec 2009 01:22:39 -0000	1.8
@@ -3,13 +3,14 @@
 
 Name:           mingw32-%{name1}
 Summary:        MinGW Windows Qwt library
-Version:        5.1.1
-Release:        9%{?dist}
+Version:        5.2.0
+Release:        2%{?dist}
 URL:            http://qwt.sourceforge.net
 License:        LGPLv2 with exceptions
 Group:          Development/Libraries
 Source:         http://downloads.sourceforge.net/%{name1}/%{name1}-%{version}.tar.bz2
 Patch0:         qwt-path.patch
+Patch1:         qwt-qhash.patch
 BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-qt
 BuildRequires:  mingw32-gcc-c++
@@ -34,6 +35,7 @@ MinGW Windows Qwt library.
 %prep
 %setup -qn %{name1}-%{version}
 %patch0 -p1
+%patch1 -p0 -b .qhash
 sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_mingw32_libdir}\1" qwtconfig.pri
 sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_mingw32_includedir}/%{name1}\1" qwtconfig.pri
 sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_mingw32_docdir}/%{name1}\1" qwtconfig.pri
@@ -84,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/lib%{name1}d5.a
 
 %changelog
+* Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.0-2
+- qt 4.6.0 compile workarounds
+
+* Tue Nov 24 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.0-1
+- update to 5.2.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

qwt-path.patch:
 designer/designer.pro |    2 +-
 qwtconfig.pri         |   16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

Index: qwt-path.patch
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qwt/devel/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qwt-path.patch	16 Mar 2009 02:22:03 -0000	1.1
+++ qwt-path.patch	2 Dec 2009 01:22:39 -0000	1.2
@@ -14,15 +14,15 @@ diff -Nur qwt-5.1.1.org/qwtconfig.pri qw
 --- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
 +++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
 @@ -7,17 +7,9 @@
- VER_PAT      = 1
- VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
+ VER_PAT      = 0
+ VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.1.1
+-    INSTALLBASE    = /usr/local/qwt-5.2.0
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.1.1
+-    INSTALLBASE    = C:/Qwt-5.2.0
 -}
 -
 -target.path    = $$INSTALLBASE/lib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qwt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Mar 2009 02:22:03 -0000	1.2
+++ sources	2 Dec 2009 01:22:39 -0000	1.3
@@ -1 +1 @@
-218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2
+c60b4cfac271a41524402b3ae5197890  qwt-5.2.0.tar.bz2



From airlied at fedoraproject.org  Wed Dec  2 01:54:01 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  2 Dec 2009 01:54:01 +0000 (UTC)
Subject: rpms/kernel/devel drm-radeon-dp-support.patch, NONE,
	1.1 drm-radeon-fixes.patch, 1.2, 1.3 kernel.spec, 1.1859, 1.1860
Message-ID: <20091202015401.268CE11C00A3@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-dp-support.patch drm-radeon-fixes.patch 
Log Message:
* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 2.6.32-0.62.rc8.git2
- forward port radeon fixes from F-12 + add radeon display port support


drm-radeon-dp-support.patch:
 b/drivers/gpu/drm/Makefile                   |    2 
 b/drivers/gpu/drm/drm_dp_helper.c            |  274 +++++++++
 b/drivers/gpu/drm/i915/Makefile              |    1 
 b/drivers/gpu/drm/i915/intel_display.c       |    1 
 b/drivers/gpu/drm/i915/intel_dp.c            |    2 
 b/drivers/gpu/drm/radeon/Makefile            |    2 
 b/drivers/gpu/drm/radeon/atom.c              |   33 +
 b/drivers/gpu/drm/radeon/atom.h              |    2 
 b/drivers/gpu/drm/radeon/atombios_dp.c       |  750 +++++++++++++++++++++++++++
 b/drivers/gpu/drm/radeon/radeon_atombios.c   |   57 +-
 b/drivers/gpu/drm/radeon/radeon_combios.c    |  158 +++--
 b/drivers/gpu/drm/radeon/radeon_connectors.c |   91 +++
 b/drivers/gpu/drm/radeon/radeon_device.c     |    2 
 b/drivers/gpu/drm/radeon/radeon_display.c    |    5 
 b/drivers/gpu/drm/radeon/radeon_encoders.c   |  189 ++++--
 b/drivers/gpu/drm/radeon/radeon_i2c.c        |   73 ++
 b/drivers/gpu/drm/radeon/radeon_mode.h       |   39 +
 b/drivers/gpu/drm/radeon/radeon_reg.h        |   12 
 b/include/drm/drm_dp_helper.c                |  273 +++++++++
 b/include/drm/drm_dp_helper.h                |  174 ++++++
 drivers/gpu/drm/i915/intel_dp.h              |  144 -----
 drivers/gpu/drm/i915/intel_dp_i2c.c          |  273 ---------
 22 files changed, 1956 insertions(+), 601 deletions(-)

--- NEW FILE drm-radeon-dp-support.patch ---
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 3c8827a..5ce2ce8 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -15,7 +15,7 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
-drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_helper.o
 
 obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
 
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
new file mode 100644
index 0000000..70399b2
--- /dev/null
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -0,0 +1,274 @@
+/*
+ * Copyright ? 2009 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/i2c.h>
+#include "drm_dp_helper.h"
+#include "drmP.h"
+
+/* Run a single AUX_CH I2C transaction, writing/reading data as necessary */
+
+#define MODE_I2C_START	1
+#define MODE_I2C_WRITE	2
+#define MODE_I2C_READ	4
+#define MODE_I2C_STOP	8
+
+static int
+i2c_algo_dp_aux_transaction(struct i2c_adapter *adapter, int mode,
+			    uint8_t write_byte, uint8_t *read_byte)
+{
+	struct i2c_algo_dp_aux_data *algo_data = adapter->algo_data;
+	uint16_t address = algo_data->address;
+	uint8_t msg[5];
+	uint8_t reply[2];
+	int msg_bytes;
+	int reply_bytes;
+	int ret;
+
+	memset(msg, 0, 5);
+	/* Set up the command byte */
+	if (mode & MODE_I2C_READ)
+		msg[0] = AUX_I2C_READ << 4;
+	else
+		msg[0] = AUX_I2C_WRITE << 4;
+
+	if (!(mode & MODE_I2C_STOP))
+		msg[0] |= AUX_I2C_MOT << 4;
+
+	msg[1] = address >> 8;
+	msg[2] = address;
+
+	switch (mode) {
+	case MODE_I2C_WRITE:
+		msg[3] = 0;
+		msg[4] = write_byte;
+		msg_bytes = 5;
+		reply_bytes = 1;
+		break;
+	case MODE_I2C_READ:
+		msg[3] = 0;
+		msg_bytes = 4;
+		reply_bytes = 2;
+		break;
+	default:
+		msg_bytes = 3;
+		reply_bytes = 1;
+		break;
+	}
+
+	for (;;) {
+		ret = (*algo_data->aux_ch)(adapter,
+					   msg, msg_bytes,
+					   reply, reply_bytes);
+		if (ret < 0) {
+			DRM_DEBUG("aux_ch failed %d\n", ret);
+			return ret;
+		}
+		switch (reply[0] & AUX_I2C_REPLY_MASK) {
+		case AUX_I2C_REPLY_ACK:
+			if (mode == MODE_I2C_READ) {
+				*read_byte = reply[1];
+			}
+			return reply_bytes - 1;
+		case AUX_I2C_REPLY_NACK:
+			DRM_DEBUG("aux_ch nack\n");
+			return -EREMOTEIO;
+		case AUX_I2C_REPLY_DEFER:
+			DRM_DEBUG("aux_ch defer\n");
+			udelay(100);
+			break;
+		default:
+			DRM_ERROR("aux_ch invalid reply 0x%02x\n", reply[0]);
+			return -EREMOTEIO;
+		}
+	}
+}
+
+/*
+ * I2C over AUX CH
+ */
+
+/*
+ * Send the address. If the I2C link is running, this 'restarts'
+ * the connection with the new address, this is used for doing
+ * a write followed by a read (as needed for DDC)
+ */
+static int
+i2c_algo_dp_aux_address(struct i2c_adapter *adapter, u16 address, bool reading)
+{
+	struct i2c_algo_dp_aux_data *algo_data = adapter->algo_data;
+	int mode = MODE_I2C_START;
+	int ret;
+
+	if (reading)
+		mode |= MODE_I2C_READ;
+	else
+		mode |= MODE_I2C_WRITE;
+	algo_data->address = address;
+	algo_data->running = true;
+	ret = i2c_algo_dp_aux_transaction(adapter, mode, 0, NULL);
+	return ret;
+}
+
+/*
+ * Stop the I2C transaction. This closes out the link, sending
+ * a bare address packet with the MOT bit turned off
+ */
+static void
+i2c_algo_dp_aux_stop(struct i2c_adapter *adapter, bool reading)
+{
+	struct i2c_algo_dp_aux_data *algo_data = adapter->algo_data;
+	int mode = MODE_I2C_STOP;
+
+	if (reading)
+		mode |= MODE_I2C_READ;
+	else
+		mode |= MODE_I2C_WRITE;
+	if (algo_data->running) {
+		(void) i2c_algo_dp_aux_transaction(adapter, mode, 0, NULL);
+		algo_data->running = false;
+	}
+}
+
+/*
+ * Write a single byte to the current I2C address, the
+ * the I2C link must be running or this returns -EIO
+ */
+static int
+i2c_algo_dp_aux_put_byte(struct i2c_adapter *adapter, u8 byte)
+{
+	struct i2c_algo_dp_aux_data *algo_data = adapter->algo_data;
+	int ret;
+
+	if (!algo_data->running)
+		return -EIO;
+
+	ret = i2c_algo_dp_aux_transaction(adapter, MODE_I2C_WRITE, byte, NULL);
+	return ret;
+}
+
+/*
+ * Read a single byte from the current I2C address, the
+ * I2C link must be running or this returns -EIO
+ */
+static int
+i2c_algo_dp_aux_get_byte(struct i2c_adapter *adapter, u8 *byte_ret)
[...2893 lines suppressed...]
+i2c_dp_aux_prepare_bus(struct i2c_adapter *adapter)
+{
+	adapter->algo = &i2c_dp_aux_algo;
+	adapter->retries = 3;
+	i2c_dp_aux_reset_bus(adapter);
+	return 0;
+}
+
+int
+i2c_dp_aux_add_bus(struct i2c_adapter *adapter)
+{
+	int error;
+	
+	error = i2c_dp_aux_prepare_bus(adapter);
+	if (error)
+		return error;
+	error = i2c_add_adapter(adapter);
+	return error;
+}
+EXPORT_SYMBOL(i2c_dp_aux_add_bus);
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
new file mode 100644
index 0000000..dc56b2c
--- /dev/null
+++ b/include/drm/drm_dp_helper.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright ? 2008 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, 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 _DRM_DP_HELPER_H_
+#define _DRM_DP_HELPER_H_
+/* From the VESA DisplayPort spec */
+
+#define AUX_NATIVE_WRITE	0x8
+#define AUX_NATIVE_READ		0x9
+#define AUX_I2C_WRITE		0x0
+#define AUX_I2C_READ		0x1
+#define AUX_I2C_STATUS		0x2
+#define AUX_I2C_MOT		0x4
+
+#define AUX_NATIVE_REPLY_ACK	(0x0 << 4)
+#define AUX_NATIVE_REPLY_NACK	(0x1 << 4)
+#define AUX_NATIVE_REPLY_DEFER	(0x2 << 4)
+#define AUX_NATIVE_REPLY_MASK	(0x3 << 4)
+
+#define AUX_I2C_REPLY_ACK	(0x0 << 6)
+#define AUX_I2C_REPLY_NACK	(0x1 << 6)
+#define AUX_I2C_REPLY_DEFER	(0x2 << 6)
+#define AUX_I2C_REPLY_MASK	(0x3 << 6)
+
+/* AUX CH addresses */
+/* DPCD */
+#define DP_DPCD_REV                         0x000
+
+#define DP_MAX_LINK_RATE                    0x001
+
+#define DP_MAX_LANE_COUNT                   0x002
+# define DP_MAX_LANE_COUNT_MASK		    0x1f
+# define DP_ENHANCED_FRAME_CAP		    (1 << 7)
+
+#define DP_MAX_DOWNSPREAD                   0x003
+# define DP_NO_AUX_HANDSHAKE_LINK_TRAINING  (1 << 6)
+
+#define DP_NORP                             0x004
+
+#define DP_DOWNSTREAMPORT_PRESENT           0x005
+# define DP_DWN_STRM_PORT_PRESENT           (1 << 0)
+# define DP_DWN_STRM_PORT_TYPE_MASK         0x06
+/* 00b = DisplayPort */
+/* 01b = Analog */
+/* 10b = TMDS or HDMI */
+/* 11b = Other */
+# define DP_FORMAT_CONVERSION               (1 << 3)
+
+#define DP_MAIN_LINK_CHANNEL_CODING         0x006
+
+/* link configuration */
+#define	DP_LINK_BW_SET		            0x100
+# define DP_LINK_BW_1_62		    0x06
+# define DP_LINK_BW_2_7			    0x0a
+
+#define DP_LANE_COUNT_SET	            0x101
+# define DP_LANE_COUNT_MASK		    0x0f
+# define DP_LANE_COUNT_ENHANCED_FRAME_EN    (1 << 7)
+
+#define DP_TRAINING_PATTERN_SET	            0x102
+# define DP_TRAINING_PATTERN_DISABLE	    0
+# define DP_TRAINING_PATTERN_1		    1
+# define DP_TRAINING_PATTERN_2		    2
+# define DP_TRAINING_PATTERN_MASK	    0x3
+
+# define DP_LINK_QUAL_PATTERN_DISABLE	    (0 << 2)
+# define DP_LINK_QUAL_PATTERN_D10_2	    (1 << 2)
+# define DP_LINK_QUAL_PATTERN_ERROR_RATE    (2 << 2)
+# define DP_LINK_QUAL_PATTERN_PRBS7	    (3 << 2)
+# define DP_LINK_QUAL_PATTERN_MASK	    (3 << 2)
+
+# define DP_RECOVERED_CLOCK_OUT_EN	    (1 << 4)
+# define DP_LINK_SCRAMBLING_DISABLE	    (1 << 5)
+
+# define DP_SYMBOL_ERROR_COUNT_BOTH	    (0 << 6)
+# define DP_SYMBOL_ERROR_COUNT_DISPARITY    (1 << 6)
+# define DP_SYMBOL_ERROR_COUNT_SYMBOL	    (2 << 6)
+# define DP_SYMBOL_ERROR_COUNT_MASK	    (3 << 6)
+
+#define DP_TRAINING_LANE0_SET		    0x103
+#define DP_TRAINING_LANE1_SET		    0x104
+#define DP_TRAINING_LANE2_SET		    0x105
+#define DP_TRAINING_LANE3_SET		    0x106
+
+# define DP_TRAIN_VOLTAGE_SWING_MASK	    0x3
+# define DP_TRAIN_VOLTAGE_SWING_SHIFT	    0
+# define DP_TRAIN_MAX_SWING_REACHED	    (1 << 2)
+# define DP_TRAIN_VOLTAGE_SWING_400	    (0 << 0)
+# define DP_TRAIN_VOLTAGE_SWING_600	    (1 << 0)
+# define DP_TRAIN_VOLTAGE_SWING_800	    (2 << 0)
+# define DP_TRAIN_VOLTAGE_SWING_1200	    (3 << 0)
+
+# define DP_TRAIN_PRE_EMPHASIS_MASK	    (3 << 3)
+# define DP_TRAIN_PRE_EMPHASIS_0	    (0 << 3)
+# define DP_TRAIN_PRE_EMPHASIS_3_5	    (1 << 3)
+# define DP_TRAIN_PRE_EMPHASIS_6	    (2 << 3)
+# define DP_TRAIN_PRE_EMPHASIS_9_5	    (3 << 3)
+
+# define DP_TRAIN_PRE_EMPHASIS_SHIFT	    3
+# define DP_TRAIN_MAX_PRE_EMPHASIS_REACHED  (1 << 5)
+
+#define DP_DOWNSPREAD_CTRL		    0x107
+# define DP_SPREAD_AMP_0_5		    (1 << 4)
+
+#define DP_MAIN_LINK_CHANNEL_CODING_SET	    0x108
+# define DP_SET_ANSI_8B10B		    (1 << 0)
+
+#define DP_LANE0_1_STATUS		    0x202
+#define DP_LANE2_3_STATUS		    0x203
+# define DP_LANE_CR_DONE		    (1 << 0)
+# define DP_LANE_CHANNEL_EQ_DONE	    (1 << 1)
+# define DP_LANE_SYMBOL_LOCKED		    (1 << 2)
+
+#define DP_CHANNEL_EQ_BITS (DP_LANE_CR_DONE |		\
+			    DP_LANE_CHANNEL_EQ_DONE |	\
+			    DP_LANE_SYMBOL_LOCKED)
+
+#define DP_LANE_ALIGN_STATUS_UPDATED	    0x204
+
+#define DP_INTERLANE_ALIGN_DONE		    (1 << 0)
+#define DP_DOWNSTREAM_PORT_STATUS_CHANGED   (1 << 6)
+#define DP_LINK_STATUS_UPDATED		    (1 << 7)
+
+#define DP_SINK_STATUS			    0x205
+
+#define DP_RECEIVE_PORT_0_STATUS	    (1 << 0)
+#define DP_RECEIVE_PORT_1_STATUS	    (1 << 1)
+
+#define DP_ADJUST_REQUEST_LANE0_1	    0x206
+#define DP_ADJUST_REQUEST_LANE2_3	    0x207
+# define DP_ADJUST_VOLTAGE_SWING_LANE0_MASK  0x03
+# define DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT 0
+# define DP_ADJUST_PRE_EMPHASIS_LANE0_MASK   0x0c
+# define DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT  2
+# define DP_ADJUST_VOLTAGE_SWING_LANE1_MASK  0x30
+# define DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT 4
+# define DP_ADJUST_PRE_EMPHASIS_LANE1_MASK   0xc0
+# define DP_ADJUST_PRE_EMPHASIS_LANE1_SHIFT  6
+
+#define DP_SET_POWER                        0x600
+# define DP_SET_POWER_D0                    0x1
+# define DP_SET_POWER_D3                    0x2
+
+struct i2c_algo_dp_aux_data {
+	bool running;
+	u16 address;
+	int (*aux_ch) (struct i2c_adapter *adapter,
+		       uint8_t *send, int send_bytes,
+		       uint8_t *recv, int recv_bytes);
+};
+
+int
+i2c_dp_aux_add_bus(struct i2c_adapter *adapter);
+
+#endif /* DRM_DP_HELPER */

drm-radeon-fixes.patch:
 atombios_crtc.c          |    7 
 r100.c                   |   27 ++-
 r300.c                   |   12 -
 r420.c                   |   14 -
 r520.c                   |    3 
 r600.c                   |   10 +
 r600d.h                  |    1 
 radeon.h                 |    4 
 radeon_asic.h            |   12 +
 radeon_atombios.c        |   40 +++-
 radeon_clocks.c          |    8 
 radeon_combios.c         |  392 ++++++++++++++++++++++++++++++++++++++++-------
 radeon_connectors.c      |   59 +++++--
 radeon_device.c          |   20 ++
 radeon_display.c         |   29 ++-
 radeon_encoders.c        |   91 +++++++---
 radeon_fb.c              |    9 -
 radeon_gem.c             |   10 -
 radeon_i2c.c             |  109 ++++++++++---
 radeon_legacy_crtc.c     |   37 +++-
 radeon_legacy_encoders.c |  125 +++++++-------
 radeon_mode.h            |   76 ++++++---
 radeon_object.c          |    1 
 radeon_reg.h             |   40 ++--
 rs400.c                  |    8 
 rs600.c                  |    7 
 rs690.c                  |    7 
 rv515.c                  |    6 
 rv770.c                  |    6 
 29 files changed, 886 insertions(+), 284 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 drm-radeon-fixes.patchIndex: drm-radeon-fixes.patch
===================================================================
RCS file: drm-radeon-fixes.patch
diff -N drm-radeon-fixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-radeon-fixes.patch	2 Dec 2009 01:53:59 -0000	1.3
@@ -0,0 +1,2184 @@
+diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
+index c15287a..f5987af 100644
+--- a/drivers/gpu/drm/radeon/atombios_crtc.c
++++ b/drivers/gpu/drm/radeon/atombios_crtc.c
+@@ -578,8 +578,11 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
+ 	uint64_t fb_location;
+ 	uint32_t fb_format, fb_pitch_pixels, tiling_flags;
+ 
+-	if (!crtc->fb)
+-		return -EINVAL;
++	/* no fb bound */
++	if (!crtc->fb) {
++		DRM_DEBUG("No FB bound\n");
++		return 0;
++	}
+ 
+ 	radeon_fb = to_radeon_framebuffer(crtc->fb);
+ 
+diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
+index c9e93ea..0862fa4 100644
+--- a/drivers/gpu/drm/radeon/r100.c
++++ b/drivers/gpu/drm/radeon/r100.c
+@@ -94,6 +94,15 @@ int r100_pci_gart_init(struct radeon_device *rdev)
+ 	return radeon_gart_table_ram_alloc(rdev);
+ }
+ 
++/* required on r1xx, r2xx, r300, r(v)350, r420/r481, rs400/rs480 */
++void r100_enable_bm(struct radeon_device *rdev)
++{
++	uint32_t tmp;
++	/* Enable bus mastering */
++	tmp = RREG32(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS;
++	WREG32(RADEON_BUS_CNTL, tmp);
++}
++
+ int r100_pci_gart_enable(struct radeon_device *rdev)
+ {
+ 	uint32_t tmp;
+@@ -105,9 +114,6 @@ int r100_pci_gart_enable(struct radeon_device *rdev)
+ 	WREG32(RADEON_AIC_LO_ADDR, rdev->mc.gtt_location);
+ 	tmp = rdev->mc.gtt_location + rdev->mc.gtt_size - 1;
+ 	WREG32(RADEON_AIC_HI_ADDR, tmp);
+-	/* Enable bus mastering */
+-	tmp = RREG32(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS;
+-	WREG32(RADEON_BUS_CNTL, tmp);
+ 	/* set PCI GART page-table base address */
+ 	WREG32(RADEON_AIC_PT_BASE, rdev->gart.table_addr);
+ 	tmp = RREG32(RADEON_AIC_CNTL) | RADEON_PCIGART_TRANSLATE_EN;
+@@ -1583,6 +1589,14 @@ void r100_gpu_init(struct radeon_device *rdev)
+ 	r100_hdp_reset(rdev);
+ }
+ 
++void r100_hdp_flush(struct radeon_device *rdev)
++{
++	u32 tmp;
++	tmp = RREG32(RADEON_HOST_PATH_CNTL);
++	tmp |= RADEON_HDP_READ_BUFFER_INVALIDATE;
++	WREG32(RADEON_HOST_PATH_CNTL, tmp);
++}
++
+ void r100_hdp_reset(struct radeon_device *rdev)
+ {
+ 	uint32_t tmp;
+@@ -3108,6 +3122,7 @@ static int r100_startup(struct radeon_device *rdev)
+ 	r100_gpu_init(rdev);
+ 	/* Initialize GART (initialize after TTM so we can allocate
+ 	 * memory through TTM but finalize after TTM) */
++	r100_enable_bm(rdev);
+ 	if (rdev->flags & RADEON_IS_PCI) {
+ 		r = r100_pci_gart_enable(rdev);
+ 		if (r)
+@@ -3242,10 +3257,8 @@ int r100_init(struct radeon_device *rdev)
+ 			RREG32(R_0007C0_CP_STAT));
+ 	}
+ 	/* check if cards are posted or not */
+-	if (!radeon_card_posted(rdev) && rdev->bios) {
+-		DRM_INFO("GPU not posted. posting now...\n");
+-		radeon_combios_asic_init(rdev->ddev);
+-	}
++	if (radeon_boot_test_post_card(rdev) == false)
++		return -EINVAL;
+ 	/* Set asic errata */
+ 	r100_errata(rdev);
+ 	/* Initialize clocks */
+diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
+index 2f43ee8..430fc2a 100644
+--- a/drivers/gpu/drm/radeon/r300.c
++++ b/drivers/gpu/drm/radeon/r300.c
+@@ -1193,6 +1193,12 @@ static int r300_startup(struct radeon_device *rdev)
+ 		if (r)
+ 			return r;
+ 	}
++
++	if (rdev->family == CHIP_R300 ||
++	    rdev->family == CHIP_R350 ||
++	    rdev->family == CHIP_RV350)
++		r100_enable_bm(rdev);
++
+ 	if (rdev->flags & RADEON_IS_PCI) {
+ 		r = r100_pci_gart_enable(rdev);
+ 		if (r)
+@@ -1303,10 +1309,8 @@ int r300_init(struct radeon_device *rdev)
+ 			RREG32(R_0007C0_CP_STAT));
+ 	}
+ 	/* check if cards are posted or not */
+-	if (!radeon_card_posted(rdev) && rdev->bios) {
+-		DRM_INFO("GPU not posted. posting now...\n");
+-		radeon_combios_asic_init(rdev->ddev);
+-	}
++	if (radeon_boot_test_post_card(rdev) == false)
++		return -EINVAL;
+ 	/* Set asic errata */
+ 	r300_errata(rdev);
+ 	/* Initialize clocks */
+diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
+index 1cefdbc..e7c3477 100644
+--- a/drivers/gpu/drm/radeon/r420.c
++++ b/drivers/gpu/drm/radeon/r420.c
+@@ -301,14 +301,9 @@ int r420_init(struct radeon_device *rdev)
+ 			RREG32(R_0007C0_CP_STAT));
+ 	}
+ 	/* check if cards are posted or not */
+-	if (!radeon_card_posted(rdev) && rdev->bios) {
+-		DRM_INFO("GPU not posted. posting now...\n");
+-		if (rdev->is_atom_bios) {
+-			atom_asic_init(rdev->mode_info.atom_context);
+-		} else {
+-			radeon_combios_asic_init(rdev->ddev);
+-		}
+-	}
++	if (radeon_boot_test_post_card(rdev) == false)
++		return -EINVAL;
++
+ 	/* Initialize clocks */
+ 	radeon_get_clock_info(rdev->ddev);
+ 	/* Initialize power management */
+@@ -335,6 +330,9 @@ int r420_init(struct radeon_device *rdev)
+ 	if (r) {
+ 		return r;
+ 	}
++	if (rdev->family == CHIP_R420)
++		r100_enable_bm(rdev);
++
+ 	if (rdev->flags & RADEON_IS_PCIE) {
+ 		r = rv370_pcie_gart_init(rdev);
+ 		if (r)
+diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
+index f743518..26c3779 100644
+--- a/drivers/gpu/drm/radeon/r520.c
++++ b/drivers/gpu/drm/radeon/r520.c
+@@ -254,6 +254,9 @@ int r520_init(struct radeon_device *rdev)
+ 			RREG32(R_0007C0_CP_STAT));
+ 	}
+ 	/* check if cards are posted or not */
++	if (radeon_boot_test_post_card(rdev) == false)
++		return -EINVAL;
++
+ 	if (!radeon_card_posted(rdev) && rdev->bios) {
+ 		DRM_INFO("GPU not posted. posting now...\n");
+ 		atom_asic_init(rdev->mode_info.atom_context);
+diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
+index 278f646..3dbd93e 100644
+--- a/drivers/gpu/drm/radeon/r600.c
++++ b/drivers/gpu/drm/radeon/r600.c
+@@ -1101,6 +1101,10 @@ void r600_pciep_wreg(struct radeon_device *rdev, u32 reg, u32 v)
+ 	(void)RREG32(PCIE_PORT_DATA);
+ }
+ 
++void r600_hdp_flush(struct radeon_device *rdev)
++{
++	WREG32(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);
++}
+ 
+ /*
+  * CP & Ring
+@@ -1627,7 +1631,11 @@ int r600_init(struct radeon_device *rdev)
+ 	if (r)
+ 		return r;
+ 	/* Post card if necessary */
+-	if (!r600_card_posted(rdev) && rdev->bios) {
++	if (!r600_card_posted(rdev)) {
++		if (!rdev->bios) {
++			dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");
++			return -EINVAL;
++		}
+ 		DRM_INFO("GPU not posted. posting now...\n");
+ 		atom_asic_init(rdev->mode_info.atom_context);
+ 	}
+diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
+index 27ab428..b7f4ce2 100644
+--- a/drivers/gpu/drm/radeon/r600d.h
++++ b/drivers/gpu/drm/radeon/r600d.h
+@@ -674,4 +674,5 @@
[...1791 lines suppressed...]
+ extern void radeon_combios_output_lock(struct drm_encoder *encoder, bool lock);
+ extern void radeon_combios_initialize_bios_scratch_regs(struct drm_device *dev);
+ extern void radeon_atom_output_lock(struct drm_encoder *encoder, bool lock);
+@@ -426,16 +469,13 @@ void radeon_atombios_init_crtc(struct drm_device *dev,
+ 			       struct radeon_crtc *radeon_crtc);
+ void radeon_legacy_init_crtc(struct drm_device *dev,
+ 			     struct radeon_crtc *radeon_crtc);
+-void radeon_i2c_do_lock(struct radeon_connector *radeon_connector, int lock_state);
++extern void radeon_i2c_do_lock(struct radeon_i2c_chan *i2c, int lock_state);
+ 
+ void radeon_get_clock_info(struct drm_device *dev);
+ 
+ extern bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev);
+ extern bool radeon_get_atom_connector_info_from_supported_devices_table(struct drm_device *dev);
+ 
+-void radeon_rmx_mode_fixup(struct drm_encoder *encoder,
+-			   struct drm_display_mode *mode,
+-			   struct drm_display_mode *adjusted_mode);
+ void radeon_enc_destroy(struct drm_encoder *encoder);
+ void radeon_copy_fb(struct drm_device *dev, struct drm_gem_object *dst_obj);
+ void radeon_combios_asic_init(struct drm_device *dev);
+diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
+index 1f056da..98835f5 100644
+--- a/drivers/gpu/drm/radeon/radeon_object.c
++++ b/drivers/gpu/drm/radeon/radeon_object.c
+@@ -315,6 +315,7 @@ int radeon_object_wait(struct radeon_object *robj)
+ 	}
+ 	spin_unlock(&robj->tobj.lock);
+ 	radeon_object_unreserve(robj);
++	radeon_hdp_flush(robj->rdev);
+ 	return r;
+ }
+ 
+diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
+index 29ab759..34ba06d 100644
+--- a/drivers/gpu/drm/radeon/radeon_reg.h
++++ b/drivers/gpu/drm/radeon/radeon_reg.h
+@@ -1051,20 +1051,25 @@
+ 
+        /* Multimedia I2C bus */
+ #define RADEON_I2C_CNTL_0		    0x0090
+-#define RADEON_I2C_DONE (1<<0)
+-#define RADEON_I2C_NACK (1<<1)
+-#define RADEON_I2C_HALT (1<<2)
+-#define RADEON_I2C_SOFT_RST (1<<5)
+-#define RADEON_I2C_DRIVE_EN (1<<6)
+-#define RADEON_I2C_DRIVE_SEL (1<<7)
+-#define RADEON_I2C_START (1<<8)
+-#define RADEON_I2C_STOP (1<<9)
+-#define RADEON_I2C_RECEIVE (1<<10)
+-#define RADEON_I2C_ABORT (1<<11)
+-#define RADEON_I2C_GO (1<<12)
++#define RADEON_I2C_DONE                     (1 << 0)
++#define RADEON_I2C_NACK                     (1 << 1)
++#define RADEON_I2C_HALT                     (1 << 2)
++#define RADEON_I2C_SOFT_RST                 (1 << 5)
++#define RADEON_I2C_DRIVE_EN                 (1 << 6)
++#define RADEON_I2C_DRIVE_SEL                (1 << 7)
++#define RADEON_I2C_START                    (1 << 8)
++#define RADEON_I2C_STOP                     (1 << 9)
++#define RADEON_I2C_RECEIVE                  (1 << 10)
++#define RADEON_I2C_ABORT                    (1 << 11)
++#define RADEON_I2C_GO                       (1 << 12)
++#define RADEON_I2C_PRESCALE_SHIFT           16
+ #define RADEON_I2C_CNTL_1                   0x0094
+-#define RADEON_I2C_SEL         (1<<16)
+-#define RADEON_I2C_EN          (1<<17)
++#define RADEON_I2C_DATA_COUNT_SHIFT         0
++#define RADEON_I2C_ADDR_COUNT_SHIFT         4
++#define RADEON_I2C_INTRA_BYTE_DELAY_SHIFT   8
++#define RADEON_I2C_SEL                      (1 << 16)
++#define RADEON_I2C_EN                       (1 << 17)
++#define RADEON_I2C_TIME_LIMIT_SHIFT         24
+ #define RADEON_I2C_DATA			    0x0098
+ 
+ #define RADEON_DVI_I2C_CNTL_0		    0x02e0
+@@ -1072,7 +1077,7 @@
+ #       define R200_SEL_DDC1                0 /* 0x60 - VGA_DDC */
+ #       define R200_SEL_DDC2                1 /* 0x64 - DVI_DDC */
+ #       define R200_SEL_DDC3                2 /* 0x68 - MONID_DDC */
+-#define RADEON_DVI_I2C_CNTL_1               0x02e4 /* ? */
++#define RADEON_DVI_I2C_CNTL_1               0x02e4
+ #define RADEON_DVI_I2C_DATA		    0x02e8
+ 
+ #define RADEON_INTERRUPT_LINE               0x0f3c /* PCI */
+@@ -1143,14 +1148,15 @@
+ #       define RADEON_IO_MCLK_MAX_DYN_STOP_LAT (1 << 13)
+ #       define RADEON_MC_MCLK_DYN_ENABLE    (1 << 14)
+ #       define RADEON_IO_MCLK_DYN_ENABLE    (1 << 15)
+-#define RADEON_LCD_GPIO_MASK                0x01a0
++#define RADEON_GPIOPAD_MASK                 0x0198
++#define RADEON_GPIOPAD_A		    0x019c
+ #define RADEON_GPIOPAD_EN                   0x01a0
++#define RADEON_GPIOPAD_Y                    0x01a4
++#define RADEON_LCD_GPIO_MASK                0x01a0
+ #define RADEON_LCD_GPIO_Y_REG               0x01a4
+ #define RADEON_MDGPIO_A_REG                 0x01ac
+ #define RADEON_MDGPIO_EN_REG                0x01b0
+ #define RADEON_MDGPIO_MASK                  0x0198
+-#define RADEON_GPIOPAD_MASK                 0x0198
+-#define RADEON_GPIOPAD_A		    0x019c
+ #define RADEON_MDGPIO_Y_REG                 0x01b4
+ #define RADEON_MEM_ADDR_CONFIG              0x0148
+ #define RADEON_MEM_BASE                     0x0f10 /* PCI */
+diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
+index ca03716..2e5b945 100644
+--- a/drivers/gpu/drm/radeon/rs400.c
++++ b/drivers/gpu/drm/radeon/rs400.c
+@@ -387,6 +387,7 @@ static int rs400_startup(struct radeon_device *rdev)
+ 	r300_clock_startup(rdev);
+ 	/* Initialize GPU configuration (# pipes, ...) */
+ 	rs400_gpu_init(rdev);
++	r100_enable_bm(rdev);
+ 	/* Initialize GART (initialize after TTM so we can allocate
+ 	 * memory through TTM but finalize after TTM) */
+ 	r = rs400_gart_enable(rdev);
+@@ -490,10 +491,9 @@ int rs400_init(struct radeon_device *rdev)
+ 			RREG32(R_0007C0_CP_STAT));
+ 	}
+ 	/* check if cards are posted or not */
+-	if (!radeon_card_posted(rdev) && rdev->bios) {
+-		DRM_INFO("GPU not posted. posting now...\n");
+-		radeon_combios_asic_init(rdev->ddev);
+-	}
++	if (radeon_boot_test_post_card(rdev) == false)
++		return -EINVAL;
++
+ 	/* Initialize clocks */
+ 	radeon_get_clock_info(rdev->ddev);
+ 	/* Get vram informations */
+diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
+index 5f117cd..d2dac45 100644
+--- a/drivers/gpu/drm/radeon/rs600.c
++++ b/drivers/gpu/drm/radeon/rs600.c
+@@ -482,10 +482,9 @@ int rs600_init(struct radeon_device *rdev)
+ 			RREG32(R_0007C0_CP_STAT));
+ 	}
+ 	/* check if cards are posted or not */
+-	if (!radeon_card_posted(rdev) && rdev->bios) {
+-		DRM_INFO("GPU not posted. posting now...\n");
+-		atom_asic_init(rdev->mode_info.atom_context);
+-	}
++	if (radeon_boot_test_post_card(rdev) == false)
++		return -EINVAL;
++
+ 	/* Initialize clocks */
+ 	radeon_get_clock_info(rdev->ddev);
+ 	/* Initialize power management */
+diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
+index 2754717..7ffd6db 100644
+--- a/drivers/gpu/drm/radeon/rs690.c
++++ b/drivers/gpu/drm/radeon/rs690.c
+@@ -700,10 +700,9 @@ int rs690_init(struct radeon_device *rdev)
+ 			RREG32(R_0007C0_CP_STAT));
+ 	}
+ 	/* check if cards are posted or not */
+-	if (!radeon_card_posted(rdev) && rdev->bios) {
+-		DRM_INFO("GPU not posted. posting now...\n");
+-		atom_asic_init(rdev->mode_info.atom_context);
+-	}
++	if (radeon_boot_test_post_card(rdev) == false)
++		return -EINVAL;
++
+ 	/* Initialize clocks */
+ 	radeon_get_clock_info(rdev->ddev);
+ 	/* Initialize power management */
+diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
+index ba68c9f..93de4a9 100644
+--- a/drivers/gpu/drm/radeon/rv515.c
++++ b/drivers/gpu/drm/radeon/rv515.c
+@@ -580,10 +580,8 @@ int rv515_init(struct radeon_device *rdev)
+ 			RREG32(R_0007C0_CP_STAT));
+ 	}
+ 	/* check if cards are posted or not */
+-	if (!radeon_card_posted(rdev) && rdev->bios) {
+-		DRM_INFO("GPU not posted. posting now...\n");
+-		atom_asic_init(rdev->mode_info.atom_context);
+-	}
++	if (radeon_boot_test_post_card(rdev) == false)
++		return -EINVAL;
+ 	/* Initialize clocks */
+ 	radeon_get_clock_info(rdev->ddev);
+ 	/* Initialize power management */
+diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
+index b0efd0d..f546284 100644
+--- a/drivers/gpu/drm/radeon/rv770.c
++++ b/drivers/gpu/drm/radeon/rv770.c
+@@ -975,7 +975,11 @@ int rv770_init(struct radeon_device *rdev)
+ 	if (r)
+ 		return r;
+ 	/* Post card if necessary */
+-	if (!r600_card_posted(rdev) && rdev->bios) {
++	if (!r600_card_posted(rdev)) {
++		if (!rdev->bios) {
++			dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");
++			return -EINVAL;
++		}
+ 		DRM_INFO("GPU not posted. posting now...\n");
+ 		atom_asic_init(rdev->mode_info.atom_context);
+ 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1859
retrieving revision 1.1860
diff -u -p -r1.1859 -r1.1860
--- kernel.spec	1 Dec 2009 06:58:35 -0000	1.1859
+++ kernel.spec	2 Dec 2009 01:53:59 -0000	1.1860
@@ -679,6 +679,8 @@ Patch1517: hdpvr-ir-enable.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 
 # nouveau + drm fixes
+Patch1811: drm-radeon-fixes.patch
+Patch1812: drm-radeon-dp-support.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1300,6 +1302,8 @@ ApplyPatch hdpvr-ir-enable.patch
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
+ApplyPatch drm-radeon-fixes.patch
+ApplyPatch drm-radeon-dp-support.patch
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
@@ -1985,6 +1989,9 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 2.6.32-0.62.rc8.git2
+- forward port radeon fixes from F-12 + add radeon display port support
+
 * Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.61.rc8.git2
 - fix-9p-fscache.patch: fix build.
 



From airlied at fedoraproject.org  Wed Dec  2 02:49:25 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  2 Dec 2009 02:49:25 +0000 (UTC)
Subject: File xf86-video-ati-20091201.tar.xz uploaded to lookaside cache by
	airlied
Message-ID: <20091202024925.B69B910F894@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xorg-x11-drv-ati:

f66ac154c99ba836f38f4bea302e9d75  xf86-video-ati-20091201.tar.xz



From airlied at fedoraproject.org  Wed Dec  2 02:50:09 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  2 Dec 2009 02:50:09 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-12 .cvsignore, 1.36, 1.37 sources, 1.36,
	1.37 xorg-x11-drv-ati.spec, 1.198, 1.199
Message-ID: <20091202025009.C24B011C03DB@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.16.20091201git88a50a30d
- fixed up multi-op support for r600s



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	27 Nov 2009 04:26:10 -0000	1.36
+++ .cvsignore	2 Dec 2009 02:50:08 -0000	1.37
@@ -1 +1 @@
-xf86-video-ati-20091127.tar.xz
+xf86-video-ati-20091201.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	27 Nov 2009 04:26:10 -0000	1.36
+++ sources	2 Dec 2009 02:50:08 -0000	1.37
@@ -1 +1 @@
-32cf98dc87839ab14088579033338fd2  xf86-video-ati-20091127.tar.xz
+f66ac154c99ba836f38f4bea302e9d75  xf86-video-ati-20091201.tar.xz


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/xorg-x11-drv-ati.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- xorg-x11-drv-ati.spec	27 Nov 2009 04:26:10 -0000	1.198
+++ xorg-x11-drv-ati.spec	2 Dec 2009 02:50:08 -0000	1.199
@@ -1,13 +1,13 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20091127
-%define gitversion a8dbf7c23
+%define gitdate 20091201
+%define gitversion 88a50a30d
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.15.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.16.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.16.20091201git88a50a30d
+- fixed up multi-op support for r600s
+
 * Fri Nov 27 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.15.20091127gita8dbf7c23
 - upstream snapshot with fix for resize under shadowfb, merged multi-op
 



From airlied at fedoraproject.org  Wed Dec  2 02:54:33 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  2 Dec 2009 02:54:33 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-ums-displayport.patch, NONE,
	1.1 sources, 1.32, 1.33 xorg-x11-drv-ati.spec, 1.187,
	1.188 r600-enable-mixed.patch, 1.1, NONE
Message-ID: <20091202025433.17E5311C00A3@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	sources xorg-x11-drv-ati.spec 
Added Files:
	radeon-ums-displayport.patch 
Removed Files:
	r600-enable-mixed.patch 
Log Message:
* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.17.20091201git88a50a30d
- ums displayport + bump libdrm requires for new function needed


radeon-ums-displayport.patch:
 atombios_output.c | 1076 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 radeon.h          |    5 
 radeon_atombios.c |    2 
 radeon_output.c   |   22 +
 radeon_probe.h    |   12 
 5 files changed, 1037 insertions(+), 80 deletions(-)

--- NEW FILE radeon-ums-displayport.patch ---
diff --git a/src/atombios_output.c b/src/atombios_output.c
index c9f1dfa..8047b53 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -65,6 +65,8 @@ const char *device_name[12] = {
     "DFP5",
 };
 
+static void do_displayport_link_train(xf86OutputPtr output);
+
 static void atombios_set_output_crtc_source(xf86OutputPtr output);
 
 static int
@@ -466,41 +468,102 @@ atombios_get_encoder_mode(xf86OutputPtr output)
 }
 
 static const int dp_clocks[] = {
-    16200,
-    27000,
-    32400,
-    54000,
-    0,
-    0,
-    64800,
-    108000,
+    5400,  // 1 lane, 1.62 Ghz
+    9000,  // 1 lane, 2.70 Ghz
+    10800, // 2 lane, 1.62 Ghz
+    18000, // 2 lane, 2.70 Ghz
+    21600, // 4 lane, 1.62 Ghz
+    36000, // 4 lane, 2.70 Ghz
 };
 static const int num_dp_clocks = sizeof(dp_clocks) / sizeof(int);
 
+# define DP_LINK_BW_1_62                    0x06
+# define DP_LINK_BW_2_7                     0x0a
+
 static int
-dp_lanes_for_mode_clock(int mode_clock)
+dp_lanes_for_mode_clock(RADEONOutputPrivatePtr radeon_output,
+			int mode_clock)
 {
     int i;
-    
-    for (i = 0; i < num_dp_clocks; i++)
-	if (dp_clocks[i] > (mode_clock / 10))
-	    return (i / 2) + 1;
+    int max_link_bw = radeon_output->dpcd[1];
+
+    switch (max_link_bw) {
+    case DP_LINK_BW_1_62:
+    default:
+	for (i = 0; i < num_dp_clocks; i++) {
+	    if (i % 2)
+		continue;
+	    if (dp_clocks[i] > (mode_clock / 10)) {
+		if (i < 2)
+		    return 1;
+		else if (i < 4)
+		    return 2;
+		else
+		    return 4;
+	    }
+	}
+	break;
+    case DP_LINK_BW_2_7:
+	for (i = 0; i < num_dp_clocks; i++) {
+	    if (dp_clocks[i] > (mode_clock / 10)) {
+		if (i < 2)
+		    return 1;
+		else if (i < 4)
+		    return 2;
+		else
+		    return 4;
+	    }
+	}
+        break;
+    }
 
     return 0;
 }
 
 static int
-dp_link_clock_for_mode_clock(int mode_clock)
+dp_link_clock_for_mode_clock(RADEONOutputPrivatePtr radeon_output,
+			     int mode_clock)
 {
     int i;
+    int max_link_bw = radeon_output->dpcd[1];
 
-    for (i = 0; i < num_dp_clocks; i++)
-	if (dp_clocks[i] > (mode_clock / 10))
-	    return (dp_clocks[i % 2]);
+    switch (max_link_bw) {
+    case DP_LINK_BW_1_62:
+    default:
+	return 16200;
+	break;
+    case DP_LINK_BW_2_7:
+	for (i = 0; i < num_dp_clocks; i++)
+	    if (dp_clocks[i] > (mode_clock / 10))
+		return (i % 2) ? 27000 : 16200;
+        break;
+    }
 
     return 0;
 }
 
+/*
+ * DIG Encoder/Transmitter Setup
+ *
+ * DCE 3.0/3.1
+ * - 2 DIG transmitter blocks. UNIPHY (links A and B) and LVTMA.
+ * Supports up to 3 digital outputs
+ * - 2 DIG encoder blocks.
+ * DIG1 can drive UNIPHY link A or link B
+ * DIG2 can drive UNIPHY link B or LVTMA
+ *
+ * DCE 3.2
+ * - 3 DIG transmitter blocks. UNIPHY0/1/2 (links A and B).
+ * Supports up to 5 digital outputs
+ * - 2 DIG encoder blocks.
+ * DIG1/2 can drive UNIPHY0/1/2 link A or link B
+ *
+ * Routing
+ * crtc -> dig encoder -> UNIPHY/LVTMA (1 or 2 links)
+ * Examples:
+ * crtc0 -> dig2 -> LVTMA links A+B
+ * crtc1 -> dig1 -> UNIPHY0 link B
+ */
 static int
 atombios_output_dig_encoder_setup(xf86OutputPtr output, int action)
 {
@@ -528,10 +591,17 @@ atombios_output_dig_encoder_setup(xf86OutputPtr output, int action)
     } else {
 	switch (radeon_encoder->encoder_id) {
 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
-	    index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
+	    /* doesn't really matter which dig encoder we pick as long as it's
+	     * not already in use
+	     */
+	    if (radeon_output->linkb)
+		index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
+	    else
+		index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl);
 	    num = 1;
 	    break;
 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+	    /* Only dig2 encoder can drive LVTMA */
 	    index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl);
 	    num = 2;
 	    break;
@@ -569,26 +639,18 @@ atombios_output_dig_encoder_setup(xf86OutputPtr output, int action)
     disp_data.ucEncoderMode = atombios_get_encoder_mode(output);
 
     if (disp_data.ucEncoderMode == ATOM_ENCODER_MODE_DP) {
-	if (radeon_output->linkb)
-	    disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKB;
-	else
-	    disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKA;
-
-	if (dp_link_clock_for_mode_clock(clock) == 27000)
+	if (dp_link_clock_for_mode_clock(radeon_output, clock) == 27000)
 	    disp_data.ucConfig |= ATOM_ENCODER_CONFIG_DPLINKRATE_2_70GHZ;
-
-	disp_data.ucLaneNum = dp_lanes_for_mode_clock(clock);
-    } else if (clock > 165000) {
-	disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKA_B;
+	disp_data.ucLaneNum = dp_lanes_for_mode_clock(radeon_output, clock);
+    } else if (clock > 165000)
 	disp_data.ucLaneNum = 8;
-    } else {
-	if (radeon_output->linkb)
-	    disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKB;
-	else
-	    disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKA;
-
+    else
 	disp_data.ucLaneNum = 4;
-    }
+
+    if (radeon_output->linkb)
+	disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKB;
+    else
+	disp_data.ucConfig |= ATOM_ENCODER_CONFIG_LINKA;
 
     data.exec.index = index;
     data.exec.dataSpace = (void *)&space;
@@ -610,7 +672,7 @@ union dig_transmitter_control {
 };
 
 static int
-atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action)
+atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action, uint8_t lane_num, uint8_t lane_set)
 {
     RADEONOutputPrivatePtr radeon_output = output->driver_private;
     RADEONInfoPtr info       = RADEONPTR(output->scrn);
@@ -648,10 +710,13 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action)
     if (IS_DCE32_VARIANT) {
 	if (action == ATOM_TRANSMITTER_ACTION_INIT) {
 	    disp_data.v2.usInitInfo = radeon_output->connector_object_id;
+	} else if (action == ATOM_TRANSMITTER_ACTION_SETUP_VSEMPH) {
+	    disp_data.v2.asMode.ucLaneSel = lane_num;
+	    disp_data.v2.asMode.ucLaneSet = lane_set;
 	} else {
 	    if (radeon_output->MonType == MT_DP) {
 		disp_data.v2.usPixelClock =
-		    cpu_to_le16(dp_link_clock_for_mode_clock(clock));
+		    cpu_to_le16(dp_link_clock_for_mode_clock(radeon_output, clock));
 		disp_data.v2.acConfig.fDPConnector = 1;
 	    } else if (clock > 165000) {
 		disp_data.v2.usPixelClock = cpu_to_le16((clock / 2) / 10);
@@ -663,6 +728,9 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action)
 	if (dig_block)
 	    disp_data.v2.acConfig.ucEncoderSel = 1;
 
+	if (radeon_output->linkb)
+	    disp_data.v2.acConfig.ucLinkSel = 1;
+
 	switch (radeon_encoder->encoder_id) {
 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
 	    disp_data.v2.acConfig.ucTransmitterSel = 0;
@@ -678,7 +746,9 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action)
 	    break;
 	}
 
-	if (radeon_output->active_device & (ATOM_DEVICE_DFP_SUPPORT)) {
+	if (radeon_output->MonType == MT_DP)
+	    disp_data.v2.acConfig.fCoherentMode = 1; /* DP requires coherent */
+	else if (radeon_output->active_device & (ATOM_DEVICE_DFP_SUPPORT)) {
 	    if (radeon_output->coherent_mode) {
 		disp_data.v2.acConfig.fCoherentMode = 1;
 		xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "UNIPHY%d transmitter: Coherent Mode enabled\n",disp_data.v2.acConfig.ucTransmitterSel);
@@ -690,10 +760,13 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action)
 
 	if (action == ATOM_TRANSMITTER_ACTION_INIT) {
 	    disp_data.v1.usInitInfo = radeon_output->connector_object_id;
+	} else if (action == ATOM_TRANSMITTER_ACTION_SETUP_VSEMPH) {
+	    disp_data.v2.asMode.ucLaneSel = lane_num;
+	    disp_data.v2.asMode.ucLaneSet = lane_set;
 	} else {
 	    if (radeon_output->MonType == MT_DP)
 		disp_data.v1.usPixelClock =
-		    cpu_to_le16(dp_link_clock_for_mode_clock(clock));
+		    cpu_to_le16(dp_link_clock_for_mode_clock(radeon_output, clock));
 	    else if (clock > 165000)
 		disp_data.v1.usPixelClock = cpu_to_le16((clock / 2) / 10);
 	    else
@@ -702,18 +775,20 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action)
 
 	switch (radeon_encoder->encoder_id) {
 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
-	    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER;
+	    /* doesn't really matter which dig encoder we pick as long as it's
+	     * not already in use
+	     */
+	    if (radeon_output->linkb)
+		disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER;
+	    else
+		disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER;
 	    if (info->IsIGP) {
 		if (clock > 165000) {
-		    disp_data.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
-					      ATOM_TRANSMITTER_CONFIG_LINKA_B);
-
 		    if (radeon_output->igp_lane_info & 0x3)
 			disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_7;
 		    else if (radeon_output->igp_lane_info & 0xc)
 			disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_8_15;
 		} else {
-		    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKA;
 		    if (radeon_output->igp_lane_info & 0x1)
 			disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_3;
 		    else if (radeon_output->igp_lane_info & 0x2)
@@ -723,39 +798,24 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action)
 		    else if (radeon_output->igp_lane_info & 0x8)
 			disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_12_15;
 		}
-	    } else {
-		if (clock > 165000)
-		    disp_data.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
-					      ATOM_TRANSMITTER_CONFIG_LINKA_B |
-					      ATOM_TRANSMITTER_CONFIG_LANE_0_7);
-		else {
-		    /* XXX */
-		    if (radeon_output->linkb)
-			disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKB | ATOM_TRANSMITTER_CONFIG_LANE_0_3;
-		    else
-			disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKA | ATOM_TRANSMITTER_CONFIG_LANE_0_3;
-		}
 	    }
 	    break;
 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+	    /* Only dig2 encoder can drive LVTMA */
 	    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER;
-	    if (clock > 165000)
-		disp_data.v1.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK |
-					  ATOM_TRANSMITTER_CONFIG_LINKA_B |
-					  ATOM_TRANSMITTER_CONFIG_LANE_0_7);
-	    else {
-		/* XXX */
-		if (radeon_output->linkb)
-		    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKB | ATOM_TRANSMITTER_CONFIG_LANE_0_3;
-		else
-		    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKA | ATOM_TRANSMITTER_CONFIG_LANE_0_3;
-	    }
 	    break;
 	}
+	if (clock > 165000)
+	    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_8LANE_LINK;
+	if (radeon_output->linkb)
+	    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKB;
+	else
+	    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKA;
 
-	if (radeon_output->active_device & (ATOM_DEVICE_DFP_SUPPORT)) {
-	    if (radeon_output->coherent_mode &&
-		radeon_output->MonType != MT_DP) {
+	if (radeon_output->MonType == MT_DP)
+	    disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_COHERENT;  /* DP requires coherent */
+	else if (radeon_output->active_device & (ATOM_DEVICE_DFP_SUPPORT)) {
+	    if (radeon_output->coherent_mode) {
 		disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_COHERENT;
 		xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
 			"DIG%d transmitter: Coherent Mode enabled\n", num);
@@ -1285,8 +1345,12 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
     switch (mode) {
     case DPMSModeOn:
 	radeon_encoder->devices |= radeon_output->active_device;
-	if (is_dig)
-	    atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT);
+	if (is_dig) {
+	    atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
+	    if (radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT && radeon_output->MonType == MT_DP) {
+	      do_displayport_link_train(output);
+	    }
+	}
 	else {
 	    disp_data.ucAction = ATOM_ENABLE;
 	    data.exec.index = index;
@@ -1310,7 +1374,7 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
 	radeon_encoder->devices &= ~(radeon_output->active_device);
 	if (!radeon_encoder->devices) {
 	    if (is_dig)
-		atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT);
+		atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0);
 	    else {
 		disp_data.ucAction = ATOM_DISABLE;
 		data.exec.index = index;
@@ -1418,10 +1482,18 @@ atombios_set_output_crtc_source(xf86OutputPtr output)
 			crtc_src_param2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID;
 		    else
 			crtc_src_param2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID;
-		} else
-		    crtc_src_param2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID;
+		} else {
+		    /* doesn't really matter which dig encoder we pick as long as it's
+		     * not already in use
+		     */
+		    if (radeon_output->linkb)
+			crtc_src_param2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID;
+		    else
+			crtc_src_param2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID;
+		}
 		break;
 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+		/* Only dig2 encoder can drive LVTMA */
 		crtc_src_param2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID;
 		break;
 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
@@ -1543,14 +1615,14 @@ atombios_output_mode_set(xf86OutputPtr output,
     case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
     case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 	/* disable encoder and transmitter */
-	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_DISABLE);
+	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
 	atombios_output_dig_encoder_setup(output, ATOM_DISABLE);
 
 	/* setup and enable the encoder and transmitter */
 	atombios_output_dig_encoder_setup(output, ATOM_ENABLE);
-	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_INIT);
-	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_SETUP);
-	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_ENABLE);
+	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_INIT, 0, 0);
+	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
+	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
 	break;
     case ENCODER_OBJECT_ID_INTERNAL_DDI:
 	atombios_output_ddia_setup(output, ATOM_ENABLE);
@@ -1686,3 +1758,849 @@ atombios_dac_detect(xf86OutputPtr output)
     return MonType;
 }
 
+#define AUX_NATIVE_WRITE                    0x8
+#define AUX_NATIVE_READ                     0x9
+
+#define AUX_I2C_WRITE                       0x0
+#define AUX_I2C_READ                        0x1
+#define AUX_I2C_STATUS                      0x2
+#define AUX_I2C_MOT                         0x4
+
+#define DP_DPCD_REV                         0x0
+#define DP_MAX_LINK_RATE                    0x1
+#define DP_MAX_LANE_COUNT                   0x2
+#define DP_MAX_DOWNSPREAD                   0x3
+#define DP_NORP                             0x4
+#define DP_DOWNSTREAMPORT_PRESENT           0x5
+#define DP_MAIN_LINK_CHANNEL_CONFIG         0x6
+#define DP_DP11_DOWNSTREAM_PORT_COUNT       0x7
+
+/* from intel i830_dp.h */
+#define DP_LINK_BW_SET                      0x100
+//# define DP_LINK_BW_1_62                    0x06
+//# define DP_LINK_BW_2_7                     0x0a
+#define DP_LANE_COUNT_SET                   0x101
+# define DP_LANE_COUNT_MASK                 0x0f
+# define DP_LANE_COUNT_ENHANCED_FRAME_EN    (1 << 7)
+
+#define DP_TRAINING_PATTERN_SET             0x102
+
+# define DP_TRAINING_PATTERN_DISABLE        0
+# define DP_TRAINING_PATTERN_1              1
+# define DP_TRAINING_PATTERN_2              2
+# define DP_TRAINING_PATTERN_MASK           0x3
+
+# define DP_LINK_QUAL_PATTERN_DISABLE       (0 << 2)
+# define DP_LINK_QUAL_PATTERN_D10_2         (1 << 2)
+# define DP_LINK_QUAL_PATTERN_ERROR_RATE    (2 << 2)
+# define DP_LINK_QUAL_PATTERN_PRBS7         (3 << 2)
+# define DP_LINK_QUAL_PATTERN_MASK          (3 << 2)
+# define DP_RECOVERED_CLOCK_OUT_EN          (1 << 4)
+# define DP_LINK_SCRAMBLING_DISABLE         (1 << 5)
+
+# define DP_SYMBOL_ERROR_COUNT_BOTH         (0 << 6)
+# define DP_SYMBOL_ERROR_COUNT_DISPARITY    (1 << 6)
+# define DP_SYMBOL_ERROR_COUNT_SYMBOL       (2 << 6)
+# define DP_SYMBOL_ERROR_COUNT_MASK         (3 << 6)
+
+#define DP_TRAINING_LANE0_SET               0x103
+#define DP_TRAINING_LANE1_SET               0x104
+#define DP_TRAINING_LANE2_SET               0x105
+#define DP_TRAINING_LANE3_SET               0x106
+# define DP_TRAIN_VOLTAGE_SWING_MASK        0x3
+# define DP_TRAIN_VOLTAGE_SWING_SHIFT       0
+# define DP_TRAIN_MAX_SWING_REACHED         (1 << 2)
+# define DP_TRAIN_VOLTAGE_SWING_400         (0 << 0)
+# define DP_TRAIN_VOLTAGE_SWING_600         (1 << 0)
+# define DP_TRAIN_VOLTAGE_SWING_800         (2 << 0)
+# define DP_TRAIN_VOLTAGE_SWING_1200        (3 << 0)
+
+# define DP_TRAIN_PRE_EMPHASIS_MASK         (3 << 3)
+# define DP_TRAIN_PRE_EMPHASIS_0            (0 << 3)
+# define DP_TRAIN_PRE_EMPHASIS_3_5          (1 << 3)
+# define DP_TRAIN_PRE_EMPHASIS_6            (2 << 3)
+# define DP_TRAIN_PRE_EMPHASIS_9_5          (3 << 3)
+
+# define DP_TRAIN_PRE_EMPHASIS_SHIFT        3
+# define DP_TRAIN_MAX_PRE_EMPHASIS_REACHED  (1 << 5)
+#define DP_DOWNSPREAD_CTRL                  0x107
+# define DP_SPREAD_AMP_0_5                  (1 << 4)
+
+#define DP_MAIN_LINK_CHANNEL_CODING_SET     0x108
+# define DP_SET_ANSI_8B10B                  (1 << 0)
+
+#define DP_LANE0_1_STATUS                   0x202
+#define DP_LANE2_3_STATUS                   0x203
+
+# define DP_LANE_CR_DONE                    (1 << 0)
+# define DP_LANE_CHANNEL_EQ_DONE            (1 << 1)
+# define DP_LANE_SYMBOL_LOCKED              (1 << 2)
+
+#define DP_LANE_ALIGN_STATUS_UPDATED        0x204
+#define DP_INTERLANE_ALIGN_DONE             (1 << 0)
+#define DP_DOWNSTREAM_PORT_STATUS_CHANGED   (1 << 6)
+#define DP_LINK_STATUS_UPDATED              (1 << 7)
+
+#define DP_SINK_STATUS                      0x205
+
+#define DP_RECEIVE_PORT_0_STATUS            (1 << 0)
+#define DP_RECEIVE_PORT_1_STATUS            (1 << 1)
+
+#define DP_ADJUST_REQUEST_LANE0_1           0x206
+#define DP_ADJUST_REQUEST_LANE2_3           0x207
+
+#define DP_ADJUST_VOLTAGE_SWING_LANE0_MASK  0x03
+#define DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT 0
+#define DP_ADJUST_PRE_EMPHASIS_LANE0_MASK   0x0c
+#define DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT  2
+#define DP_ADJUST_VOLTAGE_SWING_LANE1_MASK  0x30
+#define DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT 4
+#define DP_ADJUST_PRE_EMPHASIS_LANE1_MASK   0xc0
+#define DP_ADJUST_PRE_EMPHASIS_LANE1_SHIFT  6
+
+#define DP_LINK_STATUS_SIZE                 6
+#define DP_LINK_CONFIGURATION_SIZE          9
+
+#define DP_SET_POWER_D0  0x1
+#define DP_SET_POWER_D3  0x2
+
+static inline int atom_dp_get_encoder_id(xf86OutputPtr output)
+{
+    RADEONInfoPtr info       = RADEONPTR(output->scrn);
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    int ret = 0;
+    if (IS_DCE32_VARIANT) {
+	if (radeon_output->dig_block)
+	    ret |= ATOM_DP_CONFIG_DIG2_ENCODER;
+	else
+	    ret |= ATOM_DP_CONFIG_DIG1_ENCODER;
+	if (radeon_output->linkb)
+	    ret |= ATOM_DP_CONFIG_LINK_B;
+	else
+	    ret |= ATOM_DP_CONFIG_LINK_A;
+    } else {
+	if (radeon_output->linkb)
+	    ret |= ATOM_DP_CONFIG_DIG2_ENCODER | ATOM_DP_CONFIG_LINK_B;
+	else
+	    ret |= ATOM_DP_CONFIG_DIG1_ENCODER | ATOM_DP_CONFIG_LINK_A;
+    }
+    return ret;
+}
+
+Bool
+RADEONProcessAuxCH(xf86OutputPtr output, uint8_t *req_bytes, uint8_t num_bytes,
+		   uint8_t *read_byte, uint8_t read_buf_len, uint8_t delay)
+{
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    RADEONInfoPtr info       = RADEONPTR(output->scrn);
+    PROCESS_AUX_CHANNEL_TRANSACTION_PS_ALLOCATION args;
+    AtomBiosArgRec data;
+    unsigned char *space;
+    unsigned char *base;
+
+    memset(&args, 0, sizeof(args));
+    if (info->atomBIOS->fbBase)
+	base = info->FB + info->atomBIOS->fbBase;
+    else if (info->atomBIOS->scratchBase)
+	base = (unsigned char *)info->atomBIOS->scratchBase;
+    else
+	return FALSE;
+
+    memcpy(base, req_bytes, num_bytes);
+
+    args.lpAuxRequest = 0;
+    args.lpDataOut = 16;
+    args.ucDataOutLen = 0;
+    args.ucChannelID = radeon_output->ucI2cId;
+    args.ucDelay = delay / 10; /* 10 usec */
+
+    data.exec.index = GetIndexIntoMasterTable(COMMAND, ProcessAuxChannelTransaction);
+    data.exec.dataSpace = (void *)&space;
+    data.exec.pspace = &args;
+
+    RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data);
+    if (args.ucReplyStatus) {
+	ErrorF("failed to get auxch %02x%02x %02x %02x %02x\n",
+	       req_bytes[1], req_bytes[0], req_bytes[2], req_bytes[3],args.ucReplyStatus);
+	return FALSE;
+    }
+    if (args.ucDataOutLen && read_byte && read_buf_len) {
+	if (read_buf_len < args.ucDataOutLen) {
+	    ErrorF("%s: Buffer too small for return answer %d %d\n", __func__, read_buf_len, args.ucDataOutLen);
+	    return FALSE;
+	}
+	{
+	    int len = read_buf_len < args.ucDataOutLen ? read_buf_len : args.ucDataOutLen;
+	    memcpy(read_byte, base+16, len);
+	}
+    }
+    return TRUE;
+}
+
+static int
+RADEONDPEncoderService(xf86OutputPtr output, int action, uint8_t ucconfig, uint8_t lane_num)
+{
+    RADEONInfoPtr info = RADEONPTR(output->scrn);
+    DP_ENCODER_SERVICE_PARAMETERS args;
+    AtomBiosArgRec data;
+    unsigned char *space;
+
+    memset(&args, 0, sizeof(args));
+
+    args.ucLinkClock = 0;
+    args.ucConfig = ucconfig;
+    args.ucAction = action;
+    args.ucLaneNum = lane_num;
+    args.ucStatus = 0;
+
+    data.exec.index = GetIndexIntoMasterTable(COMMAND, DPEncoderService);
+    data.exec.dataSpace = (void *)&space;
+    data.exec.pspace = &args;
+
+    RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data);
+
+    ErrorF("%s: %d\n", __func__, args.ucStatus);
+    return args.ucStatus;
+}
+
+int RADEON_DP_GetSinkType(xf86OutputPtr output)
+{
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+
+    return RADEONDPEncoderService(output, ATOM_DP_ACTION_GET_SINK_TYPE, radeon_output->ucI2cId, 0);
+}
+
+static Bool atom_dp_aux_native_write(xf86OutputPtr output, uint16_t address,
+				     uint8_t send_bytes, uint8_t *send)
+{
+    uint8_t msg[20];
+    uint8_t msg_len, dp_msg_len;
+    int ret;
+
+    dp_msg_len = 4;
+    msg[0] = address;
+    msg[1] = address >> 8;
+    msg[2] = AUX_NATIVE_WRITE << 4;
+    dp_msg_len += send_bytes;
+    msg[3] = (dp_msg_len << 4)| (send_bytes - 1);
+
+    if (0)
+	ErrorF("writing %02x %02x %02x, %d, %d\n", msg[0], msg[1], msg[3], send_bytes, dp_msg_len);
+    if (send_bytes > 16)
+	return FALSE;
+
+    memcpy(&msg[4], send, send_bytes);
+    msg_len = 4 + send_bytes;
+    ret = RADEONProcessAuxCH(output, msg, msg_len, NULL, 0, 0);
+    return ret;
+}
+
+static Bool atom_dp_aux_native_read(xf86OutputPtr output, uint16_t address,
+				    uint8_t delay,
+				    uint8_t expected_bytes, uint8_t *read_p)
+{
+    uint8_t msg[20];
+    uint8_t msg_len, dp_msg_len;
+    int ret;
+
+    msg_len = 4;
+    dp_msg_len = 4;
+    msg[0] = address;
+    msg[1] = address >> 8;
+    msg[2] = AUX_NATIVE_READ << 4;
+    msg[3] = (dp_msg_len) << 4;
+    msg[3] |= expected_bytes - 1;
+
+    if (0)
+	ErrorF("reading %02x %02x %02x, %d, %d\n", msg[0], msg[1], msg[3], expected_bytes, dp_msg_len);
+    ret = RADEONProcessAuxCH(output, msg, msg_len, read_p, expected_bytes, delay);
+    return ret;
+}
+
+/* fill out the DPCD structure */
+void RADEON_DP_GetDPCD(xf86OutputPtr output)
+{
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    uint8_t msg[25];
+    int ret;
+
+    ret = atom_dp_aux_native_read(output, DP_DPCD_REV, 0, 8, msg);
+    if (ret) {
+	memcpy(radeon_output->dpcd, msg, 8);
+	if (0) {
+	    int i;
+	    ErrorF("DPCD: ");
+	    for (i = 0; i < 8; i++)
+		ErrorF("%02x ", radeon_output->dpcd[i]);
+	    ErrorF("\n");
+	}
+	ret = atom_dp_aux_native_read(output, DP_LINK_BW_SET, 0, 2, msg);
+	if (0) {
+	    ErrorF("0x200: %02x %02x\n", msg[0], msg[1]);
+	}
+	return;
+    }
+    radeon_output->dpcd[0] = 0;
+    return;
+}
+
+
+enum dp_aux_i2c_mode {
+    dp_aux_i2c_start,
+    dp_aux_i2c_write,
+    dp_aux_i2c_read,
+    dp_aux_i2c_stop,
+};
+
+
+static Bool atom_dp_aux_i2c_transaction(xf86OutputPtr output, uint16_t address,
+				       enum dp_aux_i2c_mode mode,
+				       uint8_t write_byte, uint8_t *read_byte)
+{
+    uint8_t msg[8], msg_len, dp_msg_len;
+    int ret;
+    int auxch_cmd = 0;
+
+    memset(msg, 0, 8);
+
+    if (mode != dp_aux_i2c_stop)
+	auxch_cmd = AUX_I2C_MOT;
+
+    if (address & 1)
+	auxch_cmd |= AUX_I2C_READ;
+    else
+    	auxch_cmd |= AUX_I2C_WRITE;
+
+    msg[2] = auxch_cmd << 4;
+
+    msg[4] = 0;
+    msg[0] = (address >> 1);
+    msg[1] = (address >> 9);
+
+    msg_len = 4;
+    dp_msg_len = 3;
+    switch (mode) {
+    case dp_aux_i2c_read:
+	/* bottom bits is byte count - 1 so for 1 byte == 0 */
+	dp_msg_len += 1;
+	break;
+    case dp_aux_i2c_write:
+	dp_msg_len += 2;
+	msg[4] = write_byte;
+	msg_len++;
+	break;
+    default:
+	break;
+    }
+    msg[3] = dp_msg_len << 4;
+
+    ret = RADEONProcessAuxCH(output, msg, msg_len, read_byte, 1, 0);
+    return ret;
+}
+
+static Bool
+atom_dp_i2c_address(I2CDevPtr dev, I2CSlaveAddr addr)
+{
+    I2CBusPtr bus = dev->pI2CBus;
+    xf86OutputPtr output = bus->DriverPrivate.ptr;
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    int ret;
+
+    radeon_output->dp_i2c_addr = addr;
+    radeon_output->dp_i2c_running = TRUE;
+
+    /* call i2c start */
+    ret = atom_dp_aux_i2c_transaction(output, radeon_output->dp_i2c_addr,
+				      dp_aux_i2c_start, 0, NULL);
+
+    return ret;
+}
+static Bool
+atom_dp_i2c_start(I2CBusPtr bus, int timeout)
+{
+    ErrorF("%s\n", __func__);
+    return TRUE;
+}
+
+static void
+atom_dp_i2c_stop(I2CDevPtr dev)
+{
+    I2CBusPtr bus = dev->pI2CBus;
+    xf86OutputPtr output = bus->DriverPrivate.ptr;
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+
+    if (radeon_output->dp_i2c_running)
+	atom_dp_aux_i2c_transaction(output, radeon_output->dp_i2c_addr,
+				    dp_aux_i2c_stop, 0, NULL);
+    radeon_output->dp_i2c_running = FALSE;
+}
+
+
+static Bool
+atom_dp_i2c_put_byte(I2CDevPtr dev, I2CByte byte)
+{
+    I2CBusPtr bus = dev->pI2CBus;
+    xf86OutputPtr output = bus->DriverPrivate.ptr;
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    Bool ret;
+
+    ret = (atom_dp_aux_i2c_transaction(output, radeon_output->dp_i2c_addr,
+				       dp_aux_i2c_write, byte, NULL));
+    return ret;
+}
+
+static Bool
+atom_dp_i2c_get_byte(I2CDevPtr dev, I2CByte *byte_ret, Bool last)
+{
+    I2CBusPtr bus = dev->pI2CBus;
+    xf86OutputPtr output = bus->DriverPrivate.ptr;
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    Bool ret;
+
+    ret = (atom_dp_aux_i2c_transaction(output, radeon_output->dp_i2c_addr,
+				       dp_aux_i2c_read, 0, byte_ret));
+    return ret;
+}
+
+Bool
+RADEON_DP_I2CInit(ScrnInfoPtr pScrn, I2CBusPtr *bus_ptr, char *name, xf86OutputPtr output)
+{
+    I2CBusPtr pI2CBus;
+
+    pI2CBus = xf86CreateI2CBusRec();
+    if (!pI2CBus) return FALSE;
+
+    pI2CBus->BusName = name;
+    pI2CBus->scrnIndex = pScrn->scrnIndex;
+    pI2CBus->I2CGetByte = atom_dp_i2c_get_byte;
+    pI2CBus->I2CPutByte = atom_dp_i2c_put_byte;
+    pI2CBus->I2CAddress = atom_dp_i2c_address;
+    pI2CBus->I2CStart = atom_dp_i2c_start;
+    pI2CBus->I2CStop = atom_dp_i2c_stop;
+    pI2CBus->DriverPrivate.ptr = output;
+
+    /*
+     * These were set incorrectly in the server pre-1.3, Having
+     * duplicate settings is sub-optimal, but this lets the driver
+     * work with older servers
+     */
+    pI2CBus->ByteTimeout = 2200; /* VESA DDC spec 3 p. 43 (+10 %) */
+    pI2CBus->StartTimeout = 550;
+    pI2CBus->BitTimeout = 40;
+    pI2CBus->AcknTimeout = 40;
+    pI2CBus->RiseFallTime = 20;
+
+    if (!xf86I2CBusInit(pI2CBus))
+	return FALSE;
+
+    *bus_ptr = pI2CBus;
+    return TRUE;
+}
+
+
+static uint8_t dp_link_status(uint8_t link_status[DP_LINK_STATUS_SIZE], int r)
+{
+    return link_status[r - DP_LANE0_1_STATUS];
+}
+
+static uint8_t dp_get_lane_status(uint8_t link_status[DP_LINK_STATUS_SIZE], int lane)
+{
+    int i = DP_LANE0_1_STATUS + (lane >> 1);
+    int s = (lane & 1) * 4;
+    uint8_t l = dp_link_status(link_status, i);
+    return (l >> s) & 0xf;
+}
+
+static Bool dp_clock_recovery_ok(uint8_t link_status[DP_LINK_STATUS_SIZE], int lane_count)
+{
+    int lane;
+
+    uint8_t lane_status;
+
+    for (lane = 0; lane < lane_count; lane++) {
+	lane_status = dp_get_lane_status(link_status, lane);
+	if ((lane_status & DP_LANE_CR_DONE) == 0)
+	    return FALSE;
+    }
+    return TRUE;
+}
+
+
+/* Check to see if channel eq is done on all channels */
+#define CHANNEL_EQ_BITS (DP_LANE_CR_DONE|\
+			 DP_LANE_CHANNEL_EQ_DONE|\
+			 DP_LANE_SYMBOL_LOCKED)
+static Bool
+dp_channel_eq_ok(uint8_t link_status[DP_LINK_STATUS_SIZE], int lane_count)
+{
+    uint8_t lane_align;
+    uint8_t lane_status;
+    int lane;
+
+    lane_align = dp_link_status(link_status,
+				DP_LANE_ALIGN_STATUS_UPDATED);
+    if ((lane_align & DP_INTERLANE_ALIGN_DONE) == 0)
+	return FALSE;
+    for (lane = 0; lane < lane_count; lane++) {
+	lane_status = dp_get_lane_status(link_status, lane);
+	if ((lane_status & CHANNEL_EQ_BITS) != CHANNEL_EQ_BITS)
+	    return FALSE;
+    }
+    return TRUE;
+}
+
+/*
+ * Fetch AUX CH registers 0x202 - 0x207 which contain
+ * link status information
+ */
+static Bool
+atom_dp_get_link_status(xf86OutputPtr output,
+			  uint8_t link_status[DP_LINK_STATUS_SIZE])
+{
+    ScrnInfoPtr pScrn = output->scrn;
+    int ret;
+    ret = atom_dp_aux_native_read(output, DP_LANE0_1_STATUS, 100,
+				  DP_LINK_STATUS_SIZE, link_status);
+    if (!ret) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "dp link status failed\n");
+	return FALSE;
+    }
+    ErrorF("link status %02x %02x %02x %02x %02x %02x\n", link_status[0], link_status[1],
+	   link_status[2], link_status[3], link_status[4], link_status[5]);
+
+    return TRUE;
+}
+
+static uint8_t
+dp_get_adjust_request_voltage(uint8_t link_status[DP_LINK_STATUS_SIZE],
+			      int lane)
+
+{
+    int     i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
+    int     s = ((lane & 1) ?
+                 DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT :
+                 DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT);
+    uint8_t l = dp_link_status(link_status, i);
+
+    return ((l >> s) & 3) << DP_TRAIN_VOLTAGE_SWING_SHIFT;
+}
+
+static uint8_t
+dp_get_adjust_request_pre_emphasis(uint8_t link_status[DP_LINK_STATUS_SIZE],
+				   int lane)
+{
+    int     i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
+    int     s = ((lane & 1) ?
+                 DP_ADJUST_PRE_EMPHASIS_LANE1_SHIFT :
+                 DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT);
+    uint8_t l = dp_link_status(link_status, i);
+
+    return ((l >> s) & 3) << DP_TRAIN_PRE_EMPHASIS_SHIFT;
+}
+
+static char     *voltage_names[] = {
+        "0.4V", "0.6V", "0.8V", "1.2V"
+};
+static char     *pre_emph_names[] = {
+        "0dB", "3.5dB", "6dB", "9.5dB"
+};
+
+/*
+ * These are source-specific values; current Intel hardware supports
+ * a maximum voltage of 800mV and a maximum pre-emphasis of 6dB
+ */
+#define DP_VOLTAGE_MAX         DP_TRAIN_VOLTAGE_SWING_1200
+
+static uint8_t
+dp_pre_emphasis_max(uint8_t voltage_swing)
+{
+    switch (voltage_swing & DP_TRAIN_VOLTAGE_SWING_MASK) {
+    case DP_TRAIN_VOLTAGE_SWING_400:
+        return DP_TRAIN_PRE_EMPHASIS_6;
+    case DP_TRAIN_VOLTAGE_SWING_600:
+        return DP_TRAIN_PRE_EMPHASIS_6;
+    case DP_TRAIN_VOLTAGE_SWING_800:
+        return DP_TRAIN_PRE_EMPHASIS_3_5;
+    case DP_TRAIN_VOLTAGE_SWING_1200:
+    default:
+        return DP_TRAIN_PRE_EMPHASIS_0;
+    }
+}
+
+static void dp_set_training(xf86OutputPtr output, uint8_t training)
+{
+    atom_dp_aux_native_write(output, DP_TRAINING_PATTERN_SET, 1, &training);
+}
+
+static void dp_set_power(xf86OutputPtr output, uint8_t power_state)
+{
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+
+    if (radeon_output->dpcd[0] >= 0x11) {
+	atom_dp_aux_native_write(output, 0x600, 1, &power_state);
+    }
+}
+
+static void
+dp_get_adjust_train(xf86OutputPtr output,
+		      uint8_t link_status[DP_LINK_STATUS_SIZE],
+		      int lane_count,
+		      uint8_t train_set[4])
+{
+    ScrnInfoPtr pScrn = output->scrn;
+    uint8_t v = 0;
+    uint8_t p = 0;
+    int lane;
+
+    for (lane = 0; lane < lane_count; lane++) {
+	uint8_t this_v = dp_get_adjust_request_voltage(link_status, lane);
+	uint8_t this_p = dp_get_adjust_request_pre_emphasis(link_status, lane);
+
+	if (0) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		       "requested signal parameters: lane %d voltage %s pre_emph %s\n",
+		       lane,
+		       voltage_names[this_v >> DP_TRAIN_VOLTAGE_SWING_SHIFT],
+		       pre_emph_names[this_p >> DP_TRAIN_PRE_EMPHASIS_SHIFT]);
+	}
+	if (this_v > v)
+	    v = this_v;
+	if (this_p > p)
+	    p = this_p;
+    }
+
+    if (v >= DP_VOLTAGE_MAX)
+	v = DP_VOLTAGE_MAX | DP_TRAIN_MAX_SWING_REACHED;
+
+    if (p >= dp_pre_emphasis_max(v))
+	p = dp_pre_emphasis_max(v) | DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
+
+    if (0) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "using signal parameters: voltage %s pre_emph %s\n",
+		   voltage_names[(v & DP_TRAIN_VOLTAGE_SWING_MASK) >> DP_TRAIN_VOLTAGE_SWING_SHIFT],
+		   pre_emph_names[(p & DP_TRAIN_PRE_EMPHASIS_MASK) >> DP_TRAIN_PRE_EMPHASIS_SHIFT]);
+    }
+    for (lane = 0; lane < 4; lane++)
+	train_set[lane] = v | p;
+}
+
+static int radeon_dp_max_lane_count(xf86OutputPtr output)
+{
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    int max_lane_count = 4;
+
+    if (radeon_output->dpcd[0] >= 0x11) {
+	max_lane_count = radeon_output->dpcd[2] & 0x1f;
+	switch(max_lane_count) {
+	case 1: case 2: case 4:
+	    break;
+	default:
+	    max_lane_count = 4;
+	}
+    }
+    return max_lane_count;
+}
+
+static int radeon_dp_max_link_bw(xf86OutputPtr output)
+{
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    int max_link_bw = radeon_output->dpcd[1];
+    switch(max_link_bw) {
+    case DP_LINK_BW_1_62:
+    case DP_LINK_BW_2_7:
+	break;
+    default:
+	max_link_bw = DP_LINK_BW_1_62;
+	break;
+    }
+    return max_link_bw;
+}
+
+static int radeon_dp_link_clock(uint8_t link_bw)
+{
+    if (link_bw == DP_LINK_BW_2_7)
+	return 270000;
+    else
+	return 162000;
+}
+
+
+/* I think this is a fiction */
+static int radeon_dp_link_required(int pixel_clock)
+{
+    return pixel_clock * 3;
+}
+
+Bool radeon_dp_mode_fixup(xf86OutputPtr output, DisplayModePtr mode, DisplayModePtr adjusted_mode)
+{
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    int lane_count, clock;
+    int max_lane_count = radeon_dp_max_lane_count(output);
+    int max_clock = radeon_dp_max_link_bw(output) == DP_LINK_BW_2_7 ? 1 : 0;
+    static int bws[2] = { DP_LINK_BW_1_62, DP_LINK_BW_2_7 };
+
+    for (lane_count = 1; lane_count <= max_lane_count; lane_count <<= 1) {
+	for (clock = 0; clock <= max_clock; clock++) {
+	    int link_avail = radeon_dp_link_clock(bws[clock]) * lane_count;
+
+	    if (radeon_dp_link_required(mode->Clock) <= link_avail) {
+		radeon_output->dp_lane_count = lane_count;
+		radeon_output->dp_clock = radeon_dp_link_clock(bws[clock]);
+		if (0)
+			xf86DrvMsg(0, X_INFO,
+				   "lane_count %d clock %d\n",
+				   radeon_output->dp_lane_count,
+				   radeon_output->dp_clock);
+		return TRUE;
+	    }
+	}
+    }
+    return FALSE;
+}
+
+static void dp_update_dpvs_emph(xf86OutputPtr output, uint8_t train_set[4])
+{
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    int i;
+    for (i = 0; i < radeon_output->dp_lane_count; i++)
+	atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_SETUP_VSEMPH, i, train_set[i]);
+
+    atom_dp_aux_native_write(output, DP_TRAINING_LANE0_SET, radeon_output->dp_lane_count, train_set);
+}
+
+static void do_displayport_link_train(xf86OutputPtr output)
+{
+    ScrnInfoPtr pScrn = output->scrn;
+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    int enc_id = atom_dp_get_encoder_id(output);
+    Bool clock_recovery;
+    uint8_t link_status[DP_LINK_STATUS_SIZE];
+    uint8_t tries, voltage, ss_cntl;
+    uint8_t train_set[4];
+    int i;
+    Bool channel_eq;
+    uint8_t dp_link_configuration[DP_LINK_CONFIGURATION_SIZE];
+
+    memset(train_set, 0, 4);
+
+    /* set up link configuration */
+    memset(dp_link_configuration, 0, DP_LINK_CONFIGURATION_SIZE);
+
+    if (radeon_output->dp_clock == 270000)
+	dp_link_configuration[0] = DP_LINK_BW_2_7;
+    else
+	dp_link_configuration[0] = DP_LINK_BW_1_62;
+    dp_link_configuration[1] = radeon_output->dp_lane_count;
+
+    if (radeon_output->dpcd[0] >= 0x11) {
+	dp_link_configuration[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN;
+    }
+
+    /* power up to D0 */
+    dp_set_power(output, DP_SET_POWER_D0);
+
+    /* disable training */
+    dp_set_training(output, DP_TRAINING_PATTERN_DISABLE);
+
+    /* write link rate / num / eh framing */
+    atom_dp_aux_native_write(output, DP_LINK_BW_SET, 2,
+			     dp_link_configuration);
+
+    /* write ss cntl */
+    ss_cntl = 0;
+    atom_dp_aux_native_write(output, DP_DOWNSPREAD_CTRL, 1,
+			     &ss_cntl);
+
+    /* start local training start */
+    RADEONDPEncoderService(output, ATOM_DP_ACTION_TRAINING_START, enc_id, 0);
+    RADEONDPEncoderService(output, ATOM_DP_ACTION_TRAINING_PATTERN_SEL, enc_id, 0);
+
+    usleep(400);
+    dp_set_training(output, DP_TRAINING_PATTERN_1);
+    dp_update_dpvs_emph(output, train_set);
+
+    /* loop around doing configuration reads and DP encoder setups */
+    clock_recovery = FALSE;
+    tries = 0;
+    voltage = 0xff;
+    for (;;) {
+      	usleep(100);
+	if (!atom_dp_get_link_status(output, link_status))
+	    break;
+
+	if (dp_clock_recovery_ok(link_status, radeon_output->dp_lane_count)) {
+	    clock_recovery = TRUE;
+	    break;
+	}
+
+	for (i = 0; i < radeon_output->dp_lane_count; i++)
+	    if ((train_set[i] & DP_TRAIN_MAX_SWING_REACHED) == 0)
+		break;
+	if (i == radeon_output->dp_lane_count) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		       "clock recovery reached max voltage\n");
+	    break;
+	}
+
+	/* Check to see if we've tried the same voltage 5 times */
+	if ((train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK) == voltage) {
+	    ++tries;
+	    if (tries == 5) {
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+			   "clock recovery tried 5 times\n");
+		break;
+	    }
+	} else
+	    tries = 0;
+
+	voltage = train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK;
+
+        dp_get_adjust_train(output, link_status, radeon_output->dp_lane_count, train_set);
+	dp_update_dpvs_emph(output, train_set);
+
+    }
+
+    if (!clock_recovery)
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		   "clock recovery failed\n");
+
+    /* channel equalization */
+    tries = 0;
+    channel_eq = FALSE;
+    dp_set_training(output, DP_TRAINING_PATTERN_2);
+    RADEONDPEncoderService(output, ATOM_DP_ACTION_TRAINING_PATTERN_SEL, enc_id, 1);
+
+    for (;;) {
+	usleep(400);
+	if (!atom_dp_get_link_status(output, link_status))
+	    break;
+
+	if (dp_channel_eq_ok(link_status, radeon_output->dp_lane_count)) {
+	    channel_eq = TRUE;
+	    break;
+	}
+
+	/* Try 5 times */
+	if (tries > 5) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		       "channel eq failed: 5 tries\n");
+	    break;
+	}
+
+	/* Compute new train_set as requested by target */
+        dp_get_adjust_train(output, link_status, radeon_output->dp_lane_count, train_set);
+	dp_update_dpvs_emph(output, train_set);
+
+	++tries;
+    }
+
+    if (!channel_eq)
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		   "channel eq failed\n");
+
+    dp_set_training(output, DP_TRAINING_PATTERN_DISABLE);
+    RADEONDPEncoderService(output, ATOM_DP_ACTION_TRAINING_COMPLETE, enc_id, 0);
+
+}
+
diff --git a/src/radeon.h b/src/radeon.h
index 1b8ae3c..c9f388a 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -1218,6 +1218,10 @@ void RADEONFreeRec(ScrnInfoPtr pScrn);
 Bool RADEONPreInitVisual(ScrnInfoPtr pScrn);
 Bool RADEONPreInitWeight(ScrnInfoPtr pScrn);
 
+extern Bool RADEON_DP_I2CInit(ScrnInfoPtr pScrn, I2CBusPtr *bus_ptr,
+			      char *name, xf86OutputPtr output);
+extern void RADEON_DP_GetDPCD(xf86OutputPtr output);
+extern int RADEON_DP_GetSinkType(xf86OutputPtr output);
 
 /* radeon_pm.c */
 extern void RADEONPMInit(ScrnInfoPtr pScrn);
@@ -1274,6 +1278,7 @@ extern void RADEONSetOutputType(ScrnInfoPtr pScrn,
 extern Bool RADEONSetupConnectors(ScrnInfoPtr pScrn);
 extern Bool RADEONI2CDoLock(xf86OutputPtr output, I2CBusPtr b, Bool lock_state);
 
+extern Bool radeon_dp_mode_fixup(xf86OutputPtr output, DisplayModePtr mode, DisplayModePtr adjusted_mode);
 
 /* radeon_tv.c */
 extern void RADEONSaveTVRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save);
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 462c5ef..72fbe21 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1581,8 +1581,10 @@ rhdAtomParseI2CRecord(ScrnInfoPtr pScrn, atomBiosHandlePtr handle,
 		      ATOM_I2C_RECORD *Record, int i)
 {
     RADEONInfoPtr info = RADEONPTR (pScrn);
+    uint8_t *temp = &Record->sucI2cId;
 
     info->BiosConnector[i].i2c_line_mux = Record->sucI2cId.bfI2C_LineMux;
+    info->BiosConnector[i].ucI2cId = *temp;
     return RADEONLookupGPIOLineForDDC(pScrn, Record->sucI2cId.bfI2C_LineMux);
 }
 
diff --git a/src/radeon_output.c b/src/radeon_output.c
index a2733a7..107955d 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -301,10 +301,13 @@ radeon_ddc_connected(xf86OutputPtr output)
     RADEONMonitorType MonType = MT_NONE;
     xf86MonPtr MonInfo = NULL;
     RADEONOutputPrivatePtr radeon_output = output->driver_private;
+    int ret;
 
     if (radeon_output->custom_edid) {
 	MonInfo = xnfcalloc(sizeof(xf86Monitor), 1);
 	*MonInfo = *radeon_output->custom_mon;
+    } else if (radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT) {
+	MonInfo = xf86OutputGetEDID(output, radeon_output->dp_pI2CBus);
     } else if (radeon_output->pI2CBus) {
 	if (info->get_hardcoded_edid_from_bios)
 	    MonInfo = RADEONGetHardCodedEDIDFromBIOS(output);
@@ -364,7 +367,13 @@ radeon_ddc_connected(xf86OutputPtr output)
 	     * XXX wrong. need to infer based on whether we got DDC from I2C
 	     * or AUXCH.
 	     */
-	    MonType = MT_DFP;
+	    ret = RADEON_DP_GetSinkType(output);
+
+	    if (ret == CONNECTOR_OBJECT_ID_DISPLAYPORT) {
+		MonType = MT_DP;
+		RADEON_DP_GetDPCD(output);
+	    } else
+		MonType = MT_DFP;
 	    break;
 	case CONNECTOR_HDMI_TYPE_B:
 	case CONNECTOR_DVI_I:
@@ -660,6 +669,9 @@ radeon_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
 	}
     }
 
+    if (radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT && radeon_output->MonType == MT_DP) {
+      radeon_dp_mode_fixup(output, mode, adjusted_mode);
+    }
     return TRUE;
 }
 
@@ -2070,6 +2082,13 @@ void RADEONInitConnector(xf86OutputPtr output)
     if (radeon_output->devices & (ATOM_DEVICE_DFP_SUPPORT))
 	radeon_output->coherent_mode = TRUE;
 
+    if (radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT) {
+	strcpy(radeon_output->dp_bus_name, output->name);
+	strcat(radeon_output->dp_bus_name, "-DP");
+	RADEON_DP_I2CInit(pScrn, &radeon_output->dp_pI2CBus, radeon_output->dp_bus_name, output);
+	RADEON_DP_GetSinkType(output);
+    }
+
     if (radeon_output->ddc_i2c.valid)
 	RADEONI2CInit(pScrn, &radeon_output->pI2CBus, output->name, &radeon_output->ddc_i2c);
 
@@ -2909,6 +2928,7 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
 	    radeon_output->linkb = info->BiosConnector[i].linkb;
 	    radeon_output->connector_id = info->BiosConnector[i].connector_object;
 	    radeon_output->connector_object_id = info->BiosConnector[i].connector_object_id;
+	    radeon_output->ucI2cId = info->BiosConnector[i].ucI2cId;
 
 	    /* Technically HDMI-B is a glorfied DL DVI so the bios is correct,
 	     * but this can be confusing to users when it comes to output names,
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 12e73ef..46bd1f5 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -240,6 +240,7 @@ typedef struct {
     Bool linkb;
     uint16_t connector_object;
     uint16_t connector_object_id;
+    uint8_t ucI2cId;
 } RADEONBIOSConnector;
 
 typedef struct _RADEONOutputPrivateRec {
@@ -284,6 +285,17 @@ typedef struct _RADEONOutputPrivateRec {
     int dig_block;
 
     int pixel_clock;
+
+    /* DP - aux bus*/
+    I2CBusPtr dp_pI2CBus;
+    uint8_t ucI2cId;
+    char dp_bus_name[20];
+    uint32_t dp_i2c_addr;
+    Bool dp_i2c_running;
+    /* DP - general config */
+    uint8_t dpcd[8];
+    int dp_lane_count;
+    int dp_clock;
 } RADEONOutputPrivateRec, *RADEONOutputPrivatePtr;
 
 struct avivo_pll_state {


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	29 Sep 2009 03:26:31 -0000	1.32
+++ sources	2 Dec 2009 02:54:32 -0000	1.33
@@ -1 +1 @@
-55a7141d73902a4d35837f4c59f4e6de  xf86-video-ati-20090929.tar.xz
+f66ac154c99ba836f38f4bea302e9d75  xf86-video-ati-20091201.tar.xz


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.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- xorg-x11-drv-ati.spec	29 Sep 2009 03:26:31 -0000	1.187
+++ xorg-x11-drv-ati.spec	2 Dec 2009 02:54:32 -0000	1.188
@@ -1,13 +1,13 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20090929
-%define gitversion 7968e1fb8
+%define gitdate 20091201
+%define gitversion 88a50a30d
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.5.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.17.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,24 +18,24 @@ Source0: %{tarball}-%{gitdate}.tar.xz
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
 
+Patch2:     radeon-ums-displayport.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
-Patch14:    r600-enable-mixed.patch
 
 ExcludeArch: s390 s390x
 
 BuildRequires: python
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
 BuildRequires: mesa-libGL-devel >= 6.4-4
-BuildRequires: libdrm-devel >= 2.4.0-0.21
+BuildRequires: libdrm-devel >= 2.4.16-0.1
 BuildRequires: kernel-headers >= 2.6.27-0.308
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
-Requires:  libdrm >= 2.4.0-0.21
+Requires:  libdrm >= 2.4.16-0.1
 # new CS method needs newer kernel
 Requires:  kernel >= 2.6.29.1-111.fc11
 Obsoletes: xorg-x11-drv-avivo <= 0.0.2
@@ -45,10 +45,10 @@ X.Org X11 ati video driver.
 
 %prep
 %setup -q -n %{tarball}-%{gitdate}
+%patch2 -p1 -b .dp
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
-%patch14 -p1 -b .mix
 
 %build
 autoreconf -iv
@@ -82,6 +82,43 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.17.20091201git88a50a30d
+- ums displayport + bump libdrm requires for new function needed
+
+* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.16.20091201git88a50a30d
+- fixed up multi-op support for r600s
+
+* Fri Nov 27 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.15.20091127gita8dbf7c23
+- upstream snapshot with fix for resize under shadowfb, merged multi-op
+
+* Thu Nov 26 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.14.20091125git8b28534bc
+- revert r600 multi-op for now seems to cause regression
+
+* Wed Nov 25 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.13.20091125git8b28534bc
+- rebase to upstream with r600 speed ups and r100 fixes integrated.
+
+* Fri Nov 20 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.12.20091119git437113124
+- fix r100 Xv (partly inspired by 505152), rn50 small VRAM fixes.
+
+* Thu Nov 19 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.11.20091119git437113124
+- upstream snapshot (#538561), amongst others
+
+* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.10.20091006git457646d73
+- Don't use scratch pixmaps for rotate
+
+* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.9.20091006git457646d73
+- reload cursors on mode switch/rotate
+
+* Wed Oct 07 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.8.20091006git457646d73
+- fix rotate (#527000)
+
+* Tue Oct 06 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.7.20091006git457646d73
+- resnapshot with VT switch fixes and mixed issue was in server which is fixed
+
+* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.6.20090929git7968e1fb8
+- mixed appears to break r600 for some reason need to investigate disable for
+  beta
+
 * Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.5.20090929git7968e1fb8
 - rebase to latest upstream for vline fixes and zaphod fixes
 


--- r600-enable-mixed.patch DELETED ---



From airlied at fedoraproject.org  Wed Dec  2 03:02:06 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  2 Dec 2009 03:02:06 +0000 (UTC)
Subject: File radeon-rlc-firmware-1.tar.bz2 uploaded to lookaside cache by
	airlied
Message-ID: <20091202030206.D46D810F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xorg-x11-drv-ati:

189be8ab60025bf81f8841ab53175665  radeon-rlc-firmware-1.tar.bz2



From pbrobinson at fedoraproject.org  Wed Dec  2 03:33:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 03:33:09 +0000 (UTC)
Subject: File anjal-0.2.0-20091202.tar.bz uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091202033309.B1DB110F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for anjal:

31a5cdfed24ea4fa74d558dbca80c9cf  anjal-0.2.0-20091202.tar.bz



From pbrobinson at fedoraproject.org  Wed Dec  2 03:37:08 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 03:37:08 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.9, 1.10 anjal.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20091202033708.DA80E11C00A3@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- Update to git snapshot for evolution 2.29 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 Oct 2009 16:48:16 -0000	1.9
+++ .cvsignore	2 Dec 2009 03:37:08 -0000	1.10
@@ -1 +1 @@
-anjal-0.1.tar.bz2
+anjal-0.2.0-20091202.tar.bz


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- anjal.spec	21 Oct 2009 22:34:29 -0000	1.12
+++ anjal.spec	2 Dec 2009 03:37:08 -0000	1.13
@@ -1,13 +1,23 @@
-Name:           anjal
-Version:        0.1.0
-Release:        1%{?dist}
-Summary:        An email client for small screen devices
-
-Group:          Applications/Productivity
-License:        LGPLv2 or LGPLv3
-URL:            http://live.gnome.org/Anjal/
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.1/%{name}-0.1.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Tarfile created using git
+# git clone git://git.gnome.org/anjal
+# git archive --format=tar --prefix=anjal-0.2.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
+
+%define gitdate 20091202
+%define git_version 224e189
+%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
+%define snapshot %{gitdate}git%{git_version}
+
+Name:          anjal
+Version:       0.2.0
+Release:       0.1%{?dist}
+Summary:       An email client for small screen devices
+
+Group:         Applications/Productivity
+License:       LGPLv2 or LGPLv3
+URL:           http://live.gnome.org/Anjal/
+# Source0:       ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.1/%{name}-0.1.tar.bz2
+Source0:       %{tarfile}
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: anerley-devel
 BuildRequires: clutter-devel
@@ -36,7 +46,10 @@ folders, new mail and config. Being base
 all the mail backends including POP3, IMAP4, Exchange and GroupWare.
 
 %prep
-%setup -q -n %{name}-0.1
+%setup -q
+
+# run autogen.sh until we have a proper release
+NOCONFIGURE=yes ./autogen.sh
 
 %build
 %configure --with-mozilla=no --with-anerley
@@ -83,6 +96,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-0.1
+- Update to git snapshot for evolution 2.29 release
+
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-1
 - Fix versioning
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 Oct 2009 16:48:16 -0000	1.9
+++ sources	2 Dec 2009 03:37:08 -0000	1.10
@@ -1 +1 @@
-50887a7663da8a3ecc6058e4b922efdc  anjal-0.1.tar.bz2
+31a5cdfed24ea4fa74d558dbca80c9cf  anjal-0.2.0-20091202.tar.bz



From pbrobinson at fedoraproject.org  Wed Dec  2 03:42:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 03:42:10 +0000 (UTC)
Subject: File anjal-0.2.0-20091202.tar.bz2 uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091202034210.5544C10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for anjal:

31a5cdfed24ea4fa74d558dbca80c9cf  anjal-0.2.0-20091202.tar.bz2



From pbrobinson at fedoraproject.org  Wed Dec  2 03:43:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 03:43:12 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.10, 1.11 anjal.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <20091202034312.1FE0E11C00A3@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- Upload source file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Dec 2009 03:37:08 -0000	1.10
+++ .cvsignore	2 Dec 2009 03:43:11 -0000	1.11
@@ -1 +1 @@
-anjal-0.2.0-20091202.tar.bz
+anjal-0.2.0-20091202.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- anjal.spec	2 Dec 2009 03:37:08 -0000	1.13
+++ anjal.spec	2 Dec 2009 03:43:11 -0000	1.14
@@ -9,7 +9,7 @@
 
 Name:          anjal
 Version:       0.2.0
-Release:       0.1%{?dist}
+Release:       0.2%{?dist}
 Summary:       An email client for small screen devices
 
 Group:         Applications/Productivity
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-0.2
+- Upload source file
+
 * Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-0.1
 - Update to git snapshot for evolution 2.29 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Dec 2009 03:37:08 -0000	1.10
+++ sources	2 Dec 2009 03:43:11 -0000	1.11
@@ -1 +1 @@
-31a5cdfed24ea4fa74d558dbca80c9cf  anjal-0.2.0-20091202.tar.bz
+31a5cdfed24ea4fa74d558dbca80c9cf  anjal-0.2.0-20091202.tar.bz2



From airlied at fedoraproject.org  Wed Dec  2 03:58:17 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  2 Dec 2009 03:58:17 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.32, 1.33 sources, 1.33,
	1.34 xorg-x11-drv-ati.spec, 1.188, 1.189
Message-ID: <20091202035817.9053E11C00A3@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091201git88a50a30d
- add R600 RLC firmware for IRQ handling



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	29 Sep 2009 03:26:30 -0000	1.32
+++ .cvsignore	2 Dec 2009 03:58:16 -0000	1.33
@@ -1 +1,2 @@
 xf86-video-ati-20090929.tar.xz
+radeon-rlc-firmware-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	2 Dec 2009 02:54:32 -0000	1.33
+++ sources	2 Dec 2009 03:58:17 -0000	1.34
@@ -1 +1,2 @@
 f66ac154c99ba836f38f4bea302e9d75  xf86-video-ati-20091201.tar.xz
+189be8ab60025bf81f8841ab53175665  radeon-rlc-firmware-1.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- xorg-x11-drv-ati.spec	2 Dec 2009 02:54:32 -0000	1.188
+++ xorg-x11-drv-ati.spec	2 Dec 2009 03:58:17 -0000	1.189
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.17.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.18.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: %{tarball}-%{gitdate}.tar.xz
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
+Source2:    radeon-rlc-firmware-1.tar.bz2
 
 Patch2:     radeon-ums-displayport.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
@@ -43,8 +44,14 @@ Obsoletes: xorg-x11-drv-avivo <= 0.0.2
 %description 
 X.Org X11 ati video driver.
 
+%package firmware
+Summary: ATI firmware for R600 RLC
+
+%description firmware
+Firmware for ATI R600/R700 IRQs
+
 %prep
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{gitdate} -a 2
 %patch2 -p1 -b .dp
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
@@ -67,6 +74,9 @@ install -m 0644 radeon.xinf $RPM_BUILD_R
 
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+%{__mkdir_p} %{buildroot}/lib/firmware/radeon
+%{__install} -p -m 0644 *.bin %{buildroot}/lib/firmware/radeon/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,7 +91,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/ati.4*
 %{_mandir}/man4/radeon.4*
 
+%files firmware
+%defattr(-,root,root,-)
+%doc LICENSE.radeon.firmware
+/lib/firmware/radeon/*.bin
+
 %changelog
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091201git88a50a30d
+- add R600 RLC firmware for IRQ handling
+
 * Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.17.20091201git88a50a30d
 - ums displayport + bump libdrm requires for new function needed
 



From mathstuf at fedoraproject.org  Wed Dec  2 04:25:49 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed,  2 Dec 2009 04:25:49 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.80-findqt4-typo.patch, NONE,
	1.1 kdelibs.spec, 1.539, 1.540
Message-ID: <20091202042549.CD62811C0095@cvs1.fedora.phx.redhat.com>

Author: mathstuf

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.80-findqt4-typo.patch 
Log Message:
Backport patch to fix a typo in FindQt4; needed for kdeedu

kdelibs-4.3.80-findqt4-typo.patch:
 FindQt4.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.80-findqt4-typo.patch ---
Index: cmake/modules/FindQt4.cmake
===================================================================
--- cmake/modules/FindQt4.cmake	(revision 1057263)
+++ cmake/modules/FindQt4.cmake	(revision 1057264)
@@ -858,7 +858,7 @@
 
   FIND_LIBRARY(QT_PHONON_LIBRARY NAMES phonon phonon4 phonon_debug phonond4    PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
-  FIND_LIBRARY(QT_QTSCRIPTTOOLS_LIBRARY NAMES QtXmlPatterns QtXmlPatterns_debug QtXmlPatterns4 QtXmlPatternsd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTSCRIPTTOOLS_LIBRARY NAMES QtScriptTools QtScriptTools_debug QtScriptTools4 QtScriptToolsd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
   IF(MSVC)
     FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE        NAMES QtCore4                PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -p -r1.539 -r1.540
--- kdelibs.spec	25 Nov 2009 16:38:28 -0000	1.539
+++ kdelibs.spec	2 Dec 2009 04:25:48 -0000	1.540
@@ -82,6 +82,8 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # workaound for low-mem systems (ppc64), tracking here (for now),
 # https://bugzilla.redhat.com/show_bug.cgi?id=539697
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
+# Backport fix, needed for kdeedu (kde-packager list)
+Patch100: kdelibs-4.3.80-findqt4-typo.patch
 
 # upstream
 # kubuntu working to upstream this



From pbrobinson at fedoraproject.org  Wed Dec  2 04:37:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 04:37:52 +0000 (UTC)
Subject: File evolution-couchdb-0.3.4.tar.bz2 uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091202043752.6677110F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for evolution-couchdb:

714cec98d1800a9683bcd1f92815639b  evolution-couchdb-0.3.4.tar.bz2



From pbrobinson at fedoraproject.org  Wed Dec  2 04:40:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 04:40:27 +0000 (UTC)
Subject: rpms/evolution-couchdb/devel .cvsignore, 1.3,
	1.4 evolution-couchdb.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091202044027.D48D411C03FC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/evolution-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1988

Modified Files:
	.cvsignore evolution-couchdb.spec sources 
Log Message:
- Update to 0.3.4 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Nov 2009 11:50:37 -0000	1.3
+++ .cvsignore	2 Dec 2009 04:40:27 -0000	1.4
@@ -1 +1 @@
-evolution-couchdb-0.3.3.tar.bz2
+evolution-couchdb-0.3.4.tar.bz2


Index: evolution-couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/devel/evolution-couchdb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- evolution-couchdb.spec	19 Nov 2009 11:50:37 -0000	1.2
+++ evolution-couchdb.spec	2 Dec 2009 04:40:27 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           evolution-couchdb
-Version:        0.3.3
+Version:        0.3.4
 Release:        1%{?dist}
 Summary:        An evolution backend to CouchDBs for PIM information
 
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_libdir}/evolution/2.28/plugins/org-gnome-evolution-couchdb.eplug
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.4-1
+- Update to 0.3.4 upstream release
+
 * Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.3-1
 - Update to 0.3.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Nov 2009 11:50:37 -0000	1.3
+++ sources	2 Dec 2009 04:40:27 -0000	1.4
@@ -1 +1 @@
-80ad665e9df064e5306b6829560575b0  evolution-couchdb-0.3.3.tar.bz2
+714cec98d1800a9683bcd1f92815639b  evolution-couchdb-0.3.4.tar.bz2



From huzaifas at fedoraproject.org  Wed Dec  2 04:49:24 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  2 Dec 2009 04:49:24 +0000 (UTC)
Subject: File gnumeric-1.9.16.tar.gz uploaded to lookaside cache by huzaifas
Message-ID: <20091202044924.41D5510F899@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnumeric:

ee24fef7ade0335f6f4b6bc58d9d072c  gnumeric-1.9.16.tar.gz



From mathstuf at fedoraproject.org  Wed Dec  2 04:50:38 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Wed,  2 Dec 2009 04:50:38 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.540,1.541
Message-ID: <20091202045038.4D17511C03E3@cvs1.fedora.phx.redhat.com>

Author: mathstuf

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

Modified Files:
	kdelibs.spec 
Log Message:
- KDE 4.4 beta1 (4.3.80)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -p -r1.540 -r1.541
--- kdelibs.spec	2 Dec 2009 04:25:48 -0000	1.540
+++ kdelibs.spec	2 Dec 2009 04:50:37 -0000	1.541
@@ -1,15 +1,14 @@
 %define phonon_ver 4.3.1
 %define soprano_ver 2.3.0
 %define strigi_ver 0.7
-%define alphatag svn1048496
 
 %if 0%{?fedora} > 11
 %define soprano_ver 2.3.1
 %endif
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.75
-Release: 0.2.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -82,8 +81,6 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # workaound for low-mem systems (ppc64), tracking here (for now),
 # https://bugzilla.redhat.com/show_bug.cgi?id=539697
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
-# Backport fix, needed for kdeedu (kde-packager list)
-Patch100: kdelibs-4.3.80-findqt4-typo.patch
 
 # upstream
 # kubuntu working to upstream this
@@ -216,6 +213,7 @@ format for easy browsing.
 %patch24 -p1 -b .drkonq
 %endif
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
+%patch100 -p0 -b findqt4-typo
 
 # upstream patches
 %patch50 -p1 -b .kaction_qt_keys
@@ -413,6 +411,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Wed Nov 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.75-0.2.svn1048496
 - -devel: Provides: kdelibs4-devel%{?_isa} ...
 - Obsoletes: kdelibs-experimental(-devel) < 4.3.75



From pbrobinson at fedoraproject.org  Wed Dec  2 04:50:41 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 04:50:41 +0000 (UTC)
Subject: rpms/evolution-couchdb/F-12 .cvsignore, 1.3,
	1.4 evolution-couchdb.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091202045041.96F0811C03E3@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/evolution-couchdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4172

Modified Files:
	.cvsignore evolution-couchdb.spec sources 
Log Message:
- Update to 0.3.4 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Nov 2009 11:53:37 -0000	1.3
+++ .cvsignore	2 Dec 2009 04:50:41 -0000	1.4
@@ -1 +1 @@
-evolution-couchdb-0.3.3.tar.bz2
+evolution-couchdb-0.3.4.tar.bz2


Index: evolution-couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/F-12/evolution-couchdb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- evolution-couchdb.spec	19 Nov 2009 11:53:37 -0000	1.2
+++ evolution-couchdb.spec	2 Dec 2009 04:50:41 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           evolution-couchdb
-Version:        0.3.3
+Version:        0.3.4
 Release:        1%{?dist}
 Summary:        An evolution backend to CouchDBs for PIM information
 
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_libdir}/evolution/2.28/plugins/org-gnome-evolution-couchdb.eplug
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.4-1
+- Update to 0.3.4 upstream release
+
 * Thu Nov 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.3-1
 - Update to 0.3.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Nov 2009 11:53:38 -0000	1.3
+++ sources	2 Dec 2009 04:50:41 -0000	1.4
@@ -1 +1 @@
-80ad665e9df064e5306b6829560575b0  evolution-couchdb-0.3.3.tar.bz2
+714cec98d1800a9683bcd1f92815639b  evolution-couchdb-0.3.4.tar.bz2



From huzaifas at fedoraproject.org  Wed Dec  2 05:00:26 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  2 Dec 2009 05:00:26 +0000 (UTC)
Subject: File gnumeric-1.9.16.tar.bz2 uploaded to lookaside cache by huzaifas
Message-ID: <20091202050026.BB42110F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnumeric:

9a55644196b0edbc638da97173983c1d  gnumeric-1.9.16.tar.bz2



From huzaifas at fedoraproject.org  Wed Dec  2 05:01:42 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  2 Dec 2009 05:01:42 +0000 (UTC)
Subject: rpms/gnumeric/devel .cvsignore, 1.8, 1.9 gnumeric.spec, 1.48,
	1.49 sources, 1.8, 1.9 gnumeric-1.8.1-gnomedb-vercheck.patch,
	1.1, NONE gnumeric-1.8.2-python.patch, 1.1,
	NONE gnumeric-1.8.4-backport-20090129.patch, 1.1,
	NONE gnumeric-1.8.4-backport-20090309.patch, 1.1,
	NONE gnumeric-1.8.4-backport-20090314.patch, 1.1,
	NONE gnumeric-1.8.4-backport-20090430.patch, 1.1,
	NONE gnumeric-1.8.4-desktop.patch, 1.1, NONE
Message-ID: <20091202050142.C7DD711C0095@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Modified Files:
	.cvsignore gnumeric.spec sources 
Removed Files:
	gnumeric-1.8.1-gnomedb-vercheck.patch 
	gnumeric-1.8.2-python.patch 
	gnumeric-1.8.4-backport-20090129.patch 
	gnumeric-1.8.4-backport-20090309.patch 
	gnumeric-1.8.4-backport-20090314.patch 
	gnumeric-1.8.4-backport-20090430.patch 
	gnumeric-1.8.4-desktop.patch 
Log Message:
update to the latest 1.9.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Apr 2009 22:26:04 -0000	1.8
+++ .cvsignore	2 Dec 2009 05:01:42 -0000	1.9
@@ -1 +1 @@
-gnumeric-1.8.4.tar.bz2
+gnumeric-1.9.16.tar.bz2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gnumeric.spec	20 Oct 2009 22:30:08 -0000	1.48
+++ gnumeric.spec	2 Dec 2009 05:01:42 -0000	1.49
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
-Version:          1.8.4
-Release:          5%{?dist}
+Version:          1.9.16
+Release:          1%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -9,20 +9,13 @@ Group:            Applications/Productiv
 License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
-Patch0:		  gnumeric-1.8.4-desktop.patch
-Patch1:           gnumeric-1.8.1-gnomedb-vercheck.patch
-Patch2:		  gnumeric-1.8.2-python.patch
-Patch3:		  gnumeric-1.8.4-backport-20090129.patch
-Patch4:		  gnumeric-1.8.4-backport-20090309.patch
-Patch5:		  gnumeric-1.8.4-backport-20090314.patch
-Patch6:		  gnumeric-1.8.4-backport-20090430.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
 BuildRequires:    libgsf-gnome-devel >= 1.13.2
 #BuildRequires:    libgnomedb-devel >= 3.0.0
 BuildRequires:    pygtk2-devel >= 2.6.0
-BuildRequires:    goffice-devel >= 0.6.1
+BuildRequires:    goffice-devel >= 0.7
 BuildRequires:    python-devel guile-devel perl(XML::Parser) scrollkeeper
 BuildRequires:    gettext desktop-file-utils perl(ExtUtils::Embed) intltool
 Requires:         scrollkeeper hicolor-icon-theme
@@ -64,13 +57,6 @@ This package contains the following addi
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
-%patch1 -p1
-%patch2 -p1 -b .new
-%patch3 -p1 -b backport-20090129
-%patch4 -p1 -b backport-20090309
-%patch5 -p1 -b backport-20090314
-%patch6 -p1 -b backport-20090430
 
 chmod -x plugins/excel/rc4.?
 
@@ -101,7 +87,7 @@ desktop-file-install --vendor fedora --d
 
 #put icon in the proper place
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT/usr/share/pixmaps/gnome-%{name}.png \
+mv $RPM_BUILD_ROOT/usr/share/pixmaps/gnome-application-x-gnumeric.png \
   $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{name}.png
 
 #remove unused mime type icons
@@ -116,8 +102,9 @@ rm $RPM_BUILD_ROOT/usr/share/pixmaps/%{n
 rm -rf $RPM_BUILD_ROOT/var
 
 #remove .la files
-rm $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}/plugins/*/*.la
+#rm $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
+#rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}/plugins/*/*.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %clean
@@ -169,15 +156,18 @@ fi
 %{_libdir}/libspreadsheet-%{version}.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/%{version}
-%exclude %{_libdir}/%{name}/%{version}/include
 %exclude %{_libdir}/%{name}/%{version}/plugins/perl-*
 #%exclude %{_libdir}/%{name}/%{version}/plugins/gdaif
 #%exclude %{_libdir}/%{name}/%{version}/plugins/gnome-db
 %{_datadir}/pixmaps/%{name}
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{version}
-%exclude %{_datadir}/%{name}/%{version}/idl
 %{_datadir}/applications/fedora-%{name}.desktop
 # The actual omf file is in gnumeric.lang, but find-lang doesn't own the dir!
 %dir %{_datadir}/omf/%{name}
@@ -185,20 +175,23 @@ fi
 
 %files devel
 %defattr(-,root,root)
-%{_datadir}/%{name}/%{version}/idl
 %{_libdir}/libspreadsheet.so
-%{_libdir}/pkgconfig/libspreadsheet-1.8.pc
-%{_includedir}/libspreadsheet-1.8
-%{_libdir}/%{name}/%{version}/include
+%{_libdir}/pkgconfig/libspreadsheet-1.10.pc
+%{_includedir}/libspreadsheet-1.10
 
 %files plugins-extras
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/plugins/perl-*
+%{_libdir}/goffice/0.7.16/plugins/gnumeric/gnumeric.so
+%{_libdir}/goffice/0.7.16/plugins/gnumeric/plugin.xml
 #%{_libdir}/%{name}/%{version}/plugins/gdaif
 #%{_libdir}/%{name}/%{version}/plugins/gnome-db
 
 
 %changelog
+* Mon Nov 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.9.16-1
+- New upstream
+
 * Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> 1:1.8.4-5
 - Applied 4 patches from the 1.8 stable branch (#500890, #505001)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Apr 2009 22:26:04 -0000	1.8
+++ sources	2 Dec 2009 05:01:42 -0000	1.9
@@ -1 +1 @@
-338f0084f04a16f78797ad01f85d3251  gnumeric-1.8.4.tar.bz2
+9a55644196b0edbc638da97173983c1d  gnumeric-1.9.16.tar.bz2


--- gnumeric-1.8.1-gnomedb-vercheck.patch DELETED ---


--- gnumeric-1.8.2-python.patch DELETED ---


--- gnumeric-1.8.4-backport-20090129.patch DELETED ---


--- gnumeric-1.8.4-backport-20090309.patch DELETED ---


--- gnumeric-1.8.4-backport-20090314.patch DELETED ---


--- gnumeric-1.8.4-backport-20090430.patch DELETED ---


--- gnumeric-1.8.4-desktop.patch DELETED ---



From dwayne at fedoraproject.org  Wed Dec  2 05:06:09 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Wed,  2 Dec 2009 05:06:09 +0000 (UTC)
Subject: rpms/virtaal/F-12 virtaal.spec,1.14,1.15
Message-ID: <20091202050609.D3DB911C0095@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8097

Modified Files:
	virtaal.spec 
Log Message:
Fix typo in postun



Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/virtaal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- virtaal.spec	27 Nov 2009 13:13:41 -0000	1.14
+++ virtaal.spec	2 Dec 2009 05:06:09 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           virtaal
 Version:        0.5.0
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
@@ -135,7 +135,7 @@ touch --no-create %{_datadir}/icons/hico
 %postun
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-ff [ $1 -eq 0 ] ; then
+if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
@@ -163,6 +163,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 2 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.2.rc1
+- Fix typo in postun
+
 * Fri Nov 27 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.1.rc1
 - Update to 0.5.0 rc1
    - Autoterm: Virtaal can now automatically download terminology files



From pbrobinson at fedoraproject.org  Wed Dec  2 05:57:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 05:57:29 +0000 (UTC)
Subject: rpms/gupnp-av/F-12 .cvsignore, 1.7, 1.8 gupnp-av.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <20091202055729.8247B11C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18460

Modified Files:
	.cvsignore gupnp-av.spec sources 
Log Message:
- Update to 0.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Sep 2009 13:29:36 -0000	1.7
+++ .cvsignore	2 Dec 2009 05:57:27 -0000	1.8
@@ -1 +1 @@
-gupnp-av-0.5.1.tar.gz
+gupnp-av-0.5.2.tar.gz


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-12/gupnp-av.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gupnp-av.spec	17 Sep 2009 16:36:17 -0000	1.15
+++ gupnp-av.spec	2 Dec 2009 05:57:28 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           gupnp-av
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        A collection of helpers for building UPnP AV applications
 
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Sat Nov 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.2-1
+- Update to 0.5.2
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.5.1-1
 - Update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Sep 2009 13:29:36 -0000	1.7
+++ sources	2 Dec 2009 05:57:28 -0000	1.8
@@ -1 +1 @@
-315b184e4aae9a7a687f3e9689d649b3  gupnp-av-0.5.1.tar.gz
+15ccfbb17553bf1cb00bf8e1d801005e  gupnp-av-0.5.2.tar.gz



From pbrobinson at fedoraproject.org  Wed Dec  2 06:16:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:16:05 +0000 (UTC)
Subject: File xapian-bindings-1.0.17.tar.gz uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091202061605.BC97C10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xapian-bindings:

0fbb4d2b80eb5143ef3378f45f86a952  xapian-bindings-1.0.17.tar.gz



From pbrobinson at fedoraproject.org  Wed Dec  2 06:16:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:16:06 +0000 (UTC)
Subject: File xapian-core-1.0.17.tar.gz uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091202061606.BB7C910F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xapian-core:

455b50c24fc65ae51c38ae67167903c5  xapian-core-1.0.17.tar.gz



From pbrobinson at fedoraproject.org  Wed Dec  2 06:17:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:17:43 +0000 (UTC)
Subject: rpms/xapian-bindings/devel .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 xapian-bindings.spec, 1.26, 1.27
Message-ID: <20091202061743.B6D3011C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22856

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	19 Sep 2009 16:05:01 -0000	1.13
+++ .cvsignore	2 Dec 2009 06:17:42 -0000	1.14
@@ -1 +1 @@
-xapian-bindings-1.0.16.tar.gz
+xapian-bindings-1.0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	19 Sep 2009 16:05:01 -0000	1.14
+++ sources	2 Dec 2009 06:17:42 -0000	1.15
@@ -1 +1 @@
-c330b2ccc451c890916c44446e148f07  xapian-bindings-1.0.16.tar.gz
+0fbb4d2b80eb5143ef3378f45f86a952  xapian-bindings-1.0.17.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xapian-bindings.spec	19 Sep 2009 16:05:01 -0000	1.26
+++ xapian-bindings.spec	2 Dec 2009 06:17:42 -0000	1.27
@@ -3,7 +3,7 @@
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
 
 Name:          xapian-bindings
-Version:       1.0.16
+Version:       1.0.17
 Release:       1%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/xapian.rb
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-1
+- Update to 1.0.17
+
 * Sat Sep 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.16-1
 - Update to 1.0.16, some spec file cleanups
 



From pbrobinson at fedoraproject.org  Wed Dec  2 06:17:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:17:53 +0000 (UTC)
Subject: rpms/xapian-core/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xapian-core.spec, 1.27, 1.28
Message-ID: <20091202061753.56BD311C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22917

Modified Files:
	.cvsignore sources xapian-core.spec 
Log Message:
- Update to 1.0.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Sep 2009 16:01:14 -0000	1.15
+++ .cvsignore	2 Dec 2009 06:17:52 -0000	1.16
@@ -1 +1 @@
-xapian-core-1.0.16.tar.gz
+xapian-core-1.0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Sep 2009 16:01:14 -0000	1.15
+++ sources	2 Dec 2009 06:17:53 -0000	1.16
@@ -1 +1 @@
-19756e128d804faa6e7975a629ca3b70  xapian-core-1.0.16.tar.gz
+455b50c24fc65ae51c38ae67167903c5  xapian-core-1.0.17.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/xapian-core.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xapian-core.spec	19 Sep 2009 16:01:14 -0000	1.27
+++ xapian-core.spec	2 Dec 2009 06:17:53 -0000	1.28
@@ -1,5 +1,5 @@
 Name:          xapian-core
-Version:       1.0.16
+Version:       1.0.17
 Release:       1%{?dist}
 Summary:       The Xapian Probabilistic Information Retrieval Library
 
@@ -116,6 +116,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.17-1
+- Update to 1.0.17
+
 * Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
 - Update to 1.0.16, some spec file cleanups
 



From kkofler at fedoraproject.org  Wed Dec  2 06:22:30 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  2 Dec 2009 06:22:30 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.541,1.542
Message-ID: <20091202062230.600A011C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdelibs.spec 
Log Message:
Readd missing Patch100: declaration.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -p -r1.541 -r1.542
--- kdelibs.spec	2 Dec 2009 04:50:37 -0000	1.541
+++ kdelibs.spec	2 Dec 2009 06:22:29 -0000	1.542
@@ -85,6 +85,8 @@ Patch26: kdelibs-4.3.3-khtml_svg_no_var_
 # upstream
 # kubuntu working to upstream this
 Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff
+# Backport fix, needed for kdeedu (kde-packager list)
+Patch100: kdelibs-4.3.80-findqt4-typo.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch



From pbrobinson at fedoraproject.org  Wed Dec  2 06:30:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:30:34 +0000 (UTC)
Subject: rpms/xapian-core/F-12 .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xapian-core.spec, 1.27, 1.28
Message-ID: <20091202063034.D214311C02C9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25534

Modified Files:
	.cvsignore sources xapian-core.spec 
Log Message:
- Update to 1.0.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Sep 2009 16:01:14 -0000	1.15
+++ .cvsignore	2 Dec 2009 06:30:34 -0000	1.16
@@ -1 +1 @@
-xapian-core-1.0.16.tar.gz
+xapian-core-1.0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Sep 2009 16:01:14 -0000	1.15
+++ sources	2 Dec 2009 06:30:34 -0000	1.16
@@ -1 +1 @@
-19756e128d804faa6e7975a629ca3b70  xapian-core-1.0.16.tar.gz
+455b50c24fc65ae51c38ae67167903c5  xapian-core-1.0.17.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-12/xapian-core.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xapian-core.spec	19 Sep 2009 16:01:14 -0000	1.27
+++ xapian-core.spec	2 Dec 2009 06:30:34 -0000	1.28
@@ -1,5 +1,5 @@
 Name:          xapian-core
-Version:       1.0.16
+Version:       1.0.17
 Release:       1%{?dist}
 Summary:       The Xapian Probabilistic Information Retrieval Library
 
@@ -116,6 +116,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.17-1
+- Update to 1.0.17
+
 * Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
 - Update to 1.0.16, some spec file cleanups
 



From pbrobinson at fedoraproject.org  Wed Dec  2 06:33:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:33:26 +0000 (UTC)
Subject: rpms/xapian-core/F-11 .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 xapian-core.spec, 1.25, 1.26
Message-ID: <20091202063326.CD66311C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26406

Modified Files:
	.cvsignore sources xapian-core.spec 
Log Message:
- Update to 1.0.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	19 Sep 2009 16:07:48 -0000	1.13
+++ .cvsignore	2 Dec 2009 06:33:24 -0000	1.14
@@ -1 +1 @@
-xapian-core-1.0.16.tar.gz
+xapian-core-1.0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	19 Sep 2009 16:07:48 -0000	1.13
+++ sources	2 Dec 2009 06:33:26 -0000	1.14
@@ -1 +1 @@
-19756e128d804faa6e7975a629ca3b70  xapian-core-1.0.16.tar.gz
+455b50c24fc65ae51c38ae67167903c5  xapian-core-1.0.17.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/xapian-core.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xapian-core.spec	19 Sep 2009 16:07:48 -0000	1.25
+++ xapian-core.spec	2 Dec 2009 06:33:26 -0000	1.26
@@ -1,5 +1,5 @@
 Name:          xapian-core
-Version:       1.0.16
+Version:       1.0.17
 Release:       1%{?dist}
 Summary:       The Xapian Probabilistic Information Retrieval Library
 
@@ -116,6 +116,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.17-1
+- Update to 1.0.17
+
 * Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
 - Update to 1.0.16, some spec file cleanups
 



From pbrobinson at fedoraproject.org  Wed Dec  2 06:33:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:33:54 +0000 (UTC)
Subject: rpms/xapian-bindings/F-12 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 xapian-bindings.spec, 1.26, 1.27
Message-ID: <20091202063354.6599211C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26585

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	19 Sep 2009 16:05:01 -0000	1.13
+++ .cvsignore	2 Dec 2009 06:33:54 -0000	1.14
@@ -1 +1 @@
-xapian-bindings-1.0.16.tar.gz
+xapian-bindings-1.0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	19 Sep 2009 16:05:01 -0000	1.14
+++ sources	2 Dec 2009 06:33:54 -0000	1.15
@@ -1 +1 @@
-c330b2ccc451c890916c44446e148f07  xapian-bindings-1.0.16.tar.gz
+0fbb4d2b80eb5143ef3378f45f86a952  xapian-bindings-1.0.17.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-12/xapian-bindings.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xapian-bindings.spec	19 Sep 2009 16:05:01 -0000	1.26
+++ xapian-bindings.spec	2 Dec 2009 06:33:54 -0000	1.27
@@ -3,7 +3,7 @@
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
 
 Name:          xapian-bindings
-Version:       1.0.16
+Version:       1.0.17
 Release:       1%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/xapian.rb
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-1
+- Update to 1.0.17
+
 * Sat Sep 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.16-1
 - Update to 1.0.16, some spec file cleanups
 



From pbrobinson at fedoraproject.org  Wed Dec  2 06:34:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:34:23 +0000 (UTC)
Subject: rpms/xapian-bindings/F-11 .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 xapian-bindings.spec, 1.22, 1.23
Message-ID: <20091202063423.F283911C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26768

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	19 Sep 2009 16:36:11 -0000	1.11
+++ .cvsignore	2 Dec 2009 06:34:23 -0000	1.12
@@ -1 +1 @@
-xapian-bindings-1.0.16.tar.gz
+xapian-bindings-1.0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Sep 2009 16:36:11 -0000	1.12
+++ sources	2 Dec 2009 06:34:23 -0000	1.13
@@ -1 +1 @@
-c330b2ccc451c890916c44446e148f07  xapian-bindings-1.0.16.tar.gz
+0fbb4d2b80eb5143ef3378f45f86a952  xapian-bindings-1.0.17.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/xapian-bindings.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xapian-bindings.spec	19 Sep 2009 16:36:11 -0000	1.22
+++ xapian-bindings.spec	2 Dec 2009 06:34:23 -0000	1.23
@@ -3,7 +3,7 @@
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
 
 Name:          xapian-bindings
-Version:       1.0.16
+Version:       1.0.17
 Release:       1%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/xapian.rb
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-1
+- Update to 1.0.17
+
 * Sat Sep 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.16-1
 - Update to 1.0.16, some spec file cleanups
 



From pbrobinson at fedoraproject.org  Wed Dec  2 06:43:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:43:15 +0000 (UTC)
Subject: rpms/xapian-bindings/devel xapian-bindings.spec,1.27,1.28
Message-ID: <20091202064315.C6D4011C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28723

Modified Files:
	xapian-bindings.spec 
Log Message:
- Drop upstreamed patch


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xapian-bindings.spec	2 Dec 2009 06:17:42 -0000	1.27
+++ xapian-bindings.spec	2 Dec 2009 06:43:15 -0000	1.28
@@ -4,14 +4,13 @@
 
 Name:          xapian-bindings
 Version:       1.0.17
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
 Group:         Development/Libraries
 License:       GPLv2+
 URL:           http://www.xapian.org/
 Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0:        xapian-bindings-Makefile-fix.patch
 Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel >= 2.2
@@ -47,7 +46,6 @@ files needed for developing Ruby scripts
 
 %prep
 %setup -q
-%patch0 -p1 -b .Makefile-fix
 
 %build
 %configure --with-python --with-ruby
@@ -77,6 +75,9 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/xapian.rb
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-2
+- Drop upstreamed patch
+
 * Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-1
 - Update to 1.0.17
 



From pbrobinson at fedoraproject.org  Wed Dec  2 06:52:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:52:11 +0000 (UTC)
Subject: rpms/xapian-bindings/devel xapian-bindings-Makefile-fix.patch, 1.1, 
	NONE
Message-ID: <20091202065211.BBE2711C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30426

Removed Files:
	xapian-bindings-Makefile-fix.patch 
Log Message:
- remove old patch


--- xapian-bindings-Makefile-fix.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Dec  2 06:52:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:52:58 +0000 (UTC)
Subject: rpms/xapian-bindings/F-12 xapian-bindings.spec, 1.27,
	1.28 xapian-bindings-Makefile-fix.patch, 1.1, NONE
Message-ID: <20091202065258.2E1A911C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30645

Modified Files:
	xapian-bindings.spec 
Removed Files:
	xapian-bindings-Makefile-fix.patch 
Log Message:
- Drop upstreamed patch


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-12/xapian-bindings.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xapian-bindings.spec	2 Dec 2009 06:33:54 -0000	1.27
+++ xapian-bindings.spec	2 Dec 2009 06:52:58 -0000	1.28
@@ -4,14 +4,13 @@
 
 Name:          xapian-bindings
 Version:       1.0.17
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
 Group:         Development/Libraries
 License:       GPLv2+
 URL:           http://www.xapian.org/
 Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0:        xapian-bindings-Makefile-fix.patch
 Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel >= 2.2
@@ -47,7 +46,6 @@ files needed for developing Ruby scripts
 
 %prep
 %setup -q
-%patch0 -p1 -b .Makefile-fix
 
 %build
 %configure --with-python --with-ruby
@@ -77,6 +75,9 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/xapian.rb
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-2
+- Drop upstreamed patch
+
 * Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-1
 - Update to 1.0.17
 


--- xapian-bindings-Makefile-fix.patch DELETED ---



From dsommers at fedoraproject.org  Wed Dec  2 06:59:04 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Wed,  2 Dec 2009 06:59:04 +0000 (UTC)
Subject: File python-dmidecode-3.10.7.tar.gz uploaded to lookaside cache by
	dsommers
Message-ID: <20091202065904.2097C10F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-dmidecode:

22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz



From pbrobinson at fedoraproject.org  Wed Dec  2 06:59:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 06:59:00 +0000 (UTC)
Subject: rpms/xapian-bindings/F-11 xapian-bindings.spec, 1.23,
	1.24 xapian-bindings-Makefile-fix.patch, 1.1, NONE
Message-ID: <20091202065900.07CED11C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31800

Modified Files:
	xapian-bindings.spec 
Removed Files:
	xapian-bindings-Makefile-fix.patch 
Log Message:
- Drop upstreamed patch


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/xapian-bindings.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xapian-bindings.spec	2 Dec 2009 06:34:23 -0000	1.23
+++ xapian-bindings.spec	2 Dec 2009 06:58:59 -0000	1.24
@@ -4,14 +4,13 @@
 
 Name:          xapian-bindings
 Version:       1.0.17
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Bindings for the Xapian Probabilistic Information Retrieval Library
 
 Group:         Development/Libraries
 License:       GPLv2+
 URL:           http://www.xapian.org/
 Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0:        xapian-bindings-Makefile-fix.patch
 Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel >= 2.2
@@ -47,7 +46,6 @@ files needed for developing Ruby scripts
 
 %prep
 %setup -q
-%patch0 -p1 -b .Makefile-fix
 
 %build
 %configure --with-python --with-ruby
@@ -77,6 +75,9 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/xapian.rb
 
 %changelog
+* Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-2
+- Drop upstreamed patch
+
 * Wed Dec  2 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.17-1
 - Update to 1.0.17
 


--- xapian-bindings-Makefile-fix.patch DELETED ---



From dsommers at fedoraproject.org  Wed Dec  2 06:59:51 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Wed,  2 Dec 2009 06:59:51 +0000 (UTC)
Subject: rpms/python-dmidecode/devel import.log, NONE,
	1.1 python-dmidecode.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091202065951.DCB5411C0095@cvs1.fedora.phx.redhat.com>

Author: dsommers

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-dmidecode.spec 
Log Message:
Imported python-dmidecode-3.10.7



--- NEW FILE import.log ---
python-dmidecode-3_10_7-3_fc11:HEAD:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737152


--- NEW FILE python-dmidecode.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_ver: %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Summary: Python module to access DMI data
Name: python-dmidecode
Version: 3.10.7
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://projects.autonomy.net.au/python-dmidecode/
Source0: http://src.autonomy.net.au/python-dmidecode/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: libxml2-python
BuildRequires: libxml2-python
BuildRequires: libxml2-devel
BuildRequires: python-devel

%description
python-dmidecode is a python extension module that uses the
code-base of the 'dmidecode' utility, and presents the data
as python data structures or as XML data using libxml2.

%prep
%setup -q

%build
make build

%install
rm -rf $RPM_BUILD_ROOT
python src/setup.py install --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README doc/README.upstream doc/LICENSE doc/AUTHORS doc/AUTHORS.upstream
%{python_sitearch}/dmidecodemod.so
%{python_sitearch}/dmidecode.py
%{python_sitearch}/dmidecode.py[co]
%if "%{python_ver}" >= "2.5"
%{python_sitearch}/*.egg-info
%endif
%{_datadir}/python-dmidecode/

%changelog
* Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
- Fixed even more .spec file issues and removed explicit mentioning
  of /usr/share/python-dmidecode/pymap.xml

* Wed Nov 25 2009 David Sommerseth <davids at redhat.com> - 3.10.7-2
- Fixed some .spec file issues (proper Requires, use _datadir macro)

* Wed Sep 23 2009 Nima Talebi <nima at it.net.au> - 3.10.7-1
- Updated source0 to new 3.10.7 tar ball

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-6
- Only build the python-dmidecode module, not everything

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-5
- Added missing BuildRequres for libxml2-python

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-4
- Added missing BuildRequres for python-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-3
- Added missing BuildRequres for libxml2-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-2
- Updated release, to avoid build conflict

* Wed Jun 10 2009 David Sommerseth <davids at redhat.com> - 3.10.6-1
- Updated to work with the new XML based python-dmidecode

* Sat Mar  7 2009 Clark Williams <williams at redhat.com> - 2.10.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:46:48 -0000	1.1
+++ .cvsignore	2 Dec 2009 06:59:51 -0000	1.2
@@ -0,0 +1 @@
+python-dmidecode-3.10.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:46:48 -0000	1.1
+++ sources	2 Dec 2009 06:59:51 -0000	1.2
@@ -0,0 +1 @@
+22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz



From dsommers at fedoraproject.org  Wed Dec  2 07:07:58 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Wed,  2 Dec 2009 07:07:58 +0000 (UTC)
Subject: rpms/python-dmidecode/F-11 import.log, NONE,
	1.1 python-dmidecode.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091202070758.BE38411C0095@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1624/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-dmidecode.spec 
Log Message:
Imported python-dmidecode-3.10.7 to F-11



--- NEW FILE import.log ---
python-dmidecode-3_10_7-3_fc11:F-11:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737645


--- NEW FILE python-dmidecode.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_ver: %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Summary: Python module to access DMI data
Name: python-dmidecode
Version: 3.10.7
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://projects.autonomy.net.au/python-dmidecode/
Source0: http://src.autonomy.net.au/python-dmidecode/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: libxml2-python
BuildRequires: libxml2-python
BuildRequires: libxml2-devel
BuildRequires: python-devel

%description
python-dmidecode is a python extension module that uses the
code-base of the 'dmidecode' utility, and presents the data
as python data structures or as XML data using libxml2.

%prep
%setup -q

%build
make build

%install
rm -rf $RPM_BUILD_ROOT
python src/setup.py install --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README doc/README.upstream doc/LICENSE doc/AUTHORS doc/AUTHORS.upstream
%{python_sitearch}/dmidecodemod.so
%{python_sitearch}/dmidecode.py
%{python_sitearch}/dmidecode.py[co]
%if "%{python_ver}" >= "2.5"
%{python_sitearch}/*.egg-info
%endif
%{_datadir}/python-dmidecode/

%changelog
* Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
- Fixed even more .spec file issues and removed explicit mentioning
  of /usr/share/python-dmidecode/pymap.xml

* Wed Nov 25 2009 David Sommerseth <davids at redhat.com> - 3.10.7-2
- Fixed some .spec file issues (proper Requires, use _datadir macro)

* Wed Sep 23 2009 Nima Talebi <nima at it.net.au> - 3.10.7-1
- Updated source0 to new 3.10.7 tar ball

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-6
- Only build the python-dmidecode module, not everything

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-5
- Added missing BuildRequres for libxml2-python

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-4
- Added missing BuildRequres for python-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-3
- Added missing BuildRequres for libxml2-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-2
- Updated release, to avoid build conflict

* Wed Jun 10 2009 David Sommerseth <davids at redhat.com> - 3.10.6-1
- Updated to work with the new XML based python-dmidecode

* Sat Mar  7 2009 Clark Williams <williams at redhat.com> - 2.10.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:46:48 -0000	1.1
+++ .cvsignore	2 Dec 2009 07:07:57 -0000	1.2
@@ -0,0 +1 @@
+python-dmidecode-3.10.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:46:48 -0000	1.1
+++ sources	2 Dec 2009 07:07:57 -0000	1.2
@@ -0,0 +1 @@
+22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz



From dsommers at fedoraproject.org  Wed Dec  2 07:09:04 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Wed,  2 Dec 2009 07:09:04 +0000 (UTC)
Subject: rpms/python-dmidecode/F-12 import.log, NONE,
	1.1 python-dmidecode.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091202070904.D663111C0095@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2068/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-dmidecode.spec 
Log Message:
Imported python-dmidecode-3.10.7 to F-12



--- NEW FILE import.log ---
python-dmidecode-3_10_7-3_fc11:F-12:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737718


--- NEW FILE python-dmidecode.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_ver: %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Summary: Python module to access DMI data
Name: python-dmidecode
Version: 3.10.7
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://projects.autonomy.net.au/python-dmidecode/
Source0: http://src.autonomy.net.au/python-dmidecode/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: libxml2-python
BuildRequires: libxml2-python
BuildRequires: libxml2-devel
BuildRequires: python-devel

%description
python-dmidecode is a python extension module that uses the
code-base of the 'dmidecode' utility, and presents the data
as python data structures or as XML data using libxml2.

%prep
%setup -q

%build
make build

%install
rm -rf $RPM_BUILD_ROOT
python src/setup.py install --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README doc/README.upstream doc/LICENSE doc/AUTHORS doc/AUTHORS.upstream
%{python_sitearch}/dmidecodemod.so
%{python_sitearch}/dmidecode.py
%{python_sitearch}/dmidecode.py[co]
%if "%{python_ver}" >= "2.5"
%{python_sitearch}/*.egg-info
%endif
%{_datadir}/python-dmidecode/

%changelog
* Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
- Fixed even more .spec file issues and removed explicit mentioning
  of /usr/share/python-dmidecode/pymap.xml

* Wed Nov 25 2009 David Sommerseth <davids at redhat.com> - 3.10.7-2
- Fixed some .spec file issues (proper Requires, use _datadir macro)

* Wed Sep 23 2009 Nima Talebi <nima at it.net.au> - 3.10.7-1
- Updated source0 to new 3.10.7 tar ball

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-6
- Only build the python-dmidecode module, not everything

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-5
- Added missing BuildRequres for libxml2-python

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-4
- Added missing BuildRequres for python-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-3
- Added missing BuildRequres for libxml2-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-2
- Updated release, to avoid build conflict

* Wed Jun 10 2009 David Sommerseth <davids at redhat.com> - 3.10.6-1
- Updated to work with the new XML based python-dmidecode

* Sat Mar  7 2009 Clark Williams <williams at redhat.com> - 2.10.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:46:48 -0000	1.1
+++ .cvsignore	2 Dec 2009 07:09:03 -0000	1.2
@@ -0,0 +1 @@
+python-dmidecode-3.10.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:46:48 -0000	1.1
+++ sources	2 Dec 2009 07:09:04 -0000	1.2
@@ -0,0 +1 @@
+22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz



From dsommers at fedoraproject.org  Wed Dec  2 07:10:34 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Wed,  2 Dec 2009 07:10:34 +0000 (UTC)
Subject: rpms/python-dmidecode/EL-4 import.log, NONE,
	1.1 python-dmidecode.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091202071034.5E9B711C03FC@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2509/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-dmidecode.spec 
Log Message:
Imported python-dmidecode-3.10.7 to EL-4



--- NEW FILE import.log ---
python-dmidecode-3_10_7-3_fc11:EL-4:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737799


--- NEW FILE python-dmidecode.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_ver: %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Summary: Python module to access DMI data
Name: python-dmidecode
Version: 3.10.7
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://projects.autonomy.net.au/python-dmidecode/
Source0: http://src.autonomy.net.au/python-dmidecode/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: libxml2-python
BuildRequires: libxml2-python
BuildRequires: libxml2-devel
BuildRequires: python-devel

%description
python-dmidecode is a python extension module that uses the
code-base of the 'dmidecode' utility, and presents the data
as python data structures or as XML data using libxml2.

%prep
%setup -q

%build
make build

%install
rm -rf $RPM_BUILD_ROOT
python src/setup.py install --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README doc/README.upstream doc/LICENSE doc/AUTHORS doc/AUTHORS.upstream
%{python_sitearch}/dmidecodemod.so
%{python_sitearch}/dmidecode.py
%{python_sitearch}/dmidecode.py[co]
%if "%{python_ver}" >= "2.5"
%{python_sitearch}/*.egg-info
%endif
%{_datadir}/python-dmidecode/

%changelog
* Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
- Fixed even more .spec file issues and removed explicit mentioning
  of /usr/share/python-dmidecode/pymap.xml

* Wed Nov 25 2009 David Sommerseth <davids at redhat.com> - 3.10.7-2
- Fixed some .spec file issues (proper Requires, use _datadir macro)

* Wed Sep 23 2009 Nima Talebi <nima at it.net.au> - 3.10.7-1
- Updated source0 to new 3.10.7 tar ball

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-6
- Only build the python-dmidecode module, not everything

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-5
- Added missing BuildRequres for libxml2-python

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-4
- Added missing BuildRequres for python-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-3
- Added missing BuildRequres for libxml2-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-2
- Updated release, to avoid build conflict

* Wed Jun 10 2009 David Sommerseth <davids at redhat.com> - 3.10.6-1
- Updated to work with the new XML based python-dmidecode

* Sat Mar  7 2009 Clark Williams <williams at redhat.com> - 2.10.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:46:48 -0000	1.1
+++ .cvsignore	2 Dec 2009 07:10:33 -0000	1.2
@@ -0,0 +1 @@
+python-dmidecode-3.10.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:46:48 -0000	1.1
+++ sources	2 Dec 2009 07:10:34 -0000	1.2
@@ -0,0 +1 @@
+22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz



From dsommers at fedoraproject.org  Wed Dec  2 07:11:39 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Wed,  2 Dec 2009 07:11:39 +0000 (UTC)
Subject: rpms/python-dmidecode/EL-5 import.log, NONE,
	1.1 python-dmidecode.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091202071139.13A2311C0095@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2968/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-dmidecode.spec 
Log Message:
Imported python-dmidecode-3.10.7 to EL-5



--- NEW FILE import.log ---
python-dmidecode-3_10_7-3_fc11:EL-5:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737874


--- NEW FILE python-dmidecode.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_ver: %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Summary: Python module to access DMI data
Name: python-dmidecode
Version: 3.10.7
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://projects.autonomy.net.au/python-dmidecode/
Source0: http://src.autonomy.net.au/python-dmidecode/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: libxml2-python
BuildRequires: libxml2-python
BuildRequires: libxml2-devel
BuildRequires: python-devel

%description
python-dmidecode is a python extension module that uses the
code-base of the 'dmidecode' utility, and presents the data
as python data structures or as XML data using libxml2.

%prep
%setup -q

%build
make build

%install
rm -rf $RPM_BUILD_ROOT
python src/setup.py install --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README doc/README.upstream doc/LICENSE doc/AUTHORS doc/AUTHORS.upstream
%{python_sitearch}/dmidecodemod.so
%{python_sitearch}/dmidecode.py
%{python_sitearch}/dmidecode.py[co]
%if "%{python_ver}" >= "2.5"
%{python_sitearch}/*.egg-info
%endif
%{_datadir}/python-dmidecode/

%changelog
* Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
- Fixed even more .spec file issues and removed explicit mentioning
  of /usr/share/python-dmidecode/pymap.xml

* Wed Nov 25 2009 David Sommerseth <davids at redhat.com> - 3.10.7-2
- Fixed some .spec file issues (proper Requires, use _datadir macro)

* Wed Sep 23 2009 Nima Talebi <nima at it.net.au> - 3.10.7-1
- Updated source0 to new 3.10.7 tar ball

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-6
- Only build the python-dmidecode module, not everything

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-5
- Added missing BuildRequres for libxml2-python

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-4
- Added missing BuildRequres for python-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-3
- Added missing BuildRequres for libxml2-devel

* Wed Jul 13 2009 David Sommerseth <davids at redhat.com> - 3.10.6-2
- Updated release, to avoid build conflict

* Wed Jun 10 2009 David Sommerseth <davids at redhat.com> - 3.10.6-1
- Updated to work with the new XML based python-dmidecode

* Sat Mar  7 2009 Clark Williams <williams at redhat.com> - 2.10.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:46:48 -0000	1.1
+++ .cvsignore	2 Dec 2009 07:11:38 -0000	1.2
@@ -0,0 +1 @@
+python-dmidecode-3.10.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:46:48 -0000	1.1
+++ sources	2 Dec 2009 07:11:38 -0000	1.2
@@ -0,0 +1 @@
+22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz



From airlied at fedoraproject.org  Wed Dec  2 07:34:18 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  2 Dec 2009 07:34:18 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-radeon-misc-fixes.patch, NONE, 1.1 kernel.spec,
	1.1944, 1.1945
Message-ID: <20091202073419.06D2A11C0095@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-misc-fixes.patch 
Log Message:
* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-159
- drm-radeon-misc-fixes.patch: r400 LVDS, r600 digital dpms, cursor fix, tv property


drm-radeon-misc-fixes.patch:
 b/drivers/gpu/drm/radeon/radeon_connectors.c  |    6 ++++++
 b/drivers/gpu/drm/radeon/radeon_encoders.c    |    4 ++--
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c |   11 ++++-------
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c   |   23 ++++++++++++-----------
 4 files changed, 24 insertions(+), 20 deletions(-)

--- NEW FILE drm-radeon-misc-fixes.patch ---
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index ec2f3ff..7ab3c50 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1053,6 +1053,9 @@ radeon_add_atom_connector(struct drm_device *dev,
 			drm_connector_attach_property(&radeon_connector->base,
 						      rdev->mode_info.load_detect_property,
 						      1);
+			drm_connector_attach_property(&radeon_connector->base,
+						      rdev->mode_info.tv_std_property,
+						      1);
 		}
 		break;
 	case DRM_MODE_CONNECTOR_LVDS:
@@ -1193,6 +1196,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
 			drm_connector_attach_property(&radeon_connector->base,
 						      rdev->mode_info.load_detect_property,
 						      1);
+			drm_connector_attach_property(&radeon_connector->base,
+						      rdev->mode_info.tv_std_property,
+						      1);
 		}
 		break;
 	case DRM_MODE_CONNECTOR_LVDS:
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index c27f6bd..291f6dd 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -950,12 +950,12 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
 	if (is_dig) {
 		switch (mode) {
 		case DRM_MODE_DPMS_ON:
-			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE);
+			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT);
 			break;
 		case DRM_MODE_DPMS_STANDBY:
 		case DRM_MODE_DPMS_SUSPEND:
 		case DRM_MODE_DPMS_OFF:
-			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE);
+			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT);
 			break;
 		}
 	} else {
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 6634769..c5c5c02 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -647,12 +647,8 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
 		uint32_t crtc2_gen_cntl;
 		uint32_t disp2_merge_cntl;
 
-		/* check to see if TV DAC is enabled for another crtc and keep it enabled */
-		if (RREG32(RADEON_CRTC2_GEN_CNTL) & RADEON_CRTC2_CRT2_ON)
-			crtc2_gen_cntl = RADEON_CRTC2_CRT2_ON;
-		else
-			crtc2_gen_cntl = 0;
-
+		/* if TV DAC is enabled for another crtc and keep it enabled */
+		crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL) & 0x00718080;
 		crtc2_gen_cntl |= ((format << 8)
 				   | RADEON_CRTC2_VSYNC_DIS
 				   | RADEON_CRTC2_HSYNC_DIS
@@ -681,7 +677,8 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
 		uint32_t crtc_ext_cntl;
 		uint32_t disp_merge_cntl;
 
-		crtc_gen_cntl = (RADEON_CRTC_EXT_DISP_EN
+		crtc_gen_cntl = RREG32(RADEON_CRTC_GEN_CNTL) & 0x00718000;
+		crtc_gen_cntl |= (RADEON_CRTC_EXT_DISP_EN
 				 | (format << 8)
 				 | RADEON_CRTC_DISP_REQ_EN_B
 				 | ((mode->flags & DRM_MODE_FLAG_DBLSCAN)
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index c1e1706..6f3ff8b 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -796,18 +796,20 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
 				pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
 			if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) {
-				struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-				struct radeon_encoder_lvds *lvds = (struct radeon_encoder_lvds *)radeon_encoder->enc_priv;
-				if (lvds) {
-					if (lvds->use_bios_dividers) {
-						pll_ref_div = lvds->panel_ref_divider;
-						pll_fb_post_div   = (lvds->panel_fb_divider |
-								     (lvds->panel_post_divider << 16));
-						htotal_cntl  = 0;
-						use_bios_divs = true;
+				if (!rdev->is_atom_bios) {
+					struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+					struct radeon_encoder_lvds *lvds = (struct radeon_encoder_lvds *)radeon_encoder->enc_priv;
+					if (lvds) {
+						if (lvds->use_bios_dividers) {
+							pll_ref_div = lvds->panel_ref_divider;
+							pll_fb_post_div   = (lvds->panel_fb_divider |
+									     (lvds->panel_post_divider << 16));
+							htotal_cntl  = 0;
+							use_bios_divs = true;
+						}
 					}
+					pll_flags |= RADEON_PLL_USE_REF_DIV;
 				}
-				pll_flags |= RADEON_PLL_USE_REF_DIV;
 			}
 		}
 	}
-- 
1.5.6.3



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1944
retrieving revision 1.1945
diff -u -p -r1.1944 -r1.1945
--- kernel.spec	1 Dec 2009 23:24:14 -0000	1.1944
+++ kernel.spec	2 Dec 2009 07:34:17 -0000	1.1945
@@ -724,6 +724,7 @@ Patch1832: drm-edid-retry.patch
 Patch1834: drm-edid-header-fixup.patch
 Patch1835: drm-default-mode.patch
 Patch1837: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
+Patch1839: drm-radeon-misc-fixes.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1421,6 +1422,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 # Nouveau DRM + drm fixes
 ApplyPatch kms-offb-handoff.patch
 ApplyPatch drm-next-b390f944.patch
+ApplyPatch drm-radeon-misc-fixes.patch
 ApplyPatch drm-conservative-fallback-modes.patch
 ApplyPatch drm-edid-retry.patch
 ApplyPatch drm-edid-header-fixup.patch
@@ -2153,6 +2155,9 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-159
+- drm-radeon-misc-fixes.patch: r400 LVDS, r600 digital dpms, cursor fix, tv property
+
 * Wed Dec 02 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-158
 - nouveau: more complete lvds script selection on >=G80 (rh#522690, rh#529859)
 - nouveau: more complete tmds script selection on >=G80 (rh#537853)



From varekova at fedoraproject.org  Wed Dec  2 07:36:43 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed,  2 Dec 2009 07:36:43 +0000 (UTC)
Subject: rpms/aspell/devel aspell.spec,1.51,1.52
Message-ID: <20091202073643.8719511C0095@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	aspell.spec 
Log Message:
add some comments to the license tag



Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- aspell.spec	1 Dec 2009 14:11:05 -0000	1.51
+++ aspell.spec	2 Dec 2009 07:36:42 -0000	1.52
@@ -3,8 +3,9 @@ Name: aspell
 Version: 0.60.6
 Release: 9%{?dist}
 Epoch: 12
-# LGPLv2+ .. aspell-0.60.6/misc/po-filter.c, ltmain.sh,
+# LGPLv2+ .. aspell-0.60.6/misc/po-filter.c, ltmain.sh, modules/speller/default/affix.cpp
 # GPLv2+  .. aspell-0.60.6/misc/po-filter.c, aspell-0.60.6/ltmain.sh
+# BSD     .. myspell/munch.c
 License: LGPLv2 and LGPLv2+ and GPLv2+ and MIT
 Group: Applications/Text
 URL: http://aspell.net/



From varekova at fedoraproject.org  Wed Dec  2 07:44:18 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed,  2 Dec 2009 07:44:18 +0000 (UTC)
Subject: File sysstat-9.0.6.tar.bz2 uploaded to lookaside cache by varekova
Message-ID: <20091202074418.EFBB610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sysstat:

e069daf192d259de905d7f8cdd85dc4e  sysstat-9.0.6.tar.bz2



From varekova at fedoraproject.org  Wed Dec  2 07:46:45 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed,  2 Dec 2009 07:46:45 +0000 (UTC)
Subject: rpms/sysstat/devel .cvsignore, 1.24, 1.25 sources, 1.23,
	1.24 sysstat.spec, 1.73, 1.74
Message-ID: <20091202074645.D4EA811C0095@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	.cvsignore sources sysstat.spec 
Log Message:
- update to 9.0.6




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	20 Jul 2009 07:00:20 -0000	1.24
+++ .cvsignore	2 Dec 2009 07:46:44 -0000	1.25
@@ -1 +1 @@
-sysstat-9.0.4.tar.bz2
+sysstat-9.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	20 Jul 2009 07:00:21 -0000	1.23
+++ sources	2 Dec 2009 07:46:45 -0000	1.24
@@ -1 +1 @@
-4ecde27986c3745a363a95e34cf897c8  sysstat-9.0.4.tar.bz2
+e069daf192d259de905d7f8cdd85dc4e  sysstat-9.0.6.tar.bz2


Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sysstat.spec	15 Sep 2009 14:49:20 -0000	1.73
+++ sysstat.spec	2 Dec 2009 07:46:45 -0000	1.74
@@ -1,6 +1,6 @@
 Name: sysstat
-Version: 9.0.4
-Release: 4%{?dist}
+Version: 9.0.6
+Release: 1%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_localstatedir}/log/sa
 
 %changelog
+* Wed Dec  2 2009 Ivana Hutarva Varekova <varekova at redhat.com> - 9.0.6-1
+- update to 9.0.6
+
 * Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> - 9.0.4-4
 - fix init script
 



From pkgdb at fedoraproject.org  Wed Dec  2 08:20:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 08:20:17 +0000
Subject: [pkgdb] ayttm: siddhesh has given up watchcommits
Message-ID: <20091202082017.D724F10F861@bastion2.fedora.phx.redhat.com>

siddhesh has given up the watchcommits acl on ayttm (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 08:20:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 08:20:18 +0000
Subject: [pkgdb] ayttm: siddhesh has given up watchbugzilla
Message-ID: <20091202082019.13AE610F89D@bastion2.fedora.phx.redhat.com>

siddhesh has given up the watchbugzilla acl on ayttm (Fedora devel)

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



From sherry151 at fedoraproject.org  Wed Dec  2 08:48:38 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Wed,  2 Dec 2009 08:48:38 +0000 (UTC)
Subject: rpms/archmage/F-12 import.log, NONE, 1.1 .cvsignore, 1.5,
	1.6 archmage.spec, 1.12, 1.13 sources, 1.5, 1.6
Message-ID: <20091202084839.1E91B11C0095@cvs1.fedora.phx.redhat.com>

Author: sherry151

Update of /cvs/pkgs/rpms/archmage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24225/F-12

Modified Files:
	.cvsignore archmage.spec sources 
Added Files:
	import.log 
Log Message:
building with updated source



--- NEW FILE import.log ---
archmage-0_2_4-2_fc12:F-12:archmage-0.2.4-2.fc12.src.rpm:1259743601


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jun 2009 08:26:01 -0000	1.5
+++ .cvsignore	2 Dec 2009 08:48:37 -0000	1.6
@@ -1 +1 @@
-archmage-0.2.3.tar.gz
+archmage-0.2.4.tar.gz


Index: archmage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/F-12/archmage.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- archmage.spec	24 Jul 2009 17:02:27 -0000	1.12
+++ archmage.spec	2 Dec 2009 08:48:37 -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:           archmage
-Version:        0.2.3
+Version:        0.2.4
 Release:        2%{?dist}
 Summary:        Extensible reader/decompiler of files in CHM format
 
@@ -53,8 +53,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/archmage*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Dec 02 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-1
+- Building freshly
+
+* Thu Oct 22 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-1
+- Update to 0.2.4
 
 * Thu Jun 11 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.3-1
 - Update to 0.2.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jun 2009 08:26:01 -0000	1.5
+++ sources	2 Dec 2009 08:48:37 -0000	1.6
@@ -1 +1 @@
-f6aaee246620c4e5c05313c03d51bbf3  archmage-0.2.3.tar.gz
+3c05cf28e0974f773a577feca892d623  archmage-0.2.4.tar.gz



From caolanm at fedoraproject.org  Wed Dec  2 08:51:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Dec 2009 08:51:38 +0000 (UTC)
Subject: File dict-ns_ZA-2009.12.01.oxt uploaded to lookaside cache by
	caolanm
Message-ID: <20091202085138.F319610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hunspell-nso:

e0458c79033a3e8e5af6c37175bdbfdb  dict-ns_ZA-2009.12.01.oxt



From sherry151 at fedoraproject.org  Wed Dec  2 08:51:55 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Wed,  2 Dec 2009 08:51:55 +0000 (UTC)
Subject: rpms/archmage/F-11 import.log, NONE, 1.1 .cvsignore, 1.5,
	1.6 archmage.spec, 1.11, 1.12 sources, 1.5, 1.6
Message-ID: <20091202085155.2FF7E11C0095@cvs1.fedora.phx.redhat.com>

Author: sherry151

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

Modified Files:
	.cvsignore archmage.spec sources 
Added Files:
	import.log 
Log Message:
updating for new upstream release



--- NEW FILE import.log ---
archmage-0_2_4-2_fc12:F-11:archmage-0.2.4-2.fc12.src.rpm:1259743828


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jun 2009 08:40:31 -0000	1.5
+++ .cvsignore	2 Dec 2009 08:51:54 -0000	1.6
@@ -1 +1 @@
-archmage-0.2.3.tar.gz
+archmage-0.2.4.tar.gz


Index: archmage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/F-11/archmage.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- archmage.spec	11 Jun 2009 08:40:31 -0000	1.11
+++ archmage.spec	2 Dec 2009 08:51:54 -0000	1.12
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           archmage
-Version:        0.2.3
-Release:        1%{?dist}
+Version:        0.2.4
+Release:        2%{?dist}
 Summary:        Extensible reader/decompiler of files in CHM format
 
 Group:          Development/Tools
@@ -53,6 +53,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/archmage*
 
 %changelog
+* Wed Dec 02 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-1
+- Building freshly
+
+* Thu Oct 22 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-1
+- Update to 0.2.4
+
 * Thu Jun 11 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.3-1
 - Update to 0.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jun 2009 08:40:31 -0000	1.5
+++ sources	2 Dec 2009 08:51:54 -0000	1.6
@@ -1 +1 @@
-f6aaee246620c4e5c05313c03d51bbf3  archmage-0.2.3.tar.gz
+3c05cf28e0974f773a577feca892d623  archmage-0.2.4.tar.gz



From caolanm at fedoraproject.org  Wed Dec  2 08:55:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Dec 2009 08:55:23 +0000 (UTC)
Subject: rpms/hunspell-nso/devel .cvsignore, 1.2, 1.3 hunspell-nso.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091202085523.8901E11C0095@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nso/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Sep 2008 07:28:41 -0000	1.2
+++ .cvsignore	2 Dec 2009 08:55:23 -0000	1.3
@@ -1 +1,2 @@
 myspell-ns_ZA-20060120.zip
+dict-ns_ZA-2009.12.01.oxt


Index: hunspell-nso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nso/devel/hunspell-nso.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hunspell-nso.spec	25 Jul 2009 02:36:37 -0000	1.3
+++ hunspell-nso.spec	2 Dec 2009 08:55:23 -0000	1.4
@@ -1,9 +1,9 @@
 Name: hunspell-nso
 Summary: Northern Sotho hunspell dictionaries
-%define upstreamid 20060120
+%define upstreamid 20091201
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
-Source: http://downloads.translate.org.za/spellchecker/northern_sotho/myspell-ns_ZA-%{upstreamid}.zip
+Release: 1%{?dist}
+Source: http://extensions.services.openoffice.org/files/3139/1/dict-ns_ZA-2009.12.01.oxt
 Group: Applications/Text
 URL: http://www.translate.org.za/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +19,16 @@ Northern Sotho hunspell dictionaries.
 %setup -q -c -n hunspell-nso
 
 %build
+for i in README-ns_ZA.txt package-description.txt release-notes-ns_ZA.txt; do
+  if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
+    iconv -f ISO-8859-2 -t UTF-8 $i > $i.new
+    touch -r $i $i.new
+    mv -f $i.new $i
+  fi
+  tr -d '\r' < $i > $i.new
+  touch -r $i $i.new
+  mv -f $i.new $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -31,10 +41,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_ns_ZA.txt
+%doc README-ns_ZA.txt package-description.txt release-notes-ns_ZA.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Dec 02 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091201-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20060120-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nso/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Sep 2008 07:28:41 -0000	1.2
+++ sources	2 Dec 2009 08:55:23 -0000	1.3
@@ -1 +1,2 @@
 0a625b4866e6c8acf35c1d92e2130b7d  myspell-ns_ZA-20060120.zip
+e0458c79033a3e8e5af6c37175bdbfdb  dict-ns_ZA-2009.12.01.oxt



From huzaifas at fedoraproject.org  Wed Dec  2 09:02:06 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  2 Dec 2009 09:02:06 +0000 (UTC)
Subject: rpms/gnumeric/F-12 gnumeric.spec,1.49,1.50
Message-ID: <20091202090206.7D4EF11C0095@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28113

Modified Files:
	gnumeric.spec 
Log Message:
version bump


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-12/gnumeric.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- gnumeric.spec	20 Oct 2009 22:30:07 -0000	1.49
+++ gnumeric.spec	2 Dec 2009 09:02:06 -0000	1.50
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -199,6 +199,9 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-6
+- Bump version
+
 * Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> 1:1.8.4-5
 - Applied 4 patches from the 1.8 stable branch (#500890, #505001)
 



From pnemade at fedoraproject.org  Wed Dec  2 09:16:05 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Wed,  2 Dec 2009 09:16:05 +0000 (UTC)
Subject: File lcdf-typetools-2.80.tar.gz uploaded to lookaside cache by
	pnemade
Message-ID: <20091202091605.DFA0910F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lcdf-typetools:

2c2d78e8acf7c7cab9e7da6ed4ea87d3  lcdf-typetools-2.80.tar.gz



From pnemade at fedoraproject.org  Wed Dec  2 09:23:37 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Wed,  2 Dec 2009 09:23:37 +0000 (UTC)
Subject: rpms/lcdf-typetools/devel .cvsignore, 1.8, 1.9 lcdf-typetools.spec, 
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20091202092337.5028B11C0095@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/lcdf-typetools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1297

Modified Files:
	.cvsignore lcdf-typetools.spec sources 
Log Message:
* Wed Dec 02 2009 Parag Nemade <pnemade AT redhat.com>- 2.80-1
- Update to next upstream release 2.80





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lcdf-typetools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 Jul 2009 08:58:33 -0000	1.8
+++ .cvsignore	2 Dec 2009 09:23:36 -0000	1.9
@@ -1 +1 @@
-lcdf-typetools-2.79.tar.gz
+lcdf-typetools-2.80.tar.gz


Index: lcdf-typetools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdf-typetools/devel/lcdf-typetools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- lcdf-typetools.spec	25 Jul 2009 05:00:52 -0000	1.10
+++ lcdf-typetools.spec	2 Dec 2009 09:23:37 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		lcdf-typetools
-Version:	2.79
-Release:	2%{?dist}
+Version:	2.80
+Release:	1%{?dist}
 Summary:	Tools for manipulating OpenType fonts
 Group:		User Interface/X
 License:	GPLv2+
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_datadir}/lcdf-typetools
 
 %changelog
+* Wed Dec 02 2009 Parag Nemade <pnemade AT redhat.com>- 2.80-1
+- Update to next upstream release 2.80
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.79-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lcdf-typetools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	13 Jul 2009 08:58:33 -0000	1.8
+++ sources	2 Dec 2009 09:23:37 -0000	1.9
@@ -1 +1 @@
-1fb0dcb2433b03ef7ed30593bbb06612  lcdf-typetools-2.79.tar.gz
+2c2d78e8acf7c7cab9e7da6ed4ea87d3  lcdf-typetools-2.80.tar.gz



From pnemade at fedoraproject.org  Wed Dec  2 09:24:07 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Wed,  2 Dec 2009 09:24:07 +0000 (UTC)
Subject: File iso-codes-3.12.tar.bz2 uploaded to lookaside cache by pnemade
Message-ID: <20091202092407.CB99E10F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for iso-codes:

eaf4b2141513481eb03b1ab6ccaec298  iso-codes-3.12.tar.bz2



From sherry151 at fedoraproject.org  Wed Dec  2 09:24:55 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Wed,  2 Dec 2009 09:24:55 +0000 (UTC)
Subject: rpms/archmage/F-11 archmage.spec,1.12,1.13
Message-ID: <20091202092455.D1A3C11C0095@cvs1.fedora.phx.redhat.com>

Author: sherry151

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

Modified Files:
	archmage.spec 
Log Message:
Fixed spec file error



Index: archmage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/F-11/archmage.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- archmage.spec	2 Dec 2009 08:51:54 -0000	1.12
+++ archmage.spec	2 Dec 2009 09:24:55 -0000	1.13
@@ -53,8 +53,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/archmage*
 
 %changelog
-* Wed Dec 02 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-1
-- Building freshly
+* Wed Dec 02 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-2
+- Building freshly for F-11
 
 * Thu Oct 22 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-1
 - Update to 0.2.4



From jsafrane at fedoraproject.org  Wed Dec  2 09:33:22 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Wed,  2 Dec 2009 09:33:22 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp-5.5-udptable-index.patch, NONE,
	1.1 net-snmp.spec, 1.194, 1.195
Message-ID: <20091202093322.6AB2411C0396@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3905

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.5-udptable-index.patch 
Log Message:
fix udpTable indexes on big-endian systems
Resolves: #543352

net-snmp-5.5-udptable-index.patch:
 udpTable.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE net-snmp-5.5-udptable-index.patch ---
543352:  'make test' fails on big endian system

Source: upstream, SVN rev. 17860

Fix udpTable indexes.
Index: net-snmp/agent/mibgroup/mibII/udpTable.c
===================================================================
--- net-snmp/agent/mibgroup/mibII/udpTable.c	(revision 17859)
+++ net-snmp/agent/mibgroup/mibII/udpTable.c	(revision 17860)
@@ -361,7 +361,7 @@
 {
     UDPTABLE_ENTRY_TYPE	 *entry = (UDPTABLE_ENTRY_TYPE *)*loop_context;
     long port;
-    in_addr_t addr;
+    long addr;
 
     if (!entry)
         return NULL;
@@ -376,7 +376,7 @@
 #else
     addr = UDP_ADDRESS_TO_NETWORK_ORDER((in_addr_t)entry->UDPTABLE_LOCALADDRESS);
     snmp_set_var_value(index, (u_char *)&addr,
-                                 sizeof(entry->UDPTABLE_LOCALADDRESS));
+                                 sizeof(addr));
 #endif
     port = UDP_PORT_TO_HOST_ORDER(entry->UDPTABLE_LOCALPORT);
     snmp_set_var_value(index->next_variable,


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- net-snmp.spec	27 Nov 2009 13:33:35 -0000	1.194
+++ net-snmp.spec	2 Dec 2009 09:33:22 -0000	1.195
@@ -10,7 +10,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: 5.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -29,6 +29,7 @@ Patch1: net-snmp-5.4.1-pie.patch
 Patch2: net-snmp-5.5-dir-fix.patch
 Patch3: net-snmp-5.5-multilib.patch
 Patch4: net-snmp-5.5-sensors3.patch
+Patch5: net-snmp-5.5-udptable-index.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -158,6 +159,7 @@ Net-SNMP toolkit library.
 %patch2 -p1 -b .dir-fix
 %patch3 -p1 -b .multilib
 %patch4 -p1 -b .sensors
+%patch5 -p1 -b .udptable-index
 
 %build
 MIBS="host agentx smux \
@@ -399,6 +401,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs/*
 
 %changelog
+* Wed Dec  2 2009 Jan Safranek <jsafrane at redhat.com> 1:5.5-4
+- fix udpTable indexes on big-endian systems (#543352)
+
 * Wed Nov 25 2009 Jan Safranek <jsafrane at redhat.com>  1:5.5-3
 - prepare the .spec file for review
 - run automatic regression suite after the compilation of the package



From mapleoin at fedoraproject.org  Wed Dec  2 09:35:39 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Wed,  2 Dec 2009 09:35:39 +0000 (UTC)
Subject: File calibre-0.6.25-nofonts.tar.gz uploaded to lookaside cache by
	mapleoin
Message-ID: <20091202093539.97CF810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for calibre:

d0bcbe90ad50ca9dcafca6e28e9e568e  calibre-0.6.25-nofonts.tar.gz



From pnemade at fedoraproject.org  Wed Dec  2 09:38:43 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Wed,  2 Dec 2009 09:38:43 +0000 (UTC)
Subject: rpms/iso-codes/devel .cvsignore, 1.30, 1.31 iso-codes.spec, 1.40,
	1.41 sources, 1.32, 1.33
Message-ID: <20091202093843.79EB711C0095@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iso-codes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5500

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Wed Dec 02 2009 Parag Nemade <pnemade AT redhat.com> - 3.12-1
- Update to 3.12




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	23 Oct 2009 06:03:49 -0000	1.30
+++ .cvsignore	2 Dec 2009 09:38:43 -0000	1.31
@@ -1 +1 @@
-iso-codes-3.11.tar.bz2
+iso-codes-3.12.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- iso-codes.spec	2 Nov 2009 04:37:57 -0000	1.40
+++ iso-codes.spec	2 Dec 2009 09:38:43 -0000	1.41
@@ -1,7 +1,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.11.1
+Version:	3.12
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -57,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Wed Dec 02 2009 Parag Nemade <pnemade AT redhat.com> - 3.12-1
+- Update to 3.12
+
 * Mon Nov 02 2009 Parag Nemade <pnemade at redhat.com> - 3.11.1-1
 - Update to 3.11.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	2 Nov 2009 04:37:57 -0000	1.32
+++ sources	2 Dec 2009 09:38:43 -0000	1.33
@@ -1 +1 @@
-e92e8e98defff9b410b8437adde8a85f  iso-codes-3.11.1.tar.bz2
+eaf4b2141513481eb03b1ab6ccaec298  iso-codes-3.12.tar.bz2



From sailer at fedoraproject.org  Wed Dec  2 09:41:43 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed,  2 Dec 2009 09:41:43 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl-svn131.patch,NONE,1.1 ghdl.spec,1.55,1.56
Message-ID: <20091202094143.C40C611C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

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

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn131.patch 
Log Message:
update to svn131


ghdl-svn131.patch:
 errorout.adb          |    6 
 ghdldrv/ghdllocal.adb |    2 
 grt/grt-processes.adb |  431 +++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads |   29 +--
 grt/grt-signals.adb   |   31 +--
 grt/grt-signals.ads   |   33 ++-
 grt/grt-types.ads     |    4 
 grt/grt-unithread.adb |    9 -
 grt/grt-unithread.ads |    6 
 ortho-lang.c          |    2 
 version.ads           |    4 
 11 files changed, 333 insertions(+), 224 deletions(-)

--- NEW FILE ghdl-svn131.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-11-29 12:28:59.000000000 +0100
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-11-29 12:28:55.000000000 +0100
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-11-29 12:28:56.000000000 +0100
@@ -36,22 +36,25 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
+   type Process_Id_Array is array (Natural range <>) of Process_Acc;
    type Process_Id_Array_Acc is access Process_Id_Array;
 
    Resume_Process_Table : Process_Id_Array_Acc;
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,63 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+      end if;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +339,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +437,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +453,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +462,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +477,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +495,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +504,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +512,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +522,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +545,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -507,7 +627,7 @@
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,35 +636,30 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
@@ -571,15 +686,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +701,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +755,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +810,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-11-29 12:28:56.000000000 +0100
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -178,8 +174,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-11-29 12:28:56.000000000 +0100
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-11-29 12:28:56.000000000 +0100
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-11-29 12:28:56.000000000 +0100
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-11-29 12:28:56.000000000 +0100
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-11-29 12:28:56.000000000 +0100
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/ortho-lang.c ghdl-0.29dev/vhdl/ortho-lang.c
--- ghdl-0.28/vhdl/ortho-lang.c	2008-08-28 05:29:25.000000000 +0200
+++ ghdl-0.29dev/vhdl/ortho-lang.c	2009-11-29 12:28:57.000000000 +0100
@@ -385,7 +385,7 @@
     filename = in_fnames[0];
 
   linemap_add (line_table, LC_ENTER, 0, filename ? filename :"*no-file*", 1);
-  input_location = linemap_line_start (line_table, 0, 252);
+  input_location = linemap_line_start (line_table, 1, 252);
 
   if (!lang_parse_file (filename))
     errorcount++;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-11-29 12:28:59.000000000 +0100
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- ghdl.spec	23 Sep 2009 18:52:58 -0000	1.55
+++ ghdl.spec	2 Dec 2009 09:41:43 -0000	1.56
@@ -1,6 +1,6 @@
 %global gccver 4.3.4
 %global ghdlver 0.28
-%global ghdlsvnver 130
+%global ghdlsvnver 131
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -282,6 +282,13 @@ pushd %{buildroot}
 
 popd
 
+# Symlink v08 libraries for now
+P64=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/
+%{__ln} -s v93 ${P64}v08
+%ifarch x86_64
+%{__ln} -s v93 ${P32}v08
+%endif
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -311,6 +318,10 @@ popd
 
 
 %changelog
+* Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
+- update to 0.28/svn131
+- symlink v08 libraries to v93 for now
+
 * Wed Sep 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.130svn.0
 - update to 0.28/svn130
 



From mapleoin at fedoraproject.org  Wed Dec  2 09:42:17 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Wed,  2 Dec 2009 09:42:17 +0000 (UTC)
Subject: rpms/calibre/devel .cvsignore, 1.5, 1.6 calibre-no-update.patch, 1.1,
	1.2 calibre.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20091202094217.B7C5D11C0095@cvs1.fedora.phx.redhat.com>

Author: mapleoin

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

Modified Files:
	.cvsignore calibre-no-update.patch calibre.spec sources 
Log Message:
- new upstream release: 0.6.25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Nov 2009 12:26:33 -0000	1.5
+++ .cvsignore	2 Dec 2009 09:42:17 -0000	1.6
@@ -1 +1 @@
-calibre-0.6.24-nofonts.tar.gz
+calibre-0.6.25-nofonts.tar.gz

calibre-no-update.patch:
 main.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: calibre-no-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre-no-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- calibre-no-update.patch	18 Nov 2009 12:26:33 -0000	1.1
+++ calibre-no-update.patch	2 Dec 2009 09:42:17 -0000	1.2
@@ -1,20 +1,20 @@
 diff -up calibre/src/calibre/gui2/main.py.no_update calibre/src/calibre/gui2/main.py
---- calibre/src/calibre/gui2/main.py.no_update	2009-11-16 14:21:55.200387171 +0200
-+++ calibre/src/calibre/gui2/main.py	2009-11-16 14:22:10.400510757 +0200
-@@ -221,11 +221,11 @@ class Main(MainWindow, Ui_MainWindow, De
+--- calibre/src/calibre/gui2/main.py.no_update	2009-12-02 11:16:14.357372471 +0200
++++ calibre/src/calibre/gui2/main.py	2009-12-02 11:17:30.421373426 +0200
+@@ -220,11 +220,11 @@ class Main(MainWindow, Ui_MainWindow, De
          self.latest_version = ' '
          self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
          self.device_info = ' '
 -        if not opts.no_update_check:
--            self.update_checker = CheckForUpdates()
+-            self.update_checker = CheckForUpdates(self)
 -            QObject.connect(self.update_checker,
 -                    SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
--            self.update_checker.start()
+-            self.update_checker.start(2000)
 +        # if not opts.no_update_check:
-+        #     self.update_checker = CheckForUpdates()
++        #     self.update_checker = CheckForUpdates(self)
 +        #     QObject.connect(self.update_checker,
 +        #             SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
-+        #     self.update_checker.start()
++        #     self.update_checker.start(2000)
          ####################### Status Bar #####################
          self.status_bar = StatusBar(self.jobs_dialog, self.system_tray_icon)
          self.setStatusBar(self.status_bar)


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- calibre.spec	24 Nov 2009 22:16:26 -0000	1.5
+++ calibre.spec	2 Dec 2009 09:42:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           calibre
-Version:        0.6.24
-Release:        2%{?dist}
+Version:        0.6.25
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -165,13 +165,16 @@ rm -rf %{buildroot}%{_libdir}/%{name}/ca
 rm -rf %{buildroot}%{_libdir}/%{name}/cal/trac
 
 # link to system fonts after we have deleted (see Source0) the non-free ones
+# http://bugs.calibre-ebook.com/ticket/3832
 ln -s %{_datadir}/fonts/liberation/LiberationSans-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0003m_.ttf
 ln -s %{_datadir}/fonts/liberation/LiberationSerif-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0011m_.ttf
 ln -s %{_datadir}/fonts/liberation/LiberationMono-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0419m_.ttf
-      
+
+# http://bugs.calibre-ebook.com/ticket/3770#comment:7
+
 # man pages
 mv %{buildroot}%{_datadir}/%{name}/man %{buildroot}%{_mandir}
 
@@ -243,8 +246,8 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.24-2
-- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
+* Wed Dec  2 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.25-1
+- New upstream release
 
 * Wed Nov 18 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.24-1
 - New upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2416Nov2009


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Nov 2009 12:26:33 -0000	1.5
+++ sources	2 Dec 2009 09:42:17 -0000	1.6
@@ -1 +1 @@
-54f25fb8062b9a119e217f816f7be4be  calibre-0.6.24-nofonts.tar.gz
+d0bcbe90ad50ca9dcafca6e28e9e568e  calibre-0.6.25-nofonts.tar.gz



From sailer at fedoraproject.org  Wed Dec  2 09:42:28 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed,  2 Dec 2009 09:42:28 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl-svn130.patch,1.1,NONE
Message-ID: <20091202094228.DF07611C0267@cvs1.fedora.phx.redhat.com>

Author: sailer

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

Removed Files:
	ghdl-svn130.patch 
Log Message:
remove obsolete patch



--- ghdl-svn130.patch DELETED ---



From tim4dev at fedoraproject.org  Wed Dec  2 09:44:01 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Wed,  2 Dec 2009 09:44:01 +0000 (UTC)
Subject: File webacula-3.4.tar.gz uploaded to lookaside cache by tim4dev
Message-ID: <20091202094401.9288410F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for webacula:

76f5e04f18be112941386c5d7e71a771  webacula-3.4.tar.gz



From tim4dev at fedoraproject.org  Wed Dec  2 09:49:49 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Wed,  2 Dec 2009 09:49:49 +0000 (UTC)
Subject: rpms/webacula/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091202094949.9C83511C0095@cvs1.fedora.phx.redhat.com>

Author: tim4dev

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

Modified Files:
	.cvsignore sources 
Log Message:
v 3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Oct 2009 07:07:43 -0000	1.2
+++ .cvsignore	2 Dec 2009 09:49:49 -0000	1.3
@@ -1 +1 @@
-webacula-3.3.tar.gz
+webacula-3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Oct 2009 07:07:44 -0000	1.2
+++ sources	2 Dec 2009 09:49:49 -0000	1.3
@@ -1 +1 @@
-d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz
+76f5e04f18be112941386c5d7e71a771  webacula-3.4.tar.gz



From tim4dev at fedoraproject.org  Wed Dec  2 09:54:06 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Wed,  2 Dec 2009 09:54:06 +0000 (UTC)
Subject: rpms/webacula/devel webacula.spec,1.1,1.2
Message-ID: <20091202095406.82FD311C0095@cvs1.fedora.phx.redhat.com>

Author: tim4dev

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

Modified Files:
	webacula.spec 
Log Message:
v 3.4



Index: webacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/devel/webacula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webacula.spec	16 Oct 2009 07:07:44 -0000	1.1
+++ webacula.spec	2 Dec 2009 09:54:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:          webacula
-Version:       3.3
-Release:       6%{?dist}
+Version:       3.4
+Release:       1%{?dist}
 Summary:       Web interface of a Bacula backup system
 Summary(ru):   ?????? ?????????????????? ?????? Bacula backup system
 
@@ -28,7 +28,8 @@ Supports the run Job, restore all files 
 restore the most recent backup for a client,
 restore backup for a client before a specified time,
 mount/umount Storages, show scheduled, running and terminated Jobs and more.
-Supported languages: English, French, German, Portuguese Brazil, Russian.
+Supported languages: English, French, German, Italian,
+Portuguese Brazil, Russian.
 
 %description -l ru
 Webacula - Web Bacula - ?????? ?????????????????? ?????? Bacula backup system.
@@ -37,7 +38,7 @@ Webacula - Web Bacula - ?????? ?????????
 ???????????????????????????? ???????????? ?????? ?????????????? ???????????????????? ?????????? ?????????????????? ????????????????,
 ????????????????????????/?????????????????????????????? ????????????????, ?????????? ??????????????????????????????, 
 ?????????????????????????? ?? ?????????????????????? ?????????????? ?? ????????????.
-???????????????????????????? ??????????: ????????????????????, ??????????????????????, ????????????????,
+???????????????????????????? ??????????: ????????????????????, ??????????????????????, ????????????????, ??????????????????????,
 ?????????????????????? ??????????????????????????, ??????????????.
 
 
@@ -109,10 +110,14 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_datadir}/%{name}/languages/fr
 %lang(pt) %{_datadir}/%{name}/languages/pt
 %lang(ru) %{_datadir}/%{name}/languages/ru
+%lang(it) %{_datadir}/%{name}/languages/it
 
 
 
 %changelog
+* Fri Oct 16 2009 Yuri Timofeev <tim4dev at gmail.com> 3.4-1
+- Version 3.4
+
 * Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
 - Fix #526855.
 



From mapleoin at fedoraproject.org  Wed Dec  2 09:54:42 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Wed,  2 Dec 2009 09:54:42 +0000 (UTC)
Subject: rpms/calibre/F-12 .cvsignore, 1.6, 1.7 calibre-no-update.patch, 1.1,
	1.2 calibre.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20091202095442.A72CF11C0095@cvs1.fedora.phx.redhat.com>

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10188

Modified Files:
	.cvsignore calibre-no-update.patch calibre.spec sources 
Log Message:
updated to upstream 0.6.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	18 Nov 2009 13:03:41 -0000	1.6
+++ .cvsignore	2 Dec 2009 09:54:42 -0000	1.7
@@ -1 +1 @@
-calibre-0.6.24-nofonts.tar.gz
+calibre-0.6.25-nofonts.tar.gz

calibre-no-update.patch:
 main.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: calibre-no-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/calibre-no-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- calibre-no-update.patch	18 Nov 2009 13:03:41 -0000	1.1
+++ calibre-no-update.patch	2 Dec 2009 09:54:42 -0000	1.2
@@ -1,20 +1,20 @@
 diff -up calibre/src/calibre/gui2/main.py.no_update calibre/src/calibre/gui2/main.py
---- calibre/src/calibre/gui2/main.py.no_update	2009-11-16 14:21:55.200387171 +0200
-+++ calibre/src/calibre/gui2/main.py	2009-11-16 14:22:10.400510757 +0200
-@@ -221,11 +221,11 @@ class Main(MainWindow, Ui_MainWindow, De
+--- calibre/src/calibre/gui2/main.py.no_update	2009-12-02 11:16:14.357372471 +0200
++++ calibre/src/calibre/gui2/main.py	2009-12-02 11:17:30.421373426 +0200
+@@ -220,11 +220,11 @@ class Main(MainWindow, Ui_MainWindow, De
          self.latest_version = ' '
          self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
          self.device_info = ' '
 -        if not opts.no_update_check:
--            self.update_checker = CheckForUpdates()
+-            self.update_checker = CheckForUpdates(self)
 -            QObject.connect(self.update_checker,
 -                    SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
--            self.update_checker.start()
+-            self.update_checker.start(2000)
 +        # if not opts.no_update_check:
-+        #     self.update_checker = CheckForUpdates()
++        #     self.update_checker = CheckForUpdates(self)
 +        #     QObject.connect(self.update_checker,
 +        #             SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
-+        #     self.update_checker.start()
++        #     self.update_checker.start(2000)
          ####################### Status Bar #####################
          self.status_bar = StatusBar(self.jobs_dialog, self.system_tray_icon)
          self.setStatusBar(self.status_bar)


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/calibre.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- calibre.spec	18 Nov 2009 13:03:41 -0000	1.5
+++ calibre.spec	2 Dec 2009 09:54:42 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           calibre
-Version:        0.6.24
+Version:        0.6.25
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -165,13 +165,16 @@ rm -rf %{buildroot}%{_libdir}/%{name}/ca
 rm -rf %{buildroot}%{_libdir}/%{name}/cal/trac
 
 # link to system fonts after we have deleted (see Source0) the non-free ones
+# http://bugs.calibre-ebook.com/ticket/3832
 ln -s %{_datadir}/fonts/liberation/LiberationSans-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0003m_.ttf
 ln -s %{_datadir}/fonts/liberation/LiberationSerif-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0011m_.ttf
 ln -s %{_datadir}/fonts/liberation/LiberationMono-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0419m_.ttf
-      
+
+# http://bugs.calibre-ebook.com/ticket/3770#comment:7
+
 # man pages
 mv %{buildroot}%{_datadir}/%{name}/man %{buildroot}%{_mandir}
 
@@ -243,6 +246,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Dec  2 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.25-1
+- New upstream release
+
 * Wed Nov 18 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.24-1
 - New upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2416Nov2009
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Nov 2009 13:03:41 -0000	1.6
+++ sources	2 Dec 2009 09:54:42 -0000	1.7
@@ -1 +1 @@
-54f25fb8062b9a119e217f816f7be4be  calibre-0.6.24-nofonts.tar.gz
+d0bcbe90ad50ca9dcafca6e28e9e568e  calibre-0.6.25-nofonts.tar.gz



From sherry151 at fedoraproject.org  Wed Dec  2 09:54:50 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Wed,  2 Dec 2009 09:54:50 +0000 (UTC)
Subject: rpms/archmage/F-12 archmage.spec,1.13,1.14
Message-ID: <20091202095450.9760E11C0095@cvs1.fedora.phx.redhat.com>

Author: sherry151

Update of /cvs/pkgs/rpms/archmage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10137

Modified Files:
	archmage.spec 
Log Message:
Fixing spec file error



Index: archmage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/F-12/archmage.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- archmage.spec	2 Dec 2009 08:48:37 -0000	1.13
+++ archmage.spec	2 Dec 2009 09:54:50 -0000	1.14
@@ -53,8 +53,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/archmage*
 
 %changelog
-* Wed Dec 02 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-1
-- Building freshly
+* Wed Dec 02 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-2
+- Fixing relese number
 
 * Thu Oct 22 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 0.2.4-1
 - Update to 0.2.4



From pnemade at fedoraproject.org  Wed Dec  2 09:56:19 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Wed,  2 Dec 2009 09:56:19 +0000 (UTC)
Subject: rpms/iso-codes/F-12 iso-codes.spec,1.40,1.41 sources,1.32,1.33
Message-ID: <20091202095619.5692F11C0095@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iso-codes/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10695

Modified Files:
	iso-codes.spec sources 
Log Message:
* Wed Dec 02 2009 Parag Nemade <pnemade AT redhat.com> - 3.12-1
- Update to 3.12




Index: iso-codes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/F-12/iso-codes.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- iso-codes.spec	2 Nov 2009 04:24:06 -0000	1.40
+++ iso-codes.spec	2 Dec 2009 09:56:18 -0000	1.41
@@ -1,7 +1,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.11.1
+Version:	3.12
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -57,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Wed Dec 02 2009 Parag Nemade <pnemade AT redhat.com> - 3.12-1
+- Update to 3.12
+
 * Mon Nov 02 2009 Parag Nemade <pnemade at redhat.com> - 3.11.1-1
 - Update to 3.11.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/F-12/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	2 Nov 2009 04:24:06 -0000	1.32
+++ sources	2 Dec 2009 09:56:19 -0000	1.33
@@ -1 +1 @@
-e92e8e98defff9b410b8437adde8a85f  iso-codes-3.11.1.tar.bz2
+eaf4b2141513481eb03b1ab6ccaec298  iso-codes-3.12.tar.bz2



From mcrha at fedoraproject.org  Wed Dec  2 10:02:45 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Wed,  2 Dec 2009 10:02:45 +0000 (UTC)
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.10.1-fix-64bit-acinclude.patch, NONE,
	1.1 evolution-exchange.spec, 1.84,
	1.85 evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch, 1.2,
	NONE evolution-exchange-2.29.3-add-ldap-libs.patch, 1.3, NONE
Message-ID: <20091202100245.1DC4511C0095@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12324

Modified Files:
	evolution-exchange.spec 
Added Files:
	evolution-exchange-2.10.1-fix-64bit-acinclude.patch 
Removed Files:
	evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch 
	evolution-exchange-2.29.3-add-ldap-libs.patch 
Log Message:
Let it build finally.


evolution-exchange-2.10.1-fix-64bit-acinclude.patch:
 evo_ldap_check.m4 |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE evolution-exchange-2.10.1-fix-64bit-acinclude.patch ---
diff -up evolution-exchange-2.29.3/m4/evo_ldap_check.m4.fix-64bit-acinclude evolution-exchange-2.29.3/m4/evo_ldap_check.m4
--- evolution-exchange-2.29.3/m4/evo_ldap_check.m4.fix-64bit-acinclude	2009-11-30 10:45:51.000000000 +0100
+++ evolution-exchange-2.29.3/m4/evo_ldap_check.m4	2009-12-02 10:49:15.000000000 +0100
@@ -14,6 +14,18 @@ AC_DEFUN([EVO_LDAP_CHECK],[
 		[AS_HELP_STRING([--with-static-ldap],
 		[Link LDAP support statically into evolution])])
 	AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
+
+	AC_MSG_CHECKING(for multilib subdirectory)
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	AC_MSG_RESULT($multilibsubdir)
+	AC_MSG_CHECKING(for lib subdirectory)
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	AC_MSG_RESULT($libsubdir)
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -24,7 +36,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -60,20 +72,20 @@ AC_DEFUN([EVO_LDAP_CHECK],[
 		AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- evolution-exchange.spec	1 Dec 2009 17:39:35 -0000	1.84
+++ evolution-exchange.spec	2 Dec 2009 10:02:44 -0000	1.85
@@ -30,9 +30,7 @@ Obsoletes: evolution-connector < %{versi
 
 ### Patches ###
 
-Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
-Patch12: evolution-exchange-2.29.3-add-ldap-libs.patch
-
+Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.patch
 ### Dependencies ###
 
 Requires: gnutls
@@ -54,6 +52,10 @@ BuildRequires: libsoup-devel >= %{libsou
 BuildRequires: libtool >= 1.5
 BuildRequires: openldap-evolution-devel
 BuildRequires: openssl-devel
+BuildRequires: krb5-devel 
+# tweak for krb5 1.2 vs 1.3
+%define krb5dir /usr/kerberos
+#define krb5dir `pwd`/krb5-fakeprefix
 
 %description
 This package enables added functionality to Evolution when used with a 
@@ -62,8 +64,11 @@ Microsoft Exchange Server.
 %prep
 %setup -q -n evolution-exchange-%{version}
 
-%patch11 -p1 -b .fix-64bit-acinclude.m4
-%patch12 -p1 -b .add-ldap-libs
+%patch11 -p1 -b .fix-64bit-acinclude
+
+mkdir -p krb5-fakeprefix/include
+mkdir -p krb5-fakeprefix/lib
+mkdir -p krb5-fakeprefix/%{_lib}
 
 %build
 export CPPFLAGS="-I%{_includedir}/et"
@@ -83,7 +88,8 @@ autoreconf --force --install
 %configure \
   --enable-gtk-doc \
   --with-openldap=%{_libdir}/evolution-openldap \
-  --with-static-ldap
+  --with-static-ldap \
+  --with-krb5=%{krb5dir}
 
 make %{?_smp_mflags} LDFLAGS="-R %{plibdir}"
 
@@ -117,7 +123,7 @@ gconftool-2 --makefile-install-rule %{_s
 %{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.so
 %{_libdir}/evolution/%{evo_major}/plugins/liborg-gnome-exchange-operations.so
 %{_libdir}/evolution/%{evo_major}/plugins/org-gnome-exchange-operations.eplug
-%{_libdir}/evolution/%{evo_major}/errors/org-gnome-exchange-operations.error
+%{_datadir}/evolution/%{evo_major}/errors/org-gnome-exchange-operations.error
 
 %{_datadir}/gtk-doc/html/evolution-exchange
 %dir %{_datadir}/evolution-exchange


--- evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch DELETED ---


--- evolution-exchange-2.29.3-add-ldap-libs.patch DELETED ---



From tim4dev at fedoraproject.org  Wed Dec  2 10:03:10 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Wed,  2 Dec 2009 10:03:10 +0000 (UTC)
Subject: rpms/webacula/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 webacula.spec, 1.1, 1.2
Message-ID: <20091202100310.755B311C0095@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12395

Modified Files:
	.cvsignore sources webacula.spec 
Log Message:
v 3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Oct 2009 12:12:31 -0000	1.2
+++ .cvsignore	2 Dec 2009 10:03:10 -0000	1.3
@@ -1 +1 @@
-webacula-3.3.tar.gz
+webacula-3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Oct 2009 12:00:59 -0000	1.2
+++ sources	2 Dec 2009 10:03:10 -0000	1.3
@@ -1 +1 @@
-d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz
+76f5e04f18be112941386c5d7e71a771  webacula-3.4.tar.gz


Index: webacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-12/webacula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webacula.spec	16 Oct 2009 09:55:43 -0000	1.1
+++ webacula.spec	2 Dec 2009 10:03:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:          webacula
-Version:       3.3
-Release:       6%{?dist}
+Version:       3.4
+Release:       1%{?dist}
 Summary:       Web interface of a Bacula backup system
 Summary(ru):   ?????? ?????????????????? ?????? Bacula backup system
 
@@ -28,7 +28,8 @@ Supports the run Job, restore all files 
 restore the most recent backup for a client,
 restore backup for a client before a specified time,
 mount/umount Storages, show scheduled, running and terminated Jobs and more.
-Supported languages: English, French, German, Portuguese Brazil, Russian.
+Supported languages: English, French, German, Italian,
+Portuguese Brazil, Russian.
 
 %description -l ru
 Webacula - Web Bacula - ?????? ?????????????????? ?????? Bacula backup system.
@@ -37,7 +38,7 @@ Webacula - Web Bacula - ?????? ?????????
 ???????????????????????????? ???????????? ?????? ?????????????? ???????????????????? ?????????? ?????????????????? ????????????????,
 ????????????????????????/?????????????????????????????? ????????????????, ?????????? ??????????????????????????????, 
 ?????????????????????????? ?? ?????????????????????? ?????????????? ?? ????????????.
-???????????????????????????? ??????????: ????????????????????, ??????????????????????, ????????????????,
+???????????????????????????? ??????????: ????????????????????, ??????????????????????, ????????????????, ??????????????????????,
 ?????????????????????? ??????????????????????????, ??????????????.
 
 
@@ -109,10 +110,14 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_datadir}/%{name}/languages/fr
 %lang(pt) %{_datadir}/%{name}/languages/pt
 %lang(ru) %{_datadir}/%{name}/languages/ru
+%lang(it) %{_datadir}/%{name}/languages/it
 
 
 
 %changelog
+* Fri Oct 16 2009 Yuri Timofeev <tim4dev at gmail.com> 3.4-1
+- Version 3.4
+
 * Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
 - Fix #526855.
 



From tim4dev at fedoraproject.org  Wed Dec  2 10:10:50 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Wed,  2 Dec 2009 10:10:50 +0000 (UTC)
Subject: rpms/webacula/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 webacula.spec, 1.1, 1.2
Message-ID: <20091202101050.D630611C0095@cvs1.fedora.phx.redhat.com>

Author: tim4dev

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

Modified Files:
	.cvsignore sources webacula.spec 
Log Message:
v 3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Oct 2009 11:44:30 -0000	1.4
+++ .cvsignore	2 Dec 2009 10:10:49 -0000	1.5
@@ -1 +1 @@
-webacula-3.3.tar.gz
+webacula-3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Oct 2009 11:44:30 -0000	1.4
+++ sources	2 Dec 2009 10:10:49 -0000	1.5
@@ -1 +1 @@
-d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz
+76f5e04f18be112941386c5d7e71a771  webacula-3.4.tar.gz


Index: webacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/webacula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webacula.spec	16 Oct 2009 09:00:33 -0000	1.1
+++ webacula.spec	2 Dec 2009 10:10:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:          webacula
-Version:       3.3
-Release:       6%{?dist}
+Version:       3.4
+Release:       1%{?dist}
 Summary:       Web interface of a Bacula backup system
 Summary(ru):   ?????? ?????????????????? ?????? Bacula backup system
 
@@ -28,7 +28,8 @@ Supports the run Job, restore all files 
 restore the most recent backup for a client,
 restore backup for a client before a specified time,
 mount/umount Storages, show scheduled, running and terminated Jobs and more.
-Supported languages: English, French, German, Portuguese Brazil, Russian.
+Supported languages: English, French, German, Italian,
+Portuguese Brazil, Russian.
 
 %description -l ru
 Webacula - Web Bacula - ?????? ?????????????????? ?????? Bacula backup system.
@@ -37,7 +38,7 @@ Webacula - Web Bacula - ?????? ?????????
 ???????????????????????????? ???????????? ?????? ?????????????? ???????????????????? ?????????? ?????????????????? ????????????????,
 ????????????????????????/?????????????????????????????? ????????????????, ?????????? ??????????????????????????????, 
 ?????????????????????????? ?? ?????????????????????? ?????????????? ?? ????????????.
-???????????????????????????? ??????????: ????????????????????, ??????????????????????, ????????????????,
+???????????????????????????? ??????????: ????????????????????, ??????????????????????, ????????????????, ??????????????????????,
 ?????????????????????? ??????????????????????????, ??????????????.
 
 
@@ -109,10 +110,14 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_datadir}/%{name}/languages/fr
 %lang(pt) %{_datadir}/%{name}/languages/pt
 %lang(ru) %{_datadir}/%{name}/languages/ru
+%lang(it) %{_datadir}/%{name}/languages/it
 
 
 
 %changelog
+* Fri Oct 16 2009 Yuri Timofeev <tim4dev at gmail.com> 3.4-1
+- Version 3.4
+
 * Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
 - Fix #526855.
 



From tim4dev at fedoraproject.org  Wed Dec  2 10:18:16 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Wed,  2 Dec 2009 10:18:16 +0000 (UTC)
Subject: rpms/webacula/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 webacula.spec, 1.1, 1.2
Message-ID: <20091202101816.D1B2D11C0095@cvs1.fedora.phx.redhat.com>

Author: tim4dev

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

Modified Files:
	.cvsignore sources webacula.spec 
Log Message:
v 3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Oct 2009 12:22:42 -0000	1.2
+++ .cvsignore	2 Dec 2009 10:18:15 -0000	1.3
@@ -1 +1 @@
-webacula-3.3.tar.gz
+webacula-3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Oct 2009 12:22:42 -0000	1.2
+++ sources	2 Dec 2009 10:18:16 -0000	1.3
@@ -1 +1 @@
-d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz
+76f5e04f18be112941386c5d7e71a771  webacula-3.4.tar.gz


Index: webacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/EL-5/webacula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webacula.spec	16 Oct 2009 12:23:42 -0000	1.1
+++ webacula.spec	2 Dec 2009 10:18:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:          webacula
-Version:       3.3
-Release:       6%{?dist}
+Version:       3.4
+Release:       1%{?dist}
 Summary:       Web interface of a Bacula backup system
 Summary(ru):   ?????? ?????????????????? ?????? Bacula backup system
 
@@ -28,7 +28,8 @@ Supports the run Job, restore all files 
 restore the most recent backup for a client,
 restore backup for a client before a specified time,
 mount/umount Storages, show scheduled, running and terminated Jobs and more.
-Supported languages: English, French, German, Portuguese Brazil, Russian.
+Supported languages: English, French, German, Italian,
+Portuguese Brazil, Russian.
 
 %description -l ru
 Webacula - Web Bacula - ?????? ?????????????????? ?????? Bacula backup system.
@@ -37,7 +38,7 @@ Webacula - Web Bacula - ?????? ?????????
 ???????????????????????????? ???????????? ?????? ?????????????? ???????????????????? ?????????? ?????????????????? ????????????????,
 ????????????????????????/?????????????????????????????? ????????????????, ?????????? ??????????????????????????????, 
 ?????????????????????????? ?? ?????????????????????? ?????????????? ?? ????????????.
-???????????????????????????? ??????????: ????????????????????, ??????????????????????, ????????????????,
+???????????????????????????? ??????????: ????????????????????, ??????????????????????, ????????????????, ??????????????????????,
 ?????????????????????? ??????????????????????????, ??????????????.
 
 
@@ -109,10 +110,14 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_datadir}/%{name}/languages/fr
 %lang(pt) %{_datadir}/%{name}/languages/pt
 %lang(ru) %{_datadir}/%{name}/languages/ru
+%lang(it) %{_datadir}/%{name}/languages/it
 
 
 
 %changelog
+* Fri Oct 16 2009 Yuri Timofeev <tim4dev at gmail.com> 3.4-1
+- Version 3.4
+
 * Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
 - Fix #526855.
 



From jakub at fedoraproject.org  Wed Dec  2 10:18:46 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  2 Dec 2009 10:18:46 +0000 (UTC)
Subject: File gcc-4.4.2-20091202.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091202101846.B4AFD10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gcc:

7c35148197c827e34d44a61d22ed918d  gcc-4.4.2-20091202.tar.bz2



From jakub at fedoraproject.org  Wed Dec  2 10:21:45 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  2 Dec 2009 10:21:45 +0000 (UTC)
Subject: rpms/gcc/F-12 .cvsignore, 1.311, 1.312 gcc.spec, 1.92, 1.93 sources,
	1.317, 1.318
Message-ID: <20091202102145.4AE3511C0095@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17790

Modified Files:
	.cvsignore gcc.spec sources 
Log Message:
4.4.2-12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -p -r1.311 -r1.312
--- .cvsignore	23 Nov 2009 17:44:31 -0000	1.311
+++ .cvsignore	2 Dec 2009 10:21:44 -0000	1.312
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091123.tar.bz2
+gcc-4.4.2-20091202.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- gcc.spec	23 Nov 2009 17:44:31 -0000	1.92
+++ gcc.spec	2 Dec 2009 10:21:45 -0000	1.93
@@ -1,9 +1,9 @@
-%global DATE 20091123
-%global SVNREV 154454
+%global DATE 20091202
+%global SVNREV 154902
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 11
+%global gcc_release 12
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -1849,6 +1849,15 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-12
+- update from gcc-4_4-branch
+  - PRs c++/42234, fortran/41278, fortran/41807, fortran/42162, target/42113,
+	target/42165
+  - don't ICE on -O256 (#539923)
+- fix -mregnames on ppc/ppc64
+- optimize even COMDAT constructors and destructors without virtual
+  bases (PR c++/3187)
+
 * Mon Nov 23 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-11
 - update from gcc-4_4-branch
   - PRs c++/42059, c++/42061, libgfortran/42090


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- sources	23 Nov 2009 17:44:31 -0000	1.317
+++ sources	2 Dec 2009 10:21:45 -0000	1.318
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-304e846b0922cd60a211020968bc0425  gcc-4.4.2-20091123.tar.bz2
+7c35148197c827e34d44a61d22ed918d  gcc-4.4.2-20091202.tar.bz2



From mhlavink at fedoraproject.org  Wed Dec  2 10:22:26 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed,  2 Dec 2009 10:22:26 +0000 (UTC)
Subject: File smartmontools-5.39-rc1.tar.gz uploaded to lookaside cache by
	mhlavink
Message-ID: <20091202102226.555AA10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for smartmontools:

1c5d1987f0d5fb779e6efe34ecf2d7d4  smartmontools-5.39-rc1.tar.gz



From mhlavink at fedoraproject.org  Wed Dec  2 10:23:41 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed,  2 Dec 2009 10:23:41 +0000 (UTC)
Subject: rpms/smartmontools/devel .cvsignore, 1.6, 1.7 smartmontools.spec,
	1.68, 1.69 sources, 1.6, 1.7
Message-ID: <20091202102341.9211611C0095@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore smartmontools.spec sources 
Log Message:
* Wed Dec 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.39-0.1.rc1
- update to 5.39-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 Nov 2009 11:20:11 -0000	1.6
+++ .cvsignore	2 Dec 2009 10:23:41 -0000	1.7
@@ -1 +1 @@
-smartmontools-5.38.snap20091119.tar.gz
+smartmontools-5.39-rc1.tar.gz


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- smartmontools.spec	25 Nov 2009 16:12:15 -0000	1.68
+++ smartmontools.spec	2 Dec 2009 10:23:41 -0000	1.69
@@ -1,18 +1,20 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	5.38
-Release:	25.20091119svn%{?dist}
+Version:	5.39
+Release:	0.1.rc1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
 URL:		http://smartmontools.sourceforge.net/
 #Source0:	http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source0:	%{name}-%{version}.snap20091119.tar.gz
+Source0:	%{name}-%{version}-rc1.tar.gz
 Source1:	smartd.initd
 Source2:	smartmontools.sysconf
+
 # fedora specific
 Patch1:		smartmontools-5.38-defaultconf.patch
 Patch2:		smartmontools-5.38-lowcap.patch
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:	fileutils mailx chkconfig initscripts
 BuildRequires:	readline-devel ncurses-devel automake util-linux groff gettext
@@ -86,6 +88,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Wed Dec 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.39-0.1.rc1
+- update to 5.39-rc1
+
 * Wed Nov 25 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-25.20091119svn
 - spec cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	19 Nov 2009 11:20:11 -0000	1.6
+++ sources	2 Dec 2009 10:23:41 -0000	1.7
@@ -1 +1 @@
-a6d75d14c64cb169145b90c7e0afdc96  smartmontools-5.38.snap20091119.tar.gz
+1c5d1987f0d5fb779e6efe34ecf2d7d4  smartmontools-5.39-rc1.tar.gz



From emunson at fedoraproject.org  Wed Dec  2 10:53:05 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed,  2 Dec 2009 10:53:05 +0000 (UTC)
Subject: File libvpd-2.1.1.tar.gz uploaded to lookaside cache by emunson
Message-ID: <20091202105305.5354B10F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libvpd:

90013a3460cd4ada7502b6ae28a9e0d3  libvpd-2.1.1.tar.gz



From emunson at fedoraproject.org  Wed Dec  2 10:53:41 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed,  2 Dec 2009 10:53:41 +0000 (UTC)
Subject: rpms/libvpd/devel .cvsignore, 1.6, 1.7 import.log, 1.2,
	1.3 libvpd.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20091202105341.DD8C511C0095@cvs1.fedora.phx.redhat.com>

Author: emunson

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

Modified Files:
	.cvsignore import.log libvpd.spec sources 
Log Message:
Updating to libvpd-2.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvpd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Aug 2008 21:30:12 -0000	1.6
+++ .cvsignore	2 Dec 2009 10:53:40 -0000	1.7
@@ -1 +1 @@
-libvpd-2.1.0.tar.gz
+libvpd-2.1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libvpd/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	18 Nov 2009 11:46:40 -0000	1.2
+++ import.log	2 Dec 2009 10:53:40 -0000	1.3
@@ -1,2 +1,3 @@
 libvpd-2_1_0-1:HEAD:libvpd-2.1.0-1.src.rpm:1218749371
 libvpd-2_1_0-5_fc12:HEAD:libvpd-2.1.0-5.fc12.src.rpm:1258544766
+libvpd-2_1_1-1_fc12:HEAD:libvpd-2.1.1-1.src.rpm:1259751189


Index: libvpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvpd/devel/libvpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libvpd.spec	18 Nov 2009 11:43:18 -0000	1.12
+++ libvpd.spec	2 Dec 2009 10:53:41 -0000	1.13
@@ -1,9 +1,9 @@
 %define name libvpd
-%define version 2.1.0
+%define version 2.1.1
 
 Name:		%{name}
 Version:	%{version}
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	VPD Database access library for lsvpd
 
 Group:		System Environment/Libraries
@@ -60,6 +60,9 @@ Contains header files for building with 
 %{_libdir}/pkgconfig/libvpd_cxx-2.pc
 
 %changelog
+* Wed Dec 02 2009 Eric Munson <ebmunson at us.ibm.com> - 2.1.1-1
+- Update to latest libvpd release
+
 * Wed Nov 18 2009 Eric Munson <ebmunson at us.ibm.com> - 2.1.0-5
 - Bump dist for rebuild for broken dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvpd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Aug 2008 21:30:12 -0000	1.8
+++ sources	2 Dec 2009 10:53:41 -0000	1.9
@@ -1 +1 @@
-ca5bac38d29b1ffb0a785ace11050196  libvpd-2.1.0.tar.gz
+90013a3460cd4ada7502b6ae28a9e0d3  libvpd-2.1.1.tar.gz



From emunson at fedoraproject.org  Wed Dec  2 10:54:59 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed,  2 Dec 2009 10:54:59 +0000 (UTC)
Subject: rpms/libvpd/F-12 .cvsignore, 1.6, 1.7 import.log, 1.2,
	1.3 libvpd.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20091202105459.08BE711C0095@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libvpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26182/F-12

Modified Files:
	.cvsignore import.log libvpd.spec sources 
Log Message:
Updating to libvpd-2.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvpd/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Aug 2008 21:30:12 -0000	1.6
+++ .cvsignore	2 Dec 2009 10:54:58 -0000	1.7
@@ -1 +1 @@
-libvpd-2.1.0.tar.gz
+libvpd-2.1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libvpd/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	18 Nov 2009 11:45:31 -0000	1.2
+++ import.log	2 Dec 2009 10:54:58 -0000	1.3
@@ -1,2 +1,3 @@
 libvpd-2_1_0-1:HEAD:libvpd-2.1.0-1.src.rpm:1218749371
 libvpd-2_1_0-5_fc12:F-12:libvpd-2.1.0-5.fc12.src.rpm:1258544678
+libvpd-2_1_1-1_fc12:F-12:libvpd-2.1.1-1.src.rpm:1259751268


Index: libvpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvpd/F-12/libvpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libvpd.spec	18 Nov 2009 11:43:18 -0000	1.12
+++ libvpd.spec	2 Dec 2009 10:54:58 -0000	1.13
@@ -1,9 +1,9 @@
 %define name libvpd
-%define version 2.1.0
+%define version 2.1.1
 
 Name:		%{name}
 Version:	%{version}
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	VPD Database access library for lsvpd
 
 Group:		System Environment/Libraries
@@ -60,6 +60,9 @@ Contains header files for building with 
 %{_libdir}/pkgconfig/libvpd_cxx-2.pc
 
 %changelog
+* Wed Dec 02 2009 Eric Munson <ebmunson at us.ibm.com> - 2.1.1-1
+- Update to latest libvpd release
+
 * Wed Nov 18 2009 Eric Munson <ebmunson at us.ibm.com> - 2.1.0-5
 - Bump dist for rebuild for broken dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvpd/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Aug 2008 21:30:12 -0000	1.8
+++ sources	2 Dec 2009 10:54:58 -0000	1.9
@@ -1 +1 @@
-ca5bac38d29b1ffb0a785ace11050196  libvpd-2.1.0.tar.gz
+90013a3460cd4ada7502b6ae28a9e0d3  libvpd-2.1.1.tar.gz



From epienbro at fedoraproject.org  Wed Dec  2 10:56:08 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed,  2 Dec 2009 10:56:08 +0000 (UTC)
Subject: File atk-1.29.3.tar.bz2 uploaded to lookaside cache by epienbro
Message-ID: <20091202105608.2605E10F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mingw32-atk:

caf6364ebf59c1b77ac052f42b7a2f43  atk-1.29.3.tar.bz2



From epienbro at fedoraproject.org  Wed Dec  2 10:57:21 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed,  2 Dec 2009 10:57:21 +0000 (UTC)
Subject: rpms/mingw32-atk/devel .cvsignore, 1.4, 1.5 mingw32-atk.spec, 1.7, 
	1.8 sources, 1.4, 1.5
Message-ID: <20091202105721.562AE11C0095@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-atk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26863

Modified Files:
	.cvsignore mingw32-atk.spec sources 
Log Message:
Update to 1.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-atk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Aug 2009 23:37:36 -0000	1.4
+++ .cvsignore	2 Dec 2009 10:57:21 -0000	1.5
@@ -1 +1 @@
-atk-1.27.90.tar.bz2
+atk-1.29.3.tar.bz2


Index: mingw32-atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-atk/devel/mingw32-atk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-atk.spec	12 Aug 2009 23:37:36 -0000	1.7
+++ mingw32-atk.spec	2 Dec 2009 10:57:21 -0000	1.8
@@ -6,14 +6,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-atk
-Version:        1.27.90
+Version:        1.29.3
 Release:        1%{?dist}
 Summary:        MinGW Windows Atk library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://projects.gnome.org/accessibility/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/atk/1.27/atk-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/atk/1.29/atk-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
   
 %changelog
+* Wed Dec  2 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.29.3-1
+- Update to 1.29.3
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.27.90-1
 - Update to 1.27.90
 - Automatically generate debuginfo subpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-atk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 23:37:37 -0000	1.4
+++ sources	2 Dec 2009 10:57:21 -0000	1.5
@@ -1 +1 @@
-8906c67d015cc90e2e70a341d0752a6f  atk-1.27.90.tar.bz2
+caf6364ebf59c1b77ac052f42b7a2f43  atk-1.29.3.tar.bz2



From epienbro at fedoraproject.org  Wed Dec  2 11:01:32 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed,  2 Dec 2009 11:01:32 +0000 (UTC)
Subject: File glib-2.23.0.tar.bz2 uploaded to lookaside cache by epienbro
Message-ID: <20091202110132.B86F110F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mingw32-glib2:

75909517629c54e5c5b36d8e233915a9  glib-2.23.0.tar.bz2



From epienbro at fedoraproject.org  Wed Dec  2 11:02:47 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed,  2 Dec 2009 11:02:47 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel .cvsignore, 1.12, 1.13 mingw32-glib2.spec, 
	1.20, 1.21 sources, 1.12, 1.13
Message-ID: <20091202110247.3AE8C11C0095@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28345

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
Update to 2.23.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	8 Oct 2009 22:09:26 -0000	1.12
+++ .cvsignore	2 Dec 2009 11:02:46 -0000	1.13
@@ -1 +1 @@
-glib-2.22.2.tar.bz2
+glib-2.23.0.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mingw32-glib2.spec	8 Oct 2009 22:09:26 -0000	1.20
+++ mingw32-glib2.spec	2 Dec 2009 11:02:46 -0000	1.21
@@ -6,14 +6,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.22.2
+Version:        2.23.0
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/glib/2.22/glib-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/glib/2.23/glib-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  2 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.23.0-1
+- Update to 2.23.0
+
 * Fri Oct  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.22.2-1
 - Update to 2.22.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Oct 2009 22:09:26 -0000	1.12
+++ sources	2 Dec 2009 11:02:46 -0000	1.13
@@ -1 +1 @@
-846a86c74b74d5b16826aa5508940f9b  glib-2.22.2.tar.bz2
+75909517629c54e5c5b36d8e233915a9  glib-2.23.0.tar.bz2



From karsten at fedoraproject.org  Wed Dec  2 11:03:46 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:03:46 +0000 (UTC)
Subject: File libtool-2.2.6b.tar.lzma uploaded to lookaside cache by karsten
Message-ID: <20091202110346.B2F7B10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libtool:

a4b36980765003b47dd75ac9429f4f11  libtool-2.2.6b.tar.lzma



From karsten at fedoraproject.org  Wed Dec  2 11:09:10 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:09:10 +0000 (UTC)
Subject: rpms/libtool/devel .cvsignore, 1.19, 1.20 libtool.spec, 1.78,
	1.79 sources, 1.19, 1.20
Message-ID: <20091202110910.5C76E11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	.cvsignore libtool.spec sources 
Log Message:
- update to 2.2.6b, fixes CVE-2009-3736:
  libltdl may load and execute code from a library in the current directory



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtool/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	12 Aug 2009 17:25:09 -0000	1.19
+++ .cvsignore	2 Dec 2009 11:09:09 -0000	1.20
@@ -1 +1 @@
-libtool-2.2.6a.tar.lzma
+libtool-2.2.6b.tar.lzma


Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- libtool.spec	12 Aug 2009 17:25:09 -0000	1.78
+++ libtool.spec	2 Dec 2009 11:09:10 -0000	1.79
@@ -2,11 +2,11 @@
 
 Summary: The GNU Portable Library Tool
 Name:    libtool
-Version: 2.2.6
-Release: 14%{?dist}
+Version: 2.2.6b
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
-Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}a.tar.lzma
+Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.lzma
 Patch0:  libtool-2.2.6a-rpath.patch
 URL:     http://www.gnu.org/software/libtool/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
@@ -142,6 +142,10 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Karsten Hopp <karsten at redhat.com> 2.2.6b-1
+- update to 2.2.6b, fixes CVE-2009-3736:
+  libltdl may load and execute code from a library in the current directory
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.6-14
 - Use lzma compressed upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtool/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	12 Aug 2009 17:25:09 -0000	1.19
+++ sources	2 Dec 2009 11:09:10 -0000	1.20
@@ -1 +1 @@
-b121e4848cc53fdd69e796aed73b9ccf  libtool-2.2.6a.tar.lzma
+a4b36980765003b47dd75ac9429f4f11  libtool-2.2.6b.tar.lzma



From dwmw2 at fedoraproject.org  Wed Dec  2 11:12:06 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed,  2 Dec 2009 11:12:06 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-intel-agp-clear-gtt.patch, NONE,
	1.1 linux-2.6-iommu-updates.patch, NONE, 1.1 kernel.spec, 1.1860,
	1.1861
Message-ID: <20091202111206.5112E11C0095@cvs1.fedora.phx.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-intel-agp-clear-gtt.patch 
	linux-2.6-iommu-updates.patch 
Log Message:
2.6.32 iommu fixes

linux-2.6-intel-agp-clear-gtt.patch:
 intel-agp.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-intel-agp-clear-gtt.patch ---
Some BIOSes fail to initialise the GTT, which will cause DMA faults when
the IOMMU is enabled. We need to clear the whole thing, not just the
part that Linux is going to use.

Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 10e1f03..6ab8173 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -176,6 +176,7 @@ static struct _intel_private {
 	 * popup and for the GTT.
 	 */
 	int gtt_entries;			/* i830+ */
+	int gtt_total_size;
 	union {
 		void __iomem *i9xx_flush_page;
 		void *i8xx_flush_page;
@@ -1151,7 +1152,7 @@ static int intel_i915_configure(void)
 	readl(intel_private.registers+I810_PGETBL_CTL);	/* PCI Posting. */
 
 	if (agp_bridge->driver->needs_scratch_page) {
-		for (i = intel_private.gtt_entries; i < current_size->num_entries; i++) {
+		for (i = intel_private.gtt_entries; i < intel_private.gtt_total_size; i++) {
 			writel(agp_bridge->scratch_page, intel_private.gtt+i);
 		}
 		readl(intel_private.gtt+i-1);	/* PCI Posting. */
@@ -1306,6 +1307,8 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
 	if (!intel_private.gtt)
 		return -ENOMEM;
 
+	intel_private.gtt_total_size = gtt_map_size / 4;
+
 	temp &= 0xfff80000;
 
 	intel_private.registers = ioremap(temp, 128 * 4096);
@@ -1392,6 +1395,8 @@ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge)
 	if (!intel_private.gtt)
 		return -ENOMEM;
 
+	intel_private.gtt_total_size = gtt_size / 4;
+
 	intel_private.registers = ioremap(temp, 128 * 4096);
 	if (!intel_private.registers) {
 		iounmap(intel_private.gtt);

linux-2.6-iommu-updates.patch:
 dmar.c        |   67 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 intel-iommu.c |   13 +++++++++++
 2 files changed, 68 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-iommu-updates.patch ---
commit 15d841769b5c921ac5502086399b0e786eeb22ea
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Dec 2 10:18:30 2009 +0000

    intel-iommu: Fix oops with intel_iommu=igfx_off
    
    The hotplug notifier will call find_domain() to see if the device in
    question has been assigned an IOMMU domain. However, this should never
    be called for devices with a "dummy" domain, such as graphics devices
    when intel_iommu=igfx_off is set and the corresponding IOMMU isn't even
    initialised. If you do that, it'll oops as it dereferences the (-1)
    pointer.
    
    The notifier function should check iommu_no_mapping() for the
    device before doing anything else.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 5282435ae48edd3414211fe14eead5fea736f18f
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Dec 2 09:21:55 2009 +0000

    intel-iommu: Check for an RMRR which ends before it starts.
    
    Some HP BIOSes report an RMRR region (a region which needs a 1:1 mapping
    in the IOMMU for a given device) which has an end address lower than its
    start address. Detect that and warn, rather than triggering the
    BUG() in dma_pte_clear_range().
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit a02d870f40a516297754d0db0abc17e168f2b494
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Dec 2 09:20:27 2009 +0000

    intel-iommu: Apply BIOS sanity checks for interrupt remapping too.
    
    The BIOS errors where an IOMMU is reported either at zero or a bogus
    address are causing problems even when the IOMMU is disabled -- because
    interrupt remapping uses the same hardware. Ensure that the checks get
    applied for the interrupt remapping initialisation too.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 90053c711bd4c6cd692a096bc6be1c74d8fcab03
Author: Chris Wright <chrisw at sous-sol.org>
Date:   Wed Dec 2 09:17:13 2009 +0000

    intel-iommu: Detect DMAR in hyperspace at probe time.
    
    Many BIOSes will lie to us about the existence of an IOMMU, and claim
    that there is one at an address which actually returns all 0xFF.
    
    We need to detect this early, so that we know we don't have a viable
    IOMMU and can set up swiotlb before it's too late.
    
    Patch from Chris Wright in Fedora 12 kernel.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index b952ebc..5753036 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -582,6 +582,8 @@ int __init dmar_table_init(void)
 	return 0;
 }
 
+static int bios_warned;
+
 int __init check_zero_address(void)
 {
 	struct acpi_table_dmar *dmar;
@@ -601,6 +603,9 @@ int __init check_zero_address(void)
 		}
 
 		if (entry_header->type == ACPI_DMAR_TYPE_HARDWARE_UNIT) {
+			void __iomem *addr;
+			u64 cap, ecap;
+
 			drhd = (void *)entry_header;
 			if (!drhd->address) {
 				/* Promote an attitude of violence to a BIOS engineer today */
@@ -609,17 +614,40 @@ int __init check_zero_address(void)
 				     dmi_get_system_info(DMI_BIOS_VENDOR),
 				     dmi_get_system_info(DMI_BIOS_VERSION),
 				     dmi_get_system_info(DMI_PRODUCT_VERSION));
-#ifdef CONFIG_DMAR
-				dmar_disabled = 1;
-#endif
-				return 0;
+				bios_warned = 1;
+				goto failed;
+			}
+
+			addr = early_ioremap(drhd->address, VTD_PAGE_SIZE);
+			if (!addr ) {
+				printk("IOMMU: can't validate: %llx\n", drhd->address);
+				goto failed;
+			}
+			cap = dmar_readq(addr + DMAR_CAP_REG);
+			ecap = dmar_readq(addr + DMAR_ECAP_REG);
+			early_iounmap(addr, VTD_PAGE_SIZE);
+			if (cap == (uint64_t)-1 && ecap == (uint64_t)-1) {
+				/* Promote an attitude of violence to a BIOS engineer today */
+				WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+				     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+				      drhd->address,
+				      dmi_get_system_info(DMI_BIOS_VENDOR),
+				      dmi_get_system_info(DMI_BIOS_VERSION),
+				      dmi_get_system_info(DMI_PRODUCT_VERSION));
+				bios_warned = 1;
+				goto failed;
 			}
-			break;
 		}
 
 		entry_header = ((void *)entry_header + entry_header->length);
 	}
 	return 1;
+
+failed:
+#ifdef CONFIG_DMAR
+	dmar_disabled = 1;
+#endif
+	return 0;
 }
 
 void __init detect_intel_iommu(void)
@@ -664,6 +692,18 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
 	int agaw = 0;
 	int msagaw = 0;
 
+	if (!drhd->reg_base_addr) {
+		if (!bios_warned) {
+			WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
+			     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+			     dmi_get_system_info(DMI_BIOS_VENDOR),
+			     dmi_get_system_info(DMI_BIOS_VERSION),
+			     dmi_get_system_info(DMI_PRODUCT_VERSION));
+			bios_warned = 1;
+		}
+		return -EINVAL;
+	}
+
 	iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
 	if (!iommu)
 		return -ENOMEM;
@@ -680,13 +720,16 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
 	iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);
 
 	if (iommu->cap == (uint64_t)-1 && iommu->ecap == (uint64_t)-1) {
-		/* Promote an attitude of violence to a BIOS engineer today */
-		WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
-		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
-		     drhd->reg_base_addr,
-		     dmi_get_system_info(DMI_BIOS_VENDOR),
-		     dmi_get_system_info(DMI_BIOS_VERSION),
-		     dmi_get_system_info(DMI_PRODUCT_VERSION));
+		if (!bios_warned) {
+			/* Promote an attitude of violence to a BIOS engineer today */
+			WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+			     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+			     drhd->reg_base_addr,
+			     dmi_get_system_info(DMI_BIOS_VENDOR),
+			     dmi_get_system_info(DMI_BIOS_VERSION),
+			     dmi_get_system_info(DMI_PRODUCT_VERSION));
+			bios_warned = 1;
+		}
 		goto err_unmap;
 	}
 
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 1840a05..1b9f76f 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1991,6 +1991,16 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
 	       "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
 	       pci_name(pdev), start, end);
 	
+	if (end < start) {
+		WARN(1, "Your BIOS is broken; RMRR ends before it starts!\n"
+			"BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+			dmi_get_system_info(DMI_BIOS_VENDOR),
+			dmi_get_system_info(DMI_BIOS_VERSION),
+		     dmi_get_system_info(DMI_PRODUCT_VERSION));
+		ret = -EIO;
+		goto error;
+	}
+
 	if (end >> agaw_to_width(domain->agaw)) {
 		WARN(1, "Your BIOS is broken; RMRR exceeds permitted address width (%d bits)\n"
 		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
@@ -3228,6 +3238,9 @@ static int device_notifier(struct notifier_block *nb,
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct dmar_domain *domain;
 
+	if (iommu_no_mapping(dev))
+		return 0;
+
 	domain = find_domain(pdev);
 	if (!domain)
 		return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1860
retrieving revision 1.1861
diff -u -p -r1.1860 -r1.1861
--- kernel.spec	2 Dec 2009 01:53:59 -0000	1.1860
+++ kernel.spec	2 Dec 2009 11:12:05 -0000	1.1861
@@ -618,6 +618,9 @@ Patch20: linux-2.6-hotfixes.patch
 Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
 
+# More workaround for BIOS brokenness, fix intel_iommu=igfx_off oops
+Patch100: linux-2.6-iommu-updates.patch
+
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -690,6 +693,7 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
+Patch1827: linux-2.6-intel-agp-clear-gtt.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1152,6 +1156,7 @@ ApplyPatch linux-2.6-dell-laptop-rfkill-
 #
 # Intel IOMMU
 #
+ApplyPatch linux-2.6-iommu-updates.patch
 
 #
 # PowerPC
@@ -1314,6 +1319,8 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 ApplyPatch drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
+# Some BIOSes don't clear the whole GTT, and it causes IOMMU faults
+ApplyPatch linux-2.6-intel-agp-clear-gtt.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1989,6 +1996,11 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 02 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.32-0.63.rc8.git2
+- forward port IOMMU fixes from F-12 for HP BIOS brokenness
+- Fix oops with intel_iommu=igfx_off
+- agp/intel: Clear full GTT at startup
+
 * Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 2.6.32-0.62.rc8.git2
 - forward port radeon fixes from F-12 + add radeon display port support
 



From leigh123linux at fedoraproject.org  Wed Dec  2 11:12:07 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed,  2 Dec 2009 11:12:07 +0000 (UTC)
Subject: File qbittorrent-3027svn.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091202111207.9C8DA10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qbittorrent:

6d306c69e07787ebaad6c9a33ea7ff8a  qbittorrent-3027svn.tar.gz



From leigh123linux at fedoraproject.org  Wed Dec  2 11:12:21 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed,  2 Dec 2009 11:12:21 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.27, 1.28 qbittorrent.spec, 1.50,
	1.51 sources, 1.27, 1.28
Message-ID: <20091202111221.3BF8A11C0095@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Wed Dec 02 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.9.svn3027
- update to svn 3027



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	29 Nov 2009 12:09:24 -0000	1.27
+++ .cvsignore	2 Dec 2009 11:12:20 -0000	1.28
@@ -1 +1 @@
-qbittorrent-3011svn.tar.gz
+qbittorrent-3027svn.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- qbittorrent.spec	29 Nov 2009 12:09:24 -0000	1.50
+++ qbittorrent.spec	2 Dec 2009 11:12:20 -0000	1.51
@@ -1,9 +1,9 @@
-%define svn_rev 3011
+%define svn_rev 3027
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.0.0
-Release: 0.8.svn%{svn_rev}%{?dist}
+Release: 0.9.svn%{svn_rev}%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -75,6 +75,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Wed Dec 02 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.9.svn3027
+- update to svn 3027
+
 * Sun Nov 29 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.8.svn3011
 - update to svn 3011
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	29 Nov 2009 12:09:24 -0000	1.27
+++ sources	2 Dec 2009 11:12:21 -0000	1.28
@@ -1 +1 @@
-58df3f495d84f982746b49a6cf26b675  qbittorrent-3011svn.tar.gz
+6d306c69e07787ebaad6c9a33ea7ff8a  qbittorrent-3027svn.tar.gz



From epienbro at fedoraproject.org  Wed Dec  2 11:12:59 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed,  2 Dec 2009 11:12:59 +0000 (UTC)
Subject: File gtk+-2.19.1.tar.bz2 uploaded to lookaside cache by epienbro
Message-ID: <20091202111259.1B8F610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mingw32-gtk2:

d11e2044aedc49e155832c54dc9ac548  gtk+-2.19.1.tar.bz2



From epienbro at fedoraproject.org  Wed Dec  2 11:13:37 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed,  2 Dec 2009 11:13:37 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel mingw32-glib2.spec,1.21,1.22
Message-ID: <20091202111337.40F0911C0095@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31726

Modified Files:
	mingw32-glib2.spec 
Log Message:
Added BR: mingw32-zlib



Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mingw32-glib2.spec	2 Dec 2009 11:02:46 -0000	1.21
+++ mingw32-glib2.spec	2 Dec 2009 11:13:37 -0000	1.22
@@ -24,6 +24,7 @@ BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-dlfcn
 BuildRequires:  mingw32-iconv
 BuildRequires:  mingw32-gettext
+BuildRequires:  mingw32-zlib
 
 BuildRequires:  pkgconfig
 # Native version required for msgfmt use in build
@@ -181,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Dec  2 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.23.0-1
 - Update to 2.23.0
+- Added BR: mingw32-zlib
 
 * Fri Oct  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.22.2-1
 - Update to 2.22.2



From karsten at fedoraproject.org  Wed Dec  2 11:13:49 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:13:49 +0000 (UTC)
Subject: rpms/libtool/devel libtool.spec, 1.79,
	1.80 libtool-1.5.24-relativepath.patch, 1.1, NONE
Message-ID: <20091202111349.5488B11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	libtool.spec 
Removed Files:
	libtool-1.5.24-relativepath.patch 
Log Message:
- fix gcc version


Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- libtool.spec	2 Dec 2009 11:09:10 -0000	1.79
+++ libtool.spec	2 Dec 2009 11:13:49 -0000	1.80
@@ -1,9 +1,9 @@
-%define gcc_version 4.4.1
+%define gcc_version 4.4.2
 
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 2.2.6b
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.lzma
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6b-2
+- fix gcc version
+
 * Tue Dec 01 2009 Karsten Hopp <karsten at redhat.com> 2.2.6b-1
 - update to 2.2.6b, fixes CVE-2009-3736:
   libltdl may load and execute code from a library in the current directory


--- libtool-1.5.24-relativepath.patch DELETED ---



From epienbro at fedoraproject.org  Wed Dec  2 11:14:05 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed,  2 Dec 2009 11:14:05 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore, 1.15, 1.16 mingw32-gtk2.spec,
	1.25, 1.26 sources, 1.15, 1.16
Message-ID: <20091202111405.48CB311C0095@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31952

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.19.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	29 Nov 2009 13:52:30 -0000	1.15
+++ .cvsignore	2 Dec 2009 11:14:05 -0000	1.16
@@ -1 +1 @@
-gtk+-2.19.0.tar.bz2
+gtk+-2.19.1.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mingw32-gtk2.spec	29 Nov 2009 13:52:30 -0000	1.25
+++ mingw32-gtk2.spec	2 Dec 2009 11:14:05 -0000	1.26
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.19.0
+Version:        2.19.1
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -352,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  2 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.19.1-1
+- Update to 2.19.1
+
 * Sun Nov 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.19.0-1
 - Update to 2.19.0
 - Added BR: gtk-doc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	29 Nov 2009 13:52:30 -0000	1.15
+++ sources	2 Dec 2009 11:14:05 -0000	1.16
@@ -1 +1 @@
-3f380acb0632687d84fdf8f70b0f1d07  gtk+-2.19.0.tar.bz2
+d11e2044aedc49e155832c54dc9ac548  gtk+-2.19.1.tar.bz2



From kdudka at fedoraproject.org  Wed Dec  2 11:14:16 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  2 Dec 2009 11:14:16 +0000 (UTC)
Subject: rpms/nano/devel nano.spec,1.35,1.36
Message-ID: <20091202111416.CF07A11C0095@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	nano.spec 
Log Message:
nano-2.2.0-warnings.patch applied upstream


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nano.spec	1 Dec 2009 13:11:47 -0000	1.35
+++ nano.spec	2 Dec 2009 11:14:16 -0000	1.36
@@ -22,7 +22,10 @@ GNU nano is a small and friendly text ed
 
 %prep
 %setup -q
+
+# applied upstream
 %patch1 -p1
+
 for f in doc/man/fr/{nano.1,nanorc.5,rnano.1} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.tmp $f && mv $f.tmp $f
   touch $f.html



From hadess at fedoraproject.org  Wed Dec  2 11:14:21 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  2 Dec 2009 11:14:21 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.238,1.239
Message-ID: <20091202111421.DA6DB11C0095@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-games.spec 
Log Message:
more filelist updates


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- gnome-games.spec	1 Dec 2009 19:12:13 -0000	1.238
+++ gnome-games.spec	2 Dec 2009 11:14:21 -0000	1.239
@@ -340,10 +340,11 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-aisleriot.*
 %{_datadir}/icons/hicolor/*/apps/gnome-iagno.*
 %{_datadir}/icons/hicolor/*/apps/gnome-mines.*
-%{_datadir}/icons/hicolor/*/apps/gnome-swellfoop.*
+#%{_datadir}/icons/hicolor/*/apps/gnome-swellfoop.*
+%{_datadir}/icons/hicolor/*/apps/gnome-samegnome.*
 %{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
 
-%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/swell-foop.*
+# %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/swell-foop.*
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnomine.*
 
 %{_libdir}/gnome-games
@@ -368,7 +369,7 @@ fi
 %attr(2551, root, games) %{_bindir}/iagno
 %attr(2551, root, games) %{_bindir}/gnomine
 
-%{_mandir}/man6/swell-foop.6.gz
+# %{_mandir}/man6/swell-foop.6.gz
 %{_mandir}/man6/iagno.6.gz
 %{_mandir}/man6/gnomine.6.gz
 %{_mandir}/man6/gnome-sudoku.6.gz



From sailer at fedoraproject.org  Wed Dec  2 11:18:49 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed,  2 Dec 2009 11:18:49 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl.spec,1.56,1.57
Message-ID: <20091202111849.342B611C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

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

Modified Files:
	ghdl.spec 
Log Message:
fix macro naming



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- ghdl.spec	2 Dec 2009 09:41:43 -0000	1.56
+++ ghdl.spec	2 Dec 2009 11:18:48 -0000	1.57
@@ -284,9 +284,9 @@ popd
 
 # Symlink v08 libraries for now
 P64=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/
-%{__ln} -s v93 ${P64}v08
+%{__ln_s} v93 ${P64}v08
 %ifarch x86_64
-%{__ln} -s v93 ${P32}v08
+%{__ln_s} v93 ${P32}v08
 %endif
 
 %clean



From devrim at fedoraproject.org  Wed Dec  2 11:20:04 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed,  2 Dec 2009 11:20:04 +0000 (UTC)
Subject: File geos-3.2.0rc3.tar.bz2 uploaded to lookaside cache by devrim
Message-ID: <20091202112004.E6F3E10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for geos:

13cf215971f379b587b90025a405ee1e  geos-3.2.0rc3.tar.bz2



From karsten at fedoraproject.org  Wed Dec  2 11:20:28 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:20:28 +0000 (UTC)
Subject: rpms/libtool/F-12 libtool.spec,1.79,1.80 sources,1.19,1.20
Message-ID: <20091202112028.7304511C03E3@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libtool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1633

Modified Files:
	libtool.spec sources 
Log Message:
- update to 2.2.6b, fixes CVE-2009-3736:
  libltdl may load and execute code from a library in the current directory



Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/F-12/libtool.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- libtool.spec	19 Oct 2009 12:11:09 -0000	1.79
+++ libtool.spec	2 Dec 2009 11:20:28 -0000	1.80
@@ -3,10 +3,10 @@
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 2.2.6
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
-Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}a.tar.lzma
+Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}b.tar.lzma
 Patch0:  libtool-2.2.6a-rpath.patch
 URL:     http://www.gnu.org/software/libtool/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
@@ -142,6 +142,10 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-16
+- update to 2.2.6b, fixes CVE-2009-3736:
+  libltdl may load and execute code from a library in the current directory
+
 * Mon Oct 19 2009 Jakub Jelinek <jakub at redhat.com> 2.2.6-15
 - Rebuild for gcc 4.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtool/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	12 Aug 2009 17:25:09 -0000	1.19
+++ sources	2 Dec 2009 11:20:28 -0000	1.20
@@ -1 +1 @@
-b121e4848cc53fdd69e796aed73b9ccf  libtool-2.2.6a.tar.lzma
+a4b36980765003b47dd75ac9429f4f11  libtool-2.2.6b.tar.lzma



From karsten at fedoraproject.org  Wed Dec  2 11:21:13 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:21:13 +0000 (UTC)
Subject: rpms/libtool/devel libtool.spec,1.80,1.81
Message-ID: <20091202112113.995E511C03E3@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	libtool.spec 
Log Message:
- make sure that NVR is higher than previous version



Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- libtool.spec	2 Dec 2009 11:13:49 -0000	1.80
+++ libtool.spec	2 Dec 2009 11:21:13 -0000	1.81
@@ -2,11 +2,11 @@
 
 Summary: The GNU Portable Library Tool
 Name:    libtool
-Version: 2.2.6b
-Release: 2%{?dist}
+Version: 2.2.6
+Release: 16%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
-Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.lzma
+Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}b.tar.lzma
 Patch0:  libtool-2.2.6a-rpath.patch
 URL:     http://www.gnu.org/software/libtool/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-16
+- make sure that NVR is higher than previous version
+
 * Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6b-2
 - fix gcc version
 



From karsten at fedoraproject.org  Wed Dec  2 11:29:13 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:29:13 +0000 (UTC)
Subject: rpms/libtool/devel libtool.spec,1.81,1.82
Message-ID: <20091202112913.228A311C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	libtool.spec 
Log Message:
- fix directory name used in libtool tarball




Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- libtool.spec	2 Dec 2009 11:21:13 -0000	1.81
+++ libtool.spec	2 Dec 2009 11:29:12 -0000	1.82
@@ -3,7 +3,7 @@
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 2.2.6
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}b.tar.lzma
@@ -67,7 +67,7 @@ Static libraries and header files for de
 
 
 %prep
-%setup -n libtool-%{version} -q
+%setup -n libtool-%{version}b -q
 %patch0 -p1 -b .rpath
 
 %build
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-17
+- fix directory name used in libtool tarball
+
 * Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-16
 - make sure that NVR is higher than previous version
 



From karsten at fedoraproject.org  Wed Dec  2 11:29:51 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:29:51 +0000 (UTC)
Subject: rpms/libtool/F-12 libtool.spec,1.80,1.81
Message-ID: <20091202112951.D9F5611C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libtool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4372

Modified Files:
	libtool.spec 
Log Message:
- fix directory name used in libtool tarball




Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/F-12/libtool.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- libtool.spec	2 Dec 2009 11:20:28 -0000	1.80
+++ libtool.spec	2 Dec 2009 11:29:51 -0000	1.81
@@ -3,7 +3,7 @@
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 2.2.6
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}b.tar.lzma
@@ -67,7 +67,7 @@ Static libraries and header files for de
 
 
 %prep
-%setup -n libtool-%{version} -q
+%setup -n libtool-%{version}b -q
 %patch0 -p1 -b .rpath
 
 %build
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-17
+- fix directory name used in libtool tarball
+
 * Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-16
 - update to 2.2.6b, fixes CVE-2009-3736:
   libltdl may load and execute code from a library in the current directory



From karsten at fedoraproject.org  Wed Dec  2 11:32:58 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:32:58 +0000 (UTC)
Subject: File libtool-2.2.6b.tar.gz uploaded to lookaside cache by karsten
Message-ID: <20091202113258.EF34610F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libtool:

07da460450490148c6d2df0f21481a25  libtool-2.2.6b.tar.gz



From karsten at fedoraproject.org  Wed Dec  2 11:34:10 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:34:10 +0000 (UTC)
Subject: rpms/libtool/F-11 .cvsignore, 1.18, 1.19 libtool.spec, 1.76,
	1.77 sources, 1.18, 1.19 libtool-1.5.24-relativepath.patch, 1.1, NONE
Message-ID: <20091202113410.1FFDE11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libtool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5514

Modified Files:
	.cvsignore libtool.spec sources 
Removed Files:
	libtool-1.5.24-relativepath.patch 
Log Message:
- update to 2.2.6b, fixes CVE-2009-3736:
  libltdl may load and execute code from a library in the current directory



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtool/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	13 Nov 2008 13:11:40 -0000	1.18
+++ .cvsignore	2 Dec 2009 11:34:09 -0000	1.19
@@ -1 +1 @@
-libtool-2.2.6a.tar.gz
+libtool-2.2.6b.tar.gz


Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/F-11/libtool.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- libtool.spec	30 Jul 2009 16:12:55 -0000	1.76
+++ libtool.spec	2 Dec 2009 11:34:09 -0000	1.77
@@ -1,12 +1,12 @@
-%define gcc_version 4.4.1
+%define gcc_version 4.4.0
 
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 2.2.6
-Release: 11%{?dist}.1
+Release: 11%{?dist}.2
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
-Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}a.tar.gz
+Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}b.tar.gz
 Patch0:  libtool-2.2.6a-rpath.patch
 URL:     http://www.gnu.org/software/libtool/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
@@ -67,7 +67,7 @@ Static libraries and header files for de
 
 
 %prep
-%setup -n libtool-%{version} -q
+%setup -n libtool-%{version}b -q
 %patch0 -p1 -b .rpath
 
 %build
@@ -142,6 +142,10 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-11.2
+- update to 2.2.6b, fixes CVE-2009-3736:
+  libltdl may load and execute code from a library in the current directory
+
 * Thu Jul 30 2009 Jakub Jelinek <jakub at redhat.com> 2.2.6-11.fc11.1
 - rebuilt against gcc-4.4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtool/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	13 Nov 2008 13:11:40 -0000	1.18
+++ sources	2 Dec 2009 11:34:09 -0000	1.19
@@ -1 +1 @@
-8ca1ea241cd27ff9832e045fe9afe4fd  libtool-2.2.6a.tar.gz
+07da460450490148c6d2df0f21481a25  libtool-2.2.6b.tar.gz


--- libtool-1.5.24-relativepath.patch DELETED ---



From caolanm at fedoraproject.org  Wed Dec  2 11:35:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Dec 2009 11:35:00 +0000 (UTC)
Subject: File icu-config uploaded to lookaside cache by caolanm
Message-ID: <20091202113500.17D4E10F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for icu:

325a88422c900e69a7efce1b86a49ac4  icu-config



From caolanm at fedoraproject.org  Wed Dec  2 11:36:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Dec 2009 11:36:09 +0000 (UTC)
Subject: rpms/icu/devel icu.spec,1.102,1.103 sources,1.21,1.22
Message-ID: <20091202113609.395CF11C0095@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	icu.spec sources 
Log Message:
Resolves: rhbz#543386 update icu-config


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- icu.spec	19 Nov 2009 09:21:31 -0000	1.102
+++ icu.spec	2 Dec 2009 11:36:08 -0000	1.103
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.2.1
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Wed Dec 02 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.1-8
+- Resolves: rhbz#543386 update icu-config
+
 * Thu Nov 19 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.1-7
 - Fix FTBFS with yet another autoconf version that changes
   behaviour


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	14 Jul 2009 11:44:13 -0000	1.21
+++ sources	2 Dec 2009 11:36:09 -0000	1.22
@@ -1,2 +1,2 @@
 e3738abd0d3ce1870dc1fd1f22bba5b1  icu4c-4_2_1-src.tgz
-d254b3d49f4c343fa1a7aae70a32fb2d  icu-config
+325a88422c900e69a7efce1b86a49ac4  icu-config



From caolanm at fedoraproject.org  Wed Dec  2 11:38:36 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  2 Dec 2009 11:38:36 +0000 (UTC)
Subject: rpms/icu/F-12 icu.spec,1.101,1.102 sources,1.21,1.22
Message-ID: <20091202113836.AFC7511C0095@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/icu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6825

Modified Files:
	icu.spec sources 
Log Message:
Resolves: rhbz#543386 update icu-config


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/F-12/icu.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- icu.spec	1 Sep 2009 10:31:45 -0000	1.101
+++ icu.spec	2 Dec 2009 11:38:36 -0000	1.102
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.2.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Wed Dec 02 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.1-7
+- Resolves: rhbz#543386 update icu-config
+
 * Tue Sep 01 2009 Caolan McNamara <caolanm at redhat.com> - 4.2.1-6
 - Resolves: rhbz#520468 fix s390x and other secondary archs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icu/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	14 Jul 2009 11:44:13 -0000	1.21
+++ sources	2 Dec 2009 11:38:36 -0000	1.22
@@ -1,2 +1,2 @@
 e3738abd0d3ce1870dc1fd1f22bba5b1  icu4c-4_2_1-src.tgz
-d254b3d49f4c343fa1a7aae70a32fb2d  icu-config
+325a88422c900e69a7efce1b86a49ac4  icu-config



From karsten at fedoraproject.org  Wed Dec  2 11:39:33 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:39:33 +0000 (UTC)
Subject: rpms/libtool/F-10 libtool-1.5.22-CVE-2009-3736.patch, NONE,
	1.1 libtool.spec, 1.63, 1.64
Message-ID: <20091202113933.A367C11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	libtool.spec 
Added Files:
	libtool-1.5.22-CVE-2009-3736.patch 
Log Message:
- add fix for CVE-2009-3736:
  libltdl may load and execute code from a library in the current directory


libtool-1.5.22-CVE-2009-3736.patch:
 ltdl.c |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

--- NEW FILE libtool-1.5.22-CVE-2009-3736.patch ---
diff -urN libtool-1.5.26.orig/libltdl/ltdl.c libtool-1.5.26/libltdl/ltdl.c
--- libtool-1.5.26.orig/libltdl/ltdl.c	2007-11-15 13:36:41.000000000 -0600
+++ libtool-1.5.26/libltdl/ltdl.c	2009-11-15 21:13:37.000000000 -0600
@@ -2192,7 +2192,8 @@
 static	int	try_dlopen	      LT_PARAMS((lt_dlhandle *handle,
 						 const char *filename));
 static	int	tryall_dlopen	      LT_PARAMS((lt_dlhandle *handle,
-						 const char *filename));
+						 const char *filename,
+						 const char * useloader));
 static	int	unload_deplibs	      LT_PARAMS((lt_dlhandle handle));
 static	int	lt_argz_insert	      LT_PARAMS((char **pargz,
 						 size_t *pargz_len,
@@ -2390,9 +2391,10 @@
 }
 
 static int
-tryall_dlopen (handle, filename)
+tryall_dlopen (handle, filename, useloader)
      lt_dlhandle *handle;
      const char *filename;
+     const char *useloader;
 {
   lt_dlhandle	 cur;
   lt_dlloader   *loader;
@@ -2459,6 +2461,11 @@
 
   while (loader)
     {
+      if (useloader && strcmp(loader->loader_name, useloader))
+	{
+	  loader = loader->next;
+	  continue;
+	}
       lt_user_data data = loader->dlloader_data;
 
       cur->module = loader->module_open (data, filename);
@@ -2528,7 +2535,7 @@
       error += tryall_dlopen_module (handle,
 				     (const char *) 0, prefix, filename);
     }
-  else if (tryall_dlopen (handle, filename) != 0)
+  else if (tryall_dlopen (handle, filename, NULL) != 0)
     {
       ++error;
     }
@@ -2549,7 +2556,7 @@
   /* Try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available.  */
-  if (old_name && tryall_dlopen (handle, old_name) == 0)
+  if (old_name && tryall_dlopen (handle, old_name, "dlpreload") == 0)
     {
       return 0;
     }
@@ -2813,7 +2820,7 @@
 
   /* Try to dlopen the file, but do not continue searching in any
      case.  */
-  if (tryall_dlopen (handle, filename) != 0)
+  if (tryall_dlopen (handle, filename,NULL) != 0)
     *handle = 0;
 
   return 1;
@@ -3103,7 +3110,7 @@
       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
       LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
 
-      if (tryall_dlopen (&newhandle, 0) != 0)
+      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
 	{
 	  LT_DLFREE (*phandle);
 	  return 1;
@@ -3225,7 +3232,7 @@
 	    }
 #endif
 	}
-      if (!file)
+      else
 	{
 	  file = fopen (filename, LT_READTEXT_MODE);
 	}
@@ -3412,7 +3419,7 @@
 #endif
 		   )))
 	{
-          if (tryall_dlopen (&newhandle, filename) != 0)
+          if (tryall_dlopen (&newhandle, filename, NULL) != 0)
             {
               newhandle = NULL;
             }


Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/F-10/libtool.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- libtool.spec	29 Aug 2008 22:21:39 -0000	1.63
+++ libtool.spec	2 Dec 2009 11:39:33 -0000	1.64
@@ -3,7 +3,7 @@
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 1.5.26
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz
@@ -13,9 +13,7 @@ Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 Patch1:  libtool-1.5.24-multilib.patch
 
-# don't  read .la file in current working directory, root might get tricked
-# into running a prepared binary in that directory:
-Patch2:  libtool-1.5.24-relativepath.patch
+Patch2:  libtool-1.5.22-CVE-2009-3736.patch
 
 BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo
 Requires: autoconf >= 2.58, automake >= 1.4
@@ -152,6 +150,10 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 1.5.26-4.1
+- add fix for CVE-2009-3736:
+  libltdl may load and execute code from a library in the current directory
+
 * Fri Aug 29 2008 Dennis Gilmore <dennis at ausil.us> 1.5.26-4
 - rebuild for gcc-4.3.2
 



From karsten at fedoraproject.org  Wed Dec  2 11:40:40 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:40:40 +0000 (UTC)
Subject: rpms/libtool/F-10 libtool-1.5.24-relativepath.patch,1.1,NONE
Message-ID: <20091202114040.3A56E11C03FC@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Removed Files:
	libtool-1.5.24-relativepath.patch 
Log Message:
- drop obsolete patch



--- libtool-1.5.24-relativepath.patch DELETED ---



From karsten at fedoraproject.org  Wed Dec  2 11:41:59 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 11:41:59 +0000 (UTC)
Subject: rpms/libtool/F-12 libtool-1.5.24-relativepath.patch,1.1,NONE
Message-ID: <20091202114159.E4F1311C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libtool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7978

Removed Files:
	libtool-1.5.24-relativepath.patch 
Log Message:
- drop obsolete patch



--- libtool-1.5.24-relativepath.patch DELETED ---



From hadess at fedoraproject.org  Wed Dec  2 11:47:56 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  2 Dec 2009 11:47:56 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.239,1.240
Message-ID: <20091202114756.1EA5811C0095@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-games.spec 
Log Message:
blackjack was removed too


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- gnome-games.spec	2 Dec 2009 11:14:21 -0000	1.239
+++ gnome-games.spec	2 Dec 2009 11:47:55 -0000	1.240
@@ -7,11 +7,9 @@
 
 %if %{build_card}
 %define card_schemas aisleriot.schemas
-%define card_schemas_extra blackjack.schemas
 %define card_desktops $RPM_BUILD_ROOT%{_datadir}/applications/gnome-sol.desktop $RPM_BUILD_ROOT%{_datadir}/applications/gnome-freecell.desktop
 %else
 %define card_schemas %{nil}
-%define card_schemas_extra %{nil}
 %define card_desktops %{nil}
 %endif
 
@@ -22,10 +20,10 @@
 %endif
 
 %if !%{build_card} && !%{build_tali}
-%define omitgames --enable-omitgames=aisleriot,blackjack,gtali
+%define omitgames --enable-omitgames=aisleriot,gtali
 %else
 %if !%{build_card}
-%define omitgames --enable-omitgames=aisleriot,blackjack
+%define omitgames --enable-omitgames=aisleriot
 %else
 %if !%{build_tali}
 %define omitgames --enable-omitgames=gtali
@@ -206,7 +204,6 @@ fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 (cd %{_sysconfdir}/gconf/schemas;   \
 gconftool-2 --makefile-install-rule \
-	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
 	glchess.schemas             \
 	glines.schemas              \
@@ -244,8 +241,8 @@ if [ "$1" -gt 1 ]; then
   (cd %{_sysconfdir}/gconf/schemas;   \
   if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
   if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
+  if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
-	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
 	glchess.schemas             \
 	glines.schemas              \
@@ -282,8 +279,8 @@ if [ "$1" -eq 0 ]; then
   (cd %{_sysconfdir}/gconf/schemas;   \
   if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
   if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
+  if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
-	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
 	glchess.schemas             \
 	glines.schemas              \
@@ -381,7 +378,6 @@ fi
 %{python_sitelib}/glchess
 %{_datadir}/glchess
 
-%{_datadir}/applications/gnome-blackjack.desktop
 %{_datadir}/applications/gnome-freecell.desktop
 %{_datadir}/applications/gnome-glchess.desktop
 %{_datadir}/applications/gnome-glines.desktop
@@ -392,9 +388,8 @@ fi
 %{_datadir}/applications/gnome-gnotski.desktop
 %{_datadir}/applications/gnome-gtali.desktop
 %{_datadir}/applications/gnome-mahjongg.desktop
-%{_datadir}/applications/quadrapassel.desktop
+%{_datadir}/applications/gnome-quadrapassel.desktop
 
-%{_mandir}/man6/blackjack.6.gz
 %{_mandir}/man6/glchess.6.gz
 %{_mandir}/man6/glines.6.gz
 %{_mandir}/man6/gnect.6.gz
@@ -418,9 +413,6 @@ fi
 
 # these are not setgid games
 %{_bindir}/gnect
-%if %{build_card}
-%{_bindir}/blackjack
-%endif
 %{_bindir}/glchess
 
 # these are setgid games
@@ -429,16 +421,13 @@ fi
 %attr(2551, root, games) %{_bindir}/gtali
 %endif
 %attr(2551, root, games) %{_bindir}/gnobots2
-%attr(2551, root, games) %{_bindir}/gnome-falling-blocks
+%attr(2551, root, games) %{_bindir}/gnome-quadrapassel
 %attr(2551, root, games) %{_bindir}/gnotravex
 %attr(2551, root, games) %{_bindir}/gnotski
 %attr(2551, root, games) %{_bindir}/gnibbles
 %attr(2551, root, games) %{_bindir}/glines
 
 # gconf schemas
-%if %{build_card}
-%{_sysconfdir}/gconf/schemas/blackjack.schemas
-%endif
 %{_sysconfdir}/gconf/schemas/glines.schemas
 %{_sysconfdir}/gconf/schemas/gnect.schemas
 %{_sysconfdir}/gconf/schemas/gnibbles.schemas
@@ -452,7 +441,6 @@ fi
 %{_sysconfdir}/gconf/schemas/mahjongg.schemas
 %{_sysconfdir}/gconf/schemas/glchess.schemas
 
-%{_datadir}/gnome-games/blackjack
 %{_datadir}/gnome-games/glines
 %{_datadir}/gnome-games/gnect
 %{_datadir}/gnome-games/gnibbles
@@ -462,13 +450,13 @@ fi
 %{_datadir}/gnome-games/mahjongg
 %{_datadir}/gnome-games/gnotski
 
-%{_datadir}/icons/hicolor/*/apps/gnome-blackjack.*
 %{_datadir}/icons/hicolor/*/apps/gnome-freecell.*
 %{_datadir}/icons/hicolor/*/apps/gnome-glchess.*
 %{_datadir}/icons/hicolor/*/apps/gnome-glines.*
 %{_datadir}/icons/hicolor/*/apps/gnome-gnect.*
 %{_datadir}/icons/hicolor/*/apps/gnome-gnibbles.*
-%{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
+# %{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
+%{_datadir}/icons/hicolor/*/apps/gnome-gnometris.*
 %{_datadir}/icons/hicolor/*/apps/gnome-klotski.*
 %{_datadir}/icons/hicolor/*/apps/gnome-mahjongg.*
 %{_datadir}/icons/hicolor/*/apps/gnome-robots.*



From ltinkl at fedoraproject.org  Wed Dec  2 11:50:43 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 11:50:43 +0000 (UTC)
Subject: File kdeedu-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202115043.88B1F10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeedu:

0ed77c40ad2b7fe30977e81f3e52ea35  kdeedu-4.3.80.tar.bz2



From epienbro at fedoraproject.org  Wed Dec  2 11:59:12 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed,  2 Dec 2009 11:59:12 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel mingw32-gtk2-enable_static_build.patch, 1.1,
	1.2 mingw32-gtk2.spec, 1.26, 1.27
Message-ID: <20091202115912.3721F11C0095@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12088

Modified Files:
	mingw32-gtk2-enable_static_build.patch mingw32-gtk2.spec 
Log Message:
Dropped the autoreconf call


mingw32-gtk2-enable_static_build.patch:
 configure    |   14 --------------
 configure.in |   20 ++++++++++----------
 2 files changed, 10 insertions(+), 24 deletions(-)

Index: mingw32-gtk2-enable_static_build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2-enable_static_build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-gtk2-enable_static_build.patch	8 Mar 2009 20:52:18 -0000	1.1
+++ mingw32-gtk2-enable_static_build.patch	2 Dec 2009 11:59:11 -0000	1.2
@@ -27,3 +27,26 @@
  
  AC_LIBTOOL_WIN32_DLL
  AM_PROG_LIBTOOL
+--- configure.orig	2009-12-02 12:33:12.670948100 +0100
++++ configure	2009-12-02 12:33:55.898932594 +0100
+@@ -4993,20 +4993,6 @@
+ 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 "$os_win32" = "yes"; then
+-  if test x$enable_static = xyes -o x$enable_static = x; then
+-    { $as_echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
+-    enable_static=no
+-  fi
+-  if test x$enable_shared = xno; then
+-    { $as_echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
+-  fi
+-  enable_shared=yes
+-fi
+-
+ enable_win32_dll=yes
+ 
+ case $host in


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mingw32-gtk2.spec	2 Dec 2009 11:14:05 -0000	1.26
+++ mingw32-gtk2.spec	2 Dec 2009 11:59:11 -0000	1.27
@@ -64,12 +64,6 @@ BuildRequires:  gtk2
 # Native one for gdk-pixbuf-csource
 BuildRequires:  gtk2-devel
 
-# These are required for the static library patch
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
-BuildRequires:  gtk-doc
-
 Requires:       pkgconfig
 
 
@@ -96,11 +90,6 @@ Static version of the MinGW Windows Gtk2
 %patch1001 -p0
 %patch1002 -p0
 
-# Regenerate the configure script
-aclocal
-autoreconf
-libtoolize
-
 
 %build
 # Need to run the correct version of glib-mkenums.
@@ -354,6 +343,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Dec  2 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.19.1-1
 - Update to 2.19.1
+- Dropped the autoreconf call
 
 * Sun Nov 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.19.0-1
 - Update to 2.19.0



From ltinkl at fedoraproject.org  Wed Dec  2 11:59:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 11:59:14 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore, 1.74, 1.75 kdeedu.spec, 1.214,
	1.215 sources, 1.74, 1.75
Message-ID: <20091202115914.BD26E11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	24 Nov 2009 16:44:10 -0000	1.74
+++ .cvsignore	2 Dec 2009 11:59:14 -0000	1.75
@@ -1 +1 @@
-kdeedu-4.3.75svn1048496.tar.bz2
+kdeedu-4.3.80.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- kdeedu.spec	24 Nov 2009 16:44:10 -0000	1.214
+++ kdeedu.spec	2 Dec 2009 11:59:14 -0000	1.215
@@ -1,5 +1,3 @@
-%define alphatag svn1048496
-
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
 %ifarch alpha %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
@@ -8,15 +6,15 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.75
-Release: 0.1.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
 
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
 Patch2: kdeedu-4.3.75-desktop-fix.patch
@@ -531,6 +529,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	24 Nov 2009 16:44:11 -0000	1.74
+++ sources	2 Dec 2009 11:59:14 -0000	1.75
@@ -1 +1 @@
-ff92e80e2e391a081802d2d571fdf2e2  kdeedu-4.3.75svn1048496.tar.bz2
+0ed77c40ad2b7fe30977e81f3e52ea35  kdeedu-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 12:10:45 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 12:10:45 +0000 (UTC)
Subject: File kdegames-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202121045.9C06210F849@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdegames:

94099f4e1917f4a68b2be679e2c0a17d  kdegames-4.3.80.tar.bz2



From nbecker at fedoraproject.org  Wed Dec  2 12:20:50 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Wed,  2 Dec 2009 12:20:50 +0000 (UTC)
Subject: File mercurial-1.4.1.tar.gz uploaded to lookaside cache by nbecker
Message-ID: <20091202122050.0292210F895@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mercurial:

eacffecad59ec145e61a1edf332b3f1f  mercurial-1.4.1.tar.gz



From ssp at fedoraproject.org  Wed Dec  2 12:22:02 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed,  2 Dec 2009 12:22:02 +0000 (UTC)
Subject: File pixman-0.17.2.tar.gz uploaded to lookaside cache by ssp
Message-ID: <20091202122202.4414210F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pixman:

006c74f1450e5ed2e1bdaf88e9806faa  pixman-0.17.2.tar.gz



From nbecker at fedoraproject.org  Wed Dec  2 12:22:06 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Wed,  2 Dec 2009 12:22:06 +0000 (UTC)
Subject: rpms/mercurial/devel .cvsignore, 1.28, 1.29 mercurial.spec, 1.75,
	1.76 sources, 1.30, 1.31
Message-ID: <20091202122206.C61C411C0095@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
Update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	16 Nov 2009 21:42:58 -0000	1.28
+++ .cvsignore	2 Dec 2009 12:22:05 -0000	1.29
@@ -1 +1 @@
-mercurial-1.4.tar.gz
+mercurial-1.4.1.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- mercurial.spec	16 Nov 2009 21:42:58 -0000	1.75
+++ mercurial.spec	2 Dec 2009 12:22:05 -0000	1.76
@@ -2,7 +2,7 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.4
+Version: 1.4.1
 Release: 1%{?dist}
 License: GPLv2
 Group: Development/Tools
@@ -170,6 +170,12 @@ rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py
 
 %changelog
+* Wed Dec  2 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Mon Nov 16 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4-1.1
+- Bump to 1.4-1.1
+
 * Mon Nov 16 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4-1
 - Update to 1.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	16 Nov 2009 21:42:58 -0000	1.30
+++ sources	2 Dec 2009 12:22:05 -0000	1.31
@@ -1 +1 @@
-951ebd4a8153eaa3c56fc0ce2575ab70  mercurial-1.4.tar.gz
+eacffecad59ec145e61a1edf332b3f1f  mercurial-1.4.1.tar.gz



From emunson at fedoraproject.org  Wed Dec  2 12:22:15 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed,  2 Dec 2009 12:22:15 +0000 (UTC)
Subject: File lsvpd-1.6.7.tar.gz uploaded to lookaside cache by emunson
Message-ID: <20091202122215.9C59C10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lsvpd:

97e6363177ee6c5dbf0cb198f5554af8  lsvpd-1.6.7.tar.gz



From emunson at fedoraproject.org  Wed Dec  2 12:23:02 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed,  2 Dec 2009 12:23:02 +0000 (UTC)
Subject: rpms/lsvpd/devel lsvpd-1.6.7-ids-lookup.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 import.log, 1.1, 1.2 lsvpd.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20091202122302.3D9EF11C0095@cvs1.fedora.phx.redhat.com>

Author: emunson

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

Modified Files:
	.cvsignore import.log lsvpd.spec sources 
Added Files:
	lsvpd-1.6.7-ids-lookup.patch 
Log Message:
Updating to lsvpd-1.6.7


lsvpd-1.6.7-ids-lookup.patch:
 include/devicelookup.hpp                      |    8 +++-
 internal/devicelookup.cpp                     |   45 ++++++++++++++++++++++++--
 internal/sys_interface/sysfstreecollector.cpp |    4 +-
 3 files changed, 51 insertions(+), 6 deletions(-)

--- NEW FILE lsvpd-1.6.7-ids-lookup.patch ---
### Eclipse Workspace Patch 1.0
#P lsvpd-new

Add ids file lookup to runtime.

Currently the pci.ids and usb.ids files are located by the Makefile
and the location defined by the build.  This presents a problem when
the build system has the files in a different location from the host.
This patch addresses this problem by moving the logic to locate the
ids files into the vpdupdate code.

Signed-off-by: Eric B Munson <ebmunson at us.ibm.com>

---

Index: src/include/devicelookup.hpp
===================================================================
RCS file: /cvsroot/lsvpd/lsvpd-new/src/include/devicelookup.hpp,v
retrieving revision 1.1
diff -u -r1.1 devicelookup.hpp
--- src/include/devicelookup.hpp	18 Feb 2008 19:45:54 -0000	1.1
+++ src/include/devicelookup.hpp	16 Oct 2009 09:35:42 -0000
@@ -58,7 +58,11 @@
 
 			void fillManus( ifstream& idFile );
 
+			static void findIdsPrefix( );
+			
 		public:
+			static string idsPrefix;
+		
 			DeviceLookup( ifstream& idFile );
 			~DeviceLookup( );
 			const Manufacturer* getManufacturer( int id ) const;
@@ -99,8 +103,8 @@
 			 */
 			const string& getName( int manID, int devID, int subID )const;
 
-			static const string PCI_ID_FILE;
-			static const string USB_ID_FILE;
+			static string getPciIds( );
+			static string getUsbIds( );
 	};
 }
 #endif
Index: src/internal/sys_interface/sysfstreecollector.cpp
===================================================================
RCS file: /cvsroot/lsvpd/lsvpd-new/src/internal/sys_interface/sysfstreecollector.cpp,v
retrieving revision 1.11
diff -u -r1.11 sysfstreecollector.cpp
--- src/internal/sys_interface/sysfstreecollector.cpp	16 Mar 2009 13:24:48 -0000	1.11
+++ src/internal/sys_interface/sysfstreecollector.cpp	16 Oct 2009 09:35:43 -0000
@@ -77,7 +77,7 @@
 		mPciTable = NULL;
 		mUsbTable = NULL;
 
-		id.open( DeviceLookup::PCI_ID_FILE.c_str( ), ios::in );
+		id.open( DeviceLookup::getPciIds( ).c_str( ), ios::in );
 		if( id )
 		{
 			mPciTable = new DeviceLookup( id );
@@ -91,7 +91,7 @@
 				LOG_ERR );
 		}
 
-		id.open( DeviceLookup::USB_ID_FILE.c_str( ), ios::in );
+		id.open( DeviceLookup::getUsbIds( ).c_str( ), ios::in );
 		if( id )
 		{
 			mUsbTable = new DeviceLookup( id );
Index: src/internal/devicelookup.cpp
===================================================================
RCS file: /cvsroot/lsvpd/lsvpd-new/src/internal/devicelookup.cpp,v
retrieving revision 1.2
diff -u -r1.2 devicelookup.cpp
--- src/internal/devicelookup.cpp	18 Feb 2008 19:45:54 -0000	1.2
+++ src/internal/devicelookup.cpp	16 Oct 2009 09:35:43 -0000
@@ -27,6 +27,8 @@
 #include <libvpd-2/vpdexception.hpp>
 #include <libvpd-2/lsvpd.hpp>
 
+#include <sys/stat.h>
+
 /**
  * The Manufacturer object will store the id and name of a single manufacturer
  * entry from the pci.ids file.  It will also store a hash_map of devices
@@ -34,8 +36,6 @@
  */
 namespace lsvpd
 {
-	const string DeviceLookup::PCI_ID_FILE( PCI_IDS );
-	const string DeviceLookup::USB_ID_FILE( USB_IDS );
 
 	DeviceLookup::DeviceLookup( ifstream& pciID )
 	{
@@ -119,4 +119,45 @@
 		const Device* d = m->getDevice( devID );
 		return (d->getSubDevice( subID ))->getName( );
 	}
+	
+	void DeviceLookup::findIdsPrefix( )
+	{
+		// There are 6 potential locations for the ids files:
+		// /usr/share, /usr/local/share, /usr/share/misc,
+		// /usr/local/share/misc, /usr/share/hwdata,
+		// and /usr/local/share/hwdata
+		
+		struct stat buf;
+		
+		if ( !stat( "/usr/share/pci.ids", &buf ) )
+			DeviceLookup::idsPrefix = "/usr/share";
+		else if ( !stat( "/usr/local/share/pci.ids", &buf ) )
+			DeviceLookup::idsPrefix = "/usr/local/share";
+		else if ( !stat( "/usr/share/misc/pci.ids", &buf ) )
+			DeviceLookup::idsPrefix = "/usr/share/misc";
+		else if ( !stat( "/usr/local/share/misc/pci.ids", &buf ) )
+			DeviceLookup::idsPrefix = "/usr/local/share/misc";
+		else if ( !stat( "/usr/share/hwdata/pci.ids", &buf ) )
+			DeviceLookup::idsPrefix = "/usr/share/hwdata";
+		else if ( !stat( "/usr/local/share/hwdata/pci.ids", &buf ) )
+			DeviceLookup::idsPrefix = "/usr/local/share/hwdata";
+	}
+	
+	string DeviceLookup::getPciIds( )
+	{
+		if ( DeviceLookup::idsPrefix == "" )
+			DeviceLookup::findIdsPrefix( );
+			
+		return DeviceLookup::idsPrefix + "/pci.ids";
+	}
+	
+	string DeviceLookup::getUsbIds( )
+	{
+		if ( DeviceLookup::idsPrefix == "" )
+			findIdsPrefix( );
+			
+		return DeviceLookup::idsPrefix + "/usb.ids";
+	}
+	
+	string DeviceLookup::idsPrefix = "";
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lsvpd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Mar 2009 13:19:13 -0000	1.4
+++ .cvsignore	2 Dec 2009 12:23:01 -0000	1.5
@@ -1 +1 @@
-lsvpd-1.6.5.tar.gz
+lsvpd-1.6.7.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lsvpd/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Mar 2009 13:19:13 -0000	1.1
+++ import.log	2 Dec 2009 12:23:01 -0000	1.2
@@ -1 +1,2 @@
 lsvpd-1_6_5-1_fc10:HEAD:lsvpd-1.6.5-1.src.rpm:1237209622
+lsvpd-1_6_7-1_fc12:HEAD:lsvpd-1.6.7-1.src.rpm:1259756539


Index: lsvpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsvpd/devel/lsvpd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- lsvpd.spec	25 Jul 2009 11:22:20 -0000	1.10
+++ lsvpd.spec	2 Dec 2009 12:23:01 -0000	1.11
@@ -1,9 +1,9 @@
 %define name lsvpd
-%define version 1.6.5
+%define version 1.6.7
 
 Name:		%{name}
 Version:	%{version}
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	VPD/hardware inventory utilities for Linux
 
 Group:		Applications/System
@@ -11,12 +11,16 @@ License:	GPLv2+
 URL:		http://linux-diag.sf.net/Lsvpd.html
 Source:		http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch0:		lsvpd-1.6.4-sg3_utils-1.26.patch
+Patch1:		lsvpd-1.6.7-ids-lookup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	sg3_utils-devel libvpd-devel zlib-devel
 Requires(post): /usr/sbin/vpdupdate
 
 # By default, build without librtas because it does not yet exist in Fedora
-%{!?_with_librtas: %{!?_without_librtas: %define _without_librtas --without-librtas }}
+
+# librtas is now part of Fedora, lsvpd provides much more information with
+# librtas on POWER
+#%{!?_with_librtas: %{!?_without_librtas: %define _without_librtas --without-librtas }}
 
 %ifarch ppc
 %{?_with_librtas:BuildRequires: librtas-devel }
@@ -39,6 +43,7 @@ on POWER PC based systems.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 %configure
@@ -71,6 +76,11 @@ on POWER PC based systems.
 %dir %{_sysconfdir}/lsvpd
 
 %changelog
+* Wed Dec 02 2009 Eric Munson <ebmunson at us.ibm.com> - 1.6.7-1
+- Update to latest lsvpd release
+- Add librtas support to build on POWERPC
+- Add patch to lookup *.ids file location at runtime
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lsvpd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Mar 2009 13:19:13 -0000	1.4
+++ sources	2 Dec 2009 12:23:02 -0000	1.5
@@ -1 +1 @@
-cdc0e247fd31bec97989d128d61efd3e  lsvpd-1.6.5.tar.gz
+97e6363177ee6c5dbf0cb198f5554af8  lsvpd-1.6.7.tar.gz



From ssp at fedoraproject.org  Wed Dec  2 12:23:39 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed,  2 Dec 2009 12:23:39 +0000 (UTC)
Subject: File pixman-0.17.2.tar.bz2 uploaded to lookaside cache by ssp
Message-ID: <20091202122339.205E410F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pixman:

64070b49e136f66640adf0f21c0b5fc8  pixman-0.17.2.tar.bz2



From ssp at fedoraproject.org  Wed Dec  2 12:25:44 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Wed,  2 Dec 2009 12:25:44 +0000 (UTC)
Subject: rpms/pixman/devel .cvsignore, 1.29, 1.30 pixman.spec, 1.44,
	1.45 sources, 1.32, 1.33
Message-ID: <20091202122544.ED60211C0095@cvs1.fedora.phx.redhat.com>

Author: ssp

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

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
pixman 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	28 Sep 2009 13:52:56 -0000	1.29
+++ .cvsignore	2 Dec 2009 12:25:44 -0000	1.30
@@ -3,3 +3,5 @@ pixman-0.15.20.tar.gz
 pixman-0.15.20.tar.bz2
 pixman-0.16.0.tar.bz2
 pixman-0.16.2.tar.bz2
+pixman-0.17.2.tar.gz
+pixman-0.17.2.tar.bz2


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- pixman.spec	28 Sep 2009 13:52:56 -0000	1.44
+++ pixman.spec	2 Dec 2009 12:25:44 -0000	1.45
@@ -2,7 +2,7 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.16.2
+Version:        0.17.2
 Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Wed Dec 2 2009 Soren Sandmann <ssp at redhat.com> - 0.17.2-1
+- pixman 0.17.2
+
 * Mon Sep 28 2009 Soren Sandmann <ssp at redhat.com> - 0.16.2-1
 - pixman 0.16.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	10 Nov 2009 16:19:15 -0000	1.32
+++ sources	2 Dec 2009 12:25:44 -0000	1.33
@@ -1 +1,3 @@
 0ce7de6d649f1a80d328b05e403730b6  pixman-0.16.2.tar.bz2
+006c74f1450e5ed2e1bdaf88e9806faa  pixman-0.17.2.tar.gz
+64070b49e136f66640adf0f21c0b5fc8  pixman-0.17.2.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:05 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up watchcommits
Message-ID: <20091202123105.F38B110F892@bastion2.fedora.phx.redhat.com>

rnovacek has given up the watchcommits acl on kdepim3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:06 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up watchbugzilla
Message-ID: <20091202123106.5E74910F899@bastion2.fedora.phx.redhat.com>

rnovacek has given up the watchbugzilla acl on kdepim3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:08 +0000
Subject: [pkgdb] kdepim3: rnovacek has requested commit
Message-ID: <20091202123108.1599310F89D@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on kdepim3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:10 +0000
Subject: [pkgdb] kdepim3: rnovacek has requested approveacls
Message-ID: <20091202123110.1110D10F8A1@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on kdepim3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:20 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up watchbugzilla
Message-ID: <20091202123120.5166810F8A4@bastion2.fedora.phx.redhat.com>

rnovacek has given up the watchbugzilla acl on kdepim3 (Fedora 11)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:21 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up watchcommits
Message-ID: <20091202123121.5881B10F8A8@bastion2.fedora.phx.redhat.com>

rnovacek has given up the watchcommits acl on kdepim3 (Fedora 11)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:22 +0000
Subject: [pkgdb] kdepim3: rnovacek has requested approveacls
Message-ID: <20091202123123.1EFF110F8B0@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on kdepim3 (Fedora 11)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:22 +0000
Subject: [pkgdb] kdepim3: rnovacek has requested commit
Message-ID: <20091202123123.2E82B10F895@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on kdepim3 (Fedora 11)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:28 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up watchbugzilla
Message-ID: <20091202123128.AC7A110F8AA@bastion2.fedora.phx.redhat.com>

rnovacek has given up the watchbugzilla acl on kdepim3 (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:29 +0000
Subject: [pkgdb] kdepim3: rnovacek has requested commit
Message-ID: <20091202123129.63B3510F8B1@bastion2.fedora.phx.redhat.com>

rnovacek has requested the commit acl on kdepim3 (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:29 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up watchcommits
Message-ID: <20091202123129.8C7D210F8B2@bastion2.fedora.phx.redhat.com>

rnovacek has given up the watchcommits acl on kdepim3 (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:31:30 +0000
Subject: [pkgdb] kdepim3: rnovacek has requested approveacls
Message-ID: <20091202123130.5650C10F8B6@bastion2.fedora.phx.redhat.com>

rnovacek has requested the approveacls acl on kdepim3 (Fedora 12)

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



From stevetraylen at fedoraproject.org  Wed Dec  2 12:32:22 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed,  2 Dec 2009 12:32:22 +0000 (UTC)
Subject: File xmltooling-1.3.2.tar.gz uploaded to lookaside cache by
	stevetraylen
Message-ID: <20091202123222.AF2C710F896@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xmltooling:

92c416258717fdb2ca8151d76cded225  xmltooling-1.3.2.tar.gz



From pkgdb at fedoraproject.org  Wed Dec  2 12:33:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:33:39 +0000
Subject: [pkgdb] taskjuggler ownership updated
Message-ID: <20091202123339.283C510F891@bastion2.fedora.phx.redhat.com>

Package taskjuggler in Fedora devel was orphaned by ovasik

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:33:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:33:43 +0000
Subject: [pkgdb] taskjuggler ownership updated
Message-ID: <20091202123343.581A510F892@bastion2.fedora.phx.redhat.com>

Package taskjuggler in Fedora 12 was orphaned by ovasik

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:33:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:33:44 +0000
Subject: [pkgdb] taskjuggler ownership updated
Message-ID: <20091202123344.C24AB10F896@bastion2.fedora.phx.redhat.com>

Package taskjuggler in Fedora 11 was orphaned by ovasik

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



From dsd at fedoraproject.org  Wed Dec  2 12:34:29 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  2 Dec 2009 12:34:29 +0000 (UTC)
Subject: File sugar-0.84.8.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091202123429.90FEE10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar:

3cf91e134761761aaa33cf73140f8554  sugar-0.84.8.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec  2 12:34:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:34:27 +0000
Subject: [pkgdb] taskjuggler ownership updated
Message-ID: <20091202123427.5CC0D10F892@bastion2.fedora.phx.redhat.com>

Package taskjuggler in Fedora devel is now owned by rnovacek

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:34:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:34:34 +0000
Subject: [pkgdb] taskjuggler ownership updated
Message-ID: <20091202123434.1618910F895@bastion2.fedora.phx.redhat.com>

Package taskjuggler in Fedora 11 is now owned by rnovacek

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:34:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:34:35 +0000
Subject: [pkgdb] taskjuggler ownership updated
Message-ID: <20091202123435.4A77710F8A1@bastion2.fedora.phx.redhat.com>

Package taskjuggler in Fedora 12 is now owned by rnovacek

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



From dsd at fedoraproject.org  Wed Dec  2 12:36:07 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  2 Dec 2009 12:36:07 +0000 (UTC)
Subject: rpms/sugar/F-11 .cvsignore, 1.39, 1.40 sources, 1.41,
	1.42 sugar.spec, 1.63, 1.64
Message-ID: <20091202123607.5787A11C0095@cvs1.fedora.phx.redhat.com>

Author: dsd

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

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
v0.84.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-11/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	11 Nov 2009 10:33:23 -0000	1.39
+++ .cvsignore	2 Dec 2009 12:36:06 -0000	1.40
@@ -1 +1 @@
-sugar-0.84.7.tar.bz2
+sugar-0.84.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	11 Nov 2009 10:33:24 -0000	1.41
+++ sources	2 Dec 2009 12:36:06 -0000	1.42
@@ -1 +1 @@
-2c0fc431d0393d51c306cbfe74b6e593  sugar-0.84.7.tar.bz2
+3cf91e134761761aaa33cf73140f8554  sugar-0.84.8.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-11/sugar.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sugar.spec	11 Nov 2009 10:33:24 -0000	1.63
+++ sugar.spec	2 Dec 2009 12:36:06 -0000	1.64
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.84.7
+Version: 0.84.8
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -140,6 +140,9 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Dec  2 2009 Daniel Drake <dsd at laptop.org> - 0.84.8-1
+- bugfix release
+
 * Wed Nov 11 2009 Daniel Drake <dsd at laptop.org> - 0.84.7-1
 - Fix bugs with journal entry bundles and activity upgrading
 



From dsd at fedoraproject.org  Wed Dec  2 12:37:45 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  2 Dec 2009 12:37:45 +0000 (UTC)
Subject: File sugar-toolkit-0.84.6.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091202123745.34F9510F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-toolkit:

e81f9fd3828672034cbdb5b11077427c  sugar-toolkit-0.84.6.tar.bz2



From dsd at fedoraproject.org  Wed Dec  2 12:39:31 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  2 Dec 2009 12:39:31 +0000 (UTC)
Subject: rpms/sugar-toolkit/F-11 .cvsignore, 1.34, 1.35 sources, 1.38,
	1.39 sugar-toolkit.spec, 1.48, 1.49
Message-ID: <20091202123931.4423811C0095@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/sugar-toolkit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22248

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
v0.84.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	10 Jul 2009 19:07:20 -0000	1.34
+++ .cvsignore	2 Dec 2009 12:39:30 -0000	1.35
@@ -1 +1 @@
-sugar-toolkit-0.84.5.tar.bz2
+sugar-toolkit-0.84.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	10 Jul 2009 19:07:20 -0000	1.38
+++ sources	2 Dec 2009 12:39:30 -0000	1.39
@@ -1 +1 @@
-4f754fe5fc62e460d352a47e3d23815d  sugar-toolkit-0.84.5.tar.bz2
+e81f9fd3828672034cbdb5b11077427c  sugar-toolkit-0.84.6.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/sugar-toolkit.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sugar-toolkit.spec	10 Jul 2009 19:07:20 -0000	1.48
+++ sugar-toolkit.spec	2 Dec 2009 12:39:31 -0000	1.49
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.84.5
+Version: 0.84.6
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Dec  2 2009 Daniel Drake <dsd at laptop.org> - 0.84.6-1
+* New bugfix release
+
 * Fri Jul 10 2009 Simon Schampijer <simon at schampijer.de> - 0.84.5-1
 - Fix ContentBundle bundle_id #1028
 



From nbecker at fedoraproject.org  Wed Dec  2 12:41:02 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Wed,  2 Dec 2009 12:41:02 +0000 (UTC)
Subject: rpms/mercurial/F-12 .cvsignore, 1.28, 1.29 mercurial.spec, 1.77,
	1.78 sources, 1.30, 1.31
Message-ID: <20091202124102.CDE6D11C03FC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22768

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	16 Nov 2009 21:56:15 -0000	1.28
+++ .cvsignore	2 Dec 2009 12:41:01 -0000	1.29
@@ -1 +1 @@
-mercurial-1.4.tar.gz
+mercurial-1.4.1.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-12/mercurial.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- mercurial.spec	16 Nov 2009 23:48:44 -0000	1.77
+++ mercurial.spec	2 Dec 2009 12:41:02 -0000	1.78
@@ -2,8 +2,8 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.4
-Release: 1%{?dist}.2
+Version: 1.4.1
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py
 
 %changelog
+* Wed Dec  2 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Mon Nov 16 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4-1.1
 - Bump to 1.4-1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	16 Nov 2009 21:56:15 -0000	1.30
+++ sources	2 Dec 2009 12:41:02 -0000	1.31
@@ -1 +1 @@
-951ebd4a8153eaa3c56fc0ce2575ab70  mercurial-1.4.tar.gz
+eacffecad59ec145e61a1edf332b3f1f  mercurial-1.4.1.tar.gz



From pkgdb at fedoraproject.org  Wed Dec  2 12:45:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:45:28 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up approveacls
Message-ID: <20091202124528.5716710F895@bastion2.fedora.phx.redhat.com>

rnovacek has given up the approveacls acl on kdepim3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:45:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:45:28 +0000
Subject: [pkgdb] kdepim3 had acl change status
Message-ID: <20091202124528.ED79B10F896@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim3 (Fedora 12) to Approved for rnovacek

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:45:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:45:30 +0000
Subject: [pkgdb] kdepim3 had acl change status
Message-ID: <20091202124530.C873110F89E@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim3 (Fedora 11) to Approved for rnovacek

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:45:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:45:30 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up approveacls
Message-ID: <20091202124530.C88ED10F89F@bastion2.fedora.phx.redhat.com>

rnovacek has given up the approveacls acl on kdepim3 (Fedora 11)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:45:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:45:32 +0000
Subject: [pkgdb] kdepim3: rnovacek has given up approveacls
Message-ID: <20091202124532.CDF4710F8A4@bastion2.fedora.phx.redhat.com>

rnovacek has given up the approveacls acl on kdepim3 (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 12:45:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 12:45:36 +0000
Subject: [pkgdb] kdepim3 had acl change status
Message-ID: <20091202124536.0CBAD10F8A6@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim3 (Fedora devel) to Approved for rnovacek

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



From nbecker at fedoraproject.org  Wed Dec  2 12:48:07 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Wed,  2 Dec 2009 12:48:07 +0000 (UTC)
Subject: rpms/mercurial/F-11 .cvsignore, 1.27, 1.28 mercurial.spec, 1.73,
	1.74 sources, 1.30, 1.31
Message-ID: <20091202124807.D0BE711C0095@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	16 Nov 2009 21:56:30 -0000	1.27
+++ .cvsignore	2 Dec 2009 12:48:07 -0000	1.28
@@ -1 +1 @@
-mercurial-1.4.tar.gz
+mercurial-1.4.1.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-11/mercurial.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- mercurial.spec	16 Nov 2009 21:56:30 -0000	1.73
+++ mercurial.spec	2 Dec 2009 12:48:07 -0000	1.74
@@ -2,7 +2,7 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.4
+Version: 1.4.1
 Release: 1%{?dist}
 License: GPLv2
 Group: Development/Tools
@@ -170,6 +170,12 @@ rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py
 
 %changelog
+* Wed Dec  2 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Mon Nov 16 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4-1.1
+- Bump to 1.4-1.1
+
 * Mon Nov 16 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4-1
 - Update to 1.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	16 Nov 2009 21:56:30 -0000	1.30
+++ sources	2 Dec 2009 12:48:07 -0000	1.31
@@ -1 +1 @@
-951ebd4a8153eaa3c56fc0ce2575ab70  mercurial-1.4.tar.gz
+eacffecad59ec145e61a1edf332b3f1f  mercurial-1.4.1.tar.gz



From rdieter at fedoraproject.org  Wed Dec  2 12:57:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 12:57:27 +0000 (UTC)
Subject: File soprano-2.3.70.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091202125727.0BCE810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for soprano:

de5cf230a95fc7218425aafdfb4a5e47  soprano-2.3.70.tar.bz2



From rdieter at fedoraproject.org  Wed Dec  2 12:59:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 12:59:05 +0000 (UTC)
Subject: rpms/soprano/devel .cvsignore, 1.27, 1.28 soprano.spec, 1.43,
	1.44 sources, 1.28, 1.29
Message-ID: <20091202125905.34D5A11C0095@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-1
- soprano-2.3.70 (#543440)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	18 Nov 2009 19:15:42 -0000	1.27
+++ .cvsignore	2 Dec 2009 12:59:04 -0000	1.28
@@ -1 +1 @@
-soprano-20091118svn.tar.bz2
+soprano-2.3.70.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- soprano.spec	18 Nov 2009 19:15:42 -0000	1.43
+++ soprano.spec	2 Dec 2009 12:59:04 -0000	1.44
@@ -4,18 +4,18 @@
 # undef or set to 0 to disable -apidocs for a faster build
 %define apidocs 1 
 
-%define snap 20091118
+#define snap 20091118
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.3.68
-Release: 0.1.%{snap}%{?dist}
+Version: 2.3.70
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://sourceforge.net/projects/soprano
-#Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
-Source0: soprano-%{snap}svn.tar.bz2
+Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
+#Source0: soprano-%{snap}svn.tar.bz2
 Source1: soprano-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -162,9 +162,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_target_platform}/docs/html
 %endif
 
+
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-1
+- soprano-2.3.70 (#543440)
+
 * Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.68-0.1.20091118
-- - soprano-2.3.68 (20091118 snapshot)
+- soprano-2.3.68 (20091118 snapshot)
 
 * Mon Nov 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.67-0.1.20091102
 - soprano-2.3.67 (20091102 snapshot)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	18 Nov 2009 19:15:42 -0000	1.28
+++ sources	2 Dec 2009 12:59:04 -0000	1.29
@@ -1 +1 @@
-71c581abb47039b7f9653b4f6bda2ff1  soprano-20091118svn.tar.bz2
+de5cf230a95fc7218425aafdfb4a5e47  soprano-2.3.70.tar.bz2



From hadess at fedoraproject.org  Wed Dec  2 13:02:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  2 Dec 2009 13:02:42 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.240,1.241
Message-ID: <20091202130242.D68AF11C0095@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-games.spec 
Log Message:
more filelist updates


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- gnome-games.spec	2 Dec 2009 11:47:55 -0000	1.240
+++ gnome-games.spec	2 Dec 2009 13:02:42 -0000	1.241
@@ -421,7 +421,7 @@ fi
 %attr(2551, root, games) %{_bindir}/gtali
 %endif
 %attr(2551, root, games) %{_bindir}/gnobots2
-%attr(2551, root, games) %{_bindir}/gnome-quadrapassel
+%attr(2551, root, games) %{_bindir}/quadrapassel
 %attr(2551, root, games) %{_bindir}/gnotravex
 %attr(2551, root, games) %{_bindir}/gnotski
 %attr(2551, root, games) %{_bindir}/gnibbles



From ellert at fedoraproject.org  Wed Dec  2 13:04:48 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed,  2 Dec 2009 13:04:48 +0000 (UTC)
Subject: rpms/CGSI-gSOAP/EL-5 CGSI-gSOAP.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091202130448.46D1811C0095@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/CGSI-gSOAP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29122/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	CGSI-gSOAP.spec import.log 
Log Message:
* Thu Nov 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.3.2-2.20090920cvs
- Use cvs checkout date in release tag
- Drop Provides/Obsoletes for the old package name since it was never in Fedora



--- NEW FILE CGSI-gSOAP.spec ---
Name:		CGSI-gSOAP
Version:	1.3.3.2
Release:	2.20090920cvs%{?dist}
Summary:	GSI plugin for gSOAP

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is based on a CVS checkout.
#		Since the latest tag, the license has been changed from the
#		EGEE license to the Apache 2.0 license in the code in the CVS
#		and the patches we submitted upstream have been applied.
#		So in order to get these changes the CVS checkout is based on
#		a date rather than a tag for this build. 
#		cvs -d:pserver:anonymous at glite.cvs.cern.ch:/cvs/glite \
#		  co -D 2009-09-20 -d CGSI-gSOAP-$version \
#		  org.glite.security.cgsi-gsoap
#		tar -z -c --exclude CVS -f CGSI-gSOAP-1.3.3.2.tar.gz \
#		  CGSI-gSOAP-1.3.3.2
Source0:	%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	globus-gss-assist-devel%{?_isa}
BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
BuildRequires:	gsoap-devel%{?_isa}
BuildRequires:	voms-devel%{?_isa}
BuildRequires:	doxygen

%description
This is a GSI plugin for gSOAP. It uses the globus GSI libraries to implement
GSI secure authentication and encryption on top of gSOAP.

%package devel
Summary:	GSI plugin for gSOAP - development files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	gsoap-devel

%description devel
This package provides the header files for programming with the cgsi-gsoap
plugins.

%prep
%setup -q

# Fix bad permissions (which otherwise end up in the debuginfo package)
find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o -name '*.cc' ')' \
    -exec chmod 644 {} ';'
chmod 644 LICENSE RELEASE-NOTES

# Adapt Makefile for Fedora
sed -e /PTHR/d \
    -e 's!_$(GLOBUS_FLAVOUR)!!g' \
    -e 's!-L$([A-Z_]*)/lib!!' \
    -e 's!-L$([A-Z_]*)/$(LIBDIR)!!' \
    -e 's!\(GLOBUS_INCLUDE *= *\).*!\1-I/usr/include/globus -I/usr/$(LIBDIR)/globus/include -I/usr/kerberos/include!' \
    -e 's!\(GSOAP_INCLUDE *= *\).*!\1!' \
    -e 's!\(GSOAP_VERSION *= *\).*!\1!' \
    -e 's!-I$(VOMS_LOCATION)/include/glite/security/voms!-I/usr/include/voms!' \
    -e 's!\.so \\$!.so!' \
    -e s/installshlibvomspthr// -i src/Makefile
sed -e :a -e '/^$/N;/\n.*$(AR)/d;ta' -e 'P;D' -i src/Makefile
sed -e :a -e '/^$/N;/\n.*$(RANLIB)/d;ta' -e 'P;D' -i src/Makefile

%build
. ./VERSION
cd src
make CFLAGS="%optflags -fPIC -I." USE_VOMS=yes WITH_CPP_LIBS=yes \
     LIBDIR=%{_lib} VERSION=$VERSION

%install
rm -rf $RPM_BUILD_ROOT

. ./VERSION
cd src
make CFLAGS="%optflags -fPIC -I." USE_VOMS=yes WITH_CPP_LIBS=yes \
     LIBDIR=%{_lib} VERSION=$VERSION install

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
mv $RPM_BUILD_ROOT%{_datadir}/doc/CGSI \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}

rm $RPM_BUILD_ROOT%{_libdir}/*.a

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libcgsi_plugin.so.*
%{_libdir}/libcgsi_plugin_cpp.so.*
%{_libdir}/libcgsi_plugin_voms.so.*
%{_libdir}/libcgsi_plugin_voms_cpp.so.*
%doc LICENSE RELEASE-NOTES

%files devel
%defattr(-,root,root,-)
%{_includedir}/cgsi_plugin.h
%{_libdir}/libcgsi_plugin.so
%{_libdir}/libcgsi_plugin_cpp.so
%{_libdir}/libcgsi_plugin_voms.so
%{_libdir}/libcgsi_plugin_voms_cpp.so
%doc %{_docdir}/%{name}-devel-%{version}
%doc %{_mandir}/man*/*

%changelog
* Thu Nov 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.3.2-2.20090920cvs
- Use cvs checkout date in release tag
- Drop Provides/Obsoletes for the old package name since it was never in Fedora

* Wed Sep 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.3.2-1
- Update to version 1.3.3.2
- Drop the patch - all issues fixed upstream
- Change License tag to Apache 2.0

* Fri Aug 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.3.1-1
- Update to version 1.3.3.1

* Tue Jun 30 2009 Anders W??n?nen <waananen at nbi.dk> - 1.3.2.2-4
- Fix docdir handling

* Wed Jan 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.2.2-3
- Rebuild against distribution Globus

* Wed Nov 19 2008 Anders W??n?nen <waananen at nbi.dk> - 1.3.2.2-2
- Update patch to use $(CPP) instead of ld (2 places)

* Sun Oct 26 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.2.2-1
- Update to version 1.3.2.2

* Fri Jan 11 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2.1.2-1
- Update to version 1.2.1.2

* Tue Jul 24 2007 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1.17.2-2
- Rebuild against newer globus and voms

* Wed May  9 2007 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1.17.2-1
- Initial build


--- NEW FILE import.log ---
CGSI-gSOAP-1_3_3_2-2_20090920cvs_fc11:EL-5:CGSI-gSOAP-1.3.3.2-2.20090920cvs.fc11.src.rpm:1259759068


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGSI-gSOAP/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Nov 2009 19:35:19 -0000	1.1
+++ .cvsignore	2 Dec 2009 13:04:47 -0000	1.2
@@ -0,0 +1 @@
+CGSI-gSOAP-1.3.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGSI-gSOAP/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Nov 2009 19:35:19 -0000	1.1
+++ sources	2 Dec 2009 13:04:48 -0000	1.2
@@ -0,0 +1 @@
+70c54a15acb87a52d39ed600a15853c2  CGSI-gSOAP-1.3.3.2.tar.gz



From ellert at fedoraproject.org  Wed Dec  2 13:06:55 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed,  2 Dec 2009 13:06:55 +0000 (UTC)
Subject: rpms/CGSI-gSOAP/EL-4 CGSI-gSOAP.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091202130655.ED63511C0095@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/CGSI-gSOAP/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29976/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	CGSI-gSOAP.spec import.log 
Log Message:
* Thu Nov 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.3.2-2.20090920cvs
- Use cvs checkout date in release tag
- Drop Provides/Obsoletes for the old package name since it was never in Fedora



--- NEW FILE CGSI-gSOAP.spec ---
Name:		CGSI-gSOAP
Version:	1.3.3.2
Release:	2.20090920cvs%{?dist}
Summary:	GSI plugin for gSOAP

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://glite.web.cern.ch/glite/
#		The source tarball is based on a CVS checkout.
#		Since the latest tag, the license has been changed from the
#		EGEE license to the Apache 2.0 license in the code in the CVS
#		and the patches we submitted upstream have been applied.
#		So in order to get these changes the CVS checkout is based on
#		a date rather than a tag for this build. 
#		cvs -d:pserver:anonymous at glite.cvs.cern.ch:/cvs/glite \
#		  co -D 2009-09-20 -d CGSI-gSOAP-$version \
#		  org.glite.security.cgsi-gsoap
#		tar -z -c --exclude CVS -f CGSI-gSOAP-1.3.3.2.tar.gz \
#		  CGSI-gSOAP-1.3.3.2
Source0:	%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	globus-gss-assist-devel%{?_isa}
BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
BuildRequires:	gsoap-devel%{?_isa}
BuildRequires:	voms-devel%{?_isa}
BuildRequires:	doxygen

%description
This is a GSI plugin for gSOAP. It uses the globus GSI libraries to implement
GSI secure authentication and encryption on top of gSOAP.

%package devel
Summary:	GSI plugin for gSOAP - development files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	gsoap-devel

%description devel
This package provides the header files for programming with the cgsi-gsoap
plugins.

%prep
%setup -q

# Fix bad permissions (which otherwise end up in the debuginfo package)
find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o -name '*.cc' ')' \
    -exec chmod 644 {} ';'
chmod 644 LICENSE RELEASE-NOTES

# Adapt Makefile for Fedora
sed -e /PTHR/d \
    -e 's!_$(GLOBUS_FLAVOUR)!!g' \
    -e 's!-L$([A-Z_]*)/lib!!' \
    -e 's!-L$([A-Z_]*)/$(LIBDIR)!!' \
    -e 's!\(GLOBUS_INCLUDE *= *\).*!\1-I/usr/include/globus -I/usr/$(LIBDIR)/globus/include -I/usr/kerberos/include!' \
    -e 's!\(GSOAP_INCLUDE *= *\).*!\1!' \
    -e 's!\(GSOAP_VERSION *= *\).*!\1!' \
    -e 's!-I$(VOMS_LOCATION)/include/glite/security/voms!-I/usr/include/voms!' \
    -e 's!\.so \\$!.so!' \
    -e s/installshlibvomspthr// -i src/Makefile
sed -e :a -e '/^$/N;/\n.*$(AR)/d;ta' -e 'P;D' -i src/Makefile
sed -e :a -e '/^$/N;/\n.*$(RANLIB)/d;ta' -e 'P;D' -i src/Makefile

%build
. ./VERSION
cd src
make CFLAGS="%optflags -fPIC -I." USE_VOMS=yes WITH_CPP_LIBS=yes \
     LIBDIR=%{_lib} VERSION=$VERSION

%install
rm -rf $RPM_BUILD_ROOT

. ./VERSION
cd src
make CFLAGS="%optflags -fPIC -I." USE_VOMS=yes WITH_CPP_LIBS=yes \
     LIBDIR=%{_lib} VERSION=$VERSION install

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
mv $RPM_BUILD_ROOT%{_datadir}/doc/CGSI \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}

rm $RPM_BUILD_ROOT%{_libdir}/*.a

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libcgsi_plugin.so.*
%{_libdir}/libcgsi_plugin_cpp.so.*
%{_libdir}/libcgsi_plugin_voms.so.*
%{_libdir}/libcgsi_plugin_voms_cpp.so.*
%doc LICENSE RELEASE-NOTES

%files devel
%defattr(-,root,root,-)
%{_includedir}/cgsi_plugin.h
%{_libdir}/libcgsi_plugin.so
%{_libdir}/libcgsi_plugin_cpp.so
%{_libdir}/libcgsi_plugin_voms.so
%{_libdir}/libcgsi_plugin_voms_cpp.so
%doc %{_docdir}/%{name}-devel-%{version}
%doc %{_mandir}/man*/*

%changelog
* Thu Nov 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.3.2-2.20090920cvs
- Use cvs checkout date in release tag
- Drop Provides/Obsoletes for the old package name since it was never in Fedora

* Wed Sep 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.3.2-1
- Update to version 1.3.3.2
- Drop the patch - all issues fixed upstream
- Change License tag to Apache 2.0

* Fri Aug 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.3.1-1
- Update to version 1.3.3.1

* Tue Jun 30 2009 Anders W??n?nen <waananen at nbi.dk> - 1.3.2.2-4
- Fix docdir handling

* Wed Jan 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.2.2-3
- Rebuild against distribution Globus

* Wed Nov 19 2008 Anders W??n?nen <waananen at nbi.dk> - 1.3.2.2-2
- Update patch to use $(CPP) instead of ld (2 places)

* Sun Oct 26 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.2.2-1
- Update to version 1.3.2.2

* Fri Jan 11 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2.1.2-1
- Update to version 1.2.1.2

* Tue Jul 24 2007 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1.17.2-2
- Rebuild against newer globus and voms

* Wed May  9 2007 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1.17.2-1
- Initial build


--- NEW FILE import.log ---
CGSI-gSOAP-1_3_3_2-2_20090920cvs_fc11:EL-4:CGSI-gSOAP-1.3.3.2-2.20090920cvs.fc11.src.rpm:1259759177


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGSI-gSOAP/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Nov 2009 19:35:19 -0000	1.1
+++ .cvsignore	2 Dec 2009 13:06:54 -0000	1.2
@@ -0,0 +1 @@
+CGSI-gSOAP-1.3.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGSI-gSOAP/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Nov 2009 19:35:19 -0000	1.1
+++ sources	2 Dec 2009 13:06:55 -0000	1.2
@@ -0,0 +1 @@
+70c54a15acb87a52d39ed600a15853c2  CGSI-gSOAP-1.3.3.2.tar.gz



From ltinkl at fedoraproject.org  Wed Dec  2 13:07:56 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:07:56 +0000 (UTC)
Subject: rpms/kdegames/devel .cvsignore, 1.76, 1.77 kdegames.spec, 1.151,
	1.152 sources, 1.78, 1.79
Message-ID: <20091202130756.B62BF11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	24 Nov 2009 16:49:01 -0000	1.76
+++ .cvsignore	2 Dec 2009 13:07:56 -0000	1.77
@@ -1 +1 @@
-kdegames-4.3.75svn1048496.tar.bz2
+kdegames-4.3.80.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kdegames.spec	24 Nov 2009 16:49:01 -0000	1.151
+++ kdegames.spec	2 Dec 2009 13:07:56 -0000	1.152
@@ -1,15 +1,13 @@
-%define alphatag svn1048496
-
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.75
-Release: 0.1.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Please be careful when rebasing this one! If you accidentally drop parts of
@@ -232,6 +230,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	24 Nov 2009 16:49:02 -0000	1.78
+++ sources	2 Dec 2009 13:07:56 -0000	1.79
@@ -1 +1 @@
-e4dc68b3158f86d6be49e6711a98e434  kdegames-4.3.75svn1048496.tar.bz2
+94099f4e1917f4a68b2be679e2c0a17d  kdegames-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:10:37 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:10:37 +0000 (UTC)
Subject: File kdegraphics-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091202131037.6DDB010F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdegraphics:

a18906933f28235ebe77b52df576bfc7  kdegraphics-4.3.80.tar.bz2



From devrim at fedoraproject.org  Wed Dec  2 13:14:03 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed,  2 Dec 2009 13:14:03 +0000 (UTC)
Subject: rpms/geos/devel .cvsignore, 1.7, 1.8 geos-gcc43.patch, 1.4,
	1.5 geos.spec, 1.21, 1.22 sources, 1.7, 1.8
Message-ID: <20091202131403.1025711C0095@cvs1.fedora.phx.redhat.com>

Author: devrim

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

Modified Files:
	.cvsignore geos-gcc43.patch geos.spec sources 
Log Message:
Update to 3.2.0 rc3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Jun 2009 07:16:27 -0000	1.7
+++ .cvsignore	2 Dec 2009 13:14:02 -0000	1.8
@@ -1,3 +1 @@
-geos-3.0.3.tar.bz2
-geos-3.1.0.tar.bz2
-geos-3.1.1.tar.bz2
+geos-3.2.0rc3.tar.bz2

geos-gcc43.patch:
 geos_unit.cpp |    1 +
 1 file changed, 1 insertion(+)

Index: geos-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos-gcc43.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- geos-gcc43.patch	27 Jun 2009 07:39:52 -0000	1.4
+++ geos-gcc43.patch	2 Dec 2009 13:14:02 -0000	1.5
@@ -1,10 +1,10 @@
---- tests/unit/geos_unit.cpp.orig	2009-06-27 10:38:04.000000000 +0300
-+++ tests/unit/geos_unit.cpp	2009-06-27 10:38:21.000000000 +0300
-@@ -13,6 +13,7 @@
- #include <cstdlib>
- // GEOS
+--- tests/unit/geos_unit.cpp.old	2009-12-02 13:21:54.000000000 +0200
++++ tests/unit/geos_unit.cpp	2009-12-02 13:22:12.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <tut_reporter.hpp>
+ // geos 
  #include <geos/unload.h>
 +#include <stdlib.h>
- 
- namespace tut
- {
+ // std
+ #include <cstdlib>
+ #include <iomanip>


Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- geos.spec	24 Jul 2009 23:53:12 -0000	1.21
+++ geos.spec	2 Dec 2009 13:14:02 -0000	1.22
@@ -1,12 +1,12 @@
 Name:		geos
-Version:	3.1.1
-Release:	2%{?dist}
+Version:	3.2.0
+Release:	rc3_1%{?dist}
 Summary:	GEOS is a C++ port of the Java Topology Suite
 
 Group:		Applications/Engineering
 License:	LGPLv2
 URL:		http://trac.osgeo.org/geos/
-Source0:	http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://download.osgeo.org/%{name}/%{name}-%{version}rc3.tar.bz2
 Patch0:		geos-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	doxygen libtool
@@ -28,7 +28,7 @@ functions such as IsValid()
 %package devel
 Summary:	Development files for GEOS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}rc3-%{release}
 
 %description devel
 GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology 
@@ -44,7 +44,7 @@ use GEOS
 %package python
 Summary:	Python modules for GEOS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}rc3-%{release}
 
 %description python
 Python module to build applications using GEOS and python
@@ -52,14 +52,14 @@ Python module to build applications usin
 %package ruby
 Summary:	Ruby modules for GEOS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}rc3-%{release}
 
 %description ruby
 Ruby module to build applications using GEOS and ruby
 %endif
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}rc3
 %patch0 -p0 -b .gcc43
 
 %build
@@ -104,7 +104,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
-%{_libdir}/libgeos-%{version}.so
+%{_libdir}/libgeos-%{version}rc3.so
 %{_libdir}/libgeos_c.so.*
 %exclude %{_libdir}/*.a
 
@@ -137,6 +137,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Dec 2 2009 Devrim GUNDUZ <devrim at gunduz.org> - 3.2.0rc3-1
+- Update to 3.2.0 rc3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jun 2009 07:16:27 -0000	1.7
+++ sources	2 Dec 2009 13:14:02 -0000	1.8
@@ -1 +1 @@
-196f4424aa4ef94476e6886d3a964fb6  geos-3.1.1.tar.bz2
+13cf215971f379b587b90025a405ee1e  geos-3.2.0rc3.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:14:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:14:27 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore, 1.71, 1.72 kdegraphics.spec,
	1.218, 1.219 sources, 1.75, 1.76
Message-ID: <20091202131427.20F8111C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	24 Nov 2009 16:51:42 -0000	1.71
+++ .cvsignore	2 Dec 2009 13:14:26 -0000	1.72
@@ -1 +1 @@
-kdegraphics-4.3.75svn1048496.tar.bz2
+kdegraphics-4.3.80.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- kdegraphics.spec	24 Nov 2009 21:49:17 -0000	1.218
+++ kdegraphics.spec	2 Dec 2009 13:14:26 -0000	1.219
@@ -1,5 +1,3 @@
-%define alphatag svn1048496
-
 %ifnarch s390 s390x
 %define gphoto 1
 ## sane implies gphoto support (via -devel deps)
@@ -8,8 +6,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.75
-Release:        0.2.%{alphatag}%{?dist}
+Version:        4.3.80
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -18,7 +16,7 @@ Provides:       kdegraphics4 = %{version
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}%{?alphatag}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -236,6 +234,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.2.svn1048496
 - update libkdcraw, libkexiv2, libkipi Provides versions
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	24 Nov 2009 16:51:43 -0000	1.75
+++ sources	2 Dec 2009 13:14:26 -0000	1.76
@@ -1 +1 @@
-63e8de10c9f66f413d9b58814b95769f  kdegraphics-4.3.75svn1048496.tar.bz2
+a18906933f28235ebe77b52df576bfc7  kdegraphics-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:18:01 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:18:01 +0000 (UTC)
Subject: File kdelibs-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202131801.9551610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdelibs:

d31fc3d08875b33fe0802352b8671c83  kdelibs-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:21:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:21:55 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore,1.83,1.84 sources,1.98,1.99
Message-ID: <20091202132155.2ED4411C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	24 Nov 2009 15:24:36 -0000	1.83
+++ .cvsignore	2 Dec 2009 13:21:54 -0000	1.84
@@ -1 +1 @@
-kdelibs-4.3.75svn1048496.tar.bz2
+kdelibs-4.3.80.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- sources	24 Nov 2009 15:24:37 -0000	1.98
+++ sources	2 Dec 2009 13:21:54 -0000	1.99
@@ -1 +1 @@
-d8b84a20332c30256c431203b962bad9  kdelibs-4.3.75svn1048496.tar.bz2
+d31fc3d08875b33fe0802352b8671c83  kdelibs-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:22:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:22:54 +0000 (UTC)
Subject: File kdemultimedia-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091202132254.DB19110F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdemultimedia:

1c7dd773cf3d961b7da4018cb9c546e0  kdemultimedia-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:23:52 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:23:52 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore, 1.73, 1.74 kdemultimedia.spec, 
	1.161, 1.162 sources, 1.73, 1.74
Message-ID: <20091202132352.2EE3E11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	24 Nov 2009 16:55:28 -0000	1.73
+++ .cvsignore	2 Dec 2009 13:23:51 -0000	1.74
@@ -1 +1 @@
-kdemultimedia-4.3.75svn1048496.tar.bz2
+kdemultimedia-4.3.80.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- kdemultimedia.spec	24 Nov 2009 16:55:28 -0000	1.161
+++ kdemultimedia.spec	2 Dec 2009 13:23:51 -0000	1.162
@@ -1,9 +1,9 @@
-%define alphatag svn1048496
+#%define alphatag svn1048496
 
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.75
-Release: 0.1.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1.%{?alphatag}%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia
@@ -173,6 +173,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Mon Nov 23 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	24 Nov 2009 16:55:29 -0000	1.73
+++ sources	2 Dec 2009 13:23:51 -0000	1.74
@@ -1 +1 @@
-52475151d5112d418b070de571da78c3  kdemultimedia-4.3.75svn1048496.tar.bz2
+1c7dd773cf3d961b7da4018cb9c546e0  kdemultimedia-4.3.80.tar.bz2



From varekova at fedoraproject.org  Wed Dec  2 13:26:55 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed,  2 Dec 2009 13:26:55 +0000 (UTC)
Subject: rpms/psacct/F-12 psacct-6.3.2-man-pages.patch, NONE, 1.1 psacct.spec,
	1.41, 1.42
Message-ID: <20091202132655.CB17D11C0095@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/psacct/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2652

Modified Files:
	psacct.spec 
Added Files:
	psacct-6.3.2-man-pages.patch 
Log Message:

add dump-utmp.8 and dump-acct.8 man-pages


psacct-6.3.2-man-pages.patch:
 dump-acct.8 |   37 +++++++++++++++++++++++++++++++++++++
 dump-utmp.8 |   29 +++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

--- NEW FILE psacct-6.3.2-man-pages.patch ---
diff -up acct-6.3.2/dump-acct.8.orig acct-6.3.2/dump-acct.8
--- acct-6.3.2/dump-acct.8.orig	2009-12-02 13:56:58.000000000 +0100
+++ acct-6.3.2/dump-acct.8	2009-12-02 13:56:58.000000000 +0100
@@ -0,0 +1,37 @@
+.\" Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
+.\" Written by Ivana Hutarova Varekova <varekova at redhat.com>
+.TH DUMP_ACCT 8 "2009 December 2" "Linux accounting system"
+
+.SH NAME
+dump\-acct \- print an acct/pacct file in human-readable format
+
+.SH SYNOPSYS
+\fBdump-acct\fR [\fB-hrR\fR] [\fB-n\fR <\fIrecs\fR>] <\fBfiles\fR>
+       [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR] [\fB--help\fR]
+
+.SH DESCRIPTION
+The dump-acct command transforms the output \fBfile\fR from the
+accton format to the human-readable format: one record per line.
+Each record consists of severald fields which are separated by
+character "|" (the meaning of concreate field depends on the
+version of kernel package - with which the accton file was created).
+
+.SH OPTIONS
+The following options are supported:
+.TP
+.B -h, --help
+Print a help message and the default location of the process accounting file
+and exit.
+.TP
+.B -r, --reverse
+Print the output in reverse order.
+.TP
+.B -R, --raw
+The records will be printed without any parsing.
+.TP
+.B -n, --num NUMRECS
+Display only the first NUMRECS number of records.
+
+.SH SEE ALSO
+accton (8), lastcomm (1)
+
diff -up acct-6.3.2/dump-utmp.8.orig acct-6.3.2/dump-utmp.8
--- acct-6.3.2/dump-utmp.8.orig	2009-12-02 13:57:05.000000000 +0100
+++ acct-6.3.2/dump-utmp.8	2009-12-02 13:57:05.000000000 +0100
@@ -0,0 +1,29 @@
+.\" Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
+.\" Written by Ivana Hutarova Varekova <varekova at redhat.com>
+.TH DUMP_UTMP 8 "2009 December 2" "Linux accounting system"
+
+.SH NAME
+dump\-utmp \- print a utmp file in human-readable format
+
+.SH SYNOPSYS
+\fBdump-utmp\fR [\fB-hrR\fR] [\fB-n\fR <\fIrecs\fR>] <\fBfiles\fR>
+      [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR] [\fB--help\fR]
+
+.SH OPTIONS
+The following options are supported:
+.TP
+.B -h, --help
+Print a help message and the default location of the process accounting file
+and exit.
+.TP
+.B -r, --reverse
+Print the output in reverse order.
+.TP
+.B -R, --raw
+The records will be printed without any parsing.
+.TP
+.B -n, --num NUMRECS
+Display only the first NUMRECS number of records.
+
+.SH SEE ALSO
+accton (8), lastcomm (1), utmp (5)


Index: psacct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/F-12/psacct.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- psacct.spec	27 Nov 2009 07:38:59 -0000	1.41
+++ psacct.spec	2 Dec 2009 13:26:55 -0000	1.42
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.3.2
-Release: 57%{?dist}
+Release: 58%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -34,6 +34,7 @@ Patch9: acct-6.3.2-sa_manpage.patch
 # if it is possible and wanted then add the possibility
 # to display the pid and ppid number
 Patch10: psacct-6.3.2-ppid.patch
+Patch11: psacct-6.3.2-man-pages.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /sbin/chkconfig /sbin/install-info
@@ -69,6 +70,7 @@ commands.
 %patch8 -p1 -b .man
 %patch9 -p1 -b .pct
 %patch10 -p1 -b .acct
+%patch11 -p1 -b .new
 
 %build
 %if ! %{FHS_compliant}
@@ -87,6 +89,7 @@ mkdir -p $RPM_BUILD_ROOT{/sbin,%{_bindir
 make install prefix=$RPM_BUILD_ROOT%{_prefix} \
         bindir=$RPM_BUILD_ROOT%{_bindir} sbindir=$RPM_BUILD_ROOT%{_sbindir} \
         infodir=$RPM_BUILD_ROOT%{_datadir}/info mandir=$RPM_BUILD_ROOT%{_mandir}
+cp dump-acct.8 dump-utmp.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
 # move accton to /sbin -- leave historical symlink
 mv $RPM_BUILD_ROOT%{_sbindir}/accton $RPM_BUILD_ROOT/sbin/accton
@@ -176,9 +179,14 @@ fi
 %{_mandir}/man1/lastcomm.1*
 %{_mandir}/man8/sa.8*
 %{_mandir}/man8/accton.8*
+%{_mandir}/man8/dump-acct.8*
+%{_mandir}/man8/dump-utmp.8*
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Wed Dec  2 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 6.2.3-58
+- add dump-utmp.8 and dump-acct.8 man-pages
+
 * Fri Nov 26 2009 Ivana Varekova <varekova at redhat.com> - 6.2.3-57
 - fix the ac_version variable handle on ppc64 (BIG_ENDIAN machine)
 



From ltinkl at fedoraproject.org  Wed Dec  2 13:35:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:35:30 +0000 (UTC)
Subject: File kdenetwork-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202133530.D259110F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdenetwork:

87f2d595ba44cec7853e0fad75ad2ff3  kdenetwork-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:37:02 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:37:02 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore, 1.77, 1.78 kdenetwork.spec, 1.216,
	1.217 sources, 1.84, 1.85
Message-ID: <20091202133702.EA06A11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	24 Nov 2009 17:36:58 -0000	1.77
+++ .cvsignore	2 Dec 2009 13:37:02 -0000	1.78
@@ -1 +1 @@
-kdenetwork-4.3.75svn1048496.tar.bz2
+kdenetwork-4.3.80.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- kdenetwork.spec	25 Nov 2009 15:18:21 -0000	1.216
+++ kdenetwork.spec	2 Dec 2009 13:37:02 -0000	1.217
@@ -1,15 +1,13 @@
-%define alphatag svn1048496
-
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.75
-Release: 0.3.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: krdc-icons.tar.bz2
 
 ## upstream me!  -- Rex :)
@@ -193,6 +191,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.3.svn1048496
 - disable webkitpart support for now, does not build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- sources	24 Nov 2009 21:12:29 -0000	1.84
+++ sources	2 Dec 2009 13:37:02 -0000	1.85
@@ -1,2 +1 @@
-7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-51b14a3a946a6ee261037c683a201665  kdenetwork-4.3.75svn1048496.tar.bz2
+87f2d595ba44cec7853e0fad75ad2ff3  kdenetwork-4.3.80.tar.bz2



From varekova at fedoraproject.org  Wed Dec  2 13:37:43 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed,  2 Dec 2009 13:37:43 +0000 (UTC)
Subject: rpms/psacct/devel psacct-6.3.2-man-pages.patch, NONE,
	1.1 psacct.spec, 1.39, 1.40
Message-ID: <20091202133743.1563711C0095@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	psacct.spec 
Added Files:
	psacct-6.3.2-man-pages.patch 
Log Message:
- add dump-utmp.8 and dump-acct.8 man-pages



psacct-6.3.2-man-pages.patch:
 dump-acct.8 |   37 +++++++++++++++++++++++++++++++++++++
 dump-utmp.8 |   29 +++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

--- NEW FILE psacct-6.3.2-man-pages.patch ---
diff -up acct-6.3.2/dump-acct.8.orig acct-6.3.2/dump-acct.8
--- acct-6.3.2/dump-acct.8.orig	2009-12-02 13:56:58.000000000 +0100
+++ acct-6.3.2/dump-acct.8	2009-12-02 13:56:58.000000000 +0100
@@ -0,0 +1,37 @@
+.\" Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
+.\" Written by Ivana Hutarova Varekova <varekova at redhat.com>
+.TH DUMP_ACCT 8 "2009 December 2" "Linux accounting system"
+
+.SH NAME
+dump\-acct \- print an acct/pacct file in human-readable format
+
+.SH SYNOPSYS
+\fBdump-acct\fR [\fB-hrR\fR] [\fB-n\fR <\fIrecs\fR>] <\fBfiles\fR>
+       [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR] [\fB--help\fR]
+
+.SH DESCRIPTION
+The dump-acct command transforms the output \fBfile\fR from the
+accton format to the human-readable format: one record per line.
+Each record consists of severald fields which are separated by
+character "|" (the meaning of concreate field depends on the
+version of kernel package - with which the accton file was created).
+
+.SH OPTIONS
+The following options are supported:
+.TP
+.B -h, --help
+Print a help message and the default location of the process accounting file
+and exit.
+.TP
+.B -r, --reverse
+Print the output in reverse order.
+.TP
+.B -R, --raw
+The records will be printed without any parsing.
+.TP
+.B -n, --num NUMRECS
+Display only the first NUMRECS number of records.
+
+.SH SEE ALSO
+accton (8), lastcomm (1)
+
diff -up acct-6.3.2/dump-utmp.8.orig acct-6.3.2/dump-utmp.8
--- acct-6.3.2/dump-utmp.8.orig	2009-12-02 13:57:05.000000000 +0100
+++ acct-6.3.2/dump-utmp.8	2009-12-02 13:57:05.000000000 +0100
@@ -0,0 +1,29 @@
+.\" Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
+.\" Written by Ivana Hutarova Varekova <varekova at redhat.com>
+.TH DUMP_UTMP 8 "2009 December 2" "Linux accounting system"
+
+.SH NAME
+dump\-utmp \- print a utmp file in human-readable format
+
+.SH SYNOPSYS
+\fBdump-utmp\fR [\fB-hrR\fR] [\fB-n\fR <\fIrecs\fR>] <\fBfiles\fR>
+      [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR] [\fB--help\fR]
+
+.SH OPTIONS
+The following options are supported:
+.TP
+.B -h, --help
+Print a help message and the default location of the process accounting file
+and exit.
+.TP
+.B -r, --reverse
+Print the output in reverse order.
+.TP
+.B -R, --raw
+The records will be printed without any parsing.
+.TP
+.B -n, --num NUMRECS
+Display only the first NUMRECS number of records.
+
+.SH SEE ALSO
+accton (8), lastcomm (1), utmp (5)


Index: psacct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- psacct.spec	16 Sep 2009 07:20:45 -0000	1.39
+++ psacct.spec	2 Dec 2009 13:37:42 -0000	1.40
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.3.2
-Release: 55%{?dist}
+Release: 56%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -30,6 +30,7 @@ Patch6: psacct-6.3.2-sa-manfix.patch
 Patch7: psacct-6.3.2-LargeFile.patch
 Patch8: psacct-6.3.2-lastcomm_man.patch
 Patch9: acct-6.3.2-sa_manpage.patch
+Patch11: psacct-6.3.2-man-pages.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /sbin/chkconfig /sbin/install-info
@@ -64,6 +65,7 @@ commands.
 %patch7 -p1 -b .lfs
 %patch8 -p1 -b .man
 %patch9 -p1 -b .pct
+%patch11 -p1 -b .new
 
 %build
 %if ! %{FHS_compliant}
@@ -82,6 +84,7 @@ mkdir -p $RPM_BUILD_ROOT{/sbin,%{_bindir
 make install prefix=$RPM_BUILD_ROOT%{_prefix} \
         bindir=$RPM_BUILD_ROOT%{_bindir} sbindir=$RPM_BUILD_ROOT%{_sbindir} \
         infodir=$RPM_BUILD_ROOT%{_datadir}/info mandir=$RPM_BUILD_ROOT%{_mandir}
+cp dump-acct.8 dump-utmp.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
 # move accton to /sbin -- leave historical symlink
 mv $RPM_BUILD_ROOT%{_sbindir}/accton $RPM_BUILD_ROOT/sbin/accton
@@ -171,9 +174,14 @@ fi
 %{_mandir}/man1/lastcomm.1*
 %{_mandir}/man8/sa.8*
 %{_mandir}/man8/accton.8*
+%{_mandir}/man8/dump-acct.8*
+%{_mandir}/man8/dump-utmp.8*
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Wed Dec  2 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 6.2.3-56
+- add dump-utmp.8 and dump-acct.8 man-pages
+
 * Wed Sep 16 2009 Ivana Varekova <varekova at redhat.com> - 6.2.3-55
 - fix init script (#521195)
 



From ltinkl at fedoraproject.org  Wed Dec  2 13:40:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:40:58 +0000 (UTC)
Subject: File kdepim-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202134058.DDABE10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdepim:

12bfcada24033e61ad4942639cf0a8f0  kdepim-4.3.80.tar.bz2



From mschwendt at fedoraproject.org  Wed Dec  2 13:43:11 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  2 Dec 2009 13:43:11 +0000 (UTC)
Subject: rpms/audacious/devel audacious.spec,1.57,1.58
Message-ID: <20091202134311.F2B2011C0095@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	audacious.spec 
Log Message:
* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
- Drop Musepack and SID MIME types from desktop files. As of Audacious 2.2,
  Musepack is only supported by the separate "ffaudio" plugin. The SID
  plugin in a separate subpackage provides its own desktop file.
- Drop unsupported MIME types from desktop files.



Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- audacious.spec	25 Nov 2009 14:40:44 -0000	1.57
+++ audacious.spec	2 Dec 2009 13:43:11 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -40,7 +40,9 @@ Provides: xmms-gui
 
 %description
 Audacious is a media player that currently uses a skinned user interface
-based on Winamp 2.x skins.
+(based on Winamp 2.x skins) as well as a separate GTK2 based front end.
+Historically, it started as a fork of Beep Media Player (BMP), which
+itself forked from XMMS.
 
 
 %package libs
@@ -69,6 +71,28 @@ Files needed when building software for 
 %setup -q -n %{name}-%{version}
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
+# From .desktop files remove MIME types the base build of the
+# Fedora audacious-plugins package does not understand.
+for t in \
+    audio/mp3 \
+    audio/mpeg \
+    audio/mpegurl \
+    audio/x-mp3 \
+    audio/x-mpeg \
+    audio/x-mpegurl \
+    audio/x-ms-wma \
+    audio/x-musepack \
+    audio/prs.sid \
+; do
+    for f in audacious2.desktop audacious2-gtkui.desktop ; do
+        cp ${f} ${f}.old
+        sed -i "s!${t};!!g" $f
+        diff -u ${f}.old ${f} || :
+        rm -f ${f}.old
+    done
+done   
+
+
 %build
 %configure  \
     --enable-samplerate \
@@ -160,6 +184,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
+- Drop Musepack and SID MIME types from desktop files. As of Audacious 2.2,
+  Musepack is only supported by the separate "ffaudio" plugin. The SID
+  plugin in a separate subpackage provides its own desktop file.
+- Drop unsupported MIME types from desktop files.
+
 * Wed Nov 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-1
 - Upgrade to 2.2 (declared as the next "stable release" after 2.1).
 



From ltinkl at fedoraproject.org  Wed Dec  2 13:45:37 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:45:37 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore, 1.73, 1.74 kdepim.spec, 1.247,
	1.248 sources, 1.79, 1.80
Message-ID: <20091202134537.2501A11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	24 Nov 2009 23:35:00 -0000	1.73
+++ .cvsignore	2 Dec 2009 13:45:36 -0000	1.74
@@ -1 +1 @@
-kdepim-4.3.75svn1048496.tar.bz2
+kdepim-4.3.80.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- kdepim.spec	27 Nov 2009 12:58:52 -0000	1.247
+++ kdepim.spec	2 Dec 2009 13:45:36 -0000	1.248
@@ -1,5 +1,3 @@
-%define alphatag svn1048496
-
 %ifnarch s390 s390x
 %define _with_pilot_link 1
 %endif
@@ -7,13 +5,13 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.75
-Release: 0.3.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
@@ -230,6 +228,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Fri Nov 27 2009 Than Ngo <than at redhat.com> - 4.3.75-0.3.svn1048496
 - fix build issue on s390(x)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	24 Nov 2009 23:35:00 -0000	1.79
+++ sources	2 Dec 2009 13:45:36 -0000	1.80
@@ -1 +1 @@
-4649ffc2be9045d6909e80871d58a786  kdepim-4.3.75svn1048496.tar.bz2
+12bfcada24033e61ad4942639cf0a8f0  kdepim-4.3.80.tar.bz2



From limb at fedoraproject.org  Wed Dec  2 13:46:03 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  2 Dec 2009 13:46:03 +0000 (UTC)
Subject: File vym-1.12.6.tar.bz2 uploaded to lookaside cache by limb
Message-ID: <20091202134603.5175510F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for vym:

12bfdf82c679f14354f9577df62de7e9  vym-1.12.6.tar.bz2



From mschwendt at fedoraproject.org  Wed Dec  2 13:46:49 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  2 Dec 2009 13:46:49 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-sid.desktop, NONE,
	1.1 audacious-plugins.spec, 1.65, 1.66
Message-ID: <20091202134649.4A4EA11C0095@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7697

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-sid.desktop 
Log Message:
* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
- Move SID music plugin into audacious-plugins-sid package. Its 
  built with libsidplay 1 while 3rd party package providers may
  build it with libsidplay 2.
- Include metronome plugin in base plugins package. No reason to
  split this off into an optional subpackage.



--- NEW FILE audacious-sid.desktop ---
[Desktop Entry]
Name=Audacious
Comment=Play SID music
Exec=audacious
Icon=audacious2
MimeType=audio/prs.sid;
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- audacious-plugins.spec	25 Nov 2009 15:27:43 -0000	1.65
+++ audacious-plugins.spec	2 Dec 2009 13:46:49 -0000	1.66
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -20,6 +20,7 @@ License: GPLv2 and GPLv2+ and LGPLv2+ an
 # Disabled via options where possible, see %%build.
 Source0: audacious-plugins-fedora-%{version}.tar.bz2
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
+Source1: audacious-sid.desktop
 
 Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
 Patch1: audacious-plugins-2.2-jack.patch
@@ -51,6 +52,7 @@ BuildRequires: libcddb-devel
 BuildRequires: libmtp-devel
 BuildRequires: libxml2-devel
 BuildRequires: gettext
+BuildRequires: desktop-file-utils
 
 # experimental, disabled by default
 BuildRequires: neon-devel
@@ -64,16 +66,23 @@ Obsoletes: audacious-plugins-arts
 Obsoletes: audacious-plugins-pulseaudio <= 1.3.5
 Provides: audacious-plugins-pulseaudio = %{version}
 
+# obsolete old subpackage -- no reason to split this off
+Obsoletes: audacious-plugins-metronome < 2.2-2
+Provides: audacious-plugins-metronome = %{version}-%{release}
+
+
 %description
 Audacious is a media player that currently uses a skinned user interface
-based on Winamp 2.x skins. It is based on ("forked off") BMP.
+(based on Winamp 2.x skins) as well as a separate GTK2 based front end.
+Historically, it started as a fork of Beep Media Player (BMP), which
+itself forked from XMMS.
 
 This package provides essential plugins for audio input, audio output and
 visualization.
 
 
 %package jack
-Summary: Audacious output plugin for JACK sound service
+Summary: Audacious output plugin for Jack Audio Connection Kit
 Group: Applications/Multimedia
 # ancient
 #Obsoletes: audacious-jack <= 1.1.2
@@ -81,11 +90,11 @@ Requires: audacious >= %{aud_ver}, audac
 
 %description jack
 This package provides an Audacious output plugin that uses the
-JACK sound service.
+Jack Audio Connection Kit (JACK) sound service.
 
 
 %package esd
-Summary: Audacious output plugin for esd sound service
+Summary: Audacious output plugin for EsounD service
 Group: Applications/Multimedia
 # ancient
 #Obsoletes: audacious-esd <= 1.1.2
@@ -93,50 +102,51 @@ Requires: audacious >= %{aud_ver}, audac
 
 %description esd
 This package provides an Audacious output plugin that uses the
-ESD sound server.
+EsounD service.
 
 
 %package amidi
-Summary: Audacious input plugin for amidi
+Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description amidi
-This package provides an Audacious input plugin that uses the
-amidi sound service.
-
+This package provides AMIDI-Plug, a modular MIDI music player, as an
+input plugin for Audacious.
 
 
-%package wavpack
-Summary: Audacious input plugin for wavpack
+%package sid
+Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
-%description wavpack
-This package provides an Audacious input plugin that reads WavPack
-compressed files.
+%description sid
+This package provides an Audacious input plugin for SID music files.
 
+This build of the plugin uses libsidplay 1. 3rd party package
+providers may build it with libsidplay 2.
 
 
-%package metronome
-Summary: Audacious input plugin simulating a metronome
+%package wavpack
+Summary: Audacious input plugin for WavPack compressed files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
-%description metronome
-This package provides an Audacious input plugin that simulates
-a metronome.
-
+%description wavpack
+This package provides an Audacious input plugin that reads WavPack
+compressed files.
 
 
 %package vortex
-Summary: Audacious input plugin for vortex audio files
+Summary: Audacious input plugin for Vortex format files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description vortex
-This package provides an Audacious input plugin that reads
-vortex compressed files.
+This package provides an Audacious input plugin that reads files
+in Vortex (.vtx) format.
 
 
 
@@ -174,12 +184,23 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %find_lang %{name}
+# audacious-sid.desktop
+desktop-file-install --vendor "" \
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+    %{SOURCE1}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post sid
+update-desktop-database &> /dev/null || :
+
+%postun sid
+update-desktop-database &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
@@ -193,7 +214,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/audacious/Input/amidi-plug.so
 %exclude %{_libdir}/audacious/Input/amidi-plug/
 %exclude %{_libdir}/audacious/Input/wavpack.so
-%exclude %{_libdir}/audacious/Input/metronom.so
+%exclude %{_libdir}/audacious/Input/sid.so
 %exclude %{_libdir}/audacious/Input/vtx.so
 %exclude %{_libdir}/audacious/Output/jackout.so
 %exclude %{_libdir}/audacious/Output/ESD.so
@@ -212,13 +233,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/audacious/Input/amidi-plug.so
 %{_libdir}/audacious/Input/amidi-plug/
 
-%files wavpack
+%files sid
 %defattr(-,root,root,-)
-%{_libdir}/audacious/Input/wavpack.so
+%{_libdir}/audacious/Input/sid.so
+%{_datadir}/applications/audacious-sid.desktop
 
-%files metronome
+%files wavpack
 %defattr(-,root,root,-)
-%{_libdir}/audacious/Input/metronom.so
+%{_libdir}/audacious/Input/wavpack.so
 
 %files vortex
 %defattr(-,root,root,-)
@@ -226,6 +248,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
+- Move SID music plugin into audacious-plugins-sid package. Its 
+  built with libsidplay 1 while 3rd party package providers may
+  build it with libsidplay 2.
+- Include metronome plugin in base plugins package. No reason to
+  split this off into an optional subpackage.
+
 * Wed Nov 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-1
 - Upgrade to 2.2 (declared as the next "stable release" after 2.1).
 - The ladspa plugin has been reworked since beta2.



From limb at fedoraproject.org  Wed Dec  2 13:46:57 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  2 Dec 2009 13:46:57 +0000 (UTC)
Subject: rpms/vym/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 vym.spec, 1.16,
	1.17
Message-ID: <20091202134657.7BD7611C0095@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	.cvsignore sources vym.spec 
Log Message:
Updated to new upstream version, BZ 543442.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vym/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Nov 2009 14:55:35 -0000	1.7
+++ .cvsignore	2 Dec 2009 13:46:57 -0000	1.8
@@ -1 +1 @@
-vym-1.12.5.tar.bz2
+vym-1.12.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vym/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Nov 2009 14:55:35 -0000	1.7
+++ sources	2 Dec 2009 13:46:57 -0000	1.8
@@ -1 +1 @@
-bd986bc0e8a8c036e1c30a7f064e4be8  vym-1.12.5.tar.bz2
+12bfdf82c679f14354f9577df62de7e9  vym-1.12.6.tar.bz2


Index: vym.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vym/devel/vym.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- vym.spec	23 Nov 2009 16:30:41 -0000	1.16
+++ vym.spec	2 Dec 2009 13:46:57 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           vym
-Version:        1.12.5
-Release:        2%{?dist}
+Version:        1.12.6
+Release:        1%{?dist}
 Summary:        View your mind
 
 Group:          Applications/Productivity
@@ -90,6 +90,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Dec 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.12.6-1
+- Updated to new upstream version, BZ 543442.
+
 * Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.12.5-2 
 - rebuild (for qt-4.6.0-rc1, f13+)
 



From ltinkl at fedoraproject.org  Wed Dec  2 13:48:56 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:48:56 +0000 (UTC)
Subject: File kdepim-runtime-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091202134856.0C87B10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdepim-runtime:

49e298e02b5684903f5680071d004bde  kdepim-runtime-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:49:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:49:30 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel .cvsignore, 1.9, 1.10 kdepim-runtime.spec,
	1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20091202134930.769FD11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Nov 2009 17:03:23 -0000	1.9
+++ .cvsignore	2 Dec 2009 13:49:30 -0000	1.10
@@ -1 +1 @@
-kdepim-runtime-4.3.75svn1048496.tar.bz2
+kdepim-runtime-4.3.80.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kdepim-runtime.spec	24 Nov 2009 17:03:23 -0000	1.11
+++ kdepim-runtime.spec	2 Dec 2009 13:49:30 -0000	1.12
@@ -1,15 +1,14 @@
 %define akonadi_version 1.2.1
-%define alphatag svn1048496
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.75
-Release: 0.1.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -132,6 +131,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Mon Nov 23 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Nov 2009 17:03:23 -0000	1.9
+++ sources	2 Dec 2009 13:49:30 -0000	1.10
@@ -1 +1 @@
-3837c4c9901ab3c7f12c04aa822bf1ca  kdepim-runtime-4.3.75svn1048496.tar.bz2
+49e298e02b5684903f5680071d004bde  kdepim-runtime-4.3.80.tar.bz2



From tbzatek at fedoraproject.org  Wed Dec  2 13:51:02 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed,  2 Dec 2009 13:51:02 +0000 (UTC)
Subject: rpms/gnome-vfs2/F-12 gnome-vfs-2.24.3-CVE-2009-2473.patch, NONE,
	1.1 gnome-vfs2.spec, 1.199, 1.200
Message-ID: <20091202135102.1325311C0095@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-vfs2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9106

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.24.3-CVE-2009-2473.patch 
Log Message:
* Wed Dec  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-3
- Patch security hole in embedded neon (CVE-2009-2473)


gnome-vfs-2.24.3-CVE-2009-2473.patch:
 ne_xml.c |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

--- NEW FILE gnome-vfs-2.24.3-CVE-2009-2473.patch ---
Index: gnome-vfs-2.24.2/imported/neon/ne_xml.c
===================================================================
--- gnome-vfs-2.24.2/imported/neon/ne_xml.c	(revision 1687)
+++ gnome-vfs-2.24.2/imported/neon/ne_xml.c	(revision 1688)
@@ -405,6 +405,28 @@
     destroy_element(elm);
 }
 
+#if defined(HAVE_EXPAT) && XML_MAJOR_VERSION > 1
+/* Stop the parser if an entity declaration is hit. */
+static void entity_declaration(void *userData, const XML_Char *entityName,
+                              int is_parameter_entity, const XML_Char *value,
+                              int value_length, const XML_Char *base,
+                              const XML_Char *systemId, const XML_Char *publicId,
+                              const XML_Char *notationName)
+{
+    ne_xml_parser *parser = userData;
+    
+    NE_DEBUG(NE_DBG_XMLPARSE, "XML: entity declaration [%s]. Failing.\n",
+             entityName);
+
+    XML_StopParser(parser->parser, XML_FALSE);
+}
+#elif defined(HAVE_EXPAT)
+/* A noop default_handler. */
+static void default_handler(void *userData, const XML_Char *s, int len)
+{
+}
+#endif
+
 /* Find a namespace definition for 'prefix' in given element, where
  * length of prefix is 'pfxlen'.  Returns the URI or NULL. */
 static const char *resolve_nspace(const struct element *elm, 
@@ -459,14 +481,34 @@
     XML_SetCharacterDataHandler(p->parser, char_data);
     XML_SetUserData(p->parser, (void *) p);
     XML_SetXmlDeclHandler(p->parser, decl_handler);
+
+    /* Prevent the "billion laughs" attack against expat by disabling
+     * internal entity expansion.  With 2.x, forcibly stop the parser
+     * if an entity is declared - this is safer and a more obvious
+     * failure mode.  With older versions, installing a noop
+     * DefaultHandler means that internal entities will be expanded as
+     * the empty string, which is also sufficient to prevent the
+     * attack. */
+#if XML_MAJOR_VERSION > 1
+    XML_SetEntityDeclHandler(p->parser, entity_declaration);
 #else
+    XML_SetDefaultHandler(p->parser, default_handler);
+#endif
+
+#else /* HAVE_LIBXML */
     p->parser = xmlCreatePushParserCtxt(&sax_handler, 
 					(void *)p, NULL, 0, NULL);
     if (p->parser == NULL) {
 	abort();
     }
+#if LIBXML_VERSION < 20602
     p->parser->replaceEntities = 1;
+#else
+    /* Enable expansion of entities, and disable network access. */
+    xmlCtxtUseOptions(p->parser, XML_PARSE_NOENT | XML_PARSE_NONET);
 #endif
+
+#endif /* HAVE_LIBXML || HAVE_EXPAT */
     return p;
 }
 


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/F-12/gnome-vfs2.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- gnome-vfs2.spec	4 Nov 2009 14:38:35 -0000	1.199
+++ gnome-vfs2.spec	2 Dec 2009 13:51:01 -0000	1.200
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -59,6 +59,10 @@ Patch3: gnome-vfs-2.9.90-modules-conf.pa
 # remove gnome-mime-data dependency
 Patch4: gnome-vfs-2.24.1-disable-gnome-mime-data.patch
 
+# CVE-2009-2473 neon, gnome-vfs2 embedded neon: billion laughs DoS attack
+# https://bugzilla.redhat.com/show_bug.cgi?id=518215
+Patch5: gnome-vfs-2.24.3-CVE-2009-2473.patch
+
 # send to upstream
 Patch101:	gnome-vfs-2.8.2-schema_about_for_upstream.patch
 
@@ -126,6 +130,7 @@ shares (SMB) to applications using GNOME
 
 %patch3 -p1 -b .modules-conf
 %patch4 -p1 -b .mime-data
+%patch5 -p1 -b .CVE-2009-2473
 
 %patch6 -p1 -b .mailto-command
 
@@ -261,6 +266,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Dec  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-3
+- Patch security hole in embedded neon (CVE-2009-2473)
+
 * Wed Nov 04 2009 Bastien Nocera <bnocera at redhat.com> 2.24.2-2
 - Set a default media player application in the schemas
 



From ltinkl at fedoraproject.org  Wed Dec  2 13:52:35 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:52:35 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel kdepim-runtime.spec,1.12,1.13
Message-ID: <20091202135235.A92E711C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	kdepim-runtime.spec 
Log Message:
correct the akonadi version



Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- kdepim-runtime.spec	2 Dec 2009 13:49:30 -0000	1.12
+++ kdepim-runtime.spec	2 Dec 2009 13:52:35 -0000	1.13
@@ -1,4 +1,4 @@
-%define akonadi_version 1.2.1
+%define akonadi_version 1.2.61
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment



From ltinkl at fedoraproject.org  Wed Dec  2 13:54:01 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:54:01 +0000 (UTC)
Subject: File kdepimlibs-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202135401.6AC3D10F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdepimlibs:

e7dee79a6ca9393ef9fdbcdd0614e611  kdepimlibs-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 13:54:42 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 13:54:42 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore, 1.47, 1.48 kdepimlibs.spec, 1.105,
	1.106 sources, 1.45, 1.46
Message-ID: <20091202135442.7EFEE11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	24 Nov 2009 16:17:48 -0000	1.47
+++ .cvsignore	2 Dec 2009 13:54:42 -0000	1.48
@@ -1 +1 @@
-kdepimlibs-4.3.75svn1048496.tar.bz2
+kdepimlibs-4.3.80.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- kdepimlibs.spec	24 Nov 2009 16:17:48 -0000	1.105
+++ kdepimlibs.spec	2 Dec 2009 13:54:42 -0000	1.106
@@ -1,11 +1,11 @@
 %define apidocs 1
 %define akonadi_subpkg 1
 %define akonadi_version 1.2.61
-%define alphatag svn1048496
+#%define alphatag svn1048496
 
 Name: kdepimlibs
-Version: 4.3.75
-Release: 0.1.%{alphatag}%{?dist}
+Version: 4.3.80
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -13,7 +13,7 @@ License: LGPLv2+
 Group: System Environment/Libraries
 
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}%{?alphatag}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
@@ -22,7 +22,7 @@ Requires: akonadi%{?_isa} >= %{akonadi_v
 %endif
 Requires: kdelibs4 >= %{version}
 
-BuildRequires: akonadi-devel >= %{akonadi_version} 
+BuildRequires: akonadi-devel >= %{akonadi_version}
 BuildRequires: boost-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: gpgme-devel
@@ -199,6 +199,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	24 Nov 2009 16:17:48 -0000	1.45
+++ sources	2 Dec 2009 13:54:42 -0000	1.46
@@ -1 +1 @@
-6717cf65d42a16684ca7fa794757cb3c  kdepimlibs-4.3.75svn1048496.tar.bz2
+e7dee79a6ca9393ef9fdbcdd0614e611  kdepimlibs-4.3.80.tar.bz2



From mclasen at fedoraproject.org  Wed Dec  2 13:55:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 13:55:58 +0000 (UTC)
Subject: rpms/atk/devel atk.spec,1.68,1.69
Message-ID: <20091202135558.4FF0A11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	atk.spec 
Log Message:
Try to drop BRs



Index: atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/atk.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- atk.spec	1 Dec 2009 02:43:44 -0000	1.68
+++ atk.spec	2 Dec 2009 13:55:58 -0000	1.69
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support
 Name: atk
 Version: 1.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/atk/1.29/atk-%{version}.tar.bz2
@@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
 
 %description
 The ATK library provides a set of interfaces for adding accessibility
@@ -69,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-2
+- Drop BR
+
 * Mon Nov 30 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-1
 - Update to 1.29.3
 



From tbzatek at fedoraproject.org  Wed Dec  2 13:56:11 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed,  2 Dec 2009 13:56:11 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs-2.24.3-CVE-2009-2473.patch, NONE,
	1.1 gnome-vfs2.spec, 1.199, 1.200
Message-ID: <20091202135611.E5FDB11C0095@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10628

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.24.3-CVE-2009-2473.patch 
Log Message:
* Wed Dec  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-3
- Patch security hole in embedded neon (CVE-2009-2473)


gnome-vfs-2.24.3-CVE-2009-2473.patch:
 ne_xml.c |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

--- NEW FILE gnome-vfs-2.24.3-CVE-2009-2473.patch ---
Index: gnome-vfs-2.24.2/imported/neon/ne_xml.c
===================================================================
--- gnome-vfs-2.24.2/imported/neon/ne_xml.c	(revision 1687)
+++ gnome-vfs-2.24.2/imported/neon/ne_xml.c	(revision 1688)
@@ -405,6 +405,28 @@
     destroy_element(elm);
 }
 
+#if defined(HAVE_EXPAT) && XML_MAJOR_VERSION > 1
+/* Stop the parser if an entity declaration is hit. */
+static void entity_declaration(void *userData, const XML_Char *entityName,
+                              int is_parameter_entity, const XML_Char *value,
+                              int value_length, const XML_Char *base,
+                              const XML_Char *systemId, const XML_Char *publicId,
+                              const XML_Char *notationName)
+{
+    ne_xml_parser *parser = userData;
+    
+    NE_DEBUG(NE_DBG_XMLPARSE, "XML: entity declaration [%s]. Failing.\n",
+             entityName);
+
+    XML_StopParser(parser->parser, XML_FALSE);
+}
+#elif defined(HAVE_EXPAT)
+/* A noop default_handler. */
+static void default_handler(void *userData, const XML_Char *s, int len)
+{
+}
+#endif
+
 /* Find a namespace definition for 'prefix' in given element, where
  * length of prefix is 'pfxlen'.  Returns the URI or NULL. */
 static const char *resolve_nspace(const struct element *elm, 
@@ -459,14 +481,34 @@
     XML_SetCharacterDataHandler(p->parser, char_data);
     XML_SetUserData(p->parser, (void *) p);
     XML_SetXmlDeclHandler(p->parser, decl_handler);
+
+    /* Prevent the "billion laughs" attack against expat by disabling
+     * internal entity expansion.  With 2.x, forcibly stop the parser
+     * if an entity is declared - this is safer and a more obvious
+     * failure mode.  With older versions, installing a noop
+     * DefaultHandler means that internal entities will be expanded as
+     * the empty string, which is also sufficient to prevent the
+     * attack. */
+#if XML_MAJOR_VERSION > 1
+    XML_SetEntityDeclHandler(p->parser, entity_declaration);
 #else
+    XML_SetDefaultHandler(p->parser, default_handler);
+#endif
+
+#else /* HAVE_LIBXML */
     p->parser = xmlCreatePushParserCtxt(&sax_handler, 
 					(void *)p, NULL, 0, NULL);
     if (p->parser == NULL) {
 	abort();
     }
+#if LIBXML_VERSION < 20602
     p->parser->replaceEntities = 1;
+#else
+    /* Enable expansion of entities, and disable network access. */
+    xmlCtxtUseOptions(p->parser, XML_PARSE_NOENT | XML_PARSE_NONET);
 #endif
+
+#endif /* HAVE_LIBXML || HAVE_EXPAT */
     return p;
 }
 


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- gnome-vfs2.spec	4 Nov 2009 14:55:22 -0000	1.199
+++ gnome-vfs2.spec	2 Dec 2009 13:56:11 -0000	1.200
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -59,6 +59,10 @@ Patch3: gnome-vfs-2.9.90-modules-conf.pa
 # remove gnome-mime-data dependency
 Patch4: gnome-vfs-2.24.1-disable-gnome-mime-data.patch
 
+# CVE-2009-2473 neon, gnome-vfs2 embedded neon: billion laughs DoS attack
+# https://bugzilla.redhat.com/show_bug.cgi?id=518215
+Patch5: gnome-vfs-2.24.3-CVE-2009-2473.patch
+
 # send to upstream
 Patch101:	gnome-vfs-2.8.2-schema_about_for_upstream.patch
 
@@ -126,6 +130,7 @@ shares (SMB) to applications using GNOME
 
 %patch3 -p1 -b .modules-conf
 %patch4 -p1 -b .mime-data
+%patch5 -p1 -b .CVE-2009-2473
 
 %patch6 -p1 -b .mailto-command
 
@@ -261,6 +266,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Dec  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-3
+- Patch security hole in embedded neon (CVE-2009-2473)
+
 * Wed Nov 04 2009 Bastien Nocera <bnocera at redhat.com> 2.24.2-2
 - Set a default media player application in the schemas
 



From ltinkl at fedoraproject.org  Wed Dec  2 14:04:00 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 14:04:00 +0000 (UTC)
Subject: File kdeplasma-addons-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091202140400.1D98910F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeplasma-addons:

c33ed42e020c14ce23156bfaf5312f81  kdeplasma-addons-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 14:05:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 14:05:30 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.24,
	1.25 kdeplasma-addons.spec, 1.72, 1.73 sources, 1.23, 1.24
Message-ID: <20091202140530.F08E911C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12878

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	25 Nov 2009 00:57:27 -0000	1.24
+++ .cvsignore	2 Dec 2009 14:05:30 -0000	1.25
@@ -1 +1 @@
-kdeplasma-addons-4.3.75svn1048496.tar.bz2
+kdeplasma-addons-4.3.80.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- kdeplasma-addons.spec	25 Nov 2009 00:56:46 -0000	1.72
+++ kdeplasma-addons.spec	2 Dec 2009 14:05:30 -0000	1.73
@@ -1,14 +1,12 @@
-%define alphatag svn1048496
-
 Name:           kdeplasma-addons
-Version:        4.3.75
-Release:        0.1.%{alphatag}%{?dist}
+Version:        4.3.80
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeplasma-addons-%{version}%{?alphatag}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
@@ -163,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	25 Nov 2009 00:57:27 -0000	1.23
+++ sources	2 Dec 2009 14:05:30 -0000	1.24
@@ -1 +1 @@
-1748c56df00f5d330a1536b3ddcb8a56  kdeplasma-addons-4.3.75svn1048496.tar.bz2
+c33ed42e020c14ce23156bfaf5312f81  kdeplasma-addons-4.3.80.tar.bz2



From mclasen at fedoraproject.org  Wed Dec  2 14:06:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 14:06:09 +0000 (UTC)
Subject: rpms/atk/F-12 atk.spec,1.66,1.67
Message-ID: <20091202140609.2DF3B11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/atk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12382

Modified Files:
	atk.spec 
Log Message:
drop unneeded BR



Index: atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atk/F-12/atk.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- atk.spec	23 Sep 2009 23:56:24 -0000	1.66
+++ atk.spec	2 Dec 2009 14:06:08 -0000	1.67
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support
 Name: atk
 Version: 1.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/atk/1.28/atk-%{version}.tar.bz2
@@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
 
 %description
 The ATK library provides a set of interfaces for adding accessibility
@@ -70,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-2
+- Drop unneeded BR
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-1
 - Update to 2.28.0
 



From ltinkl at fedoraproject.org  Wed Dec  2 14:09:53 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 14:09:53 +0000 (UTC)
Subject: File kdesdk-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202140953.A9F0C10F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdesdk:

c9f9065c5c348ac2ed17ed0fb676e248  kdesdk-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 14:11:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 14:11:27 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore, 1.68, 1.69 kdesdk.spec, 1.155,
	1.156 sources, 1.68, 1.69
Message-ID: <20091202141127.E4A6C11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	24 Nov 2009 17:08:16 -0000	1.68
+++ .cvsignore	2 Dec 2009 14:11:27 -0000	1.69
@@ -1 +1 @@
-kdesdk-4.3.75svn1048496.tar.bz2
+kdesdk-4.3.80.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kdesdk.spec	24 Nov 2009 22:35:00 -0000	1.155
+++ kdesdk.spec	2 Dec 2009 14:11:27 -0000	1.156
@@ -1,15 +1,13 @@
-%define alphatag svn1048496
-
 Name:           kdesdk
-Version:        4.3.75
-Release:        0.2.%{alphatag}%{?dist}
+Version:        4.3.80
+Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
 # FIXME/TODO: Check license
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream patches
@@ -229,6 +227,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.2.svn1048496
 - Add BR on hunspell for lokalize
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	24 Nov 2009 17:08:16 -0000	1.68
+++ sources	2 Dec 2009 14:11:27 -0000	1.69
@@ -1 +1 @@
-b710c14a1d7d74ec5201d5068702dece  kdesdk-4.3.75svn1048496.tar.bz2
+c9f9065c5c348ac2ed17ed0fb676e248  kdesdk-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 14:15:01 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 14:15:01 +0000 (UTC)
Subject: File kdetoys-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202141501.7EC3910F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdetoys:

3b6b6f6d066e6612e04085ad15c350a5  kdetoys-4.3.80.tar.bz2



From sailer at fedoraproject.org  Wed Dec  2 14:24:32 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed,  2 Dec 2009 14:24:32 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl.spec,1.57,1.58
Message-ID: <20091202142433.0BAAF11C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

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

Modified Files:
	ghdl.spec 
Log Message:
copy instead of symlink v08 libs



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- ghdl.spec	2 Dec 2009 11:18:48 -0000	1.57
+++ ghdl.spec	2 Dec 2009 14:24:32 -0000	1.58
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.0%{?dist}
+Release: 0.%{ghdlsvnver}svn.1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -282,11 +282,19 @@ pushd %{buildroot}
 
 popd
 
-# Symlink v08 libraries for now
+# copy v08 libraries from v93 for now
 P64=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/
-%{__ln_s} v93 ${P64}v08
+%{__cp} -rv ${P64}v93 ${P64}v08
+%{__mv} ${P64}v08/std/std-obj93.cf ${P64}v08/std/std-obj08.cf
+%{__mv} ${P64}v08/ieee/ieee-obj93.cf ${P64}v08/ieee/ieee-obj08.cf
+%{__mv} ${P64}v08/mentor/ieee-obj93.cf ${P64}v08/mentor/ieee-obj08.cf
+%{__mv} ${P64}v08/synopsys/ieee-obj93.cf ${P64}v08/synopsys/ieee-obj08.cf
 %ifarch x86_64
-%{__ln_s} v93 ${P32}v08
+%{__cp} -rv ${P32}v93 ${P32}v08
+%{__mv} ${P32}v08/std/std-obj93.cf ${P32}v08/std/std-obj08.cf
+%{__mv} ${P32}v08/ieee/ieee-obj93.cf ${P32}v08/ieee/ieee-obj08.cf
+%{__mv} ${P32}v08/mentor/ieee-obj93.cf ${P32}v08/mentor/ieee-obj08.cf
+%{__mv} ${P32}v08/synopsys/ieee-obj93.cf ${P32}v08/synopsys/ieee-obj08.cf
 %endif
 
 %clean
@@ -318,6 +326,9 @@ P64=%{buildroot}/%{_libdir}/gcc/%{gcc_ta
 
 
 %changelog
+* Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.1
+- copy v08 libraries instead of symlink
+
 * Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
 - update to 0.28/svn131
 - symlink v08 libraries to v93 for now



From rdieter at fedoraproject.org  Wed Dec  2 14:33:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 14:33:27 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-12
	kdebase-workspace-4.3.3-kdm_plymouth.patch, 1.1, 1.2
Message-ID: <20091202143327.8FA9811C0095@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19403

Modified Files:
	kdebase-workspace-4.3.3-kdm_plymouth.patch 
Log Message:
adapt/borrow more code from gdm-2.26.0-force-active-vt.patch


kdebase-workspace-4.3.3-kdm_plymouth.patch:
 dm.c |   34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

Index: kdebase-workspace-4.3.3-kdm_plymouth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace-4.3.3-kdm_plymouth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-workspace-4.3.3-kdm_plymouth.patch	1 Dec 2009 18:48:13 -0000	1.1
+++ kdebase-workspace-4.3.3-kdm_plymouth.patch	2 Dec 2009 14:33:27 -0000	1.2
@@ -1,13 +1,51 @@
-diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
---- kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth	2008-07-21 19:03:20.000000000 -0500
-+++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-01 12:26:16.435483131 -0600
-@@ -1356,6 +1356,9 @@ allocateVT( struct display *d )
- 						}
- 					}
- 				}
-+				/* if using plymouth, force use of specified vt.  TODO: query/use activevt */
-+				if ((open( "/var/spool/gdm/force-display-on-active-vt", O_RDONLY )) >= 0 )
-+					volun = False;
- 				if (!volun || !((1 << tvt) & getBusyVTs())) {
- 					d->serverVT = tvt;
- 					return;
+diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.kdm_plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
+--- kdebase-workspace-4.3.3/kdm/backend/dm.c.kdm_plymouth	2008-07-21 19:03:20.000000000 -0500
++++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-02 08:22:48.935095381 -0600
+@@ -1315,6 +1315,34 @@ getBusyVTs( void )
+ 	return activeVTs;
+ }
+ 
++static int
++get_active_vt (void)
++{
++        int console_fd;
++        struct vt_stat console_state = { 0 };
++        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
++        if (console_fd < 0) {
++                goto out;
++        }
++        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
++                goto out;
++        }
++out:
++        if (console_fd >= 0) {
++                close (console_fd);
++        }
++        return console_state.v_active;
++}
++
++static int
++triggered_to_force_display_on_active_vt (void)
++{
++	int should_force_display_on_active_vt;
++	should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
++	unlink("/var/spool/gdm/force-display-on-active-vt");
++	return should_force_display_on_active_vt;
++}
++
+ static void
+ allocateVT( struct display *d )
+ {
+@@ -1324,7 +1352,11 @@ allocateVT( struct display *d )
+ 	if ((d->displayType & d_location) == dLocal &&
+ 	    d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
+ 	{
+-		if (d->reqSrvVT && d->reqSrvVT < 16)
++		if ( triggered_to_force_display_on_active_vt() >= 0 )
++		{
++			d->serverVT = get_active_vt() ;
++		}
++		else if (d->reqSrvVT && d->reqSrvVT < 16)
+ 			d->serverVT = d->reqSrvVT;
+ 		else {
+ 			for (i = tvt = 0;;) {



From varekova at fedoraproject.org  Wed Dec  2 14:34:57 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed,  2 Dec 2009 14:34:57 +0000 (UTC)
Subject: rpms/man-pages/F-12 man-pages-3.22-sched_setaffinity.patch, NONE,
	1.1 man-pages.spec, 1.122, 1.123
Message-ID: <20091202143457.4E40911C0095@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19768

Modified Files:
	man-pages.spec 
Added Files:
	man-pages-3.22-sched_setaffinity.patch 
Log Message:
- fix sched_setaffinity(2) page - add an EXAMPLE and new NOTES


man-pages-3.22-sched_setaffinity.patch:
 sched_setaffinity.2 |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

--- NEW FILE man-pages-3.22-sched_setaffinity.patch ---
diff -up man-pages-3.22/man2/sched_setaffinity.2.orig man-pages-3.22/man2/sched_setaffinity.2
--- man-pages-3.22/man2/sched_setaffinity.2.orig	2009-07-25 08:53:26.000000000 +0200
+++ man-pages-3.22/man2/sched_setaffinity.2	2009-12-02 15:29:17.000000000 +0100
@@ -212,6 +212,60 @@ system call returns the size (in bytes) 
 .I cpumask_t
 data type that is used internally by the kernel to
 represent the CPU set bit mask.
+
+The \fBcpu_set_t\fR affinity mask size provided by glibc only allows for upto
+1024 CPUs. It is possible to build Linux kernels with greater than 1024
+CPUs. Any application using the statically sized \fBcpu_set_t\fR will fail
+with \fBEINVAL\fR on such kernels. It is thus recommended that applications
+avoid using the statically sized \fBcpu_set_t\fR type, and instead dynamically
+allocate a mask using the CPU_*_S macros described in the \fBCPU_SET(3)\fR man
+page. Since it is not possible to determine ahead of time what \fBNR_CPUS\fR
+value the kernel was built with, applications must be prepared to catch
+\fBEINVAL\fR, and retry the command with a larger dynamically allocated mask.
+The example that follows illustrates portable usage.
+
+.SH EXAMPLE
+.nf
+   #define _GNU_SOURCE
+
+   #include <sched.h>
+   #include <stdio.h>
+   #include <errno.h>
+
+   int main(void)
+   {
+        cpu_set_t *mask;
+        size_t size;
+        int i;
+        int nrcpus = 1024;
+
+realloc:
+        mask = CPU_ALLOC(nrcpus);
+        size = CPU_ALLOC_SIZE(nrcpus);
+        CPU_ZERO_S(size, mask);
+        if ( sched_getaffinity(0, size, mask) == -1 ) {
+                CPU_FREE(mask);
+                if (errno == EINVAL &&
+                    nrcpus < (1024 << 8)) {
+                       nrcpus = nrcpus << 2;
+                       goto realloc;
+                }
+                perror("sched_getaffinity");
+                return -1;
+        }
+
+        for ( i = 0; i < nrcpus; i++ ) {
+                if ( CPU_ISSET_S(i, size, mask) ) {
+                        printf("CPU %d is set\n", (i+1));
+                }
+        }
+
+        CPU_FREE(mask);
+
+        return 0;
+   }  
+.fi
+
 .SH "SEE ALSO"
 .BR clone (2),
 .BR getcpu (2),


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/F-12/man-pages.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- man-pages.spec	16 Sep 2009 08:47:42 -0000	1.122
+++ man-pages.spec	2 Dec 2009 14:34:57 -0000	1.123
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.22
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -31,6 +31,7 @@ Patch54: man-pages-2.80-malloc_h.patch
 Patch55: man-pages-3.22-gai.conf.patch
 Patch56: man-pages-3.22-strcpy.patch
 Patch57: man-pages-3.22-nsswitch.conf.patch
+Patch58: man-pages-3.22-sched_setaffinity.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Autoreq: false
@@ -60,6 +61,7 @@ rmdir man-pages-posix-%{posix_version}-%
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 
 ### And now remove those we are not going to use:
 
@@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Wed Dec  2 2009 Ivana Varekova <varekova at redhat.com> - 3.22-7
+- fix sched_setaffinity(2) page - add an EXAMPLE and new NOTES
+
 * Wed Sep 16 2009 Ivana Varekova <varekova at redhat.com> - 3.22-6
 - fix nsswitch.conf(5) man page
 



From rdieter at fedoraproject.org  Wed Dec  2 14:37:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 14:37:00 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-12 kdebase-workspace.spec,1.311,1.312
Message-ID: <20091202143700.311F611C0095@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20353

Modified Files:
	kdebase-workspace.spec 
Log Message:
new changelog for updated patch



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -p -r1.311 -r1.312
--- kdebase-workspace.spec	1 Dec 2009 18:52:10 -0000	1.311
+++ kdebase-workspace.spec	2 Dec 2009 14:36:59 -0000	1.312
@@ -616,7 +616,7 @@ fi
 %changelog
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
-- force use of ServerVTs(1), if booting from plymouth (#475890)
+- kdm_plymouth patch (#475890)
 
 * Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7.1
 - Requires: PolicyKit-authentication-agent unconditionally (ie, in F-12 too)



From ltinkl at fedoraproject.org  Wed Dec  2 14:38:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 14:38:25 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore, 1.45, 1.46 kdetoys.spec, 1.62,
	1.63 sources, 1.41, 1.42
Message-ID: <20091202143825.D551C11C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	24 Nov 2009 17:09:29 -0000	1.45
+++ .cvsignore	2 Dec 2009 14:38:25 -0000	1.46
@@ -1 +1 @@
-kdetoys-4.3.75svn1048496.tar.bz2
+kdetoys-4.3.80.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- kdetoys.spec	24 Nov 2009 17:09:29 -0000	1.62
+++ kdetoys.spec	2 Dec 2009 14:38:25 -0000	1.63
@@ -1,15 +1,13 @@
-%define alphatag svn1048496
-
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.75
-Release:        0.1.%{alphatag}%{?dist}
+Version:        4.3.80
+Release:        1%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream patches
@@ -84,6 +82,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snaphot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	24 Nov 2009 17:09:29 -0000	1.41
+++ sources	2 Dec 2009 14:38:25 -0000	1.42
@@ -1 +1 @@
-9876f29ea579260685d718ffd35cf1c4  kdetoys-4.3.75svn1048496.tar.bz2
+3b6b6f6d066e6612e04085ad15c350a5  kdetoys-4.3.80.tar.bz2



From varekova at fedoraproject.org  Wed Dec  2 14:42:05 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed,  2 Dec 2009 14:42:05 +0000 (UTC)
Subject: rpms/man-pages/devel man-pages-3.22-sched_setaffinity.patch, NONE, 
	1.1 man-pages.spec, 1.124, 1.125
Message-ID: <20091202144205.B6FF111C0095@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21813

Modified Files:
	man-pages.spec 
Added Files:
	man-pages-3.22-sched_setaffinity.patch 
Log Message:
- fix sched_setaffinity(2) page - add an EXAMPLE and new NOTES


man-pages-3.22-sched_setaffinity.patch:
 sched_setaffinity.2 |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

--- NEW FILE man-pages-3.22-sched_setaffinity.patch ---
diff -up man-pages-3.22/man2/sched_setaffinity.2.orig man-pages-3.22/man2/sched_setaffinity.2
--- man-pages-3.22/man2/sched_setaffinity.2.orig	2009-07-25 08:53:26.000000000 +0200
+++ man-pages-3.22/man2/sched_setaffinity.2	2009-12-02 15:29:17.000000000 +0100
@@ -212,6 +212,60 @@ system call returns the size (in bytes) 
 .I cpumask_t
 data type that is used internally by the kernel to
 represent the CPU set bit mask.
+
+The \fBcpu_set_t\fR affinity mask size provided by glibc only allows for upto
+1024 CPUs. It is possible to build Linux kernels with greater than 1024
+CPUs. Any application using the statically sized \fBcpu_set_t\fR will fail
+with \fBEINVAL\fR on such kernels. It is thus recommended that applications
+avoid using the statically sized \fBcpu_set_t\fR type, and instead dynamically
+allocate a mask using the CPU_*_S macros described in the \fBCPU_SET(3)\fR man
+page. Since it is not possible to determine ahead of time what \fBNR_CPUS\fR
+value the kernel was built with, applications must be prepared to catch
+\fBEINVAL\fR, and retry the command with a larger dynamically allocated mask.
+The example that follows illustrates portable usage.
+
+.SH EXAMPLE
+.nf
+   #define _GNU_SOURCE
+
+   #include <sched.h>
+   #include <stdio.h>
+   #include <errno.h>
+
+   int main(void)
+   {
+        cpu_set_t *mask;
+        size_t size;
+        int i;
+        int nrcpus = 1024;
+
+realloc:
+        mask = CPU_ALLOC(nrcpus);
+        size = CPU_ALLOC_SIZE(nrcpus);
+        CPU_ZERO_S(size, mask);
+        if ( sched_getaffinity(0, size, mask) == -1 ) {
+                CPU_FREE(mask);
+                if (errno == EINVAL &&
+                    nrcpus < (1024 << 8)) {
+                       nrcpus = nrcpus << 2;
+                       goto realloc;
+                }
+                perror("sched_getaffinity");
+                return -1;
+        }
+
+        for ( i = 0; i < nrcpus; i++ ) {
+                if ( CPU_ISSET_S(i, size, mask) ) {
+                        printf("CPU %d is set\n", (i+1));
+                }
+        }
+
+        CPU_FREE(mask);
+
+        return 0;
+   }  
+.fi
+
 .SH "SEE ALSO"
 .BR clone (2),
 .BR getcpu (2),


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- man-pages.spec	18 Nov 2009 12:25:03 -0000	1.124
+++ man-pages.spec	2 Dec 2009 14:42:05 -0000	1.125
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.23
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -33,6 +33,7 @@ Patch56: man-pages-3.22-strcpy.patch
 Patch57: man-pages-3.22-nsswitch.conf.patch
 Patch58: man-pages-3.23-proc.patch
 Patch59: man-pages-3.23-ld.so.patch
+Patch60: man-pages-3.22-sched_setaffinity.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Autoreq: false
@@ -64,6 +65,7 @@ rmdir man-pages-posix-%{posix_version}-%
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
 
 ### And now remove those we are not going to use:
 
@@ -134,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Wed Dec  2 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 3.22-7
+- fix sched_setaffinity(2) page - add an EXAMPLE and new NOTES
+
 * Wed Nov 18 2009 Ivana Varekova <varekova at redhat.com> - 3.23-2
 - fix ld.so man-page (#532629)
 



From rdieter at fedoraproject.org  Wed Dec  2 14:43:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 14:43:04 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11
	kdebase-workspace-4.3.3-kdm_plymouth.patch, 1.1,
	1.2 kdebase-workspace.spec, 1.249, 1.250
Message-ID: <20091202144304.0DF3F11C0095@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22182

Modified Files:
	kdebase-workspace-4.3.3-kdm_plymouth.patch 
	kdebase-workspace.spec 
Log Message:
* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-9
- (better) kdm_plymouth patch (#475890)


kdebase-workspace-4.3.3-kdm_plymouth.patch:
 dm.c |   34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

Index: kdebase-workspace-4.3.3-kdm_plymouth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace-4.3.3-kdm_plymouth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-workspace-4.3.3-kdm_plymouth.patch	1 Dec 2009 19:43:15 -0000	1.1
+++ kdebase-workspace-4.3.3-kdm_plymouth.patch	2 Dec 2009 14:43:03 -0000	1.2
@@ -1,13 +1,51 @@
-diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
---- kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth	2008-07-21 19:03:20.000000000 -0500
-+++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-01 12:26:16.435483131 -0600
-@@ -1356,6 +1356,9 @@ allocateVT( struct display *d )
- 						}
- 					}
- 				}
-+				/* if using plymouth, force use of specified vt.  TODO: query/use activevt */
-+				if ((open( "/var/spool/gdm/force-display-on-active-vt", O_RDONLY )) >= 0 )
-+					volun = False;
- 				if (!volun || !((1 << tvt) & getBusyVTs())) {
- 					d->serverVT = tvt;
- 					return;
+diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.kdm_plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
+--- kdebase-workspace-4.3.3/kdm/backend/dm.c.kdm_plymouth	2008-07-21 19:03:20.000000000 -0500
++++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-02 08:22:48.935095381 -0600
+@@ -1315,6 +1315,34 @@ getBusyVTs( void )
+ 	return activeVTs;
+ }
+ 
++static int
++get_active_vt (void)
++{
++        int console_fd;
++        struct vt_stat console_state = { 0 };
++        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
++        if (console_fd < 0) {
++                goto out;
++        }
++        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
++                goto out;
++        }
++out:
++        if (console_fd >= 0) {
++                close (console_fd);
++        }
++        return console_state.v_active;
++}
++
++static int
++triggered_to_force_display_on_active_vt (void)
++{
++	int should_force_display_on_active_vt;
++	should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
++	unlink("/var/spool/gdm/force-display-on-active-vt");
++	return should_force_display_on_active_vt;
++}
++
+ static void
+ allocateVT( struct display *d )
+ {
+@@ -1324,7 +1352,11 @@ allocateVT( struct display *d )
+ 	if ((d->displayType & d_location) == dLocal &&
+ 	    d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
+ 	{
+-		if (d->reqSrvVT && d->reqSrvVT < 16)
++		if ( triggered_to_force_display_on_active_vt() >= 0 )
++		{
++			d->serverVT = get_active_vt() ;
++		}
++		else if (d->reqSrvVT && d->reqSrvVT < 16)
+ 			d->serverVT = d->reqSrvVT;
+ 		else {
+ 			for (i = tvt = 0;;) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- kdebase-workspace.spec	1 Dec 2009 19:43:15 -0000	1.249
+++ kdebase-workspace.spec	2 Dec 2009 14:43:03 -0000	1.250
@@ -8,7 +8,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -615,6 +615,9 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-9
+- (better) kdm_plymouth patch (#475890)
+
 * Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
 - force use of ServerVTs(1), if booting from plymouth (#475890)
 



From ltinkl at fedoraproject.org  Wed Dec  2 14:43:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 14:43:27 +0000 (UTC)
Subject: File kdeutils-4.3.80.tar.bz2 uploaded to lookaside cache by ltinkl
Message-ID: <20091202144327.B2CDB10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdeutils:

a471e2dd438af142cee5c98302987f33  kdeutils-4.3.80.tar.bz2



From rdieter at fedoraproject.org  Wed Dec  2 14:43:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 14:43:49 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.3.3-kdm_plymouth.patch, 1.1,
	1.2 kdebase-workspace.spec, 1.199, 1.200
Message-ID: <20091202144349.C8ED611C0095@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22619

Modified Files:
	kdebase-workspace-4.3.3-kdm_plymouth.patch 
	kdebase-workspace.spec 
Log Message:
* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-9
- (better) kdm_plymouth patch (#475890)


kdebase-workspace-4.3.3-kdm_plymouth.patch:
 dm.c |   34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

Index: kdebase-workspace-4.3.3-kdm_plymouth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace-4.3.3-kdm_plymouth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-workspace-4.3.3-kdm_plymouth.patch	1 Dec 2009 19:44:01 -0000	1.1
+++ kdebase-workspace-4.3.3-kdm_plymouth.patch	2 Dec 2009 14:43:49 -0000	1.2
@@ -1,13 +1,51 @@
-diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
---- kdebase-workspace-4.3.3/kdm/backend/dm.c.plymouth	2008-07-21 19:03:20.000000000 -0500
-+++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-01 12:26:16.435483131 -0600
-@@ -1356,6 +1356,9 @@ allocateVT( struct display *d )
- 						}
- 					}
- 				}
-+				/* if using plymouth, force use of specified vt.  TODO: query/use activevt */
-+				if ((open( "/var/spool/gdm/force-display-on-active-vt", O_RDONLY )) >= 0 )
-+					volun = False;
- 				if (!volun || !((1 << tvt) & getBusyVTs())) {
- 					d->serverVT = tvt;
- 					return;
+diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.kdm_plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
+--- kdebase-workspace-4.3.3/kdm/backend/dm.c.kdm_plymouth	2008-07-21 19:03:20.000000000 -0500
++++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-02 08:22:48.935095381 -0600
+@@ -1315,6 +1315,34 @@ getBusyVTs( void )
+ 	return activeVTs;
+ }
+ 
++static int
++get_active_vt (void)
++{
++        int console_fd;
++        struct vt_stat console_state = { 0 };
++        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
++        if (console_fd < 0) {
++                goto out;
++        }
++        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
++                goto out;
++        }
++out:
++        if (console_fd >= 0) {
++                close (console_fd);
++        }
++        return console_state.v_active;
++}
++
++static int
++triggered_to_force_display_on_active_vt (void)
++{
++	int should_force_display_on_active_vt;
++	should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
++	unlink("/var/spool/gdm/force-display-on-active-vt");
++	return should_force_display_on_active_vt;
++}
++
+ static void
+ allocateVT( struct display *d )
+ {
+@@ -1324,7 +1352,11 @@ allocateVT( struct display *d )
+ 	if ((d->displayType & d_location) == dLocal &&
+ 	    d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
+ 	{
+-		if (d->reqSrvVT && d->reqSrvVT < 16)
++		if ( triggered_to_force_display_on_active_vt() >= 0 )
++		{
++			d->serverVT = get_active_vt() ;
++		}
++		else if (d->reqSrvVT && d->reqSrvVT < 16)
+ 			d->serverVT = d->reqSrvVT;
+ 		else {
+ 			for (i = tvt = 0;;) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- kdebase-workspace.spec	1 Dec 2009 19:44:01 -0000	1.199
+++ kdebase-workspace.spec	2 Dec 2009 14:43:49 -0000	1.200
@@ -8,7 +8,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -615,6 +615,9 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-9
+- (better) kdm_plymouth patch (#475890)
+
 * Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
 - force use of ServerVTs(1), if booting from plymouth (#475890)
 



From kkofler at fedoraproject.org  Wed Dec  2 14:44:38 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  2 Dec 2009 14:44:38 +0000 (UTC)
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.162,1.163
Message-ID: <20091202144438.D099011C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdemultimedia.spec 
Log Message:
rm alphatag


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- kdemultimedia.spec	2 Dec 2009 13:23:51 -0000	1.162
+++ kdemultimedia.spec	2 Dec 2009 14:44:38 -0000	1.163
@@ -1,9 +1,8 @@
-#%define alphatag svn1048496
 
 Name: kdemultimedia
 Epoch: 6
 Version: 4.3.80
-Release: 1.%{?alphatag}%{?dist}
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:   Applications/Multimedia



From ltinkl at fedoraproject.org  Wed Dec  2 14:47:29 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 14:47:29 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore, 1.73, 1.74 kdeutils.spec, 1.202,
	1.203 sources, 1.72, 1.73
Message-ID: <20091202144729.4920011C0095@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	24 Nov 2009 17:11:22 -0000	1.73
+++ .cvsignore	2 Dec 2009 14:47:28 -0000	1.74
@@ -1 +1 @@
-kdeutils-4.3.75svn1048496.tar.bz2
+kdeutils-4.3.80.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- kdeutils.spec	24 Nov 2009 23:41:38 -0000	1.202
+++ kdeutils.spec	2 Dec 2009 14:47:28 -0000	1.203
@@ -1,20 +1,18 @@
-%define alphatag svn1048496
-
 %if 0%{?fedora}
 %define printer_applet 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.75
-Release:        0.2.%{alphatag}%{?dist}
+Version:        4.3.80
+Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
 # FIXME/TODO: Check license
 License:        GPLv2
 URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         kdeutils-4.2.85-pykde4.patch
@@ -235,6 +233,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.2.svn1048496
 - Add BR on kdebase-workspace for irkick
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	24 Nov 2009 17:11:22 -0000	1.72
+++ sources	2 Dec 2009 14:47:28 -0000	1.73
@@ -1 +1 @@
-a41cd9d87ec1a20d848bf925359cb45f  kdeutils-4.3.75svn1048496.tar.bz2
+a471e2dd438af142cee5c98302987f33  kdeutils-4.3.80.tar.bz2



From kkofler at fedoraproject.org  Wed Dec  2 14:47:53 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  2 Dec 2009 14:47:53 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.217,1.218
Message-ID: <20091202144753.9AE9011C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdenetwork.spec 
Log Message:
- reenable webkitpart support


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- kdenetwork.spec	2 Dec 2009 13:37:02 -0000	1.217
+++ kdenetwork.spec	2 Dec 2009 14:47:53 -0000	1.218
@@ -19,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 %if 0%{?fedora}
 BuildRequires: avahi-compat-libdns_sd-devel
-#BuildRequires: webkitpart-devel >= 0.0.2
+BuildRequires: webkitpart-devel >= 0.0.2
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: openslp-devel
 BuildRequires: libotr-devel
@@ -155,7 +155,7 @@ fi
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
 %if 0%{?fedora}
-#%{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
+%{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
 %endif
 %{_kde4_appsdir}/kopete*
 %{_kde4_appsdir}/kppp/
@@ -193,6 +193,7 @@ fi
 %changelog
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
+- reenable webkitpart support
 
 * Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.3.svn1048496
 - disable webkitpart support for now, does not build



From jakub at fedoraproject.org  Wed Dec  2 14:52:02 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  2 Dec 2009 14:52:02 +0000 (UTC)
Subject: File gcc-4.4.2-20091202.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091202145202.D83F710F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gcc:

74a02ed7bf5efa323ab4113d7e5331b5  gcc-4.4.2-20091202.tar.bz2



From rdieter at fedoraproject.org  Wed Dec  2 14:57:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 14:57:15 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.3-kdm_plymouth.patch, NONE,
	1.1 kdebase-workspace-4.3.80-brightness-keys.patch, NONE,
	1.1 kdebase-workspace.spec, 1.319,
	1.320 kdebase-workspace-4.3.75-battery-plasmoid-trunk.patch, 1.1,
	NONE kdebase-workspace-4.3.75-brightness-keys.patch, 1.2, NONE
Message-ID: <20091202145715.2126F11C0095@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.3-kdm_plymouth.patch 
	kdebase-workspace-4.3.80-brightness-keys.patch 
Removed Files:
	kdebase-workspace-4.3.75-battery-plasmoid-trunk.patch 
	kdebase-workspace-4.3.75-brightness-keys.patch 
Log Message:
- kdm_plymouth patch (#475890)
- rebase brightness_keys patch
- drop upstreamed bits


kdebase-workspace-4.3.3-kdm_plymouth.patch:
 dm.c |   34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.3-kdm_plymouth.patch ---
diff -up kdebase-workspace-4.3.3/kdm/backend/dm.c.kdm_plymouth kdebase-workspace-4.3.3/kdm/backend/dm.c
--- kdebase-workspace-4.3.3/kdm/backend/dm.c.kdm_plymouth	2008-07-21 19:03:20.000000000 -0500
+++ kdebase-workspace-4.3.3/kdm/backend/dm.c	2009-12-02 08:22:48.935095381 -0600
@@ -1315,6 +1315,34 @@ getBusyVTs( void )
 	return activeVTs;
 }
 
+static int
+get_active_vt (void)
+{
+        int console_fd;
+        struct vt_stat console_state = { 0 };
+        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
+        if (console_fd < 0) {
+                goto out;
+        }
+        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
+                goto out;
+        }
+out:
+        if (console_fd >= 0) {
+                close (console_fd);
+        }
+        return console_state.v_active;
+}
+
+static int
+triggered_to_force_display_on_active_vt (void)
+{
+	int should_force_display_on_active_vt;
+	should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
+	unlink("/var/spool/gdm/force-display-on-active-vt");
+	return should_force_display_on_active_vt;
+}
+
 static void
 allocateVT( struct display *d )
 {
@@ -1324,7 +1352,11 @@ allocateVT( struct display *d )
 	if ((d->displayType & d_location) == dLocal &&
 	    d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
 	{
-		if (d->reqSrvVT && d->reqSrvVT < 16)
+		if ( triggered_to_force_display_on_active_vt() >= 0 )
+		{
+			d->serverVT = get_active_vt() ;
+		}
+		else if (d->reqSrvVT && d->reqSrvVT < 16)
 			d->serverVT = d->reqSrvVT;
 		else {
 			for (i = tvt = 0;;) {

kdebase-workspace-4.3.80-brightness-keys.patch:
 libs/solid/control/powermanager.cpp        |   11 +++-
 plasma/generic/applets/battery/battery.cpp |   74 ++++++++++++++++++++++++----
 plasma/generic/applets/battery/battery.h   |   10 +++
 powerdevil/daemon/PowerDevilDaemon.cpp     |   75 +++++++++++++++++++++++++----
 powerdevil/daemon/PowerDevilDaemon.h       |    6 ++
 powerdevil/daemon/org.kde.PowerDevil.xml   |    8 +++
 6 files changed, 161 insertions(+), 23 deletions(-)

--- NEW FILE kdebase-workspace-4.3.80-brightness-keys.patch ---
diff -up kdebase-workspace-4.3.80/libs/solid/control/powermanager.cpp.brightness_keys kdebase-workspace-4.3.80/libs/solid/control/powermanager.cpp
--- kdebase-workspace-4.3.80/libs/solid/control/powermanager.cpp.brightness_keys	2009-02-12 04:23:46.000000000 -0600
+++ kdebase-workspace-4.3.80/libs/solid/control/powermanager.cpp	2009-12-02 08:55:24.401804794 -0600
@@ -25,6 +25,8 @@
 #include "ifaces/powermanager.h"
 #include <kdebug.h>
 #include <kglobal.h>
+#include <QDBusInterface>
+#include <QDBusPendingCall>
 #include <QX11Info>
 
 K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager)
@@ -160,7 +162,8 @@ bool Solid::Control::PowerManager::setBr
 #ifdef Q_WS_WIN
             return false;
 #else
-            return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 );
+            if ( xrandr_brightlight( QX11Info::display(), brightness ) < 0 )
+                return false;
 #endif
         }
         else
@@ -170,8 +173,12 @@ bool Solid::Control::PowerManager::setBr
                 SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(), setBrightness(brightness, device));
             }
             //TODO - This should be done better, it will return true even if one of the calls returns false. SOLID_CALL does not allow us to get the return value.
-            return true;
         }
+
+        QDBusConnection dbus(QDBusConnection::sessionBus());
+        QDBusInterface iface("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil", dbus);
+        iface.asyncCall("notifyOfBrightnessChange", (int) Solid::Control::PowerManager::brightness());
+        return true;
     }
     else
     {
diff -up kdebase-workspace-4.3.80/plasma/generic/applets/battery/battery.cpp.brightness_keys kdebase-workspace-4.3.80/plasma/generic/applets/battery/battery.cpp
--- kdebase-workspace-4.3.80/plasma/generic/applets/battery/battery.cpp.brightness_keys	2009-12-02 08:55:24.388804115 -0600
+++ kdebase-workspace-4.3.80/plasma/generic/applets/battery/battery.cpp	2009-12-02 08:55:24.401804794 -0600
@@ -24,7 +24,9 @@
 #include <QApplication>
 #include <QDBusConnection>
 #include <QDBusInterface>
+#include <QDesktopWidget>
 #include <QPainter>
+#include <QProgressBar>
 #include <QStyleOptionGraphicsItem>
 #include <QFont>
 #include <QGraphicsSceneHoverEvent>
@@ -33,7 +35,9 @@
 #include <QDBusPendingCall>
 #include <QLabel>
 #include <QPropertyAnimation>
+#include <QTimer>
 
+#include <KApplication>
 #include <KDebug>
 #include <KIcon>
 #include <KSharedConfig>
@@ -86,7 +90,8 @@ Battery::Battery(QObject *parent, const 
       m_labelAlpha(0),
       m_labelAnimation(0),
       m_acAlpha(0),
-      m_acAnimation(0)
+      m_acAnimation(0),
+      m_brightnessDisplay(0)
 {
     //kDebug() << "Loading applet battery";
     setAcceptsHoverEvents(true);
@@ -318,6 +323,7 @@ void Battery::hoverLeaveEvent(QGraphicsS
 
 Battery::~Battery()
 {
+    delete m_brightnessDisplay;
 }
 
 void Battery::suspend()
@@ -338,13 +344,17 @@ void Battery::hibernate()
 
 void Battery::brightnessChanged(const int brightness)
 {
-    Solid::Control::PowerManager::setBrightness(brightness);
+    if (!m_ignoreBrightnessChange) {
+        Solid::Control::PowerManager::setBrightness(brightness);
+    }
 }
 
-void Battery::updateSlider(const float brightness)
+void Battery::updateSlider(int brightness)
 {
-    if (m_brightnessSlider->value() != (int)brightness) {
-        m_brightnessSlider->setValue((int) brightness);
+    if (m_brightnessSlider->value() != brightness) {
+        m_ignoreBrightnessChange = true;
+        m_brightnessSlider->setValue(brightness);
+        m_ignoreBrightnessChange = false;
     }
 }
 
@@ -367,6 +377,7 @@ void Battery::initExtenderItem(Plasma::E
     // as the battery applet is also embedded into the battery's extender.
     if (!m_isEmbedded && item->name() == "powermanagement") {
         int row = 0;
+        m_ignoreBrightnessChange = false;
 
         QGraphicsWidget *controls = new QGraphicsWidget(item);
         controls->setMinimumWidth(360);
@@ -428,16 +439,12 @@ void Battery::initExtenderItem(Plasma::E
 
         m_brightnessSlider = new Plasma::Slider(controls);
         m_brightnessSlider->setRange(0, 100);
-        m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
+        updateSlider(Solid::Control::PowerManager::brightness());
         m_brightnessSlider->nativeWidget()->setTickInterval(10);
         m_brightnessSlider->setOrientation(Qt::Horizontal);
         connect(m_brightnessSlider, SIGNAL(valueChanged(int)),
                 this, SLOT(brightnessChanged(int)));
 
-        Solid::Control::PowerManager::Notifier *notifier = Solid::Control::PowerManager::notifier();
-
-        connect(notifier, SIGNAL(brightnessChanged(float)),
-                this, SLOT(updateSlider(float)));
         m_controlsLayout->addItem(m_brightnessSlider, row, 1);
         row++;
 
@@ -526,6 +533,21 @@ void Battery::initExtenderItem(Plasma::E
         item->setWidget(controls);
         item->setTitle(i18n("Power Management"));
 
+        m_brightnessDisplay = new QProgressBar();
+        m_brightnessDisplay->setWindowFlags(Qt::X11BypassWindowManagerHint);
+        QDesktopWidget* desktop = KApplication::kApplication()->desktop();
+        //Getting QRect of the screen where cursor is positioned
+        QRect rect = desktop->screenGeometry(QCursor::pos());
+        int width = (rect.width()/2) - (m_brightnessDisplay->width()/2);
+        int height = (rect.height()/2) - (m_brightnessDisplay->height()/2);
+        width += rect.x();
+        height += rect.y();
+        m_brightnessDisplay->move(width, height);
+        m_brightnessDisplayTimer = new QTimer(this);
+        connect(m_brightnessDisplayTimer, SIGNAL(timeout()), this, SLOT(hideOSD()));
+        QDBusConnection::sessionBus().connect("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil",
+                                              "brightnessChanged", this, SLOT(showBrightnessOSD(int,bool)));
+
         setupFonts();
     }
 }
@@ -652,7 +674,7 @@ void Battery::updateStatus()
     }
 
     if (m_brightnessSlider) {
-        m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
+        updateSlider(Solid::Control::PowerManager::brightness());
         //kDebug() << "Updating brightness:" << Solid::Control::PowerManager::brightness();
     }
     //kDebug() << "SIZE LABEL" << m_batteryLabel->size() << m_batteryLabel->preferredSize() << m_batteryLabel->preferredSize();
@@ -1002,4 +1024,34 @@ qreal Battery::acAlpha()
     return m_acAlpha;
 }
 
+void Battery::showBrightnessOSD(int brightness, bool byFnKey)
+{
+    if (byFnKey) {
+        m_brightnessDisplay->setValue(brightness);
+        m_brightnessDisplay->show();
+
+        //FIXME, how to get this to work before it is displayed for the first time?
+        QDesktopWidget* desktop = KApplication::kApplication()->desktop();
+        //Getting QRect of the screen where cursor is positioned
+        QRect rect = desktop->screenGeometry(QCursor::pos());
+        int width = (rect.width()/2) - (m_brightnessDisplay->width()/2);
+        int height = (rect.height()/2) - (m_brightnessDisplay->height()/2);
+        width += rect.x();
+        height += rect.y();
+        m_brightnessDisplay->move(width, height);
+
+        m_brightnessDisplayTimer->setInterval(2000);
+        m_brightnessDisplayTimer->start();
+
+        if (m_extenderVisible && m_brightnessSlider) {
+            updateSlider(brightness);
+        }
+    }
+}
+
+void Battery::hideOSD()
+{
+    m_brightnessDisplay->hide();
+}
+
 #include "battery.moc"
diff -up kdebase-workspace-4.3.80/plasma/generic/applets/battery/battery.h.brightness_keys kdebase-workspace-4.3.80/plasma/generic/applets/battery/battery.h
--- kdebase-workspace-4.3.80/plasma/generic/applets/battery/battery.h.brightness_keys	2009-11-30 18:31:24.000000000 -0600
+++ kdebase-workspace-4.3.80/plasma/generic/applets/battery/battery.h	2009-12-02 08:55:24.402804503 -0600
@@ -39,6 +39,8 @@ namespace Plasma
     class Slider;
 }
 
+class QProgressBar;
+
 class Battery : public Plasma::PopupApplet
 {
     Q_OBJECT
@@ -83,7 +85,7 @@ class Battery : public Plasma::PopupAppl
         void sourceAdded(const QString &source);
         void sourceRemoved(const QString &source);
         void brightnessChanged(const int brightness);
-        void updateSlider(const float brightness);
+        void updateSlider(int brightness);
         void setFullBrightness();
         void openConfig();
         void setProfile(const QString &profile);
@@ -91,6 +93,8 @@ class Battery : public Plasma::PopupAppl
         void hibernate();
         void updateBattery();
         void setupFonts();
+        void showBrightnessOSD(int brightness, bool byFnKey);
+        void hideOSD();
 
     private:
         void connectSources();
@@ -171,6 +175,10 @@ class Battery : public Plasma::PopupAppl
         QPropertyAnimation *m_labelAnimation;
         qreal m_acAlpha;
         QPropertyAnimation *m_acAnimation;
+
+        bool m_ignoreBrightnessChange;
+        QProgressBar* m_brightnessDisplay;
+        QTimer* m_brightnessDisplayTimer;
 };
 
 K_EXPORT_PLASMA_APPLET(battery, Battery)
diff -up kdebase-workspace-4.3.80/powerdevil/daemon/org.kde.PowerDevil.xml.brightness_keys kdebase-workspace-4.3.80/powerdevil/daemon/org.kde.PowerDevil.xml
--- kdebase-workspace-4.3.80/powerdevil/daemon/org.kde.PowerDevil.xml.brightness_keys	2009-09-04 06:30:55.000000000 -0500
+++ kdebase-workspace-4.3.80/powerdevil/daemon/org.kde.PowerDevil.xml	2009-12-02 08:55:24.402804503 -0600
@@ -42,6 +42,10 @@
       <arg type="as" direction="out" />
     </method>
     
+    <method name="notifyOfBrightnessChange">
+      <arg type="i" direction="in" />
+    </method>
+    
     <signal name="lidClosed">
       <arg type="i" direction="out" />
       <arg type="s" direction="out" />
@@ -56,5 +60,9 @@
     </signal>
      <signal name="DPMSconfigUpdated">
     </signal>
+    <signal name="brightnessChanged">
+      <arg type="i" direction="out" />
+      <arg type="b" direction="out" />
+    </signal>
   </interface>
 </node>
diff -up kdebase-workspace-4.3.80/powerdevil/daemon/PowerDevilDaemon.cpp.brightness_keys kdebase-workspace-4.3.80/powerdevil/daemon/PowerDevilDaemon.cpp
--- kdebase-workspace-4.3.80/powerdevil/daemon/PowerDevilDaemon.cpp.brightness_keys	2009-11-30 18:30:27.000000000 -0600
+++ kdebase-workspace-4.3.80/powerdevil/daemon/PowerDevilDaemon.cpp	2009-12-02 08:55:24.403804769 -0600
@@ -26,6 +26,8 @@
 
 #include <kdemacros.h>
 #include <KAboutData>
+#include <KAction>
+#include <KActionCollection>
 #include <KPluginFactory>
 #include <KNotification>
 #include <KIcon>
@@ -93,6 +95,7 @@ public:
             : notifier(Solid::Control::PowerManager::notifier())
             , currentConfig(0)
             , status(PowerDevilDaemon::NoAction)
+            , brightnessInHardware(false)
             , ckSessionInterface(0) {}
 
     Solid::Control::PowerManager::Notifier *notifier;
@@ -119,7 +122,9 @@ public:
 
     int batteryPercent;
     int brightness;
+    int cachedBrightness;
     bool isPlugged;
+    bool brightnessInHardware;
 
     // ConsoleKit stuff
     QDBusInterface *ckSessionInterface;
@@ -174,6 +179,18 @@ PowerDevilDaemon::PowerDevilDaemon(QObje
     d->ksmServerIface = new OrgKdeKSMServerInterfaceInterface("org.kde.ksmserver", "/KSMServer",
                                                               QDBusConnection::sessionBus(), this);
 
+    QDBusInterface halManager("org.freedesktop.Hal",
+            "/org/freedesktop/Hal/Manager", "org.freedesktop.Hal.Manager",
+            QDBusConnection::systemBus());
+    QStringList panelDevices = halManager.call("FindDeviceByCapability",
+             "laptop_panel").arguments().at(0).toStringList();
+    if (!panelDevices.empty()) {
+        QDBusInterface deviceInterface("org.freedesktop.Hal", panelDevices.at(0), "org.freedesktop.Hal.Device",
+                QDBusConnection::systemBus());
+        d->brightnessInHardware = deviceInterface.call("GetPropertyBoolean",
+                "laptop_panel.brightness_in_hardware").arguments().at(0).toBool();
+    }
+
     /*  Not needed anymore; I am not sure if we will need that in a future, so I leave it here
      *  just in case.
      *
@@ -198,6 +215,17 @@ PowerDevilDaemon::PowerDevilDaemon(QObje
     QDBusConnection::sessionBus().registerService("org.kde.powerdevil");
     // All systems up Houston, let's go!
     refreshStatus();
+
+    d->cachedBrightness = (int) Solid::Control::PowerManager::brightness();
+    KActionCollection* actionCollection = new KActionCollection( this );
+
+    KAction* globalAction = static_cast< KAction* >( actionCollection->addAction( "Increase Screen Brightness" ));
+    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessUp));
+    connect(globalAction, SIGNAL(triggered(bool)), SLOT(increaseBrightness()));
+
+    globalAction = static_cast< KAction* >( actionCollection->addAction( "Decrease Screen Brightness" ));
+    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessDown));
+    connect(globalAction, SIGNAL(triggered(bool)), SLOT(decreaseBrightness()));
 }
 
 PowerDevilDaemon::~PowerDevilDaemon()
@@ -661,24 +689,40 @@ void PowerDevilDaemon::buttonPressed(int
     }
 }
 
-void PowerDevilDaemon::decreaseBrightness()
+void PowerDevilDaemon::incDecBrightness(bool increase)
 {
     if (!checkIfCurrentSessionActive()) {
         return;
     }
 
-    int currentBrightness = qMax(0, (int)(Solid::Control::PowerManager::brightness() - 10));
-    Solid::Control::PowerManager::setBrightness(currentBrightness);
+    int currentBrightness = (int) Solid::Control::PowerManager::brightness();
+    if ((currentBrightness == d->cachedBrightness) && !d->brightnessInHardware)
+    {
+        int newBrightness;
+        if (increase) {
+            newBrightness = qMin(100, currentBrightness + 10);
+        }
+        else {
+            newBrightness = qMax(0, currentBrightness - 10);
+        }
+
+        Solid::Control::PowerManager::setBrightness(newBrightness);
+        currentBrightness = (int) Solid::Control::PowerManager::brightness();
+    }
+
+    if (!d->brightnessInHardware) {
+        emitBrightnessChanged(currentBrightness, true);
+    }
 }
 
-void PowerDevilDaemon::increaseBrightness()
+void PowerDevilDaemon::decreaseBrightness()
 {
-    if (!checkIfCurrentSessionActive()) {
-        return;
-    }
+    incDecBrightness(false);
+}
 
-    int currentBrightness = qMin(100, (int)(Solid::Control::PowerManager::brightness() + 10));
-    Solid::Control::PowerManager::setBrightness(currentBrightness);
+void PowerDevilDaemon::increaseBrightness()
+{
+    incDecBrightness(true);
 }
 
 void PowerDevilDaemon::shutdownNotification(bool automated)
@@ -1461,4 +1505,17 @@ void PowerDevilDaemon::setUpConsoleKit()
                                          SLOT(refreshStatus()));
 }
 
+void PowerDevilDaemon::notifyOfBrightnessChange(int brightness)
+{
+    emitBrightnessChanged(brightness, false);
+}
+
+void PowerDevilDaemon::emitBrightnessChanged(int brightness, bool byFnKey)
+{
+    if ((d->cachedBrightness != brightness) || byFnKey) {
+        d->cachedBrightness = brightness;
+        emit brightnessChanged(brightness, byFnKey);
+    }
+}
+
 #include "PowerDevilDaemon.moc"
diff -up kdebase-workspace-4.3.80/powerdevil/daemon/PowerDevilDaemon.h.brightness_keys kdebase-workspace-4.3.80/powerdevil/daemon/PowerDevilDaemon.h
--- kdebase-workspace-4.3.80/powerdevil/daemon/PowerDevilDaemon.h.brightness_keys	2009-11-30 18:30:27.000000000 -0600
+++ kdebase-workspace-4.3.80/powerdevil/daemon/PowerDevilDaemon.h	2009-12-02 08:55:24.403804769 -0600
@@ -61,10 +61,13 @@ public Q_SLOTS:
 
     SuspensionLockHandler *lockHandler();
 
+    void notifyOfBrightnessChange(int brightness);
+
 private Q_SLOTS:
     void acAdapterStateChanged(int state, bool forced = false);
     void batteryChargePercentChanged(int percent, const QString &udi);
 
+    void incDecBrightness(bool increase);
     void decreaseBrightness();
     void increaseBrightness();
 
@@ -106,6 +109,7 @@ Q_SIGNALS:
     void stateChanged(int, bool);
     void profileChanged(const QString &, const QStringList &);
     void DPMSconfigUpdated();
+    void brightnessChanged(int brightness, bool byFnKey);
 
 private:
     void lockScreen();
@@ -127,6 +131,8 @@ private:
 
     bool checkIfCurrentSessionActive();
 
+    void emitBrightnessChanged(int brightness, bool byFnKey);
+
 public:
     enum IdleAction {
         None = 0,


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- kdebase-workspace.spec	1 Dec 2009 15:23:46 -0000	1.319
+++ kdebase-workspace.spec	2 Dec 2009 14:57:14 -0000	1.320
@@ -37,18 +37,18 @@ Patch16: kdebase-workspace-4.3.75-batter
 Patch17: kdebase-workspace-4.3.75-classicmenu-logout.patch
 # Fix the version
 Patch18: kdebase-workspace-4.3.75-cmake-targets.patch
+Patch19: kdebase-workspace-4.3.3-kdm_plymouth.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kdebase-workspace-4.3.3-kde#171685.patch
 # kubuntu working to upstream this
-# FIXME: Not upstreamed yet --Ben (4.3.75)
+# FIXME: Not upstreamed yet --Ben (4.3.80)
 #Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/annotate/head%3A/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff
-Patch51: kdebase-workspace-4.3.75-brightness-keys.patch
+Patch51: kdebase-workspace-4.3.80-brightness-keys.patch
 
 # 4.4 trunk
 # backport battery plasmoid from current pre-4.3.80 trunk
-Patch100: kdebase-workspace-4.3.75-battery-plasmoid-trunk.patch
 
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
@@ -277,11 +277,10 @@ Requires: akonadi
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
-# apply the backport first so the patch applies
-%patch100 -p0 -b .battery-trunk
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
 %patch18 -p1 -b .cmake-targets
+%patch19 -p1 -b .kdm_plymouth
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -622,6 +621,7 @@ fi
 %changelog
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
+- kdm_plymouth patch (#475890)
 
 * Sat Nov 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.4.svn1048496
 - backport battery plasmoid from current pre-4.3.80 trunk for showremainingtime


--- kdebase-workspace-4.3.75-battery-plasmoid-trunk.patch DELETED ---


--- kdebase-workspace-4.3.75-brightness-keys.patch DELETED ---



From jakub at fedoraproject.org  Wed Dec  2 14:58:27 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  2 Dec 2009 14:58:27 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc.spec,1.93,1.94 sources,1.318,1.319
Message-ID: <20091202145827.CC2F411C0095@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26464

Modified Files:
	gcc.spec sources 
Log Message:
4.4.2-12


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- gcc.spec	2 Dec 2009 10:21:45 -0000	1.93
+++ gcc.spec	2 Dec 2009 14:58:27 -0000	1.94
@@ -1,5 +1,5 @@
 %global DATE 20091202
-%global SVNREV 154902
+%global SVNREV 154912
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- sources	2 Dec 2009 10:21:45 -0000	1.318
+++ sources	2 Dec 2009 14:58:27 -0000	1.319
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-7c35148197c827e34d44a61d22ed918d  gcc-4.4.2-20091202.tar.bz2
+74a02ed7bf5efa323ab4113d7e5331b5  gcc-4.4.2-20091202.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 15:09:40 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 15:09:40 +0000 (UTC)
Subject: File oxygen-icons-4.3.80.tar.bz2 uploaded to lookaside cache by
	ltinkl
Message-ID: <20091202150940.E240910F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for oxygen-icon-theme:

97a391478720b670a97ad7d18054f1b6  oxygen-icons-4.3.80.tar.bz2



From ltinkl at fedoraproject.org  Wed Dec  2 15:10:47 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  2 Dec 2009 15:10:47 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/devel .cvsignore, 1.14,
	1.15 oxygen-icon-theme.spec, 1.12, 1.13 sources, 1.12, 1.13
Message-ID: <20091202151047.41F7811C03FC@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/oxygen-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29792

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
KDE 4.4b1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 Nov 2009 18:15:37 -0000	1.14
+++ .cvsignore	2 Dec 2009 15:10:46 -0000	1.15
@@ -1 +1 @@
-oxygen-icons-4.3.75svn1048496.tar.bz2
+oxygen-icons-4.3.80.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/oxygen-icon-theme.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- oxygen-icon-theme.spec	24 Nov 2009 18:15:37 -0000	1.12
+++ oxygen-icon-theme.spec	2 Dec 2009 15:10:47 -0000	1.13
@@ -1,14 +1,12 @@
-%define alphatag svn1048496
-
-Name:          oxygen-icon-theme 
-Summary:       Oxygen icon theme 
-Version:       4.3.75
-Release:       0.1.%{alphatag}%{?dist}
+Name:          oxygen-icon-theme
+Summary:       Oxygen icon theme
+Version:       4.3.80
+Release:       1%{?dist}
 
 License:       LGPLv3+ 
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
-Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/oxygen-icons-%{version}%{?alphatag}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/oxygen-icons-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 
@@ -68,6 +66,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
 * Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	24 Nov 2009 18:15:37 -0000	1.12
+++ sources	2 Dec 2009 15:10:47 -0000	1.13
@@ -1 +1 @@
-93b547ede5da733d4b2b5a95fe82b864  oxygen-icons-4.3.75svn1048496.tar.bz2
+97a391478720b670a97ad7d18054f1b6  oxygen-icons-4.3.80.tar.bz2



From jakub at fedoraproject.org  Wed Dec  2 15:15:14 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  2 Dec 2009 15:15:14 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-dynbss.patch, NONE,
	1.1 valgrind-3.5.0-syscalls2.patch, NONE, 1.1 valgrind.spec,
	1.75, 1.76
Message-ID: <20091202151514.4A3D011C0095@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31045

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.5.0-dynbss.patch valgrind-3.5.0-syscalls2.patch 
Log Message:
3.5.0-10

valgrind-3.5.0-dynbss.patch:
 readelf.c |   66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

--- NEW FILE valgrind-3.5.0-dynbss.patch ---
--- valgrind-3.5.0/coregrind/m_debuginfo/readelf.c.jj	2009-12-02 05:38:20.000000000 -0500
+++ valgrind-3.5.0/coregrind/m_debuginfo/readelf.c	2009-12-02 06:50:44.061404000 -0500
@@ -1062,6 +1062,8 @@ Bool ML_(read_elf_debug_info) ( struct _
    Bool          res, ok;
    SysRes        fd, sres;
    Word          i;
+   Bool          dynbss_present = False;
+   Bool          sdynbss_present = False;
 
    /* Image addresses for the ELF file we're working with. */
    Addr          oimage   = 0;
@@ -1476,8 +1478,40 @@ Bool ML_(read_elf_debug_info) ( struct _
          }
       }
 
+      if (0 == VG_(strcmp)(name, ".dynbss")) {
+         if (inrw && size > 0 && !di->bss_present) {
+            dynbss_present = True;
+            di->bss_present = True;
+            di->bss_svma = svma;
+            di->bss_avma = svma + rw_bias;
+            di->bss_size = size;
+            di->bss_bias = rw_bias;
+            di->bss_debug_svma = svma;
+            di->bss_debug_bias = rw_bias;
+            TRACE_SYMTAB("acquiring .dynbss svma = %#lx .. %#lx\n",
+                         di->bss_svma,
+                         di->bss_svma + di->bss_size - 1);
+            TRACE_SYMTAB("acquiring .dynbss avma = %#lx .. %#lx\n",
+                         di->bss_avma,
+                         di->bss_avma + di->bss_size - 1);
+            TRACE_SYMTAB("acquiring .dynbss bias = %#lx\n", di->bss_bias);
+         }
+      }
+
       /* Accept .bss where mapped as rw (data), even if zero-sized */
       if (0 == VG_(strcmp)(name, ".bss")) {
+         if (inrw && size > 0 && dynbss_present) {
+            vg_assert(di->bss_present);
+            dynbss_present = False;
+            vg_assert(di->bss_svma + di->bss_size == svma);
+            di->bss_size += size;
+            TRACE_SYMTAB("acquiring .bss svma = %#lx .. %#lx\n",
+                         svma, svma + size - 1);
+            TRACE_SYMTAB("acquiring .bss avma = %#lx .. %#lx\n",
+                         svma + rw_bias, svma + rw_bias + size - 1);
+            TRACE_SYMTAB("acquiring .bss bias = %#lx\n", di->bss_bias);
+         } else
+
          if (inrw && size >= 0 && !di->bss_present) {
             di->bss_present = True;
             di->bss_svma = svma;
@@ -1529,8 +1563,40 @@ Bool ML_(read_elf_debug_info) ( struct _
          }
       }
 
+      if (0 == VG_(strcmp)(name, ".sdynbss")) {
+         if (inrw && size >= 0 && !di->sbss_present) {
+            sdynbss_present = True;
+            di->sbss_present = True;
+            di->sbss_svma = svma;
+            di->sbss_avma = svma + rw_bias;
+            di->sbss_size = size;
+            di->sbss_bias = rw_bias;
+            di->sbss_debug_svma = svma;
+            di->sbss_debug_bias = rw_bias;
+            TRACE_SYMTAB("acquiring .sdynbss svma = %#lx .. %#lx\n",
+                         di->sbss_svma,
+                         di->sbss_svma + di->sbss_size - 1);
+            TRACE_SYMTAB("acquiring .sdynbss avma = %#lx .. %#lx\n",
+                         di->sbss_avma,
+                         di->sbss_avma + di->sbss_size - 1);
+            TRACE_SYMTAB("acquiring .sdynbss bias = %#lx\n", di->sbss_bias);
+         }
+      }
+
       /* Accept .sbss where mapped as rw (data) */
       if (0 == VG_(strcmp)(name, ".sbss")) {
+         if (inrw && size > 0 && sdynbss_present) {
+            vg_assert(di->sbss_present);
+            sdynbss_present = False;
+            vg_assert(di->sbss_svma + di->sbss_size == svma);
+            di->sbss_size += size;
+            TRACE_SYMTAB("acquiring .sbss svma = %#lx .. %#lx\n",
+                         svma, svma + size - 1);
+            TRACE_SYMTAB("acquiring .sbss avma = %#lx .. %#lx\n",
+                         svma + rw_bias, svma + rw_bias + size - 1);
+            TRACE_SYMTAB("acquiring .sbss bias = %#lx\n", di->sbss_bias);
+         } else
+
          if (inrw && size > 0 && !di->sbss_present) {
             di->sbss_present = True;
             di->sbss_svma = svma;

valgrind-3.5.0-syscalls2.patch:
 coregrind/m_syswrap/priv_syswrap-linux.h  |    5 
 coregrind/m_syswrap/syswrap-amd64-linux.c |   30 ++++-
 coregrind/m_syswrap/syswrap-generic.c     |   32 +++--
 coregrind/m_syswrap/syswrap-linux.c       |  180 +++++++++++++++++++++++-------
 coregrind/m_syswrap/syswrap-ppc32-linux.c |   26 ++--
 coregrind/m_syswrap/syswrap-ppc64-linux.c |   23 ++-
 coregrind/m_syswrap/syswrap-x86-linux.c   |   21 ++-
 exp-ptrcheck/h_main.c                     |    3 
 include/vki/vki-linux.h                   |   17 +-
 include/vki/vki-scnums-amd64-linux.h      |    2 
 10 files changed, 248 insertions(+), 91 deletions(-)

--- NEW FILE valgrind-3.5.0-syscalls2.patch ---
--- valgrind-3.5.0/exp-ptrcheck/h_main.c.jj	2009-08-19 09:36:41.000000000 -0400
+++ valgrind-3.5.0/exp-ptrcheck/h_main.c	2009-12-02 05:39:08.460491000 -0500
@@ -2312,6 +2312,9 @@ static void setup_post_syscall_table ( v
       ADD(0, __NR_open);
       ADD(0, __NR_personality);
       ADD(0, __NR_pipe);
+#     if defined(__NR_pipe2)
+      ADD(0, __NR_pipe2);
+#     endif
       ADD(0, __NR_poll);
       ADD(0, __NR_prctl);
       ADD(0, __NR_pread64);
--- valgrind-3.5.0/include/vki/vki-scnums-amd64-linux.h.jj	2009-12-02 05:38:21.260705000 -0500
+++ valgrind-3.5.0/include/vki/vki-scnums-amd64-linux.h	2009-12-02 05:39:08.468495000 -0500
@@ -369,7 +369,7 @@
 #define __NR_fallocate		285
 #define __NR_timerfd_settime	286
 #define __NR_timerfd_gettime	287
-#define __NR_paccept            288
+#define __NR_accept4            288
 #define __NR_signalfd4          289
 #define __NR_eventfd2           290
 #define __NR_epoll_create1      291
--- valgrind-3.5.0/include/vki/vki-linux.h.jj	2009-12-02 05:38:21.255714000 -0500
+++ valgrind-3.5.0/include/vki/vki-linux.h	2009-12-02 05:39:08.489513000 -0500
@@ -277,14 +277,14 @@ struct vki_timex {
 	int  :32; int  :32; int  :32; int  :32;
 };
 
-//#define ADJ_OFFSET		0x0001	/* time offset */
-#define ADJ_FREQUENCY		0x0002	/* frequency offset */
-#define ADJ_MAXERROR		0x0004	/* maximum time error */
-#define ADJ_ESTERROR		0x0008	/* estimated time error */
-#define ADJ_STATUS		0x0010	/* clock status */
-#define ADJ_TIMECONST		0x0020	/* pll time constant */
-#define ADJ_TICK		0x4000	/* tick value */
-//#define ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
+#define VKI_ADJ_OFFSET			0x0001	/* time offset */
+#define VKI_ADJ_FREQUENCY		0x0002	/* frequency offset */
+#define VKI_ADJ_MAXERROR		0x0004	/* maximum time error */
+#define VKI_ADJ_ESTERROR		0x0008	/* estimated time error */
+#define VKI_ADJ_STATUS			0x0010	/* clock status */
+#define VKI_ADJ_TIMECONST		0x0020	/* pll time constant */
+#define VKI_ADJ_TICK			0x4000	/* tick value */
+//#define VKI_ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
 
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/linux/times.h
@@ -525,6 +525,7 @@ typedef struct vki_sigevent {
 #define VKI_SYS_GETSOCKOPT	15	/* sys_getsockopt(2)		*/
 #define VKI_SYS_SENDMSG		16	/* sys_sendmsg(2)		*/
 #define VKI_SYS_RECVMSG		17	/* sys_recvmsg(2)		*/
+#define VKI_SYS_ACCEPT4		18	/* sys_accept4(2)		*/
 
 enum vki_sock_type {
 	VKI_SOCK_STREAM	= 1,
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc64-linux.c.jj	2009-12-02 05:38:21.300710000 -0500
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc64-linux.c	2009-12-02 05:41:28.121027000 -0500
@@ -484,6 +484,13 @@ PRE(sys_socketcall)
       break;
    }
 
+   case VKI_SYS_ACCEPT4: {
+     /* int accept4(int s, struct sockaddr *addr, int *addrlen, int flags); */
+      PRE_MEM_READ( "socketcall.accept4(args)", ARG2, 4*sizeof(Addr) );
+      ML_(generic_PRE_sys_accept)( tid, ARG2_0, ARG2_1, ARG2_2 );
+      break;
+   }
+
    case VKI_SYS_SENDTO:
      /* int sendto(int s, const void *msg, int len,
                     unsigned int flags,
@@ -629,7 +636,9 @@ POST(sys_socketcall)
     break;
 
   case VKI_SYS_ACCEPT:
+  case VKI_SYS_ACCEPT4:
     /* int accept(int s, struct sockaddr *addr, int *addrlen); */
+    /* int accept4(int s, struct sockaddr *addr, int *addrlen, int flags); */
     r = ML_(generic_POST_sys_accept)( tid, VG_(mk_SysRes_Success)(RES),
 				      ARG2_0, ARG2_1, ARG2_2 );
     SET_STATUS_from_SysRes(r);
@@ -1276,7 +1285,7 @@ const SyscallTableEntry ML_(syscall_tabl
 // _____(__NR_olduname,          sys_olduname),           // 109
 
 // _____(__NR_iopl,              sys_iopl),               // 110
-// _____(__NR_vhangup,           sys_vhangup),            // 111
+   LINX_(__NR_vhangup,           sys_vhangup),            // 111
 // _____(__NR_idle,              sys_idle),               // 112
 // _____(__NR_vm86,              sys_vm86),               // 113
    GENXY(__NR_wait4,             sys_wait4),              // 114
@@ -1291,7 +1300,7 @@ const SyscallTableEntry ML_(syscall_tabl
 // _____(__NR_setdomainname,     sys_setdomainname),      // 121
    GENXY(__NR_uname,             sys_newuname),           // 122
 // _____(__NR_modify_ldt,        sys_modify_ldt),         // 123
-// _____(__NR_adjtimex,          sys_adjtimex),           // 124
+   LINXY(__NR_adjtimex,          sys_adjtimex),           // 124
 
    GENXY(__NR_mprotect,          sys_mprotect),           // 125
 // _____(__NR_sigprocmask,       sys_sigprocmask),        // 126
@@ -1336,7 +1345,7 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_sched_get_priority_max, sys_sched_get_priority_max),// 159
 
    LINX_(__NR_sched_get_priority_min, sys_sched_get_priority_min),// 160
-// _____(__NR_sched_rr_get_interval,   sys_sched_rr_get_interval),  // 161
+   LINXY(__NR_sched_rr_get_interval,  sys_sched_rr_get_interval), // 161
    GENXY(__NR_nanosleep,         sys_nanosleep),          // 162
    GENX_(__NR_mremap,            sys_mremap),             // 163
 // _____(__NR_setresuid,         sys_setresuid),          // 164
@@ -1497,7 +1506,7 @@ const SyscallTableEntry ML_(syscall_tabl
    LINXY(__NR_signalfd,          sys_signalfd),          // 305
    LINXY(__NR_timerfd_create,    sys_timerfd_create),    // 306
    LINX_(__NR_eventfd,           sys_eventfd),           // 307
-//   LINX_(__NR_sync_file_range2,   sys_ni_syscall),       // 308
+   LINX_(__NR_sync_file_range2,  sys_sync_file_range2),  // 308
    LINX_(__NR_fallocate,         sys_fallocate),         // 309
 //   LINXY(__NR_subpage_prot,       sys_ni_syscall),       // 310
    LINXY(__NR_timerfd_settime,   sys_timerfd_settime),  // 311
@@ -1505,13 +1514,13 @@ const SyscallTableEntry ML_(syscall_tabl
    LINXY(__NR_signalfd4,         sys_signalfd4),        // 313
    LINX_(__NR_eventfd2,          sys_eventfd2),         // 314
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 315
-   //   (__NR_dup3,              sys_ni_syscall)        // 316
+   LINXY(__NR_dup3,              sys_dup3),             // 316
    LINXY(__NR_pipe2,             sys_pipe2),            // 317
    LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 318
    LINXY(__NR_perf_counter_open, sys_perf_counter_open),// 319
    LINXY(__NR_preadv,            sys_preadv),           // 320
-   LINX_(__NR_pwritev,           sys_pwritev)           // 321
-   //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 322
+   LINX_(__NR_pwritev,           sys_pwritev),          // 321
+   LINXY(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo) // 322
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c.jj	2009-12-02 05:38:21.316709000 -0500
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-02 05:55:43.388291000 -0500
@@ -378,8 +378,18 @@ SysRes ML_(do_fork_clone) ( ThreadId tid
 #define PRE(name)       DEFN_PRE_TEMPLATE(linux, name)
 #define POST(name)      DEFN_POST_TEMPLATE(linux, name)
 
-// Combine two 32-bit values into a 64-bit value
-#define LOHI64(lo,hi)   ( ((ULong)(lo)) | (((ULong)(hi)) << 32) )
+// Macros to support 64-bit syscall args split into two 32 bit values
+#if defined(VG_LITTLEENDIAN)
+#define MERGE64(lo,hi)   ( ((ULong)(lo)) | (((ULong)(hi)) << 32) )
+#define MERGE64_FIRST(name) name##_low
+#define MERGE64_SECOND(name) name##_high
+#elif defined(VG_BIGENDIAN)
+#define MERGE64(hi,lo)   ( ((ULong)(lo)) | (((ULong)(hi)) << 32) )
+#define MERGE64_FIRST(name) name##_high
+#define MERGE64_SECOND(name) name##_low
+#else
+#error Unknown endianness
+#endif
 
 /* ---------------------------------------------------------------------
    *mount wrappers
@@ -605,34 +615,34 @@ POST(sys_llseek)
       POST_MEM_WRITE( ARG4, sizeof(vki_loff_t) );
 }
 
-//zz PRE(sys_adjtimex, 0)
-//zz {
-//zz    struct vki_timex *tx = (struct vki_timex *)ARG1;
-//zz    PRINT("sys_adjtimex ( %p )", ARG1);
-//zz    PRE_REG_READ1(long, "adjtimex", struct timex *, buf);
-//zz    PRE_MEM_READ( "adjtimex(timex->modes)", ARG1, sizeof(tx->modes));
-//zz 
-#if 0 //zz  (avoiding warnings about multi-line comments)
-zz #define ADJX(bit,field) 				\
-zz    if (tx->modes & bit)					\
-zz       PRE_MEM_READ( "adjtimex(timex->"#field")",	\
-zz 		    (Addr)&tx->field, sizeof(tx->field))
-#endif
-//zz    ADJX(ADJ_FREQUENCY, freq);
-//zz    ADJX(ADJ_MAXERROR, maxerror);
-//zz    ADJX(ADJ_ESTERROR, esterror);
-//zz    ADJX(ADJ_STATUS, status);
-//zz    ADJX(ADJ_TIMECONST, constant);
-//zz    ADJX(ADJ_TICK, tick);
-//zz #undef ADJX
-//zz    
-//zz    PRE_MEM_WRITE( "adjtimex(timex)", ARG1, sizeof(struct vki_timex));
-//zz }
-//zz 
-//zz POST(sys_adjtimex)
-//zz {
-//zz    POST_MEM_WRITE( ARG1, sizeof(struct vki_timex) );
-//zz }
+PRE(sys_adjtimex)
+{
+   struct vki_timex *tx = (struct vki_timex *)ARG1;
+   PRINT("sys_adjtimex ( %#lx )", ARG1);
+   PRE_REG_READ1(long, "adjtimex", struct timex *, buf);
+   PRE_MEM_READ( "adjtimex(timex->modes)", ARG1, sizeof(tx->modes));
+
+#define ADJX(bit,field) 				\
+   if (tx->modes & bit)					\
+      PRE_MEM_READ( "adjtimex(timex->"#field")",	\
+		    (Addr)&tx->field, sizeof(tx->field))
+
+   ADJX(VKI_ADJ_OFFSET, offset);
+   ADJX(VKI_ADJ_FREQUENCY, freq);
+   ADJX(VKI_ADJ_MAXERROR, maxerror);
+   ADJX(VKI_ADJ_ESTERROR, esterror);
+   ADJX(VKI_ADJ_STATUS, status);
+   ADJX(VKI_ADJ_TIMECONST, constant);
+   ADJX(VKI_ADJ_TICK, tick);
+#undef ADJX
+
+   PRE_MEM_WRITE( "adjtimex(timex)", ARG1, sizeof(struct vki_timex));
+}
+
+POST(sys_adjtimex)
+{
+   POST_MEM_WRITE( ARG1, sizeof(struct vki_timex) );
+}
 
 PRE(sys_ioperm)
 {
@@ -1167,14 +1177,24 @@ POST(sys_eventfd2)
    }
 }
 
-// 64-bit version.
 PRE(sys_fallocate)
 {
    *flags |= SfMayBlock;
+#if VG_WORDSIZE == 4
+   PRINT("sys_fallocate ( %ld, %ld, %lld, %lld )",
+         ARG1, ARG2, MERGE64(ARG3,ARG4), MERGE64(ARG5,ARG6));
+   PRE_REG_READ6(long, "fallocate",
+                 int, fd, int, mode,
+                 unsigned, MERGE64_FIRST(offset), unsigned, MERGE64_SECOND(offset),
+                 unsigned, MERGE64_FIRST(len), unsigned, MERGE64_SECOND(len));
+#elif VG_WORDSIZE == 8
    PRINT("sys_fallocate ( %ld, %ld, %lld, %lld )",
          ARG1, ARG2, (Long)ARG3, (Long)ARG4);
    PRE_REG_READ4(long, "fallocate",
                  int, fd, int, mode, vki_loff_t, offset, vki_loff_t, len);
+#else
+#  error Unexpected word size
+#endif
    if (!ML_(fd_allowed)(ARG1, "fallocate", tid, False))
       SET_STATUS_Failure( VKI_EBADF );
 }
@@ -1286,19 +1306,19 @@ POST(sys_tgkill)
 PRE(sys_fadvise64)
 {
    PRINT("sys_fadvise64 ( %ld, %lld, %lu, %ld )",
-         ARG1, LOHI64(ARG2,ARG3), ARG4, ARG5);
+         ARG1, MERGE64(ARG2,ARG3), ARG4, ARG5);
    PRE_REG_READ5(long, "fadvise64",
-                 int, fd, vki_u32, offset_low, vki_u32, offset_high,
+                 int, fd, vki_u32, MERGE64_FIRST(offset), vki_u32, MERGE64_SECOND(offset),
                  vki_size_t, len, int, advice);
 }
 
 PRE(sys_fadvise64_64)
 {
    PRINT("sys_fadvise64_64 ( %ld, %lld, %lld, %ld )",
-         ARG1, LOHI64(ARG2,ARG3), LOHI64(ARG4,ARG5), ARG6);
+         ARG1, MERGE64(ARG2,ARG3), MERGE64(ARG4,ARG5), ARG6);
    PRE_REG_READ6(long, "fadvise64_64",
-                 int, fd, vki_u32, offset_low, vki_u32, offset_high,
-                 vki_u32, len_low, vki_u32, len_high, int, advice);
+                 int, fd, vki_u32, MERGE64_FIRST(offset), vki_u32, MERGE64_SECOND(offset),
+                 vki_u32, MERGE64_FIRST(len), vki_u32, MERGE64_SECOND(len), int, advice);
 }
 
 /* ---------------------------------------------------------------------
@@ -2271,6 +2291,21 @@ PRE(sys_sched_get_priority_min)
    PRE_REG_READ1(long, "sched_get_priority_min", int, policy);
 }
 
+PRE(sys_sched_rr_get_interval)
+{
+   PRINT("sys_sched_rr_get_interval ( %ld, %#lx )", ARG1, ARG2);
+   PRE_REG_READ2(int, "sched_rr_get_interval",
+                 vki_pid_t, pid,
+                 struct vki_timespec *, tp);
+   PRE_MEM_WRITE("sched_rr_get_interval(timespec)",
+                 ARG2, sizeof(struct vki_timespec));
+}
+
+POST(sys_sched_rr_get_interval)
+{
+   POST_MEM_WRITE(ARG2, sizeof(struct vki_timespec));
+}
+
 PRE(sys_sched_setaffinity)
 {
    PRINT("sched_setaffinity ( %ld, %ld, %#lx )", ARG1, ARG2, ARG3);
@@ -2364,6 +2399,21 @@ POST(sys_pipe2)
    }
 }
 
+PRE(sys_dup3)
+{
+   PRINT("sys_dup3 ( %ld, %ld, %ld )", ARG1,ARG2,ARG3);
+   PRE_REG_READ3(long, "dup3", unsigned int, oldfd, unsigned int, newfd, int, flags);
+   if (!ML_(fd_allowed)(ARG2, "dup3", tid, True))
+      SET_STATUS_Failure( VKI_EBADF );
+}
+
+POST(sys_dup3)
+{
+   vg_assert(SUCCESS);
+   if (VG_(clo_track_fds))
+      ML_(record_fd_open_named)(tid, RES);
+}
+
 PRE(sys_quotactl)
 {
    PRINT("sys_quotactl (0x%lx, %#lx, 0x%lx, 0x%lx )", ARG1,ARG2,ARG3, ARG4);
@@ -2394,15 +2444,50 @@ POST(sys_waitid)
 PRE(sys_sync_file_range)
 {
    *flags |= SfMayBlock;
-   PRINT("sys_sync_file_range ( %ld, %ld, %ld, %ld )",
-         ARG1,ARG2,ARG3,ARG4);
+#if VG_WORDSIZE == 4
+   PRINT("sys_sync_file_range ( %ld, %lld, %lld, %ld )",
+         ARG1,MERGE64(ARG2,ARG3),MERGE64(ARG4,ARG5),ARG6);
+   PRE_REG_READ6(long, "sync_file_range",
+                 int, fd,
+                 unsigned, MERGE64_FIRST(offset), unsigned, MERGE64_SECOND(offset),
+                 unsigned, MERGE64_FIRST(nbytes), unsigned, MERGE64_SECOND(nbytes),
+                 unsigned int, flags);
+#elif VG_WORDSIZE == 8
+   PRINT("sys_sync_file_range ( %ld, %lld, %lld, %ld )",
+         ARG1,(Long)ARG2,(Long)ARG3,ARG4);
    PRE_REG_READ4(long, "sync_file_range",
                  int, fd, vki_loff_t, offset, vki_loff_t, nbytes,
                  unsigned int, flags);
+#else
+#  error Unexpected word size
+#endif
    if (!ML_(fd_allowed)(ARG1, "sync_file_range", tid, False))
       SET_STATUS_Failure( VKI_EBADF );
 }
 
+PRE(sys_sync_file_range2)
+{
+   *flags |= SfMayBlock;
+#if VG_WORDSIZE == 4
+   PRINT("sys_sync_file_range2 ( %ld, %ld, %lld, %lld )",
+         ARG1,ARG2,MERGE64(ARG3,ARG4),MERGE64(ARG5,ARG6));
+   PRE_REG_READ6(long, "sync_file_range2",
+                 int, fd, unsigned int, flags,
+                 unsigned, MERGE64_FIRST(offset), unsigned, MERGE64_SECOND(offset),
+                 unsigned, MERGE64_FIRST(nbytes), unsigned, MERGE64_SECOND(nbytes));
+#elif VG_WORDSIZE == 8
+   PRINT("sys_sync_file_range2 ( %ld, %ld, %lld, %lld )",
+         ARG1,ARG2,(Long)ARG3,(Long)ARG4);
+   PRE_REG_READ4(long, "sync_file_range2",
+                 int, fd, unsigned int, flags,
+                 vki_loff_t, offset, vki_loff_t, nbytes);
+#else
+#  error Unexpected word size
+#endif
+   if (!ML_(fd_allowed)(ARG1, "sync_file_range2", tid, False))
+      SET_STATUS_Failure( VKI_EBADF );
+}
+
 PRE(sys_stime)
 {
    PRINT("sys_stime ( %#lx )", ARG1);
@@ -2684,6 +2769,21 @@ POST(sys_rt_sigqueueinfo)
       SET_STATUS_Failure( VKI_EINVAL );
 }
 
+PRE(sys_rt_tgsigqueueinfo)
+{
+   PRINT("sys_rt_tgsigqueueinfo(%ld, %ld, %ld, %#lx)", ARG1, ARG2, ARG3, ARG4);
+   PRE_REG_READ4(long, "rt_tgsigqueueinfo",
+                 int, tgid, int, pid, int, sig, vki_siginfo_t *, uinfo);
+   if (ARG3 != 0)
+      PRE_MEM_READ( "rt_tgsigqueueinfo(uinfo)", ARG4, VKI_SI_MAX_SIZE );
+}
+
+POST(sys_rt_tgsigqueueinfo)
+{
+   if (!ML_(client_signal_OK)(ARG3))
+      SET_STATUS_Failure( VKI_EINVAL );
+}
+
 // XXX: x86-specific?  The kernel prototypes for the different archs are
 //      hard to decipher.
 PRE(sys_rt_sigsuspend)
@@ -3299,9 +3399,9 @@ PRE(sys_delete_module)
 PRE(sys_lookup_dcookie)
 {
    PRINT("sys_lookup_dcookie (0x%llx, %#lx, %ld)",
-         LOHI64(ARG1,ARG2), ARG3, ARG4);
+         MERGE64(ARG1,ARG2), ARG3, ARG4);
    PRE_REG_READ4(long, "lookup_dcookie",
-                 vki_u32, cookie_low32, vki_u32, cookie_high32,
+                 vki_u32, MERGE64_FIRST(cookie), vki_u32, MERGE64_SECOND(cookie),
                  char *, buf, vki_size_t, len);
    PRE_MEM_WRITE( "lookup_dcookie(buf)", ARG3, ARG4);
 }
--- valgrind-3.5.0/coregrind/m_syswrap/priv_syswrap-linux.h.jj	2009-12-02 05:38:21.321704000 -0500
+++ valgrind-3.5.0/coregrind/m_syswrap/priv_syswrap-linux.h	2009-12-02 05:39:08.583466000 -0500
@@ -165,6 +165,7 @@ DECL_TEMPLATE(linux, sys_utimensat);
 
 DECL_TEMPLATE(linux, sys_preadv);
 DECL_TEMPLATE(linux, sys_pwritev);
+DECL_TEMPLATE(linux, sys_dup3);
 
 DECL_TEMPLATE(linux, sys_add_key);
 DECL_TEMPLATE(linux, sys_request_key);
@@ -214,7 +215,7 @@ DECL_TEMPLATE(linux, sys_sched_getschedu
 DECL_TEMPLATE(linux, sys_sched_yield);
 DECL_TEMPLATE(linux, sys_sched_get_priority_max);
 DECL_TEMPLATE(linux, sys_sched_get_priority_min);
-//DECL_TEMPLATE(linux, sys_sched_rr_get_interval);    // not yet encountered
+DECL_TEMPLATE(linux, sys_sched_rr_get_interval);
 DECL_TEMPLATE(linux, sys_sched_setaffinity);
 DECL_TEMPLATE(linux, sys_sched_getaffinity);
 
@@ -242,10 +243,12 @@ DECL_TEMPLATE(linux, sys_rt_sigprocmask)
 DECL_TEMPLATE(linux, sys_rt_sigpending);
 DECL_TEMPLATE(linux, sys_rt_sigtimedwait);
 DECL_TEMPLATE(linux, sys_rt_sigqueueinfo);
+DECL_TEMPLATE(linux, sys_rt_tgsigqueueinfo);
 DECL_TEMPLATE(linux, sys_rt_sigsuspend);
 
 // Linux-specific?
 DECL_TEMPLATE(linux, sys_sync_file_range);
+DECL_TEMPLATE(linux, sys_sync_file_range2);
 DECL_TEMPLATE(linux, sys_stime);  /* maybe generic?  I'm not sure */
 
 // Linux specific (kernel modules)
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-amd64-linux.c.jj	2009-12-02 05:38:21.283699000 -0500
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-amd64-linux.c	2009-12-02 05:39:08.602453000 -0500
@@ -349,6 +349,7 @@ DECL_TEMPLATE(amd64_linux, sys_setsockop
 DECL_TEMPLATE(amd64_linux, sys_getsockopt);
 DECL_TEMPLATE(amd64_linux, sys_connect);
 DECL_TEMPLATE(amd64_linux, sys_accept);
+DECL_TEMPLATE(amd64_linux, sys_accept4);
 DECL_TEMPLATE(amd64_linux, sys_sendto);
 DECL_TEMPLATE(amd64_linux, sys_recvfrom);
 DECL_TEMPLATE(amd64_linux, sys_sendmsg);
@@ -684,6 +685,23 @@ POST(sys_accept)
    SET_STATUS_from_SysRes(r);
 }
 
+PRE(sys_accept4)
+{
+   *flags |= SfMayBlock;
+   PRINT("sys_accept4 ( %ld, %#lx, %ld, %ld )",ARG1,ARG2,ARG3,ARG4);
+   PRE_REG_READ4(long, "accept4",
+                 int, s, struct sockaddr *, addr, int, *addrlen, int, flags);
+   ML_(generic_PRE_sys_accept)(tid, ARG1,ARG2,ARG3);
+}
+POST(sys_accept4)
+{
+   SysRes r;
+   vg_assert(SUCCESS);
+   r = ML_(generic_POST_sys_accept)(tid, VG_(mk_SysRes_Success)(RES),
+                                         ARG1,ARG2,ARG3);
+   SET_STATUS_from_SysRes(r);
+}
+
 PRE(sys_sendto)
 {
    *flags |= SfMayBlock;
@@ -1200,20 +1218,20 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_sched_getscheduler,      sys_sched_getscheduler),      // 145 
    LINX_(__NR_sched_get_priority_max,  sys_sched_get_priority_max),  // 146 
    LINX_(__NR_sched_get_priority_min,  sys_sched_get_priority_min),  // 147 
-   //LINX?(__NR_sched_rr_get_interval,   sys_sched_rr_get_interval),   // 148 
+   LINXY(__NR_sched_rr_get_interval,   sys_sched_rr_get_interval),   // 148 
    GENX_(__NR_mlock,                   sys_mlock),                   // 149 
 
    GENX_(__NR_munlock,           sys_munlock),        // 150 
    GENX_(__NR_mlockall,          sys_mlockall),       // 151 
    LINX_(__NR_munlockall,        sys_munlockall),     // 152 
-   //   (__NR_vhangup,           sys_vhangup),        // 153 
+   LINX_(__NR_vhangup,           sys_vhangup),        // 153 
    //   (__NR_modify_ldt,        sys_modify_ldt),     // 154 
 
    //   (__NR_pivot_root,        sys_pivot_root),     // 155 
    LINXY(__NR__sysctl,           sys_sysctl),         // 156 
    LINXY(__NR_prctl,             sys_prctl),          // 157 
    PLAX_(__NR_arch_prctl,	 sys_arch_prctl),     // 158 
-   //   (__NR_adjtimex,          sys_adjtimex),       // 159 
+   LINXY(__NR_adjtimex,          sys_adjtimex),       // 159 
 
    GENX_(__NR_setrlimit,         sys_setrlimit),      // 160 
    GENX_(__NR_chroot,            sys_chroot),         // 161 
@@ -1368,18 +1386,18 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_fallocate,         sys_fallocate),        // 285
    LINXY(__NR_timerfd_settime,   sys_timerfd_settime),  // 286
    LINXY(__NR_timerfd_gettime,   sys_timerfd_gettime),  // 287
-   //   (__NR_paccept,           sys_ni_syscall)        // 288
+   PLAXY(__NR_accept4,           sys_accept4),          // 288
    LINXY(__NR_signalfd4,         sys_signalfd4),        // 289
 
    LINX_(__NR_eventfd2,          sys_eventfd2),         // 290
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 291
-   //   (__NR_dup3,              sys_ni_syscall)        // 292
+   LINXY(__NR_dup3,              sys_dup3),             // 292
    LINXY(__NR_pipe2,             sys_pipe2),            // 293
    LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 294
 
    LINXY(__NR_preadv,            sys_preadv),           // 295
    LINX_(__NR_pwritev,           sys_pwritev),          // 296
-   //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 297
+   LINXY(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo),// 297
    LINXY(__NR_perf_counter_open, sys_perf_counter_open) // 298
 };
 
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-generic.c.jj	2009-08-19 09:37:42.000000000 -0400
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-generic.c	2009-12-02 05:39:08.627429000 -0500
@@ -2091,11 +2091,17 @@ ML_(generic_PRE_sys_mmap) ( ThreadId tid
 #define PRE(name)      DEFN_PRE_TEMPLATE(generic, name)
 #define POST(name)     DEFN_POST_TEMPLATE(generic, name)
 
-#if VG_WORDSIZE == 4
-// Combine two 32-bit values into a 64-bit value
-// Always use with low-numbered arg first (e.g. LOHI64(ARG1,ARG2) )
-// GrP fixme correct for ppc-linux?
-#define LOHI64(lo,hi)   ( ((ULong)(lo)) | (((ULong)(hi)) << 32) )
+// Macros to support 64-bit syscall args split into two 32 bit values
+#if defined(VG_LITTLEENDIAN)
+#define MERGE64(lo,hi)   ( ((ULong)(lo)) | (((ULong)(hi)) << 32) )
+#define MERGE64_FIRST(name) name##_low
+#define MERGE64_SECOND(name) name##_high
+#elif defined(VG_BIGENDIAN)
+#define MERGE64(hi,lo)   ( ((ULong)(lo)) | (((ULong)(hi)) << 32) )
+#define MERGE64_FIRST(name) name##_high
+#define MERGE64_SECOND(name) name##_low
+#else
+#error Unknown endianness
 #endif
 
 PRE(sys_exit)
@@ -2346,10 +2352,10 @@ PRE(sys_pwrite64)
    *flags |= SfMayBlock;
 #if VG_WORDSIZE == 4
    PRINT("sys_pwrite64 ( %ld, %#lx, %llu, %lld )",
-         ARG1, ARG2, (ULong)ARG3, LOHI64(ARG4,ARG5));
+         ARG1, ARG2, (ULong)ARG3, MERGE64(ARG4,ARG5));
    PRE_REG_READ5(ssize_t, "pwrite64",
                  unsigned int, fd, const char *, buf, vki_size_t, count,
-                 vki_u32, offset_low32, vki_u32, offset_high32);
+                 vki_u32, MERGE64_FIRST(offset), vki_u32, MERGE64_SECOND(offset));
 #elif VG_WORDSIZE == 8
    PRINT("sys_pwrite64 ( %ld, %#lx, %llu, %lld )",
          ARG1, ARG2, (ULong)ARG3, (Long)ARG4);
@@ -2405,10 +2411,10 @@ PRE(sys_pread64)
    *flags |= SfMayBlock;
 #if VG_WORDSIZE == 4
    PRINT("sys_pread64 ( %ld, %#lx, %llu, %lld )",
-         ARG1, ARG2, (ULong)ARG3, LOHI64(ARG4,ARG5));
+         ARG1, ARG2, (ULong)ARG3, MERGE64(ARG4,ARG5));
    PRE_REG_READ5(ssize_t, "pread64",
                  unsigned int, fd, char *, buf, vki_size_t, count,
-                 vki_u32, offset_low32, vki_u32, offset_high32);
+                 vki_u32, MERGE64_FIRST(offset), vki_u32, MERGE64_SECOND(offset));
 #elif VG_WORDSIZE == 8
    PRINT("sys_pread64 ( %ld, %#lx, %llu, %lld )",
          ARG1, ARG2, (ULong)ARG3, (Long)ARG4);
@@ -2966,10 +2972,10 @@ PRE(sys_ftruncate64)
 {
    *flags |= SfMayBlock;
 #if VG_WORDSIZE == 4
-   PRINT("sys_ftruncate64 ( %ld, %lld )", ARG1, LOHI64(ARG2,ARG3));
+   PRINT("sys_ftruncate64 ( %ld, %lld )", ARG1, MERGE64(ARG2,ARG3));
    PRE_REG_READ3(long, "ftruncate64",
                  unsigned int, fd,
-                 UWord, length_low32, UWord, length_high32);
+                 UWord, MERGE64_FIRST(length), UWord, MERGE64_SECOND(length));
 #else
    PRINT("sys_ftruncate64 ( %ld, %lld )", ARG1, (Long)ARG2);
    PRE_REG_READ2(long, "ftruncate64",
@@ -2981,10 +2987,10 @@ PRE(sys_truncate64)
 {
    *flags |= SfMayBlock;
 #if VG_WORDSIZE == 4
-   PRINT("sys_truncate64 ( %#lx, %lld )", ARG1, (Long)LOHI64(ARG2, ARG3));
+   PRINT("sys_truncate64 ( %#lx, %lld )", ARG1, (Long)MERGE64(ARG2, ARG3));
    PRE_REG_READ3(long, "truncate64",
                  const char *, path,
-                 UWord, length_low32, UWord, length_high32);
+                 UWord, MERGE64_FIRST(length), UWord, MERGE64_SECOND(length));
 #else
    PRINT("sys_truncate64 ( %#lx, %lld )", ARG1, (Long)ARG2);
    PRE_REG_READ2(long, "truncate64",
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-x86-linux.c.jj	2009-12-02 05:38:21.292713000 -0500
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-x86-linux.c	2009-12-02 05:39:08.655406000 -0500
@@ -1475,6 +1475,13 @@ PRE(sys_socketcall)
       break;
    }
 
+   case VKI_SYS_ACCEPT4: {
+      /*int accept(int s, struct sockaddr *add, int *addrlen, int flags)*/
+      PRE_MEM_READ( "socketcall.accept4(args)", ARG2, 4*sizeof(Addr) );
+      ML_(generic_PRE_sys_accept)( tid, ARG2_0, ARG2_1, ARG2_2 );
+      break;
+   }
+
    case VKI_SYS_SENDTO:
       /* int sendto(int s, const void *msg, int len, 
                     unsigned int flags, 
@@ -1620,7 +1627,9 @@ POST(sys_socketcall)
       break;
 
    case VKI_SYS_ACCEPT:
+   case VKI_SYS_ACCEPT4:
       /* int accept(int s, struct sockaddr *addr, int *addrlen); */
+      /* int accept4(int s, struct sockaddr *addr, int *addrlen, int flags); */
      r = ML_(generic_POST_sys_accept)( tid, VG_(mk_SysRes_Success)(RES), 
                                             ARG2_0, ARG2_1, ARG2_2 );
      SET_STATUS_from_SysRes(r);
@@ -2001,8 +2010,8 @@ const SyscallTableEntry ML_(syscall_tabl
 //zz    //   (__NR_setdomainname,     sys_setdomainname),  // 121 */*(?)
    GENXY(__NR_uname,             sys_newuname),       // 122
    PLAX_(__NR_modify_ldt,        sys_modify_ldt),     // 123
-//zz    LINXY(__NR_adjtimex,          sys_adjtimex),       // 124
-//zz 
+   LINXY(__NR_adjtimex,          sys_adjtimex),       // 124
+
    GENXY(__NR_mprotect,          sys_mprotect),       // 125
    LINXY(__NR_sigprocmask,       sys_sigprocmask),    // 126
 //zz    // Nb: create_module() was removed 2.4-->2.6
@@ -2048,7 +2057,7 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_sched_get_priority_max, sys_sched_get_priority_max),// 159
 
    LINX_(__NR_sched_get_priority_min, sys_sched_get_priority_min),// 160
-//zz    //LINX?(__NR_sched_rr_get_interval,  sys_sched_rr_get_interval), // 161 */*
+   LINXY(__NR_sched_rr_get_interval,  sys_sched_rr_get_interval), // 161
    GENXY(__NR_nanosleep,         sys_nanosleep),      // 162
    GENX_(__NR_mremap,            sys_mremap),         // 163
    LINX_(__NR_setresuid,         sys_setresuid16),    // 164
@@ -2244,7 +2253,7 @@ const SyscallTableEntry ML_(syscall_tabl
    LINXY(__NR_signalfd,          sys_signalfd),         // 321
    LINXY(__NR_timerfd_create,    sys_timerfd_create),   // 322
    LINX_(__NR_eventfd,           sys_eventfd),          // 323
-   //LINX_(__NR_fallocate,         sys_fallocate),        // 324
+   LINX_(__NR_fallocate,         sys_fallocate),        // 324
 
    LINXY(__NR_timerfd_settime,   sys_timerfd_settime),  // 325
    LINXY(__NR_timerfd_gettime,   sys_timerfd_gettime),  // 326
@@ -2252,13 +2261,13 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_eventfd2,          sys_eventfd2),         // 328
    LINXY(__NR_epoll_create1,     sys_epoll_create1),     // 329
 
-   //   (__NR_dup3,              sys_ni_syscall)        // 330
+   LINXY(__NR_dup3,              sys_dup3),             // 330
    LINXY(__NR_pipe2,             sys_pipe2),            // 331
    LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 332
    LINXY(__NR_preadv,            sys_preadv),           // 333
    LINX_(__NR_pwritev,           sys_pwritev),          // 334
 
-   //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 335
+   LINXY(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo),// 335
    LINXY(__NR_perf_counter_open, sys_perf_counter_open) // 336
 };
 
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc32-linux.c.jj	2009-12-02 05:38:21.331695000 -0500
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc32-linux.c	2009-12-02 05:43:30.802905000 -0500
@@ -457,6 +457,13 @@ PRE(sys_socketcall)
       break;
    }
 
+   case VKI_SYS_ACCEPT4: {
+     /* int accept(int s, struct sockaddr *addr, int *addrlen, int args); */
+      PRE_MEM_READ( "socketcall.accept4(args)", ARG2, 4*sizeof(Addr) );
+      ML_(generic_PRE_sys_accept)( tid, ARG2_0, ARG2_1, ARG2_2 );
+      break;
+   }
+
    case VKI_SYS_SENDTO:
      /* int sendto(int s, const void *msg, int len,
                     unsigned int flags,
@@ -602,6 +609,7 @@ POST(sys_socketcall)
     break;
 
   case VKI_SYS_ACCEPT:
+  case VKI_SYS_ACCEPT4:
     /* int accept(int s, struct sockaddr *addr, int *addrlen); */
     r = ML_(generic_POST_sys_accept)( tid, VG_(mk_SysRes_Success)(RES),
 				      ARG2_0, ARG2_1, ARG2_2 );
@@ -1629,7 +1637,7 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    //   (__NR_olduname,          sys_uname),             // 109 -- obsolete
 //.. 
 //..    GENX_(__NR_iopl,              sys_iopl),              // 110
-//..    LINX_(__NR_vhangup,           sys_vhangup),           // 111
+   LINX_(__NR_vhangup,           sys_vhangup),           // 111
 //..    GENX_(__NR_idle,              sys_ni_syscall),        // 112
 //..    //   (__NR_vm86old,           sys_vm86old),           // 113 x86/Linux-only
    GENXY(__NR_wait4,             sys_wait4),             // 114
@@ -1644,8 +1652,8 @@ const SyscallTableEntry ML_(syscall_tabl
 //..    //   (__NR_setdomainname,     sys_setdomainname),     // 121 */*(?)
    GENXY(__NR_uname,             sys_newuname),          // 122
 //..    PLAX_(__NR_modify_ldt,        sys_modify_ldt),        // 123
-//..    LINXY(__NR_adjtimex,          sys_adjtimex),          // 124
-//.. 
+   LINXY(__NR_adjtimex,          sys_adjtimex),          // 124
+
    GENXY(__NR_mprotect,          sys_mprotect),          // 125
    LINXY(__NR_sigprocmask,       sys_sigprocmask),       // 126
    GENX_(__NR_create_module,     sys_ni_syscall),        // 127
@@ -1690,7 +1698,7 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_sched_get_priority_max, sys_sched_get_priority_max),// 159
 
    LINX_(__NR_sched_get_priority_min, sys_sched_get_priority_min),// 160
-//..    //LINX?(__NR_sched_rr_get_interval,  sys_sched_rr_get_interval), // 161 */*
+   LINXY(__NR_sched_rr_get_interval,  sys_sched_rr_get_interval), // 161
    GENXY(__NR_nanosleep,         sys_nanosleep),         // 162
    GENX_(__NR_mremap,            sys_mremap),            // 163
    LINX_(__NR_setresuid,         sys_setresuid),         // 164
@@ -1857,21 +1865,21 @@ const SyscallTableEntry ML_(syscall_tabl
    LINXY(__NR_signalfd,          sys_signalfd),          // 305
    LINXY(__NR_timerfd_create,    sys_timerfd_create),    // 306
    LINX_(__NR_eventfd,           sys_eventfd),           // 307
-//   LINX_(__NR_sync_file_range2,   sys_ni_syscall),       // 308
-//   LINX_(__NR_fallocate,         sys_fallocate),         // 309
+   LINX_(__NR_sync_file_range2,  sys_sync_file_range2),  // 308
+   LINX_(__NR_fallocate,         sys_fallocate),         // 309
 //   LINXY(__NR_subpage_prot,       sys_ni_syscall),       // 310
    LINXY(__NR_timerfd_settime,   sys_timerfd_settime),  // 311
    LINXY(__NR_timerfd_gettime,   sys_timerfd_gettime),  // 312
    LINXY(__NR_signalfd4,         sys_signalfd4),        // 313
    LINX_(__NR_eventfd2,          sys_eventfd2),         // 314
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 315
-   //   (__NR_dup3,              sys_ni_syscall)        // 316
+   LINXY(__NR_dup3,              sys_dup3),             // 316
    LINXY(__NR_pipe2,             sys_pipe2),            // 317
    LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 318
    LINXY(__NR_perf_counter_open, sys_perf_counter_open),// 319
    LINXY(__NR_preadv,            sys_preadv),           // 320
-   LINX_(__NR_pwritev,           sys_pwritev)           // 321
-   //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 322
+   LINX_(__NR_pwritev,           sys_pwritev),          // 321
+   LINXY(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo) // 322
 };
 
 const UInt ML_(syscall_table_size) = 


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- valgrind.spec	4 Nov 2009 09:19:22 -0000	1.75
+++ valgrind.spec	2 Dec 2009 15:15:14 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 9
+Release: 10%{?dist}
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -20,6 +20,8 @@ Patch13: valgrind-3.5.0-amd64-adcsbb.pat
 Patch14: valgrind-3.5.0-syscalls.patch
 Patch15: valgrind-3.5.0-preadv.patch
 Patch16: valgrind-3.5.0-glibc-2.11.patch
+Patch17: valgrind-3.5.0-syscalls2.patch
+Patch18: valgrind-3.5.0-dynbss.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -89,6 +91,8 @@ or valgrind plugins.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -174,6 +178,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-10
+- add handling of a bunch of recent syscalls and fix some
+  other syscall wrappers (Dodji Seketeli)
+- handle prelink created split of .bss into .dynbss and .bss
+  and similarly for .sbss and .sdynbss (#539874)
+
 * Wed Nov  4 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-9
 - rebuilt against glibc 2.11
 - use upstream version of the ifunc support



From mbarnes at fedoraproject.org  Wed Dec  2 15:29:05 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 15:29:05 +0000 (UTC)
Subject: rpms/devhelp/F-12 devhelp-2.28.1-missing-webkit-1.0.patch, NONE,
	1.1 devhelp.spec, 1.118, 1.119
Message-ID: <20091202152905.EBBBC11C0095@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/devhelp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2317

Modified Files:
	devhelp.spec 
Added Files:
	devhelp-2.28.1-missing-webkit-1.0.patch 
Log Message:

* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.1-2
- Add patch for RH bug #543177 (missing webkit-1.0 requirement).


devhelp-2.28.1-missing-webkit-1.0.patch:
 libdevhelp-1.0.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE devhelp-2.28.1-missing-webkit-1.0.patch ---
diff -up devhelp-2.28.1/data/libdevhelp-1.0.pc.in.missing-webkit-1.0 devhelp-2.28.1/data/libdevhelp-1.0.pc.in
--- devhelp-2.28.1/data/libdevhelp-1.0.pc.in.missing-webkit-1.0	2009-12-02 09:59:36.227612402 -0500
+++ devhelp-2.28.1/data/libdevhelp-1.0.pc.in	2009-12-02 09:59:44.836356861 -0500
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: devhelp
 Description: devhelp
-Requires: gtk+-2.0
+Requires: gtk+-2.0 webkit-1.0
 Requires.private: @REQUIRES_LIBWNCK@
 Version: @VERSION@
 Libs: -L${libdir} -ldevhelp-1


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/F-12/devhelp.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- devhelp.spec	19 Oct 2009 23:00:19 -0000	1.118
+++ devhelp.spec	2 Dec 2009 15:29:05 -0000	1.119
@@ -6,7 +6,7 @@
 
 Name: devhelp
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
@@ -14,6 +14,10 @@ URL: http://developer.imendio.com/projec
 Source: http://download.gnome.org/sources/devhelp/2.28/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
+### Patches ###
+
+Patch1: devhelp-2.28.1-missing-webkit-1.0.patch
+
 ### Dependencies ###
 
 Requires(pre): GConf2 >= 2.14
@@ -52,6 +56,7 @@ into other applications such as IDEs.
 
 %prep
 %setup -q -n devhelp-%{version}
+%patch1 -p1 -b .missing-webkit-1.0
 
 # the configure script in the 2.28.0 tarball is bad
 autoreconf -f -i
@@ -141,6 +146,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.1-2
+- Add patch for RH bug #543177 (missing webkit-1.0 requirement).
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 



From mclasen at fedoraproject.org  Wed Dec  2 15:32:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 15:32:06 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.161,1.162
Message-ID: <20091202153206.8AA7D11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3126

Modified Files:
	file-roller.spec 
Log Message:
Drop unneeded BRs



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- file-roller.spec	1 Dec 2009 15:43:54 -0000	1.161
+++ file-roller.spec	2 Dec 2009 15:32:06 -0000	1.162
@@ -23,7 +23,6 @@ BuildRequires: pango-devel >= %{pango_ve
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libglade2-devel
 BuildRequires: nautilus-devel >= %{nautilus_version}
-BuildRequires: automake autoconf
 BuildRequires: libtool
 BuildRequires: gettext
 BuildRequires: libSM-devel
@@ -31,7 +30,6 @@ BuildRequires: desktop-file-utils >= %{d
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: GConf2-devel
 BuildRequires: dbus-glib-devel
-BuildRequires: scrollkeeper
 BuildRequires: intltool
 
 Requires(post): scrollkeeper
@@ -86,7 +84,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null || :
-scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null || :
@@ -111,7 +108,6 @@ fi
 
 %postun
 update-desktop-database &> /dev/null || :
-scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -130,6 +126,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> 2.29.2-2
+- Drop unneded BRs
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.2-1
 - Update to 2.29.2
 



From mclasen at fedoraproject.org  Wed Dec  2 15:35:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 15:35:09 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.162,1.163
Message-ID: <20091202153509.353EB11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4079

Modified Files:
	file-roller.spec 
Log Message:
bump rev



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- file-roller.spec	2 Dec 2009 15:32:06 -0000	1.162
+++ file-roller.spec	2 Dec 2009 15:35:08 -0000	1.163
@@ -11,7 +11,7 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.29.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/



From pkgdb at fedoraproject.org  Wed Dec  2 16:00:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 16:00:52 +0000
Subject: [pkgdb] frysk: swagiaal has given up watchbugzilla
Message-ID: <20091202160052.D37FE10F896@bastion2.fedora.phx.redhat.com>

swagiaal has given up the watchbugzilla acl on frysk (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 16:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 16:01:03 +0000
Subject: [pkgdb] frysk: swagiaal has given up watchcommits
Message-ID: <20091202160103.9562B10F89D@bastion2.fedora.phx.redhat.com>

swagiaal has given up the watchcommits acl on frysk (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 16:01:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 16:01:10 +0000
Subject: [pkgdb] frysk: swagiaal has given up commit
Message-ID: <20091202160111.17CA410F896@bastion2.fedora.phx.redhat.com>

swagiaal has given up the commit acl on frysk (Fedora 12)

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



From mef at fedoraproject.org  Wed Dec  2 16:03:22 2009
From: mef at fedoraproject.org (mef)
Date: Wed,  2 Dec 2009 16:03:22 +0000 (UTC)
Subject: File Slice2JavaPlugin-3.3.1.20091005.tar.gz uploaded to lookaside
	cache by mef
Message-ID: <20091202160322.D550D10F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-slice2java:

a08267848d03576ed5905b18145dde02  Slice2JavaPlugin-3.3.1.20091005.tar.gz



From mef at fedoraproject.org  Wed Dec  2 16:03:58 2009
From: mef at fedoraproject.org (mef)
Date: Wed,  2 Dec 2009 16:03:58 +0000 (UTC)
Subject: rpms/eclipse-slice2java/devel eclipse-slice2java-README, NONE,
	1.1 eclipse-slice2java.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091202160358.B729611C0095@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/eclipse-slice2java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11288/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-slice2java-README eclipse-slice2java.spec import.log 
Log Message:
Initial import



--- NEW FILE eclipse-slice2java-README ---
Configuring the Ice SDK

After installing the plugin, restart Eclipse, choose Preferences from the
Window menu, select Slice2Java, and review the default setting for the
location of your Ice installation. The property pane will display an error
message if the plug-in considers the specified location to be invalid. If
necessary, click Browse... to pick the top-level directory of your Ice
installation and apply your changes. 


Activating the Plugin for a Project

After installing the plug-in, you can use it in your Eclipse project by
right-clicking on the project, choosing Slice2Java and clicking Add
Slice2Java builder. The plug-in immediately makes several additions to your
project:

    - Creates a slice subdirectory to contain your Slice files. The plug-in
      automatically compiles any Slice file that you add to this directory.
    - Creates a generated subdirectory to hold the Java source files that
      the slice2java translator generates from your Slice files.
    - Adds a library reference to the Ice run time JAR file (Ice.jar) for
      non-Android projects. The plug-in assumes that the JAR file resides
      in the lib subdirectory of your Ice installation. 


Configuring Project Settings

To configure the Slice2Java plug-in, select Properties from the Project
menu or right-click on the name of your project and choose Properties.
Click on Slice2Java Properties to view the plug-in's configuration
settings, which are presented in three tabs:

Source

This tab configures the directories of your Slice files and generated code.
The plug-in includes the slice subdirectory by default, but you can remove
this directory and add other directories if necessary. The plug-in only
compiles Slice files that are located in the configured subdirectories.

For the generated code, the plug-in uses the default name generated for the
subdirectory. If you want to store your generated code in a different
directory, you must first create the directory and then click Browse to
select it. Be aware that the plug-in requires exclusive use of the
subdirectory you designate, therefore you must not place other project
resources in it. 

Options

This tab is where you configure additional plug-in settings. You can enter
a list of include directories corresponding to the compiler's -I option.
You can also specify preprocessor macros and metadata definitions in the
fields provided. Finally, checkboxes offer additional control over certain
features of the plug-in and the Slice compiler. When enabled, the
checkboxes have the following semantics:

        - Enable stream generates code to support the dynamic streaming API
        - Enable tie generates TIE classes
        - Enable ice instructs the compiler to accept Slice symbols that
          use the ice prefix
        - Include Ice Slice Files adds an implicit include (-I) option that
          refers to the slice subdirectory of your Ice installation
        - Enable console causes the plug-in to emit diagnostic information
          about its activities to Eclipse's console 

Libraries

This tab allows you to configure the Ice JAR files with which to build your
application. The Ice Library entry in your project's build path is
substituted with the JAR files that you add to this list. If you remove the
Ice Library entry from your build path, this list has no effect and you
will need to configure the build path manually.

Note that Android projects cannot use the Ice Library indirect reference,
therefore you must manually add IceAndroid.jar to your build path:

       1. Select Java Build Path in the project's properties
       2. Click on the Libraries tab
       3. Click Add External JARs... and choose IceAndroid.jar
       4. Click OK to save your changes 

The plug-in always rebuilds a project after its properties have been
changed, but it may be necessary to refresh the project after changing a
project's build path. To refresh a project, select it and press F5, or
right-click on the project and choose Refresh. 


--- NEW FILE eclipse-slice2java.spec ---
%define install_loc    %{_datadir}/eclipse/dropins/slice2java
%define date 20091005

Summary:        A plugin that integrates Eclipse with Ice object middleware
Name:           eclipse-slice2java
Version:        3.3.1.%{date}
Release:        1%{?dist}
License:        EPL
Group:          Development/Tools
URL:            http://www.zeroc.com/eclipse.html
Source0:        http://www.zeroc.com/download/eclipse/Slice2JavaPlugin-%{version}.tar.gz
# Adapted from the instructions at http://www.zeroc.com/eclipse.html
Source1:        eclipse-slice2java-README

BuildRequires: eclipse-pde >= 1:3.4.0

Requires: eclipse-platform >= 3.4.0
Requires: ice-java >= 3.3.1

# No Ice on this arch, so the plugin doesn't make sense
ExcludeArch:   ppc64

# Can this coexist with the ExcludeArch above?
BuildArch:     noarch

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
The slice2java plugin manages the translation of Slice to Java.
The plugin computes dependencies between Slice files and automatically
recompiles Slice files when necessary. The plugin also manages
the generated code to eliminate obsolete files.

%prep
%setup -q -n Slice2JavaPlugin-%{version}
cp %{SOURCE1} ./README

%build
%{_libdir}/eclipse/buildscripts/pdebuild

%install
%{__rm} -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
%{__unzip} -q -d $RPM_BUILD_ROOT%{install_loc} \
     build/rpmBuild/com.zeroc.Slice2Java.zip

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README CHANGES
%{install_loc}

%changelog
* Wed Nov 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1.20091005-1
- Update to newer version
- Include changelog in documentation

* Wed Nov 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1.20090330-2
- Remove GCJ bits
- Remove unnecessary BuildRequirement and arguments to pdebuild
- Fix typo in README file
- Add date to version string
- Clean up use of macros

* Wed Jul  8 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-1
- Initial package


--- NEW FILE import.log ---
eclipse-slice2java-3_3_1_20091005-1_fc12:HEAD:eclipse-slice2java-3.3.1.20091005-1.fc12.src.rpm:1259769810


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-slice2java/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:44:51 -0000	1.1
+++ .cvsignore	2 Dec 2009 16:03:58 -0000	1.2
@@ -0,0 +1 @@
+Slice2JavaPlugin-3.3.1.20091005.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-slice2java/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:44:51 -0000	1.1
+++ sources	2 Dec 2009 16:03:58 -0000	1.2
@@ -0,0 +1 @@
+a08267848d03576ed5905b18145dde02  Slice2JavaPlugin-3.3.1.20091005.tar.gz



From s4504kr at fedoraproject.org  Wed Dec  2 16:05:55 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  2 Dec 2009 16:05:55 +0000 (UTC)
Subject: rpms/clojure/devel clojure.spec,1.11,1.12
Message-ID: <20091202160555.F275111C0095@cvs1.fedora.phx.redhat.com>

Author: s4504kr

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

Modified Files:
	clojure.spec 
Log Message:
add Epoch to get proper update path


Index: clojure.spec
===================================================================
RCS file: /cvs/extras/rpms/clojure/devel/clojure.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- clojure.spec	1 Dec 2009 21:12:59 -0000	1.11
+++ clojure.spec	2 Dec 2009 16:05:55 -0000	1.12
@@ -1,7 +1,8 @@
 
 Name:           clojure
+Epoch:		1
 Version:     	1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
@@ -72,6 +73,9 @@ rm -rf %{buildroot}
 %{_bindir}/clojure
 
 %changelog
+* Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-3
+- Add Epoch to get proper EVR path
+
 * Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-2
 - Forgot uploading soruces
 



From mef at fedoraproject.org  Wed Dec  2 16:05:57 2009
From: mef at fedoraproject.org (mef)
Date: Wed,  2 Dec 2009 16:05:57 +0000 (UTC)
Subject: rpms/eclipse-slice2java/F-11/noarch - New directory
Message-ID: <20091202160557.D0EB811C0095@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/eclipse-slice2java/F-11/noarch
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11972/F-11/noarch

Log Message:
Directory /cvs/pkgs/rpms/eclipse-slice2java/F-11/noarch added to the repository




From mef at fedoraproject.org  Wed Dec  2 16:05:58 2009
From: mef at fedoraproject.org (mef)
Date: Wed,  2 Dec 2009 16:05:58 +0000 (UTC)
Subject: rpms/eclipse-slice2java/F-11/Slice2JavaPlugin-3.3.1.20091005 - New
	directory
Message-ID: <20091202160558.05CDA11C0095@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/eclipse-slice2java/F-11/Slice2JavaPlugin-3.3.1.20091005
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11972/F-11/Slice2JavaPlugin-3.3.1.20091005

Log Message:
Directory /cvs/pkgs/rpms/eclipse-slice2java/F-11/Slice2JavaPlugin-3.3.1.20091005 added to the repository




From mef at fedoraproject.org  Wed Dec  2 16:08:33 2009
From: mef at fedoraproject.org (mef)
Date: Wed,  2 Dec 2009 16:08:33 +0000 (UTC)
Subject: rpms/eclipse-slice2java/F-12 eclipse-slice2java-README, NONE,
	1.1 eclipse-slice2java.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091202160833.7ECF411C0095@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/eclipse-slice2java/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12802/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-slice2java-README eclipse-slice2java.spec 
Log Message:
Add to branches


--- NEW FILE eclipse-slice2java-README ---
Configuring the Ice SDK

After installing the plugin, restart Eclipse, choose Preferences from the
Window menu, select Slice2Java, and review the default setting for the
location of your Ice installation. The property pane will display an error
message if the plug-in considers the specified location to be invalid. If
necessary, click Browse... to pick the top-level directory of your Ice
installation and apply your changes. 


Activating the Plugin for a Project

After installing the plug-in, you can use it in your Eclipse project by
right-clicking on the project, choosing Slice2Java and clicking Add
Slice2Java builder. The plug-in immediately makes several additions to your
project:

    - Creates a slice subdirectory to contain your Slice files. The plug-in
      automatically compiles any Slice file that you add to this directory.
    - Creates a generated subdirectory to hold the Java source files that
      the slice2java translator generates from your Slice files.
    - Adds a library reference to the Ice run time JAR file (Ice.jar) for
      non-Android projects. The plug-in assumes that the JAR file resides
      in the lib subdirectory of your Ice installation. 


Configuring Project Settings

To configure the Slice2Java plug-in, select Properties from the Project
menu or right-click on the name of your project and choose Properties.
Click on Slice2Java Properties to view the plug-in's configuration
settings, which are presented in three tabs:

Source

This tab configures the directories of your Slice files and generated code.
The plug-in includes the slice subdirectory by default, but you can remove
this directory and add other directories if necessary. The plug-in only
compiles Slice files that are located in the configured subdirectories.

For the generated code, the plug-in uses the default name generated for the
subdirectory. If you want to store your generated code in a different
directory, you must first create the directory and then click Browse to
select it. Be aware that the plug-in requires exclusive use of the
subdirectory you designate, therefore you must not place other project
resources in it. 

Options

This tab is where you configure additional plug-in settings. You can enter
a list of include directories corresponding to the compiler's -I option.
You can also specify preprocessor macros and metadata definitions in the
fields provided. Finally, checkboxes offer additional control over certain
features of the plug-in and the Slice compiler. When enabled, the
checkboxes have the following semantics:

        - Enable stream generates code to support the dynamic streaming API
        - Enable tie generates TIE classes
        - Enable ice instructs the compiler to accept Slice symbols that
          use the ice prefix
        - Include Ice Slice Files adds an implicit include (-I) option that
          refers to the slice subdirectory of your Ice installation
        - Enable console causes the plug-in to emit diagnostic information
          about its activities to Eclipse's console 

Libraries

This tab allows you to configure the Ice JAR files with which to build your
application. The Ice Library entry in your project's build path is
substituted with the JAR files that you add to this list. If you remove the
Ice Library entry from your build path, this list has no effect and you
will need to configure the build path manually.

Note that Android projects cannot use the Ice Library indirect reference,
therefore you must manually add IceAndroid.jar to your build path:

       1. Select Java Build Path in the project's properties
       2. Click on the Libraries tab
       3. Click Add External JARs... and choose IceAndroid.jar
       4. Click OK to save your changes 

The plug-in always rebuilds a project after its properties have been
changed, but it may be necessary to refresh the project after changing a
project's build path. To refresh a project, select it and press F5, or
right-click on the project and choose Refresh. 


--- NEW FILE eclipse-slice2java.spec ---
%define install_loc    %{_datadir}/eclipse/dropins/slice2java
%define date 20091005

Summary:        A plugin that integrates Eclipse with Ice object middleware
Name:           eclipse-slice2java
Version:        3.3.1.%{date}
Release:        1%{?dist}
License:        EPL
Group:          Development/Tools
URL:            http://www.zeroc.com/eclipse.html
Source0:        http://www.zeroc.com/download/eclipse/Slice2JavaPlugin-%{version}.tar.gz
# Adapted from the instructions at http://www.zeroc.com/eclipse.html
Source1:        eclipse-slice2java-README

BuildRequires: eclipse-pde >= 1:3.4.0

Requires: eclipse-platform >= 3.4.0
Requires: ice-java >= 3.3.1

# No Ice on this arch, so the plugin doesn't make sense
ExcludeArch:   ppc64

# Can this coexist with the ExcludeArch above?
BuildArch:     noarch

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
The slice2java plugin manages the translation of Slice to Java.
The plugin computes dependencies between Slice files and automatically
recompiles Slice files when necessary. The plugin also manages
the generated code to eliminate obsolete files.

%prep
%setup -q -n Slice2JavaPlugin-%{version}
cp %{SOURCE1} ./README

%build
%{_libdir}/eclipse/buildscripts/pdebuild

%install
%{__rm} -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
%{__unzip} -q -d $RPM_BUILD_ROOT%{install_loc} \
     build/rpmBuild/com.zeroc.Slice2Java.zip

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README CHANGES
%{install_loc}

%changelog
* Wed Nov 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1.20091005-1
- Update to newer version
- Include changelog in documentation

* Wed Nov 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1.20090330-2
- Remove GCJ bits
- Remove unnecessary BuildRequirement and arguments to pdebuild
- Fix typo in README file
- Add date to version string
- Clean up use of macros

* Wed Jul  8 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-slice2java/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:44:51 -0000	1.1
+++ .cvsignore	2 Dec 2009 16:08:33 -0000	1.2
@@ -0,0 +1 @@
+Slice2JavaPlugin-3.3.1.20091005.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-slice2java/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:44:51 -0000	1.1
+++ sources	2 Dec 2009 16:08:33 -0000	1.2
@@ -0,0 +1 @@
+a08267848d03576ed5905b18145dde02  Slice2JavaPlugin-3.3.1.20091005.tar.gz



From mef at fedoraproject.org  Wed Dec  2 16:08:33 2009
From: mef at fedoraproject.org (mef)
Date: Wed,  2 Dec 2009 16:08:33 +0000 (UTC)
Subject: rpms/eclipse-slice2java/F-11 eclipse-slice2java-README, NONE,
	1.1 eclipse-slice2java.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091202160833.1A28611C0095@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/eclipse-slice2java/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12802/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-slice2java-README eclipse-slice2java.spec 
Log Message:
Add to branches


--- NEW FILE eclipse-slice2java-README ---
Configuring the Ice SDK

After installing the plugin, restart Eclipse, choose Preferences from the
Window menu, select Slice2Java, and review the default setting for the
location of your Ice installation. The property pane will display an error
message if the plug-in considers the specified location to be invalid. If
necessary, click Browse... to pick the top-level directory of your Ice
installation and apply your changes. 


Activating the Plugin for a Project

After installing the plug-in, you can use it in your Eclipse project by
right-clicking on the project, choosing Slice2Java and clicking Add
Slice2Java builder. The plug-in immediately makes several additions to your
project:

    - Creates a slice subdirectory to contain your Slice files. The plug-in
      automatically compiles any Slice file that you add to this directory.
    - Creates a generated subdirectory to hold the Java source files that
      the slice2java translator generates from your Slice files.
    - Adds a library reference to the Ice run time JAR file (Ice.jar) for
      non-Android projects. The plug-in assumes that the JAR file resides
      in the lib subdirectory of your Ice installation. 


Configuring Project Settings

To configure the Slice2Java plug-in, select Properties from the Project
menu or right-click on the name of your project and choose Properties.
Click on Slice2Java Properties to view the plug-in's configuration
settings, which are presented in three tabs:

Source

This tab configures the directories of your Slice files and generated code.
The plug-in includes the slice subdirectory by default, but you can remove
this directory and add other directories if necessary. The plug-in only
compiles Slice files that are located in the configured subdirectories.

For the generated code, the plug-in uses the default name generated for the
subdirectory. If you want to store your generated code in a different
directory, you must first create the directory and then click Browse to
select it. Be aware that the plug-in requires exclusive use of the
subdirectory you designate, therefore you must not place other project
resources in it. 

Options

This tab is where you configure additional plug-in settings. You can enter
a list of include directories corresponding to the compiler's -I option.
You can also specify preprocessor macros and metadata definitions in the
fields provided. Finally, checkboxes offer additional control over certain
features of the plug-in and the Slice compiler. When enabled, the
checkboxes have the following semantics:

        - Enable stream generates code to support the dynamic streaming API
        - Enable tie generates TIE classes
        - Enable ice instructs the compiler to accept Slice symbols that
          use the ice prefix
        - Include Ice Slice Files adds an implicit include (-I) option that
          refers to the slice subdirectory of your Ice installation
        - Enable console causes the plug-in to emit diagnostic information
          about its activities to Eclipse's console 

Libraries

This tab allows you to configure the Ice JAR files with which to build your
application. The Ice Library entry in your project's build path is
substituted with the JAR files that you add to this list. If you remove the
Ice Library entry from your build path, this list has no effect and you
will need to configure the build path manually.

Note that Android projects cannot use the Ice Library indirect reference,
therefore you must manually add IceAndroid.jar to your build path:

       1. Select Java Build Path in the project's properties
       2. Click on the Libraries tab
       3. Click Add External JARs... and choose IceAndroid.jar
       4. Click OK to save your changes 

The plug-in always rebuilds a project after its properties have been
changed, but it may be necessary to refresh the project after changing a
project's build path. To refresh a project, select it and press F5, or
right-click on the project and choose Refresh. 


--- NEW FILE eclipse-slice2java.spec ---
%define install_loc    %{_datadir}/eclipse/dropins/slice2java
%define date 20091005

Summary:        A plugin that integrates Eclipse with Ice object middleware
Name:           eclipse-slice2java
Version:        3.3.1.%{date}
Release:        1%{?dist}
License:        EPL
Group:          Development/Tools
URL:            http://www.zeroc.com/eclipse.html
Source0:        http://www.zeroc.com/download/eclipse/Slice2JavaPlugin-%{version}.tar.gz
# Adapted from the instructions at http://www.zeroc.com/eclipse.html
Source1:        eclipse-slice2java-README

BuildRequires: eclipse-pde >= 1:3.4.0

Requires: eclipse-platform >= 3.4.0
Requires: ice-java >= 3.3.1

# No Ice on this arch, so the plugin doesn't make sense
ExcludeArch:   ppc64

# Can this coexist with the ExcludeArch above?
BuildArch:     noarch

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
The slice2java plugin manages the translation of Slice to Java.
The plugin computes dependencies between Slice files and automatically
recompiles Slice files when necessary. The plugin also manages
the generated code to eliminate obsolete files.

%prep
%setup -q -n Slice2JavaPlugin-%{version}
cp %{SOURCE1} ./README

%build
%{_libdir}/eclipse/buildscripts/pdebuild

%install
%{__rm} -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
%{__unzip} -q -d $RPM_BUILD_ROOT%{install_loc} \
     build/rpmBuild/com.zeroc.Slice2Java.zip

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README CHANGES
%{install_loc}

%changelog
* Wed Nov 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1.20091005-1
- Update to newer version
- Include changelog in documentation

* Wed Nov 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1.20090330-2
- Remove GCJ bits
- Remove unnecessary BuildRequirement and arguments to pdebuild
- Fix typo in README file
- Add date to version string
- Clean up use of macros

* Wed Jul  8 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-slice2java/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 18:44:51 -0000	1.1
+++ .cvsignore	2 Dec 2009 16:08:32 -0000	1.2
@@ -0,0 +1 @@
+Slice2JavaPlugin-3.3.1.20091005.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-slice2java/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 18:44:51 -0000	1.1
+++ sources	2 Dec 2009 16:08:32 -0000	1.2
@@ -0,0 +1 @@
+a08267848d03576ed5905b18145dde02  Slice2JavaPlugin-3.3.1.20091005.tar.gz



From karsten at fedoraproject.org  Wed Dec  2 16:36:37 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:36:37 +0000 (UTC)
Subject: rpms/vim/devel 7.2.285,NONE,1.1
Message-ID: <20091202163637.B3A6011C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.285 
Log Message:
- patchlevel 285


--- NEW FILE 7.2.285 ---
To: vim-dev at vim.org
Subject: Patch 7.2.285
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.285 (after 7.2.169)
Problem:    CTRL-U in Insert mode also deletes indent. (Andrey Voropaev)
Solution:   Fix mistake made in patch 7.2.169.
Files:	    src/edit.c


*** ../vim-7.2.284/src/edit.c	2009-07-09 18:15:19.000000000 +0200
--- src/edit.c	2009-11-05 20:25:15.000000000 +0100
***************
*** 8519,8525 ****
  	{
  	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
! 	    if (curwin->w_cursor.col < (colnr_T)temp)
  		mincol = curwin->w_cursor.col;
  	    curwin->w_cursor.col = save_col;
  	}
--- 8519,8525 ----
  	{
  	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
! 	    if (curwin->w_cursor.col < save_col)
  		mincol = curwin->w_cursor.col;
  	    curwin->w_cursor.col = save_col;
  	}
*** ../vim-7.2.284/src/version.c	2009-11-03 18:46:53.000000000 +0100
--- src/version.c	2009-11-11 13:21:25.000000000 +0100
***************
*** 678,679 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     285,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      I would like to get back to the Censor and agree to lose the shits, take
      the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in
      your general direction', 'castanets of your testicles' and 'oral sex'
      and ask him for an 'A' rating on that basis.
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:36:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:36:45 +0000 (UTC)
Subject: rpms/vim/devel 7.2.286,NONE,1.1
Message-ID: <20091202163645.48D6311C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.286 
Log Message:
- patchlevel 286


--- NEW FILE 7.2.286 ---
To: vim-dev at vim.org
Subject: Patch 7.2.286
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.286 (after 7.2.269)
Problem:    The "--startuptime=<file>" argument is not consistent with other
	    arguments.
Solution:   Use "--startuptime <file>".  Added the +startuptime feature.
Files:	    runtime/doc/eval.txt, runtime/doc/starting.txt,
	    runtime/doc/various.txt, src/eval.c, src/main.c, src/version.c


*** ../vim-7.2.285/runtime/doc/eval.txt	2009-04-22 12:53:31.000000000 +0200
--- runtime/doc/eval.txt	2009-11-11 13:01:58.000000000 +0100
***************
*** 5869,5874 ****
--- 5881,5887 ----
  signs			Compiled with |:sign| support.
  smartindent		Compiled with 'smartindent' support.
  sniff			Compiled with SNiFF interface support.
+ startuptime		Compiled with |--startuptime| support.
  statusline		Compiled with support for 'statusline', 'rulerformat'
  			and special formats of 'titlestring' and 'iconstring'.
  sun_workshop		Compiled with support for Sun |workshop|.
*** ../vim-7.2.285/runtime/doc/starting.txt	2009-11-03 12:10:39.000000000 +0100
--- runtime/doc/starting.txt	2009-11-11 13:20:56.000000000 +0100
***************
*** 144,155 ****
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
! --startuptime={fname}					*--startuptime*
  		During startup write timing messages to the file {fname}.
  		This can be used to find out where time is spent while loading
! 		your .vimrc and plugins.
  		When {fname} already exists new messages are appended.
! 		{only when compiled with this feature}
  
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
--- 144,156 ----
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
! --startuptime {fname}					*--startuptime*
  		During startup write timing messages to the file {fname}.
  		This can be used to find out where time is spent while loading
! 		your .vimrc, plugins and opening the first file.
  		When {fname} already exists new messages are appended.
! 		(Only available when compiled with the |+startuptime|
! 		feature).
  
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
*** ../vim-7.2.285/runtime/doc/various.txt	2009-07-09 15:55:34.000000000 +0200
--- runtime/doc/various.txt	2009-11-11 13:03:52.000000000 +0100
***************
*** 374,379 ****
--- 374,380 ----
  B  *+signs*		|:sign|
  N  *+smartindent*	|'smartindent'|
  m  *+sniff*		SniFF interface |sniff|
+ N  *+startuptime*	|--startuptime| argument
  N  *+statusline*	Options 'statusline', 'rulerformat' and special
  			formats of 'titlestring' and 'iconstring'
  m  *+sun_workshop*	|workshop|
*** ../vim-7.2.285/src/eval.c	2009-11-03 14:26:29.000000000 +0100
--- src/eval.c	2009-11-11 12:59:53.000000000 +0100
***************
*** 11736,11741 ****
--- 11736,11744 ----
  #ifdef FEAT_SNIFF
  	"sniff",
  #endif
+ #ifdef STARTUPTIME
+ 	"startuptime",
+ #endif
  #ifdef FEAT_STL_OPT
  	"statusline",
  #endif
*** ../vim-7.2.285/src/main.c	2009-11-03 12:10:39.000000000 +0100
--- src/main.c	2009-11-08 12:57:46.000000000 +0100
***************
*** 204,212 ****
  #ifdef STARTUPTIME
      for (i = 1; i < argc; ++i)
      {
! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
  	{
! 	    time_fd = mch_fopen(argv[i] + 14, "a");
  	    TIME_MSG("--- VIM STARTING ---");
  	    break;
  	}
--- 204,212 ----
  #ifdef STARTUPTIME
      for (i = 1; i < argc; ++i)
      {
! 	if (STRICMP(argv[i], "--startuptime") == 0 && i + 1 < argc)
  	{
! 	    time_fd = mch_fopen(argv[i + 1], "a");
  	    TIME_MSG("--- VIM STARTING ---");
  	    break;
  	}
***************
*** 1726,1731 ****
--- 1726,1736 ----
  		    want_argument = TRUE;
  		    argv_idx += 3;
  		}
+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ 		{
+ 		    want_argument = TRUE;
+ 		    argv_idx += 11;
+ 		}
  #ifdef FEAT_CLIENTSERVER
  		else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
  		    ; /* already processed -- no arg */
***************
*** 1761,1770 ****
  		    /* already processed, skip */
  		}
  #endif
- 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
- 		{
- 		    /* already processed, skip */
- 		}
  		else
  		{
  		    if (argv[0][argv_idx])
--- 1766,1771 ----
***************
*** 2061,2067 ****
  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
  
  		--argc;
! 		if (argc < 1 && c != 'S')
  		    mainerr_arg_missing((char_u *)argv[0]);
  		++argv;
  		argv_idx = -1;
--- 2062,2068 ----
  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
  
  		--argc;
! 		if (argc < 1 && c != 'S')  /* -S has an optional argument */
  		    mainerr_arg_missing((char_u *)argv[0]);
  		++argv;
  		argv_idx = -1;
***************
*** 2102,2112 ****
  							    (char_u *)argv[0];
  		    break;
  
! 		case '-':	/* "--cmd {command}" execute command */
! 		    if (parmp->n_pre_commands >= MAX_ARG_CMDS)
! 			mainerr(ME_EXTRA_CMD, NULL);
! 		    parmp->pre_commands[parmp->n_pre_commands++] =
  							    (char_u *)argv[0];
  		    break;
  
  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
--- 2103,2118 ----
  							    (char_u *)argv[0];
  		    break;
  
! 		case '-':
! 		    if (argv[-1][2] == 'c')
! 		    {
! 			/* "--cmd {command}" execute command */
! 			if (parmp->n_pre_commands >= MAX_ARG_CMDS)
! 			    mainerr(ME_EXTRA_CMD, NULL);
! 			parmp->pre_commands[parmp->n_pre_commands++] =
  							    (char_u *)argv[0];
+ 		    }
+ 		    /* "--startuptime <file>" already handled */
  		    break;
  
  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
***************
*** 3144,3149 ****
--- 3150,3158 ----
      main_msg(_("--serverlist\t\tList available Vim server names and exit"));
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
+ #ifdef STARTUPTIME
+     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
+ #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
  #endif
*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
--- src/version.c	2009-11-11 14:17:28.000000000 +0100
***************
*** 494,499 ****
--- 494,504 ----
  #else
  	"-sniff",
  #endif
+ #ifdef STARTUPTIME
+ 	"+startuptime",
+ #else
+ 	"-startuptime",
+ #endif
  #ifdef FEAT_STL_OPT
  	"+statusline",
  #else
*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
--- src/version.c	2009-11-11 14:17:28.000000000 +0100
***************
*** 678,679 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     286,
  /**/

-- 
A fool must search for a greater fool to find admiration.

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:36:53 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:36:53 +0000 (UTC)
Subject: rpms/vim/devel 7.2.287,NONE,1.1
Message-ID: <20091202163653.29BFB11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.287 
Log Message:
- patchlevel 287


--- NEW FILE 7.2.287 ---
To: vim-dev at vim.org
Subject: Patch 7.2.287
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.287
Problem:    Warning from gcc 3.4 about uninitialized variable.
Solution:   Move assignment outside of #ifdef.
Files:	    src/if_perl.xs


*** ../vim-7.2.286/src/if_perl.xs	2009-07-14 16:05:14.000000000 +0200
--- src/if_perl.xs	2009-11-11 12:29:32.000000000 +0100
***************
*** 720,727 ****
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
! 	if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
  # endif
--- 720,728 ----
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
+ 	safe = perl_get_sv( "VIM::safe", FALSE );
  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
! 	if (safe == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
  # endif
*** ../vim-7.2.286/src/version.c	2009-11-11 14:21:48.000000000 +0100
--- src/version.c	2009-11-11 14:44:49.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     287,
  /**/

-- 
The most powerful force in the universe is gossip.

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:37:01 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:37:01 +0000 (UTC)
Subject: rpms/vim/devel 7.2.288,NONE,1.1
Message-ID: <20091202163701.0C71D11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.288 
Log Message:
- patchlevel 288


--- NEW FILE 7.2.288 ---
To: vim-dev at vim.org
Subject: Patch 7.2.288
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.288
Problem:    Python 2.6 pyconfig.h redefines macros.
Solution:   Undefine the macros before including pyconfig.h.
Files:      src/if_python.c


*** ../vim-7.2.287/src/if_python.c	2009-11-03 11:43:05.000000000 +0100
--- src/if_python.c	2009-11-11 12:33:37.000000000 +0100
***************
*** 37,42 ****
--- 37,48 ----
  #ifdef HAVE_STDARG_H
  # undef HAVE_STDARG_H	/* Python's config.h defines it as well. */
  #endif
+ #ifdef _POSIX_C_SOURCE
+ # undef _POSIX_C_SOURCE	/* pyconfig.h defines it as well. */
+ #endif
+ #ifdef _XOPEN_SOURCE
+ # undef _XOPEN_SOURCE	/* pyconfig.h defines it as well. */
+ #endif
  
  #define PY_SSIZE_T_CLEAN
  
*** ../vim-7.2.287/src/version.c	2009-11-11 14:45:36.000000000 +0100
--- src/version.c	2009-11-11 15:05:51.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     288,
  /**/

-- 
I am always surprised in the Linux world how quickly solutions can be
obtained.  (Imagine sending an email to Bill Gates, asking why Windows
crashed, and how to fix it...  and then getting an answer that fixed the
problem... <0>_<0> !)		              -- Mark Langdon

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:37:09 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:37:09 +0000 (UTC)
Subject: rpms/vim/devel 7.2.289,NONE,1.1
Message-ID: <20091202163709.0A3B311C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.289 
Log Message:
- patchlevel 289


--- NEW FILE 7.2.289 ---
To: vim-dev at vim.org
Subject: Patch 7.2.289
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.289
Problem:    Checking wrong struct member.
Solution:   Change tb_buf to tb_noremap. (Dominique Pelle)
Files:	    src/getchar.c


*** ../vim-7.2.288/src/getchar.c	2009-09-30 15:15:33.000000000 +0200
--- src/getchar.c	2009-11-11 12:50:58.000000000 +0100
***************
*** 22,28 ****
   * These buffers are used for storing:
   * - stuffed characters: A command that is translated into another command.
   * - redo characters: will redo the last change.
!  * - recorded chracters: for the "q" command.
   *
   * The bytes are stored like in the typeahead buffer:
   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
--- 22,28 ----
   * These buffers are used for storing:
   * - stuffed characters: A command that is translated into another command.
   * - redo characters: will redo the last change.
!  * - recorded characters: for the "q" command.
   *
   * The bytes are stored like in the typeahead buffer:
   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
***************
*** 1283,1289 ****
  	EMSG2(_(e_intern2), "Free typebuf 1");
      else
  	vim_free(typebuf.tb_buf);
!     if (typebuf.tb_buf == noremapbuf_init)
  	EMSG2(_(e_intern2), "Free typebuf 2");
      else
  	vim_free(typebuf.tb_noremap);
--- 1283,1289 ----
  	EMSG2(_(e_intern2), "Free typebuf 1");
      else
  	vim_free(typebuf.tb_buf);
!     if (typebuf.tb_noremap == noremapbuf_init)
  	EMSG2(_(e_intern2), "Free typebuf 2");
      else
  	vim_free(typebuf.tb_noremap);
***************
*** 1516,1522 ****
   * wanted.
   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
   * Collects the bytes of a multibyte character into the whole character.
!  * Returns the modifers in the global "mod_mask".
   */
      int
  vgetc()
--- 1516,1522 ----
   * wanted.
   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
   * Collects the bytes of a multibyte character into the whole character.
!  * Returns the modifiers in the global "mod_mask".
   */
      int
  vgetc()
***************
*** 3320,3326 ****
  			    retval = 1;
  			    goto theend;
  			}
! 	    /* An abbrevation cannot contain white space. */
  	    for (n = 0; n < len; ++n)
  		if (vim_iswhite(keys[n]))
  		{
--- 3320,3326 ----
  			    retval = 1;
  			    goto theend;
  			}
! 	    /* An abbreviation cannot contain white space. */
  	    for (n = 0; n < len; ++n)
  		if (vim_iswhite(keys[n]))
  		{
***************
*** 4272,4278 ****
  
      /*
       * Check for word before the cursor: If it ends in a keyword char all
!      * chars before it must be al keyword chars or non-keyword chars, but not
       * white space. If it ends in a non-keyword char we accept any characters
       * before it except white space.
       */
--- 4272,4278 ----
  
      /*
       * Check for word before the cursor: If it ends in a keyword char all
!      * chars before it must be keyword chars or non-keyword chars, but not
       * white space. If it ends in a non-keyword char we accept any characters
       * before it except white space.
       */
*** ../vim-7.2.288/src/version.c	2009-11-11 15:06:59.000000000 +0100
--- src/version.c	2009-11-11 16:19:12.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     289,
  /**/

-- 
A M00se once bit my sister ...
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:37:17 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:37:17 +0000 (UTC)
Subject: rpms/vim/devel 7.2.290,NONE,1.1
Message-ID: <20091202163717.1673711C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.290 
Log Message:
- patchlevel 290


--- NEW FILE 7.2.290 ---
To: vim-dev at vim.org
Subject: Patch 7.2.290
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.290
Problem:    Not freeing memory from ":lmap", ":xmap" and ":menutranslate".
Solution:   Free the memory when exiting. (Dominique Pelle)
Files:	    src/misc2.c


*** ../vim-7.2.289/src/misc2.c	2009-11-03 16:44:04.000000000 +0100
--- src/misc2.c	2009-11-11 16:49:13.000000000 +0100
***************
*** 1005,1013 ****
--- 1005,1018 ----
  # ifdef FEAT_MENU
      /* Clear menus. */
      do_cmdline_cmd((char_u *)"aunmenu *");
+ #  ifdef FEAT_MULTI_LANG
+     do_cmdline_cmd((char_u *)"menutranslate clear");
+ #  endif
  # endif
  
      /* Clear mappings, abbreviations, breakpoints. */
+     do_cmdline_cmd((char_u *)"lmapclear");
+     do_cmdline_cmd((char_u *)"xmapclear");
      do_cmdline_cmd((char_u *)"mapclear");
      do_cmdline_cmd((char_u *)"mapclear!");
      do_cmdline_cmd((char_u *)"abclear");
***************
*** 1282,1288 ****
  
  /*
   * Escape "string" for use as a shell argument with system().
!  * This uses single quotes, except when we know we need to use double qoutes
   * (MS-DOS and MS-Windows without 'shellslash' set).
   * Escape a newline, depending on the 'shell' option.
   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
--- 1287,1293 ----
  
  /*
   * Escape "string" for use as a shell argument with system().
!  * This uses single quotes, except when we know we need to use double quotes
   * (MS-DOS and MS-Windows without 'shellslash' set).
   * Escape a newline, depending on the 'shell' option.
   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
***************
*** 1537,1543 ****
  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
  /*
   * Copy a character a number of times.
!  * Does not work for multi-byte charactes!
   */
      void
  copy_chars(ptr, count, c)
--- 1542,1548 ----
  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
  /*
   * Copy a character a number of times.
!  * Does not work for multi-byte characters!
   */
      void
  copy_chars(ptr, count, c)
***************
*** 4260,4266 ****
  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
  	 * For EBCDIC you get different character values.
  	 * If no restrict is given after '**' the default is used.
! 	 * Due to this technic the path looks awful if you print it as a
  	 * string.
  	 */
  	len = 0;
--- 4265,4271 ----
  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
  	 * For EBCDIC you get different character values.
  	 * If no restrict is given after '**' the default is used.
! 	 * Due to this technique the path looks awful if you print it as a
  	 * string.
  	 */
  	len = 0;
***************
*** 4649,4655 ****
  				      && !mch_isdir(stackp->ffs_filearray[i]))
  			    continue;   /* not a directory */
  
! 			/* prepare the filename to be checked for existance
  			 * below */
  			STRCPY(file_path, stackp->ffs_filearray[i]);
  			add_pathsep(file_path);
--- 4654,4660 ----
  				      && !mch_isdir(stackp->ffs_filearray[i]))
  			    continue;   /* not a directory */
  
! 			/* prepare the filename to be checked for existence
  			 * below */
  			STRCPY(file_path, stackp->ffs_filearray[i]);
  			add_pathsep(file_path);
***************
*** 5438,5444 ****
  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
  	    /* handle "\tmp" as absolute path */
  	    || vim_ispathsep(ff_file_to_find[0])
! 	    /* handle "c:name" as absulute path */
  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
  #endif
  #ifdef AMIGA
--- 5443,5449 ----
  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
  	    /* handle "\tmp" as absolute path */
  	    || vim_ispathsep(ff_file_to_find[0])
! 	    /* handle "c:name" as absolute path */
  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
  #endif
  #ifdef AMIGA
***************
*** 5681,5687 ****
  		p2 = (char_u *)base + (j + gap) * elm_size;
  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
  		    break;
! 		/* Exchange the elemets. */
  		mch_memmove(buf, p1, elm_size);
  		mch_memmove(p1, p2, elm_size);
  		mch_memmove(p2, buf, elm_size);
--- 5686,5692 ----
  		p2 = (char_u *)base + (j + gap) * elm_size;
  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
  		    break;
! 		/* Exchange the elements. */
  		mch_memmove(buf, p1, elm_size);
  		mch_memmove(p1, p2, elm_size);
  		mch_memmove(p2, buf, elm_size);
*** ../vim-7.2.289/src/version.c	2009-11-11 16:23:37.000000000 +0100
--- src/version.c	2009-11-11 16:54:53.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     290,
  /**/

-- 
ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
        King of all Britons, defeator of the Saxons, sovereign of all England!
   [Pause]
SOLDIER: Get away!
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:37:25 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:37:25 +0000 (UTC)
Subject: rpms/vim/devel 7.2.291,NONE,1.1
Message-ID: <20091202163725.0683E11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.291 
Log Message:
- patchlevel 291


--- NEW FILE 7.2.291 ---
To: vim-dev at vim.org
Subject: Patch 7.2.291
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.291
Problem:    Reading uninitialised memory in arabic mode.
Solution:   Use utfc_ptr2char_len() rather than utfc_ptr2char().  (Dominique
	    Pelle)
Files:	    src/screen.c


*** ../vim-7.2.290/src/screen.c	2009-11-03 17:36:09.000000000 +0100
--- src/screen.c	2009-11-11 17:04:53.000000000 +0100
***************
*** 6413,6419 ****
  		    }
  		    else
  		    {
! 			nc = utfc_ptr2char(ptr + mbyte_blen, pcc);
  			nc1 = pcc[0];
  		    }
  		    pc = prev_c;
--- 6413,6420 ----
  		    }
  		    else
  		    {
! 			nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
! 				      (int)((text + len) - ptr - mbyte_blen));
  			nc1 = pcc[0];
  		    }
  		    pc = prev_c;
*** ../vim-7.2.290/src/version.c	2009-11-11 16:56:13.000000000 +0100
--- src/version.c	2009-11-11 17:06:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     291,
  /**/

-- 
The problem with political jokes is that they get elected.

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:37:32 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:37:32 +0000 (UTC)
Subject: rpms/vim/devel 7.2.292,NONE,1.1
Message-ID: <20091202163732.F30F811C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.292 
Log Message:
- patchlevel 292


--- NEW FILE 7.2.292 ---
To: vim-dev at vim.org
Subject: Patch 7.2.292
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.292
Problem:    Block right-shift doesn't work properly with multi-byte encoding
	    and 'list' set.
Solution:   Add the missing "else". (Lech Lorens)
Files:	    src/ops.c


*** ../vim-7.2.291/src/ops.c	2009-11-03 16:44:04.000000000 +0100
--- src/ops.c	2009-11-11 17:15:04.000000000 +0100
***************
*** 422,429 ****
  #ifdef FEAT_MBYTE
  	    if (has_mbyte)
  		bd.textstart += (*mb_ptr2len)(bd.textstart);
  #endif
! 	    ++bd.textstart;
  	}
  	for ( ; vim_iswhite(*bd.textstart); )
  	{
--- 422,430 ----
  #ifdef FEAT_MBYTE
  	    if (has_mbyte)
  		bd.textstart += (*mb_ptr2len)(bd.textstart);
+ 	    else
  #endif
! 		++bd.textstart;
  	}
  	for ( ; vim_iswhite(*bd.textstart); )
  	{
*** ../vim-7.2.291/src/version.c	2009-11-11 17:07:25.000000000 +0100
--- src/version.c	2009-11-11 17:21:31.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     292,
  /**/

-- 
Computers make very fast, very accurate, mistakes.

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:37:40 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:37:40 +0000 (UTC)
Subject: rpms/vim/devel 7.2.293,NONE,1.1
Message-ID: <20091202163740.90BF911C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.293 
Log Message:
- patchlevel 293


--- NEW FILE 7.2.293 ---
To: vim-dev at vim.org
Subject: Patch 7.2.293
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.293
Problem:    When setting 'comments' option it may be used in a wrong way. 
Solution:   Don't increment after skipping over digets. (Yukihiro Nakadaira)
Files:	    src/misc1.c


*** ../vim-7.2.292/src/misc1.c	2009-11-03 18:46:53.000000000 +0100
--- src/misc1.c	2009-11-11 17:27:38.000000000 +0100
***************
*** 1026,1037 ****
  		    int		c = 0;
  		    int		off = 0;
  
! 		    for (p = lead_flags; *p && *p != ':'; ++p)
  		    {
  			if (*p == COM_RIGHT || *p == COM_LEFT)
! 			    c = *p;
  			else if (VIM_ISDIGIT(*p) || *p == '-')
  			    off = getdigits(&p);
  		    }
  		    if (c == COM_RIGHT)    /* right adjusted leader */
  		    {
--- 1026,1039 ----
  		    int		c = 0;
  		    int		off = 0;
  
! 		    for (p = lead_flags; *p != NUL && *p != ':'; )
  		    {
  			if (*p == COM_RIGHT || *p == COM_LEFT)
! 			    c = *p++;
  			else if (VIM_ISDIGIT(*p) || *p == '-')
  			    off = getdigits(&p);
+ 			else
+ 			    ++p;
  		    }
  		    if (c == COM_RIGHT)    /* right adjusted leader */
  		    {
*** ../vim-7.2.292/src/version.c	2009-11-11 17:22:30.000000000 +0100
--- src/version.c	2009-11-11 17:29:24.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     293,
  /**/

-- 
SOLDIER: What?  Ridden on a horse?
ARTHUR:  Yes!
SOLDIER: You're using coconuts!
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:37:48 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:37:48 +0000 (UTC)
Subject: rpms/vim/devel 7.2.294,NONE,1.1
Message-ID: <20091202163748.0FEAD11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.294 
Log Message:
- patchlevel 294


--- NEW FILE 7.2.294 ---
To: vim-dev at vim.org
Subject: Patch 7.2.294
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.294
Problem:    When using TEMPDIRS dir name could get too long.
Solution:   Overwrite tail instead of appending each time.  Use mkdtemp() when
	    available. (James Vega)
Files:	    src/auto/configure, src/config.h.in, src/configure.in, src/fileio.c


*** ../vim-7.2.293/src/auto/configure	2009-09-11 13:44:33.000000000 +0200
--- src/auto/configure	2009-11-17 12:03:15.000000000 +0100
***************
*** 14019,14027 ****
  
  
  
  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
--- 14019,14028 ----
  
  
  
+ 
  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
*** ../vim-7.2.293/src/config.h.in	2009-05-21 23:25:38.000000000 +0200
--- src/config.h.in	2009-11-11 17:40:21.000000000 +0100
***************
*** 157,162 ****
--- 157,163 ----
  #undef HAVE_LSTAT
  #undef HAVE_MEMCMP
  #undef HAVE_MEMSET
+ #undef HAVE_MKDTEMP
  #undef HAVE_NANOSLEEP
  #undef HAVE_OPENDIR
  #undef HAVE_FLOAT_FUNCS
*** ../vim-7.2.293/src/configure.in	2009-09-11 13:44:33.000000000 +0200
--- src/configure.in	2009-11-11 17:40:21.000000000 +0100
***************
*** 2635,2641 ****
  dnl Check for functions in one big call, to reduce the size of configure
  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
--- 2635,2641 ----
  dnl Check for functions in one big call, to reduce the size of configure
  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
*** ../vim-7.2.293/src/fileio.c	2009-09-11 17:24:01.000000000 +0200
--- src/fileio.c	2009-11-11 18:01:22.000000000 +0100
***************
*** 146,151 ****
--- 146,152 ----
  # endif
  #endif
  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+ static void vim_settempdir __ARGS((char_u *tempdir));
  #ifdef FEAT_AUTOCMD
  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
  #endif
***************
*** 6987,6992 ****
--- 6988,7020 ----
  #endif
  
  /*
+  * Directory "tempdir" was created.  Expand this name to a full path and put
+  * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
+  * "tempdir" must be no longer than MAXPATHL.
+  */
+     static void
+ vim_settempdir(tempdir)
+     char_u	*tempdir;
+ {
+     char_u	*buf;
+ 
+     buf = alloc((unsigned)MAXPATHL + 2);
+     if (buf != NULL)
+     {
+ 	if (vim_FullName(tempdir, buf, MAXPATHL, FALSE) == FAIL)
+ 	    STRCPY(buf, tempdir);
+ # ifdef __EMX__
+ 	if (vim_strchr(buf, '/') != NULL)
+ 	    STRCAT(buf, "/");
+ 	else
+ # endif
+ 	    add_pathsep(buf);
+ 	vim_tempdir = vim_strsave(buf);
+ 	vim_free(buf);
+     }
+ }
+ 
+ /*
   * vim_tempname(): Return a unique name that can be used for a temp file.
   *
   * The temp file is NOT created.
***************
*** 7007,7014 ****
  #ifdef TEMPDIRNAMES
      static char	*(tempdirs[]) = {TEMPDIRNAMES};
      int		i;
-     long	nr;
-     long	off;
  # ifndef EEXIST
      struct stat	st;
  # endif
--- 7035,7040 ----
***************
*** 7027,7032 ****
--- 7053,7064 ----
  	 */
  	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
  	{
+ 	    size_t	itmplen;
+ # ifndef HAVE_MKDTEMP
+ 	    long	nr;
+ 	    long	off;
+ # endif
+ 
  	    /* expand $TMP, leave room for "/v1100000/999999999" */
  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
  	    if (mch_isdir(itmp))		/* directory exists */
***************
*** 7040,7046 ****
--- 7072,7085 ----
  		else
  # endif
  		    add_pathsep(itmp);
+ 		itmplen = STRLEN(itmp);
  
+ # ifdef HAVE_MKDTEMP
+ 		/* Leave room for filename */
+ 		STRCAT(itmp, "vXXXXXX");
+ 		if (mkdtemp((char *)itmp) != NULL)
+ 		    vim_settempdir(itmp);
+ # else
  		/* Get an arbitrary number of up to 6 digits.  When it's
  		 * unlikely that it already exists it will be faster,
  		 * otherwise it doesn't matter.  The use of mkdir() avoids any
***************
*** 7052,7110 ****
  		for (off = 0; off < 10000L; ++off)
  		{
  		    int		r;
! #if defined(UNIX) || defined(VMS)
  		    mode_t	umask_save;
! #endif
  
! 		    sprintf((char *)itmp + STRLEN(itmp), "v%ld", nr + off);
! # ifndef EEXIST
  		    /* If mkdir() does not set errno to EEXIST, check for
  		     * existing file here.  There is a race condition then,
  		     * although it's fail-safe. */
  		    if (mch_stat((char *)itmp, &st) >= 0)
  			continue;
! # endif
! #if defined(UNIX) || defined(VMS)
  		    /* Make sure the umask doesn't remove the executable bit.
  		     * "repl" has been reported to use "177". */
  		    umask_save = umask(077);
! #endif
  		    r = vim_mkdir(itmp, 0700);
! #if defined(UNIX) || defined(VMS)
  		    (void)umask(umask_save);
! #endif
  		    if (r == 0)
  		    {
! 			char_u	*buf;
! 
! 			/* Directory was created, use this name.
! 			 * Expand to full path; When using the current
! 			 * directory a ":cd" would confuse us. */
! 			buf = alloc((unsigned)MAXPATHL + 1);
! 			if (buf != NULL)
! 			{
! 			    if (vim_FullName(itmp, buf, MAXPATHL, FALSE)
! 								      == FAIL)
! 				STRCPY(buf, itmp);
! # ifdef __EMX__
! 			    if (vim_strchr(buf, '/') != NULL)
! 				STRCAT(buf, "/");
! 			    else
! # endif
! 				add_pathsep(buf);
! 			    vim_tempdir = vim_strsave(buf);
! 			    vim_free(buf);
! 			}
  			break;
  		    }
! # ifdef EEXIST
  		    /* If the mkdir() didn't fail because the file/dir exists,
  		     * we probably can't create any dir here, try another
  		     * place. */
  		    if (errno != EEXIST)
! # endif
  			break;
  		}
  		if (vim_tempdir != NULL)
  		    break;
  	    }
--- 7091,7131 ----
  		for (off = 0; off < 10000L; ++off)
  		{
  		    int		r;
! #  if defined(UNIX) || defined(VMS)
  		    mode_t	umask_save;
! #  endif
  
! 		    sprintf((char *)itmp + itmplen, "v%ld", nr + off);
! #  ifndef EEXIST
  		    /* If mkdir() does not set errno to EEXIST, check for
  		     * existing file here.  There is a race condition then,
  		     * although it's fail-safe. */
  		    if (mch_stat((char *)itmp, &st) >= 0)
  			continue;
! #  endif
! #  if defined(UNIX) || defined(VMS)
  		    /* Make sure the umask doesn't remove the executable bit.
  		     * "repl" has been reported to use "177". */
  		    umask_save = umask(077);
! #  endif
  		    r = vim_mkdir(itmp, 0700);
! #  if defined(UNIX) || defined(VMS)
  		    (void)umask(umask_save);
! #  endif
  		    if (r == 0)
  		    {
! 			vim_settempdir(itmp);
  			break;
  		    }
! #  ifdef EEXIST
  		    /* If the mkdir() didn't fail because the file/dir exists,
  		     * we probably can't create any dir here, try another
  		     * place. */
  		    if (errno != EEXIST)
! #  endif
  			break;
  		}
+ # endif /* HAVE_MKDTEMP */
  		if (vim_tempdir != NULL)
  		    break;
  	    }
*** ../vim-7.2.293/src/version.c	2009-11-11 17:30:05.000000000 +0100
--- src/version.c	2009-11-17 11:54:49.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     294,
  /**/

-- 
ARTHUR:       Now stand aside worthy adversary.
BLACK KNIGHT: (Glancing at his shoulder) 'Tis but a scratch.
ARTHUR:       A scratch?  Your arm's off.
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:37:55 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:37:55 +0000 (UTC)
Subject: rpms/vim/devel 7.2.295,NONE,1.1
Message-ID: <20091202163755.B353B11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.295 
Log Message:
- patchlevel 295


--- NEW FILE 7.2.295 ---
To: vim-dev at vim.org
Subject: Patch 7.2.295
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.295
Problem:    When using map() on a List the index is not known.
Solution:   Set v:key to the  index. (Hari Krishna Dara)
Files:	    runtime/doc/eval.txt, src/eval.c


*** ../vim-7.2.294/runtime/doc/eval.txt	2009-11-11 14:21:48.000000000 +0100
--- runtime/doc/eval.txt	2009-11-11 18:22:54.000000000 +0100
***************
*** 3802,3808 ****
  		Replace each item in {expr} with the result of evaluating
  		{string}.
  		Inside {string} |v:val| has the value of the current item.
! 		For a |Dictionary| |v:key| has the key of the current item.
  		Example: >
  			:call map(mylist, '"> " . v:val . " <"')
  <		This puts "> " before and " <" after each item in "mylist".
--- 3812,3819 ----
  		Replace each item in {expr} with the result of evaluating
  		{string}.
  		Inside {string} |v:val| has the value of the current item.
! 		For a |Dictionary| |v:key| has the key of the current item
! 		and for a |List| |v:key| has the index of the current item.
  		Example: >
  			:call map(mylist, '"> " . v:val . " <"')
  <		This puts "> " before and " <" after each item in "mylist".
*** ../vim-7.2.294/src/eval.c	2009-11-11 14:21:48.000000000 +0100
--- src/eval.c	2009-11-11 18:22:49.000000000 +0100
***************
*** 9928,9933 ****
--- 9928,9934 ----
      int		todo;
      char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
      int		save_did_emsg;
+     int		index = 0;
  
      if (argvars[0].v_type == VAR_LIST)
      {
***************
*** 9961,9969 ****
  	save_did_emsg = did_emsg;
  	did_emsg = FALSE;
  
  	if (argvars[0].v_type == VAR_DICT)
  	{
- 	    prepare_vimvar(VV_KEY, &save_key);
  	    vimvars[VV_KEY].vv_type = VAR_STRING;
  
  	    ht = &d->dv_hashtab;
--- 9962,9970 ----
  	save_did_emsg = did_emsg;
  	did_emsg = FALSE;
  
+ 	prepare_vimvar(VV_KEY, &save_key);
  	if (argvars[0].v_type == VAR_DICT)
  	{
  	    vimvars[VV_KEY].vv_type = VAR_STRING;
  
  	    ht = &d->dv_hashtab;
***************
*** 9987,10010 ****
  		}
  	    }
  	    hash_unlock(ht);
- 
- 	    restore_vimvar(VV_KEY, &save_key);
  	}
  	else
  	{
  	    for (li = l->lv_first; li != NULL; li = nli)
  	    {
  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
  		    break;
  		nli = li->li_next;
  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
  								  || did_emsg)
  		    break;
  		if (!map && rem)
  		    listitem_remove(l, li);
  	    }
  	}
  
  	restore_vimvar(VV_VAL, &save_val);
  
  	did_emsg |= save_did_emsg;
--- 9988,10014 ----
  		}
  	    }
  	    hash_unlock(ht);
  	}
  	else
  	{
+ 	    vimvars[VV_KEY].vv_type = VAR_NUMBER;
+ 
  	    for (li = l->lv_first; li != NULL; li = nli)
  	    {
  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
  		    break;
  		nli = li->li_next;
+ 		vimvars[VV_KEY].vv_nr = index;
  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
  								  || did_emsg)
  		    break;
  		if (!map && rem)
  		    listitem_remove(l, li);
+ 		++index;
  	    }
  	}
  
+ 	restore_vimvar(VV_KEY, &save_key);
  	restore_vimvar(VV_VAL, &save_val);
  
  	did_emsg |= save_did_emsg;
*** ../vim-7.2.294/src/version.c	2009-11-17 12:08:48.000000000 +0100
--- src/version.c	2009-11-17 12:18:08.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     295,
  /**/

-- 
ARTHUR:       You are indeed brave Sir knight, but the fight is mine.
BLACK KNIGHT: Had enough?
ARTHUR:       You stupid bastard.  You havn't got any arms left.
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:38:03 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:38:03 +0000 (UTC)
Subject: rpms/vim/devel 7.2.296,NONE,1.1
Message-ID: <20091202163803.DDFD111C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.296 
Log Message:
- patchlevel 296


--- NEW FILE 7.2.296 ---
To: vim-dev at vim.org
Subject: Patch 7.2.296
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.296
Problem:    Help message about startuptime is wrong. (Dominique Pelle)
Solution:   Remove the equal sign.
Files:	    src/main.c


*** ../vim-7.2.295/src/main.c	2009-11-11 14:21:48.000000000 +0100
--- src/main.c	2009-11-11 22:51:04.000000000 +0100
***************
*** 3151,3157 ****
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
  #ifdef STARTUPTIME
!     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
  #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
--- 3151,3157 ----
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
  #ifdef STARTUPTIME
!     main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>"));
  #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
*** ../vim-7.2.295/src/version.c	2009-11-17 12:20:30.000000000 +0100
--- src/version.c	2009-11-17 12:30:29.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     296,
  /**/

-- 
BLACK KNIGHT: I'm invincible!
ARTHUR:       You're a looney.
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:38:11 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:38:11 +0000 (UTC)
Subject: rpms/vim/devel 7.2.297,NONE,1.1
Message-ID: <20091202163811.EE51911C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.297 
Log Message:
- patchlevel 297


--- NEW FILE 7.2.297 ---
To: vim-dev at vim.org
Subject: Patch 7.2.297
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.297
Problem:    Reading freed memory when writing ":reg" output to a register.
	    (Dominique Pelle)
Solution:   Skip the register being written to.
Files:	    src/ops.c


*** ../vim-7.2.296/src/ops.c	2009-11-11 17:22:30.000000000 +0100
--- src/ops.c	2009-11-11 19:30:47.000000000 +0100
***************
*** 3991,3996 ****
--- 3991,4004 ----
  	}
  	else
  	    yb = &(y_regs[i]);
+ 
+ #ifdef FEAT_EVAL
+ 	if (name == MB_TOLOWER(redir_reg)
+ 		|| (redir_reg == '"' && yb == y_previous))
+ 	    continue;	    /* do not list register being written to, the
+ 			     * pointer can be freed */
+ #endif
+ 
  	if (yb->y_array != NULL)
  	{
  	    msg_putchar('\n');
***************
*** 6090,6096 ****
      long	maxlen;
  #endif
  
!     if (y_ptr->y_array == NULL)		/* NULL means emtpy register */
  	y_ptr->y_size = 0;
  
      /*
--- 6098,6104 ----
      long	maxlen;
  #endif
  
!     if (y_ptr->y_array == NULL)		/* NULL means empty register */
  	y_ptr->y_size = 0;
  
      /*
*** ../vim-7.2.296/src/version.c	2009-11-17 12:31:30.000000000 +0100
--- src/version.c	2009-11-17 12:42:28.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     297,
  /**/

-- 
"Beware of bugs in the above code; I have only proved
it correct, not tried it." -- Donald Knuth

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:38:19 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:38:19 +0000 (UTC)
Subject: rpms/vim/devel 7.2.298,NONE,1.1
Message-ID: <20091202163819.F08E911C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.298 
Log Message:
- patchlevel 298


--- NEW FILE 7.2.298 ---
To: vim-dev at vim.org
Subject: Patch 7.2.298
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.298
Problem:    ":vimgrep" crashes when there is an autocommand that sets a
	    window-local variable.
Solution:   Initialize the w: hashtab for re-use. (Yukihiro Nakadaira)
Files:	    src/fileio.c


*** ../vim-7.2.297/src/fileio.c	2009-11-17 12:08:48.000000000 +0100
--- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
***************
*** 8597,8602 ****
--- 8605,8611 ----
  	    curwin = firstwin;
  # ifdef FEAT_EVAL
  	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
+ 	hash_init(&aucmd_win->w_vars.dv_hashtab);   /* re-use the hashtab */
  # endif
  #else
  	curwin = aco->save_curwin;
*** ../vim-7.2.297/src/version.c	2009-11-17 12:43:19.000000000 +0100
--- src/version.c	2009-11-17 14:56:19.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     298,
  /**/

-- 
Eye have a spelling checker, it came with my PC;
It plainly marks four my revue mistakes I cannot sea.
I've run this poem threw it, I'm sure your please to no,
It's letter perfect in it's weigh, my checker tolled me sew!

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:38:28 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:38:28 +0000 (UTC)
Subject: rpms/vim/devel 7.2.299,NONE,1.1
Message-ID: <20091202163828.04E3111C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.299 
Log Message:
- patchlevel 299


--- NEW FILE 7.2.299 ---
To: vim-dev at vim.org
Subject: Patch 7.2.299
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.299
Problem:    Crash when comment middle is longer than start.
Solution:   Fix size computation. (Lech Lorens)
Files:	    src/misc1.c


*** ../vim-7.2.298/src/misc1.c	2009-11-11 17:30:05.000000000 +0100
--- src/misc1.c	2009-11-17 15:59:28.000000000 +0100
***************
*** 1121,1127 ****
  			    if (i != lead_repl_len)
  			    {
  				mch_memmove(p + lead_repl_len, p + i,
! 				       (size_t)(lead_len - i - (leader - p)));
  				lead_len += lead_repl_len - i;
  			    }
  			}
--- 1121,1127 ----
  			    if (i != lead_repl_len)
  			    {
  				mch_memmove(p + lead_repl_len, p + i,
! 				       (size_t)(lead_len - i - (p - leader)));
  				lead_len += lead_repl_len - i;
  			    }
  			}
*** ../vim-7.2.298/src/version.c	2009-11-17 14:57:19.000000000 +0100
--- src/version.c	2009-11-17 16:01:07.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     299,
  /**/

-- 
BLACK KNIGHT: The Black Knight always triumphs. Have at you!
   ARTHUR takes his last leg off.  The BLACK KNIGHT's body lands upright.
BLACK KNIGHT: All right, we'll call it a draw.
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:38:36 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:38:36 +0000 (UTC)
Subject: rpms/vim/devel 7.2.300,NONE,1.1
Message-ID: <20091202163836.0439811C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.300 
Log Message:
- patchlevel 300


--- NEW FILE 7.2.300 ---
To: vim-dev at vim.org
Subject: Patch 7.2.300
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.300
Problem:    Vim doesn't close file descriptors when forking and executing
	    another command, e.g., ":shell".
Solution:   Use FD_CLOEXEC when available. (James Vega)
Files:	    src/auto/configure, src/config.h.in, src/configure.in,
	    src/ex_cmdds2.c, src/fileio.c, src/memfile.c, src/memline.c


*** ../vim-7.2.299/src/auto/configure	2009-11-17 12:08:48.000000000 +0100
--- src/auto/configure	2009-11-17 13:09:03.000000000 +0100
***************
*** 15174,15179 ****
--- 15174,15231 ----
  $as_echo "yes" >&6; }
  fi
  
+ { $as_echo "$as_me:$LINENO: checking for FD_CLOEXEC" >&5
+ $as_echo_n "checking for FD_CLOEXEC... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+ int
+ main ()
+ {
+ 	int flag = FD_CLOEXEC;
+   ;
+   return 0;
+ }
+ _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$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
+   $as_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
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FD_CLOEXEC 1
+ _ACEOF
+ 
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	{ $as_echo "$as_me:$LINENO: result: not usable" >&5
+ $as_echo "not usable" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  { $as_echo "$as_me:$LINENO: checking for rename" >&5
  $as_echo_n "checking for rename... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
*** ../vim-7.2.299/src/config.h.in	2009-11-17 12:08:48.000000000 +0100
--- src/config.h.in	2009-11-17 13:01:36.000000000 +0100
***************
*** 388,390 ****
--- 388,393 ----
  
  /* Define if you want XSMP interaction as well as vanilla swapfile safety */
  #undef USE_XSMP_INTERACT
+ 
+ /* Define if fcntl()'s F_SETFD command knows about FD_CLOEXEC */
+ #undef HAVE_FD_CLOEXEC
*** ../vim-7.2.299/src/configure.in	2009-11-17 12:08:48.000000000 +0100
--- src/configure.in	2009-11-17 13:01:36.000000000 +0100
***************
*** 2855,2860 ****
--- 2855,2870 ----
    AC_MSG_RESULT(yes)
  fi
  
+ dnl make sure the FD_CLOEXEC flag for fcntl()'s F_SETFD command is known
+ AC_MSG_CHECKING(for FD_CLOEXEC)
+ AC_TRY_COMPILE(
+ [#if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif],
+ [	int flag = FD_CLOEXEC;],
+ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FD_CLOEXEC),
+ 	AC_MSG_RESULT(not usable))
+ 
  dnl rename needs to be checked separately to work on Nextstep with cc
  AC_MSG_CHECKING(for rename)
  AC_TRY_LINK([#include <stdio.h>], [rename("this", "that")],
*** ../vim-7.2.299/src/fileio.c	2009-11-17 14:57:19.000000000 +0100
--- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
***************
*** 2254,2259 ****
--- 2254,2267 ----
  
      if (!read_buffer && !read_stdin)
  	close(fd);				/* errors are ignored */
+ #ifdef HAVE_FD_CLOEXEC
+     else
+     {
+ 	int fdflags = fcntl(fd, F_GETFD);
+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 	    fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
+     }
+ #endif
      vim_free(buffer);
  
  #ifdef HAVE_DUP
*** ../vim-7.2.299/src/memfile.c	2008-07-13 19:39:39.000000000 +0200
--- src/memfile.c	2009-11-17 13:22:15.000000000 +0100
***************
*** 1343,1348 ****
--- 1343,1353 ----
      }
      else
      {
+ #ifdef HAVE_FD_CLOEXEC
+ 	int fdflags = fcntl(mfp->mf_fd, F_GETFD);
+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 	    fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ #endif
  #ifdef HAVE_SELINUX
  	mch_copy_sec(fname, mfp->mf_fname);
  #endif
*** ../vim-7.2.299/src/memline.c	2009-11-03 15:32:58.000000000 +0100
--- src/memline.c	2009-11-17 13:21:40.000000000 +0100
***************
*** 382,388 ****
      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
      dp->db_free -= 1 + INDEX_SIZE;
      dp->db_line_count = 1;
!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* emtpy line */
  
      return OK;
  
--- 382,388 ----
      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
      dp->db_free -= 1 + INDEX_SIZE;
      dp->db_line_count = 1;
!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* empty line */
  
      return OK;
  
***************
*** 490,495 ****
--- 490,502 ----
  	    EMSG(_("E301: Oops, lost the swap file!!!"));
  	    return;
  	}
+ #ifdef HAVE_FD_CLOEXEC
+ 	{
+ 	    int fdflags = fcntl(mfp->mf_fd, F_GETFD);
+ 	    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 		fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ 	}
+ #endif
      }
      if (!success)
  	EMSG(_("E302: Could not rename swap file"));
*** ../vim-7.2.299/src/version.c	2009-11-17 16:08:12.000000000 +0100
--- src/version.c	2009-11-17 17:09:43.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     300,
  /**/

-- 
            |

Ceci n'est pas une pipe.

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:38:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:38:43 +0000 (UTC)
Subject: rpms/vim/devel 7.2.301,NONE,1.1
Message-ID: <20091202163843.C86DD11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.301 
Log Message:
- patchlevel 301


--- NEW FILE 7.2.301 ---
To: vim-dev at vim.org
Subject: Patch 7.2.301
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

NOTE: some mail and patch programs may have a problem with the non-ASCII
characters in this patch.  You can fetch the patch from
ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301  and/or fetch the updated
files from CVS.  http://www.vim.org/cvs.php


Patch 7.2.301
Problem:    Formatting is wrong when 'tw' is set to a small value.
Solution:   Fix it and add tests.  Also fix behavior of "1" in 'fo'. (Yukihiro
	    Nakadaira)
Files:	    src/edit.c, src/testdir/Makefile, src/testdir/test68.in,
	    src/testdir/test68.ok, src/testdir/test69.in,
	    src/testdir/test69.ok


*** ../vim-7.2.300/src/edit.c	2009-11-11 13:22:32.000000000 +0100
--- src/edit.c	2009-11-17 15:34:47.000000000 +0100
***************
*** 181,187 ****
  static void ins_ctrl_v __ARGS((void));
  static void undisplay_dollar __ARGS((void));
  static void insert_special __ARGS((int, int, int));
! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only));
  static void check_auto_format __ARGS((int));
  static void redo_literal __ARGS((int c));
  static void start_arrow __ARGS((pos_T *end_insert_pos));
--- 181,187 ----
  static void ins_ctrl_v __ARGS((void));
  static void undisplay_dollar __ARGS((void));
  static void insert_special __ARGS((int, int, int));
! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only, int c));
  static void check_auto_format __ARGS((int));
  static void redo_literal __ARGS((int c));
  static void start_arrow __ARGS((pos_T *end_insert_pos));
***************
*** 2164,2170 ****
      int		i, c;
      int		actual_len;		/* Take multi-byte characters */
      int		actual_compl_length;	/* into account. */
!     int		*wca;		        /* Wide character array. */
      int		has_lower = FALSE;
      int		was_letter = FALSE;
  
--- 2164,2170 ----
      int		i, c;
      int		actual_len;		/* Take multi-byte characters */
      int		actual_compl_length;	/* into account. */
!     int		*wca;			/* Wide character array. */
      int		has_lower = FALSE;
      int		was_letter = FALSE;
  
***************
*** 5558,5564 ****
  	}
  	if (do_internal)
  #endif
! 	    internal_format(textwidth, second_indent, flags, c == NUL);
      }
  
      if (c == NUL)	    /* only formatting was wanted */
--- 5558,5564 ----
  	}
  	if (do_internal)
  #endif
! 	    internal_format(textwidth, second_indent, flags, c == NUL, c);
      }
  
      if (c == NUL)	    /* only formatting was wanted */
***************
*** 5738,5748 ****
   * Format text at the current insert position.
   */
      static void
! internal_format(textwidth, second_indent, flags, format_only)
      int		textwidth;
      int		second_indent;
      int		flags;
      int		format_only;
  {
      int		cc;
      int		save_char = NUL;
--- 5738,5749 ----
   * Format text at the current insert position.
   */
      static void
! internal_format(textwidth, second_indent, flags, format_only, c)
      int		textwidth;
      int		second_indent;
      int		flags;
      int		format_only;
+     int		c; /* character to be inserted (can be NUL) */
  {
      int		cc;
      int		save_char = NUL;
***************
*** 5763,5769 ****
       * When 'ai' is off we don't want a space under the cursor to be
       * deleted.  Replace it with an 'x' temporarily.
       */
!     if (!curbuf->b_p_ai)
      {
  	cc = gchar_cursor();
  	if (vim_iswhite(cc))
--- 5764,5774 ----
       * When 'ai' is off we don't want a space under the cursor to be
       * deleted.  Replace it with an 'x' temporarily.
       */
!     if (!curbuf->b_p_ai
! #ifdef FEAT_VREPLACE
! 	    && !(State & VREPLACE_FLAG)
! #endif
! 	    )
      {
  	cc = gchar_cursor();
  	if (vim_iswhite(cc))
***************
*** 5789,5797 ****
  	char_u	*saved_text = NULL;
  #endif
  	colnr_T	col;
  
! 	virtcol = get_nolist_virtcol();
! 	if (virtcol < (colnr_T)textwidth)
  	    break;
  
  #ifdef FEAT_COMMENTS
--- 5794,5804 ----
  	char_u	*saved_text = NULL;
  #endif
  	colnr_T	col;
+ 	colnr_T	end_col;
  
! 	virtcol = get_nolist_virtcol()
! 		+ char2cells(c != NUL ? c : gchar_cursor());
! 	if (virtcol <= (colnr_T)textwidth)
  	    break;
  
  #ifdef FEAT_COMMENTS
***************
*** 5831,5842 ****
  	coladvance((colnr_T)textwidth);
  	wantcol = curwin->w_cursor.col;
  
! 	curwin->w_cursor.col = startcol - 1;
! #ifdef FEAT_MBYTE
! 	/* Correct cursor for multi-byte character. */
! 	if (has_mbyte)
! 	    mb_adjust_cursor();
! #endif
  	foundcol = 0;
  
  	/*
--- 5838,5844 ----
  	coladvance((colnr_T)textwidth);
  	wantcol = curwin->w_cursor.col;
  
! 	curwin->w_cursor.col = startcol;
  	foundcol = 0;
  
  	/*
***************
*** 5847,5857 ****
  		    || curwin->w_cursor.lnum != Insstart.lnum
  		    || curwin->w_cursor.col >= Insstart.col)
  	{
! 	    cc = gchar_cursor();
  	    if (WHITECHAR(cc))
  	    {
  		/* remember position of blank just before text */
! 		end_foundcol = curwin->w_cursor.col;
  
  		/* find start of sequence of blanks */
  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
--- 5849,5862 ----
  		    || curwin->w_cursor.lnum != Insstart.lnum
  		    || curwin->w_cursor.col >= Insstart.col)
  	{
! 	    if (curwin->w_cursor.col == startcol && c != NUL)
! 		cc = c;
! 	    else
! 		cc = gchar_cursor();
  	    if (WHITECHAR(cc))
  	    {
  		/* remember position of blank just before text */
! 		end_col = curwin->w_cursor.col;
  
  		/* find start of sequence of blanks */
  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
***************
*** 5871,5877 ****
  		    /* do not break after one-letter words */
  		    if (curwin->w_cursor.col == 0)
  			break;	/* one-letter word at begin */
! 
  		    col = curwin->w_cursor.col;
  		    dec_cursor();
  		    cc = gchar_cursor();
--- 5876,5886 ----
  		    /* do not break after one-letter words */
  		    if (curwin->w_cursor.col == 0)
  			break;	/* one-letter word at begin */
! #ifdef FEAT_COMMENTS
! 		    /* do not break "#a b" when 'tw' is 2 */
! 		    if (curwin->w_cursor.col <= leader_len)
! 			break;
! #endif
  		    col = curwin->w_cursor.col;
  		    dec_cursor();
  		    cc = gchar_cursor();
***************
*** 5880,5905 ****
  			continue;	/* one-letter, continue */
  		    curwin->w_cursor.col = col;
  		}
! #ifdef FEAT_MBYTE
! 		if (has_mbyte)
! 		    foundcol = curwin->w_cursor.col
! 					 + (*mb_ptr2len)(ml_get_cursor());
! 		else
! #endif
! 		    foundcol = curwin->w_cursor.col + 1;
! 		if (curwin->w_cursor.col < (colnr_T)wantcol)
  		    break;
  	    }
  #ifdef FEAT_MBYTE
! 	    else if (cc >= 0x100 && fo_multibyte
! 			      && curwin->w_cursor.col <= (colnr_T)wantcol)
  	    {
  		/* Break after or before a multi-byte character. */
  		foundcol = curwin->w_cursor.col;
- 		if (curwin->w_cursor.col < (colnr_T)wantcol)
- 		    foundcol += (*mb_char2len)(cc);
  		end_foundcol = foundcol;
! 		break;
  	    }
  #endif
  	    if (curwin->w_cursor.col == 0)
--- 5889,5948 ----
  			continue;	/* one-letter, continue */
  		    curwin->w_cursor.col = col;
  		}
! 
! 		inc_cursor();
! 
! 		end_foundcol = end_col + 1;
! 		foundcol = curwin->w_cursor.col;
! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
  		    break;
  	    }
  #ifdef FEAT_MBYTE
! 	    else if (cc >= 0x100 && fo_multibyte)
  	    {
  		/* Break after or before a multi-byte character. */
+ 		if (curwin->w_cursor.col != startcol)
+ 		{
+ #ifdef FEAT_COMMENTS
+ 		    /* Don't break until after the comment leader */
+ 		    if (curwin->w_cursor.col < leader_len)
+ 			break;
+ #endif
+ 		    col = curwin->w_cursor.col;
+ 		    inc_cursor();
+ 		    /* Don't change end_foundcol if already set. */
+ 		    if (foundcol != curwin->w_cursor.col)
+ 		    {
+ 			foundcol = curwin->w_cursor.col;
+ 			end_foundcol = foundcol;
+ 			if (curwin->w_cursor.col <= (colnr_T)wantcol)
+ 			    break;
+ 		    }
+ 		    curwin->w_cursor.col = col;
+ 		}
+ 
+ 		if (curwin->w_cursor.col == 0)
+ 		    break;
+ 
+ 		col = curwin->w_cursor.col;
+ 
+ 		dec_cursor();
+ 		cc = gchar_cursor();
+ 
+ 		if (WHITECHAR(cc))
+ 		    continue;		/* break with space */
+ #ifdef FEAT_COMMENTS
+ 		/* Don't break until after the comment leader */
+ 		if (curwin->w_cursor.col < leader_len)
+ 		    break;
+ #endif
+ 
+ 		curwin->w_cursor.col = col;
+ 
  		foundcol = curwin->w_cursor.col;
  		end_foundcol = foundcol;
! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
! 		    break;
  	    }
  #endif
  	    if (curwin->w_cursor.col == 0)
***************
*** 5926,5939 ****
  	    orig_col = startcol;	/* Will start backspacing from here */
  	else
  #endif
! 	    replace_offset = startcol - end_foundcol - 1;
  
  	/*
  	 * adjust startcol for spaces that will be deleted and
  	 * characters that will remain on top line
  	 */
  	curwin->w_cursor.col = foundcol;
! 	while (cc = gchar_cursor(), WHITECHAR(cc))
  	    inc_cursor();
  	startcol -= curwin->w_cursor.col;
  	if (startcol < 0)
--- 5969,5983 ----
  	    orig_col = startcol;	/* Will start backspacing from here */
  	else
  #endif
! 	    replace_offset = startcol - end_foundcol;
  
  	/*
  	 * adjust startcol for spaces that will be deleted and
  	 * characters that will remain on top line
  	 */
  	curwin->w_cursor.col = foundcol;
! 	while ((cc = gchar_cursor(), WHITECHAR(cc))
! 		    && (!fo_white_par || curwin->w_cursor.col < startcol))
  	    inc_cursor();
  	startcol -= curwin->w_cursor.col;
  	if (startcol < 0)
***************
*** 8509,8515 ****
  	if (mode == BACKSPACE_LINE
  		&& (curbuf->b_p_ai
  #ifdef FEAT_CINDENT
!                     || cindent_on()
  #endif
  		   )
  #ifdef FEAT_RIGHTLEFT
--- 8553,8559 ----
  	if (mode == BACKSPACE_LINE
  		&& (curbuf->b_p_ai
  #ifdef FEAT_CINDENT
! 		    || cindent_on()
  #endif
  		   )
  #ifdef FEAT_RIGHTLEFT
*** ../vim-7.2.300/src/testdir/Makefile	2009-11-17 17:36:13.000000000 +0100
--- src/testdir/Makefile	2009-11-17 15:11:26.000000000 +0100
***************
*** 22,28 ****
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out
  
  SCRIPTS_GUI = test16.out
  
--- 22,29 ----
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out test68.out \
! 		test69.out
  
  SCRIPTS_GUI = test16.out
  
*** ../vim-7.2.300/src/testdir/test68.in	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test68.in	2009-11-17 15:39:09.000000000 +0100
***************
*** 0 ****
--- 1,56 ----
+ Test for text formatting.
+ 
+ Results of test68:
+ 
+ STARTTEST
+ :so small.vim
+ /^{/+1
+ :set noai tw=2 fo=t
+ gRa b
+ ENDTEST
+ 
+ {
+     
+ 
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set ai tw=2 fo=tw
+ gqgqjjllab
+ ENDTEST
+ 
+ {
+ a  b  
+ 
+ a    
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=3 fo=t
+ gqgqo
+ a 

+ ENDTEST
+ 
+ {
+ a 

+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tcq1 comments=:#
+ gqgqjgqgqo
+ a b
+ #a b
+ ENDTEST
+ 
+ {
+ a b
+ #a b
+ }
+ 
+ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
*** ../vim-7.2.300/src/testdir/test68.ok	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test68.ok	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,35 ----
+ Results of test68:
+ 
+ 
+ {
+ a
+ b
+ }
+ 
+ 
+ {
+ a  
+ b  
+ 
+ a  
+ b
+ }
+ 
+ 
+ {
+ a
+ 

+ 
+ a
+ 

+ }
+ 
+ 
+ {
+ a b
+ #a b
+ 
+ a b
+ #a b
+ }
+ 
*** ../vim-7.2.300/src/testdir/test69.in	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test69.in	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,139 ----
+ Test for multi-byte text formatting.
+ 
+ STARTTEST
+ :so mbyte.vim
+ :set encoding=utf-8
+ ENDTEST
+ 
+ Results of test69:
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=t
+ gqgqjgqgqo
+ ???
+ abc ???
+ ENDTEST
+ 
+ {
+ ???
+ abc ???
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=1 fo=tm
+ gqgqjgqgqjgqgqjgqgqjgqgqo
+ ?
+ ?a
+ ? a
+ ??
+ ? ?
+ ENDTEST
+ 
+ {
+ ?
+ ?a
+ ? a
+ ??
+ ? ?
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tm
+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+ ?
+ ?a
+ ? a
+ ??
+ ? ?
+ a?
+ ab?
+ abc?
+ ab? c
+ ab??
+ ENDTEST
+ 
+ {
+ ?
+ ?a
+ ? a
+ ??
+ ? ?
+ a?
+ ab?
+ abc?
+ ab? c
+ ab??
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set ai tw=2 fo=tm
+ gqgqjgqgqo
+ ?
+ ?a
+ ENDTEST
+ 
+ {
+   ?
+   ?a
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set noai tw=2 fo=tm
+ gqgqjgqgqo
+   ?
+   ?a
+ ENDTEST
+ 
+ {
+   ?
+   ?a
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=cqm comments=n:?
+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+ ?
+ ?a
+ ?a?
+ ??
+ ???
+ ? ?
+ ? ??
+ ??
+ ??a
+ ???
+ ENDTEST
+ 
+ {
+ ?
+ ?a
+ ?a?
+ ??
+ ???
+ ? ?
+ ? ??
+ ??
+ ??a
+ ???
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tm
+ R?a
+ ENDTEST
+ 
+ {
+ 
+ }
+ 
+ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
*** ../vim-7.2.300/src/testdir/test69.ok	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test69.ok	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,142 ----
+ Results of test69:
+ 
+ 
+ {
+ ???
+ abc
+ ???
+ 
+ ???
+ abc
+ ???
+ }
+ 
+ 
+ {
+ ?
+ ?
+ a
+ ?
+ a
+ ?
+ ?
+ ?
+ ?
+ 
+ ?
+ ?
+ a
+ ?
+ a
+ ?
+ ?
+ ?
+ ?
+ }
+ 
+ 
+ {
+ ?
+ ?
+ a
+ ?
+ a
+ ?
+ ?
+ ?
+ ?
+ a
+ ?
+ ab
+ ?
+ abc
+ ?
+ ab
+ ?
+ c
+ ab
+ ?
+ ?
+ 
+ ?
+ ?
+ a
+ ?
+ a
+ ?
+ ?
+ ?
+ ?
+ a
+ ?
+ ab
+ ?
+ abc
+ ?
+ ab
+ ?
+ c
+ ab
+ ?
+ ?
+ }
+ 
+ 
+ {
+   ?
+   ?
+   a
+ 
+   ?
+   ?
+   a
+ }
+ 
+ 
+ {
+   ?
+   ?
+ a
+ 
+   ?
+   ?
+ a
+ }
+ 
+ 
+ {
+ ?
+ ?a
+ ?a
+ ??
+ ??
+ ??
+ ??
+ ? ?
+ ? ?
+ ? ?
+ ??
+ ??a
+ ???
+ 
+ ?
+ ?a
+ ?a
+ ??
+ ??
+ ??
+ ??
+ ? ?
+ ? ?
+ ? ?
+ ??
+ ??a
+ ???
+ }
+ 
+ 
+ {
+ ?
+ a
+ }
+ 
*** ../vim-7.2.300/src/version.c	2009-11-17 17:37:34.000000000 +0100
--- src/version.c	2009-11-17 17:26:35.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     301,
  /**/



From karsten at fedoraproject.org  Wed Dec  2 16:38:52 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:38:52 +0000 (UTC)
Subject: rpms/vim/devel 7.2.302,NONE,1.1
Message-ID: <20091202163852.2064B11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.302 
Log Message:
- patchlevel 302


--- NEW FILE 7.2.302 ---
To: vim-dev at vim.org
Subject: Patch 7.2.302 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.302 (extra part of 7.2.301)
Problem:    Formatting wrong with small 'tw' value.
Solution:   Add build rules for tests.
Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
	    src/testdir/Make_vms.mms


*** ../vim-7.2.301/src/testdir/Make_amiga.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_amiga.mak	2009-11-17 15:29:05.000000000 +0100
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out test68.out test69.out
  
  .SUFFIXES: .in .out
  
***************
*** 113,115 ****
--- 113,117 ----
  test65.out: test65.in
  test66.out: test66.in
  test67.out: test67.in
+ test68.out: test68.in
+ test69.out: test69.in
*** ../vim-7.2.301/src/testdir/Make_dos.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_dos.mak	2009-11-17 15:29:54.000000000 +0100
***************
*** 26,32 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
--- 26,33 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out \
! 		test68.out test69.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.301/src/testdir/Make_ming.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_ming.mak	2009-11-17 15:30:07.000000000 +0100
***************
*** 45,51 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
--- 45,52 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out \
! 		test68.out test69.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.301/src/testdir/Make_os2.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_os2.mak	2009-11-17 15:11:26.000000000 +0100
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out test68.out test69.out
  
  .SUFFIXES: .in .out
  
*** ../vim-7.2.301/src/testdir/Make_vms.mms	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_vms.mms	2009-11-17 15:11:26.000000000 +0100
***************
*** 69,75 ****
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
--- 69,75 ----
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out test68.out test69.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
*** ../vim-7.2.301/src/version.c	2009-11-17 17:40:34.000000000 +0100
--- src/version.c	2009-11-17 17:43:26.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     302,
  /**/

-- 
Hacker: Someone skilled in computer programming (good guy).
Cracker: A hacker that uses his skills to crack software (bad guy).

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:38:59 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:38:59 +0000 (UTC)
Subject: rpms/vim/devel 7.2.303,NONE,1.1
Message-ID: <20091202163859.ECACD11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.303 
Log Message:
- patchlevel 303


--- NEW FILE 7.2.303 ---
To: vim-dev at vim.org
Subject: Patch 7.2.303
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.303 (after 7.2.294)
Problem:    Can't build on MS-Windows.
Solution:   Add #ifdef around vim_settempdir(). (James Vega)
Files:	    src/fileio.c


*** ../vim-7.2.302/src/fileio.c	2009-11-17 17:13:03.000000000 +0100
--- src/fileio.c	2009-11-18 20:06:55.000000000 +0100
***************
*** 146,152 ****
--- 146,154 ----
  # endif
  #endif
  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+ #ifdef TEMPDIRNAMES
  static void vim_settempdir __ARGS((char_u *tempdir));
+ #endif
  #ifdef FEAT_AUTOCMD
  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
  #endif
***************
*** 6995,7000 ****
--- 6997,7003 ----
  }
  #endif
  
+ #ifdef TEMPDIRNAMES
  /*
   * Directory "tempdir" was created.  Expand this name to a full path and put
   * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
***************
*** 7021,7026 ****
--- 7024,7030 ----
  	vim_free(buf);
      }
  }
+ #endif
  
  /*
   * vim_tempname(): Return a unique name that can be used for a temp file.
*** ../vim-7.2.302/src/version.c	2009-11-17 17:57:10.000000000 +0100
--- src/version.c	2009-11-18 20:07:58.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     303,
  /**/

-- 
BEDEVERE:        Why do you think she is a witch?
SECOND VILLAGER: She turned me into a newt.
BEDEVERE:        A newt?
SECOND VILLAGER: (After looking at himself for some time) I got better.
                 "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 karsten at fedoraproject.org  Wed Dec  2 16:39:07 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:39:07 +0000 (UTC)
Subject: rpms/vim/devel 7.2.304,NONE,1.1
Message-ID: <20091202163907.C3EEA11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.304 
Log Message:
- patchlevel 304


--- NEW FILE 7.2.304 ---
To: vim-dev at vim.org
Subject: Patch 7.2.304
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.304
Problem:    Compiler warning for bad pointer cast.
Solution:   Use another variable for int pointer.
Files:	    src/ops.c


*** ../vim-7.2.303/src/ops.c	2009-11-17 12:43:19.000000000 +0100
--- src/ops.c	2009-11-18 15:40:26.000000000 +0100
***************
*** 5597,5603 ****
  	    vc.vc_type = CONV_NONE;
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
  	    {
! 		conv_str = string_convert(&vc, str, (int*)&len);
  		if (conv_str != NULL)
  		{
  		    vim_free(str);
--- 5597,5606 ----
  	    vc.vc_type = CONV_NONE;
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
  	    {
! 	        int intlen = len;
! 
! 		conv_str = string_convert(&vc, str, &intlen);
! 		len = intlen;
  		if (conv_str != NULL)
  		{
  		    vim_free(str);
*** ../vim-7.2.303/src/version.c	2009-11-18 20:12:15.000000000 +0100
--- src/version.c	2009-11-25 12:37:36.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     304,
  /**/

-- 
I recommend ordering large cargo containers of paper towels to make up
whatever budget underruns you have.  Paper products are always useful and they
have the advantage of being completely flushable if you need to make room in
the storage area later.
				(Scott Adams - The Dilbert principle)

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:39:15 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:39:15 +0000 (UTC)
Subject: rpms/vim/devel 7.2.305,NONE,1.1
Message-ID: <20091202163915.9434511C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.305 
Log Message:
- patchlevel 305


--- NEW FILE 7.2.305 ---
To: vim-dev at vim.org
Subject: Patch 7.2.305
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.305
Problem:    Recursively redrawing causes a memory leak. (Dominique Pelle)
Solution:   Disallow recursive screen updating.
Files:	    src/screen.c


*** ../vim-7.2.304/src/screen.c	2009-11-11 17:07:25.000000000 +0100
--- src/screen.c	2009-11-17 16:30:53.000000000 +0100
***************
*** 323,328 ****
--- 323,329 ----
      int		did_one;
  #endif
  
+     /* Don't do anything if the screen structures are (not yet) valid. */
      if (!screen_valid(TRUE))
  	return;
  
***************
*** 342,348 ****
      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
  	type = NOT_VALID;
  
!     if (!redrawing())
      {
  	redraw_later(type);		/* remember type for next time */
  	must_redraw = type;
--- 343,351 ----
      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
  	type = NOT_VALID;
  
!     /* Postpone the redrawing when it's not needed and when being called
!      * recursively. */
!     if (!redrawing() || updating_screen)
      {
  	redraw_later(type);		/* remember type for next time */
  	must_redraw = type;
***************
*** 582,587 ****
--- 585,591 ----
  
  /*
   * Prepare for updating one or more windows.
+  * Caller must check for "updating_screen" already set to avoid recursiveness.
   */
      static void
  update_prepare()
***************
*** 663,669 ****
  	    doit = TRUE;
      }
  
!     if (!doit)
  	return;
  
      /* update all windows that need updating */
--- 667,675 ----
  	    doit = TRUE;
      }
  
!     /* Return when there is nothing to do or screen updating already
!      * happening. */
!     if (!doit || updating_screen)
  	return;
  
      /* update all windows that need updating */
***************
*** 696,701 ****
--- 702,711 ----
  updateWindow(wp)
      win_T	*wp;
  {
+     /* return if already busy updating */
+     if (updating_screen)
+ 	return;
+ 
      update_prepare();
  
  #ifdef FEAT_CLIPBOARD
*** ../vim-7.2.304/src/version.c	2009-11-25 12:38:49.000000000 +0100
--- src/version.c	2009-11-25 13:01:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     305,
  /**/

-- 
If the Universe is constantly expanding, why can't I ever find a parking space?

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:39:22 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:39:22 +0000 (UTC)
Subject: rpms/vim/devel 7.2.306,NONE,1.1
Message-ID: <20091202163922.5968511C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.306 
Log Message:
- patchlevel 306


--- NEW FILE 7.2.306 ---
To: vim-dev at vim.org
Subject: Patch 7.2.306
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.306
Problem:    shellescape("10%%", 1) only escapes first %. (Christian Brabandt)
Solution:   Don't copy the character after the escaped one.
Files:	    src/misc2.c


*** ../vim-7.2.305/src/misc2.c	2009-11-11 16:56:13.000000000 +0100
--- src/misc2.c	2009-11-25 17:11:49.000000000 +0100
***************
*** 1390,1395 ****
--- 1390,1396 ----
  		*d++ = '\\';		/* insert backslash */
  		while (--l >= 0)	/* copy the var */
  		    *d++ = *p++;
+ 		continue;
  	    }
  
  	    MB_COPY_CHAR(p, d);
*** ../vim-7.2.305/src/version.c	2009-11-25 13:03:29.000000000 +0100
--- src/version.c	2009-11-25 17:13:54.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     306,
  /**/

-- 
Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
engineering at the Technical University of Delft and graduated in 1985 on a
multi-processor Unix architecture."
Response by "dimator": Could the school not afford a proper stage for the
ceremony?

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:39:29 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:39:29 +0000 (UTC)
Subject: rpms/vim/devel 7.2.307,NONE,1.1
Message-ID: <20091202163929.E006C11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.307 
Log Message:
- patchlevel 307


--- NEW FILE 7.2.307 ---
To: vim-dev at vim.org
Subject: Patch 7.2.307
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.307
Problem:    Crash with a very long syntax match statement. (Guy Gur Ari)
Solution:   When the offset does not fit in the two bytes available give an
            error instead of continuing with invalid pointers.
Files:      src/regexp.c


*** ../vim-7.2.306/src/regexp.c	2009-05-15 21:31:11.000000000 +0200
--- src/regexp.c	2009-11-25 18:13:03.000000000 +0100
***************
*** 583,588 ****
--- 583,589 ----
  #endif
  static char_u	*regcode;	/* Code-emit pointer, or JUST_CALC_SIZE */
  static long	regsize;	/* Code size. */
+ static int	reg_toolong;	/* TRUE when offset out of range */
  static char_u	had_endbrace[NSUBEXP];	/* flags, TRUE if end of () found */
  static unsigned	regflags;	/* RF_ flags for prog */
  static long	brace_min[10];	/* Minimums for complex brace repeats */
***************
*** 1028,1036 ****
      regcomp_start(expr, re_flags);
      regcode = r->program;
      regc(REGMAGIC);
!     if (reg(REG_NOPAREN, &flags) == NULL)
      {
  	vim_free(r);
  	return NULL;
      }
  
--- 1029,1039 ----
      regcomp_start(expr, re_flags);
      regcode = r->program;
      regc(REGMAGIC);
!     if (reg(REG_NOPAREN, &flags) == NULL || reg_toolong)
      {
  	vim_free(r);
+ 	if (reg_toolong)
+ 	    EMSG_RET_NULL(_("E339: Pattern too long"));
  	return NULL;
      }
  
***************
*** 1141,1146 ****
--- 1144,1150 ----
      re_has_z = 0;
  #endif
      regsize = 0L;
+     reg_toolong = FALSE;
      regflags = 0;
  #if defined(FEAT_SYN_HL) || defined(PROTO)
      had_eol = FALSE;
***************
*** 1228,1234 ****
      {
  	skipchr();
  	br = regbranch(&flags);
! 	if (br == NULL)
  	    return NULL;
  	regtail(ret, br);	/* BRANCH -> BRANCH. */
  	if (!(flags & HASWIDTH))
--- 1232,1238 ----
      {
  	skipchr();
  	br = regbranch(&flags);
! 	if (br == NULL || reg_toolong)
  	    return NULL;
  	regtail(ret, br);	/* BRANCH -> BRANCH. */
  	if (!(flags & HASWIDTH))
***************
*** 1313,1318 ****
--- 1317,1324 ----
  	    break;
  	skipchr();
  	regtail(latest, regnode(END)); /* operand ends */
+ 	if (reg_toolong)
+ 	    break;
  	reginsert(MATCH, latest);
  	chain = latest;
      }
***************
*** 1382,1388 ****
  			    break;
  	    default:
  			    latest = regpiece(&flags);
! 			    if (latest == NULL)
  				return NULL;
  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
  			    if (chain == NULL)	/* First piece. */
--- 1388,1394 ----
  			    break;
  	    default:
  			    latest = regpiece(&flags);
! 			    if (latest == NULL || reg_toolong)
  				return NULL;
  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
  			    if (chain == NULL)	/* First piece. */
***************
*** 2540,2547 ****
  	offset = (int)(scan - val);
      else
  	offset = (int)(val - scan);
!     *(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
!     *(scan + 2) = (char_u) (offset & 0377);
  }
  
  /*
--- 2546,2561 ----
  	offset = (int)(scan - val);
      else
  	offset = (int)(val - scan);
!     /* When the offset uses more than 16 bits it can no longer fit in the two
!      * bytes avaliable.  Use a global flag to avoid having to check return
!      * values in too many places. */
!     if (offset > 0xffff)
! 	reg_toolong = TRUE;
!     else
!     {
! 	*(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
! 	*(scan + 2) = (char_u) (offset & 0377);
!     }
  }
  
  /*
***************
*** 5764,5769 ****
--- 5778,5785 ----
  
  /*
   * regnext - dig the "next" pointer out of a node
+  * Returns NULL when calculating size, when there is no next item and when
+  * there is an error.
   */
      static char_u *
  regnext(p)
***************
*** 5771,5777 ****
  {
      int	    offset;
  
!     if (p == JUST_CALC_SIZE)
  	return NULL;
  
      offset = NEXT(p);
--- 5787,5793 ----
  {
      int	    offset;
  
!     if (p == JUST_CALC_SIZE || reg_toolong)
  	return NULL;
  
      offset = NEXT(p);
*** ../vim-7.2.306/src/version.c	2009-11-25 17:15:16.000000000 +0100
--- src/version.c	2009-11-25 18:14:32.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     307,
  /**/

-- 
The fastest way to get an engineer to solve a problem is to declare that the
problem is unsolvable.  No engineer can walk away from an unsolvable problem
until it's solved.
				(Scott Adams - The Dilbert principle)

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:39:37 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:39:37 +0000 (UTC)
Subject: rpms/vim/devel 7.2.308,NONE,1.1
Message-ID: <20091202163937.DB0C411C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.308 
Log Message:
- patchlevel 308


--- NEW FILE 7.2.308 ---
To: vim-dev at vim.org
Subject: Patch 7.2.308
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.308
Problem:    When using a regexp in the "\=" expression of a substitute
	    command, submatch() returns empty strings for further lines.
	    (Clockwork Jam)
Solution:   Save and restore the line number and line count when calling
	    reg_getline().
Files:	    src/regexp.c


*** ../vim-7.2.307/src/regexp.c	2009-11-25 18:21:48.000000000 +0100
--- src/regexp.c	2009-11-25 19:45:07.000000000 +0100
***************
*** 6828,6833 ****
--- 6828,6835 ----
   * that contains a call to substitute() and submatch(). */
  static regmatch_T	*submatch_match;
  static regmmatch_T	*submatch_mmatch;
+ static linenr_T		submatch_firstlnum;
+ static linenr_T		submatch_maxline;
  #endif
  
  #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
***************
*** 6941,6947 ****
  	}
  	else
  	{
- 	    linenr_T	save_reg_maxline;
  	    win_T	*save_reg_win;
  	    int		save_ireg_ic;
  
--- 6943,6948 ----
***************
*** 6953,6959 ****
  	     * vim_regexec_multi() can't be called recursively. */
  	    submatch_match = reg_match;
  	    submatch_mmatch = reg_mmatch;
! 	    save_reg_maxline = reg_maxline;
  	    save_reg_win = reg_win;
  	    save_ireg_ic = ireg_ic;
  	    can_f_submatch = TRUE;
--- 6954,6961 ----
  	     * vim_regexec_multi() can't be called recursively. */
  	    submatch_match = reg_match;
  	    submatch_mmatch = reg_mmatch;
! 	    submatch_firstlnum = reg_firstlnum;
! 	    submatch_maxline = reg_maxline;
  	    save_reg_win = reg_win;
  	    save_ireg_ic = ireg_ic;
  	    can_f_submatch = TRUE;
***************
*** 6976,6982 ****
  
  	    reg_match = submatch_match;
  	    reg_mmatch = submatch_mmatch;
! 	    reg_maxline = save_reg_maxline;
  	    reg_win = save_reg_win;
  	    ireg_ic = save_ireg_ic;
  	    can_f_submatch = FALSE;
--- 6978,6985 ----
  
  	    reg_match = submatch_match;
  	    reg_mmatch = submatch_mmatch;
! 	    reg_firstlnum = submatch_firstlnum;
! 	    reg_maxline = submatch_maxline;
  	    reg_win = save_reg_win;
  	    ireg_ic = save_ireg_ic;
  	    can_f_submatch = FALSE;
***************
*** 7212,7217 ****
--- 7215,7243 ----
  
  #ifdef FEAT_EVAL
  /*
+  * Call reg_getline() with the line numbers from the submatch.  If a
+  * substitute() was used the reg_maxline and other values have been
+  * overwritten.
+  */
+     static char_u *
+ reg_getline_submatch(lnum)
+     linenr_T	lnum;
+ {
+     char_u *s;
+     linenr_T save_first = reg_firstlnum;
+     linenr_T save_max = reg_maxline;
+ 
+     reg_firstlnum = submatch_firstlnum;
+     reg_maxline = submatch_maxline;
+ 
+     s = reg_getline(lnum);
+ 
+     reg_firstlnum = save_first;
+     reg_maxline = save_max;
+     return s;
+ }
+ 
+ /*
   * Used for the submatch() function: get the string from the n'th submatch in
   * allocated memory.
   * Returns NULL when not in a ":s" command and for a non-existing submatch.
***************
*** 7241,7247 ****
  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
  		return NULL;
  
! 	    s = reg_getline(lnum) + submatch_mmatch->startpos[no].col;
  	    if (s == NULL)  /* anti-crash check, cannot happen? */
  		break;
  	    if (submatch_mmatch->endpos[no].lnum == lnum)
--- 7267,7273 ----
  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
  		return NULL;
  
! 	    s = reg_getline_submatch(lnum) + submatch_mmatch->startpos[no].col;
  	    if (s == NULL)  /* anti-crash check, cannot happen? */
  		break;
  	    if (submatch_mmatch->endpos[no].lnum == lnum)
***************
*** 7267,7273 ****
  		++lnum;
  		while (lnum < submatch_mmatch->endpos[no].lnum)
  		{
! 		    s = reg_getline(lnum++);
  		    if (round == 2)
  			STRCPY(retval + len, s);
  		    len += (int)STRLEN(s);
--- 7293,7299 ----
  		++lnum;
  		while (lnum < submatch_mmatch->endpos[no].lnum)
  		{
! 		    s = reg_getline_submatch(lnum++);
  		    if (round == 2)
  			STRCPY(retval + len, s);
  		    len += (int)STRLEN(s);
***************
*** 7276,7282 ****
  		    ++len;
  		}
  		if (round == 2)
! 		    STRNCPY(retval + len, reg_getline(lnum),
  					     submatch_mmatch->endpos[no].col);
  		len += submatch_mmatch->endpos[no].col;
  		if (round == 2)
--- 7302,7308 ----
  		    ++len;
  		}
  		if (round == 2)
! 		    STRNCPY(retval + len, reg_getline_submatch(lnum),
  					     submatch_mmatch->endpos[no].col);
  		len += submatch_mmatch->endpos[no].col;
  		if (round == 2)
*** ../vim-7.2.307/src/version.c	2009-11-25 18:21:48.000000000 +0100
--- src/version.c	2009-11-25 19:50:16.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     308,
  /**/

-- 
Engineers are always delighted to share wisdom, even in areas in which they
have no experience whatsoever.  Their logic provides them with inherent
insight into any field of expertise.  This can be a problem when dealing with
the illogical people who believe that knowledge can only be derived through
experience.
				(Scott Adams - The Dilbert principle)

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:39:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:39:45 +0000 (UTC)
Subject: rpms/vim/devel 7.2.309,NONE,1.1
Message-ID: <20091202163945.E6F0611C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.309 
Log Message:
- patchlevel 309


--- NEW FILE 7.2.309 ---
To: vim-dev at vim.org
Subject: Patch 7.2.309
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.309 (after 7.2.308)
Problem:    Warning for missing function prototype. (Patrick Texier)
Solution:   Add the prototype.
Files:	    src/regexp.c


*** ../vim-7.2.308/src/regexp.c	2009-11-25 19:51:56.000000000 +0100
--- src/regexp.c	2009-11-26 20:39:18.000000000 +0100
***************
*** 7214,7219 ****
--- 7214,7221 ----
  }
  
  #ifdef FEAT_EVAL
+ static char_u *reg_getline_submatch __ARGS((linenr_T lnum));
+ 
  /*
   * Call reg_getline() with the line numbers from the submatch.  If a
   * substitute() was used the reg_maxline and other values have been
*** ../vim-7.2.308/src/version.c	2009-11-25 19:51:56.000000000 +0100
--- src/version.c	2009-11-26 20:40:11.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     309,
  /**/

-- 
Female engineers become irresistible at the age of consent and remain that
way until about thirty minutes after their clinical death.  Longer if it's a
warm day.
				(Scott Adams - The Dilbert principle)

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:39:53 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:39:53 +0000 (UTC)
Subject: rpms/vim/devel 7.2.310,NONE,1.1
Message-ID: <20091202163953.983CA11C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.310 
Log Message:
- patchlevel 310


--- NEW FILE 7.2.310 ---
To: vim-dev at vim.org
Subject: Patch 7.2.310
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.310
Problem:    When a filetype plugin in ~/.vim/ftdetect uses ":setfiletype" and
	    the file starts with a "# comment" it gets "conf" filetype.
Solution:   Check for "conf" filetype after using ftdetect plugins.
Files:	    runtime/filetype.vim


*** ../vim-7.2.309/runtime/filetype.vim	2008-08-06 18:56:36.000000000 +0200
--- runtime/filetype.vim	2009-12-02 12:08:42.000000000 +0100
***************
*** 2400,2405 ****
--- 2435,2446 ----
  au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
  
  
+ 
+ " Use the filetype detect plugins.  They may overrule any of the previously
+ " detected filetypes.
+ runtime! ftdetect/*.vim
+ 
+ 
  " Generic configuration file (check this last, it's just guessing!)
  au BufNewFile,BufRead,StdinReadPost *
  	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
***************
*** 2408,2417 ****
  	\   setf conf |
  	\ endif
  
- " Use the plugin-filetype checks last, they may overrule any of the previously
- " detected filetypes.
- runtime! ftdetect/*.vim
- 
  augroup END
  
  
--- 2449,2454 ----
*** ../vim-7.2.309/src/version.c	2009-11-26 20:41:19.000000000 +0100
--- src/version.c	2009-12-02 12:05:27.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     310,
  /**/

-- 
A)bort, R)etry, P)lease don't bother me again

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:40:01 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:40:01 +0000 (UTC)
Subject: rpms/vim/devel 7.2.311,NONE,1.1
Message-ID: <20091202164001.E1CAA11C0396@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.311 
Log Message:
- patchlevel 311


--- NEW FILE 7.2.311 ---
To: vim-dev at vim.org
Subject: Patch 7.2.311
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.311
Problem:    Can't compile with FreeMiNT.
Solution:   Change #ifdef for limits.h. (Alan Hourihane)
Files:	    src/fileio.c


*** ../vim-7.2.310/src/fileio.c	2009-11-18 20:12:15.000000000 +0100
--- src/fileio.c	2009-12-02 13:30:07.000000000 +0100
***************
*** 21,27 ****
  
  #include "vim.h"
  
! #ifdef __TANDEM
  # include <limits.h>		/* for SSIZE_MAX */
  #endif
  
--- 21,27 ----
  
  #include "vim.h"
  
! #if defined(__TANDEM) || defined(__MINT__)
  # include <limits.h>		/* for SSIZE_MAX */
  #endif
  
*** ../vim-7.2.310/src/version.c	2009-12-02 12:08:57.000000000 +0100
--- src/version.c	2009-12-02 13:31:46.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     311,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
3. Your bookmark takes 15 minutes to scroll from top to bottom.

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:40:20 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:40:20 +0000 (UTC)
Subject: rpms/vim/devel 7.2.313,NONE,1.1
Message-ID: <20091202164020.6DDE811C03A3@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.313 
Log Message:
- patchlevel 313


--- NEW FILE 7.2.313 ---
To: vim-dev at vim.org
Subject: Patch 7.2.313
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.313
Problem:    Command line completion doesn't work after "%:h" and similar.
Solution:   Expand these items before doing the completion.
Files:	    src/ex_getln.c, src/misc1.c, src/proto/misc1.pro


*** ../vim-7.2.312/src/ex_getln.c	2009-09-18 17:24:54.000000000 +0200
--- src/ex_getln.c	2009-12-02 16:40:06.000000000 +0100
***************
*** 4422,4428 ****
  	    flags |= EW_FILE;
  	else
  	    flags = (flags | EW_DIR) & ~EW_FILE;
! 	ret = expand_wildcards(1, &pat, num_file, file, flags);
  	if (free_pat)
  	    vim_free(pat);
  	return ret;
--- 4422,4429 ----
  	    flags |= EW_FILE;
  	else
  	    flags = (flags | EW_DIR) & ~EW_FILE;
! 	/* Expand wildcards, supporting %:h and the like. */
! 	ret = expand_wildcards_eval(&pat, num_file, file, flags);
  	if (free_pat)
  	    vim_free(pat);
  	return ret;
*** ../vim-7.2.312/src/misc1.c	2009-11-17 16:08:12.000000000 +0100
--- src/misc1.c	2009-12-02 17:06:49.000000000 +0100
***************
*** 8447,8452 ****
--- 8447,8492 ----
  }
  
  /*
+  * Invoke expand_wildcards() for one pattern.
+  * Expand items like "%:h" before the expansion.
+  * Returns OK or FAIL.
+  */
+     int
+ expand_wildcards_eval(pat, num_file, file, flags)
+     char_u	 **pat;		/* pointer to input pattern */
+     int		  *num_file;	/* resulting number of files */
+     char_u	***file;	/* array of resulting files */
+     int		   flags;	/* EW_DIR, etc. */
+ {
+     int		ret = FAIL;
+     char_u	*eval_pat = NULL;
+     char_u	*exp_pat = *pat;
+     char_u      *ignored_msg;
+     int		usedlen;
+ 
+     if (*exp_pat == '%' || *exp_pat == '#' || *exp_pat == '<')
+     {
+ 	++emsg_off;
+ 	eval_pat = eval_vars(exp_pat, exp_pat, &usedlen,
+ 						    NULL, &ignored_msg, NULL);
+ 	--emsg_off;
+ 	if (eval_pat != NULL)
+ 	    exp_pat = concat_str(eval_pat, exp_pat + usedlen);
+     }
+ 
+     if (exp_pat != NULL)
+ 	ret = expand_wildcards(1, &exp_pat, num_file, file, flags);
+ 
+     if (eval_pat != NULL)
+     {
+ 	vim_free(exp_pat);
+ 	vim_free(eval_pat);
+     }
+ 
+     return ret;
+ }
+ 
+ /*
   * Expand wildcards.  Calls gen_expand_wildcards() and removes files matching
   * 'wildignore'.
   * Returns OK or FAIL.
*** ../vim-7.2.312/src/proto/misc1.pro	2007-09-26 22:36:32.000000000 +0200
--- src/proto/misc1.pro	2009-12-02 16:41:52.000000000 +0100
***************
*** 85,90 ****
--- 85,91 ----
  int vim_fexists __ARGS((char_u *fname));
  void line_breakcheck __ARGS((void));
  void fast_breakcheck __ARGS((void));
+ int expand_wildcards_eval __ARGS((char_u **pat, int *num_file, char_u ***file, int flags));
  int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
  int match_suffix __ARGS((char_u *fname));
  int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
*** ../vim-7.2.312/src/version.c	2009-12-02 15:03:24.000000000 +0100
--- src/version.c	2009-12-02 17:14:02.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     313,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
8. You spend half of the plane trip with your laptop on your lap...and your
   child in the overhead compartment.

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:40:52 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:40:52 +0000 (UTC)
Subject: rpms/vim/devel vimrc,1.20,1.21
Message-ID: <20091202164052.9A03111C03A3@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	vimrc 
Log Message:
- disable autowrapping of .txt files, #479896


Index: vimrc
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vimrc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- vimrc	3 Jun 2008 14:34:32 -0000	1.20
+++ vimrc	2 Dec 2009 16:40:52 -0000	1.21
@@ -16,7 +16,7 @@ if has("autocmd")
   augroup fedora
   autocmd!
   " In text files, always limit the width of text to 78 characters
-  autocmd BufRead *.txt set tw=78
+  # autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
   \ if line("'\"") > 0 && line ("'\"") <= line("$") |



From bioinfornatics at fedoraproject.org  Wed Dec  2 16:45:05 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Wed,  2 Dec 2009 16:45:05 +0000 (UTC)
Subject: rpms/earth-and-moon-backgrounds/F-11 .cvsignore, 1.2,
	1.3 earth-and-moon-backgrounds.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091202164505.4079C11C0095@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/earth-and-moon-backgrounds/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22310

Modified Files:
	.cvsignore earth-and-moon-backgrounds.spec sources 
Log Message:
Perform quality,License tag change to CC-BY-SA,KDE user can now use this wallpaper


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2009 20:55:28 -0000	1.2
+++ .cvsignore	2 Dec 2009 16:45:04 -0000	1.3
@@ -1 +1 @@
-earth-and-moon-0.1.tar.gz
+earth-and-moon-backgrounds-0.2.tar.xz


Index: earth-and-moon-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/F-11/earth-and-moon-backgrounds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- earth-and-moon-backgrounds.spec	13 Mar 2009 20:55:28 -0000	1.1
+++ earth-and-moon-backgrounds.spec	2 Dec 2009 16:45:05 -0000	1.2
@@ -1,54 +1,175 @@
-%global		_appname	earth-and-moon
+Name:           earth-and-moon-backgrounds
+Version:        0.2
+Release:        1%{?dist}
+Summary:        Earth-and-moon desktop backgrounds
+
+Group:          Applications/Multimedia
+License:        CC-BY-SA
+URL:            http://bioinformatiques.free.fr/
+
+Source0:        %{name}-%{version}.tar.xz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-dual = %{version}-%{release}
 
-Name:		earth-and-moon-backgrounds
-Version:	0.1
-Release:	4%{?dist}
-Summary:	Modern background
-License:	GPL+
-Group:		User Interface/Desktops
-URL:		http://bioinformatiques.free.fr/
-Source0:	http://bioinformatiques.free.fr/%{_appname}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{_appname}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+%description
+This package contains desktop backgrounds for the earth-and-moon theme.
+
+%prep
+%setup -q
 
+%package        common
+Summary:        Earth-and-moon desktop backgrounds shared between GNOME and KDE
+Group:          Applications/Multimedia
 
-%description
+%description    common
+This package includes the common files used by both GNOME and KDE.
+
+%description -l fr common
+Ce paquet inclut les fichiers commun ? GNOME et KDE
+
+%package        kdm
+Summary:        Earth-and-moon desktop background for KDM
+Group:          Applications/Multimedia
+
+%description    kdm
+Earth-and-moon desktop background used in KDM.
+
+%description -l fr kdm
+Ce paquet inclut les fond ?crans earth-and-moon qui sont utilis?s dans KDM
+
+%package        single
+Summary:        Extra earth-and-moon desktop background with modern look
+Group:          Applications/Multimedia
+
+%description    single
 Earthlooks is beautiful theme. The background change often. You can see earth
 rotate on herself and moon rotate around earth. This theme is compatible with
-many resolution: eepc: 800x480, normalish: 1280x1024, normal: 1600x1200, wide:
-1900x1200
+many resolution: 800x600, 1280x1024, 1600x1200, 1680x1050, 1900x1200
+
+%description -l fr single
+Earthlooks est un th?me magnifique. Les fonds ?crans change r?guli?rement.
+Vous pouvez voir la Terre tourner sur elle m?me et la lune tourne autour de la
+Terre. Ce fond ?crans sont compatibles dans plusieurs r?solution: 800x600,
+1280x1024, 1680x1050, 1600x1200, 1900x1200
+
+%package        dual
+Summary:        Shared dual screen earth-and-moon desktop backgrounds
+Group:          Applications/Multimedia
+
+%description dual
+Earthlooks is beautiful theme. The background change often. You can see earth
+rotate on herself and moon rotate around earth. This theme is compatible with
+many resolution: 2560x1024, 2960x1050, 3200x1200, 3840x1200
+
+%description -l fr dual
+Earthlooks est un th?me magnifique. Les fonds ?crans change r?guli?rement.
+Vous pouvez voir la Terre tourner sur elle m?me et la lune tourne autour de la
+Terre. Ce fond ?crans sont compatibles dans plusieurs r?solution: 2560x1024,
+2960x1050, 3200x1200, 3840x1200
 
-%prep
-%setup -q -n %{_appname}-%{version}
 
 %build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-# create wallpaper directorie
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
-# copy image files
-install -p -m644 images/* $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
 
-# copy xml file
-install -p -m644 %{_appname}.xml $RPM_BUILD_ROOT/%{_datadir}/backgrounds/%{_appname}/
+# prepare the dir structure
+for RESOLUTION in 800x600 1280x1024 1600x1200 1680x1050 1900x1200 2560x1024 3200x1200 3840x1200;
+do mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon/$RESOLUTION;
+done;
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+
+# copy the earth-and-moon images
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon/{800x600,1280x1024,1600x1200,1680x1050,1900x1200,2560x1024,2960x1050,3200x1200,3840x1200} \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon/
+
+# copy slideshow xml files
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon-hd.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon
 
 # copy metadata xmls file
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties/
-cp -p desktop-backgrounds-earth-and-moon.xml $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties/
-
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-earth-and-moon.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-earth-and-moon-hd.xml \
+        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
-%doc README
-%dir %{_datadir}/gnome-background-properties/
-%{_datadir}/backgrounds/earth-and-moon/
+%doc COPYING
 %{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon.xml
+
+%files common
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/earth-and-moon
+%dir %{_datadir}/backgrounds/earth-and-moon/800x600
+%dir %{_datadir}/backgrounds/earth-and-moon/1280x1024
+%dir %{_datadir}/backgrounds/earth-and-moon/1680x1050
+%dir %{_datadir}/backgrounds/earth-and-moon/1600x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/1900x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/2560x1024
+%dir %{_datadir}/backgrounds/earth-and-moon/2960x1050
+%dir %{_datadir}/backgrounds/earth-and-moon/3200x1200
+%dir %{_datadir}/backgrounds/earth-and-moon/3840x1200
+%{_datadir}/backgrounds/earth-and-moon/800x600/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1280x1024/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1680x1050/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1600x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/1900x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/2560x1024/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/2960x1050/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/3200x1200/01.jpeg
+%{_datadir}/backgrounds/earth-and-moon/3840x1200/01.jpeg
+
+%files dual
+%defattr(-,root,root,-)
+%doc COPYING
+%{_datadir}/backgrounds/earth-and-moon/2560x1024
+%{_datadir}/backgrounds/earth-and-moon/2960x1050
+%{_datadir}/backgrounds/earth-and-moon/3200x1200
+%{_datadir}/backgrounds/earth-and-moon/3840x1200
+%{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon-hd.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon-hd.xml
+
+%files single
+%defattr(-,root,root,-)
+%doc COPYING
+%{_datadir}/backgrounds/earth-and-moon/800x600
+%{_datadir}/backgrounds/earth-and-moon/1280x1024
+%{_datadir}/backgrounds/earth-and-moon/1680x1050
+%{_datadir}/backgrounds/earth-and-moon/1600x1200
+%{_datadir}/backgrounds/earth-and-moon/1900x1200
+%{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon.xml
+%{_datadir}/backgrounds/earth-and-moon/earth-and-moon.xml
+
+%files kdm
+%defattr(-,root,root,-)
+%doc COPYING
+%dir %{_datadir}/backgrounds/earth-and-moon
+%dir %{_datadir}/backgrounds/earth-and-moon/1680x1050
+%{_datadir}/backgrounds/earth-and-moon/1680x1050/01.jpeg
 
 %changelog
+* Mon Nov 30 2009  Jonathan MERCIER <bioinfornatics at gmail.com> - 0.2-1
+- Perform quality and add some new reolution such as 800x600, 1680x1050
+  2560x1024, 2960x1050, 3200x1200, 3840x1200
+- License tag change to "CC-BY-SA"
+- KDE user can now use this wallpaper
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 05 2009  Jonathan MERCIER <bioinfornatics at gmail.com> - 0.1-4
 - Add "%%dir %%{_datadir}/gnome-background-properties/" to %%files
 - For "install -p"
@@ -66,3 +187,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Oct 25 2008 Jonathan MERCIER <bioinfornatics at gmail.com> - 0.1-1
 - Initial release
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/earth-and-moon-backgrounds/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2009 20:55:28 -0000	1.2
+++ sources	2 Dec 2009 16:45:05 -0000	1.3
@@ -1 +1 @@
-f10c76967718c77406810643dcf74b22  earth-and-moon-0.1.tar.gz
+f0275fa0418d1a479fd4233f70375583  earth-and-moon-backgrounds-0.2.tar.xz



From dnovotny at fedoraproject.org  Wed Dec  2 16:50:21 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed,  2 Dec 2009 16:50:21 +0000 (UTC)
Subject: rpms/emacs/devel emacs-23.1-scroll.patch, NONE, 1.1 emacs.spec,
	1.144, 1.145
Message-ID: <20091202165021.47D8611C03A3@cvs1.fedora.phx.redhat.com>

Author: dnovotny

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

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-scroll.patch 
Log Message:
- fix #543046 -  Using scroll bar in emacs highlights/selects text


emacs-23.1-scroll.patch:
 gtkutil.c |   32 ++++++++++++++++++++++++++++++++
 gtkutil.h |    2 ++
 xterm.c   |   11 +++++++++++
 3 files changed, 45 insertions(+)

--- NEW FILE emacs-23.1-scroll.patch ---
diff -up emacs-23.1/src/gtkutil.c.scroll emacs-23.1/src/gtkutil.c
--- emacs-23.1/src/gtkutil.c.scroll	2009-06-21 06:38:15.000000000 +0200
+++ emacs-23.1/src/gtkutil.c	2009-12-02 17:10:08.000000000 +0100
@@ -3401,6 +3401,38 @@ xg_set_toolkit_scroll_bar_thumb (bar, po
     }
 }
 
+/* Return non-zero if EVENT is for a scroll bar in frame F.
+   When the same X window is used for several Gtk+ widgets, we cannot
+   say for sure based on the X window alone if an event is for the
+   frame.  This function does additional checks.
+
+   Return non-zero if the event is for a scroll bar, zero otherwise.  */
+
+int
+xg_event_is_for_scrollbar (f, event)
+     FRAME_PTR f;
+     XEvent *event;
+{
+  int retval = 0;
+
+  if (f && event->type == ButtonPress)
+    {
+      /* Check if press occurred outside the edit widget.  */
+      GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
+      retval = gdk_display_get_window_at_pointer (gdpy, NULL, NULL)
+        != f->output_data.x->edit_widget->window;
+    }
+  else if (f && (event->type != ButtonRelease || event->type != MotionNotify))
+    {
+      /* If we are releasing or moving the scroll bar, it has the grab.  */
+      retval = gtk_grab_get_current () != 0
+        && gtk_grab_get_current () != f->output_data.x->edit_widget;
+    }
+
+  return retval;
+}
+
+
 

 /***********************************************************************
                       Tool bar functions
diff -up emacs-23.1/src/gtkutil.h.scroll emacs-23.1/src/gtkutil.h
--- emacs-23.1/src/gtkutil.h.scroll	2009-06-21 06:38:15.000000000 +0200
+++ emacs-23.1/src/gtkutil.h	2009-12-02 17:10:08.000000000 +0100
@@ -180,6 +180,8 @@ extern void xg_set_toolkit_scroll_bar_th
                                                  int position,
                                                  int whole));
 
+extern int xg_event_is_for_scrollbar P_ ((FRAME_PTR f, XEvent *event));
+
 
 extern void update_frame_tool_bar P_ ((FRAME_PTR f));
 extern void free_frame_tool_bar P_ ((FRAME_PTR f));
diff -up emacs-23.1/src/xterm.c.scroll emacs-23.1/src/xterm.c
--- emacs-23.1/src/xterm.c.scroll	2009-06-21 06:38:20.000000000 +0200
+++ emacs-23.1/src/xterm.c	2009-12-02 17:13:24.000000000 +0100
@@ -6743,6 +6743,12 @@ handle_one_xevent (dpyinfo, eventp, fini
             clear_mouse_face (dpyinfo);
           }
 
+
+#ifdef USE_GTK
+        if (f && xg_event_is_for_scrollbar (f, &event))
+          f = 0;
+#endif
+
         if (f)
           {
 
@@ -6899,6 +6905,11 @@ handle_one_xevent (dpyinfo, eventp, fini
         else
           f = x_window_to_frame (dpyinfo, event.xbutton.window);
 
+#ifdef USE_GTK
+        if (f && xg_event_is_for_scrollbar (f, &event))
+          f = 0;
+#endif
+
         if (f)
           {
             /* Is this in the tool-bar?  */


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- emacs.spec	30 Nov 2009 13:04:42 -0000	1.144
+++ emacs.spec	2 Dec 2009 16:50:20 -0000	1.145
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -29,6 +29,7 @@ Patch3: rpm-spec-mode-utc.patch
 Patch4: emacs-gtk.patch
 Patch5: emacs-23.1-xdg.patch
 Patch6: emacs-23.1-cpp.patch
+Patch7: emacs-23.1-scroll.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -124,6 +125,7 @@ Emacs packages or see some elisp example
 %patch4 -p1 -b .gtk
 %patch5 -p1 -b .xdg
 %patch6 -p1
+%patch7 -p1 -b .scroll
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -395,6 +397,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Dec 02 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-15
+- fix #543046 -  Using scroll bar in emacs highlights/selects text
+
 * Mon Nov 30 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-14
 - fixed FTBFS in F12 and higher (#540921)
 



From dnovotny at fedoraproject.org  Wed Dec  2 16:51:52 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed,  2 Dec 2009 16:51:52 +0000 (UTC)
Subject: rpms/emacs/F-12 emacs-23.1-scroll.patch, NONE, 1.1 emacs.spec, 1.142,
	1.143
Message-ID: <20091202165152.4F11A11C0095@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24224

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-scroll.patch 
Log Message:
- fix #543046 -  Using scroll bar in emacs highlights/selects text


emacs-23.1-scroll.patch:
 gtkutil.c |   32 ++++++++++++++++++++++++++++++++
 gtkutil.h |    2 ++
 xterm.c   |   11 +++++++++++
 3 files changed, 45 insertions(+)

--- NEW FILE emacs-23.1-scroll.patch ---
diff -up emacs-23.1/src/gtkutil.c.scroll emacs-23.1/src/gtkutil.c
--- emacs-23.1/src/gtkutil.c.scroll	2009-06-21 06:38:15.000000000 +0200
+++ emacs-23.1/src/gtkutil.c	2009-12-02 17:10:08.000000000 +0100
@@ -3401,6 +3401,38 @@ xg_set_toolkit_scroll_bar_thumb (bar, po
     }
 }
 
+/* Return non-zero if EVENT is for a scroll bar in frame F.
+   When the same X window is used for several Gtk+ widgets, we cannot
+   say for sure based on the X window alone if an event is for the
+   frame.  This function does additional checks.
+
+   Return non-zero if the event is for a scroll bar, zero otherwise.  */
+
+int
+xg_event_is_for_scrollbar (f, event)
+     FRAME_PTR f;
+     XEvent *event;
+{
+  int retval = 0;
+
+  if (f && event->type == ButtonPress)
+    {
+      /* Check if press occurred outside the edit widget.  */
+      GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
+      retval = gdk_display_get_window_at_pointer (gdpy, NULL, NULL)
+        != f->output_data.x->edit_widget->window;
+    }
+  else if (f && (event->type != ButtonRelease || event->type != MotionNotify))
+    {
+      /* If we are releasing or moving the scroll bar, it has the grab.  */
+      retval = gtk_grab_get_current () != 0
+        && gtk_grab_get_current () != f->output_data.x->edit_widget;
+    }
+
+  return retval;
+}
+
+
 

 /***********************************************************************
                       Tool bar functions
diff -up emacs-23.1/src/gtkutil.h.scroll emacs-23.1/src/gtkutil.h
--- emacs-23.1/src/gtkutil.h.scroll	2009-06-21 06:38:15.000000000 +0200
+++ emacs-23.1/src/gtkutil.h	2009-12-02 17:10:08.000000000 +0100
@@ -180,6 +180,8 @@ extern void xg_set_toolkit_scroll_bar_th
                                                  int position,
                                                  int whole));
 
+extern int xg_event_is_for_scrollbar P_ ((FRAME_PTR f, XEvent *event));
+
 
 extern void update_frame_tool_bar P_ ((FRAME_PTR f));
 extern void free_frame_tool_bar P_ ((FRAME_PTR f));
diff -up emacs-23.1/src/xterm.c.scroll emacs-23.1/src/xterm.c
--- emacs-23.1/src/xterm.c.scroll	2009-06-21 06:38:20.000000000 +0200
+++ emacs-23.1/src/xterm.c	2009-12-02 17:13:24.000000000 +0100
@@ -6743,6 +6743,12 @@ handle_one_xevent (dpyinfo, eventp, fini
             clear_mouse_face (dpyinfo);
           }
 
+
+#ifdef USE_GTK
+        if (f && xg_event_is_for_scrollbar (f, &event))
+          f = 0;
+#endif
+
         if (f)
           {
 
@@ -6899,6 +6905,11 @@ handle_one_xevent (dpyinfo, eventp, fini
         else
           f = x_window_to_frame (dpyinfo, event.xbutton.window);
 
+#ifdef USE_GTK
+        if (f && xg_event_is_for_scrollbar (f, &event))
+          f = 0;
+#endif
+
         if (f)
           {
             /* Is this in the tool-bar?  */


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-12/emacs.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- emacs.spec	30 Nov 2009 13:09:53 -0000	1.142
+++ emacs.spec	2 Dec 2009 16:51:52 -0000	1.143
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -29,6 +29,7 @@ Patch3: rpm-spec-mode-utc.patch
 Patch4: emacs-gtk.patch
 Patch5: emacs-23.1-xdg.patch
 Patch6: emacs-23.1-cpp.patch
+Patch7: emacs-23.1-scroll.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -121,6 +122,7 @@ Emacs packages or see some elisp example
 %patch4 -p1 -b .gtk
 %patch5 -p1 -b .xdg
 %patch6 -p1
+%patch7 -p1 -b .scroll
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -383,6 +385,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Dec 02 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-13
+- fix #543046 -  Using scroll bar in emacs highlights/selects text
+
 * Mon Nov 30 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-12
 - fixed FTBFS in F12 and higher (#540921)
 



From mbarnes at fedoraproject.org  Wed Dec  2 16:56:06 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 16:56:06 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp-2.29.3-missing-webkit-1.0.patch, NONE,
	1.1 devhelp.spec, 1.118, 1.119
Message-ID: <20091202165606.8825A11C0095@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	devhelp.spec 
Added Files:
	devhelp-2.29.3-missing-webkit-1.0.patch 
Log Message:

* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.3-2
- Add patch for RH bug #543177 (missing webkit-1.0 requirement).


devhelp-2.29.3-missing-webkit-1.0.patch:
 libdevhelp-1.0.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE devhelp-2.29.3-missing-webkit-1.0.patch ---
diff -up devhelp-2.29.3/data/libdevhelp-1.0.pc.in.missing-webkit-1.0 devhelp-2.29.3/data/libdevhelp-1.0.pc.in
--- devhelp-2.29.3/data/libdevhelp-1.0.pc.in.missing-webkit-1.0	2009-12-02 10:43:27.942339456 -0500
+++ devhelp-2.29.3/data/libdevhelp-1.0.pc.in	2009-12-02 10:43:44.809331265 -0500
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: devhelp
 Description: devhelp
-Requires: gtk+-2.0
+Requires: gtk+-2.0 webkit-1.0
 Requires.private: @REQUIRES_LIBWNCK@
 Version: @VERSION@
 Libs: -L${libdir} -ldevhelp-1


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- devhelp.spec	1 Dec 2009 14:45:05 -0000	1.118
+++ devhelp.spec	2 Dec 2009 16:56:06 -0000	1.119
@@ -14,6 +14,10 @@ URL: http://developer.imendio.com/projec
 Source: http://download.gnome.org/sources/devhelp/2.28/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
+### Patches ###
+
+Patch1: devhelp-2.29.3-missing-webkit-1.0.patch
+
 ### Dependencies ###
 
 Requires(pre): GConf2 >= 2.14
@@ -52,6 +56,7 @@ into other applications such as IDEs.
 
 %prep
 %setup -q -n devhelp-%{version}
+%patch1 -p1 -b .missing-webkit-1.0
 
 # the configure script in the 2.28.0 tarball is bad
 autoreconf -f -i
@@ -141,6 +146,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.3-2
+- Add patch for RH bug #543177 (missing webkit-1.0 requirement).
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From mbarnes at fedoraproject.org  Wed Dec  2 16:56:33 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 16:56:33 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp.spec,1.119,1.120
Message-ID: <20091202165633.9D9C611C0095@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	devhelp.spec 
Log Message:
Bump the release.



Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- devhelp.spec	2 Dec 2009 16:56:06 -0000	1.119
+++ devhelp.spec	2 Dec 2009 16:56:33 -0000	1.120
@@ -6,7 +6,7 @@
 
 Name: devhelp
 Version: 2.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser



From karsten at fedoraproject.org  Wed Dec  2 16:58:46 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:58:46 +0000 (UTC)
Subject: rpms/vim/devel 7.2.314,NONE,1.1
Message-ID: <20091202165846.47AB011C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	7.2.314 
Log Message:
- patchlevel 314


--- NEW FILE 7.2.314 ---
To: vim-dev at vim.org
Subject: Patch 7.2.314
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.314
Problem:    Missing function in small build.
Solution:   Always include concat_str.
Files:	    src/misc1.c


*** ../vim-7.2.313/src/misc1.c	2009-12-02 17:15:04.000000000 +0100
--- src/misc1.c	2009-12-02 17:44:55.000000000 +0100
***************
*** 4666,4672 ****
      return dest;
  }
  
- #if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
  /*
   * Concatenate two strings and return the result in allocated memory.
   * Returns NULL when out of memory.
--- 4666,4671 ----
***************
*** 4687,4693 ****
      }
      return dest;
  }
- #endif
  
  /*
   * Add a path separator to a file name, unless it already ends in a path
--- 4686,4691 ----
*** ../vim-7.2.313/src/version.c	2009-12-02 17:15:04.000000000 +0100
--- src/version.c	2009-12-02 17:47:18.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     314,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
9. All your daydreaming is preoccupied with getting a faster connection to the
   net: 28.8...ISDN...cable modem...T1...T3.

 /// 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 karsten at fedoraproject.org  Wed Dec  2 16:59:28 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  2 Dec 2009 16:59:28 +0000 (UTC)
Subject: rpms/vim/devel README.patches,1.124,1.125
Message-ID: <20091202165928.084A611C0095@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	README.patches 
Log Message:
- patchlevel 314


Index: README.patches
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/README.patches,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- README.patches	9 Nov 2009 15:55:14 -0000	1.124
+++ README.patches	2 Dec 2009 16:59:27 -0000	1.125
@@ -26,6 +26,7 @@ Collection of patches for Vim 7.2:
   SIZE  NAME                  INCLUDES
 108889  7.2.001-100.gz        patches 7.2.001 to 7.2.100, gzip'ed
 208102  7.2.101-200.gz        patches 7.2.101 to 7.2.200, gzip'ed
+ 82163  7.2.201-300.gz        patches 7.2.201 to 7.2.300, gzip'ed
 
 Individual patches for Vim 7.2:
 
@@ -314,3 +315,33 @@ Individual patches for Vim 7.2:
   1584  7.2.282  a fold can't be closed
   2030  7.2.283  GTK: changing font doesn't keep the window maximized
   1572  7.2.284  two windows on a buffer + folding: display error after change
+  1931  7.2.285  (after 7.2.169) CTRL-U in Insert mode also deletes indent
+  7058  7.2.286  (after 7.2.269) --startuptime argument is not consistent
+  1733  7.2.287  warning from gcc 3.4 about uninitialized variable
+  1680  7.2.288  Python 2.6 pyconfig.h redefines macros
+  3979  7.2.289  checking wrong struct member
+  5344  7.2.290  not freeing memory from ":lmap", ":xmap" and ":menutranslate"
+  1498  7.2.291  reading uninitialised memory in arabic mode
+  1518  7.2.292  block right-shift wrong with multibyte encoding and 'list' set
+  1954  7.2.293  when setting 'comments' option it may be used in a wrong way
+  8992  7.2.294  when using TEMPDIRS dir name could get too long
+  4053  7.2.295  in map() on a List the index is not known, set v:key to index
+  1809  7.2.296  (after 7.2.286) help message about startuptime is wrong
+  1846  7.2.297  reading freed memory when writing ":reg" output to a register
+  1608  7.2.298  ":vimgrep" crashes with an autocommand that sets w: variable
+  1733  7.2.299  crash when comment middle is longer than start
+  5886  7.2.300  file descriptors not closed when executing external command
+ 14601  7.2.301  formatting is wrong when 'tw' is set to a small value
+  4941  7.2.302  (extra, after 7.2.301) extra part of the 7.2.301 tests
+  2073  7.2.303  (after 7.2.294) can't build on MS-Windows
+  1831  7.2.304  compiler warning for bad pointer cast
+  2727  7.2.305  recursively redrawing causes a memory leak
+  1541  7.2.306  shellescape("10%%", 1) only escapes first %
+  4869  7.2.307  crash with a very long syntax match statement
+  5504  7.2.308  submatch() in "\=" of ":s" command returns empty string
+  1533  7.2.309  (after 7.2.308) warning for missing function prototype
+  1874  7.2.310  ftdetect plugin using ":setf" doesn't work with # comment
+  1408  7.2.311  can't compile with FreeMiNT
+  9769  7.2.312  iconv() returns invalid char sequence when conversion fails
+  3744  7.2.313  command line completion doesn't work after "%:h" and similar
+  1620  7.2.314  small build broken after 7.2.313



From deji at fedoraproject.org  Wed Dec  2 17:07:24 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed,  2 Dec 2009 17:07:24 +0000 (UTC)
Subject: File bibletime-2.4.tar.gz uploaded to lookaside cache by deji
Message-ID: <20091202170724.7739C10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for bibletime:

b0c94ddcff2cace3ebbdbb9aeda5cc59  bibletime-2.4.tar.gz



From s4504kr at fedoraproject.org  Wed Dec  2 17:08:14 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  2 Dec 2009 17:08:14 +0000 (UTC)
Subject: rpms/clojure/devel clojure.spec,1.12,1.13
Message-ID: <20091202170814.EFC2A11C0095@cvs1.fedora.phx.redhat.com>

Author: s4504kr

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

Modified Files:
	clojure.spec 
Log Message:
Put pom file into maven repository


Index: clojure.spec
===================================================================
RCS file: /cvs/extras/rpms/clojure/devel/clojure.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- clojure.spec	2 Dec 2009 16:05:55 -0000	1.12
+++ clojure.spec	2 Dec 2009 17:08:14 -0000	1.13
@@ -2,7 +2,7 @@
 Name:           clojure
 Epoch:		1
 Version:     	1.0.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
@@ -60,9 +60,19 @@ cp clojure.jar %{buildroot}%{_javadir}/%
 install -d -m 755 %{buildroot}%{_bindir}
 cp %{SOURCE1} %{buildroot}%{_bindir}/clojure
 
+install -d %{buildroot}%{_datadir}/maven2/poms
+%add_to_maven_depmap clojure clojur-lang %{version} JPP/%{name} clojure-lang
+install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-clojure-lang.pom
+
 %clean
 rm -rf %{buildroot}
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
 %files
 %defattr(-,root,root,-)
 %doc readme.txt epl-v10.html
@@ -71,8 +81,13 @@ rm -rf %{buildroot}
 %{_javadir}/%{name}.jar
 %{_datadir}/%{name}
 %{_bindir}/clojure
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}/*
 
 %changelog
+* Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-5
+- Installing maven pom file
+
 * Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-3
 - Add Epoch to get proper EVR path
 



From deji at fedoraproject.org  Wed Dec  2 17:08:44 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed,  2 Dec 2009 17:08:44 +0000 (UTC)
Subject: rpms/bibletime/devel .cvsignore, 1.12, 1.13 bibletime.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <20091202170844.F02FB11C0095@cvs1.fedora.phx.redhat.com>

Author: deji

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

Modified Files:
	.cvsignore bibletime.spec sources 
Log Message:
* Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
- Update to 2.4
- Update the description and summary.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	30 Sep 2009 15:27:00 -0000	1.12
+++ .cvsignore	2 Dec 2009 17:08:44 -0000	1.13
@@ -1 +1 @@
-bibletime-2.2.tar.gz
+bibletime-2.4.tar.gz


Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/bibletime.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- bibletime.spec	30 Sep 2009 15:27:01 -0000	1.17
+++ bibletime.spec	2 Dec 2009 17:08:44 -0000	1.18
@@ -1,6 +1,6 @@
-Summary:	BibleTime is an easy to use Bible study tool for KDE
+Summary:	An easy to use Bible study tool
 Name:		bibletime
-Version:	2.2
+Version:	2.4
 Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
@@ -13,7 +13,7 @@ BuildRequires:	boost-devel openssl-devel
 BuildRequires:	desktop-file-utils gettext
 
 %description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
+BibleTime is a free and easy to use cross-platform bible study tool.
 
 BibleTime provides easy handling of digitalized texts (Bibles,
 commentaries and lexicons) and powerful features to work with these
@@ -82,6 +82,10 @@ done
 %doc ChangeLog README LICENSE
 
 %changelog
+* Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
+- Update to 2.4
+- Update the description and summary.
+
 * Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 2.2-1
 - Update to 2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	30 Sep 2009 15:27:01 -0000	1.12
+++ sources	2 Dec 2009 17:08:44 -0000	1.13
@@ -1 +1 @@
-ad4affc7aa847c0fd9b06cc55cc6919f  bibletime-2.2.tar.gz
+b0c94ddcff2cace3ebbdbb9aeda5cc59  bibletime-2.4.tar.gz



From deji at fedoraproject.org  Wed Dec  2 17:15:58 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed,  2 Dec 2009 17:15:58 +0000 (UTC)
Subject: rpms/bibletime/F-12 bibletime.spec,1.17,1.18 sources,1.12,1.13
Message-ID: <20091202171558.9BF7A11C0095@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/bibletime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30768

Modified Files:
	bibletime.spec sources 
Log Message:
* Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
- Update to 2.4
- Update the description and summary.



Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-12/bibletime.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- bibletime.spec	30 Sep 2009 16:00:00 -0000	1.17
+++ bibletime.spec	2 Dec 2009 17:15:58 -0000	1.18
@@ -1,6 +1,6 @@
-Summary:	BibleTime is an easy to use Bible study tool for KDE
+Summary:	An easy to use Bible study tool
 Name:		bibletime
-Version:	2.2
+Version:	2.4
 Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
@@ -13,7 +13,7 @@ BuildRequires:	boost-devel openssl-devel
 BuildRequires:	desktop-file-utils gettext
 
 %description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
+BibleTime is a free and easy to use cross-platform bible study tool.
 
 BibleTime provides easy handling of digitalized texts (Bibles,
 commentaries and lexicons) and powerful features to work with these
@@ -82,6 +82,10 @@ done
 %doc ChangeLog README LICENSE
 
 %changelog
+* Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
+- Update to 2.4
+- Update the description and summary.
+
 * Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 2.2-1
 - Update to 2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	30 Sep 2009 16:00:00 -0000	1.12
+++ sources	2 Dec 2009 17:15:58 -0000	1.13
@@ -1 +1 @@
-ad4affc7aa847c0fd9b06cc55cc6919f  bibletime-2.2.tar.gz
+b0c94ddcff2cace3ebbdbb9aeda5cc59  bibletime-2.4.tar.gz



From deji at fedoraproject.org  Wed Dec  2 17:18:07 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed,  2 Dec 2009 17:18:07 +0000 (UTC)
Subject: rpms/bibletime/F-11 bibletime.spec,1.14,1.15 sources,1.10,1.11
Message-ID: <20091202171807.E1EE611C0095@cvs1.fedora.phx.redhat.com>

Author: deji

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

Modified Files:
	bibletime.spec sources 
Log Message:
* Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
- Update to 2.4
- Update the description and summary.



Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-11/bibletime.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- bibletime.spec	9 Jun 2009 02:06:32 -0000	1.14
+++ bibletime.spec	2 Dec 2009 17:18:07 -0000	1.15
@@ -1,6 +1,6 @@
-Summary:	BibleTime is an easy to use Bible study tool for KDE
+Summary:	An easy to use Bible study tool
 Name:		bibletime
-Version:	2.0.1
+Version:	2.4
 Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
@@ -13,7 +13,7 @@ BuildRequires:	boost-devel openssl-devel
 BuildRequires:	desktop-file-utils gettext
 
 %description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
+BibleTime is a free and easy to use cross-platform bible study tool.
 
 BibleTime provides easy handling of digitalized texts (Bibles,
 commentaries and lexicons) and powerful features to work with these
@@ -82,6 +82,10 @@ done
 %doc ChangeLog README LICENSE
 
 %changelog
+* Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
+- Update to 2.4
+- Update the description and summary.
+
 * Sat Jun 06 2009 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
 - Update to 2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Jun 2009 02:06:32 -0000	1.10
+++ sources	2 Dec 2009 17:18:07 -0000	1.11
@@ -1 +1 @@
-1eaef5b96a9749932d50ac8f888c3778  bibletime-2.0.1.tar.gz
+b0c94ddcff2cace3ebbdbb9aeda5cc59  bibletime-2.4.tar.gz



From wtogami at fedoraproject.org  Wed Dec  2 17:18:17 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 17:18:17 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.101,1.102
Message-ID: <20091202171817.8318711C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	pidgin.spec 
Log Message:
disable SILC in EL6 builds



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- pidgin.spec	30 Nov 2009 06:14:14 -0000	1.101
+++ pidgin.spec	2 Dec 2009 17:18:17 -0000	1.102
@@ -36,6 +36,7 @@
 %define nss_md2_disabled	0
 %define vv_support		0
 %define libidn_support		0
+%define disable_silc		0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -83,6 +84,11 @@
 %if 0%{?fedora} >= 12
 %define krb4_removed	1
 %endif
+# EL6: Disable SILC protocol
+# (get rid of extra crypto lib for perpetually broken protocol that nobody uses)
+%if 0%{?rhel} == 6
+%define disable_silc	1
+%endif
 
 Name:		pidgin
 Version:	2.6.4
@@ -166,7 +172,9 @@ BuildRequires:	gtkspell-devel
 # Evolution integration (FC3+)
 BuildRequires:	evolution-data-server-devel
 # SILC integration (FC3+)
+%if ! %{disable_silc}
 BuildRequires:	libsilc-devel
+%endif
 # DBus integration (FC5+)
 %if %{dbus_integration}
 BuildRequires:  dbus-devel >= 0.60
@@ -623,6 +631,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> 2.6.4-2
+- disable SILC in EL6 builds
+
 * Mon Nov 30 2009 Warren Togami <wtogami at redhat.com> 2.6.4-1
 - 2.6.4
 



From wtogami at fedoraproject.org  Wed Dec  2 17:19:09 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 17:19:09 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.102,1.103
Message-ID: <20091202171909.AB44D11C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	pidgin.spec 
Log Message:
bump



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- pidgin.spec	2 Dec 2009 17:18:17 -0000	1.102
+++ pidgin.spec	2 Dec 2009 17:19:09 -0000	1.103
@@ -92,7 +92,7 @@
 
 Name:		pidgin
 Version:	2.6.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls



From deji at fedoraproject.org  Wed Dec  2 17:21:29 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed,  2 Dec 2009 17:21:29 +0000 (UTC)
Subject: rpms/bibletime/F-10 bibletime.spec,1.12,1.13 sources,1.9,1.10
Message-ID: <20091202172129.D6CD511C0095@cvs1.fedora.phx.redhat.com>

Author: deji

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

Modified Files:
	bibletime.spec sources 
Log Message:
* Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
- Update to 2.4
- Update the description and summary.



Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-10/bibletime.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- bibletime.spec	9 Jun 2009 02:20:28 -0000	1.12
+++ bibletime.spec	2 Dec 2009 17:21:29 -0000	1.13
@@ -1,6 +1,6 @@
-Summary:	BibleTime is an easy to use Bible study tool for KDE
+Summary:	An easy to use Bible study tool
 Name:		bibletime
-Version:	2.0.1
+Version:	2.4
 Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
@@ -13,7 +13,7 @@ BuildRequires:	boost-devel openssl-devel
 BuildRequires:	desktop-file-utils gettext
 
 %description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
+BibleTime is a free and easy to use cross-platform bible study tool.
 
 BibleTime provides easy handling of digitalized texts (Bibles,
 commentaries and lexicons) and powerful features to work with these
@@ -82,6 +82,10 @@ done
 %doc ChangeLog README LICENSE
 
 %changelog
+* Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
+- Update to 2.4
+- Update the description and summary.
+
 * Mon Jun 08 2009 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
 - Update to 2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	9 Jun 2009 02:20:28 -0000	1.9
+++ sources	2 Dec 2009 17:21:29 -0000	1.10
@@ -1 +1 @@
-1eaef5b96a9749932d50ac8f888c3778  bibletime-2.0.1.tar.gz
+b0c94ddcff2cace3ebbdbb9aeda5cc59  bibletime-2.4.tar.gz



From sergiopr at fedoraproject.org  Wed Dec  2 17:23:02 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed,  2 Dec 2009 17:23:02 +0000 (UTC)
Subject: File tkimg-20091129.tar.gz uploaded to lookaside cache by sergiopr
Message-ID: <20091202172302.92B5310F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tkimg:

bd975c977f6ec59d905ffeebe52431c9  tkimg-20091129.tar.gz



From kdudka at fedoraproject.org  Wed Dec  2 17:31:14 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  2 Dec 2009 17:31:14 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.128,1.129
Message-ID: <20091202173114.D3A1711C0095@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	curl.spec 
Log Message:
- avoid use of uninitialized value in lib/nss.c


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- curl.spec	1 Dec 2009 13:30:20 -0000	1.128
+++ curl.spec	2 Dec 2009 17:31:14 -0000	1.129
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -9,6 +9,7 @@ Source2: curlbuild.h
 Patch1: curl-7.19.7-nss-nonblock.patch
 Patch2: curl-7.19.7-ssl-retry.patch
 Patch3: curl-7.19.7-modelfree.patch
+Patch4: curl-7.19.7-nss-warning.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -84,6 +85,7 @@ use cURL's capabilities internally.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -173,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 02 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-5
+- avoid use of uninitialized value in lib/nss.c
+
 * Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
 - do not require valgrind on s390 and s390x
 - temporarily disabled SCP/SFTP test-suite (#539444)



From kdudka at fedoraproject.org  Wed Dec  2 17:31:31 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  2 Dec 2009 17:31:31 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.7-nss-warning.patch,NONE,1.1
Message-ID: <20091202173131.AA54511C0095@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Added Files:
	curl-7.19.7-nss-warning.patch 
Log Message:
- avoid use of uninitialized value in lib/nss.c

curl-7.19.7-nss-warning.patch:
 nss.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE curl-7.19.7-nss-warning.patch ---
diff --git a/lib/nss.c b/lib/nss.c
index d1a9d1a..637663e 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -990,7 +990,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
 {
   PRInt32 err;
   PRFileDesc *model = NULL;
-  PRBool ssl2, ssl3, tlsv1;
+  PRBool ssl2 = PR_FALSE;
+  PRBool ssl3 = PR_FALSE;
+  PRBool tlsv1 = PR_FALSE;
   struct SessionHandle *data = conn->data;
   curl_socket_t sockfd = conn->sock[sockindex];
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
@@ -1106,8 +1108,6 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
   if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) != SECSuccess)
     goto error;
 
-  ssl2 = ssl3 = tlsv1 = PR_FALSE;
-
   switch (data->set.ssl.version) {
   default:
   case CURL_SSLVERSION_DEFAULT:



From sergiopr at fedoraproject.org  Wed Dec  2 17:46:32 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed,  2 Dec 2009 17:46:32 +0000 (UTC)
Subject: rpms/tkimg/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tkimg.spec, 
	1.14, 1.15
Message-ID: <20091202174632.8FC0811C0095@cvs1.fedora.phx.redhat.com>

Author: sergiopr

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

Modified Files:
	.cvsignore sources tkimg.spec 
Log Message:
* Tue Dec 01 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.6.20091129svn
- New upstream source, version 228 from trunk
- Provides man pages
- Passing tests for sgi format
- Fixes bz #542356



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Nov 2008 12:23:42 -0000	1.4
+++ .cvsignore	2 Dec 2009 17:46:32 -0000	1.5
@@ -1 +1 @@
-tkimg-20081115.tar.gz
+tkimg-20091129.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Nov 2008 12:23:42 -0000	1.4
+++ sources	2 Dec 2009 17:46:32 -0000	1.5
@@ -1 +1 @@
-5da60e405571cb81d66ae0bb88b93f8f  tkimg-20081115.tar.gz
+bd975c977f6ec59d905ffeebe52431c9  tkimg-20091129.tar.gz


Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/devel/tkimg.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tkimg.spec	27 Jul 2009 06:01:47 -0000	1.14
+++ tkimg.spec	2 Dec 2009 17:46:32 -0000	1.15
@@ -1,11 +1,11 @@
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 # Data from subversion
-%define svnversion 20081115
+%define svnversion 20091129
 
 Name: tkimg
 Version: 1.4
-Release: 0.5.%{svnversion}svn%{?dist}
+Release: 0.6.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -13,8 +13,8 @@ License: BSD
 URL: http://sourceforge.net/projects/tkimg
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn export -r 173 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20081115
-#  tar -czvf tkimg-20081115.tar.gz  tkimg-20081115
+# svn export -r 228 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20091129
+#  tar -czvf tkimg-20091129.tar.gz  tkimg-20091129
 
 # Data from subversion
 Source0: %{name}-%{svnversion}.tar.gz
@@ -23,7 +23,7 @@ Source0: %{name}-%{svnversion}.tar.gz
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: tcl-devel tk-devel
+BuildRequires: tcl-devel tk-devel tcllib
 BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel libXft-devel
 
 Requires: tcl(abi) = 8.5
@@ -47,12 +47,19 @@ This are the header files needed to deve
 %setup -q -n %{name}-%{svnversion}
 
 %build
-%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch}
-%{__make} %{?_smp_mflags}
+%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} --disable-threads --enable-64bit
+
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
+rm -rf %{buildroot}
+make %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
+
+# configure ignores mandir
+# bug report
+# https://sourceforge.net/tracker/?func=detail&aid=2907616&group_id=52039&atid=465492
+mkdir -p %{buildroot}/%{_mandir}/mann
+mv %{buildroot}/usr/man/mann/* %{buildroot}/%{_mandir}/mann
 
 # Fixing some permissions
 find %{buildroot}/%{tcl_sitearch} -name "*.sh" |xargs chmod 644
@@ -61,14 +68,14 @@ find %{buildroot}/%{tcl_sitearch} -name 
 find %{buildroot}/%{tcl_sitearch} -name "*.so" |xargs chmod 755
 
 # Make library links
-%{__mv} %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir}
+mv %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir}
 for tcllibs in %{buildroot}/%{tcl_sitearch}/Img1.4/*tcl*.so; do
 btcllibs=`basename $tcllibs`
-%{__ln_s} tcl%{tcl_version}/Img1.4/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
+ln -s tcl%{tcl_version}/Img1.4/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
 done
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -79,6 +86,7 @@ done
 %doc README
 %{_libdir}/*.so
 %{tcl_sitearch}/Img1.4
+%{_mandir}/mann/img*
 %exclude %{tcl_sitearch}/Img1.4/*.a
 
 %files devel
@@ -89,6 +97,12 @@ done
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
+* Tue Dec 01 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.6.20091129svn
+- New upstream source, version 228 from trunk
+- Provides man pages
+- Passing tests for sgi format
+- Fixes bz #542356
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-0.5.20081115svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stevetraylen at fedoraproject.org  Wed Dec  2 17:53:43 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed,  2 Dec 2009 17:53:43 +0000 (UTC)
Subject: rpms/xmltooling/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xmltooling.spec, 1.4, 1.5
Message-ID: <20091202175343.9E88511C0095@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

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

Modified Files:
	.cvsignore sources xmltooling.spec 
Log Message:
Upstream 1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Nov 2009 08:08:14 -0000	1.3
+++ .cvsignore	2 Dec 2009 17:53:43 -0000	1.4
@@ -1 +1,2 @@
 xmltooling-1.3.1.tar.gz
+xmltooling-1.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Nov 2009 08:08:14 -0000	1.3
+++ sources	2 Dec 2009 17:53:43 -0000	1.4
@@ -1 +1 @@
-bde914f9c5742c9e01ec06a091423553  xmltooling-1.3.1.tar.gz
+92c416258717fdb2ca8151d76cded225  xmltooling-1.3.2.tar.gz


Index: xmltooling.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/devel/xmltooling.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xmltooling.spec	19 Nov 2009 14:06:30 -0000	1.4
+++ xmltooling.spec	2 Dec 2009 17:53:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xmltooling
-Version:        1.3.1
-Release:        2%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        XML signing and encrytion library
 
 Group:          System Environment/Libraries
@@ -123,6 +123,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Dec 2 2009 Steve Traylen <steve.traylen at cern.ch> 1.3.2-1
+- New upstream 1.3.2
 * Thu Nov 19 2009 Steve Traylen <steve.traylen at cern.ch> 1.3.1-2
 - New upstream
 - Addition of graphviz to build requires.



From kdudka at fedoraproject.org  Wed Dec  2 17:55:24 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  2 Dec 2009 17:55:24 +0000 (UTC)
Subject: rpms/curl/F-12 curl-7.19.7-nss-warning.patch, NONE, 1.1 curl.spec, 
	1.124, 1.125
Message-ID: <20091202175524.5011B11C0095@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8368

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-nss-warning.patch 
Log Message:
- avoid use of uninitialized value in lib/nss.c

curl-7.19.7-nss-warning.patch:
 nss.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE curl-7.19.7-nss-warning.patch ---
diff --git a/lib/nss.c b/lib/nss.c
index d1a9d1a..637663e 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -990,7 +990,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
 {
   PRInt32 err;
   PRFileDesc *model = NULL;
-  PRBool ssl2, ssl3, tlsv1;
+  PRBool ssl2 = PR_FALSE;
+  PRBool ssl3 = PR_FALSE;
+  PRBool tlsv1 = PR_FALSE;
   struct SessionHandle *data = conn->data;
   curl_socket_t sockfd = conn->sock[sockindex];
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
@@ -1106,8 +1108,6 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
   if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) != SECSuccess)
     goto error;
 
-  ssl2 = ssl3 = tlsv1 = PR_FALSE;
-
   switch (data->set.ssl.version) {
   default:
   case CURL_SSLVERSION_DEFAULT:


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- curl.spec	1 Dec 2009 13:29:27 -0000	1.124
+++ curl.spec	2 Dec 2009 17:55:24 -0000	1.125
@@ -1,13 +1,14 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Source2: curlbuild.h
 Patch1: curl-7.19.7-modelfree.patch
 Patch2: curl-7.19.7-ssl-retry.patch
+Patch3: curl-7.19.7-nss-warning.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -81,6 +82,7 @@ use cURL's capabilities internally.
 # upstream patches (already applied)
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -170,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 02 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
+- avoid use of uninitialized value in lib/nss.c
+
 * Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-3
 - do not require valgrind on s390 and s390x
 - temporarily disabled SCP/SFTP test-suite (#539444)



From rmeggins at fedoraproject.org  Wed Dec  2 18:09:38 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  2 Dec 2009 18:09:38 +0000 (UTC)
Subject: File 389-ds-base-1.2.5.rc1.tar.bz2 uploaded to lookaside cache by
	rmeggins
Message-ID: <20091202180938.E659110F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for 389-ds-base:

96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2



From djuran at fedoraproject.org  Wed Dec  2 18:10:26 2009
From: djuran at fedoraproject.org (David Juran)
Date: Wed,  2 Dec 2009 18:10:26 +0000 (UTC)
Subject: rpms/azureus/F-12 .cvsignore, 1.17,
	1.18 azureus-4.0.0.4-boo-osx.diff, 
	1.3, 1.4 azureus-no-update-manager-AzureusCoreImpl.patch, 1.2,
	1.3 azureus-no-update-manager-CoreUpdateChecker.patch, 1.6,
	1.7 azureus-no-update-manager-UpdateMonitor.patch, 1.8,
	1.9 azureus.spec, 1.80, 1.81 sources, 1.17, 1.18
Message-ID: <20091202181026.B359011C03E3@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/azureus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12201

Modified Files:
	.cvsignore azureus-4.0.0.4-boo-osx.diff 
	azureus-no-update-manager-AzureusCoreImpl.patch 
	azureus-no-update-manager-CoreUpdateChecker.patch 
	azureus-no-update-manager-UpdateMonitor.patch azureus.spec 
	sources 
Log Message:
- upgrade to 4.3.0.4 (Bz 540179)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	13 Sep 2009 08:49:24 -0000	1.17
+++ .cvsignore	2 Dec 2009 18:10:26 -0000	1.18
@@ -1 +1 @@
-Vuze_4.2.0.8_source.zip
+Vuze_4.3.0.4_source.zip

azureus-4.0.0.4-boo-osx.diff:
 SWTThread.java |   51 ---------------------------------------------------
 1 file changed, 51 deletions(-)

Index: azureus-4.0.0.4-boo-osx.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus-4.0.0.4-boo-osx.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-4.0.0.4-boo-osx.diff	13 Sep 2009 08:49:25 -0000	1.3
+++ azureus-4.0.0.4-boo-osx.diff	2 Dec 2009 18:10:26 -0000	1.4
@@ -1,31 +1,61 @@
-diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
---- org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx	2009-04-16 20:46:42.000000000 +0300
-+++ org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java	2009-07-31 19:35:41.000000000 +0300
-@@ -153,25 +153,6 @@ public class SWTThread {
+diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
+--- azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx	2009-10-30 01:16:06.000000000 +0200
++++ azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java	2009-11-19 21:24:45.000000000 +0200
+@@ -175,57 +175,6 @@ public class SWTThread {
  			}
  		});
-     
--    if ( Constants.isOSX && SWT.getPlatform().equals("carbon") ){
--    	
--    		// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--    	
--    	 try{
--    	 	
--            Class ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--            
--            Constructor constructor = ehancerClass.getConstructor(new Class[]{});
--            
--            constructor.newInstance(new Object[] {});
--
--        } catch (Exception e) {
--        	
--            Debug.printStackTrace(e);
--        }
--    }
--    
+ 
+-		if (Constants.isOSX) {
+-			
+-			// On Cocoa, we get a Close trigger on display.  Need to check if all
+-			// platforms send this.
+-			display.addListener(SWT.Close, new Listener() {
+-				public void handleEvent(Event event) {
+-					event.doit = UIFunctionsManager.getUIFunctions().dispose(false, false);
+-				}
+-			});
+-
+-			String platform = SWT.getPlatform();
+-			// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
+-
+-			if (platform.equals("carbon")) {
+-				try {
+-
+-					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
+-
+-					Constructor<?> constructor = ehancerClass.getConstructor(new Class[] {});
+-
+-					constructor.newInstance(new Object[] {});
+-
+-				} catch (Throwable e) {
+-
+-					Debug.printStackTrace(e);
+-				}
+-			} else if (platform.equals("cocoa")) {
+-				try {
+-
+-					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
+-
+-					Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
+-					Object claObj = mGetInstance.invoke(null, new Object[0] );
+-
+-					Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
+-					if (mHookAppMenu != null) {
+-						mHookAppMenu.invoke(claObj, new Object[0]);
+-					}
+-
+-					Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
+-					if (mHookDocOpen != null) {
+-						mHookDocOpen.invoke(claObj, new Object[0]);
+-					}
+-					
+-				} catch (Throwable e) {
+-
+-					Debug.printStackTrace(e);
+-				}
+-			}
+-		}   
 -
  		if (app != null) {
  			app.runInSWTThread();
  			runner = new Thread(new AERunnable() {
-diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/osx/Start.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/osx/Start.java
-diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java

azureus-no-update-manager-AzureusCoreImpl.patch:
 AzureusCoreImpl.java |    8 --------
 1 file changed, 8 deletions(-)

Index: azureus-no-update-manager-AzureusCoreImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus-no-update-manager-AzureusCoreImpl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- azureus-no-update-manager-AzureusCoreImpl.patch	12 May 2006 14:35:02 -0000	1.2
+++ azureus-no-update-manager-AzureusCoreImpl.patch	2 Dec 2009 18:10:26 -0000	1.3
@@ -1,9 +1,11 @@
---- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig	2006-03-25 14:17:49.000000000 -0800
-+++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java	2006-03-25 15:14:01.000000000 -0800
-@@ -584,14 +584,6 @@
+diff -up azureus-4.3.0.0/com/aelitis/azureus/core/impl/AzureusCoreImpl.java.no-update-manager-AzureusCoreImpl azureus-4.3.0.0/com/aelitis/azureus/core/impl/AzureusCoreImpl.java
+--- azureus-4.3.0.0/com/aelitis/azureus/core/impl/AzureusCoreImpl.java.no-update-manager-AzureusCoreImpl	2009-11-10 23:07:36.000000000 +0200
++++ azureus-4.3.0.0/com/aelitis/azureus/core/impl/AzureusCoreImpl.java	2009-11-19 21:10:10.000000000 +0200
+@@ -1341,14 +1341,6 @@ AzureusCoreImpl 
+ 	
  			if (Logger.isEnabled())
  				Logger.log(new LogEvent(LOGID, "Stop operation completes"));
- 	
+-	
 -				// if any installers exist then we need to closedown via the updater
 -			
 -			if ( 	apply_updates && 
@@ -11,7 +13,6 @@
 -				
 -				AzureusRestarterFactory.create( this ).restart( true );
 -			}
--			
- 			try{
- 				ThreadGroup	tg = Thread.currentThread().getThreadGroup();
- 				
+ 			
+ 			try {
+ 	      Class c = Class.forName( "sun.awt.AWTAutoShutdown" );

azureus-no-update-manager-CoreUpdateChecker.patch:
 CoreUpdateChecker.java |  304 -------------------------------------------------
 1 file changed, 2 insertions(+), 302 deletions(-)

Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- azureus-no-update-manager-CoreUpdateChecker.patch	13 Sep 2009 15:36:35 -0000	1.6
+++ azureus-no-update-manager-CoreUpdateChecker.patch	2 Dec 2009 18:10:26 -0000	1.7
@@ -1,6 +1,6 @@
-diff -up azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java
---- azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker	2009-07-07 00:52:10.000000000 +0200
-+++ azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java	2009-09-13 12:41:05.000000000 +0200
+diff -up azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker	2009-11-04 03:23:06.000000000 +0200
++++ azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java	2009-11-19 21:15:38.000000000 +0200
 @@ -127,8 +127,6 @@ CoreUpdateChecker
  		props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
  		
@@ -21,7 +21,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
 -													
 -			Map	decoded = VersionCheckClient.getSingleton().getVersionCheckInfo(
 -		  			first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC);
- 
+-
 -      
 -			displayUserMessage( decoded );
 -			
@@ -58,7 +58,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
 -			}
 -			
 -			//latest_version 		= "3.0.0.3";
--			//latest_file_name	= "http://torrents.aelitis.com:88/torrents/Azureus2.5.0.0.jar.torrent";
+-			//latest_file_name	= "http://torrent.vuze.com:88/torrents/Azureus2.5.0.0.jar.torrent";
 -			//latest_file_name	= "Azureus2.5.0.0.jar.torrent";
 -			
 -			String	msg = "Core: latest_version = '" + latest_version + "', file = '" + latest_file_name + "'";
@@ -312,11 +312,13 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
 -			checker.failed();
 -			
 -		}finally{
- 			
+-			
++	    			
  			checker.completed();
  			
  			first_check = false;
 -		}
++	
  	}
  	
        

azureus-no-update-manager-UpdateMonitor.patch:
 UpdateMonitor.java |  170 -----------------------------------------------------
 1 file changed, 170 deletions(-)

Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- azureus-no-update-manager-UpdateMonitor.patch	13 Sep 2009 15:36:35 -0000	1.8
+++ azureus-no-update-manager-UpdateMonitor.patch	2 Dec 2009 18:10:26 -0000	1.9
@@ -1,25 +1,19 @@
-diff -up azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
---- azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor	2009-07-08 19:00:26.000000000 +0200
-+++ azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2009-09-13 13:24:24.000000000 +0200
-@@ -100,66 +100,66 @@ public class UpdateMonitor
+diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
+--- azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor	2009-10-21 02:26:22.000000000 +0300
++++ azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2009-11-19 21:19:57.000000000 +0200
+@@ -98,70 +98,6 @@ public class UpdateMonitor
  	protected UpdateMonitor(AzureusCore _azureus_core) {
  		azCore = _azureus_core;
  
 -		PluginInterface defPI = PluginInitializer.getDefaultInterface();
 -		UpdateManager um = defPI.getUpdateManager();
-+// 		PluginInterface defPI = PluginInitializer.getDefaultInterface();
-+// 		UpdateManager um = defPI.getUpdateManager();
- 
+-
 -		um.addListener(new UpdateManagerListener() {
 -			public void checkInstanceCreated(UpdateCheckInstance instance) {
 -				instance.addListener(UpdateMonitor.this);
-+// 		um.addListener(new UpdateManagerListener() {
-+// 			public void checkInstanceCreated(UpdateCheckInstance instance) {
-+// 				instance.addListener(UpdateMonitor.this);
- 				
+-				
 -				if ( !instance.isLowNoise()){
-+// 				if ( !instance.isLowNoise()){
- 				
+-				
 -					new updateStatusChanger(instance);
 -				}
 -			}
@@ -35,12 +29,15 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
 -							+ "accept.unverified.text", new String[] {
 -						update.getName()
 -					});
--					return uiFunctions.promptUser(title, text, new String[] {
+-					UIFunctionsUserPrompter prompter = uiFunctions.getUserPrompter(title, text, new String[] {
 -						MessageText.getString("Button.yes"),
 -						MessageText.getString("Button.no")
--					}, 1, MSG_PREFIX + "accept.unverified",
--							MessageText.getString("MessageBoxWindow.nomoreprompting"), false,
--							0) == 0;
+-					}, 1);
+-					prompter.setRemember(MSG_PREFIX + "accept.unverified", false,
+-							MessageText.getString("MessageBoxWindow.nomoreprompting"));
+-					prompter.setAutoCloseInMS(0);
+-					prompter.open(null);
+-					return prompter.waitUntilClosed() == 0;
 -				}
 -
 -				return false;
@@ -59,7 +56,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
 -					});
 -					uiFunctions.promptUser(title, text, new String[] {
 -						MessageText.getString("Button.ok")
--					}, 0, null, null, false, 0);
+-					}, 0, null, null, false, 0, null);
 -				}
 -			}
 -		});
@@ -71,61 +68,11 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
 -						performAutoCheck(false);
 -					}
 -				});
-+// 					new updateStatusChanger(instance);
-+// 				}
-+// 			}
-+// 		});
-+
-+// 		um.addVerificationListener(new UpdateManagerVerificationListener() {
-+// 			public boolean acceptUnVerifiedUpdate(final Update update) {
-+// 				UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-+// 				if (uiFunctions != null) {
-+// 					String title = MessageText.getString(MSG_PREFIX
-+// 							+ "accept.unverified.title");
-+// 					String text = MessageText.getString(MSG_PREFIX
-+// 							+ "accept.unverified.text", new String[] {
-+// 						update.getName()
-+// 					});
-+// 					return uiFunctions.promptUser(title, text, new String[] {
-+// 						MessageText.getString("Button.yes"),
-+// 						MessageText.getString("Button.no")
-+// 					}, 1, MSG_PREFIX + "accept.unverified",
-+// 							MessageText.getString("MessageBoxWindow.nomoreprompting"), false,
-+// 							0) == 0;
-+// 				}
-+
-+// 				return false;
-+// 			}
-+
-+// 			public void verificationFailed(final Update update, final Throwable cause) {
-+// 				final String cause_str = Debug.getNestedExceptionMessage(cause);
-+// 				UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-+// 				if (uiFunctions != null) {
-+// 					String title = MessageText.getString(MSG_PREFIX
-+// 							+ "verification.failed.title");
-+// 					String text = MessageText.getString(MSG_PREFIX
-+// 							+ "verification.failed.text", new String[] {
-+// 						update.getName(),
-+// 						cause_str
-+// 					});
-+// 					uiFunctions.promptUser(title, text, new String[] {
-+// 						MessageText.getString("Button.ok")
-+// 					}, 0, null, null, false, 0);
-+// 				}
-+// 			}
-+// 		});
-+
-+
-+// 		SimpleTimer.addPeriodicEvent("UpdateMon:autocheck",
-+// 				AUTO_UPDATE_CHECK_PERIOD, new TimerEventPerformer() {
-+// 					public void perform(TimerEvent ev) {
-+// 						performAutoCheck(false);
-+// 					}
-+// 				});
- 
+-
  		DelayedTask delayed_task = 
  			UtilitiesImpl.addDelayedTask(
-@@ -381,43 +381,6 @@ public class UpdateMonitor
+ 				"Update Check", 
+@@ -381,43 +317,6 @@ public class UpdateMonitor
  	}
  	
  	protected void performAutoCheck(final boolean start_of_day) {
@@ -169,7 +116,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
  	}
  
  	public void 
-@@ -427,76 +390,7 @@ public class UpdateMonitor
+@@ -427,76 +326,7 @@ public class UpdateMonitor
  		final boolean						isRecheck,
  		final UpdateCheckInstanceListener 	l ) 
  	{


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- azureus.spec	13 Sep 2009 15:36:35 -0000	1.80
+++ azureus.spec	2 Dec 2009 18:10:26 -0000	1.81
@@ -1,8 +1,8 @@
 %define		_newname Vuze
 
 Name:		azureus
-Version:	4.2.0.8
-Release:	2%{?dist}
+Version:	4.3.0.4
+Release:	1%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -77,7 +77,7 @@ advanced users.
 %patch9 -p0
 %patch12 -p1 -b .no-updates-PluginInitializer
 %patch13 -p1 -b .no-updates-PluginInterfaceImpl
-%patch14 -p0
+%patch14 -p1 -b .no-update-manager-AzureusCoreImpl
 %patch15 -p0
 %patch16 -p1 -b .no-update-manager-CoreUpdateChecker
 %patch18 -p1 -b .no-update-manager-PluginInstallerImpl
@@ -125,7 +125,7 @@ rm org/gudy/azureus2/platform/win32/Plat
 rm org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
 rm org/gudy/azureus2/ui/swt/osx/Start.java
 rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
-%patch51 -b .boo-osx
+%patch51 -p1 -b .boo-osx
 %patch52 -b .orig
 %patch53 -p1 -b .boo-updating-w32
 %patch54 -b .orig
@@ -242,6 +242,9 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Wed Dec  2 2009 David Juran <djuran at redhat.com> - 4.3.0.4-1
+- upgrade to 4.3.0.4 (Bz 540179)
+
 * Sun Sep  13 2009 David Juran <djuran at redhat.com> - 4.2.0.8-2
 - revive the no-updates patches (Bz515131)
 - fix start-script to work when  /usr/share/azureus/plugins/ is empty


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	13 Sep 2009 08:49:25 -0000	1.17
+++ sources	2 Dec 2009 18:10:26 -0000	1.18
@@ -1 +1 @@
-81af0887805afe7bba9b651b022a7b1f  Vuze_4.2.0.8_source.zip
+b5de3ffbcd16d1c69281de21c2550fc8  Vuze_4.3.0.4_source.zip



From rmeggins at fedoraproject.org  Wed Dec  2 18:17:03 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  2 Dec 2009 18:17:03 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh,
	1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20091202181703.A73B511C0095@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14093/F-11

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 17:59:59 -0000	1.5
+++ .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
@@ -1,2 +1 @@
-389-ds-base-1.2.3.tar.bz2
-389-ds-base-1.2.4.tar.bz2
+389-ds-base-1.2.5.rc1.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git-local.sh	29 Oct 2009 18:00:00 -0000	1.2
+++ 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
@@ -2,9 +2,9 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc1
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
+TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base-git.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git.sh	29 Oct 2009 18:00:00 -0000	1.3
+++ 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
@@ -2,15 +2,15 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc1
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
-#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
-#SRCNAME=$PKGNAME-$VERSION-$DATE
+TAG=${TAG:-$PKGNAME-$VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
 SRCNAME=$PKGNAME-$VERSION
 
-cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME ldapserver
+wget -O $SRCNAME.tar.gz "$URL"
 
-tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-rm -rf $SRCNAME
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 389-ds-base.spec	29 Oct 2009 18:00:00 -0000	1.7
+++ 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.8
@@ -1,10 +1,14 @@
 
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .rc1
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.4
-Release:          1%{?dist}
+Version:          1.2.5
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -61,7 +65,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-ds-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Source2:          %{name}-devel.README
@@ -82,7 +86,7 @@ Obsoletes:        fedora-ds-base-devel <
 Development Libraries and headers for the 389 Directory Server base package.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 cp %{SOURCE2} README.devel
 
 %build
@@ -265,6 +269,12 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Dec  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.2.rc1
+- 1.2.5.rc1 release
+
+* Thu Nov 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.1.a1
+- 1.2.5.a1 release
+
 * Thu Oct 29 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.4-1
 - 1.2.4 release
 - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Oct 2009 22:51:23 -0000	1.7
+++ sources	2 Dec 2009 18:17:03 -0000	1.8
@@ -1 +1 @@
-fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2
+96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2



From rmeggins at fedoraproject.org  Wed Dec  2 18:17:03 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  2 Dec 2009 18:17:03 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh,
	1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20091202181703.8161B11C0095@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14093/F-10

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 17:59:59 -0000	1.5
+++ .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
@@ -1,2 +1 @@
-389-ds-base-1.2.3.tar.bz2
-389-ds-base-1.2.4.tar.bz2
+389-ds-base-1.2.5.rc1.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git-local.sh	29 Oct 2009 17:59:59 -0000	1.2
+++ 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
@@ -2,9 +2,9 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc1
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
+TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base-git.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git.sh	29 Oct 2009 17:59:59 -0000	1.3
+++ 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
@@ -2,15 +2,15 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc1
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
-#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
-#SRCNAME=$PKGNAME-$VERSION-$DATE
+TAG=${TAG:-$PKGNAME-$VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
 SRCNAME=$PKGNAME-$VERSION
 
-cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME ldapserver
+wget -O $SRCNAME.tar.gz "$URL"
 
-tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-rm -rf $SRCNAME
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 389-ds-base.spec	29 Oct 2009 17:59:59 -0000	1.7
+++ 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.8
@@ -1,10 +1,14 @@
 
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .rc1
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.4
-Release:          1%{?dist}
+Version:          1.2.5
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -61,7 +65,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-ds-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Source2:          %{name}-devel.README
@@ -82,7 +86,7 @@ Obsoletes:        fedora-ds-base-devel <
 Development Libraries and headers for the 389 Directory Server base package.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 cp %{SOURCE2} README.devel
 
 %build
@@ -265,6 +269,12 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Dec  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.2.rc1
+- 1.2.5.rc1 release
+
+* Thu Nov 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.1.a1
+- 1.2.5.a1 release
+
 * Thu Oct 29 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.4-1
 - 1.2.4 release
 - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Oct 2009 22:51:23 -0000	1.7
+++ sources	2 Dec 2009 18:17:03 -0000	1.8
@@ -1 +1 @@
-fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2
+96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2



From rmeggins at fedoraproject.org  Wed Dec  2 18:17:03 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  2 Dec 2009 18:17:03 +0000 (UTC)
Subject: rpms/389-ds-base/F-12 .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh,
	1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20091202181703.DD2BF11C0095@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14093/F-12

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 18:00:00 -0000	1.5
+++ .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
@@ -1,2 +1 @@
-389-ds-base-1.2.3.tar.bz2
-389-ds-base-1.2.4.tar.bz2
+389-ds-base-1.2.5.rc1.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git-local.sh	29 Oct 2009 18:00:00 -0000	1.2
+++ 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
@@ -2,9 +2,9 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc1
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
+TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base-git.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git.sh	29 Oct 2009 18:00:00 -0000	1.3
+++ 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
@@ -2,15 +2,15 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc1
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
-#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
-#SRCNAME=$PKGNAME-$VERSION-$DATE
+TAG=${TAG:-$PKGNAME-$VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
 SRCNAME=$PKGNAME-$VERSION
 
-cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME ldapserver
+wget -O $SRCNAME.tar.gz "$URL"
 
-tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-rm -rf $SRCNAME
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 389-ds-base.spec	29 Oct 2009 18:00:00 -0000	1.10
+++ 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.11
@@ -1,10 +1,14 @@
 
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .rc1
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.4
-Release:          1%{?dist}
+Version:          1.2.5
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -61,7 +65,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-ds-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Source2:          %{name}-devel.README
@@ -82,7 +86,7 @@ Obsoletes:        fedora-ds-base-devel <
 Development Libraries and headers for the 389 Directory Server base package.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 cp %{SOURCE2} README.devel
 
 %build
@@ -265,6 +269,12 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Dec  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.2.rc1
+- 1.2.5.rc1 release
+
+* Thu Nov 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.1.a1
+- 1.2.5.a1 release
+
 * Thu Oct 29 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.4-1
 - 1.2.4 release
 - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Oct 2009 22:51:24 -0000	1.7
+++ sources	2 Dec 2009 18:17:03 -0000	1.8
@@ -1 +1 @@
-fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2
+96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2



From rmeggins at fedoraproject.org  Wed Dec  2 18:17:04 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  2 Dec 2009 18:17:04 +0000 (UTC)
Subject: rpms/389-ds-base/devel .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh,
	1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20091202181704.1ED5F11C0095@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14093/devel

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 18:00:01 -0000	1.5
+++ .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
@@ -1,2 +1 @@
-389-ds-base-1.2.3.tar.bz2
-389-ds-base-1.2.4.tar.bz2
+389-ds-base-1.2.5.rc1.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git-local.sh	29 Oct 2009 18:00:01 -0000	1.2
+++ 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
@@ -2,9 +2,9 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc1
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
+TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base-git.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git.sh	29 Oct 2009 18:00:01 -0000	1.3
+++ 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
@@ -2,15 +2,15 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc1
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
-#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
-#SRCNAME=$PKGNAME-$VERSION-$DATE
+TAG=${TAG:-$PKGNAME-$VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
 SRCNAME=$PKGNAME-$VERSION
 
-cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME ldapserver
+wget -O $SRCNAME.tar.gz "$URL"
 
-tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-rm -rf $SRCNAME
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 389-ds-base.spec	29 Oct 2009 18:00:01 -0000	1.10
+++ 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.11
@@ -1,10 +1,14 @@
 
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .rc1
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.4
-Release:          1%{?dist}
+Version:          1.2.5
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -61,7 +65,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-ds-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Source2:          %{name}-devel.README
@@ -82,7 +86,7 @@ Obsoletes:        fedora-ds-base-devel <
 Development Libraries and headers for the 389 Directory Server base package.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 cp %{SOURCE2} README.devel
 
 %build
@@ -265,6 +269,12 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Dec  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.2.rc1
+- 1.2.5.rc1 release
+
+* Thu Nov 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.1.a1
+- 1.2.5.a1 release
+
 * Thu Oct 29 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.4-1
 - 1.2.4 release
 - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Oct 2009 22:51:24 -0000	1.7
+++ sources	2 Dec 2009 18:17:04 -0000	1.8
@@ -1 +1 @@
-fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2
+96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2



From sergiopr at fedoraproject.org  Wed Dec  2 18:20:07 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed,  2 Dec 2009 18:20:07 +0000 (UTC)
Subject: rpms/tkimg/F-12 sources,1.4,1.5 tkimg.spec,1.14,1.15
Message-ID: <20091202182007.E5E2F11C03A3@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15091

Modified Files:
	sources tkimg.spec 
Log Message:
* Tue Dec 01 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.6.20091129svn
- New upstream source, version 228 from trunk
- Provides man pages
- Passing tests for sgi format
- Fixes bz #542356



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Nov 2008 12:23:42 -0000	1.4
+++ sources	2 Dec 2009 18:20:07 -0000	1.5
@@ -1 +1 @@
-5da60e405571cb81d66ae0bb88b93f8f  tkimg-20081115.tar.gz
+bd975c977f6ec59d905ffeebe52431c9  tkimg-20091129.tar.gz


Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-12/tkimg.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tkimg.spec	27 Jul 2009 06:01:47 -0000	1.14
+++ tkimg.spec	2 Dec 2009 18:20:07 -0000	1.15
@@ -1,11 +1,11 @@
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 # Data from subversion
-%define svnversion 20081115
+%define svnversion 20091129
 
 Name: tkimg
 Version: 1.4
-Release: 0.5.%{svnversion}svn%{?dist}
+Release: 0.6.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -13,8 +13,8 @@ License: BSD
 URL: http://sourceforge.net/projects/tkimg
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn export -r 173 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20081115
-#  tar -czvf tkimg-20081115.tar.gz  tkimg-20081115
+# svn export -r 228 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20091129
+#  tar -czvf tkimg-20091129.tar.gz  tkimg-20091129
 
 # Data from subversion
 Source0: %{name}-%{svnversion}.tar.gz
@@ -23,7 +23,7 @@ Source0: %{name}-%{svnversion}.tar.gz
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: tcl-devel tk-devel
+BuildRequires: tcl-devel tk-devel tcllib
 BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel libXft-devel
 
 Requires: tcl(abi) = 8.5
@@ -47,12 +47,19 @@ This are the header files needed to deve
 %setup -q -n %{name}-%{svnversion}
 
 %build
-%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch}
-%{__make} %{?_smp_mflags}
+%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} --disable-threads --enable-64bit
+
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
+rm -rf %{buildroot}
+make %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
+
+# configure ignores mandir
+# bug report
+# https://sourceforge.net/tracker/?func=detail&aid=2907616&group_id=52039&atid=465492
+mkdir -p %{buildroot}/%{_mandir}/mann
+mv %{buildroot}/usr/man/mann/* %{buildroot}/%{_mandir}/mann
 
 # Fixing some permissions
 find %{buildroot}/%{tcl_sitearch} -name "*.sh" |xargs chmod 644
@@ -61,14 +68,14 @@ find %{buildroot}/%{tcl_sitearch} -name 
 find %{buildroot}/%{tcl_sitearch} -name "*.so" |xargs chmod 755
 
 # Make library links
-%{__mv} %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir}
+mv %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir}
 for tcllibs in %{buildroot}/%{tcl_sitearch}/Img1.4/*tcl*.so; do
 btcllibs=`basename $tcllibs`
-%{__ln_s} tcl%{tcl_version}/Img1.4/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
+ln -s tcl%{tcl_version}/Img1.4/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
 done
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -79,6 +86,7 @@ done
 %doc README
 %{_libdir}/*.so
 %{tcl_sitearch}/Img1.4
+%{_mandir}/mann/img*
 %exclude %{tcl_sitearch}/Img1.4/*.a
 
 %files devel
@@ -89,6 +97,12 @@ done
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
+* Tue Dec 01 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.6.20091129svn
+- New upstream source, version 228 from trunk
+- Provides man pages
+- Passing tests for sgi format
+- Fixes bz #542356
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-0.5.20081115svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From wtogami at fedoraproject.org  Wed Dec  2 18:21:46 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 18:21:46 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.424,1.425
Message-ID: <20091202182146.ABE9511C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	evolution.spec 
Log Message:
Disable bogofilter subpackage if EL6+



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -p -r1.424 -r1.425
--- evolution.spec	30 Nov 2009 20:28:05 -0000	1.424
+++ evolution.spec	2 Dec 2009 18:21:46 -0000	1.425
@@ -1,3 +1,6 @@
+# Variable must exist even if unused
+%{?!rhel:%define rhel 0}
+
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
 %define glib2_version 2.16.0
@@ -192,6 +195,8 @@ This package contains conduits for synch
 PalmOS<tm> devices with %{name}.
 %endif
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
@@ -200,6 +205,7 @@ Requires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
+%endif
 
 %package spamassassin
 Group: Applications/Productivity
@@ -367,6 +373,13 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-in
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
+rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
+rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+%endif
+
 %pre
 if [ "$1" -gt 1 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -381,9 +394,12 @@ gconftool-2 --makefile-uninstall-rule %{
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 fi
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
 %pre bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
+%endif
 
 %post
 /sbin/ldconfig
@@ -402,9 +418,12 @@ gconftool-2 --makefile-install-rule %{_s
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
+%endif
 
 %preun
 if [ "$1" -eq 0 ] ; then
@@ -420,11 +439,14 @@ gconftool-2 --makefile-uninstall-rule %{
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 fi
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
 %preun bogofilter
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
 fi
+%endif
 
 %postun
 /sbin/ldconfig
@@ -660,11 +682,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
 %files bogofilter
 %defattr(-, root, root)
 %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+%endif
 
 %files spamassassin
 %defattr(-, root, root)
@@ -684,6 +709,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.29.3-1
+- Disable bogofilter subpackage if EL6+
+
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13
 - Update to 2.29.3
 - Add patch for missing m4 files from tarball.



From wtogami at fedoraproject.org  Wed Dec  2 18:22:46 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 18:22:46 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.425,1.426
Message-ID: <20091202182246.3D46C11C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	evolution.spec 
Log Message:
bump



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -p -r1.425 -r1.426
--- evolution.spec	2 Dec 2009 18:21:46 -0000	1.425
+++ evolution.spec	2 Dec 2009 18:22:46 -0000	1.426
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -709,7 +709,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.29.3-1
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.29.3-2
 - Disable bogofilter subpackage if EL6+
 
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13



From mbarnes at fedoraproject.org  Wed Dec  2 18:22:50 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 18:22:50 +0000 (UTC)
Subject: File gtkspell-2.0.16.tar.gz uploaded to lookaside cache by mbarnes
Message-ID: <20091202182250.65EDD10F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gtkspell:

f75dcc9338f182c571b321d37c606a94  gtkspell-2.0.16.tar.gz



From wtogami at fedoraproject.org  Wed Dec  2 18:24:54 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 18:24:54 +0000 (UTC)
Subject: rpms/evolution/F-12 evolution.spec,1.419,1.420
Message-ID: <20091202182454.EB98711C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16485

Modified Files:
	evolution.spec 
Log Message:
Disable bogofilter subpackage if EL6+



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -p -r1.419 -r1.420
--- evolution.spec	19 Oct 2009 09:52:52 -0000	1.419
+++ evolution.spec	2 Dec 2009 18:24:54 -0000	1.420
@@ -1,3 +1,6 @@
+# Variable must exist even if unused
+%{?!rhel:%define rhel 0}
+
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
 %define glib2_version 2.16.0
@@ -43,7 +46,7 @@
 
 Name: evolution
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -196,6 +199,8 @@ This package contains conduits for synch
 PalmOS<tm> devices with %{name}.
 %endif
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
@@ -204,6 +209,7 @@ Requires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
+%endif
 
 %package spamassassin
 Group: Applications/Productivity
@@ -385,6 +391,13 @@ done
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6
+rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
+rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
+rm -f $RPM_BUILD_ROOT{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+%endif
+
 %post
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -401,9 +414,12 @@ gconftool-2 --makefile-install-rule %{_s
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
+%endif
 
 %postun
 /sbin/ldconfig
@@ -672,11 +688,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6
 %files bogofilter
 %defattr(-, root, root)
 %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+%endif
 
 %files spamassassin
 %defattr(-, root, root)
@@ -696,6 +715,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.28.1-2
+- Disable bogofilter subpackage if EL6+
+
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 - Remove patch 'Tweak desktop file for GNOME Shell' (fixed upstream).



From rdieter at fedoraproject.org  Wed Dec  2 18:25:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 18:25:55 +0000 (UTC)
Subject: File xine-lib-1.1.17-pruned.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091202182555.B95CF10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xine-lib:

4c2655e0c12520b1e6e78a72d59a62ce  xine-lib-1.1.17-pruned.tar.bz2



From rdieter at fedoraproject.org  Wed Dec  2 18:25:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 18:25:57 +0000 (UTC)
Subject: File xine-lib-1.1.17-autotools.patch.bz2 uploaded to lookaside cache
	by rdieter
Message-ID: <20091202182557.8127010F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xine-lib:

f4282ee36447d94765d89d06787012be  xine-lib-1.1.17-autotools.patch.bz2



From rdieter at fedoraproject.org  Wed Dec  2 18:27:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 18:27:27 +0000 (UTC)
Subject: rpms/xine-lib/devel .cvsignore, 1.21, 1.22 sources, 1.23,
	1.24 xine-lib-mk-autotools-patch.sh, 1.4, 1.5 xine-lib.spec,
	1.78, 1.79 xine-lib-1.1.15-avsync_hack.patch, 1.1,
	NONE xine-lib-1.1.16.3-mod_mimetypes_typo.patch, 1.1, NONE
Message-ID: <20091202182727.78B6111C0095@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17277

Modified Files:
	.cvsignore sources xine-lib-mk-autotools-patch.sh 
	xine-lib.spec 
Removed Files:
	xine-lib-1.1.15-avsync_hack.patch 
	xine-lib-1.1.16.3-mod_mimetypes_typo.patch 
Log Message:
* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.17-1
- xine-lib-1.1.17, plugin-abi 1.27



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	3 Apr 2009 17:07:18 -0000	1.21
+++ .cvsignore	2 Dec 2009 18:27:27 -0000	1.22
@@ -1,2 +1,2 @@
-xine-lib-1.1.16.3-autotools.patch.bz2
-xine-lib-1.1.16.3-pruned.tar.bz2
+xine-lib-1.1.17-pruned.tar.bz2
+xine-lib-1.1.17-autotools.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	3 Apr 2009 17:07:18 -0000	1.23
+++ sources	2 Dec 2009 18:27:27 -0000	1.24
@@ -1,2 +1,2 @@
-e50122a9323107564d58056b35256610  xine-lib-1.1.16.3-autotools.patch.bz2
-0cac86b7d74c1dcaa22f5a8cbc5ef578  xine-lib-1.1.16.3-pruned.tar.bz2
+4c2655e0c12520b1e6e78a72d59a62ce  xine-lib-1.1.17-pruned.tar.bz2
+f4282ee36447d94765d89d06787012be  xine-lib-1.1.17-autotools.patch.bz2


Index: xine-lib-mk-autotools-patch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib-mk-autotools-patch.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xine-lib-mk-autotools-patch.sh	10 Feb 2009 23:03:37 -0000	1.4
+++ xine-lib-mk-autotools-patch.sh	2 Dec 2009 18:27:27 -0000	1.5
@@ -23,6 +23,7 @@ tar jxf xine-lib-$version-pruned.tar.bz2
 cp -a xine-lib-$version xine-lib-$version-pruned
 
 pushd xine-lib-$version
+patch -p1 < ../xine-lib-${version}-no_autopoint.patch
 # extra work for to omit old libtool-related crud
 rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
 ./autogen.sh noconfig


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- xine-lib.spec	30 Nov 2009 02:08:09 -0000	1.78
+++ xine-lib.spec	2 Dec 2009 18:27:27 -0000	1.79
@@ -1,10 +1,9 @@
 # TODO, sometime, maybe:
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
 # - drop the opengl video out plugin?
-#   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
 # - deprecate ESD support?
 
-%define         plugin_abi  1.26
+%define         plugin_abi  1.27
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -33,35 +32,36 @@
 
 Summary:        A multimedia engine 
 Name:           xine-lib
-Version:        1.1.16.3
-Release:        5%{?dist}
+Version:        1.1.17
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.xine-project.org/ 
 # The tarball is generated from the upstream tarball using
 # the script in SOURCE1. It prunes potentially patented code
 #Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
-Source0:        %{name}-%{version}-pruned.tar.bz2
-Source1:        %{name}-cleanup-sources.sh
-Source2:        %{name}-mk-autotools-patch.sh
+Source0:        xine-lib-%{version}-pruned.tar.bz2
+Source1:        xine-lib-cleanup-sources.sh
+Source2:        xine-lib-mk-autotools-patch.sh
 # autotools patch created with source2
-Patch0:         %{name}-%{version}-autotools.patch.bz2
+Patch0:         xine-lib-%{version}-autotools.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:         %{name}-1.1.4-optflags.patch
-Patch6:         %{name}-1.1.1-deepbind-939.patch
+Patch1:         xine-lib-1.1.4-optflags.patch
+# used to help 
+Patch2:         xine-lib-1.1.17-no_autopoint.patch
+Patch6:         xine-lib-1.1.1-deepbind-939.patch
 # http://bugzilla.redhat.com/470568
-Patch8:         xine-lib-1.1.15-avsync_hack.patch
+Patch8:         xine-lib-1.1.17-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstreamable patches
-Patch50:        xine-lib-1.1.16.3-mod_mimetypes_typo.patch
 ## upstream patches
 
-Provides:       xine-lib(plugin-abi) = %{plugin_abi}
-%if "%{?_isa}" != "%{nil}"
-Provides:       xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
-%endif
+Provides:         xine-lib(plugin-abi) = %{plugin_abi}
+%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
+
+BuildRequires:  automake libtool
 # X11
 BuildRequires:  libX11-devel
 BuildRequires:  libXv-devel
@@ -133,39 +133,32 @@ common multimedia formats available - an
 %package        devel
 Summary:        Xine library development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       zlib-devel
-
 %description    devel
 This package contains development files for %{name}.
 
 %package        arts
 Summary:        aRts plugin for %{name} 
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 #Requires:      xine-lib(plugin-abi) = %{plugin_abi}
-# -arts was split off the -extras subpackage at 1.1.7-3
-Obsoletes:      xine-lib-extras < 1.1.7-3
-
 %description    arts
 This package contains the aRts plugin for %{name}.
 
 %package        pulseaudio
 Summary:        Pulseaudio plugin for %{name} 
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
-
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description    pulseaudio
 This package contains the pulseaudio plugin for %{name}.
 
-
 %package        extras
 Summary:        Additional plugins for %{name} 
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 #Requires:      xine-lib(plugin-abi) = %{plugin_abi}
-
 %description    extras
 This package contains extra plugins for %{name}:
   - EsounD
@@ -196,12 +189,14 @@ touch -r m4/optimizations.m4.stamp m4/op
 # needed at least when compiling with external ffmpeg and internal faad livna bug#939.
 # see also http://bugzilla.redhat.com/480504 for side-effects
 #patch6 -p1 -b .deepbind
-
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
-%patch50 -p1 -b .mod_mimetypes_typo
 
-# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+# autotools patch + touch'ing above seems to miss something, aclocal
+# runs on make anyway, let's use the ./autogen.sh hammer for now.
+./autogen.sh noconfig
+
+#Avoid standard rpaths on lib64 archs: (autotools patch handles this too)
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 
@@ -314,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so
-%ifarch %ix86
+%ifarch %{ix86}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so
 %endif # ix86
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so
@@ -324,6 +319,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spuhdmv.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so
@@ -435,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.17-1
+- xine-lib-1.1.17, plugin-abi 1.27
+
 * Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-5
 - move -pulseaudio into main pkg (f12+)
 - update URL


--- xine-lib-1.1.15-avsync_hack.patch DELETED ---


--- xine-lib-1.1.16.3-mod_mimetypes_typo.patch DELETED ---



From mbarnes at fedoraproject.org  Wed Dec  2 18:31:14 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 18:31:14 +0000 (UTC)
Subject: rpms/gtkspell/F-11 .cvsignore, 1.8, 1.9 gtkspell.spec, 1.31,
	1.32 sources, 1.8,
	1.9 gtkspell-2.0.15-fix-language-comparison.patch, 1.1, NONE
Message-ID: <20091202183114.ABB2C11C0095@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore gtkspell.spec sources 
Removed Files:
	gtkspell-2.0.15-fix-language-comparison.patch 
Log Message:

* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.16-1.fc11
- Update to 2.0.16
- Remove language comparison patch (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Dec 2008 20:43:22 -0000	1.8
+++ .cvsignore	2 Dec 2009 18:31:14 -0000	1.9
@@ -1 +1 @@
-gtkspell-2.0.15.tar.gz
+gtkspell-2.0.16.tar.gz


Index: gtkspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/F-11/gtkspell.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gtkspell.spec	23 Feb 2009 19:50:17 -0000	1.31
+++ gtkspell.spec	2 Dec 2009 18:31:14 -0000	1.32
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: gtkspell
-Version: 2.0.15
+Version: 2.0.16
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -10,11 +10,6 @@ URL: http://gtkspell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Source: http://gtkspell.sourceforge.net/download/%{name}-%{version}.tar.gz
 
-### Patches ###
-
-# Reported by Zden?k Jurka <zdenek.jurka at jware.cz>
-Patch0: gtkspell-2.0.15-fix-language-comparison.patch
-
 ### Build Dependencies ###
 
 BuildRequires: autoconf
@@ -43,7 +38,6 @@ applications which use GtkSpell.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-language-comparison
 
 %build
 libtoolize
@@ -78,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtkspell-2.0.pc
 
 %changelog
+* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.16-1.fc11
+- Update to 2.0.16
+- Remove language comparison patch (fixed upstream).
+
 * Fri Dec 12 2008 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-1.fc11
 - Update to 2.0.15
 - Add patch for a language comparison bug reported by Zden?k Jurka.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Dec 2008 20:43:23 -0000	1.8
+++ sources	2 Dec 2009 18:31:14 -0000	1.9
@@ -1 +1 @@
-d90a7fe883f29caca149f04f31e2f0f9  gtkspell-2.0.15.tar.gz
+f75dcc9338f182c571b321d37c606a94  gtkspell-2.0.16.tar.gz


--- gtkspell-2.0.15-fix-language-comparison.patch DELETED ---



From mbarnes at fedoraproject.org  Wed Dec  2 18:31:39 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 18:31:39 +0000 (UTC)
Subject: rpms/gtkspell/F-12 .cvsignore, 1.8, 1.9 gtkspell.spec, 1.32,
	1.33 sources, 1.8,
	1.9 gtkspell-2.0.15-fix-language-comparison.patch, 1.1, NONE
Message-ID: <20091202183139.E90DD11C0095@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkspell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18733

Modified Files:
	.cvsignore gtkspell.spec sources 
Removed Files:
	gtkspell-2.0.15-fix-language-comparison.patch 
Log Message:

* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.16-1.fc12
- Update to 2.0.16
- Remove language comparison patch (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Dec 2008 20:43:22 -0000	1.8
+++ .cvsignore	2 Dec 2009 18:31:39 -0000	1.9
@@ -1 +1 @@
-gtkspell-2.0.15.tar.gz
+gtkspell-2.0.16.tar.gz


Index: gtkspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/F-12/gtkspell.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gtkspell.spec	25 Jul 2009 01:48:30 -0000	1.32
+++ gtkspell.spec	2 Dec 2009 18:31:39 -0000	1.33
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: gtkspell
-Version: 2.0.15
-Release: 2%{?dist}
+Version: 2.0.16
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Summary: On-the-fly spell checking for GtkTextView widgets
@@ -10,11 +10,6 @@ URL: http://gtkspell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Source: http://gtkspell.sourceforge.net/download/%{name}-%{version}.tar.gz
 
-### Patches ###
-
-# Reported by Zden?k Jurka <zdenek.jurka at jware.cz>
-Patch0: gtkspell-2.0.15-fix-language-comparison.patch
-
 ### Build Dependencies ###
 
 BuildRequires: autoconf
@@ -43,7 +38,6 @@ applications which use GtkSpell.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-language-comparison
 
 %build
 libtoolize
@@ -78,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtkspell-2.0.pc
 
 %changelog
+* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.16-1.fc12
+- Update to 2.0.16
+- Remove language comparison patch (fixed upstream).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Dec 2008 20:43:23 -0000	1.8
+++ sources	2 Dec 2009 18:31:39 -0000	1.9
@@ -1 +1 @@
-d90a7fe883f29caca149f04f31e2f0f9  gtkspell-2.0.15.tar.gz
+f75dcc9338f182c571b321d37c606a94  gtkspell-2.0.16.tar.gz


--- gtkspell-2.0.15-fix-language-comparison.patch DELETED ---



From mbarnes at fedoraproject.org  Wed Dec  2 18:32:07 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 18:32:07 +0000 (UTC)
Subject: rpms/gtkspell/devel .cvsignore, 1.8, 1.9 gtkspell.spec, 1.32,
	1.33 sources, 1.8,
	1.9 gtkspell-2.0.15-fix-language-comparison.patch, 1.1, NONE
Message-ID: <20091202183207.5A44311C0095@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore gtkspell.spec sources 
Removed Files:
	gtkspell-2.0.15-fix-language-comparison.patch 
Log Message:

* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.16-1.fc13
- Update to 2.0.16
- Remove language comparison patch (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Dec 2008 20:43:22 -0000	1.8
+++ .cvsignore	2 Dec 2009 18:32:07 -0000	1.9
@@ -1 +1 @@
-gtkspell-2.0.15.tar.gz
+gtkspell-2.0.16.tar.gz


Index: gtkspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/devel/gtkspell.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gtkspell.spec	25 Jul 2009 01:48:30 -0000	1.32
+++ gtkspell.spec	2 Dec 2009 18:32:07 -0000	1.33
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: gtkspell
-Version: 2.0.15
-Release: 2%{?dist}
+Version: 2.0.16
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Summary: On-the-fly spell checking for GtkTextView widgets
@@ -10,11 +10,6 @@ URL: http://gtkspell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Source: http://gtkspell.sourceforge.net/download/%{name}-%{version}.tar.gz
 
-### Patches ###
-
-# Reported by Zden?k Jurka <zdenek.jurka at jware.cz>
-Patch0: gtkspell-2.0.15-fix-language-comparison.patch
-
 ### Build Dependencies ###
 
 BuildRequires: autoconf
@@ -43,7 +38,6 @@ applications which use GtkSpell.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-language-comparison
 
 %build
 libtoolize
@@ -78,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtkspell-2.0.pc
 
 %changelog
+* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.16-1.fc13
+- Update to 2.0.16
+- Remove language comparison patch (fixed upstream).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Dec 2008 20:43:23 -0000	1.8
+++ sources	2 Dec 2009 18:32:07 -0000	1.9
@@ -1 +1 @@
-d90a7fe883f29caca149f04f31e2f0f9  gtkspell-2.0.15.tar.gz
+f75dcc9338f182c571b321d37c606a94  gtkspell-2.0.16.tar.gz


--- gtkspell-2.0.15-fix-language-comparison.patch DELETED ---



From mbarnes at fedoraproject.org  Wed Dec  2 18:37:38 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 18:37:38 +0000 (UTC)
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.280, 
	1.281
Message-ID: <20091202183738.9751C11C0095@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20347

Modified Files:
	evolution-data-server.spec 
Log Message:

* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.3-2.fc13
- Devel subpackage does not need to require doc subpackage.



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- evolution-data-server.spec	30 Nov 2009 14:22:10 -0000	1.280
+++ evolution-data-server.spec	2 Dec 2009 18:37:38 -0000	1.281
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 2.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -96,7 +96,6 @@ by other packages.
 Summary: Development files for building against %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-doc = %{version}-%{release}
 Requires: dbus-glib-devel
 Requires: libgnome-devel
 Requires: libgweather-devel
@@ -336,6 +335,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.3-2.fc13
+- Devel subpackage does not need to require doc subpackage.
+
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13
 - Update to 2.29.3
 



From mbarnes at fedoraproject.org  Wed Dec  2 18:40:34 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  2 Dec 2009 18:40:34 +0000 (UTC)
Subject: rpms/gtkspell/devel gtkspell.spec,1.33,1.34
Message-ID: <20091202184034.694D011C03E3@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	gtkspell.spec 
Log Message:

* Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.16-1.fc13
- Update to 2.0.16
- No need to run libtoolize and autoreconf.
- Remove language comparison patch (fixed upstream).



Index: gtkspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/devel/gtkspell.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gtkspell.spec	2 Dec 2009 18:32:07 -0000	1.33
+++ gtkspell.spec	2 Dec 2009 18:40:34 -0000	1.34
@@ -12,13 +12,10 @@ Source: http://gtkspell.sourceforge.net/
 
 ### Build Dependencies ###
 
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: enchant-devel
 BuildRequires: gtk2-devel
 BuildRequires: gettext
 BuildRequires: intltool
-BuildRequires: libtool
 
 %description
 GtkSpell provides word-processor-style highlighting and replacement of 
@@ -40,8 +37,6 @@ applications which use GtkSpell.
 %setup -q
 
 %build
-libtoolize
-autoreconf --force --install
 %configure --disable-gtk-doc --disable-static 
 make %{?_smp_mflags}
 
@@ -74,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.16-1.fc13
 - Update to 2.0.16
+- No need to run libtoolize and autoreconf.
 - Remove language comparison patch (fixed upstream).
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.15-2



From jnovy at fedoraproject.org  Wed Dec  2 18:41:01 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  2 Dec 2009 18:41:01 +0000 (UTC)
Subject: File libusb-1.0.6.tar.bz2 uploaded to lookaside cache by jnovy
Message-ID: <20091202184101.289FC10F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libusb1:

818c7c02112a53e0c182666ee83f2057  libusb-1.0.6.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:14 +0000
Subject: [pkgdb] gscan2pdf: rakesh has given up watchbugzilla
Message-ID: <20091202184214.C4CA210F899@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on gscan2pdf (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:17 +0000
Subject: [pkgdb] gscan2pdf: rakesh has requested commit
Message-ID: <20091202184217.6D4B110F89F@bastion2.fedora.phx.redhat.com>

rakesh has requested the commit acl on gscan2pdf (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:18 +0000
Subject: [pkgdb] gscan2pdf: rakesh has given up watchcommits
Message-ID: <20091202184218.DD39310F8A4@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on gscan2pdf (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:20 +0000
Subject: [pkgdb] gscan2pdf: rakesh has requested approveacls
Message-ID: <20091202184220.D2D6710F8A8@bastion2.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on gscan2pdf (Fedora devel)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:30 +0000
Subject: [pkgdb] gscan2pdf: rakesh has given up watchbugzilla
Message-ID: <20091202184230.46EF210F8AA@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on gscan2pdf (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:31 +0000
Subject: [pkgdb] gscan2pdf: rakesh has requested commit
Message-ID: <20091202184231.421FD10F8AD@bastion2.fedora.phx.redhat.com>

rakesh has requested the commit acl on gscan2pdf (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:34 +0000
Subject: [pkgdb] gscan2pdf: rakesh has given up watchcommits
Message-ID: <20091202184234.529A510F899@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on gscan2pdf (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:35 +0000
Subject: [pkgdb] gscan2pdf: rakesh has requested approveacls
Message-ID: <20091202184235.ADEBF10F8B0@bastion2.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on gscan2pdf (Fedora 12)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:42 +0000
Subject: [pkgdb] gscan2pdf: rakesh has given up watchbugzilla
Message-ID: <20091202184242.C7ECA10F8B2@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on gscan2pdf (Fedora 11)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:45 +0000
Subject: [pkgdb] gscan2pdf: rakesh has requested commit
Message-ID: <20091202184245.A3D5710F8B3@bastion2.fedora.phx.redhat.com>

rakesh has requested the commit acl on gscan2pdf (Fedora 11)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:47 +0000
Subject: [pkgdb] gscan2pdf: rakesh has given up watchcommits
Message-ID: <20091202184247.3167110F8A3@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on gscan2pdf (Fedora 11)

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



From pkgdb at fedoraproject.org  Wed Dec  2 18:42:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 18:42:48 +0000
Subject: [pkgdb] gscan2pdf: rakesh has requested approveacls
Message-ID: <20091202184248.C698410F8B5@bastion2.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on gscan2pdf (Fedora 11)

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



From jnovy at fedoraproject.org  Wed Dec  2 18:45:19 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  2 Dec 2009 18:45:19 +0000 (UTC)
Subject: rpms/libusb1/devel .cvsignore, 1.9, 1.10 libusb1.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20091202184519.D522C11C0095@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore libusb1.spec sources 
Log Message:
* Wed Dec 02 2009 Jindrich Novy <jnovy at redhat.com> 1.0.6-1
- update to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Sep 2009 12:08:43 -0000	1.9
+++ .cvsignore	2 Dec 2009 18:45:19 -0000	1.10
@@ -1 +1 @@
-libusb-1.0.3.tar.bz2
+libusb-1.0.6.tar.bz2


Index: libusb1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/libusb1.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libusb1.spec	28 Sep 2009 12:08:43 -0000	1.10
+++ libusb1.spec	2 Dec 2009 18:45:19 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: A library which allows userspace access to USB devices
 Name: libusb1
-Version: 1.0.3
+Version: 1.0.6
 Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2
 License: LGPLv2+
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Dec 02 2009 Jindrich Novy <jnovy at redhat.com> 1.0.6-1
+- update to 1.0.6
+
 * Mon Sep 28 2009 Jindrich Novy <jnovy at redhat.com> 1.0.3-1
 - update to 1.0.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libusb1/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Sep 2009 12:08:43 -0000	1.9
+++ sources	2 Dec 2009 18:45:19 -0000	1.10
@@ -1 +1 @@
-03af26d0c49705fa46c1f732e1018e73  libusb-1.0.3.tar.bz2
+818c7c02112a53e0c182666ee83f2057  libusb-1.0.6.tar.bz2



From wtogami at fedoraproject.org  Wed Dec  2 18:50:52 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 18:50:52 +0000 (UTC)
Subject: rpms/evolution/F-12 evolution.spec,1.420,1.421
Message-ID: <20091202185052.DC38B11C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23968

Modified Files:
	evolution.spec 
Log Message:
Fix the logic



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- evolution.spec	2 Dec 2009 18:24:54 -0000	1.420
+++ evolution.spec	2 Dec 2009 18:50:52 -0000	1.421
@@ -1,5 +1,11 @@
 # Variable must exist even if unused
 %{?!rhel:%define rhel 0}
+%define disable_bogofilter 0
+
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
+%define disable_bogofilter 1
+%endif
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -46,7 +52,7 @@
 
 Name: evolution
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -199,7 +205,7 @@ This package contains conduits for synch
 PalmOS<tm> devices with %{name}.
 %endif
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
@@ -391,7 +397,7 @@ done
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6
 rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
@@ -414,7 +420,7 @@ gconftool-2 --makefile-install-rule %{_s
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -688,7 +694,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6
 %files bogofilter
 %defattr(-, root, root)
@@ -715,7 +721,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.28.1-2
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.28.1-3
 - Disable bogofilter subpackage if EL6+
 
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12



From wtogami at fedoraproject.org  Wed Dec  2 18:55:43 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 18:55:43 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.426,1.427
Message-ID: <20091202185543.4C38C11C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	evolution.spec 
Log Message:
Fix logic



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -p -r1.426 -r1.427
--- evolution.spec	2 Dec 2009 18:22:46 -0000	1.426
+++ evolution.spec	2 Dec 2009 18:55:43 -0000	1.427
@@ -1,5 +1,11 @@
 # Variable must exist even if unused
 %{?!rhel:%define rhel 0}
+%define disable_bogofilter 0
+
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
+%define disable_bogofilter 1
+%endif
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -43,7 +49,7 @@
 
 Name: evolution
 Version: 2.29.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -195,7 +201,7 @@ This package contains conduits for synch
 PalmOS<tm> devices with %{name}.
 %endif
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
@@ -373,7 +379,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-in
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6+
 rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
@@ -394,7 +400,7 @@ gconftool-2 --makefile-uninstall-rule %{
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 fi
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6+
 %pre bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -418,7 +424,7 @@ gconftool-2 --makefile-install-rule %{_s
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6+
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -439,7 +445,7 @@ gconftool-2 --makefile-uninstall-rule %{
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 fi
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6+
 %preun bogofilter
 if [ "$1" -eq 0 ] ; then
@@ -682,7 +688,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6+
 %files bogofilter
 %defattr(-, root, root)
@@ -709,7 +715,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.29.3-2
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.29.3-3
 - Disable bogofilter subpackage if EL6+
 
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13



From wtogami at fedoraproject.org  Wed Dec  2 18:59:16 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 18:59:16 +0000 (UTC)
Subject: rpms/pidgin/F-12 pidgin.spec,1.100,1.101
Message-ID: <20091202185916.2530011C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25938

Modified Files:
	pidgin.spec 
Log Message:
disable SILC in EL6 builds



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/pidgin.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- pidgin.spec	30 Nov 2009 06:17:41 -0000	1.100
+++ pidgin.spec	2 Dec 2009 18:59:15 -0000	1.101
@@ -36,6 +36,7 @@
 %define nss_md2_disabled	0
 %define vv_support		0
 %define libidn_support		0
+%define disable_silc		0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -83,10 +84,15 @@
 %if 0%{?fedora} >= 12
 %define krb4_removed	1
 %endif
+# EL6: Disable SILC protocol
+# (get rid of extra crypto lib for perpetually broken protocol that nobody uses)
+%if 0%{?rhel} == 6
+%define disable_silc	1
+%endif
 
 Name:		pidgin
 Version:	2.6.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -166,7 +172,9 @@ BuildRequires:	gtkspell-devel
 # Evolution integration (FC3+)
 BuildRequires:	evolution-data-server-devel
 # SILC integration (FC3+)
+%if ! %{disable_silc}
 BuildRequires:	libsilc-devel
+%endif
 # DBus integration (FC5+)
 %if %{dbus_integration}
 BuildRequires:  dbus-devel >= 0.60
@@ -623,6 +631,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> 2.6.4-2
+- disable SILC in EL6 builds
+
 * Mon Nov 30 2009 Warren Togami <wtogami at redhat.com> 2.6.4-1
 - 2.6.4
 



From jcollie at fedoraproject.org  Wed Dec  2 19:01:58 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  2 Dec 2009 19:01:58 +0000 (UTC)
Subject: File asterisk-1.6.2.0-rc7.tar.gz uploaded to lookaside cache by
	jcollie
Message-ID: <20091202190158.F393110F89A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for asterisk:

67d90f1a7af5a3dcf5de9b342e7f21a9  asterisk-1.6.2.0-rc7.tar.gz



From jcollie at fedoraproject.org  Wed Dec  2 19:01:59 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  2 Dec 2009 19:01:59 +0000 (UTC)
Subject: File asterisk-1.6.2.0-rc7.tar.gz.asc uploaded to lookaside cache by
	jcollie
Message-ID: <20091202190159.ED6FC10F89C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for asterisk:

07f681e122e18ff201a0662cb6a02198  asterisk-1.6.2.0-rc7.tar.gz.asc



From tjikkun at fedoraproject.org  Wed Dec  2 19:21:44 2009
From: tjikkun at fedoraproject.org (Sander Hoentjen)
Date: Wed,  2 Dec 2009 19:21:44 +0000 (UTC)
Subject: rpms/amsn/F-11 amsn-0.98.1-no-exact-http.patch, NONE,
	1.1 amsn-0.98.1-songbird-exception.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 amsn.spec, 1.23, 1.24 sources, 1.5, 1.6
Message-ID: <20091202192144.DF4CB11C0095@cvs1.fedora.phx.redhat.com>

Author: tjikkun

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

Modified Files:
	.cvsignore amsn.spec sources 
Added Files:
	amsn-0.98.1-no-exact-http.patch 
	amsn-0.98.1-songbird-exception.patch 
Log Message:
update to 0.98.1


amsn-0.98.1-no-exact-http.patch:
 autoupdate.tcl |    2 +-
 proxy.tcl      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE amsn-0.98.1-no-exact-http.patch ---
--- amsn/autoupdate.tcl	2009-11-11 09:23:42.736604374 +0100
+++ amsn~/autoupdate.tcl	2009-11-11 09:38:25.349355120 +0100
@@ -536,7 +536,7 @@
 	}
 
 	#///////////////////////////////////////////////////////////////////////
-	package require -exact http 2.4.4
+	package require http 2.4.4
 
 	proc check_web_version { token } {
 		global version rcversion weburl
--- amsn/proxy.tcl	2009-11-11 09:23:43.270603596 +0100
+++ amsn~/proxy.tcl	2009-11-11 09:31:51.524364201 +0100
@@ -9,7 +9,7 @@
 ::Version::setSubversionId {$Id: proxy.tcl 11344 2009-07-12 21:18:51Z kakaroto $}
 
 package provide Proxy 0.1
-package require -exact http 2.4.4
+package require http 2.4.4
 
 # This should be converted to a proper package, to use with package require
 source socks.tcl	;# SOCKS5 proxy support

amsn-0.98.1-songbird-exception.patch:
 infosongbird |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE amsn-0.98.1-songbird-exception.patch ---
--- amsn/plugins/music/infosongbird	(revision 11807)
+++ amsn/plugins/music/infosongbird	(working copy)
@@ -1,7 +1,10 @@
 #!/usr/bin/env python
-import dbus
-bus = dbus.SessionBus()
-object = bus.get_object('org.mozilla.songbird', '/org/mozilla/songbird')
-print object.getStatus()
-print object.getTitle()
-print object.getArtist()
+try:
+	import dbus
+	bus = dbus.SessionBus()
+	object = bus.get_object('org.mozilla.songbird', '/org/mozilla/songbird')
+	print object.getStatus()
+	print object.getTitle()
+	print object.getArtist()
+except dbus.exceptions.DBusException:
+	print "not installed"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Oct 2008 18:25:29 -0000	1.5
+++ .cvsignore	2 Dec 2009 19:21:44 -0000	1.6
@@ -1 +1 @@
-amsn-0.97.2.tar.bz2
+amsn-0.98.1.tar.bz2


Index: amsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-11/amsn.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- amsn.spec	24 Feb 2009 00:59:47 -0000	1.23
+++ amsn.spec	2 Dec 2009 19:21:44 -0000	1.24
@@ -2,20 +2,21 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name:           amsn
-Version:        0.97.2
-Release:        4%{?dist}
+Version:        0.98.1
+Release:        2%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.amsn-project.net/
 Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
-Patch0:         amsn-0.97-libng-fixes.patch
-Patch1:         amsn-0.97-libng-libv4l2.patch
-Patch2:		amsn-0.97-tkcximage.patch
+Patch0:         amsn-0.98.1-no-exact-http.patch
+Patch1:		amsn-0.98.1-songbird-exception.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
+BuildRequires:  farsight2-devel
+BuildRequires:  gupnp-igd-devel
 BuildRequires:  libv4l-devel
 BuildRequires:  tcl(abi) = %{tcl_version}
 Requires:       tcl(abi) = %{tcl_version}
@@ -40,22 +41,18 @@ snapshots with your webcam to use as you
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p2
 
-rm -r utils/bwidget1.8.0
+rm -r utils/BWidget-1.9.0
 rm -r skins/default/winicons
+rm -r plugins/music/MusicWin
 
 # for webcam to work these paths need to be added because we move libs around
 %{__sed} -i 's#\.\./libng/plugins#%{tcl_sitearch}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
 %{__sed} -i 's#\.\./libng/contrib-plugins#%{tcl_sitearch}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
 
-%{__sed} -i 's# utils/bwidget1.8.0##' Makefile.in
-%{__sed} -i 's#mozilla#xdg-open#' config.tcl
-%{__sed} -i 's#my_filemanager open#xdg-open#' config.tcl
-%{__sed} -i 's#openfilecommand ""#openfilecommand "xdg-open \\$file"#' config.tcl
+%{__sed} -i 's# utils/BWidget-1.9.0##' Makefile.in
 %{__sed} -i 's#soundcommand "play \\$sound"#soundcommand "aplay -q \\$sound"#' config.tcl
 %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "%{_datadir}/amsn/"#' amsn amsn-remote amsn-remote-CLI
-%{__sed} -i 's#Info=AMSN#X-Info=AMSN#' amsn.desktop
 
 %build
 %configure --enable-debug
@@ -69,29 +66,33 @@ mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn-remote ${RPM_BUILD_ROOT}/%{_bindir}/amsn-remote
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn-remote-CLI ${RPM_BUILD_ROOT}/%{_bindir}/amsn-remote-CLI
 
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/base64
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/http2.4
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/log
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/sha1
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/snit
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/tcldom
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/tclsoap1.6.7
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/Tclxml
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/uri
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/docs
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/{AGREEMENT,FAQ,GNUGPL,INSTALL,remote.help,TODO}
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/lang/{*.*,LANG-HOWTO,sortlang}
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/base64
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/http
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/log
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/sha1
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/snit
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/uri
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/docs
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/{AGREEMENT,FAQ,GNUGPL,INSTALL,remote.help,TODO}
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/lang/{*.*,LANG-HOWTO,sortlang}
 
 mkdir -p ${RPM_BUILD_ROOT}/%{tcl_sitearch}
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/linux/* ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/TkCximage ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/webcamsn ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/tcl_siren ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
+mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/tclISF ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
+mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/gupnp ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
+mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/farsight ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
+mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/asyncresolver ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
 
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/
 mv ${RPM_BUILD_ROOT}%{_datadir}/amsn/desktop-icons/ ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/
 rm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 
+chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/skins/Dark\ Matter\ 4.0/pixmapscroll/test.tcl
+chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/utils/voipcontrols/test.tcl
+
 desktop-file-install --vendor="fedora"                          \
         --dir="${RPM_BUILD_ROOT}%{_datadir}/applications"       \
         --delete-original                                       \
@@ -109,7 +110,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/amsn-remote-CLI
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-amsn.desktop
-%{_datadir}/icons/hicolor/*
+%{_datadir}/icons/hicolor/*/*/amsn.png
 %{tcl_sitearch}/*
 %exclude %{_datadir}/%{name}/plugins/*
 
@@ -131,6 +132,20 @@ fi
 
 
 %changelog
+* Wed Nov 25 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-2
+- songbird plugin had a python exception when songbird
+  was not installed (bug #539422)
+- Do not own hicolor (bug #502575)
+
+* Thu Nov 05 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-1
+- Update to new upstream
+- drop patches that are now upstream
+- voice support
+- upnp support
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 18:25:29 -0000	1.5
+++ sources	2 Dec 2009 19:21:44 -0000	1.6
@@ -1 +1 @@
-6c494d97b5ab810f1b265ef19bf652b0  amsn-0.97.2.tar.bz2
+2ef1d32324d3f9d85795433414abd51b  amsn-0.98.1.tar.bz2



From mbooth at fedoraproject.org  Wed Dec  2 19:25:37 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Wed,  2 Dec 2009 19:25:37 +0000 (UTC)
Subject: File commons-modeler-2.0.1-src.tar.gz uploaded to lookaside cache by
	mbooth
Message-ID: <20091202192537.DC6D310F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for jakarta-commons-modeler:

9ad2dc25be91c38b93346653736856dd  commons-modeler-2.0.1-src.tar.gz



From dledford at fedoraproject.org  Wed Dec  2 19:35:12 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 19:35:12 +0000 (UTC)
Subject: rpms/libmthca/devel
	libmthca-Fix-race-between-create-QP-and-destroy-QP.patch, NONE,
	1.1 libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch, NONE, 
	1.1
	libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch,
	NONE,
	1.1 libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch, 
	NONE, 1.1 libmthca.spec, 1.13, 1.14
Message-ID: <20091202193512.6828011C0095@cvs1.fedora.phx.redhat.com>

Author: dledford

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

Modified Files:
	libmthca.spec 
Added Files:
	libmthca-Fix-race-between-create-QP-and-destroy-QP.patch 
	libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch 
	libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch 
	libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch 
Log Message:
* Wed Dec 02 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-5
- Rename devel-static package to just -static, it only has a single static
  lib in it and no actual devel files (like headers, those are part of
  libibverbs-devel instead).  Obsolete the various other named packages we
  want this to supercede
- Enable valgrind annotations on all arches except ia64
- Update to latest code, including update for libibverbs API change
- Bump release to 5 so it is higher than the current rhel5 libmthca release
- Add various patches from the upstream git repo that haven't been rolled into
  a new release tarball yet


libmthca-Fix-race-between-create-QP-and-destroy-QP.patch:
 qp.c    |   18 +++---------------
 verbs.c |   10 ++++++++--
 2 files changed, 11 insertions(+), 17 deletions(-)

--- NEW FILE libmthca-Fix-race-between-create-QP-and-destroy-QP.patch ---
>From be5eef3895eb7864db6395b885a19f770fde7234 Mon Sep 17 00:00:00 2001
From: Jack Morgenstein <jackm at dev.mellanox.co.il>
Date: Sat, 22 Nov 2008 11:54:01 +0200
Subject: [PATCH 3/9] Fix race between create QP and destroy QP

There is a race in libmthca because mthca_create_qp() and
mthca_destroy_qp() are not atomic WRT each other.  If one thread is
destroying a QP while another is creating a QP, the following can
happen: the destroying thread can be scheduled out after it has
deleted the QP from kernel space, but before it has cleared it from
userspace store (mthca_clear_qp()).  If the other thread creates a QP
during this break, it gets the same QP base number and overwrites the
destroyed QP's entry with mthca_store_qp().  When the destroying thread
resumes, it clears the new entry from the userspace store via
mthca_clear_qp.

Fix this by expanding where qp_table_mutex is held to serialize the
full create and destroy operations against each other.

Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/qp.c    |   18 +++---------------
 src/verbs.c |    9 ++++++++-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/qp.c b/src/qp.c
index 55608be..84dd206 100644
--- a/src/qp.c
+++ b/src/qp.c
@@ -909,39 +909,27 @@ struct mthca_qp *mthca_find_qp(struct mthca_context *ctx, uint32_t qpn)
 int mthca_store_qp(struct mthca_context *ctx, uint32_t qpn, struct mthca_qp *qp)
 {
 	int tind = (qpn & (ctx->num_qps - 1)) >> ctx->qp_table_shift;
-	int ret = 0;
-
-	pthread_mutex_lock(&ctx->qp_table_mutex);
 
 	if (!ctx->qp_table[tind].refcnt) {
 		ctx->qp_table[tind].table = calloc(ctx->qp_table_mask + 1,
 						   sizeof (struct mthca_qp *));
-		if (!ctx->qp_table[tind].table) {
-			ret = -1;
-			goto out;
-		}
+		if (!ctx->qp_table[tind].table)
+			return -1;
 	}
 
 	++ctx->qp_table[tind].refcnt;
 	ctx->qp_table[tind].table[qpn & ctx->qp_table_mask] = qp;
-
-out:
-	pthread_mutex_unlock(&ctx->qp_table_mutex);
-	return ret;
+	return 0;
 }
 
 void mthca_clear_qp(struct mthca_context *ctx, uint32_t qpn)
 {
 	int tind = (qpn & (ctx->num_qps - 1)) >> ctx->qp_table_shift;
 
-	pthread_mutex_lock(&ctx->qp_table_mutex);
-
 	if (!--ctx->qp_table[tind].refcnt)
 		free(ctx->qp_table[tind].table);
 	else
 		ctx->qp_table[tind].table[qpn & ctx->qp_table_mask] = NULL;
-
-	pthread_mutex_unlock(&ctx->qp_table_mutex);
 }
 
 int mthca_free_err_wqe(struct mthca_qp *qp, int is_send,
diff --git a/src/verbs.c b/src/verbs.c
index def0f30..b2ef3ec 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -566,6 +566,7 @@ struct ibv_qp *mthca_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr)
 		cmd.sq_db_index = cmd.rq_db_index = 0;
 	}
 
+	pthread_mutex_lock(&to_mctx(pd->context)->qp_table_mutex);
 	ret = ibv_cmd_create_qp(pd, &qp->ibv_qp, attr, &cmd.ibv_cmd, sizeof cmd,
 				&resp, sizeof resp);
 	if (ret)
@@ -579,6 +580,7 @@ struct ibv_qp *mthca_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr)
 	ret = mthca_store_qp(to_mctx(pd->context), qp->ibv_qp.qp_num, qp);
 	if (ret)
 		goto err_destroy;
+	pthread_mutex_unlock(&to_mctx(pd->context)->qp_table_mutex);
 
 	qp->sq.max 	    = attr->cap.max_send_wr;
 	qp->rq.max 	    = attr->cap.max_recv_wr;
@@ -592,6 +594,7 @@ err_destroy:
 	ibv_cmd_destroy_qp(&qp->ibv_qp);
 
 err_rq_db:
+	pthread_mutex_unlock(&to_mctx(pd->context)->qp_table_mutex);
 	if (mthca_is_memfree(pd->context))
 		mthca_free_db(to_mctx(pd->context)->db_tab, MTHCA_DB_TYPE_RQ,
 			      qp->rq.db_index);
@@ -686,9 +689,12 @@ int mthca_destroy_qp(struct ibv_qp *qp)
 {
 	int ret;
 
+	pthread_mutex_lock(&to_mctx(qp->context)->qp_table_mutex);
 	ret = ibv_cmd_destroy_qp(qp);
-	if (ret)
+	if (ret) {
+		pthread_mutex_unlock(&to_mctx(qp->context)->qp_table_mutex);
 		return ret;
+	}
 
 	mthca_lock_cqs(qp);
 
@@ -700,6 +706,7 @@ int mthca_destroy_qp(struct ibv_qp *qp)
 	mthca_clear_qp(to_mctx(qp->context), qp->qp_num);
 
 	mthca_unlock_cqs(qp);
+	pthread_mutex_unlock(&to_mctx(qp->context)->qp_table_mutex);
 
 	if (mthca_is_memfree(qp->context)) {
 		mthca_free_db(to_mctx(qp->context)->db_tab, MTHCA_DB_TYPE_RQ,
-- 
1.6.5.2


libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch:
 mthca.c |    4 ++--
 mthca.h |    2 --
 verbs.c |   11 -----------
 3 files changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch ---
>From 6dbdcb6984671547ff230163b3dca634eacca790 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Date: Mon, 20 Jul 2009 16:36:02 -0600
Subject: [PATCH 7/9] Remove empty stubs for detach/attach_mcast

Just use ibv_cmd_* directly.  Simplifies the code and fixes const
correctness warnings due to changes in libibverbs.

Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/mthca.c |    4 ++--
 src/mthca.h |    2 --
 src/verbs.c |   10 ----------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/mthca.c b/src/mthca.c
index e00c4ee..e33bf7f 100644
--- a/src/mthca.c
+++ b/src/mthca.c
@@ -127,8 +127,8 @@ static struct ibv_context_ops mthca_ctx_ops = {
 	.destroy_qp    = mthca_destroy_qp,
 	.create_ah     = mthca_create_ah,
 	.destroy_ah    = mthca_destroy_ah,
-	.attach_mcast  = mthca_attach_mcast,
-	.detach_mcast  = mthca_detach_mcast
+	.attach_mcast  = ibv_cmd_attach_mcast,
+	.detach_mcast  = ibv_cmd_detach_mcast
 };
 
 static struct ibv_context *mthca_alloc_context(struct ibv_device *ibdev, int cmd_fd)
diff --git a/src/mthca.h b/src/mthca.h
index 66751f3..9a2e362 100644
--- a/src/mthca.h
+++ b/src/mthca.h
@@ -372,7 +372,5 @@ int mthca_destroy_ah(struct ibv_ah *ah);
 int mthca_alloc_av(struct mthca_pd *pd, struct ibv_ah_attr *attr,
 		   struct mthca_ah *ah);
 void mthca_free_av(struct mthca_ah *ah);
-int mthca_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
-int mthca_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
 
 #endif /* MTHCA_H */
diff --git a/src/verbs.c b/src/verbs.c
index b2ef3ec..f6570c6 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -746,13 +746,3 @@ int mthca_destroy_ah(struct ibv_ah *ah)
 
 	return 0;
 }
-
-int mthca_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-	return ibv_cmd_attach_mcast(qp, gid, lid);
-}
-
-int mthca_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-	return ibv_cmd_detach_mcast(qp, gid, lid);
-}
-- 
1.6.5.2


libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch:
 mthca.h |    8 ++++----
 verbs.c |   11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

--- NEW FILE libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch ---
>From 0d1253d0f64a325dac9d3a078a04e573c007f5b6 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Date: Thu, 23 Jul 2009 10:04:29 -0600
Subject: [PATCH 9/9] Update function prototypes to match libibverbs enum type change

Change enum bit flags to int to match libibverbs prototype changes.

Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/mthca.h |    8 ++++----
 src/verbs.c |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mthca.h b/src/mthca.h
index 9a2e362..bd1e7a2 100644
--- a/src/mthca.h
+++ b/src/mthca.h
@@ -309,7 +309,7 @@ struct ibv_pd *mthca_alloc_pd(struct ibv_context *context);
 int mthca_free_pd(struct ibv_pd *pd);
 
 struct ibv_mr *mthca_reg_mr(struct ibv_pd *pd, void *addr,
-			    size_t length, enum ibv_access_flags access);
+			    size_t length, int access);
 int mthca_dereg_mr(struct ibv_mr *mr);
 
 struct ibv_cq *mthca_create_cq(struct ibv_context *context, int cqe,
@@ -330,7 +330,7 @@ struct ibv_srq *mthca_create_srq(struct ibv_pd *pd,
 				 struct ibv_srq_init_attr *attr);
 int mthca_modify_srq(struct ibv_srq *srq,
 		     struct ibv_srq_attr *attr,
-		     enum ibv_srq_attr_mask mask);
+		     int mask);
 int mthca_query_srq(struct ibv_srq *srq,
 			   struct ibv_srq_attr *attr);
 int mthca_destroy_srq(struct ibv_srq *srq);
@@ -346,10 +346,10 @@ int mthca_arbel_post_srq_recv(struct ibv_srq *ibsrq,
 
 struct ibv_qp *mthca_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr);
 int mthca_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask,
+		   int attr_mask,
 		   struct ibv_qp_init_attr *init_attr);
 int mthca_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		    enum ibv_qp_attr_mask attr_mask);
+		    int attr_mask);
 int mthca_destroy_qp(struct ibv_qp *qp);
 void mthca_init_qp_indices(struct mthca_qp *qp);
 int mthca_tavor_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr,
diff --git a/src/verbs.c b/src/verbs.c
index f6570c6..b6782c9 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -117,7 +117,7 @@ int mthca_free_pd(struct ibv_pd *pd)
 
 static struct ibv_mr *__mthca_reg_mr(struct ibv_pd *pd, void *addr,
 				     size_t length, uint64_t hca_va,
-				     enum ibv_access_flags access,
+				     int access,
 				     int dma_sync)
 {
 	struct ibv_mr *mr;
@@ -157,7 +157,7 @@ static struct ibv_mr *__mthca_reg_mr(struct ibv_pd *pd, void *addr,
 }
 
 struct ibv_mr *mthca_reg_mr(struct ibv_pd *pd, void *addr,
-			    size_t length, enum ibv_access_flags access)
+			    size_t length, int access)
 {
 	return __mthca_reg_mr(pd, addr, length, (uintptr_t) addr, access, 0);
 }
@@ -468,7 +468,7 @@ err:
 
 int mthca_modify_srq(struct ibv_srq *srq,
 		     struct ibv_srq_attr *attr,
-		     enum ibv_srq_attr_mask attr_mask)
+		     int attr_mask)
 {
 	struct ibv_modify_srq cmd;
 
@@ -618,7 +618,7 @@ err:
 }
 
 int mthca_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask,
+		   int attr_mask,
 		   struct ibv_qp_init_attr *init_attr)
 {
 	struct ibv_query_qp cmd;
@@ -627,7 +627,7 @@ int mthca_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 }
 
 int mthca_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		    enum ibv_qp_attr_mask attr_mask)
+		    int attr_mask)
 {
 	struct ibv_modify_qp cmd;
 	int ret;
-- 
1.6.5.2


libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch:
 buf.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch ---
>From 14fb976c9999e1c6dc2a5c7a5e0f790d35631658 Mon Sep 17 00:00:00 2001
From: Sebastien Dugue <sebastien.dugue at bull.net>
Date: Wed, 29 Jul 2009 11:56:53 -0700
Subject: [PATCH 8/9] Use mmap(MAP_ANONYMOUS) to allocate queue buffers

Internal buffers for QPs, CQs, SRQs etc. are allocated with
mthca_alloc_buf(), which rounds the buffer's size to the page size and
then allocates page aligned memory using posix_memalign().

However, this allocation is quite wasteful on architectures using 64K
pages (ia64 for example) because we then hit glibc's MMAP_THRESHOLD
malloc parameter and chunks are allocated using mmap.  Thus we end up
allocating:

  (requested size rounded to the page size) + (page size) + (malloc overhead)

rounded internally to the page size.

So for example, if we request a buffer of page_size bytes, we end up
consuming 3 pages.  In short, for each buffer we allocate, there is an
overhead of 2 pages.  This is quite visible on large clusters where
the number of QPs can reach several thousands.

This patch replaces the call to posix_memalign() in mthca_alloc_buf()
with a direct call to mmap().

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/buf.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/buf.c b/src/buf.c
index 6c1be4f..074a5f8 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -35,6 +35,8 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
+#include <sys/mman.h>
+#include <errno.h>
 
 #include "mthca.h"
 
@@ -61,16 +63,15 @@ int mthca_alloc_buf(struct mthca_buf *buf, size_t size, int page_size)
 {
 	int ret;
 
-	ret = posix_memalign(&buf->buf, page_size, align(size, page_size));
-	if (ret)
-		return ret;
+	buf->length = align(size, page_size);
+	buf->buf = mmap(NULL, buf->length, PROT_READ | PROT_WRITE,
+			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	if (buf->buf == MAP_FAILED)
+		return errno;
 
 	ret = ibv_dontfork_range(buf->buf, size);
 	if (ret)
-		free(buf->buf);
-
-	if (!ret)
-		buf->length = size;
+		munmap(buf->buf, buf->length);
 
 	return ret;
 }
@@ -78,5 +79,5 @@ int mthca_alloc_buf(struct mthca_buf *buf, size_t size, int page_size)
 void mthca_free_buf(struct mthca_buf *buf)
 {
 	ibv_dofork_range(buf->buf, buf->length);
-	free(buf->buf);
+	munmap(buf->buf, buf->length);
 }
-- 
1.6.5.2



Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/libmthca.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libmthca.spec	25 Jul 2009 06:09:15 -0000	1.13
+++ libmthca.spec	2 Dec 2009 19:35:12 -0000	1.14
@@ -1,35 +1,53 @@
 Name: libmthca
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
-
+Provides: libibverbs-driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openfabrics.org/
-Source: http://openfabrics.org/downloads/mthca/libmthca-1.0.5.tar.gz
+Source: http://openfabrics.org/downloads/mthca/%{name}-%{version}.tar.gz
+Patch0: libmthca-Fix-race-between-create-QP-and-destroy-QP.patch
+Patch1: libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch
+Patch2: libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
+Patch3: libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires: libibverbs-devel >= 1.1-0.1.rc2
+BuildRequires: libibverbs-devel >= 1.1.3
+%ifnarch ia64
+BuildRequires: valgrind-devel
+%endif
 
 %description
 libmthca provides a device-specific userspace driver for Mellanox HCAs
 (MT23108 InfiniHost and MT25208 InfiniHost III Ex) for use with the
 libibverbs library.
 
-%package devel-static
+%package static
 Summary: Development files for the libmthca driver
 Group: System Environment/Libraries
+Provides: %{name}-devel-static = %{version}-%{release}
+Obsoletes: %{name}-devel-static <= 1.0.5-3
+Provides: %{name}-devel = %{version}-%{release}
+Obsoletes: %{name}-devel <= 1.0.5-3
 Requires: %{name} = %{version}-%{release}
 
-%description devel-static
+%description static
 Static version of libmthca that may be linked directly to an
 application, which may be useful for debugging.
 
 %prep
-%setup -q -n %{name}-1.0.5
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
+%ifnarch ia64
+%configure --with-valgrind
+%else
 %configure
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -47,11 +65,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/libibverbs.d/mthca.driver
 %doc AUTHORS COPYING ChangeLog README
 
-%files devel-static
+%files static
 %defattr(-,root,root,-)
 %{_libdir}/libmthca.a
 
 %changelog
+* Wed Dec 02 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-5
+- Rename devel-static package to just -static, it only has a single static
+  lib in it and no actual devel files (like headers, those are part of
+  libibverbs-devel instead).  Obsolete the various other named packages we
+  want this to supercede
+- Enable valgrind annotations on all arches except ia64
+- Update to latest code, including update for libibverbs API change
+- Bump release to 5 so it is higher than the current rhel5 libmthca release
+- Add various patches from the upstream git repo that haven't been rolled into
+  a new release tarball yet
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dledford at fedoraproject.org  Wed Dec  2 19:35:46 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed,  2 Dec 2009 19:35:46 +0000 (UTC)
Subject: rpms/libmthca/F-12
	libmthca-Fix-race-between-create-QP-and-destroy-QP.patch, NONE,
	1.1 libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch, NONE, 
	1.1
	libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch,
	NONE,
	1.1 libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch, 
	NONE, 1.1 libmthca.spec, 1.13, 1.14
Message-ID: <20091202193546.E2C6511C0095@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libmthca/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1306

Modified Files:
	libmthca.spec 
Added Files:
	libmthca-Fix-race-between-create-QP-and-destroy-QP.patch 
	libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch 
	libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch 
	libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch 
Log Message:
* Wed Dec 02 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-5
- Rename devel-static package to just -static, it only has a single static
  lib in it and no actual devel files (like headers, those are part of
  libibverbs-devel instead).  Obsolete the various other named packages we
  want this to supercede
- Enable valgrind annotations on all arches except ia64
- Update to latest code, including update for libibverbs API change
- Bump release to 5 so it is higher than the current rhel5 libmthca release
- Add various patches from the upstream git repo that haven't been rolled into
  a new release tarball yet


libmthca-Fix-race-between-create-QP-and-destroy-QP.patch:
 qp.c    |   18 +++---------------
 verbs.c |   10 ++++++++--
 2 files changed, 11 insertions(+), 17 deletions(-)

--- NEW FILE libmthca-Fix-race-between-create-QP-and-destroy-QP.patch ---
>From be5eef3895eb7864db6395b885a19f770fde7234 Mon Sep 17 00:00:00 2001
From: Jack Morgenstein <jackm at dev.mellanox.co.il>
Date: Sat, 22 Nov 2008 11:54:01 +0200
Subject: [PATCH 3/9] Fix race between create QP and destroy QP

There is a race in libmthca because mthca_create_qp() and
mthca_destroy_qp() are not atomic WRT each other.  If one thread is
destroying a QP while another is creating a QP, the following can
happen: the destroying thread can be scheduled out after it has
deleted the QP from kernel space, but before it has cleared it from
userspace store (mthca_clear_qp()).  If the other thread creates a QP
during this break, it gets the same QP base number and overwrites the
destroyed QP's entry with mthca_store_qp().  When the destroying thread
resumes, it clears the new entry from the userspace store via
mthca_clear_qp.

Fix this by expanding where qp_table_mutex is held to serialize the
full create and destroy operations against each other.

Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/qp.c    |   18 +++---------------
 src/verbs.c |    9 ++++++++-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/qp.c b/src/qp.c
index 55608be..84dd206 100644
--- a/src/qp.c
+++ b/src/qp.c
@@ -909,39 +909,27 @@ struct mthca_qp *mthca_find_qp(struct mthca_context *ctx, uint32_t qpn)
 int mthca_store_qp(struct mthca_context *ctx, uint32_t qpn, struct mthca_qp *qp)
 {
 	int tind = (qpn & (ctx->num_qps - 1)) >> ctx->qp_table_shift;
-	int ret = 0;
-
-	pthread_mutex_lock(&ctx->qp_table_mutex);
 
 	if (!ctx->qp_table[tind].refcnt) {
 		ctx->qp_table[tind].table = calloc(ctx->qp_table_mask + 1,
 						   sizeof (struct mthca_qp *));
-		if (!ctx->qp_table[tind].table) {
-			ret = -1;
-			goto out;
-		}
+		if (!ctx->qp_table[tind].table)
+			return -1;
 	}
 
 	++ctx->qp_table[tind].refcnt;
 	ctx->qp_table[tind].table[qpn & ctx->qp_table_mask] = qp;
-
-out:
-	pthread_mutex_unlock(&ctx->qp_table_mutex);
-	return ret;
+	return 0;
 }
 
 void mthca_clear_qp(struct mthca_context *ctx, uint32_t qpn)
 {
 	int tind = (qpn & (ctx->num_qps - 1)) >> ctx->qp_table_shift;
 
-	pthread_mutex_lock(&ctx->qp_table_mutex);
-
 	if (!--ctx->qp_table[tind].refcnt)
 		free(ctx->qp_table[tind].table);
 	else
 		ctx->qp_table[tind].table[qpn & ctx->qp_table_mask] = NULL;
-
-	pthread_mutex_unlock(&ctx->qp_table_mutex);
 }
 
 int mthca_free_err_wqe(struct mthca_qp *qp, int is_send,
diff --git a/src/verbs.c b/src/verbs.c
index def0f30..b2ef3ec 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -566,6 +566,7 @@ struct ibv_qp *mthca_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr)
 		cmd.sq_db_index = cmd.rq_db_index = 0;
 	}
 
+	pthread_mutex_lock(&to_mctx(pd->context)->qp_table_mutex);
 	ret = ibv_cmd_create_qp(pd, &qp->ibv_qp, attr, &cmd.ibv_cmd, sizeof cmd,
 				&resp, sizeof resp);
 	if (ret)
@@ -579,6 +580,7 @@ struct ibv_qp *mthca_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr)
 	ret = mthca_store_qp(to_mctx(pd->context), qp->ibv_qp.qp_num, qp);
 	if (ret)
 		goto err_destroy;
+	pthread_mutex_unlock(&to_mctx(pd->context)->qp_table_mutex);
 
 	qp->sq.max 	    = attr->cap.max_send_wr;
 	qp->rq.max 	    = attr->cap.max_recv_wr;
@@ -592,6 +594,7 @@ err_destroy:
 	ibv_cmd_destroy_qp(&qp->ibv_qp);
 
 err_rq_db:
+	pthread_mutex_unlock(&to_mctx(pd->context)->qp_table_mutex);
 	if (mthca_is_memfree(pd->context))
 		mthca_free_db(to_mctx(pd->context)->db_tab, MTHCA_DB_TYPE_RQ,
 			      qp->rq.db_index);
@@ -686,9 +689,12 @@ int mthca_destroy_qp(struct ibv_qp *qp)
 {
 	int ret;
 
+	pthread_mutex_lock(&to_mctx(qp->context)->qp_table_mutex);
 	ret = ibv_cmd_destroy_qp(qp);
-	if (ret)
+	if (ret) {
+		pthread_mutex_unlock(&to_mctx(qp->context)->qp_table_mutex);
 		return ret;
+	}
 
 	mthca_lock_cqs(qp);
 
@@ -700,6 +706,7 @@ int mthca_destroy_qp(struct ibv_qp *qp)
 	mthca_clear_qp(to_mctx(qp->context), qp->qp_num);
 
 	mthca_unlock_cqs(qp);
+	pthread_mutex_unlock(&to_mctx(qp->context)->qp_table_mutex);
 
 	if (mthca_is_memfree(qp->context)) {
 		mthca_free_db(to_mctx(qp->context)->db_tab, MTHCA_DB_TYPE_RQ,
-- 
1.6.5.2


libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch:
 mthca.c |    4 ++--
 mthca.h |    2 --
 verbs.c |   11 -----------
 3 files changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch ---
>From 6dbdcb6984671547ff230163b3dca634eacca790 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Date: Mon, 20 Jul 2009 16:36:02 -0600
Subject: [PATCH 7/9] Remove empty stubs for detach/attach_mcast

Just use ibv_cmd_* directly.  Simplifies the code and fixes const
correctness warnings due to changes in libibverbs.

Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/mthca.c |    4 ++--
 src/mthca.h |    2 --
 src/verbs.c |   10 ----------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/mthca.c b/src/mthca.c
index e00c4ee..e33bf7f 100644
--- a/src/mthca.c
+++ b/src/mthca.c
@@ -127,8 +127,8 @@ static struct ibv_context_ops mthca_ctx_ops = {
 	.destroy_qp    = mthca_destroy_qp,
 	.create_ah     = mthca_create_ah,
 	.destroy_ah    = mthca_destroy_ah,
-	.attach_mcast  = mthca_attach_mcast,
-	.detach_mcast  = mthca_detach_mcast
+	.attach_mcast  = ibv_cmd_attach_mcast,
+	.detach_mcast  = ibv_cmd_detach_mcast
 };
 
 static struct ibv_context *mthca_alloc_context(struct ibv_device *ibdev, int cmd_fd)
diff --git a/src/mthca.h b/src/mthca.h
index 66751f3..9a2e362 100644
--- a/src/mthca.h
+++ b/src/mthca.h
@@ -372,7 +372,5 @@ int mthca_destroy_ah(struct ibv_ah *ah);
 int mthca_alloc_av(struct mthca_pd *pd, struct ibv_ah_attr *attr,
 		   struct mthca_ah *ah);
 void mthca_free_av(struct mthca_ah *ah);
-int mthca_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
-int mthca_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
 
 #endif /* MTHCA_H */
diff --git a/src/verbs.c b/src/verbs.c
index b2ef3ec..f6570c6 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -746,13 +746,3 @@ int mthca_destroy_ah(struct ibv_ah *ah)
 
 	return 0;
 }
-
-int mthca_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-	return ibv_cmd_attach_mcast(qp, gid, lid);
-}
-
-int mthca_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-	return ibv_cmd_detach_mcast(qp, gid, lid);
-}
-- 
1.6.5.2


libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch:
 mthca.h |    8 ++++----
 verbs.c |   11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

--- NEW FILE libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch ---
>From 0d1253d0f64a325dac9d3a078a04e573c007f5b6 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Date: Thu, 23 Jul 2009 10:04:29 -0600
Subject: [PATCH 9/9] Update function prototypes to match libibverbs enum type change

Change enum bit flags to int to match libibverbs prototype changes.

Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/mthca.h |    8 ++++----
 src/verbs.c |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mthca.h b/src/mthca.h
index 9a2e362..bd1e7a2 100644
--- a/src/mthca.h
+++ b/src/mthca.h
@@ -309,7 +309,7 @@ struct ibv_pd *mthca_alloc_pd(struct ibv_context *context);
 int mthca_free_pd(struct ibv_pd *pd);
 
 struct ibv_mr *mthca_reg_mr(struct ibv_pd *pd, void *addr,
-			    size_t length, enum ibv_access_flags access);
+			    size_t length, int access);
 int mthca_dereg_mr(struct ibv_mr *mr);
 
 struct ibv_cq *mthca_create_cq(struct ibv_context *context, int cqe,
@@ -330,7 +330,7 @@ struct ibv_srq *mthca_create_srq(struct ibv_pd *pd,
 				 struct ibv_srq_init_attr *attr);
 int mthca_modify_srq(struct ibv_srq *srq,
 		     struct ibv_srq_attr *attr,
-		     enum ibv_srq_attr_mask mask);
+		     int mask);
 int mthca_query_srq(struct ibv_srq *srq,
 			   struct ibv_srq_attr *attr);
 int mthca_destroy_srq(struct ibv_srq *srq);
@@ -346,10 +346,10 @@ int mthca_arbel_post_srq_recv(struct ibv_srq *ibsrq,
 
 struct ibv_qp *mthca_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr);
 int mthca_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask,
+		   int attr_mask,
 		   struct ibv_qp_init_attr *init_attr);
 int mthca_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		    enum ibv_qp_attr_mask attr_mask);
+		    int attr_mask);
 int mthca_destroy_qp(struct ibv_qp *qp);
 void mthca_init_qp_indices(struct mthca_qp *qp);
 int mthca_tavor_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr,
diff --git a/src/verbs.c b/src/verbs.c
index f6570c6..b6782c9 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -117,7 +117,7 @@ int mthca_free_pd(struct ibv_pd *pd)
 
 static struct ibv_mr *__mthca_reg_mr(struct ibv_pd *pd, void *addr,
 				     size_t length, uint64_t hca_va,
-				     enum ibv_access_flags access,
+				     int access,
 				     int dma_sync)
 {
 	struct ibv_mr *mr;
@@ -157,7 +157,7 @@ static struct ibv_mr *__mthca_reg_mr(struct ibv_pd *pd, void *addr,
 }
 
 struct ibv_mr *mthca_reg_mr(struct ibv_pd *pd, void *addr,
-			    size_t length, enum ibv_access_flags access)
+			    size_t length, int access)
 {
 	return __mthca_reg_mr(pd, addr, length, (uintptr_t) addr, access, 0);
 }
@@ -468,7 +468,7 @@ err:
 
 int mthca_modify_srq(struct ibv_srq *srq,
 		     struct ibv_srq_attr *attr,
-		     enum ibv_srq_attr_mask attr_mask)
+		     int attr_mask)
 {
 	struct ibv_modify_srq cmd;
 
@@ -618,7 +618,7 @@ err:
 }
 
 int mthca_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask,
+		   int attr_mask,
 		   struct ibv_qp_init_attr *init_attr)
 {
 	struct ibv_query_qp cmd;
@@ -627,7 +627,7 @@ int mthca_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 }
 
 int mthca_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		    enum ibv_qp_attr_mask attr_mask)
+		    int attr_mask)
 {
 	struct ibv_modify_qp cmd;
 	int ret;
-- 
1.6.5.2


libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch:
 buf.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch ---
>From 14fb976c9999e1c6dc2a5c7a5e0f790d35631658 Mon Sep 17 00:00:00 2001
From: Sebastien Dugue <sebastien.dugue at bull.net>
Date: Wed, 29 Jul 2009 11:56:53 -0700
Subject: [PATCH 8/9] Use mmap(MAP_ANONYMOUS) to allocate queue buffers

Internal buffers for QPs, CQs, SRQs etc. are allocated with
mthca_alloc_buf(), which rounds the buffer's size to the page size and
then allocates page aligned memory using posix_memalign().

However, this allocation is quite wasteful on architectures using 64K
pages (ia64 for example) because we then hit glibc's MMAP_THRESHOLD
malloc parameter and chunks are allocated using mmap.  Thus we end up
allocating:

  (requested size rounded to the page size) + (page size) + (malloc overhead)

rounded internally to the page size.

So for example, if we request a buffer of page_size bytes, we end up
consuming 3 pages.  In short, for each buffer we allocate, there is an
overhead of 2 pages.  This is quite visible on large clusters where
the number of QPs can reach several thousands.

This patch replaces the call to posix_memalign() in mthca_alloc_buf()
with a direct call to mmap().

Signed-off-by: Sebastien Dugue <sebastien.dugue at bull.net>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
 src/buf.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/buf.c b/src/buf.c
index 6c1be4f..074a5f8 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -35,6 +35,8 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
+#include <sys/mman.h>
+#include <errno.h>
 
 #include "mthca.h"
 
@@ -61,16 +63,15 @@ int mthca_alloc_buf(struct mthca_buf *buf, size_t size, int page_size)
 {
 	int ret;
 
-	ret = posix_memalign(&buf->buf, page_size, align(size, page_size));
-	if (ret)
-		return ret;
+	buf->length = align(size, page_size);
+	buf->buf = mmap(NULL, buf->length, PROT_READ | PROT_WRITE,
+			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	if (buf->buf == MAP_FAILED)
+		return errno;
 
 	ret = ibv_dontfork_range(buf->buf, size);
 	if (ret)
-		free(buf->buf);
-
-	if (!ret)
-		buf->length = size;
+		munmap(buf->buf, buf->length);
 
 	return ret;
 }
@@ -78,5 +79,5 @@ int mthca_alloc_buf(struct mthca_buf *buf, size_t size, int page_size)
 void mthca_free_buf(struct mthca_buf *buf)
 {
 	ibv_dofork_range(buf->buf, buf->length);
-	free(buf->buf);
+	munmap(buf->buf, buf->length);
 }
-- 
1.6.5.2



Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/F-12/libmthca.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libmthca.spec	25 Jul 2009 06:09:15 -0000	1.13
+++ libmthca.spec	2 Dec 2009 19:35:46 -0000	1.14
@@ -1,35 +1,53 @@
 Name: libmthca
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
-
+Provides: libibverbs-driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openfabrics.org/
-Source: http://openfabrics.org/downloads/mthca/libmthca-1.0.5.tar.gz
+Source: http://openfabrics.org/downloads/mthca/%{name}-%{version}.tar.gz
+Patch0: libmthca-Fix-race-between-create-QP-and-destroy-QP.patch
+Patch1: libmthca-Remove-empty-stubs-for-detach-attach_mcast.patch
+Patch2: libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
+Patch3: libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires: libibverbs-devel >= 1.1-0.1.rc2
+BuildRequires: libibverbs-devel >= 1.1.3
+%ifnarch ia64
+BuildRequires: valgrind-devel
+%endif
 
 %description
 libmthca provides a device-specific userspace driver for Mellanox HCAs
 (MT23108 InfiniHost and MT25208 InfiniHost III Ex) for use with the
 libibverbs library.
 
-%package devel-static
+%package static
 Summary: Development files for the libmthca driver
 Group: System Environment/Libraries
+Provides: %{name}-devel-static = %{version}-%{release}
+Obsoletes: %{name}-devel-static <= 1.0.5-3
+Provides: %{name}-devel = %{version}-%{release}
+Obsoletes: %{name}-devel <= 1.0.5-3
 Requires: %{name} = %{version}-%{release}
 
-%description devel-static
+%description static
 Static version of libmthca that may be linked directly to an
 application, which may be useful for debugging.
 
 %prep
-%setup -q -n %{name}-1.0.5
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
+%ifnarch ia64
+%configure --with-valgrind
+%else
 %configure
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -47,11 +65,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/libibverbs.d/mthca.driver
 %doc AUTHORS COPYING ChangeLog README
 
-%files devel-static
+%files static
 %defattr(-,root,root,-)
 %{_libdir}/libmthca.a
 
 %changelog
+* Wed Dec 02 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-5
+- Rename devel-static package to just -static, it only has a single static
+  lib in it and no actual devel files (like headers, those are part of
+  libibverbs-devel instead).  Obsolete the various other named packages we
+  want this to supercede
+- Enable valgrind annotations on all arches except ia64
+- Update to latest code, including update for libibverbs API change
+- Bump release to 5 so it is higher than the current rhel5 libmthca release
+- Add various patches from the upstream git repo that haven't been rolled into
+  a new release tarball yet
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Wed Dec  2 19:40:16 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Dec 2009 19:40:16 +0000 (UTC)
Subject: rpms/libxcb/F-10 libxcb-1.4-keepalive.patch, NONE, 1.1 libxcb.spec, 
	1.15, 1.16
Message-ID: <20091202194016.CAE6611C03E3@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.4-keepalive.patch 
Log Message:
* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 1.1.91-8
- libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) on TCP. (#476415)


libxcb-1.4-keepalive.patch:
 xcb_util.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libxcb-1.4-keepalive.patch ---
>From 1cf2a87def76f4646fe05e282b45605d572f2513 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 2 Dec 2009 14:31:56 -0500
Subject: [PATCH] setsockopt(SO_KEEPALIVE) on TCP display connections.

This matches xtrans behaviour in SocketINETConnect, and makes it so apps
don't hang forever if their display dies.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 src/xcb_util.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 55aadb7..c3cbfa6 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -260,6 +260,7 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
         if(fd >= 0) {
             int on = 1;
             setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+	    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
 
             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
                 break;
-- 
1.6.5.2



Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/F-10/libxcb.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libxcb.spec	24 Jun 2009 16:51:36 -0000	1.15
+++ libxcb.spec	2 Dec 2009 19:40:16 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           libxcb
 Version:        1.1.91
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -19,6 +19,7 @@ Patch2:		libxcb-1.1-sloppy-lock.patch
 Patch3:		libxcb-1.1.91-git.patch
 Patch4:         libxcb-1.1.91-xidgen.patch
 Patch5:         libxcb-1.2-disable-nagle.patch
+Patch6:		libxcb-1.4-keepalive.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -59,6 +60,7 @@ The %{name}-doc package contains documen
 %patch3 -p1 -b .git
 %patch4 -p1 -b .xidgen
 %patch5 -p1 -b .disable-nagle
+%patch6 -p1 -b .keepalive
 
 %build
 autoreconf -v --install
@@ -94,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 1.1.91-8
+- libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) on TCP. (#476415)
+
 * Wed Jun 24 2009 Warren Togami <wtogami at redhat.com> 1.1.91-7
 - disable Nagle's algorithm for X TCP traffic as upstream decided this was a bad idea.
   This should be a significant performance boost.



From jcollie at fedoraproject.org  Wed Dec  2 19:44:42 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  2 Dec 2009 19:44:42 +0000 (UTC)
Subject: rpms/asterisk/devel .cvsignore, 1.28,
	1.29 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 
	1.12, 1.13 asterisk-logrotate, 1.2, 1.3 asterisk.spec, 1.66,
	1.67 sources, 1.28, 1.29
Message-ID: <20091202194442.AF25D11C0095@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	.cvsignore 
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	asterisk-logrotate asterisk.spec sources 
Log Message:
* Wed Dec  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.15.rc7
- Update to 1.6.2.0-rc7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	13 Nov 2009 22:37:00 -0000	1.28
+++ .cvsignore	2 Dec 2009 19:44:42 -0000	1.29
@@ -1,2 +1,2 @@
-asterisk-1.6.2.0-rc6.tar.gz
-asterisk-1.6.2.0-rc6.tar.gz.asc
+asterisk-1.6.2.0-rc7.tar.gz
+asterisk-1.6.2.0-rc7.tar.gz.asc

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
 init.d/rc.redhat.asterisk |   77 ++++++++++++++++++++--------------------------
 sysconfig/asterisk        |   19 +++++++++++
 2 files changed, 54 insertions(+), 42 deletions(-)

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	6 Nov 2009 22:37:02 -0000	1.12
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	2 Dec 2009 19:44:42 -0000	1.13
@@ -89,7 +89,7 @@ Index: contrib/init.d/rc.redhat.asterisk
  RETVAL=0
  
  start() {
-@@ -78,19 +78,17 @@
+@@ -78,19 +78,18 @@
  
  	# Start daemons.
  	echo -n $"Starting asterisk: "
@@ -109,7 +109,8 @@ Index: contrib/init.d/rc.redhat.asterisk
 +		AST_ARGS="$AST_ARGS -C $AST_CONFIG"
  	fi
 -	daemon $DAEMON $ASTARGS
-+	cd /var/spool/asterisk
++	export HOME=~asterisk
++	cd $HOME
 +	daemon $DAEMON $AST_ARGS $AST_EXTRA_ARGS
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk


Index: asterisk-logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- asterisk-logrotate	18 Feb 2008 21:06:43 -0000	1.2
+++ asterisk-logrotate	2 Dec 2009 19:44:42 -0000	1.3
@@ -4,6 +4,6 @@
     create 0640 asterisk asterisk
     sharedscripts
     postrotate
-	/usr/sbin/asterisk -rx 'logger reload' >/dev/null 2>/dev/null || true
+	/sbin/runuser --login --shell=/bin/bash --command="/usr/sbin/asterisk -rx 'logger reload'" asterisk >/dev/null 2>/dev/null || true
     endscript
 }


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- asterisk.spec	13 Nov 2009 22:37:00 -0000	1.66
+++ asterisk.spec	2 Dec 2009 19:44:42 -0000	1.67
@@ -1,8 +1,8 @@
-%define _rc 6
+%define _rc 7
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.12%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.15%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -39,7 +39,12 @@ BuildRequires: libcap-devel
 BuildRequires: gtk2-devel
 
 # for res_http_post
+%if 0%{?fedora} > 0
 BuildRequires: gmime22-devel
+%endif
+%if 0%{?rhel} > 0
+BuildRequires: gmime-devel
+%endif
 
 # for building docs
 BuildRequires: doxygen
@@ -346,6 +351,7 @@ Requires: /usr/sbin/sendmail
 %description voicemail
 Common Voicemail Modules for Asterisk.
 
+%if 0%{?fedora} > 0
 %package voicemail-imap
 Summary: Store voicemail on an IMAP server
 Group: Applications/Internet
@@ -357,6 +363,7 @@ BuildRequires: uw-imap-devel
 %description voicemail-imap
 Voicemail implementation for Asterisk that stores voicemail on an IMAP
 server.
+%endif
 
 %package voicemail-odbc
 Summary: Store voicemail in a database using ODBC
@@ -404,6 +411,15 @@ rm main/fskmodem.c.old
 
 chmod -x contrib/scripts/dbsep.cgi
 
+%if 0%{?rhel} > 0
+# Get the autoconf scripts working with 2.59
+%{__perl} -pi -e 's/AC_PREREQ\(2\.60\)/AC_PREREQ\(2\.59\)/g' configure.ac
+%{__perl} -pi -e 's/AC_USE_SYSTEM_EXTENSIONS/AC_GNU_SOURCE/g' configure.ac
+%{__perl} -pi -e 's/AST_PROG_SED/SED=sed/g' autoconf/ast_prog_ld.m4
+# kernel/glibc in RHEL5 does not support the timerfd
+%{__perl} -pi -e 's/^MENUSELECT_RES=(.*)$/MENUSELECT_RES=\1 res_timing_timerfd/g' menuselect.makeopts
+%endif
+
 %build
 
 %define optflags %(rpm --eval %%{optflags}) -Werror-implicit-function-declaration
@@ -424,7 +440,11 @@ pushd main/editline
 %configure
 popd
 
+%if 0%{?fedora} > 0
 %configure --with-imap=system --with-gsm=/usr --with-libedit=yes
+%else
+%configure --with-gsm=/usr --with-libedit=yes
+%endif
 
 ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
 
@@ -432,12 +452,14 @@ rm apps/app_voicemail.o apps/app_directo
 mv apps/app_voicemail.so apps/app_voicemail_plain.so
 mv apps/app_directory.so apps/app_directory_plain.so
 
+%if 0%{?fedora} > 0
 %{__sed} -i -e 's/^MENUSELECT_OPTS_app_voicemail=.*$/MENUSELECT_OPTS_app_voicemail=IMAP_STORAGE/' menuselect.makeopts
 ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
 
 rm apps/app_voicemail.o apps/app_directory.o
 mv apps/app_voicemail.so apps/app_voicemail_imap.so
 mv apps/app_directory.so apps/app_directory_imap.so
+%endif
 
 %{__sed} -i -e 's/^MENUSELECT_OPTS_app_voicemail=.*$/MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE/' menuselect.makeopts
 ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
@@ -470,8 +492,10 @@ install -D -p -m 0644 doc/digium-mib.txt
 
 rm %{buildroot}%{_libdir}/asterisk/modules/app_directory.so
 rm %{buildroot}%{_libdir}/asterisk/modules/app_voicemail.so
+%if 0%{?fedora} > 0
 install -D -p -m 0755 apps/app_directory_imap.so %{buildroot}%{_libdir}/asterisk/modules
 install -D -p -m 0755 apps/app_voicemail_imap.so %{buildroot}%{_libdir}/asterisk/modules
+%endif
 install -D -p -m 0755 apps/app_directory_odbc.so %{buildroot}%{_libdir}/asterisk/modules
 install -D -p -m 0755 apps/app_voicemail_odbc.so %{buildroot}%{_libdir}/asterisk/modules
 install -D -p -m 0755 apps/app_directory_plain.so %{buildroot}%{_libdir}/asterisk/modules
@@ -709,7 +733,9 @@ fi
 %{_libdir}/asterisk/modules/res_smdi.so
 %{_libdir}/asterisk/modules/res_speech.so
 %{_libdir}/asterisk/modules/res_timing_pthread.so
+%if 0%{?fedora} > 0
 %{_libdir}/asterisk/modules/res_timing_timerfd.so
+%endif
 %{_libdir}/asterisk/modules/test_dlinklists.so
 %{_libdir}/asterisk/modules/test_heap.so
 %{_libdir}/asterisk/modules/test_sched.so
@@ -994,10 +1020,12 @@ fi
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
 %{_libdir}/asterisk/modules/func_vmcount.so
 
+%if 0%{?fedora} > 0
 %files voicemail-imap
 %defattr(-,root,root,)
 %{_libdir}/asterisk/modules/app_directory_imap.so
 %{_libdir}/asterisk/modules/app_voicemail_imap.so
+%endif
 
 %files voicemail-odbc
 %defattr(-,root,root,-)
@@ -1011,6 +1039,17 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Wed Dec  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.15.rc7
+- Update to 1.6.2.0-rc7
+
+* Tue Dec  1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.14.rc6
+- Change the logrotate and the init scripts so that Asterisk doesn't
+  try and write to / or /root
+
+* Thu Nov 19 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.13.rc6
+- Make dependency on uw-imap conditional and some other changes to
+  make building on RHEL5 easier.
+
 * Fri Nov 13 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.12.rc6
 - Update to 1.6.2.0-rc6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	13 Nov 2009 22:37:00 -0000	1.28
+++ sources	2 Dec 2009 19:44:42 -0000	1.29
@@ -1,2 +1,2 @@
-770a80d306ccc928481ff9030d7fec38  asterisk-1.6.2.0-rc6.tar.gz
-e40c4f5ff29edac5062cb80989cdaef1  asterisk-1.6.2.0-rc6.tar.gz.asc
+67d90f1a7af5a3dcf5de9b342e7f21a9  asterisk-1.6.2.0-rc7.tar.gz
+07f681e122e18ff201a0662cb6a02198  asterisk-1.6.2.0-rc7.tar.gz.asc



From ajax at fedoraproject.org  Wed Dec  2 19:49:28 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Dec 2009 19:49:28 +0000 (UTC)
Subject: rpms/libxcb/F-11 libxcb-1.4-keepalive.patch, NONE, 1.1 libxcb.spec, 
	1.21, 1.22
Message-ID: <20091202194928.ABC7311C0095@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.4-keepalive.patch 
Log Message:
* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 1.2-5
- libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) for TCP (#476415)


libxcb-1.4-keepalive.patch:
 xcb_util.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libxcb-1.4-keepalive.patch ---
>From 1cf2a87def76f4646fe05e282b45605d572f2513 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 2 Dec 2009 14:31:56 -0500
Subject: [PATCH] setsockopt(SO_KEEPALIVE) on TCP display connections.

This matches xtrans behaviour in SocketINETConnect, and makes it so apps
don't hang forever if their display dies.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 src/xcb_util.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 55aadb7..c3cbfa6 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -260,6 +260,7 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
         if(fd >= 0) {
             int on = 1;
             setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+	    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
 
             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
                 break;
-- 
1.6.5.2



Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/F-11/libxcb.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libxcb.spec	24 Jun 2009 16:07:23 -0000	1.21
+++ libxcb.spec	2 Dec 2009 19:49:28 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           libxcb
 Version:        1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -17,6 +17,7 @@ Source1:	pthread-stubs.pc.in
 Patch0:         libxcb-1.1-no-pthread-stubs.patch
 Patch1:		libxcb-1.2-to-git-6e2e87d.patch
 Patch2:         libxcb-1.2-disable-nagle.patch
+Patch3:		libxcb-1.4-keepalive.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -56,6 +57,7 @@ The %{name}-doc package contains documen
 %patch0 -p1 -b .pthread-stubs
 %patch1 -p1 -b .git
 %patch2 -p1 -b .disable-nagle
+%patch3 -p1 -b .keepalive
 
 %build
 autoreconf -v --install
@@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 1.2-5
+- libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) for TCP (#476415)
+
 * Wed Jun 24 2009 Warren Togami <wtogami at redhat.com> 1.2-4
 - disable Nagle's algorithm for X TCP traffic as upstream decided this was a bad idea.
   This should be a significant performance boost.



From wtogami at fedoraproject.org  Wed Dec  2 19:50:40 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 19:50:40 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.427,1.428
Message-ID: <20091202195040.549DB11C03A3@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	evolution.spec 
Log Message:
remove



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -p -r1.427 -r1.428
--- evolution.spec	2 Dec 2009 18:55:43 -0000	1.427
+++ evolution.spec	2 Dec 2009 19:50:40 -0000	1.428
@@ -1,12 +1,3 @@
-# Variable must exist even if unused
-%{?!rhel:%define rhel 0}
-%define disable_bogofilter 0
-
-%if 0%{?rhel} >= 6
-# Disable bogofilter subpackage if EL6+
-%define disable_bogofilter 1
-%endif
-
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
 %define glib2_version 2.16.0
@@ -49,7 +40,7 @@
 
 Name: evolution
 Version: 2.29.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -201,8 +192,6 @@ This package contains conduits for synch
 PalmOS<tm> devices with %{name}.
 %endif
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
@@ -211,7 +200,6 @@ Requires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
-%endif
 
 %package spamassassin
 Group: Applications/Productivity
@@ -379,13 +367,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-in
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
-rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
-rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
-%endif
-
 %pre
 if [ "$1" -gt 1 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -400,12 +381,9 @@ gconftool-2 --makefile-uninstall-rule %{
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 fi
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
 %pre bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
-%endif
 
 %post
 /sbin/ldconfig
@@ -424,12 +402,9 @@ gconftool-2 --makefile-install-rule %{_s
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || :
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
-%endif
 
 %preun
 if [ "$1" -eq 0 ] ; then
@@ -445,14 +420,11 @@ gconftool-2 --makefile-uninstall-rule %{
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
 fi
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
 %preun bogofilter
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
 fi
-%endif
 
 %postun
 /sbin/ldconfig
@@ -688,14 +660,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
 %files bogofilter
 %defattr(-, root, root)
 %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
-%endif
 
 %files spamassassin
 %defattr(-, root, root)
@@ -715,9 +684,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.29.3-3
-- Disable bogofilter subpackage if EL6+
-
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13
 - Update to 2.29.3
 - Add patch for missing m4 files from tarball.



From ajax at fedoraproject.org  Wed Dec  2 19:52:57 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Dec 2009 19:52:57 +0000 (UTC)
Subject: rpms/libxcb/F-12 libxcb-1.4-keepalive.patch, NONE, 1.1 libxcb.spec, 
	1.29, 1.30
Message-ID: <20091202195257.15AA011C0095@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6826

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.4-keepalive.patch 
Log Message:
* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 1.4-2
- libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) for TCP (#476415)


libxcb-1.4-keepalive.patch:
 xcb_util.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libxcb-1.4-keepalive.patch ---
>From 1cf2a87def76f4646fe05e282b45605d572f2513 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 2 Dec 2009 14:31:56 -0500
Subject: [PATCH] setsockopt(SO_KEEPALIVE) on TCP display connections.

This matches xtrans behaviour in SocketINETConnect, and makes it so apps
don't hang forever if their display dies.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 src/xcb_util.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 55aadb7..c3cbfa6 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -260,6 +260,7 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
         if(fd >= 0) {
             int on = 1;
             setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+	    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
 
             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
                 break;
-- 
1.6.5.2



Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/F-12/libxcb.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libxcb.spec	27 Aug 2009 18:14:21 -0000	1.29
+++ libxcb.spec	2 Dec 2009 19:52:56 -0000	1.30
@@ -7,7 +7,7 @@
 
 Name:           libxcb
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -22,6 +22,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Source1:	pthread-stubs.pc.in
 Source2:	http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2 
 
+Patch1:		libxcb-1.4-keepalive.patch:
+
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -70,6 +72,7 @@ Python bindings for %{name}.
 
 %prep
 %setup -q -b2
+%patch1 -p1 -b .keepalive
 
 %if !0%{?bootstrap}
 pushd ../xpyb-%{xpyb_version}
@@ -155,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 1.4-2
+- libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) for TCP (#476415)
+
 * Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 1.4-1
 - libxcb 1.4 (#518597)
 



From wtogami at fedoraproject.org  Wed Dec  2 19:53:27 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 19:53:27 +0000 (UTC)
Subject: rpms/evolution/F-12 evolution.spec,1.421,1.422
Message-ID: <20091202195327.5E53611C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7032

Modified Files:
	evolution.spec 
Log Message:
remove



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -p -r1.421 -r1.422
--- evolution.spec	2 Dec 2009 18:50:52 -0000	1.421
+++ evolution.spec	2 Dec 2009 19:53:27 -0000	1.422
@@ -1,12 +1,3 @@
-# Variable must exist even if unused
-%{?!rhel:%define rhel 0}
-%define disable_bogofilter 0
-
-%if 0%{?rhel} >= 6
-# Disable bogofilter subpackage if EL6+
-%define disable_bogofilter 1
-%endif
-
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
 %define glib2_version 2.16.0
@@ -205,8 +196,6 @@ This package contains conduits for synch
 PalmOS<tm> devices with %{name}.
 %endif
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
@@ -215,7 +204,6 @@ Requires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
-%endif
 
 %package spamassassin
 Group: Applications/Productivity
@@ -397,13 +385,6 @@ done
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6
-rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
-rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
-rm -f $RPM_BUILD_ROOT{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
-%endif
-
 %post
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -420,12 +401,9 @@ gconftool-2 --makefile-install-rule %{_s
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
-%endif
 
 %postun
 /sbin/ldconfig
@@ -694,14 +672,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6
 %files bogofilter
 %defattr(-, root, root)
 %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
-%endif
 
 %files spamassassin
 %defattr(-, root, root)
@@ -721,9 +696,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.28.1-3
-- Disable bogofilter subpackage if EL6+
-
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 - Remove patch 'Tweak desktop file for GNOME Shell' (fixed upstream).



From wtogami at fedoraproject.org  Wed Dec  2 19:53:47 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  2 Dec 2009 19:53:47 +0000 (UTC)
Subject: rpms/evolution/F-12 evolution.spec,1.422,1.423
Message-ID: <20091202195347.A73D311C0095@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7220

Modified Files:
	evolution.spec 
Log Message:
bump



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -p -r1.422 -r1.423
--- evolution.spec	2 Dec 2009 19:53:27 -0000	1.422
+++ evolution.spec	2 Dec 2009 19:53:47 -0000	1.423
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.28.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL



From ajax at fedoraproject.org  Wed Dec  2 19:53:53 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Dec 2009 19:53:53 +0000 (UTC)
Subject: rpms/libxcb/devel libxcb-1.4-keepalive.patch, NONE, 1.1 libxcb.spec,
	1.29, 1.30
Message-ID: <20091202195353.60C5111C0095@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.4-keepalive.patch 
Log Message:
* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 1.4-2
- libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) for TCP (#476415)


libxcb-1.4-keepalive.patch:
 xcb_util.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libxcb-1.4-keepalive.patch ---
>From 1cf2a87def76f4646fe05e282b45605d572f2513 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 2 Dec 2009 14:31:56 -0500
Subject: [PATCH] setsockopt(SO_KEEPALIVE) on TCP display connections.

This matches xtrans behaviour in SocketINETConnect, and makes it so apps
don't hang forever if their display dies.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 src/xcb_util.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 55aadb7..c3cbfa6 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -260,6 +260,7 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
         if(fd >= 0) {
             int on = 1;
             setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+	    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
 
             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
                 break;
-- 
1.6.5.2



Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libxcb.spec	27 Aug 2009 18:14:21 -0000	1.29
+++ libxcb.spec	2 Dec 2009 19:53:53 -0000	1.30
@@ -7,7 +7,7 @@
 
 Name:           libxcb
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -22,6 +22,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Source1:	pthread-stubs.pc.in
 Source2:	http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2 
 
+Patch1:		libxcb-1.4-keepalive.patch
+
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -70,6 +72,7 @@ Python bindings for %{name}.
 
 %prep
 %setup -q -b2
+%patch1 -p1 -b .keepalive
 
 %if !0%{?bootstrap}
 pushd ../xpyb-%{xpyb_version}
@@ -155,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 1.4-2
+- libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) for TCP (#476415)
+
 * Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 1.4-1
 - libxcb 1.4 (#518597)
 



From ajax at fedoraproject.org  Wed Dec  2 19:59:40 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Dec 2009 19:59:40 +0000 (UTC)
Subject: rpms/libxcb/F-12 libxcb.spec,1.30,1.31
Message-ID: <20091202195940.EEF1411C0095@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9431

Modified Files:
	libxcb.spec 
Log Message:
typo


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/F-12/libxcb.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libxcb.spec	2 Dec 2009 19:52:56 -0000	1.30
+++ libxcb.spec	2 Dec 2009 19:59:40 -0000	1.31
@@ -22,7 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Source1:	pthread-stubs.pc.in
 Source2:	http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2 
 
-Patch1:		libxcb-1.4-keepalive.patch:
+Patch1:		libxcb-1.4-keepalive.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen



From davidz at fedoraproject.org  Wed Dec  2 20:06:07 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed,  2 Dec 2009 20:06:07 +0000 (UTC)
Subject: File gnome-disk-utility-2.29.0.git20091202.tar.bz2 uploaded to
	lookaside cache by davidz
Message-ID: <20091202200607.C476510F896@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-disk-utility:

0517e364b85d9b120a8db345af14d5d8  gnome-disk-utility-2.29.0.git20091202.tar.bz2



From davidz at fedoraproject.org  Wed Dec  2 20:09:29 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed,  2 Dec 2009 20:09:29 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel .cvsignore, 1.10,
	1.11 gnome-disk-utility.spec, 1.20, 1.21 sources, 1.10, 1.11
Message-ID: <20091202200929.92D9D11C0095@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12451

Modified Files:
	.cvsignore gnome-disk-utility.spec sources 
Log Message:
* Wed Dec  2 2009 David Zeuthen <davidz at redhat.com> - 2.29.0-0.git20091202%{?dist}
- Update to git snapshot that requires udisks instead of DeviceKit-disks
- The UI has been completely revamped




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	18 Sep 2009 23:55:50 -0000	1.10
+++ .cvsignore	2 Dec 2009 20:09:29 -0000	1.11
@@ -7,3 +7,4 @@ gnome-disk-utility-0.3.tar.bz2
 gnome-disk-utility-0.4.tar.bz2
 gnome-disk-utility-0.5.tar.bz2
 gnome-disk-utility-2.28.0.tar.bz2
+gnome-disk-utility-2.29.0.git20091202.tar.bz2


Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gnome-disk-utility.spec	19 Sep 2009 00:29:52 -0000	1.20
+++ gnome-disk-utility.spec	2 Dec 2009 20:09:29 -0000	1.21
@@ -4,7 +4,7 @@
 %define gtk2_version              2.17.2
 %define gnome_doc_utils_version   0.3.2
 %define gnome_keyring_version     2.22
-%define devicekit_disks_version   007
+%define udisks_version            1.0.0
 %define unique_version            1.0.4
 %define libnotify_version         0.4.5
 %define nautilus_version          2.26
@@ -12,12 +12,12 @@
 
 Summary: Disk management application
 Name: gnome-disk-utility
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.29.0
+Release: 0.git20091202%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}.git20091202.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -28,7 +28,7 @@ BuildRequires: gnome-doc-utils >= %{gnom
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version}
-BuildRequires: DeviceKit-disks-devel >= %{devicekit_disks_version}
+BuildRequires: udisks-devel >= %{udisks_version}
 BuildRequires: unique-devel >= %{unique_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: nautilus-devel >= %{nautilus_version}
@@ -48,7 +48,7 @@ RAID, SMART monitoring, etc.
 %package libs
 Summary: Shared libraries used by Palimpsest
 Group: Development/Libraries
-Requires: DeviceKit-disks >= %{devicekit_disks_version}
+Requires: udisks >= %{udisks_version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -210,6 +210,10 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Wed Dec  2 2009 David Zeuthen <davidz at redhat.com> - 2.29.0-0.git20091202%{?dist}
+- Update to git snapshot that requires udisks instead of DeviceKit-disks
+- The UI has been completely revamped
+
 * Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-2%{?dist}
 - BR libatasmart-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	18 Sep 2009 23:55:50 -0000	1.10
+++ sources	2 Dec 2009 20:09:29 -0000	1.11
@@ -1 +1 @@
-2ef95e6d5949c0d623b16bb98108cce8  gnome-disk-utility-2.28.0.tar.bz2
+0517e364b85d9b120a8db345af14d5d8  gnome-disk-utility-2.29.0.git20091202.tar.bz2



From drago01 at fedoraproject.org  Wed Dec  2 20:10:24 2009
From: drago01 at fedoraproject.org (drago01)
Date: Wed,  2 Dec 2009 20:10:24 +0000 (UTC)
Subject: rpms/compiz-fusion-extras/F-12 compiz-fusion-extras.spec,1.30,1.31
Message-ID: <20091202201024.511F111C03E3@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12913

Modified Files:
	compiz-fusion-extras.spec 
Log Message:
fix build


Index: compiz-fusion-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/F-12/compiz-fusion-extras.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- compiz-fusion-extras.spec	30 Nov 2009 16:19:21 -0000	1.30
+++ compiz-fusion-extras.spec	2 Dec 2009 20:10:24 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion-extras
 Version: 0.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Additional Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -61,7 +61,7 @@ This package contain development files r
 
 %prep
 %setup -q -n compiz-plugins-extra-%{version}
-%patch1 -p1 .b group-crash
+%patch1 -p1 -b .group-crash
 
 %build
 %configure --enable-schemas
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/compiz-*
 
 %changelog
+* Tue Dec 01 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-4
+- Fix build
+
 * Mon Nov 30 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-3
 - Fix unloading of certain plugins resulting into a crash
 - RH #531714



From dwalsh at fedoraproject.org  Wed Dec  2 20:15:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  2 Dec 2009 20:15:23 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.143,
	1.144 selinux-policy.spec, 1.973, 1.974
Message-ID: <20091202201523.4B24411C0095@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14640

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-53
- Remove transition from dhcpc_t to consoletype_t, just allow exec
- Fixes for prelink cron job
- Fix label on yumex backend
- Allow unconfined_java_t to communicate with iptables
- Allow abrt to read /tmp files
- Fix nut/ups policy


policy-F12.patch:
 Makefile                                                     |    2 
 policy/flask/access_vectors                                  |    1 
 policy/global_tunables                                       |   24 
 policy/mcs                                                   |   10 
 policy/modules/admin/alsa.te                                 |    2 
 policy/modules/admin/anaconda.te                             |    3 
 policy/modules/admin/brctl.te                                |    2 
 policy/modules/admin/certwatch.te                            |    2 
 policy/modules/admin/consoletype.te                          |    1 
 policy/modules/admin/dmesg.fc                                |    2 
 policy/modules/admin/dmesg.te                                |   10 
 policy/modules/admin/firstboot.te                            |    6 
 policy/modules/admin/kismet.fc                               |    2 
 policy/modules/admin/kismet.te                               |   13 
 policy/modules/admin/logrotate.te                            |   21 
 policy/modules/admin/logwatch.te                             |    8 
 policy/modules/admin/mrtg.te                                 |    1 
 policy/modules/admin/netutils.te                             |    2 
 policy/modules/admin/ntop.fc                                 |    5 
 policy/modules/admin/ntop.if                                 |  158 +
 policy/modules/admin/ntop.te                                 |   40 
 policy/modules/admin/portage.te                              |    2 
 policy/modules/admin/prelink.fc                              |    1 
 policy/modules/admin/prelink.if                              |    4 
 policy/modules/admin/prelink.te                              |   77 
 policy/modules/admin/readahead.te                            |    1 
 policy/modules/admin/rpm.fc                                  |   21 
 policy/modules/admin/rpm.if                                  |  344 ++
 policy/modules/admin/rpm.te                                  |   98 
 policy/modules/admin/shorewall.fc                            |    6 
 policy/modules/admin/shorewall.if                            |   40 
 policy/modules/admin/shorewall.te                            |    9 
 policy/modules/admin/smoltclient.fc                          |    4 
 policy/modules/admin/smoltclient.if                          |    1 
 policy/modules/admin/smoltclient.te                          |   66 
 policy/modules/admin/sudo.if                                 |   13 
 policy/modules/admin/tmpreaper.te                            |   10 
 policy/modules/admin/tzdata.te                               |    2 
 policy/modules/admin/usermanage.if                           |   11 
 policy/modules/admin/usermanage.te                           |   35 
 policy/modules/admin/vbetool.te                              |   14 
 policy/modules/admin/vpn.te                                  |    4 
 policy/modules/apps/calamaris.te                             |    7 
 policy/modules/apps/chrome.fc                                |    2 
 policy/modules/apps/chrome.if                                |   86 
 policy/modules/apps/chrome.te                                |   78 
 policy/modules/apps/cpufreqselector.te                       |    2 
 policy/modules/apps/execmem.fc                               |   42 
 policy/modules/apps/execmem.if                               |   80 
 policy/modules/apps/execmem.te                               |   11 
 policy/modules/apps/firewallgui.fc                           |    3 
 policy/modules/apps/firewallgui.if                           |    3 
 policy/modules/apps/firewallgui.te                           |   64 
 policy/modules/apps/gitosis.if                               |   45 
 policy/modules/apps/gnome.fc                                 |   12 
 policy/modules/apps/gnome.if                                 |  170 +
 policy/modules/apps/gnome.te                                 |   99 
 policy/modules/apps/gpg.te                                   |   20 
 policy/modules/apps/java.fc                                  |   24 
 policy/modules/apps/java.if                                  |  114 
 policy/modules/apps/java.te                                  |   19 
 policy/modules/apps/kdumpgui.fc                              |    2 
 policy/modules/apps/kdumpgui.if                              |    2 
 policy/modules/apps/kdumpgui.te                              |   67 
 policy/modules/apps/livecd.fc                                |    2 
 policy/modules/apps/livecd.if                                |   52 
 policy/modules/apps/livecd.te                                |   27 
 policy/modules/apps/loadkeys.te                              |    6 
 policy/modules/apps/mono.fc                                  |    2 
 policy/modules/apps/mono.if                                  |  101 
 policy/modules/apps/mono.te                                  |    9 
 policy/modules/apps/mozilla.fc                               |    1 
 policy/modules/apps/mozilla.if                               |   68 
 policy/modules/apps/mozilla.te                               |   23 
 policy/modules/apps/nsplugin.fc                              |   11 
 policy/modules/apps/nsplugin.if                              |  323 ++
 policy/modules/apps/nsplugin.te                              |  295 +
 policy/modules/apps/openoffice.fc                            |    3 
 policy/modules/apps/openoffice.if                            |   93 
 policy/modules/apps/openoffice.te                            |   11 
 policy/modules/apps/podsleuth.te                             |    3 
 policy/modules/apps/ptchown.if                               |   25 
 policy/modules/apps/pulseaudio.if                            |    2 
 policy/modules/apps/pulseaudio.te                            |   13 
 policy/modules/apps/qemu.fc                                  |    4 
 policy/modules/apps/qemu.if                                  |  189 +
 policy/modules/apps/qemu.te                                  |   85 
 policy/modules/apps/sambagui.fc                              |    1 
 policy/modules/apps/sambagui.if                              |    2 
 policy/modules/apps/sambagui.te                              |   60 
 policy/modules/apps/sandbox.fc                               |    1 
 policy/modules/apps/sandbox.if                               |  188 +
 policy/modules/apps/sandbox.te                               |  331 ++
 policy/modules/apps/screen.if                                |    7 
 policy/modules/apps/sectoolm.fc                              |    6 
 policy/modules/apps/sectoolm.if                              |    3 
 policy/modules/apps/sectoolm.te                              |  120 
 policy/modules/apps/selinux-policy-3.6.32-41.fc12.noarch.rpm |binary
 policy/modules/apps/seunshare.fc                             |    2 
 policy/modules/apps/seunshare.if                             |   81 
 policy/modules/apps/seunshare.te                             |   43 
 policy/modules/apps/vmware.te                                |    1 
 policy/modules/apps/wine.fc                                  |   24 
 policy/modules/apps/wine.if                                  |  115 
 policy/modules/apps/wine.te                                  |   34 
 policy/modules/kernel/corecommands.fc                        |   43 
 policy/modules/kernel/corecommands.if                        |   21 
 policy/modules/kernel/corecommands.pp                        |binary
 policy/modules/kernel/corenetwork.te.in                      |   46 
 policy/modules/kernel/devices.fc                             |   13 
 policy/modules/kernel/devices.if                             |  309 ++
 policy/modules/kernel/devices.te                             |   25 
 policy/modules/kernel/domain.if                              |  170 -
 policy/modules/kernel/domain.te                              |   89 
 policy/modules/kernel/files.fc                               |    4 
 policy/modules/kernel/files.if                               |  398 ++
 policy/modules/kernel/files.te                               |    6 
 policy/modules/kernel/filesystem.fc                          |    2 
 policy/modules/kernel/filesystem.if                          |  256 +
 policy/modules/kernel/filesystem.te                          |   16 
 policy/modules/kernel/kernel.if                              |   98 
 policy/modules/kernel/kernel.te                              |   32 
 policy/modules/kernel/selinux.if                             |   25 
 policy/modules/kernel/storage.fc                             |    2 
 policy/modules/kernel/storage.if                             |    3 
 policy/modules/kernel/terminal.fc                            |    1 
 policy/modules/kernel/terminal.if                            |   44 
 policy/modules/kernel/terminal.te                            |    1 
 policy/modules/roles/guest.te                                |    8 
 policy/modules/roles/staff.te                                |  126 
 policy/modules/roles/sysadm.te                               |  126 
 policy/modules/roles/unconfineduser.fc                       |    8 
 policy/modules/roles/unconfineduser.if                       |  667 ++++
 policy/modules/roles/unconfineduser.te                       |  436 ++
 policy/modules/roles/unprivuser.te                           |  127 
 policy/modules/roles/xguest.te                               |   74 
 policy/modules/services/abrt.fc                              |    6 
 policy/modules/services/abrt.if                              |  102 
 policy/modules/services/abrt.te                              |  105 
 policy/modules/services/afs.fc                               |    1 
 policy/modules/services/afs.te                               |    3 
 policy/modules/services/aisexec.fc                           |   12 
 policy/modules/services/aisexec.if                           |  106 
 policy/modules/services/aisexec.te                           |  112 
 policy/modules/services/amavis.te                            |    2 
 policy/modules/services/apache.fc                            |   50 
 policy/modules/services/apache.if                            |  410 +-
 policy/modules/services/apache.te                            |  452 ++
 policy/modules/services/apm.te                               |    6 
 policy/modules/services/arpwatch.te                          |    2 
 policy/modules/services/asterisk.if                          |   21 
 policy/modules/services/asterisk.te                          |   20 
 policy/modules/services/automount.te                         |    2 
 policy/modules/services/avahi.te                             |   10 
 policy/modules/services/bind.if                              |   40 
 policy/modules/services/bitlbee.te                           |    2 
 policy/modules/services/bluetooth.if                         |   21 
 policy/modules/services/bluetooth.te                         |   11 
 policy/modules/services/ccs.fc                               |    8 
 policy/modules/services/ccs.te                               |   33 
 policy/modules/services/certmaster.te                        |    2 
 policy/modules/services/chronyd.fc                           |   11 
 policy/modules/services/chronyd.if                           |  105 
 policy/modules/services/chronyd.te                           |   67 
 policy/modules/services/clamav.te                            |   18 
 policy/modules/services/clogd.fc                             |    4 
 policy/modules/services/clogd.if                             |   98 
 policy/modules/services/clogd.te                             |   62 
 policy/modules/services/cobbler.fc                           |    2 
 policy/modules/services/cobbler.if                           |   44 
 policy/modules/services/cobbler.te                           |    5 
 policy/modules/services/consolekit.fc                        |    3 
 policy/modules/services/consolekit.if                        |   39 
 policy/modules/services/consolekit.te                        |   24 
 policy/modules/services/corosync.fc                          |   13 
 policy/modules/services/corosync.if                          |  108 
 policy/modules/services/corosync.te                          |  109 
 policy/modules/services/courier.if                           |   18 
 policy/modules/services/courier.te                           |    1 
 policy/modules/services/cron.fc                              |    6 
 policy/modules/services/cron.if                              |   74 
 policy/modules/services/cron.te                              |   82 
 policy/modules/services/cups.fc                              |   13 
 policy/modules/services/cups.te                              |   51 
 policy/modules/services/cvs.te                               |    1 
 policy/modules/services/cyrus.te                             |    1 
 policy/modules/services/dbus.if                              |   49 
 policy/modules/services/dbus.te                              |   25 
 policy/modules/services/dcc.te                               |    8 
 policy/modules/services/ddclient.if                          |   25 
 policy/modules/services/devicekit.fc                         |    2 
 policy/modules/services/devicekit.if                         |   22 
 policy/modules/services/devicekit.te                         |   60 
 policy/modules/services/dnsmasq.te                           |   12 
 policy/modules/services/dovecot.te                           |   28 
 policy/modules/services/exim.te                              |    5 
 policy/modules/services/fail2ban.te                          |    2 
 policy/modules/services/fetchmail.te                         |    3 
 policy/modules/services/fprintd.te                           |    4 
 policy/modules/services/ftp.te                               |   60 
 policy/modules/services/git.fc                               |    8 
 policy/modules/services/git.if                               |  286 +
 policy/modules/services/git.te                               |  166 +
 policy/modules/services/gpm.te                               |    3 
 policy/modules/services/gpsd.fc                              |    5 
 policy/modules/services/gpsd.if                              |   27 
 policy/modules/services/gpsd.te                              |   14 
 policy/modules/services/hal.fc                               |    1 
 policy/modules/services/hal.if                               |   18 
 policy/modules/services/hal.te                               |   49 
 policy/modules/services/howl.te                              |    2 
 policy/modules/services/inetd.fc                             |    2 
 policy/modules/services/inetd.te                             |    4 
 policy/modules/services/irqbalance.te                        |    4 
 policy/modules/services/kerberos.if                          |    6 
 policy/modules/services/kerberos.te                          |   16 
 policy/modules/services/kerneloops.te                        |    2 
 policy/modules/services/ktalk.te                             |    1 
 policy/modules/services/lircd.fc                             |    2 
 policy/modules/services/lircd.if                             |    9 
 policy/modules/services/lircd.te                             |   23 
 policy/modules/services/mailman.te                           |    4 
 policy/modules/services/memcached.te                         |    2 
 policy/modules/services/milter.if                            |    2 
 policy/modules/services/modemmanager.te                      |    5 
 policy/modules/services/mta.fc                               |    2 
 policy/modules/services/mta.if                               |   13 
 policy/modules/services/mta.te                               |   36 
 policy/modules/services/munin.fc                             |    3 
 policy/modules/services/munin.te                             |    3 
 policy/modules/services/mysql.te                             |    9 
 policy/modules/services/nagios.fc                            |   20 
 policy/modules/services/nagios.if                            |   89 
 policy/modules/services/nagios.te                            |  106 
 policy/modules/services/networkmanager.fc                    |   15 
 policy/modules/services/networkmanager.if                    |   65 
 policy/modules/services/networkmanager.te                    |  117 
 policy/modules/services/nis.fc                               |    5 
 policy/modules/services/nis.if                               |   87 
 policy/modules/services/nis.te                               |   13 
 policy/modules/services/nscd.if                              |   18 
 policy/modules/services/nscd.te                              |   21 
 policy/modules/services/nslcd.if                             |    8 
 policy/modules/services/ntop.te                              |   14 
 policy/modules/services/ntp.if                               |   46 
 policy/modules/services/ntp.te                               |    8 
 policy/modules/services/nut.fc                               |    8 
 policy/modules/services/nut.if                               |   82 
 policy/modules/services/nut.pp                               |binary
 policy/modules/services/nut.tar                              |binary
 policy/modules/services/nut.te                               |  127 
 policy/modules/services/nx.fc                                |    7 
 policy/modules/services/nx.if                                |   67 
 policy/modules/services/nx.te                                |   13 
 policy/modules/services/oddjob.if                            |    1 
 policy/modules/services/oddjob.te                            |    4 
 policy/modules/services/openvpn.te                           |    2 
 policy/modules/services/pcscd.if                             |   22 
 policy/modules/services/pcscd.te                             |    4 
 policy/modules/services/pegasus.te                           |   28 
 policy/modules/services/plymouth.fc                          |    5 
 policy/modules/services/plymouth.if                          |  286 +
 policy/modules/services/plymouth.te                          |  101 
 policy/modules/services/policykit.fc                         |    5 
 policy/modules/services/policykit.if                         |   48 
 policy/modules/services/policykit.te                         |   64 
 policy/modules/services/portreserve.te                       |    1 
 policy/modules/services/postfix.fc                           |    2 
 policy/modules/services/postfix.if                           |  150 
 policy/modules/services/postfix.te                           |  142 
 policy/modules/services/postgresql.fc                        |   16 
 policy/modules/services/postgresql.if                        |   43 
 policy/modules/services/postgresql.te                        |    9 
 policy/modules/services/ppp.if                               |    6 
 policy/modules/services/ppp.te                               |   16 
 policy/modules/services/prelude.te                           |    3 
 policy/modules/services/privoxy.fc                           |    3 
 policy/modules/services/privoxy.te                           |    3 
 policy/modules/services/procmail.te                          |   12 
 policy/modules/services/pyzor.fc                             |    4 
 policy/modules/services/pyzor.if                             |   47 
 policy/modules/services/pyzor.te                             |   37 
 policy/modules/services/radvd.te                             |    1 
 policy/modules/services/razor.fc                             |    1 
 policy/modules/services/razor.if                             |   42 
 policy/modules/services/razor.te                             |   32 
 policy/modules/services/rgmanager.fc                         |    8 
 policy/modules/services/rgmanager.if                         |   59 
 policy/modules/services/rgmanager.te                         |   83 
 policy/modules/services/rhcs.fc                              |   22 
 policy/modules/services/rhcs.if                              |  348 ++
 policy/modules/services/rhcs.te                              |  394 ++
 policy/modules/services/ricci.te                             |   30 
 policy/modules/services/rpc.if                               |    7 
 policy/modules/services/rpc.te                               |   17 
 policy/modules/services/rpcbind.if                           |   20 
 policy/modules/services/rpcbind.te                           |    1 
 policy/modules/services/rsync.te                             |   23 
 policy/modules/services/rtkit.if                             |   20 
 policy/modules/services/rtkit.te                             |    4 
 policy/modules/services/samba.fc                             |    4 
 policy/modules/services/samba.if                             |  104 
 policy/modules/services/samba.te                             |   89 
 policy/modules/services/sasl.te                              |   15 
 policy/modules/services/sendmail.if                          |  137 
 policy/modules/services/sendmail.te                          |   87 
 policy/modules/services/setroubleshoot.fc                    |    2 
 policy/modules/services/setroubleshoot.if                    |  123 
 policy/modules/services/setroubleshoot.te                    |   82 
 policy/modules/services/smartmon.te                          |   15 
 policy/modules/services/snmp.if                              |   38 
 policy/modules/services/snmp.te                              |    4 
 policy/modules/services/snort.te                             |    1 
 policy/modules/services/spamassassin.fc                      |   15 
 policy/modules/services/spamassassin.if                      |   89 
 policy/modules/services/spamassassin.te                      |  139 
 policy/modules/services/squid.te                             |    9 
 policy/modules/services/ssh.fc                               |    2 
 policy/modules/services/ssh.if                               |  207 +
 policy/modules/services/ssh.te                               |  155 -
 policy/modules/services/sssd.fc                              |    5 
 policy/modules/services/sssd.if                              |   62 
 policy/modules/services/sssd.te                              |   15 
 policy/modules/services/sysstat.te                           |    5 
 policy/modules/services/tftp.fc                              |    2 
 policy/modules/services/tor.te                               |    1 
 policy/modules/services/tuned.fc                             |    6 
 policy/modules/services/tuned.if                             |  140 
 policy/modules/services/tuned.te                             |   58 
 policy/modules/services/uucp.te                              |   10 
 policy/modules/services/virt.fc                              |   14 
 policy/modules/services/virt.if                              |  210 +
 policy/modules/services/virt.te                              |  276 +
 policy/modules/services/w3c.te                               |    7 
 policy/modules/services/xserver.fc                           |   45 
 policy/modules/services/xserver.if                           |  633 +++-
 policy/modules/services/xserver.te                           |  363 +-
 policy/modules/system/application.if                         |   20 
 policy/modules/system/application.te                         |   12 
 policy/modules/system/authlogin.fc                           |    9 
 policy/modules/system/authlogin.if                           |  209 +
 policy/modules/system/authlogin.te                           |   10 
 policy/modules/system/fstools.fc                             |    3 
 policy/modules/system/fstools.te                             |    7 
 policy/modules/system/init.fc                                |    7 
 policy/modules/system/init.if                                |  163 -
 policy/modules/system/init.te                                |  290 +
 policy/modules/system/ipsec.fc                               |    7 
 policy/modules/system/ipsec.if                               |   25 
 policy/modules/system/ipsec.te                               |   66 
 policy/modules/system/iptables.fc                            |   17 
 policy/modules/system/iptables.if                            |   97 
 policy/modules/system/iptables.te                            |   20 
 policy/modules/system/iscsi.if                               |   40 
 policy/modules/system/iscsi.te                               |    6 
 policy/modules/system/kdump.te                               |    5 
 policy/modules/system/libraries.fc                           |  182 -
 policy/modules/system/libraries.if                           |    5 
 policy/modules/system/libraries.te                           |   18 
 policy/modules/system/locallogin.te                          |   30 
 policy/modules/system/logging.fc                             |   12 
 policy/modules/system/logging.if                             |   18 
 policy/modules/system/logging.te                             |   38 
 policy/modules/system/lvm.if                                 |   39 
 policy/modules/system/lvm.te                                 |   31 
 policy/modules/system/miscfiles.fc                           |    1 
 policy/modules/system/miscfiles.if                           |   60 
 policy/modules/system/miscfiles.te                           |    2 
 policy/modules/system/modutils.fc                            |    1 
 policy/modules/system/modutils.if                            |   46 
 policy/modules/system/modutils.te                            |   56 
 policy/modules/system/mount.fc                               |    7 
 policy/modules/system/mount.if                               |    2 
 policy/modules/system/mount.te                               |   83 
 policy/modules/system/raid.fc                                |    2 
 policy/modules/system/raid.te                                |    8 
 policy/modules/system/selinuxutil.fc                         |   17 
 policy/modules/system/selinuxutil.if                         |  309 ++
 policy/modules/system/selinuxutil.te                         |  229 -
 policy/modules/system/setrans.if                             |   20 
 policy/modules/system/sysnetwork.fc                          |    9 
 policy/modules/system/sysnetwork.if                          |  114 
 policy/modules/system/sysnetwork.te                          |   79 
 policy/modules/system/udev.fc                                |    3 
 policy/modules/system/udev.if                                |   39 
 policy/modules/system/udev.te                                |   39 
 policy/modules/system/unconfined.fc                          |   15 
 policy/modules/system/unconfined.if                          |  443 --
 policy/modules/system/unconfined.te                          |  224 -
 policy/modules/system/userdomain.fc                          |    7 
 policy/modules/system/userdomain.if                          | 1684 ++++++++---
 policy/modules/system/userdomain.te                          |   51 
 policy/modules/system/xen.fc                                 |    6 
 policy/modules/system/xen.if                                 |   28 
 policy/modules/system/xen.te                                 |  137 
 policy/support/obj_perm_sets.spt                             |   28 
 policy/users                                                 |   13 
 397 files changed, 19716 insertions(+), 2816 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- policy-F12.patch	1 Dec 2009 16:14:38 -0000	1.143
+++ policy-F12.patch	2 Dec 2009 20:15:22 -0000	1.144
@@ -654,7 +654,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.32/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-11-30 11:31:33.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-12-02 13:54:17.000000000 -0500
 @@ -21,8 +21,23 @@
  type prelink_tmp_t;
  files_tmp_file(prelink_tmp_t)
@@ -720,7 +720,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	amanda_manage_lib(prelink_t)
-@@ -99,5 +119,54 @@
+@@ -99,5 +119,56 @@
  ')
  
  optional_policy(`
@@ -737,19 +737,21 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +
 +allow prelink_cron_system_t self:capability setuid;
-+allow prelink_cron_system_t self:process setsched;
++allow prelink_cron_system_t self:process { setsched setfscreate };
 +allow prelink_cron_system_t self:fifo_file rw_fifo_file_perms;
 +allow prelink_cron_system_t self:unix_dgram_socket { write bind create setopt };
 +
 +domtrans_pattern(prelink_cron_system_t, prelink_exec_t, prelink_t)
 +
 +read_files_pattern(prelink_cron_system_t, prelink_cache_t, prelink_cache_t)
++allow prelink_cron_system_t prelink_cache_t:file unlink;
++files_delete_etc_dir_entry(prelink_cron_system_t)
 +
-+# This sucks: can it not just append?
-+rw_files_pattern(prelink_cron_system_t, prelink_log_t, prelink_log_t)
++manage_files_pattern(prelink_cron_system_t, prelink_log_t, prelink_log_t)
 +
 +manage_files_pattern(prelink_cron_system_t, prelink_var_lib_t, prelink_var_lib_t)
 +files_var_lib_filetrans(prelink_cron_system_t, prelink_var_lib_t, file)
++allow prelink_cron_system_t prelink_var_lib_t:file { relabelfrom relabelto };
 +
 +corecmd_exec_bin(prelink_cron_system_t)
 +corecmd_exec_shell(prelink_cron_system_t)
@@ -788,8 +790,8 @@ diff -b -B --ignore-all-space --exclude-
  files_dontaudit_getattr_all_sockets(readahead_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.32/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.fc	2009-10-28 08:38:25.000000000 -0400
-@@ -1,18 +1,18 @@
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.fc	2009-12-01 15:44:26.000000000 -0500
+@@ -1,18 +1,19 @@
  
  /bin/rpm 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
 +/usr/bin/rpm 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -811,10 +813,11 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/packagekitd		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 +/usr/libexec/yumDBUSBackend.py	--	gen_context(system_u:object_r:rpm_exec_t,s0)
 +/usr/share/yumex/yumex-yum-backend --	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/share/yumex/yum_childtask\.py --	gen_context(system_u:object_r:rpm_exec_t,s0)
  
  ifdef(`distro_redhat', `
  /usr/bin/fedora-rmdevelrpms	--	gen_context(system_u:object_r:rpm_exec_t,s0)
-@@ -21,15 +21,23 @@
+@@ -21,15 +22,23 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -1760,7 +1763,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te	2009-11-16 09:57:56.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te	2009-12-01 15:42:25.000000000 -0500
 @@ -42,6 +42,7 @@
  cron_system_entry(tmpreaper_t, tmpreaper_exec_t)
  
@@ -1769,18 +1772,19 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_delete_user_home_content_dirs(tmpreaper_t)
  	userdom_delete_user_home_content_files(tmpreaper_t)
  	userdom_delete_user_home_content_symlinks(tmpreaper_t)
-@@ -52,6 +53,10 @@
+@@ -52,6 +53,11 @@
  ')
  
  optional_policy(`
 +	apache_delete_sys_content_rw(tmpreaper_t)
++	apache_delete_cache(tmpreaper_t)
 +')
 +
 +optional_policy(`
  	kismet_manage_log(tmpreaper_t)
  ')
  
-@@ -60,5 +65,9 @@
+@@ -60,5 +66,9 @@
  ')
  
  optional_policy(`
@@ -4758,7 +4762,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.6.32/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/qemu.te	2009-11-13 08:12:27.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/qemu.te	2009-12-02 13:43:45.000000000 -0500
 @@ -13,15 +13,48 @@
  ## </desc>
  gen_tunable(qemu_full_network, false)
@@ -4858,7 +4862,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # qemu_unconfined local policy
-@@ -44,6 +115,9 @@
+@@ -44,6 +115,10 @@
  	type qemu_unconfined_t;
  	domain_type(qemu_unconfined_t)
  	unconfined_domain_noaudit(qemu_unconfined_t)
@@ -4867,6 +4871,7 @@ diff -b -B --ignore-all-space --exclude-
 +	application_type(qemu_unconfined_t)
 +	role unconfined_r types qemu_unconfined_t;
  	allow qemu_unconfined_t self:process { execstack execmem };
++	allow qemu_unconfined_t qemu_exec_t:file execmod;
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.fc serefpolicy-3.6.32/policy/modules/apps/sambagui.fc
 --- nsaserefpolicy/policy/modules/apps/sambagui.fc	1969-12-31 19:00:00.000000000 -0500
@@ -6004,7 +6009,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-12-01 09:36:15.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-12-02 09:10:48.000000000 -0500
 @@ -1,4 +1,4 @@
 -
 +c
@@ -6060,7 +6065,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -211,6 +217,8 @@
+@@ -211,16 +217,22 @@
  /usr/share/apr-0/build/[^/]+\.sh --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/apr-0/build/libtool --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/debconf/.+		--	gen_context(system_u:object_r:bin_t,s0)
@@ -6069,7 +6074,11 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/gnucash/finance-quote-check -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/gnucash/finance-quote-helper -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hal/device-manager/hal-device-manager -- gen_context(system_u:object_r:bin_t,s0)
-@@ -221,6 +229,9 @@
+ /usr/share/hal/scripts(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/mc/extfs/.*		--	gen_context(system_u:object_r:bin_t,s0)
++/usr/share/mythtv/mythweather/scripts(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/Modules/init(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/printconf/util/print\.py --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/PackageKit/pk-upgrade-distro\.sh -- 	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/PackageKit/helpers(/.*)?	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
@@ -6079,7 +6088,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/shorewall/configpath	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/shorewall-perl(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/share/shorewall-shell(/.*)?	gen_context(system_u:object_r:bin_t,s0)
-@@ -263,6 +274,7 @@
+@@ -263,6 +275,7 @@
  /usr/share/ssl/misc(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/share/switchdesk/switchdesk-gui\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-date/system-config-date\.py -- gen_context(system_u:object_r:bin_t,s0)
@@ -6087,7 +6096,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/system-config-selinux/system-config-selinux\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-display/system-config-display -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-httpd/system-config-httpd -- gen_context(system_u:object_r:bin_t,s0)
-@@ -315,3 +327,21 @@
+@@ -315,3 +328,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -6375,8 +6384,58 @@ diff -b -B --ignore-all-space --exclude-
  /var/named/chroot/dev/zero -c	gen_context(system_u:object_r:zero_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.32/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-11-30 14:35:16.000000000 -0500
-@@ -1692,6 +1692,78 @@
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-12-02 09:43:54.000000000 -0500
+@@ -783,6 +783,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Dontaudit write on all block file device nodes.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`dev_dontaudit_write_all_blk_files',`
++	gen_require(`
++		attribute device_node;
++	')
++
++	dontaudit $1 device_node:blk_file write;
++')
++
++########################################
++## <summary>
+ ##	Dontaudit read on all character file device nodes.
+ ## </summary>
+ ## <param name="domain">
+@@ -801,6 +819,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Dontaudit write on all character file device nodes.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`dev_dontaudit_write_all_chr_files',`
++	gen_require(`
++		attribute device_node;
++	')
++
++	dontaudit $1 device_node:chr_file write;
++')
++
++########################################
++## <summary>
+ ##	Create all block device files.
+ ## </summary>
+ ## <param name="domain">
+@@ -1692,6 +1728,78 @@
  
  ########################################
  ## <summary>
@@ -6455,7 +6514,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Get the attributes of the kvm devices.
  ## </summary>
  ## <param name="domain">
-@@ -1762,6 +1834,61 @@
+@@ -1762,6 +1870,61 @@
  	rw_chr_files_pattern($1, device_t, kvm_device_t)
  ')
  
@@ -6517,7 +6576,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Read the lvm comtrol device.
-@@ -1818,6 +1945,25 @@
+@@ -1818,6 +1981,25 @@
  
  ########################################
  ## <summary>
@@ -6543,7 +6602,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	dontaudit getattr raw memory devices (e.g. /dev/mem).
  ## </summary>
  ## <param name="domain">
-@@ -1836,6 +1982,24 @@
+@@ -1836,6 +2018,24 @@
  
  ########################################
  ## <summary>
@@ -6568,7 +6627,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read raw memory devices (e.g. /dev/mem).
  ## </summary>
  ## <param name="domain">
-@@ -2046,6 +2210,78 @@
+@@ -2046,6 +2246,78 @@
  
  ########################################
  ## <summary>
@@ -6647,7 +6706,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Get the attributes of the mouse devices.
  ## </summary>
  ## <param name="domain">
-@@ -2305,6 +2541,25 @@
+@@ -2305,6 +2577,25 @@
  
  ########################################
  ## <summary>
@@ -6673,7 +6732,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write to the null device (/dev/null).
  ## </summary>
  ## <param name="domain">
-@@ -3599,6 +3854,24 @@
+@@ -3599,6 +3890,24 @@
  
  ########################################
  ## <summary>
@@ -6756,7 +6815,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.32/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/domain.if	2009-11-30 15:50:22.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/domain.if	2009-12-02 09:09:19.000000000 -0500
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -7122,7 +7181,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.6.32/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/files.fc	2009-12-02 13:34:38.000000000 -0500
 @@ -18,6 +18,7 @@
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /halt			--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -7131,7 +7190,15 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ifdef(`distro_suse',`
-@@ -229,6 +230,8 @@
+@@ -48,6 +49,7 @@
+ /etc/.*				gen_context(system_u:object_r:etc_t,s0)
+ /etc/\.fstab\.hal\..+	--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/blkid(/.*)?		gen_context(system_u:object_r:etc_runtime_t,s0)
++/etc/cmtab		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/fstab\.REVOKE	--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/HOSTNAME		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/ioctl\.save	--	gen_context(system_u:object_r:etc_runtime_t,s0)
+@@ -229,6 +231,8 @@
  
  /var/ftp/etc(/.*)?		gen_context(system_u:object_r:etc_t,s0)
  
@@ -7142,7 +7209,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-01 10:00:54.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-02 13:55:02.000000000 -0500
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -7274,7 +7341,33 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2418,6 +2499,11 @@
+@@ -2011,6 +2092,25 @@
+ 	delete_files_pattern($1, etc_t, etc_t)
+ ')
+ 
++
++########################################
++## <summary>
++##	Remove entries from the etc directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_delete_etc_dir_entry',`
++	gen_require(`
++		type etc_t;
++	')
++
++	allow $1 etc_t:dir del_entry_dir_perms;
++')
++
+ ########################################
+ ## <summary>
+ ##	Execute generic files in /etc.
+@@ -2418,6 +2518,11 @@
  	')
  
  	delete_files_pattern($1, file_t, file_t)
@@ -7286,7 +7379,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3320,6 +3406,32 @@
+@@ -3320,6 +3425,32 @@
  
  ########################################
  ## <summary>
@@ -7319,7 +7412,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Manage temporary files and directories in /tmp.
  ## </summary>
  ## <param name="domain">
-@@ -3449,6 +3561,24 @@
+@@ -3449,6 +3580,24 @@
  
  ########################################
  ## <summary>
@@ -7344,7 +7437,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read all tmp files.
  ## </summary>
  ## <param name="domain">
-@@ -3515,6 +3645,8 @@
+@@ -3515,6 +3664,8 @@
  	delete_lnk_files_pattern($1, tmpfile, tmpfile)
  	delete_fifo_files_pattern($1, tmpfile, tmpfile)
  	delete_sock_files_pattern($1, tmpfile, tmpfile)
@@ -7353,7 +7446,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3623,7 +3755,12 @@
+@@ -3623,7 +3774,12 @@
  		type usr_t;
  	')
  
@@ -7367,7 +7460,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3662,6 +3799,7 @@
+@@ -3662,6 +3818,7 @@
  	allow $1 usr_t:dir list_dir_perms;
  	read_files_pattern($1, usr_t, usr_t)
  	read_lnk_files_pattern($1, usr_t, usr_t)
@@ -7375,7 +7468,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -4188,6 +4326,24 @@
+@@ -4188,6 +4345,24 @@
  
  ########################################
  ## <summary>
@@ -7400,7 +7493,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Search the /var/lib directory.
  ## </summary>
  ## <param name="domain">
-@@ -4288,6 +4444,24 @@
+@@ -4288,6 +4463,24 @@
  	read_lnk_files_pattern($1, { var_t var_lib_t }, var_lib_t)
  ')
  
@@ -7425,7 +7518,7 @@ diff -b -B --ignore-all-space --exclude-
  # cjp: the next two interfaces really need to be fixed
  # in some way.  They really neeed their own types.
  
-@@ -4686,6 +4860,24 @@
+@@ -4686,6 +4879,24 @@
  
  ########################################
  ## <summary>
@@ -7450,7 +7543,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to ioctl daemon runtime data files.
  ## </summary>
  ## <param name="domain">
-@@ -4955,7 +5147,7 @@
+@@ -4955,7 +5166,7 @@
  	selinux_compute_member($1)
  
  	# Need sys_admin capability for mounting
@@ -7459,7 +7552,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Need to give access to the directories to be polyinstantiated
  	allow $1 polydir:dir { create open getattr search write add_name setattr mounton rmdir };
-@@ -4977,12 +5169,15 @@
+@@ -4977,12 +5188,15 @@
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
  
@@ -7476,7 +7569,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -5003,3 +5198,173 @@
+@@ -5003,3 +5217,173 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -9762,8 +9855,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-11-25 10:48:26.000000000 -0500
-@@ -0,0 +1,448 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-01 14:52:35.000000000 -0500
+@@ -0,0 +1,436 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -9911,6 +10004,10 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	optional_policy(`
++		iptables_run(unconfined_usertype, unconfined_r)
++	')
++
++	optional_policy(`
 +		networkmanager_dbus_chat(unconfined_usertype)
 +	')
 +
@@ -9929,7 +10026,6 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
 +		sandbox_transition(unconfined_usertype, unconfined_r)
 +	')
-+
 +')
 +
 +ifdef(`distro_gentoo',`
@@ -9979,10 +10075,6 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	optional_policy(`
-+		hal_dbus_chat(unconfined_t)
-+	')
-+
-+	optional_policy(`
 +		gnomeclock_dbus_chat(unconfined_t)
 +	')
 +
@@ -9991,10 +10083,6 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	optional_policy(`
-+		networkmanager_dbus_chat(unconfined_t)
-+	')
-+
-+	optional_policy(`
 +		oddjob_dbus_chat(unconfined_t)
 +	')
 +
@@ -10016,10 +10104,6 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	iptables_run(unconfined_t, unconfined_r)
-+')
-+
-+optional_policy(`
 +	java_role_template(unconfined, unconfined_r, unconfined_t)
 +	role system_r types unconfined_java_t;
 +
@@ -10029,9 +10113,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	unconfined_domain_noaudit(unconfined_java_t)
 +	unconfined_dbus_chat(unconfined_java_t)
-+	optional_policy(`
-+		hal_dbus_chat(unconfined_java_t)
-+	')
 +
 +	optional_policy(`
 +		rpm_domtrans(unconfined_java_t)
@@ -10629,8 +10710,8 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-11-30 17:31:37.000000000 -0500
-@@ -33,12 +33,23 @@
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-02 09:44:01.000000000 -0500
+@@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
  
@@ -10652,10 +10733,11 @@ diff -b -B --ignore-all-space --exclude-
  
 -allow abrt_t self:capability { setuid setgid sys_nice dac_override };
 +allow abrt_t self:capability { chown kill setuid setgid sys_nice dac_override };
++dontaudit abrt_t self:capability sys_rawio;
  allow abrt_t self:process { signal signull setsched getsched };
  
  allow abrt_t self:fifo_file rw_fifo_file_perms;
-@@ -58,15 +69,18 @@
+@@ -58,15 +70,18 @@
  manage_dirs_pattern(abrt_t, abrt_tmp_t, abrt_tmp_t)
  manage_files_pattern(abrt_t, abrt_tmp_t, abrt_tmp_t)
  files_tmp_filetrans(abrt_t, abrt_tmp_t, { file dir })
@@ -10676,7 +10758,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(abrt_t, abrt_var_run_t, { file dir })
  
  kernel_read_ring_buffer(abrt_t)
-@@ -75,18 +89,30 @@
+@@ -75,18 +90,31 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -10696,10 +10778,11 @@ diff -b -B --ignore-all-space --exclude-
  files_getattr_all_files(abrt_t)
  files_read_etc_files(abrt_t)
  files_read_usr_files(abrt_t)
- 
++files_read_generic_tmp_files(abrt_t)
++
 +files_dontaudit_list_default(abrt_t)
 +files_dontaudit_read_default_files(abrt_t)
-+
+ 
  fs_list_inotifyfs(abrt_t)
  fs_getattr_all_fs(abrt_t)
  fs_getattr_all_dirs(abrt_t)
@@ -10707,7 +10790,7 @@ diff -b -B --ignore-all-space --exclude-
  
  sysnet_read_config(abrt_t)
  
-@@ -96,22 +122,75 @@
+@@ -96,22 +124,79 @@
  miscfiles_read_certs(abrt_t)
  miscfiles_read_localization(abrt_t)
  
@@ -10787,6 +10870,10 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
 +		rpm_dontaudit_leaks(abrt_helper_t)
 +	')
++	dev_dontaudit_read_all_blk_files(abrt_helper_t)
++	dev_dontaudit_read_all_chr_files(abrt_helper_t)
++	dev_dontaudit_write_all_chr_files(abrt_helper_t)
++	dev_dontaudit_write_all_blk_files(abrt_helper_t)
 +')
 +
 +permissive abrt_helper_t;
@@ -13640,7 +13727,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.32/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-11-30 08:14:58.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-12-02 14:02:29.000000000 -0500
 @@ -21,7 +21,7 @@
  # consolekit local policy
  #
@@ -13650,7 +13737,7 @@ diff -b -B --ignore-all-space --exclude-
  allow consolekit_t self:process { getsched signal };
  allow consolekit_t self:fifo_file rw_fifo_file_perms;
  allow consolekit_t self:unix_stream_socket create_stream_socket_perms;
-@@ -59,15 +59,19 @@
+@@ -59,16 +59,21 @@
  term_use_all_terms(consolekit_t)
  
  auth_use_nsswitch(consolekit_t)
@@ -13668,9 +13755,11 @@ diff -b -B --ignore-all-space --exclude-
 +# consolekit needs to be able to ptrace all logged in users 
 +userdom_ptrace_all_users(consolekit_t)
  userdom_dontaudit_read_user_home_content_files(consolekit_t)
++userdom_dontaudit_getattr_admin_home_files(consolekit_t)
  userdom_read_user_tmp_files(consolekit_t)
  
-@@ -84,9 +88,12 @@
+ hal_ptrace(consolekit_t)
+@@ -84,9 +89,12 @@
  ')
  
  optional_policy(`
@@ -13684,7 +13773,7 @@ diff -b -B --ignore-all-space --exclude-
  		hal_dbus_chat(consolekit_t)
  	')
  
-@@ -100,6 +107,7 @@
+@@ -100,6 +108,7 @@
  ')
  
  optional_policy(`
@@ -13692,7 +13781,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(consolekit_t)
  	policykit_read_lib(consolekit_t)
  	policykit_read_reload(consolekit_t)
-@@ -108,10 +116,21 @@
+@@ -108,10 +117,21 @@
  optional_policy(`
  	xserver_read_xdm_pid(consolekit_t)
  	xserver_read_user_xauth(consolekit_t)
@@ -14466,7 +14555,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/local/linuxprinter/ppd(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.32/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-12-01 09:24:30.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-12-02 09:33:28.000000000 -0500
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -14556,7 +14645,16 @@ diff -b -B --ignore-all-space --exclude-
  allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
  allow cupsd_config_t self:unix_stream_socket create_socket_perms;
  allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
-@@ -407,6 +424,7 @@
+@@ -378,6 +395,8 @@
+ dev_read_rand(cupsd_config_t)
+ dev_rw_generic_usb_dev(cupsd_config_t)
+ 
++files_search_all_mountpoints(cupsd_config_t)
++
+ fs_getattr_all_fs(cupsd_config_t)
+ fs_search_auto_mountpoints(cupsd_config_t)
+ 
+@@ -407,6 +426,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
  userdom_dontaudit_search_user_home_dirs(cupsd_config_t)
@@ -14564,7 +14662,7 @@ diff -b -B --ignore-all-space --exclude-
  
  cups_stream_connect(cupsd_config_t)
  
-@@ -419,12 +437,15 @@
+@@ -419,12 +439,15 @@
  ')
  
  optional_policy(`
@@ -14582,7 +14680,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		hal_dbus_chat(cupsd_config_t)
-@@ -446,6 +467,10 @@
+@@ -446,6 +469,10 @@
  ')
  
  optional_policy(`
@@ -14593,7 +14691,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_read_db(cupsd_config_t)
  ')
  
-@@ -457,6 +482,10 @@
+@@ -457,6 +484,10 @@
  	udev_read_db(cupsd_config_t)
  ')
  
@@ -14604,7 +14702,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Cups lpd support
-@@ -542,6 +571,8 @@
+@@ -542,6 +573,8 @@
  manage_dirs_pattern(cups_pdf_t, cups_pdf_tmp_t, cups_pdf_tmp_t)
  files_tmp_filetrans(cups_pdf_t, cups_pdf_tmp_t, { file dir })
  
@@ -14613,7 +14711,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -556,11 +587,15 @@
+@@ -556,11 +589,15 @@
  miscfiles_read_fonts(cups_pdf_t)
  
  userdom_home_filetrans_user_home_dir(cups_pdf_t)
@@ -14629,7 +14727,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(cups_pdf_t)
-@@ -601,6 +636,9 @@
+@@ -601,6 +638,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -14639,7 +14737,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t)
  files_tmp_filetrans(hplip_t, hplip_tmp_t, fifo_file )
  
-@@ -627,6 +665,7 @@
+@@ -627,6 +667,7 @@
  corenet_tcp_connect_ipp_port(hplip_t)
  corenet_sendrecv_hplip_client_packets(hplip_t)
  corenet_receive_hplip_server_packets(hplip_t)
@@ -15176,7 +15274,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.6.32/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-11-13 11:27:34.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-02 14:59:42.000000000 -0500
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -15194,7 +15292,18 @@ diff -b -B --ignore-all-space --exclude-
  fs_search_auto_mountpoints(dovecot_t)
  fs_list_inotifyfs(dovecot_t)
  
-@@ -159,7 +160,7 @@
+@@ -142,6 +143,10 @@
+ ')
+ 
+ optional_policy(`
++	postgresql_stream_connect(dovecot_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(dovecot_t)
+ ')
+ 
+@@ -159,7 +164,7 @@
  #
  
  allow dovecot_auth_t self:capability { chown dac_override setgid setuid };
@@ -15203,7 +15312,7 @@ diff -b -B --ignore-all-space --exclude-
  allow dovecot_auth_t self:fifo_file rw_fifo_file_perms;
  allow dovecot_auth_t self:unix_dgram_socket create_socket_perms;
  allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms;
-@@ -220,15 +221,23 @@
+@@ -220,15 +225,23 @@
  ')
  
  optional_policy(`
@@ -15227,7 +15336,7 @@ diff -b -B --ignore-all-space --exclude-
  allow dovecot_deliver_t dovecot_etc_t:file read_file_perms;
  allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms;
  
-@@ -260,3 +269,14 @@
+@@ -260,3 +273,14 @@
  optional_policy(`
  	mta_manage_spool(dovecot_deliver_t)
  ')
@@ -17960,8 +18069,8 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.fc serefpolicy-3.6.32/policy/modules/services/nut.fc
 --- nsaserefpolicy/policy/modules/services/nut.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/nut.fc	2009-10-07 16:06:40.000000000 -0400
-@@ -0,0 +1,15 @@
++++ serefpolicy-3.6.32/policy/modules/services/nut.fc	2009-12-02 07:58:43.000000000 -0500
+@@ -0,0 +1,8 @@
 +
 +/usr/sbin/upsd			--	gen_context(system_u:object_r:upsd_exec_t,s0)		
 +
@@ -17969,17 +18078,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/sbin/upsdrvctl			--	 gen_context(system_u:object_r:upsdrvctl_exec_t,s0)
 +
-+/var/run/nut/upsdrvctl\.pid  	--      gen_context(system_u:object_r:upsdrvctl_var_run_t,s0)
-+
-+/var/run/nut/upsd\.pid		--	gen_context(system_u:object_r:upsd_var_run_t,s0)
-+
-+/var/run/nut/upsmon\.pid  	--      gen_context(system_u:object_r:upsmon_var_run_t,s0)
-+
-+/var/run/nut/usbhid-ups-myups\.pid   --      gen_context(system_u:object_r:upsdrvctl_var_run_t,s0)
-+/var/run/nut/usbhid-ups-myups	-s	gen_context(system_u:object_r:upsdrvctl_var_run_t,s0)
++/var/run/nut(/.*)? 			 gen_context(system_u:object_r:nut_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.if serefpolicy-3.6.32/policy/modules/services/nut.if
 --- nsaserefpolicy/policy/modules/services/nut.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/nut.if	2009-10-07 16:06:40.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/nut.if	2009-12-02 07:58:44.000000000 -0500
 @@ -0,0 +1,82 @@
 +## <summary>SELinux policy for nut - Network UPS Tools </summary>
 +
@@ -17993,7 +18095,7 @@ diff -b -B --ignore-all-space --exclude-
 +## </summary>
 +## </param>
 +#
-+interface(`upsd_domtrans',`
++interface(`nut_domtrans_upsd',`
 +        gen_require(`
 +                type upsd_t, upsd_exec_t;
 +        ')
@@ -18013,7 +18115,7 @@ diff -b -B --ignore-all-space --exclude-
 +## </summary>
 +## </param>
 +#
-+interface(`upsmon_domtrans',`
++interface(`nut_domtrans_upsmon',`
 +        gen_require(`
 +                type upsmon_t, upsmon_exec_t;
 +        ')
@@ -18033,7 +18135,7 @@ diff -b -B --ignore-all-space --exclude-
 +## </summary>
 +## </param>
 +#
-+interface(`upsdrvctl_domtrans',`
++interface(`nut_domtrans_upsdrvctl',`
 +        gen_require(`
 +                type upsdrvctl_t, upsdrvctl_exec_t;
 +        ')
@@ -18054,19 +18156,21 @@ diff -b -B --ignore-all-space --exclude-
 +##      </summary>
 +## </param>
 +#
-+interface(`upsdrvctl_stream_connect',`
++interface(`nut_stream_connect',`
 +        gen_require(`
-+                type upsdrvctl_t, upsdrvctl_var_run_t;
++                type upsdrvctl_t, nut_var_run_t;
 +        ')
 +
 +        files_search_pids($1)
-+        stream_connect_pattern($1, upsdrvctl_var_run_t, upsdrvctl_var_run_t, upsdrvctl_t)
++        stream_connect_pattern($1, nut_var_run_t, nut_var_run_t, upsdrvctl_t)
 +')
 +
+Binary files nsaserefpolicy/policy/modules/services/nut.pp and serefpolicy-3.6.32/policy/modules/services/nut.pp differ
+Binary files nsaserefpolicy/policy/modules/services/nut.tar and serefpolicy-3.6.32/policy/modules/services/nut.tar differ
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.te serefpolicy-3.6.32/policy/modules/services/nut.te
 --- nsaserefpolicy/policy/modules/services/nut.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/nut.te	2009-11-24 15:02:36.000000000 -0500
-@@ -0,0 +1,138 @@
++++ serefpolicy-3.6.32/policy/modules/services/nut.te	2009-12-02 07:58:44.000000000 -0500
+@@ -0,0 +1,127 @@
 +
 +policy_module(nut,1.0.0)
 +
@@ -18079,23 +18183,18 @@ diff -b -B --ignore-all-space --exclude-
 +type upsd_exec_t;
 +init_daemon_domain(upsd_t,upsd_exec_t)
 +
-+type upsd_var_run_t;
-+files_pid_file(upsd_var_run_t)
++type nut_var_run_t;
++files_pid_file(nut_var_run_t)
++typealias nut_var_run_t alias { upsd_var_run_t upsmon_var_run_t upsdrvctl_var_run_t };
 +
 +type upsmon_t;
 +type upsmon_exec_t;
 +init_daemon_domain(upsmon_t,upsmon_exec_t)
 +
-+type upsmon_var_run_t;
-+files_pid_file(upsmon_var_run_t)
-+
 +type upsdrvctl_t;
 +type upsdrvctl_exec_t;
 +init_daemon_domain(upsdrvctl_t, upsdrvctl_exec_t)
 +
-+type upsdrvctl_var_run_t;
-+files_pid_file(upsdrvctl_var_run_t)
-+
 +permissive upsd_t;
 +permissive upsdrvctl_t;
 +permissive upsmon_t;
@@ -18104,19 +18203,16 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +# upsd local policy
 +#
-+
 +allow upsd_t self:capability { dac_override setuid setgid };
 +
 +allow upsd_t self:unix_dgram_socket { create_socket_perms sendto };
 +allow upsd_t self:tcp_socket create_stream_socket_perms;
 +
 +# pid file
-+manage_files_pattern(upsd_t, upsd_var_run_t, upsd_var_run_t)
-+manage_dirs_pattern(upsd_t, upsd_var_run_t, upsd_var_run_t)
-+manage_sock_files_pattern(upsd_t, upsd_var_run_t, upsd_var_run_t)
-+files_pid_filetrans(upsd_t, upsd_var_run_t, { file })
-+
-+rw_files_pattern(upsd_t, upsdrvctl_var_run_t, upsdrvctl_var_run_t)
++manage_files_pattern(upsd_t, nut_var_run_t, nut_var_run_t)
++manage_dirs_pattern(upsd_t, nut_var_run_t, nut_var_run_t)
++manage_sock_files_pattern(upsd_t, nut_var_run_t, nut_var_run_t)
++files_pid_filetrans(upsd_t, nut_var_run_t, { file })
 +
 +corenet_tcp_bind_ups_port(upsd_t)
 +corenet_tcp_bind_generic_node(upsd_t)
@@ -18128,13 +18224,13 @@ diff -b -B --ignore-all-space --exclude-
 +
 +auth_use_nsswitch(upsd_t)
 +
++sysnet_read_config(upsd_t)
++
 +logging_send_syslog_msg(upsd_t)
 +
 +miscfiles_read_localization(upsd_t)
 +
-+optional_policy(`
-+	upsdrvctl_stream_connect(upsd_t)
-+')
++nut_stream_connect(upsd_t)
 +
 +######################################
 +#
@@ -18148,11 +18244,9 @@ diff -b -B --ignore-all-space --exclude-
 +allow upsmon_t self:tcp_socket create_stream_socket_perms;
 +
 +# pid file
-+manage_files_pattern(upsmon_t, upsmon_var_run_t, upsmon_var_run_t)
-+manage_dirs_pattern(upsmon_t, upsmon_var_run_t, upsmon_var_run_t)
-+files_pid_filetrans(upsmon_t, upsmon_var_run_t, { file })
-+
-+rw_sock_files_pattern(upsmon_t,upsd_var_run_t,upsd_var_run_t)
++manage_files_pattern(upsmon_t, nut_var_run_t, nut_var_run_t)
++manage_dirs_pattern(upsmon_t, nut_var_run_t, nut_var_run_t)
++files_pid_filetrans(upsmon_t, nut_var_run_t, { file })
 +
 +corenet_tcp_connect_ups_port(upsmon_t)
 +
@@ -18184,10 +18278,10 @@ diff -b -B --ignore-all-space --exclude-
 +allow upsdrvctl_t self:unix_dgram_socket { create_socket_perms sendto };
 +
 +# pid file
-+manage_files_pattern(upsdrvctl_t, upsdrvctl_var_run_t, upsdrvctl_var_run_t)
-+manage_dirs_pattern(upsdrvctl_t, upsdrvctl_var_run_t, upsdrvctl_var_run_t)
-+manage_sock_files_pattern(upsdrvctl_t, upsdrvctl_var_run_t, upsdrvctl_var_run_t)
-+files_pid_filetrans(upsdrvctl_t, upsdrvctl_var_run_t, { file sock_file })
++manage_files_pattern(upsdrvctl_t, nut_var_run_t, nut_var_run_t)
++manage_dirs_pattern(upsdrvctl_t, nut_var_run_t, nut_var_run_t)
++manage_sock_files_pattern(upsdrvctl_t, nut_var_run_t, nut_var_run_t)
++files_pid_filetrans(upsdrvctl_t, nut_var_run_t, { file sock_file })
 +
 +corecmd_exec_bin(upsdrvctl_t)
 +
@@ -18204,7 +18298,6 @@ diff -b -B --ignore-all-space --exclude-
 +logging_send_syslog_msg(upsdrvctl_t)
 +
 +miscfiles_read_localization(upsdrvctl_t)
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.6.32/policy/modules/services/nx.fc
 --- nsaserefpolicy/policy/modules/services/nx.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/nx.fc	2009-12-01 10:43:41.000000000 -0500
@@ -18344,6 +18437,18 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.6.32/policy/modules/services/oddjob.te
+--- nsaserefpolicy/policy/modules/services/oddjob.te	2009-09-16 10:01:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/oddjob.te	2009-12-02 14:53:05.000000000 -0500
+@@ -101,7 +101,5 @@
+ # Add/remove user home directories
+ userdom_home_filetrans_user_home_dir(oddjob_mkhomedir_t)
+ userdom_manage_user_home_content_dirs(oddjob_mkhomedir_t)
+-userdom_manage_user_home_content_files(oddjob_mkhomedir_t)
+-userdom_manage_user_home_dirs(oddjob_mkhomedir_t)
+-userdom_user_home_dir_filetrans_user_home_content(oddjob_mkhomedir_t, notdevfile_class_set)
++userdom_manage_user_home_content(oddjob_mkhomedir_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.6.32/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/openvpn.te	2009-09-30 16:12:48.000000000 -0400
@@ -24164,7 +24269,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.32/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/sssd.te	2009-11-23 17:38:36.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/sssd.te	2009-12-02 09:09:33.000000000 -0500
 @@ -16,6 +16,9 @@
  type sssd_var_lib_t;
  files_type(sssd_var_lib_t)
@@ -24184,7 +24289,7 @@ diff -b -B --ignore-all-space --exclude-
  allow sssd_t self:process { setsched signal getsched };
  allow sssd_t self:fifo_file rw_file_perms;
  allow sssd_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -33,16 +36,23 @@
+@@ -33,16 +36,24 @@
  manage_sock_files_pattern(sssd_t, sssd_var_lib_t, sssd_var_lib_t)
  files_var_lib_filetrans(sssd_t, sssd_var_lib_t, { file dir } )
  
@@ -24204,11 +24309,12 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_urand(sssd_t)
  
 +domain_read_all_domains_state(sssd_t)
++domain_obj_id_change_exemption(sssd_t)
 +
  files_list_tmp(sssd_t)
  files_read_etc_files(sssd_t)
  files_read_usr_files(sssd_t)
-@@ -58,6 +68,8 @@
+@@ -58,6 +69,8 @@
  
  miscfiles_read_localization(sssd_t)
  
@@ -31256,8 +31362,8 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.32/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-01 09:38:51.000000000 -0500
-@@ -43,6 +43,39 @@
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-01 18:03:08.000000000 -0500
+@@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
  	role $2 types dhcpc_t;
@@ -31267,9 +31373,6 @@ diff -b -B --ignore-all-space --exclude-
 +	modutils_run_insmod(dhcpc_t, $2)
 +
 +	optional_policy(`
-+		consoletype_run(dhcpc_t, $2)
-+	')
-+	optional_policy(`
 +		hostname_run(dhcpc_t, $2)
 +	')
 +
@@ -31297,7 +31400,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -192,7 +225,25 @@
+@@ -192,7 +222,25 @@
  		type dhcpc_state_t;
  	')
  
@@ -31324,7 +31427,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -230,7 +281,8 @@
+@@ -230,7 +278,8 @@
  	')
  
  	files_search_etc($1)
@@ -31334,7 +31437,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -323,7 +375,8 @@
+@@ -323,7 +372,8 @@
  		type net_conf_t;
  	')
  
@@ -31344,7 +31447,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -464,6 +517,7 @@
+@@ -464,6 +514,7 @@
  	')
  
  	files_search_etc($1)
@@ -31352,7 +31455,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, dhcp_etc_t, dhcp_etc_t)
  ')
  
-@@ -541,6 +595,7 @@
+@@ -541,6 +592,7 @@
  		type net_conf_t;
  	')
  
@@ -31360,7 +31463,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 self:tcp_socket create_socket_perms;
  	allow $1 self:udp_socket create_socket_perms;
  
-@@ -557,6 +612,14 @@
+@@ -557,6 +609,14 @@
  
  	files_search_etc($1)
  	allow $1 net_conf_t:file read_file_perms;
@@ -31375,7 +31478,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -586,6 +649,8 @@
+@@ -586,6 +646,8 @@
  
  	files_search_etc($1)
  	allow $1 net_conf_t:file read_file_perms;
@@ -31384,7 +31487,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -620,3 +685,49 @@
+@@ -620,3 +682,49 @@
  	files_search_etc($1)
  	allow $1 net_conf_t:file read_file_perms;
  ')
@@ -31436,7 +31539,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.32/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-10-13 11:04:29.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-12-01 17:57:37.000000000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -31512,6 +31615,15 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(dhcpc_t)
  fs_search_auto_mountpoints(dhcpc_t)
+@@ -146,7 +157,7 @@
+ ')
+ 
+ optional_policy(`
+-	consoletype_domtrans(dhcpc_t)
++	consoletype_exec(dhcpc_t)
+ ')
+ 
+ optional_policy(`
 @@ -183,25 +194,23 @@
  ')
  
@@ -32599,7 +32711,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-01 07:56:40.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-02 14:02:00.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -34209,7 +34321,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +3039,32 @@
+@@ -2765,11 +3039,33 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -34220,6 +34332,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	files_list_home($1)
 +	allow $1 { user_home_dir_t user_home_type }:dir search_dir_perms;
++	allow $1 { user_home_dir_t user_home_type }:lnk_file read_lnk_file_perms;
 +')
 +
 +########################################
@@ -34244,7 +34357,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3192,43 @@
+@@ -2897,7 +3193,43 @@
  		type user_tmp_t;
  	')
  
@@ -34289,7 +34402,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3265,7 @@
+@@ -2934,6 +3266,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -34297,7 +34410,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3396,638 @@
+@@ -3064,3 +3397,656 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -34474,6 +34587,24 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	dontaudit Search getatrr /root files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_getattr_admin_home_files',`
++	gen_require(`
++		type admin_home_t;
++	')
++
++	dontaudit $1 admin_home_t:file getattr;
++')
++
++########################################
++## <summary>
 +##	dontaudit list /root
 +## </summary>
 +## <param name="domain">


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.973
retrieving revision 1.974
diff -u -p -r1.973 -r1.974
--- selinux-policy.spec	1 Dec 2009 16:14:39 -0000	1.973
+++ selinux-policy.spec	2 Dec 2009 20:15:22 -0000	1.974
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 52%{?dist}
+Release: 53%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -303,6 +303,7 @@ Obsoletes: selinux-policy-targeted-sourc
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
+Requires: selinux-policy = %{version}-%{release}
 Conflicts:  audispd-plugins <= 1.7.7-1
 Obsoletes: mod_fcgid-selinux
 Conflicts:  seedit
@@ -357,6 +358,7 @@ Group: System Environment/Base
 Requires(post): policycoreutils-python >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
+Requires: selinux-policy = %{version}-%{release}
 Conflicts:  seedit
 
 %description minimum
@@ -388,6 +390,7 @@ Provides: selinux-policy-base
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
+Requires: selinux-policy = %{version}-%{release}
 Conflicts:  seedit
 
 %description olpc 
@@ -420,6 +423,7 @@ Requires: policycoreutils-newrole >= %{P
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
+Requires: selinux-policy = %{version}-%{release}
 Conflicts:  seedit
 
 %description mls 
@@ -445,6 +449,14 @@ exit 0
 %endif
 
 %changelog
+* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-53
+- Remove transition from dhcpc_t to consoletype_t, just allow exec
+- Fixes for prelink cron job
+- Fix label on yumex backend
+- Allow unconfined_java_t to communicate with iptables
+- Allow abrt to read /tmp files
+- Fix nut/ups policy
+
 * Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-52
 - Major fixup of ntop policy
 - Fix label on /usr/lib/xorg/modules/extensions/libglx.so.195.22



From ajax at fedoraproject.org  Wed Dec  2 20:17:08 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  2 Dec 2009 20:17:08 +0000 (UTC)
Subject: rpms/mesa/F-12 mesa.spec,1.259,1.260
Message-ID: <20091202201708.B73D111C0095@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15223

Modified Files:
	mesa.spec 
Log Message:
* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 7.6-0.18
- Fix s390 packaging even harder



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-12/mesa.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- mesa.spec	23 Nov 2009 16:17:59 -0000	1.259
+++ mesa.spec	2 Dec 2009 20:17:08 -0000	1.260
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.17%{?dist}
+Release: 0.18%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -333,7 +333,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/dri
 %{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
+%if %{with_hardware}
 %exclude %{_libdir}/dri/r600_dri.so
+%endif
 
 %if %{with_hardware}
 %files dri-drivers-experimental
@@ -395,6 +397,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 7.6-0.18
+- Fix s390 packaging even harder
+
 * Mon Nov 23 2009 Adam Jackson <ajax at redhat.com> 7.6-0.17
 - Fix s390 packaging
 



From dwalsh at fedoraproject.org  Wed Dec  2 20:24:05 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  2 Dec 2009 20:24:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.144,1.145
Message-ID: <20091202202405.9588211C0095@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17122

Modified Files:
	policy-F12.patch 
Log Message:
* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-53
- Remove transition from dhcpc_t to consoletype_t, just allow exec
- Fixes for prelink cron job
- Fix label on yumex backend
- Allow unconfined_java_t to communicate with iptables
- Allow abrt to read /tmp files
- Fix nut/ups policy


policy-F12.patch:
 Makefile                                                     |    2 
 policy/flask/access_vectors                                  |    1 
 policy/global_tunables                                       |   24 
 policy/mcs                                                   |   10 
 policy/modules/admin/alsa.te                                 |    2 
 policy/modules/admin/anaconda.te                             |    3 
 policy/modules/admin/brctl.te                                |    2 
 policy/modules/admin/certwatch.te                            |    2 
 policy/modules/admin/consoletype.te                          |    1 
 policy/modules/admin/dmesg.fc                                |    2 
 policy/modules/admin/dmesg.te                                |   10 
 policy/modules/admin/firstboot.te                            |    6 
 policy/modules/admin/kismet.fc                               |    2 
 policy/modules/admin/kismet.te                               |   13 
 policy/modules/admin/logrotate.te                            |   21 
 policy/modules/admin/logwatch.te                             |    8 
 policy/modules/admin/mrtg.te                                 |    1 
 policy/modules/admin/netutils.te                             |    2 
 policy/modules/admin/ntop.fc                                 |    5 
 policy/modules/admin/ntop.if                                 |  158 +
 policy/modules/admin/ntop.te                                 |   40 
 policy/modules/admin/portage.te                              |    2 
 policy/modules/admin/prelink.fc                              |    1 
 policy/modules/admin/prelink.if                              |    4 
 policy/modules/admin/prelink.te                              |   77 
 policy/modules/admin/readahead.te                            |    1 
 policy/modules/admin/rpm.fc                                  |   21 
 policy/modules/admin/rpm.if                                  |  344 ++
 policy/modules/admin/rpm.te                                  |   98 
 policy/modules/admin/shorewall.fc                            |    6 
 policy/modules/admin/shorewall.if                            |   40 
 policy/modules/admin/shorewall.te                            |    9 
 policy/modules/admin/smoltclient.fc                          |    4 
 policy/modules/admin/smoltclient.if                          |    1 
 policy/modules/admin/smoltclient.te                          |   66 
 policy/modules/admin/sudo.if                                 |   13 
 policy/modules/admin/tmpreaper.te                            |   10 
 policy/modules/admin/tzdata.te                               |    2 
 policy/modules/admin/usermanage.if                           |   11 
 policy/modules/admin/usermanage.te                           |   35 
 policy/modules/admin/vbetool.te                              |   14 
 policy/modules/admin/vpn.te                                  |    4 
 policy/modules/apps/calamaris.te                             |    7 
 policy/modules/apps/chrome.fc                                |    2 
 policy/modules/apps/chrome.if                                |   86 
 policy/modules/apps/chrome.te                                |   78 
 policy/modules/apps/cpufreqselector.te                       |    2 
 policy/modules/apps/execmem.fc                               |   42 
 policy/modules/apps/execmem.if                               |   80 
 policy/modules/apps/execmem.te                               |   11 
 policy/modules/apps/firewallgui.fc                           |    3 
 policy/modules/apps/firewallgui.if                           |    3 
 policy/modules/apps/firewallgui.te                           |   64 
 policy/modules/apps/gitosis.if                               |   45 
 policy/modules/apps/gnome.fc                                 |   12 
 policy/modules/apps/gnome.if                                 |  170 +
 policy/modules/apps/gnome.te                                 |   99 
 policy/modules/apps/gpg.te                                   |   20 
 policy/modules/apps/java.fc                                  |   24 
 policy/modules/apps/java.if                                  |  114 
 policy/modules/apps/java.te                                  |   19 
 policy/modules/apps/kdumpgui.fc                              |    2 
 policy/modules/apps/kdumpgui.if                              |    2 
 policy/modules/apps/kdumpgui.te                              |   67 
 policy/modules/apps/livecd.fc                                |    2 
 policy/modules/apps/livecd.if                                |   52 
 policy/modules/apps/livecd.te                                |   27 
 policy/modules/apps/loadkeys.te                              |    6 
 policy/modules/apps/mono.fc                                  |    2 
 policy/modules/apps/mono.if                                  |  101 
 policy/modules/apps/mono.te                                  |    9 
 policy/modules/apps/mozilla.fc                               |    1 
 policy/modules/apps/mozilla.if                               |   68 
 policy/modules/apps/mozilla.te                               |   23 
 policy/modules/apps/nsplugin.fc                              |   11 
 policy/modules/apps/nsplugin.if                              |  323 ++
 policy/modules/apps/nsplugin.te                              |  295 +
 policy/modules/apps/openoffice.fc                            |    3 
 policy/modules/apps/openoffice.if                            |   93 
 policy/modules/apps/openoffice.te                            |   11 
 policy/modules/apps/podsleuth.te                             |    3 
 policy/modules/apps/ptchown.if                               |   25 
 policy/modules/apps/pulseaudio.if                            |    2 
 policy/modules/apps/pulseaudio.te                            |   13 
 policy/modules/apps/qemu.fc                                  |    4 
 policy/modules/apps/qemu.if                                  |  189 +
 policy/modules/apps/qemu.te                                  |   85 
 policy/modules/apps/sambagui.fc                              |    1 
 policy/modules/apps/sambagui.if                              |    2 
 policy/modules/apps/sambagui.te                              |   60 
 policy/modules/apps/sandbox.fc                               |    1 
 policy/modules/apps/sandbox.if                               |  188 +
 policy/modules/apps/sandbox.te                               |  331 ++
 policy/modules/apps/screen.if                                |    7 
 policy/modules/apps/sectoolm.fc                              |    6 
 policy/modules/apps/sectoolm.if                              |    3 
 policy/modules/apps/sectoolm.te                              |  120 
 policy/modules/apps/selinux-policy-3.6.32-41.fc12.noarch.rpm |binary
 policy/modules/apps/seunshare.fc                             |    2 
 policy/modules/apps/seunshare.if                             |   81 
 policy/modules/apps/seunshare.te                             |   43 
 policy/modules/apps/vmware.te                                |    1 
 policy/modules/apps/wine.fc                                  |   24 
 policy/modules/apps/wine.if                                  |  115 
 policy/modules/apps/wine.te                                  |   34 
 policy/modules/kernel/corecommands.fc                        |   43 
 policy/modules/kernel/corecommands.if                        |   21 
 policy/modules/kernel/corecommands.pp                        |binary
 policy/modules/kernel/corenetwork.te.in                      |   46 
 policy/modules/kernel/devices.fc                             |   13 
 policy/modules/kernel/devices.if                             |  309 ++
 policy/modules/kernel/devices.te                             |   25 
 policy/modules/kernel/domain.if                              |  170 -
 policy/modules/kernel/domain.te                              |   89 
 policy/modules/kernel/files.fc                               |    5 
 policy/modules/kernel/files.if                               |  398 ++
 policy/modules/kernel/files.te                               |    6 
 policy/modules/kernel/filesystem.fc                          |    2 
 policy/modules/kernel/filesystem.if                          |  256 +
 policy/modules/kernel/filesystem.te                          |   16 
 policy/modules/kernel/kernel.if                              |   98 
 policy/modules/kernel/kernel.te                              |   32 
 policy/modules/kernel/selinux.if                             |   25 
 policy/modules/kernel/storage.fc                             |    2 
 policy/modules/kernel/storage.if                             |    3 
 policy/modules/kernel/terminal.fc                            |    1 
 policy/modules/kernel/terminal.if                            |   44 
 policy/modules/kernel/terminal.te                            |    1 
 policy/modules/roles/guest.te                                |    8 
 policy/modules/roles/staff.te                                |  126 
 policy/modules/roles/sysadm.te                               |  126 
 policy/modules/roles/unconfineduser.fc                       |    8 
 policy/modules/roles/unconfineduser.if                       |  667 ++++
 policy/modules/roles/unconfineduser.te                       |  436 ++
 policy/modules/roles/unprivuser.te                           |  127 
 policy/modules/roles/xguest.te                               |   74 
 policy/modules/services/abrt.fc                              |    6 
 policy/modules/services/abrt.if                              |  102 
 policy/modules/services/abrt.te                              |  105 
 policy/modules/services/afs.fc                               |    1 
 policy/modules/services/afs.te                               |    3 
 policy/modules/services/aisexec.fc                           |   12 
 policy/modules/services/aisexec.if                           |  106 
 policy/modules/services/aisexec.te                           |  112 
 policy/modules/services/amavis.te                            |    2 
 policy/modules/services/apache.fc                            |   50 
 policy/modules/services/apache.if                            |  410 +-
 policy/modules/services/apache.te                            |  452 ++
 policy/modules/services/apm.te                               |    6 
 policy/modules/services/arpwatch.te                          |    2 
 policy/modules/services/asterisk.if                          |   21 
 policy/modules/services/asterisk.te                          |   20 
 policy/modules/services/automount.te                         |    2 
 policy/modules/services/avahi.te                             |   10 
 policy/modules/services/bind.if                              |   40 
 policy/modules/services/bitlbee.te                           |    2 
 policy/modules/services/bluetooth.if                         |   21 
 policy/modules/services/bluetooth.te                         |   11 
 policy/modules/services/ccs.fc                               |    8 
 policy/modules/services/ccs.te                               |   33 
 policy/modules/services/certmaster.te                        |    2 
 policy/modules/services/chronyd.fc                           |   11 
 policy/modules/services/chronyd.if                           |  105 
 policy/modules/services/chronyd.te                           |   67 
 policy/modules/services/clamav.te                            |   18 
 policy/modules/services/clogd.fc                             |    4 
 policy/modules/services/clogd.if                             |   98 
 policy/modules/services/clogd.te                             |   62 
 policy/modules/services/cobbler.fc                           |    2 
 policy/modules/services/cobbler.if                           |   44 
 policy/modules/services/cobbler.te                           |    5 
 policy/modules/services/consolekit.fc                        |    3 
 policy/modules/services/consolekit.if                        |   39 
 policy/modules/services/consolekit.te                        |   24 
 policy/modules/services/corosync.fc                          |   13 
 policy/modules/services/corosync.if                          |  108 
 policy/modules/services/corosync.te                          |  109 
 policy/modules/services/courier.if                           |   18 
 policy/modules/services/courier.te                           |    1 
 policy/modules/services/cron.fc                              |    6 
 policy/modules/services/cron.if                              |   74 
 policy/modules/services/cron.te                              |   82 
 policy/modules/services/cups.fc                              |   13 
 policy/modules/services/cups.te                              |   51 
 policy/modules/services/cvs.te                               |    1 
 policy/modules/services/cyrus.te                             |    1 
 policy/modules/services/dbus.if                              |   49 
 policy/modules/services/dbus.te                              |   25 
 policy/modules/services/dcc.te                               |    8 
 policy/modules/services/ddclient.if                          |   25 
 policy/modules/services/devicekit.fc                         |    2 
 policy/modules/services/devicekit.if                         |   22 
 policy/modules/services/devicekit.te                         |   60 
 policy/modules/services/dnsmasq.te                           |   12 
 policy/modules/services/dovecot.te                           |   28 
 policy/modules/services/exim.te                              |    5 
 policy/modules/services/fail2ban.te                          |    2 
 policy/modules/services/fetchmail.te                         |    3 
 policy/modules/services/fprintd.te                           |    4 
 policy/modules/services/ftp.te                               |   60 
 policy/modules/services/git.fc                               |    8 
 policy/modules/services/git.if                               |  286 +
 policy/modules/services/git.te                               |  166 +
 policy/modules/services/gpm.te                               |    3 
 policy/modules/services/gpsd.fc                              |    5 
 policy/modules/services/gpsd.if                              |   27 
 policy/modules/services/gpsd.te                              |   14 
 policy/modules/services/hal.fc                               |    1 
 policy/modules/services/hal.if                               |   18 
 policy/modules/services/hal.te                               |   49 
 policy/modules/services/howl.te                              |    2 
 policy/modules/services/inetd.fc                             |    2 
 policy/modules/services/inetd.te                             |    4 
 policy/modules/services/irqbalance.te                        |    4 
 policy/modules/services/kerberos.if                          |    6 
 policy/modules/services/kerberos.te                          |   16 
 policy/modules/services/kerneloops.te                        |    2 
 policy/modules/services/ktalk.te                             |    1 
 policy/modules/services/lircd.fc                             |    2 
 policy/modules/services/lircd.if                             |    9 
 policy/modules/services/lircd.te                             |   23 
 policy/modules/services/mailman.te                           |    4 
 policy/modules/services/memcached.te                         |    2 
 policy/modules/services/milter.if                            |    2 
 policy/modules/services/modemmanager.te                      |    5 
 policy/modules/services/mta.fc                               |    2 
 policy/modules/services/mta.if                               |   13 
 policy/modules/services/mta.te                               |   36 
 policy/modules/services/munin.fc                             |    3 
 policy/modules/services/munin.te                             |    3 
 policy/modules/services/mysql.te                             |    9 
 policy/modules/services/nagios.fc                            |   20 
 policy/modules/services/nagios.if                            |   89 
 policy/modules/services/nagios.te                            |  106 
 policy/modules/services/networkmanager.fc                    |   15 
 policy/modules/services/networkmanager.if                    |   65 
 policy/modules/services/networkmanager.te                    |  117 
 policy/modules/services/nis.fc                               |    5 
 policy/modules/services/nis.if                               |   87 
 policy/modules/services/nis.te                               |   13 
 policy/modules/services/nscd.if                              |   18 
 policy/modules/services/nscd.te                              |   21 
 policy/modules/services/nslcd.if                             |    8 
 policy/modules/services/ntop.te                              |   14 
 policy/modules/services/ntp.if                               |   46 
 policy/modules/services/ntp.te                               |    8 
 policy/modules/services/nut.fc                               |   16 
 policy/modules/services/nut.if                               |   58 
 policy/modules/services/nut.te                               |  188 +
 policy/modules/services/nx.fc                                |    7 
 policy/modules/services/nx.if                                |   67 
 policy/modules/services/nx.te                                |   13 
 policy/modules/services/oddjob.if                            |    1 
 policy/modules/services/oddjob.te                            |    4 
 policy/modules/services/openvpn.te                           |    2 
 policy/modules/services/pcscd.if                             |   22 
 policy/modules/services/pcscd.te                             |    4 
 policy/modules/services/pegasus.te                           |   28 
 policy/modules/services/plymouth.fc                          |    5 
 policy/modules/services/plymouth.if                          |  286 +
 policy/modules/services/plymouth.te                          |  101 
 policy/modules/services/policykit.fc                         |    5 
 policy/modules/services/policykit.if                         |   48 
 policy/modules/services/policykit.te                         |   64 
 policy/modules/services/portreserve.te                       |    1 
 policy/modules/services/postfix.fc                           |    2 
 policy/modules/services/postfix.if                           |  150 
 policy/modules/services/postfix.te                           |  142 
 policy/modules/services/postgresql.fc                        |   16 
 policy/modules/services/postgresql.if                        |   43 
 policy/modules/services/postgresql.te                        |    9 
 policy/modules/services/ppp.if                               |    6 
 policy/modules/services/ppp.te                               |   16 
 policy/modules/services/prelude.te                           |    3 
 policy/modules/services/privoxy.fc                           |    3 
 policy/modules/services/privoxy.te                           |    3 
 policy/modules/services/procmail.te                          |   12 
 policy/modules/services/pyzor.fc                             |    4 
 policy/modules/services/pyzor.if                             |   47 
 policy/modules/services/pyzor.te                             |   37 
 policy/modules/services/radvd.te                             |    1 
 policy/modules/services/razor.fc                             |    1 
 policy/modules/services/razor.if                             |   42 
 policy/modules/services/razor.te                             |   32 
 policy/modules/services/rgmanager.fc                         |    8 
 policy/modules/services/rgmanager.if                         |   59 
 policy/modules/services/rgmanager.te                         |   83 
 policy/modules/services/rhcs.fc                              |   22 
 policy/modules/services/rhcs.if                              |  348 ++
 policy/modules/services/rhcs.te                              |  394 ++
 policy/modules/services/ricci.te                             |   30 
 policy/modules/services/rpc.if                               |    7 
 policy/modules/services/rpc.te                               |   17 
 policy/modules/services/rpcbind.if                           |   20 
 policy/modules/services/rpcbind.te                           |    1 
 policy/modules/services/rsync.te                             |   23 
 policy/modules/services/rtkit.if                             |   20 
 policy/modules/services/rtkit.te                             |    4 
 policy/modules/services/samba.fc                             |    4 
 policy/modules/services/samba.if                             |  104 
 policy/modules/services/samba.te                             |   89 
 policy/modules/services/sasl.te                              |   15 
 policy/modules/services/sendmail.if                          |  137 
 policy/modules/services/sendmail.te                          |   87 
 policy/modules/services/setroubleshoot.fc                    |    2 
 policy/modules/services/setroubleshoot.if                    |  123 
 policy/modules/services/setroubleshoot.te                    |   82 
 policy/modules/services/smartmon.te                          |   15 
 policy/modules/services/snmp.if                              |   38 
 policy/modules/services/snmp.te                              |    4 
 policy/modules/services/snort.te                             |    1 
 policy/modules/services/spamassassin.fc                      |   15 
 policy/modules/services/spamassassin.if                      |   89 
 policy/modules/services/spamassassin.te                      |  139 
 policy/modules/services/squid.te                             |    9 
 policy/modules/services/ssh.fc                               |    2 
 policy/modules/services/ssh.if                               |  207 +
 policy/modules/services/ssh.te                               |  155 -
 policy/modules/services/sssd.fc                              |    5 
 policy/modules/services/sssd.if                              |   62 
 policy/modules/services/sssd.te                              |   15 
 policy/modules/services/sysstat.te                           |    5 
 policy/modules/services/tftp.fc                              |    2 
 policy/modules/services/tor.te                               |    1 
 policy/modules/services/tuned.fc                             |    6 
 policy/modules/services/tuned.if                             |  140 
 policy/modules/services/tuned.te                             |   58 
 policy/modules/services/uucp.te                              |   10 
 policy/modules/services/virt.fc                              |   14 
 policy/modules/services/virt.if                              |  210 +
 policy/modules/services/virt.te                              |  276 +
 policy/modules/services/w3c.te                               |    7 
 policy/modules/services/xserver.fc                           |   45 
 policy/modules/services/xserver.if                           |  633 +++-
 policy/modules/services/xserver.te                           |  363 +-
 policy/modules/system/application.if                         |   20 
 policy/modules/system/application.te                         |   12 
 policy/modules/system/authlogin.fc                           |    9 
 policy/modules/system/authlogin.if                           |  209 +
 policy/modules/system/authlogin.te                           |   10 
 policy/modules/system/fstools.fc                             |    3 
 policy/modules/system/fstools.te                             |    7 
 policy/modules/system/init.fc                                |    7 
 policy/modules/system/init.if                                |  163 -
 policy/modules/system/init.te                                |  290 +
 policy/modules/system/ipsec.fc                               |    7 
 policy/modules/system/ipsec.if                               |   25 
 policy/modules/system/ipsec.te                               |   66 
 policy/modules/system/iptables.fc                            |   17 
 policy/modules/system/iptables.if                            |   97 
 policy/modules/system/iptables.te                            |   20 
 policy/modules/system/iscsi.if                               |   40 
 policy/modules/system/iscsi.te                               |    6 
 policy/modules/system/kdump.te                               |    5 
 policy/modules/system/libraries.fc                           |  182 -
 policy/modules/system/libraries.if                           |    5 
 policy/modules/system/libraries.te                           |   18 
 policy/modules/system/locallogin.te                          |   30 
 policy/modules/system/logging.fc                             |   12 
 policy/modules/system/logging.if                             |   18 
 policy/modules/system/logging.te                             |   38 
 policy/modules/system/lvm.if                                 |   39 
 policy/modules/system/lvm.te                                 |   31 
 policy/modules/system/miscfiles.fc                           |    1 
 policy/modules/system/miscfiles.if                           |   60 
 policy/modules/system/miscfiles.te                           |    2 
 policy/modules/system/modutils.fc                            |    1 
 policy/modules/system/modutils.if                            |   46 
 policy/modules/system/modutils.te                            |   56 
 policy/modules/system/mount.fc                               |    7 
 policy/modules/system/mount.if                               |    2 
 policy/modules/system/mount.te                               |   83 
 policy/modules/system/raid.fc                                |    2 
 policy/modules/system/raid.te                                |    8 
 policy/modules/system/selinuxutil.fc                         |   17 
 policy/modules/system/selinuxutil.if                         |  309 ++
 policy/modules/system/selinuxutil.te                         |  229 -
 policy/modules/system/setrans.if                             |   20 
 policy/modules/system/sysnetwork.fc                          |    9 
 policy/modules/system/sysnetwork.if                          |  114 
 policy/modules/system/sysnetwork.te                          |   79 
 policy/modules/system/udev.fc                                |    3 
 policy/modules/system/udev.if                                |   39 
 policy/modules/system/udev.te                                |   39 
 policy/modules/system/unconfined.fc                          |   15 
 policy/modules/system/unconfined.if                          |  443 --
 policy/modules/system/unconfined.te                          |  224 -
 policy/modules/system/userdomain.fc                          |    7 
 policy/modules/system/userdomain.if                          | 1684 ++++++++---
 policy/modules/system/userdomain.te                          |   51 
 policy/modules/system/xen.fc                                 |    6 
 policy/modules/system/xen.if                                 |   28 
 policy/modules/system/xen.te                                 |  137 
 policy/support/obj_perm_sets.spt                             |   28 
 policy/users                                                 |   13 
 395 files changed, 19762 insertions(+), 2816 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- policy-F12.patch	2 Dec 2009 20:15:22 -0000	1.144
+++ policy-F12.patch	2 Dec 2009 20:24:04 -0000	1.145
@@ -7181,7 +7181,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.6.32/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.fc	2009-12-02 13:34:38.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/files.fc	2009-12-02 15:20:12.000000000 -0500
 @@ -18,6 +18,7 @@
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /halt			--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -7190,7 +7190,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ifdef(`distro_suse',`
-@@ -48,6 +49,7 @@
+@@ -48,11 +49,13 @@
  /etc/.*				gen_context(system_u:object_r:etc_t,s0)
  /etc/\.fstab\.hal\..+	--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/blkid(/.*)?		gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -7198,7 +7198,13 @@ diff -b -B --ignore-all-space --exclude-
  /etc/fstab\.REVOKE	--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/HOSTNAME		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/ioctl\.save	--	gen_context(system_u:object_r:etc_runtime_t,s0)
-@@ -229,6 +231,8 @@
+ /etc/issue		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/issue\.net		--	gen_context(system_u:object_r:etc_runtime_t,s0)
++/etc/killpower		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/localtime		-l	gen_context(system_u:object_r:etc_t,s0)
+ /etc/mtab		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/mtab\.fuselock	--	gen_context(system_u:object_r:etc_runtime_t,s0)
+@@ -229,6 +232,8 @@
  
  /var/ftp/etc(/.*)?		gen_context(system_u:object_r:etc_t,s0)
  
@@ -15274,7 +15280,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.6.32/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-02 14:59:42.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-02 15:19:54.000000000 -0500
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -18069,21 +18075,29 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.fc serefpolicy-3.6.32/policy/modules/services/nut.fc
 --- nsaserefpolicy/policy/modules/services/nut.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/nut.fc	2009-12-02 07:58:43.000000000 -0500
-@@ -0,0 +1,8 @@
++++ serefpolicy-3.6.32/policy/modules/services/nut.fc	2009-12-02 15:18:43.000000000 -0500
+@@ -0,0 +1,16 @@
++
++/etc/ups(/.*)?          gen_context(system_u:object_r:nut_conf_t,s0)
++
++/sbin/upsdrvctl     --  gen_context(system_u:object_r:nut_upsdrvctl_exec_t,s0)
 +
-+/usr/sbin/upsd			--	gen_context(system_u:object_r:upsd_exec_t,s0)		
++/usr/sbin/upsd      --  gen_context(system_u:object_r:nut_upsd_exec_t,s0)
++/usr/sbin/upsmon    --  gen_context(system_u:object_r:nut_upsmon_exec_t,s0)
 +
-+/usr/sbin/upsmon          	--      gen_context(system_u:object_r:upsmon_exec_t,s0)
++/var/run/nut(/.*)?                  gen_context(system_u:object_r:nut_var_run_t,s0)
 +
-+/sbin/upsdrvctl			--	 gen_context(system_u:object_r:upsdrvctl_exec_t,s0)
++#/var/www/nut-cgi-bin(/.*)?      --  gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0)
++
++/var/www/nut-cgi-bin/upsimage\.cgi  --  gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0)
++/var/www/nut-cgi-bin/upsset\.cgi    --  gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0)
++/var/www/nut-cgi-bin/upsstats\.cgi  --  gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0)
 +
-+/var/run/nut(/.*)? 			 gen_context(system_u:object_r:nut_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.if serefpolicy-3.6.32/policy/modules/services/nut.if
 --- nsaserefpolicy/policy/modules/services/nut.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/nut.if	2009-12-02 07:58:44.000000000 -0500
-@@ -0,0 +1,82 @@
-+## <summary>SELinux policy for nut - Network UPS Tools </summary>
++++ serefpolicy-3.6.32/policy/modules/services/nut.if	2009-12-02 15:18:43.000000000 -0500
+@@ -0,0 +1,58 @@
++## <summary>SELinux policy for NUT - Network UPS Tools </summary>
 +
 +#####################################
 +## <summary>
@@ -18095,14 +18109,13 @@ diff -b -B --ignore-all-space --exclude-
 +## </summary>
 +## </param>
 +#
-+interface(`nut_domtrans_upsd',`
-+        gen_require(`
-+                type upsd_t, upsd_exec_t;
-+        ')
-+
-+        corecmd_search_bin($1)
-+        domtrans_pattern($1,upsd_exec_t,upsd_t)
++interface(`nut_upsd_domtrans',`
++	gen_require(`
++		type nut_upsd_t, nut_upsd_exec_t;
++	')
 +
++	corecmd_search_bin($1)
++	domtrans_pattern($1, nut_upsd_exec_t, nut_upsd_t)
 +')
 +
 +####################################
@@ -18115,14 +18128,13 @@ diff -b -B --ignore-all-space --exclude-
 +## </summary>
 +## </param>
 +#
-+interface(`nut_domtrans_upsmon',`
-+        gen_require(`
-+                type upsmon_t, upsmon_exec_t;
-+        ')
-+
-+        corecmd_search_bin($1)
-+        domtrans_pattern($1,upsmon_exec_t,upsmon_t)
++interface(`nut_upsmon_domtrans',`
++	gen_require(`
++		type nut_upsmon_t, nut_upsmon_exec_t;
++	')
 +
++	corecmd_search_bin($1)
++	domtrans_pattern($1, nut_upsmon_exec_t, nut_upsmon_t)
 +')
 +
 +####################################
@@ -18135,169 +18147,206 @@ diff -b -B --ignore-all-space --exclude-
 +## </summary>
 +## </param>
 +#
-+interface(`nut_domtrans_upsdrvctl',`
-+        gen_require(`
-+                type upsdrvctl_t, upsdrvctl_exec_t;
-+        ')
-+
-+        corecmd_search_bin($1)
-+        domtrans_pattern($1,upsdrvctl_exec_t,upsdrvctl_t)
-+
-+')
-+
-+####################################
-+## <summary>
-+##      Connect to upsdrvctl over a unix domain
-+##      stream socket.
-+## </summary>
-+## <param name="domain">
-+##      <summary>
-+##      Domain allowed access.
-+##      </summary>
-+## </param>
-+#
-+interface(`nut_stream_connect',`
-+        gen_require(`
-+                type upsdrvctl_t, nut_var_run_t;
-+        ')
++interface(`nut_upsdrvctl_domtrans',`
++	gen_require(`
++		type nut_upsdrvctl_t, nut_upsdrvctl_exec_t;
++	')
 +
-+        files_search_pids($1)
-+        stream_connect_pattern($1, nut_var_run_t, nut_var_run_t, upsdrvctl_t)
++	corecmd_search_bin($1)
++	domtrans_pattern($1, nut_upsdrvctl_exec_t, nut_upsdrvctl_t)
 +')
-+
-Binary files nsaserefpolicy/policy/modules/services/nut.pp and serefpolicy-3.6.32/policy/modules/services/nut.pp differ
-Binary files nsaserefpolicy/policy/modules/services/nut.tar and serefpolicy-3.6.32/policy/modules/services/nut.tar differ
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.te serefpolicy-3.6.32/policy/modules/services/nut.te
 --- nsaserefpolicy/policy/modules/services/nut.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/nut.te	2009-12-02 07:58:44.000000000 -0500
-@@ -0,0 +1,127 @@
++++ serefpolicy-3.6.32/policy/modules/services/nut.te	2009-12-02 15:23:07.000000000 -0500
+@@ -0,0 +1,188 @@
 +
-+policy_module(nut,1.0.0)
++policy_module(nut, 1.0.0)
 +
 +########################################
 +#
 +# Declarations
 +#
 +
-+type upsd_t;
-+type upsd_exec_t;
-+init_daemon_domain(upsd_t,upsd_exec_t)
++type nut_upsd_t;
++typealias nut_upsd_t alias upsd_t;
++type nut_upsd_exec_t;
++init_daemon_domain(nut_upsd_t, nut_upsd_exec_t)
++
++type nut_upsmon_t;
++typealias nut_upsmon_t alias upsmon_t;
++type nut_upsmon_exec_t;
++init_daemon_domain(nut_upsmon_t, nut_upsmon_exec_t)
++
++type nut_upsdrvctl_t;
++typealias nut_upsdrvctl_t alias upsdrvctl_t;
++type nut_upsdrvctl_exec_t;
++init_daemon_domain(nut_upsdrvctl_t, nut_upsdrvctl_exec_t)
++
++# conf files
++type nut_conf_t;
++files_config_file(nut_conf_t)
 +
++# pid files
 +type nut_var_run_t;
 +files_pid_file(nut_var_run_t)
-+typealias nut_var_run_t alias { upsd_var_run_t upsmon_var_run_t upsdrvctl_var_run_t };
 +
-+type upsmon_t;
-+type upsmon_exec_t;
-+init_daemon_domain(upsmon_t,upsmon_exec_t)
-+
-+type upsdrvctl_t;
-+type upsdrvctl_exec_t;
-+init_daemon_domain(upsdrvctl_t, upsdrvctl_exec_t)
-+
-+permissive upsd_t;
-+permissive upsdrvctl_t;
-+permissive upsmon_t;
++permissive nut_upsd_t;
++permissive nut_upsmon_t;
++permissive nut_upsdrvctl_t;
 +
-+#######################################
++########################################
 +#
-+# upsd local policy
++# Local policy for upsd
 +#
-+allow upsd_t self:capability { dac_override setuid setgid };
 +
-+allow upsd_t self:unix_dgram_socket { create_socket_perms sendto };
-+allow upsd_t self:tcp_socket create_stream_socket_perms;
++allow nut_upsd_t self:capability { setgid setuid };
 +
-+# pid file
-+manage_files_pattern(upsd_t, nut_var_run_t, nut_var_run_t)
-+manage_dirs_pattern(upsd_t, nut_var_run_t, nut_var_run_t)
-+manage_sock_files_pattern(upsd_t, nut_var_run_t, nut_var_run_t)
-+files_pid_filetrans(upsd_t, nut_var_run_t, { file })
++allow nut_upsd_t self:unix_dgram_socket { create_socket_perms sendto };
++allow nut_upsd_t self:tcp_socket connected_stream_socket_perms;
 +
-+corenet_tcp_bind_ups_port(upsd_t)
-+corenet_tcp_bind_generic_node(upsd_t)
++allow nut_upsd_t nut_upsdrvctl_t:unix_stream_socket connectto;
 +
-+kernel_read_kernel_sysctls(upsd_t)
++read_files_pattern(nut_upsd_t, nut_conf_t, nut_conf_t)
 +
-+files_read_etc_files(upsd_t)
-+files_read_usr_files(upsd_t)
++# pid file
++manage_files_pattern(nut_upsd_t, nut_var_run_t, nut_var_run_t)
++manage_dirs_pattern(nut_upsd_t, nut_var_run_t, nut_var_run_t)
++manage_sock_files_pattern(nut_upsd_t, nut_var_run_t, nut_var_run_t)
++files_pid_filetrans(nut_upsd_t, nut_var_run_t, { file sock_file })
 +
-+auth_use_nsswitch(upsd_t)
++# note: add ups port !
++corenet_tcp_bind_ups_port(nut_upsd_t)
++corenet_tcp_bind_all_nodes(nut_upsd_t)
 +
-+sysnet_read_config(upsd_t)
++kernel_read_kernel_sysctls(nut_upsd_t)
 +
-+logging_send_syslog_msg(upsd_t)
++# /etc/nsswitch.conf
++auth_use_nsswitch(nut_upsd_t)
 +
-+miscfiles_read_localization(upsd_t)
++files_read_usr_files(nut_upsd_t)
 +
-+nut_stream_connect(upsd_t)
++logging_send_syslog_msg(nut_upsd_t)
 +
-+######################################
++miscfiles_read_localization(nut_upsd_t)
++
++
++########################################
 +#
-+# upsmon local policy
++# Local policy for upsmon
 +#
 +
-+allow upsmon_t self:capability { dac_override setuid setgid };
++allow nut_upsmon_t self:capability { dac_override dac_read_search setgid setuid };
 +
-+allow upsmon_t self:fifo_file rw_fifo_file_perms;
-+allow upsmon_t self:unix_dgram_socket { create_socket_perms sendto };
-+allow upsmon_t self:tcp_socket create_stream_socket_perms;
++allow nut_upsmon_t self:fifo_file rw_fifo_file_perms;
++allow nut_upsmon_t self:unix_dgram_socket { create_socket_perms sendto };
++allow nut_upsmon_t self:tcp_socket create_socket_perms;
++
++read_files_pattern(nut_upsmon_t, nut_conf_t, nut_conf_t)
 +
 +# pid file
-+manage_files_pattern(upsmon_t, nut_var_run_t, nut_var_run_t)
-+manage_dirs_pattern(upsmon_t, nut_var_run_t, nut_var_run_t)
-+files_pid_filetrans(upsmon_t, nut_var_run_t, { file })
++manage_files_pattern(nut_upsmon_t, nut_var_run_t, nut_var_run_t)
++manage_dirs_pattern(nut_upsmon_t, nut_var_run_t, nut_var_run_t)
++files_pid_filetrans(nut_upsmon_t, nut_var_run_t, { file })
 +
-+corenet_tcp_connect_ups_port(upsmon_t)
++corenet_tcp_connect_ups_port(nut_upsmon_t)
++#corenet_tcp_connect_generic_port(nut_upsmon_t)
 +
-+corecmd_exec_bin(upsmon_t)
-+corecmd_exec_shell(upsmon_t)
++corecmd_exec_bin(nut_upsmon_t)
++corecmd_exec_shell(nut_upsmon_t)
 +
-+kernel_read_kernel_sysctls(upsmon_t)
-+kernel_read_system_state(upsmon_t)
++kernel_read_kernel_sysctls(nut_upsmon_t)
++kernel_read_system_state(nut_upsmon_t)
 +
-+files_read_etc_files(upsmon_t)
++# creates /etc/killpower
++#files_manage_etc_files(nut_upsmon_t)
 +
-+auth_use_nsswitch(upsmon_t)
++# Creates /etc/killpower
++files_manage_etc_runtime_files(nut_upsmon_t)
++files_etc_filetrans_etc_runtime(nut_upsmon_t, file)
 +
-+init_read_utmp(upsmon_t)
++auth_use_nsswitch(nut_upsmon_t)
 +
-+logging_send_syslog_msg(upsmon_t)
++files_search_usr(nut_upsmon_t)
 +
-+miscfiles_read_localization(upsmon_t)
++logging_send_syslog_msg(nut_upsmon_t)
 +
-+######################################
++miscfiles_read_localization(nut_upsmon_t)
++
++# /usr/bin/wall
++term_write_all_terms(nut_upsmon_t)
++
++#upsmon runs shutdown, probably need a shutdown domain
++init_rw_utmp(nut_upsmon_t)
++init_telinit(nut_upsmon_t)
++
++########################################
 +#
-+# ups local policy
++# Local policy for upsdrvctl
 +#
 +
-+allow upsdrvctl_t self:capability { dac_override kill setuid setgid };
-+allow upsdrvctl_t self:process { signal signull };
++allow nut_upsdrvctl_t self:capability { dac_override kill setgid setuid };
++allow nut_upsdrvctl_t self:process { sigchld signal signull };
++allow nut_upsdrvctl_t self:fd use;
++
++allow nut_upsdrvctl_t self:fifo_file rw_fifo_file_perms;
++allow nut_upsdrvctl_t self:unix_dgram_socket { create_socket_perms sendto };
++allow nut_upsdrvctl_t self:udp_socket create_socket_perms;
 +
-+allow upsdrvctl_t self:fifo_file rw_fifo_file_perms;
-+allow upsdrvctl_t self:unix_dgram_socket { create_socket_perms sendto };
++read_files_pattern(nut_upsdrvctl_t, nut_conf_t, nut_conf_t)
 +
 +# pid file
-+manage_files_pattern(upsdrvctl_t, nut_var_run_t, nut_var_run_t)
-+manage_dirs_pattern(upsdrvctl_t, nut_var_run_t, nut_var_run_t)
-+manage_sock_files_pattern(upsdrvctl_t, nut_var_run_t, nut_var_run_t)
-+files_pid_filetrans(upsdrvctl_t, nut_var_run_t, { file sock_file })
++manage_files_pattern(nut_upsdrvctl_t, nut_var_run_t, nut_var_run_t)
++manage_dirs_pattern(nut_upsdrvctl_t, nut_var_run_t, nut_var_run_t)
++manage_sock_files_pattern(nut_upsdrvctl_t, nut_var_run_t, nut_var_run_t)
++files_pid_filetrans(nut_upsdrvctl_t, nut_var_run_t, { file sock_file })
 +
-+corecmd_exec_bin(upsdrvctl_t)
++# /sbin/upsdrvctl executes other drivers
++# can_exec(nut_upsdrvctl_t, nut_upsdrvctl_exec_t)
++corecmd_exec_bin(nut_upsdrvctl_t)
++corecmd_exec_sbin(nut_upsdrvctl_t)
 +
-+kernel_read_kernel_sysctls(upsdrvctl_t)
++kernel_read_kernel_sysctls(nut_upsdrvctl_t)
 +
-+dev_rw_generic_usb_dev(upsdrvctl_t)
++# /etc/nsswitch.conf
++auth_use_nsswitch(nut_upsdrvctl_t)
 +
-+term_use_unallocated_ttys(upsdrvctl_t)
++dev_read_urand(nut_upsdrvctl_t)
++dev_rw_generic_usb_dev(nut_upsdrvctl_t)
 +
-+files_read_etc_files(upsdrvctl_t)
++term_use_unallocated_ttys(nut_upsdrvctl_t)
 +
-+sysnet_read_config(upsdrvctl_t)
++logging_send_syslog_msg(nut_upsdrvctl_t)
++
++miscfiles_read_localization(nut_upsdrvctl_t)
++
++init_sigchld(nut_upsdrvctl_t)
++
++#######################################
++#
++# Local policy for NUT cgi scripts
++# requires httpd_enable_cgi and httpd_can_network_connect
++#
++
++optional_policy(`
++    apache_content_template(nutups_cgi)
++
++    read_files_pattern(httpd_nutups_cgi_script_t, nut_conf_t, nut_conf_t)
++
++    corenet_all_recvfrom_unlabeled(httpd_nutups_cgi_script_t)
++    corenet_all_recvfrom_netlabel(httpd_nutups_cgi_script_t)
++    corenet_tcp_sendrecv_generic_if(httpd_nutups_cgi_script_t)
++    corenet_tcp_sendrecv_generic_node(httpd_nutups_cgi_script_t)
++    corenet_tcp_sendrecv_all_ports(httpd_nutups_cgi_script_t)
++    corenet_tcp_connect_ups_port(httpd_nutups_cgi_script_t)
++#   corenet_tcp_connect_generic_port(httpd_nutups_cgi_script_t)
++    corenet_udp_sendrecv_generic_if(httpd_nutups_cgi_script_t)
++    corenet_udp_sendrecv_generic_node(httpd_nutups_cgi_script_t)
++    corenet_udp_sendrecv_all_ports(httpd_nutups_cgi_script_t)
++
++    sysnet_dns_name_resolve(httpd_nutups_cgi_script_t)
++')
 +
-+logging_send_syslog_msg(upsdrvctl_t)
 +
-+miscfiles_read_localization(upsdrvctl_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.6.32/policy/modules/services/nx.fc
 --- nsaserefpolicy/policy/modules/services/nx.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/nx.fc	2009-12-01 10:43:41.000000000 -0500



From rdieter at fedoraproject.org  Wed Dec  2 20:31:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 20:31:23 +0000 (UTC)
Subject: File kipi-plugins-0.9.0.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091202203123.44C9210F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kipi-plugins:

18871b4515720d5ee2581ae52e07858a  kipi-plugins-0.9.0.tar.bz2



From rdieter at fedoraproject.org  Wed Dec  2 20:40:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 20:40:47 +0000 (UTC)
Subject: rpms/kipi-plugins/devel .cvsignore, 1.33, 1.34 kipi-plugins.spec,
	1.106, 1.107 sources, 1.33, 1.34
Message-ID: <20091202204047.27FAF11C03E3@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21643

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-1
- kipi-plugins-0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	2 Nov 2009 15:31:13 -0000	1.33
+++ .cvsignore	2 Dec 2009 20:40:46 -0000	1.34
@@ -1 +1 @@
-kipi-plugins-0.8.0.tar.bz2
+kipi-plugins-0.9.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- kipi-plugins.spec	29 Nov 2009 23:14:32 -0000	1.106
+++ kipi-plugins.spec	2 Dec 2009 20:40:46 -0000	1.107
@@ -2,8 +2,8 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.8.0
-Release: 4%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -18,7 +18,7 @@ BuildRequires: expat-devel
 BuildRequires: gettext
 # Until when/if libksane grows a dep on sane-backends-devel
 BuildRequires: kdegraphics4-devel sane-backends-devel 
-BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: kdelibs4-devel
 # Add min kdelibs Req, FIXME/TODO, come up with cleaner solution -- Rex
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 BuildRequires: kdepimlibs-devel
@@ -166,18 +166,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/kipiplugin_shwup.so
 %{_kde4_libdir}/kde4/kipiplugin_smug.so
 %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
-%{_kde4_appsdir}/kipiplugin_facebook/
 %{_kde4_appsdir}/kipiplugin_flashexport/
-%{_kde4_appsdir}/kipiplugin_flickrexport/
 %{_kde4_appsdir}/kipiplugin_galleryexport/
 %{_kde4_appsdir}/kipiplugin_htmlexport/
 %{_kde4_appsdir}/kipiplugin_imageviewer/
 %{_kde4_appsdir}/kipiplugin_metadataedit/
-%{_kde4_appsdir}/kipiplugin_picasawebexport/
 %{_kde4_appsdir}/kipiplugin_printimages/
 %{_kde4_appsdir}/kipiplugin_removeredeyes/
-%{_kde4_appsdir}/kipiplugin_shwup/
-%{_kde4_appsdir}/kipiplugin_smug/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/applications/kde4/kipiplugins.desktop
 %{_kde4_datadir}/applications/kde4/scangui.desktop
@@ -191,6 +186,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-1
+- kipi-plugins-0.9.0
+
 * Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-4
 - rebuild (opencv)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	2 Nov 2009 15:31:13 -0000	1.33
+++ sources	2 Dec 2009 20:40:46 -0000	1.34
@@ -1 +1 @@
-2049c37dd1bff8f818e379d3c7676389  kipi-plugins-0.8.0.tar.bz2
+18871b4515720d5ee2581ae52e07858a  kipi-plugins-0.9.0.tar.bz2



From linville at fedoraproject.org  Wed Dec  2 20:51:22 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 20:51:22 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-ath9k-fixes.patch, NONE, 1.1 kernel.spec,
	1.1945, 1.1946
Message-ID: <20091202205122.B323C11C0095@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ath9k-fixes.patch 
Log Message:
ath9k: add fixes suggested by upstream maintainer

linux-2.6-ath9k-fixes.patch:
 ath9k.h |    3 +++
 hw.c    |   11 ++++++++++-
 hw.h    |    1 +
 mac.c   |   38 ++++++++++++++++++++++++++++++++++++--
 mac.h   |   14 +++++++++++++-
 main.c  |   18 +++++++++++++++++-
 rc.c    |   12 ++++++++----
 reg.h   |   15 ++++++++++++---
 xmit.c  |   26 +++++++++++++++++++++++++-
 9 files changed, 125 insertions(+), 13 deletions(-)

--- NEW FILE linux-2.6-ath9k-fixes.patch ---
Backports of the following commits pending for 2.6.33...

commit f4709fdf683e1ed37b321c258b614ebe39752bf3
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date:   Tue Nov 24 21:37:57 2009 -0500

    ath9k: Fix maximum tx fifo settings for single stream devices
    
    Atheros single stream AR9285 and AR9271 have half the PCU TX FIFO
    buffer size of that of dual stream devices. Dual stream devices
    have a max PCU TX FIFO size of 8 KB while single stream devices
    have 4 KB. Single stream devices have an issue though and require
    hardware only to use half of the amount of its capable PCU TX FIFO
    size, 2 KB and this requires a change in software.
    
    Technically a change would not have been required (except for frame
    burst considerations of 128 bytes) if these devices would have been
    able to use the full 4 KB of the PCU TX FIFO size but our systems
    engineers recommend 2 KB to be used only. We enforce this through
    software by reducing the max frame triggger level to 2 KB.
    
    Fixing the max frame trigger level should then have a few benefits:
    
      * The PER will now be adjusted as designed for underruns when the
        max trigger level is reached. This should help alleviate the
        bus as the rate control algorithm chooses a slower rate which
        should ensure frames are transmitted properly under high system
        bus load.
    
      * The poll we use on our TX queues should now trigger and work
        as designed for single stream devices. The hardware passes
        data from each TX queue on the PCU TX FIFO queue respecting each
        queue's priority. The new trigger level ensures this seeding of
        the PCU TX FIFO queue occurs as designed which could mean avoiding
        false resets and actually reseting hw correctly when a TX queue
        is indeed stuck.
    
      * Some undocumented / unsupported behaviour could have been triggered
        when the max trigger level level was being set to 4 KB on single
        stream devices. Its not clear what this issue was to me yet.
    
    Cc: Kyungwan Nam <kyungwan.nam at atheros.com>
    Cc: Bennyam Malavazi <bennyam.malavazi at atheros.com>
    Cc: Stephen Chen <stephen.chen at atheros.com>
    Cc: Shan Palanisamy <shan.palanisamy at atheros.com>
    Cc: Paul Shaw <paul.shaw at atheros.com>
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth at atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit e7824a50662f7f79b1a739f705b4d906c31cf221
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date:   Tue Nov 24 02:53:25 2009 -0500

    ath9k: fix processing of TX PS null data frames
    
    When mac80211 was telling us to go into Powersave we listened
    and immediately turned RX off. This meant hardware would not
    see the ACKs from the AP we're associated with and hardware
    we'd end up retransmiting the null data frame in a loop
    helplessly.
    
    Fix this by keeping track of the transmitted nullfunc frames
    and only when we are sure the AP has sent back an ACK do we
    go ahead and shut RX off.
    
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth at atheros.com>
    Signed-off-by: Vivek Natarajan <Vivek.Natarajan at atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 332c556633b8c5fb4e890b1783122f2315526590
Author: Sujith <Sujith.Manoharan at atheros.com>
Date:   Fri Oct 9 09:51:28 2009 +0530

    ath9k: Fix TX hang poll routine
    
    When TX is hung, the chip is reset. Ensure that
    the chip is awake by using the PS wrappers.
    
    Signed-off-by: Sujith <Sujith.Manoharan at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h	2009-12-02 15:24:37.000000000 -0500
@@ -137,6 +137,7 @@ struct ath_buf {
 	dma_addr_t bf_daddr;		/* physical addr of desc */
 	dma_addr_t bf_buf_addr;		/* physical addr of data buffer */
 	bool bf_stale;
+	bool bf_isnullfunc;
 	u16 bf_flags;
 	struct ath_buf_state bf_state;
 	dma_addr_t bf_dmacontext;
@@ -506,6 +507,8 @@ struct ath_led {
 #define SC_OP_WAIT_FOR_PSPOLL_DATA BIT(17)
 #define SC_OP_WAIT_FOR_TX_ACK   BIT(18)
 #define SC_OP_BEACON_SYNC       BIT(19)
+#define SC_OP_NULLFUNC_COMPLETED BIT(22)
+#define SC_OP_PS_ENABLED	BIT(23)
 
 struct ath_bus_ops {
 	void		(*read_cachesize)(struct ath_softc *sc, int *csz);
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c	2009-12-02 15:13:27.000000000 -0500
@@ -657,6 +657,11 @@ static struct ath_hw *ath9k_hw_do_attach
 	DPRINTF(sc, ATH_DBG_RESET, "serialize_regmode is %d\n",
 		ah->config.serialize_regmode);
 
+	if (AR_SREV_9285(ah))
+		ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD >> 1;
+	else
+		ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD;
+
 	if ((ah->hw_version.macVersion != AR_SREV_VERSION_5416_PCI) &&
 	    (ah->hw_version.macVersion != AR_SREV_VERSION_5416_PCIE) &&
 	    (ah->hw_version.macVersion != AR_SREV_VERSION_9160) &&
@@ -3367,7 +3372,11 @@ void ath9k_hw_fill_cap_info(struct ath_h
 		pCap->keycache_size = AR_KEYTABLE_SIZE;
 
 	pCap->hw_caps |= ATH9K_HW_CAP_FASTCC;
-	pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
+
+	if (AR_SREV_9285(ah))
+		pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD >> 1;
+	else
+		pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
 
 	if (AR_SREV_9285_10_OR_LATER(ah))
 		pCap->num_gpio_pins = AR9285_NUM_GPIO;
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h	2009-12-02 15:08:03.000000000 -0500
@@ -205,6 +205,7 @@ struct ath9k_ops_config {
 #define AR_SPUR_FEEQ_BOUND_HT20 10
 	int spurmode;
 	u16 spurchans[AR_EEPROM_MODAL_SPURS][2];
+	u8 max_txtrig_level;
 };
 
 enum ath9k_int {
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c	2009-12-02 15:13:56.000000000 -0500
@@ -70,12 +70,37 @@ u32 ath9k_hw_numtxpending(struct ath_hw 
 	return npend;
 }
 
+/**
+ * ath9k_hw_updatetxtriglevel - adjusts the frame trigger level
+ *
+ * @ah: atheros hardware struct
+ * @bIncTrigLevel: whether or not the frame trigger level should be updated
+ *
+ * The frame trigger level specifies the minimum number of bytes,
+ * in units of 64 bytes, that must be DMA'ed into the PCU TX FIFO
+ * before the PCU will initiate sending the frame on the air. This can
+ * mean we initiate transmit before a full frame is on the PCU TX FIFO.
+ * Resets to 0x1 (meaning 64 bytes or a full frame, whichever occurs
+ * first)
+ *
+ * Caution must be taken to ensure to set the frame trigger level based
+ * on the DMA request size. For example if the DMA request size is set to
+ * 128 bytes the trigger level cannot exceed 6 * 64 = 384. This is because
+ * there need to be enough space in the tx FIFO for the requested transfer
+ * size. Hence the tx FIFO will stop with 512 - 128 = 384 bytes. If we set
+ * the threshold to a value beyond 6, then the transmit will hang.
+ *
+ * Current dual   stream devices have a PCU TX FIFO size of 8 KB.
+ * Current single stream devices have a PCU TX FIFO size of 4 KB, however,
+ * there is a hardware issue which forces us to use 2 KB instead so the
+ * frame trigger level must not exceed 2 KB for these chipsets.
+ */
 bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel)
 {
 	u32 txcfg, curLevel, newLevel;
 	enum ath9k_int omask;
 
-	if (ah->tx_trig_level >= MAX_TX_FIFO_THRESHOLD)
+	if (ah->tx_trig_level >= ah->config.max_txtrig_level)
 		return false;
 
 	omask = ath9k_hw_set_interrupts(ah, ah->mask_reg & ~ATH9K_INT_GLOBAL);
@@ -84,7 +109,7 @@ bool ath9k_hw_updatetxtriglevel(struct a
 	curLevel = MS(txcfg, AR_FTRIG);
 	newLevel = curLevel;
 	if (bIncTrigLevel) {
-		if (curLevel < MAX_TX_FIFO_THRESHOLD)
+		if (curLevel < ah->config.max_txtrig_level)
 			newLevel++;
 	} else if (curLevel > MIN_TX_FIFO_THRESHOLD)
 		newLevel--;
@@ -229,6 +254,8 @@ int ath9k_hw_txprocdesc(struct ath_hw *a
 	ds->ds_txstat.ts_status = 0;
 	ds->ds_txstat.ts_flags = 0;
 
+	if (ads->ds_txstatus1 & AR_FrmXmitOK)
+		ds->ds_txstat.ts_status |= ATH9K_TX_ACKED;
 	if (ads->ds_txstatus1 & AR_ExcessiveRetries)
 		ds->ds_txstat.ts_status |= ATH9K_TXERR_XRETRY;
 	if (ads->ds_txstatus1 & AR_Filtered)
@@ -889,6 +916,13 @@ bool ath9k_hw_setuprxdesc(struct ath_hw 
 	return true;
 }
 
+/*
+ * This can stop or re-enables RX.
+ *
+ * If bool is set this will kill any frame which is currently being
+ * transferred between the MAC and baseband and also prevent any new
+ * frames from getting started.
+ */
 bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set)
 {
 	u32 reg;
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h	2009-12-02 15:13:56.000000000 -0500
@@ -76,6 +76,7 @@
 #define ATH9K_TXERR_FIFO           0x04
 #define ATH9K_TXERR_XTXOP          0x08
 #define ATH9K_TXERR_TIMER_EXPIRED  0x10
+#define ATH9K_TX_ACKED		   0x20
 
 #define ATH9K_TX_BA                0x01
 #define ATH9K_TX_PWRMGMT           0x02
@@ -85,9 +86,15 @@
 #define ATH9K_TX_SW_ABORTED        0x40
 #define ATH9K_TX_SW_FILTERED       0x80
 
+/* 64 bytes */
 #define MIN_TX_FIFO_THRESHOLD   0x1
+
+/*
+ * Single stream device AR9285 and AR9271 require 2 KB
+ * to work around a hardware issue, all other devices
+ * have can use the max 4 KB limit.
+ */
 #define MAX_TX_FIFO_THRESHOLD   ((4096 / 64) - 1)
-#define INIT_TX_FIFO_THRESHOLD  MIN_TX_FIFO_THRESHOLD
 
 struct ath_tx_status {
 	u32 ts_tstamp;
@@ -380,6 +387,11 @@ struct ar5416_desc {
 #define AR_TxBaStatus       0x40000000
 #define AR_TxStatusRsvd01   0x80000000
 
+/*
+ * AR_FrmXmitOK - Frame transmission success flag. If set, the frame was
+ * transmitted successfully. If clear, no ACK or BA was received to indicate
+ * successful transmission when we were expecting an ACK or BA.
+ */
 #define AR_FrmXmitOK            0x00000001
 #define AR_ExcessiveRetries     0x00000002
 #define AR_FIFOUnderrun         0x00000004
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c	2009-12-02 15:23:02.000000000 -0500
@@ -2252,8 +2252,15 @@ static int ath9k_config(struct ieee80211
 
 	mutex_lock(&sc->mutex);
 
+	/*
+	 * We just prepare to enable PS. We have to wait until our AP has
+	 * ACK'd our null data frame to disable RX otherwise we'll ignore
+	 * those ACKs and end up retransmitting the same null data frames.
+	 * IEEE80211_CONF_CHANGE_PS is only passed by mac80211 for STA mode.
+	 */
 	if (changed & IEEE80211_CONF_CHANGE_PS) {
 		if (conf->flags & IEEE80211_CONF_PS) {
+			sc->sc_flags |= SC_OP_PS_ENABLED;
 			if (!(ah->caps.hw_caps &
 			      ATH9K_HW_CAP_AUTOSLEEP)) {
 				if ((sc->imask & ATH9K_INT_TIM_TIMER) == 0) {
@@ -2261,11 +2268,20 @@ static int ath9k_config(struct ieee80211
 					ath9k_hw_set_interrupts(sc->sc_ah,
 							sc->imask);
 				}
+			}
+			/*
+			 * At this point we know hardware has received an ACK
+			 * of a previously sent null data frame.
+			 */
+			if ((sc->sc_flags & SC_OP_NULLFUNC_COMPLETED)) {
+				sc->sc_flags &= ~SC_OP_NULLFUNC_COMPLETED;
+				ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);
 				ath9k_hw_setrxabort(sc->sc_ah, 1);
 			}
-			ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);
 		} else {
 			ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
+			sc->sc_flags &= ~(SC_OP_PS_ENABLED |
+					  SC_OP_NULLFUNC_COMPLETED);
 			if (!(ah->caps.hw_caps &
 			      ATH9K_HW_CAP_AUTOSLEEP)) {
 				ath9k_hw_setrxabort(sc->sc_ah, 0);
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c	2009-12-02 15:11:15.000000000 -0500
@@ -1519,10 +1519,14 @@ static void ath_tx_status(void *priv, st
 		goto exit;
 
 	/*
-	 * If underrun error is seen assume it as an excessive retry only
-	 * if prefetch trigger level have reached the max (0x3f for 5416)
-	 * Adjust the long retry as if the frame was tried ATH_11N_TXMAXTRY
-	 * times. This affects how ratectrl updates PER for the failed rate.
+	 * If an underrun error is seen assume it as an excessive retry only
+	 * if max frame trigger level has been reached (2 KB for singel stream,
+	 * and 4 KB for dual stream). Adjust the long retry as if the frame was
+	 * tried hw->max_rate_tries times to affect how ratectrl updates PER for
+	 * the failed rate. In case of congestion on the bus penalizing these
+	 * type of underruns should help hardware actually transmit new frames
+	 * successfully by eventually preferring slower rates. This itself
+	 * should also alleviate congestion on the bus.
 	 */
 	if (tx_info_priv->tx.ts_flags &
 	    (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN) &&
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h	2009-12-02 15:13:56.000000000 -0500
@@ -1216,13 +1216,22 @@ enum {
 #define AR_MCAST_FIL0       0x8040
 #define AR_MCAST_FIL1       0x8044
 
+/*
+ * AR_DIAG_SW - Register which can be used for diagnostics and testing purposes.
+ *
+ * The force RX abort (AR_DIAG_RX_ABORT, bit 25) can be used in conjunction with
+ * RX block (AR_DIAG_RX_DIS, bit 5) to help fast channel change to shut down
+ * receive. The force RX abort bit will kill any frame which is currently being
+ * transferred between the MAC and baseband. The RX block bit (AR_DIAG_RX_DIS)
+ * will prevent any new frames from getting started.
+ */
 #define AR_DIAG_SW                  0x8048
 #define AR_DIAG_CACHE_ACK           0x00000001
 #define AR_DIAG_ACK_DIS             0x00000002
 #define AR_DIAG_CTS_DIS             0x00000004
 #define AR_DIAG_ENCRYPT_DIS         0x00000008
 #define AR_DIAG_DECRYPT_DIS         0x00000010
-#define AR_DIAG_RX_DIS              0x00000020
+#define AR_DIAG_RX_DIS              0x00000020 /* RX block */
 #define AR_DIAG_LOOP_BACK           0x00000040
 #define AR_DIAG_CORR_FCS            0x00000080
 #define AR_DIAG_CHAN_INFO           0x00000100
@@ -1231,12 +1240,12 @@ enum {
 #define AR_DIAG_FRAME_NV0           0x00020000
 #define AR_DIAG_OBS_PT_SEL1         0x000C0000
 #define AR_DIAG_OBS_PT_SEL1_S       18
-#define AR_DIAG_FORCE_RX_CLEAR      0x00100000
+#define AR_DIAG_FORCE_RX_CLEAR      0x00100000 /* force rx_clear high */
 #define AR_DIAG_IGNORE_VIRT_CS      0x00200000
 #define AR_DIAG_FORCE_CH_IDLE_HIGH  0x00400000
 #define AR_DIAG_EIFS_CTRL_ENA       0x00800000
 #define AR_DIAG_DUAL_CHAIN_INFO     0x01000000
-#define AR_DIAG_RX_ABORT            0x02000000
+#define AR_DIAG_RX_ABORT            0x02000000 /* Force RX abort */
 #define AR_DIAG_SATURATE_CYCLE_CNT  0x04000000
 #define AR_DIAG_OBS_PT_SEL2         0x08000000
 #define AR_DIAG_RX_CLEAR_CTL_LOW    0x10000000
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c	2009-12-02 15:29:20.000000000 -0500
@@ -434,8 +434,11 @@ static void ath_tx_complete_aggr(struct 
 
 	rcu_read_unlock();
 
-	if (needreset)
+	if (needreset) {
+		ath9k_ps_wakeup(sc);
 		ath_reset(sc, false);
+		ath9k_ps_restore(sc);
+	}
 }
 
 static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
@@ -1587,6 +1590,14 @@ static int ath_tx_setup_buffer(struct ie
 	}
 
 	bf->bf_buf_addr = bf->bf_dmacontext;
+
+	/* tag if this is a nullfunc frame to enable PS when AP acks it */
+	if (ieee80211_is_nullfunc(fc) && ieee80211_has_pm(fc)) {
+		bf->bf_isnullfunc = true;
+		sc->sc_flags &= ~SC_OP_NULLFUNC_COMPLETED;
+	} else
+		bf->bf_isnullfunc = false;
+
 	return 0;
 }
 
@@ -1996,6 +2007,19 @@ static void ath_tx_processq(struct ath_s
 			txq->axq_gatingds = NULL;
 
 		/*
+		 * We now know the nullfunc frame has been ACKed so we
+		 * can disable RX.
+		 */
+		if (bf->bf_isnullfunc &&
+		    (ds->ds_txstat.ts_status & ATH9K_TX_ACKED)) {
+			if ((sc->sc_flags & SC_OP_PS_ENABLED)) {
+				ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);
+				ath9k_hw_setrxabort(sc->sc_ah, 1);
+			} else
+				sc->sc_flags |= SC_OP_NULLFUNC_COMPLETED;
+		}
+
+		/*
 		 * Remove ath_buf's of the same transmit unit from txq,
 		 * however leave the last descriptor back as the holding
 		 * descriptor for hw.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1945
retrieving revision 1.1946
diff -u -p -r1.1945 -r1.1946
--- kernel.spec	2 Dec 2009 07:34:17 -0000	1.1945
+++ kernel.spec	2 Dec 2009 20:51:22 -0000	1.1946
@@ -680,6 +680,7 @@ Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-ahci-export-capabilities.patch
 
 Patch680: prism54-remove-pci-dev-table.patch
+Patch681: linux-2.6-ath9k-fixes.patch
 
 Patch800: linux-2.6-crash-driver.patch
 
@@ -1386,6 +1387,9 @@ ApplyPatch linux-2.6-ahci-export-capabil
 # prism54: remove pci modinfo device table
 ApplyPatch prism54-remove-pci-dev-table.patch
 
+# ath9k: add fixes suggested by upstream maintainer
+ApplyPatch linux-2.6-ath9k-fixes.patch
+
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
@@ -2155,6 +2159,9 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 02 2009 John W. Linville <linville at redhat.com> 2.6.31.6-160
+- ath9k: add fixes suggested by upstream maintainer
+
 * Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-159
 - drm-radeon-misc-fixes.patch: r400 LVDS, r600 digital dpms, cursor fix, tv property
 



From pbrobinson at fedoraproject.org  Wed Dec  2 20:54:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  2 Dec 2009 20:54:56 +0000 (UTC)
Subject: rpms/gupnp-vala/F-12 .cvsignore, 1.4, 1.5 gupnp-vala.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <20091202205456.C10ED11C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-vala/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25902

Modified Files:
	.cvsignore gupnp-vala.spec sources 
Log Message:
- New upstream 0.6.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Sep 2009 13:31:05 -0000	1.4
+++ .cvsignore	2 Dec 2009 20:54:56 -0000	1.5
@@ -1 +1 @@
-gupnp-vala-0.6.tar.gz
+gupnp-vala-0.6.2.tar.gz


Index: gupnp-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/F-12/gupnp-vala.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gupnp-vala.spec	17 Sep 2009 18:16:46 -0000	1.9
+++ gupnp-vala.spec	2 Dec 2009 20:54:56 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           gupnp-vala
-Version:        0.6
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        GUPnP is a uPnP framework. This adds vala language bindings
 
@@ -9,15 +9,15 @@ URL:            http://www.gupnp.org/
 Source0:        http://www.gupnp.org/sources/bindings/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: vala-devel >= 0.7.0
-BuildRequires: vala-tools >= 0.7.0
+BuildRequires: vala-devel >= 0.7.8
+BuildRequires: vala-tools >= 0.7.8
 BuildRequires: gssdp-devel >= 0.6.4
-BuildRequires: gupnp-devel >= 0.12.6
+BuildRequires: gupnp-devel >= 0.13.0
 BuildRequires: gupnp-av-devel
 BuildRequires: gupnp-ui-devel
 BuildRequires: libsoup-devel
 Requires: pkgconfig
-Requires: vala >= 0.7.0
+Requires: vala >= 0.7.8
 
 %description
 GUPnP is an object-oriented open source framework for creating UPnP 
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/gupnp-vala-1.0.pc
 
 %changelog
+* Sat Nov 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.6.2-1
+- New upstream 0.6.2 release
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.6-1
 - Update to 0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Sep 2009 13:31:05 -0000	1.4
+++ sources	2 Dec 2009 20:54:56 -0000	1.5
@@ -1 +1 @@
-e6aa6e9722b8dd2e79a6ea07b6d24c4e  gupnp-vala-0.6.tar.gz
+7293cab94a8595efe740ede12991ef84  gupnp-vala-0.6.2.tar.gz



From than at fedoraproject.org  Wed Dec  2 21:04:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  2 Dec 2009 21:04:21 +0000 (UTC)
Subject: rpms/kdenetwork/F-12 kdenetwork.spec,1.210,1.211
Message-ID: <20091202210421.8ADAC11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28667

Modified Files:
	kdenetwork.spec 
Log Message:
drop the webkit patch that is included in 4.3.4



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/kdenetwork.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- kdenetwork.spec	1 Dec 2009 16:05:36 -0000	1.210
+++ kdenetwork.spec	2 Dec 2009 21:04:21 -0000	1.211
@@ -105,7 +105,6 @@ Requires: kdelibs4-devel
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
-%patch100 -p0 -b .webkitkde
 
 # 4.4 upstream patches
 %patch200 -p0 -b .bz#515586-kopete



From linville at fedoraproject.org  Wed Dec  2 21:13:40 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 21:13:40 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-ath9k-fixes.patch, NONE, 1.1 kernel.spec,
	1.1861, 1.1862
Message-ID: <20091202211340.2916111C0095@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ath9k-fixes.patch 
Log Message:
ath9k: add fixes suggested by upstream maintainer

linux-2.6-ath9k-fixes.patch:
 ath9k.h |    3 +++
 hw.c    |   11 ++++++++++-
 hw.h    |    1 +
 mac.c   |   38 ++++++++++++++++++++++++++++++++++++--
 mac.h   |   14 +++++++++++++-
 main.c  |   18 +++++++++++++++++-
 rc.c    |   12 ++++++++----
 reg.h   |   15 ++++++++++++---
 xmit.c  |   23 +++++++++++++++++++++++
 9 files changed, 123 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-ath9k-fixes.patch ---
Backport of the following commits pending 2.6.33...

commit f4709fdf683e1ed37b321c258b614ebe39752bf3
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date:   Tue Nov 24 21:37:57 2009 -0500

    ath9k: Fix maximum tx fifo settings for single stream devices
    
    Atheros single stream AR9285 and AR9271 have half the PCU TX FIFO
    buffer size of that of dual stream devices. Dual stream devices
    have a max PCU TX FIFO size of 8 KB while single stream devices
    have 4 KB. Single stream devices have an issue though and require
    hardware only to use half of the amount of its capable PCU TX FIFO
    size, 2 KB and this requires a change in software.
    
    Technically a change would not have been required (except for frame
    burst considerations of 128 bytes) if these devices would have been
    able to use the full 4 KB of the PCU TX FIFO size but our systems
    engineers recommend 2 KB to be used only. We enforce this through
    software by reducing the max frame triggger level to 2 KB.
    
    Fixing the max frame trigger level should then have a few benefits:
    
      * The PER will now be adjusted as designed for underruns when the
        max trigger level is reached. This should help alleviate the
        bus as the rate control algorithm chooses a slower rate which
        should ensure frames are transmitted properly under high system
        bus load.
    
      * The poll we use on our TX queues should now trigger and work
        as designed for single stream devices. The hardware passes
        data from each TX queue on the PCU TX FIFO queue respecting each
        queue's priority. The new trigger level ensures this seeding of
        the PCU TX FIFO queue occurs as designed which could mean avoiding
        false resets and actually reseting hw correctly when a TX queue
        is indeed stuck.
    
      * Some undocumented / unsupported behaviour could have been triggered
        when the max trigger level level was being set to 4 KB on single
        stream devices. Its not clear what this issue was to me yet.
    
    Cc: Kyungwan Nam <kyungwan.nam at atheros.com>
    Cc: Bennyam Malavazi <bennyam.malavazi at atheros.com>
    Cc: Stephen Chen <stephen.chen at atheros.com>
    Cc: Shan Palanisamy <shan.palanisamy at atheros.com>
    Cc: Paul Shaw <paul.shaw at atheros.com>
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth at atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit e7824a50662f7f79b1a739f705b4d906c31cf221
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date:   Tue Nov 24 02:53:25 2009 -0500

    ath9k: fix processing of TX PS null data frames
    
    When mac80211 was telling us to go into Powersave we listened
    and immediately turned RX off. This meant hardware would not
    see the ACKs from the AP we're associated with and hardware
    we'd end up retransmiting the null data frame in a loop
    helplessly.
    
    Fix this by keeping track of the transmitted nullfunc frames
    and only when we are sure the AP has sent back an ACK do we
    go ahead and shut RX off.
    
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth at atheros.com>
    Signed-off-by: Vivek Natarajan <Vivek.Natarajan at atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 332c556633b8c5fb4e890b1783122f2315526590
Author: Sujith <Sujith.Manoharan at atheros.com>
Date:   Fri Oct 9 09:51:28 2009 +0530

    ath9k: Fix TX hang poll routine
    
    When TX is hung, the chip is reset. Ensure that
    the chip is awake by using the PS wrappers.
    
    Signed-off-by: Sujith <Sujith.Manoharan at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h.orig	2009-12-02 15:55:43.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h	2009-12-02 16:01:20.000000000 -0500
@@ -139,6 +139,7 @@ struct ath_buf {
 	dma_addr_t bf_daddr;		/* physical addr of desc */
 	dma_addr_t bf_buf_addr;		/* physical addr of data buffer */
 	bool bf_stale;
+	bool bf_isnullfunc;
 	u16 bf_flags;
 	struct ath_buf_state bf_state;
 	dma_addr_t bf_dmacontext;
@@ -524,6 +525,8 @@ struct ath_led {
 #define SC_OP_BEACON_SYNC       BIT(19)
 #define SC_OP_BTCOEX_ENABLED    BIT(20)
 #define SC_OP_BT_PRIORITY_DETECTED BIT(21)
+#define SC_OP_NULLFUNC_COMPLETED BIT(22)
+#define SC_OP_PS_ENABLED	BIT(23)
 
 struct ath_bus_ops {
 	void		(*read_cachesize)(struct ath_softc *sc, int *csz);
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/common.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/common.h
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c.orig	2009-12-02 15:55:43.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c	2009-12-02 16:00:05.000000000 -0500
@@ -937,6 +937,11 @@ int ath9k_hw_init(struct ath_hw *ah)
 	DPRINTF(ah->ah_sc, ATH_DBG_RESET, "serialize_regmode is %d\n",
 		ah->config.serialize_regmode);
 
+	if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
+		ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD >> 1;
+	else
+		ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD;
+
 	if (!ath9k_hw_macversion_supported(ah->hw_version.macVersion)) {
 		DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
 			"Mac Chip Rev 0x%02x.%x is not supported by "
@@ -3670,7 +3675,11 @@ void ath9k_hw_fill_cap_info(struct ath_h
 		pCap->keycache_size = AR_KEYTABLE_SIZE;
 
 	pCap->hw_caps |= ATH9K_HW_CAP_FASTCC;
-	pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
+
+	if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
+		pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD >> 1;
+	else
+		pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
 
 	if (AR_SREV_9285_10_OR_LATER(ah))
 		pCap->num_gpio_pins = AR9285_NUM_GPIO;
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h.orig	2009-12-02 15:55:43.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h	2009-12-02 16:00:05.000000000 -0500
@@ -218,6 +218,7 @@ struct ath9k_ops_config {
 #define AR_SPUR_FEEQ_BOUND_HT20 10
 	int spurmode;
 	u16 spurchans[AR_EEPROM_MODAL_SPURS][2];
+	u8 max_txtrig_level;
 };
 
 enum ath9k_int {
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c.orig	2009-12-02 15:55:43.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c	2009-12-02 16:00:16.000000000 -0500
@@ -65,12 +65,37 @@ u32 ath9k_hw_numtxpending(struct ath_hw 
 	return npend;
 }
 
+/**
+ * ath9k_hw_updatetxtriglevel - adjusts the frame trigger level
+ *
+ * @ah: atheros hardware struct
+ * @bIncTrigLevel: whether or not the frame trigger level should be updated
+ *
+ * The frame trigger level specifies the minimum number of bytes,
+ * in units of 64 bytes, that must be DMA'ed into the PCU TX FIFO
+ * before the PCU will initiate sending the frame on the air. This can
+ * mean we initiate transmit before a full frame is on the PCU TX FIFO.
+ * Resets to 0x1 (meaning 64 bytes or a full frame, whichever occurs
+ * first)
+ *
+ * Caution must be taken to ensure to set the frame trigger level based
+ * on the DMA request size. For example if the DMA request size is set to
+ * 128 bytes the trigger level cannot exceed 6 * 64 = 384. This is because
+ * there need to be enough space in the tx FIFO for the requested transfer
+ * size. Hence the tx FIFO will stop with 512 - 128 = 384 bytes. If we set
+ * the threshold to a value beyond 6, then the transmit will hang.
+ *
+ * Current dual   stream devices have a PCU TX FIFO size of 8 KB.
+ * Current single stream devices have a PCU TX FIFO size of 4 KB, however,
+ * there is a hardware issue which forces us to use 2 KB instead so the
+ * frame trigger level must not exceed 2 KB for these chipsets.
+ */
 bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel)
 {
 	u32 txcfg, curLevel, newLevel;
 	enum ath9k_int omask;
 
-	if (ah->tx_trig_level >= MAX_TX_FIFO_THRESHOLD)
+	if (ah->tx_trig_level >= ah->config.max_txtrig_level)
 		return false;
 
 	omask = ath9k_hw_set_interrupts(ah, ah->mask_reg & ~ATH9K_INT_GLOBAL);
@@ -79,7 +104,7 @@ bool ath9k_hw_updatetxtriglevel(struct a
 	curLevel = MS(txcfg, AR_FTRIG);
 	newLevel = curLevel;
 	if (bIncTrigLevel) {
-		if (curLevel < MAX_TX_FIFO_THRESHOLD)
+		if (curLevel < ah->config.max_txtrig_level)
 			newLevel++;
 	} else if (curLevel > MIN_TX_FIFO_THRESHOLD)
 		newLevel--;
@@ -222,6 +247,8 @@ int ath9k_hw_txprocdesc(struct ath_hw *a
 	ds->ds_txstat.ts_status = 0;
 	ds->ds_txstat.ts_flags = 0;
 
+	if (ads->ds_txstatus1 & AR_FrmXmitOK)
+		ds->ds_txstat.ts_status |= ATH9K_TX_ACKED;
 	if (ads->ds_txstatus1 & AR_ExcessiveRetries)
 		ds->ds_txstat.ts_status |= ATH9K_TXERR_XRETRY;
 	if (ads->ds_txstatus1 & AR_Filtered)
@@ -896,6 +923,13 @@ void ath9k_hw_setuprxdesc(struct ath_hw 
 		memset(&(ads->u), 0, sizeof(ads->u));
 }
 
+/*
+ * This can stop or re-enables RX.
+ *
+ * If bool is set this will kill any frame which is currently being
+ * transferred between the MAC and baseband and also prevent any new
+ * frames from getting started.
+ */
 bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set)
 {
 	u32 reg;
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h.orig	2009-12-02 15:55:43.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h	2009-12-02 16:00:16.000000000 -0500
@@ -76,6 +76,7 @@
 #define ATH9K_TXERR_FIFO           0x04
 #define ATH9K_TXERR_XTXOP          0x08
 #define ATH9K_TXERR_TIMER_EXPIRED  0x10
+#define ATH9K_TX_ACKED		   0x20
 
 #define ATH9K_TX_BA                0x01
 #define ATH9K_TX_PWRMGMT           0x02
@@ -85,9 +86,15 @@
 #define ATH9K_TX_SW_ABORTED        0x40
 #define ATH9K_TX_SW_FILTERED       0x80
 
+/* 64 bytes */
 #define MIN_TX_FIFO_THRESHOLD   0x1
+
+/*
+ * Single stream device AR9285 and AR9271 require 2 KB
+ * to work around a hardware issue, all other devices
+ * have can use the max 4 KB limit.
+ */
 #define MAX_TX_FIFO_THRESHOLD   ((4096 / 64) - 1)
-#define INIT_TX_FIFO_THRESHOLD  MIN_TX_FIFO_THRESHOLD
 
 struct ath_tx_status {
 	u32 ts_tstamp;
@@ -380,6 +387,11 @@ struct ar5416_desc {
 #define AR_TxBaStatus       0x40000000
 #define AR_TxStatusRsvd01   0x80000000
 
+/*
+ * AR_FrmXmitOK - Frame transmission success flag. If set, the frame was
+ * transmitted successfully. If clear, no ACK or BA was received to indicate
+ * successful transmission when we were expecting an ACK or BA.
+ */
 #define AR_FrmXmitOK            0x00000001
 #define AR_ExcessiveRetries     0x00000002
 #define AR_FIFOUnderrun         0x00000004
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c.orig	2009-12-02 15:56:00.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c	2009-12-02 16:04:34.000000000 -0500
@@ -2325,8 +2325,15 @@ static int ath9k_config(struct ieee80211
 		}
 	}
 
+	/*
+	 * We just prepare to enable PS. We have to wait until our AP has
+	 * ACK'd our null data frame to disable RX otherwise we'll ignore
+	 * those ACKs and end up retransmitting the same null data frames.
+	 * IEEE80211_CONF_CHANGE_PS is only passed by mac80211 for STA mode.
+	 */
 	if (changed & IEEE80211_CONF_CHANGE_PS) {
 		if (conf->flags & IEEE80211_CONF_PS) {
+			sc->sc_flags |= SC_OP_PS_ENABLED;
 			if (!(ah->caps.hw_caps &
 			      ATH9K_HW_CAP_AUTOSLEEP)) {
 				if ((sc->imask & ATH9K_INT_TIM_TIMER) == 0) {
@@ -2334,11 +2341,20 @@ static int ath9k_config(struct ieee80211
 					ath9k_hw_set_interrupts(sc->sc_ah,
 							sc->imask);
 				}
+			}
+			/*
+			 * At this point we know hardware has received an ACK
+			 * of a previously sent null data frame.
+			 */
+			if ((sc->sc_flags & SC_OP_NULLFUNC_COMPLETED)) {
+				sc->sc_flags &= ~SC_OP_NULLFUNC_COMPLETED;
+				sc->ps_enabled = true;
 				ath9k_hw_setrxabort(sc->sc_ah, 1);
 			}
-			sc->ps_enabled = true;
 		} else {
 			sc->ps_enabled = false;
+			sc->sc_flags &= ~(SC_OP_PS_ENABLED |
+					  SC_OP_NULLFUNC_COMPLETED);
 			ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
 			if (!(ah->caps.hw_caps &
 			      ATH9K_HW_CAP_AUTOSLEEP)) {
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c.orig	2009-12-02 15:55:43.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c	2009-12-02 16:00:05.000000000 -0500
@@ -1315,10 +1315,14 @@ static void ath_tx_status(void *priv, st
 		goto exit;
 
 	/*
-	 * If underrun error is seen assume it as an excessive retry only
-	 * if prefetch trigger level have reached the max (0x3f for 5416)
-	 * Adjust the long retry as if the frame was tried hw->max_rate_tries
-	 * times. This affects how ratectrl updates PER for the failed rate.
+	 * If an underrun error is seen assume it as an excessive retry only
+	 * if max frame trigger level has been reached (2 KB for singel stream,
+	 * and 4 KB for dual stream). Adjust the long retry as if the frame was
+	 * tried hw->max_rate_tries times to affect how ratectrl updates PER for
+	 * the failed rate. In case of congestion on the bus penalizing these
+	 * type of underruns should help hardware actually transmit new frames
+	 * successfully by eventually preferring slower rates. This itself
+	 * should also alleviate congestion on the bus.
 	 */
 	if (tx_info_priv->tx.ts_flags &
 	    (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN) &&
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h.orig	2009-12-02 15:55:43.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h	2009-12-02 16:00:16.000000000 -0500
@@ -1330,13 +1330,22 @@ enum {
 #define AR_MCAST_FIL0       0x8040
 #define AR_MCAST_FIL1       0x8044
 
+/*
+ * AR_DIAG_SW - Register which can be used for diagnostics and testing purposes.
+ *
+ * The force RX abort (AR_DIAG_RX_ABORT, bit 25) can be used in conjunction with
+ * RX block (AR_DIAG_RX_DIS, bit 5) to help fast channel change to shut down
+ * receive. The force RX abort bit will kill any frame which is currently being
+ * transferred between the MAC and baseband. The RX block bit (AR_DIAG_RX_DIS)
+ * will prevent any new frames from getting started.
+ */
 #define AR_DIAG_SW                  0x8048
 #define AR_DIAG_CACHE_ACK           0x00000001
 #define AR_DIAG_ACK_DIS             0x00000002
 #define AR_DIAG_CTS_DIS             0x00000004
 #define AR_DIAG_ENCRYPT_DIS         0x00000008
 #define AR_DIAG_DECRYPT_DIS         0x00000010
-#define AR_DIAG_RX_DIS              0x00000020
+#define AR_DIAG_RX_DIS              0x00000020 /* RX block */
 #define AR_DIAG_LOOP_BACK           0x00000040
 #define AR_DIAG_CORR_FCS            0x00000080
 #define AR_DIAG_CHAN_INFO           0x00000100
@@ -1345,12 +1354,12 @@ enum {
 #define AR_DIAG_FRAME_NV0           0x00020000
 #define AR_DIAG_OBS_PT_SEL1         0x000C0000
 #define AR_DIAG_OBS_PT_SEL1_S       18
-#define AR_DIAG_FORCE_RX_CLEAR      0x00100000
+#define AR_DIAG_FORCE_RX_CLEAR      0x00100000 /* force rx_clear high */
 #define AR_DIAG_IGNORE_VIRT_CS      0x00200000
 #define AR_DIAG_FORCE_CH_IDLE_HIGH  0x00400000
 #define AR_DIAG_EIFS_CTRL_ENA       0x00800000
 #define AR_DIAG_DUAL_CHAIN_INFO     0x01000000
-#define AR_DIAG_RX_ABORT            0x02000000
+#define AR_DIAG_RX_ABORT            0x02000000 /* Force RX abort */
 #define AR_DIAG_SATURATE_CYCLE_CNT  0x04000000
 #define AR_DIAG_OBS_PT_SEL2         0x08000000
 #define AR_DIAG_RX_CLEAR_CTL_LOW    0x10000000
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c.orig	2009-12-02 15:55:43.000000000 -0500
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c	2009-12-02 16:05:41.000000000 -0500
@@ -1592,6 +1592,14 @@ static int ath_tx_setup_buffer(struct ie
 	}
 
 	bf->bf_buf_addr = bf->bf_dmacontext;
+
+	/* tag if this is a nullfunc frame to enable PS when AP acks it */
+	if (ieee80211_is_nullfunc(fc) && ieee80211_has_pm(fc)) {
+		bf->bf_isnullfunc = true;
+		sc->sc_flags &= ~SC_OP_NULLFUNC_COMPLETED;
+	} else
+		bf->bf_isnullfunc = false;
+
 	return 0;
 }
 
@@ -1990,6 +1998,19 @@ static void ath_tx_processq(struct ath_s
 			txq->axq_gatingds = NULL;
 
 		/*
+		 * We now know the nullfunc frame has been ACKed so we
+		 * can disable RX.
+		 */
+		if (bf->bf_isnullfunc &&
+		    (ds->ds_txstat.ts_status & ATH9K_TX_ACKED)) {
+			if ((sc->sc_flags & SC_OP_PS_ENABLED)) {
+				sc->ps_enabled = true;
+				ath9k_hw_setrxabort(sc->sc_ah, 1);
+			} else
+				sc->sc_flags |= SC_OP_NULLFUNC_COMPLETED;
+		}
+
+		/*
 		 * Remove ath_buf's of the same transmit unit from txq,
 		 * however leave the last descriptor back as the holding
 		 * descriptor for hw.
@@ -2065,7 +2086,9 @@ static void ath_tx_complete_poll_work(st
 
 	if (needreset) {
 		DPRINTF(sc, ATH_DBG_RESET, "tx hung, resetting the chip\n");
+		ath9k_ps_wakeup(sc);
 		ath_reset(sc, false);
+		ath9k_ps_restore(sc);
 	}
 
 	ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1861
retrieving revision 1.1862
diff -u -p -r1.1861 -r1.1862
--- kernel.spec	2 Dec 2009 11:12:05 -0000	1.1861
+++ kernel.spec	2 Dec 2009 21:13:39 -0000	1.1862
@@ -667,6 +667,7 @@ Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
+Patch682: linux-2.6-ath9k-fixes.patch
 
 Patch700: linux-2.6.31-nx-data.patch
 Patch701: linux-2.6.31-modules-ro-nx.patch
@@ -1279,6 +1280,9 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 
+# ath9k: add fixes suggested by upstream maintainer
+ApplyPatch linux-2.6-ath9k-fixes.patch
+
 # Mark kernel data as NX
 #ApplyPatch linux-2.6.31-nx-data.patch
 # Apply NX/RO to modules
@@ -1996,6 +2000,9 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 02 2009 John W. Linville <linville at redhat.com> 2.6.32-0.64.rc8.git2
+- ath9k: add fixes suggested by upstream maintainer
+
 * Wed Dec 02 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.32-0.63.rc8.git2
 - forward port IOMMU fixes from F-12 for HP BIOS brokenness
 - Fix oops with intel_iommu=igfx_off



From rdieter at fedoraproject.org  Wed Dec  2 21:15:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  2 Dec 2009 21:15:29 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.105,1.106
Message-ID: <20091202211529.33E9C11C0095@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	pulseaudio.spec 
Log Message:
* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.21-2
- module-device-manager, kde autostart bits missing (#541419)



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- pulseaudio.spec	23 Nov 2009 04:58:25 -0000	1.105
+++ pulseaudio.spec	2 Dec 2009 21:15:28 -0000	1.106
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -218,9 +218,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{ver
 rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{version}/modules/module-detect.so
 rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{version}/modules/module-pipe-sink.so
 rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{version}/modules/module-pipe-source.so
-rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{version}/modules/module-device-manager.so
-rm $RPM_BUILD_ROOT%{_bindir}/start-pulseaudio-kde
-rm $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
 # preserve time stamps, for multilib's sake
 touch -r src/daemon/daemon.conf.in $RPM_BUILD_ROOT%{_sysconfdir}/pulse/daemon.conf
 touch -r src/daemon/default.pa.in $RPM_BUILD_ROOT%{_sysconfdir}/pulse/default.pa
@@ -285,6 +282,7 @@ exit 0
 %{_libdir}/pulse-%{version}/modules/module-cli-protocol-unix.so
 %{_libdir}/pulse-%{version}/modules/module-cli.so
 %{_libdir}/pulse-%{version}/modules/module-combine.so
+%{_libdir}/pulse-%{version}/modules/module-device-manager.so
 %{_libdir}/pulse-%{version}/modules/module-loopback.so
 %{_libdir}/pulse-%{version}/modules/module-esound-compat-spawnfd.so
 %{_libdir}/pulse-%{version}/modules/module-esound-compat-spawnpid.so
@@ -347,6 +345,8 @@ exit 0
 %files module-x11
 %defattr(-,root,root)
 %config %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
+%config %{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
+%{_bindir}/start-pulseaudio-kde
 %{_bindir}/start-pulseaudio-x11
 %{_libdir}/pulse-%{version}/modules/module-x11-bell.so
 %{_libdir}/pulse-%{version}/modules/module-x11-publish.so
@@ -439,6 +439,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.21-2
+- module-device-manager, kde autostart bits missing (#541419)
+
 * Mon Nov 23 2009 Lennart Poettering <lpoetter at redhat.com> - 0.9.21-1
 - New release
 



From linville at fedoraproject.org  Wed Dec  2 21:40:18 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 21:40:18 +0000 (UTC)
Subject: File iw-0.9.18.tar.bz2 uploaded to lookaside cache by linville
Message-ID: <20091202214018.EEC3C10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for iw:

9734080d8a5c4b768c5e0da665a48950  iw-0.9.18.tar.bz2



From linville at fedoraproject.org  Wed Dec  2 21:44:29 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 21:44:29 +0000 (UTC)
Subject: File wireless-regdb-2009.11.25.tar.bz2 uploaded to lookaside cache
	by linville
Message-ID: <20091202214429.A6E9D10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for crda:

73166199a4df3854fa81500b5c9a639b  wireless-regdb-2009.11.25.tar.bz2



From dwalsh at fedoraproject.org  Wed Dec  2 21:44:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  2 Dec 2009 21:44:32 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.145,1.146
Message-ID: <20091202214432.DACE511C0095@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9136

Modified Files:
	policy-F12.patch 
Log Message:
* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-53
- Remove transition from dhcpc_t to consoletype_t, just allow exec
- Fixes for prelink cron job
- Fix label on yumex backend
- Allow unconfined_java_t to communicate with iptables
- Allow abrt to read /tmp files
- Fix nut/ups policy


policy-F12.patch:
 Makefile                                                     |    2 
 policy/flask/access_vectors                                  |    1 
 policy/global_tunables                                       |   24 
 policy/mcs                                                   |   10 
 policy/modules/admin/alsa.te                                 |    2 
 policy/modules/admin/anaconda.te                             |    3 
 policy/modules/admin/brctl.te                                |    2 
 policy/modules/admin/certwatch.te                            |    2 
 policy/modules/admin/consoletype.te                          |    1 
 policy/modules/admin/dmesg.fc                                |    2 
 policy/modules/admin/dmesg.te                                |   10 
 policy/modules/admin/firstboot.te                            |    6 
 policy/modules/admin/kismet.fc                               |    2 
 policy/modules/admin/kismet.te                               |   13 
 policy/modules/admin/logrotate.te                            |   21 
 policy/modules/admin/logwatch.te                             |    8 
 policy/modules/admin/mrtg.te                                 |    1 
 policy/modules/admin/netutils.te                             |    2 
 policy/modules/admin/ntop.fc                                 |    5 
 policy/modules/admin/ntop.if                                 |  158 +
 policy/modules/admin/ntop.te                                 |   40 
 policy/modules/admin/portage.te                              |    2 
 policy/modules/admin/prelink.fc                              |    1 
 policy/modules/admin/prelink.if                              |    4 
 policy/modules/admin/prelink.te                              |   77 
 policy/modules/admin/readahead.te                            |    1 
 policy/modules/admin/rpm.fc                                  |   21 
 policy/modules/admin/rpm.if                                  |  344 ++
 policy/modules/admin/rpm.te                                  |   98 
 policy/modules/admin/shorewall.fc                            |    6 
 policy/modules/admin/shorewall.if                            |   40 
 policy/modules/admin/shorewall.te                            |    9 
 policy/modules/admin/smoltclient.fc                          |    4 
 policy/modules/admin/smoltclient.if                          |    1 
 policy/modules/admin/smoltclient.te                          |   66 
 policy/modules/admin/sudo.if                                 |   13 
 policy/modules/admin/tmpreaper.te                            |   10 
 policy/modules/admin/tzdata.te                               |    2 
 policy/modules/admin/usermanage.if                           |   11 
 policy/modules/admin/usermanage.te                           |   35 
 policy/modules/admin/vbetool.te                              |   14 
 policy/modules/admin/vpn.te                                  |    4 
 policy/modules/apps/calamaris.te                             |    7 
 policy/modules/apps/chrome.fc                                |    2 
 policy/modules/apps/chrome.if                                |   86 
 policy/modules/apps/chrome.te                                |   78 
 policy/modules/apps/cpufreqselector.te                       |    2 
 policy/modules/apps/execmem.fc                               |   42 
 policy/modules/apps/execmem.if                               |   80 
 policy/modules/apps/execmem.te                               |   11 
 policy/modules/apps/firewallgui.fc                           |    3 
 policy/modules/apps/firewallgui.if                           |    3 
 policy/modules/apps/firewallgui.te                           |   64 
 policy/modules/apps/gitosis.if                               |   45 
 policy/modules/apps/gnome.fc                                 |   12 
 policy/modules/apps/gnome.if                                 |  170 +
 policy/modules/apps/gnome.te                                 |   99 
 policy/modules/apps/gpg.te                                   |   20 
 policy/modules/apps/java.fc                                  |   24 
 policy/modules/apps/java.if                                  |  114 
 policy/modules/apps/java.te                                  |   19 
 policy/modules/apps/kdumpgui.fc                              |    2 
 policy/modules/apps/kdumpgui.if                              |    2 
 policy/modules/apps/kdumpgui.te                              |   67 
 policy/modules/apps/livecd.fc                                |    2 
 policy/modules/apps/livecd.if                                |   52 
 policy/modules/apps/livecd.te                                |   27 
 policy/modules/apps/loadkeys.te                              |    6 
 policy/modules/apps/mono.fc                                  |    2 
 policy/modules/apps/mono.if                                  |  101 
 policy/modules/apps/mono.te                                  |    9 
 policy/modules/apps/mozilla.fc                               |    1 
 policy/modules/apps/mozilla.if                               |   68 
 policy/modules/apps/mozilla.te                               |   23 
 policy/modules/apps/nsplugin.fc                              |   11 
 policy/modules/apps/nsplugin.if                              |  323 ++
 policy/modules/apps/nsplugin.te                              |  295 +
 policy/modules/apps/openoffice.fc                            |    3 
 policy/modules/apps/openoffice.if                            |   93 
 policy/modules/apps/openoffice.te                            |   11 
 policy/modules/apps/podsleuth.te                             |    3 
 policy/modules/apps/ptchown.if                               |   25 
 policy/modules/apps/pulseaudio.if                            |    2 
 policy/modules/apps/pulseaudio.te                            |   13 
 policy/modules/apps/qemu.fc                                  |    4 
 policy/modules/apps/qemu.if                                  |  189 +
 policy/modules/apps/qemu.te                                  |   85 
 policy/modules/apps/sambagui.fc                              |    1 
 policy/modules/apps/sambagui.if                              |    2 
 policy/modules/apps/sambagui.te                              |   60 
 policy/modules/apps/sandbox.fc                               |    1 
 policy/modules/apps/sandbox.if                               |  188 +
 policy/modules/apps/sandbox.te                               |  331 ++
 policy/modules/apps/screen.if                                |    7 
 policy/modules/apps/sectoolm.fc                              |    6 
 policy/modules/apps/sectoolm.if                              |    3 
 policy/modules/apps/sectoolm.te                              |  120 
 policy/modules/apps/selinux-policy-3.6.32-41.fc12.noarch.rpm |binary
 policy/modules/apps/seunshare.fc                             |    2 
 policy/modules/apps/seunshare.if                             |   81 
 policy/modules/apps/seunshare.te                             |   43 
 policy/modules/apps/vmware.te                                |    1 
 policy/modules/apps/wine.fc                                  |   24 
 policy/modules/apps/wine.if                                  |  115 
 policy/modules/apps/wine.te                                  |   34 
 policy/modules/kernel/corecommands.fc                        |   43 
 policy/modules/kernel/corecommands.if                        |   21 
 policy/modules/kernel/corecommands.pp                        |binary
 policy/modules/kernel/corenetwork.te.in                      |   46 
 policy/modules/kernel/devices.fc                             |   13 
 policy/modules/kernel/devices.if                             |  309 ++
 policy/modules/kernel/devices.te                             |   25 
 policy/modules/kernel/domain.if                              |  170 -
 policy/modules/kernel/domain.te                              |   89 
 policy/modules/kernel/files.fc                               |    5 
 policy/modules/kernel/files.if                               |  398 ++
 policy/modules/kernel/files.te                               |    6 
 policy/modules/kernel/filesystem.fc                          |    2 
 policy/modules/kernel/filesystem.if                          |  256 +
 policy/modules/kernel/filesystem.te                          |   16 
 policy/modules/kernel/kernel.if                              |   98 
 policy/modules/kernel/kernel.te                              |   32 
 policy/modules/kernel/selinux.if                             |   25 
 policy/modules/kernel/storage.fc                             |    2 
 policy/modules/kernel/storage.if                             |    3 
 policy/modules/kernel/terminal.fc                            |    1 
 policy/modules/kernel/terminal.if                            |   44 
 policy/modules/kernel/terminal.te                            |    1 
 policy/modules/roles/guest.te                                |    8 
 policy/modules/roles/staff.te                                |  126 
 policy/modules/roles/sysadm.te                               |  126 
 policy/modules/roles/unconfineduser.fc                       |    8 
 policy/modules/roles/unconfineduser.if                       |  667 ++++
 policy/modules/roles/unconfineduser.te                       |  436 ++
 policy/modules/roles/unprivuser.te                           |  127 
 policy/modules/roles/xguest.te                               |   74 
 policy/modules/services/abrt.fc                              |    6 
 policy/modules/services/abrt.if                              |  102 
 policy/modules/services/abrt.te                              |  105 
 policy/modules/services/afs.fc                               |    1 
 policy/modules/services/afs.te                               |    3 
 policy/modules/services/aisexec.fc                           |   12 
 policy/modules/services/aisexec.if                           |  106 
 policy/modules/services/aisexec.te                           |  112 
 policy/modules/services/amavis.te                            |    2 
 policy/modules/services/apache.fc                            |   50 
 policy/modules/services/apache.if                            |  410 +-
 policy/modules/services/apache.te                            |  452 ++
 policy/modules/services/apm.te                               |    6 
 policy/modules/services/arpwatch.te                          |    2 
 policy/modules/services/asterisk.if                          |   21 
 policy/modules/services/asterisk.te                          |   20 
 policy/modules/services/automount.te                         |    2 
 policy/modules/services/avahi.te                             |   10 
 policy/modules/services/bind.if                              |   40 
 policy/modules/services/bitlbee.te                           |    2 
 policy/modules/services/bluetooth.if                         |   21 
 policy/modules/services/bluetooth.te                         |   11 
 policy/modules/services/ccs.fc                               |    8 
 policy/modules/services/ccs.te                               |   33 
 policy/modules/services/certmaster.te                        |    2 
 policy/modules/services/chronyd.fc                           |   11 
 policy/modules/services/chronyd.if                           |  105 
 policy/modules/services/chronyd.te                           |   67 
 policy/modules/services/clamav.te                            |   18 
 policy/modules/services/clogd.fc                             |    4 
 policy/modules/services/clogd.if                             |   98 
 policy/modules/services/clogd.te                             |   62 
 policy/modules/services/cobbler.fc                           |    2 
 policy/modules/services/cobbler.if                           |   44 
 policy/modules/services/cobbler.te                           |    5 
 policy/modules/services/consolekit.fc                        |    3 
 policy/modules/services/consolekit.if                        |   39 
 policy/modules/services/consolekit.te                        |   24 
 policy/modules/services/corosync.fc                          |   13 
 policy/modules/services/corosync.if                          |  108 
 policy/modules/services/corosync.te                          |  109 
 policy/modules/services/courier.if                           |   18 
 policy/modules/services/courier.te                           |    1 
 policy/modules/services/cron.fc                              |    6 
 policy/modules/services/cron.if                              |   74 
 policy/modules/services/cron.te                              |   82 
 policy/modules/services/cups.fc                              |   13 
 policy/modules/services/cups.te                              |   51 
 policy/modules/services/cvs.te                               |    1 
 policy/modules/services/cyrus.te                             |    1 
 policy/modules/services/dbus.if                              |   49 
 policy/modules/services/dbus.te                              |   25 
 policy/modules/services/dcc.te                               |    8 
 policy/modules/services/ddclient.if                          |   25 
 policy/modules/services/devicekit.fc                         |    2 
 policy/modules/services/devicekit.if                         |   22 
 policy/modules/services/devicekit.te                         |   60 
 policy/modules/services/dnsmasq.te                           |   12 
 policy/modules/services/dovecot.te                           |   28 
 policy/modules/services/exim.te                              |    5 
 policy/modules/services/fail2ban.te                          |    2 
 policy/modules/services/fetchmail.te                         |    3 
 policy/modules/services/fprintd.te                           |    4 
 policy/modules/services/ftp.te                               |   60 
 policy/modules/services/git.fc                               |    8 
 policy/modules/services/git.if                               |  286 +
 policy/modules/services/git.te                               |  166 +
 policy/modules/services/gpm.te                               |    3 
 policy/modules/services/gpsd.fc                              |    5 
 policy/modules/services/gpsd.if                              |   27 
 policy/modules/services/gpsd.te                              |   14 
 policy/modules/services/hal.fc                               |    1 
 policy/modules/services/hal.if                               |   18 
 policy/modules/services/hal.te                               |   49 
 policy/modules/services/howl.te                              |    2 
 policy/modules/services/inetd.fc                             |    2 
 policy/modules/services/inetd.te                             |    4 
 policy/modules/services/irqbalance.te                        |    4 
 policy/modules/services/kerberos.if                          |    6 
 policy/modules/services/kerberos.te                          |   16 
 policy/modules/services/kerneloops.te                        |    2 
 policy/modules/services/ktalk.te                             |    1 
 policy/modules/services/lircd.fc                             |    2 
 policy/modules/services/lircd.if                             |    9 
 policy/modules/services/lircd.te                             |   23 
 policy/modules/services/mailman.te                           |    4 
 policy/modules/services/memcached.te                         |    2 
 policy/modules/services/milter.if                            |    2 
 policy/modules/services/modemmanager.te                      |    5 
 policy/modules/services/mta.fc                               |    2 
 policy/modules/services/mta.if                               |   13 
 policy/modules/services/mta.te                               |   36 
 policy/modules/services/munin.fc                             |    3 
 policy/modules/services/munin.te                             |    3 
 policy/modules/services/mysql.te                             |    9 
 policy/modules/services/nagios.fc                            |   20 
 policy/modules/services/nagios.if                            |   89 
 policy/modules/services/nagios.te                            |  106 
 policy/modules/services/networkmanager.fc                    |   15 
 policy/modules/services/networkmanager.if                    |   65 
 policy/modules/services/networkmanager.te                    |  117 
 policy/modules/services/nis.fc                               |    5 
 policy/modules/services/nis.if                               |   87 
 policy/modules/services/nis.te                               |   13 
 policy/modules/services/nscd.if                              |   18 
 policy/modules/services/nscd.te                              |   21 
 policy/modules/services/nslcd.if                             |    8 
 policy/modules/services/ntop.te                              |   14 
 policy/modules/services/ntp.if                               |   46 
 policy/modules/services/ntp.te                               |    8 
 policy/modules/services/nut.fc                               |   16 
 policy/modules/services/nut.if                               |   58 
 policy/modules/services/nut.te                               |  188 +
 policy/modules/services/nx.fc                                |    7 
 policy/modules/services/nx.if                                |   67 
 policy/modules/services/nx.te                                |   13 
 policy/modules/services/oddjob.if                            |    1 
 policy/modules/services/oddjob.te                            |    4 
 policy/modules/services/openvpn.te                           |    2 
 policy/modules/services/pcscd.if                             |   22 
 policy/modules/services/pcscd.te                             |    4 
 policy/modules/services/pegasus.te                           |   28 
 policy/modules/services/plymouth.fc                          |    5 
 policy/modules/services/plymouth.if                          |  286 +
 policy/modules/services/plymouth.te                          |  101 
 policy/modules/services/policykit.fc                         |    5 
 policy/modules/services/policykit.if                         |   48 
 policy/modules/services/policykit.te                         |   64 
 policy/modules/services/portreserve.te                       |    1 
 policy/modules/services/postfix.fc                           |    2 
 policy/modules/services/postfix.if                           |  150 
 policy/modules/services/postfix.te                           |  142 
 policy/modules/services/postgresql.fc                        |   16 
 policy/modules/services/postgresql.if                        |   43 
 policy/modules/services/postgresql.te                        |    9 
 policy/modules/services/ppp.if                               |    6 
 policy/modules/services/ppp.te                               |   16 
 policy/modules/services/prelude.te                           |    3 
 policy/modules/services/privoxy.fc                           |    3 
 policy/modules/services/privoxy.te                           |    3 
 policy/modules/services/procmail.te                          |   12 
 policy/modules/services/pyzor.fc                             |    4 
 policy/modules/services/pyzor.if                             |   47 
 policy/modules/services/pyzor.te                             |   37 
 policy/modules/services/radvd.te                             |    1 
 policy/modules/services/razor.fc                             |    1 
 policy/modules/services/razor.if                             |   42 
 policy/modules/services/razor.te                             |   32 
 policy/modules/services/rgmanager.fc                         |    8 
 policy/modules/services/rgmanager.if                         |   59 
 policy/modules/services/rgmanager.te                         |   83 
 policy/modules/services/rhcs.fc                              |   22 
 policy/modules/services/rhcs.if                              |  348 ++
 policy/modules/services/rhcs.te                              |  394 ++
 policy/modules/services/ricci.te                             |   30 
 policy/modules/services/rpc.if                               |    7 
 policy/modules/services/rpc.te                               |   17 
 policy/modules/services/rpcbind.if                           |   20 
 policy/modules/services/rpcbind.te                           |    1 
 policy/modules/services/rsync.te                             |   23 
 policy/modules/services/rtkit.if                             |   20 
 policy/modules/services/rtkit.te                             |    4 
 policy/modules/services/samba.fc                             |    4 
 policy/modules/services/samba.if                             |  104 
 policy/modules/services/samba.te                             |   89 
 policy/modules/services/sasl.te                              |   15 
 policy/modules/services/sendmail.if                          |  137 
 policy/modules/services/sendmail.te                          |   87 
 policy/modules/services/setroubleshoot.fc                    |    2 
 policy/modules/services/setroubleshoot.if                    |  123 
 policy/modules/services/setroubleshoot.te                    |   82 
 policy/modules/services/smartmon.te                          |   15 
 policy/modules/services/snmp.if                              |   38 
 policy/modules/services/snmp.te                              |    4 
 policy/modules/services/snort.te                             |    1 
 policy/modules/services/spamassassin.fc                      |   15 
 policy/modules/services/spamassassin.if                      |   89 
 policy/modules/services/spamassassin.te                      |  139 
 policy/modules/services/squid.te                             |    9 
 policy/modules/services/ssh.fc                               |    2 
 policy/modules/services/ssh.if                               |  207 +
 policy/modules/services/ssh.te                               |  155 -
 policy/modules/services/sssd.fc                              |    5 
 policy/modules/services/sssd.if                              |   62 
 policy/modules/services/sssd.te                              |   15 
 policy/modules/services/sysstat.te                           |    5 
 policy/modules/services/tftp.fc                              |    2 
 policy/modules/services/tor.te                               |    1 
 policy/modules/services/tuned.fc                             |    6 
 policy/modules/services/tuned.if                             |  140 
 policy/modules/services/tuned.te                             |   58 
 policy/modules/services/uucp.te                              |   10 
 policy/modules/services/virt.fc                              |   14 
 policy/modules/services/virt.if                              |  210 +
 policy/modules/services/virt.te                              |  276 +
 policy/modules/services/w3c.te                               |    7 
 policy/modules/services/xserver.fc                           |   45 
 policy/modules/services/xserver.if                           |  633 +++-
 policy/modules/services/xserver.te                           |  363 +-
 policy/modules/system/application.if                         |   20 
 policy/modules/system/application.te                         |   12 
 policy/modules/system/authlogin.fc                           |    9 
 policy/modules/system/authlogin.if                           |  209 +
 policy/modules/system/authlogin.te                           |   10 
 policy/modules/system/fstools.fc                             |    3 
 policy/modules/system/fstools.te                             |    7 
 policy/modules/system/init.fc                                |    7 
 policy/modules/system/init.if                                |  163 -
 policy/modules/system/init.te                                |  290 +
 policy/modules/system/ipsec.fc                               |    7 
 policy/modules/system/ipsec.if                               |   25 
 policy/modules/system/ipsec.te                               |   66 
 policy/modules/system/iptables.fc                            |   17 
 policy/modules/system/iptables.if                            |   97 
 policy/modules/system/iptables.te                            |   20 
 policy/modules/system/iscsi.if                               |   40 
 policy/modules/system/iscsi.te                               |    6 
 policy/modules/system/kdump.te                               |    5 
 policy/modules/system/libraries.fc                           |  182 -
 policy/modules/system/libraries.if                           |    5 
 policy/modules/system/libraries.te                           |   18 
 policy/modules/system/locallogin.te                          |   30 
 policy/modules/system/logging.fc                             |   12 
 policy/modules/system/logging.if                             |   18 
 policy/modules/system/logging.te                             |   38 
 policy/modules/system/lvm.if                                 |   39 
 policy/modules/system/lvm.te                                 |   31 
 policy/modules/system/miscfiles.fc                           |    1 
 policy/modules/system/miscfiles.if                           |   60 
 policy/modules/system/miscfiles.te                           |    2 
 policy/modules/system/modutils.fc                            |    1 
 policy/modules/system/modutils.if                            |   46 
 policy/modules/system/modutils.te                            |   56 
 policy/modules/system/mount.fc                               |    7 
 policy/modules/system/mount.if                               |    2 
 policy/modules/system/mount.te                               |   83 
 policy/modules/system/raid.fc                                |    2 
 policy/modules/system/raid.te                                |    8 
 policy/modules/system/selinuxutil.fc                         |   17 
 policy/modules/system/selinuxutil.if                         |  309 ++
 policy/modules/system/selinuxutil.te                         |  229 -
 policy/modules/system/setrans.if                             |   20 
 policy/modules/system/sysnetwork.fc                          |    9 
 policy/modules/system/sysnetwork.if                          |  114 
 policy/modules/system/sysnetwork.te                          |   79 
 policy/modules/system/udev.fc                                |    3 
 policy/modules/system/udev.if                                |   39 
 policy/modules/system/udev.te                                |   39 
 policy/modules/system/unconfined.fc                          |   15 
 policy/modules/system/unconfined.if                          |  443 --
 policy/modules/system/unconfined.te                          |  224 -
 policy/modules/system/userdomain.fc                          |    7 
 policy/modules/system/userdomain.if                          | 1684 ++++++++---
 policy/modules/system/userdomain.te                          |   51 
 policy/modules/system/xen.fc                                 |    6 
 policy/modules/system/xen.if                                 |   28 
 policy/modules/system/xen.te                                 |  137 
 policy/support/obj_perm_sets.spt                             |   28 
 policy/users                                                 |   13 
 395 files changed, 19762 insertions(+), 2816 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- policy-F12.patch	2 Dec 2009 20:24:04 -0000	1.145
+++ policy-F12.patch	2 Dec 2009 21:44:32 -0000	1.146
@@ -29074,7 +29074,7 @@ diff -b -B --ignore-all-space --exclude-
 +permissive kdump_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-11-30 17:12:15.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-02 16:07:18.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -29140,7 +29140,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/X11R6/lib/libGL\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/catalyst/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/libADM5avcodec\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libADM5.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libatiadlxx\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib64/altivec/libavcodec\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  



From mclasen at fedoraproject.org  Wed Dec  2 21:45:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 21:45:47 +0000 (UTC)
Subject: rpms/yelp/devel yelp.spec,1.171,1.172
Message-ID: <20091202214547.314F311C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	yelp.spec 
Log Message:
Make mono dep more automatic



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- yelp.spec	22 Sep 2009 00:01:41 -0000	1.171
+++ yelp.spec	2 Dec 2009 21:45:47 -0000	1.172
@@ -1,3 +1,4 @@
+%{?rhel:  %define WITH_MONO 0}
 %{?!WITH_MONO:  %define WITH_MONO 1}
 %ifarch ppc64 s390 s390x
 %define WITH_MONO 0
@@ -19,7 +20,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.28/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -160,6 +161,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- make mono dep more automatic
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From linville at fedoraproject.org  Wed Dec  2 21:46:57 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 21:46:57 +0000 (UTC)
Subject: rpms/crda/devel .cvsignore, 1.11, 1.12 crda.spec, 1.23, 1.24 sources,
	1.9, 1.10
Message-ID: <20091202214657.A4EE511C0095@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb to version 2009.11.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	11 Nov 2009 16:04:57 -0000	1.11
+++ .cvsignore	2 Dec 2009 21:46:57 -0000	1.12
@@ -1,2 +1,2 @@
 crda-1.1.0.tar.bz2
-wireless-regdb-2009.11.10.tar.bz2
+wireless-regdb-2009.11.25.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- crda.spec	11 Nov 2009 16:04:57 -0000	1.23
+++ crda.spec	2 Dec 2009 21:46:57 -0000	1.24
@@ -1,5 +1,5 @@
 %define         crda_version    1.1.0
-%define         regdb_version   2009.11.10
+%define         regdb_version   2009.11.25
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
@@ -82,7 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
-* Wed Oct  1 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.10-1
+* Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
+- Update wireless-regdb to version 2009.11.25 
+
+* Wed Nov 11 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.10-1
 - Update wireless-regdb to version 2009.11.10 
 
 * Wed Oct  1 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Nov 2009 16:04:58 -0000	1.9
+++ sources	2 Dec 2009 21:46:57 -0000	1.10
@@ -1,2 +1,2 @@
 6004584d2e39e899f7642b141dd72028  crda-1.1.0.tar.bz2
-dbb40f48423326e2e094208dec028200  wireless-regdb-2009.11.10.tar.bz2
+73166199a4df3854fa81500b5c9a639b  wireless-regdb-2009.11.25.tar.bz2



From mclasen at fedoraproject.org  Wed Dec  2 21:47:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 21:47:34 +0000 (UTC)
Subject: rpms/yelp/F-12 yelp.spec,1.171,1.172
Message-ID: <20091202214734.AFBF411C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10214

Modified Files:
	yelp.spec 
Log Message:
Make mono dep more automatic



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-12/yelp.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- yelp.spec	22 Sep 2009 00:01:41 -0000	1.171
+++ yelp.spec	2 Dec 2009 21:47:34 -0000	1.172
@@ -1,3 +1,4 @@
+%{?rhel:  %define WITH_MONO 0}
 %{?!WITH_MONO:  %define WITH_MONO 1}
 %ifarch ppc64 s390 s390x
 %define WITH_MONO 0
@@ -19,7 +20,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.28/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -160,6 +161,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Wed Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Make mono dep more automatic
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From linville at fedoraproject.org  Wed Dec  2 21:48:03 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 21:48:03 +0000 (UTC)
Subject: rpms/iw/devel .cvsignore, 1.12, 1.13 iw.spec, 1.18, 1.19 sources,
	1.12, 1.13 iw-avoid-section-type-conflict-on-ppc64.patch, 1.1,
	NONE iw-default-install-to-PREFIX-sbin.patch, 1.1, NONE
Message-ID: <20091202214803.1FF0511C0095@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	.cvsignore iw.spec sources 
Removed Files:
	iw-avoid-section-type-conflict-on-ppc64.patch 
	iw-default-install-to-PREFIX-sbin.patch 
Log Message:
Update to 0.9.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	4 Sep 2009 13:53:29 -0000	1.12
+++ .cvsignore	2 Dec 2009 21:48:02 -0000	1.13
@@ -1 +1 @@
-iw-0.9.17.tar.bz2
+iw-0.9.18.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- iw.spec	1 Oct 2009 18:49:42 -0000	1.18
+++ iw.spec	2 Dec 2009 21:48:02 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           iw
-Version:        0.9.17
-Release:        3%{?dist}
+Version:        0.9.18
+Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -13,9 +13,6 @@ BuildRequires: kernel-devel >= 2.6.24 
 BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
-Patch0:         iw-default-install-to-PREFIX-sbin.patch
-Patch1:         iw-avoid-section-type-conflict-on-ppc64.patch
-
 %description
 iw is a new nl80211 based CLI configuration utility for wireless devices.
 Currently you can only use this utility to configure devices which
@@ -24,8 +21,6 @@ only because most new wireless devices b
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1 -R
 
 
 %build
@@ -48,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Wed Dec  2 2009 John W. Linville <linville at redhat.com> 0.9.18-1
+- Update to 0.9.18
+
 * Thu Oct  1 2009 John W. Linville <linville at redhat.com> 0.9.17-3
 - Install in /sbin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Sep 2009 13:53:29 -0000	1.12
+++ sources	2 Dec 2009 21:48:02 -0000	1.13
@@ -1 +1 @@
-427841093ac11c5cbc025a3e13aac139  iw-0.9.17.tar.bz2
+9734080d8a5c4b768c5e0da665a48950  iw-0.9.18.tar.bz2


--- iw-avoid-section-type-conflict-on-ppc64.patch DELETED ---


--- iw-default-install-to-PREFIX-sbin.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Dec  2 21:48:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 21:48:24 +0000
Subject: [pkgdb] blender: dmalcolm has given up watchcommits
Message-ID: <20091202214824.2F50010F891@bastion2.fedora.phx.redhat.com>

dmalcolm has given up the watchcommits acl on blender (Fedora devel)

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



From nsantos at fedoraproject.org  Wed Dec  2 21:48:53 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed,  2 Dec 2009 21:48:53 +0000 (UTC)
Subject: rpms/qpidc/F-12 bz538355.patch,NONE,1.1 qpidc.spec,1.107,1.108
Message-ID: <20091202214853.D136111C0095@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10951

Modified Files:
	qpidc.spec 
Added Files:
	bz538355.patch 
Log Message:
Patch for BZ538355

bz538355.patch:
 bindings/qmf/python/qmf.py              |    5 ---
 bindings/qmf/ruby/qmf.rb                |    3 -
 bindings/qmf/tests/agent_ruby.rb        |    4 +-
 bindings/qmf/tests/python_console.py    |   15 +++++++++
 bindings/qmf/tests/ruby_console_test.rb |   16 ++++++++--
 src/qmf/engine/ObjectIdImpl.cpp         |   51 +++++++++++++++++++++++++-------
 src/qmf/engine/ObjectIdImpl.h           |   16 +++++-----
 src/qmf/engine/ResilientConnection.cpp  |    2 -
 8 files changed, 83 insertions(+), 29 deletions(-)

--- NEW FILE bz538355.patch ---
Index: cpp/src/qmf/engine/ObjectIdImpl.cpp
===================================================================
--- cpp/src/qmf/engine/ObjectIdImpl.cpp	(revision 886044)
+++ cpp/src/qmf/engine/ObjectIdImpl.cpp	(working copy)
@@ -24,7 +24,6 @@
 using namespace qmf::engine;
 using qpid::framing::Buffer;
 
-
 void AgentAttachment::setBanks(uint32_t broker, uint32_t agent)
 {
     first =
@@ -121,28 +120,60 @@
     return repr;
 }
 
-bool ObjectIdImpl::operator==(const ObjectIdImpl& other) const
+#define ACTUAL_FIRST (agent == 0 ? first : first | agent->first)
+#define ACTUAL_OTHER (other.agent == 0 ? other.first : other.first | other.agent->first)
+
+uint8_t ObjectIdImpl::getFlags() const
 {
-    uint64_t otherFirst = agent == 0 ? other.first : other.first & 0xffff000000000000LL;
+    return (ACTUAL_FIRST & 0xF000000000000000LL) >> 60;
+}
 
-    return first == otherFirst && second == other.second;
+uint16_t ObjectIdImpl::getSequence() const
+{
+    return (ACTUAL_FIRST & 0x0FFF000000000000LL) >> 48;
 }
 
-bool ObjectIdImpl::operator<(const ObjectIdImpl& other) const
+uint32_t ObjectIdImpl::getBrokerBank() const
 {
-    uint64_t otherFirst = agent == 0 ? other.first : other.first & 0xffff000000000000LL;
+    return (ACTUAL_FIRST & 0x0000FFFFF0000000LL) >> 28;
+}
 
-    return (first < otherFirst) || ((first == otherFirst) && (second < other.second));
+uint32_t ObjectIdImpl::getAgentBank() const
+{
+    return ACTUAL_FIRST & 0x000000000FFFFFFFLL;
 }
 
-bool ObjectIdImpl::operator>(const ObjectIdImpl& other) const
+uint64_t ObjectIdImpl::getObjectNum() const
 {
-    uint64_t otherFirst = agent == 0 ? other.first : other.first & 0xffff000000000000LL;
+    return second;
+}
 
-    return (first > otherFirst) || ((first == otherFirst) && (second > other.second));
+uint32_t ObjectIdImpl::getObjectNumHi() const
+{
+    return (uint32_t) (second >> 32);
 }
 
+uint32_t ObjectIdImpl::getObjectNumLo() const
+{
+    return (uint32_t) (second & 0x00000000FFFFFFFFLL);
+}
 
+bool ObjectIdImpl::operator==(const ObjectIdImpl& other) const
+{
+    return ACTUAL_FIRST == ACTUAL_OTHER && second == other.second;
+}
+
+bool ObjectIdImpl::operator<(const ObjectIdImpl& other) const
+{
+    return (ACTUAL_FIRST < ACTUAL_OTHER) || ((ACTUAL_FIRST == ACTUAL_OTHER) && (second < other.second));
+}
+
+bool ObjectIdImpl::operator>(const ObjectIdImpl& other) const
+{
+    return (ACTUAL_FIRST > ACTUAL_OTHER) || ((ACTUAL_FIRST == ACTUAL_OTHER) && (second > other.second));
+}
+
+
 //==================================================================
 // Wrappers
 //==================================================================
Index: cpp/src/qmf/engine/ObjectIdImpl.h
===================================================================
--- cpp/src/qmf/engine/ObjectIdImpl.h	(revision 886044)
+++ cpp/src/qmf/engine/ObjectIdImpl.h	(working copy)
@@ -51,15 +51,15 @@
         void encode(qpid::framing::Buffer& buffer) const;
         void fromString(const std::string& repr);
         const std::string& asString() const;
-        uint8_t getFlags() const { return (first & 0xF000000000000000LL) >> 60; }
-        uint16_t getSequence() const { return (first & 0x0FFF000000000000LL) >> 48; }
-        uint32_t getBrokerBank() const { return (first & 0x0000FFFFF0000000LL) >> 28; }
-        uint32_t getAgentBank() const { return first & 0x000000000FFFFFFFLL; }
-        uint64_t getObjectNum() const { return second; }
-        uint32_t getObjectNumHi() const { return (uint32_t) (second >> 32); }
-        uint32_t getObjectNumLo() const { return (uint32_t) (second & 0x00000000FFFFFFFFLL); }
+        uint8_t getFlags() const;
+        uint16_t getSequence() const;
+        uint32_t getBrokerBank() const;
+        uint32_t getAgentBank() const;
+        uint64_t getObjectNum() const;
+        uint32_t getObjectNumHi() const;
+        uint32_t getObjectNumLo() const;
         bool isDurable() const { return getSequence() == 0; }
-        void setValue(uint64_t f, uint64_t s) { first = f; second = s; }
+        void setValue(uint64_t f, uint64_t s) { first = f; second = s; agent = 0; }
 
         bool operator==(const ObjectIdImpl& other) const;
         bool operator<(const ObjectIdImpl& other) const;
Index: cpp/src/qmf/engine/ResilientConnection.cpp
===================================================================
--- cpp/src/qmf/engine/ResilientConnection.cpp	(revision 886044)
+++ cpp/src/qmf/engine/ResilientConnection.cpp	(working copy)
@@ -116,9 +116,9 @@
         int delayMax;
         int delayFactor;
         qpid::sys::Condition cond;
-        qpid::sys::Thread connThread;
         deque<ResilientConnectionEventImpl> eventQueue;
         set<RCSession::Ptr> sessions;
+        qpid::sys::Thread connThread;
     };
 }
 }
Index: cpp/bindings/qmf/ruby/qmf.rb
===================================================================
--- cpp/bindings/qmf/ruby/qmf.rb	(revision 886044)
+++ cpp/bindings/qmf/ruby/qmf.rb	(working copy)
@@ -472,8 +472,7 @@
     end
 
     def ==(other)
-      return (@impl.getObjectNumHi == other.impl.getObjectNumHi) &&
-        (@impl.getObjectNumLo == other.impl.getObjectNumLo)
+      return @impl == other.impl
     end
 
     def to_s
Index: cpp/bindings/qmf/python/qmf.py
===================================================================
--- cpp/bindings/qmf/python/qmf.py	(revision 886044)
+++ cpp/bindings/qmf/python/qmf.py	(working copy)
@@ -35,7 +35,6 @@
 from qmfengine import (O_EQ, O_NE, O_LT, O_LE, O_GT, O_GE, O_RE_MATCH, O_RE_NOMATCH,
                        E_NOT, E_AND, E_OR, E_XOR)
 
-
   ##==============================================================================
   ## CONNECTION
   ##==============================================================================
@@ -561,10 +560,8 @@
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__): return False
-        return (self.impl.getObjectNumHi() == other.impl.getObjectNumHi() and
-                self.impl.getObjectNumLo() == other.impl.getObjectNumLo())
+        return self.impl == other.impl
     
-    
     def __ne__(self, other):
         return not self.__eq__(other)
 
Index: cpp/bindings/qmf/tests/agent_ruby.rb
===================================================================
--- cpp/bindings/qmf/tests/agent_ruby.rb	(revision 886044)
+++ cpp/bindings/qmf/tests/agent_ruby.rb	(working copy)
@@ -83,7 +83,7 @@
 
 class App < Qmf::AgentHandler
   def get_query(context, query, userId)
-#   puts "Query: user=#{userId} context=#{context} class=#{query.class_name} object_num=#{query.object_id.object_num_low if query.object_id}"
+#    puts "Query: user=#{userId} context=#{context} class=#{query.class_name} object_num=#{query.object_id if query.object_id}"
     if query.class_name == 'parent'
         @agent.query_response(context, @parent)
     elsif query.object_id == @parent_oid
@@ -93,7 +93,7 @@
   end
 
   def method_call(context, name, object_id, args, userId)
-#    puts "Method: user=#{userId} context=#{context} method=#{name} object_num=#{object_id.object_num_low if object_id} args=#{args}"
+#    puts "Method: user=#{userId} context=#{context} method=#{name} object_num=#{object_id if object_id} args=#{args}"
     
     retCode = 0
     retText = "OK"
Index: cpp/bindings/qmf/tests/ruby_console_test.rb
===================================================================
--- cpp/bindings/qmf/tests/ruby_console_test.rb	(revision 886044)
+++ cpp/bindings/qmf/tests/ruby_console_test.rb	(working copy)
@@ -214,9 +214,21 @@
     fail("Didn't find a non-broker agent")
   end
 
+  def test_E_filter_by_object_id
+    mgmt_exchange = @qmfc.object(:class => "exchange", 'name' => "qpid.management")
+    assert(mgmt_exchange, "No Management Exchange")
+
+    bindings = @qmfc.objects(:class => "binding", 'exchangeRef' => mgmt_exchange.object_id)
+    if bindings.size == 0
+      fail("No bindings found on management exchange")
+    end
+
+    bindings.each do |binding|
+      assert_equal(binding.exchangeRef, mgmt_exchange.object_id)
+    end
+  end
+
 end
 
 app = ConsoleTest.new
 
-
-
Index: cpp/bindings/qmf/tests/python_console.py
===================================================================
--- cpp/bindings/qmf/tests/python_console.py	(revision 886044)
+++ cpp/bindings/qmf/tests/python_console.py	(working copy)
@@ -151,6 +151,21 @@
         newList = qmf.getObjects(_objectId=parent.getObjectId())
         self.assertEqual(len(newList), 1)
 
+    def test_E_filter_by_object_id(self):
+        self.startQmf()
+        qmf = self.qmf
+
+        list = qmf.getObjects(_class="exchange", name="qpid.management")
+        self.assertEqual(len(list), 1, "No Management Exchange")
+        mgmt_exchange = list[0]
+
+        bindings = qmf.getObjects(_class="binding", exchangeRef=mgmt_exchange.getObjectId())
+        if len(bindings) == 0:
+            self.fail("No bindings found on management exchange")
+
+        for binding in bindings:
+            self.assertEqual(binding.exchangeRef, mgmt_exchange.getObjectId())
+
     def getProperty(self, msg, name):
         for h in msg.headers:
             if hasattr(h, name): return getattr(h, name)


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/qpidc.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- qpidc.spec	3 Nov 2009 15:54:22 -0000	1.107
+++ qpidc.spec	2 Dec 2009 21:48:53 -0000	1.108
@@ -12,7 +12,7 @@
 
 Name:           qpidc
 Version:        0.5.%{qpid_svnrev}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -22,6 +22,7 @@ Source1:	rhm-0.5.%{rhm_svnrev}.tar.gz
 Source2:	qpidd.pp
 Patch0:		so_number.patch
 Patch1:		qmf.patch
+Patch2:		bz538355.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -245,6 +246,7 @@ exit 0
 %setup -T -D -b 1
 %patch0
 %patch1
+%patch2
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 
@@ -521,6 +523,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Wed Dec  2 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-3
+- Patch for BZ538355
+
 * Tue Nov  3 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-2
 - Add patch for qmf fixes
 



From linville at fedoraproject.org  Wed Dec  2 21:51:21 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 21:51:21 +0000 (UTC)
Subject: rpms/crda/F-12 .cvsignore, 1.11, 1.12 crda.spec, 1.23, 1.24 sources,
	1.9, 1.10
Message-ID: <20091202215121.A98CE11C0095@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12186

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb to version 2009.11.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	11 Nov 2009 16:12:14 -0000	1.11
+++ .cvsignore	2 Dec 2009 21:51:21 -0000	1.12
@@ -1,2 +1,2 @@
 crda-1.1.0.tar.bz2
-wireless-regdb-2009.11.10.tar.bz2
+wireless-regdb-2009.11.25.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-12/crda.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- crda.spec	11 Nov 2009 16:12:14 -0000	1.23
+++ crda.spec	2 Dec 2009 21:51:21 -0000	1.24
@@ -1,5 +1,5 @@
 %define         crda_version    1.1.0
-%define         regdb_version   2009.11.10
+%define         regdb_version   2009.11.25
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
@@ -82,7 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
-* Wed Oct  1 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.10-1
+* Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
+- Update wireless-regdb to version 2009.11.25 
+
+* Wed Nov 11 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.10-1
 - Update wireless-regdb to version 2009.11.10 
 
 * Wed Oct  1 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Nov 2009 16:12:15 -0000	1.9
+++ sources	2 Dec 2009 21:51:21 -0000	1.10
@@ -1,2 +1,2 @@
 6004584d2e39e899f7642b141dd72028  crda-1.1.0.tar.bz2
-dbb40f48423326e2e094208dec028200  wireless-regdb-2009.11.10.tar.bz2
+73166199a4df3854fa81500b5c9a639b  wireless-regdb-2009.11.25.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec  2 21:55:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 21:55:09 +0000
Subject: [pkgdb] gscan2pdf had acl change status
Message-ID: <20091202215509.D995410F88E@bastion2.fedora.phx.redhat.com>

bjohnson has set the commit acl on gscan2pdf (Fedora devel) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Wed Dec  2 21:55:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 21:55:11 +0000
Subject: [pkgdb] gscan2pdf had acl change status
Message-ID: <20091202215512.381DE10F895@bastion2.fedora.phx.redhat.com>

bjohnson has set the approveacls acl on gscan2pdf (Fedora devel) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Wed Dec  2 21:55:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 21:55:17 +0000
Subject: [pkgdb] gscan2pdf had acl change status
Message-ID: <20091202215517.84A8010F89E@bastion2.fedora.phx.redhat.com>

bjohnson has set the commit acl on gscan2pdf (Fedora 11) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Wed Dec  2 21:55:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 21:55:18 +0000
Subject: [pkgdb] gscan2pdf had acl change status
Message-ID: <20091202215519.2422410F8A3@bastion2.fedora.phx.redhat.com>

bjohnson has set the approveacls acl on gscan2pdf (Fedora 11) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Wed Dec  2 21:55:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 21:55:20 +0000
Subject: [pkgdb] gscan2pdf had acl change status
Message-ID: <20091202215520.DE03D10F8A6@bastion2.fedora.phx.redhat.com>

bjohnson has set the commit acl on gscan2pdf (Fedora 12) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Wed Dec  2 21:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 02 Dec 2009 21:55:22 +0000
Subject: [pkgdb] gscan2pdf had acl change status
Message-ID: <20091202215522.5E22D10F8AA@bastion2.fedora.phx.redhat.com>

bjohnson has set the approveacls acl on gscan2pdf (Fedora 12) to Approved for rakesh

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



From linville at fedoraproject.org  Wed Dec  2 21:56:44 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 21:56:44 +0000 (UTC)
Subject: rpms/crda/F-11 .cvsignore, 1.11, 1.12 crda.spec, 1.21, 1.22 sources,
	1.9, 1.10
Message-ID: <20091202215644.7254B11C0095@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb to version 2009.11.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	11 Nov 2009 16:26:51 -0000	1.11
+++ .cvsignore	2 Dec 2009 21:56:44 -0000	1.12
@@ -1,2 +1,2 @@
 crda-1.1.0.tar.bz2
-wireless-regdb-2009.11.10.tar.bz2
+wireless-regdb-2009.11.25.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/crda.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- crda.spec	11 Nov 2009 16:26:51 -0000	1.21
+++ crda.spec	2 Dec 2009 21:56:44 -0000	1.22
@@ -1,5 +1,5 @@
 %define         crda_version    1.1.0
-%define         regdb_version   2009.11.10
+%define         regdb_version   2009.11.25
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
@@ -82,7 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
-* Wed Oct  1 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.10-1
+* Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
+- Update wireless-regdb to version 2009.11.25 
+
+* Wed Nov 11 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.10-1
 - Update wireless-regdb to version 2009.11.10 
 
 * Wed Oct  1 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Nov 2009 16:26:51 -0000	1.9
+++ sources	2 Dec 2009 21:56:44 -0000	1.10
@@ -1,2 +1,2 @@
 6004584d2e39e899f7642b141dd72028  crda-1.1.0.tar.bz2
-dbb40f48423326e2e094208dec028200  wireless-regdb-2009.11.10.tar.bz2
+73166199a4df3854fa81500b5c9a639b  wireless-regdb-2009.11.25.tar.bz2



From linville at fedoraproject.org  Wed Dec  2 21:57:23 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed,  2 Dec 2009 21:57:23 +0000 (UTC)
Subject: rpms/crda/F-10 .cvsignore, 1.5, 1.6 crda.spec, 1.11, 1.12 sources,
	1.8, 1.9
Message-ID: <20091202215723.E5ED311C0095@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update wireless-regdb to version 2009.11.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Nov 2009 16:46:41 -0000	1.5
+++ .cvsignore	2 Dec 2009 21:57:23 -0000	1.6
@@ -1,2 +1,2 @@
 crda-1.1.0.tar.bz2
-wireless-regdb-2009.11.10.tar.bz2
+wireless-regdb-2009.11.25.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- crda.spec	11 Nov 2009 16:46:41 -0000	1.11
+++ crda.spec	2 Dec 2009 21:57:23 -0000	1.12
@@ -1,5 +1,5 @@
 %define         crda_version    1.1.0
-%define         regdb_version   2009.11.10
+%define         regdb_version   2009.11.25
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
@@ -82,7 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
-* Wed Oct  1 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.10-1
+* Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
+- Update wireless-regdb to version 2009.11.25 
+
+* Wed Nov 11 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.10-1
 - Update wireless-regdb to version 2009.11.10 
 
 * Wed Oct  1 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Nov 2009 16:46:41 -0000	1.8
+++ sources	2 Dec 2009 21:57:23 -0000	1.9
@@ -1,2 +1,2 @@
 6004584d2e39e899f7642b141dd72028  crda-1.1.0.tar.bz2
-dbb40f48423326e2e094208dec028200  wireless-regdb-2009.11.10.tar.bz2
+73166199a4df3854fa81500b5c9a639b  wireless-regdb-2009.11.25.tar.bz2



From mclasen at fedoraproject.org  Wed Dec  2 22:09:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 22:09:32 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec,1.69,1.70
Message-ID: <20091202220932.73AA911C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	brasero.spec 
Log Message:
Make libbeagle dep more automatic



Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- brasero.spec	1 Dec 2009 14:58:50 -0000	1.69
+++ brasero.spec	2 Dec 2009 22:09:31 -0000	1.70
@@ -1,3 +1,9 @@
+%{?rhel:  %define WITH_MONO 0}
+%{?!WITH_MONO:  %define WITH_MONO 1}
+%ifarch ppc6
+%define WITH_MONO 0
+%endif
+
 Name:      brasero
 Version:   2.29.3
 Release:   1%{?dist}
@@ -16,7 +22,7 @@ BuildRequires:  GConf2-devel >= 2.0.0
 BuildRequires:  libgnomeui-devel >= 2.10.0
 BuildRequires:  gstreamer-devel >= 0.10.15
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
-%ifnarch ppc64
+%if %{WITH_MONO}
 BuildRequires:  libbeagle-devel >= 0.3.0
 %endif
 BuildRequires:  totem-pl-parser-devel >= 2.22.0
@@ -207,6 +213,9 @@ fi
 
 
 %changelog
+* Wed Dec  2 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-2
+- Make libbeagle dep more automatic
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From mclasen at fedoraproject.org  Wed Dec  2 22:11:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 22:11:12 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec,1.70,1.71
Message-ID: <20091202221112.2160F11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	brasero.spec 
Log Message:
Bump rev



Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- brasero.spec	2 Dec 2009 22:09:31 -0000	1.70
+++ brasero.spec	2 Dec 2009 22:11:11 -0000	1.71
@@ -6,7 +6,7 @@
 
 Name:      brasero
 Version:   2.29.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+



From mclasen at fedoraproject.org  Wed Dec  2 22:13:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  2 Dec 2009 22:13:19 +0000 (UTC)
Subject: rpms/brasero/F-12 brasero.spec,1.70,1.71
Message-ID: <20091202221319.250C911C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19344

Modified Files:
	brasero.spec 
Log Message:
Make libbeagle dep more automatic



Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/brasero.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- brasero.spec	12 Nov 2009 17:55:29 -0000	1.70
+++ brasero.spec	2 Dec 2009 22:13:18 -0000	1.71
@@ -1,6 +1,12 @@
+%{?rhel:  %define WITH_MONO 0}
+%{?!WITH_MONO:  %define WITH_MONO 1}
+%ifarch ppc6
+%define WITH_MONO 0
+%endif
+
 Name:      brasero
 Version:   2.28.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -19,7 +25,7 @@ BuildRequires:  GConf2-devel >= 2.0.0
 BuildRequires:  libgnomeui-devel >= 2.10.0
 BuildRequires:  gstreamer-devel >= 0.10.15
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
-%ifnarch ppc64
+%if %{WITH_MONO}
 BuildRequires:  libbeagle-devel >= 0.3.0
 %endif
 BuildRequires:  totem-pl-parser-devel >= 2.22.0
@@ -210,6 +216,9 @@ fi
 
 
 %changelog
+* Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-4
+- Make the libbeagle dep more automatic
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-3
 - Obsolete nautilus-cd-burner-devel and -libs as well
 



From jjohnstn at fedoraproject.org  Wed Dec  2 22:14:17 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed,  2 Dec 2009 22:14:17 +0000 (UTC)
Subject: rpms/jetty/F-12 jetty.spec,1.23,1.24
Message-ID: <20091202221417.CDB4A11C0095@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20031

Modified Files:
	jetty.spec 
Log Message:

* Wed Dec 02 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-7
- Resovles #543081
- Add maven depmap fragments.




Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-12/jetty.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- jetty.spec	18 Nov 2009 14:19:49 -0000	1.23
+++ jetty.spec	2 Dec 2009 22:14:17 -0000	1.24
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.20
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -106,6 +106,8 @@ Requires: slf4j
 Requires: classpathx-mail
 Requires:  xerces-j2 >= 0:2.7
 Requires:  xml-commons-apis
+Requires(post): jpackage-utils >= 0:1.6
+Requires(postun): jpackage-utils >= 0:1.6
 Provides:  group(%username) = %jtuid
 Provides:  user(%username) = %jtuid
 
@@ -213,6 +215,15 @@ install -dm 755 $RPM_BUILD_ROOT%{_bindir
 install -dm 755 $RPM_BUILD_ROOT%{_initrddir}
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.jetty-jetty.pom
+install -pm 644 modules/util/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.jetty-jetty-util.pom
+
+%add_to_maven_depmap org.mortbay.jetty jetty %{version} JPP/jetty jetty
+%add_to_maven_depmap org.mortbay.jetty jetty-util %{version} JPP/jetty jetty-util
+%add_to_maven_depmap org.mortbay.jetty servlet-api %{version} JPP tomcat6-servlet-2.5-api
+
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 install -dm 755 $RPM_BUILD_ROOT%{confdir}
 install -dm 755 $RPM_BUILD_ROOT%{homedir}
@@ -325,10 +336,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 [ -x /sbin/chkconfig ] && /sbin/chkconfig --add %{name}
+%update_maven_depmap
 
 %postun
 %__fe_userdel  %username &>/dev/null || :
 %__fe_groupdel %username &>/dev/null || :
+%update_maven_depmap
 
 
 %preun
@@ -347,6 +360,8 @@ fi
 %{_javadir}/%{name}/%{name}-%{version}.jar
 %{_javadir}/%{name}/%{name}-util.jar
 %{_javadir}/%{name}/%{name}-util-%{version}.jar
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
 %config(noreplace) %{confdir}
 %dir %{jettylibdir}
 %dir %{jettycachedir}
@@ -371,6 +386,10 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Dec 02 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-7
+- Resovles #543081
+- Add maven depmap fragments.
+
 * Wed Nov 18 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-6
 - Add unversioned symlinks in javadir.
 



From jjohnstn at fedoraproject.org  Wed Dec  2 22:15:26 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed,  2 Dec 2009 22:15:26 +0000 (UTC)
Subject: rpms/jetty/devel jetty.spec,1.23,1.24
Message-ID: <20091202221526.C3E6511C0095@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

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

Modified Files:
	jetty.spec 
Log Message:

* Wed Dec 02 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.21-4
- Resovles #543081
- Add maven depmap fragments.




Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- jetty.spec	3 Nov 2009 20:12:04 -0000	1.23
+++ jetty.spec	2 Dec 2009 22:15:26 -0000	1.24
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -107,6 +107,8 @@ Requires: slf4j
 Requires: classpathx-mail
 Requires:  xerces-j2 >= 0:2.7
 Requires:  xml-commons-apis
+Requires(post): jpackage-utils >= 0:1.6
+Requires(postun): jpackage-utils >= 0:1.6
 Provides:  group(%username) = %jtuid
 Provides:  user(%username) = %jtuid
 
@@ -214,6 +216,15 @@ install -dm 755 $RPM_BUILD_ROOT%{_bindir
 install -dm 755 $RPM_BUILD_ROOT%{_initrddir}
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.jetty-jetty.pom
+install -pm 644 modules/util/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.jetty-jetty-util.pom
+
+%add_to_maven_depmap org.mortbay.jetty jetty %{version} JPP/jetty jetty
+%add_to_maven_depmap org.mortbay.jetty jetty-util %{version} JPP/jetty jetty-util
+%add_to_maven_depmap org.mortbay.jetty servlet-api %{version} JPP tomcat6-servlet-2.5-api
+
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 install -dm 755 $RPM_BUILD_ROOT%{confdir}
 install -dm 755 $RPM_BUILD_ROOT%{homedir}
@@ -326,10 +337,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 [ -x /sbin/chkconfig ] && /sbin/chkconfig --add %{name}
+%update_maven_depmap
 
 %postun
 %__fe_userdel  %username &>/dev/null || :
 %__fe_groupdel %username &>/dev/null || :
+%update_maven_depmap
 
 
 %preun
@@ -348,6 +361,8 @@ fi
 %{_javadir}/%{name}/%{name}-%{version}.jar
 %{_javadir}/%{name}/%{name}-util.jar
 %{_javadir}/%{name}/%{name}-util-%{version}.jar
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
 %config(noreplace) %{confdir}
 %dir %{jettylibdir}
 %dir %{jettycachedir}
@@ -372,6 +387,10 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Dec 02 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.21-4
+- Resovles #543081
+- Add maven depmap fragments.
+
 * Tue Nov 03 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.21-3
 - Security issues
 - Resolves #532675, #5326565



From maxamillion at fedoraproject.org  Wed Dec  2 22:28:55 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed,  2 Dec 2009 22:28:55 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.28,1.29
Message-ID: <20091202222855.5F9EE11C0095@cvs1.fedora.phx.redhat.com>

Author: maxamillion

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

Modified Files:
	midori.spec 
Log Message:
Update to latest upstream Midori




Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/devel/midori.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- midori.spec	20 Oct 2009 15:47:34 -0000	1.28
+++ midori.spec	2 Dec 2009 22:28:54 -0000	1.29
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.2.0
+Version:	0.2.1
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -103,6 +103,15 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.1-1
+- Update to new upstream release (0.2.1): Fix Mouse Gestures to work after 
+activation, Explicitly link to X11 to support gold, Implement various Hildon 
+specific features, Hide the navigationbar in fullscreen, Implement permanent 
+storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
+Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
+Introduce the Tab History List extension, Load icons laziy at startup to speed 
+up startup, Introduce a Web Cache extension, Refactor and tweak the Preferences dialogue, Implement combos to choose external applications
+
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1
 - Update to new upstream release (0.2.0): Drag-scroll on touchscreen devices,
   Speed Dial fixes, faster AdBlock (for all WebKitGTK+ versions), updated DNS



From maxamillion at fedoraproject.org  Wed Dec  2 22:37:30 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed,  2 Dec 2009 22:37:30 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.29,1.30
Message-ID: <20091202223730.57E1611C0095@cvs1.fedora.phx.redhat.com>

Author: maxamillion

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

Modified Files:
	midori.spec 
Log Message:
formatting issue in last changelog




Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/devel/midori.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- midori.spec	2 Dec 2009 22:28:54 -0000	1.29
+++ midori.spec	2 Dec 2009 22:37:30 -0000	1.30
@@ -105,12 +105,12 @@ fi
 %changelog
 * Wed Dec 02 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.1-1
 - Update to new upstream release (0.2.1): Fix Mouse Gestures to work after 
-activation, Explicitly link to X11 to support gold, Implement various Hildon 
-specific features, Hide the navigationbar in fullscreen, Implement permanent 
-storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
-Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
-Introduce the Tab History List extension, Load icons laziy at startup to speed 
-up startup, Introduce a Web Cache extension, Refactor and tweak the Preferences dialogue, Implement combos to choose external applications
+  activation, Explicitly link to X11 to support gold, Implement various Hildon 
+  specific features, Hide the navigationbar in fullscreen, Implement permanent 
+  storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
+  Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
+  Introduce the Tab History List extension, Load icons laziy at startup to speed  up startup, Introduce a Web Cache extension, Refactor and tweak the 
+  Preferences dialogue, Implement combos to choose external applications
 
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1
 - Update to new upstream release (0.2.0): Drag-scroll on touchscreen devices,



From nsantos at fedoraproject.org  Wed Dec  2 22:40:42 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed,  2 Dec 2009 22:40:42 +0000 (UTC)
Subject: rpms/qpidc/F-11 bz538355.patch,NONE,1.1 qpidc.spec,1.96,1.97
Message-ID: <20091202224042.21A5911C03E3@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26171

Modified Files:
	qpidc.spec 
Added Files:
	bz538355.patch 
Log Message:
Patch for BZ538355

bz538355.patch:
 bindings/qmf/python/qmf.py              |    5 ---
 bindings/qmf/ruby/qmf.rb                |    3 -
 bindings/qmf/tests/agent_ruby.rb        |    4 +-
 bindings/qmf/tests/python_console.py    |   15 +++++++++
 bindings/qmf/tests/ruby_console_test.rb |   16 ++++++++--
 src/qmf/engine/ObjectIdImpl.cpp         |   51 +++++++++++++++++++++++++-------
 src/qmf/engine/ObjectIdImpl.h           |   16 +++++-----
 src/qmf/engine/ResilientConnection.cpp  |    2 -
 8 files changed, 83 insertions(+), 29 deletions(-)

--- NEW FILE bz538355.patch ---
Index: cpp/src/qmf/engine/ObjectIdImpl.cpp
===================================================================
--- cpp/src/qmf/engine/ObjectIdImpl.cpp	(revision 886044)
+++ cpp/src/qmf/engine/ObjectIdImpl.cpp	(working copy)
@@ -24,7 +24,6 @@
 using namespace qmf::engine;
 using qpid::framing::Buffer;
 
-
 void AgentAttachment::setBanks(uint32_t broker, uint32_t agent)
 {
     first =
@@ -121,28 +120,60 @@
     return repr;
 }
 
-bool ObjectIdImpl::operator==(const ObjectIdImpl& other) const
+#define ACTUAL_FIRST (agent == 0 ? first : first | agent->first)
+#define ACTUAL_OTHER (other.agent == 0 ? other.first : other.first | other.agent->first)
+
+uint8_t ObjectIdImpl::getFlags() const
 {
-    uint64_t otherFirst = agent == 0 ? other.first : other.first & 0xffff000000000000LL;
+    return (ACTUAL_FIRST & 0xF000000000000000LL) >> 60;
+}
 
-    return first == otherFirst && second == other.second;
+uint16_t ObjectIdImpl::getSequence() const
+{
+    return (ACTUAL_FIRST & 0x0FFF000000000000LL) >> 48;
 }
 
-bool ObjectIdImpl::operator<(const ObjectIdImpl& other) const
+uint32_t ObjectIdImpl::getBrokerBank() const
 {
-    uint64_t otherFirst = agent == 0 ? other.first : other.first & 0xffff000000000000LL;
+    return (ACTUAL_FIRST & 0x0000FFFFF0000000LL) >> 28;
+}
 
-    return (first < otherFirst) || ((first == otherFirst) && (second < other.second));
+uint32_t ObjectIdImpl::getAgentBank() const
+{
+    return ACTUAL_FIRST & 0x000000000FFFFFFFLL;
 }
 
-bool ObjectIdImpl::operator>(const ObjectIdImpl& other) const
+uint64_t ObjectIdImpl::getObjectNum() const
 {
-    uint64_t otherFirst = agent == 0 ? other.first : other.first & 0xffff000000000000LL;
+    return second;
+}
 
-    return (first > otherFirst) || ((first == otherFirst) && (second > other.second));
+uint32_t ObjectIdImpl::getObjectNumHi() const
+{
+    return (uint32_t) (second >> 32);
 }
 
+uint32_t ObjectIdImpl::getObjectNumLo() const
+{
+    return (uint32_t) (second & 0x00000000FFFFFFFFLL);
+}
 
+bool ObjectIdImpl::operator==(const ObjectIdImpl& other) const
+{
+    return ACTUAL_FIRST == ACTUAL_OTHER && second == other.second;
+}
+
+bool ObjectIdImpl::operator<(const ObjectIdImpl& other) const
+{
+    return (ACTUAL_FIRST < ACTUAL_OTHER) || ((ACTUAL_FIRST == ACTUAL_OTHER) && (second < other.second));
+}
+
+bool ObjectIdImpl::operator>(const ObjectIdImpl& other) const
+{
+    return (ACTUAL_FIRST > ACTUAL_OTHER) || ((ACTUAL_FIRST == ACTUAL_OTHER) && (second > other.second));
+}
+
+
 //==================================================================
 // Wrappers
 //==================================================================
Index: cpp/src/qmf/engine/ObjectIdImpl.h
===================================================================
--- cpp/src/qmf/engine/ObjectIdImpl.h	(revision 886044)
+++ cpp/src/qmf/engine/ObjectIdImpl.h	(working copy)
@@ -51,15 +51,15 @@
         void encode(qpid::framing::Buffer& buffer) const;
         void fromString(const std::string& repr);
         const std::string& asString() const;
-        uint8_t getFlags() const { return (first & 0xF000000000000000LL) >> 60; }
-        uint16_t getSequence() const { return (first & 0x0FFF000000000000LL) >> 48; }
-        uint32_t getBrokerBank() const { return (first & 0x0000FFFFF0000000LL) >> 28; }
-        uint32_t getAgentBank() const { return first & 0x000000000FFFFFFFLL; }
-        uint64_t getObjectNum() const { return second; }
-        uint32_t getObjectNumHi() const { return (uint32_t) (second >> 32); }
-        uint32_t getObjectNumLo() const { return (uint32_t) (second & 0x00000000FFFFFFFFLL); }
+        uint8_t getFlags() const;
+        uint16_t getSequence() const;
+        uint32_t getBrokerBank() const;
+        uint32_t getAgentBank() const;
+        uint64_t getObjectNum() const;
+        uint32_t getObjectNumHi() const;
+        uint32_t getObjectNumLo() const;
         bool isDurable() const { return getSequence() == 0; }
-        void setValue(uint64_t f, uint64_t s) { first = f; second = s; }
+        void setValue(uint64_t f, uint64_t s) { first = f; second = s; agent = 0; }
 
         bool operator==(const ObjectIdImpl& other) const;
         bool operator<(const ObjectIdImpl& other) const;
Index: cpp/src/qmf/engine/ResilientConnection.cpp
===================================================================
--- cpp/src/qmf/engine/ResilientConnection.cpp	(revision 886044)
+++ cpp/src/qmf/engine/ResilientConnection.cpp	(working copy)
@@ -116,9 +116,9 @@
         int delayMax;
         int delayFactor;
         qpid::sys::Condition cond;
-        qpid::sys::Thread connThread;
         deque<ResilientConnectionEventImpl> eventQueue;
         set<RCSession::Ptr> sessions;
+        qpid::sys::Thread connThread;
     };
 }
 }
Index: cpp/bindings/qmf/ruby/qmf.rb
===================================================================
--- cpp/bindings/qmf/ruby/qmf.rb	(revision 886044)
+++ cpp/bindings/qmf/ruby/qmf.rb	(working copy)
@@ -472,8 +472,7 @@
     end
 
     def ==(other)
-      return (@impl.getObjectNumHi == other.impl.getObjectNumHi) &&
-        (@impl.getObjectNumLo == other.impl.getObjectNumLo)
+      return @impl == other.impl
     end
 
     def to_s
Index: cpp/bindings/qmf/python/qmf.py
===================================================================
--- cpp/bindings/qmf/python/qmf.py	(revision 886044)
+++ cpp/bindings/qmf/python/qmf.py	(working copy)
@@ -35,7 +35,6 @@
 from qmfengine import (O_EQ, O_NE, O_LT, O_LE, O_GT, O_GE, O_RE_MATCH, O_RE_NOMATCH,
                        E_NOT, E_AND, E_OR, E_XOR)
 
-
   ##==============================================================================
   ## CONNECTION
   ##==============================================================================
@@ -561,10 +560,8 @@
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__): return False
-        return (self.impl.getObjectNumHi() == other.impl.getObjectNumHi() and
-                self.impl.getObjectNumLo() == other.impl.getObjectNumLo())
+        return self.impl == other.impl
     
-    
     def __ne__(self, other):
         return not self.__eq__(other)
 
Index: cpp/bindings/qmf/tests/agent_ruby.rb
===================================================================
--- cpp/bindings/qmf/tests/agent_ruby.rb	(revision 886044)
+++ cpp/bindings/qmf/tests/agent_ruby.rb	(working copy)
@@ -83,7 +83,7 @@
 
 class App < Qmf::AgentHandler
   def get_query(context, query, userId)
-#   puts "Query: user=#{userId} context=#{context} class=#{query.class_name} object_num=#{query.object_id.object_num_low if query.object_id}"
+#    puts "Query: user=#{userId} context=#{context} class=#{query.class_name} object_num=#{query.object_id if query.object_id}"
     if query.class_name == 'parent'
         @agent.query_response(context, @parent)
     elsif query.object_id == @parent_oid
@@ -93,7 +93,7 @@
   end
 
   def method_call(context, name, object_id, args, userId)
-#    puts "Method: user=#{userId} context=#{context} method=#{name} object_num=#{object_id.object_num_low if object_id} args=#{args}"
+#    puts "Method: user=#{userId} context=#{context} method=#{name} object_num=#{object_id if object_id} args=#{args}"
     
     retCode = 0
     retText = "OK"
Index: cpp/bindings/qmf/tests/ruby_console_test.rb
===================================================================
--- cpp/bindings/qmf/tests/ruby_console_test.rb	(revision 886044)
+++ cpp/bindings/qmf/tests/ruby_console_test.rb	(working copy)
@@ -214,9 +214,21 @@
     fail("Didn't find a non-broker agent")
   end
 
+  def test_E_filter_by_object_id
+    mgmt_exchange = @qmfc.object(:class => "exchange", 'name' => "qpid.management")
+    assert(mgmt_exchange, "No Management Exchange")
+
+    bindings = @qmfc.objects(:class => "binding", 'exchangeRef' => mgmt_exchange.object_id)
+    if bindings.size == 0
+      fail("No bindings found on management exchange")
+    end
+
+    bindings.each do |binding|
+      assert_equal(binding.exchangeRef, mgmt_exchange.object_id)
+    end
+  end
+
 end
 
 app = ConsoleTest.new
 
-
-
Index: cpp/bindings/qmf/tests/python_console.py
===================================================================
--- cpp/bindings/qmf/tests/python_console.py	(revision 886044)
+++ cpp/bindings/qmf/tests/python_console.py	(working copy)
@@ -151,6 +151,21 @@
         newList = qmf.getObjects(_objectId=parent.getObjectId())
         self.assertEqual(len(newList), 1)
 
+    def test_E_filter_by_object_id(self):
+        self.startQmf()
+        qmf = self.qmf
+
+        list = qmf.getObjects(_class="exchange", name="qpid.management")
+        self.assertEqual(len(list), 1, "No Management Exchange")
+        mgmt_exchange = list[0]
+
+        bindings = qmf.getObjects(_class="binding", exchangeRef=mgmt_exchange.getObjectId())
+        if len(bindings) == 0:
+            self.fail("No bindings found on management exchange")
+
+        for binding in bindings:
+            self.assertEqual(binding.exchangeRef, mgmt_exchange.getObjectId())
+
     def getProperty(self, msg, name):
         for h in msg.headers:
             if hasattr(h, name): return getattr(h, name)


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- qpidc.spec	3 Nov 2009 16:34:18 -0000	1.96
+++ qpidc.spec	2 Dec 2009 22:40:41 -0000	1.97
@@ -12,7 +12,7 @@
 
 Name:           qpidc
 Version:        0.5.%{qpid_svnrev}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -22,6 +22,7 @@ Source1:	rhm-0.5.%{rhm_svnrev}.tar.gz
 Source2:	qpidd.pp
 Patch0:		so_number.patch
 Patch1:		qmf.patch
+Patch2:		bz538355.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -245,6 +246,7 @@ exit 0
 %setup -T -D -b 1
 %patch0
 %patch1
+%patch2
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 
@@ -521,6 +523,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Wed Dec  2 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-3
+- Patch for BZ538355
+
 * Tue Nov  3 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-2
 - Add patch for qmf fixes
 



From maxamillion at fedoraproject.org  Wed Dec  2 22:42:40 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed,  2 Dec 2009 22:42:40 +0000 (UTC)
Subject: File midori-0.2.1.tar.bz2 uploaded to lookaside cache by maxamillion
Message-ID: <20091202224240.601C310F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for midori:

3cee94c9a22316504a3ba99bc92e0245  midori-0.2.1.tar.bz2



From maxamillion at fedoraproject.org  Wed Dec  2 22:43:17 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed,  2 Dec 2009 22:43:17 +0000 (UTC)
Subject: rpms/midori/devel .cvsignore,1.15,1.16 sources,1.15,1.16
Message-ID: <20091202224317.6D57011C0095@cvs1.fedora.phx.redhat.com>

Author: maxamillion

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

Modified Files:
	.cvsignore sources 
Log Message:
now with new source goodness




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/midori/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	20 Oct 2009 15:47:33 -0000	1.15
+++ .cvsignore	2 Dec 2009 22:43:17 -0000	1.16
@@ -1 +1 @@
-midori-0.2.0.tar.bz2
+midori-0.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/midori/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	20 Oct 2009 15:47:34 -0000	1.15
+++ sources	2 Dec 2009 22:43:17 -0000	1.16
@@ -1 +1 @@
-805e2e59a93a0a4b7652d6547b2bd923  midori-0.2.0.tar.bz2
+3cee94c9a22316504a3ba99bc92e0245  midori-0.2.1.tar.bz2



From jakub at fedoraproject.org  Wed Dec  2 22:55:27 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  2 Dec 2009 22:55:27 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-CVE-2009-3736.patch, NONE, 1.1 gcc.spec, 1.94,
	1.95
Message-ID: <20091202225527.57E4811C0095@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29193

Modified Files:
	gcc.spec 
Added Files:
	gcc44-CVE-2009-3736.patch 
Log Message:
4.4.2-13

gcc44-CVE-2009-3736.patch:
 acinclude.m4 |    2 +-
 configure    |    8 ++++----
 ltdl.c       |   23 +++++++++++++++--------
 3 files changed, 20 insertions(+), 13 deletions(-)

--- NEW FILE gcc44-CVE-2009-3736.patch ---
2009-12-02  Jakub Jelinek  <jakub at redhat.com>

	* acinclude.m4: Regenerated to pick:
	2007-06-22 Ralf Wildenhues <Ralf.Wildenhues at gmx.de>

	* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]:
	Ignore lines in ld.so.conf starting with 'hwcap '.

	* configure: Regenerated.

	2009-11-24  Peter O'Gorman  <peter at pogma.com>

	Backport of libltdl changes from the 2.26b release.
	* ltdl.c: Backport changes.

--- libjava/libltdl/ltdl.c.jj	2008-09-05 12:57:53.000000000 +0200
+++ libjava/libltdl/ltdl.c	2009-12-02 18:19:11.000000000 +0100
@@ -2175,7 +2175,8 @@ static	int	trim		      LT_PARAMS((char *
 static	int	try_dlopen	      LT_PARAMS((lt_dlhandle *handle,
 						 const char *filename));
 static	int	tryall_dlopen	      LT_PARAMS((lt_dlhandle *handle,
-						 const char *filename));
+						 const char *filename,
+						 const char * useloader));
 static	int	unload_deplibs	      LT_PARAMS((lt_dlhandle handle));
 static	int	lt_argz_insert	      LT_PARAMS((char **pargz,
 						 size_t *pargz_len,
@@ -2361,9 +2362,10 @@ lt_dlexit ()
 }
 
 static int
-tryall_dlopen (handle, filename)
+tryall_dlopen (handle, filename, useloader)
      lt_dlhandle *handle;
      const char *filename;
+     const char *useloader;
 {
   lt_dlhandle	 cur;
   lt_dlloader   *loader;
@@ -2430,6 +2432,11 @@ tryall_dlopen (handle, filename)
 
   while (loader)
     {
+      if (useloader && strcmp(loader->loader_name, useloader))
+	{
+	  loader = loader->next;
+	  continue;
+	}
       lt_user_data data = loader->dlloader_data;
 
       cur->module = loader->module_open (data, filename);
@@ -2499,7 +2506,7 @@ tryall_dlopen_module (handle, prefix, di
       error += tryall_dlopen_module (handle,
 				     (const char *) 0, prefix, filename);
     }
-  else if (tryall_dlopen (handle, filename) != 0)
+  else if (tryall_dlopen (handle, filename, NULL) != 0)
     {
       ++error;
     }
@@ -2520,7 +2527,7 @@ find_module (handle, dir, libdir, dlname
   /* Try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available.  */
-  if (old_name && tryall_dlopen (handle, old_name) == 0)
+  if (old_name && tryall_dlopen (handle, old_name, "dlpreload") == 0)
     {
       return 0;
     }
@@ -2784,7 +2791,7 @@ find_handle_callback (filename, data, ig
 
   /* Try to dlopen the file, but do not continue searching in any
      case.  */
-  if (tryall_dlopen (handle, filename) != 0)
+  if (tryall_dlopen (handle, filename,NULL) != 0)
     *handle = 0;
 
   return 1;
@@ -3072,7 +3079,7 @@ try_dlopen (phandle, filename)
       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
       LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
 
-      if (tryall_dlopen (&newhandle, 0) != 0)
+      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
 	{
 	  LT_DLFREE (*phandle);
 	  return 1;
@@ -3194,7 +3201,7 @@ try_dlopen (phandle, filename)
 	    }
 #endif
 	}
-      if (!file)
+      else
 	{
 	  file = fopen (filename, LT_READTEXT_MODE);
 	}
@@ -3378,7 +3385,7 @@ try_dlopen (phandle, filename)
 #endif
 		   )))
 	{
-          if (tryall_dlopen (&newhandle, filename) != 0)
+          if (tryall_dlopen (&newhandle, filename, NULL) != 0)
             {
               newhandle = NULL;
             }
--- libjava/libltdl/acinclude.m4.jj	2008-09-05 12:57:53.000000000 +0200
+++ libjava/libltdl/acinclude.m4	2009-12-02 19:47:40.000000000 +0100
@@ -1527,7 +1527,7 @@ linux*)
 
   # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
--- libjava/libltdl/configure.jj	2009-09-01 11:05:06.000000000 +0200
+++ libjava/libltdl/configure	2009-12-02 19:50:23.000000000 +0100
@@ -9160,7 +9160,7 @@ linux*)
 
   # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -12576,7 +12576,7 @@ linux*)
 
   # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -15489,7 +15489,7 @@ linux*)
 
   # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -17916,7 +17916,7 @@ linux*)
 
   # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- gcc.spec	2 Dec 2009 14:58:27 -0000	1.94
+++ gcc.spec	2 Dec 2009 22:55:26 -0000	1.95
@@ -3,7 +3,7 @@
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 12
+%global gcc_release 13
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,6 +161,7 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
+Patch20: gcc44-CVE-2009-3736.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -466,6 +467,7 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
+%patch20 -p0 -b .CVE-2009-3736~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1849,6 +1851,9 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-13
+- fix security issues in libltdl bundled within libgcj (CVE-2009-3736)
+
 * Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-12
 - update from gcc-4_4-branch
   - PRs c++/42234, fortran/41278, fortran/41807, fortran/42162, target/42113,



From maxamillion at fedoraproject.org  Wed Dec  2 22:57:09 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed,  2 Dec 2009 22:57:09 +0000 (UTC)
Subject: rpms/midori/F-12 .cvsignore, 1.15, 1.16 midori.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <20091202225709.8A10611C0095@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29338

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update Fedora 12 to lastest upstream release (0.2.1)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/midori/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	20 Oct 2009 16:01:43 -0000	1.15
+++ .cvsignore	2 Dec 2009 22:57:09 -0000	1.16
@@ -1 +1 @@
-midori-0.2.0.tar.bz2
+midori-0.2.1.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/F-12/midori.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- midori.spec	20 Oct 2009 16:01:43 -0000	1.28
+++ midori.spec	2 Dec 2009 22:57:09 -0000	1.29
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.2.0
+Version:	0.2.1
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -103,6 +103,15 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.1-1
+- Update to new upstream release (0.2.1): Fix Mouse Gestures to work after 
+  activation, Explicitly link to X11 to support gold, Implement various Hildon 
+  specific features, Hide the navigationbar in fullscreen, Implement permanent 
+  storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
+  Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
+  Introduce the Tab History List extension, Load icons laziy at startup to speed  up startup, Introduce a Web Cache extension, Refactor and tweak the 
+  Preferences dialogue, Implement combos to choose external applications
+
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1
 - Update to new upstream release (0.2.0): Drag-scroll on touchscreen devices,
   Speed Dial fixes, faster AdBlock (for all WebKitGTK+ versions), updated DNS


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/midori/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	20 Oct 2009 16:01:43 -0000	1.15
+++ sources	2 Dec 2009 22:57:09 -0000	1.16
@@ -1 +1 @@
-805e2e59a93a0a4b7652d6547b2bd923  midori-0.2.0.tar.bz2
+3cee94c9a22316504a3ba99bc92e0245  midori-0.2.1.tar.bz2



From airlied at fedoraproject.org  Wed Dec  2 23:02:45 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  2 Dec 2009 23:02:45 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-radeon-rv410-test-fix.patch, NONE,
	1.1 kernel.spec, 1.1946, 1.1947
Message-ID: <20091202230245.E6FF911C0095@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-rv410-test-fix.patch 
Log Message:
* Thu Dec 03 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-161
- rv410 LVDS on resume test fix from AMD (#541562)


drm-radeon-rv410-test-fix.patch:
 atombios_crtc.c          |    4 ----
 radeon_legacy_encoders.c |    4 ----
 2 files changed, 8 deletions(-)

--- NEW FILE drm-radeon-rv410-test-fix.patch ---
>From 5eecd2f0071edd335977b1ce15fd73b804f17e3c Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher at gmail.com>
Date: Wed, 2 Dec 2009 17:56:41 -0500
Subject: [PATCH] drm/radeon/kms: further r4xx lvds fixes

- Let the driver calculate the ref div
- Use the driver programmed pll dividers

Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
---
 drivers/gpu/drm/radeon/atombios_crtc.c          |    4 ----
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c |    3 ---
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 89ac438..7a8cd93 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -457,10 +457,6 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 				if (encoder->encoder_type !=
 				    DRM_MODE_ENCODER_DAC)
 					pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
-				if (!ASIC_IS_AVIVO(rdev)
-				    && (encoder->encoder_type ==
-					DRM_MODE_ENCODER_LVDS))
-					pll_flags |= RADEON_PLL_USE_REF_DIV;
 			}
 			radeon_encoder = to_radeon_encoder(encoder);
 			break;
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index df00515..7c7c009 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -181,9 +181,6 @@ static void radeon_legacy_lvds_mode_set(struct drm_encoder *encoder,
 	WREG32(RADEON_LVDS_PLL_CNTL, lvds_pll_cntl);
 	WREG32(RADEON_LVDS_SS_GEN_CNTL, lvds_ss_gen_cntl);
 
-	if (rdev->family == CHIP_RV410)
-		WREG32(RADEON_CLOCK_CNTL_INDEX, 0);
-
 	if (rdev->is_atom_bios)
 		radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id);
 	else
-- 
1.5.6.3



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1946
retrieving revision 1.1947
diff -u -p -r1.1946 -r1.1947
--- kernel.spec	2 Dec 2009 20:51:22 -0000	1.1946
+++ kernel.spec	2 Dec 2009 23:02:45 -0000	1.1947
@@ -726,6 +726,7 @@ Patch1834: drm-edid-header-fixup.patch
 Patch1835: drm-default-mode.patch
 Patch1837: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 Patch1839: drm-radeon-misc-fixes.patch
+Patch1840: drm-radeon-rv410-test-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1427,6 +1428,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 ApplyPatch kms-offb-handoff.patch
 ApplyPatch drm-next-b390f944.patch
 ApplyPatch drm-radeon-misc-fixes.patch
+ApplyPatch drm-radeon-rv410-test-fix.patch
 ApplyPatch drm-conservative-fallback-modes.patch
 ApplyPatch drm-edid-retry.patch
 ApplyPatch drm-edid-header-fixup.patch
@@ -2159,6 +2161,9 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 03 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-161
+- rv410 LVDS on resume test fix from AMD (#541562)
+
 * Wed Dec 02 2009 John W. Linville <linville at redhat.com> 2.6.31.6-160
 - ath9k: add fixes suggested by upstream maintainer
 



From maxamillion at fedoraproject.org  Wed Dec  2 23:06:18 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed,  2 Dec 2009 23:06:18 +0000 (UTC)
Subject: rpms/midori/F-12 midori.spec,1.29,1.30
Message-ID: <20091202230618.95AF911C0095@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31742

Modified Files:
	midori.spec 
Log Message:
fixed formatting error in my last changelog




Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/F-12/midori.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- midori.spec	2 Dec 2009 22:57:09 -0000	1.29
+++ midori.spec	2 Dec 2009 23:06:18 -0000	1.30
@@ -109,7 +109,8 @@ fi
   specific features, Hide the navigationbar in fullscreen, Implement permanent 
   storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
   Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
-  Introduce the Tab History List extension, Load icons laziy at startup to speed  up startup, Introduce a Web Cache extension, Refactor and tweak the 
+  Introduce the Tab History List extension, Load icons laziy at startup to speed  
+  up startup, Introduce a Web Cache extension, Refactor and tweak the 
   Preferences dialogue, Implement combos to choose external applications
 
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1



From maxamillion at fedoraproject.org  Wed Dec  2 23:07:02 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed,  2 Dec 2009 23:07:02 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.30,1.31
Message-ID: <20091202230702.8498A11C0095@cvs1.fedora.phx.redhat.com>

Author: maxamillion

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

Modified Files:
	midori.spec 
Log Message:
corrected typo in my last changelog




Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/devel/midori.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- midori.spec	2 Dec 2009 22:37:30 -0000	1.30
+++ midori.spec	2 Dec 2009 23:07:02 -0000	1.31
@@ -109,7 +109,8 @@ fi
   specific features, Hide the navigationbar in fullscreen, Implement permanent 
   storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
   Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
-  Introduce the Tab History List extension, Load icons laziy at startup to speed  up startup, Introduce a Web Cache extension, Refactor and tweak the 
+  Introduce the Tab History List extension, Load icons laziy at startup to speed 
+  up startup, Introduce a Web Cache extension, Refactor and tweak the 
   Preferences dialogue, Implement combos to choose external applications
 
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1



From mbooth at fedoraproject.org  Wed Dec  2 23:20:51 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Wed,  2 Dec 2009 23:20:51 +0000 (UTC)
Subject: rpms/jakarta-commons-modeler/devel pom.xml, NONE,
	1.1 jakarta-commons-modeler.spec, 1.41, 1.42 sources, 1.3,
	1.4 .cvsignore, 1.5,
	1.6 jakarta-commons-modeler.build.properties.default.patch, 1.2,
	NONE jakarta-commons-modeler.build.xml.patch, 1.2, NONE
Message-ID: <20091202232052.2238D11C0095@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/jakarta-commons-modeler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2044/jakarta-commons-modeler/devel

Modified Files:
	jakarta-commons-modeler.spec sources .cvsignore 
Added Files:
	pom.xml 
Removed Files:
	jakarta-commons-modeler.build.properties.default.patch 
	jakarta-commons-modeler.build.xml.patch 
Log Message:
* Wed Dec 2 2009 Mat Booth <fedora at matbooth.co.uk> - 2.0.1-1
- Update to 2.0.1
- Rewrite spec file to build using upstream-preferred maven instead of ant
- Drop patches to build script
- Now with OSGi manifest (comes free with the maven build)
- Now installs pom and fettles the maven dep-map, see RHBZ #542730
- Fix javadoc package requires


--- NEW FILE pom.xml ---
<?xml version="1.0"?>
<!--
   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

       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.
-->
<project
    xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.commons</groupId>
    <artifactId>commons-parent</artifactId>
    <version>11</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-modeler</groupId>
  <artifactId>commons-modeler</artifactId>
  <version>2.0.1</version>
  <name>Commons Modeler</name>
  <inceptionYear>2002</inceptionYear>
  <description>
      Commons Modeler makes the process of setting up JMX (Java
      Management Extensions) MBeans easier by configuring the required meta
      data using an XML descriptor. In addition, Modeler provides a factory
      mechanism to create the actual Model MBean instances. 
  </description>
  <url>http://commons.apache.org/modeler/</url>

  <issueManagement>
    <system>jira</system>
    <url>http://issues.apache.org/jira/browse/MODELER</url>
  </issueManagement>

  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/modeler/trunk</connection>
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/modeler/trunk</developerConnection>
    <url>http://svn.apache.org/viewvc/commons/proper/modeler/trunk</url>
  </scm>

  <developers>
    <developer>
      <name>Craig McClanahan</name>
      <id>craigmcc</id>
      <email>craigmcc at apache.org</email>
      <organization>Apache</organization>
    </developer>

    <developer>
      <name>Yoav Shapira</name>
      <id>yoavs</id>
      <email>yoavs at apache.org</email>
      <organization>Apache</organization>
    </developer>

    <developer>
      <name>Bill Barker</name>
      <id>billbarker</id>
      <email>billbarker at apache.org</email>
      <organization>Apache</organization>
    </developer>

    <developer>
      <name>Davanum Srinivas</name>
      <id>dims</id>
      <email>dims at apache.org</email>
      <organization>Apache</organization>
    </developer>
  </developers>

  <dependencies>
    <dependency>
      <groupId>commons-digester</groupId>
      <artifactId>commons-digester</artifactId>
      <version>1.4.1</version>
    </dependency>

    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging-api</artifactId>
      <version>1.0.4</version>
    </dependency>

    <dependency>
      <groupId>mx4j</groupId>
      <artifactId>mx4j-jmx</artifactId>
      <version>2.1.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>2.0.2</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.5</version>
      <optional>true</optional>
    </dependency>
  </dependencies>

  <properties>
    <commons.componentid>modeler</commons.componentid>
    <commons.release.version>2.0.1</commons.release.version>
    <commons.binary.suffix></commons.binary.suffix>
    <commons.jira.id>MODELER</commons.jira.id>
    <commons.jira.pid>12310486</commons.jira.pid>
  </properties> 

  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <directory>.</directory>
        <targetPath>META-INF</targetPath>
        <includes>
          <include>NOTICE.txt</include>
          <include>LICENSE.txt</include>
        </includes>
      </resource>
      <resource>
        <directory>src/java/org/apache/commons/modeler/ant</directory>
        <targetPath>META-INF</targetPath>
        <includes>
          <include>ant.properties</include>
        </includes>
      </resource>
      <resource>
        <directory>src/java</directory>
        <targetPath>META-INF</targetPath>
        <includes>
          <include>**/ant.properties</include>
          <include>**/mbeans-descriptors.dtd</include>
        </includes>
      </resource>
    </resources>

    <testResources>
      <testResource>
        <directory>src/test</directory>
        <filtering>false</filtering>
        <includes>
          <include>**/*.xml</include>
        </includes>
      </testResource>
    </testResources>

    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>**/*TestCase.java</include>
          </includes>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-assembly-plugin</artifactId>
        <configuration>
          <descriptors>
            <descriptor>src/assembly/bin.xml</descriptor>
            <descriptor>src/assembly/src.xml</descriptor>
          </descriptors>
          <tarLongFileMode>gnu</tarLongFileMode>
        </configuration>
      </plugin>
    </plugins>
  </build>

  <reporting>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-changes-plugin</artifactId>
        <version>2.0</version>
        <configuration>
          <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
          <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
        </configuration>
        <reportSets>
          <reportSet>
            <reports>
               <report>changes-report</report>
            </reports>
          </reportSet>
        </reportSets>
      </plugin>
    </plugins>
  </reporting>

</project>


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- jakarta-commons-modeler.spec	25 Jul 2009 03:51:27 -0000	1.41
+++ jakarta-commons-modeler.spec	2 Dec 2009 23:20:50 -0000	1.42
@@ -1,183 +1,145 @@
-# Copyright (c) 2000-2007, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%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 base_name       modeler
-%define short_name      commons-%{base_name}
-
-Name:       jakarta-%{short_name}
-Epoch:      0
-Version:    2.0
-Release:    6.3%{?dist}
-Summary:    Model MBeans utilty classes
-Group:      Development/Libraries/Java
-License:    ASL 2.0
-Url:        http://jakarta.apache.org/commons/%{base_name}
-Source0:    http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/modeler/source/commons-modeler-2.0-src.tar.gz
-Patch0:     %{name}.build.properties.default.patch
-Patch1:     %{name}.build.xml.patch
-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
-%endif
-BuildRequires:  ant
-BuildRequires:  findutils
-BuildRequires:  jakarta-commons-beanutils >= 0:1.3
-BuildRequires:  jakarta-commons-collections >= 0:2.0
-BuildRequires:  jakarta-commons-digester >= 0:1.2
-BuildRequires:  jakarta-commons-logging >= 0:1.0
-BuildRequires:  jaxp_parser_impl
-BuildRequires:  jaxp_transform_impl
-BuildRequires:  jmxri
-BuildRequires:  junit >= 0:3.7
-BuildRequires:  xml-commons-apis >= 1.3
-Requires:       jakarta-commons-beanutils >= 0:1.3
-Requires:       jakarta-commons-collections >= 0:2.0
-Requires:       jakarta-commons-digester >= 0:1.2
-Requires:       jakarta-commons-logging >= 0:1.0
-Requires:       jaxp_parser_impl
-Requires:       jaxp_transform_impl
-Requires:       jmxri
-Requires:       xml-commons-apis
-%if ! %{gcj_support}
-BuildArch:      noarch
-%endif
-Provides: %{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
+%global short_name commons-modeler
+
+# TODO - Drop "jakarta-" from the package name
+Name:          jakarta-%{short_name}
+Version:       2.0.1
+Release:       1%{?dist}
+Summary:       Model MBeans utility classes
+Group:         Development/Libraries/Java
+License:       ASL 2.0
+URL:           http://commons.apache.org/modeler/
+
+Source0:       http://archive.apache.org/dist/commons/modeler/source/%{short_name}-%{version}-src.tar.gz
+
+# a maven2 pom is not supplied, so supply one based on the one from source control:
+#  $ svn export -r 678495 http://svn.apache.org/repos/asf/commons/proper/modeler/trunk/pom.xml
+Source1:       pom.xml
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:     noarch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: jakarta-commons-beanutils >= 1.6
+BuildRequires: jakarta-commons-collections >= 2.1
+BuildRequires: jakarta-commons-digester >= 1.4.1
+BuildRequires: jakarta-commons-logging >= 1.0.4
+BuildRequires: mx4j >= 2.1.1
+BuildRequires: xml-commons-apis
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-idea
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+Requires:      java
+Requires:      jpackage-utils
+Requires:      jakarta-commons-beanutils >= 1.6
+Requires:      jakarta-commons-collections >= 2.1
+Requires:      jakarta-commons-digester >= 1.4.1
+Requires:      jakarta-commons-logging >= 1.0.4
+Requires:      mx4j >= 2.1.1
+Requires:      xml-commons-apis
+
+Provides:      %{short_name} = %{version}-%{release}
+Obsoletes:     %{short_name} < %{version}-%{release}
 
 %description
-The Modeler project shall create and maintain a set of Java
-classes to provide support for configuring and instantiating Model
-MBeans, plus unit tests and small examples of using these facilities
-to instrument Java classes with Model MBean support.
+Commons Modeler makes the process of setting up JMX (Java Management
+Extensions) MBeans easier by configuring the required meta data using an
+XML descriptor. In addition, Modeler provides a factory mechanism to
+create the actual Model MBean instances.
 
 %package javadoc
-Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Summary:       Javadocs for %{name}
+Group:         Development/Documentation
+Requires:      %{name} = %{version}-%{release}
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-%patch0
-%patch1  
-# remove all binary files
-find . \( -name "*.jar" -o -name "*.class" -o -name "*.zip" \) \
-    | xargs %{__rm} -f
-
-
-# fix eol encodings
-%{__sed} -i 's/\r//' xdocs/downloads.xml
-%{__sed} -i 's/\r//' xdocs/cvs-usage.xml
-%{__sed} -i 's/\r//' xdocs/issue-tracking.xml
-%{__sed} -i 's/\r//' LICENSE.txt
-%{__sed} -i 's/\r//' xdocs/navigation.xml
-%{__sed} -i 's/\r//' xdocs/style/project.css
-%{__sed} -i 's/\r//' xdocs/index.xml
-%{__sed} -i 's/\r//' xdocs/building.xml
-%{__sed} -i 's/\r//' NOTICE.txt
-%{__sed} -i 's/\r//' RELEASE-NOTES.txt
+
+cp -p %{SOURCE1} pom.xml
 
 %build
-export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl jmxri junit commons-beanutils commons-collections commons-digester commons-logging)
-%{ant} dist
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+# TODO: remove the hack below when 543686 is fixed
+mkdir -p $MAVEN_REPO_LOCAL/mx4j/mx4j-jmx/2.1.1
+pushd $MAVEN_REPO_LOCAL/mx4j/mx4j-jmx/2.1.1
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar mx4j-jmx-2.1.1.jar
+cat <<HEREDOC > mx4j-jmx-2.1.1.pom
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>mx4j</groupId>
+  <artifactId>mx4j-jmx</artifactId>
+  <version>2.1.1</version>
+</project>
+HEREDOC
+popd
+# TODO: remove the hack above when 543686 is fixed
+
+# TODO: disable tests for now because they need internet access -- they run fine locally
+mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven.test.skip=true install javadoc:javadoc
 
 %install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
+
 # jars
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -a dist/%{short_name}.jar \
-    %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(
-    cd %{buildroot}%{_javadir}
-    for jar in *-%{version}*; do
-        %{__ln_s} ${jar} `echo $jar | %{__sed} "s|jakarta-||g"`
-    done
-)
-(
-    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}
-%{__cp} -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(
-    cd %{buildroot}%{_javadocdir}
-    %{__ln_s} %{name}-%{version} %{name}
-)
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+install -pD -T target/%{short_name}-%{version}.jar \
+  %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# javadocs
+mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+
+# pom
+install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
-%defattr(0644,root,root,0755)
-%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES*
+%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 2 2009 Mat Booth <fedora at matbooth.co.uk> - 2.0.1-1
+- Update to 2.0.1
+- Rewrite spec file to build using upstream-preferred maven instead of ant
+- Drop patches to build script
+- Now with OSGi manifest (comes free with the maven build)
+- Now installs pom and fettles the maven dep-map, see RHBZ #542730
+- Fix javadoc package requires
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0-6.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Apr 2007 00:25:06 -0000	1.3
+++ sources	2 Dec 2009 23:20:50 -0000	1.4
@@ -1 +1 @@
-43983c66113ddaa9880e4a7ea7d38db4  commons-modeler-2.0-src.tar.gz
+9ad2dc25be91c38b93346653736856dd  commons-modeler-2.0.1-src.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Apr 2007 00:25:06 -0000	1.5
+++ .cvsignore	2 Dec 2009 23:20:50 -0000	1.6
@@ -1 +1 @@
-commons-modeler-2.0-src.tar.gz
+commons-modeler-2.0.1-src.tar.gz


--- jakarta-commons-modeler.build.properties.default.patch DELETED ---


--- jakarta-commons-modeler.build.xml.patch DELETED ---



From kaitlin at fedoraproject.org  Wed Dec  2 23:30:12 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Wed,  2 Dec 2009 23:30:12 +0000 (UTC)
Subject: File libvirt-cim-0.5.8.tar.gz uploaded to lookaside cache by kaitlin
Message-ID: <20091202233012.1F70E10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libvirt-cim:

e68abe5c52c873f9d852f712915b5985  libvirt-cim-0.5.8.tar.gz



From kaitlin at fedoraproject.org  Wed Dec  2 23:32:06 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Wed,  2 Dec 2009 23:32:06 +0000 (UTC)
Subject: rpms/libvirt-cim/devel .cvsignore,1.15,1.16 sources,1.17,1.18
Message-ID: <20091202233206.60DE011C0095@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3992

Modified Files:
	.cvsignore sources 
Log Message:
Add tarball for release 0.5.8.  Also make changes to spec file for new release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	5 Oct 2009 22:45:10 -0000	1.15
+++ .cvsignore	2 Dec 2009 23:32:05 -0000	1.16
@@ -3,3 +3,4 @@ libvirt-cim-0.5.4.tar.gz
 libvirt-cim-0.5.5.tar.gz
 libvirt-cim-0.5.6.tar.gz
 libvirt-cim-0.5.7.tar.gz
+libvirt-cim-0.5.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	5 Oct 2009 22:45:10 -0000	1.17
+++ sources	2 Dec 2009 23:32:05 -0000	1.18
@@ -3,3 +3,4 @@
 dec0c3647ea3aa713022b31576e0b202  libvirt-cim-0.5.5.tar.gz
 c91674b76dfabe484d2a1b88825bc04f  libvirt-cim-0.5.6.tar.gz
 74003d67605071f63d3c5cb14fd0d676  libvirt-cim-0.5.7.tar.gz
+e68abe5c52c873f9d852f712915b5985  libvirt-cim-0.5.8.tar.gz



From kaitlin at fedoraproject.org  Wed Dec  2 23:34:04 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Wed,  2 Dec 2009 23:34:04 +0000 (UTC)
Subject: rpms/libvirt-cim/devel libvirt-cim.spec,1.29,1.30
Message-ID: <20091202233404.6025C11C0095@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4548

Modified Files:
	libvirt-cim.spec 
Log Message:
Get proper spec file changes this time.




Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libvirt-cim.spec	5 Oct 2009 22:45:10 -0000	1.29
+++ libvirt-cim.spec	2 Dec 2009 23:34:04 -0000	1.30
@@ -2,7 +2,7 @@
 
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
-Version: 0.5.7
+Version: 0.5.8
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
@@ -14,9 +14,8 @@ Requires: tog-pegasus 
 BuildRequires: libcmpiutil >= 0.4
 BuildRequires: tog-pegasus-devel
 BuildRequires: libvirt-devel >= 0.3.2
-BuildRequires: e2fsprogs-devel
+BuildRequires: libuuid-devel 
 BuildRequires: libxml2-devel
-BuildRequires: libuuid-devel
 BuildRequires: libcmpiutil-devel
 BuildConflicts: sblim-cmpi-devel
 
@@ -61,6 +60,9 @@ rm -fr $RPM_BUILD_ROOT
 %define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration
 %define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile,AllocationCapabilities}.mof
 
+%define PGINTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration
+%define PGINTEROP_MOF %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.mof
+
 %define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,ElementConformsToProfile,HostedAccessPoint}.registration
 %define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof
 
@@ -88,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
         -n root/interop \
         -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
+        -n root/PG_InterOp \
+        -r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} -v >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -t pegasus \
         -n root/cimv2\
         -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
 
@@ -95,12 +100,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
 	-n root/virt \
 	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
-%{_datadir}/%{name}/provider-register.sh -t pegasus \
-        -n root/interop \
-        -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
-%{_datadir}/%{name}/provider-register.sh -t pegasus \
-        -n root/cimv2\
-        -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -d -t pegasus \
+        -n root/PG_InterOp \
+        -r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} >/dev/null 2>&1 || true
 
 %postun -p /sbin/ldconfig
 
@@ -122,7 +124,10 @@ rm -fr $RPM_BUILD_ROOT
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
-* Tue Oct 5 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.7-1
+* Wed Dec 02 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.8-1
+- Updated to latest upstream source
+
+* Tue Oct 05 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.7-1
 - Updated to latest upstream source
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.6-2



From mschwendt at fedoraproject.org  Wed Dec  2 23:35:49 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  2 Dec 2009 23:35:49 +0000 (UTC)
Subject: rpms/audacious-plugins/F-11 audacious-plugins-1.5.1-neon.patch, NONE,
	1.1 audacious-plugins.spec, 1.47, 1.48
Message-ID: <20091202233549.8A65111C02BB@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5144/F-11

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-neon.patch 
Log Message:
* Thu Dec  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-19
- Fix truncated track name for streaming mp3 in neon.c (#543050).


audacious-plugins-1.5.1-neon.patch:
 neon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-plugins-1.5.1-neon.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-orig/src/neon/neon.c audacious-plugins-fedora-1.5.1-neon/src/neon/neon.c
--- audacious-plugins-fedora-1.5.1-orig/src/neon/neon.c	2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-neon/src/neon/neon.c	2009-12-03 00:16:58.264250701 +0100
@@ -273,7 +273,7 @@
                 /*
                  * Reading value
                  */
-                if ('\'' == *p) {
+                if ('\'' == *p && ';' == *(p+1)) {
                     /*
                      * End of value
                      */


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- audacious-plugins.spec	17 Nov 2009 21:51:47 -0000	1.47
+++ audacious-plugins.spec	2 Dec 2009 23:35:49 -0000	1.48
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -31,6 +31,7 @@ Patch10:        audacious-plugins-1.5.1-
 Patch11:        audacious-plugins-1.5.1-sndfile-playfix.patch
 Patch12:        audacious-plugins-1.5.1-modplug.patch
 Patch13:        audacious-plugins-1.5.1-musepack.patch
+Patch14:        audacious-plugins-1.5.1-neon.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -188,6 +189,7 @@ vortex compressed files.
 %patch11 -p1 -b .sndfile-playfix
 %patch12 -p1 -b .modplug
 %patch13 -p1 -b .musepack
+%patch14 -p1 -b .neon
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -287,6 +289,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Dec  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-19
+- Fix truncated track name for streaming mp3 in neon.c (#543050).
+
 * Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-18
 - Corrupt musepack files were able to crash Audacious.
 



From mschwendt at fedoraproject.org  Wed Dec  2 23:35:49 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  2 Dec 2009 23:35:49 +0000 (UTC)
Subject: rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-neon.patch, NONE,
	1.1 audacious-plugins.spec, 1.45, 1.46
Message-ID: <20091202233549.7BFB211C0095@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5144/F-10

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-neon.patch 
Log Message:
* Thu Dec  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-19
- Fix truncated track name for streaming mp3 in neon.c (#543050).


audacious-plugins-1.5.1-neon.patch:
 neon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-plugins-1.5.1-neon.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-orig/src/neon/neon.c audacious-plugins-fedora-1.5.1-neon/src/neon/neon.c
--- audacious-plugins-fedora-1.5.1-orig/src/neon/neon.c	2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-neon/src/neon/neon.c	2009-12-03 00:16:58.264250701 +0100
@@ -273,7 +273,7 @@
                 /*
                  * Reading value
                  */
-                if ('\'' == *p) {
+                if ('\'' == *p && ';' == *(p+1)) {
                     /*
                      * End of value
                      */


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- audacious-plugins.spec	17 Nov 2009 21:52:10 -0000	1.45
+++ audacious-plugins.spec	2 Dec 2009 23:35:49 -0000	1.46
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -31,6 +31,7 @@ Patch10:        audacious-plugins-1.5.1-
 Patch11:        audacious-plugins-1.5.1-sndfile-playfix.patch
 Patch12:        audacious-plugins-1.5.1-modplug.patch
 Patch13:        audacious-plugins-1.5.1-musepack.patch
+Patch14:        audacious-plugins-1.5.1-neon.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -188,6 +189,7 @@ vortex compressed files.
 %patch11 -p1 -b .sndfile-playfix
 %patch12 -p1 -b .modplug
 %patch13 -p1 -b .musepack
+%patch14 -p1 -b .neon
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -287,6 +289,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Dec  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-19
+- Fix truncated track name for streaming mp3 in neon.c (#543050).
+
 * Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-18
 - Corrupt musepack files were able to crash Audacious.
 



From mschwendt at fedoraproject.org  Wed Dec  2 23:49:52 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  2 Dec 2009 23:49:52 +0000 (UTC)
Subject: rpms/audacious-plugins/F-11 audacious-plugins-1.5.1-jack.patch, NONE,
	1.1 audacious-plugins.spec, 1.48, 1.49
Message-ID: <20091202234952.A7EFF11C0095@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8223/F-11

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-jack.patch 
Log Message:
merge the build-fix for the JACK upgrade

audacious-plugins-1.5.1-jack.patch:
 jack.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-jack.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-orig/src/jack/jack.c audacious-plugins-fedora-1.5.1-jack/src/jack/jack.c
--- audacious-plugins-fedora-1.5.1-orig/src/jack/jack.c	2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-jack/src/jack/jack.c	2009-12-03 00:45:31.956608364 +0100
@@ -219,7 +219,7 @@
 
 
 /* Return the amount of data that can be written to the device */
-gint jack_free(void)
+gint audacious_jack_free(void)
 {
   unsigned long return_val = JACK_GetBytesFreeSpace(driver);
   unsigned long tmp;
@@ -479,7 +479,7 @@
 	.close_audio = jack_close,
 	.flush = jack_flush,
 	.pause = jack_pause,
-	.buffer_free = jack_free,
+	.buffer_free = audacious_jack_free,
 	.buffer_playing = jack_playing,
 	.output_time = jack_get_output_time,
 	.written_time = jack_get_written_time,


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- audacious-plugins.spec	2 Dec 2009 23:35:49 -0000	1.48
+++ audacious-plugins.spec	2 Dec 2009 23:49:51 -0000	1.49
@@ -32,6 +32,7 @@ Patch11:        audacious-plugins-1.5.1-
 Patch12:        audacious-plugins-1.5.1-modplug.patch
 Patch13:        audacious-plugins-1.5.1-musepack.patch
 Patch14:        audacious-plugins-1.5.1-neon.patch
+Patch15:        audacious-plugins-1.5.1-jack.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -190,6 +191,7 @@ vortex compressed files.
 %patch12 -p1 -b .modplug
 %patch13 -p1 -b .musepack
 %patch14 -p1 -b .neon
+%patch15 -p1 -b .jack_free
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -291,6 +293,7 @@ update-desktop-database &> /dev/null || 
 %changelog
 * Thu Dec  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-19
 - Fix truncated track name for streaming mp3 in neon.c (#543050).
+- Merge jack_free redeclaration fix.
 
 * Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-18
 - Corrupt musepack files were able to crash Audacious.



From mschwendt at fedoraproject.org  Wed Dec  2 23:49:52 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  2 Dec 2009 23:49:52 +0000 (UTC)
Subject: rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-jack.patch, NONE,
	1.1 audacious-plugins.spec, 1.46, 1.47
Message-ID: <20091202234952.ABF5111C02C4@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8223/F-10

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-jack.patch 
Log Message:
merge the build-fix for the JACK upgrade

audacious-plugins-1.5.1-jack.patch:
 jack.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-jack.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-orig/src/jack/jack.c audacious-plugins-fedora-1.5.1-jack/src/jack/jack.c
--- audacious-plugins-fedora-1.5.1-orig/src/jack/jack.c	2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-jack/src/jack/jack.c	2009-12-03 00:45:31.956608364 +0100
@@ -219,7 +219,7 @@
 
 
 /* Return the amount of data that can be written to the device */
-gint jack_free(void)
+gint audacious_jack_free(void)
 {
   unsigned long return_val = JACK_GetBytesFreeSpace(driver);
   unsigned long tmp;
@@ -479,7 +479,7 @@
 	.close_audio = jack_close,
 	.flush = jack_flush,
 	.pause = jack_pause,
-	.buffer_free = jack_free,
+	.buffer_free = audacious_jack_free,
 	.buffer_playing = jack_playing,
 	.output_time = jack_get_output_time,
 	.written_time = jack_get_written_time,


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- audacious-plugins.spec	2 Dec 2009 23:35:49 -0000	1.46
+++ audacious-plugins.spec	2 Dec 2009 23:49:52 -0000	1.47
@@ -32,6 +32,7 @@ Patch11:        audacious-plugins-1.5.1-
 Patch12:        audacious-plugins-1.5.1-modplug.patch
 Patch13:        audacious-plugins-1.5.1-musepack.patch
 Patch14:        audacious-plugins-1.5.1-neon.patch
+Patch15:        audacious-plugins-1.5.1-jack.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -190,6 +191,7 @@ vortex compressed files.
 %patch12 -p1 -b .modplug
 %patch13 -p1 -b .musepack
 %patch14 -p1 -b .neon
+%patch15 -p1 -b .jack_free
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -291,6 +293,7 @@ update-desktop-database &> /dev/null || 
 %changelog
 * Thu Dec  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-19
 - Fix truncated track name for streaming mp3 in neon.c (#543050).
+- Merge jack_free redeclaration fix.
 
 * Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-18
 - Corrupt musepack files were able to crash Audacious.



From danielsmw at fedoraproject.org  Wed Dec  2 23:55:38 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Wed,  2 Dec 2009 23:55:38 +0000 (UTC)
Subject: rpms/xinha/F-12 import.log, NONE, 1.1 xinha.conf, NONE,
	1.1 xinha.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091202235538.A17C911C0095@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9578/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xinha.conf xinha.spec 
Log Message:
This might be the initial import for F-12; I got confused with my labeling.



--- NEW FILE import.log ---
xinha-0_96-0_1_b2:F-12:xinha-0.96-0.1.b2.src.rpm:1259797770


--- NEW FILE xinha.conf ---
Alias /xinha /usr/share/js/xinha-0.96-0.1.b2


--- NEW FILE xinha.spec ---
Name:		xinha
Version:	0.96
Release:	0.1.b2
Summary:	A WYSIWIG HTML editor component in Javascript

Group:		Development/Languages
License:	BSD and PHP and LGPLv2+ and CC-BY-SA
URL:		http://www.xinha.org

# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball (and add my conf file):
#
#  svn export -r 1191 http://svn.xinha.org/trunk %{name}-%{version}-%{release}
#  tar -czf %{name}-%{version}-%{release}.tar.gz %{name}-%{version}-%{release}/*

Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{release}.tar.gz
Source1:	xinha.conf

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	perl-XML-DOM
Requires:	perl-Text-Aspell

# These would be required for some plugins to work
# (those would be the plugins we conveniently remove in %setup)
#  * Requires:	php-magickwand
#  * Requires:	php-gd
#  * Requires:	Some other PEAR libraries which aren't in Fedora (yet)

%description
Xinha is a Javascript component that can be used to enhance a textarea field in
HTML. It can be used on its own or as part of a larger WYSIWYG module such as
Scribite.

%prep
%setup -q -c -n %{name}-%{version}-%{release} -a 0
cp -p %SOURCE1 .

# Remove precompiled binaries and other illegal files
find %{name}-%{version}-%{release} | grep \.jar$ | xargs rm
find %{name}-%{version}-%{release} | grep \.htaccess$ | xargs rm

# Fix permissions on non-executables
find %{name}-%{version}-%{release} | grep \.js$ | xargs chmod a-x
find %{name}-%{version}-%{release} | grep \.php$ | xargs chmod a-x
find %{name}-%{version}-%{release} | grep \.css$ | xargs chmod a-x
find %{name}-%{version}-%{release} | grep \.html$ | xargs chmod a-x
find %{name}-%{version}-%{release} | grep \.svg$ | xargs chmod a-x

# Remove plugins that contain unresolvable dependecies
rm -rf %{name}-%{version}-%{release}/plugins/ImageManager/
rm -rf %{name}-%{version}-%{release}/plugins/ExtendedFileManager/
rm -rf %{name}-%{version}-%{release}/unsupported_plugins/
rm -rf %{name}-%{version}-%{release}/contrib/

# Remove carriage returns
cat %{name}-%{version}-%{release}/skins/inditreuse/README | tr -d "\r \n" > README.unix
mv README.unix %{name}-%{version}-%{release}/skins/inditreuse/README
cat %{name}-%{version}-%{release}/license.txt| tr -d "\r \n" > license.unix
mv license.unix %{name}-%{version}-%{release}/license.txt
cat %{name}-%{version}-%{release}/skins/titan/README | tr -d "\r \n" > README.unix
mv README.unix %{name}-%{version}-%{release}/skins/titan/README


# Organize the documentation files into folders. We can't just
# simply %doc <file> them because they're often named the same
mkdir doc
mkdir doc/tango-images
mkdir doc/tango-icons doc/crystal-icons
mkdir doc/inditreuse-skin doc/titan-skin
mkdir doc/InsertSmiley doc/SmartReplace doc/Equation doc/SpellChecker
mkdir doc/SaveSubmit doc/FormOperations doc/InsertSnippet doc/InsertSnippet2

mv %{name}-%{version}-%{release}/license.txt doc
mv %{name}-%{version}-%{release}/release-notes.txt doc
mv %{name}-%{version}-%{release}/XinhaLoader_readme.txt doc

mv %{name}-%{version}-%{release}/images/tango/COPYING doc/tango-images

mv %{name}-%{version}-%{release}/iconsets/Tango/LICENSE doc/tango-icons
mv %{name}-%{version}-%{release}/iconsets/Tango/README doc/tango-icons
mv %{name}-%{version}-%{release}/iconsets/Crystal/LICENSE doc/crystal-icons
mv %{name}-%{version}-%{release}/iconsets/Crystal/README doc/crystal-icons

mv %{name}-%{version}-%{release}/skins/inditreuse/README doc/inditreuse-skin
mv %{name}-%{version}-%{release}/skins/titan/README doc/titan-skin

mv %{name}-%{version}-%{release}/plugins/InsertSmiley/README.txt doc/InsertSmiley
mv %{name}-%{version}-%{release}/plugins/SmartReplace/readme.txt doc/SmartReplace
mv %{name}-%{version}-%{release}/plugins/Equation/readme.txt doc/Equation
mv %{name}-%{version}-%{release}/plugins/SpellChecker/README doc/SpellChecker
mv %{name}-%{version}-%{release}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
mv %{name}-%{version}-%{release}/plugins/SaveSubmit/README.txt doc/SaveSubmit
mv %{name}-%{version}-%{release}/plugins/FormOperations/README doc/FormOperations
mv %{name}-%{version}-%{release}/plugins/InsertSnippet/readme.html doc/InsertSnippet
mv %{name}-%{version}-%{release}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2

mv %{name}-%{version}-%{release}/examples doc/examples

%build

# There's nothing to build here; we're just copying js/php.

%install

# Clean the build root
rm -rf $RPM_BUILD_ROOT

# Create the directory (if not already there) where js is supposed to go
mkdir -p $RPM_BUILD_ROOT%{_datadir}/js
cp -a %{name}-%{version}-%{release} $RPM_BUILD_ROOT%{_datadir}/js/

# Create conf.d, if it's not there already, and copy over our .conf file
mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
install -p -m 0644 %{name}.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/%{name}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/js/%{name}-%{version}-%{release}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf

# Install documentation
# If removed plugins are reintegrated in the future, remember
# to include their documentation files.

%doc doc/*

# Note that this package includes locales, but they are implemented
# in JSON, not .mo files, so we can't currently handle them. We'll
# just have to let Xinha handle them as it sees fit until we have
# a better protocol for doing so.

%changelog
* Mon Oct 19 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2
- Spec file submission (initial package creation) 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Nov 2009 16:12:06 -0000	1.1
+++ .cvsignore	2 Dec 2009 23:55:38 -0000	1.2
@@ -0,0 +1 @@
+xinha-0.96-0.1.b2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Nov 2009 16:12:06 -0000	1.1
+++ sources	2 Dec 2009 23:55:38 -0000	1.2
@@ -0,0 +1 @@
+6a7202c9fe279beae3f6b0945535ea56  xinha-0.96-0.1.b2.tar.gz



From whot at fedoraproject.org  Thu Dec  3 00:08:07 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  3 Dec 2009 00:08:07 +0000 (UTC)
Subject: rpms/libXext/F-12 libXext-1.1-XAllocID.patch, NONE,
	1.1 libXext-1.1-event_vec-smash.patch, NONE, 1.1 libXext.spec,
	1.30, 1.31
Message-ID: <20091203000807.56F3411C0095@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXext/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12973

Modified Files:
	libXext.spec 
Added Files:
	libXext-1.1-XAllocID.patch libXext-1.1-event_vec-smash.patch 
Log Message:
* Thu Dec 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1-2
- libXext-1.1-XAllocID.patch: call XAllocID with the display lock held.
- libXext-1.1-event_vec-smash.patch: don't smash the event processing vector
  if the server has an older extension version than the client.


libXext-1.1-XAllocID.patch:
 XShm.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libXext-1.1-XAllocID.patch ---
>From 956fd30e1046e5779ac0b6c07ec4f0e87250869a Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey at minilop.net>
Date: Wed, 7 Oct 2009 19:31:21 -0700
Subject: [PATCH] XAllocID must only be called with the Display lock held.

This patch makes XShmAttach follow the same XID allocation pattern used in
other stubs, such as XShmCreatePixmap.

Reported-by: <fdsteve at ihug.co.nz>
Signed-off-by: Jamey Sharp <jamey at minilop.net>
---
 src/XShm.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/XShm.c b/src/XShm.c
index 922b4cb..38efa9f 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -235,12 +235,11 @@ Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo)
 
     ShmCheckExtension (dpy, info, 0);
 
-    shminfo->shmseg = XAllocID(dpy);
     LockDisplay(dpy);
     GetReq(ShmAttach, req);
     req->reqType = info->codes->major_opcode;
     req->shmReqType = X_ShmAttach;
-    req->shmseg = shminfo->shmseg;
+    req->shmseg = shminfo->shmseg = XAllocID(dpy);
     req->shmid = shminfo->shmid;
     req->readOnly = shminfo->readOnly ? xTrue : xFalse;
     UnlockDisplay(dpy);
-- 
1.6.5.2


libXext-1.1-event_vec-smash.patch:
 extutil.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

--- NEW FILE libXext-1.1-event_vec-smash.patch ---
>From 83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 26 Nov 2009 09:38:31 +1000
Subject: [PATCH] Don't smash the event_vec if num_events differs between lib and server.

If the library extension thinks there's more events to an extension than the
server actually has, the event_vec for the overlapping range can get
overwritten. This depends on the initialization order of the libraries.

Reported-by: Nathan Kidd
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Julien Cristau <jcristau at debian.org>
---
 src/extutil.c |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/src/extutil.c b/src/extutil.c
index 8f4923a..a8f4d5d 100644
--- a/src/extutil.c
+++ b/src/extutil.c
@@ -103,6 +103,7 @@ XExtDisplayInfo *XextAddDisplay (
     int nevents,
     XPointer data)
 {
+    static unsigned char ext_handlers[64] = {0};
     XExtDisplayInfo *dpyinfo;
 
     dpyinfo = (XExtDisplayInfo *) Xmalloc (sizeof (XExtDisplayInfo));
@@ -117,10 +118,54 @@ XExtDisplayInfo *XextAddDisplay (
      */
     if (dpyinfo->codes) {
 	int i, j;
+	int idx = dpyinfo->codes->first_event & 0x3f;
+
+
+	/* Xlib extensions use compiled in event numbers. A new library
+	 * against an older server may thus expect a different (higher)
+	 * number of events than the server will send. We have no way of
+	 * knowing the number of events for an extension, the server won't
+	 * tell us.
+	 *
+	 * Depending on the extension initialization order, this smashes the
+	 * event_vec[type] for anything after the extension with the
+	 * different number of events.
+	 *
+	 * e.g. server with inputproto 1.3 expects 15 events, libXi with
+	 * inputproto 2.0 expects 17 events.
+	 * base code is 80, events [80,96] are handled by libXi. events [95,
+	 * 96] belong to the next extension already though.
+	 * This requires XI to be initialized after the extension occupying
+	 * the next range of event codes.
+	 *
+	 * To avoid this, we have a zeroed out array of extension handlers.
+	 * If an extension handler for an event type is already set, and the
+	 * previous event code (before base_code) is the same extension, we
+	 * have the nevents conflict. Unset all those handlers and allow
+	 * overwriting them with the new handlers.
+	 *
+	 * If a handler for a (base + n) event is already set, stop
+	 * registering this extension for the event codes.
+	 *
+	 * event_codes are subtracted by 64 since we don't need to worry
+	 * about core.
+	 */
+
+	if (idx && ext_handlers[idx - 1] == ext_handlers[idx]) {
+	    for (i = idx; i < 64; i++) {
+		if (ext_handlers[idx - 1] == ext_handlers[i])
+		    ext_handlers[i] = 0;
+		else
+		    break;
+	    }
+	}
 
-	for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++) {
+	for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++, idx++) {
+	    if (ext_handlers[idx]) /* don't smash the following extension */
+		break;
 	    XESetWireToEvent (dpy, j, hooks->wire_to_event);
 	    XESetEventToWire (dpy, j, hooks->event_to_wire);
+	    ext_handlers[idx] = dpyinfo->codes->first_event & 0x3f;
 	}
 
         /* register extension for XGE */
-- 
1.6.5.2



Index: libXext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/F-12/libXext.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libXext.spec	6 Oct 2009 17:02:42 -0000	1.30
+++ libXext.spec	3 Dec 2009 00:08:07 -0000	1.31
@@ -1,13 +1,17 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 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
+# From upstream, drop if updating to 1.1.1
+Patch1: libXext-1.1-XAllocID.patch
+# From upstream
+Patch2: libXext-1.1-event_vec-smash.patch
 
 BuildRequires: xorg-x11-proto-devel >= 7.4-23
 BuildRequires: libX11-devel
@@ -33,6 +37,8 @@ X.Org X11 libXext development package
 
 %prep
 %setup -q
+%patch1 -p1 
+%patch2 -p1 
 
 %build
 %configure --disable-static
@@ -85,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Dec 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1-2
+- libXext-1.1-XAllocID.patch: call XAllocID with the display lock held.
+- libXext-1.1-event_vec-smash.patch: don't smash the event processing vector
+  if the server has an older extension version than the client.
+
 * Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
 - libXext 1.1
 



From danielsmw at fedoraproject.org  Thu Dec  3 00:18:10 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Thu,  3 Dec 2009 00:18:10 +0000 (UTC)
Subject: rpms/xinha/devel import.log,1.1,1.2
Message-ID: <20091203001810.E1C3311C0095@cvs1.fedora.phx.redhat.com>

Author: danielsmw

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

Modified Files:
	import.log 
Log Message:
Second try at an initial upload of Xinha.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Nov 2009 19:05:18 -0000	1.1
+++ import.log	3 Dec 2009 00:18:10 -0000	1.2
@@ -1 +1,2 @@
 xinha-0_96-0_1_b2:HEAD:xinha-0.96-0.1.b2.src.rpm:1257274699
+xinha-0_96-0_1_b2:HEAD:xinha-0.96-0.1.b2.src.rpm:1259799140



From kiilerix at fedoraproject.org  Thu Dec  3 00:25:29 2009
From: kiilerix at fedoraproject.org (Mads Kiilerich)
Date: Thu,  3 Dec 2009 00:25:29 +0000 (UTC)
Subject: File tortoisehg-0.9.1.tar.gz uploaded to lookaside cache by kiilerix
Message-ID: <20091203002529.2FE8010F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tortoisehg:

89099ed5f9379a12887da6db18f09e05  tortoisehg-0.9.1.tar.gz



From kkofler at fedoraproject.org  Thu Dec  3 01:02:26 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Dec 2009 01:02:26 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.320,1.321
Message-ID: <20091203010226.15BE311C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
rm obsolete comments


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- kdebase-workspace.spec	2 Dec 2009 14:57:14 -0000	1.320
+++ kdebase-workspace.spec	3 Dec 2009 01:02:25 -0000	1.321
@@ -47,9 +47,6 @@ Patch50: kdebase-workspace-4.3.3-kde#171
 #Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/annotate/head%3A/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff
 Patch51: kdebase-workspace-4.3.80-brightness-keys.patch
 
-# 4.4 trunk
-# backport battery plasmoid from current pre-4.3.80 trunk
-
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 



From kiilerix at fedoraproject.org  Thu Dec  3 01:24:19 2009
From: kiilerix at fedoraproject.org (Mads Kiilerich)
Date: Thu,  3 Dec 2009 01:24:19 +0000 (UTC)
Subject: rpms/tortoisehg/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tortoisehg.spec, 1.2, 1.3
Message-ID: <20091203012419.76AC911C0095@cvs1.fedora.phx.redhat.com>

Author: kiilerix

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

Modified Files:
	.cvsignore sources tortoisehg.spec 
Log Message:
tortoisehg-0.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Nov 2009 00:01:43 -0000	1.3
+++ .cvsignore	3 Dec 2009 01:24:19 -0000	1.4
@@ -1 +1 @@
-tortoisehg-0.9.tar.gz
+tortoisehg-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Nov 2009 00:01:43 -0000	1.3
+++ sources	3 Dec 2009 01:24:19 -0000	1.4
@@ -1 +1 @@
-38a00fe0790c64d6bc25eec04db3a06a  tortoisehg-0.9.tar.gz
+89099ed5f9379a12887da6db18f09e05  tortoisehg-0.9.1.tar.gz


Index: tortoisehg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/devel/tortoisehg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tortoisehg.spec	18 Nov 2009 00:01:43 -0000	1.2
+++ tortoisehg.spec	3 Dec 2009 01:24:19 -0000	1.3
@@ -3,7 +3,7 @@
 %define debug_package %{nil} 
 
 Name:           tortoisehg
-Version:        0.9
+Version:        0.9.1
 Release:        1%{dist}
 Summary:        Mercurial GUI command line tool hgtk
 Group:          Development/Tools
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/python/nautilus-thg.py*
 
 %changelog
+* Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1-1
+- tortoisehg-0.9.1
+
 * Wed Nov 18 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9-1
 - Update to tortoisehg-0.9
 



From kiilerix at fedoraproject.org  Thu Dec  3 01:26:34 2009
From: kiilerix at fedoraproject.org (Mads Kiilerich)
Date: Thu,  3 Dec 2009 01:26:34 +0000 (UTC)
Subject: rpms/tortoisehg/F-12 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tortoisehg.spec, 1.2, 1.3
Message-ID: <20091203012634.C423F11C0095@cvs1.fedora.phx.redhat.com>

Author: kiilerix

Update of /cvs/pkgs/rpms/tortoisehg/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25967

Modified Files:
	.cvsignore sources tortoisehg.spec 
Log Message:
tortoisehg-0.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Nov 2009 00:31:54 -0000	1.3
+++ .cvsignore	3 Dec 2009 01:26:34 -0000	1.4
@@ -1 +1 @@
-tortoisehg-0.9.tar.gz
+tortoisehg-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Nov 2009 00:31:55 -0000	1.3
+++ sources	3 Dec 2009 01:26:34 -0000	1.4
@@ -1 +1 @@
-38a00fe0790c64d6bc25eec04db3a06a  tortoisehg-0.9.tar.gz
+89099ed5f9379a12887da6db18f09e05  tortoisehg-0.9.1.tar.gz


Index: tortoisehg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-12/tortoisehg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tortoisehg.spec	18 Nov 2009 00:31:55 -0000	1.2
+++ tortoisehg.spec	3 Dec 2009 01:26:34 -0000	1.3
@@ -3,7 +3,7 @@
 %define debug_package %{nil} 
 
 Name:           tortoisehg
-Version:        0.9
+Version:        0.9.1
 Release:        1%{dist}
 Summary:        Mercurial GUI command line tool hgtk
 Group:          Development/Tools
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/python/nautilus-thg.py*
 
 %changelog
+* Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1-1
+- tortoisehg-0.9.1
+
 * Wed Nov 18 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9-1
 - Update to tortoisehg-0.9
 



From kiilerix at fedoraproject.org  Thu Dec  3 01:29:55 2009
From: kiilerix at fedoraproject.org (Mads Kiilerich)
Date: Thu,  3 Dec 2009 01:29:55 +0000 (UTC)
Subject: rpms/tortoisehg/F-11 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tortoisehg.spec, 1.2, 1.3
Message-ID: <20091203012955.56CEC11C0095@cvs1.fedora.phx.redhat.com>

Author: kiilerix

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

Modified Files:
	.cvsignore sources tortoisehg.spec 
Log Message:
tortoisehg-0.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Nov 2009 00:48:38 -0000	1.3
+++ .cvsignore	3 Dec 2009 01:29:55 -0000	1.4
@@ -1 +1 @@
-tortoisehg-0.9.tar.gz
+tortoisehg-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Nov 2009 00:48:38 -0000	1.3
+++ sources	3 Dec 2009 01:29:55 -0000	1.4
@@ -1 +1 @@
-38a00fe0790c64d6bc25eec04db3a06a  tortoisehg-0.9.tar.gz
+89099ed5f9379a12887da6db18f09e05  tortoisehg-0.9.1.tar.gz


Index: tortoisehg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-11/tortoisehg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tortoisehg.spec	18 Nov 2009 00:48:38 -0000	1.2
+++ tortoisehg.spec	3 Dec 2009 01:29:55 -0000	1.3
@@ -3,7 +3,7 @@
 %define debug_package %{nil} 
 
 Name:           tortoisehg
-Version:        0.9
+Version:        0.9.1
 Release:        1%{dist}
 Summary:        Mercurial GUI command line tool hgtk
 Group:          Development/Tools
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/python/nautilus-thg.py*
 
 %changelog
+* Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1-1
+- tortoisehg-0.9.1
+
 * Wed Nov 18 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9-1
 - Update to tortoisehg-0.9
 



From kiilerix at fedoraproject.org  Thu Dec  3 01:35:08 2009
From: kiilerix at fedoraproject.org (Mads Kiilerich)
Date: Thu,  3 Dec 2009 01:35:08 +0000 (UTC)
Subject: File tortoisehg-0.9.1.1.tar.gz uploaded to lookaside cache by
	kiilerix
Message-ID: <20091203013508.1643A10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tortoisehg:

ad10f5ceb2a2147fc45d1491a9837ab3  tortoisehg-0.9.1.1.tar.gz



From kiilerix at fedoraproject.org  Thu Dec  3 01:36:51 2009
From: kiilerix at fedoraproject.org (Mads Kiilerich)
Date: Thu,  3 Dec 2009 01:36:51 +0000 (UTC)
Subject: rpms/tortoisehg/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tortoisehg.spec, 1.3, 1.4
Message-ID: <20091203013652.01D3E11C0095@cvs1.fedora.phx.redhat.com>

Author: kiilerix

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

Modified Files:
	.cvsignore sources tortoisehg.spec 
Log Message:
tortoisehg-0.9.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Dec 2009 01:24:19 -0000	1.4
+++ .cvsignore	3 Dec 2009 01:36:51 -0000	1.5
@@ -1 +1 @@
-tortoisehg-0.9.1.tar.gz
+tortoisehg-0.9.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Dec 2009 01:24:19 -0000	1.4
+++ sources	3 Dec 2009 01:36:51 -0000	1.5
@@ -1 +1 @@
-89099ed5f9379a12887da6db18f09e05  tortoisehg-0.9.1.tar.gz
+ad10f5ceb2a2147fc45d1491a9837ab3  tortoisehg-0.9.1.1.tar.gz


Index: tortoisehg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/devel/tortoisehg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tortoisehg.spec	3 Dec 2009 01:24:19 -0000	1.3
+++ tortoisehg.spec	3 Dec 2009 01:36:51 -0000	1.4
@@ -3,7 +3,7 @@
 %define debug_package %{nil} 
 
 Name:           tortoisehg
-Version:        0.9.1
+Version:        0.9.1.1
 Release:        1%{dist}
 Summary:        Mercurial GUI command line tool hgtk
 Group:          Development/Tools
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/python/nautilus-thg.py*
 
 %changelog
+* Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1.1-1
+- tortoisehg-0.9.1.1 - a brown paperbag release
+
 * Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1-1
 - tortoisehg-0.9.1
 



From kiilerix at fedoraproject.org  Thu Dec  3 01:37:49 2009
From: kiilerix at fedoraproject.org (Mads Kiilerich)
Date: Thu,  3 Dec 2009 01:37:49 +0000 (UTC)
Subject: rpms/tortoisehg/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tortoisehg.spec, 1.3, 1.4
Message-ID: <20091203013749.0CE2F11C0095@cvs1.fedora.phx.redhat.com>

Author: kiilerix

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

Modified Files:
	.cvsignore sources tortoisehg.spec 
Log Message:
tortoisehg-0.9.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Dec 2009 01:29:55 -0000	1.4
+++ .cvsignore	3 Dec 2009 01:37:48 -0000	1.5
@@ -1 +1 @@
-tortoisehg-0.9.1.tar.gz
+tortoisehg-0.9.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Dec 2009 01:29:55 -0000	1.4
+++ sources	3 Dec 2009 01:37:48 -0000	1.5
@@ -1 +1 @@
-89099ed5f9379a12887da6db18f09e05  tortoisehg-0.9.1.tar.gz
+ad10f5ceb2a2147fc45d1491a9837ab3  tortoisehg-0.9.1.1.tar.gz


Index: tortoisehg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-11/tortoisehg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tortoisehg.spec	3 Dec 2009 01:29:55 -0000	1.3
+++ tortoisehg.spec	3 Dec 2009 01:37:48 -0000	1.4
@@ -3,7 +3,7 @@
 %define debug_package %{nil} 
 
 Name:           tortoisehg
-Version:        0.9.1
+Version:        0.9.1.1
 Release:        1%{dist}
 Summary:        Mercurial GUI command line tool hgtk
 Group:          Development/Tools
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/python/nautilus-thg.py*
 
 %changelog
+* Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1.1-1
+- tortoisehg-0.9.1.1 - a brown paperbag release
+
 * Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1-1
 - tortoisehg-0.9.1
 



From kiilerix at fedoraproject.org  Thu Dec  3 01:39:15 2009
From: kiilerix at fedoraproject.org (Mads Kiilerich)
Date: Thu,  3 Dec 2009 01:39:15 +0000 (UTC)
Subject: rpms/tortoisehg/F-12 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tortoisehg.spec, 1.3, 1.4
Message-ID: <20091203013915.8861511C0095@cvs1.fedora.phx.redhat.com>

Author: kiilerix

Update of /cvs/pkgs/rpms/tortoisehg/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28525

Modified Files:
	.cvsignore sources tortoisehg.spec 
Log Message:
tortoisehg-0.9.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Dec 2009 01:26:34 -0000	1.4
+++ .cvsignore	3 Dec 2009 01:39:15 -0000	1.5
@@ -1 +1 @@
-tortoisehg-0.9.1.tar.gz
+tortoisehg-0.9.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Dec 2009 01:26:34 -0000	1.4
+++ sources	3 Dec 2009 01:39:15 -0000	1.5
@@ -1 +1 @@
-89099ed5f9379a12887da6db18f09e05  tortoisehg-0.9.1.tar.gz
+ad10f5ceb2a2147fc45d1491a9837ab3  tortoisehg-0.9.1.1.tar.gz


Index: tortoisehg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tortoisehg/F-12/tortoisehg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tortoisehg.spec	3 Dec 2009 01:26:34 -0000	1.3
+++ tortoisehg.spec	3 Dec 2009 01:39:15 -0000	1.4
@@ -3,7 +3,7 @@
 %define debug_package %{nil} 
 
 Name:           tortoisehg
-Version:        0.9.1
+Version:        0.9.1.1
 Release:        1%{dist}
 Summary:        Mercurial GUI command line tool hgtk
 Group:          Development/Tools
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/python/nautilus-thg.py*
 
 %changelog
+* Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1.1-1
+- tortoisehg-0.9.1.1 - a brown paperbag release
+
 * Thu Dec  3 2009 Mads Kiilerich <mads at kiilerich.com> - 0.9.1-1
 - tortoisehg-0.9.1
 



From kkofler at fedoraproject.org  Thu Dec  3 02:33:57 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Dec 2009 02:33:57 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec, 1.264,
	1.265 kdebindings-4.3.75-generator-trunk.patch, 1.3,
	NONE kdebindings-4.3.75-smoke-trunk.patch, 1.1, NONE
Message-ID: <20091203023357.7C83C11C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.3.75-generator-trunk.patch 
	kdebindings-4.3.75-smoke-trunk.patch 
Log Message:
rm obsolete backports


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- kdebindings.spec	1 Dec 2009 15:50:22 -0000	1.264
+++ kdebindings.spec	3 Dec 2009 02:33:57 -0000	1.265
@@ -72,11 +72,6 @@ Patch1:  kdebindings-4.2.85-old-PyQt4.pa
 Patch2:  kdebindings-4.3.75-no-rpath.patch
 
 ## upstream patches
-# 4.4 trunk:
-# update generator to the current trunk for fixes
-Patch100: kdebindings-4.3.75-generator-trunk.patch
-# update smoke to the current trunk for fixes
-Patch101: kdebindings-4.3.75-smoke-trunk.patch
 
 
 BuildRequires:  akonadi-devel >= 1.1.0
@@ -286,14 +281,8 @@ Falcon plugin for the Kross archtecture 
 %patch1 -p0 -b .old-PyQt4
 
 # upstream patches
-pushd generator
-%patch100 -p0 -b .generator-trunk
-popd
-pushd smoke
-%patch101 -p0 -b .smoke-trunk
-popd
 
-# do the no-rpath hack last, after the upstream backports
+# do the no-rpath hack last, after the upstream backports (if any)
 %patch2 -p1 -b .no-rpath
 sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
 


--- kdebindings-4.3.75-generator-trunk.patch DELETED ---


--- kdebindings-4.3.75-smoke-trunk.patch DELETED ---



From iankent at fedoraproject.org  Thu Dec  3 02:38:48 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu,  3 Dec 2009 02:38:48 +0000 (UTC)
Subject: rpms/autofs/F-12 autofs-5.0.5-fix-rpc-large-export-list.patch, NONE,
	1.1 autofs.spec, 1.294, 1.295
Message-ID: <20091203023848.F3BB911C0095@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9123

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.5-fix-rpc-large-export-list.patch 
Log Message:
* Thu Dec 3 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-15
- fix rpc fail on large export list (bz543023).


autofs-5.0.5-fix-rpc-large-export-list.patch:
 CHANGELOG      |    1 +
 lib/rpc_subs.c |   47 ++++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

--- NEW FILE autofs-5.0.5-fix-rpc-large-export-list.patch ---
autofs-5.0.5 - fix rpc fail on large export list

From: Ian Kent <raven at themaw.net>

If the export list on a server is larger than the UDP transport packet
size the transfer will fail and autofs will try TCP instead, but there
were some problems with the conversion to allow for IPv6 using libtirpc.

When creating the local socket for an RPC connection we incorrectly
performed a connect instead of a bind to the ilocal TCP socket. Aslo the
timed connect, which should be done before creating the RPC client was
not being done, which can lead to lengthy timeouts.
---

 CHANGELOG      |    1 +
 lib/rpc_subs.c |   47 ++++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 23 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 88bcc1b..20566a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@
 - fix pidof init script usage.
 - check for path mount location in generic module.
 - dont fail mount on access fail.
+- fix rpc fail on large export list.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 628f0fc..3b11dce 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -53,6 +53,7 @@
 /* Get numeric value of the n bits starting at position p */
 #define getbits(x, p, n)      ((x >> (p + 1 - n)) & ~(~0 << n))
 
+static int connect_nb(int, struct sockaddr *, socklen_t, struct timeval *);
 inline void dump_core(void);
 
 static CLIENT *rpc_clntudp_create(struct sockaddr *addr, struct conn_info *info, int *fd)
@@ -97,11 +98,17 @@ static CLIENT *rpc_clnttcp_create(struct sockaddr *addr, struct conn_info *info,
 	struct sockaddr_in *in4_raddr;
 	struct sockaddr_in6 *in6_raddr;
 	CLIENT *client = NULL;
+	socklen_t slen;
 
 	switch (addr->sa_family) {
 	case AF_INET:
 		in4_raddr = (struct sockaddr_in *) addr;
 		in4_raddr->sin_port = htons(info->port);
+		slen = sizeof(struct sockaddr_in);
+
+		if (connect_nb(*fd, addr, slen, &info->timeout) < 0)
+			break;
+
 		client = clnttcp_create(in4_raddr,
 					info->program, info->version, fd,
 					info->send_sz, info->recv_sz);
@@ -114,6 +121,11 @@ static CLIENT *rpc_clnttcp_create(struct sockaddr *addr, struct conn_info *info,
 #else
 		in6_raddr = (struct sockaddr_in6 *) addr;
 		in6_raddr->sin6_port = htons(info->port);
+		slen = sizeof(struct sockaddr_in6);
+
+		if (connect_nb(*fd, addr, slen, &info->timeout) < 0)
+			break;
+
 		client = clnttcp6_create(in6_raddr,
 					 info->program, info->version, fd,
 					 info->send_sz, info->recv_sz);
@@ -260,32 +272,21 @@ static CLIENT *rpc_do_create_client(struct sockaddr *addr, struct conn_info *inf
 		return NULL;
 	}
 
+	if (!info->client) {
+		*fd = open_sock(addr->sa_family, type, proto);
+		if (*fd < 0)
+			return NULL;
+
+		if (bind(*fd, laddr, slen) < 0)
+			return NULL;
+	}
+
 	switch (info->proto->p_proto) {
 	case IPPROTO_UDP:
-		if (!info->client) {
-			*fd = open_sock(addr->sa_family, type, proto);
-			if (*fd < 0)
-				return NULL;
-
-			if (bind(*fd, laddr, slen) < 0) {
-				close(*fd);
-				return NULL;
-			}
-		}
 		client = rpc_clntudp_create(addr, info, fd);
 		break;
 
 	case IPPROTO_TCP:
-		if (!info->client) {
-			*fd = open_sock(addr->sa_family, type, proto);
-			if (*fd < 0)
-				return NULL;
-
-			if (connect_nb(*fd, laddr, slen, &info->timeout) < 0) {
-				close(*fd);
-				return NULL;
-			}
-		}
 		client = rpc_clnttcp_create(addr, info, fd);
 		break;
 
@@ -327,7 +328,7 @@ static CLIENT *create_udp_client(struct conn_info *info)
 		if (client)
 			goto done;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}
@@ -352,7 +353,7 @@ static CLIENT *create_udp_client(struct conn_info *info)
 		if (client)
 			break;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}
@@ -477,7 +478,7 @@ static CLIENT *create_tcp_client(struct conn_info *info)
 		if (client)
 			break;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-12/autofs.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- autofs.spec	30 Nov 2009 00:45:47 -0000	1.294
+++ autofs.spec	3 Dec 2009 02:38:48 -0000	1.295
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.5
-Release: 13%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -25,6 +25,7 @@ Patch12: autofs-5.0.5-fix-timeout-in-con
 Patch13: autofs-5.0.5-fix-pidof-init-script-usage.patch
 Patch14: autofs-5.0.5-check-for-path-mount-location-in-generic-module.patch
 Patch15: autofs-5.0.5-dont-fail-mount-on-access-fail.patch
+Patch16: autofs-5.0.5-fix-rpc-large-export-list.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -81,6 +82,7 @@ echo %{version}-%{release} > .version
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -133,6 +135,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Thu Dec 3 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-15
+- fix rpc fail on large export list (bz543023).
+
 * Mon Nov 30 2009 Ian Kent <ikent at redhat.com> - 1:5.0.5-13
 - check for path mount location in generic module.
 - dont fail mount on access fail.



From kkofler at fedoraproject.org  Thu Dec  3 02:52:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Dec 2009 02:52:58 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.80-policykit-workaround.patch, NONE, 
	1.1 kdelibs.spec, 1.542,
	1.543 kdelibs-4.3.75-policykit-workaround.patch, 1.1, NONE
Message-ID: <20091203025258.90B2711C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.80-policykit-workaround.patch 
Removed Files:
	kdelibs-4.3.75-policykit-workaround.patch 
Log Message:
Rediff policykit-workaround patch.

kdelibs-4.3.80-policykit-workaround.patch:
 halstorageaccess.cpp |   70 +++++++++++++++++++++++++++++++++++++++++++++++++--
 halstorageaccess.h   |    3 ++
 2 files changed, 71 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.80-policykit-workaround.patch ---
diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
--- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp	2009-12-01 01:27:28.000000000 +0100
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp	2009-12-03 03:49:55.000000000 +0100
@@ -17,6 +17,8 @@
 
 */
 
+#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
+
 #include "halstorageaccess.h"
 
 #include "halfstabhandling.h"
@@ -177,11 +179,21 @@
 {
     // TODO: Better error reporting here
     if (m_setupInProgress) {
+        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedMount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_setupInProgress = false;
         emit setupDone(Solid::UnauthorizedOperation,
                        QString(error.name()+": "+error.message()),
                        m_device->udi());
     } else if (m_teardownInProgress) {
+        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedUnmount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_teardownInProgress = false;
         emit teardownDone(Solid::UnauthorizedOperation,
                           QString(error.name()+": "+error.message()),
@@ -311,8 +323,9 @@
 #else
     QString uid="uid=";
 #endif
-    if (halOptions.contains(uid)) {
-        options << uid+QString::number(::getuid());
+    if (halOptions.contains(uid) &&
+       (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+            options << uid+QString::number(::getuid());
     }
 
 #ifdef Q_OS_FREEBSD
@@ -354,6 +367,59 @@
                               SLOT(slotDBusError(const QDBusError &)));
 }
 
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedMount()
+{
+    QString udi = m_device->udi();
+    QString options;
+    QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
+    QString fstype = m_device->property("volume.fstype").toString();
+
+    if (halOptions.contains("uid=")
+        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+        options = "uid="+QString::number(::getuid());
+    }
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Mount string: string: "
+                               "array:string:%2").arg(udi).arg(options));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedUnmount()
+{
+    QString udi = m_device->udi();
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Unmount array:string:").arg(udi));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
 bool StorageAccess::callHalVolumeUnmount()
 {
     QDBusConnection c = QDBusConnection::systemBus();
diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h
--- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h	2009-12-01 01:27:28.000000000 +0100
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h	2009-12-03 03:49:55.000000000 +0100
@@ -70,6 +70,9 @@
     bool callSystemMount();
     bool callSystemUnmount();
 
+    bool callPrivilegedMount();
+    bool callPrivilegedUnmount();
+
     bool requestPassphrase();
     void callCryptoSetup(const QString &passphrase);
     bool callCryptoTeardown();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -p -r1.542 -r1.543
--- kdelibs.spec	2 Dec 2009 06:22:29 -0000	1.542
+++ kdelibs.spec	3 Dec 2009 02:52:58 -0000	1.543
@@ -69,7 +69,7 @@ Patch9: kdelibs-4.0.2-branding.patch
 # are loaded from kde4rc
 Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
 # workaround for policykit
-Patch11: kdelibs-4.3.75-policykit-workaround.patch
+Patch11: kdelibs-4.3.80-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.2.85-libexecdir.patch


--- kdelibs-4.3.75-policykit-workaround.patch DELETED ---



From kyle at fedoraproject.org  Thu Dec  3 03:04:56 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  3 Dec 2009 03:04:56 +0000 (UTC)
Subject: File amd-ucode-2009-10-09.tar uploaded to lookaside cache by kyle
Message-ID: <20091203030456.14BCE10F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for microcode_ctl:

524c5680aae1de04da1bf3371fd07a2d  amd-ucode-2009-10-09.tar



From mclasen at fedoraproject.org  Thu Dec  3 04:16:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Dec 2009 04:16:22 +0000 (UTC)
Subject: rpms/libgnome/devel libgnome.spec,1.154,1.155
Message-ID: <20091203041622.BDE7911C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	libgnome.spec 
Log Message:
Rebuild



Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- libgnome.spec	24 Nov 2009 06:06:23 -0000	1.154
+++ libgnome.spec	3 Dec 2009 04:16:21 -0000	1.155
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.28/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -199,6 +199,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Rebuild
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From mclasen at fedoraproject.org  Thu Dec  3 04:27:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Dec 2009 04:27:38 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.106,1.107
Message-ID: <20091203042738.CE01D11C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	comps-f13.xml.in 
Log Message:
Move desktop spin tweaks to @gnome-desktop in comps



Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- comps-f13.xml.in	30 Nov 2009 19:29:26 -0000	1.106
+++ comps-f13.xml.in	3 Dec 2009 04:27:38 -0000	1.107
@@ -2547,10 +2547,8 @@
       <packagereq type="default">brasero-nautilus</packagereq>
       <packagereq type="default">cheese</packagereq>
       <packagereq type="default">compiz-gnome</packagereq>
-      <packagereq type="default">dasher</packagereq>
       <packagereq type="default">eog</packagereq>
       <packagereq type="default">evince</packagereq>
-      <packagereq type="default">evince-djvu</packagereq>
       <packagereq type="default">file-roller</packagereq>
       <packagereq type="default">gcalctool</packagereq>
       <packagereq type="default">gdm</packagereq>
@@ -2560,6 +2558,7 @@
       <packagereq type="default">gnome-backgrounds</packagereq>
       <packagereq type="default">gnome-bluetooth</packagereq>
       <packagereq type="default">gnome-disk-utility</packagereq>
+      <packagereq type="default">gnome-games</packagereq>
       <packagereq type="default">gnome-media</packagereq>
       <packagereq type="default">gnome-pilot</packagereq>
       <packagereq type="default">gnome-power-manager</packagereq>
@@ -2571,7 +2570,6 @@
       <packagereq type="default">gnome-utils</packagereq>
       <packagereq type="default">gnote</packagereq>
       <packagereq type="default">gok</packagereq>
-      <packagereq type="default">gthumb</packagereq>
       <packagereq type="default">gtk2-engines</packagereq>
       <packagereq type="default">gucharmap</packagereq>
       <packagereq type="default">gvfs-archive</packagereq>
@@ -2589,6 +2587,8 @@
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
       <packagereq type="default">seahorse</packagereq>
+      <packagereq type="default">shotwell</packagereq>
+      <packagereq type="default">vinagre</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
       <packagereq type="default">yum-presto</packagereq>
@@ -2599,8 +2599,11 @@
       <packagereq type="optional">beagle-gnome</packagereq>
       <packagereq type="optional">buoh</packagereq>
       <packagereq type="optional">byzanz</packagereq>
+      <packagereq type="optional">control-center-extra</packagereq>
+      <packagereq type="optional">dasher</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">esc</packagereq>
+      <packagereq type="optional">evince-djvu</packagereq>
       <packagereq type="optional">evince-dvi</packagereq>
       <packagereq type="optional">file-browser-applet</packagereq>
       <packagereq type="optional">gconf-editor</packagereq>
@@ -2631,6 +2634,7 @@
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
       <packagereq type="optional">gst-mixer</packagereq>
+      <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">gtrayicon</packagereq>
       <packagereq type="optional">gtweakui</packagereq>
       <packagereq type="optional">gvfs-obexftp</packagereq>
@@ -2660,7 +2664,6 @@
       <packagereq type="optional">tomboy</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">xiphos</packagereq>
@@ -2760,7 +2763,6 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">ekiga</packagereq>
       <packagereq type="default">empathy</packagereq>
       <packagereq type="default">evolution</packagereq>
       <packagereq type="default">evolution-help</packagereq>
@@ -2784,6 +2786,7 @@
       <packagereq type="optional">deluge</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">dillo</packagereq>
+      <packagereq type="optional">ekiga</packagereq>
       <packagereq type="optional">epiphany</packagereq>
       <packagereq type="optional">epiphany-extensions</packagereq>
       <packagereq type="optional">evolution-bogofilter</packagereq>



From mclasen at fedoraproject.org  Thu Dec  3 04:55:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Dec 2009 04:55:56 +0000 (UTC)
Subject: rpms/gtk-doc/devel gtk-doc.spec,1.56,1.57
Message-ID: <20091203045556.85F2111C00EE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gtk-doc.spec 
Log Message:
Drop unneeded BRs



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gtk-doc.spec	25 Jul 2009 01:40:11 -0000	1.56
+++ gtk-doc.spec	3 Dec 2009 04:55:56 -0000	1.57
@@ -1,34 +1,29 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
-Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.11/gtk-doc-%{version}.tar.bz2 
+Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.11/gtk-doc-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=562064
 Patch0: gtk-doc-index.patch
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gtk.org/gtk-doc
 
-BuildRequires: docbook-utils 
-BuildRequires: jade 
-BuildRequires: libxslt 
+BuildRequires: docbook-utils
+BuildRequires: jade
+BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 BuildRequires: scrollkeeper
 BuildRequires: python
 BuildRequires: gnome-doc-utils
 
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
-
 Requires: docbook-utils jade /usr/bin/cmp libxslt docbook-style-xsl
 # we are installing an automake macro
 Requires: automake
 # we are installing a .pc file
 Requires: pkgconfig
-# we are installing a .omf file
-Requires: scrollkeeper
 # we are installing an sgml catalog
 Requires: sgml-common
 
@@ -65,12 +60,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
-scrollkeeper-update -q
-
-%postun
-scrollkeeper-update -q
-
 %files
 %defattr(-, root, root)
 %doc AUTHORS README doc/* examples COPYING COPYING-DOCS
@@ -83,6 +72,9 @@ scrollkeeper-update -q
 %{_datadir}/omf/gtk-doc-manual
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 1.11-6
+- Drop unnecessary BRs
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kyle at fedoraproject.org  Thu Dec  3 05:05:22 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  3 Dec 2009 05:05:22 +0000 (UTC)
Subject: File patch-2.6.32-rc8-git5.bz2 uploaded to lookaside cache by kyle
Message-ID: <20091203050522.372EB10F894@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kernel:

198e9c6bdda8f10e515aa2dc75a4da75  patch-2.6.32-rc8-git5.bz2



From rstrode at fedoraproject.org  Thu Dec  3 05:05:23 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu,  3 Dec 2009 05:05:23 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.29.1-force-active-vt.patch, NONE,
	1.1 gdm-multistack.patch, 1.2, 1.3 gdm.spec, 1.493,
	1.494 0001-Don-t-show-lock-screen-option-if-locked-down.patch,
	1.1, NONE fix-clock.patch, 1.1, NONE fix-computer-info.patch,
	1.1, NONE fix-na-tray.patch, 1.1,
	NONE fix-run-dir-permissions.patch, 1.1, NONE fix-timer.patch,
	1.1, NONE gdm-2.26.0-force-active-vt.patch, 1.1,
	NONE gdm-2.28.1-move-shutdown-functions.patch, 1.1,
	NONE make-user-list-animation-smoother.patch, 1.1, NONE
Message-ID: <20091203050523.B299511C00EE@cvs1.fedora.phx.redhat.com>

Author: rstrode

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

Modified Files:
	gdm-multistack.patch gdm.spec 
Added Files:
	gdm-2.29.1-force-active-vt.patch 
Removed Files:
	0001-Don-t-show-lock-screen-option-if-locked-down.patch 
	fix-clock.patch fix-computer-info.patch fix-na-tray.patch 
	fix-run-dir-permissions.patch fix-timer.patch 
	gdm-2.26.0-force-active-vt.patch 
	gdm-2.28.1-move-shutdown-functions.patch 
	make-user-list-animation-smoother.patch 
Log Message:
- Drop upstreamed patches
- rebase multi-stack patch


gdm-2.29.1-force-active-vt.patch:
 configure.ac                |   17 +++++++++++++
 daemon/Makefile.am          |    1 
 daemon/gdm-display.c        |   30 +++++++++++++++++++++---
 daemon/gdm-server.c         |   55 ++++++++++++++++++++++++++++++++++++++++++++
 daemon/gdm-server.h         |    1 
 daemon/gdm-simple-slave.c   |   12 ++++++++-
 daemon/gdm-simple-slave.h   |    3 +-
 daemon/gdm-slave.c          |   23 ++++++++++++++++++
 daemon/gdm-static-display.c |   17 +++++++++++++
 daemon/simple-slave-main.c  |    4 ++-
 data/Makefile.am            |    8 ++++++
 11 files changed, 164 insertions(+), 7 deletions(-)

--- NEW FILE gdm-2.29.1-force-active-vt.patch ---
diff -up gdm-2.29.1/configure.ac.force-active-vt gdm-2.29.1/configure.ac
--- gdm-2.29.1/configure.ac.force-active-vt	2009-11-30 17:23:11.000000000 -0500
+++ gdm-2.29.1/configure.ac	2009-12-02 23:31:13.064009409 -0500
@@ -1254,6 +1254,23 @@ AC_SUBST(GDM_SCREENSHOT_DIR)
 
 
 dnl ---------------------------------------------------------------------------
+dnl - Directory to spool events from other processes
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_WITH(spool-dir,
+            AS_HELP_STRING([--with-spool-dir=<dir>],
+                           [spool directory]))
+
+if ! test -z "$with_spool_dir"; then
+   GDM_SPOOL_DIR=$with_spool_dir
+else
+   GDM_SPOOL_DIR=${localstatedir}/spool/gdm
+fi
+
+AC_SUBST(GDM_SPOOL_DIR)
+
+
+dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
 
diff -up gdm-2.29.1/daemon/gdm-display.c.force-active-vt gdm-2.29.1/daemon/gdm-display.c
--- gdm-2.29.1/daemon/gdm-display.c.force-active-vt	2009-11-16 17:37:43.000000000 -0500
+++ gdm-2.29.1/daemon/gdm-display.c	2009-12-02 23:31:13.065009323 -0500
@@ -65,7 +65,9 @@ struct GdmDisplayPrivate
         gsize                 x11_cookie_size;
         GdmDisplayAccessFile *access_file;
 
-        gboolean              is_local;
+        guint                 is_local : 1;
+        guint                 force_active_vt : 1;
+
         guint                 finish_idle_id;
 
         GdmSlaveProxy        *slave_proxy;
@@ -84,6 +86,7 @@ enum {
         PROP_X11_COOKIE,
         PROP_X11_AUTHORITY_FILE,
         PROP_IS_LOCAL,
+        PROP_FORCE_ACTIVE_VT,
         PROP_SLAVE_COMMAND,
 };
 
@@ -574,9 +577,10 @@ gdm_display_real_prepare (GdmDisplay *di
         gdm_slave_proxy_set_log_path (display->priv->slave_proxy, log_path);
         g_free (log_path);
 
-        command = g_strdup_printf ("%s --display-id %s",
+        command = g_strdup_printf ("%s --display-id %s %s",
                                    display->priv->slave_command,
-                                   display->priv->id);
+                                   display->priv->id,
+                                   display->priv->force_active_vt? "--force-active-vt" : "");
         gdm_slave_proxy_set_command (display->priv->slave_proxy, command);
         g_free (command);
 
@@ -824,6 +828,13 @@ _gdm_display_set_is_local (GdmDisplay   
 }
 
 static void
+_gdm_display_set_force_active_vt (GdmDisplay     *display,
+                                  gboolean        force_active_vt)
+{
+        display->priv->force_active_vt = force_active_vt;
+}
+
+static void
 _gdm_display_set_slave_command (GdmDisplay     *display,
                                 const char     *command)
 {
@@ -866,6 +877,9 @@ gdm_display_set_property (GObject       
         case PROP_IS_LOCAL:
                 _gdm_display_set_is_local (self, g_value_get_boolean (value));
                 break;
+        case PROP_FORCE_ACTIVE_VT:
+                _gdm_display_set_force_active_vt (self, g_value_get_boolean (value));
+                break;
         case PROP_SLAVE_COMMAND:
                 _gdm_display_set_slave_command (self, g_value_get_string (value));
                 break;
@@ -914,6 +928,9 @@ gdm_display_get_property (GObject       
         case PROP_IS_LOCAL:
                 g_value_set_boolean (value, self->priv->is_local);
                 break;
+        case PROP_FORCE_ACTIVE_VT:
+                g_value_set_boolean (value, self->priv->force_active_vt);
+                break;
         case PROP_SLAVE_COMMAND:
                 g_value_set_string (value, self->priv->slave_command);
                 break;
@@ -1084,6 +1101,13 @@ gdm_display_class_init (GdmDisplayClass 
                                                                NULL,
                                                                TRUE,
                                                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+        g_object_class_install_property (object_class,
+                                         PROP_FORCE_ACTIVE_VT,
+                                         g_param_spec_boolean ("force-active-vt",
+                                                               NULL,
+                                                               NULL,
+                                                               FALSE,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
         g_object_class_install_property (object_class,
                                          PROP_SLAVE_COMMAND,
diff -up gdm-2.29.1/daemon/gdm-server.c.force-active-vt gdm-2.29.1/daemon/gdm-server.c
--- gdm-2.29.1/daemon/gdm-server.c.force-active-vt	2009-11-16 17:37:43.000000000 -0500
+++ gdm-2.29.1/daemon/gdm-server.c	2009-12-02 23:31:13.066009518 -0500
@@ -34,6 +34,8 @@
 #include <signal.h>
 #include <sys/resource.h>
 
+#include <linux/vt.h>
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -663,6 +665,44 @@ gdm_server_spawn (GdmServer  *server,
         return ret;
 }
 
+static int
+get_active_vt (void)
+{
+        int console_fd;
+        struct vt_stat console_state = { 0 };
+
+        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
+
+        if (console_fd < 0) {
+                goto out;
+        }
+
+        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
+                goto out;
+        }
+
+out:
+        if (console_fd >= 0) {
+                close (console_fd);
+        }
+
+        return console_state.v_active;
+}
+
+static char *
+get_active_vt_as_string (void)
+{
+        int vt;
+
+        vt = get_active_vt ();
+
+        if (vt <= 0) {
+                return NULL;
+        }
+
+        return g_strdup_printf ("vt%d", vt);
+}
+
 /**
  * gdm_server_start:
  * @disp: Pointer to a GdmDisplay structure
@@ -681,6 +721,21 @@ gdm_server_start (GdmServer *server)
         return res;
 }
 
+gboolean
+gdm_server_start_on_active_vt (GdmServer *server)
+{
+        gboolean res;
+        char *vt;
+
+        g_free (server->priv->command);
+        server->priv->command = g_strdup (X_SERVER " -nr -verbose");
+        vt = get_active_vt_as_string ();
+        res = gdm_server_spawn (server, vt);
+        g_free (vt);
+
+        return res;
+}
+
 static void
 server_died (GdmServer *server)
 {
diff -up gdm-2.29.1/daemon/gdm-server.h.force-active-vt gdm-2.29.1/daemon/gdm-server.h
--- gdm-2.29.1/daemon/gdm-server.h.force-active-vt	2009-11-16 17:37:43.000000000 -0500
+++ gdm-2.29.1/daemon/gdm-server.h	2009-12-02 23:31:13.066009518 -0500
@@ -56,6 +56,7 @@ GType               gdm_server_get_type 
 GdmServer *         gdm_server_new       (const char *display_id,
                                           const char *auth_file);
 gboolean            gdm_server_start     (GdmServer   *server);
+gboolean            gdm_server_start_on_active_vt (GdmServer   *server);
 gboolean            gdm_server_stop      (GdmServer   *server);
 char *              gdm_server_get_display_device (GdmServer *server);
 
diff -up gdm-2.29.1/daemon/gdm-simple-slave.c.force-active-vt gdm-2.29.1/daemon/gdm-simple-slave.c
--- gdm-2.29.1/daemon/gdm-simple-slave.c.force-active-vt	2009-11-24 02:26:07.000000000 -0500
+++ gdm-2.29.1/daemon/gdm-simple-slave.c	2009-12-02 23:31:13.067013552 -0500
@@ -88,6 +88,7 @@ struct GdmSimpleSlavePrivate
 
 enum {
         PROP_0,
+        FORCE_ACTIVE_VT
 };
 
 static void     gdm_simple_slave_class_init     (GdmSimpleSlaveClass *klass);
@@ -1075,11 +1076,13 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
         char    *display_name;
         char    *auth_file;
         gboolean display_is_local;
+        gboolean force_active_vt;
 
         g_object_get (slave,
                       "display-is-local", &display_is_local,
                       "display-name", &display_name,
                       "display-x11-authority-file", &auth_file,
+                      "force-active-vt", &force_active_vt,
                       NULL);
 
         /* if this is local display start a server if one doesn't
@@ -1111,7 +1114,10 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
                                   G_CALLBACK (on_server_ready),
                                   slave);
 
-                res = gdm_server_start (slave->priv->server);
+                if (force_active_vt)
+                        res = gdm_server_start_on_active_vt (slave->priv->server);
+                else
+                        res = gdm_server_start (slave->priv->server);
                 if (! res) {
                         g_warning (_("Could not start the X "
                                      "server (your graphical environment) "
@@ -1259,12 +1265,14 @@ gdm_simple_slave_finalize (GObject *obje
 }
 
 GdmSlave *
-gdm_simple_slave_new (const char *id)
+gdm_simple_slave_new (const char *id,
+                      gboolean    force_active_vt)
 {
         GObject *object;
 
         object = g_object_new (GDM_TYPE_SIMPLE_SLAVE,
                                "display-id", id,
+                               "force-active-vt", force_active_vt,
                                NULL);
 
         return GDM_SLAVE (object);
diff -up gdm-2.29.1/daemon/gdm-simple-slave.h.force-active-vt gdm-2.29.1/daemon/gdm-simple-slave.h
--- gdm-2.29.1/daemon/gdm-simple-slave.h.force-active-vt	2009-11-16 17:37:43.000000000 -0500
+++ gdm-2.29.1/daemon/gdm-simple-slave.h	2009-12-02 23:31:13.067013552 -0500
@@ -48,7 +48,8 @@ typedef struct
 } GdmSimpleSlaveClass;
 
 GType               gdm_simple_slave_get_type   (void);
-GdmSlave *          gdm_simple_slave_new        (const char       *id);
+GdmSlave *          gdm_simple_slave_new        (const char       *id,
+                                                 gboolean          force_active_vt);
 
 G_END_DECLS
 
diff -up gdm-2.29.1/daemon/gdm-slave.c.force-active-vt gdm-2.29.1/daemon/gdm-slave.c
--- gdm-2.29.1/daemon/gdm-slave.c.force-active-vt	2009-11-16 17:37:43.000000000 -0500
+++ gdm-2.29.1/daemon/gdm-slave.c	2009-12-02 23:31:13.068018007 -0500
@@ -83,6 +83,7 @@ struct GdmSlavePrivate
         char            *display_hostname;
         gboolean         display_is_local;
         gboolean         display_is_parented;
+        gboolean         force_active_vt;
         char            *display_seat_id;
         char            *display_x11_authority_file;
         char            *parent_display_name;
@@ -101,6 +102,7 @@ enum {
         PROP_DISPLAY_NUMBER,
         PROP_DISPLAY_HOSTNAME,
         PROP_DISPLAY_IS_LOCAL,
+        PROP_FORCE_ACTIVE_VT,
         PROP_DISPLAY_SEAT_ID,
         PROP_DISPLAY_X11_AUTHORITY_FILE
 };
@@ -1332,6 +1334,13 @@ _gdm_slave_set_display_is_local (GdmSlav
 }
 
 static void
+_gdm_slave_set_force_active_vt (GdmSlave   *slave,
+                                gboolean    force_active_vt)
+{
+        slave->priv->force_active_vt = force_active_vt;
+}
+
+static void
 gdm_slave_set_property (GObject      *object,
                         guint         prop_id,
                         const GValue *value,
@@ -1363,6 +1372,9 @@ gdm_slave_set_property (GObject      *ob
         case PROP_DISPLAY_IS_LOCAL:
                 _gdm_slave_set_display_is_local (self, g_value_get_boolean (value));
                 break;
+        case PROP_FORCE_ACTIVE_VT:
+                _gdm_slave_set_force_active_vt (self, g_value_get_boolean (value));
+                break;
         default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                 break;
@@ -1401,6 +1413,9 @@ gdm_slave_get_property (GObject    *obje
         case PROP_DISPLAY_IS_LOCAL:
                 g_value_set_boolean (value, self->priv->display_is_local);
                 break;
+        case PROP_FORCE_ACTIVE_VT:
+                g_value_set_boolean (value, self->priv->force_active_vt);
+                break;
         default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                 break;
@@ -1526,6 +1541,14 @@ gdm_slave_class_init (GdmSlaveClass *kla
                                                                TRUE,
                                                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
+        g_object_class_install_property (object_class,
+                                         PROP_FORCE_ACTIVE_VT,
+                                         g_param_spec_boolean ("force-active-vt",
+                                                               "Force Active VT",
+                                                               "Force display to active VT",
+                                                               TRUE,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
         signals [STOPPED] =
                 g_signal_new ("stopped",
                               G_TYPE_FROM_CLASS (object_class),
diff -up gdm-2.29.1/daemon/gdm-static-display.c.force-active-vt gdm-2.29.1/daemon/gdm-static-display.c
--- gdm-2.29.1/daemon/gdm-static-display.c.force-active-vt	2009-11-16 17:37:43.000000000 -0500
+++ gdm-2.29.1/daemon/gdm-static-display.c	2009-12-02 23:31:13.068018007 -0500
@@ -86,10 +86,27 @@ gdm_static_display_remove_user_authoriza
 }
 
 static gboolean
+triggered_to_force_display_on_active_vt (void)
+{
+        gboolean should_force_display_on_active_vt;
+
+        should_force_display_on_active_vt = g_file_test (GDM_SPOOL_DIR "/force-display-on-active-vt",
+                                                         G_FILE_TEST_EXISTS);
+        g_unlink (GDM_SPOOL_DIR "/force-display-on-active-vt");
+
+        return should_force_display_on_active_vt;
+}
+
+static gboolean
 gdm_static_display_manage (GdmDisplay *display)
 {
         g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
 
+        if (triggered_to_force_display_on_active_vt ()) {
+                g_object_set (display, "force-active-vt", TRUE, NULL);
+        } else {
+                g_object_set (display, "force-active-vt", FALSE, NULL);
+        }
         GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->manage (display);
 
         return TRUE;
diff -up gdm-2.29.1/daemon/Makefile.am.force-active-vt gdm-2.29.1/daemon/Makefile.am
--- gdm-2.29.1/daemon/Makefile.am.force-active-vt	2009-11-16 17:37:43.000000000 -0500
+++ gdm-2.29.1/daemon/Makefile.am	2009-12-02 23:31:13.069017990 -0500
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
 	-DLOGDIR=\"$(logdir)\"				\
 	-DSBINDIR=\"$(sbindir)\"			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-DGDM_SPOOL_DIR=\"$(GDM_SPOOL_DIR)\"  \
 	-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\"		\
 	-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\"		\
 	-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\"	\
diff -up gdm-2.29.1/daemon/simple-slave-main.c.force-active-vt gdm-2.29.1/daemon/simple-slave-main.c
--- gdm-2.29.1/daemon/simple-slave-main.c.force-active-vt	2009-11-16 17:37:43.000000000 -0500
+++ gdm-2.29.1/daemon/simple-slave-main.c	2009-12-02 23:31:54.674210044 -0500
@@ -178,9 +178,11 @@ main (int    argc,
         DBusGConnection  *connection;
         GdmSlave         *slave;
         static char      *display_id = NULL;
+        static gboolean   force_active_vt = FALSE;
         GdmSignalHandler *signal_handler;
         static GOptionEntry entries []   = {
                 { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("ID") },
+                { "force-active-vt", 0, 0, G_OPTION_ARG_NONE, &force_active_vt, N_("Force X to start on active vt"), NULL },
                 { NULL }
         };
 
@@ -248,7 +250,7 @@ main (int    argc,
         gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL);
         gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL);
 
-        slave = gdm_simple_slave_new (display_id);
+        slave = gdm_simple_slave_new (display_id, force_active_vt);
         if (slave == NULL) {
                 goto out;
         }
diff -up gdm-2.29.1/data/Makefile.am.force-active-vt gdm-2.29.1/data/Makefile.am
--- gdm-2.29.1/data/Makefile.am.force-active-vt	2009-11-16 19:45:22.000000000 -0500
+++ gdm-2.29.1/data/Makefile.am	2009-12-02 23:31:13.070023842 -0500
@@ -13,6 +13,7 @@ predir = $(gdmconfdir)/PreSession
 postlogindir = $(gdmconfdir)/PostLogin
 workingdir = $(GDM_WORKING_DIR)
 xauthdir = $(GDM_XAUTH_DIR)
+spooldir = $(GDM_SPOOL_DIR)
 screenshotdir = $(GDM_SCREENSHOT_DIR)
 cachedir = $(localstatedir)/cache/gdm
 
@@ -125,6 +126,7 @@ uninstall-hook:
 	$(DESTDIR)$(workingdir)/.gconf.mandatory \
 	$(DESTDIR)$(screenshotdir) \
 	$(DESTDIR)$(xauthdir)
+	$(DESTDIR)$(spooldir)
 
 install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
 	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
@@ -224,6 +226,12 @@ install-data-hook: gdm.conf-custom Xsess
 		chown root:gdm $(DESTDIR)$(cachedir) || : ; \
 	fi
 
+	if test '!' -d $(DESTDIR)$(spooldir); then \
+		$(mkinstalldirs) $(DESTDIR)$(spooldir); \
+		chmod 775 $(DESTDIR)$(spooldir); \
+		chown root:gdm $(DESTDIR)$(spooldir) || : ; \
+	fi
+
 	$(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
 	gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /
 	gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries

gdm-multistack.patch:
 b/common/gdm-marshal.list                                            |    1 
 b/configure.ac                                                       |   44 
 b/daemon/gdm-factory-slave.c                                         |   13 
 b/daemon/gdm-greeter-server.c                                        |   53 
 b/daemon/gdm-greeter-server.h                                        |    5 
 b/daemon/gdm-product-slave.c                                         |   47 
 b/daemon/gdm-session-direct.c                                        |  322 +-
 b/daemon/gdm-session-private.h                                       |    3 
 b/daemon/gdm-session-relay.c                                         |   29 
 b/daemon/gdm-session-worker-job.c                                    |    7 
 b/daemon/gdm-session-worker-job.h                                    |    2 
 b/daemon/gdm-session-worker.c                                        |   27 
 b/daemon/gdm-session-worker.h                                        |    2 
 b/daemon/gdm-session.c                                               |   20 
 b/daemon/gdm-session.h                                               |    9 
 b/daemon/gdm-simple-slave.c                                          |    3 
 b/daemon/test-session.c                                              |   14 
 b/gui/simple-greeter/Makefile.am                                     |    4 
 b/gui/simple-greeter/foo.glade                                       |  604 ++++
 b/gui/simple-greeter/gdm-chooser-widget.c                            |    8 
 b/gui/simple-greeter/gdm-chooser-widget.h                            |    3 
 b/gui/simple-greeter/gdm-greeter-client.c                            |   18 
 b/gui/simple-greeter/gdm-greeter-client.h                            |    4 
 b/gui/simple-greeter/gdm-greeter-login-window.c                      |   91 
 b/gui/simple-greeter/gdm-greeter-login-window.glade                  |   39 
 b/gui/simple-greeter/gdm-greeter-login-window.h                      |   11 
 b/gui/simple-greeter/gdm-greeter-plugin.c                            |  255 +
 b/gui/simple-greeter/gdm-greeter-plugin.h                            |   61 
 b/gui/simple-greeter/gdm-greeter-session.c                           |    5 
 b/gui/simple-greeter/gdm-plugin-manager.c                            |  478 +++
 b/gui/simple-greeter/gdm-plugin-manager.h                            |   66 
 b/gui/simple-greeter/gdm-task-list.c                                 |  198 +
 b/gui/simple-greeter/gdm-task-list.h                                 |   65 
 b/gui/simple-greeter/gdm-user-chooser-widget.c                       |   23 
 b/gui/simple-greeter/libgdmsimplegreeter/Makefile.am                 |   46 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c          |  147 +
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h          |   87 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c     |   93 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h     |   55 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c                  |  117 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                  |   62 
 b/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in      |   11 
 b/gui/simple-greeter/plugins/Makefile.am                             |    1 
 b/gui/simple-greeter/plugins/fingerprint/Makefile.am                 |   56 
 b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c |  299 ++
 b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h |   56 
 b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint.pam         |   17 
 b/gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am     |    5 
 b/gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am     |    5 
 b/gui/simple-greeter/plugins/fingerprint/icons/Makefile.am           |    1 
 b/gui/simple-greeter/plugins/fingerprint/page.ui                     |   56 
 b/gui/simple-greeter/plugins/fingerprint/plugin.c                    |   41 
 b/gui/simple-greeter/plugins/password/Makefile.am                    |   53 
 b/gui/simple-greeter/plugins/password/gdm-password-extension.c       |  314 ++
 b/gui/simple-greeter/plugins/password/gdm-password-extension.h       |   56 
 b/gui/simple-greeter/plugins/password/gdm-password.pam               |   19 
 b/gui/simple-greeter/plugins/password/page.ui                        |   56 
 b/gui/simple-greeter/plugins/password/plugin.c                       |   40 
 b/gui/simple-greeter/plugins/smartcard/Makefile.am                   |   77 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c     |  418 ++
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h     |   56 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c       | 1394 ++++++++++
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h       |   86 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c        |  167 +
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c               |  558 ++++
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h               |   94 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.pam             |   18 
 b/gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile.am       |    5 
 b/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am       |    5 
 b/gui/simple-greeter/plugins/smartcard/icons/Makefile.am             |    1 
 b/gui/simple-greeter/plugins/smartcard/page.ui                       |   56 
 b/gui/simple-greeter/plugins/smartcard/plugin.c                      |   40 
 b/po/POTFILES.in                                                     |    2 
 configure.ac                                                         |   15 
 daemon/gdm-factory-slave.c                                           |  103 
 daemon/gdm-greeter-server.c                                          |  142 -
 daemon/gdm-greeter-server.h                                          |   21 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          |  815 ++++-
 daemon/gdm-session-private.h                                         |   31 
 daemon/gdm-session-relay.c                                           |  223 +
 daemon/gdm-session-worker-job.c                                      |   66 
 daemon/gdm-session-worker-job.h                                      |    4 
 daemon/gdm-session-worker.c                                          |   61 
 daemon/gdm-session.c                                                 |  250 +
 daemon/gdm-session.h                                                 |   62 
 daemon/gdm-simple-slave.c                                            |  241 +
 daemon/test-session.c                                                |   22 
 gui/simple-greeter/Makefile.am                                       |   15 
 gui/simple-greeter/gdm-greeter-client.c                              |  229 +
 gui/simple-greeter/gdm-greeter-client.h                              |   21 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1158 ++++++--
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  152 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   24 
 gui/simple-greeter/gdm-greeter-session.c                             |  148 -
 gui/simple-greeter/gdm-task-list.c                                   |  268 +
 gui/simple-greeter/gdm-task-list.h                                   |   40 
 gui/simple-greeter/gdm-user-chooser-widget.c                         |    9 
 gui/simple-greeter/libgdmsimplegreeter/Makefile.am                   |    2 
 gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c            |   51 
 gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h            |   13 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.c                    |   12 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    5 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   54 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |   15 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   62 
 po/POTFILES.in                                                       |    2 
 108 files changed, 10540 insertions(+), 1267 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 gdm-multistack.patchIndex: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-multistack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdm-multistack.patch	2 Nov 2009 05:38:10 -0000	1.2
+++ gdm-multistack.patch	3 Dec 2009 05:05:23 -0000	1.3
@@ -1,323 +1,7 @@
-
-From dfa6b8d5ed60552f435c34c47bc45089fa3eef48 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 20 Feb 2009 13:52:19 -0500
-Subject: [PATCH 07/81] Add a comment marking protected api in chooser
-
-The chooser widget has methods that only its
-subclasses are supposed to call.  We should
-mark them as such.
----
- gui/simple-greeter/gdm-chooser-widget.h |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-chooser-widget.h b/gui/simple-greeter/gdm-chooser-widget.h
-index 578e613..7e3e59c 100644
---- a/gui/simple-greeter/gdm-chooser-widget.h
-+++ b/gui/simple-greeter/gdm-chooser-widget.h
-@@ -136,6 +136,8 @@ int            gdm_chooser_widget_get_number_of_items          (GdmChooserWidget
- void           gdm_chooser_widget_activate_if_one_item         (GdmChooserWidget          *widget);
- void           gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget          *widget);
- 
-+/* Protected
-+ */
- void           gdm_chooser_widget_loaded                       (GdmChooserWidget          *widget);
- 
- G_END_DECLS
--- 
-1.6.5.1
-
-
-From 7b4e38d04e246d7dc4c446ed2a3c69fcc67257cb Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 6 Feb 2009 17:44:37 -0500
-Subject: [PATCH 08/81] Drop duplicated entry introspection output
-
----
- daemon/gdm-greeter-server.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
-index 2e01d33..cecce83 100644
---- a/daemon/gdm-greeter-server.c
-+++ b/daemon/gdm-greeter-server.c
-@@ -752,7 +752,6 @@ do_introspect (DBusConnection *connection,
-                                "      <arg name=\"layout_name\" type=\"s\"/>\n"
-                                "    </signal>\n"
-                                "    <signal name=\"DefaultSessionNameChanged\">\n"
--                               "    <signal name=\"DefaultSessionNameChanged\">\n"
-                                "      <arg name=\"session_name\" type=\"s\"/>\n"
-                                "    </signal>\n"
-                                "    <signal name=\"TimedLoginRequested\">\n"
--- 
-1.6.5.1
-
-
-From 8d5ddd913f13581df1662730745c1d906772185e Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Mon, 2 Mar 2009 10:07:03 -0500
-Subject: [PATCH 09/81] Make lookup_item not warn when passing NULL for args
-
-gtk_tree_model_get doesn't like NULL, and we allow
-NULL for optional return values.
-
-We now check each argument for NULL and call
-gtk_tree_model_get individually N times (one for
-each argument) instead of just once.
----
- gui/simple-greeter/gdm-chooser-widget.c |   31 ++++++++++++++++++++++++-------
- 1 files changed, 24 insertions(+), 7 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
-index 2875456..cbd5072 100644
---- a/gui/simple-greeter/gdm-chooser-widget.c
-+++ b/gui/simple-greeter/gdm-chooser-widget.c
-@@ -2171,13 +2171,30 @@ gdm_chooser_widget_lookup_item (GdmChooserWidget *widget,
-         }
-         g_free (active_item_id);
- 
--        gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
--                            CHOOSER_IMAGE_COLUMN, image,
--                            CHOOSER_NAME_COLUMN, name,
--                            CHOOSER_PRIORITY_COLUMN, priority,
--                            CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use,
--                            CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate,
--                            -1);
-+        if (image != NULL) {
-+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
-+                                    CHOOSER_IMAGE_COLUMN, image, -1);
-+        }
-+
-+        if (name != NULL) {
-+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
-+                                    CHOOSER_NAME_COLUMN, name, -1);
-+        }
-+
-+        if (priority != NULL) {
-+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
-+                                    CHOOSER_PRIORITY_COLUMN, priority, -1);
-+        }
-+
-+        if (is_in_use != NULL) {
-+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
-+                                    CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use, -1);
-+        }
-+
-+        if (is_separate != NULL) {
-+                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
-+                                    CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate, -1);
-+        }
- 
-         return TRUE;
- }
--- 
-1.6.5.1
-
-
-From 57a0d19b8b1e5e7a2132b15ea2c536207b61f80f Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 6 Feb 2009 15:35:00 -0500
-Subject: [PATCH 10/81] Drop "stopped" signal from worker-job class
-
-It was unused, dead code.
----
- daemon/gdm-session-direct.c     |   14 --------------
- daemon/gdm-session-worker-job.c |   11 -----------
- daemon/gdm-session-worker-job.h |    1 -
- 3 files changed, 0 insertions(+), 26 deletions(-)
-
-diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 47a5778..b6abae4 100644
---- a/daemon/gdm-session-direct.c
-+++ b/daemon/gdm-session-direct.c
-@@ -1539,13 +1539,6 @@ gdm_session_direct_init (GdmSessionDirect *session)
- }
- 
- static void
--worker_stopped (GdmSessionWorkerJob *job,
--                GdmSessionDirect    *session)
--{
--        g_debug ("GdmSessionDirect: Worker job stopped");
--}
--
--static void
- worker_started (GdmSessionWorkerJob *job,
-                 GdmSessionDirect    *session)
- {
-@@ -1588,10 +1581,6 @@ start_worker (GdmSessionDirect *session)
-         session->priv->job = gdm_session_worker_job_new ();
-         gdm_session_worker_job_set_server_address (session->priv->job, session->priv->server_address);
-         g_signal_connect (session->priv->job,
--                          "stopped",
--                          G_CALLBACK (worker_stopped),
--                          session);
--        g_signal_connect (session->priv->job,
-                           "started",
-                           G_CALLBACK (worker_started),
-                           session);
-@@ -1613,9 +1602,6 @@ static void
- stop_worker (GdmSessionDirect *session)
- {
-         g_signal_handlers_disconnect_by_func (session->priv->job,
--                                              G_CALLBACK (worker_stopped),
--                                              session);
--        g_signal_handlers_disconnect_by_func (session->priv->job,
-                                               G_CALLBACK (worker_started),
-                                               session);
-         g_signal_handlers_disconnect_by_func (session->priv->job,
-diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
-index 6723464..633d6e2 100644
---- a/daemon/gdm-session-worker-job.c
-+++ b/daemon/gdm-session-worker-job.c
-@@ -68,7 +68,6 @@ enum {
- 
- enum {
-         STARTED,
--        STOPPED,
-         EXITED,
-         DIED,
-         LAST_SIGNAL
-@@ -390,16 +389,6 @@ gdm_session_worker_job_class_init (GdmSessionWorkerJobClass *klass)
-                               g_cclosure_marshal_VOID__VOID,
-                               G_TYPE_NONE,
-                               0);
--        signals [STOPPED] =
--                g_signal_new ("stopped",
--                              G_OBJECT_CLASS_TYPE (object_class),
--                              G_SIGNAL_RUN_FIRST,
--                              G_STRUCT_OFFSET (GdmSessionWorkerJobClass, stopped),
--                              NULL,
--                              NULL,
--                              g_cclosure_marshal_VOID__VOID,
[...2455 lines suppressed...]
                            G_CALLBACK (on_session_conversation_stopped),
                            slave);
          g_signal_connect (slave->priv->session,
@@ -18680,13 +18984,13 @@ index 63ea82c..29d0aee 100644
                            G_CALLBACK (on_session_setup_complete),
                            slave);
 -- 
-1.6.5.1
+1.6.5.2
 
 
-From ebf9fce3ff13743a65e14a65f6393cfc3cec4e0c Mon Sep 17 00:00:00 2001
+From a57508de7999049e0418f60c4f3659bd9b219bb8 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 28 Oct 2009 21:46:39 -0400
-Subject: [PATCH 74/81] Catch service-unavailable from server in client and propagate it
+Subject: [PATCH 42/51] Catch service-unavailable from server in client and propagate it
 
 ---
  gui/simple-greeter/gdm-greeter-client.c |   20 ++++++++++++++++++++
@@ -18759,13 +19063,13 @@ index f879307..801bae4 100644
                                            const char        *service_name);
          void (* conversation_stopped)    (GdmGreeterClient  *client,
 -- 
-1.6.5.1
+1.6.5.2
 
 
-From 4e6491ba559c142189a0b17342db780b7a462d6c Mon Sep 17 00:00:00 2001
+From 1c58a6b3bad3081408ec65f153a68baf0a5ad551 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 28 Oct 2009 22:04:44 -0400
-Subject: [PATCH 75/81] Fix memory handling of task in task list
+Subject: [PATCH 43/51] Fix memory handling of task in task list
 
 ---
  gui/simple-greeter/gdm-task-list.c |    5 +++--
@@ -18795,13 +19099,13 @@ index 162b784..be50832 100644
  
          G_OBJECT_CLASS (gdm_task_list_parent_class)->finalize (object);
 -- 
-1.6.5.1
+1.6.5.2
 
 
-From 7a609b6bc2e02c1afe47540dfb3daca37cd48cd1 Mon Sep 17 00:00:00 2001
+From 3150b82ace1a469ef0d7369d1cbca7f1901d642c Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 28 Oct 2009 22:09:45 -0400
-Subject: [PATCH 76/81] Add gdm_task_list_remove_task
+Subject: [PATCH 44/51] Add gdm_task_list_remove_task
 
 ---
  gui/simple-greeter/gdm-task-list.c |   29 +++++++++++++++++++++++++++++
@@ -18863,13 +19167,13 @@ index 8bc0c0e..3df5415 100644
  G_END_DECLS
  
 -- 
-1.6.5.1
+1.6.5.2
 
 
-From 249388ea72690fe3526ff48797aaf0206d40a49c Mon Sep 17 00:00:00 2001
+From d25cbe607c6365640e1e2eb8bbb5da60bedbeaf2 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 28 Oct 2009 21:58:44 -0400
-Subject: [PATCH 77/81] Remove task from task list if unavailable
+Subject: [PATCH 45/51] Remove task from task list if unavailable
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   20 ++++++++++++++++++++
@@ -18955,13 +19259,13 @@ index 848ea1e..3bf24e8 100644
                            G_CALLBACK (on_ready),
                            session);
 -- 
-1.6.5.1
+1.6.5.2
 
 
-From 1a44c10dda2b2cdab965cc15db392513aaafd339 Mon Sep 17 00:00:00 2001
+From 5eeb6c6d3522963c0dbe0b3923c596f3e08e7dc7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 28 Oct 2009 23:55:00 -0400
-Subject: [PATCH 78/81] Don't add task to UI if it's invisible
+Subject: [PATCH 46/51] Don't add task to UI if it's invisible
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   14 +++++++++++---
@@ -19000,13 +19304,13 @@ index 6a5b77e..9280d76 100644
                  name, description);
  
 -- 
-1.6.5.1
+1.6.5.2
 
 
-From 8bcb4b752b8d8efb62f9d4560de8076fbf2ed4bb Mon Sep 17 00:00:00 2001
+From b8b0470e8ea5b9f1c502ba2621fca3112e8a40cd Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 29 Oct 2009 00:39:20 -0400
-Subject: [PATCH 79/81] add lame check to see if fingerprint is enabled
+Subject: [PATCH 47/51] add lame check to see if fingerprint is enabled
 
 ---
  .../fingerprint/gdm-fingerprint-extension.c        |   35 +++++++++++++++++++-
@@ -19059,13 +19363,13 @@ index e1fc0ed..b749ac1 100644
  
  static void
 -- 
-1.6.5.1
+1.6.5.2
 
 
-From f289a1f28d2000c00a35efa164cd207793be1b9f Mon Sep 17 00:00:00 2001
+From aef6c0c7fdb292b05fb91b4d7f7f926189a74951 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 29 Oct 2009 00:10:40 -0400
-Subject: [PATCH 80/81] don't activate invisible tasks
+Subject: [PATCH 48/51] don't activate invisible tasks
 
 ---
  gui/simple-greeter/gdm-task-list.c |    4 ++++
@@ -19087,13 +19391,13 @@ index dd77ed6..c9d7451 100644
          gtk_widget_set_sensitive (GTK_WIDGET (widget), TRUE);
  
 -- 
-1.6.5.1
+1.6.5.2
 
 
-From 8144b99a3ab9511d85ff6169ca9612c350010612 Mon Sep 17 00:00:00 2001
+From e990afc9c83863b2db09ff1dc202d75eff4583c9 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 29 Oct 2009 00:46:34 -0400
-Subject: [PATCH 81/81] Add lame check for smart card daemon
+Subject: [PATCH 49/51] Add lame check for smart card daemon
 
 We don't want to show the smart card bits if the daemon isn't running
 
@@ -19139,5 +19443,59 @@ index 9967d5f..903e18d 100644
  
  static void
 -- 
-1.6.5.1
+1.6.5.2
+
+
+From 85de0d6e72612cf495d4ce87d9bbc46574759615 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 6 Nov 2009 13:35:26 -0500
+Subject: [PATCH 50/51] Don't delay login for passwd -d users
+
+Before we'd delay login if timed login was enabled, but
+we should have been checking if it was the reason login
+was happening.
+---
+ gui/simple-greeter/gdm-greeter-login-window.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index 9280d76..42f27bf 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -968,7 +968,7 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+                  * so they can pick language/session.  Will need to refactor things
+                  * a bit so we can share code with timed login.
+                  */
+-                if (!login_window->priv->timed_login_enabled) {
++                if (strcmp (service_name, "gdm-autologin") != 0) {
+ 
+                         g_debug ("GdmGreeterLoginWindow: Okay, we'll start the session anyway,"
+                                  "because the user isn't ever going to get an opportunity to"
+-- 
+1.6.5.2
+
+
+From 5e63bab8f742eba575856e85f24d5d357cb8816f Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 6 Nov 2009 13:41:31 -0500
+Subject: [PATCH 51/51] Remove go-home icon from button
+
+---
+ gui/simple-greeter/gdm-greeter-login-window.glade |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.glade b/gui/simple-greeter/gdm-greeter-login-window.glade
+index d221d78..032bc6d 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.glade
++++ b/gui/simple-greeter/gdm-greeter-login-window.glade
+@@ -365,7 +365,6 @@
+ 			  <child>
+ 			    <widget class="GtkImage" id="image1">
+ 			      <property name="visible">True</property>
+-			      <property name="icon_name">go-home</property>
+ 			      <property name="pixel_size">16</property>
+ 			      <property name="xalign">0.5</property>
+ 			      <property name="yalign">0.5</property>
+-- 
+1.6.5.2
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -p -r1.493 -r1.494
--- gdm.spec	1 Dec 2009 14:56:28 -0000	1.493
+++ gdm.spec	3 Dec 2009 05:05:23 -0000	1.494
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.29.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -92,7 +92,7 @@ BuildRequires: DeviceKit-power-devel >= 
 Provides: service(graphical-login)
 
 Requires: audit-libs >= %{libauditver}
-Patch2: gdm-2.26.0-force-active-vt.patch
+Patch2: gdm-2.29.1-force-active-vt.patch
 Patch3: gdm-2.23.92-save-root-window.patch
 
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
@@ -100,15 +100,6 @@ Patch3: gdm-2.23.92-save-root-window.pat
 # https://bugzilla.gnome.org/show_bug.cgi?id=572765
 Patch13: gdm-system-keyboard.patch
 
-Patch20: gdm-2.28.1-move-shutdown-functions.patch
-Patch21: fix-clock.patch
-Patch22: fix-timer.patch
-Patch23: fix-na-tray.patch
-Patch24: fix-computer-info.patch
-Patch25: fix-run-dir-permissions.patch
-Patch26: make-user-list-animation-smoother.patch
-Patch27: 0001-Don-t-show-lock-screen-option-if-locked-down.patch
-
 Patch96: gdm-multistack.patch
 # Fedora-specific
 Patch97: gdm-bubble-location.patch
@@ -153,16 +144,6 @@ The GDM fingerprint plugin provides func
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
 %patch13 -p1 -b .system-keyboard
-
-%patch20 -p1 -b .move-shutdown-functions
-%patch21 -p1 -b .fix-clock
-%patch22 -p1 -b .fix-timer
-%patch23 -p1 -b .fix-na-tray
-%patch24 -p1 -b .fix-computer-info
-%patch25 -p1 -b .fix-run-dir-permission
-%patch26 -p1 -b .make-user-list-animation-smoother
-%patch27 -p1 -b .dont-show-lock-screen-if-locked-down
-
 %patch96 -p1 -b .multistack
 %patch97 -p1 -b .bubble-location
 %patch98 -p1 -b .tray-padding
@@ -419,6 +400,10 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Thu Dec 03 2009 Ray Strode <rstrode at redhat.com> 2.29.1-2
+- Drop upstreamed patches
+- rebase multi-stack patch
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.1-1
 - Update to 2.29.1
 


--- 0001-Don-t-show-lock-screen-option-if-locked-down.patch DELETED ---


--- fix-clock.patch DELETED ---


--- fix-computer-info.patch DELETED ---


--- fix-na-tray.patch DELETED ---


--- fix-run-dir-permissions.patch DELETED ---


--- fix-timer.patch DELETED ---


--- gdm-2.26.0-force-active-vt.patch DELETED ---


--- gdm-2.28.1-move-shutdown-functions.patch DELETED ---


--- make-user-list-animation-smoother.patch DELETED ---



From mclasen at fedoraproject.org  Thu Dec  3 05:16:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Dec 2009 05:16:22 +0000 (UTC)
Subject: rpms/libgnomekbd/F-12 libgnomekbd.spec,1.52,1.53
Message-ID: <20091203051622.3624311C00EE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2605

Modified Files:
	libgnomekbd.spec 
Log Message:
Small spec fixes



Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-12/libgnomekbd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- libgnomekbd.spec	8 Oct 2009 22:22:10 -0000	1.52
+++ libgnomekbd.spec	3 Dec 2009 05:16:21 -0000	1.53
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:       	2.28.0
-Release:        2%{?dist}
+Version:        2.28.0
+Release:        3%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -51,12 +51,12 @@ The libgnomekbd-devel package contains l
 developing applications that use libgnomekbd.
 
 
-%package	capplet
-Summary:	A configuration applet to select libgnomekbd plugins
-Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+%package        capplet
+Summary:        A configuration applet to select libgnomekbd plugins
+Group:          User Interface/Desktops
+Requires:       %{name} = %{version}-%{release}
 
-%description	capplet
+%description    capplet
 The libgnomekbd-capplet package contains a configuration applet to
 select libgnomekbd plugins. These plugins can modify the appearance
 of the keyboard indicator applet.
@@ -129,11 +129,15 @@ touch --no-create %{_datadir}/icons/hico
 %{_libdir}/pkgconfig/*
 
 %files capplet
+%defattr(-,root,root,-)
 %{_bindir}/gkbd-indicator-plugins-capplet
 %{_datadir}/applications/gnome-gkbd-indicator-plugins-capplet.desktop
 
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Small spec fixes
+
 * Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Incorporate visual fixes from upstream
 



From mclasen at fedoraproject.org  Thu Dec  3 05:20:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Dec 2009 05:20:39 +0000 (UTC)
Subject: rpms/libgnomekbd/devel
	0002-Improved-indicator-background-handling.patch, NONE,
	1.1 libgnomekbd.spec, 1.50, 1.51
Message-ID: <20091203052039.AEED111C03A3@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	libgnomekbd.spec 
Added Files:
	0002-Improved-indicator-background-handling.patch 
Log Message:
Small spec file fixes


0002-Improved-indicator-background-handling.patch:
 ChangeLog                    |    3 +++
 libgnomekbd/gkbd-indicator.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE 0002-Improved-indicator-background-handling.patch ---
>From f152783de4f4dc82d757468dfc738d12390ffcbc Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Thu, 8 Oct 2009 22:52:42 +0100
Subject: [PATCH 2/2] Improved indicator background handling

https://bugzilla.gnome.org/show_bug.cgi?id=587510
---
 ChangeLog                    |    3 +++
 libgnomekbd/gkbd-indicator.c |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 574753e..3d4a437 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* libgnomekbd/gkbd-keyboard-drawing.c,
 	libgnomekbd/gkbd-keyboard-drawing.h: properly handling keycodes with
 	multiple keys, https://bugzilla.gnome.org/show_bug.cgi?id=590954
+	* libgnomekbd/gkbd-indicator.c: improved background handling by making
+	event box invisible
+	https://bugzilla.gnome.org/show_bug.cgi?id=587510
 
 2009-09-14 svu
 
diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
index 0b43f85..2fb388a 100644
--- a/libgnomekbd/gkbd-indicator.c
+++ b/libgnomekbd/gkbd-indicator.c
@@ -217,6 +217,7 @@ gkbd_indicator_prepare_drawing (GkbdIndicator * gki, int group)
 
 	pimage = g_slist_nth_data (globals.ind_cfg.images, group);
 	ebox = gtk_event_box_new ();
+	gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
 	if (globals.ind_cfg.show_flags) {
 		GtkWidget *flag;
 		if (pimage == NULL)
-- 
1.6.5.rc2



Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- libgnomekbd.spec	24 Sep 2009 00:09:20 -0000	1.50
+++ libgnomekbd.spec	3 Dec 2009 05:20:39 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:       	2.28.0
-Release:        1%{?dist}
+Version:        2.28.0
+Release:        3%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -27,6 +27,10 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+# upstream fixes
+Patch0: 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch
+Patch1: 0002-Improved-indicator-background-handling.patch
+
 %description
 The libgnomekbd package contains a GNOME library which manages
 keyboard configuration and offers various widgets related to
@@ -47,18 +51,20 @@ The libgnomekbd-devel package contains l
 developing applications that use libgnomekbd.
 
 
-%package	capplet
-Summary:	A configuration applet to select libgnomekbd plugins
-Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+%package        capplet
+Summary:        A configuration applet to select libgnomekbd plugins
+Group:          User Interface/Desktops
+Requires:       %{name} = %{version}-%{release}
 
-%description	capplet
+%description    capplet
 The libgnomekbd-capplet package contains a configuration applet to
 select libgnomekbd plugins. These plugins can modify the appearance
 of the keyboard indicator applet.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multiple-keys
+%patch1 -p1 -b .indicator-background
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -123,11 +129,18 @@ touch --no-create %{_datadir}/icons/hico
 %{_libdir}/pkgconfig/*
 
 %files capplet
+%defattr(-,root,root,-)
 %{_bindir}/gkbd-indicator-plugins-capplet
 %{_datadir}/applications/gnome-gkbd-indicator-plugins-capplet.desktop
 
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Small spec fixes
+
+* Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Incorporate visual fixes from upstream
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From mclasen at fedoraproject.org  Thu Dec  3 05:23:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Dec 2009 05:23:50 +0000 (UTC)
Subject: rpms/libgnomekbd/devel
	0001-Properly-handle-scenario-when-one-keycode-has-multip.patch,
	NONE, 1.1
Message-ID: <20091203052350.1F5E911C00EE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Added Files:
	0001-Properly-handle-scenario-when-one-keycode-has-multip.patch 
Log Message:
forgotten patch


0001-Properly-handle-scenario-when-one-keycode-has-multip.patch:
 ChangeLog                           |    6 +
 libgnomekbd/gkbd-keyboard-drawing.c |  109 ++++++++++++++++++++++--------------
 libgnomekbd/gkbd-keyboard-drawing.h |    4 -
 3 files changed, 77 insertions(+), 42 deletions(-)

--- NEW FILE 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch ---
>From d1f0758a82776031184c73a8366d4bdca29e9bb9 Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Thu, 8 Oct 2009 22:42:47 +0100
Subject: [PATCH 1/2] Properly handle scenario when one keycode has multiple keys

https://bugzilla.gnome.org/show_bug.cgi?id=590954
---
 ChangeLog                           |    6 ++
 libgnomekbd/gkbd-keyboard-drawing.c |  109 ++++++++++++++++++++++-------------
 libgnomekbd/gkbd-keyboard-drawing.h |    3 +
 3 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42189cd..574753e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-08 svu
+
+	* libgnomekbd/gkbd-keyboard-drawing.c,
+	libgnomekbd/gkbd-keyboard-drawing.h: properly handling keycodes with
+	multiple keys, https://bugzilla.gnome.org/show_bug.cgi?id=590954
+
 2009-09-14 svu
 
 	* capplet/gkbd-indicator-plugins-capplet.c: fixing compiling on macos,
diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
index f02fb5e..da314d4 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.c
+++ b/libgnomekbd/gkbd-keyboard-drawing.c
@@ -31,7 +31,7 @@
 #include <gkbd-keyboard-drawing.h>
 #include <gkbd-keyboard-drawing-marshal.h>
 
-#define noKBDRAW_DEBUG
+#define KBDRAW_DEBUG
 
 #define INVALID_KEYCODE ((guint)(-1))
 
@@ -998,8 +998,8 @@ draw_key (GkbdKeyboardDrawingRenderContext * context,
 
 	if (key->pressed)
 		color =
-		    &(GTK_WIDGET (drawing)->
-		      style->base[GTK_STATE_SELECTED]);
+		    &(GTK_WIDGET (drawing)->style->
+		      base[GTK_STATE_SELECTED]);
 	else
 		color = drawing->colors + key->xkbkey->color_ndx;
 
@@ -1097,8 +1097,9 @@ invalidate_indicator_doodad_region (GkbdKeyboardDrawing * drawing,
 			   doodad->doodad->indicator.left,
 			   doodad->origin_y +
 			   doodad->doodad->indicator.top,
-			   &drawing->xkb->geom->shapes[doodad->
-						       doodad->indicator.shape_ndx]);
+			   &drawing->xkb->geom->shapes[doodad->doodad->
+						       indicator.
+						       shape_ndx]);
 }
 
 static void
@@ -1112,8 +1113,8 @@ invalidate_key_region (GkbdKeyboardDrawing * drawing,
 			   key->angle,
 			   key->origin_x,
 			   key->origin_y,
-			   &drawing->xkb->geom->shapes[key->
-						       xkbkey->shape_ndx]);
+			   &drawing->xkb->geom->shapes[key->xkbkey->
+						       shape_ndx]);
 }
 
 static void
@@ -1265,7 +1266,11 @@ draw_keyboard_item (GkbdKeyboardDrawingItem * item,
 		return;
 
 	switch (item->type) {
+	case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_INVALID:
+		break;
+
 	case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY:
+	case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY_EXTRA:
 		draw_key (context, drawing,
 			  (GkbdKeyboardDrawingKey *) item);
 		break;
@@ -1345,8 +1350,8 @@ alloc_render_context (GkbdKeyboardDrawing * drawing)
 	pango_layout_set_ellipsize (context->layout, PANGO_ELLIPSIZE_END);
 
 	context->font_desc =
-	    pango_font_description_copy (GTK_WIDGET (drawing)->
-					 style->font_desc);
+	    pango_font_description_copy (GTK_WIDGET (drawing)->style->
+					 font_desc);
 	context->angle = 0;
 	context->scale_numerator = 1;
 	context->scale_denominator = 1;
@@ -1661,8 +1666,8 @@ init_keys_and_doodads (GkbdKeyboardDrawing * drawing)
 				    drawing->xkb->geom->shapes +
 				    xkbkey->shape_ndx;
 				guint keycode = find_keycode (drawing,
-							      xkbkey->
-							      name.name);
+							      xkbkey->name.
+							      name);
 
 				if (keycode == INVALID_KEYCODE)
 					continue;
@@ -1679,9 +1684,24 @@ init_keys_and_doodads (GkbdKeyboardDrawing * drawing)
 
 				if (keycode >= drawing->xkb->min_key_code
 				    && keycode <=
-				    drawing->xkb->max_key_code)
+				    drawing->xkb->max_key_code) {
 					key = drawing->keys + keycode;
-				else {
+					if (key->type ==
+					    GKBD_KEYBOARD_DRAWING_ITEM_TYPE_INVALID)
+					{
+						key->type =
+						    GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY;
+					} else {
+						/* duplicate key for the same keycode, 
+						   already defined as GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY */
+						key =
+						    g_new0
+						    (GkbdKeyboardDrawingKey,
+						     1);
+						key->type =
+						    GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY_EXTRA;
+					}
+				} else {
 					g_warning
 					    ("key %4.4s: keycode = %u; not in range %d..%d\n",
 					     xkbkey->name.name, keycode,
@@ -1691,10 +1711,10 @@ init_keys_and_doodads (GkbdKeyboardDrawing * drawing)
 					key =
 					    g_new0 (GkbdKeyboardDrawingKey,
 						    1);
+					key->type =
+					    GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY_EXTRA;
 				}
 
-				key->type =
-				    GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY;
 				key->xkbkey = xkbkey;
 				key->angle = section->angle;
 				rotate_coordinate (section->left,
@@ -1758,9 +1778,8 @@ init_colors (GkbdKeyboardDrawing * drawing)
 
 	for (i = 0; i < drawing->xkb->geom->num_colors; i++) {
 		result =
-		    parse_xkb_color_spec (drawing->xkb->geom->
-					  colors[i].spec,
-					  drawing->colors + i);
+		    parse_xkb_color_spec (drawing->xkb->geom->colors[i].
+					  spec, drawing->colors + i);
 
 		if (!result)
 			g_warning
@@ -1780,19 +1799,15 @@ free_cdik (			/*colors doodads indicators keys */
 
 	for (itemp = drawing->keyboard_items; itemp; itemp = itemp->next) {
 		GkbdKeyboardDrawingItem *item = itemp->data;
-		GkbdKeyboardDrawingKey *key;
 
 		switch (item->type) {
-		case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_DOODAD:
-			g_free (item);
+		case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_INVALID:
+		case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY:
 			break;
 
-		case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY:
-			key = (GkbdKeyboardDrawingKey *) item;
-			if (key->keycode < drawing->xkb->min_key_code ||
-			    key->keycode > drawing->xkb->max_key_code)
-				g_free (key);
-			/* otherwise it's part of the array */
+		case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY_EXTRA:
+		case GKBD_KEYBOARD_DRAWING_ITEM_TYPE_DOODAD:
+			g_free (item);
 			break;
 		}
 	}
@@ -1863,8 +1878,8 @@ xkb_state_notify_event_filter (GdkXEvent * gdkxev,
 
 				for (i = 0;
 				     i <=
-				     drawing->xkb->
-				     indicators->phys_indicators; i++)
+				     drawing->xkb->indicators->
+				     phys_indicators; i++)
 					if (drawing->physical_indicators[i]
 					    != NULL
 					    && (iev->changed & 1 << i)) {
@@ -1874,27 +1889,33 @@ xkb_state_notify_event_filter (GdkXEvent * gdkxev,
 
 						if ((state
 						     &&
-						     !drawing->physical_indicators
+						     !drawing->
+						     physical_indicators
 						     [i]->on) || (!state
 								  &&
-								  drawing->physical_indicators
-								  [i]->on))
-						{
-							drawing->physical_indicators
+								  drawing->
+								  physical_indicators
+								  [i]->
+								  on)) {
+							drawing->
+							    physical_indicators
 							    [i]->on =
 							    state;
 							create_cairo
 							    (drawing);
 							draw_doodad
-							    (drawing->renderContext,
+							    (drawing->
+							     renderContext,
 							     drawing,
-							     drawing->physical_indicators
+							     drawing->
+							     physical_indicators
 							     [i]);
 							destroy_cairo
 							    (drawing);
 							invalidate_indicator_doodad_region
 							    (drawing,
-							     drawing->physical_indicators
+							     drawing->
+							     physical_indicators
 							     [i]);
 						}
 					}
@@ -2135,9 +2156,15 @@ gkbd_keyboard_drawing_get_pixbuf (GkbdKeyboardDrawing * drawing)
 	return gdk_pixbuf_get_from_drawable (NULL, drawing->pixmap, NULL,
 					     0, 0, 0, 0,
 					     xkb_to_pixmap_coord (context,
-								  drawing->xkb->geom->width_mm),
+								  drawing->
+								  xkb->
+								  geom->
+								  width_mm),
 					     xkb_to_pixmap_coord (context,
-								  drawing->xkb->geom->height_mm));
+								  drawing->
+								  xkb->
+								  geom->
+								  height_mm));
 }
 
 /**
@@ -2168,8 +2195,8 @@ gkbd_keyboard_drawing_render (GkbdKeyboardDrawing * drawing,
 		cr,
 		drawing->renderContext->angle,
 		layout,
-		pango_font_description_copy (GTK_WIDGET (drawing)->
-					     style->font_desc),
+		pango_font_description_copy (GTK_WIDGET (drawing)->style->
+					     font_desc),
 		1, 1,
 		&GTK_WIDGET (drawing)->style->dark[GTK_WIDGET_STATE
 						   (GTK_WIDGET (drawing))]
diff --git a/libgnomekbd/gkbd-keyboard-drawing.h b/libgnomekbd/gkbd-keyboard-drawing.h
index 93f0fa7..c51a7f6 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.h
+++ b/libgnomekbd/gkbd-keyboard-drawing.h
@@ -42,7 +42,9 @@ typedef struct _GkbdKeyboardDrawingRenderContext
  GkbdKeyboardDrawingRenderContext;
 
 typedef enum {
+	GKBD_KEYBOARD_DRAWING_ITEM_TYPE_INVALID = 0,
 	GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY,
+	GKBD_KEYBOARD_DRAWING_ITEM_TYPE_KEY_EXTRA,
 	GKBD_KEYBOARD_DRAWING_ITEM_TYPE_DOODAD
 } GkbdKeyboardDrawingItemType;
 
@@ -128,6 +130,7 @@ struct _GkbdKeyboardDrawing {
 
 	GkbdKeyboardDrawingRenderContext *renderContext;
 
+	/* Indexed by keycode */
 	GkbdKeyboardDrawingKey *keys;
 
 	/* list of stuff to draw in priority order */
-- 
1.6.5.rc2




From whot at fedoraproject.org  Thu Dec  3 05:43:14 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  3 Dec 2009 05:43:14 +0000 (UTC)
Subject: rpms/xorg-x11-drv-wacom/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xorg-x11-drv-wacom.spec, 1.3, 1.4
Message-ID: <20091203054314.188A711C00EE@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore sources xorg-x11-drv-wacom.spec 
Log Message:
* Thu Dec 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.2-1
- wacom 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Nov 2009 04:27:39 -0000	1.3
+++ .cvsignore	3 Dec 2009 05:43:13 -0000	1.4
@@ -1 +1 @@
-xf86-input-wacom-0.10.1.tar.bz2
+xf86-input-wacom-0.10.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Nov 2009 04:27:39 -0000	1.3
+++ sources	3 Dec 2009 05:43:13 -0000	1.4
@@ -1 +1 @@
-544f40bb5bcdd8538c248c4067f3848f  xf86-input-wacom-0.10.1.tar.bz2
+86e5a1446d15bd47cd302a18033bb5e8  xf86-input-wacom-0.10.2.tar.bz2


Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/devel/xorg-x11-drv-wacom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xorg-x11-drv-wacom.spec	20 Nov 2009 04:32:02 -0000	1.3
+++ xorg-x11-drv-wacom.spec	3 Dec 2009 05:43:13 -0000	1.4
@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
-Version:    0.10.1
-Release:    2%{?dist}
+Version:    0.10.2
+Release:    1%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -75,6 +75,9 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Thu Dec 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.2-1
+- wacom 0.10.2
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.1-2
 - cvs add 10-wacom.fdi, this time really.
 



From kyle at fedoraproject.org  Thu Dec  3 06:05:07 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  3 Dec 2009 06:05:07 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc8-git5.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1146, 1.1147 config-generic, 1.340, 1.341 kernel.spec, 1.1862,
	1.1863 sources, 1.1105, 1.1106 upstream, 1.1018,
	1.1019 patch-2.6.32-rc8-git2.bz2.sign, 1.1, NONE
Message-ID: <20091203060507.9C32011C00EE@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc8-git5.bz2.sign 
Removed Files:
	patch-2.6.32-rc8-git2.bz2.sign 
Log Message:
* Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.65.rc8.git5
- 2.6.32-rc8-git5
- nuke 9p cachefiles fix, upstream.
- SLOW_WORK_PROC was renamed to SLOW_WORK_DEBUG, debugfs instead of procfs.



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

iD8DBQBLFwAByGugalF9Dw4RAr7aAJ9sIDWDCqLpfj82plflwNaamf33/QCfeg9B
m+OL9QiWL5nZZmNwKqfgkQM=
=39Za
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1146
retrieving revision 1.1147
diff -u -p -r1.1146 -r1.1147
--- .cvsignore	1 Dec 2009 06:28:49 -0000	1.1146
+++ .cvsignore	3 Dec 2009 06:05:04 -0000	1.1147
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc8.bz2
-patch-2.6.32-rc8-git2.bz2
+patch-2.6.32-rc8-git5.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- config-generic	1 Dec 2009 06:28:50 -0000	1.340
+++ config-generic	3 Dec 2009 06:05:05 -0000	1.341
@@ -4095,7 +4095,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_PAGE_POISONING is not set
 
 CONFIG_SLOW_WORK=y
-CONFIG_SLOW_WORK_PROC=y
+CONFIG_SLOW_WORK_DEBUG=y
 
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRASH is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1862
retrieving revision 1.1863
diff -u -p -r1.1862 -r1.1863
--- kernel.spec	2 Dec 2009 21:13:39 -0000	1.1862
+++ kernel.spec	3 Dec 2009 06:05:05 -0000	1.1863
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 2
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -726,8 +726,6 @@ Patch12010: linux-2.6-dell-laptop-rfkill
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
-Patch12014: fix-9p-fscache.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1342,9 +1340,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 # Patches headed upstream
 ApplyPatch linux-2.6-rfkill-all.patch
 
-# fix 9p compile
-ApplyPatch fix-9p-fscache.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2000,6 +1995,11 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.65.rc8.git5
+- 2.6.32-rc8-git5
+- nuke 9p cachefiles fix, upstream.
+- SLOW_WORK_PROC was renamed to SLOW_WORK_DEBUG, debugfs instead of procfs.
+
 * Wed Dec 02 2009 John W. Linville <linville at redhat.com> 2.6.32-0.64.rc8.git2
 - ath9k: add fixes suggested by upstream maintainer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1105
retrieving revision 1.1106
diff -u -p -r1.1105 -r1.1106
--- sources	1 Dec 2009 06:28:50 -0000	1.1105
+++ sources	3 Dec 2009 06:05:05 -0000	1.1106
@@ -1,3 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 043dae863c41ea8d56dc3da55e241069  patch-2.6.32-rc8.bz2
-4d90333761ee4d8318a0c3415452304b  patch-2.6.32-rc8-git2.bz2
+198e9c6bdda8f10e515aa2dc75a4da75  patch-2.6.32-rc8-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1018
retrieving revision 1.1019
diff -u -p -r1.1018 -r1.1019
--- upstream	1 Dec 2009 06:28:50 -0000	1.1018
+++ upstream	3 Dec 2009 06:05:05 -0000	1.1019
@@ -1,3 +1,3 @@
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc8.bz2
-patch-2.6.32-rc8-git2.bz2
+patch-2.6.32-rc8-git5.bz2


--- patch-2.6.32-rc8-git2.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:26:04 +0000
Subject: [pkgdb] php-phpunit-File-Iterator was added for cdamian
Message-ID: <20091203062604.66E7710F895@bastion2.fedora.phx.redhat.com>

kevin has added Package php-phpunit-File-Iterator with summary FilterIterator implementation that filters files based on a list of suffixes
kevin has approved Package php-phpunit-File-Iterator
kevin has added a Fedora devel branch for php-phpunit-File-Iterator with an owner of cdamian
kevin has approved php-phpunit-File-Iterator in Fedora devel
kevin has approved Package php-phpunit-File-Iterator
kevin has set commit to Approved for 107427 on php-phpunit-File-Iterator (Fedora devel)
kevin has set checkout to Approved for 107427 on php-phpunit-File-Iterator (Fedora devel)
kevin has set build to Approved for 107427 on php-phpunit-File-Iterator (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-File-Iterator



From pkgdb at fedoraproject.org  Thu Dec  3 06:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:26:06 +0000
Subject: [pkgdb] php-phpunit-File-Iterator (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203062606.827CC10F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-phpunit-File-Iterator
kevin has set commit to Approved for 107427 on php-phpunit-File-Iterator (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-phpunit-File-Iterator (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-phpunit-File-Iterator (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-File-Iterator



From pkgdb at fedoraproject.org  Thu Dec  3 06:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:26:06 +0000
Subject: [pkgdb] php-phpunit-File-Iterator summary updated by kevin
Message-ID: <20091203062606.7F9EE10F89D@bastion2.fedora.phx.redhat.com>

kevin set package php-phpunit-File-Iterator summary to FilterIterator implementation that filters files based on a list of suffixes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-File-Iterator



From pkgdb at fedoraproject.org  Thu Dec  3 06:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:26:06 +0000
Subject: [pkgdb] php-phpunit-File-Iterator (Fedora, 11) updated by kevin
Message-ID: <20091203062606.8E6E410F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-phpunit-File-Iterator
kevin has set commit to Approved for 107427 on php-phpunit-File-Iterator (Fedora 11)
kevin has set checkout to Approved for 107427 on php-phpunit-File-Iterator (Fedora 11)
kevin has set build to Approved for 107427 on php-phpunit-File-Iterator (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-File-Iterator



From pkgdb at fedoraproject.org  Thu Dec  3 06:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:26:06 +0000
Subject: [pkgdb] php-phpunit-File-Iterator (Fedora, 12) updated by kevin
Message-ID: <20091203062606.94D1910F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-phpunit-File-Iterator
kevin has set commit to Approved for 107427 on php-phpunit-File-Iterator (Fedora 12)
kevin has set checkout to Approved for 107427 on php-phpunit-File-Iterator (Fedora 12)
kevin has set build to Approved for 107427 on php-phpunit-File-Iterator (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-File-Iterator



From kevin at fedoraproject.org  Thu Dec  3 06:26:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:26:19 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/devel - New directory
Message-ID: <20091203062619.6CA1F11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy19672/rpms/php-phpunit-File-Iterator/devel

Log Message:
Directory /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:26:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:26:19 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator - New directory
Message-ID: <20091203062619.30D4911C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy19672/rpms/php-phpunit-File-Iterator

Log Message:
Directory /cvs/pkgs/rpms/php-phpunit-File-Iterator added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:26:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:26:28 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator Makefile,NONE,1.1
Message-ID: <20091203062628.09A3E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy19672/rpms/php-phpunit-File-Iterator

Added Files:
	Makefile 
Log Message:
Setup of module php-phpunit-File-Iterator


--- NEW FILE Makefile ---
# Top level Makefile for module php-phpunit-File-Iterator
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:26:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:26:29 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091203062629.7857811C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy19672/rpms/php-phpunit-File-Iterator/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-phpunit-File-Iterator


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-phpunit-File-Iterator
# $Id: Makefile,v 1.1 2009/12/03 06:26:29 kevin Exp $
NAME := php-phpunit-File-Iterator
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From whot at fedoraproject.org  Thu Dec  3 06:27:23 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  3 Dec 2009 06:27:23 +0000 (UTC)
Subject: File evtest-1.25.tar.bz2 uploaded to lookaside cache by whot
Message-ID: <20091203062723.4F60010F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for evtest:

f0c053ca02dade1ef0401798c2bea781  evtest-1.25.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec  3 06:27:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:27:37 +0000
Subject: [pkgdb] mingw32-xerces-c was added for anttix
Message-ID: <20091203062737.17F9010F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-xerces-c with summary MingGW Windows validating XML parser
kevin has approved Package mingw32-xerces-c
kevin has added a Fedora devel branch for mingw32-xerces-c with an owner of anttix
kevin has approved mingw32-xerces-c in Fedora devel
kevin has approved Package mingw32-xerces-c
kevin has set commit to Approved for 107427 on mingw32-xerces-c (Fedora devel)
kevin has set checkout to Approved for 107427 on mingw32-xerces-c (Fedora devel)
kevin has set build to Approved for 107427 on mingw32-xerces-c (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-xerces-c



From pkgdb at fedoraproject.org  Thu Dec  3 06:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:27:38 +0000
Subject: [pkgdb] mingw32-xerces-c summary updated by kevin
Message-ID: <20091203062738.6500410F89E@bastion2.fedora.phx.redhat.com>

kevin set package mingw32-xerces-c summary to MingGW Windows validating XML parser

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-xerces-c



From pkgdb at fedoraproject.org  Thu Dec  3 06:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:27:38 +0000
Subject: [pkgdb] mingw32-xerces-c (Fedora, 12) updated by kevin
Message-ID: <20091203062738.6D7E610F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for mingw32-xerces-c
kevin has set commit to Approved for 107427 on mingw32-xerces-c (Fedora 12)
kevin has set checkout to Approved for 107427 on mingw32-xerces-c (Fedora 12)
kevin has set build to Approved for 107427 on mingw32-xerces-c (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-xerces-c



From kevin at fedoraproject.org  Thu Dec  3 06:27:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:27:48 +0000 (UTC)
Subject: rpms/mingw32-xerces-c - New directory
Message-ID: <20091203062748.1A7B211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-xerces-c
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20228/rpms/mingw32-xerces-c

Log Message:
Directory /cvs/pkgs/rpms/mingw32-xerces-c added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:27:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:27:48 +0000 (UTC)
Subject: rpms/mingw32-xerces-c/devel - New directory
Message-ID: <20091203062748.45ED511C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-xerces-c/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20228/rpms/mingw32-xerces-c/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-xerces-c/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:27:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:27:57 +0000 (UTC)
Subject: rpms/mingw32-xerces-c Makefile,NONE,1.1
Message-ID: <20091203062757.3ADE211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-xerces-c
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20228/rpms/mingw32-xerces-c

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-xerces-c


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-xerces-c
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:27:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:27:57 +0000 (UTC)
Subject: rpms/mingw32-xerces-c/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091203062757.A5E3B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-xerces-c/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20228/rpms/mingw32-xerces-c/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-xerces-c


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-xerces-c
# $Id: Makefile,v 1.1 2009/12/03 06:27:57 kevin Exp $
NAME := mingw32-xerces-c
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:28:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:28:49 +0000
Subject: [pkgdb] php-ezc-EventLogDatabaseTiein was added for llaumgui
Message-ID: <20091203062849.B8B8C10F894@bastion2.fedora.phx.redhat.com>

kevin has added Package php-ezc-EventLogDatabaseTiein with summary Contains the database writer backend for the EventLog component
kevin has approved Package php-ezc-EventLogDatabaseTiein
kevin has added a Fedora devel branch for php-ezc-EventLogDatabaseTiein with an owner of llaumgui
kevin has approved php-ezc-EventLogDatabaseTiein in Fedora devel
kevin has approved Package php-ezc-EventLogDatabaseTiein
kevin has set commit to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora devel)
kevin has set checkout to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora devel)
kevin has set build to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-EventLogDatabaseTiein



From pkgdb at fedoraproject.org  Thu Dec  3 06:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:28:50 +0000
Subject: [pkgdb] php-ezc-EventLogDatabaseTiein summary updated by kevin
Message-ID: <20091203062851.12EF910F899@bastion2.fedora.phx.redhat.com>

kevin set package php-ezc-EventLogDatabaseTiein summary to Contains the database writer backend for the EventLog component

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-EventLogDatabaseTiein



From pkgdb at fedoraproject.org  Thu Dec  3 06:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:28:51 +0000
Subject: [pkgdb] php-ezc-EventLogDatabaseTiein (Fedora, 11) updated by kevin
Message-ID: <20091203062851.1C53210F8A5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-ezc-EventLogDatabaseTiein
kevin has set commit to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora 11)
kevin has set checkout to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora 11)
kevin has set build to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-EventLogDatabaseTiein



From kevin at fedoraproject.org  Thu Dec  3 06:29:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:29:04 +0000 (UTC)
Subject: rpms/php-ezc-EventLogDatabaseTiein - New directory
Message-ID: <20091203062904.1FD3D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20608/rpms/php-ezc-EventLogDatabaseTiein

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:29:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:29:04 +0000 (UTC)
Subject: rpms/php-ezc-EventLogDatabaseTiein/devel - New directory
Message-ID: <20091203062904.4189611C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20608/rpms/php-ezc-EventLogDatabaseTiein/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:29:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:29:13 +0000 (UTC)
Subject: rpms/php-ezc-EventLogDatabaseTiein Makefile,NONE,1.1
Message-ID: <20091203062913.3928711C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20608/rpms/php-ezc-EventLogDatabaseTiein

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-EventLogDatabaseTiein


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-EventLogDatabaseTiein
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:29:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:29:13 +0000 (UTC)
Subject: rpms/php-ezc-EventLogDatabaseTiein/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091203062913.A225211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv20608/rpms/php-ezc-EventLogDatabaseTiein/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-EventLogDatabaseTiein


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-EventLogDatabaseTiein
# $Id: Makefile,v 1.1 2009/12/03 06:29:13 kevin Exp $
NAME := php-ezc-EventLogDatabaseTiein
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:28:51 +0000
Subject: [pkgdb] php-ezc-EventLogDatabaseTiein (Fedora, 12) updated by kevin
Message-ID: <20091203062851.2512710F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-ezc-EventLogDatabaseTiein
kevin has set commit to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora 12)
kevin has set checkout to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora 12)
kevin has set build to Approved for 107427 on php-ezc-EventLogDatabaseTiein (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-EventLogDatabaseTiein



From pkgdb at fedoraproject.org  Thu Dec  3 06:30:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:30:29 +0000
Subject: [pkgdb] xstream was added for lkundrak
Message-ID: <20091203063029.A686410F896@bastion2.fedora.phx.redhat.com>

kevin has added Package xstream with summary Java XML serialization library
kevin has approved Package xstream
kevin has added a Fedora devel branch for xstream with an owner of lkundrak
kevin has approved xstream in Fedora devel
kevin has approved Package xstream
kevin has set commit to Approved for 107427 on xstream (Fedora devel)
kevin has set checkout to Approved for 107427 on xstream (Fedora devel)
kevin has set build to Approved for 107427 on xstream (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:30:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:30:32 +0000
Subject: [pkgdb] xstream summary updated by kevin
Message-ID: <20091203063032.3A2D310F8A1@bastion2.fedora.phx.redhat.com>

kevin set package xstream summary to Java XML serialization library

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:30:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:30:32 +0000
Subject: [pkgdb] xstream (Fedora, 11) updated by kevin
Message-ID: <20091203063032.4693E10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for xstream
kevin has set commit to Approved for 107427 on xstream (Fedora 11)
kevin has set checkout to Approved for 107427 on xstream (Fedora 11)
kevin has set build to Approved for 107427 on xstream (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:30:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:30:32 +0000
Subject: [pkgdb] xstream (Fedora, 12) updated by kevin
Message-ID: <20091203063032.53E8B10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for xstream
kevin has set commit to Approved for 107427 on xstream (Fedora 12)
kevin has set checkout to Approved for 107427 on xstream (Fedora 12)
kevin has set build to Approved for 107427 on xstream (Fedora 12)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:30:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:30:32 +0000
Subject: [pkgdb] xstream (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203063032.A729B10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for xstream
kevin has set commit to Approved for 107427 on xstream (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on xstream (Fedora EPEL 5)
kevin has set build to Approved for 107427 on xstream (Fedora EPEL 5)

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



From kevin at fedoraproject.org  Thu Dec  3 06:30:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:30:39 +0000 (UTC)
Subject: rpms/xstream - New directory
Message-ID: <20091203063039.1974311C032A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xstream
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21145/rpms/xstream

Log Message:
Directory /cvs/pkgs/rpms/xstream added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:30:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:30:39 +0000 (UTC)
Subject: rpms/xstream/devel - New directory
Message-ID: <20091203063039.3DDC211C03F6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xstream/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21145/rpms/xstream/devel

Log Message:
Directory /cvs/pkgs/rpms/xstream/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:30:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:30:46 +0000 (UTC)
Subject: rpms/xstream Makefile,NONE,1.1
Message-ID: <20091203063046.96CF811C032A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xstream
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21145/rpms/xstream

Added Files:
	Makefile 
Log Message:
Setup of module xstream


--- NEW FILE Makefile ---
# Top level Makefile for module xstream
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:30:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:30:47 +0000 (UTC)
Subject: rpms/xstream/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091203063047.A098E11C03F6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xstream/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21145/rpms/xstream/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xstream
# $Id: Makefile,v 1.1 2009/12/03 06:30:46 kevin Exp $
NAME := xstream
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:31:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:31:20 +0000
Subject: [pkgdb] php-pear-Net-URL2 was added for remi
Message-ID: <20091203063120.C03FA10F8A5@bastion2.fedora.phx.redhat.com>

kevin has added Package php-pear-Net-URL2 with summary Class for parsing and handling URL
kevin has approved Package php-pear-Net-URL2
kevin has added a Fedora devel branch for php-pear-Net-URL2 with an owner of remi
kevin has approved php-pear-Net-URL2 in Fedora devel
kevin has approved Package php-pear-Net-URL2
kevin has set commit to Approved for 107427 on php-pear-Net-URL2 (Fedora devel)
kevin has set checkout to Approved for 107427 on php-pear-Net-URL2 (Fedora devel)
kevin has set build to Approved for 107427 on php-pear-Net-URL2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Net-URL2



From pkgdb at fedoraproject.org  Thu Dec  3 06:31:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:31:23 +0000
Subject: [pkgdb] php-pear-Net-URL2 summary updated by kevin
Message-ID: <20091203063123.4498C10F891@bastion2.fedora.phx.redhat.com>

kevin set package php-pear-Net-URL2 summary to Class for parsing and handling URL

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Net-URL2



From pkgdb at fedoraproject.org  Thu Dec  3 06:31:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:31:23 +0000
Subject: [pkgdb] php-pear-Net-URL2 (Fedora, 11) updated by kevin
Message-ID: <20091203063123.4C6DA10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-pear-Net-URL2
kevin has set commit to Approved for 107427 on php-pear-Net-URL2 (Fedora 11)
kevin has set checkout to Approved for 107427 on php-pear-Net-URL2 (Fedora 11)
kevin has set build to Approved for 107427 on php-pear-Net-URL2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Net-URL2



From pkgdb at fedoraproject.org  Thu Dec  3 06:31:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:31:23 +0000
Subject: [pkgdb] php-pear-Net-URL2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203063123.5ECC310F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-pear-Net-URL2
kevin has set commit to Approved for 107427 on php-pear-Net-URL2 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-pear-Net-URL2 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-pear-Net-URL2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Net-URL2



From pkgdb at fedoraproject.org  Thu Dec  3 06:31:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:31:23 +0000
Subject: [pkgdb] php-pear-Net-URL2 (Fedora, 12) updated by kevin
Message-ID: <20091203063123.58A4910F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-pear-Net-URL2
kevin has set commit to Approved for 107427 on php-pear-Net-URL2 (Fedora 12)
kevin has set checkout to Approved for 107427 on php-pear-Net-URL2 (Fedora 12)
kevin has set build to Approved for 107427 on php-pear-Net-URL2 (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Net-URL2



From kevin at fedoraproject.org  Thu Dec  3 06:31:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:31:31 +0000 (UTC)
Subject: rpms/php-pear-Net-URL2 - New directory
Message-ID: <20091203063131.1E0AA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Net-URL2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq21566/rpms/php-pear-Net-URL2

Log Message:
Directory /cvs/pkgs/rpms/php-pear-Net-URL2 added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:31:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:31:31 +0000 (UTC)
Subject: rpms/php-pear-Net-URL2/devel - New directory
Message-ID: <20091203063131.47D8211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Net-URL2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq21566/rpms/php-pear-Net-URL2/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pear-Net-URL2/devel added to the repository




From whot at fedoraproject.org  Thu Dec  3 06:31:37 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  3 Dec 2009 06:31:37 +0000 (UTC)
Subject: rpms/evtest/F-12 .cvsignore, 1.3, 1.4 evtest.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091203063137.16C5511C00EE@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/evtest/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21649

Modified Files:
	.cvsignore evtest.spec sources 
Log Message:
* Thu Dec 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.25-1
- evtest 1.25 (includes evtest-capture)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Nov 2009 23:25:25 -0000	1.3
+++ .cvsignore	3 Dec 2009 06:31:36 -0000	1.4
@@ -1 +1 @@
-evtest-1.24.tar.bz2
+evtest-1.25.tar.bz2


Index: evtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/F-12/evtest.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- evtest.spec	10 Nov 2009 23:25:25 -0000	1.2
+++ evtest.spec	3 Dec 2009 06:31:36 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           evtest
-Version:        1.24
+Version:        1.25
 Release:        1%{?dist}
 Summary:        Event device test program
 
@@ -10,6 +10,7 @@ Source0:        http://cgit.freedesktop.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake
+BuildRequires:  asciidoc xmlto libxml2-devel
 
 %description
 %{name} is a simple utility to query information about input devices 
@@ -33,10 +34,16 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+%{_bindir}/evtest-capture
 %doc COPYING
 %{_mandir}/man1/evtest.1*
+%{_mandir}/man1/evtest-capture.1*
+%{_datadir}/%{name}/evtest-create-device.xsl
 
 %changelog
+* Thu Dec 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.25-1
+- evtest 1.25 (includes evtest-capture)
+
 * Wed Nov 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.24-1
 - evtest 1.24
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Nov 2009 23:25:25 -0000	1.3
+++ sources	3 Dec 2009 06:31:36 -0000	1.4
@@ -1 +1 @@
-24daa819cc1c52dc2e20c28d84651e24  evtest-1.24.tar.bz2
+f0c053ca02dade1ef0401798c2bea781  evtest-1.25.tar.bz2



From kevin at fedoraproject.org  Thu Dec  3 06:31:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:31:38 +0000 (UTC)
Subject: rpms/php-pear-Net-URL2 Makefile,NONE,1.1
Message-ID: <20091203063138.B4A9411C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Net-URL2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq21566/rpms/php-pear-Net-URL2

Added Files:
	Makefile 
Log Message:
Setup of module php-pear-Net-URL2


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Net-URL2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:31:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:31:39 +0000 (UTC)
Subject: rpms/php-pear-Net-URL2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091203063139.14D3A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Net-URL2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq21566/rpms/php-pear-Net-URL2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Net-URL2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-Net-URL2
# $Id: Makefile,v 1.1 2009/12/03 06:31:38 kevin Exp $
NAME := php-pear-Net-URL2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:32:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:04 +0000
Subject: [pkgdb] php-pear-HTTP-Request2 was added for remi
Message-ID: <20091203063204.8D34510F8A4@bastion2.fedora.phx.redhat.com>

kevin has added Package php-pear-HTTP-Request2 with summary Provides an easy way to perform HTTP requests
kevin has approved Package php-pear-HTTP-Request2
kevin has added a Fedora devel branch for php-pear-HTTP-Request2 with an owner of remi
kevin has approved php-pear-HTTP-Request2 in Fedora devel
kevin has approved Package php-pear-HTTP-Request2
kevin has set commit to Approved for 107427 on php-pear-HTTP-Request2 (Fedora devel)
kevin has set checkout to Approved for 107427 on php-pear-HTTP-Request2 (Fedora devel)
kevin has set build to Approved for 107427 on php-pear-HTTP-Request2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-Request2



From pkgdb at fedoraproject.org  Thu Dec  3 06:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:06 +0000
Subject: [pkgdb] php-pear-HTTP-Request2 summary updated by kevin
Message-ID: <20091203063206.8A7C910F8A8@bastion2.fedora.phx.redhat.com>

kevin set package php-pear-HTTP-Request2 summary to Provides an easy way to perform HTTP requests

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-Request2



From pkgdb at fedoraproject.org  Thu Dec  3 06:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:06 +0000
Subject: [pkgdb] php-pear-HTTP-Request2 (Fedora, 11) updated by kevin
Message-ID: <20091203063206.92E3410F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-pear-HTTP-Request2
kevin has set commit to Approved for 107427 on php-pear-HTTP-Request2 (Fedora 11)
kevin has set checkout to Approved for 107427 on php-pear-HTTP-Request2 (Fedora 11)
kevin has set build to Approved for 107427 on php-pear-HTTP-Request2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-Request2



From pkgdb at fedoraproject.org  Thu Dec  3 06:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:06 +0000
Subject: [pkgdb] php-pear-HTTP-Request2 (Fedora, 12) updated by kevin
Message-ID: <20091203063206.9C22510F8BB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-pear-HTTP-Request2
kevin has set commit to Approved for 107427 on php-pear-HTTP-Request2 (Fedora 12)
kevin has set checkout to Approved for 107427 on php-pear-HTTP-Request2 (Fedora 12)
kevin has set build to Approved for 107427 on php-pear-HTTP-Request2 (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-Request2



From kevin at fedoraproject.org  Thu Dec  3 06:32:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:32:15 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request2 - New directory
Message-ID: <20091203063215.17F8811C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22032/rpms/php-pear-HTTP-Request2

Log Message:
Directory /cvs/pkgs/rpms/php-pear-HTTP-Request2 added to the repository




From pkgdb at fedoraproject.org  Thu Dec  3 06:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:06 +0000
Subject: [pkgdb] php-pear-HTTP-Request2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203063206.A6FE010F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-pear-HTTP-Request2
kevin has set commit to Approved for 107427 on php-pear-HTTP-Request2 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-pear-HTTP-Request2 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-pear-HTTP-Request2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-Request2



From kevin at fedoraproject.org  Thu Dec  3 06:32:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:32:15 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request2/devel - New directory
Message-ID: <20091203063215.4645911C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22032/rpms/php-pear-HTTP-Request2/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pear-HTTP-Request2/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:32:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:32:24 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request2 Makefile,NONE,1.1
Message-ID: <20091203063224.232AF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22032/rpms/php-pear-HTTP-Request2

Added Files:
	Makefile 
Log Message:
Setup of module php-pear-HTTP-Request2


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTTP-Request2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:32:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:32:24 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request2/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091203063224.73A0411C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTTP-Request2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22032/rpms/php-pear-HTTP-Request2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTTP-Request2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-HTTP-Request2
# $Id: Makefile,v 1.1 2009/12/03 06:32:24 kevin Exp $
NAME := php-pear-HTTP-Request2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:32:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:54 +0000
Subject: [pkgdb] php-pear-HTTP-OAuth was added for remi
Message-ID: <20091203063254.4093510F89E@bastion2.fedora.phx.redhat.com>

kevin has added Package php-pear-HTTP-OAuth with summary Implementation of the OAuth spec
kevin has approved Package php-pear-HTTP-OAuth
kevin has added a Fedora devel branch for php-pear-HTTP-OAuth with an owner of remi
kevin has approved php-pear-HTTP-OAuth in Fedora devel
kevin has approved Package php-pear-HTTP-OAuth
kevin has set commit to Approved for 107427 on php-pear-HTTP-OAuth (Fedora devel)
kevin has set checkout to Approved for 107427 on php-pear-HTTP-OAuth (Fedora devel)
kevin has set build to Approved for 107427 on php-pear-HTTP-OAuth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-OAuth



From pkgdb at fedoraproject.org  Thu Dec  3 06:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:55 +0000
Subject: [pkgdb] php-pear-HTTP-OAuth summary updated by kevin
Message-ID: <20091203063255.B83A910F8A3@bastion2.fedora.phx.redhat.com>

kevin set package php-pear-HTTP-OAuth summary to Implementation of the OAuth spec

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-OAuth



From pkgdb at fedoraproject.org  Thu Dec  3 06:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:55 +0000
Subject: [pkgdb] php-pear-HTTP-OAuth (Fedora, 11) updated by kevin
Message-ID: <20091203063255.BFC2810F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-pear-HTTP-OAuth
kevin has set commit to Approved for 107427 on php-pear-HTTP-OAuth (Fedora 11)
kevin has set checkout to Approved for 107427 on php-pear-HTTP-OAuth (Fedora 11)
kevin has set build to Approved for 107427 on php-pear-HTTP-OAuth (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-OAuth



From pkgdb at fedoraproject.org  Thu Dec  3 06:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:32:55 +0000
Subject: [pkgdb] php-pear-HTTP-OAuth (Fedora, 12) updated by kevin
Message-ID: <20091203063255.C9D0410F8AA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-pear-HTTP-OAuth
kevin has set commit to Approved for 107427 on php-pear-HTTP-OAuth (Fedora 12)
kevin has set checkout to Approved for 107427 on php-pear-HTTP-OAuth (Fedora 12)
kevin has set build to Approved for 107427 on php-pear-HTTP-OAuth (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTTP-OAuth



From kevin at fedoraproject.org  Thu Dec  3 06:33:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:33:06 +0000 (UTC)
Subject: rpms/php-pear-HTTP-OAuth - New directory
Message-ID: <20091203063306.193C711C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTTP-OAuth
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22471/rpms/php-pear-HTTP-OAuth

Log Message:
Directory /cvs/pkgs/rpms/php-pear-HTTP-OAuth added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:33:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:33:06 +0000 (UTC)
Subject: rpms/php-pear-HTTP-OAuth/devel - New directory
Message-ID: <20091203063306.4FA3711C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTTP-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22471/rpms/php-pear-HTTP-OAuth/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pear-HTTP-OAuth/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:33:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:33:13 +0000 (UTC)
Subject: rpms/php-pear-HTTP-OAuth Makefile,NONE,1.1
Message-ID: <20091203063313.CE78511C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTTP-OAuth
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22471/rpms/php-pear-HTTP-OAuth

Added Files:
	Makefile 
Log Message:
Setup of module php-pear-HTTP-OAuth


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTTP-OAuth
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:33:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:33:14 +0000 (UTC)
Subject: rpms/php-pear-HTTP-OAuth/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091203063314.2F83011C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTTP-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ22471/rpms/php-pear-HTTP-OAuth/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTTP-OAuth


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-HTTP-OAuth
# $Id: Makefile,v 1.1 2009/12/03 06:33:13 kevin Exp $
NAME := php-pear-HTTP-OAuth
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:33:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:33:40 +0000
Subject: [pkgdb] php-pear-Services-Twitter was added for remi
Message-ID: <20091203063340.1D96E10F8B4@bastion2.fedora.phx.redhat.com>

kevin has added Package php-pear-Services-Twitter with summary PHP interface to Twitter's API
kevin has approved Package php-pear-Services-Twitter
kevin has added a Fedora devel branch for php-pear-Services-Twitter with an owner of remi
kevin has approved php-pear-Services-Twitter in Fedora devel
kevin has approved Package php-pear-Services-Twitter
kevin has set commit to Approved for 107427 on php-pear-Services-Twitter (Fedora devel)
kevin has set checkout to Approved for 107427 on php-pear-Services-Twitter (Fedora devel)
kevin has set build to Approved for 107427 on php-pear-Services-Twitter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Services-Twitter



From pkgdb at fedoraproject.org  Thu Dec  3 06:33:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:33:41 +0000
Subject: [pkgdb] php-pear-Services-Twitter summary updated by kevin
Message-ID: <20091203063341.49E7610F8BF@bastion2.fedora.phx.redhat.com>

kevin set package php-pear-Services-Twitter summary to PHP interface to Twitter's API

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Services-Twitter



From pkgdb at fedoraproject.org  Thu Dec  3 06:33:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:33:41 +0000
Subject: [pkgdb] php-pear-Services-Twitter (Fedora, 11) updated by kevin
Message-ID: <20091203063341.55F8510F8CD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-pear-Services-Twitter
kevin has set commit to Approved for 107427 on php-pear-Services-Twitter (Fedora 11)
kevin has set checkout to Approved for 107427 on php-pear-Services-Twitter (Fedora 11)
kevin has set build to Approved for 107427 on php-pear-Services-Twitter (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Services-Twitter



From kevin at fedoraproject.org  Thu Dec  3 06:33:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:33:50 +0000 (UTC)
Subject: rpms/php-pear-Services-Twitter - New directory
Message-ID: <20091203063350.1B24C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Services-Twitter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22773/rpms/php-pear-Services-Twitter

Log Message:
Directory /cvs/pkgs/rpms/php-pear-Services-Twitter added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:33:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:33:50 +0000 (UTC)
Subject: rpms/php-pear-Services-Twitter/devel - New directory
Message-ID: <20091203063350.4648E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Services-Twitter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22773/rpms/php-pear-Services-Twitter/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pear-Services-Twitter/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:33:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:33:59 +0000 (UTC)
Subject: rpms/php-pear-Services-Twitter Makefile,NONE,1.1
Message-ID: <20091203063359.7210A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Services-Twitter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22773/rpms/php-pear-Services-Twitter

Added Files:
	Makefile 
Log Message:
Setup of module php-pear-Services-Twitter


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Services-Twitter
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Dec  3 06:33:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:33:41 +0000
Subject: [pkgdb] php-pear-Services-Twitter (Fedora, 12) updated by kevin
Message-ID: <20091203063341.60CDF10F8D0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-pear-Services-Twitter
kevin has set commit to Approved for 107427 on php-pear-Services-Twitter (Fedora 12)
kevin has set checkout to Approved for 107427 on php-pear-Services-Twitter (Fedora 12)
kevin has set build to Approved for 107427 on php-pear-Services-Twitter (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Services-Twitter



From kevin at fedoraproject.org  Thu Dec  3 06:33:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:33:59 +0000 (UTC)
Subject: rpms/php-pear-Services-Twitter/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091203063359.C6CF811C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Services-Twitter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22773/rpms/php-pear-Services-Twitter/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Services-Twitter


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-Services-Twitter
# $Id: Makefile,v 1.1 2009/12/03 06:33:59 kevin Exp $
NAME := php-pear-Services-Twitter
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:34:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:34:45 +0000
Subject: [pkgdb] perl-HTTP-Daemon-SSL was added for stevetraylen
Message-ID: <20091203063445.C3F2C10F8AB@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-HTTP-Daemon-SSL with summary Simple http server class with SSL support
kevin has approved Package perl-HTTP-Daemon-SSL
kevin has added a Fedora devel branch for perl-HTTP-Daemon-SSL with an owner of stevetraylen
kevin has approved perl-HTTP-Daemon-SSL in Fedora devel
kevin has approved Package perl-HTTP-Daemon-SSL
kevin has set commit to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora devel)
kevin has set build to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Daemon-SSL



From pkgdb at fedoraproject.org  Thu Dec  3 06:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:34:48 +0000
Subject: [pkgdb] perl-HTTP-Daemon-SSL summary updated by kevin
Message-ID: <20091203063448.93F0010F8C5@bastion2.fedora.phx.redhat.com>

kevin set package perl-HTTP-Daemon-SSL summary to Simple http server class with SSL support

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Daemon-SSL



From pkgdb at fedoraproject.org  Thu Dec  3 06:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:34:48 +0000
Subject: [pkgdb] perl-HTTP-Daemon-SSL (Fedora, 11) updated by kevin
Message-ID: <20091203063448.9CBF810F841@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-HTTP-Daemon-SSL
kevin has set commit to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora 11)
kevin has set build to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora 11)
kevin approved watchbugzilla on perl-HTTP-Daemon-SSL (Fedora 11) for perl-sig
kevin approved watchcommits on perl-HTTP-Daemon-SSL (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Daemon-SSL



From pkgdb at fedoraproject.org  Thu Dec  3 06:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:34:48 +0000
Subject: [pkgdb] perl-HTTP-Daemon-SSL (Fedora EPEL, 4) updated by kevin
Message-ID: <20091203063448.B717A10F8BB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-HTTP-Daemon-SSL
kevin has set commit to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora EPEL 4)
kevin has set build to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora EPEL 4)
kevin approved watchbugzilla on perl-HTTP-Daemon-SSL (Fedora EPEL 4) for perl-sig
kevin approved watchcommits on perl-HTTP-Daemon-SSL (Fedora EPEL 4) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Daemon-SSL



From pkgdb at fedoraproject.org  Thu Dec  3 06:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:34:48 +0000
Subject: [pkgdb] perl-HTTP-Daemon-SSL (Fedora, devel) updated by kevin
Message-ID: <20091203063448.A786E10F8BC@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-HTTP-Daemon-SSL (Fedora devel) for perl-sig
kevin approved watchcommits on perl-HTTP-Daemon-SSL (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Daemon-SSL



From pkgdb at fedoraproject.org  Thu Dec  3 06:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:34:48 +0000
Subject: [pkgdb] perl-HTTP-Daemon-SSL (Fedora, 12) updated by kevin
Message-ID: <20091203063448.BEE6310F8CB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-HTTP-Daemon-SSL
kevin has set commit to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora 12)
kevin has set build to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora 12)
kevin approved watchbugzilla on perl-HTTP-Daemon-SSL (Fedora 12) for perl-sig
kevin approved watchcommits on perl-HTTP-Daemon-SSL (Fedora 12) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Daemon-SSL



From kevin at fedoraproject.org  Thu Dec  3 06:34:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:34:57 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL - New directory
Message-ID: <20091203063457.2090C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS23169/rpms/perl-HTTP-Daemon-SSL

Log Message:
Directory /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL added to the repository




From pkgdb at fedoraproject.org  Thu Dec  3 06:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:34:48 +0000
Subject: [pkgdb] perl-HTTP-Daemon-SSL (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203063448.CBF7310F8D2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-HTTP-Daemon-SSL
kevin has set commit to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-HTTP-Daemon-SSL (Fedora EPEL 5)
kevin approved watchbugzilla on perl-HTTP-Daemon-SSL (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-HTTP-Daemon-SSL (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Daemon-SSL



From kevin at fedoraproject.org  Thu Dec  3 06:34:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:34:57 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL/devel - New directory
Message-ID: <20091203063457.4E95B11C0376@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS23169/rpms/perl-HTTP-Daemon-SSL/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:35:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:35:06 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL Makefile,NONE,1.1
Message-ID: <20091203063506.1CBDB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS23169/rpms/perl-HTTP-Daemon-SSL

Added Files:
	Makefile 
Log Message:
Setup of module perl-HTTP-Daemon-SSL


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTTP-Daemon-SSL
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:35:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:35:06 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091203063506.982A211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS23169/rpms/perl-HTTP-Daemon-SSL/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTTP-Daemon-SSL


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-HTTP-Daemon-SSL
# $Id: Makefile,v 1.1 2009/12/03 06:35:06 kevin Exp $
NAME := perl-HTTP-Daemon-SSL
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:36:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:36:48 +0000
Subject: [pkgdb] mingw32-openjpeg was added for agoode
Message-ID: <20091203063648.BFF3310F8A8@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-openjpeg with summary mingw32 package for openjpeg
kevin has approved Package mingw32-openjpeg
kevin has added a Fedora devel branch for mingw32-openjpeg with an owner of agoode
kevin has approved mingw32-openjpeg in Fedora devel
kevin has approved Package mingw32-openjpeg
kevin has set commit to Approved for 107427 on mingw32-openjpeg (Fedora devel)
kevin has set checkout to Approved for 107427 on mingw32-openjpeg (Fedora devel)
kevin has set build to Approved for 107427 on mingw32-openjpeg (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:36:55 +0000
Subject: [pkgdb] mingw32-openjpeg summary updated by kevin
Message-ID: <20091203063655.51F0C10F8AC@bastion2.fedora.phx.redhat.com>

kevin set package mingw32-openjpeg summary to mingw32 package for openjpeg

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:36:55 +0000
Subject: [pkgdb] mingw32-openjpeg (Fedora, 11) updated by kevin
Message-ID: <20091203063655.5A6C310F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-openjpeg
kevin has set commit to Approved for 107427 on mingw32-openjpeg (Fedora 11)
kevin has set checkout to Approved for 107427 on mingw32-openjpeg (Fedora 11)
kevin has set build to Approved for 107427 on mingw32-openjpeg (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:36:55 +0000
Subject: [pkgdb] mingw32-openjpeg (Fedora, 12) updated by kevin
Message-ID: <20091203063655.661A210F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for mingw32-openjpeg
kevin has set commit to Approved for 107427 on mingw32-openjpeg (Fedora 12)
kevin has set checkout to Approved for 107427 on mingw32-openjpeg (Fedora 12)
kevin has set build to Approved for 107427 on mingw32-openjpeg (Fedora 12)

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



From kevin at fedoraproject.org  Thu Dec  3 06:37:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:37:03 +0000 (UTC)
Subject: rpms/mingw32-openjpeg - New directory
Message-ID: <20091203063703.1B75411C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-openjpeg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss23903/rpms/mingw32-openjpeg

Log Message:
Directory /cvs/pkgs/rpms/mingw32-openjpeg added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:37:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:37:03 +0000 (UTC)
Subject: rpms/mingw32-openjpeg/devel - New directory
Message-ID: <20091203063703.4714911C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-openjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss23903/rpms/mingw32-openjpeg/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-openjpeg/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:37:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:37:11 +0000 (UTC)
Subject: rpms/mingw32-openjpeg Makefile,NONE,1.1
Message-ID: <20091203063711.E2EB611C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-openjpeg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss23903/rpms/mingw32-openjpeg

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-openjpeg


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-openjpeg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:37:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:37:12 +0000 (UTC)
Subject: rpms/mingw32-openjpeg/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091203063712.3D45A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-openjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss23903/rpms/mingw32-openjpeg/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-openjpeg


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-openjpeg
# $Id: Makefile,v 1.1 2009/12/03 06:37:12 kevin Exp $
NAME := mingw32-openjpeg
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:37:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:37:35 +0000
Subject: [pkgdb] sqljet was added for akurtakov
Message-ID: <20091203063735.CD4A110F8A4@bastion2.fedora.phx.redhat.com>

kevin has added Package sqljet with summary Pure Java SQLite
kevin has approved Package sqljet
kevin has added a Fedora devel branch for sqljet with an owner of akurtakov
kevin has approved sqljet in Fedora devel
kevin has approved Package sqljet
kevin has set commit to Approved for 107427 on sqljet (Fedora devel)
kevin has set checkout to Approved for 107427 on sqljet (Fedora devel)
kevin has set build to Approved for 107427 on sqljet (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:37:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:37:36 +0000
Subject: [pkgdb] sqljet summary updated by kevin
Message-ID: <20091203063736.DA4F610F8C8@bastion2.fedora.phx.redhat.com>

kevin set package sqljet summary to Pure Java SQLite

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



From kevin at fedoraproject.org  Thu Dec  3 06:37:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:37:46 +0000 (UTC)
Subject: rpms/sqljet - New directory
Message-ID: <20091203063746.26ED211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sqljet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK24199/rpms/sqljet

Log Message:
Directory /cvs/pkgs/rpms/sqljet added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:37:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:37:46 +0000 (UTC)
Subject: rpms/sqljet/devel - New directory
Message-ID: <20091203063746.4E67F11C0382@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sqljet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK24199/rpms/sqljet/devel

Log Message:
Directory /cvs/pkgs/rpms/sqljet/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:37:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:37:54 +0000 (UTC)
Subject: rpms/sqljet Makefile,NONE,1.1
Message-ID: <20091203063754.E86BC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sqljet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK24199/rpms/sqljet

Added Files:
	Makefile 
Log Message:
Setup of module sqljet


--- NEW FILE Makefile ---
# Top level Makefile for module sqljet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:37:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:37:55 +0000 (UTC)
Subject: rpms/sqljet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091203063755.485E311C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sqljet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK24199/rpms/sqljet/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sqljet
# $Id: Makefile,v 1.1 2009/12/03 06:37:55 kevin Exp $
NAME := sqljet
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:38:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:38:29 +0000
Subject: [pkgdb] rubygem-ruby2ruby was added for mkent
Message-ID: <20091203063829.B2AD710F895@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-ruby2ruby with summary Generate pure ruby from RubyParser compatible Sexps
kevin has approved Package rubygem-ruby2ruby
kevin has added a Fedora devel branch for rubygem-ruby2ruby with an owner of mkent
kevin has approved rubygem-ruby2ruby in Fedora devel
kevin has approved Package rubygem-ruby2ruby
kevin has set commit to Approved for 107427 on rubygem-ruby2ruby (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-ruby2ruby (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-ruby2ruby (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:38:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:38:30 +0000
Subject: [pkgdb] rubygem-ruby2ruby summary updated by kevin
Message-ID: <20091203063830.DE2D510F89E@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-ruby2ruby summary to Generate pure ruby from RubyParser compatible Sexps

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:38:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:38:30 +0000
Subject: [pkgdb] rubygem-ruby2ruby (Fedora, 11) updated by kevin
Message-ID: <20091203063830.E9A9D10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-ruby2ruby
kevin has set commit to Approved for 107427 on rubygem-ruby2ruby (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-ruby2ruby (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-ruby2ruby (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:38:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:38:30 +0000
Subject: [pkgdb] rubygem-ruby2ruby (Fedora, 12) updated by kevin
Message-ID: <20091203063831.008E410F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-ruby2ruby
kevin has set commit to Approved for 107427 on rubygem-ruby2ruby (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-ruby2ruby (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-ruby2ruby (Fedora 12)

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



From kevin at fedoraproject.org  Thu Dec  3 06:38:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:38:39 +0000 (UTC)
Subject: rpms/rubygem-ruby2ruby - New directory
Message-ID: <20091203063839.1CDD611C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby2ruby
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN24470/rpms/rubygem-ruby2ruby

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ruby2ruby added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:38:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:38:39 +0000 (UTC)
Subject: rpms/rubygem-ruby2ruby/devel - New directory
Message-ID: <20091203063839.41E5211C032A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby2ruby/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN24470/rpms/rubygem-ruby2ruby/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ruby2ruby/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:38:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:38:47 +0000 (UTC)
Subject: rpms/rubygem-ruby2ruby Makefile,NONE,1.1
Message-ID: <20091203063847.9CD3C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby2ruby
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN24470/rpms/rubygem-ruby2ruby

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-ruby2ruby


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-ruby2ruby
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:38:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:38:47 +0000 (UTC)
Subject: rpms/rubygem-ruby2ruby/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091203063847.E604011C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby2ruby/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN24470/rpms/rubygem-ruby2ruby/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-ruby2ruby


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-ruby2ruby
# $Id: Makefile,v 1.1 2009/12/03 06:38:47 kevin Exp $
NAME := rubygem-ruby2ruby
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:39:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:39:19 +0000
Subject: [pkgdb] mono-bouncycastle was added for kalev
Message-ID: <20091203063919.3C53610F8A9@bastion2.fedora.phx.redhat.com>

kevin has added Package mono-bouncycastle with summary Bouncy Castle Crypto Package for Mono
kevin has approved Package mono-bouncycastle
kevin has added a Fedora devel branch for mono-bouncycastle with an owner of kalev
kevin has approved mono-bouncycastle in Fedora devel
kevin has approved Package mono-bouncycastle
kevin has set commit to Approved for 107427 on mono-bouncycastle (Fedora devel)
kevin has set checkout to Approved for 107427 on mono-bouncycastle (Fedora devel)
kevin has set build to Approved for 107427 on mono-bouncycastle (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:39:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:39:20 +0000
Subject: [pkgdb] mono-bouncycastle summary updated by kevin
Message-ID: <20091203063920.9F48510F8AA@bastion2.fedora.phx.redhat.com>

kevin set package mono-bouncycastle summary to Bouncy Castle Crypto Package for Mono

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:39:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:39:20 +0000
Subject: [pkgdb] mono-bouncycastle (Fedora, 11) updated by kevin
Message-ID: <20091203063920.A527310F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mono-bouncycastle
kevin has set commit to Approved for 107427 on mono-bouncycastle (Fedora 11)
kevin has set checkout to Approved for 107427 on mono-bouncycastle (Fedora 11)
kevin has set build to Approved for 107427 on mono-bouncycastle (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:39:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:39:20 +0000
Subject: [pkgdb] mono-bouncycastle (Fedora, 12) updated by kevin
Message-ID: <20091203063920.AFD8D10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for mono-bouncycastle
kevin has set commit to Approved for 107427 on mono-bouncycastle (Fedora 12)
kevin has set checkout to Approved for 107427 on mono-bouncycastle (Fedora 12)
kevin has set build to Approved for 107427 on mono-bouncycastle (Fedora 12)

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



From kevin at fedoraproject.org  Thu Dec  3 06:39:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:39:31 +0000 (UTC)
Subject: rpms/mono-bouncycastle - New directory
Message-ID: <20091203063931.17B3911C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mono-bouncycastle
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse24820/rpms/mono-bouncycastle

Log Message:
Directory /cvs/pkgs/rpms/mono-bouncycastle added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:39:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:39:31 +0000 (UTC)
Subject: rpms/mono-bouncycastle/devel - New directory
Message-ID: <20091203063931.43BF511C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mono-bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse24820/rpms/mono-bouncycastle/devel

Log Message:
Directory /cvs/pkgs/rpms/mono-bouncycastle/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:39:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:39:41 +0000 (UTC)
Subject: rpms/mono-bouncycastle/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091203063941.0EBAF11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mono-bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse24820/rpms/mono-bouncycastle/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mono-bouncycastle


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mono-bouncycastle
# $Id: Makefile,v 1.1 2009/12/03 06:39:40 kevin Exp $
NAME := mono-bouncycastle
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Thu Dec  3 06:39:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:39:40 +0000 (UTC)
Subject: rpms/mono-bouncycastle Makefile,NONE,1.1
Message-ID: <20091203063940.B4A9C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mono-bouncycastle
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse24820/rpms/mono-bouncycastle

Added Files:
	Makefile 
Log Message:
Setup of module mono-bouncycastle


--- NEW FILE Makefile ---
# Top level Makefile for module mono-bouncycastle
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Dec  3 06:40:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:40:10 +0000
Subject: [pkgdb] jazzy was added for lkundrak
Message-ID: <20091203064010.3B29510F8A5@bastion2.fedora.phx.redhat.com>

kevin has added Package jazzy with summary Java-based spellchecker
kevin has approved Package jazzy
kevin has added a Fedora devel branch for jazzy with an owner of lkundrak
kevin has approved jazzy in Fedora devel
kevin has approved Package jazzy
kevin has set commit to Approved for 107427 on jazzy (Fedora devel)
kevin has set checkout to Approved for 107427 on jazzy (Fedora devel)
kevin has set build to Approved for 107427 on jazzy (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:40:11 +0000
Subject: [pkgdb] jazzy summary updated by kevin
Message-ID: <20091203064011.A4C7210F8C1@bastion2.fedora.phx.redhat.com>

kevin set package jazzy summary to Java-based spellchecker

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:40:11 +0000
Subject: [pkgdb] jazzy (Fedora, 11) updated by kevin
Message-ID: <20091203064011.A884910F8C7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for jazzy
kevin has set commit to Approved for 107427 on jazzy (Fedora 11)
kevin has set checkout to Approved for 107427 on jazzy (Fedora 11)
kevin has set build to Approved for 107427 on jazzy (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:40:11 +0000
Subject: [pkgdb] jazzy (Fedora, 12) updated by kevin
Message-ID: <20091203064011.DEB9410F8CB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for jazzy
kevin has set commit to Approved for 107427 on jazzy (Fedora 12)
kevin has set checkout to Approved for 107427 on jazzy (Fedora 12)
kevin has set build to Approved for 107427 on jazzy (Fedora 12)

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



From kevin at fedoraproject.org  Thu Dec  3 06:40:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:40:21 +0000 (UTC)
Subject: rpms/jazzy/devel - New directory
Message-ID: <20091203064021.7967111C044D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jazzy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR25143/rpms/jazzy/devel

Log Message:
Directory /cvs/pkgs/rpms/jazzy/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:40:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:40:21 +0000 (UTC)
Subject: rpms/jazzy - New directory
Message-ID: <20091203064021.18EDA11C03F6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jazzy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR25143/rpms/jazzy

Log Message:
Directory /cvs/pkgs/rpms/jazzy added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:40:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:40:29 +0000 (UTC)
Subject: rpms/jazzy Makefile,NONE,1.1
Message-ID: <20091203064029.C504E11C03F6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jazzy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR25143/rpms/jazzy

Added Files:
	Makefile 
Log Message:
Setup of module jazzy


--- NEW FILE Makefile ---
# Top level Makefile for module jazzy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Thu Dec  3 06:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:40:11 +0000
Subject: [pkgdb] jazzy (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203064011.ECD2610F8D0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for jazzy
kevin has set commit to Approved for 107427 on jazzy (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on jazzy (Fedora EPEL 5)
kevin has set build to Approved for 107427 on jazzy (Fedora EPEL 5)

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



From kevin at fedoraproject.org  Thu Dec  3 06:40:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:40:30 +0000 (UTC)
Subject: rpms/jazzy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091203064030.BDD8D11C03F6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jazzy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR25143/rpms/jazzy/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jazzy
# $Id: Makefile,v 1.1 2009/12/03 06:40:30 kevin Exp $
NAME := jazzy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:41:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:41:05 +0000
Subject: [pkgdb] php-phpunit-bytekit was added for llaumgui
Message-ID: <20091203064106.0CE6C10F8C4@bastion2.fedora.phx.redhat.com>

kevin has added Package php-phpunit-bytekit with summary A command-line tool built on the PHP Bytekit extension
kevin has approved Package php-phpunit-bytekit
kevin has added a Fedora devel branch for php-phpunit-bytekit with an owner of llaumgui
kevin has approved php-phpunit-bytekit in Fedora devel
kevin has approved Package php-phpunit-bytekit
kevin has set commit to Approved for 107427 on php-phpunit-bytekit (Fedora devel)
kevin has set checkout to Approved for 107427 on php-phpunit-bytekit (Fedora devel)
kevin has set build to Approved for 107427 on php-phpunit-bytekit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-bytekit



From pkgdb at fedoraproject.org  Thu Dec  3 06:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:41:07 +0000
Subject: [pkgdb] php-phpunit-bytekit summary updated by kevin
Message-ID: <20091203064107.BC45610F8C3@bastion2.fedora.phx.redhat.com>

kevin set package php-phpunit-bytekit summary to A command-line tool built on the PHP Bytekit extension

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-bytekit



From pkgdb at fedoraproject.org  Thu Dec  3 06:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:41:07 +0000
Subject: [pkgdb] php-phpunit-bytekit (Fedora, 11) updated by kevin
Message-ID: <20091203064107.C371010F8D5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-phpunit-bytekit
kevin has set commit to Approved for 107427 on php-phpunit-bytekit (Fedora 11)
kevin has set checkout to Approved for 107427 on php-phpunit-bytekit (Fedora 11)
kevin has set build to Approved for 107427 on php-phpunit-bytekit (Fedora 11)
kevin approved watchbugzilla on php-phpunit-bytekit (Fedora 11) for cdamian
kevin approved watchcommits on php-phpunit-bytekit (Fedora 11) for cdamian
kevin approved commit on php-phpunit-bytekit (Fedora 11) for cdamian
kevin approved build on php-phpunit-bytekit (Fedora 11) for cdamian
kevin approved approveacls on php-phpunit-bytekit (Fedora 11) for cdamian

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-bytekit



From kevin at fedoraproject.org  Thu Dec  3 06:41:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:41:15 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit - New directory
Message-ID: <20091203064115.2126411C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-phpunit-bytekit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj25581/rpms/php-phpunit-bytekit

Log Message:
Directory /cvs/pkgs/rpms/php-phpunit-bytekit added to the repository




From pkgdb at fedoraproject.org  Thu Dec  3 06:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:41:07 +0000
Subject: [pkgdb] php-phpunit-bytekit (Fedora, devel) updated by kevin
Message-ID: <20091203064107.D0CEE10F8D9@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on php-phpunit-bytekit (Fedora devel) for cdamian
kevin approved watchcommits on php-phpunit-bytekit (Fedora devel) for cdamian
kevin approved commit on php-phpunit-bytekit (Fedora devel) for cdamian
kevin approved build on php-phpunit-bytekit (Fedora devel) for cdamian
kevin approved approveacls on php-phpunit-bytekit (Fedora devel) for cdamian

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-bytekit



From pkgdb at fedoraproject.org  Thu Dec  3 06:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:41:07 +0000
Subject: [pkgdb] php-phpunit-bytekit (Fedora, 12) updated by kevin
Message-ID: <20091203064107.DC57A10F8DD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-phpunit-bytekit
kevin has set commit to Approved for 107427 on php-phpunit-bytekit (Fedora 12)
kevin has set checkout to Approved for 107427 on php-phpunit-bytekit (Fedora 12)
kevin has set build to Approved for 107427 on php-phpunit-bytekit (Fedora 12)
kevin approved watchbugzilla on php-phpunit-bytekit (Fedora 12) for cdamian
kevin approved watchcommits on php-phpunit-bytekit (Fedora 12) for cdamian
kevin approved commit on php-phpunit-bytekit (Fedora 12) for cdamian
kevin approved build on php-phpunit-bytekit (Fedora 12) for cdamian
kevin approved approveacls on php-phpunit-bytekit (Fedora 12) for cdamian

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-phpunit-bytekit



From kevin at fedoraproject.org  Thu Dec  3 06:41:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:41:15 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit/devel - New directory
Message-ID: <20091203064115.4543C11C0382@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-phpunit-bytekit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj25581/rpms/php-phpunit-bytekit/devel

Log Message:
Directory /cvs/pkgs/rpms/php-phpunit-bytekit/devel added to the repository




From kevin at fedoraproject.org  Thu Dec  3 06:41:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:41:24 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit Makefile,NONE,1.1
Message-ID: <20091203064124.C588011C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-phpunit-bytekit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj25581/rpms/php-phpunit-bytekit

Added Files:
	Makefile 
Log Message:
Setup of module php-phpunit-bytekit


--- NEW FILE Makefile ---
# Top level Makefile for module php-phpunit-bytekit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:41:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:41:25 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091203064125.6709A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-phpunit-bytekit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj25581/rpms/php-phpunit-bytekit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-phpunit-bytekit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-phpunit-bytekit
# $Id: Makefile,v 1.1 2009/12/03 06:41:25 kevin Exp $
NAME := php-phpunit-bytekit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec  3 06:44:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:44:02 +0000
Subject: [pkgdb] perl-XML-LibXSLT (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203064402.7369310F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-XML-LibXSLT
kevin has set commit to Approved for 107427 on perl-XML-LibXSLT (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-XML-LibXSLT (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-XML-LibXSLT (Fedora EPEL 5)
kevin changed owner of perl-XML-LibXSLT in Fedora EPEL 5 to mmaslano

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-LibXSLT



From pkgdb at fedoraproject.org  Thu Dec  3 06:44:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:44:53 +0000
Subject: [pkgdb] torque (Fedora EPEL, 4) updated by kevin
Message-ID: <20091203064453.8F62210F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for torque
kevin has set commit to Approved for 107427 on torque (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on torque (Fedora EPEL 4)
kevin has set build to Approved for 107427 on torque (Fedora EPEL 4)
kevin changed owner of torque in Fedora EPEL 4 to stevetraylen
kevin approved watchbugzilla on torque (Fedora EPEL 4) for garrick
kevin approved watchcommits on torque (Fedora EPEL 4) for garrick
kevin approved commit on torque (Fedora EPEL 4) for garrick
kevin approved build on torque (Fedora EPEL 4) for garrick
kevin approved approveacls on torque (Fedora EPEL 4) for garrick

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:44:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:44:53 +0000
Subject: [pkgdb] torque (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203064453.9DFEB10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for torque
kevin has set commit to Approved for 107427 on torque (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on torque (Fedora EPEL 5)
kevin has set build to Approved for 107427 on torque (Fedora EPEL 5)
kevin changed owner of torque in Fedora EPEL 5 to stevetraylen
kevin approved watchbugzilla on torque (Fedora EPEL 5) for garrick
kevin approved watchcommits on torque (Fedora EPEL 5) for garrick
kevin approved commit on torque (Fedora EPEL 5) for garrick
kevin approved build on torque (Fedora EPEL 5) for garrick
kevin approved approveacls on torque (Fedora EPEL 5) for garrick

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:45:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:45:28 +0000
Subject: [pkgdb] perl-POE-Test-Loops (Fedora EPEL, 5) updated by kevin
Message-ID: <20091203064528.9E6C610F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-POE-Test-Loops
kevin has set commit to Approved for 107427 on perl-POE-Test-Loops (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-POE-Test-Loops (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-POE-Test-Loops (Fedora EPEL 5)
kevin changed owner of perl-POE-Test-Loops in Fedora EPEL 5 to stevetraylen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-POE-Test-Loops



From whot at fedoraproject.org  Thu Dec  3 06:45:49 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  3 Dec 2009 06:45:49 +0000 (UTC)
Subject: rpms/evtest/devel .cvsignore, 1.3, 1.4 evtest.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091203064549.5544311C00EE@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore evtest.spec sources 
Log Message:
* Thu Dec 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.25-1
- evtest 1.25 (includes evtest-capture)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Nov 2009 23:35:29 -0000	1.3
+++ .cvsignore	3 Dec 2009 06:45:48 -0000	1.4
@@ -1 +1 @@
-evtest-1.24.tar.bz2
+evtest-1.25.tar.bz2


Index: evtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/devel/evtest.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- evtest.spec	10 Nov 2009 23:35:30 -0000	1.2
+++ evtest.spec	3 Dec 2009 06:45:49 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           evtest
-Version:        1.24
+Version:        1.25
 Release:        1%{?dist}
 Summary:        Event device test program
 
@@ -10,6 +10,7 @@ Source0:        http://cgit.freedesktop.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake
+BuildRequires:  asciidoc xmlto libxml2-devel
 
 %description
 %{name} is a simple utility to query information about input devices 
@@ -33,10 +34,16 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+%{_bindir}/evtest-capture
 %doc COPYING
 %{_mandir}/man1/evtest.1*
+%{_mandir}/man1/evtest-capture.1*
+%{_datadir}/%{name}/evtest-create-device.xsl
 
 %changelog
+* Thu Dec 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.25-1
+- evtest 1.25 (includes evtest-capture)
+
 * Wed Nov 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.24-1
 - evtest 1.24
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Nov 2009 23:35:30 -0000	1.3
+++ sources	3 Dec 2009 06:45:49 -0000	1.4
@@ -1 +1 @@
-24daa819cc1c52dc2e20c28d84651e24  evtest-1.24.tar.bz2
+f0c053ca02dade1ef0401798c2bea781  evtest-1.25.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec  3 06:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:46:42 +0000
Subject: [pkgdb] rubygem-ruby_parser summary updated by kevin
Message-ID: <20091203064642.A70A610F896@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-ruby_parser summary to A ruby parser written in pure ruby

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



From pkgdb at fedoraproject.org  Thu Dec  3 06:46:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:46:40 +0000
Subject: [pkgdb] rubygem-ruby_parser was added for mkent
Message-ID: <20091203064640.B68F310F891@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-ruby_parser with summary A ruby parser written in pure ruby
kevin has approved Package rubygem-ruby_parser
kevin has added a Fedora devel branch for rubygem-ruby_parser with an owner of mkent
kevin has approved rubygem-ruby_parser in Fedora devel
kevin has approved Package rubygem-ruby_parser
kevin has set commit to Approved for 107427 on rubygem-ruby_parser (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-ruby_parser (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-ruby_parser (Fedora devel)

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



From kevin at fedoraproject.org  Thu Dec  3 06:46:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:46:53 +0000 (UTC)
Subject: rpms/rubygem-ruby_parser - New directory
Message-ID: <20091203064653.1AFBE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby_parser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL27509/rpms/rubygem-ruby_parser

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ruby_parser added to the repository




From pkgdb at fedoraproject.org  Thu Dec  3 06:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:46:42 +0000
Subject: [pkgdb] rubygem-ruby_parser (Fedora, 11) updated by kevin
Message-ID: <20091203064642.AD38D10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-ruby_parser
kevin has set commit to Approved for 107427 on rubygem-ruby_parser (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-ruby_parser (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-ruby_parser (Fedora 11)

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



From kevin at fedoraproject.org  Thu Dec  3 06:46:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:46:53 +0000 (UTC)
Subject: rpms/rubygem-ruby_parser/devel - New directory
Message-ID: <20091203064653.4889411C0376@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby_parser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL27509/rpms/rubygem-ruby_parser/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ruby_parser/devel added to the repository




From pkgdb at fedoraproject.org  Thu Dec  3 06:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 06:46:42 +0000
Subject: [pkgdb] rubygem-ruby_parser (Fedora, 12) updated by kevin
Message-ID: <20091203064642.B666910F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-ruby_parser
kevin has set commit to Approved for 107427 on rubygem-ruby_parser (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-ruby_parser (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-ruby_parser (Fedora 12)

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



From kevin at fedoraproject.org  Thu Dec  3 06:47:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:47:02 +0000 (UTC)
Subject: rpms/rubygem-ruby_parser Makefile,NONE,1.1
Message-ID: <20091203064702.BB78C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby_parser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL27509/rpms/rubygem-ruby_parser

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-ruby_parser


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-ruby_parser
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec  3 06:47:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  3 Dec 2009 06:47:03 +0000 (UTC)
Subject: rpms/rubygem-ruby_parser/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091203064703.5D11511C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby_parser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL27509/rpms/rubygem-ruby_parser/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-ruby_parser


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-ruby_parser
# $Id: Makefile,v 1.1 2009/12/03 06:47:02 kevin Exp $
NAME := rubygem-ruby_parser
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kyle at fedoraproject.org  Thu Dec  3 06:58:30 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  3 Dec 2009 06:58:30 +0000 (UTC)
Subject: File linux-2.6.32.tar.bz2 uploaded to lookaside cache by kyle
Message-ID: <20091203065830.1611910F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kernel:

260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2



From mmaslano at fedoraproject.org  Thu Dec  3 06:58:48 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu,  3 Dec 2009 06:58:48 +0000 (UTC)
Subject: rpms/perl-XML-LibXSLT/EL-5 perl-XML-LibXSLT.spec,1.7,1.8
Message-ID: <20091203065848.9BF9111C00EE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XML-LibXSLT/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29877

Modified Files:
	perl-XML-LibXSLT.spec 
Log Message:
* Thu Dec 3 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.58-5
- rebuild for EPEL



Index: perl-XML-LibXSLT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-LibXSLT/EL-5/perl-XML-LibXSLT.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-XML-LibXSLT.spec	16 Aug 2007 23:07:09 -0000	1.7
+++ perl-XML-LibXSLT.spec	3 Dec 2009 06:58:48 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		perl-XML-LibXSLT
 Version:	1.58
-Release:	4%{?dist}
+Release:	5%{?dist}
 
 Summary:	Perl module for interfacing to GNOME's libxslt
 
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Dec 3 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.58-5
+- rebuild for EPEL
+
 * Thu Aug 16 2007 Zing <zing at fastmail.fm> - 1.58-4
 - conform to Fedora Licensing Guidelines
 



From kyle at fedoraproject.org  Thu Dec  3 07:04:22 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  3 Dec 2009 07:04:22 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.32.tar.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1147, 1.1148 kernel.spec, 1.1863, 1.1864 sources, 1.1106,
	1.1107 upstream, 1.1019, 1.1020 linux-2.6.31.tar.bz2.sign, 1.1,
	NONE patch-2.6.32-rc8-git5.bz2.sign, 1.1,
	NONE patch-2.6.32-rc8.bz2.sign, 1.1, NONE
Message-ID: <20091203070422.164E211C00EE@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	linux-2.6.32.tar.bz2.sign 
Removed Files:
	linux-2.6.31.tar.bz2.sign patch-2.6.32-rc8-git5.bz2.sign 
	patch-2.6.32-rc8.bz2.sign 
Log Message:
* Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-1
- Linux 2.6.32



--- NEW FILE linux-2.6.32.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLF1qqyGugalF9Dw4RAiP6AJwLIwUWOmzYNgbg0idlA0462rTVSwCglKbm
u346vCa2H8XN6LA1m9D/9rQ=
=NE61
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1147
retrieving revision 1.1148
diff -u -p -r1.1147 -r1.1148
--- .cvsignore	3 Dec 2009 06:05:04 -0000	1.1147
+++ .cvsignore	3 Dec 2009 07:04:20 -0000	1.1148
@@ -3,7 +3,5 @@ clog
 GNUmakefile
 kernel-2.6.*.config
 temp-*
-kernel-2.6.31
-linux-2.6.31.tar.bz2
-patch-2.6.32-rc8.bz2
-patch-2.6.32-rc8-git5.bz2
+kernel-2.6.32
+linux-2.6.32.tar.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1863
retrieving revision 1.1864
diff -u -p -r1.1863 -r1.1864
--- kernel.spec	3 Dec 2009 06:05:05 -0000	1.1863
+++ kernel.spec	3 Dec 2009 07:04:20 -0000	1.1864
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 0
+%global released_kernel 1
 
 # Versions of various parts
 
@@ -27,14 +27,14 @@ Summary: The Linux kernel
 # 1.1205.1.1.  In this case we drop the initial 1, subtract fedora_cvs_origin
 # from the second number, and then append the rest of the RCS string as is.
 # Don't stare at the awk too long, you'll go blind.
-%define fedora_cvs_origin   1798
+%define fedora_cvs_origin   1863
 %define fedora_cvs_revision() %2
 %global fedora_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision$} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }')
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 31
+%define base_sublevel 32
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
@@ -59,9 +59,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 8
+%define rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1995,6 +1995,9 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-1
+- Linux 2.6.32
+
 * Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.65.rc8.git5
 - 2.6.32-rc8-git5
 - nuke 9p cachefiles fix, upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1106
retrieving revision 1.1107
diff -u -p -r1.1106 -r1.1107
--- sources	3 Dec 2009 06:05:05 -0000	1.1106
+++ sources	3 Dec 2009 07:04:21 -0000	1.1107
@@ -1,3 +1 @@
-84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-043dae863c41ea8d56dc3da55e241069  patch-2.6.32-rc8.bz2
-198e9c6bdda8f10e515aa2dc75a4da75  patch-2.6.32-rc8-git5.bz2
+260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1019
retrieving revision 1.1020
diff -u -p -r1.1019 -r1.1020
--- upstream	3 Dec 2009 06:05:05 -0000	1.1019
+++ upstream	3 Dec 2009 07:04:21 -0000	1.1020
@@ -1,3 +1 @@
-linux-2.6.31.tar.bz2
-patch-2.6.32-rc8.bz2
-patch-2.6.32-rc8-git5.bz2
+linux-2.6.32.tar.bz2


--- linux-2.6.31.tar.bz2.sign DELETED ---


--- patch-2.6.32-rc8-git5.bz2.sign DELETED ---


--- patch-2.6.32-rc8.bz2.sign DELETED ---



From kklic at fedoraproject.org  Thu Dec  3 07:20:39 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Thu,  3 Dec 2009 07:20:39 +0000 (UTC)
Subject: rpms/zip/F-12 zip-2.31-exec-shield.patch, NONE, 1.1 sources, 1.3,
	1.4 zip.spec, 1.31, 1.32 exec-shield.patch, 1.1, NONE
Message-ID: <20091203072039.3ECFD11C0396@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/zip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3186

Modified Files:
	sources zip.spec 
Added Files:
	zip-2.31-exec-shield.patch 
Removed Files:
	exec-shield.patch 
Log Message:
Renamed exec-shield patch, removed zcrypt

zip-2.31-exec-shield.patch:
 crc_i386.S |    3 +++
 match.S    |    2 ++
 2 files changed, 5 insertions(+)

--- NEW FILE zip-2.31-exec-shield.patch ---
diff -ur zip-2.3/crc_i386.S zip-2.3-lhh/crc_i386.S
--- zip-2.3/crc_i386.S	1999-10-09 16:10:26.000000000 -0400
+++ zip-2.3-lhh/crc_i386.S	2003-10-24 16:15:52.000000000 -0400
@@ -230,3 +230,6 @@
 #endif /* i386 || _i386 || _I386 || __i386 */
 
 #endif /* !USE_ZLIB */
+
+.section .note.GNU-stack, "", @progbits
+.previous
diff -ur zip-2.3/match.S zip-2.3-lhh/match.S
--- zip-2.3/match.S	1999-07-27 17:18:14.000000000 -0400
+++ zip-2.3-lhh/match.S	2003-10-24 16:15:38.000000000 -0400
@@ -405,3 +405,5 @@
 #endif /* i386 || _I386 || _i386 || __i386  */
 
 #endif /* !USE_ZLIB */
+.section .note.GNU-stack, "", @progbits
+.previous


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zip/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Nov 2005 13:08:08 -0000	1.3
+++ sources	3 Dec 2009 07:20:37 -0000	1.4
@@ -1,2 +1 @@
-922f7f38f8e50ec353fd5b3102e4d4d6  zcrypt29.tar.gz
 6bfc076664416251d7624ab3538d1cb9  zip231.tar.gz


Index: zip.spec
===================================================================
RCS file: /cvs/extras/rpms/zip/F-12/zip.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- zip.spec	27 Jul 2009 09:03:18 -0000	1.31
+++ zip.spec	3 Dec 2009 07:20:37 -0000	1.32
@@ -1,14 +1,13 @@
 Summary: A file compression and packaging utility compatible with PKZIP
 Name: zip
 Version: 2.31
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Applications/Archiving
 Source: http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz
-Source1: ftp://ftp.freesoftware.com/pub/infozip/src/zcrypt29.tar.gz
 URL: http://www.info-zip.org/pub/infozip/Zip.html
 Patch0: zip23.patch
-Patch1: exec-shield.patch
+Patch1: zip-2.31-exec-shield.patch
 Patch2: zip23-umask.patch
 Patch5: zip-2.3-currdir.patch
 Patch6: zip-2.31-install.patch
@@ -29,9 +28,9 @@ Install the zip package if you need to c
 program.
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p1 -b .zip
-%patch1 -p1 -b .zip
+%patch1 -p1 -b .exec-shield
 %patch2 -p1 -b .umask
 %patch5 -p1 -b .currdir
 %patch6 -p1 -b .install
@@ -72,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/zip.1*
 
 %changelog
+* Thu Dec  3 2009 Karel Klic <kklic at redhat.com> - 2.31-9
+- Renamed exec-shield.patch to zip-2.31-exec-shield.patch
+- Removed zcrypt29.tar.gz as it is no longer necessary
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.31-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- exec-shield.patch DELETED ---



From cdamian at fedoraproject.org  Thu Dec  3 07:23:31 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu,  3 Dec 2009 07:23:31 +0000 (UTC)
Subject: File File_Iterator-1.1.0.tgz uploaded to lookaside cache by cdamian
Message-ID: <20091203072331.7381310F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-phpunit-File-Iterator:

8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz



From mtasaka at fedoraproject.org  Thu Dec  3 07:24:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Dec 2009 07:24:09 +0000 (UTC)
Subject: rpms/gnome-commander/F-12
	gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch,
	NONE, 1.1 gnome-commander.spec, 1.64, 1.65
Message-ID: <20091203072409.A032A11C00EE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4530

Modified Files:
	gnome-commander.spec 
Added Files:
	gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch 
Log Message:
* Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:1.2.8.3-2
- Fix crash when cancelling symlink creation with ESC
  (bug 542366, GNOME bug 603301)


gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch:
 gnome-cmd-dialog.c        |    1 +
 gnome-cmd-string-dialog.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch ---
commit b6cee8a6fa8e026dbbdbea263b7053a958e415af
Author: Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
Date:   Wed Dec 2 23:24:12 2009 +0100

    Fixed problem #603301 (crash when cancelling symlink creation by ESC)

diff --git a/libgcmd/gnome-cmd-dialog.c b/libgcmd/gnome-cmd-dialog.c
index ce89824..97a21a1 100644
--- a/libgcmd/gnome-cmd-dialog.c
+++ b/libgcmd/gnome-cmd-dialog.c
@@ -63,6 +63,7 @@ static void destroy (GtkObject *object)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 
     g_free (dialog->priv);
+    dialog->priv = NULL;
 }
 
 
diff --git a/libgcmd/gnome-cmd-string-dialog.c b/libgcmd/gnome-cmd-string-dialog.c
index 4ab5fab..77d824e 100644
--- a/libgcmd/gnome-cmd-string-dialog.c
+++ b/libgcmd/gnome-cmd-string-dialog.c
@@ -82,8 +82,11 @@ destroy (GtkObject *object)
     if (GTK_OBJECT_CLASS (parent_class)->destroy)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 
-    g_free (dialog->priv->error_desc);
+    if (dialog->priv)
+        g_free (dialog->priv->error_desc);
+ 
     g_free (dialog->priv);
+    dialog->priv = NULL;
 }
 
 


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/gnome-commander.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnome-commander.spec	25 Nov 2009 16:02:53 -0000	1.64
+++ gnome-commander.spec	3 Dec 2009 07:24:09 -0000	1.65
@@ -16,31 +16,29 @@
 #
 # ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html
 
-#
-# Source20 is extracted from gnome-commander-1.2.8.2.tar.bz2
-# wget -N ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/gnome-commander-1.2.8.2.tar.bz2
-# tar xf gnome-commander-1.2.8.2.tar.bz2
-# tar cjf gnome-commander-1.2.8.2-po.tar.bz2 gnome-commander-1.2.8.2/po/
-
-%define        EXIV2_REQ             0.14
-%define        TAGLIB_REQ            1.4
-%define        LIBGSF_REQ            1.12.0
-%define        POPPLER_REQ           0.6
-
-%define        git_pull_JST          D20090629T1400
-
-%define        use_autotool          0
-%define        if_pre                0
-%define        main_release          1
-%define        extratag              git_%{git_pull_JST}
+%global        EXIV2_REQ             0.14
+%global        TAGLIB_REQ            1.4
+%global        LIBGSF_REQ            1.12.0
+%global        POPPLER_REQ           0.6
+
+%global        git_pull_JST          D20090629T1400
+
+%global        use_autotool          0
+%global        update_po             0
+%global        if_pre                0
+%global        main_release          2
+%global        extratag              git_%{git_pull_JST}
 %undefine      extratag
-%define        mimeedit_rev          1958
+%global        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
-%define        use_autotool          1
+%global        use_autotool          1
+%endif
+%if 0%{?use_autotool} < 1
+%global        update_po             0
 %endif
 
-%define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
+%global        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
 Version:       1.2.8.3
@@ -58,6 +56,8 @@ Source0:       ftp://ftp.gnome.org/pub/G
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
 Patch10:       mimeedit-svn1958.diff
+# From upstream
+Patch20:       gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -123,45 +123,18 @@ ansluta till FTP-servrar och SMB-n?tver
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
 
 %if 0%{use_autotool} > 0
-# Workaround to make gnome-autogen support automake 1.11
-# Note that fixed gnome-common-2.26.0-2.fc11 is now in testing
-mkdir TMPBIN ; cd TMPBIN
-sed -e 's|automake-1\.10|automake-1.11 automake-1.10|' \
-	%{_bindir}/gnome-autogen.sh > ./gnome-autogen.sh
-chmod 0755 ./gnome-autogen.sh
-export PATH=$(pwd):$PATH
-cd ..
-
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
 sh autogen.sh
 %endif
 
-cp -p %SOURCE10 mimeedit.sh
+%{__cp} -p %SOURCE10 mimeedit.sh
 %patch10 -p0
+%patch20 -p1 -b .symlink
 
 %{__sed} -i.pylib \
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
-%if 0%{?fedora} >= 10 && 0
-function replace_icon(){
-	find . -name \*.cc | xargs grep -l $1 | \
-		xargs %{__sed} -i.icon -e "s|\"$1\"|\"$2\"|"
-}
-
-
-# Replace icon name due to gnome-icon-theme 2.23.x change
-# (many icons are removed)
-replace_icon	gnome-fs-directory	gtk-directory
-replace_icon	gnome-fs-ftp		folder-remote
-replace_icon	gnome-fs-home		user-home
-replace_icon	gnome-fs-network	gtk-network
-replace_icon	gnome-fs-smb		network-workgroup
-replace_icon	gnome-fs-ssh		folder-remote
-replace_icon	gnome-fs-web		folder-remote
-
-%endif
-
 # gzip
 gzip -9 ChangeLog-*
 
@@ -173,9 +146,13 @@ gzip -9 ChangeLog-*
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
-# Sometimes parallel make fails (perhaps), however once
-# force it.
-%{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
+
+%if %{update_po}
+%{__make} -C po gnome-commander.pot update-po
+%endif
+
+%{__make} %{?_smp_mflags} -k \
+	GMSGFMT="msgfmt --statistics"
 
 %install
 %{__rm} -rf %{buildroot}
@@ -240,6 +217,10 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:1.2.8.3-2
+- Fix crash when cancelling symlink creation with ESC
+  (bug 542366, GNOME bug 603301)
+
 * Thu Nov 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:1.2.8.3-1
 - Use stable 1.2.8.x branch for F-12 after discussion with
   the upstream developer



From cdamian at fedoraproject.org  Thu Dec  3 07:24:20 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu,  3 Dec 2009 07:24:20 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/devel import.log, NONE,
	1.1 php-phpunit-File-Iterator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091203072420.4867F11C00EE@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4518/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-phpunit-File-Iterator.spec 
Log Message:
inital import



--- NEW FILE import.log ---
php-phpunit-File-Iterator-1_1_0-4_fc12:HEAD:php-phpunit-File-Iterator-1.1.0-4.fc12.src.rpm:1259825023


--- NEW FILE php-phpunit-File-Iterator.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name File_Iterator
%define channel pear.phpunit.de

Name:           php-phpunit-File-Iterator
Version:        1.1.0
Release:        4%{?dist}
Summary:        FilterIterator implementation that filters files based on a list of suffixes

Group:          Development/Libraries
License:        BSD
URL:            http://github.com/sebastianbergmann/php-file-iterator/
Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.7.2
BuildRequires:  php-channel(%{channel})
Requires:       php-channel(%{channel})
Requires:       php-common >= 5.2.0
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
FilterIterator implementation that filters files based on a list of suffixes.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
%{__sed} -i -e "s@<min>1.8.1</min>@<min>1.7.2</min>@" %{name}.xml


%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 %{name}.xml

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
  %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
  %{__pear} uninstall --nodeps --ignore-errors --register-only \
    pear.phpunit.de/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/File

%changelog
* Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4
- own pear directories

* Sat Nov 28 2009 Christof Damian <christof at damian.net> 1.1.0-3
- fixed php-pear buildrequire
- just require php-common

* Thu Nov 26 2009 Christof Damian <christof at damian.net> 1.1.0-2
- fix package.xml to work with older pear versions

* Wed Nov 25 2009 Christof Damian <christof at damian.net> 1.1.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:26:28 -0000	1.1
+++ .cvsignore	3 Dec 2009 07:24:19 -0000	1.2
@@ -0,0 +1 @@
+File_Iterator-1.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:26:29 -0000	1.1
+++ sources	3 Dec 2009 07:24:20 -0000	1.2
@@ -0,0 +1 @@
+8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz



From cdamian at fedoraproject.org  Thu Dec  3 07:26:04 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu,  3 Dec 2009 07:26:04 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/EL-5 import.log, NONE,
	1.1 php-phpunit-File-Iterator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091203072604.BBAD511C00EE@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5086/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-phpunit-File-Iterator.spec 
Log Message:
initial import



--- NEW FILE import.log ---
php-phpunit-File-Iterator-1_1_0-4_fc12:EL-5:php-phpunit-File-Iterator-1.1.0-4.fc12.src.rpm:1259825126


--- NEW FILE php-phpunit-File-Iterator.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name File_Iterator
%define channel pear.phpunit.de

Name:           php-phpunit-File-Iterator
Version:        1.1.0
Release:        4%{?dist}
Summary:        FilterIterator implementation that filters files based on a list of suffixes

Group:          Development/Libraries
License:        BSD
URL:            http://github.com/sebastianbergmann/php-file-iterator/
Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.7.2
BuildRequires:  php-channel(%{channel})
Requires:       php-channel(%{channel})
Requires:       php-common >= 5.2.0
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
FilterIterator implementation that filters files based on a list of suffixes.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
%{__sed} -i -e "s@<min>1.8.1</min>@<min>1.7.2</min>@" %{name}.xml


%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 %{name}.xml

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
  %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
  %{__pear} uninstall --nodeps --ignore-errors --register-only \
    pear.phpunit.de/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/File

%changelog
* Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4
- own pear directories

* Sat Nov 28 2009 Christof Damian <christof at damian.net> 1.1.0-3
- fixed php-pear buildrequire
- just require php-common

* Thu Nov 26 2009 Christof Damian <christof at damian.net> 1.1.0-2
- fix package.xml to work with older pear versions

* Wed Nov 25 2009 Christof Damian <christof at damian.net> 1.1.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:26:28 -0000	1.1
+++ .cvsignore	3 Dec 2009 07:26:04 -0000	1.2
@@ -0,0 +1 @@
+File_Iterator-1.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:26:29 -0000	1.1
+++ sources	3 Dec 2009 07:26:04 -0000	1.2
@@ -0,0 +1 @@
+8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz



From cdamian at fedoraproject.org  Thu Dec  3 07:29:05 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu,  3 Dec 2009 07:29:05 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/F-11 import.log, NONE,
	1.1 php-phpunit-File-Iterator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091203072905.2EB5011C00EE@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6042/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-phpunit-File-Iterator.spec 
Log Message:
initial import



--- NEW FILE import.log ---
php-phpunit-File-Iterator-1_1_0-4_fc12:F-11:php-phpunit-File-Iterator-1.1.0-4.fc12.src.rpm:1259825308


--- NEW FILE php-phpunit-File-Iterator.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name File_Iterator
%define channel pear.phpunit.de

Name:           php-phpunit-File-Iterator
Version:        1.1.0
Release:        4%{?dist}
Summary:        FilterIterator implementation that filters files based on a list of suffixes

Group:          Development/Libraries
License:        BSD
URL:            http://github.com/sebastianbergmann/php-file-iterator/
Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.7.2
BuildRequires:  php-channel(%{channel})
Requires:       php-channel(%{channel})
Requires:       php-common >= 5.2.0
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
FilterIterator implementation that filters files based on a list of suffixes.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
%{__sed} -i -e "s@<min>1.8.1</min>@<min>1.7.2</min>@" %{name}.xml


%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 %{name}.xml

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
  %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
  %{__pear} uninstall --nodeps --ignore-errors --register-only \
    pear.phpunit.de/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/File

%changelog
* Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4
- own pear directories

* Sat Nov 28 2009 Christof Damian <christof at damian.net> 1.1.0-3
- fixed php-pear buildrequire
- just require php-common

* Thu Nov 26 2009 Christof Damian <christof at damian.net> 1.1.0-2
- fix package.xml to work with older pear versions

* Wed Nov 25 2009 Christof Damian <christof at damian.net> 1.1.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:26:28 -0000	1.1
+++ .cvsignore	3 Dec 2009 07:29:04 -0000	1.2
@@ -0,0 +1 @@
+File_Iterator-1.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:26:29 -0000	1.1
+++ sources	3 Dec 2009 07:29:04 -0000	1.2
@@ -0,0 +1 @@
+8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz



From abompard at fedoraproject.org  Thu Dec  3 07:30:11 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Thu,  3 Dec 2009 07:30:11 +0000 (UTC)
Subject: File psi-lang-packs-0.13-1.tar.gz uploaded to lookaside cache by
	abompard
Message-ID: <20091203073011.9A38F10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for psi:

054311487f6bad8e749b6034461bb293  psi-lang-packs-0.13-1.tar.gz



From abompard at fedoraproject.org  Thu Dec  3 07:30:39 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Thu,  3 Dec 2009 07:30:39 +0000 (UTC)
Subject: File psi-0.14.tar.bz2 uploaded to lookaside cache by abompard
Message-ID: <20091203073039.765F810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for psi:

9d7dcce3bcab53b741a712199bd986be  psi-0.14.tar.bz2



From cdamian at fedoraproject.org  Thu Dec  3 07:30:44 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu,  3 Dec 2009 07:30:44 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/F-12 import.log, NONE,
	1.1 php-phpunit-File-Iterator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091203073044.2167611C0267@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6561/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-phpunit-File-Iterator.spec 
Log Message:
initial import



--- NEW FILE import.log ---
php-phpunit-File-Iterator-1_1_0-4_fc12:F-12:php-phpunit-File-Iterator-1.1.0-4.fc12.src.rpm:1259825403


--- NEW FILE php-phpunit-File-Iterator.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name File_Iterator
%define channel pear.phpunit.de

Name:           php-phpunit-File-Iterator
Version:        1.1.0
Release:        4%{?dist}
Summary:        FilterIterator implementation that filters files based on a list of suffixes

Group:          Development/Libraries
License:        BSD
URL:            http://github.com/sebastianbergmann/php-file-iterator/
Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.7.2
BuildRequires:  php-channel(%{channel})
Requires:       php-channel(%{channel})
Requires:       php-common >= 5.2.0
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
FilterIterator implementation that filters files based on a list of suffixes.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
%{__sed} -i -e "s@<min>1.8.1</min>@<min>1.7.2</min>@" %{name}.xml


%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 %{name}.xml

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
  %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
  %{__pear} uninstall --nodeps --ignore-errors --register-only \
    pear.phpunit.de/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/File

%changelog
* Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4
- own pear directories

* Sat Nov 28 2009 Christof Damian <christof at damian.net> 1.1.0-3
- fixed php-pear buildrequire
- just require php-common

* Thu Nov 26 2009 Christof Damian <christof at damian.net> 1.1.0-2
- fix package.xml to work with older pear versions

* Wed Nov 25 2009 Christof Damian <christof at damian.net> 1.1.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:26:28 -0000	1.1
+++ .cvsignore	3 Dec 2009 07:30:43 -0000	1.2
@@ -0,0 +1 @@
+File_Iterator-1.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:26:29 -0000	1.1
+++ sources	3 Dec 2009 07:30:44 -0000	1.2
@@ -0,0 +1 @@
+8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz



From mtasaka at fedoraproject.org  Thu Dec  3 07:37:06 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Dec 2009 07:37:06 +0000 (UTC)
Subject: File gnome-commander-1.2.9-git_D20091203T1630.tar.bz2 uploaded to
	lookaside cache by mtasaka
Message-ID: <20091203073706.5E1D510F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-commander:

0bf901b01b4162fc5d68212cca0e493a  gnome-commander-1.2.9-git_D20091203T1630.tar.bz2



From mtasaka at fedoraproject.org  Thu Dec  3 07:37:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Dec 2009 07:37:44 +0000 (UTC)
Subject: rpms/gnome-commander/devel .cvsignore, 1.37,
	1.38 gnome-commander.spec, 1.62, 1.63 sources, 1.38, 1.39
Message-ID: <20091203073745.0A42611C00EE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8476

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Update to the latest git
  (to fix crash when cancelling symlink creation with ESC
   bug 542366, GNOME bug 603301)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	26 Nov 2009 06:54:14 -0000	1.37
+++ .cvsignore	3 Dec 2009 07:37:44 -0000	1.38
@@ -1 +1 @@
-gnome-commander-1.2.9-git_D20091126T1510.tar.bz2
+gnome-commander-1.2.9-git_D20091203T1630.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- gnome-commander.spec	26 Nov 2009 06:54:14 -0000	1.62
+++ gnome-commander.spec	3 Dec 2009 07:37:44 -0000	1.63
@@ -21,7 +21,7 @@
 %global        LIBGSF_REQ            1.12.0
 %global        POPPLER_REQ           0.6
 
-%global        git_pull_JST          D20091126T1510
+%global        git_pull_JST          D20091203T1630
 
 %global        use_autotool          0
 %global        update_po             1
@@ -145,7 +145,7 @@ gzip -9 ChangeLog-*
    --enable-python
 
 %if %{update_po}
-make -C po gnome-commander.pot update-po
+%{__make} -C po gnome-commander.pot update-po
 %endif
 
 %{__make} %{?_smp_mflags} -k \
@@ -214,6 +214,11 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Update to the latest git
+  (to fix crash when cancelling symlink creation with ESC
+   bug 542366, GNOME bug 603301)
+
 * Thu Nov 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:1.2.9-0.1.git_D20091126T1510
 - Chase master git branch for F-13 after discussion with the upstream
   developer


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	26 Nov 2009 06:54:14 -0000	1.38
+++ sources	3 Dec 2009 07:37:44 -0000	1.39
@@ -1 +1 @@
-37680c7c5d25bd6599b58901c59fa6e8  gnome-commander-1.2.9-git_D20091126T1510.tar.bz2
+0bf901b01b4162fc5d68212cca0e493a  gnome-commander-1.2.9-git_D20091203T1630.tar.bz2



From jpopelka at fedoraproject.org  Thu Dec  3 07:42:49 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu,  3 Dec 2009 07:42:49 +0000 (UTC)
Subject: rpms/lockdev/F-12 lockdev.spec,1.34,1.35
Message-ID: <20091203074249.999C411C00EE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/lockdev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9836

Modified Files:
	lockdev.spec 
Log Message:
* Thu Dec 03 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-19
- Fixed pre section (http://fedoraproject.org/wiki/Packaging/UsersAndGroups)
- Added back Buildroot to silence rpmlint's false positive



Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/F-12/lockdev.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- lockdev.spec	1 Dec 2009 15:19:18 -0000	1.34
+++ lockdev.spec	3 Dec 2009 07:42:49 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -26,6 +26,7 @@ Requires(postun): glibc
 
 BuildRequires: perl
 BuildRequires: perl(ExtUtils::MakeMaker)
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Lockdev provides a reliable way to put an exclusive lock to devices
@@ -61,6 +62,7 @@ cp %SOURCE1 ./docs
 make "CFLAGS=${RPM_OPT_FLAGS} -fPIC"
 
 %install
+rm -fr $RPM_BUILD_ROOT
 make \
     sbindir=${RPM_BUILD_ROOT}%{_sbindir} \
     libdir=${RPM_BUILD_ROOT}%{_libdir} \
@@ -72,7 +74,8 @@ make \
 mkdir -p $RPM_BUILD_ROOT/var/lock
 
 %pre
-groupadd -g 54 -r -f lock
+getent group lock >/dev/null || groupadd -g 54 -r -f lock
+exit 0
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -95,6 +98,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Thu Dec 03 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-19
+- Fixed pre section (http://fedoraproject.org/wiki/Packaging/UsersAndGroups)
+- Added back Buildroot to silence rpmlint's false positive
+
 * Tue Dec 01 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-18
 - Added license text to package
 



From jpopelka at fedoraproject.org  Thu Dec  3 07:44:55 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu,  3 Dec 2009 07:44:55 +0000 (UTC)
Subject: rpms/lockdev/devel lockdev.spec,1.35,1.36
Message-ID: <20091203074456.0E01411C00EE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

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

Modified Files:
	lockdev.spec 
Log Message:
* Thu Dec 03 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-20
- Fixed pre section (http://fedoraproject.org/wiki/Packaging/UsersAndGroups)
- Added back Buildroot to silence rpmlint's false positive



Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- lockdev.spec	1 Dec 2009 15:18:49 -0000	1.35
+++ lockdev.spec	3 Dec 2009 07:44:55 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -26,6 +26,7 @@ Requires(postun): glibc
 
 BuildRequires: perl
 BuildRequires: perl(ExtUtils::MakeMaker)
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Lockdev provides a reliable way to put an exclusive lock to devices
@@ -61,6 +62,7 @@ cp %SOURCE1 ./docs
 make "CFLAGS=${RPM_OPT_FLAGS} -fPIC"
 
 %install
+rm -fr $RPM_BUILD_ROOT
 make \
     sbindir=${RPM_BUILD_ROOT}%{_sbindir} \
     libdir=${RPM_BUILD_ROOT}%{_libdir} \
@@ -72,7 +74,8 @@ make \
 mkdir -p $RPM_BUILD_ROOT/var/lock
 
 %pre
-groupadd -g 54 -r -f lock
+getent group lock >/dev/null || groupadd -g 54 -r -f lock
+exit 0
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -95,6 +98,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Thu Dec 03 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-20
+- Fixed pre section (http://fedoraproject.org/wiki/Packaging/UsersAndGroups)
+- Added back Buildroot to silence rpmlint's false positive
+
 * Tue Dec 01 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-19
 - Added license text to package
 



From mtasaka at fedoraproject.org  Thu Dec  3 07:49:42 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Dec 2009 07:49:42 +0000 (UTC)
Subject: rpms/gnome-commander/F-11
	gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch,
	NONE, 1.1 gnome-commander.spec, 1.64, 1.65
Message-ID: <20091203074943.02A6011C00EE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11551

Modified Files:
	gnome-commander.spec 
Added Files:
	gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch 
Log Message:
* Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-2
- Fix crash when cancelling symlink creation with ESC
  (bug 542366, GNOME bug 603301)


gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch:
 gnome-cmd-dialog.c        |    1 +
 gnome-cmd-string-dialog.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch ---
commit b6cee8a6fa8e026dbbdbea263b7053a958e415af
Author: Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
Date:   Wed Dec 2 23:24:12 2009 +0100

    Fixed problem #603301 (crash when cancelling symlink creation by ESC)

diff --git a/libgcmd/gnome-cmd-dialog.c b/libgcmd/gnome-cmd-dialog.c
index ce89824..97a21a1 100644
--- a/libgcmd/gnome-cmd-dialog.c
+++ b/libgcmd/gnome-cmd-dialog.c
@@ -63,6 +63,7 @@ static void destroy (GtkObject *object)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 
     g_free (dialog->priv);
+    dialog->priv = NULL;
 }
 
 
diff --git a/libgcmd/gnome-cmd-string-dialog.c b/libgcmd/gnome-cmd-string-dialog.c
index 4ab5fab..77d824e 100644
--- a/libgcmd/gnome-cmd-string-dialog.c
+++ b/libgcmd/gnome-cmd-string-dialog.c
@@ -82,8 +82,11 @@ destroy (GtkObject *object)
     if (GTK_OBJECT_CLASS (parent_class)->destroy)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 
-    g_free (dialog->priv->error_desc);
+    if (dialog->priv)
+        g_free (dialog->priv->error_desc);
+ 
     g_free (dialog->priv);
+    dialog->priv = NULL;
 }
 
 


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnome-commander.spec	29 Oct 2009 16:48:23 -0000	1.64
+++ gnome-commander.spec	3 Dec 2009 07:49:42 -0000	1.65
@@ -1,9 +1,14 @@
 # To use git, follow:
 #
-# git clone  git://git.gnome.org/gnome-commander
-# ln -sf gcmd-1-3 gnome-commander-%%{version}-git_%%{git_pull_JST}
+# git clone git://git.gnome.org/gnome-commander
+# cd gnome-commander/
+# git checkout -b gcmd-1-3 origin/gcmd-1-3
+# git pull
+# ...
+# cd ..
+# ln -sf gcmd-commander gnome-commander-%%{version}-git_%%{git_pull_JST}
 # tar cjf gnome-commander-%%{version}-git_%%{git_pull_JST}.tar.bz2 \
-#    gnome-commander-%%{version}-git_%%{git_pull_JST}
+#    gnome-commander-%%{version}-git_%%{git_pull_JST}/./
 
 # Source10 is created by:
 # svn co http://svn.gnome.org/svn/gnome-commander/branches/gcmd-1-3/tools/mimeedit/
@@ -11,28 +16,36 @@
 #
 # ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html
 
-%define        EXIV2_REQ             0.14
-%define        TAGLIB_REQ            1.4
-%define        LIBGSF_REQ            1.12.0
-%define        POPPLER_REQ           0.6
-
-%define        git_pull_JST          D20090629T1400
-
-%define        use_autotool          0
-%define        if_pre                0
-%define        main_release          1
-%define        extratag              git_%{git_pull_JST}
+%global        EXIV2_REQ             0.14
+%global        TAGLIB_REQ            1.4
+%global        LIBGSF_REQ            1.12.0
+%global        POPPLER_REQ           0.6
+
+%global        git_pull_JST          D20090629T1400
+
+%global        use_autotool          0
+%global        update_po             0
+%global        if_pre                0
+%global        main_release          2
+%global        extratag              git_%{git_pull_JST}
 %undefine      extratag
-%define        mimeedit_rev          1958
+%global        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
-%define        use_autotool          1
+%global        use_autotool          1
+%endif
+%if 0%{?use_autotool} < 1
+%global        update_po             0
 %endif
 
-%define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
+%global        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
 Version:       1.2.8.3
+%if 0%{?fedora} >= 12
+# Downgrade 1 time
+Epoch:         1
+%endif
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad?er plik?w dla GNOME oparty o Norton Commander'a (TM)
@@ -45,6 +58,8 @@ Source0:       ftp://ftp.gnome.org/pub/G
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
 Patch10:       mimeedit-svn1958.diff
+# From upstream
+Patch20:       gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -110,45 +125,18 @@ ansluta till FTP-servrar och SMB-n?tver
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
 
 %if 0%{use_autotool} > 0
-# Workaround to make gnome-autogen support automake 1.11
-# Note that fixed gnome-common-2.26.0-2.fc11 is now in testing
-mkdir TMPBIN ; cd TMPBIN
-sed -e 's|automake-1\.10|automake-1.11 automake-1.10|' \
-	%{_bindir}/gnome-autogen.sh > ./gnome-autogen.sh
-chmod 0755 ./gnome-autogen.sh
-export PATH=$(pwd):$PATH
-cd ..
-
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
 sh autogen.sh
 %endif
 
-cp -p %SOURCE10 mimeedit.sh
+%{__cp} -p %SOURCE10 mimeedit.sh
 %patch10 -p0
+%patch20 -p1 -b .symlink
 
 %{__sed} -i.pylib \
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
-%if 0%{?fedora} >= 10 && 0
-function replace_icon(){
-	find . -name \*.cc | xargs grep -l $1 | \
-		xargs %{__sed} -i.icon -e "s|\"$1\"|\"$2\"|"
-}
-
-
-# Replace icon name due to gnome-icon-theme 2.23.x change
-# (many icons are removed)
-replace_icon	gnome-fs-directory	gtk-directory
-replace_icon	gnome-fs-ftp		folder-remote
-replace_icon	gnome-fs-home		user-home
-replace_icon	gnome-fs-network	gtk-network
-replace_icon	gnome-fs-smb		network-workgroup
-replace_icon	gnome-fs-ssh		folder-remote
-replace_icon	gnome-fs-web		folder-remote
-
-%endif
-
 # gzip
 gzip -9 ChangeLog-*
 
@@ -160,9 +148,13 @@ gzip -9 ChangeLog-*
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
-# Sometimes parallel make fails (perhaps), however once
-# force it.
-%{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
+
+%if %{update_po}
+%{__make} -C po gnome-commander.pot update-po
+%endif
+
+%{__make} %{?_smp_mflags} -k \
+	GMSGFMT="msgfmt --statistics"
 
 %install
 %{__rm} -rf %{buildroot}
@@ -227,6 +219,10 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-2
+- Fix crash when cancelling symlink creation with ESC
+  (bug 542366, GNOME bug 603301)
+
 * Fri Oct 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-1
 - 1.2.8.3
 



From lkundrak at fedoraproject.org  Thu Dec  3 08:00:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 08:00:00 +0000 (UTC)
Subject: File xstream-distribution-1.2.2-src.zip uploaded to lookaside cache
	by lkundrak
Message-ID: <20091203080000.903D810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xstream:

a29303d9e74ddb39de87fa5c6dcd2099  xstream-distribution-1.2.2-src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 08:00:24 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 08:00:24 +0000 (UTC)
Subject: rpms/xstream/devel import.log, NONE, 1.1 xstream.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203080024.578A711C02BD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xstream.spec 
Log Message:
Initial import of xstream


--- NEW FILE import.log ---
xstream-1_2_2-4_fc13:devel:xstream-1.2.2-4.fc13.src.rpm:1259827211


--- NEW FILE xstream.spec ---
# Copyright statement from JPackage this file is derived from:

# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

# Tests are disabled by default since we don't have
# all the requirements in Fedora yet
%bcond_with test

Name:           xstream
Version:        1.2.2
Release:        4%{?dist}
Summary:        Java XML serialization library

Group:          Development/Libraries
License:        BSD
URL:            http://xstream.codehaus.org/
Source0:        http://repository.codehaus.org/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  ant >= 0:1.6
BuildRequires:  bea-stax >= 0:1.2.0
BuildRequires:  bea-stax-api >= 0:1.0.1
BuildRequires:  cglib >= 0:2.1.3
BuildRequires:  dom4j >= 0:1.6.1
BuildRequires:  jakarta-commons-lang >= 0:2.1
BuildRequires:  jakarta-oro
BuildRequires:  jdom >= 0:1.0
BuildRequires:  jettison >= 0:1.0
BuildRequires:  joda-time >= 0:1.2.1
BuildRequires:  junit >= 0:3.8.1
BuildRequires:  xom >= 0:1.0
BuildRequires:  xpp3 >= 0:1.1.3.4
BuildRequires:  unzip
BuildRequires:  java-devel-openjdk
%if %with test
BuildRequires:  jmock >= 0:1.0.1
BuildRequires:  wstx >= 0:3.2.0
%endif
Requires:       jpackage-utils
Requires:       java

BuildArch:      noarch


%description
XStream is a simple library to serialize objects to XML 
and back again. A high level facade is supplied that 
simplifies common use cases. Custom objects can be serialized 
without need for specifying mappings. Speed and low memory 
footprint are a crucial part of the design, making it suitable 
for large object graphs or systems with high message throughput. 
No information is duplicated that can be obtained via reflection. 
This results in XML that is easier to read for humans and more 
compact than native Java serialization. XStream serializes internal 
fields, including private and final. Supports non-public and inner 
classes. Classes are not required to have default constructor. 
Duplicate references encountered in the object-model will be 
maintained. Supports circular references. By implementing an 
interface, XStream can serialize directly to/from any tree 
structure (not just XML). Strategies can be registered allowing 
customization of how particular types are represented as XML. 
When an exception occurs due to malformed XML, detailed diagnostics 
are provided to help isolate and fix the problem.


%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       jpackage-utils

%description    javadoc
%{name} API documentation.


%prep
rm -rf %{name}-%{version}
%setup -qn %{name}-%{version}/xstream
find . -name "*.jar" -delete

%if %with test
# This test requires megginson's sax2
rm -f xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java
%endif


%build
# Replace bundled tars
pushd lib
ln -sf $(build-classpath cglib)
ln -sf $(build-classpath commons-lang)
ln -sf $(build-classpath dom4j)
ln -sf $(build-classpath jdom)
ln -sf $(build-classpath jettison)
ln -sf $(build-classpath joda-time)
ln -sf $(build-classpath junit)
ln -sf $(build-classpath oro)
ln -sf $(build-classpath bea-stax-ri)
ln -sf $(build-classpath bea-stax-api)
ln -sf $(build-classpath xom)
ln -sf $(build-classpath xpp3)
%if %with test
ln -sf $(build-classpath jmock)
ln -sf $(build-classpath wstx/wstx-asl)
%endif
popd

# Build
%if %with test
ant library javadoc
%else
ant benchmark:compile jar javadoc
%endif


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_javadir}
install -d $RPM_BUILD_ROOT%{_javadocdir}

# Main jar
install -p -m644 target/xstream-SNAPSHOT.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Benchmarks
install -p -m644 target/xstream-benchmark-SNAPSHOT.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
ln -s %{name}-benchmark-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark.jar

# API Documentation
cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc ../LICENSE.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Wed Dec 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2.2-4
- Cosmetic fixes

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:1.2.2-3
- Drop gcj (suggested by Jochen Schmitt), we seem to need OpenJDK anyway
- Fix -javadoc Require
- Drop epoch

* Sun Nov 01 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:1.2.2-2
- Greatly simplify for Fedora
- Disable tests, we don't have all that's required to run them
- Remove maven build

* Fri Jul 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-1jpp
- Upgrade to 1.2.2
- Build with maven2 by default
- Add poms and depmap frags

* Tue May 23 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1.3-1jpp
- Upgrade to 1.1.3
- Patched to work with bea

* Mon Sep 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-2jpp
- Drop saxpath requirement
- Require jaxen >= 0:1.1

* Mon Aug 30 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-1jpp
- Upgrade to 1.0.2
- Delete included binary jars
- Change -Dbuild.sysclasspath "from only" to "first" (DynamicProxyTest)
- Relax some versioned dependencies
- Build with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-2jpp
- Upgrade to ant-1.6.X

* Tue Jun 01 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-1jpp
- Upgrade to 1.0.1

* Fri Feb 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.3-1jpp
- Upgrade to 0.3
- Add manual subpackage

* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.2-1jpp
- First JPackage release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:30:46 -0000	1.1
+++ .cvsignore	3 Dec 2009 08:00:23 -0000	1.2
@@ -0,0 +1 @@
+xstream-distribution-1.2.2-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:30:46 -0000	1.1
+++ sources	3 Dec 2009 08:00:23 -0000	1.2
@@ -0,0 +1 @@
+a29303d9e74ddb39de87fa5c6dcd2099  xstream-distribution-1.2.2-src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 08:01:10 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 08:01:10 +0000 (UTC)
Subject: rpms/xstream/EL-5 import.log, NONE, 1.1 xstream.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203080110.1D28D11C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xstream.spec 
Log Message:
Initial import of xstream


--- NEW FILE import.log ---
xstream-1_2_2-4_fc13:EL-5:xstream-1.2.2-4.fc13.src.rpm:1259827258


--- NEW FILE xstream.spec ---
# Copyright statement from JPackage this file is derived from:

# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

# Tests are disabled by default since we don't have
# all the requirements in Fedora yet
%bcond_with test

Name:           xstream
Version:        1.2.2
Release:        4%{?dist}
Summary:        Java XML serialization library

Group:          Development/Libraries
License:        BSD
URL:            http://xstream.codehaus.org/
Source0:        http://repository.codehaus.org/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  ant >= 0:1.6
BuildRequires:  bea-stax >= 0:1.2.0
BuildRequires:  bea-stax-api >= 0:1.0.1
BuildRequires:  cglib >= 0:2.1.3
BuildRequires:  dom4j >= 0:1.6.1
BuildRequires:  jakarta-commons-lang >= 0:2.1
BuildRequires:  jakarta-oro
BuildRequires:  jdom >= 0:1.0
BuildRequires:  jettison >= 0:1.0
BuildRequires:  joda-time >= 0:1.2.1
BuildRequires:  junit >= 0:3.8.1
BuildRequires:  xom >= 0:1.0
BuildRequires:  xpp3 >= 0:1.1.3.4
BuildRequires:  unzip
BuildRequires:  java-devel-openjdk
%if %with test
BuildRequires:  jmock >= 0:1.0.1
BuildRequires:  wstx >= 0:3.2.0
%endif
Requires:       jpackage-utils
Requires:       java

BuildArch:      noarch


%description
XStream is a simple library to serialize objects to XML 
and back again. A high level facade is supplied that 
simplifies common use cases. Custom objects can be serialized 
without need for specifying mappings. Speed and low memory 
footprint are a crucial part of the design, making it suitable 
for large object graphs or systems with high message throughput. 
No information is duplicated that can be obtained via reflection. 
This results in XML that is easier to read for humans and more 
compact than native Java serialization. XStream serializes internal 
fields, including private and final. Supports non-public and inner 
classes. Classes are not required to have default constructor. 
Duplicate references encountered in the object-model will be 
maintained. Supports circular references. By implementing an 
interface, XStream can serialize directly to/from any tree 
structure (not just XML). Strategies can be registered allowing 
customization of how particular types are represented as XML. 
When an exception occurs due to malformed XML, detailed diagnostics 
are provided to help isolate and fix the problem.


%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       jpackage-utils

%description    javadoc
%{name} API documentation.


%prep
rm -rf %{name}-%{version}
%setup -qn %{name}-%{version}/xstream
find . -name "*.jar" -delete

%if %with test
# This test requires megginson's sax2
rm -f xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java
%endif


%build
# Replace bundled tars
pushd lib
ln -sf $(build-classpath cglib)
ln -sf $(build-classpath commons-lang)
ln -sf $(build-classpath dom4j)
ln -sf $(build-classpath jdom)
ln -sf $(build-classpath jettison)
ln -sf $(build-classpath joda-time)
ln -sf $(build-classpath junit)
ln -sf $(build-classpath oro)
ln -sf $(build-classpath bea-stax-ri)
ln -sf $(build-classpath bea-stax-api)
ln -sf $(build-classpath xom)
ln -sf $(build-classpath xpp3)
%if %with test
ln -sf $(build-classpath jmock)
ln -sf $(build-classpath wstx/wstx-asl)
%endif
popd

# Build
%if %with test
ant library javadoc
%else
ant benchmark:compile jar javadoc
%endif


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_javadir}
install -d $RPM_BUILD_ROOT%{_javadocdir}

# Main jar
install -p -m644 target/xstream-SNAPSHOT.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Benchmarks
install -p -m644 target/xstream-benchmark-SNAPSHOT.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
ln -s %{name}-benchmark-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark.jar

# API Documentation
cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc ../LICENSE.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Wed Dec 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2.2-4
- Cosmetic fixes

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:1.2.2-3
- Drop gcj (suggested by Jochen Schmitt), we seem to need OpenJDK anyway
- Fix -javadoc Require
- Drop epoch

* Sun Nov 01 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:1.2.2-2
- Greatly simplify for Fedora
- Disable tests, we don't have all that's required to run them
- Remove maven build

* Fri Jul 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-1jpp
- Upgrade to 1.2.2
- Build with maven2 by default
- Add poms and depmap frags

* Tue May 23 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1.3-1jpp
- Upgrade to 1.1.3
- Patched to work with bea

* Mon Sep 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-2jpp
- Drop saxpath requirement
- Require jaxen >= 0:1.1

* Mon Aug 30 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-1jpp
- Upgrade to 1.0.2
- Delete included binary jars
- Change -Dbuild.sysclasspath "from only" to "first" (DynamicProxyTest)
- Relax some versioned dependencies
- Build with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-2jpp
- Upgrade to ant-1.6.X

* Tue Jun 01 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-1jpp
- Upgrade to 1.0.1

* Fri Feb 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.3-1jpp
- Upgrade to 0.3
- Add manual subpackage

* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.2-1jpp
- First JPackage release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:30:46 -0000	1.1
+++ .cvsignore	3 Dec 2009 08:01:09 -0000	1.2
@@ -0,0 +1 @@
+xstream-distribution-1.2.2-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:30:46 -0000	1.1
+++ sources	3 Dec 2009 08:01:09 -0000	1.2
@@ -0,0 +1 @@
+a29303d9e74ddb39de87fa5c6dcd2099  xstream-distribution-1.2.2-src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 08:01:58 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 08:01:58 +0000 (UTC)
Subject: rpms/xstream/F-11 import.log, NONE, 1.1 xstream.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203080158.4B2AB11C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xstream.spec 
Log Message:
Initial import of xstream


--- NEW FILE import.log ---
xstream-1_2_2-4_fc13:F-11:xstream-1.2.2-4.fc13.src.rpm:1259827305


--- NEW FILE xstream.spec ---
# Copyright statement from JPackage this file is derived from:

# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

# Tests are disabled by default since we don't have
# all the requirements in Fedora yet
%bcond_with test

Name:           xstream
Version:        1.2.2
Release:        4%{?dist}
Summary:        Java XML serialization library

Group:          Development/Libraries
License:        BSD
URL:            http://xstream.codehaus.org/
Source0:        http://repository.codehaus.org/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  ant >= 0:1.6
BuildRequires:  bea-stax >= 0:1.2.0
BuildRequires:  bea-stax-api >= 0:1.0.1
BuildRequires:  cglib >= 0:2.1.3
BuildRequires:  dom4j >= 0:1.6.1
BuildRequires:  jakarta-commons-lang >= 0:2.1
BuildRequires:  jakarta-oro
BuildRequires:  jdom >= 0:1.0
BuildRequires:  jettison >= 0:1.0
BuildRequires:  joda-time >= 0:1.2.1
BuildRequires:  junit >= 0:3.8.1
BuildRequires:  xom >= 0:1.0
BuildRequires:  xpp3 >= 0:1.1.3.4
BuildRequires:  unzip
BuildRequires:  java-devel-openjdk
%if %with test
BuildRequires:  jmock >= 0:1.0.1
BuildRequires:  wstx >= 0:3.2.0
%endif
Requires:       jpackage-utils
Requires:       java

BuildArch:      noarch


%description
XStream is a simple library to serialize objects to XML 
and back again. A high level facade is supplied that 
simplifies common use cases. Custom objects can be serialized 
without need for specifying mappings. Speed and low memory 
footprint are a crucial part of the design, making it suitable 
for large object graphs or systems with high message throughput. 
No information is duplicated that can be obtained via reflection. 
This results in XML that is easier to read for humans and more 
compact than native Java serialization. XStream serializes internal 
fields, including private and final. Supports non-public and inner 
classes. Classes are not required to have default constructor. 
Duplicate references encountered in the object-model will be 
maintained. Supports circular references. By implementing an 
interface, XStream can serialize directly to/from any tree 
structure (not just XML). Strategies can be registered allowing 
customization of how particular types are represented as XML. 
When an exception occurs due to malformed XML, detailed diagnostics 
are provided to help isolate and fix the problem.


%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       jpackage-utils

%description    javadoc
%{name} API documentation.


%prep
rm -rf %{name}-%{version}
%setup -qn %{name}-%{version}/xstream
find . -name "*.jar" -delete

%if %with test
# This test requires megginson's sax2
rm -f xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java
%endif


%build
# Replace bundled tars
pushd lib
ln -sf $(build-classpath cglib)
ln -sf $(build-classpath commons-lang)
ln -sf $(build-classpath dom4j)
ln -sf $(build-classpath jdom)
ln -sf $(build-classpath jettison)
ln -sf $(build-classpath joda-time)
ln -sf $(build-classpath junit)
ln -sf $(build-classpath oro)
ln -sf $(build-classpath bea-stax-ri)
ln -sf $(build-classpath bea-stax-api)
ln -sf $(build-classpath xom)
ln -sf $(build-classpath xpp3)
%if %with test
ln -sf $(build-classpath jmock)
ln -sf $(build-classpath wstx/wstx-asl)
%endif
popd

# Build
%if %with test
ant library javadoc
%else
ant benchmark:compile jar javadoc
%endif


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_javadir}
install -d $RPM_BUILD_ROOT%{_javadocdir}

# Main jar
install -p -m644 target/xstream-SNAPSHOT.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Benchmarks
install -p -m644 target/xstream-benchmark-SNAPSHOT.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
ln -s %{name}-benchmark-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark.jar

# API Documentation
cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc ../LICENSE.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Wed Dec 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2.2-4
- Cosmetic fixes

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:1.2.2-3
- Drop gcj (suggested by Jochen Schmitt), we seem to need OpenJDK anyway
- Fix -javadoc Require
- Drop epoch

* Sun Nov 01 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:1.2.2-2
- Greatly simplify for Fedora
- Disable tests, we don't have all that's required to run them
- Remove maven build

* Fri Jul 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-1jpp
- Upgrade to 1.2.2
- Build with maven2 by default
- Add poms and depmap frags

* Tue May 23 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1.3-1jpp
- Upgrade to 1.1.3
- Patched to work with bea

* Mon Sep 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-2jpp
- Drop saxpath requirement
- Require jaxen >= 0:1.1

* Mon Aug 30 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-1jpp
- Upgrade to 1.0.2
- Delete included binary jars
- Change -Dbuild.sysclasspath "from only" to "first" (DynamicProxyTest)
- Relax some versioned dependencies
- Build with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-2jpp
- Upgrade to ant-1.6.X

* Tue Jun 01 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-1jpp
- Upgrade to 1.0.1

* Fri Feb 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.3-1jpp
- Upgrade to 0.3
- Add manual subpackage

* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.2-1jpp
- First JPackage release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:30:46 -0000	1.1
+++ .cvsignore	3 Dec 2009 08:01:57 -0000	1.2
@@ -0,0 +1 @@
+xstream-distribution-1.2.2-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:30:46 -0000	1.1
+++ sources	3 Dec 2009 08:01:58 -0000	1.2
@@ -0,0 +1 @@
+a29303d9e74ddb39de87fa5c6dcd2099  xstream-distribution-1.2.2-src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 08:02:45 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 08:02:45 +0000 (UTC)
Subject: rpms/xstream/F-12 import.log, NONE, 1.1 xstream.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203080245.412DF11C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xstream/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15278/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xstream.spec 
Log Message:
Initial import of xstream


--- NEW FILE import.log ---
xstream-1_2_2-4_fc13:F-12:xstream-1.2.2-4.fc13.src.rpm:1259827352


--- NEW FILE xstream.spec ---
# Copyright statement from JPackage this file is derived from:

# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

# Tests are disabled by default since we don't have
# all the requirements in Fedora yet
%bcond_with test

Name:           xstream
Version:        1.2.2
Release:        4%{?dist}
Summary:        Java XML serialization library

Group:          Development/Libraries
License:        BSD
URL:            http://xstream.codehaus.org/
Source0:        http://repository.codehaus.org/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  ant >= 0:1.6
BuildRequires:  bea-stax >= 0:1.2.0
BuildRequires:  bea-stax-api >= 0:1.0.1
BuildRequires:  cglib >= 0:2.1.3
BuildRequires:  dom4j >= 0:1.6.1
BuildRequires:  jakarta-commons-lang >= 0:2.1
BuildRequires:  jakarta-oro
BuildRequires:  jdom >= 0:1.0
BuildRequires:  jettison >= 0:1.0
BuildRequires:  joda-time >= 0:1.2.1
BuildRequires:  junit >= 0:3.8.1
BuildRequires:  xom >= 0:1.0
BuildRequires:  xpp3 >= 0:1.1.3.4
BuildRequires:  unzip
BuildRequires:  java-devel-openjdk
%if %with test
BuildRequires:  jmock >= 0:1.0.1
BuildRequires:  wstx >= 0:3.2.0
%endif
Requires:       jpackage-utils
Requires:       java

BuildArch:      noarch


%description
XStream is a simple library to serialize objects to XML 
and back again. A high level facade is supplied that 
simplifies common use cases. Custom objects can be serialized 
without need for specifying mappings. Speed and low memory 
footprint are a crucial part of the design, making it suitable 
for large object graphs or systems with high message throughput. 
No information is duplicated that can be obtained via reflection. 
This results in XML that is easier to read for humans and more 
compact than native Java serialization. XStream serializes internal 
fields, including private and final. Supports non-public and inner 
classes. Classes are not required to have default constructor. 
Duplicate references encountered in the object-model will be 
maintained. Supports circular references. By implementing an 
interface, XStream can serialize directly to/from any tree 
structure (not just XML). Strategies can be registered allowing 
customization of how particular types are represented as XML. 
When an exception occurs due to malformed XML, detailed diagnostics 
are provided to help isolate and fix the problem.


%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       jpackage-utils

%description    javadoc
%{name} API documentation.


%prep
rm -rf %{name}-%{version}
%setup -qn %{name}-%{version}/xstream
find . -name "*.jar" -delete

%if %with test
# This test requires megginson's sax2
rm -f xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java
%endif


%build
# Replace bundled tars
pushd lib
ln -sf $(build-classpath cglib)
ln -sf $(build-classpath commons-lang)
ln -sf $(build-classpath dom4j)
ln -sf $(build-classpath jdom)
ln -sf $(build-classpath jettison)
ln -sf $(build-classpath joda-time)
ln -sf $(build-classpath junit)
ln -sf $(build-classpath oro)
ln -sf $(build-classpath bea-stax-ri)
ln -sf $(build-classpath bea-stax-api)
ln -sf $(build-classpath xom)
ln -sf $(build-classpath xpp3)
%if %with test
ln -sf $(build-classpath jmock)
ln -sf $(build-classpath wstx/wstx-asl)
%endif
popd

# Build
%if %with test
ant library javadoc
%else
ant benchmark:compile jar javadoc
%endif


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_javadir}
install -d $RPM_BUILD_ROOT%{_javadocdir}

# Main jar
install -p -m644 target/xstream-SNAPSHOT.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Benchmarks
install -p -m644 target/xstream-benchmark-SNAPSHOT.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
ln -s %{name}-benchmark-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark.jar

# API Documentation
cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc ../LICENSE.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Wed Dec 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2.2-4
- Cosmetic fixes

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:1.2.2-3
- Drop gcj (suggested by Jochen Schmitt), we seem to need OpenJDK anyway
- Fix -javadoc Require
- Drop epoch

* Sun Nov 01 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:1.2.2-2
- Greatly simplify for Fedora
- Disable tests, we don't have all that's required to run them
- Remove maven build

* Fri Jul 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-1jpp
- Upgrade to 1.2.2
- Build with maven2 by default
- Add poms and depmap frags

* Tue May 23 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1.3-1jpp
- Upgrade to 1.1.3
- Patched to work with bea

* Mon Sep 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-2jpp
- Drop saxpath requirement
- Require jaxen >= 0:1.1

* Mon Aug 30 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-1jpp
- Upgrade to 1.0.2
- Delete included binary jars
- Change -Dbuild.sysclasspath "from only" to "first" (DynamicProxyTest)
- Relax some versioned dependencies
- Build with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-2jpp
- Upgrade to ant-1.6.X

* Tue Jun 01 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-1jpp
- Upgrade to 1.0.1

* Fri Feb 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.3-1jpp
- Upgrade to 0.3
- Add manual subpackage

* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.2-1jpp
- First JPackage release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:30:46 -0000	1.1
+++ .cvsignore	3 Dec 2009 08:02:44 -0000	1.2
@@ -0,0 +1 @@
+xstream-distribution-1.2.2-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:30:46 -0000	1.1
+++ sources	3 Dec 2009 08:02:45 -0000	1.2
@@ -0,0 +1 @@
+a29303d9e74ddb39de87fa5c6dcd2099  xstream-distribution-1.2.2-src.zip



From rakesh at fedoraproject.org  Thu Dec  3 08:14:29 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 08:14:29 +0000 (UTC)
Subject: File djvulibre-3.5.22.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091203081429.4303510F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for djvulibre:

d1513784ce0e4f37d71595dc34c95ec7  djvulibre-3.5.22.tar.gz



From akurtakov at fedoraproject.org  Thu Dec  3 08:15:07 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Dec 2009 08:15:07 +0000 (UTC)
Subject: File sqljet-1.0.1.tar.bz2 uploaded to lookaside cache by akurtakov
Message-ID: <20091203081507.3AB9310F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sqljet:

c4ce73c5912b1b48cc5a5166bd9e75af  sqljet-1.0.1.tar.bz2



From rakesh at fedoraproject.org  Thu Dec  3 08:15:58 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 08:15:58 +0000 (UTC)
Subject: rpms/djvulibre/devel .cvsignore, 1.12, 1.13 djvulibre.spec, 1.30,
	1.31 import.log, 1.1, 1.2 sources, 1.12,
	1.13 djvulibre-3.5.18-plugin-manpage.patch, 1.1,
	NONE djvulibre-3.5.19-ja-encoding.patch, 1.1,
	NONE djvulibre-configure.patch, 1.1, NONE
Message-ID: <20091203081558.DCEA611C00EE@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

Modified Files:
	.cvsignore djvulibre.spec import.log sources 
Removed Files:
	djvulibre-3.5.18-plugin-manpage.patch 
	djvulibre-3.5.19-ja-encoding.patch djvulibre-configure.patch 
Log Message:
Updated to 3.5.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 03:52:28 -0000	1.12
+++ .cvsignore	3 Dec 2009 08:15:58 -0000	1.13
@@ -1 +1 @@
-djvulibre-3.5.21.tar.gz
+djvulibre-3.5.22.tar.gz


Index: djvulibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/djvulibre.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- djvulibre.spec	24 Jul 2009 20:22:10 -0000	1.30
+++ djvulibre.spec	3 Dec 2009 08:15:58 -0000	1.31
@@ -1,21 +1,18 @@
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
-Version: 3.5.21
-Release: 3%{?dist}
+Version: 3.5.22
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://djvu.sourceforge.net/
 Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
-Patch0: djvulibre-3.5.18-plugin-manpage.patch
-Patch1: djvulibre-3.5.19-ja-encoding.patch
-Patch2: djvulibre-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): xdg-utils, /sbin/ldconfig
 Requires(preun): xdg-utils
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 BuildRequires: qt3-devel
-BuildRequires: xdg-utils
+BuildRequires: xdg-utils, chrpath
 
 %description
 DjVu is a web-centric format and software platform for distributing documents
@@ -62,18 +59,16 @@ Development files for DjVuLibre.
 
 %prep
 %setup -q
-%patch0 -p1 -b .plugin-manpage
-%patch1 -p1 -b .ja-encoding
-%patch2 -p1 -b .configure
+
 # Convert ISO8859-1 ja man pages to UTF-8 (still as of 3.5.20-2)
-for manpage in i18n/ja/*.1*; do
-    iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
-    mv tmp ${manpage}
-done
+#for manpage in i18n/ja/*.1*; do
+#    iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
+#    mv tmp ${manpage}
+#done
 
 
 %build
-%configure
+%configure --with-qt=%{_libdir}/qt-3.3 --enable-threads
 # Disable rpath on 64bit - NOT! It makes the build fail (still as of 3.5.20-2)
 #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
@@ -92,6 +87,26 @@ done
 # Fix for the libs to get stripped correctly (still required in 3.5.20-2)
 find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x
 
+# Remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvutoxml
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvused
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cjb2
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/csepdjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuserve
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvm
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuxmlparser
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvutxt
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/ddjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvumake
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cpaldjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuextract
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/c44
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvups
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djview3
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvudump
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvmcvt
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/bzz
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -144,6 +159,9 @@ fi
 
 
 %changelog
+* Mon Nov 30 2009 Ralesh Pandit  <rakesh at fedoraproject.org> 3.5.22-1
+- Updated to 3.5.22 (#542221) (Spec patch by Michal Schmidt)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Jan 2009 03:52:28 -0000	1.1
+++ import.log	3 Dec 2009 08:15:58 -0000	1.2
@@ -1 +1,2 @@
 djvulibre-3_5_21-1_fc10:HEAD:djvulibre-3.5.21-1.fc10.src.rpm:1232121100
+djvulibre-3_5_22-1_fc13:HEAD:djvulibre-3.5.22-1.fc13.src.rpm:1259828911


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Jan 2009 03:52:28 -0000	1.12
+++ sources	3 Dec 2009 08:15:58 -0000	1.13
@@ -1 +1 @@
-4c6f3eb03ffbd067b6d2fe2344b0d9ad  djvulibre-3.5.21.tar.gz
+d1513784ce0e4f37d71595dc34c95ec7  djvulibre-3.5.22.tar.gz


--- djvulibre-3.5.18-plugin-manpage.patch DELETED ---


--- djvulibre-3.5.19-ja-encoding.patch DELETED ---


--- djvulibre-configure.patch DELETED ---



From jnovy at fedoraproject.org  Thu Dec  3 08:32:06 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu,  3 Dec 2009 08:32:06 +0000 (UTC)
Subject: rpms/texlive-texmf/F-12 texlive-texmf.spec,1.35,1.36
Message-ID: <20091203083206.339F611C00EE@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22707

Modified Files:
	texlive-texmf.spec 
Log Message:
* Thu Dec 03 2009 Jindrich Novy <jnovy at redhat.com> 2007-33
- drop tetex-perltex dependency



Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-12/texlive-texmf.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- texlive-texmf.spec	27 Oct 2009 22:50:46 -0000	1.35
+++ texlive-texmf.spec	3 Dec 2009 08:32:05 -0000	1.36
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	32%{?dist}
+Release:	33%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -138,9 +138,6 @@ Obsoletes:	tetex-bytefield < 1.2a-7
 Provides:	tetex-bytefield = 1.2a-7
 Obsoletes:	tetex-prosper < 1.5-7
 Provides:	tetex-prosper = 1.5-7
-# The copy in this package is rather old (1.6)
-# We'll use the newer one in tetex-perltex, at least for now.
-Requires:	tetex-perltex
 
 %description latex
 This package contains the components of the TEXMF tree needed for the
@@ -348,10 +345,6 @@ rm -f texmf/web2c/{mktex.opt,mktexdir,mk
 # these files owned by binary texlive-dvips package
 rm -rf texmf/dvips/base
 
-# these files owned by tetex-perltex package
-rm -rf texmf-dist/tex/latex/perltex/
-rm -rf texmf-dist/doc/latex/perltex/
-
 # remove ttf2pk stuff from bin-ttfutils
 rm -f texmf/doc/man/man1/ttf2pk.1
 rm -rf texmf/doc/ttf2pk/
@@ -839,6 +832,9 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Thu Dec 03 2009 Jindrich Novy <jnovy at redhat.com> 2007-33
+- drop tetex-perltex dependency
+
 * Mon Oct 26 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2007-32
 - resolve conflict between texlive-texmf (and -doc) and tetex-perltex
 - resolve conflict between texlive-texmf and tetex-prosper



From kalev at fedoraproject.org  Thu Dec  3 08:40:24 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu,  3 Dec 2009 08:40:24 +0000 (UTC)
Subject: File bccrypto-net-1.5-src-nopatents.zip uploaded to lookaside cache
	by kalev
Message-ID: <20091203084024.6F31B10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mono-bouncycastle:

2905d4f7bf067394ebe4c9bbf49d81aa  bccrypto-net-1.5-src-nopatents.zip



From kalev at fedoraproject.org  Thu Dec  3 08:40:55 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu,  3 Dec 2009 08:40:55 +0000 (UTC)
Subject: rpms/mono-bouncycastle/devel bccrypto-generate-zip.sh, NONE,
	1.1 bccrypto-mono.patch, NONE, 1.1 bccrypto-nopatents.patch,
	NONE, 1.1 import.log, NONE, 1.1 mono-bouncycastle.spec, NONE,
	1.1 mono.snk, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203084055.8D06E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mono-bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24753/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bccrypto-generate-zip.sh bccrypto-mono.patch 
	bccrypto-nopatents.patch import.log mono-bouncycastle.spec 
	mono.snk 
Log Message:
Initial import (#537431)


--- NEW FILE bccrypto-generate-zip.sh ---
#!/bin/sh

VER="$1"
DIR="csharp"
ZIP="bccrypto-net-$VER-src.zip"
NEWZIP="bccrypto-net-$VER-src-nopatents.zip"

if [ -z "$VER" ] ; then
	echo "Usage: $0 <version>"
	exit 1
fi

if [ -e "$DIR" ] ; then
	echo "Error: Directory $DIR already exists."
	exit 1
fi

if [ ! -f "$ZIP" ] ; then
	echo "Error: Cannot find $ZIP."
	exit 1
fi

if [ -e "$NEWZIP" ] ; then
	echo "Error: $NEWZIP already exists."
	exit 1
fi

unzip -x "$ZIP"
rm -f "$DIR"/crypto/test/src/crypto/test/IDEATest.cs
rm -f "$DIR"/crypto/src/crypto/engines/IdeaEngine.cs
rm -f "$DIR"/crypto/src/asn1/misc/IDEACBCPar.cs
zip -r -9 "$NEWZIP" "$DIR"
rm -rf "$DIR"

bccrypto-mono.patch:
 NBuild.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bccrypto-mono.patch ---
diff -up csharp/crypto/NBuild.build.mono csharp/crypto/NBuild.build
--- csharp/crypto/NBuild.build.mono	2009-11-12 19:59:24.512446575 +0200
+++ csharp/crypto/NBuild.build	2009-11-12 20:08:33.588616449 +0200
@@ -2,22 +2,22 @@
 <project name="bccrypto-csharp" default="compile-release" basedir=".">
 
   <!-- Build for .NET Framework 1.1 -->
+  <!--
     <property name="nant.settings.currentframework" value="net-1.1" />
     <property name="compile-defines" value="NET_1_1" />
     <property name="debug-extension" value="pdb" />
     <property name="enable-nostdlib" value="true" />
     <property name="nunit-console" value="nunit-console.exe" />
     <property name="switch" value="/" />
+  -->
 
   <!-- Build for Mono 1.0 -->
-  <!--
     <property name="nant.settings.currentframework" value="mono-1.0" />
     <property name="compile-defines" value="NET_1_1" />
     <property name="debug-extension" value="dll.mdb" />
     <property name="enable-nostdlib" value="false" />
     <property name="nunit-console" value="nunit-console" />
     <property name="switch" value="-" />
-  -->
 
   <!-- Build for .NET Compact Framework 1.0 -->
   <!--

bccrypto-nopatents.patch:
 NBuild.build                       |   12 ------------
 src/security/ParameterUtilities.cs |    5 -----
 2 files changed, 17 deletions(-)

--- NEW FILE bccrypto-nopatents.patch ---
diff -up csharp/crypto/NBuild.build.nopatents csharp/crypto/NBuild.build
--- csharp/crypto/NBuild.build.nopatents	2009-08-18 15:11:56.000000000 +0300
+++ csharp/crypto/NBuild.build	2009-11-13 01:27:18.000000000 +0200
@@ -136,18 +136,6 @@
         <include name="System.dll"/>
       </references>
     </csc>
-    <csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${dist-path}/${name-ext}.dll"
-      verbose="false" debug="false" optimize="true" define="${compile-defines};STRONG_NAME;INCLUDE_IDEA">
-      <sources>
-        <include name="${api-srcpath}/**/*.cs"/>
-        <exclude name="${api-srcpath}/cms/CMSAuthenticated*.cs"/>
-        <include name="${bzip2-srcpath}/**/*.cs"/>
-      </sources>
-      <references>
-        <include name="mscorlib.dll"/>
-        <include name="System.dll"/>
-      </references>
-    </csc>
   </target>
 
   <target name="all" depends="compile-debug, compile-release"/>
diff -up csharp/crypto/src/security/ParameterUtilities.cs.nopatents csharp/crypto/src/security/ParameterUtilities.cs
--- csharp/crypto/src/security/ParameterUtilities.cs.nopatents	2009-11-13 01:26:10.000000000 +0200
+++ csharp/crypto/src/security/ParameterUtilities.cs	2009-11-13 01:26:49.000000000 +0200
@@ -226,9 +226,6 @@ namespace Org.BouncyCastle.Security
 					case "RC2":
 						iv = RC2CbcParameter.GetInstance(asn1Params).GetIV();
 						break;
-					case "IDEA":
-						iv = IdeaCbcPar.GetInstance(asn1Params).GetIV();
-						break;
 					case "CAST5":
 						iv = Cast5CbcParameters.GetInstance(asn1Params).GetIV();
 						break;
@@ -292,8 +289,6 @@ namespace Org.BouncyCastle.Security
 				case "DESEDE":
 				case "DESEDE3":
 					return CreateIVOctetString(random, 8);
-				case "IDEA":
-					return new IdeaCbcPar(CreateIV(random, 8));
 				case "NOEKEON":
 					return CreateIVOctetString(random, 16);
 				case "RC2":


--- NEW FILE import.log ---
mono-bouncycastle-1_5-4_fc13:HEAD:mono-bouncycastle-1.5-4.fc13.src.rpm:1259829636


--- NEW FILE mono-bouncycastle.spec ---
%global debug_package %{nil}

Name:           mono-bouncycastle
Version:        1.5
Release:        4%{?dist}
Summary:        Bouncy Castle Crypto Package for Mono

Group:          System Environment/Libraries
# Files in crypto/bzip2/ are ASL 1.1 licensed,
# everything else is MIT.
License:        MIT and ASL 1.1
URL:            http://www.bouncycastle.org/csharp/
# Original source http://www.bouncycastle.org/csharp/download/bccrypto-net-%{version}-src.zip
Source0:        bccrypto-net-%{version}-src-nopatents.zip
# The following script is used to remove certain patented algorithms
# from the source zip file before shipping it.
# Download the upstream zip file and invoke this script:
# ./bccrypto-generate-zip.sh %{version}
Source1:        bccrypto-generate-zip.sh
# Temporarily bundle mono.snk with this package to fix build on < F-13
Source2:        mono.snk
# Patch to enable building with Mono
Patch0:         bccrypto-mono.patch
# Patch to fix build with patent encumbered code removed
Patch1:         bccrypto-nopatents.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  mono-devel, nant
BuildRequires:  unzip

# Exclude architectures that don't have nant
ExcludeArch:    ppc64 ppc sparc64

%description
The Bouncy Castle Crypto package is a C# implementation of cryptographic
algorithms. It is a port of the Bouncy Castle Java APIs, with
approximately 80% of the functionality ported. The C# API is constantly
kept uptodate with bug fixes and new test cases from the Java build
(and vice versa sometimes), thus benefitting from the large user base
and real-world use the Java version has seen.

%prep
%setup -q -n csharp
%patch0 -p1 -b .mono
%patch1 -p1 -b .nopatents

%build
%if 0%{?fedora} < 13
cp %{SOURCE2} BouncyCastle.snk
%else
# Use the mono system key instead of generating our own here.
cp -a /etc/pki/mono/mono.snk BouncyCastle.snk
%endif
cd crypto/
nant dist

%install
rm -rf $RPM_BUILD_ROOT
cd crypto/
mkdir -p $RPM_BUILD_ROOT%{_libdir}/mono/gac/
gacutil -i dist/BouncyCastle.Crypto.dll -f -package bouncycastle -root $RPM_BUILD_ROOT%{_libdir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc crypto/Contributors.html
%doc crypto/License.html
%doc crypto/Readme.html
%{_libdir}/mono/gac/*/
%{_libdir}/mono/bouncycastle/

%changelog
* Wed Dec 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-4
- Updated License tag to read 'MIT and ASL 1.1'

* Wed Dec 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-3
- Temporarily bundle mono.snk with this package to fix build on < F-13

* Tue Dec 01 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-2
- Use the system mono.snk key instead of regenerating on every build

* Fri Nov 13 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-1
- Initial RPM release.


--- NEW FILE mono.snk ---

?&??B?O???r????Fn??	??L?}r??
?IE??*z]?oRn?l??{Ma2?,Yd???~?????Da`}????aTP????`??&??)??r??Hxw????a+?T????LG2p+??F?8J??}^pn???#????9??;?2Cg?D??&1d?!?/Wx}????p?2B???B?	H>?4-?"??5\ ?Z?J?7???T??.?<?"-!__)}?????MMr???0n??c?
*?m???9X?H??$N???t?@?q??C??&0?Q?1?'-s???cv1*<O
/p?euS?r?"????7?n????u?(^??4m??p>/ ^S??7?qG??1|+?J>?-Y??7?.}n?HuH?$??H??l?H?????J?f
lO?????E??7]R?`>lW????
?????_??4?I??????????p???o?y???E}??A?5&??c??XL??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:39:40 -0000	1.1
+++ .cvsignore	3 Dec 2009 08:40:55 -0000	1.2
@@ -0,0 +1 @@
+bccrypto-net-1.5-src-nopatents.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:39:40 -0000	1.1
+++ sources	3 Dec 2009 08:40:55 -0000	1.2
@@ -0,0 +1 @@
+2905d4f7bf067394ebe4c9bbf49d81aa  bccrypto-net-1.5-src-nopatents.zip



From akurtakov at fedoraproject.org  Thu Dec  3 08:45:06 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Dec 2009 08:45:06 +0000 (UTC)
Subject: rpms/sqljet/devel sqljet-browser.sh, NONE,
	1.1 sqljet-browser.desktop, 
	NONE, 1.1 sqljet.spec, NONE, 1.1 sqljet-javadoc.patch, NONE,
	1.1 fetch-sqljet.sh, NONE, 1.1 sources, 1.1, 1.2 .cvsignore, 1.1, 1.2
Message-ID: <20091203084506.4C90A11C00EE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	sources .cvsignore 
Added Files:
	sqljet-browser.sh sqljet-browser.desktop sqljet.spec 
	sqljet-javadoc.patch fetch-sqljet.sh 
Log Message:
Initial import.


--- NEW FILE sqljet-browser.sh ---
#!/bin/bash
. /usr/share/java-utils/java-functions

MAIN_CLASS=org.tmatesoft.sqljet.browser.DBBrowser

set_classpath "sqljet sqljet-browser"

export CLASSPATH=$CLASSPATH:/usr/share/netbeans/platform10/modules/org-netbeans-swing-outline.jar

run "$@"


--- NEW FILE sqljet-browser.desktop ---
[Desktop Entry]
Name=sqljet-browser
GenericName=SQLJet brower
Comment=Java browser for sqlite files
Exec=sqljet-browser
Terminal=false
Type=Application
Categories=Development;Database


--- NEW FILE sqljet.spec ---
Name:           sqljet
Version:        1.0.1
Release:        2%{?dist}
Summary:        Pure Java SQLite

Group:          Development/Libraries
License:        GPLv2
URL:            http://sqljet.com/
# Obtained by sh fetch-sqljet.sh
Source0:        %{name}-%{version}.tar.bz2
Source1:        fetch-sqljet.sh
Source2:        %{name}-browser.sh
Source3:        %{name}-browser.desktop
Patch0:         %{name}-javadoc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant
BuildRequires:  antlr
BuildRequires:  antlr3
BuildRequires:  easymock2
BuildRequires:  netbeans-platform
BuildRequires:  java-devel >= 1.6
BuildRequires:  junit4
BuildRequires:  desktop-file-utils

BuildArch: noarch

%description
SQLJet is an independent pure Java implementation of a popular SQLite database
management system. SQLJet is a software library that provides API that enables
Java application to read and modify SQLite databases.

%package        browser
Group:          Development/Tools
Summary:        SQLJet database browser
Requires:       %{name} = %{version}
Requires:       netbeans-platform

%description    browser
Utility for browsing SQLJet/SQLite databases.

%package        javadoc
Group:          Documentation
Summary:        Javadoc for %{name}
Requires:       jpackage-utils

%description    javadoc
API documentation for %{name}.

%prep
%setup -q
%patch0

find \( -name '*.class' -o -name '*.jar' \) -delete 

pushd lib
ln -s %{_javadir}/antlr3.jar antlr-runtime-3.1.3.jar
popd
pushd sqljet-examples/browser/lib
ln -s %{_datadir}/netbeans/platform10/modules/org-netbeans-swing-outline.jar org-netbeans-swing-outline.jar
popd


%build
export CLASSPATH=$(build-classpath antlr3 antlr stringtemplate easymock2 junit4)

ant jars javadoc

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_javadir}
cp -p  build/sqljet.jar  \
%{buildroot}%{_javadir}/%{name}-%{version}.jar
cp -p  build/sqljet-browser.jar  \
%{buildroot}%{_javadir}/%{name}-browser-%{version}.jar

(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -rp javadocs \
%{buildroot}%{_javadocdir}/%{name}

install -d %{buildroot}%{_bindir}
install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}-browser

desktop-file-install                                    \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
%{SOURCE3}

desktop-file-validate %{buildroot}/%{_datadir}/applications/sqljet-browser.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING INSTALL README.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files browser
%defattr(-,root,root,-)
%{_javadir}/%{name}-browser.jar
%{_javadir}/%{name}-browser-%{version}.jar
%{_bindir}/%{name}-browser
%{_datadir}/applications/%{name}-browser.desktop

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Mon Nov 30 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-2
- Fix build and review comments.

* Thu Nov 26 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-1
- Initial package.

sqljet-javadoc.patch:
 build.xml |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

--- NEW FILE sqljet-javadoc.patch ---
--- build.xml.orig	2009-11-18 03:30:24.000000000 +0200
+++ build.xml	2009-11-26 13:12:39.562877717 +0200
@@ -340,4 +340,32 @@ public class SqlParser</replacevalue>
 			<sysproperty key="SqlJetBtreeTableTest.REPEATS_COUNT" value="100" />
 		</junit>
 	</target>
+	<target name="javadoc" description="Build the javadocs for the source code.">
+	    <javadoc destdir="javadocs"
+		     packagenames="org.tmatesoft.sqljet"
+		     sourcepath="sqljet/src">
+		<fileset dir="sqljet/src">
+		  <include name="**/*.java"/>
+		</fileset>
+	    </javadoc>
+	</target>
+ <target name="jars" depends="clean, compile, compile-examples">
+        <mkdir dir="build" />
+    	<!-- update svnkit.build.properties here -->
+    	<antcall target="init-build.number"/>
+
+	<jar destfile="build/sqljet.jar">
+            <fileset dir="sqljet/bin">
+                <include name="**/**"/>
+            </fileset>
+            <fileset dir="build">
+                <include name="sqljet.build.properties"/>
+            </fileset>
+        </jar>
+	<jar destfile="build/sqljet-browser.jar" >
+            <fileset dir="sqljet-examples/browser/bin">
+                <include name="**/**"/>
+            </fileset>
+        </jar>
+        </target>
 </project>
\ No newline at end of file


--- NEW FILE fetch-sqljet.sh ---
#! /bin/sh

version=1.0.1
mkdir fetch
cd fetch
svn export http://svn.sqljet.com/repos/sqljet/tags/$version sqljet-$version

tar cfj sqljet-$version.tar.bz2 sqljet-$version

cd ..


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqljet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:37:55 -0000	1.1
+++ sources	3 Dec 2009 08:45:06 -0000	1.2
@@ -0,0 +1 @@
+c4ce73c5912b1b48cc5a5166bd9e75af  sqljet-1.0.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqljet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:37:55 -0000	1.1
+++ .cvsignore	3 Dec 2009 08:45:06 -0000	1.2
@@ -0,0 +1 @@
+sqljet-1.0.1.tar.bz2



From caolanm at fedoraproject.org  Thu Dec  3 08:46:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 08:46:02 +0000 (UTC)
Subject: File libxml-1.1.3.zip uploaded to lookaside cache by caolanm
Message-ID: <20091203084602.D987410F88E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pentaho-libxml:

8008caa6819ed7a03eb908cc989a65b9  libxml-1.1.3.zip



From caolanm at fedoraproject.org  Thu Dec  3 08:49:11 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 08:49:11 +0000 (UTC)
Subject: rpms/pentaho-libxml/devel .cvsignore, 1.5, 1.6 pentaho-libxml.spec, 
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091203084911.1337211C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/pentaho-libxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26870

Modified Files:
	.cvsignore pentaho-libxml.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-libxml/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Nov 2009 16:00:50 -0000	1.5
+++ .cvsignore	3 Dec 2009 08:49:10 -0000	1.6
@@ -1 +1 @@
-libxml-1.1.2.zip
+libxml-1.1.3.zip


Index: pentaho-libxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-libxml/devel/pentaho-libxml.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pentaho-libxml.spec	17 Nov 2009 16:00:50 -0000	1.7
+++ pentaho-libxml.spec	3 Dec 2009 08:49:10 -0000	1.8
@@ -3,7 +3,7 @@
 %define origname libxml
 
 Name: pentaho-libxml
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 Summary: Namespace aware SAX-Parser utility library
 License: LGPLv2+
@@ -102,6 +102,9 @@ fi
 %{_javadocdir}/%{origname}
 
 %changelog
+* Thu Dec 03 2009 Caolan McNamara <caolanm at redhat.com> 1.1.3
+- latest version
+
 * Tue Nov 17 2009 Caolan McNamara <caolanm at redhat.com> 1.1.2
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-libxml/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Nov 2009 16:00:50 -0000	1.5
+++ sources	3 Dec 2009 08:49:10 -0000	1.6
@@ -1 +1 @@
-1b0c46053733064901ae66f760cebf12  libxml-1.1.2.zip
+8008caa6819ed7a03eb908cc989a65b9  libxml-1.1.3.zip



From caolanm at fedoraproject.org  Thu Dec  3 08:52:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 08:52:02 +0000 (UTC)
Subject: File librepository-1.1.3.zip uploaded to lookaside cache by caolanm
Message-ID: <20091203085202.C6D3610F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for librepository:

78aad4dab1fb5d7bd5e6bd9fd76b8fcd  librepository-1.1.3.zip



From kalev at fedoraproject.org  Thu Dec  3 08:52:34 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu,  3 Dec 2009 08:52:34 +0000 (UTC)
Subject: rpms/mono-bouncycastle/F-12 bccrypto-generate-zip.sh, NONE,
	1.1 bccrypto-mono.patch, NONE, 1.1 bccrypto-nopatents.patch,
	NONE, 1.1 import.log, NONE, 1.1 mono-bouncycastle.spec, NONE,
	1.1 mono.snk, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203085234.E4AAB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mono-bouncycastle/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28077/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	bccrypto-generate-zip.sh bccrypto-mono.patch 
	bccrypto-nopatents.patch import.log mono-bouncycastle.spec 
	mono.snk 
Log Message:
Initial import (#537431)


--- NEW FILE bccrypto-generate-zip.sh ---
#!/bin/sh

VER="$1"
DIR="csharp"
ZIP="bccrypto-net-$VER-src.zip"
NEWZIP="bccrypto-net-$VER-src-nopatents.zip"

if [ -z "$VER" ] ; then
	echo "Usage: $0 <version>"
	exit 1
fi

if [ -e "$DIR" ] ; then
	echo "Error: Directory $DIR already exists."
	exit 1
fi

if [ ! -f "$ZIP" ] ; then
	echo "Error: Cannot find $ZIP."
	exit 1
fi

if [ -e "$NEWZIP" ] ; then
	echo "Error: $NEWZIP already exists."
	exit 1
fi

unzip -x "$ZIP"
rm -f "$DIR"/crypto/test/src/crypto/test/IDEATest.cs
rm -f "$DIR"/crypto/src/crypto/engines/IdeaEngine.cs
rm -f "$DIR"/crypto/src/asn1/misc/IDEACBCPar.cs
zip -r -9 "$NEWZIP" "$DIR"
rm -rf "$DIR"

bccrypto-mono.patch:
 NBuild.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bccrypto-mono.patch ---
diff -up csharp/crypto/NBuild.build.mono csharp/crypto/NBuild.build
--- csharp/crypto/NBuild.build.mono	2009-11-12 19:59:24.512446575 +0200
+++ csharp/crypto/NBuild.build	2009-11-12 20:08:33.588616449 +0200
@@ -2,22 +2,22 @@
 <project name="bccrypto-csharp" default="compile-release" basedir=".">
 
   <!-- Build for .NET Framework 1.1 -->
+  <!--
     <property name="nant.settings.currentframework" value="net-1.1" />
     <property name="compile-defines" value="NET_1_1" />
     <property name="debug-extension" value="pdb" />
     <property name="enable-nostdlib" value="true" />
     <property name="nunit-console" value="nunit-console.exe" />
     <property name="switch" value="/" />
+  -->
 
   <!-- Build for Mono 1.0 -->
-  <!--
     <property name="nant.settings.currentframework" value="mono-1.0" />
     <property name="compile-defines" value="NET_1_1" />
     <property name="debug-extension" value="dll.mdb" />
     <property name="enable-nostdlib" value="false" />
     <property name="nunit-console" value="nunit-console" />
     <property name="switch" value="-" />
-  -->
 
   <!-- Build for .NET Compact Framework 1.0 -->
   <!--

bccrypto-nopatents.patch:
 NBuild.build                       |   12 ------------
 src/security/ParameterUtilities.cs |    5 -----
 2 files changed, 17 deletions(-)

--- NEW FILE bccrypto-nopatents.patch ---
diff -up csharp/crypto/NBuild.build.nopatents csharp/crypto/NBuild.build
--- csharp/crypto/NBuild.build.nopatents	2009-08-18 15:11:56.000000000 +0300
+++ csharp/crypto/NBuild.build	2009-11-13 01:27:18.000000000 +0200
@@ -136,18 +136,6 @@
         <include name="System.dll"/>
       </references>
     </csc>
-    <csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${dist-path}/${name-ext}.dll"
-      verbose="false" debug="false" optimize="true" define="${compile-defines};STRONG_NAME;INCLUDE_IDEA">
-      <sources>
-        <include name="${api-srcpath}/**/*.cs"/>
-        <exclude name="${api-srcpath}/cms/CMSAuthenticated*.cs"/>
-        <include name="${bzip2-srcpath}/**/*.cs"/>
-      </sources>
-      <references>
-        <include name="mscorlib.dll"/>
-        <include name="System.dll"/>
-      </references>
-    </csc>
   </target>
 
   <target name="all" depends="compile-debug, compile-release"/>
diff -up csharp/crypto/src/security/ParameterUtilities.cs.nopatents csharp/crypto/src/security/ParameterUtilities.cs
--- csharp/crypto/src/security/ParameterUtilities.cs.nopatents	2009-11-13 01:26:10.000000000 +0200
+++ csharp/crypto/src/security/ParameterUtilities.cs	2009-11-13 01:26:49.000000000 +0200
@@ -226,9 +226,6 @@ namespace Org.BouncyCastle.Security
 					case "RC2":
 						iv = RC2CbcParameter.GetInstance(asn1Params).GetIV();
 						break;
-					case "IDEA":
-						iv = IdeaCbcPar.GetInstance(asn1Params).GetIV();
-						break;
 					case "CAST5":
 						iv = Cast5CbcParameters.GetInstance(asn1Params).GetIV();
 						break;
@@ -292,8 +289,6 @@ namespace Org.BouncyCastle.Security
 				case "DESEDE":
 				case "DESEDE3":
 					return CreateIVOctetString(random, 8);
-				case "IDEA":
-					return new IdeaCbcPar(CreateIV(random, 8));
 				case "NOEKEON":
 					return CreateIVOctetString(random, 16);
 				case "RC2":


--- NEW FILE import.log ---
mono-bouncycastle-1_5-4_fc13:F-12:mono-bouncycastle-1.5-4.fc13.src.rpm:1259830321


--- NEW FILE mono-bouncycastle.spec ---
%global debug_package %{nil}

Name:           mono-bouncycastle
Version:        1.5
Release:        4%{?dist}
Summary:        Bouncy Castle Crypto Package for Mono

Group:          System Environment/Libraries
# Files in crypto/bzip2/ are ASL 1.1 licensed,
# everything else is MIT.
License:        MIT and ASL 1.1
URL:            http://www.bouncycastle.org/csharp/
# Original source http://www.bouncycastle.org/csharp/download/bccrypto-net-%{version}-src.zip
Source0:        bccrypto-net-%{version}-src-nopatents.zip
# The following script is used to remove certain patented algorithms
# from the source zip file before shipping it.
# Download the upstream zip file and invoke this script:
# ./bccrypto-generate-zip.sh %{version}
Source1:        bccrypto-generate-zip.sh
# Temporarily bundle mono.snk with this package to fix build on < F-13
Source2:        mono.snk
# Patch to enable building with Mono
Patch0:         bccrypto-mono.patch
# Patch to fix build with patent encumbered code removed
Patch1:         bccrypto-nopatents.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  mono-devel, nant
BuildRequires:  unzip

# Exclude architectures that don't have nant
ExcludeArch:    ppc64 ppc sparc64

%description
The Bouncy Castle Crypto package is a C# implementation of cryptographic
algorithms. It is a port of the Bouncy Castle Java APIs, with
approximately 80% of the functionality ported. The C# API is constantly
kept uptodate with bug fixes and new test cases from the Java build
(and vice versa sometimes), thus benefitting from the large user base
and real-world use the Java version has seen.

%prep
%setup -q -n csharp
%patch0 -p1 -b .mono
%patch1 -p1 -b .nopatents

%build
%if 0%{?fedora} < 13
cp %{SOURCE2} BouncyCastle.snk
%else
# Use the mono system key instead of generating our own here.
cp -a /etc/pki/mono/mono.snk BouncyCastle.snk
%endif
cd crypto/
nant dist

%install
rm -rf $RPM_BUILD_ROOT
cd crypto/
mkdir -p $RPM_BUILD_ROOT%{_libdir}/mono/gac/
gacutil -i dist/BouncyCastle.Crypto.dll -f -package bouncycastle -root $RPM_BUILD_ROOT%{_libdir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc crypto/Contributors.html
%doc crypto/License.html
%doc crypto/Readme.html
%{_libdir}/mono/gac/*/
%{_libdir}/mono/bouncycastle/

%changelog
* Wed Dec 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-4
- Updated License tag to read 'MIT and ASL 1.1'

* Wed Dec 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-3
- Temporarily bundle mono.snk with this package to fix build on < F-13

* Tue Dec 01 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-2
- Use the system mono.snk key instead of regenerating on every build

* Fri Nov 13 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-1
- Initial RPM release.


--- NEW FILE mono.snk ---

?&??B?O???r????Fn??	??L?}r??
?IE??*z]?oRn?l??{Ma2?,Yd???~?????Da`}????aTP????`??&??)??r??Hxw????a+?T????LG2p+??F?8J??}^pn???#????9??;?2Cg?D??&1d?!?/Wx}????p?2B???B?	H>?4-?"??5\ ?Z?J?7???T??.?<?"-!__)}?????MMr???0n??c?
*?m???9X?H??$N???t?@?q??C??&0?Q?1?'-s???cv1*<O
/p?euS?r?"????7?n????u?(^??4m??p>/ ^S??7?qG??1|+?J>?-Y??7?.}n?HuH?$??H??l?H?????J?f
lO?????E??7]R?`>lW????
?????_??4?I??????????p???o?y???E}??A?5&??c??XL??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:39:40 -0000	1.1
+++ .cvsignore	3 Dec 2009 08:52:34 -0000	1.2
@@ -0,0 +1 @@
+bccrypto-net-1.5-src-nopatents.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:39:40 -0000	1.1
+++ sources	3 Dec 2009 08:52:34 -0000	1.2
@@ -0,0 +1 @@
+2905d4f7bf067394ebe4c9bbf49d81aa  bccrypto-net-1.5-src-nopatents.zip



From caolanm at fedoraproject.org  Thu Dec  3 08:52:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 08:52:42 +0000 (UTC)
Subject: rpms/librepository/devel .cvsignore, 1.5, 1.6 librepository.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091203085242.CA81311C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore librepository.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/librepository/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Nov 2009 20:49:37 -0000	1.5
+++ .cvsignore	3 Dec 2009 08:52:42 -0000	1.6
@@ -1 +1 @@
-librepository-1.1.2.zip
+librepository-1.1.3.zip


Index: librepository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librepository/devel/librepository.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- librepository.spec	17 Nov 2009 20:49:37 -0000	1.6
+++ librepository.spec	3 Dec 2009 08:52:42 -0000	1.7
@@ -2,7 +2,7 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: librepository
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 Summary: Hierarchical repository abstraction layer
 License: LGPLv2+
@@ -101,6 +101,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 02 2009 Caolan McNamara <caolanm at redhat.com> 1.1.3-1
+- latest version
+
 * Tue Nov 17 2009 Caolan McNamara <caolanm at redhat.com> 1.1.2-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/librepository/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Nov 2009 20:49:37 -0000	1.5
+++ sources	3 Dec 2009 08:52:42 -0000	1.6
@@ -1 +1 @@
-953ddd5d27b9c6499e6bdcc2a2063fc3  librepository-1.1.2.zip
+78aad4dab1fb5d7bd5e6bd9fd76b8fcd  librepository-1.1.3.zip



From kalev at fedoraproject.org  Thu Dec  3 08:53:59 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu,  3 Dec 2009 08:53:59 +0000 (UTC)
Subject: rpms/mono-bouncycastle/F-11 bccrypto-generate-zip.sh, NONE,
	1.1 bccrypto-mono.patch, NONE, 1.1 bccrypto-nopatents.patch,
	NONE, 1.1 import.log, NONE, 1.1 mono-bouncycastle.spec, NONE,
	1.1 mono.snk, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203085359.0B74811C00EE@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mono-bouncycastle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28714/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	bccrypto-generate-zip.sh bccrypto-mono.patch 
	bccrypto-nopatents.patch import.log mono-bouncycastle.spec 
	mono.snk 
Log Message:
Initial import (#537431)


--- NEW FILE bccrypto-generate-zip.sh ---
#!/bin/sh

VER="$1"
DIR="csharp"
ZIP="bccrypto-net-$VER-src.zip"
NEWZIP="bccrypto-net-$VER-src-nopatents.zip"

if [ -z "$VER" ] ; then
	echo "Usage: $0 <version>"
	exit 1
fi

if [ -e "$DIR" ] ; then
	echo "Error: Directory $DIR already exists."
	exit 1
fi

if [ ! -f "$ZIP" ] ; then
	echo "Error: Cannot find $ZIP."
	exit 1
fi

if [ -e "$NEWZIP" ] ; then
	echo "Error: $NEWZIP already exists."
	exit 1
fi

unzip -x "$ZIP"
rm -f "$DIR"/crypto/test/src/crypto/test/IDEATest.cs
rm -f "$DIR"/crypto/src/crypto/engines/IdeaEngine.cs
rm -f "$DIR"/crypto/src/asn1/misc/IDEACBCPar.cs
zip -r -9 "$NEWZIP" "$DIR"
rm -rf "$DIR"

bccrypto-mono.patch:
 NBuild.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bccrypto-mono.patch ---
diff -up csharp/crypto/NBuild.build.mono csharp/crypto/NBuild.build
--- csharp/crypto/NBuild.build.mono	2009-11-12 19:59:24.512446575 +0200
+++ csharp/crypto/NBuild.build	2009-11-12 20:08:33.588616449 +0200
@@ -2,22 +2,22 @@
 <project name="bccrypto-csharp" default="compile-release" basedir=".">
 
   <!-- Build for .NET Framework 1.1 -->
+  <!--
     <property name="nant.settings.currentframework" value="net-1.1" />
     <property name="compile-defines" value="NET_1_1" />
     <property name="debug-extension" value="pdb" />
     <property name="enable-nostdlib" value="true" />
     <property name="nunit-console" value="nunit-console.exe" />
     <property name="switch" value="/" />
+  -->
 
   <!-- Build for Mono 1.0 -->
-  <!--
     <property name="nant.settings.currentframework" value="mono-1.0" />
     <property name="compile-defines" value="NET_1_1" />
     <property name="debug-extension" value="dll.mdb" />
     <property name="enable-nostdlib" value="false" />
     <property name="nunit-console" value="nunit-console" />
     <property name="switch" value="-" />
-  -->
 
   <!-- Build for .NET Compact Framework 1.0 -->
   <!--

bccrypto-nopatents.patch:
 NBuild.build                       |   12 ------------
 src/security/ParameterUtilities.cs |    5 -----
 2 files changed, 17 deletions(-)

--- NEW FILE bccrypto-nopatents.patch ---
diff -up csharp/crypto/NBuild.build.nopatents csharp/crypto/NBuild.build
--- csharp/crypto/NBuild.build.nopatents	2009-08-18 15:11:56.000000000 +0300
+++ csharp/crypto/NBuild.build	2009-11-13 01:27:18.000000000 +0200
@@ -136,18 +136,6 @@
         <include name="System.dll"/>
       </references>
     </csc>
-    <csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${dist-path}/${name-ext}.dll"
-      verbose="false" debug="false" optimize="true" define="${compile-defines};STRONG_NAME;INCLUDE_IDEA">
-      <sources>
-        <include name="${api-srcpath}/**/*.cs"/>
-        <exclude name="${api-srcpath}/cms/CMSAuthenticated*.cs"/>
-        <include name="${bzip2-srcpath}/**/*.cs"/>
-      </sources>
-      <references>
-        <include name="mscorlib.dll"/>
-        <include name="System.dll"/>
-      </references>
-    </csc>
   </target>
 
   <target name="all" depends="compile-debug, compile-release"/>
diff -up csharp/crypto/src/security/ParameterUtilities.cs.nopatents csharp/crypto/src/security/ParameterUtilities.cs
--- csharp/crypto/src/security/ParameterUtilities.cs.nopatents	2009-11-13 01:26:10.000000000 +0200
+++ csharp/crypto/src/security/ParameterUtilities.cs	2009-11-13 01:26:49.000000000 +0200
@@ -226,9 +226,6 @@ namespace Org.BouncyCastle.Security
 					case "RC2":
 						iv = RC2CbcParameter.GetInstance(asn1Params).GetIV();
 						break;
-					case "IDEA":
-						iv = IdeaCbcPar.GetInstance(asn1Params).GetIV();
-						break;
 					case "CAST5":
 						iv = Cast5CbcParameters.GetInstance(asn1Params).GetIV();
 						break;
@@ -292,8 +289,6 @@ namespace Org.BouncyCastle.Security
 				case "DESEDE":
 				case "DESEDE3":
 					return CreateIVOctetString(random, 8);
-				case "IDEA":
-					return new IdeaCbcPar(CreateIV(random, 8));
 				case "NOEKEON":
 					return CreateIVOctetString(random, 16);
 				case "RC2":


--- NEW FILE import.log ---
mono-bouncycastle-1_5-4_fc13:F-11:mono-bouncycastle-1.5-4.fc13.src.rpm:1259830421


--- NEW FILE mono-bouncycastle.spec ---
%global debug_package %{nil}

Name:           mono-bouncycastle
Version:        1.5
Release:        4%{?dist}
Summary:        Bouncy Castle Crypto Package for Mono

Group:          System Environment/Libraries
# Files in crypto/bzip2/ are ASL 1.1 licensed,
# everything else is MIT.
License:        MIT and ASL 1.1
URL:            http://www.bouncycastle.org/csharp/
# Original source http://www.bouncycastle.org/csharp/download/bccrypto-net-%{version}-src.zip
Source0:        bccrypto-net-%{version}-src-nopatents.zip
# The following script is used to remove certain patented algorithms
# from the source zip file before shipping it.
# Download the upstream zip file and invoke this script:
# ./bccrypto-generate-zip.sh %{version}
Source1:        bccrypto-generate-zip.sh
# Temporarily bundle mono.snk with this package to fix build on < F-13
Source2:        mono.snk
# Patch to enable building with Mono
Patch0:         bccrypto-mono.patch
# Patch to fix build with patent encumbered code removed
Patch1:         bccrypto-nopatents.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  mono-devel, nant
BuildRequires:  unzip

# Exclude architectures that don't have nant
ExcludeArch:    ppc64 ppc sparc64

%description
The Bouncy Castle Crypto package is a C# implementation of cryptographic
algorithms. It is a port of the Bouncy Castle Java APIs, with
approximately 80% of the functionality ported. The C# API is constantly
kept uptodate with bug fixes and new test cases from the Java build
(and vice versa sometimes), thus benefitting from the large user base
and real-world use the Java version has seen.

%prep
%setup -q -n csharp
%patch0 -p1 -b .mono
%patch1 -p1 -b .nopatents

%build
%if 0%{?fedora} < 13
cp %{SOURCE2} BouncyCastle.snk
%else
# Use the mono system key instead of generating our own here.
cp -a /etc/pki/mono/mono.snk BouncyCastle.snk
%endif
cd crypto/
nant dist

%install
rm -rf $RPM_BUILD_ROOT
cd crypto/
mkdir -p $RPM_BUILD_ROOT%{_libdir}/mono/gac/
gacutil -i dist/BouncyCastle.Crypto.dll -f -package bouncycastle -root $RPM_BUILD_ROOT%{_libdir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc crypto/Contributors.html
%doc crypto/License.html
%doc crypto/Readme.html
%{_libdir}/mono/gac/*/
%{_libdir}/mono/bouncycastle/

%changelog
* Wed Dec 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-4
- Updated License tag to read 'MIT and ASL 1.1'

* Wed Dec 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-3
- Temporarily bundle mono.snk with this package to fix build on < F-13

* Tue Dec 01 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-2
- Use the system mono.snk key instead of regenerating on every build

* Fri Nov 13 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-1
- Initial RPM release.


--- NEW FILE mono.snk ---

?&??B?O???r????Fn??	??L?}r??
?IE??*z]?oRn?l??{Ma2?,Yd???~?????Da`}????aTP????`??&??)??r??Hxw????a+?T????LG2p+??F?8J??}^pn???#????9??;?2Cg?D??&1d?!?/Wx}????p?2B???B?	H>?4-?"??5\ ?Z?J?7???T??.?<?"-!__)}?????MMr???0n??c?
*?m???9X?H??$N???t?@?q??C??&0?Q?1?'-s???cv1*<O
/p?euS?r?"????7?n????u?(^??4m??p>/ ^S??7?qG??1|+?J>?-Y??7?.}n?HuH?$??H??l?H?????J?f
lO?????E??7]R?`>lW????
?????_??4?I??????????p???o?y???E}??A?5&??c??XL??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:39:40 -0000	1.1
+++ .cvsignore	3 Dec 2009 08:53:58 -0000	1.2
@@ -0,0 +1 @@
+bccrypto-net-1.5-src-nopatents.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:39:40 -0000	1.1
+++ sources	3 Dec 2009 08:53:58 -0000	1.2
@@ -0,0 +1 @@
+2905d4f7bf067394ebe4c9bbf49d81aa  bccrypto-net-1.5-src-nopatents.zip



From caolanm at fedoraproject.org  Thu Dec  3 08:58:45 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 08:58:45 +0000 (UTC)
Subject: rpms/pentaho-libxml/devel libxml-1.1.2-build.patch,1.1,1.2
Message-ID: <20091203085845.DA4A711C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/pentaho-libxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30097

Modified Files:
	libxml-1.1.2-build.patch 
Log Message:
fixup

libxml-1.1.2-build.patch:
 build.properties |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: libxml-1.1.2-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-libxml/devel/libxml-1.1.2-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libxml-1.1.2-build.patch	17 Nov 2009 16:00:50 -0000	1.1
+++ libxml-1.1.2-build.patch	3 Dec 2009 08:58:45 -0000	1.2
@@ -1,15 +1,15 @@
---- pentaho-libxml-1.1.2/build.properties	2009-11-17 15:20:48.000000000 +0000
-+++ pentaho-libxml-1.1.2/build.properties	2009-11-17 15:20:57.000000000 +0000
+--- pentaho-libxml-1.1.3/build.properties	2009-11-17 15:20:48.000000000 +0000
++++ pentaho-libxml-1.1.3/build.properties	2009-11-17 15:20:57.000000000 +0000
 @@ -1,4 +1,4 @@
 -project.revision=TRUNK-SNAPSHOT
-+project.revision=1.1.2
++project.revision=1.1.3
  ivy.artifact.group=pentaho-library
  ivy.artifact.id=libxml
  impl.title=LibXml
 @@ -6,4 +6,6 @@
  src.dir=${basedir}/source
- dependency.libbase.revision=1.1.2
- dependency.libloader.revision=1.1.2
+ dependency.libbase.revision=1.1.3
+ dependency.libloader.revision=1.1.3
 -testsrc.dir=${basedir}/test
 \ No newline at end of file
 +testsrc.dir=${basedir}/test



From jwrdegoede at fedoraproject.org  Thu Dec  3 08:58:56 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  3 Dec 2009 08:58:56 +0000 (UTC)
Subject: rpms/gkrellm/F-12 gkrellm-2.3.2-ssl-threadsafety.patch, NONE,
	1.1 gkrellm.spec, 1.24, 1.25
Message-ID: <20091203085856.168B611C00EE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30219

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.2-ssl-threadsafety.patch 
Log Message:
* Fri Nov 27 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-7
- Fix crash when using multiple simap/spop mailboxes (#541824)


gkrellm-2.3.2-ssl-threadsafety.patch:
 mail.c |   33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

--- NEW FILE gkrellm-2.3.2-ssl-threadsafety.patch ---
diff -up gkrellm-2.3.2/src/mail.c~ gkrellm-2.3.2/src/mail.c
--- gkrellm-2.3.2/src/mail.c~	2008-10-04 02:33:37.000000000 +0200
+++ gkrellm-2.3.2/src/mail.c	2009-11-27 11:50:31.000000000 +0100
@@ -306,6 +306,21 @@ static gint		anim_frame,
 
 static gint		style_id;
 
+#ifdef HAVE_SSL
+#ifndef HAVE_GNUTLS
+static GMutex		**ssl_locks;
+
+static void
+ssl_locking_cb(int mode, int n, const char *file, int line)
+	{
+	if (mode & CRYPTO_LOCK)
+		g_mutex_lock(ssl_locks[n]);
+	else
+		g_mutex_unlock(ssl_locks[n]);
+	}
+#endif
+#endif
+
   /* This may be called from gkrellm_sys_main_init()
   */
 void
@@ -750,9 +765,6 @@ ssl_negotiate(ConnInfo *conn, Mailbox *m
 	{
 	SSL_METHOD	*ssl_method;
 
-	SSLeay_add_ssl_algorithms();
-	SSL_load_error_strings();
-
 	if (mbox->account->use_ssl == SSL_TRANSPORT)
 		ssl_method = SSLv23_client_method();
 	else
@@ -4246,6 +4258,12 @@ static GkrellmMonitor	monitor_mail =
 GkrellmMonitor *
 gkrellm_init_mail_monitor(void)
 	{
+#ifdef HAVE_SSL
+#ifndef HAVE_GNUTLS
+	int i, num_locks = CRYPTO_num_locks();
+#endif
+#endif
+
 	monitor_mail.name = _(monitor_mail.name);
 	enable_mail = TRUE;
 	show_tooltip = TRUE;
@@ -4266,6 +4284,15 @@ gkrellm_init_mail_monitor(void)
 #ifdef HAVE_GNUTLS
 	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 	gnutls_global_init();
+#else
+#ifdef HAVE_SSL
+	SSL_load_error_strings();
+	SSL_library_init();
+	ssl_locks = g_new(GMutex *, num_locks);
+	for (i = 0; i < num_locks; i++)
+		ssl_locks[i] = g_mutex_new();
+	CRYPTO_set_locking_callback(ssl_locking_cb);
+#endif
 #endif
 
 	mail_fetch = g_new0(Mailbox, 1);


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/F-12/gkrellm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gkrellm.spec	21 Aug 2009 13:31:37 -0000	1.24
+++ gkrellm.spec	3 Dec 2009 08:58:55 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -13,6 +13,7 @@ Patch1:         gkrellm-2.1.28-config.pa
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.3.1-netdb.patch
+Patch5:         gkrellm-2.3.2-ssl-threadsafety.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +62,7 @@ Development files for the GNU Krell Moni
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
 %patch4 -p1 -z .netdb
+%patch5 -p1 -z .ssl
 
 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
@@ -167,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 27 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-7
+- Fix crash when using multiple simap/spop mailboxes (#541824)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.2-6
 - rebuilt with new openssl
 



From jwrdegoede at fedoraproject.org  Thu Dec  3 08:59:49 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  3 Dec 2009 08:59:49 +0000 (UTC)
Subject: rpms/gkrellm/F-11 gkrellm-2.3.2-ssl-threadsafety.patch, NONE,
	1.1 gkrellm.spec, 1.22, 1.23
Message-ID: <20091203085949.3521011C00EE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30564

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.2-ssl-threadsafety.patch 
Log Message:
* Fri Nov 27 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-7
- Fix crash when using multiple simap/spop mailboxes (#541824)


gkrellm-2.3.2-ssl-threadsafety.patch:
 mail.c |   33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

--- NEW FILE gkrellm-2.3.2-ssl-threadsafety.patch ---
diff -up gkrellm-2.3.2/src/mail.c~ gkrellm-2.3.2/src/mail.c
--- gkrellm-2.3.2/src/mail.c~	2008-10-04 02:33:37.000000000 +0200
+++ gkrellm-2.3.2/src/mail.c	2009-11-27 11:50:31.000000000 +0100
@@ -306,6 +306,21 @@ static gint		anim_frame,
 
 static gint		style_id;
 
+#ifdef HAVE_SSL
+#ifndef HAVE_GNUTLS
+static GMutex		**ssl_locks;
+
+static void
+ssl_locking_cb(int mode, int n, const char *file, int line)
+	{
+	if (mode & CRYPTO_LOCK)
+		g_mutex_lock(ssl_locks[n]);
+	else
+		g_mutex_unlock(ssl_locks[n]);
+	}
+#endif
+#endif
+
   /* This may be called from gkrellm_sys_main_init()
   */
 void
@@ -750,9 +765,6 @@ ssl_negotiate(ConnInfo *conn, Mailbox *m
 	{
 	SSL_METHOD	*ssl_method;
 
-	SSLeay_add_ssl_algorithms();
-	SSL_load_error_strings();
-
 	if (mbox->account->use_ssl == SSL_TRANSPORT)
 		ssl_method = SSLv23_client_method();
 	else
@@ -4246,6 +4258,12 @@ static GkrellmMonitor	monitor_mail =
 GkrellmMonitor *
 gkrellm_init_mail_monitor(void)
 	{
+#ifdef HAVE_SSL
+#ifndef HAVE_GNUTLS
+	int i, num_locks = CRYPTO_num_locks();
+#endif
+#endif
+
 	monitor_mail.name = _(monitor_mail.name);
 	enable_mail = TRUE;
 	show_tooltip = TRUE;
@@ -4266,6 +4284,15 @@ gkrellm_init_mail_monitor(void)
 #ifdef HAVE_GNUTLS
 	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 	gnutls_global_init();
+#else
+#ifdef HAVE_SSL
+	SSL_load_error_strings();
+	SSL_library_init();
+	ssl_locks = g_new(GMutex *, num_locks);
+	for (i = 0; i < num_locks; i++)
+		ssl_locks[i] = g_mutex_new();
+	CRYPTO_set_locking_callback(ssl_locking_cb);
+#endif
 #endif
 
 	mail_fetch = g_new0(Mailbox, 1);


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/F-11/gkrellm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gkrellm.spec	17 Mar 2009 21:02:37 -0000	1.22
+++ gkrellm.spec	3 Dec 2009 08:59:49 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.2
-Release:        4%{?dist}
+Release:        7%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -13,6 +13,7 @@ Patch1:         gkrellm-2.1.28-config.pa
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.3.1-netdb.patch
+Patch5:         gkrellm-2.3.2-ssl-threadsafety.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +62,7 @@ Development files for the GNU Krell Moni
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
 %patch4 -p1 -z .netdb
+%patch5 -p1 -z .ssl
 
 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
@@ -167,6 +169,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 27 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-7
+- Fix crash when using multiple simap/spop mailboxes (#541824)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.2-6
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.3.2-4
 - Sync icon cache update scriptlets with current Fedora guidelines.
 



From stevetraylen at fedoraproject.org  Thu Dec  3 09:00:10 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 09:00:10 +0000 (UTC)
Subject: File HTTP-Daemon-SSL-1.04.tar.gz uploaded to lookaside cache by
	stevetraylen
Message-ID: <20091203090010.630BD10F88E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-HTTP-Daemon-SSL:

fb9463de861bba7864d79045d1e8cded  HTTP-Daemon-SSL-1.04.tar.gz



From caolanm at fedoraproject.org  Thu Dec  3 09:00:39 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 09:00:39 +0000 (UTC)
Subject: File libbase-1.1.3.zip uploaded to lookaside cache by caolanm
Message-ID: <20091203090039.3A4B810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libbase:

83819f19b7338524f4292b86d686e177  libbase-1.1.3.zip



From stevetraylen at fedoraproject.org  Thu Dec  3 09:00:45 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 09:00:45 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL/devel import.log, NONE,
	1.1 perl-HTTP-Daemon-SSL.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091203090045.D54EE11C02BD@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30953/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-HTTP-Daemon-SSL.spec 
Log Message:
RPM import.



--- NEW FILE import.log ---
perl-HTTP-Daemon-SSL-1_04-2_fc11:HEAD:perl-HTTP-Daemon-SSL-1.04-2.fc11.src.rpm:1259830818


--- NEW FILE perl-HTTP-Daemon-SSL.spec ---
Name:           perl-HTTP-Daemon-SSL
Version:        1.04
Release:        2%{?dist}
Summary:        Simple http server class with SSL support
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTTP-Daemon-SSL/
Source0:        http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-SSL-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Daemon) >= 1
BuildRequires:  perl(IO::Socket::SSL) >= 0.93
Requires:       perl(HTTP::Daemon) >= 1
Requires:       perl(IO::Socket::SSL) >= 0.93
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Instances of the HTTP::Daemon::SSL class are HTTP/1.1 servers that listen
on a socket for incoming requests. The HTTP::Daemon::SSL is a sub-class of
IO::Socket::SSL, so you can perform socket operations directly on it too.

%prep
%setup -q -n HTTP-Daemon-SSL-%{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 BUGS Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/HTTP::Daemon::SSL.3pm*

%changelog
* Mon Nov 30 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-2
- Define included man pages more explicitly.
* Fri Nov 20 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:35:06 -0000	1.1
+++ .cvsignore	3 Dec 2009 09:00:45 -0000	1.2
@@ -0,0 +1 @@
+HTTP-Daemon-SSL-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:35:06 -0000	1.1
+++ sources	3 Dec 2009 09:00:45 -0000	1.2
@@ -0,0 +1 @@
+fb9463de861bba7864d79045d1e8cded  HTTP-Daemon-SSL-1.04.tar.gz



From caolanm at fedoraproject.org  Thu Dec  3 09:03:45 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 09:03:45 +0000 (UTC)
Subject: rpms/libbase/devel .cvsignore, 1.4, 1.5 libbase-1.1.2.build.patch,
	1.1, 1.2 libbase.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091203090345.8D41511C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore libbase-1.1.2.build.patch libbase.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libbase/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Nov 2009 14:01:13 -0000	1.4
+++ .cvsignore	3 Dec 2009 09:03:45 -0000	1.5
@@ -1 +1 @@
-libbase-1.1.2.zip
+libbase-1.1.3.zip

libbase-1.1.2.build.patch:
 build.properties |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: libbase-1.1.2.build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libbase/devel/libbase-1.1.2.build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libbase-1.1.2.build.patch	17 Nov 2009 14:01:13 -0000	1.1
+++ libbase-1.1.2.build.patch	3 Dec 2009 09:03:45 -0000	1.2
@@ -1,8 +1,8 @@
---- libbase-1.1.2/build.properties	2009-11-17 13:12:25.000000000 +0000
-+++ libbase-1.1.2/build.properties	2009-11-17 13:12:37.000000000 +0000
+--- libbase-1.1.3/build.properties	2009-11-17 13:12:25.000000000 +0000
++++ libbase-1.1.3/build.properties	2009-11-17 13:12:37.000000000 +0000
 @@ -1,4 +1,4 @@
 -project.revision=TRUNK-SNAPSHOT
-+project.revision=1.1.2
++project.revision=1.1.3
  ivy.artifact.group=pentaho-library
  ivy.artifact.id=libbase
  impl.title=Libbase


Index: libbase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbase/devel/libbase.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libbase.spec	17 Nov 2009 14:01:13 -0000	1.4
+++ libbase.spec	3 Dec 2009 09:03:45 -0000	1.5
@@ -2,7 +2,7 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: libbase
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 Summary: JFree Base Services
 License: LGPLv2+
@@ -99,6 +99,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Caolan McNamara <caolanm at redhat.com> 1.1.3-1
+- latest version
+
 * Thu Nov 17 2009 Caolan McNamara <caolanm at redhat.com> 1.1.2-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libbase/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Nov 2009 14:01:13 -0000	1.4
+++ sources	3 Dec 2009 09:03:45 -0000	1.5
@@ -1 +1 @@
-799c3dac20549d7aea7545a95d567020  libbase-1.1.2.zip
+83819f19b7338524f4292b86d686e177  libbase-1.1.3.zip



From caolanm at fedoraproject.org  Thu Dec  3 09:07:13 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 09:07:13 +0000 (UTC)
Subject: rpms/librepository/devel librepository-1.1.2.build.patch, 1.1,
	1.2 librepository.spec, 1.7, 1.8
Message-ID: <20091203090713.449D611C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	librepository-1.1.2.build.patch librepository.spec 
Log Message:
fixup

librepository-1.1.2.build.patch:
 build.properties |    4 +++-
 common_build.xml |    6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: librepository-1.1.2.build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/librepository/devel/librepository-1.1.2.build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- librepository-1.1.2.build.patch	17 Nov 2009 20:49:37 -0000	1.1
+++ librepository-1.1.2.build.patch	3 Dec 2009 09:07:12 -0000	1.2
@@ -1,18 +1,18 @@
---- librepository-1.1.2/build.properties	2009-11-17 16:41:36.000000000 +0000
-+++ librepository-1.1.2/build.properties	2009-11-17 16:41:56.000000000 +0000
+--- librepository-1.1.3/build.properties	2009-11-17 16:41:36.000000000 +0000
++++ librepository-1.1.3/build.properties	2009-11-17 16:41:56.000000000 +0000
 @@ -1,7 +1,9 @@
 -project.revision=TRUNK-SNAPSHOT
-+project.revision=1.1.2
++project.revision=1.1.3
  ivy.artifact.group=pentaho-library
  ivy.artifact.id=librepository
  impl.title=LibRepository
  impl.productID=librepository
  src.dir=${basedir}/source
- dependency.libbase.revision=1.1.2
+ dependency.libbase.revision=1.1.3
 +antcontrib.available=true
 +build.cache.dir=lib
---- librepository-1.1.2/common_build.xml	2009-11-17 20:34:29.000000000 +0000
-+++ librepository-1.1.2/common_build.xml	2009-11-17 20:36:51.000000000 +0000
+--- librepository-1.1.3/common_build.xml	2009-11-17 20:34:29.000000000 +0000
++++ librepository-1.1.3/common_build.xml	2009-11-17 20:36:51.000000000 +0000
 @@ -1071,6 +1071,7 @@
          <path refid="classpath" />
        </classpath>
@@ -23,7 +23,7 @@
  
 @@ -1356,6 +1357,9 @@
               doctitle="${impl.title} documentation">
-       <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+       <link href="http://java.sun.com/j2se/${javac.source}.0/docs/api/" />
        <classpath refid="classpath" />
 +      <packageset dir="source">
 +        <exclude name="org/pentaho/reporting/libraries/repository/email/**"/>
@@ -31,3 +31,10 @@
      </javadoc>
    </target>
  
+@@ -1648,4 +1652,4 @@
+     </dot-classpath>
+   </target>
+ 
+-</project>
+\ No hay ning?n car?cter de nueva l?nea al final del fichero
++</project>


Index: librepository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librepository/devel/librepository.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- librepository.spec	3 Dec 2009 08:52:42 -0000	1.7
+++ librepository.spec	3 Dec 2009 09:07:13 -0000	1.8
@@ -9,9 +9,9 @@ License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.zip
 URL: http://reporting.pentaho.org/
-BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libbase >= 1.1.2
+BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libbase >= 1.1.3
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, libbase >= 1.1.2
+Requires: java, jpackage-utils, libbase >= 1.1.3
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31



From caolanm at fedoraproject.org  Thu Dec  3 09:11:01 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 09:11:01 +0000 (UTC)
Subject: File libloader-1.1.3.zip uploaded to lookaside cache by caolanm
Message-ID: <20091203091101.BEF8610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libloader:

f124dafb3f8acd1c1fbffa3e346666c4  libloader-1.1.3.zip



From stevetraylen at fedoraproject.org  Thu Dec  3 09:11:42 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 09:11:42 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL/EL-5 perl-HTTP-Daemon-SSL.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203091142.0FBF111C02BB@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1738/EL-5

Modified Files:
	sources 
Added Files:
	perl-HTTP-Daemon-SSL.spec 
Log Message:
First package.



--- NEW FILE perl-HTTP-Daemon-SSL.spec ---
Name:           perl-HTTP-Daemon-SSL
Version:        1.04
Release:        2%{?dist}
Summary:        Simple http server class with SSL support
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTTP-Daemon-SSL/
Source0:        http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-SSL-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Daemon) >= 1
BuildRequires:  perl(IO::Socket::SSL) >= 0.93
Requires:       perl(HTTP::Daemon) >= 1
Requires:       perl(IO::Socket::SSL) >= 0.93
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Instances of the HTTP::Daemon::SSL class are HTTP/1.1 servers that listen
on a socket for incoming requests. The HTTP::Daemon::SSL is a sub-class of
IO::Socket::SSL, so you can perform socket operations directly on it too.

%prep
%setup -q -n HTTP-Daemon-SSL-%{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 BUGS Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/HTTP::Daemon::SSL.3pm*

%changelog
* Mon Nov 30 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-2
- Define included man pages more explicitly.
* Fri Nov 20 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-1
- Specfile autogenerated by cpanspec 1.78.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:35:06 -0000	1.1
+++ sources	3 Dec 2009 09:11:41 -0000	1.2
@@ -0,0 +1 @@
+fb9463de861bba7864d79045d1e8cded  HTTP-Daemon-SSL-1.04.tar.gz



From stevetraylen at fedoraproject.org  Thu Dec  3 09:11:42 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 09:11:42 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL/F-11 perl-HTTP-Daemon-SSL.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203091142.3B00F11C0376@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1738/F-11

Modified Files:
	sources 
Added Files:
	perl-HTTP-Daemon-SSL.spec 
Log Message:
First package.



--- NEW FILE perl-HTTP-Daemon-SSL.spec ---
Name:           perl-HTTP-Daemon-SSL
Version:        1.04
Release:        2%{?dist}
Summary:        Simple http server class with SSL support
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTTP-Daemon-SSL/
Source0:        http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-SSL-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Daemon) >= 1
BuildRequires:  perl(IO::Socket::SSL) >= 0.93
Requires:       perl(HTTP::Daemon) >= 1
Requires:       perl(IO::Socket::SSL) >= 0.93
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Instances of the HTTP::Daemon::SSL class are HTTP/1.1 servers that listen
on a socket for incoming requests. The HTTP::Daemon::SSL is a sub-class of
IO::Socket::SSL, so you can perform socket operations directly on it too.

%prep
%setup -q -n HTTP-Daemon-SSL-%{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 BUGS Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/HTTP::Daemon::SSL.3pm*

%changelog
* Mon Nov 30 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-2
- Define included man pages more explicitly.
* Fri Nov 20 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-1
- Specfile autogenerated by cpanspec 1.78.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:35:06 -0000	1.1
+++ sources	3 Dec 2009 09:11:42 -0000	1.2
@@ -0,0 +1 @@
+fb9463de861bba7864d79045d1e8cded  HTTP-Daemon-SSL-1.04.tar.gz



From stevetraylen at fedoraproject.org  Thu Dec  3 09:11:41 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 09:11:41 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL/EL-4 perl-HTTP-Daemon-SSL.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203091141.DE7E911C00EE@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1738/EL-4

Modified Files:
	sources 
Added Files:
	perl-HTTP-Daemon-SSL.spec 
Log Message:
First package.



--- NEW FILE perl-HTTP-Daemon-SSL.spec ---
Name:           perl-HTTP-Daemon-SSL
Version:        1.04
Release:        2%{?dist}
Summary:        Simple http server class with SSL support
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTTP-Daemon-SSL/
Source0:        http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-SSL-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Daemon) >= 1
BuildRequires:  perl(IO::Socket::SSL) >= 0.93
Requires:       perl(HTTP::Daemon) >= 1
Requires:       perl(IO::Socket::SSL) >= 0.93
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Instances of the HTTP::Daemon::SSL class are HTTP/1.1 servers that listen
on a socket for incoming requests. The HTTP::Daemon::SSL is a sub-class of
IO::Socket::SSL, so you can perform socket operations directly on it too.

%prep
%setup -q -n HTTP-Daemon-SSL-%{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 BUGS Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/HTTP::Daemon::SSL.3pm*

%changelog
* Mon Nov 30 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-2
- Define included man pages more explicitly.
* Fri Nov 20 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-1
- Specfile autogenerated by cpanspec 1.78.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:35:06 -0000	1.1
+++ sources	3 Dec 2009 09:11:41 -0000	1.2
@@ -0,0 +1 @@
+fb9463de861bba7864d79045d1e8cded  HTTP-Daemon-SSL-1.04.tar.gz



From stevetraylen at fedoraproject.org  Thu Dec  3 09:11:42 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 09:11:42 +0000 (UTC)
Subject: rpms/perl-HTTP-Daemon-SSL/F-12 perl-HTTP-Daemon-SSL.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203091142.6883611C0382@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1738/F-12

Modified Files:
	sources 
Added Files:
	perl-HTTP-Daemon-SSL.spec 
Log Message:
First package.



--- NEW FILE perl-HTTP-Daemon-SSL.spec ---
Name:           perl-HTTP-Daemon-SSL
Version:        1.04
Release:        2%{?dist}
Summary:        Simple http server class with SSL support
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTTP-Daemon-SSL/
Source0:        http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-SSL-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Daemon) >= 1
BuildRequires:  perl(IO::Socket::SSL) >= 0.93
Requires:       perl(HTTP::Daemon) >= 1
Requires:       perl(IO::Socket::SSL) >= 0.93
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Instances of the HTTP::Daemon::SSL class are HTTP/1.1 servers that listen
on a socket for incoming requests. The HTTP::Daemon::SSL is a sub-class of
IO::Socket::SSL, so you can perform socket operations directly on it too.

%prep
%setup -q -n HTTP-Daemon-SSL-%{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 BUGS Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/HTTP::Daemon::SSL.3pm*

%changelog
* Mon Nov 30 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-2
- Define included man pages more explicitly.
* Fri Nov 20 2009 Steve Traylen <steve.traylen at cern.ch> 1.04-1
- Specfile autogenerated by cpanspec 1.78.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Daemon-SSL/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:35:06 -0000	1.1
+++ sources	3 Dec 2009 09:11:42 -0000	1.2
@@ -0,0 +1 @@
+fb9463de861bba7864d79045d1e8cded  HTTP-Daemon-SSL-1.04.tar.gz



From caolanm at fedoraproject.org  Thu Dec  3 09:13:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 09:13:46 +0000 (UTC)
Subject: rpms/libloader/devel .cvsignore, 1.5,
	1.6 libloader-1.1.2.build.patch, 
	1.1, 1.2 libloader.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091203091346.1BD6711C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore libloader-1.1.2.build.patch libloader.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Nov 2009 15:17:19 -0000	1.5
+++ .cvsignore	3 Dec 2009 09:13:45 -0000	1.6
@@ -1 +1 @@
-libloader-1.1.2.zip
+libloader-1.1.3.zip

libloader-1.1.2.build.patch:
 build.properties |    6 ++++--
 common_build.xml |    6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

Index: libloader-1.1.2.build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/libloader-1.1.2.build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libloader-1.1.2.build.patch	17 Nov 2009 15:17:19 -0000	1.1
+++ libloader-1.1.2.build.patch	3 Dec 2009 09:13:45 -0000	1.2
@@ -1,22 +1,22 @@
---- libloader-1.1.2/build.properties	2009-11-17 14:12:00.000000000 +0000
-+++ libloader-1.1.2/build.properties	2009-11-17 14:12:48.000000000 +0000
+--- libloader-1.1.3/build.properties	2009-11-17 14:12:00.000000000 +0000
++++ libloader-1.1.3/build.properties	2009-11-17 14:12:48.000000000 +0000
 @@ -1,4 +1,4 @@
 -project.revision=TRUNK-SNAPSHOT
-+project.revision=1.1.2
++project.revision=1.1.3
  ivy.artifact.group=pentaho-library
  ivy.artifact.id=libloader
  impl.title=LibLoader
 @@ -6,4 +6,6 @@
  src.dir=${basedir}/source
- dependency.libbase.revision=1.1.2
- dependency.libpixie.revision=1.1.2
+ dependency.libbase.revision=1.1.3
+ dependency.libpixie.revision=1.1.3
 -testsrc.dir=${basedir}/test
 \ No newline at end of file
 +testsrc.dir=${basedir}/test
 +antcontrib.available=true
 +build.cache.dir=lib
---- libloader-1.1.2/common_build.xml	2009-11-17 14:55:31.000000000 +0000
-+++ libloader-1.1.2/common_build.xml	2009-11-17 14:56:48.000000000 +0000
+--- libloader-1.1.3/common_build.xml	2009-11-17 14:55:31.000000000 +0000
++++ libloader-1.1.3/common_build.xml	2009-11-17 14:56:48.000000000 +0000
 @@ -1071,6 +1071,7 @@
          <path refid="classpath" />
        </classpath>
@@ -27,7 +27,7 @@
  
 @@ -1356,6 +1357,9 @@
               doctitle="${impl.title} documentation">
-       <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+       <link href="http://java.sun.com/j2se/${javac.source}.0/docs/api/" />
        <classpath refid="classpath" />
 +      <packageset dir="source">
 +        <exclude name="org/pentaho/reporting/libraries/resourceloader/modules/**"/>
@@ -35,3 +35,10 @@
      </javadoc>
    </target>
  
+@@ -1648,4 +1652,4 @@
+     </dot-classpath>
+   </target>
+ 
+-</project>
+\ No newline at end of file
++</project>


Index: libloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/libloader.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libloader.spec	17 Nov 2009 15:17:19 -0000	1.6
+++ libloader.spec	3 Dec 2009 09:13:45 -0000	1.7
@@ -2,7 +2,7 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: libloader
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 Summary: Resource Loading Framework
 License: LGPLv2+
@@ -10,9 +10,9 @@ Group: System Environment/Libraries
 Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.zip
 URL: http://reporting.pentaho.org/
 BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils
-BuildRequires: libbase >= 1.1.2
+BuildRequires: libbase >= 1.1.3
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, libbase >= 1.1.2
+Requires: java, jpackage-utils, libbase >= 1.1.3
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -104,6 +104,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 02 2009 Caolan McNamara <caolanm at redhat.com> 1.1.3
+- latest version
+
 * Tue Nov 17 2009 Caolan McNamara <caolanm at redhat.com> 1.1.2
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Nov 2009 15:17:19 -0000	1.5
+++ sources	3 Dec 2009 09:13:45 -0000	1.6
@@ -1 +1 @@
-75bbd5cb221dace0c57417c9de273cc2  libloader-1.1.2.zip
+f124dafb3f8acd1c1fbffa3e346666c4  libloader-1.1.3.zip



From stransky at fedoraproject.org  Thu Dec  3 09:22:40 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  3 Dec 2009 09:22:40 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.185,1.186
Message-ID: <20091203092240.ED62711C00EE@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Modified Files:
	xulrunner.spec 
Log Message:
Added fix for #543585 - mozilla-plugin.pc contains incorrect CFLAGS


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- xulrunner.spec	27 Nov 2009 09:39:34 -0000	1.185
+++ xulrunner.spec	3 Dec 2009 09:22:40 -0000	1.186
@@ -17,7 +17,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.2.1
-Release:        0.5.%{?pretag}%{?dist}
+Release:        0.6.%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -34,6 +34,7 @@ Patch1:         mozilla-build.patch
 Patch3:         mozilla-jemalloc.patch
 Patch4:         mozilla-about-firefox-version.patch
 Patch7:         xulrunner-1.9.2.1-build.patch
+Patch8:         mozilla-plugin.patch
 
 # Fedora specific patches
 Patch10:        mozilla-192-pkgconfig.patch
@@ -128,6 +129,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch3  -p1 -b .jemalloc
 %patch4  -p1 -b .about-firefox-version
 %patch7  -p2 -b .del
+%patch8  -p1 -b .plugin
 
 %patch10 -p1 -b .pk
 
@@ -402,6 +404,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Dec 3 2009 Martin Stransky <stransky at redhat.com> 1.9.2.1-0.6.b4
+- Added fix for #543585 - mozilla-plugin.pc contains incorrect CFLAGS
+
 * Fri Nov 27 2009 Martin Stransky <stransky at redhat.com> 1.9.2.1-0.5.b4
 - Update to 1.9.2.1 Beta 4
 



From stransky at fedoraproject.org  Thu Dec  3 09:24:41 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  3 Dec 2009 09:24:41 +0000 (UTC)
Subject: rpms/xulrunner/devel mozilla-plugin.patch,NONE,1.1
Message-ID: <20091203092441.225A511C00EE@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Added Files:
	mozilla-plugin.patch 
Log Message:
added patch

mozilla-plugin.patch:
 mozilla-plugin.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mozilla-plugin.patch ---
diff -up mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in
--- mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old	2009-11-25 05:13:11.000000000 +0100
+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in	2009-12-03 10:14:41.000000000 +0100
@@ -5,5 +5,5 @@ includedir=%includedir%
 Name: Mozilla Plug-In API
 Description: Mozilla Plug-In API
 Version: %MOZILLA_VERSION%
-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
+Cflags: -I${includedir} -DXP_UNIX %ojidef%
 



From ovasik at fedoraproject.org  Thu Dec  3 09:35:32 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  3 Dec 2009 09:35:32 +0000 (UTC)
Subject: File setup-2.8.11.tar.bz2 uploaded to lookaside cache by ovasik
Message-ID: <20091203093532.3441110F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for setup:

c781588ef86fa5adb2c87925f5f8b480  setup-2.8.11.tar.bz2



From ovasik at fedoraproject.org  Thu Dec  3 09:37:22 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  3 Dec 2009 09:37:22 +0000 (UTC)
Subject: rpms/setup/devel .cvsignore, 1.68, 1.69 setup.spec, 1.86,
	1.87 sources, 1.69, 1.70
Message-ID: <20091203093722.9284011C00EE@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
new version 2.8.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	11 Nov 2009 13:39:24 -0000	1.68
+++ .cvsignore	3 Dec 2009 09:37:22 -0000	1.69
@@ -1 +1 @@
-setup-2.8.10.tar.bz2
+setup-2.8.11.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- setup.spec	11 Nov 2009 13:39:25 -0000	1.86
+++ setup.spec	3 Dec 2009 09:37:22 -0000	1.87
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.10
+Version: 2.8.11
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -89,6 +89,11 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Dec 03 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.11-1
+- don't have HISTCONTROL ignorespace by default (#520632),
+  but do not override it when it is already set
+- add csync alias for port 2005 / tcp, udp
+
 * Wed Nov 11 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.10-1
 - reserve uidgid pair 112:112 for vhostmd (#534110)
 - update /etc/services to latest IANA


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	11 Nov 2009 13:39:25 -0000	1.69
+++ sources	3 Dec 2009 09:37:22 -0000	1.70
@@ -1 +1 @@
-94f1d043ea947bfc0713fabb61ca4726  setup-2.8.10.tar.bz2
+c781588ef86fa5adb2c87925f5f8b480  setup-2.8.11.tar.bz2



From caolanm at fedoraproject.org  Thu Dec  3 09:41:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 09:41:49 +0000 (UTC)
Subject: File libfonts-1.1.3.zip uploaded to lookaside cache by caolanm
Message-ID: <20091203094149.9C20E10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libfonts:

c7798a15a7409237dc48fe541d37cbf4  libfonts-1.1.3.zip



From caolanm at fedoraproject.org  Thu Dec  3 09:43:17 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 09:43:17 +0000 (UTC)
Subject: rpms/libfonts/devel .cvsignore, 1.5, 1.6 libfonts-1.1.2.build.patch,
	1.1, 1.2 libfonts.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091203094317.A286111C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore libfonts-1.1.2.build.patch libfonts.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libfonts/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Nov 2009 16:12:48 -0000	1.5
+++ .cvsignore	3 Dec 2009 09:43:17 -0000	1.6
@@ -1 +1 @@
-libfonts-1.1.2.zip
+libfonts-1.1.3.zip

libfonts-1.1.2.build.patch:
 build.properties |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: libfonts-1.1.2.build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libfonts/devel/libfonts-1.1.2.build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libfonts-1.1.2.build.patch	17 Nov 2009 16:12:48 -0000	1.1
+++ libfonts-1.1.2.build.patch	3 Dec 2009 09:43:17 -0000	1.2
@@ -1,14 +1,14 @@
---- libfonts-1.1.2/build.properties	2009-11-17 15:56:39.000000000 +0000
-+++ libfonts-1.1.2/build.properties	2009-11-17 15:57:29.000000000 +0000
+--- libfonts-1.1.3/build.properties	2009-11-17 15:56:39.000000000 +0000
++++ libfonts-1.1.3/build.properties	2009-11-17 15:57:29.000000000 +0000
 @@ -1,8 +1,10 @@
 -project.revision=TRUNK-SNAPSHOT
-+project.revision=1.1.2
++project.revision=1.1.3
  ivy.artifact.group=pentaho-library
  ivy.artifact.id=libfonts
  impl.title=LibFonts
  impl.productID=libfonts
  src.dir=${basedir}/source
- dependency.libloader.revision=1.1.2
+ dependency.libloader.revision=1.1.3
 -testsrc.dir=${basedir}/test
 \ No newline at end of file
 +testsrc.dir=${basedir}/test


Index: libfonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfonts/devel/libfonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libfonts.spec	17 Nov 2009 16:12:48 -0000	1.6
+++ libfonts.spec	3 Dec 2009 09:43:17 -0000	1.7
@@ -2,16 +2,16 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: libfonts
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 Summary: TrueType Font Layouting
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.zip
 URL: http://reporting.pentaho.org/
-BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libloader >= 1.1.2, itext
+BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libloader >= 1.1.3, itext
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, libloader >= 1.1.2, itext
+Requires: java, jpackage-utils, libloader >= 1.1.3, itext
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -102,6 +102,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Caolan McNamara <caolanm at redhat.com> 1.1.3-1
+- latest version
+
 * Tue Nov 17 2009 Caolan McNamara <caolanm at redhat.com> 1.1.2-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libfonts/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Nov 2009 16:12:48 -0000	1.5
+++ sources	3 Dec 2009 09:43:17 -0000	1.6
@@ -1 +1 @@
-bf012a1326714af1ae50959d5b5280e1  libfonts-1.1.2.zip
+c7798a15a7409237dc48fe541d37cbf4  libfonts-1.1.3.zip



From rakesh at fedoraproject.org  Thu Dec  3 09:44:29 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 09:44:29 +0000 (UTC)
Subject: File flickcurl-1.14.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091203094429.1860A10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for flickcurl:

db07c8c880147072e58cc674540d8384  flickcurl-1.14.tar.gz



From rakesh at fedoraproject.org  Thu Dec  3 09:45:55 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 09:45:55 +0000 (UTC)
Subject: rpms/flickcurl/devel .cvsignore, 1.3, 1.4 flickcurl.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091203094555.CD5E011C00EE@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

Modified Files:
	.cvsignore flickcurl.spec import.log sources 
Log Message:
Updated to 1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flickcurl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Aug 2009 03:16:10 -0000	1.3
+++ .cvsignore	3 Dec 2009 09:45:55 -0000	1.4
@@ -1 +1 @@
-flickcurl-1.13.tar.gz
+flickcurl-1.14.tar.gz


Index: flickcurl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flickcurl/devel/flickcurl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- flickcurl.spec	6 Aug 2009 03:16:10 -0000	1.3
+++ flickcurl.spec	3 Dec 2009 09:45:55 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		flickcurl
-Version:	1.13
+Version:	1.14
 Release:	1%{?dist}
 Summary:	C library for the Flickr API
 
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}-config.1.gz
 
 %changelog
+* Thu Dec 03 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.14-1
+- Updated to 1.14
+
 * Thu Aug 06 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.13-1
 - Updated to 1.13
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flickcurl/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	6 Aug 2009 03:16:11 -0000	1.2
+++ import.log	3 Dec 2009 09:45:55 -0000	1.3
@@ -1,2 +1,3 @@
 flickcurl-1_10-3_fc10:HEAD:flickcurl-1.10-3.fc10.src.rpm:1244458708
 flickcurl-1_13-1_fc11:HEAD:flickcurl-1.13-1.fc11.src.rpm:1249528778
+flickcurl-1_14-1_fc13:HEAD:flickcurl-1.14-1.fc13.src.rpm:1259834312


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flickcurl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Aug 2009 03:16:11 -0000	1.3
+++ sources	3 Dec 2009 09:45:55 -0000	1.4
@@ -1 +1 @@
-d0a90b9e06e8927f2eb13c55f4fe9640  flickcurl-1.13.tar.gz
+db07c8c880147072e58cc674540d8384  flickcurl-1.14.tar.gz



From lkundrak at fedoraproject.org  Thu Dec  3 09:47:27 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 09:47:27 +0000 (UTC)
Subject: File jazzy-0.5.2.src.zip uploaded to lookaside cache by lkundrak
Message-ID: <20091203094727.6228410F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for jazzy:

6e0ac23646e6a60be3dc953cc77210c2  jazzy-0.5.2.src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 09:49:51 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 09:49:51 +0000 (UTC)
Subject: rpms/jazzy/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091203094951.4D1C911C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Log Message:
Initial import of jazzy


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jazzy/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:40:29 -0000	1.1
+++ .cvsignore	3 Dec 2009 09:49:51 -0000	1.2
@@ -0,0 +1 @@
+jazzy-0.5.2.src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jazzy/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:40:30 -0000	1.1
+++ sources	3 Dec 2009 09:49:51 -0000	1.2
@@ -0,0 +1 @@
+6e0ac23646e6a60be3dc953cc77210c2  jazzy-0.5.2.src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 09:49:51 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 09:49:51 +0000 (UTC)
Subject: rpms/jazzy/EL-5 0001-No-hardcoded-class-paths.patch, NONE,
	1.1 jazzy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203094951.34B0911C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	0001-No-hardcoded-class-paths.patch jazzy.spec 
Log Message:
Initial import of jazzy

0001-No-hardcoded-class-paths.patch:
 build.xml |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE 0001-No-hardcoded-class-paths.patch ---
>From 1427c9680f512fee9eee6920cc09874fb8de20b3 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 23 Nov 2009 19:03:22 +0100
Subject: [PATCH] No hardcoded class-paths

---
 .build.xml.swp |  Bin 4096 -> 0 bytes
 build.xml      |    2 --
 2 files changed, 0 insertions(+), 2 deletions(-)
 delete mode 100644 .build.xml.swp

diff --git a/.build.xml.swp b/.build.xml.swp
deleted file mode 100644
index e0373c42c8b741f88c6f3ce71b7cdf9569f83b33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmYc?2=nw+FxN9;00IF91_KWP=UGv~3=_;47;>^p^HPcuvq4h$KuJ+)Q4T%@P`Nso
zf%-)Sxk;s&IVt*1p`Jc2`dNupRh7C1dZv0t`e1Rrid<q0B*M;7C8HrQ8UnBo;AJp2
tGBi+DQdAHY3WW)d(xV|T8UmvsFd71*Aut*OqaiRF0;3@?8UiCE1OR;89MS*)

diff --git a/build.xml b/build.xml
index a2b6938..5c882e3 100644
--- a/build.xml
+++ b/build.xml
@@ -160,7 +160,6 @@
   	<jar jarfile="${dist}/lib/jazzy-swing.jar" basedir="${build}" includes="com/swabunga/spell/swing/**,${extrafiles}">
   	  	<manifest>
   			<attribute name="Built-By" value="${user.name}"/>
-  			<attribute name="Class-Path" value="jazzy-core.jar"/>
   		</manifest>
   	</jar>
   </target>
@@ -169,7 +168,6 @@
  	<jar jarfile="${dist}/lib/jazzy-examples.jar" basedir="${build}" includes="com/swabunga/spell/examples/**,${extrafiles}">
   		<manifest>
   			<attribute name="Built-By" value="${user.name}"/>
-  			<attribute name="Class-Path" value="jazzy-core.jar  $jazzy-swing.jar"/>
   			<attribute name="Main-Class" value="com.swabunga.spell.examples.JTextComponentSpellCheckExample"/>
   		</manifest>
   	</jar>
-- 
1.6.2.5



--- NEW FILE jazzy.spec ---
Name:           jazzy
Version:        0.5.2
Release:        2%{?dist}
Summary:        Java-based spell checker

Group:          Applications/Text
License:        LGPLv2+
URL:            http://sourceforge.net/projects/jazzy
Source0:        http://downloads.sourceforge.net/project/jazzy/Jazzy/Jazzy-%{version}/jazzy-%{version}.src.zip
Patch0:         0001-No-hardcoded-class-paths.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ant
BuildRequires:  unzip
BuildRequires:  jpackage-utils
Requires:       jpackage-utils

BuildArch:      noarch

%description
Jazzy is a pure Java library implementing a spell checking algorithm
similar to aspell. It may be used to spell check a variety of sources.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description javadoc
Java API Documentation for %{name}.


%prep
%setup -q -c
%patch0 -p1 -b .classpath
find -name '*.jar' -delete


%build
ant binary-release javadoc

# Get rid of CP/M line enxoding
for F in *.txt
do
        sed 's/\r//' <$F >temp
        touch -r $F temp
        mv temp $F
done


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
find dist -name '*.jar' |while read F
do
        BASE=$(basename $F)
        VER=$(echo $BASE |sed 's/\.jar$/-%{version}.jar/')
        install -p -m644 $F $RPM_BUILD_ROOT%{_javadir}/%{name}/$VER
        ln -s $VER $RPM_BUILD_ROOT%{_javadir}/%{name}/$BASE
done

# Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%doc CONTRIBUTORS.txt example2.txt LICENSE.txt README.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.2-2
- Add missing dash to jar file name (Alexander Kurtakov, #540653#c2)

* Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jazzy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:40:29 -0000	1.1
+++ .cvsignore	3 Dec 2009 09:49:50 -0000	1.2
@@ -0,0 +1 @@
+jazzy-0.5.2.src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jazzy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:40:30 -0000	1.1
+++ sources	3 Dec 2009 09:49:50 -0000	1.2
@@ -0,0 +1 @@
+6e0ac23646e6a60be3dc953cc77210c2  jazzy-0.5.2.src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 09:49:51 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 09:49:51 +0000 (UTC)
Subject: rpms/jazzy/devel 0001-No-hardcoded-class-paths.patch, NONE,
	1.1 jazzy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203094951.AF61011C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	0001-No-hardcoded-class-paths.patch jazzy.spec 
Log Message:
Initial import of jazzy

0001-No-hardcoded-class-paths.patch:
 build.xml |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE 0001-No-hardcoded-class-paths.patch ---
>From 1427c9680f512fee9eee6920cc09874fb8de20b3 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 23 Nov 2009 19:03:22 +0100
Subject: [PATCH] No hardcoded class-paths

---
 .build.xml.swp |  Bin 4096 -> 0 bytes
 build.xml      |    2 --
 2 files changed, 0 insertions(+), 2 deletions(-)
 delete mode 100644 .build.xml.swp

diff --git a/.build.xml.swp b/.build.xml.swp
deleted file mode 100644
index e0373c42c8b741f88c6f3ce71b7cdf9569f83b33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmYc?2=nw+FxN9;00IF91_KWP=UGv~3=_;47;>^p^HPcuvq4h$KuJ+)Q4T%@P`Nso
zf%-)Sxk;s&IVt*1p`Jc2`dNupRh7C1dZv0t`e1Rrid<q0B*M;7C8HrQ8UnBo;AJp2
tGBi+DQdAHY3WW)d(xV|T8UmvsFd71*Aut*OqaiRF0;3@?8UiCE1OR;89MS*)

diff --git a/build.xml b/build.xml
index a2b6938..5c882e3 100644
--- a/build.xml
+++ b/build.xml
@@ -160,7 +160,6 @@
   	<jar jarfile="${dist}/lib/jazzy-swing.jar" basedir="${build}" includes="com/swabunga/spell/swing/**,${extrafiles}">
   	  	<manifest>
   			<attribute name="Built-By" value="${user.name}"/>
-  			<attribute name="Class-Path" value="jazzy-core.jar"/>
   		</manifest>
   	</jar>
   </target>
@@ -169,7 +168,6 @@
  	<jar jarfile="${dist}/lib/jazzy-examples.jar" basedir="${build}" includes="com/swabunga/spell/examples/**,${extrafiles}">
   		<manifest>
   			<attribute name="Built-By" value="${user.name}"/>
-  			<attribute name="Class-Path" value="jazzy-core.jar  $jazzy-swing.jar"/>
   			<attribute name="Main-Class" value="com.swabunga.spell.examples.JTextComponentSpellCheckExample"/>
   		</manifest>
   	</jar>
-- 
1.6.2.5



--- NEW FILE jazzy.spec ---
Name:           jazzy
Version:        0.5.2
Release:        2%{?dist}
Summary:        Java-based spell checker

Group:          Applications/Text
License:        LGPLv2+
URL:            http://sourceforge.net/projects/jazzy
Source0:        http://downloads.sourceforge.net/project/jazzy/Jazzy/Jazzy-%{version}/jazzy-%{version}.src.zip
Patch0:         0001-No-hardcoded-class-paths.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ant
BuildRequires:  unzip
BuildRequires:  jpackage-utils
Requires:       jpackage-utils

BuildArch:      noarch

%description
Jazzy is a pure Java library implementing a spell checking algorithm
similar to aspell. It may be used to spell check a variety of sources.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description javadoc
Java API Documentation for %{name}.


%prep
%setup -q -c
%patch0 -p1 -b .classpath
find -name '*.jar' -delete


%build
ant binary-release javadoc

# Get rid of CP/M line enxoding
for F in *.txt
do
        sed 's/\r//' <$F >temp
        touch -r $F temp
        mv temp $F
done


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
find dist -name '*.jar' |while read F
do
        BASE=$(basename $F)
        VER=$(echo $BASE |sed 's/\.jar$/-%{version}.jar/')
        install -p -m644 $F $RPM_BUILD_ROOT%{_javadir}/%{name}/$VER
        ln -s $VER $RPM_BUILD_ROOT%{_javadir}/%{name}/$BASE
done

# Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%doc CONTRIBUTORS.txt example2.txt LICENSE.txt README.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.2-2
- Add missing dash to jar file name (Alexander Kurtakov, #540653#c2)

* Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jazzy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:40:29 -0000	1.1
+++ .cvsignore	3 Dec 2009 09:49:51 -0000	1.2
@@ -0,0 +1 @@
+jazzy-0.5.2.src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jazzy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:40:30 -0000	1.1
+++ sources	3 Dec 2009 09:49:51 -0000	1.2
@@ -0,0 +1 @@
+6e0ac23646e6a60be3dc953cc77210c2  jazzy-0.5.2.src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 09:49:51 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 09:49:51 +0000 (UTC)
Subject: rpms/jazzy/F-12 0001-No-hardcoded-class-paths.patch, NONE,
	1.1 jazzy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203094951.792FB11C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/jazzy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12864/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	0001-No-hardcoded-class-paths.patch jazzy.spec 
Log Message:
Initial import of jazzy

0001-No-hardcoded-class-paths.patch:
 build.xml |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE 0001-No-hardcoded-class-paths.patch ---
>From 1427c9680f512fee9eee6920cc09874fb8de20b3 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 23 Nov 2009 19:03:22 +0100
Subject: [PATCH] No hardcoded class-paths

---
 .build.xml.swp |  Bin 4096 -> 0 bytes
 build.xml      |    2 --
 2 files changed, 0 insertions(+), 2 deletions(-)
 delete mode 100644 .build.xml.swp

diff --git a/.build.xml.swp b/.build.xml.swp
deleted file mode 100644
index e0373c42c8b741f88c6f3ce71b7cdf9569f83b33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmYc?2=nw+FxN9;00IF91_KWP=UGv~3=_;47;>^p^HPcuvq4h$KuJ+)Q4T%@P`Nso
zf%-)Sxk;s&IVt*1p`Jc2`dNupRh7C1dZv0t`e1Rrid<q0B*M;7C8HrQ8UnBo;AJp2
tGBi+DQdAHY3WW)d(xV|T8UmvsFd71*Aut*OqaiRF0;3@?8UiCE1OR;89MS*)

diff --git a/build.xml b/build.xml
index a2b6938..5c882e3 100644
--- a/build.xml
+++ b/build.xml
@@ -160,7 +160,6 @@
   	<jar jarfile="${dist}/lib/jazzy-swing.jar" basedir="${build}" includes="com/swabunga/spell/swing/**,${extrafiles}">
   	  	<manifest>
   			<attribute name="Built-By" value="${user.name}"/>
-  			<attribute name="Class-Path" value="jazzy-core.jar"/>
   		</manifest>
   	</jar>
   </target>
@@ -169,7 +168,6 @@
  	<jar jarfile="${dist}/lib/jazzy-examples.jar" basedir="${build}" includes="com/swabunga/spell/examples/**,${extrafiles}">
   		<manifest>
   			<attribute name="Built-By" value="${user.name}"/>
-  			<attribute name="Class-Path" value="jazzy-core.jar  $jazzy-swing.jar"/>
   			<attribute name="Main-Class" value="com.swabunga.spell.examples.JTextComponentSpellCheckExample"/>
   		</manifest>
   	</jar>
-- 
1.6.2.5



--- NEW FILE jazzy.spec ---
Name:           jazzy
Version:        0.5.2
Release:        2%{?dist}
Summary:        Java-based spell checker

Group:          Applications/Text
License:        LGPLv2+
URL:            http://sourceforge.net/projects/jazzy
Source0:        http://downloads.sourceforge.net/project/jazzy/Jazzy/Jazzy-%{version}/jazzy-%{version}.src.zip
Patch0:         0001-No-hardcoded-class-paths.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ant
BuildRequires:  unzip
BuildRequires:  jpackage-utils
Requires:       jpackage-utils

BuildArch:      noarch

%description
Jazzy is a pure Java library implementing a spell checking algorithm
similar to aspell. It may be used to spell check a variety of sources.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description javadoc
Java API Documentation for %{name}.


%prep
%setup -q -c
%patch0 -p1 -b .classpath
find -name '*.jar' -delete


%build
ant binary-release javadoc

# Get rid of CP/M line enxoding
for F in *.txt
do
        sed 's/\r//' <$F >temp
        touch -r $F temp
        mv temp $F
done


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
find dist -name '*.jar' |while read F
do
        BASE=$(basename $F)
        VER=$(echo $BASE |sed 's/\.jar$/-%{version}.jar/')
        install -p -m644 $F $RPM_BUILD_ROOT%{_javadir}/%{name}/$VER
        ln -s $VER $RPM_BUILD_ROOT%{_javadir}/%{name}/$BASE
done

# Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%doc CONTRIBUTORS.txt example2.txt LICENSE.txt README.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.2-2
- Add missing dash to jar file name (Alexander Kurtakov, #540653#c2)

* Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jazzy/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:40:29 -0000	1.1
+++ .cvsignore	3 Dec 2009 09:49:51 -0000	1.2
@@ -0,0 +1 @@
+jazzy-0.5.2.src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jazzy/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:40:30 -0000	1.1
+++ sources	3 Dec 2009 09:49:51 -0000	1.2
@@ -0,0 +1 @@
+6e0ac23646e6a60be3dc953cc77210c2  jazzy-0.5.2.src.zip



From lkundrak at fedoraproject.org  Thu Dec  3 09:51:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 09:51:13 +0000 (UTC)
Subject: rpms/jazzy/F-11 jazzy.spec,NONE,1.1
Message-ID: <20091203095113.BA3B511C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Added Files:
	jazzy.spec 
Log Message:
wtf spec file missing


--- NEW FILE jazzy.spec ---
Name:           jazzy
Version:        0.5.2
Release:        2%{?dist}
Summary:        Java-based spell checker

Group:          Applications/Text
License:        LGPLv2+
URL:            http://sourceforge.net/projects/jazzy
Source0:        http://downloads.sourceforge.net/project/jazzy/Jazzy/Jazzy-%{version}/jazzy-%{version}.src.zip
Patch0:         0001-No-hardcoded-class-paths.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ant
BuildRequires:  unzip
BuildRequires:  jpackage-utils
Requires:       jpackage-utils

BuildArch:      noarch

%description
Jazzy is a pure Java library implementing a spell checking algorithm
similar to aspell. It may be used to spell check a variety of sources.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description javadoc
Java API Documentation for %{name}.


%prep
%setup -q -c
%patch0 -p1 -b .classpath
find -name '*.jar' -delete


%build
ant binary-release javadoc

# Get rid of CP/M line enxoding
for F in *.txt
do
        sed 's/\r//' <$F >temp
        touch -r $F temp
        mv temp $F
done


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
find dist -name '*.jar' |while read F
do
        BASE=$(basename $F)
        VER=$(echo $BASE |sed 's/\.jar$/-%{version}.jar/')
        install -p -m644 $F $RPM_BUILD_ROOT%{_javadir}/%{name}/$VER
        ln -s $VER $RPM_BUILD_ROOT%{_javadir}/%{name}/$BASE
done

# Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%doc CONTRIBUTORS.txt example2.txt LICENSE.txt README.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}


%changelog
* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.2-2
- Add missing dash to jar file name (Alexander Kurtakov, #540653#c2)

* Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.2-1
- Initial packaging



From lkundrak at fedoraproject.org  Thu Dec  3 09:52:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  3 Dec 2009 09:52:19 +0000 (UTC)
Subject: rpms/jazzy/F-11 0001-No-hardcoded-class-paths.patch,NONE,1.1
Message-ID: <20091203095219.7DEBC11C00EE@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Added Files:
	0001-No-hardcoded-class-paths.patch 
Log Message:
patch file missing

0001-No-hardcoded-class-paths.patch:
 build.xml |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE 0001-No-hardcoded-class-paths.patch ---
>From 1427c9680f512fee9eee6920cc09874fb8de20b3 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 23 Nov 2009 19:03:22 +0100
Subject: [PATCH] No hardcoded class-paths

---
 .build.xml.swp |  Bin 4096 -> 0 bytes
 build.xml      |    2 --
 2 files changed, 0 insertions(+), 2 deletions(-)
 delete mode 100644 .build.xml.swp

diff --git a/.build.xml.swp b/.build.xml.swp
deleted file mode 100644
index e0373c42c8b741f88c6f3ce71b7cdf9569f83b33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmYc?2=nw+FxN9;00IF91_KWP=UGv~3=_;47;>^p^HPcuvq4h$KuJ+)Q4T%@P`Nso
zf%-)Sxk;s&IVt*1p`Jc2`dNupRh7C1dZv0t`e1Rrid<q0B*M;7C8HrQ8UnBo;AJp2
tGBi+DQdAHY3WW)d(xV|T8UmvsFd71*Aut*OqaiRF0;3@?8UiCE1OR;89MS*)

diff --git a/build.xml b/build.xml
index a2b6938..5c882e3 100644
--- a/build.xml
+++ b/build.xml
@@ -160,7 +160,6 @@
   	<jar jarfile="${dist}/lib/jazzy-swing.jar" basedir="${build}" includes="com/swabunga/spell/swing/**,${extrafiles}">
   	  	<manifest>
   			<attribute name="Built-By" value="${user.name}"/>
-  			<attribute name="Class-Path" value="jazzy-core.jar"/>
   		</manifest>
   	</jar>
   </target>
@@ -169,7 +168,6 @@
  	<jar jarfile="${dist}/lib/jazzy-examples.jar" basedir="${build}" includes="com/swabunga/spell/examples/**,${extrafiles}">
   		<manifest>
   			<attribute name="Built-By" value="${user.name}"/>
-  			<attribute name="Class-Path" value="jazzy-core.jar  $jazzy-swing.jar"/>
   			<attribute name="Main-Class" value="com.swabunga.spell.examples.JTextComponentSpellCheckExample"/>
   		</manifest>
   	</jar>
-- 
1.6.2.5




From kalev at fedoraproject.org  Thu Dec  3 09:52:37 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu,  3 Dec 2009 09:52:37 +0000 (UTC)
Subject: rpms/mono-bouncycastle/devel mono-bouncycastle.spec,1.1,1.2
Message-ID: <20091203095237.E7C0911C00EE@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mono-bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14091

Modified Files:
	mono-bouncycastle.spec 
Log Message:
Fixed typos in description



Index: mono-bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/mono-bouncycastle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mono-bouncycastle.spec	3 Dec 2009 08:40:55 -0000	1.1
+++ mono-bouncycastle.spec	3 Dec 2009 09:52:37 -0000	1.2
@@ -35,8 +35,8 @@ ExcludeArch:    ppc64 ppc sparc64
 The Bouncy Castle Crypto package is a C# implementation of cryptographic
 algorithms. It is a port of the Bouncy Castle Java APIs, with
 approximately 80% of the functionality ported. The C# API is constantly
-kept uptodate with bug fixes and new test cases from the Java build
-(and vice versa sometimes), thus benefitting from the large user base
+kept up to date with bug fixes and new test cases from the Java build
+(and vice versa sometimes), thus benefiting from the large user base
 and real-world use the Java version has seen.
 
 %prep



From twaugh at fedoraproject.org  Thu Dec  3 10:06:21 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 10:06:21 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3413.patch,NONE,1.1 cups.spec,1.544,1.545
Message-ID: <20091203100621.0AD1D11C03FC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18392

Modified Files:
	cups.spec 
Added Files:
	cups-str3413.patch 
Log Message:
* Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-10
- Undo last change as it was incorrect.


cups-str3413.patch:
 snmp.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3413.patch ---
diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c
--- cups-1.4.2/backend/snmp.c.str3413	2009-01-14 22:40:58.000000000 +0000
+++ cups-1.4.2/backend/snmp.c	2009-12-03 10:01:27.933335209 +0000
@@ -999,7 +999,7 @@ read_snmp_response(int fd)		/* I - SNMP 
 		       DEVICE_PRODUCT, LexmarkProductOID2);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
-		       DEVICE_URI, LexmarkDeviceIdOID);
+		       DEVICE_ID, LexmarkDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
@@ -1064,7 +1064,19 @@ read_snmp_response(int fd)		/* I - SNMP 
 
 
 	  if (device->id)
+	  {
+	    if (strlen (device->id) >
+		strlen ((char *)packet.object_value.string.bytes))
+	    {
+	     /*
+	      * The Device ID we already saw was more complete.
+	      */
+
+	      break;
+	    }
+
 	    free(device->id);
+	  }
 
 	  device->id = strdup((char *)packet.object_value.string.bytes);
 
@@ -1107,7 +1119,8 @@ read_snmp_response(int fd)		/* I - SNMP 
 
     case DEVICE_URI :
 	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
-	    !device->uri)
+	    !device->uri &&
+	    (char *)packet.object_value.string.bytes[0] != '\0')
 	{
 	 /*
 	  * Update an existing cache entry...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -p -r1.544 -r1.545
--- cups.spec	23 Nov 2009 13:10:07 -0000	1.544
+++ cups.spec	3 Dec 2009 10:06:20 -0000	1.545
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -61,6 +61,7 @@ Patch33: cups-str3407.patch
 Patch34: cups-str3418.patch
 Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
+Patch37: cups-str3413.patch
 
 Patch100: cups-lspp.patch
 
@@ -230,6 +231,7 @@ module. 
 %patch34 -p1 -b .str3418
 %patch35 -p1 -b .CVE-2009-3553
 %patch36 -p1 -b .str3422
+%patch37 -p1 -b .str3413
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -530,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
+- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
+
 * Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-10
 - Undo last change as it was incorrect.
 



From caolanm at fedoraproject.org  Thu Dec  3 10:06:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 10:06:26 +0000 (UTC)
Subject: File liblayout-0.2.10.zip uploaded to lookaside cache by caolanm
Message-ID: <20091203100626.B56CF10F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for liblayout:

db60e4fde8dd6d6807523deb71ee34dc  liblayout-0.2.10.zip



From caolanm at fedoraproject.org  Thu Dec  3 10:10:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 10:10:46 +0000 (UTC)
Subject: rpms/liblayout/devel .cvsignore, 1.3, 1.4 liblayout.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20091203101047.0153811C03E3@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore liblayout.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liblayout/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Mar 2009 12:06:21 -0000	1.3
+++ .cvsignore	3 Dec 2009 10:10:46 -0000	1.4
@@ -1 +1 @@
-liblayout-0.2.9-OOo31.zip
+liblayout-0.2.10.zip


Index: liblayout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liblayout/devel/liblayout.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- liblayout.spec	24 Jul 2009 09:28:33 -0000	1.4
+++ liblayout.spec	3 Dec 2009 10:10:46 -0000	1.5
@@ -2,18 +2,18 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: liblayout
-Version: 0.2.9
-Release: 4.OOo31%{?dist}
+Version: 0.2.10
+Release: 1%{?dist}
 Summary: CSS based layouting framework
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreereport/liblayout-%{version}-OOo31.zip
+Source: http://downloads.sourceforge.net/jfreereport/liblayout-%{version}.zip
 URL: http://reporting.pentaho.org/
 BuildRequires: ant, java-devel, jpackage-utils, flute, libloader, xml-commons-apis
-BuildRequires: librepository, pentaho-libxml, libfonts, sac, libbase >= 1.0.0
+BuildRequires: librepository, pentaho-libxml, libfonts, sac, libbase >= 1.1.3
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, flute, libloader >= 0.3.7
-Requires: librepository >= 0.1.6, libfonts >= 0.3.4, sac, xml-commons-apis
+Requires: java, jpackage-utils, flute, libloader >= 1.1.3
+Requires: librepository >= 1.1.3, libfonts >= 1.1.3, sac, xml-commons-apis
 Requires: pentaho-libxml, libbase >= 1.0.0
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
@@ -98,6 +98,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Caolan McNamara <caolanm at redhat.com> 0.2.10-1
+- latest version
+
 * Fri Jul 24 2009 Caolan McNamara <caolanm at redhat.com> 0.2.9-4.OOo31
 - make javadoc no-arch when building as arch-dependant aot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liblayout/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Mar 2009 12:06:21 -0000	1.3
+++ sources	3 Dec 2009 10:10:46 -0000	1.4
@@ -1 +1 @@
-283ad2d721f334555f62ce798e129c4d  liblayout-0.2.9-OOo31.zip
+db60e4fde8dd6d6807523deb71ee34dc  liblayout-0.2.10.zip



From jnovy at fedoraproject.org  Thu Dec  3 10:11:07 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu,  3 Dec 2009 10:11:07 +0000 (UTC)
Subject: rpms/libmikmod/F-12 libmikmod-multilib.patch, 1.1,
	1.2 libmikmod.spec, 1.13, 1.14
Message-ID: <20091203101107.C5CFB11C00EE@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libmikmod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20002

Modified Files:
	libmikmod-multilib.patch libmikmod.spec 
Log Message:
* Thu Dec 03 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-10.beta2
- fix build on PPC, correctly link against -lm there


libmikmod-multilib.patch:
 configure           |    2 +-
 libmikmod-config.in |   16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

Index: libmikmod-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libmikmod/F-12/libmikmod-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libmikmod-multilib.patch	24 Oct 2007 09:48:31 -0000	1.1
+++ libmikmod-multilib.patch	3 Dec 2009 10:11:07 -0000	1.2
@@ -1,6 +1,19 @@
---- libmikmod-3.1.11/libmikmod-config.in.old	2004-01-21 18:43:52.000000000 +0100
-+++ libmikmod-3.1.11/libmikmod-config.in	2006-05-31 17:36:12.000000000 +0200
-@@ -5,7 +5,7 @@
+diff -up libmikmod-3.2.0-beta2/configure.multilib libmikmod-3.2.0-beta2/configure
+--- libmikmod-3.2.0-beta2/configure.multilib	2004-02-20 23:08:30.000000000 +0100
++++ libmikmod-3.2.0-beta2/configure	2009-12-03 11:06:48.000000000 +0100
+@@ -6360,7 +6360,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+     ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
+-    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
++    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs | sed -r 's|-L[^ ]+||g'`
+ 
+     esd_major_version=`$ESD_CONFIG $esd_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+diff -up libmikmod-3.2.0-beta2/libmikmod-config.in.multilib libmikmod-3.2.0-beta2/libmikmod-config.in
+--- libmikmod-3.2.0-beta2/libmikmod-config.in.multilib	2004-01-21 02:36:34.000000000 +0100
++++ libmikmod-3.2.0-beta2/libmikmod-config.in	2009-12-03 11:07:16.000000000 +0100
+@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
  exec_prefix_set=no
  
  usage="\
@@ -9,7 +22,7 @@
  
  if test $# -eq 0 ; then
  	echo "${usage}" 1>&2
-@@ -49,9 +49,21 @@
+@@ -49,8 +49,20 @@ while test $# -gt 0 ; do
  		echo @LIB_LDADD@
  	;;
  	--libs)
@@ -18,27 +31,16 @@
 +    		else
 +    		    libdir=-L${exec_prefix}/lib
 +    		fi
-+		echo $libdir -lmikmod @LIBRARY_LIB@
++		echo $libdir -lmikmod -lm @LIBRARY_LIB@
 +	;;
 +	--libs32)
  		libdir=-L${exec_prefix}/lib
- 		echo $libdir -lmikmod @LIBRARY_LIB@
- 	;;
+-		echo $libdir -lmikmod @LIBRARY_LIB@
++		echo $libdir -lmikmod -lm @LIBRARY_LIB@
++	;;
 +	--libs64)
 +		libdir=-L${exec_prefix}/lib64
-+		echo $libdir -lmikmod @LIBRARY_LIB@
-+	;;
++		echo $libdir -lmikmod -lm @LIBRARY_LIB@
+ 	;;
  	*)
  		echo "${usage}" 1>&2
- 		exit 1
---- libmikmod-3.1.11/configure.old	2004-01-21 18:43:52.000000000 +0100
-+++ libmikmod-3.1.11/configure	2006-05-31 17:37:10.000000000 +0200
-@@ -6390,7 +6390,7 @@
- cross_compiling=$ac_cv_prog_cc_cross
- 
-     ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
--    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-+    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs | sed -r 's|-L[^ ]+||g'`
- 
-     esd_major_version=`$ESD_CONFIG $esd_args --version | \
-            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`


Index: libmikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmikmod/F-12/libmikmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libmikmod.spec	23 Nov 2009 11:06:16 -0000	1.13
+++ libmikmod.spec	3 Dec 2009 10:11:07 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A MOD music file player library
 Name: libmikmod
 Version: 3.2.0
-Release: 9.beta2%{?dist}
+Release: 10.beta2%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -86,6 +86,9 @@ fi
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Thu Dec 03 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-10.beta2
+- fix build on PPC, correctly link against -lm there
+
 * Mon Nov 23 2009 Hans de Goede <hdegoede at redhat.com> 3.2.0-9.beta2
 - Fix CVE-2007-6720 fix, it causes mods to sound wrong, and even causes
   crashes under certain circumstances (#540234), see:



From rrakus at fedoraproject.org  Thu Dec  3 10:15:32 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu,  3 Dec 2009 10:15:32 +0000 (UTC)
Subject: rpms/yaboot/F-12 yaboot.spec,1.75,1.76
Message-ID: <20091203101532.18F2D11C00EE@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21184

Modified Files:
	yaboot.spec 
Log Message:
fixed defattr


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- yaboot.spec	1 Dec 2009 15:00:26 -0000	1.75
+++ yaboot.spec	3 Dec 2009 10:15:31 -0000	1.76
@@ -118,7 +118,7 @@ rm -f $RPM_BUILD_ROOT/usr/share/doc/yabo
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README* doc/*
 /boot/efika.forth
 /sbin/ofpath
@@ -146,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 - Clear buildroot before install
 - Removed README.man.patch and Makefile from doc dir
 - Own /usr/lib/yaboot/
+- defattr(-,root,root,-)
 - Fixes (#226661)
 
 * Thu Oct 29 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-23



From caolanm at fedoraproject.org  Thu Dec  3 10:24:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 10:24:41 +0000 (UTC)
Subject: File libformula-1.1.3.zip uploaded to lookaside cache by caolanm
Message-ID: <20091203102441.C9DA910F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libformula:

5ec40c55999fe45d07553b42388ef585  libformula-1.1.3.zip



From akahl at fedoraproject.org  Thu Dec  3 10:25:35 2009
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Thu,  3 Dec 2009 10:25:35 +0000 (UTC)
Subject: rpms/bmpx/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE bmpx-compile.patch, 1.2, NONE bmpx-hostnotfound.patch, 1.1,
	NONE bmpx-libsoup24.patch, 1.2, NONE bmpx.spec, 1.23,
	NONE sources, 1.3, NONE
Message-ID: <20091203102535.3644011C00EE@cvs1.fedora.phx.redhat.com>

Author: akahl

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

Added Files:
	dead.package 
Removed Files:
	Makefile bmpx-compile.patch bmpx-hostnotfound.patch 
	bmpx-libsoup24.patch bmpx.spec sources 
Log Message:
* retired package


--- NEW FILE dead.package ---
Project abandoned by upstream, confirmed by main dev. 


--- Makefile DELETED ---


--- bmpx-compile.patch DELETED ---


--- bmpx-hostnotfound.patch DELETED ---


--- bmpx-libsoup24.patch DELETED ---


--- bmpx.spec DELETED ---


--- sources DELETED ---



From caolanm at fedoraproject.org  Thu Dec  3 10:26:13 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 10:26:13 +0000 (UTC)
Subject: rpms/libformula/devel .cvsignore, 1.5,
	1.6 libformula-1.1.2.build.patch, 1.1, 1.2 libformula.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091203102613.C2CA711C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore libformula-1.1.2.build.patch libformula.spec 
	sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libformula/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Nov 2009 16:23:50 -0000	1.5
+++ .cvsignore	3 Dec 2009 10:26:13 -0000	1.6
@@ -1 +1 @@
-libformula-1.1.2.zip
+libformula-1.1.3.zip

libformula-1.1.2.build.patch:
 build.properties |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: libformula-1.1.2.build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libformula/devel/libformula-1.1.2.build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libformula-1.1.2.build.patch	17 Nov 2009 16:23:50 -0000	1.1
+++ libformula-1.1.2.build.patch	3 Dec 2009 10:26:13 -0000	1.2
@@ -1,14 +1,14 @@
---- libformula-1.1.2/build.properties	2009-11-17 16:11:48.000000000 +0000
-+++ libformula-1.1.2/build.properties	2009-11-17 16:12:05.000000000 +0000
+--- libformula-1.1.3/build.properties	2009-11-17 16:11:48.000000000 +0000
++++ libformula-1.1.3/build.properties	2009-11-17 16:12:05.000000000 +0000
 @@ -1,8 +1,10 @@
 -project.revision=TRUNK-SNAPSHOT
-+project.revision=1.1.2
++project.revision=1.1.3
  ivy.artifact.group=pentaho-library
  ivy.artifact.id=libformula
  impl.title=LibFormula
  impl.productID=libformula
  src.dir=${basedir}/source
- dependency.libbase.revision=1.1.2
+ dependency.libbase.revision=1.1.3
 -testsrc.dir=${basedir}/test
 \ No newline at end of file
 +testsrc.dir=${basedir}/test


Index: libformula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libformula/devel/libformula.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libformula.spec	17 Nov 2009 16:23:50 -0000	1.6
+++ libformula.spec	3 Dec 2009 10:26:13 -0000	1.7
@@ -2,16 +2,16 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: libformula
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 Summary: Formula Parser
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.zip
 URL: http://reporting.pentaho.org/
-BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libbase >= 1.1.2
+BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libbase >= 1.1.3
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, jakarta-commons-logging, libbase >= 1.1.2
+Requires: java, jpackage-utils, jakarta-commons-logging, libbase >= 1.1.3
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -98,6 +98,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Caolan McNamara <caolanm at redhat.com> 1.1.3-1
+- latest version
+
 * Tue Nov 17 2009 Caolan McNamara <caolanm at redhat.com> 1.1.2-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libformula/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Nov 2009 16:23:50 -0000	1.5
+++ sources	3 Dec 2009 10:26:13 -0000	1.6
@@ -1 +1 @@
-a58c81eabd12009e0818ce99e5507a04  libformula-1.1.2.zip
+5ec40c55999fe45d07553b42388ef585  libformula-1.1.3.zip



From caolanm at fedoraproject.org  Thu Dec  3 10:27:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 10:27:27 +0000 (UTC)
Subject: File flow-engine-0.9.4.zip uploaded to lookaside cache by caolanm
Message-ID: <20091203102727.CFE4410F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pentaho-reporting-flow-engine:

ba2930200c9f019c2d93a8c88c651a0f  flow-engine-0.9.4.zip



From tbzatek at fedoraproject.org  Thu Dec  3 10:27:59 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu,  3 Dec 2009 10:27:59 +0000 (UTC)
Subject: rpms/nautilus/F-11 nautilus-2.28.2-dnd-crash.patch, NONE,
	1.1 nautilus.spec, 1.276, 1.277
Message-ID: <20091203102759.8315411C00EE@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24459

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.28.2-dnd-crash.patch 
Log Message:
* Thu Dec  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.4-3
- Fix Nautilus crash on drag and drop from file-roller (#513230)


nautilus-2.28.2-dnd-crash.patch:
 nautilus-tree-view-drag-dest.c |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

--- NEW FILE nautilus-2.28.2-dnd-crash.patch ---
>From d5be5ed688bfeb7a8514c2ae3659921f79cdd0eb Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc at gnome.org>
Date: Mon, 02 Nov 2009 17:09:15 +0000
Subject: Don't get drag data in list mode if we don't support the target.

This fixes bug #600183.
(cherry picked from commit 6613262f4e6d40d153299d7fd4726210268a2a53)
---
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index 09ce442..20646ef 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -242,7 +242,7 @@ clear_drag_dest_row (NautilusTreeViewDragDest *dest)
 	set_widget_highlight (dest, FALSE);
 }
 
-static void
+static gboolean
 get_drag_data (NautilusTreeViewDragDest *dest,
 	       GdkDragContext *context, 
 	       guint32 time)
@@ -252,15 +252,22 @@ get_drag_data (NautilusTreeViewDragDest *dest,
 	target = gtk_drag_dest_find_target (GTK_WIDGET (dest->details->tree_view), 
 					    context, 
 					    NULL);
+
+	if (target == GDK_NONE) {
+		return FALSE;
+	}
+
 	if (target == gdk_atom_intern (NAUTILUS_ICON_DND_XDNDDIRECTSAVE_TYPE, FALSE) &&
 	    !dest->details->drop_occurred) {
 		dest->details->drag_type = NAUTILUS_ICON_DND_XDNDDIRECTSAVE;
 		dest->details->have_drag_data = TRUE;
-		return;
+		return TRUE;
 	}
 
 	gtk_drag_get_data (GTK_WIDGET (dest->details->tree_view),
 			   context, target, time);
+
+	return TRUE;
 }
 
 static void
@@ -455,6 +462,7 @@ drag_motion_callback (GtkWidget *widget,
 	GtkTreeViewDropPosition pos;
 	GdkWindow *bin_window;
 	guint action;
+	gboolean res = TRUE;
 
 	dest = NAUTILUS_TREE_VIEW_DRAG_DEST (data);
 
@@ -463,8 +471,13 @@ drag_motion_callback (GtkWidget *widget,
 	
 
 	if (!dest->details->have_drag_data) {
-		get_drag_data (dest, context, time);
+		res = get_drag_data (dest, context, time);
 	}
+
+	if (!res) {
+		return FALSE;
+	}
+
 	drop_path = get_drop_path (dest, path);
 	
 	action = 0;
--
cgit v0.8.2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-11/nautilus.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- nautilus.spec	25 Sep 2009 12:47:42 -0000	1.276
+++ nautilus.spec	3 Dec 2009 10:27:59 -0000	1.277
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -94,6 +94,10 @@ Patch18:	nautilus-2.27.2-dark-text-on-da
 # Don't load files for thumbnailing that we can't thumbnail anyway
 Patch19:	nautilus-2.28.0-thumbnailing-limit.patch
 
+# Nautilus crashing on drag and drop from file-roller
+# https://bugzilla.redhat.com/show_bug.cgi?id=513230
+Patch20:	nautilus-2.28.2-dnd-crash.patch
+
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -134,6 +138,7 @@ for developing nautilus extensions.
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .dark-text
 %patch19 -p1 -b .thumbnail-limit
+%patch20 -p1 -b .dnd-crash
 
 %build
 
@@ -271,6 +276,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.4-3
+- Fix Nautilus crash on drag and drop from file-roller (#513230)
+
 * Fri Sep 25 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.4-2
 - Don't load files for thumbnailing that we can't thumbnail anyway
 



From caolanm at fedoraproject.org  Thu Dec  3 10:30:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 10:30:15 +0000 (UTC)
Subject: rpms/pentaho-reporting-flow-engine/devel .cvsignore, 1.3,
	1.4 pentaho-reporting-flow-engine.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20091203103015.F128711C03E3@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25260

Modified Files:
	.cvsignore pentaho-reporting-flow-engine.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Mar 2009 17:22:24 -0000	1.3
+++ .cvsignore	3 Dec 2009 10:30:15 -0000	1.4
@@ -1 +1 @@
-flow-engine-0.9.2-OOo31.zip
+flow-engine-0.9.4.zip


Index: pentaho-reporting-flow-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel/pentaho-reporting-flow-engine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pentaho-reporting-flow-engine.spec	24 Jul 2009 09:53:01 -0000	1.8
+++ pentaho-reporting-flow-engine.spec	3 Dec 2009 10:30:15 -0000	1.9
@@ -2,21 +2,21 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: pentaho-reporting-flow-engine
-Version: 0.9.2
-Release: 5.OOo31%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
 Summary: Pentaho Flow Reporting Engine
 License: LGPLv2+
 Epoch: 1
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreereport/flow-engine-%{version}-OOo31.zip
+Source: http://downloads.sourceforge.net/jfreereport/flow-engine-%{version}.zip
 URL: http://reporting.pentaho.org/
 BuildRequires: ant, java-devel, jpackage-utils, libbase, jcommon-serializer
 BuildRequires: libloader, libfonts, pentaho-libxml, xml-commons-apis
 BuildRequires: librepository, sac, flute, liblayout, libformula
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, libbase >= 1.0.0, libfonts >= 0.3.4
-Requires: pentaho-libxml, libformula >= 0.1.18, librepository >= 0.1.6
-Requires: sac, flute, liblayout >= 0.2.9, jcommon-serializer
+Requires: java, jpackage-utils, libbase >= 1.1.3, libfonts >= 1.1.3
+Requires: pentaho-libxml, libformula >= 1.1.3, librepository >= 1.1.3
+Requires: sac, flute, liblayout >= 0.2.10, jcommon-serializer
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -96,6 +96,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Caolan McNamara <caolanm at redhat.com> 0.9.4-1
+- latest version
+
 * Fri Jul 24 2009 Caolan McNamara <caolanm at redhat.com> 0.9.2-5.OOo31
 - make javadoc no-arch when building as arch-dependant aot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Mar 2009 17:22:24 -0000	1.3
+++ sources	3 Dec 2009 10:30:15 -0000	1.4
@@ -1 +1 @@
-4121d73be1d53746b78d6fd2ae440b6b  flow-engine-0.9.2-OOo31.zip
+ba2930200c9f019c2d93a8c88c651a0f  flow-engine-0.9.4.zip



From akahl at fedoraproject.org  Thu Dec  3 10:30:16 2009
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Thu,  3 Dec 2009 10:30:16 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.107,1.108
Message-ID: <20091203103016.4273111C03E3@cvs1.fedora.phx.redhat.com>

Author: akahl

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

Modified Files:
	comps-f13.xml.in 
Log Message:
* removed retired bmpx from rawhide/f13


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- comps-f13.xml.in	3 Dec 2009 04:27:38 -0000	1.107
+++ comps-f13.xml.in	3 Dec 2009 10:30:15 -0000	1.108
@@ -5198,7 +5198,6 @@
       <packagereq type="optional">aumix</packagereq>
       <packagereq type="optional">banshee</packagereq>
       <packagereq type="optional">bluez-alsa</packagereq>
-      <packagereq type="optional">bmpx</packagereq>
       <packagereq type="optional">camE</packagereq>
       <packagereq type="optional">cdcollect</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>



From pkgdb at fedoraproject.org  Thu Dec  3 10:32:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 10:32:09 +0000
Subject: [pkgdb] bmpx ownership updated
Message-ID: <20091203103209.6751E10F894@bastion2.fedora.phx.redhat.com>

Package bmpx in Fedora devel was orphaned by akahl

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



From pkgdb at fedoraproject.org  Thu Dec  3 10:32:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 10:32:09 +0000
Subject: [pkgdb] bmpx (un)retirement
Message-ID: <20091203103209.71CA710F899@bastion2.fedora.phx.redhat.com>

Package bmpx in Fedora devel has been retired by akahl

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



From twaugh at fedoraproject.org  Thu Dec  3 11:10:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 11:10:41 +0000 (UTC)
Subject: rpms/cups/F-10 cups-CVE-2009-3553.patch, NONE, 1.1 cups.spec, 1.468,
	1.469
Message-ID: <20091203111041.543C511C03E3@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-CVE-2009-3553.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.3.11-4
- Applied patch to fix CVE-2009-3553 (bug #530111, STR #3200).


cups-CVE-2009-3553.patch:
 select.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE cups-CVE-2009-3553.patch ---
diff -up cups-1.3.11/scheduler/select.c.CVE-2009-3553 cups-1.3.11/scheduler/select.c
--- cups-1.3.11/scheduler/select.c.CVE-2009-3553	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.11/scheduler/select.c	2009-12-03 10:50:45.928460205 +0000
@@ -483,7 +483,7 @@ cupsdDoSelect(long timeout)		/* I - Time
       (*(fdptr->read_cb))(fdptr->data);
     }
 
-    if (fdptr->write_cb && event->filter == EVFILT_WRITE)
+    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
     {
       cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
 	              fdptr->fd);
@@ -543,7 +543,7 @@ cupsdDoSelect(long timeout)		/* I - Time
 	  (*(fdptr->read_cb))(fdptr->data);
 	}
 
-	if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+	if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
 	{
 	  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
 	        	  fdptr->fd);
@@ -655,7 +655,7 @@ cupsdDoSelect(long timeout)		/* I - Time
         (*(fdptr->read_cb))(fdptr->data);
       }
 
-      if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
+      if (fdptr->use > 1 && fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
       {
         cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
 	                fdptr->fd);
@@ -725,7 +725,7 @@ cupsdDoSelect(long timeout)		/* I - Time
         (*(fdptr->read_cb))(fdptr->data);
       }
 
-      if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
+      if (fdptr->use > 1 && fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
       {
         cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
 	                fdptr->fd);


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- cups.spec	11 Nov 2009 09:53:50 -0000	1.468
+++ cups.spec	3 Dec 2009 11:10:41 -0000	1.469
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.11
-Release: 3%{?svn:.svn%{svn}}%{?dist}
+Release: 4%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.gz
@@ -55,6 +55,7 @@ Patch100: cups-lspp.patch
 
 # SECURITY PATCHES:
 Patch200: cups-CVE-2009-2820.patch
+Patch201: cups-CVE-2009-3553.patch
 
 Epoch: 1
 Url: http://www.cups.org/
@@ -198,6 +199,7 @@ module. 
 %endif
 
 %patch200 -p1 -b .CVE-2009-2820
+%patch201 -p1 -b .CVE-2009-3553
 
 sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
 
@@ -514,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.3.11-4
+- Applied patch to fix CVE-2009-3553 (bug #530111, STR #3200).
+
 * Wed Nov 11 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.3.11-3
 - Fixed lspp-patch to avoid memory leak (bug #536741).
 



From atkac at fedoraproject.org  Thu Dec  3 11:18:47 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  3 Dec 2009 11:18:47 +0000 (UTC)
Subject: rpms/xdelta/devel xdelta.spec,1.32,1.33
Message-ID: <20091203111847.D55E711C00EE@cvs1.fedora.phx.redhat.com>

Author: atkac

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

Modified Files:
	xdelta.spec 
Log Message:
- use appropriate BuildRoot



Index: xdelta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- xdelta.spec	30 Nov 2009 15:34:41 -0000	1.32
+++ xdelta.spec	3 Dec 2009 11:18:47 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A binary file delta generator and an RCS replacement library
 Name: xdelta
 Version: 1.1.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Development/Tools
 Source0: http://xdelta.googlecode.com/files/xdelta-%{version}.tar.gz
@@ -10,8 +10,8 @@ Patch3: xdelta-1.1.3-edsio.patch
 Patch4: xdelta-1.1.4-glib2.patch
 Patch6: xdelta-1.1.3-pkgconfig.patch
 Url: http://xdelta.org/
-BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, automake >= 1.9.6, autoconf >= 2.59, pkgconfig
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, autoconf, automake, pkgconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Xdelta (X for XCF: the eXperimental Computing Facility at Berkeley) is
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Dec 03 2009 Adam Tkac <atkac redhat com> 1.1.4-9
+- use appropriate BuildRoot
+
 * Mon Nov 30 2009 Adam Tkac <atkac redhat com> 1.1.4-8
 - merge review related fixes (#226552)
 



From atkac at fedoraproject.org  Thu Dec  3 11:21:08 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  3 Dec 2009 11:21:08 +0000 (UTC)
Subject: rpms/xdelta/F-12 xdelta.spec,1.31,1.32
Message-ID: <20091203112108.787A511C00EE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/xdelta/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6034

Modified Files:
	xdelta.spec 
Log Message:
- merge review related fixes (#226552)



Index: xdelta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdelta/F-12/xdelta.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xdelta.spec	11 Aug 2009 12:58:17 -0000	1.31
+++ xdelta.spec	3 Dec 2009 11:21:08 -0000	1.32
@@ -1,7 +1,7 @@
-Summary: A binary file delta generator and an RCS replacement library.
+Summary: A binary file delta generator and an RCS replacement library
 Name: xdelta
 Version: 1.1.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: Development/Tools
 Source0: http://xdelta.googlecode.com/files/xdelta-%{version}.tar.gz
@@ -10,8 +10,8 @@ Patch3: xdelta-1.1.3-edsio.patch
 Patch4: xdelta-1.1.4-glib2.patch
 Patch6: xdelta-1.1.3-pkgconfig.patch
 Url: http://xdelta.org/
-BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, automake >= 1.9.6, autoconf >= 2.59, pkgconfig
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, autoconf, automake, pkgconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Xdelta (X for XCF: the eXperimental Computing Facility at Berkeley) is
@@ -21,15 +21,15 @@ work independently of the actual format 
 intended to be used by various higher-level programs such as XCF's
 Project Revision Control System (PRCS).  PRCS is a front end for a
 version control toolset.  Xdelta uses a binary file delta algorithm to
-replace the standard diff program used by RCS.
+replace the standard diff program used by RCS
 
 %package devel
-Summary: Static library and header files for Xdelta development.
+Summary: Shared library and header files for Xdelta development
 Group: Development/Libraries
 Requires:  %{name} = %{version}
 %description devel
-The Xdelta-devel package contains the static library and header files
-needed for developing Xdelta-based applications.
+The Xdelta-devel package contains the shared library and header files
+needed for developing Xdelta-based applications
 
 %prep
 %setup -q
@@ -38,9 +38,15 @@ needed for developing Xdelta-based appli
 %patch4 -p1 -b .glib2
 %patch6 -p1 -b .pkgconfig
 
+for all in `find . -type f -perm -001 | grep '.*[ch]$'`; do
+    chmod -x "$all"
+done
+
+chmod -x NEWS README COPYING
+
 %build
 autoreconf -fiv
-%configure
+%configure --disable-static
 
 # IDIOT author overrides our cflags with -O3
 make %{?_smp_mflags} CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS `pkg-config --cflags glib-2.0`" LDFLAGS="`pkg-config --libs glib-2.0`"
@@ -59,22 +65,24 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc NEWS README xdelta.magic
+%defattr(-,root,root,-)
+%doc NEWS README xdelta.magic COPYING
 %{_bindir}/xdelta
 %{_libdir}/lib*.so.*
 %{_mandir}/*/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/xdelta-config
 %{_includedir}/*
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_datadir}/aclocal/xdelta.m4
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 03 2009 Adam Tkac <atkac redhat com> 1.1.4-8
+- merge review related fixes (#226552)
+
 * Tue Aug 11 2009 Adam Tkac <atkac redhat com> 1.1.4-7
 - update source + project URLs
 
@@ -229,9 +237,9 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Jul 04 1998 Arne Coucheron <arneco at online.no>
   [0.21-1]
-- added xdelta.magic to %doc
+- added xdelta.magic to %%doc
 - added running of automake before configure to make this version build
-- changed %defattr
+- changed %%defattr
 
 * Sat Jun 27 1998 Arne Coucheron <arneco at online.no>
   [0.20-1]
@@ -241,12 +249,12 @@ rm -rf $RPM_BUILD_ROOT
 - fixed configuring sources by add --x-includes=/usr/lib/glib/include
   configure parameter (for glibconfig.h),
 - changed Source url to ftp://www.xcf.berkeley.edu/pub/xdelta/
-- fixed %defattr macros (thanks to Ren? Wuttke <Rene.Wuttke at gmx.net>).
+- fixed %%defattr macros (thanks to Ren? Wuttke <Rene.Wuttke at gmx.net>).
 
 * Wed May  6 1998 Tomasz K?oczko <kloczek at rudy.mif.pg.gda.pl>
   [0.19-2]
 - %%{version} macro instead %%{PACKAGE_VERSION},
-- added -q %setup parameter,
+- added -q %%setup parameter,
 - added using %%{name} macro in Buildroot, Source and Rquires in devel
   fields.
 
@@ -256,11 +264,11 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Apr 28 1998 Tomasz K?oczko <kloczek at rudy.mif.pg.gda.pl>
   [0.18-2]
-- removed COPYING from %doc (copyright statment is in Copyright field),
-- /sbin/ldconfig is now -p parameter in %post, %postun,
+- removed COPYING from %%doc (copyright statment is in Copyright field),
+- /sbin/ldconfig is now -p parameter in %%post, %%postun,
 - replaced "mkdir -p" with "install -d" in %%install,
 - added "Requires: xdelta = %%{PACKAGE_VERSION}" for devel,
-- added using %defattr macro in %files (requires rpm >= 2.4.99),
+- added using %%defattr macro in %%files (requires rpm >= 2.4.99),
 - added using predefined macro %%{PACKAGE_VERSION} instead %{version},
 - changed permission on /usr/lib/lib*.so links to 644,
 - removed /usr/lib/libxdelta.la from devel,



From varekova at fedoraproject.org  Thu Dec  3 11:21:41 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Thu,  3 Dec 2009 11:21:41 +0000 (UTC)
Subject: rpms/man-pages/devel man-pages-3.22-sched_setaffinity.patch, 1.1,
	1.2 man-pages.spec, 1.125, 1.126
Message-ID: <20091203112141.D4F5A11C00EE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6265

Modified Files:
	man-pages-3.22-sched_setaffinity.patch man-pages.spec 
Log Message:
- fix typo in sched_setaffinity(2) patch


man-pages-3.22-sched_setaffinity.patch:
 sched_setaffinity.2 |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

Index: man-pages-3.22-sched_setaffinity.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages-3.22-sched_setaffinity.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- man-pages-3.22-sched_setaffinity.patch	2 Dec 2009 14:42:05 -0000	1.1
+++ man-pages-3.22-sched_setaffinity.patch	3 Dec 2009 11:21:41 -0000	1.2
@@ -49,14 +49,14 @@ diff -up man-pages-3.22/man2/sched_setaf
 +
 +        for ( i = 0; i < nrcpus; i++ ) {
 +                if ( CPU_ISSET_S(i, size, mask) ) {
-+                        printf("CPU %d is set\n", (i+1));
++                        printf("CPU %d is set\\n", (i+1));
 +                }
 +        }
 +
 +        CPU_FREE(mask);
 +
 +        return 0;
-+   }  
++   }
 +.fi
 +
  .SH "SEE ALSO"


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- man-pages.spec	2 Dec 2009 14:42:05 -0000	1.125
+++ man-pages.spec	3 Dec 2009 11:21:41 -0000	1.126
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.23
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -136,7 +136,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
-* Wed Dec  2 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 3.22-7
+* Thu Dec  3 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 3.23-4
+- fix typo in sched_setaffinity(2) patch
+
+* Wed Dec  2 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 3.23-3
 - fix sched_setaffinity(2) page - add an EXAMPLE and new NOTES
 
 * Wed Nov 18 2009 Ivana Varekova <varekova at redhat.com> - 3.23-2



From kkofler at fedoraproject.org  Thu Dec  3 11:30:57 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Dec 2009 11:30:57 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.543,1.544
Message-ID: <20091203113057.67C6311C02C4@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdelibs.spec 
Log Message:
Fix file list.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -p -r1.543 -r1.544
--- kdelibs.spec	3 Dec 2009 02:52:58 -0000	1.543
+++ kdelibs.spec	3 Dec 2009 11:30:56 -0000	1.544
@@ -351,7 +351,7 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/mime/packages/kde.xml
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
-%{_kde4_iconsdir}/hicolor/*/actions/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/sonnet/
 %{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_libdir}/lib*.so.*



From theinric at fedoraproject.org  Thu Dec  3 11:31:00 2009
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Thu,  3 Dec 2009 11:31:00 +0000 (UTC)
Subject: File rsyslog-4.4.2.tar.gz uploaded to lookaside cache by theinric
Message-ID: <20091203113100.3459110F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rsyslog:

a8ada67b6cd5c00fbeb3a4b687b17359  rsyslog-4.4.2.tar.gz



From akurtakov at fedoraproject.org  Thu Dec  3 11:32:52 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Dec 2009 11:32:52 +0000 (UTC)
Subject: File org.tmatesoft.svn_1.3.2.src-CLEAN.zip uploaded to lookaside
	cache by akurtakov
Message-ID: <20091203113252.8A75F10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for svnkit:

3bcbbda3423b41e892224dea85b80e6a  org.tmatesoft.svn_1.3.2.src-CLEAN.zip



From yaneti at fedoraproject.org  Thu Dec  3 11:33:03 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Thu,  3 Dec 2009 11:33:03 +0000 (UTC)
Subject: File gtg-0.1.9.tar.gz uploaded to lookaside cache by yaneti
Message-ID: <20091203113303.13F7910F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gtg:

65c4138ccee894f1396d75c82924d73a  gtg-0.1.9.tar.gz



From yaneti at fedoraproject.org  Thu Dec  3 11:33:55 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Thu,  3 Dec 2009 11:33:55 +0000 (UTC)
Subject: rpms/gtg/devel .cvsignore,1.2,1.3 gtg.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091203113355.4EDD911C00EE@cvs1.fedora.phx.redhat.com>

Author: yaneti

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

Modified Files:
	.cvsignore gtg.spec sources 
Log Message:
- 0.2 beta.
  http://gtg.fritalk.com/post/2009/12/02/Getting-Things-GNOME!-0.1.9-is-out!
- Remove some no longer necessary patching
- BR: pyxdg



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Jul 2009 08:20:29 -0000	1.2
+++ .cvsignore	3 Dec 2009 11:33:55 -0000	1.3
@@ -1 +1 @@
-gtg-0.1.2.tar.gz
+gtg-0.1.9.tar.gz


Index: gtg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/devel/gtg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gtg.spec	25 Jul 2009 01:39:10 -0000	1.2
+++ gtg.spec	3 Dec 2009 11:33:55 -0000	1.3
@@ -1,20 +1,21 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gtg
-Version:        0.1.2
-Release:        4%{?dist}
+Version:        0.1.9
+Release:        1%{?dist}
 Summary:        Personal organizer for the GNOME desktop
 
 Group:          Applications/Productivity
 License:        GPLv3+
 URL:            http://gtg.fritalk.com
 BuildArch:      noarch
-Source0:        http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        http://launchpad.net/%{name}/trunk/0.2/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
+BuildRequires:  pyxdg
 Requires:       pygtk2 pygtk2-libglade python-configobj pyxdg pycairo gnome-python2-gnome
 
 %description
@@ -26,12 +27,6 @@ used as more than just GTD software.
 
 %prep
 %setup -q
-# patch up setup.py, which otherwise requires a running X server
-sed -e 's/import GTG//' \
-    -e "s|GTG.VERSION|'%{version}'|" \
-    -e 's|GTG.URL|"http://gtg.fritalk.com"|' \
-    -e 's|GTG.EMAIL|"gtg at lists.launchpad.net"|' \
-    -i.bak setup.py
 sed -i -e "s|#!/usr/bin/env python||" GTG/gtg.py
 
 
@@ -75,6 +70,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec  3 2009 Yanko Kaneti <yaneti at declera.com> 0.1.9-1
+- 0.2 beta.
+  http://gtg.fritalk.com/post/2009/12/02/Getting-Things-GNOME!-0.1.9-is-out!
+- Remove some no longer necessary patching
+- BR: pyxdg
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 08:20:30 -0000	1.2
+++ sources	3 Dec 2009 11:33:55 -0000	1.3
@@ -1 +1 @@
-276d5dbad074e4f50283a61bb569e9d4  gtg-0.1.2.tar.gz
+65c4138ccee894f1396d75c82924d73a  gtg-0.1.9.tar.gz



From akurtakov at fedoraproject.org  Thu Dec  3 11:35:15 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Dec 2009 11:35:15 +0000 (UTC)
Subject: rpms/svnkit/devel svnkit-1.3.2-dependencies.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 svnkit.spec, 1.13,
	1.14 svnkit-1.2.2-dependencies.patch, 1.1, NONE
Message-ID: <20091203113515.42D8D11C00EE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	.cvsignore sources svnkit.spec 
Added Files:
	svnkit-1.3.2-dependencies.patch 
Removed Files:
	svnkit-1.2.2-dependencies.patch 
Log Message:
Update to 1.3.2.

svnkit-1.3.2-dependencies.patch:
 build.xml                                       |   11 ++++++-----
 svnkit-eclipse/com.sun.jna/MANIFEST.MF          |    2 +-
 svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF |    1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE svnkit-1.3.2-dependencies.patch ---
--- svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF.orig	2009-08-11 23:09:44.000000000 +0300
+++ svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF	2009-12-03 11:22:40.006747135 +0200
@@ -14,6 +14,7 @@ Require-Bundle: com.sun.jna;bundle-versi
 Bundle-ClassPath: .,
  svnkit.jar,
  svnkit-javahl.jar,
+ svn-javahl.jar,
  trilead.jar,
  sqljet.%sqljet.version%.jar,
  antlr-runtime-%antlr.version%.jar
--- build.xml.orig	2009-11-24 12:52:48.000000000 +0200
+++ build.xml	2009-12-03 11:25:45.749957330 +0200
@@ -34,7 +34,8 @@
 
         <path id="library.classpath">
             <pathelement location="contrib/trilead/trilead.jar" />
-            <pathelement location="contrib/jna/jna.jar" />            
+            <pathelement location="contrib/jna/jna.jar" /> 
+        	 <pathelement location="contrib/javahl/svn-javahl.jar" />
             <pathelement location="contrib/sqljet/antlr-runtime-${antlr.version}.jar" />            
             <pathelement location="contrib/sqljet/sqljet.jar" />            
 
@@ -43,11 +44,11 @@
             <pathelement path="svnkit/bin" />
         </path>
 
-        <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
+        <!--javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
             <exclude name="**/SVNClient.java" />
             <exclude name="**/SVNAdmin.java" />
             <exclude name="**/Path.java" />
-        </javac>
+        </javac-->
         <javac debug="true" destdir="contrib/sequence/bin" srcdir="contrib/sequence/src" />
         <javac debug="true" destdir="svnkit/bin" srcdir="svnkit/src" classpathref="library.classpath">
             <exclude name="org/tmatesoft/svn/util/SVNTest.java"/>
@@ -304,11 +305,11 @@
         <zip destfile="build/lib/svnkitsrc.zip">
             <fileset dir="svnkit/src" />
             <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit/src" />
-            <fileset dir="contrib/javahl/src">
+<!--            <fileset dir="contrib/javahl/src">
             	<exclude name="org/tigris/subversion/javahl/SVNAdmin.java"/>
             	<exclude name="org/tigris/subversion/javahl/SVNClient.java"/>
                 <exclude name="org/tigris/subversion/javahl/Path.java"/>
-            </fileset>
+            </fileset>-->
             <fileset dir="contrib/sequence/src" />
             <fileset dir="${basedir}" >
                 <include name="COPYING" />
--- svnkit-eclipse/com.sun.jna/MANIFEST.MF.orig	2009-11-13 21:05:48.000000000 +0200
+++ svnkit-eclipse/com.sun.jna/MANIFEST.MF	2009-12-03 13:06:12.934956961 +0200
@@ -4,7 +4,7 @@ Bundle-Name: JNA Library Plug-in
 Bundle-SymbolicName: com.sun.jna
 Bundle-Version: %jna.version%
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ClassPath: .
+Bundle-ClassPath: jna.jar
 Export-Package: com.sun.jna,
  com.sun.jna.win32,
  com.sun.jna.ptr


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Jul 2009 14:09:30 -0000	1.6
+++ .cvsignore	3 Dec 2009 11:35:15 -0000	1.7
@@ -1,2 +1,3 @@
 org.tmatesoft.svn_1.2.3.src-CLEAN.zip
 org.tmatesoft.svn_1.3.0.src-CLEAN.zip
+org.tmatesoft.svn_1.3.2.src-CLEAN.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Jul 2009 14:09:30 -0000	1.6
+++ sources	3 Dec 2009 11:35:15 -0000	1.7
@@ -1 +1 @@
-a4c8787ceb54ef525c7d18b05923c9e2  org.tmatesoft.svn_1.3.0.src-CLEAN.zip
+3bcbbda3423b41e892224dea85b80e6a  org.tmatesoft.svn_1.3.2.src-CLEAN.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- svnkit.spec	24 Jul 2009 14:09:30 -0000	1.13
+++ svnkit.spec	3 Dec 2009 11:35:15 -0000	1.14
@@ -1,4 +1,4 @@
-%define svn_revision     5847
+%define svn_revision     6267
 
 %define eclipse_name     eclipse
 %define eclipse_base     %{_libdir}/%{eclipse_name}
@@ -8,11 +8,11 @@
 %define local_features   %{local_dropins}/features
 %define core_plugin_name org.tmatesoft.svnkit_%{version}
 %define core_plugin_dir  %{local_plugins}/%{core_plugin_name}
-%define jna_plugin_name  com.sun.jna_3.0.9
+%define jna_plugin_name  com.sun.jna_3.2.3
 %define jna_plugin_dir   %{local_plugins}/%{jna_plugin_name}
 
 Name:           svnkit
-Version:        1.3.0
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
@@ -24,7 +24,7 @@ URL:            http://www.svnkit.com/
 # repackaged removing binary dependencies using:
 # zip $FILE -d \*.jar
 Source0:        org.tmatesoft.svn_%{version}.src-CLEAN.zip
-Patch0:         svnkit-1.2.2-dependencies.patch
+Patch0:         svnkit-1.3.2-dependencies.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,8 +39,10 @@ BuildRequires:          subversion-javah
 Requires:               subversion-javahl >= 1.5
 BuildRequires:          jna >= 3.0
 BuildRequires:          trilead-ssh2 >= 213
+BuildRequires:          sqljet
 Requires:               jna >= 3.0
 Requires:               trilead-ssh2 >= 213
+Requires:               sqljet
 Obsoletes:              javasvn <= 1.1.0
 
 
@@ -69,7 +71,7 @@ Eclipse feature for SVNKit - Java Subver
 
 %prep
 %setup -q -n %{name}-src-%{version}.%{svn_revision}
-%patch0 -p1
+%patch0 
 
 # delete the jars that are in the archive
 JAR_files=""
@@ -91,6 +93,8 @@ rm contrib/trilead/trileadsrc.zip
 ln -s /usr/share/java/svn-javahl.jar contrib/javahl
 ln -sf %{_javadir}/jna.jar contrib/jna/jna.jar
 ln -sf %{_javadir}/trilead-ssh2.jar contrib/trilead/trilead.jar
+ln -sf %{_javadir}/sqljet.jar contrib/sqljet/sqljet.jar
+ln -sf %{_javadir}/antlr3.jar contrib/sqljet/antlr-runtime-3.1.3.jar
 
 # fixing wrong-file-end-of-line-encoding warnings
 sed -i 's/\r//' README.txt doc/javadoc/package-list
@@ -124,7 +128,8 @@ unzip build/eclipse/site/plugins/%{core_
  
 # removing plugin internal jars and sources
 rm -f $RPM_BUILD_ROOT%{jna_plugin_dir}/jna.jar
-rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/{svnkitsrc.zip,trilead.jar,svnkit.jar,svnkit-javahl.jar}
+rm -fR $RPM_BUILD_ROOT%{jna_plugin_dir}/com
+rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/{svnkitsrc.zip,trilead.jar,svnkit.jar,svnkit-javahl.jar,sqljet.1.0.1.jar,antlr-runtime-3.1.3.jar}
 
 # main library links
 pushd $RPM_BUILD_ROOT%{_javadir}/
@@ -138,6 +143,8 @@ ln -s %{_javadir}/svn-javahl.jar $RPM_BU
 ln -s %{_javadir}/trilead-ssh2.jar $RPM_BUILD_ROOT%{core_plugin_dir}/trilead.jar
 ln -s %{_javadir}/svnkit.jar $RPM_BUILD_ROOT%{core_plugin_dir}
 ln -s %{_javadir}/jna.jar $RPM_BUILD_ROOT%{jna_plugin_dir}
+ln -s %{_javadir}/sqljet.jar $RPM_BUILD_ROOT%{core_plugin_dir}/sqljet.1.0.1.jar
+ln -s %{_javadir}/antlr3.jar $RPM_BUILD_ROOT%{core_plugin_dir}/antlr-runtime-3.1.3.jar
 
 
 %clean
@@ -160,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3.2-1
+- Update to 1.3.2.
+
 * Fri Jul 24 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3.0-1
 - Update to 1.3.0.
 


--- svnkit-1.2.2-dependencies.patch DELETED ---



From kasal at fedoraproject.org  Thu Dec  3 11:37:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  3 Dec 2009 11:37:19 +0000 (UTC)
Subject: rpms/perl/devel perl-USE_MM_LD_RUN_PATH.patch, NONE,
	1.1 perl-add-symbols.patch, NONE,
	1.1 perl-much-better-swap-logic.patch, NONE,
	1.1 perl-perlbug-tag.patch, NONE, 1.1 perl-suid-noroot.patch,
	NONE, 1.1 perl-update-ExtUtils-CBuilder.patch, 1.1,
	1.2 perl-update-File-Path.patch, 1.1,
	1.2 perl-update-Module-Build.patch, 1.1, 1.2 perl.spec, 1.237,
	1.238 02_fix_pod2html_dl, 1.1, NONE 07_fix_nullok, 1.1,
	NONE 08_fix_udp_typo, 1.1, NONE 09_fix_memory_debugging, 1.1,
	NONE 10_fix_h2ph_include_quote, 1.1,
	NONE 11_disable_vstring_warning, 1.1, NONE 15_fix_local_symtab,
	1.1, NONE 16_fix_perlio_teardown_prototype, 1.1,
	NONE 17_fix_getopt_long_callback, 1.1, NONE 18_fix_bigint_floats,
	1.1, NONE 25_fix_cgi_tempdir, 1.1,
	NONE 27_fix_sys_syslog_timeout, 1.1, NONE 28_fix_inplace_sort,
	1.1, NONE 30_fix_freetmps, 1.1,
	NONE 31_fix_attributes_unknown_error, 1.1, NONE 32891.patch, 1.1,
	NONE 32_fix_fork_rand, 1.1, NONE 34_fix_qr-memory-leak-2, 1.1,
	NONE 36_fix_file_temp_cleanup, 1.1,
	NONE 37_fix_coredump_indicator, 1.1, NONE 38_fix_weaken_memleak,
	1.1, NONE perl-5.10.0-Archive-Extract-onlystdout.patch, 1.1,
	NONE perl-5.10.0-Change33640.patch, 1.2,
	NONE perl-5.10.0-Change33881.patch, 1.1,
	NONE perl-5.10.0-Change33896.patch, 1.1,
	NONE perl-5.10.0-Change33897.patch, 1.1,
	NONE perl-5.10.0-Change34507.patch, 1.1,
	NONE perl-5.10.0-PerlIO-via-change34025.patch, 1.1,
	NONE perl-5.10.0-USE_MM_LD_RUN_PATH.patch, 1.2,
	NONE perl-5.10.0-accessXOK.patch, 1.1,
	NONE perl-5.10.0-bz448392.patch, 1.2,
	NONE perl-5.10.0-fix_file_path_rmtree_setuid.patch, 1.1,
	NONE perl-5.10.0-much-better-swap-logic.patch, 1.1,
	NONE perl-5.10.0-perlbug-tag.patch, 1.1,
	NONE perl-5.10.0-pos.patch, 1.3, NONE perl-5.10.0-stlocal.patch,
	1.1, NONE perl-5.8.0-root.patch, 1.1,
	NONE perl-CGI-t-util-58.patch, 1.1, NONE perl-bz509676.patch,
	1.1, NONE perl-skip-prereq.patch, 1.1, NONE
Message-ID: <20091203113719.6E61D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	perl-update-ExtUtils-CBuilder.patch 
	perl-update-File-Path.patch perl-update-Module-Build.patch 
	perl.spec 
Added Files:
	perl-USE_MM_LD_RUN_PATH.patch perl-add-symbols.patch 
	perl-much-better-swap-logic.patch perl-perlbug-tag.patch 
	perl-suid-noroot.patch 
Removed Files:
	02_fix_pod2html_dl 07_fix_nullok 08_fix_udp_typo 
	09_fix_memory_debugging 10_fix_h2ph_include_quote 
	11_disable_vstring_warning 15_fix_local_symtab 
	16_fix_perlio_teardown_prototype 17_fix_getopt_long_callback 
	18_fix_bigint_floats 25_fix_cgi_tempdir 
	27_fix_sys_syslog_timeout 28_fix_inplace_sort 30_fix_freetmps 
	31_fix_attributes_unknown_error 32891.patch 32_fix_fork_rand 
	34_fix_qr-memory-leak-2 36_fix_file_temp_cleanup 
	37_fix_coredump_indicator 38_fix_weaken_memleak 
	perl-5.10.0-Archive-Extract-onlystdout.patch 
	perl-5.10.0-Change33640.patch perl-5.10.0-Change33881.patch 
	perl-5.10.0-Change33896.patch perl-5.10.0-Change33897.patch 
	perl-5.10.0-Change34507.patch 
	perl-5.10.0-PerlIO-via-change34025.patch 
	perl-5.10.0-USE_MM_LD_RUN_PATH.patch 
	perl-5.10.0-accessXOK.patch perl-5.10.0-bz448392.patch 
	perl-5.10.0-fix_file_path_rmtree_setuid.patch 
	perl-5.10.0-much-better-swap-logic.patch 
	perl-5.10.0-perlbug-tag.patch perl-5.10.0-pos.patch 
	perl-5.10.0-stlocal.patch perl-5.8.0-root.patch 
	perl-CGI-t-util-58.patch perl-bz509676.patch 
	perl-skip-prereq.patch 
Log Message:
- new upstream version
- release number must be high, because of stale version numbers of some
  of the subpackages
- drop upstreamed patches
- update the versions of bundled modules
- shorten the paths in @INC
- build without DEBUGGING
- implement compatibility measures for the above two changes, for a short
  transition period
- provide perl(:MODULE_COMPAT_5.10.0), for that transition period only

perl-USE_MM_LD_RUN_PATH.patch:
 Liblist.pm   |    5 +++++
 MM_Unix.pm   |    2 +-
 MakeMaker.pm |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 62 insertions(+), 3 deletions(-)

--- NEW FILE perl-USE_MM_LD_RUN_PATH.patch ---
diff -up perl-5.10.1/lib/ExtUtils/MM_Unix.pm.runpath perl-5.10.1/lib/ExtUtils/MM_Unix.pm
--- perl-5.10.1/lib/ExtUtils/MM_Unix.pm.runpath	2009-11-18 16:08:45.000000000 +0100
+++ perl-5.10.1/lib/ExtUtils/MM_Unix.pm	2009-11-18 16:09:32.000000000 +0100
@@ -944,7 +944,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
     }
 
     my $ld_run_path_shell = "";
-    if ($self->{LD_RUN_PATH} ne "") {
+    if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
 	$ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
     }
 
diff -up perl-5.10.1/lib/ExtUtils/Liblist.pm.runpath perl-5.10.1/lib/ExtUtils/Liblist.pm
--- perl-5.10.1/lib/ExtUtils/Liblist.pm.runpath	2009-11-18 16:08:45.000000000 +0100
+++ perl-5.10.1/lib/ExtUtils/Liblist.pm	2009-11-18 16:09:32.000000000 +0100
@@ -88,6 +88,11 @@ libraries.  LD_RUN_PATH is a colon separ
 in LDLOADLIBS. It is passed as an environment variable to the process
 that links the shared library.
 
+Fedora extension: This generation of LD_RUN_PATH is disabled by default.
+To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH
+MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH
+environment variable).
+
 =head2 BSLOADLIBS
 
 List of those libraries that are needed but can be linked in
diff -up perl-5.10.1/lib/ExtUtils/MakeMaker.pm.runpath perl-5.10.1/lib/ExtUtils/MakeMaker.pm
--- perl-5.10.1/lib/ExtUtils/MakeMaker.pm.runpath	2009-11-18 16:08:45.000000000 +0100
+++ perl-5.10.1/lib/ExtUtils/MakeMaker.pm	2009-11-18 16:32:50.000000000 +0100
@@ -262,7 +262,7 @@ sub full_setup {
     PERL_SRC PERM_DIR PERM_RW PERM_RWX
     PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC
     PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
-    SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
+    SIGN SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
     XS_VERSION clean depend dist dynamic_lib linkext macro realclean
     tool_autosplit
 
@@ -406,7 +406,27 @@ sub new {
     # PRINT_PREREQ is RedHatism.
     if ("@ARGV" =~ /\bPRINT_PREREQ\b/) {
         $self->_PRINT_PREREQ;
-   }
+    }
+
+    # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation
+    if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
+       &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
+        ||( exists( $ENV{USE_MM_LD_RUN_PATH} )
+           &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ )
+           )
+        )
+       )
+    {
+       my $v = $1;
+       if( $v )
+       {
+           $v = ($v=~/=([01])$/)[0];
+       }else
+       {
+           $v = 1;
+       };
+       $self->{USE_MM_LD_RUN_PATH}=$v;
+    };
 
     print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose;
     if (-f "MANIFEST" && ! -f "Makefile"){
@@ -2319,6 +2339,40 @@ precedence.  A typemap in the current di
 precedence, even if it isn't listed in TYPEMAPS.  The default system
 typemap has lowest precedence.
 
+=item USE_MM_LD_RUN_PATH
+
+boolean
+The Fedora perl MakeMaker distribution differs from the standard
+upstream release in that it disables use of the MakeMaker generated
+LD_RUN_PATH by default, UNLESS this attribute is specified , or the
+USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run.
+
+The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH
+to the concatenation of every -L ld(1) option directory in which a -l ld(1)
+option library is found, which is used as the ld(1) -rpath option if none
+is specified. This means that, if your application builds shared libraries
+and your MakeMaker application links to them, that the absolute paths of the
+libraries in the build tree will be inserted into the RPATH header of all
+MakeMaker generated binaries, and that such binaries will be unable to link
+to these libraries if they do not still reside in the build tree directories
+(unlikely) or in the system library directories (/lib or /usr/lib), regardless
+of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and
+ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib,
+ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH
+is set to include /some_directory_other_than_usr_lib, because RPATH overrides
+LD_LIBRARY_PATH.
+
+So for Fedora MakeMaker builds LD_RUN_PATH is NOT generated by default for
+every link. You can still use explicit -rpath ld options or the LD_RUN_PATH
+environment variable during the build to generate an RPATH for the binaries.
+
+You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command
+line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH
+for every link command.
+
+USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the
+$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run.
+
 =item VENDORPREFIX
 
 Like PERLPREFIX, but only for the vendor install locations.

perl-add-symbols.patch:
 hv.c       |    4 ++--
 makedef.pl |    2 +-
 pad.c      |    4 ++--
 perl.h     |    4 ++--
 perlvars.h |    4 ++--
 proto.h    |    4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE perl-add-symbols.patch ---
2009-12-02  Stepan Kasal  <skasal at redhat.com>

	* add the extra symbols, even though DEBUGGING is not defined

diff -ur perl-5.10.1.orig/hv.c perl-5.10.1/hv.c
--- perl-5.10.1.orig/hv.c	2009-06-10 14:36:34.000000000 +0200
+++ perl-5.10.1/hv.c	2009-12-02 15:05:07.000000000 +0100
@@ -2926,7 +2926,7 @@
 =cut
 */
 
-#ifdef DEBUGGING
+/* #ifdef DEBUGGING */
 
 void
 Perl_hv_assert(pTHX_ HV *hv)
@@ -2991,7 +2991,7 @@
     HvEITER_set(hv, eiter);
 }
 
-#endif
+/* #endif */
 
 /*
  * Local variables:
diff -ur perl-5.10.1.orig/makedef.pl perl-5.10.1/makedef.pl
--- perl-5.10.1.orig/makedef.pl	2009-12-02 14:42:12.000000000 +0100
+++ perl-5.10.1/makedef.pl	2009-12-02 14:42:04.000000000 +0100
@@ -617,7 +617,7 @@
 			)];
 }
 
-unless ($define{'DEBUGGING'}) {
+unless (1 || $define{'DEBUGGING'}) {
     skip_symbols [qw(
 		    Perl_deb_growlevel
 		    Perl_debop
diff -ur perl-5.10.1.orig/pad.c perl-5.10.1/pad.c
--- perl-5.10.1.orig/pad.c	2009-04-22 23:43:43.000000000 +0200
+++ perl-5.10.1/pad.c	2009-12-02 14:39:21.000000000 +0100
@@ -912,7 +912,7 @@
 }
 
 
-#ifdef DEBUGGING
+/* #ifdef DEBUGGING */
 /*
 =for apidoc pad_sv
 
@@ -963,7 +963,7 @@
     );
     PL_curpad[po] = sv;
 }
-#endif
+/* #endif */
 
 
 
diff -ur perl-5.10.1.orig/perl.h perl-5.10.1/perl.h
--- perl-5.10.1.orig/perl.h	2009-07-06 13:18:58.000000000 +0200
+++ perl-5.10.1/perl.h	2009-12-02 15:06:44.000000000 +0100
@@ -4457,7 +4457,7 @@
 EXTCONST unsigned char PL_freq[];
 #endif
 
-#ifdef DEBUGGING
+/* #ifdef DEBUGGING */
 #ifdef DOINIT
 EXTCONST char* const PL_block_type[] = {
 	"NULL",
@@ -4473,7 +4473,7 @@
 #else
 EXTCONST char* PL_block_type[];
 #endif
-#endif
+/* #endif */
 
 /* These are all the compile time options that affect binary compatibility.
    Other compile time options that are binary compatible are in perl.c
diff -ur perl-5.10.1.orig/perlvars.h perl-5.10.1/perlvars.h
--- perl-5.10.1.orig/perlvars.h	2009-02-12 23:58:17.000000000 +0100
+++ perl-5.10.1/perlvars.h	2009-12-02 15:10:39.000000000 +0100
@@ -112,9 +112,9 @@
 PERLVARI(Gsig_trapped, int, 0)
 #endif
 
-#ifdef DEBUGGING
+/* #ifdef DEBUGGING */
 PERLVAR(Gwatch_pvx, char*)
-#endif
+/* #endif */
 
 #ifdef PERL_GLOBAL_STRUCT 
 PERLVAR(Gppaddr, Perl_ppaddr_t*) /* or opcode.h */
--- perl-5.10.1/proto.h.kasal	2009-12-02 15:18:39.000000000 +0100
+++ perl-5.10.1/proto.h	2009-12-02 15:29:51.000000000 +0100
@@ -6068,13 +6068,13 @@
 #define PERL_ARGS_ASSERT_PAD_CHECK_DUP	\
 	assert(name); assert(ourstash)
 
-#ifdef DEBUGGING
+/* #ifdef DEBUGGING */
 PERL_CALLCONV void	Perl_pad_setsv(pTHX_ PADOFFSET po, SV* sv)
 			__attribute__nonnull__(pTHX_2);
 #define PERL_ARGS_ASSERT_PAD_SETSV	\
 	assert(sv)
 
-#endif
+/* #endif */
 PERL_CALLCONV void	Perl_pad_block_start(pTHX_ int full);
 PERL_CALLCONV void	Perl_pad_tidy(pTHX_ padtidy_type type);
 PERL_CALLCONV void	Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full)

perl-much-better-swap-logic.patch:
 embed.fnc                        |    1 
 embed.h                          |    2 -
 ext/Devel-PPPort/parts/embed.fnc |    1 
 pod/perlreapi.pod                |    2 -
 pod/perlreguts.pod               |   13 +++++------
 proto.h                          |    5 ----
 regcomp.c                        |    2 -
 regexec.c                        |   46 ++++++++++++++-------------------------
 regexp.h                         |    2 -
 t/op/pat.t                       |   20 ++++++++++++++++
 10 files changed, 44 insertions(+), 50 deletions(-)

--- NEW FILE perl-much-better-swap-logic.patch ---
Backport of commit e9105d30 in blead perl.

diff -urpN perl-5.10.1.orig/embed.fnc perl-5.10.1/embed.fnc
--- perl-5.10.1.orig/embed.fnc	2009-08-15 18:36:34.000000000 +0200
+++ perl-5.10.1/embed.fnc	2009-11-26 00:12:48.000000000 +0100
@@ -1658,7 +1658,6 @@ ERsn	|U8*	|reghop4	|NN U8 *s|I32 off|NN 
 #endif
 ERsn	|U8*	|reghopmaybe3	|NN U8 *s|I32 off|NN const U8 *lim
 ERs	|char*	|find_byclass	|NN regexp * prog|NN const regnode *c|NN char *s|NN const char *strend|NULLOK regmatch_info *reginfo
-Es	|void	|swap_match_buff|NN regexp * prog
 Es	|void	|to_utf8_substr	|NN regexp * prog
 Es	|void	|to_byte_substr	|NN regexp * prog
 ERs	|I32	|reg_check_named_buff_matched	|NN const regexp *rex \
diff -urpN perl-5.10.1.orig/embed.h perl-5.10.1/embed.h
--- perl-5.10.1.orig/embed.h	2009-07-27 23:37:52.000000000 +0200
+++ perl-5.10.1/embed.h	2009-11-26 00:12:48.000000000 +0100
@@ -1452,7 +1452,6 @@
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define reghopmaybe3		S_reghopmaybe3
 #define find_byclass		S_find_byclass
-#define swap_match_buff		S_swap_match_buff
 #define to_utf8_substr		S_to_utf8_substr
 #define to_byte_substr		S_to_byte_substr
 #define reg_check_named_buff_matched	S_reg_check_named_buff_matched
@@ -3783,7 +3782,6 @@
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define reghopmaybe3		S_reghopmaybe3
 #define find_byclass(a,b,c,d,e)	S_find_byclass(aTHX_ a,b,c,d,e)
-#define swap_match_buff(a)	S_swap_match_buff(aTHX_ a)
 #define to_utf8_substr(a)	S_to_utf8_substr(aTHX_ a)
 #define to_byte_substr(a)	S_to_byte_substr(aTHX_ a)
 #define reg_check_named_buff_matched(a,b)	S_reg_check_named_buff_matched(aTHX_ a,b)
diff -urpN perl-5.10.1.orig/ext/Devel-PPPort/parts/embed.fnc perl-5.10.1/ext/Devel-PPPort/parts/embed.fnc
--- perl-5.10.1.orig/ext/Devel-PPPort/parts/embed.fnc	2009-07-27 23:37:52.000000000 +0200
+++ perl-5.10.1/ext/Devel-PPPort/parts/embed.fnc	2009-11-26 00:12:48.000000000 +0100
@@ -1677,7 +1677,6 @@ ERsn	|U8*	|reghop4	|NN U8 *s|I32 off|NN 
 #endif
 ERsn	|U8*	|reghopmaybe3	|NN U8 *s|I32 off|NN const U8 *lim
 ERs	|char*	|find_byclass	|NN regexp * prog|NN const regnode *c|NN char *s|NN const char *strend|NULLOK regmatch_info *reginfo
-Es	|void	|swap_match_buff|NN regexp * prog
 Es	|void	|to_utf8_substr	|NN regexp * prog
 Es	|void	|to_byte_substr	|NN regexp * prog
 ERs	|I32	|reg_check_named_buff_matched	|NN const regexp *rex \
diff -urpN perl-5.10.1.orig/pod/perlreapi.pod perl-5.10.1/pod/perlreapi.pod
--- perl-5.10.1.orig/pod/perlreapi.pod	2009-07-27 23:37:52.000000000 +0200
+++ perl-5.10.1/pod/perlreapi.pod	2009-11-26 00:12:48.000000000 +0100
@@ -598,7 +598,7 @@ engine should use something else.
 
 =head2 C<swap>
 
-TODO: document
+Unused. Left in for compatibility with perl 5.10.0.
 
 =head2 C<offs>
 
diff -urpN perl-5.10.1.orig/pod/perlreguts.pod perl-5.10.1/pod/perlreguts.pod
--- perl-5.10.1.orig/pod/perlreguts.pod	2009-07-27 23:37:52.000000000 +0200
+++ perl-5.10.1/pod/perlreguts.pod	2009-11-26 00:12:48.000000000 +0100
@@ -810,13 +810,12 @@ value to other engine implementations.
 
 =item C<swap>
 
-C<swap> is an extra set of startp/endp stored in a C<regexp_paren_ofs>
-struct. This is used when the last successful match was from the same pattern
-as the current pattern, so that a partial match doesn't overwrite the
-previous match's results. When this field is data filled the matching
-engine will swap buffers before every match attempt. If the match fails,
-then it swaps them back. If it's successful it leaves them. This field
-is populated on demand and is by default null.
+C<swap> formerly was an extra set of startp/endp stored in a
+C<regexp_paren_ofs> struct. This was used when the last successful match
+was from the same pattern as the current pattern, so that a partial
+match didn't overwrite the previous match's results, but it caused a
+problem with re-entrant code such as trying to build the UTF-8 swashes.
+Currently unused and left for backward compatibility with 5.10.0.
 
 =item C<offsets>
 
diff -urpN perl-5.10.1.orig/proto.h perl-5.10.1/proto.h
--- perl-5.10.1.orig/proto.h	2009-08-15 18:36:34.000000000 +0200
+++ perl-5.10.1/proto.h	2009-11-26 00:12:48.000000000 +0100
@@ -5445,11 +5445,6 @@ STATIC char*	S_find_byclass(pTHX_ regexp
 #define PERL_ARGS_ASSERT_FIND_BYCLASS	\
 	assert(prog); assert(c); assert(s); assert(strend)
 
-STATIC void	S_swap_match_buff(pTHX_ regexp * prog)
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_SWAP_MATCH_BUFF	\
-	assert(prog)
-
 STATIC void	S_to_utf8_substr(pTHX_ regexp * prog)
 			__attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_TO_UTF8_SUBSTR	\
diff -urpN perl-5.10.1.orig/regcomp.c perl-5.10.1/regcomp.c
--- perl-5.10.1.orig/regcomp.c	2009-07-27 23:37:52.000000000 +0200
+++ perl-5.10.1/regcomp.c	2009-11-26 00:12:48.000000000 +0100
@@ -9361,7 +9361,6 @@ Perl_pregfree(pTHX_ REGEXP *r)
     if (r->saved_copy)
         SvREFCNT_dec(r->saved_copy);
 #endif
-    Safefree(r->swap);
     Safefree(r->offs);
     Safefree(r);
 }
@@ -9413,7 +9412,6 @@ Perl_reg_temp_copy (pTHX_ REGEXP *r) {
     ret->saved_copy = NULL;
 #endif
     ret->mother_re = r; 
-    ret->swap = NULL;
     
     return ret;
 }
diff -urpN perl-5.10.1.orig/regexec.c perl-5.10.1/regexec.c
--- perl-5.10.1.orig/regexec.c	2009-07-27 23:37:52.000000000 +0200
+++ perl-5.10.1/regexec.c	2009-11-26 00:12:48.000000000 +0100
@@ -1733,28 +1733,6 @@ S_find_byclass(pTHX_ regexp * prog, cons
 	return s;
 }
 
-static void 
-S_swap_match_buff (pTHX_ regexp *prog)
-{
-    regexp_paren_pair *t;
-
-    PERL_ARGS_ASSERT_SWAP_MATCH_BUFF;
-
-    if (!prog->swap) {
-    /* We have to be careful. If the previous successful match
-       was from this regex we don't want a subsequent paritally
-       successful match to clobber the old results. 
-       So when we detect this possibility we add a swap buffer
-       to the re, and switch the buffer each match. If we fail
-       we switch it back, otherwise we leave it swapped.
-    */
-        Newxz(prog->swap, (prog->nparens + 1), regexp_paren_pair);
-    }
-    t = prog->swap;
-    prog->swap = prog->offs;
-    prog->offs = t;
-}    
-
 
 /*
  - regexec_flags - match a regexp against a string
@@ -1783,7 +1761,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const 
     I32 multiline;
     RXi_GET_DECL(prog,progi);
     regmatch_info reginfo;  /* create some info to pass to regtry etc */
-    bool swap_on_fail = 0;
+    regexp_paren_pair *swap = NULL;
     GET_RE_DEBUG_FLAGS_DECL;
 
     PERL_ARGS_ASSERT_REGEXEC_FLAGS;
@@ -1861,9 +1839,16 @@ Perl_regexec_flags(pTHX_ REGEXP * const 
 	    reginfo.ganch = strbeg;
     }
     if (PL_curpm && (PM_GETRE(PL_curpm) == prog)) {
-        swap_on_fail = 1;
-        swap_match_buff(prog); /* do we need a save destructor here for
-                                  eval dies? */
+        /* We have to be careful. If the previous successful match
+           was from this regex we don't want a subsequent partially
+           successful match to clobber the old results.
+           So when we detect this possibility we add a swap buffer
+           to the re, and switch the buffer each match. If we fail
+           we switch it back, otherwise we leave it swapped.
+        */
+        swap = prog->offs;
+        /* do we need a save destructor here for eval dies? */
+        Newxz(prog->offs, (prog->nparens + 1), regexp_paren_pair);
     }
     if (!(flags & REXEC_CHECKED) && (prog->check_substr != NULL || prog->check_utf8 != NULL)) {
 	re_scream_pos_data d;
@@ -2162,6 +2147,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const 
     goto phooey;
 
 got_it:
+    Safefree(swap);
     RX_MATCH_TAINTED_set(prog, PL_reg_flags & RF_tainted);
 
     if (PL_reg_eval_set)
@@ -2207,10 +2193,12 @@ phooey:
 			  PL_colors[4], PL_colors[5]));
     if (PL_reg_eval_set)
 	restore_pos(aTHX_ prog);
-    if (swap_on_fail) 
+    if (swap) {
         /* we failed :-( roll it back */
-        swap_match_buff(prog);
-    
+        Safefree(prog->offs);
+        prog->offs = swap;
+    }
+
     return 0;
 }
 
diff -urpN perl-5.10.1.orig/regexp.h perl-5.10.1/regexp.h
--- perl-5.10.1.orig/regexp.h	2009-07-27 23:37:52.000000000 +0200
+++ perl-5.10.1/regexp.h	2009-11-26 00:12:48.000000000 +0100
@@ -88,7 +88,7 @@ typedef struct regexp {
         /* Data about the last/current match. These are modified during matching*/
         U32 lastparen;		/* last open paren matched */
 	U32 lastcloseparen;	/* last close paren matched */
-        regexp_paren_pair *swap;  /* Swap copy of *offs */ 
+        regexp_paren_pair *swap;  /* Unused: 5.10.1 and later */ 
         regexp_paren_pair *offs;  /* Array of offsets for (@-) and (@+) */
 
 	char *subbeg;		/* saved or original string 
diff -urpN perl-5.10.1.orig/t/op/pat.t perl-5.10.1/t/op/pat.t
--- perl-5.10.1.orig/t/op/pat.t	2009-07-27 23:37:52.000000000 +0200
+++ perl-5.10.1/t/op/pat.t	2009-11-26 00:12:48.000000000 +0100
@@ -13,7 +13,7 @@ sub run_tests;
 
 $| = 1;
 
-my $EXPECTED_TESTS = 4065;  # Update this when adding/deleting tests.
+my $EXPECTED_TESTS = 4066;  # Update this when adding/deleting tests.
 
 BEGIN {
     chdir 't' if -d 't';
@@ -4349,6 +4349,24 @@ sub run_tests {
        }
     }
 
+    # This only works under -DEBUGGING because it relies on an assert().
+    {
+        local $BugId = '60508';
+	local $Message = "Check capture offset re-entrancy of utf8 code.";
+
+        sub fswash { $_[0] =~ s/([>X])//g; }
+
+        my $k1 = "." x 4 . ">>";
+        fswash($k1);
+
+        my $k2 = "\x{f1}\x{2022}";
+        $k2 =~ s/([\360-\362])/>/g;
+        fswash($k2);
+
+        iseq($k2, "\x{2022}", "utf8::SWASHNEW doesn't cause capture leaks");
+    }
+
+
     {
 	local $BugId = 65372;	# minimal CURLYM limited to 32767 matches
 	my @pat = (

perl-perlbug-tag.patch:
 perlbug.PL |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

--- NEW FILE perl-perlbug-tag.patch ---
--- perl-5.10.1/utils/perlbug.PL.fedora	2009-08-12 20:49:24.000000000 +0200
+++ perl-5.10.1/utils/perlbug.PL	2009-11-18 15:56:15.000000000 +0100
@@ -27,8 +27,6 @@ open OUT, ">$file" or die "Can't create 
 open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h")
     or die "Can't open patchlevel.h: $!";
 
-my $patchlevel_date = (stat PATCH_LEVEL)[9];
-
 while (<PATCH_LEVEL>) {
     last if $_ =~ /^\s*static\s+(?:const\s+)?char.*?local_patches\[\]\s*=\s*{\s*$/;
 }
@@ -71,9 +69,8 @@ $Config{startperl}
     eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
 	if \$running_under_some_shell;
 
-my \$config_tag1 = '$extract_version - $Config{cf_time}';
+my \$config_tag1 = '$extract_version';
 
-my \$patchlevel_date = $patchlevel_date;
 my \$patch_tags = '$patch_tags';
 my \@patches = (
     $patch_desc
@@ -333,17 +330,6 @@ sub Init {
     $ok = '';
     if ($::opt_o) {
 	if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
-	    my $age = time - $patchlevel_date;
-	    if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
-		my $date = localtime $patchlevel_date;
-		print <<"EOF";
-"perlbug -ok" and "perlbug -nok" do not report on Perl versions which
-are more than 60 days old.  This Perl version was constructed on
-$date.  If you really want to report this, use
-"perlbug -okay" or "perlbug -nokay".
-EOF
-		exit();
-	    }
 	    # force these options
 	    unless ($::opt_n) {
 		$::opt_S = 1; # don't prompt for send
@@ -730,8 +716,8 @@ EFF
     print OUT <<EFF;
 ---
 EFF
-    print OUT "This perlbug was built using Perl $config_tag1\n",
-	    "It is being executed now by  Perl $config_tag2.\n\n"
+    print OUT "This perlbug was built using Perl $config_tag1 in the Fedora build system.\n",
+	    "It is being executed now by Perl $config_tag2.\n\n"
 	if $config_tag2 ne $config_tag1;
 
     print OUT <<EOF;

perl-suid-noroot.patch:
 installperl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-suid-noroot.patch ---
--- perl-5.10.1/installperl.orig	2009-11-18 15:44:47.000000000 +0100
+++ perl-5.10.1/installperl	2009-11-18 15:50:32.000000000 +0100
@@ -235,7 +235,7 @@
 
 # Do some quick sanity checks.
 
-if (!$opts{notify} && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
+# if (!$opts{notify} && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 
    $installbin		|| die "No installbin directory in config.sh\n";
 -d $installbin		|| mkpath($installbin, $opts{verbose}, 0777);

perl-update-ExtUtils-CBuilder.patch:
 MANIFEST                                       |    1 
 lib/ExtUtils/CBuilder.pm                       |   11 
 lib/ExtUtils/CBuilder/Base.pm                  |   22 +
 lib/ExtUtils/CBuilder/Changes                  |   43 ++
 lib/ExtUtils/CBuilder/Platform/Unix.pm         |    2 
 lib/ExtUtils/CBuilder/Platform/VMS.pm          |    2 
 lib/ExtUtils/CBuilder/Platform/Windows.pm      |  440 +------------------------
 lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm  |  130 +++++++
 lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm  |  151 ++++++++
 lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm |  131 +++++++
 lib/ExtUtils/CBuilder/Platform/aix.pm          |    2 
 lib/ExtUtils/CBuilder/Platform/cygwin.pm       |    9 
 lib/ExtUtils/CBuilder/Platform/darwin.pm       |    2 
 lib/ExtUtils/CBuilder/Platform/dec_osf.pm      |    2 
 lib/ExtUtils/CBuilder/Platform/os2.pm          |    2 
 lib/ExtUtils/CBuilder/t/00-have-compiler.t     |   26 -
 lib/ExtUtils/CBuilder/t/02-link.t              |   17 
 lib/ExtUtils/CBuilder/t/03-cplusplus.t         |   73 ++++
 18 files changed, 615 insertions(+), 451 deletions(-)

Index: perl-update-ExtUtils-CBuilder.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl-update-ExtUtils-CBuilder.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-update-ExtUtils-CBuilder.patch	11 Mar 2009 21:12:37 -0000	1.1
+++ perl-update-ExtUtils-CBuilder.patch	3 Dec 2009 11:37:17 -0000	1.2
@@ -1,444 +1,1347 @@
-perl-update-ExtUtils-CBuilder-0.24
+ExtUtils-CBuilder-0.27
 
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Base.pm perl-5.10.0/lib/ExtUtils/CBuilder/Base.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Base.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Base.pm	2009-03-11 20:12:36.000000000 +0100
-@@ -6,9 +6,10 @@
- use Cwd ();
- use Config;
- use Text::ParseWords;
-+use IO::File;
+diff -urN perl-5.10.1.orig/MANIFEST perl-5.10.1/MANIFEST
+--- perl-5.10.1.orig/MANIFEST	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/MANIFEST	2009-12-01 11:52:20.000000000 +0100
+@@ -2166,6 +2166,7 @@
+ lib/ExtUtils/CBuilder/t/00-have-compiler.t	ExtUtils::CBuilder tests
+ lib/ExtUtils/CBuilder/t/01-basic.t	tests for ExtUtils::CBuilder
+ lib/ExtUtils/CBuilder/t/02-link.t	tests for ExtUtils::CBuilder
++lib/ExtUtils/CBuilder/t/03-cplusplus.t	tests for ExtUtils::CBuilder
+ lib/ExtUtils/Changes		MakeMaker change log
+ lib/ExtUtils/Changes_EU-Install		ExtUtils-Install change log
+ lib/ExtUtils/Command/MM.pm	Calling MM functions from the cmd line
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Base.pm perl-5.10.1/lib/ExtUtils/CBuilder/Base.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Base.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Base.pm	2009-12-01 10:38:49.000000000 +0100
+@@ -9,7 +9,7 @@
+ use IO::File;
  
  use vars qw($VERSION);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  
  sub new {
    my $class = shift;
-@@ -118,10 +119,8 @@
-   
-   my $tmpfile = File::Spec->catfile(File::Spec->tmpdir, 'compilet.c');
-   {
--    local *FH;
--    open FH, "> $tmpfile" or die "Can't create $tmpfile: $!";
--    print FH "int boot_compilet() { return 1; }\n";
--    close FH;
-+    my $FH = IO::File->new("> $tmpfile") or die "Can't create $tmpfile: $!";
-+    print $FH "int boot_compilet() { return 1; }\n";
+@@ -21,6 +21,7 @@
+   while (my ($k,$v) = each %Config) {
+     $self->{config}{$k} = $v unless exists $self->{config}{$k};
    }
++  $self->{config}{cc} = $ENV{CC} if exists $ENV{CC};
+   return $self;
+ }
+ 
+@@ -98,6 +99,7 @@
+   my @extra_compiler_flags = $self->split_like_shell($args{extra_compiler_flags});
+   my @cccdlflags = $self->split_like_shell($cf->{cccdlflags});
+   my @ccflags = $self->split_like_shell($cf->{ccflags});
++  push @ccflags, qw/-x c++/ if $args{'C++'};
+   my @optimize = $self->split_like_shell($cf->{optimize});
+   my @flags = (@include_dirs, @defines, @cccdlflags, @extra_compiler_flags,
+ 	       $self->arg_nolink,
+@@ -114,7 +116,7 @@
+ }
  
-   my ($obj_file, @lib_files);
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Changes perl-5.10.0/lib/ExtUtils/CBuilder/Changes
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Changes	2009-03-11 20:13:30.000000000 +0100
-@@ -1,5 +1,31 @@
+ sub have_compiler {
+-  my ($self) = @_;
++  my ($self, $is_cplusplus) = @_;
+   return $self->{have_compiler} if defined $self->{have_compiler};
+ 
+   my $result;
+@@ -125,6 +127,7 @@
+     # don't clobber existing files (rare, but possible)
+     my $rand = int(rand(2**31));
+     my $tmpfile = File::Spec->catfile($dir, "compilet-$rand.c");
++    $tmpfile .= "c" if $is_cplusplus;
+     if ( -e $tmpfile ) {
+       redo DIR if $attempts--;
+       next DIR;
+@@ -132,13 +135,19 @@
+ 
+     {
+       my $FH = IO::File->new("> $tmpfile") or die "Can't create $tmpfile: $!";
+-      print $FH "int boot_compilet() { return 1; }\n";
++      if ( $is_cplusplus ) {
++        print $FH "class Bogus { public: int boot_compilet() { return 1; } };\n";
++      }
++      else {
++        print $FH "int boot_compilet() { return 1; }\n";
++      }
+     }
+ 
+     my ($obj_file, @lib_files);
+     eval {
+       local $^W = 0;
+-      $obj_file = $self->compile(source => $tmpfile);
++      local $self->{quiet} = 1;
++      $obj_file = $self->compile('C++' => $is_cplusplus, source => $tmpfile);
+       @lib_files = $self->link(objects => $obj_file, module_name => 'compilet');
+     };
+     $result = $@ ? 0 : 1;
+@@ -152,6 +161,11 @@
+   return $self->{have_compiler} = $result;
+ }
+ 
++sub have_cplusplus {
++  push @_, 1;
++  goto &have_compiler;
++}
++
+ sub lib_file {
+   my ($self, $dl_file) = @_;
+   $dl_file =~ s/\.[^.]+$//;
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Changes perl-5.10.1/lib/ExtUtils/CBuilder/Changes
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Changes	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Changes	2009-12-01 10:37:31.000000000 +0100
+@@ -1,5 +1,48 @@
  Revision history for Perl extension ExtUtils::CBuilder.
  
-+ - Added 'gnu' and 'gnukfreebsd' as Unix variants. [Niko Tyni]
++0.27 - Thu Oct 29 21:29:56 EDT 2009
++
++ Other:
++ - Removed Build.PL to avoid creating a circular dependency
++ - Added version numbers to Windows compiler driver modules
++
++0.26_05 - Sun Oct 25 17:29:02 EDT 2009
++
++ Bugs fixed:
++ - Fixed t/02link.t failures on cygwin with Perl 5.8 [David Golden]
++
++ Other:
++ - Made have_compiler (and have_cplusplus) quiet without echoing
++   the test command to STDOUT [David Golden]
 +
-+ - Brought in some VMS fixes from bleadperl: "Correct and complete
-+   CBuilder's handling of external libraries when linking on VMS."
-+   [Craig Berry]
++0.26_04 - Mon Oct 19 21:57:46 EDT 2009
 +
-+0.23 - Sat Apr 19 22:28:03 2008
++ Enhancements:
++ - Added 'have_cplusplus()' method to check for C++ support
++ - Added patches for building Perl with mingw64 [Sisyphus]
++ - Allow CC environment variable to override $Config{cc}
 +
-+ - Fixed some problems (some old, some new) with Strawberry Perl on
-+   Windows. [Alberto Simo~es]
++ Bugs fixed:
++ - Fixed link executable command for Win32 MSVC (RT#40819) [Cosimo
++   Streppone]
++ - Removed MSVC version check when embedding a manifest file
++   (RT #43002) [Steve Hay]
 +
-+ - Will now install in the core perl lib directory when the user's
-+   perl is new enough to have us in core. [Yi Ma Mao]
++ Other:
++ - Split Windows compiler driver packages into individual *.pm files
 +
-+0.22 - Fri Feb  8 21:52:21 2008
++0.260301 - Sat Aug 29 11:04:41 EDT 2009
 +
-+ - Replaced the split_like_shell() method on Windows with a
-+   near-no-op, which is probably more correct and has the benefit of
-+   not messing up UNC paths. [John R. LoVerso, see
-+   http://rt.cpan.org/Ticket/Display.html?id=26545]
++ Bugs fixed:
++ - Fixed linking error on Win32 with gcc compiler (RT#49000)
++   [kmx]
 +
-+ - Fixed extra_compiler_flags on Windows, they were being
-+   ignored. [Robert May]
++0.2603 - Sat Jul 18 06:56:06 EDT 2009
 +
-+0.21 - Tue Oct 30 06:46:01 2007
++ Bugs fixed:
++ - Makefile.PL had wrong INSTALLDIRS setting for older Perls
++   (RT#47985) [David Golden]
 +
-  - Clean up perl_src path using Cwd::realpath().  Only affects usage
-    as part of the perl core.
+ 0.2602 - Sat Jul  4 10:57:12 EDT 2009
  
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/Unix.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/Unix.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/Unix.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/Unix.pm	2009-03-11 20:12:36.000000000 +0100
+  Bugs fixed:
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Unix.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Unix.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Unix.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Unix.pm	2009-12-01 10:38:49.000000000 +0100
 @@ -4,7 +4,7 @@
  use ExtUtils::CBuilder::Base;
  
  use vars qw($VERSION @ISA);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  @ISA = qw(ExtUtils::CBuilder::Base);
  
  sub link_executable {
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/VMS.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/VMS.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/VMS.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/VMS.pm	2009-03-11 20:12:36.000000000 +0100
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/VMS.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/VMS.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/VMS.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/VMS.pm	2009-12-01 10:38:49.000000000 +0100
 @@ -4,7 +4,7 @@
  use ExtUtils::CBuilder::Base;
  
  use vars qw($VERSION @ISA);
--$VERSION = '0.22';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  @ISA = qw(ExtUtils::CBuilder::Base);
  
  use File::Spec::Functions qw(catfile catdir);
-@@ -134,7 +134,7 @@
-   # In general, we pass through the basic libraries from %Config unchanged.
-   # The one exception is that if we're building in the Perl source tree, and
-   # a library spec could be resolved via a logical name, we go to some trouble
--  # to insure that the copy in the local tree is used, rather than one to
-+  # to ensure that the copy in the local tree is used, rather than one to
-   # which a system-wide logical may point.
-   if ($self->perl_src) {
-     my($lib,$locspec,$type);
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/Windows.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/Windows.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/Windows.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/Windows.pm	2009-03-11 20:12:36.000000000 +0100
-@@ -7,9 +7,10 @@
- use File::Spec;
- 
- use ExtUtils::CBuilder::Base;
-+use IO::File;
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm	2009-12-01 10:38:49.000000000 +0100
+@@ -0,0 +1,130 @@
++package ExtUtils::CBuilder::Platform::Windows::BCC;
++
++use vars qw($VERSION);
++$VERSION = '0.27';
++
++sub format_compiler_cmd {
++  my ($self, %spec) = @_;
++
++  foreach my $path ( @{ $spec{includes} || [] },
++                     @{ $spec{perlinc}  || [] } ) {
++    $path = '-I' . $path;
++  }
++
++  %spec = $self->write_compiler_script(%spec)
++    if $spec{use_scripts};
++
++  return [ grep {defined && length} (
++    $spec{cc}, '-c'         ,
++    @{$spec{includes}}      ,
++    @{$spec{cflags}}        ,
++    @{$spec{optimize}}      ,
++    @{$spec{defines}}       ,
++    @{$spec{perlinc}}       ,
++    "-o$spec{output}"       ,
++    $spec{source}           ,
++  ) ];
++}
++
++sub write_compiler_script {
++  my ($self, %spec) = @_;
++
++  my $script = File::Spec->catfile( $spec{srcdir},
++                                    $spec{basename} . '.ccs' );
++
++  $self->add_to_cleanup($script);
++
++  print "Generating script '$script'\n" if !$self->{quiet};
++
++  my $SCRIPT = IO::File->new( ">$script" )
++    or die( "Could not create script '$script': $!" );
++
++  # XXX Borland "response files" seem to be unable to accept macro
++  # definitions containing quoted strings. Escaping strings with
++  # backslash doesn't work, and any level of quotes are stripped. The
++  # result is is a floating point number in the source file where a
++  # string is expected. So we leave the macros on the command line.
++  print $SCRIPT join( "\n",
++    map { ref $_ ? @{$_} : $_ }
++    grep defined,
++    delete(
++      @spec{ qw(includes cflags optimize perlinc) } )
++  );
++
++  push @{$spec{includes}}, '@"' . $script . '"';
++
++  return %spec;
++}
++
++sub format_linker_cmd {
++  my ($self, %spec) = @_;
++
++  foreach my $path ( @{$spec{libpath}} ) {
++    $path = "-L$path";
++  }
++
++  push( @{$spec{startup}}, 'c0d32.obj' )
++    unless ( $spec{starup} && @{$spec{startup}} );
++
++  %spec = $self->write_linker_script(%spec)
++    if $spec{use_scripts};
++
++  return [ grep {defined && length} (
++    $spec{ld}               ,
++    @{$spec{lddlflags}}     ,
++    @{$spec{libpath}}       ,
++    @{$spec{other_ldflags}} ,
++    @{$spec{startup}}       ,
++    @{$spec{objects}}       , ',',
++    $spec{output}           , ',',
++    $spec{map_file}         , ',',
++    $spec{libperl}          ,
++    @{$spec{perllibs}}      , ',',
++    $spec{def_file}
++  ) ];
++}
++
++sub write_linker_script {
++  my ($self, %spec) = @_;
++
++  # To work around Borlands "unique" commandline syntax,
++  # two scripts are used:
++
++  my $ld_script = File::Spec->catfile( $spec{srcdir},
++                                       $spec{basename} . '.lds' );
++  my $ld_libs   = File::Spec->catfile( $spec{srcdir},
++                                       $spec{basename} . '.lbs' );
++
++  $self->add_to_cleanup($ld_script, $ld_libs);
++
++  print "Generating scripts '$ld_script' and '$ld_libs'.\n" if !$self->{quiet};
++
++  # Script 1: contains options & names of object files.
++  my $LD_SCRIPT = IO::File->new( ">$ld_script" )
++    or die( "Could not create linker script '$ld_script': $!" );
++
++  print $LD_SCRIPT join( " +\n",
++    map { @{$_} }
++    grep defined,
++    delete(
++      @spec{ qw(lddlflags libpath other_ldflags startup objects) } )
++  );
++
++  # Script 2: contains name of libs to link against.
++  my $LD_LIBS = IO::File->new( ">$ld_libs" )
++    or die( "Could not create linker script '$ld_libs': $!" );
++
++  print $LD_LIBS join( " +\n",
++     (delete $spec{libperl}  || ''),
++    @{delete $spec{perllibs} || []},
++  );
++
++  push @{$spec{lddlflags}}, '@"' . $ld_script  . '"';
++  push @{$spec{perllibs}},  '@"' . $ld_libs    . '"';
++
++  return %spec;
++}
++
++1;
++
++
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm	2009-12-01 10:38:49.000000000 +0100
+@@ -0,0 +1,151 @@
++package ExtUtils::CBuilder::Platform::Windows::GCC;
++
++use vars qw($VERSION);
++$VERSION = '0.27';
++
++sub format_compiler_cmd {
++  my ($self, %spec) = @_;
++
++  foreach my $path ( @{ $spec{includes} || [] },
++                     @{ $spec{perlinc}  || [] } ) {
++    $path = '-I' . $path;
++  }
++
++  # split off any -arguments included in cc
++  my @cc = split / (?=-)/, $spec{cc};
++
++  return [ grep {defined && length} (
++    @cc, '-c'               ,
++    @{$spec{includes}}      ,
++    @{$spec{cflags}}        ,
++    @{$spec{optimize}}      ,
++    @{$spec{defines}}       ,
++    @{$spec{perlinc}}       ,
++    '-o', $spec{output}     ,
++    $spec{source}           ,
++  ) ];
++}
++
++sub format_linker_cmd {
++  my ($self, %spec) = @_;
++  my $cf = $self->{config};
++
++  # The Config.pm variable 'libperl' is hardcoded to the full name
++  # of the perl import library (i.e. 'libperl56.a'). GCC will not
++  # find it unless the 'lib' prefix & the extension are stripped.
++  $spec{libperl} =~ s/^(?:lib)?([^.]+).*$/-l$1/;
++
++  unshift( @{$spec{other_ldflags}}, '-nostartfiles' )
++    if ( $spec{startup} && @{$spec{startup}} );
++
++  # From ExtUtils::MM_Win32:
++  #
++  ## one thing for GCC/Mingw32:
++  ## we try to overcome non-relocateable-DLL problems by generating
++  ##    a (hopefully unique) image-base from the dll's name
++  ## -- BKS, 10-19-1999
++  File::Basename::basename( $spec{output} ) =~ /(....)(.{0,4})/;
++  $spec{image_base} = sprintf( "0x%x0000", unpack('n', $1 ^ $2) );
++
++  %spec = $self->write_linker_script(%spec)
++    if $spec{use_scripts};
++
++  foreach my $path ( @{$spec{libpath}} ) {
++    $path = "-L$path";
++  }
++
++  my @cmds; # Stores the series of commands needed to build the module.
++
++  my $DLLTOOL = $cf->{dlltool} || 'dlltool';
++
++  push @cmds, [
++    $DLLTOOL, '--def'        , $spec{def_file},
++              '--output-exp' , $spec{explib}
++  ];
++
++  # split off any -arguments included in ld
++  my @ld = split / (?=-)/, $spec{ld};
++
++  push @cmds, [ grep {defined && length} (
++    @ld                       ,
++    '-o', $spec{output}       ,
++    "-Wl,--base-file,$spec{base_file}"   ,
++    "-Wl,--image-base,$spec{image_base}" ,
++    @{$spec{lddlflags}}       ,
++    @{$spec{libpath}}         ,
++    @{$spec{startup}}         ,
++    @{$spec{objects}}         ,
++    @{$spec{other_ldflags}}   ,
++    $spec{libperl}            ,
++    @{$spec{perllibs}}        ,
++    $spec{explib}             ,
++    $spec{map_file} ? ('-Map', $spec{map_file}) : ''
++  ) ];
++
++  push @cmds, [
++    $DLLTOOL, '--def'        , $spec{def_file},
++              '--output-exp' , $spec{explib},
++              '--base-file'  , $spec{base_file}
++  ];
++
++  push @cmds, [ grep {defined && length} (
++    @ld                       ,
++    '-o', $spec{output}       ,
++    "-Wl,--image-base,$spec{image_base}" ,
++    @{$spec{lddlflags}}       ,
++    @{$spec{libpath}}         ,
++    @{$spec{startup}}         ,
++    @{$spec{objects}}         ,
++    @{$spec{other_ldflags}}   ,
++    $spec{libperl}            ,
++    @{$spec{perllibs}}        ,
++    $spec{explib}             ,
++    $spec{map_file} ? ('-Map', $spec{map_file}) : ''
++  ) ];
++
++  return @cmds;
++}
++
++sub write_linker_script {
++  my ($self, %spec) = @_;
++
++  my $script = File::Spec->catfile( $spec{srcdir},
++                                    $spec{basename} . '.lds' );
++
++  $self->add_to_cleanup($script);
++
++  print "Generating script '$script'\n" if !$self->{quiet};
++
++  my $SCRIPT = IO::File->new( ">$script" )
++    or die( "Could not create script '$script': $!" );
++
++  print $SCRIPT ( 'SEARCH_DIR(' . $_ . ")\n" )
++    for @{delete $spec{libpath} || []};
++
++  # gcc takes only one startup file, so the first object in startup is
++  # specified as the startup file and any others are shifted into the
++  # beginning of the list of objects.
++  if ( $spec{startup} && @{$spec{startup}} ) {
++    print $SCRIPT 'STARTUP(' . shift( @{$spec{startup}} ) . ")\n";
++    unshift @{$spec{objects}},
++      @{delete $spec{startup} || []};
++  }
++
++  print $SCRIPT 'INPUT(' . join( ',',
++    @{delete $spec{objects}  || []}
++  ) . ")\n";
++
++  print $SCRIPT 'INPUT(' . join( ' ',
++     (delete $spec{libperl}  || ''),
++    @{delete $spec{perllibs} || []},
++  ) . ")\n";
++
++  #it is important to keep the order 1.linker_script - 2.other_ldflags
++  unshift @{$spec{other_ldflags}}, '"' . $script . '"';
++
++  return %spec;
++}
++
++1;
++
++
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm	2009-12-01 10:38:49.000000000 +0100
+@@ -0,0 +1,131 @@
++package ExtUtils::CBuilder::Platform::Windows::MSVC;
++
++use vars qw($VERSION);
++$VERSION = '0.27';
++
++sub arg_exec_file {
++  my ($self, $file) = @_;
++  return "/OUT:$file";
++}
++
++sub format_compiler_cmd {
++  my ($self, %spec) = @_;
++
++  foreach my $path ( @{ $spec{includes} || [] },
++                     @{ $spec{perlinc}  || [] } ) {
++    $path = '-I' . $path;
++  }
++
++  %spec = $self->write_compiler_script(%spec)
++    if $spec{use_scripts};
++
++  return [ grep {defined && length} (
++    $spec{cc},'-nologo','-c',
++    @{$spec{includes}}      ,
++    @{$spec{cflags}}        ,
++    @{$spec{optimize}}      ,
++    @{$spec{defines}}       ,
++    @{$spec{perlinc}}       ,
++    "-Fo$spec{output}"      ,
++    $spec{source}           ,
++  ) ];
++}
++
++sub write_compiler_script {
++  my ($self, %spec) = @_;
++
++  my $script = File::Spec->catfile( $spec{srcdir},
++                                    $spec{basename} . '.ccs' );
++
++  $self->add_to_cleanup($script);
++  print "Generating script '$script'\n" if !$self->{quiet};
++
++  my $SCRIPT = IO::File->new( ">$script" )
++    or die( "Could not create script '$script': $!" );
++
++  print $SCRIPT join( "\n",
++    map { ref $_ ? @{$_} : $_ }
++    grep defined,
++    delete(
++      @spec{ qw(includes cflags optimize defines perlinc) } )
++  );
++
++  push @{$spec{includes}}, '@"' . $script . '"';
++
++  return %spec;
++}
++
++sub format_linker_cmd {
++  my ($self, %spec) = @_;
++  my $cf = $self->{config};
++
++  foreach my $path ( @{$spec{libpath}} ) {
++    $path = "-libpath:$path";
++  }
++
++  my $output = $spec{output};
++
++  $spec{def_file}  &&= '-def:'      . $spec{def_file};
++  $spec{output}    &&= '-out:'      . $spec{output};
++  $spec{manifest}  &&= '-manifest ' . $spec{manifest};
++  $spec{implib}    &&= '-implib:'   . $spec{implib};
++  $spec{map_file}  &&= '-map:'      . $spec{map_file};
++
++  %spec = $self->write_linker_script(%spec)
++    if $spec{use_scripts};
++
++  my @cmds; # Stores the series of commands needed to build the module.
++
++  push @cmds, [ grep {defined && length} (
++    $spec{ld}               ,
++    @{$spec{lddlflags}}     ,
++    @{$spec{libpath}}       ,
++    @{$spec{other_ldflags}} ,
++    @{$spec{startup}}       ,
++    @{$spec{objects}}       ,
++    $spec{map_file}         ,
++    $spec{libperl}          ,
++    @{$spec{perllibs}}      ,
++    $spec{def_file}         ,
++    $spec{implib}           ,
++    $spec{output}           ,
++  ) ];
++
++  # Embed the manifest file if it exists
++  push @cmds, [
++    'if', 'exist', $spec{manifest}, 'mt', '-nologo', $spec{manifest}, '-outputresource:' . "$output;2"
++  ];
++
++  return @cmds;
++}
++
++sub write_linker_script {
++  my ($self, %spec) = @_;
++
++  my $script = File::Spec->catfile( $spec{srcdir},
++                                    $spec{basename} . '.lds' );
++
++  $self->add_to_cleanup($script);
++
++  print "Generating script '$script'\n" if !$self->{quiet};
++
++  my $SCRIPT = IO::File->new( ">$script" )
++    or die( "Could not create script '$script': $!" );
++
++  print $SCRIPT join( "\n",
++    map { ref $_ ? @{$_} : $_ }
++    grep defined,
++    delete(
++      @spec{ qw(lddlflags libpath other_ldflags
++                startup objects libperl perllibs
++                def_file implib map_file)            } )
++  );
++
++  push @{$spec{lddlflags}}, '@"' . $script . '"';
++
++  return %spec;
++}
++
++1;
++
++
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Windows.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Windows.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/Windows.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/Windows.pm	2009-12-01 10:38:49.000000000 +0100
+@@ -10,16 +10,36 @@
+ use IO::File;
  
  use vars qw($VERSION @ISA);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  @ISA = qw(ExtUtils::CBuilder::Base);
  
++=begin comment
++
++The compiler-specific packages implement functions for generating properly
++formatted commandlines for the compiler being used. Each package
++defines two primary functions 'format_linker_cmd()' &
++'format_compiler_cmd()' that accepts a list of named arguments (a
++hash) and returns a list of formatted options suitable for invoking the
++compiler. By default, if the compiler supports scripting of its
++operation then a script file is built containing the options while
++those options are removed from the commandline, and a reference to the
++script is pushed onto the commandline in their place. Scripting the
++compiler in this way helps to avoid the problems associated with long
++commandlines under some shells.
++
++=end comment
++
++=cut
++
  sub new {
-@@ -33,61 +34,24 @@
- }
+   my $class = shift;
+   my $self = $class->SUPER::new(@_);
+   my $cf = $self->{config};
  
- sub split_like_shell {
--  # As it turns out, Windows command-parsing is very different from
--  # Unix command-parsing.  Double-quotes mean different things,
--  # backslashes don't necessarily mean escapes, and so on.  So we
--  # can't use Text::ParseWords::shellwords() to break a command string
--  # into words.  The algorithm below was bashed out by Randy and Ken
--  # (mostly Randy), and there are a lot of regression tests, so we
--  # should feel free to adjust if desired.
--  
-+  # Since Windows will pass the whole command string (not an argument
-+  # array) to the target program and make the program parse it itself,
-+  # we don't actually need to do any processing here.
-   (my $self, local $_) = @_;
-   
-   return @$_ if defined() && UNIVERSAL::isa($_, 'ARRAY');
--  
--  my @argv;
--  return @argv unless defined() && length();
--  
--  my $arg = '';
--  my( $i, $quote_mode ) = ( 0, 0 );
--  
--  while ( $i < length() ) {
--    
--    my $ch      = substr( $_, $i  , 1 );
--    my $next_ch = substr( $_, $i+1, 1 );
--    
--    if ( $ch eq '\\' && $next_ch eq '"' ) {
--      $arg .= '"';
--      $i++;
--    } elsif ( $ch eq '\\' && $next_ch eq '\\' ) {
--      $arg .= '\\';
--      $i++;
--    } elsif ( $ch eq '"' && $next_ch eq '"' && $quote_mode ) {
--      $quote_mode = !$quote_mode;
--      $arg .= '"';
--      $i++;
--    } elsif ( $ch eq '"' && $next_ch eq '"' && !$quote_mode &&
--	      ( $i + 2 == length()  ||
--		substr( $_, $i + 2, 1 ) eq ' ' )
--	    ) { # for cases like: a"" => [ 'a' ]
--      push( @argv, $arg );
--      $arg = '';
--      $i += 2;
--    } elsif ( $ch eq '"' ) {
--      $quote_mode = !$quote_mode;
--    } elsif ( $ch eq ' ' && !$quote_mode ) {
--      push( @argv, $arg ) if $arg;
--      $arg = '';
--      ++$i while substr( $_, $i + 1, 1 ) eq ' ';
--    } else {
--      $arg .= $ch;
--    }
--    
--    $i++;
--  }
--  
--  push( @argv, $arg ) if defined( $arg ) && length( $arg );
--  return @argv;
-+  return unless defined() && length();
-+  return ($_);
-+}
-+
-+sub do_system {
-+  # See above
-+  my $self = shift;
-+  my $cmd = join(" ",
-+		 grep length,
-+		 map {$a=$_;$a=~s/\t/ /g;$a=~s/^\s+|\s+$//;$a}
-+		 grep defined, @_);
-+  return $self->SUPER::do_system($cmd);
- }
- 
- sub arg_defines {
-@@ -119,7 +83,7 @@
-     cflags      => [
-                      $self->split_like_shell($cf->{ccflags}),
-                      $self->split_like_shell($cf->{cccdlflags}),
--                     $self->split_like_shell($cf->{extra_compiler_flags}),
-+                     $self->split_like_shell($args{extra_compiler_flags}),
-                    ],
-     optimize    => [ $self->split_like_shell($cf->{optimize})    ],
-     defines     => \@defines,
-@@ -329,18 +293,16 @@
-   $self->add_to_cleanup($script);
-   print "Generating script '$script'\n" if !$self->{quiet};
+   # Inherit from an appropriate compiler driver class
+-  unshift @ISA, "ExtUtils::CBuilder::Platform::Windows::" . $self->_compiler_type;
++  my $driver = "ExtUtils::CBuilder::Platform::Windows::" . $self->_compiler_type;
++  eval "require $driver" or die "Could not load compiler driver: $@";
++  unshift @ISA, $driver;
  
--  open( SCRIPT, ">$script" )
-+  my $SCRIPT = IO::File->new( ">$script" )
-     or die( "Could not create script '$script': $!" );
+   return $self;
+ }
+@@ -238,422 +258,6 @@
  
--  print SCRIPT join( "\n",
-+  print $SCRIPT join( "\n",
-     map { ref $_ ? @{$_} : $_ }
-     grep defined,
-     delete(
-       @spec{ qw(includes cflags optimize defines perlinc) } )
-   );
+ 1;
  
--  close SCRIPT;
+-########################################################################
 -
-   push @{$spec{includes}}, '@"' . $script . '"';
- 
-   return %spec;
-@@ -402,10 +364,10 @@
- 
-   print "Generating script '$script'\n" if !$self->{quiet};
- 
--  open( SCRIPT, ">$script" )
-+  my $SCRIPT = IO::File->new( ">$script" )
-     or die( "Could not create script '$script': $!" );
- 
--  print SCRIPT join( "\n",
-+  print $SCRIPT join( "\n",
-     map { ref $_ ? @{$_} : $_ }
-     grep defined,
-     delete(
-@@ -414,8 +376,6 @@
-                 def_file implib map_file)            } )
-   );
- 
--  close SCRIPT;
+-=begin comment
 -
-   push @{$spec{lddlflags}}, '@"' . $script . '"';
- 
-   return %spec;
-@@ -459,7 +419,7 @@
- 
-   print "Generating script '$script'\n" if !$self->{quiet};
- 
--  open( SCRIPT, ">$script" )
-+  my $SCRIPT = IO::File->new( ">$script" )
-     or die( "Could not create script '$script': $!" );
- 
-   # XXX Borland "response files" seem to be unable to accept macro
-@@ -467,15 +427,13 @@
-   # backslash doesn't work, and any level of quotes are stripped. The
-   # result is is a floating point number in the source file where a
-   # string is expected. So we leave the macros on the command line.
--  print SCRIPT join( "\n",
-+  print $SCRIPT join( "\n",
-     map { ref $_ ? @{$_} : $_ }
-     grep defined,
-     delete(
-       @spec{ qw(includes cflags optimize perlinc) } )
-   );
- 
--  close SCRIPT;
--
-   push @{$spec{includes}}, '@"' . $script . '"';
- 
-   return %spec;
-@@ -525,29 +483,25 @@
-   print "Generating scripts '$ld_script' and '$ld_libs'.\n" if !$self->{quiet};
- 
-   # Script 1: contains options & names of object files.
--  open( LD_SCRIPT, ">$ld_script" )
-+  my $LD_SCRIPT = IO::File->new( ">$ld_script" )
-     or die( "Could not create linker script '$ld_script': $!" );
- 
--  print LD_SCRIPT join( " +\n",
-+  print $LD_SCRIPT join( " +\n",
-     map { @{$_} }
-     grep defined,
-     delete(
-       @spec{ qw(lddlflags libpath other_ldflags startup objects) } )
-   );
- 
--  close LD_SCRIPT;
+-The packages below implement functions for generating properly
+-formatted commandlines for the compiler being used. Each package
+-defines two primary functions 'format_linker_cmd()' &
+-'format_compiler_cmd()' that accepts a list of named arguments (a
+-hash) and returns a list of formatted options suitable for invoking the
+-compiler. By default, if the compiler supports scripting of its
+-operation then a script file is built containing the options while
+-those options are removed from the commandline, and a reference to the
+-script is pushed onto the commandline in their place. Scripting the
+-compiler in this way helps to avoid the problems associated with long
+-commandlines under some shells.
 -
-   # Script 2: contains name of libs to link against.
--  open( LD_LIBS, ">$ld_libs" )
-+  my $LD_LIBS = IO::File->new( ">$ld_libs" )
-     or die( "Could not create linker script '$ld_libs': $!" );
- 
--  print LD_LIBS join( " +\n",
-+  print $LD_LIBS join( " +\n",
-      (delete $spec{libperl}  || ''),
-     @{delete $spec{perllibs} || []},
-   );
- 
--  close LD_LIBS;
+-=end comment
 -
-   push @{$spec{lddlflags}}, '@"' . $ld_script  . '"';
-   push @{$spec{perllibs}},  '@"' . $ld_libs    . '"';
- 
-@@ -669,32 +623,30 @@
- 
-   print "Generating script '$script'\n" if !$self->{quiet};
- 
--  open( SCRIPT, ">$script" )
-+  my $SCRIPT = IO::File->new( ">$script" )
-     or die( "Could not create script '$script': $!" );
- 
--  print( SCRIPT 'SEARCH_DIR(' . $_ . ")\n" )
-+  print $SCRIPT ( 'SEARCH_DIR(' . $_ . ")\n" )
-     for @{delete $spec{libpath} || []};
- 
-   # gcc takes only one startup file, so the first object in startup is
-   # specified as the startup file and any others are shifted into the
-   # beginning of the list of objects.
-   if ( $spec{startup} && @{$spec{startup}} ) {
--    print SCRIPT 'STARTUP(' . shift( @{$spec{startup}} ) . ")\n";
-+    print $SCRIPT 'STARTUP(' . shift( @{$spec{startup}} ) . ")\n";
-     unshift @{$spec{objects}},
-       @{delete $spec{startup} || []};
-   }
- 
--  print SCRIPT 'INPUT(' . join( ',',
-+  print $SCRIPT 'INPUT(' . join( ',',
-     @{delete $spec{objects}  || []}
-   ) . ")\n";
+-=cut
+-
+-########################################################################
+-package ExtUtils::CBuilder::Platform::Windows::MSVC;
+-
+-sub format_compiler_cmd {
+-  my ($self, %spec) = @_;
+-
+-  foreach my $path ( @{ $spec{includes} || [] },
+-                     @{ $spec{perlinc}  || [] } ) {
+-    $path = '-I' . $path;
+-  }
+-
+-  %spec = $self->write_compiler_script(%spec)
+-    if $spec{use_scripts};
+-
+-  return [ grep {defined && length} (
+-    $spec{cc},'-nologo','-c',
+-    @{$spec{includes}}      ,
+-    @{$spec{cflags}}        ,
+-    @{$spec{optimize}}      ,
+-    @{$spec{defines}}       ,
+-    @{$spec{perlinc}}       ,
+-    "-Fo$spec{output}"      ,
+-    $spec{source}           ,
+-  ) ];
+-}
+-
+-sub write_compiler_script {
+-  my ($self, %spec) = @_;
+-
+-  my $script = File::Spec->catfile( $spec{srcdir},
+-                                    $spec{basename} . '.ccs' );
+-
+-  $self->add_to_cleanup($script);
+-  print "Generating script '$script'\n" if !$self->{quiet};
+-
+-  my $SCRIPT = IO::File->new( ">$script" )
+-    or die( "Could not create script '$script': $!" );
+-
+-  print $SCRIPT join( "\n",
+-    map { ref $_ ? @{$_} : $_ }
+-    grep defined,
+-    delete(
+-      @spec{ qw(includes cflags optimize defines perlinc) } )
+-  );
+-
+-  push @{$spec{includes}}, '@"' . $script . '"';
+-
+-  return %spec;
+-}
+-
+-sub format_linker_cmd {
+-  my ($self, %spec) = @_;
+-  my $cf = $self->{config};
+-
+-  foreach my $path ( @{$spec{libpath}} ) {
+-    $path = "-libpath:$path";
+-  }
+-
+-  my $output = $spec{output};
+-
+-  $spec{def_file}  &&= '-def:'      . $spec{def_file};
+-  $spec{output}    &&= '-out:'      . $spec{output};
+-  $spec{manifest}  &&= '-manifest ' . $spec{manifest};
+-  $spec{implib}    &&= '-implib:'   . $spec{implib};
+-  $spec{map_file}  &&= '-map:'      . $spec{map_file};
+-
+-  %spec = $self->write_linker_script(%spec)
+-    if $spec{use_scripts};
+-
+-  my @cmds; # Stores the series of commands needed to build the module.
+-
+-  push @cmds, [ grep {defined && length} (
+-    $spec{ld}               ,
+-    @{$spec{lddlflags}}     ,
+-    @{$spec{libpath}}       ,
+-    @{$spec{other_ldflags}} ,
+-    @{$spec{startup}}       ,
+-    @{$spec{objects}}       ,
+-    $spec{map_file}         ,
+-    $spec{libperl}          ,
+-    @{$spec{perllibs}}      ,
+-    $spec{def_file}         ,
+-    $spec{implib}           ,
+-    $spec{output}           ,
+-  ) ];
+-
+-  # Embed the manifest file for VC 2005 (aka VC 8) or higher, but not for the 64-bit Platform SDK compiler
+-  if ($cf->{ivsize} == 4 && $cf->{cc} eq 'cl' and $cf->{ccversion} =~ /^(\d+)/ and $1 >= 14) {
+-    push @cmds, [
+-      'if', 'exist', $spec{manifest}, 'mt', '-nologo', $spec{manifest}, '-outputresource:' . "$output;2"
+-    ];
+-  }
+-
+-  return @cmds;
+-}
+-
+-sub write_linker_script {
+-  my ($self, %spec) = @_;
+-
+-  my $script = File::Spec->catfile( $spec{srcdir},
+-                                    $spec{basename} . '.lds' );
+-
+-  $self->add_to_cleanup($script);
+-
+-  print "Generating script '$script'\n" if !$self->{quiet};
+-
+-  my $SCRIPT = IO::File->new( ">$script" )
+-    or die( "Could not create script '$script': $!" );
+-
+-  print $SCRIPT join( "\n",
+-    map { ref $_ ? @{$_} : $_ }
+-    grep defined,
+-    delete(
+-      @spec{ qw(lddlflags libpath other_ldflags
+-                startup objects libperl perllibs
+-                def_file implib map_file)            } )
+-  );
+-
+-  push @{$spec{lddlflags}}, '@"' . $script . '"';
+-
+-  return %spec;
+-}
+-
+-1;
+-
+-########################################################################
+-package ExtUtils::CBuilder::Platform::Windows::BCC;
+-
+-sub format_compiler_cmd {
+-  my ($self, %spec) = @_;
+-
+-  foreach my $path ( @{ $spec{includes} || [] },
+-                     @{ $spec{perlinc}  || [] } ) {
+-    $path = '-I' . $path;
+-  }
+-
+-  %spec = $self->write_compiler_script(%spec)
+-    if $spec{use_scripts};
+-
+-  return [ grep {defined && length} (
+-    $spec{cc}, '-c'         ,
+-    @{$spec{includes}}      ,
+-    @{$spec{cflags}}        ,
+-    @{$spec{optimize}}      ,
+-    @{$spec{defines}}       ,
+-    @{$spec{perlinc}}       ,
+-    "-o$spec{output}"       ,
+-    $spec{source}           ,
+-  ) ];
+-}
+-
+-sub write_compiler_script {
+-  my ($self, %spec) = @_;
+-
+-  my $script = File::Spec->catfile( $spec{srcdir},
+-                                    $spec{basename} . '.ccs' );
+-
+-  $self->add_to_cleanup($script);
+-
+-  print "Generating script '$script'\n" if !$self->{quiet};
+-
+-  my $SCRIPT = IO::File->new( ">$script" )
+-    or die( "Could not create script '$script': $!" );
+-
+-  # XXX Borland "response files" seem to be unable to accept macro
+-  # definitions containing quoted strings. Escaping strings with
+-  # backslash doesn't work, and any level of quotes are stripped. The
+-  # result is is a floating point number in the source file where a
+-  # string is expected. So we leave the macros on the command line.
+-  print $SCRIPT join( "\n",
+-    map { ref $_ ? @{$_} : $_ }
+-    grep defined,
+-    delete(
+-      @spec{ qw(includes cflags optimize perlinc) } )
+-  );
+-
+-  push @{$spec{includes}}, '@"' . $script . '"';
+-
+-  return %spec;
+-}
+-
+-sub format_linker_cmd {
+-  my ($self, %spec) = @_;
+-
+-  foreach my $path ( @{$spec{libpath}} ) {
+-    $path = "-L$path";
+-  }
+-
+-  push( @{$spec{startup}}, 'c0d32.obj' )
+-    unless ( $spec{starup} && @{$spec{startup}} );
+-
+-  %spec = $self->write_linker_script(%spec)
+-    if $spec{use_scripts};
+-
+-  return [ grep {defined && length} (
+-    $spec{ld}               ,
+-    @{$spec{lddlflags}}     ,
+-    @{$spec{libpath}}       ,
+-    @{$spec{other_ldflags}} ,
+-    @{$spec{startup}}       ,
+-    @{$spec{objects}}       , ',',
+-    $spec{output}           , ',',
+-    $spec{map_file}         , ',',
+-    $spec{libperl}          ,
+-    @{$spec{perllibs}}      , ',',
+-    $spec{def_file}
+-  ) ];
+-}
+-
+-sub write_linker_script {
+-  my ($self, %spec) = @_;
+-
+-  # To work around Borlands "unique" commandline syntax,
+-  # two scripts are used:
+-
+-  my $ld_script = File::Spec->catfile( $spec{srcdir},
+-                                       $spec{basename} . '.lds' );
+-  my $ld_libs   = File::Spec->catfile( $spec{srcdir},
+-                                       $spec{basename} . '.lbs' );
+-
+-  $self->add_to_cleanup($ld_script, $ld_libs);
+-
+-  print "Generating scripts '$ld_script' and '$ld_libs'.\n" if !$self->{quiet};
+-
+-  # Script 1: contains options & names of object files.
+-  my $LD_SCRIPT = IO::File->new( ">$ld_script" )
+-    or die( "Could not create linker script '$ld_script': $!" );
+-
+-  print $LD_SCRIPT join( " +\n",
+-    map { @{$_} }
+-    grep defined,
+-    delete(
+-      @spec{ qw(lddlflags libpath other_ldflags startup objects) } )
+-  );
+-
+-  # Script 2: contains name of libs to link against.
+-  my $LD_LIBS = IO::File->new( ">$ld_libs" )
+-    or die( "Could not create linker script '$ld_libs': $!" );
+-
+-  print $LD_LIBS join( " +\n",
+-     (delete $spec{libperl}  || ''),
+-    @{delete $spec{perllibs} || []},
+-  );
+-
+-  push @{$spec{lddlflags}}, '@"' . $ld_script  . '"';
+-  push @{$spec{perllibs}},  '@"' . $ld_libs    . '"';
+-
+-  return %spec;
+-}
+-
+-1;
+-
+-########################################################################
+-package ExtUtils::CBuilder::Platform::Windows::GCC;
+-
+-sub format_compiler_cmd {
+-  my ($self, %spec) = @_;
+-
+-  foreach my $path ( @{ $spec{includes} || [] },
+-                     @{ $spec{perlinc}  || [] } ) {
+-    $path = '-I' . $path;
+-  }
+-
+-  # split off any -arguments included in cc
+-  my @cc = split / (?=-)/, $spec{cc};
+-
+-  return [ grep {defined && length} (
+-    @cc, '-c'               ,
+-    @{$spec{includes}}      ,
+-    @{$spec{cflags}}        ,
+-    @{$spec{optimize}}      ,
+-    @{$spec{defines}}       ,
+-    @{$spec{perlinc}}       ,
+-    '-o', $spec{output}     ,
+-    $spec{source}           ,
+-  ) ];
+-}
+-
+-sub format_linker_cmd {
+-  my ($self, %spec) = @_;
+-
+-  # The Config.pm variable 'libperl' is hardcoded to the full name
+-  # of the perl import library (i.e. 'libperl56.a'). GCC will not
+-  # find it unless the 'lib' prefix & the extension are stripped.
+-  $spec{libperl} =~ s/^(?:lib)?([^.]+).*$/-l$1/;
+-
+-  unshift( @{$spec{other_ldflags}}, '-nostartfiles' )
+-    if ( $spec{startup} && @{$spec{startup}} );
+-
+-  # From ExtUtils::MM_Win32:
+-  #
+-  ## one thing for GCC/Mingw32:
+-  ## we try to overcome non-relocateable-DLL problems by generating
+-  ##    a (hopefully unique) image-base from the dll's name
+-  ## -- BKS, 10-19-1999
+-  File::Basename::basename( $spec{output} ) =~ /(....)(.{0,4})/;
+-  $spec{image_base} = sprintf( "0x%x0000", unpack('n', $1 ^ $2) );
+-
+-  %spec = $self->write_linker_script(%spec)
+-    if $spec{use_scripts};
+-
+-  foreach my $path ( @{$spec{libpath}} ) {
+-    $path = "-L$path";
+-  }
+-
+-  my @cmds; # Stores the series of commands needed to build the module.
+-
+-  push @cmds, [
+-    'dlltool', '--def'        , $spec{def_file},
+-               '--output-exp' , $spec{explib}
+-  ];
+-
+-  # split off any -arguments included in ld
+-  my @ld = split / (?=-)/, $spec{ld};
+-
+-  push @cmds, [ grep {defined && length} (
+-    @ld                       ,
+-    '-o', $spec{output}       ,
+-    "-Wl,--base-file,$spec{base_file}"   ,
+-    "-Wl,--image-base,$spec{image_base}" ,
+-    @{$spec{lddlflags}}       ,
+-    @{$spec{libpath}}         ,
+-    @{$spec{startup}}         ,
+-    @{$spec{objects}}         ,
+-    @{$spec{other_ldflags}}   ,
+-    $spec{libperl}            ,
+-    @{$spec{perllibs}}        ,
+-    $spec{explib}             ,
+-    $spec{map_file} ? ('-Map', $spec{map_file}) : ''
+-  ) ];
+-
+-  push @cmds, [
+-    'dlltool', '--def'        , $spec{def_file},
+-               '--output-exp' , $spec{explib},
+-               '--base-file'  , $spec{base_file}
+-  ];
+-
+-  push @cmds, [ grep {defined && length} (
+-    @ld                       ,
+-    '-o', $spec{output}       ,
+-    "-Wl,--image-base,$spec{image_base}" ,
+-    @{$spec{lddlflags}}       ,
+-    @{$spec{libpath}}         ,
+-    @{$spec{startup}}         ,
+-    @{$spec{objects}}         ,
+-    @{$spec{other_ldflags}}   ,
+-    $spec{libperl}            ,
+-    @{$spec{perllibs}}        ,
+-    $spec{explib}             ,
+-    $spec{map_file} ? ('-Map', $spec{map_file}) : ''
+-  ) ];
+-
+-  return @cmds;
+-}
+-
+-sub write_linker_script {
+-  my ($self, %spec) = @_;
+-
+-  my $script = File::Spec->catfile( $spec{srcdir},
+-                                    $spec{basename} . '.lds' );
+-
+-  $self->add_to_cleanup($script);
+-
+-  print "Generating script '$script'\n" if !$self->{quiet};
+-
+-  my $SCRIPT = IO::File->new( ">$script" )
+-    or die( "Could not create script '$script': $!" );
+-
+-  print $SCRIPT ( 'SEARCH_DIR(' . $_ . ")\n" )
+-    for @{delete $spec{libpath} || []};
+-
+-  # gcc takes only one startup file, so the first object in startup is
+-  # specified as the startup file and any others are shifted into the
+-  # beginning of the list of objects.
+-  if ( $spec{startup} && @{$spec{startup}} ) {
+-    print $SCRIPT 'STARTUP(' . shift( @{$spec{startup}} ) . ")\n";
+-    unshift @{$spec{objects}},
+-      @{delete $spec{startup} || []};
+-  }
+-
+-  print $SCRIPT 'INPUT(' . join( ',',
+-    @{delete $spec{objects}  || []}
+-  ) . ")\n";
+-
+-  print $SCRIPT 'INPUT(' . join( ' ',
+-     (delete $spec{libperl}  || ''),
+-    @{delete $spec{perllibs} || []},
+-  ) . ")\n";
+-
+-  push @{$spec{other_ldflags}}, '"' . $script . '"';
+-
+-  return %spec;
+-}
+-
+-1;
+-
+ __END__
  
--  print SCRIPT 'INPUT(' . join( ' ',
-+  print $SCRIPT 'INPUT(' . join( ' ',
-      (delete $spec{libperl}  || ''),
-     @{delete $spec{perllibs} || []},
-   ) . ")\n";
- 
--  close SCRIPT;
--
-   push @{$spec{other_ldflags}}, '"' . $script . '"';
- 
-   return %spec;
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/aix.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/aix.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/aix.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/aix.pm	2009-03-11 20:12:36.000000000 +0100
+ =head1 NAME
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/aix.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/aix.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/aix.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/aix.pm	2009-12-01 10:38:49.000000000 +0100
 @@ -5,7 +5,7 @@
  use File::Spec;
  
  use vars qw($VERSION @ISA);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
  
  sub need_prelink { 1 }
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/cygwin.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/cygwin.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/cygwin.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/cygwin.pm	2009-03-11 20:12:36.000000000 +0100
-@@ -5,7 +5,7 @@
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/cygwin.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/cygwin.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/cygwin.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/cygwin.pm	2009-12-01 10:38:49.000000000 +0100
+@@ -5,13 +5,16 @@
  use ExtUtils::CBuilder::Platform::Unix;
  
  use vars qw($VERSION @ISA);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
  
++# TODO: If a specific exe_file name is requested, if the exe created
++# doesn't have that name, we might want to rename it.  Apparently asking
++# for an exe of "foo" might result in "foo.exe".  Alternatively, we should
++# make sure the return value is correctly "foo.exe".
++# C.f http://rt.cpan.org/Public/Bug/Display.html?id=41003
  sub link_executable {
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/darwin.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/darwin.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/darwin.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/darwin.pm	2009-03-11 20:12:36.000000000 +0100
+   my $self = shift;
+-  # $Config{ld} is okay. Circumvent the Unix ld=cc override in the superclass.
+-  local $self->{config}{cc} = $self->{config}{ld};
+   return $self->SUPER::link_executable(@_);
+ }
+ 
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/darwin.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/darwin.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/darwin.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/darwin.pm	2009-12-01 10:38:49.000000000 +0100
 @@ -4,7 +4,7 @@
  use ExtUtils::CBuilder::Platform::Unix;
  
  use vars qw($VERSION @ISA);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
  
  sub compile {
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/dec_osf.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/dec_osf.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/dec_osf.pm	2009-03-11 20:12:36.000000000 +0100
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/dec_osf.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/dec_osf.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/dec_osf.pm	2009-12-01 10:38:49.000000000 +0100
 @@ -6,7 +6,7 @@
  
  use vars qw($VERSION @ISA);
  @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  
  sub link_executable {
    my $self = shift;
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/os2.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/os2.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/os2.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/os2.pm	2009-03-11 20:12:36.000000000 +0100
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/os2.pm perl-5.10.1/lib/ExtUtils/CBuilder/Platform/os2.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/Platform/os2.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/Platform/os2.pm	2009-12-01 10:38:49.000000000 +0100
 @@ -4,7 +4,7 @@
  use ExtUtils::CBuilder::Platform::Unix;
  
  use vars qw($VERSION @ISA);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
  
  sub need_prelink { 1 }
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/t/01-basic.t perl-5.10.0/lib/ExtUtils/CBuilder/t/01-basic.t
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder/t/01-basic.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder/t/01-basic.t	2009-03-11 20:08:15.000000000 +0100
-@@ -53,6 +53,16 @@
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/t/00-have-compiler.t perl-5.10.1/lib/ExtUtils/CBuilder/t/00-have-compiler.t
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/t/00-have-compiler.t	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/t/00-have-compiler.t	2009-12-01 10:39:10.000000000 +0100
+@@ -4,12 +4,6 @@
+ my $perl;
+ BEGIN {
+   $perl = File::Spec->rel2abs($^X);
+-  if ($ENV{PERL_CORE}) {
+-    chdir 't' if -d 't';
+-    chdir '../lib/ExtUtils/CBuilder'
+-      or die "Can't chdir to lib/ExtUtils/CBuilder: $!";
+-    @INC = qw(../..);
+-  }
  }
  
- my @words = $b->split_like_shell(' foo bar');
--ok @words, 2;
--ok $words[0], 'foo';
--ok $words[1], 'bar';
-+
-+skip(
-+    $^O =~ m/MSWin/ ? "Skip under MSWindows" : 0,  # whether to skip
-+    @words, 2
-+  );
-+skip(
-+    $^O =~ m/MSWin/ ? "Skip under MSWindows" : 0,  # whether to skip
-+    $words[0], 'foo'
-+);
-+skip(
-+    $^O =~ m/MSWin/ ? "Skip under MSWindows" : 0,  # whether to skip
-+    $words[1], 'bar'
-+);
-diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder.pm perl-5.10.0/lib/ExtUtils/CBuilder.pm
---- perl-5.10.0.orig/lib/ExtUtils/CBuilder.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/ExtUtils/CBuilder.pm	2009-03-11 20:12:36.000000000 +0100
+ use strict;
+@@ -22,22 +16,30 @@
+   }
+ }
+ 
+-plan tests => 4;
++plan tests => 6;
+ 
+ require_ok "ExtUtils::CBuilder";
+ 
+ my $b = eval { ExtUtils::CBuilder->new(quiet => 1) };
+ ok( $b, "got CBuilder object" ) or diag $@;
+ 
++my $bogus_path = 'djaadjfkadjkfajdf';
++my $run_perl = "$perl -e1 --";
+ # test missing compiler
+-$b->{config}{cc} = 'djaadjfkadjkfajdf';
+-$b->{config}{ld} = 'djaadjfkadjkfajdf';
++$b->{config}{cc} = $bogus_path;
++$b->{config}{ld} = $bogus_path;
++
++$b->{have_compiler} = undef;
+ is( $b->have_compiler, 0, "have_compiler: fake missing cc" );
++$b->{have_compiler} = undef;
++is( $b->have_cplusplus, 0, "have_cplusplus: fake missing c++" );
+ 
+ # test found compiler
++$b->{config}{cc} = $run_perl;
++$b->{config}{ld} = $run_perl;
+ $b->{have_compiler} = undef;
+-$b->{config}{cc} = "$perl -e1 --";
+-$b->{config}{ld} = "$perl -e1 --";
+ is( $b->have_compiler, 1, "have_compiler: fake present cc" );
++$b->{have_compiler} = undef;
++is( $b->have_cplusplus, 1, "have_cpp_compiler: fake present c++" );
+ 
+-
++# test missing cpp compiler
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/t/02-link.t perl-5.10.1/lib/ExtUtils/CBuilder/t/02-link.t
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/t/02-link.t	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/t/02-link.t	2009-12-02 12:08:01.000000000 +0100
+@@ -35,7 +35,7 @@
+   plan skip_all => "no compiler available for testing";
+ }
+ else {
+-  plan tests => 7;
++  plan tests => 8;
+ }
+ 
+ ok $b, "created EU::CB object";
+@@ -56,13 +56,14 @@
+ 
+ # Link
+ SKIP: {
+-  skip "error compiling source", 3
++  skip "error compiling source", 4
+     unless -e $object_file;
+ 
+   my @temps;
+   eval { ($exe_file, @temps) = $b->link_executable(objects => $object_file) };
+   is $@, q{}, "no exception from linking";
+   ok -e $exe_file, "found executable file";
++  ok -x $exe_file, "executable file appears to be executable";
+ 
+   if ($^O eq 'os2') {		# Analogue of LDLOADPATH...
+           # Actually, not needed now, since we do not link with the generated DLL
+@@ -74,9 +75,9 @@
+ 
+   # Try the executable
+   my $ec = my_system($exe_file);
+-  is $ec, 11, "got expected exit code from executable"
+-    or print( $? == -1 ? "# Could not run '$exe_file'\n" 
+-                      : "# Unexpected exit code '$ec'\n");
++  is( $ec, 11, "got expected exit code from executable" )
++    or diag( $ec == -1 ? "Could not run '$exe_file': $!\n" 
++                       : "Unexpected exit code '$ec'\n");
+ }
+ 
+ # Clean up
+@@ -92,8 +93,10 @@
+ 
+ sub my_system {
+   my $cmd = shift;
++  my $ec;
+   if ($^O eq 'VMS') {
+-    return system("mcr $cmd");
++    $ec = system("mcr $cmd");
+   }
+-  return system($cmd) >> 8;
++  $ec = system($cmd);
++  return $ec == -1 ? -1 : $ec >> 8;
+ }
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder/t/03-cplusplus.t perl-5.10.1/lib/ExtUtils/CBuilder/t/03-cplusplus.t
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder/t/03-cplusplus.t	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder/t/03-cplusplus.t	2009-12-02 12:08:01.000000000 +0100
+@@ -0,0 +1,73 @@
++#! perl -w
++
++BEGIN {
++  if ($ENV{PERL_CORE}) {
++    chdir 't' if -d 't';
++    chdir '../lib/ExtUtils/CBuilder'
++      or die "Can't chdir to lib/ExtUtils/CBuilder: $!";
++    @INC = qw(../..);
++  }
++}
++
++use strict;
++use Test::More;
++BEGIN { 
++  if ($^O eq 'VMS') {
++    # So we can get the return value of system()
++    require vmsish;
++    import vmsish;
++  }
++}
++use ExtUtils::CBuilder;
++use File::Spec;
++
++# TEST doesn't like extraneous output
++my $quiet = $ENV{PERL_CORE} && !$ENV{HARNESS_ACTIVE};
++my ($source_file, $object_file, $lib_file);
++
++my $b = ExtUtils::CBuilder->new(quiet => $quiet);
++
++# test plan
++if ( ! $b->have_cplusplus ) {
++  plan skip_all => "no compiler available for testing";
++}
++else {
++  plan tests => 7;
++}
++
++ok $b, "created EU::CB object";
++
++ok $b->have_cplusplus, "have_cplusplus";
++
++$source_file = File::Spec->catfile('t', 'compilet.cc');
++{
++  local *FH;
++  open FH, "> $source_file" or die "Can't create $source_file: $!";
++  print FH "class Bogus { public: int boot_compilet() { return 1; } };\n";
++  close FH;
++}
++ok -e $source_file, "source file '$source_file' created";
++
++$object_file = $b->object_file($source_file);
++ok 1;
++
++is $object_file, $b->compile(source => $source_file, 'C++' => 1);
++
++$lib_file = $b->lib_file($object_file);
++ok 1;
++
++my ($lib, @temps) = $b->link(objects => $object_file,
++                             module_name => 'compilet');
++$lib =~ tr/"'//d;
++is $lib_file, $lib;
++
++for ($source_file, $object_file, $lib_file) {
++  tr/"'//d;
++  1 while unlink;
++}
++
++if ($^O eq 'VMS') {
++   1 while unlink 'COMPILET.LIS';
++   1 while unlink 'COMPILET.OPT';
++}
++
+diff -urN perl-5.10.1.orig/lib/ExtUtils/CBuilder.pm perl-5.10.1/lib/ExtUtils/CBuilder.pm
+--- perl-5.10.1.orig/lib/ExtUtils/CBuilder.pm	2009-12-02 11:59:51.000000000 +0100
++++ perl-5.10.1/lib/ExtUtils/CBuilder.pm	2009-12-01 10:38:49.000000000 +0100
 @@ -5,7 +5,7 @@
  use File::Basename ();
  
  use vars qw($VERSION @ISA);
--$VERSION = '0.21';
-+$VERSION = '0.24';
+-$VERSION = '0.2602';
++$VERSION = '0.27';
  $VERSION = eval $VERSION;
  
  # Okay, this is the brute-force method of finding out what kind of
-@@ -36,6 +36,8 @@
- 		 sunos     Unix
- 		 cygwin    Unix
- 		 os2       Unix
-+		 gnu       Unix
-+		 gnukfreebsd Unix
- 		 
- 		 dos       Windows
- 		 MSWin32   Windows
+@@ -133,6 +133,10 @@
+ link a sample C library.  The sample will be compiled in the system
+ tempdir or, if that fails for some reason, in the current directory.
+ 
++=item have_cplusplus
++
++Just like have_compiler but for C++ instead of C.
++
+ =item compile
+ 
+ Compiles a C source file and produces an object file.  The name of the
+@@ -161,6 +165,11 @@
+ this is not possible, as a string containing all the arguments
+ together.
+ 
++=item C<C++>
++
++Specifies that the source file is a C++ source file and sets appropriate
++compiler flags
++
+ =back
+ 
+ The operation of this method is also affected by the

perl-update-File-Path.patch:
 Path.pm |   95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 Path.t  |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 172 insertions(+), 13 deletions(-)

Index: perl-update-File-Path.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl-update-File-Path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-update-File-Path.patch	11 Mar 2009 21:12:37 -0000	1.1
+++ perl-update-File-Path.patch	3 Dec 2009 11:37:17 -0000	1.2
@@ -1,1215 +1,287 @@
-File-Path-2.07
+File-Path-2.08
 
-diff -urN perl-5.10.0.orig/lib/File/Path.pm perl-5.10.0/lib/File/Path.pm
---- perl-5.10.0.orig/lib/File/Path.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Path.pm	2009-02-17 14:50:05.000000000 +0100
-@@ -16,13 +16,14 @@
- }
+diff -urN perl-5.10.1.orig/lib/File/Path.pm perl-5.10.1/lib/File/Path.pm
+--- perl-5.10.1.orig/lib/File/Path.pm	2009-06-27 18:14:41.000000000 +0200
++++ perl-5.10.1/lib/File/Path.pm	2009-12-01 11:43:31.000000000 +0100
+@@ -17,7 +17,7 @@
  
  use Exporter ();
--use vars qw($VERSION @ISA @EXPORT);
--$VERSION = '2.04';
-- at ISA     = qw(Exporter);
-- at EXPORT  = qw(mkpath rmtree);
-+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-+$VERSION   = '2.07';
-+ at ISA       = qw(Exporter);
-+ at EXPORT    = qw(mkpath rmtree);
-+ at EXPORT_OK = qw(make_path remove_tree);
- 
--my $Is_VMS   = $^O eq 'VMS';
--my $Is_MacOS = $^O eq 'MacOS';
-+my $Is_VMS     = $^O eq 'VMS';
-+my $Is_MacOS   = $^O eq 'MacOS';
- 
- # These OSes complain if you want to remove a file that you have no
- # write permission to:
-@@ -45,22 +46,21 @@
- 
-     if ($arg->{error}) {
-         $object = '' unless defined $object;
--        push @{${$arg->{error}}}, {$object => "$message: $!"};
-+        $message .= ": $!" if $!;
-+        push @{${$arg->{error}}}, {$object => $message};
-     }
-     else {
-         _carp(defined($object) ? "$message for $object: $!" : "$message: $!");
-     }
- }
- 
-+sub make_path {
-+    push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
-+    goto &mkpath;
-+}
-+
- sub mkpath {
--    my $old_style = (
--        UNIVERSAL::isa($_[0],'ARRAY')
--        or (@_ == 2 and (defined $_[1] ? $_[1] =~ /\A\d+\z/ : 1))
--        or (@_ == 3
--            and (defined $_[1] ? $_[1] =~ /\A\d+\z/ : 1)
--            and (defined $_[2] ? $_[2] =~ /\A\d+\z/ : 1)
--        )
--    ) ? 1 : 0;
-+    my $old_style = !(@_ and UNIVERSAL::isa($_[-1],'HASH'));
- 
-     my $arg;
-     my $paths;
-@@ -69,19 +69,14 @@
-         my ($verbose, $mode);
-         ($paths, $verbose, $mode) = @_;
-         $paths = [$paths] unless UNIVERSAL::isa($paths,'ARRAY');
--        $arg->{verbose} = defined $verbose ? $verbose : 0;
--        $arg->{mode}    = defined $mode    ? $mode    : 0777;
-+        $arg->{verbose} = $verbose;
-+        $arg->{mode}    = defined $mode ? $mode : 0777;
-     }
-     else {
--        if (@_ > 0 and UNIVERSAL::isa($_[-1], 'HASH')) {
--            $arg = pop @_;
--            exists $arg->{mask} and $arg->{mode} = delete $arg->{mask};
--            $arg->{mode} = 0777 unless exists $arg->{mode};
--            ${$arg->{error}} = [] if exists $arg->{error};
--        }
--        else {
--            @{$arg}{qw(verbose mode)} = (0, 0777);
--        }
-+        $arg = pop @_;
-+        $arg->{mode}      = delete $arg->{mask} if exists $arg->{mask};
-+        $arg->{mode}      = 0777 unless exists $arg->{mode};
-+        ${$arg->{error}}  = [] if exists $arg->{error};
-         $paths = [@_];
-     }
-     return _mkpath($arg, $paths);
-@@ -91,10 +86,9 @@
-     my $arg   = shift;
-     my $paths = shift;
- 
--    local($")=$Is_MacOS ? ":" : "/";
-     my(@created,$path);
-     foreach $path (@$paths) {
--        next unless length($path);
-+        next unless defined($path) and length($path);
-         $path .= '/' if $^O eq 'os2' and $path =~ /^\w:\z/s; # feature of CRT 
-         # Logic wants Unix paths, so go with the flow.
-         if ($Is_VMS) {
-@@ -129,15 +123,13 @@
-     return @created;
- }
- 
-+sub remove_tree {
-+    push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
-+    goto &rmtree;
-+}
-+
- sub rmtree {
--    my $old_style = (
--        UNIVERSAL::isa($_[0],'ARRAY')
--        or (@_ == 2 and (defined $_[1] ? $_[1] =~ /\A\d+\z/ : 1))
--        or (@_ == 3
--            and (defined $_[1] ? $_[1] =~ /\A\d+\z/ : 1)
--            and (defined $_[2] ? $_[2] =~ /\A\d+\z/ : 1)
--        )
--    ) ? 1 : 0;
-+    my $old_style = !(@_ and UNIVERSAL::isa($_[-1],'HASH'));
- 
-     my $arg;
-     my $paths;
-@@ -145,7 +137,7 @@
-     if ($old_style) {
-         my ($verbose, $safe);
-         ($paths, $verbose, $safe) = @_;
--        $arg->{verbose} = defined $verbose ? $verbose : 0;
-+        $arg->{verbose} = $verbose;
-         $arg->{safe}    = defined $safe    ? $safe    : 0;
- 
-         if (defined($paths) and length($paths)) {
-@@ -157,32 +149,55 @@
-         }
-     }
-     else {
--        if (@_ > 0 and UNIVERSAL::isa($_[-1],'HASH')) {
--            $arg = pop @_;
--            ${$arg->{error}}  = [] if exists $arg->{error};
--            ${$arg->{result}} = [] if exists $arg->{result};
--        }
--        else {
--            @{$arg}{qw(verbose safe)} = (0, 0);
--        }
-+        $arg = pop @_;
-+        ${$arg->{error}}  = [] if exists $arg->{error};
-+        ${$arg->{result}} = [] if exists $arg->{result};
-         $paths = [@_];
-     }
- 
-     $arg->{prefix} = '';
-     $arg->{depth}  = 0;
- 
-+    my @clean_path;
-     $arg->{cwd} = getcwd() or do {
-         _error($arg, "cannot fetch initial working directory");
-         return 0;
-     };
-     for ($arg->{cwd}) { /\A(.*)\Z/; $_ = $1 } # untaint
- 
--    @{$arg}{qw(device inode)} = (stat $arg->{cwd})[0,1] or do {
-+    for my $p (@$paths) {
-+        # need to fixup case and map \ to / on Windows
-+        my $ortho_root = $^O eq 'MSWin32' ? _slash_lc($p)          : $p;
-+        my $ortho_cwd  = $^O eq 'MSWin32' ? _slash_lc($arg->{cwd}) : $arg->{cwd};
-+        my $ortho_root_length = length($ortho_root);
-+        $ortho_root_length-- if $^O eq 'VMS'; # don't compare '.' with ']'
-+        if ($ortho_root_length
-+            && (substr($ortho_root, 0, $ortho_root_length) 
-+             eq substr($ortho_cwd, 0, $ortho_root_length))) {
-+            local $! = 0;
-+            _error($arg, "cannot remove path when cwd is $arg->{cwd}", $p);
-+            next;
+ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+-$VERSION   = '2.07_03';
++$VERSION   = '2.08';
+ @ISA       = qw(Exporter);
+ @EXPORT    = qw(mkpath rmtree);
+ @EXPORT_OK = qw(make_path remove_tree);
+@@ -81,6 +81,34 @@
+         $arg->{mode}      = delete $arg->{mask} if exists $arg->{mask};
+         $arg->{mode}      = 0777 unless exists $arg->{mode};
+         ${$arg->{error}}  = [] if exists $arg->{error};
++        $arg->{owner}     = delete $arg->{user} if exists $arg->{user};
++        $arg->{owner}     = delete $arg->{uid}  if exists $arg->{uid};
++        if (exists $arg->{owner} and $arg->{owner} =~ /\D/) {
++            my $uid = (getpwnam $arg->{owner})[2];
++            if (defined $uid) {
++                $arg->{owner} = $uid;
++            }
++            else {
++                _error($arg, "unable to map $arg->{owner} to a uid, ownership not changed");
++                delete $arg->{owner};
++            }
 +        }
-+
-+        if ($Is_MacOS) {
-+            $p  = ":$p" unless $p =~ /:/;
-+            $p .= ":"   unless $p =~ /:\z/;
++        if (exists $arg->{group} and $arg->{group} =~ /\D/) {
++            my $gid = (getgrnam $arg->{group})[2];
++            if (defined $gid) {
++                $arg->{group} = $gid;
++            }
++            else {
++                _error($arg, "unable to map $arg->{group} to a gid, group ownership not changed");
++                delete $arg->{group};
++            }
 +        }
-+        elsif ($^O eq 'MSWin32') {
-+            $p =~ s{[/\\]\z}{};
++        if (exists $arg->{owner} and not exists $arg->{group}) {
++            $arg->{group} = -1; # chown will leave group unchanged
 +        }
-+        else {
-+            $p =~ s{/\z}{};
++        if (exists $arg->{group} and not exists $arg->{owner}) {
++            $arg->{owner} = -1; # chown will leave owner unchanged
 +        }
-+        push @clean_path, $p;
-+    }
-+
-+    @{$arg}{qw(device inode perm)} = (lstat $arg->{cwd})[0,1] or do {
-         _error($arg, "cannot stat initial working directory", $arg->{cwd});
-         return 0;
-     };
- 
--    return _rmtree($arg, $paths);
-+    return _rmtree($arg, \@clean_path);
- }
- 
- sub _rmtree {
-@@ -196,14 +211,6 @@
-     my (@files, $root);
-     ROOT_DIR:
-     foreach $root (@$paths) {
--        if ($Is_MacOS) {
--            $root  = ":$root" unless $root =~ /:/;
--            $root .= ":"      unless $root =~ /:\z/;
--        }
--        else {
--            $root =~ s{/\z}{};
--        }
--
-         # since we chdir into each directory, it may not be obvious
-         # to figure out where we are if we generate a message about
-         # a file name. We therefore construct a semi-canonical
-@@ -234,13 +241,13 @@
-                 }
-             }
- 
--            my ($device, $inode, $perm) = (stat $curdir)[0,1,2] or do {
-+            my ($cur_dev, $cur_inode, $perm) = (stat $curdir)[0,1,2] or do {
-                 _error($arg, "cannot stat current working directory", $canon);
-                 next ROOT_DIR;
-             };
- 
--            ($ldev eq $device and $lino eq $inode)
--                or _croak("directory $canon changed before chdir, expected dev=$ldev inode=$lino, actual dev=$device ino=$inode, aborting.");
-+            ($ldev eq $cur_dev and $lino eq $cur_inode)
-+                or _croak("directory $canon changed before chdir, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting.");
- 
-             $perm &= 07777; # don't forget setuid, setgid, sticky bits
-             my $nperm = $perm | 0700;
-@@ -287,7 +294,7 @@
-                 # remove the contained files before the directory itself
-                 my $narg = {%$arg};
-                 @{$narg}{qw(device inode cwd prefix depth)}
--                    = ($device, $inode, $updir, $canon, $arg->{depth}+1);
-+                    = ($cur_dev, $cur_inode, $updir, $canon, $arg->{depth}+1);
-                 $count += _rmtree($narg, \@files);
-             }
- 
-@@ -304,11 +311,11 @@
- 
-             # ensure that a chdir upwards didn't take us somewhere other
-             # than we expected (see CVE-2002-0435)
--            ($device, $inode) = (stat $curdir)[0,1]
-+            ($cur_dev, $cur_inode) = (stat $curdir)[0,1]
-                 or _croak("cannot stat prior working directory $arg->{cwd}: $!, aborting.");
- 
--            ($arg->{device} eq $device and $arg->{inode} eq $inode)
--                or _croak("previous directory $arg->{cwd} changed before entering $canon, expected dev=$ldev inode=$lino, actual dev=$device ino=$inode, aborting.");
-+            ($arg->{device} eq $cur_dev and $arg->{inode} eq $cur_inode)
-+                or _croak("previous directory $arg->{cwd} changed before entering $canon, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting.");
- 
-             if ($arg->{depth} or !$arg->{keep_root}) {
-                 if ($arg->{safe} &&
-@@ -316,10 +323,8 @@
-                     print "skipped $root\n" if $arg->{verbose};
-                     next ROOT_DIR;
-                 }
--                if (!chmod $perm | 0700, $root) {
--                    if ($Force_Writeable) {
--                        _error($arg, "cannot make directory writeable", $canon);
--                    }
-+                if ($Force_Writeable and !chmod $perm | 0700, $root) {
-+                    _error($arg, "cannot make directory writeable", $canon);
-                 }
-                 print "rmdir $root\n" if $arg->{verbose};
-                 if (rmdir $root) {
-@@ -338,7 +343,7 @@
-         else {
-             # not a directory
-             $root = VMS::Filespec::vmsify("./$root")
--                if $Is_VMS 
-+                if $Is_VMS
-                    && !File::Spec->file_name_is_absolute($root)
-                    && ($root !~ m/(?<!\^)[\]>]+/);  # not already in VMS syntax
- 
-@@ -351,10 +356,8 @@
-             }
- 
-             my $nperm = $perm & 07777 | 0600;
--            if ($nperm != $perm and not chmod $nperm, $root) {
--                if ($Force_Writeable) {
--                    _error($arg, "cannot make file writeable", $canon);
--                }
-+            if ($Force_Writeable and $nperm != $perm and not chmod $nperm, $root) {
-+                _error($arg, "cannot make file writeable", $canon);
-             }
-             print "unlink $canon\n" if $arg->{verbose};
-             # delete all versions under VMS
-@@ -373,10 +376,17 @@
-             }
-         }
+         $paths = [@_];
      }
--
-     return $count;
- }
- 
-+sub _slash_lc {
-+    # fix up slashes and case on MSWin32 so that we can determine that
-+    # c:\path\to\dir is underneath C:/Path/To
-+    my $path = shift;
-+    $path =~ tr{\\}{/};
-+    return lc($path);
-+}
-+
- 1;
- __END__
- 
-@@ -386,59 +396,65 @@
+     return _mkpath($arg, $paths);
+@@ -107,6 +135,12 @@
+         print "mkdir $path\n" if $arg->{verbose};
+         if (mkdir($path,$arg->{mode})) {
+             push(@created, $path);
++            if (exists $arg->{owner}) {
++				# NB: $arg->{group} guaranteed to be set during initialisation
++                if (!chown $arg->{owner}, $arg->{group}, $path) {
++                    _error($arg, "Cannot change ownership of $path to $arg->{owner}:$arg->{group}");
++                }
++            }
+         }
+         else {
+             my $save_bang = $!;
+@@ -422,8 +456,8 @@
  
  =head1 VERSION
  
--This document describes version 2.04 of File::Path, released
--2007-11-13.
-+This document describes version 2.07 of File::Path, released
-+2008-11-09.
+-This document describes version 2.07 of File::Path, released
+-2008-11-09.
++This document describes version 2.08 of File::Path, released
++2009-10-04.
  
  =head1 SYNOPSIS
  
--    use File::Path;
--
--    # modern
--    mkpath( 'foo/bar/baz', '/zug/zwang', {verbose => 1} );
-+  use File::Path qw(make_path remove_tree);
- 
--    rmtree(
--        'foo/bar/baz', '/zug/zwang',
--        { verbose => 1, error  => \my $err_list }
--    );
--
--    # traditional
--    mkpath(['/foo/bar/baz', 'blurfl/quux'], 1, 0711);
--    rmtree(['foo/bar/baz', 'blurfl/quux'], 1, 1);
-+  make_path('foo/bar/baz', '/zug/zwang');
-+  make_path('foo/bar/baz', '/zug/zwang', {
-+      verbose => 1,
-+      mode => 0711,
-+  });
-+
-+  remove_tree('foo/bar/baz', '/zug/zwang');
-+  remove_tree('foo/bar/baz', '/zug/zwang', {
-+      verbose => 1,
-+      error  => \my $err_list,
-+  });
-+
-+  # legacy (interface promoted before v2.00)
-+  mkpath('/foo/bar/baz');
-+  mkpath('/foo/bar/baz', 1, 0711);
-+  mkpath(['/foo/bar/baz', 'blurfl/quux'], 1, 0711);
-+  rmtree('foo/bar/baz', 1, 1);
-+  rmtree(['foo/bar/baz', 'blurfl/quux'], 1, 1);
-+
-+  # legacy (interface promoted before v2.06)
-+  mkpath('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
-+  rmtree('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
- 
- =head1 DESCRIPTION
- 
--The C<mkpath> function provides a convenient way to create directories
--of arbitrary depth. Similarly, the C<rmtree> function provides a
--convenient way to delete an entire directory subtree from the
--filesystem, much like the Unix command C<rm -r>.
--
--Both functions may be called in one of two ways, the traditional,
--compatible with code written since the dawn of time, and modern,
--that offers a more flexible and readable idiom. New code should use
--the modern interface.
--
--=head2 FUNCTIONS
--
--The modern way of calling C<mkpath> and C<rmtree> is with a list
--of directories to create, or remove, respectively, followed by an
--optional hash reference containing keys to control the
--function's behaviour.
--
--=head3 C<mkpath>
--
--The following keys are recognised as parameters to C<mkpath>.
--The function returns the list of files actually created during the
--call.
--
--  my @created = mkpath(
--    qw(/tmp /flub /home/nobody),
--    {verbose => 1, mode => 0750},
--  );
--  print "created $_\n" for @created;
-+This module provide a convenient way to create directories of
-+arbitrary depth and to delete an entire directory subtree from the
-+filesystem.
- 
--=over 4
-+The following functions are provided:
-+
-+=over
-+
-+=item make_path( $dir1, $dir2, .... )
- 
--=item mode
-+=item make_path( $dir1, $dir2, ...., \%opts )
-+
-+The C<make_path> function creates the given directories if they don't
-+exists before, much like the Unix command C<mkdir -p>.
-+
-+The function accepts a list of directories to be created. Its
-+behaviour may be tuned by an optional hashref appearing as the last
-+parameter on the call.
-+
-+The function returns the list of directories actually created during
-+the call; in scalar context the number of directories created.
-+
-+The following keys are recognised in the option hash:
-+
-+=over
-+
-+=item mode => $num
- 
- The numeric permissions mode to apply to each created directory
- (defaults to 0777), to be modified by the current C<umask>. If the
-@@ -447,16 +463,17 @@
- 
- C<mask> is recognised as an alias for this parameter.
- 
--=item verbose
-+=item verbose => $bool
- 
--If present, will cause C<mkpath> to print the name of each directory
-+If present, will cause C<make_path> to print the name of each directory
- as it is created. By default nothing is printed.
- 
--=item error
-+=item error => \$err
- 
--If present, will be interpreted as a reference to a list, and will
--be used to store any errors that are encountered.  See the ERROR
--HANDLING section for more information.
-+If present, it should be a reference to a scalar.
-+This scalar will be made to reference an array, which will
-+be used to store any errors that are encountered.  See the L</"ERROR
-+HANDLING"> section for more information.
- 
- If this parameter is not used, certain error conditions may raise
+@@ -505,6 +539,34 @@
  a fatal error that will cause the program will halt, unless trapped
-@@ -464,53 +481,80 @@
- 
- =back
+ in an C<eval> block.
  
--=head3 C<rmtree>
-+=item mkpath( $dir )
- 
--=over 4
-+=item mkpath( $dir, $verbose, $mode )
++=item owner => $owner
 +
-+=item mkpath( [$dir1, $dir2,...], $verbose, $mode )
++=item user => $owner
 +
-+=item mkpath( $dir1, $dir2,..., \%opt )
++=item uid => $owner
 +
-+The mkpath() function provide the legacy interface of make_path() with
-+a different interpretation of the arguments passed.  The behaviour and
-+return value of the function is otherwise identical to make_path().
- 
--=item verbose
-+=item remove_tree( $dir1, $dir2, .... )
- 
--If present, will cause C<rmtree> to print the name of each file as
-+=item remove_tree( $dir1, $dir2, ...., \%opts )
++If present, will cause any created directory to be owned by C<$owner>.
++If the value is numeric, it will be interpreted as a uid, otherwise
++as username is assumed. An error will be issued if the username cannot be
++mapped to a uid, or the uid does not exist, or the process lacks the
++privileges to change ownership.
 +
-+The C<remove_tree> function deletes the given directories and any
-+files and subdirectories they might contain, much like the Unix
-+command C<rm -r> or C<del /s> on Windows.
++Ownwership of directories that already exist will not be changed.
 +
-+The function accepts a list of directories to be
-+removed. Its behaviour may be tuned by an optional hashref
-+appearing as the last parameter on the call.
++C<user> and C<uid> are aliases of C<owner>.
 +
-+The functions returns the number of files successfully deleted.
++=item group => $group
 +
-+The following keys are recognised in the option hash:
++If present, will cause any created directory to be owned by the group C<$group>.
++If the value is numeric, it will be interpreted as a gid, otherwise
++as group name is assumed. An error will be issued if the group name cannot be
++mapped to a gid, or the gid does not exist, or the process lacks the
++privileges to change group ownership.
 +
-+=over
++Group ownwership of directories that already exist will not be changed.
 +
-+=item verbose => $bool
++    make_path '/var/tmp/webcache', {owner=>'nobody', group=>'nogroup'};
 +
-+If present, will cause C<remove_tree> to print the name of each file as
- it is unlinked. By default nothing is printed.
- 
--=item safe
-+=item safe => $bool
- 
--When set to a true value, will cause C<rmtree> to skip the files
-+When set to a true value, will cause C<remove_tree> to skip the files
- for which the process lacks the required privileges needed to delete
- files, such as delete privileges on VMS. In other words, the code
- will make no attempt to alter file permissions. Thus, if the process
- is interrupted, no filesystem object will be left in a more
- permissive mode.
- 
--=item keep_root
-+=item keep_root => $bool
- 
- When set to a true value, will cause all files and subdirectories
- to be removed, except the initially specified directories. This comes
- in handy when cleaning out an application's scratch directory.
- 
--  rmtree( '/tmp', {keep_root => 1} );
-+  remove_tree( '/tmp', {keep_root => 1} );
- 
--=item result
-+=item result => \$res
- 
--If present, will be interpreted as a reference to a list, and will
--be used to store the list of all files and directories unlinked
--during the call. If nothing is unlinked, a reference to an empty
--list is returned (rather than C<undef>).
-+If present, it should be a reference to a scalar.
-+This scalar will be made to reference an array, which will
-+be used to store all files and directories unlinked
-+during the call. If nothing is unlinked, the array will be empty.
- 
--  rmtree( '/tmp', {result => \my $list} );
-+  remove_tree( '/tmp', {result => \my $list} );
-   print "unlinked $_\n" for @$list;
- 
- This is a useful alternative to the C<verbose> key.
- 
--=item error
-+=item error => \$err
- 
--If present, will be interpreted as a reference to a list,
--and will be used to store any errors that are encountered.
--See the ERROR HANDLING section for more information.
-+If present, it should be a reference to a scalar.
-+This scalar will be made to reference an array, which will
-+be used to store any errors that are encountered.  See the L</"ERROR
-+HANDLING"> section for more information.
- 
- Removing things is a much more dangerous proposition than
- creating things. As such, there are certain conditions that
--C<rmtree> may encounter that are so dangerous that the only
-+C<remove_tree> may encounter that are so dangerous that the only
- sane action left is to kill the program.
- 
- Use C<error> to trap all that is reasonable (problems with
-@@ -519,131 +563,67 @@
- 
- =back
- 
--=head2 TRADITIONAL INTERFACE
--
--The old interfaces of C<mkpath> and C<rmtree> take a reference to
--a list of directories (to create or remove), followed by a series
--of positional, numeric, modal parameters that control their behaviour.
--
--This design made it difficult to add additional functionality, as
--well as posed the problem of what to do when the calling code only
--needs to set the last parameter. Even though the code doesn't care
--how the initial positional parameters are set, the programmer is
--forced to learn what the defaults are, and specify them.
--
--Worse, if it turns out in the future that it would make more sense
--to change the default behaviour of the first parameter (for example,
--to avoid a security vulnerability), all existing code will remain
--hard-wired to the wrong defaults.
--
--Finally, a series of numeric parameters are much less self-documenting
--in terms of communicating to the reader what the code is doing. Named
--parameters do not have this problem.
--
--In the traditional API, C<mkpath> takes three arguments:
--
--=over 4
--
--=item *
--
--The name of the path to create, or a reference to a list of paths
--to create,
-+=item rmtree( $dir )
- 
--=item *
-+=item rmtree( $dir, $verbose, $safe )
- 
--a boolean value, which if TRUE will cause C<mkpath> to print the
--name of each directory as it is created (defaults to FALSE), and
-+=item rmtree( [$dir1, $dir2,...], $verbose, $safe )
- 
--=item *
-+=item rmtree( $dir1, $dir2,..., \%opt )
- 
--the numeric mode to use when creating the directories (defaults to
--0777), to be modified by the current umask.
-+The rmtree() function provide the legacy interface of remove_tree()
-+with a different interpretation of the arguments passed. The behaviour
-+and return value of the function is otherwise identical to
-+remove_tree().
- 
- =back
- 
--It returns a list of all directories (including intermediates, determined
--using the Unix '/' separator) created.  In scalar context it returns
--the number of directories created.
--
--If a system error prevents a directory from being created, then the
--C<mkpath> function throws a fatal error with C<Carp::croak>. This error
--can be trapped with an C<eval> block:
--
--  eval { mkpath($dir) };
--  if ($@) {
--    print "Couldn't create $dir: $@";
--  }
--
--In the traditional API, C<rmtree> takes three arguments:
-+=head2 ERROR HANDLING
- 
- =over 4
- 
--=item *
-+=item B<NOTE:>
- 
--the root of the subtree to delete, or a reference to a list of
--roots. All of the files and directories below each root, as well
--as the roots themselves, will be deleted. If you want to keep
--the roots themselves, you must use the modern API.
--
--=item *
--
--a boolean value, which if TRUE will cause C<rmtree> to print a
--message each time it examines a file, giving the name of the file,
--and indicating whether it's using C<rmdir> or C<unlink> to remove
--it, or that it's skipping it.  (defaults to FALSE)
--
--=item *
--
--a boolean value, which if TRUE will cause C<rmtree> to skip any
--files to which you do not have delete access (if running under VMS)
--or write access (if running under another OS). This will change
--in the future when a criterion for 'delete permission' under OSs
--other than VMS is settled.  (defaults to FALSE)
-+The following error handling mechanism is considered
-+experimental and is subject to change pending feedback from
-+users.
- 
  =back
  
--It returns the number of files, directories and symlinks successfully
--deleted.  Symlinks are simply deleted and not followed.
--
--Note also that the occurrence of errors in C<rmtree> using the
--traditional interface can be determined I<only> by trapping diagnostic
--messages using C<$SIG{__WARN__}>; it is not apparent from the return
--value. (The modern interface may use the C<error> parameter to
--record any problems encountered).
--
--=head2 ERROR HANDLING
--
--If C<mkpath> or C<rmtree> encounter an error, a diagnostic message
--will be printed to C<STDERR> via C<carp> (for non-fatal errors),
--or via C<croak> (for fatal errors).
-+If C<make_path> or C<remove_tree> encounter an error, a diagnostic
-+message will be printed to C<STDERR> via C<carp> (for non-fatal
-+errors), or via C<croak> (for fatal errors).
- 
- If this behaviour is not desirable, the C<error> attribute may be
- used to hold a reference to a variable, which will be used to store
--the diagnostics. The result is a reference to a list of hash
--references. For each hash reference, the key is the name of the
--file, and the value is the error message (usually the contents of
--C<$!>). An example usage looks like:
--
--  rmpath( 'foo/bar', 'bar/rat', {error => \my $err} );
--  for my $diag (@$err) {
--    my ($file, $message) = each %$diag;
--    print "problem unlinking $file: $message\n";
-+the diagnostics. The variable is made a reference to an array of hash
-+references.  Each hash contain a single key/value pair where the key
-+is the name of the file, and the value is the error message (including
-+the contents of C<$!> when appropriate).  If a general error is
-+encountered the diagnostic key will be empty.
-+
-+An example usage looks like:
-+
-+  remove_tree( 'foo/bar', 'bar/rat', {error => \my $err} );
-+  if (@$err) {
-+      for my $diag (@$err) {
-+          my ($file, $message) = %$diag;
-+          if ($file eq '') {
-+              print "general error: $message\n";
-+          }
-+          else {
-+              print "problem unlinking $file: $message\n";
-+          }
-+      }
-   }
--
--If no errors are encountered, C<$err> will point to an empty list
--(thus there is no need to test for C<undef>). If a general error
--is encountered (for instance, C<rmtree> attempts to remove a directory
--tree that does not exist), the diagnostic key will be empty, only
--the value will be set:
--
--  rmpath( '/no/such/path', {error => \my $err} );
--  for my $diag (@$err) {
--    my ($file, $message) = each %$diag;
--    if ($file eq '') {
--      print "general error: $message\n";
--    }
-+  else {
-+      print "No error encountered\n";
-   }
- 
-+Note that if no errors are encountered, C<$err> will reference an
-+empty array.  This means that C<$err> will always end up TRUE; so you
-+need to test C<@$err> to determine if errors occured.
-+
- =head2 NOTES
- 
- C<File::Path> blindly exports C<mkpath> and C<rmtree> into the
-@@ -653,38 +633,18 @@
- 
-   use File::Path 'rmtree';
- 
--=head3 HEURISTICS
-+The routines C<make_path> and C<remove_tree> are B<not> exported
-+by default. You must specify which ones you want to use.
- 
--The functions detect (as far as possible) which way they are being
--called and will act appropriately. It is important to remember that
--the heuristic for detecting the old style is either the presence
--of an array reference, or two or three parameters total and second
--and third parameters are numeric. Hence...
-+  use File::Path 'remove_tree';
- 
--    mkpath 486, 487, 488;
-+Note that a side-effect of the above is that C<mkpath> and C<rmtree>
-+are no longer exported at all. This is due to the way the C<Exporter>
-+module works. If you are migrating a codebase to use the new
-+interface, you will have to list everything explicitly. But that's
-+just good practice anyway.
- 
--... will not assume the modern style and create three directories, rather
--it will create one directory verbosely, setting the permission to
--0750 (488 being the decimal equivalent of octal 750). Here, old
--style trumps new. It must, for backwards compatibility reasons.
--
--If you want to ensure there is absolutely no ambiguity about which
--way the function will behave, make sure the first parameter is a
--reference to a one-element list, to force the old style interpretation:
--
--    mkpath [486], 487, 488;
--
--and get only one directory created. Or add a reference to an empty
--parameter hash, to force the new style:
--
--    mkpath 486, 487, 488, {};
--
--... and hence create the three directories. If the empty hash
--reference seems a little strange to your eyes, or you suspect a
--subsequent programmer might I<helpfully> optimise it away, you
--can add a parameter set to a default value:
--
--    mkpath 486, 487, 488, {verbose => 0};
-+  use File::Path qw(remove_tree rmtree);
- 
- =head3 SECURITY CONSIDERATIONS
- 
-@@ -701,7 +661,7 @@
- 
- Additionally, unless the C<safe> parameter is set (or the
- third parameter in the traditional interface is TRUE), should a
--C<rmtree> be interrupted, files that were originally in read-only
-+C<remove_tree> be interrupted, files that were originally in read-only
- mode may now have their permissions set to a read-write (or "delete
- OK") mode.
- 
-@@ -723,43 +683,43 @@
- 
- =item mkdir [path]: [errmsg] (SEVERE)
- 
--C<mkpath> was unable to create the path. Probably some sort of
-+C<make_path> was unable to create the path. Probably some sort of
- permissions error at the point of departure, or insufficient resources
- (such as free inodes on Unix).
- 
- =item No root path(s) specified
+ =item mkpath( $dir )
+@@ -672,6 +734,17 @@
  
--C<mkpath> was not given any paths to create. This message is only
-+C<make_path> was not given any paths to create. This message is only
- emitted if the routine is called with the traditional interface.
- The modern interface will remain silent if given nothing to do.
+   use File::Path qw(remove_tree rmtree);
  
- =item No such file or directory
- 
--On Windows, if C<mkpath> gives you this warning, it may mean that
-+On Windows, if C<make_path> gives you this warning, it may mean that
- you have exceeded your filesystem's maximum path length.
- 
- =item cannot fetch initial working directory: [errmsg]
- 
--C<rmtree> attempted to determine the initial directory by calling
-+C<remove_tree> attempted to determine the initial directory by calling
- C<Cwd::getcwd>, but the call failed for some reason. No attempt
- will be made to delete anything.
- 
- =item cannot stat initial working directory: [errmsg]
- 
--C<rmtree> attempted to stat the initial directory (after having
-+C<remove_tree> attempted to stat the initial directory (after having
- successfully obtained its name via C<getcwd>), however, the call
- failed for some reason. No attempt will be made to delete anything.
- 
- =item cannot chdir to [dir]: [errmsg]
- 
--C<rmtree> attempted to set the working directory in order to
-+C<remove_tree> attempted to set the working directory in order to
- begin deleting the objects therein, but was unsuccessful. This is
- usually a permissions issue. The routine will continue to delete
- other things, but this directory will be left intact.
- 
--=item directory [dir] changed before chdir, expected dev=[n] inode=[n], actual dev=[n] ino=[n], aborting. (FATAL)
-+=item directory [dir] changed before chdir, expected dev=[n] ino=[n], actual dev=[n] ino=[n], aborting. (FATAL)
- 
--C<rmtree> recorded the device and inode of a directory, and then
-+C<remove_tree> recorded the device and inode of a directory, and then
- moved into it. It then performed a C<stat> on the current directory
- and detected that the device and inode were no longer the same. As
- this is at the heart of the race condition problem, the program
-@@ -767,14 +727,14 @@
- 
- =item cannot make directory [dir] read+writeable: [errmsg]
- 
--C<rmtree> attempted to change the permissions on the current directory
-+C<remove_tree> attempted to change the permissions on the current directory
- to ensure that subsequent unlinkings would not run into problems,
- but was unable to do so. The permissions remain as they were, and
- the program will carry on, doing the best it can.
- 
- =item cannot read [dir]: [errmsg]
- 
--C<rmtree> tried to read the contents of the directory in order
-+C<remove_tree> tried to read the contents of the directory in order
- to acquire the names of the directory entries to be unlinked, but
- was unsuccessful. This is usually a permissions issue. The
- program will continue, but the files in this directory will remain
-@@ -782,61 +742,70 @@
- 
- =item cannot reset chmod [dir]: [errmsg]
- 
--C<rmtree>, after having deleted everything in a directory, attempted
-+C<remove_tree>, after having deleted everything in a directory, attempted
- to restore its permissions to the original state but failed. The
- directory may wind up being left behind.
- 
-+=item cannot remove [dir] when cwd is [dir]
++=head3 API CHANGES
 +
-+The current working directory of the program is F</some/path/to/here>
-+and you are attempting to remove an ancestor, such as F</some/path>.
-+The directory tree is left untouched.
++The API was changed in the 2.0 branch. For a time, C<mkpath> and
++C<rmtree> tried, unsuccessfully, to deal with the two different
++calling mechanisms. This approach was considered a failure.
 +
-+The solution is to C<chdir> out of the child directory to a place
-+outside the directory tree to be removed.
++The new semantics are now only available with C<make_path> and
++C<remove_tree>. The old semantics are only available through
++C<mkpath> and C<rmtree>. Users are strongly encouraged to upgrade
++to at least 2.08 in order to avoid surprises.
 +
- =item cannot chdir to [parent-dir] from [child-dir]: [errmsg], aborting. (FATAL)
- 
--C<rmtree>, after having deleted everything and restored the permissions
--of a directory, was unable to chdir back to the parent. This is usually
--a sign that something evil this way comes.
-+C<remove_tree>, after having deleted everything and restored the permissions
-+of a directory, was unable to chdir back to the parent. The program
-+halts to avoid a race condition from occurring.
- 
- =item cannot stat prior working directory [dir]: [errmsg], aborting. (FATAL)
- 
--C<rmtree> was unable to stat the parent directory after have returned
-+C<remove_tree> was unable to stat the parent directory after have returned
- from the child. Since there is no way of knowing if we returned to
- where we think we should be (by comparing device and inode) the only
- way out is to C<croak>.
- 
--=item previous directory [parent-dir] changed before entering [child-dir], expected dev=[n] inode=[n], actual dev=[n] ino=[n], aborting. (FATAL)
-+=item previous directory [parent-dir] changed before entering [child-dir], expected dev=[n] ino=[n], actual dev=[n] ino=[n], aborting. (FATAL)
- 
--When C<rmtree> returned from deleting files in a child directory, a
-+When C<remove_tree> returned from deleting files in a child directory, a
- check revealed that the parent directory it returned to wasn't the one
- it started out from. This is considered a sign of malicious activity.
- 
- =item cannot make directory [dir] writeable: [errmsg]
- 
- Just before removing a directory (after having successfully removed
--everything it contained), C<rmtree> attempted to set the permissions
-+everything it contained), C<remove_tree> attempted to set the permissions
- on the directory to ensure it could be removed and failed. Program
- execution continues, but the directory may possibly not be deleted.
- 
- =item cannot remove directory [dir]: [errmsg]
- 
--C<rmtree> attempted to remove a directory, but failed. This may because
-+C<remove_tree> attempted to remove a directory, but failed. This may because
- some objects that were unable to be removed remain in the directory, or
- a permissions issue. The directory will be left behind.
- 
- =item cannot restore permissions of [dir] to [0nnn]: [errmsg]
- 
--After having failed to remove a directory, C<rmtree> was unable to
-+After having failed to remove a directory, C<remove_tree> was unable to
- restore its permissions from a permissive state back to a possibly
- more restrictive setting. (Permissions given in octal).
- 
- =item cannot make file [file] writeable: [errmsg]
- 
--C<rmtree> attempted to force the permissions of a file to ensure it
-+C<remove_tree> attempted to force the permissions of a file to ensure it
- could be deleted, but failed to do so. It will, however, still attempt
- to unlink the file.
- 
- =item cannot unlink file [file]: [errmsg]
- 
--C<rmtree> failed to remove a file. Probably a permissions issue.
-+C<remove_tree> failed to remove a file. Probably a permissions issue.
- 
- =item cannot restore permissions of [file] to [0nnn]: [errmsg]
+ =head3 SECURITY CONSIDERATIONS
  
--After having failed to remove a file, C<rmtree> was also unable
-+After having failed to remove a file, C<remove_tree> was also unable
+ There were race conditions 1.x implementations of File::Path's
+@@ -835,6 +908,20 @@
  to restore the permissions on the file to a possibly less permissive
  setting. (Permissions given in octal).
  
-@@ -879,16 +848,18 @@
- That code was used as a basis for the current code. Their efforts
- are greatly appreciated.
- 
-+Gisle Aas made a number of improvements to the documentation for
-+2.07 and his advice and assistance is also greatly appreciated.
-+
- =head1 AUTHORS
- 
--Tim Bunce <F<Tim.Bunce at ig.co.uk>> and Charles Bailey
--<F<bailey at newman.upenn.edu>>. Currently maintained by David Landgren
-+Tim Bunce and Charles Bailey. Currently maintained by David Landgren
- <F<david at landgren.net>>.
++=item unable to map [owner] to a uid, ownership not changed");
++
++C<make_path> was instructed to give the ownership of created
++directories to the symbolic name [owner], but C<getpwnam> did
++not return the corresponding numeric uid. The directory will
++be created, but ownership will not be changed.
++
++=item unable to map [group] to a gid, group ownership not changed
++
++C<make_path> was instructed to give the group ownership of created
++directories to the symbolic name [group], but C<getgrnam> did
++not return the corresponding numeric gid. The directory will
++be created, but group ownership will not be changed.
++
+ =back
  
+ =head1 SEE ALSO
+@@ -885,7 +972,7 @@
  =head1 COPYRIGHT
  
  This module is copyright (C) Charles Bailey, Tim Bunce and
--David Landgren 1995-2007.  All rights reserved.
-+David Landgren 1995-2008. All rights reserved.
+-David Landgren 1995-2008. All rights reserved.
++David Landgren 1995-2009. All rights reserved.
  
  =head1 LICENSE
  
-diff -urN perl-5.10.0.orig/lib/File/Path.t perl-5.10.0/lib/File/Path.t
---- perl-5.10.0.orig/lib/File/Path.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Path.t	2009-02-17 14:53:32.000000000 +0100
-@@ -2,17 +2,19 @@
+diff -urN perl-5.10.1.orig/lib/File/Path.t perl-5.10.1/lib/File/Path.t
+--- perl-5.10.1.orig/lib/File/Path.t	2009-06-27 18:14:41.000000000 +0200
++++ perl-5.10.1/lib/File/Path.t	2009-12-01 11:43:48.000000000 +0100
+@@ -2,7 +2,7 @@
  
  use strict;
  
--use Test::More tests => 99;
-+use Test::More tests => 114;
-+use Config;
+-use Test::More tests => 121;
++use Test::More tests => 129;
+ use Config;
  
  BEGIN {
--    use_ok('File::Path');
-+    use_ok('Cwd');
-+    use_ok('File::Path', qw(rmtree mkpath make_path remove_tree));
-     use_ok('File::Spec::Functions');
- }
- 
- eval "use Test::Output";
- my $has_Test_Output = $@ ? 0 : 1;
+@@ -323,7 +323,7 @@
+     # test bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487319
+     skip "Don't need Force_Writeable semantics on $^O", 4
+         if grep {$^O eq $_} qw(amigaos dos epoc MSWin32 MacOS os2);
+-    skip "Symlinks not available", 4 unless $Config{'d_symlink'};
++    skip "Symlinks not available", 4 unless $Config{d_symlink};
+     $dir  = 'bug487319';
+     $dir2 = 'bug487319-symlink';
+     @created = make_path($dir, {mask => 0700});
+@@ -381,7 +381,7 @@
+ SKIP: {
+     skip "extra scenarios not set up, see eg/setup-extra-tests", 14
+         unless -e $extra;
+-    skip "Symlinks not available", 14 unless $Config{'d_symlink'};
++    skip "Symlinks not available", 14 unless $Config{d_symlink};
  
--my $Is_VMS   = $^O eq 'VMS';
-+my $Is_VMS = $^O eq 'VMS';
+     my ($list, $err);
+     $dir = catdir( 'EXTRA', '1' );
+@@ -434,6 +434,78 @@
+ }
  
- # first check for stupid permissions second for full, so we clean up
- # behind ourselves
-@@ -45,7 +47,7 @@
- );
- 
- # create them
--my @created = mkpath(@dir);
-+my @created = mkpath([@dir]);
- 
- is(scalar(@created), 7, "created list of directories");
- 
-@@ -79,18 +81,98 @@
- my $dir;
- my $dir2;
- 
-+sub gisle {
-+    # background info: @_ = 1; !shift # gives '' not 0
-+    # Message-Id: <3C820CE6-4400-4E91-AF43-A3D19B356E68 at activestate.com>
-+    # http://www.nntp.perl.org/group/perl.perl5.porters/2008/05/msg136625.html
-+    mkpath(shift, !shift, 0755);
-+}
-+
-+sub count {
-+    opendir D, shift or return -1;
-+    my $count = () = readdir D;
-+    closedir D or return -1;
-+    return $count;
-+}
-+
-+{
-+    mkdir 'solo', 0755;
-+    chdir 'solo';
-+    open my $f, '>', 'foo.dat';
-+    close $f;
-+    my $before = count(curdir());
-+    cmp_ok($before, '>', 0, "baseline $before");
-+
-+    gisle('1st', 1);
-+    is(count(curdir()), $before + 1, "first after $before");
-+
-+    $before = count(curdir());
-+    gisle('2nd', 1);
-+    is(count(curdir()), $before + 1, "second after $before");
-+
-+    chdir updir();
-+    rmtree 'solo';
-+}
-+
-+{
-+    mkdir 'solo', 0755;
-+    chdir 'solo';
-+    open my $f, '>', 'foo.dat';
-+    close $f;
-+    my $before = count(curdir());
-+    cmp_ok($before, '>', 0, "ARGV $before");
-+    {
-+        local @ARGV = (1);
-+        mkpath('3rd', !shift, 0755);
+ SKIP: {
++    my $skip_count = 8; # DRY
++    skip "getpwent() not implemented on $^O", $skip_count
++        unless $Config{d_getpwent};
++    skip "getgrent() not implemented on $^O", $skip_count
++        unless $Config{d_getgrent};
++    skip 'not running as root', $skip_count
++        unless $< == 0;
++
++    my $dir_stem = $dir = catdir($tmp_base, 'owned-by');
++
++    # find the highest uid ('nobody' or similar)
++    my $max_uid   = 0;
++    my $max_user = undef;
++    while (my @u = getpwent()) {
++        if ($max_uid < $u[2]) {
++            $max_uid  = $u[2];
++            $max_user = $u[0];
++        }
 +    }
-+    is(count(curdir()), $before + 1, "third after $before");
++    skip 'getpwent() appears to be insane', $skip_count
++        unless $max_uid > 0;
 +
-+    $before = count(curdir());
-+    {
-+        local @ARGV = (1);
-+        mkpath('4th', !shift, 0755);
++    # find the highest gid ('nogroup' or similar)
++    my $max_gid   = 0;
++    my $max_group = undef;
++    while (my @g = getgrent()) {
++        if ($max_gid < $g[2]) {
++            $max_gid = $g[2];
++            $max_group = $g[0];
++        }
 +    }
-+    is(count(curdir()), $before + 1, "fourth after $before");
-+
-+    chdir updir();
-+    rmtree 'solo';
-+}
++    skip 'getgrent() appears to be insane', $skip_count
++        unless $max_gid > 0;
 +
- SKIP: {
--    $dir = catdir($tmp_base, 'B');
--    $dir2 = catdir($dir, updir());
--    # IOW: File::Spec->catdir( qw(foo bar), File::Spec->updir ) eq 'foo'
--    # rather than foo/bar/..    
--    skip "updir() canonicalises path on this platform", 2
--        if $dir2 eq $tmp_base
--            or $^O eq 'cygwin';
--        
--    @created = mkpath($dir2, {mask => 0700});
--    is(scalar(@created), 1, "make directory with trailing parent segment");
--    is($created[0], $dir, "made parent");
-+    # tests for rmtree() of ancestor directory
-+    my $nr_tests = 6;
-+    my $cwd = getcwd() or skip "failed to getcwd: $!", $nr_tests;
-+    my $dir  = catdir($cwd, 'remove');
-+    my $dir2 = catdir($cwd, 'remove', 'this', 'dir');
-+
-+    skip "failed to mkpath '$dir2': $!", $nr_tests
-+        unless mkpath($dir2, {verbose => 0});
-+    skip "failed to chdir dir '$dir2': $!", $nr_tests
-+        unless chdir($dir2);
-+
-+    rmtree($dir, {error => \$error});
-+    my $nr_err = @$error;
-+    is($nr_err, 1, "ancestor error");
-+
-+    if ($nr_err) {
-+        my ($file, $message) = each %{$error->[0]};
-+        is($file, $dir, "ancestor named");
-+        my $ortho_dir = $^O eq 'MSWin32' ? File::Path::_slash_lc($dir2) : $dir2;
-+        $^O eq 'MSWin32' and $message
-+            =~ s/\A(cannot remove path when cwd is )(.*)\Z/$1 . File::Path::_slash_lc($2)/e;
-+        is($message, "cannot remove path when cwd is $ortho_dir", "ancestor reason");
-+        ok(-d $dir2, "child not removed");
-+        ok(-d $dir, "ancestor not removed");
-+    }
-+    else {
-+        fail( "ancestor 1");
-+        fail( "ancestor 2");
-+        fail( "ancestor 3");
-+        fail( "ancestor 4");
++    $dir = catdir($dir_stem, 'aaa');
++    @created = make_path($dir, {owner => $max_user});
++    is(scalar(@created), 2, "created a directory owned by $max_user...");
++    my $dir_uid = (stat $created[0])[4];
++    is($dir_uid, $max_uid, "... owned by $max_uid");
++
++    $dir = catdir($dir_stem, 'aab');
++    @created = make_path($dir, {group => $max_group});
++    is(scalar(@created), 1, "created a directory owned by group $max_group...");
++    my $dir_gid = (stat $created[0])[5];
++    is($dir_gid, $max_gid, "... owned by group $max_gid");
++
++    $dir = catdir($dir_stem, 'aac');
++    @created = make_path($dir, {user => $max_user, group => $max_group});
++    is(scalar(@created), 1, "created a directory owned by $max_user:$max_group...");
++    ($dir_uid, $dir_gid) = (stat $created[0])[4,5];
++    is($dir_uid, $max_uid, "... owned by $max_uid");
++    is($dir_gid, $max_gid, "... owned by group $max_gid");
++
++    SKIP: {
++        skip 'Test::Output not available', 1
++               unless $has_Test_Output;
++
++        # invent a user and group that don't exist
++        do { ++$max_user  } while (getpwnam($max_user));
++        do { ++$max_group } while (getgrnam($max_group));
++
++        $dir = catdir($dir_stem, 'aad');
++        stderr_like(
++            sub {make_path($dir, {user => $max_user, group => $max_group})},
++            qr{\Aunable to map $max_user to a uid, ownership not changed: .* at \S+ line \d+
++unable to map $max_group to a gid, group ownership not changed: .* at \S+ line \d+\b},
++            "created a directory not owned by $max_user:$max_group..."
++        );
 +    }
-+    chdir $cwd;
-+    rmtree($dir);
-+    ok(!(-d $dir), "ancestor now removed");
- };
- 
- my $count = rmtree({error => \$error});
-@@ -104,7 +186,7 @@
- $dir = catdir($tmp_base,'C');
- # mkpath returns unix syntax filespecs on VMS
- $dir = VMS::Filespec::unixify($dir) if $Is_VMS;
-- at created = mkpath($tmp_base, $dir);
-+ at created = make_path($tmp_base, $dir);
- is(scalar(@created), 1, "created directory (new style 1)");
- is($created[0], $dir, "created directory (new style 1) cross-check");
- 
-@@ -115,7 +197,7 @@
- $dir2 = catdir($tmp_base,'D');
- # mkpath returns unix syntax filespecs on VMS
- $dir2 = VMS::Filespec::unixify($dir2) if $Is_VMS;
-- at created = mkpath($tmp_base, $dir, $dir2);
-+ at created = make_path($tmp_base, $dir, $dir2);
- is(scalar(@created), 1, "created directory (new style 2)");
- is($created[0], $dir2, "created directory (new style 2) cross-check");
- 
-@@ -123,8 +205,7 @@
- is($count, 1, "removed directory unsafe mode");
- 
- $count = rmtree($dir2, 0, 1);
--my $removed = $Is_VMS ? 0 : 1;
--is($count, $removed, "removed directory safe mode");
-+is($count, 1, "removed directory safe mode");
- 
- # mkdir foo ./E/../Y
- # Y should exist
-@@ -135,7 +216,7 @@
- cmp_ok(scalar(@created), '<=', 2, "made less than two dirs because of ..");
- ok( -d catdir($tmp_base, 'Y'), "directory after parent" );
- 
-- at created = mkpath(catdir(curdir(), $tmp_base));
-+ at created = make_path(catdir(curdir(), $tmp_base));
- is(scalar(@created), 0, "nothing created")
-     or diag(@created);
- 
-@@ -195,22 +276,22 @@
- $dir   = catdir('a', 'd1');
- $dir2  = catdir('a', 'd2');
- 
-- at created = mkpath( $dir, 0, $dir2 );
-+ at created = make_path( $dir, 0, $dir2 );
- is(scalar @created, 3, 'new-style 3 dirs created');
- 
--$count = rmtree( $dir, 0, $dir2, );
-+$count = remove_tree( $dir, 0, $dir2, );
- is($count, 3, 'new-style 3 dirs removed');
- 
-- at created = mkpath( $dir, $dir2, 1 );
-+ at created = make_path( $dir, $dir2, 1 );
- is(scalar @created, 3, 'new-style 3 dirs created (redux)');
- 
--$count = rmtree( $dir, $dir2, 1 );
-+$count = remove_tree( $dir, $dir2, 1 );
- is($count, 3, 'new-style 3 dirs removed (redux)');
- 
-- at created = mkpath( $dir, $dir2 );
-+ at created = make_path( $dir, $dir2 );
- is(scalar @created, 2, 'new-style 2 dirs created');
- 
--$count = rmtree( $dir, $dir2 );
-+$count = remove_tree( $dir, $dir2 );
- is($count, 2, 'new-style 2 dirs removed');
- 
- if (chdir updir()) {
-@@ -220,6 +301,43 @@
-     fail("chdir parent: $!");
- }
- 
-+SKIP: {
-+    # test bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487319
-+    skip "Don't need Force_Writeable semantics on $^O", 4
-+        if grep {$^O eq $_} qw(amigaos dos epoc MSWin32 MacOS os2);
-+    skip "Symlinks not available", 4 unless $Config{'d_symlink'};
-+    $dir  = 'bug487319';
-+    $dir2 = 'bug487319-symlink';
-+    @created = make_path($dir, {mask => 0700});
-+    is(scalar @created, 1, 'bug 487319 setup');
-+    symlink($dir, $dir2);
-+    ok(-e $dir2, "debian bug 487319 setup symlink") or diag($dir2);
-+
-+    chmod 0500, $dir;
-+    my $mask_initial = (stat $dir)[2];
-+    remove_tree($dir2);
-+
-+    my $mask = (stat $dir)[2];
-+    is( $mask, $mask_initial, 'mask of symlink target dir unchanged (debian bug 487319)');
-+
-+    # now try a file
-+    my $file = catfile($dir, 'file');
-+    open my $out, '>', $file;
-+    close $out;
-+
-+    chmod 0500, $file;
-+    $mask_initial = (stat $file)[2];
-+
-+    my $file2 = catfile($dir, 'symlink');
-+    symlink($file, $file2);
-+    remove_tree($file2);
-+
-+    $mask = (stat $file)[2];
-+    is( $mask, $mask_initial, 'mask of symlink target file unchanged (debian bug 487319)');
-+
-+    remove_tree($dir);
 +}
 +
- # see what happens if a file exists where we want a directory
- SKIP: {
-     my $entry = catdir($tmp_base, "file");
-@@ -245,6 +363,7 @@
- SKIP: {
-     skip "extra scenarios not set up, see eg/setup-extra-tests", 14
-         unless -e $extra;
-+    skip "Symlinks not available", 14 unless $Config{'d_symlink'};
- 
-     my ($list, $err);
-     $dir = catdir( 'EXTRA', '1' );
-@@ -355,8 +474,8 @@
-         "rmtree of empty dir carps sensibly"
-     );
- 
--    stderr_is( sub { mkpath() }, '', "mkpath no args does not carp" );
--    stderr_is( sub { rmtree() }, '', "rmtree no args does not carp" );
-+    stderr_is( sub { make_path() }, '', "make_path no args does not carp" );
-+    stderr_is( sub { remove_tree() }, '', "remove_tree no args does not carp" );
++SKIP: {
+     skip 'Test::Output not available', 14
+         unless $has_Test_Output;
  
-     stdout_is(
-         sub {@created = mkpath($dir, 1)},
+@@ -574,15 +646,15 @@
+     my $xx = $x . "x";
+     
+     # setup
+-    ok(mkpath($xx));
+-    ok(chdir($xx));
++    ok(mkpath($xx), "make $xx");
++    ok(chdir($xx), "... and chdir $xx");
+     END {
+-         ok(chdir($p));
+-         ok(rmtree($xx));
++         ok(chdir($p), "... now chdir $p");
++         ok(rmtree($xx), "... and finally rmtree $xx");
+     }
+     
+     # create and delete directory
+     my $px = catdir($p, $x);
+-    ok(mkpath($px));
+-    ok(rmtree($px), "rmtree");     # fails in File-Path-2.07
++    ok(mkpath($px), 'create and delete directory 2.07');
++    ok(rmtree($px), '.. rmtree fails in File-Path-2.07');
+ }

perl-update-Module-Build.patch:
 MANIFEST                                    |    1 
 lib/Module/Build.pm                         |    2 
 lib/Module/Build/API.pod                    |   23 +-
 lib/Module/Build/Base.pm                    |  158 +++++++++++++-------
 lib/Module/Build/Changes                    |   45 +++++
 lib/Module/Build/Compat.pm                  |    6 
 lib/Module/Build/Config.pm                  |    2 
 lib/Module/Build/Cookbook.pm                |    2 
 lib/Module/Build/Dumper.pm                  |    2 
 lib/Module/Build/ModuleInfo.pm              |    2 
 lib/Module/Build/Notes.pm                   |    2 
 lib/Module/Build/PPMMaker.pm                |    3 
 lib/Module/Build/Platform/Amiga.pm          |    2 
 lib/Module/Build/Platform/Default.pm        |    2 
 lib/Module/Build/Platform/EBCDIC.pm         |    2 
 lib/Module/Build/Platform/MPEiX.pm          |    2 
 lib/Module/Build/Platform/MacOS.pm          |    2 
 lib/Module/Build/Platform/RiscOS.pm         |    2 
 lib/Module/Build/Platform/Unix.pm           |    2 
 lib/Module/Build/Platform/VMS.pm            |    2 
 lib/Module/Build/Platform/VOS.pm            |    2 
 lib/Module/Build/Platform/Windows.pm        |    2 
 lib/Module/Build/Platform/aix.pm            |    2 
 lib/Module/Build/Platform/cygwin.pm         |    2 
 lib/Module/Build/Platform/darwin.pm         |    2 
 lib/Module/Build/Platform/os2.pm            |    2 
 lib/Module/Build/PodParser.pm               |    2 
 lib/Module/Build/t/PL_files.t               |    2 
 lib/Module/Build/t/add_property.t           |    2 
 lib/Module/Build/t/compat.t                 |   54 ++++---
 lib/Module/Build/t/debug.t                  |    8 -
 lib/Module/Build/t/destinations.t           |    3 
 lib/Module/Build/t/help.t                   |    4 
 lib/Module/Build/t/install_extra_target.t   |  137 +++++++++++++++++
 lib/Module/Build/t/lib/DistGen.pm           |  215 ++++++++++++++++++++++------
 lib/Module/Build/t/lib/MBTest.pm            |   19 ++
 lib/Module/Build/t/metadata.t               |    5 
 lib/Module/Build/t/metadata2.t              |    2 
 lib/Module/Build/t/runthrough.t             |   27 ---
 lib/Module/Build/t/script_dist.t            |    1 
 lib/Module/Build/t/tilde.t                  |    8 -
 lib/Module/Build/t/write_default_maniskip.t |    5 
 lib/Module/Build/t/xs.t                     |    9 -
 43 files changed, 580 insertions(+), 199 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 perl-update-Module-Build.patchIndex: perl-update-Module-Build.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl-update-Module-Build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-update-Module-Build.patch	11 Mar 2009 21:12:37 -0000	1.1
+++ perl-update-Module-Build.patch	3 Dec 2009 11:37:17 -0000	1.2
@@ -1,5715 +1,1541 @@
-Module-Build-0.32
-perl-5.10.0 contained some fixes in the Module::Build testsuite; all
-these have been integrated to Module-Build-0.31012
+Module-Build-0.35
 
---- perl-5.10.0.orig/MANIFEST	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-03-10 17:07:04.000000000 +0100
-@@ -2156,8 +2156,10 @@
- lib/Module/Build/PodParser.pm	Module::Build
- lib/Module/Build/PPMMaker.pm	Module::Build
- lib/Module/Build/scripts/config_data	Module::Build
-+lib/Module/Build/t/add_property.t	Module::Build
- lib/Module/Build/t/basic.t	Module::Build
- lib/Module/Build/t/bundled/Tie/CPHash.pm	Module::Build.pm
-+lib/Module/Build/t/compat/exit.t	Module::Build
- lib/Module/Build/t/compat.t	Module::Build
- lib/Module/Build/t/destinations.t	Module::Build
- lib/Module/Build/t/extend.t	Module::Build
-@@ -2178,9 +2180,12 @@
- lib/Module/Build/t/pod_parser.t	Module::Build
- lib/Module/Build/t/ppm.t	Module::Build
- lib/Module/Build/t/runthrough.t	Module::Build
-+lib/Module/Build/t/script_dist.t	Module::Build
-+lib/Module/Build/t/test_file_exts.t	Module::Build
- lib/Module/Build/t/test_types.t	Module::Build
- lib/Module/Build/t/test_type.t	Module::Build
- lib/Module/Build/t/tilde.t	Module::Build
-+lib/Module/Build/t/use_tap_harness.t	Module::Build
- lib/Module/Build/t/versions.t	Module::Build
- lib/Module/Build/t/xs.t		Module::Build
- lib/Module/Build/Version.pm	Module::Build
-diff -urN perl-5.10.0.orig/lib/Module/Build/API.pod perl-5.10.0/lib/Module/Build/API.pod
---- perl-5.10.0.orig/lib/Module/Build/API.pod	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/lib/Module/Build/API.pod	2009-03-10 16:49:12.000000000 +0100
-@@ -211,12 +211,12 @@
- 
- [version 0.20]
- 
--This should be a short description of the distribution.  This is used
--when generating metadata for F<META.yml> and PPD files.  If it is not
--given then C<Module::Build> looks in the POD of the module from which
--it gets the distribution's version.  It looks for the first line
--matching C<$package\s-\s(.+)>, and uses the captured text as the
--abstract.
-+This should be a short description of the distribution.  This is used when
-+generating metadata for F<META.yml> and PPD files.  If it is not given
-+then C<Module::Build> looks in the POD of the module from which it gets
-+the distribution's version.  If it finds a POD section marked "=head1
-+NAME", then it looks for the first line matching C<\s+-\s+(.+)>,
-+and uses the captured text as the abstract.
- 
- =item dist_author
- 
-@@ -268,6 +268,10 @@
- this process, so there's no real opportunity to change to something
- better.
- 
-+If the target file of L</dist_version_from> contains more than one package
-+declaration, the version returned will be the one matching the configured
-+L</module_name>.
-+
- =item dynamic_config
- 
- [version 0.07]
-@@ -502,16 +506,16 @@
- sync with your written documentation if you ever change your licensing
- terms.
- 
-+You may also use a license type of C<unknown> if you don't wish to
-+specify your terms in the metadata.
-+
- It is a fatal error to use a license other than the ones mentioned
- above.  This is not because I wish to impose licensing terms on you -
- please let me know if you would like another license option to be
--added to the list.  You may also use a license type of C<unknown> if
--you don't wish to specify your terms (but this is usually not a good
--idea for you to do!).
--
--I just started out with a small set of licenses to keep things simple,
--figuring I'd let people with actual working knowledge in this area
--tell me what to do.  So if that's you, drop me a line.
-+added to the list.  I just started out with a small set of licenses to
-+keep things simple, figuring I'd let people with actual working
-+knowledge in this area tell me what to do.  So if that's you, drop me
-+a line.
- 
- =item meta_add
- 
-@@ -683,13 +687,13 @@
- 
- An optional parameter specifying a set of files that should be
- installed as executable Perl scripts when the module is installed.
--May be given as an array reference of the files, or as a hash
--reference whose keys are the files (and whose values will currently be
--ignored).
-+May be given as an array reference of the files, as a hash reference
-+whose keys are the files (and whose values will currently be ignored),
-+as a string giving the name of a directory in which to find scripts,
-+or as a string giving the name of a single script file.
- 
--The default is to install no script files - in other words, there is
--no default location where Module::Build will look for script files to
--install.
-+The default is to install any scripts found in a F<bin> directory at
-+the top level of the distribution.
- 
- For backward compatibility, you may use the parameter C<scripts>
- instead of C<script_files>.  Please consider this usage deprecated,
-@@ -725,6 +729,26 @@
- property is true, then the C<t/> directory will be scanned recursively
- for C<*.t> files.
- 
-+=item use_tap_harness
-+
-+[version 0.2808_03]
-+
-+An optional parameter indicating whether or not to use TAP::Harness for
-+testing rather than Test::Harness. Defaults to false. If set to true, you must
-+therefore be sure to add TAP::Harness as a requirement for your module in
-+L</build_requires>. Implicitly set to a true value if C<tap_harness_args> is
-+specified.
-+
-+=item tap_harness_args
-+
-+[version 0.2808_03]
-+
-+An optional parameter specifying parameters to be passed to TAP::Harness when
-+running tests. Must be given as a hash reference of parameters; see the
-+L<TAP::Harness|TAP::Harness> documentation for details. Note that specifying
-+this parameter will implicitly set C<use_tap_harness> to a true value. You
-+must therefore be sure to add TAP::Harness as a requirement for your module in
-+L</build_requires>.
- 
- =item xs_files
- 
-@@ -771,6 +795,86 @@
- defaults to C<MyModuleBuilder>.  The C<code> parameter specifies Perl
- code to use as the body of the subclass.
- 
-+=item add_property
-+
-+[version 0.31]
-+
-+  package 'My::Build';
-+  use base 'Module::Build';
-+  __PACKAGE__->add_property( 'pedantic' );
-+  __PACKAGE__->add_property( answer => 42 );
-+  __PACKAGE__->add_property(
-+     'epoch',
-+      default => sub { time },
-+      check   => sub {
-+          return 1 if /^\d+$/;
-+          shift->property_error( "'$_' is not an epoch time" );
-+          return 0;
-+      },
-+  );
-+
-+Adds a property to a Module::Build class. Properties are those attributes of a
-+Module::Build object which can be passed to the constructor and which have
-+accessors to get and set them. All of the core properties, such as
-+C<module_name> and C<license>, are defined using this class method.
-+
-+The first argument to C<add_property()> is always the name of the property.
-+The second argument can be either a default value for the property, or a list
-+of key/value pairs. The supported keys are:
-+
-+=over
-+
-+=item C<default>
-+
-+The default value. May optionally be specified as a code reference, in which
-+case the return value from the execution of the code reference will be used.
-+If you need the default to be a code reference, just use a code reference to
-+return it, e.g.:
-+
-+      default => sub { sub { ... } },
-+
-+=item C<check>
-+
-+A code reference that checks that a value specified for the property is valid.
-+During the execution of the code reference, the new value will be included in
-+the C<$_> variable. If the value is correct, the C<check> code reference
-+should return true. If the value is not correct, it sends an error message to
-+C<property_error()> and returns false.
-+
-+=back
-+
-+When this method is called, a new property will be installed in the
-+Module::Build class, and an accessor will be built to allow the property to be
-+get or set on the build object.
-+
[...6637 lines suppressed...]
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+ use MBTest 'no_plan';
++use DistGen;
++use Cwd;
  
- $mb = Module::Build->new_from_context;
- is $@, '';
-@@ -129,7 +129,6 @@
- is $@, '';
+ use_ok 'Module::Build';
+ ensure_blib 'Module::Build';
  
- # cleanup
--chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
- $dist->remove;
+ {
++    my $cwd = Cwd::cwd;
+     chdir MBTest->tmpdir();
  
+     my $build = Module::Build->new(
+@@ -34,4 +37,6 @@
+     like $have, qr/^\Q$head\E/, "default MANIFEST.SKIP used";
+     like $have, qr/^# Avoid Module::Build generated /ms, "Module::Build specific entries";
+     like $have, qr/Foo-Bar-/, "distribution tarball entry";
++
++    DistGen::chdir_all($cwd);
+ }
+diff -urN perl-5.10.1.orig/lib/Module/Build/t/xs.t perl-5.10.1/lib/Module/Build/t/xs.t
+--- perl-5.10.1.orig/lib/Module/Build/t/xs.t	2009-12-01 17:01:57.000000000 +0100
++++ perl-5.10.1/lib/Module/Build/t/xs.t	2009-12-01 11:53:14.000000000 +0100
+@@ -6,8 +6,10 @@
+ use Module::Build;
+ use Config;
  
-@@ -208,7 +207,7 @@
- ---
++my $tmp;
++
+ {
+-  my ($have_c_compiler, $C_support_feature) = check_compiler();
++  my ($have_c_compiler, $C_support_feature, $tmp_exec) = check_compiler();
  
- $dist->regen;
--chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
-+$dist->chdir_in;
+   if (! $C_support_feature) {
+     plan skip_all => 'C_support not enabled';
+@@ -20,6 +22,8 @@
+   } else {
+     plan tests => 23;
+   }
++  require Cwd;
++  $tmp = MBTest->tmpdir( $tmp_exec ? undef : Cwd::cwd );
+ }
  
+ ensure_blib('Module::Build');
+@@ -27,9 +31,6 @@
  
- $mb = Module::Build->new_from_context;
-@@ -224,8 +223,4 @@
- is $@, '';
+ #########################
  
- # cleanup
--chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
- $dist->remove;
 -
--use File::Path;
--rmtree( $tmp );
-diff -urN perl-5.10.0.orig/lib/Module/Build.pm perl-5.10.0/lib/Module/Build.pm
---- perl-5.10.0.orig/lib/Module/Build.pm	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/lib/Module/Build.pm	2009-03-10 16:49:12.000000000 +0100
+-my $tmp = MBTest->tmpdir;
+-
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp, xs => 1 );
+ $dist->regen;
+diff -urN perl-5.10.1.orig/lib/Module/Build.pm perl-5.10.1/lib/Module/Build.pm
+--- perl-5.10.1.orig/lib/Module/Build.pm	2009-12-01 17:01:57.000000000 +0100
++++ perl-5.10.1/lib/Module/Build.pm	2009-12-01 11:51:27.000000000 +0100
 @@ -15,7 +15,7 @@
  
  use vars qw($VERSION @ISA);
  @ISA = qw(Module::Build::Base);
--$VERSION = '0.2808_01';
-+$VERSION = '0.32';
+-$VERSION = '0.340201';
++$VERSION = '0.35';
  $VERSION = eval $VERSION;
  
  # Okay, this is the brute-force method of finding out what kind of
-@@ -30,15 +30,18 @@
- 		 dynixptx  Unix
- 		 freebsd   Unix
- 		 linux     Unix
-+		 haiku     Unix
- 		 hpux      Unix
- 		 irix      Unix
- 		 darwin    Unix
- 		 machten   Unix
- 		 midnightbsd Unix
-+		 mirbsd    Unix
- 		 next      Unix
- 		 openbsd   Unix
- 		 netbsd    Unix
- 		 dec_osf   Unix
-+		 nto       Unix
- 		 svr4      Unix
- 		 svr5      Unix
- 		 sco_sv    Unix
-@@ -49,7 +52,9 @@
- 		 cygwin    Unix
- 		 os2       Unix
- 		 interix   Unix
--		 
-+		 gnu       Unix
-+		 gnukfreebsd Unix
-+
- 		 dos       Windows
- 		 MSWin32   Windows
- 
-@@ -156,11 +161,11 @@
- 'actions'.  In this case the actions run are 'build' (the default
- action), 'test', and 'install'.  Other actions defined so far include:
- 
--  build                          manifest    
--  clean                          manpages    
--  code                           pardist     
--  config_data                    ppd         
--  diff                           ppmdist     
-+  build                          manpages    
-+  clean                          pardist     
-+  code                           ppd         
-+  config_data                    ppmdist     
-+  diff                           prereq_data 
-   dist                           prereq_report
-   distcheck                      pure_install
-   distclean                      realclean   
-@@ -173,6 +178,7 @@
-   help                           testpod     
-   html                           testpodcoverage
-   install                        versioninstall
-+  manifest                                   
- 
- 
- You can run the 'help' action for a complete list of actions.
-@@ -508,6 +514,14 @@
- output, so you can supply C<tar> and/or C<gzip> parameters to affect
- the result.
- 
-+=item prereq_data
-+
-+[version 0.32]
-+
-+This action prints out a Perl data structure of all prerequsites and the versions
-+required.  The output can be loaded again using C<eval()>.  This can be useful for
-+external tools that wish to query a Build script for prerequisites.
-+
- =item prereq_report
- 
- [version 0.28]
-@@ -557,10 +571,10 @@
- 
- [version 0.01]
- 
--This will use C<Test::Harness> to run any regression tests and report
--their results.  Tests can be defined in the standard places: a file
--called C<test.pl> in the top-level directory, or several files ending
--with C<.t> in a C<t/> directory.
-+This will use C<Test::Harness> or C<TAP::Harness> to run any regression
-+tests and report their results. Tests can be defined in the standard
-+places: a file called C<test.pl> in the top-level directory, or several
-+files ending with C<.t> in a C<t/> directory.
- 
- If you want tests to be 'verbose', i.e. show details of test execution
- rather than just summary information, pass the argument C<verbose=1>.
-@@ -568,6 +582,14 @@
- If you want to run tests under the perl debugger, pass the argument
- C<debugger=1>.
- 
-+If you want to have Module::Build find test files with different file
-+name extensions, pass the C<test_file_exts> argument with an array
-+of extensions, such as C<[qw( .t .s .z )]>.
-+
-+If you want test to be run by C<TAP::Harness>, rather than C<Test::Harness>,
-+pass the argument C<tap_harness_args> as an array reference of arguments to
-+pass to the TAP::Harness constructor.
-+
- In addition, if a file called C<visual.pl> exists in the top-level
- directory, this file will be executed as a Perl script and its output
- will be shown to the user.  This is a good place to put speed tests or
-@@ -611,7 +633,7 @@
-     ...
-     test_types  => {
-       special => '.st',
--      author  => '.at',
-+      author  => ['.at', '.pt' ],
-     },
-     ...
- 


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- perl.spec	1 Dec 2009 15:14:56 -0000	1.237
+++ perl.spec	3 Dec 2009 11:37:17 -0000	1.238
@@ -1,4 +1,4 @@
-%define perl_version    5.10.0
+%define perl_version    5.10.1
 %define perl_epoch      4
 %define perl_arch_stem -thread-multi
 %define perl_archname %{_arch}-%{_os}%{perl_arch_stem}
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        87%{?dist}
+Release:        100%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -15,16 +15,16 @@ Group:          Development/Languages
 # we have to reflect that in the sub-package containing them.
 License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
 Url:            http://www.perl.org/
-Source0:        http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/perl-%{perl_version}.tar.gz
+Source0:        http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2
 Source11:       filter-requires.sh
 Source12:       perl-5.8.0-libnet.cfg
 Source13:       macros.perl
 
 # Specific to Fedora/RHEL
-Patch1:         perl-5.8.0-root.patch
+Patch1:         perl-suid-noroot.patch
 
 # Removes date check, Fedora/RHEL specific
-Patch2:         perl-5.10.0-perlbug-tag.patch
+Patch2:         perl-perlbug-tag.patch
 
 # work around annoying rpath issue
 # This is only relevant for Fedora, as it is unlikely
@@ -39,7 +39,7 @@ Patch6:         perl-5.10.0-libresolv.pa
 
 # FIXME: May need the "Fedora" references removed before upstreaming
 # patches ExtUtils-MakeMaker
-Patch7:         perl-5.10.0-USE_MM_LD_RUN_PATH.patch
+Patch7:         perl-USE_MM_LD_RUN_PATH.patch
 
 # Skip hostname tests, since hostname lookup isn't available in Fedora
 # buildroots by design.
@@ -51,211 +51,110 @@ Patch8:         perl-5.10.0-disable_test
 # systems.
 Patch10:        perl-5.10.0-x86_64-io-test-failure.patch
 
-# http://public.activestate.com/cgi-bin/perlbrowse/p/32891
-Patch11:        32891.patch
-
-# Problem with assertion - add upstream patch
-Patch15:	perl-5.10.0-bz448392.patch
-
-# Wrong access test
-Patch16:	perl-5.10.0-accessXOK.patch
-
-# fix function pos to handle unicode correctly
-Patch20:	perl-5.10.0-pos.patch
-
-# Fix crash when localizing a symtab entry rt#52740
-Patch26:    perl-5.10.0-stlocal.patch
-
-# Change 33640: More diagnostics for Fatal.pm, version bumps for all non-dual life modules affected
-# http://www.nntp.perl.org/group/perl.perl5.changes/2008/04/msg21478.html
-Patch28:    perl-5.10.0-Change33640.patch
-
-# Change 33881: (33825) Add SEEK_CUR, SEEK_END, SEEK_SET to list of constants POSIX imports from Fcntl
-#               (33826) Remove POSIX's internal implementation of S_ISBLK, S_ISCHR, S_ISDIR, S_ISFIFO, S_ISREG, pull from Fcntl
-#               (33829) Fix typo
-# http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21717.html
-Patch29:    perl-5.10.0-Change33881.patch
-
-# Change 33896: Eliminate POSIX::int_macro_int, and all the complex AUTOLOAD fandango
-# http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21732.html
-Patch30:    perl-5.10.0-Change33896.patch
-
-# Change 33897: Replaced the WEXITSTATUS, WIFEXITED, WIFSIGNALED, WIFSTOPPED, WSTOPSIG
-# http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21733.html
-Patch31:    perl-5.10.0-Change33897.patch
-
-Patch33:	perl-5.10.0-PerlIO-via-change34025.patch
-
-# Change 34507: Fix memory leak in single-char character class optimization
-Patch34:	perl-5.10.0-Change34507.patch
-
 # Reorder @INC: Based on: http://github.com/rafl/perl/commit/b9ba2fadb18b54e35e5de54f945111a56cbcb249
 Patch35:	perl-5.10.0-reorderINC.patch
 
-# Fix from Archive::Extract maintainer to only look at stdout
-# We need this because we're using tar >= 1.21
-# included upstream in 0.31_03
-Patch36:	perl-5.10.0-Archive-Extract-onlystdout.patch
-
-# Do not distort lib/CGI/t/util-58.t
-# http://rt.perl.org/rt3/Ticket/Display.html?id=64502
-Patch37:	perl-CGI-t-util-58.patch
-
-### Debian Patches ###
-
-# Fix issue with (nested) definition lists in lib/Pod/Html.pm
-# Upstream change 32727
-Patch40:	02_fix_pod2html_dl
-
-# Fix NULLOK items
-# Upstream change 33287
-Patch41:	07_fix_nullok
-
-# Fix a typo in the predefined common protocols to make "udp" resolve without netbase
-# Upstream change 33554
-Patch42:	08_fix_udp_typo
-
-# Fix a segmentation fault with 'debugperl -Dm'.
-# Upstream change 33388
-Patch43:	09_fix_memory_debugging
-
-# Allow the quote mark delimiter also for those #include directives chased with "h2ph -a".
-# Also add the directory prefix of the current file when the quote syntax is used;
-# 'require' will only look in @INC, not the current directory.
-# Upstream change 33835
-Patch44:	10_fix_h2ph_include_quote
-
-# Disable the "v-string in use/require is non-portable" warning.
-# Upstream change 32910
-Patch45:	11_disable_vstring_warning
-
-# Fix a segmentation fault occurring in the mod_perl2 test suite.
-# Upstream change 33807
-Patch46:	15_fix_local_symtab
- 
-# Fix the PerlIO_teardown prototype to suppress a compiler warning.
-# Upstream change 33370
-Patch47:	16_fix_perlio_teardown_prototype
-
-# Remove numeric overloading of Getopt::Long callback functions.
-# Dual-lived module, fixed on the CPAN side in 2.37_01.
-Patch48:	17_fix_getopt_long_callback
-
-# Fix Math::BigFloat::sqrt() breaking with too many digits.
-# Upstream change 33821
-Patch49:	18_fix_bigint_floats
-
-# Fix memory corruption with in-place sorting.
-# Upstream change 33937
-Patch50:	28_fix_inplace_sort
-
-# Revert an incorrect substitution optimization introduced in 5.10.0.
-# Bug introduced by upstream change 26334, reverted with change 33685 in blead and 33732 in maint-5.10.
-Patch51:	30_fix_freetmps
-
-# Fix 'Unknown error' messages with attribute.pm.
-# Upstream change 33265
-Patch52:	31_fix_attributes_unknown_error
-
-# Stop t/op/fork.t relying on rand().
-# Upstream change 33749
-Patch53:	32_fix_fork_rand
-
-# Fix memory leak with qr//.
-# Adapted from upstream change 34506.
-Patch54:	34_fix_qr-memory-leak-2
-
-# CVE-2005-0448 revisited: File::Path::rmtree no longer allows creating of setuid files.
-# We have 2.07, but it is still missing one fix (the debian patch has two fixes, but one is in 2.07)
-Patch55:	perl-5.10.0-fix_file_path_rmtree_setuid.patch
-
-# Fix $? when dumping core.
-Patch56:	37_fix_coredump_indicator
-
-# Fix a memory leak with Scalar::Util::weaken().
-# Upstream change 34209
-Patch57:	38_fix_weaken_memleak
-
-### End of Debian Patches ###
-
 # http://rt.perl.org/rt3/Ticket/Display.html?id=39060 (#221113)
 Patch58:	perl-perlio-incorrect-errno.patch
 
-# h2ph: generated *.ph files no longer produce warnings when processed
-Patch59:	perl-bz509676.patch
-
-# With the Scalar-List-Utils update, more prereq declarations have to
-# be skipped in Makefile.PL files.
-Patch60:	perl-skip-prereq.patch
-
 # much better swap logic to support reentrancy and fix assert failure
 # http://perl5.git.perl.org/perl.git/commitdiff/e9105d30edfbaa7f444bc7984c9bafc8e991ad12
 # RT #60508
-Patch61:	perl-5.10.0-much-better-swap-logic.patch
+Patch61:	perl-much-better-swap-logic.patch
+
+# temporarily export debug symbols even though DEBUGGING is not set:
+Patch62:	perl-add-symbols.patch
+
+# version macros for some of the modules:
+%define			    Archive_Extract_version 0.34
+%define			    Archive_Tar_version 1.52
+%define			    File_Fetch_version 0.20
+%define			    File_Temp_version 0.22
+%define			    IPC_Cmd_version 0.46
+%define			    Module_CoreList_version 2.18
+%define			    Module_Load_Conditional_version 0.30
+%define			    Pod_Simple_version 3.07
+%define			    Test_Harness_version 3.17
+%define			    Test_Simple_version 0.92
+%define			    Digest_SHA_version 5.47
+# has to be 3.x0, not 3.x
+%define			    Module_Pluggable_version 3.90
 
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
+# FIXME: predelej na update 0.2602 -> 0.27
+Patch104:	perl-update-ExtUtils-CBuilder.patch
+%define			    ExtUtils_CBuilder_version 0.27
+# FIXME: predelej na update 2.07_03 -> 2.08
+Patch106:	perl-update-File-Path.patch
+%define			    File_Path_version 2.08
+# FIXME: update 340201 -> 0.35
+Patch109:	perl-update-Module-Build.patch
+%define			    Module_Build_real_version 0.35
+# For Module-Build-0.x, the second component has to have four digits.
+%define			    Module_Build_rpm_version  0.3500
+
+#---
+# FIXME; is 2.18->2.21, should be 2.20->2.21
+# - was 2.21 previously; but it is not a subpackage, can wait
+Patch123:	perl-update-Storable.patch
+%define             Storable_version 2.20
+
+#---
+#could be 1.19
 Patch100:	perl-update-constant.patch
 %define			    constant_version 1.17
+# could be 0.36
 Patch101:	perl-update-Archive-Extract.patch
-%define			    Archive_Extract_version 0.30
+# could be 1.54
 Patch102:	perl-update-Archive-Tar.patch
-%define			    Archive_Tar_version 1.46
+# could be 3.43->3.48
 Patch103:	perl-update-CGI.patch
-%define			    CGI_version 3.43
-Patch104:	perl-update-ExtUtils-CBuilder.patch
-%define			    ExtUtils_CBuilder_version 0.24
+# could be 0.22
 Patch105:	perl-update-File-Fetch.patch
-%define			    File_Fetch_version 0.18
-Patch106:	perl-update-File-Path.patch
-%define			    File_Path_version 2.07
 Patch107:	perl-update-File-Temp.patch
-%define			    File_Temp_version 0.21
+# could be 0.54
 Patch108:	perl-update-IPC-Cmd.patch
-%define			    IPC_Cmd_version 0.42
-Patch109:	perl-update-Module-Build.patch
-%define			    Module_Build_real_version 0.32
-# For Module-Build-0.x, the second component has to have four digits.
-%define			    Module_Build_rpm_version  0.3200
+# could be 2.23
 Patch110:	perl-update-Module-CoreList.patch
-%define			    Module_CoreList_version 2.17
+# could be 0.34
 Patch111:	perl-update-Module-Load-Conditional.patch
-%define			    Module_Load_Conditional_version 0.30
+# could be 3.10
 Patch112:	perl-update-Pod-Simple.patch
-%define			    Pod_Simple_version 3.07
 Patch113:	perl-update-Sys-Syslog.patch
 %define			    Sys_Syslog_version 0.27
 Patch114:	perl-update-Test-Harness.patch
-%define			    Test_Harness_version 3.16
+# could be 0.94
 Patch115:	perl-update-Test-Simple.patch
-%define			    Test_Simple_version 0.92
 Patch116:	perl-update-Time-HiRes.patch
 %define			    Time_HiRes_version 1.9719
 Patch117:	perl-update-Digest-SHA.patch
-%define			    Digest_SHA_version 5.47
 # includes Fatal.pm
 Patch118:	perl-update-autodie.patch
 %define			    autodie_version 1.999
 # cpan has it under PathTools-3.30
+# could be 3.31
 Patch119:	perl-update-FileSpec.patch
 %define			    File_Spec_version 3.30
+# FIXME should be 2.023, to preserve upgrade path
 Patch120:	perl-update-Compress-Raw-Zlib.patch
-%define			    Compress_Raw_Zlib_version 2.023
+%define			    Compress_Raw_Zlib_version 2.020
+# could be 1.22
 Patch121:	perl-update-Scalar-List-Utils.patch
 %define			    Scalar_List_Utils 1.21
 Patch122:	perl-update-Module-Pluggable.patch
-%define			    Module_Pluggable_version 3.90
-# Also fixes segfault when objects are reblessed (rt#33242, rhbz#459918)
-Patch123:	perl-update-Storable.patch
-%define			    Storable_version 2.21
+
+# could be 2.023
 Patch124:	perl-update-IO-Compress-Base.patch
-%define			    IO_Compress_Base_version 2.015
+%define			    IO_Compress_Base_version 2.020
+# could be 2.023
 Patch125:	perl-update-IO-Compress-Zlib.patch
-%define			    IO_Compress_Zlib_version 2.015
+%define			    IO_Compress_Zlib_version 2.020
+#... also update version number of Compress::Zlib
+
+# and also ExtUtils-ParseXS 2.2002 -> 2.21
+
 
-# Fedora uses links instead of lynx
-# patches File-Fetch and CPAN
-Patch201:	perl-5.10.0-links.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
@@ -270,6 +169,8 @@ Provides: perl(VMS::Filespec)
 Provides: perl(VMS::Stdio)
 
 # Compat provides
+Provides: perl(:MODULE_COMPAT_5.10.1)
+# during the transition period, provide also this:
 Provides: perl(:MODULE_COMPAT_5.10.0)
 
 # Threading provides
@@ -440,7 +341,7 @@ Summary:        A module providing Perl 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        2.008
+Version:        2.020
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Compress-Zlib
@@ -458,7 +359,7 @@ Summary:        Query, download and buil
 Group:          Development/Languages
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        1.9205
+Version:        1.9402
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 Provides:       cpan = %{version}
 
@@ -471,7 +372,7 @@ Summary:        API & CLI access to the 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        0.84
+Version:        0.88
 Requires:       perl(Module::Pluggable) >= 2.4
 Requires:       perl(Module::CoreList)
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
@@ -534,8 +435,8 @@ Summary:        Create a module Makefile
 Group:          Development/Languages
 License:        GPL+ or Artistic
 Epoch:          0
-# It's really 6.36_01, but we drop the _01.
-Version:        6.36
+# It's really 6.55_02, but we drop the _02.
+Version:        6.55
 Requires:       perl-devel
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 Requires:       perl(Test::Harness)
@@ -550,8 +451,8 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-# It's really 2.18_02, but we drop the _02.
-Version:        2.18
+# It's really 2.2002, but we drop the 02.
+Version:        2.20
 Requires:       perl-devel
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
@@ -609,7 +510,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        1.07
+Version:        1.09
 Requires:       perl(Compress::Zlib)
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
@@ -655,7 +556,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        0.01
+Version:        0.02
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 # Add a versioned provides, since we pull the unversioned one out.
 Provides:       perl(Log::Message::Handlers) = %{version}
@@ -727,7 +628,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        0.12
+Version:        0.16
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Module-Load
@@ -755,7 +656,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        0.01
+Version:        0.02
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Module-Loaded
@@ -787,7 +688,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        0.32
+Version:        0.34
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Object-Accessor
@@ -802,7 +703,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        0.01
+Version:        0.02
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Package-Constants
@@ -859,7 +760,7 @@ Summary:        Term::ReadLine UI made e
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        0.18
+Version:        0.20
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 Requires:       perl(Log::Message::Simple)
 
@@ -900,7 +801,7 @@ Summary:        Time objects from localt
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        1.12
+Version:        1.15
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Time-Piece
@@ -916,7 +817,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          3
-Version:        0.74
+Version:        0.77
 Requires:	perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description version
@@ -970,84 +871,45 @@ upstream tarball from perl.org.
 %patch7 -p1
 %patch8 -p1
 %patch10 -p1
-%patch11 -p1
-%patch15 -p1
-%patch16 -p1
-%patch20 -p1
-%patch26 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch33 -p1
-%patch34 -p1
 %patch35 -p1
-%patch36 -p1
-%patch37 -p1
 
-### Debian patches ###
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
 %patch58 -p1
-%patch59 -p1
-%patch60 -p1
 %patch61 -p1
+%patch62 -p1
 
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
+#patch100 -p1
+#patch101 -p1
+#patch102 -p1
+#patch103 -p1
 %patch104 -p1
-%patch105 -p1
+#patch105 -p1
 %patch106 -p1
-%patch107 -p1
-%patch108 -p1
+#patch107 -p1
+#patch108 -p1
 %patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%patch116 -p1
-%patch117 -p1
-%patch118 -p1
-%patch119 -p1
-%patch120 -p1
-%patch121 -p1
-%patch122 -p1
-# 0-byte files and patch don't seem to agree
-mkdir t/Module_Pluggable/lib/Zot/
-touch t/Module_Pluggable/lib/Zot/.Zork.pm
-%patch123 -p1
-%patch124 -p1
-%patch125 -p1
-
-
-%patch201 -p1
+#patch110 -p1
+#patch111 -p1
+#patch112 -p1
+#patch113 -p1
+#patch114 -p1
+#patch115 -p1
+#patch116 -p1
+#patch117 -p1
+#patch118 -p1
+#patch119 -p1
+#patch120 -p1
+#patch121 -p1
+#patch122 -p1
+#patch123 -p1
+#patch124 -p1
+#patch125 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
 # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
 recode()
 {
-        iconv -f "$2" -t utf-8 < "$1" > "${1}_"
+        iconv -f "${2:-iso-8859-1}" -t utf-8 < "$1" > "${1}_"
         touch -r "$1" "${1}_"
         mv -f "${1}_" "$1"
 }
@@ -1055,17 +917,13 @@ recode README.cn euc-cn
 recode README.jp euc-jp
 recode README.ko euc-kr
 recode README.tw big5
-recode pod/perlebcdic.pod iso-8859-1
-recode pod/perlhack.pod iso-8859-1
-recode pod/perlhist.pod iso-8859-1
-recode pod/perlothrtut.pod iso-8859-1
-recode pod/perlthrtut.pod iso-8859-1
-recode lib/Unicode/Collate.pm iso-8859-1
-for i in Changes*; do
-    recode $i iso-8859-1
-done
-recode AUTHORS iso-8859-1
-
+recode pod/perlebcdic.pod
+recode pod/perlhack.pod
+recode pod/perlhist.pod
+recode pod/perlothrtut.pod
+recode pod/perlthrtut.pod
+recode lib/Unicode/Collate.pm
+recode AUTHORS
 
 find . -name \*.orig -exec rm -fv {} \;
 
@@ -1091,9 +949,10 @@ EOF
 chmod +x %{__perl_provides}
 
 # Configure Compress::Zlib to use system zlib
-sed -i "s|BUILD_ZLIB      = True|BUILD_ZLIB      = False|" ext/Compress/Raw/Zlib/config.in
-sed -i "s|INCLUDE         = ./zlib-src|INCLUDE         = %{_includedir}|" ext/Compress/Raw/Zlib/config.in
-sed -i "s|LIB             = ./zlib-src|LIB             = %{_libdir}|" ext/Compress/Raw/Zlib/config.in
+sed -i 's|BUILD_ZLIB      = True|BUILD_ZLIB      = False|
+	s|INCLUDE         = ./zlib-src|INCLUDE         = %{_includedir}|
+	s|LIB             = ./zlib-src|LIB             = %{_libdir}|' \
+	ext/Compress-Raw-Zlib/config.in
 
 %build
 echo "RPM Build arch: %{_arch}"
@@ -1101,7 +960,19 @@ echo "RPM Build arch: %{_arch}"
 # use "lib", not %{_lib}, for privlib, sitelib, and vendorlib
 # To build production version, we would need -DDEBUGGING=-g
 
+# transition period:
+%define old_sitearch	%{_prefix}/local/%{_lib}/perl5/site_perl/5.10.0/%{perl_archname}
+%define old_sitelib	%{_prefix}/local/lib/perl5/site_perl/5.10.0
+%define old_vendorarch	%{_libdir}/perl5/vendor_perl/5.10.0/%{perl_archname}
+# for a reason that is not clear, the version component got stripped here:
+%define old_vendorlib	%{_prefix}/lib/perl5/vendor_perl
+# No need to add old privdir and archdir to otherlibdirs.
+
+%define privlib		%{_prefix}/share/perl5
+%define archlib		%{_libdir}/perl5
+
 /bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
+	-DDEBUGGING=-g \
 	-Accflags="-DPERL_USE_SAFE_PUTENV" \
         -Dversion=%{perl_version} \
         -Dmyhostname=localhost \
@@ -1111,13 +982,23 @@ echo "RPM Build arch: %{_arch}"
         -Dprefix=%{_prefix} \
         -Dvendorprefix=%{_prefix} \
         -Dsiteprefix=%{_prefix}/local \
+        -Dsitelib="%{_prefix}/local/share/perl5" \
+        -Dsitearch="%{_prefix}/local/%{_lib}/perl5" \
+        -Dprivlib="%{privlib}" \
+        -Dvendorlib="%{privlib}" \
+        -Darchlib="%{archlib}" \
+        -Dvendorarch="%{archlib}" \
+%if 0
         -Dprivlib="%{_prefix}/lib/perl5/%{perl_version}" \
         -Dsitelib="%{_prefix}/local/lib/perl5/site_perl/%{perl_version}" \
         -Dvendorlib="%{_prefix}/lib/perl5/vendor_perl/%{perl_version}" \
         -Darchlib="%{_libdir}/perl5/%{perl_version}/%{perl_archname}" \
         -Dsitearch="%{_prefix}/local/%{_lib}/perl5/site_perl/%{perl_version}/%{perl_archname}" \
         -Dvendorarch="%{_libdir}/perl5/vendor_perl/%{perl_version}/%{perl_archname}" \
-        -Dinc_version_list=none \
+%endif
+%if 1
+        -Dinc_version_list="5.10.0" \
+%endif
         -Darchname=%{perl_archname} \
 %ifarch %{multilib_64_archs}
         -Dlibpth="/usr/local/lib64 /lib64 %{_prefix}/lib64" \
@@ -1146,7 +1027,11 @@ echo "RPM Build arch: %{_arch}"
         -Ud_endprotoent_r_proto -Ud_setprotoent_r_proto \
         -Ud_endservent_r_proto -Ud_setservent_r_proto \
         -Dscriptdir='%{_bindir}' \
-        -Dotherlibdirs=/usr/lib/perl5/site_perl
+        -Dotherlibdirs="%{old_sitearch}:%{old_sitelib}:%{old_vendorarch}:%{old_vendorlib}:/usr/lib/perl5/site_perl"
+
+# this is promised to stay forever:
+#        -Dotherlibdirs=%{prefix}/lib/perl5/site_perl
+
 
 %ifarch sparc64
 make
@@ -1158,49 +1043,34 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%define new_perl_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{version}
-%define comp_perl_lib $RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{version}
-%define new_arch_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{version}/%{perl_archname}
-%define new_vendor_lib $RPM_BUILD_ROOT%{_libdir}/perl5/vendor_perl/%{version}
-%define comp_vendor_lib $RPM_BUILD_ROOT%{_prefix}/lib/perl5/vendor_perl/%{version}
-%define new_perl_flags LD_PRELOAD=%{new_arch_lib}/CORE/libperl.so LD_LIBRARY_PATH=%{new_arch_lib}/CORE PERL5LIB=%{new_perl_lib}:%{comp_perl_lib}
-%define new_perl %{new_perl_flags} $RPM_BUILD_ROOT%{_bindir}/perl
+%define build_archlib $RPM_BUILD_ROOT%{archlib}
+%define build_privlib $RPM_BUILD_ROOT%{privlib}
+%define build_bindir  $RPM_BUILD_ROOT%{_bindir}
+%define new_perl LD_PRELOAD="%{build_archlib}/CORE/libperl.so" \\\
+	LD_LIBRARY_PATH="%{build_archlib}/CORE" \\\
+	PERL5LIB="%{build_archlib}:%{build_privlib}" \\\
+	%{build_bindir}/perl
+
+# perl doesn't create the auto subdirectory, but modules put things in it,
+# so we need to own it.
+mkdir -p -m 755 %{build_archlib}/auto
 
-# perl doesn't create this directory, but modules put things in it, so we need to own it.
-mkdir -p -m 755 %{new_vendor_lib}/%{perl_archname}/auto
+install -p -m 755 utils/pl2pm %{build_bindir}/pl2pm
 
-%ifarch %{multilib_64_archs}
-%ifarch x86_64
-%define arch32 i386
-%endif
-%ifarch s390x
-%define arch32 s390
-%endif
-%ifarch ppc64
-%define arch32 ppc
-%endif
-%ifarch sparc64
-%define arch32 sparc
-%endif
-mkdir -p -m 755 %{comp_perl_lib} %{comp_vendor_lib}{,/%{arch32}-%{_os}%{perl_arch_stem}/auto}
-%endif
-
-install -p -m 755 utils/pl2pm ${RPM_BUILD_ROOT}%{_bindir}/pl2pm
-
-for i in asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h sys/socket.h sys/time.h wait.h
+for i in asm/termios.h syscall.h syslimits.h syslog.h \
+	sys/ioctl.h sys/socket.h sys/time.h wait.h
 do
-  %{new_perl} $RPM_BUILD_ROOT%{_bindir}/h2ph -a -d %{new_arch_lib} $i || /bin/true
+  %{new_perl} %{build_bindir}/h2ph -a -d %{build_archlib} $i || true
 done
 
 #
 # libnet configuration file
 #
-install -p -m 644 %{SOURCE12} %{comp_perl_lib}/Net/libnet.cfg
+install -p -m 644 %{SOURCE12} %{build_privlib}/Net/libnet.cfg
 
 #
 # perl RPM macros
 #
-
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
 install -p -m 644 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/
 
@@ -1208,47 +1078,40 @@ install -p -m 644 %{SOURCE13} ${RPM_BUIL
 # Core modules removal
 #
 find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv
-
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty | xargs rm -f 
 
-# Install sample cgi scripts (this used to happen automatically?)
-mkdir -p %{comp_perl_lib}/CGI/eg/
-cp -a lib/CGI/eg/* %{comp_perl_lib}/CGI/eg/
-
-# Cleanup binary paths and make cgi files executable
-pushd %{comp_perl_lib}/CGI/eg/
-  for i in *.cgi make_links.pl RunMeFirst ; do
-    sed -i 's|%{_prefix}/local/bin/perl|%{_bindir}/perl|g' $i
-    chmod +x $i
-  done
+# Install sample cgi scripts (this used to happen automatically?),
+# cleanup binary paths and make cgi files executable
+cgidir=%{build_privlib}/CGI/eg/
+mkdir -p $cgidir
+cp -a lib/CGI/eg/* $cgidir
+pushd $cgidir
+  cgifiles='*.cgi make_links.pl RunMeFirst'
+  sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|g' $cgifiles
+  chmod +x $cgifiles
 popd
 
-# miniperl? As an interpreter? How odd.
-sed -i 's|./miniperl|%{_bindir}/perl|' %{comp_perl_lib}/ExtUtils/xsubpp
-chmod +x %{comp_perl_lib}/ExtUtils/xsubpp
+chmod -R u+w $RPM_BUILD_ROOT/*
+
+# miniperl? As an interpreter? How odd. Anyway, a symlink does it:
+rm %{build_privlib}/ExtUtils/xsubpp
+ln -s ../../../bin/xsubpp %{build_privlib}/ExtUtils/
 
 # Don't need the .packlist
-rm -f %{new_arch_lib}/.packlist
+rm %{build_archlib}/.packlist
 
 # Fix some manpages to be UTF-8
 pushd $RPM_BUILD_ROOT%{_mandir}/man1/
   for i in perl588delta.1 perldelta.1 ; do
     iconv -f MS-ANSI -t UTF-8 $i --output new-$i
-    rm -rf $i
+    rm $i
     mv new-$i $i
   done
 popd
 
-chmod -R u+w $RPM_BUILD_ROOT/*
-
-# Compress Changes* to save space
-bzip2 -9 Changes*
-echo "The Changes* files were moved to %{_docdir}/%{name}-devel*" \
-	> Changes-moved-to-perl-devel
-
 # Local patch tracking
-cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/
-perl -x patchlevel.h \
+pushd %{build_archlib}/CORE/
+%{new_perl} -x patchlevel.h \
 	'Fedora Patch1: Permit suidperl to install as nonroot' \
 	'Fedora Patch2: Removes date check, Fedora/RHEL specific' \
 %ifnarch sparc64 \
@@ -1261,42 +1124,15 @@ perl -x patchlevel.h \
 	'Fedora Patch7: USE_MM_LD_RUN_PATH' \
 	'Fedora Patch8: Skip hostname tests, due to builders not being network capable' \
 	'Fedora Patch10: Dont run one io test due to random builder failures' \
-	'32891 fix big slowdown in 5.10 @_ parameter passing' \
-	'Fedora Patch15: Adopt upstream commit for assertion' \
-	'Fedora Patch16: Access permission - rt49003' \
-	'Fedora Patch20: pos function handle unicode correct' \
-	'Fedora Patch26: Fix crash when localizing a symtab entry - rt52740' \
-	'33640 Integrate Changes 33399, 33621, 33622, 33623, 33624' \
-	'33881 Integrate Changes 33825, 33826, 33829' \
-	'33896 Eliminate POSIX::int_macro_int, and all the complex AUTOLOAD fandango' \
-	'33897 Replaced the WEXITSTATUS, WIFEXITED, WIFSIGNALED, WIFSTOPPED, WSTOPSIG' \
-	'54934 Change 34025 refcount of the globs generated by PerlIO::via balanced' \
-	'34507 Fix memory leak in single-char character class optimization' \
 	'Fedora Patch35: Reorder @INC, based on b9ba2fadb18b54e35e5de54f945111a56cbcb249' \
-	'Fedora Patch36: Fix from Archive::Extract maintainer to only look at stdout from tar' \
-	'Fedora Patch37: Do not distort lib/CGI/t/util-58.t' \
-	'32727 Fix issue with (nested) definition lists in lib/Pod/Html.pm' \
-	'33287 Fix NULLOK items' \
-	'33554 Fix a typo in the predefined common protocols to make _udp_ resolve without netbase' \
-	'33388 Fix a segmentation fault with debugperl -Dm' \
-	'33835 Allow the quote mark delimiter also for those #include directives chased with h2ph -a.' \
-	'32910 Disable the v-string in use/require is non-portable warning.' \
-	'33807 Fix a segmentation fault occurring in the mod_perl2 test suite.' \
-	'33370 Fix the PerlIO_teardown prototype to suppress a compiler warning.' \
-	'Fedora Patch48: Remove numeric overloading of Getopt::Long callback functions.' \
-	'33821 Fix Math::BigFloat::sqrt() breaking with too many digits.' \
-	'33937 Fix memory corruption with in-place sorting' \
-	'33732 Revert an incorrect substitution optimization introduced in 5.10.0' \
-	'33265 Fix Unknown error messages with attribute.pm.' \
-	'33749 Stop t/op/fork.t relying on rand()' \
-	'34506 Fix memory leak with qr//' \
-	'Fedora Patch55: File::Path::rmtree no longer allows creating of setuid files.' \
-	'Fedora Patch56: Fix $? when dumping core' \
-	'34209 Fix a memory leak with Scalar::Util::weaken()' \
-	'fix RT 39060, errno incorrectly set in perlio' \
-	'Fedora Patch59: h2ph: generated *.ph files no longer produce warnings when processed' \
-	'Fedora Patch60: remove PREREQ_FATAL from Makefile.PLs processed by miniperl' \
+	'Fedora Patch58: fix RT 39060, errno incorrectly set in perlio' \
 	'Fedora Patch61: much better swap logic to support reentrancy and fix assert failure' \
+	'Fedora Patch62: backward compatibility for the trasition' \
+	'Fedora Patch104: Update ExtUtils::CBuilder to %{ExtUtils_CBuilder_version}' \
+	'Fedora Patch106: Update File::Path to %{File_Path_version}' \
+	'Fedora Patch109: Update Module::Build to %{Module_Build_version}' \
+
+: \
 	'Fedora Patch100: Update module constant to %{constant_version}' \
 	'Fedora Patch101: Update Archive::Extract to %{Archive_Extract_version}' \
 	'Fedora Patch102: Update Archive::Tar to %{Archive_Tar_version}' \
@@ -1323,10 +1159,14 @@ perl -x patchlevel.h \
 	'Fedora Patch123: Update Storable to %{Storable_version}' \
 	'Fedora Patch124: Update IO::Compress::Base to %{IO_Compress_Base_version}' \
 	'Fedora Patch125: Update IO::Compress::Zlib to %{IO_Compress_Zlib_version}' \
-	'Fedora Patch201: Fedora uses links instead of lynx' \
 	%{nil}
 
 rm patchlevel.bak
+popd
+
+#FIXME: temporary compatibility hack: for perl(:MODULE_COMPAT_5.10.0)
+mkdir -p %{_libdir}/perl5/5.10.0/%{perl_archname}
+ln -s ../../CORE %{_libdir}/perl5/5.10.0/%{perl_archname}/CORE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1345,30 +1185,27 @@ TMPDIR="$PWD/tmp" make test
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic AUTHORS Copying README
-%doc Changes-moved-to-perl-devel
+%doc Artistic AUTHORS Copying README Changes
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 %{_bindir}/*
-%{_libdir}/perl5/
-%ifarch %{multilib_64_archs}
-%{_prefix}/lib/perl5/
-%endif
+%{privlib}
+%{archlib}
 
 # libs
-%exclude %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/libperl.so
+%exclude %{archlib}/CORE/libperl.so
 
 # devel
 %exclude %{_bindir}/enc2xs
 %exclude %{_mandir}/man1/enc2xs*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Encode/
+%exclude %{privlib}/Encode/
 %exclude %{_bindir}/h2xs
 %exclude %{_mandir}/man1/h2xs*
 %exclude %{_bindir}/libnetcfg
 %exclude %{_mandir}/man1/libnetcfg*
 %exclude %{_bindir}/perlivp
 %exclude %{_mandir}/man1/perlivp*
-%exclude %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/*.h
+%exclude %{archlib}/CORE/*.h
 %exclude %{_bindir}/xsubpp
 %exclude %{_mandir}/man1/xsubpp*
 
@@ -1377,22 +1214,22 @@ TMPDIR="$PWD/tmp" make test
 %exclude %{_bindir}/sperl%{perl_version}
 
 # Archive-Extract
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Archive/Extract.pm
+%exclude %{privlib}/Archive/Extract.pm
 %exclude %{_mandir}/man3/Archive::Extract.3*
 
 # Archive-Tar
 %exclude %{_bindir}/ptar
 %exclude %{_bindir}/ptardiff
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Archive/Tar/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Archive/Tar.pm
+%exclude %{privlib}/Archive/Tar/
+%exclude %{privlib}/Archive/Tar.pm
 %exclude %{_mandir}/man1/ptar.1*
 %exclude %{_mandir}/man1/ptardiff.1*
 %exclude %{_mandir}/man3/Archive::Tar*
 
 # CPAN
 %exclude %{_bindir}/cpan
-%exclude %{_prefix}/lib/perl5/%{perl_version}/CPAN/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/CPAN.pm
+%exclude %{privlib}/CPAN/
+%exclude %{privlib}/CPAN.pm
 %exclude %{_mandir}/man1/cpan.1*
 %exclude %{_mandir}/man3/CPAN.*
 %exclude %{_mandir}/man3/CPAN:*
@@ -1401,57 +1238,57 @@ TMPDIR="$PWD/tmp" make test
 %exclude %{_bindir}/cpan2dist
 %exclude %{_bindir}/cpanp
 %exclude %{_bindir}/cpanp-run-perl
-%exclude %{_prefix}/lib/perl5/%{perl_version}/CPANPLUS/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/CPANPLUS.pm
+%exclude %{privlib}/CPANPLUS/
+%exclude %{privlib}/CPANPLUS.pm
 %exclude %{_mandir}/man1/cpan2dist.1*
 %exclude %{_mandir}/man1/cpanp.1*
 %exclude %{_mandir}/man3/CPANPLUS*
 
 # Compress::Raw::Zlib
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/Compress
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/Compress/Raw/
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/auto/Compress
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/auto/Compress/Raw/
+%exclude %{archlib}/Compress
+%exclude %{archlib}/Compress/Raw/
+%exclude %{archlib}/auto/Compress
+%exclude %{archlib}/auto/Compress/Raw/
 %exclude %{_mandir}/man3/Compress::Raw::Zlib*
 
 # Compress::Zlib
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/Compress/Zlib.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/auto/Compress/Zlib/
+%exclude %{archlib}/Compress/Zlib.pm
+%exclude %{archlib}/auto/Compress/Zlib/
 %exclude %{_mandir}/man3/Compress::Zlib*
 
 # Digest::SHA
 %exclude %{_bindir}/shasum
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/Digest/SHA.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/auto/Digest/SHA/
+%exclude %{archlib}/Digest/SHA.pm
+%exclude %{archlib}/auto/Digest/SHA/
 %exclude %{_mandir}/man1/shasum.1*
 %exclude %{_mandir}/man3/Digest::SHA.3*
 
 # ExtUtils::CBuilder
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/CBuilder/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/CBuilder.pm
+%exclude %{privlib}/ExtUtils/CBuilder/
+%exclude %{privlib}/ExtUtils/CBuilder.pm
 %exclude %{_mandir}/man3/ExtUtils::CBuilder*
 
 # ExtUtils::Embed
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Embed.pm
+%exclude %{privlib}/ExtUtils/Embed.pm
 %exclude %{_mandir}/man3/ExtUtils::Embed*
 
 # ExtUtils::MakeMaker
 %exclude %{_bindir}/instmodsh
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Command/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Install.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Installed.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MM*.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MY.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Manifest.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Packlist.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/testlib.pm
+%exclude %{privlib}/ExtUtils/Command/
+%exclude %{privlib}/ExtUtils/Install.pm
+%exclude %{privlib}/ExtUtils/Installed.pm
+%exclude %{privlib}/ExtUtils/Liblist/
+%exclude %{privlib}/ExtUtils/Liblist.pm
+%exclude %{privlib}/ExtUtils/MakeMaker/
+%exclude %{privlib}/ExtUtils/MakeMaker.pm
+%exclude %{privlib}/ExtUtils/MANIFEST.SKIP
+%exclude %{privlib}/ExtUtils/MM*.pm
+%exclude %{privlib}/ExtUtils/MY.pm
+%exclude %{privlib}/ExtUtils/Manifest.pm
+%exclude %{privlib}/ExtUtils/Mkbootstrap.pm
+%exclude %{privlib}/ExtUtils/Mksymlists.pm
+%exclude %{privlib}/ExtUtils/Packlist.pm
+%exclude %{privlib}/ExtUtils/testlib.pm
 %exclude %{_mandir}/man1/instmodsh.1*
 %exclude %{_mandir}/man3/ExtUtils::Command::MM*
 %exclude %{_mandir}/man3/ExtUtils::Install.3*
@@ -1467,40 +1304,40 @@ TMPDIR="$PWD/tmp" make test
 %exclude %{_mandir}/man3/ExtUtils::testlib.3*
 
 # ExtUtils::ParseXS
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/ParseXS.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/xsubpp
+%exclude %{privlib}/ExtUtils/ParseXS.pm
+%exclude %{privlib}/ExtUtils/xsubpp
 %exclude %{_mandir}/man3/ExtUtils::ParseXS.3*
 
 # File::Fetch
-%exclude %{_prefix}/lib/perl5/%{perl_version}/File/Fetch.pm
+%exclude %{privlib}/File/Fetch.pm
 %exclude %{_mandir}/man3/File::Fetch.3*
 
 # IO::Compress::Base
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/File/GlobMapper.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Base/
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Base.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/AnyUncompress.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Base.pm
+%exclude %{archlib}/File/GlobMapper.pm
+%exclude %{archlib}/IO/Compress/Base/
+%exclude %{archlib}/IO/Compress/Base.pm
+%exclude %{archlib}/IO/Uncompress/AnyUncompress.pm
+%exclude %{archlib}/IO/Uncompress/Base.pm
 %exclude %{_mandir}/man3/File::GlobMapper.*
 %exclude %{_mandir}/man3/IO::Compress::Base.*
 %exclude %{_mandir}/man3/IO::Uncompress::AnyUncompress.*
 %exclude %{_mandir}/man3/IO::Uncompress::Base.*
 
 # IO::Compress::Zlib
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Adapter/
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Deflate.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Gzip/
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Gzip.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/RawDeflate.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Zip/
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Zip.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Zlib/
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Adapter/
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/AnyInflate.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Gunzip.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Inflate.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/RawInflate.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Unzip.pm
+%exclude %{archlib}/IO/Compress/Adapter/
+%exclude %{archlib}/IO/Compress/Deflate.pm
+%exclude %{archlib}/IO/Compress/Gzip/
+%exclude %{archlib}/IO/Compress/Gzip.pm
+%exclude %{archlib}/IO/Compress/RawDeflate.pm
+%exclude %{archlib}/IO/Compress/Zip/
+%exclude %{archlib}/IO/Compress/Zip.pm
+%exclude %{archlib}/IO/Compress/Zlib/
+%exclude %{archlib}/IO/Uncompress/Adapter/
+%exclude %{archlib}/IO/Uncompress/AnyInflate.pm
+%exclude %{archlib}/IO/Uncompress/Gunzip.pm
+%exclude %{archlib}/IO/Uncompress/Inflate.pm
+%exclude %{archlib}/IO/Uncompress/RawInflate.pm
+%exclude %{archlib}/IO/Uncompress/Unzip.pm
 %exclude %{_mandir}/man3/IO::Compress::Deflate*
 %exclude %{_mandir}/man3/IO::Compress::Gzip*
 %exclude %{_mandir}/man3/IO::Compress::RawDeflate*
@@ -1512,140 +1349,138 @@ TMPDIR="$PWD/tmp" make test
 %exclude %{_mandir}/man3/IO::Uncompress::Unzip*
 
 # IO::Zlib
-%exclude %{_prefix}/lib/perl5/%{perl_version}/IO/Zlib.pm
+%exclude %{privlib}/IO/Zlib.pm
 %exclude %{_mandir}/man3/IO::Zlib.*
 
 # IPC::Cmd
-%exclude %{_prefix}/lib/perl5/%{perl_version}/IPC/Cmd.pm
+%exclude %{privlib}/IPC/Cmd.pm
 %exclude %{_mandir}/man3/IPC::Cmd.3*
 
 # Locale::Maketext::Simple
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Locale/Maketext/Simple.pm
+%exclude %{privlib}/Locale/Maketext/Simple.pm
 %exclude %{_mandir}/man3/Locale::Maketext::Simple.*
 
 # Log::Message
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Log/Message.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Log/Message/Config.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Log/Message/Handlers.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Log/Message/Item.pm
+%exclude %{privlib}/Log/Message.pm
+%exclude %{privlib}/Log/Message/Config.pm
+%exclude %{privlib}/Log/Message/Handlers.pm
+%exclude %{privlib}/Log/Message/Item.pm
 %exclude %{_mandir}/man3/Log::Message.3*
 %exclude %{_mandir}/man3/Log::Message::Config.3*
 %exclude %{_mandir}/man3/Log::Message::Handlers.3*
 %exclude %{_mandir}/man3/Log::Message::Item.3*
 
 # Log::Message::Simple
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Log/Message/Simple.pm
+%exclude %{privlib}/Log/Message/Simple.pm
 %exclude %{_mandir}/man3/Log::Message::Simple.3*
 
 # Module::Build
 %exclude %{_bindir}/config_data
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Module/Build/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Module/Build.pm
+%exclude %{privlib}/Module/Build/
+%exclude %{privlib}/Module/Build.pm
 %exclude %{_mandir}/man1/config_data.1*
 %exclude %{_mandir}/man3/Module::Build*
 
 # Module-CoreList
 %exclude %{_bindir}/corelist
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Module/CoreList.pm
+%exclude %{privlib}/Module/CoreList.pm
 %exclude %{_mandir}/man1/corelist*
 %exclude %{_mandir}/man3/Module::CoreList*
 
 # Module-Load
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Module/Load.pm
+%exclude %{privlib}/Module/Load.pm
 %exclude %{_mandir}/man3/Module::Load.*
 
 # Module-Load-Conditional
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Module/Load/
+%exclude %{privlib}/Module/Load/
 %exclude %{_mandir}/man3/Module::Load::Conditional*
 
 # Module-Loaded
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Module/Loaded.pm
+%exclude %{privlib}/Module/Loaded.pm
 %exclude %{_mandir}/man3/Module::Loaded*
 
 # Module-Pluggable
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Devel/InnerPackage.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Module/Pluggable/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Module/Pluggable.pm
+%exclude %{privlib}/Devel/InnerPackage.pm
+%exclude %{privlib}/Module/Pluggable/
+%exclude %{privlib}/Module/Pluggable.pm
 %exclude %{_mandir}/man3/Devel::InnerPackage*
 %exclude %{_mandir}/man3/Module::Pluggable*
 
 # Object-Accessor
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Object/
+%exclude %{privlib}/Object/
 %exclude %{_mandir}/man3/Object::Accessor*
 
 # Package-Constants
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Package/
+%exclude %{privlib}/Package/
 %exclude %{_mandir}/man3/Package::Constants*
 
 # Params-Check
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Params/
+%exclude %{privlib}/Params/
 %exclude %{_mandir}/man3/Params::Check*
 
 # Pod-Escapes
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Pod/Escapes.pm
+%exclude %{privlib}/Pod/Escapes.pm
 %exclude %{_mandir}/man3/Pod::Escapes.*
 
 # Pod-Simple
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Pod/Simple/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Pod/Simple.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Pod/Simple.pod
+%exclude %{privlib}/Pod/Simple/
+%exclude %{privlib}/Pod/Simple.pm
+%exclude %{privlib}/Pod/Simple.pod
 %exclude %{_mandir}/man3/Pod::Simple*
 
 # Term-UI
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Term/UI.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Term/UI/
+%exclude %{privlib}/Term/UI.pm
+%exclude %{privlib}/Term/UI/
 %exclude %{_mandir}/man3/Term::UI*
 
 # Test::Harness
 %exclude %{_bindir}/prove
-%exclude %{_prefix}/lib/perl5/%{perl_version}/App*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/TAP*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Harness*
+%exclude %{privlib}/App*
+%exclude %{privlib}/TAP*
+%exclude %{privlib}/Test/Harness*
 %exclude %{_mandir}/man1/prove.1*
 %exclude %{_mandir}/man3/App*
 %exclude %{_mandir}/man3/TAP*
 %exclude %{_mandir}/man3/Test::Harness*
 
 # Test::Simple
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/More*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Builder*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Simple*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Tutorial*
+%exclude %{privlib}/Test/More*
+%exclude %{privlib}/Test/Builder*
+%exclude %{privlib}/Test/Simple*
+%exclude %{privlib}/Test/Tutorial*
 %exclude %{_mandir}/man3/Test::More*
 %exclude %{_mandir}/man3/Test::Builder*
 %exclude %{_mandir}/man3/Test::Simple*
 %exclude %{_mandir}/man3/Test::Tutorial*
 
 # Time::Piece
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/Time/Piece.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/Time/Seconds.pm
-%exclude %{_libdir}/perl5/%{version}/%{perl_archname}/auto/Time/Piece/
+%exclude %{archlib}/Time/Piece.pm
+%exclude %{archlib}/Time/Seconds.pm
+%exclude %{archlib}/auto/Time/Piece/
 %exclude %{_mandir}/man3/Time::Piece.3*
 %exclude %{_mandir}/man3/Time::Seconds.3*
 
 # version
-%exclude %{_prefix}/lib/perl5/%{perl_version}/version.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/version.pod
+%exclude %{privlib}/version.pm
+%exclude %{privlib}/version.pod
 %exclude %{_mandir}/man3/version.*
 
 %files libs
 %defattr(-,root,root)
-%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/libperl.so
+%{archlib}/CORE/libperl.so
 
 %files devel
 %defattr(-,root,root,-)
-# the following includes the file "Changes" -- it's compressed
-%doc Changes*.*
 %{_bindir}/enc2xs
 %{_mandir}/man1/enc2xs*
-%{_prefix}/lib/perl5/%{perl_version}/Encode/
+%{privlib}/Encode/
 %{_bindir}/h2xs
 %{_mandir}/man1/h2xs*
 %{_bindir}/libnetcfg
 %{_mandir}/man1/libnetcfg*
 %{_bindir}/perlivp
 %{_mandir}/man1/perlivp*
-%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/*.h
+%{archlib}/CORE/*.h
 %{_bindir}/xsubpp
 %{_mandir}/man1/xsubpp*
 %{_sysconfdir}/rpm/macros.perl
@@ -1657,38 +1492,38 @@ TMPDIR="$PWD/tmp" make test
 
 %files Archive-Extract
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Archive/Extract.pm
+%{privlib}/Archive/Extract.pm
 %{_mandir}/man3/Archive::Extract.3*
 
 %files Archive-Tar
 %defattr(-,root,root,-)
 %{_bindir}/ptar
 %{_bindir}/ptardiff
-%{_prefix}/lib/perl5/%{perl_version}/Archive/Tar/ 
-%{_prefix}/lib/perl5/%{perl_version}/Archive/Tar.pm
+%{privlib}/Archive/Tar/ 
+%{privlib}/Archive/Tar.pm
 %{_mandir}/man1/ptar.1*
 %{_mandir}/man1/ptardiff.1*
 %{_mandir}/man3/Archive::Tar* 
 
 %files Compress-Raw-Zlib
 %defattr(-,root,root,-)
-%dir %{_libdir}/perl5/%{version}/%{perl_archname}/Compress
-%{_libdir}/perl5/%{version}/%{perl_archname}/Compress/Raw/
-%dir %{_libdir}/perl5/%{version}/%{perl_archname}/auto/Compress/
-%{_libdir}/perl5/%{version}/%{perl_archname}/auto/Compress/Raw/
+%dir %{archlib}/Compress
+%{archlib}/Compress/Raw/
+%dir %{archlib}/auto/Compress/
+%{archlib}/auto/Compress/Raw/
 %{_mandir}/man3/Compress::Raw::Zlib*
 
 %files Compress-Zlib
 %defattr(-,root,root,-)
-%{_libdir}/perl5/%{version}/%{perl_archname}/Compress/Zlib.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/auto/Compress/Zlib/
+%{archlib}/Compress/Zlib.pm
+%{archlib}/auto/Compress/Zlib/
 %{_mandir}/man3/Compress::Zlib*
 
 %files CPAN
 %defattr(-,root,root,-)
 %{_bindir}/cpan
-%{_prefix}/lib/perl5/%{perl_version}/CPAN/
-%{_prefix}/lib/perl5/%{perl_version}/CPAN.pm
+%{privlib}/CPAN/
+%{privlib}/CPAN.pm
 %{_mandir}/man1/cpan.1*
 %{_mandir}/man3/CPAN.*
 %{_mandir}/man3/CPAN:*
@@ -1698,8 +1533,8 @@ TMPDIR="$PWD/tmp" make test
 %{_bindir}/cpan2dist
 %{_bindir}/cpanp
 %{_bindir}/cpanp-run-perl
-%{_prefix}/lib/perl5/%{perl_version}/CPANPLUS/
-%{_prefix}/lib/perl5/%{perl_version}/CPANPLUS.pm
+%{privlib}/CPANPLUS/
+%{privlib}/CPANPLUS.pm
 %{_mandir}/man1/cpan2dist.1*
 %{_mandir}/man1/cpanp.1*
 %{_mandir}/man3/CPANPLUS*
@@ -1707,41 +1542,41 @@ TMPDIR="$PWD/tmp" make test
 %files Digest-SHA
 %defattr(-,root,root,-)
 %{_bindir}/shasum
-%dir %{_libdir}/perl5/%{version}/%{perl_archname}/Digest/
-%{_libdir}/perl5/%{version}/%{perl_archname}/Digest/SHA.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/auto/Digest/SHA/
+%dir %{archlib}/Digest/
+%{archlib}/Digest/SHA.pm
+%{archlib}/auto/Digest/SHA/
 %{_mandir}/man1/shasum.1*
 %{_mandir}/man3/Digest::SHA.3*
 
 %files ExtUtils-CBuilder
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/CBuilder/
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/CBuilder.pm
+%{privlib}/ExtUtils/CBuilder/
+%{privlib}/ExtUtils/CBuilder.pm
 %{_mandir}/man3/ExtUtils::CBuilder*
 
 %files ExtUtils-Embed
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Embed.pm
+%{privlib}/ExtUtils/Embed.pm
 %{_mandir}/man3/ExtUtils::Embed*
 
 %files ExtUtils-MakeMaker
 %defattr(-,root,root,-)
 %{_bindir}/instmodsh
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Command/
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Install.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Installed.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist/
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker/
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MM*.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MY.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Manifest.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Packlist.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/testlib.pm
+%{privlib}/ExtUtils/Command/
+%{privlib}/ExtUtils/Install.pm
+%{privlib}/ExtUtils/Installed.pm
+%{privlib}/ExtUtils/Liblist/
+%{privlib}/ExtUtils/Liblist.pm
+%{privlib}/ExtUtils/MakeMaker/
+%{privlib}/ExtUtils/MakeMaker.pm
+%{privlib}/ExtUtils/MANIFEST.SKIP
+%{privlib}/ExtUtils/MM*.pm
+%{privlib}/ExtUtils/MY.pm
+%{privlib}/ExtUtils/Manifest.pm
+%{privlib}/ExtUtils/Mkbootstrap.pm
+%{privlib}/ExtUtils/Mksymlists.pm
+%{privlib}/ExtUtils/Packlist.pm
+%{privlib}/ExtUtils/testlib.pm
 %{_mandir}/man1/instmodsh.1*
 %{_mandir}/man3/ExtUtils::Command::MM*
 %{_mandir}/man3/ExtUtils::Install.3*
@@ -1758,22 +1593,22 @@ TMPDIR="$PWD/tmp" make test
 
 %files ExtUtils-ParseXS
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/ParseXS.pm
-%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/xsubpp
+%{privlib}/ExtUtils/ParseXS.pm
+%{privlib}/ExtUtils/xsubpp
 %{_mandir}/man3/ExtUtils::ParseXS.3*
 
 %files File-Fetch
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/File/Fetch.pm
+%{privlib}/File/Fetch.pm
 %{_mandir}/man3/File::Fetch.3*
 
 %files IO-Compress-Base
 %defattr(-,root,root,-)
-%{_libdir}/perl5/%{version}/%{perl_archname}/File/GlobMapper.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Base/
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Base.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/AnyUncompress.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Base.pm
+%{archlib}/File/GlobMapper.pm
+%{archlib}/IO/Compress/Base/
+%{archlib}/IO/Compress/Base.pm
+%{archlib}/IO/Uncompress/AnyUncompress.pm
+%{archlib}/IO/Uncompress/Base.pm
 %{_mandir}/man3/File::GlobMapper.*
 %{_mandir}/man3/IO::Compress::Base.*
 %{_mandir}/man3/IO::Uncompress::AnyUncompress.*
@@ -1781,20 +1616,20 @@ TMPDIR="$PWD/tmp" make test
 
 %files IO-Compress-Zlib
 %defattr(-,root,root,-)
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Adapter/
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Deflate.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Gzip/
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Gzip.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/RawDeflate.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Zip/
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Zip.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Compress/Zlib/
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Adapter/
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/AnyInflate.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Gunzip.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Inflate.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/RawInflate.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/IO/Uncompress/Unzip.pm
+%{archlib}/IO/Compress/Adapter/
+%{archlib}/IO/Compress/Deflate.pm
+%{archlib}/IO/Compress/Gzip/
+%{archlib}/IO/Compress/Gzip.pm
+%{archlib}/IO/Compress/RawDeflate.pm
+%{archlib}/IO/Compress/Zip/
+%{archlib}/IO/Compress/Zip.pm
+%{archlib}/IO/Compress/Zlib/
+%{archlib}/IO/Uncompress/Adapter/
+%{archlib}/IO/Uncompress/AnyInflate.pm
+%{archlib}/IO/Uncompress/Gunzip.pm
+%{archlib}/IO/Uncompress/Inflate.pm
+%{archlib}/IO/Uncompress/RawInflate.pm
+%{archlib}/IO/Uncompress/Unzip.pm
 %{_mandir}/man3/IO::Compress::Deflate*
 %{_mandir}/man3/IO::Compress::Gzip*
 %{_mandir}/man3/IO::Compress::RawDeflate*
@@ -1807,25 +1642,25 @@ TMPDIR="$PWD/tmp" make test
 
 %files IO-Zlib
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/IO/Zlib.pm
+%{privlib}/IO/Zlib.pm
 %{_mandir}/man3/IO::Zlib.*
 
 %files IPC-Cmd
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/IPC/Cmd.pm
+%{privlib}/IPC/Cmd.pm
 %{_mandir}/man3/IPC::Cmd.3*
 
 %files Locale-Maketext-Simple
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Locale/Maketext/Simple.pm
+%{privlib}/Locale/Maketext/Simple.pm
 %{_mandir}/man3/Locale::Maketext::Simple.*
 
 %files Log-Message
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Log/Message.pm
-%{_prefix}/lib/perl5/%{perl_version}/Log/Message/Config.pm
-%{_prefix}/lib/perl5/%{perl_version}/Log/Message/Handlers.pm
-%{_prefix}/lib/perl5/%{perl_version}/Log/Message/Item.pm
+%{privlib}/Log/Message.pm
+%{privlib}/Log/Message/Config.pm
+%{privlib}/Log/Message/Handlers.pm
+%{privlib}/Log/Message/Item.pm
 %{_mandir}/man3/Log::Message.3*
 %{_mandir}/man3/Log::Message::Config.3*
 %{_mandir}/man3/Log::Message::Handlers.3*
@@ -1833,87 +1668,87 @@ TMPDIR="$PWD/tmp" make test
 
 %files Log-Message-Simple
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Log/Message/Simple.pm
+%{privlib}/Log/Message/Simple.pm
 %{_mandir}/man3/Log::Message::Simple.3*
 
 %files Module-Build
 %defattr(-,root,root,-)
 %{_bindir}/config_data
-%{_prefix}/lib/perl5/%{perl_version}/Module/Build/
-%{_prefix}/lib/perl5/%{perl_version}/Module/Build.pm
+%{privlib}/Module/Build/
+%{privlib}/Module/Build.pm
 %{_mandir}/man1/config_data.1*
 %{_mandir}/man3/Module::Build*
 
 %files Module-CoreList
 %defattr(-,root,root,-)
 %{_bindir}/corelist
-%{_prefix}/lib/perl5/%{perl_version}/Module/CoreList.pm
+%{privlib}/Module/CoreList.pm
 %{_mandir}/man1/corelist*
 %{_mandir}/man3/Module::CoreList*
 
 %files Module-Load
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Module/Load.pm
+%{privlib}/Module/Load.pm
 %{_mandir}/man3/Module::Load.*
 
 %files Module-Load-Conditional
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Module/Load/
+%{privlib}/Module/Load/
 %{_mandir}/man3/Module::Load::Conditional* 
 
 %files Module-Loaded
 %defattr(-,root,root,-)
-%dir %{_prefix}/lib/perl5/%{perl_version}/Module/
-%{_prefix}/lib/perl5/%{perl_version}/Module/Loaded.pm
+%dir %{privlib}/Module/
+%{privlib}/Module/Loaded.pm
 %{_mandir}/man3/Module::Loaded*
 
 %files Module-Pluggable
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Devel/InnerPackage.pm
-%{_prefix}/lib/perl5/%{perl_version}/Module/Pluggable/
-%{_prefix}/lib/perl5/%{perl_version}/Module/Pluggable.pm
+%{privlib}/Devel/InnerPackage.pm
+%{privlib}/Module/Pluggable/
+%{privlib}/Module/Pluggable.pm
 %{_mandir}/man3/Devel::InnerPackage*
 %{_mandir}/man3/Module::Pluggable*
 
 %files Object-Accessor
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Object/
+%{privlib}/Object/
 %{_mandir}/man3/Object::Accessor*
 
 %files Package-Constants
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Package/
+%{privlib}/Package/
 %{_mandir}/man3/Package::Constants*
 
 %files Params-Check
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Params/
+%{privlib}/Params/
 %{_mandir}/man3/Params::Check*
 
 %files Pod-Escapes
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Pod/Escapes.pm
+%{privlib}/Pod/Escapes.pm
 %{_mandir}/man3/Pod::Escapes.*
 
 %files Pod-Simple
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Pod/Simple/ 
-%{_prefix}/lib/perl5/%{perl_version}/Pod/Simple.pm
-%{_prefix}/lib/perl5/%{perl_version}/Pod/Simple.pod
+%{privlib}/Pod/Simple/ 
+%{privlib}/Pod/Simple.pm
+%{privlib}/Pod/Simple.pod
 %{_mandir}/man3/Pod::Simple*
 
 %files Term-UI
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Term/UI/
-%{_prefix}/lib/perl5/%{perl_version}/Term/UI.pm
+%{privlib}/Term/UI/
+%{privlib}/Term/UI.pm
 %{_mandir}/man3/Term::UI*
 
 %files Test-Harness
 %defattr(-,root,root,-)
 %{_bindir}/prove
-%{_prefix}/lib/perl5/%{perl_version}/App*
-%{_prefix}/lib/perl5/%{perl_version}/TAP*
-%{_prefix}/lib/perl5/%{perl_version}/Test/Harness*
+%{privlib}/App*
+%{privlib}/TAP*
+%{privlib}/Test/Harness*
 %{_mandir}/man1/prove.1*
 %{_mandir}/man3/App*
 %{_mandir}/man3/TAP*
@@ -1921,10 +1756,10 @@ TMPDIR="$PWD/tmp" make test
 
 %files Test-Simple
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/Test/More*
-%{_prefix}/lib/perl5/%{perl_version}/Test/Builder*
-%{_prefix}/lib/perl5/%{perl_version}/Test/Simple*
-%{_prefix}/lib/perl5/%{perl_version}/Test/Tutorial*
+%{privlib}/Test/More*
+%{privlib}/Test/Builder*
+%{privlib}/Test/Simple*
+%{privlib}/Test/Tutorial*
 %{_mandir}/man3/Test::More*
 %{_mandir}/man3/Test::Builder*
 %{_mandir}/man3/Test::Simple*
@@ -1932,16 +1767,16 @@ TMPDIR="$PWD/tmp" make test
 
 %files Time-Piece
 %defattr(-,root,root,-)
-%{_libdir}/perl5/%{version}/%{perl_archname}/Time/Piece.pm 
-%{_libdir}/perl5/%{version}/%{perl_archname}/Time/Seconds.pm
-%{_libdir}/perl5/%{version}/%{perl_archname}/auto/Time/Piece/        
+%{archlib}/Time/Piece.pm 
+%{archlib}/Time/Seconds.pm
+%{archlib}/auto/Time/Piece/        
 %{_mandir}/man3/Time::Piece.3*
 %{_mandir}/man3/Time::Seconds.3*
 
 %files version
 %defattr(-,root,root,-)
-%{_prefix}/lib/perl5/%{perl_version}/version.pm
-%{_prefix}/lib/perl5/%{perl_version}/version.pod
+%{privlib}/version.pm
+%{privlib}/version.pod
 %{_mandir}/man3/version.*
 
 %files core
@@ -1949,6 +1784,18 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Wed Dec  2 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-100
+- new upstream version
+- release number must be high, because of stale version numbers of some
+  of the subpackages
+- drop upstreamed patches
+- update the versions of bundled modules
+- shorten the paths in @INC
+- build without DEBUGGING
+- implement compatibility measures for the above two changes, for a short
+  transition period
+- provide perl(:MODULE_COMPAT_5.10.0), for that transition period only
+
 * Tue Dec  1 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-87
 - fix patch-update-Compress-Raw-Zlib.patch (did not patch Zlib.pm)
 - update Compress::Raw::Zlib to 2.023


--- 02_fix_pod2html_dl DELETED ---


--- 07_fix_nullok DELETED ---


--- 08_fix_udp_typo DELETED ---


--- 09_fix_memory_debugging DELETED ---


--- 10_fix_h2ph_include_quote DELETED ---


--- 11_disable_vstring_warning DELETED ---


--- 15_fix_local_symtab DELETED ---


--- 16_fix_perlio_teardown_prototype DELETED ---


--- 17_fix_getopt_long_callback DELETED ---


--- 18_fix_bigint_floats DELETED ---


--- 25_fix_cgi_tempdir DELETED ---


--- 27_fix_sys_syslog_timeout DELETED ---


--- 28_fix_inplace_sort DELETED ---


--- 30_fix_freetmps DELETED ---


--- 31_fix_attributes_unknown_error DELETED ---


--- 32891.patch DELETED ---


--- 32_fix_fork_rand DELETED ---


--- 34_fix_qr-memory-leak-2 DELETED ---


--- 36_fix_file_temp_cleanup DELETED ---


--- 37_fix_coredump_indicator DELETED ---


--- 38_fix_weaken_memleak DELETED ---


--- perl-5.10.0-Archive-Extract-onlystdout.patch DELETED ---


--- perl-5.10.0-Change33640.patch DELETED ---


--- perl-5.10.0-Change33881.patch DELETED ---


--- perl-5.10.0-Change33896.patch DELETED ---


--- perl-5.10.0-Change33897.patch DELETED ---


--- perl-5.10.0-Change34507.patch DELETED ---


--- perl-5.10.0-PerlIO-via-change34025.patch DELETED ---


--- perl-5.10.0-USE_MM_LD_RUN_PATH.patch DELETED ---


--- perl-5.10.0-accessXOK.patch DELETED ---


--- perl-5.10.0-bz448392.patch DELETED ---


--- perl-5.10.0-fix_file_path_rmtree_setuid.patch DELETED ---


--- perl-5.10.0-much-better-swap-logic.patch DELETED ---


--- perl-5.10.0-perlbug-tag.patch DELETED ---


--- perl-5.10.0-pos.patch DELETED ---


--- perl-5.10.0-stlocal.patch DELETED ---


--- perl-5.8.0-root.patch DELETED ---


--- perl-CGI-t-util-58.patch DELETED ---


--- perl-bz509676.patch DELETED ---


--- perl-skip-prereq.patch DELETED ---



From varekova at fedoraproject.org  Thu Dec  3 11:39:29 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Thu,  3 Dec 2009 11:39:29 +0000 (UTC)
Subject: rpms/man-pages/F-12 man-pages-3.22-sched_setaffinity.patch, 1.1,
	1.2 man-pages.spec, 1.123, 1.124
Message-ID: <20091203113929.A83B511C00EE@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11845

Modified Files:
	man-pages-3.22-sched_setaffinity.patch man-pages.spec 
Log Message:
- fix typo in sched_setaffinity(2) patch


man-pages-3.22-sched_setaffinity.patch:
 sched_setaffinity.2 |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

Index: man-pages-3.22-sched_setaffinity.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/F-12/man-pages-3.22-sched_setaffinity.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- man-pages-3.22-sched_setaffinity.patch	2 Dec 2009 14:34:57 -0000	1.1
+++ man-pages-3.22-sched_setaffinity.patch	3 Dec 2009 11:39:29 -0000	1.2
@@ -49,14 +49,14 @@ diff -up man-pages-3.22/man2/sched_setaf
 +
 +        for ( i = 0; i < nrcpus; i++ ) {
 +                if ( CPU_ISSET_S(i, size, mask) ) {
-+                        printf("CPU %d is set\n", (i+1));
++                        printf("CPU %d is set\\n", (i+1));
 +                }
 +        }
 +
 +        CPU_FREE(mask);
 +
 +        return 0;
-+   }  
++   }
 +.fi
 +
  .SH "SEE ALSO"


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/F-12/man-pages.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- man-pages.spec	2 Dec 2009 14:34:57 -0000	1.123
+++ man-pages.spec	3 Dec 2009 11:39:29 -0000	1.124
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.22
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Thu Dec  3 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 3.22-8
+- fix typo in sched_setaffinity(2) patch
+
 * Wed Dec  2 2009 Ivana Varekova <varekova at redhat.com> - 3.22-7
 - fix sched_setaffinity(2) page - add an EXAMPLE and new NOTES
 



From dnovotny at fedoraproject.org  Thu Dec  3 11:40:26 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu,  3 Dec 2009 11:40:26 +0000 (UTC)
Subject: rpms/gob2/devel gob2.spec,1.23,1.24
Message-ID: <20091203114026.F3C6C11C03E3@cvs1.fedora.phx.redhat.com>

Author: dnovotny

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

Modified Files:
	gob2.spec 
Log Message:
merge review fix



Index: gob2.spec
===================================================================
RCS file: /cvs/extras/rpms/gob2/devel/gob2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gob2.spec	24 Nov 2009 10:57:10 -0000	1.23
+++ gob2.spec	3 Dec 2009 11:40:26 -0000	1.24
@@ -1,10 +1,10 @@
 Summary: The GObject Builder
 Name: gob2
 Version: 2.0.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Development/Tools
-Source: gob2-%{version}.tar.gz
+Source: http://ftp.5z.com/pub/gob/gob2-%{version}.tar.gz
 Url: http://www.5z.com/jirka/gob.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Dec 03 2009 Daniel Novotny <dnovotny at redhat.com> 2.0.16-4
+- fixed "Source:" URL in spec (merge review: #225851)
+
 * Tue Nov 24 2009 Daniel Novotny <dnovotny at redhat.com> 2.0.16-3
 - fix #519108 class and enum names convert incorrectly in mock / koji.
 



From theinric at fedoraproject.org  Thu Dec  3 11:45:32 2009
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Thu,  3 Dec 2009 11:45:32 +0000 (UTC)
Subject: rpms/rsyslog/F-12 rsyslog-4.4.2-unlimited-select.patch, NONE,
	1.1 .cvsignore, 1.33, 1.34 rsyslog.spec, 1.64, 1.65 sources,
	1.35, 1.36
Message-ID: <20091203114532.8498211C00EE@cvs1.fedora.phx.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13249

Modified Files:
	.cvsignore rsyslog.spec sources 
Added Files:
	rsyslog-4.4.2-unlimited-select.patch 
Log Message:
- rebase to rsyslog-4.4.2
- add rsyslog-4.4.2-unlimited-select.patch




rsyslog-4.4.2-unlimited-select.patch:
 configure.ac                |   16 +++++++++++++
 gss-misc.c                  |   25 +++++++++++++++++----
 plugins/imgssapi/imgssapi.c |   16 ++++++++++---
 plugins/imudp/imudp.c       |   20 ++++++++++++-----
 plugins/imuxsock/imuxsock.c |   20 ++++++++++++-----
 runtime/Makefile.am         |    1 
 runtime/glbl.c              |   12 ++++++++++
 runtime/glbl.h              |    3 +-
 runtime/nsdsel_ptcp.c       |   51 +++++++++++++++++++++++++++++++++++---------
 runtime/nsdsel_ptcp.h       |    5 ++++
 runtime/unlimited_select.h  |   45 ++++++++++++++++++++++++++++++++++++++
 tools/syslogd.c             |    3 ++
 12 files changed, 185 insertions(+), 32 deletions(-)

--- NEW FILE rsyslog-4.4.2-unlimited-select.patch ---
diff -up rsyslog-4.4.2.unlimited-select/configure.ac.orig rsyslog-4.4.2.unlimited-select/configure.ac
--- rsyslog-4.4.2.unlimited-select/configure.ac.orig	2009-12-02 17:56:40.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/configure.ac	2009-12-02 14:14:22.000000000 +0100
@@ -341,6 +341,21 @@ AC_ARG_ENABLE([fsstnd],
   ])
 
 
+# support for unlimited select() syscall
+AC_ARG_ENABLE(unlimited_select,
+        [AS_HELP_STRING([--enable-unlimited-select],[Enable unlimited select() syscall @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_unlimited_select="yes" ;;
+          no) enable_unlimited_select="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-unlimited-select) ;;
+         esac],
+        [enable_unlimited_select="no"]
+)
+if test "$enable_unlimited_select" = "yes"; then
+        AC_DEFINE(USE_UNLIMITED_SELECT, 1, [If defined, the select() syscall won't be limited to a particular number of file descriptors.])
+fi
+
+
 # debug
 AC_ARG_ENABLE(debug,
         [AS_HELP_STRING([--enable-debug],[Enable debug mode @<:@default=no@:>@])],
@@ -843,6 +858,7 @@ echo "    Zlib compression support enabl
 echo "    rsyslog runtime will be built:            $enable_rsyslogrt"
 echo "    rsyslogd will be built:                   $enable_rsyslogd"
 echo "    custom module 1 will be built:            $enable_cust1"
+echo "    Unlimited select() support enabled:       $enable_unlimited_select"
 echo
 echo "---{ input plugins }---"
 echo "    Klog functionality enabled:               $enable_klog ($os_type)"
diff -up rsyslog-4.4.2.unlimited-select/gss-misc.c.orig rsyslog-4.4.2.unlimited-select/gss-misc.c
--- rsyslog-4.4.2.unlimited-select/gss-misc.c.orig	2009-12-02 17:56:02.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/gss-misc.c	2009-12-02 18:05:23.000000000 +0100
@@ -51,11 +51,14 @@
 #include "obj.h"
 #include "errmsg.h"
 #include "gss-misc.h"
+#include "glbl.h"
+#include "unlimited_select.h"
 
 MODULE_TYPE_LIB
 
 /* static data */
 DEFobjStaticHelpers
+DEFobjCurrIf(glbl)
 DEFobjCurrIf(errmsg)
 
 static void display_status_(char *m, OM_uint32 code, int type)
@@ -108,28 +111,38 @@ static int read_all(int fd, char *buf, u
 {
     int     ret;
     char   *ptr;
-    fd_set  rfds;
     struct timeval tv;
+#ifdef USE_UNLIMITED_SELECT
+    fd_set  *pRfds = malloc(glbl.GetFdSetSize());
+#else
+    fd_set  rfds;
+    fd_set *pRfds = &rfds;
+#endif
 
     for (ptr = buf; nbyte; ptr += ret, nbyte -= ret) {
-	    FD_ZERO(&rfds);
-	    FD_SET(fd, &rfds);
+	    FD_ZERO(pRfds);
+	    FD_SET(fd, pRfds);
 	    tv.tv_sec = 1;
 	    tv.tv_usec = 0;
 
-	    if ((ret = select(FD_SETSIZE, &rfds, NULL, NULL, &tv)) <= 0
-		|| !FD_ISSET(fd, &rfds))
+	    if ((ret = select(FD_SETSIZE, pRfds, NULL, NULL, &tv)) <= 0
+		|| !FD_ISSET(fd, pRfds)) {
+                    freeFdSet(pRfds);
 		    return ret;
+	    }
 	    ret = recv(fd, ptr, nbyte, 0);
 	    if (ret < 0) {
 		    if (errno == EINTR)
 			    continue;
+                    freeFdSet(pRfds);
 		    return (ret);
 	    } else if (ret == 0) {
+                    freeFdSet(pRfds);
 		    return (ptr - buf);
 	    }
     }
 
+    freeFdSet(pRfds);
     return (ptr - buf);
 }
 
@@ -264,6 +277,7 @@ BEGINObjClassExit(gssutil, OBJ_IS_LOADAB
 CODESTARTObjClassExit(gssutil)
 	/* release objects we no longer need */
 	objRelease(errmsg, CORE_COMPONENT);
+	objRelease(glbl, CORE_COMPONENT);
 ENDObjClassExit(gssutil)
 
 
@@ -274,6 +288,7 @@ ENDObjClassExit(gssutil)
 BEGINAbstractObjClassInit(gssutil, 1, OBJ_IS_LOADABLE_MODULE) /* class, version - CHANGE class also in END MACRO! */
 	/* request objects we use */
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
+	CHKiRet(objUse(glbl, CORE_COMPONENT));
 ENDObjClassInit(gssutil)
 
 
diff -up rsyslog-4.4.2.unlimited-select/plugins/imgssapi/imgssapi.c.orig rsyslog-4.4.2.unlimited-select/plugins/imgssapi/imgssapi.c
--- rsyslog-4.4.2.unlimited-select/plugins/imgssapi/imgssapi.c.orig	2009-12-02 17:58:12.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/plugins/imgssapi/imgssapi.c	2009-12-02 14:22:42.000000000 +0100
@@ -56,6 +56,7 @@
 #include "errmsg.h"
 #include "netstrm.h"
 #include "glbl.h"
+#include "unlimited_select.h"
 
 
 MODULE_TYPE_INPUT
@@ -414,15 +415,20 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_se
 		CHKiRet(netstrm.GetSock(pSess->pStrm, &fdSess)); // TODO: method access!
 		if (allowedMethods & ALLOWEDMETHOD_TCP) {
 			int len;
-			fd_set  fds;
 			struct timeval tv;
+#ifdef USE_UNLIMITED_SELECT
+                        fd_set *pFds = malloc(glbl.GetFdSetSize());
+#else
+                        fd_set fds;
+                        fd_set *pFds = &fds;
+#endif
 		
 			do {
-				FD_ZERO(&fds);
-				FD_SET(fdSess, &fds);
+				FD_ZERO(pFds);
+				FD_SET(fdSess, pFds);
 				tv.tv_sec = 1;
 				tv.tv_usec = 0;
-				ret = select(fdSess + 1, &fds, NULL, NULL, &tv);
+				ret = select(fdSess + 1, pFds, NULL, NULL, &tv);
 			} while (ret < 0 && errno == EINTR);
 			if (ret < 0) {
 				errmsg.LogError(0, RS_RET_ERR, "TCP session %p will be closed, error ignored\n", pSess);
@@ -475,6 +481,8 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_se
 				pGSess->allowedMethods = ALLOWEDMETHOD_TCP;
 				ABORT_FINALIZE(RS_RET_OK); // TODO: define good error codes
 			}
+
+                        freeFdSet(pFds);
 		}
 
 		context = &pGSess->gss_context;
diff -up rsyslog-4.4.2.unlimited-select/plugins/imudp/imudp.c.orig rsyslog-4.4.2.unlimited-select/plugins/imudp/imudp.c
--- rsyslog-4.4.2.unlimited-select/plugins/imudp/imudp.c.orig	2009-12-02 17:58:36.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/plugins/imudp/imudp.c	2009-12-02 14:31:25.000000000 +0100
@@ -44,6 +44,7 @@
 #include "parser.h"
 #include "datetime.h"
 #include "unicode-helper.h"
+#include "unlimited_select.h"
 
 MODULE_TYPE_INPUT
 
@@ -256,12 +257,18 @@ BEGINrunInput
 	int maxfds;
 	int nfds;
 	int i;
-	fd_set readfds;
 	struct sockaddr_storage frominetPrev;
 	int bIsPermitted;
 	uchar fromHost[NI_MAXHOST];
 	uchar fromHostIP[NI_MAXHOST];
 	uchar fromHostFQDN[NI_MAXHOST];
+#ifdef USE_UNLIMITED_SELECT
+        fd_set  *pReadfds = malloc(glbl.GetFdSetSize());
+#else
+        fd_set  readfds;
+        fd_set *pReadfds = &readfds;
+#endif
+
 CODESTARTrunInput
 	/* start "name caching" algo by making sure the previous system indicator
 	 * is invalidated.
@@ -280,30 +287,30 @@ CODESTARTrunInput
 		 * is given without -a, we do not need to listen at all..
 		 */
 	        maxfds = 0;
-	        FD_ZERO (&readfds);
+	        FD_ZERO (pReadfds);
 
 		/* Add the UDP listen sockets to the list of read descriptors. */
 		for (i = 0; i < *udpLstnSocks; i++) {
 			if (udpLstnSocks[i+1] != -1) {
 				if(Debug)
 					net.debugListenInfo(udpLstnSocks[i+1], "UDP");
-				FD_SET(udpLstnSocks[i+1], &readfds);
+				FD_SET(udpLstnSocks[i+1], pReadfds);
 				if(udpLstnSocks[i+1]>maxfds) maxfds=udpLstnSocks[i+1];
 			}
 		}
 		if(Debug) {
 			dbgprintf("--------imUDP calling select, active file descriptors (max %d): ", maxfds);
 			for (nfds = 0; nfds <= maxfds; ++nfds)
-				if ( FD_ISSET(nfds, &readfds) )
+				if ( FD_ISSET(nfds, pReadfds) )
 					dbgprintf("%d ", nfds);
 			dbgprintf("\n");
 		}
 
 		/* wait for io to become ready */
-		nfds = select(maxfds+1, (fd_set *) &readfds, NULL, NULL, NULL);
+		nfds = select(maxfds+1, (fd_set *) pReadfds, NULL, NULL, NULL);
 
 	       for(i = 0; nfds && i < *udpLstnSocks; i++) {
-			if(FD_ISSET(udpLstnSocks[i+1], &readfds)) {
+		       if (FD_ISSET(udpLstnSocks[i+1], pReadfds)) {
 		       		processSocket(udpLstnSocks[i+1], &frominetPrev, &bIsPermitted,
 					      fromHost, fromHostFQDN, fromHostIP);
 			--nfds; /* indicate we have processed one descriptor */
@@ -312,6 +319,7 @@ CODESTARTrunInput
 	       /* end of a run, back to loop for next recv() */
 	}
 
+	freeFdSet(pReadfds);
 	return iRet;
 ENDrunInput
 
diff -up rsyslog-4.4.2.unlimited-select/plugins/imuxsock/imuxsock.c.orig rsyslog-4.4.2.unlimited-select/plugins/imuxsock/imuxsock.c
--- rsyslog-4.4.2.unlimited-select/plugins/imuxsock/imuxsock.c.orig	2009-12-02 17:58:23.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/plugins/imuxsock/imuxsock.c	2009-12-02 14:35:58.000000000 +0100
@@ -43,6 +43,7 @@
 #include "net.h"
 #include "glbl.h"
 #include "msg.h"
+#include "unlimited_select.h"
 
 MODULE_TYPE_INPUT
 
@@ -245,7 +246,13 @@ BEGINrunInput
 	int nfds;
 	int i;
 	int fd;
-	fd_set readfds;
+#ifdef USE_UNLIMITED_SELECT
+        fd_set  *pReadfds = malloc(glbl.GetFdSetSize());
+#else
+        fd_set  readfds;
+        fd_set *pReadfds = &readfds;
+#endif
+
 CODESTARTrunInput
 	/* this is an endless loop - it is terminated when the thread is
 	 * signalled to do so. This, however, is handled by the framework,
@@ -259,11 +266,11 @@ CODESTARTrunInput
 		 * is given without -a, we do not need to listen at all..
 		 */
 	        maxfds = 0;
-	        FD_ZERO (&readfds);
+	        FD_ZERO (pReadfds);
 		/* Copy master connections */
 		for (i = startIndexUxLocalSockets; i < nfunix; i++) {
 			if (funix[i] != -1) {
-				FD_SET(funix[i], &readfds);
+				FD_SET(funix[i], pReadfds);
 				if (funix[i]>maxfds) maxfds=funix[i];
 			}
 		}
@@ -271,22 +278,23 @@ CODESTARTrunInput
 		if(Debug) {
 			dbgprintf("--------imuxsock calling select, active file descriptors (max %d): ", maxfds);
 			for (nfds= 0; nfds <= maxfds; ++nfds)
-				if ( FD_ISSET(nfds, &readfds) )
+				if ( FD_ISSET(nfds, pReadfds) )
 					dbgprintf("%d ", nfds);
 			dbgprintf("\n");
 		}
 
 		/* wait for io to become ready */
-		nfds = select(maxfds+1, (fd_set *) &readfds, NULL, NULL, NULL);
+		nfds = select(maxfds+1, (fd_set *) pReadfds, NULL, NULL, NULL);
 
 		for (i = 0; i < nfunix && nfds > 0; i++) {
-			if ((fd = funix[i]) != -1 && FD_ISSET(fd, &readfds)) {
+			if ((fd = funix[i]) != -1 && FD_ISSET(fd, pReadfds)) {
 				readSocket(fd, i);
 				--nfds; /* indicate we have processed one */
 			}
 		}
 	}
 
+	freeFdSet(pReadfds);
 	RETiRet;
 ENDrunInput
 
diff -up rsyslog-4.4.2.unlimited-select/runtime/Makefile.am.orig rsyslog-4.4.2.unlimited-select/runtime/Makefile.am
--- rsyslog-4.4.2.unlimited-select/runtime/Makefile.am.orig	2009-12-02 17:57:25.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/Makefile.am	2009-12-02 14:36:29.000000000 +0100
@@ -15,6 +15,7 @@ librsyslog_la_SOURCES = \
 	nsd.h \
 	glbl.h \
 	glbl.c \
+	unlimited_select.h \
 	conf.c \
 	conf.h \
 	parser.h \
diff -up rsyslog-4.4.2.unlimited-select/runtime/glbl.c.orig rsyslog-4.4.2.unlimited-select/runtime/glbl.c
--- rsyslog-4.4.2.unlimited-select/runtime/glbl.c.orig	2009-12-02 17:57:35.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/glbl.c	2009-12-02 14:40:07.000000000 +0100
@@ -68,6 +68,9 @@ static uchar *pszDfltNetstrmDrvr = NULL;
 static uchar *pszDfltNetstrmDrvrCAF = NULL; /* default CA file for the netstrm driver */
 static uchar *pszDfltNetstrmDrvrKeyFile = NULL; /* default key file for the netstrm driver (server) */
 static uchar *pszDfltNetstrmDrvrCertFile = NULL; /* default cert file for the netstrm driver (server) */
+#ifdef USE_UNLIMITED_SELECT
+static int iFdSetSize = howmany(FD_SETSIZE, __NFDBITS) * sizeof (fd_mask); /* size of select() bitmask in bytes */
+#endif
 
 
 /* define a macro for the simple properties' set and get functions
@@ -100,6 +103,9 @@ SIMP_PROP(DisableDNS, bDisableDNS, int)
 SIMP_PROP(LocalDomain, LocalDomain, uchar*)
 SIMP_PROP(StripDomains, StripDomains, char**)
 SIMP_PROP(LocalHosts, LocalHosts, char**)
+#ifdef USE_UNLIMITED_SELECT
+SIMP_PROP(FdSetSize, iFdSetSize, int)
+#endif
 
 SIMP_PROP_SET(LocalFQDNName, LocalFQDNName, uchar*)
 SIMP_PROP_SET(LocalHostName, LocalHostName, uchar*)
@@ -217,6 +223,9 @@ CODESTARTobjQueryInterface(glbl)
 	SIMP_PROP(DfltNetstrmDrvrCAF)
 	SIMP_PROP(DfltNetstrmDrvrKeyFile)
 	SIMP_PROP(DfltNetstrmDrvrCertFile)
+#ifdef USE_UNLIMITED_SELECT
+	SIMP_PROP(FdSetSize)
+#endif
 #undef	SIMP_PROP
 finalize_it:
 ENDobjQueryInterface(glbl)
@@ -251,6 +260,9 @@ static rsRetVal resetConfigVariables(uch
 	bOptimizeUniProc = 1;
 	bHUPisRestart = 1;
 	bPreserveFQDN = 0;
+#ifdef USE_UNLIMITED_SELECT
+	iFdSetSize = howmany(FD_SETSIZE, __NFDBITS) * sizeof (fd_mask);
+#endif
 	return RS_RET_OK;
 }
 
diff -up rsyslog-4.4.2.unlimited-select/runtime/glbl.h.orig rsyslog-4.4.2.unlimited-select/runtime/glbl.h
--- rsyslog-4.4.2.unlimited-select/runtime/glbl.h.orig	2009-12-02 17:57:41.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/glbl.h	2009-12-02 17:42:35.000000000 +0100
@@ -57,9 +57,10 @@ BEGINinterface(glbl) /* name must also b
 	SIMP_PROP(DfltNetstrmDrvrCAF, uchar*)
 	SIMP_PROP(DfltNetstrmDrvrKeyFile, uchar*)
 	SIMP_PROP(DfltNetstrmDrvrCertFile, uchar*)
+	SIMP_PROP(FdSetSize, int)
 #undef	SIMP_PROP
 ENDinterface(glbl)
-#define glblCURR_IF_VERSION 2 /* increment whenever you change the interface structure! */
+#define glblCURR_IF_VERSION 101 /* increment whenever you change the interface structure! */
 /* version 2 had PreserveFQDN added - rgerhards, 2008-12-08 */
 
 /* the remaining prototypes */
diff -up rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.c.orig rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.c
--- rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.c.orig	2009-12-02 17:56:56.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.c	2009-12-02 18:17:31.000000000 +0100
@@ -36,6 +36,7 @@
 #include "errmsg.h"
 #include "nsd_ptcp.h"
 #include "nsdsel_ptcp.h"
+#include "unlimited_select.h"
 
 /* static data */
 DEFobjStaticHelpers
@@ -47,14 +48,23 @@ DEFobjCurrIf(glbl)
  */
 BEGINobjConstruct(nsdsel_ptcp) /* be sure to specify the object type also in END macro! */
 	pThis->maxfds = 0;
+#ifdef USE_UNLIMITED_SELECT
+        pThis->pReadfds = calloc(1, glbl.GetFdSetSize());
+        pThis->pWritefds = calloc(1, glbl.GetFdSetSize());
+#else
 	FD_ZERO(&pThis->readfds);
 	FD_ZERO(&pThis->writefds);
+#endif
 ENDobjConstruct(nsdsel_ptcp)
 
 
 /* destructor for the nsdsel_ptcp object */
 BEGINobjDestruct(nsdsel_ptcp) /* be sure to specify the object type also in END and CODESTART macros! */
 CODESTARTobjDestruct(nsdsel_ptcp)
+#ifdef USE_UNLIMITED_SELECT
+	freeFdSet(pThis->pReadfds);
+	freeFdSet(pThis->pWritefds);
+#endif
 ENDobjDestruct(nsdsel_ptcp)
 
 
@@ -65,20 +75,27 @@ Add(nsdsel_t *pNsdsel, nsd_t *pNsd, nsds
 	DEFiRet;
 	nsdsel_ptcp_t *pThis = (nsdsel_ptcp_t*) pNsdsel;
 	nsd_ptcp_t *pSock = (nsd_ptcp_t*) pNsd;
+#ifdef USE_UNLIMITED_SELECT
+        fd_set *pReadfds = pThis->pReadfds;
+        fd_set *pWritefds = pThis->pWritefds;
+#else
+        fd_set *pReadfds = &pThis->readfds;
+        fd_set *pWritefds = &pThis->writefds;
+#endif
 
 	ISOBJ_TYPE_assert(pSock, nsd_ptcp);
 	ISOBJ_TYPE_assert(pThis, nsdsel_ptcp);
 
 	switch(waitOp) {
 		case NSDSEL_RD:
-			FD_SET(pSock->sock, &pThis->readfds);
+			FD_SET(pSock->sock, pReadfds);
 			break;
 		case NSDSEL_WR:
-			FD_SET(pSock->sock, &pThis->writefds);
+			FD_SET(pSock->sock, pWritefds);
 			break;
 		case NSDSEL_RDWR:
-			FD_SET(pSock->sock, &pThis->readfds);
-			FD_SET(pSock->sock, &pThis->writefds);
+			FD_SET(pSock->sock, pReadfds);
+			FD_SET(pSock->sock, pWritefds);
 			break;
 	}
 
@@ -98,6 +115,13 @@ Select(nsdsel_t *pNsdsel, int *piNumRead
 	DEFiRet;
 	int i;
 	nsdsel_ptcp_t *pThis = (nsdsel_ptcp_t*) pNsdsel;
+#ifdef USE_UNLIMITED_SELECT
+        fd_set *pReadfds = pThis->pReadfds;
+        fd_set *pWritefds = pThis->pWritefds;
+#else
+        fd_set *pReadfds = &pThis->readfds;
+        fd_set *pWritefds = &pThis->writefds;
+#endif
 
 	ISOBJ_TYPE_assert(pThis, nsdsel_ptcp);
 	assert(piNumReady != NULL);
@@ -106,13 +130,13 @@ Select(nsdsel_t *pNsdsel, int *piNumRead
 		// TODO: name in dbgprintf!
 		dbgprintf("--------<NSDSEL_PTCP> calling select, active fds (max %d): ", pThis->maxfds);
 		for(i = 0; i <= pThis->maxfds; ++i)
-			if(FD_ISSET(i, &pThis->readfds) || FD_ISSET(i, &pThis->writefds))
+			if(FD_ISSET(i, pReadfds) || FD_ISSET(i, pWritefds))
 				dbgprintf("%d ", i);
 		dbgprintf("\n");
 	}
 
 	/* now do the select */
-	*piNumReady = select(pThis->maxfds+1, &pThis->readfds, &pThis->writefds, NULL, NULL);
+	*piNumReady = select(pThis->maxfds+1, pReadfds, pWritefds, NULL, NULL);
 
 	RETiRet;
 }
@@ -125,6 +149,13 @@ IsReady(nsdsel_t *pNsdsel, nsd_t *pNsd, 
 	DEFiRet;
 	nsdsel_ptcp_t *pThis = (nsdsel_ptcp_t*) pNsdsel;
 	nsd_ptcp_t *pSock = (nsd_ptcp_t*) pNsd;
+#ifdef USE_UNLIMITED_SELECT
+        fd_set *pReadfds = pThis->pReadfds;
+        fd_set *pWritefds = pThis->pWritefds;
+#else
+        fd_set *pReadfds = &pThis->readfds;
+        fd_set *pWritefds = &pThis->writefds;
+#endif
 
 	ISOBJ_TYPE_assert(pThis, nsdsel_ptcp);
 	ISOBJ_TYPE_assert(pSock, nsd_ptcp);
@@ -132,14 +163,14 @@ IsReady(nsdsel_t *pNsdsel, nsd_t *pNsd, 
 
 	switch(waitOp) {
 		case NSDSEL_RD:
-			*pbIsReady = FD_ISSET(pSock->sock, &pThis->readfds);
+			*pbIsReady = FD_ISSET(pSock->sock, pReadfds);
 			break;
 		case NSDSEL_WR:
-			*pbIsReady = FD_ISSET(pSock->sock, &pThis->writefds);
+			*pbIsReady = FD_ISSET(pSock->sock, pWritefds);
 			break;
 		case NSDSEL_RDWR:
-			*pbIsReady =   FD_ISSET(pSock->sock, &pThis->readfds)
-				     | FD_ISSET(pSock->sock, &pThis->writefds);
+			*pbIsReady =   FD_ISSET(pSock->sock, pReadfds)
+				     | FD_ISSET(pSock->sock, pWritefds);
 			break;
 	}
 
diff -up rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.h.orig rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.h
--- rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.h.orig	2009-12-02 17:57:15.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.h	2009-12-02 17:48:41.000000000 +0100
@@ -31,8 +31,13 @@ typedef nsdsel_if_t nsdsel_ptcp_if_t; /*
 struct nsdsel_ptcp_s {
 	BEGINobjInstance;	/* Data to implement generic object - MUST be the first data element! */
 	int maxfds;
+#ifdef USE_UNLIMITED_SELECT
+	fd_set *pReadfds;
+	fd_set *pWritefds;
+#else
 	fd_set readfds;
 	fd_set writefds;
+#endif
 };
 
 /* interface is defined in nsd.h, we just implement it! */
diff -up rsyslog-4.4.2.unlimited-select/runtime/unlimited_select.h.orig rsyslog-4.4.2.unlimited-select/runtime/unlimited_select.h
--- rsyslog-4.4.2.unlimited-select/runtime/unlimited_select.h.orig	2009-12-02 18:21:15.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/unlimited_select.h	2009-12-02 17:51:35.000000000 +0100
@@ -0,0 +1,45 @@
+/* unlimited_select.h
+ * Tweak the macros for accessing fd_set so that the select() syscall
+ * won't be limited to a particular number of file descriptors.
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+
+#ifndef	UNLIMITED_SELECT_H_INCLUDED
+
+#include <string.h>
+#include <stdlib.h>
+#include <sys/select.h>
+#include "glbl.h"
+
+#ifdef USE_UNLIMITED_SELECT
+# undef FD_ZERO
+# define FD_ZERO(set) memset((set), 0, glbl.GetFdSetSize());
+#endif
+
+#ifdef USE_UNLIMITED_SELECT
+void freeFdSet(fd_set *p) {
+        free(p);
+}
+#else
+# define freeFdSet(x)
+#endif
+
+#endif /* #ifndef UNLIMITED_SELECT_H_INCLUDED */
diff -up rsyslog-4.4.2.unlimited-select/tools/syslogd.c.orig rsyslog-4.4.2.unlimited-select/tools/syslogd.c
--- rsyslog-4.4.2.unlimited-select/tools/syslogd.c.orig	2009-12-02 17:57:55.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/tools/syslogd.c	2009-12-02 17:52:56.000000000 +0100
@@ -2150,6 +2150,9 @@ static rsRetVal setMaxFiles(void __attri
 				iFiles, errStr, (long) maxFiles.rlim_max);
 		ABORT_FINALIZE(RS_RET_ERR_RLIM_NOFILE);
 	}
+#ifdef USE_UNLIMITED_SELECT
+	glbl.SetFdSetSize(howmany(iFiles, __NFDBITS) * sizeof (fd_mask));
+#endif
 	DBGPRINTF("Max number of files set to %d [kernel max %ld].\n", iFiles, (long) maxFiles.rlim_max);
 
 finalize_it:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-12/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	3 Sep 2009 12:23:12 -0000	1.33
+++ .cvsignore	3 Dec 2009 11:45:32 -0000	1.34
@@ -1 +1 @@
-rsyslog-4.4.1.tar.gz
+rsyslog-4.4.2.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-12/rsyslog.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- rsyslog.spec	14 Sep 2009 16:54:26 -0000	1.64
+++ rsyslog.spec	3 Dec 2009 11:45:32 -0000	1.65
@@ -2,8 +2,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 4.4.1
-Release: 2%{?dist}
+Version: 4.4.2
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,8 +12,9 @@ Source1: rsyslog.init
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
+Patch0: rsyslog-4.4.2-unlimited-select.patch
 BuildRequires: zlib-devel
-BuildRequires: autoconf automake
+BuildRequires: autoconf automake libtool
 Requires: logrotate >= 3.5.2
 Requires: bash >= 2.0
 Requires(post): /sbin/chkconfig coreutils
@@ -87,6 +88,8 @@ IETF standard protocol.
 
 %prep
 %setup -q
+%patch0 -p1 -b .unlimited-select
+aclocal && autoconf && automake
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
@@ -98,7 +101,8 @@ export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_
 		--enable-gssapi-krb5 \
 		--enable-imfile \
 		--enable-relp \
-		--enable-gnutls
+		--enable-gnutls \
+		--enable-unlimited-select
 make %{?_smp_mflags}
 
 %install
@@ -194,6 +198,10 @@ fi	
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Thu Dec 03 2009 Tomas Heinrich <theinric at redhat.com> 4.4.2-1
+- upgrade to new upstream stable version 4.4.2
+- add support for arbitrary number of open file descriptors
+
 * Mon Sep 14 2009 Tomas Heinrich <theinric at redhat.com> 4.4.1-2
 - adjust init script according to guidelines (#522071)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-12/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	3 Sep 2009 12:23:12 -0000	1.35
+++ sources	3 Dec 2009 11:45:32 -0000	1.36
@@ -1 +1 @@
-2f298222850a098834bbf8c651a9963c  rsyslog-4.4.1.tar.gz
+a8ada67b6cd5c00fbeb3a4b687b17359  rsyslog-4.4.2.tar.gz



From dnovotny at fedoraproject.org  Thu Dec  3 11:46:00 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu,  3 Dec 2009 11:46:00 +0000 (UTC)
Subject: rpms/gob2/F-12 gob2.spec,1.24,1.25
Message-ID: <20091203114600.2E02811C00EE@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/gob2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13935

Modified Files:
	gob2.spec 
Log Message:
merge review fix



Index: gob2.spec
===================================================================
RCS file: /cvs/extras/rpms/gob2/F-12/gob2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gob2.spec	30 Nov 2009 09:57:53 -0000	1.24
+++ gob2.spec	3 Dec 2009 11:45:59 -0000	1.25
@@ -1,10 +1,10 @@
 Summary: The GObject Builder
 Name: gob2
 Version: 2.0.16
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Development/Tools
-Source: gob2-%{version}.tar.gz
+Source: http://ftp.5z.com/pub/gob/gob2-%{version}.tar.gz
 Url: http://www.5z.com/jirka/gob.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Dec 03 2009 Daniel Novotny <dnovotny at redhat.com> 2.0.16-5
+- fixed "Source:" URL in spec (merge review: #225851)
+
 * Mon Nov 30 2009 Daniel Novotny <dnovotny at redhat.com> 2.0.16-4
 - fix #519108 class and enum names convert incorrectly in mock / koji.
 



From kasal at fedoraproject.org  Thu Dec  3 11:47:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  3 Dec 2009 11:47:39 +0000 (UTC)
Subject: File perl-5.10.1.tar.bz2 uploaded to lookaside cache by kasal
Message-ID: <20091203114739.19AAA10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl:

82400c6d34f7b7b43d0196c76cd2bbb1  perl-5.10.1.tar.bz2



From kasal at fedoraproject.org  Thu Dec  3 11:49:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  3 Dec 2009 11:49:57 +0000 (UTC)
Subject: rpms/perl/devel .cvsignore,1.18,1.19 sources,1.18,1.19
Message-ID: <20091203114957.49A5D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	.cvsignore sources 
Log Message:
- new upstream version
- release number must be high, because of stale version numbers of some
  of the subpackages
- drop upstreamed patches
- update the versions of bundled modules
- shorten the paths in @INC
- build without DEBUGGING
- implement compatibility measures for the above two changes, for a short
  transition period
- provide perl(:MODULE_COMPAT_5.10.0), for that transition period only


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	11 Mar 2009 21:12:35 -0000	1.18
+++ .cvsignore	3 Dec 2009 11:49:57 -0000	1.19
@@ -1 +1 @@
-perl-5.10.0.tar.gz
+perl-5.10.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	11 Mar 2009 21:12:37 -0000	1.18
+++ sources	3 Dec 2009 11:49:57 -0000	1.19
@@ -1 +1 @@
-d2c39b002ebfd2c3c5dba589365c5a71  perl-5.10.0.tar.gz
+82400c6d34f7b7b43d0196c76cd2bbb1  perl-5.10.1.tar.bz2



From akurtakov at fedoraproject.org  Thu Dec  3 11:52:23 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Dec 2009 11:52:23 +0000 (UTC)
Subject: rpms/sqljet/devel sqljet.spec,1.1,1.2
Message-ID: <20091203115223.4537511C00EE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	sqljet.spec 
Log Message:
Require antlr3.


Index: sqljet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqljet/devel/sqljet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sqljet.spec	3 Dec 2009 08:45:06 -0000	1.1
+++ sqljet.spec	3 Dec 2009 11:52:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           sqljet
 Version:        1.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pure Java SQLite
 
 Group:          Development/Libraries
@@ -22,6 +22,7 @@ BuildRequires:  netbeans-platform
 BuildRequires:  java-devel >= 1.6
 BuildRequires:  junit4
 BuildRequires:  desktop-file-utils
+Requires:       antlr3
 
 BuildArch: noarch
 
@@ -112,6 +113,9 @@ rm -rf %{buildroot}
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Dec 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-3
+- Require antlr3.
+
 * Mon Nov 30 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-2
 - Fix build and review comments.
 



From xhorak at fedoraproject.org  Thu Dec  3 11:55:21 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 11:55:21 +0000 (UTC)
Subject: File thunderbird-3.0rc2.source.tar.bz2 uploaded to lookaside cache
	by xhorak
Message-ID: <20091203115521.17E7910F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for thunderbird:

35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2



From xhorak at fedoraproject.org  Thu Dec  3 11:55:33 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 11:55:33 +0000 (UTC)
Subject: File thunderbird-langpacks-3.0rc2-20091203.tar.bz2 uploaded to
	lookaside cache by xhorak
Message-ID: <20091203115533.5ECDB10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for thunderbird:

c8e226a813a1fe9049d018e59d63e3ac  thunderbird-langpacks-3.0rc2-20091203.tar.bz2



From kasal at fedoraproject.org  Thu Dec  3 12:02:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  3 Dec 2009 12:02:44 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.238,1.239
Message-ID: <20091203120244.8498C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	perl.spec 
Log Message:
oops forgot $RPM_BUILD_ROOT


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- perl.spec	3 Dec 2009 11:37:17 -0000	1.238
+++ perl.spec	3 Dec 2009 12:02:44 -0000	1.239
@@ -1166,7 +1166,7 @@ popd
 
 #FIXME: temporary compatibility hack: for perl(:MODULE_COMPAT_5.10.0)
 mkdir -p %{_libdir}/perl5/5.10.0/%{perl_archname}
-ln -s ../../CORE %{_libdir}/perl5/5.10.0/%{perl_archname}/CORE
+ln -s ../../CORE $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From karsten at fedoraproject.org  Thu Dec  3 12:13:26 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 12:13:26 +0000 (UTC)
Subject: rpms/libtool/F-11 libtool.spec,1.77,1.78
Message-ID: <20091203121326.1654311C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libtool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22209

Modified Files:
	libtool.spec 
Log Message:
- require gcc-4.4.1 from F-11-updates



Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/F-11/libtool.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- libtool.spec	2 Dec 2009 11:34:09 -0000	1.77
+++ libtool.spec	3 Dec 2009 12:13:25 -0000	1.78
@@ -1,9 +1,9 @@
-%define gcc_version 4.4.0
+%define gcc_version 4.4.1
 
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 2.2.6
-Release: 11%{?dist}.2
+Release: 11%{?dist}.3
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}b.tar.gz
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Thu Dec 03 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-11.3
+- require gcc-4.4.1 from F-11-updates
+
 * Wed Dec 02 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-11.2
 - update to 2.2.6b, fixes CVE-2009-3736:
   libltdl may load and execute code from a library in the current directory



From dnovotny at fedoraproject.org  Thu Dec  3 12:20:23 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu,  3 Dec 2009 12:20:23 +0000 (UTC)
Subject: rpms/emacs/devel emacs-23.1-indian.patch, NONE, 1.1 emacs.spec,
	1.145, 1.146
Message-ID: <20091203122023.4C68B11C03A3@cvs1.fedora.phx.redhat.com>

Author: dnovotny

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

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-indian.patch 
Log Message:
- fix #542657 -  emacs does not display indic text


emacs-23.1-indian.patch:
 indian.el |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE emacs-23.1-indian.patch ---
diff -up emacs-23.1/lisp/language/indian.el.indian emacs-23.1/lisp/language/indian.el
--- emacs-23.1/lisp/language/indian.el.indian	2009-12-03 13:03:04.000000000 +0100
+++ emacs-23.1/lisp/language/indian.el	2009-12-03 13:05:53.000000000 +0100
@@ -165,15 +165,15 @@ South Indian language Malayalam is suppo
   "Regexp matching a composable sequence of Malayalam characters.")
 
 (let ((script-regexp-alist
-       `((devanagari . ,devanagari-composable-pattern)
+       `((devanagari . "[\x900-\x97F\x200C\x200D]+")
 	 (bengali . "[\x980-\x9FF\x200C\x200D]+")
 	 (gurmukhi . "[\xA00-\xA7F\x200C\x200D]+")
 	 (gujarati . "[\xA80-\xAFF\x200C\x200D]+")
 	 (oriya . "[\xB00-\xB7F\x200C\x200D]+")
-	 (tamil . ,tamil-composable-pattern)
+	 (tamil . "[\xB80-\xBFF\x200C\x200D]+")
 	 (telugu . "[\xC00-\xC7F\x200C\x200D]+")
-	 (kannada . ,kannada-composable-pattern)
-	 (malayalam . ,malayalam-composable-pattern))))
+	 (kannada . "[\xC80-\xCFF\x200C\x200D]+")
+	 (malayalam . "[\xD00-\xD7F\x200C\x200D]+"))))
   (map-char-table
    #'(lambda (key val)
        (let ((slot (assq val script-regexp-alist)))


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- emacs.spec	2 Dec 2009 16:50:20 -0000	1.145
+++ emacs.spec	3 Dec 2009 12:20:22 -0000	1.146
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -30,6 +30,7 @@ Patch4: emacs-gtk.patch
 Patch5: emacs-23.1-xdg.patch
 Patch6: emacs-23.1-cpp.patch
 Patch7: emacs-23.1-scroll.patch
+Patch8: emacs-23.1-indian.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -56,6 +57,7 @@ Provides: emacs(bin)
 # #516391
 Obsoletes: emacs-nxml-mode < 0.20041004-10
 Provides: emacs-nxml-mode = 0.20041004-10
+Requires: m17n-db-datafiles
 
 # C and build patches
 
@@ -126,6 +128,7 @@ Emacs packages or see some elisp example
 %patch5 -p1 -b .xdg
 %patch6 -p1
 %patch7 -p1 -b .scroll
+%patch8 -p1
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -397,6 +400,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Dec 03 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-16
+- fix #542657 -  emacs does not display indic text
+
 * Wed Dec 02 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-15
 - fix #543046 -  Using scroll bar in emacs highlights/selects text
 



From stevetraylen at fedoraproject.org  Thu Dec  3 12:24:48 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 12:24:48 +0000 (UTC)
Subject: File POE-Test-Loops-1.030.tar.gz uploaded to lookaside cache by
	stevetraylen
Message-ID: <20091203122448.6688E10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-POE-Test-Loops:

67983e4a441e6f508d2ef7c71a3975eb  POE-Test-Loops-1.030.tar.gz



From xhorak at fedoraproject.org  Thu Dec  3 12:27:03 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 12:27:03 +0000 (UTC)
Subject: rpms/thunderbird/F-12 .cvsignore, 1.30, 1.31 sources, 1.38,
	1.39 thunderbird.spec, 1.154, 1.155
Message-ID: <20091203122703.46B6211C00EE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26764

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to RC2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	25 Nov 2009 10:53:53 -0000	1.30
+++ .cvsignore	3 Dec 2009 12:27:02 -0000	1.31
@@ -7,3 +7,5 @@ thunderbird-langpacks-3.0b4-20091109.tar
 thunderbird-3.0rc1.source.tar.bz2
 thunderbird-langpacks-3.0rc1-20091118.tar.bz2
 thunderbird-langpacks-3.0rc1-20091125.tar.bz2
+thunderbird-3.0rc2.source.tar.bz2
+thunderbird-langpacks-3.0rc2-20091203.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	25 Nov 2009 10:59:33 -0000	1.38
+++ sources	3 Dec 2009 12:27:02 -0000	1.39
@@ -1,2 +1,2 @@
-49028d9de4c4e167d469bbd4c6665b8c  thunderbird-3.0rc1.source.tar.bz2
-a25c36e9320f3a16a10e3141ceed841d  thunderbird-langpacks-3.0rc1-20091125.tar.bz2
+35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
+c8e226a813a1fe9049d018e59d63e3ac  thunderbird-langpacks-3.0rc2-20091203.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/thunderbird.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- thunderbird.spec	25 Nov 2009 10:53:53 -0000	1.154
+++ thunderbird.spec	3 Dec 2009 12:27:02 -0000	1.155
@@ -3,7 +3,7 @@
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
-%define version_internal 3.0rc1
+%define version_internal 3.0rc2
 %define build_langpacks 1
 %define moz_objdir objdir-tb
 
@@ -22,7 +22,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.12.rc1%{?dist}
+Release:        3.13.rc2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -33,7 +33,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version_internal}-20091125.tar.bz2
+Source1:        thunderbird-langpacks-%{version_internal}-20091203.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -354,6 +354,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.13.rc2
+- Update to 3.0 RC2
+
 * Wed Nov 25 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.12.rc1
 - Sync with Mozilla latest RC1 build
 



From xhorak at fedoraproject.org  Thu Dec  3 12:27:57 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 12:27:57 +0000 (UTC)
Subject: rpms/thunderbird/F-11 .cvsignore, 1.26, 1.27 sources, 1.34,
	1.35 thunderbird.spec, 1.144, 1.145
Message-ID: <20091203122757.3D17711C00EE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to RC2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	25 Nov 2009 10:55:56 -0000	1.26
+++ .cvsignore	3 Dec 2009 12:27:56 -0000	1.27
@@ -6,3 +6,5 @@ thunderbird-3.0b4-source.tar.bz2
 thunderbird-langpacks-3.0b4-20090917.tar.bz2
 thunderbird-3.0rc1.source.tar.bz2
 thunderbird-langpacks-3.0rc1-20091125.tar.bz2
+thunderbird-3.0rc2.source.tar.bz2
+thunderbird-langpacks-3.0rc2-20091203.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	25 Nov 2009 10:55:56 -0000	1.34
+++ sources	3 Dec 2009 12:27:57 -0000	1.35
@@ -1,2 +1,2 @@
-49028d9de4c4e167d469bbd4c6665b8c  thunderbird-3.0rc1.source.tar.bz2
-a25c36e9320f3a16a10e3141ceed841d  thunderbird-langpacks-3.0rc1-20091125.tar.bz2
+35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
+c8e226a813a1fe9049d018e59d63e3ac  thunderbird-langpacks-3.0rc2-20091203.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- thunderbird.spec	25 Nov 2009 11:01:51 -0000	1.144
+++ thunderbird.spec	3 Dec 2009 12:27:57 -0000	1.145
@@ -3,7 +3,7 @@
 %define nss_version 3.12.3
 %define cairo_version 1.0
 %define dbus_glib_version 0.6
-%define version_internal 3.0rc1
+%define version_internal 3.0rc2
 %define build_langpacks 1
 %define moz_objdir objdir-tb
 
@@ -22,7 +22,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.9.rc1%{?dist}
+Release:        2.10.rc2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -33,7 +33,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version_internal}-20091125.tar.bz2
+Source1:        thunderbird-langpacks-%{version_internal}-20091203.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -348,6 +348,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 3.0.2.10.rc2
+- Update to 3.0 RC2
+
 * Thu Nov 19 2009 Jan Horak <jhorak at redhat.com> - 3.0.2.9.rc1
 - Update to 3.0 RC1
 



From stevetraylen at fedoraproject.org  Thu Dec  3 12:28:29 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 12:28:29 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops/EL-5 .cvsignore, 1.4,
	1.5 perl-POE-Test-Loops.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091203122829.01B2311C00EE@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-POE-Test-Loops/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27365

Modified Files:
	.cvsignore perl-POE-Test-Loops.spec sources 
Log Message:
First EL5 version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Test-Loops/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Sep 2009 05:40:31 -0000	1.4
+++ .cvsignore	3 Dec 2009 12:28:28 -0000	1.5
@@ -1 +1 @@
-POE-Test-Loops-1.022.tar.gz
+POE-Test-Loops-1.030.tar.gz


Index: perl-POE-Test-Loops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Test-Loops/EL-5/perl-POE-Test-Loops.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-POE-Test-Loops.spec	27 Sep 2009 05:40:31 -0000	1.4
+++ perl-POE-Test-Loops.spec	3 Dec 2009 12:28:28 -0000	1.5
@@ -1,5 +1,5 @@
 Name:       perl-POE-Test-Loops
-Version:    1.022
+Version:    1.030
 Release:    1%{?dist}
 # META.yml, bin/poe-gen-tests -> perl
 License:    GPL+ or Artistic
@@ -59,6 +59,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/poe-gen-tests.1.gz
 
 %changelog
+* Tue Dec 1 2009 Steve Traylen <steve.traylen at cern.ch> 1.030-1
+- New upstream 1.030-1
+- First version for EPEL 5
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.022-1
 - update filtering
 - auto-update to 1.022 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Test-Loops/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Sep 2009 05:40:31 -0000	1.4
+++ sources	3 Dec 2009 12:28:28 -0000	1.5
@@ -1 +1 @@
-d663b5d958cc74990b30a021cc555dfd  POE-Test-Loops-1.022.tar.gz
+67983e4a441e6f508d2ef7c71a3975eb  POE-Test-Loops-1.030.tar.gz



From xhorak at fedoraproject.org  Thu Dec  3 12:28:43 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 12:28:43 +0000 (UTC)
Subject: rpms/thunderbird/devel .cvsignore, 1.29, 1.30 sources, 1.36,
	1.37 thunderbird.spec, 1.155, 1.156
Message-ID: <20091203122843.ECE5B11C00EE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to RC2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	25 Nov 2009 10:56:33 -0000	1.29
+++ .cvsignore	3 Dec 2009 12:28:43 -0000	1.30
@@ -6,3 +6,5 @@ thunderbird-langpacks-3.0b4-20090917.tar
 thunderbird-3.0rc1.source.tar.bz2
 thunderbird-langpacks-3.0rc1-20091118.tar.bz2
 thunderbird-langpacks-3.0rc1-20091125.tar.bz2
+thunderbird-3.0rc2.source.tar.bz2
+thunderbird-langpacks-3.0rc2-20091203.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	25 Nov 2009 10:56:33 -0000	1.36
+++ sources	3 Dec 2009 12:28:43 -0000	1.37
@@ -1,2 +1,2 @@
-49028d9de4c4e167d469bbd4c6665b8c  thunderbird-3.0rc1.source.tar.bz2
-a25c36e9320f3a16a10e3141ceed841d  thunderbird-langpacks-3.0rc1-20091125.tar.bz2
+35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
+c8e226a813a1fe9049d018e59d63e3ac  thunderbird-langpacks-3.0rc2-20091203.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- thunderbird.spec	25 Nov 2009 11:02:54 -0000	1.155
+++ thunderbird.spec	3 Dec 2009 12:28:43 -0000	1.156
@@ -3,7 +3,7 @@
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
-%define version_internal 3.0rc1
+%define version_internal 3.0rc2
 %define build_langpacks 1
 %define moz_objdir objdir-tb
 
@@ -22,7 +22,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.12.rc1%{?dist}
+Release:        3.13.rc2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -33,7 +33,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version_internal}-20091125.tar.bz2
+Source1:        thunderbird-langpacks-%{version_internal}-20091203.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -404,6 +404,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.13.rc1
+- Update to RC2
+
 * Wed Nov 25 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.12.rc1
 - Sync with Mozilla latest RC1 build
 



From mmaslano at fedoraproject.org  Thu Dec  3 12:29:21 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu,  3 Dec 2009 12:29:21 +0000 (UTC)
Subject: File at_3.1.12.orig.tar.gz uploaded to lookaside cache by mmaslano
Message-ID: <20091203122921.3508610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for at:

1e67991776148fb319fd77a2e599a765  at_3.1.12.orig.tar.gz



From caolanm at fedoraproject.org  Thu Dec  3 12:32:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 12:32:54 +0000 (UTC)
Subject: rpms/planner/F-12
	planner-gnome603693-planner-calendar-for-edittask.patch, NONE,
	1.1 planner.spec, 1.68, 1.69
Message-ID: <20091203123254.B54E311C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28899/F-12

Modified Files:
	planner.spec 
Added Files:
	planner-gnome603693-planner-calendar-for-edittask.patch 
Log Message:
Resolves: rhbz#543741 use PlannerCalander in edit->task

planner-gnome603693-planner-calendar-for-edittask.patch:
 data/glade/task-date-widget.glade |    8 +++--
 src/planner-calendar-dialog.c     |   30 ---------------------
 src/planner-calendar.c            |   33 +++++++++++++++++++++++
 src/planner-calendar.h            |    4 ++
 src/planner-task-date-widget.c    |   54 +++++++++++++++++++++++++++++++++++---
 src/planner-task-date-widget.h    |    3 ++
 src/planner-task-dialog.c         |    8 +++++
 7 files changed, 105 insertions(+), 35 deletions(-)

--- NEW FILE planner-gnome603693-planner-calendar-for-edittask.patch ---
diff -ru planner-0.14.4.orig/data/glade/task-date-widget.glade planner-0.14.4/data/glade/task-date-widget.glade
--- planner-0.14.4.orig/data/glade/task-date-widget.glade	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/data/glade/task-date-widget.glade	2009-12-03 11:07:46.000000000 +0000
@@ -25,10 +27,12 @@
       <property name="spacing">6</property>
 
       <child>
-	<widget class="GtkCalendar" id="schedule_calendar">
+	<widget class="Custom" id="schedule_calendar">
 	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="display_options">GTK_CALENDAR_SHOW_HEADING|GTK_CALENDAR_SHOW_DAY_NAMES|GTK_CALENDAR_SHOW_WEEK_NUMBERS</property>
+	  <property name="creation_function">create_schedule_calendar</property>
+	  <property name="int1">0</property>
+	  <property name="int2">0</property>
+	  <property name="last_modification_time">Thu, 03 Dec 2009 11:07:42 GMT</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-calendar.c
--- planner-0.14.4.orig/src/planner-calendar.c	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-calendar.c	2009-12-03 12:00:44.000000000 +0000
@@ -2782,5 +2782,38 @@
 	}
 }	
 
+void
+planner_calendar_mark_days (PlannerCalendar         *calendar,
+		      MrpCalendar *mrp_calendar)
+{
+	guint        y, m, d;
+	MrpTime      *t;
+	mrptime      time;
+	MrpDay       *day;
 
+	planner_calendar_get_date (calendar, &y, &m, &d);
 
+	t = mrp_time2_new ();
+	mrp_time2_set_date (t, y, m+1, 1);
+	mrp_time2_set_time (t, 0, 0, 0);
+
+	for (d = 1; d <= 31; d++) {
+		time = mrp_time2_get_epoch (t);
+
+		day = mrp_calendar_get_day (mrp_calendar, time, TRUE);
+
+		if (day == mrp_day_get_nonwork ()) {
+			planner_calendar_mark_day (calendar,
+						   d,
+						   PLANNER_CALENDAR_MARK_SHADE);
+		}
+		else if (day == mrp_day_get_work ()) {
+			planner_calendar_mark_day (calendar,
+						   d,
+						   PLANNER_CALENDAR_MARK_NONE);
+		}
+
+		mrp_time2_add_days (t, 1);
+	}
+	mrp_time2_free (t);
+}
diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/planner-calendar-dialog.c
--- planner-0.14.4.orig/src/planner-calendar-dialog.c	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-calendar-dialog.c	2009-12-03 11:31:26.000000000 +0000
@@ -876,10 +876,6 @@
 {
 	MrpCalendar *calendar;
 	PlannerCalendar  *calendar_widget;
-	guint        y, m, d;
-	MrpDay      *day;
-	MrpTime      *t;
-	mrptime      time;
 	
 	calendar = cal_dialog_get_selected_calendar (GTK_TREE_VIEW (data->tree_view));
 	if (!calendar) {
@@ -895,31 +891,7 @@
 	gtk_widget_set_sensitive (data->default_week_button, TRUE);
 	gtk_widget_set_sensitive (data->working_time_button, TRUE);
 
-	planner_calendar_get_date (calendar_widget, &y, &m, &d);
-
-	t = mrp_time2_new ();
-	mrp_time2_set_date (t, y, m+1, 1);
-	mrp_time2_set_time (t, 0, 0, 0);
-
-	for (d = 1; d <= 31; d++) {
-		time = mrp_time2_get_epoch (t);
-
-		day = mrp_calendar_get_day (calendar, time, TRUE);
-
-		if (day == mrp_day_get_nonwork ()) {
-			planner_calendar_mark_day (calendar_widget,
-						   d,
-						   PLANNER_CALENDAR_MARK_SHADE);
-		}
-		else if (day == mrp_day_get_work ()) {
-			planner_calendar_mark_day (calendar_widget,
-						   d,
-						   PLANNER_CALENDAR_MARK_NONE);
-		}
-
-		mrp_time2_add_days (t, 1);
-	}
-	mrp_time2_free (t);
+	planner_calendar_mark_days (calendar_widget, calendar);
 }
 
 static void
diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-calendar.h
--- planner-0.14.4.orig/src/planner-calendar.h	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-calendar.h	2009-12-03 12:00:03.000000000 +0000
@@ -31,6 +31,7 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
+#include <libplanner/mrp-calendar.h>
 
 #define PLANNER_TYPE_CALENDAR                  (planner_calendar_get_type ())
 #define PLANNER_CALENDAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLANNER_TYPE_CALENDAR, PlannerCalendar))
@@ -143,5 +144,8 @@
 				 guint               day,
 				 PlannerCalendarMarkType  type);
 
+void       planner_calendar_mark_days (PlannerCalendar         *calendar,
+				 MrpCalendar *mrp_calendar);
+
 
 #endif /* __PLANNER_CALENDAR_H__ */
diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/planner-task-date-widget.c
--- planner-0.14.4.orig/src/planner-task-date-widget.c	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-task-date-widget.c	2009-12-03 12:13:05.000000000 +0000
@@ -27,6 +27,7 @@
 #include "libplanner/mrp-task.h"
 #include "libplanner/mrp-paths.h"
 #include "planner-task-date-widget.h"
+#include "planner-calendar.h"
 
 typedef struct {
 	GtkWidget   *calendar;
@@ -35,6 +36,7 @@
 
 	mrptime            time;
 	MrpConstraintType  type;
+	MrpCalendar        *mrp_calendar;
 } PlannerTaskDateWidgetPriv;
 
 
@@ -130,6 +132,29 @@
 	g_signal_emit (widget, signals[DATE_SELECTED], 0);
 }
 
+void
+planner_task_date_widget_set_mrp_calendar (PlannerTaskDateWidget *widget ,
+					   MrpCalendar *mrp_calendar)
+{
+	PlannerTaskDateWidgetPriv *priv;
+
+	priv = GET_PRIV (widget);
+
+	priv->mrp_calendar = mrp_calendar;
+}
+
+static void
+update_schedule_calendar_cb (PlannerCalendar *calendar_widget,
+                             	    PlannerTaskDateWidget *widget)
+{
+	PlannerTaskDateWidgetPriv *priv;
+
+	priv = GET_PRIV (widget);
+
+        if (priv->mrp_calendar)
+        	planner_calendar_mark_days (calendar_widget, priv->mrp_calendar);
+}
+
 static gboolean
 grab_on_window (GdkWindow *window,
 		guint32    time)
@@ -160,6 +185,7 @@
 	
 	type = planner_task_date_widget_get_constraint_type (widget);
 	gtk_widget_set_sensitive (priv->calendar, type != MRP_CONSTRAINT_ASAP);
+	update_schedule_calendar_cb (PLANNER_CALENDAR (priv->calendar), widget);
 
 	/* A bit hackish. Grab focus on the popup widget again when the combo
 	 * has been used, since focus is transferred to the combo when it's
@@ -170,6 +196,22 @@
 	}
 }
 
+GtkWidget *
+create_schedule_calendar (gchar *name,
+		          gchar *string1, gchar *string2,
+		          gint int1, gint int2)
+{
+	GtkWidget *ret;
+
+	ret = planner_calendar_new ();
+
+	planner_calendar_display_options ( PLANNER_CALENDAR (ret),
+		PLANNER_CALENDAR_SHOW_HEADING | PLANNER_CALENDAR_SHOW_DAY_NAMES |
+		PLANNER_CALENDAR_SHOW_WEEK_NUMBERS | PLANNER_CALENDAR_WEEK_START_MONDAY );
+
+	return ret;
+}
+
 static void
 task_date_widget_setup (PlannerTaskDateWidget *widget)
 {
@@ -182,6 +224,8 @@
 
 	priv = GET_PRIV (widget);
 
+	priv->mrp_calendar = NULL;
+
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (widget), vbox);
 
@@ -224,6 +268,10 @@
 			  G_CALLBACK (task_date_day_selected_double_click_cb),
 			  widget);
 
+	g_signal_connect (priv->calendar, "month_changed", 
+			  G_CALLBACK (update_schedule_calendar_cb),
+			  widget);
+
         gtk_widget_show_all (vbox);
 }
 
@@ -239,8 +287,8 @@
 		return;
 	}
 
-	gtk_calendar_select_month (GTK_CALENDAR (priv->calendar), month - 1, year);
-	gtk_calendar_select_day (GTK_CALENDAR (priv->calendar), day);
+	planner_calendar_select_month (PLANNER_CALENDAR (priv->calendar), month - 1, year);
+	planner_calendar_select_day (PLANNER_CALENDAR (priv->calendar), day);
 }
 
 mrptime
@@ -251,7 +299,7 @@
 
 	priv = GET_PRIV (widget);
 	
-	gtk_calendar_get_date (GTK_CALENDAR (priv->calendar),
+	planner_calendar_get_date (PLANNER_CALENDAR (priv->calendar),
 			       &year, &month, &day);
 	
 	month++;
diff -ru planner-0.14.4.orig/src/planner-task-date-widget.h planner-0.14.4/src/planner-task-date-widget.h
--- planner-0.14.4.orig/src/planner-task-date-widget.h	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-task-date-widget.h	2009-12-03 12:00:18.000000000 +0000
@@ -22,6 +22,7 @@
 #define __PLANNER_TASK_DATE_WIDGET_H__
 
 #include <gtk/gtktogglebutton.h>
+#include <libplanner/mrp-calendar.h>
 
 #define PLANNER_TYPE_TASK_DATE_WIDGET            (planner_task_date_widget_get_type ())
 #define PLANNER_TASK_DATE_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLANNER_TYPE_TASK_DATE_WIDGET, PlannerTaskDateWidget))
@@ -50,5 +51,7 @@
 void              planner_task_date_widget_set_constraint_type (PlannerTaskDateWidget *widget,
 								MrpConstraintType      type);
 MrpConstraintType planner_task_date_widget_get_constraint_type (PlannerTaskDateWidget *widget);
+void              planner_task_date_widget_set_mrp_calendar    (PlannerTaskDateWidget *widget ,
+								MrpCalendar *calendar);
 
 #endif /* __PLANNER_TASK_DATE_WIDGET_H__ */
diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
--- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-task-dialog.c	2009-12-03 12:01:17.000000000 +0000
@@ -2276,6 +2276,8 @@
 {
 	GtkWidget     *widget;
 	MrpConstraint *constraint;
+	MrpProject    *project;
+	MrpCalendar   *calendar;
 
 	widget = planner_task_date_widget_new ();
 
@@ -2284,6 +2286,12 @@
 	planner_task_date_widget_set_constraint_type (PLANNER_TASK_DATE_WIDGET (widget),
 						      constraint->type);
 
+	g_object_get (data->task, "project", &project, NULL);
+	calendar = mrp_project_get_calendar (project);
+
+	planner_task_date_widget_set_mrp_calendar (PLANNER_TASK_DATE_WIDGET (widget),
+					           calendar);
+
 	if (constraint->type != MRP_CONSTRAINT_ASAP) {
 		planner_task_date_widget_set_date (PLANNER_TASK_DATE_WIDGET (widget),
 						   constraint->time);


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- planner.spec	23 Nov 2009 12:04:22 -0000	1.68
+++ planner.spec	3 Dec 2009 12:32:54 -0000	1.69
@@ -23,6 +23,7 @@ Patch1: planner-gnome596173-xdg.patch
 Patch2: planner-gnome596966-editoninsert.patch
 Patch3: planner-gnome550559-fitzoom.patch
 Patch4: planner-buildfix.patch
+Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -57,6 +58,7 @@ This package provides a plugin to integr
 %patch2 -p1 -b .editoninsert
 %patch3 -p1 -b .fitzoom
 %patch4 -p1 -b .buildfix
+%patch5 -p1 -b .edittask
 
 %build
 rm -rf libegg
@@ -157,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-6
+- Resolves: rhbz#543741 use PlannerCalander in edit->task
+
 * Mon Nov 23 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-5
 - Resolves: rhbz#540242 fix gtk_recent_manager_add_full usage
 



From caolanm at fedoraproject.org  Thu Dec  3 12:32:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 12:32:55 +0000 (UTC)
Subject: rpms/planner/devel
	planner-gnome603693-planner-calendar-for-edittask.patch, NONE,
	1.1 planner.spec, 1.69, 1.70
Message-ID: <20091203123255.0605811C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	planner.spec 
Added Files:
	planner-gnome603693-planner-calendar-for-edittask.patch 
Log Message:
Resolves: rhbz#543741 use PlannerCalander in edit->task

planner-gnome603693-planner-calendar-for-edittask.patch:
 data/glade/task-date-widget.glade |    8 +++--
 src/planner-calendar-dialog.c     |   30 ---------------------
 src/planner-calendar.c            |   33 +++++++++++++++++++++++
 src/planner-calendar.h            |    4 ++
 src/planner-task-date-widget.c    |   54 +++++++++++++++++++++++++++++++++++---
 src/planner-task-date-widget.h    |    3 ++
 src/planner-task-dialog.c         |    8 +++++
 7 files changed, 105 insertions(+), 35 deletions(-)

--- NEW FILE planner-gnome603693-planner-calendar-for-edittask.patch ---
diff -ru planner-0.14.4.orig/data/glade/task-date-widget.glade planner-0.14.4/data/glade/task-date-widget.glade
--- planner-0.14.4.orig/data/glade/task-date-widget.glade	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/data/glade/task-date-widget.glade	2009-12-03 11:07:46.000000000 +0000
@@ -25,10 +27,12 @@
       <property name="spacing">6</property>
 
       <child>
-	<widget class="GtkCalendar" id="schedule_calendar">
+	<widget class="Custom" id="schedule_calendar">
 	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="display_options">GTK_CALENDAR_SHOW_HEADING|GTK_CALENDAR_SHOW_DAY_NAMES|GTK_CALENDAR_SHOW_WEEK_NUMBERS</property>
+	  <property name="creation_function">create_schedule_calendar</property>
+	  <property name="int1">0</property>
+	  <property name="int2">0</property>
+	  <property name="last_modification_time">Thu, 03 Dec 2009 11:07:42 GMT</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-calendar.c
--- planner-0.14.4.orig/src/planner-calendar.c	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-calendar.c	2009-12-03 12:00:44.000000000 +0000
@@ -2782,5 +2782,38 @@
 	}
 }	
 
+void
+planner_calendar_mark_days (PlannerCalendar         *calendar,
+		      MrpCalendar *mrp_calendar)
+{
+	guint        y, m, d;
+	MrpTime      *t;
+	mrptime      time;
+	MrpDay       *day;
 
+	planner_calendar_get_date (calendar, &y, &m, &d);
 
+	t = mrp_time2_new ();
+	mrp_time2_set_date (t, y, m+1, 1);
+	mrp_time2_set_time (t, 0, 0, 0);
+
+	for (d = 1; d <= 31; d++) {
+		time = mrp_time2_get_epoch (t);
+
+		day = mrp_calendar_get_day (mrp_calendar, time, TRUE);
+
+		if (day == mrp_day_get_nonwork ()) {
+			planner_calendar_mark_day (calendar,
+						   d,
+						   PLANNER_CALENDAR_MARK_SHADE);
+		}
+		else if (day == mrp_day_get_work ()) {
+			planner_calendar_mark_day (calendar,
+						   d,
+						   PLANNER_CALENDAR_MARK_NONE);
+		}
+
+		mrp_time2_add_days (t, 1);
+	}
+	mrp_time2_free (t);
+}
diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/planner-calendar-dialog.c
--- planner-0.14.4.orig/src/planner-calendar-dialog.c	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-calendar-dialog.c	2009-12-03 11:31:26.000000000 +0000
@@ -876,10 +876,6 @@
 {
 	MrpCalendar *calendar;
 	PlannerCalendar  *calendar_widget;
-	guint        y, m, d;
-	MrpDay      *day;
-	MrpTime      *t;
-	mrptime      time;
 	
 	calendar = cal_dialog_get_selected_calendar (GTK_TREE_VIEW (data->tree_view));
 	if (!calendar) {
@@ -895,31 +891,7 @@
 	gtk_widget_set_sensitive (data->default_week_button, TRUE);
 	gtk_widget_set_sensitive (data->working_time_button, TRUE);
 
-	planner_calendar_get_date (calendar_widget, &y, &m, &d);
-
-	t = mrp_time2_new ();
-	mrp_time2_set_date (t, y, m+1, 1);
-	mrp_time2_set_time (t, 0, 0, 0);
-
-	for (d = 1; d <= 31; d++) {
-		time = mrp_time2_get_epoch (t);
-
-		day = mrp_calendar_get_day (calendar, time, TRUE);
-
-		if (day == mrp_day_get_nonwork ()) {
-			planner_calendar_mark_day (calendar_widget,
-						   d,
-						   PLANNER_CALENDAR_MARK_SHADE);
-		}
-		else if (day == mrp_day_get_work ()) {
-			planner_calendar_mark_day (calendar_widget,
-						   d,
-						   PLANNER_CALENDAR_MARK_NONE);
-		}
-
-		mrp_time2_add_days (t, 1);
-	}
-	mrp_time2_free (t);
+	planner_calendar_mark_days (calendar_widget, calendar);
 }
 
 static void
diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-calendar.h
--- planner-0.14.4.orig/src/planner-calendar.h	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-calendar.h	2009-12-03 12:00:03.000000000 +0000
@@ -31,6 +31,7 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
+#include <libplanner/mrp-calendar.h>
 
 #define PLANNER_TYPE_CALENDAR                  (planner_calendar_get_type ())
 #define PLANNER_CALENDAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLANNER_TYPE_CALENDAR, PlannerCalendar))
@@ -143,5 +144,8 @@
 				 guint               day,
 				 PlannerCalendarMarkType  type);
 
+void       planner_calendar_mark_days (PlannerCalendar         *calendar,
+				 MrpCalendar *mrp_calendar);
+
 
 #endif /* __PLANNER_CALENDAR_H__ */
diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/planner-task-date-widget.c
--- planner-0.14.4.orig/src/planner-task-date-widget.c	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-task-date-widget.c	2009-12-03 12:13:05.000000000 +0000
@@ -27,6 +27,7 @@
 #include "libplanner/mrp-task.h"
 #include "libplanner/mrp-paths.h"
 #include "planner-task-date-widget.h"
+#include "planner-calendar.h"
 
 typedef struct {
 	GtkWidget   *calendar;
@@ -35,6 +36,7 @@
 
 	mrptime            time;
 	MrpConstraintType  type;
+	MrpCalendar        *mrp_calendar;
 } PlannerTaskDateWidgetPriv;
 
 
@@ -130,6 +132,29 @@
 	g_signal_emit (widget, signals[DATE_SELECTED], 0);
 }
 
+void
+planner_task_date_widget_set_mrp_calendar (PlannerTaskDateWidget *widget ,
+					   MrpCalendar *mrp_calendar)
+{
+	PlannerTaskDateWidgetPriv *priv;
+
+	priv = GET_PRIV (widget);
+
+	priv->mrp_calendar = mrp_calendar;
+}
+
+static void
+update_schedule_calendar_cb (PlannerCalendar *calendar_widget,
+                             	    PlannerTaskDateWidget *widget)
+{
+	PlannerTaskDateWidgetPriv *priv;
+
+	priv = GET_PRIV (widget);
+
+        if (priv->mrp_calendar)
+        	planner_calendar_mark_days (calendar_widget, priv->mrp_calendar);
+}
+
 static gboolean
 grab_on_window (GdkWindow *window,
 		guint32    time)
@@ -160,6 +185,7 @@
 	
 	type = planner_task_date_widget_get_constraint_type (widget);
 	gtk_widget_set_sensitive (priv->calendar, type != MRP_CONSTRAINT_ASAP);
+	update_schedule_calendar_cb (PLANNER_CALENDAR (priv->calendar), widget);
 
 	/* A bit hackish. Grab focus on the popup widget again when the combo
 	 * has been used, since focus is transferred to the combo when it's
@@ -170,6 +196,22 @@
 	}
 }
 
+GtkWidget *
+create_schedule_calendar (gchar *name,
+		          gchar *string1, gchar *string2,
+		          gint int1, gint int2)
+{
+	GtkWidget *ret;
+
+	ret = planner_calendar_new ();
+
+	planner_calendar_display_options ( PLANNER_CALENDAR (ret),
+		PLANNER_CALENDAR_SHOW_HEADING | PLANNER_CALENDAR_SHOW_DAY_NAMES |
+		PLANNER_CALENDAR_SHOW_WEEK_NUMBERS | PLANNER_CALENDAR_WEEK_START_MONDAY );
+
+	return ret;
+}
+
 static void
 task_date_widget_setup (PlannerTaskDateWidget *widget)
 {
@@ -182,6 +224,8 @@
 
 	priv = GET_PRIV (widget);
 
+	priv->mrp_calendar = NULL;
+
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (widget), vbox);
 
@@ -224,6 +268,10 @@
 			  G_CALLBACK (task_date_day_selected_double_click_cb),
 			  widget);
 
+	g_signal_connect (priv->calendar, "month_changed", 
+			  G_CALLBACK (update_schedule_calendar_cb),
+			  widget);
+
         gtk_widget_show_all (vbox);
 }
 
@@ -239,8 +287,8 @@
 		return;
 	}
 
-	gtk_calendar_select_month (GTK_CALENDAR (priv->calendar), month - 1, year);
-	gtk_calendar_select_day (GTK_CALENDAR (priv->calendar), day);
+	planner_calendar_select_month (PLANNER_CALENDAR (priv->calendar), month - 1, year);
+	planner_calendar_select_day (PLANNER_CALENDAR (priv->calendar), day);
 }
 
 mrptime
@@ -251,7 +299,7 @@
 
 	priv = GET_PRIV (widget);
 	
-	gtk_calendar_get_date (GTK_CALENDAR (priv->calendar),
+	planner_calendar_get_date (PLANNER_CALENDAR (priv->calendar),
 			       &year, &month, &day);
 	
 	month++;
diff -ru planner-0.14.4.orig/src/planner-task-date-widget.h planner-0.14.4/src/planner-task-date-widget.h
--- planner-0.14.4.orig/src/planner-task-date-widget.h	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-task-date-widget.h	2009-12-03 12:00:18.000000000 +0000
@@ -22,6 +22,7 @@
 #define __PLANNER_TASK_DATE_WIDGET_H__
 
 #include <gtk/gtktogglebutton.h>
+#include <libplanner/mrp-calendar.h>
 
 #define PLANNER_TYPE_TASK_DATE_WIDGET            (planner_task_date_widget_get_type ())
 #define PLANNER_TASK_DATE_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLANNER_TYPE_TASK_DATE_WIDGET, PlannerTaskDateWidget))
@@ -50,5 +51,7 @@
 void              planner_task_date_widget_set_constraint_type (PlannerTaskDateWidget *widget,
 								MrpConstraintType      type);
 MrpConstraintType planner_task_date_widget_get_constraint_type (PlannerTaskDateWidget *widget);
+void              planner_task_date_widget_set_mrp_calendar    (PlannerTaskDateWidget *widget ,
+								MrpCalendar *calendar);
 
 #endif /* __PLANNER_TASK_DATE_WIDGET_H__ */
diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
--- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-03 10:50:00.000000000 +0000
+++ planner-0.14.4/src/planner-task-dialog.c	2009-12-03 12:01:17.000000000 +0000
@@ -2276,6 +2276,8 @@
 {
 	GtkWidget     *widget;
 	MrpConstraint *constraint;
+	MrpProject    *project;
+	MrpCalendar   *calendar;
 
 	widget = planner_task_date_widget_new ();
 
@@ -2284,6 +2286,12 @@
 	planner_task_date_widget_set_constraint_type (PLANNER_TASK_DATE_WIDGET (widget),
 						      constraint->type);
 
+	g_object_get (data->task, "project", &project, NULL);
+	calendar = mrp_project_get_calendar (project);
+
+	planner_task_date_widget_set_mrp_calendar (PLANNER_TASK_DATE_WIDGET (widget),
+					           calendar);
+
 	if (constraint->type != MRP_CONSTRAINT_ASAP) {
 		planner_task_date_widget_set_date (PLANNER_TASK_DATE_WIDGET (widget),
 						   constraint->time);


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- planner.spec	23 Nov 2009 12:04:22 -0000	1.69
+++ planner.spec	3 Dec 2009 12:32:54 -0000	1.70
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -23,6 +23,7 @@ Patch1: planner-gnome596173-xdg.patch
 Patch2: planner-gnome596966-editoninsert.patch
 Patch3: planner-gnome550559-fitzoom.patch
 Patch4: planner-buildfix.patch
+Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -52,11 +53,12 @@ This package provides a plugin to integr
 
 %prep
 %setup -q
-%patch0 -p1 -b .planner-gnome349304-recentlyused.patch
+%patch0 -p1 -b .recentlyused
 %patch1 -p1 -b .xdg
 %patch2 -p1 -b .editoninsert
 %patch3 -p1 -b .fitzoom
 %patch4 -p1 -b .buildfix
+%patch5 -p1 -b .edittask
 
 %build
 rm -rf libegg
@@ -157,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-6
+- Resolves: rhbz#543741 use PlannerCalander in edit->task
+
 * Mon Nov 23 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-5
 - Resolves: rhbz#540242 fix gtk_recent_manager_add_full usage
 



From mmaslano at fedoraproject.org  Thu Dec  3 12:33:59 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu,  3 Dec 2009 12:33:59 +0000 (UTC)
Subject: File pam_atd uploaded to lookaside cache by mmaslano
Message-ID: <20091203123359.22DC810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for at:

000d2f30379d2bf8af09f51416e863ec  pam_atd



From mmaslano at fedoraproject.org  Thu Dec  3 12:34:21 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu,  3 Dec 2009 12:34:21 +0000 (UTC)
Subject: rpms/at/devel at-3.1.12-makefile.patch, NONE,
	1.1 at-3.1.12-nitpicks.patch, NONE, 1.1 at-3.1.12-opt_V.patch,
	NONE, 1.1 at-3.1.12-pam.patch, NONE, 1.1 at-3.1.12-selinux.patch,
	NONE, 1.1 at-3.1.12-shell.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 at.spec, 1.80, 1.81 sources, 1.9,
	1.10 at-3.1.10-shell.patch, 1.1, NONE at-3.1.11-dont_fork.patch,
	1.1, NONE at-3.1.11-log.patch, 1.1,
	NONE at-3.1.11-makefile.patch, 1.1,
	NONE at-3.1.11-nitpicks.patch, 1.1, NONE at-3.1.11-opt_V.patch,
	1.1, NONE at-3.1.11-pam2.patch, 1.1,
	NONE at-3.1.11-selinux.patch, 1.1, NONE at-3.1.11-shell.patch,
	1.1, NONE
Message-ID: <20091203123421.5263E11C00EE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

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

Modified Files:
	.cvsignore at.spec sources 
Added Files:
	at-3.1.12-makefile.patch at-3.1.12-nitpicks.patch 
	at-3.1.12-opt_V.patch at-3.1.12-pam.patch 
	at-3.1.12-selinux.patch at-3.1.12-shell.patch 
Removed Files:
	at-3.1.10-shell.patch at-3.1.11-dont_fork.patch 
	at-3.1.11-log.patch at-3.1.11-makefile.patch 
	at-3.1.11-nitpicks.patch at-3.1.11-opt_V.patch 
	at-3.1.11-pam2.patch at-3.1.11-selinux.patch 
	at-3.1.11-shell.patch 
Log Message:
* Thu Dec  3 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.1.12-1
- update to the new version of at
- adapt patches for new version
- change our pam config to source
- start using new upstream test instead of our nonfunctinal
- upstream changed nofork option -n to foreground option -f


at-3.1.12-makefile.patch:
 Makefile.in |   50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

--- NEW FILE at-3.1.12-makefile.patch ---
diff -up at-3.1.12/Makefile.in.make at-3.1.12/Makefile.in
--- at-3.1.12/Makefile.in.make	2009-11-23 16:11:52.000000000 +0100
+++ at-3.1.12/Makefile.in	2009-12-03 13:23:08.794258910 +0100
@@ -65,13 +65,13 @@ LIST = Filelist Filelist.asc
 all: at atd atrun
 
 at: $(ATOBJECTS)
-	$(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
+	$(CC) $(CFLAGS) -o at -pie $(ATOBJECTS) $(LIBS) $(LEXLIB) $(SELINUXLIB) $(PAMLIB)
 	rm -f $(CLONES)
 	$(LN_S) -f at atq
 	$(LN_S) -f at atrm
 
 atd: $(RUNOBJECTS)
-	$(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
+	$(CC) $(CFLAGS) -o atd -pie $(RUNOBJECTS) $(LIBS) $(SELINUXLIB) $(PAMLIB)
 
 y.tab.c y.tab.h: parsetime.y
 	$(YACC) -d parsetime.y
@@ -83,38 +83,42 @@ atrun: atrun.in
 	configure
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(DEFS) $*.c
+	$(CC) -c $(CFLAGS) -fPIE $(DEFS) $*.c
 
 install: all
-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir)
-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir)
-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir)
-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir)
-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir)
-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
-	chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
+	$(INSTALL) -m 755 -d $(IROOT)$(etcdir)
+	$(INSTALL) -m 755 -d $(IROOT)$(bindir)
+	$(INSTALL) -m 755 -d $(IROOT)$(sbindir)
+	$(INSTALL) -m 755 -d $(IROOT)$(docdir)
+	$(INSTALL) -m 755 -d $(IROOT)$(atdocdir)
+	$(INSTALL) -m 755 -d $(IROOT)$(ATJOB_DIR)
+	$(INSTALL) -m 755 -d $(IROOT)$(etcdir)/pam.d
+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR)
+	chmod 700 $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR)
+	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR)
 	touch $(IROOT)$(LFILE)
 	chmod 600 $(IROOT)$(LFILE)
 	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
-	test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir)
+	test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL)  -m 600 at.deny $(IROOT)$(etcdir)/
+	$(INSTALL) -o $(INSTALL_ROOT_USER) -g $(DAEMON_GROUPNAME) pam_atd $(IROOT)$(etcdir)/pam.d/atd
+	$(INSTALL) -m 4755 at $(IROOT)$(bindir)
 	$(LN_S) -f at $(IROOT)$(bindir)/atq
 	$(LN_S) -f at $(IROOT)$(bindir)/atrm
-	$(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
-	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
-	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
-	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
-	$(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
-	$(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
-	$(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
+	$(INSTALL) -m 755 batch $(IROOT)$(bindir)
+	$(INSTALL) -d -m 755 $(IROOT)$(man1dir)
+	$(INSTALL) -d -m 755 $(IROOT)$(man5dir)
+	$(INSTALL) -d -m 755 $(IROOT)$(man8dir)
+	$(INSTALL) -m 755 atd $(IROOT)$(sbindir)
+	$(INSTALL) -m 755 atrun $(IROOT)$(sbindir)
+	$(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/
 	cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
-	$(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/
+	$(INSTALL) -m 644 atd.8 $(IROOT)$(man8dir)/
 	sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
-	$(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
+	$(INSTALL) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
 	rm -f tmpman
-	$(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/
+	$(INSTALL) -m 644 at_allow.5 $(IROOT)$(man5dir)/
 	cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 
-	$(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
+	$(INSTALL) -m 644 $(DOCS) $(IROOT)$(atdocdir)
 	rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
 		$(IROOT)$(mandir)/cat1/atq.1*
 	rm -f $(IROOT)$(mandir)/cat1/atd.8*

at-3.1.12-nitpicks.patch:
 at.1.in |    2 +-
 atd.c   |   32 +++++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

--- NEW FILE at-3.1.12-nitpicks.patch ---
diff -up at-3.1.12/at.1.in.nit at-3.1.12/at.1.in
--- at-3.1.12/at.1.in.nit	2009-11-23 16:11:52.000000000 +0100
+++ at-3.1.12/at.1.in	2009-12-03 10:32:19.018261655 +0100
@@ -121,7 +121,7 @@ and to run a job at 1am tomorrow, you wo
 .B at 1am tomorrow.
 .PP
 The exact definition of the time specification can be found in
-.IR @prefix@/share/doc/at/timespec .
+.IR @prefix@/share/doc/at- at VERSION@/timespec .
 .PP
 For both
 .BR at " and " batch ,
diff -up at-3.1.12/atd.c.nit at-3.1.12/atd.c
--- at-3.1.12/atd.c.nit	2009-11-23 16:11:52.000000000 +0100
+++ at-3.1.12/atd.c	2009-12-03 10:33:12.494259601 +0100
@@ -83,6 +83,9 @@
 #include "getloadavg.h"
 #endif
 
+#ifndef LOG_ATD
+#define LOG_ATD        LOG_DAEMON
+#endif
 /* Macros */
 
 #define BATCH_INTERVAL_DEFAULT 60
@@ -194,6 +197,18 @@ myfork()
 
 #define fork myfork
 #endif
+#undef ATD_MAIL_PROGRAM
+#undef ATD_MAIL_NAME
+#if defined(SENDMAIL)
+#define ATD_MAIL_PROGRAM SENDMAIL
+#define ATD_MAIL_NAME    "sendmail"
+#elif  defined(MAILC)
+#define ATD_MAIL_PROGRAM MAILC
+#define ATD_MAIL_NAME    "mail"
+#elif  defined(MAILX)
+#define ATD_MAIL_PROGRAM MAILX
+#define ATD_MAIL_NAME    "mailx"
+#endif
 
 static void
 run_file(const char *filename, uid_t uid, gid_t gid)
@@ -276,6 +291,9 @@ run_file(const char *filename, uid_t uid
 	free(newname);
 	return;
     }
+
+    (void) setsid(); //own session for process
+
     /* Let's see who we mail to.  Hopefully, we can read it from
      * the command file; if not, send it to the owner, or, failing that,
      * to root.
@@ -435,6 +453,9 @@ run_file(const char *filename, uid_t uid
 	    if (setuid(uid) < 0)
 		perr("Cannot set user id");
 
+            if (SIG_ERR == signal(SIGCHLD, SIG_DFL))
+                perr("Cannot reset signal handler to default");
+
 	    chdir("/");
 
 	    if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0)
@@ -503,6 +524,9 @@ run_file(const char *filename, uid_t uid
 	    if (setuid(uid) < 0)
 		perr("Cannot set user id");
 
+            if (SIG_ERR == signal(SIGCHLD, SIG_DFL))
+                perr("Cannot reset signal handler to default");
+
 	    chdir ("/");
 
 #if defined(SENDMAIL)
@@ -617,6 +641,7 @@ run_loop()
 		 * Let's remove the lockfile and reschedule.
 		 */
 		strncpy(lock_name, dirent->d_name, sizeof(lock_name));
+                lock_name[sizeof(lock_name)-1] = '\0';
 		lock_name[0] = '=';
 		unlink(lock_name);
 		next_job = now;
@@ -651,6 +676,7 @@ run_loop()
 	    run_batch++;
 	    if (strcmp(batch_name, dirent->d_name) > 0) {
 		strncpy(batch_name, dirent->d_name, sizeof(batch_name));
+                batch_name[sizeof(batch_name)-1] = '\0';
 		batch_uid = buf.st_uid;
 		batch_gid = buf.st_gid;
 		batch_queue = queue;
@@ -725,11 +751,7 @@ main(int argc, char *argv[])
 
     RELINQUISH_PRIVS_ROOT(daemon_uid, daemon_gid)
 
-#ifndef LOG_CRON
-#define LOG_CRON	LOG_DAEMON
-#endif
-
-    openlog("atd", LOG_PID, LOG_CRON);
+    openlog("atd", LOG_PID, LOG_ATD);
 
     opterr = 0;
     errno = 0;

at-3.1.12-opt_V.patch:
 at.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE at-3.1.12-opt_V.patch ---
diff -up at-3.1.12/at.c.opt_V at-3.1.12/at.c
--- at-3.1.12/at.c.opt_V	2009-11-23 16:11:52.000000000 +0100
+++ at-3.1.12/at.c	2009-12-02 13:20:29.770215516 +0100
@@ -853,10 +853,9 @@ main(int argc, char **argv)
      */
 
     if (disp_version) {
-	fprintf(stderr, "at version " VERSION "\n"
-	   "Please report bugs to the Debian bug tracking system (http://bugs.debian.org/)\n"
-	   "or contact the maintainers (at at packages.debian.org).\n");
-	exit(EXIT_SUCCESS);
+	fprintf(stderr, "at version " VERSION "\n");
+	if (argc == 2)
+		exit(EXIT_SUCCESS);
     }
 
     /* select our program

at-3.1.12-pam.patch:
 at.c         |   21 ++++----------
 atd.c        |   83 +++++++++++++++++++++++++++++++++++++++++++----------------
 config.h.in  |    4 +-
 configure.ac |    9 +++++-
 perm.c       |   47 +++++++++++++++++++++++++++++++--
 privs.h      |   58 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 180 insertions(+), 42 deletions(-)

--- NEW FILE at-3.1.12-pam.patch ---
diff -up at-3.1.12/at.c.pam at-3.1.12/at.c
--- at-3.1.12/at.c.pam	2009-12-03 10:34:52.714284767 +0100
+++ at-3.1.12/at.c	2009-12-03 10:36:38.736257590 +0100
@@ -318,26 +318,19 @@ writefile(time_t runtimer, char queue)
 	 * bit.  Yes, this is a kluge.
 	 */
 	cmask = umask(S_IRUSR | S_IWUSR | S_IXUSR);
-        seteuid(real_uid);
+       if ((seteuid(effective_uid)) < 0)
+	    perr("Error in seteuid: %s", errno);
 	if ((fd = open(atfile, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, S_IRUSR)) == -1)
 	    perr("Cannot create atjob file %.500s", atfile);
-        seteuid(effective_uid);
 
 	if ((fd2 = dup(fd)) < 0)
 	    perr("Error in dup() of job file");
 
-        /*
 	if (fchown(fd2, real_uid, real_gid) != 0)
-	    perr("Cannot give away file");
-        */
+	    perr("Cannot give real_uid and real_gid the file");
 
     PRIV_END
 
-    /* We no longer need suid root; now we just need to be able to write
-     * to the directory, if necessary.
-     */
-
-    REDUCE_PRIV(daemon_uid, daemon_gid)
     /* We've successfully created the file; let's set the flag so it 
      * gets removed in case of an interrupt or error.
      */
@@ -661,7 +654,7 @@ process_jobs(int argc, char **argv, int 
                     We need the unprivileged uid here since the file is owned by the real
                     (not effective) uid.
                     */
-                    setregid(real_gid, effective_gid);
+		    PRIV_START
 
 		    if (queue == '=') {
 			fprintf(stderr, "Warning: deleting running job\n");
@@ -670,8 +663,8 @@ process_jobs(int argc, char **argv, int 
 			perr("Cannot unlink %.500s", dirent->d_name);
 			rc = EXIT_FAILURE;
 		    }
+		    PRIV_END
 
-                    setregid(effective_gid, real_gid);
 		    done = 1;
 
 		    break;
@@ -681,7 +674,7 @@ process_jobs(int argc, char **argv, int 
 			FILE *fp;
 			int ch;
 
-			setregid(real_gid, effective_gid);
+			PRIV_START
 			fp = fopen(dirent->d_name, "r");
 
 			if (fp) {
@@ -694,7 +687,7 @@ process_jobs(int argc, char **argv, int 
 			    perr("Cannot open %.500s", dirent->d_name);
 			    rc = EXIT_FAILURE;
 			}
-			setregid(effective_gid, real_gid);
+			PRIV_END
 		    }
 		    break;
 
diff -up at-3.1.12/atd.c.pam at-3.1.12/atd.c
--- at-3.1.12/atd.c.pam	2009-12-03 10:36:45.265284508 +0100
+++ at-3.1.12/atd.c	2009-12-03 10:38:52.276261175 +0100
@@ -111,7 +111,7 @@ static int run_as_daemon = 0;
 
 static volatile sig_atomic_t term_signal = 0;
 
-#ifdef HAVE_PAM
+#ifdef WITH_PAM
 #include <security/pam_appl.h>
 
 static pam_handle_t *pamh = NULL;
@@ -120,15 +120,7 @@ static const struct pam_conv conv = {
 	NULL
 };
 
-#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \
-	fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \
-	syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \
-	pam_end(pamh, retcode); exit(1); \
-    }
-#define PAM_END { retcode = pam_close_session(pamh,0); \
-		pam_end(pamh,retcode); }
-
-#endif /* HAVE_PAM */
+#endif /* WITH_PAM */
 
 /* Signal handlers */
 RETSIGTYPE 
@@ -234,7 +226,7 @@ run_file(const char *filename, uid_t uid
     char queue;
     char fmt[64];
     unsigned long jobno;
-#ifdef HAVE_PAM
+#ifdef WITH_PAM
     int retcode;
 #endif
 
@@ -395,16 +387,11 @@ run_file(const char *filename, uid_t uid
     fstat(fd_out, &buf);
     size = buf.st_size;
 
-#ifdef HAVE_PAM
+#ifdef WITH_PAM
     PRIV_START
-    retcode = pam_start("atd", pentry->pw_name, &conv, &pamh);
-    PAM_FAIL_CHECK;
-    retcode = pam_acct_mgmt(pamh, PAM_SILENT);
-    PAM_FAIL_CHECK;
-    retcode = pam_open_session(pamh, PAM_SILENT);
-    PAM_FAIL_CHECK;
-    retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT);
-    PAM_FAIL_CHECK;
+    PAM_HANDLING;
+    closelog(); 
+    openlog("atd", LOG_PID, LOG_ATD);
     PRIV_END
 #endif
 
@@ -419,7 +406,15 @@ run_file(const char *filename, uid_t uid
     else if (pid == 0) {
 	char *nul = NULL;
 	char **nenvp = &nul;
+	char **pam_envp=0L;
 
+	PRIV_START
+#ifdef WITH_PAM
+	pam_envp = pam_getenvlist(pamh);
+	if ( ( pam_envp != 0L ) && (pam_envp[0] != 0L) )
+		nenvp = pam_envp;
+#endif
+	PRIV_END
 	/* Set up things for the child; we want standard input from the
 	 * input file, and standard output and error sent to our output file.
 	 */
@@ -460,7 +455,16 @@ run_file(const char *filename, uid_t uid
 
 	    if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0)
 		perr("Exec failed for /bin/sh");
-
+#ifdef  WITH_PAM
+	    if ( ( nenvp != &nul ) && (pam_envp != 0L)  && (*pam_envp != 0L))
+	    {
+		for( nenvp = pam_envp; *nenvp != 0L; nenvp++)
+			free(*nenvp);
+		free( pam_envp );
+		nenvp = &nul;
+		pam_envp=0L;
+	    }
+#endif
 	PRIV_END
     }
     /* We're the parent.  Let's wait.
@@ -474,7 +478,7 @@ run_file(const char *filename, uid_t uid
      */
     waitpid(pid, (int *) NULL, 0);
 
-#ifdef HAVE_PAM
+#ifdef WITH_PAM
     PRIV_START
 	pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
 	retcode = pam_close_session(pamh, PAM_SILENT);
@@ -503,6 +507,14 @@ run_file(const char *filename, uid_t uid
     if (fd_in != STDOUT_FILENO && fd_in != STDERR_FILENO)
 	close(fd_in);
 
+#ifdef  WITH_PAM
+    pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT );
+    pam_close_session(pamh, PAM_SILENT);
+    pam_end(pamh, PAM_ABORT);
+    closelog();
+    openlog("atd", LOG_PID, LOG_ATD);
+#endif
+
     unlink(filename);
 
     /* The job is now finished.  We can delete its input file.
@@ -511,8 +523,19 @@ run_file(const char *filename, uid_t uid
     unlink(newname);
     free(newname);
 
+#ifdef ATD_MAIL_PROGRAM
     if (((send_mail != -1) && (buf.st_size != size)) || (send_mail == 1)) {
+       int mail_pid = -1;
+#ifdef WITH_PAM
+       PAM_HANDLING;
+       closelog();
+       openlog("atd", LOG_PID, LOG_ATD);
+#endif
+
+   mail_pid = fork();
 
+   if ( mail_pid == 0 )
+   {
 	PRIV_START
 
 	    if (initgroups(pentry->pw_name, pentry->pw_gid))
@@ -537,7 +560,23 @@ run_file(const char *filename, uid_t uid
 	    perr("Exec failed for mail command");
 
 	PRIV_END
+   }
+   else if ( mail_pid == -1 ) {
+           perr("fork of mailer failed");
+   }
+   else {
+           /* Parent */
+           waitpid(mail_pid, (int *) NULL, 0);
+   }
+#ifdef WITH_PAM
+   pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT );
+   pam_close_session(pamh, PAM_SILENT);
+   pam_end(pamh, PAM_ABORT);
+   closelog();
+   openlog("atd", LOG_PID, LOG_ATD);
+#endif
     }
+#endif
     exit(EXIT_SUCCESS);
 }
 
diff -up at-3.1.12/config.h.in.pam at-3.1.12/config.h.in
--- at-3.1.12/config.h.in.pam	2009-11-23 16:11:52.000000000 +0100
+++ at-3.1.12/config.h.in	2009-12-03 10:34:36.373265254 +0100
@@ -68,8 +68,8 @@
 /* Define to 1 if you have the <nlist.h> header file. */
 #undef HAVE_NLIST_H
 
-/* Define to 1 for PAM support */
-#undef HAVE_PAM
+/* Define if you are building with_pam */
+#undef WITH_PAM
 
 /* Define to 1 if you have the `pstat_getdynamic' function. */
 #undef HAVE_PSTAT_GETDYNAMIC
diff -up at-3.1.12/configure.ac.pam at-3.1.12/configure.ac
--- at-3.1.12/configure.ac.pam	2009-11-23 16:11:52.000000000 +0100
+++ at-3.1.12/configure.ac	2009-12-03 10:34:36.373265254 +0100
@@ -84,7 +84,7 @@ AC_FUNC_GETLOADAVG
 AC_CHECK_FUNCS(getcwd mktime strftime setreuid setresuid sigaction waitpid)
 AC_CHECK_HEADERS(security/pam_appl.h, [
   PAMLIB="-lpam"
-  AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support])
+  AC_DEFINE(WITH_PAM, 1, [Define to 1 for PAM support])
 ])
 
 dnl Checking for programs
@@ -238,6 +238,13 @@ AC_ARG_WITH(daemon_username,
 )
 AC_SUBST(DAEMON_USERNAME)
 
+AC_ARG_WITH(pam,
+[ --with-pam            Define to enable pam support ],
+AC_DEFINE(WITH_PAM),
+)
+AC_CHECK_LIB(pam, pam_start, PAMLIB='-lpam -lpam_misc')
+AC_SUBST(PAMLIB)
+
 AC_MSG_CHECKING(groupname to run under)
 AC_ARG_WITH(daemon_groupname,
 [ --with-daemon_groupname=DAEMON_GROUPNAME	Groupname to run under (default daemon) ],
diff -up at-3.1.12/perm.c.pam at-3.1.12/perm.c
--- at-3.1.12/perm.c.pam	2009-11-23 16:11:52.000000000 +0100
+++ at-3.1.12/perm.c	2009-12-03 10:34:36.373265254 +0100
@@ -51,6 +51,14 @@
 #define PRIV_END while(0)
 #endif
 
+#ifdef WITH_PAM
+#include <security/pam_appl.h>
+static pam_handle_t *pamh = NULL;
+static const struct pam_conv conv = {
+       NULL
+};
+#endif
+
 /* Structures and unions */
 
 
@@ -108,18 +116,51 @@ user_in_file(const char *path, const cha
 int
 check_permission()
 {
-  uid_t uid = geteuid();
+  uid_t euid = geteuid(), uid=getuid(), egid=getegid(), gid=getgid();
   struct passwd *pentry;
   int    allow = 0, deny = 1;
 
-  if (uid == 0)
+  int    retcode = 0;
+  if (euid == 0)
     return 1;
 
-  if ((pentry = getpwuid(uid)) == NULL) {
+  if ((pentry = getpwuid(euid)) == NULL) {
     perror("Cannot access user database");
     exit(EXIT_FAILURE);
   }
 
+#ifdef  WITH_PAM
+/*
+ *  We must check if the atd daemon userid will be allowed to gain the job owner user's
+ *  credentials with PAM . If not, the user has been denied at(1) usage, eg. with pam_access.
+ */
+  if (setreuid(daemon_uid, daemon_uid) != 0) {
+      fprintf(stderr, "cannot set egid: %s", strerror(errno));
+      exit(1);
+  }
+  if (setregid(daemon_gid, daemon_gid) != 0) {
+      fprintf(stderr, "cannot set euid: %s", strerror(errno));
+      exit(1);
+  }
+
+    pam_close_session(pamh,PAM_SILENT);
+
+    PAM_HANDLING;
+
+    pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT );
+    pam_close_session(pamh,PAM_SILENT);
+    pam_end(pamh, PAM_ABORT);
+
+    if (setregid(gid,egid) != 0) {
+        fprintf(stderr, "cannot set egid: %s", strerror(errno));
+        exit(1);
+    }
+    if (setreuid(uid,euid) != 0) {
+        fprintf(stderr, "cannot set euid: %s", strerror(errno));
+        exit(1);
+    }
+#endif
+
   allow = user_in_file(ETCDIR "/at.allow", pentry->pw_name);
   if (allow==0 || allow==1)
     return allow;
diff -up at-3.1.12/privs.h.pam at-3.1.12/privs.h
--- at-3.1.12/privs.h.pam	2009-11-23 16:11:52.000000000 +0100
+++ at-3.1.12/privs.h	2009-12-03 10:34:36.374266484 +0100
@@ -144,3 +144,61 @@ extern gid_t real_gid, effective_gid, da
 #error "Cannot implement user ID swapping without setreuid or setresuid"
 #endif
 #endif
+
+#ifdef WITH_PAM
+/* PAM failed after session was open.  */
+#define PAM_SESSION_FAIL if (retcode != PAM_SUCCESS) \
+       pam_close_session(pamh,PAM_SILENT);
+
+/* syslog will be logging error messages */
+#ifdef HAVE_UNISTD_H
+#include <syslog.h>
+#endif
+
+/* PAM fail even before opening the session */
+#define PAM_FAIL_CHECK \
+       do { if (retcode != PAM_SUCCESS) { \
+               fprintf(stderr,"PAM failure: %s\n",pam_strerror(pamh, retcode)); \
+               syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \
+               if (pamh) \
+                   pam_end(pamh, retcode); \
+               if (setregid(getgid(),getegid()) != 0) { \
+                   fprintf(stderr, "cannot set egid: %s", strerror(errno)); \
+                   exit(1); \
+               } \
+               if (setreuid(getuid(),geteuid()) != 0) { \
+                   fprintf(stderr, "cannot set euid: %s", strerror(errno)); \
+                   exit(1); \
+               } \
+               exit(1); \
+           } \
+       } while (0) \
+
+/* PAM - check after every operation whether they passed */
+#define PAM_HANDLING \
+       do { pamh = NULL; \
+       retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); \
+       PAM_FAIL_CHECK; \
+       retcode = pam_set_item(pamh, PAM_TTY, "atd"); \
+       PAM_FAIL_CHECK; \
+       retcode = pam_acct_mgmt(pamh, PAM_SILENT); \
+       PAM_FAIL_CHECK; \
+       retcode = pam_open_session(pamh, PAM_SILENT); \
+       PAM_FAIL_CHECK; \
+       retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); \
+       PAM_SESSION_FAIL; \
+       PAM_FAIL_CHECK; \
+       } while (0)
+
+/* OLD FAIL_CHECK ONLY FOR perm.c
+ * define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \
+ *         fprintf(stderr,"\nPAM failure %s\n",pam_strerror(pamh, retcode)); \
+ *         syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \
+ *         if (pamh) \
+ *               pam_end(pamh, retcode); \
+ *         exit(1); \
+ * }
+ */
+
+#endif
+

at-3.1.12-selinux.patch:
 Makefile.in  |    1 
 atd.c        |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 config.h.in  |    3 ++
 configure.ac |    8 +++++
 4 files changed, 92 insertions(+)

--- NEW FILE at-3.1.12-selinux.patch ---
diff -up at-3.1.12/config.h.in.selinux at-3.1.12/config.h.in
--- at-3.1.12/config.h.in.selinux	2009-12-02 16:32:19.469228959 +0100
+++ at-3.1.12/config.h.in	2009-12-02 16:32:57.706966488 +0100
@@ -71,6 +71,9 @@
 /* Define if you are building with_pam */
 #undef WITH_PAM
 
+/* Define if you are building with_selinux  */
+#undef WITH_SELINUX
+
 /* Define to 1 if you have the `pstat_getdynamic' function. */
 #undef HAVE_PSTAT_GETDYNAMIC
 
diff -up at-3.1.12/configure.ac.selinux at-3.1.12/configure.ac
--- at-3.1.12/configure.ac.selinux	2009-12-02 16:31:15.323246019 +0100
+++ at-3.1.12/configure.ac	2009-12-02 16:32:01.425966844 +0100
@@ -266,5 +266,13 @@ AC_ARG_WITH(daemon_groupname,
 )
 AC_SUBST(DAEMON_GROUPNAME)
 
+AC_ARG_WITH(selinux,
+[ --with-selinux       Define to run with selinux],
+AC_DEFINE(WITH_SELINUX),
+)
+AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux)
+AC_SUBST(SELINUXLIB)
+AC_SUBST(WITH_SELINUX)
+
 AC_CONFIG_FILES(Makefile atrun atd.8 atrun.8 at.1 batch)
 AC_OUTPUT
diff -up at-3.1.12/Makefile.in.selinux at-3.1.12/Makefile.in
--- at-3.1.12/Makefile.in.selinux	2009-12-02 16:30:11.923216529 +0100
+++ at-3.1.12/Makefile.in	2009-12-02 16:30:57.949215706 +0100
@@ -39,6 +39,7 @@ LIBS		= @LIBS@
 LIBOBJS		= @LIBOBJS@
 INSTALL		= @INSTALL@
 PAMLIB          = @PAMLIB@
+SELINUXLIB      = @SELINUXLIB@
 
 CLONES		= atq atrm 
 ATOBJECTS	= at.o panic.o perm.o posixtm.o y.tab.o lex.yy.o
diff -up at-3.1.12/atd.c.selinux at-3.1.12/atd.c
--- at-3.1.12/atd.c.selinux	2009-12-03 13:03:57.182284669 +0100
+++ at-3.1.12/atd.c	2009-12-03 13:07:20.542272874 +0100
@@ -83,6 +83,14 @@
 #include "getloadavg.h"
 #endif
 
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#include <selinux/get_context_list.h>
+int selinux_enabled=0;
+#include <selinux/flask.h>
+#include <selinux/av_permissions.h>
+#endif
+
 #ifndef LOG_ATD
 #define LOG_ATD        LOG_DAEMON
 #endif
@@ -202,6 +210,68 @@ myfork()
 #define ATD_MAIL_NAME    "mailx"
 #endif
 
+#ifdef WITH_SELINUX
+static int set_selinux_context(const char *name, const char *filename) {
+       security_context_t user_context=NULL;
+       security_context_t  file_context=NULL;
+       struct av_decision avd;
+       int retval=-1;
+       char *seuser=NULL;
+       char *level=NULL;
+
+       if (getseuserbyname(name, &seuser, &level) == 0) {
+               retval=get_default_context_with_level(seuser, level, NULL, &user_context);
+               free(seuser);
+               free(level);
+               if (retval) {
+                       if (security_getenforce()==1) {
+                               perr("execle: couldn't get security context for user %s\n", name);
+                       } else {
+                               syslog(LOG_ERR, "execle: couldn't get security context for user %s\n", name);
+                               return -1;
+                       }
+               }
+       }
+
+       /*
+       * Since crontab files are not directly executed,
+       * crond must ensure that the crontab file has
+       * a context that is appropriate for the context of
+       * the user cron job.  It performs an entrypoint
+       * permission check for this purpose.
+       */
+       if (fgetfilecon(STDIN_FILENO, &file_context) < 0)
+               perr("fgetfilecon FAILED %s", filename);
+
+       retval = security_compute_av(user_context,
+                                    file_context,
+                                    SECCLASS_FILE,
+                                    FILE__ENTRYPOINT,
+                                    &avd);
+       freecon(file_context);
+       if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
+               if (security_getenforce()==1) {
+                       perr("Not allowed to set exec context to %s for user  %s\n", user_context,name);
+               } else {
+                       syslog(LOG_ERR, "Not allowed to set exec context to %s for user  %s\n", user_context,name);
+                       retval = -1;
+                       goto err;
+               }
+       }
+       if (setexeccon(user_context) < 0) {
+               if (security_getenforce()==1) {
+                       perr("Could not set exec context to %s for user  %s\n", user_context,name);
+                       retval = -1;
+               } else {
+                       syslog(LOG_ERR, "Could not set exec context to %s for user  %s\n", user_context,name);
+               }
+       }
+  err:
+       freecon(user_context);
+       return 0;
+}
+#endif
+
 static void
 run_file(const char *filename, uid_t uid, gid_t gid)
 {
@@ -452,6 +522,12 @@ run_file(const char *filename, uid_t uid
                 perr("Cannot reset signal handler to default");
 
 	    chdir("/");
+#ifdef WITH_SELINUX
+            if (selinux_enabled > 0) {
+                if (set_selinux_context(pentry->pw_name, filename) < 0)
+                       perr("SELinux Failed to set context\n");
+            }
+#endif
 
 	    if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0)
 		perr("Exec failed for /bin/sh");
@@ -774,6 +850,10 @@ main(int argc, char *argv[])
     struct passwd *pwe;
     struct group *ge;
 
+#ifdef WITH_SELINUX
+    selinux_enabled=is_selinux_enabled();
+#endif
+
 /* We don't need root privileges all the time; running under uid and gid
  * daemon is fine.
  */

at-3.1.12-shell.patch:
 at.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE at-3.1.12-shell.patch ---
diff -up at-3.1.12/at.c.shell at-3.1.12/at.c
--- at-3.1.12/at.c.shell	2009-12-02 13:25:12.706989310 +0100
+++ at-3.1.12/at.c	2009-12-02 13:26:01.991966200 +0100
@@ -62,11 +62,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef TM_IN_SYS_TIME
 #include <sys/time.h>
-#else
 #include <time.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -244,6 +241,12 @@ writefile(time_t runtimer, char queue)
     int kill_errno;
     int rc;
     int mailsize = 128;
+    struct timeval tv;
+    struct timezone tz;
+    long int i;
+
+    gettimeofday(&tv, &tz);
+    srandom(getpid()+tv.tv_usec);
 
 /* Install the signal handler for SIGINT; terminate after removing the
  * spool file if necessary
@@ -461,6 +464,9 @@ writefile(time_t runtimer, char queue)
     fprintf(fp, " || {\n\t echo 'Execution directory "
 	    "inaccessible' >&2\n\t exit 1\n}\n");
 
+    i = random();
+    fprintf(fp, "${SHELL:-/bin/sh} << marcinDELIMITER%08lx\n", i);
+
     istty = isatty(fileno(stdin));
     if (istty) {
 	fprintf(stderr, "at> ");
@@ -477,6 +483,7 @@ writefile(time_t runtimer, char queue)
 	fprintf(stderr, "<EOT>\n");
     }
     fprintf(fp, "\n");
+    fprintf(fp, "marcinDELIMITER%08lx\n", i);
     if (ferror(fp))
 	panic("Output error");
 
@@ -926,7 +933,7 @@ main(int argc, char **argv)
 	   It also alows a warning diagnostic to be printed.  Because of the
 	   possible variance, we always output the diagnostic. */
 
-	fprintf(stderr, "warning: commands will be executed using /bin/sh\n");
+	//fprintf(stderr, "warning: commands will be executed using /bin/sh\n");
 
 	writefile(timer, queue);
 	break;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Oct 2009 11:48:03 -0000	1.9
+++ .cvsignore	3 Dec 2009 12:34:20 -0000	1.10
@@ -4,3 +4,5 @@ atd.init
 atd.sysconf
 test.pl
 at_3.1.11.orig.tar.gz
+at_3.1.12.orig.tar.gz
+pam_atd


Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- at.spec	14 Oct 2009 11:48:03 -0000	1.80
+++ at.spec	3 Dec 2009 12:34:20 -0000	1.81
@@ -1,4 +1,4 @@
-%define major_ver 3.1.11
+%define major_ver 3.1.12
 
 %if %{?WITH_PAM:0}%{!?WITH_PAM:1}
 %define WITH_PAM 1
@@ -11,20 +11,18 @@ License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
 Source: http://ftp.debian.org/debian/pool/main/a/at/at_%{major_ver}.orig.tar.gz
-Source1: test.pl
+# git upstream source git://git.debian.org/git/collab-maint/at.git
+Source1: pam_atd
 Source2: atd.init
 Source3: atd.sysconf
 Source4: 56atd
 
-Patch1: at-3.1.11-makefile.patch
-Patch2: at-3.1.11-nitpicks.patch
-Patch3: at-3.1.11-shell.patch
-Patch4: at-3.1.11-opt_V.patch
-Patch5: at-3.1.11-dont_fork.patch
-Patch6: at-3.1.11-log.patch
-Patch7: at-3.1.11-pam.patch
-Patch8: at-3.1.11-pam2.patch
-Patch9: at-3.1.11-selinux.patch
+Patch1: at-3.1.12-makefile.patch
+Patch2: at-3.1.12-opt_V.patch
+Patch3: at-3.1.12-shell.patch
+Patch4: at-3.1.12-nitpicks.patch
+Patch5: at-3.1.12-pam.patch
+Patch6: at-3.1.12-selinux.patch
 
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
@@ -51,17 +49,13 @@ use crontab instead.
 
 %prep
 %setup -q
-
 cp %{SOURCE1} .
 %patch1 -p1 -b .make
-%patch2 -p1 -b .typo
+%patch2 -p1 -b .opt_V
 %patch3 -p1 -b .shell
-%patch4 -p1 -b .opt_V
-%patch5 -p1 -b .dont_fork
-%patch6 -p1 -b .log
-%patch7 -p1 -b .pam
-%patch8 -p1 -b .pam2
-%patch9 -p1 -b .selinux
+%patch4 -p1 -b .nit
+%patch5 -p1 -b .pam
+%patch6 -p1 -b .selinux
 
 %build
 # patch9 touches configure.in
@@ -79,15 +73,6 @@ rm -f lex.yy.* y.tab.*
 
 make
 
-%check
-# don't run "make test" by default
-%{?_without_check: %define _without_check 1}
-%{!?_without_check: %define _without_check 1}
-
-%if ! %{_without_check}
-	LANG=C make test > /dev/null
-%endif
-
 %install
 make install \
 	DAEMON_USERNAME=`id -nu`\
@@ -109,13 +94,15 @@ echo > %{buildroot}%{_sysconfdir}/at.den
 mkdir docs
 cp  %{buildroot}/%{_prefix}/doc/at/* docs/
 
+mkdir -p %{buildroot}%{_sysconfdir}/pam.d
+install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/atd
+
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/atd
 
 mv -f %{buildroot}/%{_mandir}/man5/at_allow.5 \
 	%{buildroot}/%{_mandir}/man5/at.allow.5
 rm -f %{buildroot}/%{_mandir}/man5/at_deny.5
-#ln -s at.allow.5 %{buildroot}/%{_mandir}/man5/at.deny.5
 
 mkdir -p %{buildroot}/etc/sysconfig
 install -m 755 %{SOURCE3} %{buildroot}/etc/sysconfig/atd
@@ -126,6 +113,9 @@ install -m 755 %{SOURCE4} %{buildroot}/%
 # remove unpackaged files from the buildroot
 rm -r  %{buildroot}%{_prefix}/doc
 
+%check
+make test
+
 %clean
 rm -rf %{buildroot}
 
@@ -156,7 +146,7 @@ fi
 %attr(0700,daemon,daemon)	%dir %{_localstatedir}/spool/at
 %attr(0600,daemon,daemon)	%verify(not md5 size mtime) %ghost %{_localstatedir}/spool/at/.SEQ
 %attr(0700,daemon,daemon)	%dir %{_localstatedir}/spool/at/spool
-%attr(0640,root,daemon)		%config(noreplace) /etc/pam.d/atd
+%attr(0640,root,daemon)		%config(noreplace) %{_sysconfdir}/pam.d/atd
 %{_sbindir}/atrun
 %attr(0755,root,root)		%{_sbindir}/atd
 %{_mandir}/man*/*
@@ -167,6 +157,13 @@ fi
 %attr(0755,root,root)		%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
+* Thu Dec  3 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.1.12-1
+- update to the new version of at
+- adapt patches for new version
+- change our pam config to source
+- start using new upstream test instead of our nonfunctinal
+- upstream changed nofork option -n to foreground option -f
+
 * Tue Oct 13 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.1.11-1
 - 528582 add noreplace option into files section
 - rewrite pam2 patch - check return value, use "better" macro, etc.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Oct 2009 11:48:03 -0000	1.9
+++ sources	3 Dec 2009 12:34:21 -0000	1.10
@@ -1,6 +1,5 @@
-6e5857e23b3c32ea6995fb7f8989987e  at_3.1.10.tar.gz
 053188856f8d971c6239ed973cb85794  56atd
 b117781fd68e393443b2a8e478c7c22f  atd.init
 ac1471fe22f63f666dc7d31173f47ea0  atd.sysconf
-67aece5997fbe1f93072e0afd69e5280  test.pl
-d5832d9b770f41db78020b92f80966d3  at_3.1.11.orig.tar.gz
+1e67991776148fb319fd77a2e599a765  at_3.1.12.orig.tar.gz
+000d2f30379d2bf8af09f51416e863ec  pam_atd


--- at-3.1.10-shell.patch DELETED ---


--- at-3.1.11-dont_fork.patch DELETED ---


--- at-3.1.11-log.patch DELETED ---


--- at-3.1.11-makefile.patch DELETED ---


--- at-3.1.11-nitpicks.patch DELETED ---


--- at-3.1.11-opt_V.patch DELETED ---


--- at-3.1.11-pam2.patch DELETED ---


--- at-3.1.11-selinux.patch DELETED ---


--- at-3.1.11-shell.patch DELETED ---



From dnovotny at fedoraproject.org  Thu Dec  3 12:35:27 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu,  3 Dec 2009 12:35:27 +0000 (UTC)
Subject: rpms/emacs/F-12 emacs-23.1-indian.patch, NONE, 1.1 emacs.spec, 1.143,
	1.144
Message-ID: <20091203123527.8C41411C00EE@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29892

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-indian.patch 
Log Message:
- fix #542657 -  emacs does not display indic text


emacs-23.1-indian.patch:
 indian.el |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE emacs-23.1-indian.patch ---
diff -up emacs-23.1/lisp/language/indian.el.indian emacs-23.1/lisp/language/indian.el
--- emacs-23.1/lisp/language/indian.el.indian	2009-12-03 13:03:04.000000000 +0100
+++ emacs-23.1/lisp/language/indian.el	2009-12-03 13:05:53.000000000 +0100
@@ -165,15 +165,15 @@ South Indian language Malayalam is suppo
   "Regexp matching a composable sequence of Malayalam characters.")
 
 (let ((script-regexp-alist
-       `((devanagari . ,devanagari-composable-pattern)
+       `((devanagari . "[\x900-\x97F\x200C\x200D]+")
 	 (bengali . "[\x980-\x9FF\x200C\x200D]+")
 	 (gurmukhi . "[\xA00-\xA7F\x200C\x200D]+")
 	 (gujarati . "[\xA80-\xAFF\x200C\x200D]+")
 	 (oriya . "[\xB00-\xB7F\x200C\x200D]+")
-	 (tamil . ,tamil-composable-pattern)
+	 (tamil . "[\xB80-\xBFF\x200C\x200D]+")
 	 (telugu . "[\xC00-\xC7F\x200C\x200D]+")
-	 (kannada . ,kannada-composable-pattern)
-	 (malayalam . ,malayalam-composable-pattern))))
+	 (kannada . "[\xC80-\xCFF\x200C\x200D]+")
+	 (malayalam . "[\xD00-\xD7F\x200C\x200D]+"))))
   (map-char-table
    #'(lambda (key val)
        (let ((slot (assq val script-regexp-alist)))


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-12/emacs.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- emacs.spec	2 Dec 2009 16:51:52 -0000	1.143
+++ emacs.spec	3 Dec 2009 12:35:27 -0000	1.144
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -30,6 +30,7 @@ Patch4: emacs-gtk.patch
 Patch5: emacs-23.1-xdg.patch
 Patch6: emacs-23.1-cpp.patch
 Patch7: emacs-23.1-scroll.patch
+Patch8: emacs-23.1-indian.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -53,6 +54,7 @@ BuildRequires: desktop-file-utils
 Requires:      desktop-file-utils
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
+Requires: m17n-db-datafiles
 
 # C and build patches
 
@@ -123,6 +125,7 @@ Emacs packages or see some elisp example
 %patch5 -p1 -b .xdg
 %patch6 -p1
 %patch7 -p1 -b .scroll
+%patch8 -p1
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -385,6 +388,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Dec 03 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-14
+- fix #542657 -  emacs does not display indic text
+
 * Wed Dec 02 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-13
 - fix #543046 -  Using scroll bar in emacs highlights/selects text
 



From sherry151 at fedoraproject.org  Thu Dec  3 12:37:16 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Thu,  3 Dec 2009 12:37:16 +0000 (UTC)
Subject: File gnusim8085-svn.141.tar.gz uploaded to lookaside cache by
	sherry151
Message-ID: <20091203123716.9E53910F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnusim8085:

8eca68b31f3abb0d9bdfcd3b78e5a748  gnusim8085-svn.141.tar.gz



From sherry151 at fedoraproject.org  Thu Dec  3 12:39:16 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Thu,  3 Dec 2009 12:39:16 +0000 (UTC)
Subject: rpms/gnusim8085/devel .cvsignore, 1.2, 1.3 gnusim8085.spec, 1.2,
	1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091203123916.D70A411C00EE@cvs1.fedora.phx.redhat.com>

Author: sherry151

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

Modified Files:
	.cvsignore gnusim8085.spec import.log sources 
Log Message:
Fixed bug 542945



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jun 2009 04:57:10 -0000	1.2
+++ .cvsignore	3 Dec 2009 12:39:16 -0000	1.3
@@ -1 +1 @@
-gnusim8085-1.3.5.tar.gz
+gnusim8085-svn.141.tar.gz


Index: gnusim8085.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/gnusim8085.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnusim8085.spec	25 Jul 2009 00:59:51 -0000	1.2
+++ gnusim8085.spec	3 Dec 2009 12:39:16 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		gnusim8085
-Version:	1.3.5
+Version:	svn.141
 Release:	5%{?dist}
 Summary:	A 8085 Simulator
 
@@ -29,7 +29,7 @@ can be used for debugging the programs.
 
 %build
 %configure 
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGSldroot}" 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +42,8 @@ desktop-file-install --vendor "" \
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p doc/gnusim8085.1 %{buildroot}%{_mandir}/man1/%{name}.1
 rm -rf %{buildroot}%{_docdir}
+mkdir -p %{buildroot}%{_datadir}/doc/gnusim8085
+cp -p AUTHORS %{buildroot}%{_datadir}/doc/gnusim8085/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,10 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/GNUSim8085.desktop
 %{_datadir}/gnusim8085/
 %{_datadir}/pixmaps/gnusim8085/
+%{_datadir}/doc/gnusim8085/
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-5
+- Fixed Bug-542945
+
+* Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-4
+- Updated to svn.141 version
 
 * Sun Jun 7 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 1.3.5-4
 - Ownership of pixmap/gnusim8085 directory included and some typos fixed.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Jun 2009 04:57:10 -0000	1.1
+++ import.log	3 Dec 2009 12:39:16 -0000	1.2
@@ -1 +1,2 @@
 gnusim8085-1_3_5-4_fc10:HEAD:gnusim8085-1.3.5-4.fc10.src.rpm:1244523313
+gnusim8085-svn_141-5_fc12:HEAD:gnusim8085-svn.141-5.fc12.src.rpm:1259843844


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jun 2009 04:57:10 -0000	1.2
+++ sources	3 Dec 2009 12:39:16 -0000	1.3
@@ -1 +1 @@
-7a474d5aafb72e912c02d15e5329a714  gnusim8085-1.3.5.tar.gz
+8eca68b31f3abb0d9bdfcd3b78e5a748  gnusim8085-svn.141.tar.gz



From sherry151 at fedoraproject.org  Thu Dec  3 12:42:18 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Thu,  3 Dec 2009 12:42:18 +0000 (UTC)
Subject: rpms/gnusim8085/F-12 .cvsignore, 1.2, 1.3 gnusim8085.spec, 1.2,
	1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091203124218.3F6B011C00EE@cvs1.fedora.phx.redhat.com>

Author: sherry151

Update of /cvs/pkgs/rpms/gnusim8085/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32076/F-12

Modified Files:
	.cvsignore gnusim8085.spec import.log sources 
Log Message:
Fixed bug 542945



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jun 2009 04:57:10 -0000	1.2
+++ .cvsignore	3 Dec 2009 12:42:17 -0000	1.3
@@ -1 +1 @@
-gnusim8085-1.3.5.tar.gz
+gnusim8085-svn.141.tar.gz


Index: gnusim8085.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-12/gnusim8085.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnusim8085.spec	25 Jul 2009 00:59:51 -0000	1.2
+++ gnusim8085.spec	3 Dec 2009 12:42:17 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		gnusim8085
-Version:	1.3.5
+Version:	svn.141
 Release:	5%{?dist}
 Summary:	A 8085 Simulator
 
@@ -29,7 +29,7 @@ can be used for debugging the programs.
 
 %build
 %configure 
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGSldroot}" 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +42,8 @@ desktop-file-install --vendor "" \
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p doc/gnusim8085.1 %{buildroot}%{_mandir}/man1/%{name}.1
 rm -rf %{buildroot}%{_docdir}
+mkdir -p %{buildroot}%{_datadir}/doc/gnusim8085
+cp -p AUTHORS %{buildroot}%{_datadir}/doc/gnusim8085/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,10 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/GNUSim8085.desktop
 %{_datadir}/gnusim8085/
 %{_datadir}/pixmaps/gnusim8085/
+%{_datadir}/doc/gnusim8085/
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-5
+- Fixed Bug-542945
+
+* Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-4
+- Updated to svn.141 version
 
 * Sun Jun 7 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 1.3.5-4
 - Ownership of pixmap/gnusim8085 directory included and some typos fixed.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Jun 2009 04:57:10 -0000	1.1
+++ import.log	3 Dec 2009 12:42:18 -0000	1.2
@@ -1 +1,2 @@
 gnusim8085-1_3_5-4_fc10:HEAD:gnusim8085-1.3.5-4.fc10.src.rpm:1244523313
+gnusim8085-svn_141-5_fc12:F-12:gnusim8085-svn.141-5.fc12.src.rpm:1259844016


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jun 2009 04:57:10 -0000	1.2
+++ sources	3 Dec 2009 12:42:18 -0000	1.3
@@ -1 +1 @@
-7a474d5aafb72e912c02d15e5329a714  gnusim8085-1.3.5.tar.gz
+8eca68b31f3abb0d9bdfcd3b78e5a748  gnusim8085-svn.141.tar.gz



From caolanm at fedoraproject.org  Thu Dec  3 12:44:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 12:44:04 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2092,1.2093
Message-ID: <20091203124404.9609711C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv391

Modified Files:
	openoffice.org.spec 
Log Message:
kid translations are broken for the .desktop files at the moment


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2092
retrieving revision 1.2093
diff -u -p -r1.2092 -r1.2093
--- openoffice.org.spec	1 Dec 2009 13:24:57 -0000	1.2092
+++ openoffice.org.spec	3 Dec 2009 12:44:04 -0000	1.2093
@@ -1663,6 +1663,11 @@ cat %{PATCH10} >> svtools/source/dialogs
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
 #don't build localized helps which are poorly translated
 POORHELPS=`find l10n/source -name localize.sdf -exec grep 'helpcontent2.*main.*Working With %PRODUCTNAME' {} \; | cut -f 10 | xargs`
+
+#kid translations are broken for the .desktop files at the moment
+#See ooo#107407
+rm -rf l10n/source/kid
+
 autoconf
 %configure \
  --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
@@ -1703,15 +1708,6 @@ for i in $RPM_OPT_FLAGS; do
 done
 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=$[${SMP_MFLAGS/-j/}]



From sherry151 at fedoraproject.org  Thu Dec  3 12:45:44 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Thu,  3 Dec 2009 12:45:44 +0000 (UTC)
Subject: rpms/gnusim8085/F-11 .cvsignore, 1.2, 1.3 gnusim8085.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091203124544.0D77A11C00EE@cvs1.fedora.phx.redhat.com>

Author: sherry151

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

Modified Files:
	.cvsignore gnusim8085.spec import.log sources 
Log Message:
Fixed Bug 542945



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jun 2009 05:03:29 -0000	1.2
+++ .cvsignore	3 Dec 2009 12:45:43 -0000	1.3
@@ -1 +1 @@
-gnusim8085-1.3.5.tar.gz
+gnusim8085-svn.141.tar.gz


Index: gnusim8085.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-11/gnusim8085.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnusim8085.spec	9 Jun 2009 05:03:29 -0000	1.1
+++ gnusim8085.spec	3 Dec 2009 12:45:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		gnusim8085
-Version:	1.3.5
-Release:	4%{?dist}
+Version:	svn.141
+Release:	5%{?dist}
 Summary:	A 8085 Simulator
 
 Group:		Applications/Engineering
@@ -29,7 +29,7 @@ can be used for debugging the programs.
 
 %build
 %configure 
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGSldroot}" 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +42,8 @@ desktop-file-install --vendor "" \
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p doc/gnusim8085.1 %{buildroot}%{_mandir}/man1/%{name}.1
 rm -rf %{buildroot}%{_docdir}
+mkdir -p %{buildroot}%{_datadir}/doc/gnusim8085
+cp -p AUTHORS %{buildroot}%{_datadir}/doc/gnusim8085/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,8 +57,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/GNUSim8085.desktop
 %{_datadir}/gnusim8085/
 %{_datadir}/pixmaps/gnusim8085/
+%{_datadir}/doc/gnusim8085/
 
 %changelog
+* Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-5
+- Fixed Bug-542945
+
+* Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-4
+- Updated to svn.141 version
+
 * Sun Jun 7 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - 1.3.5-4
 - Ownership of pixmap/gnusim8085 directory included and some typos fixed.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Jun 2009 05:03:29 -0000	1.1
+++ import.log	3 Dec 2009 12:45:43 -0000	1.2
@@ -1 +1,2 @@
 gnusim8085-1_3_5-4_fc10:F-11:gnusim8085-1.3.5-4.fc10.src.rpm:1244523670
+gnusim8085-svn_141-5_fc12:F-11:gnusim8085-svn.141-5.fc12.src.rpm:1259844297


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jun 2009 05:03:29 -0000	1.2
+++ sources	3 Dec 2009 12:45:43 -0000	1.3
@@ -1 +1 @@
-7a474d5aafb72e912c02d15e5329a714  gnusim8085-1.3.5.tar.gz
+8eca68b31f3abb0d9bdfcd3b78e5a748  gnusim8085-svn.141.tar.gz



From caolanm at fedoraproject.org  Thu Dec  3 12:46:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 12:46:15 +0000 (UTC)
Subject: rpms/planner/F-12 planner.spec,1.69,1.70
Message-ID: <20091203124615.EDCDB11C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1288

Modified Files:
	planner.spec 
Log Message:
Resolves: rhbz#543741 use PlannerCalander in edit->task


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- planner.spec	3 Dec 2009 12:32:54 -0000	1.69
+++ planner.spec	3 Dec 2009 12:46:15 -0000	1.70
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner



From mmaslano at fedoraproject.org  Thu Dec  3 12:58:30 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu,  3 Dec 2009 12:58:30 +0000 (UTC)
Subject: rpms/at/devel at.spec,1.81,1.82
Message-ID: <20091203125830.5AA1A11C00EE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

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

Modified Files:
	at.spec 
Log Message:
Add BR for test.



Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- at.spec	3 Dec 2009 12:34:20 -0000	1.81
+++ at.spec	3 Dec 2009 12:58:29 -0000	1.82
@@ -27,6 +27,7 @@ Patch6: at-3.1.12-selinux.patch
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
 BuildRequires: libselinux-devel >= 1.27.9
+BuildRequires: perl-Test-Harness
 
 %if %{WITH_PAM}
 BuildRequires: pam-devel



From mmaslano at fedoraproject.org  Thu Dec  3 13:05:52 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu,  3 Dec 2009 13:05:52 +0000 (UTC)
Subject: rpms/at/devel at.spec,1.82,1.83
Message-ID: <20091203130552.66D0311C00EE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

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

Modified Files:
	at.spec 
Log Message:
And next BR.



Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- at.spec	3 Dec 2009 12:58:29 -0000	1.82
+++ at.spec	3 Dec 2009 13:05:52 -0000	1.83
@@ -27,7 +27,8 @@ Patch6: at-3.1.12-selinux.patch
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
 BuildRequires: libselinux-devel >= 1.27.9
-BuildRequires: perl-Test-Harness
+BuildRequires: perl(Test::Harness)
+BuildRequires: perl(Test::More)
 
 %if %{WITH_PAM}
 BuildRequires: pam-devel



From karsten at fedoraproject.org  Thu Dec  3 13:06:49 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:06:49 +0000 (UTC)
Subject: rpms/vim/devel 7.2.312, NONE, 1.1 7.2.315, NONE, 1.1 README.patches,
	1.125, 1.126
Message-ID: <20091203130649.D282D11C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	README.patches 
Added Files:
	7.2.312 7.2.315 
Log Message:
- patchlevel 315


--- NEW FILE 7.2.312 ---
To: vim-dev at vim.org
Subject: Patch 7.2.312
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.312
Problem:    iconv() returns an invalid character sequence when conversion
	    fails.  It should return an empty string. (Yongwei Wu)
Solution:   Be more strict about invalid characters in the input.
Files:	    src/mbyte.c


*** ../vim-7.2.311/src/mbyte.c	2009-06-16 15:23:07.000000000 +0200
--- src/mbyte.c	2009-11-25 16:10:44.000000000 +0100
***************
*** 133,154 ****
  static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
! /* Lookup table to quickly get the length in bytes of a UTF-8 character from
!  * the first byte of a UTF-8 string.  Bytes which are illegal when used as the
!  * first byte have a one, because these will be used separately. */
  static char utf8len_tab[256] =
  {
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
  };
  
  /*
   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
   * in the "xim.log" file.
   */
--- 133,172 ----
  static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
! /*
!  * Lookup table to quickly get the length in bytes of a UTF-8 character from
!  * the first byte of a UTF-8 string.
!  * Bytes which are illegal when used as the first byte have a 1.
!  * The NUL byte has length 1.
!  */
  static char utf8len_tab[256] =
  {
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
  };
  
  /*
+  * Like utf8len_tab above, but using a zero for illegal lead bytes.
+  */
+ static char utf8len_tab_zero[256] =
+ {
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     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,0,
+     2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+     3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0,
+ };
+ 
+ /*
   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
   * in the "xim.log" file.
   */
***************
*** 1352,1358 ****
      if (size > 0 && *p >= 0x80)
      {
  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
! 	    return 1;
  	c = utf_ptr2char(p);
  	/* An illegal byte is displayed as <xx>. */
  	if (utf_ptr2len(p) == 1 || c == NUL)
--- 1370,1376 ----
      if (size > 0 && *p >= 0x80)
      {
  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
! 	    return 1;  /* truncated */
  	c = utf_ptr2char(p);
  	/* An illegal byte is displayed as <xx>. */
  	if (utf_ptr2len(p) == 1 || c == NUL)
***************
*** 1473,1479 ****
      if (p[0] < 0x80)	/* be quick for ASCII */
  	return p[0];
  
!     len = utf8len_tab[p[0]];
      if (len > 1 && (p[1] & 0xc0) == 0x80)
      {
  	if (len == 2)
--- 1491,1497 ----
      if (p[0] < 0x80)	/* be quick for ASCII */
  	return p[0];
  
!     len = utf8len_tab_zero[p[0]];
      if (len > 1 && (p[1] & 0xc0) == 0x80)
      {
  	if (len == 2)
***************
*** 1723,1728 ****
--- 1741,1747 ----
  /*
   * Return length of UTF-8 character, obtained from the first byte.
   * "b" must be between 0 and 255!
+  * Returns 1 for an invalid first byte value.
   */
      int
  utf_byte2len(b)
***************
*** 1737,1742 ****
--- 1756,1762 ----
   * Returns 1 for "".
   * Returns 1 for an illegal byte sequence (also in incomplete byte seq.).
   * Returns number > "size" for an incomplete byte sequence.
+  * Never returns zero.
   */
      int
  utf_ptr2len_len(p, size)
***************
*** 1747,1757 ****
      int		i;
      int		m;
  
!     if (*p == NUL)
! 	return 1;
!     m = len = utf8len_tab[*p];
      if (len > size)
  	m = size;	/* incomplete byte sequence. */
      for (i = 1; i < m; ++i)
  	if ((p[i] & 0xc0) != 0x80)
  	    return 1;
--- 1767,1779 ----
      int		i;
      int		m;
  
!     len = utf8len_tab[*p];
!     if (len == 1)
! 	return 1;	/* NUL, ascii or illegal lead byte */
      if (len > size)
  	m = size;	/* incomplete byte sequence. */
+     else
+ 	m = len;
      for (i = 1; i < m; ++i)
  	if ((p[i] & 0xc0) != 0x80)
  	    return 1;
***************
*** 2505,2510 ****
--- 2527,2533 ----
  /*
   * mb_head_off() function pointer.
   * Return offset from "p" to the first byte of the character it points into.
+  * If "p" points to the NUL at the end of the string return 0.
   * Returns 0 when already at the first byte of a character.
   */
      int
***************
*** 2524,2530 ****
  
      /* It can't be a trailing byte when not using DBCS, at the start of the
       * string or the previous byte can't start a double-byte. */
!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
--- 2547,2553 ----
  
      /* It can't be a trailing byte when not using DBCS, at the start of the
       * string or the previous byte can't start a double-byte. */
!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
***************
*** 2552,2558 ****
       * lead byte in the current cell. */
      if (p <= base
  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
! 	    || MB_BYTE2LEN(p[-1]) == 1)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
--- 2575,2582 ----
       * lead byte in the current cell. */
      if (p <= base
  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
! 	    || MB_BYTE2LEN(p[-1]) == 1
! 	    || *p == NUL)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
***************
*** 2578,2583 ****
--- 2602,2608 ----
      char_u	*q;
      char_u	*s;
      int		c;
+     int		len;
  #ifdef FEAT_ARABIC
      char_u	*j;
  #endif
***************
*** 2597,2604 ****
  	    --q;
  	/* Check for illegal sequence. Do allow an illegal byte after where we
  	 * started. */
! 	if (utf8len_tab[*q] != (int)(s - q + 1)
! 				       && utf8len_tab[*q] != (int)(p - q + 1))
  	    return 0;
  
  	if (q <= base)
--- 2622,2629 ----
  	    --q;
  	/* Check for illegal sequence. Do allow an illegal byte after where we
  	 * started. */
! 	len = utf8len_tab[*q];
! 	if (len != (int)(s - q + 1) && len != (int)(p - q + 1))
  	    return 0;
  
  	if (q <= base)
***************
*** 2810,2818 ****
  
      while (end == NULL ? *p != NUL : p < end)
      {
! 	if ((*p & 0xc0) == 0x80)
  	    return FALSE;	/* invalid lead byte */
- 	l = utf8len_tab[*p];
  	if (end != NULL && p + l > end)
  	    return FALSE;	/* incomplete byte sequence */
  	++p;
--- 2835,2843 ----
  
      while (end == NULL ? *p != NUL : p < end)
      {
! 	l = utf8len_tab_zero[*p];
! 	if (l == 0)
  	    return FALSE;	/* invalid lead byte */
  	if (end != NULL && p + l > end)
  	    return FALSE;	/* incomplete byte sequence */
  	++p;
***************
*** 6117,6128 ****
  	    d = retval;
  	    for (i = 0; i < len; ++i)
  	    {
! 		l = utf_ptr2len(ptr + i);
  		if (l == 0)
  		    *d++ = NUL;
  		else if (l == 1)
  		{
! 		    if (unconvlenp != NULL && utf8len_tab[ptr[i]] > len - i)
  		    {
  			/* Incomplete sequence at the end. */
  			*unconvlenp = len - i;
--- 6142,6161 ----
  	    d = retval;
  	    for (i = 0; i < len; ++i)
  	    {
! 		l = utf_ptr2len_len(ptr + i, len - i);
  		if (l == 0)
  		    *d++ = NUL;
  		else if (l == 1)
  		{
! 		    int l_w = utf8len_tab_zero[ptr[i]];
! 
! 		    if (l_w == 0)
! 		    {
! 			/* Illegal utf-8 byte cannot be converted */
! 			vim_free(retval);
! 			return NULL;
! 		    }
! 		    if (unconvlenp != NULL && l_w > len - i)
  		    {
  			/* Incomplete sequence at the end. */
  			*unconvlenp = len - i;
*** ../vim-7.2.311/src/version.c	2009-12-02 13:32:10.000000000 +0100
--- src/version.c	2009-12-02 15:00:23.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     312,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
6. You refuse to go to a vacation spot with no electricity and no phone lines.

 /// 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    ///


--- NEW FILE 7.2.315 ---
To: vim-dev at vim.org
Subject: Patch 7.2.315
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.315
Problem:    Python libs can't be found on 64 bit system.
Solution:   Add lib64 to the list of directories. (Michael Henry)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.314/src/auto/configure	2009-11-17 17:13:03.000000000 +0100
--- src/auto/configure	2009-12-02 17:21:20.000000000 +0100
***************
*** 5126,5132 ****
  
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
--- 5126,5132 ----
  
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib64 lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
***************
*** 13718,13725 ****
  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
        else
  	vim_cv_tty_group=world
! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5
! $as_echo "ptys are world accessable" >&6; }
        fi
  
  else
--- 13718,13725 ----
  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
        else
  	vim_cv_tty_group=world
! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5
! $as_echo "ptys are world accessible" >&6; }
        fi
  
  else
***************
*** 13730,13737 ****
  ( exit $ac_status )
  
        vim_cv_tty_group=world
!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5
! $as_echo "can't determine - assume ptys are world accessable" >&6; }
  
  fi
  rm -rf conftest.dSYM
--- 13730,13737 ----
  ( exit $ac_status )
  
        vim_cv_tty_group=world
!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5
! $as_echo "can't determine - assume ptys are world accessible" >&6; }
  
  fi
  rm -rf conftest.dSYM
*** ../vim-7.2.314/src/configure.in	2009-11-17 17:13:03.000000000 +0100
--- src/configure.in	2009-12-02 17:21:10.000000000 +0100
***************
*** 686,692 ****
        [
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
--- 686,692 ----
        [
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib64 lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
***************
*** 2557,2567 ****
  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
        else
  	vim_cv_tty_group=world
! 	AC_MSG_RESULT([ptys are world accessable])
        fi
      ],[
        vim_cv_tty_group=world
!       AC_MSG_RESULT([can't determine - assume ptys are world accessable])
      ],[
        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
      ])
--- 2557,2567 ----
  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
        else
  	vim_cv_tty_group=world
! 	AC_MSG_RESULT([ptys are world accessible])
        fi
      ],[
        vim_cv_tty_group=world
!       AC_MSG_RESULT([can't determine - assume ptys are world accessible])
      ],[
        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
      ])
*** ../vim-7.2.314/src/version.c	2009-12-02 17:47:46.000000000 +0100
--- src/version.c	2009-12-02 17:57:39.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     315,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
10. And even your night dreams are in HTML.

 /// 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/rpms/vim/devel/README.patches,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- README.patches	2 Dec 2009 16:59:27 -0000	1.125
+++ README.patches	3 Dec 2009 13:06:49 -0000	1.126
@@ -345,3 +345,4 @@ Individual patches for Vim 7.2:
   9769  7.2.312  iconv() returns invalid char sequence when conversion fails
   3744  7.2.313  command line completion doesn't work after "%:h" and similar
   1620  7.2.314  small build broken after 7.2.313
+  4605  7.2.315  Python libs can't be found on 64 bit system



From karsten at fedoraproject.org  Thu Dec  3 13:08:39 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:08:39 +0000 (UTC)
Subject: rpms/vim/devel vimrc,1.21,1.22
Message-ID: <20091203130839.C882511C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	vimrc 
Log Message:
- disable automated wrapping of .txt files (#479896)


Index: vimrc
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vimrc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- vimrc	2 Dec 2009 16:40:52 -0000	1.21
+++ vimrc	3 Dec 2009 13:08:39 -0000	1.22
@@ -16,7 +16,7 @@ if has("autocmd")
   augroup fedora
   autocmd!
   " In text files, always limit the width of text to 78 characters
-  # autocmd BufRead *.txt set tw=78
+  " autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
   \ if line("'\"") > 0 && line ("'\"") <= line("$") |



From karsten at fedoraproject.org  Thu Dec  3 13:09:40 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:09:40 +0000 (UTC)
Subject: rpms/vim/devel vim-7.2-fstabsyntax.patch,1.1,1.2
Message-ID: <20091203130940.183E011C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	vim-7.2-fstabsyntax.patch 
Log Message:
- add ext4 keyword to /etc/fstab syntax highlighting (#498290)

vim-7.2-fstabsyntax.patch:
 fstab.vim |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: vim-7.2-fstabsyntax.patch
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim-7.2-fstabsyntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vim-7.2-fstabsyntax.patch	14 Aug 2008 16:06:02 -0000	1.1
+++ vim-7.2-fstabsyntax.patch	3 Dec 2009 13:09:39 -0000	1.2
@@ -6,7 +6,7 @@ diff -up vim72/runtime/syntax/fstab.vim.
  syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
  syn match fsTypeUnknown /\s\+\zs\w\+/ contained
 -syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
-+syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
  
  " Options
  " -------



From caolanm at fedoraproject.org  Thu Dec  3 13:09:50 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 13:09:50 +0000 (UTC)
Subject: rpms/planner/devel planner.spec,1.70,1.71
Message-ID: <20091203130950.466AC11C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	planner.spec 
Log Message:
autotools/libtool foo


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- planner.spec	3 Dec 2009 12:32:54 -0000	1.70
+++ planner.spec	3 Dec 2009 13:09:50 -0000	1.71
@@ -62,9 +62,7 @@ This package provides a plugin to integr
 
 %build
 rm -rf libegg
-aclocal
-autoconf
-automake
+autoreconf -f -i
 %configure --enable-python --disable-gtk-doc --disable-dotnet --disable-update-mimedb --enable-eds --enable-eds-backend --disable-static
 make # %{?_smp_mflags} not parallel build safe
 



From dnovotny at fedoraproject.org  Thu Dec  3 13:13:40 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu,  3 Dec 2009 13:13:40 +0000 (UTC)
Subject: rpms/emacs/F-11 emacs-23.1-indian.patch, NONE, 1.1 emacs.spec, 1.132,
	1.133
Message-ID: <20091203131340.A964711C00EE@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6714

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-indian.patch 
Log Message:
- fix #542657 -  emacs does not display indic text


emacs-23.1-indian.patch:
 indian.el |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE emacs-23.1-indian.patch ---
diff -up emacs-23.1/lisp/language/indian.el.indian emacs-23.1/lisp/language/indian.el
--- emacs-23.1/lisp/language/indian.el.indian	2009-12-03 13:03:04.000000000 +0100
+++ emacs-23.1/lisp/language/indian.el	2009-12-03 13:05:53.000000000 +0100
@@ -165,15 +165,15 @@ South Indian language Malayalam is suppo
   "Regexp matching a composable sequence of Malayalam characters.")
 
 (let ((script-regexp-alist
-       `((devanagari . ,devanagari-composable-pattern)
+       `((devanagari . "[\x900-\x97F\x200C\x200D]+")
 	 (bengali . "[\x980-\x9FF\x200C\x200D]+")
 	 (gurmukhi . "[\xA00-\xA7F\x200C\x200D]+")
 	 (gujarati . "[\xA80-\xAFF\x200C\x200D]+")
 	 (oriya . "[\xB00-\xB7F\x200C\x200D]+")
-	 (tamil . ,tamil-composable-pattern)
+	 (tamil . "[\xB80-\xBFF\x200C\x200D]+")
 	 (telugu . "[\xC00-\xC7F\x200C\x200D]+")
-	 (kannada . ,kannada-composable-pattern)
-	 (malayalam . ,malayalam-composable-pattern))))
+	 (kannada . "[\xC80-\xCFF\x200C\x200D]+")
+	 (malayalam . "[\xD00-\xD7F\x200C\x200D]+"))))
   (map-char-table
    #'(lambda (key val)
        (let ((slot (assq val script-regexp-alist)))


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- emacs.spec	13 Oct 2009 23:42:16 -0000	1.132
+++ emacs.spec	3 Dec 2009 13:13:40 -0000	1.133
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -26,6 +26,7 @@ Patch0: glibc-open-macro.patch
 Patch1: rpm-spec-mode.patch
 Patch2: po-mode-auto-replace-date-71264.patch
 Patch3: rpm-spec-mode-utc.patch
+Patch4: emacs-23.1-indian.patch
 #Patch4: emacsclient.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -48,6 +49,7 @@ BuildRequires: desktop-file-utils
 Requires:      desktop-file-utils
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
+Requires: m17n-db-datafiles
 
 Obsoletes: emacs-nxml-mode < 0.20041004-10
 Provides: emacs-nxml-mode = 0.20041004-10
@@ -117,7 +119,7 @@ Emacs packages or see some elisp example
 %prep
 %setup -q
 %patch0 -p1 -b .glibc-open-macro
-#%%patch4 -p1
+%patch4 -p1
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -382,6 +384,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Dec 03 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-7
+- fix #542657 -  emacs does not display indic text
+
 * Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-6
 - Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
 - Use site_start_d macro consistently



From kasal at fedoraproject.org  Thu Dec  3 13:25:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  3 Dec 2009 13:25:45 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.239,1.240
Message-ID: <20091203132545.8A62E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	perl.spec 
Log Message:
forgot $RPM_BUILD_ROOT once more


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- perl.spec	3 Dec 2009 12:02:44 -0000	1.239
+++ perl.spec	3 Dec 2009 13:25:45 -0000	1.240
@@ -152,6 +152,11 @@ Patch125:	perl-update-IO-Compress-Zlib.p
 %define			    IO_Compress_Zlib_version 2.020
 #... also update version number of Compress::Zlib
 
+# FIXME: Compress-Raw-Zlib also contains Compress-Raw-Bzip2
+# and IO-Compress-Zlib contains IO-Compress-Bzip2
+# and some of these packages have been merged to IO-Compress on cpan,
+# we should merge as well
+
 # and also ExtUtils-ParseXS 2.2002 -> 2.21
 
 
@@ -1165,7 +1170,7 @@ rm patchlevel.bak
 popd
 
 #FIXME: temporary compatibility hack: for perl(:MODULE_COMPAT_5.10.0)
-mkdir -p %{_libdir}/perl5/5.10.0/%{perl_archname}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}
 ln -s ../../CORE $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE
 
 %clean



From karsten at fedoraproject.org  Thu Dec  3 13:31:18 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:31:18 +0000 (UTC)
Subject: rpms/vim/devel gvim.desktop,1.7,1.8
Message-ID: <20091203133118.3F6DE11C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	gvim.desktop 
Log Message:
- use one gvim to open multiple file selections from nautilus (#519265)



Index: gvim.desktop
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/gvim.desktop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gvim.desktop	20 Oct 2008 13:28:53 -0000	1.7
+++ gvim.desktop	3 Dec 2009 13:31:18 -0000	1.8
@@ -55,7 +55,7 @@ Comment[tr]=G??l? vi d?zenleyicisi
 Comment[uk]=???????? ???????? vi
 Comment[zh_CN.GB2312]=????? vi ???
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %f
+Exec=gvim -f %F
 Icon=gvim
 Type=Application
 Terminal=0



From jorton at fedoraproject.org  Thu Dec  3 13:31:14 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 13:31:14 +0000 (UTC)
Subject: rpms/expat/devel expat-1.95.8-CVE-2009-3560.patch, NONE,
	1.1 expat-1.95.8-CVE-2009-3720.patch, NONE,
	1.1 expat-2.0.1-confcxx.patch, NONE, 1.1 expat.spec, 1.33, 1.34
Message-ID: <20091203133114.1507111C00EE@cvs1.fedora.phx.redhat.com>

Author: jorton

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

Modified Files:
	expat.spec 
Added Files:
	expat-1.95.8-CVE-2009-3560.patch 
	expat-1.95.8-CVE-2009-3720.patch expat-2.0.1-confcxx.patch 
Log Message:
* Tue Dec  1 2009 Joe Orton <jorton at redhat.com> - 2.0.1-8
- add security fix for CVE-2009-3560 (#533174)
- add security fix for CVE-2009-3720 (#531697)
- run the test suite


expat-1.95.8-CVE-2009-3560.patch:
 xmlparse.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE expat-1.95.8-CVE-2009-3560.patch ---

http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.164&r2=1.165

--- expat-1.95.8/lib/xmlparse.c.cve3560
+++ expat-1.95.8/lib/xmlparse.c
@@ -3637,7 +3637,6 @@ doProlog(XML_Parser parser,
         return XML_ERROR_NO_ELEMENTS;
       default:
         tok = -tok;
-        next = end;
         break;
       }
     }

expat-1.95.8-CVE-2009-3720.patch:
 xmltok_impl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE expat-1.95.8-CVE-2009-3720.patch ---
--- expat-1.95.8/lib/xmltok_impl.c.cve3720
+++ expat-1.95.8/lib/xmltok_impl.c
@@ -1741,7 +1741,7 @@ PREFIX(updatePosition)(const ENCODING *e
                        const char *end,
                        POSITION *pos)
 {
-  while (ptr != end) {
+  while (ptr < end) {
     switch (BYTE_TYPE(enc, ptr)) {
 #define LEAD_CASE(n) \
     case BT_LEAD ## n: \

expat-2.0.1-confcxx.patch:
 configure.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE expat-2.0.1-confcxx.patch ---

Configure for C++ too so the testsuite works.

--- expat-2.0.1/configure.in.confcxx
+++ expat-2.0.1/configure.in
@@ -62,6 +62,7 @@ AC_SUBST(LIBAGE)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_INSTALL
 
 if test "$GCC" = yes ; then


Index: expat.spec
===================================================================
RCS file: /cvs/extras/rpms/expat/devel/expat.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- expat.spec	24 Jul 2009 22:26:13 -0000	1.33
+++ expat.spec	3 Dec 2009 13:31:13 -0000	1.34
@@ -1,13 +1,16 @@
 Summary: An XML parser library
 Name: expat
 Version: 2.0.1
-Release: 7
+Release: 8%{?dist}
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
+Patch1: expat-2.0.1-confcxx.patch
+Patch2: expat-1.95.8-CVE-2009-3560.patch
+Patch3: expat-1.95.8-CVE-2009-3720.patch
 URL: http://www.libexpat.org/
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, automake, libtool
+BuildRequires: autoconf, automake, libtool, check-devel
 
 %description
 This is expat, the C library for parsing XML, written by James Clark. Expat
@@ -28,10 +31,13 @@ to develop XML applications with expat.
 
 %prep
 %setup -q
+%patch1 -p1 -b .confcxx
+%patch2 -p1 -b .cve3560
+%patch3 -p1 -b .cve3720
 
 %build
 rm -rf autom4te*.cache
-cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1
+rm conftools/libtool.m4
 libtoolize --copy --force --automake && aclocal && autoheader && autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --libdir=/%{_lib}
@@ -53,6 +59,9 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.l
 lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*`
 ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
 
+%check
+make check
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -74,6 +83,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/*.h
 
 %changelog
+* Tue Dec  1 2009 Joe Orton <jorton at redhat.com> - 2.0.1-8
+- add security fix for CVE-2009-3560 (#533174)
+- add security fix for CVE-2009-3720 (#531697)
+- run the test suite
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mkasik at fedoraproject.org  Thu Dec  3 13:31:35 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Thu,  3 Dec 2009 13:31:35 +0000 (UTC)
Subject: rpms/cups-pk-helper/F-12 allow_authentication.patch, NONE,
	1.1 cups-pk-helper.spec, 1.14, 1.15
Message-ID: <20091203133135.5936E11C00EE@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12922

Modified Files:
	cups-pk-helper.spec 
Added Files:
	allow_authentication.patch 
Log Message:
* Thu Dec  3 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-9
- Allow inactive users and any user to authenticate
- Resolves: #543085


allow_authentication.patch:
 org.opensuse.cupspkhelper.mechanism.policy.in |   30 +++++++++++++++++---------
 1 file changed, 20 insertions(+), 10 deletions(-)

--- NEW FILE allow_authentication.patch ---
--- cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-12-02 16:43:41.000000000 +0100
+++ cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-12-03 14:13:47.000000000 +0100
@@ -15,7 +15,8 @@
     <description>Set a printer as default printer</description>
     <message>Privileges are required to set a printer, or a class, as default printer.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
@@ -27,7 +28,8 @@
     <description>Enable/Disable a printer</description>
     <message>Privileges are required to enable/disable a printer, or a class.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
@@ -36,7 +38,8 @@
     <description>Add/Remove/Edit a local printer</description>
     <message>Privileges are required to add/remove/edit a local printer.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
@@ -45,7 +48,8 @@
     <description>Add/Remove/Edit a remote printer</description>
     <message>Privileges are required to add/remove/edit a remote printer.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
@@ -54,7 +58,8 @@
     <description>Add/Remove/Edit a class</description>
     <message>Privileges are required to add/remove/edit a class.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
@@ -63,7 +68,8 @@
     <description>Get/Set server settings</description>
     <message>Privileges are required to get/set server settings.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
@@ -72,7 +78,8 @@
     <description>Restart/Cancel/Edit a job</description>
     <message>Privileges are required to restart/cancel/edit a job.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>yes</allow_active>
     </defaults>
   </action>
@@ -81,7 +88,8 @@
     <description>Restart/Cancel/Edit a job owned by another user</description>
     <message>Privileges are required to restart/cancel/edit a job owned by another user.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
@@ -90,7 +98,8 @@
     <description>Get devices</description>
     <message>Privileges are required to get devices.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
@@ -100,7 +109,8 @@
     <description>Add/Remove/Edit a printer</description>
     <message>Privileges are required to add/remove/edit a printer.</message>
     <defaults>
-      <allow_inactive>no</allow_inactive>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-12/cups-pk-helper.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- cups-pk-helper.spec	30 Sep 2009 14:40:54 -0000	1.14
+++ cups-pk-helper.spec	3 Dec 2009 13:31:35 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -13,6 +13,7 @@ Patch1:         get_devices.patch
 Patch2:         polkit_result.patch
 Patch3:         edit_job.patch
 Patch4:         cups-pk-helper-ppd-name.patch
+Patch5:         allow_authentication.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,6 +48,7 @@ interfaces available under control of Po
 %patch2 -p1 -b .polkit-result
 %patch3 -p1 -b .edit-job
 %patch4 -p1 -b .ppd-name
+%patch5 -p1 -b .allow_auth
 
 %build
 # Patch0 modifies configure.ac
@@ -76,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec  3 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-9
+- Allow inactive users and any user to authenticate
+- Resolves: #543085
+
 * Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-8
 - Fix adding of printers without specification of device-uri.
 - Patch by Tim Waugh.



From karsten at fedoraproject.org  Thu Dec  3 13:33:51 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:33:51 +0000 (UTC)
Subject: rpms/vim/devel vim-7.2-httpfiletype-499123.patch,NONE,1.1
Message-ID: <20091203133351.2E13F11C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	vim-7.2-httpfiletype-499123.patch 
Log Message:
- correct syntax highlighting of httpd config files in /etc/httpd (#499123)

vim-7.2-httpfiletype-499123.patch:
 filetype.vim |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.2-httpfiletype-499123.patch ---
diff -up vim72/runtime/filetype.vim.499123 vim72/runtime/filetype.vim
--- vim72/runtime/filetype.vim.499123	2009-12-02 17:42:47.000000000 +0100
+++ vim72/runtime/filetype.vim	2009-12-02 17:43:52.000000000 +0100
@@ -111,7 +111,7 @@ au BufNewFile,BufRead proftpd.conf*		cal
 
 " Apache config file
 au BufNewFile,BufRead .htaccess			 setf apache
-au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
+au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/httpd/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
 
 " XA65 MOS6510 cross assembler
 au BufNewFile,BufRead *.a65			setf a65



From jorton at fedoraproject.org  Thu Dec  3 13:34:26 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 13:34:26 +0000 (UTC)
Subject: rpms/expat/F-12 expat-1.95.8-CVE-2009-3560.patch, NONE,
	1.1 expat-1.95.8-CVE-2009-3720.patch, NONE,
	1.1 expat-2.0.1-confcxx.patch, NONE, 1.1 expat.spec, 1.33, 1.34
Message-ID: <20091203133426.6F6DB11C00EE@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/expat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13885

Modified Files:
	expat.spec 
Added Files:
	expat-1.95.8-CVE-2009-3560.patch 
	expat-1.95.8-CVE-2009-3720.patch expat-2.0.1-confcxx.patch 
Log Message:
* Tue Dec  1 2009 Joe Orton <jorton at redhat.com> - 2.0.1-8
- add security fix for CVE-2009-3560 (#533174)
- add security fix for CVE-2009-3720 (#531697)
- run the test suite


expat-1.95.8-CVE-2009-3560.patch:
 xmlparse.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE expat-1.95.8-CVE-2009-3560.patch ---

http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.164&r2=1.165

--- expat-1.95.8/lib/xmlparse.c.cve3560
+++ expat-1.95.8/lib/xmlparse.c
@@ -3637,7 +3637,6 @@ doProlog(XML_Parser parser,
         return XML_ERROR_NO_ELEMENTS;
       default:
         tok = -tok;
-        next = end;
         break;
       }
     }

expat-1.95.8-CVE-2009-3720.patch:
 xmltok_impl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE expat-1.95.8-CVE-2009-3720.patch ---
--- expat-1.95.8/lib/xmltok_impl.c.cve3720
+++ expat-1.95.8/lib/xmltok_impl.c
@@ -1741,7 +1741,7 @@ PREFIX(updatePosition)(const ENCODING *e
                        const char *end,
                        POSITION *pos)
 {
-  while (ptr != end) {
+  while (ptr < end) {
     switch (BYTE_TYPE(enc, ptr)) {
 #define LEAD_CASE(n) \
     case BT_LEAD ## n: \

expat-2.0.1-confcxx.patch:
 configure.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE expat-2.0.1-confcxx.patch ---

Configure for C++ too so the testsuite works.

--- expat-2.0.1/configure.in.confcxx
+++ expat-2.0.1/configure.in
@@ -62,6 +62,7 @@ AC_SUBST(LIBAGE)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_INSTALL
 
 if test "$GCC" = yes ; then


Index: expat.spec
===================================================================
RCS file: /cvs/extras/rpms/expat/F-12/expat.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- expat.spec	24 Jul 2009 22:26:13 -0000	1.33
+++ expat.spec	3 Dec 2009 13:34:26 -0000	1.34
@@ -1,13 +1,16 @@
 Summary: An XML parser library
 Name: expat
 Version: 2.0.1
-Release: 7
+Release: 8%{?dist}
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
+Patch1: expat-2.0.1-confcxx.patch
+Patch2: expat-1.95.8-CVE-2009-3560.patch
+Patch3: expat-1.95.8-CVE-2009-3720.patch
 URL: http://www.libexpat.org/
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, automake, libtool
+BuildRequires: autoconf, automake, libtool, check-devel
 
 %description
 This is expat, the C library for parsing XML, written by James Clark. Expat
@@ -28,10 +31,13 @@ to develop XML applications with expat.
 
 %prep
 %setup -q
+%patch1 -p1 -b .confcxx
+%patch2 -p1 -b .cve3560
+%patch3 -p1 -b .cve3720
 
 %build
 rm -rf autom4te*.cache
-cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1
+rm conftools/libtool.m4
 libtoolize --copy --force --automake && aclocal && autoheader && autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --libdir=/%{_lib}
@@ -53,6 +59,9 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.l
 lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*`
 ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
 
+%check
+make check
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -74,6 +83,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/*.h
 
 %changelog
+* Tue Dec  1 2009 Joe Orton <jorton at redhat.com> - 2.0.1-8
+- add security fix for CVE-2009-3560 (#533174)
+- add security fix for CVE-2009-3720 (#531697)
+- run the test suite
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From karsten at fedoraproject.org  Thu Dec  3 13:34:31 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:34:31 +0000 (UTC)
Subject: rpms/vim/devel vim.spec,1.241,1.242
Message-ID: <20091203133431.4C64611C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	vim.spec 
Log Message:
vim-7.2-elinks-parameter-518791.patch


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- vim.spec	9 Nov 2009 15:55:15 -0000	1.241
+++ vim.spec	3 Dec 2009 13:34:31 -0000	1.242
@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 284
+%define patchlevel 315
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -350,6 +350,37 @@ Patch281: ftp://ftp.vim.org/pub/vim/patc
 Patch282: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.282
 Patch283: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.283
 Patch284: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.284
+Patch285: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.285
+Patch286: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.286
+Patch287: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.287
+Patch288: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.288
+Patch289: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.289
+Patch290: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.290
+Patch291: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.291
+Patch292: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.292
+Patch293: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.293
+Patch294: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.294
+Patch295: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.295
+Patch296: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.296
+Patch297: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.297
+Patch298: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.298
+Patch299: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.299
+Patch300: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.300
+Patch301: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301
+Patch302: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.302
+Patch303: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.303
+Patch304: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.304
+Patch305: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.305
+Patch306: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.306
+Patch307: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.307
+Patch308: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.308
+Patch309: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.309
+Patch310: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.310
+Patch311: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.311
+Patch312: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.312
+Patch313: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.313
+Patch314: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.314
+Patch315: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.315
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -357,11 +388,12 @@ Patch3003: vim-6.1-rh3.patch
 Patch3004: vim-7.0-rclocation.patch
 Patch3006: vim-6.4-checkhl.patch
 Patch3007: vim-7.2-fstabsyntax.patch
-Patch3008: vim-7.1-lib64.patch
-Patch3009: vim-7.0-warning.patch
-Patch3010: vim-7.0-syncolor.patch
-Patch3011: vim-7.0-specedit.patch
-Patch3012: vim72-rh514717.patch
+Patch3008: vim-7.0-warning.patch
+Patch3009: vim-7.0-syncolor.patch
+Patch3010: vim-7.0-specedit.patch
+Patch3011: vim72-rh514717.patch
+Patch3012: vim-7.2-httpfiletype-499123.patch
+Patch3013: vim-7.2-elinks-parameter-518791.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel ncurses-devel gettext perl-devel
@@ -370,6 +402,9 @@ BuildRequires: libacl-devel gpm-devel au
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
 %endif
+%if "%{withruby}" == "1"
+Buildrequires: ruby-devel ruby
+%endif
 %if %{desktop_file}
 # for /usr/bin/desktop-file-install
 Requires: desktop-file-utils
@@ -768,6 +803,37 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runti
 %patch282 -p0 
 %patch283 -p0 
 %patch284 -p0 
+%patch285 -p0                                          
+%patch286 -p0                                          
+%patch287 -p0                                          
+%patch288 -p0                                          
+%patch289 -p0                                          
+%patch290 -p0                                          
+%patch291 -p0                                          
+%patch292 -p0                                          
+%patch293 -p0                                          
+%patch294 -p0                                          
+%patch295 -p0                                          
+%patch296 -p0                                          
+%patch297 -p0                                          
+%patch298 -p0                                          
+%patch299 -p0                                          
+%patch300 -p0                                          
+%patch301 -p0                                          
+%patch302 -p0                                          
+%patch303 -p0                                          
+%patch304 -p0                                          
+%patch305 -p0                                          
+%patch306 -p0                                          
+%patch307 -p0
+%patch308 -p0
+%patch309 -p0
+%patch310 -p0
+%patch311 -p0
+%patch312 -p0
+%patch313 -p0
+%patch314 -p0
+%patch315 -p0
 
 
 # install spell files
@@ -797,12 +863,15 @@ cp -f %{SOURCE20} runtime/autoload/tar.v
 cp -f %{SOURCE21} runtime/autoload/netrwFileHandlers.vim
 cp -f %{SOURCE22} runtime/autoload/netrw.vim
 cp -f %{SOURCE23} runtime/autoload/netrwSettings.vim
-
+%patch3013 -p1
 
 %build
 cd src
 autoconf
 
+sed -e "s+VIMRCLOC	= \$(VIMLOC)+VIMRCLOC	= /etc+" Makefile > Makefile.tmp
+mv -f Makefile.tmp Makefile
+
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 
@@ -829,7 +898,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_S
   --disable-rubyinterp \
 %endif
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim gvim
 make clean
 
@@ -855,7 +924,7 @@ make clean
   --disable-rubyinterp \
 %endif
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim enhanced-vim
 make clean
 
@@ -874,7 +943,7 @@ perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/
   --with-compiledby="<bugzilla at redhat.com>" \
   --with-modified-by="<bugzilla at redhat.com>"
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -890,8 +959,8 @@ rm -f README*.info
 
 
 cd src
-make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
-make installgtutorbin  DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
+make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
+make installgtutorbin  DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
 mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd
 mv $RPM_BUILD_ROOT/bin/gvimtutor $RPM_BUILD_ROOT/%{_bindir}/gvimtutor
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
@@ -931,8 +1000,8 @@ install -m755 enhanced-vim $RPM_BUILD_RO
     mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
     desktop-file-install --vendor fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-        --add-category "Development;TextEditor;X-Red-Hat-Base" \
         %{SOURCE3}
+        # --add-category "Development;TextEditor;X-Red-Hat-Base" D\
   %else
     mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
     cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
@@ -1000,6 +1069,7 @@ vi-Bram.txt	vi_help.txt	/*vi-Bram*
 vi-Moolenaar.txt	vi_help.txt	/*vi-Moolenaar*
 vi-credits.txt	vi_help.txt	/*vi-credits*
 EOF
+LANG=C sort tags > tags.tmp; mv tags.tmp tags
  )
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
 rm -f $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
@@ -1228,6 +1298,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Dec 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.315-1
+- patchlevel 315
+- fix vimrc location in man page (#456992)
+- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
+- Buildrequire ruby, ruby-devel (#503872)
+- Remove check for static gravity (#510307)
+- sort tags file (#517725)
+- use one gvim to open multiple file selections from nautilus (#519265)
+- use elinks -source instead of elinks -dump (#518791)
+- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
+
 * Mon Nov 09 2009 Karsten Hopp <karsten at redhat.com> 7.2.284-1
 - patchlevel 284
 



From karsten at fedoraproject.org  Thu Dec  3 13:35:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:35:43 +0000 (UTC)
Subject: rpms/vim/devel vim-7.2-elinks-parameter-518791.patch,NONE,1.1
Message-ID: <20091203133543.5F18311C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Added Files:
	vim-7.2-elinks-parameter-518791.patch 
Log Message:
- use elinks -source instead of elinks -dump (#518791)


vim-7.2-elinks-parameter-518791.patch:
 netrw.vim |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.2-elinks-parameter-518791.patch ---
diff -up vim72/runtime/autoload/netrw.vim.elinksparm vim72/runtime/autoload/netrw.vim
--- vim72/runtime/autoload/netrw.vim.elinksparm	2009-12-03 13:08:10.000000000 +0100
+++ vim72/runtime/autoload/netrw.vim	2009-12-03 13:08:27.000000000 +0100
@@ -88,7 +88,7 @@ if !exists("g:netrw_http_cmd")
  if executable("elinks")
   let g:netrw_http_cmd = "elinks"
   if !exists("g:netrw_http_xcmd")
-   let g:netrw_http_xcmd= "-dump >"
+   let g:netrw_http_xcmd= "-source >"
   endif
  elseif executable("links")
   let g:netrw_http_cmd = "links"



From kasal at fedoraproject.org  Thu Dec  3 13:36:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  3 Dec 2009 13:36:22 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.240,1.241
Message-ID: <20091203133622.9ED2811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	perl.spec 
Log Message:
delete obsolete comments


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- perl.spec	3 Dec 2009 13:25:45 -0000	1.240
+++ perl.spec	3 Dec 2009 13:36:22 -0000	1.241
@@ -82,13 +82,11 @@ Patch62:	perl-add-symbols.patch
 
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
-# FIXME: predelej na update 0.2602 -> 0.27
+
 Patch104:	perl-update-ExtUtils-CBuilder.patch
 %define			    ExtUtils_CBuilder_version 0.27
-# FIXME: predelej na update 2.07_03 -> 2.08
 Patch106:	perl-update-File-Path.patch
 %define			    File_Path_version 2.08
-# FIXME: update 340201 -> 0.35
 Patch109:	perl-update-Module-Build.patch
 %define			    Module_Build_real_version 0.35
 # For Module-Build-0.x, the second component has to have four digits.



From kkofler at fedoraproject.org  Thu Dec  3 13:36:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Dec 2009 13:36:25 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.80-fix-kauth-polkitqt-1.patch, NONE, 
	1.1 kdelibs.spec, 1.544, 1.545
Message-ID: <20091203133625.2FE2E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.80-fix-kauth-polkitqt-1.patch 
Log Message:
* Thu Dec 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
- BR polkit-qt-devel
- fix the build of the KAuth PolkitQt-1 backend (upstream patch)

kdelibs-4.3.80-fix-kauth-polkitqt-1.patch:
 ConfigureChecks.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.80-fix-kauth-polkitqt-1.patch ---
Index: kdecore/auth/ConfigureChecks.cmake
===================================================================
--- kdecore/auth/ConfigureChecks.cmake	(revision 1057409)
+++ kdecore/auth/ConfigureChecks.cmake	(revision 1057410)
@@ -20,7 +20,7 @@
             macro_optional_find_package(PolkitQt-1)
             
             if (POLKITQT-1_FOUND)
-                set (KAUTH_BACKEND "PolkitQt1")
+                set (KAUTH_BACKEND "PolkitQt-1")
                 macro_log_feature(POLKITQT-1_FOUND "PolkitQt-1" "Qt Wrapper around polkit-1" "http://techbase.kde.org/Polkit-Qt-1"
                                   FALSE "" "STRONGLY RECOMMENDED: Needed to make KAuth work (using polkit-1), hence to enable some workspace functionalities")
             else (POLKITQT-1_FOUND)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -p -r1.544 -r1.545
--- kdelibs.spec	3 Dec 2009 11:30:56 -0000	1.544
+++ kdelibs.spec	3 Dec 2009 13:36:24 -0000	1.545
@@ -8,7 +8,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -87,6 +87,8 @@ Patch26: kdelibs-4.3.3-khtml_svg_no_var_
 Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff
 # Backport fix, needed for kdeedu (kde-packager list)
 Patch100: kdelibs-4.3.80-findqt4-typo.patch
+# Another backported typo fix, this one for KAuth PolkitQt-1
+Patch101: kdelibs-4.3.80-fix-kauth-polkitqt-1.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -120,8 +122,7 @@ BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
 BuildRequires: phonon-devel >= %{phonon_ver} 
-# TODO: polkit-qt dependency
-#BuildRequires: polkit-qt-devel >= %{polkit_qt_ver}
+BuildRequires: polkit-qt-devel
 BuildRequires: qca2-devel
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver} 
@@ -215,11 +216,14 @@ format for easy browsing.
 %patch24 -p1 -b .drkonq
 %endif
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
-%patch100 -p0 -b findqt4-typo
 
-# upstream patches
+# Kubuntu patch
 %patch50 -p1 -b .kaction_qt_keys
 
+# upstream patches
+%patch100 -p0 -b .findqt4-typo
+%patch101 -p0 -b .kauth-polkitqt-1
+
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
 
@@ -413,6 +417,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
+- BR polkit-qt-devel
+- fix the build of the KAuth PolkitQt-1 backend (upstream patch)
+
 * Tue Dec 01 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From kkofler at fedoraproject.org  Thu Dec  3 13:39:01 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Dec 2009 13:39:01 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.106,1.107
Message-ID: <20091203133901.2F6EB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdepimlibs.spec 
Log Message:
rm alphatag


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- kdepimlibs.spec	2 Dec 2009 13:54:42 -0000	1.106
+++ kdepimlibs.spec	3 Dec 2009 13:39:00 -0000	1.107
@@ -1,7 +1,6 @@
 %define apidocs 1
 %define akonadi_subpkg 1
 %define akonadi_version 1.2.61
-#%define alphatag svn1048496
 
 Name: kdepimlibs
 Version: 4.3.80
@@ -85,7 +84,7 @@ format for easy browsing.
 
 
 %prep
-%setup -q -n kdepimlibs-%{version}%{?alphatag}
+%setup -q
 
 
 %build



From karsten at fedoraproject.org  Thu Dec  3 13:40:06 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:40:06 +0000 (UTC)
Subject: rpms/vim/F-12 7.2.246, NONE, 1.1 7.2.247, NONE, 1.1 7.2.248, NONE, 
	1.1 7.2.249, NONE, 1.1 7.2.250, NONE, 1.1 7.2.251, NONE,
	1.1 7.2.252, NONE, 1.1 7.2.253, NONE, 1.1 7.2.254, NONE,
	1.1 7.2.255, NONE, 1.1 7.2.256, NONE, 1.1 7.2.257, NONE,
	1.1 7.2.258, NONE, 1.1 7.2.259, NONE, 1.1 7.2.260, NONE,
	1.1 7.2.261, NONE, 1.1 7.2.262, NONE, 1.1 7.2.263, NONE,
	1.1 7.2.264, NONE, 1.1 7.2.265, NONE, 1.1 7.2.266, NONE,
	1.1 7.2.267, NONE, 1.1 7.2.268, NONE, 1.1 7.2.269, NONE,
	1.1 7.2.270, NONE, 1.1 7.2.271, NONE, 1.1 7.2.272, NONE,
	1.1 7.2.273, NONE, 1.1 7.2.274, NONE, 1.1 7.2.275, NONE,
	1.1 7.2.276, NONE, 1.1 7.2.277, NONE, 1.1 7.2.278, NONE,
	1.1 7.2.279, NONE, 1.1 7.2.280, NONE, 1.1 7.2.281, NONE,
	1.1 7.2.282, NONE, 1.1 7.2.283, NONE, 1.1 7.2.284, NONE,
	1.1 7.2.285, NONE, 1.1 7.2.286, NONE, 1.1 7.2.287, NONE,
	1.1 7.2.288, NONE, 1.1 7.2.289, NONE, 1.1 7.2.290, NONE,
	1.1 7.2.291, NONE, 1.1 7.2.292, NONE, 1.1 7.2.293, NONE,
	1.1 7.2.294, NONE, 1.1 7.2.295, NONE, 1.1 7.2.296, NONE,
	1.1 7.2.297, NONE, 1.1 7.2.298, NONE, 1.1 7.2.299, NONE,
	1.1 7.2.300, NONE, 1.1 7.2.301, NONE, 1.1 7.2.302, NONE,
	1.1 7.2.303, NONE, 1.1 7.2.304, NONE, 1.1 7.2.305, NONE,
	1.1 7.2.306, NONE, 1.1 7.2.307, NONE, 1.1 7.2.308, NONE,
	1.1 7.2.309, NONE, 1.1 7.2.310, NONE, 1.1 7.2.311, NONE,
	1.1 7.2.312, NONE, 1.1 7.2.313, NONE, 1.1 7.2.314, NONE,
	1.1 7.2.315, NONE, 1.1 vim-7.2-elinks-parameter-518791.patch,
	NONE, 1.1 vim-7.2-httpfiletype-499123.patch, NONE,
	1.1 gvim.desktop, 1.7, 1.8 vim-7.2-fstabsyntax.patch, 1.1,
	1.2 vim.spec, 1.240, 1.241 vimrc, 1.20, 1.21
Message-ID: <20091203134006.9F90511C03F6@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16434

Modified Files:
	gvim.desktop vim-7.2-fstabsyntax.patch vim.spec vimrc 
Added Files:
	7.2.246 7.2.247 7.2.248 7.2.249 7.2.250 7.2.251 7.2.252 
	7.2.253 7.2.254 7.2.255 7.2.256 7.2.257 7.2.258 7.2.259 
	7.2.260 7.2.261 7.2.262 7.2.263 7.2.264 7.2.265 7.2.266 
	7.2.267 7.2.268 7.2.269 7.2.270 7.2.271 7.2.272 7.2.273 
	7.2.274 7.2.275 7.2.276 7.2.277 7.2.278 7.2.279 7.2.280 
	7.2.281 7.2.282 7.2.283 7.2.284 7.2.285 7.2.286 7.2.287 
	7.2.288 7.2.289 7.2.290 7.2.291 7.2.292 7.2.293 7.2.294 
	7.2.295 7.2.296 7.2.297 7.2.298 7.2.299 7.2.300 7.2.301 
	7.2.302 7.2.303 7.2.304 7.2.305 7.2.306 7.2.307 7.2.308 
	7.2.309 7.2.310 7.2.311 7.2.312 7.2.313 7.2.314 7.2.315 
	vim-7.2-elinks-parameter-518791.patch 
	vim-7.2-httpfiletype-499123.patch 
Log Message:
- patchlevel 315
- fix vimrc location in man page (#456992)
- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
- Buildrequire ruby, ruby-devel (#503872)
- Remove check for static gravity (#510307)
- sort tags file (#517725)
- use one gvim to open multiple file selections from nautilus (#519265)
- use elinks -source instead of elinks -dump (#518791)
- add ext4 keyword to /etc/fstab syntax highlighting (#498290)




--- NEW FILE 7.2.246 ---
To: vim-dev at vim.org
Subject: Patch 7.2.246
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.246
Problem:    Cscope home page link is wrong.
Solution:   Update the URL. (Sergey Khorev)
Files:	    runtime/doc/if_cscop.txt


*** ../vim-7.2.245/runtime/doc/if_cscop.txt	2009-07-09 21:22:36.000000000 +0200
--- runtime/doc/if_cscop.txt	2009-09-11 11:19:31.000000000 +0200
***************
*** 481,487 ****
  any problems, suggestions, patches, et al., you have for the usage of
  cscope within Vim to him.
  							*cscope-win32*
! For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html
  
  Win32 support was added by Sergey Khorev <sergey.khorev at gmail.com>.  Contact
  him if you have Win32-specific issues.
--- 481,488 ----
  any problems, suggestions, patches, et al., you have for the usage of
  cscope within Vim to him.
  							*cscope-win32*
! For a cscope version for Win32 see:
! 	http://code.google.com/p/cscope-win32/
  
  Win32 support was added by Sergey Khorev <sergey.khorev at gmail.com>.  Contact
  him if you have Win32-specific issues.
*** ../vim-7.2.245/src/version.c	2009-07-29 18:24:59.000000000 +0200
--- src/version.c	2009-09-11 11:29:02.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     246,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
221. Your wife melts your keyboard in the oven.

 /// 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    ///


--- NEW FILE 7.2.247 ---
To: vim-dev at vim.org
Subject: Patch 7.2.247
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.247
Problem:    Mzscheme interface minor problem.
Solution:   Better error message when build fails. (Sergey Khorev)
Files:	    src/if_mzsch.c


*** ../vim-7.2.246/src/if_mzsch.c	2009-07-09 20:06:30.000000000 +0200
--- src/if_mzsch.c	2009-09-11 11:20:39.000000000 +0200
***************
*** 635,642 ****
  #endif /* DYNAMIC_MZSCHEME */
  
  /* need to put it here for dynamic stuff to work */
! #ifdef INCLUDE_MZSCHEME_BASE
  # include "mzscheme_base.c"
  #endif
  
  /*
--- 635,644 ----
  #endif /* DYNAMIC_MZSCHEME */
  
  /* need to put it here for dynamic stuff to work */
! #if defined(INCLUDE_MZSCHEME_BASE)
  # include "mzscheme_base.c"
+ #elif MZSCHEME_VERSION_MAJOR >= 400
+ # error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes
  #endif
  
  /*
***************
*** 875,888 ****
  #ifdef INCLUDE_MZSCHEME_BASE
      {
  	/*
! 	 * versions 4.x do not provide Scheme bindings by defaults
  	 * we need to add them explicitly
  	 */
  	Scheme_Object *scheme_base_symbol = NULL;
  	MZ_GC_DECL_REG(1);
  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
  	MZ_GC_REG();
! 	/* invoke function from generated and included base.c */
  	declare_modules(environment);
  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
  	MZ_GC_CHECK();
--- 877,890 ----
  #ifdef INCLUDE_MZSCHEME_BASE
      {
  	/*
! 	 * versions 4.x do not provide Scheme bindings by default
  	 * we need to add them explicitly
  	 */
  	Scheme_Object *scheme_base_symbol = NULL;
  	MZ_GC_DECL_REG(1);
  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
  	MZ_GC_REG();
! 	/* invoke function from generated and included mzscheme_base.c */
  	declare_modules(environment);
  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
  	MZ_GC_CHECK();
*** ../vim-7.2.246/src/version.c	2009-09-11 11:30:12.000000000 +0200
--- src/version.c	2009-09-11 11:53:59.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     247,
  /**/

-- 
Your fault: core dumped

 /// 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    ///


--- NEW FILE 7.2.248 ---
To: vim-dev at vim.org
Subject: Patch 7.2.248 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.248 (extra)
Problem:    Mzscheme interface building minor problems.
Solution:   Update Win32 makefiles. (Sergey Khorev)
Files:	    src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak


*** ../vim-7.2.247/src/Make_cyg.mak	2007-09-30 22:28:48.000000000 +0200
--- src/Make_cyg.mak	2009-09-11 11:23:23.000000000 +0200
***************
*** 212,224 ****
  MZSCHEME_VER = 209_000
  endif
  
  ifeq (yes, $(DYNAMIC_MZSCHEME))
  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
  else
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS = $(MZSCHEME)
  endif
! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
  endif
  endif
  
--- 212,245 ----
  MZSCHEME_VER = 209_000
  endif
  
+ ifndef MZSCHEME_PRECISE_GC
+ MZSCHEME_PRECISE_GC=no
+ endif
+ 
+ # for version 4.x we need to generate byte-code for Scheme base
+ ifndef MZSCHEME_GENERATE_BASE
+ MZSCHEME_GENERATE_BASE=no
+ endif
+ 
  ifeq (yes, $(DYNAMIC_MZSCHEME))
  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
  else
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS = $(MZSCHEME)
  endif
! ifeq (yes,$(MZSCHEME_PRECISE_GC))
! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
! else
! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
! endif
! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
! endif
! ifeq (yes,$(MZSCHEME_GENERATE_BASE))
! DEFINES += -DINCLUDE_MZSCHEME_BASE
! MZ_EXTRA_DEP += mzscheme_base.c
! endif
! ifeq (yes,$(MZSCHEME_PRECISE_GC))
! DEFINES += -DMZ_PRECISE_GC
  endif
  endif
  
***************
*** 473,478 ****
--- 494,502 ----
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
+ ifdef MZSCHEME
+ 	-$(DEL) mzscheme_base.c
+ endif
  	-$(DEL) pathdef.c
  	$(MAKE) -C xxd -f Make_cyg.mak clean
  	$(MAKE) -C GvimExt -f Make_ming.mak clean
***************
*** 523,531 ****
--- 547,561 ----
  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_DEP)
  	$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
  
+ $(OUTDIR)/if_mzsch.o:	if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
+ 	$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
+ 
  $(OUTDIR)/vimrc.o:	vim.rc version.h gui_w32_rc.h
  	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
  
+ mzscheme_base.c:
+ 	$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
+ 
  pathdef.c: $(INCL)
  ifneq (sh.exe, $(SHELL))
  	@echo creating pathdef.c
*** ../vim-7.2.247/src/Make_ming.mak	2009-05-26 22:58:43.000000000 +0200
--- src/Make_ming.mak	2009-09-11 11:23:28.000000000 +0200
***************
*** 135,141 ****
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS=$(MZSCHEME)
  endif
! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS)
  endif
  
  endif
--- 135,141 ----
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS=$(MZSCHEME)
  endif
! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
  endif
  
  endif
***************
*** 563,568 ****
--- 563,571 ----
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
+ ifdef MZSCHEME
+ 	-$(DEL) mzscheme_base.c
+ endif
  	$(MAKE) -C GvimExt -f Make_ming.mak clean
  	$(MAKE) -C xxd -f Make_cyg.mak clean
  
*** ../vim-7.2.247/src/Make_mvc.mak	2009-06-16 16:45:14.000000000 +0200
--- src/Make_mvc.mak	2009-09-11 11:23:28.000000000 +0200
***************
*** 865,870 ****
--- 865,871 ----
  	- if exist dimm_i.c del dimm_i.c
  	- if exist dimm.tlb del dimm.tlb
  	- if exist dosinst.exe del dosinst.exe
+ 	- if exist mzscheme_base.c del mzscheme_base.c
  	cd xxd
  	$(MAKE) /NOLOGO -f Make_mvc.mak clean
  	cd ..
*** ../vim-7.2.247/src/version.c	2009-09-11 12:20:47.000000000 +0200
--- src/version.c	2009-09-11 12:48:26.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     248,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
222. You send more than 20 personal e-mails a day.

 /// 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    ///


--- NEW FILE 7.2.249 ---
To: vim-dev at vim.org
Subject: Patch 7.2.249
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.249
Problem:    The script to check .po files can't handle '%' in plural forms.
Solution:   Remove "Plural-Forms:" from the checked string.
Files:	    src/po/check.vim


*** ../vim-7.2.248/src/po/check.vim	2008-06-09 14:45:38.000000000 +0200
--- src/po/check.vim	2009-09-11 12:37:56.000000000 +0200
***************
*** 23,28 ****
--- 23,31 ----
    " remove '%', not used for formatting.
    let idline = substitute(idline, "'%'", '', 'g')
  
+   " remove '%' used for plural forms.
+   let idline = substitute(idline, '\\nPlural-Forms: .\+;\\n', '', '')
+ 
    " remove everything but % items.
    return substitute(idline, '[^%]*\(%[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g')
  endfunc
*** ../vim-7.2.248/src/version.c	2009-09-11 12:48:56.000000000 +0200
--- src/version.c	2009-09-11 12:59:18.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     249,
  /**/

-- 
If evolution theories are correct, humans will soon grow a third
hand for operating the mouse.

 /// 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    ///


--- NEW FILE 7.2.250 ---
To: vim-dev at vim.org
Subject: Patch 7.2.250 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.250 (extra)
Problem:    Possible buffer overflow.
Solution:   Compute the remaining space. (Dominique Pelle)
Files:	    src/GvimExt/gvimext.cpp


*** ../vim-7.2.249/src/GvimExt/gvimext.cpp	2008-07-24 20:51:11.000000000 +0200
--- src/GvimExt/gvimext.cpp	2009-09-11 13:26:27.000000000 +0200
***************
*** 635,641 ****
  	}
  	// Now concatenate
  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
! 	strncat(temp, title, BUFSIZE - 1);
  	InsertMenu(hMenu,
  		indexMenu++,
  		MF_STRING|MF_BYPOSITION,
--- 635,643 ----
  	}
  	// Now concatenate
  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
! 	temp[BUFSIZE - 1] = '\0';
! 	strncat(temp, title, BUFSIZE - 1 - strlen(temp));
! 	temp[BUFSIZE - 1] = '\0';
  	InsertMenu(hMenu,
  		indexMenu++,
  		MF_STRING|MF_BYPOSITION,
*** ../vim-7.2.249/src/version.c	2009-09-11 12:59:57.000000000 +0200
--- src/version.c	2009-09-11 13:23:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     250,
  /**/


-- 
hundred-and-one symptoms of being an internet addict:
223. You set up a web-cam as your home's security system.

 /// 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    ///


--- NEW FILE 7.2.251 ---
To: vim-dev at vim.org
Subject: Patch 7.2.251
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.251 (after 7.2.044)
Problem:    Compiler adds invalid memory bounds check.
Solution:   Remove _FORTIFY_SOURCE=2 from CFLAGS. (Dominique Pelle)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.250/src/auto/configure	2009-07-22 11:16:54.000000000 +0200
--- src/auto/configure	2009-08-07 14:49:52.000000000 +0200
***************
*** 17135,17141 ****
        { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
  $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
    if test "$gccmajor" -gt "3"; then
!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
      { $as_echo "$as_me:$LINENO: result: yes" >&5
  $as_echo "yes" >&6; }
    else
--- 17135,17141 ----
        { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
  $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
    if test "$gccmajor" -gt "3"; then
!     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
      { $as_echo "$as_me:$LINENO: result: yes" >&5
  $as_echo "yes" >&6; }
    else
*** ../vim-7.2.250/src/configure.in	2009-07-22 11:16:54.000000000 +0200
--- src/configure.in	2009-08-07 14:49:47.000000000 +0200
***************
*** 3233,3239 ****
    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
    if test "$gccmajor" -gt "3"; then
!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
      AC_MSG_RESULT(yes)
    else
      AC_MSG_RESULT(no)
--- 3233,3239 ----
    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
    if test "$gccmajor" -gt "3"; then
!     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
      AC_MSG_RESULT(yes)
    else
      AC_MSG_RESULT(no)
*** ../vim-7.2.250/src/version.c	2009-09-11 13:26:38.000000000 +0200
--- src/version.c	2009-09-11 13:43:46.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     251,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
225. You sign up for free subscriptions for all the computer magazines

 /// 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    ///


--- NEW FILE 7.2.252 ---
To: vim-dev at vim.org
Subject: Patch 7.2.252
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.252
Problem:    When using a multi-byte 'enc' the 'iskeyword' option cannot
	    contain characters above 128.
Solution:   Use mb_ptr2char_adv().
Files:	    src/charset.c


*** ../vim-7.2.251/src/charset.c	2009-05-14 22:19:19.000000000 +0200
--- src/charset.c	2009-09-09 21:11:46.000000000 +0200
***************
*** 174,179 ****
--- 174,184 ----
  	    if (VIM_ISDIGIT(*p))
  		c = getdigits(&p);
  	    else
+ #ifdef FEAT_MBYTE
+ 		 if (has_mbyte)
+ 		c = mb_ptr2char_adv(&p);
+ 	    else
+ #endif
  		c = *p++;
  	    c2 = -1;
  	    if (*p == '-' && p[1] != NUL)
*** ../vim-7.2.251/src/version.c	2009-09-11 13:44:33.000000000 +0200
--- src/version.c	2009-09-11 14:01:48.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     252,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
226. You sit down at the computer right after dinner and your spouse
     says "See you in the morning."

 /// 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    ///


--- NEW FILE 7.2.253 ---
To: vim-dev at vim.org
Subject: Patch 7.2.253
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.253
Problem:    Netbeans interface: getLength always uses current buffer.
Solution:   Use ml_get_buf() instead of ml_get(). (Xavier de Gaye)
Files:	    src/netbeans.c


*** ../vim-7.2.252/src/netbeans.c	2009-06-24 16:49:50.000000000 +0200
--- src/netbeans.c	2009-09-11 13:40:14.000000000 +0200
***************
*** 1499,1505 ****
  		    return FAIL;
  		}
  		first = *pos;
! 		nbdebug(("    FIRST POS: line %d, col %d\n", first.lnum, first.col));
  		pos = off2pos(buf->bufp, off+count-1);
  		if (!pos)
  		{
--- 1499,1506 ----
  		    return FAIL;
  		}
  		first = *pos;
! 		nbdebug(("    FIRST POS: line %d, col %d\n",
! 						      first.lnum, first.col));
  		pos = off2pos(buf->bufp, off+count-1);
  		if (!pos)
  		{
***************
*** 1510,1516 ****
  		    return FAIL;
  		}
  		last = *pos;
! 		nbdebug(("    LAST POS: line %d, col %d\n", last.lnum, last.col));
  		del_from_lnum = first.lnum;
  		del_to_lnum = last.lnum;
  		doupdate = 1;
--- 1511,1518 ----
  		    return FAIL;
  		}
  		last = *pos;
! 		nbdebug(("    LAST POS: line %d, col %d\n",
! 							last.lnum, last.col));
  		del_from_lnum = first.lnum;
  		del_to_lnum = last.lnum;
  		doupdate = 1;
***************
*** 1521,1527 ****
  		next = off2pos(buf->bufp, off + count);
  
  		/* Remove part of the first line. */
! 		if (first.col != 0 || (next != NULL && first.lnum == next->lnum))
  		{
  		    if (first.lnum != last.lnum
  			    || (next != NULL && first.lnum != next->lnum))
--- 1523,1530 ----
  		next = off2pos(buf->bufp, off + count);
  
  		/* Remove part of the first line. */
! 		if (first.col != 0
! 				|| (next != NULL && first.lnum == next->lnum))
  		{
  		    if (first.lnum != last.lnum
  			    || (next != NULL && first.lnum != next->lnum))
***************
*** 1584,1590 ****
  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
  			if (id > 0)
  			{
! 			    nbdebug(("    Deleting sign %d on line %d\n", id, i));
  			    buf_delsign(buf->bufp, id);
  			}
  			else
--- 1587,1594 ----
  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
  			if (id > 0)
  			{
! 			    nbdebug(("    Deleting sign %d on line %d\n",
! 								      id, i));
  			    buf_delsign(buf->bufp, id);
  			}
  			else
***************
*** 1593,1599 ****
  			}
  		    }
  
! 		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
  		    curwin->w_cursor.lnum = del_from_lnum;
  		    curwin->w_cursor.col = 0;
  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
--- 1597,1604 ----
  			}
  		    }
  
! 		    nbdebug(("    Deleting lines %d through %d\n",
! 						 del_from_lnum, del_to_lnum));
  		    curwin->w_cursor.lnum = del_from_lnum;
  		    curwin->w_cursor.col = 0;
  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
***************
*** 3514,3520 ****
  	    eol_size = 1;
  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
  	{
! 	    char_count += (long)STRLEN(ml_get(lnum)) + eol_size;
  	    /* Check for a CTRL-C every 100000 characters */
  	    if (char_count > last_check)
  	    {
--- 3519,3526 ----
  	    eol_size = 1;
  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
  	{
! 	    char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
! 								   + eol_size;
  	    /* Check for a CTRL-C every 100000 characters */
  	    if (char_count > last_check)
  	    {
*** ../vim-7.2.252/src/version.c	2009-09-11 14:02:25.000000000 +0200
--- src/version.c	2009-09-11 14:18:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     253,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
227. You sleep next to your monitor.  Or on top of it.

 /// 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    ///


--- NEW FILE 7.2.254 ---
To: vim-dev at vim.org
Subject: Patch 7.2.254
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.254
Problem:    Compiler warning for assigning size_t to int.
Solution:   Use size_t for the variable. (George Reilly)
Files:	    src/fileio.c


*** ../vim-7.2.253/src/fileio.c	2009-07-29 18:24:59.000000000 +0200
--- src/fileio.c	2009-09-11 13:46:19.000000000 +0200
***************
*** 4568,4574 ****
  	    c = TRUE;
  	    if (write_info.bw_conv_error_lnum != 0)
  	    {
! 		int l = STRLEN(IObuff);
  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
  			(long)write_info.bw_conv_error_lnum);
  	    }
--- 4568,4574 ----
  	    c = TRUE;
  	    if (write_info.bw_conv_error_lnum != 0)
  	    {
! 		size_t l = STRLEN(IObuff);
  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
  			(long)write_info.bw_conv_error_lnum);
  	    }
*** ../vim-7.2.253/src/version.c	2009-09-11 14:19:41.000000000 +0200
--- src/version.c	2009-09-11 15:03:42.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     254,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
230. You spend your Friday nights typing away at your keyboard

 /// 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    ///


--- NEW FILE 7.2.255 ---
To: vim-dev at vim.org
Subject: Patch 7.2.255
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.255 (after 7.2.242)
Problem:    Setting 'rightleft', 'linebreak' and 'wrap' may cause cursor to be
	    in wrong place.
Solution:   Recompute the cursor column for these options.
Files:	    src/option.c


*** ../vim-7.2.254/src/option.c	2009-07-29 15:41:32.000000000 +0200
--- src/option.c	2009-09-11 13:59:55.000000000 +0200
***************
*** 7430,7435 ****
--- 7430,7437 ----
      {
  	if (curwin->w_p_wrap)
  	    curwin->w_leftcol = 0;
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
      }
  
  #ifdef FEAT_WINDOWS
***************
*** 7664,7669 ****
--- 7666,7687 ----
      }
  #endif
  
+ #ifdef FEAT_LINEBREAK
+     if ((int *)varp == &curwin->w_p_lbr)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ #endif
+ 
+ #ifdef FEAT_RIGHTLEFT
+     if ((int *)varp == &curwin->w_p_rl)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ #endif
+ 
      /*
       * End of handling side effects for bool options.
       */
*** ../vim-7.2.254/src/version.c	2009-09-11 15:04:13.000000000 +0200
--- src/version.c	2009-09-11 15:19:40.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     255,
  /**/

-- 
A computer without Windows is like a fish without a bicycle.

 /// 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    ///


--- NEW FILE 7.2.256 ---
To: vim-dev at vim.org
Subject: Patch 7.2.256
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.256
Problem:    When 'guifont' was not set GTK font dialog doesn't have a default.
	    (Andreas Metzler)
Solution:   Set default to DEFAULT_FONT. (James Vega)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.255/src/gui_gtk_x11.c	2009-07-01 18:04:30.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-11 14:21:32.000000000 +0200
***************
*** 4729,4734 ****
--- 4729,4737 ----
      if (oldval != NULL && *oldval != NUL)
  	gtk_font_selection_dialog_set_font_name(
  		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), (char *)oldval);
+     else
+ 	gtk_font_selection_dialog_set_font_name(
+ 		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), DEFAULT_FONT);
  
      if (gui.fontname)
      {
***************
*** 4816,4821 ****
--- 4819,4827 ----
  	if (oldname != oldval)
  	    vim_free(oldname);
      }
+     else
+ 	gtk_font_selection_dialog_set_font_name(
+ 		GTK_FONT_SELECTION_DIALOG(dialog), DEFAULT_FONT);
  
      response = gtk_dialog_run(GTK_DIALOG(dialog));
  
*** ../vim-7.2.255/src/version.c	2009-09-11 15:20:22.000000000 +0200
--- src/version.c	2009-09-11 15:45:36.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     256,
  /**/

-- 
Get a life?  What is the URL where it can be downloaded?

 /// 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    ///


--- NEW FILE 7.2.257 ---
To: vim-dev at vim.org
Subject: Patch 7.2.257
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.257
Problem:    With GTK 2.17 lots of assertion error messages.
Solution:   Remove check for static gravity. (Sebastian Droege)
Files:	    src/gui_gtk_f.c


*** ../vim-7.2.256/src/gui_gtk_f.c	2009-05-17 23:25:16.000000000 +0200
--- src/gui_gtk_f.c	2009-09-11 15:15:41.000000000 +0200
***************
*** 860,870 ****
  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
  {
  #ifdef HAVE_GTK2
!     gboolean static_gravity_supported;
! 
!     static_gravity_supported = gdk_window_set_static_gravities(window,
! 							       use_static);
!     g_return_if_fail(static_gravity_supported);
  #else
      XSetWindowAttributes xattributes;
  
--- 860,868 ----
  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
  {
  #ifdef HAVE_GTK2
!     /* We don't check if static gravity is actually supported, because it
!      * results in an annoying assertion error message. */
!     gdk_window_set_static_gravities(window, use_static);
  #else
      XSetWindowAttributes xattributes;
  
*** ../vim-7.2.256/src/version.c	2009-09-11 15:46:20.000000000 +0200
--- src/version.c	2009-09-11 16:16:52.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     257,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
     in the front doorway permanently so it always looks like you are
     actually attempting to do something about that mess that has amassed
     since you discovered the Internet.

 /// 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    ///


--- NEW FILE 7.2.258 ---
To: vim-dev at vim.org
Subject: Patch 7.2.258
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.258
Problem:    v:beval_col and b:beval_text are wrong in UTF-8 text. (Tony
	    Mechelynck)
Solution:   Use byte number instead of character number for the column.
Files:	    src/ui.c


*** ../vim-7.2.257/src/ui.c	2009-07-01 18:04:30.000000000 +0200
--- src/ui.c	2009-09-11 16:11:50.000000000 +0200
***************
*** 3055,3072 ****
      int		vcol;
  {
      /* try to advance to the specified column */
-     int		col = 0;
      int		count = 0;
      char_u	*ptr;
  
!     ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
      while (count <= vcol && *ptr != NUL)
      {
- 	++col;
  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
  	mb_ptr_adv(ptr);
      }
!     return col;
  }
  #endif
  
--- 3055,3071 ----
      int		vcol;
  {
      /* try to advance to the specified column */
      int		count = 0;
      char_u	*ptr;
+     char_u	*start;
  
!     start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
      while (count <= vcol && *ptr != NUL)
      {
  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
  	mb_ptr_adv(ptr);
      }
!     return (int)(ptr - start);
  }
  #endif
  
*** ../vim-7.2.257/src/version.c	2009-09-11 16:17:36.000000000 +0200
--- src/version.c	2009-09-11 16:45:48.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     258,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
232. You start conversations with, "Have you gotten an ISDN line?"

 /// 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    ///


--- NEW FILE 7.2.259 ---
To: vim-dev at vim.org
Subject: Patch 7.2.259
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.259
Problem:    exists() doesn't work properly for an empty aucmd group.
Solution:   Change how au_exists() handles a missing pattern.  Also add a
	    test for this. (Bob Hiestand)
Files:	    src/fileio.c, src/testdir/Makefile, src/testdir/test67.in,
	    src/testdir/test67.ok


*** ../vim-7.2.258/src/fileio.c	2009-09-11 15:04:13.000000000 +0200
--- src/fileio.c	2009-09-11 16:37:08.000000000 +0200
***************
*** 9498,9512 ****
      ap = first_autopat[(int)event];
      if (ap == NULL)
  	goto theend;
-     if (pattern == NULL)
-     {
- 	retval = TRUE;
- 	goto theend;
-     }
  
      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
      /* for pattern "<buffer=N>, fnamecmp() will work fine */
!     if (STRICMP(pattern, "<buffer>") == 0)
  	buflocal_buf = curbuf;
  
      /* Check if there is an autocommand with the given pattern. */
--- 9498,9507 ----
      ap = first_autopat[(int)event];
      if (ap == NULL)
  	goto theend;
  
      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
      /* for pattern "<buffer=N>, fnamecmp() will work fine */
!     if (pattern != NULL && STRICMP(pattern, "<buffer>") == 0)
  	buflocal_buf = curbuf;
  
      /* Check if there is an autocommand with the given pattern. */
***************
*** 9515,9523 ****
  	/* For buffer-local autocommands, fnamecmp() works fine. */
  	if (ap->pat != NULL && ap->cmds != NULL
  	    && (group == AUGROUP_ALL || ap->group == group)
! 	    && (buflocal_buf == NULL
! 		 ? fnamecmp(ap->pat, pattern) == 0
! 		 : ap->buflocal_nr == buflocal_buf->b_fnum))
  	{
  	    retval = TRUE;
  	    break;
--- 9510,9519 ----
  	/* For buffer-local autocommands, fnamecmp() works fine. */
  	if (ap->pat != NULL && ap->cmds != NULL
  	    && (group == AUGROUP_ALL || ap->group == group)
! 	    && (pattern == NULL
! 		|| (buflocal_buf == NULL
! 		    ? fnamecmp(ap->pat, pattern) == 0
! 		    : ap->buflocal_nr == buflocal_buf->b_fnum)))
  	{
  	    retval = TRUE;
  	    break;
*** ../vim-7.2.258/src/testdir/Makefile	2009-06-24 18:07:55.000000000 +0200
--- src/testdir/Makefile	2009-09-11 16:31:33.000000000 +0200
***************
*** 22,28 ****
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out
  
  SCRIPTS_GUI = test16.out
  
--- 22,28 ----
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out
  
  SCRIPTS_GUI = test16.out
  
*** ../vim-7.2.258/src/testdir/test67.in	2009-09-11 17:23:47.000000000 +0200
--- src/testdir/test67.in	2009-09-11 16:43:11.000000000 +0200
***************
*** 0 ****
--- 1,33 ----
+ Test that groups and patterns are tested correctly when calling exists() for
+ autocommands.
+ 
+ STARTTEST
+ :so small.vim
+ :let results=[]
+ :augroup auexists
+ :augroup END
+ :call add(results, "##BufEnter: " . exists("##BufEnter"))
+ :call add(results, "#BufEnter: " . exists("#BufEnter"))
+ :au BufEnter * let g:entered=1
+ :call add(results, "#BufEnter: " . exists("#BufEnter"))
+ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
+ :augroup auexists
+ :au BufEnter * let g:entered=1
+ :augroup END
+ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
+ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
+ :au BufEnter *.test let g:entered=1
+ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
+ :edit testfile.test
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :au BufEnter <buffer> let g:entered=1
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :edit testfile2.test
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :e test.out
+ :call append(0, results)
+ :$d
+ :w
+ :qa!
+ ENDTEST
+ 
*** ../vim-7.2.258/src/testdir/test67.ok	2009-09-11 17:23:47.000000000 +0200
--- src/testdir/test67.ok	2009-09-11 16:43:15.000000000 +0200
***************
*** 0 ****
--- 1,10 ----
+ ##BufEnter: 1
+ #BufEnter: 0
+ #BufEnter: 1
+ #auexists#BufEnter: 0
+ #auexists#BufEnter: 1
+ #BufEnter#*.test: 0
+ #BufEnter#*.test: 1
+ #BufEnter#<buffer>: 0
+ #BufEnter#<buffer>: 1
+ #BufEnter#<buffer>: 0
*** ../vim-7.2.258/src/version.c	2009-09-11 16:48:06.000000000 +0200
--- src/version.c	2009-09-11 17:23:14.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     259,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
234. You started college as a chemistry major, and walk out four years
     later as an Internet provider.

 /// 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    ///


--- NEW FILE 7.2.260 ---
To: vim-dev at vim.org
Subject: Patch 7.2.260 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.260 (extra part of 7.2.259)
Problem:    exists() doesn't work properly for empty aucmd group.
Solution:   Change how au_exists() handles a missing pattern.  Also add a
	    test for this. (Bob Hiestand)
Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
	    src/testdir/Make_vms.mms


*** ../vim-7.2.259/src/testdir/Make_amiga.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_amiga.mak	2009-09-11 16:29:54.000000000 +0200
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
***************
*** 112,114 ****
--- 112,115 ----
  test64.out: test64.in
  test65.out: test65.in
  test66.out: test66.in
+ test67.out: test67.in
*** ../vim-7.2.259/src/testdir/Make_dos.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_dos.mak	2009-09-11 16:30:17.000000000 +0200
***************
*** 26,32 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out
  
  SCRIPTS32 =	test50.out
  
--- 26,32 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.259/src/testdir/Make_ming.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_ming.mak	2009-09-11 16:30:37.000000000 +0200
***************
*** 45,51 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out
  
  SCRIPTS32 =	test50.out
  
--- 45,51 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.259/src/testdir/Make_os2.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_os2.mak	2009-09-11 16:30:52.000000000 +0200
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
*** ../vim-7.2.259/src/testdir/Make_vms.mms	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_vms.mms	2009-09-11 16:31:06.000000000 +0200
***************
*** 4,10 ****
  # Authors:	Zoltan Arpadffy, <arpadffy at polarhome.com>
  #		Sandor Kopanyi,  <sandor.kopanyi at mailbox.hu>
  #
! # Last change:  2009 Mar 05
  #
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
  # Edit the lines in the Configuration section below to select.
--- 4,10 ----
  # Authors:	Zoltan Arpadffy, <arpadffy at polarhome.com>
  #		Sandor Kopanyi,  <sandor.kopanyi at mailbox.hu>
  #
! # Last change:  2009 Sep 11
  #
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
  # Edit the lines in the Configuration section below to select.
***************
*** 69,75 ****
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
--- 69,75 ----
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
*** ../vim-7.2.259/src/version.c	2009-09-11 17:24:01.000000000 +0200
--- src/version.c	2009-09-18 14:57:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     260,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
251. You've never seen your closest friends who usually live WAY too far away.

 /// 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    ///


--- NEW FILE 7.2.261 ---
To: vim-dev at vim.org
Subject: Patch 7.2.261
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.261
Problem:    When deleting lines with a specific folding configuration E38 may
	    appear. (Shahaf)
Solution:   When adjusting nested folds for deleted lines take into account
	    that they don't start at the top of the enclosing fold.
Files:	    src/fold.c


*** ../vim-7.2.260/src/fold.c	2009-01-06 15:01:58.000000000 +0100
--- src/fold.c	2009-09-18 14:43:23.000000000 +0200
***************
*** 1607,1617 ****
  	    }
  	    else
  	    {
- 		/* 2, 3, or 5: need to correct nested folds too */
- 		foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
- 				  line2 - fp->fd_top, amount, amount_after);
  		if (fp->fd_top < top)
  		{
  		    if (last <= line2)
  		    {
  			/* 2. fold contains line1, line2 is below fold */
--- 1607,1617 ----
  	    }
  	    else
  	    {
  		if (fp->fd_top < top)
  		{
+ 		    /* 2 or 3: need to correct nested folds too */
+ 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
+ 				  line2 - fp->fd_top, amount, amount_after);
  		    if (last <= line2)
  		    {
  			/* 2. fold contains line1, line2 is below fold */
***************
*** 1628,1634 ****
  		}
  		else
  		{
! 		    /* 5. fold is below line1 and contains line2 */
  		    if (amount == MAXLNUM)
  		    {
  			fp->fd_len -= line2 - fp->fd_top + 1;
--- 1628,1638 ----
  		}
  		else
  		{
! 		    /* 5. fold is below line1 and contains line2; need to
! 		     * correct nested folds too */
! 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
! 				  line2 - fp->fd_top, amount,
! 				  amount_after + (fp->fd_top - top));
  		    if (amount == MAXLNUM)
  		    {
  			fp->fd_len -= line2 - fp->fd_top + 1;
*** ../vim-7.2.260/src/version.c	2009-09-18 14:58:26.000000000 +0200
--- src/version.c	2009-09-18 15:14:40.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     261,
  /**/

-- 
Emacs is a nice OS - but it lacks a good text editor.
That's why I am using Vim.  --Anonymous

 /// 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    ///


--- NEW FILE 7.2.262 ---
To: vim-dev at vim.org
Subject: Patch 7.2.262
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.262
Problem:    When using custom completion for a user command the pattern string
	    goes beyond the cursor position. (Hari Krishna Dara)
Solution:   Truncate the string at the cursor position.
Files:	    src/ex_getln.c, src/structs.h


*** ../vim-7.2.261/src/ex_getln.c	2009-06-24 17:04:40.000000000 +0200
--- src/ex_getln.c	2009-09-18 16:58:16.000000000 +0200
***************
*** 3266,3272 ****
      int		i, j;
      char_u	*p1;
      char_u	*p2;
-     int		oldlen;
      int		difflen;
      int		v;
  
--- 3266,3271 ----
***************
*** 3291,3297 ****
      out_flush();
  
      i = (int)(xp->xp_pattern - ccline.cmdbuff);
!     oldlen = ccline.cmdpos - i;
  
      if (type == WILD_NEXT || type == WILD_PREV)
      {
--- 3290,3296 ----
      out_flush();
  
      i = (int)(xp->xp_pattern - ccline.cmdbuff);
!     xp->xp_pattern_len = ccline.cmdpos - i;
  
      if (type == WILD_NEXT || type == WILD_PREV)
      {
***************
*** 3305,3322 ****
  	/*
  	 * Translate string into pattern and expand it.
  	 */
! 	if ((p1 = addstar(&ccline.cmdbuff[i], oldlen, xp->xp_context)) == NULL)
  	    p2 = NULL;
  	else
  	{
! 	    p2 = ExpandOne(xp, p1, vim_strnsave(&ccline.cmdbuff[i], oldlen),
  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
  							      |options, type);
  	    vim_free(p1);
  	    /* longest match: make sure it is not shorter (happens with :help */
  	    if (p2 != NULL && type == WILD_LONGEST)
  	    {
! 		for (j = 0; j < oldlen; ++j)
  		     if (ccline.cmdbuff[i + j] == '*'
  			     || ccline.cmdbuff[i + j] == '?')
  			 break;
--- 3304,3323 ----
  	/*
  	 * Translate string into pattern and expand it.
  	 */
! 	if ((p1 = addstar(xp->xp_pattern, xp->xp_pattern_len,
! 						     xp->xp_context)) == NULL)
  	    p2 = NULL;
  	else
  	{
! 	    p2 = ExpandOne(xp, p1,
! 			 vim_strnsave(&ccline.cmdbuff[i], xp->xp_pattern_len),
  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
  							      |options, type);
  	    vim_free(p1);
  	    /* longest match: make sure it is not shorter (happens with :help */
  	    if (p2 != NULL && type == WILD_LONGEST)
  	    {
! 		for (j = 0; j < xp->xp_pattern_len; ++j)
  		     if (ccline.cmdbuff[i + j] == '*'
  			     || ccline.cmdbuff[i + j] == '?')
  			 break;
***************
*** 3331,3337 ****
  
      if (p2 != NULL && !got_int)
      {
! 	difflen = (int)STRLEN(p2) - oldlen;
  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
  	{
  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
--- 3332,3338 ----
  
      if (p2 != NULL && !got_int)
      {
! 	difflen = (int)STRLEN(p2) - xp->xp_pattern_len;
  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
  	{
  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
***************
*** 3620,3625 ****
--- 3621,3627 ----
      expand_T	*xp;
  {
      xp->xp_pattern = NULL;
+     xp->xp_pattern_len = 0;
      xp->xp_backslash = XP_BS_NONE;
  #ifndef BACKSLASH_IN_FILENAME
      xp->xp_shell = FALSE;
***************
*** 4311,4318 ****
      }
  
      /* add star to file name, or convert to regexp if not exp. files. */
!     file_str = addstar(xp->xp_pattern,
! 			   (int)(str + col - xp->xp_pattern), xp->xp_context);
      if (file_str == NULL)
  	return EXPAND_UNSUCCESSFUL;
  
--- 4313,4320 ----
      }
  
      /* add star to file name, or convert to regexp if not exp. files. */
!     xp->xp_pattern_len = (int)(str + col - xp->xp_pattern);
!     file_str = addstar(xp->xp_pattern, xp->xp_pattern_len, xp->xp_context);
      if (file_str == NULL)
  	return EXPAND_UNSUCCESSFUL;
  
***************
*** 4781,4787 ****
  	sprintf((char *)num, "%d", ccline.cmdpos);
  	args[1] = ccline.cmdbuff;
      }
!     args[0] = xp->xp_pattern;
      args[2] = num;
  
      /* Save the cmdline, we don't know what the function may do. */
--- 4783,4789 ----
  	sprintf((char *)num, "%d", ccline.cmdpos);
  	args[1] = ccline.cmdbuff;
      }
!     args[0] = vim_strnsave(xp->xp_pattern, xp->xp_pattern_len);
      args[2] = num;
  
      /* Save the cmdline, we don't know what the function may do. */
***************
*** 4797,4802 ****
--- 4799,4805 ----
      if (ccline.cmdbuff != NULL)
  	ccline.cmdbuff[ccline.cmdlen] = keep;
  
+     vim_free(args[0]);
      return ret;
  }
  
*** ../vim-7.2.261/src/structs.h	2009-07-29 12:09:49.000000000 +0200
--- src/structs.h	2009-09-18 15:33:15.000000000 +0200
***************
*** 432,437 ****
--- 432,438 ----
  {
      int		xp_context;		/* type of expansion */
      char_u	*xp_pattern;		/* start of item to expand */
+     int		xp_pattern_len;		/* bytes in xp_pattern before cursor */
  #if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
      char_u	*xp_arg;		/* completion function */
      int		xp_scriptID;		/* SID for completion function */
*** ../vim-7.2.261/src/version.c	2009-09-18 15:16:37.000000000 +0200
--- src/version.c	2009-09-18 17:23:20.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     262,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
252. You vote for foreign officials.

 /// 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    ///


--- NEW FILE 7.2.263 ---
To: vim-dev at vim.org
Subject: Patch 7.2.263
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.263
Problem:    GTK2: when using the -geom argument with an offset from the right
	    edge and the size is smaller than the default, the Vim window is
	    not positioned properly.
Solution:   Use another function to set the size. (Vitaly Minko)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.262/src/gui_gtk_x11.c	2009-09-11 15:46:20.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
***************
*** 4066,4071 ****
--- 4066,4073 ----
  {
      guicolor_T fg_pixel = INVALCOLOR;
      guicolor_T bg_pixel = INVALCOLOR;
+     guint		pixel_width;
+     guint		pixel_height;
  
  #ifdef HAVE_GTK2
      /*
***************
*** 4106,4113 ****
  	unsigned int	w, h;
  	int		x = 0;
  	int		y = 0;
- 	guint		pixel_width;
- 	guint		pixel_height;
  
  	mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
  
--- 4108,4113 ----
***************
*** 4160,4168 ****
  	}
      }
  
!     gtk_form_set_size(GTK_FORM(gui.formwin),
! 	    (guint)(gui_get_base_width() + Columns * gui.char_width),
! 	    (guint)(gui_get_base_height() + Rows * gui.char_height));
      update_window_manager_hints(0, 0);
  
      if (foreground_argument != NULL)
--- 4160,4175 ----
  	}
      }
  
!     pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
!     pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
! #ifdef HAVE_GTK2
!     /* For GTK2 changing the size of the form widget doesn't cause window
!      * resizing. */
!     if (gtk_socket_id == 0) 
! 	gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height);
! #else
!     gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height);
! #endif
      update_window_manager_hints(0, 0);
  
      if (foreground_argument != NULL)
*** ../vim-7.2.262/src/version.c	2009-09-18 17:24:54.000000000 +0200
--- src/version.c	2009-09-23 17:34:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     263,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
267. You get an extra phone line so you can get phone calls.

 /// 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    ///


--- NEW FILE 7.2.264 ---
To: vim-dev at vim.org
Subject: Patch 7.2.264
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.264
Problem:    GTK2: When the Vim window is maximized setting 'columns' or
	    'lines' doesn't work.
Solution:   Unmaximize the window before setting the size. (Vitaly Minko)
Files:	    src/gui.c, src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro


*** ../vim-7.2.263/src/gui.c	2009-07-29 11:10:31.000000000 +0200
--- src/gui.c	2009-09-23 16:28:09.000000000 +0200
***************
*** 1386,1391 ****
--- 1386,1395 ----
      int		min_height;
      int		screen_w;
      int		screen_h;
+ #ifdef HAVE_GTK2
+     int		un_maximize = mustset;
+     int         did_adjust = 0;
+ #endif
  
      if (!gui.shell_created)
  	return;
***************
*** 1425,1446 ****
  	    if (Columns < MIN_COLUMNS)
  		Columns = MIN_COLUMNS;
  	    width = Columns * gui.char_width + base_width;
  	}
  	if ((direction & RESIZE_VERT) && height > screen_h)
  	{
  	    Rows = (screen_h - base_height) / gui.char_height;
  	    check_shellsize();
  	    height = Rows * gui.char_height + base_height;
  	}
      }
      gui.num_cols = Columns;
      gui.num_rows = Rows;
  
      min_width = base_width + MIN_COLUMNS * gui.char_width;
      min_height = base_height + MIN_LINES * gui.char_height;
! # ifdef FEAT_WINDOWS
      min_height += tabline_height() * gui.char_height;
! # endif
  
      gui_mch_set_shellsize(width, height, min_width, min_height,
  					  base_width, base_height, direction);
--- 1429,1475 ----
  	    if (Columns < MIN_COLUMNS)
  		Columns = MIN_COLUMNS;
  	    width = Columns * gui.char_width + base_width;
+ #ifdef HAVE_GTK2
+ 	    ++did_adjust;
+ #endif
  	}
  	if ((direction & RESIZE_VERT) && height > screen_h)
  	{
  	    Rows = (screen_h - base_height) / gui.char_height;
  	    check_shellsize();
  	    height = Rows * gui.char_height + base_height;
+ #ifdef HAVE_GTK2
+ 	    ++did_adjust;
+ #endif
  	}
+ #ifdef HAVE_GTK2
+ 	if (did_adjust == 2 || (width + gui.char_width >= screen_w
+ 				     && height + gui.char_height >= screen_h))
+ 	    /* don't unmaximize if at maximum size */
+ 	    un_maximize = FALSE;
+ #endif
      }
      gui.num_cols = Columns;
      gui.num_rows = Rows;
  
      min_width = base_width + MIN_COLUMNS * gui.char_width;
      min_height = base_height + MIN_LINES * gui.char_height;
! #ifdef FEAT_WINDOWS
      min_height += tabline_height() * gui.char_height;
! #endif
! 
! #ifdef HAVE_GTK2
!     if (un_maximize)
!     {
! 	/* If the window size is smaller than the screen unmaximize the
! 	 * window, otherwise resizing won't work. */
! 	gui_mch_get_screen_dimensions(&screen_w, &screen_h);
! 	if ((width + gui.char_width < screen_w
! 				   || height + gui.char_height * 2 < screen_h)
! 		&& gui_mch_maximized())
! 	    gui_mch_unmaximize();
!     }
! #endif
  
      gui_mch_set_shellsize(width, height, min_width, min_height,
  					  base_width, base_height, direction);
*** ../vim-7.2.263/src/gui_gtk_x11.c	2009-09-23 17:35:17.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
***************
*** 4376,4381 ****
--- 4376,4404 ----
  #endif
  #endif /* HAVE_GTK2 */
  
+ #if defined(HAVE_GTK2) || defined(PROTO)
+ /*
+  * Return TRUE if the main window is maximized.
+  */
+     int
+ gui_mch_maximized()
+ {
+     return (gui.mainwin != NULL && gui.mainwin->window != NULL
+ 	    && (gdk_window_get_state(gui.mainwin->window)
+ 					       & GDK_WINDOW_STATE_MAXIMIZED));
+ }
+ 
+ /*
+  * Unmaximize the main window
+  */
+     void
+ gui_mch_unmaximize()
+ {
+     if (gui.mainwin != NULL)
+ 	gtk_window_unmaximize(GTK_WINDOW(gui.mainwin));
+ }
+ #endif
+ 
  /*
   * Set the windows size.
   */
*** ../vim-7.2.263/src/proto/gui_gtk_x11.pro	2007-05-05 19:18:54.000000000 +0200
--- src/proto/gui_gtk_x11.pro	2009-09-23 15:43:45.000000000 +0200
***************
*** 16,21 ****
--- 16,23 ----
  void gui_mch_exit __ARGS((int rc));
  int gui_mch_get_winpos __ARGS((int *x, int *y));
  void gui_mch_set_winpos __ARGS((int x, int y));
+ int gui_mch_maximized __ARGS((void));
+ void gui_mch_unmaximize __ARGS((void));
  void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
  void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
  void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
*** ../vim-7.2.263/src/version.c	2009-09-23 17:35:17.000000000 +0200
--- src/version.c	2009-09-23 18:12:21.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     264,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
268. You get up in the morning and go online before getting your coffee.

 /// 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    ///


--- NEW FILE 7.2.265 ---
To: vim-dev at vim.org
Subject: Patch 7.2.265
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.265
Problem:    When using ":silent broken" inside try/catch silency may persist.
	    (dr-dr xp)
Solution:   Set msg_silent when there is an error and it's bigger than the
	    saved value.
Files:	    src/ex_docmd.c


*** ../vim-7.2.264/src/ex_docmd.c	2009-07-09 20:13:59.000000000 +0200
--- src/ex_docmd.c	2009-09-30 11:40:53.000000000 +0200
***************
*** 2695,2701 ****
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	if (!did_emsg)
  	    msg_silent = save_msg_silent;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
--- 2695,2701 ----
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	if (!did_emsg || msg_silent > save_msg_silent)
  	    msg_silent = save_msg_silent;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
*** ../vim-7.2.264/src/version.c	2009-09-23 18:14:13.000000000 +0200
--- src/version.c	2009-09-30 13:22:47.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     265,
  /**/

-- 
FIRST HEAD:  Oh! quick! get the sword out I want to cut his head off.
THIRD HEAD:  Oh, cut your own head off.
SECOND HEAD: Yes - do us all a favour.
                 "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    ///


--- NEW FILE 7.2.266 ---
To: vim-dev at vim.org
Subject: Patch 7.2.266
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.266
Problem:    When an expression abbreviation is triggered, the typed character
	    is unknown.
Solution:   Make the typed character available in v:char.
Files:	    runtime/doc/map.txt, src/eval.c, src/getchar.c, src/ops.c,
	    src/proto/eval.pro


*** ../vim-7.2.265/runtime/doc/map.txt	2008-08-09 19:36:49.000000000 +0200
--- runtime/doc/map.txt	2009-09-23 19:39:19.000000000 +0200
***************
*** 224,229 ****
--- 224,233 ----
  The result of the InsertDot() function will be inserted.  It could check the
  text before the cursor and start omni completion when some condition is met.
  
+ For abbreviations |v:char| is set to the character that was typed to trigger
+ the abbreviation.  You can use this to decide how to expand the {lhs}.  You
+ can't change v:char and you should not insert it.
+ 
  Be very careful about side effects!  The expression is evaluated while
  obtaining characters, you may very well make the command dysfunctional.
  For this reason the following is blocked:
*** ../vim-7.2.265/src/eval.c	2009-06-03 14:25:47.000000000 +0200
--- src/eval.c	2009-09-23 19:36:32.000000000 +0200
***************
*** 18101,18106 ****
--- 18101,18131 ----
  }
  
  /*
+  * Set v:char to character "c".
+  */
+     void
+ set_vim_var_char(c)
+     int c;
+ {
+ #ifdef FEAT_MBYTE
+     char_u	buf[MB_MAXBYTES];
+ #else
+     char_u	buf[2];
+ #endif
+ 
+ #ifdef FEAT_MBYTE
+     if (has_mbyte)
+ 	buf[(*mb_char2bytes)(c, buf)] = NUL;
+     else
+ #endif
+     {
+ 	buf[0] = c;
+ 	buf[1] = NUL;
+     }
+     set_vim_var_string(VV_CHAR, buf, -1);
+ }
+ 
+ /*
   * Set v:count to "count" and v:count1 to "count1".
   * When "set_prevcount" is TRUE first set v:prevcount from v:count.
   */
*** ../vim-7.2.265/src/getchar.c	2009-07-14 13:44:43.000000000 +0200
--- src/getchar.c	2009-09-23 19:35:54.000000000 +0200
***************
*** 129,135 ****
  static void	validate_maphash __ARGS((void));
  static void	showmap __ARGS((mapblock_T *mp, int local));
  #ifdef FEAT_EVAL
! static char_u	*eval_map_expr __ARGS((char_u *str));
  #endif
  
  /*
--- 129,135 ----
  static void	validate_maphash __ARGS((void));
  static void	showmap __ARGS((mapblock_T *mp, int local));
  #ifdef FEAT_EVAL
! static char_u	*eval_map_expr __ARGS((char_u *str, int c));
  #endif
  
  /*
***************
*** 2446,2452 ****
  			    if (tabuf.typebuf_valid)
  			    {
  				vgetc_busy = 0;
! 				s = eval_map_expr(mp->m_str);
  				vgetc_busy = save_vgetc_busy;
  			    }
  			    else
--- 2446,2452 ----
  			    if (tabuf.typebuf_valid)
  			    {
  				vgetc_busy = 0;
! 				s = eval_map_expr(mp->m_str, NUL);
  				vgetc_busy = save_vgetc_busy;
  			    }
  			    else
***************
*** 4367,4375 ****
  	     * abbreviation, but is not inserted into the input stream.
  	     */
  	    j = 0;
- 					/* special key code, split up */
  	    if (c != Ctrl_RSB)
  	    {
  		if (IS_SPECIAL(c) || c == K_SPECIAL)
  		{
  		    tb[j++] = K_SPECIAL;
--- 4367,4375 ----
  	     * abbreviation, but is not inserted into the input stream.
  	     */
  	    j = 0;
  	    if (c != Ctrl_RSB)
  	    {
+ 					/* special key code, split up */
  		if (IS_SPECIAL(c) || c == K_SPECIAL)
  		{
  		    tb[j++] = K_SPECIAL;
***************
*** 4398,4404 ****
  	    }
  #ifdef FEAT_EVAL
  	    if (mp->m_expr)
! 		s = eval_map_expr(mp->m_str);
  	    else
  #endif
  		s = mp->m_str;
--- 4398,4404 ----
  	    }
  #ifdef FEAT_EVAL
  	    if (mp->m_expr)
! 		s = eval_map_expr(mp->m_str, c);
  	    else
  #endif
  		s = mp->m_str;
***************
*** 4434,4441 ****
   * special characters.
   */
      static char_u *
! eval_map_expr(str)
      char_u	*str;
  {
      char_u	*res;
      char_u	*p;
--- 4434,4442 ----
   * special characters.
   */
      static char_u *
! eval_map_expr(str, c)
      char_u	*str;
+     int		c;	    /* NUL or typed character for abbreviation */
  {
      char_u	*res;
      char_u	*p;
***************
*** 4452,4457 ****
--- 4453,4459 ----
  #ifdef FEAT_EX_EXTRA
      ++ex_normal_lock;
  #endif
+     set_vim_var_char(c);  /* set v:char to the typed character */
      save_cursor = curwin->w_cursor;
      p = eval_to_string(str, NULL, FALSE);
      --textlock;
*** ../vim-7.2.265/src/ops.c	2009-07-01 18:04:30.000000000 +0200
--- src/ops.c	2009-09-23 19:11:40.000000000 +0200
***************
*** 4473,4483 ****
      int		use_sandbox = was_set_insecurely((char_u *)"formatexpr",
  								   OPT_LOCAL);
      int		r;
- #ifdef FEAT_MBYTE
-     char_u	buf[MB_MAXBYTES];
- #else
-     char_u	buf[2];
- #endif
  
      /*
       * Set v:lnum to the first line number and v:count to the number of lines.
--- 4473,4478 ----
***************
*** 4485,4501 ****
       */
      set_vim_var_nr(VV_LNUM, lnum);
      set_vim_var_nr(VV_COUNT, count);
! 
! #ifdef FEAT_MBYTE
!     if (has_mbyte)
! 	buf[(*mb_char2bytes)(c, buf)] = NUL;
!     else
! #endif
!     {
! 	buf[0] = c;
! 	buf[1] = NUL;
!     }
!     set_vim_var_string(VV_CHAR, buf, -1);
  
      /*
       * Evaluate the function.
--- 4480,4486 ----
       */
      set_vim_var_nr(VV_LNUM, lnum);
      set_vim_var_nr(VV_COUNT, count);
!     set_vim_var_char(c);
  
      /*
       * Evaluate the function.
*** ../vim-7.2.265/src/proto/eval.pro	2008-11-20 16:11:03.000000000 +0100
--- src/proto/eval.pro	2009-09-23 19:36:30.000000000 +0200
***************
*** 61,66 ****
--- 61,67 ----
  long get_vim_var_nr __ARGS((int idx));
  char_u *get_vim_var_str __ARGS((int idx));
  list_T *get_vim_var_list __ARGS((int idx));
+ void set_vim_var_char __ARGS((int c));
  void set_vcount __ARGS((long count, long count1, int set_prevcount));
  void set_vim_var_string __ARGS((int idx, char_u *val, int len));
  void set_vim_var_list __ARGS((int idx, list_T *val));
*** ../vim-7.2.265/src/version.c	2009-09-30 13:23:57.000000000 +0200
--- src/version.c	2009-09-30 15:11:29.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     266,
  /**/

-- 
Life would be so much easier if we could just look at the source code.

 /// 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    ///


--- NEW FILE 7.2.267 ---
To: vim-dev at vim.org
Subject: Patch 7.2.267
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.267
Problem:    Crash for narrow window and double-width character.
Solution:   Check for zero width.  (Taro Muraoka)
Files:	    src/charset.c


*** ../vim-7.2.266/src/charset.c	2009-09-11 14:02:25.000000000 +0200
--- src/charset.c	2009-10-07 16:17:27.000000000 +0200
***************
*** 1218,1223 ****
--- 1218,1225 ----
      if ((int)vcol == width1 - 1)
  	return TRUE;
      width2 = width1 + win_col_off2(wp);
+     if (width2 <= 0)
+ 	return FALSE;
      return ((vcol - width1) % width2 == width2 - 1);
  }
  #endif /* FEAT_MBYTE */
*** ../vim-7.2.266/src/version.c	2009-09-30 15:15:33.000000000 +0200
--- src/version.c	2009-10-07 16:19:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     267,
  /**/

-- 
You got to work at a mill?  Lucky!  I got sent back to work in the
acid-mines for my daily crust of stale bread... which not even the
birds would eat.

 /// 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    ///


--- NEW FILE 7.2.268 ---
To: vim-dev at vim.org
Subject: Patch 7.2.268
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.268
Problem:    Crash when using Python to set cursor beyond end of line.
	    (winterTTr)
Solution:   Check the column to be valid.
Files:	    src/if_python.c


*** ../vim-7.2.267/src/if_python.c	2009-07-09 20:06:30.000000000 +0200
--- src/if_python.c	2009-10-10 14:49:10.000000000 +0200
***************
*** 2058,2063 ****
--- 2058,2064 ----
      {
  	long lnum;
  	long col;
+ 	long len;
  
  	if (!PyArg_Parse(val, "(ll)", &lnum, &col))
  	    return -1;
***************
*** 2072,2081 ****
  	if (VimErrorCheck())
  	    return -1;
  
! 	/* NO CHECK ON COLUMN - SEEMS NOT TO MATTER */
  
  	this->win->w_cursor.lnum = lnum;
  	this->win->w_cursor.col = col;
  	update_screen(VALID);
  
  	return 0;
--- 2073,2088 ----
  	if (VimErrorCheck())
  	    return -1;
  
! 	/* When column is out of range silently correct it. */
! 	len = STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
! 	if (col > len)
! 	    col = len;
  
  	this->win->w_cursor.lnum = lnum;
  	this->win->w_cursor.col = col;
+ #ifdef FEAT_VIRTUALEDIT
+ 	this->win->w_cursor.coladd = 0;
+ #endif
  	update_screen(VALID);
  
  	return 0;
*** ../vim-7.2.267/src/version.c	2009-10-07 16:19:52.000000000 +0200
--- src/version.c	2009-11-03 11:42:08.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     268,
  /**/

-- 
VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur
            and his knights seemed hopeless,  when, suddenly ... the animator
            suffered a fatal heart attack.
ANIMATOR:   Aaaaagh!
VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could
            continue.
                 "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    ///


--- NEW FILE 7.2.269 ---
To: vim-dev at vim.org
Subject: Patch 7.2.269
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.269
Problem:    Many people struggle to find out why Vim startup is slow.
Solution:   Add the --startuptime command line flag.
Files:	    runtime/doc/starting.txt, src/globals.h, src/feature.h,
	    src/main.c, src/macros.h


*** ../vim-7.2.268/runtime/doc/starting.txt	2008-11-09 13:43:25.000000000 +0100
--- runtime/doc/starting.txt	2009-10-25 11:57:51.000000000 +0100
***************
*** 144,149 ****
--- 144,156 ----
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
+ --startuptime={fname}					*--startuptime*
+ 		During startup write timing messages to the file {fname}.
+ 		This can be used to find out where time is spent while loading
+ 		your .vimrc and plugins.
+ 		When {fname} already exists new messages are appended.
+ 		{only when compiled with this feature}
+ 
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
  		for Unix, because Vim always takes file names literally (the
***************
*** 471,476 ****
--- 487,493 ----
  		window title and copy/paste using the X clipboard.  This
  		avoids a long startup time when running Vim in a terminal
  		emulator and the connection to the X server is slow.
+ 		See |--startuptime| to find out if affects you.
  		Only makes a difference on Unix or VMS, when compiled with the
  		|+X11| feature.  Otherwise it's ignored.
  		To disable the connection only for specific terminals, see the
*** ../vim-7.2.268/src/globals.h	2009-07-29 12:09:49.000000000 +0200
--- src/globals.h	2009-10-10 15:14:31.000000000 +0200
***************
*** 1567,1572 ****
--- 1567,1576 ----
  /* For undo we need to know the lowest time possible. */
  EXTERN time_t starttime;
  
+ #ifdef STARTUPTIME
+ EXTERN FILE *time_fd INIT(= NULL);  /* where to write startup timing */
+ #endif
+ 
  /*
   * Some compilers warn for not using a return value, but in some situations we
   * can't do anything useful with the value.  Assign to this variable to avoid
*** ../vim-7.2.268/src/feature.h	2008-11-09 13:43:25.000000000 +0100
--- src/feature.h	2009-10-10 16:16:19.000000000 +0200
***************
*** 844,853 ****
  /* #define DEBUG */
  
  /*
!  * STARTUPTIME		Time the startup process.  Writes a "vimstartup" file
!  *			with timestamps.
   */
! /* #define STARTUPTIME "vimstartup" */
  
  /*
   * MEM_PROFILE		Debugging of memory allocation and freeing.
--- 844,857 ----
  /* #define DEBUG */
  
  /*
!  * STARTUPTIME		Time the startup process.  Writes a file with
!  *			timestamps.
   */
! #if defined(FEAT_NORMAL) \
! 	&& ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
! 		|| defined(WIN3264))
! # define STARTUPTIME 1
! #endif
  
  /*
   * MEM_PROFILE		Debugging of memory allocation and freeing.
*** ../vim-7.2.268/src/main.c	2009-05-26 22:58:43.000000000 +0200
--- src/main.c	2009-10-10 16:18:32.000000000 +0200
***************
*** 130,139 ****
  #endif
  
  
- #ifdef STARTUPTIME
- static FILE *time_fd = NULL;
- #endif
- 
  /*
   * Different types of error messages.
   */
--- 130,135 ----
***************
*** 173,178 ****
--- 169,177 ----
      char_u	*fname = NULL;		/* file name from command line */
      mparm_T	params;			/* various parameters passed between
  					 * main() and other functions. */
+ #ifdef STARTUPTIME
+     int		i;
+ #endif
  
      /*
       * Do any system-specific initialisations.  These can NOT use IObuff or
***************
*** 203,210 ****
  #endif
  
  #ifdef STARTUPTIME
!     time_fd = mch_fopen(STARTUPTIME, "a");
!     TIME_MSG("--- VIM STARTING ---");
  #endif
      starttime = time(NULL);
  
--- 202,216 ----
  #endif
  
  #ifdef STARTUPTIME
!     for (i = 1; i < argc; ++i)
!     {
! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
! 	{
! 	    time_fd = mch_fopen(argv[i] + 14, "a");
! 	    TIME_MSG("--- VIM STARTING ---");
! 	    break;
! 	}
!     }
  #endif
      starttime = time(NULL);
  
***************
*** 1150,1155 ****
--- 1156,1173 ----
  	    cursor_on();
  
  	    do_redraw = FALSE;
+ 
+ #ifdef STARTUPTIME
+ 	    /* Now that we have drawn the first screen all the startup stuff
+ 	     * has been done, close any file for startup messages. */
+ 	    if (time_fd != NULL)
+ 	    {
+ 		TIME_MSG("first screen update");
+ 		TIME_MSG("--- VIM STARTED ---");
+ 		fclose(time_fd);
+ 		time_fd = NULL;
+ 	    }
+ #endif
  	}
  #ifdef FEAT_GUI
  	if (need_mouse_correct)
***************
*** 1743,1748 ****
--- 1761,1770 ----
  		    /* already processed, skip */
  		}
  #endif
+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ 		{
+ 		    /* already processed, skip */
+ 		}
  		else
  		{
  		    if (argv[0][argv_idx])
***************
*** 3211,3216 ****
--- 3233,3252 ----
  
  static struct timeval	prev_timeval;
  
+ # ifdef WIN3264
+ /*
+  * Windows doesn't have gettimeofday(), although it does have struct timeval.
+  */
+     static int
+ gettimeofday(struct timeval *tv, char *dummy)
+ {
+     long t = clock();
+     tv->tv_sec = t / CLOCKS_PER_SEC;
+     tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
+     return 0;
+ }
+ # endif
+ 
  /*
   * Save the previous time before doing something that could nest.
   * set "*tv_rel" to the time elapsed so far.
***************
*** 3299,3318 ****
      }
  }
  
- # ifdef WIN3264
- /*
-  * Windows doesn't have gettimeofday(), although it does have struct timeval.
-  */
-     int
- gettimeofday(struct timeval *tv, char *dummy)
- {
-     long t = clock();
-     tv->tv_sec = t / CLOCKS_PER_SEC;
-     tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
-     return 0;
- }
- # endif
- 
  #endif
  
  #if defined(FEAT_CLIENTSERVER) || defined(PROTO)
--- 3335,3340 ----
*** ../vim-7.2.268/src/macros.h	2009-05-17 13:30:58.000000000 +0200
--- src/macros.h	2009-10-10 15:19:07.000000000 +0200
***************
*** 243,249 ****
  #endif
  
  #ifdef STARTUPTIME
! # define TIME_MSG(s) time_msg(s, NULL)
  #else
  # define TIME_MSG(s)
  #endif
--- 243,249 ----
  #endif
  
  #ifdef STARTUPTIME
! # define TIME_MSG(s) { if (time_fd != NULL) time_msg(s, NULL); }
  #else
  # define TIME_MSG(s)
  #endif
*** ../vim-7.2.268/src/version.c	2009-11-03 11:43:05.000000000 +0100
--- src/version.c	2009-11-03 12:06:31.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     269,
  /**/

-- 
BEDEVERE: Look!  It's the old man from scene 24 - what's he Doing here?
ARTHUR:   He is the keeper of the Bridge.  He asks each traveler five
          questions ...
GALAHAD:  Three questions.
                 "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    ///


--- NEW FILE 7.2.270 ---
To: vim-dev at vim.org
Subject: Patch 7.2.270
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.270
Problem:    Using ":@c" when the c register contains a CR causes the rest to
	    be executed later. (Dexter Douglas)
Solution:   Don't check for typeahead to start with ':', keep executing
	    commands until all added typeahead has been used.
Files:	    src/ex_docmd.c


*** ../vim-7.2.269/src/ex_docmd.c	2009-09-30 13:23:57.000000000 +0200
--- src/ex_docmd.c	2009-10-28 12:06:54.000000000 +0100
***************
*** 8358,8363 ****
--- 8358,8364 ----
      exarg_T	*eap;
  {
      int		c;
+     int		prev_len = typebuf.tb_len;
  
      curwin->w_cursor.lnum = eap->line2;
  
***************
*** 8383,8393 ****
  
  	/*
  	 * Execute from the typeahead buffer.
! 	 * Originally this didn't check for the typeahead buffer to be empty,
! 	 * thus could read more Ex commands from stdin.  It's not clear why,
! 	 * it is certainly unexpected.
  	 */
! 	while ((!stuff_empty() || typebuf.tb_len > 0) && vpeekc() == ':')
  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
  
  	exec_from_reg = save_efr;
--- 8384,8393 ----
  
  	/*
  	 * Execute from the typeahead buffer.
! 	 * Continue until the stuff buffer is empty and all added characters
! 	 * have been consumed.
  	 */
! 	while (!stuff_empty() || typebuf.tb_len > prev_len)
  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
  
  	exec_from_reg = save_efr;
*** ../vim-7.2.269/src/version.c	2009-11-03 12:10:39.000000000 +0100
--- src/version.c	2009-11-03 12:32:47.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     270,
  /**/

-- 
To the optimist, the glass is half full.
To the pessimist, the glass is half empty.
To the engineer, the glass is twice as big as it needs to be.

 /// 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    ///


--- NEW FILE 7.2.271 ---
To: vim-dev at vim.org
Subject: Patch 7.2.271
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.271
Problem:    Using freed memory in Motif GUI version when making a choice.
Solution:   Free memory only after using it. (Dominique Pelle)
Files:	    src/gui_xmdlg.c


*** ../vim-7.2.270/src/gui_xmdlg.c	2009-05-21 23:25:38.000000000 +0200
--- src/gui_xmdlg.c	2009-10-28 21:56:15.000000000 +0100
***************
*** 10,16 ****
  /*
   * (C) 2001,2005 by Marcin Dalecki <martin at dalecki.de>
   *
!  * Implementation of dialogue functions for the Motif GUI variant.
   *
   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
   * when using a dynamic scrollbar policy.
--- 10,16 ----
  /*
   * (C) 2001,2005 by Marcin Dalecki <martin at dalecki.de>
   *
!  * Implementation of dialog functions for the Motif GUI variant.
   *
   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
   * when using a dynamic scrollbar policy.
***************
*** 633,648 ****
  	data->sel[which] = XtNewString(sel);
      else
      {
- 	XtFree(data->sel[which]);
  	if (!strcmp(data->sel[which], sel))
  	{
  	    /* unselecting current selection */
  	    data->sel[which] = NULL;
  	    if (w)
  		XmListDeselectItem(w, call_data->item);
  	}
  	else
  	    data->sel[which] = XtNewString(sel);
      }
      XtFree(sel);
  
--- 633,651 ----
  	data->sel[which] = XtNewString(sel);
      else
      {
  	if (!strcmp(data->sel[which], sel))
  	{
  	    /* unselecting current selection */
+ 	    XtFree(data->sel[which]);
  	    data->sel[which] = NULL;
  	    if (w)
  		XmListDeselectItem(w, call_data->item);
  	}
  	else
+ 	{
+ 	    XtFree(data->sel[which]);
  	    data->sel[which] = XtNewString(sel);
+ 	}
      }
      XtFree(sel);
  
*** ../vim-7.2.270/src/version.c	2009-11-03 12:38:50.000000000 +0100
--- src/version.c	2009-11-03 12:48:26.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     271,
  /**/

-- 
ROBIN:  (warily) And if you get a question wrong?
ARTHUR: You are cast into the Gorge of Eternal Peril.
ROBIN:  Oh ... wacho!
                 "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    ///


--- NEW FILE 7.2.272 ---
To: vim-dev at vim.org
Subject: Patch 7.2.272
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.272
Problem:    "_.svz" is not recognized as a swap file. (David M. Besonen)
Solution:   Accept .s[uvw][a-z] as a swap file name extension.
Files:	    src/memline.c


*** ../vim-7.2.271/src/memline.c	2009-04-22 15:56:27.000000000 +0200
--- src/memline.c	2009-10-29 20:55:08.000000000 +0100
***************
*** 864,884 ****
      recoverymode = TRUE;
      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
      attr = hl_attr(HLF_E);
! /*
!  * If the file name ends in ".sw?" we use it directly.
!  * Otherwise a search is done to find the swap file(s).
!  */
      fname = curbuf->b_fname;
      if (fname == NULL)		    /* When there is no file name */
  	fname = (char_u *)"";
      len = (int)STRLEN(fname);
      if (len >= 4 &&
  #if defined(VMS) || defined(RISCOS)
! 	    STRNICMP(fname + len - 4, "_sw" , 3)
  #else
! 	    STRNICMP(fname + len - 4, ".sw" , 3)
  #endif
! 		== 0)
      {
  	directly = TRUE;
  	fname = vim_strsave(fname); /* make a copy for mf_open() */
--- 864,887 ----
      recoverymode = TRUE;
      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
      attr = hl_attr(HLF_E);
! 
!     /*
!      * If the file name ends in ".s[uvw][a-z]" we assume this is the swap file.
!      * Otherwise a search is done to find the swap file(s).
!      */
      fname = curbuf->b_fname;
      if (fname == NULL)		    /* When there is no file name */
  	fname = (char_u *)"";
      len = (int)STRLEN(fname);
      if (len >= 4 &&
  #if defined(VMS) || defined(RISCOS)
! 	    STRNICMP(fname + len - 4, "_s" , 2)
  #else
! 	    STRNICMP(fname + len - 4, ".s" , 2)
  #endif
! 		== 0
! 		&& vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
! 		&& ASCII_ISALPHA(fname[len - 1]))
      {
  	directly = TRUE;
  	fname = vim_strsave(fname); /* make a copy for mf_open() */
*** ../vim-7.2.271/src/version.c	2009-11-03 12:53:44.000000000 +0100
--- src/version.c	2009-11-03 13:02:51.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     272,
  /**/

-- 
Sorry, no fortune today.

 /// 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    ///


--- NEW FILE 7.2.273 ---
To: vim-dev at vim.org
Subject: Patch 7.2.273
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.273
Problem:    Crash with redir to unknown array. (Christian Brabandt)
Solution:   Don't assign the redir result when there was an error.
Files:	    src/eval.c


*** ../vim-7.2.272/src/eval.c	2009-09-30 15:15:33.000000000 +0200
--- src/eval.c	2009-11-03 12:05:07.000000000 +0100
***************
*** 988,1000 ****
      int		err;
      typval_T	tv;
  
!     /* Make sure a valid variable name is specified */
      if (!eval_isnamec1(*name))
      {
  	EMSG(_(e_invarg));
  	return FAIL;
      }
  
      redir_varname = vim_strsave(name);
      if (redir_varname == NULL)
  	return FAIL;
--- 988,1001 ----
      int		err;
      typval_T	tv;
  
!     /* Catch a bad name early. */
      if (!eval_isnamec1(*name))
      {
  	EMSG(_(e_invarg));
  	return FAIL;
      }
  
+     /* Make a copy of the name, it is used in redir_lval until redir ends. */
      redir_varname = vim_strsave(name);
      if (redir_varname == NULL)
  	return FAIL;
***************
*** 1019,1024 ****
--- 1020,1026 ----
  	    EMSG(_(e_trailing));
  	else
  	    EMSG(_(e_invarg));
+ 	redir_endp = NULL;  /* don't store a value, only cleanup */
  	var_redir_stop();
  	return FAIL;
      }
***************
*** 1037,1042 ****
--- 1039,1045 ----
      did_emsg |= save_emsg;
      if (err)
      {
+ 	redir_endp = NULL;  /* don't store a value, only cleanup */
  	var_redir_stop();
  	return FAIL;
      }
***************
*** 1085,1090 ****
--- 1088,1094 ----
  
  /*
   * Stop redirecting command output to a variable.
+  * Frees the allocated memory.
   */
      void
  var_redir_stop()
***************
*** 1093,1106 ****
  
      if (redir_lval != NULL)
      {
! 	/* Append the trailing NUL. */
! 	ga_append(&redir_ga, NUL);
  
! 	/* Assign the text to the variable. */
! 	tv.v_type = VAR_STRING;
! 	tv.vval.v_string = redir_ga.ga_data;
! 	set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
! 	vim_free(tv.vval.v_string);
  
  	clear_lval(redir_lval);
  	vim_free(redir_lval);
--- 1097,1114 ----
  
      if (redir_lval != NULL)
      {
! 	/* If there was no error: assign the text to the variable. */
! 	if (redir_endp != NULL)
! 	{
! 	    ga_append(&redir_ga, NUL);  /* Append the trailing NUL. */
! 	    tv.v_type = VAR_STRING;
! 	    tv.vval.v_string = redir_ga.ga_data;
! 	    set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
! 	}
  
! 	/* free the collected output */
! 	vim_free(redir_ga.ga_data);
! 	redir_ga.ga_data = NULL;
  
  	clear_lval(redir_lval);
  	vim_free(redir_lval);
*** ../vim-7.2.272/src/version.c	2009-11-03 13:06:03.000000000 +0100
--- src/version.c	2009-11-03 14:24:06.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     273,
  /**/

-- 
Permission is granted to read this message out aloud on Kings Cross Road,
London, under the condition that the orator is properly dressed.

 /// 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    ///


--- NEW FILE 7.2.274 ---
To: vim-dev at vim.org
Subject: Patch 7.2.274
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.274
Problem:    Syntax folding doesn't work properly when adding a comment.
Solution:   Fix it and add a test. (Lech Lorens)
Files:	    src/fold.c, src/testdir/test45.in, src/testdir/test45.ok


*** ../vim-7.2.273/src/fold.c	2009-09-18 15:16:37.000000000 +0200
--- src/fold.c	2009-11-03 12:36:37.000000000 +0100
***************
*** 2256,2261 ****
--- 2256,2295 ----
  	}
      }
  
+     /*
+      * If folding is defined by the syntax, it is possible that a change in
+      * one line will cause all sub-folds of the current fold to change (e.g.,
+      * closing a C-style comment can cause folds in the subsequent lines to
+      * appear). To take that into account we should adjust the value of "bot"
+      * to point to the end of the current fold:
+      */
+     if (foldlevelSyntax == getlevel)
+     {
+ 	garray_T *gap = &wp->w_folds;
+ 	fold_T	 *fp = NULL;
+ 	int	  current_fdl = 0;
+ 	linenr_T  fold_start_lnum = 0;
+ 	linenr_T  lnum_rel = fline.lnum;
+ 
+ 	while (current_fdl < fline.lvl)
+ 	{
+ 	    if (!foldFind(gap, lnum_rel, &fp))
+ 		break;
+ 	    ++current_fdl;
+ 
+ 	    fold_start_lnum += fp->fd_top;
+ 	    gap = &fp->fd_nested;
+ 	    lnum_rel -= fp->fd_top;
+ 	}
+ 	if (fp != NULL && current_fdl == fline.lvl)
+ 	{
+ 	    linenr_T fold_end_lnum = fold_start_lnum + fp->fd_len;
+ 
+ 	    if (fold_end_lnum > bot)
+ 		bot = fold_end_lnum;
+ 	}
+     }
+ 
      start = fline.lnum;
      end = bot;
      /* Do at least one line. */
*** ../vim-7.2.273/src/testdir/test45.in	2007-09-25 17:58:43.000000000 +0200
--- src/testdir/test45.in	2009-11-03 12:22:38.000000000 +0100
***************
*** 28,36 ****
  k:call append("$", foldlevel("."))
  :" test syntax folding
  :set fdm=syntax fdl=0
! :syn region Hup start="dd" end="hh" fold
  Gzk:call append("$", "folding " . getline("."))
  k:call append("$", getline("."))
  :" test expression folding
  :fun Flvl()
    let l = getline(v:lnum)
--- 28,41 ----
  k:call append("$", foldlevel("."))
  :" test syntax folding
  :set fdm=syntax fdl=0
! :syn region Hup start="dd" end="ii" fold contains=Fd1,Fd2,Fd3
! :syn region Fd1 start="ee" end="ff" fold contained
! :syn region Fd2 start="gg" end="hh" fold contained
! :syn region Fd3 start="commentstart" end="commentend" fold contained
  Gzk:call append("$", "folding " . getline("."))
  k:call append("$", getline("."))
+ jAcommentstart  Acommentend:set fdl=1
+ 3j:call append("$", getline("."))
  :" test expression folding
  :fun Flvl()
    let l = getline(v:lnum)
*** ../vim-7.2.273/src/testdir/test45.ok	2004-06-13 17:47:37.000000000 +0200
--- src/testdir/test45.ok	2009-11-03 12:22:50.000000000 +0100
***************
*** 8,15 ****
  0
  indent 2
  1
! folding 8 hh
      3 cc
  expr 2
  1
  2
--- 8,16 ----
  0
  indent 2
  1
! folding 9 ii
      3 cc
+ 7 gg
  expr 2
  1
  2
*** ../vim-7.2.273/src/version.c	2009-11-03 14:26:29.000000000 +0100
--- src/version.c	2009-11-03 14:44:21.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     274,
  /**/

-- 
BRIDGEKEEPER: What is your favorite colour?
LAUNCELOT:    Blue.
BRIDGEKEEPER: Right.  Off you go.
                 "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    ///


--- NEW FILE 7.2.275 ---
To: vim-dev at vim.org
Subject: Patch 7.2.275
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.275
Problem:    Warning for unused argument and comparing signed and unsigned.
Solution:   Add type cast.
Files:	    src/memline.c


*** ../vim-7.2.274/src/memline.c	2009-11-03 13:06:03.000000000 +0100
--- src/memline.c	2009-10-29 20:55:08.000000000 +0100
***************
*** 1285,1291 ****
  		    for (i = 0; i < dp->db_line_count; ++i)
  		    {
  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
! 			if (txt_start <= HEADER_SIZE
  					  || txt_start >= (int)dp->db_txt_end)
  			{
  			    p = (char_u *)"???";
--- 1285,1291 ----
  		    for (i = 0; i < dp->db_line_count; ++i)
  		    {
  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
! 			if (txt_start <= (int)HEADER_SIZE
  					  || txt_start >= (int)dp->db_txt_end)
  			{
  			    p = (char_u *)"???";
***************
*** 1296,1302 ****
  			ml_append(lnum++, p, (colnr_T)0, TRUE);
  		    }
  		    if (has_error)
! 			ml_append(lnum++, (char_u *)_("???END"), (colnr_T)0, TRUE);
  		}
  	    }
  	}
--- 1296,1303 ----
  			ml_append(lnum++, p, (colnr_T)0, TRUE);
  		    }
  		    if (has_error)
! 			ml_append(lnum++, (char_u *)_("???END"),
! 							    (colnr_T)0, TRUE);
  		}
  	    }
  	}
***************
*** 3576,3586 ****
   * Make swap file name out of the file name and a directory name.
   * Returns pointer to allocated memory or NULL.
   */
- /*ARGSUSED*/
      char_u *
  makeswapname(fname, ffname, buf, dir_name)
      char_u	*fname;
!     char_u	*ffname;
      buf_T	*buf;
      char_u	*dir_name;
  {
--- 3577,3586 ----
   * Make swap file name out of the file name and a directory name.
   * Returns pointer to allocated memory or NULL.
   */
      char_u *
  makeswapname(fname, ffname, buf, dir_name)
      char_u	*fname;
!     char_u	*ffname UNUSED;
      buf_T	*buf;
      char_u	*dir_name;
  {
*** ../vim-7.2.274/src/version.c	2009-11-03 14:46:35.000000000 +0100
--- src/version.c	2009-11-03 15:28:33.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     275,
  /**/

-- 
BRIDGEKEEPER: What is your favorite colour?
GAWAIN:       Blue ...  No yelloooooww!
                 "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    ///


--- NEW FILE 7.2.276 ---
To: vim-dev at vim.org
Subject: Patch 7.2.276
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.276
Problem:    Crash when setting 'isprint' to a small bullet. (Raul Coronado)
Solution:   Check for the character to be < 256.  Also make it possible to
	    specify a range of multi-byte characters. (Lech Lorens)
Files:	    src/charset.c


*** ../vim-7.2.275/src/charset.c	2009-10-07 16:19:52.000000000 +0200
--- src/charset.c	2009-11-03 12:46:12.000000000 +0100
***************
*** 187,195 ****
  		if (VIM_ISDIGIT(*p))
  		    c2 = getdigits(&p);
  		else
  		    c2 = *p++;
  	    }
! 	    if (c <= 0 || (c2 < c && c2 != -1) || c2 >= 256
  						 || !(*p == NUL || *p == ','))
  		return FAIL;
  
--- 187,200 ----
  		if (VIM_ISDIGIT(*p))
  		    c2 = getdigits(&p);
  		else
+ #ifdef FEAT_MBYTE
+ 		     if (has_mbyte)
+ 		    c2 = mb_ptr2char_adv(&p);
+ 		else
+ #endif
  		    c2 = *p++;
  	    }
! 	    if (c <= 0 || c >= 256 || (c2 < c && c2 != -1) || c2 >= 256
  						 || !(*p == NUL || *p == ','))
  		return FAIL;
  
*** ../vim-7.2.275/src/version.c	2009-11-03 15:32:58.000000000 +0100
--- src/version.c	2009-11-03 16:03:18.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     276,
  /**/

-- 
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    ///


--- NEW FILE 7.2.277 ---
To: vim-dev at vim.org
Subject: Patch 7.2.277
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.277
Problem:    CTRL-Y in a diff'ed window may move the cursor outside of the
	    window. (Lech Lorens)
Solution:   Limit the number of filler lines to the height of the window.
	    Don't reset filler lines to zero for an empty buffer.
Files:	    src/move.c


*** ../vim-7.2.276/src/move.c	2009-05-15 21:31:11.000000000 +0200
--- src/move.c	2009-11-03 14:39:55.000000000 +0100
***************
*** 183,191 ****
  	if (curwin->w_topline != 1)
  	    redraw_later(NOT_VALID);
  	curwin->w_topline = 1;
- #ifdef FEAT_DIFF
- 	curwin->w_topfill = 0;
- #endif
  	curwin->w_botline = 2;
  	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
  #ifdef FEAT_SCROLLBIND
--- 183,188 ----
***************
*** 1257,1263 ****
      while (line_count-- > 0)
      {
  #ifdef FEAT_DIFF
! 	if (curwin->w_topfill < diff_check(curwin, curwin->w_topline))
  	{
  	    ++curwin->w_topfill;
  	    ++done;
--- 1254,1261 ----
      while (line_count-- > 0)
      {
  #ifdef FEAT_DIFF
! 	if (curwin->w_topfill < diff_check(curwin, curwin->w_topline)
! 		&& curwin->w_topfill < curwin->w_height - 1)
  	{
  	    ++curwin->w_topfill;
  	    ++done;
*** ../vim-7.2.276/src/version.c	2009-11-03 16:03:59.000000000 +0100
--- src/version.c	2009-11-03 16:22:04.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     277,
  /**/

-- 
SIGFUN -- signature too funny (core dumped)

 /// 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    ///


--- NEW FILE 7.2.278 ---
To: vim-dev at vim.org
Subject: Patch 7.2.278
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.278
Problem:    Using magic number in the folding code.
Solution:   Use the defined MAX_LEVEL.
Files:	    src/fold.c


*** ../vim-7.2.277/src/fold.c	2009-11-03 14:46:35.000000000 +0100
--- src/fold.c	2009-11-03 12:36:37.000000000 +0100
***************
*** 1932,1938 ****
  #ifdef FEAT_EVAL
      if (*wp->w_p_fdt != NUL)
      {
! 	char_u	dashes[51];
  	win_T	*save_curwin;
  	int	level;
  	char_u	*p;
--- 1932,1938 ----
  #ifdef FEAT_EVAL
      if (*wp->w_p_fdt != NUL)
      {
! 	char_u	dashes[MAX_LEVEL + 2];
  	win_T	*save_curwin;
  	int	level;
  	char_u	*p;
***************
*** 1944,1951 ****
  	/* Set "v:folddashes" to a string of "level" dashes. */
  	/* Set "v:foldlevel" to "level". */
  	level = foldinfo->fi_level;
! 	if (level > 50)
! 	    level = 50;
  	vim_memset(dashes, '-', (size_t)level);
  	dashes[level] = NUL;
  	set_vim_var_string(VV_FOLDDASHES, dashes, -1);
--- 1944,1951 ----
  	/* Set "v:folddashes" to a string of "level" dashes. */
  	/* Set "v:foldlevel" to "level". */
  	level = foldinfo->fi_level;
! 	if (level > (int)sizeof(dashes) - 1)
! 	    level = (int)sizeof(dashes) - 1;
  	vim_memset(dashes, '-', (size_t)level);
  	dashes[level] = NUL;
  	set_vim_var_string(VV_FOLDDASHES, dashes, -1);
*** ../vim-7.2.277/src/version.c	2009-11-03 16:22:59.000000000 +0100
--- src/version.c	2009-11-03 16:29:08.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     278,
  /**/

-- 
BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
ARTHUR:       What do you mean?  An African or European swallow?
BRIDGEKEEPER: Er ...  I don't know that ... Aaaaarrrrrrggghhh!
   BRIDGEKEEPER is cast into the gorge.
                 "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    ///


--- NEW FILE 7.2.279 ---
To: vim-dev at vim.org
Subject: Patch 7.2.279
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.279
Problem:    Invalid memory read with visual mode "r". (Dominique Pelle)
Solution:   Make sure the cursor position is valid.  Don't check the cursor
	    position but the position being used.  And make sure we get the
	    right line.
Files:	    src/misc2.c, src/ops.c


*** ../vim-7.2.278/src/misc2.c	2009-05-16 21:06:36.000000000 +0200
--- src/misc2.c	2009-11-03 16:43:10.000000000 +0100
***************
*** 156,162 ****
  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
  #endif
  		    ;
!     line = ml_get_curline();
  
      if (wcol >= MAXCOL)
      {
--- 156,162 ----
  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
  #endif
  		    ;
!     line = ml_get_buf(curbuf, pos->lnum, FALSE);
  
      if (wcol >= MAXCOL)
      {
***************
*** 332,340 ****
  #endif
  
  #ifdef FEAT_MBYTE
!     /* prevent cursor from moving on the trail byte */
      if (has_mbyte)
! 	mb_adjust_cursor();
  #endif
  
      if (col < wcol)
--- 332,340 ----
  #endif
  
  #ifdef FEAT_MBYTE
!     /* prevent from moving onto a trail byte */
      if (has_mbyte)
! 	mb_adjustpos(pos);
  #endif
  
      if (col < wcol)
*** ../vim-7.2.278/src/ops.c	2009-09-30 15:15:33.000000000 +0200
--- src/ops.c	2009-11-03 15:18:50.000000000 +0100
***************
*** 2020,2025 ****
--- 2020,2026 ----
  	bd.is_MAX = (curwin->w_curswant == MAXCOL);
  	for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
  	{
+ 	    curwin->w_cursor.col = 0;  /* make sure cursor position is valid */
  	    block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
  	    if (bd.textlen == 0 && (!virtual_op || bd.is_MAX))
  		continue;	    /* nothing to replace */
***************
*** 2035,2040 ****
--- 2036,2042 ----
  	    {
  		pos_T vpos;
  
+ 		vpos.lnum = curwin->w_cursor.lnum;
  		getvpos(&vpos, oap->start_vcol);
  		bd.startspaces += vpos.coladd;
  		n = bd.startspaces;
***************
*** 2693,2703 ****
  			 * initial coladd offset as part of "startspaces" */
  			if (bd.is_short)
  			{
! 			    linenr_T lnum = curwin->w_cursor.lnum;
! 
! 			    curwin->w_cursor.lnum = linenr;
  			    (void)getvpos(&vpos, oap->start_vcol);
- 			    curwin->w_cursor.lnum = lnum;
  			}
  			else
  			    vpos.coladd = 0;
--- 2695,2702 ----
  			 * initial coladd offset as part of "startspaces" */
  			if (bd.is_short)
  			{
! 			    vpos.lnum = linenr;
  			    (void)getvpos(&vpos, oap->start_vcol);
  			}
  			else
  			    vpos.coladd = 0;
*** ../vim-7.2.278/src/version.c	2009-11-03 16:29:48.000000000 +0100
--- src/version.c	2009-11-03 16:41:53.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     279,
  /**/

-- 
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    ///


--- NEW FILE 7.2.280 ---
To: vim-dev at vim.org
Subject: Patch 7.2.280
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.280
Problem:    A redraw in a custom statusline with %! may cause a crash.
            (Yukihiro Nakadaira)
Solution:   Make a copy of 'statusline'.  Also fix typo in function name
            redraw_custum_statusline. (party by Dominique Pelle)
Files:      src/screen.c


*** ../vim-7.2.279/src/screen.c	2009-07-29 16:13:35.000000000 +0200
--- src/screen.c	2009-11-03 17:13:16.000000000 +0100
***************
*** 132,138 ****
  static void draw_vsep_win __ARGS((win_T *wp, int row));
  #endif
  #ifdef FEAT_STL_OPT
! static void redraw_custum_statusline __ARGS((win_T *wp));
  #endif
  #ifdef FEAT_SEARCH_EXTRA
  #define SEARCH_HL_PRIORITY 0
--- 132,138 ----
  static void draw_vsep_win __ARGS((win_T *wp, int row));
  #endif
  #ifdef FEAT_STL_OPT
! static void redraw_custom_statusline __ARGS((win_T *wp));
  #endif
  #ifdef FEAT_SEARCH_EXTRA
  #define SEARCH_HL_PRIORITY 0
***************
*** 5772,5778 ****
      else if (*p_stl != NUL || *wp->w_p_stl != NUL)
      {
  	/* redraw custom status line */
! 	redraw_custum_statusline(wp);
      }
  #endif
      else
--- 5794,5800 ----
      else if (*p_stl != NUL || *wp->w_p_stl != NUL)
      {
  	/* redraw custom status line */
! 	redraw_custom_statusline(wp);
      }
  #endif
      else
***************
*** 5897,5914 ****
   * errors encountered.
   */
      static void
! redraw_custum_statusline(wp)
      win_T	    *wp;
  {
!     int	save_called_emsg = called_emsg;
  
      called_emsg = FALSE;
      win_redr_custom(wp, FALSE);
      if (called_emsg)
  	set_string_option_direct((char_u *)"statusline", -1,
  		(char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
  					? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
      called_emsg |= save_called_emsg;
  }
  #endif
  
--- 5919,5949 ----
   * errors encountered.
   */
      static void
! redraw_custom_statusline(wp)
      win_T	    *wp;
  {
!     static int	    entered = FALSE;
!     int		    save_called_emsg = called_emsg;
! 
!     /* When called recursively return.  This can happen when the statusline
!      * contains an expression that triggers a redraw. */
!     if (entered)
! 	return;
!     entered = TRUE;
  
      called_emsg = FALSE;
      win_redr_custom(wp, FALSE);
      if (called_emsg)
+     {
+ 	/* When there is an error disable the statusline, otherwise the
+ 	 * display is messed up with errors and a redraw triggers the problem
+ 	 * again and again. */
  	set_string_option_direct((char_u *)"statusline", -1,
  		(char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
  					? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
+     }
      called_emsg |= save_called_emsg;
+     entered = FALSE;
  }
  #endif
  
***************
*** 6016,6021 ****
--- 6051,6057 ----
      int		len;
      int		fillchar;
      char_u	buf[MAXPATHL];
+     char_u	*stl;
      char_u	*p;
      struct	stl_hlrec hltab[STL_MAX_ITEM];
      struct	stl_hlrec tabtab[STL_MAX_ITEM];
***************
*** 6025,6031 ****
      if (wp == NULL)
      {
  	/* Use 'tabline'.  Always at the first line of the screen. */
! 	p = p_tal;
  	row = 0;
  	fillchar = ' ';
  	attr = hl_attr(HLF_TPF);
--- 6061,6067 ----
      if (wp == NULL)
      {
  	/* Use 'tabline'.  Always at the first line of the screen. */
! 	stl = p_tal;
  	row = 0;
  	fillchar = ' ';
  	attr = hl_attr(HLF_TPF);
***************
*** 6042,6058 ****
  
  	if (draw_ruler)
  	{
! 	    p = p_ruf;
  	    /* advance past any leading group spec - implicit in ru_col */
! 	    if (*p == '%')
  	    {
! 		if (*++p == '-')
! 		    p++;
! 		if (atoi((char *) p))
! 		    while (VIM_ISDIGIT(*p))
! 			p++;
! 		if (*p++ != '(')
! 		    p = p_ruf;
  	    }
  #ifdef FEAT_VERTSPLIT
  	    col = ru_col - (Columns - W_WIDTH(wp));
--- 6078,6094 ----
  
  	if (draw_ruler)
  	{
! 	    stl = p_ruf;
  	    /* advance past any leading group spec - implicit in ru_col */
! 	    if (*stl == '%')
  	    {
! 		if (*++stl == '-')
! 		    stl++;
! 		if (atoi((char *)stl))
! 		    while (VIM_ISDIGIT(*stl))
! 			stl++;
! 		if (*stl++ != '(')
! 		    stl = p_ruf;
  	    }
  #ifdef FEAT_VERTSPLIT
  	    col = ru_col - (Columns - W_WIDTH(wp));
***************
*** 6081,6089 ****
  	else
  	{
  	    if (*wp->w_p_stl != NUL)
! 		p = wp->w_p_stl;
  	    else
! 		p = p_stl;
  # ifdef FEAT_EVAL
  	    use_sandbox = was_set_insecurely((char_u *)"statusline",
  					 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL);
--- 6117,6125 ----
  	else
  	{
  	    if (*wp->w_p_stl != NUL)
! 		stl = wp->w_p_stl;
  	    else
! 		stl = p_stl;
  # ifdef FEAT_EVAL
  	    use_sandbox = was_set_insecurely((char_u *)"statusline",
  					 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL);
***************
*** 6098,6107 ****
      if (maxwidth <= 0)
  	return;
  
      width = build_stl_str_hl(wp == NULL ? curwin : wp,
  				buf, sizeof(buf),
! 				p, use_sandbox,
  				fillchar, maxwidth, hltab, tabtab);
      len = (int)STRLEN(buf);
  
      while (width < maxwidth && len < (int)sizeof(buf) - 1)
--- 6134,6147 ----
      if (maxwidth <= 0)
  	return;
  
+     /* Make a copy, because the statusline may include a function call that
+      * might change the option value and free the memory. */
+     stl = vim_strsave(stl);
      width = build_stl_str_hl(wp == NULL ? curwin : wp,
  				buf, sizeof(buf),
! 				stl, use_sandbox,
  				fillchar, maxwidth, hltab, tabtab);
+     vim_free(stl);
      len = (int)STRLEN(buf);
  
      while (width < maxwidth && len < (int)sizeof(buf) - 1)
***************
*** 9465,9471 ****
  #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
      if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
      {
! 	redraw_custum_statusline(curwin);
      }
      else
  #endif
--- 9505,9511 ----
  #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
      if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
      {
! 	redraw_custom_statusline(curwin);
      }
      else
  #endif
*** ../vim-7.2.279/src/version.c	2009-11-03 16:44:04.000000000 +0100
--- src/version.c	2009-11-03 17:15:35.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     280,
  /**/

-- 
Every exit is an entrance into something else.

 /// 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    ///


--- NEW FILE 7.2.281 ---
To: vim-dev at vim.org
Subject: Patch 7.2.281
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.281
Problem:    'cursorcolumn' highlighting is wrong in diff mode.
Solution:   Adjust the column computation. (Lech Lorens)
Files:	    src/screen.c


*** ../vim-7.2.280/src/screen.c	2009-11-03 17:20:18.000000000 +0100
--- src/screen.c	2009-11-03 17:13:16.000000000 +0100
***************
*** 3008,3018 ****
  	    mb_ptr_adv(ptr);
  	}
  
! #ifdef FEAT_VIRTUALEDIT
! 	/* When 'virtualedit' is set the end of the line may be before the
! 	 * start of the displayed part. */
! 	if (vcol < v && *ptr == NUL && virtual_active())
  	    vcol = v;
  #endif
  
  	/* Handle a character that's not completely on the screen: Put ptr at
--- 3008,3040 ----
  	    mb_ptr_adv(ptr);
  	}
  
! #if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
! 	/* When:
! 	 * - 'cuc' is set, or
! 	 * - 'virtualedit' is set, or
! 	 * - the visual mode is active,
! 	 * the end of the line may be before the start of the displayed part.
! 	 */
! 	if (vcol < v && (
! # ifdef FEAT_SYN_HL
! 	     wp->w_p_cuc
! #  if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
! 	     ||
! #  endif
! # endif
! # ifdef FEAT_VIRTUALEDIT
! 	     virtual_active()
! #  ifdef FEAT_VISUAL
! 	     ||
! #  endif
! # endif
! # ifdef FEAT_VISUAL
! 	     (VIsual_active && wp->w_buffer == curwin->w_buffer)
! # endif
! 	     ))
! 	{
  	    vcol = v;
+ 	}
  #endif
  
  	/* Handle a character that's not completely on the screen: Put ptr at
*** ../vim-7.2.280/src/version.c	2009-11-03 17:20:18.000000000 +0100
--- src/version.c	2009-11-03 17:34:54.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     281,
  /**/

-- 
Every person is responsible for the choices he makes.

 /// 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    ///


--- NEW FILE 7.2.282 ---
To: vim-dev at vim.org
Subject: Patch 7.2.282
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.282
Problem:    A fold can't be closed.
Solution:   Initialize fd_small to MAYBE. (Lech Lorens)
Files:	    src/fold.c


*** ../vim-7.2.281/src/fold.c	2009-11-03 16:29:48.000000000 +0100
--- src/fold.c	2009-11-03 17:41:50.000000000 +0100
***************
*** 2851,2856 ****
--- 2851,2858 ----
      fp[1].fd_top = bot + 1;
      fp[1].fd_len = fp->fd_len - (fp[1].fd_top - fp->fd_top);
      fp[1].fd_flags = fp->fd_flags;
+     fp[1].fd_small = MAYBE;
+     fp->fd_small = MAYBE;
  
      /* Move nested folds below bot to new fold.  There can't be
       * any between top and bot, they have been removed by the caller. */
*** ../vim-7.2.281/src/version.c	2009-11-03 17:36:09.000000000 +0100
--- src/version.c	2009-11-03 17:59:12.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     282,
  /**/

-- 
You can be stopped by the police for biking over 65 miles per hour.
You are not allowed to walk across a street on your hands.
		[real standing laws in Connecticut, 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    ///


--- NEW FILE 7.2.283 ---
To: vim-dev at vim.org
Subject: Patch 7.2.283
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.283
Problem:    Changing font while the window is maximized doesn't keep the
	    window maximized.
Solution:   Recompute number of lines and columns after changing font. (James
	    Vega)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.282/src/gui_gtk_x11.c	2009-09-23 18:14:13.000000000 +0200
--- src/gui_gtk_x11.c	2009-11-03 17:56:27.000000000 +0100
***************
*** 5267,5274 ****
  # endif
  #endif /* !HAVE_GTK2 */
  
!     /* Preserve the logical dimensions of the screen. */
!     update_window_manager_hints(0, 0);
  
      return OK;
  }
--- 5267,5290 ----
  # endif
  #endif /* !HAVE_GTK2 */
  
! #ifdef HAVE_GTK2
!     if (gui_mch_maximized())
!     {
! 	int w, h;
! 
! 	/* Update lines and columns in accordance with the new font, keep the
! 	 * window maximized. */
! 	gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
! 	w -= get_menu_tool_width();
! 	h -= get_menu_tool_height();
! 	gui_resize_shell(w, h);
!     }
!     else
! #endif
!     {
! 	/* Preserve the logical dimensions of the screen. */
! 	update_window_manager_hints(0, 0);
!     }
  
      return OK;
  }
*** ../vim-7.2.282/src/version.c	2009-11-03 18:04:26.000000000 +0100
--- src/version.c	2009-11-03 18:11:53.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     283,
  /**/

-- 
If an elephant is left tied to a parking meter, the parking fee has to be paid
just as it would for a vehicle.
		[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    ///


--- NEW FILE 7.2.284 ---
To: vim-dev at vim.org
Subject: Patch 7.2.284
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.284
Problem:    When editing the same buffer in two windows, one with folding,
	    display may be wrong after changes.
Solution:   Call set_topline() to take care of side effects. (Lech Lorens)
Files:	    src/misc1.c


*** ../vim-7.2.283/src/misc1.c	2009-07-22 11:03:38.000000000 +0200
--- src/misc1.c	2009-11-03 18:38:15.000000000 +0100
***************
*** 2886,2891 ****
--- 2886,2898 ----
  		    }
  #endif
  		}
+ 
+ #ifdef FEAT_FOLDING
+ 	    /* Take care of side effects for setting w_topline when folds have
+ 	     * changed.  Esp. when the buffer was changed in another window. */
+ 	    if (hasAnyFolding(wp))
+ 		set_topline(wp, wp->w_topline);
+ #endif
  	}
      }
  
*** ../vim-7.2.283/src/version.c	2009-11-03 18:13:36.000000000 +0100
--- src/version.c	2009-11-03 18:44:12.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     284,
  /**/

-- 
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    ///


--- NEW FILE 7.2.285 ---
To: vim-dev at vim.org
Subject: Patch 7.2.285
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.285 (after 7.2.169)
Problem:    CTRL-U in Insert mode also deletes indent. (Andrey Voropaev)
Solution:   Fix mistake made in patch 7.2.169.
Files:	    src/edit.c


*** ../vim-7.2.284/src/edit.c	2009-07-09 18:15:19.000000000 +0200
--- src/edit.c	2009-11-05 20:25:15.000000000 +0100
***************
*** 8519,8525 ****
  	{
  	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
! 	    if (curwin->w_cursor.col < (colnr_T)temp)
  		mincol = curwin->w_cursor.col;
  	    curwin->w_cursor.col = save_col;
  	}
--- 8519,8525 ----
  	{
  	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
! 	    if (curwin->w_cursor.col < save_col)
  		mincol = curwin->w_cursor.col;
  	    curwin->w_cursor.col = save_col;
  	}
*** ../vim-7.2.284/src/version.c	2009-11-03 18:46:53.000000000 +0100
--- src/version.c	2009-11-11 13:21:25.000000000 +0100
***************
*** 678,679 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     285,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      I would like to get back to the Censor and agree to lose the shits, take
      the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in
      your general direction', 'castanets of your testicles' and 'oral sex'
      and ask him for an 'A' rating on that basis.
                 "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    ///


--- NEW FILE 7.2.286 ---
To: vim-dev at vim.org
Subject: Patch 7.2.286
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.286 (after 7.2.269)
Problem:    The "--startuptime=<file>" argument is not consistent with other
	    arguments.
Solution:   Use "--startuptime <file>".  Added the +startuptime feature.
Files:	    runtime/doc/eval.txt, runtime/doc/starting.txt,
	    runtime/doc/various.txt, src/eval.c, src/main.c, src/version.c


*** ../vim-7.2.285/runtime/doc/eval.txt	2009-04-22 12:53:31.000000000 +0200
--- runtime/doc/eval.txt	2009-11-11 13:01:58.000000000 +0100
***************
*** 5869,5874 ****
--- 5881,5887 ----
  signs			Compiled with |:sign| support.
  smartindent		Compiled with 'smartindent' support.
  sniff			Compiled with SNiFF interface support.
+ startuptime		Compiled with |--startuptime| support.
  statusline		Compiled with support for 'statusline', 'rulerformat'
  			and special formats of 'titlestring' and 'iconstring'.
  sun_workshop		Compiled with support for Sun |workshop|.
*** ../vim-7.2.285/runtime/doc/starting.txt	2009-11-03 12:10:39.000000000 +0100
--- runtime/doc/starting.txt	2009-11-11 13:20:56.000000000 +0100
***************
*** 144,155 ****
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
! --startuptime={fname}					*--startuptime*
  		During startup write timing messages to the file {fname}.
  		This can be used to find out where time is spent while loading
! 		your .vimrc and plugins.
  		When {fname} already exists new messages are appended.
! 		{only when compiled with this feature}
  
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
--- 144,156 ----
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
! --startuptime {fname}					*--startuptime*
  		During startup write timing messages to the file {fname}.
  		This can be used to find out where time is spent while loading
! 		your .vimrc, plugins and opening the first file.
  		When {fname} already exists new messages are appended.
! 		(Only available when compiled with the |+startuptime|
! 		feature).
  
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
*** ../vim-7.2.285/runtime/doc/various.txt	2009-07-09 15:55:34.000000000 +0200
--- runtime/doc/various.txt	2009-11-11 13:03:52.000000000 +0100
***************
*** 374,379 ****
--- 374,380 ----
  B  *+signs*		|:sign|
  N  *+smartindent*	|'smartindent'|
  m  *+sniff*		SniFF interface |sniff|
+ N  *+startuptime*	|--startuptime| argument
  N  *+statusline*	Options 'statusline', 'rulerformat' and special
  			formats of 'titlestring' and 'iconstring'
  m  *+sun_workshop*	|workshop|
*** ../vim-7.2.285/src/eval.c	2009-11-03 14:26:29.000000000 +0100
--- src/eval.c	2009-11-11 12:59:53.000000000 +0100
***************
*** 11736,11741 ****
--- 11736,11744 ----
  #ifdef FEAT_SNIFF
  	"sniff",
  #endif
+ #ifdef STARTUPTIME
+ 	"startuptime",
+ #endif
  #ifdef FEAT_STL_OPT
  	"statusline",
  #endif
*** ../vim-7.2.285/src/main.c	2009-11-03 12:10:39.000000000 +0100
--- src/main.c	2009-11-08 12:57:46.000000000 +0100
***************
*** 204,212 ****
  #ifdef STARTUPTIME
      for (i = 1; i < argc; ++i)
      {
! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
  	{
! 	    time_fd = mch_fopen(argv[i] + 14, "a");
  	    TIME_MSG("--- VIM STARTING ---");
  	    break;
  	}
--- 204,212 ----
  #ifdef STARTUPTIME
      for (i = 1; i < argc; ++i)
      {
! 	if (STRICMP(argv[i], "--startuptime") == 0 && i + 1 < argc)
  	{
! 	    time_fd = mch_fopen(argv[i + 1], "a");
  	    TIME_MSG("--- VIM STARTING ---");
  	    break;
  	}
***************
*** 1726,1731 ****
--- 1726,1736 ----
  		    want_argument = TRUE;
  		    argv_idx += 3;
  		}
+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ 		{
+ 		    want_argument = TRUE;
+ 		    argv_idx += 11;
+ 		}
  #ifdef FEAT_CLIENTSERVER
  		else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
  		    ; /* already processed -- no arg */
***************
*** 1761,1770 ****
  		    /* already processed, skip */
  		}
  #endif
- 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
- 		{
- 		    /* already processed, skip */
- 		}
  		else
  		{
  		    if (argv[0][argv_idx])
--- 1766,1771 ----
***************
*** 2061,2067 ****
  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
  
  		--argc;
! 		if (argc < 1 && c != 'S')
  		    mainerr_arg_missing((char_u *)argv[0]);
  		++argv;
  		argv_idx = -1;
--- 2062,2068 ----
  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
  
  		--argc;
! 		if (argc < 1 && c != 'S')  /* -S has an optional argument */
  		    mainerr_arg_missing((char_u *)argv[0]);
  		++argv;
  		argv_idx = -1;
***************
*** 2102,2112 ****
  							    (char_u *)argv[0];
  		    break;
  
! 		case '-':	/* "--cmd {command}" execute command */
! 		    if (parmp->n_pre_commands >= MAX_ARG_CMDS)
! 			mainerr(ME_EXTRA_CMD, NULL);
! 		    parmp->pre_commands[parmp->n_pre_commands++] =
  							    (char_u *)argv[0];
  		    break;
  
  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
--- 2103,2118 ----
  							    (char_u *)argv[0];
  		    break;
  
! 		case '-':
! 		    if (argv[-1][2] == 'c')
! 		    {
! 			/* "--cmd {command}" execute command */
! 			if (parmp->n_pre_commands >= MAX_ARG_CMDS)
! 			    mainerr(ME_EXTRA_CMD, NULL);
! 			parmp->pre_commands[parmp->n_pre_commands++] =
  							    (char_u *)argv[0];
+ 		    }
+ 		    /* "--startuptime <file>" already handled */
  		    break;
  
  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
***************
*** 3144,3149 ****
--- 3150,3158 ----
      main_msg(_("--serverlist\t\tList available Vim server names and exit"));
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
+ #ifdef STARTUPTIME
+     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
+ #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
  #endif
*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
--- src/version.c	2009-11-11 14:17:28.000000000 +0100
***************
*** 494,499 ****
--- 494,504 ----
  #else
  	"-sniff",
  #endif
+ #ifdef STARTUPTIME
+ 	"+startuptime",
+ #else
+ 	"-startuptime",
+ #endif
  #ifdef FEAT_STL_OPT
  	"+statusline",
  #else
*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
--- src/version.c	2009-11-11 14:17:28.000000000 +0100
***************
*** 678,679 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     286,
  /**/

-- 
A fool must search for a greater fool to find admiration.

 /// 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    ///


--- NEW FILE 7.2.287 ---
To: vim-dev at vim.org
Subject: Patch 7.2.287
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.287
Problem:    Warning from gcc 3.4 about uninitialized variable.
Solution:   Move assignment outside of #ifdef.
Files:	    src/if_perl.xs


*** ../vim-7.2.286/src/if_perl.xs	2009-07-14 16:05:14.000000000 +0200
--- src/if_perl.xs	2009-11-11 12:29:32.000000000 +0100
***************
*** 720,727 ****
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
! 	if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
  # endif
--- 720,728 ----
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
+ 	safe = perl_get_sv( "VIM::safe", FALSE );
  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
! 	if (safe == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
  # endif
*** ../vim-7.2.286/src/version.c	2009-11-11 14:21:48.000000000 +0100
--- src/version.c	2009-11-11 14:44:49.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     287,
  /**/

-- 
The most powerful force in the universe is gossip.

 /// 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    ///


--- NEW FILE 7.2.288 ---
To: vim-dev at vim.org
Subject: Patch 7.2.288
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.288
Problem:    Python 2.6 pyconfig.h redefines macros.
Solution:   Undefine the macros before including pyconfig.h.
Files:      src/if_python.c


*** ../vim-7.2.287/src/if_python.c	2009-11-03 11:43:05.000000000 +0100
--- src/if_python.c	2009-11-11 12:33:37.000000000 +0100
***************
*** 37,42 ****
--- 37,48 ----
  #ifdef HAVE_STDARG_H
  # undef HAVE_STDARG_H	/* Python's config.h defines it as well. */
  #endif
+ #ifdef _POSIX_C_SOURCE
+ # undef _POSIX_C_SOURCE	/* pyconfig.h defines it as well. */
+ #endif
+ #ifdef _XOPEN_SOURCE
+ # undef _XOPEN_SOURCE	/* pyconfig.h defines it as well. */
+ #endif
  
  #define PY_SSIZE_T_CLEAN
  
*** ../vim-7.2.287/src/version.c	2009-11-11 14:45:36.000000000 +0100
--- src/version.c	2009-11-11 15:05:51.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     288,
  /**/

-- 
I am always surprised in the Linux world how quickly solutions can be
obtained.  (Imagine sending an email to Bill Gates, asking why Windows
crashed, and how to fix it...  and then getting an answer that fixed the
problem... <0>_<0> !)		              -- Mark Langdon

 /// 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    ///


--- NEW FILE 7.2.289 ---
To: vim-dev at vim.org
Subject: Patch 7.2.289
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.289
Problem:    Checking wrong struct member.
Solution:   Change tb_buf to tb_noremap. (Dominique Pelle)
Files:	    src/getchar.c


*** ../vim-7.2.288/src/getchar.c	2009-09-30 15:15:33.000000000 +0200
--- src/getchar.c	2009-11-11 12:50:58.000000000 +0100
***************
*** 22,28 ****
   * These buffers are used for storing:
   * - stuffed characters: A command that is translated into another command.
   * - redo characters: will redo the last change.
!  * - recorded chracters: for the "q" command.
   *
   * The bytes are stored like in the typeahead buffer:
   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
--- 22,28 ----
   * These buffers are used for storing:
   * - stuffed characters: A command that is translated into another command.
   * - redo characters: will redo the last change.
!  * - recorded characters: for the "q" command.
   *
   * The bytes are stored like in the typeahead buffer:
   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
***************
*** 1283,1289 ****
  	EMSG2(_(e_intern2), "Free typebuf 1");
      else
  	vim_free(typebuf.tb_buf);
!     if (typebuf.tb_buf == noremapbuf_init)
  	EMSG2(_(e_intern2), "Free typebuf 2");
      else
  	vim_free(typebuf.tb_noremap);
--- 1283,1289 ----
  	EMSG2(_(e_intern2), "Free typebuf 1");
      else
  	vim_free(typebuf.tb_buf);
!     if (typebuf.tb_noremap == noremapbuf_init)
  	EMSG2(_(e_intern2), "Free typebuf 2");
      else
  	vim_free(typebuf.tb_noremap);
***************
*** 1516,1522 ****
   * wanted.
   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
   * Collects the bytes of a multibyte character into the whole character.
!  * Returns the modifers in the global "mod_mask".
   */
      int
  vgetc()
--- 1516,1522 ----
   * wanted.
   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
   * Collects the bytes of a multibyte character into the whole character.
!  * Returns the modifiers in the global "mod_mask".
   */
      int
  vgetc()
***************
*** 3320,3326 ****
  			    retval = 1;
  			    goto theend;
  			}
! 	    /* An abbrevation cannot contain white space. */
  	    for (n = 0; n < len; ++n)
  		if (vim_iswhite(keys[n]))
  		{
--- 3320,3326 ----
  			    retval = 1;
  			    goto theend;
  			}
! 	    /* An abbreviation cannot contain white space. */
  	    for (n = 0; n < len; ++n)
  		if (vim_iswhite(keys[n]))
  		{
***************
*** 4272,4278 ****
  
      /*
       * Check for word before the cursor: If it ends in a keyword char all
!      * chars before it must be al keyword chars or non-keyword chars, but not
       * white space. If it ends in a non-keyword char we accept any characters
       * before it except white space.
       */
--- 4272,4278 ----
  
      /*
       * Check for word before the cursor: If it ends in a keyword char all
!      * chars before it must be keyword chars or non-keyword chars, but not
       * white space. If it ends in a non-keyword char we accept any characters
       * before it except white space.
       */
*** ../vim-7.2.288/src/version.c	2009-11-11 15:06:59.000000000 +0100
--- src/version.c	2009-11-11 16:19:12.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     289,
  /**/

-- 
A M00se once bit my sister ...
                 "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    ///


--- NEW FILE 7.2.290 ---
To: vim-dev at vim.org
Subject: Patch 7.2.290
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.290
Problem:    Not freeing memory from ":lmap", ":xmap" and ":menutranslate".
Solution:   Free the memory when exiting. (Dominique Pelle)
Files:	    src/misc2.c


*** ../vim-7.2.289/src/misc2.c	2009-11-03 16:44:04.000000000 +0100
--- src/misc2.c	2009-11-11 16:49:13.000000000 +0100
***************
*** 1005,1013 ****
--- 1005,1018 ----
  # ifdef FEAT_MENU
      /* Clear menus. */
      do_cmdline_cmd((char_u *)"aunmenu *");
+ #  ifdef FEAT_MULTI_LANG
+     do_cmdline_cmd((char_u *)"menutranslate clear");
+ #  endif
  # endif
  
      /* Clear mappings, abbreviations, breakpoints. */
+     do_cmdline_cmd((char_u *)"lmapclear");
+     do_cmdline_cmd((char_u *)"xmapclear");
      do_cmdline_cmd((char_u *)"mapclear");
      do_cmdline_cmd((char_u *)"mapclear!");
      do_cmdline_cmd((char_u *)"abclear");
***************
*** 1282,1288 ****
  
  /*
   * Escape "string" for use as a shell argument with system().
!  * This uses single quotes, except when we know we need to use double qoutes
   * (MS-DOS and MS-Windows without 'shellslash' set).
   * Escape a newline, depending on the 'shell' option.
   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
--- 1287,1293 ----
  
  /*
   * Escape "string" for use as a shell argument with system().
!  * This uses single quotes, except when we know we need to use double quotes
   * (MS-DOS and MS-Windows without 'shellslash' set).
   * Escape a newline, depending on the 'shell' option.
   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
***************
*** 1537,1543 ****
  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
  /*
   * Copy a character a number of times.
!  * Does not work for multi-byte charactes!
   */
      void
  copy_chars(ptr, count, c)
--- 1542,1548 ----
  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
  /*
   * Copy a character a number of times.
!  * Does not work for multi-byte characters!
   */
      void
  copy_chars(ptr, count, c)
***************
*** 4260,4266 ****
  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
  	 * For EBCDIC you get different character values.
  	 * If no restrict is given after '**' the default is used.
! 	 * Due to this technic the path looks awful if you print it as a
  	 * string.
  	 */
  	len = 0;
--- 4265,4271 ----
  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
  	 * For EBCDIC you get different character values.
  	 * If no restrict is given after '**' the default is used.
! 	 * Due to this technique the path looks awful if you print it as a
  	 * string.
  	 */
  	len = 0;
***************
*** 4649,4655 ****
  				      && !mch_isdir(stackp->ffs_filearray[i]))
  			    continue;   /* not a directory */
  
! 			/* prepare the filename to be checked for existance
  			 * below */
  			STRCPY(file_path, stackp->ffs_filearray[i]);
  			add_pathsep(file_path);
--- 4654,4660 ----
  				      && !mch_isdir(stackp->ffs_filearray[i]))
  			    continue;   /* not a directory */
  
! 			/* prepare the filename to be checked for existence
  			 * below */
  			STRCPY(file_path, stackp->ffs_filearray[i]);
  			add_pathsep(file_path);
***************
*** 5438,5444 ****
  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
  	    /* handle "\tmp" as absolute path */
  	    || vim_ispathsep(ff_file_to_find[0])
! 	    /* handle "c:name" as absulute path */
  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
  #endif
  #ifdef AMIGA
--- 5443,5449 ----
  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
  	    /* handle "\tmp" as absolute path */
  	    || vim_ispathsep(ff_file_to_find[0])
! 	    /* handle "c:name" as absolute path */
  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
  #endif
  #ifdef AMIGA
***************
*** 5681,5687 ****
  		p2 = (char_u *)base + (j + gap) * elm_size;
  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
  		    break;
! 		/* Exchange the elemets. */
  		mch_memmove(buf, p1, elm_size);
  		mch_memmove(p1, p2, elm_size);
  		mch_memmove(p2, buf, elm_size);
--- 5686,5692 ----
  		p2 = (char_u *)base + (j + gap) * elm_size;
  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
  		    break;
! 		/* Exchange the elements. */
  		mch_memmove(buf, p1, elm_size);
  		mch_memmove(p1, p2, elm_size);
  		mch_memmove(p2, buf, elm_size);
*** ../vim-7.2.289/src/version.c	2009-11-11 16:23:37.000000000 +0100
--- src/version.c	2009-11-11 16:54:53.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     290,
  /**/

-- 
ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
        King of all Britons, defeator of the Saxons, sovereign of all England!
   [Pause]
SOLDIER: Get away!
                 "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    ///


--- NEW FILE 7.2.291 ---
To: vim-dev at vim.org
Subject: Patch 7.2.291
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.291
Problem:    Reading uninitialised memory in arabic mode.
Solution:   Use utfc_ptr2char_len() rather than utfc_ptr2char().  (Dominique
	    Pelle)
Files:	    src/screen.c


*** ../vim-7.2.290/src/screen.c	2009-11-03 17:36:09.000000000 +0100
--- src/screen.c	2009-11-11 17:04:53.000000000 +0100
***************
*** 6413,6419 ****
  		    }
  		    else
  		    {
! 			nc = utfc_ptr2char(ptr + mbyte_blen, pcc);
  			nc1 = pcc[0];
  		    }
  		    pc = prev_c;
--- 6413,6420 ----
  		    }
  		    else
  		    {
! 			nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
! 				      (int)((text + len) - ptr - mbyte_blen));
  			nc1 = pcc[0];
  		    }
  		    pc = prev_c;
*** ../vim-7.2.290/src/version.c	2009-11-11 16:56:13.000000000 +0100
--- src/version.c	2009-11-11 17:06:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     291,
  /**/

-- 
The problem with political jokes is that they get elected.

 /// 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    ///


--- NEW FILE 7.2.292 ---
To: vim-dev at vim.org
Subject: Patch 7.2.292
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.292
Problem:    Block right-shift doesn't work properly with multi-byte encoding
	    and 'list' set.
Solution:   Add the missing "else". (Lech Lorens)
Files:	    src/ops.c


*** ../vim-7.2.291/src/ops.c	2009-11-03 16:44:04.000000000 +0100
--- src/ops.c	2009-11-11 17:15:04.000000000 +0100
***************
*** 422,429 ****
  #ifdef FEAT_MBYTE
  	    if (has_mbyte)
  		bd.textstart += (*mb_ptr2len)(bd.textstart);
  #endif
! 	    ++bd.textstart;
  	}
  	for ( ; vim_iswhite(*bd.textstart); )
  	{
--- 422,430 ----
  #ifdef FEAT_MBYTE
  	    if (has_mbyte)
  		bd.textstart += (*mb_ptr2len)(bd.textstart);
+ 	    else
  #endif
! 		++bd.textstart;
  	}
  	for ( ; vim_iswhite(*bd.textstart); )
  	{
*** ../vim-7.2.291/src/version.c	2009-11-11 17:07:25.000000000 +0100
--- src/version.c	2009-11-11 17:21:31.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     292,
  /**/

-- 
Computers make very fast, very accurate, mistakes.

 /// 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    ///


--- NEW FILE 7.2.293 ---
To: vim-dev at vim.org
Subject: Patch 7.2.293
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.293
Problem:    When setting 'comments' option it may be used in a wrong way. 
Solution:   Don't increment after skipping over digets. (Yukihiro Nakadaira)
Files:	    src/misc1.c


*** ../vim-7.2.292/src/misc1.c	2009-11-03 18:46:53.000000000 +0100
--- src/misc1.c	2009-11-11 17:27:38.000000000 +0100
***************
*** 1026,1037 ****
  		    int		c = 0;
  		    int		off = 0;
  
! 		    for (p = lead_flags; *p && *p != ':'; ++p)
  		    {
  			if (*p == COM_RIGHT || *p == COM_LEFT)
! 			    c = *p;
  			else if (VIM_ISDIGIT(*p) || *p == '-')
  			    off = getdigits(&p);
  		    }
  		    if (c == COM_RIGHT)    /* right adjusted leader */
  		    {
--- 1026,1039 ----
  		    int		c = 0;
  		    int		off = 0;
  
! 		    for (p = lead_flags; *p != NUL && *p != ':'; )
  		    {
  			if (*p == COM_RIGHT || *p == COM_LEFT)
! 			    c = *p++;
  			else if (VIM_ISDIGIT(*p) || *p == '-')
  			    off = getdigits(&p);
+ 			else
+ 			    ++p;
  		    }
  		    if (c == COM_RIGHT)    /* right adjusted leader */
  		    {
*** ../vim-7.2.292/src/version.c	2009-11-11 17:22:30.000000000 +0100
--- src/version.c	2009-11-11 17:29:24.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     293,
  /**/

-- 
SOLDIER: What?  Ridden on a horse?
ARTHUR:  Yes!
SOLDIER: You're using coconuts!
                 "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    ///


--- NEW FILE 7.2.294 ---
To: vim-dev at vim.org
Subject: Patch 7.2.294
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.294
Problem:    When using TEMPDIRS dir name could get too long.
Solution:   Overwrite tail instead of appending each time.  Use mkdtemp() when
	    available. (James Vega)
Files:	    src/auto/configure, src/config.h.in, src/configure.in, src/fileio.c


*** ../vim-7.2.293/src/auto/configure	2009-09-11 13:44:33.000000000 +0200
--- src/auto/configure	2009-11-17 12:03:15.000000000 +0100
***************
*** 14019,14027 ****
  
  
  
  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
--- 14019,14028 ----
  
  
  
+ 
  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
*** ../vim-7.2.293/src/config.h.in	2009-05-21 23:25:38.000000000 +0200
--- src/config.h.in	2009-11-11 17:40:21.000000000 +0100
***************
*** 157,162 ****
--- 157,163 ----
  #undef HAVE_LSTAT
  #undef HAVE_MEMCMP
  #undef HAVE_MEMSET
+ #undef HAVE_MKDTEMP
  #undef HAVE_NANOSLEEP
  #undef HAVE_OPENDIR
  #undef HAVE_FLOAT_FUNCS
*** ../vim-7.2.293/src/configure.in	2009-09-11 13:44:33.000000000 +0200
--- src/configure.in	2009-11-11 17:40:21.000000000 +0100
***************
*** 2635,2641 ****
  dnl Check for functions in one big call, to reduce the size of configure
  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
--- 2635,2641 ----
  dnl Check for functions in one big call, to reduce the size of configure
  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
*** ../vim-7.2.293/src/fileio.c	2009-09-11 17:24:01.000000000 +0200
--- src/fileio.c	2009-11-11 18:01:22.000000000 +0100
***************
*** 146,151 ****
--- 146,152 ----
  # endif
  #endif
  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+ static void vim_settempdir __ARGS((char_u *tempdir));
  #ifdef FEAT_AUTOCMD
  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
  #endif
***************
*** 6987,6992 ****
--- 6988,7020 ----
  #endif
  
  /*
+  * Directory "tempdir" was created.  Expand this name to a full path and put
+  * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
+  * "tempdir" must be no longer than MAXPATHL.
+  */
+     static void
+ vim_settempdir(tempdir)
+     char_u	*tempdir;
+ {
+     char_u	*buf;
+ 
+     buf = alloc((unsigned)MAXPATHL + 2);
+     if (buf != NULL)
+     {
+ 	if (vim_FullName(tempdir, buf, MAXPATHL, FALSE) == FAIL)
+ 	    STRCPY(buf, tempdir);
+ # ifdef __EMX__
+ 	if (vim_strchr(buf, '/') != NULL)
+ 	    STRCAT(buf, "/");
+ 	else
+ # endif
+ 	    add_pathsep(buf);
+ 	vim_tempdir = vim_strsave(buf);
+ 	vim_free(buf);
+     }
+ }
+ 
+ /*
   * vim_tempname(): Return a unique name that can be used for a temp file.
   *
   * The temp file is NOT created.
***************
*** 7007,7014 ****
  #ifdef TEMPDIRNAMES
      static char	*(tempdirs[]) = {TEMPDIRNAMES};
      int		i;
-     long	nr;
-     long	off;
  # ifndef EEXIST
      struct stat	st;
  # endif
--- 7035,7040 ----
***************
*** 7027,7032 ****
--- 7053,7064 ----
  	 */
  	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
  	{
+ 	    size_t	itmplen;
+ # ifndef HAVE_MKDTEMP
+ 	    long	nr;
+ 	    long	off;
+ # endif
+ 
  	    /* expand $TMP, leave room for "/v1100000/999999999" */
  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
  	    if (mch_isdir(itmp))		/* directory exists */
***************
*** 7040,7046 ****
--- 7072,7085 ----
  		else
  # endif
  		    add_pathsep(itmp);
+ 		itmplen = STRLEN(itmp);
  
+ # ifdef HAVE_MKDTEMP
+ 		/* Leave room for filename */
+ 		STRCAT(itmp, "vXXXXXX");
+ 		if (mkdtemp((char *)itmp) != NULL)
+ 		    vim_settempdir(itmp);
+ # else
  		/* Get an arbitrary number of up to 6 digits.  When it's
  		 * unlikely that it already exists it will be faster,
  		 * otherwise it doesn't matter.  The use of mkdir() avoids any
***************
*** 7052,7110 ****
  		for (off = 0; off < 10000L; ++off)
  		{
  		    int		r;
! #if defined(UNIX) || defined(VMS)
  		    mode_t	umask_save;
! #endif
  
! 		    sprintf((char *)itmp + STRLEN(itmp), "v%ld", nr + off);
! # ifndef EEXIST
  		    /* If mkdir() does not set errno to EEXIST, check for
  		     * existing file here.  There is a race condition then,
  		     * although it's fail-safe. */
  		    if (mch_stat((char *)itmp, &st) >= 0)
  			continue;
! # endif
! #if defined(UNIX) || defined(VMS)
  		    /* Make sure the umask doesn't remove the executable bit.
  		     * "repl" has been reported to use "177". */
  		    umask_save = umask(077);
! #endif
  		    r = vim_mkdir(itmp, 0700);
! #if defined(UNIX) || defined(VMS)
  		    (void)umask(umask_save);
! #endif
  		    if (r == 0)
  		    {
! 			char_u	*buf;
! 
! 			/* Directory was created, use this name.
! 			 * Expand to full path; When using the current
! 			 * directory a ":cd" would confuse us. */
! 			buf = alloc((unsigned)MAXPATHL + 1);
! 			if (buf != NULL)
! 			{
! 			    if (vim_FullName(itmp, buf, MAXPATHL, FALSE)
! 								      == FAIL)
! 				STRCPY(buf, itmp);
! # ifdef __EMX__
! 			    if (vim_strchr(buf, '/') != NULL)
! 				STRCAT(buf, "/");
! 			    else
! # endif
! 				add_pathsep(buf);
! 			    vim_tempdir = vim_strsave(buf);
! 			    vim_free(buf);
! 			}
  			break;
  		    }
! # ifdef EEXIST
  		    /* If the mkdir() didn't fail because the file/dir exists,
  		     * we probably can't create any dir here, try another
  		     * place. */
  		    if (errno != EEXIST)
! # endif
  			break;
  		}
  		if (vim_tempdir != NULL)
  		    break;
  	    }
--- 7091,7131 ----
  		for (off = 0; off < 10000L; ++off)
  		{
  		    int		r;
! #  if defined(UNIX) || defined(VMS)
  		    mode_t	umask_save;
! #  endif
  
! 		    sprintf((char *)itmp + itmplen, "v%ld", nr + off);
! #  ifndef EEXIST
  		    /* If mkdir() does not set errno to EEXIST, check for
  		     * existing file here.  There is a race condition then,
  		     * although it's fail-safe. */
  		    if (mch_stat((char *)itmp, &st) >= 0)
  			continue;
! #  endif
! #  if defined(UNIX) || defined(VMS)
  		    /* Make sure the umask doesn't remove the executable bit.
  		     * "repl" has been reported to use "177". */
  		    umask_save = umask(077);
! #  endif
  		    r = vim_mkdir(itmp, 0700);
! #  if defined(UNIX) || defined(VMS)
  		    (void)umask(umask_save);
! #  endif
  		    if (r == 0)
  		    {
! 			vim_settempdir(itmp);
  			break;
  		    }
! #  ifdef EEXIST
  		    /* If the mkdir() didn't fail because the file/dir exists,
  		     * we probably can't create any dir here, try another
  		     * place. */
  		    if (errno != EEXIST)
! #  endif
  			break;
  		}
+ # endif /* HAVE_MKDTEMP */
  		if (vim_tempdir != NULL)
  		    break;
  	    }
*** ../vim-7.2.293/src/version.c	2009-11-11 17:30:05.000000000 +0100
--- src/version.c	2009-11-17 11:54:49.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     294,
  /**/

-- 
ARTHUR:       Now stand aside worthy adversary.
BLACK KNIGHT: (Glancing at his shoulder) 'Tis but a scratch.
ARTHUR:       A scratch?  Your arm's off.
                 "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    ///


--- NEW FILE 7.2.295 ---
To: vim-dev at vim.org
Subject: Patch 7.2.295
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.295
Problem:    When using map() on a List the index is not known.
Solution:   Set v:key to the  index. (Hari Krishna Dara)
Files:	    runtime/doc/eval.txt, src/eval.c


*** ../vim-7.2.294/runtime/doc/eval.txt	2009-11-11 14:21:48.000000000 +0100
--- runtime/doc/eval.txt	2009-11-11 18:22:54.000000000 +0100
***************
*** 3802,3808 ****
  		Replace each item in {expr} with the result of evaluating
  		{string}.
  		Inside {string} |v:val| has the value of the current item.
! 		For a |Dictionary| |v:key| has the key of the current item.
  		Example: >
  			:call map(mylist, '"> " . v:val . " <"')
  <		This puts "> " before and " <" after each item in "mylist".
--- 3812,3819 ----
  		Replace each item in {expr} with the result of evaluating
  		{string}.
  		Inside {string} |v:val| has the value of the current item.
! 		For a |Dictionary| |v:key| has the key of the current item
! 		and for a |List| |v:key| has the index of the current item.
  		Example: >
  			:call map(mylist, '"> " . v:val . " <"')
  <		This puts "> " before and " <" after each item in "mylist".
*** ../vim-7.2.294/src/eval.c	2009-11-11 14:21:48.000000000 +0100
--- src/eval.c	2009-11-11 18:22:49.000000000 +0100
***************
*** 9928,9933 ****
--- 9928,9934 ----
      int		todo;
      char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
      int		save_did_emsg;
+     int		index = 0;
  
      if (argvars[0].v_type == VAR_LIST)
      {
***************
*** 9961,9969 ****
  	save_did_emsg = did_emsg;
  	did_emsg = FALSE;
  
  	if (argvars[0].v_type == VAR_DICT)
  	{
- 	    prepare_vimvar(VV_KEY, &save_key);
  	    vimvars[VV_KEY].vv_type = VAR_STRING;
  
  	    ht = &d->dv_hashtab;
--- 9962,9970 ----
  	save_did_emsg = did_emsg;
  	did_emsg = FALSE;
  
+ 	prepare_vimvar(VV_KEY, &save_key);
  	if (argvars[0].v_type == VAR_DICT)
  	{
  	    vimvars[VV_KEY].vv_type = VAR_STRING;
  
  	    ht = &d->dv_hashtab;
***************
*** 9987,10010 ****
  		}
  	    }
  	    hash_unlock(ht);
- 
- 	    restore_vimvar(VV_KEY, &save_key);
  	}
  	else
  	{
  	    for (li = l->lv_first; li != NULL; li = nli)
  	    {
  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
  		    break;
  		nli = li->li_next;
  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
  								  || did_emsg)
  		    break;
  		if (!map && rem)
  		    listitem_remove(l, li);
  	    }
  	}
  
  	restore_vimvar(VV_VAL, &save_val);
  
  	did_emsg |= save_did_emsg;
--- 9988,10014 ----
  		}
  	    }
  	    hash_unlock(ht);
  	}
  	else
  	{
+ 	    vimvars[VV_KEY].vv_type = VAR_NUMBER;
+ 
  	    for (li = l->lv_first; li != NULL; li = nli)
  	    {
  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
  		    break;
  		nli = li->li_next;
+ 		vimvars[VV_KEY].vv_nr = index;
  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
  								  || did_emsg)
  		    break;
  		if (!map && rem)
  		    listitem_remove(l, li);
+ 		++index;
  	    }
  	}
  
+ 	restore_vimvar(VV_KEY, &save_key);
  	restore_vimvar(VV_VAL, &save_val);
  
  	did_emsg |= save_did_emsg;
*** ../vim-7.2.294/src/version.c	2009-11-17 12:08:48.000000000 +0100
--- src/version.c	2009-11-17 12:18:08.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     295,
  /**/

-- 
ARTHUR:       You are indeed brave Sir knight, but the fight is mine.
BLACK KNIGHT: Had enough?
ARTHUR:       You stupid bastard.  You havn't got any arms left.
                 "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    ///


--- NEW FILE 7.2.296 ---
To: vim-dev at vim.org
Subject: Patch 7.2.296
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.296
Problem:    Help message about startuptime is wrong. (Dominique Pelle)
Solution:   Remove the equal sign.
Files:	    src/main.c


*** ../vim-7.2.295/src/main.c	2009-11-11 14:21:48.000000000 +0100
--- src/main.c	2009-11-11 22:51:04.000000000 +0100
***************
*** 3151,3157 ****
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
  #ifdef STARTUPTIME
!     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
  #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
--- 3151,3157 ----
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
  #ifdef STARTUPTIME
!     main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>"));
  #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
*** ../vim-7.2.295/src/version.c	2009-11-17 12:20:30.000000000 +0100
--- src/version.c	2009-11-17 12:30:29.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     296,
  /**/

-- 
BLACK KNIGHT: I'm invincible!
ARTHUR:       You're a looney.
                 "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    ///


--- NEW FILE 7.2.297 ---
To: vim-dev at vim.org
Subject: Patch 7.2.297
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.297
Problem:    Reading freed memory when writing ":reg" output to a register.
	    (Dominique Pelle)
Solution:   Skip the register being written to.
Files:	    src/ops.c


*** ../vim-7.2.296/src/ops.c	2009-11-11 17:22:30.000000000 +0100
--- src/ops.c	2009-11-11 19:30:47.000000000 +0100
***************
*** 3991,3996 ****
--- 3991,4004 ----
  	}
  	else
  	    yb = &(y_regs[i]);
+ 
+ #ifdef FEAT_EVAL
+ 	if (name == MB_TOLOWER(redir_reg)
+ 		|| (redir_reg == '"' && yb == y_previous))
+ 	    continue;	    /* do not list register being written to, the
+ 			     * pointer can be freed */
+ #endif
+ 
  	if (yb->y_array != NULL)
  	{
  	    msg_putchar('\n');
***************
*** 6090,6096 ****
      long	maxlen;
  #endif
  
!     if (y_ptr->y_array == NULL)		/* NULL means emtpy register */
  	y_ptr->y_size = 0;
  
      /*
--- 6098,6104 ----
      long	maxlen;
  #endif
  
!     if (y_ptr->y_array == NULL)		/* NULL means empty register */
  	y_ptr->y_size = 0;
  
      /*
*** ../vim-7.2.296/src/version.c	2009-11-17 12:31:30.000000000 +0100
--- src/version.c	2009-11-17 12:42:28.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     297,
  /**/

-- 
"Beware of bugs in the above code; I have only proved
it correct, not tried it." -- Donald Knuth

 /// 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    ///


--- NEW FILE 7.2.298 ---
To: vim-dev at vim.org
Subject: Patch 7.2.298
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.298
Problem:    ":vimgrep" crashes when there is an autocommand that sets a
	    window-local variable.
Solution:   Initialize the w: hashtab for re-use. (Yukihiro Nakadaira)
Files:	    src/fileio.c


*** ../vim-7.2.297/src/fileio.c	2009-11-17 12:08:48.000000000 +0100
--- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
***************
*** 8597,8602 ****
--- 8605,8611 ----
  	    curwin = firstwin;
  # ifdef FEAT_EVAL
  	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
+ 	hash_init(&aucmd_win->w_vars.dv_hashtab);   /* re-use the hashtab */
  # endif
  #else
  	curwin = aco->save_curwin;
*** ../vim-7.2.297/src/version.c	2009-11-17 12:43:19.000000000 +0100
--- src/version.c	2009-11-17 14:56:19.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     298,
  /**/

-- 
Eye have a spelling checker, it came with my PC;
It plainly marks four my revue mistakes I cannot sea.
I've run this poem threw it, I'm sure your please to no,
It's letter perfect in it's weigh, my checker tolled me sew!

 /// 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    ///


--- NEW FILE 7.2.299 ---
To: vim-dev at vim.org
Subject: Patch 7.2.299
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.299
Problem:    Crash when comment middle is longer than start.
Solution:   Fix size computation. (Lech Lorens)
Files:	    src/misc1.c


*** ../vim-7.2.298/src/misc1.c	2009-11-11 17:30:05.000000000 +0100
--- src/misc1.c	2009-11-17 15:59:28.000000000 +0100
***************
*** 1121,1127 ****
  			    if (i != lead_repl_len)
  			    {
  				mch_memmove(p + lead_repl_len, p + i,
! 				       (size_t)(lead_len - i - (leader - p)));
  				lead_len += lead_repl_len - i;
  			    }
  			}
--- 1121,1127 ----
  			    if (i != lead_repl_len)
  			    {
  				mch_memmove(p + lead_repl_len, p + i,
! 				       (size_t)(lead_len - i - (p - leader)));
  				lead_len += lead_repl_len - i;
  			    }
  			}
*** ../vim-7.2.298/src/version.c	2009-11-17 14:57:19.000000000 +0100
--- src/version.c	2009-11-17 16:01:07.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     299,
  /**/

-- 
BLACK KNIGHT: The Black Knight always triumphs. Have at you!
   ARTHUR takes his last leg off.  The BLACK KNIGHT's body lands upright.
BLACK KNIGHT: All right, we'll call it a draw.
                 "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    ///


--- NEW FILE 7.2.300 ---
To: vim-dev at vim.org
Subject: Patch 7.2.300
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.300
Problem:    Vim doesn't close file descriptors when forking and executing
	    another command, e.g., ":shell".
Solution:   Use FD_CLOEXEC when available. (James Vega)
Files:	    src/auto/configure, src/config.h.in, src/configure.in,
	    src/ex_cmdds2.c, src/fileio.c, src/memfile.c, src/memline.c


*** ../vim-7.2.299/src/auto/configure	2009-11-17 12:08:48.000000000 +0100
--- src/auto/configure	2009-11-17 13:09:03.000000000 +0100
***************
*** 15174,15179 ****
--- 15174,15231 ----
  $as_echo "yes" >&6; }
  fi
  
+ { $as_echo "$as_me:$LINENO: checking for FD_CLOEXEC" >&5
+ $as_echo_n "checking for FD_CLOEXEC... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+ int
+ main ()
+ {
+ 	int flag = FD_CLOEXEC;
+   ;
+   return 0;
+ }
+ _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$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
+   $as_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
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FD_CLOEXEC 1
+ _ACEOF
+ 
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	{ $as_echo "$as_me:$LINENO: result: not usable" >&5
+ $as_echo "not usable" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  { $as_echo "$as_me:$LINENO: checking for rename" >&5
  $as_echo_n "checking for rename... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
*** ../vim-7.2.299/src/config.h.in	2009-11-17 12:08:48.000000000 +0100
--- src/config.h.in	2009-11-17 13:01:36.000000000 +0100
***************
*** 388,390 ****
--- 388,393 ----
  
  /* Define if you want XSMP interaction as well as vanilla swapfile safety */
  #undef USE_XSMP_INTERACT
+ 
+ /* Define if fcntl()'s F_SETFD command knows about FD_CLOEXEC */
+ #undef HAVE_FD_CLOEXEC
*** ../vim-7.2.299/src/configure.in	2009-11-17 12:08:48.000000000 +0100
--- src/configure.in	2009-11-17 13:01:36.000000000 +0100
***************
*** 2855,2860 ****
--- 2855,2870 ----
    AC_MSG_RESULT(yes)
  fi
  
+ dnl make sure the FD_CLOEXEC flag for fcntl()'s F_SETFD command is known
+ AC_MSG_CHECKING(for FD_CLOEXEC)
+ AC_TRY_COMPILE(
+ [#if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif],
+ [	int flag = FD_CLOEXEC;],
+ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FD_CLOEXEC),
+ 	AC_MSG_RESULT(not usable))
+ 
  dnl rename needs to be checked separately to work on Nextstep with cc
  AC_MSG_CHECKING(for rename)
  AC_TRY_LINK([#include <stdio.h>], [rename("this", "that")],
*** ../vim-7.2.299/src/fileio.c	2009-11-17 14:57:19.000000000 +0100
--- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
***************
*** 2254,2259 ****
--- 2254,2267 ----
  
      if (!read_buffer && !read_stdin)
  	close(fd);				/* errors are ignored */
+ #ifdef HAVE_FD_CLOEXEC
+     else
+     {
+ 	int fdflags = fcntl(fd, F_GETFD);
+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 	    fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
+     }
+ #endif
      vim_free(buffer);
  
  #ifdef HAVE_DUP
*** ../vim-7.2.299/src/memfile.c	2008-07-13 19:39:39.000000000 +0200
--- src/memfile.c	2009-11-17 13:22:15.000000000 +0100
***************
*** 1343,1348 ****
--- 1343,1353 ----
      }
      else
      {
+ #ifdef HAVE_FD_CLOEXEC
+ 	int fdflags = fcntl(mfp->mf_fd, F_GETFD);
+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 	    fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ #endif
  #ifdef HAVE_SELINUX
  	mch_copy_sec(fname, mfp->mf_fname);
  #endif
*** ../vim-7.2.299/src/memline.c	2009-11-03 15:32:58.000000000 +0100
--- src/memline.c	2009-11-17 13:21:40.000000000 +0100
***************
*** 382,388 ****
      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
      dp->db_free -= 1 + INDEX_SIZE;
      dp->db_line_count = 1;
!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* emtpy line */
  
      return OK;
  
--- 382,388 ----
      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
      dp->db_free -= 1 + INDEX_SIZE;
      dp->db_line_count = 1;
!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* empty line */
  
      return OK;
  
***************
*** 490,495 ****
--- 490,502 ----
  	    EMSG(_("E301: Oops, lost the swap file!!!"));
  	    return;
  	}
+ #ifdef HAVE_FD_CLOEXEC
+ 	{
+ 	    int fdflags = fcntl(mfp->mf_fd, F_GETFD);
+ 	    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 		fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ 	}
+ #endif
      }
      if (!success)
  	EMSG(_("E302: Could not rename swap file"));
*** ../vim-7.2.299/src/version.c	2009-11-17 16:08:12.000000000 +0100
--- src/version.c	2009-11-17 17:09:43.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     300,
  /**/

-- 
            |

Ceci n'est pas une pipe.

 /// 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    ///


--- NEW FILE 7.2.301 ---
To: vim-dev at vim.org
Subject: Patch 7.2.301
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

NOTE: some mail and patch programs may have a problem with the non-ASCII
characters in this patch.  You can fetch the patch from
ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301  and/or fetch the updated
files from CVS.  http://www.vim.org/cvs.php


Patch 7.2.301
Problem:    Formatting is wrong when 'tw' is set to a small value.
Solution:   Fix it and add tests.  Also fix behavior of "1" in 'fo'. (Yukihiro
	    Nakadaira)
Files:	    src/edit.c, src/testdir/Makefile, src/testdir/test68.in,
	    src/testdir/test68.ok, src/testdir/test69.in,
	    src/testdir/test69.ok


*** ../vim-7.2.300/src/edit.c	2009-11-11 13:22:32.000000000 +0100
--- src/edit.c	2009-11-17 15:34:47.000000000 +0100
***************
*** 181,187 ****
  static void ins_ctrl_v __ARGS((void));
  static void undisplay_dollar __ARGS((void));
  static void insert_special __ARGS((int, int, int));
! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only));
  static void check_auto_format __ARGS((int));
  static void redo_literal __ARGS((int c));
  static void start_arrow __ARGS((pos_T *end_insert_pos));
--- 181,187 ----
  static void ins_ctrl_v __ARGS((void));
  static void undisplay_dollar __ARGS((void));
  static void insert_special __ARGS((int, int, int));
! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only, int c));
  static void check_auto_format __ARGS((int));
  static void redo_literal __ARGS((int c));
  static void start_arrow __ARGS((pos_T *end_insert_pos));
***************
*** 2164,2170 ****
      int		i, c;
      int		actual_len;		/* Take multi-byte characters */
      int		actual_compl_length;	/* into account. */
!     int		*wca;		        /* Wide character array. */
      int		has_lower = FALSE;
      int		was_letter = FALSE;
  
--- 2164,2170 ----
      int		i, c;
      int		actual_len;		/* Take multi-byte characters */
      int		actual_compl_length;	/* into account. */
!     int		*wca;			/* Wide character array. */
      int		has_lower = FALSE;
      int		was_letter = FALSE;
  
***************
*** 5558,5564 ****
  	}
  	if (do_internal)
  #endif
! 	    internal_format(textwidth, second_indent, flags, c == NUL);
      }
  
      if (c == NUL)	    /* only formatting was wanted */
--- 5558,5564 ----
  	}
  	if (do_internal)
  #endif
! 	    internal_format(textwidth, second_indent, flags, c == NUL, c);
      }
  
      if (c == NUL)	    /* only formatting was wanted */
***************
*** 5738,5748 ****
   * Format text at the current insert position.
   */
      static void
! internal_format(textwidth, second_indent, flags, format_only)
      int		textwidth;
      int		second_indent;
      int		flags;
      int		format_only;
  {
      int		cc;
      int		save_char = NUL;
--- 5738,5749 ----
   * Format text at the current insert position.
   */
      static void
! internal_format(textwidth, second_indent, flags, format_only, c)
      int		textwidth;
      int		second_indent;
      int		flags;
      int		format_only;
+     int		c; /* character to be inserted (can be NUL) */
  {
      int		cc;
      int		save_char = NUL;
***************
*** 5763,5769 ****
       * When 'ai' is off we don't want a space under the cursor to be
       * deleted.  Replace it with an 'x' temporarily.
       */
!     if (!curbuf->b_p_ai)
      {
  	cc = gchar_cursor();
  	if (vim_iswhite(cc))
--- 5764,5774 ----
       * When 'ai' is off we don't want a space under the cursor to be
       * deleted.  Replace it with an 'x' temporarily.
       */
!     if (!curbuf->b_p_ai
! #ifdef FEAT_VREPLACE
! 	    && !(State & VREPLACE_FLAG)
! #endif
! 	    )
      {
  	cc = gchar_cursor();
  	if (vim_iswhite(cc))
***************
*** 5789,5797 ****
  	char_u	*saved_text = NULL;
  #endif
  	colnr_T	col;
  
! 	virtcol = get_nolist_virtcol();
! 	if (virtcol < (colnr_T)textwidth)
  	    break;
  
  #ifdef FEAT_COMMENTS
--- 5794,5804 ----
  	char_u	*saved_text = NULL;
  #endif
  	colnr_T	col;
+ 	colnr_T	end_col;
  
! 	virtcol = get_nolist_virtcol()
! 		+ char2cells(c != NUL ? c : gchar_cursor());
! 	if (virtcol <= (colnr_T)textwidth)
  	    break;
  
  #ifdef FEAT_COMMENTS
***************
*** 5831,5842 ****
  	coladvance((colnr_T)textwidth);
  	wantcol = curwin->w_cursor.col;
  
! 	curwin->w_cursor.col = startcol - 1;
! #ifdef FEAT_MBYTE
! 	/* Correct cursor for multi-byte character. */
! 	if (has_mbyte)
! 	    mb_adjust_cursor();
! #endif
  	foundcol = 0;
  
  	/*
--- 5838,5844 ----
  	coladvance((colnr_T)textwidth);
  	wantcol = curwin->w_cursor.col;
  
! 	curwin->w_cursor.col = startcol;
  	foundcol = 0;
  
  	/*
***************
*** 5847,5857 ****
  		    || curwin->w_cursor.lnum != Insstart.lnum
  		    || curwin->w_cursor.col >= Insstart.col)
  	{
! 	    cc = gchar_cursor();
  	    if (WHITECHAR(cc))
  	    {
  		/* remember position of blank just before text */
! 		end_foundcol = curwin->w_cursor.col;
  
  		/* find start of sequence of blanks */
  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
--- 5849,5862 ----
  		    || curwin->w_cursor.lnum != Insstart.lnum
  		    || curwin->w_cursor.col >= Insstart.col)
  	{
! 	    if (curwin->w_cursor.col == startcol && c != NUL)
! 		cc = c;
! 	    else
! 		cc = gchar_cursor();
  	    if (WHITECHAR(cc))
  	    {
  		/* remember position of blank just before text */
! 		end_col = curwin->w_cursor.col;
  
  		/* find start of sequence of blanks */
  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
***************
*** 5871,5877 ****
  		    /* do not break after one-letter words */
  		    if (curwin->w_cursor.col == 0)
  			break;	/* one-letter word at begin */
! 
  		    col = curwin->w_cursor.col;
  		    dec_cursor();
  		    cc = gchar_cursor();
--- 5876,5886 ----
  		    /* do not break after one-letter words */
  		    if (curwin->w_cursor.col == 0)
  			break;	/* one-letter word at begin */
! #ifdef FEAT_COMMENTS
! 		    /* do not break "#a b" when 'tw' is 2 */
! 		    if (curwin->w_cursor.col <= leader_len)
! 			break;
! #endif
  		    col = curwin->w_cursor.col;
  		    dec_cursor();
  		    cc = gchar_cursor();
***************
*** 5880,5905 ****
  			continue;	/* one-letter, continue */
  		    curwin->w_cursor.col = col;
  		}
! #ifdef FEAT_MBYTE
! 		if (has_mbyte)
! 		    foundcol = curwin->w_cursor.col
! 					 + (*mb_ptr2len)(ml_get_cursor());
! 		else
! #endif
! 		    foundcol = curwin->w_cursor.col + 1;
! 		if (curwin->w_cursor.col < (colnr_T)wantcol)
  		    break;
  	    }
  #ifdef FEAT_MBYTE
! 	    else if (cc >= 0x100 && fo_multibyte
! 			      && curwin->w_cursor.col <= (colnr_T)wantcol)
  	    {
  		/* Break after or before a multi-byte character. */
  		foundcol = curwin->w_cursor.col;
- 		if (curwin->w_cursor.col < (colnr_T)wantcol)
- 		    foundcol += (*mb_char2len)(cc);
  		end_foundcol = foundcol;
! 		break;
  	    }
  #endif
  	    if (curwin->w_cursor.col == 0)
--- 5889,5948 ----
  			continue;	/* one-letter, continue */
  		    curwin->w_cursor.col = col;
  		}
! 
! 		inc_cursor();
! 
! 		end_foundcol = end_col + 1;
! 		foundcol = curwin->w_cursor.col;
! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
  		    break;
  	    }
  #ifdef FEAT_MBYTE
! 	    else if (cc >= 0x100 && fo_multibyte)
  	    {
  		/* Break after or before a multi-byte character. */
+ 		if (curwin->w_cursor.col != startcol)
+ 		{
+ #ifdef FEAT_COMMENTS
+ 		    /* Don't break until after the comment leader */
+ 		    if (curwin->w_cursor.col < leader_len)
+ 			break;
+ #endif
+ 		    col = curwin->w_cursor.col;
+ 		    inc_cursor();
+ 		    /* Don't change end_foundcol if already set. */
+ 		    if (foundcol != curwin->w_cursor.col)
+ 		    {
+ 			foundcol = curwin->w_cursor.col;
+ 			end_foundcol = foundcol;
+ 			if (curwin->w_cursor.col <= (colnr_T)wantcol)
+ 			    break;
+ 		    }
+ 		    curwin->w_cursor.col = col;
+ 		}
+ 
+ 		if (curwin->w_cursor.col == 0)
+ 		    break;
+ 
+ 		col = curwin->w_cursor.col;
+ 
+ 		dec_cursor();
+ 		cc = gchar_cursor();
+ 
+ 		if (WHITECHAR(cc))
+ 		    continue;		/* break with space */
+ #ifdef FEAT_COMMENTS
+ 		/* Don't break until after the comment leader */
+ 		if (curwin->w_cursor.col < leader_len)
+ 		    break;
+ #endif
+ 
+ 		curwin->w_cursor.col = col;
+ 
  		foundcol = curwin->w_cursor.col;
  		end_foundcol = foundcol;
! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
! 		    break;
  	    }
  #endif
  	    if (curwin->w_cursor.col == 0)
***************
*** 5926,5939 ****
  	    orig_col = startcol;	/* Will start backspacing from here */
  	else
  #endif
! 	    replace_offset = startcol - end_foundcol - 1;
  
  	/*
  	 * adjust startcol for spaces that will be deleted and
  	 * characters that will remain on top line
  	 */
  	curwin->w_cursor.col = foundcol;
! 	while (cc = gchar_cursor(), WHITECHAR(cc))
  	    inc_cursor();
  	startcol -= curwin->w_cursor.col;
  	if (startcol < 0)
--- 5969,5983 ----
  	    orig_col = startcol;	/* Will start backspacing from here */
  	else
  #endif
! 	    replace_offset = startcol - end_foundcol;
  
  	/*
  	 * adjust startcol for spaces that will be deleted and
  	 * characters that will remain on top line
  	 */
  	curwin->w_cursor.col = foundcol;
! 	while ((cc = gchar_cursor(), WHITECHAR(cc))
! 		    && (!fo_white_par || curwin->w_cursor.col < startcol))
  	    inc_cursor();
  	startcol -= curwin->w_cursor.col;
  	if (startcol < 0)
***************
*** 8509,8515 ****
  	if (mode == BACKSPACE_LINE
  		&& (curbuf->b_p_ai
  #ifdef FEAT_CINDENT
!                     || cindent_on()
  #endif
  		   )
  #ifdef FEAT_RIGHTLEFT
--- 8553,8559 ----
  	if (mode == BACKSPACE_LINE
  		&& (curbuf->b_p_ai
  #ifdef FEAT_CINDENT
! 		    || cindent_on()
  #endif
  		   )
  #ifdef FEAT_RIGHTLEFT
*** ../vim-7.2.300/src/testdir/Makefile	2009-11-17 17:36:13.000000000 +0100
--- src/testdir/Makefile	2009-11-17 15:11:26.000000000 +0100
***************
*** 22,28 ****
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out
  
  SCRIPTS_GUI = test16.out
  
--- 22,29 ----
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out test68.out \
! 		test69.out
  
  SCRIPTS_GUI = test16.out
  
*** ../vim-7.2.300/src/testdir/test68.in	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test68.in	2009-11-17 15:39:09.000000000 +0100
***************
*** 0 ****
--- 1,56 ----
+ Test for text formatting.
+ 
+ Results of test68:
+ 
+ STARTTEST
+ :so small.vim
+ /^{/+1
+ :set noai tw=2 fo=t
+ gRa b
+ ENDTEST
+ 
+ {
+     
+ 
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set ai tw=2 fo=tw
+ gqgqjjllab
+ ENDTEST
+ 
+ {
+ a  b  
+ 
+ a    
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=3 fo=t
+ gqgqo
+ a 

+ ENDTEST
+ 
+ {
+ a 

+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tcq1 comments=:#
+ gqgqjgqgqo
+ a b
+ #a b
+ ENDTEST
+ 
+ {
+ a b
+ #a b
+ }
+ 
+ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
*** ../vim-7.2.300/src/testdir/test68.ok	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test68.ok	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,35 ----
+ Results of test68:
+ 
+ 
+ {
+ a
+ b
+ }
+ 
+ 
+ {
+ a  
+ b  
+ 
+ a  
+ b
+ }
+ 
+ 
+ {
+ a
+ 

+ 
+ a
+ 

+ }
+ 
+ 
+ {
+ a b
+ #a b
+ 
+ a b
+ #a b
+ }
+ 
*** ../vim-7.2.300/src/testdir/test69.in	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test69.in	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,139 ----
+ Test for multi-byte text formatting.
+ 
+ STARTTEST
+ :so mbyte.vim
+ :set encoding=utf-8
+ ENDTEST
+ 
+ Results of test69:
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=t
+ gqgqjgqgqo
+ ???
+ abc ???
+ ENDTEST
+ 
+ {
+ ???
+ abc ???
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=1 fo=tm
+ gqgqjgqgqjgqgqjgqgqjgqgqo
+ ?
+ ?a
+ ? a
+ ??
+ ? ?
+ ENDTEST
+ 
+ {
+ ?
+ ?a
+ ? a
+ ??
+ ? ?
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tm
+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+ ?
+ ?a
+ ? a
+ ??
+ ? ?
+ a?
+ ab?
+ abc?
+ ab? c
+ ab??
+ ENDTEST
+ 
+ {
+ ?
+ ?a
+ ? a
+ ??
+ ? ?
+ a?
+ ab?
+ abc?
+ ab? c
+ ab??
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set ai tw=2 fo=tm
+ gqgqjgqgqo
+ ?
+ ?a
+ ENDTEST
+ 
+ {
+   ?
+   ?a
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set noai tw=2 fo=tm
+ gqgqjgqgqo
+   ?
+   ?a
+ ENDTEST
+ 
+ {
+   ?
+   ?a
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=cqm comments=n:?
+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+ ?
+ ?a
+ ?a?
+ ??
+ ???
+ ? ?
+ ? ??
+ ??
+ ??a
+ ???
+ ENDTEST
+ 
+ {
+ ?
+ ?a
+ ?a?
+ ??
+ ???
+ ? ?
+ ? ??
+ ??
+ ??a
+ ???
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tm
+ R?a
+ ENDTEST
+ 
+ {
+ 
+ }
+ 
+ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
*** ../vim-7.2.300/src/testdir/test69.ok	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test69.ok	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,142 ----
+ Results of test69:
+ 
+ 
+ {
+ ???
+ abc
+ ???
+ 
+ ???
+ abc
+ ???
+ }
+ 
+ 
+ {
+ ?
+ ?
+ a
+ ?
+ a
+ ?
+ ?
+ ?
+ ?
+ 
+ ?
+ ?
+ a
+ ?
+ a
+ ?
+ ?
+ ?
+ ?
+ }
+ 
+ 
+ {
+ ?
+ ?
+ a
+ ?
+ a
+ ?
+ ?
+ ?
+ ?
+ a
+ ?
+ ab
+ ?
+ abc
+ ?
+ ab
+ ?
+ c
+ ab
+ ?
+ ?
+ 
+ ?
+ ?
+ a
+ ?
+ a
+ ?
+ ?
+ ?
+ ?
+ a
+ ?
+ ab
+ ?
+ abc
+ ?
+ ab
+ ?
+ c
+ ab
+ ?
+ ?
+ }
+ 
+ 
+ {
+   ?
+   ?
+   a
+ 
+   ?
+   ?
+   a
+ }
+ 
+ 
+ {
+   ?
+   ?
+ a
+ 
+   ?
+   ?
+ a
+ }
+ 
+ 
+ {
+ ?
+ ?a
+ ?a
+ ??
+ ??
+ ??
+ ??
+ ? ?
+ ? ?
+ ? ?
+ ??
+ ??a
+ ???
+ 
+ ?
+ ?a
+ ?a
+ ??
+ ??
+ ??
+ ??
+ ? ?
+ ? ?
+ ? ?
+ ??
+ ??a
+ ???
+ }
+ 
+ 
+ {
+ ?
+ a
+ }
+ 
*** ../vim-7.2.300/src/version.c	2009-11-17 17:37:34.000000000 +0100
--- src/version.c	2009-11-17 17:26:35.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     301,
  /**/


--- NEW FILE 7.2.302 ---
To: vim-dev at vim.org
Subject: Patch 7.2.302 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.302 (extra part of 7.2.301)
Problem:    Formatting wrong with small 'tw' value.
Solution:   Add build rules for tests.
Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
	    src/testdir/Make_vms.mms


*** ../vim-7.2.301/src/testdir/Make_amiga.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_amiga.mak	2009-11-17 15:29:05.000000000 +0100
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out test68.out test69.out
  
  .SUFFIXES: .in .out
  
***************
*** 113,115 ****
--- 113,117 ----
  test65.out: test65.in
  test66.out: test66.in
  test67.out: test67.in
+ test68.out: test68.in
+ test69.out: test69.in
*** ../vim-7.2.301/src/testdir/Make_dos.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_dos.mak	2009-11-17 15:29:54.000000000 +0100
***************
*** 26,32 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
--- 26,33 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out \
! 		test68.out test69.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.301/src/testdir/Make_ming.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_ming.mak	2009-11-17 15:30:07.000000000 +0100
***************
*** 45,51 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
--- 45,52 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out \
! 		test68.out test69.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.301/src/testdir/Make_os2.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_os2.mak	2009-11-17 15:11:26.000000000 +0100
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out test68.out test69.out
  
  .SUFFIXES: .in .out
  
*** ../vim-7.2.301/src/testdir/Make_vms.mms	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_vms.mms	2009-11-17 15:11:26.000000000 +0100
***************
*** 69,75 ****
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
--- 69,75 ----
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out test68.out test69.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
*** ../vim-7.2.301/src/version.c	2009-11-17 17:40:34.000000000 +0100
--- src/version.c	2009-11-17 17:43:26.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     302,
  /**/

-- 
Hacker: Someone skilled in computer programming (good guy).
Cracker: A hacker that uses his skills to crack software (bad guy).

 /// 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    ///


--- NEW FILE 7.2.303 ---
To: vim-dev at vim.org
Subject: Patch 7.2.303
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.303 (after 7.2.294)
Problem:    Can't build on MS-Windows.
Solution:   Add #ifdef around vim_settempdir(). (James Vega)
Files:	    src/fileio.c


*** ../vim-7.2.302/src/fileio.c	2009-11-17 17:13:03.000000000 +0100
--- src/fileio.c	2009-11-18 20:06:55.000000000 +0100
***************
*** 146,152 ****
--- 146,154 ----
  # endif
  #endif
  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+ #ifdef TEMPDIRNAMES
  static void vim_settempdir __ARGS((char_u *tempdir));
+ #endif
  #ifdef FEAT_AUTOCMD
  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
  #endif
***************
*** 6995,7000 ****
--- 6997,7003 ----
  }
  #endif
  
+ #ifdef TEMPDIRNAMES
  /*
   * Directory "tempdir" was created.  Expand this name to a full path and put
   * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
***************
*** 7021,7026 ****
--- 7024,7030 ----
  	vim_free(buf);
      }
  }
+ #endif
  
  /*
   * vim_tempname(): Return a unique name that can be used for a temp file.
*** ../vim-7.2.302/src/version.c	2009-11-17 17:57:10.000000000 +0100
--- src/version.c	2009-11-18 20:07:58.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     303,
  /**/

-- 
BEDEVERE:        Why do you think she is a witch?
SECOND VILLAGER: She turned me into a newt.
BEDEVERE:        A newt?
SECOND VILLAGER: (After looking at himself for some time) I got better.
                 "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    ///


--- NEW FILE 7.2.304 ---
To: vim-dev at vim.org
Subject: Patch 7.2.304
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.304
Problem:    Compiler warning for bad pointer cast.
Solution:   Use another variable for int pointer.
Files:	    src/ops.c


*** ../vim-7.2.303/src/ops.c	2009-11-17 12:43:19.000000000 +0100
--- src/ops.c	2009-11-18 15:40:26.000000000 +0100
***************
*** 5597,5603 ****
  	    vc.vc_type = CONV_NONE;
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
  	    {
! 		conv_str = string_convert(&vc, str, (int*)&len);
  		if (conv_str != NULL)
  		{
  		    vim_free(str);
--- 5597,5606 ----
  	    vc.vc_type = CONV_NONE;
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
  	    {
! 	        int intlen = len;
! 
! 		conv_str = string_convert(&vc, str, &intlen);
! 		len = intlen;
  		if (conv_str != NULL)
  		{
  		    vim_free(str);
*** ../vim-7.2.303/src/version.c	2009-11-18 20:12:15.000000000 +0100
--- src/version.c	2009-11-25 12:37:36.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     304,
  /**/

-- 
I recommend ordering large cargo containers of paper towels to make up
whatever budget underruns you have.  Paper products are always useful and they
have the advantage of being completely flushable if you need to make room in
the storage area later.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.305 ---
To: vim-dev at vim.org
Subject: Patch 7.2.305
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.305
Problem:    Recursively redrawing causes a memory leak. (Dominique Pelle)
Solution:   Disallow recursive screen updating.
Files:	    src/screen.c


*** ../vim-7.2.304/src/screen.c	2009-11-11 17:07:25.000000000 +0100
--- src/screen.c	2009-11-17 16:30:53.000000000 +0100
***************
*** 323,328 ****
--- 323,329 ----
      int		did_one;
  #endif
  
+     /* Don't do anything if the screen structures are (not yet) valid. */
      if (!screen_valid(TRUE))
  	return;
  
***************
*** 342,348 ****
      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
  	type = NOT_VALID;
  
!     if (!redrawing())
      {
  	redraw_later(type);		/* remember type for next time */
  	must_redraw = type;
--- 343,351 ----
      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
  	type = NOT_VALID;
  
!     /* Postpone the redrawing when it's not needed and when being called
!      * recursively. */
!     if (!redrawing() || updating_screen)
      {
  	redraw_later(type);		/* remember type for next time */
  	must_redraw = type;
***************
*** 582,587 ****
--- 585,591 ----
  
  /*
   * Prepare for updating one or more windows.
+  * Caller must check for "updating_screen" already set to avoid recursiveness.
   */
      static void
  update_prepare()
***************
*** 663,669 ****
  	    doit = TRUE;
      }
  
!     if (!doit)
  	return;
  
      /* update all windows that need updating */
--- 667,675 ----
  	    doit = TRUE;
      }
  
!     /* Return when there is nothing to do or screen updating already
!      * happening. */
!     if (!doit || updating_screen)
  	return;
  
      /* update all windows that need updating */
***************
*** 696,701 ****
--- 702,711 ----
  updateWindow(wp)
      win_T	*wp;
  {
+     /* return if already busy updating */
+     if (updating_screen)
+ 	return;
+ 
      update_prepare();
  
  #ifdef FEAT_CLIPBOARD
*** ../vim-7.2.304/src/version.c	2009-11-25 12:38:49.000000000 +0100
--- src/version.c	2009-11-25 13:01:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     305,
  /**/

-- 
If the Universe is constantly expanding, why can't I ever find a parking space?

 /// 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    ///


--- NEW FILE 7.2.306 ---
To: vim-dev at vim.org
Subject: Patch 7.2.306
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.306
Problem:    shellescape("10%%", 1) only escapes first %. (Christian Brabandt)
Solution:   Don't copy the character after the escaped one.
Files:	    src/misc2.c


*** ../vim-7.2.305/src/misc2.c	2009-11-11 16:56:13.000000000 +0100
--- src/misc2.c	2009-11-25 17:11:49.000000000 +0100
***************
*** 1390,1395 ****
--- 1390,1396 ----
  		*d++ = '\\';		/* insert backslash */
  		while (--l >= 0)	/* copy the var */
  		    *d++ = *p++;
+ 		continue;
  	    }
  
  	    MB_COPY_CHAR(p, d);
*** ../vim-7.2.305/src/version.c	2009-11-25 13:03:29.000000000 +0100
--- src/version.c	2009-11-25 17:13:54.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     306,
  /**/

-- 
Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
engineering at the Technical University of Delft and graduated in 1985 on a
multi-processor Unix architecture."
Response by "dimator": Could the school not afford a proper stage for the
ceremony?

 /// 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    ///


--- NEW FILE 7.2.307 ---
To: vim-dev at vim.org
Subject: Patch 7.2.307
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.307
Problem:    Crash with a very long syntax match statement. (Guy Gur Ari)
Solution:   When the offset does not fit in the two bytes available give an
            error instead of continuing with invalid pointers.
Files:      src/regexp.c


*** ../vim-7.2.306/src/regexp.c	2009-05-15 21:31:11.000000000 +0200
--- src/regexp.c	2009-11-25 18:13:03.000000000 +0100
***************
*** 583,588 ****
--- 583,589 ----
  #endif
  static char_u	*regcode;	/* Code-emit pointer, or JUST_CALC_SIZE */
  static long	regsize;	/* Code size. */
+ static int	reg_toolong;	/* TRUE when offset out of range */
  static char_u	had_endbrace[NSUBEXP];	/* flags, TRUE if end of () found */
  static unsigned	regflags;	/* RF_ flags for prog */
  static long	brace_min[10];	/* Minimums for complex brace repeats */
***************
*** 1028,1036 ****
      regcomp_start(expr, re_flags);
      regcode = r->program;
      regc(REGMAGIC);
!     if (reg(REG_NOPAREN, &flags) == NULL)
      {
  	vim_free(r);
  	return NULL;
      }
  
--- 1029,1039 ----
      regcomp_start(expr, re_flags);
      regcode = r->program;
      regc(REGMAGIC);
!     if (reg(REG_NOPAREN, &flags) == NULL || reg_toolong)
      {
  	vim_free(r);
+ 	if (reg_toolong)
+ 	    EMSG_RET_NULL(_("E339: Pattern too long"));
  	return NULL;
      }
  
***************
*** 1141,1146 ****
--- 1144,1150 ----
      re_has_z = 0;
  #endif
      regsize = 0L;
+     reg_toolong = FALSE;
      regflags = 0;
  #if defined(FEAT_SYN_HL) || defined(PROTO)
      had_eol = FALSE;
***************
*** 1228,1234 ****
      {
  	skipchr();
  	br = regbranch(&flags);
! 	if (br == NULL)
  	    return NULL;
  	regtail(ret, br);	/* BRANCH -> BRANCH. */
  	if (!(flags & HASWIDTH))
--- 1232,1238 ----
      {
  	skipchr();
  	br = regbranch(&flags);
! 	if (br == NULL || reg_toolong)
  	    return NULL;
  	regtail(ret, br);	/* BRANCH -> BRANCH. */
  	if (!(flags & HASWIDTH))
***************
*** 1313,1318 ****
--- 1317,1324 ----
  	    break;
  	skipchr();
  	regtail(latest, regnode(END)); /* operand ends */
+ 	if (reg_toolong)
+ 	    break;
  	reginsert(MATCH, latest);
  	chain = latest;
      }
***************
*** 1382,1388 ****
  			    break;
  	    default:
  			    latest = regpiece(&flags);
! 			    if (latest == NULL)
  				return NULL;
  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
  			    if (chain == NULL)	/* First piece. */
--- 1388,1394 ----
  			    break;
  	    default:
  			    latest = regpiece(&flags);
! 			    if (latest == NULL || reg_toolong)
  				return NULL;
  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
  			    if (chain == NULL)	/* First piece. */
***************
*** 2540,2547 ****
  	offset = (int)(scan - val);
      else
  	offset = (int)(val - scan);
!     *(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
!     *(scan + 2) = (char_u) (offset & 0377);
  }
  
  /*
--- 2546,2561 ----
  	offset = (int)(scan - val);
      else
  	offset = (int)(val - scan);
!     /* When the offset uses more than 16 bits it can no longer fit in the two
!      * bytes avaliable.  Use a global flag to avoid having to check return
!      * values in too many places. */
!     if (offset > 0xffff)
! 	reg_toolong = TRUE;
!     else
!     {
! 	*(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
! 	*(scan + 2) = (char_u) (offset & 0377);
!     }
  }
  
  /*
***************
*** 5764,5769 ****
--- 5778,5785 ----
  
  /*
   * regnext - dig the "next" pointer out of a node
+  * Returns NULL when calculating size, when there is no next item and when
+  * there is an error.
   */
      static char_u *
  regnext(p)
***************
*** 5771,5777 ****
  {
      int	    offset;
  
!     if (p == JUST_CALC_SIZE)
  	return NULL;
  
      offset = NEXT(p);
--- 5787,5793 ----
  {
      int	    offset;
  
!     if (p == JUST_CALC_SIZE || reg_toolong)
  	return NULL;
  
      offset = NEXT(p);
*** ../vim-7.2.306/src/version.c	2009-11-25 17:15:16.000000000 +0100
--- src/version.c	2009-11-25 18:14:32.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     307,
  /**/

-- 
The fastest way to get an engineer to solve a problem is to declare that the
problem is unsolvable.  No engineer can walk away from an unsolvable problem
until it's solved.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.308 ---
To: vim-dev at vim.org
Subject: Patch 7.2.308
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.308
Problem:    When using a regexp in the "\=" expression of a substitute
	    command, submatch() returns empty strings for further lines.
	    (Clockwork Jam)
Solution:   Save and restore the line number and line count when calling
	    reg_getline().
Files:	    src/regexp.c


*** ../vim-7.2.307/src/regexp.c	2009-11-25 18:21:48.000000000 +0100
--- src/regexp.c	2009-11-25 19:45:07.000000000 +0100
***************
*** 6828,6833 ****
--- 6828,6835 ----
   * that contains a call to substitute() and submatch(). */
  static regmatch_T	*submatch_match;
  static regmmatch_T	*submatch_mmatch;
+ static linenr_T		submatch_firstlnum;
+ static linenr_T		submatch_maxline;
  #endif
  
  #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
***************
*** 6941,6947 ****
  	}
  	else
  	{
- 	    linenr_T	save_reg_maxline;
  	    win_T	*save_reg_win;
  	    int		save_ireg_ic;
  
--- 6943,6948 ----
***************
*** 6953,6959 ****
  	     * vim_regexec_multi() can't be called recursively. */
  	    submatch_match = reg_match;
  	    submatch_mmatch = reg_mmatch;
! 	    save_reg_maxline = reg_maxline;
  	    save_reg_win = reg_win;
  	    save_ireg_ic = ireg_ic;
  	    can_f_submatch = TRUE;
--- 6954,6961 ----
  	     * vim_regexec_multi() can't be called recursively. */
  	    submatch_match = reg_match;
  	    submatch_mmatch = reg_mmatch;
! 	    submatch_firstlnum = reg_firstlnum;
! 	    submatch_maxline = reg_maxline;
  	    save_reg_win = reg_win;
  	    save_ireg_ic = ireg_ic;
  	    can_f_submatch = TRUE;
***************
*** 6976,6982 ****
  
  	    reg_match = submatch_match;
  	    reg_mmatch = submatch_mmatch;
! 	    reg_maxline = save_reg_maxline;
  	    reg_win = save_reg_win;
  	    ireg_ic = save_ireg_ic;
  	    can_f_submatch = FALSE;
--- 6978,6985 ----
  
  	    reg_match = submatch_match;
  	    reg_mmatch = submatch_mmatch;
! 	    reg_firstlnum = submatch_firstlnum;
! 	    reg_maxline = submatch_maxline;
  	    reg_win = save_reg_win;
  	    ireg_ic = save_ireg_ic;
  	    can_f_submatch = FALSE;
***************
*** 7212,7217 ****
--- 7215,7243 ----
  
  #ifdef FEAT_EVAL
  /*
+  * Call reg_getline() with the line numbers from the submatch.  If a
+  * substitute() was used the reg_maxline and other values have been
+  * overwritten.
+  */
+     static char_u *
+ reg_getline_submatch(lnum)
+     linenr_T	lnum;
+ {
+     char_u *s;
+     linenr_T save_first = reg_firstlnum;
+     linenr_T save_max = reg_maxline;
+ 
+     reg_firstlnum = submatch_firstlnum;
+     reg_maxline = submatch_maxline;
+ 
+     s = reg_getline(lnum);
+ 
+     reg_firstlnum = save_first;
+     reg_maxline = save_max;
+     return s;
+ }
+ 
+ /*
   * Used for the submatch() function: get the string from the n'th submatch in
   * allocated memory.
   * Returns NULL when not in a ":s" command and for a non-existing submatch.
***************
*** 7241,7247 ****
  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
  		return NULL;
  
! 	    s = reg_getline(lnum) + submatch_mmatch->startpos[no].col;
  	    if (s == NULL)  /* anti-crash check, cannot happen? */
  		break;
  	    if (submatch_mmatch->endpos[no].lnum == lnum)
--- 7267,7273 ----
  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
  		return NULL;
  
! 	    s = reg_getline_submatch(lnum) + submatch_mmatch->startpos[no].col;
  	    if (s == NULL)  /* anti-crash check, cannot happen? */
  		break;
  	    if (submatch_mmatch->endpos[no].lnum == lnum)
***************
*** 7267,7273 ****
  		++lnum;
  		while (lnum < submatch_mmatch->endpos[no].lnum)
  		{
! 		    s = reg_getline(lnum++);
  		    if (round == 2)
  			STRCPY(retval + len, s);
  		    len += (int)STRLEN(s);
--- 7293,7299 ----
  		++lnum;
  		while (lnum < submatch_mmatch->endpos[no].lnum)
  		{
! 		    s = reg_getline_submatch(lnum++);
  		    if (round == 2)
  			STRCPY(retval + len, s);
  		    len += (int)STRLEN(s);
***************
*** 7276,7282 ****
  		    ++len;
  		}
  		if (round == 2)
! 		    STRNCPY(retval + len, reg_getline(lnum),
  					     submatch_mmatch->endpos[no].col);
  		len += submatch_mmatch->endpos[no].col;
  		if (round == 2)
--- 7302,7308 ----
  		    ++len;
  		}
  		if (round == 2)
! 		    STRNCPY(retval + len, reg_getline_submatch(lnum),
  					     submatch_mmatch->endpos[no].col);
  		len += submatch_mmatch->endpos[no].col;
  		if (round == 2)
*** ../vim-7.2.307/src/version.c	2009-11-25 18:21:48.000000000 +0100
--- src/version.c	2009-11-25 19:50:16.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     308,
  /**/

-- 
Engineers are always delighted to share wisdom, even in areas in which they
have no experience whatsoever.  Their logic provides them with inherent
insight into any field of expertise.  This can be a problem when dealing with
the illogical people who believe that knowledge can only be derived through
experience.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.309 ---
To: vim-dev at vim.org
Subject: Patch 7.2.309
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.309 (after 7.2.308)
Problem:    Warning for missing function prototype. (Patrick Texier)
Solution:   Add the prototype.
Files:	    src/regexp.c


*** ../vim-7.2.308/src/regexp.c	2009-11-25 19:51:56.000000000 +0100
--- src/regexp.c	2009-11-26 20:39:18.000000000 +0100
***************
*** 7214,7219 ****
--- 7214,7221 ----
  }
  
  #ifdef FEAT_EVAL
+ static char_u *reg_getline_submatch __ARGS((linenr_T lnum));
+ 
  /*
   * Call reg_getline() with the line numbers from the submatch.  If a
   * substitute() was used the reg_maxline and other values have been
*** ../vim-7.2.308/src/version.c	2009-11-25 19:51:56.000000000 +0100
--- src/version.c	2009-11-26 20:40:11.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     309,
  /**/

-- 
Female engineers become irresistible at the age of consent and remain that
way until about thirty minutes after their clinical death.  Longer if it's a
warm day.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.310 ---
To: vim-dev at vim.org
Subject: Patch 7.2.310
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.310
Problem:    When a filetype plugin in ~/.vim/ftdetect uses ":setfiletype" and
	    the file starts with a "# comment" it gets "conf" filetype.
Solution:   Check for "conf" filetype after using ftdetect plugins.
Files:	    runtime/filetype.vim


*** ../vim-7.2.309/runtime/filetype.vim	2008-08-06 18:56:36.000000000 +0200
--- runtime/filetype.vim	2009-12-02 12:08:42.000000000 +0100
***************
*** 2400,2405 ****
--- 2435,2446 ----
  au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
  
  
+ 
+ " Use the filetype detect plugins.  They may overrule any of the previously
+ " detected filetypes.
+ runtime! ftdetect/*.vim
+ 
+ 
  " Generic configuration file (check this last, it's just guessing!)
  au BufNewFile,BufRead,StdinReadPost *
  	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
***************
*** 2408,2417 ****
  	\   setf conf |
  	\ endif
  
- " Use the plugin-filetype checks last, they may overrule any of the previously
- " detected filetypes.
- runtime! ftdetect/*.vim
- 
  augroup END
  
  
--- 2449,2454 ----
*** ../vim-7.2.309/src/version.c	2009-11-26 20:41:19.000000000 +0100
--- src/version.c	2009-12-02 12:05:27.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     310,
  /**/

-- 
A)bort, R)etry, P)lease don't bother me again

 /// 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    ///


--- NEW FILE 7.2.311 ---
To: vim-dev at vim.org
Subject: Patch 7.2.311
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.311
Problem:    Can't compile with FreeMiNT.
Solution:   Change #ifdef for limits.h. (Alan Hourihane)
Files:	    src/fileio.c


*** ../vim-7.2.310/src/fileio.c	2009-11-18 20:12:15.000000000 +0100
--- src/fileio.c	2009-12-02 13:30:07.000000000 +0100
***************
*** 21,27 ****
  
  #include "vim.h"
  
! #ifdef __TANDEM
  # include <limits.h>		/* for SSIZE_MAX */
  #endif
  
--- 21,27 ----
  
  #include "vim.h"
  
! #if defined(__TANDEM) || defined(__MINT__)
  # include <limits.h>		/* for SSIZE_MAX */
  #endif
  
*** ../vim-7.2.310/src/version.c	2009-12-02 12:08:57.000000000 +0100
--- src/version.c	2009-12-02 13:31:46.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     311,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
3. Your bookmark takes 15 minutes to scroll from top to bottom.

 /// 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    ///


--- NEW FILE 7.2.312 ---
To: vim-dev at vim.org
Subject: Patch 7.2.312
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.312
Problem:    iconv() returns an invalid character sequence when conversion
	    fails.  It should return an empty string. (Yongwei Wu)
Solution:   Be more strict about invalid characters in the input.
Files:	    src/mbyte.c


*** ../vim-7.2.311/src/mbyte.c	2009-06-16 15:23:07.000000000 +0200
--- src/mbyte.c	2009-11-25 16:10:44.000000000 +0100
***************
*** 133,154 ****
  static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
! /* Lookup table to quickly get the length in bytes of a UTF-8 character from
!  * the first byte of a UTF-8 string.  Bytes which are illegal when used as the
!  * first byte have a one, because these will be used separately. */
  static char utf8len_tab[256] =
  {
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
  };
  
  /*
   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
   * in the "xim.log" file.
   */
--- 133,172 ----
  static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
! /*
!  * Lookup table to quickly get the length in bytes of a UTF-8 character from
!  * the first byte of a UTF-8 string.
!  * Bytes which are illegal when used as the first byte have a 1.
!  * The NUL byte has length 1.
!  */
  static char utf8len_tab[256] =
  {
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
  };
  
  /*
+  * Like utf8len_tab above, but using a zero for illegal lead bytes.
+  */
+ static char utf8len_tab_zero[256] =
+ {
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     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,0,
+     2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+     3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0,
+ };
+ 
+ /*
   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
   * in the "xim.log" file.
   */
***************
*** 1352,1358 ****
      if (size > 0 && *p >= 0x80)
      {
  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
! 	    return 1;
  	c = utf_ptr2char(p);
  	/* An illegal byte is displayed as <xx>. */
  	if (utf_ptr2len(p) == 1 || c == NUL)
--- 1370,1376 ----
      if (size > 0 && *p >= 0x80)
      {
  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
! 	    return 1;  /* truncated */
  	c = utf_ptr2char(p);
  	/* An illegal byte is displayed as <xx>. */
  	if (utf_ptr2len(p) == 1 || c == NUL)
***************
*** 1473,1479 ****
      if (p[0] < 0x80)	/* be quick for ASCII */
  	return p[0];
  
!     len = utf8len_tab[p[0]];
      if (len > 1 && (p[1] & 0xc0) == 0x80)
      {
  	if (len == 2)
--- 1491,1497 ----
      if (p[0] < 0x80)	/* be quick for ASCII */
  	return p[0];
  
!     len = utf8len_tab_zero[p[0]];
      if (len > 1 && (p[1] & 0xc0) == 0x80)
      {
  	if (len == 2)
***************
*** 1723,1728 ****
--- 1741,1747 ----
  /*
   * Return length of UTF-8 character, obtained from the first byte.
   * "b" must be between 0 and 255!
+  * Returns 1 for an invalid first byte value.
   */
      int
  utf_byte2len(b)
***************
*** 1737,1742 ****
--- 1756,1762 ----
   * Returns 1 for "".
   * Returns 1 for an illegal byte sequence (also in incomplete byte seq.).
   * Returns number > "size" for an incomplete byte sequence.
+  * Never returns zero.
   */
      int
  utf_ptr2len_len(p, size)
***************
*** 1747,1757 ****
      int		i;
      int		m;
  
!     if (*p == NUL)
! 	return 1;
!     m = len = utf8len_tab[*p];
      if (len > size)
  	m = size;	/* incomplete byte sequence. */
      for (i = 1; i < m; ++i)
  	if ((p[i] & 0xc0) != 0x80)
  	    return 1;
--- 1767,1779 ----
      int		i;
      int		m;
  
!     len = utf8len_tab[*p];
!     if (len == 1)
! 	return 1;	/* NUL, ascii or illegal lead byte */
      if (len > size)
  	m = size;	/* incomplete byte sequence. */
+     else
+ 	m = len;
      for (i = 1; i < m; ++i)
  	if ((p[i] & 0xc0) != 0x80)
  	    return 1;
***************
*** 2505,2510 ****
--- 2527,2533 ----
  /*
   * mb_head_off() function pointer.
   * Return offset from "p" to the first byte of the character it points into.
+  * If "p" points to the NUL at the end of the string return 0.
   * Returns 0 when already at the first byte of a character.
   */
      int
***************
*** 2524,2530 ****
  
      /* It can't be a trailing byte when not using DBCS, at the start of the
       * string or the previous byte can't start a double-byte. */
!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
--- 2547,2553 ----
  
      /* It can't be a trailing byte when not using DBCS, at the start of the
       * string or the previous byte can't start a double-byte. */
!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
***************
*** 2552,2558 ****
       * lead byte in the current cell. */
      if (p <= base
  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
! 	    || MB_BYTE2LEN(p[-1]) == 1)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
--- 2575,2582 ----
       * lead byte in the current cell. */
      if (p <= base
  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
! 	    || MB_BYTE2LEN(p[-1]) == 1
! 	    || *p == NUL)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
***************
*** 2578,2583 ****
--- 2602,2608 ----
      char_u	*q;
      char_u	*s;
      int		c;
+     int		len;
  #ifdef FEAT_ARABIC
      char_u	*j;
  #endif
***************
*** 2597,2604 ****
  	    --q;
  	/* Check for illegal sequence. Do allow an illegal byte after where we
  	 * started. */
! 	if (utf8len_tab[*q] != (int)(s - q + 1)
! 				       && utf8len_tab[*q] != (int)(p - q + 1))
  	    return 0;
  
  	if (q <= base)
--- 2622,2629 ----
  	    --q;
  	/* Check for illegal sequence. Do allow an illegal byte after where we
  	 * started. */
! 	len = utf8len_tab[*q];
! 	if (len != (int)(s - q + 1) && len != (int)(p - q + 1))
  	    return 0;
  
  	if (q <= base)
***************
*** 2810,2818 ****
  
      while (end == NULL ? *p != NUL : p < end)
      {
! 	if ((*p & 0xc0) == 0x80)
  	    return FALSE;	/* invalid lead byte */
- 	l = utf8len_tab[*p];
  	if (end != NULL && p + l > end)
  	    return FALSE;	/* incomplete byte sequence */
  	++p;
--- 2835,2843 ----
  
      while (end == NULL ? *p != NUL : p < end)
      {
! 	l = utf8len_tab_zero[*p];
! 	if (l == 0)
  	    return FALSE;	/* invalid lead byte */
  	if (end != NULL && p + l > end)
  	    return FALSE;	/* incomplete byte sequence */
  	++p;
***************
*** 6117,6128 ****
  	    d = retval;
  	    for (i = 0; i < len; ++i)
  	    {
! 		l = utf_ptr2len(ptr + i);
  		if (l == 0)
  		    *d++ = NUL;
  		else if (l == 1)
  		{
! 		    if (unconvlenp != NULL && utf8len_tab[ptr[i]] > len - i)
  		    {
  			/* Incomplete sequence at the end. */
  			*unconvlenp = len - i;
--- 6142,6161 ----
  	    d = retval;
  	    for (i = 0; i < len; ++i)
  	    {
! 		l = utf_ptr2len_len(ptr + i, len - i);
  		if (l == 0)
  		    *d++ = NUL;
  		else if (l == 1)
  		{
! 		    int l_w = utf8len_tab_zero[ptr[i]];
! 
! 		    if (l_w == 0)
! 		    {
! 			/* Illegal utf-8 byte cannot be converted */
! 			vim_free(retval);
! 			return NULL;
! 		    }
! 		    if (unconvlenp != NULL && l_w > len - i)
  		    {
  			/* Incomplete sequence at the end. */
  			*unconvlenp = len - i;
*** ../vim-7.2.311/src/version.c	2009-12-02 13:32:10.000000000 +0100
--- src/version.c	2009-12-02 15:00:23.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     312,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
6. You refuse to go to a vacation spot with no electricity and no phone lines.

 /// 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    ///


--- NEW FILE 7.2.313 ---
To: vim-dev at vim.org
Subject: Patch 7.2.313
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.313
Problem:    Command line completion doesn't work after "%:h" and similar.
Solution:   Expand these items before doing the completion.
Files:	    src/ex_getln.c, src/misc1.c, src/proto/misc1.pro


*** ../vim-7.2.312/src/ex_getln.c	2009-09-18 17:24:54.000000000 +0200
--- src/ex_getln.c	2009-12-02 16:40:06.000000000 +0100
***************
*** 4422,4428 ****
  	    flags |= EW_FILE;
  	else
  	    flags = (flags | EW_DIR) & ~EW_FILE;
! 	ret = expand_wildcards(1, &pat, num_file, file, flags);
  	if (free_pat)
  	    vim_free(pat);
  	return ret;
--- 4422,4429 ----
  	    flags |= EW_FILE;
  	else
  	    flags = (flags | EW_DIR) & ~EW_FILE;
! 	/* Expand wildcards, supporting %:h and the like. */
! 	ret = expand_wildcards_eval(&pat, num_file, file, flags);
  	if (free_pat)
  	    vim_free(pat);
  	return ret;
*** ../vim-7.2.312/src/misc1.c	2009-11-17 16:08:12.000000000 +0100
--- src/misc1.c	2009-12-02 17:06:49.000000000 +0100
***************
*** 8447,8452 ****
--- 8447,8492 ----
  }
  
  /*
+  * Invoke expand_wildcards() for one pattern.
+  * Expand items like "%:h" before the expansion.
+  * Returns OK or FAIL.
+  */
+     int
+ expand_wildcards_eval(pat, num_file, file, flags)
+     char_u	 **pat;		/* pointer to input pattern */
+     int		  *num_file;	/* resulting number of files */
+     char_u	***file;	/* array of resulting files */
+     int		   flags;	/* EW_DIR, etc. */
+ {
+     int		ret = FAIL;
+     char_u	*eval_pat = NULL;
+     char_u	*exp_pat = *pat;
+     char_u      *ignored_msg;
+     int		usedlen;
+ 
+     if (*exp_pat == '%' || *exp_pat == '#' || *exp_pat == '<')
+     {
+ 	++emsg_off;
+ 	eval_pat = eval_vars(exp_pat, exp_pat, &usedlen,
+ 						    NULL, &ignored_msg, NULL);
+ 	--emsg_off;
+ 	if (eval_pat != NULL)
+ 	    exp_pat = concat_str(eval_pat, exp_pat + usedlen);
+     }
+ 
+     if (exp_pat != NULL)
+ 	ret = expand_wildcards(1, &exp_pat, num_file, file, flags);
+ 
+     if (eval_pat != NULL)
+     {
+ 	vim_free(exp_pat);
+ 	vim_free(eval_pat);
+     }
+ 
+     return ret;
+ }
+ 
+ /*
   * Expand wildcards.  Calls gen_expand_wildcards() and removes files matching
   * 'wildignore'.
   * Returns OK or FAIL.
*** ../vim-7.2.312/src/proto/misc1.pro	2007-09-26 22:36:32.000000000 +0200
--- src/proto/misc1.pro	2009-12-02 16:41:52.000000000 +0100
***************
*** 85,90 ****
--- 85,91 ----
  int vim_fexists __ARGS((char_u *fname));
  void line_breakcheck __ARGS((void));
  void fast_breakcheck __ARGS((void));
+ int expand_wildcards_eval __ARGS((char_u **pat, int *num_file, char_u ***file, int flags));
  int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
  int match_suffix __ARGS((char_u *fname));
  int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
*** ../vim-7.2.312/src/version.c	2009-12-02 15:03:24.000000000 +0100
--- src/version.c	2009-12-02 17:14:02.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     313,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
8. You spend half of the plane trip with your laptop on your lap...and your
   child in the overhead compartment.

 /// 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    ///


--- NEW FILE 7.2.314 ---
To: vim-dev at vim.org
Subject: Patch 7.2.314
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.314
Problem:    Missing function in small build.
Solution:   Always include concat_str.
Files:	    src/misc1.c


*** ../vim-7.2.313/src/misc1.c	2009-12-02 17:15:04.000000000 +0100
--- src/misc1.c	2009-12-02 17:44:55.000000000 +0100
***************
*** 4666,4672 ****
      return dest;
  }
  
- #if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
  /*
   * Concatenate two strings and return the result in allocated memory.
   * Returns NULL when out of memory.
--- 4666,4671 ----
***************
*** 4687,4693 ****
      }
      return dest;
  }
- #endif
  
  /*
   * Add a path separator to a file name, unless it already ends in a path
--- 4686,4691 ----
*** ../vim-7.2.313/src/version.c	2009-12-02 17:15:04.000000000 +0100
--- src/version.c	2009-12-02 17:47:18.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     314,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
9. All your daydreaming is preoccupied with getting a faster connection to the
   net: 28.8...ISDN...cable modem...T1...T3.

 /// 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    ///


--- NEW FILE 7.2.315 ---
To: vim-dev at vim.org
Subject: Patch 7.2.315
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.315
Problem:    Python libs can't be found on 64 bit system.
Solution:   Add lib64 to the list of directories. (Michael Henry)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.314/src/auto/configure	2009-11-17 17:13:03.000000000 +0100
--- src/auto/configure	2009-12-02 17:21:20.000000000 +0100
***************
*** 5126,5132 ****
  
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
--- 5126,5132 ----
  
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib64 lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
***************
*** 13718,13725 ****
  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
        else
  	vim_cv_tty_group=world
! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5
! $as_echo "ptys are world accessable" >&6; }
        fi
  
  else
--- 13718,13725 ----
  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
        else
  	vim_cv_tty_group=world
! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5
! $as_echo "ptys are world accessible" >&6; }
        fi
  
  else
***************
*** 13730,13737 ****
  ( exit $ac_status )
  
        vim_cv_tty_group=world
!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5
! $as_echo "can't determine - assume ptys are world accessable" >&6; }
  
  fi
  rm -rf conftest.dSYM
--- 13730,13737 ----
  ( exit $ac_status )
  
        vim_cv_tty_group=world
!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5
! $as_echo "can't determine - assume ptys are world accessible" >&6; }
  
  fi
  rm -rf conftest.dSYM
*** ../vim-7.2.314/src/configure.in	2009-11-17 17:13:03.000000000 +0100
--- src/configure.in	2009-12-02 17:21:10.000000000 +0100
***************
*** 686,692 ****
        [
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
--- 686,692 ----
        [
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib64 lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
***************
*** 2557,2567 ****
  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
        else
  	vim_cv_tty_group=world
! 	AC_MSG_RESULT([ptys are world accessable])
        fi
      ],[
        vim_cv_tty_group=world
!       AC_MSG_RESULT([can't determine - assume ptys are world accessable])
      ],[
        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
      ])
--- 2557,2567 ----
  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
        else
  	vim_cv_tty_group=world
! 	AC_MSG_RESULT([ptys are world accessible])
        fi
      ],[
        vim_cv_tty_group=world
!       AC_MSG_RESULT([can't determine - assume ptys are world accessible])
      ],[
        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
      ])
*** ../vim-7.2.314/src/version.c	2009-12-02 17:47:46.000000000 +0100
--- src/version.c	2009-12-02 17:57:39.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     315,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
10. And even your night dreams are in HTML.

 /// 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    ///

vim-7.2-elinks-parameter-518791.patch:
 netrw.vim |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.2-elinks-parameter-518791.patch ---
diff -up vim72/runtime/autoload/netrw.vim.elinksparm vim72/runtime/autoload/netrw.vim
--- vim72/runtime/autoload/netrw.vim.elinksparm	2009-12-03 13:08:10.000000000 +0100
+++ vim72/runtime/autoload/netrw.vim	2009-12-03 13:08:27.000000000 +0100
@@ -88,7 +88,7 @@ if !exists("g:netrw_http_cmd")
  if executable("elinks")
   let g:netrw_http_cmd = "elinks"
   if !exists("g:netrw_http_xcmd")
-   let g:netrw_http_xcmd= "-dump >"
+   let g:netrw_http_xcmd= "-source >"
   endif
  elseif executable("links")
   let g:netrw_http_cmd = "links"

vim-7.2-httpfiletype-499123.patch:
 filetype.vim |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.2-httpfiletype-499123.patch ---
diff -up vim72/runtime/filetype.vim.499123 vim72/runtime/filetype.vim
--- vim72/runtime/filetype.vim.499123	2009-12-02 17:42:47.000000000 +0100
+++ vim72/runtime/filetype.vim	2009-12-02 17:43:52.000000000 +0100
@@ -111,7 +111,7 @@ au BufNewFile,BufRead proftpd.conf*		cal
 
 " Apache config file
 au BufNewFile,BufRead .htaccess			 setf apache
-au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
+au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/httpd/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
 
 " XA65 MOS6510 cross assembler
 au BufNewFile,BufRead *.a65			setf a65


Index: gvim.desktop
===================================================================
RCS file: /cvs/extras/rpms/vim/F-12/gvim.desktop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gvim.desktop	20 Oct 2008 13:28:53 -0000	1.7
+++ gvim.desktop	3 Dec 2009 13:40:06 -0000	1.8
@@ -55,7 +55,7 @@ Comment[tr]=G??l? vi d?zenleyicisi
 Comment[uk]=???????? ???????? vi
 Comment[zh_CN.GB2312]=????? vi ???
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %f
+Exec=gvim -f %F
 Icon=gvim
 Type=Application
 Terminal=0

vim-7.2-fstabsyntax.patch:
 fstab.vim |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: vim-7.2-fstabsyntax.patch
===================================================================
RCS file: /cvs/extras/rpms/vim/F-12/vim-7.2-fstabsyntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vim-7.2-fstabsyntax.patch	14 Aug 2008 16:06:02 -0000	1.1
+++ vim-7.2-fstabsyntax.patch	3 Dec 2009 13:40:06 -0000	1.2
@@ -6,7 +6,7 @@ diff -up vim72/runtime/syntax/fstab.vim.
  syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
  syn match fsTypeUnknown /\s\+\zs\w\+/ contained
 -syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
-+syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
  
  " Options
  " -------


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/F-12/vim.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- vim.spec	20 Aug 2009 21:43:34 -0000	1.240
+++ vim.spec	3 Dec 2009 13:40:06 -0000	1.241
@@ -18,13 +18,13 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 245
+%define patchlevel 315
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -311,6 +311,76 @@ Patch242: ftp://ftp.vim.org/pub/vim/patc
 Patch243: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.243
 Patch244: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.244
 Patch245: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.245
+Patch246: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.246
+Patch247: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.247
+Patch248: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.248
+Patch249: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.249
+Patch250: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.250
+Patch251: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.251
+Patch252: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.252
+Patch253: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.253
+Patch254: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.254
+Patch255: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.255
+Patch256: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.256
+Patch257: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.257
+Patch258: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.258
+Patch259: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.259
+Patch260: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.260
+Patch261: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.261
+Patch262: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.262
+Patch263: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.263
+Patch264: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.264
+Patch265: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.265
+Patch266: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.266
+Patch267: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.267
+Patch268: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.268
+Patch269: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.269
+Patch270: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.270
+Patch271: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.271
+Patch272: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.272
+Patch273: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.273
+Patch274: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.274
+Patch275: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.275
+Patch276: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.276
+Patch277: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.277
+Patch278: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.278
+Patch279: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.279
+Patch280: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.280
+Patch281: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.281
+Patch282: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.282
+Patch283: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.283
+Patch284: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.284
+Patch285: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.285
+Patch286: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.286
+Patch287: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.287
+Patch288: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.288
+Patch289: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.289
+Patch290: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.290
+Patch291: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.291
+Patch292: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.292
+Patch293: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.293
+Patch294: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.294
+Patch295: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.295
+Patch296: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.296
+Patch297: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.297
+Patch298: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.298
+Patch299: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.299
+Patch300: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.300
+Patch301: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301
+Patch302: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.302
+Patch303: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.303
+Patch304: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.304
+Patch305: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.305
+Patch306: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.306
+Patch307: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.307
+Patch308: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.308
+Patch309: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.309
+Patch310: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.310
+Patch311: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.311
+Patch312: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.312
+Patch313: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.313
+Patch314: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.314
+Patch315: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.315
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -318,11 +388,12 @@ Patch3003: vim-6.1-rh3.patch
 Patch3004: vim-7.0-rclocation.patch
 Patch3006: vim-6.4-checkhl.patch
 Patch3007: vim-7.2-fstabsyntax.patch
-Patch3008: vim-7.1-lib64.patch
-Patch3009: vim-7.0-warning.patch
-Patch3010: vim-7.0-syncolor.patch
-Patch3011: vim-7.0-specedit.patch
-Patch3012: vim72-rh514717.patch
+Patch3008: vim-7.0-warning.patch
+Patch3009: vim-7.0-syncolor.patch
+Patch3010: vim-7.0-specedit.patch
+Patch3011: vim72-rh514717.patch
+Patch3012: vim-7.2-httpfiletype-499123.patch
+Patch3013: vim-7.2-elinks-parameter-518791.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel ncurses-devel gettext perl-devel
@@ -331,6 +402,9 @@ BuildRequires: libacl-devel gpm-devel au
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
 %endif
+%if "%{withruby}" == "1"
+Buildrequires: ruby-devel ruby
+%endif
 %if %{desktop_file}
 # for /usr/bin/desktop-file-install
 Requires: desktop-file-utils
@@ -690,6 +764,76 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runti
 %patch243 -p0 
 %patch244 -p0 
 %patch245 -p0 
+%patch246 -p0 
+%patch247 -p0 
+%patch248 -p0 
+%patch249 -p0 
+%patch250 -p0 
+%patch251 -p0 
+%patch252 -p0 
+%patch253 -p0 
+%patch254 -p0 
+%patch255 -p0 
+%patch256 -p0 
+%patch257 -p0 
+%patch258 -p0 
+%patch259 -p0 
+%patch260 -p0 
+%patch261 -p0 
+%patch262 -p0 
+%patch263 -p0 
+%patch264 -p0 
+%patch265 -p0 
+%patch266 -p0 
+%patch267 -p0 
+%patch268 -p0 
+%patch269 -p0 
+%patch270 -p0 
+%patch271 -p0 
+%patch272 -p0 
+%patch273 -p0 
+%patch274 -p0 
+%patch275 -p0 
+%patch276 -p0 
+%patch277 -p0 
+%patch278 -p0 
+%patch279 -p0 
+%patch280 -p0 
+%patch281 -p0 
+%patch282 -p0 
+%patch283 -p0 
+%patch284 -p0 
+%patch285 -p0                                          
+%patch286 -p0                                          
+%patch287 -p0                                          
+%patch288 -p0                                          
+%patch289 -p0                                          
+%patch290 -p0                                          
+%patch291 -p0                                          
+%patch292 -p0                                          
+%patch293 -p0                                          
+%patch294 -p0                                          
+%patch295 -p0                                          
+%patch296 -p0                                          
+%patch297 -p0                                          
+%patch298 -p0                                          
+%patch299 -p0                                          
+%patch300 -p0                                          
+%patch301 -p0                                          
+%patch302 -p0                                          
+%patch303 -p0                                          
+%patch304 -p0                                          
+%patch305 -p0                                          
+%patch306 -p0                                          
+%patch307 -p0
+%patch308 -p0
+%patch309 -p0
+%patch310 -p0
+%patch311 -p0
+%patch312 -p0
+%patch313 -p0
+%patch314 -p0
+%patch315 -p0
 
 
 # install spell files
@@ -719,12 +863,15 @@ cp -f %{SOURCE20} runtime/autoload/tar.v
 cp -f %{SOURCE21} runtime/autoload/netrwFileHandlers.vim
 cp -f %{SOURCE22} runtime/autoload/netrw.vim
 cp -f %{SOURCE23} runtime/autoload/netrwSettings.vim
-
+%patch3013 -p1
 
 %build
 cd src
 autoconf
 
+sed -e "s+VIMRCLOC	= \$(VIMLOC)+VIMRCLOC	= /etc+" Makefile > Makefile.tmp
+mv -f Makefile.tmp Makefile
+
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 
@@ -751,7 +898,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_S
   --disable-rubyinterp \
 %endif
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim gvim
 make clean
 
@@ -777,7 +924,7 @@ make clean
   --disable-rubyinterp \
 %endif
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim enhanced-vim
 make clean
 
@@ -796,7 +943,7 @@ perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/
   --with-compiledby="<bugzilla at redhat.com>" \
   --with-modified-by="<bugzilla at redhat.com>"
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -812,8 +959,8 @@ rm -f README*.info
 
 
 cd src
-make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
-make installgtutorbin  DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
+make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
+make installgtutorbin  DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
 mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd
 mv $RPM_BUILD_ROOT/bin/gvimtutor $RPM_BUILD_ROOT/%{_bindir}/gvimtutor
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
@@ -853,8 +1000,8 @@ install -m755 enhanced-vim $RPM_BUILD_RO
     mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
     desktop-file-install --vendor fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-        --add-category "Development;TextEditor;X-Red-Hat-Base" \
         %{SOURCE3}
+        # --add-category "Development;TextEditor;X-Red-Hat-Base" D\
   %else
     mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
     cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
@@ -922,6 +1069,7 @@ vi-Bram.txt	vi_help.txt	/*vi-Bram*
 vi-Moolenaar.txt	vi_help.txt	/*vi-Moolenaar*
 vi-credits.txt	vi_help.txt	/*vi-credits*
 EOF
+LANG=C sort tags > tags.tmp; mv tags.tmp tags
  )
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
 rm -f $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
@@ -1150,6 +1298,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Dec 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.315-1
+- patchlevel 315
+- fix vimrc location in man page (#456992)
+- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
+- Buildrequire ruby, ruby-devel (#503872)
+- Remove check for static gravity (#510307)
+- sort tags file (#517725)
+- use one gvim to open multiple file selections from nautilus (#519265)
+- use elinks -source instead of elinks -dump (#518791)
+- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
+
+* Mon Nov 09 2009 Karsten Hopp <karsten at redhat.com> 7.2.284-1
+- patchlevel 284
+
 * Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-3
 - change range of system ids in /etc/profile.d/vim/* (#518555)
 


Index: vimrc
===================================================================
RCS file: /cvs/extras/rpms/vim/F-12/vimrc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- vimrc	3 Jun 2008 14:34:32 -0000	1.20
+++ vimrc	3 Dec 2009 13:40:06 -0000	1.21
@@ -16,7 +16,7 @@ if has("autocmd")
   augroup fedora
   autocmd!
   " In text files, always limit the width of text to 78 characters
-  autocmd BufRead *.txt set tw=78
+  " autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
   \ if line("'\"") > 0 && line ("'\"") <= line("$") |



From jorton at fedoraproject.org  Thu Dec  3 13:44:51 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 13:44:51 +0000 (UTC)
Subject: rpms/expat/F-11 expat-1.95.8-CVE-2009-3560.patch, NONE,
	1.1 expat-2.0.1-confcxx.patch, NONE, 1.1 expat.spec, 1.33, 1.34
Message-ID: <20091203134451.AC35A11C00EE@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/expat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18176

Modified Files:
	expat.spec 
Added Files:
	expat-1.95.8-CVE-2009-3560.patch expat-2.0.1-confcxx.patch 
Log Message:
* Tue Dec  1 2009 Joe Orton <jorton at redhat.com> - 2.0.1-8
- add security fix for CVE-2009-3560 (#533174)
- run the test suite


expat-1.95.8-CVE-2009-3560.patch:
 xmlparse.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE expat-1.95.8-CVE-2009-3560.patch ---

http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.164&r2=1.165

--- expat-1.95.8/lib/xmlparse.c.cve3560
+++ expat-1.95.8/lib/xmlparse.c
@@ -3637,7 +3637,6 @@ doProlog(XML_Parser parser,
         return XML_ERROR_NO_ELEMENTS;
       default:
         tok = -tok;
-        next = end;
         break;
       }
     }

expat-2.0.1-confcxx.patch:
 configure.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE expat-2.0.1-confcxx.patch ---

Configure for C++ too so the testsuite works.

--- expat-2.0.1/configure.in.confcxx
+++ expat-2.0.1/configure.in
@@ -62,6 +62,7 @@ AC_SUBST(LIBAGE)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_INSTALL
 
 if test "$GCC" = yes ; then


Index: expat.spec
===================================================================
RCS file: /cvs/extras/rpms/expat/F-11/expat.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- expat.spec	30 Oct 2009 16:03:02 -0000	1.33
+++ expat.spec	3 Dec 2009 13:44:51 -0000	1.34
@@ -1,14 +1,16 @@
 Summary: An XML parser library
 Name: expat
 Version: 2.0.1
-Release: 6%{?dist}.1
+Release: 8%{?dist}
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
-Patch1: expat-1.95.8-CVE-2009-3720.patch
+Patch1: expat-2.0.1-confcxx.patch
+Patch2: expat-1.95.8-CVE-2009-3560.patch
+Patch3: expat-1.95.8-CVE-2009-3720.patch
 URL: http://www.libexpat.org/
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, automake, libtool
+BuildRequires: autoconf, automake, libtool, check-devel
 
 %description
 This is expat, the C library for parsing XML, written by James Clark. Expat
@@ -29,11 +31,13 @@ to develop XML applications with expat.
 
 %prep
 %setup -q
-%patch1 -p1 -b .cve3720
+%patch1 -p1 -b .confcxx
+%patch2 -p1 -b .cve3560
+%patch3 -p1 -b .cve3720
 
 %build
 rm -rf autom4te*.cache
-cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1
+rm conftools/libtool.m4
 libtoolize --copy --force --automake && aclocal && autoheader && autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --libdir=/%{_lib}
@@ -55,6 +59,9 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.l
 lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*`
 ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
 
+%check
+make check
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -76,6 +83,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/*.h
 
 %changelog
+* Tue Dec  1 2009 Joe Orton <jorton at redhat.com> - 2.0.1-8
+- add security fix for CVE-2009-3560 (#533174)
+- run the test suite
+
 * Fri Oct 30 2009 Joe Orton <jorton at redhat.com> - 2.0.1-6.1
 - add security fix for CVE-2009-3720
 



From nucleo at fedoraproject.org  Thu Dec  3 13:48:01 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Thu,  3 Dec 2009 13:48:01 +0000 (UTC)
Subject: File webkitkde-0.0.3-svn.tar.bz2 uploaded to lookaside cache by
	nucleo
Message-ID: <20091203134801.162AC10F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for webkitkde:

785d9b2645000b12ee629a3bcc5c045a  webkitkde-0.0.3-svn.tar.bz2



From nucleo at fedoraproject.org  Thu Dec  3 13:50:54 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Thu,  3 Dec 2009 13:50:54 +0000 (UTC)
Subject: rpms/webkitkde/devel .cvsignore, 1.4, 1.5 sources, 1.7,
	1.8 webkitkde.spec, 1.10,
	1.11 webkitkde-remove-kdelauncher.patch, 1.2, NONE
Message-ID: <20091203135054.98BD111C03DB@cvs1.fedora.phx.redhat.com>

Author: nucleo

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

Modified Files:
	.cvsignore sources webkitkde.spec 
Removed Files:
	webkitkde-remove-kdelauncher.patch 
Log Message:
svn 1057318


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Nov 2009 20:12:54 -0000	1.4
+++ .cvsignore	3 Dec 2009 13:50:54 -0000	1.5
@@ -1 +1 @@
-webkitkde-svn1049337.tar.bz2
+webkitkde-0.0.3-svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Nov 2009 20:12:54 -0000	1.7
+++ sources	3 Dec 2009 13:50:54 -0000	1.8
@@ -1 +1 @@
-26f7c96342ff474ba114a4297128fb0e  webkitkde-svn1049337.tar.bz2
+785d9b2645000b12ee629a3bcc5c045a  webkitkde-0.0.3-svn.tar.bz2


Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- webkitkde.spec	24 Nov 2009 20:12:54 -0000	1.10
+++ webkitkde.spec	3 Dec 2009 13:50:54 -0000	1.11
@@ -1,17 +1,28 @@
 Name:             webkitkde
 Version:          0.0.3
-Release:          0.1.svn1049337%{?dist}
+Release:          0.2.svn1057318%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
 URL:              http://techbase.kde.org/Projects/WebKit
 
-# The source for this package was pulled from upstream's vcs.
-# Use the following commands to generate the tarball:
-#  svn export -r 1049337 svn://anonsvn.kde.org/home/kde/trunk/playground/libs/webkitkde
-#  tar -cjf webkitkde-svn1049337.tar.bz2 kvirc
-Patch0:           webkitkde-remove-kdelauncher.patch
-Source0:          %{name}-svn1049337.tar.bz2
+# To create a tarball from svn use create_tarball.rb script
+#
+# http://websvn.kde.org/trunk/KDE/kdesdk/scripts/createtarball/
+#
+# To use it you will need the script itself and a config.ini in the same directory
+# config.ini contents:
+#
+# [webkitkde]
+# mainmodule   = playground
+# submodule    = libs
+# kde_release  = no
+# version      = 0.0.3-svn
+# docs         = no
+#
+# To create a new checkout use it with anonymous svn access
+# ./create_tarball.rb -n -a webkitkde
+Source0:          %{name}-%{version}-svn.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake gettext
 BuildRequires:    kdelibs4-devel
@@ -57,8 +68,7 @@ Requires:         webkitpart = %{version
 Development files for the webkitpart.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q -n %{name}-%{version}-svn
 
 %build
 mkdir -p %{_target_platform}
@@ -109,8 +119,13 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %doc README
-%{_kde4_includedir}/KDE/KdeWebKit
-%{_kde4_includedir}/kdewebkit
+%{_kde4_includedir}/KDE/KWebPage
+%{_kde4_includedir}/KDE/KWebPluginFactory
+%{_kde4_includedir}/KDE/KWebView
+%{_kde4_includedir}/kdewebkit_export.h
+%{_kde4_includedir}/kwebpage.h
+%{_kde4_includedir}/kwebpluginfactory.h
+%{_kde4_includedir}/kwebview.h
 %{_kde4_libdir}/libkdewebkit.so
 %{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake
 %endif
@@ -118,8 +133,8 @@ fi
 %files -n webkitpart
 %defattr(-,root,root,-)
 %doc README COPYING.LIB
-%{_kde4_libdir}/kde4/webkitkdepart.so
-%{_kde4_libdir}/libwebkitkde.so.*
+%{_kde4_libdir}/kde4/kwebkitpart.so
+%{_kde4_libdir}/libkwebkit.so.*
 %{_kde4_iconsdir}/hicolor/*/apps/webkit.png
 %{_kde4_appsdir}/webkitpart
 %{_kde4_datadir}/kde4/services/webkitpart.desktop
@@ -128,11 +143,15 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %{_kde4_includedir}/KDE/WebKitPart
-%{_kde4_includedir}/webkitkde
-%{_kde4_libdir}/libwebkitkde.so
+%{_kde4_includedir}/webkitpart.h
+%{_kde4_includedir}/webkitkde_export.h
+%{_kde4_libdir}/libkwebkit.so
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
+* Thu Dec  3 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.3-0.2.svn1057318
+- svn 1057318
+
 * Tue Nov 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.3-0.1.svn1049337
 - version changed to 0.0.3 (kdewebkit moved to kdelibs 4.4)
 - drop webkitkde-devel subpackage for KDE 4.4


--- webkitkde-remove-kdelauncher.patch DELETED ---



From jorton at fedoraproject.org  Thu Dec  3 13:54:56 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 13:54:56 +0000 (UTC)
Subject: rpms/expat/F-10 expat-1.95.8-CVE-2009-3560.patch, NONE,
	1.1 expat-2.0.1-confcxx.patch, NONE, 1.1 expat.spec, 1.32,
	1.33 expat-1.95.8-pedantic.patch, 1.1, NONE
Message-ID: <20091203135456.8293D11C00EE@cvs1.fedora.phx.redhat.com>

Author: jorton

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

Modified Files:
	expat.spec 
Added Files:
	expat-1.95.8-CVE-2009-3560.patch expat-2.0.1-confcxx.patch 
Removed Files:
	expat-1.95.8-pedantic.patch 
Log Message:
* Tue Dec  1 2009 Joe Orton <jorton at redhat.com> - 2.0.1-8
- add security fix for CVE-2009-3560 (#533174)
- run the test suite


expat-1.95.8-CVE-2009-3560.patch:
 xmlparse.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE expat-1.95.8-CVE-2009-3560.patch ---

http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.164&r2=1.165

--- expat-1.95.8/lib/xmlparse.c.cve3560
+++ expat-1.95.8/lib/xmlparse.c
@@ -3637,7 +3637,6 @@ doProlog(XML_Parser parser,
         return XML_ERROR_NO_ELEMENTS;
       default:
         tok = -tok;
-        next = end;
         break;
       }
     }

expat-2.0.1-confcxx.patch:
 configure.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE expat-2.0.1-confcxx.patch ---

Configure for C++ too so the testsuite works.

--- expat-2.0.1/configure.in.confcxx
+++ expat-2.0.1/configure.in
@@ -62,6 +62,7 @@ AC_SUBST(LIBAGE)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_INSTALL
 
 if test "$GCC" = yes ; then


Index: expat.spec
===================================================================
RCS file: /cvs/extras/rpms/expat/F-10/expat.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- expat.spec	2 Nov 2009 19:57:42 -0000	1.32
+++ expat.spec	3 Dec 2009 13:54:56 -0000	1.33
@@ -1,14 +1,16 @@
 Summary: An XML parser library
 Name: expat
 Version: 2.0.1
-Release: 5%{?dist}.1
+Release: 8%{?dist}
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
-Patch1: expat-1.95.8-CVE-2009-3720.patch
+Patch1: expat-2.0.1-confcxx.patch
+Patch2: expat-1.95.8-CVE-2009-3560.patch
+Patch3: expat-1.95.8-CVE-2009-3720.patch
 URL: http://www.libexpat.org/
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, automake, libtool
+BuildRequires: autoconf, automake, libtool, check-devel
 
 %description
 This is expat, the C library for parsing XML, written by James Clark. Expat
@@ -29,11 +31,13 @@ to develop XML applications with expat.
 
 %prep
 %setup -q
-%patch1 -p1 -b .cve3720
+%patch1 -p1 -b .confcxx
+%patch2 -p1 -b .cve3560
+%patch3 -p1 -b .cve3720
 
 %build
 rm -rf autom4te*.cache
-cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1
+rm conftools/libtool.m4
 libtoolize --copy --force --automake && aclocal && autoheader && autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --libdir=/%{_lib}
@@ -55,6 +59,9 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.l
 lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*`
 ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
 
+%check
+make check
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -76,6 +83,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/*.h
 
 %changelog
+* Tue Dec  1 2009 Joe Orton <jorton at redhat.com> - 2.0.1-8
+- add security fix for CVE-2009-3560 (#533174)
+- run the test suite
+
 * Fri Oct 30 2009 Joe Orton <jorton at redhat.com> - 2.0.1-5.1
 - add security fix for CVE-2009-3720
 


--- expat-1.95.8-pedantic.patch DELETED ---



From karsten at fedoraproject.org  Thu Dec  3 13:55:25 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 13:55:25 +0000 (UTC)
Subject: rpms/vim/F-11 7.2.149, NONE, 1.1 7.2.150, NONE, 1.1 7.2.151, NONE, 
	1.1 7.2.152, NONE, 1.1 7.2.153, NONE, 1.1 7.2.154, NONE,
	1.1 7.2.155, NONE, 1.1 7.2.156, NONE, 1.1 7.2.157, NONE,
	1.1 7.2.158, NONE, 1.1 7.2.159, NONE, 1.1 7.2.160, NONE,
	1.1 7.2.161, NONE, 1.1 7.2.162, NONE, 1.1 7.2.163, NONE,
	1.1 7.2.164, NONE, 1.1 7.2.165, NONE, 1.1 7.2.166, NONE,
	1.1 7.2.167, NONE, 1.1 7.2.168, NONE, 1.1 7.2.169, NONE,
	1.1 7.2.170, NONE, 1.1 7.2.171, NONE, 1.1 7.2.172, NONE,
	1.1 7.2.173, NONE, 1.1 7.2.174, NONE, 1.1 7.2.175, NONE,
	1.1 7.2.176, NONE, 1.1 7.2.177, NONE, 1.1 7.2.178, NONE,
	1.1 7.2.179, NONE, 1.1 7.2.180, NONE, 1.1 7.2.181, NONE,
	1.1 7.2.182, NONE, 1.1 7.2.183, NONE, 1.1 7.2.184, NONE,
	1.1 7.2.185, NONE, 1.1 7.2.186, NONE, 1.1 7.2.187, NONE,
	1.1 7.2.188, NONE, 1.1 7.2.189, NONE, 1.1 7.2.190, NONE,
	1.1 7.2.191, NONE, 1.1 7.2.192, NONE, 1.1 7.2.193, NONE,
	1.1 7.2.194, NONE, 1.1 7.2.195, NONE, 1.1 7.2.196, NONE,
	1.1 7.2.197, NONE, 1.1 7.2.198, NONE, 1.1 7.2.199, NONE,
	1.1 7.2.200, NONE, 1.1 7.2.201, NONE, 1.1 7.2.202, NONE,
	1.1 7.2.203, NONE, 1.1 7.2.204, NONE, 1.1 7.2.205, NONE,
	1.1 7.2.206, NONE, 1.1 7.2.207, NONE, 1.1 7.2.208, NONE,
	1.1 7.2.209, NONE, 1.1 7.2.210, NONE, 1.1 7.2.211, NONE,
	1.1 7.2.212, NONE, 1.1 7.2.213, NONE, 1.1 7.2.214, NONE,
	1.1 7.2.215, NONE, 1.1 7.2.216, NONE, 1.1 7.2.217, NONE,
	1.1 7.2.218, NONE, 1.1 7.2.219, NONE, 1.1 7.2.220, NONE,
	1.1 7.2.221, NONE, 1.1 7.2.222, NONE, 1.1 7.2.223, NONE,
	1.1 7.2.224, NONE, 1.1 7.2.225, NONE, 1.1 7.2.226, NONE,
	1.1 7.2.227, NONE, 1.1 7.2.228, NONE, 1.1 7.2.229, NONE,
	1.1 7.2.230, NONE, 1.1 7.2.231, NONE, 1.1 7.2.232, NONE,
	1.1 7.2.233, NONE, 1.1 7.2.234, NONE, 1.1 7.2.235, NONE,
	1.1 7.2.236, NONE, 1.1 7.2.237, NONE, 1.1 7.2.238, NONE,
	1.1 7.2.239, NONE, 1.1 7.2.240, NONE, 1.1 7.2.241, NONE,
	1.1 7.2.242, NONE, 1.1 7.2.243, NONE, 1.1 7.2.244, NONE,
	1.1 7.2.245, NONE, 1.1 7.2.246, NONE, 1.1 7.2.247, NONE,
	1.1 7.2.248, NONE, 1.1 7.2.249, NONE, 1.1 7.2.250, NONE,
	1.1 7.2.251, NONE, 1.1 7.2.252, NONE, 1.1 7.2.253, NONE,
	1.1 7.2.254, NONE, 1.1 7.2.255, NONE, 1.1 7.2.256, NONE,
	1.1 7.2.257, NONE, 1.1 7.2.258, NONE, 1.1 7.2.259, NONE,
	1.1 7.2.260, NONE, 1.1 7.2.261, NONE, 1.1 7.2.262, NONE,
	1.1 7.2.263, NONE, 1.1 7.2.264, NONE, 1.1 7.2.265, NONE,
	1.1 7.2.266, NONE, 1.1 7.2.267, NONE, 1.1 7.2.268, NONE,
	1.1 7.2.269, NONE, 1.1 7.2.270, NONE, 1.1 7.2.271, NONE,
	1.1 7.2.272, NONE, 1.1 7.2.273, NONE, 1.1 7.2.274, NONE,
	1.1 7.2.275, NONE, 1.1 7.2.276, NONE, 1.1 7.2.277, NONE,
	1.1 7.2.278, NONE, 1.1 7.2.279, NONE, 1.1 7.2.280, NONE,
	1.1 7.2.281, NONE, 1.1 7.2.282, NONE, 1.1 7.2.283, NONE,
	1.1 7.2.284, NONE, 1.1 7.2.285, NONE, 1.1 7.2.286, NONE,
	1.1 7.2.287, NONE, 1.1 7.2.288, NONE, 1.1 7.2.289, NONE,
	1.1 7.2.290, NONE, 1.1 7.2.291, NONE, 1.1 7.2.292, NONE,
	1.1 7.2.293, NONE, 1.1 7.2.294, NONE, 1.1 7.2.295, NONE,
	1.1 7.2.296, NONE, 1.1 7.2.297, NONE, 1.1 7.2.298, NONE,
	1.1 7.2.299, NONE, 1.1 7.2.300, NONE, 1.1 7.2.301, NONE,
	1.1 7.2.302, NONE, 1.1 7.2.303, NONE, 1.1 7.2.304, NONE,
	1.1 7.2.305, NONE, 1.1 7.2.306, NONE, 1.1 7.2.307, NONE,
	1.1 7.2.308, NONE, 1.1 7.2.309, NONE, 1.1 7.2.310, NONE,
	1.1 7.2.311, NONE, 1.1 7.2.312, NONE, 1.1 7.2.313, NONE,
	1.1 7.2.314, NONE, 1.1 7.2.315, NONE,
	1.1 vim-7.2-elinks-parameter-518791.patch, NONE,
	1.1 vim-7.2-httpfiletype-499123.patch, NONE,
	1.1 vim72-rh514717.patch, NONE, 1.1 gvim.desktop, 1.7,
	1.8 vim-7.2-fstabsyntax.patch, 1.1, 1.2 vim.spec, 1.236,
	1.237 vimrc, 1.20, 1.21
Message-ID: <20091203135525.12F2611C00EE@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21319

Modified Files:
	gvim.desktop vim-7.2-fstabsyntax.patch vim.spec vimrc 
Added Files:
	7.2.149 7.2.150 7.2.151 7.2.152 7.2.153 7.2.154 7.2.155 
	7.2.156 7.2.157 7.2.158 7.2.159 7.2.160 7.2.161 7.2.162 
	7.2.163 7.2.164 7.2.165 7.2.166 7.2.167 7.2.168 7.2.169 
	7.2.170 7.2.171 7.2.172 7.2.173 7.2.174 7.2.175 7.2.176 
	7.2.177 7.2.178 7.2.179 7.2.180 7.2.181 7.2.182 7.2.183 
	7.2.184 7.2.185 7.2.186 7.2.187 7.2.188 7.2.189 7.2.190 
	7.2.191 7.2.192 7.2.193 7.2.194 7.2.195 7.2.196 7.2.197 
	7.2.198 7.2.199 7.2.200 7.2.201 7.2.202 7.2.203 7.2.204 
	7.2.205 7.2.206 7.2.207 7.2.208 7.2.209 7.2.210 7.2.211 
	7.2.212 7.2.213 7.2.214 7.2.215 7.2.216 7.2.217 7.2.218 
	7.2.219 7.2.220 7.2.221 7.2.222 7.2.223 7.2.224 7.2.225 
	7.2.226 7.2.227 7.2.228 7.2.229 7.2.230 7.2.231 7.2.232 
	7.2.233 7.2.234 7.2.235 7.2.236 7.2.237 7.2.238 7.2.239 
	7.2.240 7.2.241 7.2.242 7.2.243 7.2.244 7.2.245 7.2.246 
	7.2.247 7.2.248 7.2.249 7.2.250 7.2.251 7.2.252 7.2.253 
	7.2.254 7.2.255 7.2.256 7.2.257 7.2.258 7.2.259 7.2.260 
	7.2.261 7.2.262 7.2.263 7.2.264 7.2.265 7.2.266 7.2.267 
	7.2.268 7.2.269 7.2.270 7.2.271 7.2.272 7.2.273 7.2.274 
	7.2.275 7.2.276 7.2.277 7.2.278 7.2.279 7.2.280 7.2.281 
	7.2.282 7.2.283 7.2.284 7.2.285 7.2.286 7.2.287 7.2.288 
	7.2.289 7.2.290 7.2.291 7.2.292 7.2.293 7.2.294 7.2.295 
	7.2.296 7.2.297 7.2.298 7.2.299 7.2.300 7.2.301 7.2.302 
	7.2.303 7.2.304 7.2.305 7.2.306 7.2.307 7.2.308 7.2.309 
	7.2.310 7.2.311 7.2.312 7.2.313 7.2.314 7.2.315 
	vim-7.2-elinks-parameter-518791.patch 
	vim-7.2-httpfiletype-499123.patch vim72-rh514717.patch 
Log Message:
- patchlevel 315
- fix vimrc location in man page (#456992)
- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
- Buildrequire ruby, ruby-devel (#503872)
- Remove check for static gravity (#510307)
- sort tags file (#517725)
- use one gvim to open multiple file selections from nautilus (#519265)
- use elinks -source instead of elinks -dump (#518791)
- add ext4 keyword to /etc/fstab syntax highlighting (#498290)




--- NEW FILE 7.2.149 ---
To: vim-dev at vim.org
Subject: Patch 7.2.149
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.2.149
Problem:    Using return value of function that doesn't return a value results
	    in reading uninitialized memory.
Solution:   Set the default to return zero.  Make cursor() return -1 on
	    failure.  Let complete() return an empty string in case of an
	    error.  (partly by Dominique Pelle)
Files:	    runtime/doc/eval.txt, src/eval.c


*** ../vim-7.2.148/runtime/doc/eval.txt	Tue Dec  9 10:56:50 2008
--- runtime/doc/eval.txt	Sun Mar 22 14:28:49 2009
***************
*** 2414,2419 ****
--- 2419,2425 ----
  		When 'virtualedit' is used {off} specifies the offset in
  		screen columns from the start of the character.  E.g., a
  		position within a <Tab> or after the last character.
+ 		Returns 0 when the position could be set, -1 otherwise.
  
  
  deepcopy({expr}[, {noref}])				*deepcopy()* *E698*
***************
*** 4516,4521 ****
--- 4526,4532 ----
  		should also work to move files across file systems.  The
  		result is a Number, which is 0 if the file was renamed
  		successfully, and non-zero when the renaming failed.
+ 		NOTE: If {to} exists it is overwritten without warning.
  		This function is not available in the |sandbox|.
  
  repeat({expr}, {count})					*repeat()*
*** ../vim-7.2.148/src/eval.c	Wed Feb  4 16:25:53 2009
--- src/eval.c	Sun Mar 22 20:45:18 2009
***************
*** 1285,1291 ****
--- 1285,1293 ----
      typval_T	tv;
      char_u	*retval;
      garray_T	ga;
+ #ifdef FEAT_FLOAT
      char_u	numbuf[NUMBUFLEN];
+ #endif
  
      if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
  	retval = NULL;
***************
*** 8018,8024 ****
      /* execute the function if no errors detected and executing */
      if (evaluate && error == ERROR_NONE)
      {
! 	rettv->v_type = VAR_NUMBER;	/* default is number rettv */
  	error = ERROR_UNKNOWN;
  
  	if (!builtin_function(fname))
--- 8020,8027 ----
      /* execute the function if no errors detected and executing */
      if (evaluate && error == ERROR_NONE)
      {
! 	rettv->v_type = VAR_NUMBER;	/* default rettv is number zero */
! 	rettv->vval.v_number = 0;
  	error = ERROR_UNKNOWN;
  
  	if (!builtin_function(fname))
***************
*** 8268,8274 ****
  		return;
  	    li = l->lv_first;
  	}
- 	rettv->vval.v_number = 0;	/* Default: Success */
  	for (;;)
  	{
  	    if (l == NULL)
--- 8271,8276 ----
***************
*** 8728,8734 ****
      int		dummy;
      dict_T	*selfdict = NULL;
  
-     rettv->vval.v_number = 0;
      if (argvars[1].v_type != VAR_LIST)
      {
  	EMSG(_(e_listreq));
--- 8730,8735 ----
***************
*** 9036,9048 ****
      if (buttons == NULL || *buttons == NUL)
  	buttons = (char_u *)_("&Ok");
  
!     if (error)
! 	rettv->vval.v_number = 0;
!     else
  	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
  								   def, NULL);
- #else
-     rettv->vval.v_number = 0;
  #endif
  }
  
--- 9037,9045 ----
      if (buttons == NULL || *buttons == NUL)
  	buttons = (char_u *)_("&Ok");
  
!     if (!error)
  	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
  								   def, NULL);
  #endif
  }
  
***************
*** 9181,9195 ****
      }
  
      rettv->vval.v_number = cs_connection(num, dbpath, prepend);
- #else
-     rettv->vval.v_number = 0;
  #endif
  }
  
  /*
   * "cursor(lnum, col)" function
   *
!  * Moves the cursor to the specified line and column
   */
  /*ARGSUSED*/
      static void
--- 9178,9191 ----
      }
  
      rettv->vval.v_number = cs_connection(num, dbpath, prepend);
  #endif
  }
  
  /*
   * "cursor(lnum, col)" function
   *
!  * Moves the cursor to the specified line and column.
!  * Returns 0 when the position could be set, -1 otherwise.
   */
  /*ARGSUSED*/
      static void
***************
*** 9202,9207 ****
--- 9198,9204 ----
      long	coladd = 0;
  #endif
  
+     rettv->vval.v_number = -1;
      if (argvars[1].v_type == VAR_UNKNOWN)
      {
  	pos_T	    pos;
***************
*** 9246,9251 ****
--- 9243,9249 ----
  #endif
  
      curwin->w_set_curswant = TRUE;
+     rettv->vval.v_number = 0;
  }
  
  /*
***************
*** 9291,9298 ****
  {
  #ifdef FEAT_AUTOCMD
      rettv->vval.v_number = did_filetype;
- #else
-     rettv->vval.v_number = 0;
  #endif
  }
  
--- 9289,9294 ----
***************
*** 9605,9611 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
      {
  	list_T		*l1, *l2;
--- 9601,9606 ----
***************
*** 9733,9739 ****
      if (check_secure())
  	return;
  
-     rettv->vval.v_number = 0;
      keys = get_tv_string(&argvars[0]);
      if (*keys != NUL)
      {
--- 9728,9733 ----
***************
*** 9901,9907 ****
      char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
      int		save_did_emsg;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type == VAR_LIST)
      {
  	if ((l = argvars[0].vval.v_list) == NULL
--- 9895,9900 ----
***************
*** 10084,10091 ****
  	else
  	    rettv->vval.v_number = (varnumber_T)f;
      }
-     else
- 	rettv->vval.v_number = 0;
  }
  
  /*
--- 10077,10082 ----
***************
*** 10219,10227 ****
      lnum = get_tv_lnum(argvars);
      if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count)
  	rettv->vval.v_number = foldLevel(lnum);
-     else
  #endif
- 	rettv->vval.v_number = 0;
  }
  
  /*
--- 10210,10216 ----
***************
*** 10337,10343 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
  #ifdef FEAT_GUI
      if (gui.in_use)
  	gui_mch_set_foreground();
--- 10326,10331 ----
***************
*** 10359,10365 ****
  {
      char_u	*s;
  
-     rettv->vval.v_number = 0;
      s = get_tv_string(&argvars[0]);
      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
  	EMSG2(_(e_invarg2), s);
--- 10347,10352 ----
***************
*** 10429,10437 ****
  
      if (tv == NULL)
      {
! 	if (argvars[2].v_type == VAR_UNKNOWN)
! 	    rettv->vval.v_number = 0;
! 	else
  	    copy_tv(&argvars[2], rettv);
      }
      else
--- 10416,10422 ----
  
      if (tv == NULL)
      {
! 	if (argvars[2].v_type != VAR_UNKNOWN)
  	    copy_tv(&argvars[2], rettv);
      }
      else
***************
*** 10456,10468 ****
  {
      char_u	*p;
  
!     if (retlist)
!     {
! 	if (rettv_list_alloc(rettv) == FAIL)
! 	    return;
!     }
!     else
! 	rettv->vval.v_number = 0;
  
      if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
  	return;
--- 10441,10448 ----
  {
      char_u	*p;
  
!     if (retlist && rettv_list_alloc(rettv) == FAIL)
! 	return;
  
      if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
  	return;
***************
*** 11009,11016 ****
      dict_T	*dict;
      matchitem_T	*cur = curwin->w_match_head;
  
-     rettv->vval.v_number = 0;
- 
      if (rettv_list_alloc(rettv) == OK)
      {
  	while (cur != NULL)
--- 10989,10994 ----
***************
*** 11089,11095 ****
      win_T	*wp;
  #endif
  
-     rettv->vval.v_number = 0;
  #ifdef FEAT_QUICKFIX
      if (rettv_list_alloc(rettv) == OK)
      {
--- 11067,11072 ----
***************
*** 11935,11941 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_DICT)
      {
  	EMSG(_(e_dictreq));
--- 11912,11917 ----
***************
*** 12052,12059 ****
  	n = del_history_entry(get_histtype(str),
  				      get_tv_string_buf(&argvars[1], buf));
      rettv->vval.v_number = n;
- #else
-     rettv->vval.v_number = 0;
  #endif
  }
  
--- 12028,12033 ----
***************
*** 12415,12421 ****
      int		selected;
      int		mouse_used;
  
-     rettv->vval.v_number = 0;
  #ifdef NO_CONSOLE_INPUT
      /* While starting up, there is no place to enter text. */
      if (no_console_input())
--- 12389,12394 ----
***************
*** 12464,12470 ****
  	--ga_userinput.ga_len;
  	restore_typeahead((tasave_T *)(ga_userinput.ga_data)
  						       + ga_userinput.ga_len);
! 	rettv->vval.v_number = 0; /* OK */
      }
      else if (p_verbose > 1)
      {
--- 12437,12443 ----
  	--ga_userinput.ga_len;
  	restore_typeahead((tasave_T *)(ga_userinput.ga_data)
  						       + ga_userinput.ga_len);
! 	/* default return is zero == OK */
      }
      else if (p_verbose > 1)
      {
***************
*** 12488,12494 ****
  	save_typeahead((tasave_T *)(ga_userinput.ga_data)
  						       + ga_userinput.ga_len);
  	++ga_userinput.ga_len;
! 	rettv->vval.v_number = 0; /* OK */
      }
      else
  	rettv->vval.v_number = 1; /* Failed */
--- 12461,12467 ----
  	save_typeahead((tasave_T *)(ga_userinput.ga_data)
  						       + ga_userinput.ga_len);
  	++ga_userinput.ga_len;
! 	/* default return is zero == OK */
      }
      else
  	rettv->vval.v_number = 1; /* Failed */
***************
*** 12522,12528 ****
      list_T	*l;
      int		error = FALSE;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listarg), "insert()");
      else if ((l = argvars[0].vval.v_list) != NULL
--- 12495,12500 ----
***************
*** 12641,12647 ****
      dict_T	*d;
      int		todo;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_DICT)
      {
  	EMSG(_(e_dictreq));
--- 12613,12618 ----
***************
*** 12729,12735 ****
      garray_T	ga;
      char_u	*sep;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_LIST)
      {
  	EMSG(_(e_listreq));
--- 12700,12705 ----
***************
*** 12827,12835 ****
  #endif
  
      rettv->v_type = type;
!     if (type == VAR_NUMBER)
! 	rettv->vval.v_number = 0;
!     else
  	rettv->vval.v_string = NULL;
  
      if (check_restricted() || check_secure())
--- 12797,12803 ----
  #endif
  
      rettv->v_type = type;
!     if (type != VAR_NUMBER)
  	rettv->vval.v_string = NULL;
  
      if (check_restricted() || check_secure())
***************
*** 13770,13776 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
  #ifdef FEAT_INS_EXPAND
      if (pum_visible())
  	rettv->vval.v_number = 1;
--- 13738,13743 ----
***************
*** 13804,13810 ****
  	    stride = get_tv_number_chk(&argvars[2], &error);
      }
  
-     rettv->vval.v_number = 0;
      if (error)
  	return;		/* type error; errmsg already given */
      if (stride == 0)
--- 13771,13776 ----
***************
*** 14193,14199 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
  #ifdef FEAT_CLIENTSERVER
  # ifdef WIN32
      /* On Win32 it's done in this application. */
--- 14159,14164 ----
***************
*** 14249,14255 ****
  	rettv->vval.v_number = (s != NULL);
      }
  # else
-     rettv->vval.v_number = 0;
      if (check_connection() == FAIL)
  	return;
  
--- 14214,14219 ----
***************
*** 14338,14344 ****
      dict_T	*d;
      dictitem_T	*di;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type == VAR_DICT)
      {
  	if (argvars[2].v_type != VAR_UNKNOWN)
--- 14302,14307 ----
***************
*** 14696,14702 ****
      list_T	*l;
      listitem_T	*li, *ni;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listarg), "reverse()");
      else if ((l = argvars[0].vval.v_list) != NULL
--- 14659,14664 ----
***************
*** 15048,15055 ****
      int		lnum = 0;
      int		col = 0;
  
-     rettv->vval.v_number = 0;
- 
      if (rettv_list_alloc(rettv) == FAIL)
  	return;
  
--- 15010,15015 ----
***************
*** 15236,15243 ****
      int		n;
      int		flags = 0;
  
-     rettv->vval.v_number = 0;
- 
      if (rettv_list_alloc(rettv) == FAIL)
  	return;
  
--- 15196,15201 ----
***************
*** 15323,15330 ****
      typval_T	*varp;
      char_u	nbuf[NUMBUFLEN];
  
-     rettv->vval.v_number = 0;
- 
      if (check_restricted() || check_secure())
  	return;
      (void)get_tv_number(&argvars[0]);	    /* issue errmsg if type error */
--- 15281,15286 ----
***************
*** 15404,15410 ****
      else
  	line = get_tv_string_chk(&argvars[1]);
  
!     rettv->vval.v_number = 0;		/* OK */
      for (;;)
      {
  	if (l != NULL)
--- 15360,15366 ----
      else
  	line = get_tv_string_chk(&argvars[1]);
  
!     /* default result is zero == OK */
      for (;;)
      {
  	if (l != NULL)
***************
*** 15717,15722 ****
--- 15673,15679 ----
  /*
   * "setwinvar()" and "settabwinvar()" functions
   */
+ /*ARGSUSED*/
      static void
  setwinvar(argvars, rettv, off)
      typval_T	*argvars;
***************
*** 15733,15740 ****
      char_u	nbuf[NUMBUFLEN];
      tabpage_T	*tp;
  
-     rettv->vval.v_number = 0;
- 
      if (check_restricted() || check_secure())
  	return;
  
--- 15690,15695 ----
***************
*** 15947,15953 ****
      long	len;
      long	i;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listarg), "sort()");
      else
--- 15902,15907 ----
***************
*** 16870,16878 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
! #ifndef FEAT_WINDOWS
!     rettv->vval.v_number = 0;
! #else
      tabpage_T	*tp;
      win_T	*wp = NULL;
  
--- 16824,16830 ----
      typval_T	*argvars;
      typval_T	*rettv;
  {
! #ifdef FEAT_WINDOWS
      tabpage_T	*tp;
      win_T	*wp = NULL;
  
***************
*** 16884,16902 ****
  	if (tp != NULL)
  	    wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
      }
!     if (wp == NULL)
! 	rettv->vval.v_number = 0;
!     else
      {
! 	if (rettv_list_alloc(rettv) == FAIL)
! 	    rettv->vval.v_number = 0;
! 	else
! 	{
! 	    for (; wp != NULL; wp = wp->w_next)
! 		if (list_append_number(rettv->vval.v_list,
  						wp->w_buffer->b_fnum) == FAIL)
! 		    break;
! 	}
      }
  #endif
  }
--- 16836,16847 ----
  	if (tp != NULL)
  	    wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
      }
!     if (wp != NULL && rettv_list_alloc(rettv) != FAIL)
      {
! 	for (; wp != NULL; wp = wp->w_next)
! 	    if (list_append_number(rettv->vval.v_list,
  						wp->w_buffer->b_fnum) == FAIL)
! 		break;
      }
  #endif
  }
***************
*** 17024,17033 ****
      int		first;
  
      if (rettv_list_alloc(rettv) == FAIL)
-     {
- 	rettv->vval.v_number = 0;
  	return;
-     }
  
      for (first = TRUE; ; first = FALSE)
  	if (get_tagfname(&tn, first, fname) == FAIL
--- 16969,16975 ----
***************
*** 17401,17408 ****
      /* A non-zero number or non-empty string argument: reset mode. */
      if (non_zero_arg(&argvars[0]))
  	curbuf->b_visual_mode_eval = NUL;
- #else
-     rettv->vval.v_number = 0; /* return anything, it won't work anyway */
  #endif
  }
  
--- 17343,17348 ----
*** ../vim-7.2.148/src/version.c	Wed Mar 18 19:07:09 2009
--- src/version.c	Wed Apr 22 12:44:05 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     149,
  /**/


-- 
WOMAN:   Well, 'ow did you become king then?
ARTHUR:  The Lady of the Lake, [angels sing] her arm clad in the purest
         shimmering samite, held aloft Excalibur from the bosom of the water
         signifying by Divine Providence that I, Arthur, was to carry
         Excalibur.  [singing stops] That is why I am your king!
                                  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    ///


--- NEW FILE 7.2.150 ---
To: vim-dev at vim.org
Subject: Patch 7.2.150 (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
------------

Note: I haven't tested this myself, since I don't have a compiler that
works for this code.

Patch 7.2.150 (extra)
Problem:    Can't use tab pages from VisVim.
Solution:   Add tab page support to VisVim. (Adam Slater)
Files:	    src/VisVim/Commands.cpp, src/VisVim/Resource.h,
	    src/VisVim/VisVim.rc


*** ../vim-7.2.149/src/VisVim/Commands.cpp	Thu May 10 20:45:34 2007
--- src/VisVim/Commands.cpp	Mon Mar  2 00:52:15 2009
***************
*** 20,39 ****
  
  static BOOL g_bEnableVim = TRUE;	// Vim enabled
  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously
  static int g_ChangeDir = CD_NONE;	// CD after file open?
  
! static void VimSetEnableState (BOOL bEnableState);
! static BOOL VimOpenFile (BSTR& FileName, long LineNr);
! static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method);
! static void VimErrDiag (COleAutomationControl& VimOle);
! static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);
! static void DebugMsg (char* Msg, char* Arg = NULL);
  
  
  /////////////////////////////////////////////////////////////////////////////
  // CCommands
  
! CCommands::CCommands ()
  {
  	// m_pApplication == NULL; M$ Code generation bug!!!
  	m_pApplication = NULL;
--- 20,40 ----
  
  static BOOL g_bEnableVim = TRUE;	// Vim enabled
  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously
+ static BOOL g_bNewTabs = FALSE;
  static int g_ChangeDir = CD_NONE;	// CD after file open?
  
! static void VimSetEnableState(BOOL bEnableState);
! static BOOL VimOpenFile(BSTR& FileName, long LineNr);
! static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method);
! static void VimErrDiag(COleAutomationControl& VimOle);
! static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);
! static void DebugMsg(char* Msg, char* Arg = NULL);
  
  
  /////////////////////////////////////////////////////////////////////////////
  // CCommands
  
! CCommands::CCommands()
  {
  	// m_pApplication == NULL; M$ Code generation bug!!!
  	m_pApplication = NULL;
***************
*** 41,57 ****
  	m_pDebuggerEventsObj = NULL;
  }
  
! CCommands::~CCommands ()
  {
! 	ASSERT (m_pApplication != NULL);
  	if (m_pApplication)
  	{
! 		m_pApplication->Release ();
  		m_pApplication = NULL;
  	}
  }
  
! void CCommands::SetApplicationObject (IApplication * pApplication)
  {
  	// This function assumes pApplication has already been AddRef'd
  	// for us, which CDSAddIn did in it's QueryInterface call
--- 42,58 ----
  	m_pDebuggerEventsObj = NULL;
  }
  
! CCommands::~CCommands()
  {
! 	ASSERT(m_pApplication != NULL);
  	if (m_pApplication)
  	{
! 		m_pApplication->Release();
  		m_pApplication = NULL;
  	}
  }
  
! void CCommands::SetApplicationObject(IApplication * pApplication)
  {
  	// This function assumes pApplication has already been AddRef'd
  	// for us, which CDSAddIn did in it's QueryInterface call
***************
*** 61,115 ****
  		return;
  
  	// Create Application event handlers
! 	XApplicationEventsObj::CreateInstance (&m_pApplicationEventsObj);
  	if (! m_pApplicationEventsObj)
  	{
! 		ReportInternalError ("XApplicationEventsObj::CreateInstance");
  		return;
  	}
! 	m_pApplicationEventsObj->AddRef ();
! 	m_pApplicationEventsObj->Connect (m_pApplication);
  	m_pApplicationEventsObj->m_pCommands = this;
  
  #ifdef NEVER
  	// Create Debugger event handler
  	CComPtr < IDispatch > pDebugger;
! 	if (SUCCEEDED (m_pApplication->get_Debugger (&pDebugger))
  	    && pDebugger != NULL)
  	{
! 		XDebuggerEventsObj::CreateInstance (&m_pDebuggerEventsObj);
! 		m_pDebuggerEventsObj->AddRef ();
! 		m_pDebuggerEventsObj->Connect (pDebugger);
  		m_pDebuggerEventsObj->m_pCommands = this;
  	}
  #endif
  
  	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim
! 	HKEY hAppKey = GetAppKey ("Vim");
  	if (hAppKey)
  	{
! 		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
  		if (hSectionKey)
  		{
! 			g_bEnableVim = GetRegistryInt (hSectionKey, "EnableVim",
  						       g_bEnableVim);
! 			g_bDevStudioEditor = GetRegistryInt(hSectionKey,"DevStudioEditor",
! 							    g_bDevStudioEditor);
! 			g_ChangeDir = GetRegistryInt (hSectionKey, "ChangeDir",
  						      g_ChangeDir);
! 			RegCloseKey (hSectionKey);
  		}
! 		RegCloseKey (hAppKey);
  	}
  }
  
! void CCommands::UnadviseFromEvents ()
  {
! 	ASSERT (m_pApplicationEventsObj != NULL);
  	if (m_pApplicationEventsObj)
  	{
! 		m_pApplicationEventsObj->Disconnect (m_pApplication);
! 		m_pApplicationEventsObj->Release ();
  		m_pApplicationEventsObj = NULL;
  	}
  
--- 62,118 ----
  		return;
  
  	// Create Application event handlers
! 	XApplicationEventsObj::CreateInstance(&m_pApplicationEventsObj);
  	if (! m_pApplicationEventsObj)
  	{
! 		ReportInternalError("XApplicationEventsObj::CreateInstance");
  		return;
  	}
! 	m_pApplicationEventsObj->AddRef();
! 	m_pApplicationEventsObj->Connect(m_pApplication);
  	m_pApplicationEventsObj->m_pCommands = this;
  
  #ifdef NEVER
  	// Create Debugger event handler
  	CComPtr < IDispatch > pDebugger;
! 	if (SUCCEEDED(m_pApplication->get_Debugger(&pDebugger))
  	    && pDebugger != NULL)
  	{
! 		XDebuggerEventsObj::CreateInstance(&m_pDebuggerEventsObj);
! 		m_pDebuggerEventsObj->AddRef();
! 		m_pDebuggerEventsObj->Connect(pDebugger);
  		m_pDebuggerEventsObj->m_pCommands = this;
  	}
  #endif
  
  	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim
! 	HKEY hAppKey = GetAppKey("Vim");
  	if (hAppKey)
  	{
! 		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
  		if (hSectionKey)
  		{
! 			g_bEnableVim = GetRegistryInt(hSectionKey, "EnableVim",
  						       g_bEnableVim);
! 			g_bDevStudioEditor = GetRegistryInt(hSectionKey,
! 					"DevStudioEditor", g_bDevStudioEditor);
! 			g_bNewTabs = GetRegistryInt(hSectionKey, "NewTabs",
! 						    g_bNewTabs);
! 			g_ChangeDir = GetRegistryInt(hSectionKey, "ChangeDir",
  						      g_ChangeDir);
! 			RegCloseKey(hSectionKey);
  		}
! 		RegCloseKey(hAppKey);
  	}
  }
  
! void CCommands::UnadviseFromEvents()
  {
! 	ASSERT(m_pApplicationEventsObj != NULL);
  	if (m_pApplicationEventsObj)
  	{
! 		m_pApplicationEventsObj->Disconnect(m_pApplication);
! 		m_pApplicationEventsObj->Release();
  		m_pApplicationEventsObj = NULL;
  	}
  
***************
*** 121,130 ****
  		// unadvise from its events (thus the VERIFY_OK below--see
  		// stdafx.h).
  		CComPtr < IDispatch > pDebugger;
! 		VERIFY_OK (m_pApplication->get_Debugger (&pDebugger));
! 		ASSERT (pDebugger != NULL);
! 		m_pDebuggerEventsObj->Disconnect (pDebugger);
! 		m_pDebuggerEventsObj->Release ();
  		m_pDebuggerEventsObj = NULL;
  	}
  #endif
--- 124,133 ----
  		// unadvise from its events (thus the VERIFY_OK below--see
  		// stdafx.h).
  		CComPtr < IDispatch > pDebugger;
! 		VERIFY_OK(m_pApplication->get_Debugger(&pDebugger));
! 		ASSERT(pDebugger != NULL);
! 		m_pDebuggerEventsObj->Disconnect(pDebugger);
! 		m_pDebuggerEventsObj->Release();
  		m_pDebuggerEventsObj = NULL;
  	}
  #endif
***************
*** 136,156 ****
  
  // Application events
  
! HRESULT CCommands::XApplicationEvents::BeforeBuildStart ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BuildFinish (long nNumErrors, long nNumWarnings)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
--- 139,159 ----
  
  // Application events
  
! HRESULT CCommands::XApplicationEvents::BeforeBuildStart()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BuildFinish(long nNumErrors, long nNumWarnings)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
***************
*** 158,166 ****
  // is done.
  // Vim gets called from here.
  //
! HRESULT CCommands::XApplicationEvents::DocumentOpen (IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  
  	if (! g_bEnableVim)
  		// Vim not enabled or empty command line entered
--- 161,169 ----
  // is done.
  // Vim gets called from here.
  //
! HRESULT CCommands::XApplicationEvents::DocumentOpen(IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  
  	if (! g_bEnableVim)
  		// Vim not enabled or empty command line entered
***************
*** 169,175 ****
  	// First get the current file name and line number
  
  	// Get the document object
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);
  	if (! pDoc)
  		return S_OK;
  
--- 172,178 ----
  	// First get the current file name and line number
  
  	// Get the document object
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);
  	if (! pDoc)
  		return S_OK;
  
***************
*** 177,202 ****
  	long LineNr = -1;
  
  	// Get the document name
! 	if (FAILED (pDoc->get_FullName (&FileName)))
  		return S_OK;
  
  	LPDISPATCH pDispSel;
  
  	// Get a selection object dispatch pointer
! 	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))
  	{
  		// Get the selection object
! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);
  
  		if (pSel)
  			// Get the selection line number
! 			pSel->get_CurrentLine (&LineNr);
  
! 		pDispSel->Release ();
  	}
  
  	// Open the file in Vim and position to the current line
! 	if (VimOpenFile (FileName, LineNr))
  	{
  		if (! g_bDevStudioEditor)
  		{
--- 180,205 ----
  	long LineNr = -1;
  
  	// Get the document name
! 	if (FAILED(pDoc->get_FullName(&FileName)))
  		return S_OK;
  
  	LPDISPATCH pDispSel;
  
  	// Get a selection object dispatch pointer
! 	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))
  	{
  		// Get the selection object
! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);
  
  		if (pSel)
  			// Get the selection line number
! 			pSel->get_CurrentLine(&LineNr);
  
! 		pDispSel->Release();
  	}
  
  	// Open the file in Vim and position to the current line
! 	if (VimOpenFile(FileName, LineNr))
  	{
  		if (! g_bDevStudioEditor)
  		{
***************
*** 204,233 ****
  			CComVariant vSaveChanges = dsSaveChangesPrompt;
  			DsSaveStatus Saved;
  
! 			pDoc->Close (vSaveChanges, &Saved);
  		}
  	}
  
  	// We're done here
! 	SysFreeString (FileName);
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BeforeDocumentClose (IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::DocumentSave (IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::NewDocument (IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  
  	if (! g_bEnableVim)
  		// Vim not enabled or empty command line entered
--- 207,236 ----
  			CComVariant vSaveChanges = dsSaveChangesPrompt;
  			DsSaveStatus Saved;
  
! 			pDoc->Close(vSaveChanges, &Saved);
  		}
  	}
  
  	// We're done here
! 	SysFreeString(FileName);
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BeforeDocumentClose(IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::DocumentSave(IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::NewDocument(IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  
  	if (! g_bEnableVim)
  		// Vim not enabled or empty command line entered
***************
*** 235,253 ****
  
  	// First get the current file name and line number
  
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);
  	if (! pDoc)
  		return S_OK;
  
  	BSTR FileName;
  	HRESULT hr;
  
! 	hr = pDoc->get_FullName (&FileName);
! 	if (FAILED (hr))
  		return S_OK;
  
  	// Open the file in Vim and position to the current line
! 	if (VimOpenFile (FileName, 0))
  	{
  		if (! g_bDevStudioEditor)
  		{
--- 238,256 ----
  
  	// First get the current file name and line number
  
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);
  	if (! pDoc)
  		return S_OK;
  
  	BSTR FileName;
  	HRESULT hr;
  
! 	hr = pDoc->get_FullName(&FileName);
! 	if (FAILED(hr))
  		return S_OK;
  
  	// Open the file in Vim and position to the current line
! 	if (VimOpenFile(FileName, 0))
  	{
  		if (! g_bDevStudioEditor)
  		{
***************
*** 255,303 ****
  			CComVariant vSaveChanges = dsSaveChangesPrompt;
  			DsSaveStatus Saved;
  
! 			pDoc->Close (vSaveChanges, &Saved);
  		}
  	}
  
! 	SysFreeString (FileName);
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WindowActivate (IDispatch * theWindow)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WindowDeactivate (IDispatch * theWindow)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WorkspaceOpen ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WorkspaceClose ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::NewWorkspace ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
  // Debugger event
  
! HRESULT CCommands::XDebuggerEvents::BreakpointHit (IDispatch * pBreakpoint)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
--- 258,306 ----
  			CComVariant vSaveChanges = dsSaveChangesPrompt;
  			DsSaveStatus Saved;
  
! 			pDoc->Close(vSaveChanges, &Saved);
  		}
  	}
  
! 	SysFreeString(FileName);
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WindowActivate(IDispatch * theWindow)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WindowDeactivate(IDispatch * theWindow)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WorkspaceOpen()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WorkspaceClose()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::NewWorkspace()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
  // Debugger event
  
! HRESULT CCommands::XDebuggerEvents::BreakpointHit(IDispatch * pBreakpoint)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
***************
*** 308,324 ****
  class CMainDialog : public CDialog
  {
      public:
! 	CMainDialog (CWnd * pParent = NULL);	// Standard constructor
  
  	//{{AFX_DATA(CMainDialog)
  	enum { IDD = IDD_ADDINMAIN };
  	int	m_ChangeDir;
  	BOOL	m_bDevStudioEditor;
  	//}}AFX_DATA
  
  	//{{AFX_VIRTUAL(CMainDialog)
      protected:
! 	virtual void DoDataExchange (CDataExchange * pDX);	// DDX/DDV support
  	//}}AFX_VIRTUAL
  
      protected:
--- 311,328 ----
  class CMainDialog : public CDialog
  {
      public:
! 	CMainDialog(CWnd * pParent = NULL);	// Standard constructor
  
  	//{{AFX_DATA(CMainDialog)
  	enum { IDD = IDD_ADDINMAIN };
  	int	m_ChangeDir;
  	BOOL	m_bDevStudioEditor;
+ 	BOOL	m_bNewTabs;
  	//}}AFX_DATA
  
  	//{{AFX_VIRTUAL(CMainDialog)
      protected:
! 	virtual void DoDataExchange(CDataExchange * pDX);	// DDX/DDV support
  	//}}AFX_VIRTUAL
  
      protected:
***************
*** 326,425 ****
  	afx_msg void OnEnable();
  	afx_msg void OnDisable();
  	//}}AFX_MSG
! 	DECLARE_MESSAGE_MAP ()
  };
  
! CMainDialog::CMainDialog (CWnd * pParent /* =NULL */ )
! 	: CDialog (CMainDialog::IDD, pParent)
  {
  	//{{AFX_DATA_INIT(CMainDialog)
  	m_ChangeDir = -1;
  	m_bDevStudioEditor = FALSE;
  	//}}AFX_DATA_INIT
  }
  
! void CMainDialog::DoDataExchange (CDataExchange * pDX)
  {
! 	CDialog::DoDataExchange (pDX);
  	//{{AFX_DATA_MAP(CMainDialog)
  	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);
! 	DDX_Check (pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
  	//}}AFX_DATA_MAP
  }
  
! BEGIN_MESSAGE_MAP (CMainDialog, CDialog)
  	//{{AFX_MSG_MAP(CMainDialog)
  	//}}AFX_MSG_MAP
! END_MESSAGE_MAP ()
  
  
  /////////////////////////////////////////////////////////////////////////////
  // CCommands methods
  
! STDMETHODIMP CCommands::VisVimDialog ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  
  	// Use m_pApplication to access the Developer Studio Application
  	// object,
  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
  	// (see stdafx.h)
  
! 	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_FALSE));
  
  	CMainDialog Dlg;
  
  	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;
  	Dlg.m_ChangeDir = g_ChangeDir;
! 	if (Dlg.DoModal () == IDOK)
  	{
  		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;
  		g_ChangeDir = Dlg.m_ChangeDir;
  
  		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim
! 		HKEY hAppKey = GetAppKey ("Vim");
  		if (hAppKey)
  		{
! 			HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
  			if (hSectionKey)
  			{
! 				WriteRegistryInt (hSectionKey, "DevStudioEditor",
  						  g_bDevStudioEditor);
! 				WriteRegistryInt (hSectionKey, "ChangeDir", g_ChangeDir);
! 				RegCloseKey (hSectionKey);
  			}
! 			RegCloseKey (hAppKey);
  		}
  	}
  
! 	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_TRUE));
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimEnable ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
! 	VimSetEnableState (true);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimDisable ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
! 	VimSetEnableState (false);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimToggle ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
! 	VimSetEnableState (! g_bEnableVim);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimLoad ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  
  	// Use m_pApplication to access the Developer Studio Application object,
  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
--- 330,435 ----
  	afx_msg void OnEnable();
  	afx_msg void OnDisable();
  	//}}AFX_MSG
! 	DECLARE_MESSAGE_MAP()
  };
  
! CMainDialog::CMainDialog(CWnd * pParent /* =NULL */ )
! 	: CDialog(CMainDialog::IDD, pParent)
  {
  	//{{AFX_DATA_INIT(CMainDialog)
  	m_ChangeDir = -1;
  	m_bDevStudioEditor = FALSE;
+ 	m_bNewTabs = FALSE;
  	//}}AFX_DATA_INIT
  }
  
! void CMainDialog::DoDataExchange(CDataExchange * pDX)
  {
! 	CDialog::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CMainDialog)
  	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);
! 	DDX_Check(pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
! 	DDX_Check(pDX, IDC_NEW_TABS, m_bNewTabs);
  	//}}AFX_DATA_MAP
  }
  
! BEGIN_MESSAGE_MAP(CMainDialog, CDialog)
  	//{{AFX_MSG_MAP(CMainDialog)
  	//}}AFX_MSG_MAP
! END_MESSAGE_MAP()
  
  
  /////////////////////////////////////////////////////////////////////////////
  // CCommands methods
  
! STDMETHODIMP CCommands::VisVimDialog()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  
  	// Use m_pApplication to access the Developer Studio Application
  	// object,
  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
  	// (see stdafx.h)
  
! 	VERIFY_OK(m_pApplication->EnableModeless(VARIANT_FALSE));
  
  	CMainDialog Dlg;
  
  	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;
+ 	Dlg.m_bNewTabs = g_bNewTabs;
  	Dlg.m_ChangeDir = g_ChangeDir;
! 	if (Dlg.DoModal() == IDOK)
  	{
  		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;
+ 		g_bNewTabs = Dlg.m_bNewTabs;
  		g_ChangeDir = Dlg.m_ChangeDir;
  
  		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim
! 		HKEY hAppKey = GetAppKey("Vim");
  		if (hAppKey)
  		{
! 			HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
  			if (hSectionKey)
  			{
! 				WriteRegistryInt(hSectionKey, "DevStudioEditor",
  						  g_bDevStudioEditor);
! 				WriteRegistryInt(hSectionKey, "NewTabs",
! 						  g_bNewTabs);
! 				WriteRegistryInt(hSectionKey, "ChangeDir", g_ChangeDir);
! 				RegCloseKey(hSectionKey);
  			}
! 			RegCloseKey(hAppKey);
  		}
  	}
  
! 	VERIFY_OK(m_pApplication->EnableModeless(VARIANT_TRUE));
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimEnable()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
! 	VimSetEnableState(true);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimDisable()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
! 	VimSetEnableState(false);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimToggle()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
! 	VimSetEnableState(! g_bEnableVim);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimLoad()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  
  	// Use m_pApplication to access the Developer Studio Application object,
  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
***************
*** 430,436 ****
  	CComPtr < IDispatch > pDispDoc, pDispSel;
  
  	// Get a document object dispatch pointer
! 	VERIFY_OK (m_pApplication->get_ActiveDocument (&pDispDoc));
  	if (! pDispDoc)
  		return S_OK;
  
--- 440,446 ----
  	CComPtr < IDispatch > pDispDoc, pDispSel;
  
  	// Get a document object dispatch pointer
! 	VERIFY_OK(m_pApplication->get_ActiveDocument(&pDispDoc));
  	if (! pDispDoc)
  		return S_OK;
  
***************
*** 438,467 ****
  	long LineNr = -1;
  
  	// Get the document object
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (pDispDoc);
  
  	if (! pDoc)
  		return S_OK;
  
  	// Get the document name
! 	if (FAILED (pDoc->get_FullName (&FileName)))
  		return S_OK;
  
  	// Get a selection object dispatch pointer
! 	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))
  	{
  		// Get the selection object
! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);
  
  		if (pSel)
  			// Get the selection line number
! 			pSel->get_CurrentLine (&LineNr);
  	}
  
  	// Open the file in Vim
! 	VimOpenFile (FileName, LineNr);
  
! 	SysFreeString (FileName);
  	return S_OK;
  }
  
--- 448,477 ----
  	long LineNr = -1;
  
  	// Get the document object
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(pDispDoc);
  
  	if (! pDoc)
  		return S_OK;
  
  	// Get the document name
! 	if (FAILED(pDoc->get_FullName(&FileName)))
  		return S_OK;
  
  	// Get a selection object dispatch pointer
! 	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))
  	{
  		// Get the selection object
! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);
  
  		if (pSel)
  			// Get the selection line number
! 			pSel->get_CurrentLine(&LineNr);
  	}
  
  	// Open the file in Vim
! 	VimOpenFile(FileName, LineNr);
  
! 	SysFreeString(FileName);
  	return S_OK;
  }
  
***************
*** 472,487 ****
  
  // Set the enable state and save to registry
  //
! static void VimSetEnableState (BOOL bEnableState)
  {
  	g_bEnableVim = bEnableState;
! 	HKEY hAppKey = GetAppKey ("Vim");
  	if (hAppKey)
  	{
! 		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
  		if (hSectionKey)
! 			WriteRegistryInt (hSectionKey, "EnableVim", g_bEnableVim);
! 		RegCloseKey (hAppKey);
  	}
  }
  
--- 482,497 ----
  
  // Set the enable state and save to registry
  //
! static void VimSetEnableState(BOOL bEnableState)
  {
  	g_bEnableVim = bEnableState;
! 	HKEY hAppKey = GetAppKey("Vim");
  	if (hAppKey)
  	{
! 		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
  		if (hSectionKey)
! 			WriteRegistryInt(hSectionKey, "EnableVim", g_bEnableVim);
! 		RegCloseKey(hAppKey);
  	}
  }
  
***************
*** 490,496 ****
  // letter.
  // 'LineNr' must contain a valid line number or 0, e. g. for a new file
  //
! static BOOL VimOpenFile (BSTR& FileName, long LineNr)
  {
  
  	// OLE automation object for com. with Vim
--- 500,506 ----
  // letter.
  // 'LineNr' must contain a valid line number or 0, e. g. for a new file
  //
! static BOOL VimOpenFile(BSTR& FileName, long LineNr)
  {
  
  	// OLE automation object for com. with Vim
***************
*** 507,513 ****
  	// Get a dispatch id for the SendKeys method of Vim;
  	// enables connection to Vim if necessary
  	DISPID DispatchId;
! 	DispatchId = VimGetDispatchId (VimOle, "SendKeys");
  	if (! DispatchId)
  		// OLE error, can't obtain dispatch id
  		goto OleError;
--- 517,523 ----
  	// Get a dispatch id for the SendKeys method of Vim;
  	// enables connection to Vim if necessary
  	DISPID DispatchId;
! 	DispatchId = VimGetDispatchId(VimOle, "SendKeys");
  	if (! DispatchId)
  		// OLE error, can't obtain dispatch id
  		goto OleError;
***************
*** 525,544 ****
  #ifdef SINGLE_WINDOW
  	// Update the current file in Vim if it has been modified.
  	// Disabled, because it could write the file when you don't want to.
! 	sprintf (VimCmd + 2, ":up\n");
  #endif
! 	if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
  		goto OleError;
  
  	// Change Vim working directory to where the file is if desired
  	if (g_ChangeDir != CD_NONE)
! 		VimChangeDir (VimOle, DispatchId, FileName);
  
  	// Make Vim open the file.
  	// In the filename convert all \ to /, put a \ before a space.
! 	sprintf(VimCmd, ":drop ");
  	sprintf(FileNameTmp, "%S", (char *)FileName);
- 	s = VimCmd + 6;
  	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
  									  ++p)
  		if (*p == '\\')
--- 535,562 ----
  #ifdef SINGLE_WINDOW
  	// Update the current file in Vim if it has been modified.
  	// Disabled, because it could write the file when you don't want to.
! 	sprintf(VimCmd + 2, ":up\n");
  #endif
! 	if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
  		goto OleError;
  
  	// Change Vim working directory to where the file is if desired
  	if (g_ChangeDir != CD_NONE)
! 		VimChangeDir(VimOle, DispatchId, FileName);
  
  	// Make Vim open the file.
  	// In the filename convert all \ to /, put a \ before a space.
! 	if (g_bNewTabs)
! 	{
! 		sprintf(VimCmd, ":tab drop ");
! 		s = VimCmd + 11;
! 	}
! 	else
! 	{
! 		sprintf(VimCmd, ":drop ");
! 		s = VimCmd + 6;
! 	}
  	sprintf(FileNameTmp, "%S", (char *)FileName);
  	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
  									  ++p)
  		if (*p == '\\')
***************
*** 552,571 ****
  	*s++ = '\n';
  	*s = '\0';
  
! 	if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
  		goto OleError;
  
  	if (LineNr > 0)
  	{
  		// Goto line
! 		sprintf (VimCmd, ":%d\n", LineNr);
! 		if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
  			goto OleError;
  	}
  
  	// Make Vim come to the foreground
! 	if (! VimOle.Method ("SetForeground"))
! 		VimOle.ErrDiag ();
  
  	// We're done
  	return true;
--- 570,589 ----
  	*s++ = '\n';
  	*s = '\0';
  
! 	if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
  		goto OleError;
  
  	if (LineNr > 0)
  	{
  		// Goto line
! 		sprintf(VimCmd, ":%d\n", LineNr);
! 		if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
  			goto OleError;
  	}
  
  	// Make Vim come to the foreground
! 	if (! VimOle.Method("SetForeground"))
! 		VimOle.ErrDiag();
  
  	// We're done
  	return true;
***************
*** 573,579 ****
      OleError:
  	// There was an OLE error
  	// Check if it's the "unknown class string" error
! 	VimErrDiag (VimOle);
  	return false;
  }
  
--- 591,597 ----
      OleError:
  	// There was an OLE error
  	// Check if it's the "unknown class string" error
! 	VimErrDiag(VimOle);
  	return false;
  }
  
***************
*** 581,598 ****
  // Create the Vim OLE object if necessary
  // Returns a valid dispatch id or null on error
  //
! static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method)
  {
  	// Initialize Vim OLE connection if not already done
! 	if (! VimOle.IsCreated ())
  	{
! 		if (! VimOle.CreateObject ("Vim.Application"))
  			return NULL;
  	}
  
  	// Get the dispatch id for the SendKeys method.
  	// By doing this, we are checking if Vim is still there...
! 	DISPID DispatchId = VimOle.GetDispatchId ("SendKeys");
  	if (! DispatchId)
  	{
  		// We can't get a dispatch id.
--- 599,616 ----
  // Create the Vim OLE object if necessary
  // Returns a valid dispatch id or null on error
  //
! static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method)
  {
  	// Initialize Vim OLE connection if not already done
! 	if (! VimOle.IsCreated())
  	{
! 		if (! VimOle.CreateObject("Vim.Application"))
  			return NULL;
  	}
  
  	// Get the dispatch id for the SendKeys method.
  	// By doing this, we are checking if Vim is still there...
! 	DISPID DispatchId = VimOle.GetDispatchId("SendKeys");
  	if (! DispatchId)
  	{
  		// We can't get a dispatch id.
***************
*** 604,615 ****
  		// should not be kept long enough to allow the user to terminate Vim
  		// to avoid memory corruption (why the heck is there no system garbage
  		// collection for those damned OLE memory chunks???).
! 		VimOle.DeleteObject ();
! 		if (! VimOle.CreateObject ("Vim.Application"))
  			// If this create fails, it's time for an error msg
  			return NULL;
  
! 		if (! (DispatchId = VimOle.GetDispatchId ("SendKeys")))
  			// There is something wrong...
  			return NULL;
  	}
--- 622,633 ----
  		// should not be kept long enough to allow the user to terminate Vim
  		// to avoid memory corruption (why the heck is there no system garbage
  		// collection for those damned OLE memory chunks???).
! 		VimOle.DeleteObject();
! 		if (! VimOle.CreateObject("Vim.Application"))
  			// If this create fails, it's time for an error msg
  			return NULL;
  
! 		if (! (DispatchId = VimOle.GetDispatchId("SendKeys")))
  			// There is something wrong...
  			return NULL;
  	}
***************
*** 620,639 ****
  // Output an error message for an OLE error
  // Check on the classstring error, which probably means Vim wasn't registered.
  //
! static void VimErrDiag (COleAutomationControl& VimOle)
  {
! 	SCODE sc = GetScode (VimOle.GetResult ());
  	if (sc == CO_E_CLASSSTRING)
  	{
  		char Buf[256];
! 		sprintf (Buf, "There is no registered OLE automation server named "
  			 "\"Vim.Application\".\n"
  			 "Use the OLE-enabled version of Vim with VisVim and "
  			 "make sure to register Vim by running \"vim -register\".");
! 		MessageBox (NULL, Buf, "OLE Error", MB_OK);
  	}
  	else
! 		VimOle.ErrDiag ();
  }
  
  // Change directory to the directory the file 'FileName' is in or it's parent
--- 638,657 ----
  // Output an error message for an OLE error
  // Check on the classstring error, which probably means Vim wasn't registered.
  //
! static void VimErrDiag(COleAutomationControl& VimOle)
  {
! 	SCODE sc = GetScode(VimOle.GetResult());
  	if (sc == CO_E_CLASSSTRING)
  	{
  		char Buf[256];
! 		sprintf(Buf, "There is no registered OLE automation server named "
  			 "\"Vim.Application\".\n"
  			 "Use the OLE-enabled version of Vim with VisVim and "
  			 "make sure to register Vim by running \"vim -register\".");
! 		MessageBox(NULL, Buf, "OLE Error", MB_OK);
  	}
  	else
! 		VimOle.ErrDiag();
  }
  
  // Change directory to the directory the file 'FileName' is in or it's parent
***************
*** 644,650 ****
  //	CD_SOURCE_PATH
  //	CD_SOURCE_PARENT
  //
! static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName)
  {
  	// Do a :cd first
  
--- 662,668 ----
  //	CD_SOURCE_PATH
  //	CD_SOURCE_PARENT
  //
! static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName)
  {
  	// Do a :cd first
  
***************
*** 655,661 ****
  	char DirUnix[_MAX_DIR * 2];
  	char *s, *t;
  
! 	_splitpath (StrFileName, Drive, Dir, NULL, NULL);
  
  	// Convert to Unix path name format, escape spaces.
  	t = DirUnix;
--- 673,679 ----
  	char DirUnix[_MAX_DIR * 2];
  	char *s, *t;
  
! 	_splitpath(StrFileName, Drive, Dir, NULL, NULL);
  
  	// Convert to Unix path name format, escape spaces.
  	t = DirUnix;
***************
*** 676,694 ****
  	OLECHAR Buf[MAX_OLE_STR];
  	char VimCmd[MAX_OLE_STR];
  
! 	sprintf (VimCmd, ":cd %s%s%s\n", Drive, DirUnix,
  		 g_ChangeDir == CD_SOURCE_PARENT && DirUnix[1] ? ".." : "");
! 	VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf));
  }
  
  #ifdef _DEBUG
  // Print out a debug message
  //
! static void DebugMsg (char* Msg, char* Arg)
  {
  	char Buf[400];
! 	sprintf (Buf, Msg, Arg);
! 	AfxMessageBox (Buf);
  }
  #endif
- 
--- 694,711 ----
  	OLECHAR Buf[MAX_OLE_STR];
  	char VimCmd[MAX_OLE_STR];
  
! 	sprintf(VimCmd, ":cd %s%s%s\n", Drive, DirUnix,
  		 g_ChangeDir == CD_SOURCE_PARENT && DirUnix[1] ? ".." : "");
! 	VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf));
  }
  
  #ifdef _DEBUG
  // Print out a debug message
  //
! static void DebugMsg(char* Msg, char* Arg)
  {
  	char Buf[400];
! 	sprintf(Buf, Msg, Arg);
! 	AfxMessageBox(Buf);
  }
  #endif
*** ../vim-7.2.149/src/VisVim/Resource.h	Sun Jun 13 19:17:32 2004
--- src/VisVim/Resource.h	Mon Mar  2 00:39:21 2009
***************
*** 16,21 ****
--- 16,22 ----
  #define IDC_CD_SOURCE_PATH		1001
  #define IDC_CD_SOURCE_PARENT		1002
  #define IDC_CD_NONE			1003
+ #define IDC_NEW_TABS			1004
  
  // Next default values for new objects
  //
*** ../vim-7.2.149/src/VisVim/VisVim.rc	Sun Jun 13 19:38:03 2004
--- src/VisVim/VisVim.rc	Mon Mar  2 00:40:19 2009
***************
*** 122,127 ****
--- 122,130 ----
      CONTROL         "&Open file in DevStudio editor simultaneously",
                      IDC_DEVSTUDIO_EDITOR,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
                      WS_TABSTOP,7,7,153,10
+     CONTROL         "Open files in new tabs",
+                     IDC_NEW_TABS,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
+                     WS_TABSTOP,7,21,153,10
      GROUPBOX        "Current directory",IDC_STATIC,7,35,164,58,WS_GROUP
      CONTROL         "Set to &source file path",IDC_CD_SOURCE_PATH,"Button",
                      BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,49,85,10
*** ../vim-7.2.149/src/version.c	Wed Apr 22 12:53:31 2009
--- src/version.c	Wed Apr 22 13:04:32 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     150,
  /**/

-- 
A poem:                read aloud:

<> !*''#               Waka waka bang splat tick tick hash,
^"`$$-                 Caret quote back-tick dollar dollar dash,
!*=@$_                 Bang splat equal at dollar under-score,
%*<> ~#4               Percent splat waka waka tilde number four,
&[]../                 Ampersand bracket bracket dot dot slash,
|{,,SYSTEM HALTED      Vertical-bar curly-bracket comma comma CRASH.

Fred Bremmer and Steve Kroese (Calvin College & Seminary of Grand Rapids, MI.)

 /// 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    ///


--- NEW FILE 7.2.151 ---
To: vim-dev at vim.org
Subject: Patch 7.2.151
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.2.151
Problem:    ":hist a" doesn't work like ":hist all" as the docs suggest.
Solution:   Make ":hist a" and ":hist al" work. (Dominique Pelle)
Files:	    src/ex_getln.c


*** ../vim-7.2.150/src/ex_getln.c	Wed Mar 18 12:50:58 2009
--- src/ex_getln.c	Sun Apr 12 13:36:06 2009
***************
*** 5686,5692 ****
  	histype1 = get_histtype(arg);
  	if (histype1 == -1)
  	{
! 	    if (STRICMP(arg, "all") == 0)
  	    {
  		histype1 = 0;
  		histype2 = HIST_COUNT-1;
--- 5686,5692 ----
  	histype1 = get_histtype(arg);
  	if (histype1 == -1)
  	{
! 	    if (STRNICMP(arg, "all", STRLEN(arg)) == 0)
  	    {
  		histype1 = 0;
  		histype2 = HIST_COUNT-1;
*** ../vim-7.2.150/src/version.c	Wed Apr 22 13:06:11 2009
--- src/version.c	Wed Apr 22 13:49:41 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     151,
  /**/

-- 
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    ///


--- NEW FILE 7.2.152 ---
To: vim-dev at vim.org
Subject: Patch 7.2.152
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.2.152
Problem:    When using "silent echo x" inside ":redir" a next echo may start
	    halfway the line. (Tony Mechelynck, Dennis Benzinger)
Solution:   Reset msg_col after redirecting silently.
Files:	    src/ex_docmd.c, src/message.c, src/proto/message.pro


*** ../vim-7.2.151/src/ex_docmd.c	Wed Mar 18 12:50:58 2009
--- src/ex_docmd.c	Wed Apr 22 11:57:49 2009
***************
*** 2699,2704 ****
--- 2699,2709 ----
  	/* Restore msg_scroll, it's set by file I/O commands, even when no
  	 * message is actually displayed. */
  	msg_scroll = save_msg_scroll;
+ 
+ 	/* "silent reg" or "silent echo x" inside "redir" leaves msg_col
+ 	 * somewhere in the line.  Put it back in the first column. */
+ 	if (redirecting())
+ 	    msg_col = 0;
      }
  
  #ifdef HAVE_SANDBOX
*** ../vim-7.2.151/src/message.c	Tue Feb 24 04:36:50 2009
--- src/message.c	Sun Apr 12 14:08:25 2009
***************
*** 3023,3033 ****
      if (*p_vfile != NUL)
  	verbose_write(s, maxlen);
  
!     if (redir_fd != NULL
! #ifdef FEAT_EVAL
! 			  || redir_reg || redir_vname
! #endif
! 				       )
      {
  	/* If the string doesn't start with CR or NL, go to msg_col */
  	if (*s != '\n' && *s != '\r')
--- 3023,3029 ----
      if (*p_vfile != NUL)
  	verbose_write(s, maxlen);
  
!     if (redirecting())
      {
  	/* If the string doesn't start with CR or NL, go to msg_col */
  	if (*s != '\n' && *s != '\r')
***************
*** 3074,3079 ****
--- 3070,3085 ----
      }
  }
  
+     int
+ redirecting()
+ {
+     return redir_fd != NULL
+ #ifdef FEAT_EVAL
+ 			  || redir_reg || redir_vname
+ #endif
+ 				       ;
+ }
+ 
  /*
   * Before giving verbose message.
   * Must always be called paired with verbose_leave()!
*** ../vim-7.2.151/src/proto/message.pro	Sat May  5 19:35:34 2007
--- src/proto/message.pro	Sun Apr 12 14:08:50 2009
***************
*** 54,59 ****
--- 54,60 ----
  void msg_clr_cmdline __ARGS((void));
  int msg_end __ARGS((void));
  void msg_check __ARGS((void));
+ int redirecting __ARGS((void));
  void verbose_enter __ARGS((void));
  void verbose_leave __ARGS((void));
  void verbose_enter_scroll __ARGS((void));
*** ../vim-7.2.151/src/version.c	Wed Apr 22 13:50:14 2009
--- src/version.c	Wed Apr 22 14:40:22 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     152,
  /**/

-- 
Q: How does a UNIX Guru pick up a girl?
A: look; grep; which; eval; nice; uname; talk; date;

 /// 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    ///


--- NEW FILE 7.2.153 ---
To: vim-dev at vim.org
Subject: Patch 7.2.153
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.2.153
Problem:    Memory leak for ":recover empty_dir/".
Solution:   Free files[] when it becomes empty. (Dominique Pelle)
Files:	    src/memline.c


*** ../vim-7.2.152/src/memline.c	Sun Jul 13 19:40:43 2008
--- src/memline.c	Wed Apr 22 11:48:35 2009
***************
*** 1554,1563 ****
  	    for (i = 0; i < num_files; ++i)
  		if (fullpathcmp(p, files[i], TRUE) & FPC_SAME)
  		{
  		    vim_free(files[i]);
! 		    --num_files;
! 		    for ( ; i < num_files; ++i)
! 			files[i] = files[i + 1];
  		}
  	}
  	if (nr > 0)
--- 1554,1568 ----
  	    for (i = 0; i < num_files; ++i)
  		if (fullpathcmp(p, files[i], TRUE) & FPC_SAME)
  		{
+ 		    /* Remove the name from files[i].  Move further entries
+ 		     * down.  When the array becomes empty free it here, since
+ 		     * FreeWild() won't be called below. */
  		    vim_free(files[i]);
! 		    if (--num_files == 0)
! 			vim_free(files);
! 		    else
! 			for ( ; i < num_files; ++i)
! 			    files[i] = files[i + 1];
  		}
  	}
  	if (nr > 0)
***************
*** 3522,3528 ****
  	    if (errno == EINVAL || errno == ENOENT)
  	    {
  		/* Found non-symlink or not existing file, stop here.
! 		 * When at the first level use the unmodifed name, skip the
  		 * call to vim_FullName(). */
  		if (depth == 1)
  		    return FAIL;
--- 3527,3533 ----
  	    if (errno == EINVAL || errno == ENOENT)
  	    {
  		/* Found non-symlink or not existing file, stop here.
! 		 * When at the first level use the unmodified name, skip the
  		 * call to vim_FullName(). */
  		if (depth == 1)
  		    return FAIL;
***************
*** 4560,4566 ****
  			buf->b_ml.ml_chunksize + curix,
  			(buf->b_ml.ml_usedchunks - curix) *
  			sizeof(chunksize_T));
! 	    /* Compute length of first half of lines in the splitted chunk */
  	    size = 0;
  	    linecnt = 0;
  	    while (curline < buf->b_ml.ml_line_count
--- 4568,4574 ----
  			buf->b_ml.ml_chunksize + curix,
  			(buf->b_ml.ml_usedchunks - curix) *
  			sizeof(chunksize_T));
! 	    /* Compute length of first half of lines in the split chunk */
  	    size = 0;
  	    linecnt = 0;
  	    while (curline < buf->b_ml.ml_line_count
*** ../vim-7.2.152/src/version.c	Wed Apr 22 14:42:26 2009
--- src/version.c	Wed Apr 22 15:34:18 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     153,
  /**/

-- 
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    ///


--- NEW FILE 7.2.154 ---
To: vim-dev at vim.org
Subject: Patch 7.2.154
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.2.154 (after 7.2.132)
Problem:    ":cd" is still possible in a SwapExists autocmd.
Solution:   Set allbuf_lock in do_swapexists().
Files:	    src/memline.c


*** ../vim-7.2.153/src/memline.c	Wed Apr 22 15:37:12 2009
--- src/memline.c	Wed Apr 22 15:54:48 2009
***************
*** 3771,3778 ****
      set_vim_var_string(VV_SWAPCHOICE, NULL, -1);
  
      /* Trigger SwapExists autocommands with <afile> set to the file being
!      * edited. */
      apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL);
  
      set_vim_var_string(VV_SWAPNAME, NULL, -1);
  
--- 3771,3780 ----
      set_vim_var_string(VV_SWAPCHOICE, NULL, -1);
  
      /* Trigger SwapExists autocommands with <afile> set to the file being
!      * edited.  Disallow changing directory here. */
!     ++allbuf_lock;
      apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL);
+     --allbuf_lock;
  
      set_vim_var_string(VV_SWAPNAME, NULL, -1);
  
***************
*** 3798,3803 ****
--- 3800,3806 ----
   *
   * Note: If BASENAMELEN is not correct, you will get error messages for
   *	 not being able to open the swapfile
+  * Note: May trigger SwapExists autocmd, pointers may change!
   */
      static char_u *
  findswapname(buf, dirp, old_fname)
*** ../vim-7.2.153/src/version.c	Wed Apr 22 15:37:12 2009
--- src/version.c	Wed Apr 22 15:55:48 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     154,
  /**/

-- 
ARTHUR:  Be quiet!
DENNIS:  Well you can't expect to wield supreme executive power just 'cause
         some watery tart threw a sword at you!
ARTHUR:  Shut up!
DENNIS:  I mean, if I went around sayin' I was an empereror just because some
         moistened bint had lobbed a scimitar at me they'd put me away!
                                  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    ///


--- NEW FILE 7.2.155 ---
To: vim-dev at vim.org
Subject: Patch 7.2.155
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.2.155
Problem:    Memory leak in ":function /pat".
Solution:   Free the memory. (Dominique Pelle)
Files:	    src/eval.c


*** ../vim-7.2.154/src/eval.c	Wed Apr 22 12:53:31 2009
--- src/eval.c	Wed Apr 22 16:04:34 2009
***************
*** 19720,19725 ****
--- 19720,19726 ----
  			    list_func_head(fp, FALSE);
  		    }
  		}
+ 		vim_free(regmatch.regprog);
  	    }
  	}
  	if (*p == '/')
*** ../vim-7.2.154/src/version.c	Wed Apr 22 15:56:27 2009
--- src/version.c	Wed Apr 22 16:07:27 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     155,
  /**/

-- 
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    ///


--- NEW FILE 7.2.156 ---
To: vim-dev at vim.org
Subject: Patch 7.2.156
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.2.156 (after 7.2.143)
Problem:    No completion for :scscope and :lcscope commands.
Solution:   Implement the completion. (Dominique Pelle)
Files:	    src/if_cscope.c, src/ex_docmd.c, src/proto/if_cscope.pro


*** ../vim-7.2.155/src/if_cscope.c	Wed Mar 18 14:30:46 2009
--- src/if_cscope.c	Wed Apr 22 11:57:49 2009
***************
*** 98,103 ****
--- 98,104 ----
  static enum
  {
      EXP_CSCOPE_SUBCMD,	/* expand ":cscope" sub-commands */
+     EXP_SCSCOPE_SUBCMD,	/* expand ":scscope" sub-commands */
      EXP_CSCOPE_FIND,	/* expand ":cscope find" arguments */
      EXP_CSCOPE_KILL	/* expand ":cscope kill" arguments */
  } expand_what;
***************
*** 112,123 ****
--- 113,135 ----
      expand_T	*xp;
      int		idx;
  {
+     int		current_idx;
+     int		i;
+ 
      switch (expand_what)
      {
      case EXP_CSCOPE_SUBCMD:
  	/* Complete with sub-commands of ":cscope":
  	 * add, find, help, kill, reset, show */
  	return (char_u *)cs_cmds[idx].name;
+     case EXP_SCSCOPE_SUBCMD:
+ 	/* Complete with sub-commands of ":scscope": same sub-commands as
+ 	 * ":cscope" but skip commands which don't support split windows */
+ 	for (i = 0, current_idx = 0; cs_cmds[i].name != NULL; i++)
+ 	    if (cs_cmds[i].cansplit)
+ 		if (current_idx++ == idx)
+ 		    break;
+ 	return (char_u *)cs_cmds[i].name;
      case EXP_CSCOPE_FIND:
  	{
  	    const char *query_type[] =
***************
*** 133,147 ****
  	}
      case EXP_CSCOPE_KILL:
  	{
- 	    int			i;
- 	    int			current_idx = 0;
  	    static char_u	connection[2];
  
  	    /* ":cscope kill" accepts connection numbers or partial names of
  	     * the pathname of the cscope database as argument.  Only complete
  	     * with connection numbers. -1 can also be used to kill all
  	     * connections. */
! 	    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	    {
  		if (csinfo[i].fname == NULL)
  		    continue;
--- 145,157 ----
  	}
      case EXP_CSCOPE_KILL:
  	{
  	    static char_u	connection[2];
  
  	    /* ":cscope kill" accepts connection numbers or partial names of
  	     * the pathname of the cscope database as argument.  Only complete
  	     * with connection numbers. -1 can also be used to kill all
  	     * connections. */
! 	    for (i = 0, current_idx = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	    {
  		if (csinfo[i].fname == NULL)
  		    continue;
***************
*** 165,180 ****
   * Handle command line completion for :cscope command.
   */
      void
! set_context_in_cscope_cmd(xp, arg)
      expand_T	*xp;
      char_u	*arg;
  {
      char_u	*p;
  
      /* Default: expand subcommands */
      xp->xp_context = EXPAND_CSCOPE;
-     expand_what = EXP_CSCOPE_SUBCMD;
      xp->xp_pattern = arg;
  
      /* (part of) subcommand already typed */
      if (*arg != NUL)
--- 175,192 ----
   * Handle command line completion for :cscope command.
   */
      void
! set_context_in_cscope_cmd(xp, arg, cmdidx)
      expand_T	*xp;
      char_u	*arg;
+     cmdidx_T	cmdidx;
  {
      char_u	*p;
  
      /* Default: expand subcommands */
      xp->xp_context = EXPAND_CSCOPE;
      xp->xp_pattern = arg;
+     expand_what = (cmdidx == CMD_scscope)
+ 			? EXP_SCSCOPE_SUBCMD : EXP_CSCOPE_SUBCMD;
  
      /* (part of) subcommand already typed */
      if (*arg != NUL)
*** ../vim-7.2.155/src/ex_docmd.c	Wed Apr 22 14:42:26 2009
--- src/ex_docmd.c	Wed Apr 22 11:57:49 2009
***************
*** 3690,3696 ****
  	    break;
  #ifdef FEAT_CSCOPE
  	case CMD_cscope:
! 	    set_context_in_cscope_cmd(xp, arg);
  	    break;
  #endif
  #ifdef FEAT_LISTCMDS
--- 3690,3698 ----
  	    break;
  #ifdef FEAT_CSCOPE
  	case CMD_cscope:
! 	case CMD_lcscope:
! 	case CMD_scscope:
! 	    set_context_in_cscope_cmd(xp, arg, ea.cmdidx);
  	    break;
  #endif
  #ifdef FEAT_LISTCMDS
*** ../vim-7.2.155/src/proto/if_cscope.pro	Wed Mar 18 12:50:58 2009
--- src/proto/if_cscope.pro	Wed Apr 22 11:57:49 2009
***************
*** 1,6 ****
  /* if_cscope.c */
  char_u *get_cscope_name __ARGS((expand_T *xp, int idx));
! void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg));
  void do_cscope __ARGS((exarg_T *eap));
  void do_scscope __ARGS((exarg_T *eap));
  void do_cstag __ARGS((exarg_T *eap));
--- 1,6 ----
  /* if_cscope.c */
  char_u *get_cscope_name __ARGS((expand_T *xp, int idx));
! void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg, cmdidx_T cmdidx));
  void do_cscope __ARGS((exarg_T *eap));
  void do_scscope __ARGS((exarg_T *eap));
  void do_cstag __ARGS((exarg_T *eap));
*** ../vim-7.2.155/src/version.c	Wed Apr 22 16:07:57 2009
--- src/version.c	Wed Apr 22 16:21:43 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     156,
  /**/

-- 
ARTHUR:  Shut up!  Will you shut up!
DENNIS:  Ah, now we see the violence inherent in the system.
ARTHUR:  Shut up!
DENNIS:  Oh!  Come and see the violence inherent in the system!
         HELP! HELP!  I'm being repressed!
                                  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    ///


--- NEW FILE 7.2.157 ---
To: vim-dev at vim.org
Subject: Patch 7.2.157
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.2.157
Problem:    Illegal memory access when searching in path.
Solution:   Avoid looking at a byte after end of a string. (Dominique Pelle)
Files:	    src/search.c


*** ../vim-7.2.156/src/search.c	Fri Jul 18 12:05:58 2008
--- src/search.c	Wed Apr 22 12:26:19 2009
***************
*** 2327,2334 ****
  		    for (col = pos.col; check_prevcol(linep, col, '\\', &col);)
  			bslcnt++;
  		}
! 		/* Only accept a match when 'M' is in 'cpo' or when ecaping is
! 		 * what we expect. */
  		if (cpo_bsl || (bslcnt & 1) == match_escaped)
  		{
  		    if (c == initc)
--- 2336,2343 ----
  		    for (col = pos.col; check_prevcol(linep, col, '\\', &col);)
  			bslcnt++;
  		}
! 		/* Only accept a match when 'M' is in 'cpo' or when escaping
! 		 * is what we expect. */
  		if (cpo_bsl || (bslcnt & 1) == match_escaped)
  		{
  		    if (c == initc)
***************
*** 4663,4669 ****
  			    msg_putchar('\n');	    /* cursor below last one */
  			    if (!got_int)	    /* don't display if 'q'
  						       typed at "--more--"
! 						       mesage */
  			    {
  				msg_home_replace_hl(new_fname);
  				MSG_PUTS(_(" (includes previously listed match)"));
--- 4672,4678 ----
  			    msg_putchar('\n');	    /* cursor below last one */
  			    if (!got_int)	    /* don't display if 'q'
  						       typed at "--more--"
! 						       message */
  			    {
  				msg_home_replace_hl(new_fname);
  				MSG_PUTS(_(" (includes previously listed match)"));
***************
*** 4975,4981 ****
  					    || IObuff[i-2] == '!'))))
  				IObuff[i++] = ' ';
  			}
! 			/* copy as much as posible of the new word */
  			if (p - aux >= IOSIZE - i)
  			    p = aux + IOSIZE - i - 1;
  			STRNCPY(IObuff + i, aux, p - aux);
--- 4984,4990 ----
  					    || IObuff[i-2] == '!'))))
  				IObuff[i++] = ' ';
  			}
! 			/* copy as much as possible of the new word */
  			if (p - aux >= IOSIZE - i)
  			    p = aux + IOSIZE - i - 1;
  			STRNCPY(IObuff + i, aux, p - aux);
***************
*** 5010,5016 ****
  		    if (did_show)
  			msg_putchar('\n');	/* cursor below last one */
  		    if (!got_int)		/* don't display if 'q' typed
! 						    at "--more--" mesage */
  			msg_home_replace_hl(curr_fname);
  		    prev_fname = curr_fname;
  		}
--- 5019,5025 ----
  		    if (did_show)
  			msg_putchar('\n');	/* cursor below last one */
  		    if (!got_int)		/* don't display if 'q' typed
! 						    at "--more--" message */
  			msg_home_replace_hl(curr_fname);
  		    prev_fname = curr_fname;
  		}
***************
*** 5092,5098 ****
  		}
  		if (action != ACTION_SHOW)
  		{
! 		    curwin->w_cursor.col = (colnr_T) (startp - line);
  		    curwin->w_set_curswant = TRUE;
  		}
  
--- 5101,5107 ----
  		}
  		if (action != ACTION_SHOW)
  		{
! 		    curwin->w_cursor.col = (colnr_T)(startp - line);
  		    curwin->w_set_curswant = TRUE;
  		}
  
***************
*** 5119,5125 ****
  		    && action == ACTION_EXPAND
  		    && !(compl_cont_status & CONT_SOL)
  #endif
! 		    && *(p = startp + 1))
  		goto search_line;
  	}
  	line_breakcheck();
--- 5128,5135 ----
  		    && action == ACTION_EXPAND
  		    && !(compl_cont_status & CONT_SOL)
  #endif
! 		    && *startp != NUL
! 		    && *(p = startp + 1) != NUL)
  		goto search_line;
  	}
  	line_breakcheck();
*** ../vim-7.2.156/src/version.c	Wed Apr 22 16:22:44 2009
--- src/version.c	Wed Apr 22 16:39:59 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     157,
  /**/


-- 
ARTHUR:  Bloody peasant!
DENNIS:  Oh, what a give away.  Did you hear that, did you hear that, eh?
         That's what I'm on about -- did you see him repressing me, you saw it
         didn't you?
                                  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    ///


--- NEW FILE 7.2.158 ---
To: vim-dev at vim.org
Subject: Patch 7.2.158
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.2.158
Problem:    Warnings from VisualC compiler.
Solution:   Add type casts. (George Reilly)
Files:	    src/ops.c


*** ../vim-7.2.157/src/ops.c	Wed Mar 11 16:26:01 2009
--- src/ops.c	Wed Apr 22 13:01:46 2009
***************
*** 495,504 ****
  	block_space_width = non_white_col - oap->start_vcol;
  	/* We will shift by "total" or "block_space_width", whichever is less.
  	 */
! 	shift_amount = (block_space_width < total? block_space_width: total);
  
  	/* The column to which we will shift the text.  */
! 	destination_col = non_white_col - shift_amount;
  
  	/* Now let's find out how much of the beginning of the line we can
  	 * reuse without modification.  */
--- 495,505 ----
  	block_space_width = non_white_col - oap->start_vcol;
  	/* We will shift by "total" or "block_space_width", whichever is less.
  	 */
! 	shift_amount = (block_space_width < (size_t)total
! 					 ? block_space_width : (size_t)total);
  
  	/* The column to which we will shift the text.  */
! 	destination_col = (colnr_T)(non_white_col - shift_amount);
  
  	/* Now let's find out how much of the beginning of the line we can
  	 * reuse without modification.  */
*** ../vim-7.2.157/src/version.c	Wed Apr 22 16:42:24 2009
--- src/version.c	Wed Apr 22 17:42:19 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     158,
  /**/

-- 
ARTHUR:        What?
BLACK KNIGHT:  None shall pass.
ARTHUR:        I have no quarrel with you, good Sir knight, but I must cross
               this bridge.
BLACK KNIGHT:  Then you shall die.
                                  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    ///


--- NEW FILE 7.2.159 ---
To: vim-dev at vim.org
Subject: Patch 7.2.159
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.2.159
Problem:    When $x_includes ends up being "NONE" configure fails.
Solution:   Check for $x_includes not to be "NONE" (Rainer)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.158/src/auto/configure	Mon Mar  2 02:44:54 2009
--- src/auto/configure	Wed Apr 22 14:37:24 2009
***************
*** 15519,15525 ****
  if test "$enable_multibyte" = "yes"; then
    cflags_save=$CFLAGS
    ldflags_save=$LDFLAGS
!   if test -n "$x_includes" ; then
      CFLAGS="$CFLAGS -I$x_includes"
      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
      { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
--- 15519,15525 ----
  if test "$enable_multibyte" = "yes"; then
    cflags_save=$CFLAGS
    ldflags_save=$LDFLAGS
!   if test "x$x_includes" != "xNONE" ; then
      CFLAGS="$CFLAGS -I$x_includes"
      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
      { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
*** ../vim-7.2.158/src/configure.in	Mon Mar  2 02:44:54 2009
--- src/configure.in	Wed Apr 22 14:35:57 2009
***************
*** 2952,2958 ****
  if test "$enable_multibyte" = "yes"; then
    cflags_save=$CFLAGS
    ldflags_save=$LDFLAGS
!   if test -n "$x_includes" ; then
      CFLAGS="$CFLAGS -I$x_includes"
      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
      AC_MSG_CHECKING(whether X_LOCALE needed)
--- 2952,2958 ----
  if test "$enable_multibyte" = "yes"; then
    cflags_save=$CFLAGS
    ldflags_save=$LDFLAGS
!   if test "x$x_includes" != "xNONE" ; then
      CFLAGS="$CFLAGS -I$x_includes"
      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
      AC_MSG_CHECKING(whether X_LOCALE needed)
*** ../vim-7.2.158/src/version.c	Wed Apr 22 17:42:53 2009
--- src/version.c	Wed Apr 22 17:49:50 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     159,
  /**/

-- 
"Hegel was right when he said that we learn from history that man can
never learn anything from history."       (George Bernard Shaw)

 /// 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    ///


--- NEW FILE 7.2.160 ---
To: vim-dev at vim.org
Subject: Patch 7.2.160
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.2.160
Problem:    Search pattern not freed on exit when 'rightleft' set.
Solution:   Free mr_pattern_alloced.
Files:	    src/search.c


*** ../vim-7.2.159/src/search.c	Wed Apr 22 16:42:24 2009
--- src/search.c	Wed Apr 22 12:26:19 2009
***************
*** 345,350 ****
--- 345,359 ----
  {
      vim_free(spats[0].pat);
      vim_free(spats[1].pat);
+ 
+ # ifdef FEAT_RIGHTLEFT
+     if (mr_pattern_alloced)
+     {
+         vim_free(mr_pattern);
+         mr_pattern_alloced = FALSE;
+         mr_pattern = NULL;
+     }
+ # endif
  }
  #endif
  
*** ../vim-7.2.159/src/version.c	Wed Apr 22 17:50:53 2009
--- src/version.c	Wed Apr 22 18:42:25 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     160,
  /**/

-- 
    f y cn rd ths thn y cn hv grt jb n cmptr prgrmmng

 /// 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    ///


--- NEW FILE 7.2.161 ---
To: vim-dev at vim.org
Subject: Patch 7.2.161
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.2.161
Problem:    Folds messed up in other tab page. (Vlad Irnov)
Solution:   Instead of going over all windows in current tab page go over all
	    windows in all tab pages.  Also free memory for location lists in
	    other tab pages when exiting. (Lech Lorens)
Files:	    src/fileio.c, src/mark.c, src/misc1.c, src/misc2.c


*** ../vim-7.2.160/src/fileio.c	Wed Mar 18 15:40:03 2009
--- src/fileio.c	Wed Apr 22 15:46:35 2009
***************
*** 6846,6855 ****
  #endif
  #ifdef FEAT_FOLDING
  	{
! 	    win_T *wp;
  
  	    /* Update folds unless they are defined manually. */
! 	    FOR_ALL_WINDOWS(wp)
  		if (wp->w_buffer == curwin->w_buffer
  			&& !foldmethodIsManual(wp))
  		    foldUpdateAll(wp);
--- 6846,6856 ----
  #endif
  #ifdef FEAT_FOLDING
  	{
! 	    win_T	*wp;
! 	    tabpage_T	*tp;
  
  	    /* Update folds unless they are defined manually. */
! 	    FOR_ALL_TAB_WINDOWS(tp, wp)
  		if (wp->w_buffer == curwin->w_buffer
  			&& !foldmethodIsManual(wp))
  		    foldUpdateAll(wp);
*** ../vim-7.2.160/src/mark.c	Sun Nov  9 13:43:25 2008
--- src/mark.c	Wed Apr 22 17:32:29 2009
***************
*** 1023,1028 ****
--- 1023,1031 ----
      int		fnum = curbuf->b_fnum;
      linenr_T	*lp;
      win_T	*win;
+ #ifdef FEAT_WINDOWS
+     tabpage_T	*tab;
+ #endif
  
      if (line2 < line1 && amount_after == 0L)	    /* nothing to do */
  	return;
***************
*** 1064,1070 ****
  	/* quickfix marks */
  	qf_mark_adjust(NULL, line1, line2, amount, amount_after);
  	/* location lists */
! 	FOR_ALL_WINDOWS(win)
  	    qf_mark_adjust(win, line1, line2, amount, amount_after);
  #endif
  
--- 1067,1073 ----
  	/* quickfix marks */
  	qf_mark_adjust(NULL, line1, line2, amount, amount_after);
  	/* location lists */
! 	FOR_ALL_TAB_WINDOWS(tab, win)
  	    qf_mark_adjust(win, line1, line2, amount, amount_after);
  #endif
  
***************
*** 1086,1092 ****
      /*
       * Adjust items in all windows related to the current buffer.
       */
!     FOR_ALL_WINDOWS(win)
      {
  #ifdef FEAT_JUMPLIST
  	if (!cmdmod.lockmarks)
--- 1089,1095 ----
      /*
       * Adjust items in all windows related to the current buffer.
       */
!     FOR_ALL_TAB_WINDOWS(tab, win)
      {
  #ifdef FEAT_JUMPLIST
  	if (!cmdmod.lockmarks)
*** ../vim-7.2.160/src/misc1.c	Wed Mar 18 15:40:03 2009
--- src/misc1.c	Wed Apr 22 17:32:46 2009
***************
*** 2717,2722 ****
--- 2717,2725 ----
      long	xtra;
  {
      win_T	*wp;
+ #ifdef FEAT_WINDOWS
+     tabpage_T	*tp;
+ #endif
      int		i;
  #ifdef FEAT_JUMPLIST
      int		cols;
***************
*** 2769,2775 ****
  		    curbuf->b_changelistlen = JUMPLISTSIZE - 1;
  		    mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
  					  sizeof(pos_T) * (JUMPLISTSIZE - 1));
! 		    FOR_ALL_WINDOWS(wp)
  		    {
  			/* Correct position in changelist for other windows on
  			 * this buffer. */
--- 2772,2778 ----
  		    curbuf->b_changelistlen = JUMPLISTSIZE - 1;
  		    mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
  					  sizeof(pos_T) * (JUMPLISTSIZE - 1));
! 		    FOR_ALL_TAB_WINDOWS(tp, wp)
  		    {
  			/* Correct position in changelist for other windows on
  			 * this buffer. */
***************
*** 2777,2783 ****
  			    --wp->w_changelistidx;
  		    }
  		}
! 		FOR_ALL_WINDOWS(wp)
  		{
  		    /* For other windows, if the position in the changelist is
  		     * at the end it stays at the end. */
--- 2780,2786 ----
  			    --wp->w_changelistidx;
  		    }
  		}
! 		FOR_ALL_TAB_WINDOWS(tp, wp)
  		{
  		    /* For other windows, if the position in the changelist is
  		     * at the end it stays at the end. */
***************
*** 2796,2802 ****
  #endif
      }
  
!     FOR_ALL_WINDOWS(wp)
      {
  	if (wp->w_buffer == curbuf)
  	{
--- 2799,2805 ----
  #endif
      }
  
!     FOR_ALL_TAB_WINDOWS(tp, wp)
      {
  	if (wp->w_buffer == curbuf)
  	{
*** ../vim-7.2.160/src/misc2.c	Wed Mar 11 17:27:46 2009
--- src/misc2.c	Wed Apr 22 15:46:35 2009
***************
*** 1075,1085 ****
  
  #ifdef FEAT_QUICKFIX
      {
! 	win_T	*win;
  
  	qf_free_all(NULL);
  	/* Free all location lists */
! 	FOR_ALL_WINDOWS(win)
  	    qf_free_all(win);
      }
  #endif
--- 1075,1086 ----
  
  #ifdef FEAT_QUICKFIX
      {
! 	win_T	    *win;
! 	tabpage_T   *tab;
  
  	qf_free_all(NULL);
  	/* Free all location lists */
! 	FOR_ALL_TAB_WINDOWS(tab, win)
  	    qf_free_all(win);
      }
  #endif
*** ../vim-7.2.160/src/version.c	Wed Apr 22 18:43:06 2009
--- src/version.c	Wed Apr 29 10:59:01 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     161,
  /**/

-- 
CONCORDE:  Quickly, sir, come this way!
LAUNCELOT: No!  It's not right for my idiom.  I must escape more  ... more ...
CONCORDE:  Dramatically, sir?
LAUNCELOT: Dramatically.
                 "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    ///


--- NEW FILE 7.2.162 ---
To: vim-dev at vim.org
Subject: Patch 7.2.162
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.2.162
Problem:    The quickfix window may get wrong filetype.
Solution:   Do not detect the filetype for the quickfix window. (Lech Lorens)
Files:	    src/quickfix.c


*** ../vim-7.2.161/src/quickfix.c	Sun Feb 22 02:36:36 2009
--- src/quickfix.c	Wed Apr 22 17:34:57 2009
***************
*** 2346,2352 ****
  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
  								   OPT_LOCAL);
  	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
! 	    set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL);
  	}
  
  	/* Only set the height when still in the same tab page and there is no
--- 2346,2358 ----
  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
  								   OPT_LOCAL);
  	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
! #ifdef FEAT_DIFF
! 	    curwin->w_p_diff = FALSE;
! #endif
! #ifdef FEAT_FOLDING
! 	    set_option_value((char_u *)"fdm", 0L, (char_u *)"manual",
! 								   OPT_LOCAL);
! #endif
  	}
  
  	/* Only set the height when still in the same tab page and there is no
***************
*** 2607,2616 ****
--- 2613,2624 ----
      curbuf->b_p_ma = FALSE;
  
  #ifdef FEAT_AUTOCMD
+     keep_filetype = TRUE;		/* don't detect 'filetype' */
      apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL,
  							       FALSE, curbuf);
      apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL,
  							       FALSE, curbuf);
+     keep_filetype = FALSE;
  #endif
  
      /* make sure it will be redrawn */
*** ../vim-7.2.161/src/version.c	Wed Apr 29 11:00:09 2009
--- src/version.c	Wed Apr 29 11:49:09 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     162,
  /**/

-- 
Yesterday is history.
Tomorrow is a mystery.
Today is a gift.
That's why it is called 'present'.

 /// 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    ///


--- NEW FILE 7.2.163 ---
To: vim-dev at vim.org
Subject: Patch 7.2.163
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.2.163
Problem:    The command line window may get folding.
Solution:   Default to no/manual folding. (Lech Lorens)
Files:	    src/ex_getln.c


*** ../vim-7.2.162/src/ex_getln.c	Wed Apr 22 13:50:14 2009
--- src/ex_getln.c	Wed Apr 22 16:12:54 2009
***************
*** 6073,6078 ****
--- 6073,6081 ----
      set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
      set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
      curbuf->b_p_ma = TRUE;
+ #ifdef FEAT_FOLDING
+     curwin->w_p_fen = FALSE;
+ #endif
  # ifdef FEAT_RIGHTLEFT
      curwin->w_p_rl = cmdmsg_rl;
      cmdmsg_rl = FALSE;
*** ../vim-7.2.162/src/version.c	Wed Apr 29 11:49:57 2009
--- src/version.c	Wed Apr 29 12:02:56 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     163,
  /**/

-- 
   [SIR LAUNCELOT runs back up the stairs, grabs a rope
   of the wall and swings out over the heads of the CROWD in a
   swashbuckling manner towards a large window.  He stops just short
   of the window and is left swing pathetically back and forth.]
LAUNCELOT: Excuse me ... could somebody give me a push ...
                 "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    ///


--- NEW FILE 7.2.164 ---
To: vim-dev at vim.org
Subject: Patch 7.2.164
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.2.164
Problem:    When 'showbreak' is set the size of the Visual block may be
	    reported wrong. (Eduardo Daudt Flach)
Solution:   Temporarily make 'sbr' empty.
Files:	    src/normal.c, src/ops.c


*** ../vim-7.2.163/src/normal.c	Sat Feb 21 20:27:00 2009
--- src/normal.c	Wed Apr 22 18:30:20 2009
***************
*** 3709,3721 ****
  #ifdef FEAT_VISUAL
      if (VIsual_active && !char_avail())
      {
! 	int		i = lt(VIsual, curwin->w_cursor);
  	long		lines;
  	colnr_T		leftcol, rightcol;
  	linenr_T	top, bot;
  
  	/* Show the size of the Visual area. */
! 	if (i)
  	{
  	    top = VIsual.lnum;
  	    bot = curwin->w_cursor.lnum;
--- 3709,3721 ----
  #ifdef FEAT_VISUAL
      if (VIsual_active && !char_avail())
      {
! 	int		cursor_bot = lt(VIsual, curwin->w_cursor);
  	long		lines;
  	colnr_T		leftcol, rightcol;
  	linenr_T	top, bot;
  
  	/* Show the size of the Visual area. */
! 	if (cursor_bot)
  	{
  	    top = VIsual.lnum;
  	    bot = curwin->w_cursor.lnum;
***************
*** 3734,3747 ****
  
  	if (VIsual_mode == Ctrl_V)
  	{
  	    getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol);
  	    sprintf((char *)showcmd_buf, "%ldx%ld", lines,
  					      (long)(rightcol - leftcol + 1));
  	}
  	else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum)
  	    sprintf((char *)showcmd_buf, "%ld", lines);
  	else
! 	    sprintf((char *)showcmd_buf, "%ld", (long)(i
  		    ? curwin->w_cursor.col - VIsual.col
  		    : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e'));
  	showcmd_buf[SHOWCMD_COLS] = NUL;	/* truncate */
--- 3734,3756 ----
  
  	if (VIsual_mode == Ctrl_V)
  	{
+ #ifdef FEAT_LINEBREAK
+ 	    char_u *saved_sbr = p_sbr;
+ 
+ 	    /* Make 'sbr' empty for a moment to get the correct size. */
+ 	    p_sbr = empty_option;
+ #endif
  	    getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol);
+ #ifdef FEAT_LINEBREAK
+ 	    p_sbr = saved_sbr;
+ #endif
  	    sprintf((char *)showcmd_buf, "%ldx%ld", lines,
  					      (long)(rightcol - leftcol + 1));
  	}
  	else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum)
  	    sprintf((char *)showcmd_buf, "%ld", lines);
  	else
! 	    sprintf((char *)showcmd_buf, "%ld", (long)(cursor_bot
  		    ? curwin->w_cursor.col - VIsual.col
  		    : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e'));
  	showcmd_buf[SHOWCMD_COLS] = NUL;	/* truncate */
*** ../vim-7.2.163/src/ops.c	Wed Apr 22 17:42:53 2009
--- src/ops.c	Wed Apr 22 18:30:07 2009
***************
*** 392,398 ****
      colnr_T		ws_vcol;
      int			i = 0, j = 0;
      int			len;
- 
  #ifdef FEAT_RIGHTLEFT
      int			old_p_ri = p_ri;
  
--- 392,397 ----
***************
*** 6284,6294 ****
--- 6283,6302 ----
  
  	    if (VIsual_mode == Ctrl_V)
  	    {
+ #ifdef FEAT_LINEBREAK
+ 		char_u * saved_sbr = p_sbr;
+ 
+ 		/* Make 'sbr' empty for a moment to get the correct size. */
+ 		p_sbr = empty_option;
+ #endif
  		oparg.is_VIsual = 1;
  		oparg.block_mode = TRUE;
  		oparg.op_type = OP_NOP;
  		getvcols(curwin, &min_pos, &max_pos,
  					  &oparg.start_vcol, &oparg.end_vcol);
+ #ifdef FEAT_LINEBREAK
+ 		p_sbr = saved_sbr;
+ #endif
  		if (curwin->w_curswant == MAXCOL)
  		    oparg.end_vcol = MAXCOL;
  		/* Swap the start, end vcol if needed */
*** ../vim-7.2.163/src/version.c	Wed Apr 29 12:03:35 2009
--- src/version.c	Wed Apr 29 17:38:05 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     164,
  /**/

-- 
There are 10 kinds of people: Those who understand binary and those who don't.

 /// 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    ///


--- NEW FILE 7.2.165 ---
To: vim-dev at vim.org
Subject: Patch 7.2.165
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.2.165
Problem:    The argument for the FuncUndefined autocmd event is expanded like
	    a file name.
Solution:   Don't try expanding it. (Wang Xu)
Files:	    src/fileio.c


*** ../vim-7.2.164/src/fileio.c	Wed Apr 29 11:00:09 2009
--- src/fileio.c	Wed Apr 29 18:01:06 2009
***************
*** 8785,8793 ****
      else
      {
  	sfname = vim_strsave(fname);
! 	/* Don't try expanding FileType, Syntax, WindowID or QuickFixCmd* */
  	if (event == EVENT_FILETYPE
  		|| event == EVENT_SYNTAX
  		|| event == EVENT_REMOTEREPLY
  		|| event == EVENT_SPELLFILEMISSING
  		|| event == EVENT_QUICKFIXCMDPRE
--- 8785,8795 ----
      else
      {
  	sfname = vim_strsave(fname);
! 	/* Don't try expanding FileType, Syntax, FuncUndefined, WindowID or
! 	 * QuickFixCmd* */
  	if (event == EVENT_FILETYPE
  		|| event == EVENT_SYNTAX
+ 		|| event == EVENT_FUNCUNDEFINED
  		|| event == EVENT_REMOTEREPLY
  		|| event == EVENT_SPELLFILEMISSING
  		|| event == EVENT_QUICKFIXCMDPRE
*** ../vim-7.2.164/src/version.c	Wed Apr 29 17:39:17 2009
--- src/version.c	Wed Apr 29 18:00:43 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     165,
  /**/

-- 
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    ///


--- NEW FILE 7.2.166 ---
To: vim-dev at vim.org
Subject: Patch 7.2.166
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.2.166
Problem:    No completion for ":sign" command.
Solution:   Add ":sign" completion. (Dominique Pelle)
Files:	    src/ex_cmds.c, src/ex_docmd.c, src/ex_getln.c, src/vim.h,
	    src/proto/ex_cmds.pro


*** ../vim-7.2.165/src/ex_cmds.c	Tue Feb 24 04:28:40 2009
--- src/ex_cmds.c	Wed Apr 29 17:08:27 2009
***************
*** 6543,6562 ****
  static void sign_list_defined __ARGS((sign_T *sp));
  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
  
! /*
!  * ":sign" command
!  */
!     void
! ex_sign(eap)
!     exarg_T	*eap;
! {
!     char_u	*arg = eap->arg;
!     char_u	*p;
!     int		idx;
!     sign_T	*sp;
!     sign_T	*sp_prev;
!     buf_T	*buf;
!     static char	*cmds[] = {
  			"define",
  #define SIGNCMD_DEFINE	0
  			"undefine",
--- 6543,6549 ----
  static void sign_list_defined __ARGS((sign_T *sp));
  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
  
! static char *cmds[] = {
  			"define",
  #define SIGNCMD_DEFINE	0
  			"undefine",
***************
*** 6569,6590 ****
  #define SIGNCMD_UNPLACE	4
  			"jump",
  #define SIGNCMD_JUMP	5
  #define SIGNCMD_LAST	6
!     };
  
      /* Parse the subcommand. */
      p = skiptowhite(arg);
!     if (*p != NUL)
! 	*p++ = NUL;
!     for (idx = 0; ; ++idx)
      {
! 	if (idx == SIGNCMD_LAST)
! 	{
! 	    EMSG2(_("E160: Unknown sign command: %s"), arg);
! 	    return;
! 	}
! 	if (STRCMP(arg, cmds[idx]) == 0)
! 	    break;
      }
      arg = skipwhite(p);
  
--- 6556,6606 ----
  #define SIGNCMD_UNPLACE	4
  			"jump",
  #define SIGNCMD_JUMP	5
+ 			NULL
  #define SIGNCMD_LAST	6
! };
! 
! /*
!  * Find index of a ":sign" subcmd from its name.
!  * "*end_cmd" must be writable.
!  */
!     static int
! sign_cmd_idx(begin_cmd, end_cmd)
!     char	*begin_cmd;	/* begin of sign subcmd */
!     char	*end_cmd;	/* just after sign subcmd */
! {
!     int		idx;
!     char	save = *end_cmd;
! 
!     *end_cmd = NUL;
!     for (idx = 0; ; ++idx)
! 	if (cmds[idx] == NULL || STRCMP(begin_cmd, cmds[idx]) == 0)
! 	    break;
!     *end_cmd = save;
!     return idx;
! }
! 
! /*
!  * ":sign" command
!  */
!     void
! ex_sign(eap)
!     exarg_T	*eap;
! {
!     char_u	*arg = eap->arg;
!     char_u	*p;
!     int		idx;
!     sign_T	*sp;
!     sign_T	*sp_prev;
!     buf_T	*buf;
  
      /* Parse the subcommand. */
      p = skiptowhite(arg);
!     idx = sign_cmd_idx(arg, p);
!     if (idx == SIGNCMD_LAST)
      {
! 	EMSG2(_("E160: Unknown sign command: %s"), arg);
! 	return;
      }
      arg = skipwhite(p);
  
***************
*** 7110,7115 ****
--- 7126,7311 ----
  }
  #endif
  
+ #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
+ static enum
+ {
+     EXP_SUBCMD,		/* expand :sign sub-commands */
+     EXP_DEFINE,		/* expand :sign define {name} args */
+     EXP_PLACE,		/* expand :sign place {id} args */
+     EXP_UNPLACE,	/* expand :sign unplace" */
+     EXP_SIGN_NAMES	/* expand with name of placed signs */
+ } expand_what;
+ 
+ /*
+  * Function given to ExpandGeneric() to obtain the sign command
+  * expansion.
+  */
+ /*ARGSUSED*/
+     char_u *
+ get_sign_name(xp, idx)
+     expand_T	*xp;
+     int		idx;
+ {
+     sign_T	*sp;
+     int		current_idx;
+ 
+     switch (expand_what)
+     {
+     case EXP_SUBCMD:
+ 	return (char_u *)cmds[idx];
+     case EXP_DEFINE:
+ 	{
+ 	    char *define_arg[] =
+ 	    {
+ 		"icon=", "linehl=", "text=", "texthl=", NULL
+ 	    };
+ 	    return (char_u *)define_arg[idx];
+ 	}
+     case EXP_PLACE:
+ 	{
+ 	    char *place_arg[] =
+ 	    {
+ 		"line=", "name=", "file=", "buffer=", NULL
+ 	    };
+ 	    return (char_u *)place_arg[idx];
+ 	}
+     case EXP_UNPLACE:
+ 	{
+ 	    char *unplace_arg[] = { "file=", "buffer=", NULL };
+ 	    return (char_u *)unplace_arg[idx];
+ 	}
+     case EXP_SIGN_NAMES:
+ 	/* Complete with name of signs already defined */
+ 	current_idx = 0;
+ 	for (sp = first_sign; sp != NULL; sp = sp->sn_next)
+ 	    if (current_idx++ == idx)
+ 		return sp->sn_name;
+ 	return NULL;
+     default:
+ 	return NULL;
+     }
+ }
+ 
+ /*
+  * Handle command line completion for :sign command.
+  */
+     void
+ set_context_in_sign_cmd(xp, arg)
+     expand_T	*xp;
+     char_u	*arg;
+ {
+     char_u	*p;
+     char_u	*end_subcmd;
+     char_u	*last;
+     int		cmd_idx;
+     char_u	*begin_subcmd_args;
+ 
+     /* Default: expand subcommands. */
+     xp->xp_context = EXPAND_SIGN;
+     expand_what = EXP_SUBCMD;
+     xp->xp_pattern = arg;
+ 
+     end_subcmd = skiptowhite(arg);
+     if (*end_subcmd == NUL)
+ 	/* expand subcmd name
+ 	 * :sign {subcmd}<CTRL-D>*/
+ 	return;
+ 
+     cmd_idx = sign_cmd_idx(arg, end_subcmd);
+ 
+     /* :sign {subcmd} {subcmd_args}
+      *                |
+      *                begin_subcmd_args */
+     begin_subcmd_args = skipwhite(end_subcmd);
+     p = skiptowhite(begin_subcmd_args);
+     if (*p == NUL)
+     {
+ 	/*
+ 	 * Expand first argument of subcmd when possible.
+ 	 * For ":jump {id}" and ":unplace {id}", we could
+ 	 * possibly expand the ids of all signs already placed.
+ 	 */
+ 	xp->xp_pattern = begin_subcmd_args;
+ 	switch (cmd_idx)
+ 	{
+ 	    case SIGNCMD_LIST:
+ 	    case SIGNCMD_UNDEFINE:
+ 		/* :sign list <CTRL-D>
+ 		 * :sign undefine <CTRL-D> */
+ 		expand_what = EXP_SIGN_NAMES;
+ 		break;
+ 	    default:
+ 		xp->xp_context = EXPAND_NOTHING;
+ 	}
+ 	return;
+     }
+ 
+     /* expand last argument of subcmd */
+ 
+     /* :sign define {name} {args}...
+      *              |
+      *              p */
+ 
+     /* Loop until reaching last argument. */
+     do
+     {
+ 	p = skipwhite(p);
+ 	last = p;
+ 	p = skiptowhite(p);
+     } while (*p != NUL);
+ 
+     p = vim_strchr(last, '=');
+ 
+     /* :sign define {name} {args}... {last}=
+      *                               |     |
+      *                            last     p */
+     if (p == NUL)
+     {
+ 	/* Expand last argument name (before equal sign). */
+ 	xp->xp_pattern = last;
+ 	switch (cmd_idx)
+ 	{
+ 	    case SIGNCMD_DEFINE:
+ 		expand_what = EXP_DEFINE;
+ 		break;
+ 	    case SIGNCMD_PLACE:
+ 		expand_what = EXP_PLACE;
+ 		break;
+ 	    case SIGNCMD_JUMP:
+ 	    case SIGNCMD_UNPLACE:
+ 		expand_what = EXP_UNPLACE;
+ 		break;
+ 	    default:
+ 		xp->xp_context = EXPAND_NOTHING;
+ 	}
+     }
+     else
+     {
+ 	/* Expand last argument value (after equal sign). */
+ 	xp->xp_pattern = p + 1;
+ 	switch (cmd_idx)
+ 	{
+ 	    case SIGNCMD_DEFINE:
+ 		if (STRNCMP(last, "texthl", p - last) == 0 ||
+ 		    STRNCMP(last, "linehl", p - last) == 0)
+ 		    xp->xp_context = EXPAND_HIGHLIGHT;
+ 		else if (STRNCMP(last, "icon", p - last) == 0)
+ 		    xp->xp_context = EXPAND_FILES;
+ 		else
+ 		    xp->xp_context = EXPAND_NOTHING;
+ 		break;
+ 	    case SIGNCMD_PLACE:
+ 		if (STRNCMP(last, "name", p - last) == 0)
+ 		    expand_what = EXP_SIGN_NAMES;
+ 		else
+ 		    xp->xp_context = EXPAND_NOTHING;
+ 		break;
+ 	    default:
+ 		xp->xp_context = EXPAND_NOTHING;
+ 	}
+     }
+ }
+ #endif
  #endif
  
  #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO)
*** ../vim-7.2.165/src/ex_docmd.c	Wed Apr 22 16:22:44 2009
--- src/ex_docmd.c	Wed Apr 29 17:05:23 2009
***************
*** 3695,3700 ****
--- 3695,3705 ----
  	    set_context_in_cscope_cmd(xp, arg, ea.cmdidx);
  	    break;
  #endif
+ #ifdef FEAT_SIGNS
+ 	case CMD_sign:
+ 	    set_context_in_sign_cmd(xp, arg);
+ 	    break;
+ #endif
  #ifdef FEAT_LISTCMDS
  	case CMD_bdelete:
  	case CMD_bwipeout:
***************
*** 5218,5223 ****
--- 5223,5231 ----
      {EXPAND_MENUS, "menu"},
      {EXPAND_SETTINGS, "option"},
      {EXPAND_SHELLCMD, "shellcmd"},
+ #if defined(FEAT_SIGNS)
+     {EXPAND_SIGN, "sign"},
+ #endif
      {EXPAND_TAGS, "tag"},
      {EXPAND_TAGS_LISTFILES, "tag_listfiles"},
      {EXPAND_USER_VARS, "var"},
*** ../vim-7.2.165/src/ex_getln.c	Wed Apr 29 12:03:35 2009
--- src/ex_getln.c	Wed Apr 29 12:51:42 2009
***************
*** 325,331 ****
  #endif
  
  #ifdef FEAT_DIGRAPHS
!     do_digraph(-1);		/* init digraph typahead */
  #endif
  
      /*
--- 325,331 ----
  #endif
  
  #ifdef FEAT_DIGRAPHS
!     do_digraph(-1);		/* init digraph typeahead */
  #endif
  
      /*
***************
*** 4521,4526 ****
--- 4521,4529 ----
  #ifdef FEAT_CSCOPE
  	    {EXPAND_CSCOPE, get_cscope_name, TRUE},
  #endif
+ #ifdef FEAT_SIGNS
+ 	    {EXPAND_SIGN, get_sign_name, TRUE},
+ #endif
  #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
  	&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
  	    {EXPAND_LANGUAGE, get_lang_arg, TRUE},
*** ../vim-7.2.165/src/vim.h	Wed Mar 18 12:50:58 2009
--- src/vim.h	Wed Apr 29 12:51:42 2009
***************
*** 709,714 ****
--- 709,715 ----
  #define EXPAND_USER_LIST	31
  #define EXPAND_SHELLCMD		32
  #define EXPAND_CSCOPE		33
+ #define EXPAND_SIGN		34
  
  /* Values for exmode_active (0 is no exmode) */
  #define EXMODE_NORMAL		1
*** ../vim-7.2.165/src/proto/ex_cmds.pro	Tue Feb 24 04:28:40 2009
--- src/proto/ex_cmds.pro	Wed Apr 29 17:10:29 2009
***************
*** 40,46 ****
  int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
  void write_viminfo_sub_string __ARGS((FILE *fp));
  void free_old_sub __ARGS((void));
- void free_signs __ARGS((void));
  int prepare_tagpreview __ARGS((int undo_sync));
  void ex_help __ARGS((exarg_T *eap));
  char_u *check_help_lang __ARGS((char_u *arg));
--- 40,45 ----
***************
*** 56,60 ****
--- 55,62 ----
  char_u *sign_get_text __ARGS((int typenr));
  void *sign_get_image __ARGS((int typenr));
  char_u *sign_typenr2name __ARGS((int typenr));
+ void free_signs __ARGS((void));
+ char_u *get_sign_name __ARGS((expand_T *xp, int idx));
+ void set_context_in_sign_cmd __ARGS((expand_T *xp, char_u *arg));
  void ex_drop __ARGS((exarg_T *eap));
  /* vim: set ft=c : */
*** ../vim-7.2.165/src/version.c	Wed Apr 29 18:01:23 2009
--- src/version.c	Wed Apr 29 18:43:14 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     166,
  /**/

-- 
Did you ever stop to think...  and forget to start again?
                                  -- Steven Wright

 /// 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    ///


--- NEW FILE 7.2.167 ---
To: vim-dev at vim.org
Subject: Patch 7.2.167
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.167
Problem:    Splint doesn't work well for checking the code.
Solution:   Add splint arguments in the Makefile.  Exclude some code from
	    splint that it can't handle.  Tune splint arguments to give
	    reasonable errors.  Add a filter for removing false warnings from
	    splint output.  Many small changes to avoid warnings.  More to
	    follow...
Files:	    Filelist, src/Makefile, src/buffer.c, src/charset.c,
	    src/cleanlint.vim, src/digraph.c, src/edit.c, src/ex_cmds.c,
	    src/globals.h, src/ops.c, src/os_unix.c, src/os_unix.h,
	    src/proto/buffer.pro, src/proto/edit.pro, src/screen.c,
	    src/structs.h

*** ../vim-7.2.166/Filelist	2008-09-20 16:26:10.000000000 +0200
--- Filelist	2009-05-05 21:45:49.000000000 +0200
***************
*** 139,144 ****
--- 139,145 ----
  		src/INSTALL \
  		src/INSTALLx.txt \
  		src/Makefile \
+ 		src/cleanlint.vim \
  		src/auto/configure \
  		src/config.aap.in \
  		src/config.h.in \
***************
*** 683,691 ****
  		runtime/spell/??/main.aap \
  		runtime/spell/yi/README.txt \
  		runtime/spell/main.aap \
- 		runtime/spell/cleanadd.vim \
  		runtime/spell/*.vim \
- 		runtime/spell/fixdup \
  
  # generic language files, binary
  LANG_GEN_BIN = \
--- 684,690 ----
*** ../vim-7.2.166/src/Makefile	2009-04-29 18:44:45.000000000 +0200
--- src/Makefile	2009-05-06 00:23:15.000000000 +0200
***************
*** 551,557 ****
  # }}}
  
  # LINT - for running lint
! LINT_OPTIONS = -beprxzF
  
  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
  # Might not work with GUI or Perl.
--- 551,562 ----
  # }}}
  
  # LINT - for running lint
! #  For standard lint
! #LINT = lint
! #LINT_OPTIONS = -beprxzF
! #  For splint  (see cleanlint.vim for filtering the output)
! LINT = splint
! LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
  
  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
  # Might not work with GUI or Perl.
***************
*** 1259,1274 ****
  #     This is for cproto 3 patchlevel 8 or below
  #     __inline, __attribute__ and __extension__ are not recognized by cproto
  #     G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h.
! NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \
! 	  -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
! 	  -D__extension__= -D__restrict="" \
! 	  -D__gnuc_va_list=char -D__builtin_va_list=char
  
  #
! #     This is for cproto 3 patchlevel 9 or above (currently 4.6)
  #     __inline and __attribute__ are now recognized by cproto
  #     -D"foo()=" is not supported by all compilers so do not use it
! # NO_ATTR=
  #
  #     maybe the "/usr/bin/cc -E" has to be adjusted for some systems
  # This is for cproto 3.5 patchlevel 3:
--- 1264,1279 ----
  #     This is for cproto 3 patchlevel 8 or below
  #     __inline, __attribute__ and __extension__ are not recognized by cproto
  #     G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h.
! #NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \
! #	  -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
! #	  -D__extension__= -D__restrict="" \
! #	  -D__gnuc_va_list=char -D__builtin_va_list=char
  
  #
! #     This is for cproto 3 patchlevel 9 or above (currently 4.6, 4.7g)
  #     __inline and __attribute__ are now recognized by cproto
  #     -D"foo()=" is not supported by all compilers so do not use it
! NO_ATTR=
  #
  #     maybe the "/usr/bin/cc -E" has to be adjusted for some systems
  # This is for cproto 3.5 patchlevel 3:
***************
*** 1432,1437 ****
--- 1437,1443 ----
  	$(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(NETBEANS_SRC)
  #LINT_SRC = $(SRC)
  #LINT_SRC = $(ALL_SRC)
+ #LINT_SRC = $(BASIC_SRC)
  
  OBJ = \
  	objects/buffer.o \
***************
*** 2272,2283 ****
  
  # Run lint.  Clean up the *.ln files that are sometimes left behind.
  lint:
! 	lint $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)
  	-rm -f *.ln
  
  # Check dosinst.c with lint.
  lintinstall:
! 	lint $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c
  	-rm -f dosinst.ln
  
  ###########################################################################
--- 2279,2290 ----
  
  # Run lint.  Clean up the *.ln files that are sometimes left behind.
  lint:
! 	$(LINT) $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)
  	-rm -f *.ln
  
  # Check dosinst.c with lint.
  lintinstall:
! 	$(LINT) $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c
  	-rm -f dosinst.ln
  
  ###########################################################################
*** ../vim-7.2.166/src/buffer.c	2009-02-22 00:01:42.000000000 +0100
--- src/buffer.c	2009-05-13 12:25:29.000000000 +0200
***************
*** 44,49 ****
--- 44,50 ----
  #ifdef FEAT_TITLE
  static int	ti_change __ARGS((char_u *str, char_u **last));
  #endif
+ static int	append_arg_number __ARGS((win_T *wp, char_u *buf, int buflen, int add_file));
  static void	free_buffer __ARGS((buf_T *));
  static void	free_buffer_stuff __ARGS((buf_T *buf, int free_options));
  static void	clear_wininfo __ARGS((buf_T *buf));
***************
*** 1453,1465 ****
  
  #ifdef FEAT_KEYMAP
      if (curbuf->b_kmap_state & KEYMAP_INIT)
! 	keymap_init();
  #endif
  #ifdef FEAT_SPELL
      /* May need to set the spell language.  Can only do this after the buffer
       * has been properly setup. */
      if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! 	did_set_spelllang(curbuf);
  #endif
  
      redraw_later(NOT_VALID);
--- 1454,1466 ----
  
  #ifdef FEAT_KEYMAP
      if (curbuf->b_kmap_state & KEYMAP_INIT)
! 	(void)keymap_init();
  #endif
  #ifdef FEAT_SPELL
      /* May need to set the spell language.  Can only do this after the buffer
       * has been properly setup. */
      if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! 	(void)did_set_spelllang(curbuf);
  #endif
  
      redraw_later(NOT_VALID);
***************
*** 2516,2522 ****
      buf_T	*buf;
  {
      wininfo_T	*wip;
!     static pos_T no_position = {1, 0};
  
      wip = find_wininfo(buf, FALSE);
      if (wip != NULL)
--- 2517,2523 ----
      buf_T	*buf;
  {
      wininfo_T	*wip;
!     static pos_T no_position = INIT_POS_T(1, 0, 0);
  
      wip = find_wininfo(buf, FALSE);
      if (wip != NULL)
***************
*** 2577,2584 ****
  	{
  	    IObuff[len++] = ' ';
  	} while (--i > 0 && len < IOSIZE - 18);
! 	vim_snprintf((char *)IObuff + len, IOSIZE - len, _("line %ld"),
! 		buf == curbuf ? curwin->w_cursor.lnum
  					       : (long)buflist_findlnum(buf));
  	msg_outtrans(IObuff);
  	out_flush();	    /* output one line at a time */
--- 2578,2585 ----
  	{
  	    IObuff[len++] = ' ';
  	} while (--i > 0 && len < IOSIZE - 18);
! 	vim_snprintf((char *)IObuff + len, (size_t)(IOSIZE - len),
! 		_("line %ld"), buf == curbuf ? curwin->w_cursor.lnum
  					       : (long)buflist_findlnum(buf));
  	msg_outtrans(IObuff);
  	out_flush();	    /* output one line at a time */
***************
*** 2967,2973 ****
  
      if (fullname > 1)	    /* 2 CTRL-G: include buffer number */
      {
! 	sprintf((char *)buffer, "buf %d: ", curbuf->b_fnum);
  	p = buffer + STRLEN(buffer);
      }
      else
--- 2968,2974 ----
  
      if (fullname > 1)	    /* 2 CTRL-G: include buffer number */
      {
! 	vim_snprintf((char *)buffer, IOSIZE, "buf %d: ", curbuf->b_fnum);
  	p = buffer + STRLEN(buffer);
      }
      else
***************
*** 3041,3051 ****
  		(long)curbuf->b_ml.ml_line_count,
  		n);
  	validate_virtcol();
! 	col_print(buffer + STRLEN(buffer),
  		   (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1);
      }
  
!     (void)append_arg_number(curwin, buffer, !shortmess(SHM_FILE), IOSIZE);
  
      if (dont_truncate)
      {
--- 3042,3053 ----
  		(long)curbuf->b_ml.ml_line_count,
  		n);
  	validate_virtcol();
! 	len = STRLEN(buffer);
! 	col_print(buffer + len, IOSIZE - len,
  		   (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1);
      }
  
!     (void)append_arg_number(curwin, buffer, IOSIZE, !shortmess(SHM_FILE));
  
      if (dont_truncate)
      {
***************
*** 3073,3087 ****
  }
  
      void
! col_print(buf, col, vcol)
      char_u  *buf;
      int	    col;
      int	    vcol;
  {
      if (col == vcol)
! 	sprintf((char *)buf, "%d", col);
      else
! 	sprintf((char *)buf, "%d-%d", col, vcol);
  }
  
  #if defined(FEAT_TITLE) || defined(PROTO)
--- 3075,3090 ----
  }
  
      void
! col_print(buf, buflen, col, vcol)
      char_u  *buf;
+     size_t  buflen;
      int	    col;
      int	    vcol;
  {
      if (col == vcol)
! 	vim_snprintf((char *)buf, buflen, "%d", col);
      else
! 	vim_snprintf((char *)buf, buflen, "%d-%d", col, vcol);
  }
  
  #if defined(FEAT_TITLE) || defined(PROTO)
***************
*** 3194,3211 ****
  		if (p == buf + off)
  		    /* must be a help buffer */
  		    vim_strncpy(buf + off, (char_u *)_("help"),
! 							    IOSIZE - off - 1);
  		else
  		    *p = NUL;
  
  		/* translate unprintable chars */
  		p = transstr(buf + off);
! 		vim_strncpy(buf + off, p, IOSIZE - off - 1);
  		vim_free(p);
  		STRCAT(buf, ")");
  	    }
  
! 	    append_arg_number(curwin, buf, FALSE, IOSIZE);
  
  #if defined(FEAT_CLIENTSERVER)
  	    if (serverName != NULL)
--- 3197,3214 ----
  		if (p == buf + off)
  		    /* must be a help buffer */
  		    vim_strncpy(buf + off, (char_u *)_("help"),
! 						  (size_t)(IOSIZE - off - 1));
  		else
  		    *p = NUL;
  
  		/* translate unprintable chars */
  		p = transstr(buf + off);
! 		vim_strncpy(buf + off, p, (size_t)(IOSIZE - off - 1));
  		vim_free(p);
  		STRCAT(buf, ")");
  	    }
  
! 	    append_arg_number(curwin, buf, IOSIZE, FALSE);
  
  #if defined(FEAT_CLIENTSERVER)
  	    if (serverName != NULL)
***************
*** 3520,3526 ****
  		    n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1;
  
  		*t = '<';
! 		mch_memmove(t + 1, t + n, p - (t + n));
  		p = p - n + 1;
  #ifdef FEAT_MBYTE
  		/* Fill up space left over by half a double-wide char. */
--- 3523,3529 ----
  		    n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1;
  
  		*t = '<';
! 		mch_memmove(t + 1, t + n, (size_t)(p - (t + n)));
  		p = p - n + 1;
  #ifdef FEAT_MBYTE
  		/* Fill up space left over by half a double-wide char. */
***************
*** 3550,3556 ****
  		else
  		{
  		    /* fill by inserting characters */
! 		    mch_memmove(t + n - l, t, p - t);
  		    l = n - l;
  		    if (p + l >= out + outlen)
  			l = (long)((out + outlen) - p - 1);
--- 3553,3559 ----
  		else
  		{
  		    /* fill by inserting characters */
! 		    mch_memmove(t + n - l, t, (size_t)(p - t));
  		    l = n - l;
  		    if (p + l >= out + outlen)
  			l = (long)((out + outlen) - p - 1);
***************
*** 3686,3692 ****
  	    p = t;
  
  #ifdef FEAT_EVAL
! 	    sprintf((char *)tmp, "%d", curbuf->b_fnum);
  	    set_internal_string_var((char_u *)"actual_curbuf", tmp);
  
  	    o_curbuf = curbuf;
--- 3689,3695 ----
  	    p = t;
  
  #ifdef FEAT_EVAL
! 	    vim_snprintf((char *)tmp, sizeof(tmp), "%d", curbuf->b_fnum);
  	    set_internal_string_var((char_u *)"actual_curbuf", tmp);
  
  	    o_curbuf = curbuf;
***************
*** 3753,3765 ****
  
  	case STL_ALTPERCENT:
  	    str = tmp;
! 	    get_rel_pos(wp, str);
  	    break;
  
  	case STL_ARGLISTSTAT:
  	    fillable = FALSE;
  	    tmp[0] = 0;
! 	    if (append_arg_number(wp, tmp, FALSE, (int)sizeof(tmp)))
  		str = tmp;
  	    break;
  
--- 3756,3768 ----
  
  	case STL_ALTPERCENT:
  	    str = tmp;
! 	    get_rel_pos(wp, str, TMPLEN);
  	    break;
  
  	case STL_ARGLISTSTAT:
  	    fillable = FALSE;
  	    tmp[0] = 0;
! 	    if (append_arg_number(wp, tmp, (int)sizeof(tmp), FALSE))
  		str = tmp;
  	    break;
  
***************
*** 3794,3800 ****
  	case STL_BYTEVAL_X:
  	    base = 'X';
  	case STL_BYTEVAL:
! 	    if (wp->w_cursor.col > STRLEN(linecont))
  		num = 0;
  	    else
  	    {
--- 3797,3803 ----
  	case STL_BYTEVAL_X:
  	    base = 'X';
  	case STL_BYTEVAL:
! 	    if (wp->w_cursor.col > (colnr_T)STRLEN(linecont))
  		num = 0;
  	    else
  	    {
***************
*** 3967,3973 ****
  	    if (zeropad)
  		*t++ = '0';
  	    *t++ = '*';
! 	    *t++ = nbase == 16 ? base : (nbase == 8 ? 'o' : 'd');
  	    *t = 0;
  
  	    for (n = num, l = 1; n >= nbase; n /= nbase)
--- 3970,3976 ----
  	    if (zeropad)
  		*t++ = '0';
  	    *t++ = '*';
! 	    *t++ = nbase == 16 ? base : (char_u)(nbase == 8 ? 'o' : 'd');
  	    *t = 0;
  
  	    for (n = num, l = 1; n >= nbase; n /= nbase)
***************
*** 4160,4172 ****
  #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \
  	    || defined(FEAT_GUI_TABLINE) || defined(PROTO)
  /*
!  * Get relative cursor position in window into "str[]", in the form 99%, using
!  * "Top", "Bot" or "All" when appropriate.
   */
      void
! get_rel_pos(wp, str)
      win_T	*wp;
!     char_u	*str;
  {
      long	above; /* number of lines above window */
      long	below; /* number of lines below window */
--- 4163,4176 ----
  #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \
  	    || defined(FEAT_GUI_TABLINE) || defined(PROTO)
  /*
!  * Get relative cursor position in window into "buf[buflen]", in the form 99%,
!  * using "Top", "Bot" or "All" when appropriate.
   */
      void
! get_rel_pos(wp, buf, buflen)
      win_T	*wp;
!     char_u	*buf;
!     int		buflen;
  {
      long	above; /* number of lines above window */
      long	below; /* number of lines below window */
***************
*** 4177,4210 ****
  #endif
      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
      if (below <= 0)
! 	STRCPY(str, above == 0 ? _("All") : _("Bot"));
      else if (above <= 0)
! 	STRCPY(str, _("Top"));
      else
! 	sprintf((char *)str, "%2d%%", above > 1000000L
  				    ? (int)(above / ((above + below) / 100L))
  				    : (int)(above * 100L / (above + below)));
  }
  #endif
  
  /*
!  * Append (file 2 of 8) to 'buf', if editing more than one file.
   * Return TRUE if it was appended.
   */
!     int
! append_arg_number(wp, buf, add_file, maxlen)
      win_T	*wp;
      char_u	*buf;
      int		add_file;	/* Add "file" before the arg number */
-     int		maxlen;		/* maximum nr of chars in buf or zero*/
  {
      char_u	*p;
  
      if (ARGCOUNT <= 1)		/* nothing to do */
  	return FALSE;
  
!     p = buf + STRLEN(buf);		/* go to the end of the buffer */
!     if (maxlen && p - buf + 35 >= maxlen) /* getting too long */
  	return FALSE;
      *p++ = ' ';
      *p++ = '(';
--- 4181,4215 ----
  #endif
      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
      if (below <= 0)
! 	vim_strncpy(buf, (char_u *)(above == 0 ? _("All") : _("Bot")),
! 							(size_t)(buflen - 1));
      else if (above <= 0)
! 	vim_strncpy(buf, (char_u *)_("Top"), (size_t)(buflen - 1));
      else
! 	vim_snprintf((char *)buf, (size_t)buflen, "%2d%%", above > 1000000L
  				    ? (int)(above / ((above + below) / 100L))
  				    : (int)(above * 100L / (above + below)));
  }
  #endif
  
  /*
!  * Append (file 2 of 8) to "buf[buflen]", if editing more than one file.
   * Return TRUE if it was appended.
   */
!     static int
! append_arg_number(wp, buf, buflen, add_file)
      win_T	*wp;
      char_u	*buf;
+     int		buflen;
      int		add_file;	/* Add "file" before the arg number */
  {
      char_u	*p;
  
      if (ARGCOUNT <= 1)		/* nothing to do */
  	return FALSE;
  
!     p = buf + STRLEN(buf);	/* go to the end of the buffer */
!     if (p - buf + 35 >= buflen)	/* getting too long */
  	return FALSE;
      *p++ = ' ';
      *p++ = '(';
***************
*** 4213,4219 ****
  	STRCPY(p, "file ");
  	p += 5;
      }
!     sprintf((char *)p, wp->w_arg_idx_invalid ? "(%d) of %d)"
  				  : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);
      return TRUE;
  }
--- 4218,4225 ----
  	STRCPY(p, "file ");
  	p += 5;
      }
!     vim_snprintf((char *)p, (size_t)(buflen - (p - buf)),
! 		wp->w_arg_idx_invalid ? "(%d) of %d)"
  				  : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);
      return TRUE;
  }
***************
*** 4996,5002 ****
  	if (tab != NULL)
  	{
  	    *tab++ = '\0';
! 	    col = atoi((char *)tab);
  	    tab = vim_strrchr(xline, '\t');
  	    if (tab != NULL)
  	    {
--- 5002,5008 ----
  	if (tab != NULL)
  	{
  	    *tab++ = '\0';
! 	    col = (colnr_T)atoi((char *)tab);
  	    tab = vim_strrchr(xline, '\t');
  	    if (tab != NULL)
  	    {
***************
*** 5034,5039 ****
--- 5040,5046 ----
  #endif
      char_u	*line;
      int		max_buffers;
+     size_t	len;
  
      if (find_viminfo_parameter('%') == NULL)
  	return;
***************
*** 5042,5048 ****
      max_buffers = get_viminfo_parameter('%');
  
      /* Allocate room for the file name, lnum and col. */
!     line = alloc(MAXPATHL + 40);
      if (line == NULL)
  	return;
  
--- 5049,5056 ----
      max_buffers = get_viminfo_parameter('%');
  
      /* Allocate room for the file name, lnum and col. */
! #define LINE_BUF_LEN (MAXPATHL + 40)
!     line = alloc(LINE_BUF_LEN);
      if (line == NULL)
  	return;
  
***************
*** 5068,5074 ****
  	    break;
  	putc('%', fp);
  	home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);
! 	sprintf((char *)line + STRLEN(line), "\t%ld\t%d",
  			(long)buf->b_last_cursor.lnum,
  			buf->b_last_cursor.col);
  	viminfo_writestring(fp, line);
--- 5076,5083 ----
  	    break;
  	putc('%', fp);
  	home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);
! 	len = STRLEN(line);
! 	vim_snprintf((char *)line + len, len - LINE_BUF_LEN, "\t%ld\t%d",
  			(long)buf->b_last_cursor.lnum,
  			buf->b_last_cursor.col);
  	viminfo_writestring(fp, line);
***************
*** 5226,5232 ****
      return;
  }
  
!     int
  buf_change_sign_type(buf, markId, typenr)
      buf_T	*buf;		/* buffer to store sign in */
      int		markId;		/* sign ID */
--- 5235,5241 ----
      return;
  }
  
!     linenr_T
  buf_change_sign_type(buf, markId, typenr)
      buf_T	*buf;		/* buffer to store sign in */
      int		markId;		/* sign ID */
***************
*** 5243,5252 ****
  	}
      }
  
!     return 0;
  }
  
!     int_u
  buf_getsigntype(buf, lnum, type)
      buf_T	*buf;
      linenr_T	lnum;
--- 5252,5261 ----
  	}
      }
  
!     return (linenr_T)0;
  }
  
!     int
  buf_getsigntype(buf, lnum, type)
      buf_T	*buf;
      linenr_T	lnum;
*** ../vim-7.2.166/src/charset.c	2008-07-24 21:30:44.000000000 +0200
--- src/charset.c	2009-05-05 18:17:11.000000000 +0200
***************
*** 17,23 ****
  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
  #endif
  
! static int nr2hex __ARGS((int c));
  
  static int    chartab_initialized = FALSE;
  
--- 17,23 ----
  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
  #endif
  
! static unsigned nr2hex __ARGS((unsigned c));
  
  static int    chartab_initialized = FALSE;
  
***************
*** 664,670 ****
      }
  #endif
      buf[++i] = nr2hex((unsigned)c >> 4);
!     buf[++i] = nr2hex(c);
      buf[++i] = '>';
      buf[++i] = NUL;
  }
--- 664,670 ----
      }
  #endif
      buf[++i] = nr2hex((unsigned)c >> 4);
!     buf[++i] = nr2hex((unsigned)c);
      buf[++i] = '>';
      buf[++i] = NUL;
  }
***************
*** 674,682 ****
   * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or
   * function key 1.
   */
!     static int
  nr2hex(c)
!     int		c;
  {
      if ((c & 0xf) <= 9)
  	return (c & 0xf) + '0';
--- 674,682 ----
   * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or
   * function key 1.
   */
!     static unsigned
  nr2hex(c)
!     unsigned	c;
  {
      if ((c & 0xf) <= 9)
  	return (c & 0xf) + '0';
***************
*** 884,890 ****
      if (c >= 0x100)
      {
  	if (enc_dbcs != 0)
! 	    return dbcs_class((unsigned)c >> 8, c & 0xff) >= 2;
  	if (enc_utf8)
  	    return utf_class(c) >= 2;
      }
--- 884,890 ----
      if (c >= 0x100)
      {
  	if (enc_dbcs != 0)
! 	    return dbcs_class((unsigned)c >> 8, (unsigned)(c & 0xff)) >= 2;
  	if (enc_utf8)
  	    return utf_class(c) >= 2;
      }
***************
*** 1090,1096 ****
  	 */
  	numberextra = win_col_off(wp);
  	col2 = col;
! 	colmax = W_WIDTH(wp) - numberextra;
  	if (col >= colmax)
  	{
  	    n = colmax + win_col_off2(wp);
--- 1090,1096 ----
  	 */
  	numberextra = win_col_off(wp);
  	col2 = col;
! 	colmax = (colnr_T)(W_WIDTH(wp) - numberextra);
  	if (col >= colmax)
  	{
  	    n = colmax + win_col_off2(wp);
***************
*** 1201,1217 ****
      win_T	*wp;
      colnr_T	vcol;
  {
!     colnr_T	width1;		/* width of first line (after line number) */
!     colnr_T	width2;		/* width of further lines */
  
  #ifdef FEAT_VERTSPLIT
      if (wp->w_width == 0)	/* there is no border */
  	return FALSE;
  #endif
      width1 = W_WIDTH(wp) - win_col_off(wp);
!     if (vcol < width1 - 1)
  	return FALSE;
!     if (vcol == width1 - 1)
  	return TRUE;
      width2 = width1 + win_col_off2(wp);
      return ((vcol - width1) % width2 == width2 - 1);
--- 1201,1217 ----
      win_T	*wp;
      colnr_T	vcol;
  {
!     int		width1;		/* width of first line (after line number) */
!     int		width2;		/* width of further lines */
  
  #ifdef FEAT_VERTSPLIT
      if (wp->w_width == 0)	/* there is no border */
  	return FALSE;
  #endif
      width1 = W_WIDTH(wp) - win_col_off(wp);
!     if ((int)vcol < width1 - 1)
  	return FALSE;
!     if ((int)vcol == width1 - 1)
  	return TRUE;
      width2 = width1 + win_col_off2(wp);
      return ((vcol - width1) % width2 == width2 - 1);
***************
*** 1396,1408 ****
  # ifdef FEAT_MBYTE
  	/* Cannot put the cursor on part of a wide character. */
  	ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
! 	if (pos->col < STRLEN(ptr))
  	{
  	    int c = (*mb_ptr2char)(ptr + pos->col);
  
  	    if (c != TAB && vim_isprintc(c))
  	    {
! 		endadd = char2cells(c) - 1;
  		if (coladd > endadd)	/* past end of line */
  		    endadd = 0;
  		else
--- 1396,1408 ----
  # ifdef FEAT_MBYTE
  	/* Cannot put the cursor on part of a wide character. */
  	ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
! 	if (pos->col < (colnr_T)STRLEN(ptr))
  	{
  	    int c = (*mb_ptr2char)(ptr + pos->col);
  
  	    if (c != TAB && vim_isprintc(c))
  	    {
! 		endadd = (colnr_T)(char2cells(c) - 1);
  		if (coladd > endadd)	/* past end of line */
  		    endadd = 0;
  		else
*** ../vim-7.2.166/src/cleanlint.vim	2009-05-13 12:08:12.000000000 +0200
--- src/cleanlint.vim	2009-05-05 21:34:01.000000000 +0200
***************
*** 0 ****
--- 1,27 ----
+ " Vim tool: Filter output of splint
+ "
+ " Maintainer:	Bram Moolenaar <Bram at vim.org>
+ " Last Change:	2009 May 05
+ 
+ " Usage: redirect output of "make lint" to a file, edit that file with Vim and
+ " :call CleanLint()
+ " This deletes irrelevant messages.  What remains might be valid warnings.
+ 
+ fun! CleanLint()
+   g/^  Types are incompatible/lockmarks d
+   g/Assignment of dev_t to __dev_t:/lockmarks d
+   g/Assignment of __dev_t to dev_t:/lockmarks d
+   g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
+   g/Operands of == have incompatible types (unsigned int, int): /lockmarks d
+   g/Assignment of char to char_u: /lockmarks d
+   g/Assignment of unsigned int to int: /lockmarks d
+   g/Assignment of colnr_T to int: /lockmarks d
+   g/Assignment of int to char_u: /lockmarks d
+   g/Function .* expects arg . to be wint_t gets int: /lockmarks d
+   g/^digraph.c.*digraphdefault.*is type char, expects char_u:/lockmarks d
+   g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
+   g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
+   g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
+   g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
+   g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
+ endfun
*** ../vim-7.2.166/src/digraph.c	2008-06-25 00:26:41.000000000 +0200
--- src/digraph.c	2009-05-05 20:32:43.000000000 +0200
***************
*** 32,38 ****
  static void printdigraph __ARGS((digr_T *));
  
  /* digraphs added by the user */
! static garray_T	user_digraphs = {0, 0, sizeof(digr_T), 10, NULL};
  
  /*
   * Note: Characters marked with XX are not included literally, because some
--- 32,38 ----
  static void printdigraph __ARGS((digr_T *));
  
  /* digraphs added by the user */
! static garray_T	user_digraphs = {0, 0, (int)sizeof(digr_T), 10, NULL};
  
  /*
   * Note: Characters marked with XX are not included literally, because some
***************
*** 2371,2380 ****
  	}
  	else
  #endif
! 	    *p++ = dp->result;
  	if (char2cells(dp->result) == 1)
  	    *p++ = ' ';
! 	sprintf((char *)p, " %3d", dp->result);
  	msg_outtrans(buf);
      }
  }
--- 2371,2380 ----
  	}
  	else
  #endif
! 	    *p++ = (char_u)dp->result;
  	if (char2cells(dp->result) == 1)
  	    *p++ = ' ';
! 	vim_snprintf((char *)p, sizeof(buf) - (p - buf), " %3d", dp->result);
  	msg_outtrans(buf);
      }
  }
***************
*** 2395,2401 ****
  static void keymap_unload __ARGS((void));
  
  /*
!  * Set up key mapping tables for the 'keymap' option
   */
      char_u *
  keymap_init()
--- 2395,2404 ----
  static void keymap_unload __ARGS((void));
  
  /*
!  * Set up key mapping tables for the 'keymap' option.
!  * Returns NULL if OK, an error message for failure.  This only needs to be
!  * used when setting the option, not later when the value has already been
!  * checked.
   */
      char_u *
  keymap_init()
***************
*** 2412,2436 ****
      else
      {
  	char_u	*buf;
  
  	/* Source the keymap file.  It will contain a ":loadkeymap" command
  	 * which will call ex_loadkeymap() below. */
! 	buf = alloc((unsigned)(STRLEN(curbuf->b_p_keymap)
  # ifdef FEAT_MBYTE
! 						       + STRLEN(p_enc)
  # endif
! 						       + 14));
  	if (buf == NULL)
  	    return e_outofmem;
  
  # ifdef FEAT_MBYTE
  	/* try finding "keymap/'keymap'_'encoding'.vim"  in 'runtimepath' */
! 	sprintf((char *)buf, "keymap/%s_%s.vim", curbuf->b_p_keymap, p_enc);
  	if (source_runtime(buf, FALSE) == FAIL)
  # endif
  	{
  	    /* try finding "keymap/'keymap'.vim" in 'runtimepath'  */
! 	    sprintf((char *)buf, "keymap/%s.vim", curbuf->b_p_keymap);
  	    if (source_runtime(buf, FALSE) == FAIL)
  	    {
  		vim_free(buf);
--- 2415,2443 ----
      else
      {
  	char_u	*buf;
+ 	size_t  buflen;
  
  	/* Source the keymap file.  It will contain a ":loadkeymap" command
  	 * which will call ex_loadkeymap() below. */
! 	buflen = STRLEN(curbuf->b_p_keymap)
  # ifdef FEAT_MBYTE
! 					   + STRLEN(p_enc)
  # endif
! 						       + 14;
! 	buf = alloc((unsigned)buflen);
  	if (buf == NULL)
  	    return e_outofmem;
  
  # ifdef FEAT_MBYTE
  	/* try finding "keymap/'keymap'_'encoding'.vim"  in 'runtimepath' */
! 	vim_snprintf((char *)buf, buflen, "keymap/%s_%s.vim",
! 						   curbuf->b_p_keymap, p_enc);
  	if (source_runtime(buf, FALSE) == FAIL)
  # endif
  	{
  	    /* try finding "keymap/'keymap'.vim" in 'runtimepath'  */
! 	    vim_snprintf((char *)buf, buflen, "keymap/%s.vim",
! 							  curbuf->b_p_keymap);
  	    if (source_runtime(buf, FALSE) == FAIL)
  	    {
  		vim_free(buf);
*** ../vim-7.2.166/src/edit.c	2009-02-21 20:27:00.000000000 +0100
--- src/edit.c	2009-05-05 21:14:50.000000000 +0200
***************
*** 57,63 ****
      N_(" Keyword Local completion (^N^P)"),
  };
  
! static char_u e_hitend[] = N_("Hit end of paragraph");
  
  /*
   * Structure used to store one match for insert completion.
--- 57,63 ----
      N_(" Keyword Local completion (^N^P)"),
  };
  
! static char e_hitend[] = N_("Hit end of paragraph");
  
  /*
   * Structure used to store one match for insert completion.
***************
*** 69,75 ****
--- 69,79 ----
      compl_T	*cp_prev;
      char_u	*cp_str;	/* matched text */
      char	cp_icase;	/* TRUE or FALSE: ignore case */
+ #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
+     char_u	**cp_text;	/* text for the menu */
+ #else
      char_u	*(cp_text[CPT_COUNT]);	/* text for the menu */
+ #endif
      char_u	*cp_fname;	/* file containing the match, allocated when
  				 * cp_flags has FREE_FNAME */
      int		cp_flags;	/* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
***************
*** 306,312 ****
      int		c = 0;
      char_u	*ptr;
      int		lastc;
!     colnr_T	mincol;
      static linenr_T o_lnum = 0;
      int		i;
      int		did_backspace = TRUE;	    /* previous char was backspace */
--- 310,316 ----
      int		c = 0;
      char_u	*ptr;
      int		lastc;
!     int		mincol;
      static linenr_T o_lnum = 0;
      int		i;
      int		did_backspace = TRUE;	    /* previous char was backspace */
***************
*** 387,393 ****
  	if (startln)
  	    Insstart.col = 0;
      }
!     Insstart_textlen = linetabsize(ml_get_curline());
      Insstart_blank_vcol = MAXCOL;
      if (!did_ai)
  	ai_col = 0;
--- 391,397 ----
  	if (startln)
  	    Insstart.col = 0;
      }
!     Insstart_textlen = (colnr_T)linetabsize(ml_get_curline());
      Insstart_blank_vcol = MAXCOL;
      if (!did_ai)
  	ai_col = 0;
***************
*** 653,659 ****
  	    mincol = curwin->w_wcol;
  	    validate_cursor_col();
  
! 	    if ((int)curwin->w_wcol < (int)mincol - curbuf->b_p_ts
  		    && curwin->w_wrow == W_WINROW(curwin)
  						 + curwin->w_height - 1 - p_so
  		    && (curwin->w_cursor.lnum != curwin->w_topline
--- 657,663 ----
  	    mincol = curwin->w_wcol;
  	    validate_cursor_col();
  
! 	    if ((int)curwin->w_wcol < mincol - curbuf->b_p_ts
  		    && curwin->w_wrow == W_WINROW(curwin)
  						 + curwin->w_height - 1 - p_so
  		    && (curwin->w_cursor.lnum != curwin->w_topline
***************
*** 1773,1779 ****
  	 * Compute the screen column where the cursor should be.
  	 */
  	vcol = get_indent() - vcol;
! 	curwin->w_virtcol = (vcol < 0) ? 0 : vcol;
  
  	/*
  	 * Advance the cursor until we reach the right screen column.
--- 1777,1783 ----
  	 * Compute the screen column where the cursor should be.
  	 */
  	vcol = get_indent() - vcol;
! 	curwin->w_virtcol = (colnr_T)((vcol < 0) ? 0 : vcol);
  
  	/*
  	 * Advance the cursor until we reach the right screen column.
***************
*** 1800,1808 ****
  	 */
  	if (vcol != (int)curwin->w_virtcol)
  	{
! 	    curwin->w_cursor.col = new_cursor_col;
  	    i = (int)curwin->w_virtcol - vcol;
! 	    ptr = alloc(i + 1);
  	    if (ptr != NULL)
  	    {
  		new_cursor_col += i;
--- 1804,1812 ----
  	 */
  	if (vcol != (int)curwin->w_virtcol)
  	{
! 	    curwin->w_cursor.col = (colnr_T)new_cursor_col;
  	    i = (int)curwin->w_virtcol - vcol;
! 	    ptr = alloc((unsigned)(i + 1));
  	    if (ptr != NULL)
  	    {
  		new_cursor_col += i;
***************
*** 1826,1832 ****
      if (new_cursor_col <= 0)
  	curwin->w_cursor.col = 0;
      else
! 	curwin->w_cursor.col = new_cursor_col;
      curwin->w_set_curswant = TRUE;
      changed_cline_bef_curs();
  
--- 1830,1836 ----
      if (new_cursor_col <= 0)
  	curwin->w_cursor.col = 0;
      else
! 	curwin->w_cursor.col = (colnr_T)new_cursor_col;
      curwin->w_set_curswant = TRUE;
      changed_cline_bef_curs();
  
***************
*** 1966,1972 ****
  #ifdef FEAT_MBYTE
      if (enc_utf8 && limit_col >= 0)
      {
! 	int ecol = curwin->w_cursor.col + 1;
  
  	/* Make sure the cursor is at the start of a character, but
  	 * skip forward again when going too far back because of a
--- 1970,1976 ----
  #ifdef FEAT_MBYTE
      if (enc_utf8 && limit_col >= 0)
      {
! 	colnr_T ecol = curwin->w_cursor.col + 1;
  
  	/* Make sure the cursor is at the start of a character, but
  	 * skip forward again when going too far back because of a
***************
*** 1982,1988 ****
  	}
  	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
  	    return FALSE;
! 	del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE);
      }
      else
  #endif
--- 1986,1992 ----
  	}
  	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
  	    return FALSE;
! 	del_bytes((long)((int)ecol - curwin->w_cursor.col), FALSE, TRUE);
      }
      else
  #endif
***************
*** 2201,2207 ****
  	    actual_compl_length = compl_length;
  
  	/* Allocate wide character array for the completion and fill it. */
! 	wca = (int *)alloc(actual_len * sizeof(int));
  	if (wca != NULL)
  	{
  	    p = str;
--- 2205,2211 ----
  	    actual_compl_length = compl_length;
  
  	/* Allocate wide character array for the completion and fill it. */
! 	wca = (int *)alloc((unsigned)(actual_len * sizeof(int)));
  	if (wca != NULL)
  	{
  	    p = str;
***************
*** 2580,2586 ****
   */
      void
  set_completion(startcol, list)
!     int	    startcol;
      list_T  *list;
  {
      /* If already doing completions stop it. */
--- 2584,2590 ----
   */
      void
  set_completion(startcol, list)
!     colnr_T startcol;
      list_T  *list;
  {
      /* If already doing completions stop it. */
***************
*** 2591,2600 ****
      if (stop_arrow() == FAIL)
  	return;
  
!     if (startcol > (int)curwin->w_cursor.col)
  	startcol = curwin->w_cursor.col;
      compl_col = startcol;
!     compl_length = curwin->w_cursor.col - startcol;
      /* compl_pattern doesn't need to be set */
      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
--- 2595,2604 ----
      if (stop_arrow() == FAIL)
  	return;
  
!     if (startcol > curwin->w_cursor.col)
  	startcol = curwin->w_cursor.col;
      compl_col = startcol;
!     compl_length = (int)curwin->w_cursor.col - (int)startcol;
      /* compl_pattern doesn't need to be set */
      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
***************
*** 2860,2866 ****
      regmatch_T	regmatch;
      char_u	**files;
      int		count;
-     int		i;
      int		save_p_scs;
      int		dir = compl_direction;
  
--- 2864,2869 ----
***************
*** 2892,2908 ****
      if (ctrl_x_mode == CTRL_X_WHOLE_LINE)
      {
  	char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
  
  	if (pat_esc == NULL)
  	    goto theend;
! 	i = (int)STRLEN(pat_esc) + 10;
! 	ptr = alloc(i);
  	if (ptr == NULL)
  	{
  	    vim_free(pat_esc);
  	    goto theend;
  	}
! 	vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc);
  	regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
  	vim_free(pat_esc);
  	vim_free(ptr);
--- 2895,2912 ----
      if (ctrl_x_mode == CTRL_X_WHOLE_LINE)
      {
  	char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
+ 	size_t len;
  
  	if (pat_esc == NULL)
  	    goto theend;
! 	len = STRLEN(pat_esc) + 10;
! 	ptr = alloc((unsigned)len);
  	if (ptr == NULL)
  	{
  	    vim_free(pat_esc);
  	    goto theend;
  	}
! 	vim_snprintf((char *)ptr, len, "^\\s*\\zs\\V%s", pat_esc);
  	regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
  	vim_free(pat_esc);
  	vim_free(ptr);
***************
*** 2993,2999 ****
  	{
  	    vim_snprintf((char *)IObuff, IOSIZE,
  			      _("Scanning dictionary: %s"), (char *)files[i]);
! 	    msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  	}
  
  	if (fp != NULL)
--- 2997,3003 ----
  	{
  	    vim_snprintf((char *)IObuff, IOSIZE,
  			      _("Scanning dictionary: %s"), (char *)files[i]);
! 	    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  	}
  
  	if (fp != NULL)
***************
*** 3311,3317 ****
      static int
  ins_compl_len()
  {
!     int off = curwin->w_cursor.col - compl_col;
  
      if (off < 0)
  	return 0;
--- 3315,3321 ----
      static int
  ins_compl_len()
  {
!     int off = (int)curwin->w_cursor.col - (int)compl_col;
  
      if (off < 0)
  	return 0;
***************
*** 3347,3353 ****
  
      vim_free(compl_leader);
      compl_leader = vim_strnsave(ml_get_curline() + compl_col,
! 					    curwin->w_cursor.col - compl_col);
      if (compl_leader != NULL)
  	ins_compl_new_leader();
  }
--- 3351,3357 ----
  
      vim_free(compl_leader);
      compl_leader = vim_strnsave(ml_get_curline() + compl_col,
! 				     (int)(curwin->w_cursor.col - compl_col));
      if (compl_leader != NULL)
  	ins_compl_new_leader();
  }
***************
*** 3395,3401 ****
  ins_compl_addfrommatch()
  {
      char_u	*p;
!     int		len = curwin->w_cursor.col - compl_col;
      int		c;
      compl_T	*cp;
  
--- 3399,3405 ----
  ins_compl_addfrommatch()
  {
      char_u	*p;
!     int		len = (int)curwin->w_cursor.col - (int)compl_col;
      int		c;
      compl_T	*cp;
  
***************
*** 3961,3967 ****
  			    : ins_buf->b_sfname == NULL
  				? (char *)ins_buf->b_fname
  				: (char *)ins_buf->b_sfname);
! 		msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  	    }
  	    else if (*e_cpt == NUL)
  		break;
--- 3965,3971 ----
  			    : ins_buf->b_sfname == NULL
  				? (char *)ins_buf->b_fname
  				: (char *)ins_buf->b_sfname);
! 		(void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  	    }
  	    else if (*e_cpt == NUL)
  		break;
***************
*** 3991,3997 ****
  		{
  		    type = CTRL_X_TAGS;
  		    sprintf((char*)IObuff, _("Scanning tags."));
! 		    msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  		}
  		else
  		    type = -1;
--- 3995,4001 ----
  		{
  		    type = CTRL_X_TAGS;
  		    sprintf((char*)IObuff, _("Scanning tags."));
! 		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  		}
  		else
  		    type = -1;
***************
*** 6320,6326 ****
  	    ins_need_undo = FALSE;
  	}
  	Insstart = curwin->w_cursor;	/* new insertion starts here */
! 	Insstart_textlen = linetabsize(ml_get_curline());
  	ai_col = 0;
  #ifdef FEAT_VREPLACE
  	if (State & VREPLACE_FLAG)
--- 6324,6330 ----
  	    ins_need_undo = FALSE;
  	}
  	Insstart = curwin->w_cursor;	/* new insertion starts here */
! 	Insstart_textlen = (colnr_T)linetabsize(ml_get_curline());
  	ai_col = 0;
  #ifdef FEAT_VREPLACE
  	if (State & VREPLACE_FLAG)
*** ../vim-7.2.166/src/ex_cmds.c	2009-04-29 18:44:38.000000000 +0200
--- src/ex_cmds.c	2009-05-05 17:55:40.000000000 +0200
***************
*** 1789,1795 ****
  	 * overwrite a user's viminfo file after a "su root", with a
  	 * viminfo file that the user can't read.
  	 */
! 	st_old.st_dev = 0;
  	st_old.st_ino = 0;
  	st_old.st_mode = 0600;
  	if (mch_stat((char *)fname, &st_old) == 0
--- 1789,1795 ----
  	 * overwrite a user's viminfo file after a "su root", with a
  	 * viminfo file that the user can't read.
  	 */
! 	st_old.st_dev = (dev_t)0;
  	st_old.st_ino = 0;
  	st_old.st_mode = 0600;
  	if (mch_stat((char *)fname, &st_old) == 0
***************
*** 3715,3721 ****
      /* If the window options were changed may need to set the spell language.
       * Can only do this after the buffer has been properly setup. */
      if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! 	did_set_spelllang(curbuf);
  #endif
  
      if (command == NULL)
--- 3715,3721 ----
      /* If the window options were changed may need to set the spell language.
       * Can only do this after the buffer has been properly setup. */
      if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! 	(void)did_set_spelllang(curbuf);
  #endif
  
      if (command == NULL)
***************
*** 3788,3794 ****
  
  #ifdef FEAT_KEYMAP
      if (curbuf->b_kmap_state & KEYMAP_INIT)
! 	keymap_init();
  #endif
  
      --RedrawingDisabled;
--- 3788,3794 ----
  
  #ifdef FEAT_KEYMAP
      if (curbuf->b_kmap_state & KEYMAP_INIT)
! 	(void)keymap_init();
  #endif
  
      --RedrawingDisabled;
*** ../vim-7.2.166/src/globals.h	2009-03-05 03:13:51.000000000 +0100
--- src/globals.h	2009-05-09 21:14:49.000000000 +0200
***************
*** 524,530 ****
  EXTERN win_T	*prevwin INIT(= NULL);	/* previous window */
  # define W_NEXT(wp) ((wp)->w_next)
  # define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next)
! #define FOR_ALL_TAB_WINDOWS(tp, wp) \
      for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
  	for ((wp) = ((tp) == curtab) \
  		? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
--- 524,530 ----
  EXTERN win_T	*prevwin INIT(= NULL);	/* previous window */
  # define W_NEXT(wp) ((wp)->w_next)
  # define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next)
! # define FOR_ALL_TAB_WINDOWS(tp, wp) \
      for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
  	for ((wp) = ((tp) == curtab) \
  		? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
***************
*** 718,724 ****
  
  EXTERN pos_T	saved_cursor		/* w_cursor before formatting text. */
  # ifdef DO_INIT
! 	= INIT_POS_T
  # endif
  	;
  
--- 718,724 ----
  
  EXTERN pos_T	saved_cursor		/* w_cursor before formatting text. */
  # ifdef DO_INIT
! 	= INIT_POS_T(0, 0, 0)
  # endif
  	;
  
***************
*** 1039,1045 ****
  EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
  EXTERN pos_T	last_cursormoved	    /* for CursorMoved event */
  # ifdef DO_INIT
! 			= INIT_POS_T
  # endif
  			;
  #endif
--- 1039,1045 ----
  EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
  EXTERN pos_T	last_cursormoved	    /* for CursorMoved event */
  # ifdef DO_INIT
! 			= INIT_POS_T(0, 0, 0)
  # endif
  			;
  #endif
*** ../vim-7.2.166/src/ops.c	2009-04-29 17:39:17.000000000 +0200
--- src/ops.c	2009-05-13 12:41:02.000000000 +0200
***************
*** 6400,6406 ****
  	    {
  		getvcols(curwin, &min_pos, &max_pos, &min_pos.col,
  								&max_pos.col);
! 		sprintf((char *)buf1, _("%ld Cols; "),
  			(long)(oparg.end_vcol - oparg.start_vcol + 1));
  	    }
  	    else
--- 6400,6406 ----
  	    {
  		getvcols(curwin, &min_pos, &max_pos, &min_pos.col,
  								&max_pos.col);
! 		vim_snprintf((char *)buf1, sizeof(buf1), _("%ld Cols; "),
  			(long)(oparg.end_vcol - oparg.start_vcol + 1));
  	    }
  	    else
***************
*** 6408,6420 ****
  
  	    if (char_count_cursor == byte_count_cursor
  						  && char_count == byte_count)
! 		sprintf((char *)IObuff, _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"),
  			buf1, line_count_selected,
  			(long)curbuf->b_ml.ml_line_count,
  			word_count_cursor, word_count,
  			byte_count_cursor, byte_count);
  	    else
! 		sprintf((char *)IObuff, _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"),
  			buf1, line_count_selected,
  			(long)curbuf->b_ml.ml_line_count,
  			word_count_cursor, word_count,
--- 6408,6422 ----
  
  	    if (char_count_cursor == byte_count_cursor
  						  && char_count == byte_count)
! 		vim_snprintf((char *)IObuff, IOSIZE,
! 			_("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"),
  			buf1, line_count_selected,
  			(long)curbuf->b_ml.ml_line_count,
  			word_count_cursor, word_count,
  			byte_count_cursor, byte_count);
  	    else
! 		vim_snprintf((char *)IObuff, IOSIZE,
! 			_("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"),
  			buf1, line_count_selected,
  			(long)curbuf->b_ml.ml_line_count,
  			word_count_cursor, word_count,
***************
*** 6426,6445 ****
  	{
  	    p = ml_get_curline();
  	    validate_virtcol();
! 	    col_print(buf1, (int)curwin->w_cursor.col + 1,
  		    (int)curwin->w_virtcol + 1);
! 	    col_print(buf2, (int)STRLEN(p), linetabsize(p));
  
  	    if (char_count_cursor == byte_count_cursor
  		    && char_count == byte_count)
! 		sprintf((char *)IObuff, _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"),
  		    (char *)buf1, (char *)buf2,
  		    (long)curwin->w_cursor.lnum,
  		    (long)curbuf->b_ml.ml_line_count,
  		    word_count_cursor, word_count,
  		    byte_count_cursor, byte_count);
  	    else
! 		sprintf((char *)IObuff, _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"),
  		    (char *)buf1, (char *)buf2,
  		    (long)curwin->w_cursor.lnum,
  		    (long)curbuf->b_ml.ml_line_count,
--- 6428,6449 ----
  	{
  	    p = ml_get_curline();
  	    validate_virtcol();
! 	    col_print(buf1, sizeof(buf1), (int)curwin->w_cursor.col + 1,
  		    (int)curwin->w_virtcol + 1);
! 	    col_print(buf2, sizeof(buf2), (int)STRLEN(p), linetabsize(p));
  
  	    if (char_count_cursor == byte_count_cursor
  		    && char_count == byte_count)
! 		vim_snprintf((char *)IObuff, IOSIZE,
! 		    _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"),
  		    (char *)buf1, (char *)buf2,
  		    (long)curwin->w_cursor.lnum,
  		    (long)curbuf->b_ml.ml_line_count,
  		    word_count_cursor, word_count,
  		    byte_count_cursor, byte_count);
  	    else
! 		vim_snprintf((char *)IObuff, IOSIZE,
! 		    _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"),
  		    (char *)buf1, (char *)buf2,
  		    (long)curwin->w_cursor.lnum,
  		    (long)curbuf->b_ml.ml_line_count,
*** ../vim-7.2.166/src/os_unix.c	2009-03-02 02:44:54.000000000 +0100
--- src/os_unix.c	2009-05-05 17:35:58.000000000 +0200
***************
*** 199,205 ****
  #endif
  
  #ifndef SIG_ERR
! # define SIG_ERR	((RETSIGTYPE (*)())-1)
  #endif
  
  /* volatile because it is used in signal handler sig_winch(). */
--- 199,207 ----
  #endif
  
  #ifndef SIG_ERR
! # ifndef S_SPLINT_S
! #  define SIG_ERR	((RETSIGTYPE (*)())-1)
! # endif
  #endif
  
  /* volatile because it is used in signal handler sig_winch(). */
***************
*** 441,447 ****
  
  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
  # ifdef HAVE_SYS_RESOURCE_H
! #  include <sys/resource.h>
  # endif
  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
--- 443,451 ----
  
  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
  # ifdef HAVE_SYS_RESOURCE_H
! #  ifndef S_SPLINT_S  /* splint crashes on bits/resource.h */
! #   include <sys/resource.h>
! #  endif
  # endif
  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
*** ../vim-7.2.166/src/os_unix.h	2008-06-20 18:06:36.000000000 +0200
--- src/os_unix.h	2009-05-05 17:07:45.000000000 +0200
***************
*** 53,59 ****
  #endif
  
  #ifdef HAVE_UNISTD_H
! # include <unistd.h>
  #endif
  
  #ifdef HAVE_LIBC_H
--- 53,61 ----
  #endif
  
  #ifdef HAVE_UNISTD_H
! # ifndef S_SPLINT_S  /* splint crashes on bits/confname.h */
! #  include <unistd.h>
! # endif
  #endif
  
  #ifdef HAVE_LIBC_H
*** ../vim-7.2.166/src/proto/buffer.pro	2008-11-15 14:10:23.000000000 +0100
--- src/proto/buffer.pro	2009-05-13 12:23:41.000000000 +0200
***************
*** 37,49 ****
  int otherfile __ARGS((char_u *ffname));
  void buf_setino __ARGS((buf_T *buf));
  void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
! void col_print __ARGS((char_u *buf, int col, int vcol));
  void maketitle __ARGS((void));
  void resettitle __ARGS((void));
  void free_titles __ARGS((void));
  int build_stl_str_hl __ARGS((win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab));
! void get_rel_pos __ARGS((win_T *wp, char_u *str));
! int append_arg_number __ARGS((win_T *wp, char_u *buf, int add_file, int maxlen));
  char_u *fix_fname __ARGS((char_u *fname));
  void fname_expand __ARGS((buf_T *buf, char_u **ffname, char_u **sfname));
  char_u *alist_name __ARGS((aentry_T *aep));
--- 37,48 ----
  int otherfile __ARGS((char_u *ffname));
  void buf_setino __ARGS((buf_T *buf));
  void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
! void col_print __ARGS((char_u *buf, size_t buflen, int col, int vcol));
  void maketitle __ARGS((void));
  void resettitle __ARGS((void));
  void free_titles __ARGS((void));
  int build_stl_str_hl __ARGS((win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab));
! void get_rel_pos __ARGS((win_T *wp, char_u *buf, int buflen));
  char_u *fix_fname __ARGS((char_u *fname));
  void fname_expand __ARGS((buf_T *buf, char_u **ffname, char_u **sfname));
  char_u *alist_name __ARGS((aentry_T *aep));
***************
*** 54,61 ****
  void write_viminfo_bufferlist __ARGS((FILE *fp));
  char *buf_spname __ARGS((buf_T *buf));
  void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr));
! int buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr));
! int_u buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type));
  linenr_T buf_delsign __ARGS((buf_T *buf, int id));
  int buf_findsign __ARGS((buf_T *buf, int id));
  int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum));
--- 53,60 ----
  void write_viminfo_bufferlist __ARGS((FILE *fp));
  char *buf_spname __ARGS((buf_T *buf));
  void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr));
! linenr_T buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr));
! int buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type));
  linenr_T buf_delsign __ARGS((buf_T *buf, int id));
  int buf_findsign __ARGS((buf_T *buf, int id));
  int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum));
*** ../vim-7.2.166/src/proto/edit.pro	2008-01-16 20:03:13.000000000 +0100
--- src/proto/edit.pro	2009-05-05 20:51:56.000000000 +0200
***************
*** 8,14 ****
  void backspace_until_column __ARGS((int col));
  int vim_is_ctrl_x_key __ARGS((int c));
  int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
! void set_completion __ARGS((int startcol, list_T *list));
  void ins_compl_show_pum __ARGS((void));
  char_u *find_word_start __ARGS((char_u *ptr));
  char_u *find_word_end __ARGS((char_u *ptr));
--- 8,14 ----
  void backspace_until_column __ARGS((int col));
  int vim_is_ctrl_x_key __ARGS((int c));
  int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
! void set_completion __ARGS((colnr_T startcol, list_T *list));
  void ins_compl_show_pum __ARGS((void));
  char_u *find_word_start __ARGS((char_u *ptr));
  char_u *find_word_end __ARGS((char_u *ptr));
*** ../vim-7.2.166/src/screen.c	2009-03-18 19:07:09.000000000 +0100
--- src/screen.c	2009-05-05 17:42:45.000000000 +0200
***************
*** 9481,9493 ****
      win_T	*wp;
      int		always;
  {
!     char_u	buffer[70];
      int		row;
      int		fillchar;
      int		attr;
      int		empty_line = FALSE;
      colnr_T	virtcol;
      int		i;
      int		o;
  #ifdef FEAT_VERTSPLIT
      int		this_ru_col;
--- 9481,9495 ----
      win_T	*wp;
      int		always;
  {
! #define RULER_BUF_LEN 70
!     char_u	buffer[RULER_BUF_LEN];
      int		row;
      int		fillchar;
      int		attr;
      int		empty_line = FALSE;
      colnr_T	virtcol;
      int		i;
+     size_t	len;
      int		o;
  #ifdef FEAT_VERTSPLIT
      int		this_ru_col;
***************
*** 9602,9612 ****
  	 * Some sprintfs return the length, some return a pointer.
  	 * To avoid portability problems we use strlen() here.
  	 */
! 	sprintf((char *)buffer, "%ld,",
  		(wp->w_buffer->b_ml.ml_flags & ML_EMPTY)
  		    ? 0L
  		    : (long)(wp->w_cursor.lnum));
! 	col_print(buffer + STRLEN(buffer),
  			empty_line ? 0 : (int)wp->w_cursor.col + 1,
  			(int)virtcol + 1);
  
--- 9604,9615 ----
  	 * Some sprintfs return the length, some return a pointer.
  	 * To avoid portability problems we use strlen() here.
  	 */
! 	vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,",
  		(wp->w_buffer->b_ml.ml_flags & ML_EMPTY)
  		    ? 0L
  		    : (long)(wp->w_cursor.lnum));
! 	len = STRLEN(buffer);
! 	col_print(buffer + len, RULER_BUF_LEN - len,
  			empty_line ? 0 : (int)wp->w_cursor.col + 1,
  			(int)virtcol + 1);
  
***************
*** 9616,9622 ****
  	 * screen up on some terminals).
  	 */
  	i = (int)STRLEN(buffer);
! 	get_rel_pos(wp, buffer + i + 1);
  	o = i + vim_strsize(buffer + i + 1);
  #ifdef FEAT_WINDOWS
  	if (wp->w_status_height == 0)	/* can't use last char of screen */
--- 9619,9625 ----
  	 * screen up on some terminals).
  	 */
  	i = (int)STRLEN(buffer);
! 	get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1);
  	o = i + vim_strsize(buffer + i + 1);
  #ifdef FEAT_WINDOWS
  	if (wp->w_status_height == 0)	/* can't use last char of screen */
***************
*** 9643,9649 ****
  		    buffer[i++] = fillchar;
  		++o;
  	    }
! 	    get_rel_pos(wp, buffer + i);
  	}
  	/* Truncate at window boundary. */
  #ifdef FEAT_MBYTE
--- 9646,9652 ----
  		    buffer[i++] = fillchar;
  		++o;
  	    }
! 	    get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i);
  	}
  	/* Truncate at window boundary. */
  #ifdef FEAT_MBYTE
*** ../vim-7.2.166/src/structs.h	2008-11-15 16:05:30.000000000 +0100
--- src/structs.h	2009-05-05 18:20:36.000000000 +0200
***************
*** 33,41 ****
  } pos_T;
  
  #ifdef FEAT_VIRTUALEDIT
! # define INIT_POS_T {0, 0, 0}
  #else
! # define INIT_POS_T {0, 0}
  #endif
  
  /*
--- 33,41 ----
  } pos_T;
  
  #ifdef FEAT_VIRTUALEDIT
! # define INIT_POS_T(l, c, ca) {l, c, ca}
  #else
! # define INIT_POS_T(l, c, ca) {l, c}
  #endif
  
  /*
***************
*** 1166,1172 ****
      char_u	*b_fname;	/* current file name */
  
  #ifdef UNIX
!     int		b_dev;		/* device number (-1 if not set) */
      ino_t	b_ino;		/* inode number */
  #endif
  #ifdef FEAT_CW_EDITOR
--- 1166,1172 ----
      char_u	*b_fname;	/* current file name */
  
  #ifdef UNIX
!     dev_t	b_dev;		/* device number (-1 if not set) */
      ino_t	b_ino;		/* inode number */
  #endif
  #ifdef FEAT_CW_EDITOR
***************
*** 1645,1651 ****
--- 1645,1655 ----
  #endif
  #ifdef FEAT_DIFF
      diff_T	    *tp_first_diff;
+ # ifdef S_SPLINT_S  /* splint doesn't understand the array of pointers */
+     buf_T	    **tp_diffbuf;
+ # else
      buf_T	    *(tp_diffbuf[DB_COUNT]);
+ # endif
      int		    tp_diff_invalid;	/* list of diffs is outdated */
  #endif
      frame_T	    *tp_snapshot;    /* window layout snapshot */
*** ../vim-7.2.166/src/version.c	2009-04-29 18:44:38.000000000 +0200
--- src/version.c	2009-05-13 12:06:36.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     167,
  /**/

-- 
Snoring is prohibited unless all bedroom windows are closed and securely
locked.
		[real standing law in Massachusetts, 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    ///


--- NEW FILE 7.2.168 ---
To: vim-dev at vim.org
Subject: Patch 7.2.168
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.168
Problem:    When no ctags program can be found, "make tags" attempts to
	    execute the first C file.
Solution:   Default to "ctags" when no ctags program can be found.
Files:	    src/configure.in, src/auto/configure


*** ../vim-7.2.167/src/configure.in	2009-04-22 17:50:53.000000000 +0200
--- src/configure.in	2009-05-05 17:46:45.000000000 +0200
***************
*** 2968,2974 ****
  dnl Link with xpg4, it is said to make Korean locale working
  AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
  
! dnl Check how we can run ctags
  dnl --version for Exuberant ctags (preferred)
  dnl       Add --fields=+S to get function signatures for omni completion.
  dnl -t for typedefs (many ctags have this)
--- 2968,2974 ----
  dnl Link with xpg4, it is said to make Korean locale working
  AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
  
! dnl Check how we can run ctags.  Default to "ctags" when nothing works.
  dnl --version for Exuberant ctags (preferred)
  dnl       Add --fields=+S to get function signatures for omni completion.
  dnl -t for typedefs (many ctags have this)
***************
*** 2980,2985 ****
--- 2980,2986 ----
  if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
    TAGPRG="ctags -I INIT+ --fields=+S"
  else
+   TAGPRG="ctags"
    (eval etags	   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags"
    (eval etags -c   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags -c"
    (eval ctags	   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="ctags"
*** ../vim-7.2.167/src/auto/configure	2009-04-22 17:50:53.000000000 +0200
--- src/auto/configure	2009-05-13 14:38:10.000000000 +0200
***************
*** 15707,15712 ****
--- 15723,15729 ----
  if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
    TAGPRG="ctags -I INIT+ --fields=+S"
  else
+   TAGPRG="ctags"
    (eval etags	   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags"
    (eval etags -c   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c"
    (eval ctags	   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags"
*** ../vim-7.2.167/src/version.c	2009-05-13 12:46:36.000000000 +0200
--- src/version.c	2009-05-13 14:46:35.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     168,
  /**/

-- 
Zen Microsystems: we're the om in .commmmmmmmm

 /// 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    ///


--- NEW FILE 7.2.169 ---
To: vim-dev at vim.org
Subject: Patch 7.2.169
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.169
Problem:    Splint complains about a lot of things.
Solution:   Add type casts, #ifdefs and other changes to avoid warnings.
	    Change colnr_T from unsigned to int.  Avoids mistakes with
	    subtracting columns.
Files:	    src/cleanlint.vim, src/diff.c, src/edit.c, src/ex_cmds.c,
	    src/ex_cmds2.c, src/ex_docmd.c, src/proto/ex_cmds.pro,
	    src/proto/spell.pro, src/quickfix.c, src/spell.c, src/structs.h,
	    src/term.h, src/vim.h


*** ../vim-7.2.168/src/cleanlint.vim	2009-05-13 12:46:36.000000000 +0200
--- src/cleanlint.vim	2009-05-13 18:03:11.000000000 +0200
***************
*** 1,27 ****
  " Vim tool: Filter output of splint
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2009 May 05
  
  " Usage: redirect output of "make lint" to a file, edit that file with Vim and
  " :call CleanLint()
  " This deletes irrelevant messages.  What remains might be valid warnings.
  
  fun! CleanLint()
-   g/^  Types are incompatible/lockmarks d
    g/Assignment of dev_t to __dev_t:/lockmarks d
    g/Assignment of __dev_t to dev_t:/lockmarks d
    g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
!   g/Operands of == have incompatible types (unsigned int, int): /lockmarks d
    g/Assignment of char to char_u: /lockmarks d
    g/Assignment of unsigned int to int: /lockmarks d
!   g/Assignment of colnr_T to int: /lockmarks d
    g/Assignment of int to char_u: /lockmarks d
    g/Function .* expects arg . to be wint_t gets int: /lockmarks d
!   g/^digraph.c.*digraphdefault.*is type char, expects char_u:/lockmarks d
    g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
    g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
    g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
    g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
    g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
  endfun
--- 1,32 ----
  " Vim tool: Filter output of splint
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2009 May 13
  
  " Usage: redirect output of "make lint" to a file, edit that file with Vim and
  " :call CleanLint()
  " This deletes irrelevant messages.  What remains might be valid warnings.
  
  fun! CleanLint()
    g/Assignment of dev_t to __dev_t:/lockmarks d
    g/Assignment of __dev_t to dev_t:/lockmarks d
    g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
!   g/Operands of == have incompatible types (char_u, int): /lockmarks d
    g/Assignment of char to char_u: /lockmarks d
    g/Assignment of unsigned int to int: /lockmarks d
!   g/Assignment of int to unsigned int: /lockmarks d
!   g/Assignment of unsigned int to long int: /lockmarks d
    g/Assignment of int to char_u: /lockmarks d
    g/Function .* expects arg . to be wint_t gets int: /lockmarks d
!   g/Function .* expects arg . to be size_t gets int: /lockmarks d
!   g/Initial value of .* is type char, expects char_u: /lockmarks d
!   g/^ex_cmds.h:.* Function types are inconsistent. Parameter 1 is implicitly temp, but unqualified in assigned function:/lockmarks d
!   g/^ex_docmd.c:.* nospec_str/lockmarks d
    g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
    g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
+   g/^  Types are incompatible/lockmarks d
    g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
    g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
    g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
+   g+ A variable is declared but never used. Use /. at unused@./ in front of declaration to suppress message.+lockmarks d
  endfun
*** ../vim-7.2.168/src/diff.c	2009-03-11 12:45:44.000000000 +0100
--- src/diff.c	2009-05-13 16:16:11.000000000 +0200
***************
*** 827,832 ****
--- 827,833 ----
      char_u	*tmp_diff;
  {
      char_u	*cmd;
+     size_t	len;
  
  #ifdef FEAT_EVAL
      if (*p_dex != NUL)
***************
*** 835,842 ****
      else
  #endif
      {
! 	cmd = alloc((unsigned)(STRLEN(tmp_orig) + STRLEN(tmp_new)
! 				+ STRLEN(tmp_diff) + STRLEN(p_srr) + 27));
  	if (cmd != NULL)
  	{
  	    /* We don't want $DIFF_OPTIONS to get in the way. */
--- 836,844 ----
      else
  #endif
      {
! 	len = STRLEN(tmp_orig) + STRLEN(tmp_new)
! 				      + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
! 	cmd = alloc((unsigned)len);
  	if (cmd != NULL)
  	{
  	    /* We don't want $DIFF_OPTIONS to get in the way. */
***************
*** 846,852 ****
  	    /* Build the diff command and execute it.  Always use -a, binary
  	     * differences are of no use.  Ignore errors, diff returns
  	     * non-zero when differences have been found. */
! 	    sprintf((char *)cmd, "diff %s%s%s%s%s %s",
  		    diff_a_works == FALSE ? "" : "-a ",
  #if defined(MSWIN) || defined(MSDOS)
  		    diff_bin_works == TRUE ? "--binary " : "",
--- 848,854 ----
  	    /* Build the diff command and execute it.  Always use -a, binary
  	     * differences are of no use.  Ignore errors, diff returns
  	     * non-zero when differences have been found. */
! 	    vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s",
  		    diff_a_works == FALSE ? "" : "-a ",
  #if defined(MSWIN) || defined(MSDOS)
  		    diff_bin_works == TRUE ? "--binary " : "",
***************
*** 856,862 ****
  		    (diff_flags & DIFF_IWHITE) ? "-b " : "",
  		    (diff_flags & DIFF_ICASE) ? "-i " : "",
  		    tmp_orig, tmp_new);
! 	    append_redir(cmd, p_srr, tmp_diff);
  #ifdef FEAT_AUTOCMD
  	    block_autocmds();	/* Avoid ShellCmdPost stuff */
  #endif
--- 858,864 ----
  		    (diff_flags & DIFF_IWHITE) ? "-b " : "",
  		    (diff_flags & DIFF_ICASE) ? "-i " : "",
  		    tmp_orig, tmp_new);
! 	    append_redir(cmd, (int)len, p_srr, tmp_diff);
  #ifdef FEAT_AUTOCMD
  	    block_autocmds();	/* Avoid ShellCmdPost stuff */
  #endif
***************
*** 881,886 ****
--- 883,889 ----
      char_u	*tmp_orig;	/* name of original temp file */
      char_u	*tmp_new;	/* name of patched temp file */
      char_u	*buf = NULL;
+     size_t	buflen;
      win_T	*old_curwin = curwin;
      char_u	*newname = NULL;	/* name of patched file buffer */
  #ifdef UNIX
***************
*** 920,930 ****
      /* Get the absolute path of the patchfile, changing directory below. */
      fullname = FullName_save(eap->arg, FALSE);
  #endif
!     buf = alloc((unsigned)(STRLEN(tmp_orig) + (
  # ifdef UNIX
  		    fullname != NULL ? STRLEN(fullname) :
  # endif
! 		    STRLEN(eap->arg)) + STRLEN(tmp_new) + 16));
      if (buf == NULL)
  	goto theend;
  
--- 923,934 ----
      /* Get the absolute path of the patchfile, changing directory below. */
      fullname = FullName_save(eap->arg, FALSE);
  #endif
!     buflen = STRLEN(tmp_orig) + (
  # ifdef UNIX
  		    fullname != NULL ? STRLEN(fullname) :
  # endif
! 		    STRLEN(eap->arg)) + STRLEN(tmp_new) + 16;
!     buf = alloc((unsigned)buflen);
      if (buf == NULL)
  	goto theend;
  
***************
*** 961,967 ****
      {
  	/* Build the patch command and execute it.  Ignore errors.  Switch to
  	 * cooked mode to allow the user to respond to prompts. */
! 	sprintf((char *)buf, "patch -o %s %s < \"%s\"", tmp_new, tmp_orig,
  # ifdef UNIX
  		fullname != NULL ? fullname :
  # endif
--- 965,972 ----
      {
  	/* Build the patch command and execute it.  Ignore errors.  Switch to
  	 * cooked mode to allow the user to respond to prompts. */
! 	vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
! 		tmp_new, tmp_orig,
  # ifdef UNIX
  		fullname != NULL ? fullname :
  # endif
*** ../vim-7.2.168/src/edit.c	2009-05-13 12:46:36.000000000 +0200
--- src/edit.c	2009-05-13 18:29:21.000000000 +0200
***************
*** 169,175 ****
  static int  ins_compl_key2count __ARGS((int c));
  static int  ins_compl_use_match __ARGS((int c));
  static int  ins_complete __ARGS((int c));
! static int  quote_meta __ARGS((char_u *dest, char_u *str, int len));
  #endif /* FEAT_INS_EXPAND */
  
  #define BACKSPACE_CHAR		    1
--- 169,175 ----
  static int  ins_compl_key2count __ARGS((int c));
  static int  ins_compl_use_match __ARGS((int c));
  static int  ins_complete __ARGS((int c));
! static unsigned  quote_meta __ARGS((char_u *dest, char_u *str, int len));
  #endif /* FEAT_INS_EXPAND */
  
  #define BACKSPACE_CHAR		    1
***************
*** 757,763 ****
  		 * there is nothing to add, CTRL-L works like CTRL-P then. */
  		if (c == Ctrl_L
  			&& (ctrl_x_mode != CTRL_X_WHOLE_LINE
! 			    || STRLEN(compl_shown_match->cp_str)
  					  > curwin->w_cursor.col - compl_col))
  		{
  		    ins_compl_addfrommatch();
--- 757,763 ----
  		 * there is nothing to add, CTRL-L works like CTRL-P then. */
  		if (c == Ctrl_L
  			&& (ctrl_x_mode != CTRL_X_WHOLE_LINE
! 			    || (int)STRLEN(compl_shown_match->cp_str)
  					  > curwin->w_cursor.col - compl_col))
  		{
  		    ins_compl_addfrommatch();
***************
*** 3837,3843 ****
--- 3837,3847 ----
      char_u	*word;
      int		icase = FALSE;
      int		adup = FALSE;
+ #ifdef S_SPLINT_S  /* splint doesn't parse array of pointers correctly */
+     char_u	**cptext;
+ #else
      char_u	*(cptext[CPT_COUNT]);
+ #endif
  
      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
      {
***************
*** 3994,4000 ****
  		else if (*e_cpt == ']' || *e_cpt == 't')
  		{
  		    type = CTRL_X_TAGS;
! 		    sprintf((char*)IObuff, _("Scanning tags."));
  		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  		}
  		else
--- 3998,4004 ----
  		else if (*e_cpt == ']' || *e_cpt == 't')
  		{
  		    type = CTRL_X_TAGS;
! 		    vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags."));
  		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  		}
  		else
***************
*** 4093,4099 ****
  	case CTRL_X_SPELL:
  #ifdef FEAT_SPELL
  	    num_matches = expand_spelling(first_match_pos.lnum,
! 				 first_match_pos.col, compl_pattern, &matches);
  	    if (num_matches > 0)
  		ins_compl_add_matches(num_matches, matches, p_ic);
  #endif
--- 4097,4103 ----
  	case CTRL_X_SPELL:
  #ifdef FEAT_SPELL
  	    num_matches = expand_spelling(first_match_pos.lnum,
! 						     compl_pattern, &matches);
  	    if (num_matches > 0)
  		ins_compl_add_matches(num_matches, matches, p_ic);
  #endif
***************
*** 4803,4812 ****
  	    {
  		char_u	    *prefix = (char_u *)"\\<";
  
! 		/* we need 3 extra chars, 1 for the NUL and
! 		 * 2 >= strlen(prefix)	-- Acevedo */
  		compl_pattern = alloc(quote_meta(NULL, line + compl_col,
! 							   compl_length) + 3);
  		if (compl_pattern == NULL)
  		    return FAIL;
  		if (!vim_iswordp(line + compl_col)
--- 4807,4815 ----
  	    {
  		char_u	    *prefix = (char_u *)"\\<";
  
! 		/* we need up to 2 extra chars for the prefix */
  		compl_pattern = alloc(quote_meta(NULL, line + compl_col,
! 							   compl_length) + 2);
  		if (compl_pattern == NULL)
  		    return FAIL;
  		if (!vim_iswordp(line + compl_col)
***************
*** 4881,4887 ****
  		else
  		{
  		    compl_pattern = alloc(quote_meta(NULL, line + compl_col,
! 							   compl_length) + 3);
  		    if (compl_pattern == NULL)
  			return FAIL;
  		    STRCPY((char *)compl_pattern, "\\<");
--- 4884,4890 ----
  		else
  		{
  		    compl_pattern = alloc(quote_meta(NULL, line + compl_col,
! 							   compl_length) + 2);
  		    if (compl_pattern == NULL)
  			return FAIL;
  		    STRCPY((char *)compl_pattern, "\\<");
***************
*** 4963,4969 ****
  	    if (col < 0)
  		col = curs_col;
  	    compl_col = col;
! 	    if ((colnr_T)compl_col > curs_col)
  		compl_col = curs_col;
  
  	    /* Setup variables for completion.  Need to obtain "line" again,
--- 4966,4972 ----
  	    if (col < 0)
  		col = curs_col;
  	    compl_col = col;
! 	    if (compl_col > curs_col)
  		compl_col = curs_col;
  
  	    /* Setup variables for completion.  Need to obtain "line" again,
***************
*** 5236,5250 ****
   * a backslash) the metachars, and dest would be NUL terminated.
   * Returns the length (needed) of dest
   */
!     static int
  quote_meta(dest, src, len)
      char_u	*dest;
      char_u	*src;
      int		len;
  {
!     int	m;
  
!     for (m = len; --len >= 0; src++)
      {
  	switch (*src)
  	{
--- 5239,5253 ----
   * a backslash) the metachars, and dest would be NUL terminated.
   * Returns the length (needed) of dest
   */
!     static unsigned
  quote_meta(dest, src, len)
      char_u	*dest;
      char_u	*src;
      int		len;
  {
!     unsigned	m = (unsigned)len + 1;  /* one extra for the NUL */
  
!     for ( ; --len >= 0; src++)
      {
  	switch (*src)
  	{
***************
*** 6073,6079 ****
       * in 'formatoptions' and there is a single character before the cursor.
       * Otherwise the line would be broken and when typing another non-white
       * next they are not joined back together. */
!     wasatend = (pos.col == STRLEN(old));
      if (*old != NUL && !trailblank && wasatend)
      {
  	dec_cursor();
--- 6076,6082 ----
       * in 'formatoptions' and there is a single character before the cursor.
       * Otherwise the line would be broken and when typing another non-white
       * next they are not joined back together. */
!     wasatend = (pos.col == (colnr_T)STRLEN(old));
      if (*old != NUL && !trailblank && wasatend)
      {
  	dec_cursor();
***************
*** 6250,6256 ****
       * three digits. */
      if (VIM_ISDIGIT(c))
      {
! 	sprintf((char *)buf, "%03d", c);
  	AppendToRedobuff(buf);
      }
      else
--- 6253,6259 ----
       * three digits. */
      if (VIM_ISDIGIT(c))
      {
! 	vim_snprintf((char *)buf, sizeof(buf), "%03d", c);
  	AppendToRedobuff(buf);
      }
      else
***************
*** 6453,6462 ****
  	     * deleted characters. */
  	    if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
  	    {
! 		cc = (int)STRLEN(ml_get_curline());
! 		if (VIsual.col > (colnr_T)cc)
  		{
! 		    VIsual.col = cc;
  # ifdef FEAT_VIRTUALEDIT
  		    VIsual.coladd = 0;
  # endif
--- 6457,6467 ----
  	     * deleted characters. */
  	    if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
  	    {
! 		int len = (int)STRLEN(ml_get_curline());
! 
! 		if (VIsual.col > len)
  		{
! 		    VIsual.col = len;
  # ifdef FEAT_VIRTUALEDIT
  		    VIsual.coladd = 0;
  # endif
***************
*** 8315,8320 ****
--- 8320,8326 ----
      linenr_T	lnum;
      int		cc;
      int		temp = 0;	    /* init for GCC */
+     colnr_T	save_col;
      colnr_T	mincol;
      int		did_backspace = FALSE;
      int		in_indent;
***************
*** 8472,8484 ****
  		 */
  		while (cc > 0)
  		{
! 		    temp = curwin->w_cursor.col;
  #ifdef FEAT_MBYTE
  		    mb_replace_pop_ins(cc);
  #else
  		    ins_char(cc);
  #endif
! 		    curwin->w_cursor.col = temp;
  		    cc = replace_pop();
  		}
  		/* restore the characters that NL replaced */
--- 8478,8490 ----
  		 */
  		while (cc > 0)
  		{
! 		    save_col = curwin->w_cursor.col;
  #ifdef FEAT_MBYTE
  		    mb_replace_pop_ins(cc);
  #else
  		    ins_char(cc);
  #endif
! 		    curwin->w_cursor.col = save_col;
  		    cc = replace_pop();
  		}
  		/* restore the characters that NL replaced */
***************
*** 8510,8520 ****
  #endif
  			    )
  	{
! 	    temp = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
  	    if (curwin->w_cursor.col < (colnr_T)temp)
  		mincol = curwin->w_cursor.col;
! 	    curwin->w_cursor.col = temp;
  	}
  
  	/*
--- 8516,8526 ----
  #endif
  			    )
  	{
! 	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
  	    if (curwin->w_cursor.col < (colnr_T)temp)
  		mincol = curwin->w_cursor.col;
! 	    curwin->w_cursor.col = save_col;
  	}
  
  	/*
*** ../vim-7.2.168/src/ex_cmds.c	2009-05-13 12:46:36.000000000 +0200
--- src/ex_cmds.c	2009-05-13 18:24:18.000000000 +0200
***************
*** 87,99 ****
  			       ))
  	{
  	    transchar_nonprint(buf3, c);
! 	    sprintf(buf1, "  <%s>", (char *)buf3);
  	}
  	else
  	    buf1[0] = NUL;
  #ifndef EBCDIC
  	if (c >= 0x80)
! 	    sprintf(buf2, "  <M-%s>", transchar(c & 0x7f));
  	else
  #endif
  	    buf2[0] = NUL;
--- 87,100 ----
  			       ))
  	{
  	    transchar_nonprint(buf3, c);
! 	    vim_snprintf(buf1, sizeof(buf1), "  <%s>", (char *)buf3);
  	}
  	else
  	    buf1[0] = NUL;
  #ifndef EBCDIC
  	if (c >= 0x80)
! 	    vim_snprintf(buf2, sizeof(buf2), "  <M-%s>",
! 						 (char *)transchar(c & 0x7f));
  	else
  #endif
  	    buf2[0] = NUL;
***************
*** 358,364 ****
      linenr_T	lnum;
      long	maxlen = 0;
      sorti_T	*nrs;
!     size_t	count = eap->line2 - eap->line1 + 1;
      size_t	i;
      char_u	*p;
      char_u	*s;
--- 359,365 ----
      linenr_T	lnum;
      long	maxlen = 0;
      sorti_T	*nrs;
!     size_t	count = (size_t)(eap->line2 - eap->line1 + 1);
      size_t	i;
      char_u	*p;
      char_u	*s;
***************
*** 957,963 ****
  	    }
  	    len += (int)STRLEN(prevcmd);
  	}
! 	if ((t = alloc(len)) == NULL)
  	{
  	    vim_free(newcmd);
  	    return;
--- 958,964 ----
  	    }
  	    len += (int)STRLEN(prevcmd);
  	}
! 	if ((t = alloc((unsigned)len)) == NULL)
  	{
  	    vim_free(newcmd);
  	    return;
***************
*** 1548,1554 ****
       * redirecting input and/or output.
       */
      if (itmp != NULL || otmp != NULL)
! 	sprintf((char *)buf, "(%s)", (char *)cmd);
      else
  	STRCPY(buf, cmd);
      if (itmp != NULL)
--- 1549,1555 ----
       * redirecting input and/or output.
       */
      if (itmp != NULL || otmp != NULL)
! 	vim_snprintf((char *)buf, len, "(%s)", (char *)cmd);
      else
  	STRCPY(buf, cmd);
      if (itmp != NULL)
***************
*** 1597,1633 ****
      }
  #endif
      if (otmp != NULL)
! 	append_redir(buf, p_srr, otmp);
  
      return buf;
  }
  
  /*
!  * Append output redirection for file "fname" to the end of string buffer "buf"
   * Works with the 'shellredir' and 'shellpipe' options.
   * The caller should make sure that there is enough room:
   *	STRLEN(opt) + STRLEN(fname) + 3
   */
      void
! append_redir(buf, opt, fname)
      char_u	*buf;
      char_u	*opt;
      char_u	*fname;
  {
      char_u	*p;
  
!     buf += STRLEN(buf);
      /* find "%s", skipping "%%" */
      for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p)
  	if (p[1] == 's')
  	    break;
      if (p != NULL)
      {
! 	*buf = ' '; /* not really needed? Not with sh, ksh or bash */
! 	sprintf((char *)buf + 1, (char *)opt, (char *)fname);
      }
      else
! 	sprintf((char *)buf,
  #ifdef FEAT_QUICKFIX
  # ifndef RISCOS
  		opt != p_sp ? " %s%s" :
--- 1598,1638 ----
      }
  #endif
      if (otmp != NULL)
! 	append_redir(buf, (int)len, p_srr, otmp);
  
      return buf;
  }
  
  /*
!  * Append output redirection for file "fname" to the end of string buffer
!  * "buf[buflen]"
   * Works with the 'shellredir' and 'shellpipe' options.
   * The caller should make sure that there is enough room:
   *	STRLEN(opt) + STRLEN(fname) + 3
   */
      void
! append_redir(buf, buflen, opt, fname)
      char_u	*buf;
+     int		buflen;
      char_u	*opt;
      char_u	*fname;
  {
      char_u	*p;
+     char_u	*end;
  
!     end = buf + STRLEN(buf);
      /* find "%s", skipping "%%" */
      for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p)
  	if (p[1] == 's')
  	    break;
      if (p != NULL)
      {
! 	*end = ' '; /* not really needed? Not with sh, ksh or bash */
! 	vim_snprintf((char *)end + 1, (size_t)(buflen - (end + 1 - buf)),
! 						  (char *)opt, (char *)fname);
      }
      else
! 	vim_snprintf((char *)end, (size_t)(buflen - (end - buf)),
  #ifdef FEAT_QUICKFIX
  # ifndef RISCOS
  		opt != p_sp ? " %s%s" :
***************
*** 2390,2396 ****
  
      if (curwin->w_p_nu || use_number)
      {
! 	sprintf((char *)numbuf, "%*ld ", number_width(curwin), (long)lnum);
  	msg_puts_attr(numbuf, hl_attr(HLF_N));	/* Highlight line nrs */
      }
      msg_prt_line(ml_get(lnum), list);
--- 2395,2402 ----
  
      if (curwin->w_p_nu || use_number)
      {
! 	vim_snprintf((char *)numbuf, sizeof(numbuf),
! 				   "%*ld ", number_width(curwin), (long)lnum);
  	msg_puts_attr(numbuf, hl_attr(HLF_N));	/* Highlight line nrs */
      }
      msg_prt_line(ml_get(lnum), list);
***************
*** 4486,4492 ****
  	    char_u	*p1;
  	    int		did_sub = FALSE;
  	    int		lastone;
! 	    unsigned	len, needed_len;
  	    long	nmatch_tl = 0;	/* nr of lines matched below lnum */
  	    int		do_again;	/* do it again after joining lines */
  	    int		skip_match = FALSE;
--- 4492,4498 ----
  	    char_u	*p1;
  	    int		did_sub = FALSE;
  	    int		lastone;
! 	    int		len, copy_len, needed_len;
  	    long	nmatch_tl = 0;	/* nr of lines matched below lnum */
  	    int		do_again;	/* do it again after joining lines */
  	    int		skip_match = FALSE;
***************
*** 4631,4636 ****
--- 4637,4644 ----
  
  		if (do_ask)
  		{
+ 		    int typed;
+ 
  		    /* change State to CONFIRM, so that the mouse works
  		     * properly */
  		    save_State = State;
***************
*** 4669,4675 ****
  			    resp = getexmodeline('?', NULL, 0);
  			    if (resp != NULL)
  			    {
! 				i = *resp;
  				vim_free(resp);
  			    }
  			}
--- 4677,4683 ----
  			    resp = getexmodeline('?', NULL, 0);
  			    if (resp != NULL)
  			    {
! 				typed = *resp;
  				vim_free(resp);
  			    }
  			}
***************
*** 4721,4727 ****
  #endif
  			    ++no_mapping;	/* don't map this key */
  			    ++allow_keys;	/* allow special keys */
! 			    i = plain_vgetc();
  			    --allow_keys;
  			    --no_mapping;
  
--- 4729,4735 ----
  #endif
  			    ++no_mapping;	/* don't map this key */
  			    ++allow_keys;	/* allow special keys */
! 			    typed = plain_vgetc();
  			    --allow_keys;
  			    --no_mapping;
  
***************
*** 4732,4766 ****
  			}
  
  			need_wait_return = FALSE; /* no hit-return prompt */
! 			if (i == 'q' || i == ESC || i == Ctrl_C
  #ifdef UNIX
! 				|| i == intr_char
  #endif
  				)
  			{
  			    got_quit = TRUE;
  			    break;
  			}
! 			if (i == 'n')
  			    break;
! 			if (i == 'y')
  			    break;
! 			if (i == 'l')
  			{
  			    /* last: replace and then stop */
  			    do_all = FALSE;
  			    line2 = lnum;
  			    break;
  			}
! 			if (i == 'a')
  			{
  			    do_ask = FALSE;
  			    break;
  			}
  #ifdef FEAT_INS_EXPAND
! 			if (i == Ctrl_E)
  			    scrollup_clamp();
! 			else if (i == Ctrl_Y)
  			    scrolldown_clamp();
  #endif
  		    }
--- 4740,4774 ----
  			}
  
  			need_wait_return = FALSE; /* no hit-return prompt */
! 			if (typed == 'q' || typed == ESC || typed == Ctrl_C
  #ifdef UNIX
! 				|| typed == intr_char
  #endif
  				)
  			{
  			    got_quit = TRUE;
  			    break;
  			}
! 			if (typed == 'n')
  			    break;
! 			if (typed == 'y')
  			    break;
! 			if (typed == 'l')
  			{
  			    /* last: replace and then stop */
  			    do_all = FALSE;
  			    line2 = lnum;
  			    break;
  			}
! 			if (typed == 'a')
  			{
  			    do_ask = FALSE;
  			    break;
  			}
  #ifdef FEAT_INS_EXPAND
! 			if (typed == Ctrl_E)
  			    scrollup_clamp();
! 			else if (typed == Ctrl_Y)
  			    scrolldown_clamp();
  #endif
  		    }
***************
*** 4771,4777 ****
  		    if (vim_strchr(p_cpo, CPO_UNDO) != NULL)
  			--no_u_sync;
  
! 		    if (i == 'n')
  		    {
  			/* For a multi-line match, put matchcol at the NUL at
  			 * the end of the line and set nmatch to one, so that
--- 4779,4785 ----
  		    if (vim_strchr(p_cpo, CPO_UNDO) != NULL)
  			--no_u_sync;
  
! 		    if (typed == 'n')
  		    {
  			/* For a multi-line match, put matchcol at the NUL at
  			 * the end of the line and set nmatch to one, so that
***************
*** 4822,4830 ****
  		    p1 = ml_get(sub_firstlnum + nmatch - 1);
  		    nmatch_tl += nmatch - 1;
  		}
! 		i = regmatch.startpos[0].col - copycol;
! 		needed_len = i + ((unsigned)STRLEN(p1) - regmatch.endpos[0].col)
! 								 + sublen + 1;
  		if (new_start == NULL)
  		{
  		    /*
--- 4830,4838 ----
  		    p1 = ml_get(sub_firstlnum + nmatch - 1);
  		    nmatch_tl += nmatch - 1;
  		}
! 		copy_len = regmatch.startpos[0].col - copycol;
! 		needed_len = copy_len + ((unsigned)STRLEN(p1)
! 				       - regmatch.endpos[0].col) + sublen + 1;
  		if (new_start == NULL)
  		{
  		    /*
***************
*** 4847,4853 ****
  		     */
  		    len = (unsigned)STRLEN(new_start);
  		    needed_len += len;
! 		    if (needed_len > new_start_len)
  		    {
  			new_start_len = needed_len + 50;
  			if ((p1 = alloc_check(new_start_len)) == NULL)
--- 4855,4861 ----
  		     */
  		    len = (unsigned)STRLEN(new_start);
  		    needed_len += len;
! 		    if (needed_len > (int)new_start_len)
  		    {
  			new_start_len = needed_len + 50;
  			if ((p1 = alloc_check(new_start_len)) == NULL)
***************
*** 4865,4872 ****
  		/*
  		 * copy the text up to the part that matched
  		 */
! 		mch_memmove(new_end, sub_firstline + copycol, (size_t)i);
! 		new_end += i;
  
  		(void)vim_regsub_multi(&regmatch,
  				    sub_firstlnum - regmatch.startpos[0].lnum,
--- 4873,4880 ----
  		/*
  		 * copy the text up to the part that matched
  		 */
! 		mch_memmove(new_end, sub_firstline + copycol, (size_t)copy_len);
! 		new_end += copy_len;
  
  		(void)vim_regsub_multi(&regmatch,
  				    sub_firstlnum - regmatch.startpos[0].lnum,
***************
*** 5768,5773 ****
--- 5776,5785 ----
  {
      char_u	*s, *d;
      int		i;
+ #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
+     static char **mtable;
+     static char **rtable;
+ #else
      static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
  			       "/*", "/\\*", "\"*", "**",
  			       "/\\(\\)",
***************
*** 5782,5787 ****
--- 5794,5800 ----
  			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
  			       "\\[count]", "\\[quotex]", "\\[range]",
  			       "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
+ #endif
      int flags;
  
      d = IObuff;		    /* assume IObuff is long enough! */
***************
*** 5790,5796 ****
       * Recognize a few exceptions to the rule.	Some strings that contain '*'
       * with "star".  Otherwise '*' is recognized as a wildcard.
       */
!     for (i = sizeof(mtable) / sizeof(char *); --i >= 0; )
  	if (STRCMP(arg, mtable[i]) == 0)
  	{
  	    STRCPY(d, rtable[i]);
--- 5803,5809 ----
       * Recognize a few exceptions to the rule.	Some strings that contain '*'
       * with "star".  Otherwise '*' is recognized as a wildcard.
       */
!     for (i = (int)(sizeof(mtable) / sizeof(char *)); --i >= 0; )
  	if (STRCMP(arg, mtable[i]) == 0)
  	{
  	    STRCPY(d, rtable[i]);
*** ../vim-7.2.168/src/ex_cmds2.c	2009-02-05 20:47:14.000000000 +0100
--- src/ex_cmds2.c	2009-05-13 16:22:33.000000000 +0200
***************
*** 3373,3379 ****
  	    p = skipwhite(sp->nextline);
  	    if (*p != '\\')
  		break;
! 	    s = alloc((int)(STRLEN(line) + STRLEN(p)));
  	    if (s == NULL)	/* out of memory */
  		break;
  	    STRCPY(s, line);
--- 3373,3379 ----
  	    p = skipwhite(sp->nextline);
  	    if (*p != '\\')
  		break;
! 	    s = alloc((unsigned)(STRLEN(line) + STRLEN(p)));
  	    if (s == NULL)	/* out of memory */
  		break;
  	    STRCPY(s, line);
*** ../vim-7.2.168/src/ex_docmd.c	2009-04-29 18:44:38.000000000 +0200
--- src/ex_docmd.c	2009-05-13 17:56:44.000000000 +0200
***************
*** 2737,2743 ****
      int		i;
  
      for (i = 0; cmd[i] != NUL; ++i)
! 	if (cmd[i] != (*pp)[i])
  	    break;
      if (i >= len && !isalpha((*pp)[i]))
      {
--- 2737,2743 ----
      int		i;
  
      for (i = 0; cmd[i] != NUL; ++i)
! 	if (((char_u *)cmd)[i] != (*pp)[i])
  	    break;
      if (i >= len && !isalpha((*pp)[i]))
      {
***************
*** 2803,2809 ****
  	    /* Check for ":dl", ":dell", etc. to ":deletel": that's
  	     * :delete with the 'l' flag.  Same for 'p'. */
  	    for (i = 0; i < len; ++i)
! 		if (eap->cmd[i] != "delete"[i])
  		    break;
  	    if (i == len - 1)
  	    {
--- 2803,2809 ----
  	    /* Check for ":dl", ":dell", etc. to ":deletel": that's
  	     * :delete with the 'l' flag.  Same for 'p'. */
  	    for (i = 0; i < len; ++i)
! 		if (eap->cmd[i] != ((char_u *)"delete")[i])
  		    break;
  	    if (i == len - 1)
  	    {
***************
*** 3823,3829 ****
      char_u	*cmd;
      int		*ctx;	/* pointer to xp_context or NULL */
  {
!     int		delim;
  
      while (vim_strchr((char_u *)" \t0123456789.$%'/?-+,;", *cmd) != NULL)
      {
--- 3823,3829 ----
      char_u	*cmd;
      int		*ctx;	/* pointer to xp_context or NULL */
  {
!     unsigned	delim;
  
      while (vim_strchr((char_u *)" \t0123456789.$%'/?-+,;", *cmd) != NULL)
      {
***************
*** 9417,9423 ****
  {
      int		len;
      int		i;
!     static char *(spec_str[]) = {
  		    "%",
  #define SPEC_PERC   0
  		    "#",
--- 9417,9429 ----
  {
      int		len;
      int		i;
! #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
!     static char **spec_str;
!     static char *(nospec_str[])
! #else
!     static char *(spec_str[])
! #endif
! 	= {
  		    "%",
  #define SPEC_PERC   0
  		    "#",
***************
*** 9443,9451 ****
  # define SPEC_CLIENT 9
  #endif
      };
- #define SPEC_COUNT  (sizeof(spec_str) / sizeof(char *))
  
!     for (i = 0; i < SPEC_COUNT; ++i)
      {
  	len = (int)STRLEN(spec_str[i]);
  	if (STRNCMP(src, spec_str[i], len) == 0)
--- 9449,9456 ----
  # define SPEC_CLIENT 9
  #endif
      };
  
!     for (i = 0; i < (int)(sizeof(spec_str) / sizeof(char *)); ++i)
      {
  	len = (int)STRLEN(spec_str[i]);
  	if (STRNCMP(src, spec_str[i], len) == 0)
***************
*** 9796,9802 ****
  	}
  
  	/* allocate memory */
! 	retval = alloc(len + 1);
  	if (retval == NULL)
  	    break;
      }
--- 9801,9807 ----
  	}
  
  	/* allocate memory */
! 	retval = alloc((unsigned)len + 1);
  	if (retval == NULL)
  	    break;
      }
*** ../vim-7.2.168/src/proto/ex_cmds.pro	2009-04-29 18:44:38.000000000 +0200
--- src/proto/ex_cmds.pro	2009-05-13 15:53:39.000000000 +0200
***************
*** 9,15 ****
  void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
  void do_shell __ARGS((char_u *cmd, int flags));
  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
! void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
  int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
  int read_viminfo __ARGS((char_u *file, int flags));
  void write_viminfo __ARGS((char_u *file, int forceit));
--- 9,15 ----
  void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
  void do_shell __ARGS((char_u *cmd, int flags));
  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
! void append_redir __ARGS((char_u *buf, int buflen, char_u *opt, char_u *fname));
  int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
  int read_viminfo __ARGS((char_u *file, int flags));
  void write_viminfo __ARGS((char_u *file, int forceit));
*** ../vim-7.2.168/src/proto/spell.pro	2007-05-05 19:19:19.000000000 +0200
--- src/proto/spell.pro	2009-05-13 16:43:13.000000000 +0200
***************
*** 22,26 ****
  char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf));
  int spell_word_start __ARGS((int startcol));
  void spell_expand_check_cap __ARGS((colnr_T col));
! int expand_spelling __ARGS((linenr_T lnum, int col, char_u *pat, char_u ***matchp));
  /* vim: set ft=c : */
--- 22,26 ----
  char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf));
  int spell_word_start __ARGS((int startcol));
  void spell_expand_check_cap __ARGS((colnr_T col));
! int expand_spelling __ARGS((linenr_T lnum, char_u *pat, char_u ***matchp));
  /* vim: set ft=c : */
*** ../vim-7.2.168/src/quickfix.c	2009-04-29 11:49:57.000000000 +0200
--- src/quickfix.c	2009-05-13 15:53:18.000000000 +0200
***************
*** 2774,2780 ****
      sprintf((char *)cmd, "%s%s%s", (char *)p_shq, (char *)eap->arg,
  							       (char *)p_shq);
      if (*p_sp != NUL)
! 	append_redir(cmd, p_sp, fname);
      /*
       * Output a newline if there's something else than the :make command that
       * was typed (in which case the cursor is in column 0).
--- 2774,2780 ----
      sprintf((char *)cmd, "%s%s%s", (char *)p_shq, (char *)eap->arg,
  							       (char *)p_shq);
      if (*p_sp != NUL)
! 	append_redir(cmd, len, p_sp, fname);
      /*
       * Output a newline if there's something else than the :make command that
       * was typed (in which case the cursor is in column 0).
*** ../vim-7.2.168/src/spell.c	2009-02-11 17:57:43.000000000 +0100
--- src/spell.c	2009-05-13 16:31:15.000000000 +0200
***************
*** 16151,16161 ****
   * Returns the number of matches.  The matches are in "matchp[]", array of
   * allocated strings.
   */
- /*ARGSUSED*/
      int
! expand_spelling(lnum, col, pat, matchp)
      linenr_T	lnum;
-     int		col;
      char_u	*pat;
      char_u	***matchp;
  {
--- 16151,16159 ----
   * Returns the number of matches.  The matches are in "matchp[]", array of
   * allocated strings.
   */
      int
! expand_spelling(lnum, pat, matchp)
      linenr_T	lnum;
      char_u	*pat;
      char_u	***matchp;
  {
*** ../vim-7.2.168/src/structs.h	2009-05-13 12:46:36.000000000 +0200
--- src/structs.h	2009-05-13 16:45:51.000000000 +0200
***************
*** 16,22 ****
   */
  #if defined(SASC) && SASC < 658
  typedef long		linenr_T;
! typedef unsigned	colnr_T;
  typedef unsigned short	short_u;
  #endif
  
--- 16,22 ----
   */
  #if defined(SASC) && SASC < 658
  typedef long		linenr_T;
! typedef int		colnr_T;
  typedef unsigned short	short_u;
  #endif
  
*** ../vim-7.2.168/src/term.h	2005-03-16 10:53:56.000000000 +0100
--- src/term.h	2009-05-13 17:27:41.000000000 +0200
***************
*** 96,102 ****
--- 96,106 ----
   * - there should be code in term.c to obtain the value from the termcap
   */
  
+ #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
+ extern char_u **term_strings;    /* current terminal strings */
+ #else
  extern char_u *(term_strings[]);    /* current terminal strings */
+ #endif
  
  /*
   * strings used for terminal
*** ../vim-7.2.168/src/vim.h	2009-04-29 18:44:38.000000000 +0200
--- src/vim.h	2009-05-13 16:45:39.000000000 +0200
***************
*** 1460,1467 ****
  # define PERROR(msg)		    perror(msg)
  #endif
  
! typedef long	    linenr_T;		/* line number type */
! typedef unsigned    colnr_T;		/* column number type */
  typedef unsigned short disptick_T;	/* display tick type */
  
  #define MAXLNUM (0x7fffffffL)		/* maximum (invalid) line number */
--- 1460,1467 ----
  # define PERROR(msg)		    perror(msg)
  #endif
  
! typedef long	linenr_T;		/* line number type */
! typedef int	colnr_T;		/* column number type */
  typedef unsigned short disptick_T;	/* display tick type */
  
  #define MAXLNUM (0x7fffffffL)		/* maximum (invalid) line number */
*** ../vim-7.2.168/src/version.c	2009-05-13 14:48:55.000000000 +0200
--- src/version.c	2009-05-13 18:44:28.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     169,
  /**/

-- 
Females are strictly forbidden to appear unshaven in public.
		[real standing law in New Mexico, 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    ///


--- NEW FILE 7.2.170 ---
To: vim-dev at vim.org
Subject: Patch 7.2.170
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.170
Problem:    Using b_dev while it was not set. (Dominique Pelle)
Solution:   Add the b_dev_valid flag.
Files:	    src/buffer.c, src/fileio.c, src/structs.h


*** ../vim-7.2.169/src/buffer.c	2009-05-13 12:46:36.000000000 +0200
--- src/buffer.c	2009-05-13 20:23:51.000000000 +0200
***************
*** 1678,1686 ****
      buf->b_fname = buf->b_sfname;
  #ifdef UNIX
      if (st.st_dev == (dev_T)-1)
! 	buf->b_dev = -1;
      else
      {
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
--- 1678,1687 ----
      buf->b_fname = buf->b_sfname;
  #ifdef UNIX
      if (st.st_dev == (dev_T)-1)
! 	buf->b_dev_valid = FALSE;
      else
      {
+ 	buf->b_dev_valid = TRUE;
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
***************
*** 2693,2701 ****
      buf->b_fname = buf->b_sfname;
  #ifdef UNIX
      if (st.st_dev == (dev_T)-1)
! 	buf->b_dev = -1;
      else
      {
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
--- 2694,2703 ----
      buf->b_fname = buf->b_sfname;
  #ifdef UNIX
      if (st.st_dev == (dev_T)-1)
! 	buf->b_dev_valid = FALSE;
      else
      {
+ 	buf->b_dev_valid = TRUE;
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
***************
*** 2889,2895 ****
  	/* If no struct stat given, get it now */
  	if (stp == NULL)
  	{
! 	    if (buf->b_dev < 0 || mch_stat((char *)ffname, &st) < 0)
  		st.st_dev = (dev_T)-1;
  	    stp = &st;
  	}
--- 2891,2897 ----
  	/* If no struct stat given, get it now */
  	if (stp == NULL)
  	{
! 	    if (!buf->b_dev_valid || mch_stat((char *)ffname, &st) < 0)
  		st.st_dev = (dev_T)-1;
  	    stp = &st;
  	}
***************
*** 2926,2936 ****
  
      if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0)
      {
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
      else
! 	buf->b_dev = -1;
  }
  
  /*
--- 2928,2939 ----
  
      if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0)
      {
+ 	buf->b_dev_valid = TRUE;
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
      else
! 	buf->b_dev_valid = FALSE;
  }
  
  /*
***************
*** 2941,2947 ****
      buf_T	*buf;
      struct stat *stp;
  {
!     return (buf->b_dev >= 0
  	    && stp->st_dev == buf->b_dev
  	    && stp->st_ino == buf->b_ino);
  }
--- 2944,2950 ----
      buf_T	*buf;
      struct stat *stp;
  {
!     return (buf->b_dev_valid
  	    && stp->st_dev == buf->b_dev
  	    && stp->st_ino == buf->b_ino);
  }
*** ../vim-7.2.169/src/fileio.c	2009-04-29 18:01:23.000000000 +0200
--- src/fileio.c	2009-05-13 20:24:08.000000000 +0200
***************
*** 4416,4422 ****
  # endif
  	buf_setino(buf);
      }
!     else if (buf->b_dev < 0)
  	/* Set the inode when creating a new file. */
  	buf_setino(buf);
  #endif
--- 4416,4422 ----
  # endif
  	buf_setino(buf);
      }
!     else if (!buf->b_dev_valid)
  	/* Set the inode when creating a new file. */
  	buf_setino(buf);
  #endif
*** ../vim-7.2.169/src/structs.h	2009-05-13 18:54:14.000000000 +0200
--- src/structs.h	2009-05-13 20:24:54.000000000 +0200
***************
*** 1166,1172 ****
      char_u	*b_fname;	/* current file name */
  
  #ifdef UNIX
!     dev_t	b_dev;		/* device number (-1 if not set) */
      ino_t	b_ino;		/* inode number */
  #endif
  #ifdef FEAT_CW_EDITOR
--- 1166,1173 ----
      char_u	*b_fname;	/* current file name */
  
  #ifdef UNIX
!     int		b_dev_valid;	/* TRUE when b_dev has a valid number */
!     dev_t	b_dev;		/* device number */
      ino_t	b_ino;		/* inode number */
  #endif
  #ifdef FEAT_CW_EDITOR
*** ../vim-7.2.169/src/version.c	2009-05-13 18:54:14.000000000 +0200
--- src/version.c	2009-05-13 20:43:22.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     170,
  /**/

-- 
A special cleaning ordinance bans housewives from hiding dirt and dust under a
rug in a dwelling.
		[real standing law in Pennsylvania, 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    ///


--- NEW FILE 7.2.171 ---
To: vim-dev at vim.org
Subject: Patch 7.2.171
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.171 (after 7.2.169)
Problem:    Compiler warnings. (Tony Mechelynck)
Solution:   Add function prototype. (Patrick Texier)  Init variable.
Files:	    src/ex_cmds.c


*** ../vim-7.2.170/src/ex_cmds.c	2009-05-13 18:54:14.000000000 +0200
--- src/ex_cmds.c	2009-05-14 21:11:01.000000000 +0200
***************
*** 4637,4643 ****
  
  		if (do_ask)
  		{
! 		    int typed;
  
  		    /* change State to CONFIRM, so that the mouse works
  		     * properly */
--- 4635,4641 ----
  
  		if (do_ask)
  		{
! 		    int typed = 0;
  
  		    /* change State to CONFIRM, so that the mouse works
  		     * properly */
***************
*** 6553,6558 ****
--- 6549,6555 ----
  static sign_T	*first_sign = NULL;
  static int	last_sign_typenr = MAX_TYPENR;	/* is decremented */
  
+ static int sign_cmd_idx __ARGS((char_u *begin_cmd, char_u *end_cmd));
  static void sign_list_defined __ARGS((sign_T *sp));
  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
  
***************
*** 6579,6586 ****
   */
      static int
  sign_cmd_idx(begin_cmd, end_cmd)
!     char	*begin_cmd;	/* begin of sign subcmd */
!     char	*end_cmd;	/* just after sign subcmd */
  {
      int		idx;
      char	save = *end_cmd;
--- 6576,6583 ----
   */
      static int
  sign_cmd_idx(begin_cmd, end_cmd)
!     char_u	*begin_cmd;	/* begin of sign subcmd */
!     char_u	*end_cmd;	/* just after sign subcmd */
  {
      int		idx;
      char	save = *end_cmd;
*** ../vim-7.2.170/src/version.c	2009-05-13 20:47:07.000000000 +0200
--- src/version.c	2009-05-14 21:49:22.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     171,
  /**/

-- 
Living on Earth includes an annual free trip around the Sun.

 /// 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    ///


--- NEW FILE 7.2.172 ---
To: vim-dev at vim.org
Subject: Patch 7.2.172 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.172 (extra)
Problem:    Compiler warning.
Solution:   Adjust function prototype. (Patrick Texier)
Files:	    src/os_mswin.c


*** ../vim-7.2.171/src/os_mswin.c	2009-01-22 21:49:21.000000000 +0100
--- src/os_mswin.c	2009-05-14 20:54:32.000000000 +0200
***************
*** 1227,1234 ****
   * Wait for another process to Close the Clipboard.
   * Returns TRUE for success.
   */
!     int
! vim_open_clipboard()
  {
      int delay = 10;
  
--- 1227,1234 ----
   * Wait for another process to Close the Clipboard.
   * Returns TRUE for success.
   */
!     static int
! vim_open_clipboard(void)
  {
      int delay = 10;
  
*** ../vim-7.2.171/src/version.c	2009-05-14 21:51:06.000000000 +0200
--- src/version.c	2009-05-14 21:59:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     172,
  /**/

-- 
FROG: How you English say:  I one more time, mac, I unclog my nose towards
      you, sons of a window-dresser,  so, you think you could out-clever us
      French fellows with your silly knees-bent creeping about advancing
      behaviour.  (blows a raspberry) I wave my private parts at your aunties,
      you brightly-coloured, mealy-templed, cranberry-smelling, electric
      donkey-bottom biters.
                 "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    ///


--- NEW FILE 7.2.173 ---
To: vim-dev at vim.org
Subject: Patch 7.2.173
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.173
Problem:    Without lint there is no check for unused function arguments.
Solution:   Use gcc -Wunused-parameter instead of lint.  For a few files add
	    attributes to arguments that are known not to be used.
Files:	    src/auto/configure, src/buffer.c, src/charset.c, src/diff.c,
	    src/configure.in, src/config.h.in, src/edit.c, src/ex_cmds.c,
	    src/ex_cmds2.c, src/version.c, src/vim.h


*** ../vim-7.2.172/src/auto/configure	2009-05-13 14:48:55.000000000 +0200
--- src/auto/configure	2009-05-14 22:08:12.000000000 +0200
***************
*** 10362,10367 ****
--- 10372,10427 ----
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+ { $as_echo "$as_me:$LINENO: checking whether __attribute__((unused)) is allowed" >&5
+ $as_echo_n "checking whether __attribute__((unused)) is allowed... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <stdio.h>
+ int
+ main ()
+ {
+ int x __attribute__((unused));
+   ;
+   return 0;
+ }
+ _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$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
+   $as_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
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ATTRIBUTE_UNUSED 1
+ _ACEOF
+ 
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  if test "${ac_cv_header_elf_h+set}" = set; then
    { $as_echo "$as_me:$LINENO: checking for elf.h" >&5
  $as_echo_n "checking for elf.h... " >&6; }
*** ../vim-7.2.172/src/buffer.c	2009-05-13 20:47:07.000000000 +0200
--- src/buffer.c	2009-05-14 21:34:06.000000000 +0200
***************
*** 512,523 ****
   * buf_freeall() - free all things allocated for a buffer that are related to
   * the file.
   */
- /*ARGSUSED*/
      void
  buf_freeall(buf, del_buf, wipe_buf)
      buf_T	*buf;
!     int		del_buf;	/* buffer is going to be deleted */
!     int		wipe_buf;	/* buffer is going to be wiped out */
  {
  #ifdef FEAT_AUTOCMD
      int		is_curbuf = (buf == curbuf);
--- 512,522 ----
   * buf_freeall() - free all things allocated for a buffer that are related to
   * the file.
   */
      void
  buf_freeall(buf, del_buf, wipe_buf)
      buf_T	*buf;
!     int		del_buf UNUSED;	    /* buffer is going to be deleted */
!     int		wipe_buf UNUSED;    /* buffer is going to be wiped out */
  {
  #ifdef FEAT_AUTOCMD
      int		is_curbuf = (buf == curbuf);
***************
*** 2437,2447 ****
   * another tab page.
   * Returns NULL when there isn't any info.
   */
- /*ARGSUSED*/
      static wininfo_T *
  find_wininfo(buf, skip_diff_buffer)
      buf_T	*buf;
!     int		skip_diff_buffer;
  {
      wininfo_T	*wip;
  
--- 2436,2445 ----
   * another tab page.
   * Returns NULL when there isn't any info.
   */
      static wininfo_T *
  find_wininfo(buf, skip_diff_buffer)
      buf_T	*buf;
!     int		skip_diff_buffer UNUSED;
  {
      wininfo_T	*wip;
  
***************
*** 4278,4287 ****
   * Make "ffname" a full file name, set "sfname" to "ffname" if not NULL.
   * "ffname" becomes a pointer to allocated memory (or NULL).
   */
- /*ARGSUSED*/
      void
  fname_expand(buf, ffname, sfname)
!     buf_T	*buf;
      char_u	**ffname;
      char_u	**sfname;
  {
--- 4276,4284 ----
   * Make "ffname" a full file name, set "sfname" to "ffname" if not NULL.
   * "ffname" becomes a pointer to allocated memory (or NULL).
   */
      void
  fname_expand(buf, ffname, sfname)
!     buf_T	*buf UNUSED;
      char_u	**ffname;
      char_u	**sfname;
  {
***************
*** 5577,5587 ****
   * this buffer.  Call this to wipe out a temp buffer that does not contain any
   * marks.
   */
- /*ARGSUSED*/
      void
  wipe_buffer(buf, aucmd)
      buf_T	*buf;
!     int		aucmd;	    /* When TRUE trigger autocommands. */
  {
      if (buf->b_fnum == top_file_num - 1)
  	--top_file_num;
--- 5574,5583 ----
   * this buffer.  Call this to wipe out a temp buffer that does not contain any
   * marks.
   */
      void
  wipe_buffer(buf, aucmd)
      buf_T	*buf;
!     int		aucmd UNUSED;	    /* When TRUE trigger autocommands. */
  {
      if (buf->b_fnum == top_file_num - 1)
  	--top_file_num;
*** ../vim-7.2.172/src/charset.c	2009-05-13 14:10:46.000000000 +0200
--- src/charset.c	2009-05-14 21:34:30.000000000 +0200
***************
*** 1026,1038 ****
   * string at start of line.  Warning: *headp is only set if it's a non-zero
   * value, init to 0 before calling.
   */
- /*ARGSUSED*/
      int
  win_lbr_chartabsize(wp, s, col, headp)
      win_T	*wp;
      char_u	*s;
      colnr_T	col;
!     int		*headp;
  {
  #ifdef FEAT_LINEBREAK
      int		c;
--- 1026,1037 ----
   * string at start of line.  Warning: *headp is only set if it's a non-zero
   * value, init to 0 before calling.
   */
      int
  win_lbr_chartabsize(wp, s, col, headp)
      win_T	*wp;
      char_u	*s;
      colnr_T	col;
!     int		*headp UNUSED;
  {
  #ifdef FEAT_LINEBREAK
      int		c;
*** ../vim-7.2.172/src/diff.c	2009-05-13 18:54:14.000000000 +0200
--- src/diff.c	2009-05-14 21:24:59.000000000 +0200
***************
*** 652,661 ****
   * The buffers are written to a file, also for unmodified buffers (the file
   * could have been produced by autocommands, e.g. the netrw plugin).
   */
- /*ARGSUSED*/
      void
  ex_diffupdate(eap)
!     exarg_T	*eap;	    /* can be NULL, it's not used */
  {
      buf_T	*buf;
      int		idx_orig;
--- 652,660 ----
   * The buffers are written to a file, also for unmodified buffers (the file
   * could have been produced by autocommands, e.g. the netrw plugin).
   */
      void
  ex_diffupdate(eap)
!     exarg_T	*eap UNUSED;	    /* can be NULL */
  {
      buf_T	*buf;
      int		idx_orig;
***************
*** 1094,1103 ****
  /*
   * Set options to show difs for the current window.
   */
- /*ARGSUSED*/
      void
  ex_diffthis(eap)
!     exarg_T	*eap;
  {
      /* Set 'diff', 'scrollbind' on and 'wrap' off. */
      diff_win_options(curwin, TRUE);
--- 1093,1101 ----
  /*
   * Set options to show difs for the current window.
   */
      void
  ex_diffthis(eap)
!     exarg_T	*eap UNUSED;
  {
      /* Set 'diff', 'scrollbind' on and 'wrap' off. */
      diff_win_options(curwin, TRUE);
*** ../vim-7.2.172/src/configure.in	2009-05-13 14:48:55.000000000 +0200
--- src/configure.in	2009-05-14 22:08:06.000000000 +0200
***************
*** 2067,2072 ****
--- 2067,2077 ----
  	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_DATE_TIME),
  	AC_MSG_RESULT(no))
  
+ AC_MSG_CHECKING(whether __attribute__((unused)) is allowed)
+ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));],
+ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ATTRIBUTE_UNUSED),
+ 	AC_MSG_RESULT(no))
+ 
  dnl Checks for header files.
  AC_CHECK_HEADER(elf.h, HAS_ELF=1)
  dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
*** ../vim-7.2.172/src/config.h.in	2009-03-02 02:44:54.000000000 +0100
--- src/config.h.in	2009-05-14 21:15:02.000000000 +0200
***************
*** 30,35 ****
--- 30,38 ----
  /* Define when __DATE__ " " __TIME__ can be used */
  #undef HAVE_DATE_TIME
  
+ /* Define when __attribute__((unused)) can be used */
+ #undef HAVE_ATTRIBUTE_UNUSED
+ 
  /* defined always when using configure */
  #undef UNIX
  
*** ../vim-7.2.172/src/edit.c	2009-05-13 18:54:14.000000000 +0200
--- src/edit.c	2009-05-14 21:35:08.000000000 +0200
***************
*** 1447,1456 ****
   * Only redraw when there are no characters available.  This speeds up
   * inserting sequences of characters (e.g., for CTRL-R).
   */
- /*ARGSUSED*/
      static void
  ins_redraw(ready)
!     int		ready;	    /* not busy with something */
  {
      if (!char_avail())
      {
--- 1447,1455 ----
   * Only redraw when there are no characters available.  This speeds up
   * inserting sequences of characters (e.g., for CTRL-R).
   */
      static void
  ins_redraw(ready)
!     int		ready UNUSED;	    /* not busy with something */
  {
      if (!char_avail())
      {
***************
*** 1962,1971 ****
   * Only matters when there are composing characters.
   * Return TRUE when something was deleted.
   */
- /*ARGSUSED*/
     static int
  del_char_after_col(limit_col)
!     int limit_col;
  {
  #ifdef FEAT_MBYTE
      if (enc_utf8 && limit_col >= 0)
--- 1961,1969 ----
   * Only matters when there are composing characters.
   * Return TRUE when something was deleted.
   */
     static int
  del_char_after_col(limit_col)
!     int limit_col UNUSED;
  {
  #ifdef FEAT_MBYTE
      if (enc_utf8 && limit_col >= 0)
*** ../vim-7.2.172/src/ex_cmds.c	2009-05-14 21:51:06.000000000 +0200
--- src/ex_cmds.c	2009-05-14 21:11:01.000000000 +0200
***************
*** 43,52 ****
  /*
   * ":ascii" and "ga".
   */
- /*ARGSUSED*/
      void
  do_ascii(eap)
!     exarg_T	*eap;
  {
      int		c;
      int		cval;
--- 43,51 ----
  /*
   * ":ascii" and "ga".
   */
      void
  do_ascii(eap)
!     exarg_T	*eap UNUSED;
  {
      int		c;
      int		cval;
***************
*** 2373,2382 ****
   *   ^?		^H
   * not ^?	^?
   */
- /*ARGSUSED*/
      void
  do_fixdel(eap)
!     exarg_T	*eap;
  {
      char_u  *p;
  
--- 2372,2380 ----
   *   ^?		^H
   * not ^?	^?
   */
      void
  do_fixdel(eap)
!     exarg_T	*eap UNUSED;
  {
      char_u  *p;
  
***************
*** 6127,6136 ****
  /*
   * ":exusage"
   */
- /*ARGSUSED*/
      void
  ex_exusage(eap)
!     exarg_T	*eap;
  {
      do_cmdline_cmd((char_u *)"help ex-cmd-index");
  }
--- 6125,6133 ----
  /*
   * ":exusage"
   */
      void
  ex_exusage(eap)
!     exarg_T	*eap UNUSED;
  {
      do_cmdline_cmd((char_u *)"help ex-cmd-index");
  }
***************
*** 6138,6147 ****
  /*
   * ":viusage"
   */
- /*ARGSUSED*/
      void
  ex_viusage(eap)
!     exarg_T	*eap;
  {
      do_cmdline_cmd((char_u *)"help normal-index");
  }
--- 6135,6143 ----
  /*
   * ":viusage"
   */
      void
  ex_viusage(eap)
!     exarg_T	*eap UNUSED;
  {
      do_cmdline_cmd((char_u *)"help normal-index");
  }
***************
*** 7154,7163 ****
   * Function given to ExpandGeneric() to obtain the sign command
   * expansion.
   */
- /*ARGSUSED*/
      char_u *
  get_sign_name(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      sign_T	*sp;
--- 7150,7158 ----
   * Function given to ExpandGeneric() to obtain the sign command
   * expansion.
   */
      char_u *
  get_sign_name(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      sign_T	*sp;
*** ../vim-7.2.172/src/ex_cmds2.c	2009-05-13 18:54:14.000000000 +0200
--- src/ex_cmds2.c	2009-05-14 21:35:40.000000000 +0200
***************
*** 680,689 ****
  /*
   * ":breaklist".
   */
- /*ARGSUSED*/
      void
  ex_breaklist(eap)
!     exarg_T	*eap;
  {
      struct debuggy *bp;
      int		i;
--- 680,688 ----
  /*
   * ":breaklist".
   */
      void
  ex_breaklist(eap)
!     exarg_T	*eap UNUSED;
  {
      struct debuggy *bp;
      int		i;
***************
*** 1342,1355 ****
  /*
   * return TRUE if buffer was changed and cannot be abandoned.
   */
- /*ARGSUSED*/
      int
  check_changed(buf, checkaw, mult_win, forceit, allbuf)
      buf_T	*buf;
      int		checkaw;	/* do autowrite if buffer was changed */
      int		mult_win;	/* check also when several wins for the buf */
      int		forceit;
!     int		allbuf;		/* may write all buffers */
  {
      if (       !forceit
  	    && bufIsChanged(buf)
--- 1341,1353 ----
  /*
   * return TRUE if buffer was changed and cannot be abandoned.
   */
      int
  check_changed(buf, checkaw, mult_win, forceit, allbuf)
      buf_T	*buf;
      int		checkaw;	/* do autowrite if buffer was changed */
      int		mult_win;	/* check also when several wins for the buf */
      int		forceit;
!     int		allbuf UNUSED;	/* may write all buffers */
  {
      if (       !forceit
  	    && bufIsChanged(buf)
***************
*** 1759,1770 ****
   *
   * Return FAIL for failure, OK otherwise.
   */
- /*ARGSUSED*/
      static int
  do_arglist(str, what, after)
      char_u	*str;
!     int		what;
!     int		after;		/* 0 means before first one */
  {
      garray_T	new_ga;
      int		exp_count;
--- 1757,1767 ----
   *
   * Return FAIL for failure, OK otherwise.
   */
      static int
  do_arglist(str, what, after)
      char_u	*str;
!     int		what UNUSED;
!     int		after UNUSED;		/* 0 means before first one */
  {
      garray_T	new_ga;
      int		exp_count;
***************
*** 2549,2559 ****
  
  static void source_callback __ARGS((char_u *fname, void *cookie));
  
- /*ARGSUSED*/
      static void
  source_callback(fname, cookie)
      char_u	*fname;
!     void	*cookie;
  {
      (void)do_source(fname, FALSE, DOSO_NONE);
  }
--- 2546,2555 ----
  
  static void source_callback __ARGS((char_u *fname, void *cookie));
  
      static void
  source_callback(fname, cookie)
      char_u	*fname;
!     void	*cookie UNUSED;
  {
      (void)do_source(fname, FALSE, DOSO_NONE);
  }
***************
*** 2680,2689 ****
  /*
   * ":options"
   */
- /*ARGSUSED*/
      void
  ex_options(eap)
!     exarg_T	*eap;
  {
      cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
  }
--- 2676,2684 ----
  /*
   * ":options"
   */
      void
  ex_options(eap)
!     exarg_T	*eap UNUSED;
  {
      cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
  }
***************
*** 3190,3199 ****
  /*
   * ":scriptnames"
   */
- /*ARGSUSED*/
      void
  ex_scriptnames(eap)
!     exarg_T	*eap;
  {
      int i;
  
--- 3185,3193 ----
  /*
   * ":scriptnames"
   */
      void
  ex_scriptnames(eap)
!     exarg_T	*eap UNUSED;
  {
      int i;
  
***************
*** 3317,3328 ****
   * Return a pointer to the line in allocated memory.
   * Return NULL for end-of-file or some error.
   */
- /* ARGSUSED */
      char_u *
  getsourceline(c, cookie, indent)
!     int		c;		/* not used */
      void	*cookie;
!     int		indent;		/* not used */
  {
      struct source_cookie *sp = (struct source_cookie *)cookie;
      char_u		*line;
--- 3311,3321 ----
   * Return a pointer to the line in allocated memory.
   * Return NULL for end-of-file or some error.
   */
      char_u *
  getsourceline(c, cookie, indent)
!     int		c UNUSED;
      void	*cookie;
!     int		indent UNUSED;
  {
      struct source_cookie *sp = (struct source_cookie *)cookie;
      char_u		*line;
***************
*** 3649,3658 ****
   * ":scriptencoding": Set encoding conversion for a sourced script.
   * Without the multi-byte feature it's simply ignored.
   */
- /*ARGSUSED*/
      void
  ex_scriptencoding(eap)
!     exarg_T	*eap;
  {
  #ifdef FEAT_MBYTE
      struct source_cookie	*sp;
--- 3642,3650 ----
   * ":scriptencoding": Set encoding conversion for a sourced script.
   * Without the multi-byte feature it's simply ignored.
   */
      void
  ex_scriptencoding(eap)
!     exarg_T	*eap UNUSED;
  {
  #ifdef FEAT_MBYTE
      struct source_cookie	*sp;
***************
*** 4101,4110 ****
   * Function given to ExpandGeneric() to obtain the possible arguments of the
   * ":language" command.
   */
- /*ARGSUSED*/
      char_u *
  get_lang_arg(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      if (idx == 0)
--- 4093,4101 ----
   * Function given to ExpandGeneric() to obtain the possible arguments of the
   * ":language" command.
   */
      char_u *
  get_lang_arg(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      if (idx == 0)
*** ../vim-7.2.172/src/version.c	2009-05-14 22:00:37.000000000 +0200
--- src/version.c	2009-05-14 22:14:51.000000000 +0200
***************
*** 1623,1632 ****
  /*
   * ":intro": clear screen, display intro screen and wait for return.
   */
- /*ARGSUSED*/
      void
  ex_intro(eap)
!     exarg_T	*eap;
  {
      screenclear();
      intro_message(TRUE);
--- 1625,1633 ----
  /*
   * ":intro": clear screen, display intro screen and wait for return.
   */
      void
  ex_intro(eap)
!     exarg_T	*eap UNUSED;
  {
      screenclear();
      intro_message(TRUE);
*** ../vim-7.2.172/src/vim.h	2009-05-13 18:54:14.000000000 +0200
--- src/vim.h	2009-05-14 21:17:51.000000000 +0200
***************
*** 262,267 ****
--- 262,275 ----
  # define __PARMS(x) __ARGS(x)
  #endif
  
+ /* Mark unused function arguments with UNUSED, so that gcc -Wunused-parameter
+  * can be used to check for mistakes. */
+ #ifdef HAVE_ATTRIBUTE_UNUSED
+ # define UNUSED __attribute__((unused))
+ #else
+ # define UNUSED
+ #endif
+ 
  /* if we're compiling in C++ (currently only KVim), the system
   * headers must have the correct prototypes or nothing will build.
   * conversely, our prototypes might clash due to throw() specifiers and
*** ../vim-7.2.172/src/version.c	2009-05-14 22:00:37.000000000 +0200
--- src/version.c	2009-05-14 22:14:51.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     173,
  /**/

-- 
SIGIRO -- irony detected (iron core dumped)

 /// 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    ///


--- NEW FILE 7.2.174 ---
To: vim-dev at vim.org
Subject: Patch 7.2.174
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.174
Problem:    Too many warnings from gcc -Wextra.
Solution:   Change initializer.  Add UNUSED.  Add type casts.
Files:      src/edit.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c,
            src/ex_getln.c, src/fileio.c, getchar.c, globals.h, main.c,
            memline.c, message.c, src/misc1.c, src/move.c, src/normal.c,
            src/option.c, src/os_unix.c, src/os_unix.h, src/regexp.c,
            src/search.c, src/tag.c


*** ../vim-7.2.173/src/edit.c	2009-05-14 22:19:19.000000000 +0200
--- src/edit.c	2009-05-15 21:06:07.000000000 +0200
***************
*** 8991,8997 ****
  	foldOpenCursor();
  #endif
      undisplay_dollar();
!     if (gchar_cursor() != NUL || virtual_active()
  	    )
      {
  	start_arrow(&curwin->w_cursor);
--- 8992,9001 ----
  	foldOpenCursor();
  #endif
      undisplay_dollar();
!     if (gchar_cursor() != NUL
! #ifdef FEAT_VIRTUALEDIT
! 	    || virtual_active()
! #endif
  	    )
      {
  	start_arrow(&curwin->w_cursor);
*** ../vim-7.2.173/src/eval.c	2009-04-22 16:07:57.000000000 +0200
--- src/eval.c	2009-05-15 21:18:08.000000000 +0200
***************
*** 8303,8312 ****
  /*
   * "argc()" function
   */
- /* ARGSUSED */
      static void
  f_argc(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
      rettv->vval.v_number = ARGCOUNT;
--- 8303,8311 ----
  /*
   * "argc()" function
   */
      static void
  f_argc(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
      rettv->vval.v_number = ARGCOUNT;
***************
*** 8315,8324 ****
  /*
   * "argidx()" function
   */
- /* ARGSUSED */
      static void
  f_argidx(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
      rettv->vval.v_number = curwin->w_arg_idx;
--- 8314,8322 ----
  /*
   * "argidx()" function
   */
      static void
  f_argidx(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
      rettv->vval.v_number = curwin->w_arg_idx;
***************
*** 8396,8405 ****
  /*
   * "browse(save, title, initdir, default)" function
   */
- /* ARGSUSED */
      static void
  f_browse(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
  #ifdef FEAT_BROWSE
--- 8394,8402 ----
  /*
   * "browse(save, title, initdir, default)" function
   */
      static void
  f_browse(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
  #ifdef FEAT_BROWSE
***************
*** 8431,8440 ****
  /*
   * "browsedir(title, initdir)" function
   */
- /* ARGSUSED */
      static void
  f_browsedir(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
  #ifdef FEAT_BROWSE
--- 8428,8436 ----
  /*
   * "browsedir(title, initdir)" function
   */
      static void
  f_browsedir(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
  #ifdef FEAT_BROWSE
***************
*** 8801,8810 ****
  /*
   * "changenr()" function
   */
- /*ARGSUSED*/
      static void
  f_changenr(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
      rettv->vval.v_number = curbuf->b_u_seq_cur;
--- 8797,8805 ----
  /*
   * "changenr()" function
   */
      static void
  f_changenr(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
      rettv->vval.v_number = curbuf->b_u_seq_cur;
***************
*** 8854,8863 ****
  /*
   * "clearmatches()" function
   */
- /*ARGSUSED*/
      static void
  f_clearmatches(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
  #ifdef FEAT_SEARCH_EXTRA
--- 8849,8857 ----
  /*
   * "clearmatches()" function
   */
      static void
  f_clearmatches(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
  #ifdef FEAT_SEARCH_EXTRA
*** ../vim-7.2.173/src/ex_cmds.c	2009-05-14 22:19:19.000000000 +0200
--- src/ex_cmds.c	2009-05-15 20:42:18.000000000 +0200
***************
*** 4040,4047 ****
--- 4040,4049 ----
  	bigness = curwin->w_height;
      else if (firstwin == lastwin)
  	bigness = curwin->w_p_scr * 2;
+ #ifdef FEAT_WINDOWS
      else
  	bigness = curwin->w_height - 3;
+ #endif
      if (bigness < 1)
  	bigness = 1;
  
*** ../vim-7.2.173/src/ex_docmd.c	2009-05-13 18:54:14.000000000 +0200
--- src/ex_docmd.c	2009-05-15 20:47:58.000000000 +0200
***************
*** 1578,1588 ****
   * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
   * "func".  * Otherwise return TRUE when "fgetline" equals "func".
   */
- /*ARGSUSED*/
      int
  getline_equal(fgetline, cookie, func)
      char_u	*(*fgetline) __ARGS((int, void *, int));
!     void	*cookie;		/* argument for fgetline() */
      char_u	*(*func) __ARGS((int, void *, int));
  {
  #ifdef FEAT_EVAL
--- 1578,1587 ----
   * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
   * "func".  * Otherwise return TRUE when "fgetline" equals "func".
   */
      int
  getline_equal(fgetline, cookie, func)
      char_u	*(*fgetline) __ARGS((int, void *, int));
!     void	*cookie UNUSED;		/* argument for fgetline() */
      char_u	*(*func) __ARGS((int, void *, int));
  {
  #ifdef FEAT_EVAL
***************
*** 1610,1619 ****
   * If "fgetline" is get_loop_line(), return the cookie used by the original
   * getline function.  Otherwise return "cookie".
   */
- /*ARGSUSED*/
      void *
  getline_cookie(fgetline, cookie)
!     char_u	*(*fgetline) __ARGS((int, void *, int));
      void	*cookie;		/* argument for fgetline() */
  {
  # ifdef FEAT_EVAL
--- 1609,1617 ----
   * If "fgetline" is get_loop_line(), return the cookie used by the original
   * getline function.  Otherwise return "cookie".
   */
      void *
  getline_cookie(fgetline, cookie)
!     char_u	*(*fgetline) __ARGS((int, void *, int)) UNUSED;
      void	*cookie;		/* argument for fgetline() */
  {
  # ifdef FEAT_EVAL
***************
*** 2754,2764 ****
   * "full" is set to TRUE if the whole command name matched.
   * Returns NULL for an ambiguous user command.
   */
- /*ARGSUSED*/
      static char_u *
  find_command(eap, full)
      exarg_T	*eap;
!     int		*full;
  {
      int		len;
      char_u	*p;
--- 2752,2761 ----
   * "full" is set to TRUE if the whole command name matched.
   * Returns NULL for an ambiguous user command.
   */
      static char_u *
  find_command(eap, full)
      exarg_T	*eap;
!     int		*full UNUSED;
  {
      int		len;
      char_u	*p;
***************
*** 5053,5062 ****
  /*
   * Function given to ExpandGeneric() to obtain the list of command names.
   */
- /*ARGSUSED*/
      char_u *
  get_command_name(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      if (idx >= (int)CMD_SIZE)
--- 5050,5058 ----
  /*
   * Function given to ExpandGeneric() to obtain the list of command names.
   */
      char_u *
  get_command_name(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      if (idx >= (int)CMD_SIZE)
***************
*** 5573,5582 ****
   * ":comclear"
   * Clear all user commands, global and for current buffer.
   */
- /*ARGSUSED*/
      void
  ex_comclear(eap)
!     exarg_T	*eap;
  {
      uc_clear(&ucmds);
      uc_clear(&curbuf->b_ucmds);
--- 5569,5577 ----
   * ":comclear"
   * Clear all user commands, global and for current buffer.
   */
      void
  ex_comclear(eap)
!     exarg_T	*eap UNUSED;
  {
      uc_clear(&ucmds);
      uc_clear(&curbuf->b_ucmds);
***************
*** 6072,6081 ****
  /*
   * Function given to ExpandGeneric() to obtain the list of user command names.
   */
- /*ARGSUSED*/
      char_u *
  get_user_commands(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      if (idx < curbuf->b_ucmds.ga_len)
--- 6067,6075 ----
  /*
   * Function given to ExpandGeneric() to obtain the list of user command names.
   */
      char_u *
  get_user_commands(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      if (idx < curbuf->b_ucmds.ga_len)
***************
*** 6090,6099 ****
   * Function given to ExpandGeneric() to obtain the list of user command
   * attributes.
   */
- /*ARGSUSED*/
      char_u *
  get_user_cmd_flags(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      static char *user_cmd_flags[] =
--- 6084,6092 ----
   * Function given to ExpandGeneric() to obtain the list of user command
   * attributes.
   */
      char_u *
  get_user_cmd_flags(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      static char *user_cmd_flags[] =
***************
*** 6108,6117 ****
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -nargs.
   */
- /*ARGSUSED*/
      char_u *
  get_user_cmd_nargs(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
--- 6101,6109 ----
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -nargs.
   */
      char_u *
  get_user_cmd_nargs(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
***************
*** 6124,6133 ****
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -complete.
   */
- /*ARGSUSED*/
      char_u *
  get_user_cmd_complete(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      return (char_u *)command_complete[idx].name;
--- 6116,6124 ----
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -complete.
   */
      char_u *
  get_user_cmd_complete(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      return (char_u *)command_complete[idx].name;
***************
*** 6305,6314 ****
  /*
   * ":cquit".
   */
- /*ARGSUSED*/
      static void
  ex_cquit(eap)
!     exarg_T	*eap;
  {
      getout(1);	/* this does not always pass on the exit code to the Manx
  		   compiler. why? */
--- 6296,6304 ----
  /*
   * ":cquit".
   */
      static void
  ex_cquit(eap)
!     exarg_T	*eap UNUSED;
  {
      getout(1);	/* this does not always pass on the exit code to the Manx
  		   compiler. why? */
***************
*** 6750,6759 ****
  /*
   * ":shell".
   */
- /*ARGSUSED*/
      static void
  ex_shell(eap)
!     exarg_T	*eap;
  {
      do_shell(NULL, 0);
  }
--- 6740,6748 ----
  /*
   * ":shell".
   */
      static void
  ex_shell(eap)
!     exarg_T	*eap UNUSED;
  {
      do_shell(NULL, 0);
  }
***************
*** 7057,7066 ****
  /*
   * ":preserve".
   */
- /*ARGSUSED*/
      static void
  ex_preserve(eap)
!     exarg_T	*eap;
  {
      curbuf->b_flags |= BF_PRESERVED;
      ml_preserve(curbuf, TRUE);
--- 7046,7054 ----
  /*
   * ":preserve".
   */
      static void
  ex_preserve(eap)
!     exarg_T	*eap UNUSED;
  {
      curbuf->b_flags |= BF_PRESERVED;
      ml_preserve(curbuf, TRUE);
***************
*** 7292,7301 ****
  /*
   * :tabs command: List tabs and their contents.
   */
- /*ARGSUSED*/
      static void
  ex_tabs(eap)
!     exarg_T	*eap;
  {
      tabpage_T	*tp;
      win_T	*wp;
--- 7280,7288 ----
  /*
   * :tabs command: List tabs and their contents.
   */
      static void
  ex_tabs(eap)
!     exarg_T	*eap UNUSED;
  {
      tabpage_T	*tp;
      win_T	*wp;
***************
*** 7482,7488 ****
  /*
   * ":edit <file>" command and alikes.
   */
- /*ARGSUSED*/
      void
  do_exedit(eap, old_curwin)
      exarg_T	*eap;
--- 7469,7474 ----
***************
*** 7694,7703 ****
  }
  #endif
  
- /*ARGSUSED*/
      static void
  ex_swapname(eap)
!     exarg_T	*eap;
  {
      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
  	MSG(_("No swap file"));
--- 7680,7688 ----
  }
  #endif
  
      static void
  ex_swapname(eap)
!     exarg_T	*eap UNUSED;
  {
      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
  	MSG(_("No swap file"));
***************
*** 7710,7719 ****
   * offset.
   * (1998-11-02 16:21:01  R. Edward Ralston <eralston at computer.org>)
   */
- /*ARGSUSED*/
      static void
  ex_syncbind(eap)
!     exarg_T	*eap;
  {
  #ifdef FEAT_SCROLLBIND
      win_T	*wp;
--- 7695,7703 ----
   * offset.
   * (1998-11-02 16:21:01  R. Edward Ralston <eralston at computer.org>)
   */
      static void
  ex_syncbind(eap)
!     exarg_T	*eap UNUSED;
  {
  #ifdef FEAT_SCROLLBIND
      win_T	*wp;
***************
*** 7983,7992 ****
  /*
   * ":pwd".
   */
- /*ARGSUSED*/
      static void
  ex_pwd(eap)
!     exarg_T	*eap;
  {
      if (mch_dirname(NameBuff, MAXPATHL) == OK)
      {
--- 7967,7975 ----
  /*
   * ":pwd".
   */
      static void
  ex_pwd(eap)
!     exarg_T	*eap UNUSED;
  {
      if (mch_dirname(NameBuff, MAXPATHL) == OK)
      {
***************
*** 8417,8426 ****
  /*
   * ":undo".
   */
- /*ARGSUSED*/
      static void
  ex_undo(eap)
!     exarg_T	*eap;
  {
      if (eap->addr_count == 1)	    /* :undo 123 */
  	undo_time(eap->line2, FALSE, TRUE);
--- 8400,8408 ----
  /*
   * ":undo".
   */
      static void
  ex_undo(eap)
!     exarg_T	*eap UNUSED;
  {
      if (eap->addr_count == 1)	    /* :undo 123 */
  	undo_time(eap->line2, FALSE, TRUE);
***************
*** 8431,8440 ****
  /*
   * ":redo".
   */
- /*ARGSUSED*/
      static void
  ex_redo(eap)
!     exarg_T	*eap;
  {
      u_redo(1);
  }
--- 8413,8421 ----
  /*
   * ":redo".
   */
      static void
  ex_redo(eap)
!     exarg_T	*eap UNUSED;
  {
      u_redo(1);
  }
***************
*** 8442,8448 ****
  /*
   * ":earlier" and ":later".
   */
- /*ARGSUSED*/
      static void
  ex_later(eap)
      exarg_T	*eap;
--- 8423,8428 ----
***************
*** 8627,8636 ****
  /*
   * ":redrawstatus": force redraw of status line(s)
   */
- /*ARGSUSED*/
      static void
  ex_redrawstatus(eap)
!     exarg_T	*eap;
  {
  #if defined(FEAT_WINDOWS)
      int		r = RedrawingDisabled;
--- 8607,8615 ----
  /*
   * ":redrawstatus": force redraw of status line(s)
   */
      static void
  ex_redrawstatus(eap)
!     exarg_T	*eap UNUSED;
  {
  #if defined(FEAT_WINDOWS)
      int		r = RedrawingDisabled;
***************
*** 8891,8901 ****
  
  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
  	|| defined(PROTO)
- /*ARGSUSED*/
      int
  vim_mkdir_emsg(name, prot)
      char_u	*name;
!     int		prot;
  {
      if (vim_mkdir(name, prot) != 0)
      {
--- 8870,8879 ----
  
  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
  	|| defined(PROTO)
      int
  vim_mkdir_emsg(name, prot)
      char_u	*name;
!     int		prot UNUSED;
  {
      if (vim_mkdir(name, prot) != 0)
      {
***************
*** 10968,10977 ****
  }
  #endif
  
- /*ARGSUSED*/
      static void
  ex_digraphs(eap)
!     exarg_T	*eap;
  {
  #ifdef FEAT_DIGRAPHS
      if (*eap->arg != NUL)
--- 10946,10954 ----
  }
  #endif
  
      static void
  ex_digraphs(eap)
!     exarg_T	*eap UNUSED;
  {
  #ifdef FEAT_DIGRAPHS
      if (*eap->arg != NUL)
***************
*** 11005,11014 ****
  /*
   * ":nohlsearch"
   */
- /*ARGSUSED*/
      static void
  ex_nohlsearch(eap)
!     exarg_T	*eap;
  {
      no_hlsearch = TRUE;
      redraw_all_later(SOME_VALID);
--- 10982,10990 ----
  /*
   * ":nohlsearch"
   */
      static void
  ex_nohlsearch(eap)
!     exarg_T	*eap UNUSED;
  {
      no_hlsearch = TRUE;
      redraw_all_later(SOME_VALID);
***************
*** 11087,11096 ****
  /*
   * ":X": Get crypt key
   */
- /*ARGSUSED*/
      static void
  ex_X(eap)
!     exarg_T	*eap;
  {
      (void)get_crypt_key(TRUE, TRUE);
  }
--- 11063,11071 ----
  /*
   * ":X": Get crypt key
   */
      static void
  ex_X(eap)
!     exarg_T	*eap UNUSED;
  {
      (void)get_crypt_key(TRUE, TRUE);
  }
*** ../vim-7.2.173/src/ex_getln.c	2009-04-29 18:44:38.000000000 +0200
--- src/ex_getln.c	2009-05-15 20:49:22.000000000 +0200
***************
*** 140,150 ****
   * Return pointer to allocated string if there is a commandline, NULL
   * otherwise.
   */
- /*ARGSUSED*/
      char_u *
  getcmdline(firstc, count, indent)
      int		firstc;
!     long	count;		/* only used for incremental search */
      int		indent;		/* indent for inside conditionals */
  {
      int		c;
--- 140,149 ----
   * Return pointer to allocated string if there is a commandline, NULL
   * otherwise.
   */
      char_u *
  getcmdline(firstc, count, indent)
      int		firstc;
!     long	count UNUSED;	/* only used for incremental search */
      int		indent;		/* indent for inside conditionals */
  {
      int		c;
***************
*** 2113,2123 ****
  /*
   * Get an Ex command line for the ":" command.
   */
- /* ARGSUSED */
      char_u *
! getexline(c, dummy, indent)
      int		c;		/* normally ':', NUL for ":append" */
!     void	*dummy;		/* cookie not used */
      int		indent;		/* indent for inside conditionals */
  {
      /* When executing a register, remove ':' that's in front of each line. */
--- 2112,2121 ----
  /*
   * Get an Ex command line for the ":" command.
   */
      char_u *
! getexline(c, cookie, indent)
      int		c;		/* normally ':', NUL for ":append" */
!     void	*cookie UNUSED;
      int		indent;		/* indent for inside conditionals */
  {
      /* When executing a register, remove ':' that's in front of each line. */
***************
*** 2132,2143 ****
   * mappings or abbreviations.
   * Returns a string in allocated memory or NULL.
   */
- /* ARGSUSED */
      char_u *
! getexmodeline(promptc, dummy, indent)
      int		promptc;	/* normally ':', NUL for ":append" and '?' for
  				   :s prompt */
!     void	*dummy;		/* cookie not used */
      int		indent;		/* indent for inside conditionals */
  {
      garray_T	line_ga;
--- 2130,2140 ----
   * mappings or abbreviations.
   * Returns a string in allocated memory or NULL.
   */
      char_u *
! getexmodeline(promptc, cookie, indent)
      int		promptc;	/* normally ':', NUL for ":append" and '?' for
  				   :s prompt */
!     void	*cookie UNUSED;
      int		indent;		/* indent for inside conditionals */
  {
      garray_T	line_ga;
***************
*** 3832,3842 ****
   * Returns EXPAND_NOTHING when the character that triggered expansion should
   * be inserted like a normal character.
   */
- /*ARGSUSED*/
      static int
  showmatches(xp, wildmenu)
      expand_T	*xp;
!     int		wildmenu;
  {
  #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])
      int		num_files;
--- 3829,3838 ----
   * Returns EXPAND_NOTHING when the character that triggered expansion should
   * be inserted like a normal character.
   */
      static int
  showmatches(xp, wildmenu)
      expand_T	*xp;
!     int		wildmenu UNUSED;
  {
  #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])
      int		num_files;
*** ../vim-7.2.173/src/fileio.c	2009-05-13 20:47:07.000000000 +0200
--- src/fileio.c	2009-05-15 20:52:40.000000000 +0200
***************
*** 3498,3504 ****
  		    if (mch_stat((char *)IObuff, &st) < 0
  			    || st.st_uid != st_old.st_uid
  			    || st.st_gid != st_old.st_gid
! 			    || st.st_mode != perm)
  			backup_copy = TRUE;
  # endif
  		    /* Close the file before removing it, on MS-Windows we
--- 3498,3504 ----
  		    if (mch_stat((char *)IObuff, &st) < 0
  			    || st.st_uid != st_old.st_uid
  			    || st.st_gid != st_old.st_gid
! 			    || (long)st.st_mode != perm)
  			backup_copy = TRUE;
  # endif
  		    /* Close the file before removing it, on MS-Windows we
***************
*** 5963,5969 ****
  	else if (*ext == '.')
  #endif
  	{
! 	    if (s - ptr > (size_t)8)
  	    {
  		s = ptr + 8;
  		*s = '\0';
--- 5971,5977 ----
  	else if (*ext == '.')
  #endif
  	{
! 	    if ((size_t)(s - ptr) > (size_t)8)
  	    {
  		s = ptr + 8;
  		*s = '\0';
***************
*** 6460,6470 ****
   * return 2 if a message has been displayed.
   * return 0 otherwise.
   */
- /*ARGSUSED*/
      int
  buf_check_timestamp(buf, focus)
      buf_T	*buf;
!     int		focus;		/* called for GUI focus event */
  {
      struct stat	st;
      int		stat_res;
--- 6468,6477 ----
   * return 2 if a message has been displayed.
   * return 0 otherwise.
   */
      int
  buf_check_timestamp(buf, focus)
      buf_T	*buf;
!     int		focus UNUSED;	/* called for GUI focus event */
  {
      struct stat	st;
      int		stat_res;
***************
*** 6868,6879 ****
      /* Careful: autocommands may have made "buf" invalid! */
  }
  
- /*ARGSUSED*/
      void
  buf_store_time(buf, st, fname)
      buf_T	*buf;
      struct stat	*st;
!     char_u	*fname;
  {
      buf->b_mtime = (long)st->st_mtime;
      buf->b_orig_size = (size_t)st->st_size;
--- 6875,6885 ----
      /* Careful: autocommands may have made "buf" invalid! */
  }
  
      void
  buf_store_time(buf, st, fname)
      buf_T	*buf;
      struct stat	*st;
!     char_u	*fname UNUSED;
  {
      buf->b_mtime = (long)st->st_mtime;
      buf->b_orig_size = (size_t)st->st_size;
***************
*** 6936,6945 ****
   * The returned pointer is to allocated memory.
   * The returned pointer is NULL if no valid name was found.
   */
- /*ARGSUSED*/
      char_u  *
  vim_tempname(extra_char)
!     int	    extra_char;	    /* character to use in the name instead of '?' */
  {
  #ifdef USE_TMPNAM
      char_u	itmp[L_tmpnam];	/* use tmpnam() */
--- 6942,6950 ----
   * The returned pointer is to allocated memory.
   * The returned pointer is NULL if no valid name was found.
   */
      char_u  *
  vim_tempname(extra_char)
!     int	    extra_char UNUSED;  /* char to use in the name instead of '?' */
  {
  #ifdef USE_TMPNAM
      char_u	itmp[L_tmpnam];	/* use tmpnam() */
***************
*** 6968,6974 ****
  	/*
  	 * Try the entries in TEMPDIRNAMES to create the temp directory.
  	 */
! 	for (i = 0; i < sizeof(tempdirs) / sizeof(char *); ++i)
  	{
  	    /* expand $TMP, leave room for "/v1100000/999999999" */
  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
--- 6973,6979 ----
  	/*
  	 * Try the entries in TEMPDIRNAMES to create the temp directory.
  	 */
! 	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
  	{
  	    /* expand $TMP, leave room for "/v1100000/999999999" */
  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
***************
*** 9588,9600 ****
   *
   * Returns NULL when out of memory.
   */
- /*ARGSUSED*/
      char_u *
  file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
      char_u	*pat;
      char_u	*pat_end;	/* first char after pattern or NULL */
      char	*allow_dirs;	/* Result passed back out in here */
!     int		no_bslash;	/* Don't use a backward slash as pathsep */
  {
      int		size;
      char_u	*endp;
--- 9593,9604 ----
   *
   * Returns NULL when out of memory.
   */
      char_u *
  file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
      char_u	*pat;
      char_u	*pat_end;	/* first char after pattern or NULL */
      char	*allow_dirs;	/* Result passed back out in here */
!     int		no_bslash UNUSED; /* Don't use a backward slash as pathsep */
  {
      int		size;
      char_u	*endp;
*** ../vim-7.2.173/src/misc1.c	2009-04-29 11:00:09.000000000 +0200
--- src/misc1.c	2009-05-15 20:59:08.000000000 +0200
***************
*** 2188,2199 ****
   *
   * return FAIL for failure, OK otherwise
   */
- /*ARGSUSED*/
      int
  del_bytes(count, fixpos_arg, use_delcombine)
      long	count;
      int		fixpos_arg;
!     int		use_delcombine;	    /* 'delcombine' option applies */
  {
      char_u	*oldp, *newp;
      colnr_T	oldlen;
--- 2188,2198 ----
   *
   * return FAIL for failure, OK otherwise
   */
      int
  del_bytes(count, fixpos_arg, use_delcombine)
      long	count;
      int		fixpos_arg;
!     int		use_delcombine UNUSED;	    /* 'delcombine' option applies */
  {
      char_u	*oldp, *newp;
      colnr_T	oldlen;
*** ../vim-7.2.173/src/move.c	2008-11-15 16:05:30.000000000 +0100
--- src/move.c	2009-05-15 21:00:06.000000000 +0200
***************
*** 1238,1248 ****
  /*
   * Scroll the current window down by "line_count" logical lines.  "CTRL-Y"
   */
- /*ARGSUSED*/
      void
  scrolldown(line_count, byfold)
      long	line_count;
!     int		byfold;		/* TRUE: count a closed fold as one line */
  {
      long	done = 0;	/* total # of physical lines done */
      int		wrow;
--- 1238,1247 ----
  /*
   * Scroll the current window down by "line_count" logical lines.  "CTRL-Y"
   */
      void
  scrolldown(line_count, byfold)
      long	line_count;
!     int		byfold UNUSED;	/* TRUE: count a closed fold as one line */
  {
      long	done = 0;	/* total # of physical lines done */
      int		wrow;
***************
*** 1349,1359 ****
  /*
   * Scroll the current window up by "line_count" logical lines.  "CTRL-E"
   */
- /*ARGSUSED*/
      void
  scrollup(line_count, byfold)
      long	line_count;
!     int		byfold;		/* TRUE: count a closed fold as one line */
  {
  #if defined(FEAT_FOLDING) || defined(FEAT_DIFF)
      linenr_T	lnum;
--- 1348,1357 ----
  /*
   * Scroll the current window up by "line_count" logical lines.  "CTRL-E"
   */
      void
  scrollup(line_count, byfold)
      long	line_count;
!     int		byfold UNUSED;	/* TRUE: count a closed fold as one line */
  {
  #if defined(FEAT_FOLDING) || defined(FEAT_DIFF)
      linenr_T	lnum;
*** ../vim-7.2.173/src/normal.c	2009-04-29 17:39:17.000000000 +0200
--- src/normal.c	2009-05-15 21:08:07.000000000 +0200
***************
*** 493,506 ****
      int		i;
  
      /* Fill the index table with a one to one relation. */
!     for (i = 0; i < NV_CMDS_SIZE; ++i)
  	nv_cmd_idx[i] = i;
  
      /* Sort the commands by the command character.  */
      qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare);
  
      /* Find the first entry that can't be indexed by the command character. */
!     for (i = 0; i < NV_CMDS_SIZE; ++i)
  	if (i != nv_cmds[nv_cmd_idx[i]].cmd_char)
  	    break;
      nv_max_linear = i - 1;
--- 493,506 ----
      int		i;
  
      /* Fill the index table with a one to one relation. */
!     for (i = 0; i < (int)NV_CMDS_SIZE; ++i)
  	nv_cmd_idx[i] = i;
  
      /* Sort the commands by the command character.  */
      qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare);
  
      /* Find the first entry that can't be indexed by the command character. */
!     for (i = 0; i < (int)NV_CMDS_SIZE; ++i)
  	if (i != nv_cmds[nv_cmd_idx[i]].cmd_char)
  	    break;
      nv_max_linear = i - 1;
***************
*** 561,571 ****
  /*
   * Execute a command in Normal mode.
   */
- /*ARGSUSED*/
      void
  normal_cmd(oap, toplevel)
      oparg_T	*oap;
!     int		toplevel;		/* TRUE when called from main() */
  {
      cmdarg_T	ca;			/* command arguments */
      int		c;
--- 561,570 ----
  /*
   * Execute a command in Normal mode.
   */
      void
  normal_cmd(oap, toplevel)
      oparg_T	*oap;
!     int		toplevel UNUSED;	/* TRUE when called from main() */
  {
      cmdarg_T	ca;			/* command arguments */
      int		c;
***************
*** 2188,2197 ****
  /*
   * Handle the "g@" operator: call 'operatorfunc'.
   */
- /*ARGSUSED*/
      static void
  op_function(oap)
!     oparg_T	*oap;
  {
  #ifdef FEAT_EVAL
      char_u	*(argv[1]);
--- 2187,2195 ----
  /*
   * Handle the "g@" operator: call 'operatorfunc'.
   */
      static void
  op_function(oap)
!     oparg_T	*oap UNUSED;
  {
  #ifdef FEAT_EVAL
      char_u	*(argv[1]);
***************
*** 4100,4109 ****
   * Command character that doesn't do anything, but unlike nv_ignore() does
   * start edit().  Used for "startinsert" executed while starting up.
   */
- /*ARGSUSED */
      static void
  nv_nop(cap)
!     cmdarg_T	*cap;
  {
  }
  
--- 4098,4106 ----
   * Command character that doesn't do anything, but unlike nv_ignore() does
   * start edit().  Used for "startinsert" executed while starting up.
   */
      static void
  nv_nop(cap)
!     cmdarg_T	*cap UNUSED;
  {
  }
  
***************
*** 5241,5247 ****
  	if (cap->oap->op_type != OP_NOP
  		&& (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
  		    || cap->oap->start.col >
! 					 STRLEN(ml_get(cap->oap->start.lnum))))
  	    clearopbeep(cap->oap);
      }
  }
--- 5238,5244 ----
  	if (cap->oap->op_type != OP_NOP
  		&& (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
  		    || cap->oap->start.col >
! 			       (colnr_T)STRLEN(ml_get(cap->oap->start.lnum))))
  	    clearopbeep(cap->oap);
      }
  }
***************
*** 5816,5822 ****
      for (n = cap->count1; n > 0; --n)
      {
  	if ((!PAST_LINE && oneright() == FAIL)
! 		|| (PAST_LINE && *ml_get_cursor() == NUL))
  	{
  	    /*
  	     *	  <Space> wraps to next line if 'whichwrap' has 's'.
--- 5813,5822 ----
      for (n = cap->count1; n > 0; --n)
      {
  	if ((!PAST_LINE && oneright() == FAIL)
! #ifdef FEAT_VISUAL
! 		|| (PAST_LINE && *ml_get_cursor() == NUL)
! #endif
! 		)
  	{
  	    /*
  	     *	  <Space> wraps to next line if 'whichwrap' has 's'.
*** ../vim-7.2.173/src/option.c	2009-03-18 15:40:03.000000000 +0100
--- src/option.c	2009-05-15 21:08:50.000000000 +0200
***************
*** 5302,5315 ****
   * When "set_sid" is zero set the scriptID to current_SID.  When "set_sid" is
   * SID_NONE don't set the scriptID.  Otherwise set the scriptID to "set_sid".
   */
- /*ARGSUSED*/
      void
  set_string_option_direct(name, opt_idx, val, opt_flags, set_sid)
      char_u	*name;
      int		opt_idx;
      char_u	*val;
      int		opt_flags;	/* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
!     int		set_sid;
  {
      char_u	*s;
      char_u	**varp;
--- 5302,5314 ----
   * When "set_sid" is zero set the scriptID to current_SID.  When "set_sid" is
   * SID_NONE don't set the scriptID.  Otherwise set the scriptID to "set_sid".
   */
      void
  set_string_option_direct(name, opt_idx, val, opt_flags, set_sid)
      char_u	*name;
      int		opt_idx;
      char_u	*val;
      int		opt_flags;	/* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
!     int		set_sid UNUSED;
  {
      char_u	*s;
      char_u	**varp;
***************
*** 9357,9366 ****
  /*
   * Check for NULL pointers in a winopt_T and replace them with empty_option.
   */
- /*ARGSUSED*/
      void
  check_winopt(wop)
!     winopt_T	*wop;
  {
  #ifdef FEAT_FOLDING
      check_string_option(&wop->wo_fdi);
--- 9356,9364 ----
  /*
   * Check for NULL pointers in a winopt_T and replace them with empty_option.
   */
      void
  check_winopt(wop)
!     winopt_T	*wop UNUSED;
  {
  #ifdef FEAT_FOLDING
      check_string_option(&wop->wo_fdi);
***************
*** 9382,9391 ****
  /*
   * Free the allocated memory inside a winopt_T.
   */
- /*ARGSUSED*/
      void
  clear_winopt(wop)
!     winopt_T	*wop;
  {
  #ifdef FEAT_FOLDING
      clear_string_option(&wop->wo_fdi);
--- 9380,9388 ----
  /*
   * Free the allocated memory inside a winopt_T.
   */
      void
  clear_winopt(wop)
!     winopt_T	*wop UNUSED;
  {
  #ifdef FEAT_FOLDING
      clear_string_option(&wop->wo_fdi);
*** ../vim-7.2.173/src/os_unix.c	2009-05-13 12:46:36.000000000 +0200
--- src/os_unix.c	2009-05-15 21:13:43.000000000 +0200
***************
*** 458,467 ****
   * Return total amount of memory available in Kbyte.
   * Doesn't change when memory has been allocated.
   */
- /* ARGSUSED */
      long_u
  mch_total_mem(special)
!     int special;
  {
  # ifdef __EMX__
      return ulimit(3, 0L) >> 10;   /* always 32MB? */
--- 458,466 ----
   * Return total amount of memory available in Kbyte.
   * Doesn't change when memory has been allocated.
   */
      long_u
  mch_total_mem(special)
!     int special UNUSED;
  {
  # ifdef __EMX__
      return ulimit(3, 0L) >> 10;   /* always 32MB? */
***************
*** 815,821 ****
   * Let me try it with a few tricky defines from my own osdef.h	(jw).
   */
  #if defined(SIGWINCH)
- /* ARGSUSED */
      static RETSIGTYPE
  sig_winch SIGDEFARG(sigarg)
  {
--- 814,819 ----
***************
*** 1355,1365 ****
  /*
   * Check_win checks whether we have an interactive stdout.
   */
- /* ARGSUSED */
      int
  mch_check_win(argc, argv)
!     int	    argc;
!     char    **argv;
  {
  #ifdef OS2
      /*
--- 1353,1362 ----
  /*
   * Check_win checks whether we have an interactive stdout.
   */
      int
  mch_check_win(argc, argv)
!     int	    argc UNUSED;
!     char    **argv UNUSED;
  {
  #ifdef OS2
      /*
***************
*** 2467,2473 ****
      }
  
      /* Catch file names which are too long. */
!     if (retval == FAIL || STRLEN(buf) + STRLEN(fname) >= len)
  	return FAIL;
  
      /* Do not append ".", "/dir/." is equal to "/dir". */
--- 2464,2470 ----
      }
  
      /* Catch file names which are too long. */
!     if (retval == FAIL || (int)(STRLEN(buf) + STRLEN(fname)) >= len)
  	return FAIL;
  
      /* Do not append ".", "/dir/." is equal to "/dir". */
***************
*** 2686,2692 ****
   */
      vim_acl_T
  mch_get_acl(fname)
!     char_u	*fname;
  {
      vim_acl_T	ret = NULL;
  #ifdef HAVE_POSIX_ACL
--- 2683,2689 ----
   */
      vim_acl_T
  mch_get_acl(fname)
!     char_u	*fname UNUSED;
  {
      vim_acl_T	ret = NULL;
  #ifdef HAVE_POSIX_ACL
***************
*** 2746,2752 ****
   */
      void
  mch_set_acl(fname, aclent)
!     char_u	*fname;
      vim_acl_T	aclent;
  {
      if (aclent == NULL)
--- 2743,2749 ----
   */
      void
  mch_set_acl(fname, aclent)
!     char_u	*fname UNUSED;
      vim_acl_T	aclent;
  {
      if (aclent == NULL)
***************
*** 2789,2798 ****
  /*
   * Set hidden flag for "name".
   */
- /* ARGSUSED */
      void
  mch_hide(name)
!     char_u	*name;
  {
      /* can't hide a file */
  }
--- 2786,2794 ----
  /*
   * Set hidden flag for "name".
   */
      void
  mch_hide(name)
!     char_u	*name UNUSED;
  {
      /* can't hide a file */
  }
***************
*** 3481,3490 ****
  /*
   * set screen mode, always fails.
   */
- /* ARGSUSED */
      int
  mch_screenmode(arg)
!     char_u   *arg;
  {
      EMSG(_(e_screenmode));
      return FAIL;
--- 3477,3485 ----
  /*
   * set screen mode, always fails.
   */
      int
  mch_screenmode(arg)
!     char_u   *arg UNUSED;
  {
      EMSG(_(e_screenmode));
      return FAIL;
***************
*** 4189,4197 ****
  			    {
  				s = vim_strchr(lp + written, NL);
  				len = write(toshell_fd, (char *)lp + written,
! 					   s == NULL ? l : s - (lp + written));
  			    }
! 			    if (len == l)
  			    {
  				/* Finished a line, add a NL, unless this line
  				 * should not have one. */
--- 4184,4193 ----
  			    {
  				s = vim_strchr(lp + written, NL);
  				len = write(toshell_fd, (char *)lp + written,
! 					   s == NULL ? l
! 					      : (size_t)(s - (lp + written)));
  			    }
! 			    if (len == (int)l)
  			    {
  				/* Finished a line, add a NL, unless this line
  				 * should not have one. */
***************
*** 4746,4752 ****
   * Returns also, when a request from Sniff is waiting -- toni.
   * Or when a Linux GPM mouse event is waiting.
   */
- /* ARGSUSED */
  #if defined(__BEOS__)
      int
  #else
--- 4742,4747 ----
***************
*** 4755,4761 ****
  RealWaitForChar(fd, msec, check_for_gpm)
      int		fd;
      long	msec;
!     int		*check_for_gpm;
  {
      int		ret;
  #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
--- 4750,4756 ----
  RealWaitForChar(fd, msec, check_for_gpm)
      int		fd;
      long	msec;
!     int		*check_for_gpm UNUSED;
  {
      int		ret;
  #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
***************
*** 5572,5578 ****
      i = fread((char *)buffer, 1, len, fd);
      fclose(fd);
      mch_remove(tempname);
!     if (i != len)
      {
  	/* unexpected read error */
  	EMSG2(_(e_notread), tempname);
--- 5567,5573 ----
      i = fread((char *)buffer, 1, len, fd);
      fclose(fd);
      mch_remove(tempname);
!     if (i != (int)len)
      {
  	/* unexpected read error */
  	EMSG2(_(e_notread), tempname);
***************
*** 5633,5639 ****
  	if (shell_style == STYLE_PRINT && !did_find_nul)
  	{
  	    /* If there is a NUL, set did_find_nul, else set check_spaces */
! 	    if (len && (int)STRLEN(buffer) < len - 1)
  		did_find_nul = TRUE;
  	    else
  		check_spaces = TRUE;
--- 5628,5634 ----
  	if (shell_style == STYLE_PRINT && !did_find_nul)
  	{
  	    /* If there is a NUL, set did_find_nul, else set check_spaces */
! 	    if (len && (int)STRLEN(buffer) < (int)len - 1)
  		did_find_nul = TRUE;
  	    else
  		check_spaces = TRUE;
*** ../vim-7.2.173/src/os_unix.h	2009-05-13 12:46:36.000000000 +0200
--- src/os_unix.h	2009-05-15 21:10:31.000000000 +0200
***************
*** 126,132 ****
  #  define SIGDUMMYARG	0, 0, (struct sigcontext *)0
  # else
  #  define SIGPROTOARG	(int)
! #  define SIGDEFARG(s)	(s) int s;
  #  define SIGDUMMYARG	0
  # endif
  #else
--- 126,132 ----
  #  define SIGDUMMYARG	0, 0, (struct sigcontext *)0
  # else
  #  define SIGPROTOARG	(int)
! #  define SIGDEFARG(s)	(s) int s UNUSED;
  #  define SIGDUMMYARG	0
  # endif
  #else
*** ../vim-7.2.173/src/regexp.c	2009-02-21 22:03:06.000000000 +0100
--- src/regexp.c	2009-05-15 21:14:18.000000000 +0200
***************
*** 471,477 ****
  
      if ((*pp)[1] == ':')
      {
! 	for (i = 0; i < sizeof(class_names) / sizeof(*class_names); ++i)
  	    if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0)
  	    {
  		*pp += STRLEN(class_names[i]) + 2;
--- 471,477 ----
  
      if ((*pp)[1] == ':')
      {
! 	for (i = 0; i < (int)(sizeof(class_names) / sizeof(*class_names)); ++i)
  	    if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0)
  	    {
  		*pp += STRLEN(class_names[i]) + 2;
***************
*** 3362,3373 ****
   * Match a regexp against a string ("line" points to the string) or multiple
   * lines ("line" is NULL, use reg_getline()).
   */
- /*ARGSUSED*/
      static long
  vim_regexec_both(line, col, tm)
      char_u	*line;
      colnr_T	col;		/* column to start looking for match */
!     proftime_T	*tm;		/* timeout limit or NULL */
  {
      regprog_T	*prog;
      char_u	*s;
--- 3362,3372 ----
   * Match a regexp against a string ("line" points to the string) or multiple
   * lines ("line" is NULL, use reg_getline()).
   */
      static long
  vim_regexec_both(line, col, tm)
      char_u	*line;
      colnr_T	col;		/* column to start looking for match */
!     proftime_T	*tm UNUSED;	/* timeout limit or NULL */
  {
      regprog_T	*prog;
      char_u	*s;
*** ../vim-7.2.173/src/search.c	2009-04-22 18:43:06.000000000 +0200
--- src/search.c	2009-05-15 21:16:36.000000000 +0200
***************
*** 522,528 ****
   * When FEAT_EVAL is defined, returns the index of the first matching
   * subpattern plus one; one if there was none.
   */
- /*ARGSUSED*/
      int
  searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
      win_T	*win;		/* window to search in; can be NULL for a
--- 522,527 ----
***************
*** 535,541 ****
      int		options;
      int		pat_use;	/* which pattern to use when "pat" is empty */
      linenr_T	stop_lnum;	/* stop after this line number when != 0 */
!     proftime_T	*tm;		/* timeout limit or NULL */
  {
      int		found;
      linenr_T	lnum;		/* no init to shut up Apollo cc */
--- 534,540 ----
      int		options;
      int		pat_use;	/* which pattern to use when "pat" is empty */
      linenr_T	stop_lnum;	/* stop after this line number when != 0 */
!     proftime_T	*tm UNUSED;	/* timeout limit or NULL */
  {
      int		found;
      linenr_T	lnum;		/* no init to shut up Apollo cc */
***************
*** 554,561 ****
      int		save_called_emsg = called_emsg;
  #ifdef FEAT_SEARCH_EXTRA
      int		break_loop = FALSE;
- #else
- # define break_loop FALSE
  #endif
  
      if (search_regcomp(pat, RE_SEARCH, pat_use,
--- 553,558 ----
***************
*** 940,946 ****
  	     * twice.
  	     */
  	    if (!p_ws || stop_lnum != 0 || got_int || called_emsg
! 					       || break_loop || found || loop)
  		break;
  
  	    /*
--- 937,946 ----
  	     * twice.
  	     */
  	    if (!p_ws || stop_lnum != 0 || got_int || called_emsg
! #ifdef FEAT_SEARCH_EXTRA
! 					       || break_loop
! #endif
! 					       || found || loop)
  		break;
  
  	    /*
***************
*** 958,964 ****
  		give_warning((char_u *)_(dir == BACKWARD
  					  ? top_bot_msg : bot_top_msg), TRUE);
  	}
! 	if (got_int || called_emsg || break_loop)
  	    break;
      }
      while (--count > 0 && found);   /* stop after count matches or no match */
--- 958,968 ----
  		give_warning((char_u *)_(dir == BACKWARD
  					  ? top_bot_msg : bot_top_msg), TRUE);
  	}
! 	if (got_int || called_emsg
! #ifdef FEAT_SEARCH_EXTRA
! 		|| break_loop
! #endif
! 		)
  	    break;
      }
      while (--count > 0 && found);   /* stop after count matches or no match */
*** ../vim-7.2.173/src/tag.c	2009-02-23 00:53:35.000000000 +0100
--- src/tag.c	2009-05-15 21:16:59.000000000 +0200
***************
*** 1105,1114 ****
  /*
   * Print the tag stack
   */
- /*ARGSUSED*/
      void
  do_tags(eap)
!     exarg_T	*eap;
  {
      int		i;
      char_u	*name;
--- 1105,1113 ----
  /*
   * Print the tag stack
   */
      void
  do_tags(eap)
!     exarg_T	*eap UNUSED;
  {
      int		i;
      char_u	*name;
***************
*** 2530,2540 ****
   * Callback function for finding all "tags" and "tags-??" files in
   * 'runtimepath' doc directories.
   */
- /*ARGSUSED*/
      static void
  found_tagfile_cb(fname, cookie)
      char_u	*fname;
!     void	*cookie;
  {
      if (ga_grow(&tag_fnames, 1) == OK)
  	((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
--- 2529,2538 ----
   * Callback function for finding all "tags" and "tags-??" files in
   * 'runtimepath' doc directories.
   */
      static void
  found_tagfile_cb(fname, cookie)
      char_u	*fname;
!     void	*cookie UNUSED;
  {
      if (ga_grow(&tag_fnames, 1) == OK)
  	((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
*** ../vim-7.2.173/src/version.c	2009-05-14 22:19:19.000000000 +0200
--- src/version.c	2009-05-15 21:21:44.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     174,
  /**/

-- 
TERRY GILLIAM PLAYED: PATSY (ARTHUR'S TRUSTY STEED), THE GREEN KNIGHT
                      SOOTHSAYER, BRIDGEKEEPER, SIR GAWAIN (THE FIRST TO BE
                      KILLED BY THE RABBIT)
                 "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    ///


--- NEW FILE 7.2.175 ---
To: vim-dev at vim.org
Subject: Patch 7.2.175
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.175
Problem:    Compiler warning in OpenBSD.
Solution:   Add type cast for NULL. (Dasn)
Files:	    src/if_cscope.c


*** ../vim-7.2.174/src/if_cscope.c	2009-04-22 16:22:44.000000000 +0200
--- src/if_cscope.c	2009-05-16 16:15:03.000000000 +0200
***************
*** 994,1000 ****
  	vim_free(ppath);
  
  #if defined(UNIX)
! 	if (execl("/bin/sh", "sh", "-c", cmd, NULL) == -1)
  	    PERROR(_("cs_create_connection exec failed"));
  
  	exit(127);
--- 994,1000 ----
  	vim_free(ppath);
  
  #if defined(UNIX)
! 	if (execl("/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1)
  	    PERROR(_("cs_create_connection exec failed"));
  
  	exit(127);
*** ../vim-7.2.174/src/version.c	2009-05-15 21:31:11.000000000 +0200
--- src/version.c	2009-05-16 16:13:15.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     175,
  /**/

-- 
Every time I lose weight, it finds me again!

 /// 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    ///


--- NEW FILE 7.2.176 ---
To: vim-dev at vim.org
Subject: Patch 7.2.176
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.176
Problem:    Exceptions for splint are not useful.
Solution:   Remove the S_SPLINT_S ifdefs.
Files:	    src/edit.c, src/ex_cmds.c, src/ex_docmd.c, src/os_unix.c,
	    src/os_unix.h, src/os_unixx.h, src/structs.h, src/term.h


*** ../vim-7.2.175/src/edit.c	2009-05-15 21:31:11.000000000 +0200
--- src/edit.c	2009-05-16 16:18:35.000000000 +0200
***************
*** 69,79 ****
      compl_T	*cp_prev;
      char_u	*cp_str;	/* matched text */
      char	cp_icase;	/* TRUE or FALSE: ignore case */
- #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
-     char_u	**cp_text;	/* text for the menu */
- #else
      char_u	*(cp_text[CPT_COUNT]);	/* text for the menu */
- #endif
      char_u	*cp_fname;	/* file containing the match, allocated when
  				 * cp_flags has FREE_FNAME */
      int		cp_flags;	/* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
--- 69,75 ----
***************
*** 3835,3845 ****
      char_u	*word;
      int		icase = FALSE;
      int		adup = FALSE;
- #ifdef S_SPLINT_S  /* splint doesn't parse array of pointers correctly */
-     char_u	**cptext;
- #else
      char_u	*(cptext[CPT_COUNT]);
- #endif
  
      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
      {
--- 3831,3837 ----
*** ../vim-7.2.175/src/ex_cmds.c	2009-05-15 21:31:11.000000000 +0200
--- src/ex_cmds.c	2009-05-16 16:18:56.000000000 +0200
***************
*** 5776,5785 ****
  {
      char_u	*s, *d;
      int		i;
- #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
-     static char **mtable;
-     static char **rtable;
- #else
      static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
  			       "/*", "/\\*", "\"*", "**",
  			       "/\\(\\)",
--- 5776,5781 ----
***************
*** 5794,5800 ****
  			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
  			       "\\[count]", "\\[quotex]", "\\[range]",
  			       "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
- #endif
      int flags;
  
      d = IObuff;		    /* assume IObuff is long enough! */
--- 5790,5795 ----
*** ../vim-7.2.175/src/ex_docmd.c	2009-05-15 21:31:11.000000000 +0200
--- src/ex_docmd.c	2009-05-16 16:19:26.000000000 +0200
***************
*** 9395,9407 ****
  {
      int		len;
      int		i;
! #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
!     static char **spec_str;
!     static char *(nospec_str[])
! #else
!     static char *(spec_str[])
! #endif
! 	= {
  		    "%",
  #define SPEC_PERC   0
  		    "#",
--- 9395,9401 ----
  {
      int		len;
      int		i;
!     static char *(spec_str[]) = {
  		    "%",
  #define SPEC_PERC   0
  		    "#",
*** ../vim-7.2.175/src/os_unix.c	2009-05-15 21:31:11.000000000 +0200
--- src/os_unix.c	2009-05-16 16:20:00.000000000 +0200
***************
*** 199,207 ****
  #endif
  
  #ifndef SIG_ERR
! # ifndef S_SPLINT_S
! #  define SIG_ERR	((RETSIGTYPE (*)())-1)
! # endif
  #endif
  
  /* volatile because it is used in signal handler sig_winch(). */
--- 199,205 ----
  #endif
  
  #ifndef SIG_ERR
! # define SIG_ERR	((RETSIGTYPE (*)())-1)
  #endif
  
  /* volatile because it is used in signal handler sig_winch(). */
***************
*** 443,451 ****
  
  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
  # ifdef HAVE_SYS_RESOURCE_H
! #  ifndef S_SPLINT_S  /* splint crashes on bits/resource.h */
! #   include <sys/resource.h>
! #  endif
  # endif
  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
--- 441,447 ----
  
  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
  # ifdef HAVE_SYS_RESOURCE_H
! #  include <sys/resource.h>
  # endif
  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
*** ../vim-7.2.175/src/os_unix.h	2009-05-15 21:31:11.000000000 +0200
--- src/os_unix.h	2009-05-16 16:17:22.000000000 +0200
***************
*** 53,61 ****
  #endif
  
  #ifdef HAVE_UNISTD_H
! # ifndef S_SPLINT_S  /* splint crashes on bits/confname.h */
! #  include <unistd.h>
! # endif
  #endif
  
  #ifdef HAVE_LIBC_H
--- 53,59 ----
  #endif
  
  #ifdef HAVE_UNISTD_H
! # include <unistd.h>
  #endif
  
  #ifdef HAVE_LIBC_H
*** ../vim-7.2.175/src/structs.h	2009-05-13 20:47:07.000000000 +0200
--- src/structs.h	2009-05-16 16:17:51.000000000 +0200
***************
*** 1646,1656 ****
  #endif
  #ifdef FEAT_DIFF
      diff_T	    *tp_first_diff;
- # ifdef S_SPLINT_S  /* splint doesn't understand the array of pointers */
-     buf_T	    **tp_diffbuf;
- # else
      buf_T	    *(tp_diffbuf[DB_COUNT]);
- # endif
      int		    tp_diff_invalid;	/* list of diffs is outdated */
  #endif
      frame_T	    *tp_snapshot;    /* window layout snapshot */
--- 1646,1652 ----
*** ../vim-7.2.175/src/term.h	2009-05-13 18:54:14.000000000 +0200
--- src/term.h	2009-05-16 16:20:06.000000000 +0200
***************
*** 96,106 ****
   * - there should be code in term.c to obtain the value from the termcap
   */
  
- #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
- extern char_u **term_strings;    /* current terminal strings */
- #else
  extern char_u *(term_strings[]);    /* current terminal strings */
- #endif
  
  /*
   * strings used for terminal
--- 96,102 ----
*** ../vim-7.2.175/src/version.c	2009-05-16 16:15:39.000000000 +0200
--- src/version.c	2009-05-16 16:34:10.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     176,
  /**/

-- 
Corn oil comes from corn and olive oil comes from olives, so where
does baby oil come from?

 /// 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    ///


--- NEW FILE 7.2.177 ---
To: vim-dev at vim.org
Subject: Patch 7.2.177
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.177
Problem:    Compiler warnings when using -Wextra
Solution:   Add UNUSED and type casts.
Files:	    src/eval.c, src/ex_docmd.c, src/ex_eval.c, src/ex_getln.c,
	    src/fileio.c, src/hardcopy.c, src/if_cscope.c, src/if_xcmdsrv.c,
	    src/farsi.c, src/mark.c, src/menu.c


*** ../vim-7.2.176/src/eval.c	2009-05-15 21:31:11.000000000 +0200
--- src/eval.c	2009-05-16 16:58:30.000000000 +0200
***************
*** 3772,3778 ****
   * Function given to ExpandGeneric() to obtain the list of user defined
   * (global/buffer/window/built-in) variable names.
   */
- /*ARGSUSED*/
      char_u *
  get_user_var_name(xp, idx)
      expand_T	*xp;
--- 3772,3777 ----
***************
*** 7787,7793 ****
   * Function given to ExpandGeneric() to obtain the list of internal or
   * user defined variable or function names.
   */
- /*ARGSUSED*/
      char_u *
  get_expr_name(xp, idx)
      expand_T	*xp;
--- 7786,7791 ----
***************
*** 8655,8664 ****
  /*
   * "byte2line(byte)" function
   */
- /*ARGSUSED*/
      static void
  f_byte2line(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
  #ifndef FEAT_BYTEOFF
--- 8653,8661 ----
  /*
   * "byte2line(byte)" function
   */
      static void
  f_byte2line(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
  #ifndef FEAT_BYTEOFF
***************
*** 8678,8684 ****
  /*
   * "byteidx()" function
   */
- /*ARGSUSED*/
      static void
  f_byteidx(argvars, rettv)
      typval_T	*argvars;
--- 8675,8680 ----
***************
*** 8852,8858 ****
      static void
  f_clearmatches(argvars, rettv)
      typval_T	*argvars UNUSED;
!     typval_T	*rettv;
  {
  #ifdef FEAT_SEARCH_EXTRA
      clear_matches(curwin);
--- 8848,8854 ----
      static void
  f_clearmatches(argvars, rettv)
      typval_T	*argvars UNUSED;
!     typval_T	*rettv UNUSED;
  {
  #ifdef FEAT_SEARCH_EXTRA
      clear_matches(curwin);
***************
*** 8916,8926 ****
  /*
   * "complete()" function
   */
- /*ARGSUSED*/
      static void
  f_complete(argvars, rettv)
      typval_T	*argvars;
!     typval_T	*rettv;
  {
      int	    startcol;
  
--- 8912,8921 ----
  /*
   * "complete()" function
   */
      static void
  f_complete(argvars, rettv)
      typval_T	*argvars;
!     typval_T	*rettv UNUSED;
  {
      int	    startcol;
  
***************
*** 8951,8957 ****
  /*
   * "complete_add()" function
   */
- /*ARGSUSED*/
      static void
  f_complete_add(argvars, rettv)
      typval_T	*argvars;
--- 8946,8951 ----
***************
*** 8963,8972 ****
  /*
   * "complete_check()" function
   */
- /*ARGSUSED*/
      static void
  f_complete_check(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
      int		saved = RedrawingDisabled;
--- 8957,8965 ----
  /*
   * "complete_check()" function
   */
      static void
  f_complete_check(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
      int		saved = RedrawingDisabled;
***************
*** 8981,8991 ****
  /*
   * "confirm(message, buttons[, default [, type]])" function
   */
- /*ARGSUSED*/
      static void
  f_confirm(argvars, rettv)
!     typval_T	*argvars;
!     typval_T	*rettv;
  {
  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
      char_u	*message;
--- 8974,8983 ----
  /*
   * "confirm(message, buttons[, default [, type]])" function
   */
      static void
  f_confirm(argvars, rettv)
!     typval_T	*argvars UNUSED;
!     typval_T	*rettv UNUSED;
  {
  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
      char_u	*message;
***************
*** 9150,9160 ****
   *
   * Checks the existence of a cscope connection.
   */
- /*ARGSUSED*/
      static void
  f_cscope_connection(argvars, rettv)
!     typval_T	*argvars;
!     typval_T	*rettv;
  {
  #ifdef FEAT_CSCOPE
      int		num = 0;
--- 9142,9151 ----
   *
   * Checks the existence of a cscope connection.
   */
      static void
  f_cscope_connection(argvars, rettv)
!     typval_T	*argvars UNUSED;
!     typval_T	*rettv UNUSED;
  {
  #ifdef FEAT_CSCOPE
      int		num = 0;
***************
*** 9181,9187 ****
   * Moves the cursor to the specified line and column.
   * Returns 0 when the position could be set, -1 otherwise.
   */
- /*ARGSUSED*/
      static void
[...2327 lines suppressed...]
  
      if (!curwin->w_cursor.col && p_ri)
--- 595,602 ----
  {
      int	tempc;
  
!     if (curwin->w_cursor.col != 0 &&
! 	(curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline())))
  	return;
  
      if (!curwin->w_cursor.col && p_ri)
***************
*** 663,670 ****
  {
      int	tempc;
  
!     if (!curwin->w_cursor.col &&
! 	(curwin->w_cursor.col+1 == STRLEN(ml_get_curline())))
  	return;
  
      if (!curwin->w_cursor.col && p_ri)
--- 664,671 ----
  {
      int	tempc;
  
!     if (curwin->w_cursor.col != 0 &&
! 	(curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline())))
  	return;
  
      if (!curwin->w_cursor.col && p_ri)
*** ../vim-7.2.176/src/mark.c	2009-04-29 11:00:09.000000000 +0200
--- src/mark.c	2009-05-16 17:14:56.000000000 +0200
***************
*** 884,893 ****
  /*
   * print the jumplist
   */
- /*ARGSUSED*/
      void
  ex_jumps(eap)
!     exarg_T	*eap;
  {
      int		i;
      char_u	*name;
--- 884,892 ----
  /*
   * print the jumplist
   */
      void
  ex_jumps(eap)
!     exarg_T	*eap UNUSED;
  {
      int		i;
      char_u	*name;
***************
*** 933,942 ****
  /*
   * print the changelist
   */
- /*ARGSUSED*/
      void
  ex_changes(eap)
!     exarg_T	*eap;
  {
      int		i;
      char_u	*name;
--- 932,940 ----
  /*
   * print the changelist
   */
      void
  ex_changes(eap)
!     exarg_T	*eap UNUSED;
  {
      int		i;
      char_u	*name;
*** ../vim-7.2.176/src/menu.c	2008-08-17 23:43:53.000000000 +0200
--- src/menu.c	2009-05-16 17:19:57.000000000 +0200
***************
*** 231,237 ****
  		if (skipdigits(menu_path + 7) == p)
  		{
  		    menuarg.iconidx = atoi((char *)menu_path + 7);
! 		    if (menuarg.iconidx >= TOOLBAR_NAME_COUNT)
  			menuarg.iconidx = -1;
  		    else
  			menuarg.icon_builtin = TRUE;
--- 231,237 ----
  		if (skipdigits(menu_path + 7) == p)
  		{
  		    menuarg.iconidx = atoi((char *)menu_path + 7);
! 		    if (menuarg.iconidx >= (int)TOOLBAR_NAME_COUNT)
  			menuarg.iconidx = -1;
  		    else
  			menuarg.icon_builtin = TRUE;
***************
*** 239,245 ****
  	    }
  	    else
  	    {
! 		for (i = 0; i < TOOLBAR_NAME_COUNT; ++i)
  		    if (STRNCMP(toolbar_names[i], menu_path, p - menu_path)
  									 == 0)
  		    {
--- 239,245 ----
  	    }
  	    else
  	    {
! 		for (i = 0; i < (int)TOOLBAR_NAME_COUNT; ++i)
  		    if (STRNCMP(toolbar_names[i], menu_path, p - menu_path)
  									 == 0)
  		    {
***************
*** 1341,1350 ****
   * Function given to ExpandGeneric() to obtain the list of (sub)menus (not
   * entries).
   */
- /*ARGSUSED*/
      char_u *
  get_menu_name(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      static vimmenu_T	*menu = NULL;
--- 1341,1349 ----
   * Function given to ExpandGeneric() to obtain the list of (sub)menus (not
   * entries).
   */
      char_u *
  get_menu_name(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      static vimmenu_T	*menu = NULL;
***************
*** 1378,1387 ****
   * Function given to ExpandGeneric() to obtain the list of menus and menu
   * entries.
   */
- /*ARGSUSED*/
      char_u *
  get_menu_names(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      static vimmenu_T	*menu = NULL;
--- 1377,1385 ----
   * Function given to ExpandGeneric() to obtain the list of menus and menu
   * entries.
   */
      char_u *
  get_menu_names(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      static vimmenu_T	*menu = NULL;
***************
*** 1739,1748 ****
  /*
   * Return TRUE if the menu is the tearoff menu.
   */
- /*ARGSUSED*/
      static int
  menu_is_tearoff(name)
!     char_u *name;
  {
  #ifdef FEAT_GUI
      return (STRCMP(name, TEAR_STRING) == 0);
--- 1737,1745 ----
  /*
   * Return TRUE if the menu is the tearoff menu.
   */
      static int
  menu_is_tearoff(name)
!     char_u *name UNUSED;
  {
  #ifdef FEAT_GUI
      return (STRCMP(name, TEAR_STRING) == 0);
*** ../vim-7.2.176/src/version.c	2009-05-16 16:36:25.000000000 +0200
--- src/version.c	2009-05-16 17:22:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     177,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      For an 'A' we would have to: Lose as many shits as possible; Take Jesus
      Christ out, if possible; Loose "I fart in your general direction"; Lose
      "the oral sex"; Lose "oh, fuck off"; Lose "We make castanets out of your
      testicles"
                 "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    ///


--- NEW FILE 7.2.178 ---
To: vim-dev at vim.org
Subject: Patch 7.2.178
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.178
Problem:    Using negative value for device number might not work.
Solution:   Use a separate flag for whether ffv_dev was set.
Files:	    src/misc2.c


*** ../vim-7.2.177/src/misc2.c	2009-04-29 11:00:09.000000000 +0200
--- src/misc2.c	2009-05-16 21:05:10.000000000 +0200
***************
*** 2841,2847 ****
  get_key_name(i)
      int	    i;
  {
!     if (i >= KEY_NAMES_TABLE_LEN)
  	return NULL;
      return  key_names_table[i].name;
  }
--- 2841,2847 ----
  get_key_name(i)
      int	    i;
  {
!     if (i >= (int)KEY_NAMES_TABLE_LEN)
  	return NULL;
      return  key_names_table[i].name;
  }
***************
*** 3869,3875 ****
       * use filename.
       */
  #ifdef UNIX
!     int			ffv_dev;	/* device number (-1 if not set) */
      ino_t		ffv_ino;	/* inode number */
  #endif
      /* The memory for this struct is allocated according to the length of
--- 3869,3876 ----
       * use filename.
       */
  #ifdef UNIX
!     int			ffv_dev_valid;	/* ffv_dev and ffv_ino were set */
!     dev_t		ffv_dev;	/* device number */
      ino_t		ffv_ino;	/* inode number */
  #endif
      /* The memory for this struct is allocated according to the length of
***************
*** 4059,4071 ****
   * This function silently ignores a few errors, vim_findfile() will have
   * limited functionality then.
   */
- /*ARGSUSED*/
      void *
  vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
  					   search_ctx_arg, tagfile, rel_fname)
      char_u	*path;
      char_u	*filename;
!     char_u	*stopdirs;
      int		level;
      int		free_visited;
      int		find_what;
--- 4060,4071 ----
   * This function silently ignores a few errors, vim_findfile() will have
   * limited functionality then.
   */
      void *
  vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
  					   search_ctx_arg, tagfile, rel_fname)
      char_u	*path;
      char_u	*filename;
!     char_u	*stopdirs UNUSED;
      int		level;
      int		free_visited;
      int		find_what;
***************
*** 5063,5072 ****
      {
  	if (
  #ifdef UNIX
! 		!url
! 		    ? (vp->ffv_dev == st.st_dev
! 			&& vp->ffv_ino == st.st_ino)
! 		    :
  #endif
  		fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0
  	   )
--- 5063,5071 ----
      {
  	if (
  #ifdef UNIX
! 		!url ? (vp->ffv_dev_valid && vp->ffv_dev == st.st_dev
! 						  && vp->ffv_ino == st.st_ino)
! 		     :
  #endif
  		fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0
  	   )
***************
*** 5091,5104 ****
  #ifdef UNIX
  	if (!url)
  	{
  	    vp->ffv_ino = st.st_ino;
  	    vp->ffv_dev = st.st_dev;
  	    vp->ffv_fname[0] = NUL;
  	}
  	else
  	{
! 	    vp->ffv_ino = 0;
! 	    vp->ffv_dev = -1;
  #endif
  	    STRCPY(vp->ffv_fname, ff_expand_buffer);
  #ifdef UNIX
--- 5090,5103 ----
  #ifdef UNIX
  	if (!url)
  	{
+ 	    vp->ffv_dev_valid = TRUE;
  	    vp->ffv_ino = st.st_ino;
  	    vp->ffv_dev = st.st_dev;
  	    vp->ffv_fname[0] = NUL;
  	}
  	else
  	{
! 	    vp->ffv_dev_valid = FALSE;
  #endif
  	    STRCPY(vp->ffv_fname, ff_expand_buffer);
  #ifdef UNIX
*** ../vim-7.2.177/src/version.c	2009-05-16 17:29:37.000000000 +0200
--- src/version.c	2009-05-16 21:00:15.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     178,
  /**/

-- 
FATAL ERROR! SYSTEM HALTED! - Press any key to continue doing nothing.

 /// 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    ///


--- NEW FILE 7.2.179 ---
To: vim-dev at vim.org
Subject: Patch 7.2.179
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.179
Problem:    Using negative value for device number might not work.
Solution:   Use a separate flag for whether sn_dev was set.
Files:	    src/ex_cmds2.c


*** ../vim-7.2.178/src/ex_cmds2.c	2009-05-14 22:19:19.000000000 +0200
--- src/ex_cmds2.c	2009-05-16 21:13:29.000000000 +0200
***************
*** 28,34 ****
  {
      char_u	*sn_name;
  # ifdef UNIX
!     int		sn_dev;
      ino_t	sn_ino;
  # endif
  # ifdef FEAT_PROFILE
--- 28,35 ----
  {
      char_u	*sn_name;
  # ifdef UNIX
!     int		sn_dev_valid;
!     dev_t	sn_dev;
      ino_t	sn_ino;
  # endif
  # ifdef FEAT_PROFILE
***************
*** 3049,3055 ****
  		    /* Compare dev/ino when possible, it catches symbolic
  		     * links.  Also compare file names, the inode may change
  		     * when the file was edited. */
! 		    ((stat_ok && si->sn_dev != -1)
  			&& (si->sn_dev == st.st_dev
  			    && si->sn_ino == st.st_ino)) ||
  # endif
--- 3050,3056 ----
  		    /* Compare dev/ino when possible, it catches symbolic
  		     * links.  Also compare file names, the inode may change
  		     * when the file was edited. */
! 		    ((stat_ok && si->sn_dev_valid)
  			&& (si->sn_dev == st.st_dev
  			    && si->sn_ino == st.st_ino)) ||
  # endif
***************
*** 3076,3086 ****
  # ifdef UNIX
  	if (stat_ok)
  	{
  	    si->sn_dev = st.st_dev;
  	    si->sn_ino = st.st_ino;
  	}
  	else
! 	    si->sn_dev = -1;
  # endif
  
  	/* Allocate the local script variables to use for this script. */
--- 3077,3088 ----
  # ifdef UNIX
  	if (stat_ok)
  	{
+ 	    si->sn_dev_valid = TRUE;
  	    si->sn_dev = st.st_dev;
  	    si->sn_ino = st.st_ino;
  	}
  	else
! 	    si->sn_dev_valid = FALSE;
  # endif
  
  	/* Allocate the local script variables to use for this script. */
*** ../vim-7.2.178/src/version.c	2009-05-16 21:06:36.000000000 +0200
--- src/version.c	2009-05-16 21:15:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     179,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      I would like to get back to the Censor and agree to lose the shits, take
      the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in
      your general direction', 'castanets of your testicles' and 'oral sex'
      and ask him for an 'A' rating on that basis.
                 "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    ///


--- NEW FILE 7.2.180 ---
To: vim-dev at vim.org
Subject: Patch 7.2.180
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.180
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Add UNUSED and type casts.
Files:	    src/buffer.c, src/ex_cmds.c, src/macros.h, src/main.c,
	    src/menu.c, src/message.c, src/misc1.c, src/mbyte.c,
	    src/normal.c, src/option.c, src/os_unix.c, src/quickfix.c,
	    src/screen.c, src/search.c, src/spell.c, src/syntax.c, src/tag.c,
	    src/term.c, src/ui.c


*** ../vim-7.2.179/src/buffer.c	2009-05-14 22:19:19.000000000 +0200
--- src/buffer.c	2009-05-16 22:21:41.000000000 +0200
***************
*** 2025,2037 ****
   * Return fnum of the found buffer.
   * Return < 0 for error.
   */
- /*ARGSUSED*/
      int
  buflist_findpat(pattern, pattern_end, unlisted, diffmode)
      char_u	*pattern;
      char_u	*pattern_end;	/* pointer to first char after pattern */
      int		unlisted;	/* find unlisted buffers */
!     int		diffmode;	/* find diff-mode buffers only */
  {
      buf_T	*buf;
      regprog_T	*prog;
--- 2025,2036 ----
   * Return fnum of the found buffer.
   * Return < 0 for error.
   */
      int
  buflist_findpat(pattern, pattern_end, unlisted, diffmode)
      char_u	*pattern;
      char_u	*pattern_end;	/* pointer to first char after pattern */
      int		unlisted;	/* find unlisted buffers */
!     int		diffmode UNUSED; /* find diff-mode buffers only */
  {
      buf_T	*buf;
      regprog_T	*prog;
***************
*** 2539,2545 ****
  /*
   * List all know file names (for :files and :buffers command).
   */
- /*ARGSUSED*/
      void
  buflist_list(eap)
      exarg_T	*eap;
--- 2538,2543 ----
***************
*** 3346,3359 ****
   * If maxwidth is not zero, the string will be filled at any middle marker
   * or truncated if too long, fillchar is used for all whitespace.
   */
- /*ARGSUSED*/
      int
  build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab)
      win_T	*wp;
      char_u	*out;		/* buffer to write into != NameBuff */
      size_t	outlen;		/* length of out[] */
      char_u	*fmt;
!     int		use_sandbox;	/* "fmt" was set insecurely, use sandbox */
      int		fillchar;
      int		maxwidth;
      struct stl_hlrec *hltab;	/* return: HL attributes (can be NULL) */
--- 3344,3356 ----
   * If maxwidth is not zero, the string will be filled at any middle marker
   * or truncated if too long, fillchar is used for all whitespace.
   */
      int
  build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab)
      win_T	*wp;
      char_u	*out;		/* buffer to write into != NameBuff */
      size_t	outlen;		/* length of out[] */
      char_u	*fmt;
!     int		use_sandbox UNUSED; /* "fmt" was set insecurely, use sandbox */
      int		fillchar;
      int		maxwidth;
      struct stl_hlrec *hltab;	/* return: HL attributes (can be NULL) */
*** ../vim-7.2.179/src/ex_cmds.c	2009-05-16 16:36:25.000000000 +0200
--- src/ex_cmds.c	2009-05-16 22:22:46.000000000 +0200
***************
*** 2255,2266 ****
   *
   * Return the string in allocated memory (NULL when out of memory).
   */
- /*ARGSUSED*/
      char_u *
  viminfo_readstring(virp, off, convert)
      vir_T	*virp;
      int		off;		    /* offset for virp->vir_line */
!     int		convert;	    /* convert the string */
  {
      char_u	*retval;
      char_u	*s, *d;
--- 2255,2265 ----
   *
   * Return the string in allocated memory (NULL when out of memory).
   */
      char_u *
  viminfo_readstring(virp, off, convert)
      vir_T	*virp;
      int		off;		    /* offset for virp->vir_line */
!     int		convert UNUSED;	    /* convert the string */
  {
      char_u	*retval;
      char_u	*s, *d;
***************
*** 2736,2742 ****
   * May set eap->forceit if a dialog says it's OK to overwrite.
   * Return OK if it's OK, FAIL if it is not.
   */
- /*ARGSUSED*/
      static int
  check_overwrite(eap, buf, fname, ffname, other)
      exarg_T	*eap;
--- 2735,2740 ----
*** ../vim-7.2.179/src/macros.h	2009-02-21 20:27:00.000000000 +0100
--- src/macros.h	2009-05-16 21:52:56.000000000 +0200
***************
*** 284,290 ****
  # define mb_cptr2len(p)	    (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
  
  # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
! # define MB_CHARLEN(p)	    (has_mbyte ? mb_charlen(p) : STRLEN(p))
  # define PTR2CHAR(p)	    (has_mbyte ? mb_ptr2char(p) : (int)*(p))
  #else
  # define mb_ptr_adv(p)		++p
--- 284,290 ----
  # define mb_cptr2len(p)	    (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
  
  # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
! # define MB_CHARLEN(p)	    (has_mbyte ? mb_charlen(p) : (int)STRLEN(p))
  # define PTR2CHAR(p)	    (has_mbyte ? mb_ptr2char(p) : (int)*(p))
  #else
  # define mb_ptr_adv(p)		++p
*** ../vim-7.2.179/src/main.c	2008-11-28 21:26:50.000000000 +0100
--- src/main.c	2009-05-16 22:25:59.000000000 +0200
***************
*** 1505,1514 ****
   *
   * Also find the --server... arguments and --socketid and --windowid
   */
- /*ARGSUSED*/
      static void
  early_arg_scan(parmp)
!     mparm_T	*parmp;
  {
  #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
  	|| !defined(FEAT_NETBEANS_INTG)
--- 1505,1513 ----
   *
   * Also find the --server... arguments and --socketid and --windowid
   */
      static void
  early_arg_scan(parmp)
!     mparm_T	*parmp UNUSED;
  {
  #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
  	|| !defined(FEAT_NETBEANS_INTG)
***************
*** 2380,2389 ****
   * Create the requested number of windows and edit buffers in them.
   * Also does recovery if "recoverymode" set.
   */
- /*ARGSUSED*/
      static void
  create_windows(parmp)
!     mparm_T	*parmp;
  {
  #ifdef FEAT_WINDOWS
      int		dorewind;
--- 2379,2387 ----
   * Create the requested number of windows and edit buffers in them.
   * Also does recovery if "recoverymode" set.
   */
      static void
  create_windows(parmp)
!     mparm_T	*parmp UNUSED;
  {
  #ifdef FEAT_WINDOWS
      int		dorewind;
***************
*** 3851,3860 ****
   * return an allocated string.  Otherwise return "data".
   * "*tofree" is set to the result when it needs to be freed later.
   */
- /*ARGSUSED*/
      char_u *
[...6121 lines suppressed...]
*** ../vim-7.2.179/src/ui.c	2008-11-28 21:26:50.000000000 +0100
--- src/ui.c	2009-05-16 22:33:55.000000000 +0200
***************
*** 320,329 ****
   * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
   * new size.  If this is not possible, it will adjust Rows and Columns.
   */
- /*ARGSUSED*/
      void
  ui_set_shellsize(mustset)
!     int		mustset;	/* set by the user */
  {
  #ifdef FEAT_GUI
      if (gui.in_use)
--- 320,328 ----
   * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
   * new size.  If this is not possible, it will adjust Rows and Columns.
   */
      void
  ui_set_shellsize(mustset)
!     int		mustset UNUSED;	/* set by the user */
  {
  #ifdef FEAT_GUI
      if (gui.in_use)
***************
*** 1127,1136 ****
   * available for pasting.
   * When "both" is TRUE also copy to the '+' register.
   */
- /*ARGSUSED*/
      void
  clip_copy_modeless_selection(both)
!     int		both;
  {
      char_u	*buffer;
      char_u	*bufp;
--- 1126,1134 ----
   * available for pasting.
   * When "both" is TRUE also copy to the '+' register.
   */
      void
  clip_copy_modeless_selection(both)
!     int		both UNUSED;
  {
      char_u	*buffer;
      char_u	*bufp;
***************
*** 1701,1710 ****
      return (int)maxlen;
  }
  
- /*ARGSUSED*/
      void
  fill_input_buf(exit_on_error)
!     int	exit_on_error;
  {
  #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX)
      int		len;
--- 1699,1707 ----
      return (int)maxlen;
  }
  
      void
  fill_input_buf(exit_on_error)
!     int	exit_on_error UNUSED;
  {
  #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX)
      int		len;
***************
*** 1992,2002 ****
  
  static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
  
- /* ARGSUSED */
      static void
  clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
  			      format)
!     Widget	w;
      XtPointer	success;
      Atom	*sel_atom;
      Atom	*type;
--- 1989,1998 ----
  
  static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
  
      static void
  clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
  			      format)
!     Widget	w UNUSED;
      XtPointer	success;
      Atom	*sel_atom;
      Atom	*type;
***************
*** 2202,2211 ****
  
  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
  
- /* ARGSUSED */
      static Boolean
  clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format)
!     Widget	w;
      Atom	*sel_atom;
      Atom	*target;
      Atom	*type;
--- 2198,2206 ----
  
  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
  
      static Boolean
  clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format)
!     Widget	w UNUSED;
      Atom	*sel_atom;
      Atom	*target;
      Atom	*type;
***************
*** 2332,2341 ****
  
  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
  
- /* ARGSUSED */
      static void
  clip_x11_lose_ownership_cb(w, sel_atom)
!     Widget  w;
      Atom    *sel_atom;
  {
      if (*sel_atom == clip_plus.sel_atom)
--- 2327,2335 ----
  
  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
  
      static void
  clip_x11_lose_ownership_cb(w, sel_atom)
!     Widget  w UNUSED;
      Atom    *sel_atom;
  {
      if (*sel_atom == clip_plus.sel_atom)
***************
*** 2368,2377 ****
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
   */
- /*ARGSUSED*/
      void
  clip_x11_set_selection(cbd)
!     VimClipboard *cbd;
  {
  }
  #endif
--- 2362,2370 ----
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
   */
      void
  clip_x11_set_selection(cbd)
!     VimClipboard *cbd UNUSED;
  {
  }
  #endif
***************
*** 2922,2932 ****
   * Find the window at screen position "*rowp" and "*colp".  The positions are
   * updated to become relative to the top-left of the window.
   */
- /*ARGSUSED*/
      win_T *
  mouse_find_win(rowp, colp)
      int		*rowp;
!     int		*colp;
  {
      frame_T	*fp;
  
--- 2915,2924 ----
   * Find the window at screen position "*rowp" and "*colp".  The positions are
   * updated to become relative to the top-left of the window.
   */
      win_T *
  mouse_find_win(rowp, colp)
      int		*rowp;
!     int		*colp UNUSED;
  {
      frame_T	*fp;
  
*** ../vim-7.2.179/src/version.c	2009-05-16 21:16:12.000000000 +0200
--- src/version.c	2009-05-17 13:06:38.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     180,
  /**/

-- 
Wi n0t trei a h0liday in Sweden thi yer?
                 "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    ///


--- NEW FILE 7.2.181 ---
To: vim-dev at vim.org
Subject: Patch 7.2.181
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.181
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Add UNUSED and type casts.
Files:	    src/if_mzsch.c, src/gui.c, src/gui_gtk.c, src/gui_gtk_x11.c,
	    src/gui_gtk_f.c, src/gui_beval.c, src/netbeans.c


*** ../vim-7.2.180/src/if_mzsch.c	2007-07-06 19:43:08.000000000 +0200
--- src/if_mzsch.c	2009-05-16 22:24:18.000000000 +0200
***************
*** 667,679 ****
      static void CALLBACK
  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
  # elif defined(FEAT_GUI_GTK)
- /*ARGSUSED*/
      static gint
! timer_proc(gpointer data)
  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
- /* ARGSUSED */
      static void
! timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
  # elif defined(FEAT_GUI_MAC)
      pascal void
  timer_proc(EventLoopTimerRef theTimer, void *userData)
--- 667,677 ----
      static void CALLBACK
  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
  # elif defined(FEAT_GUI_GTK)
      static gint
! timer_proc(gpointer data UNUSED)
  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
      static void
! timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
  # elif defined(FEAT_GUI_MAC)
      pascal void
  timer_proc(EventLoopTimerRef theTimer, void *userData)
*** ../vim-7.2.180/src/gui.c	2008-12-03 18:50:09.000000000 +0100
--- src/gui.c	2009-05-17 15:52:18.000000000 +0200
***************
*** 678,688 ****
   * Return OK when able to set the font.  When it failed FAIL is returned and
   * the fonts are unchanged.
   */
- /*ARGSUSED*/
      int
  gui_init_font(font_list, fontset)
      char_u	*font_list;
!     int		fontset;
  {
  #define FONTLEN 320
      char_u	font_name[FONTLEN];
--- 678,687 ----
   * Return OK when able to set the font.  When it failed FAIL is returned and
   * the fonts are unchanged.
   */
      int
  gui_init_font(font_list, fontset)
      char_u	*font_list;
!     int		fontset UNUSED;
  {
  #define FONTLEN 320
      char_u	font_name[FONTLEN];
***************
*** 1138,1147 ****
   * Position the various GUI components (text area, menu).  The vertical
   * scrollbars are NOT handled here.  See gui_update_scrollbars().
   */
- /*ARGSUSED*/
      static void
  gui_position_components(total_width)
!     int	    total_width;
  {
      int	    text_area_x;
      int	    text_area_y;
--- 1137,1145 ----
   * Position the various GUI components (text area, menu).  The vertical
   * scrollbars are NOT handled here.  See gui_update_scrollbars().
   */
      static void
  gui_position_components(total_width)
!     int	    total_width UNUSED;
  {
      int	    text_area_x;
      int	    text_area_y;
***************
*** 1374,1383 ****
   * If "fit_to_display" is TRUE then the size may be reduced to fit the window
   * on the screen.
   */
- /*ARGSUSED*/
      void
  gui_set_shellsize(mustset, fit_to_display, direction)
!     int		mustset;		/* set by the user */
      int		fit_to_display;
      int		direction;		/* RESIZE_HOR, RESIZE_VER */
  {
--- 1372,1380 ----
   * If "fit_to_display" is TRUE then the size may be reduced to fit the window
   * on the screen.
   */
      void
  gui_set_shellsize(mustset, fit_to_display, direction)
!     int		mustset UNUSED;		/* set by the user */
      int		fit_to_display;
      int		direction;		/* RESIZE_HOR, RESIZE_VER */
  {
***************
*** 3120,3126 ****
   * If "oldval" is not NULL, "oldval" is the previous value, the new value is
   * in p_go.
   */
- /*ARGSUSED*/
      void
  gui_init_which_components(oldval)
      char_u	*oldval;
--- 3117,3122 ----
***************
*** 4411,4417 ****
      if (curwin->w_p_wrap)
  	return FALSE;
  
!     if (curwin->w_leftcol == scrollbar_value)
  	return FALSE;
  
      curwin->w_leftcol = (colnr_T)scrollbar_value;
--- 4407,4413 ----
      if (curwin->w_p_wrap)
  	return FALSE;
  
!     if ((long_u)curwin->w_leftcol == scrollbar_value)
  	return FALSE;
  
      curwin->w_leftcol = (colnr_T)scrollbar_value;
***************
*** 4424,4430 ****
  	    && longest_lnum < curwin->w_botline
  	    && !virtual_active())
      {
! 	if (scrollbar_value > scroll_line_len(curwin->w_cursor.lnum))
  	{
  	    curwin->w_cursor.lnum = longest_lnum;
  	    curwin->w_cursor.col = 0;
--- 4420,4426 ----
  	    && longest_lnum < curwin->w_botline
  	    && !virtual_active())
      {
! 	if (scrollbar_value > (long_u)scroll_line_len(curwin->w_cursor.lnum))
  	{
  	    curwin->w_cursor.lnum = longest_lnum;
  	    curwin->w_cursor.col = 0;
***************
*** 4670,4676 ****
  /*
   * Find window where the mouse pointer "y" coordinate is in.
   */
- /*ARGSUSED*/
      static win_T *
  xy2win(x, y)
      int		x;
--- 4666,4671 ----
***************
*** 5124,5130 ****
   * of dropped files, they will be freed in this function, and caller can't use
   * fnames after call this function.
   */
- /*ARGSUSED*/
      void
  gui_handle_drop(x, y, modifiers, fnames, count)
      int		x;
--- 5119,5124 ----
*** ../vim-7.2.180/src/gui_gtk.c	2008-07-31 22:29:28.000000000 +0200
--- src/gui_gtk.c	2009-05-17 16:06:30.000000000 +0200
***************
*** 285,298 ****
      return image;
  }
  
- /*ARGSUSED*/
      static gint
! toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
! {
!     /* When we're in a GtkPlug, we don't have window focus events, only widget focus.
!      * To emulate stand-alone gvim, if a button gets focus (e.g., <Tab> into GtkPlug)
!      * immediately pass it to mainwin.
!      */
      if (gtk_socket_id != 0)
  	gtk_widget_grab_focus(gui.drawarea);
  
--- 285,298 ----
      return image;
  }
  
      static gint
! toolbar_button_focus_in_event(GtkWidget *widget UNUSED,
! 			      GdkEventFocus *event UNUSED,
! 			      gpointer data UNUSED)
! {
!     /* When we're in a GtkPlug, we don't have window focus events, only widget
!      * focus.  To emulate stand-alone gvim, if a button gets focus (e.g.,
!      * <Tab> into GtkPlug) immediately pass it to mainwin. */
      if (gtk_socket_id != 0)
  	gtk_widget_grab_focus(gui.drawarea);
  
***************
*** 585,593 ****
      gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
  }
  
- /*ARGSUSED*/
      static void
! menu_item_activate(GtkWidget *widget, gpointer data)
  {
      gui_menu_cb((vimmenu_T *)data);
  
--- 585,592 ----
      gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
  }
  
      static void
! menu_item_activate(GtkWidget *widget UNUSED, gpointer data)
  {
      gui_menu_cb((vimmenu_T *)data);
  
***************
*** 1202,1210 ****
  #endif
  
  #ifndef USE_FILE_CHOOSER
- /*ARGSUSED*/
      static void
! browse_ok_cb(GtkWidget *widget, gpointer cbdata)
  {
      gui_T *vw = (gui_T *)cbdata;
  
--- 1201,1208 ----
  #endif
  
  #ifndef USE_FILE_CHOOSER
      static void
! browse_ok_cb(GtkWidget *widget UNUSED, gpointer cbdata)
  {
      gui_T *vw = (gui_T *)cbdata;
  
***************
*** 1218,1226 ****
  	gtk_main_quit();
  }
  
- /*ARGSUSED*/
      static void
! browse_cancel_cb(GtkWidget *widget, gpointer cbdata)
  {
      gui_T *vw = (gui_T *)cbdata;
  
--- 1216,1223 ----
  	gtk_main_quit();
  }
  
      static void
! browse_cancel_cb(GtkWidget *widget UNUSED, gpointer cbdata)
  {
      gui_T *vw = (gui_T *)cbdata;
  
***************
*** 1234,1242 ****
  	gtk_main_quit();
  }
  
- /*ARGSUSED*/
      static gboolean
! browse_destroy_cb(GtkWidget * widget)
  {
      if (gui.browse_fname != NULL)
      {
--- 1231,1238 ----
  	gtk_main_quit();
  }
  
      static gboolean
! browse_destroy_cb(GtkWidget *widget UNUSED)
  {
      if (gui.browse_fname != NULL)
      {
***************
*** 1262,1275 ****
   * initdir			initial directory, NULL for current dir
   * filter			not used (file name filter)
   */
- /*ARGSUSED*/
      char_u *
! gui_mch_browse(int saving,
  	       char_u *title,
  	       char_u *dflt,
! 	       char_u *ext,
  	       char_u *initdir,
! 	       char_u *filter)
  {
  #ifdef USE_FILE_CHOOSER
      GtkWidget		*fc;
--- 1258,1270 ----
   * initdir			initial directory, NULL for current dir
   * filter			not used (file name filter)
   */
      char_u *
! gui_mch_browse(int saving UNUSED,
  	       char_u *title,
  	       char_u *dflt,
! 	       char_u *ext UNUSED,
  	       char_u *initdir,
! 	       char_u *filter UNUSED)
  {
  #ifdef USE_FILE_CHOOSER
      GtkWidget		*fc;
***************
*** 1377,1383 ****
   * dflt				default name
   * initdir			initial directory, NULL for current dir
   */
- /*ARGSUSED*/
      char_u *
  gui_mch_browsedir(
  	       char_u *title,
--- 1372,1377 ----
***************
*** 1460,1466 ****
  }
  
  # ifdef FEAT_GUI_GNOME
- /* ARGSUSED */
      static int
  gui_gnome_dialog( int	type,
  		char_u	*title,
--- 1454,1459 ----
***************
*** 1611,1617 ****
      GtkWidget	*dialog;
  } CancelData;
  
- /* ARGSUSED */
      static void
  dlg_button_clicked(GtkWidget * widget, ButtonData *data)
  {
--- 1604,1609 ----
***************
*** 1622,1628 ****
  /*
   * This makes the Escape key equivalent to the cancel button.
   */
- /*ARGSUSED*/
      static int
  dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
  {
--- 1614,1619 ----
***************
*** 1655,1661 ****
  	gtk_main_quit();
  }
  
- /* ARGSUSED */
      int
  gui_mch_dialog(	int	type,		/* type of dialog */
  		char_u	*title,		/* title of dialog */
--- 1646,1651 ----
***************
*** 2215,2221 ****
      GtkDialog	*dialog;	    /* Widget of the dialog */
  } DialogInfo;
  
- /*ARGSUSED2*/
      static gboolean
  dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
  {
--- 2205,2210 ----
***************
*** 2398,2411 ****
   * Note: The push_in output argument seems to affect scrolling of huge
   * menus that don't fit on the screen.	Leave it at the default for now.
   */
- /*ARGSUSED0*/
      static void
! popup_menu_position_func(GtkMenu *menu,
  			 gint *x, gint *y,
  # ifdef HAVE_GTK2
! 			 gboolean *push_in,
  # endif
! 			 gpointer user_data)
  {
      gdk_window_get_origin(gui.drawarea->window, x, y);
  
--- 2387,2399 ----
   * Note: The push_in output argument seems to affect scrolling of huge
   * menus that don't fit on the screen.	Leave it at the default for now.
   */
      static void
! popup_menu_position_func(GtkMenu *menu UNUSED,
  			 gint *x, gint *y,
  # ifdef HAVE_GTK2
! 			 gboolean *push_in UNUSED,
  # endif
! 			 gpointer user_data UNUSED)
  {
      gdk_window_get_origin(gui.drawarea->window, x, y);
  
***************
*** 2464,2476 ****
      GtkWidget *all;	/* 'Replace All' action button */
  } SharedFindReplace;
  
! static SharedFindReplace find_widgets = { NULL, };
! static SharedFindReplace repl_widgets = { NULL, };
  
- /* ARGSUSED */
      static int
  find_key_press_event(
! 		GtkWidget	*widget,
  		GdkEventKey	*event,
  		SharedFindReplace *frdp)
  {
--- 2452,2463 ----
      GtkWidget *all;	/* 'Replace All' action button */
  } SharedFindReplace;
  
! static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
! static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
  
      static int
  find_key_press_event(
! 		GtkWidget	*widget UNUSED,
  		GdkEventKey	*event,
  		SharedFindReplace *frdp)
  {
***************
*** 2962,2970 ****
  /*
   * Callback for actions of the find and replace dialogs
   */
- /*ARGSUSED*/
      static void
! find_replace_cb(GtkWidget *widget, gpointer data)
  {
      int			flags;
      char_u		*find_text;
--- 2949,2956 ----
  /*
   * Callback for actions of the find and replace dialogs
   */
      static void
! find_replace_cb(GtkWidget *widget UNUSED, gpointer data)
  {
      int			flags;
      char_u		*find_text;
***************
*** 3010,3018 ****
  }
  
  /* our usual callback function */
- /*ARGSUSED*/
      static void
! entry_activate_cb(GtkWidget *widget, gpointer data)
  {
      gtk_widget_grab_focus(GTK_WIDGET(data));
  }
--- 2996,3003 ----
  }
  
  /* our usual callback function */
      static void
! entry_activate_cb(GtkWidget *widget UNUSED, gpointer data)
  {
      gtk_widget_grab_focus(GTK_WIDGET(data));
  }
***************
*** 3055,3064 ****
  /*
   * ":helpfind"
   */
- /*ARGSUSED*/
      void
  ex_helpfind(eap)
!     exarg_T	*eap;
  {
      /* This will fail when menus are not loaded.  Well, it's only for
       * backwards compatibility anyway. */
--- 3040,3048 ----
  /*
   * ":helpfind"
   */
      void
  ex_helpfind(eap)
!     exarg_T	*eap UNUSED;
  {
      /* This will fail when menus are not loaded.  Well, it's only for
       * backwards compatibility anyway. */
*** ../vim-7.2.180/src/gui_gtk_x11.c	2008-11-28 21:26:50.000000000 +0100
--- src/gui_gtk_x11.c	2009-05-17 15:53:02.000000000 +0200
***************
*** 619,627 ****
   * Doesn't seem possible, since check_copy_area() relies on
   * this information.  --danielk
   */
- /*ARGSUSED*/
      static gint
! visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data)
  {
      gui.visibility = event->state;
      /*
--- 625,634 ----
   * Doesn't seem possible, since check_copy_area() relies on
   * this information.  --danielk
   */
      static gint
! visibility_event(GtkWidget *widget UNUSED,
! 		 GdkEventVisibility *event,
! 		 gpointer data UNUSED)
  {
      gui.visibility = event->state;
      /*
***************
*** 638,646 ****
  /*
   * Redraw the corresponding portions of the screen.
   */
- /*ARGSUSED*/
      static gint
! expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
  {
      /* Skip this when the GUI isn't set up yet, will redraw later. */
      if (gui.starting)
--- 645,654 ----
  /*
   * Redraw the corresponding portions of the screen.
   */
      static gint
! expose_event(GtkWidget *widget UNUSED,
! 	     GdkEventExpose *event,
! 	     gpointer data UNUSED)
  {
      /* Skip this when the GUI isn't set up yet, will redraw later. */
      if (gui.starting)
***************
*** 668,676 ****
  /*
   * Handle changes to the "Comm" property
   */
- /*ARGSUSED2*/
      static gint
! property_event(GtkWidget *widget, GdkEventProperty *event, gpointer data)
  {
      if (event->type == GDK_PROPERTY_NOTIFY
  	    && event->state == (int)GDK_PROPERTY_NEW_VALUE
--- 676,685 ----
  /*
   * Handle changes to the "Comm" property
   */
      static gint
! property_event(GtkWidget *widget,
! 	       GdkEventProperty *event,
! 	       gpointer data UNUSED)
  {
      if (event->type == GDK_PROPERTY_NOTIFY
  	    && event->state == (int)GDK_PROPERTY_NEW_VALUE
***************
*** 740,748 ****
      blink_state = BLINK_NONE;
  }
  
- /*ARGSUSED*/
      static gint
! blink_cb(gpointer data)
  {
      if (blink_state == BLINK_ON)
      {
--- 749,756 ----
      blink_state = BLINK_NONE;
  }
  
      static gint
! blink_cb(gpointer data UNUSED)
  {
      if (blink_state == BLINK_ON)
      {
***************
*** 781,789 ****
      }
  }
  
- /*ARGSUSED*/
      static gint
! enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
  {
      if (blink_state == BLINK_NONE)
  	gui_mch_start_blink();
--- 789,798 ----
      }
  }
  
      static gint
! enter_notify_event(GtkWidget *widget UNUSED,
! 		   GdkEventCrossing *event UNUSED,
! 		   gpointer data UNUSED)
  {
      if (blink_state == BLINK_NONE)
  	gui_mch_start_blink();
***************
*** 795,803 ****
      return FALSE;
  }
  
- /*ARGSUSED*/
      static gint
! leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
  {
      if (blink_state != BLINK_NONE)
  	gui_mch_stop_blink();
--- 804,813 ----
      return FALSE;
  }
  
      static gint
! leave_notify_event(GtkWidget *widget UNUSED,
! 		   GdkEventCrossing *event UNUSED,
! 		   gpointer data UNUSED)
  {
      if (blink_state != BLINK_NONE)
  	gui_mch_stop_blink();
***************
*** 805,813 ****
      return FALSE;
  }
  
- /*ARGSUSED*/
      static gint
! focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
  {
      gui_focus_change(TRUE);
  
--- 815,824 ----
      return FALSE;
  }
  
      static gint
! focus_in_event(GtkWidget *widget,
! 	       GdkEventFocus *event UNUSED,
! 	       gpointer data UNUSED)
  {
      gui_focus_change(TRUE);
  
***************
*** 826,834 ****
      return TRUE;
  }
  
- /*ARGSUSED*/
      static gint
! focus_out_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
  {
      gui_focus_change(FALSE);
  
--- 837,846 ----
      return TRUE;
  }
  
      static gint
! focus_out_event(GtkWidget *widget UNUSED,
! 	        GdkEventFocus *event UNUSED,
! 		gpointer data UNUSED)
  {
      gui_focus_change(FALSE);
  
***************
*** 956,964 ****
  /*
   * Main keyboard handler:
   */
- /*ARGSUSED*/
      static gint
! key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
  {
  #ifdef HAVE_GTK2
      /* 256 bytes is way over the top, but for safety let's reduce it only
--- 968,977 ----
  /*
   * Main keyboard handler:
   */
      static gint
! key_press_event(GtkWidget *widget UNUSED,
! 		GdkEventKey *event,
! 		gpointer data UNUSED)
  {
  #ifdef HAVE_GTK2
      /* 256 bytes is way over the top, but for safety let's reduce it only
***************
*** 1225,1233 ****
  }
  
  #if defined(FEAT_XIM) && defined(HAVE_GTK2)
- /*ARGSUSED0*/
      static gboolean
! key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
  {
      /*
       * GTK+ 2 input methods may do fancy stuff on key release events too.
--- 1238,1247 ----
  }
  
  #if defined(FEAT_XIM) && defined(HAVE_GTK2)
      static gboolean
! key_release_event(GtkWidget *widget UNUSED,
! 		  GdkEventKey *event,
! 		  gpointer data UNUSED)
  {
      /*
       * GTK+ 2 input methods may do fancy stuff on key release events too.
***************
*** 1243,1253 ****
   * Selection handlers:
   */
  
- /*ARGSUSED*/
      static gint
! selection_clear_event(GtkWidget		*widget,
  		      GdkEventSelection	*event,
! 		      gpointer		user_data)
  {
      if (event->selection == clip_plus.gtk_sel_atom)
  	clip_lose_selection(&clip_plus);
--- 1257,1266 ----
   * Selection handlers:
   */
  
      static gint
! selection_clear_event(GtkWidget		*widget UNUSED,
  		      GdkEventSelection	*event,
! 		      gpointer		user_data UNUSED)
  {
      if (event->selection == clip_plus.gtk_sel_atom)
  	clip_lose_selection(&clip_plus);
***************
*** 1265,1276 ****
  #define RS_FAIL	2	/* selection_received_cb() called and failed */
  static int received_selection = RS_NONE;
  
- /*ARGSUSED*/
      static void
! selection_received_cb(GtkWidget		*widget,
  		      GtkSelectionData	*data,
! 		      guint		time_,
! 		      gpointer		user_data)
  {
      VimClipboard    *cbd;
      char_u	    *text;
--- 1278,1288 ----
  #define RS_FAIL	2	/* selection_received_cb() called and failed */
  static int received_selection = RS_NONE;
  
      static void
! selection_received_cb(GtkWidget		*widget UNUSED,
  		      GtkSelectionData	*data,
! 		      guint		time_ UNUSED,
! 		      gpointer		user_data UNUSED)
  {
      VimClipboard    *cbd;
      char_u	    *text;
***************
*** 1414,1426 ****
   * Prepare our selection data for passing it to the external selection
   * client.
   */
- /*ARGSUSED*/
      static void
! selection_get_cb(GtkWidget	    *widget,
  		 GtkSelectionData   *selection_data,
  		 guint		    info,
! 		 guint		    time_,
! 		 gpointer	    user_data)
  {
      char_u	    *string;
      char_u	    *tmpbuf;
--- 1426,1437 ----
   * Prepare our selection data for passing it to the external selection
   * client.
   */
      static void
! selection_get_cb(GtkWidget	    *widget UNUSED,
  		 GtkSelectionData   *selection_data,
  		 guint		    info,
! 		 guint		    time_ UNUSED,
! 		 gpointer	    user_data UNUSED)
  {
      char_u	    *string;
      char_u	    *tmpbuf;
***************
*** 1678,1684 ****
  
  	offshoot = dx > dy ? dx : dy;
  
! 	/* Make a linearly declaying timer delay with a threshold of 5 at a
  	 * distance of 127 pixels from the main window.
  	 *
  	 * One could think endlessly about the most ergonomic variant here.
--- 1689,1695 ----
  
  	offshoot = dx > dy ? dx : dy;
  
! 	/* Make a linearly decaying timer delay with a threshold of 5 at a
  	 * distance of 127 pixels from the main window.
  	 *
  	 * One could think endlessly about the most ergonomic variant here.
***************
*** 1707,1715 ****
  /*
   * Timer used to recognize multiple clicks of the mouse button.
   */
- /*ARGSUSED0*/
      static gint
! motion_repeat_timer_cb(gpointer data)
  {
      int		    x;
      int		    y;
--- 1718,1725 ----
  /*
   * Timer used to recognize multiple clicks of the mouse button.
   */
      static gint
! motion_repeat_timer_cb(gpointer data UNUSED)
  {
      int		    x;
      int		    y;
***************
*** 1749,1757 ****
      return FALSE;
  }
  
- /*ARGSUSED2*/
      static gint
! motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
  {
      if (event->is_hint)
      {
--- 1759,1768 ----
      return FALSE;
  }
  
      static gint
! motion_notify_event(GtkWidget *widget,
! 		    GdkEventMotion *event,
! 		    gpointer data UNUSED)
  {
      if (event->is_hint)
      {
***************
*** 1777,1785 ****
   * by our own timeout mechanism instead of the one provided by GTK+ itself.
   * This is due to the way the generic VIM code is recognizing multiple clicks.
   */
- /*ARGSUSED2*/
      static gint
! button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
  {
      int button;
      int repeated_click = FALSE;
--- 1788,1797 ----
   * by our own timeout mechanism instead of the one provided by GTK+ itself.
   * This is due to the way the generic VIM code is recognizing multiple clicks.
   */
      static gint
! button_press_event(GtkWidget *widget,
! 		   GdkEventButton *event,
! 		   gpointer data UNUSED)
  {
      int button;
      int repeated_click = FALSE;
***************
*** 1855,1863 ****
   * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
   * Instead, it abstracts scrolling via the new GdkEventScroll.
   */
- /*ARGSUSED2*/
      static gboolean
! scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
  {
      int	    button;
      int_u   vim_modifiers;
--- 1867,1876 ----
   * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
   * Instead, it abstracts scrolling via the new GdkEventScroll.
   */
      static gboolean
! scroll_event(GtkWidget *widget,
! 	     GdkEventScroll *event,
! 	     gpointer data UNUSED)
  {
      int	    button;
      int_u   vim_modifiers;
***************
*** 1896,1904 ****
  #endif /* HAVE_GTK2 */
  
  
- /*ARGSUSED*/
      static gint
! button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
  {
      int x, y;
      int_u vim_modifiers;
--- 1909,1918 ----
  #endif /* HAVE_GTK2 */
  
  
      static gint
! button_release_event(GtkWidget *widget UNUSED,
! 		     GdkEventButton *event,
! 		     gpointer data UNUSED)
  {
      int x, y;
      int_u vim_modifiers;
***************
*** 2100,2106 ****
  /*
   * DND receiver.
   */
- /*ARGSUSED2*/
      static void
  drag_data_received_cb(GtkWidget		*widget,
  		      GdkDragContext	*context,
--- 2114,2119 ----
***************
*** 2109,2115 ****
  		      GtkSelectionData	*data,
  		      guint		info,
  		      guint		time_,
! 		      gpointer		user_data)
  {
      GdkModifierType state;
  
--- 2122,2128 ----
  		      GtkSelectionData	*data,
  		      guint		info,
  		      guint		time_,
! 		      gpointer		user_data UNUSED)
  {
      GdkModifierType state;
  
***************
*** 2143,2149 ****
   * be abandoned and pop up a dialog asking the user for confirmation if
   * necessary.
   */
- /*ARGSUSED0*/
      static void
  sm_client_check_changed_any(GnomeClient	    *client,
  			    gint	    key,
--- 2156,2161 ----
***************
*** 2251,2257 ****
   * for confirmation if necessary.  Save the current editing session and tell
   * the session manager how to restart Vim.
   */
- /*ARGSUSED1*/
      static gboolean
  sm_client_save_yourself(GnomeClient	    *client,
  			gint		    phase,
--- 2263,2268 ----
***************
*** 2339,2345 ****
   * here since "save_yourself" has been emitted before (unless serious trouble
   * is happening).
   */
- /*ARGSUSED0*/
      static void
  sm_client_die(GnomeClient *client, gpointer data)
  {
--- 2350,2355 ----
***************
*** 2379,2388 ****
  /*
   * GTK tells us that XSMP needs attention
   */
- /*ARGSUSED*/
      static gboolean
  local_xsmp_handle_requests(source, condition, data)
!     GIOChannel		*source;
      GIOCondition	condition;
      gpointer		data;
  {
--- 2389,2397 ----
  /*
   * GTK tells us that XSMP needs attention
   */
      static gboolean
  local_xsmp_handle_requests(source, condition, data)
!     GIOChannel		*source UNUSED;
      GIOCondition	condition;
      gpointer		data;
  {
***************
*** 2480,2495 ****
   * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
   * it should work with KDE as well.
   */
- /*ARGSUSED1*/
      static GdkFilterReturn
! global_event_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
  {
      XEvent *xevent = (XEvent *)xev;
  
      if (xevent != NULL
  	    && xevent->type == ClientMessage
  	    && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
! 	    && xevent->xclient.data.l[0] == GET_X_ATOM(save_yourself_atom))
      {
  	out_flush();
  	ml_sync_all(FALSE, FALSE); /* preserve all swap files */
--- 2489,2506 ----
   * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
   * it should work with KDE as well.
   */
      static GdkFilterReturn
! global_event_filter(GdkXEvent *xev,
! 		    GdkEvent *event UNUSED,
! 		    gpointer data UNUSED)
  {
      XEvent *xevent = (XEvent *)xev;
  
      if (xevent != NULL
  	    && xevent->type == ClientMessage
  	    && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
! 	    && (long_u)xevent->xclient.data.l[0]
! 					    == GET_X_ATOM(save_yourself_atom))
      {
  	out_flush();
  	ml_sync_all(FALSE, FALSE); /* preserve all swap files */
***************
*** 2512,2518 ****
  /*
   * GDK handler for X ClientMessage events.
   */
- /*ARGSUSED2*/
      static GdkFilterReturn
  gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
  {
--- 2523,2528 ----
***************
*** 2558,2566 ****
  /*
   * Setup the window icon & xcmdsrv comm after the main window has been realized.
   */
- /*ARGSUSED*/
      static void
! mainwin_realize(GtkWidget *widget, gpointer data)
  {
  /* If you get an error message here, you still need to unpack the runtime
   * archive! */
--- 2568,2575 ----
  /*
   * Setup the window icon & xcmdsrv comm after the main window has been realized.
   */
      static void
! mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
  {
  /* If you get an error message here, you still need to unpack the runtime
   * archive! */
***************
*** 2712,2722 ****
  }
  
  #ifdef HAVE_GTK_MULTIHEAD
- /*ARGSUSED1*/
      static void
  mainwin_screen_changed_cb(GtkWidget  *widget,
! 			  GdkScreen  *previous_screen,
! 			  gpointer   data)
  {
      if (!gtk_widget_has_screen(widget))
  	return;
--- 2721,2730 ----
  }
  
  #ifdef HAVE_GTK_MULTIHEAD
      static void
  mainwin_screen_changed_cb(GtkWidget  *widget,
! 			  GdkScreen  *previous_screen UNUSED,
! 			  gpointer   data UNUSED)
  {
      if (!gtk_widget_has_screen(widget))
  	return;
***************
*** 2757,2765 ****
   * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
   * fact that the main VIM engine doesn't take them into account anywhere.
   */
- /*ARGSUSED1*/
      static void
! drawarea_realize_cb(GtkWidget *widget, gpointer data)
  {
      GtkWidget *sbar;
  
--- 2765,2772 ----
   * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
   * fact that the main VIM engine doesn't take them into account anywhere.
   */
      static void
! drawarea_realize_cb(GtkWidget *widget, gpointer data UNUSED)
  {
      GtkWidget *sbar;
  
***************
*** 2789,2797 ****
  /*
   * Properly clean up on shutdown.
   */
- /*ARGSUSED0*/
      static void
! drawarea_unrealize_cb(GtkWidget *widget, gpointer data)
  {
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
--- 2796,2803 ----
  /*
   * Properly clean up on shutdown.
   */
      static void
! drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
  {
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
***************
*** 2827,2837 ****
  #endif
  }
  
- /*ARGSUSED0*/
      static void
! drawarea_style_set_cb(GtkWidget	*widget,
! 		      GtkStyle	*previous_style,
! 		      gpointer	data)
  {
      gui_mch_new_colors();
  }
--- 2833,2842 ----
  #endif
  }
  
      static void
! drawarea_style_set_cb(GtkWidget	*widget UNUSED,
! 		      GtkStyle	*previous_style UNUSED,
! 		      gpointer	data UNUSED)
  {
      gui_mch_new_colors();
  }
***************
*** 2840,2848 ****
   * Callback routine for the "delete_event" signal on the toplevel window.
   * Tries to vim gracefully, or refuses to exit with changed buffers.
   */
- /*ARGSUSED*/
      static gint
! delete_event_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
  {
      gui_shell_closed();
      return TRUE;
--- 2845,2854 ----
   * Callback routine for the "delete_event" signal on the toplevel window.
   * Tries to vim gracefully, or refuses to exit with changed buffers.
   */
      static gint
! delete_event_cb(GtkWidget *widget UNUSED,
! 		GdkEventAny *event UNUSED,
! 		gpointer data UNUSED)
  {
      gui_shell_closed();
      return TRUE;
***************
*** 2964,2970 ****
  
      /* At start-up, don't try to set the hints until the initial
       * values have been used (those that dictate our initial size)
!      * Let forced (i.e., correct) values thruogh always.
       */
      if (!(force_width && force_height)  &&  init_window_hints_state > 0)
      {
--- 2970,2976 ----
  
      /* At start-up, don't try to set the hints until the initial
       * values have been used (those that dictate our initial size)
!      * Let forced (i.e., correct) values through always.
       */
      if (!(force_width && force_height)  &&  init_window_hints_state > 0)
      {
***************
*** 3142,3150 ****
  /*
   * Handle selecting an item in the tab line popup menu.
   */
- /*ARGSUSED*/
      static void
! tabline_menu_handler(GtkMenuItem *item, gpointer user_data)
  {
      /* Add the string cmd into input buffer */
      send_tabline_menu_event(clicked_page, (int)(long)user_data);
--- 3148,3155 ----
  /*
   * Handle selecting an item in the tab line popup menu.
   */
      static void
! tabline_menu_handler(GtkMenuItem *item UNUSED, gpointer user_data)
  {
      /* Add the string cmd into input buffer */
      send_tabline_menu_event(clicked_page, (int)(long)user_data);
***************
*** 3244,3256 ****
  /*
   * Handle selecting one of the tabs.
   */
- /*ARGSUSED*/
      static void
  on_select_tab(
! 	GtkNotebook	*notebook,
! 	GtkNotebookPage *page,
  	gint		idx,
! 	gpointer	data)
  {
      if (!ignore_tabline_evt)
      {
--- 3249,3260 ----
  /*
   * Handle selecting one of the tabs.
   */
      static void
  on_select_tab(
! 	GtkNotebook	*notebook UNUSED,
! 	GtkNotebookPage *page UNUSED,
  	gint		idx,
! 	gpointer	data UNUSED)
  {
      if (!ignore_tabline_evt)
      {
***************
*** 3784,3790 ****
  #endif
  
      if (gtk_socket_id != 0)
! 	/* make sure keybord input can go to the drawarea */
  	GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
  
      /*
--- 3788,3794 ----
  #endif
  
      if (gtk_socket_id != 0)
! 	/* make sure keyboard input can go to the drawarea */
  	GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
  
      /*
***************
*** 3922,3931 ****
  /*
   * This signal informs us about the need to rearrange our sub-widgets.
   */
- /*ARGSUSED*/
      static gint
! form_configure_event(GtkWidget *widget, GdkEventConfigure *event,
! 		     gpointer data)
  {
      int usable_height = event->height;
  
--- 3926,3935 ----
  /*
   * This signal informs us about the need to rearrange our sub-widgets.
   */
      static gint
! form_configure_event(GtkWidget *widget UNUSED,
! 		     GdkEventConfigure *event,
! 		     gpointer data UNUSED)
  {
      int usable_height = event->height;
  
***************
*** 3948,3956 ****
   * We can't do much more here than to trying to preserve what had been done,
   * since the window is already inevitably going away.
   */
- /*ARGSUSED0*/
      static void
! mainwin_destroy_cb(GtkObject *object, gpointer data)
  {
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
--- 3952,3959 ----
   * We can't do much more here than to trying to preserve what had been done,
   * since the window is already inevitably going away.
   */
      static void
! mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED)
  {
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
***************
*** 3980,3988 ****
   * scrollbar init.), actually do the standard hinst and stop the timer.
   * We'll not let the default hints be set while this timer's active.
   */
- /*ARGSUSED*/
      static gboolean
! check_startup_plug_hints(gpointer data)
  {
      if (init_window_hints_state == 1)
      {
--- 3983,3990 ----
   * scrollbar init.), actually do the standard hinst and stop the timer.
   * We'll not let the default hints be set while this timer's active.
   */
      static gboolean
! check_startup_plug_hints(gpointer data UNUSED)
  {
      if (init_window_hints_state == 1)
      {
***************
*** 4055,4061 ****
  	    Columns = w;
  	if (mask & HeightValue)
  	{
! 	    if (p_window > h - 1 || !option_was_set((char_u *)"window"))
  		p_window = h - 1;
  	    Rows = h;
  	}
--- 4057,4063 ----
  	    Columns = w;
  	if (mask & HeightValue)
  	{
! 	    if (p_window > (long)h - 1 || !option_was_set((char_u *)"window"))
  		p_window = h - 1;
  	    Rows = h;
  	}
***************
*** 4229,4237 ****
  }
  
  
- /*ARGSUSED0*/
      void
! gui_mch_exit(int rc)
  {
      if (gui.mainwin != NULL)
  	gtk_widget_destroy(gui.mainwin);
--- 4231,4238 ----
  }
  
  
      void
! gui_mch_exit(int rc UNUSED)
  {
      if (gui.mainwin != NULL)
  	gtk_widget_destroy(gui.mainwin);
***************
*** 4286,4292 ****
   * report the new size through form_configure_event().  That caused the window
   * layout to be messed up.
   */
- /*ARGSUSED0*/
      static gboolean
  force_shell_resize_idle(gpointer data)
  {
--- 4287,4292 ----
***************
*** 4314,4325 ****
  /*
   * Set the windows size.
   */
- /*ARGSUSED2*/
      void
  gui_mch_set_shellsize(int width, int height,
! 		      int min_width,  int min_height,
! 		      int base_width, int base_height,
! 		      int direction)
  {
  #ifndef HAVE_GTK2
      /* Hack: When the form already is at the desired size, the window might
--- 4314,4324 ----
  /*
   * Set the windows size.
   */
      void
  gui_mch_set_shellsize(int width, int height,
! 		      int min_width UNUSED,  int min_height UNUSED,
! 		      int base_width UNUSED, int base_height UNUSED,
! 		      int direction UNUSED)
  {
  #ifndef HAVE_GTK2
      /* Hack: When the form already is at the desired size, the window might
***************
*** 4413,4421 ****
  }
  
  #if defined(FEAT_TITLE) || defined(PROTO)
- /*ARGSUSED*/
      void
! gui_mch_settitle(char_u *title, char_u *icon)
  {
  # ifdef HAVE_GTK2
      if (title != NULL && output_conv.vc_type != CONV_NONE)
--- 4412,4419 ----
  }
  
  #if defined(FEAT_TITLE) || defined(PROTO)
      void
! gui_mch_settitle(char_u *title, char_u *icon UNUSED)
  {
  # ifdef HAVE_GTK2
      if (title != NULL && output_conv.vc_type != CONV_NONE)
***************
*** 4493,4499 ****
   * Get a font structure for highlighting.
   * "cbdata" is a pointer to the global gui structure.
   */
- /*ARGSUSED*/
      static void
  font_sel_ok(GtkWidget *wgt, gpointer cbdata)
  {
--- 4491,4496 ----
***************
*** 4509,4515 ****
  	gtk_main_quit();
  }
  
- /*ARGSUSED*/
      static void
  font_sel_cancel(GtkWidget *wgt, gpointer cbdata)
  {
--- 4506,4511 ----
***************
*** 4520,4526 ****
  	gtk_main_quit();
  }
  
- /*ARGSUSED*/
      static void
  font_sel_destroy(GtkWidget *wgt, gpointer cbdata)
  {
--- 4516,4521 ----
***************
*** 4620,4626 ****
  /*
   * Try to load the requested fontset.
   */
- /*ARGSUSED2*/
      GuiFontset
  gui_mch_get_fontset(char_u *name, int report_error, int fixed_width)
  {
--- 4615,4620 ----
***************
*** 4863,4869 ****
      styled_font[1] = &gui.ital_font;
      styled_font[2] = &gui.boldital_font;
  
!     /* First free whatever was freviously there. */
      for (i = 0; i < 3; ++i)
  	if (*styled_font[i])
  	{
--- 4857,4863 ----
      styled_font[1] = &gui.ital_font;
      styled_font[2] = &gui.boldital_font;
  
!     /* First free whatever was previously there. */
      for (i = 0; i < 3; ++i)
  	if (*styled_font[i])
  	{
***************
*** 5012,5020 ****
   * Initialize Vim to use the font or fontset with the given name.
   * Return FAIL if the font could not be loaded, OK otherwise.
   */
- /*ARGSUSED1*/
      int
! gui_mch_init_font(char_u *font_name, int fontset)
  {
  #ifdef HAVE_GTK2
      PangoFontDescription    *font_desc;
--- 5006,5013 ----
   * Initialize Vim to use the font or fontset with the given name.
   * Return FAIL if the font could not be loaded, OK otherwise.
   */
      int
! gui_mch_init_font(char_u *font_name, int fontset UNUSED)
  {
  #ifdef HAVE_GTK2
      PangoFontDescription    *font_desc;
***************
*** 5326,5334 ****
  /*
   * Return the name of font "font" in allocated memory.
   */
- /*ARGSUSED*/
      char_u *
! gui_mch_get_fontname(GuiFont font, char_u *name)
  {
  # ifdef HAVE_GTK2
      if (font != NOFONT)
--- 5319,5326 ----
  /*
   * Return the name of font "font" in allocated memory.
   */
      char_u *
! gui_mch_get_fontname(GuiFont font, char_u *name UNUSED)
  {
  # ifdef HAVE_GTK2
      if (font != NOFONT)
***************
*** 5732,5738 ****
  {
      int			i;
      int			offset;
!     const static int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
      int			y = FILL_Y(row + 1) - 1;
  
      /* Undercurl: draw curl at the bottom of the character cell. */
--- 5724,5730 ----
  {
      int			i;
      int			offset;
!     static const int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
      int			y = FILL_Y(row + 1) - 1;
  
      /* Undercurl: draw curl at the bottom of the character cell. */
***************
*** 6402,6408 ****
  /*
   * Callback function, used when data is available on the SNiFF connection.
   */
- /* ARGSUSED */
      static void
  sniff_request_cb(
      gpointer	data,
--- 6394,6399 ----
***************
*** 6711,6719 ****
  /*
   * Disown the selection.
   */
- /*ARGSUSED*/
      void
! clip_mch_lose_selection(VimClipboard *cbd)
  {
      /* WEIRD: when using NULL to actually disown the selection, we lose the
       * selection the first time we own it. */
--- 6702,6709 ----
  /*
   * Disown the selection.
   */
      void
! clip_mch_lose_selection(VimClipboard *cbd UNUSED)
  {
      /* WEIRD: when using NULL to actually disown the selection, we lose the
       * selection the first time we own it. */
***************
*** 6741,6749 ****
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
   */
- /*ARGSUSED*/
      void
! clip_mch_set_selection(VimClipboard *cbd)
  {
  }
  
--- 6731,6738 ----
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
   */
      void
! clip_mch_set_selection(VimClipboard *cbd UNUSED)
  {
  }
  
***************
*** 6950,6956 ****
  	    else
  		id &= ~1;	/* they are always even (why?) */
  	}
! 	else if (shape < sizeof(mshape_ids) / sizeof(int))
  	    id = mshape_ids[shape];
  	else
  	    return;
--- 6939,6945 ----
  	    else
  		id &= ~1;	/* they are always even (why?) */
  	}
! 	else if (shape < (int)(sizeof(mshape_ids) / sizeof(int)))
  	    id = mshape_ids[shape];
  	else
  	    return;
*** ../vim-7.2.180/src/gui_gtk_f.c	2007-05-10 19:50:33.000000000 +0200
--- src/gui_gtk_f.c	2009-05-17 15:48:51.000000000 +0200
***************
*** 227,240 ****
  
      if (!form_type)
      {
! 	GtkTypeInfo form_info =
! 	{
! 	    "GtkForm",
! 	    sizeof(GtkForm),
! 	    sizeof(GtkFormClass),
! 	    (GtkClassInitFunc) gtk_form_class_init,
! 	    (GtkObjectInitFunc) gtk_form_init
! 	};
  
  	form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
      }
--- 227,239 ----
  
      if (!form_type)
      {
! 	GtkTypeInfo form_info;
! 
! 	form_info.type_name = "GtkForm";
! 	form_info.object_size = sizeof(GtkForm);
! 	form_info.class_size = sizeof(GtkFormClass);
! 	form_info.class_init_func = (GtkClassInitFunc)gtk_form_class_init;
! 	form_info.object_init_func = (GtkObjectInitFunc)gtk_form_init;
  
  	form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
      }
***************
*** 611,620 ****
      }
  }
  
- /*ARGSUSED1*/
      static void
  gtk_form_forall(GtkContainer	*container,
! 		gboolean	include_internals,
  		GtkCallback	callback,
  		gpointer	callback_data)
  {
--- 610,618 ----
      }
  }
  
      static void
  gtk_form_forall(GtkContainer	*container,
! 		gboolean	include_internals UNUSED,
  		GtkCallback	callback,
  		gpointer	callback_data)
  {
***************
*** 786,794 ****
   * them or discards them, depending on whether we are obscured
   * or not.
   */
- /*ARGSUSED1*/
      static GdkFilterReturn
! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
  {
      XEvent *xevent;
      GtkForm *form;
--- 784,791 ----
   * them or discards them, depending on whether we are obscured
   * or not.
   */
      static GdkFilterReturn
! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event UNUSED, gpointer data)
  {
      XEvent *xevent;
      GtkForm *form;
***************
*** 821,829 ****
   * there is no corresponding event in GTK, so we have
   * to get the events from a filter
   */
- /*ARGSUSED1*/
      static GdkFilterReturn
! gtk_form_main_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
  {
      XEvent *xevent;
      GtkForm *form;
--- 818,827 ----
   * there is no corresponding event in GTK, so we have
   * to get the events from a filter
   */
      static GdkFilterReturn
! gtk_form_main_filter(GdkXEvent *gdk_xevent,
! 		     GdkEvent *event UNUSED,
! 		     gpointer data)
  {
      XEvent *xevent;
      GtkForm *form;
***************
*** 911,919 ****
  #endif
  }
  
- /*ARGSUSED0*/
      static void
! gtk_form_child_map(GtkWidget *widget, gpointer user_data)
  {
      GtkFormChild *child;
  
--- 909,916 ----
  #endif
  }
  
      static void
! gtk_form_child_map(GtkWidget *widget UNUSED, gpointer user_data)
  {
      GtkFormChild *child;
  
***************
*** 923,931 ****
      gdk_window_show(child->window);
  }
  
- /*ARGSUSED0*/
      static void
! gtk_form_child_unmap(GtkWidget *widget, gpointer user_data)
  {
      GtkFormChild *child;
  
--- 920,927 ----
      gdk_window_show(child->window);
  }
  
      static void
! gtk_form_child_unmap(GtkWidget *widget UNUSED, gpointer user_data)
  {
      GtkFormChild *child;
  
*** ../vim-7.2.180/src/gui_beval.c	2009-03-18 12:20:35.000000000 +0100
--- src/gui_beval.c	2009-05-17 15:53:22.000000000 +0200
***************
*** 15,21 ****
  /*
   * Common code, invoked when the mouse is resting for a moment.
   */
- /*ARGSUSED*/
      void
  general_beval_cb(beval, state)
      BalloonEval *beval;
--- 15,20 ----
***************
*** 551,559 ****
      return FALSE; /* continue emission */
  }
  
- /*ARGSUSED*/
      static gint
! mainwin_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
  {
      BalloonEval *beval = (BalloonEval *)data;
  
--- 550,557 ----
      return FALSE; /* continue emission */
  }
  
      static gint
! mainwin_event_cb(GtkWidget *widget UNUSED, GdkEvent *event, gpointer data)
  {
      BalloonEval *beval = (BalloonEval *)data;
  
***************
*** 663,671 ****
      return FALSE; /* don't call me again */
  }
  
- /*ARGSUSED2*/
      static gint
! balloon_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
  {
      gtk_paint_flat_box(widget->style, widget->window,
  		       GTK_STATE_NORMAL, GTK_SHADOW_OUT,
--- 661,670 ----
      return FALSE; /* don't call me again */
  }
  
      static gint
! balloon_expose_event_cb(GtkWidget *widget,
! 			GdkEventExpose *event,
! 			gpointer data UNUSED)
  {
      gtk_paint_flat_box(widget->style, widget->window,
  		       GTK_STATE_NORMAL, GTK_SHADOW_OUT,
***************
*** 676,682 ****
  }
  
  # ifndef HAVE_GTK2
- /*ARGSUSED2*/
      static void
  balloon_draw_cb(GtkWidget *widget, GdkRectangle *area, gpointer data)
  {
--- 675,680 ----
***************
*** 726,732 ****
  /*
   * The X event handler. All it does is call the real event handler.
   */
- /*ARGSUSED*/
      static void
  pointerEventEH(w, client_data, event, unused)
      Widget	w;
--- 724,729 ----
***************
*** 877,883 ****
      }
  }
  
- /*ARGSUSED*/
      static void
  timerRoutine(dx, id)
      XtPointer	    dx;
--- 874,879 ----
*** ../vim-7.2.180/src/netbeans.c	2009-02-21 22:12:43.000000000 +0100
--- src/netbeans.c	2009-05-17 15:51:14.000000000 +0200
***************
*** 700,706 ****
  /*
   * Read and process a command from netbeans.
   */
- /*ARGSUSED*/
  #if defined(FEAT_GUI_W32) || defined(PROTO)
  /* Use this one when generating prototypes, the others are static. */
      void
--- 700,705 ----
***************
*** 708,719 ****
  #else
  # ifdef FEAT_GUI_MOTIF
      static void
! messageFromNetbeans(XtPointer clientData, int *unused1, XtInputId *unused2)
  # endif
  # ifdef FEAT_GUI_GTK
      static void
! messageFromNetbeans(gpointer clientData, gint unused1,
! 						    GdkInputCondition unused2)
  # endif
  #endif
  {
--- 707,721 ----
  #else
  # ifdef FEAT_GUI_MOTIF
      static void
! messageFromNetbeans(XtPointer clientData UNUSED
! 		    int *unused1 UNUSED,
! 		    XtInputId *unused2 UNUSED)
  # endif
  # ifdef FEAT_GUI_GTK
      static void
! messageFromNetbeans(gpointer clientData UNUSED,
! 		    gint unused1 UNUSED,
! 		    GdkInputCondition unused2 UNUSED)
  # endif
  #endif
  {
***************
*** 1585,1591 ****
--- 1587,1595 ----
  			    buf_delsign(buf->bufp, id);
  			}
  			else
+ 			{
  			    nbdebug(("    No sign on line %d\n", i));
+ 			}
  		    }
  
  		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
***************
*** 2144,2150 ****
--- 2148,2156 ----
  #endif
  	    }
  	    else
+ 	    {
  		nbdebug(("    BAD POSITION in setDot: %s\n", s));
+ 	    }
  
  	    /* gui_update_cursor(TRUE, FALSE); */
  	    /* update_curbuf(NOT_VALID); */
***************
*** 2744,2754 ****
   * cursor and sends it to the debugger for evaluation.  The debugger should
   * respond with a showBalloon command when there is a useful result.
   */
- /*ARGSUSED*/
      void
  netbeans_beval_cb(
  	BalloonEval	*beval,
! 	int		 state)
  {
      win_T	*wp;
      char_u	*text;
--- 2750,2759 ----
   * cursor and sends it to the debugger for evaluation.  The debugger should
   * respond with a showBalloon command when there is a useful result.
   */
      void
  netbeans_beval_cb(
  	BalloonEval	*beval,
! 	int		 state UNUSED)
  {
      win_T	*wp;
      char_u	*text;
***************
*** 3061,3069 ****
  /*
   * Send netbeans an unmodufied command.
   */
- /*ARGSUSED*/
      void
! netbeans_unmodified(buf_T *bufp)
  {
  #if 0
      char_u	buf[128];
--- 3066,3073 ----
  /*
   * Send netbeans an unmodufied command.
   */
      void
! netbeans_unmodified(buf_T *bufp UNUSED)
  {
  #if 0
      char_u	buf[128];
***************
*** 3370,3382 ****
   * buf->signmapused[]	maps buffer-local annotation IDs to an index in
   *			globalsignmap[].
   */
- /*ARGSUSED*/
      static void
  addsigntype(
      nbbuf_T	*buf,
      int		typeNum,
      char_u	*typeName,
!     char_u	*tooltip,
      char_u	*glyphFile,
      int		use_fg,
      int		fg,
--- 3374,3385 ----
   * buf->signmapused[]	maps buffer-local annotation IDs to an index in
   *			globalsignmap[].
   */
      static void
  addsigntype(
      nbbuf_T	*buf,
      int		typeNum,
      char_u	*typeName,
!     char_u	*tooltip UNUSED,
      char_u	*glyphFile,
      int		use_fg,
      int		fg,
*** ../vim-7.2.180/src/version.c	2009-05-17 13:30:58.000000000 +0200
--- src/version.c	2009-05-17 16:07:26.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     181,
  /**/

-- 
I am always surprised in the Linux world how quickly solutions can be
obtained.  (Imagine sending an email to Bill Gates, asking why Windows
crashed, and how to fix it...  and then getting an answer that fixed the
problem... <0>_<0> !)		              -- Mark Langdon

 /// 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    ///


--- NEW FILE 7.2.182 ---
To: vim-dev at vim.org
Subject: Patch 7.2.182
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.182 (after 7.2.181)
Problem:    Compilation problems after previous patch for Motif.  Gvim with
	    GTK crashes on startup.
Solution:   Add comma.  Init form structure to zeroes.
Files:	    src/netbeans.c, src/gui_gtk_f.c


*** ../vim-7.2.181/src/netbeans.c	2009-05-17 16:23:20.000000000 +0200
--- src/netbeans.c	2009-05-17 22:34:11.000000000 +0200
***************
*** 707,713 ****
  #else
  # ifdef FEAT_GUI_MOTIF
      static void
! messageFromNetbeans(XtPointer clientData UNUSED
  		    int *unused1 UNUSED,
  		    XtInputId *unused2 UNUSED)
  # endif
--- 707,713 ----
  #else
  # ifdef FEAT_GUI_MOTIF
      static void
! messageFromNetbeans(XtPointer clientData UNUSED,
  		    int *unused1 UNUSED,
  		    XtInputId *unused2 UNUSED)
  # endif
*** ../vim-7.2.181/src/gui_gtk_f.c	2009-05-17 16:23:20.000000000 +0200
--- src/gui_gtk_f.c	2009-05-17 23:20:41.000000000 +0200
***************
*** 229,234 ****
--- 229,235 ----
      {
  	GtkTypeInfo form_info;
  
+ 	vim_memset(&form_info, 0, sizeof(form_info));
  	form_info.type_name = "GtkForm";
  	form_info.object_size = sizeof(GtkForm);
  	form_info.class_size = sizeof(GtkFormClass);
*** ../vim-7.2.181/src/version.c	2009-05-17 16:23:20.000000000 +0200
--- src/version.c	2009-05-17 23:21:41.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     182,
  /**/

-- 
We apologise again for the fault in the subtitles.  Those responsible for
sacking the people who have just been sacked have been sacked.
                 "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    ///


--- NEW FILE 7.2.183 ---
To: vim-dev at vim.org
Subject: Patch 7.2.183
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.183
Problem:    Configure problem for sys/sysctl.h on OpenBSD. (Dasn)
Solution:   Add separate check for this header file.  Also switch to newer
	    version of autoconf.
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.182/src/auto/configure	2009-05-14 22:19:19.000000000 +0200
--- src/auto/configure	2009-05-16 13:32:16.000000000 +0200
***************
*** 1,6 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.62.
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.63.
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
***************
*** 635,772 ****
  # include <unistd.h>
  #endif"
  
! ac_subst_vars='SHELL
! PATH_SEPARATOR
! PACKAGE_NAME
! PACKAGE_TARNAME
! PACKAGE_VERSION
! PACKAGE_STRING
! PACKAGE_BUGREPORT
! exec_prefix
! prefix
! program_transform_name
! bindir
! sbindir
! libexecdir
! datarootdir
! datadir
! sysconfdir
! sharedstatedir
! localstatedir
! includedir
! oldincludedir
! docdir
! infodir
! htmldir
! dvidir
! pdfdir
! psdir
! libdir
! localedir
! mandir
! DEFS
! ECHO_C
! ECHO_N
! ECHO_T
! LIBS
! build_alias
! host_alias
! target_alias
! SET_MAKE
! CC
! CFLAGS
! LDFLAGS
! CPPFLAGS
! ac_ct_CC
! EXEEXT
! OBJEXT
! CPP
! GREP
! EGREP
! AWK
! STRIP
! CPP_MM
! OS_EXTRA_SRC
! OS_EXTRA_OBJ
! VIMNAME
! EXNAME
! VIEWNAME
! line_break
! dovimdiff
! dogvimdiff
! compiledby
! vi_cv_path_mzscheme
! MZSCHEME_SRC
! MZSCHEME_OBJ
! MZSCHEME_PRO
! MZSCHEME_LIBS
! MZSCHEME_CFLAGS
! vi_cv_path_perl
! vi_cv_perllib
! shrpenv
! PERL_SRC
! PERL_OBJ
! PERL_PRO
! PERL_CFLAGS
! PERL_LIBS
! vi_cv_path_python
! PYTHON_CONFDIR
! PYTHON_LIBS
! PYTHON_GETPATH_CFLAGS
! PYTHON_CFLAGS
! PYTHON_SRC
! PYTHON_OBJ
! vi_cv_path_tcl
! TCL_SRC
! TCL_OBJ
! TCL_PRO
! TCL_CFLAGS
! TCL_LIBS
! vi_cv_path_ruby
! RUBY_SRC
! RUBY_OBJ
! RUBY_PRO
! RUBY_CFLAGS
! RUBY_LIBS
! WORKSHOP_SRC
! WORKSHOP_OBJ
! NETBEANS_SRC
! NETBEANS_OBJ
! SNIFF_SRC
! SNIFF_OBJ
! xmkmfpath
! XMKMF
! X_CFLAGS
! X_PRE_LIBS
! X_LIBS
! X_EXTRA_LIBS
! X_LIB
! GTK_CONFIG
! GTK12_CONFIG
! PKG_CONFIG
! GTK_CFLAGS
! GTK_LIBS
! GTK_LIBNAME
! GNOME_LIBS
! GNOME_LIBDIR
! GNOME_INCLUDEDIR
! GNOME_CONFIG
! MOTIF_LIBNAME
! NARROW_PROTO
! GUI_INC_LOC
! GUI_LIB_LOC
! GUITYPE
! GUI_X_LIBS
! HANGULIN_SRC
! HANGULIN_OBJ
! TAGPRG
! INSTALL_LANGS
! INSTALL_TOOL_LANGS
! MSGFMT
! MAKEMO
! DEPEND_CFLAGS_FILTER
  LIBOBJS
! LTLIBOBJS'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
--- 635,772 ----
  # include <unistd.h>
  #endif"
  
! ac_subst_vars='LTLIBOBJS
  LIBOBJS
! DEPEND_CFLAGS_FILTER
! MAKEMO
! MSGFMT
! INSTALL_TOOL_LANGS
! INSTALL_LANGS
! TAGPRG
! HANGULIN_OBJ
! HANGULIN_SRC
! GUI_X_LIBS
! GUITYPE
! GUI_LIB_LOC
! GUI_INC_LOC
! NARROW_PROTO
! MOTIF_LIBNAME
! GNOME_CONFIG
! GNOME_INCLUDEDIR
! GNOME_LIBDIR
! GNOME_LIBS
! GTK_LIBNAME
! GTK_LIBS
! GTK_CFLAGS
! PKG_CONFIG
! GTK12_CONFIG
! GTK_CONFIG
! X_LIB
! X_EXTRA_LIBS
! X_LIBS
! X_PRE_LIBS
! X_CFLAGS
! XMKMF
! xmkmfpath
! SNIFF_OBJ
! SNIFF_SRC
! NETBEANS_OBJ
! NETBEANS_SRC
! WORKSHOP_OBJ
! WORKSHOP_SRC
! RUBY_LIBS
! RUBY_CFLAGS
! RUBY_PRO
! RUBY_OBJ
! RUBY_SRC
! vi_cv_path_ruby
! TCL_LIBS
! TCL_CFLAGS
! TCL_PRO
! TCL_OBJ
! TCL_SRC
! vi_cv_path_tcl
! PYTHON_OBJ
! PYTHON_SRC
! PYTHON_CFLAGS
! PYTHON_GETPATH_CFLAGS
! PYTHON_LIBS
! PYTHON_CONFDIR
! vi_cv_path_python
! PERL_LIBS
! PERL_CFLAGS
! PERL_PRO
! PERL_OBJ
! PERL_SRC
! shrpenv
! vi_cv_perllib
! vi_cv_path_perl
! MZSCHEME_CFLAGS
! MZSCHEME_LIBS
! MZSCHEME_PRO
! MZSCHEME_OBJ
! MZSCHEME_SRC
! vi_cv_path_mzscheme
! compiledby
! dogvimdiff
! dovimdiff
! line_break
! VIEWNAME
! EXNAME
! VIMNAME
! OS_EXTRA_OBJ
! OS_EXTRA_SRC
! CPP_MM
! STRIP
! AWK
! EGREP
! GREP
! CPP
! OBJEXT
! EXEEXT
! ac_ct_CC
! CPPFLAGS
! LDFLAGS
! CFLAGS
! CC
! SET_MAKE
! target_alias
! host_alias
! build_alias
! LIBS
! ECHO_T
! ECHO_N
! ECHO_C
! DEFS
! mandir
! localedir
! libdir
! psdir
! pdfdir
! dvidir
! htmldir
! infodir
! docdir
! oldincludedir
! includedir
! localstatedir
! sharedstatedir
! sysconfdir
! datadir
! datarootdir
! libexecdir
! sbindir
! bindir
! program_transform_name
! prefix
! exec_prefix
! PACKAGE_BUGREPORT
! PACKAGE_STRING
! PACKAGE_VERSION
! PACKAGE_TARNAME
! PACKAGE_NAME
! PATH_SEPARATOR
! SHELL'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
***************
*** 1253,1261 ****
  if test -n "$ac_unrecognized_opts"; then
    case $enable_option_checking in
      no) ;;
!     fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
     { (exit 1); exit 1; }; } ;;
!     *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
  
--- 1253,1261 ----
  if test -n "$ac_unrecognized_opts"; then
    case $enable_option_checking in
      no) ;;
!     fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
     { (exit 1); exit 1; }; } ;;
!     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
  
***************
*** 1308,1314 ****
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
!   { $as_echo "$as_me: error: Working directory cannot be determined" >&2
     { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
--- 1308,1314 ----
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
!   { $as_echo "$as_me: error: working directory cannot be determined" >&2
     { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
***************
*** 1587,1593 ****
  if $ac_init_version; then
    cat <<\_ACEOF
  configure
! generated by GNU Autoconf 2.62
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--- 1587,1593 ----
  if $ac_init_version; then
    cat <<\_ACEOF
  configure
! generated by GNU Autoconf 2.63
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
***************
*** 1601,1607 ****
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
! generated by GNU Autoconf 2.62.  Invocation command line was
  
    $ $0 $@
  
--- 1601,1607 ----
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
! generated by GNU Autoconf 2.63.  Invocation command line was
  
    $ $0 $@
  
***************
*** 1724,1731 ****
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
! $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
--- 1724,1731 ----
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
***************
*** 1928,1933 ****
--- 1928,1935 ----
    fi
  done
  if $ac_cache_corrupted; then
+   { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
***************
*** 2084,2095 ****
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
! { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf at gnu.org." >&5
! $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
--- 2086,2093 ----
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
! { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
***************
*** 2288,2299 ****
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
! { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf at gnu.org." >&5
! $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
--- 2286,2293 ----
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
! { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
***************
*** 2303,2313 ****
  fi
  
  
! test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
  $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
--- 2297,2309 ----
  fi
  
  
! test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
  
  # Provide some information about the compiler.
  $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
***************
*** 2437,2447 ****
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: C compiler cannot create executables
  See \`config.log' for more details." >&2;}
!    { (exit 77); exit 77; }; }
  fi
  
  ac_exeext=$ac_cv_exeext
--- 2433,2445 ----
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: C compiler cannot create executables
  See \`config.log' for more details." >&2;}
!    { (exit 77); exit 77; }; }; }
  fi
  
  ac_exeext=$ac_cv_exeext
***************
*** 2469,2481 ****
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
      else
! 	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
      fi
    fi
  fi
--- 2467,2481 ----
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
      else
! 	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
      fi
    fi
  fi
***************
*** 2518,2528 ****
    esac
  done
  else
!   { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
  fi
  
  rm -f conftest$ac_cv_exeext
--- 2518,2530 ----
    esac
  done
  else
!   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
  fi
  
  rm -f conftest$ac_cv_exeext
***************
*** 2576,2586 ****
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
  fi
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
--- 2578,2590 ----
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
  fi
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
***************
*** 3148,3158 ****
  if $ac_preproc_ok; then
    :
  else
!   { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
  fi
  
  ac_ext=c
--- 3152,3164 ----
  if $ac_preproc_ok; then
    :
  else
!   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
  fi
  
  ac_ext=c
***************
*** 4016,4023 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 4022,4030 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 4154,4160 ****
  $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
  
  fi
! if test $ac_cv_header_Carbon_Carbon_h = yes; then
    CARBON=yes
  fi
  
--- 4161,4167 ----
  $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
  
  fi
! if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
    CARBON=yes
  fi
  
***************
*** 4484,4490 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
  $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
! if test $ac_cv_lib_selinux_is_selinux_enabled = yes; then
    LIBS="$LIBS -lselinux"
  	   cat >>confdefs.h <<\_ACEOF
  #define HAVE_SELINUX 1
--- 4491,4497 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
  $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
! if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then
    LIBS="$LIBS -lselinux"
  	   cat >>confdefs.h <<\_ACEOF
  #define HAVE_SELINUX 1
***************
*** 5891,5897 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
  $as_echo "$ac_cv_lib_socket_socket" >&6; }
! if test $ac_cv_lib_socket_socket = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSOCKET 1
  _ACEOF
--- 5898,5904 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
  $as_echo "$ac_cv_lib_socket_socket" >&6; }
! if test "x$ac_cv_lib_socket_socket" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSOCKET 1
  _ACEOF
***************
*** 5966,5972 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test $ac_cv_lib_nsl_gethostbyname = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
  _ACEOF
--- 5973,5979 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
  _ACEOF
***************
*** 6203,6210 ****
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
!     *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
! $as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
     { (exit 1); exit 1; }; };; #(
      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
    $as_echo_n "(cached) " >&6
--- 6210,6217 ----
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
!     *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
! $as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
     { (exit 1); exit 1; }; };; #(
      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
    $as_echo_n "(cached) " >&6
***************
*** 6242,6248 ****
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
! 	/usr/lib | /lib) ;;
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
--- 6249,6255 ----
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
! 	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
***************
*** 6682,6688 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
! if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  fi
  
--- 6689,6695 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
! if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  fi
  
***************
*** 6752,6758 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
! if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
  
--- 6759,6765 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
! if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
  
***************
*** 6924,6930 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test $ac_cv_lib_nsl_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
  
--- 6931,6937 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
  
***************
*** 6994,7000 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
! if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
--- 7001,7007 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
! if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
***************
*** 7160,7166 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
  $as_echo "$ac_cv_lib_socket_connect" >&6; }
! if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
--- 7167,7173 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
  $as_echo "$ac_cv_lib_socket_connect" >&6; }
! if test "x$ac_cv_lib_socket_connect" = x""yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
***************
*** 7319,7325 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
  $as_echo "$ac_cv_lib_posix_remove" >&6; }
! if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
  
--- 7326,7332 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
  $as_echo "$ac_cv_lib_posix_remove" >&6; }
! if test "x$ac_cv_lib_posix_remove" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
  
***************
*** 7478,7484 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
! if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
--- 7485,7491 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
! if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
***************
*** 7559,7565 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
! if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
--- 7566,7572 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
! if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
***************
*** 7727,7733 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
  $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
! if test $ac_cv_lib_Xdmcp__XdmcpAuthDoIt = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
  fi
  
--- 7734,7740 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
  $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
! if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
  fi
  
***************
*** 7797,7803 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
  $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; }
! if test $ac_cv_lib_ICE_IceOpenConnection = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
  fi
  
--- 7804,7810 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
  $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; }
! if test "x$ac_cv_lib_ICE_IceOpenConnection" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
  fi
  
***************
*** 7868,7874 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
  $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
! if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lXpm"
  fi
  
--- 7875,7881 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
  $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
! if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = x""yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lXpm"
  fi
  
***************
*** 9251,9257 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
  $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
! if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
    GUI_X_LIBS="-lXext"
  fi
  
--- 9258,9264 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
  $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
! if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then
    GUI_X_LIBS="-lXext"
  fi
  
***************
*** 9320,9326 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5
  $as_echo "$ac_cv_lib_w_wslen" >&6; }
! if test $ac_cv_lib_w_wslen = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
  fi
  
--- 9327,9333 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5
  $as_echo "$ac_cv_lib_w_wslen" >&6; }
! if test "x$ac_cv_lib_w_wslen" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
  fi
  
***************
*** 9389,9395 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
  $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
! if test $ac_cv_lib_dl_dlsym = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
  fi
  
--- 9396,9402 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
  $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
! if test "x$ac_cv_lib_dl_dlsym" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
  fi
  
***************
*** 9458,9464 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
  $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
! if test $ac_cv_lib_Xmu_XmuCreateStippledPixmap = yes; then
    GUI_X_LIBS="-lXmu $GUI_X_LIBS"
  fi
  
--- 9465,9471 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
  $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
! if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = x""yes; then
    GUI_X_LIBS="-lXmu $GUI_X_LIBS"
  fi
  
***************
*** 9528,9534 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5
  $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; }
! if test $ac_cv_lib_Xp_XpEndJob = yes; then
    GUI_X_LIBS="-lXp $GUI_X_LIBS"
  fi
  
--- 9535,9541 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5
  $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; }
! if test "x$ac_cv_lib_Xp_XpEndJob" = x""yes; then
    GUI_X_LIBS="-lXp $GUI_X_LIBS"
  fi
  
***************
*** 9699,9706 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 9706,9714 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 9852,9859 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 9860,9868 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 10098,10105 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 10107,10115 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 10539,10545 ****
  $as_echo "$ac_cv_header_elf_h" >&6; }
  
  fi
! if test $ac_cv_header_elf_h = yes; then
    HAS_ELF=1
  fi
  
--- 10549,10555 ----
  $as_echo "$ac_cv_header_elf_h" >&6; }
  
  fi
! if test "x$ac_cv_header_elf_h" = x""yes; then
    HAS_ELF=1
  fi
  
***************
*** 10605,10611 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
  $as_echo "$ac_cv_lib_elf_main" >&6; }
! if test $ac_cv_lib_elf_main = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBELF 1
  _ACEOF
--- 10615,10621 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
  $as_echo "$ac_cv_lib_elf_main" >&6; }
! if test "x$ac_cv_lib_elf_main" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBELF 1
  _ACEOF
***************
*** 10679,10686 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
--- 10689,10697 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
***************
*** 10966,10972 ****
  
  
  
- 
  for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
  	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
  	iconv.h langinfo.h math.h unistd.h stropts.h errno.h \
--- 10977,10982 ----
***************
*** 10974,10980 ****
  	sys/stream.h termios.h libc.h sys/statfs.h \
  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
  	libgen.h util/debug.h util/msg18n.h frame.h \
! 	sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h
  do
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--- 10984,10990 ----
  	sys/stream.h termios.h libc.h sys/statfs.h \
  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
  	libgen.h util/debug.h util/msg18n.h frame.h \
! 	sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h
  do
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
***************
*** 11108,11115 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 11118,11126 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 11172,11179 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 11183,11256 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
!   cat >>confdefs.h <<_ACEOF
! #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
! _ACEOF
! 
! fi
! 
! done
! 
! 
! 
! for ac_header in sys/sysctl.h
! do
! as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
! { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
! $as_echo_n "checking for $ac_header... " >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   $as_echo_n "(cached) " >&6
! else
!   cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! #if defined HAVE_SYS_PARAM_H
! #  include <sys/param.h>
! #endif
! 
! #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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
! $as_echo "$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
!   $as_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
!   eval "$as_ac_Header=yes"
! else
!   $as_echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! 	eval "$as_ac_Header=no"
! fi
! 
! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
! fi
! ac_res=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
! 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
! $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 11372,11379 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 11449,11457 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 11770,11776 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
  $as_echo "$ac_cv_type_mode_t" >&6; }
! if test $ac_cv_type_mode_t = yes; then
    :
  else
  
--- 11848,11854 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
  $as_echo "$ac_cv_type_mode_t" >&6; }
! if test "x$ac_cv_type_mode_t" = x""yes; then
    :
  else
  
***************
*** 11874,11880 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
  $as_echo "$ac_cv_type_off_t" >&6; }
! if test $ac_cv_type_off_t = yes; then
    :
  else
  
--- 11952,11958 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
  $as_echo "$ac_cv_type_off_t" >&6; }
! if test "x$ac_cv_type_off_t" = x""yes; then
    :
  else
  
***************
*** 11978,11984 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
  $as_echo "$ac_cv_type_pid_t" >&6; }
! if test $ac_cv_type_pid_t = yes; then
    :
  else
  
--- 12056,12062 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
  $as_echo "$ac_cv_type_pid_t" >&6; }
! if test "x$ac_cv_type_pid_t" = x""yes; then
    :
  else
  
***************
*** 12082,12088 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
  $as_echo "$ac_cv_type_size_t" >&6; }
! if test $ac_cv_type_size_t = yes; then
    :
  else
  
--- 12160,12166 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
  $as_echo "$ac_cv_type_size_t" >&6; }
! if test "x$ac_cv_type_size_t" = x""yes; then
    :
  else
  
***************
*** 12286,12292 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
  $as_echo "$ac_cv_type_ino_t" >&6; }
! if test $ac_cv_type_ino_t = yes; then
    :
  else
  
--- 12364,12370 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
  $as_echo "$ac_cv_type_ino_t" >&6; }
! if test "x$ac_cv_type_ino_t" = x""yes; then
    :
  else
  
***************
*** 12390,12396 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5
  $as_echo "$ac_cv_type_dev_t" >&6; }
! if test $ac_cv_type_dev_t = yes; then
    :
  else
  
--- 12468,12474 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5
  $as_echo "$ac_cv_type_dev_t" >&6; }
! if test "x$ac_cv_type_dev_t" = x""yes; then
    :
  else
  
***************
*** 12680,12687 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_Lib'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
  _ACEOF
--- 12758,12766 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Lib'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
  _ACEOF
***************
*** 13929,13936 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_var'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
--- 14008,14016 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_var'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
***************
*** 14313,14319 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5
  $as_echo "$ac_cv_lib_m_strtod" >&6; }
! if test $ac_cv_lib_m_strtod = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
  _ACEOF
--- 14393,14399 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5
  $as_echo "$ac_cv_lib_m_strtod" >&6; }
! if test "x$ac_cv_lib_m_strtod" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
  _ACEOF
***************
*** 14473,14479 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5
  $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; }
! if test $ac_cv_lib_posix1e_acl_get_file = yes; then
    LIBS="$LIBS -lposix1e"
  else
    { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
--- 14553,14559 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5
  $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; }
! if test "x$ac_cv_lib_posix1e_acl_get_file" = x""yes; then
    LIBS="$LIBS -lposix1e"
  else
    { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
***************
*** 14541,14547 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
  $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
! if test $ac_cv_lib_acl_acl_get_file = yes; then
    LIBS="$LIBS -lacl"
  		  { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5
  $as_echo_n "checking for fgetxattr in -lattr... " >&6; }
--- 14621,14627 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
  $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
! if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then
    LIBS="$LIBS -lacl"
  		  { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5
  $as_echo_n "checking for fgetxattr in -lattr... " >&6; }
***************
*** 14608,14614 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5
  $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
! if test $ac_cv_lib_attr_fgetxattr = yes; then
    LIBS="$LIBS -lattr"
  fi
  
--- 14688,14694 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5
  $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
! if test "x$ac_cv_lib_attr_fgetxattr" = x""yes; then
    LIBS="$LIBS -lattr"
  fi
  
***************
*** 15746,15752 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
  $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
! if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then
    LIBS="$LIBS -lxpg4"
  fi
  
--- 15826,15832 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
  $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
! if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = x""yes; then
    LIBS="$LIBS -lxpg4"
  fi
  
***************
*** 16045,16052 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_var'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
--- 16125,16133 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_var'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
***************
*** 16246,16252 ****
  $as_echo "$ac_cv_header_dlfcn_h" >&6; }
  
  fi
! if test $ac_cv_header_dlfcn_h = yes; then
    DLL=dlfcn.h
  else
    if test "${ac_cv_header_dl_h+set}" = set; then
--- 16327,16333 ----
  $as_echo "$ac_cv_header_dlfcn_h" >&6; }
  
  fi
! if test "x$ac_cv_header_dlfcn_h" = x""yes; then
    DLL=dlfcn.h
  else
    if test "${ac_cv_header_dl_h+set}" = set; then
***************
*** 16376,16382 ****
  $as_echo "$ac_cv_header_dl_h" >&6; }
  
  fi
! if test $ac_cv_header_dl_h = yes; then
    DLL=dl.h
  fi
  
--- 16457,16463 ----
  $as_echo "$ac_cv_header_dl_h" >&6; }
  
  fi
! if test "x$ac_cv_header_dl_h" = x""yes; then
    DLL=dl.h
  fi
  
***************
*** 16895,16902 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 16976,16984 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 16986,16993 ****
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
! $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
--- 17068,17075 ----
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
***************
*** 17379,17385 ****
  # values after options handling.
  ac_log="
  This file was extended by $as_me, which was
! generated by GNU Autoconf 2.62.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
--- 17461,17467 ----
  # values after options handling.
  ac_log="
  This file was extended by $as_me, which was
! generated by GNU Autoconf 2.63.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
***************
*** 17392,17397 ****
--- 17474,17488 ----
  
  _ACEOF
  
+ case $ac_config_files in *"
+ "*) set x $ac_config_files; shift; ac_config_files=$*;;
+ esac
+ 
+ case $ac_config_headers in *"
+ "*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+ esac
+ 
+ 
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  # Files that config.status was made for.
  config_files="$ac_config_files"
***************
*** 17404,17419 ****
  \`$as_me' instantiates files from templates according to the
  current configuration.
  
! Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
!   -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
!   --file=FILE[:TEMPLATE]
                     instantiate the configuration file FILE
!   --header=FILE[:TEMPLATE]
                     instantiate the configuration header FILE
  
  Configuration files:
--- 17495,17511 ----
  \`$as_me' instantiates files from templates according to the
  current configuration.
  
! Usage: $0 [OPTION]... [FILE]...
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
!   -q, --quiet, --silent
!                    do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
!       --file=FILE[:TEMPLATE]
                     instantiate the configuration file FILE
!       --header=FILE[:TEMPLATE]
                     instantiate the configuration header FILE
  
  Configuration files:
***************
*** 17428,17434 ****
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
  config.status
! configured by $0, generated by GNU Autoconf 2.62,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright (C) 2008 Free Software Foundation, Inc.
--- 17520,17526 ----
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
  config.status
! configured by $0, generated by GNU Autoconf 2.63,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright (C) 2008 Free Software Foundation, Inc.
***************
*** 17625,17631 ****
  $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
     { (exit 1); exit 1; }; }
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
      break
    elif $ac_last_try; then
      { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- 17717,17724 ----
  $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
     { (exit 1); exit 1; }; }
  
!   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
!   if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
      { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
***************
*** 17830,17838 ****
    }
    split(mac1, mac2, "(") #)
    macro = mac2[1]
    if (D_is_set[macro]) {
      # Preserve the white space surrounding the "#".
-     prefix = substr(line, 1, index(line, defundef) - 1)
      print prefix "define", macro P[macro] D[macro]
      next
    } else {
--- 17923,17931 ----
    }
    split(mac1, mac2, "(") #)
    macro = mac2[1]
+   prefix = substr(line, 1, index(line, defundef) - 1)
    if (D_is_set[macro]) {
      # Preserve the white space surrounding the "#".
      print prefix "define", macro P[macro] D[macro]
      next
    } else {
***************
*** 17840,17846 ****
      # in the case of _POSIX_SOURCE, which is predefined and required
      # on some systems where configure will not decide to define it.
      if (defundef == "undef") {
!       print "/*", line, "*/"
        next
      }
    }
--- 17933,17939 ----
      # in the case of _POSIX_SOURCE, which is predefined and required
      # on some systems where configure will not decide to define it.
      if (defundef == "undef") {
!       print "/*", prefix defundef, macro, "*/"
        next
      }
    }
***************
*** 17864,17871 ****
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
!   :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
! $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
     { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
--- 17957,17964 ----
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
!   :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
! $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
     { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
***************
*** 18183,18190 ****
    $ac_cs_success || { (exit 1); exit 1; }
  fi
  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
!   { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
! $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
  
--- 18276,18283 ----
    $ac_cs_success || { (exit 1); exit 1; }
  fi
  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
!   { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
! $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
  
*** ../vim-7.2.182/src/configure.in	2009-05-14 22:19:19.000000000 +0200
--- src/configure.in	2009-05-16 13:32:00.000000000 +0200
***************
*** 2100,2106 ****
  	sys/stream.h termios.h libc.h sys/statfs.h \
  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
  	libgen.h util/debug.h util/msg18n.h frame.h \
! 	sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h)
  
  dnl sys/ptem.h depends on sys/stream.h on Solaris
  AC_CHECK_HEADERS(sys/ptem.h, [], [],
--- 2100,2106 ----
  	sys/stream.h termios.h libc.h sys/statfs.h \
  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
  	libgen.h util/debug.h util/msg18n.h frame.h \
! 	sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h)
  
  dnl sys/ptem.h depends on sys/stream.h on Solaris
  AC_CHECK_HEADERS(sys/ptem.h, [], [],
***************
*** 2108,2113 ****
--- 2108,2119 ----
  #  include <sys/stream.h>
  #endif])
  
+ dnl sys/sysctl.h depends on sys/param.h on OpenBSD
+ AC_CHECK_HEADERS(sys/sysctl.h, [], [],
+ [#if defined HAVE_SYS_PARAM_H
+ #  include <sys/param.h>
+ #endif])
+ 
  
  dnl pthread_np.h may exist but can only be used after including pthread.h
  AC_MSG_CHECKING([for pthread_np.h])
*** ../vim-7.2.182/src/version.c	2009-05-17 23:25:16.000000000 +0200
--- src/version.c	2009-05-21 15:16:01.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     183,
  /**/

-- 
CART DRIVER: Bring out your dead!
   There are legs stick out of windows and doors.  Two MEN are fighting in the
   mud - covered from head to foot in it.  Another MAN is on his hands in
   knees shovelling mud into his mouth.  We just catch sight of a MAN falling
   into a well.
                 "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    ///


--- NEW FILE 7.2.184 ---
To: vim-dev at vim.org
Subject: Patch 7.2.184
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.184
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Add UNUSED and type casts.  Autoconf check for wchar_t.
Files:	    src/auto/configure, src/config.h.in, src/configure.in,
	    src/gui_athena.c, src/gui_x11.c, src/gui.c, src/gui_beval.c,
	    src/gui_at_sb.c, src/gui_at_fs.c, src/gui_motif.c,
	    src/gui_xmdlg.c, src/gui_xmebw.c, src/if_python.c, src/window.c,
	    src/workshop.c


*** ../vim-7.2.183/src/auto/configure	2009-05-21 15:19:59.000000000 +0200
--- src/auto/configure	2009-05-21 16:05:01.000000000 +0200
***************
*** 7977,7982 ****
--- 7977,8058 ----
  
      LDFLAGS="$ac_save_LDFLAGS"
  
+     { $as_echo "$as_me:$LINENO: checking size of wchar_t is 2 bytes" >&5
+ $as_echo_n "checking size of wchar_t is 2 bytes... " >&6; }
+     if test "${ac_cv_small_wchar_t+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then
+   { { $as_echo "$as_me:$LINENO: error: failed to compile test program" >&5
+ $as_echo "$as_me: error: failed to compile test program" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+ #include <X11/Xlib.h>
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #endif
+ 		main()
+ 		{
+ 		  if (sizeof(wchar_t) <= 2)
+ 		    exit(1);
+ 		  exit(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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+   $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_small_wchar_t="no"
+ else
+   $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_small_wchar_t="yes"
+ fi
+ rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ 
+ fi
+ 
+     { $as_echo "$as_me:$LINENO: result: $ac_cv_small_wchar_t" >&5
+ $as_echo "$ac_cv_small_wchar_t" >&6; }
+     if test "x$ac_cv_small_wchar_t" = "xyes" ; then
+       cat >>confdefs.h <<\_ACEOF
+ #define SMALL_WCHAR_T 1
+ _ACEOF
+ 
+     fi
+ 
    fi
  fi
  
***************
*** 15417,15423 ****
  
  
  
- 
  bcopy_test_prog='
  #include "confdefs.h"
  #ifdef HAVE_STRING_H
--- 15493,15498 ----
*** ../vim-7.2.183/src/config.h.in	2009-05-14 22:19:19.000000000 +0200
--- src/config.h.in	2009-05-21 15:44:24.000000000 +0200
***************
*** 39,44 ****
--- 39,47 ----
  /* Defined to the size of an int */
  #undef SIZEOF_INT
  
+ /* Define when wchar_t is only 2 bytes. */
+ #undef SMALL_WCHAR_T
+ 
  /*
   * If we cannot trust one of the following from the libraries, we use our
   * own safe but probably slower vim_memmove().
*** ../vim-7.2.183/src/configure.in	2009-05-21 15:19:59.000000000 +0200
--- src/configure.in	2009-05-21 16:04:56.000000000 +0200
***************
*** 1193,1198 ****
--- 1193,1220 ----
  
      LDFLAGS="$ac_save_LDFLAGS"
  
+     AC_MSG_CHECKING(size of wchar_t is 2 bytes)
+     AC_CACHE_VAL(ac_cv_small_wchar_t,
+ 	[AC_TRY_RUN([
+ #include <X11/Xlib.h>
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #endif
+ 		main()
+ 		{
+ 		  if (sizeof(wchar_t) <= 2)
+ 		    exit(1);
+ 		  exit(0);
+ 		}],
+ 		ac_cv_small_wchar_t="no",
+ 		ac_cv_small_wchar_t="yes",
+ 		AC_MSG_ERROR(failed to compile test program))])
+     AC_MSG_RESULT($ac_cv_small_wchar_t)
+     if test "x$ac_cv_small_wchar_t" = "xyes" ; then
+       AC_DEFINE(SMALL_WCHAR_T)
+     fi
+ 
    fi
  fi
  
***************
*** 2881,2887 ****
  AC_MSG_RESULT($ac_cv_sizeof_int)
  AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)
  
- 
  dnl Check for memmove() before bcopy(), makes memmove() be used when both are
  dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
  
--- 2903,2908 ----
*** ../vim-7.2.183/src/gui_athena.c	2008-06-24 23:00:51.000000000 +0200
--- src/gui_athena.c	2009-05-21 16:39:43.000000000 +0200
***************
*** 86,95 ****
   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
   * left or middle mouse button.
   */
- /* ARGSUSED */
      static void
  gui_athena_scroll_cb_jump(w, client_data, call_data)
!     Widget	w;
      XtPointer	client_data, call_data;
  {
      scrollbar_T *sb, *sb_info;
--- 86,94 ----
   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
   * left or middle mouse button.
   */
      static void
  gui_athena_scroll_cb_jump(w, client_data, call_data)
!     Widget	w UNUSED;
      XtPointer	client_data, call_data;
  {
      scrollbar_T *sb, *sb_info;
***************
*** 122,131 ****
[...3247 lines suppressed...]
! 	char	*filename)
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
--- 262,270 ----
      load_window(filename, lineno);
  }
  
      void
  workshop_front_file(
! 	char	*filename UNUSED)
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
***************
*** 538,546 ****
   * breakpoints have moved when a program has been recompiled and
   * reloaded into dbx.
   */
- /*ARGSUSED*/
      void
! workshop_moved_marks(char *filename)
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
--- 536,543 ----
   * breakpoints have moved when a program has been recompiled and
   * reloaded into dbx.
   */
      void
! workshop_moved_marks(char *filename UNUSED)
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
***************
*** 575,585 ****
      return (int)h;
  }
  
- /*ARGSUSED*/
      void
  workshop_footer_message(
! 	char		*message,
! 	int		 severity)	/* severity is currently unused */
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
--- 572,581 ----
      return (int)h;
  }
  
      void
  workshop_footer_message(
! 	char	*message,
! 	int	severity UNUSED)	/* severity is currently unused */
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
***************
*** 687,701 ****
   * command. The globals curMenuName and curMenuPriority contain the name and
   * priority of the parent menu tree.
   */
- /*ARGSUSED*/
      void
  workshop_menu_item(
  	char		*label,
  	char		*verb,
! 	char		*accelerator,
  	char		*acceleratorText,
! 	char		*name,
! 	char		*filepos,
  	char		*sensitive)
  {
      char		 cbuf[BUFSIZ];
--- 683,696 ----
   * command. The globals curMenuName and curMenuPriority contain the name and
   * priority of the parent menu tree.
   */
      void
  workshop_menu_item(
  	char		*label,
  	char		*verb,
! 	char		*accelerator UNUSED,
  	char		*acceleratorText,
! 	char		*name UNUSED,
! 	char		*filepos UNUSED,
  	char		*sensitive)
  {
      char		 cbuf[BUFSIZ];
***************
*** 810,822 ****
      workshopInitDone = True;
  }
  
- /*ARGSUSED*/
      void
  workshop_toolbar_button(
  	char	*label,
  	char	*verb,
! 	char	*senseVerb,
! 	char	*filepos,
  	char	*help,
  	char	*sense,
  	char	*file,
--- 805,816 ----
      workshopInitDone = True;
  }
  
      void
  workshop_toolbar_button(
  	char	*label,
  	char	*verb,
! 	char	*senseVerb UNUSED,
! 	char	*filepos UNUSED,
  	char	*help,
  	char	*sense,
  	char	*file,
***************
*** 968,974 ****
  	    if (strcmp(option, "syntax") == 0)
  		vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
  	    else if (strcmp(option, "savefiles") == 0)
! 		; /* XXX - Not yet implemented */
  	    break;
  
  	case 'l':
--- 962,970 ----
  	    if (strcmp(option, "syntax") == 0)
  		vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
  	    else if (strcmp(option, "savefiles") == 0)
! 	    {
! 		/* XXX - Not yet implemented */
! 	    }
  	    break;
  
  	case 'l':
***************
*** 1098,1107 ****
  /*
   * A button in the toolbar has been pushed.
   */
- /*ARGSUSED*/
      int
  workshop_get_positions(
! 	void		*clientData,	/* unused */
  	char	       **filename,	/* output data */
  	int		*curLine,	/* output data */
  	int		*curCol,	/* output data */
--- 1094,1102 ----
  /*
   * A button in the toolbar has been pushed.
   */
      int
  workshop_get_positions(
! 	void		*clientData UNUSED,
  	char	       **filename,	/* output data */
  	int		*curLine,	/* output data */
  	int		*curCol,	/* output data */
***************
*** 1526,1534 ****
  	return NULL;
  }
  
- /*ARGSUSED*/
      void
! workshop_save_sensitivity(char *filename)
  {
  }
  
--- 1521,1528 ----
  	return NULL;
  }
  
      void
! workshop_save_sensitivity(char *filename UNUSED)
  {
  }
  
*** ../vim-7.2.183/src/version.c	2009-05-21 15:19:59.000000000 +0200
--- src/version.c	2009-05-21 23:19:40.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     184,
  /**/

-- 
CART DRIVER: Bring out your dead!
LARGE MAN:   Here's one!
CART DRIVER: Ninepence.
BODY:        I'm not dead!
                 "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    ///


--- NEW FILE 7.2.185 ---
To: vim-dev at vim.org
Subject: Patch 7.2.185
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.185
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Add UNUSED and type casts.
Files:	    src/Makefile, src/if_tlc.c, src/if_ruby.c


*** ../vim-7.2.184/src/Makefile	2009-05-21 23:25:47.000000000 +0200
--- src/Makefile	2009-05-22 18:18:44.000000000 +0200
***************
*** 105,112 ****
  # 4. "make test"  {{{1
  #	This is optional.  This will run Vim scripts on a number of test
  #	files, and compare the produced output with the expected output.
! #	If all is well, you will get the "ALL DONE" message in the end.  See
! #	below (search for "/^test").
  #
  # 5. "make install"  {{{1
  #	If the new Vim seems to be working OK you can install it and the
--- 105,112 ----
  # 4. "make test"  {{{1
  #	This is optional.  This will run Vim scripts on a number of test
  #	files, and compare the produced output with the expected output.
! #	If all is well, you will get the "ALL DONE" message in the end.  If a
! #	test fails you get "TEST FAILURE".  See below (search for "/^test").
  #
  # 5. "make install"  {{{1
  #	If the new Vim seems to be working OK you can install it and the
***************
*** 533,538 ****
--- 533,543 ----
  #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes
  #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
  
+ # Use this with GCC to check for mistakes, unused arguments, etc.
+ #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
+ #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+ #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code
+ 
  # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
  # allocated memory (and makes every malloc()/free() very slow).
  # Electric Fence is free (search ftp sites).
***************
*** 551,562 ****
  # }}}
  
  # LINT - for running lint
! #  For standard lint
! #LINT = lint
! #LINT_OPTIONS = -beprxzF
! #  For splint  (see cleanlint.vim for filtering the output)
! LINT = splint
! LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
  
  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
  # Might not work with GUI or Perl.
--- 556,568 ----
  # }}}
  
  # LINT - for running lint
! #  For standard Unix lint
! LINT = lint
! LINT_OPTIONS = -beprxzF
! #  For splint
! #  It doesn't work well, crashes on include files and non-ascii characters.
! #LINT = splint
! #LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
  
  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
  # Might not work with GUI or Perl.
***************
*** 1743,1749 ****
  # messages.  Don't worry about that.
  # If there is a real error, there will be a difference between "test.out" and
  # a "test99.ok" file.
! # If everything is alright, the final message will be "ALL DONE".
  #
  test check:
  	$(MAKE) -f Makefile $(VIMTARGET)
--- 1749,1756 ----
  # messages.  Don't worry about that.
  # If there is a real error, there will be a difference between "test.out" and
  # a "test99.ok" file.
! # If everything is alright, the final message will be "ALL DONE".  If not you
! # get "TEST FAILURE".
  #
  test check:
  	$(MAKE) -f Makefile $(VIMTARGET)
***************
*** 2427,2433 ****
  	$(CCC) -o $@ if_xcmdsrv.c
  
  objects/if_mzsch.o: if_mzsch.c
! 	$(CCC) -o $@ if_mzsch.c
  
  objects/if_perl.o: auto/if_perl.c
  	$(CCC) -o $@ auto/if_perl.c
--- 2434,2440 ----
  	$(CCC) -o $@ if_xcmdsrv.c
  
  objects/if_mzsch.o: if_mzsch.c
! 	$(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c
  
  objects/if_perl.o: auto/if_perl.c
  	$(CCC) -o $@ auto/if_perl.c
***************
*** 2436,2442 ****
  	$(CCC) -o $@ if_perlsfio.c
  
  objects/if_python.o: if_python.c
! 	$(CCC) -o $@ if_python.c
  
  objects/if_ruby.o: if_ruby.c
  	$(CCC) -o $@ if_ruby.c
--- 2443,2449 ----
  	$(CCC) -o $@ if_perlsfio.c
  
  objects/if_python.o: if_python.c
! 	$(CCC) -o $@ $(PYTHON_CFLAGS_EXTRA) if_python.c
  
  objects/if_ruby.o: if_ruby.c
  	$(CCC) -o $@ if_ruby.c
*** ../vim-7.2.184/src/if_ruby.c	2007-09-13 15:00:49.000000000 +0200
--- src/if_ruby.c	2009-05-22 15:32:04.000000000 +0200
***************
*** 492,498 ****
      }
  }
  
! static VALUE vim_message(VALUE self, VALUE str)
  {
      char *buff, *p;
  
--- 492,498 ----
      }
  }
  
! static VALUE vim_message(VALUE self UNUSED, VALUE str)
  {
      char *buff, *p;
  
***************
*** 505,524 ****
      return Qnil;
  }
  
! static VALUE vim_set_option(VALUE self, VALUE str)
  {
      do_set((char_u *)STR2CSTR(str), 0);
      update_screen(NOT_VALID);
      return Qnil;
  }
  
! static VALUE vim_command(VALUE self, VALUE str)
  {
      do_cmdline_cmd((char_u *)STR2CSTR(str));
      return Qnil;
  }
  
! static VALUE vim_evaluate(VALUE self, VALUE str)
  {
  #ifdef FEAT_EVAL
      char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE);
--- 505,524 ----
      return Qnil;
  }
  
! static VALUE vim_set_option(VALUE self UNUSED, VALUE str)
  {
      do_set((char_u *)STR2CSTR(str), 0);
      update_screen(NOT_VALID);
      return Qnil;
  }
  
! static VALUE vim_command(VALUE self UNUSED, VALUE str)
  {
      do_cmdline_cmd((char_u *)STR2CSTR(str));
      return Qnil;
  }
  
! static VALUE vim_evaluate(VALUE self UNUSED, VALUE str)
  {
  #ifdef FEAT_EVAL
      char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE);
***************
*** 580,586 ****
      return INT2NUM(n);
  }
  
! static VALUE buffer_s_aref(VALUE self, VALUE num)
  {
      buf_T *b;
      int n = NUM2INT(num);
--- 580,586 ----
      return INT2NUM(n);
  }
  
! static VALUE buffer_s_aref(VALUE self UNUSED, VALUE num)
  {
      buf_T *b;
      int n = NUM2INT(num);
***************
*** 629,635 ****
--- 629,637 ----
  	return line ? rb_str_new2(line) : Qnil;
      }
      rb_raise(rb_eIndexError, "index %d out of buffer", n);
+ #ifndef __GNUC__
      return Qnil; /* For stop warning */
+ #endif
  }
  
  static VALUE buffer_aref(VALUE self, VALUE num)
***************
*** 668,674 ****
--- 670,678 ----
      else
      {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
+ #ifndef __GNUC__
  	return Qnil; /* For stop warning */
+ #endif
      }
      return 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);
  }
--- 793,799 ----
      return get_buffer_line(curbuf, curwin->w_cursor.lnum);
  }
  
! static VALUE set_current_line(VALUE self UNUSED, VALUE str)
  {
      return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
  }
***************
*** 815,821 ****
  #endif
  }
  
! static VALUE window_s_aref(VALUE self, VALUE num)
  {
      win_T *w;
      int n = NUM2INT(num);
--- 819,825 ----
  #endif
  }
  
! static VALUE window_s_aref(VALUE self UNUSED, VALUE num)
  {
      win_T *w;
      int n = NUM2INT(num);
***************
*** 897,903 ****
      return Qnil;
  }
  
! static VALUE f_p(int argc, VALUE *argv, VALUE self)
  {
      int i;
      VALUE str = rb_str_new("", 0);
--- 901,907 ----
      return Qnil;
  }
  
! static VALUE f_p(int argc, VALUE *argv, VALUE self UNUSED)
  {
      int i;
      VALUE str = rb_str_new("", 0);
*** ../vim-7.2.184/src/version.c	2009-05-21 23:25:38.000000000 +0200
--- src/version.c	2009-05-22 18:18:58.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     185,
  /**/

-- 
BODY:        I'm not dead!
CART DRIVER: 'Ere.  He says he's not dead.
LARGE MAN:   Yes he is.
BODY:        I'm not!
                 "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    ///


--- NEW FILE 7.2.186 ---
To: vim-dev at vim.org
Subject: Patch 7.2.186
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.186
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Now with the intended if_tcl.c changes.
Files:	    src/if_tcl.c


*** ../vim-7.2.185/src/if_tcl.c	2007-05-10 20:55:34.000000000 +0200
--- src/if_tcl.c	2009-05-22 15:29:53.000000000 +0200
***************
*** 290,299 ****
   */
  #define TCL_EXIT	5
  
- /* ARGSUSED */
      static int
  exitcmd(dummy, interp, objc, objv)
!     ClientData dummy;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
--- 290,298 ----
   */
  #define TCL_EXIT	5
  
      static int
  exitcmd(dummy, interp, objc, objv)
!     ClientData dummy UNUSED;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
***************
*** 315,324 ****
      return TCL_ERROR;
  }
  
- /* ARGSUSED */
      static int
  catchcmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 314,322 ----
      return TCL_ERROR;
  }
  
      static int
  catchcmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 356,365 ****
  /*
   *  "::vim::beep" - what Vi[m] does best :-)
   */
- /* ARGSUSED */
      static int
  beepcmd(dummy, interp, objc, objv)
!     ClientData dummy;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
--- 354,362 ----
  /*
   *  "::vim::beep" - what Vi[m] does best :-)
   */
      static int
  beepcmd(dummy, interp, objc, objv)
!     ClientData dummy UNUSED;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
***************
*** 378,387 ****
   *  "::vim::buffer {N}" - create buffer command for buffer N.
   *  "::vim::buffer new" - create a new buffer (not implemented)
   */
- /* ARGSUSED */
      static int
  buffercmd(dummy, interp, objc, objv)
!     ClientData dummy;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
--- 375,383 ----
   *  "::vim::buffer {N}" - create buffer command for buffer N.
   *  "::vim::buffer new" - create a new buffer (not implemented)
   */
      static int
  buffercmd(dummy, interp, objc, objv)
!     ClientData dummy UNUSED;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
***************
*** 475,484 ****
  /*
   * "::vim::window list" - create list of window commands.
   */
- /* ARGSUSED */
      static int
  windowcmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 471,479 ----
  /*
   * "::vim::window list" - create list of window commands.
   */
      static int
  windowcmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 1130,1139 ****
  }
  
  
- /* ARGSUSED */
      static int
  commandcmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 1125,1133 ----
  }
  
  
      static int
  commandcmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 1145,1154 ****
      return err;
  }
  
- /* ARGSUSED */
      static int
  optioncmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 1139,1147 ----
      return err;
  }
  
      static int
  optioncmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 1160,1169 ****
      return err;
  }
  
- /* ARGSUSED */
      static int
  exprcmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 1153,1161 ----
      return err;
  }
  
      static int
  exprcmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 1584,1594 ****
      I/O Channel
  ********************************************/
  
- /* ARGSUSED */
      static int
  channel_close(instance, interp)
      ClientData	instance;
!     Tcl_Interp	*interp;
  {
      int		err = 0;
  
--- 1576,1585 ----
      I/O Channel
  ********************************************/
  
      static int
  channel_close(instance, interp)
      ClientData	instance;
!     Tcl_Interp	*interp UNUSED;
  {
      int		err = 0;
  
***************
*** 1602,1613 ****
      return err;
  }
  
- /* ARGSUSED */
      static int
  channel_input(instance, buf, bufsiz, errptr)
!     ClientData	instance;
!     char	*buf;
!     int		bufsiz;
      int		*errptr;
  {
  
--- 1593,1603 ----
      return err;
  }
  
      static int
  channel_input(instance, buf, bufsiz, errptr)
!     ClientData	instance UNUSED;
!     char	*buf UNUSED;
!     int		bufsiz UNUSED;
      int		*errptr;
  {
  
***************
*** 1659,1679 ****
      return result;
  }
  
- /* ARGSUSED */
      static void
  channel_watch(instance, mask)
!     ClientData	instance;
!     int		mask;
  {
      Tcl_SetErrno(EINVAL);
  }
  
- /* ARGSUSED */
      static int
  channel_gethandle(instance, direction, handleptr)
!     ClientData	instance;
!     int		direction;
!     ClientData	*handleptr;
  {
      Tcl_SetErrno(EINVAL);
      return EINVAL;
--- 1649,1667 ----
      return result;
  }
  
      static void
  channel_watch(instance, mask)
!     ClientData	instance UNUSED;
!     int		mask UNUSED;
  {
      Tcl_SetErrno(EINVAL);
  }
  
      static int
  channel_gethandle(instance, direction, handleptr)
!     ClientData	instance UNUSED;
!     int		direction UNUSED;
!     ClientData	*handleptr UNUSED;
  {
      Tcl_SetErrno(EINVAL);
      return EINVAL;
***************
*** 1691,1697 ****
      NULL,   /* set option */
      NULL,   /* get option */
      channel_watch,
!     channel_gethandle
  };
  
  /**********************************
--- 1679,1692 ----
      NULL,   /* set option */
      NULL,   /* get option */
      channel_watch,
!     channel_gethandle,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL
  };
  
  /**********************************
*** ../vim-7.2.185/src/version.c	2009-05-22 18:20:23.000000000 +0200
--- src/version.c	2009-05-22 21:07:21.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     186,
  /**/

-- 
ARTHUR: Old woman!
DENNIS: Man!
ARTHUR: Man.  I'm sorry.  Old man, What knight live in that castle over there?
DENNIS: I'm thirty-seven.
                 "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    ///


--- NEW FILE 7.2.187 ---
To: vim-dev at vim.org
Subject: Patch 7.2.187
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.187 (after 7.2.186)
Problem:    Doesn't build with older versions of TCL. (Yongwei Wu)
Solution:   Add #ifdefs. (Dominique Pelle)
Files:	    src/if_tcl.c


*** ../vim-7.2.186/src/if_tcl.c	2009-05-22 21:07:45.000000000 +0200
--- src/if_tcl.c	2009-05-23 14:23:51.000000000 +0200
***************
*** 161,167 ****
  # endif
  
  /*
!  * Declare HANDLE for perl.dll and function pointers.
   */
  static HANDLE hTclLib = NULL;
  Tcl_Interp* (*dll_Tcl_CreateInterp)();
--- 161,167 ----
  # endif
  
  /*
!  * Declare HANDLE for tcl.dll and function pointers.
   */
  static HANDLE hTclLib = NULL;
  Tcl_Interp* (*dll_Tcl_CreateInterp)();
***************
*** 182,188 ****
   * Make all runtime-links of tcl.
   *
   * 1. Get module handle using LoadLibraryEx.
!  * 2. Get pointer to perl function by GetProcAddress.
   * 3. Repeat 2, until get all functions will be used.
   *
   * Parameter 'libname' provides name of DLL.
--- 182,188 ----
   * Make all runtime-links of tcl.
   *
   * 1. Get module handle using LoadLibraryEx.
!  * 2. Get pointer to tcl function by GetProcAddress.
   * 3. Repeat 2, until get all functions will be used.
   *
   * Parameter 'libname' provides name of DLL.
***************
*** 1670,1692 ****
  
  static Tcl_ChannelType channel_type =
  {
!     "vimmessage",
!     NULL,   /* blockmode */
!     channel_close,
!     channel_input,
!     channel_output,
!     NULL,   /* seek */
!     NULL,   /* set option */
!     NULL,   /* get option */
!     channel_watch,
!     channel_gethandle,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL
  };
  
  /**********************************
--- 1670,1700 ----
  
  static Tcl_ChannelType channel_type =
  {
!     "vimmessage",	/* typeName */
!     NULL,		/* version */
!     channel_close,	/* closeProc */
!     channel_input,	/* inputProc */
!     channel_output,	/* outputProc */
!     NULL,		/* seekProc */
!     NULL,		/* setOptionProc */
!     NULL,		/* getOptionProc */
!     channel_watch,	/* watchProc */
!     channel_gethandle,	/* getHandleProc */
!     NULL,		/* close2Proc */
!     NULL,		/* blockModeProc */
! #ifdef TCL_CHANNEL_VERSION_2
!     NULL,		/* flushProc */
!     NULL,		/* handlerProc */
! #endif
! #ifdef TCL_CHANNEL_VERSION_3
!     NULL,		/* wideSeekProc */
! #endif
! #ifdef TCL_CHANNEL_VERSION_4
!     NULL,		/* threadActionProc */
! #endif
! #ifdef TCL_CHANNEL_VERSION_5
!     NULL		/* truncateProc */
! #endif
  };
  
  /**********************************
*** ../vim-7.2.186/src/version.c	2009-05-22 21:07:45.000000000 +0200
--- src/version.c	2009-05-23 14:25:04.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     187,
  /**/

-- 
Friends?  I have lots of friends!  In fact, I have every episode ever made.

 /// 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    ///


--- NEW FILE 7.2.188 ---
To: vim-dev at vim.org
Subject: Patch 7.2.188
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.188
Problem:    Crash with specific use of function calls. (Meikel Brandmeyer)
Solution:   Make sure the items referenced by a function call are not freed
	    twice.  (based on patch from Nico Weber)
Files:	    src/eval.c


*** ../vim-7.2.187/src/eval.c	2009-05-16 17:29:37.000000000 +0200
--- src/eval.c	2009-05-22 20:04:22.000000000 +0200
***************
*** 129,136 ****
--- 129,139 ----
  /*
   * When recursively copying lists and dicts we need to remember which ones we
   * have done to avoid endless recursiveness.  This unique ID is used for that.
+  * The last bit is used for previous_funccal, ignored when comparing.
   */
  static int current_copyID = 0;
+ #define COPYID_INC 2
+ #define COPYID_MASK (~0x1)
  
  /*
   * Array to hold the hashtab with variables local to each sourced script.
***************
*** 439,444 ****
--- 442,448 ----
  static void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
  static char_u *list2string __ARGS((typval_T *tv, int copyID));
  static int list_join __ARGS((garray_T *gap, list_T *l, char_u *sep, int echo, int copyID));
+ static int free_unref_items __ARGS((int copyID));
  static void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
  static void set_ref_in_list __ARGS((list_T *l, int copyID));
  static void set_ref_in_item __ARGS((typval_T *tv, int copyID));
***************
*** 6494,6507 ****
      int
  garbage_collect()
  {
!     dict_T	*dd;
!     list_T	*ll;
!     int		copyID = ++current_copyID;
      buf_T	*buf;
      win_T	*wp;
      int		i;
      funccall_T	*fc, **pfc;
!     int		did_free = FALSE;
  #ifdef FEAT_WINDOWS
      tabpage_T	*tp;
  #endif
--- 6498,6510 ----
      int
  garbage_collect()
  {
!     int		copyID;
      buf_T	*buf;
      win_T	*wp;
      int		i;
      funccall_T	*fc, **pfc;
!     int		did_free;
!     int		did_free_funccal = FALSE;
  #ifdef FEAT_WINDOWS
      tabpage_T	*tp;
  #endif
***************
*** 6511,6520 ****
--- 6514,6538 ----
      may_garbage_collect = FALSE;
      garbage_collect_at_exit = FALSE;
  
+     /* We advance by two because we add one for items referenced through
+      * previous_funccal. */
+     current_copyID += COPYID_INC;
+     copyID = current_copyID;
+ 
      /*
       * 1. Go through all accessible variables and mark all lists and dicts
       *    with copyID.
       */
+ 
+     /* Don't free variables in the previous_funccal list unless they are only
+      * referenced through previous_funccal.  This must be first, because if
+      * the item is referenced elsewhere it must not be freed. */
+     for (fc = previous_funccal; fc != NULL; fc = fc->caller)
+     {
+ 	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
+ 	set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID + 1);
+     }
+ 
      /* script-local variables */
      for (i = 1; i <= ga_scripts.ga_len; ++i)
  	set_ref_in_ht(&SCRIPT_VARS(i), copyID);
***************
*** 6546,6556 ****
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
  
      /*
!      * 2. Go through the list of dicts and free items without the copyID.
       */
      for (dd = first_dict; dd != NULL; )
! 	if (dd->dv_copyID != copyID)
  	{
  	    /* Free the Dictionary and ordinary items it contains, but don't
  	     * recurse into Lists and Dictionaries, they will be in the list
--- 6564,6610 ----
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
  
+     /* Free lists and dictionaries that are not referenced. */
+     did_free = free_unref_items(copyID);
+ 
+     /* check if any funccal can be freed now */
+     for (pfc = &previous_funccal; *pfc != NULL; )
+     {
+ 	if (can_free_funccal(*pfc, copyID))
+ 	{
+ 	    fc = *pfc;
+ 	    *pfc = fc->caller;
+ 	    free_funccal(fc, TRUE);
+ 	    did_free = TRUE;
+ 	    did_free_funccal = TRUE;
+ 	}
+ 	else
+ 	    pfc = &(*pfc)->caller;
+     }
+     if (did_free_funccal)
+ 	/* When a funccal was freed some more items might be garbage
+ 	 * collected, so run again. */
+ 	(void)garbage_collect();
+ 
+     return did_free;
+ }
+ 
+ /*
+  * Free lists and dictionaries that are no longer referenced.
+  */
+     static int
+ free_unref_items(copyID)
+     int copyID;
+ {
+     dict_T	*dd;
+     list_T	*ll;
+     int		did_free = FALSE;
+ 
      /*
!      * Go through the list of dicts and free items without the copyID.
       */
      for (dd = first_dict; dd != NULL; )
! 	if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
  	{
  	    /* Free the Dictionary and ordinary items it contains, but don't
  	     * recurse into Lists and Dictionaries, they will be in the list
***************
*** 6565,6576 ****
  	    dd = dd->dv_used_next;
  
      /*
!      * 3. Go through the list of lists and free items without the copyID.
!      *    But don't free a list that has a watcher (used in a for loop), these
!      *    are not referenced anywhere.
       */
      for (ll = first_list; ll != NULL; )
! 	if (ll->lv_copyID != copyID && ll->lv_watch == NULL)
  	{
  	    /* Free the List and ordinary items it contains, but don't recurse
  	     * into Lists and Dictionaries, they will be in the list of dicts
--- 6619,6631 ----
  	    dd = dd->dv_used_next;
  
      /*
!      * Go through the list of lists and free items without the copyID.
!      * But don't free a list that has a watcher (used in a for loop), these
!      * are not referenced anywhere.
       */
      for (ll = first_list; ll != NULL; )
! 	if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)
! 						      && ll->lv_watch == NULL)
  	{
  	    /* Free the List and ordinary items it contains, but don't recurse
  	     * into Lists and Dictionaries, they will be in the list of dicts
***************
*** 6584,6603 ****
  	else
  	    ll = ll->lv_used_next;
  
-     /* check if any funccal can be freed now */
-     for (pfc = &previous_funccal; *pfc != NULL; )
-     {
- 	if (can_free_funccal(*pfc, copyID))
- 	{
- 	    fc = *pfc;
- 	    *pfc = fc->caller;
- 	    free_funccal(fc, TRUE);
- 	    did_free = TRUE;
- 	}
- 	else
- 	    pfc = &(*pfc)->caller;
-     }
- 
      return did_free;
  }
  
--- 6639,6644 ----
***************
*** 18842,18847 ****
--- 18883,18889 ----
  {
      hash_init(&dict->dv_hashtab);
      dict->dv_refcount = DO_NOT_FREE_CNT;
+     dict->dv_copyID = 0;
      dict_var->di_tv.vval.v_dict = dict;
      dict_var->di_tv.v_type = VAR_DICT;
      dict_var->di_tv.v_lock = VAR_FIXED;
***************
*** 21294,21301 ****
      current_funccal = fc->caller;
      --depth;
  
!     /* if the a:000 list and the a: dict are not referenced we can free the
!      * funccall_T and what's in it. */
      if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
  	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
  	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
--- 21336,21343 ----
      current_funccal = fc->caller;
      --depth;
  
!     /* If the a:000 list and the l: and a: dicts are not referenced we can
!      * free the funccall_T and what's in it. */
      if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
  	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
  	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
***************
*** 21334,21340 ****
  
  /*
   * Return TRUE if items in "fc" do not have "copyID".  That means they are not
!  * referenced from anywhere.
   */
      static int
  can_free_funccal(fc, copyID)
--- 21376,21382 ----
  
  /*
   * Return TRUE if items in "fc" do not have "copyID".  That means they are not
!  * referenced from anywhere that is in use.
   */
      static int
  can_free_funccal(fc, copyID)
*** ../vim-7.2.187/src/version.c	2009-05-23 14:27:43.000000000 +0200
--- src/version.c	2009-05-24 13:20:49.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     188,
  /**/

-- 
ARTHUR:    ... and I am your king ....
OLD WOMAN: Ooooh!  I didn't know we had a king.  I thought we were an
           autonomous collective ...
                 "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    ///


--- NEW FILE 7.2.189 ---
To: vim-dev at vim.org
Subject: Patch 7.2.189
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.189
Problem:    Possible hang for deleting auto-indent. (Dominique Pelle)
Solution:   Make sure the position is not beyond the end of the line.
Files:	    src/edit.c


*** ../vim-7.2.188/src/edit.c	2009-05-16 16:36:25.000000000 +0200
--- src/edit.c	2009-05-26 10:53:05.000000000 +0200
***************
*** 6420,6432 ****
  
  	/* If we just did an auto-indent, remove the white space from the end
  	 * of the line, and put the cursor back.
! 	 * Do this when ESC was used or moving the cursor up/down. */
  	if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
! 			&& curwin->w_cursor.lnum != end_insert_pos->lnum)))
  	{
  	    pos_T	tpos = curwin->w_cursor;
  
  	    curwin->w_cursor = *end_insert_pos;
  	    for (;;)
  	    {
  		if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
--- 6420,6436 ----
  
  	/* If we just did an auto-indent, remove the white space from the end
  	 * of the line, and put the cursor back.
! 	 * Do this when ESC was used or moving the cursor up/down.
! 	 * Check for the old position still being valid, just in case the text
! 	 * got changed unexpectedly. */
  	if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
! 			&& curwin->w_cursor.lnum != end_insert_pos->lnum))
! 		&& end_insert_pos->lnum <= curbuf->b_ml.ml_line_count)
  	{
  	    pos_T	tpos = curwin->w_cursor;
  
  	    curwin->w_cursor = *end_insert_pos;
+ 	    check_cursor_col();  /* make sure it is not past the line */
  	    for (;;)
  	    {
  		if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
***************
*** 6434,6440 ****
  		cc = gchar_cursor();
  		if (!vim_iswhite(cc))
  		    break;
! 		(void)del_char(TRUE);
  	    }
  	    if (curwin->w_cursor.lnum != tpos.lnum)
  		curwin->w_cursor = tpos;
--- 6438,6445 ----
  		cc = gchar_cursor();
  		if (!vim_iswhite(cc))
  		    break;
! 		if (del_char(TRUE) == FAIL)
! 		    break;  /* should not happen */
  	    }
  	    if (curwin->w_cursor.lnum != tpos.lnum)
  		curwin->w_cursor = tpos;
*** ../vim-7.2.188/src/version.c	2009-05-24 13:40:17.000000000 +0200
--- src/version.c	2009-05-26 10:50:53.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     189,
  /**/

-- 
FIRST VILLAGER: We have found a witch.  May we burn her?
                 "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    ///


--- NEW FILE 7.2.190 ---
To: vim-dev at vim.org
Subject: Patch 7.2.190
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.190
Problem:    The register executed by @@ isn't restored.
Solution:   Mark the executable register in the viminfo file.
Files:	    src/ops.c


*** ../vim-7.2.189/src/ops.c	2009-05-13 12:46:36.000000000 +0200
--- src/ops.c	2009-05-26 18:05:23.000000000 +0200
***************
*** 1143,1148 ****
--- 1143,1150 ----
      return OK;
  }
  
+ static int execreg_lastc = NUL;
+ 
  /*
   * execute a yank register: copy it into the stuff buffer
   *
***************
*** 1155,1161 ****
      int	    addcr;		/* always add '\n' to end of line */
      int	    silent;		/* set "silent" flag in typeahead buffer */
  {
-     static int	lastc = NUL;
      long	i;
      char_u	*p;
      int		retval = OK;
--- 1157,1162 ----
***************
*** 1163,1174 ****
  
      if (regname == '@')			/* repeat previous one */
      {
! 	if (lastc == NUL)
  	{
  	    EMSG(_("E748: No previously used register"));
  	    return FAIL;
  	}
! 	regname = lastc;
      }
  					/* check for valid regname */
      if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE))
--- 1164,1175 ----
  
      if (regname == '@')			/* repeat previous one */
      {
! 	if (execreg_lastc == NUL)
  	{
  	    EMSG(_("E748: No previously used register"));
  	    return FAIL;
  	}
! 	regname = execreg_lastc;
      }
  					/* check for valid regname */
      if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE))
***************
*** 1176,1182 ****
  	emsg_invreg(regname);
  	return FAIL;
      }
!     lastc = regname;
  
  #ifdef FEAT_CLIPBOARD
      regname = may_get_selection(regname);
--- 1177,1183 ----
  	emsg_invreg(regname);
  	return FAIL;
      }
!     execreg_lastc = regname;
  
  #ifdef FEAT_CLIPBOARD
      regname = may_get_selection(regname);
***************
*** 5337,5347 ****
--- 5338,5351 ----
  
      /* We only get here (hopefully) if line[0] == '"' */
      str = virp->vir_line + 1;
+ 
+     /* If the line starts with "" this is the y_previous register. */
      if (*str == '"')
      {
  	set_prev = TRUE;
  	str++;
      }
+ 
      if (!ASCII_ISALNUM(*str) && *str != '-')
      {
  	if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line))
***************
*** 5351,5356 ****
--- 5355,5368 ----
      get_yank_register(*str++, FALSE);
      if (!force && y_current->y_array != NULL)
  	do_it = FALSE;
+ 
+     if (*str == '@')
+     {
+ 	/* "x@: register x used for @@ */
+ 	if (force || execreg_lastc == NUL)
+ 	    execreg_lastc = str[-1];
+     }
+ 
      size = 0;
      limit = 100;	/* Optimized for registers containing <= 100 lines */
      if (do_it)
***************
*** 5360,5366 ****
  	vim_free(y_current->y_array);
  	array = y_current->y_array =
  		       (char_u **)alloc((unsigned)(limit * sizeof(char_u *)));
! 	str = skipwhite(str);
  	if (STRNCMP(str, "CHAR", 4) == 0)
  	    y_current->y_type = MCHAR;
  #ifdef FEAT_VISUAL
--- 5372,5378 ----
  	vim_free(y_current->y_array);
  	array = y_current->y_array =
  		       (char_u **)alloc((unsigned)(limit * sizeof(char_u *)));
! 	str = skipwhite(skiptowhite(str));
  	if (STRNCMP(str, "CHAR", 4) == 0)
  	    y_current->y_type = MCHAR;
  #ifdef FEAT_VISUAL
***************
*** 5443,5448 ****
--- 5455,5461 ----
      max_kbyte = get_viminfo_parameter('s');
      if (max_kbyte == 0)
  	return;
+ 
      for (i = 0; i < NUM_REGISTERS; i++)
      {
  	if (y_regs[i].y_array == NULL)
***************
*** 5497,5503 ****
  	if (y_previous == &y_regs[i])
  	    fprintf(fp, "\"");
  	c = get_register_name(i);
! 	fprintf(fp, "\"%c\t%s\t%d\n", c, type,
  #ifdef FEAT_VISUAL
  		    (int)y_regs[i].y_width
  #else
--- 5510,5519 ----
  	if (y_previous == &y_regs[i])
  	    fprintf(fp, "\"");
  	c = get_register_name(i);
! 	fprintf(fp, "\"%c", c);
! 	if (c == execreg_lastc)
! 	    fprintf(fp, "@");
! 	fprintf(fp, "\t%s\t%d\n", type,
  #ifdef FEAT_VISUAL
  		    (int)y_regs[i].y_width
  #else
*** ../vim-7.2.189/src/version.c	2009-05-26 11:01:43.000000000 +0200
--- src/version.c	2009-05-26 18:10:13.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     190,
  /**/

-- 
If you had to identify, in one word, the reason why the
human race has not achieved, and never will achieve, its
full potential, that word would be "meetings."

 /// 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    ///


--- NEW FILE 7.2.191 ---
To: vim-dev at vim.org
Subject: Patch 7.2.191
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.191
Problem:    Mzscheme interface doesn't work on Ubuntu.
Solution:   Change autoconf rules.  Define missing macro.  Some changes to
	    avoid gcc warnings.  Remove per-buffer namespace. (Sergey Khorev)
Files:	    runtime/doc/if_mzsch.txt, src/Makefile, src/Make_ming.mak,
	    src/Make_mvc.mak, src/auto/configure, src/configure.in,
	    src/config.mk.in, src/eval.c, src/if_mzsch.c, src/if_mzsch.h,
	    src/main.c, src/proto/if_mzsch.pro


*** ../vim-7.2.190/runtime/doc/if_mzsch.txt	2008-08-09 19:36:48.000000000 +0200
--- runtime/doc/if_mzsch.txt	2009-05-26 18:49:53.000000000 +0200
***************
*** 1,4 ****
! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
  
  
  		  VIM REFERENCE MANUAL    by Sergey Khorev
--- 1,4 ----
! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 May 26
  
  
  		  VIM REFERENCE MANUAL    by Sergey Khorev
***************
*** 42,51 ****
  
  							*:mzfile* *:mzf*
  :[range]mzf[ile] {file}	Execute the MzScheme script in {file}.  {not in Vi}
- 			All statements are executed in the namespace of the
- 			buffer that was current during :mzfile start.
- 			If you want to access other namespaces, use
- 			'parameterize'.
  
  All of these commands do essentially the same thing - they execute a piece of
  MzScheme code, with the "current range" set to the given line
--- 42,47 ----
***************
*** 54,61 ****
  In the case of :mzscheme, the code to execute is in the command-line.
  In the case of :mzfile, the code to execute is the contents of the given file.
  
- Each buffer has its own MzScheme namespace. Global namespace is bound to
- the "global-namespace" value from the 'vimext' module.
  MzScheme interface defines exception exn:vim, derived from exn.
  It is raised for various Vim errors.
  
--- 50,55 ----
***************
*** 79,118 ****
  e.g.: >
  	:mzscheme (require (prefix vim- vimext))
  <
! All the examples below assume this naming scheme.  Note that you need to do
! this again for every buffer.
  
- The auto-instantiation can be achieved with autocommands, e.g. you can put
- something like this in your .vimrc (EOFs should not have indentation): >
-     function s:MzRequire()
- 	if has("mzscheme")
- 	    :mz << EOF
- 	    (require (prefix vim- vimext))
- 	    (let ((buf (vim-get-buff-by-name (vim-eval "expand(\"<afile>\")"))))
- 	      (when (and buf (not (eq? buf (vim-curr-buff))))
- 		(parameterize ((current-namespace (vim-get-buff-namespace buf)))
- 		  (namespace-attach-module vim-global-namespace 'vimext)
- 		  (namespace-require '(prefix vim vimext)))))
-     EOF
- 	endif
-     endfunction
- 
-     function s:MzStartup()
- 	if has("mzscheme")
- 	    au BufNew,BufNewFile,BufAdd,BufReadPre * :call s:MzRequire()
- 	    :mz << EOF
- 	    (current-library-collection-paths
- 		(cons
- 		    (build-path (find-system-path 'addon-dir) (version) "collects")
- 		    (current-library-collection-paths)))
-     EOF
- 	endif
-     endfunction
- 
-     call s:MzStartup()
- <
- 
- The global namespace just instantiated this module with the prefix "vimext:".
  							*mzscheme-sandbox*
  When executed in the |sandbox|, access to some filesystem and Vim interface
  procedures is restricted.
--- 73,80 ----
  e.g.: >
  	:mzscheme (require (prefix vim- vimext))
  <
! All the examples below assume this naming scheme. 
  
  							*mzscheme-sandbox*
  When executed in the |sandbox|, access to some filesystem and Vim interface
  procedures is restricted.
***************
*** 121,135 ****
  2. Examples						*mzscheme-examples*
  >
  	:mzscheme (display "Hello")
  	:mzscheme (vim-set-buff-line 10 "This is line #10")
  <
  Inline script usage: >
  	function! <SID>SetFirstLine()
  	    :mz << EOF
  	    (display "!!!")
  	    (vim-set-buff-line 1 "This is line #1")
  	    (vim-beep)
! 	    EOF
  	endfunction
  
  	nmap <F9> :call <SID>SetFirstLine() <CR>
--- 83,102 ----
  2. Examples						*mzscheme-examples*
  >
  	:mzscheme (display "Hello")
+ 	:mz (display (string-append "Using MzScheme version " (version)))
+ 	:mzscheme (require (prefix vim- vimext)) ; for MzScheme < 4.x
+ 	:mzscheme (require (prefix-in vim- 'vimext)) ; MzScheme 4.x
  	:mzscheme (vim-set-buff-line 10 "This is line #10")
  <
  Inline script usage: >
  	function! <SID>SetFirstLine()
  	    :mz << EOF
  	    (display "!!!")
+ 	    (require (prefix vim- vimext))
+ 	    ; for newer versions (require (prefix-in vim- 'vimext))
  	    (vim-set-buff-line 1 "This is line #1")
  	    (vim-beep)
! 	EOF
  	endfunction
  
  	nmap <F9> :call <SID>SetFirstLine() <CR>
***************
*** 137,153 ****
  File execution: >
  	:mzfile supascript.scm
  <
! Accessing the current buffer namespace from an MzScheme program running in
! another buffer within |:mzfile|-executed script : >
! 	; Move to the window below
! 	(vim-command "wincmd j")
! 	; execute in the context of buffer, to which window belongs
! 	; assume that buffer has 'textstring' defined
! 	(parameterize ((current-namespace
! 			(vim-get-buff-namespace (vim-curr-buff))))
! 	 (eval '(vim-set-buff-line 1 textstring)))
! <
  
  ==============================================================================
  3. Threads						*mzscheme-threads*
  
--- 104,136 ----
  File execution: >
  	:mzfile supascript.scm
  <
! Vim exception handling: >
! 	:mz << EOF
! 	(require (prefix vim- vimext))
! 	; for newer versions (require (prefix-in vim- 'vimext))
! 	(with-handlers
! 	  ([exn:vim? (lambda (e) (display (exn-message e)))])
! 	  (vim-eval "nonsense-string"))
! 	EOF
! <
! Auto-instantiation of vimext module (can be placed in your |vimrc|): >
!     function! MzRequire()
! 	:redir => l:mzversion
! 	:mz (version)
! 	:redir END
! 	if strpart(l:mzversion, 1, 1) < "4"
! 	    " MzScheme versions < 4.x:
! 	    :mz (require (prefix vim- vimext))
! 	else
! 	    " newer versions:
! 	    :mz (require (prefix-in vim- 'vimext))
! 	endif
!     endfunction
  
+     if has("mzscheme")
+ 	silent call MzRequire()
+     endif
+ <
  ==============================================================================
  3. Threads						*mzscheme-threads*
  
***************
[...3306 lines suppressed...]
       */
--- 3035,3040 ----
***************
*** 2653,2675 ****
  }
  
      static void
! make_modules(Scheme_Env *env)
  {
!     int		i;
!     Scheme_Env	*mod;
! 
!     mod = scheme_primitive_module(scheme_intern_symbol("vimext"), env);
      /* all prims made closed so they can access their own names */
!     for (i = 0; i < sizeof(prims)/sizeof(prims[0]); i++)
      {
  	Vim_Prim *prim = prims + i;
! 	scheme_add_global(prim->name,
! 		scheme_make_closed_prim_w_arity(prim->prim, prim, prim->name,
! 		    prim->mina, prim->maxa),
! 		mod);
      }
-     scheme_add_global("global-namespace", (Scheme_Object *)environment, mod);
      scheme_finish_primitive_module(mod);
  }
  
  #ifdef HAVE_SANDBOX
--- 3092,3126 ----
  }
  
      static void
! make_modules()
  {
!     int		    i;
!     Scheme_Env	    *mod = NULL;
!     Scheme_Object   *vimext_symbol = NULL;
!     Scheme_Object   *closed_prim = NULL;
! 
!     MZ_GC_DECL_REG(3);
!     MZ_GC_VAR_IN_REG(0, mod);
!     MZ_GC_VAR_IN_REG(1, vimext_symbol);
!     MZ_GC_VAR_IN_REG(2, closed_prim);
!     MZ_GC_REG();
! 
!     vimext_symbol = scheme_intern_symbol("vimext");
!     MZ_GC_CHECK();
!     mod = scheme_primitive_module(vimext_symbol, environment);
!     MZ_GC_CHECK();
      /* all prims made closed so they can access their own names */
!     for (i = 0; i < (int)(sizeof(prims)/sizeof(prims[0])); i++)
      {
  	Vim_Prim *prim = prims + i;
! 	closed_prim = scheme_make_closed_prim_w_arity(prim->prim, prim, prim->name,
! 			    prim->mina, prim->maxa);
! 	scheme_add_global(prim->name, closed_prim, mod);
! 	MZ_GC_CHECK();
      }
      scheme_finish_primitive_module(mod);
+     MZ_GC_CHECK();
+     MZ_GC_UNREG();
  }
  
  #ifdef HAVE_SANDBOX
***************
*** 2697,2717 ****
--- 3148,3172 ----
  	{
  	    MZ_REGISTER_STATIC(M_write);
  	    M_write = scheme_intern_symbol("write");
+ 	    MZ_GC_CHECK();
  	}
  	if (M_read == NULL)
  	{
  	    MZ_REGISTER_STATIC(M_read);
  	    M_read = scheme_intern_symbol("read");
+ 	    MZ_GC_CHECK();
  	}
  	if (M_execute == NULL)
  	{
  	    MZ_REGISTER_STATIC(M_execute);
  	    M_execute = scheme_intern_symbol("execute");
+ 	    MZ_GC_CHECK();
  	}
  	if (M_delete == NULL)
  	{
  	    MZ_REGISTER_STATIC(M_delete);
  	    M_delete = scheme_intern_symbol("delete");
+ 	    MZ_GC_CHECK();
  	}
  
  	while (!SCHEME_NULLP(requested_access))
*** ../vim-7.2.190/src/if_mzsch.h	2006-03-24 23:43:11.000000000 +0100
--- src/if_mzsch.h	2009-05-26 19:08:21.000000000 +0200
***************
*** 11,16 ****
--- 11,17 ----
  
  /* #ifdef needed for "make depend" */
  #ifdef FEAT_MZSCHEME
+ # include <schvers.h>
  # include <scheme.h>
  #endif
  
***************
*** 46,49 ****
--- 47,77 ----
  # define scheme_byte_string_to_char_string(obj) (obj)
  #endif
  
+ /* Precise GC macros */
+ #ifndef MZ_GC_DECL_REG
+ # define MZ_GC_DECL_REG(size)            /* empty */
+ #endif
+ #ifndef MZ_GC_VAR_IN_REG
+ # define MZ_GC_VAR_IN_REG(x, v)          /* empty */
+ #endif
+ #ifndef MZ_GC_ARRAY_VAR_IN_REG
+ # define MZ_GC_ARRAY_VAR_IN_REG(x, v, l) /* empty */
+ #endif
+ #ifndef MZ_GC_REG
+ # define MZ_GC_REG()                     /* empty */
+ #endif
+ #ifndef MZ_GC_UNREG
+ # define MZ_GC_UNREG()                   /* empty */
+ #endif
+ 
+ #ifdef MZSCHEME_FORCE_GC
+ /*
+  * force garbage collection to check all references are registered
+  * seg faults will indicate not registered refs
+  */
+ # define MZ_GC_CHECK() scheme_collect_garbage();
+ #else
+ # define MZ_GC_CHECK()			/* empty */
+ #endif
+ 
  #endif /* _IF_MZSCH_H_ */
*** ../vim-7.2.190/src/main.c	2009-05-17 13:30:58.000000000 +0200
--- src/main.c	2009-05-26 19:09:01.000000000 +0200
***************
*** 935,942 ****
--- 935,948 ----
  
      /*
       * Call the main command loop.  This never returns.
+      * For embedded MzScheme the main_loop will be called by Scheme
+      * for proper stack tracking
       */
+ #ifndef FEAT_MZSCHEME
      main_loop(FALSE, FALSE);
+ #else
+     mzscheme_main();
+ #endif
  
      return 0;
  }
*** ../vim-7.2.190/src/proto/if_mzsch.pro	2004-07-12 17:51:52.000000000 +0200
--- src/proto/if_mzsch.pro	2009-05-26 19:09:55.000000000 +0200
***************
*** 15,24 ****
  void *mzvim_eval_string __ARGS((char_u *str));
  struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc,
      struct Scheme_Object **));
! int mzthreads_allowed (void);
! #ifdef FEAT_GUI_KDE
! void timer_proc (void);
! void mzscheme_kde_start_timer (void);
! void mzscheme_kde_stop_timer (void);
! #endif
  /* vim: set ft=c : */
--- 15,20 ----
  void *mzvim_eval_string __ARGS((char_u *str));
  struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc,
      struct Scheme_Object **));
! int mzthreads_allowed __ARGS((void));
! void mzscheme_main __ARGS((void));
  /* vim: set ft=c : */
*** ../vim-7.2.190/src/version.c	2009-05-26 18:12:13.000000000 +0200
--- src/version.c	2009-05-26 22:52:53.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     191,
  /**/

-- 
Scientists decoded the first message from an alien civilization:
        SIMPLY SEND 6 TIMES 10 TO THE 50 ATOMS OF HYDROGEN TO THE STAR
SYSTEM AT THE TOP OF THE LIST, CROSS OFF THAT STAR SYSTEM, THEN PUT
YOUR STAR SYSTEM AT THE BOTTOM OF THE LIST AND SEND IT TO 100 OTHER
STAR SYSTEMS.  WITHIN ONE TENTH GALACTIC ROTATION YOU WILL RECEIVE
ENOUGH HYDROGREN TO POWER YOUR CIVILIZATION UNTIL ENTROPY REACHES ITS
MAXIMUM!  IT REALLY WORKS!

 /// 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    ///


--- NEW FILE 7.2.192 ---
To: vim-dev at vim.org
Subject: Patch 7.2.192
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.192 (after 7.2.188)
Problem:    Still a crash in the garbage collector for a very rare situation.
Solution:   Make sure current_copyID is always incremented correctly. (Kent
	    Sibilev)
Files:	    src/eval.c


*** ../vim-7.2.191/src/eval.c	2009-05-26 22:58:43.000000000 +0200
--- src/eval.c	2009-05-29 21:13:47.000000000 +0200
***************
*** 6526,6532 ****
  
      /* Don't free variables in the previous_funccal list unless they are only
       * referenced through previous_funccal.  This must be first, because if
!      * the item is referenced elsewhere it must not be freed. */
      for (fc = previous_funccal; fc != NULL; fc = fc->caller)
      {
  	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
--- 6526,6532 ----
  
      /* Don't free variables in the previous_funccal list unless they are only
       * referenced through previous_funccal.  This must be first, because if
!      * the item is referenced elsewhere the funccal must not be freed. */
      for (fc = previous_funccal; fc != NULL; fc = fc->caller)
      {
  	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
***************
*** 6564,6573 ****
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
  
!     /* Free lists and dictionaries that are not referenced. */
      did_free = free_unref_items(copyID);
  
!     /* check if any funccal can be freed now */
      for (pfc = &previous_funccal; *pfc != NULL; )
      {
  	if (can_free_funccal(*pfc, copyID))
--- 6564,6577 ----
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
  
!     /*
!      * 2. Free lists and dictionaries that are not referenced.
!      */
      did_free = free_unref_items(copyID);
  
!     /*
!      * 3. Check if any funccal can be freed now.
!      */
      for (pfc = &previous_funccal; *pfc != NULL; )
      {
  	if (can_free_funccal(*pfc, copyID))
***************
*** 9286,9292 ****
      if (noref < 0 || noref > 1)
  	EMSG(_(e_invarg));
      else
! 	item_copy(&argvars[0], rettv, TRUE, noref == 0 ? ++current_copyID : 0);
  }
  
  /*
--- 9290,9299 ----
      if (noref < 0 || noref > 1)
  	EMSG(_(e_invarg));
      else
!     {
! 	current_copyID += COPYID_INC;
! 	item_copy(&argvars[0], rettv, TRUE, noref == 0 ? current_copyID : 0);
!     }
  }
  
  /*
***************
*** 18966,18972 ****
      char_u	*s;
      char_u	numbuf[NUMBUFLEN];
  
!     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);
--- 18973,18980 ----
      char_u	*s;
      char_u	numbuf[NUMBUFLEN];
  
!     current_copyID += COPYID_INC;
!     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);
***************
*** 19401,19407 ****
  	    }
  	    else if (eap->cmdidx == CMD_echo)
  		msg_puts_attr((char_u *)" ", echo_attr);
! 	    p = echo_string(&rettv, &tofree, numbuf, ++current_copyID);
  	    if (p != NULL)
  		for ( ; *p != NUL && !got_int; ++p)
  		{
--- 19409,19416 ----
  	    }
  	    else if (eap->cmdidx == CMD_echo)
  		msg_puts_attr((char_u *)" ", echo_attr);
! 	    current_copyID += COPYID_INC;
! 	    p = echo_string(&rettv, &tofree, numbuf, current_copyID);
  	    if (p != NULL)
  		for ( ; *p != NUL && !got_int; ++p)
  		{
*** ../vim-7.2.191/src/version.c	2009-05-26 22:58:43.000000000 +0200
--- src/version.c	2009-06-03 13:21:20.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     192,
  /**/

-- 
Imagine a world without hypothetical situations.

 /// 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    ///


--- NEW FILE 7.2.193 ---
To: vim-dev at vim.org
Subject: Patch 7.2.193
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.193
Problem:    Warning for uninitialized values.
Solution:   Initialize all the struct items.
Files:	    src/eval.c


*** ../vim-7.2.192/src/eval.c	2009-06-03 13:22:22.000000000 +0200
--- src/eval.c	2009-05-29 21:13:47.000000000 +0200
***************
*** 286,292 ****
  #define VV_RO		2	/* read-only */
  #define VV_RO_SBX	4	/* read-only in the sandbox */
  
! #define VV_NAME(s, t)	s, {{t}}, {0}
  
  static struct vimvar
  {
--- 286,292 ----
  #define VV_RO		2	/* read-only */
  #define VV_RO_SBX	4	/* read-only in the sandbox */
  
! #define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}, {0}
  
  static struct vimvar
  {
*** ../vim-7.2.192/src/version.c	2009-06-03 13:22:23.000000000 +0200
--- src/version.c	2009-06-03 14:25:18.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     193,
  /**/

-- 
No engineer can take a shower without wondering if some sort of Teflon coating
would make showering unnecessary.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.194 ---
To: vim-dev at vim.org
Subject: Patch 7.2.194 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.194 (extra)
Problem:    MSVC: rem commands are echoed.
Solution:   Add commands to switch off echo. (Wang Xu)
Files:	    src/msvc2008.bat


*** ../vim-7.2.193/src/msvc2008.bat	2008-06-24 22:55:23.000000000 +0200
--- src/msvc2008.bat	2009-04-29 18:05:11.000000000 +0200
***************
*** 1,5 ****
--- 1,7 ----
+ @echo off
  rem To be used on MS-Windows for Visual C++ 2008 Express Edition
  rem   aka Microsoft Visual Studio 9.0.
  rem See INSTALLpc.txt for information.
+ @echo on
  
  call "%VS90COMNTOOLS%%vsvars32.bat"
*** ../vim-7.2.193/src/version.c	2009-06-03 14:25:47.000000000 +0200
--- src/version.c	2009-06-03 15:04:30.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     194,
  /**/

-- 
I used to be indecisive, now I'm not sure.

 /// 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    ///


--- NEW FILE 7.2.195 ---
To: vim-dev at vim.org
Subject: Patch 7.2.195
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.195
Problem:    Leaking memory for the command Vim was started with.
Solution:   Remember the pointer and free it.
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.194/src/gui_gtk_x11.c	2009-05-17 16:23:20.000000000 +0200
--- src/gui_gtk_x11.c	2009-06-03 12:44:31.000000000 +0200
***************
*** 412,417 ****
--- 412,418 ----
  #endif
  #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION)
  static const char *restart_command = NULL;
+ static       char *abs_restart_command = NULL;
  #endif
  static int found_iconic_arg = FALSE;
  
***************
*** 449,456 ****
  	char_u buf[MAXPATHL];
  
  	if (mch_FullName((char_u *)argv[0], buf, (int)sizeof(buf), TRUE) == OK)
! 	    /* Tiny leak; doesn't matter, and usually we don't even get here */
! 	    restart_command = (char *)vim_strsave(buf);
      }
  #endif
  
--- 450,459 ----
  	char_u buf[MAXPATHL];
  
  	if (mch_FullName((char_u *)argv[0], buf, (int)sizeof(buf), TRUE) == OK)
! 	{
! 	    abs_restart_command = (char *)vim_strsave(buf);
! 	    restart_command = abs_restart_command;
! 	}
      }
  #endif
  
***************
*** 611,616 ****
--- 614,622 ----
  gui_mch_free_all()
  {
      vim_free(gui_argv);
+ #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION)
+     vim_free(abs_restart_command);
+ #endif
  }
  #endif
  
*** ../vim-7.2.194/src/version.c	2009-06-03 15:05:05.000000000 +0200
--- src/version.c	2009-06-03 16:19:00.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     195,
  /**/

-- 
I think that you'll agree that engineers are very effective in their social
interactions.  It's the "normal" people who are nuts.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.196 ---
To: vim-dev at vim.org
Subject: Patch 7.2.196
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.196 (after 7.2.167)
Problem:    Turns out splint doesn't work well enough to be usable.
Solution:   Remove splint support.
Files:	    Filelist, src/cleanlint.vim


*** ../vim-7.2.195/Filelist	2009-05-13 12:46:36.000000000 +0200
--- Filelist	2009-05-21 14:42:46.000000000 +0200
***************
*** 139,145 ****
  		src/INSTALL \
  		src/INSTALLx.txt \
  		src/Makefile \
- 		src/cleanlint.vim \
  		src/auto/configure \
  		src/config.aap.in \
  		src/config.h.in \
--- 139,144 ----
*** ../vim-7.2.195/src/cleanlint.vim	2009-05-13 18:54:14.000000000 +0200
--- src/cleanlint.vim	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,32 ****
- " Vim tool: Filter output of splint
- "
- " Maintainer:	Bram Moolenaar <Bram at vim.org>
- " Last Change:	2009 May 13
- 
- " Usage: redirect output of "make lint" to a file, edit that file with Vim and
- " :call CleanLint()
- " This deletes irrelevant messages.  What remains might be valid warnings.
- 
- fun! CleanLint()
-   g/Assignment of dev_t to __dev_t:/lockmarks d
-   g/Assignment of __dev_t to dev_t:/lockmarks d
-   g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
-   g/Operands of == have incompatible types (char_u, int): /lockmarks d
-   g/Assignment of char to char_u: /lockmarks d
-   g/Assignment of unsigned int to int: /lockmarks d
-   g/Assignment of int to unsigned int: /lockmarks d
-   g/Assignment of unsigned int to long int: /lockmarks d
-   g/Assignment of int to char_u: /lockmarks d
-   g/Function .* expects arg . to be wint_t gets int: /lockmarks d
-   g/Function .* expects arg . to be size_t gets int: /lockmarks d
-   g/Initial value of .* is type char, expects char_u: /lockmarks d
-   g/^ex_cmds.h:.* Function types are inconsistent. Parameter 1 is implicitly temp, but unqualified in assigned function:/lockmarks d
-   g/^ex_docmd.c:.* nospec_str/lockmarks d
-   g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
-   g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
-   g/^  Types are incompatible/lockmarks d
-   g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
-   g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
-   g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
-   g+ A variable is declared but never used. Use /. at unused@./ in front of declaration to suppress message.+lockmarks d
- endfun
--- 0 ----
*** ../vim-7.2.195/src/version.c	2009-06-03 16:20:09.000000000 +0200
--- src/version.c	2009-06-03 22:04:31.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     196,
  /**/

-- 
It's totally unfair to suggest - as many have - that engineers are socially
inept.  Engineers simply have different objectives when it comes to social
interaction.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.197 ---
To: vim-dev at vim.org
Subject: Patch 7.2.197
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.197
Problem:    Warning for uninitialized values.
Solution:   Initialize all the struct items of typebuf.
Files:	    src/globals.h


*** ../vim-7.2.196/src/globals.h	2009-05-13 12:46:36.000000000 +0200
--- src/globals.h	2009-06-10 15:52:18.000000000 +0200
***************
*** 960,966 ****
  		    ;
  EXTERN typebuf_T typebuf		/* typeahead buffer */
  #ifdef DO_INIT
! 		    = {NULL, NULL}
  #endif
  		    ;
  #ifdef FEAT_EX_EXTRA
--- 967,973 ----
  		    ;
  EXTERN typebuf_T typebuf		/* typeahead buffer */
  #ifdef DO_INIT
! 		    = {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}
  #endif
  		    ;
  #ifdef FEAT_EX_EXTRA
*** ../vim-7.2.196/src/version.c	2009-06-03 22:07:38.000000000 +0200
--- src/version.c	2009-06-10 18:14:58.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     197,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
18. Your wife drapes a blond wig over your monitor to remind you of what she
    looks like.

 /// 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    ///


--- NEW FILE 7.2.198 ---
To: vim-dev at vim.org
Subject: Patch 7.2.198
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.198
Problem:    Size of buffer used for tgetent() may be too small.
Solution:   Use the largest known size everywhere.
Files:	    src/vim.h


*** ../vim-7.2.197/src/vim.h	2009-05-14 22:19:19.000000000 +0200
--- src/vim.h	2009-06-07 20:37:48.000000000 +0200
***************
*** 1345,1355 ****
  # define MSG_BUF_CLEN  MSG_BUF_LEN	    /* cell length */
  #endif
  
! #if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX)
! # define TBUFSZ 2048		/* buffer size for termcap entry */
! #else
! # define TBUFSZ 1024		/* buffer size for termcap entry */
! #endif
  
  /*
   * Maximum length of key sequence to be mapped.
--- 1345,1355 ----
  # define MSG_BUF_CLEN  MSG_BUF_LEN	    /* cell length */
  #endif
  
! /* Size of the buffer used for tgetent().  Unfortunately this is largely
!  * undocumented, some systems use 1024.  Using a buffer that is too small
!  * causes a buffer overrun and a crash.  Use the maximum known value to stay
!  * on the safe side. */
! #define TBUFSZ 2048		/* buffer size for termcap entry */
  
  /*
   * Maximum length of key sequence to be mapped.
*** ../vim-7.2.197/src/version.c	2009-06-10 18:15:49.000000000 +0200
--- src/version.c	2009-06-16 11:06:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     198,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
7. Finish all your sentences with "in accordance with the prophecy".

 /// 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    ///


--- NEW FILE 7.2.199 ---
To: vim-dev at vim.org
Subject: Patch 7.2.199
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.2.199
Problem:    Strange character in comment.
Solution:   Change to "message". (Yongwei Wu)
Files:      src/term.c


*** ../vim-7.2.198/src/term.c	2009-05-17 13:30:58.000000000 +0200
--- src/term.c	2009-06-16 11:16:17.000000000 +0200
***************
*** 5555,5561 ****
   * respects the current B/k/< settings of 'cpoption'.
   *
   * This function is called when expanding mappings/abbreviations on the
!  * command-line, and for building the "Ambiguous mapping..." error mess?ge.
   *
   * It uses a growarray to build the translation string since the
   * latter can be wider than the original description. The caller has to
--- 5555,5561 ----
   * respects the current B/k/< settings of 'cpoption'.
   *
   * This function is called when expanding mappings/abbreviations on the
!  * command-line, and for building the "Ambiguous mapping..." error message.
   *
   * It uses a growarray to build the translation string since the
   * latter can be wider than the original description. The caller has to
*** ../vim-7.2.198/src/version.c	2009-06-16 11:08:13.000000000 +0200
--- src/version.c	2009-06-16 14:31:03.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     199,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
10. Ask people what sex they are. Laugh hysterically after they answer.

 /// 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    ///


--- NEW FILE 7.2.200 ---
To: vim-dev at vim.org
Subject: Patch 7.2.200
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.200
Problem:    Reading past end of string when navigating the menu bar or
	    resizing the window.
Solution:   Add and use mb_ptr2len_len(). (partly by Dominique Pelle)
	    Also add mb_ptr2cells_len() to prevent more trouble.
Files:	    src/gui_gtk_x11.c, src/os_unix.c, src/globals.h, src/mbyte.c,
	    src/proto/mbyte.pro


*** ../vim-7.2.199/src/gui_gtk_x11.c	2009-06-03 16:20:09.000000000 +0200
--- src/gui_gtk_x11.c	2009-06-16 14:44:19.000000000 +0200
***************
*** 6077,6088 ****
  # ifdef FEAT_MBYTE
  	    if (enc_utf8)
  	    {
! 		c = utf_ptr2char(p);
  		if (c >= 0x10000)	/* show chars > 0xffff as ? */
  		    c = 0xbf;
  		buf[textlen].byte1 = c >> 8;
  		buf[textlen].byte2 = c;
! 		p += utf_ptr2len(p);
  		width += utf_char2cells(c);
  	    }
  	    else
--- 6135,6149 ----
  # ifdef FEAT_MBYTE
  	    if (enc_utf8)
  	    {
! 		int pcc[MAX_MCO];
! 
! 		/* TODO: use the composing characters */
! 		c = utfc_ptr2char_len(p, &pcc, len - (p - s));
  		if (c >= 0x10000)	/* show chars > 0xffff as ? */
  		    c = 0xbf;
  		buf[textlen].byte1 = c >> 8;
  		buf[textlen].byte2 = c;
! 		p += utfc_ptr2len_len(p, len - (p - s));
  		width += utf_char2cells(c);
  	    }
  	    else
***************
*** 6106,6113 ****
  	if (has_mbyte)
  	{
  	    width = 0;
! 	    for (p = s; p < s + len; p += (*mb_ptr2len)(p))
! 		width += (*mb_ptr2cells)(p);
  	}
  	else
  # endif
--- 6167,6174 ----
  	if (has_mbyte)
  	{
  	    width = 0;
! 	    for (p = s; p < s + len; p += (*mb_ptr2len_len)(p, len - (p - s)))
! 		width += (*mb_ptr2cells_len)(p, len - (p - s));
  	}
  	else
  # endif
*** ../vim-7.2.199/src/os_unix.c	2009-05-17 13:30:58.000000000 +0200
--- src/os_unix.c	2009-06-03 12:35:59.000000000 +0200
***************
*** 4305,4311 ****
  				ta_buf[i] = '\n';
  # ifdef FEAT_MBYTE
  			    if (has_mbyte)
! 				i += (*mb_ptr2len)(ta_buf + i) - 1;
  # endif
  			}
  
--- 4305,4312 ----
  				ta_buf[i] = '\n';
  # ifdef FEAT_MBYTE
  			    if (has_mbyte)
! 				i += (*mb_ptr2len_len)(ta_buf + i,
! 							ta_len + len - i) - 1;
  # endif
  			}
  
*** ../vim-7.2.199/src/globals.h	2009-06-10 18:15:49.000000000 +0200
--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
***************
*** 810,820 ****
--- 815,828 ----
   */
  /* length of char in bytes, including following composing chars */
  EXTERN int (*mb_ptr2len) __ARGS((char_u *p)) INIT(= latin_ptr2len);
+ /* idem, with limit on string length */
+ EXTERN int (*mb_ptr2len_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2len_len);
  /* byte length of char */
  EXTERN int (*mb_char2len) __ARGS((int c)) INIT(= latin_char2len);
  /* convert char to bytes, return the length */
  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_ptr2cells_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2cells_len);
  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);
*** ../vim-7.2.199/src/mbyte.c	2009-05-17 13:30:58.000000000 +0200
--- src/mbyte.c	2009-06-16 15:01:30.000000000 +0200
***************
*** 127,133 ****
--- 127,136 ----
  static int dbcs_char2len __ARGS((int c));
  static int dbcs_char2bytes __ARGS((int c, char_u *buf));
  static int dbcs_ptr2len __ARGS((char_u *p));
+ static int dbcs_ptr2len_len __ARGS((char_u *p, int size));
+ static int utf_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_char2cells __ARGS((int c));
+ static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
  /* Lookup table to quickly get the length in bytes of a UTF-8 character from
***************
*** 606,614 ****
--- 609,619 ----
      if (enc_utf8)
      {
  	mb_ptr2len = utfc_ptr2len;
+ 	mb_ptr2len_len = utfc_ptr2len_len;
  	mb_char2len = utf_char2len;
  	mb_char2bytes = utf_char2bytes;
  	mb_ptr2cells = utf_ptr2cells;
+ 	mb_ptr2cells_len = utf_ptr2cells_len;
  	mb_char2cells = utf_char2cells;
  	mb_off2cells = utf_off2cells;
  	mb_ptr2char = utf_ptr2char;
***************
*** 617,625 ****
--- 622,632 ----
      else if (enc_dbcs != 0)
      {
  	mb_ptr2len = dbcs_ptr2len;
+ 	mb_ptr2len_len = dbcs_ptr2len_len;
  	mb_char2len = dbcs_char2len;
  	mb_char2bytes = dbcs_char2bytes;
  	mb_ptr2cells = dbcs_ptr2cells;
+ 	mb_ptr2cells_len = dbcs_ptr2cells_len;
  	mb_char2cells = dbcs_char2cells;
  	mb_off2cells = dbcs_off2cells;
  	mb_ptr2char = dbcs_ptr2char;
***************
*** 628,636 ****
--- 635,645 ----
      else
      {
  	mb_ptr2len = latin_ptr2len;
+ 	mb_ptr2len_len = latin_ptr2len_len;
  	mb_char2len = latin_char2len;
  	mb_char2bytes = latin_char2bytes;
  	mb_ptr2cells = latin_ptr2cells;
+ 	mb_ptr2cells_len = latin_ptr2cells_len;
  	mb_char2cells = latin_char2cells;
  	mb_off2cells = latin_off2cells;
  	mb_ptr2char = latin_ptr2char;
***************
*** 1069,1075 ****
   * Get byte length of character at "*p" but stop at a NUL.
   * For UTF-8 this includes following composing characters.
   * Returns 0 when *p is NUL.
-  *
   */
      int
  latin_ptr2len(p)
--- 1078,1083 ----
***************
*** 1091,1096 ****
--- 1099,1138 ----
      return len;
  }
  
+ /*
+  * mb_ptr2len_len() function pointer.
+  * Like mb_ptr2len(), but limit to read "size" bytes.
+  * Returns 0 for an empty string.
+  * Returns 1 for an illegal char or an incomplete byte sequence.
+  */
+     int
+ latin_ptr2len_len(p, size)
+     char_u	*p;
+     int		size;
+ {
+     if (size < 1 || *p == NUL)
+ 	return 0;
+     return 1;
+ }
+ 
+     static int
+ dbcs_ptr2len_len(p, size)
+     char_u	*p;
+     int		size;
+ {
+     int		len;
+ 
+     if (size < 1 || *p == NUL)
+ 	return 0;
+     if (size == 1)
+ 	return 1;
+     /* Check that second byte is not missing. */
+     len = MB_BYTE2LEN(*p);
+     if (len == 2 && p[1] == NUL)
+ 	len = 1;
+     return len;
+ }
+ 
  struct interval
  {
      unsigned short first;
***************
*** 1287,1292 ****
--- 1329,1383 ----
  }
  
  /*
+  * mb_ptr2cells_len() function pointer.
+  * Like mb_ptr2cells(), but limit string length to "size".
+  * For an empty string or truncated character returns 1.
+  */
+     int
+ latin_ptr2cells_len(p, size)
+     char_u	*p UNUSED;
+     int		size UNUSED;
+ {
+     return 1;
+ }
+ 
+     static int
+ utf_ptr2cells_len(p, size)
+     char_u	*p;
+     int		size;
+ {
+     int		c;
+ 
+     /* Need to convert to a wide character. */
+     if (size > 0 && *p >= 0x80)
+     {
+ 	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
+ 	    return 1;
+ 	c = utf_ptr2char(p);
+ 	/* An illegal byte is displayed as <xx>. */
+ 	if (utf_ptr2len(p) == 1 || c == NUL)
+ 	    return 4;
+ 	/* If the char is ASCII it must be an overlong sequence. */
+ 	if (c < 0x80)
+ 	    return char2cells(c);
+ 	return utf_char2cells(c);
+     }
+     return 1;
+ }
+ 
+     static int
+ dbcs_ptr2cells_len(p, size)
+     char_u	*p;
+     int		size;
+ {
+     /* Number of cells is equal to number of bytes, except for euc-jp when
+      * the first byte is 0x8e. */
+     if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e))
+ 	return 1;
+     return MB_BYTE2LEN(*p);
+ }
+ 
+ /*
   * mb_char2cells() function pointer.
   * Return the number of display cells character "c" occupies.
   * Only takes care of multi-byte chars, not "^C" and such.
***************
*** 1716,1721 ****
--- 1807,1813 ----
  /*
   * Return the number of bytes the UTF-8 encoding of the character at "p[size]"
   * takes.  This includes following composing characters.
+  * Returns 0 for an empty string.
   * Returns 1 for an illegal char or an incomplete byte sequence.
   */
      int
***************
*** 1728,1734 ****
      int		prevlen;
  #endif
  
!     if (*p == NUL)
  	return 0;
      if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */
  	return 1;
--- 1820,1826 ----
      int		prevlen;
  #endif
  
!     if (size < 1 || *p == NUL)
  	return 0;
      if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */
  	return 1;
*** ../vim-7.2.199/src/proto/mbyte.pro	2008-07-13 19:34:19.000000000 +0200
--- src/proto/mbyte.pro	2009-06-16 14:58:39.000000000 +0200
***************
*** 7,16 ****
--- 7,18 ----
  int latin_char2len __ARGS((int c));
  int latin_char2bytes __ARGS((int c, char_u *buf));
  int latin_ptr2len __ARGS((char_u *p));
+ int latin_ptr2len_len __ARGS((char_u *p, int size));
  int utf_char2cells __ARGS((int c));
  int latin_ptr2cells __ARGS((char_u *p));
  int utf_ptr2cells __ARGS((char_u *p));
  int dbcs_ptr2cells __ARGS((char_u *p));
+ int latin_ptr2cells_len __ARGS((char_u *p, int size));
  int latin_char2cells __ARGS((int c));
  int latin_off2cells __ARGS((unsigned off, unsigned max_off));
  int dbcs_off2cells __ARGS((unsigned off, unsigned max_off));
***************
*** 85,90 ****
--- 87,93 ----
  int preedit_get_status __ARGS((void));
  int im_is_preediting __ARGS((void));
  int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to));
+ int convert_setup_ext __ARGS((vimconv_T *vcp, char_u *from, int from_unicode_is_utf8, char_u *to, int to_unicode_is_utf8));
  int convert_input __ARGS((char_u *ptr, int len, int maxlen));
  int convert_input_safe __ARGS((char_u *ptr, int len, int maxlen, char_u **restp, int *restlenp));
  char_u *string_convert __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp));
*** ../vim-7.2.199/src/version.c	2009-06-16 14:31:56.000000000 +0200
--- src/version.c	2009-06-16 14:37:38.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     200,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
12. Sing along at the opera.

 /// 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    ///


--- NEW FILE 7.2.201 ---
To: vim-dev at vim.org
Subject: Patch 7.2.201
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.201
Problem:    Cannot copy/paste HTML to/from Firefox via the clipboard.
Solution:   Implement this for GTK.  Add the "html" value to 'clipboard'.
Files:	    runtime/doc/options.txt, src/globals.h, src/gui_gtk_x11.c,
	    src/mbyte.c, src/proto/mbyte.pro, src/option.c


*** ../vim-7.2.200/runtime/doc/options.txt	2009-02-21 20:27:00.000000000 +0100
--- runtime/doc/options.txt	2009-06-12 22:25:22.000000000 +0200
***************
*** 1443,1448 ****
--- 1444,1457 ----
  	autoselectml	Like "autoselect", but for the modeless selection
  			only.  Compare to the 'A' flag in 'guioptions'.
  
+ 	html		When the clipboard contains HTML, use this when
+ 			pasting.  When putting text on the clipboard, mark it
+ 			as HTML.  This works to copy rendered HTML from
+ 			Firefox, paste it as raw HTML in Vim, select the HTML
+ 			in Vim and paste it in a rich edit box in Firefox.
+ 			Only supported for GTK version 2 and later.
+ 			Only available with the |+multi_byte| feature.
+ 
  	exclude:{pattern}
  			Defines a pattern that is matched against the name of
  			the terminal 'term'.  If there is a match, no
*** ../vim-7.2.200/src/globals.h	2009-06-16 15:12:11.000000000 +0200
--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
***************
*** 509,514 ****
--- 509,515 ----
  EXTERN int	clip_unnamed INIT(= FALSE);
  EXTERN int	clip_autoselect INIT(= FALSE);
  EXTERN int	clip_autoselectml INIT(= FALSE);
+ EXTERN int	clip_html INIT(= FALSE);
  EXTERN regprog_T *clip_exclude_prog INIT(= NULL);
  #endif
  
*** ../vim-7.2.200/src/gui_gtk_x11.c	2009-06-16 15:12:11.000000000 +0200
--- src/gui_gtk_x11.c	2009-06-16 14:44:19.000000000 +0200
***************
*** 107,112 ****
--- 107,113 ----
      TARGET_UTF8_STRING,
      TARGET_STRING,
      TARGET_COMPOUND_TEXT,
+     TARGET_HTML,
      TARGET_TEXT,
      TARGET_TEXT_URI_LIST,
      TARGET_TEXT_PLAIN,
***************
*** 123,128 ****
--- 124,130 ----
      {VIMENC_ATOM_NAME,	0, TARGET_VIMENC},
      {VIM_ATOM_NAME,	0, TARGET_VIM},
  #ifdef FEAT_MBYTE
+     {"text/html",	0, TARGET_HTML},
      {"UTF8_STRING",	0, TARGET_UTF8_STRING},
  #endif
      {"COMPOUND_TEXT",	0, TARGET_COMPOUND_TEXT},
***************
*** 140,145 ****
--- 142,148 ----
  {
      {"text/uri-list",	0, TARGET_TEXT_URI_LIST},
  # ifdef FEAT_MBYTE
+     {"text/html",	0, TARGET_HTML},
      {"UTF8_STRING",	0, TARGET_UTF8_STRING},
  # endif
      {"STRING",		0, TARGET_STRING},
***************
*** 178,183 ****
--- 181,187 ----
   * Atoms used to control/reference X11 selections.
   */
  #ifdef FEAT_MBYTE
+ static GdkAtom html_atom = GDK_NONE;
  static GdkAtom utf8_string_atom = GDK_NONE;
  #endif
  #ifndef HAVE_GTK2
***************
*** 1364,1369 ****
--- 1368,1391 ----
  	    else
  		text = tmpbuf_utf8;
  	}
+ 	else if (len >= 2 && text[0] == 0xff && text[1] == 0xfe)
+ 	{
+ 	    vimconv_T conv;
+ 
+ 	    /* UTF-16, we get this for HTML */
+ 	    conv.vc_type = CONV_NONE;
+ 	    convert_setup_ext(&conv, (char_u *)"utf-16le", FALSE, p_enc, TRUE);
+ 
+ 	    if (conv.vc_type != CONV_NONE)
+ 	    {
+ 		text += 2;
+ 		len -= 2;
+ 		tmpbuf = string_convert(&conv, text, &len);
+ 		convert_setup(&conv, NULL, NULL);
+ 	    }
+ 	    if (tmpbuf != NULL)
+ 		text = tmpbuf;
+ 	}
      }
  #else /* !HAVE_GTK2 */
  # ifdef FEAT_MBYTE
***************
*** 1451,1456 ****
--- 1473,1479 ----
  
      if (info != (guint)TARGET_STRING
  #ifdef FEAT_MBYTE
+ 	    && (!clip_html || info != (guint)TARGET_HTML)
  	    && info != (guint)TARGET_UTF8_STRING
  	    && info != (guint)TARGET_VIMENC
  #endif
***************
*** 1486,1491 ****
--- 1509,1548 ----
      }
  
  #ifdef FEAT_MBYTE
+     else if (info == (guint)TARGET_HTML)
+     {
+ 	vimconv_T conv;
+ 
+ 	/* Since we get utf-16, we probably should set it as well. */
+ 	conv.vc_type = CONV_NONE;
+ 	convert_setup_ext(&conv, p_enc, TRUE, (char_u *)"utf-16le", FALSE);
+ 	if (conv.vc_type != CONV_NONE)
+ 	{
+ 	    tmpbuf = string_convert(&conv, string, &length);
+ 	    convert_setup(&conv, NULL, NULL);
+ 	    vim_free(string);
+ 	    string = tmpbuf;
+ 	}
+ 
+ 	/* Prepend the BOM: "fffe" */
+ 	if (string != NULL)
+ 	{
+ 	    tmpbuf = alloc(length + 2);
+ 	    tmpbuf[0] = 0xff;
+ 	    tmpbuf[1] = 0xfe;
+ 	    mch_memmove(tmpbuf + 2, string, (size_t)length);
+ 	    vim_free(string);
+ 	    string = tmpbuf;
+ 	    length += 2;
+ 
+ 	    selection_data->type = selection_data->target;
+ 	    selection_data->format = 16;	/* 16 bits per char */
+ 	    gtk_selection_data_set(selection_data, html_atom, 16,
+ 							      string, length);
+ 	    vim_free(string);
+ 	}
+ 	return;
+     }
      else if (info == (guint)TARGET_VIMENC)
      {
  	int l = STRLEN(p_enc);
***************
*** 3464,3469 ****
--- 3521,3527 ----
  
      /* Initialise atoms */
  #ifdef FEAT_MBYTE
+     html_atom = gdk_atom_intern("text/html", FALSE);
      utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
  #endif
  #ifndef HAVE_GTK2
***************
*** 6665,6670 ****
--- 6723,6732 ----
  
      for (i = 0; i < N_SELECTION_TARGETS; ++i)
      {
+ #ifdef FEAT_MBYTE
+ 	if (!clip_html && selection_targets[i].info == TARGET_HTML)
+ 	    continue;
+ #endif
  	received_selection = RS_NONE;
  	target = gdk_atom_intern(selection_targets[i].target, FALSE);
  
*** ../vim-7.2.200/src/mbyte.c	2009-06-16 15:12:11.000000000 +0200
--- src/mbyte.c	2009-06-16 15:01:30.000000000 +0200
***************
*** 3265,3271 ****
  
  # if defined(USE_ICONV) || defined(PROTO)
  
! static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp));
  
  /*
   * Call iconv_open() with a check if iconv() works properly (there are broken
--- 3265,3271 ----
  
  # if defined(USE_ICONV) || defined(PROTO)
  
! static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp, int *resultlenp));
  
  /*
   * Call iconv_open() with a check if iconv() works properly (there are broken
***************
*** 3326,3338 ****
   * If "unconvlenp" is not NULL handle the string ending in an incomplete
   * sequence and set "*unconvlenp" to the length of it.
   * Returns the converted string in allocated memory.  NULL for an error.
   */
      static char_u *
! iconv_string(vcp, str, slen, unconvlenp)
      vimconv_T	*vcp;
      char_u	*str;
      int		slen;
      int		*unconvlenp;
  {
      const char	*from;
      size_t	fromlen;
--- 3326,3340 ----
   * If "unconvlenp" is not NULL handle the string ending in an incomplete
   * sequence and set "*unconvlenp" to the length of it.
   * Returns the converted string in allocated memory.  NULL for an error.
+  * If resultlenp is not NULL, sets it to the result length in bytes.
   */
      static char_u *
! iconv_string(vcp, str, slen, unconvlenp, resultlenp)
      vimconv_T	*vcp;
      char_u	*str;
      int		slen;
      int		*unconvlenp;
+     int		*resultlenp;
  {
      const char	*from;
      size_t	fromlen;
***************
*** 3418,3423 ****
--- 3420,3428 ----
  	/* Not enough room or skipping illegal sequence. */
  	done = to - (char *)result;
      }
+ 
+     if (resultlenp != NULL)
+ 	*resultlenp = (int)(to - (char *)result);
      return result;
  }
  
***************
*** 5837,5844 ****
--- 5842,5866 ----
      char_u	*from;
      char_u	*to;
  {
+     return convert_setup_ext(vcp, from, TRUE, to, TRUE);
+ }
+ 
+ /*
+  * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all
+  * "from" unicode charsets be considered utf-8.  Same for "to".
+  */
+     int
+ convert_setup_ext(vcp, from, from_unicode_is_utf8, to, to_unicode_is_utf8)
+     vimconv_T	*vcp;
+     char_u	*from;
+     int		from_unicode_is_utf8;
+     char_u	*to;
+     int		to_unicode_is_utf8;
+ {
      int		from_prop;
      int		to_prop;
+     int		from_is_utf8;
+     int		to_is_utf8;
  
      /* Reset to no conversion. */
  # ifdef USE_ICONV
***************
*** 5856,5892 ****
  
      from_prop = enc_canon_props(from);
      to_prop = enc_canon_props(to);
!     if ((from_prop & ENC_LATIN1) && (to_prop & ENC_UNICODE))
      {
  	/* Internal latin1 -> utf-8 conversion. */
  	vcp->vc_type = CONV_TO_UTF8;
  	vcp->vc_factor = 2;	/* up to twice as long */
      }
!     else if ((from_prop & ENC_LATIN9) && (to_prop & ENC_UNICODE))
      {
  	/* Internal latin9 -> utf-8 conversion. */
  	vcp->vc_type = CONV_9_TO_UTF8;
  	vcp->vc_factor = 3;	/* up to three as long (euro sign) */
      }
!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN1))
      {
  	/* Internal utf-8 -> latin1 conversion. */
  	vcp->vc_type = CONV_TO_LATIN1;
      }
!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN9))
      {
  	/* Internal utf-8 -> latin9 conversion. */
  	vcp->vc_type = CONV_TO_LATIN9;
      }
  #ifdef WIN3264
      /* Win32-specific codepage <-> codepage conversion without iconv. */
!     else if (((from_prop & ENC_UNICODE) || encname2codepage(from) > 0)
! 	    && ((to_prop & ENC_UNICODE) || encname2codepage(to) > 0))
      {
  	vcp->vc_type = CONV_CODEPAGE;
  	vcp->vc_factor = 2;	/* up to twice as long */
! 	vcp->vc_cpfrom = (from_prop & ENC_UNICODE) ? 0 : encname2codepage(from);
! 	vcp->vc_cpto = (to_prop & ENC_UNICODE) ? 0 : encname2codepage(to);
      }
  #endif
  #ifdef MACOS_X
--- 5878,5923 ----
  
      from_prop = enc_canon_props(from);
      to_prop = enc_canon_props(to);
!     if (from_unicode_is_utf8)
! 	from_is_utf8 = from_prop & ENC_UNICODE;
!     else
! 	from_is_utf8 = from_prop == ENC_UNICODE;
!     if (to_unicode_is_utf8)
! 	to_is_utf8 = to_prop & ENC_UNICODE;
!     else
! 	to_is_utf8 = to_prop == ENC_UNICODE;
! 
!     if ((from_prop & ENC_LATIN1) && to_is_utf8)
      {
  	/* Internal latin1 -> utf-8 conversion. */
  	vcp->vc_type = CONV_TO_UTF8;
  	vcp->vc_factor = 2;	/* up to twice as long */
      }
!     else if ((from_prop & ENC_LATIN9) && to_is_utf8)
      {
  	/* Internal latin9 -> utf-8 conversion. */
  	vcp->vc_type = CONV_9_TO_UTF8;
  	vcp->vc_factor = 3;	/* up to three as long (euro sign) */
      }
!     else if (from_is_utf8 && (to_prop & ENC_LATIN1))
      {
  	/* Internal utf-8 -> latin1 conversion. */
  	vcp->vc_type = CONV_TO_LATIN1;
      }
!     else if (from_is_utf8 && (to_prop & ENC_LATIN9))
      {
  	/* Internal utf-8 -> latin9 conversion. */
  	vcp->vc_type = CONV_TO_LATIN9;
      }
  #ifdef WIN3264
      /* Win32-specific codepage <-> codepage conversion without iconv. */
!     else if ((from_is_utf8 || encname2codepage(from) > 0)
! 	    && (to_is_utf8 || encname2codepage(to) > 0))
      {
  	vcp->vc_type = CONV_CODEPAGE;
  	vcp->vc_factor = 2;	/* up to twice as long */
! 	vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from);
! 	vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to);
      }
  #endif
  #ifdef MACOS_X
***************
*** 5894,5900 ****
      {
  	vcp->vc_type = CONV_MAC_LATIN1;
      }
!     else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_UNICODE))
      {
  	vcp->vc_type = CONV_MAC_UTF8;
  	vcp->vc_factor = 2;	/* up to twice as long */
--- 5925,5931 ----
      {
  	vcp->vc_type = CONV_MAC_LATIN1;
      }
!     else if ((from_prop & ENC_MACROMAN) && to_is_utf8)
      {
  	vcp->vc_type = CONV_MAC_UTF8;
  	vcp->vc_factor = 2;	/* up to twice as long */
***************
*** 5903,5909 ****
      {
  	vcp->vc_type = CONV_LATIN1_MAC;
      }
!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_MACROMAN))
      {
  	vcp->vc_type = CONV_UTF8_MAC;
      }
--- 5934,5940 ----
      {
  	vcp->vc_type = CONV_LATIN1_MAC;
      }
!     else if (from_is_utf8 && (to_prop & ENC_MACROMAN))
      {
  	vcp->vc_type = CONV_UTF8_MAC;
      }
***************
*** 5913,5920 ****
      {
  	/* Use iconv() for conversion. */
  	vcp->vc_fd = (iconv_t)my_iconv_open(
! 		(to_prop & ENC_UNICODE) ? (char_u *)"utf-8" : to,
! 		(from_prop & ENC_UNICODE) ? (char_u *)"utf-8" : from);
  	if (vcp->vc_fd != (iconv_t)-1)
  	{
  	    vcp->vc_type = CONV_ICONV;
--- 5944,5951 ----
      {
  	/* Use iconv() for conversion. */
  	vcp->vc_fd = (iconv_t)my_iconv_open(
! 		to_is_utf8 ? (char_u *)"utf-8" : to,
! 		from_is_utf8 ? (char_u *)"utf-8" : from);
  	if (vcp->vc_fd != (iconv_t)-1)
  	{
  	    vcp->vc_type = CONV_ICONV;
***************
*** 6170,6178 ****
  
  # ifdef USE_ICONV
  	case CONV_ICONV:	/* conversion with output_conv.vc_fd */
! 	    retval = iconv_string(vcp, ptr, len, unconvlenp);
! 	    if (retval != NULL && lenp != NULL)
! 		*lenp = (int)STRLEN(retval);
  	    break;
  # endif
  # ifdef WIN3264
--- 6201,6207 ----
  
  # ifdef USE_ICONV
  	case CONV_ICONV:	/* conversion with output_conv.vc_fd */
! 	    retval = iconv_string(vcp, ptr, len, unconvlenp, lenp);
  	    break;
  # endif
  # ifdef WIN3264
*** ../vim-7.2.200/src/option.c	2009-05-17 13:30:58.000000000 +0200
--- src/option.c	2009-06-12 21:09:51.000000000 +0200
***************
*** 7024,7029 ****
--- 7024,7030 ----
      int		new_unnamed = FALSE;
      int		new_autoselect = FALSE;
      int		new_autoselectml = FALSE;
+     int		new_html = FALSE;
      regprog_T	*new_exclude_prog = NULL;
      char_u	*errmsg = NULL;
      char_u	*p;
***************
*** 7047,7052 ****
--- 7048,7058 ----
  	    new_autoselectml = TRUE;
  	    p += 12;
  	}
+ 	else if (STRNCMP(p, "html", 4) == 0 && (p[4] == ',' || p[4] == NUL))
+ 	{
+ 	    new_html = TRUE;
+ 	    p += 4;
+ 	}
  	else if (STRNCMP(p, "exclude:", 8) == 0 && new_exclude_prog == NULL)
  	{
  	    p += 8;
***************
*** 7068,7073 ****
--- 7074,7080 ----
  	clip_unnamed = new_unnamed;
  	clip_autoselect = new_autoselect;
  	clip_autoselectml = new_autoselectml;
+ 	clip_html = new_html;
  	vim_free(clip_exclude_prog);
  	clip_exclude_prog = new_exclude_prog;
      }
*** ../vim-7.2.200/src/version.c	2009-06-16 15:12:11.000000000 +0200
--- src/version.c	2009-06-16 15:14:02.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     201,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
13. Go to a poetry recital and ask why the poems don't rhyme.

 /// 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    ///


--- NEW FILE 7.2.202 ---
To: vim-dev at vim.org
Subject: Patch 7.2.202
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.202
Problem:    BufWipeout autocommand that edits another buffer causes problems.
Solution:   Check for the situation, give an error and quit the operation.
Files:	    src/fileio.c


*** ../vim-7.2.201/src/fileio.c	2009-05-16 17:29:37.000000000 +0200
--- src/fileio.c	2009-06-11 21:22:37.000000000 +0200
***************
*** 4824,4829 ****
--- 4824,4831 ----
      char_u	*sfname;
  {
  #ifdef FEAT_AUTOCMD
+     buf_T	*buf = curbuf;
+ 
      /* It's like the unnamed buffer is deleted.... */
      if (curbuf->b_p_bl)
  	apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf);
***************
*** 4832,4837 ****
--- 4834,4845 ----
      if (aborting())	    /* autocmds may abort script processing */
  	return FAIL;
  # endif
+     if (curbuf != buf)
+     {
+ 	/* We are in another buffer now, don't do the renaming. */
+ 	EMSG(_(e_auchangedbuf));
+ 	return FAIL;
+     }
  #endif
  
      if (setfname(curbuf, fname, sfname, FALSE) == OK)
*** ../vim-7.2.201/src/version.c	2009-06-16 15:23:07.000000000 +0200
--- src/version.c	2009-06-16 15:28:31.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     202,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
14. Put mosquito netting around your work area. Play a tape of jungle
    sounds all day.

 /// 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    ///


--- NEW FILE 7.2.203 ---
To: vim-dev at vim.org
Subject: Patch 7.2.203
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.203
Problem:    When reloading a buffer or doing anything else with a buffer that
	    is not displayed in a visible window, autocommands may be applied
	    to the current window, folds messed up, etc.
Solution:   Instead of using the current window for the hidden buffer use a
	    special window, splitting the current one temporarily.
Files:	    src/fileio.c, src/globals.h, src/gui.c, src/if_perl.xs,
	    src/proto/gui.pro, src/proto/window.pro, src/screen.c,
	    src/structs.h, src/window.c


*** ../vim-7.2.202/src/fileio.c	2009-06-16 15:35:46.000000000 +0200
--- src/fileio.c	2009-06-11 21:22:37.000000000 +0200
***************
*** 8365,8371 ****
  
  	    /* Execute the modeline settings, but don't set window-local
  	     * options if we are using the current window for another buffer. */
! 	    do_modelines(aco.save_curwin == NULL ? OPT_NOWIN : 0);
  
  	    /* restore the current window */
  	    aucmd_restbuf(&aco);
--- 8365,8371 ----
  
  	    /* Execute the modeline settings, but don't set window-local
  	     * options if we are using the current window for another buffer. */
! 	    do_modelines(curwin == aucmd_win ? OPT_NOWIN : 0);
  
  	    /* restore the current window */
  	    aucmd_restbuf(&aco);
***************
*** 8381,8388 ****
  
  /*
   * Prepare for executing autocommands for (hidden) buffer "buf".
!  * Search a window for the current buffer.  Save the cursor position and
!  * screen offset.
   * Set "curbuf" and "curwin" to match "buf".
   * When FEAT_AUTOCMD is not defined another version is used, see below.
   */
--- 8381,8388 ----
  
  /*
   * Prepare for executing autocommands for (hidden) buffer "buf".
!  * Search for a visible window containing the current buffer.  If there isn't
!  * one then use "aucmd_win".
   * Set "curbuf" and "curwin" to match "buf".
   * When FEAT_AUTOCMD is not defined another version is used, see below.
   */
***************
*** 8392,8399 ****
      buf_T	*buf;		/* new curbuf */
  {
      win_T	*win;
! 
!     aco->new_curbuf = buf;
  
      /* Find a window that is for the new buffer */
      if (buf == curbuf)		/* be quick when buf is curbuf */
--- 8392,8400 ----
      buf_T	*buf;		/* new curbuf */
  {
      win_T	*win;
! #ifdef FEAT_WINDOWS
!     int		save_ea;
! #endif
  
      /* Find a window that is for the new buffer */
      if (buf == curbuf)		/* be quick when buf is curbuf */
***************
*** 8407,8448 ****
  	win = NULL;
  #endif
  
!     /*
!      * Prefer to use an existing window for the buffer, it has the least side
!      * effects (esp. if "buf" is curbuf).
!      * Otherwise, use curwin for "buf".  It might make some items in the
!      * window invalid.  At least save the cursor and topline.
!      */
      if (win != NULL)
      {
! 	/* there is a window for "buf", make it the curwin */
! 	aco->save_curwin = curwin;
  	curwin = win;
- 	aco->save_buf = win->w_buffer;
- 	aco->new_curwin = win;
      }
      else
      {
! 	/* there is no window for "buf", use curwin */
! 	aco->save_curwin = NULL;
! 	aco->save_buf = curbuf;
! 	--curbuf->b_nwindows;
  	curwin->w_buffer = buf;
  	++buf->b_nwindows;
  
! 	/* save cursor and topline, set them to safe values */
! 	aco->save_cursor = curwin->w_cursor;
! 	curwin->w_cursor.lnum = 1;
! 	curwin->w_cursor.col = 0;
! 	aco->save_topline = curwin->w_topline;
! 	curwin->w_topline = 1;
! #ifdef FEAT_DIFF
! 	aco->save_topfill = curwin->w_topfill;
! 	curwin->w_topfill = 0;
  #endif
      }
- 
      curbuf = buf;
  }
  
  /*
--- 8408,8460 ----
  	win = NULL;
  #endif
  
!     /* Allocate "aucmd_win" when needed.  If this fails (out of memory) fall
!      * back to using the current window. */
!     if (win == NULL && aucmd_win == NULL)
!     {
! 	win_alloc_aucmd_win();
! 	if (aucmd_win == NULL)
! 	    win = curwin;
!     }
! 
!     aco->save_curwin = curwin;
!     aco->save_curbuf = curbuf;
      if (win != NULL)
      {
! 	/* There is a window for "buf" in the current tab page, make it the
! 	 * curwin.  This is preferred, it has the least side effects (esp. if
! 	 * "buf" is curbuf). */
  	curwin = win;
      }
      else
      {
! 	/* There is no window for "buf", use "aucmd_win".  To minimize the side
! 	 * effects, insert it in a the current tab page.
! 	 * Anything related to a window (e.g., setting folds) may have
! 	 * unexpected results. */
! 	curwin = aucmd_win;
  	curwin->w_buffer = buf;
  	++buf->b_nwindows;
  
! #ifdef FEAT_WINDOWS
! 	/* Split the current window, put the aucmd_win in the upper half. */
! 	make_snapshot(SNAP_AUCMD_IDX);
! 	save_ea = p_ea;
! 	p_ea = FALSE;
! 	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
! 	(void)win_comp_pos();   /* recompute window positions */
! 	p_ea = save_ea;
! #endif
! 	/* set cursor and topline to safe values */
! 	curwin_init();
! #ifdef FEAT_VERTSPLIT
! 	curwin->w_wincol = 0;
! 	curwin->w_width = Columns;
  #endif
      }
      curbuf = buf;
+     aco->new_curwin = curwin;
+     aco->new_curbuf = curbuf;
  }
  
  /*
***************
*** 8454,8474 ****
  aucmd_restbuf(aco)
      aco_save_T	*aco;		/* structure holding saved values */
  {
!     if (aco->save_curwin != NULL)
      {
  	/* restore curwin */
  #ifdef FEAT_WINDOWS
  	if (win_valid(aco->save_curwin))
  #endif
  	{
! 	    /* restore the buffer which was previously edited by curwin, if
! 	     * it's still the same window and it's valid */
  	    if (curwin == aco->new_curwin
! 		    && buf_valid(aco->save_buf)
! 		    && aco->save_buf->b_ml.ml_mfp != NULL)
  	    {
  		--curbuf->b_nwindows;
! 		curbuf = aco->save_buf;
  		curwin->w_buffer = curbuf;
  		++curbuf->b_nwindows;
  	    }
--- 8466,8551 ----
  aucmd_restbuf(aco)
      aco_save_T	*aco;		/* structure holding saved values */
  {
! #ifdef FEAT_WINDOWS
!     int dummy;
! #endif
! 
!     if (aco->new_curwin == aucmd_win)
!     {
! 	--curbuf->b_nwindows;
! #ifdef FEAT_WINDOWS
! 	/* Find "aucmd_win", it can't be closed, but it may be in another tab
! 	 * page. */
! 	if (curwin != aucmd_win)
! 	{
! 	    tabpage_T	*tp;
! 	    win_T	*wp;
! 
! 	    FOR_ALL_TAB_WINDOWS(tp, wp)
! 	    {
! 		if (wp == aucmd_win)
! 		{
! 		    if (tp != curtab)
! 			goto_tabpage_tp(tp);
! 		    win_goto(aucmd_win);
! 		    break;
! 		}
! 	    }
! 	}
! 
! 	/* Remove the window and frame from the tree of frames. */
! 	(void)winframe_remove(curwin, &dummy, NULL);
! 	win_remove(curwin, NULL);
! 	last_status(FALSE);	    /* may need to remove last status line */
! 	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
! 	(void)win_comp_pos();   /* recompute window positions */
! 
! 	if (win_valid(aco->save_curwin))
! 	    curwin = aco->save_curwin;
! 	else
! 	    /* Hmm, original window disappeared.  Just use the first one. */
! 	    curwin = firstwin;
! # ifdef FEAT_EVAL
! 	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
! # endif
! #else
! 	curwin = aco->save_curwin;
! #endif
! 	curbuf = curwin->w_buffer;
! 
! 	/* the buffer contents may have changed */
! 	check_cursor();
! 	if (curwin->w_topline > curbuf->b_ml.ml_line_count)
! 	{
! 	    curwin->w_topline = curbuf->b_ml.ml_line_count;
! #ifdef FEAT_DIFF
! 	    curwin->w_topfill = 0;
! #endif
! 	}
! #if defined(FEAT_GUI)
! 	/* Hide the scrollbars from the aucmd_win and update. */
! 	gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE);
! 	gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE);
! 	gui_may_update_scrollbars();
! #endif
!     }
!     else
      {
  	/* restore curwin */
  #ifdef FEAT_WINDOWS
  	if (win_valid(aco->save_curwin))
  #endif
  	{
! 	    /* Restore the buffer which was previously edited by curwin, if
! 	     * it was chagned, we are still the same window and the buffer is
! 	     * valid. */
  	    if (curwin == aco->new_curwin
! 		    && curbuf != aco->new_curbuf
! 		    && buf_valid(aco->new_curbuf)
! 		    && aco->new_curbuf->b_ml.ml_mfp != NULL)
  	    {
  		--curbuf->b_nwindows;
! 		curbuf = aco->new_curbuf;
  		curwin->w_buffer = curbuf;
  		++curbuf->b_nwindows;
  	    }
***************
*** 8477,8510 ****
  	    curbuf = curwin->w_buffer;
  	}
      }
-     else
-     {
- 	/* restore buffer for curwin if it still exists and is loaded */
- 	if (buf_valid(aco->save_buf) && aco->save_buf->b_ml.ml_mfp != NULL)
- 	{
- 	    --curbuf->b_nwindows;
- 	    curbuf = aco->save_buf;
- 	    curwin->w_buffer = curbuf;
- 	    ++curbuf->b_nwindows;
- 	    curwin->w_cursor = aco->save_cursor;
- 	    check_cursor();
- 	    /* check topline < line_count, in case lines got deleted */
- 	    if (aco->save_topline <= curbuf->b_ml.ml_line_count)
- 	    {
- 		curwin->w_topline = aco->save_topline;
- #ifdef FEAT_DIFF
- 		curwin->w_topfill = aco->save_topfill;
- #endif
- 	    }
- 	    else
- 	    {
- 		curwin->w_topline = curbuf->b_ml.ml_line_count;
- #ifdef FEAT_DIFF
- 		curwin->w_topfill = 0;
- #endif
- 	    }
- 	}
-     }
  }
  
  static int	autocmd_nested = FALSE;
--- 8554,8559 ----
***************
*** 9419,9427 ****
      aco_save_T	*aco;		/* structure to save values in */
      buf_T	*buf;		/* new curbuf */
  {
!     aco->save_buf = curbuf;
      curbuf = buf;
      curwin->w_buffer = buf;
  }
  
  /*
--- 9468,9478 ----
      aco_save_T	*aco;		/* structure to save values in */
      buf_T	*buf;		/* new curbuf */
  {
!     aco->save_curbuf = curbuf;
!     --curbuf->b_nwindows;
      curbuf = buf;
      curwin->w_buffer = buf;
+     ++curbuf->b_nwindows;
  }
  
  /*
***************
*** 9432,9439 ****
  aucmd_restbuf(aco)
      aco_save_T	*aco;		/* structure holding saved values */
  {
!     curbuf = aco->save_buf;
      curwin->w_buffer = curbuf;
  }
  
  #endif	/* FEAT_AUTOCMD */
--- 9483,9492 ----
  aucmd_restbuf(aco)
      aco_save_T	*aco;		/* structure holding saved values */
  {
!     --curbuf->b_nwindows;
!     curbuf = aco->save_curbuf;
      curwin->w_buffer = curbuf;
+     ++curbuf->b_nwindows;
  }
  
  #endif	/* FEAT_AUTOCMD */
*** ../vim-7.2.202/src/globals.h	2009-06-16 15:23:07.000000000 +0200
--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
***************
*** 539,544 ****
--- 539,548 ----
  
  EXTERN win_T	*curwin;	/* currently active window */
  
+ #ifdef FEAT_AUTOCMD
+ EXTERN win_T	*aucmd_win;	/* window used in aucmd_prepbuf() */
+ #endif
+ 
  /*
   * The window layout is kept in a tree of frames.  topframe points to the top
   * of the tree.
*** ../vim-7.2.202/src/gui.c	2009-05-21 23:25:38.000000000 +0200
--- src/gui.c	2009-06-11 20:58:05.000000000 +0200
***************
*** 3879,3884 ****
--- 3879,3899 ----
   * Scrollbar stuff:
   */
  
+ /*
+  * Called when something in the window layout has changed.
+  */
+     void
+ gui_may_update_scrollbars()
+ {
+     if (gui.in_use && starting == 0)
+     {
+ 	out_flush();
+ 	gui_init_which_components(NULL);
+ 	gui_update_scrollbars(TRUE);
+     }
+     need_mouse_correct = TRUE;
+ }
+ 
      void
  gui_update_scrollbars(force)
      int		force;	    /* Force all scrollbars to get updated */
*** ../vim-7.2.202/src/if_perl.xs	2008-12-03 13:18:16.000000000 +0100
--- src/if_perl.xs	2009-06-03 17:52:51.000000000 +0200
***************
*** 1234,1240 ****
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
! 			if (aco.save_buf == curbuf)
  			    check_cursor();
  		    }
  
--- 1236,1242 ----
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
! 			if (aco.save_curbuf == curbuf)
  			    check_cursor();
  		    }
  
*** ../vim-7.2.202/src/proto/gui.pro	2007-05-05 19:42:19.000000000 +0200
--- src/proto/gui.pro	2009-06-11 20:58:08.000000000 +0200
***************
*** 43,48 ****
--- 43,49 ----
  void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
  scrollbar_T *gui_find_scrollbar __ARGS((long ident));
  void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
+ void gui_may_update_scrollbars __ARGS((void));
  void gui_update_scrollbars __ARGS((int force));
  int gui_do_scroll __ARGS((void));
  int gui_do_horiz_scroll __ARGS((void));
*** ../vim-7.2.202/src/proto/window.pro	2007-07-26 22:57:45.000000000 +0200
--- src/proto/window.pro	2009-06-10 21:20:39.000000000 +0200
***************
*** 1,6 ****
--- 1,7 ----
  /* window.c */
  void do_window __ARGS((int nchar, long Prenum, int xchar));
  int win_split __ARGS((int size, int flags));
+ int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
  int win_valid __ARGS((win_T *win));
  int win_count __ARGS((void));
  int make_windows __ARGS((int count, int vertical));
***************
*** 10,18 ****
--- 11,21 ----
  void win_close __ARGS((win_T *win, int free_buf));
  void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp));
  void win_free_all __ARGS((void));
+ win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
  void close_others __ARGS((int message, int forceit));
  void curwin_init __ARGS((void));
  int win_alloc_first __ARGS((void));
+ void win_alloc_aucmd_win __ARGS((void));
  void win_init_size __ARGS((void));
  void free_tabpage __ARGS((tabpage_T *tp));
  int win_new_tabpage __ARGS((int after));
***************
*** 30,35 ****
--- 33,40 ----
  void win_enter __ARGS((win_T *wp, int undo_sync));
  win_T *buf_jump_open_win __ARGS((buf_T *buf));
  win_T *buf_jump_open_tab __ARGS((buf_T *buf));
+ void win_append __ARGS((win_T *after, win_T *wp));
+ void win_remove __ARGS((win_T *wp, tabpage_T *tp));
  int win_alloc_lines __ARGS((win_T *wp));
  void win_free_lsize __ARGS((win_T *wp));
  void shell_new_rows __ARGS((void));
***************
*** 58,63 ****
--- 63,70 ----
  int min_rows __ARGS((void));
  int only_one_window __ARGS((void));
  void check_lnums __ARGS((int do_curwin));
+ void make_snapshot __ARGS((int idx));
+ void restore_snapshot __ARGS((int idx, int close_curwin));
  int win_hasvertsplit __ARGS((void));
  int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id));
  int match_delete __ARGS((win_T *wp, int id, int perr));
*** ../vim-7.2.202/src/screen.c	2009-05-17 13:30:58.000000000 +0200
--- src/screen.c	2009-06-10 16:41:45.000000000 +0200
***************
*** 7495,7500 ****
--- 7495,7504 ----
  #endif
  	}
      }
+ #ifdef FEAT_AUTOCMD
+     if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
+ 	outofmem = TRUE;
+ #endif
  #ifdef FEAT_WINDOWS
  give_up:
  #endif
*** ../vim-7.2.202/src/structs.h	2009-05-16 16:36:25.000000000 +0200
--- src/structs.h	2009-06-13 12:51:56.000000000 +0200
***************
*** 1621,1626 ****
--- 1621,1634 ----
  };
  #endif
  
+ #define SNAP_HELP_IDX	0
+ #ifdef FEAT_AUTOCMD
+ # define SNAP_AUCMD_IDX 1
+ # define SNAP_COUNT	2
+ #else
+ # define SNAP_COUNT	1
+ #endif
+ 
  /*
   * Tab pages point to the top frame of each tab page.
   * Note: Most values are NOT valid for the current tab page!  Use "curwin",
***************
*** 1649,1655 ****
      buf_T	    *(tp_diffbuf[DB_COUNT]);
      int		    tp_diff_invalid;	/* list of diffs is outdated */
  #endif
!     frame_T	    *tp_snapshot;    /* window layout snapshot */
  #ifdef FEAT_EVAL
      dictitem_T	    tp_winvar;	    /* variable for "t:" Dictionary */
      dict_T	    tp_vars;	    /* internal variables, local to tab page */
--- 1657,1663 ----
      buf_T	    *(tp_diffbuf[DB_COUNT]);
      int		    tp_diff_invalid;	/* list of diffs is outdated */
  #endif
!     frame_T	    *(tp_snapshot[SNAP_COUNT]);  /* window layout snapshots */
  #ifdef FEAT_EVAL
      dictitem_T	    tp_winvar;	    /* variable for "t:" Dictionary */
      dict_T	    tp_vars;	    /* internal variables, local to tab page */
***************
*** 2276,2291 ****
   */
  typedef struct
  {
!     buf_T	*save_buf;	/* saved curbuf */
  #ifdef FEAT_AUTOCMD
!     buf_T	*new_curbuf;	/* buffer to be used */
!     win_T	*save_curwin;	/* saved curwin, NULL if it didn't change */
!     win_T	*new_curwin;	/* new curwin if save_curwin != NULL */
!     pos_T	save_cursor;	/* saved cursor pos of save_curwin */
!     linenr_T	save_topline;	/* saved topline of save_curwin */
! # ifdef FEAT_DIFF
!     int		save_topfill;	/* saved topfill of save_curwin */
! # endif
  #endif
  } aco_save_T;
  
--- 2284,2294 ----
   */
  typedef struct
  {
!     buf_T	*save_curbuf;	/* saved curbuf */
  #ifdef FEAT_AUTOCMD
!     win_T	*save_curwin;	/* saved curwin */
!     win_T	*new_curwin;	/* new curwin */
!     buf_T	*new_curbuf;	/* new curbuf */
  #endif
  } aco_save_T;
  
*** ../vim-7.2.202/src/window.c	2009-05-21 23:25:38.000000000 +0200
--- src/window.c	2009-06-12 22:29:33.000000000 +0200
***************
*** 11,18 ****
  
  static int path_is_url __ARGS((char_u *p));
  #if defined(FEAT_WINDOWS) || defined(PROTO)
- static int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
  static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
  static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
  static void frame_setheight __ARGS((frame_T *curfrp, int height));
  #ifdef FEAT_VERTSPLIT
--- 11,18 ----
  
  static int path_is_url __ARGS((char_u *p));
  #if defined(FEAT_WINDOWS) || defined(PROTO)
  static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
+ static void win_init_some __ARGS((win_T *newp, win_T *oldp));
  static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
  static void frame_setheight __ARGS((frame_T *curfrp, int height));
  #ifdef FEAT_VERTSPLIT
***************
*** 23,30 ****
  static void win_totop __ARGS((int size, int flags));
  static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height));
  static int last_window __ARGS((void));
  static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp));
- static win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
  static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
  static tabpage_T *alt_tabpage __ARGS((void));
  static win_T *frame2win __ARGS((frame_T *frp));
--- 23,30 ----
  static void win_totop __ARGS((int size, int flags));
  static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height));
  static int last_window __ARGS((void));
+ static int one_window __ARGS((void));
  static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp));
  static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
  static tabpage_T *alt_tabpage __ARGS((void));
  static win_T *frame2win __ARGS((frame_T *frp));
***************
*** 41,46 ****
--- 41,47 ----
  #endif
  #endif
  static int win_alloc_firstwin __ARGS((win_T *oldwin));
+ static void new_frame __ARGS((win_T *wp));
  #if defined(FEAT_WINDOWS) || defined(PROTO)
  static tabpage_T *alloc_tabpage __ARGS((void));
  static int leave_tabpage __ARGS((buf_T *new_curbuf));
***************
*** 49,56 ****
  static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin));
  static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin));
  static void win_free __ARGS((win_T *wp, tabpage_T *tp));
- static void win_append __ARGS((win_T *, win_T *));
- static void win_remove __ARGS((win_T *, tabpage_T *tp));
  static void frame_append __ARGS((frame_T *after, frame_T *frp));
  static void frame_insert __ARGS((frame_T *before, frame_T *frp));
  static void frame_remove __ARGS((frame_T *frp));
--- 50,55 ----
***************
*** 62,78 ****
  static void frame_add_height __ARGS((frame_T *frp, int n));
  static void last_status_rec __ARGS((frame_T *fr, int statusline));
  
- static void make_snapshot __ARGS((void));
  static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp));
! static void clear_snapshot __ARGS((tabpage_T *tp));
  static void clear_snapshot_rec __ARGS((frame_T *fr));
- static void restore_snapshot __ARGS((int close_curwin));
  static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
  static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
  
  #endif /* FEAT_WINDOWS */
  
! static win_T *win_alloc __ARGS((win_T *after));
  static void win_new_height __ARGS((win_T *, int));
  
  #define URL_SLASH	1		/* path_is_url() has found "://" */
--- 61,75 ----
  static void frame_add_height __ARGS((frame_T *frp, int n));
  static void last_status_rec __ARGS((frame_T *fr, int statusline));
  
  static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp));
! static void clear_snapshot __ARGS((tabpage_T *tp, int idx));
  static void clear_snapshot_rec __ARGS((frame_T *fr));
  static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
  static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
  
  #endif /* FEAT_WINDOWS */
  
! static win_T *win_alloc __ARGS((win_T *after, int hidden));
  static void win_new_height __ARGS((win_T *, int));
  
  #define URL_SLASH	1		/* path_is_url() has found "://" */
***************
*** 259,265 ****
  /* cursor to previous window with wrap around */
      case 'W':
  		CHECK_CMDWIN
! 		if (lastwin == firstwin && Prenum != 1)	/* just one window */
  		    beep_flush();
  		else
  		{
--- 256,262 ----
  /* cursor to previous window with wrap around */
      case 'W':
  		CHECK_CMDWIN
! 		if (firstwin == lastwin && Prenum != 1)	/* just one window */
  		    beep_flush();
  		else
  		{
***************
*** 343,349 ****
  
  /* move window to new tab page */
      case 'T':
! 		if (firstwin == lastwin)
  		    MSG(_(m_onlyone));
  		else
  		{
--- 340,346 ----
  
  /* move window to new tab page */
      case 'T':
! 		if (one_window())
  		    MSG(_(m_onlyone));
  		else
  		{
***************
*** 679,687 ****
      /* When creating the help window make a snapshot of the window layout.
       * Otherwise clear the snapshot, it's now invalid. */
      if (flags & WSP_HELP)
! 	make_snapshot();
      else
! 	clear_snapshot(curtab);
  
      return win_split_ins(size, flags, NULL, 0);
  }
--- 676,684 ----
      /* When creating the help window make a snapshot of the window layout.
       * Otherwise clear the snapshot, it's now invalid. */
      if (flags & WSP_HELP)
! 	make_snapshot(SNAP_HELP_IDX);
      else
! 	clear_snapshot(curtab, SNAP_HELP_IDX);
  
      return win_split_ins(size, flags, NULL, 0);
  }
***************
*** 692,698 ****
   * top/left/right/bottom.
   * return FAIL for failure, OK otherwise
   */
!     static int
  win_split_ins(size, flags, newwin, dir)
      int		size;
      int		flags;
--- 689,695 ----
   * top/left/right/bottom.
   * return FAIL for failure, OK otherwise
   */
!     int
  win_split_ins(size, flags, newwin, dir)
      int		size;
      int		flags;
***************
*** 893,906 ****
      {
  	/* new window below/right of current one */
  	if (newwin == NULL)
! 	    wp = win_alloc(oldwin);
  	else
  	    win_append(oldwin, wp);
      }
      else
      {
  	if (newwin == NULL)
! 	    wp = win_alloc(oldwin->w_prev);
  	else
  	    win_append(oldwin->w_prev, wp);
      }
--- 890,903 ----
      {
  	/* new window below/right of current one */
  	if (newwin == NULL)
! 	    wp = win_alloc(oldwin, FALSE);
  	else
  	    win_append(oldwin, wp);
      }
      else
      {
  	if (newwin == NULL)
! 	    wp = win_alloc(oldwin->w_prev, FALSE);
  	else
  	    win_append(oldwin->w_prev, wp);
      }
***************
*** 910,915 ****
--- 907,919 ----
  	if (wp == NULL)
  	    return FAIL;
  
+ 	new_frame(wp);
+ 	if (wp->w_frame == NULL)
+ 	{
+ 	    win_free(wp, NULL);
+ 	    return FAIL;
+ 	}
+ 
  	/* make the contents of the new window the same as the current one */
  	win_init(wp, curwin, flags);
      }
***************
*** 970,982 ****
      }
  
      if (newwin == NULL)
!     {
! 	/* Create a frame for the new window. */
! 	frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
! 	frp->fr_layout = FR_LEAF;
! 	frp->fr_win = wp;
! 	wp->w_frame = frp;
!     }
      else
  	frp = newwin->w_frame;
      frp->fr_parent = curfrp->fr_parent;
--- 974,980 ----
      }
  
      if (newwin == NULL)
! 	frp = wp->w_frame;
      else
  	frp = newwin->w_frame;
      frp->fr_parent = curfrp->fr_parent;
***************
*** 1156,1161 ****
--- 1154,1160 ----
      return OK;
  }
  
+ 
  /*
   * Initialize window "newp" from window "oldp".
   * Used when splitting a window and when creating a new tab page.
***************
*** 1204,1217 ****
      if (oldp->w_localdir != NULL)
  	newp->w_localdir = vim_strsave(oldp->w_localdir);
  
!     /* Use the same argument list. */
!     newp->w_alist = oldp->w_alist;
!     ++newp->w_alist->al_refcount;
!     newp->w_arg_idx = oldp->w_arg_idx;
! 
!     /*
!      * copy tagstack and options from existing window
!      */
      for (i = 0; i < oldp->w_tagstacklen; i++)
      {
  	newp->w_tagstack[i] = oldp->w_tagstack[i];
--- 1203,1209 ----
      if (oldp->w_localdir != NULL)
  	newp->w_localdir = vim_strsave(oldp->w_localdir);
  
!     /* copy tagstack and folds */
      for (i = 0; i < oldp->w_tagstacklen; i++)
      {
  	newp->w_tagstack[i] = oldp->w_tagstack[i];
***************
*** 1221,1230 ****
      }
      newp->w_tagstackidx = oldp->w_tagstackidx;
      newp->w_tagstacklen = oldp->w_tagstacklen;
-     win_copy_options(oldp, newp);
  # ifdef FEAT_FOLDING
      copyFoldingState(oldp, newp);
  # endif
  }
  
  #endif /* FEAT_WINDOWS */
--- 1213,1241 ----
      }
      newp->w_tagstackidx = oldp->w_tagstackidx;
      newp->w_tagstacklen = oldp->w_tagstacklen;
  # ifdef FEAT_FOLDING
      copyFoldingState(oldp, newp);
  # endif
+ 
+     win_init_some(newp, oldp);
+ }
+ 
+ /*
+  * Initialize window "newp" from window"old".
+  * Only the essential things are copied.
+  */
+     static void
+ win_init_some(newp, oldp)
+     win_T	*newp;
+     win_T	*oldp;
+ {
+     /* Use the same argument list. */
+     newp->w_alist = oldp->w_alist;
+     ++newp->w_alist->al_refcount;
+     newp->w_arg_idx = oldp->w_arg_idx;
+ 
+     /* copy options from existing window */
+     win_copy_options(oldp, newp);
  }
  
  #endif /* FEAT_WINDOWS */
***************
*** 1565,1579 ****
  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
       * scrollbars.  Have to update them anyway. */
!     if (gui.in_use)
!     {
! 	out_flush();
! 	gui_init_which_components(NULL);
! 	gui_update_scrollbars(TRUE);
!     }
!     need_mouse_correct = TRUE;
  #endif
- 
  }
  
  /*
--- 1576,1583 ----
  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
       * scrollbars.  Have to update them anyway. */
!     gui_may_update_scrollbars();
  #endif
  }
  
  /*
***************
*** 2048,2060 ****
  }
  
  /*
!  * Return TRUE if the current window is the only window that exists.
   * Returns FALSE if there is a window, possibly in another tab page.
   */
      static int
  last_window()
  {
!     return (lastwin == firstwin && first_tabpage->tp_next == NULL);
  }
  
  /*
--- 2052,2091 ----
  }
  
  /*
!  * Return TRUE if the current window is the only window that exists (ignoring
!  * "aucmd_win").
   * Returns FALSE if there is a window, possibly in another tab page.
   */
      static int
  last_window()
  {
!     return (one_window() && first_tabpage->tp_next == NULL);
! }
! 
! /*
!  * Return TRUE if there is only one window other than "aucmd_win" in the
!  * current tab page.
!  */
!     static int
! one_window()
! {
! #ifdef FEAT_AUTOCMD
!     win_T	*wp;
!     int		seen_one = FALSE;
! 
!     FOR_ALL_WINDOWS(wp)
!     {
! 	if (wp != aucmd_win)
! 	{
! 	    if (seen_one)
! 		return FALSE;
! 	    seen_one = TRUE;
! 	}
!     }
!     return TRUE;
! #else
!     return firstwin == lastwin;
! #endif
  }
  
  /*
***************
*** 2083,2088 ****
--- 2114,2132 ----
  	return;
      }
  
+ #ifdef FEAT_AUTOCMD
+     if (win == aucmd_win)
+     {
+ 	EMSG(_("E813: Cannot close autocmd window"));
+ 	return;
+     }
+     if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window())
+     {
+ 	EMSG(_("E814: Cannot close window, only autocmd window would remain"));
+ 	return;
+     }
+ #endif
+ 
      /*
       * When closing the last window in a tab page first go to another tab
       * page and then close the window and the tab page.  This avoids that
***************
*** 2112,2118 ****
      if (win->w_buffer->b_help)
  	help_window = TRUE;
      else
! 	clear_snapshot(curtab);
  
  #ifdef FEAT_AUTOCMD
      if (win == curwin)
--- 2156,2162 ----
      if (win->w_buffer->b_help)
  	help_window = TRUE;
      else
! 	clear_snapshot(curtab, SNAP_HELP_IDX);
  
  #ifdef FEAT_AUTOCMD
      if (win == curwin)
***************
*** 2229,2235 ****
      /* After closing the help window, try restoring the window layout from
       * before it was opened. */
      if (help_window)
! 	restore_snapshot(close_curwin);
  
  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
      /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */
--- 2273,2279 ----
      /* After closing the help window, try restoring the window layout from
       * before it was opened. */
      if (help_window)
! 	restore_snapshot(SNAP_HELP_IDX, close_curwin);
  
  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
      /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */
***************
*** 2344,2349 ****
--- 2388,2401 ----
  
      while (firstwin != NULL)
  	(void)win_free_mem(firstwin, &dummy, NULL);
+ 
+ # ifdef FEAT_AUTOCMD
+     if (aucmd_win != NULL)
+     {
+ 	(void)win_free_mem(aucmd_win, &dummy, NULL);
+ 	aucmd_win = NULL;
+     }
+ # endif
  }
  #endif
  
***************
*** 2351,2357 ****
   * Remove a window and its frame from the tree of frames.
   * Returns a pointer to the window that got the freed up space.
   */
!     static win_T *
  winframe_remove(win, dirp, tp)
      win_T	*win;
      int		*dirp UNUSED;	/* set to 'v' or 'h' for direction if 'ea' */
--- 2403,2409 ----
   * Remove a window and its frame from the tree of frames.
   * Returns a pointer to the window that got the freed up space.
   */
!     win_T *
  winframe_remove(win, dirp, tp)
      win_T	*win;
      int		*dirp UNUSED;	/* set to 'v' or 'h' for direction if 'ea' */
***************
*** 3090,3096 ****
      win_T	*nextwp;
      int		r;
  
!     if (lastwin == firstwin)
      {
  	if (message
  #ifdef FEAT_AUTOCMD
--- 3142,3148 ----
      win_T	*nextwp;
      int		r;
  
!     if (one_window())
      {
  	if (message
  #ifdef FEAT_AUTOCMD
***************
*** 3194,3202 ****
--- 3246,3275 ----
      first_tabpage->tp_topframe = topframe;
      curtab = first_tabpage;
  #endif
+ 
      return OK;
  }
  
+ #if defined(FEAT_AUTOCMD) || defined(PROTO)
+ /*
+  * Init "aucmd_win".  This can only be done after the first
+  * window is fully initialized, thus it can't be in win_alloc_first().
+  */
+     void
+ win_alloc_aucmd_win()
+ {
+     aucmd_win = win_alloc(NULL, TRUE);
+     if (aucmd_win != NULL)
+     {
+ 	win_init_some(aucmd_win, curwin);
+ # ifdef FEAT_SCROLLBIND
+ 	aucmd_win->w_p_scb = FALSE;
+ # endif
+ 	new_frame(aucmd_win);
+     }
+ }
+ #endif
+ 
  /*
   * Allocate the first window or the first window in a new tab page.
   * When "oldwin" is NULL create an empty buffer for it.
***************
*** 3208,3214 ****
  win_alloc_firstwin(oldwin)
      win_T	*oldwin;
  {
!     curwin = win_alloc(NULL);
      if (oldwin == NULL)
      {
  	/* Very first window, need to create an empty buffer for it and
--- 3281,3287 ----
  win_alloc_firstwin(oldwin)
      win_T	*oldwin;
  {
!     curwin = win_alloc(NULL, FALSE);
      if (oldwin == NULL)
      {
  	/* Very first window, need to create an empty buffer for it and
***************
*** 3236,3256 ****
      }
  #endif
  
!     topframe = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
!     if (topframe == NULL)
  	return FAIL;
!     topframe->fr_layout = FR_LEAF;
  #ifdef FEAT_VERTSPLIT
      topframe->fr_width = Columns;
  #endif
      topframe->fr_height = Rows - p_ch;
      topframe->fr_win = curwin;
-     curwin->w_frame = topframe;
  
      return OK;
  }
  
  /*
   * Initialize the window and frame size to the maximum.
   */
      void
--- 3309,3344 ----
      }
  #endif
  
!     new_frame(curwin);
!     if (curwin->w_frame == NULL)
  	return FAIL;
!     topframe = curwin->w_frame;
  #ifdef FEAT_VERTSPLIT
      topframe->fr_width = Columns;
  #endif
      topframe->fr_height = Rows - p_ch;
      topframe->fr_win = curwin;
  
      return OK;
  }
  
  /*
+  * Create a frame for window "wp".
+  */
+     static void
+ new_frame(win_T *wp)
+ {
+     frame_T *frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
+ 
+     wp->w_frame = frp;
+     if (frp != NULL)
+     {
+ 	frp->fr_layout = FR_LEAF;
+ 	frp->fr_win = wp;
+     }
+ }
+ 
+ /*
   * Initialize the window and frame size to the maximum.
   */
      void
***************
*** 3300,3309 ****
  free_tabpage(tp)
      tabpage_T	*tp;
  {
  # ifdef FEAT_DIFF
      diff_clear(tp);
  # endif
!     clear_snapshot(tp);
  #ifdef FEAT_EVAL
      vars_clear(&tp->tp_vars.dv_hashtab);	/* free all t: variables */
  #endif
--- 3388,3400 ----
  free_tabpage(tp)
      tabpage_T	*tp;
  {
+     int idx;
+ 
  # ifdef FEAT_DIFF
      diff_clear(tp);
  # endif
!     for (idx = 0; idx < SNAP_COUNT; ++idx)
! 	clear_snapshot(tp, idx);
  #ifdef FEAT_EVAL
      vars_clear(&tp->tp_vars.dv_hashtab);	/* free all t: variables */
  #endif
***************
*** 3370,3381 ****
  #if defined(FEAT_GUI)
  	/* When 'guioptions' includes 'L' or 'R' may have to remove or add
  	 * scrollbars.  Have to update them anyway. */
! 	if (gui.in_use && starting == 0)
! 	{
! 	    gui_init_which_components(NULL);
! 	    gui_update_scrollbars(TRUE);
! 	}
! 	need_mouse_correct = TRUE;
  #endif
  
  	redraw_all_later(CLEAR);
--- 3461,3467 ----
  #if defined(FEAT_GUI)
  	/* When 'guioptions' includes 'L' or 'R' may have to remove or add
  	 * scrollbars.  Have to update them anyway. */
! 	gui_may_update_scrollbars();
  #endif
  
  	redraw_all_later(CLEAR);
***************
*** 3593,3604 ****
  #if defined(FEAT_GUI)
      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
       * scrollbars.  Have to update them anyway. */
!     if (gui.in_use && starting == 0)
!     {
! 	gui_init_which_components(NULL);
! 	gui_update_scrollbars(TRUE);
!     }
!     need_mouse_correct = TRUE;
  #endif
  
      redraw_all_later(CLEAR);
--- 3679,3685 ----
  #if defined(FEAT_GUI)
      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
       * scrollbars.  Have to update them anyway. */
!     gui_may_update_scrollbars();
  #endif
  
      redraw_all_later(CLEAR);
***************
*** 4150,4160 ****
  #endif
  
  /*
!  * allocate a window structure and link it in the window list
   */
      static win_T *
! win_alloc(after)
      win_T	*after UNUSED;
  {
      win_T	*newwin;
  
--- 4231,4243 ----
  #endif
  
  /*
!  * Allocate a window structure and link it in the window list when "hidden" is
!  * FALSE.
   */
      static win_T *
! win_alloc(after, hidden)
      win_T	*after UNUSED;
+     int		hidden UNUSED;
  {
      win_T	*newwin;
  
***************
*** 4180,4186 ****
  	 * link the window in the window list
  	 */
  #ifdef FEAT_WINDOWS
! 	win_append(after, newwin);
  #endif
  #ifdef FEAT_VERTSPLIT
  	newwin->w_wincol = 0;
--- 4263,4270 ----
  	 * link the window in the window list
  	 */
  #ifdef FEAT_WINDOWS
! 	if (!hidden)
! 	    win_append(after, newwin);
  #endif
  #ifdef FEAT_VERTSPLIT
  	newwin->w_wincol = 0;
***************
*** 4314,4320 ****
  /*
   * Append window "wp" in the window list after window "after".
   */
!     static void
  win_append(after, wp)
      win_T	*after, *wp;
  {
--- 4398,4404 ----
  /*
   * Append window "wp" in the window list after window "after".
   */
!     void
  win_append(after, wp)
      win_T	*after, *wp;
  {
***************
*** 4340,4346 ****
  /*
   * Remove a window from the window list.
   */
!     static void
  win_remove(wp, tp)
      win_T	*wp;
      tabpage_T	*tp;		/* tab page "win" is in, NULL for current */
--- 4424,4430 ----
  /*
   * Remove a window from the window list.
   */
!     void
  win_remove(wp, tp)
      win_T	*wp;
      tabpage_T	*tp;		/* tab page "win" is in, NULL for current */
***************
*** 6040,6045 ****
--- 6124,6130 ----
  /*
   * Return TRUE if there is only one window (in the current tab page), not
   * counting a help or preview window, unless it is the current window.
+  * Does not count "aucmd_win".
   */
      int
  only_one_window()
***************
*** 6053,6063 ****
  	return FALSE;
  
      for (wp = firstwin; wp != NULL; wp = wp->w_next)
! 	if (!((wp->w_buffer->b_help && !curbuf->b_help)
  # ifdef FEAT_QUICKFIX
  		    || wp->w_p_pvw
  # endif
  	     ) || wp == curwin)
  	    ++count;
      return (count <= 1);
  #else
--- 6138,6152 ----
  	return FALSE;
  
      for (wp = firstwin; wp != NULL; wp = wp->w_next)
! 	if ((!((wp->w_buffer->b_help && !curbuf->b_help)
  # ifdef FEAT_QUICKFIX
  		    || wp->w_p_pvw
  # endif
  	     ) || wp == curwin)
+ # ifdef FEAT_AUTOCMD
+ 		&& wp != aucmd_win
+ # endif
+ 	   )
  	    ++count;
      return (count <= 1);
  #else
***************
*** 6112,6122 ****
  /*
   * Create a snapshot of the current frame sizes.
   */
!     static void
! make_snapshot()
  {
!     clear_snapshot(curtab);
!     make_snapshot_rec(topframe, &curtab->tp_snapshot);
  }
  
      static void
--- 6201,6212 ----
  /*
   * Create a snapshot of the current frame sizes.
   */
!     void
! make_snapshot(idx)
!     int idx;
  {
!     clear_snapshot(curtab, idx);
!     make_snapshot_rec(topframe, &curtab->tp_snapshot[idx]);
  }
  
      static void
***************
*** 6144,6154 ****
   * Remove any existing snapshot.
   */
      static void
! clear_snapshot(tp)
      tabpage_T	*tp;
  {
!     clear_snapshot_rec(tp->tp_snapshot);
!     tp->tp_snapshot = NULL;
  }
  
      static void
--- 6234,6245 ----
   * Remove any existing snapshot.
   */
      static void
! clear_snapshot(tp, idx)
      tabpage_T	*tp;
+     int		idx;
  {
!     clear_snapshot_rec(tp->tp_snapshot[idx]);
!     tp->tp_snapshot[idx] = NULL;
  }
  
      static void
***************
*** 6168,6193 ****
   * This is only done if the screen size didn't change and the window layout is
   * still the same.
   */
!     static void
! restore_snapshot(close_curwin)
      int		close_curwin;	    /* closing current window */
  {
      win_T	*wp;
  
!     if (curtab->tp_snapshot != NULL
  # ifdef FEAT_VERTSPLIT
! 	    && curtab->tp_snapshot->fr_width == topframe->fr_width
  # endif
! 	    && curtab->tp_snapshot->fr_height == topframe->fr_height
! 	    && check_snapshot_rec(curtab->tp_snapshot, topframe) == OK)
      {
! 	wp = restore_snapshot_rec(curtab->tp_snapshot, topframe);
  	win_comp_pos();
  	if (wp != NULL && close_curwin)
  	    win_goto(wp);
  	redraw_all_later(CLEAR);
      }
!     clear_snapshot(curtab);
  }
  
  /*
--- 6259,6285 ----
   * This is only done if the screen size didn't change and the window layout is
   * still the same.
   */
!     void
! restore_snapshot(idx, close_curwin)
!     int		idx;
      int		close_curwin;	    /* closing current window */
  {
      win_T	*wp;
  
!     if (curtab->tp_snapshot[idx] != NULL
  # ifdef FEAT_VERTSPLIT
! 	    && curtab->tp_snapshot[idx]->fr_width == topframe->fr_width
  # endif
! 	    && curtab->tp_snapshot[idx]->fr_height == topframe->fr_height
! 	    && check_snapshot_rec(curtab->tp_snapshot[idx], topframe) == OK)
      {
! 	wp = restore_snapshot_rec(curtab->tp_snapshot[idx], topframe);
  	win_comp_pos();
  	if (wp != NULL && close_curwin)
  	    win_goto(wp);
  	redraw_all_later(CLEAR);
      }
!     clear_snapshot(curtab, idx);
  }
  
  /*
*** ../vim-7.2.202/src/version.c	2009-06-16 15:35:46.000000000 +0200
--- src/version.c	2009-06-16 15:37:16.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     203,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
15. Five days in advance, tell your friends you can't attend their
    party because you're not in the mood.

 /// 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    ///


--- NEW FILE 7.2.204 ---
To: vim-dev at vim.org
Subject: Patch 7.2.204 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.204 (extra)
Problem:    Win32: Can't build with Visual Studio 2010 beta 1.
Solution:   Fix the makefile. (George Reilly)
Files:	    src/Make_mvc.mak


*** ../vim-7.2.203/src/Make_mvc.mak	2009-05-26 22:58:43.000000000 +0200
--- src/Make_mvc.mak	2009-06-16 16:27:59.000000000 +0200
***************
*** 1,18 ****
  # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
  # and Win64, using the Microsoft Visual C++ compilers. Known to work with
  # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
! # and VC9 (VS2008).
  #
  # To build using other Windows compilers, see INSTALLpc.txt
  #
  # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
! # Python-enabled versions of vim for Win32 platforms.
  #
! # The basic command line to build vim is:
  #
  #	nmake -f Make_mvc.mak
  #
! # This will build the console version of vim with no additional interfaces.
  # To add features, define any of the following:
  #
  #	!!!!  After changing features do "nmake clean" first  !!!!
--- 1,18 ----
  # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
  # and Win64, using the Microsoft Visual C++ compilers. Known to work with
  # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
! # VC9 (VS2008), and VC10 (VS2010).
  #
  # To build using other Windows compilers, see INSTALLpc.txt
  #
  # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
! # Python-enabled versions of Vim for Win32 platforms.
  #
! # The basic command line to build Vim is:
  #
  #	nmake -f Make_mvc.mak
  #
! # This will build the console version of Vim with no additional interfaces.
  # To add features, define any of the following:
  #
  #	!!!!  After changing features do "nmake clean" first  !!!!
***************
*** 358,363 ****
--- 358,366 ----
  !if "$(_NMAKE_VER)" == "9.00.30729.01"
  MSVCVER = 9.0
  !endif
+ !if "$(_NMAKE_VER)" == "10.00.20506.01"
+ MSVCVER = 10.0
+ !endif
  !endif
  
  # Abort bulding VIM if version of VC is unrecognised.
***************
*** 372,378 ****
  !endif
  
  # Convert processor ID to MVC-compatible number
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
  !if "$(CPUNR)" == "i386"
  CPUARG = /G3
  !elseif "$(CPUNR)" == "i486"
--- 375,381 ----
  !endif
  
  # Convert processor ID to MVC-compatible number
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
  !if "$(CPUNR)" == "i386"
  CPUARG = /G3
  !elseif "$(CPUNR)" == "i486"
***************
*** 405,411 ****
  !else # MAXSPEED
  OPTFLAG = /Ox
  !endif
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
  # Use link time code generation if not worried about size
  !if "$(OPTIMIZE)" != "SPACE"
  OPTFLAG = $(OPTFLAG) /GL
--- 408,414 ----
  !else # MAXSPEED
  OPTFLAG = /Ox
  !endif
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
  # Use link time code generation if not worried about size
  !if "$(OPTIMIZE)" != "SPACE"
  OPTFLAG = $(OPTFLAG) /GL
***************
*** 793,799 ****
  
  # Report link time code generation progress if used. 
  !ifdef NODEBUG
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
  !if "$(OPTIMIZE)" != "SPACE"
  LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
  !endif
--- 796,802 ----
  
  # Report link time code generation progress if used. 
  !ifdef NODEBUG
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
  !if "$(OPTIMIZE)" != "SPACE"
  LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
  !endif
*** ../vim-7.2.203/src/version.c	2009-06-16 16:01:34.000000000 +0200
--- src/version.c	2009-06-16 16:32:41.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     204,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
16. Have your coworkers address you by your wrestling name, Rock Hard Kim.

 /// 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    ///


--- NEW FILE 7.2.205 ---
To: vim-dev at vim.org
Subject: Patch 7.2.205 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.205 (extra)
Problem:    Win32: No support for High DPI awarenes.
Solution:   Fix the manifest file. (George Reilly)
Files:	    src/Make_mvc.mak, src/gvim.exe.mnf


*** ../vim-7.2.204/src/Make_mvc.mak	2009-06-16 16:34:12.000000000 +0200
--- src/Make_mvc.mak	2009-06-16 16:36:32.000000000 +0200
***************
*** 1040,1046 ****
  $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
  	$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
  
! $(OUTDIR)/vim.res:	$(OUTDIR) vim.rc version.h tools.bmp tearoff.bmp \
  		vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
  	$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
  
--- 1040,1046 ----
  $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
  	$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
  
! $(OUTDIR)/vim.res:	$(OUTDIR) vim.rc gvim.exe.mnf version.h tools.bmp tearoff.bmp \
  		vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
  	$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
  
*** ../vim-7.2.204/src/gvim.exe.mnf	2008-08-09 19:37:29.000000000 +0200
--- src/gvim.exe.mnf	2009-06-16 16:36:32.000000000 +0200
***************
*** 1,5 ****
  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
! <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
    <assemblyIdentity
      processorArchitecture="*"
      version="7.2.0.0"
--- 1,5 ----
  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
! <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
    <assemblyIdentity
      processorArchitecture="*"
      version="7.2.0.0"
***************
*** 29,32 ****
--- 29,38 ----
        </requestedPrivileges>
      </security>
    </trustInfo>
+   <!-- Vista High DPI aware -->
+   <asmv3:application>
+     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+       <dpiAware>true</dpiAware>
+     </asmv3:windowsSettings>
+   </asmv3:application>
  </assembly>
*** ../vim-7.2.204/src/version.c	2009-06-16 16:34:12.000000000 +0200
--- src/version.c	2009-06-16 16:43:04.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     205,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
17. When the money comes out the ATM, scream "I won!, I won! 3rd
    time this week!!!!!"

 /// 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    ///


--- NEW FILE 7.2.206 ---
To: vim-dev at vim.org
Subject: Patch 7.2.206
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.206
Problem:    Win32: Can't build netbeans interface with Visual Studio 2010.
Solution:   Undefine ECONNREFUSED. (George Reilly)
Files:	    src/netbeans.c


*** ../vim-7.2.205/src/netbeans.c	2009-05-17 23:25:16.000000000 +0200
--- src/netbeans.c	2009-06-16 16:39:17.000000000 +0200
***************
*** 32,37 ****
--- 32,38 ----
  /* WinSock API is separated from C API, thus we can't use read(), write(),
   * errno... */
  # define sock_errno WSAGetLastError()
+ # undef ECONNREFUSED
  # define ECONNREFUSED WSAECONNREFUSED
  # ifdef EINTR
  #  undef EINTR
*** ../vim-7.2.205/src/version.c	2009-06-16 16:45:14.000000000 +0200
--- src/version.c	2009-06-16 16:57:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     206,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
18. When leaving the zoo, start running towards the parking lot,
    yelling "run for your lives, they're loose!!"

 /// 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    ///


--- NEW FILE 7.2.207 ---
To: vim-dev at vim.org
Subject: Patch 7.2.207
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.207
Problem:    Using freed memory with ":redrawstatus" when it works recursively.
Solution:   Prevent recursively updating the status line. (partly by Dominique
	    Pelle)
Files:	    src/screen.c


*** ../vim-7.2.206/src/screen.c	2009-06-16 16:01:34.000000000 +0200
--- src/screen.c	2009-06-16 17:04:53.000000000 +0200
***************
*** 5743,5748 ****
--- 5743,5755 ----
      int		fillchar;
      int		attr;
      int		this_ru_col;
+     static int  busy = FALSE;
+ 
+     /* It's possible to get here recursively when 'statusline' (indirectly)
+      * invokes ":redrawstatus".  Simply ignore the call then. */
+     if (busy)
+ 	return;
+     busy = TRUE;
  
      wp->w_redr_status = FALSE;
      if (wp->w_status_height == 0)
***************
*** 5881,5886 ****
--- 5888,5894 ----
  									attr);
      }
  #endif
+     busy = FALSE;
  }
  
  #ifdef FEAT_STL_OPT
*** ../vim-7.2.206/src/version.c	2009-06-16 16:57:53.000000000 +0200
--- src/version.c	2009-06-16 17:21:56.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     207,
  /**/

-- 
In many of the more relaxed civilizations on the Outer Eastern Rim of the
Galaxy, "The Hitchhiker's Guide to the Galaxy" has already supplanted the
great "Encyclopedia Galactica" as the standard repository of all knowledge
and wisdom, for though it has many omissions and contains much that is
apocryphal, or at least wildly inaccurate, it scores over the older, more
pedestrian work in two important respects.
First, it is slightly cheaper; and second, it has the words "DON'T PANIC"
inscribed in large friendly letters on its cover.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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    ///


--- NEW FILE 7.2.208 ---
To: vim-dev at vim.org
Subject: Patch 7.2.208
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.208
Problem:    "set novice" gives an error message, it should be ignored.
Solution:   Don't see "no" in "novice" as unsetting an option.  (Patrick
	    Texier)
Files:	    src/option.c


*** ../vim-7.2.207/src/option.c	2009-06-16 15:23:07.000000000 +0200
--- src/option.c	2009-06-16 17:35:08.000000000 +0200
***************
*** 4006,4012 ****
  	else
  	{
  	    prefix = 1;
! 	    if (STRNCMP(arg, "no", 2) == 0)
  	    {
  		prefix = 0;
  		arg += 2;
--- 4006,4012 ----
  	else
  	{
  	    prefix = 1;
! 	    if (STRNCMP(arg, "no", 2) == 0 && STRNCMP(arg, "novice", 6) != 0)
  	    {
  		prefix = 0;
  		arg += 2;
***************
*** 9757,9763 ****
  	}
  	--p;
      }
!     if (STRNCMP(p, "no", 2) == 0)
      {
  	xp->xp_context = EXPAND_BOOL_SETTINGS;
  	p += 2;
--- 9757,9763 ----
  	}
  	--p;
      }
!     if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0)
      {
  	xp->xp_context = EXPAND_BOOL_SETTINGS;
  	p += 2;
*** ../vim-7.2.207/src/version.c	2009-06-16 17:22:38.000000000 +0200
--- src/version.c	2009-06-16 17:50:33.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     208,
  /**/

-- 
Now it is such a bizarrely improbable coincidence that anything as
mind-bogglingly useful as the Babel fish could have evolved purely by chance
that some thinkers have chosen to see it as a final and clinching proof of the
NON-existence of God.
The argument goes something like this: 'I refuse to prove that I exist,' says
God, 'for proof denies faith, and without faith I am nothing.'
'But,' says Man, 'the Babel fish is a dead giveaway, isn't it?  It could not
have evolved by chance.  It proves you exist, and so therefore, by your own
arguments, you don't.  QED.'
'Oh dear,' says God, 'I hadn't thought of that,' and promptly vanishes in a
puff of logic.
'Oh, that was easy,' says Man, and for an encore goes on to prove that black
is white and gets himself killed on the next pedestrian crossing.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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    ///


--- NEW FILE 7.2.209 ---
To: vim-dev at vim.org
Subject: Patch 7.2.209
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.209
Problem:    For xxd setmode() is undefined on Cygwin.
Solution:   Include io.h. (Dominique Pelle)
Files:	    src/xxd/xxd.c


*** ../vim-7.2.208/src/xxd/xxd.c	2007-12-03 21:32:21.000000000 +0100
--- src/xxd/xxd.c	2009-06-16 18:03:14.000000000 +0200
***************
*** 64,69 ****
--- 64,72 ----
  # define _CRT_SECURE_NO_DEPRECATE
  # define _CRT_NONSTDC_NO_DEPRECATE
  #endif
+ #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
+ # define CYGWIN
+ #endif
  
  #include <stdio.h>
  #ifdef VAXC
***************
*** 77,83 ****
  #if !defined(OS2) && defined(__EMX__)
  # define OS2
  #endif
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__)
  # include <io.h>	/* for setmode() */
  #else
  # ifdef UNIX
--- 80,87 ----
  #if !defined(OS2) && defined(__EMX__)
  # define OS2
  #endif
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \
!   || defined(CYGWIN)
  # include <io.h>	/* for setmode() */
  #else
  # ifdef UNIX
***************
*** 150,158 ****
  # endif
  #endif
  
- #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
- # define CYGWIN
- #endif
  #if defined(MSDOS) || defined(WIN32) || defined(OS2)
  # define BIN_READ(yes)  ((yes) ? "rb" : "rt")
  # define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
--- 154,159 ----
*** ../vim-7.2.208/src/version.c	2009-06-16 17:50:56.000000000 +0200
--- src/version.c	2009-06-16 18:16:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     209,
  /**/

-- 
"So this is it," said Arthur, "we are going to die."
"Yes," said Ford, "except...no!  Wait a minute!"  He suddenly lunged across
the chamber at something behind Arthur's line of vision.  "What's this
switch?" he cried.
"What?   Where?" cried Arthur, twisting around.
"No, I was only fooling," said Ford, "we are going to die after all."
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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    ///


--- NEW FILE 7.2.210 ---
To: vim-dev at vim.org
Subject: Patch 7.2.210
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.210
Problem:    When a file that is being edited has its timestamp updated outside
	    of Vim and ":checktime" is used still get a warning when writing
	    the file. (Matt Mueller)
Solution:   Store the timestamp in b_mtime_read when the timestamp is the only
	    thing that changed.
Files:	    src/fileio.c


*** ../vim-7.2.209/src/fileio.c	2009-06-16 16:01:34.000000000 +0200
--- src/fileio.c	2009-06-20 13:29:41.000000000 +0200
***************
*** 6627,6633 ****
  			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
  			mesg2 = _("See \":help W16\" for more info.");
  		    }
! 		    /* Else: only timestamp changed, ignored */
  		}
  	    }
  	}
--- 6627,6636 ----
  			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
  			mesg2 = _("See \":help W16\" for more info.");
  		    }
! 		    else
! 			/* Only timestamp changed, store it to avoid a warning
! 			 * in check_mtime() later. */
! 			buf->b_mtime_read = buf->b_mtime;
  		}
  	    }
  	}
*** ../vim-7.2.209/src/version.c	2009-06-16 18:29:37.000000000 +0200
--- src/version.c	2009-06-24 11:57:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     210,
  /**/

-- 
Have you heard about the new Beowulf cluster? It's so fast, it executes
an infinite loop in 6 seconds.

 /// 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    ///


--- NEW FILE 7.2.211 ---
To: vim-dev at vim.org
Subject: Patch 7.2.211
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.211
Problem:    Memory leak when expanding a series of file names.
Solution:   Use ga_clear_strings() instead of ga_clear().
Files:	    src/misc1.c


*** ../vim-7.2.210/src/misc1.c	2009-05-17 13:30:58.000000000 +0200
--- src/misc1.c	2009-06-24 16:16:17.000000000 +0200
***************
*** 9193,9199 ****
  		else if (vim_strpbrk(p, (char_u *)"$~") != NULL)
  		{
  		    vim_free(p);
! 		    ga_clear(&ga);
  		    i = mch_expand_wildcards(num_pat, pat, num_file, file,
  								       flags);
  		    recursive = FALSE;
--- 9193,9199 ----
  		else if (vim_strpbrk(p, (char_u *)"$~") != NULL)
  		{
  		    vim_free(p);
! 		    ga_clear_strings(&ga);
  		    i = mch_expand_wildcards(num_pat, pat, num_file, file,
  								       flags);
  		    recursive = FALSE;
*** ../vim-7.2.210/src/version.c	2009-06-24 11:57:53.000000000 +0200
--- src/version.c	2009-06-24 16:24:32.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     211,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
34. You laugh at people with 14400 baud modems.

 /// 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    ///


--- NEW FILE 7.2.212 ---
To: vim-dev at vim.org
Subject: Patch 7.2.212 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.212 (extra)
Problem:    Warnings for redefining SIG macros.
Solution:   Don't define them if already defined. (Bjorn Winckler)
Files:	    src/os_mac.h


*** ../vim-7.2.211/src/os_mac.h	2008-06-24 22:27:34.000000000 +0200
--- src/os_mac.h	2009-06-19 21:21:57.000000000 +0200
***************
*** 268,276 ****
   */
  
  #ifdef MACOS_X_UNIX
! # define SIGPROTOARG	(int)
! # define SIGDEFARG(s)	(s) int s;
! # define SIGDUMMYARG	0
  # undef  HAVE_AVAIL_MEM
  # ifndef HAVE_CONFIG_H
  #  define RETSIGTYPE void
--- 268,282 ----
   */
  
  #ifdef MACOS_X_UNIX
! # ifndef SIGPROTOARG
! #  define SIGPROTOARG	(int)
! # endif
! # ifndef SIGDEFARG
! #  define SIGDEFARG(s)	(s) int s UNUSED;
! # endif
! # ifndef SIGDUMMYARG
! #  define SIGDUMMYARG	0
! # endif
  # undef  HAVE_AVAIL_MEM
  # ifndef HAVE_CONFIG_H
  #  define RETSIGTYPE void
*** ../vim-7.2.211/src/version.c	2009-06-24 16:25:23.000000000 +0200
--- src/version.c	2009-06-24 16:40:18.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     212,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
37. You start looking for hot HTML addresses in public restrooms.

 /// 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    ///


--- NEW FILE 7.2.213 ---
To: vim-dev at vim.org
Subject: Patch 7.2.213
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.213
Problem:    Warning for using vsprintf().
Solution:   Use vim_vsnprintf().
Files:	    src/netbeans.c


*** ../vim-7.2.212/src/netbeans.c	2009-06-16 16:57:53.000000000 +0200
--- src/netbeans.c	2009-06-24 11:26:43.000000000 +0200
***************
*** 2586,2592 ****
      va_list ap;
  
      va_start(ap, cmd);
!     vsprintf(buf, cmd, ap);
      va_end(ap);
  
      nbdebug(("    COLONCMD %s\n", buf));
--- 2586,2592 ----
      va_list ap;
  
      va_start(ap, cmd);
!     vim_vsnprintf(buf, sizeof(buf), cmd, ap, NULL);
      va_end(ap);
  
      nbdebug(("    COLONCMD %s\n", buf));
*** ../vim-7.2.212/src/version.c	2009-06-24 16:41:01.000000000 +0200
--- src/version.c	2009-06-24 16:49:06.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     213,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
38. You wake up at 3 a.m. to go to the bathroom and stop and check your e-mail
    on the way back to bed.

 /// 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    ///


--- NEW FILE 7.2.214 ---
To: vim-dev at vim.org
Subject: Patch 7.2.214
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.214
Problem:    Crash with complete function for user command. (Andy Wokula)
Solution:   Avoid using a NULL pointer (Dominique Pelle)
Files:	    src/ex_getln.c


*** ../vim-7.2.213/src/ex_getln.c	2009-05-16 17:29:37.000000000 +0200
--- src/ex_getln.c	2009-06-24 16:57:28.000000000 +0200
***************
*** 4874,4887 ****
      /* Loop over the items in the list. */
      for (li = retlist->lv_first; li != NULL; li = li->li_next)
      {
! 	if (li->li_tv.v_type != VAR_STRING)
! 	    continue;  /* Skip non-string items */
  
  	if (ga_grow(&ga, 1) == FAIL)
  	    break;
  
  	((char_u **)ga.ga_data)[ga.ga_len] =
! 	    vim_strsave(li->li_tv.vval.v_string);
  	++ga.ga_len;
      }
      list_unref(retlist);
--- 4874,4887 ----
      /* Loop over the items in the list. */
      for (li = retlist->lv_first; li != NULL; li = li->li_next)
      {
! 	if (li->li_tv.v_type != VAR_STRING || li->li_tv.vval.v_string == NULL)
! 	    continue;  /* Skip non-string items and empty strings */
  
  	if (ga_grow(&ga, 1) == FAIL)
  	    break;
  
  	((char_u **)ga.ga_data)[ga.ga_len] =
! 					 vim_strsave(li->li_tv.vval.v_string);
  	++ga.ga_len;
      }
      list_unref(retlist);
*** ../vim-7.2.213/src/version.c	2009-06-24 16:49:50.000000000 +0200
--- src/version.c	2009-06-24 17:03:58.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     214,
  /**/

-- 
He who laughs last, thinks slowest.

 /// 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    ///


--- NEW FILE 7.2.215 ---
To: vim-dev at vim.org
Subject: Patch 7.2.215
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.215
Problem:    ml_get error when using ":vimgrep".
Solution:   Load the memfile for the hidden buffer before putting it in a
	    window.  Correct the order of splitting the window and filling
	    the window and buffer with data.
Files:	    src/fileio.c, src/proto/window.pro, src/quickfix.c, src/window.c


*** ../vim-7.2.214/src/fileio.c	2009-06-24 11:57:53.000000000 +0200
--- src/fileio.c	2009-06-24 12:53:19.000000000 +0200
***************
*** 710,716 ****
  #endif
  #ifdef UNIX
  	/* Set swap file protection bits after creating it. */
! 	if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL)
  	    (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode);
  #endif
      }
--- 710,717 ----
  #endif
  #ifdef UNIX
  	/* Set swap file protection bits after creating it. */
! 	if (swap_mode > 0 && curbuf->b_ml.ml_mfp != NULL
! 			  && curbuf->b_ml.ml_mfp->mf_fname != NULL)
  	    (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode);
  #endif
      }
***************
*** 8435,8443 ****
  	 * effects, insert it in a the current tab page.
  	 * Anything related to a window (e.g., setting folds) may have
  	 * unexpected results. */
! 	curwin = aucmd_win;
! 	curwin->w_buffer = buf;
  	++buf->b_nwindows;
  
  #ifdef FEAT_WINDOWS
  	/* Split the current window, put the aucmd_win in the upper half. */
--- 8436,8444 ----
  	 * effects, insert it in a the current tab page.
  	 * Anything related to a window (e.g., setting folds) may have
  	 * unexpected results. */
! 	aucmd_win->w_buffer = buf;
  	++buf->b_nwindows;
+ 	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
  
  #ifdef FEAT_WINDOWS
  	/* Split the current window, put the aucmd_win in the upper half. */
***************
*** 8448,8459 ****
  	(void)win_comp_pos();   /* recompute window positions */
  	p_ea = save_ea;
  #endif
! 	/* set cursor and topline to safe values */
! 	curwin_init();
! #ifdef FEAT_VERTSPLIT
! 	curwin->w_wincol = 0;
! 	curwin->w_width = Columns;
! #endif
      }
      curbuf = buf;
      aco->new_curwin = curwin;
--- 8449,8455 ----
  	(void)win_comp_pos();   /* recompute window positions */
  	p_ea = save_ea;
  #endif
! 	curwin = aucmd_win;
      }
      curbuf = buf;
      aco->new_curwin = curwin;
*** ../vim-7.2.214/src/proto/window.pro	2009-06-16 16:01:34.000000000 +0200
--- src/proto/window.pro	2009-06-24 12:53:13.000000000 +0200
***************
*** 14,19 ****
--- 14,20 ----
  win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
  void close_others __ARGS((int message, int forceit));
  void curwin_init __ARGS((void));
+ void win_init_empty __ARGS((win_T *wp));
  int win_alloc_first __ARGS((void));
  void win_alloc_aucmd_win __ARGS((void));
  void win_init_size __ARGS((void));
*** ../vim-7.2.214/src/quickfix.c	2009-05-17 13:30:58.000000000 +0200
--- src/quickfix.c	2009-06-24 15:30:06.000000000 +0200
***************
*** 3411,3424 ****
      /* Init the options. */
      buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
  
!     /* set curwin/curbuf to buf and save a few things */
!     aucmd_prepbuf(&aco, newbuf);
  
!     /* Need to set the filename for autocommands. */
!     (void)setfname(curbuf, fname, NULL, FALSE);
  
-     if (ml_open(curbuf) == OK)
-     {
  	/* Create swap file now to avoid the ATTENTION message. */
  	check_need_swap(TRUE);
  
--- 3411,3425 ----
      /* Init the options. */
      buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
  
!     /* need to open the memfile before putting the buffer in a window */
!     if (ml_open(newbuf) == OK)
!     {
! 	/* set curwin/curbuf to buf and save a few things */
! 	aucmd_prepbuf(&aco, newbuf);
  
! 	/* Need to set the filename for autocommands. */
! 	(void)setfname(curbuf, fname, NULL, FALSE);
  
  	/* Create swap file now to avoid the ATTENTION message. */
  	check_need_swap(TRUE);
  
***************
*** 3441,3450 ****
  		newbuf = curbuf;
  	    }
  	}
-     }
  
!     /* restore curwin/curbuf and a few other things */
!     aucmd_restbuf(&aco);
  
      if (!buf_valid(newbuf))
  	return NULL;
--- 3442,3451 ----
  		newbuf = curbuf;
  	    }
  	}
  
! 	/* restore curwin/curbuf and a few other things */
! 	aucmd_restbuf(&aco);
!     }
  
      if (!buf_valid(newbuf))
  	return NULL;
*** ../vim-7.2.214/src/window.c	2009-06-16 16:01:34.000000000 +0200
--- src/window.c	2009-06-24 14:35:16.000000000 +0200
***************
*** 2354,2366 ****
      frame_T	*frp;
      win_T	*wp;
  
- #ifdef FEAT_FOLDING
-     clearFolding(win);
- #endif
- 
-     /* reduce the reference count to the argument list. */
-     alist_unlink(win->w_alist);
- 
      /* Remove the window and its frame from the tree of frames. */
      frp = win->w_frame;
      wp = winframe_remove(win, dirp, tp);
--- 2354,2359 ----
***************
*** 2386,2394 ****
  	tabpage_close(TRUE);
  # endif
  
-     while (firstwin != NULL)
- 	(void)win_free_mem(firstwin, &dummy, NULL);
- 
  # ifdef FEAT_AUTOCMD
      if (aucmd_win != NULL)
      {
--- 2379,2384 ----
***************
*** 2396,2401 ****
--- 2386,2394 ----
  	aucmd_win = NULL;
      }
  # endif
+ 
+     while (firstwin != NULL)
+ 	(void)win_free_mem(firstwin, &dummy, NULL);
  }
  #endif
  
***************
*** 3204,3230 ****
      void
  curwin_init()
  {
!     redraw_win_later(curwin, NOT_VALID);
!     curwin->w_lines_valid = 0;
!     curwin->w_cursor.lnum = 1;
!     curwin->w_curswant = curwin->w_cursor.col = 0;
  #ifdef FEAT_VIRTUALEDIT
!     curwin->w_cursor.coladd = 0;
  #endif
!     curwin->w_pcmark.lnum = 1;	/* pcmark not cleared but set to line 1 */
!     curwin->w_pcmark.col = 0;
!     curwin->w_prev_pcmark.lnum = 0;
!     curwin->w_prev_pcmark.col = 0;
!     curwin->w_topline = 1;
  #ifdef FEAT_DIFF
!     curwin->w_topfill = 0;
  #endif
!     curwin->w_botline = 2;
  #ifdef FEAT_FKMAP
!     if (curwin->w_p_rl)
! 	curwin->w_farsi = W_CONV + W_R_L;
      else
! 	curwin->w_farsi = W_CONV;
  #endif
  }
  
--- 3197,3230 ----
      void
  curwin_init()
  {
!     win_init_empty(curwin);
! }
! 
!     void
! win_init_empty(wp)
!     win_T *wp;
! {
!     redraw_win_later(wp, NOT_VALID);
!     wp->w_lines_valid = 0;
!     wp->w_cursor.lnum = 1;
!     wp->w_curswant = wp->w_cursor.col = 0;
  #ifdef FEAT_VIRTUALEDIT
!     wp->w_cursor.coladd = 0;
  #endif
!     wp->w_pcmark.lnum = 1;	/* pcmark not cleared but set to line 1 */
!     wp->w_pcmark.col = 0;
!     wp->w_prev_pcmark.lnum = 0;
!     wp->w_prev_pcmark.col = 0;
!     wp->w_topline = 1;
  #ifdef FEAT_DIFF
!     wp->w_topfill = 0;
  #endif
!     wp->w_botline = 2;
  #ifdef FEAT_FKMAP
!     if (wp->w_p_rl)
! 	wp->w_farsi = W_CONV + W_R_L;
      else
! 	wp->w_farsi = W_CONV;
  #endif
  }
  
***************
*** 4325,4330 ****
--- 4325,4337 ----
  {
      int		i;
  
+ #ifdef FEAT_FOLDING
+     clearFolding(wp);
+ #endif
+ 
+     /* reduce the reference count to the argument list. */
+     alist_unlink(wp->w_alist);
+ 
  #ifdef FEAT_AUTOCMD
      /* Don't execute autocommands while the window is halfway being deleted.
       * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
***************
*** 4387,4393 ****
      }
  #endif /* FEAT_GUI */
  
!     win_remove(wp, tp);
      vim_free(wp);
  
  #ifdef FEAT_AUTOCMD
--- 4394,4403 ----
      }
  #endif /* FEAT_GUI */
  
! #ifdef FEAT_AUTOCMD
!     if (wp != aucmd_win)
! #endif
! 	win_remove(wp, tp);
      vim_free(wp);
  
  #ifdef FEAT_AUTOCMD
*** ../vim-7.2.214/src/version.c	2009-06-24 17:04:40.000000000 +0200
--- src/version.c	2009-06-24 17:27:38.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     215,
  /**/

-- 
Micro$oft: where do you want to go today?
    Linux: where do you want to go tomorrow?
  FreeBSD: are you guys coming, or what?

 /// 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    ///


--- NEW FILE 7.2.216 ---
To: vim-dev at vim.org
Subject: Patch 7.2.216
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.216
Problem:    Two error messages have the same number E812.
Solution:   Give one message a different number.
Files:	    runtime/doc/autocmd.txt, runtime/doc/if_mzsch.txt, src/if_mzsch.c


*** ../vim-7.2.215/runtime/doc/autocmd.txt	2008-08-09 19:36:46.000000000 +0200
--- runtime/doc/autocmd.txt	2009-06-24 17:49:04.000000000 +0200
***************
*** 335,340 ****
--- 335,342 ----
  				NOTE: When this autocommand is executed, the
  				current buffer "%" may be different from the
  				buffer being deleted "<afile>" and "<abuf>".
+ 				Don't change to another buffer, it will cause
+ 				problems.
  							*BufEnter*
  BufEnter			After entering a buffer.  Useful for setting
  				options for a file type.  Also executed when
***************
*** 397,402 ****
--- 399,406 ----
  				NOTE: When this autocommand is executed, the
  				current buffer "%" may be different from the
  				buffer being unloaded "<afile>".
+ 				Don't change to another buffer, it will cause
+ 				problems.
  							*BufWinEnter*
  BufWinEnter			After a buffer is displayed in a window.  This
  				can be when the buffer is loaded (after
***************
*** 428,433 ****
--- 432,439 ----
  				NOTE: When this autocommand is executed, the
  				current buffer "%" may be different from the
  				buffer being deleted "<afile>".
+ 				Don't change to another buffer, it will cause
+ 				problems.
  						*BufWrite* *BufWritePre*
  BufWrite or BufWritePre		Before writing the whole buffer to a file.
  							*BufWriteCmd*
***************
*** 748,755 ****
  					'a'	abort, like hitting CTRL-C
  				When set to an empty string the user will be
  				asked, as if there was no SwapExists autocmd.
! 				Note: Do not try to change the buffer, the
! 				results are unpredictable.
  							*Syntax*
  Syntax				When the 'syntax' option has been set.  The
  				pattern is matched against the syntax name.
--- 754,763 ----
  					'a'	abort, like hitting CTRL-C
  				When set to an empty string the user will be
  				asked, as if there was no SwapExists autocmd.
! 							*E812*
! 				It is not allowed to change to another buffer,
! 				change a buffer name or change directory
! 				here.
  							*Syntax*
  Syntax				When the 'syntax' option has been set.  The
  				pattern is matched against the syntax name.
*** ../vim-7.2.215/runtime/doc/if_mzsch.txt	2009-05-26 22:58:43.000000000 +0200
--- runtime/doc/if_mzsch.txt	2009-06-24 12:08:20.000000000 +0200
***************
*** 1,4 ****
! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 May 26
  
  
  		  VIM REFERENCE MANUAL    by Sergey Khorev
--- 1,4 ----
! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 Jun 24
  
  
  		  VIM REFERENCE MANUAL    by Sergey Khorev
***************
*** 231,237 ****
      (set-cursor (line . col) [window])  Set cursor position.
  
  ==============================================================================
! 5. Dynamic loading				    *mzscheme-dynamic* *E812*
  
  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
  output then includes |+mzscheme/dyn|.
--- 231,237 ----
      (set-cursor (line . col) [window])  Set cursor position.
  
  ==============================================================================
! 5. Dynamic loading				    *mzscheme-dynamic* *E815*
  
  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
  output then includes |+mzscheme/dyn|.
*** ../vim-7.2.215/src/if_mzsch.c	2009-05-26 22:58:43.000000000 +0200
--- src/if_mzsch.c	2009-06-24 12:08:23.000000000 +0200
***************
*** 1040,1046 ****
  #ifdef DYNAMIC_MZSCHEME
  	if (!mzscheme_enabled(TRUE))
  	{
! 	    EMSG(_("E812: Sorry, this command is disabled, the MzScheme libraries could not be loaded."));
  	    return -1;
  	}
  #endif
--- 1040,1046 ----
  #ifdef DYNAMIC_MZSCHEME
  	if (!mzscheme_enabled(TRUE))
  	{
! 	    EMSG(_("E815: Sorry, this command is disabled, the MzScheme libraries could not be loaded."));
  	    return -1;
  	}
  #endif
*** ../vim-7.2.215/src/version.c	2009-06-24 17:31:27.000000000 +0200
--- src/version.c	2009-06-24 17:46:56.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     216,
  /**/

-- 
Everyone has a photographic memory. Some don't have film.

 /// 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    ///


--- NEW FILE 7.2.217 ---
To: vim-dev at vim.org
Subject: Patch 7.2.217
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.217
Problem:    Running tests with valgrind doesn't work as advertised.
Solution:   Fix the line in the Makefile.
Files:	    src/testdir/Makefile


*** ../vim-7.2.216/src/testdir/Makefile	2009-03-11 16:26:01.000000000 +0100
--- src/testdir/Makefile	2009-06-24 14:59:42.000000000 +0200
***************
*** 4,12 ****
  
  VIMPROG = ../vim
  
! # 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 \
--- 4,14 ----
  
  VIMPROG = ../vim
  
! # Uncomment this line to use valgrind for memory leaks and extra warnings.
! #   The output goes into a file "valgrind.testN"
! #   Vim should be compiled with EXITFREE to avoid false warnings.
! #   This will make testing about 10 times as slow.
! # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --log-file=valgrind.$*
  
  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
  		test7.out test8.out test9.out test10.out test11.out \
*** ../vim-7.2.216/src/version.c	2009-06-24 17:51:01.000000000 +0200
--- src/version.c	2009-06-24 18:07:07.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     217,
  /**/

-- 
A day without sunshine is like, well, night.

 /// 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    ///


--- NEW FILE 7.2.218 ---
To: vim-dev at vim.org
Subject: Patch 7.2.218
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.218
Problem:    Cannot build GTK with hangul_input feature. (Dominique Pelle)
Solution:   Adjuste #ifdef.  (SungHyun Nam)
Files:	    src/gui.c


*** ../vim-7.2.217/src/gui.c	2009-06-16 16:01:34.000000000 +0200
--- src/gui.c	2009-06-24 17:45:01.000000000 +0200
***************
*** 959,965 ****
  		guicolor_T fg, bg;
  
  		if (
! # ifdef HAVE_GTK2
  			preedit_get_status()
  # else
  			im_get_status()
--- 959,965 ----
  		guicolor_T fg, bg;
  
  		if (
! # if defined(HAVE_GTK2) && !defined(FEAT_HANGULIN)
  			preedit_get_status()
  # else
  			im_get_status()
*** ../vim-7.2.217/src/version.c	2009-06-24 18:07:55.000000000 +0200
--- src/version.c	2009-06-24 18:31:06.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     218,
  /**/

-- 
The users that I support would double-click on a landmine to find out
what happens.				-- A system administrator

 /// 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    ///


--- NEW FILE 7.2.219 ---
To: vim-dev at vim.org
Subject: Patch 7.2.219 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.219 (extra)
Problem:    Photon GUI is outdated.
Solution:   Updates for QNX 6.4.0. (Sean Boudreau)
Files:	    src/gui_photon.c


*** ../vim-7.2.218/src/gui_photon.c	2007-05-10 20:23:35.000000000 +0200
--- src/gui_photon.c	2009-07-01 16:08:36.000000000 +0200
***************
*** 838,844 ****
--- 838,849 ----
      static void
  gui_ph_draw_start( void )
  {
+     PhGC_t *gc;
+ 
+     gc = PgGetGC();
      PgSetRegion( PtWidgetRid( PtFindDisjoint( gui.vimTextArea ) ) );
+     PgClearClippingsCx( gc );
+     PgClearTranslationCx( gc );
  
      PtWidgetOffset( gui.vimTextArea, &gui_ph_raw_offset );
      PhTranslatePoint( &gui_ph_raw_offset, PtWidgetPos( gui.vimTextArea, NULL ) );
***************
*** 2970,2976 ****
      if( vim_font_name == NULL )
      {
  	/* Default font */
! 	vim_font_name = "PC Term";
      }
  
      if( STRCMP( vim_font_name, "*" ) == 0 )
--- 2975,2981 ----
      if( vim_font_name == NULL )
      {
  	/* Default font */
! 	vim_font_name = "PC Terminal";
      }
  
      if( STRCMP( vim_font_name, "*" ) == 0 )
*** ../vim-7.2.218/src/version.c	2009-06-24 18:31:36.000000000 +0200
--- src/version.c	2009-07-01 16:11:34.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     219,
  /**/

-- 
"Oh, no!  NOT the Spanish Inquisition!"
"NOBODY expects the Spanish Inquisition!!!"
				-- Monty Python sketch --
"Oh, no!  NOT another option!"
"EVERYBODY expects another option!!!"
				-- Discussion in vim-dev mailing list --

 /// 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    ///


--- NEW FILE 7.2.220 ---
To: vim-dev at vim.org
Subject: Patch 7.2.220
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.220 (after 7.2.215)
Problem:    a BufEnter autocommand that changes directory causes problems.
	    (Ajit Thakkar)
Solution:   Disable autocommands when opening a hidden buffer in a window.
Files:	    src/fileio.c


*** ../vim-7.2.219/src/fileio.c	2009-06-24 17:31:27.000000000 +0200
--- src/fileio.c	2009-07-01 17:02:46.000000000 +0200
***************
*** 8441,8453 ****
  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
  
  #ifdef FEAT_WINDOWS
! 	/* Split the current window, put the aucmd_win in the upper half. */
  	make_snapshot(SNAP_AUCMD_IDX);
  	save_ea = p_ea;
  	p_ea = FALSE;
  	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
  	(void)win_comp_pos();   /* recompute window positions */
  	p_ea = save_ea;
  #endif
  	curwin = aucmd_win;
      }
--- 8441,8456 ----
  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
  
  #ifdef FEAT_WINDOWS
! 	/* Split the current window, put the aucmd_win in the upper half.
! 	 * We don't want the BufEnter or WinEnter autocommands. */
! 	block_autocmds();
  	make_snapshot(SNAP_AUCMD_IDX);
  	save_ea = p_ea;
  	p_ea = FALSE;
  	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
  	(void)win_comp_pos();   /* recompute window positions */
  	p_ea = save_ea;
+ 	unblock_autocmds();
  #endif
  	curwin = aucmd_win;
      }
***************
*** 8474,8480 ****
  	--curbuf->b_nwindows;
  #ifdef FEAT_WINDOWS
  	/* Find "aucmd_win", it can't be closed, but it may be in another tab
! 	 * page. */
  	if (curwin != aucmd_win)
  	{
  	    tabpage_T	*tp;
--- 8477,8484 ----
  	--curbuf->b_nwindows;
  #ifdef FEAT_WINDOWS
  	/* Find "aucmd_win", it can't be closed, but it may be in another tab
! 	 * page. Do not trigger autocommands here. */
! 	block_autocmds();
  	if (curwin != aucmd_win)
  	{
  	    tabpage_T	*tp;
***************
*** 8498,8503 ****
--- 8502,8508 ----
  	last_status(FALSE);	    /* may need to remove last status line */
  	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
  	(void)win_comp_pos();   /* recompute window positions */
+ 	unblock_autocmds();
  
  	if (win_valid(aco->save_curwin))
  	    curwin = aco->save_curwin;
*** ../vim-7.2.219/src/version.c	2009-07-01 16:12:54.000000000 +0200
--- src/version.c	2009-07-01 17:10:22.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     220,
  /**/

-- 
Microsoft is to software what McDonalds is to gourmet cooking

 /// 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    ///


--- NEW FILE 7.2.221 ---
To: vim-dev at vim.org
Subject: Patch 7.2.221
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.221
Problem:    X cut_buffer0 text is used as-is, it may be in the wrong encoding.
Solution:   Convert between 'enc' and latin1. (James Vega)
Files:	    src/gui_gtk_x11.c, src/message.c, src/ops.c, src/proto/ui.pro,
	    src/ui.c


*** ../vim-7.2.220/src/gui_gtk_x11.c	2009-06-16 15:23:07.000000000 +0200
--- src/gui_gtk_x11.c	2009-07-01 11:55:34.000000000 +0200
***************
*** 6717,6724 ****
  {
      GdkAtom	target;
      unsigned	i;
-     int		nbytes;
-     char_u	*buffer;
      time_t	start;
  
      for (i = 0; i < N_SELECTION_TARGETS; ++i)
--- 6717,6722 ----
***************
*** 6746,6767 ****
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
!     nbytes = 0;
!     buffer = (char_u *)XFetchBuffer(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
! 				    &nbytes, 0);
!     if (nbytes > 0)
!     {
! 	/* Got something */
! 	clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
! 	if (p_verbose > 0)
! 	{
! 	    verbose_enter();
! 	    smsg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
! 	    verbose_leave();
! 	}
!     }
!     if (buffer != NULL)
! 	XFree(buffer);
  }
  
  /*
--- 6744,6750 ----
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
!     yank_cut_buffer0(GDK_WINDOW_XDISPLAY(gui.mainwin->window), cbd);
  }
  
  /*
*** ../vim-7.2.220/src/message.c	2009-05-17 13:30:58.000000000 +0200
--- src/message.c	2009-07-01 16:43:08.000000000 +0200
***************
*** 107,113 ****
  }
  
  #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \
!     || defined(PROTO)
  /*
   * Like msg() but keep it silent when 'verbosefile' is set.
   */
--- 107,113 ----
  }
  
  #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \
!     || defined(FEAT_GUI_GTK) || defined(PROTO)
  /*
   * Like msg() but keep it silent when 'verbosefile' is set.
   */
*** ../vim-7.2.220/src/ops.c	2009-05-26 18:12:13.000000000 +0200
--- src/ops.c	2009-07-01 12:15:31.000000000 +0200
***************
*** 5591,5596 ****
--- 5591,5619 ----
      if (dpy != NULL && str != NULL && motion_type >= 0
  					       && len < 1024*1024 && len > 0)
      {
+ #ifdef FEAT_MBYTE
+ 	/* The CUT_BUFFER0 is supposed to always contain latin1.  Convert from
+ 	 * 'enc' when it is a multi-byte encoding.  When 'enc' is an 8-bit
+ 	 * encoding conversion usually doesn't work, so keep the text as-is.
+ 	 */
+ 	if (has_mbyte)
+ 	{
+ 	    char_u	*conv_str = str;
+ 	    vimconv_T	vc;
+ 
+ 	    vc.vc_type = CONV_NONE;
+ 	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
+ 	    {
+ 		conv_str = string_convert(&vc, str, (int*)&len);
+ 		if (conv_str != NULL)
+ 		{
+ 		    vim_free(str);
+ 		    str = conv_str;
+ 		}
+ 		convert_setup(&vc, NULL, NULL);
+ 	    }
+ 	}
+ #endif
  	XStoreBuffer(dpy, (char *)str, (int)len, 0);
  	XFlush(dpy);
      }
*** ../vim-7.2.220/src/proto/ui.pro	2007-05-05 19:58:49.000000000 +0200
--- src/proto/ui.pro	2009-07-01 11:48:11.000000000 +0200
***************
*** 48,53 ****
--- 48,54 ----
  void open_app_context __ARGS((void));
  void x11_setup_atoms __ARGS((Display *dpy));
  void clip_x11_request_selection __ARGS((Widget myShell, Display *dpy, VimClipboard *cbd));
+ void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd));
  void clip_x11_lose_selection __ARGS((Widget myShell, VimClipboard *cbd));
  int clip_x11_own_selection __ARGS((Widget myShell, VimClipboard *cbd));
  void clip_x11_set_selection __ARGS((VimClipboard *cbd));
*** ../vim-7.2.220/src/ui.c	2009-05-17 13:30:58.000000000 +0200
--- src/ui.c	2009-07-01 15:44:07.000000000 +0200
***************
*** 2104,2111 ****
      Atom	type;
      static int	success;
      int		i;
-     int		nbytes = 0;
-     char_u	*buffer;
      time_t	start_time;
      int		timed_out = FALSE;
  
--- 2104,2109 ----
***************
*** 2185,2199 ****
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
!     buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0);
!     if (nbytes > 0)
!     {
! 	/* Got something */
! 	clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
! 	XFree((void *)buffer);
! 	if (p_verbose > 0)
! 	    verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
!     }
  }
  
  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
--- 2183,2189 ----
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
!     yank_cut_buffer0(dpy, cbd);
  }
  
  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
***************
*** 2369,2374 ****
--- 2359,2418 ----
  }
  #endif
  
+ #if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11) \
+     || defined(FEAT_GUI_GTK) || defined(PROTO)
+ /*
+  * Get the contents of the X CUT_BUFFER0 and put it in "cbd".
+  */
+     void
+ yank_cut_buffer0(dpy, cbd)
+     Display		*dpy;
+     VimClipboard	*cbd;
+ {
+     int		nbytes = 0;
+     char_u	*buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0);
+ 
+     if (nbytes > 0)
+     {
+ #ifdef FEAT_MBYTE
+ 	int  done = FALSE;
+ 
+ 	/* CUT_BUFFER0 is supposed to be always latin1.  Convert to 'enc' when
+ 	 * using a multi-byte encoding.  Conversion between two 8-bit
+ 	 * character sets usually fails and the text might actually be in
+ 	 * 'enc' anyway. */
+ 	if (has_mbyte)
+ 	{
+ 	    char_u	*conv_buf = buffer;
+ 	    vimconv_T	vc;
+ 
+ 	    vc.vc_type = CONV_NONE;
+ 	    if (convert_setup(&vc, (char_u *)"latin1", p_enc) == OK)
+ 	    {
+ 		conv_buf = string_convert(&vc, buffer, &nbytes);
+ 		if (conv_buf != NULL)
+ 		{
+ 		    clip_yank_selection(MCHAR, conv_buf, (long)nbytes, cbd);
+ 		    vim_free(conv_buf);
+ 		    done = TRUE;
+ 		}
+ 		convert_setup(&vc, NULL, NULL);
+ 	    }
+ 	}
+ 	if (!done)  /* use the text without conversion */
+ #endif
+ 	    clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
+ 	XFree((void *)buffer);
+ 	if (p_verbose > 0)
+ 	{
+ 	    verbose_enter();
+ 	    verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
+ 	    verbose_leave();
+ 	}
+     }
+ }
+ #endif
+ 
  #if defined(FEAT_MOUSE) || defined(PROTO)
  
  /*
*** ../vim-7.2.220/src/version.c	2009-07-01 17:11:40.000000000 +0200
--- src/version.c	2009-07-01 17:56:02.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     221,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
40. You tell the cab driver you live at
    http://123.elm.street/house/bluetrim.html
41. You actually try that 123.elm.street address.

 /// 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    ///


--- NEW FILE 7.2.222 ---
To: vim-dev at vim.org
Subject: Patch 7.2.222
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.222
Problem:   ":mksession" doesn't work properly with 'acd' set. 
Solution:   Make it work. (Yakov Lerner)
Files:	    src/ex_docmd.c


*** ../vim-7.2.221/src/ex_docmd.c	2009-05-16 17:29:37.000000000 +0200
--- src/ex_docmd.c	2009-07-01 20:18:22.000000000 +0200
***************
*** 8686,8691 ****
--- 8693,8700 ----
      }
  
  #ifdef FEAT_SESSION
+     /* Use the short file name until ":lcd" is used.  We also don't use the
+      * short file name when 'acd' is set, that is checked later. */
      did_lcd = FALSE;
  
      /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */
***************
*** 10573,10578 ****
--- 10582,10590 ----
      if (buf->b_sfname != NULL
  	    && flagp == &ssop_flags
  	    && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
+ #ifdef FEAT_AUTOCHDIR
+ 	    && !p_acd
+ #endif
  	    && !did_lcd)
  	name = buf->b_sfname;
      else
*** ../vim-7.2.221/src/version.c	2009-07-01 18:04:30.000000000 +0200
--- src/version.c	2009-07-01 20:16:19.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     222,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
43. You tell the kids they can't use the computer because "Daddy's got work to
    do" and you don't even have a job.

 /// 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    ///


--- NEW FILE 7.2.223 ---
To: vim-dev at vim.org
Subject: Patch 7.2.223
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.223
Problem:    When a script is run with ":silent" it is not able to give warning
	    messages.
Solution:   Add the ":unsilent" command.
Files:	    runtime/doc/various.txt, src/ex_cmds.h, src/ex_docmd.c


*** ../vim-7.2.222/runtime/doc/various.txt	2008-08-09 19:36:54.000000000 +0200
--- runtime/doc/various.txt	2009-07-09 15:52:54.000000000 +0200
***************
*** 508,513 ****
--- 508,524 ----
  			messages though.  Use ":silent" in the command itself
  			to avoid that: ":silent menu .... :silent command".
  
+ 						*:uns* *:unsilent*
+ :uns[ilent] {command}	Execute {command} not silently.  Only makes a
+ 			difference when |:silent| was used to get to this
+ 			command.
+ 			Use this for giving a message even when |:silent| was
+ 			used.  In this example |:silent| is used to avoid the
+ 			message about reading the file and |:unsilent| to be
+ 			able to list the first line of each file. >
+     		:silent argdo unsilent echo expand('%') . ": " . getline(1)
+ <
+ 
  						*:verb* *:verbose*
  :[count]verb[ose] {command}
  			Execute {command} with 'verbose' set to [count].  If
*** ../vim-7.2.222/src/ex_cmds.h	2008-11-09 13:43:25.000000000 +0100
--- src/ex_cmds.h	2009-07-01 18:12:55.000000000 +0200
***************
*** 991,996 ****
--- 991,998 ----
  			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
  EX(CMD_unmenu,		"unmenu",	ex_menu,
  			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_unsilent,	"unsilent",	ex_wrongmodifier,
+ 			NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
  EX(CMD_update,		"update",	ex_update,
  			RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR),
  EX(CMD_vglobal,		"vglobal",	ex_global,
*** ../vim-7.2.222/src/ex_docmd.c	2009-07-01 20:18:43.000000000 +0200
--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
***************
*** 1677,1684 ****
      char_u		*errormsg = NULL;	/* error message */
      exarg_T		ea;			/* Ex command arguments */
      long		verbose_save = -1;
!     int			save_msg_scroll = 0;
!     int			did_silent = 0;
      int			did_esilent = 0;
  #ifdef HAVE_SANDBOX
      int			did_sandbox = FALSE;
--- 1677,1684 ----
      char_u		*errormsg = NULL;	/* error message */
      exarg_T		ea;			/* Ex command arguments */
      long		verbose_save = -1;
!     int			save_msg_scroll = msg_scroll;
!     int			save_msg_silent = -1;
      int			did_esilent = 0;
  #ifdef HAVE_SANDBOX
      int			did_sandbox = FALSE;
***************
*** 1856,1864 ****
  			}
  			if (!checkforcmd(&ea.cmd, "silent", 3))
  			    break;
! 			++did_silent;
  			++msg_silent;
- 			save_msg_scroll = msg_scroll;
  			if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1]))
  			{
  			    /* ":silent!", but not "silent !cmd" */
--- 1856,1864 ----
  			}
  			if (!checkforcmd(&ea.cmd, "silent", 3))
  			    break;
! 			if (save_msg_silent == -1)
! 			    save_msg_silent = msg_silent;
  			++msg_silent;
  			if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1]))
  			{
  			    /* ":silent!", but not "silent !cmd" */
***************
*** 1886,1891 ****
--- 1886,1898 ----
  #endif
  			continue;
  
+ 	    case 'u':	if (!checkforcmd(&ea.cmd, "unsilent", 3))
+ 			    break;
+ 			if (save_msg_silent == -1)
+ 			    save_msg_silent = msg_silent;
+ 			msg_silent = 0;
+ 			continue;
+ 
  	    case 'v':	if (checkforcmd(&ea.cmd, "vertical", 4))
  			{
  #ifdef FEAT_VERTSPLIT
***************
*** 2684,2696 ****
  
      cmdmod = save_cmdmod;
  
!     if (did_silent > 0)
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	msg_silent -= did_silent;
! 	if (msg_silent < 0)
! 	    msg_silent = 0;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
  	    emsg_silent = 0;
--- 2691,2702 ----
  
      cmdmod = save_cmdmod;
  
!     if (save_msg_silent != -1)
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	if (!did_emsg)
! 	    msg_silent = save_msg_silent;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
  	    emsg_silent = 0;
***************
*** 2987,2992 ****
--- 2993,2999 ----
      {"silent", 3, FALSE},
      {"tab", 3, TRUE},
      {"topleft", 2, FALSE},
+     {"unsilent", 3, FALSE},
      {"verbose", 4, TRUE},
      {"vertical", 4, FALSE},
  };
*** ../vim-7.2.222/src/version.c	2009-07-01 20:18:43.000000000 +0200
--- src/version.c	2009-07-09 15:53:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     223,
  /**/

-- 
Q: How many legs does a giraffe have?
A: Eight: two in front, two behind, two on the left and two on the right

 /// 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    ///


--- NEW FILE 7.2.224 ---
To: vim-dev at vim.org
Subject: Patch 7.2.224
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.224
Problem:    Crash when using 'completefunc'. (Ingo Karkat)
Solution:   Disallow entering edit() recursively when doing completion.
Files:	    src/edit.c


*** ../vim-7.2.223/src/edit.c	2009-05-26 11:01:43.000000000 +0200
--- src/edit.c	2009-07-09 18:01:49.000000000 +0200
***************
*** 114,119 ****
--- 114,123 ----
   * FALSE the word to be completed must be located. */
  static int	  compl_started = FALSE;
  
+ /* Set when doing something for completion that may call edit() recursively,
+  * which is not allowed. */
+ static int	  compl_busy = FALSE;
+ 
  static int	  compl_matches = 0;
  static char_u	  *compl_pattern = NULL;
  static int	  compl_direction = FORWARD;
***************
*** 346,352 ****
  
  #ifdef FEAT_INS_EXPAND
      /* Don't allow recursive insert mode when busy with completion. */
!     if (compl_started || pum_visible())
      {
  	EMSG(_(e_secure));
  	return FALSE;
--- 350,356 ----
  
  #ifdef FEAT_INS_EXPAND
      /* Don't allow recursive insert mode when busy with completion. */
!     if (compl_started || compl_busy || pum_visible())
      {
  	EMSG(_(e_secure));
  	return FALSE;
***************
*** 1340,1347 ****
--- 1344,1353 ----
  		goto normalchar;
  
  docomplete:
+ 	    compl_busy = TRUE;
  	    if (ins_complete(c) == FAIL)
  		compl_cont_status = 0;
+ 	    compl_busy = FALSE;
  	    break;
  #endif /* FEAT_INS_EXPAND */
  
***************
*** 3172,3177 ****
--- 3178,3184 ----
  	vim_free(match);
      } while (compl_curr_match != NULL && compl_curr_match != compl_first_match);
      compl_first_match = compl_curr_match = NULL;
+     compl_shown_match = NULL;
  }
  
      static void
*** ../vim-7.2.223/src/version.c	2009-07-09 15:55:34.000000000 +0200
--- src/version.c	2009-07-09 18:14:16.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     224,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
77. The phone company asks you to test drive their new PBX system

 /// 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    ///


--- NEW FILE 7.2.225 ---
To: vim-dev at vim.org
Subject: Patch 7.2.225
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.225
Problem:    When using ":normal" a saved character may be executed.
Solution:   Also store old_char when saving typeahead.
Files:	    src/getchar.c, src/structs.h


*** ../vim-7.2.224/src/getchar.c	2009-02-22 23:42:08.000000000 +0100
--- src/getchar.c	2009-07-09 18:09:13.000000000 +0200
***************
*** 1309,1314 ****
--- 1309,1317 ----
      return OK;
  }
  
+ static int old_char = -1;	/* character put back by vungetc() */
+ static int old_mod_mask;	/* mod_mask for ungotten character */
+ 
  #if defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) || defined(PROTO)
  
  /*
***************
*** 1323,1328 ****
--- 1326,1335 ----
      if (!tp->typebuf_valid)
  	typebuf = tp->save_typebuf;
  
+     tp->old_char = old_char;
+     tp->old_mod_mask = old_mod_mask;
+     old_char = -1;
+ 
      tp->save_stuffbuff = stuffbuff;
      stuffbuff.bh_first.b_next = NULL;
  # ifdef USE_INPUT_BUF
***************
*** 1344,1349 ****
--- 1351,1359 ----
  	typebuf = tp->save_typebuf;
      }
  
+     old_char = tp->old_char;
+     old_mod_mask = tp->old_mod_mask;
+ 
      free_buff(&stuffbuff);
      stuffbuff = tp->save_stuffbuff;
  # ifdef USE_INPUT_BUF
***************
*** 1499,1507 ****
  #define KL_PART_KEY -1		/* keylen value for incomplete key-code */
  #define KL_PART_MAP -2		/* keylen value for incomplete mapping */
  
- static int old_char = -1;	/* character put back by vungetc() */
- static int old_mod_mask;	/* mod_mask for ungotten character */
- 
  /*
   * Get the next input character.
   * Can return a special key or a multi-byte character.
--- 1509,1514 ----
*** ../vim-7.2.224/src/structs.h	2009-06-16 16:01:34.000000000 +0200
--- src/structs.h	2009-07-09 18:09:20.000000000 +0200
***************
*** 882,887 ****
--- 882,889 ----
  {
      typebuf_T		save_typebuf;
      int			typebuf_valid;	    /* TRUE when save_typebuf valid */
+     int			old_char;
+     int			old_mod_mask;
      struct buffheader	save_stuffbuff;
  #ifdef USE_INPUT_BUF
      char_u		*save_inputbuf;
*** ../vim-7.2.224/src/version.c	2009-07-09 18:15:19.000000000 +0200
--- src/version.c	2009-07-09 18:21:56.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     225,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
78. You find yourself dialing IP numbers on the phone.

 /// 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    ///


--- NEW FILE 7.2.226 ---
To: vim-dev at vim.org
Subject: Patch 7.2.226
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.226
Problem:    ml_get error after deleting the last line. (Xavier de Gaye)
Solution:   When adjusting marks a callback may be invoked.  Adjust the cursor
	    position before invoking deleted_lines_mark().
Files:	    src/ex_cmds.c, src/ex_docmd.c, src/if_mzsch.c, src/if_python.c,
	    src/if_perl.xs, src/misc1.c


*** ../vim-7.2.225/src/ex_cmds.c	2009-05-17 13:30:58.000000000 +0200
--- src/ex_cmds.c	2009-07-09 12:56:51.000000000 +0200
***************
*** 4013,4018 ****
--- 4013,4021 ----
  	    break;
  	ml_delete(eap->line1, FALSE);
      }
+ 
+     /* make sure the cursor is not beyond the end of the file now */
+     check_cursor_lnum();
      deleted_lines_mark(eap->line1, (long)(eap->line2 - lnum));
  
      /* ":append" on the line above the deleted lines. */
*** ../vim-7.2.225/src/ex_docmd.c	2009-07-09 15:55:34.000000000 +0200
--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
***************
*** 7845,7854 ****
  		if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK)
  		{
  		    ml_delete(lnum, FALSE);
- 		    deleted_lines_mark(lnum, 1L);
  		    if (curwin->w_cursor.lnum > 1
  					     && curwin->w_cursor.lnum >= lnum)
  			--curwin->w_cursor.lnum;
  		}
  	    }
  	    redraw_curbuf_later(VALID);
--- 7845,7854 ----
  		if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK)
  		{
  		    ml_delete(lnum, FALSE);
  		    if (curwin->w_cursor.lnum > 1
  					     && curwin->w_cursor.lnum >= lnum)
  			--curwin->w_cursor.lnum;
+ 		    deleted_lines_mark(lnum, 1L);
  		}
  	    }
  	    redraw_curbuf_later(VALID);
*** ../vim-7.2.225/src/if_mzsch.c	2009-06-24 17:51:01.000000000 +0200
--- src/if_mzsch.c	2009-07-09 12:59:17.000000000 +0200
***************
*** 2169,2177 ****
  	    curbuf = savebuf;
  	    raise_vim_exn(_("cannot delete line"));
  	}
- 	deleted_lines_mark((linenr_T)n, 1L);
  	if (buf->buf == curwin->w_buffer)
  	    mz_fix_cursor(n, n + 1, -1);
  
  	curbuf = savebuf;
  
--- 2169,2177 ----
  	    curbuf = savebuf;
  	    raise_vim_exn(_("cannot delete line"));
  	}
  	if (buf->buf == curwin->w_buffer)
  	    mz_fix_cursor(n, n + 1, -1);
+ 	deleted_lines_mark((linenr_T)n, 1L);
  
  	curbuf = savebuf;
  
***************
*** 2299,2307 ****
  		    curbuf = savebuf;
  		    raise_vim_exn(_("cannot delete line"));
  		}
- 	    deleted_lines_mark((linenr_T)lo, (long)old_len);
  	    if (buf->buf == curwin->w_buffer)
  		mz_fix_cursor(lo, hi, -old_len);
  	}
  
  	curbuf = savebuf;
--- 2299,2307 ----
  		    curbuf = savebuf;
  		    raise_vim_exn(_("cannot delete line"));
  		}
  	    if (buf->buf == curwin->w_buffer)
  		mz_fix_cursor(lo, hi, -old_len);
+ 	    deleted_lines_mark((linenr_T)lo, (long)old_len);
  	}
  
  	curbuf = savebuf;
*** ../vim-7.2.225/src/if_python.c	2009-05-21 23:25:38.000000000 +0200
--- src/if_python.c	2009-07-09 12:59:45.000000000 +0200
***************
*** 2497,2505 ****
  	    PyErr_SetVim(_("cannot delete line"));
  	else
  	{
- 	    deleted_lines_mark((linenr_T)n, 1L);
  	    if (buf == curwin->w_buffer)
  		py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
  	}
  
  	curbuf = savebuf;
--- 2497,2505 ----
  	    PyErr_SetVim(_("cannot delete line"));
  	else
  	{
  	    if (buf == curwin->w_buffer)
  		py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
+ 	    deleted_lines_mark((linenr_T)n, 1L);
  	}
  
  	curbuf = savebuf;
***************
*** 2596,2605 ****
  		    break;
  		}
  	    }
- 	    deleted_lines_mark((linenr_T)lo, (long)i);
- 
  	    if (buf == curwin->w_buffer)
  		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
  	}
  
  	curbuf = savebuf;
--- 2596,2604 ----
  		    break;
  		}
  	    }
  	    if (buf == curwin->w_buffer)
  		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
+ 	    deleted_lines_mark((linenr_T)lo, (long)i);
  	}
  
  	curbuf = savebuf;
*** ../vim-7.2.225/src/if_perl.xs	2009-06-16 16:01:34.000000000 +0200
--- src/if_perl.xs	2009-07-09 13:02:16.000000000 +0200
***************
*** 1233,1241 ****
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
- 			if (aco.save_curbuf == curbuf)
- 			    check_cursor();
  		    }
  
  		    /* restore curwin/curbuf and a few other things */
--- 1235,1242 ----
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
+ 			check_cursor();
  			deleted_lines_mark(lnum, 1L);
  		    }
  
  		    /* restore curwin/curbuf and a few other things */
*** ../vim-7.2.225/src/misc1.c	2009-06-24 16:25:23.000000000 +0200
--- src/misc1.c	2009-07-09 13:00:59.000000000 +0200
***************
*** 2345,2356 ****
      int		undo;		/* if TRUE, prepare for undo */
  {
      long	n;
  
      if (nlines <= 0)
  	return;
  
      /* save the deleted lines for undo */
!     if (undo && u_savedel(curwin->w_cursor.lnum, nlines) == FAIL)
  	return;
  
      for (n = 0; n < nlines; )
--- 2345,2357 ----
      int		undo;		/* if TRUE, prepare for undo */
  {
      long	n;
+     linenr_T	first = curwin->w_cursor.lnum;
  
      if (nlines <= 0)
  	return;
  
      /* save the deleted lines for undo */
!     if (undo && u_savedel(first, nlines) == FAIL)
  	return;
  
      for (n = 0; n < nlines; )
***************
*** 2358,2375 ****
  	if (curbuf->b_ml.ml_flags & ML_EMPTY)	    /* nothing to delete */
  	    break;
  
! 	ml_delete(curwin->w_cursor.lnum, TRUE);
  	++n;
  
  	/* If we delete the last line in the file, stop */
! 	if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
  	    break;
      }
-     /* adjust marks, mark the buffer as changed and prepare for displaying */
-     deleted_lines_mark(curwin->w_cursor.lnum, n);
  
      curwin->w_cursor.col = 0;
      check_cursor_lnum();
  }
  
      int
--- 2359,2379 ----
  	if (curbuf->b_ml.ml_flags & ML_EMPTY)	    /* nothing to delete */
  	    break;
  
! 	ml_delete(first, TRUE);
  	++n;
  
  	/* If we delete the last line in the file, stop */
! 	if (first > curbuf->b_ml.ml_line_count)
  	    break;
      }
  
+     /* Correct the cursor position before calling deleted_lines_mark(), it may
+      * trigger a callback to display the cursor. */
      curwin->w_cursor.col = 0;
      check_cursor_lnum();
+ 
+     /* adjust marks, mark the buffer as changed and prepare for displaying */
+     deleted_lines_mark(first, n);
  }
  
      int
***************
*** 2621,2626 ****
--- 2625,2632 ----
  
  /*
   * Like deleted_lines(), but adjust marks first.
+  * Make sure the cursor is on a valid line before calling, a GUI callback may
+  * be triggered to display the cursor.
   */
      void
  deleted_lines_mark(lnum, count)
*** ../vim-7.2.225/src/version.c	2009-07-09 18:24:24.000000000 +0200
--- src/version.c	2009-07-09 20:01:16.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     226,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
80. At parties, you introduce your spouse as your "service provider."

 /// 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    ///


--- NEW FILE 7.2.227 ---
To: vim-dev at vim.org
Subject: Patch 7.2.227
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.227
Problem:    When using ":cd" in a script there is no way to track this.
Solution:   Display the directory when 'verbose' is 5 or higher.
Files:	    src/ex_docmd.c


*** ../vim-7.2.226/src/ex_docmd.c	2009-07-09 20:06:30.000000000 +0200
--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
***************
*** 7964,7970 ****
  	    shorten_fnames(TRUE);
  
  	    /* Echo the new current directory if the command was typed. */
! 	    if (KeyTyped)
  		ex_pwd(eap);
  	}
  	vim_free(tofree);
--- 7964,7970 ----
  	    shorten_fnames(TRUE);
  
  	    /* Echo the new current directory if the command was typed. */
! 	    if (KeyTyped || p_verbose >= 5)
  		ex_pwd(eap);
  	}
  	vim_free(tofree);
*** ../vim-7.2.226/src/version.c	2009-07-09 20:06:30.000000000 +0200
--- src/version.c	2009-07-09 20:13:13.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     227,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
83. Batteries in the TV remote now last for months.

 /// 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    ///


--- NEW FILE 7.2.228 ---
To: vim-dev at vim.org
Subject: Patch 7.2.228
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.228
Problem:    Cscope is limited to 8 connections.
Solution:   Allocated the connection array to handle any number of
	    connections. (Dominique Pelle)
Files:	    runtime/doc/if_cscop.txt, src/if_cscope.h, src/if_cscope.c


*** ../vim-7.2.227/runtime/doc/if_cscop.txt	2009-03-18 14:30:46.000000000 +0100
--- runtime/doc/if_cscop.txt	2009-07-09 15:40:48.000000000 +0200
***************
*** 355,367 ****
  The DJGPP-built version from http://cscope.sourceforge.net is known to not
  work with Vim.
  
! There are a couple of hard-coded limitations:
! 
!     1. The maximum number of cscope connections allowed is 8.  Do you
!     really need more?
! 
!     2. Doing a |:tjump| when |:cstag| searches the tag files is not
!     configurable (e.g., you can't do a tselect instead).
  
  ==============================================================================
  6. Suggested usage					*cscope-suggestions*
--- 355,362 ----
  The DJGPP-built version from http://cscope.sourceforge.net is known to not
  work with Vim.
  
! Hard-coded limitation: doing a |:tjump| when |:cstag| searches the tag files
! is not configurable (e.g., you can't do a tselect instead).
  
  ==============================================================================
  6. Suggested usage					*cscope-suggestions*
*** ../vim-7.2.227/src/if_cscope.h	2008-08-25 04:35:13.000000000 +0200
--- src/if_cscope.h	2009-07-09 15:39:32.000000000 +0200
***************
*** 25,31 ****
  
  #define CSCOPE_SUCCESS		0
  #define CSCOPE_FAILURE		-1
- #define CSCOPE_MAX_CONNECTIONS	8   /* you actually need more? */
  
  #define	CSCOPE_DBFILE		"cscope.out"
  #define	CSCOPE_PROMPT		">> "
--- 25,30 ----
*** ../vim-7.2.227/src/if_cscope.c	2009-05-16 17:29:37.000000000 +0200
--- src/if_cscope.c	2009-07-09 15:39:32.000000000 +0200
***************
*** 46,52 ****
  static int	    cs_find __ARGS((exarg_T *eap));
  static int	    cs_find_common __ARGS((char *opt, char *pat, int, int, int));
  static int	    cs_help __ARGS((exarg_T *eap));
- static void	    cs_init __ARGS((void));
  static void	    clear_csinfo __ARGS((int i));
  static int	    cs_insert_filelist __ARGS((char *, char *, char *,
  			struct stat *));
--- 46,51 ----
***************
*** 66,72 ****
  static int	    cs_show __ARGS((exarg_T *eap));
  
  
! static csinfo_T	    csinfo[CSCOPE_MAX_CONNECTIONS];
  static int	    eap_arg_len;    /* length of eap->arg, set in
  				       cs_lookup_cmd() */
  static cscmd_T	    cs_cmds[] =
--- 65,74 ----
  static int	    cs_show __ARGS((exarg_T *eap));
  
  
! static csinfo_T *   csinfo = NULL;
! static int	    csinfo_size = 0;	/* number of items allocated in
! 					   csinfo[] */
! 
  static int	    eap_arg_len;    /* length of eap->arg, set in
  				       cs_lookup_cmd() */
  static cscmd_T	    cs_cmds[] =
***************
*** 144,166 ****
  	}
      case EXP_CSCOPE_KILL:
  	{
! 	    static char_u	connection[2];
  
  	    /* ":cscope kill" accepts connection numbers or partial names of
  	     * the pathname of the cscope database as argument.  Only complete
  	     * with connection numbers. -1 can also be used to kill all
  	     * connections. */
! 	    for (i = 0, current_idx = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	    {
  		if (csinfo[i].fname == NULL)
  		    continue;
  		if (current_idx++ == idx)
  		{
! 		    /* Connection number fits in one character since
! 		     * CSCOPE_MAX_CONNECTIONS is < 10 */
! 		    connection[0] = i + '0';
! 		    connection[1] = NUL;
! 		    return connection;
  		}
  	    }
  	    return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL;
--- 146,165 ----
  	}
      case EXP_CSCOPE_KILL:
  	{
! 	    static char	connection[5];
  
  	    /* ":cscope kill" accepts connection numbers or partial names of
  	     * the pathname of the cscope database as argument.  Only complete
  	     * with connection numbers. -1 can also be used to kill all
  	     * connections. */
! 	    for (i = 0, current_idx = 0; i < csinfo_size; i++)
  	    {
  		if (csinfo[i].fname == NULL)
  		    continue;
  		if (current_idx++ == idx)
  		{
! 		    vim_snprintf(connection, sizeof(connection), "%d", i);
! 		    return (char_u *)connection;
  		}
  	    }
  	    return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL;
***************
*** 223,229 ****
  {
      cscmd_T *cmdp;
  
-     cs_init();
      if ((cmdp = cs_lookup_cmd(eap)) == NULL)
      {
  	cs_help(eap);
--- 222,227 ----
***************
*** 284,291 ****
  {
      int ret = FALSE;
  
-     cs_init();
- 
      if (*eap->arg == NUL)
      {
  	(void)EMSG(_("E562: Usage: cstag <ident>"));
--- 282,287 ----
***************
*** 441,447 ****
      if (num < 0 || num > 4 || (num > 0 && !dbpath))
  	return FALSE;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (!csinfo[i].fname)
  	    continue;
--- 437,443 ----
      if (num < 0 || num > 4 || (num > 0 && !dbpath))
  	return FALSE;
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (!csinfo[i].fname)
  	    continue;
***************
*** 684,690 ****
      short i;
      short cnt = 0;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (csinfo[i].fname != NULL)
  	    cnt++;
--- 680,686 ----
      short i;
      short cnt = 0;
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (csinfo[i].fname != NULL)
  	    cnt++;
***************
*** 1112,1118 ****
  {
      int i;
      char *cmd;
!     int nummatches[CSCOPE_MAX_CONNECTIONS], totmatches;
  #ifdef FEAT_QUICKFIX
      char cmdletter;
      char *qfpos;
--- 1108,1115 ----
  {
      int i;
      char *cmd;
!     int *nummatches;
!     int totmatches;
  #ifdef FEAT_QUICKFIX
      char cmdletter;
      char *qfpos;
***************
*** 1123,1135 ****
      if (cmd == NULL)
  	return FALSE;
  
      /* send query to all open connections, then count the total number
       * of matches so we can alloc matchesp all in one swell foop
       */
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	nummatches[i] = 0;
      totmatches = 0;
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL)
  	    continue;
--- 1120,1136 ----
      if (cmd == NULL)
  	return FALSE;
  
+     nummatches = (int *)alloc(sizeof(int)*csinfo_size);
+     if (nummatches == NULL)
+ 	return FALSE;
+ 
      /* send query to all open connections, then count the total number
       * of matches so we can alloc matchesp all in one swell foop
       */
!     for (i = 0; i < csinfo_size; i++)
  	nummatches[i] = 0;
      totmatches = 0;
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL)
  	    continue;
***************
*** 1154,1160 ****
--- 1155,1164 ----
  	char *buf;
  
  	if (!verbose)
+ 	{
+ 	    vim_free(nummatches);
  	    return FALSE;
+ 	}
  
  	buf = (char *)alloc((unsigned)(strlen(opt) + strlen(pat) + strlen(nf)));
  	if (buf == NULL)
***************
*** 1165,1170 ****
--- 1169,1175 ----
  	    (void)EMSG(buf);
  	    vim_free(buf);
  	}
+ 	vim_free(nummatches);
  	return FALSE;
      }
  
***************
*** 1217,1222 ****
--- 1222,1228 ----
  		(void)EMSG(buf);
  		vim_free(buf);
  	    }
+ 	    vim_free(nummatches);
  	    return FALSE;
  	}
      }
***************
*** 1264,1269 ****
--- 1270,1276 ----
  	}
  	mch_remove(tmp);
  	vim_free(tmp);
+ 	vim_free(nummatches);
  	return TRUE;
      }
      else
***************
*** 1275,1280 ****
--- 1282,1288 ----
  	/* read output */
  	cs_fill_results((char *)pat, totmatches, nummatches, &matches,
  							 &contexts, &matched);
+ 	vim_free(nummatches);
  	if (matches == NULL)
  	    return FALSE;
  
***************
*** 1328,1353 ****
  } /* cs_help */
  
  
- /*
-  * PRIVATE: cs_init
-  *
-  * initialize cscope structure if not already
-  */
-     static void
- cs_init()
- {
-     short i;
-     static int init_already = FALSE;
- 
-     if (init_already)
- 	return;
- 
-     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
- 	clear_csinfo(i);
- 
-     init_already = TRUE;
- } /* cs_init */
- 
      static void
  clear_csinfo(i)
      int	    i;
--- 1336,1341 ----
***************
*** 1444,1450 ****
  #endif
  
      i = -1; /* can be set to the index of an empty item in csinfo */
!     for (j = 0; j < CSCOPE_MAX_CONNECTIONS; j++)
      {
  	if (csinfo[j].fname != NULL
  #if defined(UNIX)
--- 1432,1438 ----
  #endif
  
      i = -1; /* can be set to the index of an empty item in csinfo */
!     for (j = 0; j < csinfo_size; j++)
      {
  	if (csinfo[j].fname != NULL
  #if defined(UNIX)
***************
*** 1471,1479 ****
  
      if (i == -1)
      {
! 	if (p_csverbose)
! 	    (void)EMSG(_("E569: maximum number of cscope connections reached"));
! 	return -1;
      }
  
      if ((csinfo[i].fname = (char *)alloc((unsigned)strlen(fname)+1)) == NULL)
--- 1459,1483 ----
  
      if (i == -1)
      {
! 	i = csinfo_size;
! 	if (csinfo_size == 0)
! 	{
! 	    /* First time allocation: allocate only 1 connection. It should
! 	     * be enough for most users.  If more is needed, csinfo will be
! 	     * reallocated. */
! 	    csinfo_size = 1;
! 	    csinfo = (csinfo_T *)alloc_clear(sizeof(csinfo_T));
! 	}
! 	else
! 	{
! 	    /* Reallocate space for more connections. */
! 	    csinfo_size *= 2;
! 	    csinfo = vim_realloc(csinfo, sizeof(csinfo_T)*csinfo_size);
! 	}
! 	if (csinfo == NULL)
! 	    return -1;
! 	for (j = csinfo_size/2; j < csinfo_size; j++)
! 	    clear_csinfo(j);
      }
  
      if ((csinfo[i].fname = (char *)alloc((unsigned)strlen(fname)+1)) == NULL)
***************
*** 1580,1594 ****
  	/* It must be part of a name.  We will try to find a match
  	 * within all the names in the csinfo data structure
  	 */
! 	for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	{
  	    if (csinfo[i].fname != NULL && strstr(csinfo[i].fname, stok))
  		break;
  	}
      }
  
!     if ((i >= CSCOPE_MAX_CONNECTIONS || i < -1 || csinfo[i].fname == NULL)
! 	    && i != -1)
      {
  	if (p_csverbose)
  	    (void)EMSG2(_("E261: cscope connection %s not found"), stok);
--- 1584,1597 ----
  	/* It must be part of a name.  We will try to find a match
  	 * within all the names in the csinfo data structure
  	 */
! 	for (i = 0; i < csinfo_size; i++)
  	{
  	    if (csinfo[i].fname != NULL && strstr(csinfo[i].fname, stok))
  		break;
  	}
      }
  
!     if ((i != -1) && (i >= csinfo_size || i < -1 || csinfo[i].fname == NULL))
      {
  	if (p_csverbose)
  	    (void)EMSG2(_("E261: cscope connection %s not found"), stok);
***************
*** 1597,1603 ****
      {
  	if (i == -1)
  	{
! 	    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	    {
  		if (csinfo[i].fname)
  		    cs_kill_execute(i, csinfo[i].fname);
--- 1600,1606 ----
      {
  	if (i == -1)
  	{
! 	    for (i = 0; i < csinfo_size; i++)
  	    {
  		if (csinfo[i].fname)
  		    cs_kill_execute(i, csinfo[i].fname);
***************
*** 1857,1863 ****
      if (buf == NULL)
  	return;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (nummatches_a[i] < 1)
  	    continue;
--- 1860,1866 ----
      if (buf == NULL)
  	return;
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (nummatches_a[i] < 1)
  	    continue;
***************
*** 1929,1935 ****
      if ((cntxts = (char **)alloc(sizeof(char *) * totmatches)) == NULL)
  	goto parse_out;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (nummatches_a[i] < 1)
  	    continue;
--- 1932,1938 ----
      if ((cntxts = (char **)alloc(sizeof(char *) * totmatches)) == NULL)
  	goto parse_out;
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (nummatches_a[i] < 1)
  	    continue;
***************
*** 2383,2392 ****
      int	i;
      char buf[20]; /* for sprintf " (#%d)" */
  
      /* malloc our db and ppath list */
!     dblist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
!     pplist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
!     fllist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
      if (dblist == NULL || pplist == NULL || fllist == NULL)
      {
  	vim_free(dblist);
--- 2386,2398 ----
      int	i;
      char buf[20]; /* for sprintf " (#%d)" */
  
+     if (csinfo_size == 0)
+ 	return CSCOPE_SUCCESS;
+ 
      /* malloc our db and ppath list */
!     dblist = (char **)alloc(csinfo_size * sizeof(char *));
!     pplist = (char **)alloc(csinfo_size * sizeof(char *));
!     fllist = (char **)alloc(csinfo_size * sizeof(char *));
      if (dblist == NULL || pplist == NULL || fllist == NULL)
      {
  	vim_free(dblist);
***************
*** 2395,2401 ****
  	return CSCOPE_FAILURE;
      }
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	dblist[i] = csinfo[i].fname;
  	pplist[i] = csinfo[i].ppath;
--- 2401,2407 ----
  	return CSCOPE_FAILURE;
      }
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	dblist[i] = csinfo[i].fname;
  	pplist[i] = csinfo[i].ppath;
***************
*** 2405,2411 ****
      }
  
      /* rebuild the cscope connection list */
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (dblist[i] != NULL)
  	{
--- 2411,2417 ----
      }
  
      /* rebuild the cscope connection list */
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (dblist[i] != NULL)
  	{
***************
*** 2502,2508 ****
  	MSG_PUTS_ATTR(
  	    _(" # pid    database name                       prepend path\n"),
  	    hl_attr(HLF_T));
! 	for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	{
  	    if (csinfo[i].fname == NULL)
  		continue;
--- 2508,2514 ----
  	MSG_PUTS_ATTR(
  	    _(" # pid    database name                       prepend path\n"),
  	    hl_attr(HLF_T));
! 	for (i = 0; i < csinfo_size; i++)
  	{
  	    if (csinfo[i].fname == NULL)
  		continue;
***************
*** 2531,2538 ****
  {
      int i;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	cs_release_csp(i, TRUE);
  }
  
  #endif	/* FEAT_CSCOPE */
--- 2537,2546 ----
  {
      int i;
  
!     for (i = 0; i < csinfo_size; i++)
  	cs_release_csp(i, TRUE);
+     vim_free(csinfo);
+     csinfo_size = 0;
  }
  
  #endif	/* FEAT_CSCOPE */
*** ../vim-7.2.227/src/version.c	2009-07-09 20:13:59.000000000 +0200
--- src/version.c	2009-07-09 21:21:48.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     228,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
84. Books in your bookcase bear the names Bongo, WinSock and Inside OLE

 /// 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    ///


--- NEW FILE 7.2.229 ---
To: vim-dev at vim.org
Subject: Patch 7.2.229
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.229
Problem:    Warning for shadowed variable.
Solution:   Rename "wait" to "wait_time".
Files:	    src/os_unix.c


*** ../vim-7.2.228/src/os_unix.c	2009-06-16 15:12:11.000000000 +0200
--- src/os_unix.c	2009-07-09 16:24:14.000000000 +0200
***************
*** 1138,1147 ****
       * to happen).
       */
      {
! 	long wait;
! 	for (wait = 0; !sigcont_received && wait <= 3L; wait++)
  	    /* Loop is not entered most of the time */
! 	    mch_delay(wait, FALSE);
      }
  # endif
  
--- 1138,1147 ----
       * to happen).
       */
      {
! 	long wait_time;
! 	for (wait_time = 0; !sigcont_received && wait_time <= 3L; wait_time++)
  	    /* Loop is not entered most of the time */
! 	    mch_delay(wait_time, FALSE);
      }
  # endif
  
*** ../vim-7.2.228/src/version.c	2009-07-09 21:22:36.000000000 +0200
--- src/version.c	2009-07-14 12:18:21.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     229,
  /**/

-- 
>From "know your smileys":
 :-)	Funny
 |-)	Funny Oriental
 (-:	Funny Australian

 /// 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    ///


--- NEW FILE 7.2.230 ---
To: vim-dev at vim.org
Subject: Patch 7.2.230
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.230
Problem:    A few old lint-style ARGUSED comments.
Solution:   Change to the new UNUSED style.
Files:	    src/getchar.c


*** ../vim-7.2.229/src/getchar.c	2009-07-09 18:24:24.000000000 +0200
--- src/getchar.c	2009-07-09 18:09:13.000000000 +0200
***************
*** 3708,3718 ****
   * Clear all mappings or abbreviations.
   * 'abbr' should be FALSE for mappings, TRUE for abbreviations.
   */
- /*ARGSUSED*/
      void
  map_clear(cmdp, arg, forceit, abbr)
      char_u	*cmdp;
!     char_u	*arg;
      int		forceit;
      int		abbr;
  {
--- 3708,3717 ----
   * Clear all mappings or abbreviations.
   * 'abbr' should be FALSE for mappings, TRUE for abbreviations.
   */
      void
  map_clear(cmdp, arg, forceit, abbr)
      char_u	*cmdp;
!     char_u	*arg UNUSED;
      int		forceit;
      int		abbr;
  {
***************
*** 3741,3753 ****
  /*
   * Clear all mappings in "mode".
   */
- /*ARGSUSED*/
      void
  map_clear_int(buf, mode, local, abbr)
!     buf_T	*buf;	    /* buffer for local mappings */
!     int		mode;	    /* mode in which to delete */
!     int		local;	    /* TRUE for buffer-local mappings */
!     int		abbr;	    /* TRUE for abbreviations */
  {
      mapblock_T	*mp, **mpp;
      int		hash;
--- 3740,3751 ----
  /*
   * Clear all mappings in "mode".
   */
      void
  map_clear_int(buf, mode, local, abbr)
!     buf_T	*buf UNUSED;	/* buffer for local mappings */
!     int		mode;		/* mode in which to delete */
!     int		local UNUSED;	/* TRUE for buffer-local mappings */
!     int		abbr;		/* TRUE for abbreviations */
  {
      mapblock_T	*mp, **mpp;
      int		hash;
*** ../vim-7.2.229/src/version.c	2009-07-14 12:20:28.000000000 +0200
--- src/version.c	2009-07-14 13:44:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     230,
  /**/

-- 
>From "know your smileys":
 :~)	A man with a tape recorder up his nose

 /// 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    ///


--- NEW FILE 7.2.231 ---
To: vim-dev at vim.org
Subject: Patch 7.2.231
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.231
Problem:    Warning for unreacheable code.
Solution:   Add #ifdef.
Files:	    src/if_perl.xs


*** ../vim-7.2.230/src/if_perl.xs	2009-07-09 20:06:30.000000000 +0200
--- src/if_perl.xs	2009-07-09 13:02:16.000000000 +0200
***************
*** 720,728 ****
--- 720,730 ----
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
+ # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
  	if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
+ # endif
  	{
  	    PUSHMARK(SP);
  	    XPUSHs(safe);
*** ../vim-7.2.230/src/version.c	2009-07-14 13:44:43.000000000 +0200
--- src/version.c	2009-07-14 16:04:07.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     231,
  /**/

-- 
>From "know your smileys":
 ~#:-(	I just washed my hair, and I can't do nuthin' with it.

 /// 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    ///


--- NEW FILE 7.2.232 ---
To: vim-dev at vim.org
Subject: Patch 7.2.232
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.232
Problem:    Cannot debug problems with being in a wrong directory.
Solution:   When 'verbose' is 5 or higher report directory changes.
Files:	    src/os_unix.c, src/os_unix.h, src/proto/os_unix.pro


*** ../vim-7.2.231/src/os_unix.c	2009-07-14 12:20:28.000000000 +0200
--- src/os_unix.c	2009-07-14 17:13:15.000000000 +0200
***************
*** 319,324 ****
--- 319,341 ----
      {-1,	    "Unknown!", FALSE}
  };
  
+     int
+ mch_chdir(path)
+     char *path;
+ {
+     if (p_verbose >= 5)
+     {
+ 	verbose_enter();
+ 	smsg((char_u *)"chdir(%s)", path);
+ 	verbose_leave();
+     }
+ # ifdef VMS
+     return chdir(vms_fixfilename(path));
+ # else
+     return chdir(path);
+ # endif
+ }
+ 
  /*
   * Write s[len] to the screen.
   */
***************
*** 2424,2429 ****
--- 2441,2452 ----
  #ifdef HAVE_FCHDIR
  	    if (fd >= 0)
  	    {
+ 		if (p_verbose >= 5)
+ 		{
+ 		    verbose_enter();
+ 		    MSG("fchdir() to previous dir");
+ 		    verbose_leave();
+ 		}
  		l = fchdir(fd);
  		close(fd);
  	    }
*** ../vim-7.2.231/src/os_unix.h	2009-05-16 16:36:25.000000000 +0200
--- src/os_unix.h	2009-07-14 16:55:05.000000000 +0200
***************
*** 482,492 ****
  # else
  int mch_rename __ARGS((const char *src, const char *dest));
  # endif
- # ifdef VMS
- #  define mch_chdir(s) chdir(vms_fixfilename(s))
- # else
- #  define mch_chdir(s) chdir(s)
- # endif
  # ifndef VMS
  #  ifdef __MVS__
    /* on OS390 Unix getenv() doesn't return a pointer to persistent
--- 482,487 ----
*** ../vim-7.2.231/src/proto/os_unix.pro	2008-06-24 23:58:57.000000000 +0200
--- src/proto/os_unix.pro	2009-07-14 16:58:08.000000000 +0200
***************
*** 1,4 ****
--- 1,5 ----
  /* os_unix.c */
+ int mch_chdir __ARGS((char *path));
  void mch_write __ARGS((char_u *s, int len));
  int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
  int mch_char_avail __ARGS((void));
*** ../vim-7.2.231/src/version.c	2009-07-14 16:05:14.000000000 +0200
--- src/version.c	2009-07-14 17:37:15.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     232,
  /**/

-- 
>From "know your smileys":
 O:-)	Saint

 /// 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    ///


--- NEW FILE 7.2.233 ---
To: vim-dev at vim.org
Subject: Patch 7.2.233 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.233 (extra part of 7.2.232)
Problem:    Cannot debug problems with being in a wrong directory.
Solution:   When 'verbose' is 5 or higher report directory changes.
Files:	    src/os_msdos.c, src/os_mswin.c, src/os_riscos.c, src/os_mac.h


*** ../vim-7.2.232/src/os_msdos.c	2008-06-24 23:30:18.000000000 +0200
--- src/os_msdos.c	2009-07-14 16:50:57.000000000 +0200
***************
*** 2039,2044 ****
--- 2039,2050 ----
  {
      if (path[0] == NUL)		    /* just checking... */
  	return 0;
+     if (p_verbose >= 5)
+     {
+ 	verbose_enter();
+ 	smsg((char_u *)"chdir(%s)", path);
+ 	verbose_leave();
+     }
      if (path[1] == ':')		    /* has a drive name */
      {
  	if (change_drive(TOLOWER_ASC(path[0]) - 'a' + 1))
*** ../vim-7.2.232/src/os_mswin.c	2009-05-14 22:00:37.000000000 +0200
--- src/os_mswin.c	2009-07-14 16:53:03.000000000 +0200
***************
*** 653,658 ****
--- 653,664 ----
      if (path[0] == NUL)		/* just checking... */
  	return -1;
  
+     if (p_verbose >= 5)
+     {
+ 	verbose_enter();
+ 	smsg((char_u *)"chdir(%s)", path);
+ 	verbose_leave();
+     }
      if (isalpha(path[0]) && path[1] == ':')	/* has a drive name */
      {
  	/* If we can change to the drive, skip that part of the path.  If we
*** ../vim-7.2.232/src/os_riscos.c	2006-03-07 23:25:50.000000000 +0100
--- src/os_riscos.c	2009-07-14 16:53:35.000000000 +0200
***************
*** 1203,1208 ****
--- 1203,1214 ----
      int	    retval;
      char_u  *new_dir;
  
+     if (p_verbose >= 5)
+     {
+ 	verbose_enter();
+ 	smsg((char_u *)"chdir(%s)", dir);
+ 	verbose_leave();
+     }
      length = strlen(dir);
      if (dir[length - 1] != '.')
  	return chdir(dir);	    /* No trailing dots - nothing to do. */
*** ../vim-7.2.232/src/os_mac.h	2009-06-24 16:41:01.000000000 +0200
--- src/os_mac.h	2009-07-14 16:54:33.000000000 +0200
***************
*** 291,297 ****
  #  define HAVE_SETENV
  #  define HAVE_RENAME
  # endif
- # define mch_chdir(s) chdir(s)
  #endif
  
  #if defined(MACOS_X) && !defined(HAVE_CONFIG_H)
--- 291,296 ----
*** ../vim-7.2.232/src/version.c	2009-07-14 17:38:51.000000000 +0200
--- src/version.c	2009-07-14 18:35:30.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     233,
  /**/

-- 
>From "know your smileys":
 :-O>-o   Smiley American tourist (note big mouth and camera)

 /// 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    ///


--- NEW FILE 7.2.234 ---
To: vim-dev at vim.org
Subject: Patch 7.2.234
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.234
Problem:    It is not possible to ignore file names without a suffix.
Solution:   Use an empty entry in 'suffixes' for file names without a dot.
Files:	    runtime/doc/cmdline.txt, src/misc1.c


*** ../vim-7.2.233/runtime/doc/cmdline.txt	2008-11-09 13:43:25.000000000 +0100
--- runtime/doc/cmdline.txt	2009-07-14 13:35:56.000000000 +0200
***************
*** 441,453 ****
  those files with an extension that is in the 'suffixes' option are ignored.
  The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
  in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
! It is impossible to ignore suffixes with two dots.  Examples:
  
    pattern:	files:				match:	~
     test*	test.c test.h test.o		test.c
     test*	test.h test.o			test.h and test.o
     test*	test.i test.h test.c		test.i and test.c
  
  If there is more than one matching file (after ignoring the ones matching
  the 'suffixes' option) the first file name is inserted.  You can see that
  there is only one match when you type 'wildchar' twice and the completed
--- 439,458 ----
  those files with an extension that is in the 'suffixes' option are ignored.
  The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
  in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
! 
! An empty entry, two consecutive commas, match a file name that does not
! contain a ".", thus has no suffix.  This is useful to ignore "prog" and prefer
! "prog.c".
! 
! Examples:
  
    pattern:	files:				match:	~
     test*	test.c test.h test.o		test.c
     test*	test.h test.o			test.h and test.o
     test*	test.i test.h test.c		test.i and test.c
  
+ It is impossible to ignore suffixes with two dots.
+ 
  If there is more than one matching file (after ignoring the ones matching
  the 'suffixes' option) the first file name is inserted.  You can see that
  there is only one match when you type 'wildchar' twice and the completed
*** ../vim-7.2.233/src/misc1.c	2009-07-09 20:06:30.000000000 +0200
--- src/misc1.c	2009-07-14 15:51:55.000000000 +0200
***************
*** 8533,8543 ****
      for (setsuf = p_su; *setsuf; )
      {
  	setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,");
! 	if (fnamelen >= setsuflen
! 		&& fnamencmp(suf_buf, fname + fnamelen - setsuflen,
! 					      (size_t)setsuflen) == 0)
! 	    break;
! 	setsuflen = 0;
      }
      return (setsuflen != 0);
  }
--- 8534,8558 ----
      for (setsuf = p_su; *setsuf; )
      {
  	setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,");
! 	if (setsuflen == 0)
! 	{
! 	    char_u *tail = gettail(fname);
! 
! 	    /* empty entry: match name without a '.' */
! 	    if (vim_strchr(tail, '.') == NULL)
! 	    {
! 		setsuflen = 1;
! 		break;
! 	    }
! 	}
! 	else
! 	{
! 	    if (fnamelen >= setsuflen
! 		    && fnamencmp(suf_buf, fname + fnamelen - setsuflen,
! 						  (size_t)setsuflen) == 0)
! 		break;
! 	    setsuflen = 0;
! 	}
      }
      return (setsuflen != 0);
  }
*** ../vim-7.2.233/src/version.c	2009-07-14 18:38:09.000000000 +0200
--- src/version.c	2009-07-14 21:38:30.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     234,
  /**/

-- 
How many light bulbs does it take to change a person?

 /// 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    ///


--- NEW FILE 7.2.235 ---
To: vim-dev at vim.org
Subject: Patch 7.2.235
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.235
Problem:    Using CTRL-O z= in Insert mode has a delay before redrawing.
Solution:   Reset msg_didout and msg_scroll.
Files:	    src/misc1.c, src/spell.c


*** ../vim-7.2.234/src/misc1.c	2009-07-14 21:40:30.000000000 +0200
--- src/misc1.c	2009-07-14 15:51:55.000000000 +0200
***************
*** 3276,3281 ****
--- 3276,3282 ----
  	cmdline_row = msg_row - 1;
  	need_wait_return = FALSE;
  	msg_didany = FALSE;
+ 	msg_didout = FALSE;
      }
      else
  	cmdline_row = save_cmdline_row;
*** ../vim-7.2.234/src/spell.c	2009-05-17 13:30:58.000000000 +0200
--- src/spell.c	2009-07-14 15:57:55.000000000 +0200
***************
*** 10252,10257 ****
--- 10252,10258 ----
      int		limit;
      int		selected = count;
      int		badlen = 0;
+     int		msg_scroll_save = msg_scroll;
  
      if (no_spell_checking(curwin))
  	return;
***************
*** 10416,10422 ****
  	selected = prompt_for_number(&mouse_used);
  	if (mouse_used)
  	    selected -= lines_left;
! 	lines_left = Rows;	/* avoid more prompt */
      }
  
      if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
--- 10417,10425 ----
  	selected = prompt_for_number(&mouse_used);
  	if (mouse_used)
  	    selected -= lines_left;
! 	lines_left = Rows;		/* avoid more prompt */
! 	/* don't delay for 'smd' in normal_cmd() */
! 	msg_scroll = msg_scroll_save;
      }
  
      if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
***************
*** 10441,10447 ****
  	}
  
  	/* Replace the word. */
! 	p = alloc((unsigned)STRLEN(line) - stp->st_orglen + stp->st_wordlen + 1);
  	if (p != NULL)
  	{
  	    c = (int)(sug.su_badptr - line);
--- 10444,10451 ----
  	}
  
  	/* Replace the word. */
! 	p = alloc((unsigned)STRLEN(line) - stp->st_orglen
! 						       + stp->st_wordlen + 1);
  	if (p != NULL)
  	{
  	    c = (int)(sug.su_badptr - line);
*** ../vim-7.2.234/src/version.c	2009-07-14 21:40:30.000000000 +0200
--- src/version.c	2009-07-22 11:00:34.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     235,
  /**/

-- 
>From "know your smileys":
 |-(	Contact lenses, but has lost them

 /// 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    ///


--- NEW FILE 7.2.236 ---
To: vim-dev at vim.org
Subject: Patch 7.2.236
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.236
Problem:    Mac: Compiling with Ruby doesn't always work.
Solution:   In configure filter out the --arch argument (Bjorn Winckler)
Files:	    src/configure.in, src/auto/configure


*** ../vim-7.2.235/src/configure.in	2009-05-26 22:58:43.000000000 +0200
--- src/configure.in	2009-07-14 16:09:34.000000000 +0200
***************
*** 984,990 ****
  	fi
  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
  	if test "X$rubyldflags" != "X"; then
! 	  LDFLAGS="$rubyldflags $LDFLAGS"
  	fi
  	RUBY_SRC="if_ruby.c"
  	RUBY_OBJ="objects/if_ruby.o"
--- 984,996 ----
  	fi
  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
  	if test "X$rubyldflags" != "X"; then
! 	  dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only
! 	  dnl be included if requested by passing --with-mac-arch to
! 	  dnl configure, so strip these flags first (if present)
! 	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
! 	  if test "X$rubyldflags" != "X"; then
! 	    LDFLAGS="$rubyldflags $LDFLAGS"
! 	  fi
  	fi
  	RUBY_SRC="if_ruby.c"
  	RUBY_OBJ="objects/if_ruby.o"
*** ../vim-7.2.235/src/auto/configure	2009-05-26 22:58:43.000000000 +0200
--- src/auto/configure	2009-07-14 16:11:58.000000000 +0200
***************
*** 5780,5786 ****
  	fi
  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
  	if test "X$rubyldflags" != "X"; then
! 	  LDFLAGS="$rubyldflags $LDFLAGS"
  	fi
  	RUBY_SRC="if_ruby.c"
  	RUBY_OBJ="objects/if_ruby.o"
--- 5780,5789 ----
  	fi
  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
  	if test "X$rubyldflags" != "X"; then
! 	  	  	  	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
! 	  if test "X$rubyldflags" != "X"; then
! 	    LDFLAGS="$rubyldflags $LDFLAGS"
! 	  fi
  	fi
  	RUBY_SRC="if_ruby.c"
  	RUBY_OBJ="objects/if_ruby.o"
*** ../vim-7.2.235/src/version.c	2009-07-22 11:03:38.000000000 +0200
--- src/version.c	2009-07-22 11:14:38.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     236,
  /**/

-- 
>From "know your smileys":
 <|-) Chinese
 <|-( Chinese and doesn't like these kind of jokes

 /// 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    ///


--- NEW FILE 7.2.237 ---
To: vim-dev at vim.org
Subject: Patch 7.2.237
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.237
Problem:    Crash on exit when window icon not set.
Solution:   Copy terminal name when using it for the icon name.
Files:	    src/os_unix.c


*** ../vim-7.2.236/src/os_unix.c	2009-07-14 17:38:51.000000000 +0200
--- src/os_unix.c	2009-07-14 18:30:04.000000000 +0200
***************
*** 1734,1742 ****
      if (oldicon == NULL && !test_only)
      {
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
! 	    oldicon = T_NAME + 8;
  	else
! 	    oldicon = T_NAME;
      }
  
      return retval;
--- 1734,1742 ----
      if (oldicon == NULL && !test_only)
      {
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
! 	    oldicon = vim_strsave(T_NAME + 8);
  	else
! 	    oldicon = vim_strsave(T_NAME);
      }
  
      return retval;
***************
*** 1939,1947 ****
      if (!test_only)
      {
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
! 	    oldicon = T_NAME + 8;
  	else
! 	    oldicon = T_NAME;
      }
      return FALSE;
  }
--- 1939,1947 ----
      if (!test_only)
      {
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
! 	    oldicon = vim_strsave(T_NAME + 8);
  	else
! 	    oldicon = vim_strsave(T_NAME);
      }
      return FALSE;
  }
*** ../vim-7.2.236/src/version.c	2009-07-22 11:16:54.000000000 +0200
--- src/version.c	2009-07-22 13:26:30.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     237,
  /**/

-- 
Common sense is what tells you that the world is flat.

 /// 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    ///


--- NEW FILE 7.2.238 ---
To: vim-dev at vim.org
Subject: Patch 7.2.238
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.238
Problem:    Leaking memory when setting term to "builtin_dumb".
Solution:   Free memory when resetting term option t_Co.
Files:	    src/option.c, src/proto/option.pro, src/term.c


*** ../vim-7.2.237/src/option.c	2009-06-16 17:50:56.000000000 +0200
--- src/option.c	2009-07-22 12:49:19.000000000 +0200
***************
*** 403,410 ****
  #define P_NUM		0x02	/* the option is numeric */
  #define P_STRING	0x04	/* the option is a string */
  #define P_ALLOCED	0x08	/* the string option is in allocated memory,
! 				    must use vim_free() when assigning new
! 				    value. Not set if default is the same. */
  #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
  				   never be used for local or hidden options! */
  #define P_NODEFAULT	0x40	/* don't set to default value */
--- 403,411 ----
  #define P_NUM		0x02	/* the option is numeric */
  #define P_STRING	0x04	/* the option is a string */
  #define P_ALLOCED	0x08	/* the string option is in allocated memory,
! 				   must use free_string_option() when
! 				   assigning new value. Not set if default is
! 				   the same. */
  #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
  				   never be used for local or hidden options! */
  #define P_NODEFAULT	0x40	/* don't set to default value */
***************
*** 8927,8932 ****
--- 8928,8955 ----
  }
  
  /*
+  * Free the string for one term option, if it was allocated.
+  * Set the string to empty_option and clear allocated flag.
+  * "var" points to the option value.
+  */
+     void
+ free_one_termoption(var)
+     char_u *var;
+ {
+     struct vimoption   *p;
+ 
+     for (p = &options[0]; p->fullname != NULL; p++)
+ 	if (p->var == var)
+ 	{
+ 	    if (p->flags & P_ALLOCED)
+ 		free_string_option(*(char_u **)(p->var));
+ 	    *(char_u **)(p->var) = empty_option;
+ 	    p->flags &= ~P_ALLOCED;
+ 	    break;
+ 	}
+ }
+ 
+ /*
   * Set the terminal option defaults to the current value.
   * Used after setting the terminal name.
   */
*** ../vim-7.2.237/src/proto/option.pro	2009-02-21 20:27:00.000000000 +0100
--- src/proto/option.pro	2009-07-22 12:52:31.000000000 +0200
***************
*** 29,34 ****
--- 29,35 ----
  int makefoldset __ARGS((FILE *fd));
  void clear_termoptions __ARGS((void));
  void free_termoptions __ARGS((void));
+ void free_one_termoption __ARGS((char_u *var));
  void set_term_defaults __ARGS((void));
  void comp_col __ARGS((void));
  char_u *get_equalprg __ARGS((void));
*** ../vim-7.2.237/src/term.c	2009-06-16 14:31:56.000000000 +0200
--- src/term.c	2009-07-22 13:19:59.000000000 +0200
***************
*** 2881,2887 ****
  
  	/* if 'Sb' and 'AB' are not defined, reset "Co" */
  	if (*T_CSB == NUL && *T_CAB == NUL)
! 	    T_CCO = empty_option;
  
  	/* Set 'weirdinvert' according to value of 't_xs' */
  	p_wiv = (*T_XS != NUL);
--- 2881,2887 ----
  
  	/* if 'Sb' and 'AB' are not defined, reset "Co" */
  	if (*T_CSB == NUL && *T_CAB == NUL)
! 	    free_one_termoption(T_CCO);
  
  	/* Set 'weirdinvert' according to value of 't_xs' */
  	p_wiv = (*T_XS != NUL);
*** ../vim-7.2.237/src/version.c	2009-07-22 13:27:50.000000000 +0200
--- src/version.c	2009-07-22 14:25:44.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     238,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
95. Only communication in your household is through email.

 /// 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    ///


--- NEW FILE 7.2.239 ---
To: vim-dev at vim.org
Subject: Patch 7.2.239
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.239
Problem:    Using :diffpatch twice or when patching fails causes memory
	    corruption and/or a crash.  (Bryan Venteicher)
Solution:   Detect missing output file.  Avoid using non-existing buffer.
Files:	    src/diff.c


*** ../vim-7.2.238/src/diff.c	2009-05-14 22:19:19.000000000 +0200
--- src/diff.c	2009-07-22 16:06:21.000000000 +0200
***************
*** 893,898 ****
--- 893,899 ----
      char_u	*browseFile = NULL;
      int		browse_flag = cmdmod.browse;
  #endif
+     struct stat st;
  
  #ifdef FEAT_BROWSE
      if (cmdmod.browse)
***************
*** 999,1042 ****
      STRCAT(buf, ".rej");
      mch_remove(buf);
  
!     if (curbuf->b_fname != NULL)
      {
! 	newname = vim_strnsave(curbuf->b_fname,
  					  (int)(STRLEN(curbuf->b_fname) + 4));
! 	if (newname != NULL)
! 	    STRCAT(newname, ".new");
!     }
  
  #ifdef FEAT_GUI
!     need_mouse_correct = TRUE;
  #endif
!     /* don't use a new tab page, each tab page has its own diffs */
!     cmdmod.tab = 0;
! 
!     if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
!     {
! 	/* Pretend it was a ":split fname" command */
! 	eap->cmdidx = CMD_split;
! 	eap->arg = tmp_new;
! 	do_exedit(eap, old_curwin);
  
! 	if (curwin != old_curwin)		/* split must have worked */
  	{
! 	    /* Set 'diff', 'scrollbind' on and 'wrap' off. */
! 	    diff_win_options(curwin, TRUE);
! 	    diff_win_options(old_curwin, TRUE);
  
! 	    if (newname != NULL)
  	    {
! 		/* do a ":file filename.new" on the patched buffer */
! 		eap->arg = newname;
! 		ex_file(eap);
  
  #ifdef FEAT_AUTOCMD
! 		/* Do filetype detection with the new name. */
! 		if (au_has_group((char_u *)"filetypedetect"))
! 		    do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
  #endif
  	    }
  	}
      }
--- 1000,1050 ----
      STRCAT(buf, ".rej");
      mch_remove(buf);
  
!     /* Only continue if the output file was created. */
!     if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
! 	EMSG(_("E816: Cannot read patch output"));
!     else
      {
! 	if (curbuf->b_fname != NULL)
! 	{
! 	    newname = vim_strnsave(curbuf->b_fname,
  					  (int)(STRLEN(curbuf->b_fname) + 4));
! 	    if (newname != NULL)
! 		STRCAT(newname, ".new");
! 	}
  
  #ifdef FEAT_GUI
! 	need_mouse_correct = TRUE;
  #endif
! 	/* don't use a new tab page, each tab page has its own diffs */
! 	cmdmod.tab = 0;
  
! 	if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
  	{
! 	    /* Pretend it was a ":split fname" command */
! 	    eap->cmdidx = CMD_split;
! 	    eap->arg = tmp_new;
! 	    do_exedit(eap, old_curwin);
  
! 	    /* check that split worked and editing tmp_new */
! 	    if (curwin != old_curwin && win_valid(old_curwin))
  	    {
! 		/* Set 'diff', 'scrollbind' on and 'wrap' off. */
! 		diff_win_options(curwin, TRUE);
! 		diff_win_options(old_curwin, TRUE);
! 
! 		if (newname != NULL)
! 		{
! 		    /* do a ":file filename.new" on the patched buffer */
! 		    eap->arg = newname;
! 		    ex_file(eap);
  
  #ifdef FEAT_AUTOCMD
! 		    /* Do filetype detection with the new name. */
! 		    if (au_has_group((char_u *)"filetypedetect"))
! 			do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
  #endif
+ 		}
  	    }
  	}
      }
*** ../vim-7.2.238/src/version.c	2009-07-22 14:27:33.000000000 +0200
--- src/version.c	2009-07-22 16:21:29.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     239,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
97. Your mother tells you to remember something, and you look for
    a File/Save command.

 /// 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    ///


--- NEW FILE 7.2.240 ---
To: vim-dev at vim.org
Subject: Patch 7.2.240
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.240
Problem:    Crash when using find/replace dialog repeatedly. (Michiel
	    Hartsuiker)
Solution:   Avoid doing the operation while busy or recursively.  Also refuse
	    replace when text is locked.
Files:	    src/gui.c


*** ../vim-7.2.239/src/gui.c	2009-06-24 18:31:36.000000000 +0200
--- src/gui.c	2009-07-22 16:54:16.000000000 +0200
***************
*** 5004,5009 ****
--- 5004,5022 ----
      char_u	*p;
      regmatch_T	regmatch;
      int		save_did_emsg = did_emsg;
+     static int  busy = FALSE;
+ 
+     /* When the screen is being updated we should not change buffers and
+      * windows structures, it may cause freed memory to be used.  Also don't
+      * do this recursively (pressing "Find" quickly several times. */
+     if (updating_screen || busy)
+ 	return FALSE;
+ 
+     /* refuse replace when text cannot be changed */
+     if ((type == FRD_REPLACE || type == FRD_REPLACEALL) && text_locked())
+ 	return FALSE;
+ 
+     busy = TRUE;
  
      ga_init2(&ga, 1, 100);
      if (type == FRD_REPLACEALL)
***************
*** 5094,5099 ****
--- 5107,5113 ----
      }
  
      vim_free(ga.ga_data);
+     busy = FALSE;
      return (ga.ga_len > 0);
  }
  
*** ../vim-7.2.239/src/version.c	2009-07-22 16:22:33.000000000 +0200
--- src/version.c	2009-07-29 11:09:13.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     240,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
113. You are asked about a bus schedule, you wonder if it is 16 or 32 bits.

 /// 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    ///


--- NEW FILE 7.2.241 ---
To: vim-dev at vim.org
Subject: Patch 7.2.241
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.241
Problem:    When using a combination of ":bufdo" and "doautoall" we may end up
	    in the wrong directory. (Ajit Thakkar)
	    Crash when triggering an autocommand in ":vimgrep".  (Yukihiro
	    Nakadaira)
Solution:   Clear w_localdir and globaldir when using the aucmd_win.
	    Use a separate flag to decide aucmd_win needs to be restored.
Files:	    src/fileio.c, src/globals.h, src/structs.h


*** ../vim-7.2.240/src/fileio.c	2009-07-01 17:11:40.000000000 +0200
--- src/fileio.c	2009-07-22 19:08:55.000000000 +0200
***************
*** 8420,8425 ****
--- 8420,8429 ----
  	if (aucmd_win == NULL)
  	    win = curwin;
      }
+     if (win == NULL && aucmd_win_used)
+ 	/* Strange recursive autocommand, fall back to using the current
+ 	 * window.  Expect a few side effects... */
+ 	win = curwin;
  
      aco->save_curwin = curwin;
      aco->save_curbuf = curbuf;
***************
*** 8428,8433 ****
--- 8432,8438 ----
  	/* There is a window for "buf" in the current tab page, make it the
  	 * curwin.  This is preferred, it has the least side effects (esp. if
  	 * "buf" is curbuf). */
+ 	aco->use_aucmd_win = FALSE;
  	curwin = win;
      }
      else
***************
*** 8436,8444 ****
--- 8441,8460 ----
  	 * effects, insert it in a the current tab page.
  	 * Anything related to a window (e.g., setting folds) may have
  	 * unexpected results. */
+ 	aco->use_aucmd_win = TRUE;
+ 	aucmd_win_used = TRUE;
  	aucmd_win->w_buffer = buf;
  	++buf->b_nwindows;
  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
+ 	vim_free(aucmd_win->w_localdir);
+ 	aucmd_win->w_localdir = NULL;
+ 
+ 	/* Make sure w_localdir and globaldir are NULL to avoid a chdir() in
+ 	 * win_enter_ext(). */
+ 	aucmd_win->w_localdir = NULL;
+ 	aco->globaldir = globaldir;
+ 	globaldir = NULL;
+ 
  
  #ifdef FEAT_WINDOWS
  	/* Split the current window, put the aucmd_win in the upper half.
***************
*** 8472,8478 ****
      int dummy;
  #endif
  
!     if (aco->new_curwin == aucmd_win)
      {
  	--curbuf->b_nwindows;
  #ifdef FEAT_WINDOWS
--- 8488,8494 ----
      int dummy;
  #endif
  
!     if (aco->use_aucmd_win)
      {
  	--curbuf->b_nwindows;
  #ifdef FEAT_WINDOWS
***************
*** 8499,8504 ****
--- 8515,8521 ----
  	/* Remove the window and frame from the tree of frames. */
  	(void)winframe_remove(curwin, &dummy, NULL);
  	win_remove(curwin, NULL);
+ 	aucmd_win_used = FALSE;
  	last_status(FALSE);	    /* may need to remove last status line */
  	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
  	(void)win_comp_pos();   /* recompute window positions */
***************
*** 8517,8522 ****
--- 8534,8542 ----
  #endif
  	curbuf = curwin->w_buffer;
  
+ 	vim_free(globaldir);
+ 	globaldir = aco->globaldir;
+ 
  	/* the buffer contents may have changed */
  	check_cursor();
  	if (curwin->w_topline > curbuf->b_ml.ml_line_count)
***************
*** 8541,8547 ****
  #endif
  	{
  	    /* Restore the buffer which was previously edited by curwin, if
! 	     * it was chagned, we are still the same window and the buffer is
  	     * valid. */
  	    if (curwin == aco->new_curwin
  		    && curbuf != aco->new_curbuf
--- 8561,8567 ----
  #endif
  	{
  	    /* Restore the buffer which was previously edited by curwin, if
! 	     * it was changed, we are still the same window and the buffer is
  	     * valid. */
  	    if (curwin == aco->new_curwin
  		    && curbuf != aco->new_curbuf
*** ../vim-7.2.240/src/globals.h	2009-06-16 16:01:34.000000000 +0200
--- src/globals.h	2009-07-22 19:50:53.000000000 +0200
***************
*** 541,546 ****
--- 541,547 ----
  
  #ifdef FEAT_AUTOCMD
  EXTERN win_T	*aucmd_win;	/* window used in aucmd_prepbuf() */
+ EXTERN int	aucmd_win_used INIT(= FALSE);	/* aucmd_win is being used */
  #endif
  
  /*
*** ../vim-7.2.240/src/structs.h	2009-07-09 18:24:24.000000000 +0200
--- src/structs.h	2009-07-22 18:58:35.000000000 +0200
***************
*** 2288,2296 ****
--- 2288,2298 ----
  {
      buf_T	*save_curbuf;	/* saved curbuf */
  #ifdef FEAT_AUTOCMD
+     int		use_aucmd_win;	/* using aucmd_win */
      win_T	*save_curwin;	/* saved curwin */
      win_T	*new_curwin;	/* new curwin */
      buf_T	*new_curbuf;	/* new curbuf */
+     char_u	*globaldir;	/* saved value of globaldir */
  #endif
  } aco_save_T;
  
*** ../vim-7.2.240/src/version.c	2009-07-29 11:10:31.000000000 +0200
--- src/version.c	2009-07-29 12:06:31.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     241,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
114. You are counting items, you go "0,1,2,3,4,5,6,7,8,9,A,B,C,D...".

 /// 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    ///


--- NEW FILE 7.2.242 ---
To: vim-dev at vim.org
Subject: Patch 7.2.242
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.242
Problem:    Setting 'lazyredraw' causes the cursor column to be recomputed.
	    (Tom Link)
Solution:   Only recompute the cursor column for a boolean option if changes
	    the cursor position.
Files:	    src/option.c


*** ../vim-7.2.241/src/option.c	2009-07-22 14:27:33.000000000 +0200
--- src/option.c	2009-07-29 10:03:39.000000000 +0200
***************
*** 7194,7199 ****
--- 7194,7207 ----
  	compatible_set();
      }
  
+     /* 'list', 'number' */
+     else if ((int *)varp == &curwin->w_p_list
+ 	  || (int *)varp == &curwin->w_p_nu)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ 
      else if ((int *)varp == &curbuf->b_p_ro)
      {
  	/* when 'readonly' is reset globally, also reset readonlymode */
***************
*** 7645,7650 ****
--- 7653,7666 ----
  	    curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
  # endif
  	}
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ 
+     else if ((int *)varp == &p_arshape)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
      }
  #endif
  
***************
*** 7655,7662 ****
      options[opt_idx].flags |= P_WAS_SET;
  
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
!     if (curwin->w_curswant != MAXCOL)
! 	curwin->w_set_curswant = TRUE;  /* in case 'list' changed */
      check_redraw(options[opt_idx].flags);
  
      return NULL;
--- 7671,7677 ----
      options[opt_idx].flags |= P_WAS_SET;
  
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
! 
      check_redraw(options[opt_idx].flags);
  
      return NULL;
*** ../vim-7.2.241/src/version.c	2009-07-29 12:09:49.000000000 +0200
--- src/version.c	2009-07-29 15:40:43.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     242,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
117. You are more comfortable typing in html.

 /// 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    ///


--- NEW FILE 7.2.243 ---
To: vim-dev at vim.org
Subject: Patch 7.2.243
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.243
Problem:    Memory leak when using :vimgrep and resizing. (Dominique Pelle)
Solution:   Free memory for aucmd_win when resizing and don't allocate it
	    twice.
Files:	    src/screen.c


*** ../vim-7.2.242/src/screen.c	2009-06-16 17:22:38.000000000 +0200
--- src/screen.c	2009-07-29 15:59:37.000000000 +0200
***************
*** 7467,7472 ****
--- 7467,7476 ----
       */
      FOR_ALL_TAB_WINDOWS(tp, wp)
  	win_free_lsize(wp);
+ #ifdef FEAT_AUTOCMD
+     if (aucmd_win != NULL)
+ 	win_free_lsize(aucmd_win);
+ #endif
  
      new_ScreenLines = (schar_T *)lalloc((long_u)(
  			      (Rows + 1) * Columns * sizeof(schar_T)), FALSE);
***************
*** 7504,7510 ****
  	}
      }
  #ifdef FEAT_AUTOCMD
!     if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
  	outofmem = TRUE;
  #endif
  #ifdef FEAT_WINDOWS
--- 7508,7515 ----
  	}
      }
  #ifdef FEAT_AUTOCMD
!     if (aucmd_win != NULL && aucmd_win->w_lines == NULL
! 					&& win_alloc_lines(aucmd_win) == FAIL)
  	outofmem = TRUE;
  #endif
  #ifdef FEAT_WINDOWS
*** ../vim-7.2.242/src/version.c	2009-07-29 15:41:32.000000000 +0200
--- src/version.c	2009-07-29 16:07:47.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     243,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
118. You are on a first-name basis with your ISP's staff.

 /// 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    ///


--- NEW FILE 7.2.244 ---
To: vim-dev at vim.org
Subject: Patch 7.2.244
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.244
Problem:    When 'enc' is utf-8 and 'fenc' is latin1, writing a non-latin1
	    character gives a conversion error without any hint what is wrong.
Solution:   When known add the line number to the error message.
Files:	    src/fileio.c


*** ../vim-7.2.243/src/fileio.c	2009-07-29 12:09:49.000000000 +0200
--- src/fileio.c	2009-07-29 17:04:06.000000000 +0200
***************
*** 121,126 ****
--- 121,128 ----
      char_u	*bw_conv_buf;	/* buffer for writing converted chars */
      int		bw_conv_buflen; /* size of bw_conv_buf */
      int		bw_conv_error;	/* set for conversion error */
+     linenr_T	bw_conv_error_lnum;  /* first line with error or zero */
+     linenr_T	bw_start_lnum;  /* line number at start of buffer */
  # ifdef USE_ICONV
      iconv_t	bw_iconv_fd;	/* descriptor for iconv() or -1 */
  # endif
***************
*** 2924,2929 ****
--- 2925,2931 ----
      linenr_T	    lnum;
      long	    nchars;
      char_u	    *errmsg = NULL;
+     int		    errmsg_allocated = FALSE;
      char_u	    *errnum = NULL;
      char_u	    *buffer;
      char_u	    smallbuf[SMBUFSIZE];
***************
*** 2987,2992 ****
--- 2989,2995 ----
      /* must init bw_conv_buf and bw_iconv_fd before jumping to "fail" */
      write_info.bw_conv_buf = NULL;
      write_info.bw_conv_error = FALSE;
+     write_info.bw_conv_error_lnum = 0;
      write_info.bw_restlen = 0;
  # ifdef USE_ICONV
      write_info.bw_iconv_fd = (iconv_t)-1;
***************
*** 4243,4248 ****
--- 4245,4251 ----
  		nchars += write_info.bw_len;
  	}
      }
+     write_info.bw_start_lnum = start;
  #endif
  
      write_info.bw_len = bufsize;
***************
*** 4278,4283 ****
--- 4281,4289 ----
  	    nchars += bufsize;
  	    s = buffer;
  	    len = 0;
+ #ifdef FEAT_MBYTE
+ 	    write_info.bw_start_lnum = lnum;
+ #endif
  	}
  	/* write failed or last line has no EOL: stop here */
  	if (end == 0
***************
*** 4474,4480 ****
  	{
  #ifdef FEAT_MBYTE
  	    if (write_info.bw_conv_error)
! 		errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)");
  	    else
  #endif
  		if (got_int)
--- 4480,4496 ----
  	{
  #ifdef FEAT_MBYTE
  	    if (write_info.bw_conv_error)
! 	    {
! 		if (write_info.bw_conv_error_lnum == 0)
! 		    errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)");
! 		else
! 		{
! 		    errmsg_allocated = TRUE;
! 		    errmsg = alloc(300);
! 		    vim_snprintf((char *)errmsg, 300, _("E513: write error, conversion failed in line %ld (make 'fenc' empty to override)"),
! 					 (long)write_info.bw_conv_error_lnum);
! 		}
! 	    }
  	    else
  #endif
  		if (got_int)
***************
*** 4550,4555 ****
--- 4566,4577 ----
  	{
  	    STRCAT(IObuff, _(" CONVERSION ERROR"));
  	    c = TRUE;
+ 	    if (write_info.bw_conv_error_lnum != 0)
+ 	    {
+ 		int l = STRLEN(IObuff);
+ 		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
+ 			(long)write_info.bw_conv_error_lnum);
+ 	    }
  	}
  	else if (notconverted)
  	{
***************
*** 4746,4751 ****
--- 4768,4775 ----
  	}
  	STRCAT(IObuff, errmsg);
  	emsg(IObuff);
+ 	if (errmsg_allocated)
+ 	    vim_free(errmsg);
  
  	retval = FAIL;
  	if (end == 0)
***************
*** 5105,5111 ****
  			c = buf[wlen];
  		}
  
! 		ip->bw_conv_error |= ucs2bytes(c, &p, flags);
  	    }
  	    if (flags & FIO_LATIN1)
  		len = (int)(p - buf);
--- 5129,5141 ----
  			c = buf[wlen];
  		}
  
! 		if (ucs2bytes(c, &p, flags) && !ip->bw_conv_error)
! 		{
! 		    ip->bw_conv_error = TRUE;
! 		    ip->bw_conv_error_lnum = ip->bw_start_lnum;
! 		}
! 		if (c == NL)
! 		    ++ip->bw_start_lnum;
  	    }
  	    if (flags & FIO_LATIN1)
  		len = (int)(p - buf);
***************
*** 5386,5391 ****
--- 5416,5422 ----
  #ifdef FEAT_MBYTE
  /*
   * Convert a Unicode character to bytes.
+  * Return TRUE for an error, FALSE when it's OK.
   */
      static int
  ucs2bytes(c, pp, flags)
*** ../vim-7.2.243/src/version.c	2009-07-29 16:13:35.000000000 +0200
--- src/version.c	2009-07-29 18:01:27.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     244,
  /**/

-- 
Support your right to bare arms!  Wear short sleeves!

 /// 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    ///


--- NEW FILE 7.2.245 ---
To: vim-dev at vim.org
Subject: Patch 7.2.245
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.245
Problem:    When 'enc' is "utf-16" and 'fenc' is "utf-8" writing a file does
	    conversion while none should be done. (Yukihiro Nakadaira) When
	    'fenc' is empty the file is written as utf-8 instead of utf-16.
Solution:   Do proper comparison of encodings, taking into account that all
	    Unicode values for 'enc' use utf-8 internally.
Files:	    src/fileio.c


*** ../vim-7.2.244/src/fileio.c	2009-07-29 18:05:57.000000000 +0200
--- src/fileio.c	2009-07-29 17:04:06.000000000 +0200
***************
*** 134,140 ****
  #ifdef FEAT_MBYTE
  static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
  static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
! static int same_encoding __ARGS((char_u *a, char_u *b));
  static int get_fio_flags __ARGS((char_u *ptr));
  static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
  static int make_bom __ARGS((char_u *buf, char_u *name));
--- 134,140 ----
  #ifdef FEAT_MBYTE
  static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
  static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
! static int need_conversion __ARGS((char_u *fenc));
  static int get_fio_flags __ARGS((char_u *ptr));
  static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
  static int make_bom __ARGS((char_u *buf, char_u *name));
***************
*** 1043,1055 ****
      }
  
      /*
!      * Conversion is required when the encoding of the file is different
!      * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4 (requires
!      * conversion to UTF-8).
       */
      fio_flags = 0;
!     converted = (*fenc != NUL && !same_encoding(p_enc, fenc));
!     if (converted || enc_unicode != 0)
      {
  
  	/* "ucs-bom" means we need to check the first bytes of the file
--- 1043,1054 ----
      }
  
      /*
!      * Conversion may be required when the encoding of the file is different
!      * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4.
       */
      fio_flags = 0;
!     converted = need_conversion(fenc);
!     if (converted)
      {
  
  	/* "ucs-bom" means we need to check the first bytes of the file
***************
*** 3969,3978 ****
  	fenc = buf->b_p_fenc;
  
      /*
!      * The file needs to be converted when 'fileencoding' is set and
!      * 'fileencoding' differs from 'encoding'.
       */
!     converted = (*fenc != NUL && !same_encoding(p_enc, fenc));
  
      /*
       * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done.  Or
--- 3968,3976 ----
  	fenc = buf->b_p_fenc;
  
      /*
!      * Check if the file needs to be converted.
       */
!     converted = need_conversion(fenc);
  
      /*
       * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done.  Or
***************
*** 5502,5521 ****
  }
  
  /*
!  * Return TRUE if "a" and "b" are the same 'encoding'.
!  * Ignores difference between "ansi" and "latin1", "ucs-4" and "ucs-4be", etc.
   */
      static int
! same_encoding(a, b)
!     char_u	*a;
!     char_u	*b;
  {
!     int		f;
  
!     if (STRCMP(a, b) == 0)
! 	return TRUE;
!     f = get_fio_flags(a);
!     return (f != 0 && get_fio_flags(b) == f);
  }
  
  /*
--- 5500,5536 ----
  }
  
  /*
!  * Return TRUE if file encoding "fenc" requires conversion from or to
!  * 'encoding'.
   */
      static int
! need_conversion(fenc)
!     char_u	*fenc;
  {
!     int		same_encoding;
!     int		enc_flags;
!     int		fenc_flags;
  
!     if (*fenc == NUL || STRCMP(p_enc, fenc) == 0)
! 	same_encoding = TRUE;
!     else
!     {
! 	/* Ignore difference between "ansi" and "latin1", "ucs-4" and
! 	 * "ucs-4be", etc. */
! 	enc_flags = get_fio_flags(p_enc);
! 	fenc_flags = get_fio_flags(fenc);
! 	same_encoding = (enc_flags != 0 && fenc_flags == enc_flags);
!     }
!     if (same_encoding)
!     {
! 	/* Specified encoding matches with 'encoding'.  This requires
! 	 * conversion when 'encoding' is Unicode but not UTF-8. */
! 	return enc_unicode != 0;
!     }
! 
!     /* Encodings differ.  However, conversion is not needed when 'enc' is any
!      * Unicode encoding and the file is UTF-8. */
!     return !(enc_utf8 && fenc_flags == FIO_UTF8);
  }
  
  /*
*** ../vim-7.2.244/src/version.c	2009-07-29 18:05:57.000000000 +0200
--- src/version.c	2009-07-29 18:20:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     245,
  /**/

-- 
An actual excerpt from a classified section of a city newspaper:
"Illiterate?  Write today for free help!"

 /// 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    ///


--- NEW FILE 7.2.246 ---
To: vim-dev at vim.org
Subject: Patch 7.2.246
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.246
Problem:    Cscope home page link is wrong.
Solution:   Update the URL. (Sergey Khorev)
Files:	    runtime/doc/if_cscop.txt


*** ../vim-7.2.245/runtime/doc/if_cscop.txt	2009-07-09 21:22:36.000000000 +0200
--- runtime/doc/if_cscop.txt	2009-09-11 11:19:31.000000000 +0200
***************
*** 481,487 ****
  any problems, suggestions, patches, et al., you have for the usage of
  cscope within Vim to him.
  							*cscope-win32*
! For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html
  
  Win32 support was added by Sergey Khorev <sergey.khorev at gmail.com>.  Contact
  him if you have Win32-specific issues.
--- 481,488 ----
  any problems, suggestions, patches, et al., you have for the usage of
  cscope within Vim to him.
  							*cscope-win32*
! For a cscope version for Win32 see:
! 	http://code.google.com/p/cscope-win32/
  
  Win32 support was added by Sergey Khorev <sergey.khorev at gmail.com>.  Contact
  him if you have Win32-specific issues.
*** ../vim-7.2.245/src/version.c	2009-07-29 18:24:59.000000000 +0200
--- src/version.c	2009-09-11 11:29:02.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     246,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
221. Your wife melts your keyboard in the oven.

 /// 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    ///


--- NEW FILE 7.2.247 ---
To: vim-dev at vim.org
Subject: Patch 7.2.247
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.247
Problem:    Mzscheme interface minor problem.
Solution:   Better error message when build fails. (Sergey Khorev)
Files:	    src/if_mzsch.c


*** ../vim-7.2.246/src/if_mzsch.c	2009-07-09 20:06:30.000000000 +0200
--- src/if_mzsch.c	2009-09-11 11:20:39.000000000 +0200
***************
*** 635,642 ****
  #endif /* DYNAMIC_MZSCHEME */
  
  /* need to put it here for dynamic stuff to work */
! #ifdef INCLUDE_MZSCHEME_BASE
  # include "mzscheme_base.c"
  #endif
  
  /*
--- 635,644 ----
  #endif /* DYNAMIC_MZSCHEME */
  
  /* need to put it here for dynamic stuff to work */
! #if defined(INCLUDE_MZSCHEME_BASE)
  # include "mzscheme_base.c"
+ #elif MZSCHEME_VERSION_MAJOR >= 400
+ # error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes
  #endif
  
  /*
***************
*** 875,888 ****
  #ifdef INCLUDE_MZSCHEME_BASE
      {
  	/*
! 	 * versions 4.x do not provide Scheme bindings by defaults
  	 * we need to add them explicitly
  	 */
  	Scheme_Object *scheme_base_symbol = NULL;
  	MZ_GC_DECL_REG(1);
  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
  	MZ_GC_REG();
! 	/* invoke function from generated and included base.c */
  	declare_modules(environment);
  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
  	MZ_GC_CHECK();
--- 877,890 ----
  #ifdef INCLUDE_MZSCHEME_BASE
      {
  	/*
! 	 * versions 4.x do not provide Scheme bindings by default
  	 * we need to add them explicitly
  	 */
  	Scheme_Object *scheme_base_symbol = NULL;
  	MZ_GC_DECL_REG(1);
  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
  	MZ_GC_REG();
! 	/* invoke function from generated and included mzscheme_base.c */
  	declare_modules(environment);
  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
  	MZ_GC_CHECK();
*** ../vim-7.2.246/src/version.c	2009-09-11 11:30:12.000000000 +0200
--- src/version.c	2009-09-11 11:53:59.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     247,
  /**/

-- 
Your fault: core dumped

 /// 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    ///


--- NEW FILE 7.2.248 ---
To: vim-dev at vim.org
Subject: Patch 7.2.248 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.248 (extra)
Problem:    Mzscheme interface building minor problems.
Solution:   Update Win32 makefiles. (Sergey Khorev)
Files:	    src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak


*** ../vim-7.2.247/src/Make_cyg.mak	2007-09-30 22:28:48.000000000 +0200
--- src/Make_cyg.mak	2009-09-11 11:23:23.000000000 +0200
***************
*** 212,224 ****
  MZSCHEME_VER = 209_000
  endif
  
  ifeq (yes, $(DYNAMIC_MZSCHEME))
  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
  else
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS = $(MZSCHEME)
  endif
! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
  endif
  endif
  
--- 212,245 ----
  MZSCHEME_VER = 209_000
  endif
  
+ ifndef MZSCHEME_PRECISE_GC
+ MZSCHEME_PRECISE_GC=no
+ endif
+ 
+ # for version 4.x we need to generate byte-code for Scheme base
+ ifndef MZSCHEME_GENERATE_BASE
+ MZSCHEME_GENERATE_BASE=no
+ endif
+ 
  ifeq (yes, $(DYNAMIC_MZSCHEME))
  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
  else
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS = $(MZSCHEME)
  endif
! ifeq (yes,$(MZSCHEME_PRECISE_GC))
! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
! else
! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
! endif
! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
! endif
! ifeq (yes,$(MZSCHEME_GENERATE_BASE))
! DEFINES += -DINCLUDE_MZSCHEME_BASE
! MZ_EXTRA_DEP += mzscheme_base.c
! endif
! ifeq (yes,$(MZSCHEME_PRECISE_GC))
! DEFINES += -DMZ_PRECISE_GC
  endif
  endif
  
***************
*** 473,478 ****
--- 494,502 ----
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
+ ifdef MZSCHEME
+ 	-$(DEL) mzscheme_base.c
+ endif
  	-$(DEL) pathdef.c
  	$(MAKE) -C xxd -f Make_cyg.mak clean
  	$(MAKE) -C GvimExt -f Make_ming.mak clean
***************
*** 523,531 ****
--- 547,561 ----
  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_DEP)
  	$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
  
+ $(OUTDIR)/if_mzsch.o:	if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
+ 	$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
+ 
  $(OUTDIR)/vimrc.o:	vim.rc version.h gui_w32_rc.h
  	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
  
+ mzscheme_base.c:
+ 	$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
+ 
  pathdef.c: $(INCL)
  ifneq (sh.exe, $(SHELL))
  	@echo creating pathdef.c
*** ../vim-7.2.247/src/Make_ming.mak	2009-05-26 22:58:43.000000000 +0200
--- src/Make_ming.mak	2009-09-11 11:23:28.000000000 +0200
***************
*** 135,141 ****
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS=$(MZSCHEME)
  endif
! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS)
  endif
  
  endif
--- 135,141 ----
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS=$(MZSCHEME)
  endif
! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
  endif
  
  endif
***************
*** 563,568 ****
--- 563,571 ----
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
+ ifdef MZSCHEME
+ 	-$(DEL) mzscheme_base.c
+ endif
  	$(MAKE) -C GvimExt -f Make_ming.mak clean
  	$(MAKE) -C xxd -f Make_cyg.mak clean
  
*** ../vim-7.2.247/src/Make_mvc.mak	2009-06-16 16:45:14.000000000 +0200
--- src/Make_mvc.mak	2009-09-11 11:23:28.000000000 +0200
***************
*** 865,870 ****
--- 865,871 ----
  	- if exist dimm_i.c del dimm_i.c
  	- if exist dimm.tlb del dimm.tlb
  	- if exist dosinst.exe del dosinst.exe
+ 	- if exist mzscheme_base.c del mzscheme_base.c
  	cd xxd
  	$(MAKE) /NOLOGO -f Make_mvc.mak clean
  	cd ..
*** ../vim-7.2.247/src/version.c	2009-09-11 12:20:47.000000000 +0200
--- src/version.c	2009-09-11 12:48:26.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     248,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
222. You send more than 20 personal e-mails a day.

 /// 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    ///


--- NEW FILE 7.2.249 ---
To: vim-dev at vim.org
Subject: Patch 7.2.249
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.249
Problem:    The script to check .po files can't handle '%' in plural forms.
Solution:   Remove "Plural-Forms:" from the checked string.
Files:	    src/po/check.vim


*** ../vim-7.2.248/src/po/check.vim	2008-06-09 14:45:38.000000000 +0200
--- src/po/check.vim	2009-09-11 12:37:56.000000000 +0200
***************
*** 23,28 ****
--- 23,31 ----
    " remove '%', not used for formatting.
    let idline = substitute(idline, "'%'", '', 'g')
  
+   " remove '%' used for plural forms.
+   let idline = substitute(idline, '\\nPlural-Forms: .\+;\\n', '', '')
+ 
    " remove everything but % items.
    return substitute(idline, '[^%]*\(%[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g')
  endfunc
*** ../vim-7.2.248/src/version.c	2009-09-11 12:48:56.000000000 +0200
--- src/version.c	2009-09-11 12:59:18.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     249,
  /**/

-- 
If evolution theories are correct, humans will soon grow a third
hand for operating the mouse.

 /// 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    ///


--- NEW FILE 7.2.250 ---
To: vim-dev at vim.org
Subject: Patch 7.2.250 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.250 (extra)
Problem:    Possible buffer overflow.
Solution:   Compute the remaining space. (Dominique Pelle)
Files:	    src/GvimExt/gvimext.cpp


*** ../vim-7.2.249/src/GvimExt/gvimext.cpp	2008-07-24 20:51:11.000000000 +0200
--- src/GvimExt/gvimext.cpp	2009-09-11 13:26:27.000000000 +0200
***************
*** 635,641 ****
  	}
  	// Now concatenate
  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
! 	strncat(temp, title, BUFSIZE - 1);
  	InsertMenu(hMenu,
  		indexMenu++,
  		MF_STRING|MF_BYPOSITION,
--- 635,643 ----
  	}
  	// Now concatenate
  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
! 	temp[BUFSIZE - 1] = '\0';
! 	strncat(temp, title, BUFSIZE - 1 - strlen(temp));
! 	temp[BUFSIZE - 1] = '\0';
  	InsertMenu(hMenu,
  		indexMenu++,
  		MF_STRING|MF_BYPOSITION,
*** ../vim-7.2.249/src/version.c	2009-09-11 12:59:57.000000000 +0200
--- src/version.c	2009-09-11 13:23:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     250,
  /**/


-- 
hundred-and-one symptoms of being an internet addict:
223. You set up a web-cam as your home's security system.

 /// 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    ///


--- NEW FILE 7.2.251 ---
To: vim-dev at vim.org
Subject: Patch 7.2.251
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.251 (after 7.2.044)
Problem:    Compiler adds invalid memory bounds check.
Solution:   Remove _FORTIFY_SOURCE=2 from CFLAGS. (Dominique Pelle)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.250/src/auto/configure	2009-07-22 11:16:54.000000000 +0200
--- src/auto/configure	2009-08-07 14:49:52.000000000 +0200
***************
*** 17135,17141 ****
        { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
  $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
    if test "$gccmajor" -gt "3"; then
!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
      { $as_echo "$as_me:$LINENO: result: yes" >&5
  $as_echo "yes" >&6; }
    else
--- 17135,17141 ----
        { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
  $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
    if test "$gccmajor" -gt "3"; then
!     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
      { $as_echo "$as_me:$LINENO: result: yes" >&5
  $as_echo "yes" >&6; }
    else
*** ../vim-7.2.250/src/configure.in	2009-07-22 11:16:54.000000000 +0200
--- src/configure.in	2009-08-07 14:49:47.000000000 +0200
***************
*** 3233,3239 ****
    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
    if test "$gccmajor" -gt "3"; then
!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
      AC_MSG_RESULT(yes)
    else
      AC_MSG_RESULT(no)
--- 3233,3239 ----
    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
    if test "$gccmajor" -gt "3"; then
!     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
      AC_MSG_RESULT(yes)
    else
      AC_MSG_RESULT(no)
*** ../vim-7.2.250/src/version.c	2009-09-11 13:26:38.000000000 +0200
--- src/version.c	2009-09-11 13:43:46.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     251,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
225. You sign up for free subscriptions for all the computer magazines

 /// 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    ///


--- NEW FILE 7.2.252 ---
To: vim-dev at vim.org
Subject: Patch 7.2.252
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.252
Problem:    When using a multi-byte 'enc' the 'iskeyword' option cannot
	    contain characters above 128.
Solution:   Use mb_ptr2char_adv().
Files:	    src/charset.c


*** ../vim-7.2.251/src/charset.c	2009-05-14 22:19:19.000000000 +0200
--- src/charset.c	2009-09-09 21:11:46.000000000 +0200
***************
*** 174,179 ****
--- 174,184 ----
  	    if (VIM_ISDIGIT(*p))
  		c = getdigits(&p);
  	    else
+ #ifdef FEAT_MBYTE
+ 		 if (has_mbyte)
+ 		c = mb_ptr2char_adv(&p);
+ 	    else
+ #endif
  		c = *p++;
  	    c2 = -1;
  	    if (*p == '-' && p[1] != NUL)
*** ../vim-7.2.251/src/version.c	2009-09-11 13:44:33.000000000 +0200
--- src/version.c	2009-09-11 14:01:48.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     252,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
226. You sit down at the computer right after dinner and your spouse
     says "See you in the morning."

 /// 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    ///


--- NEW FILE 7.2.253 ---
To: vim-dev at vim.org
Subject: Patch 7.2.253
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.253
Problem:    Netbeans interface: getLength always uses current buffer.
Solution:   Use ml_get_buf() instead of ml_get(). (Xavier de Gaye)
Files:	    src/netbeans.c


*** ../vim-7.2.252/src/netbeans.c	2009-06-24 16:49:50.000000000 +0200
--- src/netbeans.c	2009-09-11 13:40:14.000000000 +0200
***************
*** 1499,1505 ****
  		    return FAIL;
  		}
  		first = *pos;
! 		nbdebug(("    FIRST POS: line %d, col %d\n", first.lnum, first.col));
  		pos = off2pos(buf->bufp, off+count-1);
  		if (!pos)
  		{
--- 1499,1506 ----
  		    return FAIL;
  		}
  		first = *pos;
! 		nbdebug(("    FIRST POS: line %d, col %d\n",
! 						      first.lnum, first.col));
  		pos = off2pos(buf->bufp, off+count-1);
  		if (!pos)
  		{
***************
*** 1510,1516 ****
  		    return FAIL;
  		}
  		last = *pos;
! 		nbdebug(("    LAST POS: line %d, col %d\n", last.lnum, last.col));
  		del_from_lnum = first.lnum;
  		del_to_lnum = last.lnum;
  		doupdate = 1;
--- 1511,1518 ----
  		    return FAIL;
  		}
  		last = *pos;
! 		nbdebug(("    LAST POS: line %d, col %d\n",
! 							last.lnum, last.col));
  		del_from_lnum = first.lnum;
  		del_to_lnum = last.lnum;
  		doupdate = 1;
***************
*** 1521,1527 ****
  		next = off2pos(buf->bufp, off + count);
  
  		/* Remove part of the first line. */
! 		if (first.col != 0 || (next != NULL && first.lnum == next->lnum))
  		{
  		    if (first.lnum != last.lnum
  			    || (next != NULL && first.lnum != next->lnum))
--- 1523,1530 ----
  		next = off2pos(buf->bufp, off + count);
  
  		/* Remove part of the first line. */
! 		if (first.col != 0
! 				|| (next != NULL && first.lnum == next->lnum))
  		{
  		    if (first.lnum != last.lnum
  			    || (next != NULL && first.lnum != next->lnum))
***************
*** 1584,1590 ****
  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
  			if (id > 0)
  			{
! 			    nbdebug(("    Deleting sign %d on line %d\n", id, i));
  			    buf_delsign(buf->bufp, id);
  			}
  			else
--- 1587,1594 ----
  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
  			if (id > 0)
  			{
! 			    nbdebug(("    Deleting sign %d on line %d\n",
! 								      id, i));
  			    buf_delsign(buf->bufp, id);
  			}
  			else
***************
*** 1593,1599 ****
  			}
  		    }
  
! 		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
  		    curwin->w_cursor.lnum = del_from_lnum;
  		    curwin->w_cursor.col = 0;
  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
--- 1597,1604 ----
  			}
  		    }
  
! 		    nbdebug(("    Deleting lines %d through %d\n",
! 						 del_from_lnum, del_to_lnum));
  		    curwin->w_cursor.lnum = del_from_lnum;
  		    curwin->w_cursor.col = 0;
  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
***************
*** 3514,3520 ****
  	    eol_size = 1;
  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
  	{
! 	    char_count += (long)STRLEN(ml_get(lnum)) + eol_size;
  	    /* Check for a CTRL-C every 100000 characters */
  	    if (char_count > last_check)
  	    {
--- 3519,3526 ----
  	    eol_size = 1;
  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
  	{
! 	    char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
! 								   + eol_size;
  	    /* Check for a CTRL-C every 100000 characters */
  	    if (char_count > last_check)
  	    {
*** ../vim-7.2.252/src/version.c	2009-09-11 14:02:25.000000000 +0200
--- src/version.c	2009-09-11 14:18:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     253,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
227. You sleep next to your monitor.  Or on top of it.

 /// 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    ///


--- NEW FILE 7.2.254 ---
To: vim-dev at vim.org
Subject: Patch 7.2.254
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.254
Problem:    Compiler warning for assigning size_t to int.
Solution:   Use size_t for the variable. (George Reilly)
Files:	    src/fileio.c


*** ../vim-7.2.253/src/fileio.c	2009-07-29 18:24:59.000000000 +0200
--- src/fileio.c	2009-09-11 13:46:19.000000000 +0200
***************
*** 4568,4574 ****
  	    c = TRUE;
  	    if (write_info.bw_conv_error_lnum != 0)
  	    {
! 		int l = STRLEN(IObuff);
  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
  			(long)write_info.bw_conv_error_lnum);
  	    }
--- 4568,4574 ----
  	    c = TRUE;
  	    if (write_info.bw_conv_error_lnum != 0)
  	    {
! 		size_t l = STRLEN(IObuff);
  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
  			(long)write_info.bw_conv_error_lnum);
  	    }
*** ../vim-7.2.253/src/version.c	2009-09-11 14:19:41.000000000 +0200
--- src/version.c	2009-09-11 15:03:42.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     254,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
230. You spend your Friday nights typing away at your keyboard

 /// 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    ///


--- NEW FILE 7.2.255 ---
To: vim-dev at vim.org
Subject: Patch 7.2.255
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.255 (after 7.2.242)
Problem:    Setting 'rightleft', 'linebreak' and 'wrap' may cause cursor to be
	    in wrong place.
Solution:   Recompute the cursor column for these options.
Files:	    src/option.c


*** ../vim-7.2.254/src/option.c	2009-07-29 15:41:32.000000000 +0200
--- src/option.c	2009-09-11 13:59:55.000000000 +0200
***************
*** 7430,7435 ****
--- 7430,7437 ----
      {
  	if (curwin->w_p_wrap)
  	    curwin->w_leftcol = 0;
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
      }
  
  #ifdef FEAT_WINDOWS
***************
*** 7664,7669 ****
--- 7666,7687 ----
      }
  #endif
  
+ #ifdef FEAT_LINEBREAK
+     if ((int *)varp == &curwin->w_p_lbr)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ #endif
+ 
+ #ifdef FEAT_RIGHTLEFT
+     if ((int *)varp == &curwin->w_p_rl)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ #endif
+ 
      /*
       * End of handling side effects for bool options.
       */
*** ../vim-7.2.254/src/version.c	2009-09-11 15:04:13.000000000 +0200
--- src/version.c	2009-09-11 15:19:40.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     255,
  /**/

-- 
A computer without Windows is like a fish without a bicycle.

 /// 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    ///


--- NEW FILE 7.2.256 ---
To: vim-dev at vim.org
Subject: Patch 7.2.256
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.256
Problem:    When 'guifont' was not set GTK font dialog doesn't have a default.
	    (Andreas Metzler)
Solution:   Set default to DEFAULT_FONT. (James Vega)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.255/src/gui_gtk_x11.c	2009-07-01 18:04:30.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-11 14:21:32.000000000 +0200
***************
*** 4729,4734 ****
--- 4729,4737 ----
      if (oldval != NULL && *oldval != NUL)
  	gtk_font_selection_dialog_set_font_name(
  		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), (char *)oldval);
+     else
+ 	gtk_font_selection_dialog_set_font_name(
+ 		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), DEFAULT_FONT);
  
      if (gui.fontname)
      {
***************
*** 4816,4821 ****
--- 4819,4827 ----
  	if (oldname != oldval)
  	    vim_free(oldname);
      }
+     else
+ 	gtk_font_selection_dialog_set_font_name(
+ 		GTK_FONT_SELECTION_DIALOG(dialog), DEFAULT_FONT);
  
      response = gtk_dialog_run(GTK_DIALOG(dialog));
  
*** ../vim-7.2.255/src/version.c	2009-09-11 15:20:22.000000000 +0200
--- src/version.c	2009-09-11 15:45:36.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     256,
  /**/

-- 
Get a life?  What is the URL where it can be downloaded?

 /// 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    ///


--- NEW FILE 7.2.257 ---
To: vim-dev at vim.org
Subject: Patch 7.2.257
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.257
Problem:    With GTK 2.17 lots of assertion error messages.
Solution:   Remove check for static gravity. (Sebastian Droege)
Files:	    src/gui_gtk_f.c


*** ../vim-7.2.256/src/gui_gtk_f.c	2009-05-17 23:25:16.000000000 +0200
--- src/gui_gtk_f.c	2009-09-11 15:15:41.000000000 +0200
***************
*** 860,870 ****
  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
  {
  #ifdef HAVE_GTK2
!     gboolean static_gravity_supported;
! 
!     static_gravity_supported = gdk_window_set_static_gravities(window,
! 							       use_static);
!     g_return_if_fail(static_gravity_supported);
  #else
      XSetWindowAttributes xattributes;
  
--- 860,868 ----
  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
  {
  #ifdef HAVE_GTK2
!     /* We don't check if static gravity is actually supported, because it
!      * results in an annoying assertion error message. */
!     gdk_window_set_static_gravities(window, use_static);
  #else
      XSetWindowAttributes xattributes;
  
*** ../vim-7.2.256/src/version.c	2009-09-11 15:46:20.000000000 +0200
--- src/version.c	2009-09-11 16:16:52.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     257,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
     in the front doorway permanently so it always looks like you are
     actually attempting to do something about that mess that has amassed
     since you discovered the Internet.

 /// 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    ///


--- NEW FILE 7.2.258 ---
To: vim-dev at vim.org
Subject: Patch 7.2.258
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.258
Problem:    v:beval_col and b:beval_text are wrong in UTF-8 text. (Tony
	    Mechelynck)
Solution:   Use byte number instead of character number for the column.
Files:	    src/ui.c


*** ../vim-7.2.257/src/ui.c	2009-07-01 18:04:30.000000000 +0200
--- src/ui.c	2009-09-11 16:11:50.000000000 +0200
***************
*** 3055,3072 ****
      int		vcol;
  {
      /* try to advance to the specified column */
-     int		col = 0;
      int		count = 0;
      char_u	*ptr;
  
!     ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
      while (count <= vcol && *ptr != NUL)
      {
- 	++col;
  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
  	mb_ptr_adv(ptr);
      }
!     return col;
  }
  #endif
  
--- 3055,3071 ----
      int		vcol;
  {
      /* try to advance to the specified column */
      int		count = 0;
      char_u	*ptr;
+     char_u	*start;
  
!     start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
      while (count <= vcol && *ptr != NUL)
      {
  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
  	mb_ptr_adv(ptr);
      }
!     return (int)(ptr - start);
  }
  #endif
  
*** ../vim-7.2.257/src/version.c	2009-09-11 16:17:36.000000000 +0200
--- src/version.c	2009-09-11 16:45:48.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     258,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
232. You start conversations with, "Have you gotten an ISDN line?"

 /// 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    ///


--- NEW FILE 7.2.259 ---
To: vim-dev at vim.org
Subject: Patch 7.2.259
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.259
Problem:    exists() doesn't work properly for an empty aucmd group.
Solution:   Change how au_exists() handles a missing pattern.  Also add a
	    test for this. (Bob Hiestand)
Files:	    src/fileio.c, src/testdir/Makefile, src/testdir/test67.in,
	    src/testdir/test67.ok


*** ../vim-7.2.258/src/fileio.c	2009-09-11 15:04:13.000000000 +0200
--- src/fileio.c	2009-09-11 16:37:08.000000000 +0200
***************
*** 9498,9512 ****
      ap = first_autopat[(int)event];
      if (ap == NULL)
  	goto theend;
-     if (pattern == NULL)
-     {
- 	retval = TRUE;
- 	goto theend;
-     }
  
      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
      /* for pattern "<buffer=N>, fnamecmp() will work fine */
!     if (STRICMP(pattern, "<buffer>") == 0)
  	buflocal_buf = curbuf;
  
      /* Check if there is an autocommand with the given pattern. */
--- 9498,9507 ----
      ap = first_autopat[(int)event];
      if (ap == NULL)
  	goto theend;
  
      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
      /* for pattern "<buffer=N>, fnamecmp() will work fine */
!     if (pattern != NULL && STRICMP(pattern, "<buffer>") == 0)
  	buflocal_buf = curbuf;
  
      /* Check if there is an autocommand with the given pattern. */
***************
*** 9515,9523 ****
  	/* For buffer-local autocommands, fnamecmp() works fine. */
  	if (ap->pat != NULL && ap->cmds != NULL
  	    && (group == AUGROUP_ALL || ap->group == group)
! 	    && (buflocal_buf == NULL
! 		 ? fnamecmp(ap->pat, pattern) == 0
! 		 : ap->buflocal_nr == buflocal_buf->b_fnum))
  	{
  	    retval = TRUE;
  	    break;
--- 9510,9519 ----
  	/* For buffer-local autocommands, fnamecmp() works fine. */
  	if (ap->pat != NULL && ap->cmds != NULL
  	    && (group == AUGROUP_ALL || ap->group == group)
! 	    && (pattern == NULL
! 		|| (buflocal_buf == NULL
! 		    ? fnamecmp(ap->pat, pattern) == 0
! 		    : ap->buflocal_nr == buflocal_buf->b_fnum)))
  	{
  	    retval = TRUE;
  	    break;
*** ../vim-7.2.258/src/testdir/Makefile	2009-06-24 18:07:55.000000000 +0200
--- src/testdir/Makefile	2009-09-11 16:31:33.000000000 +0200
***************
*** 22,28 ****
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out
  
  SCRIPTS_GUI = test16.out
  
--- 22,28 ----
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out
  
  SCRIPTS_GUI = test16.out
  
*** ../vim-7.2.258/src/testdir/test67.in	2009-09-11 17:23:47.000000000 +0200
--- src/testdir/test67.in	2009-09-11 16:43:11.000000000 +0200
***************
*** 0 ****
--- 1,33 ----
+ Test that groups and patterns are tested correctly when calling exists() for
+ autocommands.
+ 
+ STARTTEST
+ :so small.vim
+ :let results=[]
+ :augroup auexists
+ :augroup END
+ :call add(results, "##BufEnter: " . exists("##BufEnter"))
+ :call add(results, "#BufEnter: " . exists("#BufEnter"))
+ :au BufEnter * let g:entered=1
+ :call add(results, "#BufEnter: " . exists("#BufEnter"))
+ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
+ :augroup auexists
+ :au BufEnter * let g:entered=1
+ :augroup END
+ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
+ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
+ :au BufEnter *.test let g:entered=1
+ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
+ :edit testfile.test
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :au BufEnter <buffer> let g:entered=1
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :edit testfile2.test
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :e test.out
+ :call append(0, results)
+ :$d
+ :w
+ :qa!
+ ENDTEST
+ 
*** ../vim-7.2.258/src/testdir/test67.ok	2009-09-11 17:23:47.000000000 +0200
--- src/testdir/test67.ok	2009-09-11 16:43:15.000000000 +0200
***************
*** 0 ****
--- 1,10 ----
+ ##BufEnter: 1
+ #BufEnter: 0
+ #BufEnter: 1
+ #auexists#BufEnter: 0
+ #auexists#BufEnter: 1
+ #BufEnter#*.test: 0
+ #BufEnter#*.test: 1
+ #BufEnter#<buffer>: 0
+ #BufEnter#<buffer>: 1
+ #BufEnter#<buffer>: 0
*** ../vim-7.2.258/src/version.c	2009-09-11 16:48:06.000000000 +0200
--- src/version.c	2009-09-11 17:23:14.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     259,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
234. You started college as a chemistry major, and walk out four years
     later as an Internet provider.

 /// 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    ///


--- NEW FILE 7.2.260 ---
To: vim-dev at vim.org
Subject: Patch 7.2.260 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.260 (extra part of 7.2.259)
Problem:    exists() doesn't work properly for empty aucmd group.
Solution:   Change how au_exists() handles a missing pattern.  Also add a
	    test for this. (Bob Hiestand)
Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
	    src/testdir/Make_vms.mms


*** ../vim-7.2.259/src/testdir/Make_amiga.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_amiga.mak	2009-09-11 16:29:54.000000000 +0200
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
***************
*** 112,114 ****
--- 112,115 ----
  test64.out: test64.in
  test65.out: test65.in
  test66.out: test66.in
+ test67.out: test67.in
*** ../vim-7.2.259/src/testdir/Make_dos.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_dos.mak	2009-09-11 16:30:17.000000000 +0200
***************
*** 26,32 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out
  
  SCRIPTS32 =	test50.out
  
--- 26,32 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.259/src/testdir/Make_ming.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_ming.mak	2009-09-11 16:30:37.000000000 +0200
***************
*** 45,51 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out
  
  SCRIPTS32 =	test50.out
  
--- 45,51 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.259/src/testdir/Make_os2.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_os2.mak	2009-09-11 16:30:52.000000000 +0200
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
*** ../vim-7.2.259/src/testdir/Make_vms.mms	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_vms.mms	2009-09-11 16:31:06.000000000 +0200
***************
*** 4,10 ****
  # Authors:	Zoltan Arpadffy, <arpadffy at polarhome.com>
  #		Sandor Kopanyi,  <sandor.kopanyi at mailbox.hu>
  #
! # Last change:  2009 Mar 05
  #
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
  # Edit the lines in the Configuration section below to select.
--- 4,10 ----
  # Authors:	Zoltan Arpadffy, <arpadffy at polarhome.com>
  #		Sandor Kopanyi,  <sandor.kopanyi at mailbox.hu>
  #
! # Last change:  2009 Sep 11
  #
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
  # Edit the lines in the Configuration section below to select.
***************
*** 69,75 ****
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
--- 69,75 ----
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
*** ../vim-7.2.259/src/version.c	2009-09-11 17:24:01.000000000 +0200
--- src/version.c	2009-09-18 14:57:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     260,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
251. You've never seen your closest friends who usually live WAY too far away.

 /// 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    ///


--- NEW FILE 7.2.261 ---
To: vim-dev at vim.org
Subject: Patch 7.2.261
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.261
Problem:    When deleting lines with a specific folding configuration E38 may
	    appear. (Shahaf)
Solution:   When adjusting nested folds for deleted lines take into account
	    that they don't start at the top of the enclosing fold.
Files:	    src/fold.c


*** ../vim-7.2.260/src/fold.c	2009-01-06 15:01:58.000000000 +0100
--- src/fold.c	2009-09-18 14:43:23.000000000 +0200
***************
*** 1607,1617 ****
  	    }
  	    else
  	    {
- 		/* 2, 3, or 5: need to correct nested folds too */
- 		foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
- 				  line2 - fp->fd_top, amount, amount_after);
  		if (fp->fd_top < top)
  		{
  		    if (last <= line2)
  		    {
  			/* 2. fold contains line1, line2 is below fold */
--- 1607,1617 ----
  	    }
  	    else
  	    {
  		if (fp->fd_top < top)
  		{
+ 		    /* 2 or 3: need to correct nested folds too */
+ 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
+ 				  line2 - fp->fd_top, amount, amount_after);
  		    if (last <= line2)
  		    {
  			/* 2. fold contains line1, line2 is below fold */
***************
*** 1628,1634 ****
  		}
  		else
  		{
! 		    /* 5. fold is below line1 and contains line2 */
  		    if (amount == MAXLNUM)
  		    {
  			fp->fd_len -= line2 - fp->fd_top + 1;
--- 1628,1638 ----
  		}
  		else
  		{
! 		    /* 5. fold is below line1 and contains line2; need to
! 		     * correct nested folds too */
! 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
! 				  line2 - fp->fd_top, amount,
! 				  amount_after + (fp->fd_top - top));
  		    if (amount == MAXLNUM)
  		    {
  			fp->fd_len -= line2 - fp->fd_top + 1;
*** ../vim-7.2.260/src/version.c	2009-09-18 14:58:26.000000000 +0200
--- src/version.c	2009-09-18 15:14:40.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     261,
  /**/

-- 
Emacs is a nice OS - but it lacks a good text editor.
That's why I am using Vim.  --Anonymous

 /// 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    ///


--- NEW FILE 7.2.262 ---
To: vim-dev at vim.org
Subject: Patch 7.2.262
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.262
Problem:    When using custom completion for a user command the pattern string
	    goes beyond the cursor position. (Hari Krishna Dara)
Solution:   Truncate the string at the cursor position.
Files:	    src/ex_getln.c, src/structs.h


*** ../vim-7.2.261/src/ex_getln.c	2009-06-24 17:04:40.000000000 +0200
--- src/ex_getln.c	2009-09-18 16:58:16.000000000 +0200
***************
*** 3266,3272 ****
      int		i, j;
      char_u	*p1;
      char_u	*p2;
-     int		oldlen;
      int		difflen;
      int		v;
  
--- 3266,3271 ----
***************
*** 3291,3297 ****
      out_flush();
  
      i = (int)(xp->xp_pattern - ccline.cmdbuff);
!     oldlen = ccline.cmdpos - i;
  
      if (type == WILD_NEXT || type == WILD_PREV)
      {
--- 3290,3296 ----
      out_flush();
  
      i = (int)(xp->xp_pattern - ccline.cmdbuff);
!     xp->xp_pattern_len = ccline.cmdpos - i;
  
      if (type == WILD_NEXT || type == WILD_PREV)
      {
***************
*** 3305,3322 ****
  	/*
  	 * Translate string into pattern and expand it.
  	 */
! 	if ((p1 = addstar(&ccline.cmdbuff[i], oldlen, xp->xp_context)) == NULL)
  	    p2 = NULL;
  	else
  	{
! 	    p2 = ExpandOne(xp, p1, vim_strnsave(&ccline.cmdbuff[i], oldlen),
  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
  							      |options, type);
  	    vim_free(p1);
  	    /* longest match: make sure it is not shorter (happens with :help */
  	    if (p2 != NULL && type == WILD_LONGEST)
  	    {
! 		for (j = 0; j < oldlen; ++j)
  		     if (ccline.cmdbuff[i + j] == '*'
  			     || ccline.cmdbuff[i + j] == '?')
  			 break;
--- 3304,3323 ----
  	/*
  	 * Translate string into pattern and expand it.
  	 */
! 	if ((p1 = addstar(xp->xp_pattern, xp->xp_pattern_len,
! 						     xp->xp_context)) == NULL)
  	    p2 = NULL;
  	else
  	{
! 	    p2 = ExpandOne(xp, p1,
! 			 vim_strnsave(&ccline.cmdbuff[i], xp->xp_pattern_len),
  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
  							      |options, type);
  	    vim_free(p1);
  	    /* longest match: make sure it is not shorter (happens with :help */
  	    if (p2 != NULL && type == WILD_LONGEST)
  	    {
! 		for (j = 0; j < xp->xp_pattern_len; ++j)
  		     if (ccline.cmdbuff[i + j] == '*'
  			     || ccline.cmdbuff[i + j] == '?')
  			 break;
***************
*** 3331,3337 ****
  
      if (p2 != NULL && !got_int)
      {
! 	difflen = (int)STRLEN(p2) - oldlen;
  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
  	{
  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
--- 3332,3338 ----
  
      if (p2 != NULL && !got_int)
      {
! 	difflen = (int)STRLEN(p2) - xp->xp_pattern_len;
  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
  	{
  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
***************
*** 3620,3625 ****
--- 3621,3627 ----
      expand_T	*xp;
  {
      xp->xp_pattern = NULL;
+     xp->xp_pattern_len = 0;
      xp->xp_backslash = XP_BS_NONE;
  #ifndef BACKSLASH_IN_FILENAME
      xp->xp_shell = FALSE;
***************
*** 4311,4318 ****
      }
  
      /* add star to file name, or convert to regexp if not exp. files. */
!     file_str = addstar(xp->xp_pattern,
! 			   (int)(str + col - xp->xp_pattern), xp->xp_context);
      if (file_str == NULL)
  	return EXPAND_UNSUCCESSFUL;
  
--- 4313,4320 ----
      }
  
      /* add star to file name, or convert to regexp if not exp. files. */
!     xp->xp_pattern_len = (int)(str + col - xp->xp_pattern);
!     file_str = addstar(xp->xp_pattern, xp->xp_pattern_len, xp->xp_context);
      if (file_str == NULL)
  	return EXPAND_UNSUCCESSFUL;
  
***************
*** 4781,4787 ****
  	sprintf((char *)num, "%d", ccline.cmdpos);
  	args[1] = ccline.cmdbuff;
      }
!     args[0] = xp->xp_pattern;
      args[2] = num;
  
      /* Save the cmdline, we don't know what the function may do. */
--- 4783,4789 ----
  	sprintf((char *)num, "%d", ccline.cmdpos);
  	args[1] = ccline.cmdbuff;
      }
!     args[0] = vim_strnsave(xp->xp_pattern, xp->xp_pattern_len);
      args[2] = num;
  
      /* Save the cmdline, we don't know what the function may do. */
***************
*** 4797,4802 ****
--- 4799,4805 ----
      if (ccline.cmdbuff != NULL)
  	ccline.cmdbuff[ccline.cmdlen] = keep;
  
+     vim_free(args[0]);
      return ret;
  }
  
*** ../vim-7.2.261/src/structs.h	2009-07-29 12:09:49.000000000 +0200
--- src/structs.h	2009-09-18 15:33:15.000000000 +0200
***************
*** 432,437 ****
--- 432,438 ----
  {
      int		xp_context;		/* type of expansion */
      char_u	*xp_pattern;		/* start of item to expand */
+     int		xp_pattern_len;		/* bytes in xp_pattern before cursor */
  #if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
      char_u	*xp_arg;		/* completion function */
      int		xp_scriptID;		/* SID for completion function */
*** ../vim-7.2.261/src/version.c	2009-09-18 15:16:37.000000000 +0200
--- src/version.c	2009-09-18 17:23:20.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     262,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
252. You vote for foreign officials.

 /// 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    ///


--- NEW FILE 7.2.263 ---
To: vim-dev at vim.org
Subject: Patch 7.2.263
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.263
Problem:    GTK2: when using the -geom argument with an offset from the right
	    edge and the size is smaller than the default, the Vim window is
	    not positioned properly.
Solution:   Use another function to set the size. (Vitaly Minko)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.262/src/gui_gtk_x11.c	2009-09-11 15:46:20.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
***************
*** 4066,4071 ****
--- 4066,4073 ----
  {
      guicolor_T fg_pixel = INVALCOLOR;
      guicolor_T bg_pixel = INVALCOLOR;
+     guint		pixel_width;
+     guint		pixel_height;
  
  #ifdef HAVE_GTK2
      /*
***************
*** 4106,4113 ****
  	unsigned int	w, h;
  	int		x = 0;
  	int		y = 0;
- 	guint		pixel_width;
- 	guint		pixel_height;
  
  	mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
  
--- 4108,4113 ----
***************
*** 4160,4168 ****
  	}
      }
  
!     gtk_form_set_size(GTK_FORM(gui.formwin),
! 	    (guint)(gui_get_base_width() + Columns * gui.char_width),
! 	    (guint)(gui_get_base_height() + Rows * gui.char_height));
      update_window_manager_hints(0, 0);
  
      if (foreground_argument != NULL)
--- 4160,4175 ----
  	}
      }
  
!     pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
!     pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
! #ifdef HAVE_GTK2
!     /* For GTK2 changing the size of the form widget doesn't cause window
!      * resizing. */
!     if (gtk_socket_id == 0) 
! 	gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height);
! #else
!     gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height);
! #endif
      update_window_manager_hints(0, 0);
  
      if (foreground_argument != NULL)
*** ../vim-7.2.262/src/version.c	2009-09-18 17:24:54.000000000 +0200
--- src/version.c	2009-09-23 17:34:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     263,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
267. You get an extra phone line so you can get phone calls.

 /// 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    ///


--- NEW FILE 7.2.264 ---
To: vim-dev at vim.org
Subject: Patch 7.2.264
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.264
Problem:    GTK2: When the Vim window is maximized setting 'columns' or
	    'lines' doesn't work.
Solution:   Unmaximize the window before setting the size. (Vitaly Minko)
Files:	    src/gui.c, src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro


*** ../vim-7.2.263/src/gui.c	2009-07-29 11:10:31.000000000 +0200
--- src/gui.c	2009-09-23 16:28:09.000000000 +0200
***************
*** 1386,1391 ****
--- 1386,1395 ----
      int		min_height;
      int		screen_w;
      int		screen_h;
+ #ifdef HAVE_GTK2
+     int		un_maximize = mustset;
+     int         did_adjust = 0;
+ #endif
  
      if (!gui.shell_created)
  	return;
***************
*** 1425,1446 ****
  	    if (Columns < MIN_COLUMNS)
  		Columns = MIN_COLUMNS;
  	    width = Columns * gui.char_width + base_width;
  	}
  	if ((direction & RESIZE_VERT) && height > screen_h)
  	{
  	    Rows = (screen_h - base_height) / gui.char_height;
  	    check_shellsize();
  	    height = Rows * gui.char_height + base_height;
  	}
      }
      gui.num_cols = Columns;
      gui.num_rows = Rows;
  
      min_width = base_width + MIN_COLUMNS * gui.char_width;
      min_height = base_height + MIN_LINES * gui.char_height;
! # ifdef FEAT_WINDOWS
      min_height += tabline_height() * gui.char_height;
! # endif
  
      gui_mch_set_shellsize(width, height, min_width, min_height,
  					  base_width, base_height, direction);
--- 1429,1475 ----
  	    if (Columns < MIN_COLUMNS)
  		Columns = MIN_COLUMNS;
  	    width = Columns * gui.char_width + base_width;
+ #ifdef HAVE_GTK2
+ 	    ++did_adjust;
+ #endif
  	}
  	if ((direction & RESIZE_VERT) && height > screen_h)
  	{
  	    Rows = (screen_h - base_height) / gui.char_height;
  	    check_shellsize();
  	    height = Rows * gui.char_height + base_height;
+ #ifdef HAVE_GTK2
+ 	    ++did_adjust;
+ #endif
  	}
+ #ifdef HAVE_GTK2
+ 	if (did_adjust == 2 || (width + gui.char_width >= screen_w
+ 				     && height + gui.char_height >= screen_h))
+ 	    /* don't unmaximize if at maximum size */
+ 	    un_maximize = FALSE;
+ #endif
      }
      gui.num_cols = Columns;
      gui.num_rows = Rows;
  
      min_width = base_width + MIN_COLUMNS * gui.char_width;
      min_height = base_height + MIN_LINES * gui.char_height;
! #ifdef FEAT_WINDOWS
      min_height += tabline_height() * gui.char_height;
! #endif
! 
! #ifdef HAVE_GTK2
!     if (un_maximize)
!     {
! 	/* If the window size is smaller than the screen unmaximize the
! 	 * window, otherwise resizing won't work. */
! 	gui_mch_get_screen_dimensions(&screen_w, &screen_h);
! 	if ((width + gui.char_width < screen_w
! 				   || height + gui.char_height * 2 < screen_h)
! 		&& gui_mch_maximized())
! 	    gui_mch_unmaximize();
!     }
! #endif
  
      gui_mch_set_shellsize(width, height, min_width, min_height,
  					  base_width, base_height, direction);
*** ../vim-7.2.263/src/gui_gtk_x11.c	2009-09-23 17:35:17.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
***************
*** 4376,4381 ****
--- 4376,4404 ----
  #endif
  #endif /* HAVE_GTK2 */
  
+ #if defined(HAVE_GTK2) || defined(PROTO)
+ /*
+  * Return TRUE if the main window is maximized.
+  */
+     int
+ gui_mch_maximized()
+ {
+     return (gui.mainwin != NULL && gui.mainwin->window != NULL
+ 	    && (gdk_window_get_state(gui.mainwin->window)
+ 					       & GDK_WINDOW_STATE_MAXIMIZED));
+ }
+ 
+ /*
+  * Unmaximize the main window
+  */
+     void
+ gui_mch_unmaximize()
+ {
+     if (gui.mainwin != NULL)
+ 	gtk_window_unmaximize(GTK_WINDOW(gui.mainwin));
+ }
+ #endif
+ 
  /*
   * Set the windows size.
   */
*** ../vim-7.2.263/src/proto/gui_gtk_x11.pro	2007-05-05 19:18:54.000000000 +0200
--- src/proto/gui_gtk_x11.pro	2009-09-23 15:43:45.000000000 +0200
***************
*** 16,21 ****
--- 16,23 ----
  void gui_mch_exit __ARGS((int rc));
  int gui_mch_get_winpos __ARGS((int *x, int *y));
  void gui_mch_set_winpos __ARGS((int x, int y));
+ int gui_mch_maximized __ARGS((void));
+ void gui_mch_unmaximize __ARGS((void));
  void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
  void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
  void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
*** ../vim-7.2.263/src/version.c	2009-09-23 17:35:17.000000000 +0200
--- src/version.c	2009-09-23 18:12:21.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     264,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
268. You get up in the morning and go online before getting your coffee.

 /// 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    ///


--- NEW FILE 7.2.265 ---
To: vim-dev at vim.org
Subject: Patch 7.2.265
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.265
Problem:    When using ":silent broken" inside try/catch silency may persist.
	    (dr-dr xp)
Solution:   Set msg_silent when there is an error and it's bigger than the
	    saved value.
Files:	    src/ex_docmd.c


*** ../vim-7.2.264/src/ex_docmd.c	2009-07-09 20:13:59.000000000 +0200
--- src/ex_docmd.c	2009-09-30 11:40:53.000000000 +0200
***************
*** 2695,2701 ****
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	if (!did_emsg)
  	    msg_silent = save_msg_silent;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
--- 2695,2701 ----
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	if (!did_emsg || msg_silent > save_msg_silent)
  	    msg_silent = save_msg_silent;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
*** ../vim-7.2.264/src/version.c	2009-09-23 18:14:13.000000000 +0200
--- src/version.c	2009-09-30 13:22:47.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     265,
  /**/

-- 
FIRST HEAD:  Oh! quick! get the sword out I want to cut his head off.
THIRD HEAD:  Oh, cut your own head off.
SECOND HEAD: Yes - do us all a favour.
                 "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    ///


--- NEW FILE 7.2.266 ---
To: vim-dev at vim.org
Subject: Patch 7.2.266
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.266
Problem:    When an expression abbreviation is triggered, the typed character
	    is unknown.
Solution:   Make the typed character available in v:char.
Files:	    runtime/doc/map.txt, src/eval.c, src/getchar.c, src/ops.c,
	    src/proto/eval.pro


*** ../vim-7.2.265/runtime/doc/map.txt	2008-08-09 19:36:49.000000000 +0200
--- runtime/doc/map.txt	2009-09-23 19:39:19.000000000 +0200
***************
*** 224,229 ****
--- 224,233 ----
  The result of the InsertDot() function will be inserted.  It could check the
  text before the cursor and start omni completion when some condition is met.
  
+ For abbreviations |v:char| is set to the character that was typed to trigger
+ the abbreviation.  You can use this to decide how to expand the {lhs}.  You
+ can't change v:char and you should not insert it.
+ 
  Be very careful about side effects!  The expression is evaluated while
  obtaining characters, you may very well make the command dysfunctional.
  For this reason the following is blocked:
*** ../vim-7.2.265/src/eval.c	2009-06-03 14:25:47.000000000 +0200
--- src/eval.c	2009-09-23 19:36:32.000000000 +0200
***************
*** 18101,18106 ****
--- 18101,18131 ----
  }
  
  /*
+  * Set v:char to character "c".
+  */
+     void
+ set_vim_var_char(c)
+     int c;
+ {
+ #ifdef FEAT_MBYTE
+     char_u	buf[MB_MAXBYTES];
+ #else
+     char_u	buf[2];
+ #endif
+ 
+ #ifdef FEAT_MBYTE
+     if (has_mbyte)
+ 	buf[(*mb_char2bytes)(c, buf)] = NUL;
+     else
+ #endif
+     {
+ 	buf[0] = c;
+ 	buf[1] = NUL;
+     }
+     set_vim_var_string(VV_CHAR, buf, -1);
+ }
+ 
+ /*
   * Set v:count to "count" and v:count1 to "count1".
   * When "set_prevcount" is TRUE first set v:prevcount from v:count.
   */
*** ../vim-7.2.265/src/getchar.c	2009-07-14 13:44:43.000000000 +0200
--- src/getchar.c	2009-09-23 19:35:54.000000000 +0200
***************
*** 129,135 ****
  static void	validate_maphash __ARGS((void));
  static void	showmap __ARGS((mapblock_T *mp, int local));
  #ifdef FEAT_EVAL
! static char_u	*eval_map_expr __ARGS((char_u *str));
  #endif
  
  /*
--- 129,135 ----
  static void	validate_maphash __ARGS((void));
  static void	showmap __ARGS((mapblock_T *mp, int local));
  #ifdef FEAT_EVAL
! static char_u	*eval_map_expr __ARGS((char_u *str, int c));
  #endif
  
  /*
***************
*** 2446,2452 ****
  			    if (tabuf.typebuf_valid)
  			    {
  				vgetc_busy = 0;
! 				s = eval_map_expr(mp->m_str);
  				vgetc_busy = save_vgetc_busy;
  			    }
  			    else
--- 2446,2452 ----
  			    if (tabuf.typebuf_valid)
  			    {
  				vgetc_busy = 0;
! 				s = eval_map_expr(mp->m_str, NUL);
  				vgetc_busy = save_vgetc_busy;
  			    }
  			    else
***************
*** 4367,4375 ****
  	     * abbreviation, but is not inserted into the input stream.
  	     */
  	    j = 0;
- 					/* special key code, split up */
  	    if (c != Ctrl_RSB)
  	    {
  		if (IS_SPECIAL(c) || c == K_SPECIAL)
  		{
  		    tb[j++] = K_SPECIAL;
--- 4367,4375 ----
  	     * abbreviation, but is not inserted into the input stream.
  	     */
  	    j = 0;
  	    if (c != Ctrl_RSB)
  	    {
+ 					/* special key code, split up */
  		if (IS_SPECIAL(c) || c == K_SPECIAL)
  		{
  		    tb[j++] = K_SPECIAL;
***************
*** 4398,4404 ****
  	    }
  #ifdef FEAT_EVAL
  	    if (mp->m_expr)
! 		s = eval_map_expr(mp->m_str);
  	    else
  #endif
  		s = mp->m_str;
--- 4398,4404 ----
  	    }
  #ifdef FEAT_EVAL
  	    if (mp->m_expr)
! 		s = eval_map_expr(mp->m_str, c);
  	    else
  #endif
  		s = mp->m_str;
***************
*** 4434,4441 ****
   * special characters.
   */
      static char_u *
! eval_map_expr(str)
      char_u	*str;
  {
      char_u	*res;
      char_u	*p;
--- 4434,4442 ----
   * special characters.
   */
      static char_u *
! eval_map_expr(str, c)
      char_u	*str;
+     int		c;	    /* NUL or typed character for abbreviation */
  {
      char_u	*res;
      char_u	*p;
***************
*** 4452,4457 ****
--- 4453,4459 ----
  #ifdef FEAT_EX_EXTRA
      ++ex_normal_lock;
  #endif
+     set_vim_var_char(c);  /* set v:char to the typed character */
      save_cursor = curwin->w_cursor;
      p = eval_to_string(str, NULL, FALSE);
      --textlock;
*** ../vim-7.2.265/src/ops.c	2009-07-01 18:04:30.000000000 +0200
--- src/ops.c	2009-09-23 19:11:40.000000000 +0200
***************
*** 4473,4483 ****
      int		use_sandbox = was_set_insecurely((char_u *)"formatexpr",
  								   OPT_LOCAL);
      int		r;
- #ifdef FEAT_MBYTE
-     char_u	buf[MB_MAXBYTES];
- #else
-     char_u	buf[2];
- #endif
  
      /*
       * Set v:lnum to the first line number and v:count to the number of lines.
--- 4473,4478 ----
***************
*** 4485,4501 ****
       */
      set_vim_var_nr(VV_LNUM, lnum);
      set_vim_var_nr(VV_COUNT, count);
! 
! #ifdef FEAT_MBYTE
!     if (has_mbyte)
! 	buf[(*mb_char2bytes)(c, buf)] = NUL;
!     else
! #endif
!     {
! 	buf[0] = c;
! 	buf[1] = NUL;
!     }
!     set_vim_var_string(VV_CHAR, buf, -1);
  
      /*
       * Evaluate the function.
--- 4480,4486 ----
       */
      set_vim_var_nr(VV_LNUM, lnum);
      set_vim_var_nr(VV_COUNT, count);
!     set_vim_var_char(c);
  
      /*
       * Evaluate the function.
*** ../vim-7.2.265/src/proto/eval.pro	2008-11-20 16:11:03.000000000 +0100
--- src/proto/eval.pro	2009-09-23 19:36:30.000000000 +0200
***************
*** 61,66 ****
--- 61,67 ----
  long get_vim_var_nr __ARGS((int idx));
  char_u *get_vim_var_str __ARGS((int idx));
  list_T *get_vim_var_list __ARGS((int idx));
+ void set_vim_var_char __ARGS((int c));
  void set_vcount __ARGS((long count, long count1, int set_prevcount));
  void set_vim_var_string __ARGS((int idx, char_u *val, int len));
  void set_vim_var_list __ARGS((int idx, list_T *val));
*** ../vim-7.2.265/src/version.c	2009-09-30 13:23:57.000000000 +0200
--- src/version.c	2009-09-30 15:11:29.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     266,
  /**/

-- 
Life would be so much easier if we could just look at the source code.

 /// 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    ///


--- NEW FILE 7.2.267 ---
To: vim-dev at vim.org
Subject: Patch 7.2.267
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.267
Problem:    Crash for narrow window and double-width character.
Solution:   Check for zero width.  (Taro Muraoka)
Files:	    src/charset.c


*** ../vim-7.2.266/src/charset.c	2009-09-11 14:02:25.000000000 +0200
--- src/charset.c	2009-10-07 16:17:27.000000000 +0200
***************
*** 1218,1223 ****
--- 1218,1225 ----
      if ((int)vcol == width1 - 1)
  	return TRUE;
      width2 = width1 + win_col_off2(wp);
+     if (width2 <= 0)
+ 	return FALSE;
      return ((vcol - width1) % width2 == width2 - 1);
  }
  #endif /* FEAT_MBYTE */
*** ../vim-7.2.266/src/version.c	2009-09-30 15:15:33.000000000 +0200
--- src/version.c	2009-10-07 16:19:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     267,
  /**/

-- 
You got to work at a mill?  Lucky!  I got sent back to work in the
acid-mines for my daily crust of stale bread... which not even the
birds would eat.

 /// 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    ///


--- NEW FILE 7.2.268 ---
To: vim-dev at vim.org
Subject: Patch 7.2.268
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.268
Problem:    Crash when using Python to set cursor beyond end of line.
	    (winterTTr)
Solution:   Check the column to be valid.
Files:	    src/if_python.c


*** ../vim-7.2.267/src/if_python.c	2009-07-09 20:06:30.000000000 +0200
--- src/if_python.c	2009-10-10 14:49:10.000000000 +0200
***************
*** 2058,2063 ****
--- 2058,2064 ----
      {
  	long lnum;
  	long col;
+ 	long len;
  
  	if (!PyArg_Parse(val, "(ll)", &lnum, &col))
  	    return -1;
***************
*** 2072,2081 ****
  	if (VimErrorCheck())
  	    return -1;
  
! 	/* NO CHECK ON COLUMN - SEEMS NOT TO MATTER */
  
  	this->win->w_cursor.lnum = lnum;
  	this->win->w_cursor.col = col;
  	update_screen(VALID);
  
  	return 0;
--- 2073,2088 ----
  	if (VimErrorCheck())
  	    return -1;
  
! 	/* When column is out of range silently correct it. */
! 	len = STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
! 	if (col > len)
! 	    col = len;
  
  	this->win->w_cursor.lnum = lnum;
  	this->win->w_cursor.col = col;
+ #ifdef FEAT_VIRTUALEDIT
+ 	this->win->w_cursor.coladd = 0;
+ #endif
  	update_screen(VALID);
  
  	return 0;
*** ../vim-7.2.267/src/version.c	2009-10-07 16:19:52.000000000 +0200
--- src/version.c	2009-11-03 11:42:08.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     268,
  /**/

-- 
VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur
            and his knights seemed hopeless,  when, suddenly ... the animator
            suffered a fatal heart attack.
ANIMATOR:   Aaaaagh!
VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could
            continue.
                 "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    ///


--- NEW FILE 7.2.269 ---
To: vim-dev at vim.org
Subject: Patch 7.2.269
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.269
Problem:    Many people struggle to find out why Vim startup is slow.
Solution:   Add the --startuptime command line flag.
Files:	    runtime/doc/starting.txt, src/globals.h, src/feature.h,
	    src/main.c, src/macros.h


*** ../vim-7.2.268/runtime/doc/starting.txt	2008-11-09 13:43:25.000000000 +0100
--- runtime/doc/starting.txt	2009-10-25 11:57:51.000000000 +0100
***************
*** 144,149 ****
--- 144,156 ----
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
+ --startuptime={fname}					*--startuptime*
+ 		During startup write timing messages to the file {fname}.
+ 		This can be used to find out where time is spent while loading
+ 		your .vimrc and plugins.
+ 		When {fname} already exists new messages are appended.
+ 		{only when compiled with this feature}
+ 
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
  		for Unix, because Vim always takes file names literally (the
***************
*** 471,476 ****
--- 487,493 ----
  		window title and copy/paste using the X clipboard.  This
  		avoids a long startup time when running Vim in a terminal
  		emulator and the connection to the X server is slow.
+ 		See |--startuptime| to find out if affects you.
  		Only makes a difference on Unix or VMS, when compiled with the
  		|+X11| feature.  Otherwise it's ignored.
  		To disable the connection only for specific terminals, see the
*** ../vim-7.2.268/src/globals.h	2009-07-29 12:09:49.000000000 +0200
--- src/globals.h	2009-10-10 15:14:31.000000000 +0200
***************
*** 1567,1572 ****
--- 1567,1576 ----
  /* For undo we need to know the lowest time possible. */
  EXTERN time_t starttime;
  
+ #ifdef STARTUPTIME
+ EXTERN FILE *time_fd INIT(= NULL);  /* where to write startup timing */
+ #endif
+ 
  /*
   * Some compilers warn for not using a return value, but in some situations we
   * can't do anything useful with the value.  Assign to this variable to avoid
*** ../vim-7.2.268/src/feature.h	2008-11-09 13:43:25.000000000 +0100
--- src/feature.h	2009-10-10 16:16:19.000000000 +0200
***************
*** 844,853 ****
  /* #define DEBUG */
  
  /*
!  * STARTUPTIME		Time the startup process.  Writes a "vimstartup" file
!  *			with timestamps.
   */
! /* #define STARTUPTIME "vimstartup" */
  
  /*
   * MEM_PROFILE		Debugging of memory allocation and freeing.
--- 844,857 ----
  /* #define DEBUG */
  
  /*
!  * STARTUPTIME		Time the startup process.  Writes a file with
!  *			timestamps.
   */
! #if defined(FEAT_NORMAL) \
! 	&& ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
! 		|| defined(WIN3264))
! # define STARTUPTIME 1
! #endif
  
  /*
   * MEM_PROFILE		Debugging of memory allocation and freeing.
*** ../vim-7.2.268/src/main.c	2009-05-26 22:58:43.000000000 +0200
--- src/main.c	2009-10-10 16:18:32.000000000 +0200
***************
*** 130,139 ****
  #endif
  
  
- #ifdef STARTUPTIME
- static FILE *time_fd = NULL;
- #endif
- 
  /*
   * Different types of error messages.
   */
--- 130,135 ----
***************
*** 173,178 ****
--- 169,177 ----
      char_u	*fname = NULL;		/* file name from command line */
      mparm_T	params;			/* various parameters passed between
  					 * main() and other functions. */
+ #ifdef STARTUPTIME
+     int		i;
+ #endif
  
      /*
       * Do any system-specific initialisations.  These can NOT use IObuff or
***************
*** 203,210 ****
  #endif
  
  #ifdef STARTUPTIME
!     time_fd = mch_fopen(STARTUPTIME, "a");
!     TIME_MSG("--- VIM STARTING ---");
  #endif
      starttime = time(NULL);
  
--- 202,216 ----
  #endif
  
  #ifdef STARTUPTIME
!     for (i = 1; i < argc; ++i)
!     {
! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
! 	{
! 	    time_fd = mch_fopen(argv[i] + 14, "a");
! 	    TIME_MSG("--- VIM STARTING ---");
! 	    break;
! 	}
!     }
  #endif
      starttime = time(NULL);
  
***************
*** 1150,1155 ****
--- 1156,1173 ----
  	    cursor_on();
  
  	    do_redraw = FALSE;
+ 
+ #ifdef STARTUPTIME
+ 	    /* Now that we have drawn the first screen all the startup stuff
+ 	     * has been done, close any file for startup messages. */
+ 	    if (time_fd != NULL)
+ 	    {
+ 		TIME_MSG("first screen update");
+ 		TIME_MSG("--- VIM STARTED ---");
+ 		fclose(time_fd);
+ 		time_fd = NULL;
+ 	    }
+ #endif
  	}
  #ifdef FEAT_GUI
  	if (need_mouse_correct)
***************
*** 1743,1748 ****
--- 1761,1770 ----
  		    /* already processed, skip */
  		}
  #endif
+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ 		{
+ 		    /* already processed, skip */
+ 		}
  		else
  		{
  		    if (argv[0][argv_idx])
***************
*** 3211,3216 ****
--- 3233,3252 ----
  
  static struct timeval	prev_timeval;
  
+ # ifdef WIN3264
+ /*
+  * Windows doesn't have gettimeofday(), although it does have struct timeval.
+  */
+     static int
+ gettimeofday(struct timeval *tv, char *dummy)
+ {
+     long t = clock();
+     tv->tv_sec = t / CLOCKS_PER_SEC;
+     tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
+     return 0;
+ }
+ # endif
+ 
  /*
   * Save the previous time before doing something that could nest.
   * set "*tv_rel" to the time elapsed so far.
***************
*** 3299,3318 ****
      }
  }
  
- # ifdef WIN3264
- /*
-  * Windows doesn't have gettimeofday(), although it does have struct timeval.
-  */
-     int
- gettimeofday(struct timeval *tv, char *dummy)
- {
-     long t = clock();
-     tv->tv_sec = t / CLOCKS_PER_SEC;
-     tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
-     return 0;
- }
- # endif
- 
  #endif
  
  #if defined(FEAT_CLIENTSERVER) || defined(PROTO)
--- 3335,3340 ----
*** ../vim-7.2.268/src/macros.h	2009-05-17 13:30:58.000000000 +0200
--- src/macros.h	2009-10-10 15:19:07.000000000 +0200
***************
*** 243,249 ****
  #endif
  
  #ifdef STARTUPTIME
! # define TIME_MSG(s) time_msg(s, NULL)
  #else
  # define TIME_MSG(s)
  #endif
--- 243,249 ----
  #endif
  
  #ifdef STARTUPTIME
! # define TIME_MSG(s) { if (time_fd != NULL) time_msg(s, NULL); }
  #else
  # define TIME_MSG(s)
  #endif
*** ../vim-7.2.268/src/version.c	2009-11-03 11:43:05.000000000 +0100
--- src/version.c	2009-11-03 12:06:31.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     269,
  /**/

-- 
BEDEVERE: Look!  It's the old man from scene 24 - what's he Doing here?
ARTHUR:   He is the keeper of the Bridge.  He asks each traveler five
          questions ...
GALAHAD:  Three questions.
                 "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    ///


--- NEW FILE 7.2.270 ---
To: vim-dev at vim.org
Subject: Patch 7.2.270
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.270
Problem:    Using ":@c" when the c register contains a CR causes the rest to
	    be executed later. (Dexter Douglas)
Solution:   Don't check for typeahead to start with ':', keep executing
	    commands until all added typeahead has been used.
Files:	    src/ex_docmd.c


*** ../vim-7.2.269/src/ex_docmd.c	2009-09-30 13:23:57.000000000 +0200
--- src/ex_docmd.c	2009-10-28 12:06:54.000000000 +0100
***************
*** 8358,8363 ****
--- 8358,8364 ----
      exarg_T	*eap;
  {
      int		c;
+     int		prev_len = typebuf.tb_len;
  
      curwin->w_cursor.lnum = eap->line2;
  
***************
*** 8383,8393 ****
  
  	/*
  	 * Execute from the typeahead buffer.
! 	 * Originally this didn't check for the typeahead buffer to be empty,
! 	 * thus could read more Ex commands from stdin.  It's not clear why,
! 	 * it is certainly unexpected.
  	 */
! 	while ((!stuff_empty() || typebuf.tb_len > 0) && vpeekc() == ':')
  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
  
  	exec_from_reg = save_efr;
--- 8384,8393 ----
  
  	/*
  	 * Execute from the typeahead buffer.
! 	 * Continue until the stuff buffer is empty and all added characters
! 	 * have been consumed.
  	 */
! 	while (!stuff_empty() || typebuf.tb_len > prev_len)
  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
  
  	exec_from_reg = save_efr;
*** ../vim-7.2.269/src/version.c	2009-11-03 12:10:39.000000000 +0100
--- src/version.c	2009-11-03 12:32:47.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     270,
  /**/

-- 
To the optimist, the glass is half full.
To the pessimist, the glass is half empty.
To the engineer, the glass is twice as big as it needs to be.

 /// 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    ///


--- NEW FILE 7.2.271 ---
To: vim-dev at vim.org
Subject: Patch 7.2.271
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.271
Problem:    Using freed memory in Motif GUI version when making a choice.
Solution:   Free memory only after using it. (Dominique Pelle)
Files:	    src/gui_xmdlg.c


*** ../vim-7.2.270/src/gui_xmdlg.c	2009-05-21 23:25:38.000000000 +0200
--- src/gui_xmdlg.c	2009-10-28 21:56:15.000000000 +0100
***************
*** 10,16 ****
  /*
   * (C) 2001,2005 by Marcin Dalecki <martin at dalecki.de>
   *
!  * Implementation of dialogue functions for the Motif GUI variant.
   *
   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
   * when using a dynamic scrollbar policy.
--- 10,16 ----
  /*
   * (C) 2001,2005 by Marcin Dalecki <martin at dalecki.de>
   *
!  * Implementation of dialog functions for the Motif GUI variant.
   *
   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
   * when using a dynamic scrollbar policy.
***************
*** 633,648 ****
  	data->sel[which] = XtNewString(sel);
      else
      {
- 	XtFree(data->sel[which]);
  	if (!strcmp(data->sel[which], sel))
  	{
  	    /* unselecting current selection */
  	    data->sel[which] = NULL;
  	    if (w)
  		XmListDeselectItem(w, call_data->item);
  	}
  	else
  	    data->sel[which] = XtNewString(sel);
      }
      XtFree(sel);
  
--- 633,651 ----
  	data->sel[which] = XtNewString(sel);
      else
      {
  	if (!strcmp(data->sel[which], sel))
  	{
  	    /* unselecting current selection */
+ 	    XtFree(data->sel[which]);
  	    data->sel[which] = NULL;
  	    if (w)
  		XmListDeselectItem(w, call_data->item);
  	}
  	else
+ 	{
+ 	    XtFree(data->sel[which]);
  	    data->sel[which] = XtNewString(sel);
+ 	}
      }
      XtFree(sel);
  
*** ../vim-7.2.270/src/version.c	2009-11-03 12:38:50.000000000 +0100
--- src/version.c	2009-11-03 12:48:26.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     271,
  /**/

-- 
ROBIN:  (warily) And if you get a question wrong?
ARTHUR: You are cast into the Gorge of Eternal Peril.
ROBIN:  Oh ... wacho!
                 "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    ///


--- NEW FILE 7.2.272 ---
To: vim-dev at vim.org
Subject: Patch 7.2.272
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.272
Problem:    "_.svz" is not recognized as a swap file. (David M. Besonen)
Solution:   Accept .s[uvw][a-z] as a swap file name extension.
Files:	    src/memline.c


*** ../vim-7.2.271/src/memline.c	2009-04-22 15:56:27.000000000 +0200
--- src/memline.c	2009-10-29 20:55:08.000000000 +0100
***************
*** 864,884 ****
      recoverymode = TRUE;
      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
      attr = hl_attr(HLF_E);
! /*
!  * If the file name ends in ".sw?" we use it directly.
!  * Otherwise a search is done to find the swap file(s).
!  */
      fname = curbuf->b_fname;
      if (fname == NULL)		    /* When there is no file name */
  	fname = (char_u *)"";
      len = (int)STRLEN(fname);
      if (len >= 4 &&
  #if defined(VMS) || defined(RISCOS)
! 	    STRNICMP(fname + len - 4, "_sw" , 3)
  #else
! 	    STRNICMP(fname + len - 4, ".sw" , 3)
  #endif
! 		== 0)
      {
  	directly = TRUE;
  	fname = vim_strsave(fname); /* make a copy for mf_open() */
--- 864,887 ----
      recoverymode = TRUE;
      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
      attr = hl_attr(HLF_E);
! 
!     /*
!      * If the file name ends in ".s[uvw][a-z]" we assume this is the swap file.
!      * Otherwise a search is done to find the swap file(s).
!      */
      fname = curbuf->b_fname;
      if (fname == NULL)		    /* When there is no file name */
  	fname = (char_u *)"";
      len = (int)STRLEN(fname);
      if (len >= 4 &&
  #if defined(VMS) || defined(RISCOS)
! 	    STRNICMP(fname + len - 4, "_s" , 2)
  #else
! 	    STRNICMP(fname + len - 4, ".s" , 2)
  #endif
! 		== 0
! 		&& vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
! 		&& ASCII_ISALPHA(fname[len - 1]))
      {
  	directly = TRUE;
  	fname = vim_strsave(fname); /* make a copy for mf_open() */
*** ../vim-7.2.271/src/version.c	2009-11-03 12:53:44.000000000 +0100
--- src/version.c	2009-11-03 13:02:51.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     272,
  /**/

-- 
Sorry, no fortune today.

 /// 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    ///


--- NEW FILE 7.2.273 ---
To: vim-dev at vim.org
Subject: Patch 7.2.273
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.273
Problem:    Crash with redir to unknown array. (Christian Brabandt)
Solution:   Don't assign the redir result when there was an error.
Files:	    src/eval.c


*** ../vim-7.2.272/src/eval.c	2009-09-30 15:15:33.000000000 +0200
--- src/eval.c	2009-11-03 12:05:07.000000000 +0100
***************
*** 988,1000 ****
      int		err;
      typval_T	tv;
  
!     /* Make sure a valid variable name is specified */
      if (!eval_isnamec1(*name))
      {
  	EMSG(_(e_invarg));
  	return FAIL;
      }
  
      redir_varname = vim_strsave(name);
      if (redir_varname == NULL)
  	return FAIL;
--- 988,1001 ----
      int		err;
      typval_T	tv;
  
!     /* Catch a bad name early. */
      if (!eval_isnamec1(*name))
      {
  	EMSG(_(e_invarg));
  	return FAIL;
      }
  
+     /* Make a copy of the name, it is used in redir_lval until redir ends. */
      redir_varname = vim_strsave(name);
      if (redir_varname == NULL)
  	return FAIL;
***************
*** 1019,1024 ****
--- 1020,1026 ----
  	    EMSG(_(e_trailing));
  	else
  	    EMSG(_(e_invarg));
+ 	redir_endp = NULL;  /* don't store a value, only cleanup */
  	var_redir_stop();
  	return FAIL;
      }
***************
*** 1037,1042 ****
--- 1039,1045 ----
      did_emsg |= save_emsg;
      if (err)
      {
+ 	redir_endp = NULL;  /* don't store a value, only cleanup */
  	var_redir_stop();
  	return FAIL;
      }
***************
*** 1085,1090 ****
--- 1088,1094 ----
  
  /*
   * Stop redirecting command output to a variable.
+  * Frees the allocated memory.
   */
      void
  var_redir_stop()
***************
*** 1093,1106 ****
  
      if (redir_lval != NULL)
      {
! 	/* Append the trailing NUL. */
! 	ga_append(&redir_ga, NUL);
  
! 	/* Assign the text to the variable. */
! 	tv.v_type = VAR_STRING;
! 	tv.vval.v_string = redir_ga.ga_data;
! 	set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
! 	vim_free(tv.vval.v_string);
  
  	clear_lval(redir_lval);
  	vim_free(redir_lval);
--- 1097,1114 ----
  
      if (redir_lval != NULL)
      {
! 	/* If there was no error: assign the text to the variable. */
! 	if (redir_endp != NULL)
! 	{
! 	    ga_append(&redir_ga, NUL);  /* Append the trailing NUL. */
! 	    tv.v_type = VAR_STRING;
! 	    tv.vval.v_string = redir_ga.ga_data;
! 	    set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
! 	}
  
! 	/* free the collected output */
! 	vim_free(redir_ga.ga_data);
! 	redir_ga.ga_data = NULL;
  
  	clear_lval(redir_lval);
  	vim_free(redir_lval);
*** ../vim-7.2.272/src/version.c	2009-11-03 13:06:03.000000000 +0100
--- src/version.c	2009-11-03 14:24:06.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     273,
  /**/

-- 
Permission is granted to read this message out aloud on Kings Cross Road,
London, under the condition that the orator is properly dressed.

 /// 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    ///


--- NEW FILE 7.2.274 ---
To: vim-dev at vim.org
Subject: Patch 7.2.274
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.274
Problem:    Syntax folding doesn't work properly when adding a comment.
Solution:   Fix it and add a test. (Lech Lorens)
Files:	    src/fold.c, src/testdir/test45.in, src/testdir/test45.ok


*** ../vim-7.2.273/src/fold.c	2009-09-18 15:16:37.000000000 +0200
--- src/fold.c	2009-11-03 12:36:37.000000000 +0100
***************
*** 2256,2261 ****
--- 2256,2295 ----
  	}
      }
  
+     /*
+      * If folding is defined by the syntax, it is possible that a change in
+      * one line will cause all sub-folds of the current fold to change (e.g.,
+      * closing a C-style comment can cause folds in the subsequent lines to
+      * appear). To take that into account we should adjust the value of "bot"
+      * to point to the end of the current fold:
+      */
+     if (foldlevelSyntax == getlevel)
+     {
+ 	garray_T *gap = &wp->w_folds;
+ 	fold_T	 *fp = NULL;
+ 	int	  current_fdl = 0;
+ 	linenr_T  fold_start_lnum = 0;
+ 	linenr_T  lnum_rel = fline.lnum;
+ 
+ 	while (current_fdl < fline.lvl)
+ 	{
+ 	    if (!foldFind(gap, lnum_rel, &fp))
+ 		break;
+ 	    ++current_fdl;
+ 
+ 	    fold_start_lnum += fp->fd_top;
+ 	    gap = &fp->fd_nested;
+ 	    lnum_rel -= fp->fd_top;
+ 	}
+ 	if (fp != NULL && current_fdl == fline.lvl)
+ 	{
+ 	    linenr_T fold_end_lnum = fold_start_lnum + fp->fd_len;
+ 
+ 	    if (fold_end_lnum > bot)
+ 		bot = fold_end_lnum;
+ 	}
+     }
+ 
      start = fline.lnum;
      end = bot;
      /* Do at least one line. */
*** ../vim-7.2.273/src/testdir/test45.in	2007-09-25 17:58:43.000000000 +0200
--- src/testdir/test45.in	2009-11-03 12:22:38.000000000 +0100
***************
*** 28,36 ****
  k:call append("$", foldlevel("."))
  :" test syntax folding
  :set fdm=syntax fdl=0
! :syn region Hup start="dd" end="hh" fold
  Gzk:call append("$", "folding " . getline("."))
  k:call append("$", getline("."))
  :" test expression folding
  :fun Flvl()
    let l = getline(v:lnum)
--- 28,41 ----
  k:call append("$", foldlevel("."))
  :" test syntax folding
  :set fdm=syntax fdl=0
! :syn region Hup start="dd" end="ii" fold contains=Fd1,Fd2,Fd3
! :syn region Fd1 start="ee" end="ff" fold contained
! :syn region Fd2 start="gg" end="hh" fold contained
! :syn region Fd3 start="commentstart" end="commentend" fold contained
  Gzk:call append("$", "folding " . getline("."))
  k:call append("$", getline("."))
+ jAcommentstart  Acommentend:set fdl=1
+ 3j:call append("$", getline("."))
  :" test expression folding
  :fun Flvl()
    let l = getline(v:lnum)
*** ../vim-7.2.273/src/testdir/test45.ok	2004-06-13 17:47:37.000000000 +0200
--- src/testdir/test45.ok	2009-11-03 12:22:50.000000000 +0100
***************
*** 8,15 ****
  0
  indent 2
  1
! folding 8 hh
      3 cc
  expr 2
  1
  2
--- 8,16 ----
  0
  indent 2
  1
! folding 9 ii
      3 cc
+ 7 gg
  expr 2
  1
  2
*** ../vim-7.2.273/src/version.c	2009-11-03 14:26:29.000000000 +0100
--- src/version.c	2009-11-03 14:44:21.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     274,
  /**/

-- 
BRIDGEKEEPER: What is your favorite colour?
LAUNCELOT:    Blue.
BRIDGEKEEPER: Right.  Off you go.
                 "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    ///


--- NEW FILE 7.2.275 ---
To: vim-dev at vim.org
Subject: Patch 7.2.275
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.275
Problem:    Warning for unused argument and comparing signed and unsigned.
Solution:   Add type cast.
Files:	    src/memline.c


*** ../vim-7.2.274/src/memline.c	2009-11-03 13:06:03.000000000 +0100
--- src/memline.c	2009-10-29 20:55:08.000000000 +0100
***************
*** 1285,1291 ****
  		    for (i = 0; i < dp->db_line_count; ++i)
  		    {
  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
! 			if (txt_start <= HEADER_SIZE
  					  || txt_start >= (int)dp->db_txt_end)
  			{
  			    p = (char_u *)"???";
--- 1285,1291 ----
  		    for (i = 0; i < dp->db_line_count; ++i)
  		    {
  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
! 			if (txt_start <= (int)HEADER_SIZE
  					  || txt_start >= (int)dp->db_txt_end)
  			{
  			    p = (char_u *)"???";
***************
*** 1296,1302 ****
  			ml_append(lnum++, p, (colnr_T)0, TRUE);
  		    }
  		    if (has_error)
! 			ml_append(lnum++, (char_u *)_("???END"), (colnr_T)0, TRUE);
  		}
  	    }
  	}
--- 1296,1303 ----
  			ml_append(lnum++, p, (colnr_T)0, TRUE);
  		    }
  		    if (has_error)
! 			ml_append(lnum++, (char_u *)_("???END"),
! 							    (colnr_T)0, TRUE);
  		}
  	    }
  	}
***************
*** 3576,3586 ****
   * Make swap file name out of the file name and a directory name.
   * Returns pointer to allocated memory or NULL.
   */
- /*ARGSUSED*/
      char_u *
  makeswapname(fname, ffname, buf, dir_name)
      char_u	*fname;
!     char_u	*ffname;
      buf_T	*buf;
      char_u	*dir_name;
  {
--- 3577,3586 ----
   * Make swap file name out of the file name and a directory name.
   * Returns pointer to allocated memory or NULL.
   */
      char_u *
  makeswapname(fname, ffname, buf, dir_name)
      char_u	*fname;
!     char_u	*ffname UNUSED;
      buf_T	*buf;
      char_u	*dir_name;
  {
*** ../vim-7.2.274/src/version.c	2009-11-03 14:46:35.000000000 +0100
--- src/version.c	2009-11-03 15:28:33.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     275,
  /**/

-- 
BRIDGEKEEPER: What is your favorite colour?
GAWAIN:       Blue ...  No yelloooooww!
                 "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    ///


--- NEW FILE 7.2.276 ---
To: vim-dev at vim.org
Subject: Patch 7.2.276
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.276
Problem:    Crash when setting 'isprint' to a small bullet. (Raul Coronado)
Solution:   Check for the character to be < 256.  Also make it possible to
	    specify a range of multi-byte characters. (Lech Lorens)
Files:	    src/charset.c


*** ../vim-7.2.275/src/charset.c	2009-10-07 16:19:52.000000000 +0200
--- src/charset.c	2009-11-03 12:46:12.000000000 +0100
***************
*** 187,195 ****
  		if (VIM_ISDIGIT(*p))
  		    c2 = getdigits(&p);
  		else
  		    c2 = *p++;
  	    }
! 	    if (c <= 0 || (c2 < c && c2 != -1) || c2 >= 256
  						 || !(*p == NUL || *p == ','))
  		return FAIL;
  
--- 187,200 ----
  		if (VIM_ISDIGIT(*p))
  		    c2 = getdigits(&p);
  		else
+ #ifdef FEAT_MBYTE
+ 		     if (has_mbyte)
+ 		    c2 = mb_ptr2char_adv(&p);
+ 		else
+ #endif
  		    c2 = *p++;
  	    }
! 	    if (c <= 0 || c >= 256 || (c2 < c && c2 != -1) || c2 >= 256
  						 || !(*p == NUL || *p == ','))
  		return FAIL;
  
*** ../vim-7.2.275/src/version.c	2009-11-03 15:32:58.000000000 +0100
--- src/version.c	2009-11-03 16:03:18.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     276,
  /**/

-- 
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    ///


--- NEW FILE 7.2.277 ---
To: vim-dev at vim.org
Subject: Patch 7.2.277
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.277
Problem:    CTRL-Y in a diff'ed window may move the cursor outside of the
	    window. (Lech Lorens)
Solution:   Limit the number of filler lines to the height of the window.
	    Don't reset filler lines to zero for an empty buffer.
Files:	    src/move.c


*** ../vim-7.2.276/src/move.c	2009-05-15 21:31:11.000000000 +0200
--- src/move.c	2009-11-03 14:39:55.000000000 +0100
***************
*** 183,191 ****
  	if (curwin->w_topline != 1)
  	    redraw_later(NOT_VALID);
  	curwin->w_topline = 1;
- #ifdef FEAT_DIFF
- 	curwin->w_topfill = 0;
- #endif
  	curwin->w_botline = 2;
  	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
  #ifdef FEAT_SCROLLBIND
--- 183,188 ----
***************
*** 1257,1263 ****
      while (line_count-- > 0)
      {
  #ifdef FEAT_DIFF
! 	if (curwin->w_topfill < diff_check(curwin, curwin->w_topline))
  	{
  	    ++curwin->w_topfill;
  	    ++done;
--- 1254,1261 ----
      while (line_count-- > 0)
      {
  #ifdef FEAT_DIFF
! 	if (curwin->w_topfill < diff_check(curwin, curwin->w_topline)
! 		&& curwin->w_topfill < curwin->w_height - 1)
  	{
  	    ++curwin->w_topfill;
  	    ++done;
*** ../vim-7.2.276/src/version.c	2009-11-03 16:03:59.000000000 +0100
--- src/version.c	2009-11-03 16:22:04.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     277,
  /**/

-- 
SIGFUN -- signature too funny (core dumped)

 /// 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    ///


--- NEW FILE 7.2.278 ---
To: vim-dev at vim.org
Subject: Patch 7.2.278
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.278
Problem:    Using magic number in the folding code.
Solution:   Use the defined MAX_LEVEL.
Files:	    src/fold.c


*** ../vim-7.2.277/src/fold.c	2009-11-03 14:46:35.000000000 +0100
--- src/fold.c	2009-11-03 12:36:37.000000000 +0100
***************
*** 1932,1938 ****
  #ifdef FEAT_EVAL
      if (*wp->w_p_fdt != NUL)
      {
! 	char_u	dashes[51];
  	win_T	*save_curwin;
  	int	level;
  	char_u	*p;
--- 1932,1938 ----
  #ifdef FEAT_EVAL
      if (*wp->w_p_fdt != NUL)
      {
! 	char_u	dashes[MAX_LEVEL + 2];
  	win_T	*save_curwin;
  	int	level;
  	char_u	*p;
***************
*** 1944,1951 ****
  	/* Set "v:folddashes" to a string of "level" dashes. */
  	/* Set "v:foldlevel" to "level". */
  	level = foldinfo->fi_level;
! 	if (level > 50)
! 	    level = 50;
  	vim_memset(dashes, '-', (size_t)level);
  	dashes[level] = NUL;
  	set_vim_var_string(VV_FOLDDASHES, dashes, -1);
--- 1944,1951 ----
  	/* Set "v:folddashes" to a string of "level" dashes. */
  	/* Set "v:foldlevel" to "level". */
  	level = foldinfo->fi_level;
! 	if (level > (int)sizeof(dashes) - 1)
! 	    level = (int)sizeof(dashes) - 1;
  	vim_memset(dashes, '-', (size_t)level);
  	dashes[level] = NUL;
  	set_vim_var_string(VV_FOLDDASHES, dashes, -1);
*** ../vim-7.2.277/src/version.c	2009-11-03 16:22:59.000000000 +0100
--- src/version.c	2009-11-03 16:29:08.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     278,
  /**/

-- 
BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
ARTHUR:       What do you mean?  An African or European swallow?
BRIDGEKEEPER: Er ...  I don't know that ... Aaaaarrrrrrggghhh!
   BRIDGEKEEPER is cast into the gorge.
                 "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    ///


--- NEW FILE 7.2.279 ---
To: vim-dev at vim.org
Subject: Patch 7.2.279
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.279
Problem:    Invalid memory read with visual mode "r". (Dominique Pelle)
Solution:   Make sure the cursor position is valid.  Don't check the cursor
	    position but the position being used.  And make sure we get the
	    right line.
Files:	    src/misc2.c, src/ops.c


*** ../vim-7.2.278/src/misc2.c	2009-05-16 21:06:36.000000000 +0200
--- src/misc2.c	2009-11-03 16:43:10.000000000 +0100
***************
*** 156,162 ****
  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
  #endif
  		    ;
!     line = ml_get_curline();
  
      if (wcol >= MAXCOL)
      {
--- 156,162 ----
  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
  #endif
  		    ;
!     line = ml_get_buf(curbuf, pos->lnum, FALSE);
  
      if (wcol >= MAXCOL)
      {
***************
*** 332,340 ****
  #endif
  
  #ifdef FEAT_MBYTE
!     /* prevent cursor from moving on the trail byte */
      if (has_mbyte)
! 	mb_adjust_cursor();
  #endif
  
      if (col < wcol)
--- 332,340 ----
  #endif
  
  #ifdef FEAT_MBYTE
!     /* prevent from moving onto a trail byte */
      if (has_mbyte)
! 	mb_adjustpos(pos);
  #endif
  
      if (col < wcol)
*** ../vim-7.2.278/src/ops.c	2009-09-30 15:15:33.000000000 +0200
--- src/ops.c	2009-11-03 15:18:50.000000000 +0100
***************
*** 2020,2025 ****
--- 2020,2026 ----
  	bd.is_MAX = (curwin->w_curswant == MAXCOL);
  	for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
  	{
+ 	    curwin->w_cursor.col = 0;  /* make sure cursor position is valid */
  	    block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
  	    if (bd.textlen == 0 && (!virtual_op || bd.is_MAX))
  		continue;	    /* nothing to replace */
***************
*** 2035,2040 ****
--- 2036,2042 ----
  	    {
  		pos_T vpos;
  
+ 		vpos.lnum = curwin->w_cursor.lnum;
  		getvpos(&vpos, oap->start_vcol);
  		bd.startspaces += vpos.coladd;
  		n = bd.startspaces;
***************
*** 2693,2703 ****
  			 * initial coladd offset as part of "startspaces" */
  			if (bd.is_short)
  			{
! 			    linenr_T lnum = curwin->w_cursor.lnum;
! 
! 			    curwin->w_cursor.lnum = linenr;
  			    (void)getvpos(&vpos, oap->start_vcol);
- 			    curwin->w_cursor.lnum = lnum;
  			}
  			else
  			    vpos.coladd = 0;
--- 2695,2702 ----
  			 * initial coladd offset as part of "startspaces" */
  			if (bd.is_short)
  			{
! 			    vpos.lnum = linenr;
  			    (void)getvpos(&vpos, oap->start_vcol);
  			}
  			else
  			    vpos.coladd = 0;
*** ../vim-7.2.278/src/version.c	2009-11-03 16:29:48.000000000 +0100
--- src/version.c	2009-11-03 16:41:53.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     279,
  /**/

-- 
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    ///


--- NEW FILE 7.2.280 ---
To: vim-dev at vim.org
Subject: Patch 7.2.280
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.280
Problem:    A redraw in a custom statusline with %! may cause a crash.
            (Yukihiro Nakadaira)
Solution:   Make a copy of 'statusline'.  Also fix typo in function name
            redraw_custum_statusline. (party by Dominique Pelle)
Files:      src/screen.c


*** ../vim-7.2.279/src/screen.c	2009-07-29 16:13:35.000000000 +0200
--- src/screen.c	2009-11-03 17:13:16.000000000 +0100
***************
*** 132,138 ****
  static void draw_vsep_win __ARGS((win_T *wp, int row));
  #endif
  #ifdef FEAT_STL_OPT
! static void redraw_custum_statusline __ARGS((win_T *wp));
  #endif
  #ifdef FEAT_SEARCH_EXTRA
  #define SEARCH_HL_PRIORITY 0
--- 132,138 ----
  static void draw_vsep_win __ARGS((win_T *wp, int row));
  #endif
  #ifdef FEAT_STL_OPT
! static void redraw_custom_statusline __ARGS((win_T *wp));
  #endif
  #ifdef FEAT_SEARCH_EXTRA
  #define SEARCH_HL_PRIORITY 0
***************
*** 5772,5778 ****
      else if (*p_stl != NUL || *wp->w_p_stl != NUL)
      {
  	/* redraw custom status line */
! 	redraw_custum_statusline(wp);
      }
  #endif
      else
--- 5794,5800 ----
      else if (*p_stl != NUL || *wp->w_p_stl != NUL)
      {
  	/* redraw custom status line */
! 	redraw_custom_statusline(wp);
      }
  #endif
      else
***************
*** 5897,5914 ****
   * errors encountered.
   */
      static void
! redraw_custum_statusline(wp)
      win_T	    *wp;
  {
!     int	save_called_emsg = called_emsg;
  
      called_emsg = FALSE;
      win_redr_custom(wp, FALSE);
      if (called_emsg)
  	set_string_option_direct((char_u *)"statusline", -1,
  		(char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
  					? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
      called_emsg |= save_called_emsg;
  }
  #endif
  
--- 5919,5949 ----
   * errors encountered.
   */
      static void
! redraw_custom_statusline(wp)
      win_T	    *wp;
  {
!     static int	    entered = FALSE;
!     int		    save_called_emsg = called_emsg;
! 
!     /* When called recursively return.  This can happen when the statusline
!      * contains an expression that triggers a redraw. */
!     if (entered)
! 	return;
!     entered = TRUE;
  
      called_emsg = FALSE;
      win_redr_custom(wp, FALSE);
      if (called_emsg)
+     {
+ 	/* When there is an error disable the statusline, otherwise the
+ 	 * display is messed up with errors and a redraw triggers the problem
+ 	 * again and again. */
  	set_string_option_direct((char_u *)"statusline", -1,
  		(char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
  					? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
+     }
      called_emsg |= save_called_emsg;
+     entered = FALSE;
  }
  #endif
  
***************
*** 6016,6021 ****
--- 6051,6057 ----
      int		len;
      int		fillchar;
      char_u	buf[MAXPATHL];
+     char_u	*stl;
      char_u	*p;
      struct	stl_hlrec hltab[STL_MAX_ITEM];
      struct	stl_hlrec tabtab[STL_MAX_ITEM];
***************
*** 6025,6031 ****
      if (wp == NULL)
      {
  	/* Use 'tabline'.  Always at the first line of the screen. */
! 	p = p_tal;
  	row = 0;
  	fillchar = ' ';
  	attr = hl_attr(HLF_TPF);
--- 6061,6067 ----
      if (wp == NULL)
      {
  	/* Use 'tabline'.  Always at the first line of the screen. */
! 	stl = p_tal;
  	row = 0;
  	fillchar = ' ';
  	attr = hl_attr(HLF_TPF);
***************
*** 6042,6058 ****
  
  	if (draw_ruler)
  	{
! 	    p = p_ruf;
  	    /* advance past any leading group spec - implicit in ru_col */
! 	    if (*p == '%')
  	    {
! 		if (*++p == '-')
! 		    p++;
! 		if (atoi((char *) p))
! 		    while (VIM_ISDIGIT(*p))
! 			p++;
! 		if (*p++ != '(')
! 		    p = p_ruf;
  	    }
  #ifdef FEAT_VERTSPLIT
  	    col = ru_col - (Columns - W_WIDTH(wp));
--- 6078,6094 ----
  
  	if (draw_ruler)
  	{
! 	    stl = p_ruf;
  	    /* advance past any leading group spec - implicit in ru_col */
! 	    if (*stl == '%')
  	    {
! 		if (*++stl == '-')
! 		    stl++;
! 		if (atoi((char *)stl))
! 		    while (VIM_ISDIGIT(*stl))
! 			stl++;
! 		if (*stl++ != '(')
! 		    stl = p_ruf;
  	    }
  #ifdef FEAT_VERTSPLIT
  	    col = ru_col - (Columns - W_WIDTH(wp));
***************
*** 6081,6089 ****
  	else
  	{
  	    if (*wp->w_p_stl != NUL)
! 		p = wp->w_p_stl;
  	    else
! 		p = p_stl;
  # ifdef FEAT_EVAL
  	    use_sandbox = was_set_insecurely((char_u *)"statusline",
  					 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL);
--- 6117,6125 ----
  	else
  	{
  	    if (*wp->w_p_stl != NUL)
! 		stl = wp->w_p_stl;
  	    else
! 		stl = p_stl;
  # ifdef FEAT_EVAL
  	    use_sandbox = was_set_insecurely((char_u *)"statusline",
  					 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL);
***************
*** 6098,6107 ****
      if (maxwidth <= 0)
  	return;
  
      width = build_stl_str_hl(wp == NULL ? curwin : wp,
  				buf, sizeof(buf),
! 				p, use_sandbox,
  				fillchar, maxwidth, hltab, tabtab);
      len = (int)STRLEN(buf);
  
      while (width < maxwidth && len < (int)sizeof(buf) - 1)
--- 6134,6147 ----
      if (maxwidth <= 0)
  	return;
  
+     /* Make a copy, because the statusline may include a function call that
+      * might change the option value and free the memory. */
+     stl = vim_strsave(stl);
      width = build_stl_str_hl(wp == NULL ? curwin : wp,
  				buf, sizeof(buf),
! 				stl, use_sandbox,
  				fillchar, maxwidth, hltab, tabtab);
+     vim_free(stl);
      len = (int)STRLEN(buf);
  
      while (width < maxwidth && len < (int)sizeof(buf) - 1)
***************
*** 9465,9471 ****
  #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
      if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
      {
! 	redraw_custum_statusline(curwin);
      }
      else
  #endif
--- 9505,9511 ----
  #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
      if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
      {
! 	redraw_custom_statusline(curwin);
      }
      else
  #endif
*** ../vim-7.2.279/src/version.c	2009-11-03 16:44:04.000000000 +0100
--- src/version.c	2009-11-03 17:15:35.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     280,
  /**/

-- 
Every exit is an entrance into something else.

 /// 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    ///


--- NEW FILE 7.2.281 ---
To: vim-dev at vim.org
Subject: Patch 7.2.281
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.281
Problem:    'cursorcolumn' highlighting is wrong in diff mode.
Solution:   Adjust the column computation. (Lech Lorens)
Files:	    src/screen.c


*** ../vim-7.2.280/src/screen.c	2009-11-03 17:20:18.000000000 +0100
--- src/screen.c	2009-11-03 17:13:16.000000000 +0100
***************
*** 3008,3018 ****
  	    mb_ptr_adv(ptr);
  	}
  
! #ifdef FEAT_VIRTUALEDIT
! 	/* When 'virtualedit' is set the end of the line may be before the
! 	 * start of the displayed part. */
! 	if (vcol < v && *ptr == NUL && virtual_active())
  	    vcol = v;
  #endif
  
  	/* Handle a character that's not completely on the screen: Put ptr at
--- 3008,3040 ----
  	    mb_ptr_adv(ptr);
  	}
  
! #if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
! 	/* When:
! 	 * - 'cuc' is set, or
! 	 * - 'virtualedit' is set, or
! 	 * - the visual mode is active,
! 	 * the end of the line may be before the start of the displayed part.
! 	 */
! 	if (vcol < v && (
! # ifdef FEAT_SYN_HL
! 	     wp->w_p_cuc
! #  if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
! 	     ||
! #  endif
! # endif
! # ifdef FEAT_VIRTUALEDIT
! 	     virtual_active()
! #  ifdef FEAT_VISUAL
! 	     ||
! #  endif
! # endif
! # ifdef FEAT_VISUAL
! 	     (VIsual_active && wp->w_buffer == curwin->w_buffer)
! # endif
! 	     ))
! 	{
  	    vcol = v;
+ 	}
  #endif
  
  	/* Handle a character that's not completely on the screen: Put ptr at
*** ../vim-7.2.280/src/version.c	2009-11-03 17:20:18.000000000 +0100
--- src/version.c	2009-11-03 17:34:54.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     281,
  /**/

-- 
Every person is responsible for the choices he makes.

 /// 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    ///


--- NEW FILE 7.2.282 ---
To: vim-dev at vim.org
Subject: Patch 7.2.282
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.282
Problem:    A fold can't be closed.
Solution:   Initialize fd_small to MAYBE. (Lech Lorens)
Files:	    src/fold.c


*** ../vim-7.2.281/src/fold.c	2009-11-03 16:29:48.000000000 +0100
--- src/fold.c	2009-11-03 17:41:50.000000000 +0100
***************
*** 2851,2856 ****
--- 2851,2858 ----
      fp[1].fd_top = bot + 1;
      fp[1].fd_len = fp->fd_len - (fp[1].fd_top - fp->fd_top);
      fp[1].fd_flags = fp->fd_flags;
+     fp[1].fd_small = MAYBE;
+     fp->fd_small = MAYBE;
  
      /* Move nested folds below bot to new fold.  There can't be
       * any between top and bot, they have been removed by the caller. */
*** ../vim-7.2.281/src/version.c	2009-11-03 17:36:09.000000000 +0100
--- src/version.c	2009-11-03 17:59:12.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     282,
  /**/

-- 
You can be stopped by the police for biking over 65 miles per hour.
You are not allowed to walk across a street on your hands.
		[real standing laws in Connecticut, 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    ///


--- NEW FILE 7.2.283 ---
To: vim-dev at vim.org
Subject: Patch 7.2.283
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.283
Problem:    Changing font while the window is maximized doesn't keep the
	    window maximized.
Solution:   Recompute number of lines and columns after changing font. (James
	    Vega)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.282/src/gui_gtk_x11.c	2009-09-23 18:14:13.000000000 +0200
--- src/gui_gtk_x11.c	2009-11-03 17:56:27.000000000 +0100
***************
*** 5267,5274 ****
  # endif
  #endif /* !HAVE_GTK2 */
  
!     /* Preserve the logical dimensions of the screen. */
!     update_window_manager_hints(0, 0);
  
      return OK;
  }
--- 5267,5290 ----
  # endif
  #endif /* !HAVE_GTK2 */
  
! #ifdef HAVE_GTK2
!     if (gui_mch_maximized())
!     {
! 	int w, h;
! 
! 	/* Update lines and columns in accordance with the new font, keep the
! 	 * window maximized. */
! 	gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
! 	w -= get_menu_tool_width();
! 	h -= get_menu_tool_height();
! 	gui_resize_shell(w, h);
!     }
!     else
! #endif
!     {
! 	/* Preserve the logical dimensions of the screen. */
! 	update_window_manager_hints(0, 0);
!     }
  
      return OK;
  }
*** ../vim-7.2.282/src/version.c	2009-11-03 18:04:26.000000000 +0100
--- src/version.c	2009-11-03 18:11:53.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     283,
  /**/

-- 
If an elephant is left tied to a parking meter, the parking fee has to be paid
just as it would for a vehicle.
		[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    ///


--- NEW FILE 7.2.284 ---
To: vim-dev at vim.org
Subject: Patch 7.2.284
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.284
Problem:    When editing the same buffer in two windows, one with folding,
	    display may be wrong after changes.
Solution:   Call set_topline() to take care of side effects. (Lech Lorens)
Files:	    src/misc1.c


*** ../vim-7.2.283/src/misc1.c	2009-07-22 11:03:38.000000000 +0200
--- src/misc1.c	2009-11-03 18:38:15.000000000 +0100
***************
*** 2886,2891 ****
--- 2886,2898 ----
  		    }
  #endif
  		}
+ 
+ #ifdef FEAT_FOLDING
+ 	    /* Take care of side effects for setting w_topline when folds have
+ 	     * changed.  Esp. when the buffer was changed in another window. */
+ 	    if (hasAnyFolding(wp))
+ 		set_topline(wp, wp->w_topline);
+ #endif
  	}
      }
  
*** ../vim-7.2.283/src/version.c	2009-11-03 18:13:36.000000000 +0100
--- src/version.c	2009-11-03 18:44:12.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     284,
  /**/

-- 
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    ///


--- NEW FILE 7.2.285 ---
To: vim-dev at vim.org
Subject: Patch 7.2.285
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.285 (after 7.2.169)
Problem:    CTRL-U in Insert mode also deletes indent. (Andrey Voropaev)
Solution:   Fix mistake made in patch 7.2.169.
Files:	    src/edit.c


*** ../vim-7.2.284/src/edit.c	2009-07-09 18:15:19.000000000 +0200
--- src/edit.c	2009-11-05 20:25:15.000000000 +0100
***************
*** 8519,8525 ****
  	{
  	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
! 	    if (curwin->w_cursor.col < (colnr_T)temp)
  		mincol = curwin->w_cursor.col;
  	    curwin->w_cursor.col = save_col;
  	}
--- 8519,8525 ----
  	{
  	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
! 	    if (curwin->w_cursor.col < save_col)
  		mincol = curwin->w_cursor.col;
  	    curwin->w_cursor.col = save_col;
  	}
*** ../vim-7.2.284/src/version.c	2009-11-03 18:46:53.000000000 +0100
--- src/version.c	2009-11-11 13:21:25.000000000 +0100
***************
*** 678,679 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     285,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      I would like to get back to the Censor and agree to lose the shits, take
      the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in
      your general direction', 'castanets of your testicles' and 'oral sex'
      and ask him for an 'A' rating on that basis.
                 "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    ///


--- NEW FILE 7.2.286 ---
To: vim-dev at vim.org
Subject: Patch 7.2.286
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.286 (after 7.2.269)
Problem:    The "--startuptime=<file>" argument is not consistent with other
	    arguments.
Solution:   Use "--startuptime <file>".  Added the +startuptime feature.
Files:	    runtime/doc/eval.txt, runtime/doc/starting.txt,
	    runtime/doc/various.txt, src/eval.c, src/main.c, src/version.c


*** ../vim-7.2.285/runtime/doc/eval.txt	2009-04-22 12:53:31.000000000 +0200
--- runtime/doc/eval.txt	2009-11-11 13:01:58.000000000 +0100
***************
*** 5869,5874 ****
--- 5881,5887 ----
  signs			Compiled with |:sign| support.
  smartindent		Compiled with 'smartindent' support.
  sniff			Compiled with SNiFF interface support.
+ startuptime		Compiled with |--startuptime| support.
  statusline		Compiled with support for 'statusline', 'rulerformat'
  			and special formats of 'titlestring' and 'iconstring'.
  sun_workshop		Compiled with support for Sun |workshop|.
*** ../vim-7.2.285/runtime/doc/starting.txt	2009-11-03 12:10:39.000000000 +0100
--- runtime/doc/starting.txt	2009-11-11 13:20:56.000000000 +0100
***************
*** 144,155 ****
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
! --startuptime={fname}					*--startuptime*
  		During startup write timing messages to the file {fname}.
  		This can be used to find out where time is spent while loading
! 		your .vimrc and plugins.
  		When {fname} already exists new messages are appended.
! 		{only when compiled with this feature}
  
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
--- 144,156 ----
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
! --startuptime {fname}					*--startuptime*
  		During startup write timing messages to the file {fname}.
  		This can be used to find out where time is spent while loading
! 		your .vimrc, plugins and opening the first file.
  		When {fname} already exists new messages are appended.
! 		(Only available when compiled with the |+startuptime|
! 		feature).
  
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
*** ../vim-7.2.285/runtime/doc/various.txt	2009-07-09 15:55:34.000000000 +0200
--- runtime/doc/various.txt	2009-11-11 13:03:52.000000000 +0100
***************
*** 374,379 ****
--- 374,380 ----
  B  *+signs*		|:sign|
  N  *+smartindent*	|'smartindent'|
  m  *+sniff*		SniFF interface |sniff|
+ N  *+startuptime*	|--startuptime| argument
  N  *+statusline*	Options 'statusline', 'rulerformat' and special
  			formats of 'titlestring' and 'iconstring'
  m  *+sun_workshop*	|workshop|
*** ../vim-7.2.285/src/eval.c	2009-11-03 14:26:29.000000000 +0100
--- src/eval.c	2009-11-11 12:59:53.000000000 +0100
***************
*** 11736,11741 ****
--- 11736,11744 ----
  #ifdef FEAT_SNIFF
  	"sniff",
  #endif
+ #ifdef STARTUPTIME
+ 	"startuptime",
+ #endif
  #ifdef FEAT_STL_OPT
  	"statusline",
  #endif
*** ../vim-7.2.285/src/main.c	2009-11-03 12:10:39.000000000 +0100
--- src/main.c	2009-11-08 12:57:46.000000000 +0100
***************
*** 204,212 ****
  #ifdef STARTUPTIME
      for (i = 1; i < argc; ++i)
      {
! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
  	{
! 	    time_fd = mch_fopen(argv[i] + 14, "a");
  	    TIME_MSG("--- VIM STARTING ---");
  	    break;
  	}
--- 204,212 ----
  #ifdef STARTUPTIME
      for (i = 1; i < argc; ++i)
      {
! 	if (STRICMP(argv[i], "--startuptime") == 0 && i + 1 < argc)
  	{
! 	    time_fd = mch_fopen(argv[i + 1], "a");
  	    TIME_MSG("--- VIM STARTING ---");
  	    break;
  	}
***************
*** 1726,1731 ****
--- 1726,1736 ----
  		    want_argument = TRUE;
  		    argv_idx += 3;
  		}
+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ 		{
+ 		    want_argument = TRUE;
+ 		    argv_idx += 11;
+ 		}
  #ifdef FEAT_CLIENTSERVER
  		else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
  		    ; /* already processed -- no arg */
***************
*** 1761,1770 ****
  		    /* already processed, skip */
  		}
  #endif
- 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
- 		{
- 		    /* already processed, skip */
- 		}
  		else
  		{
  		    if (argv[0][argv_idx])
--- 1766,1771 ----
***************
*** 2061,2067 ****
  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
  
  		--argc;
! 		if (argc < 1 && c != 'S')
  		    mainerr_arg_missing((char_u *)argv[0]);
  		++argv;
  		argv_idx = -1;
--- 2062,2068 ----
  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
  
  		--argc;
! 		if (argc < 1 && c != 'S')  /* -S has an optional argument */
  		    mainerr_arg_missing((char_u *)argv[0]);
  		++argv;
  		argv_idx = -1;
***************
*** 2102,2112 ****
  							    (char_u *)argv[0];
  		    break;
  
! 		case '-':	/* "--cmd {command}" execute command */
! 		    if (parmp->n_pre_commands >= MAX_ARG_CMDS)
! 			mainerr(ME_EXTRA_CMD, NULL);
! 		    parmp->pre_commands[parmp->n_pre_commands++] =
  							    (char_u *)argv[0];
  		    break;
  
  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
--- 2103,2118 ----
  							    (char_u *)argv[0];
  		    break;
  
! 		case '-':
! 		    if (argv[-1][2] == 'c')
! 		    {
! 			/* "--cmd {command}" execute command */
! 			if (parmp->n_pre_commands >= MAX_ARG_CMDS)
! 			    mainerr(ME_EXTRA_CMD, NULL);
! 			parmp->pre_commands[parmp->n_pre_commands++] =
  							    (char_u *)argv[0];
+ 		    }
+ 		    /* "--startuptime <file>" already handled */
  		    break;
  
  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
***************
*** 3144,3149 ****
--- 3150,3158 ----
      main_msg(_("--serverlist\t\tList available Vim server names and exit"));
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
+ #ifdef STARTUPTIME
+     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
+ #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
  #endif
*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
--- src/version.c	2009-11-11 14:17:28.000000000 +0100
***************
*** 494,499 ****
--- 494,504 ----
  #else
  	"-sniff",
  #endif
+ #ifdef STARTUPTIME
+ 	"+startuptime",
+ #else
+ 	"-startuptime",
+ #endif
  #ifdef FEAT_STL_OPT
  	"+statusline",
  #else
*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
--- src/version.c	2009-11-11 14:17:28.000000000 +0100
***************
*** 678,679 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     286,
  /**/

-- 
A fool must search for a greater fool to find admiration.

 /// 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    ///


--- NEW FILE 7.2.287 ---
To: vim-dev at vim.org
Subject: Patch 7.2.287
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.287
Problem:    Warning from gcc 3.4 about uninitialized variable.
Solution:   Move assignment outside of #ifdef.
Files:	    src/if_perl.xs


*** ../vim-7.2.286/src/if_perl.xs	2009-07-14 16:05:14.000000000 +0200
--- src/if_perl.xs	2009-11-11 12:29:32.000000000 +0100
***************
*** 720,727 ****
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
! 	if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
  # endif
--- 720,728 ----
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
+ 	safe = perl_get_sv( "VIM::safe", FALSE );
  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
! 	if (safe == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
  # endif
*** ../vim-7.2.286/src/version.c	2009-11-11 14:21:48.000000000 +0100
--- src/version.c	2009-11-11 14:44:49.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     287,
  /**/

-- 
The most powerful force in the universe is gossip.

 /// 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    ///


--- NEW FILE 7.2.288 ---
To: vim-dev at vim.org
Subject: Patch 7.2.288
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.288
Problem:    Python 2.6 pyconfig.h redefines macros.
Solution:   Undefine the macros before including pyconfig.h.
Files:      src/if_python.c


*** ../vim-7.2.287/src/if_python.c	2009-11-03 11:43:05.000000000 +0100
--- src/if_python.c	2009-11-11 12:33:37.000000000 +0100
***************
*** 37,42 ****
--- 37,48 ----
  #ifdef HAVE_STDARG_H
  # undef HAVE_STDARG_H	/* Python's config.h defines it as well. */
  #endif
+ #ifdef _POSIX_C_SOURCE
+ # undef _POSIX_C_SOURCE	/* pyconfig.h defines it as well. */
+ #endif
+ #ifdef _XOPEN_SOURCE
+ # undef _XOPEN_SOURCE	/* pyconfig.h defines it as well. */
+ #endif
  
  #define PY_SSIZE_T_CLEAN
  
*** ../vim-7.2.287/src/version.c	2009-11-11 14:45:36.000000000 +0100
--- src/version.c	2009-11-11 15:05:51.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     288,
  /**/

-- 
I am always surprised in the Linux world how quickly solutions can be
obtained.  (Imagine sending an email to Bill Gates, asking why Windows
crashed, and how to fix it...  and then getting an answer that fixed the
problem... <0>_<0> !)		              -- Mark Langdon

 /// 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    ///


--- NEW FILE 7.2.289 ---
To: vim-dev at vim.org
Subject: Patch 7.2.289
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.289
Problem:    Checking wrong struct member.
Solution:   Change tb_buf to tb_noremap. (Dominique Pelle)
Files:	    src/getchar.c


*** ../vim-7.2.288/src/getchar.c	2009-09-30 15:15:33.000000000 +0200
--- src/getchar.c	2009-11-11 12:50:58.000000000 +0100
***************
*** 22,28 ****
   * These buffers are used for storing:
   * - stuffed characters: A command that is translated into another command.
   * - redo characters: will redo the last change.
!  * - recorded chracters: for the "q" command.
   *
   * The bytes are stored like in the typeahead buffer:
   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
--- 22,28 ----
   * These buffers are used for storing:
   * - stuffed characters: A command that is translated into another command.
   * - redo characters: will redo the last change.
!  * - recorded characters: for the "q" command.
   *
   * The bytes are stored like in the typeahead buffer:
   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
***************
*** 1283,1289 ****
  	EMSG2(_(e_intern2), "Free typebuf 1");
      else
  	vim_free(typebuf.tb_buf);
!     if (typebuf.tb_buf == noremapbuf_init)
  	EMSG2(_(e_intern2), "Free typebuf 2");
      else
  	vim_free(typebuf.tb_noremap);
--- 1283,1289 ----
  	EMSG2(_(e_intern2), "Free typebuf 1");
      else
  	vim_free(typebuf.tb_buf);
!     if (typebuf.tb_noremap == noremapbuf_init)
  	EMSG2(_(e_intern2), "Free typebuf 2");
      else
  	vim_free(typebuf.tb_noremap);
***************
*** 1516,1522 ****
   * wanted.
   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
   * Collects the bytes of a multibyte character into the whole character.
!  * Returns the modifers in the global "mod_mask".
   */
      int
  vgetc()
--- 1516,1522 ----
   * wanted.
   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
   * Collects the bytes of a multibyte character into the whole character.
!  * Returns the modifiers in the global "mod_mask".
   */
      int
  vgetc()
***************
*** 3320,3326 ****
  			    retval = 1;
  			    goto theend;
  			}
! 	    /* An abbrevation cannot contain white space. */
  	    for (n = 0; n < len; ++n)
  		if (vim_iswhite(keys[n]))
  		{
--- 3320,3326 ----
  			    retval = 1;
  			    goto theend;
  			}
! 	    /* An abbreviation cannot contain white space. */
  	    for (n = 0; n < len; ++n)
  		if (vim_iswhite(keys[n]))
  		{
***************
*** 4272,4278 ****
  
      /*
       * Check for word before the cursor: If it ends in a keyword char all
!      * chars before it must be al keyword chars or non-keyword chars, but not
       * white space. If it ends in a non-keyword char we accept any characters
       * before it except white space.
       */
--- 4272,4278 ----
  
      /*
       * Check for word before the cursor: If it ends in a keyword char all
!      * chars before it must be keyword chars or non-keyword chars, but not
       * white space. If it ends in a non-keyword char we accept any characters
       * before it except white space.
       */
*** ../vim-7.2.288/src/version.c	2009-11-11 15:06:59.000000000 +0100
--- src/version.c	2009-11-11 16:19:12.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     289,
  /**/

-- 
A M00se once bit my sister ...
                 "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    ///


--- NEW FILE 7.2.290 ---
To: vim-dev at vim.org
Subject: Patch 7.2.290
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.290
Problem:    Not freeing memory from ":lmap", ":xmap" and ":menutranslate".
Solution:   Free the memory when exiting. (Dominique Pelle)
Files:	    src/misc2.c


*** ../vim-7.2.289/src/misc2.c	2009-11-03 16:44:04.000000000 +0100
--- src/misc2.c	2009-11-11 16:49:13.000000000 +0100
***************
*** 1005,1013 ****
--- 1005,1018 ----
  # ifdef FEAT_MENU
      /* Clear menus. */
      do_cmdline_cmd((char_u *)"aunmenu *");
+ #  ifdef FEAT_MULTI_LANG
+     do_cmdline_cmd((char_u *)"menutranslate clear");
+ #  endif
  # endif
  
      /* Clear mappings, abbreviations, breakpoints. */
+     do_cmdline_cmd((char_u *)"lmapclear");
+     do_cmdline_cmd((char_u *)"xmapclear");
      do_cmdline_cmd((char_u *)"mapclear");
      do_cmdline_cmd((char_u *)"mapclear!");
      do_cmdline_cmd((char_u *)"abclear");
***************
*** 1282,1288 ****
  
  /*
   * Escape "string" for use as a shell argument with system().
!  * This uses single quotes, except when we know we need to use double qoutes
   * (MS-DOS and MS-Windows without 'shellslash' set).
   * Escape a newline, depending on the 'shell' option.
   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
--- 1287,1293 ----
  
  /*
   * Escape "string" for use as a shell argument with system().
!  * This uses single quotes, except when we know we need to use double quotes
   * (MS-DOS and MS-Windows without 'shellslash' set).
   * Escape a newline, depending on the 'shell' option.
   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
***************
*** 1537,1543 ****
  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
  /*
   * Copy a character a number of times.
!  * Does not work for multi-byte charactes!
   */
      void
  copy_chars(ptr, count, c)
--- 1542,1548 ----
  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
  /*
   * Copy a character a number of times.
!  * Does not work for multi-byte characters!
   */
      void
  copy_chars(ptr, count, c)
***************
*** 4260,4266 ****
  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
  	 * For EBCDIC you get different character values.
  	 * If no restrict is given after '**' the default is used.
! 	 * Due to this technic the path looks awful if you print it as a
  	 * string.
  	 */
  	len = 0;
--- 4265,4271 ----
  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
  	 * For EBCDIC you get different character values.
  	 * If no restrict is given after '**' the default is used.
! 	 * Due to this technique the path looks awful if you print it as a
  	 * string.
  	 */
  	len = 0;
***************
*** 4649,4655 ****
  				      && !mch_isdir(stackp->ffs_filearray[i]))
  			    continue;   /* not a directory */
  
! 			/* prepare the filename to be checked for existance
  			 * below */
  			STRCPY(file_path, stackp->ffs_filearray[i]);
  			add_pathsep(file_path);
--- 4654,4660 ----
  				      && !mch_isdir(stackp->ffs_filearray[i]))
  			    continue;   /* not a directory */
  
! 			/* prepare the filename to be checked for existence
  			 * below */
  			STRCPY(file_path, stackp->ffs_filearray[i]);
  			add_pathsep(file_path);
***************
*** 5438,5444 ****
  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
  	    /* handle "\tmp" as absolute path */
  	    || vim_ispathsep(ff_file_to_find[0])
! 	    /* handle "c:name" as absulute path */
  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
  #endif
  #ifdef AMIGA
--- 5443,5449 ----
  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
  	    /* handle "\tmp" as absolute path */
  	    || vim_ispathsep(ff_file_to_find[0])
! 	    /* handle "c:name" as absolute path */
  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
  #endif
  #ifdef AMIGA
***************
*** 5681,5687 ****
  		p2 = (char_u *)base + (j + gap) * elm_size;
  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
  		    break;
! 		/* Exchange the elemets. */
  		mch_memmove(buf, p1, elm_size);
  		mch_memmove(p1, p2, elm_size);
  		mch_memmove(p2, buf, elm_size);
--- 5686,5692 ----
  		p2 = (char_u *)base + (j + gap) * elm_size;
  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
  		    break;
! 		/* Exchange the elements. */
  		mch_memmove(buf, p1, elm_size);
  		mch_memmove(p1, p2, elm_size);
  		mch_memmove(p2, buf, elm_size);
*** ../vim-7.2.289/src/version.c	2009-11-11 16:23:37.000000000 +0100
--- src/version.c	2009-11-11 16:54:53.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     290,
  /**/

-- 
ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
        King of all Britons, defeator of the Saxons, sovereign of all England!
   [Pause]
SOLDIER: Get away!
                 "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    ///


--- NEW FILE 7.2.291 ---
To: vim-dev at vim.org
Subject: Patch 7.2.291
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.291
Problem:    Reading uninitialised memory in arabic mode.
Solution:   Use utfc_ptr2char_len() rather than utfc_ptr2char().  (Dominique
	    Pelle)
Files:	    src/screen.c


*** ../vim-7.2.290/src/screen.c	2009-11-03 17:36:09.000000000 +0100
--- src/screen.c	2009-11-11 17:04:53.000000000 +0100
***************
*** 6413,6419 ****
  		    }
  		    else
  		    {
! 			nc = utfc_ptr2char(ptr + mbyte_blen, pcc);
  			nc1 = pcc[0];
  		    }
  		    pc = prev_c;
--- 6413,6420 ----
  		    }
  		    else
  		    {
! 			nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
! 				      (int)((text + len) - ptr - mbyte_blen));
  			nc1 = pcc[0];
  		    }
  		    pc = prev_c;
*** ../vim-7.2.290/src/version.c	2009-11-11 16:56:13.000000000 +0100
--- src/version.c	2009-11-11 17:06:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     291,
  /**/

-- 
The problem with political jokes is that they get elected.

 /// 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    ///


--- NEW FILE 7.2.292 ---
To: vim-dev at vim.org
Subject: Patch 7.2.292
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.292
Problem:    Block right-shift doesn't work properly with multi-byte encoding
	    and 'list' set.
Solution:   Add the missing "else". (Lech Lorens)
Files:	    src/ops.c


*** ../vim-7.2.291/src/ops.c	2009-11-03 16:44:04.000000000 +0100
--- src/ops.c	2009-11-11 17:15:04.000000000 +0100
***************
*** 422,429 ****
  #ifdef FEAT_MBYTE
  	    if (has_mbyte)
  		bd.textstart += (*mb_ptr2len)(bd.textstart);
  #endif
! 	    ++bd.textstart;
  	}
  	for ( ; vim_iswhite(*bd.textstart); )
  	{
--- 422,430 ----
  #ifdef FEAT_MBYTE
  	    if (has_mbyte)
  		bd.textstart += (*mb_ptr2len)(bd.textstart);
+ 	    else
  #endif
! 		++bd.textstart;
  	}
  	for ( ; vim_iswhite(*bd.textstart); )
  	{
*** ../vim-7.2.291/src/version.c	2009-11-11 17:07:25.000000000 +0100
--- src/version.c	2009-11-11 17:21:31.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     292,
  /**/

-- 
Computers make very fast, very accurate, mistakes.

 /// 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    ///


--- NEW FILE 7.2.293 ---
To: vim-dev at vim.org
Subject: Patch 7.2.293
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.293
Problem:    When setting 'comments' option it may be used in a wrong way. 
Solution:   Don't increment after skipping over digets. (Yukihiro Nakadaira)
Files:	    src/misc1.c


*** ../vim-7.2.292/src/misc1.c	2009-11-03 18:46:53.000000000 +0100
--- src/misc1.c	2009-11-11 17:27:38.000000000 +0100
***************
*** 1026,1037 ****
  		    int		c = 0;
  		    int		off = 0;
  
! 		    for (p = lead_flags; *p && *p != ':'; ++p)
  		    {
  			if (*p == COM_RIGHT || *p == COM_LEFT)
! 			    c = *p;
  			else if (VIM_ISDIGIT(*p) || *p == '-')
  			    off = getdigits(&p);
  		    }
  		    if (c == COM_RIGHT)    /* right adjusted leader */
  		    {
--- 1026,1039 ----
  		    int		c = 0;
  		    int		off = 0;
  
! 		    for (p = lead_flags; *p != NUL && *p != ':'; )
  		    {
  			if (*p == COM_RIGHT || *p == COM_LEFT)
! 			    c = *p++;
  			else if (VIM_ISDIGIT(*p) || *p == '-')
  			    off = getdigits(&p);
+ 			else
+ 			    ++p;
  		    }
  		    if (c == COM_RIGHT)    /* right adjusted leader */
  		    {
*** ../vim-7.2.292/src/version.c	2009-11-11 17:22:30.000000000 +0100
--- src/version.c	2009-11-11 17:29:24.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     293,
  /**/

-- 
SOLDIER: What?  Ridden on a horse?
ARTHUR:  Yes!
SOLDIER: You're using coconuts!
                 "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    ///


--- NEW FILE 7.2.294 ---
To: vim-dev at vim.org
Subject: Patch 7.2.294
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.294
Problem:    When using TEMPDIRS dir name could get too long.
Solution:   Overwrite tail instead of appending each time.  Use mkdtemp() when
	    available. (James Vega)
Files:	    src/auto/configure, src/config.h.in, src/configure.in, src/fileio.c


*** ../vim-7.2.293/src/auto/configure	2009-09-11 13:44:33.000000000 +0200
--- src/auto/configure	2009-11-17 12:03:15.000000000 +0100
***************
*** 14019,14027 ****
  
  
  
  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
--- 14019,14028 ----
  
  
  
+ 
  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
*** ../vim-7.2.293/src/config.h.in	2009-05-21 23:25:38.000000000 +0200
--- src/config.h.in	2009-11-11 17:40:21.000000000 +0100
***************
*** 157,162 ****
--- 157,163 ----
  #undef HAVE_LSTAT
  #undef HAVE_MEMCMP
  #undef HAVE_MEMSET
+ #undef HAVE_MKDTEMP
  #undef HAVE_NANOSLEEP
  #undef HAVE_OPENDIR
  #undef HAVE_FLOAT_FUNCS
*** ../vim-7.2.293/src/configure.in	2009-09-11 13:44:33.000000000 +0200
--- src/configure.in	2009-11-11 17:40:21.000000000 +0100
***************
*** 2635,2641 ****
  dnl Check for functions in one big call, to reduce the size of configure
  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
--- 2635,2641 ----
  dnl Check for functions in one big call, to reduce the size of configure
  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
*** ../vim-7.2.293/src/fileio.c	2009-09-11 17:24:01.000000000 +0200
--- src/fileio.c	2009-11-11 18:01:22.000000000 +0100
***************
*** 146,151 ****
--- 146,152 ----
  # endif
  #endif
  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+ static void vim_settempdir __ARGS((char_u *tempdir));
  #ifdef FEAT_AUTOCMD
  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
  #endif
***************
*** 6987,6992 ****
--- 6988,7020 ----
  #endif
  
  /*
+  * Directory "tempdir" was created.  Expand this name to a full path and put
+  * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
+  * "tempdir" must be no longer than MAXPATHL.
+  */
+     static void
+ vim_settempdir(tempdir)
+     char_u	*tempdir;
+ {
+     char_u	*buf;
+ 
+     buf = alloc((unsigned)MAXPATHL + 2);
+     if (buf != NULL)
+     {
+ 	if (vim_FullName(tempdir, buf, MAXPATHL, FALSE) == FAIL)
+ 	    STRCPY(buf, tempdir);
+ # ifdef __EMX__
+ 	if (vim_strchr(buf, '/') != NULL)
+ 	    STRCAT(buf, "/");
+ 	else
+ # endif
+ 	    add_pathsep(buf);
+ 	vim_tempdir = vim_strsave(buf);
+ 	vim_free(buf);
+     }
+ }
+ 
+ /*
   * vim_tempname(): Return a unique name that can be used for a temp file.
   *
   * The temp file is NOT created.
***************
*** 7007,7014 ****
  #ifdef TEMPDIRNAMES
      static char	*(tempdirs[]) = {TEMPDIRNAMES};
      int		i;
-     long	nr;
-     long	off;
  # ifndef EEXIST
      struct stat	st;
  # endif
--- 7035,7040 ----
***************
*** 7027,7032 ****
--- 7053,7064 ----
  	 */
  	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
  	{
+ 	    size_t	itmplen;
+ # ifndef HAVE_MKDTEMP
+ 	    long	nr;
+ 	    long	off;
+ # endif
+ 
  	    /* expand $TMP, leave room for "/v1100000/999999999" */
  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
  	    if (mch_isdir(itmp))		/* directory exists */
***************
*** 7040,7046 ****
--- 7072,7085 ----
  		else
  # endif
  		    add_pathsep(itmp);
+ 		itmplen = STRLEN(itmp);
  
+ # ifdef HAVE_MKDTEMP
+ 		/* Leave room for filename */
+ 		STRCAT(itmp, "vXXXXXX");
+ 		if (mkdtemp((char *)itmp) != NULL)
+ 		    vim_settempdir(itmp);
+ # else
  		/* Get an arbitrary number of up to 6 digits.  When it's
  		 * unlikely that it already exists it will be faster,
  		 * otherwise it doesn't matter.  The use of mkdir() avoids any
***************
*** 7052,7110 ****
  		for (off = 0; off < 10000L; ++off)
  		{
  		    int		r;
! #if defined(UNIX) || defined(VMS)
  		    mode_t	umask_save;
! #endif
  
! 		    sprintf((char *)itmp + STRLEN(itmp), "v%ld", nr + off);
! # ifndef EEXIST
  		    /* If mkdir() does not set errno to EEXIST, check for
  		     * existing file here.  There is a race condition then,
  		     * although it's fail-safe. */
  		    if (mch_stat((char *)itmp, &st) >= 0)
  			continue;
! # endif
! #if defined(UNIX) || defined(VMS)
  		    /* Make sure the umask doesn't remove the executable bit.
  		     * "repl" has been reported to use "177". */
  		    umask_save = umask(077);
! #endif
  		    r = vim_mkdir(itmp, 0700);
! #if defined(UNIX) || defined(VMS)
  		    (void)umask(umask_save);
! #endif
  		    if (r == 0)
  		    {
! 			char_u	*buf;
! 
! 			/* Directory was created, use this name.
! 			 * Expand to full path; When using the current
! 			 * directory a ":cd" would confuse us. */
! 			buf = alloc((unsigned)MAXPATHL + 1);
! 			if (buf != NULL)
! 			{
! 			    if (vim_FullName(itmp, buf, MAXPATHL, FALSE)
! 								      == FAIL)
! 				STRCPY(buf, itmp);
! # ifdef __EMX__
! 			    if (vim_strchr(buf, '/') != NULL)
! 				STRCAT(buf, "/");
! 			    else
! # endif
! 				add_pathsep(buf);
! 			    vim_tempdir = vim_strsave(buf);
! 			    vim_free(buf);
! 			}
  			break;
  		    }
! # ifdef EEXIST
  		    /* If the mkdir() didn't fail because the file/dir exists,
  		     * we probably can't create any dir here, try another
  		     * place. */
  		    if (errno != EEXIST)
! # endif
  			break;
  		}
  		if (vim_tempdir != NULL)
  		    break;
  	    }
--- 7091,7131 ----
  		for (off = 0; off < 10000L; ++off)
  		{
  		    int		r;
! #  if defined(UNIX) || defined(VMS)
  		    mode_t	umask_save;
! #  endif
  
! 		    sprintf((char *)itmp + itmplen, "v%ld", nr + off);
! #  ifndef EEXIST
  		    /* If mkdir() does not set errno to EEXIST, check for
  		     * existing file here.  There is a race condition then,
  		     * although it's fail-safe. */
  		    if (mch_stat((char *)itmp, &st) >= 0)
  			continue;
! #  endif
! #  if defined(UNIX) || defined(VMS)
  		    /* Make sure the umask doesn't remove the executable bit.
  		     * "repl" has been reported to use "177". */
  		    umask_save = umask(077);
! #  endif
  		    r = vim_mkdir(itmp, 0700);
! #  if defined(UNIX) || defined(VMS)
  		    (void)umask(umask_save);
! #  endif
  		    if (r == 0)
  		    {
! 			vim_settempdir(itmp);
  			break;
  		    }
! #  ifdef EEXIST
  		    /* If the mkdir() didn't fail because the file/dir exists,
  		     * we probably can't create any dir here, try another
  		     * place. */
  		    if (errno != EEXIST)
! #  endif
  			break;
  		}
+ # endif /* HAVE_MKDTEMP */
  		if (vim_tempdir != NULL)
  		    break;
  	    }
*** ../vim-7.2.293/src/version.c	2009-11-11 17:30:05.000000000 +0100
--- src/version.c	2009-11-17 11:54:49.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     294,
  /**/

-- 
ARTHUR:       Now stand aside worthy adversary.
BLACK KNIGHT: (Glancing at his shoulder) 'Tis but a scratch.
ARTHUR:       A scratch?  Your arm's off.
                 "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    ///


--- NEW FILE 7.2.295 ---
To: vim-dev at vim.org
Subject: Patch 7.2.295
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.295
Problem:    When using map() on a List the index is not known.
Solution:   Set v:key to the  index. (Hari Krishna Dara)
Files:	    runtime/doc/eval.txt, src/eval.c


*** ../vim-7.2.294/runtime/doc/eval.txt	2009-11-11 14:21:48.000000000 +0100
--- runtime/doc/eval.txt	2009-11-11 18:22:54.000000000 +0100
***************
*** 3802,3808 ****
  		Replace each item in {expr} with the result of evaluating
  		{string}.
  		Inside {string} |v:val| has the value of the current item.
! 		For a |Dictionary| |v:key| has the key of the current item.
  		Example: >
  			:call map(mylist, '"> " . v:val . " <"')
  <		This puts "> " before and " <" after each item in "mylist".
--- 3812,3819 ----
  		Replace each item in {expr} with the result of evaluating
  		{string}.
  		Inside {string} |v:val| has the value of the current item.
! 		For a |Dictionary| |v:key| has the key of the current item
! 		and for a |List| |v:key| has the index of the current item.
  		Example: >
  			:call map(mylist, '"> " . v:val . " <"')
  <		This puts "> " before and " <" after each item in "mylist".
*** ../vim-7.2.294/src/eval.c	2009-11-11 14:21:48.000000000 +0100
--- src/eval.c	2009-11-11 18:22:49.000000000 +0100
***************
*** 9928,9933 ****
--- 9928,9934 ----
      int		todo;
      char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
      int		save_did_emsg;
+     int		index = 0;
  
      if (argvars[0].v_type == VAR_LIST)
      {
***************
*** 9961,9969 ****
  	save_did_emsg = did_emsg;
  	did_emsg = FALSE;
  
  	if (argvars[0].v_type == VAR_DICT)
  	{
- 	    prepare_vimvar(VV_KEY, &save_key);
  	    vimvars[VV_KEY].vv_type = VAR_STRING;
  
  	    ht = &d->dv_hashtab;
--- 9962,9970 ----
  	save_did_emsg = did_emsg;
  	did_emsg = FALSE;
  
+ 	prepare_vimvar(VV_KEY, &save_key);
  	if (argvars[0].v_type == VAR_DICT)
  	{
  	    vimvars[VV_KEY].vv_type = VAR_STRING;
  
  	    ht = &d->dv_hashtab;
***************
*** 9987,10010 ****
  		}
  	    }
  	    hash_unlock(ht);
- 
- 	    restore_vimvar(VV_KEY, &save_key);
  	}
  	else
  	{
  	    for (li = l->lv_first; li != NULL; li = nli)
  	    {
  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
  		    break;
  		nli = li->li_next;
  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
  								  || did_emsg)
  		    break;
  		if (!map && rem)
  		    listitem_remove(l, li);
  	    }
  	}
  
  	restore_vimvar(VV_VAL, &save_val);
  
  	did_emsg |= save_did_emsg;
--- 9988,10014 ----
  		}
  	    }
  	    hash_unlock(ht);
  	}
  	else
  	{
+ 	    vimvars[VV_KEY].vv_type = VAR_NUMBER;
+ 
  	    for (li = l->lv_first; li != NULL; li = nli)
  	    {
  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
  		    break;
  		nli = li->li_next;
+ 		vimvars[VV_KEY].vv_nr = index;
  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
  								  || did_emsg)
  		    break;
  		if (!map && rem)
  		    listitem_remove(l, li);
+ 		++index;
  	    }
  	}
  
+ 	restore_vimvar(VV_KEY, &save_key);
  	restore_vimvar(VV_VAL, &save_val);
  
  	did_emsg |= save_did_emsg;
*** ../vim-7.2.294/src/version.c	2009-11-17 12:08:48.000000000 +0100
--- src/version.c	2009-11-17 12:18:08.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     295,
  /**/

-- 
ARTHUR:       You are indeed brave Sir knight, but the fight is mine.
BLACK KNIGHT: Had enough?
ARTHUR:       You stupid bastard.  You havn't got any arms left.
                 "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    ///


--- NEW FILE 7.2.296 ---
To: vim-dev at vim.org
Subject: Patch 7.2.296
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.296
Problem:    Help message about startuptime is wrong. (Dominique Pelle)
Solution:   Remove the equal sign.
Files:	    src/main.c


*** ../vim-7.2.295/src/main.c	2009-11-11 14:21:48.000000000 +0100
--- src/main.c	2009-11-11 22:51:04.000000000 +0100
***************
*** 3151,3157 ****
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
  #ifdef STARTUPTIME
!     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
  #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
--- 3151,3157 ----
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
  #ifdef STARTUPTIME
!     main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>"));
  #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
*** ../vim-7.2.295/src/version.c	2009-11-17 12:20:30.000000000 +0100
--- src/version.c	2009-11-17 12:30:29.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     296,
  /**/

-- 
BLACK KNIGHT: I'm invincible!
ARTHUR:       You're a looney.
                 "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    ///


--- NEW FILE 7.2.297 ---
To: vim-dev at vim.org
Subject: Patch 7.2.297
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.297
Problem:    Reading freed memory when writing ":reg" output to a register.
	    (Dominique Pelle)
Solution:   Skip the register being written to.
Files:	    src/ops.c


*** ../vim-7.2.296/src/ops.c	2009-11-11 17:22:30.000000000 +0100
--- src/ops.c	2009-11-11 19:30:47.000000000 +0100
***************
*** 3991,3996 ****
--- 3991,4004 ----
  	}
  	else
  	    yb = &(y_regs[i]);
+ 
+ #ifdef FEAT_EVAL
+ 	if (name == MB_TOLOWER(redir_reg)
+ 		|| (redir_reg == '"' && yb == y_previous))
+ 	    continue;	    /* do not list register being written to, the
+ 			     * pointer can be freed */
+ #endif
+ 
  	if (yb->y_array != NULL)
  	{
  	    msg_putchar('\n');
***************
*** 6090,6096 ****
      long	maxlen;
  #endif
  
!     if (y_ptr->y_array == NULL)		/* NULL means emtpy register */
  	y_ptr->y_size = 0;
  
      /*
--- 6098,6104 ----
      long	maxlen;
  #endif
  
!     if (y_ptr->y_array == NULL)		/* NULL means empty register */
  	y_ptr->y_size = 0;
  
      /*
*** ../vim-7.2.296/src/version.c	2009-11-17 12:31:30.000000000 +0100
--- src/version.c	2009-11-17 12:42:28.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     297,
  /**/

-- 
"Beware of bugs in the above code; I have only proved
it correct, not tried it." -- Donald Knuth

 /// 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    ///


--- NEW FILE 7.2.298 ---
To: vim-dev at vim.org
Subject: Patch 7.2.298
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.298
Problem:    ":vimgrep" crashes when there is an autocommand that sets a
	    window-local variable.
Solution:   Initialize the w: hashtab for re-use. (Yukihiro Nakadaira)
Files:	    src/fileio.c


*** ../vim-7.2.297/src/fileio.c	2009-11-17 12:08:48.000000000 +0100
--- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
***************
*** 8597,8602 ****
--- 8605,8611 ----
  	    curwin = firstwin;
  # ifdef FEAT_EVAL
  	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
+ 	hash_init(&aucmd_win->w_vars.dv_hashtab);   /* re-use the hashtab */
  # endif
  #else
  	curwin = aco->save_curwin;
*** ../vim-7.2.297/src/version.c	2009-11-17 12:43:19.000000000 +0100
--- src/version.c	2009-11-17 14:56:19.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     298,
  /**/

-- 
Eye have a spelling checker, it came with my PC;
It plainly marks four my revue mistakes I cannot sea.
I've run this poem threw it, I'm sure your please to no,
It's letter perfect in it's weigh, my checker tolled me sew!

 /// 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    ///


--- NEW FILE 7.2.299 ---
To: vim-dev at vim.org
Subject: Patch 7.2.299
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.299
Problem:    Crash when comment middle is longer than start.
Solution:   Fix size computation. (Lech Lorens)
Files:	    src/misc1.c


*** ../vim-7.2.298/src/misc1.c	2009-11-11 17:30:05.000000000 +0100
--- src/misc1.c	2009-11-17 15:59:28.000000000 +0100
***************
*** 1121,1127 ****
  			    if (i != lead_repl_len)
  			    {
  				mch_memmove(p + lead_repl_len, p + i,
! 				       (size_t)(lead_len - i - (leader - p)));
  				lead_len += lead_repl_len - i;
  			    }
  			}
--- 1121,1127 ----
  			    if (i != lead_repl_len)
  			    {
  				mch_memmove(p + lead_repl_len, p + i,
! 				       (size_t)(lead_len - i - (p - leader)));
  				lead_len += lead_repl_len - i;
  			    }
  			}
*** ../vim-7.2.298/src/version.c	2009-11-17 14:57:19.000000000 +0100
--- src/version.c	2009-11-17 16:01:07.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     299,
  /**/

-- 
BLACK KNIGHT: The Black Knight always triumphs. Have at you!
   ARTHUR takes his last leg off.  The BLACK KNIGHT's body lands upright.
BLACK KNIGHT: All right, we'll call it a draw.
                 "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    ///


--- NEW FILE 7.2.300 ---
To: vim-dev at vim.org
Subject: Patch 7.2.300
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.300
Problem:    Vim doesn't close file descriptors when forking and executing
	    another command, e.g., ":shell".
Solution:   Use FD_CLOEXEC when available. (James Vega)
Files:	    src/auto/configure, src/config.h.in, src/configure.in,
	    src/ex_cmdds2.c, src/fileio.c, src/memfile.c, src/memline.c


*** ../vim-7.2.299/src/auto/configure	2009-11-17 12:08:48.000000000 +0100
--- src/auto/configure	2009-11-17 13:09:03.000000000 +0100
***************
*** 15174,15179 ****
--- 15174,15231 ----
  $as_echo "yes" >&6; }
  fi
  
+ { $as_echo "$as_me:$LINENO: checking for FD_CLOEXEC" >&5
+ $as_echo_n "checking for FD_CLOEXEC... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+ int
+ main ()
+ {
+ 	int flag = FD_CLOEXEC;
+   ;
+   return 0;
+ }
+ _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$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
+   $as_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
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FD_CLOEXEC 1
+ _ACEOF
+ 
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	{ $as_echo "$as_me:$LINENO: result: not usable" >&5
+ $as_echo "not usable" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  { $as_echo "$as_me:$LINENO: checking for rename" >&5
  $as_echo_n "checking for rename... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
*** ../vim-7.2.299/src/config.h.in	2009-11-17 12:08:48.000000000 +0100
--- src/config.h.in	2009-11-17 13:01:36.000000000 +0100
***************
*** 388,390 ****
--- 388,393 ----
  
  /* Define if you want XSMP interaction as well as vanilla swapfile safety */
  #undef USE_XSMP_INTERACT
+ 
+ /* Define if fcntl()'s F_SETFD command knows about FD_CLOEXEC */
+ #undef HAVE_FD_CLOEXEC
*** ../vim-7.2.299/src/configure.in	2009-11-17 12:08:48.000000000 +0100
--- src/configure.in	2009-11-17 13:01:36.000000000 +0100
***************
*** 2855,2860 ****
--- 2855,2870 ----
    AC_MSG_RESULT(yes)
  fi
  
+ dnl make sure the FD_CLOEXEC flag for fcntl()'s F_SETFD command is known
+ AC_MSG_CHECKING(for FD_CLOEXEC)
+ AC_TRY_COMPILE(
+ [#if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif],
+ [	int flag = FD_CLOEXEC;],
+ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FD_CLOEXEC),
+ 	AC_MSG_RESULT(not usable))
+ 
  dnl rename needs to be checked separately to work on Nextstep with cc
  AC_MSG_CHECKING(for rename)
  AC_TRY_LINK([#include <stdio.h>], [rename("this", "that")],
*** ../vim-7.2.299/src/fileio.c	2009-11-17 14:57:19.000000000 +0100
--- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
***************
*** 2254,2259 ****
--- 2254,2267 ----
  
      if (!read_buffer && !read_stdin)
  	close(fd);				/* errors are ignored */
+ #ifdef HAVE_FD_CLOEXEC
+     else
+     {
+ 	int fdflags = fcntl(fd, F_GETFD);
+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 	    fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
+     }
+ #endif
      vim_free(buffer);
  
  #ifdef HAVE_DUP
*** ../vim-7.2.299/src/memfile.c	2008-07-13 19:39:39.000000000 +0200
--- src/memfile.c	2009-11-17 13:22:15.000000000 +0100
***************
*** 1343,1348 ****
--- 1343,1353 ----
      }
      else
      {
+ #ifdef HAVE_FD_CLOEXEC
+ 	int fdflags = fcntl(mfp->mf_fd, F_GETFD);
+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 	    fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ #endif
  #ifdef HAVE_SELINUX
  	mch_copy_sec(fname, mfp->mf_fname);
  #endif
*** ../vim-7.2.299/src/memline.c	2009-11-03 15:32:58.000000000 +0100
--- src/memline.c	2009-11-17 13:21:40.000000000 +0100
***************
*** 382,388 ****
      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
      dp->db_free -= 1 + INDEX_SIZE;
      dp->db_line_count = 1;
!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* emtpy line */
  
      return OK;
  
--- 382,388 ----
      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
      dp->db_free -= 1 + INDEX_SIZE;
      dp->db_line_count = 1;
!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* empty line */
  
      return OK;
  
***************
*** 490,495 ****
--- 490,502 ----
  	    EMSG(_("E301: Oops, lost the swap file!!!"));
  	    return;
  	}
+ #ifdef HAVE_FD_CLOEXEC
+ 	{
+ 	    int fdflags = fcntl(mfp->mf_fd, F_GETFD);
+ 	    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 		fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ 	}
+ #endif
      }
      if (!success)
  	EMSG(_("E302: Could not rename swap file"));
*** ../vim-7.2.299/src/version.c	2009-11-17 16:08:12.000000000 +0100
--- src/version.c	2009-11-17 17:09:43.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     300,
  /**/

-- 
            |

Ceci n'est pas une pipe.

 /// 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    ///


--- NEW FILE 7.2.301 ---
To: vim-dev at vim.org
Subject: Patch 7.2.301
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

NOTE: some mail and patch programs may have a problem with the non-ASCII
characters in this patch.  You can fetch the patch from
ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301  and/or fetch the updated
files from CVS.  http://www.vim.org/cvs.php


Patch 7.2.301
Problem:    Formatting is wrong when 'tw' is set to a small value.
Solution:   Fix it and add tests.  Also fix behavior of "1" in 'fo'. (Yukihiro
	    Nakadaira)
Files:	    src/edit.c, src/testdir/Makefile, src/testdir/test68.in,
	    src/testdir/test68.ok, src/testdir/test69.in,
	    src/testdir/test69.ok


*** ../vim-7.2.300/src/edit.c	2009-11-11 13:22:32.000000000 +0100
--- src/edit.c	2009-11-17 15:34:47.000000000 +0100
***************
*** 181,187 ****
  static void ins_ctrl_v __ARGS((void));
  static void undisplay_dollar __ARGS((void));
  static void insert_special __ARGS((int, int, int));
! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only));
  static void check_auto_format __ARGS((int));
  static void redo_literal __ARGS((int c));
  static void start_arrow __ARGS((pos_T *end_insert_pos));
--- 181,187 ----
  static void ins_ctrl_v __ARGS((void));
  static void undisplay_dollar __ARGS((void));
  static void insert_special __ARGS((int, int, int));
! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only, int c));
  static void check_auto_format __ARGS((int));
  static void redo_literal __ARGS((int c));
  static void start_arrow __ARGS((pos_T *end_insert_pos));
***************
*** 2164,2170 ****
      int		i, c;
      int		actual_len;		/* Take multi-byte characters */
      int		actual_compl_length;	/* into account. */
!     int		*wca;		        /* Wide character array. */
      int		has_lower = FALSE;
      int		was_letter = FALSE;
  
--- 2164,2170 ----
      int		i, c;
      int		actual_len;		/* Take multi-byte characters */
      int		actual_compl_length;	/* into account. */
!     int		*wca;			/* Wide character array. */
      int		has_lower = FALSE;
      int		was_letter = FALSE;
  
***************
*** 5558,5564 ****
  	}
  	if (do_internal)
  #endif
! 	    internal_format(textwidth, second_indent, flags, c == NUL);
      }
  
      if (c == NUL)	    /* only formatting was wanted */
--- 5558,5564 ----
  	}
  	if (do_internal)
  #endif
! 	    internal_format(textwidth, second_indent, flags, c == NUL, c);
      }
  
      if (c == NUL)	    /* only formatting was wanted */
***************
*** 5738,5748 ****
   * Format text at the current insert position.
   */
      static void
! internal_format(textwidth, second_indent, flags, format_only)
      int		textwidth;
      int		second_indent;
      int		flags;
      int		format_only;
  {
      int		cc;
      int		save_char = NUL;
--- 5738,5749 ----
   * Format text at the current insert position.
   */
      static void
! internal_format(textwidth, second_indent, flags, format_only, c)
      int		textwidth;
      int		second_indent;
      int		flags;
      int		format_only;
+     int		c; /* character to be inserted (can be NUL) */
  {
      int		cc;
      int		save_char = NUL;
***************
*** 5763,5769 ****
       * When 'ai' is off we don't want a space under the cursor to be
       * deleted.  Replace it with an 'x' temporarily.
       */
!     if (!curbuf->b_p_ai)
      {
  	cc = gchar_cursor();
  	if (vim_iswhite(cc))
--- 5764,5774 ----
       * When 'ai' is off we don't want a space under the cursor to be
       * deleted.  Replace it with an 'x' temporarily.
       */
!     if (!curbuf->b_p_ai
! #ifdef FEAT_VREPLACE
! 	    && !(State & VREPLACE_FLAG)
! #endif
! 	    )
      {
  	cc = gchar_cursor();
  	if (vim_iswhite(cc))
***************
*** 5789,5797 ****
  	char_u	*saved_text = NULL;
  #endif
  	colnr_T	col;
  
! 	virtcol = get_nolist_virtcol();
! 	if (virtcol < (colnr_T)textwidth)
  	    break;
  
  #ifdef FEAT_COMMENTS
--- 5794,5804 ----
  	char_u	*saved_text = NULL;
  #endif
  	colnr_T	col;
+ 	colnr_T	end_col;
  
! 	virtcol = get_nolist_virtcol()
! 		+ char2cells(c != NUL ? c : gchar_cursor());
! 	if (virtcol <= (colnr_T)textwidth)
  	    break;
  
  #ifdef FEAT_COMMENTS
***************
*** 5831,5842 ****
  	coladvance((colnr_T)textwidth);
  	wantcol = curwin->w_cursor.col;
  
! 	curwin->w_cursor.col = startcol - 1;
! #ifdef FEAT_MBYTE
! 	/* Correct cursor for multi-byte character. */
! 	if (has_mbyte)
! 	    mb_adjust_cursor();
! #endif
  	foundcol = 0;
  
  	/*
--- 5838,5844 ----
  	coladvance((colnr_T)textwidth);
  	wantcol = curwin->w_cursor.col;
  
! 	curwin->w_cursor.col = startcol;
  	foundcol = 0;
  
  	/*
***************
*** 5847,5857 ****
  		    || curwin->w_cursor.lnum != Insstart.lnum
  		    || curwin->w_cursor.col >= Insstart.col)
  	{
! 	    cc = gchar_cursor();
  	    if (WHITECHAR(cc))
  	    {
  		/* remember position of blank just before text */
! 		end_foundcol = curwin->w_cursor.col;
  
  		/* find start of sequence of blanks */
  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
--- 5849,5862 ----
  		    || curwin->w_cursor.lnum != Insstart.lnum
  		    || curwin->w_cursor.col >= Insstart.col)
  	{
! 	    if (curwin->w_cursor.col == startcol && c != NUL)
! 		cc = c;
! 	    else
! 		cc = gchar_cursor();
  	    if (WHITECHAR(cc))
  	    {
  		/* remember position of blank just before text */
! 		end_col = curwin->w_cursor.col;
  
  		/* find start of sequence of blanks */
  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
***************
*** 5871,5877 ****
  		    /* do not break after one-letter words */
  		    if (curwin->w_cursor.col == 0)
  			break;	/* one-letter word at begin */
! 
  		    col = curwin->w_cursor.col;
  		    dec_cursor();
  		    cc = gchar_cursor();
--- 5876,5886 ----
  		    /* do not break after one-letter words */
  		    if (curwin->w_cursor.col == 0)
  			break;	/* one-letter word at begin */
! #ifdef FEAT_COMMENTS
! 		    /* do not break "#a b" when 'tw' is 2 */
! 		    if (curwin->w_cursor.col <= leader_len)
! 			break;
! #endif
  		    col = curwin->w_cursor.col;
  		    dec_cursor();
  		    cc = gchar_cursor();
***************
*** 5880,5905 ****
  			continue;	/* one-letter, continue */
  		    curwin->w_cursor.col = col;
  		}
! #ifdef FEAT_MBYTE
! 		if (has_mbyte)
! 		    foundcol = curwin->w_cursor.col
! 					 + (*mb_ptr2len)(ml_get_cursor());
! 		else
! #endif
! 		    foundcol = curwin->w_cursor.col + 1;
! 		if (curwin->w_cursor.col < (colnr_T)wantcol)
  		    break;
  	    }
  #ifdef FEAT_MBYTE
! 	    else if (cc >= 0x100 && fo_multibyte
! 			      && curwin->w_cursor.col <= (colnr_T)wantcol)
  	    {
  		/* Break after or before a multi-byte character. */
  		foundcol = curwin->w_cursor.col;
- 		if (curwin->w_cursor.col < (colnr_T)wantcol)
- 		    foundcol += (*mb_char2len)(cc);
  		end_foundcol = foundcol;
! 		break;
  	    }
  #endif
  	    if (curwin->w_cursor.col == 0)
--- 5889,5948 ----
  			continue;	/* one-letter, continue */
  		    curwin->w_cursor.col = col;
  		}
! 
! 		inc_cursor();
! 
! 		end_foundcol = end_col + 1;
! 		foundcol = curwin->w_cursor.col;
! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
  		    break;
  	    }
  #ifdef FEAT_MBYTE
! 	    else if (cc >= 0x100 && fo_multibyte)
  	    {
  		/* Break after or before a multi-byte character. */
+ 		if (curwin->w_cursor.col != startcol)
+ 		{
+ #ifdef FEAT_COMMENTS
+ 		    /* Don't break until after the comment leader */
+ 		    if (curwin->w_cursor.col < leader_len)
+ 			break;
+ #endif
+ 		    col = curwin->w_cursor.col;
+ 		    inc_cursor();
+ 		    /* Don't change end_foundcol if already set. */
+ 		    if (foundcol != curwin->w_cursor.col)
+ 		    {
+ 			foundcol = curwin->w_cursor.col;
+ 			end_foundcol = foundcol;
+ 			if (curwin->w_cursor.col <= (colnr_T)wantcol)
+ 			    break;
+ 		    }
+ 		    curwin->w_cursor.col = col;
+ 		}
+ 
+ 		if (curwin->w_cursor.col == 0)
+ 		    break;
+ 
+ 		col = curwin->w_cursor.col;
+ 
+ 		dec_cursor();
+ 		cc = gchar_cursor();
+ 
+ 		if (WHITECHAR(cc))
+ 		    continue;		/* break with space */
+ #ifdef FEAT_COMMENTS
+ 		/* Don't break until after the comment leader */
+ 		if (curwin->w_cursor.col < leader_len)
+ 		    break;
+ #endif
+ 
+ 		curwin->w_cursor.col = col;
+ 
  		foundcol = curwin->w_cursor.col;
  		end_foundcol = foundcol;
! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
! 		    break;
  	    }
  #endif
  	    if (curwin->w_cursor.col == 0)
***************
*** 5926,5939 ****
  	    orig_col = startcol;	/* Will start backspacing from here */
  	else
  #endif
! 	    replace_offset = startcol - end_foundcol - 1;
  
  	/*
  	 * adjust startcol for spaces that will be deleted and
  	 * characters that will remain on top line
  	 */
  	curwin->w_cursor.col = foundcol;
! 	while (cc = gchar_cursor(), WHITECHAR(cc))
  	    inc_cursor();
  	startcol -= curwin->w_cursor.col;
  	if (startcol < 0)
--- 5969,5983 ----
  	    orig_col = startcol;	/* Will start backspacing from here */
  	else
  #endif
! 	    replace_offset = startcol - end_foundcol;
  
  	/*
  	 * adjust startcol for spaces that will be deleted and
  	 * characters that will remain on top line
  	 */
  	curwin->w_cursor.col = foundcol;
! 	while ((cc = gchar_cursor(), WHITECHAR(cc))
! 		    && (!fo_white_par || curwin->w_cursor.col < startcol))
  	    inc_cursor();
  	startcol -= curwin->w_cursor.col;
  	if (startcol < 0)
***************
*** 8509,8515 ****
  	if (mode == BACKSPACE_LINE
  		&& (curbuf->b_p_ai
  #ifdef FEAT_CINDENT
!                     || cindent_on()
  #endif
  		   )
  #ifdef FEAT_RIGHTLEFT
--- 8553,8559 ----
  	if (mode == BACKSPACE_LINE
  		&& (curbuf->b_p_ai
  #ifdef FEAT_CINDENT
! 		    || cindent_on()
  #endif
  		   )
  #ifdef FEAT_RIGHTLEFT
*** ../vim-7.2.300/src/testdir/Makefile	2009-11-17 17:36:13.000000000 +0100
--- src/testdir/Makefile	2009-11-17 15:11:26.000000000 +0100
***************
*** 22,28 ****
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out
  
  SCRIPTS_GUI = test16.out
  
--- 22,29 ----
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out test68.out \
! 		test69.out
  
  SCRIPTS_GUI = test16.out
  
*** ../vim-7.2.300/src/testdir/test68.in	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test68.in	2009-11-17 15:39:09.000000000 +0100
***************
*** 0 ****
--- 1,56 ----
+ Test for text formatting.
+ 
+ Results of test68:
+ 
+ STARTTEST
+ :so small.vim
+ /^{/+1
+ :set noai tw=2 fo=t
+ gRa b
+ ENDTEST
+ 
+ {
+     
+ 
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set ai tw=2 fo=tw
+ gqgqjjllab
+ ENDTEST
+ 
+ {
+ a  b  
+ 
+ a    
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=3 fo=t
+ gqgqo
+ a 

+ ENDTEST
+ 
+ {
+ a 

+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tcq1 comments=:#
+ gqgqjgqgqo
+ a b
+ #a b
+ ENDTEST
+ 
+ {
+ a b
+ #a b
+ }
+ 
+ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
*** ../vim-7.2.300/src/testdir/test68.ok	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test68.ok	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,35 ----
+ Results of test68:
+ 
+ 
+ {
+ a
+ b
+ }
+ 
+ 
+ {
+ a  
+ b  
+ 
+ a  
+ b
+ }
+ 
+ 
+ {
+ a
+ 

+ 
+ a
+ 

+ }
+ 
+ 
+ {
+ a b
+ #a b
+ 
+ a b
+ #a b
+ }
+ 
*** ../vim-7.2.300/src/testdir/test69.in	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test69.in	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,139 ----
+ Test for multi-byte text formatting.
+ 
+ STARTTEST
+ :so mbyte.vim
+ :set encoding=utf-8
+ ENDTEST
+ 
+ Results of test69:
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=t
+ gqgqjgqgqo
+ ?????????
+ abc ?????????
+ ENDTEST
+ 
+ {
+ ?????????
+ abc ?????????
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=1 fo=tm
+ gqgqjgqgqjgqgqjgqgqjgqgqo
+ ???
+ ???a
+ ??? a
+ ??????
+ ??? ???
+ ENDTEST
+ 
+ {
+ ???
+ ???a
+ ??? a
+ ??????
+ ??? ???
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tm
+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+ ???
+ ???a
+ ??? a
+ ??????
+ ??? ???
+ a???
+ ab???
+ abc???
+ ab??? c
+ ab??????
+ ENDTEST
+ 
+ {
+ ???
+ ???a
+ ??? a
+ ??????
+ ??? ???
+ a???
+ ab???
+ abc???
+ ab??? c
+ ab??????
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set ai tw=2 fo=tm
+ gqgqjgqgqo
+ ???
+ ???a
+ ENDTEST
+ 
+ {
+   ???
+   ???a
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set noai tw=2 fo=tm
+ gqgqjgqgqo
+   ???
+   ???a
+ ENDTEST
+ 
+ {
+   ???
+   ???a
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=cqm comments=n:???
+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+ ???
+ ???a
+ ???a???
+ ??????
+ ?????????
+ ??? ???
+ ??? ??????
+ ??????
+ ??????a
+ ?????????
+ ENDTEST
+ 
+ {
+ ???
+ ???a
+ ???a???
+ ??????
+ ?????????
+ ??? ???
+ ??? ??????
+ ??????
+ ??????a
+ ?????????
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tm
+ R???a
+ ENDTEST
+ 
+ {
+ 
+ }
+ 
+ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
*** ../vim-7.2.300/src/testdir/test69.ok	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test69.ok	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,142 ----
+ Results of test69:
+ 
+ 
+ {
+ ?????????
+ abc
+ ?????????
+ 
+ ?????????
+ abc
+ ?????????
+ }
+ 
+ 
+ {
+ ???
+ ???
+ a
+ ???
+ a
+ ???
+ ???
+ ???
+ ???
+ 
+ ???
+ ???
+ a
+ ???
+ a
+ ???
+ ???
+ ???
+ ???
+ }
+ 
+ 
+ {
+ ???
+ ???
+ a
+ ???
+ a
+ ???
+ ???
+ ???
+ ???
+ a
+ ???
+ ab
+ ???
+ abc
+ ???
+ ab
+ ???
+ c
+ ab
+ ???
+ ???
+ 
+ ???
+ ???
+ a
+ ???
+ a
+ ???
+ ???
+ ???
+ ???
+ a
+ ???
+ ab
+ ???
+ abc
+ ???
+ ab
+ ???
+ c
+ ab
+ ???
+ ???
+ }
+ 
+ 
+ {
+   ???
+   ???
+   a
+ 
+   ???
+   ???
+   a
+ }
+ 
+ 
+ {
+   ???
+   ???
+ a
+ 
+   ???
+   ???
+ a
+ }
+ 
+ 
+ {
+ ???
+ ???a
+ ???a
+ ??????
+ ??????
+ ??????
+ ??????
+ ??? ???
+ ??? ???
+ ??? ???
+ ??????
+ ??????a
+ ?????????
+ 
+ ???
+ ???a
+ ???a
+ ??????
+ ??????
+ ??????
+ ??????
+ ??? ???
+ ??? ???
+ ??? ???
+ ??????
+ ??????a
+ ?????????
+ }
+ 
+ 
+ {
+ ???
+ a
+ }
+ 
*** ../vim-7.2.300/src/version.c	2009-11-17 17:37:34.000000000 +0100
--- src/version.c	2009-11-17 17:26:35.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     301,
  /**/


--- NEW FILE 7.2.302 ---
To: vim-dev at vim.org
Subject: Patch 7.2.302 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.302 (extra part of 7.2.301)
Problem:    Formatting wrong with small 'tw' value.
Solution:   Add build rules for tests.
Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
	    src/testdir/Make_vms.mms


*** ../vim-7.2.301/src/testdir/Make_amiga.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_amiga.mak	2009-11-17 15:29:05.000000000 +0100
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out test68.out test69.out
  
  .SUFFIXES: .in .out
  
***************
*** 113,115 ****
--- 113,117 ----
  test65.out: test65.in
  test66.out: test66.in
  test67.out: test67.in
+ test68.out: test68.in
+ test69.out: test69.in
*** ../vim-7.2.301/src/testdir/Make_dos.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_dos.mak	2009-11-17 15:29:54.000000000 +0100
***************
*** 26,32 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
--- 26,33 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out \
! 		test68.out test69.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.301/src/testdir/Make_ming.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_ming.mak	2009-11-17 15:30:07.000000000 +0100
***************
*** 45,51 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
--- 45,52 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out \
! 		test68.out test69.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.301/src/testdir/Make_os2.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_os2.mak	2009-11-17 15:11:26.000000000 +0100
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out test68.out test69.out
  
  .SUFFIXES: .in .out
  
*** ../vim-7.2.301/src/testdir/Make_vms.mms	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_vms.mms	2009-11-17 15:11:26.000000000 +0100
***************
*** 69,75 ****
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
--- 69,75 ----
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out test68.out test69.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
*** ../vim-7.2.301/src/version.c	2009-11-17 17:40:34.000000000 +0100
--- src/version.c	2009-11-17 17:43:26.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     302,
  /**/

-- 
Hacker: Someone skilled in computer programming (good guy).
Cracker: A hacker that uses his skills to crack software (bad guy).

 /// 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    ///


--- NEW FILE 7.2.303 ---
To: vim-dev at vim.org
Subject: Patch 7.2.303
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.303 (after 7.2.294)
Problem:    Can't build on MS-Windows.
Solution:   Add #ifdef around vim_settempdir(). (James Vega)
Files:	    src/fileio.c


*** ../vim-7.2.302/src/fileio.c	2009-11-17 17:13:03.000000000 +0100
--- src/fileio.c	2009-11-18 20:06:55.000000000 +0100
***************
*** 146,152 ****
--- 146,154 ----
  # endif
  #endif
  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+ #ifdef TEMPDIRNAMES
  static void vim_settempdir __ARGS((char_u *tempdir));
+ #endif
  #ifdef FEAT_AUTOCMD
  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
  #endif
***************
*** 6995,7000 ****
--- 6997,7003 ----
  }
  #endif
  
+ #ifdef TEMPDIRNAMES
  /*
   * Directory "tempdir" was created.  Expand this name to a full path and put
   * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
***************
*** 7021,7026 ****
--- 7024,7030 ----
  	vim_free(buf);
      }
  }
+ #endif
  
  /*
   * vim_tempname(): Return a unique name that can be used for a temp file.
*** ../vim-7.2.302/src/version.c	2009-11-17 17:57:10.000000000 +0100
--- src/version.c	2009-11-18 20:07:58.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     303,
  /**/

-- 
BEDEVERE:        Why do you think she is a witch?
SECOND VILLAGER: She turned me into a newt.
BEDEVERE:        A newt?
SECOND VILLAGER: (After looking at himself for some time) I got better.
                 "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    ///


--- NEW FILE 7.2.304 ---
To: vim-dev at vim.org
Subject: Patch 7.2.304
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.304
Problem:    Compiler warning for bad pointer cast.
Solution:   Use another variable for int pointer.
Files:	    src/ops.c


*** ../vim-7.2.303/src/ops.c	2009-11-17 12:43:19.000000000 +0100
--- src/ops.c	2009-11-18 15:40:26.000000000 +0100
***************
*** 5597,5603 ****
  	    vc.vc_type = CONV_NONE;
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
  	    {
! 		conv_str = string_convert(&vc, str, (int*)&len);
  		if (conv_str != NULL)
  		{
  		    vim_free(str);
--- 5597,5606 ----
  	    vc.vc_type = CONV_NONE;
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
  	    {
! 	        int intlen = len;
! 
! 		conv_str = string_convert(&vc, str, &intlen);
! 		len = intlen;
  		if (conv_str != NULL)
  		{
  		    vim_free(str);
*** ../vim-7.2.303/src/version.c	2009-11-18 20:12:15.000000000 +0100
--- src/version.c	2009-11-25 12:37:36.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     304,
  /**/

-- 
I recommend ordering large cargo containers of paper towels to make up
whatever budget underruns you have.  Paper products are always useful and they
have the advantage of being completely flushable if you need to make room in
the storage area later.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.305 ---
To: vim-dev at vim.org
Subject: Patch 7.2.305
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.305
Problem:    Recursively redrawing causes a memory leak. (Dominique Pelle)
Solution:   Disallow recursive screen updating.
Files:	    src/screen.c


*** ../vim-7.2.304/src/screen.c	2009-11-11 17:07:25.000000000 +0100
--- src/screen.c	2009-11-17 16:30:53.000000000 +0100
***************
*** 323,328 ****
--- 323,329 ----
      int		did_one;
  #endif
  
+     /* Don't do anything if the screen structures are (not yet) valid. */
      if (!screen_valid(TRUE))
  	return;
  
***************
*** 342,348 ****
      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
  	type = NOT_VALID;
  
!     if (!redrawing())
      {
  	redraw_later(type);		/* remember type for next time */
  	must_redraw = type;
--- 343,351 ----
      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
  	type = NOT_VALID;
  
!     /* Postpone the redrawing when it's not needed and when being called
!      * recursively. */
!     if (!redrawing() || updating_screen)
      {
  	redraw_later(type);		/* remember type for next time */
  	must_redraw = type;
***************
*** 582,587 ****
--- 585,591 ----
  
  /*
   * Prepare for updating one or more windows.
+  * Caller must check for "updating_screen" already set to avoid recursiveness.
   */
      static void
  update_prepare()
***************
*** 663,669 ****
  	    doit = TRUE;
      }
  
!     if (!doit)
  	return;
  
      /* update all windows that need updating */
--- 667,675 ----
  	    doit = TRUE;
      }
  
!     /* Return when there is nothing to do or screen updating already
!      * happening. */
!     if (!doit || updating_screen)
  	return;
  
      /* update all windows that need updating */
***************
*** 696,701 ****
--- 702,711 ----
  updateWindow(wp)
      win_T	*wp;
  {
+     /* return if already busy updating */
+     if (updating_screen)
+ 	return;
+ 
      update_prepare();
  
  #ifdef FEAT_CLIPBOARD
*** ../vim-7.2.304/src/version.c	2009-11-25 12:38:49.000000000 +0100
--- src/version.c	2009-11-25 13:01:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     305,
  /**/

-- 
If the Universe is constantly expanding, why can't I ever find a parking space?

 /// 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    ///


--- NEW FILE 7.2.306 ---
To: vim-dev at vim.org
Subject: Patch 7.2.306
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.306
Problem:    shellescape("10%%", 1) only escapes first %. (Christian Brabandt)
Solution:   Don't copy the character after the escaped one.
Files:	    src/misc2.c


*** ../vim-7.2.305/src/misc2.c	2009-11-11 16:56:13.000000000 +0100
--- src/misc2.c	2009-11-25 17:11:49.000000000 +0100
***************
*** 1390,1395 ****
--- 1390,1396 ----
  		*d++ = '\\';		/* insert backslash */
  		while (--l >= 0)	/* copy the var */
  		    *d++ = *p++;
+ 		continue;
  	    }
  
  	    MB_COPY_CHAR(p, d);
*** ../vim-7.2.305/src/version.c	2009-11-25 13:03:29.000000000 +0100
--- src/version.c	2009-11-25 17:13:54.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     306,
  /**/

-- 
Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
engineering at the Technical University of Delft and graduated in 1985 on a
multi-processor Unix architecture."
Response by "dimator": Could the school not afford a proper stage for the
ceremony?

 /// 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    ///


--- NEW FILE 7.2.307 ---
To: vim-dev at vim.org
Subject: Patch 7.2.307
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.307
Problem:    Crash with a very long syntax match statement. (Guy Gur Ari)
Solution:   When the offset does not fit in the two bytes available give an
            error instead of continuing with invalid pointers.
Files:      src/regexp.c


*** ../vim-7.2.306/src/regexp.c	2009-05-15 21:31:11.000000000 +0200
--- src/regexp.c	2009-11-25 18:13:03.000000000 +0100
***************
*** 583,588 ****
--- 583,589 ----
  #endif
  static char_u	*regcode;	/* Code-emit pointer, or JUST_CALC_SIZE */
  static long	regsize;	/* Code size. */
+ static int	reg_toolong;	/* TRUE when offset out of range */
  static char_u	had_endbrace[NSUBEXP];	/* flags, TRUE if end of () found */
  static unsigned	regflags;	/* RF_ flags for prog */
  static long	brace_min[10];	/* Minimums for complex brace repeats */
***************
*** 1028,1036 ****
      regcomp_start(expr, re_flags);
      regcode = r->program;
      regc(REGMAGIC);
!     if (reg(REG_NOPAREN, &flags) == NULL)
      {
  	vim_free(r);
  	return NULL;
      }
  
--- 1029,1039 ----
      regcomp_start(expr, re_flags);
      regcode = r->program;
      regc(REGMAGIC);
!     if (reg(REG_NOPAREN, &flags) == NULL || reg_toolong)
      {
  	vim_free(r);
+ 	if (reg_toolong)
+ 	    EMSG_RET_NULL(_("E339: Pattern too long"));
  	return NULL;
      }
  
***************
*** 1141,1146 ****
--- 1144,1150 ----
      re_has_z = 0;
  #endif
      regsize = 0L;
+     reg_toolong = FALSE;
      regflags = 0;
  #if defined(FEAT_SYN_HL) || defined(PROTO)
      had_eol = FALSE;
***************
*** 1228,1234 ****
      {
  	skipchr();
  	br = regbranch(&flags);
! 	if (br == NULL)
  	    return NULL;
  	regtail(ret, br);	/* BRANCH -> BRANCH. */
  	if (!(flags & HASWIDTH))
--- 1232,1238 ----
      {
  	skipchr();
  	br = regbranch(&flags);
! 	if (br == NULL || reg_toolong)
  	    return NULL;
  	regtail(ret, br);	/* BRANCH -> BRANCH. */
  	if (!(flags & HASWIDTH))
***************
*** 1313,1318 ****
--- 1317,1324 ----
  	    break;
  	skipchr();
  	regtail(latest, regnode(END)); /* operand ends */
+ 	if (reg_toolong)
+ 	    break;
  	reginsert(MATCH, latest);
  	chain = latest;
      }
***************
*** 1382,1388 ****
  			    break;
  	    default:
  			    latest = regpiece(&flags);
! 			    if (latest == NULL)
  				return NULL;
  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
  			    if (chain == NULL)	/* First piece. */
--- 1388,1394 ----
  			    break;
  	    default:
  			    latest = regpiece(&flags);
! 			    if (latest == NULL || reg_toolong)
  				return NULL;
  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
  			    if (chain == NULL)	/* First piece. */
***************
*** 2540,2547 ****
  	offset = (int)(scan - val);
      else
  	offset = (int)(val - scan);
!     *(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
!     *(scan + 2) = (char_u) (offset & 0377);
  }
  
  /*
--- 2546,2561 ----
  	offset = (int)(scan - val);
      else
  	offset = (int)(val - scan);
!     /* When the offset uses more than 16 bits it can no longer fit in the two
!      * bytes avaliable.  Use a global flag to avoid having to check return
!      * values in too many places. */
!     if (offset > 0xffff)
! 	reg_toolong = TRUE;
!     else
!     {
! 	*(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
! 	*(scan + 2) = (char_u) (offset & 0377);
!     }
  }
  
  /*
***************
*** 5764,5769 ****
--- 5778,5785 ----
  
  /*
   * regnext - dig the "next" pointer out of a node
+  * Returns NULL when calculating size, when there is no next item and when
+  * there is an error.
   */
      static char_u *
  regnext(p)
***************
*** 5771,5777 ****
  {
      int	    offset;
  
!     if (p == JUST_CALC_SIZE)
  	return NULL;
  
      offset = NEXT(p);
--- 5787,5793 ----
  {
      int	    offset;
  
!     if (p == JUST_CALC_SIZE || reg_toolong)
  	return NULL;
  
      offset = NEXT(p);
*** ../vim-7.2.306/src/version.c	2009-11-25 17:15:16.000000000 +0100
--- src/version.c	2009-11-25 18:14:32.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     307,
  /**/

-- 
The fastest way to get an engineer to solve a problem is to declare that the
problem is unsolvable.  No engineer can walk away from an unsolvable problem
until it's solved.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.308 ---
To: vim-dev at vim.org
Subject: Patch 7.2.308
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.308
Problem:    When using a regexp in the "\=" expression of a substitute
	    command, submatch() returns empty strings for further lines.
	    (Clockwork Jam)
Solution:   Save and restore the line number and line count when calling
	    reg_getline().
Files:	    src/regexp.c


*** ../vim-7.2.307/src/regexp.c	2009-11-25 18:21:48.000000000 +0100
--- src/regexp.c	2009-11-25 19:45:07.000000000 +0100
***************
*** 6828,6833 ****
--- 6828,6835 ----
   * that contains a call to substitute() and submatch(). */
  static regmatch_T	*submatch_match;
  static regmmatch_T	*submatch_mmatch;
+ static linenr_T		submatch_firstlnum;
+ static linenr_T		submatch_maxline;
  #endif
  
  #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
***************
*** 6941,6947 ****
  	}
  	else
  	{
- 	    linenr_T	save_reg_maxline;
  	    win_T	*save_reg_win;
  	    int		save_ireg_ic;
  
--- 6943,6948 ----
***************
*** 6953,6959 ****
  	     * vim_regexec_multi() can't be called recursively. */
  	    submatch_match = reg_match;
  	    submatch_mmatch = reg_mmatch;
! 	    save_reg_maxline = reg_maxline;
  	    save_reg_win = reg_win;
  	    save_ireg_ic = ireg_ic;
  	    can_f_submatch = TRUE;
--- 6954,6961 ----
  	     * vim_regexec_multi() can't be called recursively. */
  	    submatch_match = reg_match;
  	    submatch_mmatch = reg_mmatch;
! 	    submatch_firstlnum = reg_firstlnum;
! 	    submatch_maxline = reg_maxline;
  	    save_reg_win = reg_win;
  	    save_ireg_ic = ireg_ic;
  	    can_f_submatch = TRUE;
***************
*** 6976,6982 ****
  
  	    reg_match = submatch_match;
  	    reg_mmatch = submatch_mmatch;
! 	    reg_maxline = save_reg_maxline;
  	    reg_win = save_reg_win;
  	    ireg_ic = save_ireg_ic;
  	    can_f_submatch = FALSE;
--- 6978,6985 ----
  
  	    reg_match = submatch_match;
  	    reg_mmatch = submatch_mmatch;
! 	    reg_firstlnum = submatch_firstlnum;
! 	    reg_maxline = submatch_maxline;
  	    reg_win = save_reg_win;
  	    ireg_ic = save_ireg_ic;
  	    can_f_submatch = FALSE;
***************
*** 7212,7217 ****
--- 7215,7243 ----
  
  #ifdef FEAT_EVAL
  /*
+  * Call reg_getline() with the line numbers from the submatch.  If a
+  * substitute() was used the reg_maxline and other values have been
+  * overwritten.
+  */
+     static char_u *
+ reg_getline_submatch(lnum)
+     linenr_T	lnum;
+ {
+     char_u *s;
+     linenr_T save_first = reg_firstlnum;
+     linenr_T save_max = reg_maxline;
+ 
+     reg_firstlnum = submatch_firstlnum;
+     reg_maxline = submatch_maxline;
+ 
+     s = reg_getline(lnum);
+ 
+     reg_firstlnum = save_first;
+     reg_maxline = save_max;
+     return s;
+ }
+ 
+ /*
   * Used for the submatch() function: get the string from the n'th submatch in
   * allocated memory.
   * Returns NULL when not in a ":s" command and for a non-existing submatch.
***************
*** 7241,7247 ****
  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
  		return NULL;
  
! 	    s = reg_getline(lnum) + submatch_mmatch->startpos[no].col;
  	    if (s == NULL)  /* anti-crash check, cannot happen? */
  		break;
  	    if (submatch_mmatch->endpos[no].lnum == lnum)
--- 7267,7273 ----
  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
  		return NULL;
  
! 	    s = reg_getline_submatch(lnum) + submatch_mmatch->startpos[no].col;
  	    if (s == NULL)  /* anti-crash check, cannot happen? */
  		break;
  	    if (submatch_mmatch->endpos[no].lnum == lnum)
***************
*** 7267,7273 ****
  		++lnum;
  		while (lnum < submatch_mmatch->endpos[no].lnum)
  		{
! 		    s = reg_getline(lnum++);
  		    if (round == 2)
  			STRCPY(retval + len, s);
  		    len += (int)STRLEN(s);
--- 7293,7299 ----
  		++lnum;
  		while (lnum < submatch_mmatch->endpos[no].lnum)
  		{
! 		    s = reg_getline_submatch(lnum++);
  		    if (round == 2)
  			STRCPY(retval + len, s);
  		    len += (int)STRLEN(s);
***************
*** 7276,7282 ****
  		    ++len;
  		}
  		if (round == 2)
! 		    STRNCPY(retval + len, reg_getline(lnum),
  					     submatch_mmatch->endpos[no].col);
  		len += submatch_mmatch->endpos[no].col;
  		if (round == 2)
--- 7302,7308 ----
  		    ++len;
  		}
  		if (round == 2)
! 		    STRNCPY(retval + len, reg_getline_submatch(lnum),
  					     submatch_mmatch->endpos[no].col);
  		len += submatch_mmatch->endpos[no].col;
  		if (round == 2)
*** ../vim-7.2.307/src/version.c	2009-11-25 18:21:48.000000000 +0100
--- src/version.c	2009-11-25 19:50:16.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     308,
  /**/

-- 
Engineers are always delighted to share wisdom, even in areas in which they
have no experience whatsoever.  Their logic provides them with inherent
insight into any field of expertise.  This can be a problem when dealing with
the illogical people who believe that knowledge can only be derived through
experience.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.309 ---
To: vim-dev at vim.org
Subject: Patch 7.2.309
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.309 (after 7.2.308)
Problem:    Warning for missing function prototype. (Patrick Texier)
Solution:   Add the prototype.
Files:	    src/regexp.c


*** ../vim-7.2.308/src/regexp.c	2009-11-25 19:51:56.000000000 +0100
--- src/regexp.c	2009-11-26 20:39:18.000000000 +0100
***************
*** 7214,7219 ****
--- 7214,7221 ----
  }
  
  #ifdef FEAT_EVAL
+ static char_u *reg_getline_submatch __ARGS((linenr_T lnum));
+ 
  /*
   * Call reg_getline() with the line numbers from the submatch.  If a
   * substitute() was used the reg_maxline and other values have been
*** ../vim-7.2.308/src/version.c	2009-11-25 19:51:56.000000000 +0100
--- src/version.c	2009-11-26 20:40:11.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     309,
  /**/

-- 
Female engineers become irresistible at the age of consent and remain that
way until about thirty minutes after their clinical death.  Longer if it's a
warm day.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.310 ---
To: vim-dev at vim.org
Subject: Patch 7.2.310
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.310
Problem:    When a filetype plugin in ~/.vim/ftdetect uses ":setfiletype" and
	    the file starts with a "# comment" it gets "conf" filetype.
Solution:   Check for "conf" filetype after using ftdetect plugins.
Files:	    runtime/filetype.vim


*** ../vim-7.2.309/runtime/filetype.vim	2008-08-06 18:56:36.000000000 +0200
--- runtime/filetype.vim	2009-12-02 12:08:42.000000000 +0100
***************
*** 2400,2405 ****
--- 2435,2446 ----
  au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
  
  
+ 
+ " Use the filetype detect plugins.  They may overrule any of the previously
+ " detected filetypes.
+ runtime! ftdetect/*.vim
+ 
+ 
  " Generic configuration file (check this last, it's just guessing!)
  au BufNewFile,BufRead,StdinReadPost *
  	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
***************
*** 2408,2417 ****
  	\   setf conf |
  	\ endif
  
- " Use the plugin-filetype checks last, they may overrule any of the previously
- " detected filetypes.
- runtime! ftdetect/*.vim
- 
  augroup END
  
  
--- 2449,2454 ----
*** ../vim-7.2.309/src/version.c	2009-11-26 20:41:19.000000000 +0100
--- src/version.c	2009-12-02 12:05:27.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     310,
  /**/

-- 
A)bort, R)etry, P)lease don't bother me again

 /// 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    ///


--- NEW FILE 7.2.311 ---
To: vim-dev at vim.org
Subject: Patch 7.2.311
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.311
Problem:    Can't compile with FreeMiNT.
Solution:   Change #ifdef for limits.h. (Alan Hourihane)
Files:	    src/fileio.c


*** ../vim-7.2.310/src/fileio.c	2009-11-18 20:12:15.000000000 +0100
--- src/fileio.c	2009-12-02 13:30:07.000000000 +0100
***************
*** 21,27 ****
  
  #include "vim.h"
  
! #ifdef __TANDEM
  # include <limits.h>		/* for SSIZE_MAX */
  #endif
  
--- 21,27 ----
  
  #include "vim.h"
  
! #if defined(__TANDEM) || defined(__MINT__)
  # include <limits.h>		/* for SSIZE_MAX */
  #endif
  
*** ../vim-7.2.310/src/version.c	2009-12-02 12:08:57.000000000 +0100
--- src/version.c	2009-12-02 13:31:46.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     311,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
3. Your bookmark takes 15 minutes to scroll from top to bottom.

 /// 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    ///


--- NEW FILE 7.2.312 ---
To: vim-dev at vim.org
Subject: Patch 7.2.312
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.312
Problem:    iconv() returns an invalid character sequence when conversion
	    fails.  It should return an empty string. (Yongwei Wu)
Solution:   Be more strict about invalid characters in the input.
Files:	    src/mbyte.c


*** ../vim-7.2.311/src/mbyte.c	2009-06-16 15:23:07.000000000 +0200
--- src/mbyte.c	2009-11-25 16:10:44.000000000 +0100
***************
*** 133,154 ****
  static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
! /* Lookup table to quickly get the length in bytes of a UTF-8 character from
!  * the first byte of a UTF-8 string.  Bytes which are illegal when used as the
!  * first byte have a one, because these will be used separately. */
  static char utf8len_tab[256] =
  {
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
  };
  
  /*
   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
   * in the "xim.log" file.
   */
--- 133,172 ----
  static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
! /*
!  * Lookup table to quickly get the length in bytes of a UTF-8 character from
!  * the first byte of a UTF-8 string.
!  * Bytes which are illegal when used as the first byte have a 1.
!  * The NUL byte has length 1.
!  */
  static char utf8len_tab[256] =
  {
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
  };
  
  /*
+  * Like utf8len_tab above, but using a zero for illegal lead bytes.
+  */
+ static char utf8len_tab_zero[256] =
+ {
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     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,0,
+     2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+     3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0,
+ };
+ 
+ /*
   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
   * in the "xim.log" file.
   */
***************
*** 1352,1358 ****
      if (size > 0 && *p >= 0x80)
      {
  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
! 	    return 1;
  	c = utf_ptr2char(p);
  	/* An illegal byte is displayed as <xx>. */
  	if (utf_ptr2len(p) == 1 || c == NUL)
--- 1370,1376 ----
      if (size > 0 && *p >= 0x80)
      {
  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
! 	    return 1;  /* truncated */
  	c = utf_ptr2char(p);
  	/* An illegal byte is displayed as <xx>. */
  	if (utf_ptr2len(p) == 1 || c == NUL)
***************
*** 1473,1479 ****
      if (p[0] < 0x80)	/* be quick for ASCII */
  	return p[0];
  
!     len = utf8len_tab[p[0]];
      if (len > 1 && (p[1] & 0xc0) == 0x80)
      {
  	if (len == 2)
--- 1491,1497 ----
      if (p[0] < 0x80)	/* be quick for ASCII */
  	return p[0];
  
!     len = utf8len_tab_zero[p[0]];
      if (len > 1 && (p[1] & 0xc0) == 0x80)
      {
  	if (len == 2)
***************
*** 1723,1728 ****
--- 1741,1747 ----
  /*
   * Return length of UTF-8 character, obtained from the first byte.
   * "b" must be between 0 and 255!
+  * Returns 1 for an invalid first byte value.
   */
      int
  utf_byte2len(b)
***************
*** 1737,1742 ****
--- 1756,1762 ----
   * Returns 1 for "".
   * Returns 1 for an illegal byte sequence (also in incomplete byte seq.).
   * Returns number > "size" for an incomplete byte sequence.
+  * Never returns zero.
   */
      int
  utf_ptr2len_len(p, size)
***************
*** 1747,1757 ****
      int		i;
      int		m;
  
!     if (*p == NUL)
! 	return 1;
!     m = len = utf8len_tab[*p];
      if (len > size)
  	m = size;	/* incomplete byte sequence. */
      for (i = 1; i < m; ++i)
  	if ((p[i] & 0xc0) != 0x80)
  	    return 1;
--- 1767,1779 ----
      int		i;
      int		m;
  
!     len = utf8len_tab[*p];
!     if (len == 1)
! 	return 1;	/* NUL, ascii or illegal lead byte */
      if (len > size)
  	m = size;	/* incomplete byte sequence. */
+     else
+ 	m = len;
      for (i = 1; i < m; ++i)
  	if ((p[i] & 0xc0) != 0x80)
  	    return 1;
***************
*** 2505,2510 ****
--- 2527,2533 ----
  /*
   * mb_head_off() function pointer.
   * Return offset from "p" to the first byte of the character it points into.
+  * If "p" points to the NUL at the end of the string return 0.
   * Returns 0 when already at the first byte of a character.
   */
      int
***************
*** 2524,2530 ****
  
      /* It can't be a trailing byte when not using DBCS, at the start of the
       * string or the previous byte can't start a double-byte. */
!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
--- 2547,2553 ----
  
      /* It can't be a trailing byte when not using DBCS, at the start of the
       * string or the previous byte can't start a double-byte. */
!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
***************
*** 2552,2558 ****
       * lead byte in the current cell. */
      if (p <= base
  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
! 	    || MB_BYTE2LEN(p[-1]) == 1)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
--- 2575,2582 ----
       * lead byte in the current cell. */
      if (p <= base
  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
! 	    || MB_BYTE2LEN(p[-1]) == 1
! 	    || *p == NUL)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
***************
*** 2578,2583 ****
--- 2602,2608 ----
      char_u	*q;
      char_u	*s;
      int		c;
+     int		len;
  #ifdef FEAT_ARABIC
      char_u	*j;
  #endif
***************
*** 2597,2604 ****
  	    --q;
  	/* Check for illegal sequence. Do allow an illegal byte after where we
  	 * started. */
! 	if (utf8len_tab[*q] != (int)(s - q + 1)
! 				       && utf8len_tab[*q] != (int)(p - q + 1))
  	    return 0;
  
  	if (q <= base)
--- 2622,2629 ----
  	    --q;
  	/* Check for illegal sequence. Do allow an illegal byte after where we
  	 * started. */
! 	len = utf8len_tab[*q];
! 	if (len != (int)(s - q + 1) && len != (int)(p - q + 1))
  	    return 0;
  
  	if (q <= base)
***************
*** 2810,2818 ****
  
      while (end == NULL ? *p != NUL : p < end)
      {
! 	if ((*p & 0xc0) == 0x80)
  	    return FALSE;	/* invalid lead byte */
- 	l = utf8len_tab[*p];
  	if (end != NULL && p + l > end)
  	    return FALSE;	/* incomplete byte sequence */
  	++p;
--- 2835,2843 ----
  
      while (end == NULL ? *p != NUL : p < end)
      {
! 	l = utf8len_tab_zero[*p];
! 	if (l == 0)
  	    return FALSE;	/* invalid lead byte */
  	if (end != NULL && p + l > end)
  	    return FALSE;	/* incomplete byte sequence */
  	++p;
***************
*** 6117,6128 ****
  	    d = retval;
  	    for (i = 0; i < len; ++i)
  	    {
! 		l = utf_ptr2len(ptr + i);
  		if (l == 0)
  		    *d++ = NUL;
  		else if (l == 1)
  		{
! 		    if (unconvlenp != NULL && utf8len_tab[ptr[i]] > len - i)
  		    {
  			/* Incomplete sequence at the end. */
  			*unconvlenp = len - i;
--- 6142,6161 ----
  	    d = retval;
  	    for (i = 0; i < len; ++i)
  	    {
! 		l = utf_ptr2len_len(ptr + i, len - i);
  		if (l == 0)
  		    *d++ = NUL;
  		else if (l == 1)
  		{
! 		    int l_w = utf8len_tab_zero[ptr[i]];
! 
! 		    if (l_w == 0)
! 		    {
! 			/* Illegal utf-8 byte cannot be converted */
! 			vim_free(retval);
! 			return NULL;
! 		    }
! 		    if (unconvlenp != NULL && l_w > len - i)
  		    {
  			/* Incomplete sequence at the end. */
  			*unconvlenp = len - i;
*** ../vim-7.2.311/src/version.c	2009-12-02 13:32:10.000000000 +0100
--- src/version.c	2009-12-02 15:00:23.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     312,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
6. You refuse to go to a vacation spot with no electricity and no phone lines.

 /// 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    ///


--- NEW FILE 7.2.313 ---
To: vim-dev at vim.org
Subject: Patch 7.2.313
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.313
Problem:    Command line completion doesn't work after "%:h" and similar.
Solution:   Expand these items before doing the completion.
Files:	    src/ex_getln.c, src/misc1.c, src/proto/misc1.pro


*** ../vim-7.2.312/src/ex_getln.c	2009-09-18 17:24:54.000000000 +0200
--- src/ex_getln.c	2009-12-02 16:40:06.000000000 +0100
***************
*** 4422,4428 ****
  	    flags |= EW_FILE;
  	else
  	    flags = (flags | EW_DIR) & ~EW_FILE;
! 	ret = expand_wildcards(1, &pat, num_file, file, flags);
  	if (free_pat)
  	    vim_free(pat);
  	return ret;
--- 4422,4429 ----
  	    flags |= EW_FILE;
  	else
  	    flags = (flags | EW_DIR) & ~EW_FILE;
! 	/* Expand wildcards, supporting %:h and the like. */
! 	ret = expand_wildcards_eval(&pat, num_file, file, flags);
  	if (free_pat)
  	    vim_free(pat);
  	return ret;
*** ../vim-7.2.312/src/misc1.c	2009-11-17 16:08:12.000000000 +0100
--- src/misc1.c	2009-12-02 17:06:49.000000000 +0100
***************
*** 8447,8452 ****
--- 8447,8492 ----
  }
  
  /*
+  * Invoke expand_wildcards() for one pattern.
+  * Expand items like "%:h" before the expansion.
+  * Returns OK or FAIL.
+  */
+     int
+ expand_wildcards_eval(pat, num_file, file, flags)
+     char_u	 **pat;		/* pointer to input pattern */
+     int		  *num_file;	/* resulting number of files */
+     char_u	***file;	/* array of resulting files */
+     int		   flags;	/* EW_DIR, etc. */
+ {
+     int		ret = FAIL;
+     char_u	*eval_pat = NULL;
+     char_u	*exp_pat = *pat;
+     char_u      *ignored_msg;
+     int		usedlen;
+ 
+     if (*exp_pat == '%' || *exp_pat == '#' || *exp_pat == '<')
+     {
+ 	++emsg_off;
+ 	eval_pat = eval_vars(exp_pat, exp_pat, &usedlen,
+ 						    NULL, &ignored_msg, NULL);
+ 	--emsg_off;
+ 	if (eval_pat != NULL)
+ 	    exp_pat = concat_str(eval_pat, exp_pat + usedlen);
+     }
+ 
+     if (exp_pat != NULL)
+ 	ret = expand_wildcards(1, &exp_pat, num_file, file, flags);
+ 
+     if (eval_pat != NULL)
+     {
+ 	vim_free(exp_pat);
+ 	vim_free(eval_pat);
+     }
+ 
+     return ret;
+ }
+ 
+ /*
   * Expand wildcards.  Calls gen_expand_wildcards() and removes files matching
   * 'wildignore'.
   * Returns OK or FAIL.
*** ../vim-7.2.312/src/proto/misc1.pro	2007-09-26 22:36:32.000000000 +0200
--- src/proto/misc1.pro	2009-12-02 16:41:52.000000000 +0100
***************
*** 85,90 ****
--- 85,91 ----
  int vim_fexists __ARGS((char_u *fname));
  void line_breakcheck __ARGS((void));
  void fast_breakcheck __ARGS((void));
+ int expand_wildcards_eval __ARGS((char_u **pat, int *num_file, char_u ***file, int flags));
  int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
  int match_suffix __ARGS((char_u *fname));
  int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
*** ../vim-7.2.312/src/version.c	2009-12-02 15:03:24.000000000 +0100
--- src/version.c	2009-12-02 17:14:02.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     313,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
8. You spend half of the plane trip with your laptop on your lap...and your
   child in the overhead compartment.

 /// 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    ///


--- NEW FILE 7.2.314 ---
To: vim-dev at vim.org
Subject: Patch 7.2.314
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.314
Problem:    Missing function in small build.
Solution:   Always include concat_str.
Files:	    src/misc1.c


*** ../vim-7.2.313/src/misc1.c	2009-12-02 17:15:04.000000000 +0100
--- src/misc1.c	2009-12-02 17:44:55.000000000 +0100
***************
*** 4666,4672 ****
      return dest;
  }
  
- #if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
  /*
   * Concatenate two strings and return the result in allocated memory.
   * Returns NULL when out of memory.
--- 4666,4671 ----
***************
*** 4687,4693 ****
      }
      return dest;
  }
- #endif
  
  /*
   * Add a path separator to a file name, unless it already ends in a path
--- 4686,4691 ----
*** ../vim-7.2.313/src/version.c	2009-12-02 17:15:04.000000000 +0100
--- src/version.c	2009-12-02 17:47:18.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     314,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
9. All your daydreaming is preoccupied with getting a faster connection to the
   net: 28.8...ISDN...cable modem...T1...T3.

 /// 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    ///


--- NEW FILE 7.2.315 ---
To: vim-dev at vim.org
Subject: Patch 7.2.315
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.315
Problem:    Python libs can't be found on 64 bit system.
Solution:   Add lib64 to the list of directories. (Michael Henry)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.314/src/auto/configure	2009-11-17 17:13:03.000000000 +0100
--- src/auto/configure	2009-12-02 17:21:20.000000000 +0100
***************
*** 5126,5132 ****
  
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
--- 5126,5132 ----
  
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib64 lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
***************
*** 13718,13725 ****
  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
        else
  	vim_cv_tty_group=world
! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5
! $as_echo "ptys are world accessable" >&6; }
        fi
  
  else
--- 13718,13725 ----
  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
        else
  	vim_cv_tty_group=world
! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5
! $as_echo "ptys are world accessible" >&6; }
        fi
  
  else
***************
*** 13730,13737 ****
  ( exit $ac_status )
  
        vim_cv_tty_group=world
!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5
! $as_echo "can't determine - assume ptys are world accessable" >&6; }
  
  fi
  rm -rf conftest.dSYM
--- 13730,13737 ----
  ( exit $ac_status )
  
        vim_cv_tty_group=world
!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5
! $as_echo "can't determine - assume ptys are world accessible" >&6; }
  
  fi
  rm -rf conftest.dSYM
*** ../vim-7.2.314/src/configure.in	2009-11-17 17:13:03.000000000 +0100
--- src/configure.in	2009-12-02 17:21:10.000000000 +0100
***************
*** 686,692 ****
        [
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
--- 686,692 ----
        [
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib64 lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
***************
*** 2557,2567 ****
  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
        else
  	vim_cv_tty_group=world
! 	AC_MSG_RESULT([ptys are world accessable])
        fi
      ],[
        vim_cv_tty_group=world
!       AC_MSG_RESULT([can't determine - assume ptys are world accessable])
      ],[
        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
      ])
--- 2557,2567 ----
  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
        else
  	vim_cv_tty_group=world
! 	AC_MSG_RESULT([ptys are world accessible])
        fi
      ],[
        vim_cv_tty_group=world
!       AC_MSG_RESULT([can't determine - assume ptys are world accessible])
      ],[
        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
      ])
*** ../vim-7.2.314/src/version.c	2009-12-02 17:47:46.000000000 +0100
--- src/version.c	2009-12-02 17:57:39.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     315,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
10. And even your night dreams are in HTML.

 /// 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    ///

vim-7.2-elinks-parameter-518791.patch:
 netrw.vim |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.2-elinks-parameter-518791.patch ---
diff -up vim72/runtime/autoload/netrw.vim.elinksparm vim72/runtime/autoload/netrw.vim
--- vim72/runtime/autoload/netrw.vim.elinksparm	2009-12-03 13:08:10.000000000 +0100
+++ vim72/runtime/autoload/netrw.vim	2009-12-03 13:08:27.000000000 +0100
@@ -88,7 +88,7 @@ if !exists("g:netrw_http_cmd")
  if executable("elinks")
   let g:netrw_http_cmd = "elinks"
   if !exists("g:netrw_http_xcmd")
-   let g:netrw_http_xcmd= "-dump >"
+   let g:netrw_http_xcmd= "-source >"
   endif
  elseif executable("links")
   let g:netrw_http_cmd = "links"

vim-7.2-httpfiletype-499123.patch:
 filetype.vim |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.2-httpfiletype-499123.patch ---
diff -up vim72/runtime/filetype.vim.499123 vim72/runtime/filetype.vim
--- vim72/runtime/filetype.vim.499123	2009-12-02 17:42:47.000000000 +0100
+++ vim72/runtime/filetype.vim	2009-12-02 17:43:52.000000000 +0100
@@ -111,7 +111,7 @@ au BufNewFile,BufRead proftpd.conf*		cal
 
 " Apache config file
 au BufNewFile,BufRead .htaccess			 setf apache
-au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
+au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/httpd/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
 
 " XA65 MOS6510 cross assembler
 au BufNewFile,BufRead *.a65			setf a65

vim72-rh514717.patch:
 eval.c    |    3 +--
 structs.h |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE vim72-rh514717.patch ---
diff -up vim72/src/eval.c.rh514717 vim72/src/eval.c
--- vim72/src/eval.c.rh514717	2009-08-03 16:15:42.882375154 +0200
+++ vim72/src/eval.c	2009-08-03 16:34:14.863381780 +0200
@@ -286,13 +286,12 @@ typedef struct
 #define VV_RO		2	/* read-only */
 #define VV_RO_SBX	4	/* read-only in the sandbox */
 
-#define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}, {0}
+#define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}
 
 static struct vimvar
 {
     char	*vv_name;	/* name of variable, without v: */
     dictitem_T	vv_di;		/* value and name for key */
-    char	vv_filler[16];	/* space for LONGEST name below!!! */
     char	vv_flags;	/* VV_COMPAT, VV_RO, VV_RO_SBX */
 } vimvars[VV_LEN] =
 {
diff -up vim72/src/structs.h.rh514717 vim72/src/structs.h
--- vim72/src/structs.h.rh514717	2009-08-03 16:33:35.274870950 +0200
+++ vim72/src/structs.h	2009-08-03 16:33:48.607436706 +0200
@@ -1095,7 +1095,7 @@ struct dictitem_S
 {
     typval_T	di_tv;		/* type and value of the variable */
     char_u	di_flags;	/* flags (only used for variable) */
-    char_u	di_key[10];	/* key (actually longer!) */
+    char_u	di_key[18];	/* key */
 };
 
 typedef struct dictitem_S dictitem_T;


Index: gvim.desktop
===================================================================
RCS file: /cvs/extras/rpms/vim/F-11/gvim.desktop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gvim.desktop	20 Oct 2008 13:28:53 -0000	1.7
+++ gvim.desktop	3 Dec 2009 13:55:24 -0000	1.8
@@ -55,7 +55,7 @@ Comment[tr]=G????l?? vi d??zenleyicisi
 Comment[uk]=???????????????? ???????????????? vi
 Comment[zh_CN.GB2312]=??????????????? vi ?????????
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %f
+Exec=gvim -f %F
 Icon=gvim
 Type=Application
 Terminal=0

vim-7.2-fstabsyntax.patch:
 fstab.vim |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: vim-7.2-fstabsyntax.patch
===================================================================
RCS file: /cvs/extras/rpms/vim/F-11/vim-7.2-fstabsyntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vim-7.2-fstabsyntax.patch	14 Aug 2008 16:06:02 -0000	1.1
+++ vim-7.2-fstabsyntax.patch	3 Dec 2009 13:55:24 -0000	1.2
@@ -6,7 +6,7 @@ diff -up vim72/runtime/syntax/fstab.vim.
  syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
  syn match fsTypeUnknown /\s\+\zs\w\+/ contained
 -syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
-+syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
  
  " Options
  " -------


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/F-11/vim.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- vim.spec	27 Mar 2009 11:39:00 -0000	1.236
+++ vim.spec	3 Dec 2009 13:55:24 -0000	1.237
@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 148
+%define patchlevel 315
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -214,6 +214,173 @@ Patch145: ftp://ftp.vim.org/pub/vim/patc
 Patch146: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.146
 Patch147: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.147
 Patch148: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.148
+Patch149: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.149
+Patch150: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.150
+Patch151: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.151
+Patch152: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.152
+Patch153: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.153
+Patch154: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.154
+Patch155: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.155
+Patch156: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.156
+Patch157: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.157
+Patch158: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.158
+Patch159: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.159
+Patch160: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.160
+Patch161: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.161
+Patch162: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.162
+Patch163: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.163
+Patch164: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.164
+Patch165: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.165
+Patch166: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.166
+Patch167: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.167
+Patch168: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.168
+Patch169: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.169
+Patch170: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.170
+Patch171: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.171
+Patch172: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.172
+Patch173: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.173
+Patch174: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.174
+Patch175: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.175
+Patch176: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.176
+Patch177: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.177
+Patch178: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.178
+Patch179: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.179
+Patch180: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.180
+Patch181: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.181
+Patch182: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.182
+Patch183: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.183
+Patch184: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.184
+Patch185: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.185
+Patch186: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.186
+Patch187: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.187
+Patch188: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.188
+Patch189: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.189
+Patch190: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.190
+Patch191: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.191
+Patch192: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.192
+Patch193: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.193
+Patch194: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.194
+Patch195: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.195
+Patch196: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.196
+Patch197: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.197
+Patch198: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.198
+Patch199: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.199
+Patch200: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.200
+Patch201: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.201
+Patch202: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.202
+Patch203: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.203
+Patch204: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.204
+Patch205: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.205
+Patch206: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.206
+Patch207: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.207
+Patch208: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.208
+Patch209: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.209
+Patch210: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.210
+Patch211: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.211
+Patch212: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.212
+Patch213: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.213
+Patch214: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.214
+Patch215: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.215
+Patch216: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.216
+Patch217: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.217
+Patch218: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.218
+Patch219: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.219
+Patch220: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.220
+Patch221: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.221
+Patch222: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.222
+Patch223: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.223
+Patch224: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.224
+Patch225: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.225
+Patch226: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.226
+Patch227: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.227
+Patch228: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.228
+Patch229: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.229
+Patch230: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.230
+Patch231: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.231
+Patch232: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.232
+Patch233: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.233
+Patch234: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.234
+Patch235: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.235
+Patch236: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.236
+Patch237: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.237
+Patch238: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.238
+Patch239: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.239
+Patch240: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.240
+Patch241: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.241
+Patch242: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.242
+Patch243: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.243
+Patch244: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.244
+Patch245: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.245
+Patch246: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.246
+Patch247: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.247
+Patch248: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.248
+Patch249: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.249
+Patch250: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.250
+Patch251: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.251
+Patch252: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.252
+Patch253: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.253
+Patch254: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.254
+Patch255: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.255
+Patch256: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.256
+Patch257: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.257
+Patch258: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.258
+Patch259: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.259
+Patch260: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.260
+Patch261: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.261
+Patch262: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.262
+Patch263: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.263
+Patch264: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.264
+Patch265: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.265
+Patch266: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.266
+Patch267: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.267
+Patch268: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.268
+Patch269: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.269
+Patch270: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.270
+Patch271: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.271
+Patch272: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.272
+Patch273: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.273
+Patch274: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.274
+Patch275: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.275
+Patch276: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.276
+Patch277: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.277
+Patch278: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.278
+Patch279: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.279
+Patch280: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.280
+Patch281: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.281
+Patch282: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.282
+Patch283: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.283
+Patch284: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.284
+Patch285: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.285
+Patch286: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.286
+Patch287: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.287
+Patch288: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.288
+Patch289: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.289
+Patch290: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.290
+Patch291: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.291
+Patch292: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.292
+Patch293: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.293
+Patch294: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.294
+Patch295: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.295
+Patch296: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.296
+Patch297: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.297
+Patch298: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.298
+Patch299: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.299
+Patch300: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.300
+Patch301: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301
+Patch302: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.302
+Patch303: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.303
+Patch304: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.304
+Patch305: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.305
+Patch306: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.306
+Patch307: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.307
+Patch308: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.308
+Patch309: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.309
+Patch310: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.310
+Patch311: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.311
+Patch312: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.312
+Patch313: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.313
+Patch314: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.314
+Patch315: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.315
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -221,10 +388,12 @@ Patch3003: vim-6.1-rh3.patch
 Patch3004: vim-7.0-rclocation.patch
 Patch3006: vim-6.4-checkhl.patch
 Patch3007: vim-7.2-fstabsyntax.patch
-Patch3008: vim-7.1-lib64.patch
-Patch3009: vim-7.0-warning.patch
-Patch3010: vim-7.0-syncolor.patch
-Patch3011: vim-7.0-specedit.patch
+Patch3008: vim-7.0-warning.patch
+Patch3009: vim-7.0-syncolor.patch
+Patch3010: vim-7.0-specedit.patch
+Patch3011: vim72-rh514717.patch
+Patch3012: vim-7.2-httpfiletype-499123.patch
+Patch3013: vim-7.2-elinks-parameter-518791.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel ncurses-devel gettext perl-devel
@@ -233,6 +402,9 @@ BuildRequires: libacl-devel gpm-devel au
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
 %endif
+%if "%{withruby}" == "1"
+Buildrequires: ruby-devel ruby
+%endif
 %if %{desktop_file}
 # for /usr/bin/desktop-file-install
 Requires: desktop-file-utils
@@ -495,6 +667,173 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runti
 %patch146 -p0
 %patch147 -p0
 %patch148 -p0
+%patch149 -p0 
+%patch150 -p0 
+%patch151 -p0 
+%patch152 -p0 
+%patch153 -p0 
+%patch154 -p0 
+%patch155 -p0 
+%patch156 -p0 
+%patch157 -p0 
+%patch158 -p0 
+%patch159 -p0 
+%patch160 -p0 
+%patch161 -p0 
+%patch162 -p0 
+%patch163 -p0 
+%patch164 -p0 
+%patch165 -p0 
+%patch166 -p0 
+%patch167 -p0 
+%patch168 -p0 
+%patch169 -p0 
+%patch170 -p0 
+%patch171 -p0 
+%patch172 -p0 
+%patch173 -p0 
+%patch174 -p0 
+%patch175 -p0 
+%patch176 -p0 
+%patch177 -p0 
+%patch178 -p0 
+%patch179 -p0 
+%patch180 -p0 
+%patch181 -p0 
+%patch182 -p0 
+%patch183 -p0 
+%patch184 -p0 
+%patch185 -p0 
+%patch186 -p0 
+%patch187 -p0 
+%patch188 -p0 
+%patch189 -p0 
+%patch190 -p0 
+%patch191 -p0 
+%patch192 -p0 
+%patch193 -p0 
+%patch194 -p0 
+%patch195 -p0 
+%patch196 -p0 
+%patch197 -p0 
+%patch198 -p0 
+%patch199 -p0 
+%patch200 -p0 
+%patch201 -p0 
+%patch202 -p0 
+%patch203 -p0 
+%patch204 -p0 
+%patch205 -p0 
+%patch206 -p0 
+%patch207 -p0 
+%patch208 -p0 
+%patch209 -p0 
+%patch210 -p0 
+%patch211 -p0 
+%patch212 -p0 
+%patch213 -p0 
+%patch214 -p0 
+%patch215 -p0 
+%patch216 -p0 
+%patch217 -p0 
+%patch218 -p0 
+%patch219 -p0 
+%patch220 -p0 
+%patch221 -p0 
+%patch222 -p0 
+%patch223 -p0 
+%patch224 -p0 
+%patch225 -p0 
+%patch226 -p0 
+%patch227 -p0 
+%patch228 -p0 
+%patch229 -p0 
+%patch230 -p0 
+%patch231 -p0 
+%patch232 -p0 
+%patch233 -p0 
+%patch234 -p0 
+%patch235 -p0 
+%patch236 -p0 
+%patch237 -p0 
+%patch238 -p0 
+%patch239 -p0 
+%patch240 -p0 
+%patch241 -p0 
+%patch242 -p0 
+%patch243 -p0 
+%patch244 -p0 
+%patch245 -p0 
+%patch246 -p0 
+%patch247 -p0 
+%patch248 -p0 
+%patch249 -p0 
+%patch250 -p0 
+%patch251 -p0 
+%patch252 -p0 
+%patch253 -p0 
+%patch254 -p0 
+%patch255 -p0 
+%patch256 -p0 
+%patch257 -p0 
+%patch258 -p0 
+%patch259 -p0 
+%patch260 -p0 
+%patch261 -p0 
+%patch262 -p0 
+%patch263 -p0 
+%patch264 -p0 
+%patch265 -p0 
+%patch266 -p0 
+%patch267 -p0 
+%patch268 -p0 
+%patch269 -p0 
+%patch270 -p0 
+%patch271 -p0 
+%patch272 -p0 
+%patch273 -p0 
+%patch274 -p0 
+%patch275 -p0 
+%patch276 -p0 
+%patch277 -p0 
+%patch278 -p0 
+%patch279 -p0 
+%patch280 -p0 
+%patch281 -p0 
+%patch282 -p0 
+%patch283 -p0 
+%patch284 -p0 
+%patch285 -p0                                          
+%patch286 -p0                                          
+%patch287 -p0                                          
+%patch288 -p0                                          
+%patch289 -p0                                          
+%patch290 -p0                                          
+%patch291 -p0                                          
+%patch292 -p0                                          
+%patch293 -p0                                          
+%patch294 -p0                                          
+%patch295 -p0                                          
+%patch296 -p0                                          
+%patch297 -p0                                          
+%patch298 -p0                                          
+%patch299 -p0                                          
+%patch300 -p0                                          
+%patch301 -p0                                          
+%patch302 -p0                                          
+%patch303 -p0                                          
+%patch304 -p0                                          
+%patch305 -p0                                          
+%patch306 -p0                                          
+%patch307 -p0
+%patch308 -p0
+%patch309 -p0
+%patch310 -p0
+%patch311 -p0
+%patch312 -p0
+%patch313 -p0
+%patch314 -p0
+%patch315 -p0
 
 
 # install spell files
@@ -513,6 +852,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runti
 %patch3009 -p1
 %patch3010 -p1
 %patch3011 -p1
+%patch3012 -p1
 
 cp -f %{SOURCE15} runtime/syntax/forth.vim
 cp -f %{SOURCE16} runtime/plugin/netrwPlugin.vim
@@ -523,12 +863,15 @@ cp -f %{SOURCE20} runtime/autoload/tar.v
 cp -f %{SOURCE21} runtime/autoload/netrwFileHandlers.vim
 cp -f %{SOURCE22} runtime/autoload/netrw.vim
 cp -f %{SOURCE23} runtime/autoload/netrwSettings.vim
-
+%patch3013 -p1
 
 %build
 cd src
 autoconf
 
+sed -e "s+VIMRCLOC	= \$(VIMLOC)+VIMRCLOC	= /etc+" Makefile > Makefile.tmp
+mv -f Makefile.tmp Makefile
+
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 
@@ -555,7 +898,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_S
   --disable-rubyinterp \
 %endif
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim gvim
 make clean
 
@@ -581,7 +924,7 @@ make clean
   --disable-rubyinterp \
 %endif
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim enhanced-vim
 make clean
 
@@ -600,7 +943,7 @@ perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/
   --with-compiledby="<bugzilla at redhat.com>" \
   --with-modified-by="<bugzilla at redhat.com>"
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -616,8 +959,8 @@ rm -f README*.info
 
 
 cd src
-make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
-make installgtutorbin  DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
+make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
+make installgtutorbin  DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
 mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd
 mv $RPM_BUILD_ROOT/bin/gvimtutor $RPM_BUILD_ROOT/%{_bindir}/gvimtutor
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
@@ -657,8 +1000,8 @@ install -m755 enhanced-vim $RPM_BUILD_RO
     mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
     desktop-file-install --vendor fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-        --add-category "Development;TextEditor;X-Red-Hat-Base" \
         %{SOURCE3}
+        # --add-category "Development;TextEditor;X-Red-Hat-Base" D\
   %else
     mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
     cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
@@ -702,14 +1045,14 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.sh <<EOF
 if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
   [ -x /%{_bindir}/id ] || return
-  [ \`/%{_bindir}/id -u\` -le 100 ] && return
+  [ \`/%{_bindir}/id -u\` -le 200 ] && return
   # for bash and zsh, only if no alias is already set
   alias vi >/dev/null 2>&1 || alias vi=vim
 fi
 EOF
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.csh <<EOF
 [ -x /%{_bindir}/id ] || exit
-[ \`/%{_bindir}/id -u\` -gt 100 ] && alias vi vim
+[ \`/%{_bindir}/id -u\` -gt 200 ] && alias vi vim
 EOF
 chmod 0644 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
 install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
@@ -726,6 +1069,7 @@ vi-Bram.txt	vi_help.txt	/*vi-Bram*
 vi-Moolenaar.txt	vi_help.txt	/*vi-Moolenaar*
 vi-credits.txt	vi_help.txt	/*vi-credits*
 EOF
+LANG=C sort tags > tags.tmp; mv tags.tmp tags
  )
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
 rm -f $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
@@ -954,6 +1298,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Dec 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.315-1
+- patchlevel 315
+- fix vimrc location in man page (#456992)
+- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
+- Buildrequire ruby, ruby-devel (#503872)
+- Remove check for static gravity (#510307)
+- sort tags file (#517725)
+- use one gvim to open multiple file selections from nautilus (#519265)
+- use elinks -source instead of elinks -dump (#518791)
+- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
+
+* Mon Nov 09 2009 Karsten Hopp <karsten at redhat.com> 7.2.284-1
+- patchlevel 284
+
+* Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-3
+- change range of system ids in /etc/profile.d/vim/* (#518555)
+
+* Mon Aug 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-2
+- add fix for glibc fortify segfault (#514717, Adam Tkac)
+
+* Sat Aug 01 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-1
+- add 97 upstream patches to get to patchlevel 245
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:7.2.148-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 27 2009 Karsten Hopp <karsten at redhat.com> 7.2.148-1
 - patchlevel 148, fixes #461417
 


Index: vimrc
===================================================================
RCS file: /cvs/extras/rpms/vim/F-11/vimrc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- vimrc	3 Jun 2008 14:34:32 -0000	1.20
+++ vimrc	3 Dec 2009 13:55:24 -0000	1.21
@@ -16,7 +16,7 @@ if has("autocmd")
   augroup fedora
   autocmd!
   " In text files, always limit the width of text to 78 characters
-  autocmd BufRead *.txt set tw=78
+  " autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
   \ if line("'\"") > 0 && line ("'\"") <= line("$") |



From stevetraylen at fedoraproject.org  Thu Dec  3 13:58:45 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 13:58:45 +0000 (UTC)
Subject: File torque-2.4.2.tar.gz uploaded to lookaside cache by stevetraylen
Message-ID: <20091203135845.2432E10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for torque:

cd1b0e63d9c54d49232f89c3dbd29272  torque-2.4.2.tar.gz



From jorton at fedoraproject.org  Thu Dec  3 14:04:16 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 14:04:16 +0000 (UTC)
Subject: File httpd-2.2.14.tar.gz uploaded to lookaside cache by jorton
Message-ID: <20091203140416.5C8EA10F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for httpd:

2c1e3c7ba00bcaa0163da7b3e66aaa1e  httpd-2.2.14.tar.gz



From hadess at fedoraproject.org  Thu Dec  3 14:06:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  3 Dec 2009 14:06:42 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.69, 
	1.70
Message-ID: <20091203140642.57DFE11C00EE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26678

Modified Files:
	gnome-python2-desktop.spec 
Log Message:
* Thu Dec 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
- Rebuild for new evince



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- gnome-python2-desktop.spec	21 Sep 2009 16:54:52 -0000	1.69
+++ gnome-python2-desktop.spec	3 Dec 2009 14:06:41 -0000	1.70
@@ -28,7 +28,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -323,6 +323,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Thu Dec 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
+- Rebuild for new evince
+
 * Mon Sep 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.0-1.fc12
 - Update to 2.28.0
 



From karsten at fedoraproject.org  Thu Dec  3 14:10:03 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  3 Dec 2009 14:10:03 +0000 (UTC)
Subject: rpms/vim/F-10 7.2.149, NONE, 1.1 7.2.150, NONE, 1.1 7.2.151, NONE, 
	1.1 7.2.152, NONE, 1.1 7.2.153, NONE, 1.1 7.2.154, NONE,
	1.1 7.2.155, NONE, 1.1 7.2.156, NONE, 1.1 7.2.157, NONE,
	1.1 7.2.158, NONE, 1.1 7.2.159, NONE, 1.1 7.2.160, NONE,
	1.1 7.2.161, NONE, 1.1 7.2.162, NONE, 1.1 7.2.163, NONE,
	1.1 7.2.164, NONE, 1.1 7.2.165, NONE, 1.1 7.2.166, NONE,
	1.1 7.2.167, NONE, 1.1 7.2.168, NONE, 1.1 7.2.169, NONE,
	1.1 7.2.170, NONE, 1.1 7.2.171, NONE, 1.1 7.2.172, NONE,
	1.1 7.2.173, NONE, 1.1 7.2.174, NONE, 1.1 7.2.175, NONE,
	1.1 7.2.176, NONE, 1.1 7.2.177, NONE, 1.1 7.2.178, NONE,
	1.1 7.2.179, NONE, 1.1 7.2.180, NONE, 1.1 7.2.181, NONE,
	1.1 7.2.182, NONE, 1.1 7.2.183, NONE, 1.1 7.2.184, NONE,
	1.1 7.2.185, NONE, 1.1 7.2.186, NONE, 1.1 7.2.187, NONE,
	1.1 7.2.188, NONE, 1.1 7.2.189, NONE, 1.1 7.2.190, NONE,
	1.1 7.2.191, NONE, 1.1 7.2.192, NONE, 1.1 7.2.193, NONE,
	1.1 7.2.194, NONE, 1.1 7.2.195, NONE, 1.1 7.2.196, NONE,
	1.1 7.2.197, NONE, 1.1 7.2.198, NONE, 1.1 7.2.199, NONE,
	1.1 7.2.200, NONE, 1.1 7.2.201, NONE, 1.1 7.2.202, NONE,
	1.1 7.2.203, NONE, 1.1 7.2.204, NONE, 1.1 7.2.205, NONE,
	1.1 7.2.206, NONE, 1.1 7.2.207, NONE, 1.1 7.2.208, NONE,
	1.1 7.2.209, NONE, 1.1 7.2.210, NONE, 1.1 7.2.211, NONE,
	1.1 7.2.212, NONE, 1.1 7.2.213, NONE, 1.1 7.2.214, NONE,
	1.1 7.2.215, NONE, 1.1 7.2.216, NONE, 1.1 7.2.217, NONE,
	1.1 7.2.218, NONE, 1.1 7.2.219, NONE, 1.1 7.2.220, NONE,
	1.1 7.2.221, NONE, 1.1 7.2.222, NONE, 1.1 7.2.223, NONE,
	1.1 7.2.224, NONE, 1.1 7.2.225, NONE, 1.1 7.2.226, NONE,
	1.1 7.2.227, NONE, 1.1 7.2.228, NONE, 1.1 7.2.229, NONE,
	1.1 7.2.230, NONE, 1.1 7.2.231, NONE, 1.1 7.2.232, NONE,
	1.1 7.2.233, NONE, 1.1 7.2.234, NONE, 1.1 7.2.235, NONE,
	1.1 7.2.236, NONE, 1.1 7.2.237, NONE, 1.1 7.2.238, NONE,
	1.1 7.2.239, NONE, 1.1 7.2.240, NONE, 1.1 7.2.241, NONE,
	1.1 7.2.242, NONE, 1.1 7.2.243, NONE, 1.1 7.2.244, NONE,
	1.1 7.2.245, NONE, 1.1 7.2.246, NONE, 1.1 7.2.247, NONE,
	1.1 7.2.248, NONE, 1.1 7.2.249, NONE, 1.1 7.2.250, NONE,
	1.1 7.2.251, NONE, 1.1 7.2.252, NONE, 1.1 7.2.253, NONE,
	1.1 7.2.254, NONE, 1.1 7.2.255, NONE, 1.1 7.2.256, NONE,
	1.1 7.2.257, NONE, 1.1 7.2.258, NONE, 1.1 7.2.259, NONE,
	1.1 7.2.260, NONE, 1.1 7.2.261, NONE, 1.1 7.2.262, NONE,
	1.1 7.2.263, NONE, 1.1 7.2.264, NONE, 1.1 7.2.265, NONE,
	1.1 7.2.266, NONE, 1.1 7.2.267, NONE, 1.1 7.2.268, NONE,
	1.1 7.2.269, NONE, 1.1 7.2.270, NONE, 1.1 7.2.271, NONE,
	1.1 7.2.272, NONE, 1.1 7.2.273, NONE, 1.1 7.2.274, NONE,
	1.1 7.2.275, NONE, 1.1 7.2.276, NONE, 1.1 7.2.277, NONE,
	1.1 7.2.278, NONE, 1.1 7.2.279, NONE, 1.1 7.2.280, NONE,
	1.1 7.2.281, NONE, 1.1 7.2.282, NONE, 1.1 7.2.283, NONE,
	1.1 7.2.284, NONE, 1.1 7.2.285, NONE, 1.1 7.2.286, NONE,
	1.1 7.2.287, NONE, 1.1 7.2.288, NONE, 1.1 7.2.289, NONE,
	1.1 7.2.290, NONE, 1.1 7.2.291, NONE, 1.1 7.2.292, NONE,
	1.1 7.2.293, NONE, 1.1 7.2.294, NONE, 1.1 7.2.295, NONE,
	1.1 7.2.296, NONE, 1.1 7.2.297, NONE, 1.1 7.2.298, NONE,
	1.1 7.2.299, NONE, 1.1 7.2.300, NONE, 1.1 7.2.301, NONE,
	1.1 7.2.302, NONE, 1.1 7.2.303, NONE, 1.1 7.2.304, NONE,
	1.1 7.2.305, NONE, 1.1 7.2.306, NONE, 1.1 7.2.307, NONE,
	1.1 7.2.308, NONE, 1.1 7.2.309, NONE, 1.1 7.2.310, NONE,
	1.1 7.2.311, NONE, 1.1 7.2.312, NONE, 1.1 7.2.313, NONE,
	1.1 7.2.314, NONE, 1.1 7.2.315, NONE,
	1.1 vim-7.2-elinks-parameter-518791.patch, NONE,
	1.1 vim-7.2-httpfiletype-499123.patch, NONE,
	1.1 vim72-rh514717.patch, NONE, 1.1 gvim.desktop, 1.7,
	1.8 vim-7.2-fstabsyntax.patch, 1.1, 1.2 vim.spec, 1.228,
	1.229 vimrc, 1.20, 1.21
Message-ID: <20091203141003.0637D11C0494@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	gvim.desktop vim-7.2-fstabsyntax.patch vim.spec vimrc 
Added Files:
	7.2.149 7.2.150 7.2.151 7.2.152 7.2.153 7.2.154 7.2.155 
	7.2.156 7.2.157 7.2.158 7.2.159 7.2.160 7.2.161 7.2.162 
	7.2.163 7.2.164 7.2.165 7.2.166 7.2.167 7.2.168 7.2.169 
	7.2.170 7.2.171 7.2.172 7.2.173 7.2.174 7.2.175 7.2.176 
	7.2.177 7.2.178 7.2.179 7.2.180 7.2.181 7.2.182 7.2.183 
	7.2.184 7.2.185 7.2.186 7.2.187 7.2.188 7.2.189 7.2.190 
	7.2.191 7.2.192 7.2.193 7.2.194 7.2.195 7.2.196 7.2.197 
	7.2.198 7.2.199 7.2.200 7.2.201 7.2.202 7.2.203 7.2.204 
	7.2.205 7.2.206 7.2.207 7.2.208 7.2.209 7.2.210 7.2.211 
	7.2.212 7.2.213 7.2.214 7.2.215 7.2.216 7.2.217 7.2.218 
	7.2.219 7.2.220 7.2.221 7.2.222 7.2.223 7.2.224 7.2.225 
	7.2.226 7.2.227 7.2.228 7.2.229 7.2.230 7.2.231 7.2.232 
	7.2.233 7.2.234 7.2.235 7.2.236 7.2.237 7.2.238 7.2.239 
	7.2.240 7.2.241 7.2.242 7.2.243 7.2.244 7.2.245 7.2.246 
	7.2.247 7.2.248 7.2.249 7.2.250 7.2.251 7.2.252 7.2.253 
	7.2.254 7.2.255 7.2.256 7.2.257 7.2.258 7.2.259 7.2.260 
	7.2.261 7.2.262 7.2.263 7.2.264 7.2.265 7.2.266 7.2.267 
	7.2.268 7.2.269 7.2.270 7.2.271 7.2.272 7.2.273 7.2.274 
	7.2.275 7.2.276 7.2.277 7.2.278 7.2.279 7.2.280 7.2.281 
	7.2.282 7.2.283 7.2.284 7.2.285 7.2.286 7.2.287 7.2.288 
	7.2.289 7.2.290 7.2.291 7.2.292 7.2.293 7.2.294 7.2.295 
	7.2.296 7.2.297 7.2.298 7.2.299 7.2.300 7.2.301 7.2.302 
	7.2.303 7.2.304 7.2.305 7.2.306 7.2.307 7.2.308 7.2.309 
	7.2.310 7.2.311 7.2.312 7.2.313 7.2.314 7.2.315 
	vim-7.2-elinks-parameter-518791.patch 
	vim-7.2-httpfiletype-499123.patch vim72-rh514717.patch 
Log Message:
- patchlevel 315
- fix vimrc location in man page (#456992)
- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
- Buildrequire ruby, ruby-devel (#503872)
- Remove check for static gravity (#510307)
- sort tags file (#517725)
- use one gvim to open multiple file selections from nautilus (#519265)
- use elinks -source instead of elinks -dump (#518791)
- add ext4 keyword to /etc/fstab syntax highlighting (#498290)




--- NEW FILE 7.2.149 ---
To: vim-dev at vim.org
Subject: Patch 7.2.149
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.2.149
Problem:    Using return value of function that doesn't return a value results
	    in reading uninitialized memory.
Solution:   Set the default to return zero.  Make cursor() return -1 on
	    failure.  Let complete() return an empty string in case of an
	    error.  (partly by Dominique Pelle)
Files:	    runtime/doc/eval.txt, src/eval.c


*** ../vim-7.2.148/runtime/doc/eval.txt	Tue Dec  9 10:56:50 2008
--- runtime/doc/eval.txt	Sun Mar 22 14:28:49 2009
***************
*** 2414,2419 ****
--- 2419,2425 ----
  		When 'virtualedit' is used {off} specifies the offset in
  		screen columns from the start of the character.  E.g., a
  		position within a <Tab> or after the last character.
+ 		Returns 0 when the position could be set, -1 otherwise.
  
  
  deepcopy({expr}[, {noref}])				*deepcopy()* *E698*
***************
*** 4516,4521 ****
--- 4526,4532 ----
  		should also work to move files across file systems.  The
  		result is a Number, which is 0 if the file was renamed
  		successfully, and non-zero when the renaming failed.
+ 		NOTE: If {to} exists it is overwritten without warning.
  		This function is not available in the |sandbox|.
  
  repeat({expr}, {count})					*repeat()*
*** ../vim-7.2.148/src/eval.c	Wed Feb  4 16:25:53 2009
--- src/eval.c	Sun Mar 22 20:45:18 2009
***************
*** 1285,1291 ****
--- 1285,1293 ----
      typval_T	tv;
      char_u	*retval;
      garray_T	ga;
+ #ifdef FEAT_FLOAT
      char_u	numbuf[NUMBUFLEN];
+ #endif
  
      if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
  	retval = NULL;
***************
*** 8018,8024 ****
      /* execute the function if no errors detected and executing */
      if (evaluate && error == ERROR_NONE)
      {
! 	rettv->v_type = VAR_NUMBER;	/* default is number rettv */
  	error = ERROR_UNKNOWN;
  
  	if (!builtin_function(fname))
--- 8020,8027 ----
      /* execute the function if no errors detected and executing */
      if (evaluate && error == ERROR_NONE)
      {
! 	rettv->v_type = VAR_NUMBER;	/* default rettv is number zero */
! 	rettv->vval.v_number = 0;
  	error = ERROR_UNKNOWN;
  
  	if (!builtin_function(fname))
***************
*** 8268,8274 ****
  		return;
  	    li = l->lv_first;
  	}
- 	rettv->vval.v_number = 0;	/* Default: Success */
  	for (;;)
  	{
  	    if (l == NULL)
--- 8271,8276 ----
***************
*** 8728,8734 ****
      int		dummy;
      dict_T	*selfdict = NULL;
  
-     rettv->vval.v_number = 0;
      if (argvars[1].v_type != VAR_LIST)
      {
  	EMSG(_(e_listreq));
--- 8730,8735 ----
***************
*** 9036,9048 ****
      if (buttons == NULL || *buttons == NUL)
  	buttons = (char_u *)_("&Ok");
  
!     if (error)
! 	rettv->vval.v_number = 0;
!     else
  	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
  								   def, NULL);
- #else
-     rettv->vval.v_number = 0;
  #endif
  }
  
--- 9037,9045 ----
      if (buttons == NULL || *buttons == NUL)
  	buttons = (char_u *)_("&Ok");
  
!     if (!error)
  	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
  								   def, NULL);
  #endif
  }
  
***************
*** 9181,9195 ****
      }
  
      rettv->vval.v_number = cs_connection(num, dbpath, prepend);
- #else
-     rettv->vval.v_number = 0;
  #endif
  }
  
  /*
   * "cursor(lnum, col)" function
   *
!  * Moves the cursor to the specified line and column
   */
  /*ARGSUSED*/
      static void
--- 9178,9191 ----
      }
  
      rettv->vval.v_number = cs_connection(num, dbpath, prepend);
  #endif
  }
  
  /*
   * "cursor(lnum, col)" function
   *
!  * Moves the cursor to the specified line and column.
!  * Returns 0 when the position could be set, -1 otherwise.
   */
  /*ARGSUSED*/
      static void
***************
*** 9202,9207 ****
--- 9198,9204 ----
      long	coladd = 0;
  #endif
  
+     rettv->vval.v_number = -1;
      if (argvars[1].v_type == VAR_UNKNOWN)
      {
  	pos_T	    pos;
***************
*** 9246,9251 ****
--- 9243,9249 ----
  #endif
  
      curwin->w_set_curswant = TRUE;
+     rettv->vval.v_number = 0;
  }
  
  /*
***************
*** 9291,9298 ****
  {
  #ifdef FEAT_AUTOCMD
      rettv->vval.v_number = did_filetype;
- #else
-     rettv->vval.v_number = 0;
  #endif
  }
  
--- 9289,9294 ----
***************
*** 9605,9611 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
      {
  	list_T		*l1, *l2;
--- 9601,9606 ----
***************
*** 9733,9739 ****
      if (check_secure())
  	return;
  
-     rettv->vval.v_number = 0;
      keys = get_tv_string(&argvars[0]);
      if (*keys != NUL)
      {
--- 9728,9733 ----
***************
*** 9901,9907 ****
      char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
      int		save_did_emsg;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type == VAR_LIST)
      {
  	if ((l = argvars[0].vval.v_list) == NULL
--- 9895,9900 ----
***************
*** 10084,10091 ****
  	else
  	    rettv->vval.v_number = (varnumber_T)f;
      }
-     else
- 	rettv->vval.v_number = 0;
  }
  
  /*
--- 10077,10082 ----
***************
*** 10219,10227 ****
      lnum = get_tv_lnum(argvars);
      if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count)
  	rettv->vval.v_number = foldLevel(lnum);
-     else
  #endif
- 	rettv->vval.v_number = 0;
  }
  
  /*
--- 10210,10216 ----
***************
*** 10337,10343 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
  #ifdef FEAT_GUI
      if (gui.in_use)
  	gui_mch_set_foreground();
--- 10326,10331 ----
***************
*** 10359,10365 ****
  {
      char_u	*s;
  
-     rettv->vval.v_number = 0;
      s = get_tv_string(&argvars[0]);
      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
  	EMSG2(_(e_invarg2), s);
--- 10347,10352 ----
***************
*** 10429,10437 ****
  
      if (tv == NULL)
      {
! 	if (argvars[2].v_type == VAR_UNKNOWN)
! 	    rettv->vval.v_number = 0;
! 	else
  	    copy_tv(&argvars[2], rettv);
      }
      else
--- 10416,10422 ----
  
      if (tv == NULL)
      {
! 	if (argvars[2].v_type != VAR_UNKNOWN)
  	    copy_tv(&argvars[2], rettv);
      }
      else
***************
*** 10456,10468 ****
  {
      char_u	*p;
  
!     if (retlist)
!     {
! 	if (rettv_list_alloc(rettv) == FAIL)
! 	    return;
!     }
!     else
! 	rettv->vval.v_number = 0;
  
      if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
  	return;
--- 10441,10448 ----
  {
      char_u	*p;
  
!     if (retlist && rettv_list_alloc(rettv) == FAIL)
! 	return;
  
      if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
  	return;
***************
*** 11009,11016 ****
      dict_T	*dict;
      matchitem_T	*cur = curwin->w_match_head;
  
-     rettv->vval.v_number = 0;
- 
      if (rettv_list_alloc(rettv) == OK)
      {
  	while (cur != NULL)
--- 10989,10994 ----
***************
*** 11089,11095 ****
      win_T	*wp;
  #endif
  
-     rettv->vval.v_number = 0;
  #ifdef FEAT_QUICKFIX
      if (rettv_list_alloc(rettv) == OK)
      {
--- 11067,11072 ----
***************
*** 11935,11941 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_DICT)
      {
  	EMSG(_(e_dictreq));
--- 11912,11917 ----
***************
*** 12052,12059 ****
  	n = del_history_entry(get_histtype(str),
  				      get_tv_string_buf(&argvars[1], buf));
      rettv->vval.v_number = n;
- #else
-     rettv->vval.v_number = 0;
  #endif
  }
  
--- 12028,12033 ----
***************
*** 12415,12421 ****
      int		selected;
      int		mouse_used;
  
-     rettv->vval.v_number = 0;
  #ifdef NO_CONSOLE_INPUT
      /* While starting up, there is no place to enter text. */
      if (no_console_input())
--- 12389,12394 ----
***************
*** 12464,12470 ****
  	--ga_userinput.ga_len;
  	restore_typeahead((tasave_T *)(ga_userinput.ga_data)
  						       + ga_userinput.ga_len);
! 	rettv->vval.v_number = 0; /* OK */
      }
      else if (p_verbose > 1)
      {
--- 12437,12443 ----
  	--ga_userinput.ga_len;
  	restore_typeahead((tasave_T *)(ga_userinput.ga_data)
  						       + ga_userinput.ga_len);
! 	/* default return is zero == OK */
      }
      else if (p_verbose > 1)
      {
***************
*** 12488,12494 ****
  	save_typeahead((tasave_T *)(ga_userinput.ga_data)
  						       + ga_userinput.ga_len);
  	++ga_userinput.ga_len;
! 	rettv->vval.v_number = 0; /* OK */
      }
      else
  	rettv->vval.v_number = 1; /* Failed */
--- 12461,12467 ----
  	save_typeahead((tasave_T *)(ga_userinput.ga_data)
  						       + ga_userinput.ga_len);
  	++ga_userinput.ga_len;
! 	/* default return is zero == OK */
      }
      else
  	rettv->vval.v_number = 1; /* Failed */
***************
*** 12522,12528 ****
      list_T	*l;
      int		error = FALSE;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listarg), "insert()");
      else if ((l = argvars[0].vval.v_list) != NULL
--- 12495,12500 ----
***************
*** 12641,12647 ****
      dict_T	*d;
      int		todo;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_DICT)
      {
  	EMSG(_(e_dictreq));
--- 12613,12618 ----
***************
*** 12729,12735 ****
      garray_T	ga;
      char_u	*sep;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_LIST)
      {
  	EMSG(_(e_listreq));
--- 12700,12705 ----
***************
*** 12827,12835 ****
  #endif
  
      rettv->v_type = type;
!     if (type == VAR_NUMBER)
! 	rettv->vval.v_number = 0;
!     else
  	rettv->vval.v_string = NULL;
  
      if (check_restricted() || check_secure())
--- 12797,12803 ----
  #endif
  
      rettv->v_type = type;
!     if (type != VAR_NUMBER)
  	rettv->vval.v_string = NULL;
  
      if (check_restricted() || check_secure())
***************
*** 13770,13776 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
  #ifdef FEAT_INS_EXPAND
      if (pum_visible())
  	rettv->vval.v_number = 1;
--- 13738,13743 ----
***************
*** 13804,13810 ****
  	    stride = get_tv_number_chk(&argvars[2], &error);
      }
  
-     rettv->vval.v_number = 0;
      if (error)
  	return;		/* type error; errmsg already given */
      if (stride == 0)
--- 13771,13776 ----
***************
*** 14193,14199 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
-     rettv->vval.v_number = 0;
  #ifdef FEAT_CLIENTSERVER
  # ifdef WIN32
      /* On Win32 it's done in this application. */
--- 14159,14164 ----
***************
*** 14249,14255 ****
  	rettv->vval.v_number = (s != NULL);
      }
  # else
-     rettv->vval.v_number = 0;
      if (check_connection() == FAIL)
  	return;
  
--- 14214,14219 ----
***************
*** 14338,14344 ****
      dict_T	*d;
      dictitem_T	*di;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type == VAR_DICT)
      {
  	if (argvars[2].v_type != VAR_UNKNOWN)
--- 14302,14307 ----
***************
*** 14696,14702 ****
      list_T	*l;
      listitem_T	*li, *ni;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listarg), "reverse()");
      else if ((l = argvars[0].vval.v_list) != NULL
--- 14659,14664 ----
***************
*** 15048,15055 ****
      int		lnum = 0;
      int		col = 0;
  
-     rettv->vval.v_number = 0;
- 
      if (rettv_list_alloc(rettv) == FAIL)
  	return;
  
--- 15010,15015 ----
***************
*** 15236,15243 ****
      int		n;
      int		flags = 0;
  
-     rettv->vval.v_number = 0;
- 
      if (rettv_list_alloc(rettv) == FAIL)
  	return;
  
--- 15196,15201 ----
***************
*** 15323,15330 ****
      typval_T	*varp;
      char_u	nbuf[NUMBUFLEN];
  
-     rettv->vval.v_number = 0;
- 
      if (check_restricted() || check_secure())
  	return;
      (void)get_tv_number(&argvars[0]);	    /* issue errmsg if type error */
--- 15281,15286 ----
***************
*** 15404,15410 ****
      else
  	line = get_tv_string_chk(&argvars[1]);
  
!     rettv->vval.v_number = 0;		/* OK */
      for (;;)
      {
  	if (l != NULL)
--- 15360,15366 ----
      else
  	line = get_tv_string_chk(&argvars[1]);
  
!     /* default result is zero == OK */
      for (;;)
      {
  	if (l != NULL)
***************
*** 15717,15722 ****
--- 15673,15679 ----
  /*
   * "setwinvar()" and "settabwinvar()" functions
   */
+ /*ARGSUSED*/
      static void
  setwinvar(argvars, rettv, off)
      typval_T	*argvars;
***************
*** 15733,15740 ****
      char_u	nbuf[NUMBUFLEN];
      tabpage_T	*tp;
  
-     rettv->vval.v_number = 0;
- 
      if (check_restricted() || check_secure())
  	return;
  
--- 15690,15695 ----
***************
*** 15947,15953 ****
      long	len;
      long	i;
  
-     rettv->vval.v_number = 0;
      if (argvars[0].v_type != VAR_LIST)
  	EMSG2(_(e_listarg), "sort()");
      else
--- 15902,15907 ----
***************
*** 16870,16878 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
! #ifndef FEAT_WINDOWS
!     rettv->vval.v_number = 0;
! #else
      tabpage_T	*tp;
      win_T	*wp = NULL;
  
--- 16824,16830 ----
      typval_T	*argvars;
      typval_T	*rettv;
  {
! #ifdef FEAT_WINDOWS
      tabpage_T	*tp;
      win_T	*wp = NULL;
  
***************
*** 16884,16902 ****
  	if (tp != NULL)
  	    wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
      }
!     if (wp == NULL)
! 	rettv->vval.v_number = 0;
!     else
      {
! 	if (rettv_list_alloc(rettv) == FAIL)
! 	    rettv->vval.v_number = 0;
! 	else
! 	{
! 	    for (; wp != NULL; wp = wp->w_next)
! 		if (list_append_number(rettv->vval.v_list,
  						wp->w_buffer->b_fnum) == FAIL)
! 		    break;
! 	}
      }
  #endif
  }
--- 16836,16847 ----
  	if (tp != NULL)
  	    wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
      }
!     if (wp != NULL && rettv_list_alloc(rettv) != FAIL)
      {
! 	for (; wp != NULL; wp = wp->w_next)
! 	    if (list_append_number(rettv->vval.v_list,
  						wp->w_buffer->b_fnum) == FAIL)
! 		break;
      }
  #endif
  }
***************
*** 17024,17033 ****
      int		first;
  
      if (rettv_list_alloc(rettv) == FAIL)
-     {
- 	rettv->vval.v_number = 0;
  	return;
-     }
  
      for (first = TRUE; ; first = FALSE)
  	if (get_tagfname(&tn, first, fname) == FAIL
--- 16969,16975 ----
***************
*** 17401,17408 ****
      /* A non-zero number or non-empty string argument: reset mode. */
      if (non_zero_arg(&argvars[0]))
  	curbuf->b_visual_mode_eval = NUL;
- #else
-     rettv->vval.v_number = 0; /* return anything, it won't work anyway */
  #endif
  }
  
--- 17343,17348 ----
*** ../vim-7.2.148/src/version.c	Wed Mar 18 19:07:09 2009
--- src/version.c	Wed Apr 22 12:44:05 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     149,
  /**/


-- 
WOMAN:   Well, 'ow did you become king then?
ARTHUR:  The Lady of the Lake, [angels sing] her arm clad in the purest
         shimmering samite, held aloft Excalibur from the bosom of the water
         signifying by Divine Providence that I, Arthur, was to carry
         Excalibur.  [singing stops] That is why I am your king!
                                  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    ///


--- NEW FILE 7.2.150 ---
To: vim-dev at vim.org
Subject: Patch 7.2.150 (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
------------

Note: I haven't tested this myself, since I don't have a compiler that
works for this code.

Patch 7.2.150 (extra)
Problem:    Can't use tab pages from VisVim.
Solution:   Add tab page support to VisVim. (Adam Slater)
Files:	    src/VisVim/Commands.cpp, src/VisVim/Resource.h,
	    src/VisVim/VisVim.rc


*** ../vim-7.2.149/src/VisVim/Commands.cpp	Thu May 10 20:45:34 2007
--- src/VisVim/Commands.cpp	Mon Mar  2 00:52:15 2009
***************
*** 20,39 ****
  
  static BOOL g_bEnableVim = TRUE;	// Vim enabled
  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously
  static int g_ChangeDir = CD_NONE;	// CD after file open?
  
! static void VimSetEnableState (BOOL bEnableState);
! static BOOL VimOpenFile (BSTR& FileName, long LineNr);
! static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method);
! static void VimErrDiag (COleAutomationControl& VimOle);
! static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);
! static void DebugMsg (char* Msg, char* Arg = NULL);
  
  
  /////////////////////////////////////////////////////////////////////////////
  // CCommands
  
! CCommands::CCommands ()
  {
  	// m_pApplication == NULL; M$ Code generation bug!!!
  	m_pApplication = NULL;
--- 20,40 ----
  
  static BOOL g_bEnableVim = TRUE;	// Vim enabled
  static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously
+ static BOOL g_bNewTabs = FALSE;
  static int g_ChangeDir = CD_NONE;	// CD after file open?
  
! static void VimSetEnableState(BOOL bEnableState);
! static BOOL VimOpenFile(BSTR& FileName, long LineNr);
! static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method);
! static void VimErrDiag(COleAutomationControl& VimOle);
! static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);
! static void DebugMsg(char* Msg, char* Arg = NULL);
  
  
  /////////////////////////////////////////////////////////////////////////////
  // CCommands
  
! CCommands::CCommands()
  {
  	// m_pApplication == NULL; M$ Code generation bug!!!
  	m_pApplication = NULL;
***************
*** 41,57 ****
  	m_pDebuggerEventsObj = NULL;
  }
  
! CCommands::~CCommands ()
  {
! 	ASSERT (m_pApplication != NULL);
  	if (m_pApplication)
  	{
! 		m_pApplication->Release ();
  		m_pApplication = NULL;
  	}
  }
  
! void CCommands::SetApplicationObject (IApplication * pApplication)
  {
  	// This function assumes pApplication has already been AddRef'd
  	// for us, which CDSAddIn did in it's QueryInterface call
--- 42,58 ----
  	m_pDebuggerEventsObj = NULL;
  }
  
! CCommands::~CCommands()
  {
! 	ASSERT(m_pApplication != NULL);
  	if (m_pApplication)
  	{
! 		m_pApplication->Release();
  		m_pApplication = NULL;
  	}
  }
  
! void CCommands::SetApplicationObject(IApplication * pApplication)
  {
  	// This function assumes pApplication has already been AddRef'd
  	// for us, which CDSAddIn did in it's QueryInterface call
***************
*** 61,115 ****
  		return;
  
  	// Create Application event handlers
! 	XApplicationEventsObj::CreateInstance (&m_pApplicationEventsObj);
  	if (! m_pApplicationEventsObj)
  	{
! 		ReportInternalError ("XApplicationEventsObj::CreateInstance");
  		return;
  	}
! 	m_pApplicationEventsObj->AddRef ();
! 	m_pApplicationEventsObj->Connect (m_pApplication);
  	m_pApplicationEventsObj->m_pCommands = this;
  
  #ifdef NEVER
  	// Create Debugger event handler
  	CComPtr < IDispatch > pDebugger;
! 	if (SUCCEEDED (m_pApplication->get_Debugger (&pDebugger))
  	    && pDebugger != NULL)
  	{
! 		XDebuggerEventsObj::CreateInstance (&m_pDebuggerEventsObj);
! 		m_pDebuggerEventsObj->AddRef ();
! 		m_pDebuggerEventsObj->Connect (pDebugger);
  		m_pDebuggerEventsObj->m_pCommands = this;
  	}
  #endif
  
  	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim
! 	HKEY hAppKey = GetAppKey ("Vim");
  	if (hAppKey)
  	{
! 		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
  		if (hSectionKey)
  		{
! 			g_bEnableVim = GetRegistryInt (hSectionKey, "EnableVim",
  						       g_bEnableVim);
! 			g_bDevStudioEditor = GetRegistryInt(hSectionKey,"DevStudioEditor",
! 							    g_bDevStudioEditor);
! 			g_ChangeDir = GetRegistryInt (hSectionKey, "ChangeDir",
  						      g_ChangeDir);
! 			RegCloseKey (hSectionKey);
  		}
! 		RegCloseKey (hAppKey);
  	}
  }
  
! void CCommands::UnadviseFromEvents ()
  {
! 	ASSERT (m_pApplicationEventsObj != NULL);
  	if (m_pApplicationEventsObj)
  	{
! 		m_pApplicationEventsObj->Disconnect (m_pApplication);
! 		m_pApplicationEventsObj->Release ();
  		m_pApplicationEventsObj = NULL;
  	}
  
--- 62,118 ----
  		return;
  
  	// Create Application event handlers
! 	XApplicationEventsObj::CreateInstance(&m_pApplicationEventsObj);
  	if (! m_pApplicationEventsObj)
  	{
! 		ReportInternalError("XApplicationEventsObj::CreateInstance");
  		return;
  	}
! 	m_pApplicationEventsObj->AddRef();
! 	m_pApplicationEventsObj->Connect(m_pApplication);
  	m_pApplicationEventsObj->m_pCommands = this;
  
  #ifdef NEVER
  	// Create Debugger event handler
  	CComPtr < IDispatch > pDebugger;
! 	if (SUCCEEDED(m_pApplication->get_Debugger(&pDebugger))
  	    && pDebugger != NULL)
  	{
! 		XDebuggerEventsObj::CreateInstance(&m_pDebuggerEventsObj);
! 		m_pDebuggerEventsObj->AddRef();
! 		m_pDebuggerEventsObj->Connect(pDebugger);
  		m_pDebuggerEventsObj->m_pCommands = this;
  	}
  #endif
  
  	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim
! 	HKEY hAppKey = GetAppKey("Vim");
  	if (hAppKey)
  	{
! 		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
  		if (hSectionKey)
  		{
! 			g_bEnableVim = GetRegistryInt(hSectionKey, "EnableVim",
  						       g_bEnableVim);
! 			g_bDevStudioEditor = GetRegistryInt(hSectionKey,
! 					"DevStudioEditor", g_bDevStudioEditor);
! 			g_bNewTabs = GetRegistryInt(hSectionKey, "NewTabs",
! 						    g_bNewTabs);
! 			g_ChangeDir = GetRegistryInt(hSectionKey, "ChangeDir",
  						      g_ChangeDir);
! 			RegCloseKey(hSectionKey);
  		}
! 		RegCloseKey(hAppKey);
  	}
  }
  
! void CCommands::UnadviseFromEvents()
  {
! 	ASSERT(m_pApplicationEventsObj != NULL);
  	if (m_pApplicationEventsObj)
  	{
! 		m_pApplicationEventsObj->Disconnect(m_pApplication);
! 		m_pApplicationEventsObj->Release();
  		m_pApplicationEventsObj = NULL;
  	}
  
***************
*** 121,130 ****
  		// unadvise from its events (thus the VERIFY_OK below--see
  		// stdafx.h).
  		CComPtr < IDispatch > pDebugger;
! 		VERIFY_OK (m_pApplication->get_Debugger (&pDebugger));
! 		ASSERT (pDebugger != NULL);
! 		m_pDebuggerEventsObj->Disconnect (pDebugger);
! 		m_pDebuggerEventsObj->Release ();
  		m_pDebuggerEventsObj = NULL;
  	}
  #endif
--- 124,133 ----
  		// unadvise from its events (thus the VERIFY_OK below--see
  		// stdafx.h).
  		CComPtr < IDispatch > pDebugger;
! 		VERIFY_OK(m_pApplication->get_Debugger(&pDebugger));
! 		ASSERT(pDebugger != NULL);
! 		m_pDebuggerEventsObj->Disconnect(pDebugger);
! 		m_pDebuggerEventsObj->Release();
  		m_pDebuggerEventsObj = NULL;
  	}
  #endif
***************
*** 136,156 ****
  
  // Application events
  
! HRESULT CCommands::XApplicationEvents::BeforeBuildStart ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BuildFinish (long nNumErrors, long nNumWarnings)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
--- 139,159 ----
  
  // Application events
  
! HRESULT CCommands::XApplicationEvents::BeforeBuildStart()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BuildFinish(long nNumErrors, long nNumWarnings)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
***************
*** 158,166 ****
  // is done.
  // Vim gets called from here.
  //
! HRESULT CCommands::XApplicationEvents::DocumentOpen (IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  
  	if (! g_bEnableVim)
  		// Vim not enabled or empty command line entered
--- 161,169 ----
  // is done.
  // Vim gets called from here.
  //
! HRESULT CCommands::XApplicationEvents::DocumentOpen(IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  
  	if (! g_bEnableVim)
  		// Vim not enabled or empty command line entered
***************
*** 169,175 ****
  	// First get the current file name and line number
  
  	// Get the document object
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);
  	if (! pDoc)
  		return S_OK;
  
--- 172,178 ----
  	// First get the current file name and line number
  
  	// Get the document object
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);
  	if (! pDoc)
  		return S_OK;
  
***************
*** 177,202 ****
  	long LineNr = -1;
  
  	// Get the document name
! 	if (FAILED (pDoc->get_FullName (&FileName)))
  		return S_OK;
  
  	LPDISPATCH pDispSel;
  
  	// Get a selection object dispatch pointer
! 	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))
  	{
  		// Get the selection object
! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);
  
  		if (pSel)
  			// Get the selection line number
! 			pSel->get_CurrentLine (&LineNr);
  
! 		pDispSel->Release ();
  	}
  
  	// Open the file in Vim and position to the current line
! 	if (VimOpenFile (FileName, LineNr))
  	{
  		if (! g_bDevStudioEditor)
  		{
--- 180,205 ----
  	long LineNr = -1;
  
  	// Get the document name
! 	if (FAILED(pDoc->get_FullName(&FileName)))
  		return S_OK;
  
  	LPDISPATCH pDispSel;
  
  	// Get a selection object dispatch pointer
! 	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))
  	{
  		// Get the selection object
! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);
  
  		if (pSel)
  			// Get the selection line number
! 			pSel->get_CurrentLine(&LineNr);
  
! 		pDispSel->Release();
  	}
  
  	// Open the file in Vim and position to the current line
! 	if (VimOpenFile(FileName, LineNr))
  	{
  		if (! g_bDevStudioEditor)
  		{
***************
*** 204,233 ****
  			CComVariant vSaveChanges = dsSaveChangesPrompt;
  			DsSaveStatus Saved;
  
! 			pDoc->Close (vSaveChanges, &Saved);
  		}
  	}
  
  	// We're done here
! 	SysFreeString (FileName);
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BeforeDocumentClose (IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::DocumentSave (IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::NewDocument (IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  
  	if (! g_bEnableVim)
  		// Vim not enabled or empty command line entered
--- 207,236 ----
  			CComVariant vSaveChanges = dsSaveChangesPrompt;
  			DsSaveStatus Saved;
  
! 			pDoc->Close(vSaveChanges, &Saved);
  		}
  	}
  
  	// We're done here
! 	SysFreeString(FileName);
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::BeforeDocumentClose(IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::DocumentSave(IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::NewDocument(IDispatch * theDocument)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  
  	if (! g_bEnableVim)
  		// Vim not enabled or empty command line entered
***************
*** 235,253 ****
  
  	// First get the current file name and line number
  
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);
  	if (! pDoc)
  		return S_OK;
  
  	BSTR FileName;
  	HRESULT hr;
  
! 	hr = pDoc->get_FullName (&FileName);
! 	if (FAILED (hr))
  		return S_OK;
  
  	// Open the file in Vim and position to the current line
! 	if (VimOpenFile (FileName, 0))
  	{
  		if (! g_bDevStudioEditor)
  		{
--- 238,256 ----
  
  	// First get the current file name and line number
  
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);
  	if (! pDoc)
  		return S_OK;
  
  	BSTR FileName;
  	HRESULT hr;
  
! 	hr = pDoc->get_FullName(&FileName);
! 	if (FAILED(hr))
  		return S_OK;
  
  	// Open the file in Vim and position to the current line
! 	if (VimOpenFile(FileName, 0))
  	{
  		if (! g_bDevStudioEditor)
  		{
***************
*** 255,303 ****
  			CComVariant vSaveChanges = dsSaveChangesPrompt;
  			DsSaveStatus Saved;
  
! 			pDoc->Close (vSaveChanges, &Saved);
  		}
  	}
  
! 	SysFreeString (FileName);
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WindowActivate (IDispatch * theWindow)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WindowDeactivate (IDispatch * theWindow)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WorkspaceOpen ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WorkspaceClose ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::NewWorkspace ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
  // Debugger event
  
! HRESULT CCommands::XDebuggerEvents::BreakpointHit (IDispatch * pBreakpoint)
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  	return S_OK;
  }
  
--- 258,306 ----
  			CComVariant vSaveChanges = dsSaveChangesPrompt;
  			DsSaveStatus Saved;
  
! 			pDoc->Close(vSaveChanges, &Saved);
  		}
  	}
  
! 	SysFreeString(FileName);
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WindowActivate(IDispatch * theWindow)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WindowDeactivate(IDispatch * theWindow)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WorkspaceOpen()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::WorkspaceClose()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
! HRESULT CCommands::XApplicationEvents::NewWorkspace()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
  // Debugger event
  
! HRESULT CCommands::XDebuggerEvents::BreakpointHit(IDispatch * pBreakpoint)
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  	return S_OK;
  }
  
***************
*** 308,324 ****
  class CMainDialog : public CDialog
  {
      public:
! 	CMainDialog (CWnd * pParent = NULL);	// Standard constructor
  
  	//{{AFX_DATA(CMainDialog)
  	enum { IDD = IDD_ADDINMAIN };
  	int	m_ChangeDir;
  	BOOL	m_bDevStudioEditor;
  	//}}AFX_DATA
  
  	//{{AFX_VIRTUAL(CMainDialog)
      protected:
! 	virtual void DoDataExchange (CDataExchange * pDX);	// DDX/DDV support
  	//}}AFX_VIRTUAL
  
      protected:
--- 311,328 ----
  class CMainDialog : public CDialog
  {
      public:
! 	CMainDialog(CWnd * pParent = NULL);	// Standard constructor
  
  	//{{AFX_DATA(CMainDialog)
  	enum { IDD = IDD_ADDINMAIN };
  	int	m_ChangeDir;
  	BOOL	m_bDevStudioEditor;
+ 	BOOL	m_bNewTabs;
  	//}}AFX_DATA
  
  	//{{AFX_VIRTUAL(CMainDialog)
      protected:
! 	virtual void DoDataExchange(CDataExchange * pDX);	// DDX/DDV support
  	//}}AFX_VIRTUAL
  
      protected:
***************
*** 326,425 ****
  	afx_msg void OnEnable();
  	afx_msg void OnDisable();
  	//}}AFX_MSG
! 	DECLARE_MESSAGE_MAP ()
  };
  
! CMainDialog::CMainDialog (CWnd * pParent /* =NULL */ )
! 	: CDialog (CMainDialog::IDD, pParent)
  {
  	//{{AFX_DATA_INIT(CMainDialog)
  	m_ChangeDir = -1;
  	m_bDevStudioEditor = FALSE;
  	//}}AFX_DATA_INIT
  }
  
! void CMainDialog::DoDataExchange (CDataExchange * pDX)
  {
! 	CDialog::DoDataExchange (pDX);
  	//{{AFX_DATA_MAP(CMainDialog)
  	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);
! 	DDX_Check (pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
  	//}}AFX_DATA_MAP
  }
  
! BEGIN_MESSAGE_MAP (CMainDialog, CDialog)
  	//{{AFX_MSG_MAP(CMainDialog)
  	//}}AFX_MSG_MAP
! END_MESSAGE_MAP ()
  
  
  /////////////////////////////////////////////////////////////////////////////
  // CCommands methods
  
! STDMETHODIMP CCommands::VisVimDialog ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  
  	// Use m_pApplication to access the Developer Studio Application
  	// object,
  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
  	// (see stdafx.h)
  
! 	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_FALSE));
  
  	CMainDialog Dlg;
  
  	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;
  	Dlg.m_ChangeDir = g_ChangeDir;
! 	if (Dlg.DoModal () == IDOK)
  	{
  		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;
  		g_ChangeDir = Dlg.m_ChangeDir;
  
  		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim
! 		HKEY hAppKey = GetAppKey ("Vim");
  		if (hAppKey)
  		{
! 			HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
  			if (hSectionKey)
  			{
! 				WriteRegistryInt (hSectionKey, "DevStudioEditor",
  						  g_bDevStudioEditor);
! 				WriteRegistryInt (hSectionKey, "ChangeDir", g_ChangeDir);
! 				RegCloseKey (hSectionKey);
  			}
! 			RegCloseKey (hAppKey);
  		}
  	}
  
! 	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_TRUE));
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimEnable ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
! 	VimSetEnableState (true);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimDisable ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
! 	VimSetEnableState (false);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimToggle ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
! 	VimSetEnableState (! g_bEnableVim);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimLoad ()
  {
! 	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
  
  	// Use m_pApplication to access the Developer Studio Application object,
  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
--- 330,435 ----
  	afx_msg void OnEnable();
  	afx_msg void OnDisable();
  	//}}AFX_MSG
! 	DECLARE_MESSAGE_MAP()
  };
  
! CMainDialog::CMainDialog(CWnd * pParent /* =NULL */ )
! 	: CDialog(CMainDialog::IDD, pParent)
  {
  	//{{AFX_DATA_INIT(CMainDialog)
  	m_ChangeDir = -1;
  	m_bDevStudioEditor = FALSE;
+ 	m_bNewTabs = FALSE;
  	//}}AFX_DATA_INIT
  }
  
! void CMainDialog::DoDataExchange(CDataExchange * pDX)
  {
! 	CDialog::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CMainDialog)
  	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);
! 	DDX_Check(pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
! 	DDX_Check(pDX, IDC_NEW_TABS, m_bNewTabs);
  	//}}AFX_DATA_MAP
  }
  
! BEGIN_MESSAGE_MAP(CMainDialog, CDialog)
  	//{{AFX_MSG_MAP(CMainDialog)
  	//}}AFX_MSG_MAP
! END_MESSAGE_MAP()
  
  
  /////////////////////////////////////////////////////////////////////////////
  // CCommands methods
  
! STDMETHODIMP CCommands::VisVimDialog()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  
  	// Use m_pApplication to access the Developer Studio Application
  	// object,
  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
  	// (see stdafx.h)
  
! 	VERIFY_OK(m_pApplication->EnableModeless(VARIANT_FALSE));
  
  	CMainDialog Dlg;
  
  	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;
+ 	Dlg.m_bNewTabs = g_bNewTabs;
  	Dlg.m_ChangeDir = g_ChangeDir;
! 	if (Dlg.DoModal() == IDOK)
  	{
  		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;
+ 		g_bNewTabs = Dlg.m_bNewTabs;
  		g_ChangeDir = Dlg.m_ChangeDir;
  
  		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim
! 		HKEY hAppKey = GetAppKey("Vim");
  		if (hAppKey)
  		{
! 			HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
  			if (hSectionKey)
  			{
! 				WriteRegistryInt(hSectionKey, "DevStudioEditor",
  						  g_bDevStudioEditor);
! 				WriteRegistryInt(hSectionKey, "NewTabs",
! 						  g_bNewTabs);
! 				WriteRegistryInt(hSectionKey, "ChangeDir", g_ChangeDir);
! 				RegCloseKey(hSectionKey);
  			}
! 			RegCloseKey(hAppKey);
  		}
  	}
  
! 	VERIFY_OK(m_pApplication->EnableModeless(VARIANT_TRUE));
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimEnable()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
! 	VimSetEnableState(true);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimDisable()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
! 	VimSetEnableState(false);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimToggle()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
! 	VimSetEnableState(! g_bEnableVim);
  	return S_OK;
  }
  
! STDMETHODIMP CCommands::VisVimLoad()
  {
! 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
  
  	// Use m_pApplication to access the Developer Studio Application object,
  	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
***************
*** 430,436 ****
  	CComPtr < IDispatch > pDispDoc, pDispSel;
  
  	// Get a document object dispatch pointer
! 	VERIFY_OK (m_pApplication->get_ActiveDocument (&pDispDoc));
  	if (! pDispDoc)
  		return S_OK;
  
--- 440,446 ----
  	CComPtr < IDispatch > pDispDoc, pDispSel;
  
  	// Get a document object dispatch pointer
! 	VERIFY_OK(m_pApplication->get_ActiveDocument(&pDispDoc));
  	if (! pDispDoc)
  		return S_OK;
  
***************
*** 438,467 ****
  	long LineNr = -1;
  
  	// Get the document object
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (pDispDoc);
  
  	if (! pDoc)
  		return S_OK;
  
  	// Get the document name
! 	if (FAILED (pDoc->get_FullName (&FileName)))
  		return S_OK;
  
  	// Get a selection object dispatch pointer
! 	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))
  	{
  		// Get the selection object
! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);
  
  		if (pSel)
  			// Get the selection line number
! 			pSel->get_CurrentLine (&LineNr);
  	}
  
  	// Open the file in Vim
! 	VimOpenFile (FileName, LineNr);
  
! 	SysFreeString (FileName);
  	return S_OK;
  }
  
--- 448,477 ----
  	long LineNr = -1;
  
  	// Get the document object
! 	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(pDispDoc);
  
  	if (! pDoc)
  		return S_OK;
  
  	// Get the document name
! 	if (FAILED(pDoc->get_FullName(&FileName)))
  		return S_OK;
  
  	// Get a selection object dispatch pointer
! 	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))
  	{
  		// Get the selection object
! 		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);
  
  		if (pSel)
  			// Get the selection line number
! 			pSel->get_CurrentLine(&LineNr);
  	}
  
  	// Open the file in Vim
! 	VimOpenFile(FileName, LineNr);
  
! 	SysFreeString(FileName);
  	return S_OK;
  }
  
***************
*** 472,487 ****
  
  // Set the enable state and save to registry
  //
! static void VimSetEnableState (BOOL bEnableState)
  {
  	g_bEnableVim = bEnableState;
! 	HKEY hAppKey = GetAppKey ("Vim");
  	if (hAppKey)
  	{
! 		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
  		if (hSectionKey)
! 			WriteRegistryInt (hSectionKey, "EnableVim", g_bEnableVim);
! 		RegCloseKey (hAppKey);
  	}
  }
  
--- 482,497 ----
  
  // Set the enable state and save to registry
  //
! static void VimSetEnableState(BOOL bEnableState)
  {
  	g_bEnableVim = bEnableState;
! 	HKEY hAppKey = GetAppKey("Vim");
  	if (hAppKey)
  	{
! 		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
  		if (hSectionKey)
! 			WriteRegistryInt(hSectionKey, "EnableVim", g_bEnableVim);
! 		RegCloseKey(hAppKey);
  	}
  }
  
***************
*** 490,496 ****
  // letter.
  // 'LineNr' must contain a valid line number or 0, e. g. for a new file
  //
! static BOOL VimOpenFile (BSTR& FileName, long LineNr)
  {
  
  	// OLE automation object for com. with Vim
--- 500,506 ----
  // letter.
  // 'LineNr' must contain a valid line number or 0, e. g. for a new file
  //
! static BOOL VimOpenFile(BSTR& FileName, long LineNr)
  {
  
  	// OLE automation object for com. with Vim
***************
*** 507,513 ****
  	// Get a dispatch id for the SendKeys method of Vim;
  	// enables connection to Vim if necessary
  	DISPID DispatchId;
! 	DispatchId = VimGetDispatchId (VimOle, "SendKeys");
  	if (! DispatchId)
  		// OLE error, can't obtain dispatch id
  		goto OleError;
--- 517,523 ----
  	// Get a dispatch id for the SendKeys method of Vim;
  	// enables connection to Vim if necessary
  	DISPID DispatchId;
! 	DispatchId = VimGetDispatchId(VimOle, "SendKeys");
  	if (! DispatchId)
  		// OLE error, can't obtain dispatch id
  		goto OleError;
***************
*** 525,544 ****
  #ifdef SINGLE_WINDOW
  	// Update the current file in Vim if it has been modified.
  	// Disabled, because it could write the file when you don't want to.
! 	sprintf (VimCmd + 2, ":up\n");
  #endif
! 	if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
  		goto OleError;
  
  	// Change Vim working directory to where the file is if desired
  	if (g_ChangeDir != CD_NONE)
! 		VimChangeDir (VimOle, DispatchId, FileName);
  
  	// Make Vim open the file.
  	// In the filename convert all \ to /, put a \ before a space.
! 	sprintf(VimCmd, ":drop ");
  	sprintf(FileNameTmp, "%S", (char *)FileName);
- 	s = VimCmd + 6;
  	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
  									  ++p)
  		if (*p == '\\')
--- 535,562 ----
  #ifdef SINGLE_WINDOW
  	// Update the current file in Vim if it has been modified.
  	// Disabled, because it could write the file when you don't want to.
! 	sprintf(VimCmd + 2, ":up\n");
  #endif
! 	if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
  		goto OleError;
  
  	// Change Vim working directory to where the file is if desired
  	if (g_ChangeDir != CD_NONE)
! 		VimChangeDir(VimOle, DispatchId, FileName);
  
  	// Make Vim open the file.
  	// In the filename convert all \ to /, put a \ before a space.
! 	if (g_bNewTabs)
! 	{
! 		sprintf(VimCmd, ":tab drop ");
! 		s = VimCmd + 11;
! 	}
! 	else
! 	{
! 		sprintf(VimCmd, ":drop ");
! 		s = VimCmd + 6;
! 	}
  	sprintf(FileNameTmp, "%S", (char *)FileName);
  	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
  									  ++p)
  		if (*p == '\\')
***************
*** 552,571 ****
  	*s++ = '\n';
  	*s = '\0';
  
! 	if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
  		goto OleError;
  
  	if (LineNr > 0)
  	{
  		// Goto line
! 		sprintf (VimCmd, ":%d\n", LineNr);
! 		if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
  			goto OleError;
  	}
  
  	// Make Vim come to the foreground
! 	if (! VimOle.Method ("SetForeground"))
! 		VimOle.ErrDiag ();
  
  	// We're done
  	return true;
--- 570,589 ----
  	*s++ = '\n';
  	*s = '\0';
  
! 	if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
  		goto OleError;
  
  	if (LineNr > 0)
  	{
  		// Goto line
! 		sprintf(VimCmd, ":%d\n", LineNr);
! 		if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
  			goto OleError;
  	}
  
  	// Make Vim come to the foreground
! 	if (! VimOle.Method("SetForeground"))
! 		VimOle.ErrDiag();
  
  	// We're done
  	return true;
***************
*** 573,579 ****
      OleError:
  	// There was an OLE error
  	// Check if it's the "unknown class string" error
! 	VimErrDiag (VimOle);
  	return false;
  }
  
--- 591,597 ----
      OleError:
  	// There was an OLE error
  	// Check if it's the "unknown class string" error
! 	VimErrDiag(VimOle);
  	return false;
  }
  
***************
*** 581,598 ****
  // Create the Vim OLE object if necessary
  // Returns a valid dispatch id or null on error
  //
! static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method)
  {
  	// Initialize Vim OLE connection if not already done
! 	if (! VimOle.IsCreated ())
  	{
! 		if (! VimOle.CreateObject ("Vim.Application"))
  			return NULL;
  	}
  
  	// Get the dispatch id for the SendKeys method.
  	// By doing this, we are checking if Vim is still there...
! 	DISPID DispatchId = VimOle.GetDispatchId ("SendKeys");
  	if (! DispatchId)
  	{
  		// We can't get a dispatch id.
--- 599,616 ----
  // Create the Vim OLE object if necessary
  // Returns a valid dispatch id or null on error
  //
! static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method)
  {
  	// Initialize Vim OLE connection if not already done
! 	if (! VimOle.IsCreated())
  	{
! 		if (! VimOle.CreateObject("Vim.Application"))
  			return NULL;
  	}
  
  	// Get the dispatch id for the SendKeys method.
  	// By doing this, we are checking if Vim is still there...
! 	DISPID DispatchId = VimOle.GetDispatchId("SendKeys");
  	if (! DispatchId)
  	{
  		// We can't get a dispatch id.
***************
*** 604,615 ****
  		// should not be kept long enough to allow the user to terminate Vim
  		// to avoid memory corruption (why the heck is there no system garbage
  		// collection for those damned OLE memory chunks???).
! 		VimOle.DeleteObject ();
! 		if (! VimOle.CreateObject ("Vim.Application"))
  			// If this create fails, it's time for an error msg
  			return NULL;
  
! 		if (! (DispatchId = VimOle.GetDispatchId ("SendKeys")))
  			// There is something wrong...
  			return NULL;
  	}
--- 622,633 ----
  		// should not be kept long enough to allow the user to terminate Vim
  		// to avoid memory corruption (why the heck is there no system garbage
  		// collection for those damned OLE memory chunks???).
! 		VimOle.DeleteObject();
! 		if (! VimOle.CreateObject("Vim.Application"))
  			// If this create fails, it's time for an error msg
  			return NULL;
  
! 		if (! (DispatchId = VimOle.GetDispatchId("SendKeys")))
  			// There is something wrong...
  			return NULL;
  	}
***************
*** 620,639 ****
  // Output an error message for an OLE error
  // Check on the classstring error, which probably means Vim wasn't registered.
  //
! static void VimErrDiag (COleAutomationControl& VimOle)
  {
! 	SCODE sc = GetScode (VimOle.GetResult ());
  	if (sc == CO_E_CLASSSTRING)
  	{
  		char Buf[256];
! 		sprintf (Buf, "There is no registered OLE automation server named "
  			 "\"Vim.Application\".\n"
  			 "Use the OLE-enabled version of Vim with VisVim and "
  			 "make sure to register Vim by running \"vim -register\".");
! 		MessageBox (NULL, Buf, "OLE Error", MB_OK);
  	}
  	else
! 		VimOle.ErrDiag ();
  }
  
  // Change directory to the directory the file 'FileName' is in or it's parent
--- 638,657 ----
  // Output an error message for an OLE error
  // Check on the classstring error, which probably means Vim wasn't registered.
  //
! static void VimErrDiag(COleAutomationControl& VimOle)
  {
! 	SCODE sc = GetScode(VimOle.GetResult());
  	if (sc == CO_E_CLASSSTRING)
  	{
  		char Buf[256];
! 		sprintf(Buf, "There is no registered OLE automation server named "
  			 "\"Vim.Application\".\n"
  			 "Use the OLE-enabled version of Vim with VisVim and "
  			 "make sure to register Vim by running \"vim -register\".");
! 		MessageBox(NULL, Buf, "OLE Error", MB_OK);
  	}
  	else
! 		VimOle.ErrDiag();
  }
  
  // Change directory to the directory the file 'FileName' is in or it's parent
***************
*** 644,650 ****
  //	CD_SOURCE_PATH
  //	CD_SOURCE_PARENT
  //
! static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName)
  {
  	// Do a :cd first
  
--- 662,668 ----
  //	CD_SOURCE_PATH
  //	CD_SOURCE_PARENT
  //
! static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName)
  {
  	// Do a :cd first
  
***************
*** 655,661 ****
  	char DirUnix[_MAX_DIR * 2];
  	char *s, *t;
  
! 	_splitpath (StrFileName, Drive, Dir, NULL, NULL);
  
  	// Convert to Unix path name format, escape spaces.
  	t = DirUnix;
--- 673,679 ----
  	char DirUnix[_MAX_DIR * 2];
  	char *s, *t;
  
! 	_splitpath(StrFileName, Drive, Dir, NULL, NULL);
  
  	// Convert to Unix path name format, escape spaces.
  	t = DirUnix;
***************
*** 676,694 ****
  	OLECHAR Buf[MAX_OLE_STR];
  	char VimCmd[MAX_OLE_STR];
  
! 	sprintf (VimCmd, ":cd %s%s%s\n", Drive, DirUnix,
  		 g_ChangeDir == CD_SOURCE_PARENT && DirUnix[1] ? ".." : "");
! 	VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf));
  }
  
  #ifdef _DEBUG
  // Print out a debug message
  //
! static void DebugMsg (char* Msg, char* Arg)
  {
  	char Buf[400];
! 	sprintf (Buf, Msg, Arg);
! 	AfxMessageBox (Buf);
  }
  #endif
- 
--- 694,711 ----
  	OLECHAR Buf[MAX_OLE_STR];
  	char VimCmd[MAX_OLE_STR];
  
! 	sprintf(VimCmd, ":cd %s%s%s\n", Drive, DirUnix,
  		 g_ChangeDir == CD_SOURCE_PARENT && DirUnix[1] ? ".." : "");
! 	VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf));
  }
  
  #ifdef _DEBUG
  // Print out a debug message
  //
! static void DebugMsg(char* Msg, char* Arg)
  {
  	char Buf[400];
! 	sprintf(Buf, Msg, Arg);
! 	AfxMessageBox(Buf);
  }
  #endif
*** ../vim-7.2.149/src/VisVim/Resource.h	Sun Jun 13 19:17:32 2004
--- src/VisVim/Resource.h	Mon Mar  2 00:39:21 2009
***************
*** 16,21 ****
--- 16,22 ----
  #define IDC_CD_SOURCE_PATH		1001
  #define IDC_CD_SOURCE_PARENT		1002
  #define IDC_CD_NONE			1003
+ #define IDC_NEW_TABS			1004
  
  // Next default values for new objects
  //
*** ../vim-7.2.149/src/VisVim/VisVim.rc	Sun Jun 13 19:38:03 2004
--- src/VisVim/VisVim.rc	Mon Mar  2 00:40:19 2009
***************
*** 122,127 ****
--- 122,130 ----
      CONTROL         "&Open file in DevStudio editor simultaneously",
                      IDC_DEVSTUDIO_EDITOR,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
                      WS_TABSTOP,7,7,153,10
+     CONTROL         "Open files in new tabs",
+                     IDC_NEW_TABS,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
+                     WS_TABSTOP,7,21,153,10
      GROUPBOX        "Current directory",IDC_STATIC,7,35,164,58,WS_GROUP
      CONTROL         "Set to &source file path",IDC_CD_SOURCE_PATH,"Button",
                      BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,49,85,10
*** ../vim-7.2.149/src/version.c	Wed Apr 22 12:53:31 2009
--- src/version.c	Wed Apr 22 13:04:32 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     150,
  /**/

-- 
A poem:                read aloud:

<> !*''#               Waka waka bang splat tick tick hash,
^"`$$-                 Caret quote back-tick dollar dollar dash,
!*=@$_                 Bang splat equal at dollar under-score,
%*<> ~#4               Percent splat waka waka tilde number four,
&[]../                 Ampersand bracket bracket dot dot slash,
|{,,SYSTEM HALTED      Vertical-bar curly-bracket comma comma CRASH.

Fred Bremmer and Steve Kroese (Calvin College & Seminary of Grand Rapids, MI.)

 /// 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    ///


--- NEW FILE 7.2.151 ---
To: vim-dev at vim.org
Subject: Patch 7.2.151
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.2.151
Problem:    ":hist a" doesn't work like ":hist all" as the docs suggest.
Solution:   Make ":hist a" and ":hist al" work. (Dominique Pelle)
Files:	    src/ex_getln.c


*** ../vim-7.2.150/src/ex_getln.c	Wed Mar 18 12:50:58 2009
--- src/ex_getln.c	Sun Apr 12 13:36:06 2009
***************
*** 5686,5692 ****
  	histype1 = get_histtype(arg);
  	if (histype1 == -1)
  	{
! 	    if (STRICMP(arg, "all") == 0)
  	    {
  		histype1 = 0;
  		histype2 = HIST_COUNT-1;
--- 5686,5692 ----
  	histype1 = get_histtype(arg);
  	if (histype1 == -1)
  	{
! 	    if (STRNICMP(arg, "all", STRLEN(arg)) == 0)
  	    {
  		histype1 = 0;
  		histype2 = HIST_COUNT-1;
*** ../vim-7.2.150/src/version.c	Wed Apr 22 13:06:11 2009
--- src/version.c	Wed Apr 22 13:49:41 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     151,
  /**/

-- 
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    ///


--- NEW FILE 7.2.152 ---
To: vim-dev at vim.org
Subject: Patch 7.2.152
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.2.152
Problem:    When using "silent echo x" inside ":redir" a next echo may start
	    halfway the line. (Tony Mechelynck, Dennis Benzinger)
Solution:   Reset msg_col after redirecting silently.
Files:	    src/ex_docmd.c, src/message.c, src/proto/message.pro


*** ../vim-7.2.151/src/ex_docmd.c	Wed Mar 18 12:50:58 2009
--- src/ex_docmd.c	Wed Apr 22 11:57:49 2009
***************
*** 2699,2704 ****
--- 2699,2709 ----
  	/* Restore msg_scroll, it's set by file I/O commands, even when no
  	 * message is actually displayed. */
  	msg_scroll = save_msg_scroll;
+ 
+ 	/* "silent reg" or "silent echo x" inside "redir" leaves msg_col
+ 	 * somewhere in the line.  Put it back in the first column. */
+ 	if (redirecting())
+ 	    msg_col = 0;
      }
  
  #ifdef HAVE_SANDBOX
*** ../vim-7.2.151/src/message.c	Tue Feb 24 04:36:50 2009
--- src/message.c	Sun Apr 12 14:08:25 2009
***************
*** 3023,3033 ****
      if (*p_vfile != NUL)
  	verbose_write(s, maxlen);
  
!     if (redir_fd != NULL
! #ifdef FEAT_EVAL
! 			  || redir_reg || redir_vname
! #endif
! 				       )
      {
  	/* If the string doesn't start with CR or NL, go to msg_col */
  	if (*s != '\n' && *s != '\r')
--- 3023,3029 ----
      if (*p_vfile != NUL)
  	verbose_write(s, maxlen);
  
!     if (redirecting())
      {
  	/* If the string doesn't start with CR or NL, go to msg_col */
  	if (*s != '\n' && *s != '\r')
***************
*** 3074,3079 ****
--- 3070,3085 ----
      }
  }
  
+     int
+ redirecting()
+ {
+     return redir_fd != NULL
+ #ifdef FEAT_EVAL
+ 			  || redir_reg || redir_vname
+ #endif
+ 				       ;
+ }
+ 
  /*
   * Before giving verbose message.
   * Must always be called paired with verbose_leave()!
*** ../vim-7.2.151/src/proto/message.pro	Sat May  5 19:35:34 2007
--- src/proto/message.pro	Sun Apr 12 14:08:50 2009
***************
*** 54,59 ****
--- 54,60 ----
  void msg_clr_cmdline __ARGS((void));
  int msg_end __ARGS((void));
  void msg_check __ARGS((void));
+ int redirecting __ARGS((void));
  void verbose_enter __ARGS((void));
  void verbose_leave __ARGS((void));
  void verbose_enter_scroll __ARGS((void));
*** ../vim-7.2.151/src/version.c	Wed Apr 22 13:50:14 2009
--- src/version.c	Wed Apr 22 14:40:22 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     152,
  /**/

-- 
Q: How does a UNIX Guru pick up a girl?
A: look; grep; which; eval; nice; uname; talk; date;

 /// 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    ///


--- NEW FILE 7.2.153 ---
To: vim-dev at vim.org
Subject: Patch 7.2.153
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.2.153
Problem:    Memory leak for ":recover empty_dir/".
Solution:   Free files[] when it becomes empty. (Dominique Pelle)
Files:	    src/memline.c


*** ../vim-7.2.152/src/memline.c	Sun Jul 13 19:40:43 2008
--- src/memline.c	Wed Apr 22 11:48:35 2009
***************
*** 1554,1563 ****
  	    for (i = 0; i < num_files; ++i)
  		if (fullpathcmp(p, files[i], TRUE) & FPC_SAME)
  		{
  		    vim_free(files[i]);
! 		    --num_files;
! 		    for ( ; i < num_files; ++i)
! 			files[i] = files[i + 1];
  		}
  	}
  	if (nr > 0)
--- 1554,1568 ----
  	    for (i = 0; i < num_files; ++i)
  		if (fullpathcmp(p, files[i], TRUE) & FPC_SAME)
  		{
+ 		    /* Remove the name from files[i].  Move further entries
+ 		     * down.  When the array becomes empty free it here, since
+ 		     * FreeWild() won't be called below. */
  		    vim_free(files[i]);
! 		    if (--num_files == 0)
! 			vim_free(files);
! 		    else
! 			for ( ; i < num_files; ++i)
! 			    files[i] = files[i + 1];
  		}
  	}
  	if (nr > 0)
***************
*** 3522,3528 ****
  	    if (errno == EINVAL || errno == ENOENT)
  	    {
  		/* Found non-symlink or not existing file, stop here.
! 		 * When at the first level use the unmodifed name, skip the
  		 * call to vim_FullName(). */
  		if (depth == 1)
  		    return FAIL;
--- 3527,3533 ----
  	    if (errno == EINVAL || errno == ENOENT)
  	    {
  		/* Found non-symlink or not existing file, stop here.
! 		 * When at the first level use the unmodified name, skip the
  		 * call to vim_FullName(). */
  		if (depth == 1)
  		    return FAIL;
***************
*** 4560,4566 ****
  			buf->b_ml.ml_chunksize + curix,
  			(buf->b_ml.ml_usedchunks - curix) *
  			sizeof(chunksize_T));
! 	    /* Compute length of first half of lines in the splitted chunk */
  	    size = 0;
  	    linecnt = 0;
  	    while (curline < buf->b_ml.ml_line_count
--- 4568,4574 ----
  			buf->b_ml.ml_chunksize + curix,
  			(buf->b_ml.ml_usedchunks - curix) *
  			sizeof(chunksize_T));
! 	    /* Compute length of first half of lines in the split chunk */
  	    size = 0;
  	    linecnt = 0;
  	    while (curline < buf->b_ml.ml_line_count
*** ../vim-7.2.152/src/version.c	Wed Apr 22 14:42:26 2009
--- src/version.c	Wed Apr 22 15:34:18 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     153,
  /**/

-- 
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    ///


--- NEW FILE 7.2.154 ---
To: vim-dev at vim.org
Subject: Patch 7.2.154
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.2.154 (after 7.2.132)
Problem:    ":cd" is still possible in a SwapExists autocmd.
Solution:   Set allbuf_lock in do_swapexists().
Files:	    src/memline.c


*** ../vim-7.2.153/src/memline.c	Wed Apr 22 15:37:12 2009
--- src/memline.c	Wed Apr 22 15:54:48 2009
***************
*** 3771,3778 ****
      set_vim_var_string(VV_SWAPCHOICE, NULL, -1);
  
      /* Trigger SwapExists autocommands with <afile> set to the file being
!      * edited. */
      apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL);
  
      set_vim_var_string(VV_SWAPNAME, NULL, -1);
  
--- 3771,3780 ----
      set_vim_var_string(VV_SWAPCHOICE, NULL, -1);
  
      /* Trigger SwapExists autocommands with <afile> set to the file being
!      * edited.  Disallow changing directory here. */
!     ++allbuf_lock;
      apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL);
+     --allbuf_lock;
  
      set_vim_var_string(VV_SWAPNAME, NULL, -1);
  
***************
*** 3798,3803 ****
--- 3800,3806 ----
   *
   * Note: If BASENAMELEN is not correct, you will get error messages for
   *	 not being able to open the swapfile
+  * Note: May trigger SwapExists autocmd, pointers may change!
   */
      static char_u *
  findswapname(buf, dirp, old_fname)
*** ../vim-7.2.153/src/version.c	Wed Apr 22 15:37:12 2009
--- src/version.c	Wed Apr 22 15:55:48 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     154,
  /**/

-- 
ARTHUR:  Be quiet!
DENNIS:  Well you can't expect to wield supreme executive power just 'cause
         some watery tart threw a sword at you!
ARTHUR:  Shut up!
DENNIS:  I mean, if I went around sayin' I was an empereror just because some
         moistened bint had lobbed a scimitar at me they'd put me away!
                                  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    ///


--- NEW FILE 7.2.155 ---
To: vim-dev at vim.org
Subject: Patch 7.2.155
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.2.155
Problem:    Memory leak in ":function /pat".
Solution:   Free the memory. (Dominique Pelle)
Files:	    src/eval.c


*** ../vim-7.2.154/src/eval.c	Wed Apr 22 12:53:31 2009
--- src/eval.c	Wed Apr 22 16:04:34 2009
***************
*** 19720,19725 ****
--- 19720,19726 ----
  			    list_func_head(fp, FALSE);
  		    }
  		}
+ 		vim_free(regmatch.regprog);
  	    }
  	}
  	if (*p == '/')
*** ../vim-7.2.154/src/version.c	Wed Apr 22 15:56:27 2009
--- src/version.c	Wed Apr 22 16:07:27 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     155,
  /**/

-- 
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    ///


--- NEW FILE 7.2.156 ---
To: vim-dev at vim.org
Subject: Patch 7.2.156
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.2.156 (after 7.2.143)
Problem:    No completion for :scscope and :lcscope commands.
Solution:   Implement the completion. (Dominique Pelle)
Files:	    src/if_cscope.c, src/ex_docmd.c, src/proto/if_cscope.pro


*** ../vim-7.2.155/src/if_cscope.c	Wed Mar 18 14:30:46 2009
--- src/if_cscope.c	Wed Apr 22 11:57:49 2009
***************
*** 98,103 ****
--- 98,104 ----
  static enum
  {
      EXP_CSCOPE_SUBCMD,	/* expand ":cscope" sub-commands */
+     EXP_SCSCOPE_SUBCMD,	/* expand ":scscope" sub-commands */
      EXP_CSCOPE_FIND,	/* expand ":cscope find" arguments */
      EXP_CSCOPE_KILL	/* expand ":cscope kill" arguments */
  } expand_what;
***************
*** 112,123 ****
--- 113,135 ----
      expand_T	*xp;
      int		idx;
  {
+     int		current_idx;
+     int		i;
+ 
      switch (expand_what)
      {
      case EXP_CSCOPE_SUBCMD:
  	/* Complete with sub-commands of ":cscope":
  	 * add, find, help, kill, reset, show */
  	return (char_u *)cs_cmds[idx].name;
+     case EXP_SCSCOPE_SUBCMD:
+ 	/* Complete with sub-commands of ":scscope": same sub-commands as
+ 	 * ":cscope" but skip commands which don't support split windows */
+ 	for (i = 0, current_idx = 0; cs_cmds[i].name != NULL; i++)
+ 	    if (cs_cmds[i].cansplit)
+ 		if (current_idx++ == idx)
+ 		    break;
+ 	return (char_u *)cs_cmds[i].name;
      case EXP_CSCOPE_FIND:
  	{
  	    const char *query_type[] =
***************
*** 133,147 ****
  	}
      case EXP_CSCOPE_KILL:
  	{
- 	    int			i;
- 	    int			current_idx = 0;
  	    static char_u	connection[2];
  
  	    /* ":cscope kill" accepts connection numbers or partial names of
  	     * the pathname of the cscope database as argument.  Only complete
  	     * with connection numbers. -1 can also be used to kill all
  	     * connections. */
! 	    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	    {
  		if (csinfo[i].fname == NULL)
  		    continue;
--- 145,157 ----
  	}
      case EXP_CSCOPE_KILL:
  	{
  	    static char_u	connection[2];
  
  	    /* ":cscope kill" accepts connection numbers or partial names of
  	     * the pathname of the cscope database as argument.  Only complete
  	     * with connection numbers. -1 can also be used to kill all
  	     * connections. */
! 	    for (i = 0, current_idx = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	    {
  		if (csinfo[i].fname == NULL)
  		    continue;
***************
*** 165,180 ****
   * Handle command line completion for :cscope command.
   */
      void
! set_context_in_cscope_cmd(xp, arg)
      expand_T	*xp;
      char_u	*arg;
  {
      char_u	*p;
  
      /* Default: expand subcommands */
      xp->xp_context = EXPAND_CSCOPE;
-     expand_what = EXP_CSCOPE_SUBCMD;
      xp->xp_pattern = arg;
  
      /* (part of) subcommand already typed */
      if (*arg != NUL)
--- 175,192 ----
   * Handle command line completion for :cscope command.
   */
      void
! set_context_in_cscope_cmd(xp, arg, cmdidx)
      expand_T	*xp;
      char_u	*arg;
+     cmdidx_T	cmdidx;
  {
      char_u	*p;
  
      /* Default: expand subcommands */
      xp->xp_context = EXPAND_CSCOPE;
      xp->xp_pattern = arg;
+     expand_what = (cmdidx == CMD_scscope)
+ 			? EXP_SCSCOPE_SUBCMD : EXP_CSCOPE_SUBCMD;
  
      /* (part of) subcommand already typed */
      if (*arg != NUL)
*** ../vim-7.2.155/src/ex_docmd.c	Wed Apr 22 14:42:26 2009
--- src/ex_docmd.c	Wed Apr 22 11:57:49 2009
***************
*** 3690,3696 ****
  	    break;
  #ifdef FEAT_CSCOPE
  	case CMD_cscope:
! 	    set_context_in_cscope_cmd(xp, arg);
  	    break;
  #endif
  #ifdef FEAT_LISTCMDS
--- 3690,3698 ----
  	    break;
  #ifdef FEAT_CSCOPE
  	case CMD_cscope:
! 	case CMD_lcscope:
! 	case CMD_scscope:
! 	    set_context_in_cscope_cmd(xp, arg, ea.cmdidx);
  	    break;
  #endif
  #ifdef FEAT_LISTCMDS
*** ../vim-7.2.155/src/proto/if_cscope.pro	Wed Mar 18 12:50:58 2009
--- src/proto/if_cscope.pro	Wed Apr 22 11:57:49 2009
***************
*** 1,6 ****
  /* if_cscope.c */
  char_u *get_cscope_name __ARGS((expand_T *xp, int idx));
! void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg));
  void do_cscope __ARGS((exarg_T *eap));
  void do_scscope __ARGS((exarg_T *eap));
  void do_cstag __ARGS((exarg_T *eap));
--- 1,6 ----
  /* if_cscope.c */
  char_u *get_cscope_name __ARGS((expand_T *xp, int idx));
! void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg, cmdidx_T cmdidx));
  void do_cscope __ARGS((exarg_T *eap));
  void do_scscope __ARGS((exarg_T *eap));
  void do_cstag __ARGS((exarg_T *eap));
*** ../vim-7.2.155/src/version.c	Wed Apr 22 16:07:57 2009
--- src/version.c	Wed Apr 22 16:21:43 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     156,
  /**/

-- 
ARTHUR:  Shut up!  Will you shut up!
DENNIS:  Ah, now we see the violence inherent in the system.
ARTHUR:  Shut up!
DENNIS:  Oh!  Come and see the violence inherent in the system!
         HELP! HELP!  I'm being repressed!
                                  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    ///


--- NEW FILE 7.2.157 ---
To: vim-dev at vim.org
Subject: Patch 7.2.157
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.2.157
Problem:    Illegal memory access when searching in path.
Solution:   Avoid looking at a byte after end of a string. (Dominique Pelle)
Files:	    src/search.c


*** ../vim-7.2.156/src/search.c	Fri Jul 18 12:05:58 2008
--- src/search.c	Wed Apr 22 12:26:19 2009
***************
*** 2327,2334 ****
  		    for (col = pos.col; check_prevcol(linep, col, '\\', &col);)
  			bslcnt++;
  		}
! 		/* Only accept a match when 'M' is in 'cpo' or when ecaping is
! 		 * what we expect. */
  		if (cpo_bsl || (bslcnt & 1) == match_escaped)
  		{
  		    if (c == initc)
--- 2336,2343 ----
  		    for (col = pos.col; check_prevcol(linep, col, '\\', &col);)
  			bslcnt++;
  		}
! 		/* Only accept a match when 'M' is in 'cpo' or when escaping
! 		 * is what we expect. */
  		if (cpo_bsl || (bslcnt & 1) == match_escaped)
  		{
  		    if (c == initc)
***************
*** 4663,4669 ****
  			    msg_putchar('\n');	    /* cursor below last one */
  			    if (!got_int)	    /* don't display if 'q'
  						       typed at "--more--"
! 						       mesage */
  			    {
  				msg_home_replace_hl(new_fname);
  				MSG_PUTS(_(" (includes previously listed match)"));
--- 4672,4678 ----
  			    msg_putchar('\n');	    /* cursor below last one */
  			    if (!got_int)	    /* don't display if 'q'
  						       typed at "--more--"
! 						       message */
  			    {
  				msg_home_replace_hl(new_fname);
  				MSG_PUTS(_(" (includes previously listed match)"));
***************
*** 4975,4981 ****
  					    || IObuff[i-2] == '!'))))
  				IObuff[i++] = ' ';
  			}
! 			/* copy as much as posible of the new word */
  			if (p - aux >= IOSIZE - i)
  			    p = aux + IOSIZE - i - 1;
  			STRNCPY(IObuff + i, aux, p - aux);
--- 4984,4990 ----
  					    || IObuff[i-2] == '!'))))
  				IObuff[i++] = ' ';
  			}
! 			/* copy as much as possible of the new word */
  			if (p - aux >= IOSIZE - i)
  			    p = aux + IOSIZE - i - 1;
  			STRNCPY(IObuff + i, aux, p - aux);
***************
*** 5010,5016 ****
  		    if (did_show)
  			msg_putchar('\n');	/* cursor below last one */
  		    if (!got_int)		/* don't display if 'q' typed
! 						    at "--more--" mesage */
  			msg_home_replace_hl(curr_fname);
  		    prev_fname = curr_fname;
  		}
--- 5019,5025 ----
  		    if (did_show)
  			msg_putchar('\n');	/* cursor below last one */
  		    if (!got_int)		/* don't display if 'q' typed
! 						    at "--more--" message */
  			msg_home_replace_hl(curr_fname);
  		    prev_fname = curr_fname;
  		}
***************
*** 5092,5098 ****
  		}
  		if (action != ACTION_SHOW)
  		{
! 		    curwin->w_cursor.col = (colnr_T) (startp - line);
  		    curwin->w_set_curswant = TRUE;
  		}
  
--- 5101,5107 ----
  		}
  		if (action != ACTION_SHOW)
  		{
! 		    curwin->w_cursor.col = (colnr_T)(startp - line);
  		    curwin->w_set_curswant = TRUE;
  		}
  
***************
*** 5119,5125 ****
  		    && action == ACTION_EXPAND
  		    && !(compl_cont_status & CONT_SOL)
  #endif
! 		    && *(p = startp + 1))
  		goto search_line;
  	}
  	line_breakcheck();
--- 5128,5135 ----
  		    && action == ACTION_EXPAND
  		    && !(compl_cont_status & CONT_SOL)
  #endif
! 		    && *startp != NUL
! 		    && *(p = startp + 1) != NUL)
  		goto search_line;
  	}
  	line_breakcheck();
*** ../vim-7.2.156/src/version.c	Wed Apr 22 16:22:44 2009
--- src/version.c	Wed Apr 22 16:39:59 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     157,
  /**/


-- 
ARTHUR:  Bloody peasant!
DENNIS:  Oh, what a give away.  Did you hear that, did you hear that, eh?
         That's what I'm on about -- did you see him repressing me, you saw it
         didn't you?
                                  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    ///


--- NEW FILE 7.2.158 ---
To: vim-dev at vim.org
Subject: Patch 7.2.158
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.2.158
Problem:    Warnings from VisualC compiler.
Solution:   Add type casts. (George Reilly)
Files:	    src/ops.c


*** ../vim-7.2.157/src/ops.c	Wed Mar 11 16:26:01 2009
--- src/ops.c	Wed Apr 22 13:01:46 2009
***************
*** 495,504 ****
  	block_space_width = non_white_col - oap->start_vcol;
  	/* We will shift by "total" or "block_space_width", whichever is less.
  	 */
! 	shift_amount = (block_space_width < total? block_space_width: total);
  
  	/* The column to which we will shift the text.  */
! 	destination_col = non_white_col - shift_amount;
  
  	/* Now let's find out how much of the beginning of the line we can
  	 * reuse without modification.  */
--- 495,505 ----
  	block_space_width = non_white_col - oap->start_vcol;
  	/* We will shift by "total" or "block_space_width", whichever is less.
  	 */
! 	shift_amount = (block_space_width < (size_t)total
! 					 ? block_space_width : (size_t)total);
  
  	/* The column to which we will shift the text.  */
! 	destination_col = (colnr_T)(non_white_col - shift_amount);
  
  	/* Now let's find out how much of the beginning of the line we can
  	 * reuse without modification.  */
*** ../vim-7.2.157/src/version.c	Wed Apr 22 16:42:24 2009
--- src/version.c	Wed Apr 22 17:42:19 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     158,
  /**/

-- 
ARTHUR:        What?
BLACK KNIGHT:  None shall pass.
ARTHUR:        I have no quarrel with you, good Sir knight, but I must cross
               this bridge.
BLACK KNIGHT:  Then you shall die.
                                  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    ///


--- NEW FILE 7.2.159 ---
To: vim-dev at vim.org
Subject: Patch 7.2.159
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.2.159
Problem:    When $x_includes ends up being "NONE" configure fails.
Solution:   Check for $x_includes not to be "NONE" (Rainer)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.158/src/auto/configure	Mon Mar  2 02:44:54 2009
--- src/auto/configure	Wed Apr 22 14:37:24 2009
***************
*** 15519,15525 ****
  if test "$enable_multibyte" = "yes"; then
    cflags_save=$CFLAGS
    ldflags_save=$LDFLAGS
!   if test -n "$x_includes" ; then
      CFLAGS="$CFLAGS -I$x_includes"
      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
      { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
--- 15519,15525 ----
  if test "$enable_multibyte" = "yes"; then
    cflags_save=$CFLAGS
    ldflags_save=$LDFLAGS
!   if test "x$x_includes" != "xNONE" ; then
      CFLAGS="$CFLAGS -I$x_includes"
      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
      { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
*** ../vim-7.2.158/src/configure.in	Mon Mar  2 02:44:54 2009
--- src/configure.in	Wed Apr 22 14:35:57 2009
***************
*** 2952,2958 ****
  if test "$enable_multibyte" = "yes"; then
    cflags_save=$CFLAGS
    ldflags_save=$LDFLAGS
!   if test -n "$x_includes" ; then
      CFLAGS="$CFLAGS -I$x_includes"
      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
      AC_MSG_CHECKING(whether X_LOCALE needed)
--- 2952,2958 ----
  if test "$enable_multibyte" = "yes"; then
    cflags_save=$CFLAGS
    ldflags_save=$LDFLAGS
!   if test "x$x_includes" != "xNONE" ; then
      CFLAGS="$CFLAGS -I$x_includes"
      LDFLAGS="$X_LIBS $LDFLAGS -lX11"
      AC_MSG_CHECKING(whether X_LOCALE needed)
*** ../vim-7.2.158/src/version.c	Wed Apr 22 17:42:53 2009
--- src/version.c	Wed Apr 22 17:49:50 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     159,
  /**/

-- 
"Hegel was right when he said that we learn from history that man can
never learn anything from history."       (George Bernard Shaw)

 /// 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    ///


--- NEW FILE 7.2.160 ---
To: vim-dev at vim.org
Subject: Patch 7.2.160
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.2.160
Problem:    Search pattern not freed on exit when 'rightleft' set.
Solution:   Free mr_pattern_alloced.
Files:	    src/search.c


*** ../vim-7.2.159/src/search.c	Wed Apr 22 16:42:24 2009
--- src/search.c	Wed Apr 22 12:26:19 2009
***************
*** 345,350 ****
--- 345,359 ----
  {
      vim_free(spats[0].pat);
      vim_free(spats[1].pat);
+ 
+ # ifdef FEAT_RIGHTLEFT
+     if (mr_pattern_alloced)
+     {
+         vim_free(mr_pattern);
+         mr_pattern_alloced = FALSE;
+         mr_pattern = NULL;
+     }
+ # endif
  }
  #endif
  
*** ../vim-7.2.159/src/version.c	Wed Apr 22 17:50:53 2009
--- src/version.c	Wed Apr 22 18:42:25 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     160,
  /**/

-- 
    f y cn rd ths thn y cn hv grt jb n cmptr prgrmmng

 /// 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    ///


--- NEW FILE 7.2.161 ---
To: vim-dev at vim.org
Subject: Patch 7.2.161
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.2.161
Problem:    Folds messed up in other tab page. (Vlad Irnov)
Solution:   Instead of going over all windows in current tab page go over all
	    windows in all tab pages.  Also free memory for location lists in
	    other tab pages when exiting. (Lech Lorens)
Files:	    src/fileio.c, src/mark.c, src/misc1.c, src/misc2.c


*** ../vim-7.2.160/src/fileio.c	Wed Mar 18 15:40:03 2009
--- src/fileio.c	Wed Apr 22 15:46:35 2009
***************
*** 6846,6855 ****
  #endif
  #ifdef FEAT_FOLDING
  	{
! 	    win_T *wp;
  
  	    /* Update folds unless they are defined manually. */
! 	    FOR_ALL_WINDOWS(wp)
  		if (wp->w_buffer == curwin->w_buffer
  			&& !foldmethodIsManual(wp))
  		    foldUpdateAll(wp);
--- 6846,6856 ----
  #endif
  #ifdef FEAT_FOLDING
  	{
! 	    win_T	*wp;
! 	    tabpage_T	*tp;
  
  	    /* Update folds unless they are defined manually. */
! 	    FOR_ALL_TAB_WINDOWS(tp, wp)
  		if (wp->w_buffer == curwin->w_buffer
  			&& !foldmethodIsManual(wp))
  		    foldUpdateAll(wp);
*** ../vim-7.2.160/src/mark.c	Sun Nov  9 13:43:25 2008
--- src/mark.c	Wed Apr 22 17:32:29 2009
***************
*** 1023,1028 ****
--- 1023,1031 ----
      int		fnum = curbuf->b_fnum;
      linenr_T	*lp;
      win_T	*win;
+ #ifdef FEAT_WINDOWS
+     tabpage_T	*tab;
+ #endif
  
      if (line2 < line1 && amount_after == 0L)	    /* nothing to do */
  	return;
***************
*** 1064,1070 ****
  	/* quickfix marks */
  	qf_mark_adjust(NULL, line1, line2, amount, amount_after);
  	/* location lists */
! 	FOR_ALL_WINDOWS(win)
  	    qf_mark_adjust(win, line1, line2, amount, amount_after);
  #endif
  
--- 1067,1073 ----
  	/* quickfix marks */
  	qf_mark_adjust(NULL, line1, line2, amount, amount_after);
  	/* location lists */
! 	FOR_ALL_TAB_WINDOWS(tab, win)
  	    qf_mark_adjust(win, line1, line2, amount, amount_after);
  #endif
  
***************
*** 1086,1092 ****
      /*
       * Adjust items in all windows related to the current buffer.
       */
!     FOR_ALL_WINDOWS(win)
      {
  #ifdef FEAT_JUMPLIST
  	if (!cmdmod.lockmarks)
--- 1089,1095 ----
      /*
       * Adjust items in all windows related to the current buffer.
       */
!     FOR_ALL_TAB_WINDOWS(tab, win)
      {
  #ifdef FEAT_JUMPLIST
  	if (!cmdmod.lockmarks)
*** ../vim-7.2.160/src/misc1.c	Wed Mar 18 15:40:03 2009
--- src/misc1.c	Wed Apr 22 17:32:46 2009
***************
*** 2717,2722 ****
--- 2717,2725 ----
      long	xtra;
  {
      win_T	*wp;
+ #ifdef FEAT_WINDOWS
+     tabpage_T	*tp;
+ #endif
      int		i;
  #ifdef FEAT_JUMPLIST
      int		cols;
***************
*** 2769,2775 ****
  		    curbuf->b_changelistlen = JUMPLISTSIZE - 1;
  		    mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
  					  sizeof(pos_T) * (JUMPLISTSIZE - 1));
! 		    FOR_ALL_WINDOWS(wp)
  		    {
  			/* Correct position in changelist for other windows on
  			 * this buffer. */
--- 2772,2778 ----
  		    curbuf->b_changelistlen = JUMPLISTSIZE - 1;
  		    mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
  					  sizeof(pos_T) * (JUMPLISTSIZE - 1));
! 		    FOR_ALL_TAB_WINDOWS(tp, wp)
  		    {
  			/* Correct position in changelist for other windows on
  			 * this buffer. */
***************
*** 2777,2783 ****
  			    --wp->w_changelistidx;
  		    }
  		}
! 		FOR_ALL_WINDOWS(wp)
  		{
  		    /* For other windows, if the position in the changelist is
  		     * at the end it stays at the end. */
--- 2780,2786 ----
  			    --wp->w_changelistidx;
  		    }
  		}
! 		FOR_ALL_TAB_WINDOWS(tp, wp)
  		{
  		    /* For other windows, if the position in the changelist is
  		     * at the end it stays at the end. */
***************
*** 2796,2802 ****
  #endif
      }
  
!     FOR_ALL_WINDOWS(wp)
      {
  	if (wp->w_buffer == curbuf)
  	{
--- 2799,2805 ----
  #endif
      }
  
!     FOR_ALL_TAB_WINDOWS(tp, wp)
      {
  	if (wp->w_buffer == curbuf)
  	{
*** ../vim-7.2.160/src/misc2.c	Wed Mar 11 17:27:46 2009
--- src/misc2.c	Wed Apr 22 15:46:35 2009
***************
*** 1075,1085 ****
  
  #ifdef FEAT_QUICKFIX
      {
! 	win_T	*win;
  
  	qf_free_all(NULL);
  	/* Free all location lists */
! 	FOR_ALL_WINDOWS(win)
  	    qf_free_all(win);
      }
  #endif
--- 1075,1086 ----
  
  #ifdef FEAT_QUICKFIX
      {
! 	win_T	    *win;
! 	tabpage_T   *tab;
  
  	qf_free_all(NULL);
  	/* Free all location lists */
! 	FOR_ALL_TAB_WINDOWS(tab, win)
  	    qf_free_all(win);
      }
  #endif
*** ../vim-7.2.160/src/version.c	Wed Apr 22 18:43:06 2009
--- src/version.c	Wed Apr 29 10:59:01 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     161,
  /**/

-- 
CONCORDE:  Quickly, sir, come this way!
LAUNCELOT: No!  It's not right for my idiom.  I must escape more  ... more ...
CONCORDE:  Dramatically, sir?
LAUNCELOT: Dramatically.
                 "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    ///


--- NEW FILE 7.2.162 ---
To: vim-dev at vim.org
Subject: Patch 7.2.162
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.2.162
Problem:    The quickfix window may get wrong filetype.
Solution:   Do not detect the filetype for the quickfix window. (Lech Lorens)
Files:	    src/quickfix.c


*** ../vim-7.2.161/src/quickfix.c	Sun Feb 22 02:36:36 2009
--- src/quickfix.c	Wed Apr 22 17:34:57 2009
***************
*** 2346,2352 ****
  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
  								   OPT_LOCAL);
  	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
! 	    set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL);
  	}
  
  	/* Only set the height when still in the same tab page and there is no
--- 2346,2358 ----
  	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
  								   OPT_LOCAL);
  	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
! #ifdef FEAT_DIFF
! 	    curwin->w_p_diff = FALSE;
! #endif
! #ifdef FEAT_FOLDING
! 	    set_option_value((char_u *)"fdm", 0L, (char_u *)"manual",
! 								   OPT_LOCAL);
! #endif
  	}
  
  	/* Only set the height when still in the same tab page and there is no
***************
*** 2607,2616 ****
--- 2613,2624 ----
      curbuf->b_p_ma = FALSE;
  
  #ifdef FEAT_AUTOCMD
+     keep_filetype = TRUE;		/* don't detect 'filetype' */
      apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL,
  							       FALSE, curbuf);
      apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL,
  							       FALSE, curbuf);
+     keep_filetype = FALSE;
  #endif
  
      /* make sure it will be redrawn */
*** ../vim-7.2.161/src/version.c	Wed Apr 29 11:00:09 2009
--- src/version.c	Wed Apr 29 11:49:09 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     162,
  /**/

-- 
Yesterday is history.
Tomorrow is a mystery.
Today is a gift.
That's why it is called 'present'.

 /// 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    ///


--- NEW FILE 7.2.163 ---
To: vim-dev at vim.org
Subject: Patch 7.2.163
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.2.163
Problem:    The command line window may get folding.
Solution:   Default to no/manual folding. (Lech Lorens)
Files:	    src/ex_getln.c


*** ../vim-7.2.162/src/ex_getln.c	Wed Apr 22 13:50:14 2009
--- src/ex_getln.c	Wed Apr 22 16:12:54 2009
***************
*** 6073,6078 ****
--- 6073,6081 ----
      set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
      set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
      curbuf->b_p_ma = TRUE;
+ #ifdef FEAT_FOLDING
+     curwin->w_p_fen = FALSE;
+ #endif
  # ifdef FEAT_RIGHTLEFT
      curwin->w_p_rl = cmdmsg_rl;
      cmdmsg_rl = FALSE;
*** ../vim-7.2.162/src/version.c	Wed Apr 29 11:49:57 2009
--- src/version.c	Wed Apr 29 12:02:56 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     163,
  /**/

-- 
   [SIR LAUNCELOT runs back up the stairs, grabs a rope
   of the wall and swings out over the heads of the CROWD in a
   swashbuckling manner towards a large window.  He stops just short
   of the window and is left swing pathetically back and forth.]
LAUNCELOT: Excuse me ... could somebody give me a push ...
                 "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    ///


--- NEW FILE 7.2.164 ---
To: vim-dev at vim.org
Subject: Patch 7.2.164
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.2.164
Problem:    When 'showbreak' is set the size of the Visual block may be
	    reported wrong. (Eduardo Daudt Flach)
Solution:   Temporarily make 'sbr' empty.
Files:	    src/normal.c, src/ops.c


*** ../vim-7.2.163/src/normal.c	Sat Feb 21 20:27:00 2009
--- src/normal.c	Wed Apr 22 18:30:20 2009
***************
*** 3709,3721 ****
  #ifdef FEAT_VISUAL
      if (VIsual_active && !char_avail())
      {
! 	int		i = lt(VIsual, curwin->w_cursor);
  	long		lines;
  	colnr_T		leftcol, rightcol;
  	linenr_T	top, bot;
  
  	/* Show the size of the Visual area. */
! 	if (i)
  	{
  	    top = VIsual.lnum;
  	    bot = curwin->w_cursor.lnum;
--- 3709,3721 ----
  #ifdef FEAT_VISUAL
      if (VIsual_active && !char_avail())
      {
! 	int		cursor_bot = lt(VIsual, curwin->w_cursor);
  	long		lines;
  	colnr_T		leftcol, rightcol;
  	linenr_T	top, bot;
  
  	/* Show the size of the Visual area. */
! 	if (cursor_bot)
  	{
  	    top = VIsual.lnum;
  	    bot = curwin->w_cursor.lnum;
***************
*** 3734,3747 ****
  
  	if (VIsual_mode == Ctrl_V)
  	{
  	    getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol);
  	    sprintf((char *)showcmd_buf, "%ldx%ld", lines,
  					      (long)(rightcol - leftcol + 1));
  	}
  	else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum)
  	    sprintf((char *)showcmd_buf, "%ld", lines);
  	else
! 	    sprintf((char *)showcmd_buf, "%ld", (long)(i
  		    ? curwin->w_cursor.col - VIsual.col
  		    : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e'));
  	showcmd_buf[SHOWCMD_COLS] = NUL;	/* truncate */
--- 3734,3756 ----
  
  	if (VIsual_mode == Ctrl_V)
  	{
+ #ifdef FEAT_LINEBREAK
+ 	    char_u *saved_sbr = p_sbr;
+ 
+ 	    /* Make 'sbr' empty for a moment to get the correct size. */
+ 	    p_sbr = empty_option;
+ #endif
  	    getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol);
+ #ifdef FEAT_LINEBREAK
+ 	    p_sbr = saved_sbr;
+ #endif
  	    sprintf((char *)showcmd_buf, "%ldx%ld", lines,
  					      (long)(rightcol - leftcol + 1));
  	}
  	else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum)
  	    sprintf((char *)showcmd_buf, "%ld", lines);
  	else
! 	    sprintf((char *)showcmd_buf, "%ld", (long)(cursor_bot
  		    ? curwin->w_cursor.col - VIsual.col
  		    : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e'));
  	showcmd_buf[SHOWCMD_COLS] = NUL;	/* truncate */
*** ../vim-7.2.163/src/ops.c	Wed Apr 22 17:42:53 2009
--- src/ops.c	Wed Apr 22 18:30:07 2009
***************
*** 392,398 ****
      colnr_T		ws_vcol;
      int			i = 0, j = 0;
      int			len;
- 
  #ifdef FEAT_RIGHTLEFT
      int			old_p_ri = p_ri;
  
--- 392,397 ----
***************
*** 6284,6294 ****
--- 6283,6302 ----
  
  	    if (VIsual_mode == Ctrl_V)
  	    {
+ #ifdef FEAT_LINEBREAK
+ 		char_u * saved_sbr = p_sbr;
+ 
+ 		/* Make 'sbr' empty for a moment to get the correct size. */
+ 		p_sbr = empty_option;
+ #endif
  		oparg.is_VIsual = 1;
  		oparg.block_mode = TRUE;
  		oparg.op_type = OP_NOP;
  		getvcols(curwin, &min_pos, &max_pos,
  					  &oparg.start_vcol, &oparg.end_vcol);
+ #ifdef FEAT_LINEBREAK
+ 		p_sbr = saved_sbr;
+ #endif
  		if (curwin->w_curswant == MAXCOL)
  		    oparg.end_vcol = MAXCOL;
  		/* Swap the start, end vcol if needed */
*** ../vim-7.2.163/src/version.c	Wed Apr 29 12:03:35 2009
--- src/version.c	Wed Apr 29 17:38:05 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     164,
  /**/

-- 
There are 10 kinds of people: Those who understand binary and those who don't.

 /// 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    ///


--- NEW FILE 7.2.165 ---
To: vim-dev at vim.org
Subject: Patch 7.2.165
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.2.165
Problem:    The argument for the FuncUndefined autocmd event is expanded like
	    a file name.
Solution:   Don't try expanding it. (Wang Xu)
Files:	    src/fileio.c


*** ../vim-7.2.164/src/fileio.c	Wed Apr 29 11:00:09 2009
--- src/fileio.c	Wed Apr 29 18:01:06 2009
***************
*** 8785,8793 ****
      else
      {
  	sfname = vim_strsave(fname);
! 	/* Don't try expanding FileType, Syntax, WindowID or QuickFixCmd* */
  	if (event == EVENT_FILETYPE
  		|| event == EVENT_SYNTAX
  		|| event == EVENT_REMOTEREPLY
  		|| event == EVENT_SPELLFILEMISSING
  		|| event == EVENT_QUICKFIXCMDPRE
--- 8785,8795 ----
      else
      {
  	sfname = vim_strsave(fname);
! 	/* Don't try expanding FileType, Syntax, FuncUndefined, WindowID or
! 	 * QuickFixCmd* */
  	if (event == EVENT_FILETYPE
  		|| event == EVENT_SYNTAX
+ 		|| event == EVENT_FUNCUNDEFINED
  		|| event == EVENT_REMOTEREPLY
  		|| event == EVENT_SPELLFILEMISSING
  		|| event == EVENT_QUICKFIXCMDPRE
*** ../vim-7.2.164/src/version.c	Wed Apr 29 17:39:17 2009
--- src/version.c	Wed Apr 29 18:00:43 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     165,
  /**/

-- 
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    ///


--- NEW FILE 7.2.166 ---
To: vim-dev at vim.org
Subject: Patch 7.2.166
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.2.166
Problem:    No completion for ":sign" command.
Solution:   Add ":sign" completion. (Dominique Pelle)
Files:	    src/ex_cmds.c, src/ex_docmd.c, src/ex_getln.c, src/vim.h,
	    src/proto/ex_cmds.pro


*** ../vim-7.2.165/src/ex_cmds.c	Tue Feb 24 04:28:40 2009
--- src/ex_cmds.c	Wed Apr 29 17:08:27 2009
***************
*** 6543,6562 ****
  static void sign_list_defined __ARGS((sign_T *sp));
  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
  
! /*
!  * ":sign" command
!  */
!     void
! ex_sign(eap)
!     exarg_T	*eap;
! {
!     char_u	*arg = eap->arg;
!     char_u	*p;
!     int		idx;
!     sign_T	*sp;
!     sign_T	*sp_prev;
!     buf_T	*buf;
!     static char	*cmds[] = {
  			"define",
  #define SIGNCMD_DEFINE	0
  			"undefine",
--- 6543,6549 ----
  static void sign_list_defined __ARGS((sign_T *sp));
  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
  
! static char *cmds[] = {
  			"define",
  #define SIGNCMD_DEFINE	0
  			"undefine",
***************
*** 6569,6590 ****
  #define SIGNCMD_UNPLACE	4
  			"jump",
  #define SIGNCMD_JUMP	5
  #define SIGNCMD_LAST	6
!     };
  
      /* Parse the subcommand. */
      p = skiptowhite(arg);
!     if (*p != NUL)
! 	*p++ = NUL;
!     for (idx = 0; ; ++idx)
      {
! 	if (idx == SIGNCMD_LAST)
! 	{
! 	    EMSG2(_("E160: Unknown sign command: %s"), arg);
! 	    return;
! 	}
! 	if (STRCMP(arg, cmds[idx]) == 0)
! 	    break;
      }
      arg = skipwhite(p);
  
--- 6556,6606 ----
  #define SIGNCMD_UNPLACE	4
  			"jump",
  #define SIGNCMD_JUMP	5
+ 			NULL
  #define SIGNCMD_LAST	6
! };
! 
! /*
!  * Find index of a ":sign" subcmd from its name.
!  * "*end_cmd" must be writable.
!  */
!     static int
! sign_cmd_idx(begin_cmd, end_cmd)
!     char	*begin_cmd;	/* begin of sign subcmd */
!     char	*end_cmd;	/* just after sign subcmd */
! {
!     int		idx;
!     char	save = *end_cmd;
! 
!     *end_cmd = NUL;
!     for (idx = 0; ; ++idx)
! 	if (cmds[idx] == NULL || STRCMP(begin_cmd, cmds[idx]) == 0)
! 	    break;
!     *end_cmd = save;
!     return idx;
! }
! 
! /*
!  * ":sign" command
!  */
!     void
! ex_sign(eap)
!     exarg_T	*eap;
! {
!     char_u	*arg = eap->arg;
!     char_u	*p;
!     int		idx;
!     sign_T	*sp;
!     sign_T	*sp_prev;
!     buf_T	*buf;
  
      /* Parse the subcommand. */
      p = skiptowhite(arg);
!     idx = sign_cmd_idx(arg, p);
!     if (idx == SIGNCMD_LAST)
      {
! 	EMSG2(_("E160: Unknown sign command: %s"), arg);
! 	return;
      }
      arg = skipwhite(p);
  
***************
*** 7110,7115 ****
--- 7126,7311 ----
  }
  #endif
  
+ #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
+ static enum
+ {
+     EXP_SUBCMD,		/* expand :sign sub-commands */
+     EXP_DEFINE,		/* expand :sign define {name} args */
+     EXP_PLACE,		/* expand :sign place {id} args */
+     EXP_UNPLACE,	/* expand :sign unplace" */
+     EXP_SIGN_NAMES	/* expand with name of placed signs */
+ } expand_what;
+ 
+ /*
+  * Function given to ExpandGeneric() to obtain the sign command
+  * expansion.
+  */
+ /*ARGSUSED*/
+     char_u *
+ get_sign_name(xp, idx)
+     expand_T	*xp;
+     int		idx;
+ {
+     sign_T	*sp;
+     int		current_idx;
+ 
+     switch (expand_what)
+     {
+     case EXP_SUBCMD:
+ 	return (char_u *)cmds[idx];
+     case EXP_DEFINE:
+ 	{
+ 	    char *define_arg[] =
+ 	    {
+ 		"icon=", "linehl=", "text=", "texthl=", NULL
+ 	    };
+ 	    return (char_u *)define_arg[idx];
+ 	}
+     case EXP_PLACE:
+ 	{
+ 	    char *place_arg[] =
+ 	    {
+ 		"line=", "name=", "file=", "buffer=", NULL
+ 	    };
+ 	    return (char_u *)place_arg[idx];
+ 	}
+     case EXP_UNPLACE:
+ 	{
+ 	    char *unplace_arg[] = { "file=", "buffer=", NULL };
+ 	    return (char_u *)unplace_arg[idx];
+ 	}
+     case EXP_SIGN_NAMES:
+ 	/* Complete with name of signs already defined */
+ 	current_idx = 0;
+ 	for (sp = first_sign; sp != NULL; sp = sp->sn_next)
+ 	    if (current_idx++ == idx)
+ 		return sp->sn_name;
+ 	return NULL;
+     default:
+ 	return NULL;
+     }
+ }
+ 
+ /*
+  * Handle command line completion for :sign command.
+  */
+     void
+ set_context_in_sign_cmd(xp, arg)
+     expand_T	*xp;
+     char_u	*arg;
+ {
+     char_u	*p;
+     char_u	*end_subcmd;
+     char_u	*last;
+     int		cmd_idx;
+     char_u	*begin_subcmd_args;
+ 
+     /* Default: expand subcommands. */
+     xp->xp_context = EXPAND_SIGN;
+     expand_what = EXP_SUBCMD;
+     xp->xp_pattern = arg;
+ 
+     end_subcmd = skiptowhite(arg);
+     if (*end_subcmd == NUL)
+ 	/* expand subcmd name
+ 	 * :sign {subcmd}<CTRL-D>*/
+ 	return;
+ 
+     cmd_idx = sign_cmd_idx(arg, end_subcmd);
+ 
+     /* :sign {subcmd} {subcmd_args}
+      *                |
+      *                begin_subcmd_args */
+     begin_subcmd_args = skipwhite(end_subcmd);
+     p = skiptowhite(begin_subcmd_args);
+     if (*p == NUL)
+     {
+ 	/*
+ 	 * Expand first argument of subcmd when possible.
+ 	 * For ":jump {id}" and ":unplace {id}", we could
+ 	 * possibly expand the ids of all signs already placed.
+ 	 */
+ 	xp->xp_pattern = begin_subcmd_args;
+ 	switch (cmd_idx)
+ 	{
+ 	    case SIGNCMD_LIST:
+ 	    case SIGNCMD_UNDEFINE:
+ 		/* :sign list <CTRL-D>
+ 		 * :sign undefine <CTRL-D> */
+ 		expand_what = EXP_SIGN_NAMES;
+ 		break;
+ 	    default:
+ 		xp->xp_context = EXPAND_NOTHING;
+ 	}
+ 	return;
+     }
+ 
+     /* expand last argument of subcmd */
+ 
+     /* :sign define {name} {args}...
+      *              |
+      *              p */
+ 
+     /* Loop until reaching last argument. */
+     do
+     {
+ 	p = skipwhite(p);
+ 	last = p;
+ 	p = skiptowhite(p);
+     } while (*p != NUL);
+ 
+     p = vim_strchr(last, '=');
+ 
+     /* :sign define {name} {args}... {last}=
+      *                               |     |
+      *                            last     p */
+     if (p == NUL)
+     {
+ 	/* Expand last argument name (before equal sign). */
+ 	xp->xp_pattern = last;
+ 	switch (cmd_idx)
+ 	{
+ 	    case SIGNCMD_DEFINE:
+ 		expand_what = EXP_DEFINE;
+ 		break;
+ 	    case SIGNCMD_PLACE:
+ 		expand_what = EXP_PLACE;
+ 		break;
+ 	    case SIGNCMD_JUMP:
+ 	    case SIGNCMD_UNPLACE:
+ 		expand_what = EXP_UNPLACE;
+ 		break;
+ 	    default:
+ 		xp->xp_context = EXPAND_NOTHING;
+ 	}
+     }
+     else
+     {
+ 	/* Expand last argument value (after equal sign). */
+ 	xp->xp_pattern = p + 1;
+ 	switch (cmd_idx)
+ 	{
+ 	    case SIGNCMD_DEFINE:
+ 		if (STRNCMP(last, "texthl", p - last) == 0 ||
+ 		    STRNCMP(last, "linehl", p - last) == 0)
+ 		    xp->xp_context = EXPAND_HIGHLIGHT;
+ 		else if (STRNCMP(last, "icon", p - last) == 0)
+ 		    xp->xp_context = EXPAND_FILES;
+ 		else
+ 		    xp->xp_context = EXPAND_NOTHING;
+ 		break;
+ 	    case SIGNCMD_PLACE:
+ 		if (STRNCMP(last, "name", p - last) == 0)
+ 		    expand_what = EXP_SIGN_NAMES;
+ 		else
+ 		    xp->xp_context = EXPAND_NOTHING;
+ 		break;
+ 	    default:
+ 		xp->xp_context = EXPAND_NOTHING;
+ 	}
+     }
+ }
+ #endif
  #endif
  
  #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO)
*** ../vim-7.2.165/src/ex_docmd.c	Wed Apr 22 16:22:44 2009
--- src/ex_docmd.c	Wed Apr 29 17:05:23 2009
***************
*** 3695,3700 ****
--- 3695,3705 ----
  	    set_context_in_cscope_cmd(xp, arg, ea.cmdidx);
  	    break;
  #endif
+ #ifdef FEAT_SIGNS
+ 	case CMD_sign:
+ 	    set_context_in_sign_cmd(xp, arg);
+ 	    break;
+ #endif
  #ifdef FEAT_LISTCMDS
  	case CMD_bdelete:
  	case CMD_bwipeout:
***************
*** 5218,5223 ****
--- 5223,5231 ----
      {EXPAND_MENUS, "menu"},
      {EXPAND_SETTINGS, "option"},
      {EXPAND_SHELLCMD, "shellcmd"},
+ #if defined(FEAT_SIGNS)
+     {EXPAND_SIGN, "sign"},
+ #endif
      {EXPAND_TAGS, "tag"},
      {EXPAND_TAGS_LISTFILES, "tag_listfiles"},
      {EXPAND_USER_VARS, "var"},
*** ../vim-7.2.165/src/ex_getln.c	Wed Apr 29 12:03:35 2009
--- src/ex_getln.c	Wed Apr 29 12:51:42 2009
***************
*** 325,331 ****
  #endif
  
  #ifdef FEAT_DIGRAPHS
!     do_digraph(-1);		/* init digraph typahead */
  #endif
  
      /*
--- 325,331 ----
  #endif
  
  #ifdef FEAT_DIGRAPHS
!     do_digraph(-1);		/* init digraph typeahead */
  #endif
  
      /*
***************
*** 4521,4526 ****
--- 4521,4529 ----
  #ifdef FEAT_CSCOPE
  	    {EXPAND_CSCOPE, get_cscope_name, TRUE},
  #endif
+ #ifdef FEAT_SIGNS
+ 	    {EXPAND_SIGN, get_sign_name, TRUE},
+ #endif
  #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
  	&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
  	    {EXPAND_LANGUAGE, get_lang_arg, TRUE},
*** ../vim-7.2.165/src/vim.h	Wed Mar 18 12:50:58 2009
--- src/vim.h	Wed Apr 29 12:51:42 2009
***************
*** 709,714 ****
--- 709,715 ----
  #define EXPAND_USER_LIST	31
  #define EXPAND_SHELLCMD		32
  #define EXPAND_CSCOPE		33
+ #define EXPAND_SIGN		34
  
  /* Values for exmode_active (0 is no exmode) */
  #define EXMODE_NORMAL		1
*** ../vim-7.2.165/src/proto/ex_cmds.pro	Tue Feb 24 04:28:40 2009
--- src/proto/ex_cmds.pro	Wed Apr 29 17:10:29 2009
***************
*** 40,46 ****
  int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
  void write_viminfo_sub_string __ARGS((FILE *fp));
  void free_old_sub __ARGS((void));
- void free_signs __ARGS((void));
  int prepare_tagpreview __ARGS((int undo_sync));
  void ex_help __ARGS((exarg_T *eap));
  char_u *check_help_lang __ARGS((char_u *arg));
--- 40,45 ----
***************
*** 56,60 ****
--- 55,62 ----
  char_u *sign_get_text __ARGS((int typenr));
  void *sign_get_image __ARGS((int typenr));
  char_u *sign_typenr2name __ARGS((int typenr));
+ void free_signs __ARGS((void));
+ char_u *get_sign_name __ARGS((expand_T *xp, int idx));
+ void set_context_in_sign_cmd __ARGS((expand_T *xp, char_u *arg));
  void ex_drop __ARGS((exarg_T *eap));
  /* vim: set ft=c : */
*** ../vim-7.2.165/src/version.c	Wed Apr 29 18:01:23 2009
--- src/version.c	Wed Apr 29 18:43:14 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     166,
  /**/

-- 
Did you ever stop to think...  and forget to start again?
                                  -- Steven Wright

 /// 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    ///


--- NEW FILE 7.2.167 ---
To: vim-dev at vim.org
Subject: Patch 7.2.167
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.167
Problem:    Splint doesn't work well for checking the code.
Solution:   Add splint arguments in the Makefile.  Exclude some code from
	    splint that it can't handle.  Tune splint arguments to give
	    reasonable errors.  Add a filter for removing false warnings from
	    splint output.  Many small changes to avoid warnings.  More to
	    follow...
Files:	    Filelist, src/Makefile, src/buffer.c, src/charset.c,
	    src/cleanlint.vim, src/digraph.c, src/edit.c, src/ex_cmds.c,
	    src/globals.h, src/ops.c, src/os_unix.c, src/os_unix.h,
	    src/proto/buffer.pro, src/proto/edit.pro, src/screen.c,
	    src/structs.h

*** ../vim-7.2.166/Filelist	2008-09-20 16:26:10.000000000 +0200
--- Filelist	2009-05-05 21:45:49.000000000 +0200
***************
*** 139,144 ****
--- 139,145 ----
  		src/INSTALL \
  		src/INSTALLx.txt \
  		src/Makefile \
+ 		src/cleanlint.vim \
  		src/auto/configure \
  		src/config.aap.in \
  		src/config.h.in \
***************
*** 683,691 ****
  		runtime/spell/??/main.aap \
  		runtime/spell/yi/README.txt \
  		runtime/spell/main.aap \
- 		runtime/spell/cleanadd.vim \
  		runtime/spell/*.vim \
- 		runtime/spell/fixdup \
  
  # generic language files, binary
  LANG_GEN_BIN = \
--- 684,690 ----
*** ../vim-7.2.166/src/Makefile	2009-04-29 18:44:45.000000000 +0200
--- src/Makefile	2009-05-06 00:23:15.000000000 +0200
***************
*** 551,557 ****
  # }}}
  
  # LINT - for running lint
! LINT_OPTIONS = -beprxzF
  
  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
  # Might not work with GUI or Perl.
--- 551,562 ----
  # }}}
  
  # LINT - for running lint
! #  For standard lint
! #LINT = lint
! #LINT_OPTIONS = -beprxzF
! #  For splint  (see cleanlint.vim for filtering the output)
! LINT = splint
! LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
  
  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
  # Might not work with GUI or Perl.
***************
*** 1259,1274 ****
  #     This is for cproto 3 patchlevel 8 or below
  #     __inline, __attribute__ and __extension__ are not recognized by cproto
  #     G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h.
! NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \
! 	  -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
! 	  -D__extension__= -D__restrict="" \
! 	  -D__gnuc_va_list=char -D__builtin_va_list=char
  
  #
! #     This is for cproto 3 patchlevel 9 or above (currently 4.6)
  #     __inline and __attribute__ are now recognized by cproto
  #     -D"foo()=" is not supported by all compilers so do not use it
! # NO_ATTR=
  #
  #     maybe the "/usr/bin/cc -E" has to be adjusted for some systems
  # This is for cproto 3.5 patchlevel 3:
--- 1264,1279 ----
  #     This is for cproto 3 patchlevel 8 or below
  #     __inline, __attribute__ and __extension__ are not recognized by cproto
  #     G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h.
! #NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \
! #	  -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
! #	  -D__extension__= -D__restrict="" \
! #	  -D__gnuc_va_list=char -D__builtin_va_list=char
  
  #
! #     This is for cproto 3 patchlevel 9 or above (currently 4.6, 4.7g)
  #     __inline and __attribute__ are now recognized by cproto
  #     -D"foo()=" is not supported by all compilers so do not use it
! NO_ATTR=
  #
  #     maybe the "/usr/bin/cc -E" has to be adjusted for some systems
  # This is for cproto 3.5 patchlevel 3:
***************
*** 1432,1437 ****
--- 1437,1443 ----
  	$(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(NETBEANS_SRC)
  #LINT_SRC = $(SRC)
  #LINT_SRC = $(ALL_SRC)
+ #LINT_SRC = $(BASIC_SRC)
  
  OBJ = \
  	objects/buffer.o \
***************
*** 2272,2283 ****
  
  # Run lint.  Clean up the *.ln files that are sometimes left behind.
  lint:
! 	lint $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)
  	-rm -f *.ln
  
  # Check dosinst.c with lint.
  lintinstall:
! 	lint $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c
  	-rm -f dosinst.ln
  
  ###########################################################################
--- 2279,2290 ----
  
  # Run lint.  Clean up the *.ln files that are sometimes left behind.
  lint:
! 	$(LINT) $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)
  	-rm -f *.ln
  
  # Check dosinst.c with lint.
  lintinstall:
! 	$(LINT) $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c
  	-rm -f dosinst.ln
  
  ###########################################################################
*** ../vim-7.2.166/src/buffer.c	2009-02-22 00:01:42.000000000 +0100
--- src/buffer.c	2009-05-13 12:25:29.000000000 +0200
***************
*** 44,49 ****
--- 44,50 ----
  #ifdef FEAT_TITLE
  static int	ti_change __ARGS((char_u *str, char_u **last));
  #endif
+ static int	append_arg_number __ARGS((win_T *wp, char_u *buf, int buflen, int add_file));
  static void	free_buffer __ARGS((buf_T *));
  static void	free_buffer_stuff __ARGS((buf_T *buf, int free_options));
  static void	clear_wininfo __ARGS((buf_T *buf));
***************
*** 1453,1465 ****
  
  #ifdef FEAT_KEYMAP
      if (curbuf->b_kmap_state & KEYMAP_INIT)
! 	keymap_init();
  #endif
  #ifdef FEAT_SPELL
      /* May need to set the spell language.  Can only do this after the buffer
       * has been properly setup. */
      if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! 	did_set_spelllang(curbuf);
  #endif
  
      redraw_later(NOT_VALID);
--- 1454,1466 ----
  
  #ifdef FEAT_KEYMAP
      if (curbuf->b_kmap_state & KEYMAP_INIT)
! 	(void)keymap_init();
  #endif
  #ifdef FEAT_SPELL
      /* May need to set the spell language.  Can only do this after the buffer
       * has been properly setup. */
      if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! 	(void)did_set_spelllang(curbuf);
  #endif
  
      redraw_later(NOT_VALID);
***************
*** 2516,2522 ****
      buf_T	*buf;
  {
      wininfo_T	*wip;
!     static pos_T no_position = {1, 0};
  
      wip = find_wininfo(buf, FALSE);
      if (wip != NULL)
--- 2517,2523 ----
      buf_T	*buf;
  {
      wininfo_T	*wip;
!     static pos_T no_position = INIT_POS_T(1, 0, 0);
  
      wip = find_wininfo(buf, FALSE);
      if (wip != NULL)
***************
*** 2577,2584 ****
  	{
  	    IObuff[len++] = ' ';
  	} while (--i > 0 && len < IOSIZE - 18);
! 	vim_snprintf((char *)IObuff + len, IOSIZE - len, _("line %ld"),
! 		buf == curbuf ? curwin->w_cursor.lnum
  					       : (long)buflist_findlnum(buf));
  	msg_outtrans(IObuff);
  	out_flush();	    /* output one line at a time */
--- 2578,2585 ----
  	{
  	    IObuff[len++] = ' ';
  	} while (--i > 0 && len < IOSIZE - 18);
! 	vim_snprintf((char *)IObuff + len, (size_t)(IOSIZE - len),
! 		_("line %ld"), buf == curbuf ? curwin->w_cursor.lnum
  					       : (long)buflist_findlnum(buf));
  	msg_outtrans(IObuff);
  	out_flush();	    /* output one line at a time */
***************
*** 2967,2973 ****
  
      if (fullname > 1)	    /* 2 CTRL-G: include buffer number */
      {
! 	sprintf((char *)buffer, "buf %d: ", curbuf->b_fnum);
  	p = buffer + STRLEN(buffer);
      }
      else
--- 2968,2974 ----
  
      if (fullname > 1)	    /* 2 CTRL-G: include buffer number */
      {
! 	vim_snprintf((char *)buffer, IOSIZE, "buf %d: ", curbuf->b_fnum);
  	p = buffer + STRLEN(buffer);
      }
      else
***************
*** 3041,3051 ****
  		(long)curbuf->b_ml.ml_line_count,
  		n);
  	validate_virtcol();
! 	col_print(buffer + STRLEN(buffer),
  		   (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1);
      }
  
!     (void)append_arg_number(curwin, buffer, !shortmess(SHM_FILE), IOSIZE);
  
      if (dont_truncate)
      {
--- 3042,3053 ----
  		(long)curbuf->b_ml.ml_line_count,
  		n);
  	validate_virtcol();
! 	len = STRLEN(buffer);
! 	col_print(buffer + len, IOSIZE - len,
  		   (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1);
      }
  
!     (void)append_arg_number(curwin, buffer, IOSIZE, !shortmess(SHM_FILE));
  
      if (dont_truncate)
      {
***************
*** 3073,3087 ****
  }
  
      void
! col_print(buf, col, vcol)
      char_u  *buf;
      int	    col;
      int	    vcol;
  {
      if (col == vcol)
! 	sprintf((char *)buf, "%d", col);
      else
! 	sprintf((char *)buf, "%d-%d", col, vcol);
  }
  
  #if defined(FEAT_TITLE) || defined(PROTO)
--- 3075,3090 ----
  }
  
      void
! col_print(buf, buflen, col, vcol)
      char_u  *buf;
+     size_t  buflen;
      int	    col;
      int	    vcol;
  {
      if (col == vcol)
! 	vim_snprintf((char *)buf, buflen, "%d", col);
      else
! 	vim_snprintf((char *)buf, buflen, "%d-%d", col, vcol);
  }
  
  #if defined(FEAT_TITLE) || defined(PROTO)
***************
*** 3194,3211 ****
  		if (p == buf + off)
  		    /* must be a help buffer */
  		    vim_strncpy(buf + off, (char_u *)_("help"),
! 							    IOSIZE - off - 1);
  		else
  		    *p = NUL;
  
  		/* translate unprintable chars */
  		p = transstr(buf + off);
! 		vim_strncpy(buf + off, p, IOSIZE - off - 1);
  		vim_free(p);
  		STRCAT(buf, ")");
  	    }
  
! 	    append_arg_number(curwin, buf, FALSE, IOSIZE);
  
  #if defined(FEAT_CLIENTSERVER)
  	    if (serverName != NULL)
--- 3197,3214 ----
  		if (p == buf + off)
  		    /* must be a help buffer */
  		    vim_strncpy(buf + off, (char_u *)_("help"),
! 						  (size_t)(IOSIZE - off - 1));
  		else
  		    *p = NUL;
  
  		/* translate unprintable chars */
  		p = transstr(buf + off);
! 		vim_strncpy(buf + off, p, (size_t)(IOSIZE - off - 1));
  		vim_free(p);
  		STRCAT(buf, ")");
  	    }
  
! 	    append_arg_number(curwin, buf, IOSIZE, FALSE);
  
  #if defined(FEAT_CLIENTSERVER)
  	    if (serverName != NULL)
***************
*** 3520,3526 ****
  		    n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1;
  
  		*t = '<';
! 		mch_memmove(t + 1, t + n, p - (t + n));
  		p = p - n + 1;
  #ifdef FEAT_MBYTE
  		/* Fill up space left over by half a double-wide char. */
--- 3523,3529 ----
  		    n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1;
  
  		*t = '<';
! 		mch_memmove(t + 1, t + n, (size_t)(p - (t + n)));
  		p = p - n + 1;
  #ifdef FEAT_MBYTE
  		/* Fill up space left over by half a double-wide char. */
***************
*** 3550,3556 ****
  		else
  		{
  		    /* fill by inserting characters */
! 		    mch_memmove(t + n - l, t, p - t);
  		    l = n - l;
  		    if (p + l >= out + outlen)
  			l = (long)((out + outlen) - p - 1);
--- 3553,3559 ----
  		else
  		{
  		    /* fill by inserting characters */
! 		    mch_memmove(t + n - l, t, (size_t)(p - t));
  		    l = n - l;
  		    if (p + l >= out + outlen)
  			l = (long)((out + outlen) - p - 1);
***************
*** 3686,3692 ****
  	    p = t;
  
  #ifdef FEAT_EVAL
! 	    sprintf((char *)tmp, "%d", curbuf->b_fnum);
  	    set_internal_string_var((char_u *)"actual_curbuf", tmp);
  
  	    o_curbuf = curbuf;
--- 3689,3695 ----
  	    p = t;
  
  #ifdef FEAT_EVAL
! 	    vim_snprintf((char *)tmp, sizeof(tmp), "%d", curbuf->b_fnum);
  	    set_internal_string_var((char_u *)"actual_curbuf", tmp);
  
  	    o_curbuf = curbuf;
***************
*** 3753,3765 ****
  
  	case STL_ALTPERCENT:
  	    str = tmp;
! 	    get_rel_pos(wp, str);
  	    break;
  
  	case STL_ARGLISTSTAT:
  	    fillable = FALSE;
  	    tmp[0] = 0;
! 	    if (append_arg_number(wp, tmp, FALSE, (int)sizeof(tmp)))
  		str = tmp;
  	    break;
  
--- 3756,3768 ----
  
  	case STL_ALTPERCENT:
  	    str = tmp;
! 	    get_rel_pos(wp, str, TMPLEN);
  	    break;
  
  	case STL_ARGLISTSTAT:
  	    fillable = FALSE;
  	    tmp[0] = 0;
! 	    if (append_arg_number(wp, tmp, (int)sizeof(tmp), FALSE))
  		str = tmp;
  	    break;
  
***************
*** 3794,3800 ****
  	case STL_BYTEVAL_X:
  	    base = 'X';
  	case STL_BYTEVAL:
! 	    if (wp->w_cursor.col > STRLEN(linecont))
  		num = 0;
  	    else
  	    {
--- 3797,3803 ----
  	case STL_BYTEVAL_X:
  	    base = 'X';
  	case STL_BYTEVAL:
! 	    if (wp->w_cursor.col > (colnr_T)STRLEN(linecont))
  		num = 0;
  	    else
  	    {
***************
*** 3967,3973 ****
  	    if (zeropad)
  		*t++ = '0';
  	    *t++ = '*';
! 	    *t++ = nbase == 16 ? base : (nbase == 8 ? 'o' : 'd');
  	    *t = 0;
  
  	    for (n = num, l = 1; n >= nbase; n /= nbase)
--- 3970,3976 ----
  	    if (zeropad)
  		*t++ = '0';
  	    *t++ = '*';
! 	    *t++ = nbase == 16 ? base : (char_u)(nbase == 8 ? 'o' : 'd');
  	    *t = 0;
  
  	    for (n = num, l = 1; n >= nbase; n /= nbase)
***************
*** 4160,4172 ****
  #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \
  	    || defined(FEAT_GUI_TABLINE) || defined(PROTO)
  /*
!  * Get relative cursor position in window into "str[]", in the form 99%, using
!  * "Top", "Bot" or "All" when appropriate.
   */
      void
! get_rel_pos(wp, str)
      win_T	*wp;
!     char_u	*str;
  {
      long	above; /* number of lines above window */
      long	below; /* number of lines below window */
--- 4163,4176 ----
  #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \
  	    || defined(FEAT_GUI_TABLINE) || defined(PROTO)
  /*
!  * Get relative cursor position in window into "buf[buflen]", in the form 99%,
!  * using "Top", "Bot" or "All" when appropriate.
   */
      void
! get_rel_pos(wp, buf, buflen)
      win_T	*wp;
!     char_u	*buf;
!     int		buflen;
  {
      long	above; /* number of lines above window */
      long	below; /* number of lines below window */
***************
*** 4177,4210 ****
  #endif
      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
      if (below <= 0)
! 	STRCPY(str, above == 0 ? _("All") : _("Bot"));
      else if (above <= 0)
! 	STRCPY(str, _("Top"));
      else
! 	sprintf((char *)str, "%2d%%", above > 1000000L
  				    ? (int)(above / ((above + below) / 100L))
  				    : (int)(above * 100L / (above + below)));
  }
  #endif
  
  /*
!  * Append (file 2 of 8) to 'buf', if editing more than one file.
   * Return TRUE if it was appended.
   */
!     int
! append_arg_number(wp, buf, add_file, maxlen)
      win_T	*wp;
      char_u	*buf;
      int		add_file;	/* Add "file" before the arg number */
-     int		maxlen;		/* maximum nr of chars in buf or zero*/
  {
      char_u	*p;
  
      if (ARGCOUNT <= 1)		/* nothing to do */
  	return FALSE;
  
!     p = buf + STRLEN(buf);		/* go to the end of the buffer */
!     if (maxlen && p - buf + 35 >= maxlen) /* getting too long */
  	return FALSE;
      *p++ = ' ';
      *p++ = '(';
--- 4181,4215 ----
  #endif
      below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
      if (below <= 0)
! 	vim_strncpy(buf, (char_u *)(above == 0 ? _("All") : _("Bot")),
! 							(size_t)(buflen - 1));
      else if (above <= 0)
! 	vim_strncpy(buf, (char_u *)_("Top"), (size_t)(buflen - 1));
      else
! 	vim_snprintf((char *)buf, (size_t)buflen, "%2d%%", above > 1000000L
  				    ? (int)(above / ((above + below) / 100L))
  				    : (int)(above * 100L / (above + below)));
  }
  #endif
  
  /*
!  * Append (file 2 of 8) to "buf[buflen]", if editing more than one file.
   * Return TRUE if it was appended.
   */
!     static int
! append_arg_number(wp, buf, buflen, add_file)
      win_T	*wp;
      char_u	*buf;
+     int		buflen;
      int		add_file;	/* Add "file" before the arg number */
  {
      char_u	*p;
  
      if (ARGCOUNT <= 1)		/* nothing to do */
  	return FALSE;
  
!     p = buf + STRLEN(buf);	/* go to the end of the buffer */
!     if (p - buf + 35 >= buflen)	/* getting too long */
  	return FALSE;
      *p++ = ' ';
      *p++ = '(';
***************
*** 4213,4219 ****
  	STRCPY(p, "file ");
  	p += 5;
      }
!     sprintf((char *)p, wp->w_arg_idx_invalid ? "(%d) of %d)"
  				  : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);
      return TRUE;
  }
--- 4218,4225 ----
  	STRCPY(p, "file ");
  	p += 5;
      }
!     vim_snprintf((char *)p, (size_t)(buflen - (p - buf)),
! 		wp->w_arg_idx_invalid ? "(%d) of %d)"
  				  : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);
      return TRUE;
  }
***************
*** 4996,5002 ****
  	if (tab != NULL)
  	{
  	    *tab++ = '\0';
! 	    col = atoi((char *)tab);
  	    tab = vim_strrchr(xline, '\t');
  	    if (tab != NULL)
  	    {
--- 5002,5008 ----
  	if (tab != NULL)
  	{
  	    *tab++ = '\0';
! 	    col = (colnr_T)atoi((char *)tab);
  	    tab = vim_strrchr(xline, '\t');
  	    if (tab != NULL)
  	    {
***************
*** 5034,5039 ****
--- 5040,5046 ----
  #endif
      char_u	*line;
      int		max_buffers;
+     size_t	len;
  
      if (find_viminfo_parameter('%') == NULL)
  	return;
***************
*** 5042,5048 ****
      max_buffers = get_viminfo_parameter('%');
  
      /* Allocate room for the file name, lnum and col. */
!     line = alloc(MAXPATHL + 40);
      if (line == NULL)
  	return;
  
--- 5049,5056 ----
      max_buffers = get_viminfo_parameter('%');
  
      /* Allocate room for the file name, lnum and col. */
! #define LINE_BUF_LEN (MAXPATHL + 40)
!     line = alloc(LINE_BUF_LEN);
      if (line == NULL)
  	return;
  
***************
*** 5068,5074 ****
  	    break;
  	putc('%', fp);
  	home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);
! 	sprintf((char *)line + STRLEN(line), "\t%ld\t%d",
  			(long)buf->b_last_cursor.lnum,
  			buf->b_last_cursor.col);
  	viminfo_writestring(fp, line);
--- 5076,5083 ----
  	    break;
  	putc('%', fp);
  	home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);
! 	len = STRLEN(line);
! 	vim_snprintf((char *)line + len, len - LINE_BUF_LEN, "\t%ld\t%d",
  			(long)buf->b_last_cursor.lnum,
  			buf->b_last_cursor.col);
  	viminfo_writestring(fp, line);
***************
*** 5226,5232 ****
      return;
  }
  
!     int
  buf_change_sign_type(buf, markId, typenr)
      buf_T	*buf;		/* buffer to store sign in */
      int		markId;		/* sign ID */
--- 5235,5241 ----
      return;
  }
  
!     linenr_T
  buf_change_sign_type(buf, markId, typenr)
      buf_T	*buf;		/* buffer to store sign in */
      int		markId;		/* sign ID */
***************
*** 5243,5252 ****
  	}
      }
  
!     return 0;
  }
  
!     int_u
  buf_getsigntype(buf, lnum, type)
      buf_T	*buf;
      linenr_T	lnum;
--- 5252,5261 ----
  	}
      }
  
!     return (linenr_T)0;
  }
  
!     int
  buf_getsigntype(buf, lnum, type)
      buf_T	*buf;
      linenr_T	lnum;
*** ../vim-7.2.166/src/charset.c	2008-07-24 21:30:44.000000000 +0200
--- src/charset.c	2009-05-05 18:17:11.000000000 +0200
***************
*** 17,23 ****
  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
  #endif
  
! static int nr2hex __ARGS((int c));
  
  static int    chartab_initialized = FALSE;
  
--- 17,23 ----
  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
  #endif
  
! static unsigned nr2hex __ARGS((unsigned c));
  
  static int    chartab_initialized = FALSE;
  
***************
*** 664,670 ****
      }
  #endif
      buf[++i] = nr2hex((unsigned)c >> 4);
!     buf[++i] = nr2hex(c);
      buf[++i] = '>';
      buf[++i] = NUL;
  }
--- 664,670 ----
      }
  #endif
      buf[++i] = nr2hex((unsigned)c >> 4);
!     buf[++i] = nr2hex((unsigned)c);
      buf[++i] = '>';
      buf[++i] = NUL;
  }
***************
*** 674,682 ****
   * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or
   * function key 1.
   */
!     static int
  nr2hex(c)
!     int		c;
  {
      if ((c & 0xf) <= 9)
  	return (c & 0xf) + '0';
--- 674,682 ----
   * Lower case letters are used to avoid the confusion of <F1> being 0xf1 or
   * function key 1.
   */
!     static unsigned
  nr2hex(c)
!     unsigned	c;
  {
      if ((c & 0xf) <= 9)
  	return (c & 0xf) + '0';
***************
*** 884,890 ****
      if (c >= 0x100)
      {
  	if (enc_dbcs != 0)
! 	    return dbcs_class((unsigned)c >> 8, c & 0xff) >= 2;
  	if (enc_utf8)
  	    return utf_class(c) >= 2;
      }
--- 884,890 ----
      if (c >= 0x100)
      {
  	if (enc_dbcs != 0)
! 	    return dbcs_class((unsigned)c >> 8, (unsigned)(c & 0xff)) >= 2;
  	if (enc_utf8)
  	    return utf_class(c) >= 2;
      }
***************
*** 1090,1096 ****
  	 */
  	numberextra = win_col_off(wp);
  	col2 = col;
! 	colmax = W_WIDTH(wp) - numberextra;
  	if (col >= colmax)
  	{
  	    n = colmax + win_col_off2(wp);
--- 1090,1096 ----
  	 */
  	numberextra = win_col_off(wp);
  	col2 = col;
! 	colmax = (colnr_T)(W_WIDTH(wp) - numberextra);
  	if (col >= colmax)
  	{
  	    n = colmax + win_col_off2(wp);
***************
*** 1201,1217 ****
      win_T	*wp;
      colnr_T	vcol;
  {
!     colnr_T	width1;		/* width of first line (after line number) */
!     colnr_T	width2;		/* width of further lines */
  
  #ifdef FEAT_VERTSPLIT
      if (wp->w_width == 0)	/* there is no border */
  	return FALSE;
  #endif
      width1 = W_WIDTH(wp) - win_col_off(wp);
!     if (vcol < width1 - 1)
  	return FALSE;
!     if (vcol == width1 - 1)
  	return TRUE;
      width2 = width1 + win_col_off2(wp);
      return ((vcol - width1) % width2 == width2 - 1);
--- 1201,1217 ----
      win_T	*wp;
      colnr_T	vcol;
  {
!     int		width1;		/* width of first line (after line number) */
!     int		width2;		/* width of further lines */
  
  #ifdef FEAT_VERTSPLIT
      if (wp->w_width == 0)	/* there is no border */
  	return FALSE;
  #endif
      width1 = W_WIDTH(wp) - win_col_off(wp);
!     if ((int)vcol < width1 - 1)
  	return FALSE;
!     if ((int)vcol == width1 - 1)
  	return TRUE;
      width2 = width1 + win_col_off2(wp);
      return ((vcol - width1) % width2 == width2 - 1);
***************
*** 1396,1408 ****
  # ifdef FEAT_MBYTE
  	/* Cannot put the cursor on part of a wide character. */
  	ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
! 	if (pos->col < STRLEN(ptr))
  	{
  	    int c = (*mb_ptr2char)(ptr + pos->col);
  
  	    if (c != TAB && vim_isprintc(c))
  	    {
! 		endadd = char2cells(c) - 1;
  		if (coladd > endadd)	/* past end of line */
  		    endadd = 0;
  		else
--- 1396,1408 ----
  # ifdef FEAT_MBYTE
  	/* Cannot put the cursor on part of a wide character. */
  	ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
! 	if (pos->col < (colnr_T)STRLEN(ptr))
  	{
  	    int c = (*mb_ptr2char)(ptr + pos->col);
  
  	    if (c != TAB && vim_isprintc(c))
  	    {
! 		endadd = (colnr_T)(char2cells(c) - 1);
  		if (coladd > endadd)	/* past end of line */
  		    endadd = 0;
  		else
*** ../vim-7.2.166/src/cleanlint.vim	2009-05-13 12:08:12.000000000 +0200
--- src/cleanlint.vim	2009-05-05 21:34:01.000000000 +0200
***************
*** 0 ****
--- 1,27 ----
+ " Vim tool: Filter output of splint
+ "
+ " Maintainer:	Bram Moolenaar <Bram at vim.org>
+ " Last Change:	2009 May 05
+ 
+ " Usage: redirect output of "make lint" to a file, edit that file with Vim and
+ " :call CleanLint()
+ " This deletes irrelevant messages.  What remains might be valid warnings.
+ 
+ fun! CleanLint()
+   g/^  Types are incompatible/lockmarks d
+   g/Assignment of dev_t to __dev_t:/lockmarks d
+   g/Assignment of __dev_t to dev_t:/lockmarks d
+   g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
+   g/Operands of == have incompatible types (unsigned int, int): /lockmarks d
+   g/Assignment of char to char_u: /lockmarks d
+   g/Assignment of unsigned int to int: /lockmarks d
+   g/Assignment of colnr_T to int: /lockmarks d
+   g/Assignment of int to char_u: /lockmarks d
+   g/Function .* expects arg . to be wint_t gets int: /lockmarks d
+   g/^digraph.c.*digraphdefault.*is type char, expects char_u:/lockmarks d
+   g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
+   g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
+   g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
+   g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
+   g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
+ endfun
*** ../vim-7.2.166/src/digraph.c	2008-06-25 00:26:41.000000000 +0200
--- src/digraph.c	2009-05-05 20:32:43.000000000 +0200
***************
*** 32,38 ****
  static void printdigraph __ARGS((digr_T *));
  
  /* digraphs added by the user */
! static garray_T	user_digraphs = {0, 0, sizeof(digr_T), 10, NULL};
  
  /*
   * Note: Characters marked with XX are not included literally, because some
--- 32,38 ----
  static void printdigraph __ARGS((digr_T *));
  
  /* digraphs added by the user */
! static garray_T	user_digraphs = {0, 0, (int)sizeof(digr_T), 10, NULL};
  
  /*
   * Note: Characters marked with XX are not included literally, because some
***************
*** 2371,2380 ****
  	}
  	else
  #endif
! 	    *p++ = dp->result;
  	if (char2cells(dp->result) == 1)
  	    *p++ = ' ';
! 	sprintf((char *)p, " %3d", dp->result);
  	msg_outtrans(buf);
      }
  }
--- 2371,2380 ----
  	}
  	else
  #endif
! 	    *p++ = (char_u)dp->result;
  	if (char2cells(dp->result) == 1)
  	    *p++ = ' ';
! 	vim_snprintf((char *)p, sizeof(buf) - (p - buf), " %3d", dp->result);
  	msg_outtrans(buf);
      }
  }
***************
*** 2395,2401 ****
  static void keymap_unload __ARGS((void));
  
  /*
!  * Set up key mapping tables for the 'keymap' option
   */
      char_u *
  keymap_init()
--- 2395,2404 ----
  static void keymap_unload __ARGS((void));
  
  /*
!  * Set up key mapping tables for the 'keymap' option.
!  * Returns NULL if OK, an error message for failure.  This only needs to be
!  * used when setting the option, not later when the value has already been
!  * checked.
   */
      char_u *
  keymap_init()
***************
*** 2412,2436 ****
      else
      {
  	char_u	*buf;
  
  	/* Source the keymap file.  It will contain a ":loadkeymap" command
  	 * which will call ex_loadkeymap() below. */
! 	buf = alloc((unsigned)(STRLEN(curbuf->b_p_keymap)
  # ifdef FEAT_MBYTE
! 						       + STRLEN(p_enc)
  # endif
! 						       + 14));
  	if (buf == NULL)
  	    return e_outofmem;
  
  # ifdef FEAT_MBYTE
  	/* try finding "keymap/'keymap'_'encoding'.vim"  in 'runtimepath' */
! 	sprintf((char *)buf, "keymap/%s_%s.vim", curbuf->b_p_keymap, p_enc);
  	if (source_runtime(buf, FALSE) == FAIL)
  # endif
  	{
  	    /* try finding "keymap/'keymap'.vim" in 'runtimepath'  */
! 	    sprintf((char *)buf, "keymap/%s.vim", curbuf->b_p_keymap);
  	    if (source_runtime(buf, FALSE) == FAIL)
  	    {
  		vim_free(buf);
--- 2415,2443 ----
      else
      {
  	char_u	*buf;
+ 	size_t  buflen;
  
  	/* Source the keymap file.  It will contain a ":loadkeymap" command
  	 * which will call ex_loadkeymap() below. */
! 	buflen = STRLEN(curbuf->b_p_keymap)
  # ifdef FEAT_MBYTE
! 					   + STRLEN(p_enc)
  # endif
! 						       + 14;
! 	buf = alloc((unsigned)buflen);
  	if (buf == NULL)
  	    return e_outofmem;
  
  # ifdef FEAT_MBYTE
  	/* try finding "keymap/'keymap'_'encoding'.vim"  in 'runtimepath' */
! 	vim_snprintf((char *)buf, buflen, "keymap/%s_%s.vim",
! 						   curbuf->b_p_keymap, p_enc);
  	if (source_runtime(buf, FALSE) == FAIL)
  # endif
  	{
  	    /* try finding "keymap/'keymap'.vim" in 'runtimepath'  */
! 	    vim_snprintf((char *)buf, buflen, "keymap/%s.vim",
! 							  curbuf->b_p_keymap);
  	    if (source_runtime(buf, FALSE) == FAIL)
  	    {
  		vim_free(buf);
*** ../vim-7.2.166/src/edit.c	2009-02-21 20:27:00.000000000 +0100
--- src/edit.c	2009-05-05 21:14:50.000000000 +0200
***************
*** 57,63 ****
      N_(" Keyword Local completion (^N^P)"),
  };
  
! static char_u e_hitend[] = N_("Hit end of paragraph");
  
  /*
   * Structure used to store one match for insert completion.
--- 57,63 ----
      N_(" Keyword Local completion (^N^P)"),
  };
  
! static char e_hitend[] = N_("Hit end of paragraph");
  
  /*
   * Structure used to store one match for insert completion.
***************
*** 69,75 ****
--- 69,79 ----
      compl_T	*cp_prev;
      char_u	*cp_str;	/* matched text */
      char	cp_icase;	/* TRUE or FALSE: ignore case */
+ #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
+     char_u	**cp_text;	/* text for the menu */
+ #else
      char_u	*(cp_text[CPT_COUNT]);	/* text for the menu */
+ #endif
      char_u	*cp_fname;	/* file containing the match, allocated when
  				 * cp_flags has FREE_FNAME */
      int		cp_flags;	/* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
***************
*** 306,312 ****
      int		c = 0;
      char_u	*ptr;
      int		lastc;
!     colnr_T	mincol;
      static linenr_T o_lnum = 0;
      int		i;
      int		did_backspace = TRUE;	    /* previous char was backspace */
--- 310,316 ----
      int		c = 0;
      char_u	*ptr;
      int		lastc;
!     int		mincol;
      static linenr_T o_lnum = 0;
      int		i;
      int		did_backspace = TRUE;	    /* previous char was backspace */
***************
*** 387,393 ****
  	if (startln)
  	    Insstart.col = 0;
      }
!     Insstart_textlen = linetabsize(ml_get_curline());
      Insstart_blank_vcol = MAXCOL;
      if (!did_ai)
  	ai_col = 0;
--- 391,397 ----
  	if (startln)
  	    Insstart.col = 0;
      }
!     Insstart_textlen = (colnr_T)linetabsize(ml_get_curline());
      Insstart_blank_vcol = MAXCOL;
      if (!did_ai)
  	ai_col = 0;
***************
*** 653,659 ****
  	    mincol = curwin->w_wcol;
  	    validate_cursor_col();
  
! 	    if ((int)curwin->w_wcol < (int)mincol - curbuf->b_p_ts
  		    && curwin->w_wrow == W_WINROW(curwin)
  						 + curwin->w_height - 1 - p_so
  		    && (curwin->w_cursor.lnum != curwin->w_topline
--- 657,663 ----
  	    mincol = curwin->w_wcol;
  	    validate_cursor_col();
  
! 	    if ((int)curwin->w_wcol < mincol - curbuf->b_p_ts
  		    && curwin->w_wrow == W_WINROW(curwin)
  						 + curwin->w_height - 1 - p_so
  		    && (curwin->w_cursor.lnum != curwin->w_topline
***************
*** 1773,1779 ****
  	 * Compute the screen column where the cursor should be.
  	 */
  	vcol = get_indent() - vcol;
! 	curwin->w_virtcol = (vcol < 0) ? 0 : vcol;
  
  	/*
  	 * Advance the cursor until we reach the right screen column.
--- 1777,1783 ----
  	 * Compute the screen column where the cursor should be.
  	 */
  	vcol = get_indent() - vcol;
! 	curwin->w_virtcol = (colnr_T)((vcol < 0) ? 0 : vcol);
  
  	/*
  	 * Advance the cursor until we reach the right screen column.
***************
*** 1800,1808 ****
  	 */
  	if (vcol != (int)curwin->w_virtcol)
  	{
! 	    curwin->w_cursor.col = new_cursor_col;
  	    i = (int)curwin->w_virtcol - vcol;
! 	    ptr = alloc(i + 1);
  	    if (ptr != NULL)
  	    {
  		new_cursor_col += i;
--- 1804,1812 ----
  	 */
  	if (vcol != (int)curwin->w_virtcol)
  	{
! 	    curwin->w_cursor.col = (colnr_T)new_cursor_col;
  	    i = (int)curwin->w_virtcol - vcol;
! 	    ptr = alloc((unsigned)(i + 1));
  	    if (ptr != NULL)
  	    {
  		new_cursor_col += i;
***************
*** 1826,1832 ****
      if (new_cursor_col <= 0)
  	curwin->w_cursor.col = 0;
      else
! 	curwin->w_cursor.col = new_cursor_col;
      curwin->w_set_curswant = TRUE;
      changed_cline_bef_curs();
  
--- 1830,1836 ----
      if (new_cursor_col <= 0)
  	curwin->w_cursor.col = 0;
      else
! 	curwin->w_cursor.col = (colnr_T)new_cursor_col;
      curwin->w_set_curswant = TRUE;
      changed_cline_bef_curs();
  
***************
*** 1966,1972 ****
  #ifdef FEAT_MBYTE
      if (enc_utf8 && limit_col >= 0)
      {
! 	int ecol = curwin->w_cursor.col + 1;
  
  	/* Make sure the cursor is at the start of a character, but
  	 * skip forward again when going too far back because of a
--- 1970,1976 ----
  #ifdef FEAT_MBYTE
      if (enc_utf8 && limit_col >= 0)
      {
! 	colnr_T ecol = curwin->w_cursor.col + 1;
  
  	/* Make sure the cursor is at the start of a character, but
  	 * skip forward again when going too far back because of a
***************
*** 1982,1988 ****
  	}
  	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
  	    return FALSE;
! 	del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE);
      }
      else
  #endif
--- 1986,1992 ----
  	}
  	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
  	    return FALSE;
! 	del_bytes((long)((int)ecol - curwin->w_cursor.col), FALSE, TRUE);
      }
      else
  #endif
***************
*** 2201,2207 ****
  	    actual_compl_length = compl_length;
  
  	/* Allocate wide character array for the completion and fill it. */
! 	wca = (int *)alloc(actual_len * sizeof(int));
  	if (wca != NULL)
  	{
  	    p = str;
--- 2205,2211 ----
  	    actual_compl_length = compl_length;
  
  	/* Allocate wide character array for the completion and fill it. */
! 	wca = (int *)alloc((unsigned)(actual_len * sizeof(int)));
  	if (wca != NULL)
  	{
  	    p = str;
***************
*** 2580,2586 ****
   */
      void
  set_completion(startcol, list)
!     int	    startcol;
      list_T  *list;
  {
      /* If already doing completions stop it. */
--- 2584,2590 ----
   */
      void
  set_completion(startcol, list)
!     colnr_T startcol;
      list_T  *list;
  {
      /* If already doing completions stop it. */
***************
*** 2591,2600 ****
      if (stop_arrow() == FAIL)
  	return;
  
!     if (startcol > (int)curwin->w_cursor.col)
  	startcol = curwin->w_cursor.col;
      compl_col = startcol;
!     compl_length = curwin->w_cursor.col - startcol;
      /* compl_pattern doesn't need to be set */
      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
--- 2595,2604 ----
      if (stop_arrow() == FAIL)
  	return;
  
!     if (startcol > curwin->w_cursor.col)
  	startcol = curwin->w_cursor.col;
      compl_col = startcol;
!     compl_length = (int)curwin->w_cursor.col - (int)startcol;
      /* compl_pattern doesn't need to be set */
      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
***************
*** 2860,2866 ****
      regmatch_T	regmatch;
      char_u	**files;
      int		count;
-     int		i;
      int		save_p_scs;
      int		dir = compl_direction;
  
--- 2864,2869 ----
***************
*** 2892,2908 ****
      if (ctrl_x_mode == CTRL_X_WHOLE_LINE)
      {
  	char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
  
  	if (pat_esc == NULL)
  	    goto theend;
! 	i = (int)STRLEN(pat_esc) + 10;
! 	ptr = alloc(i);
  	if (ptr == NULL)
  	{
  	    vim_free(pat_esc);
  	    goto theend;
  	}
! 	vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc);
  	regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
  	vim_free(pat_esc);
  	vim_free(ptr);
--- 2895,2912 ----
      if (ctrl_x_mode == CTRL_X_WHOLE_LINE)
      {
  	char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
+ 	size_t len;
  
  	if (pat_esc == NULL)
  	    goto theend;
! 	len = STRLEN(pat_esc) + 10;
! 	ptr = alloc((unsigned)len);
  	if (ptr == NULL)
  	{
  	    vim_free(pat_esc);
  	    goto theend;
  	}
! 	vim_snprintf((char *)ptr, len, "^\\s*\\zs\\V%s", pat_esc);
  	regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
  	vim_free(pat_esc);
  	vim_free(ptr);
***************
*** 2993,2999 ****
  	{
  	    vim_snprintf((char *)IObuff, IOSIZE,
  			      _("Scanning dictionary: %s"), (char *)files[i]);
! 	    msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  	}
  
  	if (fp != NULL)
--- 2997,3003 ----
  	{
  	    vim_snprintf((char *)IObuff, IOSIZE,
  			      _("Scanning dictionary: %s"), (char *)files[i]);
! 	    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  	}
  
  	if (fp != NULL)
***************
*** 3311,3317 ****
      static int
  ins_compl_len()
  {
!     int off = curwin->w_cursor.col - compl_col;
  
      if (off < 0)
  	return 0;
--- 3315,3321 ----
      static int
  ins_compl_len()
  {
!     int off = (int)curwin->w_cursor.col - (int)compl_col;
  
      if (off < 0)
  	return 0;
***************
*** 3347,3353 ****
  
      vim_free(compl_leader);
      compl_leader = vim_strnsave(ml_get_curline() + compl_col,
! 					    curwin->w_cursor.col - compl_col);
      if (compl_leader != NULL)
  	ins_compl_new_leader();
  }
--- 3351,3357 ----
  
      vim_free(compl_leader);
      compl_leader = vim_strnsave(ml_get_curline() + compl_col,
! 				     (int)(curwin->w_cursor.col - compl_col));
      if (compl_leader != NULL)
  	ins_compl_new_leader();
  }
***************
*** 3395,3401 ****
  ins_compl_addfrommatch()
  {
      char_u	*p;
!     int		len = curwin->w_cursor.col - compl_col;
      int		c;
      compl_T	*cp;
  
--- 3399,3405 ----
  ins_compl_addfrommatch()
  {
      char_u	*p;
!     int		len = (int)curwin->w_cursor.col - (int)compl_col;
      int		c;
      compl_T	*cp;
  
***************
*** 3961,3967 ****
  			    : ins_buf->b_sfname == NULL
  				? (char *)ins_buf->b_fname
  				: (char *)ins_buf->b_sfname);
! 		msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  	    }
  	    else if (*e_cpt == NUL)
  		break;
--- 3965,3971 ----
  			    : ins_buf->b_sfname == NULL
  				? (char *)ins_buf->b_fname
  				: (char *)ins_buf->b_sfname);
! 		(void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  	    }
  	    else if (*e_cpt == NUL)
  		break;
***************
*** 3991,3997 ****
  		{
  		    type = CTRL_X_TAGS;
  		    sprintf((char*)IObuff, _("Scanning tags."));
! 		    msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  		}
  		else
  		    type = -1;
--- 3995,4001 ----
  		{
  		    type = CTRL_X_TAGS;
  		    sprintf((char*)IObuff, _("Scanning tags."));
! 		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  		}
  		else
  		    type = -1;
***************
*** 6320,6326 ****
  	    ins_need_undo = FALSE;
  	}
  	Insstart = curwin->w_cursor;	/* new insertion starts here */
! 	Insstart_textlen = linetabsize(ml_get_curline());
  	ai_col = 0;
  #ifdef FEAT_VREPLACE
  	if (State & VREPLACE_FLAG)
--- 6324,6330 ----
  	    ins_need_undo = FALSE;
  	}
  	Insstart = curwin->w_cursor;	/* new insertion starts here */
! 	Insstart_textlen = (colnr_T)linetabsize(ml_get_curline());
  	ai_col = 0;
  #ifdef FEAT_VREPLACE
  	if (State & VREPLACE_FLAG)
*** ../vim-7.2.166/src/ex_cmds.c	2009-04-29 18:44:38.000000000 +0200
--- src/ex_cmds.c	2009-05-05 17:55:40.000000000 +0200
***************
*** 1789,1795 ****
  	 * overwrite a user's viminfo file after a "su root", with a
  	 * viminfo file that the user can't read.
  	 */
! 	st_old.st_dev = 0;
  	st_old.st_ino = 0;
  	st_old.st_mode = 0600;
  	if (mch_stat((char *)fname, &st_old) == 0
--- 1789,1795 ----
  	 * overwrite a user's viminfo file after a "su root", with a
  	 * viminfo file that the user can't read.
  	 */
! 	st_old.st_dev = (dev_t)0;
  	st_old.st_ino = 0;
  	st_old.st_mode = 0600;
  	if (mch_stat((char *)fname, &st_old) == 0
***************
*** 3715,3721 ****
      /* If the window options were changed may need to set the spell language.
       * Can only do this after the buffer has been properly setup. */
      if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! 	did_set_spelllang(curbuf);
  #endif
  
      if (command == NULL)
--- 3715,3721 ----
      /* If the window options were changed may need to set the spell language.
       * Can only do this after the buffer has been properly setup. */
      if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! 	(void)did_set_spelllang(curbuf);
  #endif
  
      if (command == NULL)
***************
*** 3788,3794 ****
  
  #ifdef FEAT_KEYMAP
      if (curbuf->b_kmap_state & KEYMAP_INIT)
! 	keymap_init();
  #endif
  
      --RedrawingDisabled;
--- 3788,3794 ----
  
  #ifdef FEAT_KEYMAP
      if (curbuf->b_kmap_state & KEYMAP_INIT)
! 	(void)keymap_init();
  #endif
  
      --RedrawingDisabled;
*** ../vim-7.2.166/src/globals.h	2009-03-05 03:13:51.000000000 +0100
--- src/globals.h	2009-05-09 21:14:49.000000000 +0200
***************
*** 524,530 ****
  EXTERN win_T	*prevwin INIT(= NULL);	/* previous window */
  # define W_NEXT(wp) ((wp)->w_next)
  # define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next)
! #define FOR_ALL_TAB_WINDOWS(tp, wp) \
      for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
  	for ((wp) = ((tp) == curtab) \
  		? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
--- 524,530 ----
  EXTERN win_T	*prevwin INIT(= NULL);	/* previous window */
  # define W_NEXT(wp) ((wp)->w_next)
  # define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next)
! # define FOR_ALL_TAB_WINDOWS(tp, wp) \
      for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
  	for ((wp) = ((tp) == curtab) \
  		? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
***************
*** 718,724 ****
  
  EXTERN pos_T	saved_cursor		/* w_cursor before formatting text. */
  # ifdef DO_INIT
! 	= INIT_POS_T
  # endif
  	;
  
--- 718,724 ----
  
  EXTERN pos_T	saved_cursor		/* w_cursor before formatting text. */
  # ifdef DO_INIT
! 	= INIT_POS_T(0, 0, 0)
  # endif
  	;
  
***************
*** 1039,1045 ****
  EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
  EXTERN pos_T	last_cursormoved	    /* for CursorMoved event */
  # ifdef DO_INIT
! 			= INIT_POS_T
  # endif
  			;
  #endif
--- 1039,1045 ----
  EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
  EXTERN pos_T	last_cursormoved	    /* for CursorMoved event */
  # ifdef DO_INIT
! 			= INIT_POS_T(0, 0, 0)
  # endif
  			;
  #endif
*** ../vim-7.2.166/src/ops.c	2009-04-29 17:39:17.000000000 +0200
--- src/ops.c	2009-05-13 12:41:02.000000000 +0200
***************
*** 6400,6406 ****
  	    {
  		getvcols(curwin, &min_pos, &max_pos, &min_pos.col,
  								&max_pos.col);
! 		sprintf((char *)buf1, _("%ld Cols; "),
  			(long)(oparg.end_vcol - oparg.start_vcol + 1));
  	    }
  	    else
--- 6400,6406 ----
  	    {
  		getvcols(curwin, &min_pos, &max_pos, &min_pos.col,
  								&max_pos.col);
! 		vim_snprintf((char *)buf1, sizeof(buf1), _("%ld Cols; "),
  			(long)(oparg.end_vcol - oparg.start_vcol + 1));
  	    }
  	    else
***************
*** 6408,6420 ****
  
  	    if (char_count_cursor == byte_count_cursor
  						  && char_count == byte_count)
! 		sprintf((char *)IObuff, _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"),
  			buf1, line_count_selected,
  			(long)curbuf->b_ml.ml_line_count,
  			word_count_cursor, word_count,
  			byte_count_cursor, byte_count);
  	    else
! 		sprintf((char *)IObuff, _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"),
  			buf1, line_count_selected,
  			(long)curbuf->b_ml.ml_line_count,
  			word_count_cursor, word_count,
--- 6408,6422 ----
  
  	    if (char_count_cursor == byte_count_cursor
  						  && char_count == byte_count)
! 		vim_snprintf((char *)IObuff, IOSIZE,
! 			_("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"),
  			buf1, line_count_selected,
  			(long)curbuf->b_ml.ml_line_count,
  			word_count_cursor, word_count,
  			byte_count_cursor, byte_count);
  	    else
! 		vim_snprintf((char *)IObuff, IOSIZE,
! 			_("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"),
  			buf1, line_count_selected,
  			(long)curbuf->b_ml.ml_line_count,
  			word_count_cursor, word_count,
***************
*** 6426,6445 ****
  	{
  	    p = ml_get_curline();
  	    validate_virtcol();
! 	    col_print(buf1, (int)curwin->w_cursor.col + 1,
  		    (int)curwin->w_virtcol + 1);
! 	    col_print(buf2, (int)STRLEN(p), linetabsize(p));
  
  	    if (char_count_cursor == byte_count_cursor
  		    && char_count == byte_count)
! 		sprintf((char *)IObuff, _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"),
  		    (char *)buf1, (char *)buf2,
  		    (long)curwin->w_cursor.lnum,
  		    (long)curbuf->b_ml.ml_line_count,
  		    word_count_cursor, word_count,
  		    byte_count_cursor, byte_count);
  	    else
! 		sprintf((char *)IObuff, _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"),
  		    (char *)buf1, (char *)buf2,
  		    (long)curwin->w_cursor.lnum,
  		    (long)curbuf->b_ml.ml_line_count,
--- 6428,6449 ----
  	{
  	    p = ml_get_curline();
  	    validate_virtcol();
! 	    col_print(buf1, sizeof(buf1), (int)curwin->w_cursor.col + 1,
  		    (int)curwin->w_virtcol + 1);
! 	    col_print(buf2, sizeof(buf2), (int)STRLEN(p), linetabsize(p));
  
  	    if (char_count_cursor == byte_count_cursor
  		    && char_count == byte_count)
! 		vim_snprintf((char *)IObuff, IOSIZE,
! 		    _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"),
  		    (char *)buf1, (char *)buf2,
  		    (long)curwin->w_cursor.lnum,
  		    (long)curbuf->b_ml.ml_line_count,
  		    word_count_cursor, word_count,
  		    byte_count_cursor, byte_count);
  	    else
! 		vim_snprintf((char *)IObuff, IOSIZE,
! 		    _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"),
  		    (char *)buf1, (char *)buf2,
  		    (long)curwin->w_cursor.lnum,
  		    (long)curbuf->b_ml.ml_line_count,
*** ../vim-7.2.166/src/os_unix.c	2009-03-02 02:44:54.000000000 +0100
--- src/os_unix.c	2009-05-05 17:35:58.000000000 +0200
***************
*** 199,205 ****
  #endif
  
  #ifndef SIG_ERR
! # define SIG_ERR	((RETSIGTYPE (*)())-1)
  #endif
  
  /* volatile because it is used in signal handler sig_winch(). */
--- 199,207 ----
  #endif
  
  #ifndef SIG_ERR
! # ifndef S_SPLINT_S
! #  define SIG_ERR	((RETSIGTYPE (*)())-1)
! # endif
  #endif
  
  /* volatile because it is used in signal handler sig_winch(). */
***************
*** 441,447 ****
  
  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
  # ifdef HAVE_SYS_RESOURCE_H
! #  include <sys/resource.h>
  # endif
  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
--- 443,451 ----
  
  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
  # ifdef HAVE_SYS_RESOURCE_H
! #  ifndef S_SPLINT_S  /* splint crashes on bits/resource.h */
! #   include <sys/resource.h>
! #  endif
  # endif
  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
*** ../vim-7.2.166/src/os_unix.h	2008-06-20 18:06:36.000000000 +0200
--- src/os_unix.h	2009-05-05 17:07:45.000000000 +0200
***************
*** 53,59 ****
  #endif
  
  #ifdef HAVE_UNISTD_H
! # include <unistd.h>
  #endif
  
  #ifdef HAVE_LIBC_H
--- 53,61 ----
  #endif
  
  #ifdef HAVE_UNISTD_H
! # ifndef S_SPLINT_S  /* splint crashes on bits/confname.h */
! #  include <unistd.h>
! # endif
  #endif
  
  #ifdef HAVE_LIBC_H
*** ../vim-7.2.166/src/proto/buffer.pro	2008-11-15 14:10:23.000000000 +0100
--- src/proto/buffer.pro	2009-05-13 12:23:41.000000000 +0200
***************
*** 37,49 ****
  int otherfile __ARGS((char_u *ffname));
  void buf_setino __ARGS((buf_T *buf));
  void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
! void col_print __ARGS((char_u *buf, int col, int vcol));
  void maketitle __ARGS((void));
  void resettitle __ARGS((void));
  void free_titles __ARGS((void));
  int build_stl_str_hl __ARGS((win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab));
! void get_rel_pos __ARGS((win_T *wp, char_u *str));
! int append_arg_number __ARGS((win_T *wp, char_u *buf, int add_file, int maxlen));
  char_u *fix_fname __ARGS((char_u *fname));
  void fname_expand __ARGS((buf_T *buf, char_u **ffname, char_u **sfname));
  char_u *alist_name __ARGS((aentry_T *aep));
--- 37,48 ----
  int otherfile __ARGS((char_u *ffname));
  void buf_setino __ARGS((buf_T *buf));
  void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate));
! void col_print __ARGS((char_u *buf, size_t buflen, int col, int vcol));
  void maketitle __ARGS((void));
  void resettitle __ARGS((void));
  void free_titles __ARGS((void));
  int build_stl_str_hl __ARGS((win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab));
! void get_rel_pos __ARGS((win_T *wp, char_u *buf, int buflen));
  char_u *fix_fname __ARGS((char_u *fname));
  void fname_expand __ARGS((buf_T *buf, char_u **ffname, char_u **sfname));
  char_u *alist_name __ARGS((aentry_T *aep));
***************
*** 54,61 ****
  void write_viminfo_bufferlist __ARGS((FILE *fp));
  char *buf_spname __ARGS((buf_T *buf));
  void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr));
! int buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr));
! int_u buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type));
  linenr_T buf_delsign __ARGS((buf_T *buf, int id));
  int buf_findsign __ARGS((buf_T *buf, int id));
  int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum));
--- 53,60 ----
  void write_viminfo_bufferlist __ARGS((FILE *fp));
  char *buf_spname __ARGS((buf_T *buf));
  void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr));
! linenr_T buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr));
! int buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type));
  linenr_T buf_delsign __ARGS((buf_T *buf, int id));
  int buf_findsign __ARGS((buf_T *buf, int id));
  int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum));
*** ../vim-7.2.166/src/proto/edit.pro	2008-01-16 20:03:13.000000000 +0100
--- src/proto/edit.pro	2009-05-05 20:51:56.000000000 +0200
***************
*** 8,14 ****
  void backspace_until_column __ARGS((int col));
  int vim_is_ctrl_x_key __ARGS((int c));
  int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
! void set_completion __ARGS((int startcol, list_T *list));
  void ins_compl_show_pum __ARGS((void));
  char_u *find_word_start __ARGS((char_u *ptr));
  char_u *find_word_end __ARGS((char_u *ptr));
--- 8,14 ----
  void backspace_until_column __ARGS((int col));
  int vim_is_ctrl_x_key __ARGS((int c));
  int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
! void set_completion __ARGS((colnr_T startcol, list_T *list));
  void ins_compl_show_pum __ARGS((void));
  char_u *find_word_start __ARGS((char_u *ptr));
  char_u *find_word_end __ARGS((char_u *ptr));
*** ../vim-7.2.166/src/screen.c	2009-03-18 19:07:09.000000000 +0100
--- src/screen.c	2009-05-05 17:42:45.000000000 +0200
***************
*** 9481,9493 ****
      win_T	*wp;
      int		always;
  {
!     char_u	buffer[70];
      int		row;
      int		fillchar;
      int		attr;
      int		empty_line = FALSE;
      colnr_T	virtcol;
      int		i;
      int		o;
  #ifdef FEAT_VERTSPLIT
      int		this_ru_col;
--- 9481,9495 ----
      win_T	*wp;
      int		always;
  {
! #define RULER_BUF_LEN 70
!     char_u	buffer[RULER_BUF_LEN];
      int		row;
      int		fillchar;
      int		attr;
      int		empty_line = FALSE;
      colnr_T	virtcol;
      int		i;
+     size_t	len;
      int		o;
  #ifdef FEAT_VERTSPLIT
      int		this_ru_col;
***************
*** 9602,9612 ****
  	 * Some sprintfs return the length, some return a pointer.
  	 * To avoid portability problems we use strlen() here.
  	 */
! 	sprintf((char *)buffer, "%ld,",
  		(wp->w_buffer->b_ml.ml_flags & ML_EMPTY)
  		    ? 0L
  		    : (long)(wp->w_cursor.lnum));
! 	col_print(buffer + STRLEN(buffer),
  			empty_line ? 0 : (int)wp->w_cursor.col + 1,
  			(int)virtcol + 1);
  
--- 9604,9615 ----
  	 * Some sprintfs return the length, some return a pointer.
  	 * To avoid portability problems we use strlen() here.
  	 */
! 	vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,",
  		(wp->w_buffer->b_ml.ml_flags & ML_EMPTY)
  		    ? 0L
  		    : (long)(wp->w_cursor.lnum));
! 	len = STRLEN(buffer);
! 	col_print(buffer + len, RULER_BUF_LEN - len,
  			empty_line ? 0 : (int)wp->w_cursor.col + 1,
  			(int)virtcol + 1);
  
***************
*** 9616,9622 ****
  	 * screen up on some terminals).
  	 */
  	i = (int)STRLEN(buffer);
! 	get_rel_pos(wp, buffer + i + 1);
  	o = i + vim_strsize(buffer + i + 1);
  #ifdef FEAT_WINDOWS
  	if (wp->w_status_height == 0)	/* can't use last char of screen */
--- 9619,9625 ----
  	 * screen up on some terminals).
  	 */
  	i = (int)STRLEN(buffer);
! 	get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1);
  	o = i + vim_strsize(buffer + i + 1);
  #ifdef FEAT_WINDOWS
  	if (wp->w_status_height == 0)	/* can't use last char of screen */
***************
*** 9643,9649 ****
  		    buffer[i++] = fillchar;
  		++o;
  	    }
! 	    get_rel_pos(wp, buffer + i);
  	}
  	/* Truncate at window boundary. */
  #ifdef FEAT_MBYTE
--- 9646,9652 ----
  		    buffer[i++] = fillchar;
  		++o;
  	    }
! 	    get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i);
  	}
  	/* Truncate at window boundary. */
  #ifdef FEAT_MBYTE
*** ../vim-7.2.166/src/structs.h	2008-11-15 16:05:30.000000000 +0100
--- src/structs.h	2009-05-05 18:20:36.000000000 +0200
***************
*** 33,41 ****
  } pos_T;
  
  #ifdef FEAT_VIRTUALEDIT
! # define INIT_POS_T {0, 0, 0}
  #else
! # define INIT_POS_T {0, 0}
  #endif
  
  /*
--- 33,41 ----
  } pos_T;
  
  #ifdef FEAT_VIRTUALEDIT
! # define INIT_POS_T(l, c, ca) {l, c, ca}
  #else
! # define INIT_POS_T(l, c, ca) {l, c}
  #endif
  
  /*
***************
*** 1166,1172 ****
      char_u	*b_fname;	/* current file name */
  
  #ifdef UNIX
!     int		b_dev;		/* device number (-1 if not set) */
      ino_t	b_ino;		/* inode number */
  #endif
  #ifdef FEAT_CW_EDITOR
--- 1166,1172 ----
      char_u	*b_fname;	/* current file name */
  
  #ifdef UNIX
!     dev_t	b_dev;		/* device number (-1 if not set) */
      ino_t	b_ino;		/* inode number */
  #endif
  #ifdef FEAT_CW_EDITOR
***************
*** 1645,1651 ****
--- 1645,1655 ----
  #endif
  #ifdef FEAT_DIFF
      diff_T	    *tp_first_diff;
+ # ifdef S_SPLINT_S  /* splint doesn't understand the array of pointers */
+     buf_T	    **tp_diffbuf;
+ # else
      buf_T	    *(tp_diffbuf[DB_COUNT]);
+ # endif
      int		    tp_diff_invalid;	/* list of diffs is outdated */
  #endif
      frame_T	    *tp_snapshot;    /* window layout snapshot */
*** ../vim-7.2.166/src/version.c	2009-04-29 18:44:38.000000000 +0200
--- src/version.c	2009-05-13 12:06:36.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     167,
  /**/

-- 
Snoring is prohibited unless all bedroom windows are closed and securely
locked.
		[real standing law in Massachusetts, 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    ///


--- NEW FILE 7.2.168 ---
To: vim-dev at vim.org
Subject: Patch 7.2.168
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.168
Problem:    When no ctags program can be found, "make tags" attempts to
	    execute the first C file.
Solution:   Default to "ctags" when no ctags program can be found.
Files:	    src/configure.in, src/auto/configure


*** ../vim-7.2.167/src/configure.in	2009-04-22 17:50:53.000000000 +0200
--- src/configure.in	2009-05-05 17:46:45.000000000 +0200
***************
*** 2968,2974 ****
  dnl Link with xpg4, it is said to make Korean locale working
  AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
  
! dnl Check how we can run ctags
  dnl --version for Exuberant ctags (preferred)
  dnl       Add --fields=+S to get function signatures for omni completion.
  dnl -t for typedefs (many ctags have this)
--- 2968,2974 ----
  dnl Link with xpg4, it is said to make Korean locale working
  AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
  
! dnl Check how we can run ctags.  Default to "ctags" when nothing works.
  dnl --version for Exuberant ctags (preferred)
  dnl       Add --fields=+S to get function signatures for omni completion.
  dnl -t for typedefs (many ctags have this)
***************
*** 2980,2985 ****
--- 2980,2986 ----
  if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
    TAGPRG="ctags -I INIT+ --fields=+S"
  else
+   TAGPRG="ctags"
    (eval etags	   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags"
    (eval etags -c   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags -c"
    (eval ctags	   /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="ctags"
*** ../vim-7.2.167/src/auto/configure	2009-04-22 17:50:53.000000000 +0200
--- src/auto/configure	2009-05-13 14:38:10.000000000 +0200
***************
*** 15707,15712 ****
--- 15723,15729 ----
  if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
    TAGPRG="ctags -I INIT+ --fields=+S"
  else
+   TAGPRG="ctags"
    (eval etags	   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags"
    (eval etags -c   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c"
    (eval ctags	   /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags"
*** ../vim-7.2.167/src/version.c	2009-05-13 12:46:36.000000000 +0200
--- src/version.c	2009-05-13 14:46:35.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     168,
  /**/

-- 
Zen Microsystems: we're the om in .commmmmmmmm

 /// 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    ///


--- NEW FILE 7.2.169 ---
To: vim-dev at vim.org
Subject: Patch 7.2.169
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.169
Problem:    Splint complains about a lot of things.
Solution:   Add type casts, #ifdefs and other changes to avoid warnings.
	    Change colnr_T from unsigned to int.  Avoids mistakes with
	    subtracting columns.
Files:	    src/cleanlint.vim, src/diff.c, src/edit.c, src/ex_cmds.c,
	    src/ex_cmds2.c, src/ex_docmd.c, src/proto/ex_cmds.pro,
	    src/proto/spell.pro, src/quickfix.c, src/spell.c, src/structs.h,
	    src/term.h, src/vim.h


*** ../vim-7.2.168/src/cleanlint.vim	2009-05-13 12:46:36.000000000 +0200
--- src/cleanlint.vim	2009-05-13 18:03:11.000000000 +0200
***************
*** 1,27 ****
  " Vim tool: Filter output of splint
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2009 May 05
  
  " Usage: redirect output of "make lint" to a file, edit that file with Vim and
  " :call CleanLint()
  " This deletes irrelevant messages.  What remains might be valid warnings.
  
  fun! CleanLint()
-   g/^  Types are incompatible/lockmarks d
    g/Assignment of dev_t to __dev_t:/lockmarks d
    g/Assignment of __dev_t to dev_t:/lockmarks d
    g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
!   g/Operands of == have incompatible types (unsigned int, int): /lockmarks d
    g/Assignment of char to char_u: /lockmarks d
    g/Assignment of unsigned int to int: /lockmarks d
!   g/Assignment of colnr_T to int: /lockmarks d
    g/Assignment of int to char_u: /lockmarks d
    g/Function .* expects arg . to be wint_t gets int: /lockmarks d
!   g/^digraph.c.*digraphdefault.*is type char, expects char_u:/lockmarks d
    g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
    g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
    g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
    g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
    g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
  endfun
--- 1,32 ----
  " Vim tool: Filter output of splint
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2009 May 13
  
  " Usage: redirect output of "make lint" to a file, edit that file with Vim and
  " :call CleanLint()
  " This deletes irrelevant messages.  What remains might be valid warnings.
  
  fun! CleanLint()
    g/Assignment of dev_t to __dev_t:/lockmarks d
    g/Assignment of __dev_t to dev_t:/lockmarks d
    g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
!   g/Operands of == have incompatible types (char_u, int): /lockmarks d
    g/Assignment of char to char_u: /lockmarks d
    g/Assignment of unsigned int to int: /lockmarks d
!   g/Assignment of int to unsigned int: /lockmarks d
!   g/Assignment of unsigned int to long int: /lockmarks d
    g/Assignment of int to char_u: /lockmarks d
    g/Function .* expects arg . to be wint_t gets int: /lockmarks d
!   g/Function .* expects arg . to be size_t gets int: /lockmarks d
!   g/Initial value of .* is type char, expects char_u: /lockmarks d
!   g/^ex_cmds.h:.* Function types are inconsistent. Parameter 1 is implicitly temp, but unqualified in assigned function:/lockmarks d
!   g/^ex_docmd.c:.* nospec_str/lockmarks d
    g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
    g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
+   g/^  Types are incompatible/lockmarks d
    g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
    g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
    g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
+   g+ A variable is declared but never used. Use /. at unused@./ in front of declaration to suppress message.+lockmarks d
  endfun
*** ../vim-7.2.168/src/diff.c	2009-03-11 12:45:44.000000000 +0100
--- src/diff.c	2009-05-13 16:16:11.000000000 +0200
***************
*** 827,832 ****
--- 827,833 ----
      char_u	*tmp_diff;
  {
      char_u	*cmd;
+     size_t	len;
  
  #ifdef FEAT_EVAL
      if (*p_dex != NUL)
***************
*** 835,842 ****
      else
  #endif
      {
! 	cmd = alloc((unsigned)(STRLEN(tmp_orig) + STRLEN(tmp_new)
! 				+ STRLEN(tmp_diff) + STRLEN(p_srr) + 27));
  	if (cmd != NULL)
  	{
  	    /* We don't want $DIFF_OPTIONS to get in the way. */
--- 836,844 ----
      else
  #endif
      {
! 	len = STRLEN(tmp_orig) + STRLEN(tmp_new)
! 				      + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
! 	cmd = alloc((unsigned)len);
  	if (cmd != NULL)
  	{
  	    /* We don't want $DIFF_OPTIONS to get in the way. */
***************
*** 846,852 ****
  	    /* Build the diff command and execute it.  Always use -a, binary
  	     * differences are of no use.  Ignore errors, diff returns
  	     * non-zero when differences have been found. */
! 	    sprintf((char *)cmd, "diff %s%s%s%s%s %s",
  		    diff_a_works == FALSE ? "" : "-a ",
  #if defined(MSWIN) || defined(MSDOS)
  		    diff_bin_works == TRUE ? "--binary " : "",
--- 848,854 ----
  	    /* Build the diff command and execute it.  Always use -a, binary
  	     * differences are of no use.  Ignore errors, diff returns
  	     * non-zero when differences have been found. */
! 	    vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s",
  		    diff_a_works == FALSE ? "" : "-a ",
  #if defined(MSWIN) || defined(MSDOS)
  		    diff_bin_works == TRUE ? "--binary " : "",
***************
*** 856,862 ****
  		    (diff_flags & DIFF_IWHITE) ? "-b " : "",
  		    (diff_flags & DIFF_ICASE) ? "-i " : "",
  		    tmp_orig, tmp_new);
! 	    append_redir(cmd, p_srr, tmp_diff);
  #ifdef FEAT_AUTOCMD
  	    block_autocmds();	/* Avoid ShellCmdPost stuff */
  #endif
--- 858,864 ----
  		    (diff_flags & DIFF_IWHITE) ? "-b " : "",
  		    (diff_flags & DIFF_ICASE) ? "-i " : "",
  		    tmp_orig, tmp_new);
! 	    append_redir(cmd, (int)len, p_srr, tmp_diff);
  #ifdef FEAT_AUTOCMD
  	    block_autocmds();	/* Avoid ShellCmdPost stuff */
  #endif
***************
*** 881,886 ****
--- 883,889 ----
      char_u	*tmp_orig;	/* name of original temp file */
      char_u	*tmp_new;	/* name of patched temp file */
      char_u	*buf = NULL;
+     size_t	buflen;
      win_T	*old_curwin = curwin;
      char_u	*newname = NULL;	/* name of patched file buffer */
  #ifdef UNIX
***************
*** 920,930 ****
      /* Get the absolute path of the patchfile, changing directory below. */
      fullname = FullName_save(eap->arg, FALSE);
  #endif
!     buf = alloc((unsigned)(STRLEN(tmp_orig) + (
  # ifdef UNIX
  		    fullname != NULL ? STRLEN(fullname) :
  # endif
! 		    STRLEN(eap->arg)) + STRLEN(tmp_new) + 16));
      if (buf == NULL)
  	goto theend;
  
--- 923,934 ----
      /* Get the absolute path of the patchfile, changing directory below. */
      fullname = FullName_save(eap->arg, FALSE);
  #endif
!     buflen = STRLEN(tmp_orig) + (
  # ifdef UNIX
  		    fullname != NULL ? STRLEN(fullname) :
  # endif
! 		    STRLEN(eap->arg)) + STRLEN(tmp_new) + 16;
!     buf = alloc((unsigned)buflen);
      if (buf == NULL)
  	goto theend;
  
***************
*** 961,967 ****
      {
  	/* Build the patch command and execute it.  Ignore errors.  Switch to
  	 * cooked mode to allow the user to respond to prompts. */
! 	sprintf((char *)buf, "patch -o %s %s < \"%s\"", tmp_new, tmp_orig,
  # ifdef UNIX
  		fullname != NULL ? fullname :
  # endif
--- 965,972 ----
      {
  	/* Build the patch command and execute it.  Ignore errors.  Switch to
  	 * cooked mode to allow the user to respond to prompts. */
! 	vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
! 		tmp_new, tmp_orig,
  # ifdef UNIX
  		fullname != NULL ? fullname :
  # endif
*** ../vim-7.2.168/src/edit.c	2009-05-13 12:46:36.000000000 +0200
--- src/edit.c	2009-05-13 18:29:21.000000000 +0200
***************
*** 169,175 ****
  static int  ins_compl_key2count __ARGS((int c));
  static int  ins_compl_use_match __ARGS((int c));
  static int  ins_complete __ARGS((int c));
! static int  quote_meta __ARGS((char_u *dest, char_u *str, int len));
  #endif /* FEAT_INS_EXPAND */
  
  #define BACKSPACE_CHAR		    1
--- 169,175 ----
  static int  ins_compl_key2count __ARGS((int c));
  static int  ins_compl_use_match __ARGS((int c));
  static int  ins_complete __ARGS((int c));
! static unsigned  quote_meta __ARGS((char_u *dest, char_u *str, int len));
  #endif /* FEAT_INS_EXPAND */
  
  #define BACKSPACE_CHAR		    1
***************
*** 757,763 ****
  		 * there is nothing to add, CTRL-L works like CTRL-P then. */
  		if (c == Ctrl_L
  			&& (ctrl_x_mode != CTRL_X_WHOLE_LINE
! 			    || STRLEN(compl_shown_match->cp_str)
  					  > curwin->w_cursor.col - compl_col))
  		{
  		    ins_compl_addfrommatch();
--- 757,763 ----
  		 * there is nothing to add, CTRL-L works like CTRL-P then. */
  		if (c == Ctrl_L
  			&& (ctrl_x_mode != CTRL_X_WHOLE_LINE
! 			    || (int)STRLEN(compl_shown_match->cp_str)
  					  > curwin->w_cursor.col - compl_col))
  		{
  		    ins_compl_addfrommatch();
***************
*** 3837,3843 ****
--- 3837,3847 ----
      char_u	*word;
      int		icase = FALSE;
      int		adup = FALSE;
+ #ifdef S_SPLINT_S  /* splint doesn't parse array of pointers correctly */
+     char_u	**cptext;
+ #else
      char_u	*(cptext[CPT_COUNT]);
+ #endif
  
      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
      {
***************
*** 3994,4000 ****
  		else if (*e_cpt == ']' || *e_cpt == 't')
  		{
  		    type = CTRL_X_TAGS;
! 		    sprintf((char*)IObuff, _("Scanning tags."));
  		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  		}
  		else
--- 3998,4004 ----
  		else if (*e_cpt == ']' || *e_cpt == 't')
  		{
  		    type = CTRL_X_TAGS;
! 		    vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags."));
  		    (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
  		}
  		else
***************
*** 4093,4099 ****
  	case CTRL_X_SPELL:
  #ifdef FEAT_SPELL
  	    num_matches = expand_spelling(first_match_pos.lnum,
! 				 first_match_pos.col, compl_pattern, &matches);
  	    if (num_matches > 0)
  		ins_compl_add_matches(num_matches, matches, p_ic);
  #endif
--- 4097,4103 ----
  	case CTRL_X_SPELL:
  #ifdef FEAT_SPELL
  	    num_matches = expand_spelling(first_match_pos.lnum,
! 						     compl_pattern, &matches);
  	    if (num_matches > 0)
  		ins_compl_add_matches(num_matches, matches, p_ic);
  #endif
***************
*** 4803,4812 ****
  	    {
  		char_u	    *prefix = (char_u *)"\\<";
  
! 		/* we need 3 extra chars, 1 for the NUL and
! 		 * 2 >= strlen(prefix)	-- Acevedo */
  		compl_pattern = alloc(quote_meta(NULL, line + compl_col,
! 							   compl_length) + 3);
  		if (compl_pattern == NULL)
  		    return FAIL;
  		if (!vim_iswordp(line + compl_col)
--- 4807,4815 ----
  	    {
  		char_u	    *prefix = (char_u *)"\\<";
  
! 		/* we need up to 2 extra chars for the prefix */
  		compl_pattern = alloc(quote_meta(NULL, line + compl_col,
! 							   compl_length) + 2);
  		if (compl_pattern == NULL)
  		    return FAIL;
  		if (!vim_iswordp(line + compl_col)
***************
*** 4881,4887 ****
  		else
  		{
  		    compl_pattern = alloc(quote_meta(NULL, line + compl_col,
! 							   compl_length) + 3);
  		    if (compl_pattern == NULL)
  			return FAIL;
  		    STRCPY((char *)compl_pattern, "\\<");
--- 4884,4890 ----
  		else
  		{
  		    compl_pattern = alloc(quote_meta(NULL, line + compl_col,
! 							   compl_length) + 2);
  		    if (compl_pattern == NULL)
  			return FAIL;
  		    STRCPY((char *)compl_pattern, "\\<");
***************
*** 4963,4969 ****
  	    if (col < 0)
  		col = curs_col;
  	    compl_col = col;
! 	    if ((colnr_T)compl_col > curs_col)
  		compl_col = curs_col;
  
  	    /* Setup variables for completion.  Need to obtain "line" again,
--- 4966,4972 ----
  	    if (col < 0)
  		col = curs_col;
  	    compl_col = col;
! 	    if (compl_col > curs_col)
  		compl_col = curs_col;
  
  	    /* Setup variables for completion.  Need to obtain "line" again,
***************
*** 5236,5250 ****
   * a backslash) the metachars, and dest would be NUL terminated.
   * Returns the length (needed) of dest
   */
!     static int
  quote_meta(dest, src, len)
      char_u	*dest;
      char_u	*src;
      int		len;
  {
!     int	m;
  
!     for (m = len; --len >= 0; src++)
      {
  	switch (*src)
  	{
--- 5239,5253 ----
   * a backslash) the metachars, and dest would be NUL terminated.
   * Returns the length (needed) of dest
   */
!     static unsigned
  quote_meta(dest, src, len)
      char_u	*dest;
      char_u	*src;
      int		len;
  {
!     unsigned	m = (unsigned)len + 1;  /* one extra for the NUL */
  
!     for ( ; --len >= 0; src++)
      {
  	switch (*src)
  	{
***************
*** 6073,6079 ****
       * in 'formatoptions' and there is a single character before the cursor.
       * Otherwise the line would be broken and when typing another non-white
       * next they are not joined back together. */
!     wasatend = (pos.col == STRLEN(old));
      if (*old != NUL && !trailblank && wasatend)
      {
  	dec_cursor();
--- 6076,6082 ----
       * in 'formatoptions' and there is a single character before the cursor.
       * Otherwise the line would be broken and when typing another non-white
       * next they are not joined back together. */
!     wasatend = (pos.col == (colnr_T)STRLEN(old));
      if (*old != NUL && !trailblank && wasatend)
      {
  	dec_cursor();
***************
*** 6250,6256 ****
       * three digits. */
      if (VIM_ISDIGIT(c))
      {
! 	sprintf((char *)buf, "%03d", c);
  	AppendToRedobuff(buf);
      }
      else
--- 6253,6259 ----
       * three digits. */
      if (VIM_ISDIGIT(c))
      {
! 	vim_snprintf((char *)buf, sizeof(buf), "%03d", c);
  	AppendToRedobuff(buf);
      }
      else
***************
*** 6453,6462 ****
  	     * deleted characters. */
  	    if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
  	    {
! 		cc = (int)STRLEN(ml_get_curline());
! 		if (VIsual.col > (colnr_T)cc)
  		{
! 		    VIsual.col = cc;
  # ifdef FEAT_VIRTUALEDIT
  		    VIsual.coladd = 0;
  # endif
--- 6457,6467 ----
  	     * deleted characters. */
  	    if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
  	    {
! 		int len = (int)STRLEN(ml_get_curline());
! 
! 		if (VIsual.col > len)
  		{
! 		    VIsual.col = len;
  # ifdef FEAT_VIRTUALEDIT
  		    VIsual.coladd = 0;
  # endif
***************
*** 8315,8320 ****
--- 8320,8326 ----
      linenr_T	lnum;
      int		cc;
      int		temp = 0;	    /* init for GCC */
+     colnr_T	save_col;
      colnr_T	mincol;
      int		did_backspace = FALSE;
      int		in_indent;
***************
*** 8472,8484 ****
  		 */
  		while (cc > 0)
  		{
! 		    temp = curwin->w_cursor.col;
  #ifdef FEAT_MBYTE
  		    mb_replace_pop_ins(cc);
  #else
  		    ins_char(cc);
  #endif
! 		    curwin->w_cursor.col = temp;
  		    cc = replace_pop();
  		}
  		/* restore the characters that NL replaced */
--- 8478,8490 ----
  		 */
  		while (cc > 0)
  		{
! 		    save_col = curwin->w_cursor.col;
  #ifdef FEAT_MBYTE
  		    mb_replace_pop_ins(cc);
  #else
  		    ins_char(cc);
  #endif
! 		    curwin->w_cursor.col = save_col;
  		    cc = replace_pop();
  		}
  		/* restore the characters that NL replaced */
***************
*** 8510,8520 ****
  #endif
  			    )
  	{
! 	    temp = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
  	    if (curwin->w_cursor.col < (colnr_T)temp)
  		mincol = curwin->w_cursor.col;
! 	    curwin->w_cursor.col = temp;
  	}
  
  	/*
--- 8516,8526 ----
  #endif
  			    )
  	{
! 	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
  	    if (curwin->w_cursor.col < (colnr_T)temp)
  		mincol = curwin->w_cursor.col;
! 	    curwin->w_cursor.col = save_col;
  	}
  
  	/*
*** ../vim-7.2.168/src/ex_cmds.c	2009-05-13 12:46:36.000000000 +0200
--- src/ex_cmds.c	2009-05-13 18:24:18.000000000 +0200
***************
*** 87,99 ****
  			       ))
  	{
  	    transchar_nonprint(buf3, c);
! 	    sprintf(buf1, "  <%s>", (char *)buf3);
  	}
  	else
  	    buf1[0] = NUL;
  #ifndef EBCDIC
  	if (c >= 0x80)
! 	    sprintf(buf2, "  <M-%s>", transchar(c & 0x7f));
  	else
  #endif
  	    buf2[0] = NUL;
--- 87,100 ----
  			       ))
  	{
  	    transchar_nonprint(buf3, c);
! 	    vim_snprintf(buf1, sizeof(buf1), "  <%s>", (char *)buf3);
  	}
  	else
  	    buf1[0] = NUL;
  #ifndef EBCDIC
  	if (c >= 0x80)
! 	    vim_snprintf(buf2, sizeof(buf2), "  <M-%s>",
! 						 (char *)transchar(c & 0x7f));
  	else
  #endif
  	    buf2[0] = NUL;
***************
*** 358,364 ****
      linenr_T	lnum;
      long	maxlen = 0;
      sorti_T	*nrs;
!     size_t	count = eap->line2 - eap->line1 + 1;
      size_t	i;
      char_u	*p;
      char_u	*s;
--- 359,365 ----
      linenr_T	lnum;
      long	maxlen = 0;
      sorti_T	*nrs;
!     size_t	count = (size_t)(eap->line2 - eap->line1 + 1);
      size_t	i;
      char_u	*p;
      char_u	*s;
***************
*** 957,963 ****
  	    }
  	    len += (int)STRLEN(prevcmd);
  	}
! 	if ((t = alloc(len)) == NULL)
  	{
  	    vim_free(newcmd);
  	    return;
--- 958,964 ----
  	    }
  	    len += (int)STRLEN(prevcmd);
  	}
! 	if ((t = alloc((unsigned)len)) == NULL)
  	{
  	    vim_free(newcmd);
  	    return;
***************
*** 1548,1554 ****
       * redirecting input and/or output.
       */
      if (itmp != NULL || otmp != NULL)
! 	sprintf((char *)buf, "(%s)", (char *)cmd);
      else
  	STRCPY(buf, cmd);
      if (itmp != NULL)
--- 1549,1555 ----
       * redirecting input and/or output.
       */
      if (itmp != NULL || otmp != NULL)
! 	vim_snprintf((char *)buf, len, "(%s)", (char *)cmd);
      else
  	STRCPY(buf, cmd);
      if (itmp != NULL)
***************
*** 1597,1633 ****
      }
  #endif
      if (otmp != NULL)
! 	append_redir(buf, p_srr, otmp);
  
      return buf;
  }
  
  /*
!  * Append output redirection for file "fname" to the end of string buffer "buf"
   * Works with the 'shellredir' and 'shellpipe' options.
   * The caller should make sure that there is enough room:
   *	STRLEN(opt) + STRLEN(fname) + 3
   */
      void
! append_redir(buf, opt, fname)
      char_u	*buf;
      char_u	*opt;
      char_u	*fname;
  {
      char_u	*p;
  
!     buf += STRLEN(buf);
      /* find "%s", skipping "%%" */
      for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p)
  	if (p[1] == 's')
  	    break;
      if (p != NULL)
      {
! 	*buf = ' '; /* not really needed? Not with sh, ksh or bash */
! 	sprintf((char *)buf + 1, (char *)opt, (char *)fname);
      }
      else
! 	sprintf((char *)buf,
  #ifdef FEAT_QUICKFIX
  # ifndef RISCOS
  		opt != p_sp ? " %s%s" :
--- 1598,1638 ----
      }
  #endif
      if (otmp != NULL)
! 	append_redir(buf, (int)len, p_srr, otmp);
  
      return buf;
  }
  
  /*
!  * Append output redirection for file "fname" to the end of string buffer
!  * "buf[buflen]"
   * Works with the 'shellredir' and 'shellpipe' options.
   * The caller should make sure that there is enough room:
   *	STRLEN(opt) + STRLEN(fname) + 3
   */
      void
! append_redir(buf, buflen, opt, fname)
      char_u	*buf;
+     int		buflen;
      char_u	*opt;
      char_u	*fname;
  {
      char_u	*p;
+     char_u	*end;
  
!     end = buf + STRLEN(buf);
      /* find "%s", skipping "%%" */
      for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p)
  	if (p[1] == 's')
  	    break;
      if (p != NULL)
      {
! 	*end = ' '; /* not really needed? Not with sh, ksh or bash */
! 	vim_snprintf((char *)end + 1, (size_t)(buflen - (end + 1 - buf)),
! 						  (char *)opt, (char *)fname);
      }
      else
! 	vim_snprintf((char *)end, (size_t)(buflen - (end - buf)),
  #ifdef FEAT_QUICKFIX
  # ifndef RISCOS
  		opt != p_sp ? " %s%s" :
***************
*** 2390,2396 ****
  
      if (curwin->w_p_nu || use_number)
      {
! 	sprintf((char *)numbuf, "%*ld ", number_width(curwin), (long)lnum);
  	msg_puts_attr(numbuf, hl_attr(HLF_N));	/* Highlight line nrs */
      }
      msg_prt_line(ml_get(lnum), list);
--- 2395,2402 ----
  
      if (curwin->w_p_nu || use_number)
      {
! 	vim_snprintf((char *)numbuf, sizeof(numbuf),
! 				   "%*ld ", number_width(curwin), (long)lnum);
  	msg_puts_attr(numbuf, hl_attr(HLF_N));	/* Highlight line nrs */
      }
      msg_prt_line(ml_get(lnum), list);
***************
*** 4486,4492 ****
  	    char_u	*p1;
  	    int		did_sub = FALSE;
  	    int		lastone;
! 	    unsigned	len, needed_len;
  	    long	nmatch_tl = 0;	/* nr of lines matched below lnum */
  	    int		do_again;	/* do it again after joining lines */
  	    int		skip_match = FALSE;
--- 4492,4498 ----
  	    char_u	*p1;
  	    int		did_sub = FALSE;
  	    int		lastone;
! 	    int		len, copy_len, needed_len;
  	    long	nmatch_tl = 0;	/* nr of lines matched below lnum */
  	    int		do_again;	/* do it again after joining lines */
  	    int		skip_match = FALSE;
***************
*** 4631,4636 ****
--- 4637,4644 ----
  
  		if (do_ask)
  		{
+ 		    int typed;
+ 
  		    /* change State to CONFIRM, so that the mouse works
  		     * properly */
  		    save_State = State;
***************
*** 4669,4675 ****
  			    resp = getexmodeline('?', NULL, 0);
  			    if (resp != NULL)
  			    {
! 				i = *resp;
  				vim_free(resp);
  			    }
  			}
--- 4677,4683 ----
  			    resp = getexmodeline('?', NULL, 0);
  			    if (resp != NULL)
  			    {
! 				typed = *resp;
  				vim_free(resp);
  			    }
  			}
***************
*** 4721,4727 ****
  #endif
  			    ++no_mapping;	/* don't map this key */
  			    ++allow_keys;	/* allow special keys */
! 			    i = plain_vgetc();
  			    --allow_keys;
  			    --no_mapping;
  
--- 4729,4735 ----
  #endif
  			    ++no_mapping;	/* don't map this key */
  			    ++allow_keys;	/* allow special keys */
! 			    typed = plain_vgetc();
  			    --allow_keys;
  			    --no_mapping;
  
***************
*** 4732,4766 ****
  			}
  
  			need_wait_return = FALSE; /* no hit-return prompt */
! 			if (i == 'q' || i == ESC || i == Ctrl_C
  #ifdef UNIX
! 				|| i == intr_char
  #endif
  				)
  			{
  			    got_quit = TRUE;
  			    break;
  			}
! 			if (i == 'n')
  			    break;
! 			if (i == 'y')
  			    break;
! 			if (i == 'l')
  			{
  			    /* last: replace and then stop */
  			    do_all = FALSE;
  			    line2 = lnum;
  			    break;
  			}
! 			if (i == 'a')
  			{
  			    do_ask = FALSE;
  			    break;
  			}
  #ifdef FEAT_INS_EXPAND
! 			if (i == Ctrl_E)
  			    scrollup_clamp();
! 			else if (i == Ctrl_Y)
  			    scrolldown_clamp();
  #endif
  		    }
--- 4740,4774 ----
  			}
  
  			need_wait_return = FALSE; /* no hit-return prompt */
! 			if (typed == 'q' || typed == ESC || typed == Ctrl_C
  #ifdef UNIX
! 				|| typed == intr_char
  #endif
  				)
  			{
  			    got_quit = TRUE;
  			    break;
  			}
! 			if (typed == 'n')
  			    break;
! 			if (typed == 'y')
  			    break;
! 			if (typed == 'l')
  			{
  			    /* last: replace and then stop */
  			    do_all = FALSE;
  			    line2 = lnum;
  			    break;
  			}
! 			if (typed == 'a')
  			{
  			    do_ask = FALSE;
  			    break;
  			}
  #ifdef FEAT_INS_EXPAND
! 			if (typed == Ctrl_E)
  			    scrollup_clamp();
! 			else if (typed == Ctrl_Y)
  			    scrolldown_clamp();
  #endif
  		    }
***************
*** 4771,4777 ****
  		    if (vim_strchr(p_cpo, CPO_UNDO) != NULL)
  			--no_u_sync;
  
! 		    if (i == 'n')
  		    {
  			/* For a multi-line match, put matchcol at the NUL at
  			 * the end of the line and set nmatch to one, so that
--- 4779,4785 ----
  		    if (vim_strchr(p_cpo, CPO_UNDO) != NULL)
  			--no_u_sync;
  
! 		    if (typed == 'n')
  		    {
  			/* For a multi-line match, put matchcol at the NUL at
  			 * the end of the line and set nmatch to one, so that
***************
*** 4822,4830 ****
  		    p1 = ml_get(sub_firstlnum + nmatch - 1);
  		    nmatch_tl += nmatch - 1;
  		}
! 		i = regmatch.startpos[0].col - copycol;
! 		needed_len = i + ((unsigned)STRLEN(p1) - regmatch.endpos[0].col)
! 								 + sublen + 1;
  		if (new_start == NULL)
  		{
  		    /*
--- 4830,4838 ----
  		    p1 = ml_get(sub_firstlnum + nmatch - 1);
  		    nmatch_tl += nmatch - 1;
  		}
! 		copy_len = regmatch.startpos[0].col - copycol;
! 		needed_len = copy_len + ((unsigned)STRLEN(p1)
! 				       - regmatch.endpos[0].col) + sublen + 1;
  		if (new_start == NULL)
  		{
  		    /*
***************
*** 4847,4853 ****
  		     */
  		    len = (unsigned)STRLEN(new_start);
  		    needed_len += len;
! 		    if (needed_len > new_start_len)
  		    {
  			new_start_len = needed_len + 50;
  			if ((p1 = alloc_check(new_start_len)) == NULL)
--- 4855,4861 ----
  		     */
  		    len = (unsigned)STRLEN(new_start);
  		    needed_len += len;
! 		    if (needed_len > (int)new_start_len)
  		    {
  			new_start_len = needed_len + 50;
  			if ((p1 = alloc_check(new_start_len)) == NULL)
***************
*** 4865,4872 ****
  		/*
  		 * copy the text up to the part that matched
  		 */
! 		mch_memmove(new_end, sub_firstline + copycol, (size_t)i);
! 		new_end += i;
  
  		(void)vim_regsub_multi(&regmatch,
  				    sub_firstlnum - regmatch.startpos[0].lnum,
--- 4873,4880 ----
  		/*
  		 * copy the text up to the part that matched
  		 */
! 		mch_memmove(new_end, sub_firstline + copycol, (size_t)copy_len);
! 		new_end += copy_len;
  
  		(void)vim_regsub_multi(&regmatch,
  				    sub_firstlnum - regmatch.startpos[0].lnum,
***************
*** 5768,5773 ****
--- 5776,5785 ----
  {
      char_u	*s, *d;
      int		i;
+ #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
+     static char **mtable;
+     static char **rtable;
+ #else
      static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
  			       "/*", "/\\*", "\"*", "**",
  			       "/\\(\\)",
***************
*** 5782,5787 ****
--- 5794,5800 ----
  			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
  			       "\\[count]", "\\[quotex]", "\\[range]",
  			       "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
+ #endif
      int flags;
  
      d = IObuff;		    /* assume IObuff is long enough! */
***************
*** 5790,5796 ****
       * Recognize a few exceptions to the rule.	Some strings that contain '*'
       * with "star".  Otherwise '*' is recognized as a wildcard.
       */
!     for (i = sizeof(mtable) / sizeof(char *); --i >= 0; )
  	if (STRCMP(arg, mtable[i]) == 0)
  	{
  	    STRCPY(d, rtable[i]);
--- 5803,5809 ----
       * Recognize a few exceptions to the rule.	Some strings that contain '*'
       * with "star".  Otherwise '*' is recognized as a wildcard.
       */
!     for (i = (int)(sizeof(mtable) / sizeof(char *)); --i >= 0; )
  	if (STRCMP(arg, mtable[i]) == 0)
  	{
  	    STRCPY(d, rtable[i]);
*** ../vim-7.2.168/src/ex_cmds2.c	2009-02-05 20:47:14.000000000 +0100
--- src/ex_cmds2.c	2009-05-13 16:22:33.000000000 +0200
***************
*** 3373,3379 ****
  	    p = skipwhite(sp->nextline);
  	    if (*p != '\\')
  		break;
! 	    s = alloc((int)(STRLEN(line) + STRLEN(p)));
  	    if (s == NULL)	/* out of memory */
  		break;
  	    STRCPY(s, line);
--- 3373,3379 ----
  	    p = skipwhite(sp->nextline);
  	    if (*p != '\\')
  		break;
! 	    s = alloc((unsigned)(STRLEN(line) + STRLEN(p)));
  	    if (s == NULL)	/* out of memory */
  		break;
  	    STRCPY(s, line);
*** ../vim-7.2.168/src/ex_docmd.c	2009-04-29 18:44:38.000000000 +0200
--- src/ex_docmd.c	2009-05-13 17:56:44.000000000 +0200
***************
*** 2737,2743 ****
      int		i;
  
      for (i = 0; cmd[i] != NUL; ++i)
! 	if (cmd[i] != (*pp)[i])
  	    break;
      if (i >= len && !isalpha((*pp)[i]))
      {
--- 2737,2743 ----
      int		i;
  
      for (i = 0; cmd[i] != NUL; ++i)
! 	if (((char_u *)cmd)[i] != (*pp)[i])
  	    break;
      if (i >= len && !isalpha((*pp)[i]))
      {
***************
*** 2803,2809 ****
  	    /* Check for ":dl", ":dell", etc. to ":deletel": that's
  	     * :delete with the 'l' flag.  Same for 'p'. */
  	    for (i = 0; i < len; ++i)
! 		if (eap->cmd[i] != "delete"[i])
  		    break;
  	    if (i == len - 1)
  	    {
--- 2803,2809 ----
  	    /* Check for ":dl", ":dell", etc. to ":deletel": that's
  	     * :delete with the 'l' flag.  Same for 'p'. */
  	    for (i = 0; i < len; ++i)
! 		if (eap->cmd[i] != ((char_u *)"delete")[i])
  		    break;
  	    if (i == len - 1)
  	    {
***************
*** 3823,3829 ****
      char_u	*cmd;
      int		*ctx;	/* pointer to xp_context or NULL */
  {
!     int		delim;
  
      while (vim_strchr((char_u *)" \t0123456789.$%'/?-+,;", *cmd) != NULL)
      {
--- 3823,3829 ----
      char_u	*cmd;
      int		*ctx;	/* pointer to xp_context or NULL */
  {
!     unsigned	delim;
  
      while (vim_strchr((char_u *)" \t0123456789.$%'/?-+,;", *cmd) != NULL)
      {
***************
*** 9417,9423 ****
  {
      int		len;
      int		i;
!     static char *(spec_str[]) = {
  		    "%",
  #define SPEC_PERC   0
  		    "#",
--- 9417,9429 ----
  {
      int		len;
      int		i;
! #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
!     static char **spec_str;
!     static char *(nospec_str[])
! #else
!     static char *(spec_str[])
! #endif
! 	= {
  		    "%",
  #define SPEC_PERC   0
  		    "#",
***************
*** 9443,9451 ****
  # define SPEC_CLIENT 9
  #endif
      };
- #define SPEC_COUNT  (sizeof(spec_str) / sizeof(char *))
  
!     for (i = 0; i < SPEC_COUNT; ++i)
      {
  	len = (int)STRLEN(spec_str[i]);
  	if (STRNCMP(src, spec_str[i], len) == 0)
--- 9449,9456 ----
  # define SPEC_CLIENT 9
  #endif
      };
  
!     for (i = 0; i < (int)(sizeof(spec_str) / sizeof(char *)); ++i)
      {
  	len = (int)STRLEN(spec_str[i]);
  	if (STRNCMP(src, spec_str[i], len) == 0)
***************
*** 9796,9802 ****
  	}
  
  	/* allocate memory */
! 	retval = alloc(len + 1);
  	if (retval == NULL)
  	    break;
      }
--- 9801,9807 ----
  	}
  
  	/* allocate memory */
! 	retval = alloc((unsigned)len + 1);
  	if (retval == NULL)
  	    break;
      }
*** ../vim-7.2.168/src/proto/ex_cmds.pro	2009-04-29 18:44:38.000000000 +0200
--- src/proto/ex_cmds.pro	2009-05-13 15:53:39.000000000 +0200
***************
*** 9,15 ****
  void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
  void do_shell __ARGS((char_u *cmd, int flags));
  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
! void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
  int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
  int read_viminfo __ARGS((char_u *file, int flags));
  void write_viminfo __ARGS((char_u *file, int forceit));
--- 9,15 ----
  void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
  void do_shell __ARGS((char_u *cmd, int flags));
  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
! void append_redir __ARGS((char_u *buf, int buflen, char_u *opt, char_u *fname));
  int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
  int read_viminfo __ARGS((char_u *file, int flags));
  void write_viminfo __ARGS((char_u *file, int forceit));
*** ../vim-7.2.168/src/proto/spell.pro	2007-05-05 19:19:19.000000000 +0200
--- src/proto/spell.pro	2009-05-13 16:43:13.000000000 +0200
***************
*** 22,26 ****
  char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf));
  int spell_word_start __ARGS((int startcol));
  void spell_expand_check_cap __ARGS((colnr_T col));
! int expand_spelling __ARGS((linenr_T lnum, int col, char_u *pat, char_u ***matchp));
  /* vim: set ft=c : */
--- 22,26 ----
  char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf));
  int spell_word_start __ARGS((int startcol));
  void spell_expand_check_cap __ARGS((colnr_T col));
! int expand_spelling __ARGS((linenr_T lnum, char_u *pat, char_u ***matchp));
  /* vim: set ft=c : */
*** ../vim-7.2.168/src/quickfix.c	2009-04-29 11:49:57.000000000 +0200
--- src/quickfix.c	2009-05-13 15:53:18.000000000 +0200
***************
*** 2774,2780 ****
      sprintf((char *)cmd, "%s%s%s", (char *)p_shq, (char *)eap->arg,
  							       (char *)p_shq);
      if (*p_sp != NUL)
! 	append_redir(cmd, p_sp, fname);
      /*
       * Output a newline if there's something else than the :make command that
       * was typed (in which case the cursor is in column 0).
--- 2774,2780 ----
      sprintf((char *)cmd, "%s%s%s", (char *)p_shq, (char *)eap->arg,
  							       (char *)p_shq);
      if (*p_sp != NUL)
! 	append_redir(cmd, len, p_sp, fname);
      /*
       * Output a newline if there's something else than the :make command that
       * was typed (in which case the cursor is in column 0).
*** ../vim-7.2.168/src/spell.c	2009-02-11 17:57:43.000000000 +0100
--- src/spell.c	2009-05-13 16:31:15.000000000 +0200
***************
*** 16151,16161 ****
   * Returns the number of matches.  The matches are in "matchp[]", array of
   * allocated strings.
   */
- /*ARGSUSED*/
      int
! expand_spelling(lnum, col, pat, matchp)
      linenr_T	lnum;
-     int		col;
      char_u	*pat;
      char_u	***matchp;
  {
--- 16151,16159 ----
   * Returns the number of matches.  The matches are in "matchp[]", array of
   * allocated strings.
   */
      int
! expand_spelling(lnum, pat, matchp)
      linenr_T	lnum;
      char_u	*pat;
      char_u	***matchp;
  {
*** ../vim-7.2.168/src/structs.h	2009-05-13 12:46:36.000000000 +0200
--- src/structs.h	2009-05-13 16:45:51.000000000 +0200
***************
*** 16,22 ****
   */
  #if defined(SASC) && SASC < 658
  typedef long		linenr_T;
! typedef unsigned	colnr_T;
  typedef unsigned short	short_u;
  #endif
  
--- 16,22 ----
   */
  #if defined(SASC) && SASC < 658
  typedef long		linenr_T;
! typedef int		colnr_T;
  typedef unsigned short	short_u;
  #endif
  
*** ../vim-7.2.168/src/term.h	2005-03-16 10:53:56.000000000 +0100
--- src/term.h	2009-05-13 17:27:41.000000000 +0200
***************
*** 96,102 ****
--- 96,106 ----
   * - there should be code in term.c to obtain the value from the termcap
   */
  
+ #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
+ extern char_u **term_strings;    /* current terminal strings */
+ #else
  extern char_u *(term_strings[]);    /* current terminal strings */
+ #endif
  
  /*
   * strings used for terminal
*** ../vim-7.2.168/src/vim.h	2009-04-29 18:44:38.000000000 +0200
--- src/vim.h	2009-05-13 16:45:39.000000000 +0200
***************
*** 1460,1467 ****
  # define PERROR(msg)		    perror(msg)
  #endif
  
! typedef long	    linenr_T;		/* line number type */
! typedef unsigned    colnr_T;		/* column number type */
  typedef unsigned short disptick_T;	/* display tick type */
  
  #define MAXLNUM (0x7fffffffL)		/* maximum (invalid) line number */
--- 1460,1467 ----
  # define PERROR(msg)		    perror(msg)
  #endif
  
! typedef long	linenr_T;		/* line number type */
! typedef int	colnr_T;		/* column number type */
  typedef unsigned short disptick_T;	/* display tick type */
  
  #define MAXLNUM (0x7fffffffL)		/* maximum (invalid) line number */
*** ../vim-7.2.168/src/version.c	2009-05-13 14:48:55.000000000 +0200
--- src/version.c	2009-05-13 18:44:28.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     169,
  /**/

-- 
Females are strictly forbidden to appear unshaven in public.
		[real standing law in New Mexico, 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    ///


--- NEW FILE 7.2.170 ---
To: vim-dev at vim.org
Subject: Patch 7.2.170
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.170
Problem:    Using b_dev while it was not set. (Dominique Pelle)
Solution:   Add the b_dev_valid flag.
Files:	    src/buffer.c, src/fileio.c, src/structs.h


*** ../vim-7.2.169/src/buffer.c	2009-05-13 12:46:36.000000000 +0200
--- src/buffer.c	2009-05-13 20:23:51.000000000 +0200
***************
*** 1678,1686 ****
      buf->b_fname = buf->b_sfname;
  #ifdef UNIX
      if (st.st_dev == (dev_T)-1)
! 	buf->b_dev = -1;
      else
      {
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
--- 1678,1687 ----
      buf->b_fname = buf->b_sfname;
  #ifdef UNIX
      if (st.st_dev == (dev_T)-1)
! 	buf->b_dev_valid = FALSE;
      else
      {
+ 	buf->b_dev_valid = TRUE;
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
***************
*** 2693,2701 ****
      buf->b_fname = buf->b_sfname;
  #ifdef UNIX
      if (st.st_dev == (dev_T)-1)
! 	buf->b_dev = -1;
      else
      {
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
--- 2694,2703 ----
      buf->b_fname = buf->b_sfname;
  #ifdef UNIX
      if (st.st_dev == (dev_T)-1)
! 	buf->b_dev_valid = FALSE;
      else
      {
+ 	buf->b_dev_valid = TRUE;
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
***************
*** 2889,2895 ****
  	/* If no struct stat given, get it now */
  	if (stp == NULL)
  	{
! 	    if (buf->b_dev < 0 || mch_stat((char *)ffname, &st) < 0)
  		st.st_dev = (dev_T)-1;
  	    stp = &st;
  	}
--- 2891,2897 ----
  	/* If no struct stat given, get it now */
  	if (stp == NULL)
  	{
! 	    if (!buf->b_dev_valid || mch_stat((char *)ffname, &st) < 0)
  		st.st_dev = (dev_T)-1;
  	    stp = &st;
  	}
***************
*** 2926,2936 ****
  
      if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0)
      {
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
      else
! 	buf->b_dev = -1;
  }
  
  /*
--- 2928,2939 ----
  
      if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0)
      {
+ 	buf->b_dev_valid = TRUE;
  	buf->b_dev = st.st_dev;
  	buf->b_ino = st.st_ino;
      }
      else
! 	buf->b_dev_valid = FALSE;
  }
  
  /*
***************
*** 2941,2947 ****
      buf_T	*buf;
      struct stat *stp;
  {
!     return (buf->b_dev >= 0
  	    && stp->st_dev == buf->b_dev
  	    && stp->st_ino == buf->b_ino);
  }
--- 2944,2950 ----
      buf_T	*buf;
      struct stat *stp;
  {
!     return (buf->b_dev_valid
  	    && stp->st_dev == buf->b_dev
  	    && stp->st_ino == buf->b_ino);
  }
*** ../vim-7.2.169/src/fileio.c	2009-04-29 18:01:23.000000000 +0200
--- src/fileio.c	2009-05-13 20:24:08.000000000 +0200
***************
*** 4416,4422 ****
  # endif
  	buf_setino(buf);
      }
!     else if (buf->b_dev < 0)
  	/* Set the inode when creating a new file. */
  	buf_setino(buf);
  #endif
--- 4416,4422 ----
  # endif
  	buf_setino(buf);
      }
!     else if (!buf->b_dev_valid)
  	/* Set the inode when creating a new file. */
  	buf_setino(buf);
  #endif
*** ../vim-7.2.169/src/structs.h	2009-05-13 18:54:14.000000000 +0200
--- src/structs.h	2009-05-13 20:24:54.000000000 +0200
***************
*** 1166,1172 ****
      char_u	*b_fname;	/* current file name */
  
  #ifdef UNIX
!     dev_t	b_dev;		/* device number (-1 if not set) */
      ino_t	b_ino;		/* inode number */
  #endif
  #ifdef FEAT_CW_EDITOR
--- 1166,1173 ----
      char_u	*b_fname;	/* current file name */
  
  #ifdef UNIX
!     int		b_dev_valid;	/* TRUE when b_dev has a valid number */
!     dev_t	b_dev;		/* device number */
      ino_t	b_ino;		/* inode number */
  #endif
  #ifdef FEAT_CW_EDITOR
*** ../vim-7.2.169/src/version.c	2009-05-13 18:54:14.000000000 +0200
--- src/version.c	2009-05-13 20:43:22.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     170,
  /**/

-- 
A special cleaning ordinance bans housewives from hiding dirt and dust under a
rug in a dwelling.
		[real standing law in Pennsylvania, 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    ///


--- NEW FILE 7.2.171 ---
To: vim-dev at vim.org
Subject: Patch 7.2.171
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.171 (after 7.2.169)
Problem:    Compiler warnings. (Tony Mechelynck)
Solution:   Add function prototype. (Patrick Texier)  Init variable.
Files:	    src/ex_cmds.c


*** ../vim-7.2.170/src/ex_cmds.c	2009-05-13 18:54:14.000000000 +0200
--- src/ex_cmds.c	2009-05-14 21:11:01.000000000 +0200
***************
*** 4637,4643 ****
  
  		if (do_ask)
  		{
! 		    int typed;
  
  		    /* change State to CONFIRM, so that the mouse works
  		     * properly */
--- 4635,4641 ----
  
  		if (do_ask)
  		{
! 		    int typed = 0;
  
  		    /* change State to CONFIRM, so that the mouse works
  		     * properly */
***************
*** 6553,6558 ****
--- 6549,6555 ----
  static sign_T	*first_sign = NULL;
  static int	last_sign_typenr = MAX_TYPENR;	/* is decremented */
  
+ static int sign_cmd_idx __ARGS((char_u *begin_cmd, char_u *end_cmd));
  static void sign_list_defined __ARGS((sign_T *sp));
  static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
  
***************
*** 6579,6586 ****
   */
      static int
  sign_cmd_idx(begin_cmd, end_cmd)
!     char	*begin_cmd;	/* begin of sign subcmd */
!     char	*end_cmd;	/* just after sign subcmd */
  {
      int		idx;
      char	save = *end_cmd;
--- 6576,6583 ----
   */
      static int
  sign_cmd_idx(begin_cmd, end_cmd)
!     char_u	*begin_cmd;	/* begin of sign subcmd */
!     char_u	*end_cmd;	/* just after sign subcmd */
  {
      int		idx;
      char	save = *end_cmd;
*** ../vim-7.2.170/src/version.c	2009-05-13 20:47:07.000000000 +0200
--- src/version.c	2009-05-14 21:49:22.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     171,
  /**/

-- 
Living on Earth includes an annual free trip around the Sun.

 /// 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    ///


--- NEW FILE 7.2.172 ---
To: vim-dev at vim.org
Subject: Patch 7.2.172 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.172 (extra)
Problem:    Compiler warning.
Solution:   Adjust function prototype. (Patrick Texier)
Files:	    src/os_mswin.c


*** ../vim-7.2.171/src/os_mswin.c	2009-01-22 21:49:21.000000000 +0100
--- src/os_mswin.c	2009-05-14 20:54:32.000000000 +0200
***************
*** 1227,1234 ****
   * Wait for another process to Close the Clipboard.
   * Returns TRUE for success.
   */
!     int
! vim_open_clipboard()
  {
      int delay = 10;
  
--- 1227,1234 ----
   * Wait for another process to Close the Clipboard.
   * Returns TRUE for success.
   */
!     static int
! vim_open_clipboard(void)
  {
      int delay = 10;
  
*** ../vim-7.2.171/src/version.c	2009-05-14 21:51:06.000000000 +0200
--- src/version.c	2009-05-14 21:59:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     172,
  /**/

-- 
FROG: How you English say:  I one more time, mac, I unclog my nose towards
      you, sons of a window-dresser,  so, you think you could out-clever us
      French fellows with your silly knees-bent creeping about advancing
      behaviour.  (blows a raspberry) I wave my private parts at your aunties,
      you brightly-coloured, mealy-templed, cranberry-smelling, electric
      donkey-bottom biters.
                 "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    ///


--- NEW FILE 7.2.173 ---
To: vim-dev at vim.org
Subject: Patch 7.2.173
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.173
Problem:    Without lint there is no check for unused function arguments.
Solution:   Use gcc -Wunused-parameter instead of lint.  For a few files add
	    attributes to arguments that are known not to be used.
Files:	    src/auto/configure, src/buffer.c, src/charset.c, src/diff.c,
	    src/configure.in, src/config.h.in, src/edit.c, src/ex_cmds.c,
	    src/ex_cmds2.c, src/version.c, src/vim.h


*** ../vim-7.2.172/src/auto/configure	2009-05-13 14:48:55.000000000 +0200
--- src/auto/configure	2009-05-14 22:08:12.000000000 +0200
***************
*** 10362,10367 ****
--- 10372,10427 ----
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+ { $as_echo "$as_me:$LINENO: checking whether __attribute__((unused)) is allowed" >&5
+ $as_echo_n "checking whether __attribute__((unused)) is allowed... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <stdio.h>
+ int
+ main ()
+ {
+ int x __attribute__((unused));
+   ;
+   return 0;
+ }
+ _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$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
+   $as_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
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ATTRIBUTE_UNUSED 1
+ _ACEOF
+ 
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  if test "${ac_cv_header_elf_h+set}" = set; then
    { $as_echo "$as_me:$LINENO: checking for elf.h" >&5
  $as_echo_n "checking for elf.h... " >&6; }
*** ../vim-7.2.172/src/buffer.c	2009-05-13 20:47:07.000000000 +0200
--- src/buffer.c	2009-05-14 21:34:06.000000000 +0200
***************
*** 512,523 ****
   * buf_freeall() - free all things allocated for a buffer that are related to
   * the file.
   */
- /*ARGSUSED*/
      void
  buf_freeall(buf, del_buf, wipe_buf)
      buf_T	*buf;
!     int		del_buf;	/* buffer is going to be deleted */
!     int		wipe_buf;	/* buffer is going to be wiped out */
  {
  #ifdef FEAT_AUTOCMD
      int		is_curbuf = (buf == curbuf);
--- 512,522 ----
   * buf_freeall() - free all things allocated for a buffer that are related to
   * the file.
   */
      void
  buf_freeall(buf, del_buf, wipe_buf)
      buf_T	*buf;
!     int		del_buf UNUSED;	    /* buffer is going to be deleted */
!     int		wipe_buf UNUSED;    /* buffer is going to be wiped out */
  {
  #ifdef FEAT_AUTOCMD
      int		is_curbuf = (buf == curbuf);
***************
*** 2437,2447 ****
   * another tab page.
   * Returns NULL when there isn't any info.
   */
- /*ARGSUSED*/
      static wininfo_T *
  find_wininfo(buf, skip_diff_buffer)
      buf_T	*buf;
!     int		skip_diff_buffer;
  {
      wininfo_T	*wip;
  
--- 2436,2445 ----
   * another tab page.
   * Returns NULL when there isn't any info.
   */
      static wininfo_T *
  find_wininfo(buf, skip_diff_buffer)
      buf_T	*buf;
!     int		skip_diff_buffer UNUSED;
  {
      wininfo_T	*wip;
  
***************
*** 4278,4287 ****
   * Make "ffname" a full file name, set "sfname" to "ffname" if not NULL.
   * "ffname" becomes a pointer to allocated memory (or NULL).
   */
- /*ARGSUSED*/
      void
  fname_expand(buf, ffname, sfname)
!     buf_T	*buf;
      char_u	**ffname;
      char_u	**sfname;
  {
--- 4276,4284 ----
   * Make "ffname" a full file name, set "sfname" to "ffname" if not NULL.
   * "ffname" becomes a pointer to allocated memory (or NULL).
   */
      void
  fname_expand(buf, ffname, sfname)
!     buf_T	*buf UNUSED;
      char_u	**ffname;
      char_u	**sfname;
  {
***************
*** 5577,5587 ****
   * this buffer.  Call this to wipe out a temp buffer that does not contain any
   * marks.
   */
- /*ARGSUSED*/
      void
  wipe_buffer(buf, aucmd)
      buf_T	*buf;
!     int		aucmd;	    /* When TRUE trigger autocommands. */
  {
      if (buf->b_fnum == top_file_num - 1)
  	--top_file_num;
--- 5574,5583 ----
   * this buffer.  Call this to wipe out a temp buffer that does not contain any
   * marks.
   */
      void
  wipe_buffer(buf, aucmd)
      buf_T	*buf;
!     int		aucmd UNUSED;	    /* When TRUE trigger autocommands. */
  {
      if (buf->b_fnum == top_file_num - 1)
  	--top_file_num;
*** ../vim-7.2.172/src/charset.c	2009-05-13 14:10:46.000000000 +0200
--- src/charset.c	2009-05-14 21:34:30.000000000 +0200
***************
*** 1026,1038 ****
   * string at start of line.  Warning: *headp is only set if it's a non-zero
   * value, init to 0 before calling.
   */
- /*ARGSUSED*/
      int
  win_lbr_chartabsize(wp, s, col, headp)
      win_T	*wp;
      char_u	*s;
      colnr_T	col;
!     int		*headp;
  {
  #ifdef FEAT_LINEBREAK
      int		c;
--- 1026,1037 ----
   * string at start of line.  Warning: *headp is only set if it's a non-zero
   * value, init to 0 before calling.
   */
      int
  win_lbr_chartabsize(wp, s, col, headp)
      win_T	*wp;
      char_u	*s;
      colnr_T	col;
!     int		*headp UNUSED;
  {
  #ifdef FEAT_LINEBREAK
      int		c;
*** ../vim-7.2.172/src/diff.c	2009-05-13 18:54:14.000000000 +0200
--- src/diff.c	2009-05-14 21:24:59.000000000 +0200
***************
*** 652,661 ****
   * The buffers are written to a file, also for unmodified buffers (the file
   * could have been produced by autocommands, e.g. the netrw plugin).
   */
- /*ARGSUSED*/
      void
  ex_diffupdate(eap)
!     exarg_T	*eap;	    /* can be NULL, it's not used */
  {
      buf_T	*buf;
      int		idx_orig;
--- 652,660 ----
   * The buffers are written to a file, also for unmodified buffers (the file
   * could have been produced by autocommands, e.g. the netrw plugin).
   */
      void
  ex_diffupdate(eap)
!     exarg_T	*eap UNUSED;	    /* can be NULL */
  {
      buf_T	*buf;
      int		idx_orig;
***************
*** 1094,1103 ****
  /*
   * Set options to show difs for the current window.
   */
- /*ARGSUSED*/
      void
  ex_diffthis(eap)
!     exarg_T	*eap;
  {
      /* Set 'diff', 'scrollbind' on and 'wrap' off. */
      diff_win_options(curwin, TRUE);
--- 1093,1101 ----
  /*
   * Set options to show difs for the current window.
   */
      void
  ex_diffthis(eap)
!     exarg_T	*eap UNUSED;
  {
      /* Set 'diff', 'scrollbind' on and 'wrap' off. */
      diff_win_options(curwin, TRUE);
*** ../vim-7.2.172/src/configure.in	2009-05-13 14:48:55.000000000 +0200
--- src/configure.in	2009-05-14 22:08:06.000000000 +0200
***************
*** 2067,2072 ****
--- 2067,2077 ----
  	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_DATE_TIME),
  	AC_MSG_RESULT(no))
  
+ AC_MSG_CHECKING(whether __attribute__((unused)) is allowed)
+ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));],
+ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ATTRIBUTE_UNUSED),
+ 	AC_MSG_RESULT(no))
+ 
  dnl Checks for header files.
  AC_CHECK_HEADER(elf.h, HAS_ELF=1)
  dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
*** ../vim-7.2.172/src/config.h.in	2009-03-02 02:44:54.000000000 +0100
--- src/config.h.in	2009-05-14 21:15:02.000000000 +0200
***************
*** 30,35 ****
--- 30,38 ----
  /* Define when __DATE__ " " __TIME__ can be used */
  #undef HAVE_DATE_TIME
  
+ /* Define when __attribute__((unused)) can be used */
+ #undef HAVE_ATTRIBUTE_UNUSED
+ 
  /* defined always when using configure */
  #undef UNIX
  
*** ../vim-7.2.172/src/edit.c	2009-05-13 18:54:14.000000000 +0200
--- src/edit.c	2009-05-14 21:35:08.000000000 +0200
***************
*** 1447,1456 ****
   * Only redraw when there are no characters available.  This speeds up
   * inserting sequences of characters (e.g., for CTRL-R).
   */
- /*ARGSUSED*/
      static void
  ins_redraw(ready)
!     int		ready;	    /* not busy with something */
  {
      if (!char_avail())
      {
--- 1447,1455 ----
   * Only redraw when there are no characters available.  This speeds up
   * inserting sequences of characters (e.g., for CTRL-R).
   */
      static void
  ins_redraw(ready)
!     int		ready UNUSED;	    /* not busy with something */
  {
      if (!char_avail())
      {
***************
*** 1962,1971 ****
   * Only matters when there are composing characters.
   * Return TRUE when something was deleted.
   */
- /*ARGSUSED*/
     static int
  del_char_after_col(limit_col)
!     int limit_col;
  {
  #ifdef FEAT_MBYTE
      if (enc_utf8 && limit_col >= 0)
--- 1961,1969 ----
   * Only matters when there are composing characters.
   * Return TRUE when something was deleted.
   */
     static int
  del_char_after_col(limit_col)
!     int limit_col UNUSED;
  {
  #ifdef FEAT_MBYTE
      if (enc_utf8 && limit_col >= 0)
*** ../vim-7.2.172/src/ex_cmds.c	2009-05-14 21:51:06.000000000 +0200
--- src/ex_cmds.c	2009-05-14 21:11:01.000000000 +0200
***************
*** 43,52 ****
  /*
   * ":ascii" and "ga".
   */
- /*ARGSUSED*/
      void
  do_ascii(eap)
!     exarg_T	*eap;
  {
      int		c;
      int		cval;
--- 43,51 ----
  /*
   * ":ascii" and "ga".
   */
      void
  do_ascii(eap)
!     exarg_T	*eap UNUSED;
  {
      int		c;
      int		cval;
***************
*** 2373,2382 ****
   *   ^?		^H
   * not ^?	^?
   */
- /*ARGSUSED*/
      void
  do_fixdel(eap)
!     exarg_T	*eap;
  {
      char_u  *p;
  
--- 2372,2380 ----
   *   ^?		^H
   * not ^?	^?
   */
      void
  do_fixdel(eap)
!     exarg_T	*eap UNUSED;
  {
      char_u  *p;
  
***************
*** 6127,6136 ****
  /*
   * ":exusage"
   */
- /*ARGSUSED*/
      void
  ex_exusage(eap)
!     exarg_T	*eap;
  {
      do_cmdline_cmd((char_u *)"help ex-cmd-index");
  }
--- 6125,6133 ----
  /*
   * ":exusage"
   */
      void
  ex_exusage(eap)
!     exarg_T	*eap UNUSED;
  {
      do_cmdline_cmd((char_u *)"help ex-cmd-index");
  }
***************
*** 6138,6147 ****
  /*
   * ":viusage"
   */
- /*ARGSUSED*/
      void
  ex_viusage(eap)
!     exarg_T	*eap;
  {
      do_cmdline_cmd((char_u *)"help normal-index");
  }
--- 6135,6143 ----
  /*
   * ":viusage"
   */
      void
  ex_viusage(eap)
!     exarg_T	*eap UNUSED;
  {
      do_cmdline_cmd((char_u *)"help normal-index");
  }
***************
*** 7154,7163 ****
   * Function given to ExpandGeneric() to obtain the sign command
   * expansion.
   */
- /*ARGSUSED*/
      char_u *
  get_sign_name(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      sign_T	*sp;
--- 7150,7158 ----
   * Function given to ExpandGeneric() to obtain the sign command
   * expansion.
   */
      char_u *
  get_sign_name(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      sign_T	*sp;
*** ../vim-7.2.172/src/ex_cmds2.c	2009-05-13 18:54:14.000000000 +0200
--- src/ex_cmds2.c	2009-05-14 21:35:40.000000000 +0200
***************
*** 680,689 ****
  /*
   * ":breaklist".
   */
- /*ARGSUSED*/
      void
  ex_breaklist(eap)
!     exarg_T	*eap;
  {
      struct debuggy *bp;
      int		i;
--- 680,688 ----
  /*
   * ":breaklist".
   */
      void
  ex_breaklist(eap)
!     exarg_T	*eap UNUSED;
  {
      struct debuggy *bp;
      int		i;
***************
*** 1342,1355 ****
  /*
   * return TRUE if buffer was changed and cannot be abandoned.
   */
- /*ARGSUSED*/
      int
  check_changed(buf, checkaw, mult_win, forceit, allbuf)
      buf_T	*buf;
      int		checkaw;	/* do autowrite if buffer was changed */
      int		mult_win;	/* check also when several wins for the buf */
      int		forceit;
!     int		allbuf;		/* may write all buffers */
  {
      if (       !forceit
  	    && bufIsChanged(buf)
--- 1341,1353 ----
  /*
   * return TRUE if buffer was changed and cannot be abandoned.
   */
      int
  check_changed(buf, checkaw, mult_win, forceit, allbuf)
      buf_T	*buf;
      int		checkaw;	/* do autowrite if buffer was changed */
      int		mult_win;	/* check also when several wins for the buf */
      int		forceit;
!     int		allbuf UNUSED;	/* may write all buffers */
  {
      if (       !forceit
  	    && bufIsChanged(buf)
***************
*** 1759,1770 ****
   *
   * Return FAIL for failure, OK otherwise.
   */
- /*ARGSUSED*/
      static int
  do_arglist(str, what, after)
      char_u	*str;
!     int		what;
!     int		after;		/* 0 means before first one */
  {
      garray_T	new_ga;
      int		exp_count;
--- 1757,1767 ----
   *
   * Return FAIL for failure, OK otherwise.
   */
      static int
  do_arglist(str, what, after)
      char_u	*str;
!     int		what UNUSED;
!     int		after UNUSED;		/* 0 means before first one */
  {
      garray_T	new_ga;
      int		exp_count;
***************
*** 2549,2559 ****
  
  static void source_callback __ARGS((char_u *fname, void *cookie));
  
- /*ARGSUSED*/
      static void
  source_callback(fname, cookie)
      char_u	*fname;
!     void	*cookie;
  {
      (void)do_source(fname, FALSE, DOSO_NONE);
  }
--- 2546,2555 ----
  
  static void source_callback __ARGS((char_u *fname, void *cookie));
  
      static void
  source_callback(fname, cookie)
      char_u	*fname;
!     void	*cookie UNUSED;
  {
      (void)do_source(fname, FALSE, DOSO_NONE);
  }
***************
*** 2680,2689 ****
  /*
   * ":options"
   */
- /*ARGSUSED*/
      void
  ex_options(eap)
!     exarg_T	*eap;
  {
      cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
  }
--- 2676,2684 ----
  /*
   * ":options"
   */
      void
  ex_options(eap)
!     exarg_T	*eap UNUSED;
  {
      cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
  }
***************
*** 3190,3199 ****
  /*
   * ":scriptnames"
   */
- /*ARGSUSED*/
      void
  ex_scriptnames(eap)
!     exarg_T	*eap;
  {
      int i;
  
--- 3185,3193 ----
  /*
   * ":scriptnames"
   */
      void
  ex_scriptnames(eap)
!     exarg_T	*eap UNUSED;
  {
      int i;
  
***************
*** 3317,3328 ****
   * Return a pointer to the line in allocated memory.
   * Return NULL for end-of-file or some error.
   */
- /* ARGSUSED */
      char_u *
  getsourceline(c, cookie, indent)
!     int		c;		/* not used */
      void	*cookie;
!     int		indent;		/* not used */
  {
      struct source_cookie *sp = (struct source_cookie *)cookie;
      char_u		*line;
--- 3311,3321 ----
   * Return a pointer to the line in allocated memory.
   * Return NULL for end-of-file or some error.
   */
      char_u *
  getsourceline(c, cookie, indent)
!     int		c UNUSED;
      void	*cookie;
!     int		indent UNUSED;
  {
      struct source_cookie *sp = (struct source_cookie *)cookie;
      char_u		*line;
***************
*** 3649,3658 ****
   * ":scriptencoding": Set encoding conversion for a sourced script.
   * Without the multi-byte feature it's simply ignored.
   */
- /*ARGSUSED*/
      void
  ex_scriptencoding(eap)
!     exarg_T	*eap;
  {
  #ifdef FEAT_MBYTE
      struct source_cookie	*sp;
--- 3642,3650 ----
   * ":scriptencoding": Set encoding conversion for a sourced script.
   * Without the multi-byte feature it's simply ignored.
   */
      void
  ex_scriptencoding(eap)
!     exarg_T	*eap UNUSED;
  {
  #ifdef FEAT_MBYTE
      struct source_cookie	*sp;
***************
*** 4101,4110 ****
   * Function given to ExpandGeneric() to obtain the possible arguments of the
   * ":language" command.
   */
- /*ARGSUSED*/
      char_u *
  get_lang_arg(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      if (idx == 0)
--- 4093,4101 ----
   * Function given to ExpandGeneric() to obtain the possible arguments of the
   * ":language" command.
   */
      char_u *
  get_lang_arg(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      if (idx == 0)
*** ../vim-7.2.172/src/version.c	2009-05-14 22:00:37.000000000 +0200
--- src/version.c	2009-05-14 22:14:51.000000000 +0200
***************
*** 1623,1632 ****
  /*
   * ":intro": clear screen, display intro screen and wait for return.
   */
- /*ARGSUSED*/
      void
  ex_intro(eap)
!     exarg_T	*eap;
  {
      screenclear();
      intro_message(TRUE);
--- 1625,1633 ----
  /*
   * ":intro": clear screen, display intro screen and wait for return.
   */
      void
  ex_intro(eap)
!     exarg_T	*eap UNUSED;
  {
      screenclear();
      intro_message(TRUE);
*** ../vim-7.2.172/src/vim.h	2009-05-13 18:54:14.000000000 +0200
--- src/vim.h	2009-05-14 21:17:51.000000000 +0200
***************
*** 262,267 ****
--- 262,275 ----
  # define __PARMS(x) __ARGS(x)
  #endif
  
+ /* Mark unused function arguments with UNUSED, so that gcc -Wunused-parameter
+  * can be used to check for mistakes. */
+ #ifdef HAVE_ATTRIBUTE_UNUSED
+ # define UNUSED __attribute__((unused))
+ #else
+ # define UNUSED
+ #endif
+ 
  /* if we're compiling in C++ (currently only KVim), the system
   * headers must have the correct prototypes or nothing will build.
   * conversely, our prototypes might clash due to throw() specifiers and
*** ../vim-7.2.172/src/version.c	2009-05-14 22:00:37.000000000 +0200
--- src/version.c	2009-05-14 22:14:51.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     173,
  /**/

-- 
SIGIRO -- irony detected (iron core dumped)

 /// 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    ///


--- NEW FILE 7.2.174 ---
To: vim-dev at vim.org
Subject: Patch 7.2.174
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.174
Problem:    Too many warnings from gcc -Wextra.
Solution:   Change initializer.  Add UNUSED.  Add type casts.
Files:      src/edit.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c,
            src/ex_getln.c, src/fileio.c, getchar.c, globals.h, main.c,
            memline.c, message.c, src/misc1.c, src/move.c, src/normal.c,
            src/option.c, src/os_unix.c, src/os_unix.h, src/regexp.c,
            src/search.c, src/tag.c


*** ../vim-7.2.173/src/edit.c	2009-05-14 22:19:19.000000000 +0200
--- src/edit.c	2009-05-15 21:06:07.000000000 +0200
***************
*** 8991,8997 ****
  	foldOpenCursor();
  #endif
      undisplay_dollar();
!     if (gchar_cursor() != NUL || virtual_active()
  	    )
      {
  	start_arrow(&curwin->w_cursor);
--- 8992,9001 ----
  	foldOpenCursor();
  #endif
      undisplay_dollar();
!     if (gchar_cursor() != NUL
! #ifdef FEAT_VIRTUALEDIT
! 	    || virtual_active()
! #endif
  	    )
      {
  	start_arrow(&curwin->w_cursor);
*** ../vim-7.2.173/src/eval.c	2009-04-22 16:07:57.000000000 +0200
--- src/eval.c	2009-05-15 21:18:08.000000000 +0200
***************
*** 8303,8312 ****
  /*
   * "argc()" function
   */
- /* ARGSUSED */
      static void
  f_argc(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
      rettv->vval.v_number = ARGCOUNT;
--- 8303,8311 ----
  /*
   * "argc()" function
   */
      static void
  f_argc(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
      rettv->vval.v_number = ARGCOUNT;
***************
*** 8315,8324 ****
  /*
   * "argidx()" function
   */
- /* ARGSUSED */
      static void
  f_argidx(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
      rettv->vval.v_number = curwin->w_arg_idx;
--- 8314,8322 ----
  /*
   * "argidx()" function
   */
      static void
  f_argidx(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
      rettv->vval.v_number = curwin->w_arg_idx;
***************
*** 8396,8405 ****
  /*
   * "browse(save, title, initdir, default)" function
   */
- /* ARGSUSED */
      static void
  f_browse(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
  #ifdef FEAT_BROWSE
--- 8394,8402 ----
  /*
   * "browse(save, title, initdir, default)" function
   */
      static void
  f_browse(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
  #ifdef FEAT_BROWSE
***************
*** 8431,8440 ****
  /*
   * "browsedir(title, initdir)" function
   */
- /* ARGSUSED */
      static void
  f_browsedir(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
  #ifdef FEAT_BROWSE
--- 8428,8436 ----
  /*
   * "browsedir(title, initdir)" function
   */
      static void
  f_browsedir(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
  #ifdef FEAT_BROWSE
***************
*** 8801,8810 ****
  /*
   * "changenr()" function
   */
- /*ARGSUSED*/
      static void
  f_changenr(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
      rettv->vval.v_number = curbuf->b_u_seq_cur;
--- 8797,8805 ----
  /*
   * "changenr()" function
   */
      static void
  f_changenr(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
      rettv->vval.v_number = curbuf->b_u_seq_cur;
***************
*** 8854,8863 ****
  /*
   * "clearmatches()" function
   */
- /*ARGSUSED*/
      static void
  f_clearmatches(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
  #ifdef FEAT_SEARCH_EXTRA
--- 8849,8857 ----
  /*
   * "clearmatches()" function
   */
      static void
  f_clearmatches(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
  #ifdef FEAT_SEARCH_EXTRA
*** ../vim-7.2.173/src/ex_cmds.c	2009-05-14 22:19:19.000000000 +0200
--- src/ex_cmds.c	2009-05-15 20:42:18.000000000 +0200
***************
*** 4040,4047 ****
--- 4040,4049 ----
  	bigness = curwin->w_height;
      else if (firstwin == lastwin)
  	bigness = curwin->w_p_scr * 2;
+ #ifdef FEAT_WINDOWS
      else
  	bigness = curwin->w_height - 3;
+ #endif
      if (bigness < 1)
  	bigness = 1;
  
*** ../vim-7.2.173/src/ex_docmd.c	2009-05-13 18:54:14.000000000 +0200
--- src/ex_docmd.c	2009-05-15 20:47:58.000000000 +0200
***************
*** 1578,1588 ****
   * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
   * "func".  * Otherwise return TRUE when "fgetline" equals "func".
   */
- /*ARGSUSED*/
      int
  getline_equal(fgetline, cookie, func)
      char_u	*(*fgetline) __ARGS((int, void *, int));
!     void	*cookie;		/* argument for fgetline() */
      char_u	*(*func) __ARGS((int, void *, int));
  {
  #ifdef FEAT_EVAL
--- 1578,1587 ----
   * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
   * "func".  * Otherwise return TRUE when "fgetline" equals "func".
   */
      int
  getline_equal(fgetline, cookie, func)
      char_u	*(*fgetline) __ARGS((int, void *, int));
!     void	*cookie UNUSED;		/* argument for fgetline() */
      char_u	*(*func) __ARGS((int, void *, int));
  {
  #ifdef FEAT_EVAL
***************
*** 1610,1619 ****
   * If "fgetline" is get_loop_line(), return the cookie used by the original
   * getline function.  Otherwise return "cookie".
   */
- /*ARGSUSED*/
      void *
  getline_cookie(fgetline, cookie)
!     char_u	*(*fgetline) __ARGS((int, void *, int));
      void	*cookie;		/* argument for fgetline() */
  {
  # ifdef FEAT_EVAL
--- 1609,1617 ----
   * If "fgetline" is get_loop_line(), return the cookie used by the original
   * getline function.  Otherwise return "cookie".
   */
      void *
  getline_cookie(fgetline, cookie)
!     char_u	*(*fgetline) __ARGS((int, void *, int)) UNUSED;
      void	*cookie;		/* argument for fgetline() */
  {
  # ifdef FEAT_EVAL
***************
*** 2754,2764 ****
   * "full" is set to TRUE if the whole command name matched.
   * Returns NULL for an ambiguous user command.
   */
- /*ARGSUSED*/
      static char_u *
  find_command(eap, full)
      exarg_T	*eap;
!     int		*full;
  {
      int		len;
      char_u	*p;
--- 2752,2761 ----
   * "full" is set to TRUE if the whole command name matched.
   * Returns NULL for an ambiguous user command.
   */
      static char_u *
  find_command(eap, full)
      exarg_T	*eap;
!     int		*full UNUSED;
  {
      int		len;
      char_u	*p;
***************
*** 5053,5062 ****
  /*
   * Function given to ExpandGeneric() to obtain the list of command names.
   */
- /*ARGSUSED*/
      char_u *
  get_command_name(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      if (idx >= (int)CMD_SIZE)
--- 5050,5058 ----
  /*
   * Function given to ExpandGeneric() to obtain the list of command names.
   */
      char_u *
  get_command_name(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      if (idx >= (int)CMD_SIZE)
***************
*** 5573,5582 ****
   * ":comclear"
   * Clear all user commands, global and for current buffer.
   */
- /*ARGSUSED*/
      void
  ex_comclear(eap)
!     exarg_T	*eap;
  {
      uc_clear(&ucmds);
      uc_clear(&curbuf->b_ucmds);
--- 5569,5577 ----
   * ":comclear"
   * Clear all user commands, global and for current buffer.
   */
      void
  ex_comclear(eap)
!     exarg_T	*eap UNUSED;
  {
      uc_clear(&ucmds);
      uc_clear(&curbuf->b_ucmds);
***************
*** 6072,6081 ****
  /*
   * Function given to ExpandGeneric() to obtain the list of user command names.
   */
- /*ARGSUSED*/
      char_u *
  get_user_commands(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      if (idx < curbuf->b_ucmds.ga_len)
--- 6067,6075 ----
  /*
   * Function given to ExpandGeneric() to obtain the list of user command names.
   */
      char_u *
  get_user_commands(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      if (idx < curbuf->b_ucmds.ga_len)
***************
*** 6090,6099 ****
   * Function given to ExpandGeneric() to obtain the list of user command
   * attributes.
   */
- /*ARGSUSED*/
      char_u *
  get_user_cmd_flags(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      static char *user_cmd_flags[] =
--- 6084,6092 ----
   * Function given to ExpandGeneric() to obtain the list of user command
   * attributes.
   */
      char_u *
  get_user_cmd_flags(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      static char *user_cmd_flags[] =
***************
*** 6108,6117 ****
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -nargs.
   */
- /*ARGSUSED*/
      char_u *
  get_user_cmd_nargs(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
--- 6101,6109 ----
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -nargs.
   */
      char_u *
  get_user_cmd_nargs(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
***************
*** 6124,6133 ****
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -complete.
   */
- /*ARGSUSED*/
      char_u *
  get_user_cmd_complete(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      return (char_u *)command_complete[idx].name;
--- 6116,6124 ----
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -complete.
   */
      char_u *
  get_user_cmd_complete(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      return (char_u *)command_complete[idx].name;
***************
*** 6305,6314 ****
  /*
   * ":cquit".
   */
- /*ARGSUSED*/
      static void
  ex_cquit(eap)
!     exarg_T	*eap;
  {
      getout(1);	/* this does not always pass on the exit code to the Manx
  		   compiler. why? */
--- 6296,6304 ----
  /*
   * ":cquit".
   */
      static void
  ex_cquit(eap)
!     exarg_T	*eap UNUSED;
  {
      getout(1);	/* this does not always pass on the exit code to the Manx
  		   compiler. why? */
***************
*** 6750,6759 ****
  /*
   * ":shell".
   */
- /*ARGSUSED*/
      static void
  ex_shell(eap)
!     exarg_T	*eap;
  {
      do_shell(NULL, 0);
  }
--- 6740,6748 ----
  /*
   * ":shell".
   */
      static void
  ex_shell(eap)
!     exarg_T	*eap UNUSED;
  {
      do_shell(NULL, 0);
  }
***************
*** 7057,7066 ****
  /*
   * ":preserve".
   */
- /*ARGSUSED*/
      static void
  ex_preserve(eap)
!     exarg_T	*eap;
  {
      curbuf->b_flags |= BF_PRESERVED;
      ml_preserve(curbuf, TRUE);
--- 7046,7054 ----
  /*
   * ":preserve".
   */
      static void
  ex_preserve(eap)
!     exarg_T	*eap UNUSED;
  {
      curbuf->b_flags |= BF_PRESERVED;
      ml_preserve(curbuf, TRUE);
***************
*** 7292,7301 ****
  /*
   * :tabs command: List tabs and their contents.
   */
- /*ARGSUSED*/
      static void
  ex_tabs(eap)
!     exarg_T	*eap;
  {
      tabpage_T	*tp;
      win_T	*wp;
--- 7280,7288 ----
  /*
   * :tabs command: List tabs and their contents.
   */
      static void
  ex_tabs(eap)
!     exarg_T	*eap UNUSED;
  {
      tabpage_T	*tp;
      win_T	*wp;
***************
*** 7482,7488 ****
  /*
   * ":edit <file>" command and alikes.
   */
- /*ARGSUSED*/
      void
  do_exedit(eap, old_curwin)
      exarg_T	*eap;
--- 7469,7474 ----
***************
*** 7694,7703 ****
  }
  #endif
  
- /*ARGSUSED*/
      static void
  ex_swapname(eap)
!     exarg_T	*eap;
  {
      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
  	MSG(_("No swap file"));
--- 7680,7688 ----
  }
  #endif
  
      static void
  ex_swapname(eap)
!     exarg_T	*eap UNUSED;
  {
      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
  	MSG(_("No swap file"));
***************
*** 7710,7719 ****
   * offset.
   * (1998-11-02 16:21:01  R. Edward Ralston <eralston at computer.org>)
   */
- /*ARGSUSED*/
      static void
  ex_syncbind(eap)
!     exarg_T	*eap;
  {
  #ifdef FEAT_SCROLLBIND
      win_T	*wp;
--- 7695,7703 ----
   * offset.
   * (1998-11-02 16:21:01  R. Edward Ralston <eralston at computer.org>)
   */
      static void
  ex_syncbind(eap)
!     exarg_T	*eap UNUSED;
  {
  #ifdef FEAT_SCROLLBIND
      win_T	*wp;
***************
*** 7983,7992 ****
  /*
   * ":pwd".
   */
- /*ARGSUSED*/
      static void
  ex_pwd(eap)
!     exarg_T	*eap;
  {
      if (mch_dirname(NameBuff, MAXPATHL) == OK)
      {
--- 7967,7975 ----
  /*
   * ":pwd".
   */
      static void
  ex_pwd(eap)
!     exarg_T	*eap UNUSED;
  {
      if (mch_dirname(NameBuff, MAXPATHL) == OK)
      {
***************
*** 8417,8426 ****
  /*
   * ":undo".
   */
- /*ARGSUSED*/
      static void
  ex_undo(eap)
!     exarg_T	*eap;
  {
      if (eap->addr_count == 1)	    /* :undo 123 */
  	undo_time(eap->line2, FALSE, TRUE);
--- 8400,8408 ----
  /*
   * ":undo".
   */
      static void
  ex_undo(eap)
!     exarg_T	*eap UNUSED;
  {
      if (eap->addr_count == 1)	    /* :undo 123 */
  	undo_time(eap->line2, FALSE, TRUE);
***************
*** 8431,8440 ****
  /*
   * ":redo".
   */
- /*ARGSUSED*/
      static void
  ex_redo(eap)
!     exarg_T	*eap;
  {
      u_redo(1);
  }
--- 8413,8421 ----
  /*
   * ":redo".
   */
      static void
  ex_redo(eap)
!     exarg_T	*eap UNUSED;
  {
      u_redo(1);
  }
***************
*** 8442,8448 ****
  /*
   * ":earlier" and ":later".
   */
- /*ARGSUSED*/
      static void
  ex_later(eap)
      exarg_T	*eap;
--- 8423,8428 ----
***************
*** 8627,8636 ****
  /*
   * ":redrawstatus": force redraw of status line(s)
   */
- /*ARGSUSED*/
      static void
  ex_redrawstatus(eap)
!     exarg_T	*eap;
  {
  #if defined(FEAT_WINDOWS)
      int		r = RedrawingDisabled;
--- 8607,8615 ----
  /*
   * ":redrawstatus": force redraw of status line(s)
   */
      static void
  ex_redrawstatus(eap)
!     exarg_T	*eap UNUSED;
  {
  #if defined(FEAT_WINDOWS)
      int		r = RedrawingDisabled;
***************
*** 8891,8901 ****
  
  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
  	|| defined(PROTO)
- /*ARGSUSED*/
      int
  vim_mkdir_emsg(name, prot)
      char_u	*name;
!     int		prot;
  {
      if (vim_mkdir(name, prot) != 0)
      {
--- 8870,8879 ----
  
  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
  	|| defined(PROTO)
      int
  vim_mkdir_emsg(name, prot)
      char_u	*name;
!     int		prot UNUSED;
  {
      if (vim_mkdir(name, prot) != 0)
      {
***************
*** 10968,10977 ****
  }
  #endif
  
- /*ARGSUSED*/
      static void
  ex_digraphs(eap)
!     exarg_T	*eap;
  {
  #ifdef FEAT_DIGRAPHS
      if (*eap->arg != NUL)
--- 10946,10954 ----
  }
  #endif
  
      static void
  ex_digraphs(eap)
!     exarg_T	*eap UNUSED;
  {
  #ifdef FEAT_DIGRAPHS
      if (*eap->arg != NUL)
***************
*** 11005,11014 ****
  /*
   * ":nohlsearch"
   */
- /*ARGSUSED*/
      static void
  ex_nohlsearch(eap)
!     exarg_T	*eap;
  {
      no_hlsearch = TRUE;
      redraw_all_later(SOME_VALID);
--- 10982,10990 ----
  /*
   * ":nohlsearch"
   */
      static void
  ex_nohlsearch(eap)
!     exarg_T	*eap UNUSED;
  {
      no_hlsearch = TRUE;
      redraw_all_later(SOME_VALID);
***************
*** 11087,11096 ****
  /*
   * ":X": Get crypt key
   */
- /*ARGSUSED*/
      static void
  ex_X(eap)
!     exarg_T	*eap;
  {
      (void)get_crypt_key(TRUE, TRUE);
  }
--- 11063,11071 ----
  /*
   * ":X": Get crypt key
   */
      static void
  ex_X(eap)
!     exarg_T	*eap UNUSED;
  {
      (void)get_crypt_key(TRUE, TRUE);
  }
*** ../vim-7.2.173/src/ex_getln.c	2009-04-29 18:44:38.000000000 +0200
--- src/ex_getln.c	2009-05-15 20:49:22.000000000 +0200
***************
*** 140,150 ****
   * Return pointer to allocated string if there is a commandline, NULL
   * otherwise.
   */
- /*ARGSUSED*/
      char_u *
  getcmdline(firstc, count, indent)
      int		firstc;
!     long	count;		/* only used for incremental search */
      int		indent;		/* indent for inside conditionals */
  {
      int		c;
--- 140,149 ----
   * Return pointer to allocated string if there is a commandline, NULL
   * otherwise.
   */
      char_u *
  getcmdline(firstc, count, indent)
      int		firstc;
!     long	count UNUSED;	/* only used for incremental search */
      int		indent;		/* indent for inside conditionals */
  {
      int		c;
***************
*** 2113,2123 ****
  /*
   * Get an Ex command line for the ":" command.
   */
- /* ARGSUSED */
      char_u *
! getexline(c, dummy, indent)
      int		c;		/* normally ':', NUL for ":append" */
!     void	*dummy;		/* cookie not used */
      int		indent;		/* indent for inside conditionals */
  {
      /* When executing a register, remove ':' that's in front of each line. */
--- 2112,2121 ----
  /*
   * Get an Ex command line for the ":" command.
   */
      char_u *
! getexline(c, cookie, indent)
      int		c;		/* normally ':', NUL for ":append" */
!     void	*cookie UNUSED;
      int		indent;		/* indent for inside conditionals */
  {
      /* When executing a register, remove ':' that's in front of each line. */
***************
*** 2132,2143 ****
   * mappings or abbreviations.
   * Returns a string in allocated memory or NULL.
   */
- /* ARGSUSED */
      char_u *
! getexmodeline(promptc, dummy, indent)
      int		promptc;	/* normally ':', NUL for ":append" and '?' for
  				   :s prompt */
!     void	*dummy;		/* cookie not used */
      int		indent;		/* indent for inside conditionals */
  {
      garray_T	line_ga;
--- 2130,2140 ----
   * mappings or abbreviations.
   * Returns a string in allocated memory or NULL.
   */
      char_u *
! getexmodeline(promptc, cookie, indent)
      int		promptc;	/* normally ':', NUL for ":append" and '?' for
  				   :s prompt */
!     void	*cookie UNUSED;
      int		indent;		/* indent for inside conditionals */
  {
      garray_T	line_ga;
***************
*** 3832,3842 ****
   * Returns EXPAND_NOTHING when the character that triggered expansion should
   * be inserted like a normal character.
   */
- /*ARGSUSED*/
      static int
  showmatches(xp, wildmenu)
      expand_T	*xp;
!     int		wildmenu;
  {
  #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])
      int		num_files;
--- 3829,3838 ----
   * Returns EXPAND_NOTHING when the character that triggered expansion should
   * be inserted like a normal character.
   */
      static int
  showmatches(xp, wildmenu)
      expand_T	*xp;
!     int		wildmenu UNUSED;
  {
  #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])
      int		num_files;
*** ../vim-7.2.173/src/fileio.c	2009-05-13 20:47:07.000000000 +0200
--- src/fileio.c	2009-05-15 20:52:40.000000000 +0200
***************
*** 3498,3504 ****
  		    if (mch_stat((char *)IObuff, &st) < 0
  			    || st.st_uid != st_old.st_uid
  			    || st.st_gid != st_old.st_gid
! 			    || st.st_mode != perm)
  			backup_copy = TRUE;
  # endif
  		    /* Close the file before removing it, on MS-Windows we
--- 3498,3504 ----
  		    if (mch_stat((char *)IObuff, &st) < 0
  			    || st.st_uid != st_old.st_uid
  			    || st.st_gid != st_old.st_gid
! 			    || (long)st.st_mode != perm)
  			backup_copy = TRUE;
  # endif
  		    /* Close the file before removing it, on MS-Windows we
***************
*** 5963,5969 ****
  	else if (*ext == '.')
  #endif
  	{
! 	    if (s - ptr > (size_t)8)
  	    {
  		s = ptr + 8;
  		*s = '\0';
--- 5971,5977 ----
  	else if (*ext == '.')
  #endif
  	{
! 	    if ((size_t)(s - ptr) > (size_t)8)
  	    {
  		s = ptr + 8;
  		*s = '\0';
***************
*** 6460,6470 ****
   * return 2 if a message has been displayed.
   * return 0 otherwise.
   */
- /*ARGSUSED*/
      int
  buf_check_timestamp(buf, focus)
      buf_T	*buf;
!     int		focus;		/* called for GUI focus event */
  {
      struct stat	st;
      int		stat_res;
--- 6468,6477 ----
   * return 2 if a message has been displayed.
   * return 0 otherwise.
   */
      int
  buf_check_timestamp(buf, focus)
      buf_T	*buf;
!     int		focus UNUSED;	/* called for GUI focus event */
  {
      struct stat	st;
      int		stat_res;
***************
*** 6868,6879 ****
      /* Careful: autocommands may have made "buf" invalid! */
  }
  
- /*ARGSUSED*/
      void
  buf_store_time(buf, st, fname)
      buf_T	*buf;
      struct stat	*st;
!     char_u	*fname;
  {
      buf->b_mtime = (long)st->st_mtime;
      buf->b_orig_size = (size_t)st->st_size;
--- 6875,6885 ----
      /* Careful: autocommands may have made "buf" invalid! */
  }
  
      void
  buf_store_time(buf, st, fname)
      buf_T	*buf;
      struct stat	*st;
!     char_u	*fname UNUSED;
  {
      buf->b_mtime = (long)st->st_mtime;
      buf->b_orig_size = (size_t)st->st_size;
***************
*** 6936,6945 ****
   * The returned pointer is to allocated memory.
   * The returned pointer is NULL if no valid name was found.
   */
- /*ARGSUSED*/
      char_u  *
  vim_tempname(extra_char)
!     int	    extra_char;	    /* character to use in the name instead of '?' */
  {
  #ifdef USE_TMPNAM
      char_u	itmp[L_tmpnam];	/* use tmpnam() */
--- 6942,6950 ----
   * The returned pointer is to allocated memory.
   * The returned pointer is NULL if no valid name was found.
   */
      char_u  *
  vim_tempname(extra_char)
!     int	    extra_char UNUSED;  /* char to use in the name instead of '?' */
  {
  #ifdef USE_TMPNAM
      char_u	itmp[L_tmpnam];	/* use tmpnam() */
***************
*** 6968,6974 ****
  	/*
  	 * Try the entries in TEMPDIRNAMES to create the temp directory.
  	 */
! 	for (i = 0; i < sizeof(tempdirs) / sizeof(char *); ++i)
  	{
  	    /* expand $TMP, leave room for "/v1100000/999999999" */
  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
--- 6973,6979 ----
  	/*
  	 * Try the entries in TEMPDIRNAMES to create the temp directory.
  	 */
! 	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
  	{
  	    /* expand $TMP, leave room for "/v1100000/999999999" */
  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
***************
*** 9588,9600 ****
   *
   * Returns NULL when out of memory.
   */
- /*ARGSUSED*/
      char_u *
  file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
      char_u	*pat;
      char_u	*pat_end;	/* first char after pattern or NULL */
      char	*allow_dirs;	/* Result passed back out in here */
!     int		no_bslash;	/* Don't use a backward slash as pathsep */
  {
      int		size;
      char_u	*endp;
--- 9593,9604 ----
   *
   * Returns NULL when out of memory.
   */
      char_u *
  file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
      char_u	*pat;
      char_u	*pat_end;	/* first char after pattern or NULL */
      char	*allow_dirs;	/* Result passed back out in here */
!     int		no_bslash UNUSED; /* Don't use a backward slash as pathsep */
  {
      int		size;
      char_u	*endp;
*** ../vim-7.2.173/src/misc1.c	2009-04-29 11:00:09.000000000 +0200
--- src/misc1.c	2009-05-15 20:59:08.000000000 +0200
***************
*** 2188,2199 ****
   *
   * return FAIL for failure, OK otherwise
   */
- /*ARGSUSED*/
      int
  del_bytes(count, fixpos_arg, use_delcombine)
      long	count;
      int		fixpos_arg;
!     int		use_delcombine;	    /* 'delcombine' option applies */
  {
      char_u	*oldp, *newp;
      colnr_T	oldlen;
--- 2188,2198 ----
   *
   * return FAIL for failure, OK otherwise
   */
      int
  del_bytes(count, fixpos_arg, use_delcombine)
      long	count;
      int		fixpos_arg;
!     int		use_delcombine UNUSED;	    /* 'delcombine' option applies */
  {
      char_u	*oldp, *newp;
      colnr_T	oldlen;
*** ../vim-7.2.173/src/move.c	2008-11-15 16:05:30.000000000 +0100
--- src/move.c	2009-05-15 21:00:06.000000000 +0200
***************
*** 1238,1248 ****
  /*
   * Scroll the current window down by "line_count" logical lines.  "CTRL-Y"
   */
- /*ARGSUSED*/
      void
  scrolldown(line_count, byfold)
      long	line_count;
!     int		byfold;		/* TRUE: count a closed fold as one line */
  {
      long	done = 0;	/* total # of physical lines done */
      int		wrow;
--- 1238,1247 ----
  /*
   * Scroll the current window down by "line_count" logical lines.  "CTRL-Y"
   */
      void
  scrolldown(line_count, byfold)
      long	line_count;
!     int		byfold UNUSED;	/* TRUE: count a closed fold as one line */
  {
      long	done = 0;	/* total # of physical lines done */
      int		wrow;
***************
*** 1349,1359 ****
  /*
   * Scroll the current window up by "line_count" logical lines.  "CTRL-E"
   */
- /*ARGSUSED*/
      void
  scrollup(line_count, byfold)
      long	line_count;
!     int		byfold;		/* TRUE: count a closed fold as one line */
  {
  #if defined(FEAT_FOLDING) || defined(FEAT_DIFF)
      linenr_T	lnum;
--- 1348,1357 ----
  /*
   * Scroll the current window up by "line_count" logical lines.  "CTRL-E"
   */
      void
  scrollup(line_count, byfold)
      long	line_count;
!     int		byfold UNUSED;	/* TRUE: count a closed fold as one line */
  {
  #if defined(FEAT_FOLDING) || defined(FEAT_DIFF)
      linenr_T	lnum;
*** ../vim-7.2.173/src/normal.c	2009-04-29 17:39:17.000000000 +0200
--- src/normal.c	2009-05-15 21:08:07.000000000 +0200
***************
*** 493,506 ****
      int		i;
  
      /* Fill the index table with a one to one relation. */
!     for (i = 0; i < NV_CMDS_SIZE; ++i)
  	nv_cmd_idx[i] = i;
  
      /* Sort the commands by the command character.  */
      qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare);
  
      /* Find the first entry that can't be indexed by the command character. */
!     for (i = 0; i < NV_CMDS_SIZE; ++i)
  	if (i != nv_cmds[nv_cmd_idx[i]].cmd_char)
  	    break;
      nv_max_linear = i - 1;
--- 493,506 ----
      int		i;
  
      /* Fill the index table with a one to one relation. */
!     for (i = 0; i < (int)NV_CMDS_SIZE; ++i)
  	nv_cmd_idx[i] = i;
  
      /* Sort the commands by the command character.  */
      qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare);
  
      /* Find the first entry that can't be indexed by the command character. */
!     for (i = 0; i < (int)NV_CMDS_SIZE; ++i)
  	if (i != nv_cmds[nv_cmd_idx[i]].cmd_char)
  	    break;
      nv_max_linear = i - 1;
***************
*** 561,571 ****
  /*
   * Execute a command in Normal mode.
   */
- /*ARGSUSED*/
      void
  normal_cmd(oap, toplevel)
      oparg_T	*oap;
!     int		toplevel;		/* TRUE when called from main() */
  {
      cmdarg_T	ca;			/* command arguments */
      int		c;
--- 561,570 ----
  /*
   * Execute a command in Normal mode.
   */
      void
  normal_cmd(oap, toplevel)
      oparg_T	*oap;
!     int		toplevel UNUSED;	/* TRUE when called from main() */
  {
      cmdarg_T	ca;			/* command arguments */
      int		c;
***************
*** 2188,2197 ****
  /*
   * Handle the "g@" operator: call 'operatorfunc'.
   */
- /*ARGSUSED*/
      static void
  op_function(oap)
!     oparg_T	*oap;
  {
  #ifdef FEAT_EVAL
      char_u	*(argv[1]);
--- 2187,2195 ----
  /*
   * Handle the "g@" operator: call 'operatorfunc'.
   */
      static void
  op_function(oap)
!     oparg_T	*oap UNUSED;
  {
  #ifdef FEAT_EVAL
      char_u	*(argv[1]);
***************
*** 4100,4109 ****
   * Command character that doesn't do anything, but unlike nv_ignore() does
   * start edit().  Used for "startinsert" executed while starting up.
   */
- /*ARGSUSED */
      static void
  nv_nop(cap)
!     cmdarg_T	*cap;
  {
  }
  
--- 4098,4106 ----
   * Command character that doesn't do anything, but unlike nv_ignore() does
   * start edit().  Used for "startinsert" executed while starting up.
   */
      static void
  nv_nop(cap)
!     cmdarg_T	*cap UNUSED;
  {
  }
  
***************
*** 5241,5247 ****
  	if (cap->oap->op_type != OP_NOP
  		&& (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
  		    || cap->oap->start.col >
! 					 STRLEN(ml_get(cap->oap->start.lnum))))
  	    clearopbeep(cap->oap);
      }
  }
--- 5238,5244 ----
  	if (cap->oap->op_type != OP_NOP
  		&& (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
  		    || cap->oap->start.col >
! 			       (colnr_T)STRLEN(ml_get(cap->oap->start.lnum))))
  	    clearopbeep(cap->oap);
      }
  }
***************
*** 5816,5822 ****
      for (n = cap->count1; n > 0; --n)
      {
  	if ((!PAST_LINE && oneright() == FAIL)
! 		|| (PAST_LINE && *ml_get_cursor() == NUL))
  	{
  	    /*
  	     *	  <Space> wraps to next line if 'whichwrap' has 's'.
--- 5813,5822 ----
      for (n = cap->count1; n > 0; --n)
      {
  	if ((!PAST_LINE && oneright() == FAIL)
! #ifdef FEAT_VISUAL
! 		|| (PAST_LINE && *ml_get_cursor() == NUL)
! #endif
! 		)
  	{
  	    /*
  	     *	  <Space> wraps to next line if 'whichwrap' has 's'.
*** ../vim-7.2.173/src/option.c	2009-03-18 15:40:03.000000000 +0100
--- src/option.c	2009-05-15 21:08:50.000000000 +0200
***************
*** 5302,5315 ****
   * When "set_sid" is zero set the scriptID to current_SID.  When "set_sid" is
   * SID_NONE don't set the scriptID.  Otherwise set the scriptID to "set_sid".
   */
- /*ARGSUSED*/
      void
  set_string_option_direct(name, opt_idx, val, opt_flags, set_sid)
      char_u	*name;
      int		opt_idx;
      char_u	*val;
      int		opt_flags;	/* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
!     int		set_sid;
  {
      char_u	*s;
      char_u	**varp;
--- 5302,5314 ----
   * When "set_sid" is zero set the scriptID to current_SID.  When "set_sid" is
   * SID_NONE don't set the scriptID.  Otherwise set the scriptID to "set_sid".
   */
      void
  set_string_option_direct(name, opt_idx, val, opt_flags, set_sid)
      char_u	*name;
      int		opt_idx;
      char_u	*val;
      int		opt_flags;	/* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
!     int		set_sid UNUSED;
  {
      char_u	*s;
      char_u	**varp;
***************
*** 9357,9366 ****
  /*
   * Check for NULL pointers in a winopt_T and replace them with empty_option.
   */
- /*ARGSUSED*/
      void
  check_winopt(wop)
!     winopt_T	*wop;
  {
  #ifdef FEAT_FOLDING
      check_string_option(&wop->wo_fdi);
--- 9356,9364 ----
  /*
   * Check for NULL pointers in a winopt_T and replace them with empty_option.
   */
      void
  check_winopt(wop)
!     winopt_T	*wop UNUSED;
  {
  #ifdef FEAT_FOLDING
      check_string_option(&wop->wo_fdi);
***************
*** 9382,9391 ****
  /*
   * Free the allocated memory inside a winopt_T.
   */
- /*ARGSUSED*/
      void
  clear_winopt(wop)
!     winopt_T	*wop;
  {
  #ifdef FEAT_FOLDING
      clear_string_option(&wop->wo_fdi);
--- 9380,9388 ----
  /*
   * Free the allocated memory inside a winopt_T.
   */
      void
  clear_winopt(wop)
!     winopt_T	*wop UNUSED;
  {
  #ifdef FEAT_FOLDING
      clear_string_option(&wop->wo_fdi);
*** ../vim-7.2.173/src/os_unix.c	2009-05-13 12:46:36.000000000 +0200
--- src/os_unix.c	2009-05-15 21:13:43.000000000 +0200
***************
*** 458,467 ****
   * Return total amount of memory available in Kbyte.
   * Doesn't change when memory has been allocated.
   */
- /* ARGSUSED */
      long_u
  mch_total_mem(special)
!     int special;
  {
  # ifdef __EMX__
      return ulimit(3, 0L) >> 10;   /* always 32MB? */
--- 458,466 ----
   * Return total amount of memory available in Kbyte.
   * Doesn't change when memory has been allocated.
   */
      long_u
  mch_total_mem(special)
!     int special UNUSED;
  {
  # ifdef __EMX__
      return ulimit(3, 0L) >> 10;   /* always 32MB? */
***************
*** 815,821 ****
   * Let me try it with a few tricky defines from my own osdef.h	(jw).
   */
  #if defined(SIGWINCH)
- /* ARGSUSED */
      static RETSIGTYPE
  sig_winch SIGDEFARG(sigarg)
  {
--- 814,819 ----
***************
*** 1355,1365 ****
  /*
   * Check_win checks whether we have an interactive stdout.
   */
- /* ARGSUSED */
      int
  mch_check_win(argc, argv)
!     int	    argc;
!     char    **argv;
  {
  #ifdef OS2
      /*
--- 1353,1362 ----
  /*
   * Check_win checks whether we have an interactive stdout.
   */
      int
  mch_check_win(argc, argv)
!     int	    argc UNUSED;
!     char    **argv UNUSED;
  {
  #ifdef OS2
      /*
***************
*** 2467,2473 ****
      }
  
      /* Catch file names which are too long. */
!     if (retval == FAIL || STRLEN(buf) + STRLEN(fname) >= len)
  	return FAIL;
  
      /* Do not append ".", "/dir/." is equal to "/dir". */
--- 2464,2470 ----
      }
  
      /* Catch file names which are too long. */
!     if (retval == FAIL || (int)(STRLEN(buf) + STRLEN(fname)) >= len)
  	return FAIL;
  
      /* Do not append ".", "/dir/." is equal to "/dir". */
***************
*** 2686,2692 ****
   */
      vim_acl_T
  mch_get_acl(fname)
!     char_u	*fname;
  {
      vim_acl_T	ret = NULL;
  #ifdef HAVE_POSIX_ACL
--- 2683,2689 ----
   */
      vim_acl_T
  mch_get_acl(fname)
!     char_u	*fname UNUSED;
  {
      vim_acl_T	ret = NULL;
  #ifdef HAVE_POSIX_ACL
***************
*** 2746,2752 ****
   */
      void
  mch_set_acl(fname, aclent)
!     char_u	*fname;
      vim_acl_T	aclent;
  {
      if (aclent == NULL)
--- 2743,2749 ----
   */
      void
  mch_set_acl(fname, aclent)
!     char_u	*fname UNUSED;
      vim_acl_T	aclent;
  {
      if (aclent == NULL)
***************
*** 2789,2798 ****
  /*
   * Set hidden flag for "name".
   */
- /* ARGSUSED */
      void
  mch_hide(name)
!     char_u	*name;
  {
      /* can't hide a file */
  }
--- 2786,2794 ----
  /*
   * Set hidden flag for "name".
   */
      void
  mch_hide(name)
!     char_u	*name UNUSED;
  {
      /* can't hide a file */
  }
***************
*** 3481,3490 ****
  /*
   * set screen mode, always fails.
   */
- /* ARGSUSED */
      int
  mch_screenmode(arg)
!     char_u   *arg;
  {
      EMSG(_(e_screenmode));
      return FAIL;
--- 3477,3485 ----
  /*
   * set screen mode, always fails.
   */
      int
  mch_screenmode(arg)
!     char_u   *arg UNUSED;
  {
      EMSG(_(e_screenmode));
      return FAIL;
***************
*** 4189,4197 ****
  			    {
  				s = vim_strchr(lp + written, NL);
  				len = write(toshell_fd, (char *)lp + written,
! 					   s == NULL ? l : s - (lp + written));
  			    }
! 			    if (len == l)
  			    {
  				/* Finished a line, add a NL, unless this line
  				 * should not have one. */
--- 4184,4193 ----
  			    {
  				s = vim_strchr(lp + written, NL);
  				len = write(toshell_fd, (char *)lp + written,
! 					   s == NULL ? l
! 					      : (size_t)(s - (lp + written)));
  			    }
! 			    if (len == (int)l)
  			    {
  				/* Finished a line, add a NL, unless this line
  				 * should not have one. */
***************
*** 4746,4752 ****
   * Returns also, when a request from Sniff is waiting -- toni.
   * Or when a Linux GPM mouse event is waiting.
   */
- /* ARGSUSED */
  #if defined(__BEOS__)
      int
  #else
--- 4742,4747 ----
***************
*** 4755,4761 ****
  RealWaitForChar(fd, msec, check_for_gpm)
      int		fd;
      long	msec;
!     int		*check_for_gpm;
  {
      int		ret;
  #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
--- 4750,4756 ----
  RealWaitForChar(fd, msec, check_for_gpm)
      int		fd;
      long	msec;
!     int		*check_for_gpm UNUSED;
  {
      int		ret;
  #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
***************
*** 5572,5578 ****
      i = fread((char *)buffer, 1, len, fd);
      fclose(fd);
      mch_remove(tempname);
!     if (i != len)
      {
  	/* unexpected read error */
  	EMSG2(_(e_notread), tempname);
--- 5567,5573 ----
      i = fread((char *)buffer, 1, len, fd);
      fclose(fd);
      mch_remove(tempname);
!     if (i != (int)len)
      {
  	/* unexpected read error */
  	EMSG2(_(e_notread), tempname);
***************
*** 5633,5639 ****
  	if (shell_style == STYLE_PRINT && !did_find_nul)
  	{
  	    /* If there is a NUL, set did_find_nul, else set check_spaces */
! 	    if (len && (int)STRLEN(buffer) < len - 1)
  		did_find_nul = TRUE;
  	    else
  		check_spaces = TRUE;
--- 5628,5634 ----
  	if (shell_style == STYLE_PRINT && !did_find_nul)
  	{
  	    /* If there is a NUL, set did_find_nul, else set check_spaces */
! 	    if (len && (int)STRLEN(buffer) < (int)len - 1)
  		did_find_nul = TRUE;
  	    else
  		check_spaces = TRUE;
*** ../vim-7.2.173/src/os_unix.h	2009-05-13 12:46:36.000000000 +0200
--- src/os_unix.h	2009-05-15 21:10:31.000000000 +0200
***************
*** 126,132 ****
  #  define SIGDUMMYARG	0, 0, (struct sigcontext *)0
  # else
  #  define SIGPROTOARG	(int)
! #  define SIGDEFARG(s)	(s) int s;
  #  define SIGDUMMYARG	0
  # endif
  #else
--- 126,132 ----
  #  define SIGDUMMYARG	0, 0, (struct sigcontext *)0
  # else
  #  define SIGPROTOARG	(int)
! #  define SIGDEFARG(s)	(s) int s UNUSED;
  #  define SIGDUMMYARG	0
  # endif
  #else
*** ../vim-7.2.173/src/regexp.c	2009-02-21 22:03:06.000000000 +0100
--- src/regexp.c	2009-05-15 21:14:18.000000000 +0200
***************
*** 471,477 ****
  
      if ((*pp)[1] == ':')
      {
! 	for (i = 0; i < sizeof(class_names) / sizeof(*class_names); ++i)
  	    if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0)
  	    {
  		*pp += STRLEN(class_names[i]) + 2;
--- 471,477 ----
  
      if ((*pp)[1] == ':')
      {
! 	for (i = 0; i < (int)(sizeof(class_names) / sizeof(*class_names)); ++i)
  	    if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0)
  	    {
  		*pp += STRLEN(class_names[i]) + 2;
***************
*** 3362,3373 ****
   * Match a regexp against a string ("line" points to the string) or multiple
   * lines ("line" is NULL, use reg_getline()).
   */
- /*ARGSUSED*/
      static long
  vim_regexec_both(line, col, tm)
      char_u	*line;
      colnr_T	col;		/* column to start looking for match */
!     proftime_T	*tm;		/* timeout limit or NULL */
  {
      regprog_T	*prog;
      char_u	*s;
--- 3362,3372 ----
   * Match a regexp against a string ("line" points to the string) or multiple
   * lines ("line" is NULL, use reg_getline()).
   */
      static long
  vim_regexec_both(line, col, tm)
      char_u	*line;
      colnr_T	col;		/* column to start looking for match */
!     proftime_T	*tm UNUSED;	/* timeout limit or NULL */
  {
      regprog_T	*prog;
      char_u	*s;
*** ../vim-7.2.173/src/search.c	2009-04-22 18:43:06.000000000 +0200
--- src/search.c	2009-05-15 21:16:36.000000000 +0200
***************
*** 522,528 ****
   * When FEAT_EVAL is defined, returns the index of the first matching
   * subpattern plus one; one if there was none.
   */
- /*ARGSUSED*/
      int
  searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
      win_T	*win;		/* window to search in; can be NULL for a
--- 522,527 ----
***************
*** 535,541 ****
      int		options;
      int		pat_use;	/* which pattern to use when "pat" is empty */
      linenr_T	stop_lnum;	/* stop after this line number when != 0 */
!     proftime_T	*tm;		/* timeout limit or NULL */
  {
      int		found;
      linenr_T	lnum;		/* no init to shut up Apollo cc */
--- 534,540 ----
      int		options;
      int		pat_use;	/* which pattern to use when "pat" is empty */
      linenr_T	stop_lnum;	/* stop after this line number when != 0 */
!     proftime_T	*tm UNUSED;	/* timeout limit or NULL */
  {
      int		found;
      linenr_T	lnum;		/* no init to shut up Apollo cc */
***************
*** 554,561 ****
      int		save_called_emsg = called_emsg;
  #ifdef FEAT_SEARCH_EXTRA
      int		break_loop = FALSE;
- #else
- # define break_loop FALSE
  #endif
  
      if (search_regcomp(pat, RE_SEARCH, pat_use,
--- 553,558 ----
***************
*** 940,946 ****
  	     * twice.
  	     */
  	    if (!p_ws || stop_lnum != 0 || got_int || called_emsg
! 					       || break_loop || found || loop)
  		break;
  
  	    /*
--- 937,946 ----
  	     * twice.
  	     */
  	    if (!p_ws || stop_lnum != 0 || got_int || called_emsg
! #ifdef FEAT_SEARCH_EXTRA
! 					       || break_loop
! #endif
! 					       || found || loop)
  		break;
  
  	    /*
***************
*** 958,964 ****
  		give_warning((char_u *)_(dir == BACKWARD
  					  ? top_bot_msg : bot_top_msg), TRUE);
  	}
! 	if (got_int || called_emsg || break_loop)
  	    break;
      }
      while (--count > 0 && found);   /* stop after count matches or no match */
--- 958,968 ----
  		give_warning((char_u *)_(dir == BACKWARD
  					  ? top_bot_msg : bot_top_msg), TRUE);
  	}
! 	if (got_int || called_emsg
! #ifdef FEAT_SEARCH_EXTRA
! 		|| break_loop
! #endif
! 		)
  	    break;
      }
      while (--count > 0 && found);   /* stop after count matches or no match */
*** ../vim-7.2.173/src/tag.c	2009-02-23 00:53:35.000000000 +0100
--- src/tag.c	2009-05-15 21:16:59.000000000 +0200
***************
*** 1105,1114 ****
  /*
   * Print the tag stack
   */
- /*ARGSUSED*/
      void
  do_tags(eap)
!     exarg_T	*eap;
  {
      int		i;
      char_u	*name;
--- 1105,1113 ----
  /*
   * Print the tag stack
   */
      void
  do_tags(eap)
!     exarg_T	*eap UNUSED;
  {
      int		i;
      char_u	*name;
***************
*** 2530,2540 ****
   * Callback function for finding all "tags" and "tags-??" files in
   * 'runtimepath' doc directories.
   */
- /*ARGSUSED*/
      static void
  found_tagfile_cb(fname, cookie)
      char_u	*fname;
!     void	*cookie;
  {
      if (ga_grow(&tag_fnames, 1) == OK)
  	((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
--- 2529,2538 ----
   * Callback function for finding all "tags" and "tags-??" files in
   * 'runtimepath' doc directories.
   */
      static void
  found_tagfile_cb(fname, cookie)
      char_u	*fname;
!     void	*cookie UNUSED;
  {
      if (ga_grow(&tag_fnames, 1) == OK)
  	((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
*** ../vim-7.2.173/src/version.c	2009-05-14 22:19:19.000000000 +0200
--- src/version.c	2009-05-15 21:21:44.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     174,
  /**/

-- 
TERRY GILLIAM PLAYED: PATSY (ARTHUR'S TRUSTY STEED), THE GREEN KNIGHT
                      SOOTHSAYER, BRIDGEKEEPER, SIR GAWAIN (THE FIRST TO BE
                      KILLED BY THE RABBIT)
                 "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    ///


--- NEW FILE 7.2.175 ---
To: vim-dev at vim.org
Subject: Patch 7.2.175
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.175
Problem:    Compiler warning in OpenBSD.
Solution:   Add type cast for NULL. (Dasn)
Files:	    src/if_cscope.c


*** ../vim-7.2.174/src/if_cscope.c	2009-04-22 16:22:44.000000000 +0200
--- src/if_cscope.c	2009-05-16 16:15:03.000000000 +0200
***************
*** 994,1000 ****
  	vim_free(ppath);
  
  #if defined(UNIX)
! 	if (execl("/bin/sh", "sh", "-c", cmd, NULL) == -1)
  	    PERROR(_("cs_create_connection exec failed"));
  
  	exit(127);
--- 994,1000 ----
  	vim_free(ppath);
  
  #if defined(UNIX)
! 	if (execl("/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1)
  	    PERROR(_("cs_create_connection exec failed"));
  
  	exit(127);
*** ../vim-7.2.174/src/version.c	2009-05-15 21:31:11.000000000 +0200
--- src/version.c	2009-05-16 16:13:15.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     175,
  /**/

-- 
Every time I lose weight, it finds me again!

 /// 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    ///


--- NEW FILE 7.2.176 ---
To: vim-dev at vim.org
Subject: Patch 7.2.176
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.176
Problem:    Exceptions for splint are not useful.
Solution:   Remove the S_SPLINT_S ifdefs.
Files:	    src/edit.c, src/ex_cmds.c, src/ex_docmd.c, src/os_unix.c,
	    src/os_unix.h, src/os_unixx.h, src/structs.h, src/term.h


*** ../vim-7.2.175/src/edit.c	2009-05-15 21:31:11.000000000 +0200
--- src/edit.c	2009-05-16 16:18:35.000000000 +0200
***************
*** 69,79 ****
      compl_T	*cp_prev;
      char_u	*cp_str;	/* matched text */
      char	cp_icase;	/* TRUE or FALSE: ignore case */
- #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
-     char_u	**cp_text;	/* text for the menu */
- #else
      char_u	*(cp_text[CPT_COUNT]);	/* text for the menu */
- #endif
      char_u	*cp_fname;	/* file containing the match, allocated when
  				 * cp_flags has FREE_FNAME */
      int		cp_flags;	/* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
--- 69,75 ----
***************
*** 3835,3845 ****
      char_u	*word;
      int		icase = FALSE;
      int		adup = FALSE;
- #ifdef S_SPLINT_S  /* splint doesn't parse array of pointers correctly */
-     char_u	**cptext;
- #else
      char_u	*(cptext[CPT_COUNT]);
- #endif
  
      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
      {
--- 3831,3837 ----
*** ../vim-7.2.175/src/ex_cmds.c	2009-05-15 21:31:11.000000000 +0200
--- src/ex_cmds.c	2009-05-16 16:18:56.000000000 +0200
***************
*** 5776,5785 ****
  {
      char_u	*s, *d;
      int		i;
- #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
-     static char **mtable;
-     static char **rtable;
- #else
      static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
  			       "/*", "/\\*", "\"*", "**",
  			       "/\\(\\)",
--- 5776,5781 ----
***************
*** 5794,5800 ****
  			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
  			       "\\[count]", "\\[quotex]", "\\[range]",
  			       "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
- #endif
      int flags;
  
      d = IObuff;		    /* assume IObuff is long enough! */
--- 5790,5795 ----
*** ../vim-7.2.175/src/ex_docmd.c	2009-05-15 21:31:11.000000000 +0200
--- src/ex_docmd.c	2009-05-16 16:19:26.000000000 +0200
***************
*** 9395,9407 ****
  {
      int		len;
      int		i;
! #ifdef S_SPLINT_S  /* splint can't handle array of pointers */
!     static char **spec_str;
!     static char *(nospec_str[])
! #else
!     static char *(spec_str[])
! #endif
! 	= {
  		    "%",
  #define SPEC_PERC   0
  		    "#",
--- 9395,9401 ----
  {
      int		len;
      int		i;
!     static char *(spec_str[]) = {
  		    "%",
  #define SPEC_PERC   0
  		    "#",
*** ../vim-7.2.175/src/os_unix.c	2009-05-15 21:31:11.000000000 +0200
--- src/os_unix.c	2009-05-16 16:20:00.000000000 +0200
***************
*** 199,207 ****
  #endif
  
  #ifndef SIG_ERR
! # ifndef S_SPLINT_S
! #  define SIG_ERR	((RETSIGTYPE (*)())-1)
! # endif
  #endif
  
  /* volatile because it is used in signal handler sig_winch(). */
--- 199,205 ----
  #endif
  
  #ifndef SIG_ERR
! # define SIG_ERR	((RETSIGTYPE (*)())-1)
  #endif
  
  /* volatile because it is used in signal handler sig_winch(). */
***************
*** 443,451 ****
  
  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
  # ifdef HAVE_SYS_RESOURCE_H
! #  ifndef S_SPLINT_S  /* splint crashes on bits/resource.h */
! #   include <sys/resource.h>
! #  endif
  # endif
  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
--- 441,447 ----
  
  #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
  # ifdef HAVE_SYS_RESOURCE_H
! #  include <sys/resource.h>
  # endif
  # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
  #  include <sys/sysctl.h>
*** ../vim-7.2.175/src/os_unix.h	2009-05-15 21:31:11.000000000 +0200
--- src/os_unix.h	2009-05-16 16:17:22.000000000 +0200
***************
*** 53,61 ****
  #endif
  
  #ifdef HAVE_UNISTD_H
! # ifndef S_SPLINT_S  /* splint crashes on bits/confname.h */
! #  include <unistd.h>
! # endif
  #endif
  
  #ifdef HAVE_LIBC_H
--- 53,59 ----
  #endif
  
  #ifdef HAVE_UNISTD_H
! # include <unistd.h>
  #endif
  
  #ifdef HAVE_LIBC_H
*** ../vim-7.2.175/src/structs.h	2009-05-13 20:47:07.000000000 +0200
--- src/structs.h	2009-05-16 16:17:51.000000000 +0200
***************
*** 1646,1656 ****
  #endif
  #ifdef FEAT_DIFF
      diff_T	    *tp_first_diff;
- # ifdef S_SPLINT_S  /* splint doesn't understand the array of pointers */
-     buf_T	    **tp_diffbuf;
- # else
      buf_T	    *(tp_diffbuf[DB_COUNT]);
- # endif
      int		    tp_diff_invalid;	/* list of diffs is outdated */
  #endif
      frame_T	    *tp_snapshot;    /* window layout snapshot */
--- 1646,1652 ----
*** ../vim-7.2.175/src/term.h	2009-05-13 18:54:14.000000000 +0200
--- src/term.h	2009-05-16 16:20:06.000000000 +0200
***************
*** 96,106 ****
   * - there should be code in term.c to obtain the value from the termcap
   */
  
- #ifdef S_SPLINT_S  /* splint doesn't understand array of pointers */
- extern char_u **term_strings;    /* current terminal strings */
- #else
  extern char_u *(term_strings[]);    /* current terminal strings */
- #endif
  
  /*
   * strings used for terminal
--- 96,102 ----
*** ../vim-7.2.175/src/version.c	2009-05-16 16:15:39.000000000 +0200
--- src/version.c	2009-05-16 16:34:10.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     176,
  /**/

-- 
Corn oil comes from corn and olive oil comes from olives, so where
does baby oil come from?

 /// 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    ///


--- NEW FILE 7.2.177 ---
To: vim-dev at vim.org
Subject: Patch 7.2.177
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.177
Problem:    Compiler warnings when using -Wextra
Solution:   Add UNUSED and type casts.
Files:	    src/eval.c, src/ex_docmd.c, src/ex_eval.c, src/ex_getln.c,
	    src/fileio.c, src/hardcopy.c, src/if_cscope.c, src/if_xcmdsrv.c,
	    src/farsi.c, src/mark.c, src/menu.c


*** ../vim-7.2.176/src/eval.c	2009-05-15 21:31:11.000000000 +0200
--- src/eval.c	2009-05-16 16:58:30.000000000 +0200
***************
*** 3772,3778 ****
   * Function given to ExpandGeneric() to obtain the list of user defined
   * (global/buffer/window/built-in) variable names.
   */
- /*ARGSUSED*/
      char_u *
  get_user_var_name(xp, idx)
      expand_T	*xp;
--- 3772,3777 ----
***************
*** 7787,7793 ****
   * Function given to ExpandGeneric() to obtain the list of internal or
   * user defined variable or function names.
   */
- /*ARGSUSED*/
      char_u *
  get_expr_name(xp, idx)
      expand_T	*xp;
--- 7786,7791 ----
***************
*** 8655,8664 ****
  /*
   * "byte2line(byte)" function
   */
- /*ARGSUSED*/
      static void
  f_byte2line(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
  #ifndef FEAT_BYTEOFF
--- 8653,8661 ----
  /*
   * "byte2line(byte)" function
   */
      static void
  f_byte2line(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
  #ifndef FEAT_BYTEOFF
***************
*** 8678,8684 ****
  /*
   * "byteidx()" function
   */
- /*ARGSUSED*/
      static void
  f_byteidx(argvars, rettv)
      typval_T	*argvars;
--- 8675,8680 ----
***************
*** 8852,8858 ****
      static void
  f_clearmatches(argvars, rettv)
      typval_T	*argvars UNUSED;
!     typval_T	*rettv;
  {
  #ifdef FEAT_SEARCH_EXTRA
      clear_matches(curwin);
--- 8848,8854 ----
      static void
  f_clearmatches(argvars, rettv)
      typval_T	*argvars UNUSED;
!     typval_T	*rettv UNUSED;
  {
  #ifdef FEAT_SEARCH_EXTRA
      clear_matches(curwin);
***************
*** 8916,8926 ****
  /*
   * "complete()" function
   */
- /*ARGSUSED*/
      static void
  f_complete(argvars, rettv)
      typval_T	*argvars;
!     typval_T	*rettv;
  {
      int	    startcol;
  
--- 8912,8921 ----
  /*
   * "complete()" function
   */
      static void
  f_complete(argvars, rettv)
      typval_T	*argvars;
!     typval_T	*rettv UNUSED;
  {
      int	    startcol;
  
***************
*** 8951,8957 ****
  /*
   * "complete_add()" function
   */
- /*ARGSUSED*/
      static void
  f_complete_add(argvars, rettv)
      typval_T	*argvars;
--- 8946,8951 ----
***************
*** 8963,8972 ****
  /*
   * "complete_check()" function
   */
- /*ARGSUSED*/
      static void
  f_complete_check(argvars, rettv)
!     typval_T	*argvars;
      typval_T	*rettv;
  {
      int		saved = RedrawingDisabled;
--- 8957,8965 ----
  /*
   * "complete_check()" function
   */
      static void
  f_complete_check(argvars, rettv)
!     typval_T	*argvars UNUSED;
      typval_T	*rettv;
  {
      int		saved = RedrawingDisabled;
***************
*** 8981,8991 ****
  /*
   * "confirm(message, buttons[, default [, type]])" function
   */
- /*ARGSUSED*/
      static void
  f_confirm(argvars, rettv)
!     typval_T	*argvars;
!     typval_T	*rettv;
  {
  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
      char_u	*message;
--- 8974,8983 ----
  /*
   * "confirm(message, buttons[, default [, type]])" function
   */
      static void
  f_confirm(argvars, rettv)
!     typval_T	*argvars UNUSED;
!     typval_T	*rettv UNUSED;
  {
  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
      char_u	*message;
***************
*** 9150,9160 ****
   *
   * Checks the existence of a cscope connection.
   */
- /*ARGSUSED*/
      static void
  f_cscope_connection(argvars, rettv)
!     typval_T	*argvars;
!     typval_T	*rettv;
  {
  #ifdef FEAT_CSCOPE
      int		num = 0;
--- 9142,9151 ----
   *
   * Checks the existence of a cscope connection.
   */
      static void
  f_cscope_connection(argvars, rettv)
!     typval_T	*argvars UNUSED;
!     typval_T	*rettv UNUSED;
  {
  #ifdef FEAT_CSCOPE
      int		num = 0;
***************
*** 9181,9187 ****
   * Moves the cursor to the specified line and column.
   * Returns 0 when the position could be set, -1 otherwise.
   */
- /*ARGSUSED*/
      static void
[...2327 lines suppressed...]
  
      if (!curwin->w_cursor.col && p_ri)
--- 595,602 ----
  {
      int	tempc;
  
!     if (curwin->w_cursor.col != 0 &&
! 	(curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline())))
  	return;
  
      if (!curwin->w_cursor.col && p_ri)
***************
*** 663,670 ****
  {
      int	tempc;
  
!     if (!curwin->w_cursor.col &&
! 	(curwin->w_cursor.col+1 == STRLEN(ml_get_curline())))
  	return;
  
      if (!curwin->w_cursor.col && p_ri)
--- 664,671 ----
  {
      int	tempc;
  
!     if (curwin->w_cursor.col != 0 &&
! 	(curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline())))
  	return;
  
      if (!curwin->w_cursor.col && p_ri)
*** ../vim-7.2.176/src/mark.c	2009-04-29 11:00:09.000000000 +0200
--- src/mark.c	2009-05-16 17:14:56.000000000 +0200
***************
*** 884,893 ****
  /*
   * print the jumplist
   */
- /*ARGSUSED*/
      void
  ex_jumps(eap)
!     exarg_T	*eap;
  {
      int		i;
      char_u	*name;
--- 884,892 ----
  /*
   * print the jumplist
   */
      void
  ex_jumps(eap)
!     exarg_T	*eap UNUSED;
  {
      int		i;
      char_u	*name;
***************
*** 933,942 ****
  /*
   * print the changelist
   */
- /*ARGSUSED*/
      void
  ex_changes(eap)
!     exarg_T	*eap;
  {
      int		i;
      char_u	*name;
--- 932,940 ----
  /*
   * print the changelist
   */
      void
  ex_changes(eap)
!     exarg_T	*eap UNUSED;
  {
      int		i;
      char_u	*name;
*** ../vim-7.2.176/src/menu.c	2008-08-17 23:43:53.000000000 +0200
--- src/menu.c	2009-05-16 17:19:57.000000000 +0200
***************
*** 231,237 ****
  		if (skipdigits(menu_path + 7) == p)
  		{
  		    menuarg.iconidx = atoi((char *)menu_path + 7);
! 		    if (menuarg.iconidx >= TOOLBAR_NAME_COUNT)
  			menuarg.iconidx = -1;
  		    else
  			menuarg.icon_builtin = TRUE;
--- 231,237 ----
  		if (skipdigits(menu_path + 7) == p)
  		{
  		    menuarg.iconidx = atoi((char *)menu_path + 7);
! 		    if (menuarg.iconidx >= (int)TOOLBAR_NAME_COUNT)
  			menuarg.iconidx = -1;
  		    else
  			menuarg.icon_builtin = TRUE;
***************
*** 239,245 ****
  	    }
  	    else
  	    {
! 		for (i = 0; i < TOOLBAR_NAME_COUNT; ++i)
  		    if (STRNCMP(toolbar_names[i], menu_path, p - menu_path)
  									 == 0)
  		    {
--- 239,245 ----
  	    }
  	    else
  	    {
! 		for (i = 0; i < (int)TOOLBAR_NAME_COUNT; ++i)
  		    if (STRNCMP(toolbar_names[i], menu_path, p - menu_path)
  									 == 0)
  		    {
***************
*** 1341,1350 ****
   * Function given to ExpandGeneric() to obtain the list of (sub)menus (not
   * entries).
   */
- /*ARGSUSED*/
      char_u *
  get_menu_name(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      static vimmenu_T	*menu = NULL;
--- 1341,1349 ----
   * Function given to ExpandGeneric() to obtain the list of (sub)menus (not
   * entries).
   */
      char_u *
  get_menu_name(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      static vimmenu_T	*menu = NULL;
***************
*** 1378,1387 ****
   * Function given to ExpandGeneric() to obtain the list of menus and menu
   * entries.
   */
- /*ARGSUSED*/
      char_u *
  get_menu_names(xp, idx)
!     expand_T	*xp;
      int		idx;
  {
      static vimmenu_T	*menu = NULL;
--- 1377,1385 ----
   * Function given to ExpandGeneric() to obtain the list of menus and menu
   * entries.
   */
      char_u *
  get_menu_names(xp, idx)
!     expand_T	*xp UNUSED;
      int		idx;
  {
      static vimmenu_T	*menu = NULL;
***************
*** 1739,1748 ****
  /*
   * Return TRUE if the menu is the tearoff menu.
   */
- /*ARGSUSED*/
      static int
  menu_is_tearoff(name)
!     char_u *name;
  {
  #ifdef FEAT_GUI
      return (STRCMP(name, TEAR_STRING) == 0);
--- 1737,1745 ----
  /*
   * Return TRUE if the menu is the tearoff menu.
   */
      static int
  menu_is_tearoff(name)
!     char_u *name UNUSED;
  {
  #ifdef FEAT_GUI
      return (STRCMP(name, TEAR_STRING) == 0);
*** ../vim-7.2.176/src/version.c	2009-05-16 16:36:25.000000000 +0200
--- src/version.c	2009-05-16 17:22:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     177,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      For an 'A' we would have to: Lose as many shits as possible; Take Jesus
      Christ out, if possible; Loose "I fart in your general direction"; Lose
      "the oral sex"; Lose "oh, fuck off"; Lose "We make castanets out of your
      testicles"
                 "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    ///


--- NEW FILE 7.2.178 ---
To: vim-dev at vim.org
Subject: Patch 7.2.178
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.178
Problem:    Using negative value for device number might not work.
Solution:   Use a separate flag for whether ffv_dev was set.
Files:	    src/misc2.c


*** ../vim-7.2.177/src/misc2.c	2009-04-29 11:00:09.000000000 +0200
--- src/misc2.c	2009-05-16 21:05:10.000000000 +0200
***************
*** 2841,2847 ****
  get_key_name(i)
      int	    i;
  {
!     if (i >= KEY_NAMES_TABLE_LEN)
  	return NULL;
      return  key_names_table[i].name;
  }
--- 2841,2847 ----
  get_key_name(i)
      int	    i;
  {
!     if (i >= (int)KEY_NAMES_TABLE_LEN)
  	return NULL;
      return  key_names_table[i].name;
  }
***************
*** 3869,3875 ****
       * use filename.
       */
  #ifdef UNIX
!     int			ffv_dev;	/* device number (-1 if not set) */
      ino_t		ffv_ino;	/* inode number */
  #endif
      /* The memory for this struct is allocated according to the length of
--- 3869,3876 ----
       * use filename.
       */
  #ifdef UNIX
!     int			ffv_dev_valid;	/* ffv_dev and ffv_ino were set */
!     dev_t		ffv_dev;	/* device number */
      ino_t		ffv_ino;	/* inode number */
  #endif
      /* The memory for this struct is allocated according to the length of
***************
*** 4059,4071 ****
   * This function silently ignores a few errors, vim_findfile() will have
   * limited functionality then.
   */
- /*ARGSUSED*/
      void *
  vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
  					   search_ctx_arg, tagfile, rel_fname)
      char_u	*path;
      char_u	*filename;
!     char_u	*stopdirs;
      int		level;
      int		free_visited;
      int		find_what;
--- 4060,4071 ----
   * This function silently ignores a few errors, vim_findfile() will have
   * limited functionality then.
   */
      void *
  vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
  					   search_ctx_arg, tagfile, rel_fname)
      char_u	*path;
      char_u	*filename;
!     char_u	*stopdirs UNUSED;
      int		level;
      int		free_visited;
      int		find_what;
***************
*** 5063,5072 ****
      {
  	if (
  #ifdef UNIX
! 		!url
! 		    ? (vp->ffv_dev == st.st_dev
! 			&& vp->ffv_ino == st.st_ino)
! 		    :
  #endif
  		fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0
  	   )
--- 5063,5071 ----
      {
  	if (
  #ifdef UNIX
! 		!url ? (vp->ffv_dev_valid && vp->ffv_dev == st.st_dev
! 						  && vp->ffv_ino == st.st_ino)
! 		     :
  #endif
  		fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0
  	   )
***************
*** 5091,5104 ****
  #ifdef UNIX
  	if (!url)
  	{
  	    vp->ffv_ino = st.st_ino;
  	    vp->ffv_dev = st.st_dev;
  	    vp->ffv_fname[0] = NUL;
  	}
  	else
  	{
! 	    vp->ffv_ino = 0;
! 	    vp->ffv_dev = -1;
  #endif
  	    STRCPY(vp->ffv_fname, ff_expand_buffer);
  #ifdef UNIX
--- 5090,5103 ----
  #ifdef UNIX
  	if (!url)
  	{
+ 	    vp->ffv_dev_valid = TRUE;
  	    vp->ffv_ino = st.st_ino;
  	    vp->ffv_dev = st.st_dev;
  	    vp->ffv_fname[0] = NUL;
  	}
  	else
  	{
! 	    vp->ffv_dev_valid = FALSE;
  #endif
  	    STRCPY(vp->ffv_fname, ff_expand_buffer);
  #ifdef UNIX
*** ../vim-7.2.177/src/version.c	2009-05-16 17:29:37.000000000 +0200
--- src/version.c	2009-05-16 21:00:15.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     178,
  /**/

-- 
FATAL ERROR! SYSTEM HALTED! - Press any key to continue doing nothing.

 /// 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    ///


--- NEW FILE 7.2.179 ---
To: vim-dev at vim.org
Subject: Patch 7.2.179
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.179
Problem:    Using negative value for device number might not work.
Solution:   Use a separate flag for whether sn_dev was set.
Files:	    src/ex_cmds2.c


*** ../vim-7.2.178/src/ex_cmds2.c	2009-05-14 22:19:19.000000000 +0200
--- src/ex_cmds2.c	2009-05-16 21:13:29.000000000 +0200
***************
*** 28,34 ****
  {
      char_u	*sn_name;
  # ifdef UNIX
!     int		sn_dev;
      ino_t	sn_ino;
  # endif
  # ifdef FEAT_PROFILE
--- 28,35 ----
  {
      char_u	*sn_name;
  # ifdef UNIX
!     int		sn_dev_valid;
!     dev_t	sn_dev;
      ino_t	sn_ino;
  # endif
  # ifdef FEAT_PROFILE
***************
*** 3049,3055 ****
  		    /* Compare dev/ino when possible, it catches symbolic
  		     * links.  Also compare file names, the inode may change
  		     * when the file was edited. */
! 		    ((stat_ok && si->sn_dev != -1)
  			&& (si->sn_dev == st.st_dev
  			    && si->sn_ino == st.st_ino)) ||
  # endif
--- 3050,3056 ----
  		    /* Compare dev/ino when possible, it catches symbolic
  		     * links.  Also compare file names, the inode may change
  		     * when the file was edited. */
! 		    ((stat_ok && si->sn_dev_valid)
  			&& (si->sn_dev == st.st_dev
  			    && si->sn_ino == st.st_ino)) ||
  # endif
***************
*** 3076,3086 ****
  # ifdef UNIX
  	if (stat_ok)
  	{
  	    si->sn_dev = st.st_dev;
  	    si->sn_ino = st.st_ino;
  	}
  	else
! 	    si->sn_dev = -1;
  # endif
  
  	/* Allocate the local script variables to use for this script. */
--- 3077,3088 ----
  # ifdef UNIX
  	if (stat_ok)
  	{
+ 	    si->sn_dev_valid = TRUE;
  	    si->sn_dev = st.st_dev;
  	    si->sn_ino = st.st_ino;
  	}
  	else
! 	    si->sn_dev_valid = FALSE;
  # endif
  
  	/* Allocate the local script variables to use for this script. */
*** ../vim-7.2.178/src/version.c	2009-05-16 21:06:36.000000000 +0200
--- src/version.c	2009-05-16 21:15:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     179,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      I would like to get back to the Censor and agree to lose the shits, take
      the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in
      your general direction', 'castanets of your testicles' and 'oral sex'
      and ask him for an 'A' rating on that basis.
                 "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    ///


--- NEW FILE 7.2.180 ---
To: vim-dev at vim.org
Subject: Patch 7.2.180
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.180
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Add UNUSED and type casts.
Files:	    src/buffer.c, src/ex_cmds.c, src/macros.h, src/main.c,
	    src/menu.c, src/message.c, src/misc1.c, src/mbyte.c,
	    src/normal.c, src/option.c, src/os_unix.c, src/quickfix.c,
	    src/screen.c, src/search.c, src/spell.c, src/syntax.c, src/tag.c,
	    src/term.c, src/ui.c


*** ../vim-7.2.179/src/buffer.c	2009-05-14 22:19:19.000000000 +0200
--- src/buffer.c	2009-05-16 22:21:41.000000000 +0200
***************
*** 2025,2037 ****
   * Return fnum of the found buffer.
   * Return < 0 for error.
   */
- /*ARGSUSED*/
      int
  buflist_findpat(pattern, pattern_end, unlisted, diffmode)
      char_u	*pattern;
      char_u	*pattern_end;	/* pointer to first char after pattern */
      int		unlisted;	/* find unlisted buffers */
!     int		diffmode;	/* find diff-mode buffers only */
  {
      buf_T	*buf;
      regprog_T	*prog;
--- 2025,2036 ----
   * Return fnum of the found buffer.
   * Return < 0 for error.
   */
      int
  buflist_findpat(pattern, pattern_end, unlisted, diffmode)
      char_u	*pattern;
      char_u	*pattern_end;	/* pointer to first char after pattern */
      int		unlisted;	/* find unlisted buffers */
!     int		diffmode UNUSED; /* find diff-mode buffers only */
  {
      buf_T	*buf;
      regprog_T	*prog;
***************
*** 2539,2545 ****
  /*
   * List all know file names (for :files and :buffers command).
   */
- /*ARGSUSED*/
      void
  buflist_list(eap)
      exarg_T	*eap;
--- 2538,2543 ----
***************
*** 3346,3359 ****
   * If maxwidth is not zero, the string will be filled at any middle marker
   * or truncated if too long, fillchar is used for all whitespace.
   */
- /*ARGSUSED*/
      int
  build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab)
      win_T	*wp;
      char_u	*out;		/* buffer to write into != NameBuff */
      size_t	outlen;		/* length of out[] */
      char_u	*fmt;
!     int		use_sandbox;	/* "fmt" was set insecurely, use sandbox */
      int		fillchar;
      int		maxwidth;
      struct stl_hlrec *hltab;	/* return: HL attributes (can be NULL) */
--- 3344,3356 ----
   * If maxwidth is not zero, the string will be filled at any middle marker
   * or truncated if too long, fillchar is used for all whitespace.
   */
      int
  build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab)
      win_T	*wp;
      char_u	*out;		/* buffer to write into != NameBuff */
      size_t	outlen;		/* length of out[] */
      char_u	*fmt;
!     int		use_sandbox UNUSED; /* "fmt" was set insecurely, use sandbox */
      int		fillchar;
      int		maxwidth;
      struct stl_hlrec *hltab;	/* return: HL attributes (can be NULL) */
*** ../vim-7.2.179/src/ex_cmds.c	2009-05-16 16:36:25.000000000 +0200
--- src/ex_cmds.c	2009-05-16 22:22:46.000000000 +0200
***************
*** 2255,2266 ****
   *
   * Return the string in allocated memory (NULL when out of memory).
   */
- /*ARGSUSED*/
      char_u *
  viminfo_readstring(virp, off, convert)
      vir_T	*virp;
      int		off;		    /* offset for virp->vir_line */
!     int		convert;	    /* convert the string */
  {
      char_u	*retval;
      char_u	*s, *d;
--- 2255,2265 ----
   *
   * Return the string in allocated memory (NULL when out of memory).
   */
      char_u *
  viminfo_readstring(virp, off, convert)
      vir_T	*virp;
      int		off;		    /* offset for virp->vir_line */
!     int		convert UNUSED;	    /* convert the string */
  {
      char_u	*retval;
      char_u	*s, *d;
***************
*** 2736,2742 ****
   * May set eap->forceit if a dialog says it's OK to overwrite.
   * Return OK if it's OK, FAIL if it is not.
   */
- /*ARGSUSED*/
      static int
  check_overwrite(eap, buf, fname, ffname, other)
      exarg_T	*eap;
--- 2735,2740 ----
*** ../vim-7.2.179/src/macros.h	2009-02-21 20:27:00.000000000 +0100
--- src/macros.h	2009-05-16 21:52:56.000000000 +0200
***************
*** 284,290 ****
  # define mb_cptr2len(p)	    (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
  
  # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
! # define MB_CHARLEN(p)	    (has_mbyte ? mb_charlen(p) : STRLEN(p))
  # define PTR2CHAR(p)	    (has_mbyte ? mb_ptr2char(p) : (int)*(p))
  #else
  # define mb_ptr_adv(p)		++p
--- 284,290 ----
  # define mb_cptr2len(p)	    (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
  
  # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
! # define MB_CHARLEN(p)	    (has_mbyte ? mb_charlen(p) : (int)STRLEN(p))
  # define PTR2CHAR(p)	    (has_mbyte ? mb_ptr2char(p) : (int)*(p))
  #else
  # define mb_ptr_adv(p)		++p
*** ../vim-7.2.179/src/main.c	2008-11-28 21:26:50.000000000 +0100
--- src/main.c	2009-05-16 22:25:59.000000000 +0200
***************
*** 1505,1514 ****
   *
   * Also find the --server... arguments and --socketid and --windowid
   */
- /*ARGSUSED*/
      static void
  early_arg_scan(parmp)
!     mparm_T	*parmp;
  {
  #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
  	|| !defined(FEAT_NETBEANS_INTG)
--- 1505,1513 ----
   *
   * Also find the --server... arguments and --socketid and --windowid
   */
      static void
  early_arg_scan(parmp)
!     mparm_T	*parmp UNUSED;
  {
  #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
  	|| !defined(FEAT_NETBEANS_INTG)
***************
*** 2380,2389 ****
   * Create the requested number of windows and edit buffers in them.
   * Also does recovery if "recoverymode" set.
   */
- /*ARGSUSED*/
      static void
  create_windows(parmp)
!     mparm_T	*parmp;
  {
  #ifdef FEAT_WINDOWS
      int		dorewind;
--- 2379,2387 ----
   * Create the requested number of windows and edit buffers in them.
   * Also does recovery if "recoverymode" set.
   */
      static void
  create_windows(parmp)
!     mparm_T	*parmp UNUSED;
  {
  #ifdef FEAT_WINDOWS
      int		dorewind;
***************
*** 3851,3860 ****
   * return an allocated string.  Otherwise return "data".
   * "*tofree" is set to the result when it needs to be freed later.
   */
- /*ARGSUSED*/
      char_u *
[...6121 lines suppressed...]
*** ../vim-7.2.179/src/ui.c	2008-11-28 21:26:50.000000000 +0100
--- src/ui.c	2009-05-16 22:33:55.000000000 +0200
***************
*** 320,329 ****
   * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
   * new size.  If this is not possible, it will adjust Rows and Columns.
   */
- /*ARGSUSED*/
      void
  ui_set_shellsize(mustset)
!     int		mustset;	/* set by the user */
  {
  #ifdef FEAT_GUI
      if (gui.in_use)
--- 320,328 ----
   * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
   * new size.  If this is not possible, it will adjust Rows and Columns.
   */
      void
  ui_set_shellsize(mustset)
!     int		mustset UNUSED;	/* set by the user */
  {
  #ifdef FEAT_GUI
      if (gui.in_use)
***************
*** 1127,1136 ****
   * available for pasting.
   * When "both" is TRUE also copy to the '+' register.
   */
- /*ARGSUSED*/
      void
  clip_copy_modeless_selection(both)
!     int		both;
  {
      char_u	*buffer;
      char_u	*bufp;
--- 1126,1134 ----
   * available for pasting.
   * When "both" is TRUE also copy to the '+' register.
   */
      void
  clip_copy_modeless_selection(both)
!     int		both UNUSED;
  {
      char_u	*buffer;
      char_u	*bufp;
***************
*** 1701,1710 ****
      return (int)maxlen;
  }
  
- /*ARGSUSED*/
      void
  fill_input_buf(exit_on_error)
!     int	exit_on_error;
  {
  #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX)
      int		len;
--- 1699,1707 ----
      return (int)maxlen;
  }
  
      void
  fill_input_buf(exit_on_error)
!     int	exit_on_error UNUSED;
  {
  #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX)
      int		len;
***************
*** 1992,2002 ****
  
  static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
  
- /* ARGSUSED */
      static void
  clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
  			      format)
!     Widget	w;
      XtPointer	success;
      Atom	*sel_atom;
      Atom	*type;
--- 1989,1998 ----
  
  static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
  
      static void
  clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
  			      format)
!     Widget	w UNUSED;
      XtPointer	success;
      Atom	*sel_atom;
      Atom	*type;
***************
*** 2202,2211 ****
  
  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
  
- /* ARGSUSED */
      static Boolean
  clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format)
!     Widget	w;
      Atom	*sel_atom;
      Atom	*target;
      Atom	*type;
--- 2198,2206 ----
  
  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
  
      static Boolean
  clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format)
!     Widget	w UNUSED;
      Atom	*sel_atom;
      Atom	*target;
      Atom	*type;
***************
*** 2332,2341 ****
  
  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
  
- /* ARGSUSED */
      static void
  clip_x11_lose_ownership_cb(w, sel_atom)
!     Widget  w;
      Atom    *sel_atom;
  {
      if (*sel_atom == clip_plus.sel_atom)
--- 2327,2335 ----
  
  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
  
      static void
  clip_x11_lose_ownership_cb(w, sel_atom)
!     Widget  w UNUSED;
      Atom    *sel_atom;
  {
      if (*sel_atom == clip_plus.sel_atom)
***************
*** 2368,2377 ****
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
   */
- /*ARGSUSED*/
      void
  clip_x11_set_selection(cbd)
!     VimClipboard *cbd;
  {
  }
  #endif
--- 2362,2370 ----
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
   */
      void
  clip_x11_set_selection(cbd)
!     VimClipboard *cbd UNUSED;
  {
  }
  #endif
***************
*** 2922,2932 ****
   * Find the window at screen position "*rowp" and "*colp".  The positions are
   * updated to become relative to the top-left of the window.
   */
- /*ARGSUSED*/
      win_T *
  mouse_find_win(rowp, colp)
      int		*rowp;
!     int		*colp;
  {
      frame_T	*fp;
  
--- 2915,2924 ----
   * Find the window at screen position "*rowp" and "*colp".  The positions are
   * updated to become relative to the top-left of the window.
   */
      win_T *
  mouse_find_win(rowp, colp)
      int		*rowp;
!     int		*colp UNUSED;
  {
      frame_T	*fp;
  
*** ../vim-7.2.179/src/version.c	2009-05-16 21:16:12.000000000 +0200
--- src/version.c	2009-05-17 13:06:38.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     180,
  /**/

-- 
Wi n0t trei a h0liday in Sweden thi yer?
                 "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    ///


--- NEW FILE 7.2.181 ---
To: vim-dev at vim.org
Subject: Patch 7.2.181
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.181
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Add UNUSED and type casts.
Files:	    src/if_mzsch.c, src/gui.c, src/gui_gtk.c, src/gui_gtk_x11.c,
	    src/gui_gtk_f.c, src/gui_beval.c, src/netbeans.c


*** ../vim-7.2.180/src/if_mzsch.c	2007-07-06 19:43:08.000000000 +0200
--- src/if_mzsch.c	2009-05-16 22:24:18.000000000 +0200
***************
*** 667,679 ****
      static void CALLBACK
  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
  # elif defined(FEAT_GUI_GTK)
- /*ARGSUSED*/
      static gint
! timer_proc(gpointer data)
  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
- /* ARGSUSED */
      static void
! timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
  # elif defined(FEAT_GUI_MAC)
      pascal void
  timer_proc(EventLoopTimerRef theTimer, void *userData)
--- 667,677 ----
      static void CALLBACK
  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
  # elif defined(FEAT_GUI_GTK)
      static gint
! timer_proc(gpointer data UNUSED)
  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
      static void
! timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
  # elif defined(FEAT_GUI_MAC)
      pascal void
  timer_proc(EventLoopTimerRef theTimer, void *userData)
*** ../vim-7.2.180/src/gui.c	2008-12-03 18:50:09.000000000 +0100
--- src/gui.c	2009-05-17 15:52:18.000000000 +0200
***************
*** 678,688 ****
   * Return OK when able to set the font.  When it failed FAIL is returned and
   * the fonts are unchanged.
   */
- /*ARGSUSED*/
      int
  gui_init_font(font_list, fontset)
      char_u	*font_list;
!     int		fontset;
  {
  #define FONTLEN 320
      char_u	font_name[FONTLEN];
--- 678,687 ----
   * Return OK when able to set the font.  When it failed FAIL is returned and
   * the fonts are unchanged.
   */
      int
  gui_init_font(font_list, fontset)
      char_u	*font_list;
!     int		fontset UNUSED;
  {
  #define FONTLEN 320
      char_u	font_name[FONTLEN];
***************
*** 1138,1147 ****
   * Position the various GUI components (text area, menu).  The vertical
   * scrollbars are NOT handled here.  See gui_update_scrollbars().
   */
- /*ARGSUSED*/
      static void
  gui_position_components(total_width)
!     int	    total_width;
  {
      int	    text_area_x;
      int	    text_area_y;
--- 1137,1145 ----
   * Position the various GUI components (text area, menu).  The vertical
   * scrollbars are NOT handled here.  See gui_update_scrollbars().
   */
      static void
  gui_position_components(total_width)
!     int	    total_width UNUSED;
  {
      int	    text_area_x;
      int	    text_area_y;
***************
*** 1374,1383 ****
   * If "fit_to_display" is TRUE then the size may be reduced to fit the window
   * on the screen.
   */
- /*ARGSUSED*/
      void
  gui_set_shellsize(mustset, fit_to_display, direction)
!     int		mustset;		/* set by the user */
      int		fit_to_display;
      int		direction;		/* RESIZE_HOR, RESIZE_VER */
  {
--- 1372,1380 ----
   * If "fit_to_display" is TRUE then the size may be reduced to fit the window
   * on the screen.
   */
      void
  gui_set_shellsize(mustset, fit_to_display, direction)
!     int		mustset UNUSED;		/* set by the user */
      int		fit_to_display;
      int		direction;		/* RESIZE_HOR, RESIZE_VER */
  {
***************
*** 3120,3126 ****
   * If "oldval" is not NULL, "oldval" is the previous value, the new value is
   * in p_go.
   */
- /*ARGSUSED*/
      void
  gui_init_which_components(oldval)
      char_u	*oldval;
--- 3117,3122 ----
***************
*** 4411,4417 ****
      if (curwin->w_p_wrap)
  	return FALSE;
  
!     if (curwin->w_leftcol == scrollbar_value)
  	return FALSE;
  
      curwin->w_leftcol = (colnr_T)scrollbar_value;
--- 4407,4413 ----
      if (curwin->w_p_wrap)
  	return FALSE;
  
!     if ((long_u)curwin->w_leftcol == scrollbar_value)
  	return FALSE;
  
      curwin->w_leftcol = (colnr_T)scrollbar_value;
***************
*** 4424,4430 ****
  	    && longest_lnum < curwin->w_botline
  	    && !virtual_active())
      {
! 	if (scrollbar_value > scroll_line_len(curwin->w_cursor.lnum))
  	{
  	    curwin->w_cursor.lnum = longest_lnum;
  	    curwin->w_cursor.col = 0;
--- 4420,4426 ----
  	    && longest_lnum < curwin->w_botline
  	    && !virtual_active())
      {
! 	if (scrollbar_value > (long_u)scroll_line_len(curwin->w_cursor.lnum))
  	{
  	    curwin->w_cursor.lnum = longest_lnum;
  	    curwin->w_cursor.col = 0;
***************
*** 4670,4676 ****
  /*
   * Find window where the mouse pointer "y" coordinate is in.
   */
- /*ARGSUSED*/
      static win_T *
  xy2win(x, y)
      int		x;
--- 4666,4671 ----
***************
*** 5124,5130 ****
   * of dropped files, they will be freed in this function, and caller can't use
   * fnames after call this function.
   */
- /*ARGSUSED*/
      void
  gui_handle_drop(x, y, modifiers, fnames, count)
      int		x;
--- 5119,5124 ----
*** ../vim-7.2.180/src/gui_gtk.c	2008-07-31 22:29:28.000000000 +0200
--- src/gui_gtk.c	2009-05-17 16:06:30.000000000 +0200
***************
*** 285,298 ****
      return image;
  }
  
- /*ARGSUSED*/
      static gint
! toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
! {
!     /* When we're in a GtkPlug, we don't have window focus events, only widget focus.
!      * To emulate stand-alone gvim, if a button gets focus (e.g., <Tab> into GtkPlug)
!      * immediately pass it to mainwin.
!      */
      if (gtk_socket_id != 0)
  	gtk_widget_grab_focus(gui.drawarea);
  
--- 285,298 ----
      return image;
  }
  
      static gint
! toolbar_button_focus_in_event(GtkWidget *widget UNUSED,
! 			      GdkEventFocus *event UNUSED,
! 			      gpointer data UNUSED)
! {
!     /* When we're in a GtkPlug, we don't have window focus events, only widget
!      * focus.  To emulate stand-alone gvim, if a button gets focus (e.g.,
!      * <Tab> into GtkPlug) immediately pass it to mainwin. */
      if (gtk_socket_id != 0)
  	gtk_widget_grab_focus(gui.drawarea);
  
***************
*** 585,593 ****
      gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
  }
  
- /*ARGSUSED*/
      static void
! menu_item_activate(GtkWidget *widget, gpointer data)
  {
      gui_menu_cb((vimmenu_T *)data);
  
--- 585,592 ----
      gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
  }
  
      static void
! menu_item_activate(GtkWidget *widget UNUSED, gpointer data)
  {
      gui_menu_cb((vimmenu_T *)data);
  
***************
*** 1202,1210 ****
  #endif
  
  #ifndef USE_FILE_CHOOSER
- /*ARGSUSED*/
      static void
! browse_ok_cb(GtkWidget *widget, gpointer cbdata)
  {
      gui_T *vw = (gui_T *)cbdata;
  
--- 1201,1208 ----
  #endif
  
  #ifndef USE_FILE_CHOOSER
      static void
! browse_ok_cb(GtkWidget *widget UNUSED, gpointer cbdata)
  {
      gui_T *vw = (gui_T *)cbdata;
  
***************
*** 1218,1226 ****
  	gtk_main_quit();
  }
  
- /*ARGSUSED*/
      static void
! browse_cancel_cb(GtkWidget *widget, gpointer cbdata)
  {
      gui_T *vw = (gui_T *)cbdata;
  
--- 1216,1223 ----
  	gtk_main_quit();
  }
  
      static void
! browse_cancel_cb(GtkWidget *widget UNUSED, gpointer cbdata)
  {
      gui_T *vw = (gui_T *)cbdata;
  
***************
*** 1234,1242 ****
  	gtk_main_quit();
  }
  
- /*ARGSUSED*/
      static gboolean
! browse_destroy_cb(GtkWidget * widget)
  {
      if (gui.browse_fname != NULL)
      {
--- 1231,1238 ----
  	gtk_main_quit();
  }
  
      static gboolean
! browse_destroy_cb(GtkWidget *widget UNUSED)
  {
      if (gui.browse_fname != NULL)
      {
***************
*** 1262,1275 ****
   * initdir			initial directory, NULL for current dir
   * filter			not used (file name filter)
   */
- /*ARGSUSED*/
      char_u *
! gui_mch_browse(int saving,
  	       char_u *title,
  	       char_u *dflt,
! 	       char_u *ext,
  	       char_u *initdir,
! 	       char_u *filter)
  {
  #ifdef USE_FILE_CHOOSER
      GtkWidget		*fc;
--- 1258,1270 ----
   * initdir			initial directory, NULL for current dir
   * filter			not used (file name filter)
   */
      char_u *
! gui_mch_browse(int saving UNUSED,
  	       char_u *title,
  	       char_u *dflt,
! 	       char_u *ext UNUSED,
  	       char_u *initdir,
! 	       char_u *filter UNUSED)
  {
  #ifdef USE_FILE_CHOOSER
      GtkWidget		*fc;
***************
*** 1377,1383 ****
   * dflt				default name
   * initdir			initial directory, NULL for current dir
   */
- /*ARGSUSED*/
      char_u *
  gui_mch_browsedir(
  	       char_u *title,
--- 1372,1377 ----
***************
*** 1460,1466 ****
  }
  
  # ifdef FEAT_GUI_GNOME
- /* ARGSUSED */
      static int
  gui_gnome_dialog( int	type,
  		char_u	*title,
--- 1454,1459 ----
***************
*** 1611,1617 ****
      GtkWidget	*dialog;
  } CancelData;
  
- /* ARGSUSED */
      static void
  dlg_button_clicked(GtkWidget * widget, ButtonData *data)
  {
--- 1604,1609 ----
***************
*** 1622,1628 ****
  /*
   * This makes the Escape key equivalent to the cancel button.
   */
- /*ARGSUSED*/
      static int
  dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
  {
--- 1614,1619 ----
***************
*** 1655,1661 ****
  	gtk_main_quit();
  }
  
- /* ARGSUSED */
      int
  gui_mch_dialog(	int	type,		/* type of dialog */
  		char_u	*title,		/* title of dialog */
--- 1646,1651 ----
***************
*** 2215,2221 ****
      GtkDialog	*dialog;	    /* Widget of the dialog */
  } DialogInfo;
  
- /*ARGSUSED2*/
      static gboolean
  dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
  {
--- 2205,2210 ----
***************
*** 2398,2411 ****
   * Note: The push_in output argument seems to affect scrolling of huge
   * menus that don't fit on the screen.	Leave it at the default for now.
   */
- /*ARGSUSED0*/
      static void
! popup_menu_position_func(GtkMenu *menu,
  			 gint *x, gint *y,
  # ifdef HAVE_GTK2
! 			 gboolean *push_in,
  # endif
! 			 gpointer user_data)
  {
      gdk_window_get_origin(gui.drawarea->window, x, y);
  
--- 2387,2399 ----
   * Note: The push_in output argument seems to affect scrolling of huge
   * menus that don't fit on the screen.	Leave it at the default for now.
   */
      static void
! popup_menu_position_func(GtkMenu *menu UNUSED,
  			 gint *x, gint *y,
  # ifdef HAVE_GTK2
! 			 gboolean *push_in UNUSED,
  # endif
! 			 gpointer user_data UNUSED)
  {
      gdk_window_get_origin(gui.drawarea->window, x, y);
  
***************
*** 2464,2476 ****
      GtkWidget *all;	/* 'Replace All' action button */
  } SharedFindReplace;
  
! static SharedFindReplace find_widgets = { NULL, };
! static SharedFindReplace repl_widgets = { NULL, };
  
- /* ARGSUSED */
      static int
  find_key_press_event(
! 		GtkWidget	*widget,
  		GdkEventKey	*event,
  		SharedFindReplace *frdp)
  {
--- 2452,2463 ----
      GtkWidget *all;	/* 'Replace All' action button */
  } SharedFindReplace;
  
! static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
! static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
  
      static int
  find_key_press_event(
! 		GtkWidget	*widget UNUSED,
  		GdkEventKey	*event,
  		SharedFindReplace *frdp)
  {
***************
*** 2962,2970 ****
  /*
   * Callback for actions of the find and replace dialogs
   */
- /*ARGSUSED*/
      static void
! find_replace_cb(GtkWidget *widget, gpointer data)
  {
      int			flags;
      char_u		*find_text;
--- 2949,2956 ----
  /*
   * Callback for actions of the find and replace dialogs
   */
      static void
! find_replace_cb(GtkWidget *widget UNUSED, gpointer data)
  {
      int			flags;
      char_u		*find_text;
***************
*** 3010,3018 ****
  }
  
  /* our usual callback function */
- /*ARGSUSED*/
      static void
! entry_activate_cb(GtkWidget *widget, gpointer data)
  {
      gtk_widget_grab_focus(GTK_WIDGET(data));
  }
--- 2996,3003 ----
  }
  
  /* our usual callback function */
      static void
! entry_activate_cb(GtkWidget *widget UNUSED, gpointer data)
  {
      gtk_widget_grab_focus(GTK_WIDGET(data));
  }
***************
*** 3055,3064 ****
  /*
   * ":helpfind"
   */
- /*ARGSUSED*/
      void
  ex_helpfind(eap)
!     exarg_T	*eap;
  {
      /* This will fail when menus are not loaded.  Well, it's only for
       * backwards compatibility anyway. */
--- 3040,3048 ----
  /*
   * ":helpfind"
   */
      void
  ex_helpfind(eap)
!     exarg_T	*eap UNUSED;
  {
      /* This will fail when menus are not loaded.  Well, it's only for
       * backwards compatibility anyway. */
*** ../vim-7.2.180/src/gui_gtk_x11.c	2008-11-28 21:26:50.000000000 +0100
--- src/gui_gtk_x11.c	2009-05-17 15:53:02.000000000 +0200
***************
*** 619,627 ****
   * Doesn't seem possible, since check_copy_area() relies on
   * this information.  --danielk
   */
- /*ARGSUSED*/
      static gint
! visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data)
  {
      gui.visibility = event->state;
      /*
--- 625,634 ----
   * Doesn't seem possible, since check_copy_area() relies on
   * this information.  --danielk
   */
      static gint
! visibility_event(GtkWidget *widget UNUSED,
! 		 GdkEventVisibility *event,
! 		 gpointer data UNUSED)
  {
      gui.visibility = event->state;
      /*
***************
*** 638,646 ****
  /*
   * Redraw the corresponding portions of the screen.
   */
- /*ARGSUSED*/
      static gint
! expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
  {
      /* Skip this when the GUI isn't set up yet, will redraw later. */
      if (gui.starting)
--- 645,654 ----
  /*
   * Redraw the corresponding portions of the screen.
   */
      static gint
! expose_event(GtkWidget *widget UNUSED,
! 	     GdkEventExpose *event,
! 	     gpointer data UNUSED)
  {
      /* Skip this when the GUI isn't set up yet, will redraw later. */
      if (gui.starting)
***************
*** 668,676 ****
  /*
   * Handle changes to the "Comm" property
   */
- /*ARGSUSED2*/
      static gint
! property_event(GtkWidget *widget, GdkEventProperty *event, gpointer data)
  {
      if (event->type == GDK_PROPERTY_NOTIFY
  	    && event->state == (int)GDK_PROPERTY_NEW_VALUE
--- 676,685 ----
  /*
   * Handle changes to the "Comm" property
   */
      static gint
! property_event(GtkWidget *widget,
! 	       GdkEventProperty *event,
! 	       gpointer data UNUSED)
  {
      if (event->type == GDK_PROPERTY_NOTIFY
  	    && event->state == (int)GDK_PROPERTY_NEW_VALUE
***************
*** 740,748 ****
      blink_state = BLINK_NONE;
  }
  
- /*ARGSUSED*/
      static gint
! blink_cb(gpointer data)
  {
      if (blink_state == BLINK_ON)
      {
--- 749,756 ----
      blink_state = BLINK_NONE;
  }
  
      static gint
! blink_cb(gpointer data UNUSED)
  {
      if (blink_state == BLINK_ON)
      {
***************
*** 781,789 ****
      }
  }
  
- /*ARGSUSED*/
      static gint
! enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
  {
      if (blink_state == BLINK_NONE)
  	gui_mch_start_blink();
--- 789,798 ----
      }
  }
  
      static gint
! enter_notify_event(GtkWidget *widget UNUSED,
! 		   GdkEventCrossing *event UNUSED,
! 		   gpointer data UNUSED)
  {
      if (blink_state == BLINK_NONE)
  	gui_mch_start_blink();
***************
*** 795,803 ****
      return FALSE;
  }
  
- /*ARGSUSED*/
      static gint
! leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
  {
      if (blink_state != BLINK_NONE)
  	gui_mch_stop_blink();
--- 804,813 ----
      return FALSE;
  }
  
      static gint
! leave_notify_event(GtkWidget *widget UNUSED,
! 		   GdkEventCrossing *event UNUSED,
! 		   gpointer data UNUSED)
  {
      if (blink_state != BLINK_NONE)
  	gui_mch_stop_blink();
***************
*** 805,813 ****
      return FALSE;
  }
  
- /*ARGSUSED*/
      static gint
! focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
  {
      gui_focus_change(TRUE);
  
--- 815,824 ----
      return FALSE;
  }
  
      static gint
! focus_in_event(GtkWidget *widget,
! 	       GdkEventFocus *event UNUSED,
! 	       gpointer data UNUSED)
  {
      gui_focus_change(TRUE);
  
***************
*** 826,834 ****
      return TRUE;
  }
  
- /*ARGSUSED*/
      static gint
! focus_out_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
  {
      gui_focus_change(FALSE);
  
--- 837,846 ----
      return TRUE;
  }
  
      static gint
! focus_out_event(GtkWidget *widget UNUSED,
! 	        GdkEventFocus *event UNUSED,
! 		gpointer data UNUSED)
  {
      gui_focus_change(FALSE);
  
***************
*** 956,964 ****
  /*
   * Main keyboard handler:
   */
- /*ARGSUSED*/
      static gint
! key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
  {
  #ifdef HAVE_GTK2
      /* 256 bytes is way over the top, but for safety let's reduce it only
--- 968,977 ----
  /*
   * Main keyboard handler:
   */
      static gint
! key_press_event(GtkWidget *widget UNUSED,
! 		GdkEventKey *event,
! 		gpointer data UNUSED)
  {
  #ifdef HAVE_GTK2
      /* 256 bytes is way over the top, but for safety let's reduce it only
***************
*** 1225,1233 ****
  }
  
  #if defined(FEAT_XIM) && defined(HAVE_GTK2)
- /*ARGSUSED0*/
      static gboolean
! key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
  {
      /*
       * GTK+ 2 input methods may do fancy stuff on key release events too.
--- 1238,1247 ----
  }
  
  #if defined(FEAT_XIM) && defined(HAVE_GTK2)
      static gboolean
! key_release_event(GtkWidget *widget UNUSED,
! 		  GdkEventKey *event,
! 		  gpointer data UNUSED)
  {
      /*
       * GTK+ 2 input methods may do fancy stuff on key release events too.
***************
*** 1243,1253 ****
   * Selection handlers:
   */
  
- /*ARGSUSED*/
      static gint
! selection_clear_event(GtkWidget		*widget,
  		      GdkEventSelection	*event,
! 		      gpointer		user_data)
  {
      if (event->selection == clip_plus.gtk_sel_atom)
  	clip_lose_selection(&clip_plus);
--- 1257,1266 ----
   * Selection handlers:
   */
  
      static gint
! selection_clear_event(GtkWidget		*widget UNUSED,
  		      GdkEventSelection	*event,
! 		      gpointer		user_data UNUSED)
  {
      if (event->selection == clip_plus.gtk_sel_atom)
  	clip_lose_selection(&clip_plus);
***************
*** 1265,1276 ****
  #define RS_FAIL	2	/* selection_received_cb() called and failed */
  static int received_selection = RS_NONE;
  
- /*ARGSUSED*/
      static void
! selection_received_cb(GtkWidget		*widget,
  		      GtkSelectionData	*data,
! 		      guint		time_,
! 		      gpointer		user_data)
  {
      VimClipboard    *cbd;
      char_u	    *text;
--- 1278,1288 ----
  #define RS_FAIL	2	/* selection_received_cb() called and failed */
  static int received_selection = RS_NONE;
  
      static void
! selection_received_cb(GtkWidget		*widget UNUSED,
  		      GtkSelectionData	*data,
! 		      guint		time_ UNUSED,
! 		      gpointer		user_data UNUSED)
  {
      VimClipboard    *cbd;
      char_u	    *text;
***************
*** 1414,1426 ****
   * Prepare our selection data for passing it to the external selection
   * client.
   */
- /*ARGSUSED*/
      static void
! selection_get_cb(GtkWidget	    *widget,
  		 GtkSelectionData   *selection_data,
  		 guint		    info,
! 		 guint		    time_,
! 		 gpointer	    user_data)
  {
      char_u	    *string;
      char_u	    *tmpbuf;
--- 1426,1437 ----
   * Prepare our selection data for passing it to the external selection
   * client.
   */
      static void
! selection_get_cb(GtkWidget	    *widget UNUSED,
  		 GtkSelectionData   *selection_data,
  		 guint		    info,
! 		 guint		    time_ UNUSED,
! 		 gpointer	    user_data UNUSED)
  {
      char_u	    *string;
      char_u	    *tmpbuf;
***************
*** 1678,1684 ****
  
  	offshoot = dx > dy ? dx : dy;
  
! 	/* Make a linearly declaying timer delay with a threshold of 5 at a
  	 * distance of 127 pixels from the main window.
  	 *
  	 * One could think endlessly about the most ergonomic variant here.
--- 1689,1695 ----
  
  	offshoot = dx > dy ? dx : dy;
  
! 	/* Make a linearly decaying timer delay with a threshold of 5 at a
  	 * distance of 127 pixels from the main window.
  	 *
  	 * One could think endlessly about the most ergonomic variant here.
***************
*** 1707,1715 ****
  /*
   * Timer used to recognize multiple clicks of the mouse button.
   */
- /*ARGSUSED0*/
      static gint
! motion_repeat_timer_cb(gpointer data)
  {
      int		    x;
      int		    y;
--- 1718,1725 ----
  /*
   * Timer used to recognize multiple clicks of the mouse button.
   */
      static gint
! motion_repeat_timer_cb(gpointer data UNUSED)
  {
      int		    x;
      int		    y;
***************
*** 1749,1757 ****
      return FALSE;
  }
  
- /*ARGSUSED2*/
      static gint
! motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
  {
      if (event->is_hint)
      {
--- 1759,1768 ----
      return FALSE;
  }
  
      static gint
! motion_notify_event(GtkWidget *widget,
! 		    GdkEventMotion *event,
! 		    gpointer data UNUSED)
  {
      if (event->is_hint)
      {
***************
*** 1777,1785 ****
   * by our own timeout mechanism instead of the one provided by GTK+ itself.
   * This is due to the way the generic VIM code is recognizing multiple clicks.
   */
- /*ARGSUSED2*/
      static gint
! button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
  {
      int button;
      int repeated_click = FALSE;
--- 1788,1797 ----
   * by our own timeout mechanism instead of the one provided by GTK+ itself.
   * This is due to the way the generic VIM code is recognizing multiple clicks.
   */
      static gint
! button_press_event(GtkWidget *widget,
! 		   GdkEventButton *event,
! 		   gpointer data UNUSED)
  {
      int button;
      int repeated_click = FALSE;
***************
*** 1855,1863 ****
   * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
   * Instead, it abstracts scrolling via the new GdkEventScroll.
   */
- /*ARGSUSED2*/
      static gboolean
! scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
  {
      int	    button;
      int_u   vim_modifiers;
--- 1867,1876 ----
   * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
   * Instead, it abstracts scrolling via the new GdkEventScroll.
   */
      static gboolean
! scroll_event(GtkWidget *widget,
! 	     GdkEventScroll *event,
! 	     gpointer data UNUSED)
  {
      int	    button;
      int_u   vim_modifiers;
***************
*** 1896,1904 ****
  #endif /* HAVE_GTK2 */
  
  
- /*ARGSUSED*/
      static gint
! button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
  {
      int x, y;
      int_u vim_modifiers;
--- 1909,1918 ----
  #endif /* HAVE_GTK2 */
  
  
      static gint
! button_release_event(GtkWidget *widget UNUSED,
! 		     GdkEventButton *event,
! 		     gpointer data UNUSED)
  {
      int x, y;
      int_u vim_modifiers;
***************
*** 2100,2106 ****
  /*
   * DND receiver.
   */
- /*ARGSUSED2*/
      static void
  drag_data_received_cb(GtkWidget		*widget,
  		      GdkDragContext	*context,
--- 2114,2119 ----
***************
*** 2109,2115 ****
  		      GtkSelectionData	*data,
  		      guint		info,
  		      guint		time_,
! 		      gpointer		user_data)
  {
      GdkModifierType state;
  
--- 2122,2128 ----
  		      GtkSelectionData	*data,
  		      guint		info,
  		      guint		time_,
! 		      gpointer		user_data UNUSED)
  {
      GdkModifierType state;
  
***************
*** 2143,2149 ****
   * be abandoned and pop up a dialog asking the user for confirmation if
   * necessary.
   */
- /*ARGSUSED0*/
      static void
  sm_client_check_changed_any(GnomeClient	    *client,
  			    gint	    key,
--- 2156,2161 ----
***************
*** 2251,2257 ****
   * for confirmation if necessary.  Save the current editing session and tell
   * the session manager how to restart Vim.
   */
- /*ARGSUSED1*/
      static gboolean
  sm_client_save_yourself(GnomeClient	    *client,
  			gint		    phase,
--- 2263,2268 ----
***************
*** 2339,2345 ****
   * here since "save_yourself" has been emitted before (unless serious trouble
   * is happening).
   */
- /*ARGSUSED0*/
      static void
  sm_client_die(GnomeClient *client, gpointer data)
  {
--- 2350,2355 ----
***************
*** 2379,2388 ****
  /*
   * GTK tells us that XSMP needs attention
   */
- /*ARGSUSED*/
      static gboolean
  local_xsmp_handle_requests(source, condition, data)
!     GIOChannel		*source;
      GIOCondition	condition;
      gpointer		data;
  {
--- 2389,2397 ----
  /*
   * GTK tells us that XSMP needs attention
   */
      static gboolean
  local_xsmp_handle_requests(source, condition, data)
!     GIOChannel		*source UNUSED;
      GIOCondition	condition;
      gpointer		data;
  {
***************
*** 2480,2495 ****
   * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
   * it should work with KDE as well.
   */
- /*ARGSUSED1*/
      static GdkFilterReturn
! global_event_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
  {
      XEvent *xevent = (XEvent *)xev;
  
      if (xevent != NULL
  	    && xevent->type == ClientMessage
  	    && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
! 	    && xevent->xclient.data.l[0] == GET_X_ATOM(save_yourself_atom))
      {
  	out_flush();
  	ml_sync_all(FALSE, FALSE); /* preserve all swap files */
--- 2489,2506 ----
   * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
   * it should work with KDE as well.
   */
      static GdkFilterReturn
! global_event_filter(GdkXEvent *xev,
! 		    GdkEvent *event UNUSED,
! 		    gpointer data UNUSED)
  {
      XEvent *xevent = (XEvent *)xev;
  
      if (xevent != NULL
  	    && xevent->type == ClientMessage
  	    && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
! 	    && (long_u)xevent->xclient.data.l[0]
! 					    == GET_X_ATOM(save_yourself_atom))
      {
  	out_flush();
  	ml_sync_all(FALSE, FALSE); /* preserve all swap files */
***************
*** 2512,2518 ****
  /*
   * GDK handler for X ClientMessage events.
   */
- /*ARGSUSED2*/
      static GdkFilterReturn
  gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
  {
--- 2523,2528 ----
***************
*** 2558,2566 ****
  /*
   * Setup the window icon & xcmdsrv comm after the main window has been realized.
   */
- /*ARGSUSED*/
      static void
! mainwin_realize(GtkWidget *widget, gpointer data)
  {
  /* If you get an error message here, you still need to unpack the runtime
   * archive! */
--- 2568,2575 ----
  /*
   * Setup the window icon & xcmdsrv comm after the main window has been realized.
   */
      static void
! mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
  {
  /* If you get an error message here, you still need to unpack the runtime
   * archive! */
***************
*** 2712,2722 ****
  }
  
  #ifdef HAVE_GTK_MULTIHEAD
- /*ARGSUSED1*/
      static void
  mainwin_screen_changed_cb(GtkWidget  *widget,
! 			  GdkScreen  *previous_screen,
! 			  gpointer   data)
  {
      if (!gtk_widget_has_screen(widget))
  	return;
--- 2721,2730 ----
  }
  
  #ifdef HAVE_GTK_MULTIHEAD
      static void
  mainwin_screen_changed_cb(GtkWidget  *widget,
! 			  GdkScreen  *previous_screen UNUSED,
! 			  gpointer   data UNUSED)
  {
      if (!gtk_widget_has_screen(widget))
  	return;
***************
*** 2757,2765 ****
   * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
   * fact that the main VIM engine doesn't take them into account anywhere.
   */
- /*ARGSUSED1*/
      static void
! drawarea_realize_cb(GtkWidget *widget, gpointer data)
  {
      GtkWidget *sbar;
  
--- 2765,2772 ----
   * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
   * fact that the main VIM engine doesn't take them into account anywhere.
   */
      static void
! drawarea_realize_cb(GtkWidget *widget, gpointer data UNUSED)
  {
      GtkWidget *sbar;
  
***************
*** 2789,2797 ****
  /*
   * Properly clean up on shutdown.
   */
- /*ARGSUSED0*/
      static void
! drawarea_unrealize_cb(GtkWidget *widget, gpointer data)
  {
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
--- 2796,2803 ----
  /*
   * Properly clean up on shutdown.
   */
      static void
! drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
  {
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
***************
*** 2827,2837 ****
  #endif
  }
  
- /*ARGSUSED0*/
      static void
! drawarea_style_set_cb(GtkWidget	*widget,
! 		      GtkStyle	*previous_style,
! 		      gpointer	data)
  {
      gui_mch_new_colors();
  }
--- 2833,2842 ----
  #endif
  }
  
      static void
! drawarea_style_set_cb(GtkWidget	*widget UNUSED,
! 		      GtkStyle	*previous_style UNUSED,
! 		      gpointer	data UNUSED)
  {
      gui_mch_new_colors();
  }
***************
*** 2840,2848 ****
   * Callback routine for the "delete_event" signal on the toplevel window.
   * Tries to vim gracefully, or refuses to exit with changed buffers.
   */
- /*ARGSUSED*/
      static gint
! delete_event_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
  {
      gui_shell_closed();
      return TRUE;
--- 2845,2854 ----
   * Callback routine for the "delete_event" signal on the toplevel window.
   * Tries to vim gracefully, or refuses to exit with changed buffers.
   */
      static gint
! delete_event_cb(GtkWidget *widget UNUSED,
! 		GdkEventAny *event UNUSED,
! 		gpointer data UNUSED)
  {
      gui_shell_closed();
      return TRUE;
***************
*** 2964,2970 ****
  
      /* At start-up, don't try to set the hints until the initial
       * values have been used (those that dictate our initial size)
!      * Let forced (i.e., correct) values thruogh always.
       */
      if (!(force_width && force_height)  &&  init_window_hints_state > 0)
      {
--- 2970,2976 ----
  
      /* At start-up, don't try to set the hints until the initial
       * values have been used (those that dictate our initial size)
!      * Let forced (i.e., correct) values through always.
       */
      if (!(force_width && force_height)  &&  init_window_hints_state > 0)
      {
***************
*** 3142,3150 ****
  /*
   * Handle selecting an item in the tab line popup menu.
   */
- /*ARGSUSED*/
      static void
! tabline_menu_handler(GtkMenuItem *item, gpointer user_data)
  {
      /* Add the string cmd into input buffer */
      send_tabline_menu_event(clicked_page, (int)(long)user_data);
--- 3148,3155 ----
  /*
   * Handle selecting an item in the tab line popup menu.
   */
      static void
! tabline_menu_handler(GtkMenuItem *item UNUSED, gpointer user_data)
  {
      /* Add the string cmd into input buffer */
      send_tabline_menu_event(clicked_page, (int)(long)user_data);
***************
*** 3244,3256 ****
  /*
   * Handle selecting one of the tabs.
   */
- /*ARGSUSED*/
      static void
  on_select_tab(
! 	GtkNotebook	*notebook,
! 	GtkNotebookPage *page,
  	gint		idx,
! 	gpointer	data)
  {
      if (!ignore_tabline_evt)
      {
--- 3249,3260 ----
  /*
   * Handle selecting one of the tabs.
   */
      static void
  on_select_tab(
! 	GtkNotebook	*notebook UNUSED,
! 	GtkNotebookPage *page UNUSED,
  	gint		idx,
! 	gpointer	data UNUSED)
  {
      if (!ignore_tabline_evt)
      {
***************
*** 3784,3790 ****
  #endif
  
      if (gtk_socket_id != 0)
! 	/* make sure keybord input can go to the drawarea */
  	GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
  
      /*
--- 3788,3794 ----
  #endif
  
      if (gtk_socket_id != 0)
! 	/* make sure keyboard input can go to the drawarea */
  	GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
  
      /*
***************
*** 3922,3931 ****
  /*
   * This signal informs us about the need to rearrange our sub-widgets.
   */
- /*ARGSUSED*/
      static gint
! form_configure_event(GtkWidget *widget, GdkEventConfigure *event,
! 		     gpointer data)
  {
      int usable_height = event->height;
  
--- 3926,3935 ----
  /*
   * This signal informs us about the need to rearrange our sub-widgets.
   */
      static gint
! form_configure_event(GtkWidget *widget UNUSED,
! 		     GdkEventConfigure *event,
! 		     gpointer data UNUSED)
  {
      int usable_height = event->height;
  
***************
*** 3948,3956 ****
   * We can't do much more here than to trying to preserve what had been done,
   * since the window is already inevitably going away.
   */
- /*ARGSUSED0*/
      static void
! mainwin_destroy_cb(GtkObject *object, gpointer data)
  {
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
--- 3952,3959 ----
   * We can't do much more here than to trying to preserve what had been done,
   * since the window is already inevitably going away.
   */
      static void
! mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED)
  {
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
***************
*** 3980,3988 ****
   * scrollbar init.), actually do the standard hinst and stop the timer.
   * We'll not let the default hints be set while this timer's active.
   */
- /*ARGSUSED*/
      static gboolean
! check_startup_plug_hints(gpointer data)
  {
      if (init_window_hints_state == 1)
      {
--- 3983,3990 ----
   * scrollbar init.), actually do the standard hinst and stop the timer.
   * We'll not let the default hints be set while this timer's active.
   */
      static gboolean
! check_startup_plug_hints(gpointer data UNUSED)
  {
      if (init_window_hints_state == 1)
      {
***************
*** 4055,4061 ****
  	    Columns = w;
  	if (mask & HeightValue)
  	{
! 	    if (p_window > h - 1 || !option_was_set((char_u *)"window"))
  		p_window = h - 1;
  	    Rows = h;
  	}
--- 4057,4063 ----
  	    Columns = w;
  	if (mask & HeightValue)
  	{
! 	    if (p_window > (long)h - 1 || !option_was_set((char_u *)"window"))
  		p_window = h - 1;
  	    Rows = h;
  	}
***************
*** 4229,4237 ****
  }
  
  
- /*ARGSUSED0*/
      void
! gui_mch_exit(int rc)
  {
      if (gui.mainwin != NULL)
  	gtk_widget_destroy(gui.mainwin);
--- 4231,4238 ----
  }
  
  
      void
! gui_mch_exit(int rc UNUSED)
  {
      if (gui.mainwin != NULL)
  	gtk_widget_destroy(gui.mainwin);
***************
*** 4286,4292 ****
   * report the new size through form_configure_event().  That caused the window
   * layout to be messed up.
   */
- /*ARGSUSED0*/
      static gboolean
  force_shell_resize_idle(gpointer data)
  {
--- 4287,4292 ----
***************
*** 4314,4325 ****
  /*
   * Set the windows size.
   */
- /*ARGSUSED2*/
      void
  gui_mch_set_shellsize(int width, int height,
! 		      int min_width,  int min_height,
! 		      int base_width, int base_height,
! 		      int direction)
  {
  #ifndef HAVE_GTK2
      /* Hack: When the form already is at the desired size, the window might
--- 4314,4324 ----
  /*
   * Set the windows size.
   */
      void
  gui_mch_set_shellsize(int width, int height,
! 		      int min_width UNUSED,  int min_height UNUSED,
! 		      int base_width UNUSED, int base_height UNUSED,
! 		      int direction UNUSED)
  {
  #ifndef HAVE_GTK2
      /* Hack: When the form already is at the desired size, the window might
***************
*** 4413,4421 ****
  }
  
  #if defined(FEAT_TITLE) || defined(PROTO)
- /*ARGSUSED*/
      void
! gui_mch_settitle(char_u *title, char_u *icon)
  {
  # ifdef HAVE_GTK2
      if (title != NULL && output_conv.vc_type != CONV_NONE)
--- 4412,4419 ----
  }
  
  #if defined(FEAT_TITLE) || defined(PROTO)
      void
! gui_mch_settitle(char_u *title, char_u *icon UNUSED)
  {
  # ifdef HAVE_GTK2
      if (title != NULL && output_conv.vc_type != CONV_NONE)
***************
*** 4493,4499 ****
   * Get a font structure for highlighting.
   * "cbdata" is a pointer to the global gui structure.
   */
- /*ARGSUSED*/
      static void
  font_sel_ok(GtkWidget *wgt, gpointer cbdata)
  {
--- 4491,4496 ----
***************
*** 4509,4515 ****
  	gtk_main_quit();
  }
  
- /*ARGSUSED*/
      static void
  font_sel_cancel(GtkWidget *wgt, gpointer cbdata)
  {
--- 4506,4511 ----
***************
*** 4520,4526 ****
  	gtk_main_quit();
  }
  
- /*ARGSUSED*/
      static void
  font_sel_destroy(GtkWidget *wgt, gpointer cbdata)
  {
--- 4516,4521 ----
***************
*** 4620,4626 ****
  /*
   * Try to load the requested fontset.
   */
- /*ARGSUSED2*/
      GuiFontset
  gui_mch_get_fontset(char_u *name, int report_error, int fixed_width)
  {
--- 4615,4620 ----
***************
*** 4863,4869 ****
      styled_font[1] = &gui.ital_font;
      styled_font[2] = &gui.boldital_font;
  
!     /* First free whatever was freviously there. */
      for (i = 0; i < 3; ++i)
  	if (*styled_font[i])
  	{
--- 4857,4863 ----
      styled_font[1] = &gui.ital_font;
      styled_font[2] = &gui.boldital_font;
  
!     /* First free whatever was previously there. */
      for (i = 0; i < 3; ++i)
  	if (*styled_font[i])
  	{
***************
*** 5012,5020 ****
   * Initialize Vim to use the font or fontset with the given name.
   * Return FAIL if the font could not be loaded, OK otherwise.
   */
- /*ARGSUSED1*/
      int
! gui_mch_init_font(char_u *font_name, int fontset)
  {
  #ifdef HAVE_GTK2
      PangoFontDescription    *font_desc;
--- 5006,5013 ----
   * Initialize Vim to use the font or fontset with the given name.
   * Return FAIL if the font could not be loaded, OK otherwise.
   */
      int
! gui_mch_init_font(char_u *font_name, int fontset UNUSED)
  {
  #ifdef HAVE_GTK2
      PangoFontDescription    *font_desc;
***************
*** 5326,5334 ****
  /*
   * Return the name of font "font" in allocated memory.
   */
- /*ARGSUSED*/
      char_u *
! gui_mch_get_fontname(GuiFont font, char_u *name)
  {
  # ifdef HAVE_GTK2
      if (font != NOFONT)
--- 5319,5326 ----
  /*
   * Return the name of font "font" in allocated memory.
   */
      char_u *
! gui_mch_get_fontname(GuiFont font, char_u *name UNUSED)
  {
  # ifdef HAVE_GTK2
      if (font != NOFONT)
***************
*** 5732,5738 ****
  {
      int			i;
      int			offset;
!     const static int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
      int			y = FILL_Y(row + 1) - 1;
  
      /* Undercurl: draw curl at the bottom of the character cell. */
--- 5724,5730 ----
  {
      int			i;
      int			offset;
!     static const int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
      int			y = FILL_Y(row + 1) - 1;
  
      /* Undercurl: draw curl at the bottom of the character cell. */
***************
*** 6402,6408 ****
  /*
   * Callback function, used when data is available on the SNiFF connection.
   */
- /* ARGSUSED */
      static void
  sniff_request_cb(
      gpointer	data,
--- 6394,6399 ----
***************
*** 6711,6719 ****
  /*
   * Disown the selection.
   */
- /*ARGSUSED*/
      void
! clip_mch_lose_selection(VimClipboard *cbd)
  {
      /* WEIRD: when using NULL to actually disown the selection, we lose the
       * selection the first time we own it. */
--- 6702,6709 ----
  /*
   * Disown the selection.
   */
      void
! clip_mch_lose_selection(VimClipboard *cbd UNUSED)
  {
      /* WEIRD: when using NULL to actually disown the selection, we lose the
       * selection the first time we own it. */
***************
*** 6741,6749 ****
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
   */
- /*ARGSUSED*/
      void
! clip_mch_set_selection(VimClipboard *cbd)
  {
  }
  
--- 6731,6738 ----
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
   */
      void
! clip_mch_set_selection(VimClipboard *cbd UNUSED)
  {
  }
  
***************
*** 6950,6956 ****
  	    else
  		id &= ~1;	/* they are always even (why?) */
  	}
! 	else if (shape < sizeof(mshape_ids) / sizeof(int))
  	    id = mshape_ids[shape];
  	else
  	    return;
--- 6939,6945 ----
  	    else
  		id &= ~1;	/* they are always even (why?) */
  	}
! 	else if (shape < (int)(sizeof(mshape_ids) / sizeof(int)))
  	    id = mshape_ids[shape];
  	else
  	    return;
*** ../vim-7.2.180/src/gui_gtk_f.c	2007-05-10 19:50:33.000000000 +0200
--- src/gui_gtk_f.c	2009-05-17 15:48:51.000000000 +0200
***************
*** 227,240 ****
  
      if (!form_type)
      {
! 	GtkTypeInfo form_info =
! 	{
! 	    "GtkForm",
! 	    sizeof(GtkForm),
! 	    sizeof(GtkFormClass),
! 	    (GtkClassInitFunc) gtk_form_class_init,
! 	    (GtkObjectInitFunc) gtk_form_init
! 	};
  
  	form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
      }
--- 227,239 ----
  
      if (!form_type)
      {
! 	GtkTypeInfo form_info;
! 
! 	form_info.type_name = "GtkForm";
! 	form_info.object_size = sizeof(GtkForm);
! 	form_info.class_size = sizeof(GtkFormClass);
! 	form_info.class_init_func = (GtkClassInitFunc)gtk_form_class_init;
! 	form_info.object_init_func = (GtkObjectInitFunc)gtk_form_init;
  
  	form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
      }
***************
*** 611,620 ****
      }
  }
  
- /*ARGSUSED1*/
      static void
  gtk_form_forall(GtkContainer	*container,
! 		gboolean	include_internals,
  		GtkCallback	callback,
  		gpointer	callback_data)
  {
--- 610,618 ----
      }
  }
  
      static void
  gtk_form_forall(GtkContainer	*container,
! 		gboolean	include_internals UNUSED,
  		GtkCallback	callback,
  		gpointer	callback_data)
  {
***************
*** 786,794 ****
   * them or discards them, depending on whether we are obscured
   * or not.
   */
- /*ARGSUSED1*/
      static GdkFilterReturn
! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
  {
      XEvent *xevent;
      GtkForm *form;
--- 784,791 ----
   * them or discards them, depending on whether we are obscured
   * or not.
   */
      static GdkFilterReturn
! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event UNUSED, gpointer data)
  {
      XEvent *xevent;
      GtkForm *form;
***************
*** 821,829 ****
   * there is no corresponding event in GTK, so we have
   * to get the events from a filter
   */
- /*ARGSUSED1*/
      static GdkFilterReturn
! gtk_form_main_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
  {
      XEvent *xevent;
      GtkForm *form;
--- 818,827 ----
   * there is no corresponding event in GTK, so we have
   * to get the events from a filter
   */
      static GdkFilterReturn
! gtk_form_main_filter(GdkXEvent *gdk_xevent,
! 		     GdkEvent *event UNUSED,
! 		     gpointer data)
  {
      XEvent *xevent;
      GtkForm *form;
***************
*** 911,919 ****
  #endif
  }
  
- /*ARGSUSED0*/
      static void
! gtk_form_child_map(GtkWidget *widget, gpointer user_data)
  {
      GtkFormChild *child;
  
--- 909,916 ----
  #endif
  }
  
      static void
! gtk_form_child_map(GtkWidget *widget UNUSED, gpointer user_data)
  {
      GtkFormChild *child;
  
***************
*** 923,931 ****
      gdk_window_show(child->window);
  }
  
- /*ARGSUSED0*/
      static void
! gtk_form_child_unmap(GtkWidget *widget, gpointer user_data)
  {
      GtkFormChild *child;
  
--- 920,927 ----
      gdk_window_show(child->window);
  }
  
      static void
! gtk_form_child_unmap(GtkWidget *widget UNUSED, gpointer user_data)
  {
      GtkFormChild *child;
  
*** ../vim-7.2.180/src/gui_beval.c	2009-03-18 12:20:35.000000000 +0100
--- src/gui_beval.c	2009-05-17 15:53:22.000000000 +0200
***************
*** 15,21 ****
  /*
   * Common code, invoked when the mouse is resting for a moment.
   */
- /*ARGSUSED*/
      void
  general_beval_cb(beval, state)
      BalloonEval *beval;
--- 15,20 ----
***************
*** 551,559 ****
      return FALSE; /* continue emission */
  }
  
- /*ARGSUSED*/
      static gint
! mainwin_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
  {
      BalloonEval *beval = (BalloonEval *)data;
  
--- 550,557 ----
      return FALSE; /* continue emission */
  }
  
      static gint
! mainwin_event_cb(GtkWidget *widget UNUSED, GdkEvent *event, gpointer data)
  {
      BalloonEval *beval = (BalloonEval *)data;
  
***************
*** 663,671 ****
      return FALSE; /* don't call me again */
  }
  
- /*ARGSUSED2*/
      static gint
! balloon_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
  {
      gtk_paint_flat_box(widget->style, widget->window,
  		       GTK_STATE_NORMAL, GTK_SHADOW_OUT,
--- 661,670 ----
      return FALSE; /* don't call me again */
  }
  
      static gint
! balloon_expose_event_cb(GtkWidget *widget,
! 			GdkEventExpose *event,
! 			gpointer data UNUSED)
  {
      gtk_paint_flat_box(widget->style, widget->window,
  		       GTK_STATE_NORMAL, GTK_SHADOW_OUT,
***************
*** 676,682 ****
  }
  
  # ifndef HAVE_GTK2
- /*ARGSUSED2*/
      static void
  balloon_draw_cb(GtkWidget *widget, GdkRectangle *area, gpointer data)
  {
--- 675,680 ----
***************
*** 726,732 ****
  /*
   * The X event handler. All it does is call the real event handler.
   */
- /*ARGSUSED*/
      static void
  pointerEventEH(w, client_data, event, unused)
      Widget	w;
--- 724,729 ----
***************
*** 877,883 ****
      }
  }
  
- /*ARGSUSED*/
      static void
  timerRoutine(dx, id)
      XtPointer	    dx;
--- 874,879 ----
*** ../vim-7.2.180/src/netbeans.c	2009-02-21 22:12:43.000000000 +0100
--- src/netbeans.c	2009-05-17 15:51:14.000000000 +0200
***************
*** 700,706 ****
  /*
   * Read and process a command from netbeans.
   */
- /*ARGSUSED*/
  #if defined(FEAT_GUI_W32) || defined(PROTO)
  /* Use this one when generating prototypes, the others are static. */
      void
--- 700,705 ----
***************
*** 708,719 ****
  #else
  # ifdef FEAT_GUI_MOTIF
      static void
! messageFromNetbeans(XtPointer clientData, int *unused1, XtInputId *unused2)
  # endif
  # ifdef FEAT_GUI_GTK
      static void
! messageFromNetbeans(gpointer clientData, gint unused1,
! 						    GdkInputCondition unused2)
  # endif
  #endif
  {
--- 707,721 ----
  #else
  # ifdef FEAT_GUI_MOTIF
      static void
! messageFromNetbeans(XtPointer clientData UNUSED
! 		    int *unused1 UNUSED,
! 		    XtInputId *unused2 UNUSED)
  # endif
  # ifdef FEAT_GUI_GTK
      static void
! messageFromNetbeans(gpointer clientData UNUSED,
! 		    gint unused1 UNUSED,
! 		    GdkInputCondition unused2 UNUSED)
  # endif
  #endif
  {
***************
*** 1585,1591 ****
--- 1587,1595 ----
  			    buf_delsign(buf->bufp, id);
  			}
  			else
+ 			{
  			    nbdebug(("    No sign on line %d\n", i));
+ 			}
  		    }
  
  		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
***************
*** 2144,2150 ****
--- 2148,2156 ----
  #endif
  	    }
  	    else
+ 	    {
  		nbdebug(("    BAD POSITION in setDot: %s\n", s));
+ 	    }
  
  	    /* gui_update_cursor(TRUE, FALSE); */
  	    /* update_curbuf(NOT_VALID); */
***************
*** 2744,2754 ****
   * cursor and sends it to the debugger for evaluation.  The debugger should
   * respond with a showBalloon command when there is a useful result.
   */
- /*ARGSUSED*/
      void
  netbeans_beval_cb(
  	BalloonEval	*beval,
! 	int		 state)
  {
      win_T	*wp;
      char_u	*text;
--- 2750,2759 ----
   * cursor and sends it to the debugger for evaluation.  The debugger should
   * respond with a showBalloon command when there is a useful result.
   */
      void
  netbeans_beval_cb(
  	BalloonEval	*beval,
! 	int		 state UNUSED)
  {
      win_T	*wp;
      char_u	*text;
***************
*** 3061,3069 ****
  /*
   * Send netbeans an unmodufied command.
   */
- /*ARGSUSED*/
      void
! netbeans_unmodified(buf_T *bufp)
  {
  #if 0
      char_u	buf[128];
--- 3066,3073 ----
  /*
   * Send netbeans an unmodufied command.
   */
      void
! netbeans_unmodified(buf_T *bufp UNUSED)
  {
  #if 0
      char_u	buf[128];
***************
*** 3370,3382 ****
   * buf->signmapused[]	maps buffer-local annotation IDs to an index in
   *			globalsignmap[].
   */
- /*ARGSUSED*/
      static void
  addsigntype(
      nbbuf_T	*buf,
      int		typeNum,
      char_u	*typeName,
!     char_u	*tooltip,
      char_u	*glyphFile,
      int		use_fg,
      int		fg,
--- 3374,3385 ----
   * buf->signmapused[]	maps buffer-local annotation IDs to an index in
   *			globalsignmap[].
   */
      static void
  addsigntype(
      nbbuf_T	*buf,
      int		typeNum,
      char_u	*typeName,
!     char_u	*tooltip UNUSED,
      char_u	*glyphFile,
      int		use_fg,
      int		fg,
*** ../vim-7.2.180/src/version.c	2009-05-17 13:30:58.000000000 +0200
--- src/version.c	2009-05-17 16:07:26.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     181,
  /**/

-- 
I am always surprised in the Linux world how quickly solutions can be
obtained.  (Imagine sending an email to Bill Gates, asking why Windows
crashed, and how to fix it...  and then getting an answer that fixed the
problem... <0>_<0> !)		              -- Mark Langdon

 /// 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    ///


--- NEW FILE 7.2.182 ---
To: vim-dev at vim.org
Subject: Patch 7.2.182
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.182 (after 7.2.181)
Problem:    Compilation problems after previous patch for Motif.  Gvim with
	    GTK crashes on startup.
Solution:   Add comma.  Init form structure to zeroes.
Files:	    src/netbeans.c, src/gui_gtk_f.c


*** ../vim-7.2.181/src/netbeans.c	2009-05-17 16:23:20.000000000 +0200
--- src/netbeans.c	2009-05-17 22:34:11.000000000 +0200
***************
*** 707,713 ****
  #else
  # ifdef FEAT_GUI_MOTIF
      static void
! messageFromNetbeans(XtPointer clientData UNUSED
  		    int *unused1 UNUSED,
  		    XtInputId *unused2 UNUSED)
  # endif
--- 707,713 ----
  #else
  # ifdef FEAT_GUI_MOTIF
      static void
! messageFromNetbeans(XtPointer clientData UNUSED,
  		    int *unused1 UNUSED,
  		    XtInputId *unused2 UNUSED)
  # endif
*** ../vim-7.2.181/src/gui_gtk_f.c	2009-05-17 16:23:20.000000000 +0200
--- src/gui_gtk_f.c	2009-05-17 23:20:41.000000000 +0200
***************
*** 229,234 ****
--- 229,235 ----
      {
  	GtkTypeInfo form_info;
  
+ 	vim_memset(&form_info, 0, sizeof(form_info));
  	form_info.type_name = "GtkForm";
  	form_info.object_size = sizeof(GtkForm);
  	form_info.class_size = sizeof(GtkFormClass);
*** ../vim-7.2.181/src/version.c	2009-05-17 16:23:20.000000000 +0200
--- src/version.c	2009-05-17 23:21:41.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     182,
  /**/

-- 
We apologise again for the fault in the subtitles.  Those responsible for
sacking the people who have just been sacked have been sacked.
                 "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    ///


--- NEW FILE 7.2.183 ---
To: vim-dev at vim.org
Subject: Patch 7.2.183
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.183
Problem:    Configure problem for sys/sysctl.h on OpenBSD. (Dasn)
Solution:   Add separate check for this header file.  Also switch to newer
	    version of autoconf.
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.182/src/auto/configure	2009-05-14 22:19:19.000000000 +0200
--- src/auto/configure	2009-05-16 13:32:16.000000000 +0200
***************
*** 1,6 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.62.
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.63.
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
***************
*** 635,772 ****
  # include <unistd.h>
  #endif"
  
! ac_subst_vars='SHELL
! PATH_SEPARATOR
! PACKAGE_NAME
! PACKAGE_TARNAME
! PACKAGE_VERSION
! PACKAGE_STRING
! PACKAGE_BUGREPORT
! exec_prefix
! prefix
! program_transform_name
! bindir
! sbindir
! libexecdir
! datarootdir
! datadir
! sysconfdir
! sharedstatedir
! localstatedir
! includedir
! oldincludedir
! docdir
! infodir
! htmldir
! dvidir
! pdfdir
! psdir
! libdir
! localedir
! mandir
! DEFS
! ECHO_C
! ECHO_N
! ECHO_T
! LIBS
! build_alias
! host_alias
! target_alias
! SET_MAKE
! CC
! CFLAGS
! LDFLAGS
! CPPFLAGS
! ac_ct_CC
! EXEEXT
! OBJEXT
! CPP
! GREP
! EGREP
! AWK
! STRIP
! CPP_MM
! OS_EXTRA_SRC
! OS_EXTRA_OBJ
! VIMNAME
! EXNAME
! VIEWNAME
! line_break
! dovimdiff
! dogvimdiff
! compiledby
! vi_cv_path_mzscheme
! MZSCHEME_SRC
! MZSCHEME_OBJ
! MZSCHEME_PRO
! MZSCHEME_LIBS
! MZSCHEME_CFLAGS
! vi_cv_path_perl
! vi_cv_perllib
! shrpenv
! PERL_SRC
! PERL_OBJ
! PERL_PRO
! PERL_CFLAGS
! PERL_LIBS
! vi_cv_path_python
! PYTHON_CONFDIR
! PYTHON_LIBS
! PYTHON_GETPATH_CFLAGS
! PYTHON_CFLAGS
! PYTHON_SRC
! PYTHON_OBJ
! vi_cv_path_tcl
! TCL_SRC
! TCL_OBJ
! TCL_PRO
! TCL_CFLAGS
! TCL_LIBS
! vi_cv_path_ruby
! RUBY_SRC
! RUBY_OBJ
! RUBY_PRO
! RUBY_CFLAGS
! RUBY_LIBS
! WORKSHOP_SRC
! WORKSHOP_OBJ
! NETBEANS_SRC
! NETBEANS_OBJ
! SNIFF_SRC
! SNIFF_OBJ
! xmkmfpath
! XMKMF
! X_CFLAGS
! X_PRE_LIBS
! X_LIBS
! X_EXTRA_LIBS
! X_LIB
! GTK_CONFIG
! GTK12_CONFIG
! PKG_CONFIG
! GTK_CFLAGS
! GTK_LIBS
! GTK_LIBNAME
! GNOME_LIBS
! GNOME_LIBDIR
! GNOME_INCLUDEDIR
! GNOME_CONFIG
! MOTIF_LIBNAME
! NARROW_PROTO
! GUI_INC_LOC
! GUI_LIB_LOC
! GUITYPE
! GUI_X_LIBS
! HANGULIN_SRC
! HANGULIN_OBJ
! TAGPRG
! INSTALL_LANGS
! INSTALL_TOOL_LANGS
! MSGFMT
! MAKEMO
! DEPEND_CFLAGS_FILTER
  LIBOBJS
! LTLIBOBJS'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
--- 635,772 ----
  # include <unistd.h>
  #endif"
  
! ac_subst_vars='LTLIBOBJS
  LIBOBJS
! DEPEND_CFLAGS_FILTER
! MAKEMO
! MSGFMT
! INSTALL_TOOL_LANGS
! INSTALL_LANGS
! TAGPRG
! HANGULIN_OBJ
! HANGULIN_SRC
! GUI_X_LIBS
! GUITYPE
! GUI_LIB_LOC
! GUI_INC_LOC
! NARROW_PROTO
! MOTIF_LIBNAME
! GNOME_CONFIG
! GNOME_INCLUDEDIR
! GNOME_LIBDIR
! GNOME_LIBS
! GTK_LIBNAME
! GTK_LIBS
! GTK_CFLAGS
! PKG_CONFIG
! GTK12_CONFIG
! GTK_CONFIG
! X_LIB
! X_EXTRA_LIBS
! X_LIBS
! X_PRE_LIBS
! X_CFLAGS
! XMKMF
! xmkmfpath
! SNIFF_OBJ
! SNIFF_SRC
! NETBEANS_OBJ
! NETBEANS_SRC
! WORKSHOP_OBJ
! WORKSHOP_SRC
! RUBY_LIBS
! RUBY_CFLAGS
! RUBY_PRO
! RUBY_OBJ
! RUBY_SRC
! vi_cv_path_ruby
! TCL_LIBS
! TCL_CFLAGS
! TCL_PRO
! TCL_OBJ
! TCL_SRC
! vi_cv_path_tcl
! PYTHON_OBJ
! PYTHON_SRC
! PYTHON_CFLAGS
! PYTHON_GETPATH_CFLAGS
! PYTHON_LIBS
! PYTHON_CONFDIR
! vi_cv_path_python
! PERL_LIBS
! PERL_CFLAGS
! PERL_PRO
! PERL_OBJ
! PERL_SRC
! shrpenv
! vi_cv_perllib
! vi_cv_path_perl
! MZSCHEME_CFLAGS
! MZSCHEME_LIBS
! MZSCHEME_PRO
! MZSCHEME_OBJ
! MZSCHEME_SRC
! vi_cv_path_mzscheme
! compiledby
! dogvimdiff
! dovimdiff
! line_break
! VIEWNAME
! EXNAME
! VIMNAME
! OS_EXTRA_OBJ
! OS_EXTRA_SRC
! CPP_MM
! STRIP
! AWK
! EGREP
! GREP
! CPP
! OBJEXT
! EXEEXT
! ac_ct_CC
! CPPFLAGS
! LDFLAGS
! CFLAGS
! CC
! SET_MAKE
! target_alias
! host_alias
! build_alias
! LIBS
! ECHO_T
! ECHO_N
! ECHO_C
! DEFS
! mandir
! localedir
! libdir
! psdir
! pdfdir
! dvidir
! htmldir
! infodir
! docdir
! oldincludedir
! includedir
! localstatedir
! sharedstatedir
! sysconfdir
! datadir
! datarootdir
! libexecdir
! sbindir
! bindir
! program_transform_name
! prefix
! exec_prefix
! PACKAGE_BUGREPORT
! PACKAGE_STRING
! PACKAGE_VERSION
! PACKAGE_TARNAME
! PACKAGE_NAME
! PATH_SEPARATOR
! SHELL'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
***************
*** 1253,1261 ****
  if test -n "$ac_unrecognized_opts"; then
    case $enable_option_checking in
      no) ;;
!     fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
     { (exit 1); exit 1; }; } ;;
!     *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
  
--- 1253,1261 ----
  if test -n "$ac_unrecognized_opts"; then
    case $enable_option_checking in
      no) ;;
!     fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
     { (exit 1); exit 1; }; } ;;
!     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
  
***************
*** 1308,1314 ****
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
!   { $as_echo "$as_me: error: Working directory cannot be determined" >&2
     { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
--- 1308,1314 ----
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
!   { $as_echo "$as_me: error: working directory cannot be determined" >&2
     { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
***************
*** 1587,1593 ****
  if $ac_init_version; then
    cat <<\_ACEOF
  configure
! generated by GNU Autoconf 2.62
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--- 1587,1593 ----
  if $ac_init_version; then
    cat <<\_ACEOF
  configure
! generated by GNU Autoconf 2.63
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
***************
*** 1601,1607 ****
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
! generated by GNU Autoconf 2.62.  Invocation command line was
  
    $ $0 $@
  
--- 1601,1607 ----
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
! generated by GNU Autoconf 2.63.  Invocation command line was
  
    $ $0 $@
  
***************
*** 1724,1731 ****
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
! $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
--- 1724,1731 ----
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
***************
*** 1928,1933 ****
--- 1928,1935 ----
    fi
  done
  if $ac_cache_corrupted; then
+   { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
***************
*** 2084,2095 ****
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
! { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf at gnu.org." >&5
! $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
--- 2086,2093 ----
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
! { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
***************
*** 2288,2299 ****
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
! { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf at gnu.org." >&5
! $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
--- 2286,2293 ----
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
! { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
***************
*** 2303,2313 ****
  fi
  
  
! test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
  $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
--- 2297,2309 ----
  fi
  
  
! test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
  
  # Provide some information about the compiler.
  $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
***************
*** 2437,2447 ****
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: C compiler cannot create executables
  See \`config.log' for more details." >&2;}
!    { (exit 77); exit 77; }; }
  fi
  
  ac_exeext=$ac_cv_exeext
--- 2433,2445 ----
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: C compiler cannot create executables
  See \`config.log' for more details." >&2;}
!    { (exit 77); exit 77; }; }; }
  fi
  
  ac_exeext=$ac_cv_exeext
***************
*** 2469,2481 ****
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
      else
! 	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
      fi
    fi
  fi
--- 2467,2481 ----
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
      else
! 	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
      fi
    fi
  fi
***************
*** 2518,2528 ****
    esac
  done
  else
!   { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
  fi
  
  rm -f conftest$ac_cv_exeext
--- 2518,2530 ----
    esac
  done
  else
!   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
  fi
  
  rm -f conftest$ac_cv_exeext
***************
*** 2576,2586 ****
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
  fi
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
--- 2578,2590 ----
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
  fi
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
***************
*** 3148,3158 ****
  if $ac_preproc_ok; then
    :
  else
!   { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }
  fi
  
  ac_ext=c
--- 3152,3164 ----
  if $ac_preproc_ok; then
    :
  else
!   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&5
  $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&2;}
!    { (exit 1); exit 1; }; }; }
  fi
  
  ac_ext=c
***************
*** 4016,4023 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 4022,4030 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 4154,4160 ****
  $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
  
  fi
! if test $ac_cv_header_Carbon_Carbon_h = yes; then
    CARBON=yes
  fi
  
--- 4161,4167 ----
  $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
  
  fi
! if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
    CARBON=yes
  fi
  
***************
*** 4484,4490 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
  $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
! if test $ac_cv_lib_selinux_is_selinux_enabled = yes; then
    LIBS="$LIBS -lselinux"
  	   cat >>confdefs.h <<\_ACEOF
  #define HAVE_SELINUX 1
--- 4491,4497 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
  $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
! if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then
    LIBS="$LIBS -lselinux"
  	   cat >>confdefs.h <<\_ACEOF
  #define HAVE_SELINUX 1
***************
*** 5891,5897 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
  $as_echo "$ac_cv_lib_socket_socket" >&6; }
! if test $ac_cv_lib_socket_socket = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSOCKET 1
  _ACEOF
--- 5898,5904 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
  $as_echo "$ac_cv_lib_socket_socket" >&6; }
! if test "x$ac_cv_lib_socket_socket" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSOCKET 1
  _ACEOF
***************
*** 5966,5972 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test $ac_cv_lib_nsl_gethostbyname = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
  _ACEOF
--- 5973,5979 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
  _ACEOF
***************
*** 6203,6210 ****
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
!     *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
! $as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
     { (exit 1); exit 1; }; };; #(
      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
    $as_echo_n "(cached) " >&6
--- 6210,6217 ----
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
!     *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
! $as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
     { (exit 1); exit 1; }; };; #(
      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
    $as_echo_n "(cached) " >&6
***************
*** 6242,6248 ****
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
! 	/usr/lib | /lib) ;;
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
--- 6249,6255 ----
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
! 	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
***************
*** 6682,6688 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
! if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  fi
  
--- 6689,6695 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
! if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  fi
  
***************
*** 6752,6758 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
! if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
  
--- 6759,6765 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
! if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
  
***************
*** 6924,6930 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test $ac_cv_lib_nsl_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
  
--- 6931,6937 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
  
***************
*** 6994,7000 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
! if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
--- 7001,7007 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
! if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
***************
*** 7160,7166 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
  $as_echo "$ac_cv_lib_socket_connect" >&6; }
! if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
--- 7167,7173 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
  $as_echo "$ac_cv_lib_socket_connect" >&6; }
! if test "x$ac_cv_lib_socket_connect" = x""yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
***************
*** 7319,7325 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
  $as_echo "$ac_cv_lib_posix_remove" >&6; }
! if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
  
--- 7326,7332 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
  $as_echo "$ac_cv_lib_posix_remove" >&6; }
! if test "x$ac_cv_lib_posix_remove" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
  
***************
*** 7478,7484 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
! if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
--- 7485,7491 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
! if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
***************
*** 7559,7565 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
! if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
--- 7566,7572 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
! if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
***************
*** 7727,7733 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
  $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
! if test $ac_cv_lib_Xdmcp__XdmcpAuthDoIt = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
  fi
  
--- 7734,7740 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
  $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
! if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
  fi
  
***************
*** 7797,7803 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
  $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; }
! if test $ac_cv_lib_ICE_IceOpenConnection = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
  fi
  
--- 7804,7810 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
  $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; }
! if test "x$ac_cv_lib_ICE_IceOpenConnection" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
  fi
  
***************
*** 7868,7874 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
  $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
! if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lXpm"
  fi
  
--- 7875,7881 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
  $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
! if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = x""yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lXpm"
  fi
  
***************
*** 9251,9257 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
  $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
! if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
    GUI_X_LIBS="-lXext"
  fi
  
--- 9258,9264 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
  $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
! if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then
    GUI_X_LIBS="-lXext"
  fi
  
***************
*** 9320,9326 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5
  $as_echo "$ac_cv_lib_w_wslen" >&6; }
! if test $ac_cv_lib_w_wslen = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
  fi
  
--- 9327,9333 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5
  $as_echo "$ac_cv_lib_w_wslen" >&6; }
! if test "x$ac_cv_lib_w_wslen" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
  fi
  
***************
*** 9389,9395 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
  $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
! if test $ac_cv_lib_dl_dlsym = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
  fi
  
--- 9396,9402 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
  $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
! if test "x$ac_cv_lib_dl_dlsym" = x""yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
  fi
  
***************
*** 9458,9464 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
  $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
! if test $ac_cv_lib_Xmu_XmuCreateStippledPixmap = yes; then
    GUI_X_LIBS="-lXmu $GUI_X_LIBS"
  fi
  
--- 9465,9471 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
  $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
! if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = x""yes; then
    GUI_X_LIBS="-lXmu $GUI_X_LIBS"
  fi
  
***************
*** 9528,9534 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5
  $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; }
! if test $ac_cv_lib_Xp_XpEndJob = yes; then
    GUI_X_LIBS="-lXp $GUI_X_LIBS"
  fi
  
--- 9535,9541 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5
  $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; }
! if test "x$ac_cv_lib_Xp_XpEndJob" = x""yes; then
    GUI_X_LIBS="-lXp $GUI_X_LIBS"
  fi
  
***************
*** 9699,9706 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 9706,9714 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 9852,9859 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 9860,9868 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 10098,10105 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 10107,10115 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 10539,10545 ****
  $as_echo "$ac_cv_header_elf_h" >&6; }
  
  fi
! if test $ac_cv_header_elf_h = yes; then
    HAS_ELF=1
  fi
  
--- 10549,10555 ----
  $as_echo "$ac_cv_header_elf_h" >&6; }
  
  fi
! if test "x$ac_cv_header_elf_h" = x""yes; then
    HAS_ELF=1
  fi
  
***************
*** 10605,10611 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
  $as_echo "$ac_cv_lib_elf_main" >&6; }
! if test $ac_cv_lib_elf_main = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBELF 1
  _ACEOF
--- 10615,10621 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
  $as_echo "$ac_cv_lib_elf_main" >&6; }
! if test "x$ac_cv_lib_elf_main" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBELF 1
  _ACEOF
***************
*** 10679,10686 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
--- 10689,10697 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
***************
*** 10966,10972 ****
  
  
  
- 
  for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
  	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
  	iconv.h langinfo.h math.h unistd.h stropts.h errno.h \
--- 10977,10982 ----
***************
*** 10974,10980 ****
  	sys/stream.h termios.h libc.h sys/statfs.h \
  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
  	libgen.h util/debug.h util/msg18n.h frame.h \
! 	sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h
  do
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--- 10984,10990 ----
  	sys/stream.h termios.h libc.h sys/statfs.h \
  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
  	libgen.h util/debug.h util/msg18n.h frame.h \
! 	sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h
  do
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
***************
*** 11108,11115 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 11118,11126 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 11172,11179 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 11183,11256 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
!   cat >>confdefs.h <<_ACEOF
! #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
! _ACEOF
! 
! fi
! 
! done
! 
! 
! 
! for ac_header in sys/sysctl.h
! do
! as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
! { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
! $as_echo_n "checking for $ac_header... " >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   $as_echo_n "(cached) " >&6
! else
!   cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! #if defined HAVE_SYS_PARAM_H
! #  include <sys/param.h>
! #endif
! 
! #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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
! $as_echo "$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
!   $as_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
!   eval "$as_ac_Header=yes"
! else
!   $as_echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! 	eval "$as_ac_Header=no"
! fi
! 
! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
! fi
! ac_res=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
! 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
! $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 11372,11379 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 11449,11457 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 11770,11776 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
  $as_echo "$ac_cv_type_mode_t" >&6; }
! if test $ac_cv_type_mode_t = yes; then
    :
  else
  
--- 11848,11854 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
  $as_echo "$ac_cv_type_mode_t" >&6; }
! if test "x$ac_cv_type_mode_t" = x""yes; then
    :
  else
  
***************
*** 11874,11880 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
  $as_echo "$ac_cv_type_off_t" >&6; }
! if test $ac_cv_type_off_t = yes; then
    :
  else
  
--- 11952,11958 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
  $as_echo "$ac_cv_type_off_t" >&6; }
! if test "x$ac_cv_type_off_t" = x""yes; then
    :
  else
  
***************
*** 11978,11984 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
  $as_echo "$ac_cv_type_pid_t" >&6; }
! if test $ac_cv_type_pid_t = yes; then
    :
  else
  
--- 12056,12062 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
  $as_echo "$ac_cv_type_pid_t" >&6; }
! if test "x$ac_cv_type_pid_t" = x""yes; then
    :
  else
  
***************
*** 12082,12088 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
  $as_echo "$ac_cv_type_size_t" >&6; }
! if test $ac_cv_type_size_t = yes; then
    :
  else
  
--- 12160,12166 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
  $as_echo "$ac_cv_type_size_t" >&6; }
! if test "x$ac_cv_type_size_t" = x""yes; then
    :
  else
  
***************
*** 12286,12292 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
  $as_echo "$ac_cv_type_ino_t" >&6; }
! if test $ac_cv_type_ino_t = yes; then
    :
  else
  
--- 12364,12370 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
  $as_echo "$ac_cv_type_ino_t" >&6; }
! if test "x$ac_cv_type_ino_t" = x""yes; then
    :
  else
  
***************
*** 12390,12396 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5
  $as_echo "$ac_cv_type_dev_t" >&6; }
! if test $ac_cv_type_dev_t = yes; then
    :
  else
  
--- 12468,12474 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5
  $as_echo "$ac_cv_type_dev_t" >&6; }
! if test "x$ac_cv_type_dev_t" = x""yes; then
    :
  else
  
***************
*** 12680,12687 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_Lib'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
  _ACEOF
--- 12758,12766 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_Lib'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
  _ACEOF
***************
*** 13929,13936 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_var'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
--- 14008,14016 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_var'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
***************
*** 14313,14319 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5
  $as_echo "$ac_cv_lib_m_strtod" >&6; }
! if test $ac_cv_lib_m_strtod = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
  _ACEOF
--- 14393,14399 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5
  $as_echo "$ac_cv_lib_m_strtod" >&6; }
! if test "x$ac_cv_lib_m_strtod" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
  _ACEOF
***************
*** 14473,14479 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5
  $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; }
! if test $ac_cv_lib_posix1e_acl_get_file = yes; then
    LIBS="$LIBS -lposix1e"
  else
    { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
--- 14553,14559 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5
  $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; }
! if test "x$ac_cv_lib_posix1e_acl_get_file" = x""yes; then
    LIBS="$LIBS -lposix1e"
  else
    { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
***************
*** 14541,14547 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
  $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
! if test $ac_cv_lib_acl_acl_get_file = yes; then
    LIBS="$LIBS -lacl"
  		  { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5
  $as_echo_n "checking for fgetxattr in -lattr... " >&6; }
--- 14621,14627 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
  $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
! if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then
    LIBS="$LIBS -lacl"
  		  { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5
  $as_echo_n "checking for fgetxattr in -lattr... " >&6; }
***************
*** 14608,14614 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5
  $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
! if test $ac_cv_lib_attr_fgetxattr = yes; then
    LIBS="$LIBS -lattr"
  fi
  
--- 14688,14694 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5
  $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
! if test "x$ac_cv_lib_attr_fgetxattr" = x""yes; then
    LIBS="$LIBS -lattr"
  fi
  
***************
*** 15746,15752 ****
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
  $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
! if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then
    LIBS="$LIBS -lxpg4"
  fi
  
--- 15826,15832 ----
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
  $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
! if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = x""yes; then
    LIBS="$LIBS -lxpg4"
  fi
  
***************
*** 16045,16052 ****
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if test `eval 'as_val=${'$as_ac_var'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
--- 16125,16133 ----
  		 $as_echo "$as_val"'`
  	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! as_val=`eval 'as_val=${'$as_ac_var'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
***************
*** 16246,16252 ****
  $as_echo "$ac_cv_header_dlfcn_h" >&6; }
  
  fi
! if test $ac_cv_header_dlfcn_h = yes; then
    DLL=dlfcn.h
  else
    if test "${ac_cv_header_dl_h+set}" = set; then
--- 16327,16333 ----
  $as_echo "$ac_cv_header_dlfcn_h" >&6; }
  
  fi
! if test "x$ac_cv_header_dlfcn_h" = x""yes; then
    DLL=dlfcn.h
  else
    if test "${ac_cv_header_dl_h+set}" = set; then
***************
*** 16376,16382 ****
  $as_echo "$ac_cv_header_dl_h" >&6; }
  
  fi
! if test $ac_cv_header_dl_h = yes; then
    DLL=dl.h
  fi
  
--- 16457,16463 ----
  $as_echo "$ac_cv_header_dl_h" >&6; }
  
  fi
! if test "x$ac_cv_header_dl_h" = x""yes; then
    DLL=dl.h
  fi
  
***************
*** 16895,16902 ****
  $as_echo "$ac_res" >&6; }
  
  fi
! if test `eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 16976,16984 ----
  $as_echo "$ac_res" >&6; }
  
  fi
! as_val=`eval 'as_val=${'$as_ac_Header'}
! 		 $as_echo "$as_val"'`
!    if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 16986,16993 ****
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
! $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
--- 17068,17075 ----
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
!       *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
        esac
        case $ac_var in #(
        _ | IFS | as_nl) ;; #(
***************
*** 17379,17385 ****
  # values after options handling.
  ac_log="
  This file was extended by $as_me, which was
! generated by GNU Autoconf 2.62.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
--- 17461,17467 ----
  # values after options handling.
  ac_log="
  This file was extended by $as_me, which was
! generated by GNU Autoconf 2.63.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
***************
*** 17392,17397 ****
--- 17474,17488 ----
  
  _ACEOF
  
+ case $ac_config_files in *"
+ "*) set x $ac_config_files; shift; ac_config_files=$*;;
+ esac
+ 
+ case $ac_config_headers in *"
+ "*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+ esac
+ 
+ 
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  # Files that config.status was made for.
  config_files="$ac_config_files"
***************
*** 17404,17419 ****
  \`$as_me' instantiates files from templates according to the
  current configuration.
  
! Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
!   -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
!   --file=FILE[:TEMPLATE]
                     instantiate the configuration file FILE
!   --header=FILE[:TEMPLATE]
                     instantiate the configuration header FILE
  
  Configuration files:
--- 17495,17511 ----
  \`$as_me' instantiates files from templates according to the
  current configuration.
  
! Usage: $0 [OPTION]... [FILE]...
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
!   -q, --quiet, --silent
!                    do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
!       --file=FILE[:TEMPLATE]
                     instantiate the configuration file FILE
!       --header=FILE[:TEMPLATE]
                     instantiate the configuration header FILE
  
  Configuration files:
***************
*** 17428,17434 ****
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
  config.status
! configured by $0, generated by GNU Autoconf 2.62,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright (C) 2008 Free Software Foundation, Inc.
--- 17520,17526 ----
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
  config.status
! configured by $0, generated by GNU Autoconf 2.63,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright (C) 2008 Free Software Foundation, Inc.
***************
*** 17625,17631 ****
  $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
     { (exit 1); exit 1; }; }
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
      break
    elif $ac_last_try; then
      { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- 17717,17724 ----
  $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
     { (exit 1); exit 1; }; }
  
!   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
!   if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
      { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
***************
*** 17830,17838 ****
    }
    split(mac1, mac2, "(") #)
    macro = mac2[1]
    if (D_is_set[macro]) {
      # Preserve the white space surrounding the "#".
-     prefix = substr(line, 1, index(line, defundef) - 1)
      print prefix "define", macro P[macro] D[macro]
      next
    } else {
--- 17923,17931 ----
    }
    split(mac1, mac2, "(") #)
    macro = mac2[1]
+   prefix = substr(line, 1, index(line, defundef) - 1)
    if (D_is_set[macro]) {
      # Preserve the white space surrounding the "#".
      print prefix "define", macro P[macro] D[macro]
      next
    } else {
***************
*** 17840,17846 ****
      # in the case of _POSIX_SOURCE, which is predefined and required
      # on some systems where configure will not decide to define it.
      if (defundef == "undef") {
!       print "/*", line, "*/"
        next
      }
    }
--- 17933,17939 ----
      # in the case of _POSIX_SOURCE, which is predefined and required
      # on some systems where configure will not decide to define it.
      if (defundef == "undef") {
!       print "/*", prefix defundef, macro, "*/"
        next
      }
    }
***************
*** 17864,17871 ****
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
!   :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
! $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
     { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
--- 17957,17964 ----
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
!   :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
! $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
     { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
***************
*** 18183,18190 ****
    $ac_cs_success || { (exit 1); exit 1; }
  fi
  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
!   { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
! $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
  
--- 18276,18283 ----
    $ac_cs_success || { (exit 1); exit 1; }
  fi
  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
!   { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
! $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
  
*** ../vim-7.2.182/src/configure.in	2009-05-14 22:19:19.000000000 +0200
--- src/configure.in	2009-05-16 13:32:00.000000000 +0200
***************
*** 2100,2106 ****
  	sys/stream.h termios.h libc.h sys/statfs.h \
  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
  	libgen.h util/debug.h util/msg18n.h frame.h \
! 	sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h)
  
  dnl sys/ptem.h depends on sys/stream.h on Solaris
  AC_CHECK_HEADERS(sys/ptem.h, [], [],
--- 2100,2106 ----
  	sys/stream.h termios.h libc.h sys/statfs.h \
  	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
  	libgen.h util/debug.h util/msg18n.h frame.h \
! 	sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h)
  
  dnl sys/ptem.h depends on sys/stream.h on Solaris
  AC_CHECK_HEADERS(sys/ptem.h, [], [],
***************
*** 2108,2113 ****
--- 2108,2119 ----
  #  include <sys/stream.h>
  #endif])
  
+ dnl sys/sysctl.h depends on sys/param.h on OpenBSD
+ AC_CHECK_HEADERS(sys/sysctl.h, [], [],
+ [#if defined HAVE_SYS_PARAM_H
+ #  include <sys/param.h>
+ #endif])
+ 
  
  dnl pthread_np.h may exist but can only be used after including pthread.h
  AC_MSG_CHECKING([for pthread_np.h])
*** ../vim-7.2.182/src/version.c	2009-05-17 23:25:16.000000000 +0200
--- src/version.c	2009-05-21 15:16:01.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     183,
  /**/

-- 
CART DRIVER: Bring out your dead!
   There are legs stick out of windows and doors.  Two MEN are fighting in the
   mud - covered from head to foot in it.  Another MAN is on his hands in
   knees shovelling mud into his mouth.  We just catch sight of a MAN falling
   into a well.
                 "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    ///


--- NEW FILE 7.2.184 ---
To: vim-dev at vim.org
Subject: Patch 7.2.184
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.184
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Add UNUSED and type casts.  Autoconf check for wchar_t.
Files:	    src/auto/configure, src/config.h.in, src/configure.in,
	    src/gui_athena.c, src/gui_x11.c, src/gui.c, src/gui_beval.c,
	    src/gui_at_sb.c, src/gui_at_fs.c, src/gui_motif.c,
	    src/gui_xmdlg.c, src/gui_xmebw.c, src/if_python.c, src/window.c,
	    src/workshop.c


*** ../vim-7.2.183/src/auto/configure	2009-05-21 15:19:59.000000000 +0200
--- src/auto/configure	2009-05-21 16:05:01.000000000 +0200
***************
*** 7977,7982 ****
--- 7977,8058 ----
  
      LDFLAGS="$ac_save_LDFLAGS"
  
+     { $as_echo "$as_me:$LINENO: checking size of wchar_t is 2 bytes" >&5
+ $as_echo_n "checking size of wchar_t is 2 bytes... " >&6; }
+     if test "${ac_cv_small_wchar_t+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then
+   { { $as_echo "$as_me:$LINENO: error: failed to compile test program" >&5
+ $as_echo "$as_me: error: failed to compile test program" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+ #include <X11/Xlib.h>
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #endif
+ 		main()
+ 		{
+ 		  if (sizeof(wchar_t) <= 2)
+ 		    exit(1);
+ 		  exit(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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+   $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_small_wchar_t="no"
+ else
+   $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_small_wchar_t="yes"
+ fi
+ rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ 
+ fi
+ 
+     { $as_echo "$as_me:$LINENO: result: $ac_cv_small_wchar_t" >&5
+ $as_echo "$ac_cv_small_wchar_t" >&6; }
+     if test "x$ac_cv_small_wchar_t" = "xyes" ; then
+       cat >>confdefs.h <<\_ACEOF
+ #define SMALL_WCHAR_T 1
+ _ACEOF
+ 
+     fi
+ 
    fi
  fi
  
***************
*** 15417,15423 ****
  
  
  
- 
  bcopy_test_prog='
  #include "confdefs.h"
  #ifdef HAVE_STRING_H
--- 15493,15498 ----
*** ../vim-7.2.183/src/config.h.in	2009-05-14 22:19:19.000000000 +0200
--- src/config.h.in	2009-05-21 15:44:24.000000000 +0200
***************
*** 39,44 ****
--- 39,47 ----
  /* Defined to the size of an int */
  #undef SIZEOF_INT
  
+ /* Define when wchar_t is only 2 bytes. */
+ #undef SMALL_WCHAR_T
+ 
  /*
   * If we cannot trust one of the following from the libraries, we use our
   * own safe but probably slower vim_memmove().
*** ../vim-7.2.183/src/configure.in	2009-05-21 15:19:59.000000000 +0200
--- src/configure.in	2009-05-21 16:04:56.000000000 +0200
***************
*** 1193,1198 ****
--- 1193,1220 ----
  
      LDFLAGS="$ac_save_LDFLAGS"
  
+     AC_MSG_CHECKING(size of wchar_t is 2 bytes)
+     AC_CACHE_VAL(ac_cv_small_wchar_t,
+ 	[AC_TRY_RUN([
+ #include <X11/Xlib.h>
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #endif
+ 		main()
+ 		{
+ 		  if (sizeof(wchar_t) <= 2)
+ 		    exit(1);
+ 		  exit(0);
+ 		}],
+ 		ac_cv_small_wchar_t="no",
+ 		ac_cv_small_wchar_t="yes",
+ 		AC_MSG_ERROR(failed to compile test program))])
+     AC_MSG_RESULT($ac_cv_small_wchar_t)
+     if test "x$ac_cv_small_wchar_t" = "xyes" ; then
+       AC_DEFINE(SMALL_WCHAR_T)
+     fi
+ 
    fi
  fi
  
***************
*** 2881,2887 ****
  AC_MSG_RESULT($ac_cv_sizeof_int)
  AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)
  
- 
  dnl Check for memmove() before bcopy(), makes memmove() be used when both are
  dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
  
--- 2903,2908 ----
*** ../vim-7.2.183/src/gui_athena.c	2008-06-24 23:00:51.000000000 +0200
--- src/gui_athena.c	2009-05-21 16:39:43.000000000 +0200
***************
*** 86,95 ****
   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
   * left or middle mouse button.
   */
- /* ARGSUSED */
      static void
  gui_athena_scroll_cb_jump(w, client_data, call_data)
!     Widget	w;
      XtPointer	client_data, call_data;
  {
      scrollbar_T *sb, *sb_info;
--- 86,94 ----
   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
   * left or middle mouse button.
   */
      static void
  gui_athena_scroll_cb_jump(w, client_data, call_data)
!     Widget	w UNUSED;
      XtPointer	client_data, call_data;
  {
      scrollbar_T *sb, *sb_info;
***************
*** 122,131 ****
[...3247 lines suppressed...]
! 	char	*filename)
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
--- 262,270 ----
      load_window(filename, lineno);
  }
  
      void
  workshop_front_file(
! 	char	*filename UNUSED)
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
***************
*** 538,546 ****
   * breakpoints have moved when a program has been recompiled and
   * reloaded into dbx.
   */
- /*ARGSUSED*/
      void
! workshop_moved_marks(char *filename)
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
--- 536,543 ----
   * breakpoints have moved when a program has been recompiled and
   * reloaded into dbx.
   */
      void
! workshop_moved_marks(char *filename UNUSED)
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
***************
*** 575,585 ****
      return (int)h;
  }
  
- /*ARGSUSED*/
      void
  workshop_footer_message(
! 	char		*message,
! 	int		 severity)	/* severity is currently unused */
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
--- 572,581 ----
      return (int)h;
  }
  
      void
  workshop_footer_message(
! 	char	*message,
! 	int	severity UNUSED)	/* severity is currently unused */
  {
  #ifdef WSDEBUG_TRACE
      if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
***************
*** 687,701 ****
   * command. The globals curMenuName and curMenuPriority contain the name and
   * priority of the parent menu tree.
   */
- /*ARGSUSED*/
      void
  workshop_menu_item(
  	char		*label,
  	char		*verb,
! 	char		*accelerator,
  	char		*acceleratorText,
! 	char		*name,
! 	char		*filepos,
  	char		*sensitive)
  {
      char		 cbuf[BUFSIZ];
--- 683,696 ----
   * command. The globals curMenuName and curMenuPriority contain the name and
   * priority of the parent menu tree.
   */
      void
  workshop_menu_item(
  	char		*label,
  	char		*verb,
! 	char		*accelerator UNUSED,
  	char		*acceleratorText,
! 	char		*name UNUSED,
! 	char		*filepos UNUSED,
  	char		*sensitive)
  {
      char		 cbuf[BUFSIZ];
***************
*** 810,822 ****
      workshopInitDone = True;
  }
  
- /*ARGSUSED*/
      void
  workshop_toolbar_button(
  	char	*label,
  	char	*verb,
! 	char	*senseVerb,
! 	char	*filepos,
  	char	*help,
  	char	*sense,
  	char	*file,
--- 805,816 ----
      workshopInitDone = True;
  }
  
      void
  workshop_toolbar_button(
  	char	*label,
  	char	*verb,
! 	char	*senseVerb UNUSED,
! 	char	*filepos UNUSED,
  	char	*help,
  	char	*sense,
  	char	*file,
***************
*** 968,974 ****
  	    if (strcmp(option, "syntax") == 0)
  		vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
  	    else if (strcmp(option, "savefiles") == 0)
! 		; /* XXX - Not yet implemented */
  	    break;
  
  	case 'l':
--- 962,970 ----
  	    if (strcmp(option, "syntax") == 0)
  		vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
  	    else if (strcmp(option, "savefiles") == 0)
! 	    {
! 		/* XXX - Not yet implemented */
! 	    }
  	    break;
  
  	case 'l':
***************
*** 1098,1107 ****
  /*
   * A button in the toolbar has been pushed.
   */
- /*ARGSUSED*/
      int
  workshop_get_positions(
! 	void		*clientData,	/* unused */
  	char	       **filename,	/* output data */
  	int		*curLine,	/* output data */
  	int		*curCol,	/* output data */
--- 1094,1102 ----
  /*
   * A button in the toolbar has been pushed.
   */
      int
  workshop_get_positions(
! 	void		*clientData UNUSED,
  	char	       **filename,	/* output data */
  	int		*curLine,	/* output data */
  	int		*curCol,	/* output data */
***************
*** 1526,1534 ****
  	return NULL;
  }
  
- /*ARGSUSED*/
      void
! workshop_save_sensitivity(char *filename)
  {
  }
  
--- 1521,1528 ----
  	return NULL;
  }
  
      void
! workshop_save_sensitivity(char *filename UNUSED)
  {
  }
  
*** ../vim-7.2.183/src/version.c	2009-05-21 15:19:59.000000000 +0200
--- src/version.c	2009-05-21 23:19:40.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     184,
  /**/

-- 
CART DRIVER: Bring out your dead!
LARGE MAN:   Here's one!
CART DRIVER: Ninepence.
BODY:        I'm not dead!
                 "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    ///


--- NEW FILE 7.2.185 ---
To: vim-dev at vim.org
Subject: Patch 7.2.185
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.185
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Add UNUSED and type casts.
Files:	    src/Makefile, src/if_tlc.c, src/if_ruby.c


*** ../vim-7.2.184/src/Makefile	2009-05-21 23:25:47.000000000 +0200
--- src/Makefile	2009-05-22 18:18:44.000000000 +0200
***************
*** 105,112 ****
  # 4. "make test"  {{{1
  #	This is optional.  This will run Vim scripts on a number of test
  #	files, and compare the produced output with the expected output.
! #	If all is well, you will get the "ALL DONE" message in the end.  See
! #	below (search for "/^test").
  #
  # 5. "make install"  {{{1
  #	If the new Vim seems to be working OK you can install it and the
--- 105,112 ----
  # 4. "make test"  {{{1
  #	This is optional.  This will run Vim scripts on a number of test
  #	files, and compare the produced output with the expected output.
! #	If all is well, you will get the "ALL DONE" message in the end.  If a
! #	test fails you get "TEST FAILURE".  See below (search for "/^test").
  #
  # 5. "make install"  {{{1
  #	If the new Vim seems to be working OK you can install it and the
***************
*** 533,538 ****
--- 533,543 ----
  #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes
  #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
  
+ # Use this with GCC to check for mistakes, unused arguments, etc.
+ #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
+ #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+ #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code
+ 
  # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
  # allocated memory (and makes every malloc()/free() very slow).
  # Electric Fence is free (search ftp sites).
***************
*** 551,562 ****
  # }}}
  
  # LINT - for running lint
! #  For standard lint
! #LINT = lint
! #LINT_OPTIONS = -beprxzF
! #  For splint  (see cleanlint.vim for filtering the output)
! LINT = splint
! LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
  
  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
  # Might not work with GUI or Perl.
--- 556,568 ----
  # }}}
  
  # LINT - for running lint
! #  For standard Unix lint
! LINT = lint
! LINT_OPTIONS = -beprxzF
! #  For splint
! #  It doesn't work well, crashes on include files and non-ascii characters.
! #LINT = splint
! #LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999
  
  # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof.
  # Might not work with GUI or Perl.
***************
*** 1743,1749 ****
  # messages.  Don't worry about that.
  # If there is a real error, there will be a difference between "test.out" and
  # a "test99.ok" file.
! # If everything is alright, the final message will be "ALL DONE".
  #
  test check:
  	$(MAKE) -f Makefile $(VIMTARGET)
--- 1749,1756 ----
  # messages.  Don't worry about that.
  # If there is a real error, there will be a difference between "test.out" and
  # a "test99.ok" file.
! # If everything is alright, the final message will be "ALL DONE".  If not you
! # get "TEST FAILURE".
  #
  test check:
  	$(MAKE) -f Makefile $(VIMTARGET)
***************
*** 2427,2433 ****
  	$(CCC) -o $@ if_xcmdsrv.c
  
  objects/if_mzsch.o: if_mzsch.c
! 	$(CCC) -o $@ if_mzsch.c
  
  objects/if_perl.o: auto/if_perl.c
  	$(CCC) -o $@ auto/if_perl.c
--- 2434,2440 ----
  	$(CCC) -o $@ if_xcmdsrv.c
  
  objects/if_mzsch.o: if_mzsch.c
! 	$(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c
  
  objects/if_perl.o: auto/if_perl.c
  	$(CCC) -o $@ auto/if_perl.c
***************
*** 2436,2442 ****
  	$(CCC) -o $@ if_perlsfio.c
  
  objects/if_python.o: if_python.c
! 	$(CCC) -o $@ if_python.c
  
  objects/if_ruby.o: if_ruby.c
  	$(CCC) -o $@ if_ruby.c
--- 2443,2449 ----
  	$(CCC) -o $@ if_perlsfio.c
  
  objects/if_python.o: if_python.c
! 	$(CCC) -o $@ $(PYTHON_CFLAGS_EXTRA) if_python.c
  
  objects/if_ruby.o: if_ruby.c
  	$(CCC) -o $@ if_ruby.c
*** ../vim-7.2.184/src/if_ruby.c	2007-09-13 15:00:49.000000000 +0200
--- src/if_ruby.c	2009-05-22 15:32:04.000000000 +0200
***************
*** 492,498 ****
      }
  }
  
! static VALUE vim_message(VALUE self, VALUE str)
  {
      char *buff, *p;
  
--- 492,498 ----
      }
  }
  
! static VALUE vim_message(VALUE self UNUSED, VALUE str)
  {
      char *buff, *p;
  
***************
*** 505,524 ****
      return Qnil;
  }
  
! static VALUE vim_set_option(VALUE self, VALUE str)
  {
      do_set((char_u *)STR2CSTR(str), 0);
      update_screen(NOT_VALID);
      return Qnil;
  }
  
! static VALUE vim_command(VALUE self, VALUE str)
  {
      do_cmdline_cmd((char_u *)STR2CSTR(str));
      return Qnil;
  }
  
! static VALUE vim_evaluate(VALUE self, VALUE str)
  {
  #ifdef FEAT_EVAL
      char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE);
--- 505,524 ----
      return Qnil;
  }
  
! static VALUE vim_set_option(VALUE self UNUSED, VALUE str)
  {
      do_set((char_u *)STR2CSTR(str), 0);
      update_screen(NOT_VALID);
      return Qnil;
  }
  
! static VALUE vim_command(VALUE self UNUSED, VALUE str)
  {
      do_cmdline_cmd((char_u *)STR2CSTR(str));
      return Qnil;
  }
  
! static VALUE vim_evaluate(VALUE self UNUSED, VALUE str)
  {
  #ifdef FEAT_EVAL
      char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE);
***************
*** 580,586 ****
      return INT2NUM(n);
  }
  
! static VALUE buffer_s_aref(VALUE self, VALUE num)
  {
      buf_T *b;
      int n = NUM2INT(num);
--- 580,586 ----
      return INT2NUM(n);
  }
  
! static VALUE buffer_s_aref(VALUE self UNUSED, VALUE num)
  {
      buf_T *b;
      int n = NUM2INT(num);
***************
*** 629,635 ****
--- 629,637 ----
  	return line ? rb_str_new2(line) : Qnil;
      }
      rb_raise(rb_eIndexError, "index %d out of buffer", n);
+ #ifndef __GNUC__
      return Qnil; /* For stop warning */
+ #endif
  }
  
  static VALUE buffer_aref(VALUE self, VALUE num)
***************
*** 668,674 ****
--- 670,678 ----
      else
      {
  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
+ #ifndef __GNUC__
  	return Qnil; /* For stop warning */
+ #endif
      }
      return 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);
  }
--- 793,799 ----
      return get_buffer_line(curbuf, curwin->w_cursor.lnum);
  }
  
! static VALUE set_current_line(VALUE self UNUSED, VALUE str)
  {
      return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
  }
***************
*** 815,821 ****
  #endif
  }
  
! static VALUE window_s_aref(VALUE self, VALUE num)
  {
      win_T *w;
      int n = NUM2INT(num);
--- 819,825 ----
  #endif
  }
  
! static VALUE window_s_aref(VALUE self UNUSED, VALUE num)
  {
      win_T *w;
      int n = NUM2INT(num);
***************
*** 897,903 ****
      return Qnil;
  }
  
! static VALUE f_p(int argc, VALUE *argv, VALUE self)
  {
      int i;
      VALUE str = rb_str_new("", 0);
--- 901,907 ----
      return Qnil;
  }
  
! static VALUE f_p(int argc, VALUE *argv, VALUE self UNUSED)
  {
      int i;
      VALUE str = rb_str_new("", 0);
*** ../vim-7.2.184/src/version.c	2009-05-21 23:25:38.000000000 +0200
--- src/version.c	2009-05-22 18:18:58.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     185,
  /**/

-- 
BODY:        I'm not dead!
CART DRIVER: 'Ere.  He says he's not dead.
LARGE MAN:   Yes he is.
BODY:        I'm not!
                 "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    ///


--- NEW FILE 7.2.186 ---
To: vim-dev at vim.org
Subject: Patch 7.2.186
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.186
Problem:    Some more compiler warnings when using gcc -Wextra.
Solution:   Now with the intended if_tcl.c changes.
Files:	    src/if_tcl.c


*** ../vim-7.2.185/src/if_tcl.c	2007-05-10 20:55:34.000000000 +0200
--- src/if_tcl.c	2009-05-22 15:29:53.000000000 +0200
***************
*** 290,299 ****
   */
  #define TCL_EXIT	5
  
- /* ARGSUSED */
      static int
  exitcmd(dummy, interp, objc, objv)
!     ClientData dummy;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
--- 290,298 ----
   */
  #define TCL_EXIT	5
  
      static int
  exitcmd(dummy, interp, objc, objv)
!     ClientData dummy UNUSED;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
***************
*** 315,324 ****
      return TCL_ERROR;
  }
  
- /* ARGSUSED */
      static int
  catchcmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 314,322 ----
      return TCL_ERROR;
  }
  
      static int
  catchcmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 356,365 ****
  /*
   *  "::vim::beep" - what Vi[m] does best :-)
   */
- /* ARGSUSED */
      static int
  beepcmd(dummy, interp, objc, objv)
!     ClientData dummy;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
--- 354,362 ----
  /*
   *  "::vim::beep" - what Vi[m] does best :-)
   */
      static int
  beepcmd(dummy, interp, objc, objv)
!     ClientData dummy UNUSED;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
***************
*** 378,387 ****
   *  "::vim::buffer {N}" - create buffer command for buffer N.
   *  "::vim::buffer new" - create a new buffer (not implemented)
   */
- /* ARGSUSED */
      static int
  buffercmd(dummy, interp, objc, objv)
!     ClientData dummy;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
--- 375,383 ----
   *  "::vim::buffer {N}" - create buffer command for buffer N.
   *  "::vim::buffer new" - create a new buffer (not implemented)
   */
      static int
  buffercmd(dummy, interp, objc, objv)
!     ClientData dummy UNUSED;
      Tcl_Interp *interp;
      int objc;
      Tcl_Obj *CONST objv[];
***************
*** 475,484 ****
  /*
   * "::vim::window list" - create list of window commands.
   */
- /* ARGSUSED */
      static int
  windowcmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 471,479 ----
  /*
   * "::vim::window list" - create list of window commands.
   */
      static int
  windowcmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 1130,1139 ****
  }
  
  
- /* ARGSUSED */
      static int
  commandcmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 1125,1133 ----
  }
  
  
      static int
  commandcmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 1145,1154 ****
      return err;
  }
  
- /* ARGSUSED */
      static int
  optioncmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 1139,1147 ----
      return err;
  }
  
      static int
  optioncmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 1160,1169 ****
      return err;
  }
  
- /* ARGSUSED */
      static int
  exprcmd(dummy, interp, objc, objv)
!     ClientData	dummy;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
--- 1153,1161 ----
      return err;
  }
  
      static int
  exprcmd(dummy, interp, objc, objv)
!     ClientData	dummy UNUSED;
      Tcl_Interp	*interp;
      int		objc;
      Tcl_Obj	*CONST objv[];
***************
*** 1584,1594 ****
      I/O Channel
  ********************************************/
  
- /* ARGSUSED */
      static int
  channel_close(instance, interp)
      ClientData	instance;
!     Tcl_Interp	*interp;
  {
      int		err = 0;
  
--- 1576,1585 ----
      I/O Channel
  ********************************************/
  
      static int
  channel_close(instance, interp)
      ClientData	instance;
!     Tcl_Interp	*interp UNUSED;
  {
      int		err = 0;
  
***************
*** 1602,1613 ****
      return err;
  }
  
- /* ARGSUSED */
      static int
  channel_input(instance, buf, bufsiz, errptr)
!     ClientData	instance;
!     char	*buf;
!     int		bufsiz;
      int		*errptr;
  {
  
--- 1593,1603 ----
      return err;
  }
  
      static int
  channel_input(instance, buf, bufsiz, errptr)
!     ClientData	instance UNUSED;
!     char	*buf UNUSED;
!     int		bufsiz UNUSED;
      int		*errptr;
  {
  
***************
*** 1659,1679 ****
      return result;
  }
  
- /* ARGSUSED */
      static void
  channel_watch(instance, mask)
!     ClientData	instance;
!     int		mask;
  {
      Tcl_SetErrno(EINVAL);
  }
  
- /* ARGSUSED */
      static int
  channel_gethandle(instance, direction, handleptr)
!     ClientData	instance;
!     int		direction;
!     ClientData	*handleptr;
  {
      Tcl_SetErrno(EINVAL);
      return EINVAL;
--- 1649,1667 ----
      return result;
  }
  
      static void
  channel_watch(instance, mask)
!     ClientData	instance UNUSED;
!     int		mask UNUSED;
  {
      Tcl_SetErrno(EINVAL);
  }
  
      static int
  channel_gethandle(instance, direction, handleptr)
!     ClientData	instance UNUSED;
!     int		direction UNUSED;
!     ClientData	*handleptr UNUSED;
  {
      Tcl_SetErrno(EINVAL);
      return EINVAL;
***************
*** 1691,1697 ****
      NULL,   /* set option */
      NULL,   /* get option */
      channel_watch,
!     channel_gethandle
  };
  
  /**********************************
--- 1679,1692 ----
      NULL,   /* set option */
      NULL,   /* get option */
      channel_watch,
!     channel_gethandle,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL
  };
  
  /**********************************
*** ../vim-7.2.185/src/version.c	2009-05-22 18:20:23.000000000 +0200
--- src/version.c	2009-05-22 21:07:21.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     186,
  /**/

-- 
ARTHUR: Old woman!
DENNIS: Man!
ARTHUR: Man.  I'm sorry.  Old man, What knight live in that castle over there?
DENNIS: I'm thirty-seven.
                 "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    ///


--- NEW FILE 7.2.187 ---
To: vim-dev at vim.org
Subject: Patch 7.2.187
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.187 (after 7.2.186)
Problem:    Doesn't build with older versions of TCL. (Yongwei Wu)
Solution:   Add #ifdefs. (Dominique Pelle)
Files:	    src/if_tcl.c


*** ../vim-7.2.186/src/if_tcl.c	2009-05-22 21:07:45.000000000 +0200
--- src/if_tcl.c	2009-05-23 14:23:51.000000000 +0200
***************
*** 161,167 ****
  # endif
  
  /*
!  * Declare HANDLE for perl.dll and function pointers.
   */
  static HANDLE hTclLib = NULL;
  Tcl_Interp* (*dll_Tcl_CreateInterp)();
--- 161,167 ----
  # endif
  
  /*
!  * Declare HANDLE for tcl.dll and function pointers.
   */
  static HANDLE hTclLib = NULL;
  Tcl_Interp* (*dll_Tcl_CreateInterp)();
***************
*** 182,188 ****
   * Make all runtime-links of tcl.
   *
   * 1. Get module handle using LoadLibraryEx.
!  * 2. Get pointer to perl function by GetProcAddress.
   * 3. Repeat 2, until get all functions will be used.
   *
   * Parameter 'libname' provides name of DLL.
--- 182,188 ----
   * Make all runtime-links of tcl.
   *
   * 1. Get module handle using LoadLibraryEx.
!  * 2. Get pointer to tcl function by GetProcAddress.
   * 3. Repeat 2, until get all functions will be used.
   *
   * Parameter 'libname' provides name of DLL.
***************
*** 1670,1692 ****
  
  static Tcl_ChannelType channel_type =
  {
!     "vimmessage",
!     NULL,   /* blockmode */
!     channel_close,
!     channel_input,
!     channel_output,
!     NULL,   /* seek */
!     NULL,   /* set option */
!     NULL,   /* get option */
!     channel_watch,
!     channel_gethandle,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL,
!     NULL
  };
  
  /**********************************
--- 1670,1700 ----
  
  static Tcl_ChannelType channel_type =
  {
!     "vimmessage",	/* typeName */
!     NULL,		/* version */
!     channel_close,	/* closeProc */
!     channel_input,	/* inputProc */
!     channel_output,	/* outputProc */
!     NULL,		/* seekProc */
!     NULL,		/* setOptionProc */
!     NULL,		/* getOptionProc */
!     channel_watch,	/* watchProc */
!     channel_gethandle,	/* getHandleProc */
!     NULL,		/* close2Proc */
!     NULL,		/* blockModeProc */
! #ifdef TCL_CHANNEL_VERSION_2
!     NULL,		/* flushProc */
!     NULL,		/* handlerProc */
! #endif
! #ifdef TCL_CHANNEL_VERSION_3
!     NULL,		/* wideSeekProc */
! #endif
! #ifdef TCL_CHANNEL_VERSION_4
!     NULL,		/* threadActionProc */
! #endif
! #ifdef TCL_CHANNEL_VERSION_5
!     NULL		/* truncateProc */
! #endif
  };
  
  /**********************************
*** ../vim-7.2.186/src/version.c	2009-05-22 21:07:45.000000000 +0200
--- src/version.c	2009-05-23 14:25:04.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     187,
  /**/

-- 
Friends?  I have lots of friends!  In fact, I have every episode ever made.

 /// 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    ///


--- NEW FILE 7.2.188 ---
To: vim-dev at vim.org
Subject: Patch 7.2.188
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.188
Problem:    Crash with specific use of function calls. (Meikel Brandmeyer)
Solution:   Make sure the items referenced by a function call are not freed
	    twice.  (based on patch from Nico Weber)
Files:	    src/eval.c


*** ../vim-7.2.187/src/eval.c	2009-05-16 17:29:37.000000000 +0200
--- src/eval.c	2009-05-22 20:04:22.000000000 +0200
***************
*** 129,136 ****
--- 129,139 ----
  /*
   * When recursively copying lists and dicts we need to remember which ones we
   * have done to avoid endless recursiveness.  This unique ID is used for that.
+  * The last bit is used for previous_funccal, ignored when comparing.
   */
  static int current_copyID = 0;
+ #define COPYID_INC 2
+ #define COPYID_MASK (~0x1)
  
  /*
   * Array to hold the hashtab with variables local to each sourced script.
***************
*** 439,444 ****
--- 442,448 ----
  static void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
  static char_u *list2string __ARGS((typval_T *tv, int copyID));
  static int list_join __ARGS((garray_T *gap, list_T *l, char_u *sep, int echo, int copyID));
+ static int free_unref_items __ARGS((int copyID));
  static void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
  static void set_ref_in_list __ARGS((list_T *l, int copyID));
  static void set_ref_in_item __ARGS((typval_T *tv, int copyID));
***************
*** 6494,6507 ****
      int
  garbage_collect()
  {
!     dict_T	*dd;
!     list_T	*ll;
!     int		copyID = ++current_copyID;
      buf_T	*buf;
      win_T	*wp;
      int		i;
      funccall_T	*fc, **pfc;
!     int		did_free = FALSE;
  #ifdef FEAT_WINDOWS
      tabpage_T	*tp;
  #endif
--- 6498,6510 ----
      int
  garbage_collect()
  {
!     int		copyID;
      buf_T	*buf;
      win_T	*wp;
      int		i;
      funccall_T	*fc, **pfc;
!     int		did_free;
!     int		did_free_funccal = FALSE;
  #ifdef FEAT_WINDOWS
      tabpage_T	*tp;
  #endif
***************
*** 6511,6520 ****
--- 6514,6538 ----
      may_garbage_collect = FALSE;
      garbage_collect_at_exit = FALSE;
  
+     /* We advance by two because we add one for items referenced through
+      * previous_funccal. */
+     current_copyID += COPYID_INC;
+     copyID = current_copyID;
+ 
      /*
       * 1. Go through all accessible variables and mark all lists and dicts
       *    with copyID.
       */
+ 
+     /* Don't free variables in the previous_funccal list unless they are only
+      * referenced through previous_funccal.  This must be first, because if
+      * the item is referenced elsewhere it must not be freed. */
+     for (fc = previous_funccal; fc != NULL; fc = fc->caller)
+     {
+ 	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
+ 	set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID + 1);
+     }
+ 
      /* script-local variables */
      for (i = 1; i <= ga_scripts.ga_len; ++i)
  	set_ref_in_ht(&SCRIPT_VARS(i), copyID);
***************
*** 6546,6556 ****
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
  
      /*
!      * 2. Go through the list of dicts and free items without the copyID.
       */
      for (dd = first_dict; dd != NULL; )
! 	if (dd->dv_copyID != copyID)
  	{
  	    /* Free the Dictionary and ordinary items it contains, but don't
  	     * recurse into Lists and Dictionaries, they will be in the list
--- 6564,6610 ----
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
  
+     /* Free lists and dictionaries that are not referenced. */
+     did_free = free_unref_items(copyID);
+ 
+     /* check if any funccal can be freed now */
+     for (pfc = &previous_funccal; *pfc != NULL; )
+     {
+ 	if (can_free_funccal(*pfc, copyID))
+ 	{
+ 	    fc = *pfc;
+ 	    *pfc = fc->caller;
+ 	    free_funccal(fc, TRUE);
+ 	    did_free = TRUE;
+ 	    did_free_funccal = TRUE;
+ 	}
+ 	else
+ 	    pfc = &(*pfc)->caller;
+     }
+     if (did_free_funccal)
+ 	/* When a funccal was freed some more items might be garbage
+ 	 * collected, so run again. */
+ 	(void)garbage_collect();
+ 
+     return did_free;
+ }
+ 
+ /*
+  * Free lists and dictionaries that are no longer referenced.
+  */
+     static int
+ free_unref_items(copyID)
+     int copyID;
+ {
+     dict_T	*dd;
+     list_T	*ll;
+     int		did_free = FALSE;
+ 
      /*
!      * Go through the list of dicts and free items without the copyID.
       */
      for (dd = first_dict; dd != NULL; )
! 	if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
  	{
  	    /* Free the Dictionary and ordinary items it contains, but don't
  	     * recurse into Lists and Dictionaries, they will be in the list
***************
*** 6565,6576 ****
  	    dd = dd->dv_used_next;
  
      /*
!      * 3. Go through the list of lists and free items without the copyID.
!      *    But don't free a list that has a watcher (used in a for loop), these
!      *    are not referenced anywhere.
       */
      for (ll = first_list; ll != NULL; )
! 	if (ll->lv_copyID != copyID && ll->lv_watch == NULL)
  	{
  	    /* Free the List and ordinary items it contains, but don't recurse
  	     * into Lists and Dictionaries, they will be in the list of dicts
--- 6619,6631 ----
  	    dd = dd->dv_used_next;
  
      /*
!      * Go through the list of lists and free items without the copyID.
!      * But don't free a list that has a watcher (used in a for loop), these
!      * are not referenced anywhere.
       */
      for (ll = first_list; ll != NULL; )
! 	if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)
! 						      && ll->lv_watch == NULL)
  	{
  	    /* Free the List and ordinary items it contains, but don't recurse
  	     * into Lists and Dictionaries, they will be in the list of dicts
***************
*** 6584,6603 ****
  	else
  	    ll = ll->lv_used_next;
  
-     /* check if any funccal can be freed now */
-     for (pfc = &previous_funccal; *pfc != NULL; )
-     {
- 	if (can_free_funccal(*pfc, copyID))
- 	{
- 	    fc = *pfc;
- 	    *pfc = fc->caller;
- 	    free_funccal(fc, TRUE);
- 	    did_free = TRUE;
- 	}
- 	else
- 	    pfc = &(*pfc)->caller;
-     }
- 
      return did_free;
  }
  
--- 6639,6644 ----
***************
*** 18842,18847 ****
--- 18883,18889 ----
  {
      hash_init(&dict->dv_hashtab);
      dict->dv_refcount = DO_NOT_FREE_CNT;
+     dict->dv_copyID = 0;
      dict_var->di_tv.vval.v_dict = dict;
      dict_var->di_tv.v_type = VAR_DICT;
      dict_var->di_tv.v_lock = VAR_FIXED;
***************
*** 21294,21301 ****
      current_funccal = fc->caller;
      --depth;
  
!     /* if the a:000 list and the a: dict are not referenced we can free the
!      * funccall_T and what's in it. */
      if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
  	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
  	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
--- 21336,21343 ----
      current_funccal = fc->caller;
      --depth;
  
!     /* If the a:000 list and the l: and a: dicts are not referenced we can
!      * free the funccall_T and what's in it. */
      if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
  	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
  	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
***************
*** 21334,21340 ****
  
  /*
   * Return TRUE if items in "fc" do not have "copyID".  That means they are not
!  * referenced from anywhere.
   */
      static int
  can_free_funccal(fc, copyID)
--- 21376,21382 ----
  
  /*
   * Return TRUE if items in "fc" do not have "copyID".  That means they are not
!  * referenced from anywhere that is in use.
   */
      static int
  can_free_funccal(fc, copyID)
*** ../vim-7.2.187/src/version.c	2009-05-23 14:27:43.000000000 +0200
--- src/version.c	2009-05-24 13:20:49.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     188,
  /**/

-- 
ARTHUR:    ... and I am your king ....
OLD WOMAN: Ooooh!  I didn't know we had a king.  I thought we were an
           autonomous collective ...
                 "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    ///


--- NEW FILE 7.2.189 ---
To: vim-dev at vim.org
Subject: Patch 7.2.189
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.189
Problem:    Possible hang for deleting auto-indent. (Dominique Pelle)
Solution:   Make sure the position is not beyond the end of the line.
Files:	    src/edit.c


*** ../vim-7.2.188/src/edit.c	2009-05-16 16:36:25.000000000 +0200
--- src/edit.c	2009-05-26 10:53:05.000000000 +0200
***************
*** 6420,6432 ****
  
  	/* If we just did an auto-indent, remove the white space from the end
  	 * of the line, and put the cursor back.
! 	 * Do this when ESC was used or moving the cursor up/down. */
  	if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
! 			&& curwin->w_cursor.lnum != end_insert_pos->lnum)))
  	{
  	    pos_T	tpos = curwin->w_cursor;
  
  	    curwin->w_cursor = *end_insert_pos;
  	    for (;;)
  	    {
  		if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
--- 6420,6436 ----
  
  	/* If we just did an auto-indent, remove the white space from the end
  	 * of the line, and put the cursor back.
! 	 * Do this when ESC was used or moving the cursor up/down.
! 	 * Check for the old position still being valid, just in case the text
! 	 * got changed unexpectedly. */
  	if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
! 			&& curwin->w_cursor.lnum != end_insert_pos->lnum))
! 		&& end_insert_pos->lnum <= curbuf->b_ml.ml_line_count)
  	{
  	    pos_T	tpos = curwin->w_cursor;
  
  	    curwin->w_cursor = *end_insert_pos;
+ 	    check_cursor_col();  /* make sure it is not past the line */
  	    for (;;)
  	    {
  		if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
***************
*** 6434,6440 ****
  		cc = gchar_cursor();
  		if (!vim_iswhite(cc))
  		    break;
! 		(void)del_char(TRUE);
  	    }
  	    if (curwin->w_cursor.lnum != tpos.lnum)
  		curwin->w_cursor = tpos;
--- 6438,6445 ----
  		cc = gchar_cursor();
  		if (!vim_iswhite(cc))
  		    break;
! 		if (del_char(TRUE) == FAIL)
! 		    break;  /* should not happen */
  	    }
  	    if (curwin->w_cursor.lnum != tpos.lnum)
  		curwin->w_cursor = tpos;
*** ../vim-7.2.188/src/version.c	2009-05-24 13:40:17.000000000 +0200
--- src/version.c	2009-05-26 10:50:53.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     189,
  /**/

-- 
FIRST VILLAGER: We have found a witch.  May we burn her?
                 "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    ///


--- NEW FILE 7.2.190 ---
To: vim-dev at vim.org
Subject: Patch 7.2.190
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.190
Problem:    The register executed by @@ isn't restored.
Solution:   Mark the executable register in the viminfo file.
Files:	    src/ops.c


*** ../vim-7.2.189/src/ops.c	2009-05-13 12:46:36.000000000 +0200
--- src/ops.c	2009-05-26 18:05:23.000000000 +0200
***************
*** 1143,1148 ****
--- 1143,1150 ----
      return OK;
  }
  
+ static int execreg_lastc = NUL;
+ 
  /*
   * execute a yank register: copy it into the stuff buffer
   *
***************
*** 1155,1161 ****
      int	    addcr;		/* always add '\n' to end of line */
      int	    silent;		/* set "silent" flag in typeahead buffer */
  {
-     static int	lastc = NUL;
      long	i;
      char_u	*p;
      int		retval = OK;
--- 1157,1162 ----
***************
*** 1163,1174 ****
  
      if (regname == '@')			/* repeat previous one */
      {
! 	if (lastc == NUL)
  	{
  	    EMSG(_("E748: No previously used register"));
  	    return FAIL;
  	}
! 	regname = lastc;
      }
  					/* check for valid regname */
      if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE))
--- 1164,1175 ----
  
      if (regname == '@')			/* repeat previous one */
      {
! 	if (execreg_lastc == NUL)
  	{
  	    EMSG(_("E748: No previously used register"));
  	    return FAIL;
  	}
! 	regname = execreg_lastc;
      }
  					/* check for valid regname */
      if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE))
***************
*** 1176,1182 ****
  	emsg_invreg(regname);
  	return FAIL;
      }
!     lastc = regname;
  
  #ifdef FEAT_CLIPBOARD
      regname = may_get_selection(regname);
--- 1177,1183 ----
  	emsg_invreg(regname);
  	return FAIL;
      }
!     execreg_lastc = regname;
  
  #ifdef FEAT_CLIPBOARD
      regname = may_get_selection(regname);
***************
*** 5337,5347 ****
--- 5338,5351 ----
  
      /* We only get here (hopefully) if line[0] == '"' */
      str = virp->vir_line + 1;
+ 
+     /* If the line starts with "" this is the y_previous register. */
      if (*str == '"')
      {
  	set_prev = TRUE;
  	str++;
      }
+ 
      if (!ASCII_ISALNUM(*str) && *str != '-')
      {
  	if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line))
***************
*** 5351,5356 ****
--- 5355,5368 ----
      get_yank_register(*str++, FALSE);
      if (!force && y_current->y_array != NULL)
  	do_it = FALSE;
+ 
+     if (*str == '@')
+     {
+ 	/* "x@: register x used for @@ */
+ 	if (force || execreg_lastc == NUL)
+ 	    execreg_lastc = str[-1];
+     }
+ 
      size = 0;
      limit = 100;	/* Optimized for registers containing <= 100 lines */
      if (do_it)
***************
*** 5360,5366 ****
  	vim_free(y_current->y_array);
  	array = y_current->y_array =
  		       (char_u **)alloc((unsigned)(limit * sizeof(char_u *)));
! 	str = skipwhite(str);
  	if (STRNCMP(str, "CHAR", 4) == 0)
  	    y_current->y_type = MCHAR;
  #ifdef FEAT_VISUAL
--- 5372,5378 ----
  	vim_free(y_current->y_array);
  	array = y_current->y_array =
  		       (char_u **)alloc((unsigned)(limit * sizeof(char_u *)));
! 	str = skipwhite(skiptowhite(str));
  	if (STRNCMP(str, "CHAR", 4) == 0)
  	    y_current->y_type = MCHAR;
  #ifdef FEAT_VISUAL
***************
*** 5443,5448 ****
--- 5455,5461 ----
      max_kbyte = get_viminfo_parameter('s');
      if (max_kbyte == 0)
  	return;
+ 
      for (i = 0; i < NUM_REGISTERS; i++)
      {
  	if (y_regs[i].y_array == NULL)
***************
*** 5497,5503 ****
  	if (y_previous == &y_regs[i])
  	    fprintf(fp, "\"");
  	c = get_register_name(i);
! 	fprintf(fp, "\"%c\t%s\t%d\n", c, type,
  #ifdef FEAT_VISUAL
  		    (int)y_regs[i].y_width
  #else
--- 5510,5519 ----
  	if (y_previous == &y_regs[i])
  	    fprintf(fp, "\"");
  	c = get_register_name(i);
! 	fprintf(fp, "\"%c", c);
! 	if (c == execreg_lastc)
! 	    fprintf(fp, "@");
! 	fprintf(fp, "\t%s\t%d\n", type,
  #ifdef FEAT_VISUAL
  		    (int)y_regs[i].y_width
  #else
*** ../vim-7.2.189/src/version.c	2009-05-26 11:01:43.000000000 +0200
--- src/version.c	2009-05-26 18:10:13.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     190,
  /**/

-- 
If you had to identify, in one word, the reason why the
human race has not achieved, and never will achieve, its
full potential, that word would be "meetings."

 /// 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    ///


--- NEW FILE 7.2.191 ---
To: vim-dev at vim.org
Subject: Patch 7.2.191
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.191
Problem:    Mzscheme interface doesn't work on Ubuntu.
Solution:   Change autoconf rules.  Define missing macro.  Some changes to
	    avoid gcc warnings.  Remove per-buffer namespace. (Sergey Khorev)
Files:	    runtime/doc/if_mzsch.txt, src/Makefile, src/Make_ming.mak,
	    src/Make_mvc.mak, src/auto/configure, src/configure.in,
	    src/config.mk.in, src/eval.c, src/if_mzsch.c, src/if_mzsch.h,
	    src/main.c, src/proto/if_mzsch.pro


*** ../vim-7.2.190/runtime/doc/if_mzsch.txt	2008-08-09 19:36:48.000000000 +0200
--- runtime/doc/if_mzsch.txt	2009-05-26 18:49:53.000000000 +0200
***************
*** 1,4 ****
! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
  
  
  		  VIM REFERENCE MANUAL    by Sergey Khorev
--- 1,4 ----
! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 May 26
  
  
  		  VIM REFERENCE MANUAL    by Sergey Khorev
***************
*** 42,51 ****
  
  							*:mzfile* *:mzf*
  :[range]mzf[ile] {file}	Execute the MzScheme script in {file}.  {not in Vi}
- 			All statements are executed in the namespace of the
- 			buffer that was current during :mzfile start.
- 			If you want to access other namespaces, use
- 			'parameterize'.
  
  All of these commands do essentially the same thing - they execute a piece of
  MzScheme code, with the "current range" set to the given line
--- 42,47 ----
***************
*** 54,61 ****
  In the case of :mzscheme, the code to execute is in the command-line.
  In the case of :mzfile, the code to execute is the contents of the given file.
  
- Each buffer has its own MzScheme namespace. Global namespace is bound to
- the "global-namespace" value from the 'vimext' module.
  MzScheme interface defines exception exn:vim, derived from exn.
  It is raised for various Vim errors.
  
--- 50,55 ----
***************
*** 79,118 ****
  e.g.: >
  	:mzscheme (require (prefix vim- vimext))
  <
! All the examples below assume this naming scheme.  Note that you need to do
! this again for every buffer.
  
- The auto-instantiation can be achieved with autocommands, e.g. you can put
- something like this in your .vimrc (EOFs should not have indentation): >
-     function s:MzRequire()
- 	if has("mzscheme")
- 	    :mz << EOF
- 	    (require (prefix vim- vimext))
- 	    (let ((buf (vim-get-buff-by-name (vim-eval "expand(\"<afile>\")"))))
- 	      (when (and buf (not (eq? buf (vim-curr-buff))))
- 		(parameterize ((current-namespace (vim-get-buff-namespace buf)))
- 		  (namespace-attach-module vim-global-namespace 'vimext)
- 		  (namespace-require '(prefix vim vimext)))))
-     EOF
- 	endif
-     endfunction
- 
-     function s:MzStartup()
- 	if has("mzscheme")
- 	    au BufNew,BufNewFile,BufAdd,BufReadPre * :call s:MzRequire()
- 	    :mz << EOF
- 	    (current-library-collection-paths
- 		(cons
- 		    (build-path (find-system-path 'addon-dir) (version) "collects")
- 		    (current-library-collection-paths)))
-     EOF
- 	endif
-     endfunction
- 
-     call s:MzStartup()
- <
- 
- The global namespace just instantiated this module with the prefix "vimext:".
  							*mzscheme-sandbox*
  When executed in the |sandbox|, access to some filesystem and Vim interface
  procedures is restricted.
--- 73,80 ----
  e.g.: >
  	:mzscheme (require (prefix vim- vimext))
  <
! All the examples below assume this naming scheme. 
  
  							*mzscheme-sandbox*
  When executed in the |sandbox|, access to some filesystem and Vim interface
  procedures is restricted.
***************
*** 121,135 ****
  2. Examples						*mzscheme-examples*
  >
  	:mzscheme (display "Hello")
  	:mzscheme (vim-set-buff-line 10 "This is line #10")
  <
  Inline script usage: >
  	function! <SID>SetFirstLine()
  	    :mz << EOF
  	    (display "!!!")
  	    (vim-set-buff-line 1 "This is line #1")
  	    (vim-beep)
! 	    EOF
  	endfunction
  
  	nmap <F9> :call <SID>SetFirstLine() <CR>
--- 83,102 ----
  2. Examples						*mzscheme-examples*
  >
  	:mzscheme (display "Hello")
+ 	:mz (display (string-append "Using MzScheme version " (version)))
+ 	:mzscheme (require (prefix vim- vimext)) ; for MzScheme < 4.x
+ 	:mzscheme (require (prefix-in vim- 'vimext)) ; MzScheme 4.x
  	:mzscheme (vim-set-buff-line 10 "This is line #10")
  <
  Inline script usage: >
  	function! <SID>SetFirstLine()
  	    :mz << EOF
  	    (display "!!!")
+ 	    (require (prefix vim- vimext))
+ 	    ; for newer versions (require (prefix-in vim- 'vimext))
  	    (vim-set-buff-line 1 "This is line #1")
  	    (vim-beep)
! 	EOF
  	endfunction
  
  	nmap <F9> :call <SID>SetFirstLine() <CR>
***************
*** 137,153 ****
  File execution: >
  	:mzfile supascript.scm
  <
! Accessing the current buffer namespace from an MzScheme program running in
! another buffer within |:mzfile|-executed script : >
! 	; Move to the window below
! 	(vim-command "wincmd j")
! 	; execute in the context of buffer, to which window belongs
! 	; assume that buffer has 'textstring' defined
! 	(parameterize ((current-namespace
! 			(vim-get-buff-namespace (vim-curr-buff))))
! 	 (eval '(vim-set-buff-line 1 textstring)))
! <
  
  ==============================================================================
  3. Threads						*mzscheme-threads*
  
--- 104,136 ----
  File execution: >
  	:mzfile supascript.scm
  <
! Vim exception handling: >
! 	:mz << EOF
! 	(require (prefix vim- vimext))
! 	; for newer versions (require (prefix-in vim- 'vimext))
! 	(with-handlers
! 	  ([exn:vim? (lambda (e) (display (exn-message e)))])
! 	  (vim-eval "nonsense-string"))
! 	EOF
! <
! Auto-instantiation of vimext module (can be placed in your |vimrc|): >
!     function! MzRequire()
! 	:redir => l:mzversion
! 	:mz (version)
! 	:redir END
! 	if strpart(l:mzversion, 1, 1) < "4"
! 	    " MzScheme versions < 4.x:
! 	    :mz (require (prefix vim- vimext))
! 	else
! 	    " newer versions:
! 	    :mz (require (prefix-in vim- 'vimext))
! 	endif
!     endfunction
  
+     if has("mzscheme")
+ 	silent call MzRequire()
+     endif
+ <
  ==============================================================================
  3. Threads						*mzscheme-threads*
  
***************
[...3306 lines suppressed...]
       */
--- 3035,3040 ----
***************
*** 2653,2675 ****
  }
  
      static void
! make_modules(Scheme_Env *env)
  {
!     int		i;
!     Scheme_Env	*mod;
! 
!     mod = scheme_primitive_module(scheme_intern_symbol("vimext"), env);
      /* all prims made closed so they can access their own names */
!     for (i = 0; i < sizeof(prims)/sizeof(prims[0]); i++)
      {
  	Vim_Prim *prim = prims + i;
! 	scheme_add_global(prim->name,
! 		scheme_make_closed_prim_w_arity(prim->prim, prim, prim->name,
! 		    prim->mina, prim->maxa),
! 		mod);
      }
-     scheme_add_global("global-namespace", (Scheme_Object *)environment, mod);
      scheme_finish_primitive_module(mod);
  }
  
  #ifdef HAVE_SANDBOX
--- 3092,3126 ----
  }
  
      static void
! make_modules()
  {
!     int		    i;
!     Scheme_Env	    *mod = NULL;
!     Scheme_Object   *vimext_symbol = NULL;
!     Scheme_Object   *closed_prim = NULL;
! 
!     MZ_GC_DECL_REG(3);
!     MZ_GC_VAR_IN_REG(0, mod);
!     MZ_GC_VAR_IN_REG(1, vimext_symbol);
!     MZ_GC_VAR_IN_REG(2, closed_prim);
!     MZ_GC_REG();
! 
!     vimext_symbol = scheme_intern_symbol("vimext");
!     MZ_GC_CHECK();
!     mod = scheme_primitive_module(vimext_symbol, environment);
!     MZ_GC_CHECK();
      /* all prims made closed so they can access their own names */
!     for (i = 0; i < (int)(sizeof(prims)/sizeof(prims[0])); i++)
      {
  	Vim_Prim *prim = prims + i;
! 	closed_prim = scheme_make_closed_prim_w_arity(prim->prim, prim, prim->name,
! 			    prim->mina, prim->maxa);
! 	scheme_add_global(prim->name, closed_prim, mod);
! 	MZ_GC_CHECK();
      }
      scheme_finish_primitive_module(mod);
+     MZ_GC_CHECK();
+     MZ_GC_UNREG();
  }
  
  #ifdef HAVE_SANDBOX
***************
*** 2697,2717 ****
--- 3148,3172 ----
  	{
  	    MZ_REGISTER_STATIC(M_write);
  	    M_write = scheme_intern_symbol("write");
+ 	    MZ_GC_CHECK();
  	}
  	if (M_read == NULL)
  	{
  	    MZ_REGISTER_STATIC(M_read);
  	    M_read = scheme_intern_symbol("read");
+ 	    MZ_GC_CHECK();
  	}
  	if (M_execute == NULL)
  	{
  	    MZ_REGISTER_STATIC(M_execute);
  	    M_execute = scheme_intern_symbol("execute");
+ 	    MZ_GC_CHECK();
  	}
  	if (M_delete == NULL)
  	{
  	    MZ_REGISTER_STATIC(M_delete);
  	    M_delete = scheme_intern_symbol("delete");
+ 	    MZ_GC_CHECK();
  	}
  
  	while (!SCHEME_NULLP(requested_access))
*** ../vim-7.2.190/src/if_mzsch.h	2006-03-24 23:43:11.000000000 +0100
--- src/if_mzsch.h	2009-05-26 19:08:21.000000000 +0200
***************
*** 11,16 ****
--- 11,17 ----
  
  /* #ifdef needed for "make depend" */
  #ifdef FEAT_MZSCHEME
+ # include <schvers.h>
  # include <scheme.h>
  #endif
  
***************
*** 46,49 ****
--- 47,77 ----
  # define scheme_byte_string_to_char_string(obj) (obj)
  #endif
  
+ /* Precise GC macros */
+ #ifndef MZ_GC_DECL_REG
+ # define MZ_GC_DECL_REG(size)            /* empty */
+ #endif
+ #ifndef MZ_GC_VAR_IN_REG
+ # define MZ_GC_VAR_IN_REG(x, v)          /* empty */
+ #endif
+ #ifndef MZ_GC_ARRAY_VAR_IN_REG
+ # define MZ_GC_ARRAY_VAR_IN_REG(x, v, l) /* empty */
+ #endif
+ #ifndef MZ_GC_REG
+ # define MZ_GC_REG()                     /* empty */
+ #endif
+ #ifndef MZ_GC_UNREG
+ # define MZ_GC_UNREG()                   /* empty */
+ #endif
+ 
+ #ifdef MZSCHEME_FORCE_GC
+ /*
+  * force garbage collection to check all references are registered
+  * seg faults will indicate not registered refs
+  */
+ # define MZ_GC_CHECK() scheme_collect_garbage();
+ #else
+ # define MZ_GC_CHECK()			/* empty */
+ #endif
+ 
  #endif /* _IF_MZSCH_H_ */
*** ../vim-7.2.190/src/main.c	2009-05-17 13:30:58.000000000 +0200
--- src/main.c	2009-05-26 19:09:01.000000000 +0200
***************
*** 935,942 ****
--- 935,948 ----
  
      /*
       * Call the main command loop.  This never returns.
+      * For embedded MzScheme the main_loop will be called by Scheme
+      * for proper stack tracking
       */
+ #ifndef FEAT_MZSCHEME
      main_loop(FALSE, FALSE);
+ #else
+     mzscheme_main();
+ #endif
  
      return 0;
  }
*** ../vim-7.2.190/src/proto/if_mzsch.pro	2004-07-12 17:51:52.000000000 +0200
--- src/proto/if_mzsch.pro	2009-05-26 19:09:55.000000000 +0200
***************
*** 15,24 ****
  void *mzvim_eval_string __ARGS((char_u *str));
  struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc,
      struct Scheme_Object **));
! int mzthreads_allowed (void);
! #ifdef FEAT_GUI_KDE
! void timer_proc (void);
! void mzscheme_kde_start_timer (void);
! void mzscheme_kde_stop_timer (void);
! #endif
  /* vim: set ft=c : */
--- 15,20 ----
  void *mzvim_eval_string __ARGS((char_u *str));
  struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc,
      struct Scheme_Object **));
! int mzthreads_allowed __ARGS((void));
! void mzscheme_main __ARGS((void));
  /* vim: set ft=c : */
*** ../vim-7.2.190/src/version.c	2009-05-26 18:12:13.000000000 +0200
--- src/version.c	2009-05-26 22:52:53.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     191,
  /**/

-- 
Scientists decoded the first message from an alien civilization:
        SIMPLY SEND 6 TIMES 10 TO THE 50 ATOMS OF HYDROGEN TO THE STAR
SYSTEM AT THE TOP OF THE LIST, CROSS OFF THAT STAR SYSTEM, THEN PUT
YOUR STAR SYSTEM AT THE BOTTOM OF THE LIST AND SEND IT TO 100 OTHER
STAR SYSTEMS.  WITHIN ONE TENTH GALACTIC ROTATION YOU WILL RECEIVE
ENOUGH HYDROGREN TO POWER YOUR CIVILIZATION UNTIL ENTROPY REACHES ITS
MAXIMUM!  IT REALLY WORKS!

 /// 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    ///


--- NEW FILE 7.2.192 ---
To: vim-dev at vim.org
Subject: Patch 7.2.192
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.192 (after 7.2.188)
Problem:    Still a crash in the garbage collector for a very rare situation.
Solution:   Make sure current_copyID is always incremented correctly. (Kent
	    Sibilev)
Files:	    src/eval.c


*** ../vim-7.2.191/src/eval.c	2009-05-26 22:58:43.000000000 +0200
--- src/eval.c	2009-05-29 21:13:47.000000000 +0200
***************
*** 6526,6532 ****
  
      /* Don't free variables in the previous_funccal list unless they are only
       * referenced through previous_funccal.  This must be first, because if
!      * the item is referenced elsewhere it must not be freed. */
      for (fc = previous_funccal; fc != NULL; fc = fc->caller)
      {
  	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
--- 6526,6532 ----
  
      /* Don't free variables in the previous_funccal list unless they are only
       * referenced through previous_funccal.  This must be first, because if
!      * the item is referenced elsewhere the funccal must not be freed. */
      for (fc = previous_funccal; fc != NULL; fc = fc->caller)
      {
  	set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1);
***************
*** 6564,6573 ****
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
  
!     /* Free lists and dictionaries that are not referenced. */
      did_free = free_unref_items(copyID);
  
!     /* check if any funccal can be freed now */
      for (pfc = &previous_funccal; *pfc != NULL; )
      {
  	if (can_free_funccal(*pfc, copyID))
--- 6564,6577 ----
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
  
!     /*
!      * 2. Free lists and dictionaries that are not referenced.
!      */
      did_free = free_unref_items(copyID);
  
!     /*
!      * 3. Check if any funccal can be freed now.
!      */
      for (pfc = &previous_funccal; *pfc != NULL; )
      {
  	if (can_free_funccal(*pfc, copyID))
***************
*** 9286,9292 ****
      if (noref < 0 || noref > 1)
  	EMSG(_(e_invarg));
      else
! 	item_copy(&argvars[0], rettv, TRUE, noref == 0 ? ++current_copyID : 0);
  }
  
  /*
--- 9290,9299 ----
      if (noref < 0 || noref > 1)
  	EMSG(_(e_invarg));
      else
!     {
! 	current_copyID += COPYID_INC;
! 	item_copy(&argvars[0], rettv, TRUE, noref == 0 ? current_copyID : 0);
!     }
  }
  
  /*
***************
*** 18966,18972 ****
      char_u	*s;
      char_u	numbuf[NUMBUFLEN];
  
!     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);
--- 18973,18980 ----
      char_u	*s;
      char_u	numbuf[NUMBUFLEN];
  
!     current_copyID += COPYID_INC;
!     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);
***************
*** 19401,19407 ****
  	    }
  	    else if (eap->cmdidx == CMD_echo)
  		msg_puts_attr((char_u *)" ", echo_attr);
! 	    p = echo_string(&rettv, &tofree, numbuf, ++current_copyID);
  	    if (p != NULL)
  		for ( ; *p != NUL && !got_int; ++p)
  		{
--- 19409,19416 ----
  	    }
  	    else if (eap->cmdidx == CMD_echo)
  		msg_puts_attr((char_u *)" ", echo_attr);
! 	    current_copyID += COPYID_INC;
! 	    p = echo_string(&rettv, &tofree, numbuf, current_copyID);
  	    if (p != NULL)
  		for ( ; *p != NUL && !got_int; ++p)
  		{
*** ../vim-7.2.191/src/version.c	2009-05-26 22:58:43.000000000 +0200
--- src/version.c	2009-06-03 13:21:20.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     192,
  /**/

-- 
Imagine a world without hypothetical situations.

 /// 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    ///


--- NEW FILE 7.2.193 ---
To: vim-dev at vim.org
Subject: Patch 7.2.193
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.193
Problem:    Warning for uninitialized values.
Solution:   Initialize all the struct items.
Files:	    src/eval.c


*** ../vim-7.2.192/src/eval.c	2009-06-03 13:22:22.000000000 +0200
--- src/eval.c	2009-05-29 21:13:47.000000000 +0200
***************
*** 286,292 ****
  #define VV_RO		2	/* read-only */
  #define VV_RO_SBX	4	/* read-only in the sandbox */
  
! #define VV_NAME(s, t)	s, {{t}}, {0}
  
  static struct vimvar
  {
--- 286,292 ----
  #define VV_RO		2	/* read-only */
  #define VV_RO_SBX	4	/* read-only in the sandbox */
  
! #define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}, {0}
  
  static struct vimvar
  {
*** ../vim-7.2.192/src/version.c	2009-06-03 13:22:23.000000000 +0200
--- src/version.c	2009-06-03 14:25:18.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     193,
  /**/

-- 
No engineer can take a shower without wondering if some sort of Teflon coating
would make showering unnecessary.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.194 ---
To: vim-dev at vim.org
Subject: Patch 7.2.194 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.194 (extra)
Problem:    MSVC: rem commands are echoed.
Solution:   Add commands to switch off echo. (Wang Xu)
Files:	    src/msvc2008.bat


*** ../vim-7.2.193/src/msvc2008.bat	2008-06-24 22:55:23.000000000 +0200
--- src/msvc2008.bat	2009-04-29 18:05:11.000000000 +0200
***************
*** 1,5 ****
--- 1,7 ----
+ @echo off
  rem To be used on MS-Windows for Visual C++ 2008 Express Edition
  rem   aka Microsoft Visual Studio 9.0.
  rem See INSTALLpc.txt for information.
+ @echo on
  
  call "%VS90COMNTOOLS%%vsvars32.bat"
*** ../vim-7.2.193/src/version.c	2009-06-03 14:25:47.000000000 +0200
--- src/version.c	2009-06-03 15:04:30.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     194,
  /**/

-- 
I used to be indecisive, now I'm not sure.

 /// 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    ///


--- NEW FILE 7.2.195 ---
To: vim-dev at vim.org
Subject: Patch 7.2.195
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.195
Problem:    Leaking memory for the command Vim was started with.
Solution:   Remember the pointer and free it.
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.194/src/gui_gtk_x11.c	2009-05-17 16:23:20.000000000 +0200
--- src/gui_gtk_x11.c	2009-06-03 12:44:31.000000000 +0200
***************
*** 412,417 ****
--- 412,418 ----
  #endif
  #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION)
  static const char *restart_command = NULL;
+ static       char *abs_restart_command = NULL;
  #endif
  static int found_iconic_arg = FALSE;
  
***************
*** 449,456 ****
  	char_u buf[MAXPATHL];
  
  	if (mch_FullName((char_u *)argv[0], buf, (int)sizeof(buf), TRUE) == OK)
! 	    /* Tiny leak; doesn't matter, and usually we don't even get here */
! 	    restart_command = (char *)vim_strsave(buf);
      }
  #endif
  
--- 450,459 ----
  	char_u buf[MAXPATHL];
  
  	if (mch_FullName((char_u *)argv[0], buf, (int)sizeof(buf), TRUE) == OK)
! 	{
! 	    abs_restart_command = (char *)vim_strsave(buf);
! 	    restart_command = abs_restart_command;
! 	}
      }
  #endif
  
***************
*** 611,616 ****
--- 614,622 ----
  gui_mch_free_all()
  {
      vim_free(gui_argv);
+ #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION)
+     vim_free(abs_restart_command);
+ #endif
  }
  #endif
  
*** ../vim-7.2.194/src/version.c	2009-06-03 15:05:05.000000000 +0200
--- src/version.c	2009-06-03 16:19:00.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     195,
  /**/

-- 
I think that you'll agree that engineers are very effective in their social
interactions.  It's the "normal" people who are nuts.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.196 ---
To: vim-dev at vim.org
Subject: Patch 7.2.196
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.196 (after 7.2.167)
Problem:    Turns out splint doesn't work well enough to be usable.
Solution:   Remove splint support.
Files:	    Filelist, src/cleanlint.vim


*** ../vim-7.2.195/Filelist	2009-05-13 12:46:36.000000000 +0200
--- Filelist	2009-05-21 14:42:46.000000000 +0200
***************
*** 139,145 ****
  		src/INSTALL \
  		src/INSTALLx.txt \
  		src/Makefile \
- 		src/cleanlint.vim \
  		src/auto/configure \
  		src/config.aap.in \
  		src/config.h.in \
--- 139,144 ----
*** ../vim-7.2.195/src/cleanlint.vim	2009-05-13 18:54:14.000000000 +0200
--- src/cleanlint.vim	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,32 ****
- " Vim tool: Filter output of splint
- "
- " Maintainer:	Bram Moolenaar <Bram at vim.org>
- " Last Change:	2009 May 13
- 
- " Usage: redirect output of "make lint" to a file, edit that file with Vim and
- " :call CleanLint()
- " This deletes irrelevant messages.  What remains might be valid warnings.
- 
- fun! CleanLint()
-   g/Assignment of dev_t to __dev_t:/lockmarks d
-   g/Assignment of __dev_t to dev_t:/lockmarks d
-   g/Operands of == have incompatible types (__dev_t, dev_t): /lockmarks d
-   g/Operands of == have incompatible types (char_u, int): /lockmarks d
-   g/Assignment of char to char_u: /lockmarks d
-   g/Assignment of unsigned int to int: /lockmarks d
-   g/Assignment of int to unsigned int: /lockmarks d
-   g/Assignment of unsigned int to long int: /lockmarks d
-   g/Assignment of int to char_u: /lockmarks d
-   g/Function .* expects arg . to be wint_t gets int: /lockmarks d
-   g/Function .* expects arg . to be size_t gets int: /lockmarks d
-   g/Initial value of .* is type char, expects char_u: /lockmarks d
-   g/^ex_cmds.h:.* Function types are inconsistent. Parameter 1 is implicitly temp, but unqualified in assigned function:/lockmarks d
-   g/^ex_docmd.c:.* nospec_str/lockmarks d
-   g/^digraph.c.*Additional initialization errors for digraphdefault not reported/lockmarks d
-   g/Function strncasecmp expects arg 3 to be int gets size_t: /lockmarks d
-   g/^  Types are incompatible/lockmarks d
-   g/ To ignore signs in type comparisons use +ignoresigns/lockmarks d
-   g/ To allow arbitrary integral types to match any integral type, use +matchanyintegral./lockmarks d
-   g/ To allow arbitrary integral types to match long unsigned, use +longintegral./lockmarks d
-   g+ A variable is declared but never used. Use /. at unused@./ in front of declaration to suppress message.+lockmarks d
- endfun
--- 0 ----
*** ../vim-7.2.195/src/version.c	2009-06-03 16:20:09.000000000 +0200
--- src/version.c	2009-06-03 22:04:31.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     196,
  /**/

-- 
It's totally unfair to suggest - as many have - that engineers are socially
inept.  Engineers simply have different objectives when it comes to social
interaction.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.197 ---
To: vim-dev at vim.org
Subject: Patch 7.2.197
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.197
Problem:    Warning for uninitialized values.
Solution:   Initialize all the struct items of typebuf.
Files:	    src/globals.h


*** ../vim-7.2.196/src/globals.h	2009-05-13 12:46:36.000000000 +0200
--- src/globals.h	2009-06-10 15:52:18.000000000 +0200
***************
*** 960,966 ****
  		    ;
  EXTERN typebuf_T typebuf		/* typeahead buffer */
  #ifdef DO_INIT
! 		    = {NULL, NULL}
  #endif
  		    ;
  #ifdef FEAT_EX_EXTRA
--- 967,973 ----
  		    ;
  EXTERN typebuf_T typebuf		/* typeahead buffer */
  #ifdef DO_INIT
! 		    = {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}
  #endif
  		    ;
  #ifdef FEAT_EX_EXTRA
*** ../vim-7.2.196/src/version.c	2009-06-03 22:07:38.000000000 +0200
--- src/version.c	2009-06-10 18:14:58.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     197,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
18. Your wife drapes a blond wig over your monitor to remind you of what she
    looks like.

 /// 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    ///


--- NEW FILE 7.2.198 ---
To: vim-dev at vim.org
Subject: Patch 7.2.198
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.198
Problem:    Size of buffer used for tgetent() may be too small.
Solution:   Use the largest known size everywhere.
Files:	    src/vim.h


*** ../vim-7.2.197/src/vim.h	2009-05-14 22:19:19.000000000 +0200
--- src/vim.h	2009-06-07 20:37:48.000000000 +0200
***************
*** 1345,1355 ****
  # define MSG_BUF_CLEN  MSG_BUF_LEN	    /* cell length */
  #endif
  
! #if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX)
! # define TBUFSZ 2048		/* buffer size for termcap entry */
! #else
! # define TBUFSZ 1024		/* buffer size for termcap entry */
! #endif
  
  /*
   * Maximum length of key sequence to be mapped.
--- 1345,1355 ----
  # define MSG_BUF_CLEN  MSG_BUF_LEN	    /* cell length */
  #endif
  
! /* Size of the buffer used for tgetent().  Unfortunately this is largely
!  * undocumented, some systems use 1024.  Using a buffer that is too small
!  * causes a buffer overrun and a crash.  Use the maximum known value to stay
!  * on the safe side. */
! #define TBUFSZ 2048		/* buffer size for termcap entry */
  
  /*
   * Maximum length of key sequence to be mapped.
*** ../vim-7.2.197/src/version.c	2009-06-10 18:15:49.000000000 +0200
--- src/version.c	2009-06-16 11:06:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     198,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
7. Finish all your sentences with "in accordance with the prophecy".

 /// 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    ///


--- NEW FILE 7.2.199 ---
To: vim-dev at vim.org
Subject: Patch 7.2.199
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.2.199
Problem:    Strange character in comment.
Solution:   Change to "message". (Yongwei Wu)
Files:      src/term.c


*** ../vim-7.2.198/src/term.c	2009-05-17 13:30:58.000000000 +0200
--- src/term.c	2009-06-16 11:16:17.000000000 +0200
***************
*** 5555,5561 ****
   * respects the current B/k/< settings of 'cpoption'.
   *
   * This function is called when expanding mappings/abbreviations on the
!  * command-line, and for building the "Ambiguous mapping..." error mess?ge.
   *
   * It uses a growarray to build the translation string since the
   * latter can be wider than the original description. The caller has to
--- 5555,5561 ----
   * respects the current B/k/< settings of 'cpoption'.
   *
   * This function is called when expanding mappings/abbreviations on the
!  * command-line, and for building the "Ambiguous mapping..." error message.
   *
   * It uses a growarray to build the translation string since the
   * latter can be wider than the original description. The caller has to
*** ../vim-7.2.198/src/version.c	2009-06-16 11:08:13.000000000 +0200
--- src/version.c	2009-06-16 14:31:03.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     199,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
10. Ask people what sex they are. Laugh hysterically after they answer.

 /// 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    ///


--- NEW FILE 7.2.200 ---
To: vim-dev at vim.org
Subject: Patch 7.2.200
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.200
Problem:    Reading past end of string when navigating the menu bar or
	    resizing the window.
Solution:   Add and use mb_ptr2len_len(). (partly by Dominique Pelle)
	    Also add mb_ptr2cells_len() to prevent more trouble.
Files:	    src/gui_gtk_x11.c, src/os_unix.c, src/globals.h, src/mbyte.c,
	    src/proto/mbyte.pro


*** ../vim-7.2.199/src/gui_gtk_x11.c	2009-06-03 16:20:09.000000000 +0200
--- src/gui_gtk_x11.c	2009-06-16 14:44:19.000000000 +0200
***************
*** 6077,6088 ****
  # ifdef FEAT_MBYTE
  	    if (enc_utf8)
  	    {
! 		c = utf_ptr2char(p);
  		if (c >= 0x10000)	/* show chars > 0xffff as ? */
  		    c = 0xbf;
  		buf[textlen].byte1 = c >> 8;
  		buf[textlen].byte2 = c;
! 		p += utf_ptr2len(p);
  		width += utf_char2cells(c);
  	    }
  	    else
--- 6135,6149 ----
  # ifdef FEAT_MBYTE
  	    if (enc_utf8)
  	    {
! 		int pcc[MAX_MCO];
! 
! 		/* TODO: use the composing characters */
! 		c = utfc_ptr2char_len(p, &pcc, len - (p - s));
  		if (c >= 0x10000)	/* show chars > 0xffff as ? */
  		    c = 0xbf;
  		buf[textlen].byte1 = c >> 8;
  		buf[textlen].byte2 = c;
! 		p += utfc_ptr2len_len(p, len - (p - s));
  		width += utf_char2cells(c);
  	    }
  	    else
***************
*** 6106,6113 ****
  	if (has_mbyte)
  	{
  	    width = 0;
! 	    for (p = s; p < s + len; p += (*mb_ptr2len)(p))
! 		width += (*mb_ptr2cells)(p);
  	}
  	else
  # endif
--- 6167,6174 ----
  	if (has_mbyte)
  	{
  	    width = 0;
! 	    for (p = s; p < s + len; p += (*mb_ptr2len_len)(p, len - (p - s)))
! 		width += (*mb_ptr2cells_len)(p, len - (p - s));
  	}
  	else
  # endif
*** ../vim-7.2.199/src/os_unix.c	2009-05-17 13:30:58.000000000 +0200
--- src/os_unix.c	2009-06-03 12:35:59.000000000 +0200
***************
*** 4305,4311 ****
  				ta_buf[i] = '\n';
  # ifdef FEAT_MBYTE
  			    if (has_mbyte)
! 				i += (*mb_ptr2len)(ta_buf + i) - 1;
  # endif
  			}
  
--- 4305,4312 ----
  				ta_buf[i] = '\n';
  # ifdef FEAT_MBYTE
  			    if (has_mbyte)
! 				i += (*mb_ptr2len_len)(ta_buf + i,
! 							ta_len + len - i) - 1;
  # endif
  			}
  
*** ../vim-7.2.199/src/globals.h	2009-06-10 18:15:49.000000000 +0200
--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
***************
*** 810,820 ****
--- 815,828 ----
   */
  /* length of char in bytes, including following composing chars */
  EXTERN int (*mb_ptr2len) __ARGS((char_u *p)) INIT(= latin_ptr2len);
+ /* idem, with limit on string length */
+ EXTERN int (*mb_ptr2len_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2len_len);
  /* byte length of char */
  EXTERN int (*mb_char2len) __ARGS((int c)) INIT(= latin_char2len);
  /* convert char to bytes, return the length */
  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_ptr2cells_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2cells_len);
  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);
*** ../vim-7.2.199/src/mbyte.c	2009-05-17 13:30:58.000000000 +0200
--- src/mbyte.c	2009-06-16 15:01:30.000000000 +0200
***************
*** 127,133 ****
--- 127,136 ----
  static int dbcs_char2len __ARGS((int c));
  static int dbcs_char2bytes __ARGS((int c, char_u *buf));
  static int dbcs_ptr2len __ARGS((char_u *p));
+ static int dbcs_ptr2len_len __ARGS((char_u *p, int size));
+ static int utf_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_char2cells __ARGS((int c));
+ static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
  /* Lookup table to quickly get the length in bytes of a UTF-8 character from
***************
*** 606,614 ****
--- 609,619 ----
      if (enc_utf8)
      {
  	mb_ptr2len = utfc_ptr2len;
+ 	mb_ptr2len_len = utfc_ptr2len_len;
  	mb_char2len = utf_char2len;
  	mb_char2bytes = utf_char2bytes;
  	mb_ptr2cells = utf_ptr2cells;
+ 	mb_ptr2cells_len = utf_ptr2cells_len;
  	mb_char2cells = utf_char2cells;
  	mb_off2cells = utf_off2cells;
  	mb_ptr2char = utf_ptr2char;
***************
*** 617,625 ****
--- 622,632 ----
      else if (enc_dbcs != 0)
      {
  	mb_ptr2len = dbcs_ptr2len;
+ 	mb_ptr2len_len = dbcs_ptr2len_len;
  	mb_char2len = dbcs_char2len;
  	mb_char2bytes = dbcs_char2bytes;
  	mb_ptr2cells = dbcs_ptr2cells;
+ 	mb_ptr2cells_len = dbcs_ptr2cells_len;
  	mb_char2cells = dbcs_char2cells;
  	mb_off2cells = dbcs_off2cells;
  	mb_ptr2char = dbcs_ptr2char;
***************
*** 628,636 ****
--- 635,645 ----
      else
      {
  	mb_ptr2len = latin_ptr2len;
+ 	mb_ptr2len_len = latin_ptr2len_len;
  	mb_char2len = latin_char2len;
  	mb_char2bytes = latin_char2bytes;
  	mb_ptr2cells = latin_ptr2cells;
+ 	mb_ptr2cells_len = latin_ptr2cells_len;
  	mb_char2cells = latin_char2cells;
  	mb_off2cells = latin_off2cells;
  	mb_ptr2char = latin_ptr2char;
***************
*** 1069,1075 ****
   * Get byte length of character at "*p" but stop at a NUL.
   * For UTF-8 this includes following composing characters.
   * Returns 0 when *p is NUL.
-  *
   */
      int
  latin_ptr2len(p)
--- 1078,1083 ----
***************
*** 1091,1096 ****
--- 1099,1138 ----
      return len;
  }
  
+ /*
+  * mb_ptr2len_len() function pointer.
+  * Like mb_ptr2len(), but limit to read "size" bytes.
+  * Returns 0 for an empty string.
+  * Returns 1 for an illegal char or an incomplete byte sequence.
+  */
+     int
+ latin_ptr2len_len(p, size)
+     char_u	*p;
+     int		size;
+ {
+     if (size < 1 || *p == NUL)
+ 	return 0;
+     return 1;
+ }
+ 
+     static int
+ dbcs_ptr2len_len(p, size)
+     char_u	*p;
+     int		size;
+ {
+     int		len;
+ 
+     if (size < 1 || *p == NUL)
+ 	return 0;
+     if (size == 1)
+ 	return 1;
+     /* Check that second byte is not missing. */
+     len = MB_BYTE2LEN(*p);
+     if (len == 2 && p[1] == NUL)
+ 	len = 1;
+     return len;
+ }
+ 
  struct interval
  {
      unsigned short first;
***************
*** 1287,1292 ****
--- 1329,1383 ----
  }
  
  /*
+  * mb_ptr2cells_len() function pointer.
+  * Like mb_ptr2cells(), but limit string length to "size".
+  * For an empty string or truncated character returns 1.
+  */
+     int
+ latin_ptr2cells_len(p, size)
+     char_u	*p UNUSED;
+     int		size UNUSED;
+ {
+     return 1;
+ }
+ 
+     static int
+ utf_ptr2cells_len(p, size)
+     char_u	*p;
+     int		size;
+ {
+     int		c;
+ 
+     /* Need to convert to a wide character. */
+     if (size > 0 && *p >= 0x80)
+     {
+ 	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
+ 	    return 1;
+ 	c = utf_ptr2char(p);
+ 	/* An illegal byte is displayed as <xx>. */
+ 	if (utf_ptr2len(p) == 1 || c == NUL)
+ 	    return 4;
+ 	/* If the char is ASCII it must be an overlong sequence. */
+ 	if (c < 0x80)
+ 	    return char2cells(c);
+ 	return utf_char2cells(c);
+     }
+     return 1;
+ }
+ 
+     static int
+ dbcs_ptr2cells_len(p, size)
+     char_u	*p;
+     int		size;
+ {
+     /* Number of cells is equal to number of bytes, except for euc-jp when
+      * the first byte is 0x8e. */
+     if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e))
+ 	return 1;
+     return MB_BYTE2LEN(*p);
+ }
+ 
+ /*
   * mb_char2cells() function pointer.
   * Return the number of display cells character "c" occupies.
   * Only takes care of multi-byte chars, not "^C" and such.
***************
*** 1716,1721 ****
--- 1807,1813 ----
  /*
   * Return the number of bytes the UTF-8 encoding of the character at "p[size]"
   * takes.  This includes following composing characters.
+  * Returns 0 for an empty string.
   * Returns 1 for an illegal char or an incomplete byte sequence.
   */
      int
***************
*** 1728,1734 ****
      int		prevlen;
  #endif
  
!     if (*p == NUL)
  	return 0;
      if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */
  	return 1;
--- 1820,1826 ----
      int		prevlen;
  #endif
  
!     if (size < 1 || *p == NUL)
  	return 0;
      if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */
  	return 1;
*** ../vim-7.2.199/src/proto/mbyte.pro	2008-07-13 19:34:19.000000000 +0200
--- src/proto/mbyte.pro	2009-06-16 14:58:39.000000000 +0200
***************
*** 7,16 ****
--- 7,18 ----
  int latin_char2len __ARGS((int c));
  int latin_char2bytes __ARGS((int c, char_u *buf));
  int latin_ptr2len __ARGS((char_u *p));
+ int latin_ptr2len_len __ARGS((char_u *p, int size));
  int utf_char2cells __ARGS((int c));
  int latin_ptr2cells __ARGS((char_u *p));
  int utf_ptr2cells __ARGS((char_u *p));
  int dbcs_ptr2cells __ARGS((char_u *p));
+ int latin_ptr2cells_len __ARGS((char_u *p, int size));
  int latin_char2cells __ARGS((int c));
  int latin_off2cells __ARGS((unsigned off, unsigned max_off));
  int dbcs_off2cells __ARGS((unsigned off, unsigned max_off));
***************
*** 85,90 ****
--- 87,93 ----
  int preedit_get_status __ARGS((void));
  int im_is_preediting __ARGS((void));
  int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to));
+ int convert_setup_ext __ARGS((vimconv_T *vcp, char_u *from, int from_unicode_is_utf8, char_u *to, int to_unicode_is_utf8));
  int convert_input __ARGS((char_u *ptr, int len, int maxlen));
  int convert_input_safe __ARGS((char_u *ptr, int len, int maxlen, char_u **restp, int *restlenp));
  char_u *string_convert __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp));
*** ../vim-7.2.199/src/version.c	2009-06-16 14:31:56.000000000 +0200
--- src/version.c	2009-06-16 14:37:38.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     200,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
12. Sing along at the opera.

 /// 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    ///


--- NEW FILE 7.2.201 ---
To: vim-dev at vim.org
Subject: Patch 7.2.201
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.201
Problem:    Cannot copy/paste HTML to/from Firefox via the clipboard.
Solution:   Implement this for GTK.  Add the "html" value to 'clipboard'.
Files:	    runtime/doc/options.txt, src/globals.h, src/gui_gtk_x11.c,
	    src/mbyte.c, src/proto/mbyte.pro, src/option.c


*** ../vim-7.2.200/runtime/doc/options.txt	2009-02-21 20:27:00.000000000 +0100
--- runtime/doc/options.txt	2009-06-12 22:25:22.000000000 +0200
***************
*** 1443,1448 ****
--- 1444,1457 ----
  	autoselectml	Like "autoselect", but for the modeless selection
  			only.  Compare to the 'A' flag in 'guioptions'.
  
+ 	html		When the clipboard contains HTML, use this when
+ 			pasting.  When putting text on the clipboard, mark it
+ 			as HTML.  This works to copy rendered HTML from
+ 			Firefox, paste it as raw HTML in Vim, select the HTML
+ 			in Vim and paste it in a rich edit box in Firefox.
+ 			Only supported for GTK version 2 and later.
+ 			Only available with the |+multi_byte| feature.
+ 
  	exclude:{pattern}
  			Defines a pattern that is matched against the name of
  			the terminal 'term'.  If there is a match, no
*** ../vim-7.2.200/src/globals.h	2009-06-16 15:12:11.000000000 +0200
--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
***************
*** 509,514 ****
--- 509,515 ----
  EXTERN int	clip_unnamed INIT(= FALSE);
  EXTERN int	clip_autoselect INIT(= FALSE);
  EXTERN int	clip_autoselectml INIT(= FALSE);
+ EXTERN int	clip_html INIT(= FALSE);
  EXTERN regprog_T *clip_exclude_prog INIT(= NULL);
  #endif
  
*** ../vim-7.2.200/src/gui_gtk_x11.c	2009-06-16 15:12:11.000000000 +0200
--- src/gui_gtk_x11.c	2009-06-16 14:44:19.000000000 +0200
***************
*** 107,112 ****
--- 107,113 ----
      TARGET_UTF8_STRING,
      TARGET_STRING,
      TARGET_COMPOUND_TEXT,
+     TARGET_HTML,
      TARGET_TEXT,
      TARGET_TEXT_URI_LIST,
      TARGET_TEXT_PLAIN,
***************
*** 123,128 ****
--- 124,130 ----
      {VIMENC_ATOM_NAME,	0, TARGET_VIMENC},
      {VIM_ATOM_NAME,	0, TARGET_VIM},
  #ifdef FEAT_MBYTE
+     {"text/html",	0, TARGET_HTML},
      {"UTF8_STRING",	0, TARGET_UTF8_STRING},
  #endif
      {"COMPOUND_TEXT",	0, TARGET_COMPOUND_TEXT},
***************
*** 140,145 ****
--- 142,148 ----
  {
      {"text/uri-list",	0, TARGET_TEXT_URI_LIST},
  # ifdef FEAT_MBYTE
+     {"text/html",	0, TARGET_HTML},
      {"UTF8_STRING",	0, TARGET_UTF8_STRING},
  # endif
      {"STRING",		0, TARGET_STRING},
***************
*** 178,183 ****
--- 181,187 ----
   * Atoms used to control/reference X11 selections.
   */
  #ifdef FEAT_MBYTE
+ static GdkAtom html_atom = GDK_NONE;
  static GdkAtom utf8_string_atom = GDK_NONE;
  #endif
  #ifndef HAVE_GTK2
***************
*** 1364,1369 ****
--- 1368,1391 ----
  	    else
  		text = tmpbuf_utf8;
  	}
+ 	else if (len >= 2 && text[0] == 0xff && text[1] == 0xfe)
+ 	{
+ 	    vimconv_T conv;
+ 
+ 	    /* UTF-16, we get this for HTML */
+ 	    conv.vc_type = CONV_NONE;
+ 	    convert_setup_ext(&conv, (char_u *)"utf-16le", FALSE, p_enc, TRUE);
+ 
+ 	    if (conv.vc_type != CONV_NONE)
+ 	    {
+ 		text += 2;
+ 		len -= 2;
+ 		tmpbuf = string_convert(&conv, text, &len);
+ 		convert_setup(&conv, NULL, NULL);
+ 	    }
+ 	    if (tmpbuf != NULL)
+ 		text = tmpbuf;
+ 	}
      }
  #else /* !HAVE_GTK2 */
  # ifdef FEAT_MBYTE
***************
*** 1451,1456 ****
--- 1473,1479 ----
  
      if (info != (guint)TARGET_STRING
  #ifdef FEAT_MBYTE
+ 	    && (!clip_html || info != (guint)TARGET_HTML)
  	    && info != (guint)TARGET_UTF8_STRING
  	    && info != (guint)TARGET_VIMENC
  #endif
***************
*** 1486,1491 ****
--- 1509,1548 ----
      }
  
  #ifdef FEAT_MBYTE
+     else if (info == (guint)TARGET_HTML)
+     {
+ 	vimconv_T conv;
+ 
+ 	/* Since we get utf-16, we probably should set it as well. */
+ 	conv.vc_type = CONV_NONE;
+ 	convert_setup_ext(&conv, p_enc, TRUE, (char_u *)"utf-16le", FALSE);
+ 	if (conv.vc_type != CONV_NONE)
+ 	{
+ 	    tmpbuf = string_convert(&conv, string, &length);
+ 	    convert_setup(&conv, NULL, NULL);
+ 	    vim_free(string);
+ 	    string = tmpbuf;
+ 	}
+ 
+ 	/* Prepend the BOM: "fffe" */
+ 	if (string != NULL)
+ 	{
+ 	    tmpbuf = alloc(length + 2);
+ 	    tmpbuf[0] = 0xff;
+ 	    tmpbuf[1] = 0xfe;
+ 	    mch_memmove(tmpbuf + 2, string, (size_t)length);
+ 	    vim_free(string);
+ 	    string = tmpbuf;
+ 	    length += 2;
+ 
+ 	    selection_data->type = selection_data->target;
+ 	    selection_data->format = 16;	/* 16 bits per char */
+ 	    gtk_selection_data_set(selection_data, html_atom, 16,
+ 							      string, length);
+ 	    vim_free(string);
+ 	}
+ 	return;
+     }
      else if (info == (guint)TARGET_VIMENC)
      {
  	int l = STRLEN(p_enc);
***************
*** 3464,3469 ****
--- 3521,3527 ----
  
      /* Initialise atoms */
  #ifdef FEAT_MBYTE
+     html_atom = gdk_atom_intern("text/html", FALSE);
      utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
  #endif
  #ifndef HAVE_GTK2
***************
*** 6665,6670 ****
--- 6723,6732 ----
  
      for (i = 0; i < N_SELECTION_TARGETS; ++i)
      {
+ #ifdef FEAT_MBYTE
+ 	if (!clip_html && selection_targets[i].info == TARGET_HTML)
+ 	    continue;
+ #endif
  	received_selection = RS_NONE;
  	target = gdk_atom_intern(selection_targets[i].target, FALSE);
  
*** ../vim-7.2.200/src/mbyte.c	2009-06-16 15:12:11.000000000 +0200
--- src/mbyte.c	2009-06-16 15:01:30.000000000 +0200
***************
*** 3265,3271 ****
  
  # if defined(USE_ICONV) || defined(PROTO)
  
! static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp));
  
  /*
   * Call iconv_open() with a check if iconv() works properly (there are broken
--- 3265,3271 ----
  
  # if defined(USE_ICONV) || defined(PROTO)
  
! static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp, int *resultlenp));
  
  /*
   * Call iconv_open() with a check if iconv() works properly (there are broken
***************
*** 3326,3338 ****
   * If "unconvlenp" is not NULL handle the string ending in an incomplete
   * sequence and set "*unconvlenp" to the length of it.
   * Returns the converted string in allocated memory.  NULL for an error.
   */
      static char_u *
! iconv_string(vcp, str, slen, unconvlenp)
      vimconv_T	*vcp;
      char_u	*str;
      int		slen;
      int		*unconvlenp;
  {
      const char	*from;
      size_t	fromlen;
--- 3326,3340 ----
   * If "unconvlenp" is not NULL handle the string ending in an incomplete
   * sequence and set "*unconvlenp" to the length of it.
   * Returns the converted string in allocated memory.  NULL for an error.
+  * If resultlenp is not NULL, sets it to the result length in bytes.
   */
      static char_u *
! iconv_string(vcp, str, slen, unconvlenp, resultlenp)
      vimconv_T	*vcp;
      char_u	*str;
      int		slen;
      int		*unconvlenp;
+     int		*resultlenp;
  {
      const char	*from;
      size_t	fromlen;
***************
*** 3418,3423 ****
--- 3420,3428 ----
  	/* Not enough room or skipping illegal sequence. */
  	done = to - (char *)result;
      }
+ 
+     if (resultlenp != NULL)
+ 	*resultlenp = (int)(to - (char *)result);
      return result;
  }
  
***************
*** 5837,5844 ****
--- 5842,5866 ----
      char_u	*from;
      char_u	*to;
  {
+     return convert_setup_ext(vcp, from, TRUE, to, TRUE);
+ }
+ 
+ /*
+  * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all
+  * "from" unicode charsets be considered utf-8.  Same for "to".
+  */
+     int
+ convert_setup_ext(vcp, from, from_unicode_is_utf8, to, to_unicode_is_utf8)
+     vimconv_T	*vcp;
+     char_u	*from;
+     int		from_unicode_is_utf8;
+     char_u	*to;
+     int		to_unicode_is_utf8;
+ {
      int		from_prop;
      int		to_prop;
+     int		from_is_utf8;
+     int		to_is_utf8;
  
      /* Reset to no conversion. */
  # ifdef USE_ICONV
***************
*** 5856,5892 ****
  
      from_prop = enc_canon_props(from);
      to_prop = enc_canon_props(to);
!     if ((from_prop & ENC_LATIN1) && (to_prop & ENC_UNICODE))
      {
  	/* Internal latin1 -> utf-8 conversion. */
  	vcp->vc_type = CONV_TO_UTF8;
  	vcp->vc_factor = 2;	/* up to twice as long */
      }
!     else if ((from_prop & ENC_LATIN9) && (to_prop & ENC_UNICODE))
      {
  	/* Internal latin9 -> utf-8 conversion. */
  	vcp->vc_type = CONV_9_TO_UTF8;
  	vcp->vc_factor = 3;	/* up to three as long (euro sign) */
      }
!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN1))
      {
  	/* Internal utf-8 -> latin1 conversion. */
  	vcp->vc_type = CONV_TO_LATIN1;
      }
!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN9))
      {
  	/* Internal utf-8 -> latin9 conversion. */
  	vcp->vc_type = CONV_TO_LATIN9;
      }
  #ifdef WIN3264
      /* Win32-specific codepage <-> codepage conversion without iconv. */
!     else if (((from_prop & ENC_UNICODE) || encname2codepage(from) > 0)
! 	    && ((to_prop & ENC_UNICODE) || encname2codepage(to) > 0))
      {
  	vcp->vc_type = CONV_CODEPAGE;
  	vcp->vc_factor = 2;	/* up to twice as long */
! 	vcp->vc_cpfrom = (from_prop & ENC_UNICODE) ? 0 : encname2codepage(from);
! 	vcp->vc_cpto = (to_prop & ENC_UNICODE) ? 0 : encname2codepage(to);
      }
  #endif
  #ifdef MACOS_X
--- 5878,5923 ----
  
      from_prop = enc_canon_props(from);
      to_prop = enc_canon_props(to);
!     if (from_unicode_is_utf8)
! 	from_is_utf8 = from_prop & ENC_UNICODE;
!     else
! 	from_is_utf8 = from_prop == ENC_UNICODE;
!     if (to_unicode_is_utf8)
! 	to_is_utf8 = to_prop & ENC_UNICODE;
!     else
! 	to_is_utf8 = to_prop == ENC_UNICODE;
! 
!     if ((from_prop & ENC_LATIN1) && to_is_utf8)
      {
  	/* Internal latin1 -> utf-8 conversion. */
  	vcp->vc_type = CONV_TO_UTF8;
  	vcp->vc_factor = 2;	/* up to twice as long */
      }
!     else if ((from_prop & ENC_LATIN9) && to_is_utf8)
      {
  	/* Internal latin9 -> utf-8 conversion. */
  	vcp->vc_type = CONV_9_TO_UTF8;
  	vcp->vc_factor = 3;	/* up to three as long (euro sign) */
      }
!     else if (from_is_utf8 && (to_prop & ENC_LATIN1))
      {
  	/* Internal utf-8 -> latin1 conversion. */
  	vcp->vc_type = CONV_TO_LATIN1;
      }
!     else if (from_is_utf8 && (to_prop & ENC_LATIN9))
      {
  	/* Internal utf-8 -> latin9 conversion. */
  	vcp->vc_type = CONV_TO_LATIN9;
      }
  #ifdef WIN3264
      /* Win32-specific codepage <-> codepage conversion without iconv. */
!     else if ((from_is_utf8 || encname2codepage(from) > 0)
! 	    && (to_is_utf8 || encname2codepage(to) > 0))
      {
  	vcp->vc_type = CONV_CODEPAGE;
  	vcp->vc_factor = 2;	/* up to twice as long */
! 	vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from);
! 	vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to);
      }
  #endif
  #ifdef MACOS_X
***************
*** 5894,5900 ****
      {
  	vcp->vc_type = CONV_MAC_LATIN1;
      }
!     else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_UNICODE))
      {
  	vcp->vc_type = CONV_MAC_UTF8;
  	vcp->vc_factor = 2;	/* up to twice as long */
--- 5925,5931 ----
      {
  	vcp->vc_type = CONV_MAC_LATIN1;
      }
!     else if ((from_prop & ENC_MACROMAN) && to_is_utf8)
      {
  	vcp->vc_type = CONV_MAC_UTF8;
  	vcp->vc_factor = 2;	/* up to twice as long */
***************
*** 5903,5909 ****
      {
  	vcp->vc_type = CONV_LATIN1_MAC;
      }
!     else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_MACROMAN))
      {
  	vcp->vc_type = CONV_UTF8_MAC;
      }
--- 5934,5940 ----
      {
  	vcp->vc_type = CONV_LATIN1_MAC;
      }
!     else if (from_is_utf8 && (to_prop & ENC_MACROMAN))
      {
  	vcp->vc_type = CONV_UTF8_MAC;
      }
***************
*** 5913,5920 ****
      {
  	/* Use iconv() for conversion. */
  	vcp->vc_fd = (iconv_t)my_iconv_open(
! 		(to_prop & ENC_UNICODE) ? (char_u *)"utf-8" : to,
! 		(from_prop & ENC_UNICODE) ? (char_u *)"utf-8" : from);
  	if (vcp->vc_fd != (iconv_t)-1)
  	{
  	    vcp->vc_type = CONV_ICONV;
--- 5944,5951 ----
      {
  	/* Use iconv() for conversion. */
  	vcp->vc_fd = (iconv_t)my_iconv_open(
! 		to_is_utf8 ? (char_u *)"utf-8" : to,
! 		from_is_utf8 ? (char_u *)"utf-8" : from);
  	if (vcp->vc_fd != (iconv_t)-1)
  	{
  	    vcp->vc_type = CONV_ICONV;
***************
*** 6170,6178 ****
  
  # ifdef USE_ICONV
  	case CONV_ICONV:	/* conversion with output_conv.vc_fd */
! 	    retval = iconv_string(vcp, ptr, len, unconvlenp);
! 	    if (retval != NULL && lenp != NULL)
! 		*lenp = (int)STRLEN(retval);
  	    break;
  # endif
  # ifdef WIN3264
--- 6201,6207 ----
  
  # ifdef USE_ICONV
  	case CONV_ICONV:	/* conversion with output_conv.vc_fd */
! 	    retval = iconv_string(vcp, ptr, len, unconvlenp, lenp);
  	    break;
  # endif
  # ifdef WIN3264
*** ../vim-7.2.200/src/option.c	2009-05-17 13:30:58.000000000 +0200
--- src/option.c	2009-06-12 21:09:51.000000000 +0200
***************
*** 7024,7029 ****
--- 7024,7030 ----
      int		new_unnamed = FALSE;
      int		new_autoselect = FALSE;
      int		new_autoselectml = FALSE;
+     int		new_html = FALSE;
      regprog_T	*new_exclude_prog = NULL;
      char_u	*errmsg = NULL;
      char_u	*p;
***************
*** 7047,7052 ****
--- 7048,7058 ----
  	    new_autoselectml = TRUE;
  	    p += 12;
  	}
+ 	else if (STRNCMP(p, "html", 4) == 0 && (p[4] == ',' || p[4] == NUL))
+ 	{
+ 	    new_html = TRUE;
+ 	    p += 4;
+ 	}
  	else if (STRNCMP(p, "exclude:", 8) == 0 && new_exclude_prog == NULL)
  	{
  	    p += 8;
***************
*** 7068,7073 ****
--- 7074,7080 ----
  	clip_unnamed = new_unnamed;
  	clip_autoselect = new_autoselect;
  	clip_autoselectml = new_autoselectml;
+ 	clip_html = new_html;
  	vim_free(clip_exclude_prog);
  	clip_exclude_prog = new_exclude_prog;
      }
*** ../vim-7.2.200/src/version.c	2009-06-16 15:12:11.000000000 +0200
--- src/version.c	2009-06-16 15:14:02.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     201,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
13. Go to a poetry recital and ask why the poems don't rhyme.

 /// 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    ///


--- NEW FILE 7.2.202 ---
To: vim-dev at vim.org
Subject: Patch 7.2.202
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.202
Problem:    BufWipeout autocommand that edits another buffer causes problems.
Solution:   Check for the situation, give an error and quit the operation.
Files:	    src/fileio.c


*** ../vim-7.2.201/src/fileio.c	2009-05-16 17:29:37.000000000 +0200
--- src/fileio.c	2009-06-11 21:22:37.000000000 +0200
***************
*** 4824,4829 ****
--- 4824,4831 ----
      char_u	*sfname;
  {
  #ifdef FEAT_AUTOCMD
+     buf_T	*buf = curbuf;
+ 
      /* It's like the unnamed buffer is deleted.... */
      if (curbuf->b_p_bl)
  	apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf);
***************
*** 4832,4837 ****
--- 4834,4845 ----
      if (aborting())	    /* autocmds may abort script processing */
  	return FAIL;
  # endif
+     if (curbuf != buf)
+     {
+ 	/* We are in another buffer now, don't do the renaming. */
+ 	EMSG(_(e_auchangedbuf));
+ 	return FAIL;
+     }
  #endif
  
      if (setfname(curbuf, fname, sfname, FALSE) == OK)
*** ../vim-7.2.201/src/version.c	2009-06-16 15:23:07.000000000 +0200
--- src/version.c	2009-06-16 15:28:31.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     202,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
14. Put mosquito netting around your work area. Play a tape of jungle
    sounds all day.

 /// 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    ///


--- NEW FILE 7.2.203 ---
To: vim-dev at vim.org
Subject: Patch 7.2.203
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.203
Problem:    When reloading a buffer or doing anything else with a buffer that
	    is not displayed in a visible window, autocommands may be applied
	    to the current window, folds messed up, etc.
Solution:   Instead of using the current window for the hidden buffer use a
	    special window, splitting the current one temporarily.
Files:	    src/fileio.c, src/globals.h, src/gui.c, src/if_perl.xs,
	    src/proto/gui.pro, src/proto/window.pro, src/screen.c,
	    src/structs.h, src/window.c


*** ../vim-7.2.202/src/fileio.c	2009-06-16 15:35:46.000000000 +0200
--- src/fileio.c	2009-06-11 21:22:37.000000000 +0200
***************
*** 8365,8371 ****
  
  	    /* Execute the modeline settings, but don't set window-local
  	     * options if we are using the current window for another buffer. */
! 	    do_modelines(aco.save_curwin == NULL ? OPT_NOWIN : 0);
  
  	    /* restore the current window */
  	    aucmd_restbuf(&aco);
--- 8365,8371 ----
  
  	    /* Execute the modeline settings, but don't set window-local
  	     * options if we are using the current window for another buffer. */
! 	    do_modelines(curwin == aucmd_win ? OPT_NOWIN : 0);
  
  	    /* restore the current window */
  	    aucmd_restbuf(&aco);
***************
*** 8381,8388 ****
  
  /*
   * Prepare for executing autocommands for (hidden) buffer "buf".
!  * Search a window for the current buffer.  Save the cursor position and
!  * screen offset.
   * Set "curbuf" and "curwin" to match "buf".
   * When FEAT_AUTOCMD is not defined another version is used, see below.
   */
--- 8381,8388 ----
  
  /*
   * Prepare for executing autocommands for (hidden) buffer "buf".
!  * Search for a visible window containing the current buffer.  If there isn't
!  * one then use "aucmd_win".
   * Set "curbuf" and "curwin" to match "buf".
   * When FEAT_AUTOCMD is not defined another version is used, see below.
   */
***************
*** 8392,8399 ****
      buf_T	*buf;		/* new curbuf */
  {
      win_T	*win;
! 
!     aco->new_curbuf = buf;
  
      /* Find a window that is for the new buffer */
      if (buf == curbuf)		/* be quick when buf is curbuf */
--- 8392,8400 ----
      buf_T	*buf;		/* new curbuf */
  {
      win_T	*win;
! #ifdef FEAT_WINDOWS
!     int		save_ea;
! #endif
  
      /* Find a window that is for the new buffer */
      if (buf == curbuf)		/* be quick when buf is curbuf */
***************
*** 8407,8448 ****
  	win = NULL;
  #endif
  
!     /*
!      * Prefer to use an existing window for the buffer, it has the least side
!      * effects (esp. if "buf" is curbuf).
!      * Otherwise, use curwin for "buf".  It might make some items in the
!      * window invalid.  At least save the cursor and topline.
!      */
      if (win != NULL)
      {
! 	/* there is a window for "buf", make it the curwin */
! 	aco->save_curwin = curwin;
  	curwin = win;
- 	aco->save_buf = win->w_buffer;
- 	aco->new_curwin = win;
      }
      else
      {
! 	/* there is no window for "buf", use curwin */
! 	aco->save_curwin = NULL;
! 	aco->save_buf = curbuf;
! 	--curbuf->b_nwindows;
  	curwin->w_buffer = buf;
  	++buf->b_nwindows;
  
! 	/* save cursor and topline, set them to safe values */
! 	aco->save_cursor = curwin->w_cursor;
! 	curwin->w_cursor.lnum = 1;
! 	curwin->w_cursor.col = 0;
! 	aco->save_topline = curwin->w_topline;
! 	curwin->w_topline = 1;
! #ifdef FEAT_DIFF
! 	aco->save_topfill = curwin->w_topfill;
! 	curwin->w_topfill = 0;
  #endif
      }
- 
      curbuf = buf;
  }
  
  /*
--- 8408,8460 ----
  	win = NULL;
  #endif
  
!     /* Allocate "aucmd_win" when needed.  If this fails (out of memory) fall
!      * back to using the current window. */
!     if (win == NULL && aucmd_win == NULL)
!     {
! 	win_alloc_aucmd_win();
! 	if (aucmd_win == NULL)
! 	    win = curwin;
!     }
! 
!     aco->save_curwin = curwin;
!     aco->save_curbuf = curbuf;
      if (win != NULL)
      {
! 	/* There is a window for "buf" in the current tab page, make it the
! 	 * curwin.  This is preferred, it has the least side effects (esp. if
! 	 * "buf" is curbuf). */
  	curwin = win;
      }
      else
      {
! 	/* There is no window for "buf", use "aucmd_win".  To minimize the side
! 	 * effects, insert it in a the current tab page.
! 	 * Anything related to a window (e.g., setting folds) may have
! 	 * unexpected results. */
! 	curwin = aucmd_win;
  	curwin->w_buffer = buf;
  	++buf->b_nwindows;
  
! #ifdef FEAT_WINDOWS
! 	/* Split the current window, put the aucmd_win in the upper half. */
! 	make_snapshot(SNAP_AUCMD_IDX);
! 	save_ea = p_ea;
! 	p_ea = FALSE;
! 	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
! 	(void)win_comp_pos();   /* recompute window positions */
! 	p_ea = save_ea;
! #endif
! 	/* set cursor and topline to safe values */
! 	curwin_init();
! #ifdef FEAT_VERTSPLIT
! 	curwin->w_wincol = 0;
! 	curwin->w_width = Columns;
  #endif
      }
      curbuf = buf;
+     aco->new_curwin = curwin;
+     aco->new_curbuf = curbuf;
  }
  
  /*
***************
*** 8454,8474 ****
  aucmd_restbuf(aco)
      aco_save_T	*aco;		/* structure holding saved values */
  {
!     if (aco->save_curwin != NULL)
      {
  	/* restore curwin */
  #ifdef FEAT_WINDOWS
  	if (win_valid(aco->save_curwin))
  #endif
  	{
! 	    /* restore the buffer which was previously edited by curwin, if
! 	     * it's still the same window and it's valid */
  	    if (curwin == aco->new_curwin
! 		    && buf_valid(aco->save_buf)
! 		    && aco->save_buf->b_ml.ml_mfp != NULL)
  	    {
  		--curbuf->b_nwindows;
! 		curbuf = aco->save_buf;
  		curwin->w_buffer = curbuf;
  		++curbuf->b_nwindows;
  	    }
--- 8466,8551 ----
  aucmd_restbuf(aco)
      aco_save_T	*aco;		/* structure holding saved values */
  {
! #ifdef FEAT_WINDOWS
!     int dummy;
! #endif
! 
!     if (aco->new_curwin == aucmd_win)
!     {
! 	--curbuf->b_nwindows;
! #ifdef FEAT_WINDOWS
! 	/* Find "aucmd_win", it can't be closed, but it may be in another tab
! 	 * page. */
! 	if (curwin != aucmd_win)
! 	{
! 	    tabpage_T	*tp;
! 	    win_T	*wp;
! 
! 	    FOR_ALL_TAB_WINDOWS(tp, wp)
! 	    {
! 		if (wp == aucmd_win)
! 		{
! 		    if (tp != curtab)
! 			goto_tabpage_tp(tp);
! 		    win_goto(aucmd_win);
! 		    break;
! 		}
! 	    }
! 	}
! 
! 	/* Remove the window and frame from the tree of frames. */
! 	(void)winframe_remove(curwin, &dummy, NULL);
! 	win_remove(curwin, NULL);
! 	last_status(FALSE);	    /* may need to remove last status line */
! 	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
! 	(void)win_comp_pos();   /* recompute window positions */
! 
! 	if (win_valid(aco->save_curwin))
! 	    curwin = aco->save_curwin;
! 	else
! 	    /* Hmm, original window disappeared.  Just use the first one. */
! 	    curwin = firstwin;
! # ifdef FEAT_EVAL
! 	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
! # endif
! #else
! 	curwin = aco->save_curwin;
! #endif
! 	curbuf = curwin->w_buffer;
! 
! 	/* the buffer contents may have changed */
! 	check_cursor();
! 	if (curwin->w_topline > curbuf->b_ml.ml_line_count)
! 	{
! 	    curwin->w_topline = curbuf->b_ml.ml_line_count;
! #ifdef FEAT_DIFF
! 	    curwin->w_topfill = 0;
! #endif
! 	}
! #if defined(FEAT_GUI)
! 	/* Hide the scrollbars from the aucmd_win and update. */
! 	gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE);
! 	gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE);
! 	gui_may_update_scrollbars();
! #endif
!     }
!     else
      {
  	/* restore curwin */
  #ifdef FEAT_WINDOWS
  	if (win_valid(aco->save_curwin))
  #endif
  	{
! 	    /* Restore the buffer which was previously edited by curwin, if
! 	     * it was chagned, we are still the same window and the buffer is
! 	     * valid. */
  	    if (curwin == aco->new_curwin
! 		    && curbuf != aco->new_curbuf
! 		    && buf_valid(aco->new_curbuf)
! 		    && aco->new_curbuf->b_ml.ml_mfp != NULL)
  	    {
  		--curbuf->b_nwindows;
! 		curbuf = aco->new_curbuf;
  		curwin->w_buffer = curbuf;
  		++curbuf->b_nwindows;
  	    }
***************
*** 8477,8510 ****
  	    curbuf = curwin->w_buffer;
  	}
      }
-     else
-     {
- 	/* restore buffer for curwin if it still exists and is loaded */
- 	if (buf_valid(aco->save_buf) && aco->save_buf->b_ml.ml_mfp != NULL)
- 	{
- 	    --curbuf->b_nwindows;
- 	    curbuf = aco->save_buf;
- 	    curwin->w_buffer = curbuf;
- 	    ++curbuf->b_nwindows;
- 	    curwin->w_cursor = aco->save_cursor;
- 	    check_cursor();
- 	    /* check topline < line_count, in case lines got deleted */
- 	    if (aco->save_topline <= curbuf->b_ml.ml_line_count)
- 	    {
- 		curwin->w_topline = aco->save_topline;
- #ifdef FEAT_DIFF
- 		curwin->w_topfill = aco->save_topfill;
- #endif
- 	    }
- 	    else
- 	    {
- 		curwin->w_topline = curbuf->b_ml.ml_line_count;
- #ifdef FEAT_DIFF
- 		curwin->w_topfill = 0;
- #endif
- 	    }
- 	}
-     }
  }
  
  static int	autocmd_nested = FALSE;
--- 8554,8559 ----
***************
*** 9419,9427 ****
      aco_save_T	*aco;		/* structure to save values in */
      buf_T	*buf;		/* new curbuf */
  {
!     aco->save_buf = curbuf;
      curbuf = buf;
      curwin->w_buffer = buf;
  }
  
  /*
--- 9468,9478 ----
      aco_save_T	*aco;		/* structure to save values in */
      buf_T	*buf;		/* new curbuf */
  {
!     aco->save_curbuf = curbuf;
!     --curbuf->b_nwindows;
      curbuf = buf;
      curwin->w_buffer = buf;
+     ++curbuf->b_nwindows;
  }
  
  /*
***************
*** 9432,9439 ****
  aucmd_restbuf(aco)
      aco_save_T	*aco;		/* structure holding saved values */
  {
!     curbuf = aco->save_buf;
      curwin->w_buffer = curbuf;
  }
  
  #endif	/* FEAT_AUTOCMD */
--- 9483,9492 ----
  aucmd_restbuf(aco)
      aco_save_T	*aco;		/* structure holding saved values */
  {
!     --curbuf->b_nwindows;
!     curbuf = aco->save_curbuf;
      curwin->w_buffer = curbuf;
+     ++curbuf->b_nwindows;
  }
  
  #endif	/* FEAT_AUTOCMD */
*** ../vim-7.2.202/src/globals.h	2009-06-16 15:23:07.000000000 +0200
--- src/globals.h	2009-06-12 21:10:30.000000000 +0200
***************
*** 539,544 ****
--- 539,548 ----
  
  EXTERN win_T	*curwin;	/* currently active window */
  
+ #ifdef FEAT_AUTOCMD
+ EXTERN win_T	*aucmd_win;	/* window used in aucmd_prepbuf() */
+ #endif
+ 
  /*
   * The window layout is kept in a tree of frames.  topframe points to the top
   * of the tree.
*** ../vim-7.2.202/src/gui.c	2009-05-21 23:25:38.000000000 +0200
--- src/gui.c	2009-06-11 20:58:05.000000000 +0200
***************
*** 3879,3884 ****
--- 3879,3899 ----
   * Scrollbar stuff:
   */
  
+ /*
+  * Called when something in the window layout has changed.
+  */
+     void
+ gui_may_update_scrollbars()
+ {
+     if (gui.in_use && starting == 0)
+     {
+ 	out_flush();
+ 	gui_init_which_components(NULL);
+ 	gui_update_scrollbars(TRUE);
+     }
+     need_mouse_correct = TRUE;
+ }
+ 
      void
  gui_update_scrollbars(force)
      int		force;	    /* Force all scrollbars to get updated */
*** ../vim-7.2.202/src/if_perl.xs	2008-12-03 13:18:16.000000000 +0100
--- src/if_perl.xs	2009-06-03 17:52:51.000000000 +0200
***************
*** 1234,1240 ****
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
! 			if (aco.save_buf == curbuf)
  			    check_cursor();
  		    }
  
--- 1236,1242 ----
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
! 			if (aco.save_curbuf == curbuf)
  			    check_cursor();
  		    }
  
*** ../vim-7.2.202/src/proto/gui.pro	2007-05-05 19:42:19.000000000 +0200
--- src/proto/gui.pro	2009-06-11 20:58:08.000000000 +0200
***************
*** 43,48 ****
--- 43,49 ----
  void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
  scrollbar_T *gui_find_scrollbar __ARGS((long ident));
  void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
+ void gui_may_update_scrollbars __ARGS((void));
  void gui_update_scrollbars __ARGS((int force));
  int gui_do_scroll __ARGS((void));
  int gui_do_horiz_scroll __ARGS((void));
*** ../vim-7.2.202/src/proto/window.pro	2007-07-26 22:57:45.000000000 +0200
--- src/proto/window.pro	2009-06-10 21:20:39.000000000 +0200
***************
*** 1,6 ****
--- 1,7 ----
  /* window.c */
  void do_window __ARGS((int nchar, long Prenum, int xchar));
  int win_split __ARGS((int size, int flags));
+ int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
  int win_valid __ARGS((win_T *win));
  int win_count __ARGS((void));
  int make_windows __ARGS((int count, int vertical));
***************
*** 10,18 ****
--- 11,21 ----
  void win_close __ARGS((win_T *win, int free_buf));
  void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp));
  void win_free_all __ARGS((void));
+ win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
  void close_others __ARGS((int message, int forceit));
  void curwin_init __ARGS((void));
  int win_alloc_first __ARGS((void));
+ void win_alloc_aucmd_win __ARGS((void));
  void win_init_size __ARGS((void));
  void free_tabpage __ARGS((tabpage_T *tp));
  int win_new_tabpage __ARGS((int after));
***************
*** 30,35 ****
--- 33,40 ----
  void win_enter __ARGS((win_T *wp, int undo_sync));
  win_T *buf_jump_open_win __ARGS((buf_T *buf));
  win_T *buf_jump_open_tab __ARGS((buf_T *buf));
+ void win_append __ARGS((win_T *after, win_T *wp));
+ void win_remove __ARGS((win_T *wp, tabpage_T *tp));
  int win_alloc_lines __ARGS((win_T *wp));
  void win_free_lsize __ARGS((win_T *wp));
  void shell_new_rows __ARGS((void));
***************
*** 58,63 ****
--- 63,70 ----
  int min_rows __ARGS((void));
  int only_one_window __ARGS((void));
  void check_lnums __ARGS((int do_curwin));
+ void make_snapshot __ARGS((int idx));
+ void restore_snapshot __ARGS((int idx, int close_curwin));
  int win_hasvertsplit __ARGS((void));
  int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id));
  int match_delete __ARGS((win_T *wp, int id, int perr));
*** ../vim-7.2.202/src/screen.c	2009-05-17 13:30:58.000000000 +0200
--- src/screen.c	2009-06-10 16:41:45.000000000 +0200
***************
*** 7495,7500 ****
--- 7495,7504 ----
  #endif
  	}
      }
+ #ifdef FEAT_AUTOCMD
+     if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
+ 	outofmem = TRUE;
+ #endif
  #ifdef FEAT_WINDOWS
  give_up:
  #endif
*** ../vim-7.2.202/src/structs.h	2009-05-16 16:36:25.000000000 +0200
--- src/structs.h	2009-06-13 12:51:56.000000000 +0200
***************
*** 1621,1626 ****
--- 1621,1634 ----
  };
  #endif
  
+ #define SNAP_HELP_IDX	0
+ #ifdef FEAT_AUTOCMD
+ # define SNAP_AUCMD_IDX 1
+ # define SNAP_COUNT	2
+ #else
+ # define SNAP_COUNT	1
+ #endif
+ 
  /*
   * Tab pages point to the top frame of each tab page.
   * Note: Most values are NOT valid for the current tab page!  Use "curwin",
***************
*** 1649,1655 ****
      buf_T	    *(tp_diffbuf[DB_COUNT]);
      int		    tp_diff_invalid;	/* list of diffs is outdated */
  #endif
!     frame_T	    *tp_snapshot;    /* window layout snapshot */
  #ifdef FEAT_EVAL
      dictitem_T	    tp_winvar;	    /* variable for "t:" Dictionary */
      dict_T	    tp_vars;	    /* internal variables, local to tab page */
--- 1657,1663 ----
      buf_T	    *(tp_diffbuf[DB_COUNT]);
      int		    tp_diff_invalid;	/* list of diffs is outdated */
  #endif
!     frame_T	    *(tp_snapshot[SNAP_COUNT]);  /* window layout snapshots */
  #ifdef FEAT_EVAL
      dictitem_T	    tp_winvar;	    /* variable for "t:" Dictionary */
      dict_T	    tp_vars;	    /* internal variables, local to tab page */
***************
*** 2276,2291 ****
   */
  typedef struct
  {
!     buf_T	*save_buf;	/* saved curbuf */
  #ifdef FEAT_AUTOCMD
!     buf_T	*new_curbuf;	/* buffer to be used */
!     win_T	*save_curwin;	/* saved curwin, NULL if it didn't change */
!     win_T	*new_curwin;	/* new curwin if save_curwin != NULL */
!     pos_T	save_cursor;	/* saved cursor pos of save_curwin */
!     linenr_T	save_topline;	/* saved topline of save_curwin */
! # ifdef FEAT_DIFF
!     int		save_topfill;	/* saved topfill of save_curwin */
! # endif
  #endif
  } aco_save_T;
  
--- 2284,2294 ----
   */
  typedef struct
  {
!     buf_T	*save_curbuf;	/* saved curbuf */
  #ifdef FEAT_AUTOCMD
!     win_T	*save_curwin;	/* saved curwin */
!     win_T	*new_curwin;	/* new curwin */
!     buf_T	*new_curbuf;	/* new curbuf */
  #endif
  } aco_save_T;
  
*** ../vim-7.2.202/src/window.c	2009-05-21 23:25:38.000000000 +0200
--- src/window.c	2009-06-12 22:29:33.000000000 +0200
***************
*** 11,18 ****
  
  static int path_is_url __ARGS((char_u *p));
  #if defined(FEAT_WINDOWS) || defined(PROTO)
- static int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
  static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
  static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
  static void frame_setheight __ARGS((frame_T *curfrp, int height));
  #ifdef FEAT_VERTSPLIT
--- 11,18 ----
  
  static int path_is_url __ARGS((char_u *p));
  #if defined(FEAT_WINDOWS) || defined(PROTO)
  static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
+ static void win_init_some __ARGS((win_T *newp, win_T *oldp));
  static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
  static void frame_setheight __ARGS((frame_T *curfrp, int height));
  #ifdef FEAT_VERTSPLIT
***************
*** 23,30 ****
  static void win_totop __ARGS((int size, int flags));
  static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height));
  static int last_window __ARGS((void));
  static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp));
- static win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
  static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
  static tabpage_T *alt_tabpage __ARGS((void));
  static win_T *frame2win __ARGS((frame_T *frp));
--- 23,30 ----
  static void win_totop __ARGS((int size, int flags));
  static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height));
  static int last_window __ARGS((void));
+ static int one_window __ARGS((void));
  static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp));
  static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
  static tabpage_T *alt_tabpage __ARGS((void));
  static win_T *frame2win __ARGS((frame_T *frp));
***************
*** 41,46 ****
--- 41,47 ----
  #endif
  #endif
  static int win_alloc_firstwin __ARGS((win_T *oldwin));
+ static void new_frame __ARGS((win_T *wp));
  #if defined(FEAT_WINDOWS) || defined(PROTO)
  static tabpage_T *alloc_tabpage __ARGS((void));
  static int leave_tabpage __ARGS((buf_T *new_curbuf));
***************
*** 49,56 ****
  static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin));
  static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin));
  static void win_free __ARGS((win_T *wp, tabpage_T *tp));
- static void win_append __ARGS((win_T *, win_T *));
- static void win_remove __ARGS((win_T *, tabpage_T *tp));
  static void frame_append __ARGS((frame_T *after, frame_T *frp));
  static void frame_insert __ARGS((frame_T *before, frame_T *frp));
  static void frame_remove __ARGS((frame_T *frp));
--- 50,55 ----
***************
*** 62,78 ****
  static void frame_add_height __ARGS((frame_T *frp, int n));
  static void last_status_rec __ARGS((frame_T *fr, int statusline));
  
- static void make_snapshot __ARGS((void));
  static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp));
! static void clear_snapshot __ARGS((tabpage_T *tp));
  static void clear_snapshot_rec __ARGS((frame_T *fr));
- static void restore_snapshot __ARGS((int close_curwin));
  static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
  static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
  
  #endif /* FEAT_WINDOWS */
  
! static win_T *win_alloc __ARGS((win_T *after));
  static void win_new_height __ARGS((win_T *, int));
  
  #define URL_SLASH	1		/* path_is_url() has found "://" */
--- 61,75 ----
  static void frame_add_height __ARGS((frame_T *frp, int n));
  static void last_status_rec __ARGS((frame_T *fr, int statusline));
  
  static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp));
! static void clear_snapshot __ARGS((tabpage_T *tp, int idx));
  static void clear_snapshot_rec __ARGS((frame_T *fr));
  static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
  static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
  
  #endif /* FEAT_WINDOWS */
  
! static win_T *win_alloc __ARGS((win_T *after, int hidden));
  static void win_new_height __ARGS((win_T *, int));
  
  #define URL_SLASH	1		/* path_is_url() has found "://" */
***************
*** 259,265 ****
  /* cursor to previous window with wrap around */
      case 'W':
  		CHECK_CMDWIN
! 		if (lastwin == firstwin && Prenum != 1)	/* just one window */
  		    beep_flush();
  		else
  		{
--- 256,262 ----
  /* cursor to previous window with wrap around */
      case 'W':
  		CHECK_CMDWIN
! 		if (firstwin == lastwin && Prenum != 1)	/* just one window */
  		    beep_flush();
  		else
  		{
***************
*** 343,349 ****
  
  /* move window to new tab page */
      case 'T':
! 		if (firstwin == lastwin)
  		    MSG(_(m_onlyone));
  		else
  		{
--- 340,346 ----
  
  /* move window to new tab page */
      case 'T':
! 		if (one_window())
  		    MSG(_(m_onlyone));
  		else
  		{
***************
*** 679,687 ****
      /* When creating the help window make a snapshot of the window layout.
       * Otherwise clear the snapshot, it's now invalid. */
      if (flags & WSP_HELP)
! 	make_snapshot();
      else
! 	clear_snapshot(curtab);
  
      return win_split_ins(size, flags, NULL, 0);
  }
--- 676,684 ----
      /* When creating the help window make a snapshot of the window layout.
       * Otherwise clear the snapshot, it's now invalid. */
      if (flags & WSP_HELP)
! 	make_snapshot(SNAP_HELP_IDX);
      else
! 	clear_snapshot(curtab, SNAP_HELP_IDX);
  
      return win_split_ins(size, flags, NULL, 0);
  }
***************
*** 692,698 ****
   * top/left/right/bottom.
   * return FAIL for failure, OK otherwise
   */
!     static int
  win_split_ins(size, flags, newwin, dir)
      int		size;
      int		flags;
--- 689,695 ----
   * top/left/right/bottom.
   * return FAIL for failure, OK otherwise
   */
!     int
  win_split_ins(size, flags, newwin, dir)
      int		size;
      int		flags;
***************
*** 893,906 ****
      {
  	/* new window below/right of current one */
  	if (newwin == NULL)
! 	    wp = win_alloc(oldwin);
  	else
  	    win_append(oldwin, wp);
      }
      else
      {
  	if (newwin == NULL)
! 	    wp = win_alloc(oldwin->w_prev);
  	else
  	    win_append(oldwin->w_prev, wp);
      }
--- 890,903 ----
      {
  	/* new window below/right of current one */
  	if (newwin == NULL)
! 	    wp = win_alloc(oldwin, FALSE);
  	else
  	    win_append(oldwin, wp);
      }
      else
      {
  	if (newwin == NULL)
! 	    wp = win_alloc(oldwin->w_prev, FALSE);
  	else
  	    win_append(oldwin->w_prev, wp);
      }
***************
*** 910,915 ****
--- 907,919 ----
  	if (wp == NULL)
  	    return FAIL;
  
+ 	new_frame(wp);
+ 	if (wp->w_frame == NULL)
+ 	{
+ 	    win_free(wp, NULL);
+ 	    return FAIL;
+ 	}
+ 
  	/* make the contents of the new window the same as the current one */
  	win_init(wp, curwin, flags);
      }
***************
*** 970,982 ****
      }
  
      if (newwin == NULL)
!     {
! 	/* Create a frame for the new window. */
! 	frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
! 	frp->fr_layout = FR_LEAF;
! 	frp->fr_win = wp;
! 	wp->w_frame = frp;
!     }
      else
  	frp = newwin->w_frame;
      frp->fr_parent = curfrp->fr_parent;
--- 974,980 ----
      }
  
      if (newwin == NULL)
! 	frp = wp->w_frame;
      else
  	frp = newwin->w_frame;
      frp->fr_parent = curfrp->fr_parent;
***************
*** 1156,1161 ****
--- 1154,1160 ----
      return OK;
  }
  
+ 
  /*
   * Initialize window "newp" from window "oldp".
   * Used when splitting a window and when creating a new tab page.
***************
*** 1204,1217 ****
      if (oldp->w_localdir != NULL)
  	newp->w_localdir = vim_strsave(oldp->w_localdir);
  
!     /* Use the same argument list. */
!     newp->w_alist = oldp->w_alist;
!     ++newp->w_alist->al_refcount;
!     newp->w_arg_idx = oldp->w_arg_idx;
! 
!     /*
!      * copy tagstack and options from existing window
!      */
      for (i = 0; i < oldp->w_tagstacklen; i++)
      {
  	newp->w_tagstack[i] = oldp->w_tagstack[i];
--- 1203,1209 ----
      if (oldp->w_localdir != NULL)
  	newp->w_localdir = vim_strsave(oldp->w_localdir);
  
!     /* copy tagstack and folds */
      for (i = 0; i < oldp->w_tagstacklen; i++)
      {
  	newp->w_tagstack[i] = oldp->w_tagstack[i];
***************
*** 1221,1230 ****
      }
      newp->w_tagstackidx = oldp->w_tagstackidx;
      newp->w_tagstacklen = oldp->w_tagstacklen;
-     win_copy_options(oldp, newp);
  # ifdef FEAT_FOLDING
      copyFoldingState(oldp, newp);
  # endif
  }
  
  #endif /* FEAT_WINDOWS */
--- 1213,1241 ----
      }
      newp->w_tagstackidx = oldp->w_tagstackidx;
      newp->w_tagstacklen = oldp->w_tagstacklen;
  # ifdef FEAT_FOLDING
      copyFoldingState(oldp, newp);
  # endif
+ 
+     win_init_some(newp, oldp);
+ }
+ 
+ /*
+  * Initialize window "newp" from window"old".
+  * Only the essential things are copied.
+  */
+     static void
+ win_init_some(newp, oldp)
+     win_T	*newp;
+     win_T	*oldp;
+ {
+     /* Use the same argument list. */
+     newp->w_alist = oldp->w_alist;
+     ++newp->w_alist->al_refcount;
+     newp->w_arg_idx = oldp->w_arg_idx;
+ 
+     /* copy options from existing window */
+     win_copy_options(oldp, newp);
  }
  
  #endif /* FEAT_WINDOWS */
***************
*** 1565,1579 ****
  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
       * scrollbars.  Have to update them anyway. */
!     if (gui.in_use)
!     {
! 	out_flush();
! 	gui_init_which_components(NULL);
! 	gui_update_scrollbars(TRUE);
!     }
!     need_mouse_correct = TRUE;
  #endif
- 
  }
  
  /*
--- 1576,1583 ----
  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
       * scrollbars.  Have to update them anyway. */
!     gui_may_update_scrollbars();
  #endif
  }
  
  /*
***************
*** 2048,2060 ****
  }
  
  /*
!  * Return TRUE if the current window is the only window that exists.
   * Returns FALSE if there is a window, possibly in another tab page.
   */
      static int
  last_window()
  {
!     return (lastwin == firstwin && first_tabpage->tp_next == NULL);
  }
  
  /*
--- 2052,2091 ----
  }
  
  /*
!  * Return TRUE if the current window is the only window that exists (ignoring
!  * "aucmd_win").
   * Returns FALSE if there is a window, possibly in another tab page.
   */
      static int
  last_window()
  {
!     return (one_window() && first_tabpage->tp_next == NULL);
! }
! 
! /*
!  * Return TRUE if there is only one window other than "aucmd_win" in the
!  * current tab page.
!  */
!     static int
! one_window()
! {
! #ifdef FEAT_AUTOCMD
!     win_T	*wp;
!     int		seen_one = FALSE;
! 
!     FOR_ALL_WINDOWS(wp)
!     {
! 	if (wp != aucmd_win)
! 	{
! 	    if (seen_one)
! 		return FALSE;
! 	    seen_one = TRUE;
! 	}
!     }
!     return TRUE;
! #else
!     return firstwin == lastwin;
! #endif
  }
  
  /*
***************
*** 2083,2088 ****
--- 2114,2132 ----
  	return;
      }
  
+ #ifdef FEAT_AUTOCMD
+     if (win == aucmd_win)
+     {
+ 	EMSG(_("E813: Cannot close autocmd window"));
+ 	return;
+     }
+     if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window())
+     {
+ 	EMSG(_("E814: Cannot close window, only autocmd window would remain"));
+ 	return;
+     }
+ #endif
+ 
      /*
       * When closing the last window in a tab page first go to another tab
       * page and then close the window and the tab page.  This avoids that
***************
*** 2112,2118 ****
      if (win->w_buffer->b_help)
  	help_window = TRUE;
      else
! 	clear_snapshot(curtab);
  
  #ifdef FEAT_AUTOCMD
      if (win == curwin)
--- 2156,2162 ----
      if (win->w_buffer->b_help)
  	help_window = TRUE;
      else
! 	clear_snapshot(curtab, SNAP_HELP_IDX);
  
  #ifdef FEAT_AUTOCMD
      if (win == curwin)
***************
*** 2229,2235 ****
      /* After closing the help window, try restoring the window layout from
       * before it was opened. */
      if (help_window)
! 	restore_snapshot(close_curwin);
  
  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
      /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */
--- 2273,2279 ----
      /* After closing the help window, try restoring the window layout from
       * before it was opened. */
      if (help_window)
! 	restore_snapshot(SNAP_HELP_IDX, close_curwin);
  
  #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
      /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */
***************
*** 2344,2349 ****
--- 2388,2401 ----
  
      while (firstwin != NULL)
  	(void)win_free_mem(firstwin, &dummy, NULL);
+ 
+ # ifdef FEAT_AUTOCMD
+     if (aucmd_win != NULL)
+     {
+ 	(void)win_free_mem(aucmd_win, &dummy, NULL);
+ 	aucmd_win = NULL;
+     }
+ # endif
  }
  #endif
  
***************
*** 2351,2357 ****
   * Remove a window and its frame from the tree of frames.
   * Returns a pointer to the window that got the freed up space.
   */
!     static win_T *
  winframe_remove(win, dirp, tp)
      win_T	*win;
      int		*dirp UNUSED;	/* set to 'v' or 'h' for direction if 'ea' */
--- 2403,2409 ----
   * Remove a window and its frame from the tree of frames.
   * Returns a pointer to the window that got the freed up space.
   */
!     win_T *
  winframe_remove(win, dirp, tp)
      win_T	*win;
      int		*dirp UNUSED;	/* set to 'v' or 'h' for direction if 'ea' */
***************
*** 3090,3096 ****
      win_T	*nextwp;
      int		r;
  
!     if (lastwin == firstwin)
      {
  	if (message
  #ifdef FEAT_AUTOCMD
--- 3142,3148 ----
      win_T	*nextwp;
      int		r;
  
!     if (one_window())
      {
  	if (message
  #ifdef FEAT_AUTOCMD
***************
*** 3194,3202 ****
--- 3246,3275 ----
      first_tabpage->tp_topframe = topframe;
      curtab = first_tabpage;
  #endif
+ 
      return OK;
  }
  
+ #if defined(FEAT_AUTOCMD) || defined(PROTO)
+ /*
+  * Init "aucmd_win".  This can only be done after the first
+  * window is fully initialized, thus it can't be in win_alloc_first().
+  */
+     void
+ win_alloc_aucmd_win()
+ {
+     aucmd_win = win_alloc(NULL, TRUE);
+     if (aucmd_win != NULL)
+     {
+ 	win_init_some(aucmd_win, curwin);
+ # ifdef FEAT_SCROLLBIND
+ 	aucmd_win->w_p_scb = FALSE;
+ # endif
+ 	new_frame(aucmd_win);
+     }
+ }
+ #endif
+ 
  /*
   * Allocate the first window or the first window in a new tab page.
   * When "oldwin" is NULL create an empty buffer for it.
***************
*** 3208,3214 ****
  win_alloc_firstwin(oldwin)
      win_T	*oldwin;
  {
!     curwin = win_alloc(NULL);
      if (oldwin == NULL)
      {
  	/* Very first window, need to create an empty buffer for it and
--- 3281,3287 ----
  win_alloc_firstwin(oldwin)
      win_T	*oldwin;
  {
!     curwin = win_alloc(NULL, FALSE);
      if (oldwin == NULL)
      {
  	/* Very first window, need to create an empty buffer for it and
***************
*** 3236,3256 ****
      }
  #endif
  
!     topframe = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
!     if (topframe == NULL)
  	return FAIL;
!     topframe->fr_layout = FR_LEAF;
  #ifdef FEAT_VERTSPLIT
      topframe->fr_width = Columns;
  #endif
      topframe->fr_height = Rows - p_ch;
      topframe->fr_win = curwin;
-     curwin->w_frame = topframe;
  
      return OK;
  }
  
  /*
   * Initialize the window and frame size to the maximum.
   */
      void
--- 3309,3344 ----
      }
  #endif
  
!     new_frame(curwin);
!     if (curwin->w_frame == NULL)
  	return FAIL;
!     topframe = curwin->w_frame;
  #ifdef FEAT_VERTSPLIT
      topframe->fr_width = Columns;
  #endif
      topframe->fr_height = Rows - p_ch;
      topframe->fr_win = curwin;
  
      return OK;
  }
  
  /*
+  * Create a frame for window "wp".
+  */
+     static void
+ new_frame(win_T *wp)
+ {
+     frame_T *frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
+ 
+     wp->w_frame = frp;
+     if (frp != NULL)
+     {
+ 	frp->fr_layout = FR_LEAF;
+ 	frp->fr_win = wp;
+     }
+ }
+ 
+ /*
   * Initialize the window and frame size to the maximum.
   */
      void
***************
*** 3300,3309 ****
  free_tabpage(tp)
      tabpage_T	*tp;
  {
  # ifdef FEAT_DIFF
      diff_clear(tp);
  # endif
!     clear_snapshot(tp);
  #ifdef FEAT_EVAL
      vars_clear(&tp->tp_vars.dv_hashtab);	/* free all t: variables */
  #endif
--- 3388,3400 ----
  free_tabpage(tp)
      tabpage_T	*tp;
  {
+     int idx;
+ 
  # ifdef FEAT_DIFF
      diff_clear(tp);
  # endif
!     for (idx = 0; idx < SNAP_COUNT; ++idx)
! 	clear_snapshot(tp, idx);
  #ifdef FEAT_EVAL
      vars_clear(&tp->tp_vars.dv_hashtab);	/* free all t: variables */
  #endif
***************
*** 3370,3381 ****
  #if defined(FEAT_GUI)
  	/* When 'guioptions' includes 'L' or 'R' may have to remove or add
  	 * scrollbars.  Have to update them anyway. */
! 	if (gui.in_use && starting == 0)
! 	{
! 	    gui_init_which_components(NULL);
! 	    gui_update_scrollbars(TRUE);
! 	}
! 	need_mouse_correct = TRUE;
  #endif
  
  	redraw_all_later(CLEAR);
--- 3461,3467 ----
  #if defined(FEAT_GUI)
  	/* When 'guioptions' includes 'L' or 'R' may have to remove or add
  	 * scrollbars.  Have to update them anyway. */
! 	gui_may_update_scrollbars();
  #endif
  
  	redraw_all_later(CLEAR);
***************
*** 3593,3604 ****
  #if defined(FEAT_GUI)
      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
       * scrollbars.  Have to update them anyway. */
!     if (gui.in_use && starting == 0)
!     {
! 	gui_init_which_components(NULL);
! 	gui_update_scrollbars(TRUE);
!     }
!     need_mouse_correct = TRUE;
  #endif
  
      redraw_all_later(CLEAR);
--- 3679,3685 ----
  #if defined(FEAT_GUI)
      /* When 'guioptions' includes 'L' or 'R' may have to remove or add
       * scrollbars.  Have to update them anyway. */
!     gui_may_update_scrollbars();
  #endif
  
      redraw_all_later(CLEAR);
***************
*** 4150,4160 ****
  #endif
  
  /*
!  * allocate a window structure and link it in the window list
   */
      static win_T *
! win_alloc(after)
      win_T	*after UNUSED;
  {
      win_T	*newwin;
  
--- 4231,4243 ----
  #endif
  
  /*
!  * Allocate a window structure and link it in the window list when "hidden" is
!  * FALSE.
   */
      static win_T *
! win_alloc(after, hidden)
      win_T	*after UNUSED;
+     int		hidden UNUSED;
  {
      win_T	*newwin;
  
***************
*** 4180,4186 ****
  	 * link the window in the window list
  	 */
  #ifdef FEAT_WINDOWS
! 	win_append(after, newwin);
  #endif
  #ifdef FEAT_VERTSPLIT
  	newwin->w_wincol = 0;
--- 4263,4270 ----
  	 * link the window in the window list
  	 */
  #ifdef FEAT_WINDOWS
! 	if (!hidden)
! 	    win_append(after, newwin);
  #endif
  #ifdef FEAT_VERTSPLIT
  	newwin->w_wincol = 0;
***************
*** 4314,4320 ****
  /*
   * Append window "wp" in the window list after window "after".
   */
!     static void
  win_append(after, wp)
      win_T	*after, *wp;
  {
--- 4398,4404 ----
  /*
   * Append window "wp" in the window list after window "after".
   */
!     void
  win_append(after, wp)
      win_T	*after, *wp;
  {
***************
*** 4340,4346 ****
  /*
   * Remove a window from the window list.
   */
!     static void
  win_remove(wp, tp)
      win_T	*wp;
      tabpage_T	*tp;		/* tab page "win" is in, NULL for current */
--- 4424,4430 ----
  /*
   * Remove a window from the window list.
   */
!     void
  win_remove(wp, tp)
      win_T	*wp;
      tabpage_T	*tp;		/* tab page "win" is in, NULL for current */
***************
*** 6040,6045 ****
--- 6124,6130 ----
  /*
   * Return TRUE if there is only one window (in the current tab page), not
   * counting a help or preview window, unless it is the current window.
+  * Does not count "aucmd_win".
   */
      int
  only_one_window()
***************
*** 6053,6063 ****
  	return FALSE;
  
      for (wp = firstwin; wp != NULL; wp = wp->w_next)
! 	if (!((wp->w_buffer->b_help && !curbuf->b_help)
  # ifdef FEAT_QUICKFIX
  		    || wp->w_p_pvw
  # endif
  	     ) || wp == curwin)
  	    ++count;
      return (count <= 1);
  #else
--- 6138,6152 ----
  	return FALSE;
  
      for (wp = firstwin; wp != NULL; wp = wp->w_next)
! 	if ((!((wp->w_buffer->b_help && !curbuf->b_help)
  # ifdef FEAT_QUICKFIX
  		    || wp->w_p_pvw
  # endif
  	     ) || wp == curwin)
+ # ifdef FEAT_AUTOCMD
+ 		&& wp != aucmd_win
+ # endif
+ 	   )
  	    ++count;
      return (count <= 1);
  #else
***************
*** 6112,6122 ****
  /*
   * Create a snapshot of the current frame sizes.
   */
!     static void
! make_snapshot()
  {
!     clear_snapshot(curtab);
!     make_snapshot_rec(topframe, &curtab->tp_snapshot);
  }
  
      static void
--- 6201,6212 ----
  /*
   * Create a snapshot of the current frame sizes.
   */
!     void
! make_snapshot(idx)
!     int idx;
  {
!     clear_snapshot(curtab, idx);
!     make_snapshot_rec(topframe, &curtab->tp_snapshot[idx]);
  }
  
      static void
***************
*** 6144,6154 ****
   * Remove any existing snapshot.
   */
      static void
! clear_snapshot(tp)
      tabpage_T	*tp;
  {
!     clear_snapshot_rec(tp->tp_snapshot);
!     tp->tp_snapshot = NULL;
  }
  
      static void
--- 6234,6245 ----
   * Remove any existing snapshot.
   */
      static void
! clear_snapshot(tp, idx)
      tabpage_T	*tp;
+     int		idx;
  {
!     clear_snapshot_rec(tp->tp_snapshot[idx]);
!     tp->tp_snapshot[idx] = NULL;
  }
  
      static void
***************
*** 6168,6193 ****
   * This is only done if the screen size didn't change and the window layout is
   * still the same.
   */
!     static void
! restore_snapshot(close_curwin)
      int		close_curwin;	    /* closing current window */
  {
      win_T	*wp;
  
!     if (curtab->tp_snapshot != NULL
  # ifdef FEAT_VERTSPLIT
! 	    && curtab->tp_snapshot->fr_width == topframe->fr_width
  # endif
! 	    && curtab->tp_snapshot->fr_height == topframe->fr_height
! 	    && check_snapshot_rec(curtab->tp_snapshot, topframe) == OK)
      {
! 	wp = restore_snapshot_rec(curtab->tp_snapshot, topframe);
  	win_comp_pos();
  	if (wp != NULL && close_curwin)
  	    win_goto(wp);
  	redraw_all_later(CLEAR);
      }
!     clear_snapshot(curtab);
  }
  
  /*
--- 6259,6285 ----
   * This is only done if the screen size didn't change and the window layout is
   * still the same.
   */
!     void
! restore_snapshot(idx, close_curwin)
!     int		idx;
      int		close_curwin;	    /* closing current window */
  {
      win_T	*wp;
  
!     if (curtab->tp_snapshot[idx] != NULL
  # ifdef FEAT_VERTSPLIT
! 	    && curtab->tp_snapshot[idx]->fr_width == topframe->fr_width
  # endif
! 	    && curtab->tp_snapshot[idx]->fr_height == topframe->fr_height
! 	    && check_snapshot_rec(curtab->tp_snapshot[idx], topframe) == OK)
      {
! 	wp = restore_snapshot_rec(curtab->tp_snapshot[idx], topframe);
  	win_comp_pos();
  	if (wp != NULL && close_curwin)
  	    win_goto(wp);
  	redraw_all_later(CLEAR);
      }
!     clear_snapshot(curtab, idx);
  }
  
  /*
*** ../vim-7.2.202/src/version.c	2009-06-16 15:35:46.000000000 +0200
--- src/version.c	2009-06-16 15:37:16.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     203,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
15. Five days in advance, tell your friends you can't attend their
    party because you're not in the mood.

 /// 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    ///


--- NEW FILE 7.2.204 ---
To: vim-dev at vim.org
Subject: Patch 7.2.204 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.204 (extra)
Problem:    Win32: Can't build with Visual Studio 2010 beta 1.
Solution:   Fix the makefile. (George Reilly)
Files:	    src/Make_mvc.mak


*** ../vim-7.2.203/src/Make_mvc.mak	2009-05-26 22:58:43.000000000 +0200
--- src/Make_mvc.mak	2009-06-16 16:27:59.000000000 +0200
***************
*** 1,18 ****
  # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
  # and Win64, using the Microsoft Visual C++ compilers. Known to work with
  # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
! # and VC9 (VS2008).
  #
  # To build using other Windows compilers, see INSTALLpc.txt
  #
  # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
! # Python-enabled versions of vim for Win32 platforms.
  #
! # The basic command line to build vim is:
  #
  #	nmake -f Make_mvc.mak
  #
! # This will build the console version of vim with no additional interfaces.
  # To add features, define any of the following:
  #
  #	!!!!  After changing features do "nmake clean" first  !!!!
--- 1,18 ----
  # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
  # and Win64, using the Microsoft Visual C++ compilers. Known to work with
  # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
! # VC9 (VS2008), and VC10 (VS2010).
  #
  # To build using other Windows compilers, see INSTALLpc.txt
  #
  # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
! # Python-enabled versions of Vim for Win32 platforms.
  #
! # The basic command line to build Vim is:
  #
  #	nmake -f Make_mvc.mak
  #
! # This will build the console version of Vim with no additional interfaces.
  # To add features, define any of the following:
  #
  #	!!!!  After changing features do "nmake clean" first  !!!!
***************
*** 358,363 ****
--- 358,366 ----
  !if "$(_NMAKE_VER)" == "9.00.30729.01"
  MSVCVER = 9.0
  !endif
+ !if "$(_NMAKE_VER)" == "10.00.20506.01"
+ MSVCVER = 10.0
+ !endif
  !endif
  
  # Abort bulding VIM if version of VC is unrecognised.
***************
*** 372,378 ****
  !endif
  
  # Convert processor ID to MVC-compatible number
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
  !if "$(CPUNR)" == "i386"
  CPUARG = /G3
  !elseif "$(CPUNR)" == "i486"
--- 375,381 ----
  !endif
  
  # Convert processor ID to MVC-compatible number
! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
  !if "$(CPUNR)" == "i386"
  CPUARG = /G3
  !elseif "$(CPUNR)" == "i486"
***************
*** 405,411 ****
  !else # MAXSPEED
  OPTFLAG = /Ox
  !endif
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
  # Use link time code generation if not worried about size
  !if "$(OPTIMIZE)" != "SPACE"
  OPTFLAG = $(OPTFLAG) /GL
--- 408,414 ----
  !else # MAXSPEED
  OPTFLAG = /Ox
  !endif
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
  # Use link time code generation if not worried about size
  !if "$(OPTIMIZE)" != "SPACE"
  OPTFLAG = $(OPTFLAG) /GL
***************
*** 793,799 ****
  
  # Report link time code generation progress if used. 
  !ifdef NODEBUG
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
  !if "$(OPTIMIZE)" != "SPACE"
  LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
  !endif
--- 796,802 ----
  
  # Report link time code generation progress if used. 
  !ifdef NODEBUG
! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
  !if "$(OPTIMIZE)" != "SPACE"
  LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
  !endif
*** ../vim-7.2.203/src/version.c	2009-06-16 16:01:34.000000000 +0200
--- src/version.c	2009-06-16 16:32:41.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     204,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
16. Have your coworkers address you by your wrestling name, Rock Hard Kim.

 /// 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    ///


--- NEW FILE 7.2.205 ---
To: vim-dev at vim.org
Subject: Patch 7.2.205 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.205 (extra)
Problem:    Win32: No support for High DPI awarenes.
Solution:   Fix the manifest file. (George Reilly)
Files:	    src/Make_mvc.mak, src/gvim.exe.mnf


*** ../vim-7.2.204/src/Make_mvc.mak	2009-06-16 16:34:12.000000000 +0200
--- src/Make_mvc.mak	2009-06-16 16:36:32.000000000 +0200
***************
*** 1040,1046 ****
  $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
  	$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
  
! $(OUTDIR)/vim.res:	$(OUTDIR) vim.rc version.h tools.bmp tearoff.bmp \
  		vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
  	$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
  
--- 1040,1046 ----
  $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
  	$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
  
! $(OUTDIR)/vim.res:	$(OUTDIR) vim.rc gvim.exe.mnf version.h tools.bmp tearoff.bmp \
  		vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
  	$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
  
*** ../vim-7.2.204/src/gvim.exe.mnf	2008-08-09 19:37:29.000000000 +0200
--- src/gvim.exe.mnf	2009-06-16 16:36:32.000000000 +0200
***************
*** 1,5 ****
  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
! <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
    <assemblyIdentity
      processorArchitecture="*"
      version="7.2.0.0"
--- 1,5 ----
  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
! <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
    <assemblyIdentity
      processorArchitecture="*"
      version="7.2.0.0"
***************
*** 29,32 ****
--- 29,38 ----
        </requestedPrivileges>
      </security>
    </trustInfo>
+   <!-- Vista High DPI aware -->
+   <asmv3:application>
+     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+       <dpiAware>true</dpiAware>
+     </asmv3:windowsSettings>
+   </asmv3:application>
  </assembly>
*** ../vim-7.2.204/src/version.c	2009-06-16 16:34:12.000000000 +0200
--- src/version.c	2009-06-16 16:43:04.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     205,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
17. When the money comes out the ATM, scream "I won!, I won! 3rd
    time this week!!!!!"

 /// 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    ///


--- NEW FILE 7.2.206 ---
To: vim-dev at vim.org
Subject: Patch 7.2.206
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.206
Problem:    Win32: Can't build netbeans interface with Visual Studio 2010.
Solution:   Undefine ECONNREFUSED. (George Reilly)
Files:	    src/netbeans.c


*** ../vim-7.2.205/src/netbeans.c	2009-05-17 23:25:16.000000000 +0200
--- src/netbeans.c	2009-06-16 16:39:17.000000000 +0200
***************
*** 32,37 ****
--- 32,38 ----
  /* WinSock API is separated from C API, thus we can't use read(), write(),
   * errno... */
  # define sock_errno WSAGetLastError()
+ # undef ECONNREFUSED
  # define ECONNREFUSED WSAECONNREFUSED
  # ifdef EINTR
  #  undef EINTR
*** ../vim-7.2.205/src/version.c	2009-06-16 16:45:14.000000000 +0200
--- src/version.c	2009-06-16 16:57:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     206,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
18. When leaving the zoo, start running towards the parking lot,
    yelling "run for your lives, they're loose!!"

 /// 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    ///


--- NEW FILE 7.2.207 ---
To: vim-dev at vim.org
Subject: Patch 7.2.207
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.207
Problem:    Using freed memory with ":redrawstatus" when it works recursively.
Solution:   Prevent recursively updating the status line. (partly by Dominique
	    Pelle)
Files:	    src/screen.c


*** ../vim-7.2.206/src/screen.c	2009-06-16 16:01:34.000000000 +0200
--- src/screen.c	2009-06-16 17:04:53.000000000 +0200
***************
*** 5743,5748 ****
--- 5743,5755 ----
      int		fillchar;
      int		attr;
      int		this_ru_col;
+     static int  busy = FALSE;
+ 
+     /* It's possible to get here recursively when 'statusline' (indirectly)
+      * invokes ":redrawstatus".  Simply ignore the call then. */
+     if (busy)
+ 	return;
+     busy = TRUE;
  
      wp->w_redr_status = FALSE;
      if (wp->w_status_height == 0)
***************
*** 5881,5886 ****
--- 5888,5894 ----
  									attr);
      }
  #endif
+     busy = FALSE;
  }
  
  #ifdef FEAT_STL_OPT
*** ../vim-7.2.206/src/version.c	2009-06-16 16:57:53.000000000 +0200
--- src/version.c	2009-06-16 17:21:56.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     207,
  /**/

-- 
In many of the more relaxed civilizations on the Outer Eastern Rim of the
Galaxy, "The Hitchhiker's Guide to the Galaxy" has already supplanted the
great "Encyclopedia Galactica" as the standard repository of all knowledge
and wisdom, for though it has many omissions and contains much that is
apocryphal, or at least wildly inaccurate, it scores over the older, more
pedestrian work in two important respects.
First, it is slightly cheaper; and second, it has the words "DON'T PANIC"
inscribed in large friendly letters on its cover.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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    ///


--- NEW FILE 7.2.208 ---
To: vim-dev at vim.org
Subject: Patch 7.2.208
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.208
Problem:    "set novice" gives an error message, it should be ignored.
Solution:   Don't see "no" in "novice" as unsetting an option.  (Patrick
	    Texier)
Files:	    src/option.c


*** ../vim-7.2.207/src/option.c	2009-06-16 15:23:07.000000000 +0200
--- src/option.c	2009-06-16 17:35:08.000000000 +0200
***************
*** 4006,4012 ****
  	else
  	{
  	    prefix = 1;
! 	    if (STRNCMP(arg, "no", 2) == 0)
  	    {
  		prefix = 0;
  		arg += 2;
--- 4006,4012 ----
  	else
  	{
  	    prefix = 1;
! 	    if (STRNCMP(arg, "no", 2) == 0 && STRNCMP(arg, "novice", 6) != 0)
  	    {
  		prefix = 0;
  		arg += 2;
***************
*** 9757,9763 ****
  	}
  	--p;
      }
!     if (STRNCMP(p, "no", 2) == 0)
      {
  	xp->xp_context = EXPAND_BOOL_SETTINGS;
  	p += 2;
--- 9757,9763 ----
  	}
  	--p;
      }
!     if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0)
      {
  	xp->xp_context = EXPAND_BOOL_SETTINGS;
  	p += 2;
*** ../vim-7.2.207/src/version.c	2009-06-16 17:22:38.000000000 +0200
--- src/version.c	2009-06-16 17:50:33.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     208,
  /**/

-- 
Now it is such a bizarrely improbable coincidence that anything as
mind-bogglingly useful as the Babel fish could have evolved purely by chance
that some thinkers have chosen to see it as a final and clinching proof of the
NON-existence of God.
The argument goes something like this: 'I refuse to prove that I exist,' says
God, 'for proof denies faith, and without faith I am nothing.'
'But,' says Man, 'the Babel fish is a dead giveaway, isn't it?  It could not
have evolved by chance.  It proves you exist, and so therefore, by your own
arguments, you don't.  QED.'
'Oh dear,' says God, 'I hadn't thought of that,' and promptly vanishes in a
puff of logic.
'Oh, that was easy,' says Man, and for an encore goes on to prove that black
is white and gets himself killed on the next pedestrian crossing.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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    ///


--- NEW FILE 7.2.209 ---
To: vim-dev at vim.org
Subject: Patch 7.2.209
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.209
Problem:    For xxd setmode() is undefined on Cygwin.
Solution:   Include io.h. (Dominique Pelle)
Files:	    src/xxd/xxd.c


*** ../vim-7.2.208/src/xxd/xxd.c	2007-12-03 21:32:21.000000000 +0100
--- src/xxd/xxd.c	2009-06-16 18:03:14.000000000 +0200
***************
*** 64,69 ****
--- 64,72 ----
  # define _CRT_SECURE_NO_DEPRECATE
  # define _CRT_NONSTDC_NO_DEPRECATE
  #endif
+ #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
+ # define CYGWIN
+ #endif
  
  #include <stdio.h>
  #ifdef VAXC
***************
*** 77,83 ****
  #if !defined(OS2) && defined(__EMX__)
  # define OS2
  #endif
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__)
  # include <io.h>	/* for setmode() */
  #else
  # ifdef UNIX
--- 80,87 ----
  #if !defined(OS2) && defined(__EMX__)
  # define OS2
  #endif
! #if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \
!   || defined(CYGWIN)
  # include <io.h>	/* for setmode() */
  #else
  # ifdef UNIX
***************
*** 150,158 ****
  # endif
  #endif
  
- #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
- # define CYGWIN
- #endif
  #if defined(MSDOS) || defined(WIN32) || defined(OS2)
  # define BIN_READ(yes)  ((yes) ? "rb" : "rt")
  # define BIN_WRITE(yes) ((yes) ? "wb" : "wt")
--- 154,159 ----
*** ../vim-7.2.208/src/version.c	2009-06-16 17:50:56.000000000 +0200
--- src/version.c	2009-06-16 18:16:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     209,
  /**/

-- 
"So this is it," said Arthur, "we are going to die."
"Yes," said Ford, "except...no!  Wait a minute!"  He suddenly lunged across
the chamber at something behind Arthur's line of vision.  "What's this
switch?" he cried.
"What?   Where?" cried Arthur, twisting around.
"No, I was only fooling," said Ford, "we are going to die after all."
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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    ///


--- NEW FILE 7.2.210 ---
To: vim-dev at vim.org
Subject: Patch 7.2.210
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.210
Problem:    When a file that is being edited has its timestamp updated outside
	    of Vim and ":checktime" is used still get a warning when writing
	    the file. (Matt Mueller)
Solution:   Store the timestamp in b_mtime_read when the timestamp is the only
	    thing that changed.
Files:	    src/fileio.c


*** ../vim-7.2.209/src/fileio.c	2009-06-16 16:01:34.000000000 +0200
--- src/fileio.c	2009-06-20 13:29:41.000000000 +0200
***************
*** 6627,6633 ****
  			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
  			mesg2 = _("See \":help W16\" for more info.");
  		    }
! 		    /* Else: only timestamp changed, ignored */
  		}
  	    }
  	}
--- 6627,6636 ----
  			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
  			mesg2 = _("See \":help W16\" for more info.");
  		    }
! 		    else
! 			/* Only timestamp changed, store it to avoid a warning
! 			 * in check_mtime() later. */
! 			buf->b_mtime_read = buf->b_mtime;
  		}
  	    }
  	}
*** ../vim-7.2.209/src/version.c	2009-06-16 18:29:37.000000000 +0200
--- src/version.c	2009-06-24 11:57:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     210,
  /**/

-- 
Have you heard about the new Beowulf cluster? It's so fast, it executes
an infinite loop in 6 seconds.

 /// 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    ///


--- NEW FILE 7.2.211 ---
To: vim-dev at vim.org
Subject: Patch 7.2.211
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.211
Problem:    Memory leak when expanding a series of file names.
Solution:   Use ga_clear_strings() instead of ga_clear().
Files:	    src/misc1.c


*** ../vim-7.2.210/src/misc1.c	2009-05-17 13:30:58.000000000 +0200
--- src/misc1.c	2009-06-24 16:16:17.000000000 +0200
***************
*** 9193,9199 ****
  		else if (vim_strpbrk(p, (char_u *)"$~") != NULL)
  		{
  		    vim_free(p);
! 		    ga_clear(&ga);
  		    i = mch_expand_wildcards(num_pat, pat, num_file, file,
  								       flags);
  		    recursive = FALSE;
--- 9193,9199 ----
  		else if (vim_strpbrk(p, (char_u *)"$~") != NULL)
  		{
  		    vim_free(p);
! 		    ga_clear_strings(&ga);
  		    i = mch_expand_wildcards(num_pat, pat, num_file, file,
  								       flags);
  		    recursive = FALSE;
*** ../vim-7.2.210/src/version.c	2009-06-24 11:57:53.000000000 +0200
--- src/version.c	2009-06-24 16:24:32.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     211,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
34. You laugh at people with 14400 baud modems.

 /// 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    ///


--- NEW FILE 7.2.212 ---
To: vim-dev at vim.org
Subject: Patch 7.2.212 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.212 (extra)
Problem:    Warnings for redefining SIG macros.
Solution:   Don't define them if already defined. (Bjorn Winckler)
Files:	    src/os_mac.h


*** ../vim-7.2.211/src/os_mac.h	2008-06-24 22:27:34.000000000 +0200
--- src/os_mac.h	2009-06-19 21:21:57.000000000 +0200
***************
*** 268,276 ****
   */
  
  #ifdef MACOS_X_UNIX
! # define SIGPROTOARG	(int)
! # define SIGDEFARG(s)	(s) int s;
! # define SIGDUMMYARG	0
  # undef  HAVE_AVAIL_MEM
  # ifndef HAVE_CONFIG_H
  #  define RETSIGTYPE void
--- 268,282 ----
   */
  
  #ifdef MACOS_X_UNIX
! # ifndef SIGPROTOARG
! #  define SIGPROTOARG	(int)
! # endif
! # ifndef SIGDEFARG
! #  define SIGDEFARG(s)	(s) int s UNUSED;
! # endif
! # ifndef SIGDUMMYARG
! #  define SIGDUMMYARG	0
! # endif
  # undef  HAVE_AVAIL_MEM
  # ifndef HAVE_CONFIG_H
  #  define RETSIGTYPE void
*** ../vim-7.2.211/src/version.c	2009-06-24 16:25:23.000000000 +0200
--- src/version.c	2009-06-24 16:40:18.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     212,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
37. You start looking for hot HTML addresses in public restrooms.

 /// 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    ///


--- NEW FILE 7.2.213 ---
To: vim-dev at vim.org
Subject: Patch 7.2.213
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.213
Problem:    Warning for using vsprintf().
Solution:   Use vim_vsnprintf().
Files:	    src/netbeans.c


*** ../vim-7.2.212/src/netbeans.c	2009-06-16 16:57:53.000000000 +0200
--- src/netbeans.c	2009-06-24 11:26:43.000000000 +0200
***************
*** 2586,2592 ****
      va_list ap;
  
      va_start(ap, cmd);
!     vsprintf(buf, cmd, ap);
      va_end(ap);
  
      nbdebug(("    COLONCMD %s\n", buf));
--- 2586,2592 ----
      va_list ap;
  
      va_start(ap, cmd);
!     vim_vsnprintf(buf, sizeof(buf), cmd, ap, NULL);
      va_end(ap);
  
      nbdebug(("    COLONCMD %s\n", buf));
*** ../vim-7.2.212/src/version.c	2009-06-24 16:41:01.000000000 +0200
--- src/version.c	2009-06-24 16:49:06.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     213,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
38. You wake up at 3 a.m. to go to the bathroom and stop and check your e-mail
    on the way back to bed.

 /// 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    ///


--- NEW FILE 7.2.214 ---
To: vim-dev at vim.org
Subject: Patch 7.2.214
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.214
Problem:    Crash with complete function for user command. (Andy Wokula)
Solution:   Avoid using a NULL pointer (Dominique Pelle)
Files:	    src/ex_getln.c


*** ../vim-7.2.213/src/ex_getln.c	2009-05-16 17:29:37.000000000 +0200
--- src/ex_getln.c	2009-06-24 16:57:28.000000000 +0200
***************
*** 4874,4887 ****
      /* Loop over the items in the list. */
      for (li = retlist->lv_first; li != NULL; li = li->li_next)
      {
! 	if (li->li_tv.v_type != VAR_STRING)
! 	    continue;  /* Skip non-string items */
  
  	if (ga_grow(&ga, 1) == FAIL)
  	    break;
  
  	((char_u **)ga.ga_data)[ga.ga_len] =
! 	    vim_strsave(li->li_tv.vval.v_string);
  	++ga.ga_len;
      }
      list_unref(retlist);
--- 4874,4887 ----
      /* Loop over the items in the list. */
      for (li = retlist->lv_first; li != NULL; li = li->li_next)
      {
! 	if (li->li_tv.v_type != VAR_STRING || li->li_tv.vval.v_string == NULL)
! 	    continue;  /* Skip non-string items and empty strings */
  
  	if (ga_grow(&ga, 1) == FAIL)
  	    break;
  
  	((char_u **)ga.ga_data)[ga.ga_len] =
! 					 vim_strsave(li->li_tv.vval.v_string);
  	++ga.ga_len;
      }
      list_unref(retlist);
*** ../vim-7.2.213/src/version.c	2009-06-24 16:49:50.000000000 +0200
--- src/version.c	2009-06-24 17:03:58.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     214,
  /**/

-- 
He who laughs last, thinks slowest.

 /// 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    ///


--- NEW FILE 7.2.215 ---
To: vim-dev at vim.org
Subject: Patch 7.2.215
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.215
Problem:    ml_get error when using ":vimgrep".
Solution:   Load the memfile for the hidden buffer before putting it in a
	    window.  Correct the order of splitting the window and filling
	    the window and buffer with data.
Files:	    src/fileio.c, src/proto/window.pro, src/quickfix.c, src/window.c


*** ../vim-7.2.214/src/fileio.c	2009-06-24 11:57:53.000000000 +0200
--- src/fileio.c	2009-06-24 12:53:19.000000000 +0200
***************
*** 710,716 ****
  #endif
  #ifdef UNIX
  	/* Set swap file protection bits after creating it. */
! 	if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL)
  	    (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode);
  #endif
      }
--- 710,717 ----
  #endif
  #ifdef UNIX
  	/* Set swap file protection bits after creating it. */
! 	if (swap_mode > 0 && curbuf->b_ml.ml_mfp != NULL
! 			  && curbuf->b_ml.ml_mfp->mf_fname != NULL)
  	    (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode);
  #endif
      }
***************
*** 8435,8443 ****
  	 * effects, insert it in a the current tab page.
  	 * Anything related to a window (e.g., setting folds) may have
  	 * unexpected results. */
! 	curwin = aucmd_win;
! 	curwin->w_buffer = buf;
  	++buf->b_nwindows;
  
  #ifdef FEAT_WINDOWS
  	/* Split the current window, put the aucmd_win in the upper half. */
--- 8436,8444 ----
  	 * effects, insert it in a the current tab page.
  	 * Anything related to a window (e.g., setting folds) may have
  	 * unexpected results. */
! 	aucmd_win->w_buffer = buf;
  	++buf->b_nwindows;
+ 	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
  
  #ifdef FEAT_WINDOWS
  	/* Split the current window, put the aucmd_win in the upper half. */
***************
*** 8448,8459 ****
  	(void)win_comp_pos();   /* recompute window positions */
  	p_ea = save_ea;
  #endif
! 	/* set cursor and topline to safe values */
! 	curwin_init();
! #ifdef FEAT_VERTSPLIT
! 	curwin->w_wincol = 0;
! 	curwin->w_width = Columns;
! #endif
      }
      curbuf = buf;
      aco->new_curwin = curwin;
--- 8449,8455 ----
  	(void)win_comp_pos();   /* recompute window positions */
  	p_ea = save_ea;
  #endif
! 	curwin = aucmd_win;
      }
      curbuf = buf;
      aco->new_curwin = curwin;
*** ../vim-7.2.214/src/proto/window.pro	2009-06-16 16:01:34.000000000 +0200
--- src/proto/window.pro	2009-06-24 12:53:13.000000000 +0200
***************
*** 14,19 ****
--- 14,20 ----
  win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
  void close_others __ARGS((int message, int forceit));
  void curwin_init __ARGS((void));
+ void win_init_empty __ARGS((win_T *wp));
  int win_alloc_first __ARGS((void));
  void win_alloc_aucmd_win __ARGS((void));
  void win_init_size __ARGS((void));
*** ../vim-7.2.214/src/quickfix.c	2009-05-17 13:30:58.000000000 +0200
--- src/quickfix.c	2009-06-24 15:30:06.000000000 +0200
***************
*** 3411,3424 ****
      /* Init the options. */
      buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
  
!     /* set curwin/curbuf to buf and save a few things */
!     aucmd_prepbuf(&aco, newbuf);
  
!     /* Need to set the filename for autocommands. */
!     (void)setfname(curbuf, fname, NULL, FALSE);
  
-     if (ml_open(curbuf) == OK)
-     {
  	/* Create swap file now to avoid the ATTENTION message. */
  	check_need_swap(TRUE);
  
--- 3411,3425 ----
      /* Init the options. */
      buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
  
!     /* need to open the memfile before putting the buffer in a window */
!     if (ml_open(newbuf) == OK)
!     {
! 	/* set curwin/curbuf to buf and save a few things */
! 	aucmd_prepbuf(&aco, newbuf);
  
! 	/* Need to set the filename for autocommands. */
! 	(void)setfname(curbuf, fname, NULL, FALSE);
  
  	/* Create swap file now to avoid the ATTENTION message. */
  	check_need_swap(TRUE);
  
***************
*** 3441,3450 ****
  		newbuf = curbuf;
  	    }
  	}
-     }
  
!     /* restore curwin/curbuf and a few other things */
!     aucmd_restbuf(&aco);
  
      if (!buf_valid(newbuf))
  	return NULL;
--- 3442,3451 ----
  		newbuf = curbuf;
  	    }
  	}
  
! 	/* restore curwin/curbuf and a few other things */
! 	aucmd_restbuf(&aco);
!     }
  
      if (!buf_valid(newbuf))
  	return NULL;
*** ../vim-7.2.214/src/window.c	2009-06-16 16:01:34.000000000 +0200
--- src/window.c	2009-06-24 14:35:16.000000000 +0200
***************
*** 2354,2366 ****
      frame_T	*frp;
      win_T	*wp;
  
- #ifdef FEAT_FOLDING
-     clearFolding(win);
- #endif
- 
-     /* reduce the reference count to the argument list. */
-     alist_unlink(win->w_alist);
- 
      /* Remove the window and its frame from the tree of frames. */
      frp = win->w_frame;
      wp = winframe_remove(win, dirp, tp);
--- 2354,2359 ----
***************
*** 2386,2394 ****
  	tabpage_close(TRUE);
  # endif
  
-     while (firstwin != NULL)
- 	(void)win_free_mem(firstwin, &dummy, NULL);
- 
  # ifdef FEAT_AUTOCMD
      if (aucmd_win != NULL)
      {
--- 2379,2384 ----
***************
*** 2396,2401 ****
--- 2386,2394 ----
  	aucmd_win = NULL;
      }
  # endif
+ 
+     while (firstwin != NULL)
+ 	(void)win_free_mem(firstwin, &dummy, NULL);
  }
  #endif
  
***************
*** 3204,3230 ****
      void
  curwin_init()
  {
!     redraw_win_later(curwin, NOT_VALID);
!     curwin->w_lines_valid = 0;
!     curwin->w_cursor.lnum = 1;
!     curwin->w_curswant = curwin->w_cursor.col = 0;
  #ifdef FEAT_VIRTUALEDIT
!     curwin->w_cursor.coladd = 0;
  #endif
!     curwin->w_pcmark.lnum = 1;	/* pcmark not cleared but set to line 1 */
!     curwin->w_pcmark.col = 0;
!     curwin->w_prev_pcmark.lnum = 0;
!     curwin->w_prev_pcmark.col = 0;
!     curwin->w_topline = 1;
  #ifdef FEAT_DIFF
!     curwin->w_topfill = 0;
  #endif
!     curwin->w_botline = 2;
  #ifdef FEAT_FKMAP
!     if (curwin->w_p_rl)
! 	curwin->w_farsi = W_CONV + W_R_L;
      else
! 	curwin->w_farsi = W_CONV;
  #endif
  }
  
--- 3197,3230 ----
      void
  curwin_init()
  {
!     win_init_empty(curwin);
! }
! 
!     void
! win_init_empty(wp)
!     win_T *wp;
! {
!     redraw_win_later(wp, NOT_VALID);
!     wp->w_lines_valid = 0;
!     wp->w_cursor.lnum = 1;
!     wp->w_curswant = wp->w_cursor.col = 0;
  #ifdef FEAT_VIRTUALEDIT
!     wp->w_cursor.coladd = 0;
  #endif
!     wp->w_pcmark.lnum = 1;	/* pcmark not cleared but set to line 1 */
!     wp->w_pcmark.col = 0;
!     wp->w_prev_pcmark.lnum = 0;
!     wp->w_prev_pcmark.col = 0;
!     wp->w_topline = 1;
  #ifdef FEAT_DIFF
!     wp->w_topfill = 0;
  #endif
!     wp->w_botline = 2;
  #ifdef FEAT_FKMAP
!     if (wp->w_p_rl)
! 	wp->w_farsi = W_CONV + W_R_L;
      else
! 	wp->w_farsi = W_CONV;
  #endif
  }
  
***************
*** 4325,4330 ****
--- 4325,4337 ----
  {
      int		i;
  
+ #ifdef FEAT_FOLDING
+     clearFolding(wp);
+ #endif
+ 
+     /* reduce the reference count to the argument list. */
+     alist_unlink(wp->w_alist);
+ 
  #ifdef FEAT_AUTOCMD
      /* Don't execute autocommands while the window is halfway being deleted.
       * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
***************
*** 4387,4393 ****
      }
  #endif /* FEAT_GUI */
  
!     win_remove(wp, tp);
      vim_free(wp);
  
  #ifdef FEAT_AUTOCMD
--- 4394,4403 ----
      }
  #endif /* FEAT_GUI */
  
! #ifdef FEAT_AUTOCMD
!     if (wp != aucmd_win)
! #endif
! 	win_remove(wp, tp);
      vim_free(wp);
  
  #ifdef FEAT_AUTOCMD
*** ../vim-7.2.214/src/version.c	2009-06-24 17:04:40.000000000 +0200
--- src/version.c	2009-06-24 17:27:38.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     215,
  /**/

-- 
Micro$oft: where do you want to go today?
    Linux: where do you want to go tomorrow?
  FreeBSD: are you guys coming, or what?

 /// 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    ///


--- NEW FILE 7.2.216 ---
To: vim-dev at vim.org
Subject: Patch 7.2.216
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.216
Problem:    Two error messages have the same number E812.
Solution:   Give one message a different number.
Files:	    runtime/doc/autocmd.txt, runtime/doc/if_mzsch.txt, src/if_mzsch.c


*** ../vim-7.2.215/runtime/doc/autocmd.txt	2008-08-09 19:36:46.000000000 +0200
--- runtime/doc/autocmd.txt	2009-06-24 17:49:04.000000000 +0200
***************
*** 335,340 ****
--- 335,342 ----
  				NOTE: When this autocommand is executed, the
  				current buffer "%" may be different from the
  				buffer being deleted "<afile>" and "<abuf>".
+ 				Don't change to another buffer, it will cause
+ 				problems.
  							*BufEnter*
  BufEnter			After entering a buffer.  Useful for setting
  				options for a file type.  Also executed when
***************
*** 397,402 ****
--- 399,406 ----
  				NOTE: When this autocommand is executed, the
  				current buffer "%" may be different from the
  				buffer being unloaded "<afile>".
+ 				Don't change to another buffer, it will cause
+ 				problems.
  							*BufWinEnter*
  BufWinEnter			After a buffer is displayed in a window.  This
  				can be when the buffer is loaded (after
***************
*** 428,433 ****
--- 432,439 ----
  				NOTE: When this autocommand is executed, the
  				current buffer "%" may be different from the
  				buffer being deleted "<afile>".
+ 				Don't change to another buffer, it will cause
+ 				problems.
  						*BufWrite* *BufWritePre*
  BufWrite or BufWritePre		Before writing the whole buffer to a file.
  							*BufWriteCmd*
***************
*** 748,755 ****
  					'a'	abort, like hitting CTRL-C
  				When set to an empty string the user will be
  				asked, as if there was no SwapExists autocmd.
! 				Note: Do not try to change the buffer, the
! 				results are unpredictable.
  							*Syntax*
  Syntax				When the 'syntax' option has been set.  The
  				pattern is matched against the syntax name.
--- 754,763 ----
  					'a'	abort, like hitting CTRL-C
  				When set to an empty string the user will be
  				asked, as if there was no SwapExists autocmd.
! 							*E812*
! 				It is not allowed to change to another buffer,
! 				change a buffer name or change directory
! 				here.
  							*Syntax*
  Syntax				When the 'syntax' option has been set.  The
  				pattern is matched against the syntax name.
*** ../vim-7.2.215/runtime/doc/if_mzsch.txt	2009-05-26 22:58:43.000000000 +0200
--- runtime/doc/if_mzsch.txt	2009-06-24 12:08:20.000000000 +0200
***************
*** 1,4 ****
! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 May 26
  
  
  		  VIM REFERENCE MANUAL    by Sergey Khorev
--- 1,4 ----
! *if_mzsch.txt*  For Vim version 7.2.  Last change: 2009 Jun 24
  
  
  		  VIM REFERENCE MANUAL    by Sergey Khorev
***************
*** 231,237 ****
      (set-cursor (line . col) [window])  Set cursor position.
  
  ==============================================================================
! 5. Dynamic loading				    *mzscheme-dynamic* *E812*
  
  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
  output then includes |+mzscheme/dyn|.
--- 231,237 ----
      (set-cursor (line . col) [window])  Set cursor position.
  
  ==============================================================================
! 5. Dynamic loading				    *mzscheme-dynamic* *E815*
  
  On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
  output then includes |+mzscheme/dyn|.
*** ../vim-7.2.215/src/if_mzsch.c	2009-05-26 22:58:43.000000000 +0200
--- src/if_mzsch.c	2009-06-24 12:08:23.000000000 +0200
***************
*** 1040,1046 ****
  #ifdef DYNAMIC_MZSCHEME
  	if (!mzscheme_enabled(TRUE))
  	{
! 	    EMSG(_("E812: Sorry, this command is disabled, the MzScheme libraries could not be loaded."));
  	    return -1;
  	}
  #endif
--- 1040,1046 ----
  #ifdef DYNAMIC_MZSCHEME
  	if (!mzscheme_enabled(TRUE))
  	{
! 	    EMSG(_("E815: Sorry, this command is disabled, the MzScheme libraries could not be loaded."));
  	    return -1;
  	}
  #endif
*** ../vim-7.2.215/src/version.c	2009-06-24 17:31:27.000000000 +0200
--- src/version.c	2009-06-24 17:46:56.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     216,
  /**/

-- 
Everyone has a photographic memory. Some don't have film.

 /// 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    ///


--- NEW FILE 7.2.217 ---
To: vim-dev at vim.org
Subject: Patch 7.2.217
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.217
Problem:    Running tests with valgrind doesn't work as advertised.
Solution:   Fix the line in the Makefile.
Files:	    src/testdir/Makefile


*** ../vim-7.2.216/src/testdir/Makefile	2009-03-11 16:26:01.000000000 +0100
--- src/testdir/Makefile	2009-06-24 14:59:42.000000000 +0200
***************
*** 4,12 ****
  
  VIMPROG = ../vim
  
! # 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 \
--- 4,14 ----
  
  VIMPROG = ../vim
  
! # Uncomment this line to use valgrind for memory leaks and extra warnings.
! #   The output goes into a file "valgrind.testN"
! #   Vim should be compiled with EXITFREE to avoid false warnings.
! #   This will make testing about 10 times as slow.
! # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --log-file=valgrind.$*
  
  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
  		test7.out test8.out test9.out test10.out test11.out \
*** ../vim-7.2.216/src/version.c	2009-06-24 17:51:01.000000000 +0200
--- src/version.c	2009-06-24 18:07:07.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     217,
  /**/

-- 
A day without sunshine is like, well, night.

 /// 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    ///


--- NEW FILE 7.2.218 ---
To: vim-dev at vim.org
Subject: Patch 7.2.218
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.218
Problem:    Cannot build GTK with hangul_input feature. (Dominique Pelle)
Solution:   Adjuste #ifdef.  (SungHyun Nam)
Files:	    src/gui.c


*** ../vim-7.2.217/src/gui.c	2009-06-16 16:01:34.000000000 +0200
--- src/gui.c	2009-06-24 17:45:01.000000000 +0200
***************
*** 959,965 ****
  		guicolor_T fg, bg;
  
  		if (
! # ifdef HAVE_GTK2
  			preedit_get_status()
  # else
  			im_get_status()
--- 959,965 ----
  		guicolor_T fg, bg;
  
  		if (
! # if defined(HAVE_GTK2) && !defined(FEAT_HANGULIN)
  			preedit_get_status()
  # else
  			im_get_status()
*** ../vim-7.2.217/src/version.c	2009-06-24 18:07:55.000000000 +0200
--- src/version.c	2009-06-24 18:31:06.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     218,
  /**/

-- 
The users that I support would double-click on a landmine to find out
what happens.				-- A system administrator

 /// 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    ///


--- NEW FILE 7.2.219 ---
To: vim-dev at vim.org
Subject: Patch 7.2.219 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.219 (extra)
Problem:    Photon GUI is outdated.
Solution:   Updates for QNX 6.4.0. (Sean Boudreau)
Files:	    src/gui_photon.c


*** ../vim-7.2.218/src/gui_photon.c	2007-05-10 20:23:35.000000000 +0200
--- src/gui_photon.c	2009-07-01 16:08:36.000000000 +0200
***************
*** 838,844 ****
--- 838,849 ----
      static void
  gui_ph_draw_start( void )
  {
+     PhGC_t *gc;
+ 
+     gc = PgGetGC();
      PgSetRegion( PtWidgetRid( PtFindDisjoint( gui.vimTextArea ) ) );
+     PgClearClippingsCx( gc );
+     PgClearTranslationCx( gc );
  
      PtWidgetOffset( gui.vimTextArea, &gui_ph_raw_offset );
      PhTranslatePoint( &gui_ph_raw_offset, PtWidgetPos( gui.vimTextArea, NULL ) );
***************
*** 2970,2976 ****
      if( vim_font_name == NULL )
      {
  	/* Default font */
! 	vim_font_name = "PC Term";
      }
  
      if( STRCMP( vim_font_name, "*" ) == 0 )
--- 2975,2981 ----
      if( vim_font_name == NULL )
      {
  	/* Default font */
! 	vim_font_name = "PC Terminal";
      }
  
      if( STRCMP( vim_font_name, "*" ) == 0 )
*** ../vim-7.2.218/src/version.c	2009-06-24 18:31:36.000000000 +0200
--- src/version.c	2009-07-01 16:11:34.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     219,
  /**/

-- 
"Oh, no!  NOT the Spanish Inquisition!"
"NOBODY expects the Spanish Inquisition!!!"
				-- Monty Python sketch --
"Oh, no!  NOT another option!"
"EVERYBODY expects another option!!!"
				-- Discussion in vim-dev mailing list --

 /// 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    ///


--- NEW FILE 7.2.220 ---
To: vim-dev at vim.org
Subject: Patch 7.2.220
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.220 (after 7.2.215)
Problem:    a BufEnter autocommand that changes directory causes problems.
	    (Ajit Thakkar)
Solution:   Disable autocommands when opening a hidden buffer in a window.
Files:	    src/fileio.c


*** ../vim-7.2.219/src/fileio.c	2009-06-24 17:31:27.000000000 +0200
--- src/fileio.c	2009-07-01 17:02:46.000000000 +0200
***************
*** 8441,8453 ****
  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
  
  #ifdef FEAT_WINDOWS
! 	/* Split the current window, put the aucmd_win in the upper half. */
  	make_snapshot(SNAP_AUCMD_IDX);
  	save_ea = p_ea;
  	p_ea = FALSE;
  	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
  	(void)win_comp_pos();   /* recompute window positions */
  	p_ea = save_ea;
  #endif
  	curwin = aucmd_win;
      }
--- 8441,8456 ----
  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
  
  #ifdef FEAT_WINDOWS
! 	/* Split the current window, put the aucmd_win in the upper half.
! 	 * We don't want the BufEnter or WinEnter autocommands. */
! 	block_autocmds();
  	make_snapshot(SNAP_AUCMD_IDX);
  	save_ea = p_ea;
  	p_ea = FALSE;
  	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
  	(void)win_comp_pos();   /* recompute window positions */
  	p_ea = save_ea;
+ 	unblock_autocmds();
  #endif
  	curwin = aucmd_win;
      }
***************
*** 8474,8480 ****
  	--curbuf->b_nwindows;
  #ifdef FEAT_WINDOWS
  	/* Find "aucmd_win", it can't be closed, but it may be in another tab
! 	 * page. */
  	if (curwin != aucmd_win)
  	{
  	    tabpage_T	*tp;
--- 8477,8484 ----
  	--curbuf->b_nwindows;
  #ifdef FEAT_WINDOWS
  	/* Find "aucmd_win", it can't be closed, but it may be in another tab
! 	 * page. Do not trigger autocommands here. */
! 	block_autocmds();
  	if (curwin != aucmd_win)
  	{
  	    tabpage_T	*tp;
***************
*** 8498,8503 ****
--- 8502,8508 ----
  	last_status(FALSE);	    /* may need to remove last status line */
  	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
  	(void)win_comp_pos();   /* recompute window positions */
+ 	unblock_autocmds();
  
  	if (win_valid(aco->save_curwin))
  	    curwin = aco->save_curwin;
*** ../vim-7.2.219/src/version.c	2009-07-01 16:12:54.000000000 +0200
--- src/version.c	2009-07-01 17:10:22.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     220,
  /**/

-- 
Microsoft is to software what McDonalds is to gourmet cooking

 /// 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    ///


--- NEW FILE 7.2.221 ---
To: vim-dev at vim.org
Subject: Patch 7.2.221
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.221
Problem:    X cut_buffer0 text is used as-is, it may be in the wrong encoding.
Solution:   Convert between 'enc' and latin1. (James Vega)
Files:	    src/gui_gtk_x11.c, src/message.c, src/ops.c, src/proto/ui.pro,
	    src/ui.c


*** ../vim-7.2.220/src/gui_gtk_x11.c	2009-06-16 15:23:07.000000000 +0200
--- src/gui_gtk_x11.c	2009-07-01 11:55:34.000000000 +0200
***************
*** 6717,6724 ****
  {
      GdkAtom	target;
      unsigned	i;
-     int		nbytes;
-     char_u	*buffer;
      time_t	start;
  
      for (i = 0; i < N_SELECTION_TARGETS; ++i)
--- 6717,6722 ----
***************
*** 6746,6767 ****
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
!     nbytes = 0;
!     buffer = (char_u *)XFetchBuffer(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
! 				    &nbytes, 0);
!     if (nbytes > 0)
!     {
! 	/* Got something */
! 	clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
! 	if (p_verbose > 0)
! 	{
! 	    verbose_enter();
! 	    smsg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
! 	    verbose_leave();
! 	}
!     }
!     if (buffer != NULL)
! 	XFree(buffer);
  }
  
  /*
--- 6744,6750 ----
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
!     yank_cut_buffer0(GDK_WINDOW_XDISPLAY(gui.mainwin->window), cbd);
  }
  
  /*
*** ../vim-7.2.220/src/message.c	2009-05-17 13:30:58.000000000 +0200
--- src/message.c	2009-07-01 16:43:08.000000000 +0200
***************
*** 107,113 ****
  }
  
  #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \
!     || defined(PROTO)
  /*
   * Like msg() but keep it silent when 'verbosefile' is set.
   */
--- 107,113 ----
  }
  
  #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \
!     || defined(FEAT_GUI_GTK) || defined(PROTO)
  /*
   * Like msg() but keep it silent when 'verbosefile' is set.
   */
*** ../vim-7.2.220/src/ops.c	2009-05-26 18:12:13.000000000 +0200
--- src/ops.c	2009-07-01 12:15:31.000000000 +0200
***************
*** 5591,5596 ****
--- 5591,5619 ----
      if (dpy != NULL && str != NULL && motion_type >= 0
  					       && len < 1024*1024 && len > 0)
      {
+ #ifdef FEAT_MBYTE
+ 	/* The CUT_BUFFER0 is supposed to always contain latin1.  Convert from
+ 	 * 'enc' when it is a multi-byte encoding.  When 'enc' is an 8-bit
+ 	 * encoding conversion usually doesn't work, so keep the text as-is.
+ 	 */
+ 	if (has_mbyte)
+ 	{
+ 	    char_u	*conv_str = str;
+ 	    vimconv_T	vc;
+ 
+ 	    vc.vc_type = CONV_NONE;
+ 	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
+ 	    {
+ 		conv_str = string_convert(&vc, str, (int*)&len);
+ 		if (conv_str != NULL)
+ 		{
+ 		    vim_free(str);
+ 		    str = conv_str;
+ 		}
+ 		convert_setup(&vc, NULL, NULL);
+ 	    }
+ 	}
+ #endif
  	XStoreBuffer(dpy, (char *)str, (int)len, 0);
  	XFlush(dpy);
      }
*** ../vim-7.2.220/src/proto/ui.pro	2007-05-05 19:58:49.000000000 +0200
--- src/proto/ui.pro	2009-07-01 11:48:11.000000000 +0200
***************
*** 48,53 ****
--- 48,54 ----
  void open_app_context __ARGS((void));
  void x11_setup_atoms __ARGS((Display *dpy));
  void clip_x11_request_selection __ARGS((Widget myShell, Display *dpy, VimClipboard *cbd));
+ void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd));
  void clip_x11_lose_selection __ARGS((Widget myShell, VimClipboard *cbd));
  int clip_x11_own_selection __ARGS((Widget myShell, VimClipboard *cbd));
  void clip_x11_set_selection __ARGS((VimClipboard *cbd));
*** ../vim-7.2.220/src/ui.c	2009-05-17 13:30:58.000000000 +0200
--- src/ui.c	2009-07-01 15:44:07.000000000 +0200
***************
*** 2104,2111 ****
      Atom	type;
      static int	success;
      int		i;
-     int		nbytes = 0;
-     char_u	*buffer;
      time_t	start_time;
      int		timed_out = FALSE;
  
--- 2104,2109 ----
***************
*** 2185,2199 ****
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
!     buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0);
!     if (nbytes > 0)
!     {
! 	/* Got something */
! 	clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
! 	XFree((void *)buffer);
! 	if (p_verbose > 0)
! 	    verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
!     }
  }
  
  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
--- 2183,2189 ----
      }
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
!     yank_cut_buffer0(dpy, cbd);
  }
  
  static Boolean	clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
***************
*** 2369,2374 ****
--- 2359,2418 ----
  }
  #endif
  
+ #if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11) \
+     || defined(FEAT_GUI_GTK) || defined(PROTO)
+ /*
+  * Get the contents of the X CUT_BUFFER0 and put it in "cbd".
+  */
+     void
+ yank_cut_buffer0(dpy, cbd)
+     Display		*dpy;
+     VimClipboard	*cbd;
+ {
+     int		nbytes = 0;
+     char_u	*buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0);
+ 
+     if (nbytes > 0)
+     {
+ #ifdef FEAT_MBYTE
+ 	int  done = FALSE;
+ 
+ 	/* CUT_BUFFER0 is supposed to be always latin1.  Convert to 'enc' when
+ 	 * using a multi-byte encoding.  Conversion between two 8-bit
+ 	 * character sets usually fails and the text might actually be in
+ 	 * 'enc' anyway. */
+ 	if (has_mbyte)
+ 	{
+ 	    char_u	*conv_buf = buffer;
+ 	    vimconv_T	vc;
+ 
+ 	    vc.vc_type = CONV_NONE;
+ 	    if (convert_setup(&vc, (char_u *)"latin1", p_enc) == OK)
+ 	    {
+ 		conv_buf = string_convert(&vc, buffer, &nbytes);
+ 		if (conv_buf != NULL)
+ 		{
+ 		    clip_yank_selection(MCHAR, conv_buf, (long)nbytes, cbd);
+ 		    vim_free(conv_buf);
+ 		    done = TRUE;
+ 		}
+ 		convert_setup(&vc, NULL, NULL);
+ 	    }
+ 	}
+ 	if (!done)  /* use the text without conversion */
+ #endif
+ 	    clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
+ 	XFree((void *)buffer);
+ 	if (p_verbose > 0)
+ 	{
+ 	    verbose_enter();
+ 	    verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
+ 	    verbose_leave();
+ 	}
+     }
+ }
+ #endif
+ 
  #if defined(FEAT_MOUSE) || defined(PROTO)
  
  /*
*** ../vim-7.2.220/src/version.c	2009-07-01 17:11:40.000000000 +0200
--- src/version.c	2009-07-01 17:56:02.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     221,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
40. You tell the cab driver you live at
    http://123.elm.street/house/bluetrim.html
41. You actually try that 123.elm.street address.

 /// 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    ///


--- NEW FILE 7.2.222 ---
To: vim-dev at vim.org
Subject: Patch 7.2.222
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.222
Problem:   ":mksession" doesn't work properly with 'acd' set. 
Solution:   Make it work. (Yakov Lerner)
Files:	    src/ex_docmd.c


*** ../vim-7.2.221/src/ex_docmd.c	2009-05-16 17:29:37.000000000 +0200
--- src/ex_docmd.c	2009-07-01 20:18:22.000000000 +0200
***************
*** 8686,8691 ****
--- 8693,8700 ----
      }
  
  #ifdef FEAT_SESSION
+     /* Use the short file name until ":lcd" is used.  We also don't use the
+      * short file name when 'acd' is set, that is checked later. */
      did_lcd = FALSE;
  
      /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */
***************
*** 10573,10578 ****
--- 10582,10590 ----
      if (buf->b_sfname != NULL
  	    && flagp == &ssop_flags
  	    && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
+ #ifdef FEAT_AUTOCHDIR
+ 	    && !p_acd
+ #endif
  	    && !did_lcd)
  	name = buf->b_sfname;
      else
*** ../vim-7.2.221/src/version.c	2009-07-01 18:04:30.000000000 +0200
--- src/version.c	2009-07-01 20:16:19.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     222,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
43. You tell the kids they can't use the computer because "Daddy's got work to
    do" and you don't even have a job.

 /// 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    ///


--- NEW FILE 7.2.223 ---
To: vim-dev at vim.org
Subject: Patch 7.2.223
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.223
Problem:    When a script is run with ":silent" it is not able to give warning
	    messages.
Solution:   Add the ":unsilent" command.
Files:	    runtime/doc/various.txt, src/ex_cmds.h, src/ex_docmd.c


*** ../vim-7.2.222/runtime/doc/various.txt	2008-08-09 19:36:54.000000000 +0200
--- runtime/doc/various.txt	2009-07-09 15:52:54.000000000 +0200
***************
*** 508,513 ****
--- 508,524 ----
  			messages though.  Use ":silent" in the command itself
  			to avoid that: ":silent menu .... :silent command".
  
+ 						*:uns* *:unsilent*
+ :uns[ilent] {command}	Execute {command} not silently.  Only makes a
+ 			difference when |:silent| was used to get to this
+ 			command.
+ 			Use this for giving a message even when |:silent| was
+ 			used.  In this example |:silent| is used to avoid the
+ 			message about reading the file and |:unsilent| to be
+ 			able to list the first line of each file. >
+     		:silent argdo unsilent echo expand('%') . ": " . getline(1)
+ <
+ 
  						*:verb* *:verbose*
  :[count]verb[ose] {command}
  			Execute {command} with 'verbose' set to [count].  If
*** ../vim-7.2.222/src/ex_cmds.h	2008-11-09 13:43:25.000000000 +0100
--- src/ex_cmds.h	2009-07-01 18:12:55.000000000 +0200
***************
*** 991,996 ****
--- 991,998 ----
  			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
  EX(CMD_unmenu,		"unmenu",	ex_menu,
  			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_unsilent,	"unsilent",	ex_wrongmodifier,
+ 			NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
  EX(CMD_update,		"update",	ex_update,
  			RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR),
  EX(CMD_vglobal,		"vglobal",	ex_global,
*** ../vim-7.2.222/src/ex_docmd.c	2009-07-01 20:18:43.000000000 +0200
--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
***************
*** 1677,1684 ****
      char_u		*errormsg = NULL;	/* error message */
      exarg_T		ea;			/* Ex command arguments */
      long		verbose_save = -1;
!     int			save_msg_scroll = 0;
!     int			did_silent = 0;
      int			did_esilent = 0;
  #ifdef HAVE_SANDBOX
      int			did_sandbox = FALSE;
--- 1677,1684 ----
      char_u		*errormsg = NULL;	/* error message */
      exarg_T		ea;			/* Ex command arguments */
      long		verbose_save = -1;
!     int			save_msg_scroll = msg_scroll;
!     int			save_msg_silent = -1;
      int			did_esilent = 0;
  #ifdef HAVE_SANDBOX
      int			did_sandbox = FALSE;
***************
*** 1856,1864 ****
  			}
  			if (!checkforcmd(&ea.cmd, "silent", 3))
  			    break;
! 			++did_silent;
  			++msg_silent;
- 			save_msg_scroll = msg_scroll;
  			if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1]))
  			{
  			    /* ":silent!", but not "silent !cmd" */
--- 1856,1864 ----
  			}
  			if (!checkforcmd(&ea.cmd, "silent", 3))
  			    break;
! 			if (save_msg_silent == -1)
! 			    save_msg_silent = msg_silent;
  			++msg_silent;
  			if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1]))
  			{
  			    /* ":silent!", but not "silent !cmd" */
***************
*** 1886,1891 ****
--- 1886,1898 ----
  #endif
  			continue;
  
+ 	    case 'u':	if (!checkforcmd(&ea.cmd, "unsilent", 3))
+ 			    break;
+ 			if (save_msg_silent == -1)
+ 			    save_msg_silent = msg_silent;
+ 			msg_silent = 0;
+ 			continue;
+ 
  	    case 'v':	if (checkforcmd(&ea.cmd, "vertical", 4))
  			{
  #ifdef FEAT_VERTSPLIT
***************
*** 2684,2696 ****
  
      cmdmod = save_cmdmod;
  
!     if (did_silent > 0)
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	msg_silent -= did_silent;
! 	if (msg_silent < 0)
! 	    msg_silent = 0;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
  	    emsg_silent = 0;
--- 2691,2702 ----
  
      cmdmod = save_cmdmod;
  
!     if (save_msg_silent != -1)
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	if (!did_emsg)
! 	    msg_silent = save_msg_silent;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
  	    emsg_silent = 0;
***************
*** 2987,2992 ****
--- 2993,2999 ----
      {"silent", 3, FALSE},
      {"tab", 3, TRUE},
      {"topleft", 2, FALSE},
+     {"unsilent", 3, FALSE},
      {"verbose", 4, TRUE},
      {"vertical", 4, FALSE},
  };
*** ../vim-7.2.222/src/version.c	2009-07-01 20:18:43.000000000 +0200
--- src/version.c	2009-07-09 15:53:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     223,
  /**/

-- 
Q: How many legs does a giraffe have?
A: Eight: two in front, two behind, two on the left and two on the right

 /// 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    ///


--- NEW FILE 7.2.224 ---
To: vim-dev at vim.org
Subject: Patch 7.2.224
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.224
Problem:    Crash when using 'completefunc'. (Ingo Karkat)
Solution:   Disallow entering edit() recursively when doing completion.
Files:	    src/edit.c


*** ../vim-7.2.223/src/edit.c	2009-05-26 11:01:43.000000000 +0200
--- src/edit.c	2009-07-09 18:01:49.000000000 +0200
***************
*** 114,119 ****
--- 114,123 ----
   * FALSE the word to be completed must be located. */
  static int	  compl_started = FALSE;
  
+ /* Set when doing something for completion that may call edit() recursively,
+  * which is not allowed. */
+ static int	  compl_busy = FALSE;
+ 
  static int	  compl_matches = 0;
  static char_u	  *compl_pattern = NULL;
  static int	  compl_direction = FORWARD;
***************
*** 346,352 ****
  
  #ifdef FEAT_INS_EXPAND
      /* Don't allow recursive insert mode when busy with completion. */
!     if (compl_started || pum_visible())
      {
  	EMSG(_(e_secure));
  	return FALSE;
--- 350,356 ----
  
  #ifdef FEAT_INS_EXPAND
      /* Don't allow recursive insert mode when busy with completion. */
!     if (compl_started || compl_busy || pum_visible())
      {
  	EMSG(_(e_secure));
  	return FALSE;
***************
*** 1340,1347 ****
--- 1344,1353 ----
  		goto normalchar;
  
  docomplete:
+ 	    compl_busy = TRUE;
  	    if (ins_complete(c) == FAIL)
  		compl_cont_status = 0;
+ 	    compl_busy = FALSE;
  	    break;
  #endif /* FEAT_INS_EXPAND */
  
***************
*** 3172,3177 ****
--- 3178,3184 ----
  	vim_free(match);
      } while (compl_curr_match != NULL && compl_curr_match != compl_first_match);
      compl_first_match = compl_curr_match = NULL;
+     compl_shown_match = NULL;
  }
  
      static void
*** ../vim-7.2.223/src/version.c	2009-07-09 15:55:34.000000000 +0200
--- src/version.c	2009-07-09 18:14:16.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     224,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
77. The phone company asks you to test drive their new PBX system

 /// 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    ///


--- NEW FILE 7.2.225 ---
To: vim-dev at vim.org
Subject: Patch 7.2.225
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.225
Problem:    When using ":normal" a saved character may be executed.
Solution:   Also store old_char when saving typeahead.
Files:	    src/getchar.c, src/structs.h


*** ../vim-7.2.224/src/getchar.c	2009-02-22 23:42:08.000000000 +0100
--- src/getchar.c	2009-07-09 18:09:13.000000000 +0200
***************
*** 1309,1314 ****
--- 1309,1317 ----
      return OK;
  }
  
+ static int old_char = -1;	/* character put back by vungetc() */
+ static int old_mod_mask;	/* mod_mask for ungotten character */
+ 
  #if defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) || defined(PROTO)
  
  /*
***************
*** 1323,1328 ****
--- 1326,1335 ----
      if (!tp->typebuf_valid)
  	typebuf = tp->save_typebuf;
  
+     tp->old_char = old_char;
+     tp->old_mod_mask = old_mod_mask;
+     old_char = -1;
+ 
      tp->save_stuffbuff = stuffbuff;
      stuffbuff.bh_first.b_next = NULL;
  # ifdef USE_INPUT_BUF
***************
*** 1344,1349 ****
--- 1351,1359 ----
  	typebuf = tp->save_typebuf;
      }
  
+     old_char = tp->old_char;
+     old_mod_mask = tp->old_mod_mask;
+ 
      free_buff(&stuffbuff);
      stuffbuff = tp->save_stuffbuff;
  # ifdef USE_INPUT_BUF
***************
*** 1499,1507 ****
  #define KL_PART_KEY -1		/* keylen value for incomplete key-code */
  #define KL_PART_MAP -2		/* keylen value for incomplete mapping */
  
- static int old_char = -1;	/* character put back by vungetc() */
- static int old_mod_mask;	/* mod_mask for ungotten character */
- 
  /*
   * Get the next input character.
   * Can return a special key or a multi-byte character.
--- 1509,1514 ----
*** ../vim-7.2.224/src/structs.h	2009-06-16 16:01:34.000000000 +0200
--- src/structs.h	2009-07-09 18:09:20.000000000 +0200
***************
*** 882,887 ****
--- 882,889 ----
  {
      typebuf_T		save_typebuf;
      int			typebuf_valid;	    /* TRUE when save_typebuf valid */
+     int			old_char;
+     int			old_mod_mask;
      struct buffheader	save_stuffbuff;
  #ifdef USE_INPUT_BUF
      char_u		*save_inputbuf;
*** ../vim-7.2.224/src/version.c	2009-07-09 18:15:19.000000000 +0200
--- src/version.c	2009-07-09 18:21:56.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     225,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
78. You find yourself dialing IP numbers on the phone.

 /// 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    ///


--- NEW FILE 7.2.226 ---
To: vim-dev at vim.org
Subject: Patch 7.2.226
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.226
Problem:    ml_get error after deleting the last line. (Xavier de Gaye)
Solution:   When adjusting marks a callback may be invoked.  Adjust the cursor
	    position before invoking deleted_lines_mark().
Files:	    src/ex_cmds.c, src/ex_docmd.c, src/if_mzsch.c, src/if_python.c,
	    src/if_perl.xs, src/misc1.c


*** ../vim-7.2.225/src/ex_cmds.c	2009-05-17 13:30:58.000000000 +0200
--- src/ex_cmds.c	2009-07-09 12:56:51.000000000 +0200
***************
*** 4013,4018 ****
--- 4013,4021 ----
  	    break;
  	ml_delete(eap->line1, FALSE);
      }
+ 
+     /* make sure the cursor is not beyond the end of the file now */
+     check_cursor_lnum();
      deleted_lines_mark(eap->line1, (long)(eap->line2 - lnum));
  
      /* ":append" on the line above the deleted lines. */
*** ../vim-7.2.225/src/ex_docmd.c	2009-07-09 15:55:34.000000000 +0200
--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
***************
*** 7845,7854 ****
  		if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK)
  		{
  		    ml_delete(lnum, FALSE);
- 		    deleted_lines_mark(lnum, 1L);
  		    if (curwin->w_cursor.lnum > 1
  					     && curwin->w_cursor.lnum >= lnum)
  			--curwin->w_cursor.lnum;
  		}
  	    }
  	    redraw_curbuf_later(VALID);
--- 7845,7854 ----
  		if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK)
  		{
  		    ml_delete(lnum, FALSE);
  		    if (curwin->w_cursor.lnum > 1
  					     && curwin->w_cursor.lnum >= lnum)
  			--curwin->w_cursor.lnum;
+ 		    deleted_lines_mark(lnum, 1L);
  		}
  	    }
  	    redraw_curbuf_later(VALID);
*** ../vim-7.2.225/src/if_mzsch.c	2009-06-24 17:51:01.000000000 +0200
--- src/if_mzsch.c	2009-07-09 12:59:17.000000000 +0200
***************
*** 2169,2177 ****
  	    curbuf = savebuf;
  	    raise_vim_exn(_("cannot delete line"));
  	}
- 	deleted_lines_mark((linenr_T)n, 1L);
  	if (buf->buf == curwin->w_buffer)
  	    mz_fix_cursor(n, n + 1, -1);
  
  	curbuf = savebuf;
  
--- 2169,2177 ----
  	    curbuf = savebuf;
  	    raise_vim_exn(_("cannot delete line"));
  	}
  	if (buf->buf == curwin->w_buffer)
  	    mz_fix_cursor(n, n + 1, -1);
+ 	deleted_lines_mark((linenr_T)n, 1L);
  
  	curbuf = savebuf;
  
***************
*** 2299,2307 ****
  		    curbuf = savebuf;
  		    raise_vim_exn(_("cannot delete line"));
  		}
- 	    deleted_lines_mark((linenr_T)lo, (long)old_len);
  	    if (buf->buf == curwin->w_buffer)
  		mz_fix_cursor(lo, hi, -old_len);
  	}
  
  	curbuf = savebuf;
--- 2299,2307 ----
  		    curbuf = savebuf;
  		    raise_vim_exn(_("cannot delete line"));
  		}
  	    if (buf->buf == curwin->w_buffer)
  		mz_fix_cursor(lo, hi, -old_len);
+ 	    deleted_lines_mark((linenr_T)lo, (long)old_len);
  	}
  
  	curbuf = savebuf;
*** ../vim-7.2.225/src/if_python.c	2009-05-21 23:25:38.000000000 +0200
--- src/if_python.c	2009-07-09 12:59:45.000000000 +0200
***************
*** 2497,2505 ****
  	    PyErr_SetVim(_("cannot delete line"));
  	else
  	{
- 	    deleted_lines_mark((linenr_T)n, 1L);
  	    if (buf == curwin->w_buffer)
  		py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
  	}
  
  	curbuf = savebuf;
--- 2497,2505 ----
  	    PyErr_SetVim(_("cannot delete line"));
  	else
  	{
  	    if (buf == curwin->w_buffer)
  		py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
+ 	    deleted_lines_mark((linenr_T)n, 1L);
  	}
  
  	curbuf = savebuf;
***************
*** 2596,2605 ****
  		    break;
  		}
  	    }
- 	    deleted_lines_mark((linenr_T)lo, (long)i);
- 
  	    if (buf == curwin->w_buffer)
  		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
  	}
  
  	curbuf = savebuf;
--- 2596,2604 ----
  		    break;
  		}
  	    }
  	    if (buf == curwin->w_buffer)
  		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
+ 	    deleted_lines_mark((linenr_T)lo, (long)i);
  	}
  
  	curbuf = savebuf;
*** ../vim-7.2.225/src/if_perl.xs	2009-06-16 16:01:34.000000000 +0200
--- src/if_perl.xs	2009-07-09 13:02:16.000000000 +0200
***************
*** 1233,1241 ****
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
  			deleted_lines_mark(lnum, 1L);
- 			if (aco.save_curbuf == curbuf)
- 			    check_cursor();
  		    }
  
  		    /* restore curwin/curbuf and a few other things */
--- 1235,1242 ----
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
+ 			check_cursor();
  			deleted_lines_mark(lnum, 1L);
  		    }
  
  		    /* restore curwin/curbuf and a few other things */
*** ../vim-7.2.225/src/misc1.c	2009-06-24 16:25:23.000000000 +0200
--- src/misc1.c	2009-07-09 13:00:59.000000000 +0200
***************
*** 2345,2356 ****
      int		undo;		/* if TRUE, prepare for undo */
  {
      long	n;
  
      if (nlines <= 0)
  	return;
  
      /* save the deleted lines for undo */
!     if (undo && u_savedel(curwin->w_cursor.lnum, nlines) == FAIL)
  	return;
  
      for (n = 0; n < nlines; )
--- 2345,2357 ----
      int		undo;		/* if TRUE, prepare for undo */
  {
      long	n;
+     linenr_T	first = curwin->w_cursor.lnum;
  
      if (nlines <= 0)
  	return;
  
      /* save the deleted lines for undo */
!     if (undo && u_savedel(first, nlines) == FAIL)
  	return;
  
      for (n = 0; n < nlines; )
***************
*** 2358,2375 ****
  	if (curbuf->b_ml.ml_flags & ML_EMPTY)	    /* nothing to delete */
  	    break;
  
! 	ml_delete(curwin->w_cursor.lnum, TRUE);
  	++n;
  
  	/* If we delete the last line in the file, stop */
! 	if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
  	    break;
      }
-     /* adjust marks, mark the buffer as changed and prepare for displaying */
-     deleted_lines_mark(curwin->w_cursor.lnum, n);
  
      curwin->w_cursor.col = 0;
      check_cursor_lnum();
  }
  
      int
--- 2359,2379 ----
  	if (curbuf->b_ml.ml_flags & ML_EMPTY)	    /* nothing to delete */
  	    break;
  
! 	ml_delete(first, TRUE);
  	++n;
  
  	/* If we delete the last line in the file, stop */
! 	if (first > curbuf->b_ml.ml_line_count)
  	    break;
      }
  
+     /* Correct the cursor position before calling deleted_lines_mark(), it may
+      * trigger a callback to display the cursor. */
      curwin->w_cursor.col = 0;
      check_cursor_lnum();
+ 
+     /* adjust marks, mark the buffer as changed and prepare for displaying */
+     deleted_lines_mark(first, n);
  }
  
      int
***************
*** 2621,2626 ****
--- 2625,2632 ----
  
  /*
   * Like deleted_lines(), but adjust marks first.
+  * Make sure the cursor is on a valid line before calling, a GUI callback may
+  * be triggered to display the cursor.
   */
      void
  deleted_lines_mark(lnum, count)
*** ../vim-7.2.225/src/version.c	2009-07-09 18:24:24.000000000 +0200
--- src/version.c	2009-07-09 20:01:16.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     226,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
80. At parties, you introduce your spouse as your "service provider."

 /// 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    ///


--- NEW FILE 7.2.227 ---
To: vim-dev at vim.org
Subject: Patch 7.2.227
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.227
Problem:    When using ":cd" in a script there is no way to track this.
Solution:   Display the directory when 'verbose' is 5 or higher.
Files:	    src/ex_docmd.c


*** ../vim-7.2.226/src/ex_docmd.c	2009-07-09 20:06:30.000000000 +0200
--- src/ex_docmd.c	2009-07-09 15:24:03.000000000 +0200
***************
*** 7964,7970 ****
  	    shorten_fnames(TRUE);
  
  	    /* Echo the new current directory if the command was typed. */
! 	    if (KeyTyped)
  		ex_pwd(eap);
  	}
  	vim_free(tofree);
--- 7964,7970 ----
  	    shorten_fnames(TRUE);
  
  	    /* Echo the new current directory if the command was typed. */
! 	    if (KeyTyped || p_verbose >= 5)
  		ex_pwd(eap);
  	}
  	vim_free(tofree);
*** ../vim-7.2.226/src/version.c	2009-07-09 20:06:30.000000000 +0200
--- src/version.c	2009-07-09 20:13:13.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     227,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
83. Batteries in the TV remote now last for months.

 /// 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    ///


--- NEW FILE 7.2.228 ---
To: vim-dev at vim.org
Subject: Patch 7.2.228
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.228
Problem:    Cscope is limited to 8 connections.
Solution:   Allocated the connection array to handle any number of
	    connections. (Dominique Pelle)
Files:	    runtime/doc/if_cscop.txt, src/if_cscope.h, src/if_cscope.c


*** ../vim-7.2.227/runtime/doc/if_cscop.txt	2009-03-18 14:30:46.000000000 +0100
--- runtime/doc/if_cscop.txt	2009-07-09 15:40:48.000000000 +0200
***************
*** 355,367 ****
  The DJGPP-built version from http://cscope.sourceforge.net is known to not
  work with Vim.
  
! There are a couple of hard-coded limitations:
! 
!     1. The maximum number of cscope connections allowed is 8.  Do you
!     really need more?
! 
!     2. Doing a |:tjump| when |:cstag| searches the tag files is not
!     configurable (e.g., you can't do a tselect instead).
  
  ==============================================================================
  6. Suggested usage					*cscope-suggestions*
--- 355,362 ----
  The DJGPP-built version from http://cscope.sourceforge.net is known to not
  work with Vim.
  
! Hard-coded limitation: doing a |:tjump| when |:cstag| searches the tag files
! is not configurable (e.g., you can't do a tselect instead).
  
  ==============================================================================
  6. Suggested usage					*cscope-suggestions*
*** ../vim-7.2.227/src/if_cscope.h	2008-08-25 04:35:13.000000000 +0200
--- src/if_cscope.h	2009-07-09 15:39:32.000000000 +0200
***************
*** 25,31 ****
  
  #define CSCOPE_SUCCESS		0
  #define CSCOPE_FAILURE		-1
- #define CSCOPE_MAX_CONNECTIONS	8   /* you actually need more? */
  
  #define	CSCOPE_DBFILE		"cscope.out"
  #define	CSCOPE_PROMPT		">> "
--- 25,30 ----
*** ../vim-7.2.227/src/if_cscope.c	2009-05-16 17:29:37.000000000 +0200
--- src/if_cscope.c	2009-07-09 15:39:32.000000000 +0200
***************
*** 46,52 ****
  static int	    cs_find __ARGS((exarg_T *eap));
  static int	    cs_find_common __ARGS((char *opt, char *pat, int, int, int));
  static int	    cs_help __ARGS((exarg_T *eap));
- static void	    cs_init __ARGS((void));
  static void	    clear_csinfo __ARGS((int i));
  static int	    cs_insert_filelist __ARGS((char *, char *, char *,
  			struct stat *));
--- 46,51 ----
***************
*** 66,72 ****
  static int	    cs_show __ARGS((exarg_T *eap));
  
  
! static csinfo_T	    csinfo[CSCOPE_MAX_CONNECTIONS];
  static int	    eap_arg_len;    /* length of eap->arg, set in
  				       cs_lookup_cmd() */
  static cscmd_T	    cs_cmds[] =
--- 65,74 ----
  static int	    cs_show __ARGS((exarg_T *eap));
  
  
! static csinfo_T *   csinfo = NULL;
! static int	    csinfo_size = 0;	/* number of items allocated in
! 					   csinfo[] */
! 
  static int	    eap_arg_len;    /* length of eap->arg, set in
  				       cs_lookup_cmd() */
  static cscmd_T	    cs_cmds[] =
***************
*** 144,166 ****
  	}
      case EXP_CSCOPE_KILL:
  	{
! 	    static char_u	connection[2];
  
  	    /* ":cscope kill" accepts connection numbers or partial names of
  	     * the pathname of the cscope database as argument.  Only complete
  	     * with connection numbers. -1 can also be used to kill all
  	     * connections. */
! 	    for (i = 0, current_idx = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	    {
  		if (csinfo[i].fname == NULL)
  		    continue;
  		if (current_idx++ == idx)
  		{
! 		    /* Connection number fits in one character since
! 		     * CSCOPE_MAX_CONNECTIONS is < 10 */
! 		    connection[0] = i + '0';
! 		    connection[1] = NUL;
! 		    return connection;
  		}
  	    }
  	    return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL;
--- 146,165 ----
  	}
      case EXP_CSCOPE_KILL:
  	{
! 	    static char	connection[5];
  
  	    /* ":cscope kill" accepts connection numbers or partial names of
  	     * the pathname of the cscope database as argument.  Only complete
  	     * with connection numbers. -1 can also be used to kill all
  	     * connections. */
! 	    for (i = 0, current_idx = 0; i < csinfo_size; i++)
  	    {
  		if (csinfo[i].fname == NULL)
  		    continue;
  		if (current_idx++ == idx)
  		{
! 		    vim_snprintf(connection, sizeof(connection), "%d", i);
! 		    return (char_u *)connection;
  		}
  	    }
  	    return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL;
***************
*** 223,229 ****
  {
      cscmd_T *cmdp;
  
-     cs_init();
      if ((cmdp = cs_lookup_cmd(eap)) == NULL)
      {
  	cs_help(eap);
--- 222,227 ----
***************
*** 284,291 ****
  {
      int ret = FALSE;
  
-     cs_init();
- 
      if (*eap->arg == NUL)
      {
  	(void)EMSG(_("E562: Usage: cstag <ident>"));
--- 282,287 ----
***************
*** 441,447 ****
      if (num < 0 || num > 4 || (num > 0 && !dbpath))
  	return FALSE;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (!csinfo[i].fname)
  	    continue;
--- 437,443 ----
      if (num < 0 || num > 4 || (num > 0 && !dbpath))
  	return FALSE;
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (!csinfo[i].fname)
  	    continue;
***************
*** 684,690 ****
      short i;
      short cnt = 0;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (csinfo[i].fname != NULL)
  	    cnt++;
--- 680,686 ----
      short i;
      short cnt = 0;
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (csinfo[i].fname != NULL)
  	    cnt++;
***************
*** 1112,1118 ****
  {
      int i;
      char *cmd;
!     int nummatches[CSCOPE_MAX_CONNECTIONS], totmatches;
  #ifdef FEAT_QUICKFIX
      char cmdletter;
      char *qfpos;
--- 1108,1115 ----
  {
      int i;
      char *cmd;
!     int *nummatches;
!     int totmatches;
  #ifdef FEAT_QUICKFIX
      char cmdletter;
      char *qfpos;
***************
*** 1123,1135 ****
      if (cmd == NULL)
  	return FALSE;
  
      /* send query to all open connections, then count the total number
       * of matches so we can alloc matchesp all in one swell foop
       */
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	nummatches[i] = 0;
      totmatches = 0;
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL)
  	    continue;
--- 1120,1136 ----
      if (cmd == NULL)
  	return FALSE;
  
+     nummatches = (int *)alloc(sizeof(int)*csinfo_size);
+     if (nummatches == NULL)
+ 	return FALSE;
+ 
      /* send query to all open connections, then count the total number
       * of matches so we can alloc matchesp all in one swell foop
       */
!     for (i = 0; i < csinfo_size; i++)
  	nummatches[i] = 0;
      totmatches = 0;
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL)
  	    continue;
***************
*** 1154,1160 ****
--- 1155,1164 ----
  	char *buf;
  
  	if (!verbose)
+ 	{
+ 	    vim_free(nummatches);
  	    return FALSE;
+ 	}
  
  	buf = (char *)alloc((unsigned)(strlen(opt) + strlen(pat) + strlen(nf)));
  	if (buf == NULL)
***************
*** 1165,1170 ****
--- 1169,1175 ----
  	    (void)EMSG(buf);
  	    vim_free(buf);
  	}
+ 	vim_free(nummatches);
  	return FALSE;
      }
  
***************
*** 1217,1222 ****
--- 1222,1228 ----
  		(void)EMSG(buf);
  		vim_free(buf);
  	    }
+ 	    vim_free(nummatches);
  	    return FALSE;
  	}
      }
***************
*** 1264,1269 ****
--- 1270,1276 ----
  	}
  	mch_remove(tmp);
  	vim_free(tmp);
+ 	vim_free(nummatches);
  	return TRUE;
      }
      else
***************
*** 1275,1280 ****
--- 1282,1288 ----
  	/* read output */
  	cs_fill_results((char *)pat, totmatches, nummatches, &matches,
  							 &contexts, &matched);
+ 	vim_free(nummatches);
  	if (matches == NULL)
  	    return FALSE;
  
***************
*** 1328,1353 ****
  } /* cs_help */
  
  
- /*
-  * PRIVATE: cs_init
-  *
-  * initialize cscope structure if not already
-  */
-     static void
- cs_init()
- {
-     short i;
-     static int init_already = FALSE;
- 
-     if (init_already)
- 	return;
- 
-     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
- 	clear_csinfo(i);
- 
-     init_already = TRUE;
- } /* cs_init */
- 
      static void
  clear_csinfo(i)
      int	    i;
--- 1336,1341 ----
***************
*** 1444,1450 ****
  #endif
  
      i = -1; /* can be set to the index of an empty item in csinfo */
!     for (j = 0; j < CSCOPE_MAX_CONNECTIONS; j++)
      {
  	if (csinfo[j].fname != NULL
  #if defined(UNIX)
--- 1432,1438 ----
  #endif
  
      i = -1; /* can be set to the index of an empty item in csinfo */
!     for (j = 0; j < csinfo_size; j++)
      {
  	if (csinfo[j].fname != NULL
  #if defined(UNIX)
***************
*** 1471,1479 ****
  
      if (i == -1)
      {
! 	if (p_csverbose)
! 	    (void)EMSG(_("E569: maximum number of cscope connections reached"));
! 	return -1;
      }
  
      if ((csinfo[i].fname = (char *)alloc((unsigned)strlen(fname)+1)) == NULL)
--- 1459,1483 ----
  
      if (i == -1)
      {
! 	i = csinfo_size;
! 	if (csinfo_size == 0)
! 	{
! 	    /* First time allocation: allocate only 1 connection. It should
! 	     * be enough for most users.  If more is needed, csinfo will be
! 	     * reallocated. */
! 	    csinfo_size = 1;
! 	    csinfo = (csinfo_T *)alloc_clear(sizeof(csinfo_T));
! 	}
! 	else
! 	{
! 	    /* Reallocate space for more connections. */
! 	    csinfo_size *= 2;
! 	    csinfo = vim_realloc(csinfo, sizeof(csinfo_T)*csinfo_size);
! 	}
! 	if (csinfo == NULL)
! 	    return -1;
! 	for (j = csinfo_size/2; j < csinfo_size; j++)
! 	    clear_csinfo(j);
      }
  
      if ((csinfo[i].fname = (char *)alloc((unsigned)strlen(fname)+1)) == NULL)
***************
*** 1580,1594 ****
  	/* It must be part of a name.  We will try to find a match
  	 * within all the names in the csinfo data structure
  	 */
! 	for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	{
  	    if (csinfo[i].fname != NULL && strstr(csinfo[i].fname, stok))
  		break;
  	}
      }
  
!     if ((i >= CSCOPE_MAX_CONNECTIONS || i < -1 || csinfo[i].fname == NULL)
! 	    && i != -1)
      {
  	if (p_csverbose)
  	    (void)EMSG2(_("E261: cscope connection %s not found"), stok);
--- 1584,1597 ----
  	/* It must be part of a name.  We will try to find a match
  	 * within all the names in the csinfo data structure
  	 */
! 	for (i = 0; i < csinfo_size; i++)
  	{
  	    if (csinfo[i].fname != NULL && strstr(csinfo[i].fname, stok))
  		break;
  	}
      }
  
!     if ((i != -1) && (i >= csinfo_size || i < -1 || csinfo[i].fname == NULL))
      {
  	if (p_csverbose)
  	    (void)EMSG2(_("E261: cscope connection %s not found"), stok);
***************
*** 1597,1603 ****
      {
  	if (i == -1)
  	{
! 	    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	    {
  		if (csinfo[i].fname)
  		    cs_kill_execute(i, csinfo[i].fname);
--- 1600,1606 ----
      {
  	if (i == -1)
  	{
! 	    for (i = 0; i < csinfo_size; i++)
  	    {
  		if (csinfo[i].fname)
  		    cs_kill_execute(i, csinfo[i].fname);
***************
*** 1857,1863 ****
      if (buf == NULL)
  	return;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (nummatches_a[i] < 1)
  	    continue;
--- 1860,1866 ----
      if (buf == NULL)
  	return;
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (nummatches_a[i] < 1)
  	    continue;
***************
*** 1929,1935 ****
      if ((cntxts = (char **)alloc(sizeof(char *) * totmatches)) == NULL)
  	goto parse_out;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (nummatches_a[i] < 1)
  	    continue;
--- 1932,1938 ----
      if ((cntxts = (char **)alloc(sizeof(char *) * totmatches)) == NULL)
  	goto parse_out;
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (nummatches_a[i] < 1)
  	    continue;
***************
*** 2383,2392 ****
      int	i;
      char buf[20]; /* for sprintf " (#%d)" */
  
      /* malloc our db and ppath list */
!     dblist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
!     pplist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
!     fllist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
      if (dblist == NULL || pplist == NULL || fllist == NULL)
      {
  	vim_free(dblist);
--- 2386,2398 ----
      int	i;
      char buf[20]; /* for sprintf " (#%d)" */
  
+     if (csinfo_size == 0)
+ 	return CSCOPE_SUCCESS;
+ 
      /* malloc our db and ppath list */
!     dblist = (char **)alloc(csinfo_size * sizeof(char *));
!     pplist = (char **)alloc(csinfo_size * sizeof(char *));
!     fllist = (char **)alloc(csinfo_size * sizeof(char *));
      if (dblist == NULL || pplist == NULL || fllist == NULL)
      {
  	vim_free(dblist);
***************
*** 2395,2401 ****
  	return CSCOPE_FAILURE;
      }
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	dblist[i] = csinfo[i].fname;
  	pplist[i] = csinfo[i].ppath;
--- 2401,2407 ----
  	return CSCOPE_FAILURE;
      }
  
!     for (i = 0; i < csinfo_size; i++)
      {
  	dblist[i] = csinfo[i].fname;
  	pplist[i] = csinfo[i].ppath;
***************
*** 2405,2411 ****
      }
  
      /* rebuild the cscope connection list */
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
      {
  	if (dblist[i] != NULL)
  	{
--- 2411,2417 ----
      }
  
      /* rebuild the cscope connection list */
!     for (i = 0; i < csinfo_size; i++)
      {
  	if (dblist[i] != NULL)
  	{
***************
*** 2502,2508 ****
  	MSG_PUTS_ATTR(
  	    _(" # pid    database name                       prepend path\n"),
  	    hl_attr(HLF_T));
! 	for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	{
  	    if (csinfo[i].fname == NULL)
  		continue;
--- 2508,2514 ----
  	MSG_PUTS_ATTR(
  	    _(" # pid    database name                       prepend path\n"),
  	    hl_attr(HLF_T));
! 	for (i = 0; i < csinfo_size; i++)
  	{
  	    if (csinfo[i].fname == NULL)
  		continue;
***************
*** 2531,2538 ****
  {
      int i;
  
!     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
  	cs_release_csp(i, TRUE);
  }
  
  #endif	/* FEAT_CSCOPE */
--- 2537,2546 ----
  {
      int i;
  
!     for (i = 0; i < csinfo_size; i++)
  	cs_release_csp(i, TRUE);
+     vim_free(csinfo);
+     csinfo_size = 0;
  }
  
  #endif	/* FEAT_CSCOPE */
*** ../vim-7.2.227/src/version.c	2009-07-09 20:13:59.000000000 +0200
--- src/version.c	2009-07-09 21:21:48.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     228,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
84. Books in your bookcase bear the names Bongo, WinSock and Inside OLE

 /// 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    ///


--- NEW FILE 7.2.229 ---
To: vim-dev at vim.org
Subject: Patch 7.2.229
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.229
Problem:    Warning for shadowed variable.
Solution:   Rename "wait" to "wait_time".
Files:	    src/os_unix.c


*** ../vim-7.2.228/src/os_unix.c	2009-06-16 15:12:11.000000000 +0200
--- src/os_unix.c	2009-07-09 16:24:14.000000000 +0200
***************
*** 1138,1147 ****
       * to happen).
       */
      {
! 	long wait;
! 	for (wait = 0; !sigcont_received && wait <= 3L; wait++)
  	    /* Loop is not entered most of the time */
! 	    mch_delay(wait, FALSE);
      }
  # endif
  
--- 1138,1147 ----
       * to happen).
       */
      {
! 	long wait_time;
! 	for (wait_time = 0; !sigcont_received && wait_time <= 3L; wait_time++)
  	    /* Loop is not entered most of the time */
! 	    mch_delay(wait_time, FALSE);
      }
  # endif
  
*** ../vim-7.2.228/src/version.c	2009-07-09 21:22:36.000000000 +0200
--- src/version.c	2009-07-14 12:18:21.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     229,
  /**/

-- 
>From "know your smileys":
 :-)	Funny
 |-)	Funny Oriental
 (-:	Funny Australian

 /// 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    ///


--- NEW FILE 7.2.230 ---
To: vim-dev at vim.org
Subject: Patch 7.2.230
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.230
Problem:    A few old lint-style ARGUSED comments.
Solution:   Change to the new UNUSED style.
Files:	    src/getchar.c


*** ../vim-7.2.229/src/getchar.c	2009-07-09 18:24:24.000000000 +0200
--- src/getchar.c	2009-07-09 18:09:13.000000000 +0200
***************
*** 3708,3718 ****
   * Clear all mappings or abbreviations.
   * 'abbr' should be FALSE for mappings, TRUE for abbreviations.
   */
- /*ARGSUSED*/
      void
  map_clear(cmdp, arg, forceit, abbr)
      char_u	*cmdp;
!     char_u	*arg;
      int		forceit;
      int		abbr;
  {
--- 3708,3717 ----
   * Clear all mappings or abbreviations.
   * 'abbr' should be FALSE for mappings, TRUE for abbreviations.
   */
      void
  map_clear(cmdp, arg, forceit, abbr)
      char_u	*cmdp;
!     char_u	*arg UNUSED;
      int		forceit;
      int		abbr;
  {
***************
*** 3741,3753 ****
  /*
   * Clear all mappings in "mode".
   */
- /*ARGSUSED*/
      void
  map_clear_int(buf, mode, local, abbr)
!     buf_T	*buf;	    /* buffer for local mappings */
!     int		mode;	    /* mode in which to delete */
!     int		local;	    /* TRUE for buffer-local mappings */
!     int		abbr;	    /* TRUE for abbreviations */
  {
      mapblock_T	*mp, **mpp;
      int		hash;
--- 3740,3751 ----
  /*
   * Clear all mappings in "mode".
   */
      void
  map_clear_int(buf, mode, local, abbr)
!     buf_T	*buf UNUSED;	/* buffer for local mappings */
!     int		mode;		/* mode in which to delete */
!     int		local UNUSED;	/* TRUE for buffer-local mappings */
!     int		abbr;		/* TRUE for abbreviations */
  {
      mapblock_T	*mp, **mpp;
      int		hash;
*** ../vim-7.2.229/src/version.c	2009-07-14 12:20:28.000000000 +0200
--- src/version.c	2009-07-14 13:44:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     230,
  /**/

-- 
>From "know your smileys":
 :~)	A man with a tape recorder up his nose

 /// 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    ///


--- NEW FILE 7.2.231 ---
To: vim-dev at vim.org
Subject: Patch 7.2.231
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.231
Problem:    Warning for unreacheable code.
Solution:   Add #ifdef.
Files:	    src/if_perl.xs


*** ../vim-7.2.230/src/if_perl.xs	2009-07-09 20:06:30.000000000 +0200
--- src/if_perl.xs	2009-07-09 13:02:16.000000000 +0200
***************
*** 720,728 ****
--- 720,730 ----
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
+ # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
  	if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
+ # endif
  	{
  	    PUSHMARK(SP);
  	    XPUSHs(safe);
*** ../vim-7.2.230/src/version.c	2009-07-14 13:44:43.000000000 +0200
--- src/version.c	2009-07-14 16:04:07.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     231,
  /**/

-- 
>From "know your smileys":
 ~#:-(	I just washed my hair, and I can't do nuthin' with it.

 /// 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    ///


--- NEW FILE 7.2.232 ---
To: vim-dev at vim.org
Subject: Patch 7.2.232
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.232
Problem:    Cannot debug problems with being in a wrong directory.
Solution:   When 'verbose' is 5 or higher report directory changes.
Files:	    src/os_unix.c, src/os_unix.h, src/proto/os_unix.pro


*** ../vim-7.2.231/src/os_unix.c	2009-07-14 12:20:28.000000000 +0200
--- src/os_unix.c	2009-07-14 17:13:15.000000000 +0200
***************
*** 319,324 ****
--- 319,341 ----
      {-1,	    "Unknown!", FALSE}
  };
  
+     int
+ mch_chdir(path)
+     char *path;
+ {
+     if (p_verbose >= 5)
+     {
+ 	verbose_enter();
+ 	smsg((char_u *)"chdir(%s)", path);
+ 	verbose_leave();
+     }
+ # ifdef VMS
+     return chdir(vms_fixfilename(path));
+ # else
+     return chdir(path);
+ # endif
+ }
+ 
  /*
   * Write s[len] to the screen.
   */
***************
*** 2424,2429 ****
--- 2441,2452 ----
  #ifdef HAVE_FCHDIR
  	    if (fd >= 0)
  	    {
+ 		if (p_verbose >= 5)
+ 		{
+ 		    verbose_enter();
+ 		    MSG("fchdir() to previous dir");
+ 		    verbose_leave();
+ 		}
  		l = fchdir(fd);
  		close(fd);
  	    }
*** ../vim-7.2.231/src/os_unix.h	2009-05-16 16:36:25.000000000 +0200
--- src/os_unix.h	2009-07-14 16:55:05.000000000 +0200
***************
*** 482,492 ****
  # else
  int mch_rename __ARGS((const char *src, const char *dest));
  # endif
- # ifdef VMS
- #  define mch_chdir(s) chdir(vms_fixfilename(s))
- # else
- #  define mch_chdir(s) chdir(s)
- # endif
  # ifndef VMS
  #  ifdef __MVS__
    /* on OS390 Unix getenv() doesn't return a pointer to persistent
--- 482,487 ----
*** ../vim-7.2.231/src/proto/os_unix.pro	2008-06-24 23:58:57.000000000 +0200
--- src/proto/os_unix.pro	2009-07-14 16:58:08.000000000 +0200
***************
*** 1,4 ****
--- 1,5 ----
  /* os_unix.c */
+ int mch_chdir __ARGS((char *path));
  void mch_write __ARGS((char_u *s, int len));
  int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
  int mch_char_avail __ARGS((void));
*** ../vim-7.2.231/src/version.c	2009-07-14 16:05:14.000000000 +0200
--- src/version.c	2009-07-14 17:37:15.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     232,
  /**/

-- 
>From "know your smileys":
 O:-)	Saint

 /// 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    ///


--- NEW FILE 7.2.233 ---
To: vim-dev at vim.org
Subject: Patch 7.2.233 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.233 (extra part of 7.2.232)
Problem:    Cannot debug problems with being in a wrong directory.
Solution:   When 'verbose' is 5 or higher report directory changes.
Files:	    src/os_msdos.c, src/os_mswin.c, src/os_riscos.c, src/os_mac.h


*** ../vim-7.2.232/src/os_msdos.c	2008-06-24 23:30:18.000000000 +0200
--- src/os_msdos.c	2009-07-14 16:50:57.000000000 +0200
***************
*** 2039,2044 ****
--- 2039,2050 ----
  {
      if (path[0] == NUL)		    /* just checking... */
  	return 0;
+     if (p_verbose >= 5)
+     {
+ 	verbose_enter();
+ 	smsg((char_u *)"chdir(%s)", path);
+ 	verbose_leave();
+     }
      if (path[1] == ':')		    /* has a drive name */
      {
  	if (change_drive(TOLOWER_ASC(path[0]) - 'a' + 1))
*** ../vim-7.2.232/src/os_mswin.c	2009-05-14 22:00:37.000000000 +0200
--- src/os_mswin.c	2009-07-14 16:53:03.000000000 +0200
***************
*** 653,658 ****
--- 653,664 ----
      if (path[0] == NUL)		/* just checking... */
  	return -1;
  
+     if (p_verbose >= 5)
+     {
+ 	verbose_enter();
+ 	smsg((char_u *)"chdir(%s)", path);
+ 	verbose_leave();
+     }
      if (isalpha(path[0]) && path[1] == ':')	/* has a drive name */
      {
  	/* If we can change to the drive, skip that part of the path.  If we
*** ../vim-7.2.232/src/os_riscos.c	2006-03-07 23:25:50.000000000 +0100
--- src/os_riscos.c	2009-07-14 16:53:35.000000000 +0200
***************
*** 1203,1208 ****
--- 1203,1214 ----
      int	    retval;
      char_u  *new_dir;
  
+     if (p_verbose >= 5)
+     {
+ 	verbose_enter();
+ 	smsg((char_u *)"chdir(%s)", dir);
+ 	verbose_leave();
+     }
      length = strlen(dir);
      if (dir[length - 1] != '.')
  	return chdir(dir);	    /* No trailing dots - nothing to do. */
*** ../vim-7.2.232/src/os_mac.h	2009-06-24 16:41:01.000000000 +0200
--- src/os_mac.h	2009-07-14 16:54:33.000000000 +0200
***************
*** 291,297 ****
  #  define HAVE_SETENV
  #  define HAVE_RENAME
  # endif
- # define mch_chdir(s) chdir(s)
  #endif
  
  #if defined(MACOS_X) && !defined(HAVE_CONFIG_H)
--- 291,296 ----
*** ../vim-7.2.232/src/version.c	2009-07-14 17:38:51.000000000 +0200
--- src/version.c	2009-07-14 18:35:30.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     233,
  /**/

-- 
>From "know your smileys":
 :-O>-o   Smiley American tourist (note big mouth and camera)

 /// 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    ///


--- NEW FILE 7.2.234 ---
To: vim-dev at vim.org
Subject: Patch 7.2.234
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.234
Problem:    It is not possible to ignore file names without a suffix.
Solution:   Use an empty entry in 'suffixes' for file names without a dot.
Files:	    runtime/doc/cmdline.txt, src/misc1.c


*** ../vim-7.2.233/runtime/doc/cmdline.txt	2008-11-09 13:43:25.000000000 +0100
--- runtime/doc/cmdline.txt	2009-07-14 13:35:56.000000000 +0200
***************
*** 441,453 ****
  those files with an extension that is in the 'suffixes' option are ignored.
  The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
  in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
! It is impossible to ignore suffixes with two dots.  Examples:
  
    pattern:	files:				match:	~
     test*	test.c test.h test.o		test.c
     test*	test.h test.o			test.h and test.o
     test*	test.i test.h test.c		test.i and test.c
  
  If there is more than one matching file (after ignoring the ones matching
  the 'suffixes' option) the first file name is inserted.  You can see that
  there is only one match when you type 'wildchar' twice and the completed
--- 439,458 ----
  those files with an extension that is in the 'suffixes' option are ignored.
  The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
  in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
! 
! An empty entry, two consecutive commas, match a file name that does not
! contain a ".", thus has no suffix.  This is useful to ignore "prog" and prefer
! "prog.c".
! 
! Examples:
  
    pattern:	files:				match:	~
     test*	test.c test.h test.o		test.c
     test*	test.h test.o			test.h and test.o
     test*	test.i test.h test.c		test.i and test.c
  
+ It is impossible to ignore suffixes with two dots.
+ 
  If there is more than one matching file (after ignoring the ones matching
  the 'suffixes' option) the first file name is inserted.  You can see that
  there is only one match when you type 'wildchar' twice and the completed
*** ../vim-7.2.233/src/misc1.c	2009-07-09 20:06:30.000000000 +0200
--- src/misc1.c	2009-07-14 15:51:55.000000000 +0200
***************
*** 8533,8543 ****
      for (setsuf = p_su; *setsuf; )
      {
  	setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,");
! 	if (fnamelen >= setsuflen
! 		&& fnamencmp(suf_buf, fname + fnamelen - setsuflen,
! 					      (size_t)setsuflen) == 0)
! 	    break;
! 	setsuflen = 0;
      }
      return (setsuflen != 0);
  }
--- 8534,8558 ----
      for (setsuf = p_su; *setsuf; )
      {
  	setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,");
! 	if (setsuflen == 0)
! 	{
! 	    char_u *tail = gettail(fname);
! 
! 	    /* empty entry: match name without a '.' */
! 	    if (vim_strchr(tail, '.') == NULL)
! 	    {
! 		setsuflen = 1;
! 		break;
! 	    }
! 	}
! 	else
! 	{
! 	    if (fnamelen >= setsuflen
! 		    && fnamencmp(suf_buf, fname + fnamelen - setsuflen,
! 						  (size_t)setsuflen) == 0)
! 		break;
! 	    setsuflen = 0;
! 	}
      }
      return (setsuflen != 0);
  }
*** ../vim-7.2.233/src/version.c	2009-07-14 18:38:09.000000000 +0200
--- src/version.c	2009-07-14 21:38:30.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     234,
  /**/

-- 
How many light bulbs does it take to change a person?

 /// 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    ///


--- NEW FILE 7.2.235 ---
To: vim-dev at vim.org
Subject: Patch 7.2.235
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.235
Problem:    Using CTRL-O z= in Insert mode has a delay before redrawing.
Solution:   Reset msg_didout and msg_scroll.
Files:	    src/misc1.c, src/spell.c


*** ../vim-7.2.234/src/misc1.c	2009-07-14 21:40:30.000000000 +0200
--- src/misc1.c	2009-07-14 15:51:55.000000000 +0200
***************
*** 3276,3281 ****
--- 3276,3282 ----
  	cmdline_row = msg_row - 1;
  	need_wait_return = FALSE;
  	msg_didany = FALSE;
+ 	msg_didout = FALSE;
      }
      else
  	cmdline_row = save_cmdline_row;
*** ../vim-7.2.234/src/spell.c	2009-05-17 13:30:58.000000000 +0200
--- src/spell.c	2009-07-14 15:57:55.000000000 +0200
***************
*** 10252,10257 ****
--- 10252,10258 ----
      int		limit;
      int		selected = count;
      int		badlen = 0;
+     int		msg_scroll_save = msg_scroll;
  
      if (no_spell_checking(curwin))
  	return;
***************
*** 10416,10422 ****
  	selected = prompt_for_number(&mouse_used);
  	if (mouse_used)
  	    selected -= lines_left;
! 	lines_left = Rows;	/* avoid more prompt */
      }
  
      if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
--- 10417,10425 ----
  	selected = prompt_for_number(&mouse_used);
  	if (mouse_used)
  	    selected -= lines_left;
! 	lines_left = Rows;		/* avoid more prompt */
! 	/* don't delay for 'smd' in normal_cmd() */
! 	msg_scroll = msg_scroll_save;
      }
  
      if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
***************
*** 10441,10447 ****
  	}
  
  	/* Replace the word. */
! 	p = alloc((unsigned)STRLEN(line) - stp->st_orglen + stp->st_wordlen + 1);
  	if (p != NULL)
  	{
  	    c = (int)(sug.su_badptr - line);
--- 10444,10451 ----
  	}
  
  	/* Replace the word. */
! 	p = alloc((unsigned)STRLEN(line) - stp->st_orglen
! 						       + stp->st_wordlen + 1);
  	if (p != NULL)
  	{
  	    c = (int)(sug.su_badptr - line);
*** ../vim-7.2.234/src/version.c	2009-07-14 21:40:30.000000000 +0200
--- src/version.c	2009-07-22 11:00:34.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     235,
  /**/

-- 
>From "know your smileys":
 |-(	Contact lenses, but has lost them

 /// 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    ///


--- NEW FILE 7.2.236 ---
To: vim-dev at vim.org
Subject: Patch 7.2.236
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.236
Problem:    Mac: Compiling with Ruby doesn't always work.
Solution:   In configure filter out the --arch argument (Bjorn Winckler)
Files:	    src/configure.in, src/auto/configure


*** ../vim-7.2.235/src/configure.in	2009-05-26 22:58:43.000000000 +0200
--- src/configure.in	2009-07-14 16:09:34.000000000 +0200
***************
*** 984,990 ****
  	fi
  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
  	if test "X$rubyldflags" != "X"; then
! 	  LDFLAGS="$rubyldflags $LDFLAGS"
  	fi
  	RUBY_SRC="if_ruby.c"
  	RUBY_OBJ="objects/if_ruby.o"
--- 984,996 ----
  	fi
  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
  	if test "X$rubyldflags" != "X"; then
! 	  dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only
! 	  dnl be included if requested by passing --with-mac-arch to
! 	  dnl configure, so strip these flags first (if present)
! 	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
! 	  if test "X$rubyldflags" != "X"; then
! 	    LDFLAGS="$rubyldflags $LDFLAGS"
! 	  fi
  	fi
  	RUBY_SRC="if_ruby.c"
  	RUBY_OBJ="objects/if_ruby.o"
*** ../vim-7.2.235/src/auto/configure	2009-05-26 22:58:43.000000000 +0200
--- src/auto/configure	2009-07-14 16:11:58.000000000 +0200
***************
*** 5780,5786 ****
  	fi
  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
  	if test "X$rubyldflags" != "X"; then
! 	  LDFLAGS="$rubyldflags $LDFLAGS"
  	fi
  	RUBY_SRC="if_ruby.c"
  	RUBY_OBJ="objects/if_ruby.o"
--- 5780,5789 ----
  	fi
  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
  	if test "X$rubyldflags" != "X"; then
! 	  	  	  	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
! 	  if test "X$rubyldflags" != "X"; then
! 	    LDFLAGS="$rubyldflags $LDFLAGS"
! 	  fi
  	fi
  	RUBY_SRC="if_ruby.c"
  	RUBY_OBJ="objects/if_ruby.o"
*** ../vim-7.2.235/src/version.c	2009-07-22 11:03:38.000000000 +0200
--- src/version.c	2009-07-22 11:14:38.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     236,
  /**/

-- 
>From "know your smileys":
 <|-) Chinese
 <|-( Chinese and doesn't like these kind of jokes

 /// 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    ///


--- NEW FILE 7.2.237 ---
To: vim-dev at vim.org
Subject: Patch 7.2.237
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.237
Problem:    Crash on exit when window icon not set.
Solution:   Copy terminal name when using it for the icon name.
Files:	    src/os_unix.c


*** ../vim-7.2.236/src/os_unix.c	2009-07-14 17:38:51.000000000 +0200
--- src/os_unix.c	2009-07-14 18:30:04.000000000 +0200
***************
*** 1734,1742 ****
      if (oldicon == NULL && !test_only)
      {
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
! 	    oldicon = T_NAME + 8;
  	else
! 	    oldicon = T_NAME;
      }
  
      return retval;
--- 1734,1742 ----
      if (oldicon == NULL && !test_only)
      {
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
! 	    oldicon = vim_strsave(T_NAME + 8);
  	else
! 	    oldicon = vim_strsave(T_NAME);
      }
  
      return retval;
***************
*** 1939,1947 ****
      if (!test_only)
      {
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
! 	    oldicon = T_NAME + 8;
  	else
! 	    oldicon = T_NAME;
      }
      return FALSE;
  }
--- 1939,1947 ----
      if (!test_only)
      {
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
! 	    oldicon = vim_strsave(T_NAME + 8);
  	else
! 	    oldicon = vim_strsave(T_NAME);
      }
      return FALSE;
  }
*** ../vim-7.2.236/src/version.c	2009-07-22 11:16:54.000000000 +0200
--- src/version.c	2009-07-22 13:26:30.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     237,
  /**/

-- 
Common sense is what tells you that the world is flat.

 /// 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    ///


--- NEW FILE 7.2.238 ---
To: vim-dev at vim.org
Subject: Patch 7.2.238
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.238
Problem:    Leaking memory when setting term to "builtin_dumb".
Solution:   Free memory when resetting term option t_Co.
Files:	    src/option.c, src/proto/option.pro, src/term.c


*** ../vim-7.2.237/src/option.c	2009-06-16 17:50:56.000000000 +0200
--- src/option.c	2009-07-22 12:49:19.000000000 +0200
***************
*** 403,410 ****
  #define P_NUM		0x02	/* the option is numeric */
  #define P_STRING	0x04	/* the option is a string */
  #define P_ALLOCED	0x08	/* the string option is in allocated memory,
! 				    must use vim_free() when assigning new
! 				    value. Not set if default is the same. */
  #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
  				   never be used for local or hidden options! */
  #define P_NODEFAULT	0x40	/* don't set to default value */
--- 403,411 ----
  #define P_NUM		0x02	/* the option is numeric */
  #define P_STRING	0x04	/* the option is a string */
  #define P_ALLOCED	0x08	/* the string option is in allocated memory,
! 				   must use free_string_option() when
! 				   assigning new value. Not set if default is
! 				   the same. */
  #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
  				   never be used for local or hidden options! */
  #define P_NODEFAULT	0x40	/* don't set to default value */
***************
*** 8927,8932 ****
--- 8928,8955 ----
  }
  
  /*
+  * Free the string for one term option, if it was allocated.
+  * Set the string to empty_option and clear allocated flag.
+  * "var" points to the option value.
+  */
+     void
+ free_one_termoption(var)
+     char_u *var;
+ {
+     struct vimoption   *p;
+ 
+     for (p = &options[0]; p->fullname != NULL; p++)
+ 	if (p->var == var)
+ 	{
+ 	    if (p->flags & P_ALLOCED)
+ 		free_string_option(*(char_u **)(p->var));
+ 	    *(char_u **)(p->var) = empty_option;
+ 	    p->flags &= ~P_ALLOCED;
+ 	    break;
+ 	}
+ }
+ 
+ /*
   * Set the terminal option defaults to the current value.
   * Used after setting the terminal name.
   */
*** ../vim-7.2.237/src/proto/option.pro	2009-02-21 20:27:00.000000000 +0100
--- src/proto/option.pro	2009-07-22 12:52:31.000000000 +0200
***************
*** 29,34 ****
--- 29,35 ----
  int makefoldset __ARGS((FILE *fd));
  void clear_termoptions __ARGS((void));
  void free_termoptions __ARGS((void));
+ void free_one_termoption __ARGS((char_u *var));
  void set_term_defaults __ARGS((void));
  void comp_col __ARGS((void));
  char_u *get_equalprg __ARGS((void));
*** ../vim-7.2.237/src/term.c	2009-06-16 14:31:56.000000000 +0200
--- src/term.c	2009-07-22 13:19:59.000000000 +0200
***************
*** 2881,2887 ****
  
  	/* if 'Sb' and 'AB' are not defined, reset "Co" */
  	if (*T_CSB == NUL && *T_CAB == NUL)
! 	    T_CCO = empty_option;
  
  	/* Set 'weirdinvert' according to value of 't_xs' */
  	p_wiv = (*T_XS != NUL);
--- 2881,2887 ----
  
  	/* if 'Sb' and 'AB' are not defined, reset "Co" */
  	if (*T_CSB == NUL && *T_CAB == NUL)
! 	    free_one_termoption(T_CCO);
  
  	/* Set 'weirdinvert' according to value of 't_xs' */
  	p_wiv = (*T_XS != NUL);
*** ../vim-7.2.237/src/version.c	2009-07-22 13:27:50.000000000 +0200
--- src/version.c	2009-07-22 14:25:44.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     238,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
95. Only communication in your household is through email.

 /// 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    ///


--- NEW FILE 7.2.239 ---
To: vim-dev at vim.org
Subject: Patch 7.2.239
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.239
Problem:    Using :diffpatch twice or when patching fails causes memory
	    corruption and/or a crash.  (Bryan Venteicher)
Solution:   Detect missing output file.  Avoid using non-existing buffer.
Files:	    src/diff.c


*** ../vim-7.2.238/src/diff.c	2009-05-14 22:19:19.000000000 +0200
--- src/diff.c	2009-07-22 16:06:21.000000000 +0200
***************
*** 893,898 ****
--- 893,899 ----
      char_u	*browseFile = NULL;
      int		browse_flag = cmdmod.browse;
  #endif
+     struct stat st;
  
  #ifdef FEAT_BROWSE
      if (cmdmod.browse)
***************
*** 999,1042 ****
      STRCAT(buf, ".rej");
      mch_remove(buf);
  
!     if (curbuf->b_fname != NULL)
      {
! 	newname = vim_strnsave(curbuf->b_fname,
  					  (int)(STRLEN(curbuf->b_fname) + 4));
! 	if (newname != NULL)
! 	    STRCAT(newname, ".new");
!     }
  
  #ifdef FEAT_GUI
!     need_mouse_correct = TRUE;
  #endif
!     /* don't use a new tab page, each tab page has its own diffs */
!     cmdmod.tab = 0;
! 
!     if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
!     {
! 	/* Pretend it was a ":split fname" command */
! 	eap->cmdidx = CMD_split;
! 	eap->arg = tmp_new;
! 	do_exedit(eap, old_curwin);
  
! 	if (curwin != old_curwin)		/* split must have worked */
  	{
! 	    /* Set 'diff', 'scrollbind' on and 'wrap' off. */
! 	    diff_win_options(curwin, TRUE);
! 	    diff_win_options(old_curwin, TRUE);
  
! 	    if (newname != NULL)
  	    {
! 		/* do a ":file filename.new" on the patched buffer */
! 		eap->arg = newname;
! 		ex_file(eap);
  
  #ifdef FEAT_AUTOCMD
! 		/* Do filetype detection with the new name. */
! 		if (au_has_group((char_u *)"filetypedetect"))
! 		    do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
  #endif
  	    }
  	}
      }
--- 1000,1050 ----
      STRCAT(buf, ".rej");
      mch_remove(buf);
  
!     /* Only continue if the output file was created. */
!     if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
! 	EMSG(_("E816: Cannot read patch output"));
!     else
      {
! 	if (curbuf->b_fname != NULL)
! 	{
! 	    newname = vim_strnsave(curbuf->b_fname,
  					  (int)(STRLEN(curbuf->b_fname) + 4));
! 	    if (newname != NULL)
! 		STRCAT(newname, ".new");
! 	}
  
  #ifdef FEAT_GUI
! 	need_mouse_correct = TRUE;
  #endif
! 	/* don't use a new tab page, each tab page has its own diffs */
! 	cmdmod.tab = 0;
  
! 	if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
  	{
! 	    /* Pretend it was a ":split fname" command */
! 	    eap->cmdidx = CMD_split;
! 	    eap->arg = tmp_new;
! 	    do_exedit(eap, old_curwin);
  
! 	    /* check that split worked and editing tmp_new */
! 	    if (curwin != old_curwin && win_valid(old_curwin))
  	    {
! 		/* Set 'diff', 'scrollbind' on and 'wrap' off. */
! 		diff_win_options(curwin, TRUE);
! 		diff_win_options(old_curwin, TRUE);
! 
! 		if (newname != NULL)
! 		{
! 		    /* do a ":file filename.new" on the patched buffer */
! 		    eap->arg = newname;
! 		    ex_file(eap);
  
  #ifdef FEAT_AUTOCMD
! 		    /* Do filetype detection with the new name. */
! 		    if (au_has_group((char_u *)"filetypedetect"))
! 			do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
  #endif
+ 		}
  	    }
  	}
      }
*** ../vim-7.2.238/src/version.c	2009-07-22 14:27:33.000000000 +0200
--- src/version.c	2009-07-22 16:21:29.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     239,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
97. Your mother tells you to remember something, and you look for
    a File/Save command.

 /// 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    ///


--- NEW FILE 7.2.240 ---
To: vim-dev at vim.org
Subject: Patch 7.2.240
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.240
Problem:    Crash when using find/replace dialog repeatedly. (Michiel
	    Hartsuiker)
Solution:   Avoid doing the operation while busy or recursively.  Also refuse
	    replace when text is locked.
Files:	    src/gui.c


*** ../vim-7.2.239/src/gui.c	2009-06-24 18:31:36.000000000 +0200
--- src/gui.c	2009-07-22 16:54:16.000000000 +0200
***************
*** 5004,5009 ****
--- 5004,5022 ----
      char_u	*p;
      regmatch_T	regmatch;
      int		save_did_emsg = did_emsg;
+     static int  busy = FALSE;
+ 
+     /* When the screen is being updated we should not change buffers and
+      * windows structures, it may cause freed memory to be used.  Also don't
+      * do this recursively (pressing "Find" quickly several times. */
+     if (updating_screen || busy)
+ 	return FALSE;
+ 
+     /* refuse replace when text cannot be changed */
+     if ((type == FRD_REPLACE || type == FRD_REPLACEALL) && text_locked())
+ 	return FALSE;
+ 
+     busy = TRUE;
  
      ga_init2(&ga, 1, 100);
      if (type == FRD_REPLACEALL)
***************
*** 5094,5099 ****
--- 5107,5113 ----
      }
  
      vim_free(ga.ga_data);
+     busy = FALSE;
      return (ga.ga_len > 0);
  }
  
*** ../vim-7.2.239/src/version.c	2009-07-22 16:22:33.000000000 +0200
--- src/version.c	2009-07-29 11:09:13.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     240,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
113. You are asked about a bus schedule, you wonder if it is 16 or 32 bits.

 /// 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    ///


--- NEW FILE 7.2.241 ---
To: vim-dev at vim.org
Subject: Patch 7.2.241
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.241
Problem:    When using a combination of ":bufdo" and "doautoall" we may end up
	    in the wrong directory. (Ajit Thakkar)
	    Crash when triggering an autocommand in ":vimgrep".  (Yukihiro
	    Nakadaira)
Solution:   Clear w_localdir and globaldir when using the aucmd_win.
	    Use a separate flag to decide aucmd_win needs to be restored.
Files:	    src/fileio.c, src/globals.h, src/structs.h


*** ../vim-7.2.240/src/fileio.c	2009-07-01 17:11:40.000000000 +0200
--- src/fileio.c	2009-07-22 19:08:55.000000000 +0200
***************
*** 8420,8425 ****
--- 8420,8429 ----
  	if (aucmd_win == NULL)
  	    win = curwin;
      }
+     if (win == NULL && aucmd_win_used)
+ 	/* Strange recursive autocommand, fall back to using the current
+ 	 * window.  Expect a few side effects... */
+ 	win = curwin;
  
      aco->save_curwin = curwin;
      aco->save_curbuf = curbuf;
***************
*** 8428,8433 ****
--- 8432,8438 ----
  	/* There is a window for "buf" in the current tab page, make it the
  	 * curwin.  This is preferred, it has the least side effects (esp. if
  	 * "buf" is curbuf). */
+ 	aco->use_aucmd_win = FALSE;
  	curwin = win;
      }
      else
***************
*** 8436,8444 ****
--- 8441,8460 ----
  	 * effects, insert it in a the current tab page.
  	 * Anything related to a window (e.g., setting folds) may have
  	 * unexpected results. */
+ 	aco->use_aucmd_win = TRUE;
+ 	aucmd_win_used = TRUE;
  	aucmd_win->w_buffer = buf;
  	++buf->b_nwindows;
  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
+ 	vim_free(aucmd_win->w_localdir);
+ 	aucmd_win->w_localdir = NULL;
+ 
+ 	/* Make sure w_localdir and globaldir are NULL to avoid a chdir() in
+ 	 * win_enter_ext(). */
+ 	aucmd_win->w_localdir = NULL;
+ 	aco->globaldir = globaldir;
+ 	globaldir = NULL;
+ 
  
  #ifdef FEAT_WINDOWS
  	/* Split the current window, put the aucmd_win in the upper half.
***************
*** 8472,8478 ****
      int dummy;
  #endif
  
!     if (aco->new_curwin == aucmd_win)
      {
  	--curbuf->b_nwindows;
  #ifdef FEAT_WINDOWS
--- 8488,8494 ----
      int dummy;
  #endif
  
!     if (aco->use_aucmd_win)
      {
  	--curbuf->b_nwindows;
  #ifdef FEAT_WINDOWS
***************
*** 8499,8504 ****
--- 8515,8521 ----
  	/* Remove the window and frame from the tree of frames. */
  	(void)winframe_remove(curwin, &dummy, NULL);
  	win_remove(curwin, NULL);
+ 	aucmd_win_used = FALSE;
  	last_status(FALSE);	    /* may need to remove last status line */
  	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
  	(void)win_comp_pos();   /* recompute window positions */
***************
*** 8517,8522 ****
--- 8534,8542 ----
  #endif
  	curbuf = curwin->w_buffer;
  
+ 	vim_free(globaldir);
+ 	globaldir = aco->globaldir;
+ 
  	/* the buffer contents may have changed */
  	check_cursor();
  	if (curwin->w_topline > curbuf->b_ml.ml_line_count)
***************
*** 8541,8547 ****
  #endif
  	{
  	    /* Restore the buffer which was previously edited by curwin, if
! 	     * it was chagned, we are still the same window and the buffer is
  	     * valid. */
  	    if (curwin == aco->new_curwin
  		    && curbuf != aco->new_curbuf
--- 8561,8567 ----
  #endif
  	{
  	    /* Restore the buffer which was previously edited by curwin, if
! 	     * it was changed, we are still the same window and the buffer is
  	     * valid. */
  	    if (curwin == aco->new_curwin
  		    && curbuf != aco->new_curbuf
*** ../vim-7.2.240/src/globals.h	2009-06-16 16:01:34.000000000 +0200
--- src/globals.h	2009-07-22 19:50:53.000000000 +0200
***************
*** 541,546 ****
--- 541,547 ----
  
  #ifdef FEAT_AUTOCMD
  EXTERN win_T	*aucmd_win;	/* window used in aucmd_prepbuf() */
+ EXTERN int	aucmd_win_used INIT(= FALSE);	/* aucmd_win is being used */
  #endif
  
  /*
*** ../vim-7.2.240/src/structs.h	2009-07-09 18:24:24.000000000 +0200
--- src/structs.h	2009-07-22 18:58:35.000000000 +0200
***************
*** 2288,2296 ****
--- 2288,2298 ----
  {
      buf_T	*save_curbuf;	/* saved curbuf */
  #ifdef FEAT_AUTOCMD
+     int		use_aucmd_win;	/* using aucmd_win */
      win_T	*save_curwin;	/* saved curwin */
      win_T	*new_curwin;	/* new curwin */
      buf_T	*new_curbuf;	/* new curbuf */
+     char_u	*globaldir;	/* saved value of globaldir */
  #endif
  } aco_save_T;
  
*** ../vim-7.2.240/src/version.c	2009-07-29 11:10:31.000000000 +0200
--- src/version.c	2009-07-29 12:06:31.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     241,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
114. You are counting items, you go "0,1,2,3,4,5,6,7,8,9,A,B,C,D...".

 /// 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    ///


--- NEW FILE 7.2.242 ---
To: vim-dev at vim.org
Subject: Patch 7.2.242
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.242
Problem:    Setting 'lazyredraw' causes the cursor column to be recomputed.
	    (Tom Link)
Solution:   Only recompute the cursor column for a boolean option if changes
	    the cursor position.
Files:	    src/option.c


*** ../vim-7.2.241/src/option.c	2009-07-22 14:27:33.000000000 +0200
--- src/option.c	2009-07-29 10:03:39.000000000 +0200
***************
*** 7194,7199 ****
--- 7194,7207 ----
  	compatible_set();
      }
  
+     /* 'list', 'number' */
+     else if ((int *)varp == &curwin->w_p_list
+ 	  || (int *)varp == &curwin->w_p_nu)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ 
      else if ((int *)varp == &curbuf->b_p_ro)
      {
  	/* when 'readonly' is reset globally, also reset readonlymode */
***************
*** 7645,7650 ****
--- 7653,7666 ----
  	    curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
  # endif
  	}
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ 
+     else if ((int *)varp == &p_arshape)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
      }
  #endif
  
***************
*** 7655,7662 ****
      options[opt_idx].flags |= P_WAS_SET;
  
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
!     if (curwin->w_curswant != MAXCOL)
! 	curwin->w_set_curswant = TRUE;  /* in case 'list' changed */
      check_redraw(options[opt_idx].flags);
  
      return NULL;
--- 7671,7677 ----
      options[opt_idx].flags |= P_WAS_SET;
  
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
! 
      check_redraw(options[opt_idx].flags);
  
      return NULL;
*** ../vim-7.2.241/src/version.c	2009-07-29 12:09:49.000000000 +0200
--- src/version.c	2009-07-29 15:40:43.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     242,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
117. You are more comfortable typing in html.

 /// 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    ///


--- NEW FILE 7.2.243 ---
To: vim-dev at vim.org
Subject: Patch 7.2.243
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.243
Problem:    Memory leak when using :vimgrep and resizing. (Dominique Pelle)
Solution:   Free memory for aucmd_win when resizing and don't allocate it
	    twice.
Files:	    src/screen.c


*** ../vim-7.2.242/src/screen.c	2009-06-16 17:22:38.000000000 +0200
--- src/screen.c	2009-07-29 15:59:37.000000000 +0200
***************
*** 7467,7472 ****
--- 7467,7476 ----
       */
      FOR_ALL_TAB_WINDOWS(tp, wp)
  	win_free_lsize(wp);
+ #ifdef FEAT_AUTOCMD
+     if (aucmd_win != NULL)
+ 	win_free_lsize(aucmd_win);
+ #endif
  
      new_ScreenLines = (schar_T *)lalloc((long_u)(
  			      (Rows + 1) * Columns * sizeof(schar_T)), FALSE);
***************
*** 7504,7510 ****
  	}
      }
  #ifdef FEAT_AUTOCMD
!     if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
  	outofmem = TRUE;
  #endif
  #ifdef FEAT_WINDOWS
--- 7508,7515 ----
  	}
      }
  #ifdef FEAT_AUTOCMD
!     if (aucmd_win != NULL && aucmd_win->w_lines == NULL
! 					&& win_alloc_lines(aucmd_win) == FAIL)
  	outofmem = TRUE;
  #endif
  #ifdef FEAT_WINDOWS
*** ../vim-7.2.242/src/version.c	2009-07-29 15:41:32.000000000 +0200
--- src/version.c	2009-07-29 16:07:47.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     243,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
118. You are on a first-name basis with your ISP's staff.

 /// 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    ///


--- NEW FILE 7.2.244 ---
To: vim-dev at vim.org
Subject: Patch 7.2.244
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.244
Problem:    When 'enc' is utf-8 and 'fenc' is latin1, writing a non-latin1
	    character gives a conversion error without any hint what is wrong.
Solution:   When known add the line number to the error message.
Files:	    src/fileio.c


*** ../vim-7.2.243/src/fileio.c	2009-07-29 12:09:49.000000000 +0200
--- src/fileio.c	2009-07-29 17:04:06.000000000 +0200
***************
*** 121,126 ****
--- 121,128 ----
      char_u	*bw_conv_buf;	/* buffer for writing converted chars */
      int		bw_conv_buflen; /* size of bw_conv_buf */
      int		bw_conv_error;	/* set for conversion error */
+     linenr_T	bw_conv_error_lnum;  /* first line with error or zero */
+     linenr_T	bw_start_lnum;  /* line number at start of buffer */
  # ifdef USE_ICONV
      iconv_t	bw_iconv_fd;	/* descriptor for iconv() or -1 */
  # endif
***************
*** 2924,2929 ****
--- 2925,2931 ----
      linenr_T	    lnum;
      long	    nchars;
      char_u	    *errmsg = NULL;
+     int		    errmsg_allocated = FALSE;
      char_u	    *errnum = NULL;
      char_u	    *buffer;
      char_u	    smallbuf[SMBUFSIZE];
***************
*** 2987,2992 ****
--- 2989,2995 ----
      /* must init bw_conv_buf and bw_iconv_fd before jumping to "fail" */
      write_info.bw_conv_buf = NULL;
      write_info.bw_conv_error = FALSE;
+     write_info.bw_conv_error_lnum = 0;
      write_info.bw_restlen = 0;
  # ifdef USE_ICONV
      write_info.bw_iconv_fd = (iconv_t)-1;
***************
*** 4243,4248 ****
--- 4245,4251 ----
  		nchars += write_info.bw_len;
  	}
      }
+     write_info.bw_start_lnum = start;
  #endif
  
      write_info.bw_len = bufsize;
***************
*** 4278,4283 ****
--- 4281,4289 ----
  	    nchars += bufsize;
  	    s = buffer;
  	    len = 0;
+ #ifdef FEAT_MBYTE
+ 	    write_info.bw_start_lnum = lnum;
+ #endif
  	}
  	/* write failed or last line has no EOL: stop here */
  	if (end == 0
***************
*** 4474,4480 ****
  	{
  #ifdef FEAT_MBYTE
  	    if (write_info.bw_conv_error)
! 		errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)");
  	    else
  #endif
  		if (got_int)
--- 4480,4496 ----
  	{
  #ifdef FEAT_MBYTE
  	    if (write_info.bw_conv_error)
! 	    {
! 		if (write_info.bw_conv_error_lnum == 0)
! 		    errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)");
! 		else
! 		{
! 		    errmsg_allocated = TRUE;
! 		    errmsg = alloc(300);
! 		    vim_snprintf((char *)errmsg, 300, _("E513: write error, conversion failed in line %ld (make 'fenc' empty to override)"),
! 					 (long)write_info.bw_conv_error_lnum);
! 		}
! 	    }
  	    else
  #endif
  		if (got_int)
***************
*** 4550,4555 ****
--- 4566,4577 ----
  	{
  	    STRCAT(IObuff, _(" CONVERSION ERROR"));
  	    c = TRUE;
+ 	    if (write_info.bw_conv_error_lnum != 0)
+ 	    {
+ 		int l = STRLEN(IObuff);
+ 		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
+ 			(long)write_info.bw_conv_error_lnum);
+ 	    }
  	}
  	else if (notconverted)
  	{
***************
*** 4746,4751 ****
--- 4768,4775 ----
  	}
  	STRCAT(IObuff, errmsg);
  	emsg(IObuff);
+ 	if (errmsg_allocated)
+ 	    vim_free(errmsg);
  
  	retval = FAIL;
  	if (end == 0)
***************
*** 5105,5111 ****
  			c = buf[wlen];
  		}
  
! 		ip->bw_conv_error |= ucs2bytes(c, &p, flags);
  	    }
  	    if (flags & FIO_LATIN1)
  		len = (int)(p - buf);
--- 5129,5141 ----
  			c = buf[wlen];
  		}
  
! 		if (ucs2bytes(c, &p, flags) && !ip->bw_conv_error)
! 		{
! 		    ip->bw_conv_error = TRUE;
! 		    ip->bw_conv_error_lnum = ip->bw_start_lnum;
! 		}
! 		if (c == NL)
! 		    ++ip->bw_start_lnum;
  	    }
  	    if (flags & FIO_LATIN1)
  		len = (int)(p - buf);
***************
*** 5386,5391 ****
--- 5416,5422 ----
  #ifdef FEAT_MBYTE
  /*
   * Convert a Unicode character to bytes.
+  * Return TRUE for an error, FALSE when it's OK.
   */
      static int
  ucs2bytes(c, pp, flags)
*** ../vim-7.2.243/src/version.c	2009-07-29 16:13:35.000000000 +0200
--- src/version.c	2009-07-29 18:01:27.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     244,
  /**/

-- 
Support your right to bare arms!  Wear short sleeves!

 /// 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    ///


--- NEW FILE 7.2.245 ---
To: vim-dev at vim.org
Subject: Patch 7.2.245
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.245
Problem:    When 'enc' is "utf-16" and 'fenc' is "utf-8" writing a file does
	    conversion while none should be done. (Yukihiro Nakadaira) When
	    'fenc' is empty the file is written as utf-8 instead of utf-16.
Solution:   Do proper comparison of encodings, taking into account that all
	    Unicode values for 'enc' use utf-8 internally.
Files:	    src/fileio.c


*** ../vim-7.2.244/src/fileio.c	2009-07-29 18:05:57.000000000 +0200
--- src/fileio.c	2009-07-29 17:04:06.000000000 +0200
***************
*** 134,140 ****
  #ifdef FEAT_MBYTE
  static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
  static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
! static int same_encoding __ARGS((char_u *a, char_u *b));
  static int get_fio_flags __ARGS((char_u *ptr));
  static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
  static int make_bom __ARGS((char_u *buf, char_u *name));
--- 134,140 ----
  #ifdef FEAT_MBYTE
  static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
  static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
! static int need_conversion __ARGS((char_u *fenc));
  static int get_fio_flags __ARGS((char_u *ptr));
  static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
  static int make_bom __ARGS((char_u *buf, char_u *name));
***************
*** 1043,1055 ****
      }
  
      /*
!      * Conversion is required when the encoding of the file is different
!      * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4 (requires
!      * conversion to UTF-8).
       */
      fio_flags = 0;
!     converted = (*fenc != NUL && !same_encoding(p_enc, fenc));
!     if (converted || enc_unicode != 0)
      {
  
  	/* "ucs-bom" means we need to check the first bytes of the file
--- 1043,1054 ----
      }
  
      /*
!      * Conversion may be required when the encoding of the file is different
!      * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4.
       */
      fio_flags = 0;
!     converted = need_conversion(fenc);
!     if (converted)
      {
  
  	/* "ucs-bom" means we need to check the first bytes of the file
***************
*** 3969,3978 ****
  	fenc = buf->b_p_fenc;
  
      /*
!      * The file needs to be converted when 'fileencoding' is set and
!      * 'fileencoding' differs from 'encoding'.
       */
!     converted = (*fenc != NUL && !same_encoding(p_enc, fenc));
  
      /*
       * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done.  Or
--- 3968,3976 ----
  	fenc = buf->b_p_fenc;
  
      /*
!      * Check if the file needs to be converted.
       */
!     converted = need_conversion(fenc);
  
      /*
       * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done.  Or
***************
*** 5502,5521 ****
  }
  
  /*
!  * Return TRUE if "a" and "b" are the same 'encoding'.
!  * Ignores difference between "ansi" and "latin1", "ucs-4" and "ucs-4be", etc.
   */
      static int
! same_encoding(a, b)
!     char_u	*a;
!     char_u	*b;
  {
!     int		f;
  
!     if (STRCMP(a, b) == 0)
! 	return TRUE;
!     f = get_fio_flags(a);
!     return (f != 0 && get_fio_flags(b) == f);
  }
  
  /*
--- 5500,5536 ----
  }
  
  /*
!  * Return TRUE if file encoding "fenc" requires conversion from or to
!  * 'encoding'.
   */
      static int
! need_conversion(fenc)
!     char_u	*fenc;
  {
!     int		same_encoding;
!     int		enc_flags;
!     int		fenc_flags;
  
!     if (*fenc == NUL || STRCMP(p_enc, fenc) == 0)
! 	same_encoding = TRUE;
!     else
!     {
! 	/* Ignore difference between "ansi" and "latin1", "ucs-4" and
! 	 * "ucs-4be", etc. */
! 	enc_flags = get_fio_flags(p_enc);
! 	fenc_flags = get_fio_flags(fenc);
! 	same_encoding = (enc_flags != 0 && fenc_flags == enc_flags);
!     }
!     if (same_encoding)
!     {
! 	/* Specified encoding matches with 'encoding'.  This requires
! 	 * conversion when 'encoding' is Unicode but not UTF-8. */
! 	return enc_unicode != 0;
!     }
! 
!     /* Encodings differ.  However, conversion is not needed when 'enc' is any
!      * Unicode encoding and the file is UTF-8. */
!     return !(enc_utf8 && fenc_flags == FIO_UTF8);
  }
  
  /*
*** ../vim-7.2.244/src/version.c	2009-07-29 18:05:57.000000000 +0200
--- src/version.c	2009-07-29 18:20:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     245,
  /**/

-- 
An actual excerpt from a classified section of a city newspaper:
"Illiterate?  Write today for free help!"

 /// 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    ///


--- NEW FILE 7.2.246 ---
To: vim-dev at vim.org
Subject: Patch 7.2.246
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.246
Problem:    Cscope home page link is wrong.
Solution:   Update the URL. (Sergey Khorev)
Files:	    runtime/doc/if_cscop.txt


*** ../vim-7.2.245/runtime/doc/if_cscop.txt	2009-07-09 21:22:36.000000000 +0200
--- runtime/doc/if_cscop.txt	2009-09-11 11:19:31.000000000 +0200
***************
*** 481,487 ****
  any problems, suggestions, patches, et al., you have for the usage of
  cscope within Vim to him.
  							*cscope-win32*
! For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html
  
  Win32 support was added by Sergey Khorev <sergey.khorev at gmail.com>.  Contact
  him if you have Win32-specific issues.
--- 481,488 ----
  any problems, suggestions, patches, et al., you have for the usage of
  cscope within Vim to him.
  							*cscope-win32*
! For a cscope version for Win32 see:
! 	http://code.google.com/p/cscope-win32/
  
  Win32 support was added by Sergey Khorev <sergey.khorev at gmail.com>.  Contact
  him if you have Win32-specific issues.
*** ../vim-7.2.245/src/version.c	2009-07-29 18:24:59.000000000 +0200
--- src/version.c	2009-09-11 11:29:02.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     246,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
221. Your wife melts your keyboard in the oven.

 /// 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    ///


--- NEW FILE 7.2.247 ---
To: vim-dev at vim.org
Subject: Patch 7.2.247
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.247
Problem:    Mzscheme interface minor problem.
Solution:   Better error message when build fails. (Sergey Khorev)
Files:	    src/if_mzsch.c


*** ../vim-7.2.246/src/if_mzsch.c	2009-07-09 20:06:30.000000000 +0200
--- src/if_mzsch.c	2009-09-11 11:20:39.000000000 +0200
***************
*** 635,642 ****
  #endif /* DYNAMIC_MZSCHEME */
  
  /* need to put it here for dynamic stuff to work */
! #ifdef INCLUDE_MZSCHEME_BASE
  # include "mzscheme_base.c"
  #endif
  
  /*
--- 635,644 ----
  #endif /* DYNAMIC_MZSCHEME */
  
  /* need to put it here for dynamic stuff to work */
! #if defined(INCLUDE_MZSCHEME_BASE)
  # include "mzscheme_base.c"
+ #elif MZSCHEME_VERSION_MAJOR >= 400
+ # error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes
  #endif
  
  /*
***************
*** 875,888 ****
  #ifdef INCLUDE_MZSCHEME_BASE
      {
  	/*
! 	 * versions 4.x do not provide Scheme bindings by defaults
  	 * we need to add them explicitly
  	 */
  	Scheme_Object *scheme_base_symbol = NULL;
  	MZ_GC_DECL_REG(1);
  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
  	MZ_GC_REG();
! 	/* invoke function from generated and included base.c */
  	declare_modules(environment);
  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
  	MZ_GC_CHECK();
--- 877,890 ----
  #ifdef INCLUDE_MZSCHEME_BASE
      {
  	/*
! 	 * versions 4.x do not provide Scheme bindings by default
  	 * we need to add them explicitly
  	 */
  	Scheme_Object *scheme_base_symbol = NULL;
  	MZ_GC_DECL_REG(1);
  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
  	MZ_GC_REG();
! 	/* invoke function from generated and included mzscheme_base.c */
  	declare_modules(environment);
  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
  	MZ_GC_CHECK();
*** ../vim-7.2.246/src/version.c	2009-09-11 11:30:12.000000000 +0200
--- src/version.c	2009-09-11 11:53:59.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     247,
  /**/

-- 
Your fault: core dumped

 /// 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    ///


--- NEW FILE 7.2.248 ---
To: vim-dev at vim.org
Subject: Patch 7.2.248 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.248 (extra)
Problem:    Mzscheme interface building minor problems.
Solution:   Update Win32 makefiles. (Sergey Khorev)
Files:	    src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak


*** ../vim-7.2.247/src/Make_cyg.mak	2007-09-30 22:28:48.000000000 +0200
--- src/Make_cyg.mak	2009-09-11 11:23:23.000000000 +0200
***************
*** 212,224 ****
  MZSCHEME_VER = 209_000
  endif
  
  ifeq (yes, $(DYNAMIC_MZSCHEME))
  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
  else
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS = $(MZSCHEME)
  endif
! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
  endif
  endif
  
--- 212,245 ----
  MZSCHEME_VER = 209_000
  endif
  
+ ifndef MZSCHEME_PRECISE_GC
+ MZSCHEME_PRECISE_GC=no
+ endif
+ 
+ # for version 4.x we need to generate byte-code for Scheme base
+ ifndef MZSCHEME_GENERATE_BASE
+ MZSCHEME_GENERATE_BASE=no
+ endif
+ 
  ifeq (yes, $(DYNAMIC_MZSCHEME))
  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
  else
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS = $(MZSCHEME)
  endif
! ifeq (yes,$(MZSCHEME_PRECISE_GC))
! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
! else
! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
! endif
! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
! endif
! ifeq (yes,$(MZSCHEME_GENERATE_BASE))
! DEFINES += -DINCLUDE_MZSCHEME_BASE
! MZ_EXTRA_DEP += mzscheme_base.c
! endif
! ifeq (yes,$(MZSCHEME_PRECISE_GC))
! DEFINES += -DMZ_PRECISE_GC
  endif
  endif
  
***************
*** 473,478 ****
--- 494,502 ----
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
+ ifdef MZSCHEME
+ 	-$(DEL) mzscheme_base.c
+ endif
  	-$(DEL) pathdef.c
  	$(MAKE) -C xxd -f Make_cyg.mak clean
  	$(MAKE) -C GvimExt -f Make_ming.mak clean
***************
*** 523,531 ****
--- 547,561 ----
  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_DEP)
  	$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
  
+ $(OUTDIR)/if_mzsch.o:	if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
+ 	$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
+ 
  $(OUTDIR)/vimrc.o:	vim.rc version.h gui_w32_rc.h
  	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
  
+ mzscheme_base.c:
+ 	$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
+ 
  pathdef.c: $(INCL)
  ifneq (sh.exe, $(SHELL))
  	@echo creating pathdef.c
*** ../vim-7.2.247/src/Make_ming.mak	2009-05-26 22:58:43.000000000 +0200
--- src/Make_ming.mak	2009-09-11 11:23:28.000000000 +0200
***************
*** 135,141 ****
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS=$(MZSCHEME)
  endif
! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS)
  endif
  
  endif
--- 135,141 ----
  ifndef MZSCHEME_DLLS
  MZSCHEME_DLLS=$(MZSCHEME)
  endif
! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
  endif
  
  endif
***************
*** 563,568 ****
--- 563,571 ----
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
+ ifdef MZSCHEME
+ 	-$(DEL) mzscheme_base.c
+ endif
  	$(MAKE) -C GvimExt -f Make_ming.mak clean
  	$(MAKE) -C xxd -f Make_cyg.mak clean
  
*** ../vim-7.2.247/src/Make_mvc.mak	2009-06-16 16:45:14.000000000 +0200
--- src/Make_mvc.mak	2009-09-11 11:23:28.000000000 +0200
***************
*** 865,870 ****
--- 865,871 ----
  	- if exist dimm_i.c del dimm_i.c
  	- if exist dimm.tlb del dimm.tlb
  	- if exist dosinst.exe del dosinst.exe
+ 	- if exist mzscheme_base.c del mzscheme_base.c
  	cd xxd
  	$(MAKE) /NOLOGO -f Make_mvc.mak clean
  	cd ..
*** ../vim-7.2.247/src/version.c	2009-09-11 12:20:47.000000000 +0200
--- src/version.c	2009-09-11 12:48:26.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     248,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
222. You send more than 20 personal e-mails a day.

 /// 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    ///


--- NEW FILE 7.2.249 ---
To: vim-dev at vim.org
Subject: Patch 7.2.249
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.249
Problem:    The script to check .po files can't handle '%' in plural forms.
Solution:   Remove "Plural-Forms:" from the checked string.
Files:	    src/po/check.vim


*** ../vim-7.2.248/src/po/check.vim	2008-06-09 14:45:38.000000000 +0200
--- src/po/check.vim	2009-09-11 12:37:56.000000000 +0200
***************
*** 23,28 ****
--- 23,31 ----
    " remove '%', not used for formatting.
    let idline = substitute(idline, "'%'", '', 'g')
  
+   " remove '%' used for plural forms.
+   let idline = substitute(idline, '\\nPlural-Forms: .\+;\\n', '', '')
+ 
    " remove everything but % items.
    return substitute(idline, '[^%]*\(%[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g')
  endfunc
*** ../vim-7.2.248/src/version.c	2009-09-11 12:48:56.000000000 +0200
--- src/version.c	2009-09-11 12:59:18.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     249,
  /**/

-- 
If evolution theories are correct, humans will soon grow a third
hand for operating the mouse.

 /// 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    ///


--- NEW FILE 7.2.250 ---
To: vim-dev at vim.org
Subject: Patch 7.2.250 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.250 (extra)
Problem:    Possible buffer overflow.
Solution:   Compute the remaining space. (Dominique Pelle)
Files:	    src/GvimExt/gvimext.cpp


*** ../vim-7.2.249/src/GvimExt/gvimext.cpp	2008-07-24 20:51:11.000000000 +0200
--- src/GvimExt/gvimext.cpp	2009-09-11 13:26:27.000000000 +0200
***************
*** 635,641 ****
  	}
  	// Now concatenate
  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
! 	strncat(temp, title, BUFSIZE - 1);
  	InsertMenu(hMenu,
  		indexMenu++,
  		MF_STRING|MF_BYPOSITION,
--- 635,643 ----
  	}
  	// Now concatenate
  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
! 	temp[BUFSIZE - 1] = '\0';
! 	strncat(temp, title, BUFSIZE - 1 - strlen(temp));
! 	temp[BUFSIZE - 1] = '\0';
  	InsertMenu(hMenu,
  		indexMenu++,
  		MF_STRING|MF_BYPOSITION,
*** ../vim-7.2.249/src/version.c	2009-09-11 12:59:57.000000000 +0200
--- src/version.c	2009-09-11 13:23:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     250,
  /**/


-- 
hundred-and-one symptoms of being an internet addict:
223. You set up a web-cam as your home's security system.

 /// 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    ///


--- NEW FILE 7.2.251 ---
To: vim-dev at vim.org
Subject: Patch 7.2.251
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.251 (after 7.2.044)
Problem:    Compiler adds invalid memory bounds check.
Solution:   Remove _FORTIFY_SOURCE=2 from CFLAGS. (Dominique Pelle)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.250/src/auto/configure	2009-07-22 11:16:54.000000000 +0200
--- src/auto/configure	2009-08-07 14:49:52.000000000 +0200
***************
*** 17135,17141 ****
        { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
  $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
    if test "$gccmajor" -gt "3"; then
!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
      { $as_echo "$as_me:$LINENO: result: yes" >&5
  $as_echo "yes" >&6; }
    else
--- 17135,17141 ----
        { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
  $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
    if test "$gccmajor" -gt "3"; then
!     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
      { $as_echo "$as_me:$LINENO: result: yes" >&5
  $as_echo "yes" >&6; }
    else
*** ../vim-7.2.250/src/configure.in	2009-07-22 11:16:54.000000000 +0200
--- src/configure.in	2009-08-07 14:49:47.000000000 +0200
***************
*** 3233,3239 ****
    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
    if test "$gccmajor" -gt "3"; then
!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
      AC_MSG_RESULT(yes)
    else
      AC_MSG_RESULT(no)
--- 3233,3239 ----
    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
    if test "$gccmajor" -gt "3"; then
!     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
      AC_MSG_RESULT(yes)
    else
      AC_MSG_RESULT(no)
*** ../vim-7.2.250/src/version.c	2009-09-11 13:26:38.000000000 +0200
--- src/version.c	2009-09-11 13:43:46.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     251,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
225. You sign up for free subscriptions for all the computer magazines

 /// 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    ///


--- NEW FILE 7.2.252 ---
To: vim-dev at vim.org
Subject: Patch 7.2.252
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.252
Problem:    When using a multi-byte 'enc' the 'iskeyword' option cannot
	    contain characters above 128.
Solution:   Use mb_ptr2char_adv().
Files:	    src/charset.c


*** ../vim-7.2.251/src/charset.c	2009-05-14 22:19:19.000000000 +0200
--- src/charset.c	2009-09-09 21:11:46.000000000 +0200
***************
*** 174,179 ****
--- 174,184 ----
  	    if (VIM_ISDIGIT(*p))
  		c = getdigits(&p);
  	    else
+ #ifdef FEAT_MBYTE
+ 		 if (has_mbyte)
+ 		c = mb_ptr2char_adv(&p);
+ 	    else
+ #endif
  		c = *p++;
  	    c2 = -1;
  	    if (*p == '-' && p[1] != NUL)
*** ../vim-7.2.251/src/version.c	2009-09-11 13:44:33.000000000 +0200
--- src/version.c	2009-09-11 14:01:48.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     252,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
226. You sit down at the computer right after dinner and your spouse
     says "See you in the morning."

 /// 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    ///


--- NEW FILE 7.2.253 ---
To: vim-dev at vim.org
Subject: Patch 7.2.253
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.253
Problem:    Netbeans interface: getLength always uses current buffer.
Solution:   Use ml_get_buf() instead of ml_get(). (Xavier de Gaye)
Files:	    src/netbeans.c


*** ../vim-7.2.252/src/netbeans.c	2009-06-24 16:49:50.000000000 +0200
--- src/netbeans.c	2009-09-11 13:40:14.000000000 +0200
***************
*** 1499,1505 ****
  		    return FAIL;
  		}
  		first = *pos;
! 		nbdebug(("    FIRST POS: line %d, col %d\n", first.lnum, first.col));
  		pos = off2pos(buf->bufp, off+count-1);
  		if (!pos)
  		{
--- 1499,1506 ----
  		    return FAIL;
  		}
  		first = *pos;
! 		nbdebug(("    FIRST POS: line %d, col %d\n",
! 						      first.lnum, first.col));
  		pos = off2pos(buf->bufp, off+count-1);
  		if (!pos)
  		{
***************
*** 1510,1516 ****
  		    return FAIL;
  		}
  		last = *pos;
! 		nbdebug(("    LAST POS: line %d, col %d\n", last.lnum, last.col));
  		del_from_lnum = first.lnum;
  		del_to_lnum = last.lnum;
  		doupdate = 1;
--- 1511,1518 ----
  		    return FAIL;
  		}
  		last = *pos;
! 		nbdebug(("    LAST POS: line %d, col %d\n",
! 							last.lnum, last.col));
  		del_from_lnum = first.lnum;
  		del_to_lnum = last.lnum;
  		doupdate = 1;
***************
*** 1521,1527 ****
  		next = off2pos(buf->bufp, off + count);
  
  		/* Remove part of the first line. */
! 		if (first.col != 0 || (next != NULL && first.lnum == next->lnum))
  		{
  		    if (first.lnum != last.lnum
  			    || (next != NULL && first.lnum != next->lnum))
--- 1523,1530 ----
  		next = off2pos(buf->bufp, off + count);
  
  		/* Remove part of the first line. */
! 		if (first.col != 0
! 				|| (next != NULL && first.lnum == next->lnum))
  		{
  		    if (first.lnum != last.lnum
  			    || (next != NULL && first.lnum != next->lnum))
***************
*** 1584,1590 ****
  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
  			if (id > 0)
  			{
! 			    nbdebug(("    Deleting sign %d on line %d\n", id, i));
  			    buf_delsign(buf->bufp, id);
  			}
  			else
--- 1587,1594 ----
  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
  			if (id > 0)
  			{
! 			    nbdebug(("    Deleting sign %d on line %d\n",
! 								      id, i));
  			    buf_delsign(buf->bufp, id);
  			}
  			else
***************
*** 1593,1599 ****
  			}
  		    }
  
! 		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
  		    curwin->w_cursor.lnum = del_from_lnum;
  		    curwin->w_cursor.col = 0;
  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
--- 1597,1604 ----
  			}
  		    }
  
! 		    nbdebug(("    Deleting lines %d through %d\n",
! 						 del_from_lnum, del_to_lnum));
  		    curwin->w_cursor.lnum = del_from_lnum;
  		    curwin->w_cursor.col = 0;
  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
***************
*** 3514,3520 ****
  	    eol_size = 1;
  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
  	{
! 	    char_count += (long)STRLEN(ml_get(lnum)) + eol_size;
  	    /* Check for a CTRL-C every 100000 characters */
  	    if (char_count > last_check)
  	    {
--- 3519,3526 ----
  	    eol_size = 1;
  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
  	{
! 	    char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
! 								   + eol_size;
  	    /* Check for a CTRL-C every 100000 characters */
  	    if (char_count > last_check)
  	    {
*** ../vim-7.2.252/src/version.c	2009-09-11 14:02:25.000000000 +0200
--- src/version.c	2009-09-11 14:18:45.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     253,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
227. You sleep next to your monitor.  Or on top of it.

 /// 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    ///


--- NEW FILE 7.2.254 ---
To: vim-dev at vim.org
Subject: Patch 7.2.254
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.254
Problem:    Compiler warning for assigning size_t to int.
Solution:   Use size_t for the variable. (George Reilly)
Files:	    src/fileio.c


*** ../vim-7.2.253/src/fileio.c	2009-07-29 18:24:59.000000000 +0200
--- src/fileio.c	2009-09-11 13:46:19.000000000 +0200
***************
*** 4568,4574 ****
  	    c = TRUE;
  	    if (write_info.bw_conv_error_lnum != 0)
  	    {
! 		int l = STRLEN(IObuff);
  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
  			(long)write_info.bw_conv_error_lnum);
  	    }
--- 4568,4574 ----
  	    c = TRUE;
  	    if (write_info.bw_conv_error_lnum != 0)
  	    {
! 		size_t l = STRLEN(IObuff);
  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
  			(long)write_info.bw_conv_error_lnum);
  	    }
*** ../vim-7.2.253/src/version.c	2009-09-11 14:19:41.000000000 +0200
--- src/version.c	2009-09-11 15:03:42.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     254,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
230. You spend your Friday nights typing away at your keyboard

 /// 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    ///


--- NEW FILE 7.2.255 ---
To: vim-dev at vim.org
Subject: Patch 7.2.255
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.255 (after 7.2.242)
Problem:    Setting 'rightleft', 'linebreak' and 'wrap' may cause cursor to be
	    in wrong place.
Solution:   Recompute the cursor column for these options.
Files:	    src/option.c


*** ../vim-7.2.254/src/option.c	2009-07-29 15:41:32.000000000 +0200
--- src/option.c	2009-09-11 13:59:55.000000000 +0200
***************
*** 7430,7435 ****
--- 7430,7437 ----
      {
  	if (curwin->w_p_wrap)
  	    curwin->w_leftcol = 0;
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
      }
  
  #ifdef FEAT_WINDOWS
***************
*** 7664,7669 ****
--- 7666,7687 ----
      }
  #endif
  
+ #ifdef FEAT_LINEBREAK
+     if ((int *)varp == &curwin->w_p_lbr)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ #endif
+ 
+ #ifdef FEAT_RIGHTLEFT
+     if ((int *)varp == &curwin->w_p_rl)
+     {
+ 	if (curwin->w_curswant != MAXCOL)
+ 	    curwin->w_set_curswant = TRUE;
+     }
+ #endif
+ 
      /*
       * End of handling side effects for bool options.
       */
*** ../vim-7.2.254/src/version.c	2009-09-11 15:04:13.000000000 +0200
--- src/version.c	2009-09-11 15:19:40.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     255,
  /**/

-- 
A computer without Windows is like a fish without a bicycle.

 /// 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    ///


--- NEW FILE 7.2.256 ---
To: vim-dev at vim.org
Subject: Patch 7.2.256
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.256
Problem:    When 'guifont' was not set GTK font dialog doesn't have a default.
	    (Andreas Metzler)
Solution:   Set default to DEFAULT_FONT. (James Vega)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.255/src/gui_gtk_x11.c	2009-07-01 18:04:30.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-11 14:21:32.000000000 +0200
***************
*** 4729,4734 ****
--- 4729,4737 ----
      if (oldval != NULL && *oldval != NUL)
  	gtk_font_selection_dialog_set_font_name(
  		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), (char *)oldval);
+     else
+ 	gtk_font_selection_dialog_set_font_name(
+ 		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), DEFAULT_FONT);
  
      if (gui.fontname)
      {
***************
*** 4816,4821 ****
--- 4819,4827 ----
  	if (oldname != oldval)
  	    vim_free(oldname);
      }
+     else
+ 	gtk_font_selection_dialog_set_font_name(
+ 		GTK_FONT_SELECTION_DIALOG(dialog), DEFAULT_FONT);
  
      response = gtk_dialog_run(GTK_DIALOG(dialog));
  
*** ../vim-7.2.255/src/version.c	2009-09-11 15:20:22.000000000 +0200
--- src/version.c	2009-09-11 15:45:36.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     256,
  /**/

-- 
Get a life?  What is the URL where it can be downloaded?

 /// 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    ///


--- NEW FILE 7.2.257 ---
To: vim-dev at vim.org
Subject: Patch 7.2.257
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.257
Problem:    With GTK 2.17 lots of assertion error messages.
Solution:   Remove check for static gravity. (Sebastian Droege)
Files:	    src/gui_gtk_f.c


*** ../vim-7.2.256/src/gui_gtk_f.c	2009-05-17 23:25:16.000000000 +0200
--- src/gui_gtk_f.c	2009-09-11 15:15:41.000000000 +0200
***************
*** 860,870 ****
  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
  {
  #ifdef HAVE_GTK2
!     gboolean static_gravity_supported;
! 
!     static_gravity_supported = gdk_window_set_static_gravities(window,
! 							       use_static);
!     g_return_if_fail(static_gravity_supported);
  #else
      XSetWindowAttributes xattributes;
  
--- 860,868 ----
  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
  {
  #ifdef HAVE_GTK2
!     /* We don't check if static gravity is actually supported, because it
!      * results in an annoying assertion error message. */
!     gdk_window_set_static_gravities(window, use_static);
  #else
      XSetWindowAttributes xattributes;
  
*** ../vim-7.2.256/src/version.c	2009-09-11 15:46:20.000000000 +0200
--- src/version.c	2009-09-11 16:16:52.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     257,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
     in the front doorway permanently so it always looks like you are
     actually attempting to do something about that mess that has amassed
     since you discovered the Internet.

 /// 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    ///


--- NEW FILE 7.2.258 ---
To: vim-dev at vim.org
Subject: Patch 7.2.258
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.258
Problem:    v:beval_col and b:beval_text are wrong in UTF-8 text. (Tony
	    Mechelynck)
Solution:   Use byte number instead of character number for the column.
Files:	    src/ui.c


*** ../vim-7.2.257/src/ui.c	2009-07-01 18:04:30.000000000 +0200
--- src/ui.c	2009-09-11 16:11:50.000000000 +0200
***************
*** 3055,3072 ****
      int		vcol;
  {
      /* try to advance to the specified column */
-     int		col = 0;
      int		count = 0;
      char_u	*ptr;
  
!     ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
      while (count <= vcol && *ptr != NUL)
      {
- 	++col;
  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
  	mb_ptr_adv(ptr);
      }
!     return col;
  }
  #endif
  
--- 3055,3071 ----
      int		vcol;
  {
      /* try to advance to the specified column */
      int		count = 0;
      char_u	*ptr;
+     char_u	*start;
  
!     start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
      while (count <= vcol && *ptr != NUL)
      {
  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
  	mb_ptr_adv(ptr);
      }
!     return (int)(ptr - start);
  }
  #endif
  
*** ../vim-7.2.257/src/version.c	2009-09-11 16:17:36.000000000 +0200
--- src/version.c	2009-09-11 16:45:48.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     258,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
232. You start conversations with, "Have you gotten an ISDN line?"

 /// 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    ///


--- NEW FILE 7.2.259 ---
To: vim-dev at vim.org
Subject: Patch 7.2.259
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.259
Problem:    exists() doesn't work properly for an empty aucmd group.
Solution:   Change how au_exists() handles a missing pattern.  Also add a
	    test for this. (Bob Hiestand)
Files:	    src/fileio.c, src/testdir/Makefile, src/testdir/test67.in,
	    src/testdir/test67.ok


*** ../vim-7.2.258/src/fileio.c	2009-09-11 15:04:13.000000000 +0200
--- src/fileio.c	2009-09-11 16:37:08.000000000 +0200
***************
*** 9498,9512 ****
      ap = first_autopat[(int)event];
      if (ap == NULL)
  	goto theend;
-     if (pattern == NULL)
-     {
- 	retval = TRUE;
- 	goto theend;
-     }
  
      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
      /* for pattern "<buffer=N>, fnamecmp() will work fine */
!     if (STRICMP(pattern, "<buffer>") == 0)
  	buflocal_buf = curbuf;
  
      /* Check if there is an autocommand with the given pattern. */
--- 9498,9507 ----
      ap = first_autopat[(int)event];
      if (ap == NULL)
  	goto theend;
  
      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
      /* for pattern "<buffer=N>, fnamecmp() will work fine */
!     if (pattern != NULL && STRICMP(pattern, "<buffer>") == 0)
  	buflocal_buf = curbuf;
  
      /* Check if there is an autocommand with the given pattern. */
***************
*** 9515,9523 ****
  	/* For buffer-local autocommands, fnamecmp() works fine. */
  	if (ap->pat != NULL && ap->cmds != NULL
  	    && (group == AUGROUP_ALL || ap->group == group)
! 	    && (buflocal_buf == NULL
! 		 ? fnamecmp(ap->pat, pattern) == 0
! 		 : ap->buflocal_nr == buflocal_buf->b_fnum))
  	{
  	    retval = TRUE;
  	    break;
--- 9510,9519 ----
  	/* For buffer-local autocommands, fnamecmp() works fine. */
  	if (ap->pat != NULL && ap->cmds != NULL
  	    && (group == AUGROUP_ALL || ap->group == group)
! 	    && (pattern == NULL
! 		|| (buflocal_buf == NULL
! 		    ? fnamecmp(ap->pat, pattern) == 0
! 		    : ap->buflocal_nr == buflocal_buf->b_fnum)))
  	{
  	    retval = TRUE;
  	    break;
*** ../vim-7.2.258/src/testdir/Makefile	2009-06-24 18:07:55.000000000 +0200
--- src/testdir/Makefile	2009-09-11 16:31:33.000000000 +0200
***************
*** 22,28 ****
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out
  
  SCRIPTS_GUI = test16.out
  
--- 22,28 ----
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out
  
  SCRIPTS_GUI = test16.out
  
*** ../vim-7.2.258/src/testdir/test67.in	2009-09-11 17:23:47.000000000 +0200
--- src/testdir/test67.in	2009-09-11 16:43:11.000000000 +0200
***************
*** 0 ****
--- 1,33 ----
+ Test that groups and patterns are tested correctly when calling exists() for
+ autocommands.
+ 
+ STARTTEST
+ :so small.vim
+ :let results=[]
+ :augroup auexists
+ :augroup END
+ :call add(results, "##BufEnter: " . exists("##BufEnter"))
+ :call add(results, "#BufEnter: " . exists("#BufEnter"))
+ :au BufEnter * let g:entered=1
+ :call add(results, "#BufEnter: " . exists("#BufEnter"))
+ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
+ :augroup auexists
+ :au BufEnter * let g:entered=1
+ :augroup END
+ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
+ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
+ :au BufEnter *.test let g:entered=1
+ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
+ :edit testfile.test
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :au BufEnter <buffer> let g:entered=1
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :edit testfile2.test
+ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
+ :e test.out
+ :call append(0, results)
+ :$d
+ :w
+ :qa!
+ ENDTEST
+ 
*** ../vim-7.2.258/src/testdir/test67.ok	2009-09-11 17:23:47.000000000 +0200
--- src/testdir/test67.ok	2009-09-11 16:43:15.000000000 +0200
***************
*** 0 ****
--- 1,10 ----
+ ##BufEnter: 1
+ #BufEnter: 0
+ #BufEnter: 1
+ #auexists#BufEnter: 0
+ #auexists#BufEnter: 1
+ #BufEnter#*.test: 0
+ #BufEnter#*.test: 1
+ #BufEnter#<buffer>: 0
+ #BufEnter#<buffer>: 1
+ #BufEnter#<buffer>: 0
*** ../vim-7.2.258/src/version.c	2009-09-11 16:48:06.000000000 +0200
--- src/version.c	2009-09-11 17:23:14.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     259,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
234. You started college as a chemistry major, and walk out four years
     later as an Internet provider.

 /// 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    ///


--- NEW FILE 7.2.260 ---
To: vim-dev at vim.org
Subject: Patch 7.2.260 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.260 (extra part of 7.2.259)
Problem:    exists() doesn't work properly for empty aucmd group.
Solution:   Change how au_exists() handles a missing pattern.  Also add a
	    test for this. (Bob Hiestand)
Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
	    src/testdir/Make_vms.mms


*** ../vim-7.2.259/src/testdir/Make_amiga.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_amiga.mak	2009-09-11 16:29:54.000000000 +0200
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
***************
*** 112,114 ****
--- 112,115 ----
  test64.out: test64.in
  test65.out: test65.in
  test66.out: test66.in
+ test67.out: test67.in
*** ../vim-7.2.259/src/testdir/Make_dos.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_dos.mak	2009-09-11 16:30:17.000000000 +0200
***************
*** 26,32 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out
  
  SCRIPTS32 =	test50.out
  
--- 26,32 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.259/src/testdir/Make_ming.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_ming.mak	2009-09-11 16:30:37.000000000 +0200
***************
*** 45,51 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out
  
  SCRIPTS32 =	test50.out
  
--- 45,51 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.259/src/testdir/Make_os2.mak	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_os2.mak	2009-09-11 16:30:52.000000000 +0200
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
*** ../vim-7.2.259/src/testdir/Make_vms.mms	2009-03-11 16:36:04.000000000 +0100
--- src/testdir/Make_vms.mms	2009-09-11 16:31:06.000000000 +0200
***************
*** 4,10 ****
  # Authors:	Zoltan Arpadffy, <arpadffy at polarhome.com>
  #		Sandor Kopanyi,  <sandor.kopanyi at mailbox.hu>
  #
! # Last change:  2009 Mar 05
  #
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
  # Edit the lines in the Configuration section below to select.
--- 4,10 ----
  # Authors:	Zoltan Arpadffy, <arpadffy at polarhome.com>
  #		Sandor Kopanyi,  <sandor.kopanyi at mailbox.hu>
  #
! # Last change:  2009 Sep 11
  #
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
  # Edit the lines in the Configuration section below to select.
***************
*** 69,75 ****
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
--- 69,75 ----
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
*** ../vim-7.2.259/src/version.c	2009-09-11 17:24:01.000000000 +0200
--- src/version.c	2009-09-18 14:57:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     260,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
251. You've never seen your closest friends who usually live WAY too far away.

 /// 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    ///


--- NEW FILE 7.2.261 ---
To: vim-dev at vim.org
Subject: Patch 7.2.261
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.261
Problem:    When deleting lines with a specific folding configuration E38 may
	    appear. (Shahaf)
Solution:   When adjusting nested folds for deleted lines take into account
	    that they don't start at the top of the enclosing fold.
Files:	    src/fold.c


*** ../vim-7.2.260/src/fold.c	2009-01-06 15:01:58.000000000 +0100
--- src/fold.c	2009-09-18 14:43:23.000000000 +0200
***************
*** 1607,1617 ****
  	    }
  	    else
  	    {
- 		/* 2, 3, or 5: need to correct nested folds too */
- 		foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
- 				  line2 - fp->fd_top, amount, amount_after);
  		if (fp->fd_top < top)
  		{
  		    if (last <= line2)
  		    {
  			/* 2. fold contains line1, line2 is below fold */
--- 1607,1617 ----
  	    }
  	    else
  	    {
  		if (fp->fd_top < top)
  		{
+ 		    /* 2 or 3: need to correct nested folds too */
+ 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
+ 				  line2 - fp->fd_top, amount, amount_after);
  		    if (last <= line2)
  		    {
  			/* 2. fold contains line1, line2 is below fold */
***************
*** 1628,1634 ****
  		}
  		else
  		{
! 		    /* 5. fold is below line1 and contains line2 */
  		    if (amount == MAXLNUM)
  		    {
  			fp->fd_len -= line2 - fp->fd_top + 1;
--- 1628,1638 ----
  		}
  		else
  		{
! 		    /* 5. fold is below line1 and contains line2; need to
! 		     * correct nested folds too */
! 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
! 				  line2 - fp->fd_top, amount,
! 				  amount_after + (fp->fd_top - top));
  		    if (amount == MAXLNUM)
  		    {
  			fp->fd_len -= line2 - fp->fd_top + 1;
*** ../vim-7.2.260/src/version.c	2009-09-18 14:58:26.000000000 +0200
--- src/version.c	2009-09-18 15:14:40.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     261,
  /**/

-- 
Emacs is a nice OS - but it lacks a good text editor.
That's why I am using Vim.  --Anonymous

 /// 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    ///


--- NEW FILE 7.2.262 ---
To: vim-dev at vim.org
Subject: Patch 7.2.262
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.262
Problem:    When using custom completion for a user command the pattern string
	    goes beyond the cursor position. (Hari Krishna Dara)
Solution:   Truncate the string at the cursor position.
Files:	    src/ex_getln.c, src/structs.h


*** ../vim-7.2.261/src/ex_getln.c	2009-06-24 17:04:40.000000000 +0200
--- src/ex_getln.c	2009-09-18 16:58:16.000000000 +0200
***************
*** 3266,3272 ****
      int		i, j;
      char_u	*p1;
      char_u	*p2;
-     int		oldlen;
      int		difflen;
      int		v;
  
--- 3266,3271 ----
***************
*** 3291,3297 ****
      out_flush();
  
      i = (int)(xp->xp_pattern - ccline.cmdbuff);
!     oldlen = ccline.cmdpos - i;
  
      if (type == WILD_NEXT || type == WILD_PREV)
      {
--- 3290,3296 ----
      out_flush();
  
      i = (int)(xp->xp_pattern - ccline.cmdbuff);
!     xp->xp_pattern_len = ccline.cmdpos - i;
  
      if (type == WILD_NEXT || type == WILD_PREV)
      {
***************
*** 3305,3322 ****
  	/*
  	 * Translate string into pattern and expand it.
  	 */
! 	if ((p1 = addstar(&ccline.cmdbuff[i], oldlen, xp->xp_context)) == NULL)
  	    p2 = NULL;
  	else
  	{
! 	    p2 = ExpandOne(xp, p1, vim_strnsave(&ccline.cmdbuff[i], oldlen),
  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
  							      |options, type);
  	    vim_free(p1);
  	    /* longest match: make sure it is not shorter (happens with :help */
  	    if (p2 != NULL && type == WILD_LONGEST)
  	    {
! 		for (j = 0; j < oldlen; ++j)
  		     if (ccline.cmdbuff[i + j] == '*'
  			     || ccline.cmdbuff[i + j] == '?')
  			 break;
--- 3304,3323 ----
  	/*
  	 * Translate string into pattern and expand it.
  	 */
! 	if ((p1 = addstar(xp->xp_pattern, xp->xp_pattern_len,
! 						     xp->xp_context)) == NULL)
  	    p2 = NULL;
  	else
  	{
! 	    p2 = ExpandOne(xp, p1,
! 			 vim_strnsave(&ccline.cmdbuff[i], xp->xp_pattern_len),
  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
  							      |options, type);
  	    vim_free(p1);
  	    /* longest match: make sure it is not shorter (happens with :help */
  	    if (p2 != NULL && type == WILD_LONGEST)
  	    {
! 		for (j = 0; j < xp->xp_pattern_len; ++j)
  		     if (ccline.cmdbuff[i + j] == '*'
  			     || ccline.cmdbuff[i + j] == '?')
  			 break;
***************
*** 3331,3337 ****
  
      if (p2 != NULL && !got_int)
      {
! 	difflen = (int)STRLEN(p2) - oldlen;
  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
  	{
  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
--- 3332,3338 ----
  
      if (p2 != NULL && !got_int)
      {
! 	difflen = (int)STRLEN(p2) - xp->xp_pattern_len;
  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
  	{
  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
***************
*** 3620,3625 ****
--- 3621,3627 ----
      expand_T	*xp;
  {
      xp->xp_pattern = NULL;
+     xp->xp_pattern_len = 0;
      xp->xp_backslash = XP_BS_NONE;
  #ifndef BACKSLASH_IN_FILENAME
      xp->xp_shell = FALSE;
***************
*** 4311,4318 ****
      }
  
      /* add star to file name, or convert to regexp if not exp. files. */
!     file_str = addstar(xp->xp_pattern,
! 			   (int)(str + col - xp->xp_pattern), xp->xp_context);
      if (file_str == NULL)
  	return EXPAND_UNSUCCESSFUL;
  
--- 4313,4320 ----
      }
  
      /* add star to file name, or convert to regexp if not exp. files. */
!     xp->xp_pattern_len = (int)(str + col - xp->xp_pattern);
!     file_str = addstar(xp->xp_pattern, xp->xp_pattern_len, xp->xp_context);
      if (file_str == NULL)
  	return EXPAND_UNSUCCESSFUL;
  
***************
*** 4781,4787 ****
  	sprintf((char *)num, "%d", ccline.cmdpos);
  	args[1] = ccline.cmdbuff;
      }
!     args[0] = xp->xp_pattern;
      args[2] = num;
  
      /* Save the cmdline, we don't know what the function may do. */
--- 4783,4789 ----
  	sprintf((char *)num, "%d", ccline.cmdpos);
  	args[1] = ccline.cmdbuff;
      }
!     args[0] = vim_strnsave(xp->xp_pattern, xp->xp_pattern_len);
      args[2] = num;
  
      /* Save the cmdline, we don't know what the function may do. */
***************
*** 4797,4802 ****
--- 4799,4805 ----
      if (ccline.cmdbuff != NULL)
  	ccline.cmdbuff[ccline.cmdlen] = keep;
  
+     vim_free(args[0]);
      return ret;
  }
  
*** ../vim-7.2.261/src/structs.h	2009-07-29 12:09:49.000000000 +0200
--- src/structs.h	2009-09-18 15:33:15.000000000 +0200
***************
*** 432,437 ****
--- 432,438 ----
  {
      int		xp_context;		/* type of expansion */
      char_u	*xp_pattern;		/* start of item to expand */
+     int		xp_pattern_len;		/* bytes in xp_pattern before cursor */
  #if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
      char_u	*xp_arg;		/* completion function */
      int		xp_scriptID;		/* SID for completion function */
*** ../vim-7.2.261/src/version.c	2009-09-18 15:16:37.000000000 +0200
--- src/version.c	2009-09-18 17:23:20.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     262,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
252. You vote for foreign officials.

 /// 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    ///


--- NEW FILE 7.2.263 ---
To: vim-dev at vim.org
Subject: Patch 7.2.263
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.263
Problem:    GTK2: when using the -geom argument with an offset from the right
	    edge and the size is smaller than the default, the Vim window is
	    not positioned properly.
Solution:   Use another function to set the size. (Vitaly Minko)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.262/src/gui_gtk_x11.c	2009-09-11 15:46:20.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
***************
*** 4066,4071 ****
--- 4066,4073 ----
  {
      guicolor_T fg_pixel = INVALCOLOR;
      guicolor_T bg_pixel = INVALCOLOR;
+     guint		pixel_width;
+     guint		pixel_height;
  
  #ifdef HAVE_GTK2
      /*
***************
*** 4106,4113 ****
  	unsigned int	w, h;
  	int		x = 0;
  	int		y = 0;
- 	guint		pixel_width;
- 	guint		pixel_height;
  
  	mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
  
--- 4108,4113 ----
***************
*** 4160,4168 ****
  	}
      }
  
!     gtk_form_set_size(GTK_FORM(gui.formwin),
! 	    (guint)(gui_get_base_width() + Columns * gui.char_width),
! 	    (guint)(gui_get_base_height() + Rows * gui.char_height));
      update_window_manager_hints(0, 0);
  
      if (foreground_argument != NULL)
--- 4160,4175 ----
  	}
      }
  
!     pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
!     pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
! #ifdef HAVE_GTK2
!     /* For GTK2 changing the size of the form widget doesn't cause window
!      * resizing. */
!     if (gtk_socket_id == 0) 
! 	gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height);
! #else
!     gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height);
! #endif
      update_window_manager_hints(0, 0);
  
      if (foreground_argument != NULL)
*** ../vim-7.2.262/src/version.c	2009-09-18 17:24:54.000000000 +0200
--- src/version.c	2009-09-23 17:34:08.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     263,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
267. You get an extra phone line so you can get phone calls.

 /// 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    ///


--- NEW FILE 7.2.264 ---
To: vim-dev at vim.org
Subject: Patch 7.2.264
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.264
Problem:    GTK2: When the Vim window is maximized setting 'columns' or
	    'lines' doesn't work.
Solution:   Unmaximize the window before setting the size. (Vitaly Minko)
Files:	    src/gui.c, src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro


*** ../vim-7.2.263/src/gui.c	2009-07-29 11:10:31.000000000 +0200
--- src/gui.c	2009-09-23 16:28:09.000000000 +0200
***************
*** 1386,1391 ****
--- 1386,1395 ----
      int		min_height;
      int		screen_w;
      int		screen_h;
+ #ifdef HAVE_GTK2
+     int		un_maximize = mustset;
+     int         did_adjust = 0;
+ #endif
  
      if (!gui.shell_created)
  	return;
***************
*** 1425,1446 ****
  	    if (Columns < MIN_COLUMNS)
  		Columns = MIN_COLUMNS;
  	    width = Columns * gui.char_width + base_width;
  	}
  	if ((direction & RESIZE_VERT) && height > screen_h)
  	{
  	    Rows = (screen_h - base_height) / gui.char_height;
  	    check_shellsize();
  	    height = Rows * gui.char_height + base_height;
  	}
      }
      gui.num_cols = Columns;
      gui.num_rows = Rows;
  
      min_width = base_width + MIN_COLUMNS * gui.char_width;
      min_height = base_height + MIN_LINES * gui.char_height;
! # ifdef FEAT_WINDOWS
      min_height += tabline_height() * gui.char_height;
! # endif
  
      gui_mch_set_shellsize(width, height, min_width, min_height,
  					  base_width, base_height, direction);
--- 1429,1475 ----
  	    if (Columns < MIN_COLUMNS)
  		Columns = MIN_COLUMNS;
  	    width = Columns * gui.char_width + base_width;
+ #ifdef HAVE_GTK2
+ 	    ++did_adjust;
+ #endif
  	}
  	if ((direction & RESIZE_VERT) && height > screen_h)
  	{
  	    Rows = (screen_h - base_height) / gui.char_height;
  	    check_shellsize();
  	    height = Rows * gui.char_height + base_height;
+ #ifdef HAVE_GTK2
+ 	    ++did_adjust;
+ #endif
  	}
+ #ifdef HAVE_GTK2
+ 	if (did_adjust == 2 || (width + gui.char_width >= screen_w
+ 				     && height + gui.char_height >= screen_h))
+ 	    /* don't unmaximize if at maximum size */
+ 	    un_maximize = FALSE;
+ #endif
      }
      gui.num_cols = Columns;
      gui.num_rows = Rows;
  
      min_width = base_width + MIN_COLUMNS * gui.char_width;
      min_height = base_height + MIN_LINES * gui.char_height;
! #ifdef FEAT_WINDOWS
      min_height += tabline_height() * gui.char_height;
! #endif
! 
! #ifdef HAVE_GTK2
!     if (un_maximize)
!     {
! 	/* If the window size is smaller than the screen unmaximize the
! 	 * window, otherwise resizing won't work. */
! 	gui_mch_get_screen_dimensions(&screen_w, &screen_h);
! 	if ((width + gui.char_width < screen_w
! 				   || height + gui.char_height * 2 < screen_h)
! 		&& gui_mch_maximized())
! 	    gui_mch_unmaximize();
!     }
! #endif
  
      gui_mch_set_shellsize(width, height, min_width, min_height,
  					  base_width, base_height, direction);
*** ../vim-7.2.263/src/gui_gtk_x11.c	2009-09-23 17:35:17.000000000 +0200
--- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
***************
*** 4376,4381 ****
--- 4376,4404 ----
  #endif
  #endif /* HAVE_GTK2 */
  
+ #if defined(HAVE_GTK2) || defined(PROTO)
+ /*
+  * Return TRUE if the main window is maximized.
+  */
+     int
+ gui_mch_maximized()
+ {
+     return (gui.mainwin != NULL && gui.mainwin->window != NULL
+ 	    && (gdk_window_get_state(gui.mainwin->window)
+ 					       & GDK_WINDOW_STATE_MAXIMIZED));
+ }
+ 
+ /*
+  * Unmaximize the main window
+  */
+     void
+ gui_mch_unmaximize()
+ {
+     if (gui.mainwin != NULL)
+ 	gtk_window_unmaximize(GTK_WINDOW(gui.mainwin));
+ }
+ #endif
+ 
  /*
   * Set the windows size.
   */
*** ../vim-7.2.263/src/proto/gui_gtk_x11.pro	2007-05-05 19:18:54.000000000 +0200
--- src/proto/gui_gtk_x11.pro	2009-09-23 15:43:45.000000000 +0200
***************
*** 16,21 ****
--- 16,23 ----
  void gui_mch_exit __ARGS((int rc));
  int gui_mch_get_winpos __ARGS((int *x, int *y));
  void gui_mch_set_winpos __ARGS((int x, int y));
+ int gui_mch_maximized __ARGS((void));
+ void gui_mch_unmaximize __ARGS((void));
  void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
  void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
  void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
*** ../vim-7.2.263/src/version.c	2009-09-23 17:35:17.000000000 +0200
--- src/version.c	2009-09-23 18:12:21.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     264,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
268. You get up in the morning and go online before getting your coffee.

 /// 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    ///


--- NEW FILE 7.2.265 ---
To: vim-dev at vim.org
Subject: Patch 7.2.265
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.265
Problem:    When using ":silent broken" inside try/catch silency may persist.
	    (dr-dr xp)
Solution:   Set msg_silent when there is an error and it's bigger than the
	    saved value.
Files:	    src/ex_docmd.c


*** ../vim-7.2.264/src/ex_docmd.c	2009-07-09 20:13:59.000000000 +0200
--- src/ex_docmd.c	2009-09-30 11:40:53.000000000 +0200
***************
*** 2695,2701 ****
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	if (!did_emsg)
  	    msg_silent = save_msg_silent;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
--- 2695,2701 ----
      {
  	/* messages could be enabled for a serious error, need to check if the
  	 * counters don't become negative */
! 	if (!did_emsg || msg_silent > save_msg_silent)
  	    msg_silent = save_msg_silent;
  	emsg_silent -= did_esilent;
  	if (emsg_silent < 0)
*** ../vim-7.2.264/src/version.c	2009-09-23 18:14:13.000000000 +0200
--- src/version.c	2009-09-30 13:22:47.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     265,
  /**/

-- 
FIRST HEAD:  Oh! quick! get the sword out I want to cut his head off.
THIRD HEAD:  Oh, cut your own head off.
SECOND HEAD: Yes - do us all a favour.
                 "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    ///


--- NEW FILE 7.2.266 ---
To: vim-dev at vim.org
Subject: Patch 7.2.266
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.266
Problem:    When an expression abbreviation is triggered, the typed character
	    is unknown.
Solution:   Make the typed character available in v:char.
Files:	    runtime/doc/map.txt, src/eval.c, src/getchar.c, src/ops.c,
	    src/proto/eval.pro


*** ../vim-7.2.265/runtime/doc/map.txt	2008-08-09 19:36:49.000000000 +0200
--- runtime/doc/map.txt	2009-09-23 19:39:19.000000000 +0200
***************
*** 224,229 ****
--- 224,233 ----
  The result of the InsertDot() function will be inserted.  It could check the
  text before the cursor and start omni completion when some condition is met.
  
+ For abbreviations |v:char| is set to the character that was typed to trigger
+ the abbreviation.  You can use this to decide how to expand the {lhs}.  You
+ can't change v:char and you should not insert it.
+ 
  Be very careful about side effects!  The expression is evaluated while
  obtaining characters, you may very well make the command dysfunctional.
  For this reason the following is blocked:
*** ../vim-7.2.265/src/eval.c	2009-06-03 14:25:47.000000000 +0200
--- src/eval.c	2009-09-23 19:36:32.000000000 +0200
***************
*** 18101,18106 ****
--- 18101,18131 ----
  }
  
  /*
+  * Set v:char to character "c".
+  */
+     void
+ set_vim_var_char(c)
+     int c;
+ {
+ #ifdef FEAT_MBYTE
+     char_u	buf[MB_MAXBYTES];
+ #else
+     char_u	buf[2];
+ #endif
+ 
+ #ifdef FEAT_MBYTE
+     if (has_mbyte)
+ 	buf[(*mb_char2bytes)(c, buf)] = NUL;
+     else
+ #endif
+     {
+ 	buf[0] = c;
+ 	buf[1] = NUL;
+     }
+     set_vim_var_string(VV_CHAR, buf, -1);
+ }
+ 
+ /*
   * Set v:count to "count" and v:count1 to "count1".
   * When "set_prevcount" is TRUE first set v:prevcount from v:count.
   */
*** ../vim-7.2.265/src/getchar.c	2009-07-14 13:44:43.000000000 +0200
--- src/getchar.c	2009-09-23 19:35:54.000000000 +0200
***************
*** 129,135 ****
  static void	validate_maphash __ARGS((void));
  static void	showmap __ARGS((mapblock_T *mp, int local));
  #ifdef FEAT_EVAL
! static char_u	*eval_map_expr __ARGS((char_u *str));
  #endif
  
  /*
--- 129,135 ----
  static void	validate_maphash __ARGS((void));
  static void	showmap __ARGS((mapblock_T *mp, int local));
  #ifdef FEAT_EVAL
! static char_u	*eval_map_expr __ARGS((char_u *str, int c));
  #endif
  
  /*
***************
*** 2446,2452 ****
  			    if (tabuf.typebuf_valid)
  			    {
  				vgetc_busy = 0;
! 				s = eval_map_expr(mp->m_str);
  				vgetc_busy = save_vgetc_busy;
  			    }
  			    else
--- 2446,2452 ----
  			    if (tabuf.typebuf_valid)
  			    {
  				vgetc_busy = 0;
! 				s = eval_map_expr(mp->m_str, NUL);
  				vgetc_busy = save_vgetc_busy;
  			    }
  			    else
***************
*** 4367,4375 ****
  	     * abbreviation, but is not inserted into the input stream.
  	     */
  	    j = 0;
- 					/* special key code, split up */
  	    if (c != Ctrl_RSB)
  	    {
  		if (IS_SPECIAL(c) || c == K_SPECIAL)
  		{
  		    tb[j++] = K_SPECIAL;
--- 4367,4375 ----
  	     * abbreviation, but is not inserted into the input stream.
  	     */
  	    j = 0;
  	    if (c != Ctrl_RSB)
  	    {
+ 					/* special key code, split up */
  		if (IS_SPECIAL(c) || c == K_SPECIAL)
  		{
  		    tb[j++] = K_SPECIAL;
***************
*** 4398,4404 ****
  	    }
  #ifdef FEAT_EVAL
  	    if (mp->m_expr)
! 		s = eval_map_expr(mp->m_str);
  	    else
  #endif
  		s = mp->m_str;
--- 4398,4404 ----
  	    }
  #ifdef FEAT_EVAL
  	    if (mp->m_expr)
! 		s = eval_map_expr(mp->m_str, c);
  	    else
  #endif
  		s = mp->m_str;
***************
*** 4434,4441 ****
   * special characters.
   */
      static char_u *
! eval_map_expr(str)
      char_u	*str;
  {
      char_u	*res;
      char_u	*p;
--- 4434,4442 ----
   * special characters.
   */
      static char_u *
! eval_map_expr(str, c)
      char_u	*str;
+     int		c;	    /* NUL or typed character for abbreviation */
  {
      char_u	*res;
      char_u	*p;
***************
*** 4452,4457 ****
--- 4453,4459 ----
  #ifdef FEAT_EX_EXTRA
      ++ex_normal_lock;
  #endif
+     set_vim_var_char(c);  /* set v:char to the typed character */
      save_cursor = curwin->w_cursor;
      p = eval_to_string(str, NULL, FALSE);
      --textlock;
*** ../vim-7.2.265/src/ops.c	2009-07-01 18:04:30.000000000 +0200
--- src/ops.c	2009-09-23 19:11:40.000000000 +0200
***************
*** 4473,4483 ****
      int		use_sandbox = was_set_insecurely((char_u *)"formatexpr",
  								   OPT_LOCAL);
      int		r;
- #ifdef FEAT_MBYTE
-     char_u	buf[MB_MAXBYTES];
- #else
-     char_u	buf[2];
- #endif
  
      /*
       * Set v:lnum to the first line number and v:count to the number of lines.
--- 4473,4478 ----
***************
*** 4485,4501 ****
       */
      set_vim_var_nr(VV_LNUM, lnum);
      set_vim_var_nr(VV_COUNT, count);
! 
! #ifdef FEAT_MBYTE
!     if (has_mbyte)
! 	buf[(*mb_char2bytes)(c, buf)] = NUL;
!     else
! #endif
!     {
! 	buf[0] = c;
! 	buf[1] = NUL;
!     }
!     set_vim_var_string(VV_CHAR, buf, -1);
  
      /*
       * Evaluate the function.
--- 4480,4486 ----
       */
      set_vim_var_nr(VV_LNUM, lnum);
      set_vim_var_nr(VV_COUNT, count);
!     set_vim_var_char(c);
  
      /*
       * Evaluate the function.
*** ../vim-7.2.265/src/proto/eval.pro	2008-11-20 16:11:03.000000000 +0100
--- src/proto/eval.pro	2009-09-23 19:36:30.000000000 +0200
***************
*** 61,66 ****
--- 61,67 ----
  long get_vim_var_nr __ARGS((int idx));
  char_u *get_vim_var_str __ARGS((int idx));
  list_T *get_vim_var_list __ARGS((int idx));
+ void set_vim_var_char __ARGS((int c));
  void set_vcount __ARGS((long count, long count1, int set_prevcount));
  void set_vim_var_string __ARGS((int idx, char_u *val, int len));
  void set_vim_var_list __ARGS((int idx, list_T *val));
*** ../vim-7.2.265/src/version.c	2009-09-30 13:23:57.000000000 +0200
--- src/version.c	2009-09-30 15:11:29.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     266,
  /**/

-- 
Life would be so much easier if we could just look at the source code.

 /// 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    ///


--- NEW FILE 7.2.267 ---
To: vim-dev at vim.org
Subject: Patch 7.2.267
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.267
Problem:    Crash for narrow window and double-width character.
Solution:   Check for zero width.  (Taro Muraoka)
Files:	    src/charset.c


*** ../vim-7.2.266/src/charset.c	2009-09-11 14:02:25.000000000 +0200
--- src/charset.c	2009-10-07 16:17:27.000000000 +0200
***************
*** 1218,1223 ****
--- 1218,1225 ----
      if ((int)vcol == width1 - 1)
  	return TRUE;
      width2 = width1 + win_col_off2(wp);
+     if (width2 <= 0)
+ 	return FALSE;
      return ((vcol - width1) % width2 == width2 - 1);
  }
  #endif /* FEAT_MBYTE */
*** ../vim-7.2.266/src/version.c	2009-09-30 15:15:33.000000000 +0200
--- src/version.c	2009-10-07 16:19:05.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     267,
  /**/

-- 
You got to work at a mill?  Lucky!  I got sent back to work in the
acid-mines for my daily crust of stale bread... which not even the
birds would eat.

 /// 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    ///


--- NEW FILE 7.2.268 ---
To: vim-dev at vim.org
Subject: Patch 7.2.268
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.268
Problem:    Crash when using Python to set cursor beyond end of line.
	    (winterTTr)
Solution:   Check the column to be valid.
Files:	    src/if_python.c


*** ../vim-7.2.267/src/if_python.c	2009-07-09 20:06:30.000000000 +0200
--- src/if_python.c	2009-10-10 14:49:10.000000000 +0200
***************
*** 2058,2063 ****
--- 2058,2064 ----
      {
  	long lnum;
  	long col;
+ 	long len;
  
  	if (!PyArg_Parse(val, "(ll)", &lnum, &col))
  	    return -1;
***************
*** 2072,2081 ****
  	if (VimErrorCheck())
  	    return -1;
  
! 	/* NO CHECK ON COLUMN - SEEMS NOT TO MATTER */
  
  	this->win->w_cursor.lnum = lnum;
  	this->win->w_cursor.col = col;
  	update_screen(VALID);
  
  	return 0;
--- 2073,2088 ----
  	if (VimErrorCheck())
  	    return -1;
  
! 	/* When column is out of range silently correct it. */
! 	len = STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
! 	if (col > len)
! 	    col = len;
  
  	this->win->w_cursor.lnum = lnum;
  	this->win->w_cursor.col = col;
+ #ifdef FEAT_VIRTUALEDIT
+ 	this->win->w_cursor.coladd = 0;
+ #endif
  	update_screen(VALID);
  
  	return 0;
*** ../vim-7.2.267/src/version.c	2009-10-07 16:19:52.000000000 +0200
--- src/version.c	2009-11-03 11:42:08.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     268,
  /**/

-- 
VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur
            and his knights seemed hopeless,  when, suddenly ... the animator
            suffered a fatal heart attack.
ANIMATOR:   Aaaaagh!
VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could
            continue.
                 "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    ///


--- NEW FILE 7.2.269 ---
To: vim-dev at vim.org
Subject: Patch 7.2.269
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.269
Problem:    Many people struggle to find out why Vim startup is slow.
Solution:   Add the --startuptime command line flag.
Files:	    runtime/doc/starting.txt, src/globals.h, src/feature.h,
	    src/main.c, src/macros.h


*** ../vim-7.2.268/runtime/doc/starting.txt	2008-11-09 13:43:25.000000000 +0100
--- runtime/doc/starting.txt	2009-10-25 11:57:51.000000000 +0100
***************
*** 144,149 ****
--- 144,156 ----
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
+ --startuptime={fname}					*--startuptime*
+ 		During startup write timing messages to the file {fname}.
+ 		This can be used to find out where time is spent while loading
+ 		your .vimrc and plugins.
+ 		When {fname} already exists new messages are appended.
+ 		{only when compiled with this feature}
+ 
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
  		for Unix, because Vim always takes file names literally (the
***************
*** 471,476 ****
--- 487,493 ----
  		window title and copy/paste using the X clipboard.  This
  		avoids a long startup time when running Vim in a terminal
  		emulator and the connection to the X server is slow.
+ 		See |--startuptime| to find out if affects you.
  		Only makes a difference on Unix or VMS, when compiled with the
  		|+X11| feature.  Otherwise it's ignored.
  		To disable the connection only for specific terminals, see the
*** ../vim-7.2.268/src/globals.h	2009-07-29 12:09:49.000000000 +0200
--- src/globals.h	2009-10-10 15:14:31.000000000 +0200
***************
*** 1567,1572 ****
--- 1567,1576 ----
  /* For undo we need to know the lowest time possible. */
  EXTERN time_t starttime;
  
+ #ifdef STARTUPTIME
+ EXTERN FILE *time_fd INIT(= NULL);  /* where to write startup timing */
+ #endif
+ 
  /*
   * Some compilers warn for not using a return value, but in some situations we
   * can't do anything useful with the value.  Assign to this variable to avoid
*** ../vim-7.2.268/src/feature.h	2008-11-09 13:43:25.000000000 +0100
--- src/feature.h	2009-10-10 16:16:19.000000000 +0200
***************
*** 844,853 ****
  /* #define DEBUG */
  
  /*
!  * STARTUPTIME		Time the startup process.  Writes a "vimstartup" file
!  *			with timestamps.
   */
! /* #define STARTUPTIME "vimstartup" */
  
  /*
   * MEM_PROFILE		Debugging of memory allocation and freeing.
--- 844,857 ----
  /* #define DEBUG */
  
  /*
!  * STARTUPTIME		Time the startup process.  Writes a file with
!  *			timestamps.
   */
! #if defined(FEAT_NORMAL) \
! 	&& ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
! 		|| defined(WIN3264))
! # define STARTUPTIME 1
! #endif
  
  /*
   * MEM_PROFILE		Debugging of memory allocation and freeing.
*** ../vim-7.2.268/src/main.c	2009-05-26 22:58:43.000000000 +0200
--- src/main.c	2009-10-10 16:18:32.000000000 +0200
***************
*** 130,139 ****
  #endif
  
  
- #ifdef STARTUPTIME
- static FILE *time_fd = NULL;
- #endif
- 
  /*
   * Different types of error messages.
   */
--- 130,135 ----
***************
*** 173,178 ****
--- 169,177 ----
      char_u	*fname = NULL;		/* file name from command line */
      mparm_T	params;			/* various parameters passed between
  					 * main() and other functions. */
+ #ifdef STARTUPTIME
+     int		i;
+ #endif
  
      /*
       * Do any system-specific initialisations.  These can NOT use IObuff or
***************
*** 203,210 ****
  #endif
  
  #ifdef STARTUPTIME
!     time_fd = mch_fopen(STARTUPTIME, "a");
!     TIME_MSG("--- VIM STARTING ---");
  #endif
      starttime = time(NULL);
  
--- 202,216 ----
  #endif
  
  #ifdef STARTUPTIME
!     for (i = 1; i < argc; ++i)
!     {
! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
! 	{
! 	    time_fd = mch_fopen(argv[i] + 14, "a");
! 	    TIME_MSG("--- VIM STARTING ---");
! 	    break;
! 	}
!     }
  #endif
      starttime = time(NULL);
  
***************
*** 1150,1155 ****
--- 1156,1173 ----
  	    cursor_on();
  
  	    do_redraw = FALSE;
+ 
+ #ifdef STARTUPTIME
+ 	    /* Now that we have drawn the first screen all the startup stuff
+ 	     * has been done, close any file for startup messages. */
+ 	    if (time_fd != NULL)
+ 	    {
+ 		TIME_MSG("first screen update");
+ 		TIME_MSG("--- VIM STARTED ---");
+ 		fclose(time_fd);
+ 		time_fd = NULL;
+ 	    }
+ #endif
  	}
  #ifdef FEAT_GUI
  	if (need_mouse_correct)
***************
*** 1743,1748 ****
--- 1761,1770 ----
  		    /* already processed, skip */
  		}
  #endif
+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ 		{
+ 		    /* already processed, skip */
+ 		}
  		else
  		{
  		    if (argv[0][argv_idx])
***************
*** 3211,3216 ****
--- 3233,3252 ----
  
  static struct timeval	prev_timeval;
  
+ # ifdef WIN3264
+ /*
+  * Windows doesn't have gettimeofday(), although it does have struct timeval.
+  */
+     static int
+ gettimeofday(struct timeval *tv, char *dummy)
+ {
+     long t = clock();
+     tv->tv_sec = t / CLOCKS_PER_SEC;
+     tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
+     return 0;
+ }
+ # endif
+ 
  /*
   * Save the previous time before doing something that could nest.
   * set "*tv_rel" to the time elapsed so far.
***************
*** 3299,3318 ****
      }
  }
  
- # ifdef WIN3264
- /*
-  * Windows doesn't have gettimeofday(), although it does have struct timeval.
-  */
-     int
- gettimeofday(struct timeval *tv, char *dummy)
- {
-     long t = clock();
-     tv->tv_sec = t / CLOCKS_PER_SEC;
-     tv->tv_usec = (t - tv->tv_sec * CLOCKS_PER_SEC) * 1000000 / CLOCKS_PER_SEC;
-     return 0;
- }
- # endif
- 
  #endif
  
  #if defined(FEAT_CLIENTSERVER) || defined(PROTO)
--- 3335,3340 ----
*** ../vim-7.2.268/src/macros.h	2009-05-17 13:30:58.000000000 +0200
--- src/macros.h	2009-10-10 15:19:07.000000000 +0200
***************
*** 243,249 ****
  #endif
  
  #ifdef STARTUPTIME
! # define TIME_MSG(s) time_msg(s, NULL)
  #else
  # define TIME_MSG(s)
  #endif
--- 243,249 ----
  #endif
  
  #ifdef STARTUPTIME
! # define TIME_MSG(s) { if (time_fd != NULL) time_msg(s, NULL); }
  #else
  # define TIME_MSG(s)
  #endif
*** ../vim-7.2.268/src/version.c	2009-11-03 11:43:05.000000000 +0100
--- src/version.c	2009-11-03 12:06:31.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     269,
  /**/

-- 
BEDEVERE: Look!  It's the old man from scene 24 - what's he Doing here?
ARTHUR:   He is the keeper of the Bridge.  He asks each traveler five
          questions ...
GALAHAD:  Three questions.
                 "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    ///


--- NEW FILE 7.2.270 ---
To: vim-dev at vim.org
Subject: Patch 7.2.270
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.270
Problem:    Using ":@c" when the c register contains a CR causes the rest to
	    be executed later. (Dexter Douglas)
Solution:   Don't check for typeahead to start with ':', keep executing
	    commands until all added typeahead has been used.
Files:	    src/ex_docmd.c


*** ../vim-7.2.269/src/ex_docmd.c	2009-09-30 13:23:57.000000000 +0200
--- src/ex_docmd.c	2009-10-28 12:06:54.000000000 +0100
***************
*** 8358,8363 ****
--- 8358,8364 ----
      exarg_T	*eap;
  {
      int		c;
+     int		prev_len = typebuf.tb_len;
  
      curwin->w_cursor.lnum = eap->line2;
  
***************
*** 8383,8393 ****
  
  	/*
  	 * Execute from the typeahead buffer.
! 	 * Originally this didn't check for the typeahead buffer to be empty,
! 	 * thus could read more Ex commands from stdin.  It's not clear why,
! 	 * it is certainly unexpected.
  	 */
! 	while ((!stuff_empty() || typebuf.tb_len > 0) && vpeekc() == ':')
  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
  
  	exec_from_reg = save_efr;
--- 8384,8393 ----
  
  	/*
  	 * Execute from the typeahead buffer.
! 	 * Continue until the stuff buffer is empty and all added characters
! 	 * have been consumed.
  	 */
! 	while (!stuff_empty() || typebuf.tb_len > prev_len)
  	    (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
  
  	exec_from_reg = save_efr;
*** ../vim-7.2.269/src/version.c	2009-11-03 12:10:39.000000000 +0100
--- src/version.c	2009-11-03 12:32:47.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     270,
  /**/

-- 
To the optimist, the glass is half full.
To the pessimist, the glass is half empty.
To the engineer, the glass is twice as big as it needs to be.

 /// 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    ///


--- NEW FILE 7.2.271 ---
To: vim-dev at vim.org
Subject: Patch 7.2.271
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.271
Problem:    Using freed memory in Motif GUI version when making a choice.
Solution:   Free memory only after using it. (Dominique Pelle)
Files:	    src/gui_xmdlg.c


*** ../vim-7.2.270/src/gui_xmdlg.c	2009-05-21 23:25:38.000000000 +0200
--- src/gui_xmdlg.c	2009-10-28 21:56:15.000000000 +0100
***************
*** 10,16 ****
  /*
   * (C) 2001,2005 by Marcin Dalecki <martin at dalecki.de>
   *
!  * Implementation of dialogue functions for the Motif GUI variant.
   *
   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
   * when using a dynamic scrollbar policy.
--- 10,16 ----
  /*
   * (C) 2001,2005 by Marcin Dalecki <martin at dalecki.de>
   *
!  * Implementation of dialog functions for the Motif GUI variant.
   *
   * Note about Lesstif: Apparently lesstif doesn't get the widget layout right,
   * when using a dynamic scrollbar policy.
***************
*** 633,648 ****
  	data->sel[which] = XtNewString(sel);
      else
      {
- 	XtFree(data->sel[which]);
  	if (!strcmp(data->sel[which], sel))
  	{
  	    /* unselecting current selection */
  	    data->sel[which] = NULL;
  	    if (w)
  		XmListDeselectItem(w, call_data->item);
  	}
  	else
  	    data->sel[which] = XtNewString(sel);
      }
      XtFree(sel);
  
--- 633,651 ----
  	data->sel[which] = XtNewString(sel);
      else
      {
  	if (!strcmp(data->sel[which], sel))
  	{
  	    /* unselecting current selection */
+ 	    XtFree(data->sel[which]);
  	    data->sel[which] = NULL;
  	    if (w)
  		XmListDeselectItem(w, call_data->item);
  	}
  	else
+ 	{
+ 	    XtFree(data->sel[which]);
  	    data->sel[which] = XtNewString(sel);
+ 	}
      }
      XtFree(sel);
  
*** ../vim-7.2.270/src/version.c	2009-11-03 12:38:50.000000000 +0100
--- src/version.c	2009-11-03 12:48:26.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     271,
  /**/

-- 
ROBIN:  (warily) And if you get a question wrong?
ARTHUR: You are cast into the Gorge of Eternal Peril.
ROBIN:  Oh ... wacho!
                 "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    ///


--- NEW FILE 7.2.272 ---
To: vim-dev at vim.org
Subject: Patch 7.2.272
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.272
Problem:    "_.svz" is not recognized as a swap file. (David M. Besonen)
Solution:   Accept .s[uvw][a-z] as a swap file name extension.
Files:	    src/memline.c


*** ../vim-7.2.271/src/memline.c	2009-04-22 15:56:27.000000000 +0200
--- src/memline.c	2009-10-29 20:55:08.000000000 +0100
***************
*** 864,884 ****
      recoverymode = TRUE;
      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
      attr = hl_attr(HLF_E);
! /*
!  * If the file name ends in ".sw?" we use it directly.
!  * Otherwise a search is done to find the swap file(s).
!  */
      fname = curbuf->b_fname;
      if (fname == NULL)		    /* When there is no file name */
  	fname = (char_u *)"";
      len = (int)STRLEN(fname);
      if (len >= 4 &&
  #if defined(VMS) || defined(RISCOS)
! 	    STRNICMP(fname + len - 4, "_sw" , 3)
  #else
! 	    STRNICMP(fname + len - 4, ".sw" , 3)
  #endif
! 		== 0)
      {
  	directly = TRUE;
  	fname = vim_strsave(fname); /* make a copy for mf_open() */
--- 864,887 ----
      recoverymode = TRUE;
      called_from_main = (curbuf->b_ml.ml_mfp == NULL);
      attr = hl_attr(HLF_E);
! 
!     /*
!      * If the file name ends in ".s[uvw][a-z]" we assume this is the swap file.
!      * Otherwise a search is done to find the swap file(s).
!      */
      fname = curbuf->b_fname;
      if (fname == NULL)		    /* When there is no file name */
  	fname = (char_u *)"";
      len = (int)STRLEN(fname);
      if (len >= 4 &&
  #if defined(VMS) || defined(RISCOS)
! 	    STRNICMP(fname + len - 4, "_s" , 2)
  #else
! 	    STRNICMP(fname + len - 4, ".s" , 2)
  #endif
! 		== 0
! 		&& vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
! 		&& ASCII_ISALPHA(fname[len - 1]))
      {
  	directly = TRUE;
  	fname = vim_strsave(fname); /* make a copy for mf_open() */
*** ../vim-7.2.271/src/version.c	2009-11-03 12:53:44.000000000 +0100
--- src/version.c	2009-11-03 13:02:51.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     272,
  /**/

-- 
Sorry, no fortune today.

 /// 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    ///


--- NEW FILE 7.2.273 ---
To: vim-dev at vim.org
Subject: Patch 7.2.273
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.273
Problem:    Crash with redir to unknown array. (Christian Brabandt)
Solution:   Don't assign the redir result when there was an error.
Files:	    src/eval.c


*** ../vim-7.2.272/src/eval.c	2009-09-30 15:15:33.000000000 +0200
--- src/eval.c	2009-11-03 12:05:07.000000000 +0100
***************
*** 988,1000 ****
      int		err;
      typval_T	tv;
  
!     /* Make sure a valid variable name is specified */
      if (!eval_isnamec1(*name))
      {
  	EMSG(_(e_invarg));
  	return FAIL;
      }
  
      redir_varname = vim_strsave(name);
      if (redir_varname == NULL)
  	return FAIL;
--- 988,1001 ----
      int		err;
      typval_T	tv;
  
!     /* Catch a bad name early. */
      if (!eval_isnamec1(*name))
      {
  	EMSG(_(e_invarg));
  	return FAIL;
      }
  
+     /* Make a copy of the name, it is used in redir_lval until redir ends. */
      redir_varname = vim_strsave(name);
      if (redir_varname == NULL)
  	return FAIL;
***************
*** 1019,1024 ****
--- 1020,1026 ----
  	    EMSG(_(e_trailing));
  	else
  	    EMSG(_(e_invarg));
+ 	redir_endp = NULL;  /* don't store a value, only cleanup */
  	var_redir_stop();
  	return FAIL;
      }
***************
*** 1037,1042 ****
--- 1039,1045 ----
      did_emsg |= save_emsg;
      if (err)
      {
+ 	redir_endp = NULL;  /* don't store a value, only cleanup */
  	var_redir_stop();
  	return FAIL;
      }
***************
*** 1085,1090 ****
--- 1088,1094 ----
  
  /*
   * Stop redirecting command output to a variable.
+  * Frees the allocated memory.
   */
      void
  var_redir_stop()
***************
*** 1093,1106 ****
  
      if (redir_lval != NULL)
      {
! 	/* Append the trailing NUL. */
! 	ga_append(&redir_ga, NUL);
  
! 	/* Assign the text to the variable. */
! 	tv.v_type = VAR_STRING;
! 	tv.vval.v_string = redir_ga.ga_data;
! 	set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
! 	vim_free(tv.vval.v_string);
  
  	clear_lval(redir_lval);
  	vim_free(redir_lval);
--- 1097,1114 ----
  
      if (redir_lval != NULL)
      {
! 	/* If there was no error: assign the text to the variable. */
! 	if (redir_endp != NULL)
! 	{
! 	    ga_append(&redir_ga, NUL);  /* Append the trailing NUL. */
! 	    tv.v_type = VAR_STRING;
! 	    tv.vval.v_string = redir_ga.ga_data;
! 	    set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
! 	}
  
! 	/* free the collected output */
! 	vim_free(redir_ga.ga_data);
! 	redir_ga.ga_data = NULL;
  
  	clear_lval(redir_lval);
  	vim_free(redir_lval);
*** ../vim-7.2.272/src/version.c	2009-11-03 13:06:03.000000000 +0100
--- src/version.c	2009-11-03 14:24:06.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     273,
  /**/

-- 
Permission is granted to read this message out aloud on Kings Cross Road,
London, under the condition that the orator is properly dressed.

 /// 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    ///


--- NEW FILE 7.2.274 ---
To: vim-dev at vim.org
Subject: Patch 7.2.274
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.274
Problem:    Syntax folding doesn't work properly when adding a comment.
Solution:   Fix it and add a test. (Lech Lorens)
Files:	    src/fold.c, src/testdir/test45.in, src/testdir/test45.ok


*** ../vim-7.2.273/src/fold.c	2009-09-18 15:16:37.000000000 +0200
--- src/fold.c	2009-11-03 12:36:37.000000000 +0100
***************
*** 2256,2261 ****
--- 2256,2295 ----
  	}
      }
  
+     /*
+      * If folding is defined by the syntax, it is possible that a change in
+      * one line will cause all sub-folds of the current fold to change (e.g.,
+      * closing a C-style comment can cause folds in the subsequent lines to
+      * appear). To take that into account we should adjust the value of "bot"
+      * to point to the end of the current fold:
+      */
+     if (foldlevelSyntax == getlevel)
+     {
+ 	garray_T *gap = &wp->w_folds;
+ 	fold_T	 *fp = NULL;
+ 	int	  current_fdl = 0;
+ 	linenr_T  fold_start_lnum = 0;
+ 	linenr_T  lnum_rel = fline.lnum;
+ 
+ 	while (current_fdl < fline.lvl)
+ 	{
+ 	    if (!foldFind(gap, lnum_rel, &fp))
+ 		break;
+ 	    ++current_fdl;
+ 
+ 	    fold_start_lnum += fp->fd_top;
+ 	    gap = &fp->fd_nested;
+ 	    lnum_rel -= fp->fd_top;
+ 	}
+ 	if (fp != NULL && current_fdl == fline.lvl)
+ 	{
+ 	    linenr_T fold_end_lnum = fold_start_lnum + fp->fd_len;
+ 
+ 	    if (fold_end_lnum > bot)
+ 		bot = fold_end_lnum;
+ 	}
+     }
+ 
      start = fline.lnum;
      end = bot;
      /* Do at least one line. */
*** ../vim-7.2.273/src/testdir/test45.in	2007-09-25 17:58:43.000000000 +0200
--- src/testdir/test45.in	2009-11-03 12:22:38.000000000 +0100
***************
*** 28,36 ****
  k:call append("$", foldlevel("."))
  :" test syntax folding
  :set fdm=syntax fdl=0
! :syn region Hup start="dd" end="hh" fold
  Gzk:call append("$", "folding " . getline("."))
  k:call append("$", getline("."))
  :" test expression folding
  :fun Flvl()
    let l = getline(v:lnum)
--- 28,41 ----
  k:call append("$", foldlevel("."))
  :" test syntax folding
  :set fdm=syntax fdl=0
! :syn region Hup start="dd" end="ii" fold contains=Fd1,Fd2,Fd3
! :syn region Fd1 start="ee" end="ff" fold contained
! :syn region Fd2 start="gg" end="hh" fold contained
! :syn region Fd3 start="commentstart" end="commentend" fold contained
  Gzk:call append("$", "folding " . getline("."))
  k:call append("$", getline("."))
+ jAcommentstart  Acommentend:set fdl=1
+ 3j:call append("$", getline("."))
  :" test expression folding
  :fun Flvl()
    let l = getline(v:lnum)
*** ../vim-7.2.273/src/testdir/test45.ok	2004-06-13 17:47:37.000000000 +0200
--- src/testdir/test45.ok	2009-11-03 12:22:50.000000000 +0100
***************
*** 8,15 ****
  0
  indent 2
  1
! folding 8 hh
      3 cc
  expr 2
  1
  2
--- 8,16 ----
  0
  indent 2
  1
! folding 9 ii
      3 cc
+ 7 gg
  expr 2
  1
  2
*** ../vim-7.2.273/src/version.c	2009-11-03 14:26:29.000000000 +0100
--- src/version.c	2009-11-03 14:44:21.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     274,
  /**/

-- 
BRIDGEKEEPER: What is your favorite colour?
LAUNCELOT:    Blue.
BRIDGEKEEPER: Right.  Off you go.
                 "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    ///


--- NEW FILE 7.2.275 ---
To: vim-dev at vim.org
Subject: Patch 7.2.275
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.275
Problem:    Warning for unused argument and comparing signed and unsigned.
Solution:   Add type cast.
Files:	    src/memline.c


*** ../vim-7.2.274/src/memline.c	2009-11-03 13:06:03.000000000 +0100
--- src/memline.c	2009-10-29 20:55:08.000000000 +0100
***************
*** 1285,1291 ****
  		    for (i = 0; i < dp->db_line_count; ++i)
  		    {
  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
! 			if (txt_start <= HEADER_SIZE
  					  || txt_start >= (int)dp->db_txt_end)
  			{
  			    p = (char_u *)"???";
--- 1285,1291 ----
  		    for (i = 0; i < dp->db_line_count; ++i)
  		    {
  			txt_start = (dp->db_index[i] & DB_INDEX_MASK);
! 			if (txt_start <= (int)HEADER_SIZE
  					  || txt_start >= (int)dp->db_txt_end)
  			{
  			    p = (char_u *)"???";
***************
*** 1296,1302 ****
  			ml_append(lnum++, p, (colnr_T)0, TRUE);
  		    }
  		    if (has_error)
! 			ml_append(lnum++, (char_u *)_("???END"), (colnr_T)0, TRUE);
  		}
  	    }
  	}
--- 1296,1303 ----
  			ml_append(lnum++, p, (colnr_T)0, TRUE);
  		    }
  		    if (has_error)
! 			ml_append(lnum++, (char_u *)_("???END"),
! 							    (colnr_T)0, TRUE);
  		}
  	    }
  	}
***************
*** 3576,3586 ****
   * Make swap file name out of the file name and a directory name.
   * Returns pointer to allocated memory or NULL.
   */
- /*ARGSUSED*/
      char_u *
  makeswapname(fname, ffname, buf, dir_name)
      char_u	*fname;
!     char_u	*ffname;
      buf_T	*buf;
      char_u	*dir_name;
  {
--- 3577,3586 ----
   * Make swap file name out of the file name and a directory name.
   * Returns pointer to allocated memory or NULL.
   */
      char_u *
  makeswapname(fname, ffname, buf, dir_name)
      char_u	*fname;
!     char_u	*ffname UNUSED;
      buf_T	*buf;
      char_u	*dir_name;
  {
*** ../vim-7.2.274/src/version.c	2009-11-03 14:46:35.000000000 +0100
--- src/version.c	2009-11-03 15:28:33.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     275,
  /**/

-- 
BRIDGEKEEPER: What is your favorite colour?
GAWAIN:       Blue ...  No yelloooooww!
                 "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    ///


--- NEW FILE 7.2.276 ---
To: vim-dev at vim.org
Subject: Patch 7.2.276
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.276
Problem:    Crash when setting 'isprint' to a small bullet. (Raul Coronado)
Solution:   Check for the character to be < 256.  Also make it possible to
	    specify a range of multi-byte characters. (Lech Lorens)
Files:	    src/charset.c


*** ../vim-7.2.275/src/charset.c	2009-10-07 16:19:52.000000000 +0200
--- src/charset.c	2009-11-03 12:46:12.000000000 +0100
***************
*** 187,195 ****
  		if (VIM_ISDIGIT(*p))
  		    c2 = getdigits(&p);
  		else
  		    c2 = *p++;
  	    }
! 	    if (c <= 0 || (c2 < c && c2 != -1) || c2 >= 256
  						 || !(*p == NUL || *p == ','))
  		return FAIL;
  
--- 187,200 ----
  		if (VIM_ISDIGIT(*p))
  		    c2 = getdigits(&p);
  		else
+ #ifdef FEAT_MBYTE
+ 		     if (has_mbyte)
+ 		    c2 = mb_ptr2char_adv(&p);
+ 		else
+ #endif
  		    c2 = *p++;
  	    }
! 	    if (c <= 0 || c >= 256 || (c2 < c && c2 != -1) || c2 >= 256
  						 || !(*p == NUL || *p == ','))
  		return FAIL;
  
*** ../vim-7.2.275/src/version.c	2009-11-03 15:32:58.000000000 +0100
--- src/version.c	2009-11-03 16:03:18.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     276,
  /**/

-- 
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    ///


--- NEW FILE 7.2.277 ---
To: vim-dev at vim.org
Subject: Patch 7.2.277
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.277
Problem:    CTRL-Y in a diff'ed window may move the cursor outside of the
	    window. (Lech Lorens)
Solution:   Limit the number of filler lines to the height of the window.
	    Don't reset filler lines to zero for an empty buffer.
Files:	    src/move.c


*** ../vim-7.2.276/src/move.c	2009-05-15 21:31:11.000000000 +0200
--- src/move.c	2009-11-03 14:39:55.000000000 +0100
***************
*** 183,191 ****
  	if (curwin->w_topline != 1)
  	    redraw_later(NOT_VALID);
  	curwin->w_topline = 1;
- #ifdef FEAT_DIFF
- 	curwin->w_topfill = 0;
- #endif
  	curwin->w_botline = 2;
  	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
  #ifdef FEAT_SCROLLBIND
--- 183,188 ----
***************
*** 1257,1263 ****
      while (line_count-- > 0)
      {
  #ifdef FEAT_DIFF
! 	if (curwin->w_topfill < diff_check(curwin, curwin->w_topline))
  	{
  	    ++curwin->w_topfill;
  	    ++done;
--- 1254,1261 ----
      while (line_count-- > 0)
      {
  #ifdef FEAT_DIFF
! 	if (curwin->w_topfill < diff_check(curwin, curwin->w_topline)
! 		&& curwin->w_topfill < curwin->w_height - 1)
  	{
  	    ++curwin->w_topfill;
  	    ++done;
*** ../vim-7.2.276/src/version.c	2009-11-03 16:03:59.000000000 +0100
--- src/version.c	2009-11-03 16:22:04.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     277,
  /**/

-- 
SIGFUN -- signature too funny (core dumped)

 /// 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    ///


--- NEW FILE 7.2.278 ---
To: vim-dev at vim.org
Subject: Patch 7.2.278
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.278
Problem:    Using magic number in the folding code.
Solution:   Use the defined MAX_LEVEL.
Files:	    src/fold.c


*** ../vim-7.2.277/src/fold.c	2009-11-03 14:46:35.000000000 +0100
--- src/fold.c	2009-11-03 12:36:37.000000000 +0100
***************
*** 1932,1938 ****
  #ifdef FEAT_EVAL
      if (*wp->w_p_fdt != NUL)
      {
! 	char_u	dashes[51];
  	win_T	*save_curwin;
  	int	level;
  	char_u	*p;
--- 1932,1938 ----
  #ifdef FEAT_EVAL
      if (*wp->w_p_fdt != NUL)
      {
! 	char_u	dashes[MAX_LEVEL + 2];
  	win_T	*save_curwin;
  	int	level;
  	char_u	*p;
***************
*** 1944,1951 ****
  	/* Set "v:folddashes" to a string of "level" dashes. */
  	/* Set "v:foldlevel" to "level". */
  	level = foldinfo->fi_level;
! 	if (level > 50)
! 	    level = 50;
  	vim_memset(dashes, '-', (size_t)level);
  	dashes[level] = NUL;
  	set_vim_var_string(VV_FOLDDASHES, dashes, -1);
--- 1944,1951 ----
  	/* Set "v:folddashes" to a string of "level" dashes. */
  	/* Set "v:foldlevel" to "level". */
  	level = foldinfo->fi_level;
! 	if (level > (int)sizeof(dashes) - 1)
! 	    level = (int)sizeof(dashes) - 1;
  	vim_memset(dashes, '-', (size_t)level);
  	dashes[level] = NUL;
  	set_vim_var_string(VV_FOLDDASHES, dashes, -1);
*** ../vim-7.2.277/src/version.c	2009-11-03 16:22:59.000000000 +0100
--- src/version.c	2009-11-03 16:29:08.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     278,
  /**/

-- 
BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
ARTHUR:       What do you mean?  An African or European swallow?
BRIDGEKEEPER: Er ...  I don't know that ... Aaaaarrrrrrggghhh!
   BRIDGEKEEPER is cast into the gorge.
                 "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    ///


--- NEW FILE 7.2.279 ---
To: vim-dev at vim.org
Subject: Patch 7.2.279
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.279
Problem:    Invalid memory read with visual mode "r". (Dominique Pelle)
Solution:   Make sure the cursor position is valid.  Don't check the cursor
	    position but the position being used.  And make sure we get the
	    right line.
Files:	    src/misc2.c, src/ops.c


*** ../vim-7.2.278/src/misc2.c	2009-05-16 21:06:36.000000000 +0200
--- src/misc2.c	2009-11-03 16:43:10.000000000 +0100
***************
*** 156,162 ****
  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
  #endif
  		    ;
!     line = ml_get_curline();
  
      if (wcol >= MAXCOL)
      {
--- 156,162 ----
  		    || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
  #endif
  		    ;
!     line = ml_get_buf(curbuf, pos->lnum, FALSE);
  
      if (wcol >= MAXCOL)
      {
***************
*** 332,340 ****
  #endif
  
  #ifdef FEAT_MBYTE
!     /* prevent cursor from moving on the trail byte */
      if (has_mbyte)
! 	mb_adjust_cursor();
  #endif
  
      if (col < wcol)
--- 332,340 ----
  #endif
  
  #ifdef FEAT_MBYTE
!     /* prevent from moving onto a trail byte */
      if (has_mbyte)
! 	mb_adjustpos(pos);
  #endif
  
      if (col < wcol)
*** ../vim-7.2.278/src/ops.c	2009-09-30 15:15:33.000000000 +0200
--- src/ops.c	2009-11-03 15:18:50.000000000 +0100
***************
*** 2020,2025 ****
--- 2020,2026 ----
  	bd.is_MAX = (curwin->w_curswant == MAXCOL);
  	for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
  	{
+ 	    curwin->w_cursor.col = 0;  /* make sure cursor position is valid */
  	    block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
  	    if (bd.textlen == 0 && (!virtual_op || bd.is_MAX))
  		continue;	    /* nothing to replace */
***************
*** 2035,2040 ****
--- 2036,2042 ----
  	    {
  		pos_T vpos;
  
+ 		vpos.lnum = curwin->w_cursor.lnum;
  		getvpos(&vpos, oap->start_vcol);
  		bd.startspaces += vpos.coladd;
  		n = bd.startspaces;
***************
*** 2693,2703 ****
  			 * initial coladd offset as part of "startspaces" */
  			if (bd.is_short)
  			{
! 			    linenr_T lnum = curwin->w_cursor.lnum;
! 
! 			    curwin->w_cursor.lnum = linenr;
  			    (void)getvpos(&vpos, oap->start_vcol);
- 			    curwin->w_cursor.lnum = lnum;
  			}
  			else
  			    vpos.coladd = 0;
--- 2695,2702 ----
  			 * initial coladd offset as part of "startspaces" */
  			if (bd.is_short)
  			{
! 			    vpos.lnum = linenr;
  			    (void)getvpos(&vpos, oap->start_vcol);
  			}
  			else
  			    vpos.coladd = 0;
*** ../vim-7.2.278/src/version.c	2009-11-03 16:29:48.000000000 +0100
--- src/version.c	2009-11-03 16:41:53.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     279,
  /**/

-- 
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    ///


--- NEW FILE 7.2.280 ---
To: vim-dev at vim.org
Subject: Patch 7.2.280
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.280
Problem:    A redraw in a custom statusline with %! may cause a crash.
            (Yukihiro Nakadaira)
Solution:   Make a copy of 'statusline'.  Also fix typo in function name
            redraw_custum_statusline. (party by Dominique Pelle)
Files:      src/screen.c


*** ../vim-7.2.279/src/screen.c	2009-07-29 16:13:35.000000000 +0200
--- src/screen.c	2009-11-03 17:13:16.000000000 +0100
***************
*** 132,138 ****
  static void draw_vsep_win __ARGS((win_T *wp, int row));
  #endif
  #ifdef FEAT_STL_OPT
! static void redraw_custum_statusline __ARGS((win_T *wp));
  #endif
  #ifdef FEAT_SEARCH_EXTRA
  #define SEARCH_HL_PRIORITY 0
--- 132,138 ----
  static void draw_vsep_win __ARGS((win_T *wp, int row));
  #endif
  #ifdef FEAT_STL_OPT
! static void redraw_custom_statusline __ARGS((win_T *wp));
  #endif
  #ifdef FEAT_SEARCH_EXTRA
  #define SEARCH_HL_PRIORITY 0
***************
*** 5772,5778 ****
      else if (*p_stl != NUL || *wp->w_p_stl != NUL)
      {
  	/* redraw custom status line */
! 	redraw_custum_statusline(wp);
      }
  #endif
      else
--- 5794,5800 ----
      else if (*p_stl != NUL || *wp->w_p_stl != NUL)
      {
  	/* redraw custom status line */
! 	redraw_custom_statusline(wp);
      }
  #endif
      else
***************
*** 5897,5914 ****
   * errors encountered.
   */
      static void
! redraw_custum_statusline(wp)
      win_T	    *wp;
  {
!     int	save_called_emsg = called_emsg;
  
      called_emsg = FALSE;
      win_redr_custom(wp, FALSE);
      if (called_emsg)
  	set_string_option_direct((char_u *)"statusline", -1,
  		(char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
  					? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
      called_emsg |= save_called_emsg;
  }
  #endif
  
--- 5919,5949 ----
   * errors encountered.
   */
      static void
! redraw_custom_statusline(wp)
      win_T	    *wp;
  {
!     static int	    entered = FALSE;
!     int		    save_called_emsg = called_emsg;
! 
!     /* When called recursively return.  This can happen when the statusline
!      * contains an expression that triggers a redraw. */
!     if (entered)
! 	return;
!     entered = TRUE;
  
      called_emsg = FALSE;
      win_redr_custom(wp, FALSE);
      if (called_emsg)
+     {
+ 	/* When there is an error disable the statusline, otherwise the
+ 	 * display is messed up with errors and a redraw triggers the problem
+ 	 * again and again. */
  	set_string_option_direct((char_u *)"statusline", -1,
  		(char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
  					? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
+     }
      called_emsg |= save_called_emsg;
+     entered = FALSE;
  }
  #endif
  
***************
*** 6016,6021 ****
--- 6051,6057 ----
      int		len;
      int		fillchar;
      char_u	buf[MAXPATHL];
+     char_u	*stl;
      char_u	*p;
      struct	stl_hlrec hltab[STL_MAX_ITEM];
      struct	stl_hlrec tabtab[STL_MAX_ITEM];
***************
*** 6025,6031 ****
      if (wp == NULL)
      {
  	/* Use 'tabline'.  Always at the first line of the screen. */
! 	p = p_tal;
  	row = 0;
  	fillchar = ' ';
  	attr = hl_attr(HLF_TPF);
--- 6061,6067 ----
      if (wp == NULL)
      {
  	/* Use 'tabline'.  Always at the first line of the screen. */
! 	stl = p_tal;
  	row = 0;
  	fillchar = ' ';
  	attr = hl_attr(HLF_TPF);
***************
*** 6042,6058 ****
  
  	if (draw_ruler)
  	{
! 	    p = p_ruf;
  	    /* advance past any leading group spec - implicit in ru_col */
! 	    if (*p == '%')
  	    {
! 		if (*++p == '-')
! 		    p++;
! 		if (atoi((char *) p))
! 		    while (VIM_ISDIGIT(*p))
! 			p++;
! 		if (*p++ != '(')
! 		    p = p_ruf;
  	    }
  #ifdef FEAT_VERTSPLIT
  	    col = ru_col - (Columns - W_WIDTH(wp));
--- 6078,6094 ----
  
  	if (draw_ruler)
  	{
! 	    stl = p_ruf;
  	    /* advance past any leading group spec - implicit in ru_col */
! 	    if (*stl == '%')
  	    {
! 		if (*++stl == '-')
! 		    stl++;
! 		if (atoi((char *)stl))
! 		    while (VIM_ISDIGIT(*stl))
! 			stl++;
! 		if (*stl++ != '(')
! 		    stl = p_ruf;
  	    }
  #ifdef FEAT_VERTSPLIT
  	    col = ru_col - (Columns - W_WIDTH(wp));
***************
*** 6081,6089 ****
  	else
  	{
  	    if (*wp->w_p_stl != NUL)
! 		p = wp->w_p_stl;
  	    else
! 		p = p_stl;
  # ifdef FEAT_EVAL
  	    use_sandbox = was_set_insecurely((char_u *)"statusline",
  					 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL);
--- 6117,6125 ----
  	else
  	{
  	    if (*wp->w_p_stl != NUL)
! 		stl = wp->w_p_stl;
  	    else
! 		stl = p_stl;
  # ifdef FEAT_EVAL
  	    use_sandbox = was_set_insecurely((char_u *)"statusline",
  					 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL);
***************
*** 6098,6107 ****
      if (maxwidth <= 0)
  	return;
  
      width = build_stl_str_hl(wp == NULL ? curwin : wp,
  				buf, sizeof(buf),
! 				p, use_sandbox,
  				fillchar, maxwidth, hltab, tabtab);
      len = (int)STRLEN(buf);
  
      while (width < maxwidth && len < (int)sizeof(buf) - 1)
--- 6134,6147 ----
      if (maxwidth <= 0)
  	return;
  
+     /* Make a copy, because the statusline may include a function call that
+      * might change the option value and free the memory. */
+     stl = vim_strsave(stl);
      width = build_stl_str_hl(wp == NULL ? curwin : wp,
  				buf, sizeof(buf),
! 				stl, use_sandbox,
  				fillchar, maxwidth, hltab, tabtab);
+     vim_free(stl);
      len = (int)STRLEN(buf);
  
      while (width < maxwidth && len < (int)sizeof(buf) - 1)
***************
*** 9465,9471 ****
  #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
      if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
      {
! 	redraw_custum_statusline(curwin);
      }
      else
  #endif
--- 9505,9511 ----
  #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS)
      if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height)
      {
! 	redraw_custom_statusline(curwin);
      }
      else
  #endif
*** ../vim-7.2.279/src/version.c	2009-11-03 16:44:04.000000000 +0100
--- src/version.c	2009-11-03 17:15:35.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     280,
  /**/

-- 
Every exit is an entrance into something else.

 /// 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    ///


--- NEW FILE 7.2.281 ---
To: vim-dev at vim.org
Subject: Patch 7.2.281
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.281
Problem:    'cursorcolumn' highlighting is wrong in diff mode.
Solution:   Adjust the column computation. (Lech Lorens)
Files:	    src/screen.c


*** ../vim-7.2.280/src/screen.c	2009-11-03 17:20:18.000000000 +0100
--- src/screen.c	2009-11-03 17:13:16.000000000 +0100
***************
*** 3008,3018 ****
  	    mb_ptr_adv(ptr);
  	}
  
! #ifdef FEAT_VIRTUALEDIT
! 	/* When 'virtualedit' is set the end of the line may be before the
! 	 * start of the displayed part. */
! 	if (vcol < v && *ptr == NUL && virtual_active())
  	    vcol = v;
  #endif
  
  	/* Handle a character that's not completely on the screen: Put ptr at
--- 3008,3040 ----
  	    mb_ptr_adv(ptr);
  	}
  
! #if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
! 	/* When:
! 	 * - 'cuc' is set, or
! 	 * - 'virtualedit' is set, or
! 	 * - the visual mode is active,
! 	 * the end of the line may be before the start of the displayed part.
! 	 */
! 	if (vcol < v && (
! # ifdef FEAT_SYN_HL
! 	     wp->w_p_cuc
! #  if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
! 	     ||
! #  endif
! # endif
! # ifdef FEAT_VIRTUALEDIT
! 	     virtual_active()
! #  ifdef FEAT_VISUAL
! 	     ||
! #  endif
! # endif
! # ifdef FEAT_VISUAL
! 	     (VIsual_active && wp->w_buffer == curwin->w_buffer)
! # endif
! 	     ))
! 	{
  	    vcol = v;
+ 	}
  #endif
  
  	/* Handle a character that's not completely on the screen: Put ptr at
*** ../vim-7.2.280/src/version.c	2009-11-03 17:20:18.000000000 +0100
--- src/version.c	2009-11-03 17:34:54.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     281,
  /**/

-- 
Every person is responsible for the choices he makes.

 /// 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    ///


--- NEW FILE 7.2.282 ---
To: vim-dev at vim.org
Subject: Patch 7.2.282
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.282
Problem:    A fold can't be closed.
Solution:   Initialize fd_small to MAYBE. (Lech Lorens)
Files:	    src/fold.c


*** ../vim-7.2.281/src/fold.c	2009-11-03 16:29:48.000000000 +0100
--- src/fold.c	2009-11-03 17:41:50.000000000 +0100
***************
*** 2851,2856 ****
--- 2851,2858 ----
      fp[1].fd_top = bot + 1;
      fp[1].fd_len = fp->fd_len - (fp[1].fd_top - fp->fd_top);
      fp[1].fd_flags = fp->fd_flags;
+     fp[1].fd_small = MAYBE;
+     fp->fd_small = MAYBE;
  
      /* Move nested folds below bot to new fold.  There can't be
       * any between top and bot, they have been removed by the caller. */
*** ../vim-7.2.281/src/version.c	2009-11-03 17:36:09.000000000 +0100
--- src/version.c	2009-11-03 17:59:12.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     282,
  /**/

-- 
You can be stopped by the police for biking over 65 miles per hour.
You are not allowed to walk across a street on your hands.
		[real standing laws in Connecticut, 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    ///


--- NEW FILE 7.2.283 ---
To: vim-dev at vim.org
Subject: Patch 7.2.283
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.283
Problem:    Changing font while the window is maximized doesn't keep the
	    window maximized.
Solution:   Recompute number of lines and columns after changing font. (James
	    Vega)
Files:	    src/gui_gtk_x11.c


*** ../vim-7.2.282/src/gui_gtk_x11.c	2009-09-23 18:14:13.000000000 +0200
--- src/gui_gtk_x11.c	2009-11-03 17:56:27.000000000 +0100
***************
*** 5267,5274 ****
  # endif
  #endif /* !HAVE_GTK2 */
  
!     /* Preserve the logical dimensions of the screen. */
!     update_window_manager_hints(0, 0);
  
      return OK;
  }
--- 5267,5290 ----
  # endif
  #endif /* !HAVE_GTK2 */
  
! #ifdef HAVE_GTK2
!     if (gui_mch_maximized())
!     {
! 	int w, h;
! 
! 	/* Update lines and columns in accordance with the new font, keep the
! 	 * window maximized. */
! 	gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
! 	w -= get_menu_tool_width();
! 	h -= get_menu_tool_height();
! 	gui_resize_shell(w, h);
!     }
!     else
! #endif
!     {
! 	/* Preserve the logical dimensions of the screen. */
! 	update_window_manager_hints(0, 0);
!     }
  
      return OK;
  }
*** ../vim-7.2.282/src/version.c	2009-11-03 18:04:26.000000000 +0100
--- src/version.c	2009-11-03 18:11:53.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     283,
  /**/

-- 
If an elephant is left tied to a parking meter, the parking fee has to be paid
just as it would for a vehicle.
		[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    ///


--- NEW FILE 7.2.284 ---
To: vim-dev at vim.org
Subject: Patch 7.2.284
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.284
Problem:    When editing the same buffer in two windows, one with folding,
	    display may be wrong after changes.
Solution:   Call set_topline() to take care of side effects. (Lech Lorens)
Files:	    src/misc1.c


*** ../vim-7.2.283/src/misc1.c	2009-07-22 11:03:38.000000000 +0200
--- src/misc1.c	2009-11-03 18:38:15.000000000 +0100
***************
*** 2886,2891 ****
--- 2886,2898 ----
  		    }
  #endif
  		}
+ 
+ #ifdef FEAT_FOLDING
+ 	    /* Take care of side effects for setting w_topline when folds have
+ 	     * changed.  Esp. when the buffer was changed in another window. */
+ 	    if (hasAnyFolding(wp))
+ 		set_topline(wp, wp->w_topline);
+ #endif
  	}
      }
  
*** ../vim-7.2.283/src/version.c	2009-11-03 18:13:36.000000000 +0100
--- src/version.c	2009-11-03 18:44:12.000000000 +0100
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     284,
  /**/

-- 
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    ///


--- NEW FILE 7.2.285 ---
To: vim-dev at vim.org
Subject: Patch 7.2.285
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.285 (after 7.2.169)
Problem:    CTRL-U in Insert mode also deletes indent. (Andrey Voropaev)
Solution:   Fix mistake made in patch 7.2.169.
Files:	    src/edit.c


*** ../vim-7.2.284/src/edit.c	2009-07-09 18:15:19.000000000 +0200
--- src/edit.c	2009-11-05 20:25:15.000000000 +0100
***************
*** 8519,8525 ****
  	{
  	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
! 	    if (curwin->w_cursor.col < (colnr_T)temp)
  		mincol = curwin->w_cursor.col;
  	    curwin->w_cursor.col = save_col;
  	}
--- 8519,8525 ----
  	{
  	    save_col = curwin->w_cursor.col;
  	    beginline(BL_WHITE);
! 	    if (curwin->w_cursor.col < save_col)
  		mincol = curwin->w_cursor.col;
  	    curwin->w_cursor.col = save_col;
  	}
*** ../vim-7.2.284/src/version.c	2009-11-03 18:46:53.000000000 +0100
--- src/version.c	2009-11-11 13:21:25.000000000 +0100
***************
*** 678,679 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     285,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      I would like to get back to the Censor and agree to lose the shits, take
      the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in
      your general direction', 'castanets of your testicles' and 'oral sex'
      and ask him for an 'A' rating on that basis.
                 "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    ///


--- NEW FILE 7.2.286 ---
To: vim-dev at vim.org
Subject: Patch 7.2.286
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.286 (after 7.2.269)
Problem:    The "--startuptime=<file>" argument is not consistent with other
	    arguments.
Solution:   Use "--startuptime <file>".  Added the +startuptime feature.
Files:	    runtime/doc/eval.txt, runtime/doc/starting.txt,
	    runtime/doc/various.txt, src/eval.c, src/main.c, src/version.c


*** ../vim-7.2.285/runtime/doc/eval.txt	2009-04-22 12:53:31.000000000 +0200
--- runtime/doc/eval.txt	2009-11-11 13:01:58.000000000 +0100
***************
*** 5869,5874 ****
--- 5881,5887 ----
  signs			Compiled with |:sign| support.
  smartindent		Compiled with 'smartindent' support.
  sniff			Compiled with SNiFF interface support.
+ startuptime		Compiled with |--startuptime| support.
  statusline		Compiled with support for 'statusline', 'rulerformat'
  			and special formats of 'titlestring' and 'iconstring'.
  sun_workshop		Compiled with support for Sun |workshop|.
*** ../vim-7.2.285/runtime/doc/starting.txt	2009-11-03 12:10:39.000000000 +0100
--- runtime/doc/starting.txt	2009-11-11 13:20:56.000000000 +0100
***************
*** 144,155 ****
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
! --startuptime={fname}					*--startuptime*
  		During startup write timing messages to the file {fname}.
  		This can be used to find out where time is spent while loading
! 		your .vimrc and plugins.
  		When {fname} already exists new messages are appended.
! 		{only when compiled with this feature}
  
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
--- 144,156 ----
  			-u NORC			no		    yes
  			--noplugin		yes		    no
  
! --startuptime {fname}					*--startuptime*
  		During startup write timing messages to the file {fname}.
  		This can be used to find out where time is spent while loading
! 		your .vimrc, plugins and opening the first file.
  		When {fname} already exists new messages are appended.
! 		(Only available when compiled with the |+startuptime|
! 		feature).
  
  							*--literal*
  --literal	Take file names literally, don't expand wildcards.  Not needed
*** ../vim-7.2.285/runtime/doc/various.txt	2009-07-09 15:55:34.000000000 +0200
--- runtime/doc/various.txt	2009-11-11 13:03:52.000000000 +0100
***************
*** 374,379 ****
--- 374,380 ----
  B  *+signs*		|:sign|
  N  *+smartindent*	|'smartindent'|
  m  *+sniff*		SniFF interface |sniff|
+ N  *+startuptime*	|--startuptime| argument
  N  *+statusline*	Options 'statusline', 'rulerformat' and special
  			formats of 'titlestring' and 'iconstring'
  m  *+sun_workshop*	|workshop|
*** ../vim-7.2.285/src/eval.c	2009-11-03 14:26:29.000000000 +0100
--- src/eval.c	2009-11-11 12:59:53.000000000 +0100
***************
*** 11736,11741 ****
--- 11736,11744 ----
  #ifdef FEAT_SNIFF
  	"sniff",
  #endif
+ #ifdef STARTUPTIME
+ 	"startuptime",
+ #endif
  #ifdef FEAT_STL_OPT
  	"statusline",
  #endif
*** ../vim-7.2.285/src/main.c	2009-11-03 12:10:39.000000000 +0100
--- src/main.c	2009-11-08 12:57:46.000000000 +0100
***************
*** 204,212 ****
  #ifdef STARTUPTIME
      for (i = 1; i < argc; ++i)
      {
! 	if (STRNICMP(argv[i], "--startuptime=", 14) == 0)
  	{
! 	    time_fd = mch_fopen(argv[i] + 14, "a");
  	    TIME_MSG("--- VIM STARTING ---");
  	    break;
  	}
--- 204,212 ----
  #ifdef STARTUPTIME
      for (i = 1; i < argc; ++i)
      {
! 	if (STRICMP(argv[i], "--startuptime") == 0 && i + 1 < argc)
  	{
! 	    time_fd = mch_fopen(argv[i + 1], "a");
  	    TIME_MSG("--- VIM STARTING ---");
  	    break;
  	}
***************
*** 1726,1731 ****
--- 1726,1736 ----
  		    want_argument = TRUE;
  		    argv_idx += 3;
  		}
+ 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
+ 		{
+ 		    want_argument = TRUE;
+ 		    argv_idx += 11;
+ 		}
  #ifdef FEAT_CLIENTSERVER
  		else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
  		    ; /* already processed -- no arg */
***************
*** 1761,1770 ****
  		    /* already processed, skip */
  		}
  #endif
- 		else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0)
- 		{
- 		    /* already processed, skip */
- 		}
  		else
  		{
  		    if (argv[0][argv_idx])
--- 1766,1771 ----
***************
*** 2061,2067 ****
  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
  
  		--argc;
! 		if (argc < 1 && c != 'S')
  		    mainerr_arg_missing((char_u *)argv[0]);
  		++argv;
  		argv_idx = -1;
--- 2062,2068 ----
  		    mainerr(ME_GARBAGE, (char_u *)argv[0]);
  
  		--argc;
! 		if (argc < 1 && c != 'S')  /* -S has an optional argument */
  		    mainerr_arg_missing((char_u *)argv[0]);
  		++argv;
  		argv_idx = -1;
***************
*** 2102,2112 ****
  							    (char_u *)argv[0];
  		    break;
  
! 		case '-':	/* "--cmd {command}" execute command */
! 		    if (parmp->n_pre_commands >= MAX_ARG_CMDS)
! 			mainerr(ME_EXTRA_CMD, NULL);
! 		    parmp->pre_commands[parmp->n_pre_commands++] =
  							    (char_u *)argv[0];
  		    break;
  
  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
--- 2103,2118 ----
  							    (char_u *)argv[0];
  		    break;
  
! 		case '-':
! 		    if (argv[-1][2] == 'c')
! 		    {
! 			/* "--cmd {command}" execute command */
! 			if (parmp->n_pre_commands >= MAX_ARG_CMDS)
! 			    mainerr(ME_EXTRA_CMD, NULL);
! 			parmp->pre_commands[parmp->n_pre_commands++] =
  							    (char_u *)argv[0];
+ 		    }
+ 		    /* "--startuptime <file>" already handled */
  		    break;
  
  	    /*	case 'd':   -d {device} is handled in mch_check_win() for the
***************
*** 3144,3149 ****
--- 3150,3158 ----
      main_msg(_("--serverlist\t\tList available Vim server names and exit"));
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
+ #ifdef STARTUPTIME
+     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
+ #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
  #endif
*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
--- src/version.c	2009-11-11 14:17:28.000000000 +0100
***************
*** 494,499 ****
--- 494,504 ----
  #else
  	"-sniff",
  #endif
+ #ifdef STARTUPTIME
+ 	"+startuptime",
+ #else
+ 	"-startuptime",
+ #endif
  #ifdef FEAT_STL_OPT
  	"+statusline",
  #else
*** ../vim-7.2.285/src/version.c	2009-11-11 13:22:09.000000000 +0100
--- src/version.c	2009-11-11 14:17:28.000000000 +0100
***************
*** 678,679 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     286,
  /**/

-- 
A fool must search for a greater fool to find admiration.

 /// 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    ///


--- NEW FILE 7.2.287 ---
To: vim-dev at vim.org
Subject: Patch 7.2.287
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.287
Problem:    Warning from gcc 3.4 about uninitialized variable.
Solution:   Move assignment outside of #ifdef.
Files:	    src/if_perl.xs


*** ../vim-7.2.286/src/if_perl.xs	2009-07-14 16:05:14.000000000 +0200
--- src/if_perl.xs	2009-11-11 12:29:32.000000000 +0100
***************
*** 720,727 ****
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
! 	if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
  # endif
--- 720,728 ----
  #ifdef HAVE_SANDBOX
      if (sandbox)
      {
+ 	safe = perl_get_sv( "VIM::safe", FALSE );
  # ifndef MAKE_TEST  /* avoid a warning for unreachable code */
! 	if (safe == NULL || !SvTRUE(safe))
  	    EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
  	else
  # endif
*** ../vim-7.2.286/src/version.c	2009-11-11 14:21:48.000000000 +0100
--- src/version.c	2009-11-11 14:44:49.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     287,
  /**/

-- 
The most powerful force in the universe is gossip.

 /// 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    ///


--- NEW FILE 7.2.288 ---
To: vim-dev at vim.org
Subject: Patch 7.2.288
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.288
Problem:    Python 2.6 pyconfig.h redefines macros.
Solution:   Undefine the macros before including pyconfig.h.
Files:      src/if_python.c


*** ../vim-7.2.287/src/if_python.c	2009-11-03 11:43:05.000000000 +0100
--- src/if_python.c	2009-11-11 12:33:37.000000000 +0100
***************
*** 37,42 ****
--- 37,48 ----
  #ifdef HAVE_STDARG_H
  # undef HAVE_STDARG_H	/* Python's config.h defines it as well. */
  #endif
+ #ifdef _POSIX_C_SOURCE
+ # undef _POSIX_C_SOURCE	/* pyconfig.h defines it as well. */
+ #endif
+ #ifdef _XOPEN_SOURCE
+ # undef _XOPEN_SOURCE	/* pyconfig.h defines it as well. */
+ #endif
  
  #define PY_SSIZE_T_CLEAN
  
*** ../vim-7.2.287/src/version.c	2009-11-11 14:45:36.000000000 +0100
--- src/version.c	2009-11-11 15:05:51.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     288,
  /**/

-- 
I am always surprised in the Linux world how quickly solutions can be
obtained.  (Imagine sending an email to Bill Gates, asking why Windows
crashed, and how to fix it...  and then getting an answer that fixed the
problem... <0>_<0> !)		              -- Mark Langdon

 /// 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    ///


--- NEW FILE 7.2.289 ---
To: vim-dev at vim.org
Subject: Patch 7.2.289
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.289
Problem:    Checking wrong struct member.
Solution:   Change tb_buf to tb_noremap. (Dominique Pelle)
Files:	    src/getchar.c


*** ../vim-7.2.288/src/getchar.c	2009-09-30 15:15:33.000000000 +0200
--- src/getchar.c	2009-11-11 12:50:58.000000000 +0100
***************
*** 22,28 ****
   * These buffers are used for storing:
   * - stuffed characters: A command that is translated into another command.
   * - redo characters: will redo the last change.
!  * - recorded chracters: for the "q" command.
   *
   * The bytes are stored like in the typeahead buffer:
   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
--- 22,28 ----
   * These buffers are used for storing:
   * - stuffed characters: A command that is translated into another command.
   * - redo characters: will redo the last change.
!  * - recorded characters: for the "q" command.
   *
   * The bytes are stored like in the typeahead buffer:
   * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
***************
*** 1283,1289 ****
  	EMSG2(_(e_intern2), "Free typebuf 1");
      else
  	vim_free(typebuf.tb_buf);
!     if (typebuf.tb_buf == noremapbuf_init)
  	EMSG2(_(e_intern2), "Free typebuf 2");
      else
  	vim_free(typebuf.tb_noremap);
--- 1283,1289 ----
  	EMSG2(_(e_intern2), "Free typebuf 1");
      else
  	vim_free(typebuf.tb_buf);
!     if (typebuf.tb_noremap == noremapbuf_init)
  	EMSG2(_(e_intern2), "Free typebuf 2");
      else
  	vim_free(typebuf.tb_noremap);
***************
*** 1516,1522 ****
   * wanted.
   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
   * Collects the bytes of a multibyte character into the whole character.
!  * Returns the modifers in the global "mod_mask".
   */
      int
  vgetc()
--- 1516,1522 ----
   * wanted.
   * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
   * Collects the bytes of a multibyte character into the whole character.
!  * Returns the modifiers in the global "mod_mask".
   */
      int
  vgetc()
***************
*** 3320,3326 ****
  			    retval = 1;
  			    goto theend;
  			}
! 	    /* An abbrevation cannot contain white space. */
  	    for (n = 0; n < len; ++n)
  		if (vim_iswhite(keys[n]))
  		{
--- 3320,3326 ----
  			    retval = 1;
  			    goto theend;
  			}
! 	    /* An abbreviation cannot contain white space. */
  	    for (n = 0; n < len; ++n)
  		if (vim_iswhite(keys[n]))
  		{
***************
*** 4272,4278 ****
  
      /*
       * Check for word before the cursor: If it ends in a keyword char all
!      * chars before it must be al keyword chars or non-keyword chars, but not
       * white space. If it ends in a non-keyword char we accept any characters
       * before it except white space.
       */
--- 4272,4278 ----
  
      /*
       * Check for word before the cursor: If it ends in a keyword char all
!      * chars before it must be keyword chars or non-keyword chars, but not
       * white space. If it ends in a non-keyword char we accept any characters
       * before it except white space.
       */
*** ../vim-7.2.288/src/version.c	2009-11-11 15:06:59.000000000 +0100
--- src/version.c	2009-11-11 16:19:12.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     289,
  /**/

-- 
A M00se once bit my sister ...
                 "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    ///


--- NEW FILE 7.2.290 ---
To: vim-dev at vim.org
Subject: Patch 7.2.290
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.290
Problem:    Not freeing memory from ":lmap", ":xmap" and ":menutranslate".
Solution:   Free the memory when exiting. (Dominique Pelle)
Files:	    src/misc2.c


*** ../vim-7.2.289/src/misc2.c	2009-11-03 16:44:04.000000000 +0100
--- src/misc2.c	2009-11-11 16:49:13.000000000 +0100
***************
*** 1005,1013 ****
--- 1005,1018 ----
  # ifdef FEAT_MENU
      /* Clear menus. */
      do_cmdline_cmd((char_u *)"aunmenu *");
+ #  ifdef FEAT_MULTI_LANG
+     do_cmdline_cmd((char_u *)"menutranslate clear");
+ #  endif
  # endif
  
      /* Clear mappings, abbreviations, breakpoints. */
+     do_cmdline_cmd((char_u *)"lmapclear");
+     do_cmdline_cmd((char_u *)"xmapclear");
      do_cmdline_cmd((char_u *)"mapclear");
      do_cmdline_cmd((char_u *)"mapclear!");
      do_cmdline_cmd((char_u *)"abclear");
***************
*** 1282,1288 ****
  
  /*
   * Escape "string" for use as a shell argument with system().
!  * This uses single quotes, except when we know we need to use double qoutes
   * (MS-DOS and MS-Windows without 'shellslash' set).
   * Escape a newline, depending on the 'shell' option.
   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
--- 1287,1293 ----
  
  /*
   * Escape "string" for use as a shell argument with system().
!  * This uses single quotes, except when we know we need to use double quotes
   * (MS-DOS and MS-Windows without 'shellslash' set).
   * Escape a newline, depending on the 'shell' option.
   * When "do_special" is TRUE also replace "!", "%", "#" and things starting
***************
*** 1537,1543 ****
  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
  /*
   * Copy a character a number of times.
!  * Does not work for multi-byte charactes!
   */
      void
  copy_chars(ptr, count, c)
--- 1542,1548 ----
  #if defined(FEAT_VISUALEXTRA) || defined(PROTO)
  /*
   * Copy a character a number of times.
!  * Does not work for multi-byte characters!
   */
      void
  copy_chars(ptr, count, c)
***************
*** 4260,4266 ****
  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
  	 * For EBCDIC you get different character values.
  	 * If no restrict is given after '**' the default is used.
! 	 * Due to this technic the path looks awful if you print it as a
  	 * string.
  	 */
  	len = 0;
--- 4265,4271 ----
  	 * or '**76' is transposed to '**N'( 'N' is ASCII value 76).
  	 * For EBCDIC you get different character values.
  	 * If no restrict is given after '**' the default is used.
! 	 * Due to this technique the path looks awful if you print it as a
  	 * string.
  	 */
  	len = 0;
***************
*** 4649,4655 ****
  				      && !mch_isdir(stackp->ffs_filearray[i]))
  			    continue;   /* not a directory */
  
! 			/* prepare the filename to be checked for existance
  			 * below */
  			STRCPY(file_path, stackp->ffs_filearray[i]);
  			add_pathsep(file_path);
--- 4654,4660 ----
  				      && !mch_isdir(stackp->ffs_filearray[i]))
  			    continue;   /* not a directory */
  
! 			/* prepare the filename to be checked for existence
  			 * below */
  			STRCPY(file_path, stackp->ffs_filearray[i]);
  			add_pathsep(file_path);
***************
*** 5438,5444 ****
  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
  	    /* handle "\tmp" as absolute path */
  	    || vim_ispathsep(ff_file_to_find[0])
! 	    /* handle "c:name" as absulute path */
  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
  #endif
  #ifdef AMIGA
--- 5443,5449 ----
  #if defined(MSWIN) || defined(MSDOS) || defined(OS2)
  	    /* handle "\tmp" as absolute path */
  	    || vim_ispathsep(ff_file_to_find[0])
! 	    /* handle "c:name" as absolute path */
  	    || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':')
  #endif
  #ifdef AMIGA
***************
*** 5681,5687 ****
  		p2 = (char_u *)base + (j + gap) * elm_size;
  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
  		    break;
! 		/* Exchange the elemets. */
  		mch_memmove(buf, p1, elm_size);
  		mch_memmove(p1, p2, elm_size);
  		mch_memmove(p2, buf, elm_size);
--- 5686,5692 ----
  		p2 = (char_u *)base + (j + gap) * elm_size;
  		if ((*cmp)((void *)p1, (void *)p2) <= 0)
  		    break;
! 		/* Exchange the elements. */
  		mch_memmove(buf, p1, elm_size);
  		mch_memmove(p1, p2, elm_size);
  		mch_memmove(p2, buf, elm_size);
*** ../vim-7.2.289/src/version.c	2009-11-11 16:23:37.000000000 +0100
--- src/version.c	2009-11-11 16:54:53.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     290,
  /**/

-- 
ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
        King of all Britons, defeator of the Saxons, sovereign of all England!
   [Pause]
SOLDIER: Get away!
                 "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    ///


--- NEW FILE 7.2.291 ---
To: vim-dev at vim.org
Subject: Patch 7.2.291
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.291
Problem:    Reading uninitialised memory in arabic mode.
Solution:   Use utfc_ptr2char_len() rather than utfc_ptr2char().  (Dominique
	    Pelle)
Files:	    src/screen.c


*** ../vim-7.2.290/src/screen.c	2009-11-03 17:36:09.000000000 +0100
--- src/screen.c	2009-11-11 17:04:53.000000000 +0100
***************
*** 6413,6419 ****
  		    }
  		    else
  		    {
! 			nc = utfc_ptr2char(ptr + mbyte_blen, pcc);
  			nc1 = pcc[0];
  		    }
  		    pc = prev_c;
--- 6413,6420 ----
  		    }
  		    else
  		    {
! 			nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
! 				      (int)((text + len) - ptr - mbyte_blen));
  			nc1 = pcc[0];
  		    }
  		    pc = prev_c;
*** ../vim-7.2.290/src/version.c	2009-11-11 16:56:13.000000000 +0100
--- src/version.c	2009-11-11 17:06:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     291,
  /**/

-- 
The problem with political jokes is that they get elected.

 /// 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    ///


--- NEW FILE 7.2.292 ---
To: vim-dev at vim.org
Subject: Patch 7.2.292
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.292
Problem:    Block right-shift doesn't work properly with multi-byte encoding
	    and 'list' set.
Solution:   Add the missing "else". (Lech Lorens)
Files:	    src/ops.c


*** ../vim-7.2.291/src/ops.c	2009-11-03 16:44:04.000000000 +0100
--- src/ops.c	2009-11-11 17:15:04.000000000 +0100
***************
*** 422,429 ****
  #ifdef FEAT_MBYTE
  	    if (has_mbyte)
  		bd.textstart += (*mb_ptr2len)(bd.textstart);
  #endif
! 	    ++bd.textstart;
  	}
  	for ( ; vim_iswhite(*bd.textstart); )
  	{
--- 422,430 ----
  #ifdef FEAT_MBYTE
  	    if (has_mbyte)
  		bd.textstart += (*mb_ptr2len)(bd.textstart);
+ 	    else
  #endif
! 		++bd.textstart;
  	}
  	for ( ; vim_iswhite(*bd.textstart); )
  	{
*** ../vim-7.2.291/src/version.c	2009-11-11 17:07:25.000000000 +0100
--- src/version.c	2009-11-11 17:21:31.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     292,
  /**/

-- 
Computers make very fast, very accurate, mistakes.

 /// 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    ///


--- NEW FILE 7.2.293 ---
To: vim-dev at vim.org
Subject: Patch 7.2.293
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.293
Problem:    When setting 'comments' option it may be used in a wrong way. 
Solution:   Don't increment after skipping over digets. (Yukihiro Nakadaira)
Files:	    src/misc1.c


*** ../vim-7.2.292/src/misc1.c	2009-11-03 18:46:53.000000000 +0100
--- src/misc1.c	2009-11-11 17:27:38.000000000 +0100
***************
*** 1026,1037 ****
  		    int		c = 0;
  		    int		off = 0;
  
! 		    for (p = lead_flags; *p && *p != ':'; ++p)
  		    {
  			if (*p == COM_RIGHT || *p == COM_LEFT)
! 			    c = *p;
  			else if (VIM_ISDIGIT(*p) || *p == '-')
  			    off = getdigits(&p);
  		    }
  		    if (c == COM_RIGHT)    /* right adjusted leader */
  		    {
--- 1026,1039 ----
  		    int		c = 0;
  		    int		off = 0;
  
! 		    for (p = lead_flags; *p != NUL && *p != ':'; )
  		    {
  			if (*p == COM_RIGHT || *p == COM_LEFT)
! 			    c = *p++;
  			else if (VIM_ISDIGIT(*p) || *p == '-')
  			    off = getdigits(&p);
+ 			else
+ 			    ++p;
  		    }
  		    if (c == COM_RIGHT)    /* right adjusted leader */
  		    {
*** ../vim-7.2.292/src/version.c	2009-11-11 17:22:30.000000000 +0100
--- src/version.c	2009-11-11 17:29:24.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     293,
  /**/

-- 
SOLDIER: What?  Ridden on a horse?
ARTHUR:  Yes!
SOLDIER: You're using coconuts!
                 "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    ///


--- NEW FILE 7.2.294 ---
To: vim-dev at vim.org
Subject: Patch 7.2.294
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.294
Problem:    When using TEMPDIRS dir name could get too long.
Solution:   Overwrite tail instead of appending each time.  Use mkdtemp() when
	    available. (James Vega)
Files:	    src/auto/configure, src/config.h.in, src/configure.in, src/fileio.c


*** ../vim-7.2.293/src/auto/configure	2009-09-11 13:44:33.000000000 +0200
--- src/auto/configure	2009-11-17 12:03:15.000000000 +0100
***************
*** 14019,14027 ****
  
  
  
  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
--- 14019,14028 ----
  
  
  
+ 
  for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
*** ../vim-7.2.293/src/config.h.in	2009-05-21 23:25:38.000000000 +0200
--- src/config.h.in	2009-11-11 17:40:21.000000000 +0100
***************
*** 157,162 ****
--- 157,163 ----
  #undef HAVE_LSTAT
  #undef HAVE_MEMCMP
  #undef HAVE_MEMSET
+ #undef HAVE_MKDTEMP
  #undef HAVE_NANOSLEEP
  #undef HAVE_OPENDIR
  #undef HAVE_FLOAT_FUNCS
*** ../vim-7.2.293/src/configure.in	2009-09-11 13:44:33.000000000 +0200
--- src/configure.in	2009-11-11 17:40:21.000000000 +0100
***************
*** 2635,2641 ****
  dnl Check for functions in one big call, to reduce the size of configure
  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
--- 2635,2641 ----
  dnl Check for functions in one big call, to reduce the size of configure
  AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
  	getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
! 	memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
  	setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
  	sigvec strcasecmp strerror strftime stricmp strncasecmp \
  	strnicmp strpbrk strtol tgetent towlower towupper iswupper \
*** ../vim-7.2.293/src/fileio.c	2009-09-11 17:24:01.000000000 +0200
--- src/fileio.c	2009-11-11 18:01:22.000000000 +0100
***************
*** 146,151 ****
--- 146,152 ----
  # endif
  #endif
  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+ static void vim_settempdir __ARGS((char_u *tempdir));
  #ifdef FEAT_AUTOCMD
  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
  #endif
***************
*** 6987,6992 ****
--- 6988,7020 ----
  #endif
  
  /*
+  * Directory "tempdir" was created.  Expand this name to a full path and put
+  * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
+  * "tempdir" must be no longer than MAXPATHL.
+  */
+     static void
+ vim_settempdir(tempdir)
+     char_u	*tempdir;
+ {
+     char_u	*buf;
+ 
+     buf = alloc((unsigned)MAXPATHL + 2);
+     if (buf != NULL)
+     {
+ 	if (vim_FullName(tempdir, buf, MAXPATHL, FALSE) == FAIL)
+ 	    STRCPY(buf, tempdir);
+ # ifdef __EMX__
+ 	if (vim_strchr(buf, '/') != NULL)
+ 	    STRCAT(buf, "/");
+ 	else
+ # endif
+ 	    add_pathsep(buf);
+ 	vim_tempdir = vim_strsave(buf);
+ 	vim_free(buf);
+     }
+ }
+ 
+ /*
   * vim_tempname(): Return a unique name that can be used for a temp file.
   *
   * The temp file is NOT created.
***************
*** 7007,7014 ****
  #ifdef TEMPDIRNAMES
      static char	*(tempdirs[]) = {TEMPDIRNAMES};
      int		i;
-     long	nr;
-     long	off;
  # ifndef EEXIST
      struct stat	st;
  # endif
--- 7035,7040 ----
***************
*** 7027,7032 ****
--- 7053,7064 ----
  	 */
  	for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
  	{
+ 	    size_t	itmplen;
+ # ifndef HAVE_MKDTEMP
+ 	    long	nr;
+ 	    long	off;
+ # endif
+ 
  	    /* expand $TMP, leave room for "/v1100000/999999999" */
  	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
  	    if (mch_isdir(itmp))		/* directory exists */
***************
*** 7040,7046 ****
--- 7072,7085 ----
  		else
  # endif
  		    add_pathsep(itmp);
+ 		itmplen = STRLEN(itmp);
  
+ # ifdef HAVE_MKDTEMP
+ 		/* Leave room for filename */
+ 		STRCAT(itmp, "vXXXXXX");
+ 		if (mkdtemp((char *)itmp) != NULL)
+ 		    vim_settempdir(itmp);
+ # else
  		/* Get an arbitrary number of up to 6 digits.  When it's
  		 * unlikely that it already exists it will be faster,
  		 * otherwise it doesn't matter.  The use of mkdir() avoids any
***************
*** 7052,7110 ****
  		for (off = 0; off < 10000L; ++off)
  		{
  		    int		r;
! #if defined(UNIX) || defined(VMS)
  		    mode_t	umask_save;
! #endif
  
! 		    sprintf((char *)itmp + STRLEN(itmp), "v%ld", nr + off);
! # ifndef EEXIST
  		    /* If mkdir() does not set errno to EEXIST, check for
  		     * existing file here.  There is a race condition then,
  		     * although it's fail-safe. */
  		    if (mch_stat((char *)itmp, &st) >= 0)
  			continue;
! # endif
! #if defined(UNIX) || defined(VMS)
  		    /* Make sure the umask doesn't remove the executable bit.
  		     * "repl" has been reported to use "177". */
  		    umask_save = umask(077);
! #endif
  		    r = vim_mkdir(itmp, 0700);
! #if defined(UNIX) || defined(VMS)
  		    (void)umask(umask_save);
! #endif
  		    if (r == 0)
  		    {
! 			char_u	*buf;
! 
! 			/* Directory was created, use this name.
! 			 * Expand to full path; When using the current
! 			 * directory a ":cd" would confuse us. */
! 			buf = alloc((unsigned)MAXPATHL + 1);
! 			if (buf != NULL)
! 			{
! 			    if (vim_FullName(itmp, buf, MAXPATHL, FALSE)
! 								      == FAIL)
! 				STRCPY(buf, itmp);
! # ifdef __EMX__
! 			    if (vim_strchr(buf, '/') != NULL)
! 				STRCAT(buf, "/");
! 			    else
! # endif
! 				add_pathsep(buf);
! 			    vim_tempdir = vim_strsave(buf);
! 			    vim_free(buf);
! 			}
  			break;
  		    }
! # ifdef EEXIST
  		    /* If the mkdir() didn't fail because the file/dir exists,
  		     * we probably can't create any dir here, try another
  		     * place. */
  		    if (errno != EEXIST)
! # endif
  			break;
  		}
  		if (vim_tempdir != NULL)
  		    break;
  	    }
--- 7091,7131 ----
  		for (off = 0; off < 10000L; ++off)
  		{
  		    int		r;
! #  if defined(UNIX) || defined(VMS)
  		    mode_t	umask_save;
! #  endif
  
! 		    sprintf((char *)itmp + itmplen, "v%ld", nr + off);
! #  ifndef EEXIST
  		    /* If mkdir() does not set errno to EEXIST, check for
  		     * existing file here.  There is a race condition then,
  		     * although it's fail-safe. */
  		    if (mch_stat((char *)itmp, &st) >= 0)
  			continue;
! #  endif
! #  if defined(UNIX) || defined(VMS)
  		    /* Make sure the umask doesn't remove the executable bit.
  		     * "repl" has been reported to use "177". */
  		    umask_save = umask(077);
! #  endif
  		    r = vim_mkdir(itmp, 0700);
! #  if defined(UNIX) || defined(VMS)
  		    (void)umask(umask_save);
! #  endif
  		    if (r == 0)
  		    {
! 			vim_settempdir(itmp);
  			break;
  		    }
! #  ifdef EEXIST
  		    /* If the mkdir() didn't fail because the file/dir exists,
  		     * we probably can't create any dir here, try another
  		     * place. */
  		    if (errno != EEXIST)
! #  endif
  			break;
  		}
+ # endif /* HAVE_MKDTEMP */
  		if (vim_tempdir != NULL)
  		    break;
  	    }
*** ../vim-7.2.293/src/version.c	2009-11-11 17:30:05.000000000 +0100
--- src/version.c	2009-11-17 11:54:49.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     294,
  /**/

-- 
ARTHUR:       Now stand aside worthy adversary.
BLACK KNIGHT: (Glancing at his shoulder) 'Tis but a scratch.
ARTHUR:       A scratch?  Your arm's off.
                 "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    ///


--- NEW FILE 7.2.295 ---
To: vim-dev at vim.org
Subject: Patch 7.2.295
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.295
Problem:    When using map() on a List the index is not known.
Solution:   Set v:key to the  index. (Hari Krishna Dara)
Files:	    runtime/doc/eval.txt, src/eval.c


*** ../vim-7.2.294/runtime/doc/eval.txt	2009-11-11 14:21:48.000000000 +0100
--- runtime/doc/eval.txt	2009-11-11 18:22:54.000000000 +0100
***************
*** 3802,3808 ****
  		Replace each item in {expr} with the result of evaluating
  		{string}.
  		Inside {string} |v:val| has the value of the current item.
! 		For a |Dictionary| |v:key| has the key of the current item.
  		Example: >
  			:call map(mylist, '"> " . v:val . " <"')
  <		This puts "> " before and " <" after each item in "mylist".
--- 3812,3819 ----
  		Replace each item in {expr} with the result of evaluating
  		{string}.
  		Inside {string} |v:val| has the value of the current item.
! 		For a |Dictionary| |v:key| has the key of the current item
! 		and for a |List| |v:key| has the index of the current item.
  		Example: >
  			:call map(mylist, '"> " . v:val . " <"')
  <		This puts "> " before and " <" after each item in "mylist".
*** ../vim-7.2.294/src/eval.c	2009-11-11 14:21:48.000000000 +0100
--- src/eval.c	2009-11-11 18:22:49.000000000 +0100
***************
*** 9928,9933 ****
--- 9928,9934 ----
      int		todo;
      char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
      int		save_did_emsg;
+     int		index = 0;
  
      if (argvars[0].v_type == VAR_LIST)
      {
***************
*** 9961,9969 ****
  	save_did_emsg = did_emsg;
  	did_emsg = FALSE;
  
  	if (argvars[0].v_type == VAR_DICT)
  	{
- 	    prepare_vimvar(VV_KEY, &save_key);
  	    vimvars[VV_KEY].vv_type = VAR_STRING;
  
  	    ht = &d->dv_hashtab;
--- 9962,9970 ----
  	save_did_emsg = did_emsg;
  	did_emsg = FALSE;
  
+ 	prepare_vimvar(VV_KEY, &save_key);
  	if (argvars[0].v_type == VAR_DICT)
  	{
  	    vimvars[VV_KEY].vv_type = VAR_STRING;
  
  	    ht = &d->dv_hashtab;
***************
*** 9987,10010 ****
  		}
  	    }
  	    hash_unlock(ht);
- 
- 	    restore_vimvar(VV_KEY, &save_key);
  	}
  	else
  	{
  	    for (li = l->lv_first; li != NULL; li = nli)
  	    {
  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
  		    break;
  		nli = li->li_next;
  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
  								  || did_emsg)
  		    break;
  		if (!map && rem)
  		    listitem_remove(l, li);
  	    }
  	}
  
  	restore_vimvar(VV_VAL, &save_val);
  
  	did_emsg |= save_did_emsg;
--- 9988,10014 ----
  		}
  	    }
  	    hash_unlock(ht);
  	}
  	else
  	{
+ 	    vimvars[VV_KEY].vv_type = VAR_NUMBER;
+ 
  	    for (li = l->lv_first; li != NULL; li = nli)
  	    {
  		if (tv_check_lock(li->li_tv.v_lock, ermsg))
  		    break;
  		nli = li->li_next;
+ 		vimvars[VV_KEY].vv_nr = index;
  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
  								  || did_emsg)
  		    break;
  		if (!map && rem)
  		    listitem_remove(l, li);
+ 		++index;
  	    }
  	}
  
+ 	restore_vimvar(VV_KEY, &save_key);
  	restore_vimvar(VV_VAL, &save_val);
  
  	did_emsg |= save_did_emsg;
*** ../vim-7.2.294/src/version.c	2009-11-17 12:08:48.000000000 +0100
--- src/version.c	2009-11-17 12:18:08.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     295,
  /**/

-- 
ARTHUR:       You are indeed brave Sir knight, but the fight is mine.
BLACK KNIGHT: Had enough?
ARTHUR:       You stupid bastard.  You havn't got any arms left.
                 "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    ///


--- NEW FILE 7.2.296 ---
To: vim-dev at vim.org
Subject: Patch 7.2.296
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.296
Problem:    Help message about startuptime is wrong. (Dominique Pelle)
Solution:   Remove the equal sign.
Files:	    src/main.c


*** ../vim-7.2.295/src/main.c	2009-11-11 14:21:48.000000000 +0100
--- src/main.c	2009-11-11 22:51:04.000000000 +0100
***************
*** 3151,3157 ****
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
  #ifdef STARTUPTIME
!     main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
  #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
--- 3151,3157 ----
      main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
  #endif
  #ifdef STARTUPTIME
!     main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>"));
  #endif
  #ifdef FEAT_VIMINFO
      main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
*** ../vim-7.2.295/src/version.c	2009-11-17 12:20:30.000000000 +0100
--- src/version.c	2009-11-17 12:30:29.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     296,
  /**/

-- 
BLACK KNIGHT: I'm invincible!
ARTHUR:       You're a looney.
                 "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    ///


--- NEW FILE 7.2.297 ---
To: vim-dev at vim.org
Subject: Patch 7.2.297
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.297
Problem:    Reading freed memory when writing ":reg" output to a register.
	    (Dominique Pelle)
Solution:   Skip the register being written to.
Files:	    src/ops.c


*** ../vim-7.2.296/src/ops.c	2009-11-11 17:22:30.000000000 +0100
--- src/ops.c	2009-11-11 19:30:47.000000000 +0100
***************
*** 3991,3996 ****
--- 3991,4004 ----
  	}
  	else
  	    yb = &(y_regs[i]);
+ 
+ #ifdef FEAT_EVAL
+ 	if (name == MB_TOLOWER(redir_reg)
+ 		|| (redir_reg == '"' && yb == y_previous))
+ 	    continue;	    /* do not list register being written to, the
+ 			     * pointer can be freed */
+ #endif
+ 
  	if (yb->y_array != NULL)
  	{
  	    msg_putchar('\n');
***************
*** 6090,6096 ****
      long	maxlen;
  #endif
  
!     if (y_ptr->y_array == NULL)		/* NULL means emtpy register */
  	y_ptr->y_size = 0;
  
      /*
--- 6098,6104 ----
      long	maxlen;
  #endif
  
!     if (y_ptr->y_array == NULL)		/* NULL means empty register */
  	y_ptr->y_size = 0;
  
      /*
*** ../vim-7.2.296/src/version.c	2009-11-17 12:31:30.000000000 +0100
--- src/version.c	2009-11-17 12:42:28.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     297,
  /**/

-- 
"Beware of bugs in the above code; I have only proved
it correct, not tried it." -- Donald Knuth

 /// 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    ///


--- NEW FILE 7.2.298 ---
To: vim-dev at vim.org
Subject: Patch 7.2.298
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.298
Problem:    ":vimgrep" crashes when there is an autocommand that sets a
	    window-local variable.
Solution:   Initialize the w: hashtab for re-use. (Yukihiro Nakadaira)
Files:	    src/fileio.c


*** ../vim-7.2.297/src/fileio.c	2009-11-17 12:08:48.000000000 +0100
--- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
***************
*** 8597,8602 ****
--- 8605,8611 ----
  	    curwin = firstwin;
  # ifdef FEAT_EVAL
  	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
+ 	hash_init(&aucmd_win->w_vars.dv_hashtab);   /* re-use the hashtab */
  # endif
  #else
  	curwin = aco->save_curwin;
*** ../vim-7.2.297/src/version.c	2009-11-17 12:43:19.000000000 +0100
--- src/version.c	2009-11-17 14:56:19.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     298,
  /**/

-- 
Eye have a spelling checker, it came with my PC;
It plainly marks four my revue mistakes I cannot sea.
I've run this poem threw it, I'm sure your please to no,
It's letter perfect in it's weigh, my checker tolled me sew!

 /// 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    ///


--- NEW FILE 7.2.299 ---
To: vim-dev at vim.org
Subject: Patch 7.2.299
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.299
Problem:    Crash when comment middle is longer than start.
Solution:   Fix size computation. (Lech Lorens)
Files:	    src/misc1.c


*** ../vim-7.2.298/src/misc1.c	2009-11-11 17:30:05.000000000 +0100
--- src/misc1.c	2009-11-17 15:59:28.000000000 +0100
***************
*** 1121,1127 ****
  			    if (i != lead_repl_len)
  			    {
  				mch_memmove(p + lead_repl_len, p + i,
! 				       (size_t)(lead_len - i - (leader - p)));
  				lead_len += lead_repl_len - i;
  			    }
  			}
--- 1121,1127 ----
  			    if (i != lead_repl_len)
  			    {
  				mch_memmove(p + lead_repl_len, p + i,
! 				       (size_t)(lead_len - i - (p - leader)));
  				lead_len += lead_repl_len - i;
  			    }
  			}
*** ../vim-7.2.298/src/version.c	2009-11-17 14:57:19.000000000 +0100
--- src/version.c	2009-11-17 16:01:07.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     299,
  /**/

-- 
BLACK KNIGHT: The Black Knight always triumphs. Have at you!
   ARTHUR takes his last leg off.  The BLACK KNIGHT's body lands upright.
BLACK KNIGHT: All right, we'll call it a draw.
                 "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    ///


--- NEW FILE 7.2.300 ---
To: vim-dev at vim.org
Subject: Patch 7.2.300
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.300
Problem:    Vim doesn't close file descriptors when forking and executing
	    another command, e.g., ":shell".
Solution:   Use FD_CLOEXEC when available. (James Vega)
Files:	    src/auto/configure, src/config.h.in, src/configure.in,
	    src/ex_cmdds2.c, src/fileio.c, src/memfile.c, src/memline.c


*** ../vim-7.2.299/src/auto/configure	2009-11-17 12:08:48.000000000 +0100
--- src/auto/configure	2009-11-17 13:09:03.000000000 +0100
***************
*** 15174,15179 ****
--- 15174,15231 ----
  $as_echo "yes" >&6; }
  fi
  
+ { $as_echo "$as_me:$LINENO: checking for FD_CLOEXEC" >&5
+ $as_echo_n "checking for FD_CLOEXEC... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+ int
+ main ()
+ {
+ 	int flag = FD_CLOEXEC;
+   ;
+   return 0;
+ }
+ _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$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
+   $as_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
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FD_CLOEXEC 1
+ _ACEOF
+ 
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	{ $as_echo "$as_me:$LINENO: result: not usable" >&5
+ $as_echo "not usable" >&6; }
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
  { $as_echo "$as_me:$LINENO: checking for rename" >&5
  $as_echo_n "checking for rename... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
*** ../vim-7.2.299/src/config.h.in	2009-11-17 12:08:48.000000000 +0100
--- src/config.h.in	2009-11-17 13:01:36.000000000 +0100
***************
*** 388,390 ****
--- 388,393 ----
  
  /* Define if you want XSMP interaction as well as vanilla swapfile safety */
  #undef USE_XSMP_INTERACT
+ 
+ /* Define if fcntl()'s F_SETFD command knows about FD_CLOEXEC */
+ #undef HAVE_FD_CLOEXEC
*** ../vim-7.2.299/src/configure.in	2009-11-17 12:08:48.000000000 +0100
--- src/configure.in	2009-11-17 13:01:36.000000000 +0100
***************
*** 2855,2860 ****
--- 2855,2870 ----
    AC_MSG_RESULT(yes)
  fi
  
+ dnl make sure the FD_CLOEXEC flag for fcntl()'s F_SETFD command is known
+ AC_MSG_CHECKING(for FD_CLOEXEC)
+ AC_TRY_COMPILE(
+ [#if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif],
+ [	int flag = FD_CLOEXEC;],
+ 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FD_CLOEXEC),
+ 	AC_MSG_RESULT(not usable))
+ 
  dnl rename needs to be checked separately to work on Nextstep with cc
  AC_MSG_CHECKING(for rename)
  AC_TRY_LINK([#include <stdio.h>], [rename("this", "that")],
*** ../vim-7.2.299/src/fileio.c	2009-11-17 14:57:19.000000000 +0100
--- src/fileio.c	2009-11-17 13:22:06.000000000 +0100
***************
*** 2254,2259 ****
--- 2254,2267 ----
  
      if (!read_buffer && !read_stdin)
  	close(fd);				/* errors are ignored */
+ #ifdef HAVE_FD_CLOEXEC
+     else
+     {
+ 	int fdflags = fcntl(fd, F_GETFD);
+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 	    fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
+     }
+ #endif
      vim_free(buffer);
  
  #ifdef HAVE_DUP
*** ../vim-7.2.299/src/memfile.c	2008-07-13 19:39:39.000000000 +0200
--- src/memfile.c	2009-11-17 13:22:15.000000000 +0100
***************
*** 1343,1348 ****
--- 1343,1353 ----
      }
      else
      {
+ #ifdef HAVE_FD_CLOEXEC
+ 	int fdflags = fcntl(mfp->mf_fd, F_GETFD);
+ 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 	    fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ #endif
  #ifdef HAVE_SELINUX
  	mch_copy_sec(fname, mfp->mf_fname);
  #endif
*** ../vim-7.2.299/src/memline.c	2009-11-03 15:32:58.000000000 +0100
--- src/memline.c	2009-11-17 13:21:40.000000000 +0100
***************
*** 382,388 ****
      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
      dp->db_free -= 1 + INDEX_SIZE;
      dp->db_line_count = 1;
!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* emtpy line */
  
      return OK;
  
--- 382,388 ----
      dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
      dp->db_free -= 1 + INDEX_SIZE;
      dp->db_line_count = 1;
!     *((char_u *)dp + dp->db_txt_start) = NUL;	/* empty line */
  
      return OK;
  
***************
*** 490,495 ****
--- 490,502 ----
  	    EMSG(_("E301: Oops, lost the swap file!!!"));
  	    return;
  	}
+ #ifdef HAVE_FD_CLOEXEC
+ 	{
+ 	    int fdflags = fcntl(mfp->mf_fd, F_GETFD);
+ 	    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ 		fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ 	}
+ #endif
      }
      if (!success)
  	EMSG(_("E302: Could not rename swap file"));
*** ../vim-7.2.299/src/version.c	2009-11-17 16:08:12.000000000 +0100
--- src/version.c	2009-11-17 17:09:43.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     300,
  /**/

-- 
            |

Ceci n'est pas une pipe.

 /// 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    ///


--- NEW FILE 7.2.301 ---
To: vim-dev at vim.org
Subject: Patch 7.2.301
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

NOTE: some mail and patch programs may have a problem with the non-ASCII
characters in this patch.  You can fetch the patch from
ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301  and/or fetch the updated
files from CVS.  http://www.vim.org/cvs.php


Patch 7.2.301
Problem:    Formatting is wrong when 'tw' is set to a small value.
Solution:   Fix it and add tests.  Also fix behavior of "1" in 'fo'. (Yukihiro
	    Nakadaira)
Files:	    src/edit.c, src/testdir/Makefile, src/testdir/test68.in,
	    src/testdir/test68.ok, src/testdir/test69.in,
	    src/testdir/test69.ok


*** ../vim-7.2.300/src/edit.c	2009-11-11 13:22:32.000000000 +0100
--- src/edit.c	2009-11-17 15:34:47.000000000 +0100
***************
*** 181,187 ****
  static void ins_ctrl_v __ARGS((void));
  static void undisplay_dollar __ARGS((void));
  static void insert_special __ARGS((int, int, int));
! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only));
  static void check_auto_format __ARGS((int));
  static void redo_literal __ARGS((int c));
  static void start_arrow __ARGS((pos_T *end_insert_pos));
--- 181,187 ----
  static void ins_ctrl_v __ARGS((void));
  static void undisplay_dollar __ARGS((void));
  static void insert_special __ARGS((int, int, int));
! static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only, int c));
  static void check_auto_format __ARGS((int));
  static void redo_literal __ARGS((int c));
  static void start_arrow __ARGS((pos_T *end_insert_pos));
***************
*** 2164,2170 ****
      int		i, c;
      int		actual_len;		/* Take multi-byte characters */
      int		actual_compl_length;	/* into account. */
!     int		*wca;		        /* Wide character array. */
      int		has_lower = FALSE;
      int		was_letter = FALSE;
  
--- 2164,2170 ----
      int		i, c;
      int		actual_len;		/* Take multi-byte characters */
      int		actual_compl_length;	/* into account. */
!     int		*wca;			/* Wide character array. */
      int		has_lower = FALSE;
      int		was_letter = FALSE;
  
***************
*** 5558,5564 ****
  	}
  	if (do_internal)
  #endif
! 	    internal_format(textwidth, second_indent, flags, c == NUL);
      }
  
      if (c == NUL)	    /* only formatting was wanted */
--- 5558,5564 ----
  	}
  	if (do_internal)
  #endif
! 	    internal_format(textwidth, second_indent, flags, c == NUL, c);
      }
  
      if (c == NUL)	    /* only formatting was wanted */
***************
*** 5738,5748 ****
   * Format text at the current insert position.
   */
      static void
! internal_format(textwidth, second_indent, flags, format_only)
      int		textwidth;
      int		second_indent;
      int		flags;
      int		format_only;
  {
      int		cc;
      int		save_char = NUL;
--- 5738,5749 ----
   * Format text at the current insert position.
   */
      static void
! internal_format(textwidth, second_indent, flags, format_only, c)
      int		textwidth;
      int		second_indent;
      int		flags;
      int		format_only;
+     int		c; /* character to be inserted (can be NUL) */
  {
      int		cc;
      int		save_char = NUL;
***************
*** 5763,5769 ****
       * When 'ai' is off we don't want a space under the cursor to be
       * deleted.  Replace it with an 'x' temporarily.
       */
!     if (!curbuf->b_p_ai)
      {
  	cc = gchar_cursor();
  	if (vim_iswhite(cc))
--- 5764,5774 ----
       * When 'ai' is off we don't want a space under the cursor to be
       * deleted.  Replace it with an 'x' temporarily.
       */
!     if (!curbuf->b_p_ai
! #ifdef FEAT_VREPLACE
! 	    && !(State & VREPLACE_FLAG)
! #endif
! 	    )
      {
  	cc = gchar_cursor();
  	if (vim_iswhite(cc))
***************
*** 5789,5797 ****
  	char_u	*saved_text = NULL;
  #endif
  	colnr_T	col;
  
! 	virtcol = get_nolist_virtcol();
! 	if (virtcol < (colnr_T)textwidth)
  	    break;
  
  #ifdef FEAT_COMMENTS
--- 5794,5804 ----
  	char_u	*saved_text = NULL;
  #endif
  	colnr_T	col;
+ 	colnr_T	end_col;
  
! 	virtcol = get_nolist_virtcol()
! 		+ char2cells(c != NUL ? c : gchar_cursor());
! 	if (virtcol <= (colnr_T)textwidth)
  	    break;
  
  #ifdef FEAT_COMMENTS
***************
*** 5831,5842 ****
  	coladvance((colnr_T)textwidth);
  	wantcol = curwin->w_cursor.col;
  
! 	curwin->w_cursor.col = startcol - 1;
! #ifdef FEAT_MBYTE
! 	/* Correct cursor for multi-byte character. */
! 	if (has_mbyte)
! 	    mb_adjust_cursor();
! #endif
  	foundcol = 0;
  
  	/*
--- 5838,5844 ----
  	coladvance((colnr_T)textwidth);
  	wantcol = curwin->w_cursor.col;
  
! 	curwin->w_cursor.col = startcol;
  	foundcol = 0;
  
  	/*
***************
*** 5847,5857 ****
  		    || curwin->w_cursor.lnum != Insstart.lnum
  		    || curwin->w_cursor.col >= Insstart.col)
  	{
! 	    cc = gchar_cursor();
  	    if (WHITECHAR(cc))
  	    {
  		/* remember position of blank just before text */
! 		end_foundcol = curwin->w_cursor.col;
  
  		/* find start of sequence of blanks */
  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
--- 5849,5862 ----
  		    || curwin->w_cursor.lnum != Insstart.lnum
  		    || curwin->w_cursor.col >= Insstart.col)
  	{
! 	    if (curwin->w_cursor.col == startcol && c != NUL)
! 		cc = c;
! 	    else
! 		cc = gchar_cursor();
  	    if (WHITECHAR(cc))
  	    {
  		/* remember position of blank just before text */
! 		end_col = curwin->w_cursor.col;
  
  		/* find start of sequence of blanks */
  		while (curwin->w_cursor.col > 0 && WHITECHAR(cc))
***************
*** 5871,5877 ****
  		    /* do not break after one-letter words */
  		    if (curwin->w_cursor.col == 0)
  			break;	/* one-letter word at begin */
! 
  		    col = curwin->w_cursor.col;
  		    dec_cursor();
  		    cc = gchar_cursor();
--- 5876,5886 ----
  		    /* do not break after one-letter words */
  		    if (curwin->w_cursor.col == 0)
  			break;	/* one-letter word at begin */
! #ifdef FEAT_COMMENTS
! 		    /* do not break "#a b" when 'tw' is 2 */
! 		    if (curwin->w_cursor.col <= leader_len)
! 			break;
! #endif
  		    col = curwin->w_cursor.col;
  		    dec_cursor();
  		    cc = gchar_cursor();
***************
*** 5880,5905 ****
  			continue;	/* one-letter, continue */
  		    curwin->w_cursor.col = col;
  		}
! #ifdef FEAT_MBYTE
! 		if (has_mbyte)
! 		    foundcol = curwin->w_cursor.col
! 					 + (*mb_ptr2len)(ml_get_cursor());
! 		else
! #endif
! 		    foundcol = curwin->w_cursor.col + 1;
! 		if (curwin->w_cursor.col < (colnr_T)wantcol)
  		    break;
  	    }
  #ifdef FEAT_MBYTE
! 	    else if (cc >= 0x100 && fo_multibyte
! 			      && curwin->w_cursor.col <= (colnr_T)wantcol)
  	    {
  		/* Break after or before a multi-byte character. */
  		foundcol = curwin->w_cursor.col;
- 		if (curwin->w_cursor.col < (colnr_T)wantcol)
- 		    foundcol += (*mb_char2len)(cc);
  		end_foundcol = foundcol;
! 		break;
  	    }
  #endif
  	    if (curwin->w_cursor.col == 0)
--- 5889,5948 ----
  			continue;	/* one-letter, continue */
  		    curwin->w_cursor.col = col;
  		}
! 
! 		inc_cursor();
! 
! 		end_foundcol = end_col + 1;
! 		foundcol = curwin->w_cursor.col;
! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
  		    break;
  	    }
  #ifdef FEAT_MBYTE
! 	    else if (cc >= 0x100 && fo_multibyte)
  	    {
  		/* Break after or before a multi-byte character. */
+ 		if (curwin->w_cursor.col != startcol)
+ 		{
+ #ifdef FEAT_COMMENTS
+ 		    /* Don't break until after the comment leader */
+ 		    if (curwin->w_cursor.col < leader_len)
+ 			break;
+ #endif
+ 		    col = curwin->w_cursor.col;
+ 		    inc_cursor();
+ 		    /* Don't change end_foundcol if already set. */
+ 		    if (foundcol != curwin->w_cursor.col)
+ 		    {
+ 			foundcol = curwin->w_cursor.col;
+ 			end_foundcol = foundcol;
+ 			if (curwin->w_cursor.col <= (colnr_T)wantcol)
+ 			    break;
+ 		    }
+ 		    curwin->w_cursor.col = col;
+ 		}
+ 
+ 		if (curwin->w_cursor.col == 0)
+ 		    break;
+ 
+ 		col = curwin->w_cursor.col;
+ 
+ 		dec_cursor();
+ 		cc = gchar_cursor();
+ 
+ 		if (WHITECHAR(cc))
+ 		    continue;		/* break with space */
+ #ifdef FEAT_COMMENTS
+ 		/* Don't break until after the comment leader */
+ 		if (curwin->w_cursor.col < leader_len)
+ 		    break;
+ #endif
+ 
+ 		curwin->w_cursor.col = col;
+ 
  		foundcol = curwin->w_cursor.col;
  		end_foundcol = foundcol;
! 		if (curwin->w_cursor.col <= (colnr_T)wantcol)
! 		    break;
  	    }
  #endif
  	    if (curwin->w_cursor.col == 0)
***************
*** 5926,5939 ****
  	    orig_col = startcol;	/* Will start backspacing from here */
  	else
  #endif
! 	    replace_offset = startcol - end_foundcol - 1;
  
  	/*
  	 * adjust startcol for spaces that will be deleted and
  	 * characters that will remain on top line
  	 */
  	curwin->w_cursor.col = foundcol;
! 	while (cc = gchar_cursor(), WHITECHAR(cc))
  	    inc_cursor();
  	startcol -= curwin->w_cursor.col;
  	if (startcol < 0)
--- 5969,5983 ----
  	    orig_col = startcol;	/* Will start backspacing from here */
  	else
  #endif
! 	    replace_offset = startcol - end_foundcol;
  
  	/*
  	 * adjust startcol for spaces that will be deleted and
  	 * characters that will remain on top line
  	 */
  	curwin->w_cursor.col = foundcol;
! 	while ((cc = gchar_cursor(), WHITECHAR(cc))
! 		    && (!fo_white_par || curwin->w_cursor.col < startcol))
  	    inc_cursor();
  	startcol -= curwin->w_cursor.col;
  	if (startcol < 0)
***************
*** 8509,8515 ****
  	if (mode == BACKSPACE_LINE
  		&& (curbuf->b_p_ai
  #ifdef FEAT_CINDENT
!                     || cindent_on()
  #endif
  		   )
  #ifdef FEAT_RIGHTLEFT
--- 8553,8559 ----
  	if (mode == BACKSPACE_LINE
  		&& (curbuf->b_p_ai
  #ifdef FEAT_CINDENT
! 		    || cindent_on()
  #endif
  		   )
  #ifdef FEAT_RIGHTLEFT
*** ../vim-7.2.300/src/testdir/Makefile	2009-11-17 17:36:13.000000000 +0100
--- src/testdir/Makefile	2009-11-17 15:11:26.000000000 +0100
***************
*** 22,28 ****
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out
  
  SCRIPTS_GUI = test16.out
  
--- 22,29 ----
  		test48.out test49.out test51.out test52.out test53.out \
  		test54.out test55.out test56.out test57.out test58.out \
  		test59.out test60.out test61.out test62.out test63.out \
! 		test64.out test65.out test66.out test67.out test68.out \
! 		test69.out
  
  SCRIPTS_GUI = test16.out
  
*** ../vim-7.2.300/src/testdir/test68.in	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test68.in	2009-11-17 15:39:09.000000000 +0100
***************
*** 0 ****
--- 1,56 ----
+ Test for text formatting.
+ 
+ Results of test68:
+ 
+ STARTTEST
+ :so small.vim
+ /^{/+1
+ :set noai tw=2 fo=t
+ gRa b
+ ENDTEST
+ 
+ {
+     
+ 
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set ai tw=2 fo=tw
+ gqgqjjllab
+ ENDTEST
+ 
+ {
+ a  b  
+ 
+ a    
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=3 fo=t
+ gqgqo
+ a 

+ ENDTEST
+ 
+ {
+ a 

+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tcq1 comments=:#
+ gqgqjgqgqo
+ a b
+ #a b
+ ENDTEST
+ 
+ {
+ a b
+ #a b
+ }
+ 
+ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
*** ../vim-7.2.300/src/testdir/test68.ok	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test68.ok	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,35 ----
+ Results of test68:
+ 
+ 
+ {
+ a
+ b
+ }
+ 
+ 
+ {
+ a  
+ b  
+ 
+ a  
+ b
+ }
+ 
+ 
+ {
+ a
+ 

+ 
+ a
+ 

+ }
+ 
+ 
+ {
+ a b
+ #a b
+ 
+ a b
+ #a b
+ }
+ 
*** ../vim-7.2.300/src/testdir/test69.in	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test69.in	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,139 ----
+ Test for multi-byte text formatting.
+ 
+ STARTTEST
+ :so mbyte.vim
+ :set encoding=utf-8
+ ENDTEST
+ 
+ Results of test69:
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=t
+ gqgqjgqgqo
+ ?????????
+ abc ?????????
+ ENDTEST
+ 
+ {
+ ?????????
+ abc ?????????
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=1 fo=tm
+ gqgqjgqgqjgqgqjgqgqjgqgqo
+ ???
+ ???a
+ ??? a
+ ??????
+ ??? ???
+ ENDTEST
+ 
+ {
+ ???
+ ???a
+ ??? a
+ ??????
+ ??? ???
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tm
+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+ ???
+ ???a
+ ??? a
+ ??????
+ ??? ???
+ a???
+ ab???
+ abc???
+ ab??? c
+ ab??????
+ ENDTEST
+ 
+ {
+ ???
+ ???a
+ ??? a
+ ??????
+ ??? ???
+ a???
+ ab???
+ abc???
+ ab??? c
+ ab??????
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set ai tw=2 fo=tm
+ gqgqjgqgqo
+ ???
+ ???a
+ ENDTEST
+ 
+ {
+   ???
+   ???a
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set noai tw=2 fo=tm
+ gqgqjgqgqo
+   ???
+   ???a
+ ENDTEST
+ 
+ {
+   ???
+   ???a
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=cqm comments=n:???
+ gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+ ???
+ ???a
+ ???a???
+ ??????
+ ?????????
+ ??? ???
+ ??? ??????
+ ??????
+ ??????a
+ ?????????
+ ENDTEST
+ 
+ {
+ ???
+ ???a
+ ???a???
+ ??????
+ ?????????
+ ??? ???
+ ??? ??????
+ ??????
+ ??????a
+ ?????????
+ }
+ 
+ STARTTEST
+ /^{/+1
+ :set tw=2 fo=tm
+ R???a
+ ENDTEST
+ 
+ {
+ 
+ }
+ 
+ STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
+ ENDTEST
*** ../vim-7.2.300/src/testdir/test69.ok	2009-11-17 17:39:36.000000000 +0100
--- src/testdir/test69.ok	2009-11-17 15:11:26.000000000 +0100
***************
*** 0 ****
--- 1,142 ----
+ Results of test69:
+ 
+ 
+ {
+ ?????????
+ abc
+ ?????????
+ 
+ ?????????
+ abc
+ ?????????
+ }
+ 
+ 
+ {
+ ???
+ ???
+ a
+ ???
+ a
+ ???
+ ???
+ ???
+ ???
+ 
+ ???
+ ???
+ a
+ ???
+ a
+ ???
+ ???
+ ???
+ ???
+ }
+ 
+ 
+ {
+ ???
+ ???
+ a
+ ???
+ a
+ ???
+ ???
+ ???
+ ???
+ a
+ ???
+ ab
+ ???
+ abc
+ ???
+ ab
+ ???
+ c
+ ab
+ ???
+ ???
+ 
+ ???
+ ???
+ a
+ ???
+ a
+ ???
+ ???
+ ???
+ ???
+ a
+ ???
+ ab
+ ???
+ abc
+ ???
+ ab
+ ???
+ c
+ ab
+ ???
+ ???
+ }
+ 
+ 
+ {
+   ???
+   ???
+   a
+ 
+   ???
+   ???
+   a
+ }
+ 
+ 
+ {
+   ???
+   ???
+ a
+ 
+   ???
+   ???
+ a
+ }
+ 
+ 
+ {
+ ???
+ ???a
+ ???a
+ ??????
+ ??????
+ ??????
+ ??????
+ ??? ???
+ ??? ???
+ ??? ???
+ ??????
+ ??????a
+ ?????????
+ 
+ ???
+ ???a
+ ???a
+ ??????
+ ??????
+ ??????
+ ??????
+ ??? ???
+ ??? ???
+ ??? ???
+ ??????
+ ??????a
+ ?????????
+ }
+ 
+ 
+ {
+ ???
+ a
+ }
+ 
*** ../vim-7.2.300/src/version.c	2009-11-17 17:37:34.000000000 +0100
--- src/version.c	2009-11-17 17:26:35.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     301,
  /**/


--- NEW FILE 7.2.302 ---
To: vim-dev at vim.org
Subject: Patch 7.2.302 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.302 (extra part of 7.2.301)
Problem:    Formatting wrong with small 'tw' value.
Solution:   Add build rules for tests.
Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
	    src/testdir/Make_vms.mms


*** ../vim-7.2.301/src/testdir/Make_amiga.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_amiga.mak	2009-11-17 15:29:05.000000000 +0100
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out test68.out test69.out
  
  .SUFFIXES: .in .out
  
***************
*** 113,115 ****
--- 113,117 ----
  test65.out: test65.in
  test66.out: test66.in
  test67.out: test67.in
+ test68.out: test68.in
+ test69.out: test69.in
*** ../vim-7.2.301/src/testdir/Make_dos.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_dos.mak	2009-11-17 15:29:54.000000000 +0100
***************
*** 26,32 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
--- 26,33 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out \
! 		test68.out test69.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.301/src/testdir/Make_ming.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_ming.mak	2009-11-17 15:30:07.000000000 +0100
***************
*** 45,51 ****
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out
  
  SCRIPTS32 =	test50.out
  
--- 45,52 ----
  		test15.out test17.out test18.out test21.out test26.out \
  		test30.out test31.out test32.out test33.out test34.out \
  		test37.out test38.out test39.out test40.out test41.out \
! 		test42.out test52.out test65.out test66.out test67.out \
! 		test68.out test69.out
  
  SCRIPTS32 =	test50.out
  
*** ../vim-7.2.301/src/testdir/Make_os2.mak	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_os2.mak	2009-11-17 15:11:26.000000000 +0100
***************
*** 26,32 ****
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out
  
  .SUFFIXES: .in .out
  
--- 26,32 ----
  		test48.out test51.out test53.out test54.out test55.out \
  		test56.out test57.out test58.out test59.out test60.out \
  		test61.out test62.out test63.out test64.out test65.out \
! 		test66.out test67.out test68.out test69.out
  
  .SUFFIXES: .in .out
  
*** ../vim-7.2.301/src/testdir/Make_vms.mms	2009-09-18 14:58:26.000000000 +0200
--- src/testdir/Make_vms.mms	2009-11-17 15:11:26.000000000 +0100
***************
*** 69,75 ****
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
--- 69,75 ----
  	 test48.out test51.out test53.out test54.out test55.out \
  	 test56.out test57.out test60.out \
  	 test61.out test62.out test63.out test64.out test65.out \
! 	 test66.out test67.out test68.out test69.out
  
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
*** ../vim-7.2.301/src/version.c	2009-11-17 17:40:34.000000000 +0100
--- src/version.c	2009-11-17 17:43:26.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     302,
  /**/

-- 
Hacker: Someone skilled in computer programming (good guy).
Cracker: A hacker that uses his skills to crack software (bad guy).

 /// 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    ///


--- NEW FILE 7.2.303 ---
To: vim-dev at vim.org
Subject: Patch 7.2.303
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.303 (after 7.2.294)
Problem:    Can't build on MS-Windows.
Solution:   Add #ifdef around vim_settempdir(). (James Vega)
Files:	    src/fileio.c


*** ../vim-7.2.302/src/fileio.c	2009-11-17 17:13:03.000000000 +0100
--- src/fileio.c	2009-11-18 20:06:55.000000000 +0100
***************
*** 146,152 ****
--- 146,154 ----
  # endif
  #endif
  static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+ #ifdef TEMPDIRNAMES
  static void vim_settempdir __ARGS((char_u *tempdir));
+ #endif
  #ifdef FEAT_AUTOCMD
  static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
  #endif
***************
*** 6995,7000 ****
--- 6997,7003 ----
  }
  #endif
  
+ #ifdef TEMPDIRNAMES
  /*
   * Directory "tempdir" was created.  Expand this name to a full path and put
   * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
***************
*** 7021,7026 ****
--- 7024,7030 ----
  	vim_free(buf);
      }
  }
+ #endif
  
  /*
   * vim_tempname(): Return a unique name that can be used for a temp file.
*** ../vim-7.2.302/src/version.c	2009-11-17 17:57:10.000000000 +0100
--- src/version.c	2009-11-18 20:07:58.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     303,
  /**/

-- 
BEDEVERE:        Why do you think she is a witch?
SECOND VILLAGER: She turned me into a newt.
BEDEVERE:        A newt?
SECOND VILLAGER: (After looking at himself for some time) I got better.
                 "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    ///


--- NEW FILE 7.2.304 ---
To: vim-dev at vim.org
Subject: Patch 7.2.304
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.304
Problem:    Compiler warning for bad pointer cast.
Solution:   Use another variable for int pointer.
Files:	    src/ops.c


*** ../vim-7.2.303/src/ops.c	2009-11-17 12:43:19.000000000 +0100
--- src/ops.c	2009-11-18 15:40:26.000000000 +0100
***************
*** 5597,5603 ****
  	    vc.vc_type = CONV_NONE;
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
  	    {
! 		conv_str = string_convert(&vc, str, (int*)&len);
  		if (conv_str != NULL)
  		{
  		    vim_free(str);
--- 5597,5606 ----
  	    vc.vc_type = CONV_NONE;
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
  	    {
! 	        int intlen = len;
! 
! 		conv_str = string_convert(&vc, str, &intlen);
! 		len = intlen;
  		if (conv_str != NULL)
  		{
  		    vim_free(str);
*** ../vim-7.2.303/src/version.c	2009-11-18 20:12:15.000000000 +0100
--- src/version.c	2009-11-25 12:37:36.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     304,
  /**/

-- 
I recommend ordering large cargo containers of paper towels to make up
whatever budget underruns you have.  Paper products are always useful and they
have the advantage of being completely flushable if you need to make room in
the storage area later.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.305 ---
To: vim-dev at vim.org
Subject: Patch 7.2.305
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.305
Problem:    Recursively redrawing causes a memory leak. (Dominique Pelle)
Solution:   Disallow recursive screen updating.
Files:	    src/screen.c


*** ../vim-7.2.304/src/screen.c	2009-11-11 17:07:25.000000000 +0100
--- src/screen.c	2009-11-17 16:30:53.000000000 +0100
***************
*** 323,328 ****
--- 323,329 ----
      int		did_one;
  #endif
  
+     /* Don't do anything if the screen structures are (not yet) valid. */
      if (!screen_valid(TRUE))
  	return;
  
***************
*** 342,348 ****
      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
  	type = NOT_VALID;
  
!     if (!redrawing())
      {
  	redraw_later(type);		/* remember type for next time */
  	must_redraw = type;
--- 343,351 ----
      if (curwin->w_lines_valid == 0 && type < NOT_VALID)
  	type = NOT_VALID;
  
!     /* Postpone the redrawing when it's not needed and when being called
!      * recursively. */
!     if (!redrawing() || updating_screen)
      {
  	redraw_later(type);		/* remember type for next time */
  	must_redraw = type;
***************
*** 582,587 ****
--- 585,591 ----
  
  /*
   * Prepare for updating one or more windows.
+  * Caller must check for "updating_screen" already set to avoid recursiveness.
   */
      static void
  update_prepare()
***************
*** 663,669 ****
  	    doit = TRUE;
      }
  
!     if (!doit)
  	return;
  
      /* update all windows that need updating */
--- 667,675 ----
  	    doit = TRUE;
      }
  
!     /* Return when there is nothing to do or screen updating already
!      * happening. */
!     if (!doit || updating_screen)
  	return;
  
      /* update all windows that need updating */
***************
*** 696,701 ****
--- 702,711 ----
  updateWindow(wp)
      win_T	*wp;
  {
+     /* return if already busy updating */
+     if (updating_screen)
+ 	return;
+ 
      update_prepare();
  
  #ifdef FEAT_CLIPBOARD
*** ../vim-7.2.304/src/version.c	2009-11-25 12:38:49.000000000 +0100
--- src/version.c	2009-11-25 13:01:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     305,
  /**/

-- 
If the Universe is constantly expanding, why can't I ever find a parking space?

 /// 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    ///


--- NEW FILE 7.2.306 ---
To: vim-dev at vim.org
Subject: Patch 7.2.306
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.306
Problem:    shellescape("10%%", 1) only escapes first %. (Christian Brabandt)
Solution:   Don't copy the character after the escaped one.
Files:	    src/misc2.c


*** ../vim-7.2.305/src/misc2.c	2009-11-11 16:56:13.000000000 +0100
--- src/misc2.c	2009-11-25 17:11:49.000000000 +0100
***************
*** 1390,1395 ****
--- 1390,1396 ----
  		*d++ = '\\';		/* insert backslash */
  		while (--l >= 0)	/* copy the var */
  		    *d++ = *p++;
+ 		continue;
  	    }
  
  	    MB_COPY_CHAR(p, d);
*** ../vim-7.2.305/src/version.c	2009-11-25 13:03:29.000000000 +0100
--- src/version.c	2009-11-25 17:13:54.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     306,
  /**/

-- 
Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
engineering at the Technical University of Delft and graduated in 1985 on a
multi-processor Unix architecture."
Response by "dimator": Could the school not afford a proper stage for the
ceremony?

 /// 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    ///


--- NEW FILE 7.2.307 ---
To: vim-dev at vim.org
Subject: Patch 7.2.307
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.307
Problem:    Crash with a very long syntax match statement. (Guy Gur Ari)
Solution:   When the offset does not fit in the two bytes available give an
            error instead of continuing with invalid pointers.
Files:      src/regexp.c


*** ../vim-7.2.306/src/regexp.c	2009-05-15 21:31:11.000000000 +0200
--- src/regexp.c	2009-11-25 18:13:03.000000000 +0100
***************
*** 583,588 ****
--- 583,589 ----
  #endif
  static char_u	*regcode;	/* Code-emit pointer, or JUST_CALC_SIZE */
  static long	regsize;	/* Code size. */
+ static int	reg_toolong;	/* TRUE when offset out of range */
  static char_u	had_endbrace[NSUBEXP];	/* flags, TRUE if end of () found */
  static unsigned	regflags;	/* RF_ flags for prog */
  static long	brace_min[10];	/* Minimums for complex brace repeats */
***************
*** 1028,1036 ****
      regcomp_start(expr, re_flags);
      regcode = r->program;
      regc(REGMAGIC);
!     if (reg(REG_NOPAREN, &flags) == NULL)
      {
  	vim_free(r);
  	return NULL;
      }
  
--- 1029,1039 ----
      regcomp_start(expr, re_flags);
      regcode = r->program;
      regc(REGMAGIC);
!     if (reg(REG_NOPAREN, &flags) == NULL || reg_toolong)
      {
  	vim_free(r);
+ 	if (reg_toolong)
+ 	    EMSG_RET_NULL(_("E339: Pattern too long"));
  	return NULL;
      }
  
***************
*** 1141,1146 ****
--- 1144,1150 ----
      re_has_z = 0;
  #endif
      regsize = 0L;
+     reg_toolong = FALSE;
      regflags = 0;
  #if defined(FEAT_SYN_HL) || defined(PROTO)
      had_eol = FALSE;
***************
*** 1228,1234 ****
      {
  	skipchr();
  	br = regbranch(&flags);
! 	if (br == NULL)
  	    return NULL;
  	regtail(ret, br);	/* BRANCH -> BRANCH. */
  	if (!(flags & HASWIDTH))
--- 1232,1238 ----
      {
  	skipchr();
  	br = regbranch(&flags);
! 	if (br == NULL || reg_toolong)
  	    return NULL;
  	regtail(ret, br);	/* BRANCH -> BRANCH. */
  	if (!(flags & HASWIDTH))
***************
*** 1313,1318 ****
--- 1317,1324 ----
  	    break;
  	skipchr();
  	regtail(latest, regnode(END)); /* operand ends */
+ 	if (reg_toolong)
+ 	    break;
  	reginsert(MATCH, latest);
  	chain = latest;
      }
***************
*** 1382,1388 ****
  			    break;
  	    default:
  			    latest = regpiece(&flags);
! 			    if (latest == NULL)
  				return NULL;
  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
  			    if (chain == NULL)	/* First piece. */
--- 1388,1394 ----
  			    break;
  	    default:
  			    latest = regpiece(&flags);
! 			    if (latest == NULL || reg_toolong)
  				return NULL;
  			    *flagp |= flags & (HASWIDTH | HASNL | HASLOOKBH);
  			    if (chain == NULL)	/* First piece. */
***************
*** 2540,2547 ****
  	offset = (int)(scan - val);
      else
  	offset = (int)(val - scan);
!     *(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
!     *(scan + 2) = (char_u) (offset & 0377);
  }
  
  /*
--- 2546,2561 ----
  	offset = (int)(scan - val);
      else
  	offset = (int)(val - scan);
!     /* When the offset uses more than 16 bits it can no longer fit in the two
!      * bytes avaliable.  Use a global flag to avoid having to check return
!      * values in too many places. */
!     if (offset > 0xffff)
! 	reg_toolong = TRUE;
!     else
!     {
! 	*(scan + 1) = (char_u) (((unsigned)offset >> 8) & 0377);
! 	*(scan + 2) = (char_u) (offset & 0377);
!     }
  }
  
  /*
***************
*** 5764,5769 ****
--- 5778,5785 ----
  
  /*
   * regnext - dig the "next" pointer out of a node
+  * Returns NULL when calculating size, when there is no next item and when
+  * there is an error.
   */
      static char_u *
  regnext(p)
***************
*** 5771,5777 ****
  {
      int	    offset;
  
!     if (p == JUST_CALC_SIZE)
  	return NULL;
  
      offset = NEXT(p);
--- 5787,5793 ----
  {
      int	    offset;
  
!     if (p == JUST_CALC_SIZE || reg_toolong)
  	return NULL;
  
      offset = NEXT(p);
*** ../vim-7.2.306/src/version.c	2009-11-25 17:15:16.000000000 +0100
--- src/version.c	2009-11-25 18:14:32.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     307,
  /**/

-- 
The fastest way to get an engineer to solve a problem is to declare that the
problem is unsolvable.  No engineer can walk away from an unsolvable problem
until it's solved.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.308 ---
To: vim-dev at vim.org
Subject: Patch 7.2.308
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.308
Problem:    When using a regexp in the "\=" expression of a substitute
	    command, submatch() returns empty strings for further lines.
	    (Clockwork Jam)
Solution:   Save and restore the line number and line count when calling
	    reg_getline().
Files:	    src/regexp.c


*** ../vim-7.2.307/src/regexp.c	2009-11-25 18:21:48.000000000 +0100
--- src/regexp.c	2009-11-25 19:45:07.000000000 +0100
***************
*** 6828,6833 ****
--- 6828,6835 ----
   * that contains a call to substitute() and submatch(). */
  static regmatch_T	*submatch_match;
  static regmmatch_T	*submatch_mmatch;
+ static linenr_T		submatch_firstlnum;
+ static linenr_T		submatch_maxline;
  #endif
  
  #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
***************
*** 6941,6947 ****
  	}
  	else
  	{
- 	    linenr_T	save_reg_maxline;
  	    win_T	*save_reg_win;
  	    int		save_ireg_ic;
  
--- 6943,6948 ----
***************
*** 6953,6959 ****
  	     * vim_regexec_multi() can't be called recursively. */
  	    submatch_match = reg_match;
  	    submatch_mmatch = reg_mmatch;
! 	    save_reg_maxline = reg_maxline;
  	    save_reg_win = reg_win;
  	    save_ireg_ic = ireg_ic;
  	    can_f_submatch = TRUE;
--- 6954,6961 ----
  	     * vim_regexec_multi() can't be called recursively. */
  	    submatch_match = reg_match;
  	    submatch_mmatch = reg_mmatch;
! 	    submatch_firstlnum = reg_firstlnum;
! 	    submatch_maxline = reg_maxline;
  	    save_reg_win = reg_win;
  	    save_ireg_ic = ireg_ic;
  	    can_f_submatch = TRUE;
***************
*** 6976,6982 ****
  
  	    reg_match = submatch_match;
  	    reg_mmatch = submatch_mmatch;
! 	    reg_maxline = save_reg_maxline;
  	    reg_win = save_reg_win;
  	    ireg_ic = save_ireg_ic;
  	    can_f_submatch = FALSE;
--- 6978,6985 ----
  
  	    reg_match = submatch_match;
  	    reg_mmatch = submatch_mmatch;
! 	    reg_firstlnum = submatch_firstlnum;
! 	    reg_maxline = submatch_maxline;
  	    reg_win = save_reg_win;
  	    ireg_ic = save_ireg_ic;
  	    can_f_submatch = FALSE;
***************
*** 7212,7217 ****
--- 7215,7243 ----
  
  #ifdef FEAT_EVAL
  /*
+  * Call reg_getline() with the line numbers from the submatch.  If a
+  * substitute() was used the reg_maxline and other values have been
+  * overwritten.
+  */
+     static char_u *
+ reg_getline_submatch(lnum)
+     linenr_T	lnum;
+ {
+     char_u *s;
+     linenr_T save_first = reg_firstlnum;
+     linenr_T save_max = reg_maxline;
+ 
+     reg_firstlnum = submatch_firstlnum;
+     reg_maxline = submatch_maxline;
+ 
+     s = reg_getline(lnum);
+ 
+     reg_firstlnum = save_first;
+     reg_maxline = save_max;
+     return s;
+ }
+ 
+ /*
   * Used for the submatch() function: get the string from the n'th submatch in
   * allocated memory.
   * Returns NULL when not in a ":s" command and for a non-existing submatch.
***************
*** 7241,7247 ****
  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
  		return NULL;
  
! 	    s = reg_getline(lnum) + submatch_mmatch->startpos[no].col;
  	    if (s == NULL)  /* anti-crash check, cannot happen? */
  		break;
  	    if (submatch_mmatch->endpos[no].lnum == lnum)
--- 7267,7273 ----
  	    if (lnum < 0 || submatch_mmatch->endpos[no].lnum < 0)
  		return NULL;
  
! 	    s = reg_getline_submatch(lnum) + submatch_mmatch->startpos[no].col;
  	    if (s == NULL)  /* anti-crash check, cannot happen? */
  		break;
  	    if (submatch_mmatch->endpos[no].lnum == lnum)
***************
*** 7267,7273 ****
  		++lnum;
  		while (lnum < submatch_mmatch->endpos[no].lnum)
  		{
! 		    s = reg_getline(lnum++);
  		    if (round == 2)
  			STRCPY(retval + len, s);
  		    len += (int)STRLEN(s);
--- 7293,7299 ----
  		++lnum;
  		while (lnum < submatch_mmatch->endpos[no].lnum)
  		{
! 		    s = reg_getline_submatch(lnum++);
  		    if (round == 2)
  			STRCPY(retval + len, s);
  		    len += (int)STRLEN(s);
***************
*** 7276,7282 ****
  		    ++len;
  		}
  		if (round == 2)
! 		    STRNCPY(retval + len, reg_getline(lnum),
  					     submatch_mmatch->endpos[no].col);
  		len += submatch_mmatch->endpos[no].col;
  		if (round == 2)
--- 7302,7308 ----
  		    ++len;
  		}
  		if (round == 2)
! 		    STRNCPY(retval + len, reg_getline_submatch(lnum),
  					     submatch_mmatch->endpos[no].col);
  		len += submatch_mmatch->endpos[no].col;
  		if (round == 2)
*** ../vim-7.2.307/src/version.c	2009-11-25 18:21:48.000000000 +0100
--- src/version.c	2009-11-25 19:50:16.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     308,
  /**/

-- 
Engineers are always delighted to share wisdom, even in areas in which they
have no experience whatsoever.  Their logic provides them with inherent
insight into any field of expertise.  This can be a problem when dealing with
the illogical people who believe that knowledge can only be derived through
experience.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.309 ---
To: vim-dev at vim.org
Subject: Patch 7.2.309
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.309 (after 7.2.308)
Problem:    Warning for missing function prototype. (Patrick Texier)
Solution:   Add the prototype.
Files:	    src/regexp.c


*** ../vim-7.2.308/src/regexp.c	2009-11-25 19:51:56.000000000 +0100
--- src/regexp.c	2009-11-26 20:39:18.000000000 +0100
***************
*** 7214,7219 ****
--- 7214,7221 ----
  }
  
  #ifdef FEAT_EVAL
+ static char_u *reg_getline_submatch __ARGS((linenr_T lnum));
+ 
  /*
   * Call reg_getline() with the line numbers from the submatch.  If a
   * substitute() was used the reg_maxline and other values have been
*** ../vim-7.2.308/src/version.c	2009-11-25 19:51:56.000000000 +0100
--- src/version.c	2009-11-26 20:40:11.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     309,
  /**/

-- 
Female engineers become irresistible at the age of consent and remain that
way until about thirty minutes after their clinical death.  Longer if it's a
warm day.
				(Scott Adams - The Dilbert principle)

 /// 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    ///


--- NEW FILE 7.2.310 ---
To: vim-dev at vim.org
Subject: Patch 7.2.310
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.310
Problem:    When a filetype plugin in ~/.vim/ftdetect uses ":setfiletype" and
	    the file starts with a "# comment" it gets "conf" filetype.
Solution:   Check for "conf" filetype after using ftdetect plugins.
Files:	    runtime/filetype.vim


*** ../vim-7.2.309/runtime/filetype.vim	2008-08-06 18:56:36.000000000 +0200
--- runtime/filetype.vim	2009-12-02 12:08:42.000000000 +0100
***************
*** 2400,2405 ****
--- 2435,2446 ----
  au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
  
  
+ 
+ " Use the filetype detect plugins.  They may overrule any of the previously
+ " detected filetypes.
+ runtime! ftdetect/*.vim
+ 
+ 
  " Generic configuration file (check this last, it's just guessing!)
  au BufNewFile,BufRead,StdinReadPost *
  	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
***************
*** 2408,2417 ****
  	\   setf conf |
  	\ endif
  
- " Use the plugin-filetype checks last, they may overrule any of the previously
- " detected filetypes.
- runtime! ftdetect/*.vim
- 
  augroup END
  
  
--- 2449,2454 ----
*** ../vim-7.2.309/src/version.c	2009-11-26 20:41:19.000000000 +0100
--- src/version.c	2009-12-02 12:05:27.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     310,
  /**/

-- 
A)bort, R)etry, P)lease don't bother me again

 /// 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    ///


--- NEW FILE 7.2.311 ---
To: vim-dev at vim.org
Subject: Patch 7.2.311
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.311
Problem:    Can't compile with FreeMiNT.
Solution:   Change #ifdef for limits.h. (Alan Hourihane)
Files:	    src/fileio.c


*** ../vim-7.2.310/src/fileio.c	2009-11-18 20:12:15.000000000 +0100
--- src/fileio.c	2009-12-02 13:30:07.000000000 +0100
***************
*** 21,27 ****
  
  #include "vim.h"
  
! #ifdef __TANDEM
  # include <limits.h>		/* for SSIZE_MAX */
  #endif
  
--- 21,27 ----
  
  #include "vim.h"
  
! #if defined(__TANDEM) || defined(__MINT__)
  # include <limits.h>		/* for SSIZE_MAX */
  #endif
  
*** ../vim-7.2.310/src/version.c	2009-12-02 12:08:57.000000000 +0100
--- src/version.c	2009-12-02 13:31:46.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     311,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
3. Your bookmark takes 15 minutes to scroll from top to bottom.

 /// 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    ///


--- NEW FILE 7.2.312 ---
To: vim-dev at vim.org
Subject: Patch 7.2.312
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.312
Problem:    iconv() returns an invalid character sequence when conversion
	    fails.  It should return an empty string. (Yongwei Wu)
Solution:   Be more strict about invalid characters in the input.
Files:	    src/mbyte.c


*** ../vim-7.2.311/src/mbyte.c	2009-06-16 15:23:07.000000000 +0200
--- src/mbyte.c	2009-11-25 16:10:44.000000000 +0100
***************
*** 133,154 ****
  static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
! /* Lookup table to quickly get the length in bytes of a UTF-8 character from
!  * the first byte of a UTF-8 string.  Bytes which are illegal when used as the
!  * first byte have a one, because these will be used separately. */
  static char utf8len_tab[256] =
  {
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /*bogus*/
      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
  };
  
  /*
   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
   * in the "xim.log" file.
   */
--- 133,172 ----
  static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
  static int dbcs_ptr2char __ARGS((char_u *p));
  
! /*
!  * Lookup table to quickly get the length in bytes of a UTF-8 character from
!  * the first byte of a UTF-8 string.
!  * Bytes which are illegal when used as the first byte have a 1.
!  * The NUL byte has length 1.
!  */
  static char utf8len_tab[256] =
  {
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
!     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
      2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
  };
  
  /*
+  * Like utf8len_tab above, but using a zero for illegal lead bytes.
+  */
+ static char utf8len_tab_zero[256] =
+ {
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+     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,0,
+     2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+     3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0,
+ };
+ 
+ /*
   * XIM often causes trouble.  Define XIM_DEBUG to get a log of XIM callbacks
   * in the "xim.log" file.
   */
***************
*** 1352,1358 ****
      if (size > 0 && *p >= 0x80)
      {
  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
! 	    return 1;
  	c = utf_ptr2char(p);
  	/* An illegal byte is displayed as <xx>. */
  	if (utf_ptr2len(p) == 1 || c == NUL)
--- 1370,1376 ----
      if (size > 0 && *p >= 0x80)
      {
  	if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
! 	    return 1;  /* truncated */
  	c = utf_ptr2char(p);
  	/* An illegal byte is displayed as <xx>. */
  	if (utf_ptr2len(p) == 1 || c == NUL)
***************
*** 1473,1479 ****
      if (p[0] < 0x80)	/* be quick for ASCII */
  	return p[0];
  
!     len = utf8len_tab[p[0]];
      if (len > 1 && (p[1] & 0xc0) == 0x80)
      {
  	if (len == 2)
--- 1491,1497 ----
      if (p[0] < 0x80)	/* be quick for ASCII */
  	return p[0];
  
!     len = utf8len_tab_zero[p[0]];
      if (len > 1 && (p[1] & 0xc0) == 0x80)
      {
  	if (len == 2)
***************
*** 1723,1728 ****
--- 1741,1747 ----
  /*
   * Return length of UTF-8 character, obtained from the first byte.
   * "b" must be between 0 and 255!
+  * Returns 1 for an invalid first byte value.
   */
      int
  utf_byte2len(b)
***************
*** 1737,1742 ****
--- 1756,1762 ----
   * Returns 1 for "".
   * Returns 1 for an illegal byte sequence (also in incomplete byte seq.).
   * Returns number > "size" for an incomplete byte sequence.
+  * Never returns zero.
   */
      int
  utf_ptr2len_len(p, size)
***************
*** 1747,1757 ****
      int		i;
      int		m;
  
!     if (*p == NUL)
! 	return 1;
!     m = len = utf8len_tab[*p];
      if (len > size)
  	m = size;	/* incomplete byte sequence. */
      for (i = 1; i < m; ++i)
  	if ((p[i] & 0xc0) != 0x80)
  	    return 1;
--- 1767,1779 ----
      int		i;
      int		m;
  
!     len = utf8len_tab[*p];
!     if (len == 1)
! 	return 1;	/* NUL, ascii or illegal lead byte */
      if (len > size)
  	m = size;	/* incomplete byte sequence. */
+     else
+ 	m = len;
      for (i = 1; i < m; ++i)
  	if ((p[i] & 0xc0) != 0x80)
  	    return 1;
***************
*** 2505,2510 ****
--- 2527,2533 ----
  /*
   * mb_head_off() function pointer.
   * Return offset from "p" to the first byte of the character it points into.
+  * If "p" points to the NUL at the end of the string return 0.
   * Returns 0 when already at the first byte of a character.
   */
      int
***************
*** 2524,2530 ****
  
      /* It can't be a trailing byte when not using DBCS, at the start of the
       * string or the previous byte can't start a double-byte. */
!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
--- 2547,2553 ----
  
      /* It can't be a trailing byte when not using DBCS, at the start of the
       * string or the previous byte can't start a double-byte. */
!     if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
***************
*** 2552,2558 ****
       * lead byte in the current cell. */
      if (p <= base
  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
! 	    || MB_BYTE2LEN(p[-1]) == 1)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
--- 2575,2582 ----
       * lead byte in the current cell. */
      if (p <= base
  	    || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
! 	    || MB_BYTE2LEN(p[-1]) == 1
! 	    || *p == NUL)
  	return 0;
  
      /* This is slow: need to start at the base and go forward until the
***************
*** 2578,2583 ****
--- 2602,2608 ----
      char_u	*q;
      char_u	*s;
      int		c;
+     int		len;
  #ifdef FEAT_ARABIC
      char_u	*j;
  #endif
***************
*** 2597,2604 ****
  	    --q;
  	/* Check for illegal sequence. Do allow an illegal byte after where we
  	 * started. */
! 	if (utf8len_tab[*q] != (int)(s - q + 1)
! 				       && utf8len_tab[*q] != (int)(p - q + 1))
  	    return 0;
  
  	if (q <= base)
--- 2622,2629 ----
  	    --q;
  	/* Check for illegal sequence. Do allow an illegal byte after where we
  	 * started. */
! 	len = utf8len_tab[*q];
! 	if (len != (int)(s - q + 1) && len != (int)(p - q + 1))
  	    return 0;
  
  	if (q <= base)
***************
*** 2810,2818 ****
  
      while (end == NULL ? *p != NUL : p < end)
      {
! 	if ((*p & 0xc0) == 0x80)
  	    return FALSE;	/* invalid lead byte */
- 	l = utf8len_tab[*p];
  	if (end != NULL && p + l > end)
  	    return FALSE;	/* incomplete byte sequence */
  	++p;
--- 2835,2843 ----
  
      while (end == NULL ? *p != NUL : p < end)
      {
! 	l = utf8len_tab_zero[*p];
! 	if (l == 0)
  	    return FALSE;	/* invalid lead byte */
  	if (end != NULL && p + l > end)
  	    return FALSE;	/* incomplete byte sequence */
  	++p;
***************
*** 6117,6128 ****
  	    d = retval;
  	    for (i = 0; i < len; ++i)
  	    {
! 		l = utf_ptr2len(ptr + i);
  		if (l == 0)
  		    *d++ = NUL;
  		else if (l == 1)
  		{
! 		    if (unconvlenp != NULL && utf8len_tab[ptr[i]] > len - i)
  		    {
  			/* Incomplete sequence at the end. */
  			*unconvlenp = len - i;
--- 6142,6161 ----
  	    d = retval;
  	    for (i = 0; i < len; ++i)
  	    {
! 		l = utf_ptr2len_len(ptr + i, len - i);
  		if (l == 0)
  		    *d++ = NUL;
  		else if (l == 1)
  		{
! 		    int l_w = utf8len_tab_zero[ptr[i]];
! 
! 		    if (l_w == 0)
! 		    {
! 			/* Illegal utf-8 byte cannot be converted */
! 			vim_free(retval);
! 			return NULL;
! 		    }
! 		    if (unconvlenp != NULL && l_w > len - i)
  		    {
  			/* Incomplete sequence at the end. */
  			*unconvlenp = len - i;
*** ../vim-7.2.311/src/version.c	2009-12-02 13:32:10.000000000 +0100
--- src/version.c	2009-12-02 15:00:23.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     312,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
6. You refuse to go to a vacation spot with no electricity and no phone lines.

 /// 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    ///


--- NEW FILE 7.2.313 ---
To: vim-dev at vim.org
Subject: Patch 7.2.313
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.313
Problem:    Command line completion doesn't work after "%:h" and similar.
Solution:   Expand these items before doing the completion.
Files:	    src/ex_getln.c, src/misc1.c, src/proto/misc1.pro


*** ../vim-7.2.312/src/ex_getln.c	2009-09-18 17:24:54.000000000 +0200
--- src/ex_getln.c	2009-12-02 16:40:06.000000000 +0100
***************
*** 4422,4428 ****
  	    flags |= EW_FILE;
  	else
  	    flags = (flags | EW_DIR) & ~EW_FILE;
! 	ret = expand_wildcards(1, &pat, num_file, file, flags);
  	if (free_pat)
  	    vim_free(pat);
  	return ret;
--- 4422,4429 ----
  	    flags |= EW_FILE;
  	else
  	    flags = (flags | EW_DIR) & ~EW_FILE;
! 	/* Expand wildcards, supporting %:h and the like. */
! 	ret = expand_wildcards_eval(&pat, num_file, file, flags);
  	if (free_pat)
  	    vim_free(pat);
  	return ret;
*** ../vim-7.2.312/src/misc1.c	2009-11-17 16:08:12.000000000 +0100
--- src/misc1.c	2009-12-02 17:06:49.000000000 +0100
***************
*** 8447,8452 ****
--- 8447,8492 ----
  }
  
  /*
+  * Invoke expand_wildcards() for one pattern.
+  * Expand items like "%:h" before the expansion.
+  * Returns OK or FAIL.
+  */
+     int
+ expand_wildcards_eval(pat, num_file, file, flags)
+     char_u	 **pat;		/* pointer to input pattern */
+     int		  *num_file;	/* resulting number of files */
+     char_u	***file;	/* array of resulting files */
+     int		   flags;	/* EW_DIR, etc. */
+ {
+     int		ret = FAIL;
+     char_u	*eval_pat = NULL;
+     char_u	*exp_pat = *pat;
+     char_u      *ignored_msg;
+     int		usedlen;
+ 
+     if (*exp_pat == '%' || *exp_pat == '#' || *exp_pat == '<')
+     {
+ 	++emsg_off;
+ 	eval_pat = eval_vars(exp_pat, exp_pat, &usedlen,
+ 						    NULL, &ignored_msg, NULL);
+ 	--emsg_off;
+ 	if (eval_pat != NULL)
+ 	    exp_pat = concat_str(eval_pat, exp_pat + usedlen);
+     }
+ 
+     if (exp_pat != NULL)
+ 	ret = expand_wildcards(1, &exp_pat, num_file, file, flags);
+ 
+     if (eval_pat != NULL)
+     {
+ 	vim_free(exp_pat);
+ 	vim_free(eval_pat);
+     }
+ 
+     return ret;
+ }
+ 
+ /*
   * Expand wildcards.  Calls gen_expand_wildcards() and removes files matching
   * 'wildignore'.
   * Returns OK or FAIL.
*** ../vim-7.2.312/src/proto/misc1.pro	2007-09-26 22:36:32.000000000 +0200
--- src/proto/misc1.pro	2009-12-02 16:41:52.000000000 +0100
***************
*** 85,90 ****
--- 85,91 ----
  int vim_fexists __ARGS((char_u *fname));
  void line_breakcheck __ARGS((void));
  void fast_breakcheck __ARGS((void));
+ int expand_wildcards_eval __ARGS((char_u **pat, int *num_file, char_u ***file, int flags));
  int expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
  int match_suffix __ARGS((char_u *fname));
  int unix_expandpath __ARGS((garray_T *gap, char_u *path, int wildoff, int flags, int didstar));
*** ../vim-7.2.312/src/version.c	2009-12-02 15:03:24.000000000 +0100
--- src/version.c	2009-12-02 17:14:02.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     313,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
8. You spend half of the plane trip with your laptop on your lap...and your
   child in the overhead compartment.

 /// 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    ///


--- NEW FILE 7.2.314 ---
To: vim-dev at vim.org
Subject: Patch 7.2.314
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.314
Problem:    Missing function in small build.
Solution:   Always include concat_str.
Files:	    src/misc1.c


*** ../vim-7.2.313/src/misc1.c	2009-12-02 17:15:04.000000000 +0100
--- src/misc1.c	2009-12-02 17:44:55.000000000 +0100
***************
*** 4666,4672 ****
      return dest;
  }
  
- #if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
  /*
   * Concatenate two strings and return the result in allocated memory.
   * Returns NULL when out of memory.
--- 4666,4671 ----
***************
*** 4687,4693 ****
      }
      return dest;
  }
- #endif
  
  /*
   * Add a path separator to a file name, unless it already ends in a path
--- 4686,4691 ----
*** ../vim-7.2.313/src/version.c	2009-12-02 17:15:04.000000000 +0100
--- src/version.c	2009-12-02 17:47:18.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     314,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
9. All your daydreaming is preoccupied with getting a faster connection to the
   net: 28.8...ISDN...cable modem...T1...T3.

 /// 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    ///


--- NEW FILE 7.2.315 ---
To: vim-dev at vim.org
Subject: Patch 7.2.315
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.315
Problem:    Python libs can't be found on 64 bit system.
Solution:   Add lib64 to the list of directories. (Michael Henry)
Files:	    src/auto/configure, src/configure.in


*** ../vim-7.2.314/src/auto/configure	2009-11-17 17:13:03.000000000 +0100
--- src/auto/configure	2009-12-02 17:21:20.000000000 +0100
***************
*** 5126,5132 ****
  
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
--- 5126,5132 ----
  
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib64 lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
***************
*** 13718,13725 ****
  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
        else
  	vim_cv_tty_group=world
! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5
! $as_echo "ptys are world accessable" >&6; }
        fi
  
  else
--- 13718,13725 ----
  $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
        else
  	vim_cv_tty_group=world
! 	{ $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5
! $as_echo "ptys are world accessible" >&6; }
        fi
  
  else
***************
*** 13730,13737 ****
  ( exit $ac_status )
  
        vim_cv_tty_group=world
!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5
! $as_echo "can't determine - assume ptys are world accessable" >&6; }
  
  fi
  rm -rf conftest.dSYM
--- 13730,13737 ----
  ( exit $ac_status )
  
        vim_cv_tty_group=world
!       { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5
! $as_echo "can't determine - assume ptys are world accessible" >&6; }
  
  fi
  rm -rf conftest.dSYM
*** ../vim-7.2.314/src/configure.in	2009-11-17 17:13:03.000000000 +0100
--- src/configure.in	2009-12-02 17:21:10.000000000 +0100
***************
*** 686,692 ****
        [
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
--- 686,692 ----
        [
  	vi_cv_path_python_conf=
  	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
! 	  for subdir in lib64 lib share; do
  	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
  	    if test -d "$d" && test -f "$d/config.c"; then
  	      vi_cv_path_python_conf="$d"
***************
*** 2557,2567 ****
  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
        else
  	vim_cv_tty_group=world
! 	AC_MSG_RESULT([ptys are world accessable])
        fi
      ],[
        vim_cv_tty_group=world
!       AC_MSG_RESULT([can't determine - assume ptys are world accessable])
      ],[
        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
      ])
--- 2557,2567 ----
  	AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
        else
  	vim_cv_tty_group=world
! 	AC_MSG_RESULT([ptys are world accessible])
        fi
      ],[
        vim_cv_tty_group=world
!       AC_MSG_RESULT([can't determine - assume ptys are world accessible])
      ],[
        AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
      ])
*** ../vim-7.2.314/src/version.c	2009-12-02 17:47:46.000000000 +0100
--- src/version.c	2009-12-02 17:57:39.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
  {   /* Add new patch number below this line */
+ /**/
+     315,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
10. And even your night dreams are in HTML.

 /// 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    ///

vim-7.2-elinks-parameter-518791.patch:
 netrw.vim |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.2-elinks-parameter-518791.patch ---
diff -up vim72/runtime/autoload/netrw.vim.elinksparm vim72/runtime/autoload/netrw.vim
--- vim72/runtime/autoload/netrw.vim.elinksparm	2009-12-03 13:08:10.000000000 +0100
+++ vim72/runtime/autoload/netrw.vim	2009-12-03 13:08:27.000000000 +0100
@@ -88,7 +88,7 @@ if !exists("g:netrw_http_cmd")
  if executable("elinks")
   let g:netrw_http_cmd = "elinks"
   if !exists("g:netrw_http_xcmd")
-   let g:netrw_http_xcmd= "-dump >"
+   let g:netrw_http_xcmd= "-source >"
   endif
  elseif executable("links")
   let g:netrw_http_cmd = "links"

vim-7.2-httpfiletype-499123.patch:
 filetype.vim |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vim-7.2-httpfiletype-499123.patch ---
diff -up vim72/runtime/filetype.vim.499123 vim72/runtime/filetype.vim
--- vim72/runtime/filetype.vim.499123	2009-12-02 17:42:47.000000000 +0100
+++ vim72/runtime/filetype.vim	2009-12-02 17:43:52.000000000 +0100
@@ -111,7 +111,7 @@ au BufNewFile,BufRead proftpd.conf*		cal
 
 " Apache config file
 au BufNewFile,BufRead .htaccess			 setf apache
-au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
+au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/httpd/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
 
 " XA65 MOS6510 cross assembler
 au BufNewFile,BufRead *.a65			setf a65

vim72-rh514717.patch:
 eval.c    |    3 +--
 structs.h |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE vim72-rh514717.patch ---
diff -up vim72/src/eval.c.rh514717 vim72/src/eval.c
--- vim72/src/eval.c.rh514717	2009-08-03 16:15:42.882375154 +0200
+++ vim72/src/eval.c	2009-08-03 16:34:14.863381780 +0200
@@ -286,13 +286,12 @@ typedef struct
 #define VV_RO		2	/* read-only */
 #define VV_RO_SBX	4	/* read-only in the sandbox */
 
-#define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}, {0}
+#define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}
 
 static struct vimvar
 {
     char	*vv_name;	/* name of variable, without v: */
     dictitem_T	vv_di;		/* value and name for key */
-    char	vv_filler[16];	/* space for LONGEST name below!!! */
     char	vv_flags;	/* VV_COMPAT, VV_RO, VV_RO_SBX */
 } vimvars[VV_LEN] =
 {
diff -up vim72/src/structs.h.rh514717 vim72/src/structs.h
--- vim72/src/structs.h.rh514717	2009-08-03 16:33:35.274870950 +0200
+++ vim72/src/structs.h	2009-08-03 16:33:48.607436706 +0200
@@ -1095,7 +1095,7 @@ struct dictitem_S
 {
     typval_T	di_tv;		/* type and value of the variable */
     char_u	di_flags;	/* flags (only used for variable) */
-    char_u	di_key[10];	/* key (actually longer!) */
+    char_u	di_key[18];	/* key */
 };
 
 typedef struct dictitem_S dictitem_T;


Index: gvim.desktop
===================================================================
RCS file: /cvs/extras/rpms/vim/F-10/gvim.desktop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gvim.desktop	20 Oct 2008 13:28:53 -0000	1.7
+++ gvim.desktop	3 Dec 2009 14:10:02 -0000	1.8
@@ -55,7 +55,7 @@ Comment[tr]=G????l?? vi d??zenleyicisi
 Comment[uk]=???????????????? ???????????????? vi
 Comment[zh_CN.GB2312]=??????????????? vi ?????????
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %f
+Exec=gvim -f %F
 Icon=gvim
 Type=Application
 Terminal=0

vim-7.2-fstabsyntax.patch:
 fstab.vim |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: vim-7.2-fstabsyntax.patch
===================================================================
RCS file: /cvs/extras/rpms/vim/F-10/vim-7.2-fstabsyntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vim-7.2-fstabsyntax.patch	14 Aug 2008 16:06:02 -0000	1.1
+++ vim-7.2-fstabsyntax.patch	3 Dec 2009 14:10:02 -0000	1.2
@@ -6,7 +6,7 @@ diff -up vim72/runtime/syntax/fstab.vim.
  syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
  syn match fsTypeUnknown /\s\+\zs\w\+/ contained
 -syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
-+syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
  
  " Options
  " -------


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/F-10/vim.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- vim.spec	27 Mar 2009 11:53:29 -0000	1.228
+++ vim.spec	3 Dec 2009 14:10:02 -0000	1.229
@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 148
+%define patchlevel 315
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -214,6 +214,173 @@ Patch145: ftp://ftp.vim.org/pub/vim/patc
 Patch146: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.146
 Patch147: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.147
 Patch148: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.148
+Patch149: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.149
+Patch150: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.150
+Patch151: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.151
+Patch152: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.152
+Patch153: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.153
+Patch154: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.154
+Patch155: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.155
+Patch156: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.156
+Patch157: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.157
+Patch158: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.158
+Patch159: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.159
+Patch160: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.160
+Patch161: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.161
+Patch162: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.162
+Patch163: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.163
+Patch164: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.164
+Patch165: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.165
+Patch166: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.166
+Patch167: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.167
+Patch168: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.168
+Patch169: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.169
+Patch170: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.170
+Patch171: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.171
+Patch172: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.172
+Patch173: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.173
+Patch174: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.174
+Patch175: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.175
+Patch176: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.176
+Patch177: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.177
+Patch178: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.178
+Patch179: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.179
+Patch180: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.180
+Patch181: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.181
+Patch182: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.182
+Patch183: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.183
+Patch184: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.184
+Patch185: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.185
+Patch186: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.186
+Patch187: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.187
+Patch188: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.188
+Patch189: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.189
+Patch190: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.190
+Patch191: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.191
+Patch192: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.192
+Patch193: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.193
+Patch194: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.194
+Patch195: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.195
+Patch196: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.196
+Patch197: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.197
+Patch198: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.198
+Patch199: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.199
+Patch200: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.200
+Patch201: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.201
+Patch202: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.202
+Patch203: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.203
+Patch204: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.204
+Patch205: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.205
+Patch206: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.206
+Patch207: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.207
+Patch208: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.208
+Patch209: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.209
+Patch210: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.210
+Patch211: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.211
+Patch212: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.212
+Patch213: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.213
+Patch214: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.214
+Patch215: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.215
+Patch216: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.216
+Patch217: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.217
+Patch218: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.218
+Patch219: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.219
+Patch220: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.220
+Patch221: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.221
+Patch222: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.222
+Patch223: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.223
+Patch224: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.224
+Patch225: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.225
+Patch226: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.226
+Patch227: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.227
+Patch228: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.228
+Patch229: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.229
+Patch230: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.230
+Patch231: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.231
+Patch232: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.232
+Patch233: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.233
+Patch234: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.234
+Patch235: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.235
+Patch236: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.236
+Patch237: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.237
+Patch238: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.238
+Patch239: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.239
+Patch240: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.240
+Patch241: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.241
+Patch242: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.242
+Patch243: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.243
+Patch244: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.244
+Patch245: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.245
+Patch246: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.246
+Patch247: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.247
+Patch248: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.248
+Patch249: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.249
+Patch250: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.250
+Patch251: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.251
+Patch252: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.252
+Patch253: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.253
+Patch254: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.254
+Patch255: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.255
+Patch256: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.256
+Patch257: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.257
+Patch258: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.258
+Patch259: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.259
+Patch260: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.260
+Patch261: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.261
+Patch262: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.262
+Patch263: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.263
+Patch264: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.264
+Patch265: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.265
+Patch266: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.266
+Patch267: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.267
+Patch268: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.268
+Patch269: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.269
+Patch270: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.270
+Patch271: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.271
+Patch272: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.272
+Patch273: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.273
+Patch274: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.274
+Patch275: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.275
+Patch276: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.276
+Patch277: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.277
+Patch278: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.278
+Patch279: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.279
+Patch280: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.280
+Patch281: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.281
+Patch282: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.282
+Patch283: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.283
+Patch284: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.284
+Patch285: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.285
+Patch286: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.286
+Patch287: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.287
+Patch288: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.288
+Patch289: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.289
+Patch290: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.290
+Patch291: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.291
+Patch292: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.292
+Patch293: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.293
+Patch294: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.294
+Patch295: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.295
+Patch296: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.296
+Patch297: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.297
+Patch298: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.298
+Patch299: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.299
+Patch300: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.300
+Patch301: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301
+Patch302: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.302
+Patch303: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.303
+Patch304: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.304
+Patch305: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.305
+Patch306: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.306
+Patch307: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.307
+Patch308: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.308
+Patch309: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.309
+Patch310: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.310
+Patch311: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.311
+Patch312: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.312
+Patch313: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.313
+Patch314: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.314
+Patch315: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.315
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -221,10 +388,12 @@ Patch3003: vim-6.1-rh3.patch
 Patch3004: vim-7.0-rclocation.patch
 Patch3006: vim-6.4-checkhl.patch
 Patch3007: vim-7.2-fstabsyntax.patch
-Patch3008: vim-7.1-lib64.patch
-Patch3009: vim-7.0-warning.patch
-Patch3010: vim-7.0-syncolor.patch
-Patch3011: vim-7.0-specedit.patch
+Patch3008: vim-7.0-warning.patch
+Patch3009: vim-7.0-syncolor.patch
+Patch3010: vim-7.0-specedit.patch
+Patch3011: vim72-rh514717.patch
+Patch3012: vim-7.2-httpfiletype-499123.patch
+Patch3013: vim-7.2-elinks-parameter-518791.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel ncurses-devel gettext perl-devel
@@ -233,6 +402,9 @@ BuildRequires: libacl-devel gpm-devel au
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
 %endif
+%if "%{withruby}" == "1"
+Buildrequires: ruby-devel ruby
+%endif
 %if %{desktop_file}
 # for /usr/bin/desktop-file-install
 Requires: desktop-file-utils
@@ -495,6 +667,173 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runti
 %patch146 -p0
 %patch147 -p0
 %patch148 -p0
+%patch149 -p0 
+%patch150 -p0 
+%patch151 -p0 
+%patch152 -p0 
+%patch153 -p0 
+%patch154 -p0 
+%patch155 -p0 
+%patch156 -p0 
+%patch157 -p0 
+%patch158 -p0 
+%patch159 -p0 
+%patch160 -p0 
+%patch161 -p0 
+%patch162 -p0 
+%patch163 -p0 
+%patch164 -p0 
+%patch165 -p0 
+%patch166 -p0 
+%patch167 -p0 
+%patch168 -p0 
+%patch169 -p0 
+%patch170 -p0 
+%patch171 -p0 
+%patch172 -p0 
+%patch173 -p0 
+%patch174 -p0 
+%patch175 -p0 
+%patch176 -p0 
+%patch177 -p0 
+%patch178 -p0 
+%patch179 -p0 
+%patch180 -p0 
+%patch181 -p0 
+%patch182 -p0 
+%patch183 -p0 
+%patch184 -p0 
+%patch185 -p0 
+%patch186 -p0 
+%patch187 -p0 
+%patch188 -p0 
+%patch189 -p0 
+%patch190 -p0 
+%patch191 -p0 
+%patch192 -p0 
+%patch193 -p0 
+%patch194 -p0 
+%patch195 -p0 
+%patch196 -p0 
+%patch197 -p0 
+%patch198 -p0 
+%patch199 -p0 
+%patch200 -p0 
+%patch201 -p0 
+%patch202 -p0 
+%patch203 -p0 
+%patch204 -p0 
+%patch205 -p0 
+%patch206 -p0 
+%patch207 -p0 
+%patch208 -p0 
+%patch209 -p0 
+%patch210 -p0 
+%patch211 -p0 
+%patch212 -p0 
+%patch213 -p0 
+%patch214 -p0 
+%patch215 -p0 
+%patch216 -p0 
+%patch217 -p0 
+%patch218 -p0 
+%patch219 -p0 
+%patch220 -p0 
+%patch221 -p0 
+%patch222 -p0 
+%patch223 -p0 
+%patch224 -p0 
+%patch225 -p0 
+%patch226 -p0 
+%patch227 -p0 
+%patch228 -p0 
+%patch229 -p0 
+%patch230 -p0 
+%patch231 -p0 
+%patch232 -p0 
+%patch233 -p0 
+%patch234 -p0 
+%patch235 -p0 
+%patch236 -p0 
+%patch237 -p0 
+%patch238 -p0 
+%patch239 -p0 
+%patch240 -p0 
+%patch241 -p0 
+%patch242 -p0 
+%patch243 -p0 
+%patch244 -p0 
+%patch245 -p0 
+%patch246 -p0 
+%patch247 -p0 
+%patch248 -p0 
+%patch249 -p0 
+%patch250 -p0 
+%patch251 -p0 
+%patch252 -p0 
+%patch253 -p0 
+%patch254 -p0 
+%patch255 -p0 
+%patch256 -p0 
+%patch257 -p0 
+%patch258 -p0 
+%patch259 -p0 
+%patch260 -p0 
+%patch261 -p0 
+%patch262 -p0 
+%patch263 -p0 
+%patch264 -p0 
+%patch265 -p0 
+%patch266 -p0 
+%patch267 -p0 
+%patch268 -p0 
+%patch269 -p0 
+%patch270 -p0 
+%patch271 -p0 
+%patch272 -p0 
+%patch273 -p0 
+%patch274 -p0 
+%patch275 -p0 
+%patch276 -p0 
+%patch277 -p0 
+%patch278 -p0 
+%patch279 -p0 
+%patch280 -p0 
+%patch281 -p0 
+%patch282 -p0 
+%patch283 -p0 
+%patch284 -p0 
+%patch285 -p0                                          
+%patch286 -p0                                          
+%patch287 -p0                                          
+%patch288 -p0                                          
+%patch289 -p0                                          
+%patch290 -p0                                          
+%patch291 -p0                                          
+%patch292 -p0                                          
+%patch293 -p0                                          
+%patch294 -p0                                          
+%patch295 -p0                                          
+%patch296 -p0                                          
+%patch297 -p0                                          
+%patch298 -p0                                          
+%patch299 -p0                                          
+%patch300 -p0                                          
+%patch301 -p0                                          
+%patch302 -p0                                          
+%patch303 -p0                                          
+%patch304 -p0                                          
+%patch305 -p0                                          
+%patch306 -p0                                          
+%patch307 -p0
+%patch308 -p0
+%patch309 -p0
+%patch310 -p0
+%patch311 -p0
+%patch312 -p0
+%patch313 -p0
+%patch314 -p0
+%patch315 -p0
 
 
 # install spell files
@@ -513,6 +852,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runti
 %patch3009 -p1
 %patch3010 -p1
 %patch3011 -p1
+%patch3012 -p1
 
 cp -f %{SOURCE15} runtime/syntax/forth.vim
 cp -f %{SOURCE16} runtime/plugin/netrwPlugin.vim
@@ -523,12 +863,15 @@ cp -f %{SOURCE20} runtime/autoload/tar.v
 cp -f %{SOURCE21} runtime/autoload/netrwFileHandlers.vim
 cp -f %{SOURCE22} runtime/autoload/netrw.vim
 cp -f %{SOURCE23} runtime/autoload/netrwSettings.vim
-
+%patch3013 -p1
 
 %build
 cd src
 autoconf
 
+sed -e "s+VIMRCLOC	= \$(VIMLOC)+VIMRCLOC	= /etc+" Makefile > Makefile.tmp
+mv -f Makefile.tmp Makefile
+
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 
@@ -555,7 +898,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_S
   --disable-rubyinterp \
 %endif
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim gvim
 make clean
 
@@ -581,7 +924,7 @@ make clean
   --disable-rubyinterp \
 %endif
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim enhanced-vim
 make clean
 
@@ -600,7 +943,7 @@ perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/
   --with-compiledby="<bugzilla at redhat.com>" \
   --with-modified-by="<bugzilla at redhat.com>"
 
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -616,8 +959,8 @@ rm -f README*.info
 
 
 cd src
-make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
-make installgtutorbin  DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
+make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
+make installgtutorbin  DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
 mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd
 mv $RPM_BUILD_ROOT/bin/gvimtutor $RPM_BUILD_ROOT/%{_bindir}/gvimtutor
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
@@ -657,8 +1000,8 @@ install -m755 enhanced-vim $RPM_BUILD_RO
     mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
     desktop-file-install --vendor fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-        --add-category "Development;TextEditor;X-Red-Hat-Base" \
         %{SOURCE3}
+        # --add-category "Development;TextEditor;X-Red-Hat-Base" D\
   %else
     mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
     cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
@@ -702,14 +1045,14 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.sh <<EOF
 if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
   [ -x /%{_bindir}/id ] || return
-  [ \`/%{_bindir}/id -u\` -le 100 ] && return
+  [ \`/%{_bindir}/id -u\` -le 200 ] && return
   # for bash and zsh, only if no alias is already set
   alias vi >/dev/null 2>&1 || alias vi=vim
 fi
 EOF
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.csh <<EOF
 [ -x /%{_bindir}/id ] || exit
-[ \`/%{_bindir}/id -u\` -gt 100 ] && alias vi vim
+[ \`/%{_bindir}/id -u\` -gt 200 ] && alias vi vim
 EOF
 chmod 0644 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
 install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
@@ -726,6 +1069,7 @@ vi-Bram.txt	vi_help.txt	/*vi-Bram*
 vi-Moolenaar.txt	vi_help.txt	/*vi-Moolenaar*
 vi-credits.txt	vi_help.txt	/*vi-credits*
 EOF
+LANG=C sort tags > tags.tmp; mv tags.tmp tags
  )
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
 rm -f $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
@@ -954,6 +1298,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Dec 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.315-1
+- patchlevel 315
+- fix vimrc location in man page (#456992)
+- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
+- Buildrequire ruby, ruby-devel (#503872)
+- Remove check for static gravity (#510307)
+- sort tags file (#517725)
+- use one gvim to open multiple file selections from nautilus (#519265)
+- use elinks -source instead of elinks -dump (#518791)
+- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
+
+* Mon Nov 09 2009 Karsten Hopp <karsten at redhat.com> 7.2.284-1
+- patchlevel 284
+
+* Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-3
+- change range of system ids in /etc/profile.d/vim/* (#518555)
+
+* Mon Aug 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-2
+- add fix for glibc fortify segfault (#514717, Adam Tkac)
+
+* Sat Aug 01 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-1
+- add 97 upstream patches to get to patchlevel 245
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:7.2.148-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 27 2009 Karsten Hopp <karsten at redhat.com> 7.2.148-1
 - patchlevel 148, fixes #461417
 


Index: vimrc
===================================================================
RCS file: /cvs/extras/rpms/vim/F-10/vimrc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- vimrc	3 Jun 2008 14:34:32 -0000	1.20
+++ vimrc	3 Dec 2009 14:10:02 -0000	1.21
@@ -16,7 +16,7 @@ if has("autocmd")
   augroup fedora
   autocmd!
   " In text files, always limit the width of text to 78 characters
-  autocmd BufRead *.txt set tw=78
+  " autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
   \ if line("'\"") > 0 && line ("'\"") <= line("$") |



From hadess at fedoraproject.org  Thu Dec  3 14:11:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  3 Dec 2009 14:11:51 +0000 (UTC)
Subject: rpms/libgnomekbd/devel
	0001-Properly-handle-scenario-when-one-keycode-has-multip.patch,
	1.1, 1.2 libgnomekbd.spec, 1.51, 1.52
Message-ID: <20091203141151.D9A4C11C00EE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	0001-Properly-handle-scenario-when-one-keycode-has-multip.patch 
	libgnomekbd.spec 
Log Message:
* Thu Dec 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
- Remove debug in patch


0001-Properly-handle-scenario-when-one-keycode-has-multip.patch:
 ChangeLog                           |    6 ++
 libgnomekbd/gkbd-keyboard-drawing.c |  107 ++++++++++++++++++++++--------------
 libgnomekbd/gkbd-keyboard-drawing.h |    4 +
 3 files changed, 76 insertions(+), 41 deletions(-)

Index: 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/0001-Properly-handle-scenario-when-one-keycode-has-multip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch	3 Dec 2009 05:23:49 -0000	1.1
+++ 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch	3 Dec 2009 14:11:51 -0000	1.2
@@ -28,15 +28,6 @@ diff --git a/libgnomekbd/gkbd-keyboard-d
 index f02fb5e..da314d4 100644
 --- a/libgnomekbd/gkbd-keyboard-drawing.c
 +++ b/libgnomekbd/gkbd-keyboard-drawing.c
-@@ -31,7 +31,7 @@
- #include <gkbd-keyboard-drawing.h>
- #include <gkbd-keyboard-drawing-marshal.h>
- 
--#define noKBDRAW_DEBUG
-+#define KBDRAW_DEBUG
- 
- #define INVALID_KEYCODE ((guint)(-1))
- 
 @@ -998,8 +998,8 @@ draw_key (GkbdKeyboardDrawingRenderContext * context,
  
  	if (key->pressed)


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- libgnomekbd.spec	3 Dec 2009 05:20:39 -0000	1.51
+++ libgnomekbd.spec	3 Dec 2009 14:11:51 -0000	1.52
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
 Version:        2.28.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -135,6 +135,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Dec 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
+- Remove debug in patch
+
 * Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Small spec fixes
 



From hadess at fedoraproject.org  Thu Dec  3 14:11:58 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  3 Dec 2009 14:11:58 +0000 (UTC)
Subject: rpms/libgnomekbd/F-12
	0001-Properly-handle-scenario-when-one-keycode-has-multip.patch,
	1.1, 1.2 libgnomekbd.spec, 1.53, 1.54
Message-ID: <20091203141158.9835611C00EE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgnomekbd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28948

Modified Files:
	0001-Properly-handle-scenario-when-one-keycode-has-multip.patch 
	libgnomekbd.spec 
Log Message:
* Thu Dec 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
- Remove debug in patch


0001-Properly-handle-scenario-when-one-keycode-has-multip.patch:
 ChangeLog                           |    6 ++
 libgnomekbd/gkbd-keyboard-drawing.c |  107 ++++++++++++++++++++++--------------
 libgnomekbd/gkbd-keyboard-drawing.h |    4 +
 3 files changed, 76 insertions(+), 41 deletions(-)

Index: 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-12/0001-Properly-handle-scenario-when-one-keycode-has-multip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch	8 Oct 2009 22:16:10 -0000	1.1
+++ 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch	3 Dec 2009 14:11:58 -0000	1.2
@@ -28,15 +28,6 @@ diff --git a/libgnomekbd/gkbd-keyboard-d
 index f02fb5e..da314d4 100644
 --- a/libgnomekbd/gkbd-keyboard-drawing.c
 +++ b/libgnomekbd/gkbd-keyboard-drawing.c
-@@ -31,7 +31,7 @@
- #include <gkbd-keyboard-drawing.h>
- #include <gkbd-keyboard-drawing-marshal.h>
- 
--#define noKBDRAW_DEBUG
-+#define KBDRAW_DEBUG
- 
- #define INVALID_KEYCODE ((guint)(-1))
- 
 @@ -998,8 +998,8 @@ draw_key (GkbdKeyboardDrawingRenderContext * context,
  
  	if (key->pressed)


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-12/libgnomekbd.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- libgnomekbd.spec	3 Dec 2009 05:16:21 -0000	1.53
+++ libgnomekbd.spec	3 Dec 2009 14:11:58 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
 Version:        2.28.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -135,6 +135,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Dec 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
+- Remove debug in patch
+
 * Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Small spec fixes
 



From devrim at fedoraproject.org  Thu Dec  3 14:21:52 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  3 Dec 2009 14:21:52 +0000 (UTC)
Subject: rpms/postgis/devel postgis.spec,1.32,1.33
Message-ID: <20091203142152.F17F011C00EE@cvs1.fedora.phx.redhat.com>

Author: devrim

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

Modified Files:
	postgis.spec 
Log Message:
Fix spec per rawhide report.



Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/devel/postgis.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- postgis.spec	30 Nov 2009 23:32:26 -0000	1.32
+++ postgis.spec	3 Dec 2009 14:21:52 -0000	1.33
@@ -5,7 +5,7 @@
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
 Version:	1.4.1
-Release:	rc2_1%{?dist}.1
+Release:	rc2_1%{?dist}.2
 License:	GPLv2+
 Group:		Applications/Databases
 Source0:	http://postgis.refractions.net/download/%{name}-%{version}rc2.tar.gz
@@ -37,7 +37,7 @@ The postgis-docs package includes PDF do
 Summary:	The JDBC driver for PostGIS
 Group:		Applications/Databases
 License:	LGPLv2+
-Requires:	%{name} = %{version}rc2-%{release}, postgresql-jdbc
+Requires:	%{name} = %{version}-%{release}, postgresql-jdbc
 BuildRequires:  ant >= 0:1.6.2, junit >= 0:3.7, postgresql-jdbc
 
 %if %{gcj_support}
@@ -55,7 +55,7 @@ The postgis-jdbc package provides the es
 %package utils
 Summary:	The utils for PostGIS
 Group:		Applications/Databases
-Requires:	%{name} = %{version}rc2-%{release}, perl-DBD-Pg
+Requires:	%{name} = %{version}-%{release}, perl-DBD-Pg
 
 %description utils
 The postgis-utils package provides the utilities for PostGIS.
@@ -164,6 +164,9 @@ rm -rf %{buildroot}
 %doc postgis*.pdf
 
 %changelog
+* Thu Dec 03 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.4.1-rc2_1.2
+- Fix spec per rawhide report.
+
 * Tue Dec 01 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.4.1-rc2_1.1
 - Update spec for rc2 changes.
 



From jorton at fedoraproject.org  Thu Dec  3 14:23:28 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 14:23:28 +0000 (UTC)
Subject: rpms/httpd/devel httpd-2.2.14-CVE-2009-3555.patch, NONE,
	1.1 httpd-2.2.14.tar.gz.asc, NONE, 1.1 .cvsignore, 1.25,
	1.26 httpd.spec, 1.140, 1.141 sources, 1.21, 1.22 upstream, 1.14,
	1.15 httpd-2.2.13.tar.gz.asc, 1.1, NONE
Message-ID: <20091203142328.F279E11C00EE@cvs1.fedora.phx.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore httpd.spec sources upstream 
Added Files:
	httpd-2.2.14-CVE-2009-3555.patch httpd-2.2.14.tar.gz.asc 
Removed Files:
	httpd-2.2.13.tar.gz.asc 
Log Message:
* Thu Dec  3 2009 Joe Orton <jorton at redhat.com> - 2.2.14-1
- update to 2.2.14
- relax permissions on /var/run/httpd (#495780)
- Requires(pre): httpd in mod_ssl subpackage (#543275)
- add partial security fix for CVE-2009-3555 (#533125)


httpd-2.2.14-CVE-2009-3555.patch:
 ssl_engine_init.c   |    5 -
 ssl_engine_io.c     |   17 +++++
 ssl_engine_kernel.c |  151 +++++++++++++++++++++++++++++++---------------------
 ssl_private.h       |   16 +++++
 4 files changed, 123 insertions(+), 66 deletions(-)

--- NEW FILE httpd-2.2.14-CVE-2009-3555.patch ---
--- httpd-2.2.14/modules/ssl/ssl_engine_init.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_init.c
@@ -501,10 +501,7 @@ static void ssl_init_ctx_callbacks(serve
     SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
     SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);
 
-    if (s->loglevel >= APLOG_DEBUG) {
-        /* this callback only logs if LogLevel >= info */
-        SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);
-    }
+    SSL_CTX_set_info_callback(ctx, ssl_callback_Info);
 }
 
 static void ssl_init_ctx_verify(server_rec *s,
--- httpd-2.2.14/modules/ssl/ssl_engine_io.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_io.c
@@ -103,6 +103,7 @@ typedef struct {
     ap_filter_t        *pInputFilter;
     ap_filter_t        *pOutputFilter;
     int                nobuffer; /* non-zero to prevent buffering */
+    SSLConnRec         *config;
 } ssl_filter_ctx_t;
 
 typedef struct {
@@ -193,7 +194,13 @@ static int bio_filter_out_read(BIO *bio,
 static int bio_filter_out_write(BIO *bio, const char *in, int inl)
 {
     bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)(bio->ptr);
-
+    
+    /* Abort early if the client has initiated a renegotiation. */
+    if (outctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        outctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+    
     /* when handshaking we'll have a small number of bytes.
      * max size SSL will pass us here is about 16k.
      * (16413 bytes to be exact)
@@ -466,6 +473,12 @@ static int bio_filter_in_read(BIO *bio, 
     if (!in)
         return 0;
 
+    /* Abort early if the client has initiated a renegotiation. */
+    if (inctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        inctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+
     /* XXX: flush here only required for SSLv2;
      * OpenSSL calls BIO_flush() at the appropriate times for
      * the other protocols.
@@ -1724,6 +1737,8 @@ void ssl_io_filter_init(conn_rec *c, SSL
 
     filter_ctx = apr_palloc(c->pool, sizeof(ssl_filter_ctx_t));
 
+    filter_ctx->config          = myConnConfig(c);
+
     filter_ctx->nobuffer        = 0;
     filter_ctx->pOutputFilter   = ap_add_output_filter(ssl_io_filter,
                                                    filter_ctx, NULL, c);
--- httpd-2.2.14/modules/ssl/ssl_engine_kernel.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_kernel.c
@@ -729,6 +729,10 @@ int ssl_hook_Access(request_rec *r)
                                        (unsigned char *)&id,
                                        sizeof(id));
 
+            /* Toggle the renegotiation state to allow the new
+             * handshake to proceed. */
+            sslconn->reneg_state = RENEG_ALLOW;
+            
             SSL_renegotiate(ssl);
             SSL_do_handshake(ssl);
 
@@ -750,6 +754,8 @@ int ssl_hook_Access(request_rec *r)
             SSL_set_state(ssl, SSL_ST_ACCEPT);
             SSL_do_handshake(ssl);
 
+            sslconn->reneg_state = RENEG_REJECT;
+
             if (SSL_get_state(ssl) != SSL_ST_OK) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Re-negotiation handshake failed: "
@@ -1844,76 +1850,55 @@ void ssl_callback_DelSessionCacheEntry(S
     return;
 }
 
-/*
- * This callback function is executed while OpenSSL processes the
- * SSL handshake and does SSL record layer stuff. We use it to
- * trace OpenSSL's processing in out SSL logfile.
- */
-void ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
+/* Dump debugginfo trace to the log file. */
+static void log_tracing_state(MODSSL_INFO_CB_ARG_TYPE ssl, conn_rec *c, 
+                              server_rec *s, int where, int rc)
 {
-    conn_rec *c;
-    server_rec *s;
-    SSLSrvConfigRec *sc;
-
-    /*
-     * find corresponding server
-     */
-    if (!(c = (conn_rec *)SSL_get_app_data((SSL *)ssl))) {
-        return;
-    }
-
-    s = mySrvFromConn(c);
-    if (!(sc = mySrvConfig(s))) {
-        return;
-    }
-
     /*
      * create the various trace messages
      */
-    if (s->loglevel >= APLOG_DEBUG) {
-        if (where & SSL_CB_HANDSHAKE_START) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Handshake: start", SSL_LIBRARY_NAME);
-        }
-        else if (where & SSL_CB_HANDSHAKE_DONE) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Handshake: done", SSL_LIBRARY_NAME);
-        }
-        else if (where & SSL_CB_LOOP) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Loop: %s",
-                         SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-        }
-        else if (where & SSL_CB_READ) {
+    if (where & SSL_CB_HANDSHAKE_START) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Handshake: start", SSL_LIBRARY_NAME);
+    }
+    else if (where & SSL_CB_HANDSHAKE_DONE) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Handshake: done", SSL_LIBRARY_NAME);
+    }
+    else if (where & SSL_CB_LOOP) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Loop: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_READ) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Read: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_WRITE) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Write: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_ALERT) {
+        char *str = (where & SSL_CB_READ) ? "read" : "write";
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Alert: %s:%s:%s",
+                     SSL_LIBRARY_NAME, str,
+                     SSL_alert_type_string_long(rc),
+                     SSL_alert_desc_string_long(rc));
+    }
+    else if (where & SSL_CB_EXIT) {
+        if (rc == 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Read: %s",
+                         "%s: Exit: failed in %s",
                          SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
         }
-        else if (where & SSL_CB_WRITE) {
+        else if (rc < 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Write: %s",
+                         "%s: Exit: error in %s",
                          SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
         }
-        else if (where & SSL_CB_ALERT) {
-            char *str = (where & SSL_CB_READ) ? "read" : "write";
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Alert: %s:%s:%s",
-                         SSL_LIBRARY_NAME, str,
-                         SSL_alert_type_string_long(rc),
-                         SSL_alert_desc_string_long(rc));
-        }
-        else if (where & SSL_CB_EXIT) {
-            if (rc == 0) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                             "%s: Exit: failed in %s",
-                             SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-            }
-            else if (rc < 0) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                             "%s: Exit: error in %s",
-                             SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-            }
-        }
     }
 
     /*
@@ -1933,6 +1918,52 @@ void ssl_callback_LogTracingState(MODSSL
     }
 }
 
+/*
+ * This callback function is executed while OpenSSL processes the SSL
+ * handshake and does SSL record layer stuff.  It's used to trap
+ * client-initiated renegotiations, and for dumping everything to the
+ * log.
+ */
+void ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
+{
+    conn_rec *c;
+    server_rec *s;
+    SSLConnRec *scr;
+
+    /* Retrieve the conn_rec and the associated SSLConnRec. */
+    if ((c = (conn_rec *)SSL_get_app_data((SSL *)ssl)) == NULL) {
+        return;
+    }
+
+    if ((scr = myConnConfig(c)) == NULL) {
+        return;
+    }
+
+    /* If the reneg state is to reject renegotiations, check the SSL
+     * state machine and move to ABORT if a Client Hello is being
+     * read. */
+    if ((where & SSL_CB_ACCEPT_LOOP) && scr->reneg_state == RENEG_REJECT) {
+        int state = SSL_get_state(ssl);
+        
+        if (state == SSL3_ST_SR_CLNT_HELLO_A 
+            || state == SSL23_ST_SR_CLNT_HELLO_A) {
+            scr->reneg_state = RENEG_ABORT;
+            ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c,
+                          "rejecting client initiated renegotiation");
+        }
+    }
+    /* If the first handshake is complete, change state to reject any
+     * subsequent client-initated renegotiation. */
+    else if ((where & SSL_CB_HANDSHAKE_DONE) && scr->reneg_state == RENEG_INIT) {
+        scr->reneg_state = RENEG_REJECT;
+    }
+
+    s = mySrvFromConn(c);
+    if (s && s->loglevel >= APLOG_DEBUG) {
+        log_tracing_state(ssl, c, s, where, rc);
+    }
+}
+
 #ifndef OPENSSL_NO_TLSEXT
 /*
  * This callback function is executed when OpenSSL encounters an extended
--- httpd-2.2.14/modules/ssl/ssl_private.h.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_private.h
@@ -356,6 +356,20 @@ typedef struct {
     int is_proxy;
     int disabled;
     int non_ssl_request;
+
+    /* Track the handshake/renegotiation state for the connection so
+     * that all client-initiated renegotiations can be rejected, as a
+     * partial fix for CVE-2009-3555. */
+    enum { 
+        RENEG_INIT = 0, /* Before initial handshake */
+        RENEG_REJECT, /* After initial handshake; any client-initiated
+                       * renegotiation should be rejected */
+        RENEG_ALLOW, /* A server-initated renegotiation is taking
+                      * place (as dictated by configuration) */
+        RENEG_ABORT /* Renegotiation initiated by client, abort the
+                     * connection */
+    } reneg_state;
+    
     server_rec *server;
 } SSLConnRec;
 
@@ -574,7 +588,7 @@ int          ssl_callback_proxy_cert(SSL
 int          ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
 SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
 void         ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);
-void         ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE, int, int);
+void         ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE, int, int);
 #ifndef OPENSSL_NO_TLSEXT
 int          ssl_callback_ServerNameIndication(SSL *, int *, modssl_ctx_t *);
 #endif


--- NEW FILE httpd-2.2.14.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Darwin)

iD8DBQBKuq+ENEqETXUdfycRAt+lAKCBA8IJnjaV416wdym0//EHlOjO8ACdFLOD
K4ODFOVg9S1rvewVwER0VM4=
=R/uW
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	18 Aug 2009 10:07:02 -0000	1.25
+++ .cvsignore	3 Dec 2009 14:23:28 -0000	1.26
@@ -1 +1 @@
-httpd-2.2.13.tar.gz
+httpd-2.2.14.tar.gz


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- httpd.spec	27 Oct 2009 19:10:38 -0000	1.140
+++ httpd.spec	3 Dec 2009 14:23:28 -0000	1.141
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.13
-Release: 4%{?dist}
+Version: 2.2.14
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -37,6 +37,8 @@ Patch25: httpd-2.2.11-selinux.patch
 Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+# Security fixes
+Patch90: httpd-2.2.14-CVE-2009-3555.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -101,6 +103,7 @@ Summary: SSL/TLS module for the Apache H
 Epoch: 1
 BuildRequires: openssl-devel, distcache-devel
 Requires(post): openssl >= 0.9.7f-4, /bin/cat
+Requires(pre): httpd
 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
 Obsoletes: stronghold-mod_ssl
 
@@ -126,6 +129,8 @@ Security (TLS) protocols.
 
 %patch54 -p1 -b .authnoprov
 
+%patch90 -p1 -b .cve3555
+
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
 
@@ -446,7 +451,7 @@ rm -rf $RPM_BUILD_ROOT
 %config %{contentdir}/error/*.var
 %config %{contentdir}/error/include/*.html
 
-%attr(0700,root,root) %dir %{_localstatedir}/run/httpd
+%attr(0710,root,apache) %dir %{_localstatedir}/run/httpd
 %attr(0700,root,root) %dir %{_localstatedir}/log/httpd
 %attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
 %attr(0700,apache,apache) %dir %{_localstatedir}/cache/mod_proxy
@@ -484,6 +489,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Dec  3 2009 Joe Orton <jorton at redhat.com> - 2.2.14-1
+- update to 2.2.14
+- relax permissions on /var/run/httpd (#495780)
+- Requires(pre): httpd in mod_ssl subpackage (#543275)
+- add partial security fix for CVE-2009-3555 (#533125)
+
 * Tue Oct 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.13-4
 - add additional explanatory text to test page to help prevent legal emails to Fedora
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	18 Aug 2009 10:07:03 -0000	1.21
+++ sources	3 Dec 2009 14:23:28 -0000	1.22
@@ -1 +1 @@
-2803e35be6650f5b739e6e91faa824dd  httpd-2.2.13.tar.gz
+2c1e3c7ba00bcaa0163da7b3e66aaa1e  httpd-2.2.14.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/upstream,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- upstream	18 Aug 2009 10:07:03 -0000	1.14
+++ upstream	3 Dec 2009 14:23:28 -0000	1.15
@@ -1 +1 @@
-httpd-2.2.13.tar.gz
+httpd-2.2.14.tar.gz


--- httpd-2.2.13.tar.gz.asc DELETED ---



From stevetraylen at fedoraproject.org  Thu Dec  3 14:27:47 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 14:27:47 +0000 (UTC)
Subject: rpms/perl-POE/EL-5 perl-POE.spec,1.11,1.12
Message-ID: <20091203142747.7049E11C00EE@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

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

Modified Files:
	perl-POE.spec 
Log Message:
Use perl-POE-Test-Loops



Index: perl-POE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE/EL-5/perl-POE.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-POE.spec	27 Nov 2009 20:06:29 -0000	1.11
+++ perl-POE.spec	3 Dec 2009 14:27:47 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-POE
 Version:        1.280
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable multitasking and networking framework for any event loop
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -14,8 +14,7 @@ BuildRequires:  perl(Term::ReadKey)
 BuildRequires:  perl(Socket6)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::Pod)
-# perl(POE::Test::Loops) not available till perl(POE) is available.
-#BuildRequires:  perl(POE::Test::Loops) >= 1.030
+BuildRequires:  perl(POE::Test::Loops) >= 1.030
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(IO::Tty) >= 1.07
@@ -30,8 +29,7 @@ Requires:       perl(Exporter)
 Requires:       perl(File::Spec) >= 0.87
 Requires:       perl(IO::Handle) >= 1.25
 Requires:       perl(IO::Tty) >= 1.07
-# perl(POE::Test::Loops) not available till perl(POE) is available.
-#Requires:       perl(POE::Test::Loops) >= 1.022
+Requires:       perl(POE::Test::Loops) >= 1.022
 Requires:       perl(POSIX) >= 1.02
 Requires:       perl(Socket) >= 1.7
 Requires:       perl(Storable) >= 2.15
@@ -49,8 +47,6 @@ Twisted. TCL has "the event loop".
 %{__perl} Makefile.PL INSTALLDIRS=vendor --default
 #Don't run network tests by default
 %{?!_with_network_tests: rm run_network_tests } 
-# Remove tests for now that require POE::Test::Loops
-rm t/00_info.t
 make %{?_smp_mflags}
 
 %install
@@ -76,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 3 2009 Steve Traylen <steve.traylen at cern.ch> 1.280-2
+- Add back requirment on perl(POE::Test::Loops) since it
+  is now available.
 * Fri Nov 27 2009 Steve Traylen <steve.traylen at cern.ch> 1.280-1
 - First build for EPEL5
 - Remove requirment for perl(POE::Test::Loops) since it can't be



From mclasen at fedoraproject.org  Thu Dec  3 14:27:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Dec 2009 14:27:56 +0000 (UTC)
Subject: rpms/gnome-screensaver/F-12 gnome-screensaver.spec,1.233,1.234
Message-ID: <20091203142756.A3FCD11C00EE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2256

Modified Files:
	gnome-screensaver.spec 
Log Message:
Drop an unwanted dependency



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- gnome-screensaver.spec	2 Nov 2009 23:10:39 -0000	1.233
+++ gnome-screensaver.spec	3 Dec 2009 14:27:56 -0000	1.234
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.28.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
@@ -68,7 +68,6 @@ Requires: system-logos
 # since we use it, and pam spams the log if a module is missing
 Requires: gnome-keyring-pam
 Requires: fedora-screensaver-theme
-Requires: fedorainfinity-screensaver-theme
 Conflicts: xscreensaver < 1:5.00-19
 
 %description
@@ -159,6 +158,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-7
+- Drop an unwanted dependency
+
 * Mon Nov  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-6
 - Clean up session inhibitors if the owner falls off the bus
 



From jsafrane at fedoraproject.org  Thu Dec  3 14:28:21 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu,  3 Dec 2009 14:28:21 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec, 1.195, 1.196 net-snmptrapd.init, 
	1.6, 1.7
Message-ID: <20091203142821.2C53F11C00EE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2926

Modified Files:
	net-snmp.spec net-snmptrapd.init 
Log Message:
fix snmptrapd init script to survive with empty /etc/sysconfig/snmptrapd


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- net-snmp.spec	2 Dec 2009 09:33:22 -0000	1.195
+++ net-snmp.spec	3 Dec 2009 14:28:20 -0000	1.196
@@ -403,6 +403,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %changelog
 * Wed Dec  2 2009 Jan Safranek <jsafrane at redhat.com> 1:5.5-4
 - fix udpTable indexes on big-endian systems (#543352)
+- fix snmptrapd init script to survive with empty /etc/sysconfig/snmptrapd
 
 * Wed Nov 25 2009 Jan Safranek <jsafrane at redhat.com>  1:5.5-3
 - prepare the .spec file for review


Index: net-snmptrapd.init
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmptrapd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- net-snmptrapd.init	25 Nov 2009 15:22:55 -0000	1.6
+++ net-snmptrapd.init	3 Dec 2009 14:28:21 -0000	1.7
@@ -26,10 +26,9 @@
 # source function library
 . /etc/init.d/functions
 
+OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
 if [ -e /etc/sysconfig/snmptrapd ]; then
   . /etc/sysconfig/snmptrapd
-else
-   OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
 fi
 
 RETVAL=0



From devrim at fedoraproject.org  Thu Dec  3 14:31:29 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  3 Dec 2009 14:31:29 +0000 (UTC)
Subject: rpms/geos/devel geos.spec,1.22,1.23
Message-ID: <20091203143129.74C4911C00EE@cvs1.fedora.phx.redhat.com>

Author: devrim

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

Modified Files:
	geos.spec 
Log Message:
Fix spec (dep error).



Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- geos.spec	2 Dec 2009 13:14:02 -0000	1.22
+++ geos.spec	3 Dec 2009 14:31:29 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		geos
 Version:	3.2.0
-Release:	rc3_1%{?dist}
+Release:	rc3_1%{?dist}.1
 Summary:	GEOS is a C++ port of the Java Topology Suite
 
 Group:		Applications/Engineering
@@ -28,7 +28,7 @@ functions such as IsValid()
 %package devel
 Summary:	Development files for GEOS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}rc3-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology 
@@ -44,7 +44,7 @@ use GEOS
 %package python
 Summary:	Python modules for GEOS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}rc3-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description python
 Python module to build applications using GEOS and python
@@ -52,7 +52,7 @@ Python module to build applications usin
 %package ruby
 Summary:	Ruby modules for GEOS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}rc3-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description ruby
 Ruby module to build applications using GEOS and ruby
@@ -137,6 +137,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Dec 03 2009 Devrim G?ND?Z <devrim at gunduz.org> - 3.2.0-rc3_1.1
+- Fix spec (dep error).
+
 * Wed Dec 2 2009 Devrim GUNDUZ <devrim at gunduz.org> - 3.2.0rc3-1
 - Update to 3.2.0 rc3
 



From mclasen at fedoraproject.org  Thu Dec  3 14:33:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  3 Dec 2009 14:33:30 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.232,1.233
Message-ID: <20091203143330.A483111C00EE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-screensaver.spec 
Log Message:
Drop an unwanted dependency



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- gnome-screensaver.spec	7 Nov 2009 00:29:02 -0000	1.232
+++ gnome-screensaver.spec	3 Dec 2009 14:33:30 -0000	1.233
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.28.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
@@ -74,7 +74,6 @@ Requires: system-logos
 # since we use it, and pam spams the log if a module is missing
 Requires: gnome-keyring-pam
 Requires: fedora-screensaver-theme
-Requires: fedorainfinity-screensaver-theme
 Conflicts: xscreensaver < 1:5.00-19
 
 %description
@@ -162,6 +161,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-8
+- Drop an unwanted dependency
+
 * Fri Nov  6 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-7
 - Clean up session inhibitors if the owner falls off the bus
 - Add an api to show messages



From pghmcfc at fedoraproject.org  Thu Dec  3 14:34:10 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu,  3 Dec 2009 14:34:10 +0000 (UTC)
Subject: File libpng-1.0.51.tar.bz2 uploaded to lookaside cache by pghmcfc
Message-ID: <20091203143410.8F3BF10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libpng10:

90c9097b78c0b42eea1fea608776ec79  libpng-1.0.51.tar.bz2



From pghmcfc at fedoraproject.org  Thu Dec  3 14:34:55 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu,  3 Dec 2009 14:34:55 +0000 (UTC)
Subject: rpms/libpng10/devel libpng-1.0.51-soname.patch, NONE, 1.1 .cvsignore,
	1.25, 1.26 libpng10.spec, 1.35, 1.36 sources, 1.25,
	1.26 libpng-1.0.48-soname.patch, 1.1, NONE
Message-ID: <20091203143455.6D40A11C00EE@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

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

Modified Files:
	.cvsignore libpng10.spec sources 
Added Files:
	libpng-1.0.51-soname.patch 
Removed Files:
	libpng-1.0.48-soname.patch 
Log Message:
update to 1.0.51

libpng-1.0.51-soname.patch:
 libpng-1.0.48/Makefile.am |    2 +-
 libpng-1.0.48/ltmain.sh   |    2 +-
 libpng-1.0.51/Makefile.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libpng-1.0.51-soname.patch ---
--- libpng-1.0.48/ltmain.sh	2009-07-11 14:39:02.000000000 +0100
+++ libpng-1.0.48/ltmain.sh	2009-08-13 13:59:25.000000000 +0100
@@ -6225,7 +6225,7 @@
 	esac
 
 	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]|[0-9].[0-9][0-9]) ;;
 	*)
 	  func_error "REVISION \`$revision' must be a nonnegative integer"
 	  func_fatal_error "\`$vinfo' is not valid version information"
--- libpng-1.0.48/Makefile.am	2009-08-13 12:12:18.000000000 +0100
+++ libpng-1.0.48/Makefile.am	2009-08-13 13:59:25.000000000 +0100
@@ -45,7 +45,7 @@
 	-version-number 0:@PNGLIB_RELEASE@:0
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_RELEASE@:0
+	-version-number 2:1:0. at PNGLIB_RELEASE@
 
 if HAVE_LD_VERSION_SCRIPT
   # Versioned symbols and restricted exports
--- libpng-1.0.51/Makefile.in	2009-12-03 01:44:54.000000000 +0000
+++ libpng-1.0.51/Makefile.in	2009-12-03 13:02:16.207268595 +0000
@@ -324,7 +324,7 @@
 	0:@PNGLIB_RELEASE@:0 $(am__append_1) $(am__append_2)
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_RELEASE@:0
+	-version-number 2:1:0. at PNGLIB_RELEASE@
 
 @HAVE_LD_VERSION_SCRIPT_FALSE at libpng10_la_DEPENDENCIES = libpng.sym
 @HAVE_LD_VERSION_SCRIPT_TRUE at libpng10_la_DEPENDENCIES = libpng.vers


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	11 Sep 2009 08:14:54 -0000	1.25
+++ .cvsignore	3 Dec 2009 14:34:55 -0000	1.26
@@ -1 +1 @@
-libpng-1.0.50.tar.bz2
+libpng-1.0.51.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- libpng10.spec	11 Sep 2009 08:14:55 -0000	1.35
+++ libpng10.spec	3 Dec 2009 14:34:55 -0000	1.36
@@ -1,12 +1,12 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.50
+Version:	1.0.51
 Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
-Patch0:		libpng-1.0.48-soname.patch
+Patch0:		libpng-1.0.51-soname.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
@@ -111,6 +111,10 @@ libpng10-devel.
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Thu Dec  3 2009 Paul Howarth <paul at city-fan.org> 1.0.51-1
+- update to 1.0.51 (see ANNOUNCE for details)
+- update soname patch to apply to 1.0.51
+
 * Fri Sep 11 2009 Paul Howarth <paul at city-fan.org> 1.0.50-1
 - update to 1.0.50 (garbage removal patch upstreamed)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	11 Sep 2009 08:14:55 -0000	1.25
+++ sources	3 Dec 2009 14:34:55 -0000	1.26
@@ -1 +1 @@
-39152389df9b58ecc02c23850f88308b  libpng-1.0.50.tar.bz2
+90c9097b78c0b42eea1fea608776ec79  libpng-1.0.51.tar.bz2


--- libpng-1.0.48-soname.patch DELETED ---



From jpopelka at fedoraproject.org  Thu Dec  3 14:45:22 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu,  3 Dec 2009 14:45:22 +0000 (UTC)
Subject: rpms/net-tools/devel net-tools.spec,1.104,1.105
Message-ID: <20091203144522.994B711C00EE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

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

Modified Files:
	net-tools.spec 
Log Message:
* Thu Dec  3 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-99
- return defining of BuildRoot even it's no longer necessary
  (https://fedoraproject.org/wiki/Packaging:Guidelines#BuildRoot_tag)
  to silent rpmlint false warning



Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- net-tools.spec	4 Nov 2009 13:25:17 -0000	1.104
+++ net-tools.spec	3 Dec 2009 14:45:22 -0000	1.105
@@ -1,7 +1,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 98%{?dist}
+Release: 99%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
@@ -119,6 +119,7 @@ Patch83: net-tools-1.60-mii-refactor.pat
 
 BuildRequires: gettext, libselinux
 BuildRequires: libselinux-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The net-tools package contains basic networking tools,
@@ -254,6 +255,7 @@ gcc $RPM_OPT_FLAGS -o ether-wake ether-w
 gcc $RPM_OPT_FLAGS -o mii-diag mii-diag.c
 
 %install
+rm -rf %{buildroot}
 mv man/de_DE man/de
 mv man/fr_FR man/fr
 mv man/pt_BR man/pt
@@ -290,6 +292,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ethers
 
 %changelog
+* Thu Dec  3 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-99
+- return defining of BuildRoot even it's no longer necessary
+  (https://fedoraproject.org/wiki/Packaging:Guidelines#BuildRoot_tag)
+  to silent rpmlint false warning
+
 * Wed Nov  4 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-98
 - in mii-tool.c use <linux/mii.h> instead of "mii.h" and fix Bug #491358
 



From twaugh at fedoraproject.org  Thu Dec  3 14:59:37 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 14:59:37 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-localize-statereason.patch, NONE,
	1.1 system-config-printer.spec, 1.314, 1.315
Message-ID: <20091203145937.AA3A911C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12185

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-localize-statereason.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
- Handle RuntimeError when localizing state reason (bug #543937).


system-config-printer-localize-statereason.patch:
 statereason.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-localize-statereason.patch ---
diff -up system-config-printer-1.1.15/statereason.py.localize-statereason system-config-printer-1.1.15/statereason.py
--- system-config-printer-1.1.15/statereason.py.localize-statereason	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/statereason.py	2009-12-03 14:57:17.285051607 +0000
@@ -138,7 +138,7 @@ class StateReason:
                     reason = localized_reason[:-2]
                 else:
                     reason = self.get_reason()
-            except cups.IPPError:
+            except (cups.IPPError, RuntimeError):
                 reason = self.get_reason()
 
             text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- system-config-printer.spec	30 Nov 2009 13:01:52 -0000	1.314
+++ system-config-printer.spec	3 Dec 2009 14:59:37 -0000	1.315
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
+Patch2: system-config-printer-localize-statereason.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
+%patch2 -p1 -b .localize-statereason
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -188,6 +190,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
+- Handle RuntimeError when localizing state reason (bug #543937).
+
 * Mon Nov 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.15-1
 - 1.1.15:
   - Fixed traceback introduced by fix to bug #541882.



From twaugh at fedoraproject.org  Thu Dec  3 15:01:12 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 15:01:12 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-localize-statereason.patch, NONE,
	1.1 system-config-printer.spec, 1.319, 1.320
Message-ID: <20091203150112.9D27711C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12881

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-localize-statereason.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
- Handle RuntimeError when localizing state reason (bug #543937).


system-config-printer-localize-statereason.patch:
 statereason.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-localize-statereason.patch ---
diff -up system-config-printer-1.1.15/statereason.py.localize-statereason system-config-printer-1.1.15/statereason.py
--- system-config-printer-1.1.15/statereason.py.localize-statereason	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/statereason.py	2009-12-03 14:57:17.285051607 +0000
@@ -138,7 +138,7 @@ class StateReason:
                     reason = localized_reason[:-2]
                 else:
                     reason = self.get_reason()
-            except cups.IPPError:
+            except (cups.IPPError, RuntimeError):
                 reason = self.get_reason()
 
             text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- system-config-printer.spec	30 Nov 2009 13:02:49 -0000	1.319
+++ system-config-printer.spec	3 Dec 2009 15:01:12 -0000	1.320
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
+Patch2: system-config-printer-localize-statereason.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
+%patch2 -p1 -b .localize-statereason
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -188,6 +190,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
+- Handle RuntimeError when localizing state reason (bug #543937).
+
 * Mon Nov 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.15-1
 - 1.1.15:
   - Fixed traceback introduced by fix to bug #541882.



From pkgdb at fedoraproject.org  Thu Dec  3 15:01:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:01:56 +0000
Subject: [pkgdb] cherokee: arbiter has requested commit
Message-ID: <20091203150157.27A9E10F865@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on cherokee (Fedora EPEL 4)

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



From caolanm at fedoraproject.org  Thu Dec  3 15:01:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 15:01:54 +0000 (UTC)
Subject: rpms/hunspell-eo/devel hunspell-eo.spec,1.3,1.4
Message-ID: <20091203150154.5FFC611C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	hunspell-eo.spec 
Log Message:
latest version


Index: hunspell-eo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-eo/devel/hunspell-eo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hunspell-eo.spec	25 Jul 2009 02:24:27 -0000	1.3
+++ hunspell-eo.spec	3 Dec 2009 15:01:54 -0000	1.4
@@ -1,13 +1,12 @@
 Name: hunspell-eo
 Summary: Esperanto hunspell dictionaries
-%define upstreamid 20041129
-Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Version: 1.0
+Release: 0.1.dev%{?dist}
 Group: Applications/Text
-Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/eo.zip
-URL: http://wiki.services.openoffice.org/wiki/Dictionaries#Esperanto_.28anywhere.29
+Source: http://extensions.services.openoffice.org/files/3377/1/1.0-dev.oxt
+URL: http://extensions.services.openoffice.org/project/literumilo
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPL+
+License: LGPLv3
 BuildArch: noarch
 BuildRequires: hunspell-devel
 
@@ -25,18 +24,20 @@ chmod -x *
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p eo_l3.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/eo.dic
-cp -p eo_l3.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/eo.aff
+cp -p literumilo.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/eo.dic
+cp -p literumilo.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/eo.aff
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_eo_l3.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Dec 03 2009 Caolan McNamara <caolanm at redhat.com> - 1.0-0.1.dev
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20041129-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Dec  3 15:01:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:01:59 +0000
Subject: [pkgdb] cherokee: arbiter has given up watchcommits
Message-ID: <20091203150159.D8D7410F895@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchcommits acl on cherokee (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:02:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:02:03 +0000
Subject: [pkgdb] cherokee: arbiter has given up watchbugzilla
Message-ID: <20091203150204.0847A10F89C@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchbugzilla acl on cherokee (Fedora EPEL 4)

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



From twaugh at fedoraproject.org  Thu Dec  3 15:03:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 15:03:00 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-localize-statereason.patch, NONE,
	1.1 system-config-printer.spec, 1.308, 1.309
Message-ID: <20091203150300.C726811C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13591

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-localize-statereason.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
- Handle RuntimeError when localizing state reason (bug #543937).


system-config-printer-localize-statereason.patch:
 statereason.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-localize-statereason.patch ---
diff -up system-config-printer-1.1.15/statereason.py.localize-statereason system-config-printer-1.1.15/statereason.py
--- system-config-printer-1.1.15/statereason.py.localize-statereason	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/statereason.py	2009-12-03 14:57:17.285051607 +0000
@@ -138,7 +138,7 @@ class StateReason:
                     reason = localized_reason[:-2]
                 else:
                     reason = self.get_reason()
-            except cups.IPPError:
+            except (cups.IPPError, RuntimeError):
                 reason = self.get_reason()
 
             text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -p -r1.308 -r1.309
--- system-config-printer.spec	30 Nov 2009 13:04:44 -0000	1.308
+++ system-config-printer.spec	3 Dec 2009 15:03:00 -0000	1.309
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch1: system-config-printer-localize-statereason.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -62,6 +64,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .localize-statereason
 
 %build
 %configure
@@ -164,6 +167,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
+- Handle RuntimeError when localizing state reason (bug #543937).
+
 * Mon Nov 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.15-1
 - 1.1.15:
   - Fixed traceback introduced by fix to bug #541882.



From stevetraylen at fedoraproject.org  Thu Dec  3 15:09:13 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 15:09:13 +0000 (UTC)
Subject: rpms/torque/EL-5 pbs-config-multilib, NONE,
	1.1 torque-2.1.10-NI_MAXSERV.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 torque.spec, 1.19, 1.20
Message-ID: <20091203150913.F0ABA11C00EE@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

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

Modified Files:
	.cvsignore sources torque.spec 
Added Files:
	pbs-config-multilib torque-2.1.10-NI_MAXSERV.patch 
Log Message:
Builds at least.



--- NEW FILE pbs-config-multilib ---
#! /bin/sh
 
package="pbs"
version="2.1.8"
 
prefix="/usr"
exec_prefix="/usr"
bindir="/usr/bin"
sbindir="/usr/sbin"
libexecdir="/usr/libexec"
datadir="/usr/share"
sysconfdir="/etc"
sharedstatedir="/usr/com"
localstatedir="/var"
infodir="/usr/share/info"
mandir="/usr/share/man"
includedir="/usr/include/torque"
libs="-ltorque"
 
if test "$#" -eq 0; then
   cat <<EOF
Usage: $package-config OPTIONS
Options:
  --prefix=DIR) : \$prefix
  --package) : \$package
  --version) : \$version
  --cflags) : -I\$includedir
  --libs) : \$libs
  --help) print all the options (not just these)
EOF
fi
 
o=""
h=""
for i in "$@"; do
  case $i in
  --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;
  --prefix)    o="$o $prefix" ;;
  --package)   o="$o $package" ;;
  --version)   o="$o $version" ;;
  --cflags) if test "_$includedir" != "_/usr/include"
          then o="$o -I$includedir" ; fi
  ;;
  --libs)                  o="$o $libs" ;;
  --exec_prefix|--eprefix) o="$o $exec_prefix" ;;
  --bindir)                o="$o $bindir" ;;
  --sbindir)               o="$o $sbindir" ;;
  --libexecdir)            o="$o $libexecdir" ;;
  --datadir)               o="$o $datadir" ;;
  --datainc)               o="$o -I$datadir" ;;
  --datalib)               o="$o -L$datadir" ;;
  --sysconfdir)            o="$o $sysconfdir" ;;
  --sharedstatedir)        o="$o $sharedstatedir" ;;
  --localstatedir)         o="$o $localstatedir" ;;
  --infodir)               o="$o $infodir" ;;
  --mandir)                o="$o $mandir" ;;
  --includedir)            o="$o $includedir" ;;
  --data)                  o="$o -I$datadir/$package" ;;
  --pkgdatadir)            o="$o $datadir/$package" ;;
  --pkgdatainc)            o="$o -I$datadir/$package" ;;
  --pkgdatalib)            o="$o -L$datadir/$package" ;;
  --pkglibinc)             o="$o -I$libinc/$package" ;;
  --pkglibadd)             o="$o -L$libadd/$package" ;;
  --pkgincludedir)         o="$o $includedir/$package" ;;
  --help) h="1" ;;
  -?//*|-?/*//*|-?./*//*|//*|/*//*|./*//*) 
       v=`echo $i | sed -e s://:\$:g`
       v=`eval "echo $v"` 
       o="$o $v" ;; 
  esac
done
 
o=`eval "echo $o"`
o=`eval "echo $o"`
eval "echo $o"
 
if test ! -z "$h" ; then 
cat <<EOF
  --prefix=xxx)      (what is that for anyway?)
  --prefix)         \$prefix        $prefix
  --package)        \$package       $package
  --version)        \$version       $version
  --cflags)         -I\$includedir    unless it is /usr/include
  --libs)           -l\$PACKAGE \$LIBS
  --exec_prefix) or... 
  --eprefix)        \$exec_prefix   $exec_prefix
  --bindir)         \$bindir        $bindir
  --sbindir)        \$sbindir       $sbindir
  --libexecdir)     \$libexecdir    $libexecdir
  --datadir)        \$datadir       $datadir
  --sysconfdir)     \$sysconfdir    $sysconfdir
  --sharedstatedir) \$sharedstatedir$sharedstatedir
  --localstatedir)  \$localstatedir $localstatedir
  --infodir)        \$infodir       $infodir
  --mandir)         \$mandir        $mandir
  --data)           -I\$datadir/\$package
  --pkgdatadir)     \$datadir/\$package
  --pkgincludedir)  \$includedir/\$package
  --help)           generated by ac_create_generic_config.m4
  -I//varname and other inc-targets like --pkgdatainc supported
  -L//varname and other lib-targets, e.g. --pkgdatalib or --libadd
EOF
fi

torque-2.1.10-NI_MAXSERV.patch:
 port_forwarding.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE torque-2.1.10-NI_MAXSERV.patch ---
diff -pruN torque-2.1.10_orig/src/include/port_forwarding.h torque-2.1.10/src/include/port_forwarding.h
--- torque-2.1.10_orig/src/include/port_forwarding.h	2006-10-13 11:25:37.000000000 -0700
+++ torque-2.1.10/src/include/port_forwarding.h	2008-02-14 13:08:05.000000000 -0800
@@ -16,6 +16,10 @@
 #  endif
 #endif /* X_UNIX_PATH */
 
+#ifndef NI_MAXSERV
+# define NI_MAXSERV 32
+#endif /* !NI_MAXSERV */
+
 
 struct pfwdsock {
   int sock;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	13 Mar 2007 19:34:51 -0000	1.12
+++ .cvsignore	3 Dec 2009 15:09:13 -0000	1.13
@@ -1 +1 @@
-torque-2.1.8.tar.gz
+torque-2.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 Mar 2007 19:34:51 -0000	1.12
+++ sources	3 Dec 2009 15:09:13 -0000	1.13
@@ -1 +1 @@
-484cdbd5693ac12268405ca1fb6b549d  torque-2.1.8.tar.gz
+cd1b0e63d9c54d49232f89c3dbd29272  torque-2.4.2.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/torque.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- torque.spec	13 Mar 2007 19:34:51 -0000	1.19
+++ torque.spec	3 Dec 2009 15:09:13 -0000	1.20
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.8
+%define version 2.4.2
 #%%define snap 200604251602
 %define release 1
 
@@ -91,15 +91,20 @@ Source3: xpbsmon.desktop
 Source4: xpbs.png
 Source5: xpbsmon.png
 Source6: README-localhost
-License: Freely redistributable (See PBS_License.txt)
+Source7: pbs-config-multilib
+License: OpenPBS
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
 BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
+Requires(posttrans): /usr/sbin/alternatives
+Requires(preun): /usr/sbin/alternatives
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
+Patch0: torque-2.1.10-NI_MAXSERV.patch
+
 %if %use_tcl
 BuildRequires: tcl-devel
 %endif
@@ -119,28 +124,32 @@ This package holds just a few shared fil
 
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
+%patch0 -p1
 
-%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
+%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
 
 
 %build
-%configure --includedir=%{_includedir}/torque \
+%configure  --disable-gcc-warnings \
+  --includedir=%{_includedir}/torque \
   --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
   --with-sendmail=/usr/sbin/sendmail \
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
+%__cp -vf pbs-config-multilib pbs-config
 %__make %{?_smp_mflags}
  
 
 
 %install
 %__rm -rf "$RPM_BUILD_ROOT"
-%__make DESTDIR=$RPM_BUILD_ROOT install
+%__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 # remove files we don't need
 %__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
 %__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex
-%{__rm} -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
+%__rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
+touch -r pbs-config-multilib $RPM_BUILD_ROOT/%{_bindir}/pbs-config
 
 # install initscripts
 %__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
@@ -171,6 +180,15 @@ desktop-file-install --vendor fedora    
 %endif
 
 
+# alternatives stuff
+for bin in qalter qdel qhold qrls qselect qstat qsub
+do
+    mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-torque
+    mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 \
+       $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-torque.1
+done
+
+
 %clean
 %__rm -rf "$RPM_BUILD_ROOT"
 
@@ -180,16 +198,16 @@ if %__grep -q "PBS services" /etc/servic
    : PBS services already installed
 else
    cat<<-__EOF__>>/etc/services
-	# Standard PBS services
-	pbs           15001/tcp           # pbs server (pbs_server)
-	pbs           15001/udp           # pbs server (pbs_server)
-	pbs_mom       15002/tcp           # mom to/from server
-	pbs_mom       15002/udp           # mom to/from server
-	pbs_resmom    15003/tcp           # mom resource management requests
-	pbs_resmom    15003/udp           # mom resource management requests
-	pbs_sched     15004/tcp           # scheduler
-	pbs_sched     15004/udp           # scheduler
-	__EOF__
+# Standard PBS services
+pbs           15001/tcp           # pbs server (pbs_server)
+pbs           15001/udp           # pbs server (pbs_server)
+pbs_mom       15002/tcp           # mom to/from server
+pbs_mom       15002/udp           # mom to/from server
+pbs_resmom    15003/tcp           # mom resource management requests
+pbs_resmom    15003/udp           # mom resource management requests
+pbs_sched     15004/tcp           # scheduler
+pbs_sched     15004/udp           # scheduler
+__EOF__
 fi
 
 
@@ -216,6 +234,13 @@ This package holds the documentation fil
 %defattr(-, root, root)
 %doc doc/admin_guide.ps
 %{_mandir}/man*/*
+%exclude %{_mandir}/man1/qsub-torque.1.gz
+%exclude %{_mandir}/man1/qalter-torque.1.gz
+%exclude %{_mandir}/man1/qdel-torque.1.gz
+%exclude %{_mandir}/man1/qhold-torque.1.gz
+%exclude %{_mandir}/man1/qrls-torque.1.gz
+%exclude %{_mandir}/man1/qselect-torque.1.gz
+%exclude %{_mandir}/man1/qstat-torque.1.gz
 
 
 %package scheduler
@@ -230,6 +255,7 @@ This package holds the fifo C scheduler.
 %files scheduler
 %defattr(-, root, root)
 %attr(0755, root, root) %{_sbindir}/pbs_sched
+%attr(0755, root, root) %{_sbindir}/qschedd
 %{_initrddir}/pbs_sched
 %dir %{torquehomedir}/sched_priv
 %config(noreplace) %{torquehomedir}/sched_priv/*
@@ -257,6 +283,7 @@ This package holds the server.
 %files server
 %defattr(-, root, root)
 %attr(0755, root, root) %{_sbindir}/pbs_server
+%attr(0755, root, root) %{_sbindir}/qserverd
 %attr(0755, root, root) %{_sbindir}/momctl
 %{_initrddir}/pbs_server
 %{torquehomedir}/server_logs
@@ -284,6 +311,8 @@ This package holds the execute daemon re
 %files mom
 %defattr(-, root, root)
 %attr(0755, root, root) %{_sbindir}/pbs_mom
+%attr(0755, root, root) %{_sbindir}/qnoded
+%attr(0755, root, root) %{_bindir}/pbs_track
 %{_initrddir}/pbs_mom
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
@@ -312,6 +341,34 @@ Provides: pbs-client
 %shared_description
 This package holds the command-line client programs.
 
+%posttrans client
+/usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \
+        --slave %{_mandir}/man1/qsub.1.gz qsub-man \
+                %{_mandir}/man1/qsub-torque.1.gz \
+        --slave %{_bindir}/qalter qalter %{_bindir}/qalter-torque \
+        --slave %{_mandir}/man1/qalter.1.gz qalter-man \
+                %{_mandir}/man1/qalter-torque.1.gz \
+        --slave %{_bindir}/qdel qdel %{_bindir}/qdel-torque \
+        --slave %{_mandir}/man1/qdel.1.gz qdel-man \
+                %{_mandir}/man1/qdel-torque.1.gz \
+        --slave %{_bindir}/qhold qhold %{_bindir}/qhold-torque \
+        --slave %{_mandir}/man1/qhold.1.gz qhold-man \
+                %{_mandir}/man1/qhold-torque.1.gz \
+        --slave %{_bindir}/qrls qrls %{_bindir}/qrls-torque \
+        --slave %{_mandir}/man1/qrls.1.gz qrls-man \
+                %{_mandir}/man1/qrls-torque.1.gz \
+        --slave %{_bindir}/qselect qselect %{_bindir}/qselect-torque \
+        --slave %{_mandir}/man1/qselect.1.gz qselect-man \
+                %{_mandir}/man1/qselect-torque.1.gz \
+        --slave %{_bindir}/qstat qstat %{_bindir}/qstat-torque \
+        --slave %{_mandir}/man1/qstat.1.gz qstat-man \
+                %{_mandir}/man1/qstat-torque.1.gz
+
+%preun client
+if [ $1 -eq 0 ]; then
+  /usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
+fi
+
 %files client
 %defattr(-, root, root)
 %{_bindir}/q*
@@ -322,12 +379,21 @@ This package holds the command-line clie
 %{_bindir}/pbsnodes
 %{_bindir}/printjob
 %{_bindir}/printtracking
+%{_bindir}/printserverdb
 %{_bindir}/tracejob
 %attr(4755 root root) %{_sbindir}/pbs_iff
 %{_sbindir}/pbs_demux
 %if %use_tcl
 %{_bindir}/pbs_tclsh
 %endif
+%{_mandir}/man1/qsub-torque.1.gz
+%{_mandir}/man1/qalter-torque.1.gz
+%{_mandir}/man1/qdel-torque.1.gz
+%{_mandir}/man1/qhold-torque.1.gz
+%{_mandir}/man1/qrls-torque.1.gz
+%{_mandir}/man1/qselect-torque.1.gz
+%{_mandir}/man1/qstat-torque.1.gz
+
 
 %package gui
 Group: Applications/System
@@ -402,6 +468,48 @@ A simple PAM module to authorize users o
 
 
 %changelog
+* Thu Dec 3 2009 Steve Traylen <steve.traylen at cern.ch> - 2.4.2-1
+- Updated to upstream 2.4.2
+- First EPEL build.
+- Add new commands to package.
+   /usr/bin/pbs_track
+   /usr/bin/printserverdb
+   /usr/sbin/qnoded
+   /usr/sbin/qschedd
+   /usr/sbin/qserverd
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Apr 16 2008 Garrick Staples <garrick at usc.edu> 2.1.10-6
+- add alternatives system
+
+* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 2.1.10-5
+- fix missing NI_MAXSERV on fedora9
+
+* Thu Jan  3 2008 Garrick Staples <garrick at usc.edu> 2.1.10-4
+- correct pbs-config build typo
+
+* Thu Jan  3 2008 Garrick Staples <garrick at usc.edu> 2.1.10-3
+- rebuild because tcl was bumped
+
+* Thu Dec 13 2007 Garrick Staples <garrick at usc.edu> 2.1.10-2
+- fix multilib conflicts
+
+* Wed Dec 12 2007 Garrick Staples <garrick at usc.edu> 2.1.10-1
+- bump to 2.1.10
+
+* Wed Oct  3 2007 Garrick Staples <garrick at usc.edu> 2.1.9-1
+- bump to 2.1.9
+
+* Fri Aug 31 2007 Garrick Staples <garrick at usc.edu> 2.1.8-3
+- correct License tag
+
+* Wed Aug 15 2007 Garrick Staples <garrick at usc.edu> 2.1.8-2
+- correct errors in desktop entry files
+
 * Tue Mar 13 2007 Garrick Staples <garrick at usc.edu> 2.1.8-1
 - bump to 2.1.8
 - ensure daemons have the correct path to sendmail



From caolanm at fedoraproject.org  Thu Dec  3 15:09:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 15:09:41 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2093,1.2094
Message-ID: <20091203150941.2C14111C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15854

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#543934 drop kid pseudo-translations


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2093
retrieving revision 1.2094
diff -u -p -r1.2093 -r1.2094
--- openoffice.org.spec	3 Dec 2009 12:44:04 -0000	1.2093
+++ openoffice.org.spec	3 Dec 2009 15:09:40 -0000	1.2094
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 6
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4160,6 +4160,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-6.4
+- Resolves: rhbz#543934 drop "kid" pseudo-translations
+
 * Tue Dec 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-6.3
 - add workspace.pythonssldedux.patch to get CRAM-MD5 working from
   emailmerge



From caolanm at fedoraproject.org  Thu Dec  3 15:09:59 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 15:09:59 +0000 (UTC)
Subject: File 1.0-dev.oxt uploaded to lookaside cache by caolanm
Message-ID: <20091203150959.537F410F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hunspell-eo:

16ea61ab4b2ba78faccc938bb2888525  1.0-dev.oxt



From caolanm at fedoraproject.org  Thu Dec  3 15:10:35 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 15:10:35 +0000 (UTC)
Subject: rpms/hunspell-eo/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091203151035.553A011C03F6@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore sources 
Log Message:
actually add sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-eo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Nov 2008 22:49:54 -0000	1.2
+++ .cvsignore	3 Dec 2009 15:10:35 -0000	1.3
@@ -1 +1 @@
-eo.zip
+1.0-dev.oxt


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-eo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Nov 2008 22:49:54 -0000	1.2
+++ sources	3 Dec 2009 15:10:35 -0000	1.3
@@ -1 +1 @@
-518edcd9a9ecda594e519b2af1fd7e80  eo.zip
+16ea61ab4b2ba78faccc938bb2888525  1.0-dev.oxt



From arbiter at fedoraproject.org  Thu Dec  3 15:14:20 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  3 Dec 2009 15:14:20 +0000 (UTC)
Subject: File cherokee-0.99.31.tar.gz uploaded to lookaside cache by arbiter
Message-ID: <20091203151420.0501910F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for cherokee:

e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz



From arbiter at fedoraproject.org  Thu Dec  3 15:15:53 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  3 Dec 2009 15:15:53 +0000 (UTC)
Subject: rpms/cherokee/devel .cvsignore, 1.14, 1.15 cherokee.spec, 1.24,
	1.25 sources, 1.14, 1.15
Message-ID: <20091203151553.43F6211C00EE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
- New upstream release: 0.99.31



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	1 Dec 2009 08:55:55 -0000	1.14
+++ .cvsignore	3 Dec 2009 15:15:52 -0000	1.15
@@ -1 +1 @@
-cherokee-0.99.30.tar.gz
+cherokee-0.99.31.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- cherokee.spec	1 Dec 2009 08:55:55 -0000	1.24
+++ cherokee.spec	3 Dec 2009 15:15:52 -0000	1.25
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.30
+Version:        0.99.31
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
+- New upstream release: 0.99.31
+
 * Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
 - 0.99.30
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	1 Dec 2009 08:55:55 -0000	1.14
+++ sources	3 Dec 2009 15:15:52 -0000	1.15
@@ -1 +1 @@
-a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz
+e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz



From arbiter at fedoraproject.org  Thu Dec  3 15:16:07 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  3 Dec 2009 15:16:07 +0000 (UTC)
Subject: rpms/cherokee/F-11 .cvsignore, 1.12, 1.13 cherokee.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20091203151607.3367E11C00EE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
- New upstream release: 0.99.31



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Dec 2009 13:09:11 -0000	1.12
+++ .cvsignore	3 Dec 2009 15:16:07 -0000	1.13
@@ -1 +1 @@
-cherokee-0.99.30.tar.gz
+cherokee-0.99.31.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/cherokee.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- cherokee.spec	1 Dec 2009 13:09:11 -0000	1.18
+++ cherokee.spec	3 Dec 2009 15:16:07 -0000	1.19
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.30
+Version:        0.99.31
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
+- New upstream release: 0.99.31
+
 * Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
 - 0.99.30
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Dec 2009 13:09:11 -0000	1.12
+++ sources	3 Dec 2009 15:16:07 -0000	1.13
@@ -1 +1 @@
-a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz
+e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz



From arbiter at fedoraproject.org  Thu Dec  3 15:16:21 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  3 Dec 2009 15:16:21 +0000 (UTC)
Subject: rpms/cherokee/F-12 .cvsignore, 1.13, 1.14 cherokee.spec, 1.24,
	1.25 sources, 1.14, 1.15
Message-ID: <20091203151621.9C7B011C00EE@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18730

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
- New upstream release: 0.99.31



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	1 Dec 2009 13:09:18 -0000	1.13
+++ .cvsignore	3 Dec 2009 15:16:21 -0000	1.14
@@ -1 +1 @@
-cherokee-0.99.30.tar.gz
+cherokee-0.99.31.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/cherokee.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- cherokee.spec	1 Dec 2009 13:09:18 -0000	1.24
+++ cherokee.spec	3 Dec 2009 15:16:21 -0000	1.25
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.30
+Version:        0.99.31
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
+- New upstream release: 0.99.31
+
 * Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
 - 0.99.30
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	1 Dec 2009 13:09:18 -0000	1.14
+++ sources	3 Dec 2009 15:16:21 -0000	1.15
@@ -1 +1 @@
-a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz
+e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz



From arbiter at fedoraproject.org  Thu Dec  3 15:17:32 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  3 Dec 2009 15:17:32 +0000 (UTC)
Subject: rpms/cherokee/EL-5 .cvsignore, 1.12, 1.13 cherokee.spec, 1.15,
	1.16 sources, 1.12, 1.13
Message-ID: <20091203151732.7879A11C00EE@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
- New upstream release: 0.99.31



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Dec 2009 13:09:06 -0000	1.12
+++ .cvsignore	3 Dec 2009 15:17:32 -0000	1.13
@@ -1 +1 @@
-cherokee-0.99.30.tar.gz
+cherokee-0.99.31.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/cherokee.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cherokee.spec	1 Dec 2009 13:09:06 -0000	1.15
+++ cherokee.spec	3 Dec 2009 15:17:32 -0000	1.16
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.30
+Version:        0.99.31
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
+- New upstream release: 0.99.31
+
 * Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
 - 0.99.30
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Dec 2009 13:09:06 -0000	1.12
+++ sources	3 Dec 2009 15:17:32 -0000	1.13
@@ -1 +1 @@
-a3c4d5b258437206087e2b4a8f53afdc  cherokee-0.99.30.tar.gz
+e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz



From jorton at fedoraproject.org  Thu Dec  3 15:20:17 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 15:20:17 +0000 (UTC)
Subject: rpms/httpd/F-12 httpd-2.2.14-CVE-2009-3555.patch, NONE,
	1.1 httpd.spec, 1.140, 1.141 sources, 1.21, 1.22 upstream, 1.14,
	1.15 httpd-2.2.13.tar.gz.asc, 1.1, NONE
Message-ID: <20091203152018.00C6211C03DB@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20424

Modified Files:
	httpd.spec sources upstream 
Added Files:
	httpd-2.2.14-CVE-2009-3555.patch 
Removed Files:
	httpd-2.2.13.tar.gz.asc 
Log Message:
* Thu Dec  3 2009 Joe Orton <jorton at redhat.com> - 2.2.14-1
- update to 2.2.14
- relax permissions on /var/run/httpd (#495780)
- Requires(pre): httpd in mod_ssl subpackage (#543275)
- add partial security fix for CVE-2009-3555 (#533125)


httpd-2.2.14-CVE-2009-3555.patch:
 ssl_engine_init.c   |    5 -
 ssl_engine_io.c     |   17 +++++
 ssl_engine_kernel.c |  151 +++++++++++++++++++++++++++++++---------------------
 ssl_private.h       |   16 +++++
 4 files changed, 123 insertions(+), 66 deletions(-)

--- NEW FILE httpd-2.2.14-CVE-2009-3555.patch ---
--- httpd-2.2.14/modules/ssl/ssl_engine_init.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_init.c
@@ -501,10 +501,7 @@ static void ssl_init_ctx_callbacks(serve
     SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
     SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);
 
-    if (s->loglevel >= APLOG_DEBUG) {
-        /* this callback only logs if LogLevel >= info */
-        SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);
-    }
+    SSL_CTX_set_info_callback(ctx, ssl_callback_Info);
 }
 
 static void ssl_init_ctx_verify(server_rec *s,
--- httpd-2.2.14/modules/ssl/ssl_engine_io.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_io.c
@@ -103,6 +103,7 @@ typedef struct {
     ap_filter_t        *pInputFilter;
     ap_filter_t        *pOutputFilter;
     int                nobuffer; /* non-zero to prevent buffering */
+    SSLConnRec         *config;
 } ssl_filter_ctx_t;
 
 typedef struct {
@@ -193,7 +194,13 @@ static int bio_filter_out_read(BIO *bio,
 static int bio_filter_out_write(BIO *bio, const char *in, int inl)
 {
     bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)(bio->ptr);
-
+    
+    /* Abort early if the client has initiated a renegotiation. */
+    if (outctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        outctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+    
     /* when handshaking we'll have a small number of bytes.
      * max size SSL will pass us here is about 16k.
      * (16413 bytes to be exact)
@@ -466,6 +473,12 @@ static int bio_filter_in_read(BIO *bio, 
     if (!in)
         return 0;
 
+    /* Abort early if the client has initiated a renegotiation. */
+    if (inctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        inctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+
     /* XXX: flush here only required for SSLv2;
      * OpenSSL calls BIO_flush() at the appropriate times for
      * the other protocols.
@@ -1724,6 +1737,8 @@ void ssl_io_filter_init(conn_rec *c, SSL
 
     filter_ctx = apr_palloc(c->pool, sizeof(ssl_filter_ctx_t));
 
+    filter_ctx->config          = myConnConfig(c);
+
     filter_ctx->nobuffer        = 0;
     filter_ctx->pOutputFilter   = ap_add_output_filter(ssl_io_filter,
                                                    filter_ctx, NULL, c);
--- httpd-2.2.14/modules/ssl/ssl_engine_kernel.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_kernel.c
@@ -729,6 +729,10 @@ int ssl_hook_Access(request_rec *r)
                                        (unsigned char *)&id,
                                        sizeof(id));
 
+            /* Toggle the renegotiation state to allow the new
+             * handshake to proceed. */
+            sslconn->reneg_state = RENEG_ALLOW;
+            
             SSL_renegotiate(ssl);
             SSL_do_handshake(ssl);
 
@@ -750,6 +754,8 @@ int ssl_hook_Access(request_rec *r)
             SSL_set_state(ssl, SSL_ST_ACCEPT);
             SSL_do_handshake(ssl);
 
+            sslconn->reneg_state = RENEG_REJECT;
+
             if (SSL_get_state(ssl) != SSL_ST_OK) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Re-negotiation handshake failed: "
@@ -1844,76 +1850,55 @@ void ssl_callback_DelSessionCacheEntry(S
     return;
 }
 
-/*
- * This callback function is executed while OpenSSL processes the
- * SSL handshake and does SSL record layer stuff. We use it to
- * trace OpenSSL's processing in out SSL logfile.
- */
-void ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
+/* Dump debugginfo trace to the log file. */
+static void log_tracing_state(MODSSL_INFO_CB_ARG_TYPE ssl, conn_rec *c, 
+                              server_rec *s, int where, int rc)
 {
-    conn_rec *c;
-    server_rec *s;
-    SSLSrvConfigRec *sc;
-
-    /*
-     * find corresponding server
-     */
-    if (!(c = (conn_rec *)SSL_get_app_data((SSL *)ssl))) {
-        return;
-    }
-
-    s = mySrvFromConn(c);
-    if (!(sc = mySrvConfig(s))) {
-        return;
-    }
-
     /*
      * create the various trace messages
      */
-    if (s->loglevel >= APLOG_DEBUG) {
-        if (where & SSL_CB_HANDSHAKE_START) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Handshake: start", SSL_LIBRARY_NAME);
-        }
-        else if (where & SSL_CB_HANDSHAKE_DONE) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Handshake: done", SSL_LIBRARY_NAME);
-        }
-        else if (where & SSL_CB_LOOP) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Loop: %s",
-                         SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-        }
-        else if (where & SSL_CB_READ) {
+    if (where & SSL_CB_HANDSHAKE_START) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Handshake: start", SSL_LIBRARY_NAME);
+    }
+    else if (where & SSL_CB_HANDSHAKE_DONE) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Handshake: done", SSL_LIBRARY_NAME);
+    }
+    else if (where & SSL_CB_LOOP) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Loop: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_READ) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Read: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_WRITE) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Write: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_ALERT) {
+        char *str = (where & SSL_CB_READ) ? "read" : "write";
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Alert: %s:%s:%s",
+                     SSL_LIBRARY_NAME, str,
+                     SSL_alert_type_string_long(rc),
+                     SSL_alert_desc_string_long(rc));
+    }
+    else if (where & SSL_CB_EXIT) {
+        if (rc == 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Read: %s",
+                         "%s: Exit: failed in %s",
                          SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
         }
-        else if (where & SSL_CB_WRITE) {
+        else if (rc < 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Write: %s",
+                         "%s: Exit: error in %s",
                          SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
         }
-        else if (where & SSL_CB_ALERT) {
-            char *str = (where & SSL_CB_READ) ? "read" : "write";
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Alert: %s:%s:%s",
-                         SSL_LIBRARY_NAME, str,
-                         SSL_alert_type_string_long(rc),
-                         SSL_alert_desc_string_long(rc));
-        }
-        else if (where & SSL_CB_EXIT) {
-            if (rc == 0) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                             "%s: Exit: failed in %s",
-                             SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-            }
-            else if (rc < 0) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                             "%s: Exit: error in %s",
-                             SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-            }
-        }
     }
 
     /*
@@ -1933,6 +1918,52 @@ void ssl_callback_LogTracingState(MODSSL
     }
 }
 
+/*
+ * This callback function is executed while OpenSSL processes the SSL
+ * handshake and does SSL record layer stuff.  It's used to trap
+ * client-initiated renegotiations, and for dumping everything to the
+ * log.
+ */
+void ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
+{
+    conn_rec *c;
+    server_rec *s;
+    SSLConnRec *scr;
+
+    /* Retrieve the conn_rec and the associated SSLConnRec. */
+    if ((c = (conn_rec *)SSL_get_app_data((SSL *)ssl)) == NULL) {
+        return;
+    }
+
+    if ((scr = myConnConfig(c)) == NULL) {
+        return;
+    }
+
+    /* If the reneg state is to reject renegotiations, check the SSL
+     * state machine and move to ABORT if a Client Hello is being
+     * read. */
+    if ((where & SSL_CB_ACCEPT_LOOP) && scr->reneg_state == RENEG_REJECT) {
+        int state = SSL_get_state(ssl);
+        
+        if (state == SSL3_ST_SR_CLNT_HELLO_A 
+            || state == SSL23_ST_SR_CLNT_HELLO_A) {
+            scr->reneg_state = RENEG_ABORT;
+            ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c,
+                          "rejecting client initiated renegotiation");
+        }
+    }
+    /* If the first handshake is complete, change state to reject any
+     * subsequent client-initated renegotiation. */
+    else if ((where & SSL_CB_HANDSHAKE_DONE) && scr->reneg_state == RENEG_INIT) {
+        scr->reneg_state = RENEG_REJECT;
+    }
+
+    s = mySrvFromConn(c);
+    if (s && s->loglevel >= APLOG_DEBUG) {
+        log_tracing_state(ssl, c, s, where, rc);
+    }
+}
+
 #ifndef OPENSSL_NO_TLSEXT
 /*
  * This callback function is executed when OpenSSL encounters an extended
--- httpd-2.2.14/modules/ssl/ssl_private.h.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_private.h
@@ -356,6 +356,20 @@ typedef struct {
     int is_proxy;
     int disabled;
     int non_ssl_request;
+
+    /* Track the handshake/renegotiation state for the connection so
+     * that all client-initiated renegotiations can be rejected, as a
+     * partial fix for CVE-2009-3555. */
+    enum { 
+        RENEG_INIT = 0, /* Before initial handshake */
+        RENEG_REJECT, /* After initial handshake; any client-initiated
+                       * renegotiation should be rejected */
+        RENEG_ALLOW, /* A server-initated renegotiation is taking
+                      * place (as dictated by configuration) */
+        RENEG_ABORT /* Renegotiation initiated by client, abort the
+                     * connection */
+    } reneg_state;
+    
     server_rec *server;
 } SSLConnRec;
 
@@ -574,7 +588,7 @@ int          ssl_callback_proxy_cert(SSL
 int          ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
 SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
 void         ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);
-void         ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE, int, int);
+void         ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE, int, int);
 #ifndef OPENSSL_NO_TLSEXT
 int          ssl_callback_ServerNameIndication(SSL *, int *, modssl_ctx_t *);
 #endif


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-12/httpd.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- httpd.spec	27 Oct 2009 19:10:37 -0000	1.140
+++ httpd.spec	3 Dec 2009 15:20:17 -0000	1.141
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.13
-Release: 4%{?dist}
+Version: 2.2.14
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -37,6 +37,8 @@ Patch25: httpd-2.2.11-selinux.patch
 Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+# Security fixes
+Patch90: httpd-2.2.14-CVE-2009-3555.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -101,6 +103,7 @@ Summary: SSL/TLS module for the Apache H
 Epoch: 1
 BuildRequires: openssl-devel, distcache-devel
 Requires(post): openssl >= 0.9.7f-4, /bin/cat
+Requires(pre): httpd
 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
 Obsoletes: stronghold-mod_ssl
 
@@ -126,6 +129,8 @@ Security (TLS) protocols.
 
 %patch54 -p1 -b .authnoprov
 
+%patch90 -p1 -b .cve3555
+
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
 
@@ -446,7 +451,7 @@ rm -rf $RPM_BUILD_ROOT
 %config %{contentdir}/error/*.var
 %config %{contentdir}/error/include/*.html
 
-%attr(0700,root,root) %dir %{_localstatedir}/run/httpd
+%attr(0710,root,apache) %dir %{_localstatedir}/run/httpd
 %attr(0700,root,root) %dir %{_localstatedir}/log/httpd
 %attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
 %attr(0700,apache,apache) %dir %{_localstatedir}/cache/mod_proxy
@@ -484,6 +489,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Dec  3 2009 Joe Orton <jorton at redhat.com> - 2.2.14-1
+- update to 2.2.14
+- relax permissions on /var/run/httpd (#495780)
+- Requires(pre): httpd in mod_ssl subpackage (#543275)
+- add partial security fix for CVE-2009-3555 (#533125)
+
 * Tue Oct 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.13-4
 - add additional explanatory text to test page to help prevent legal emails to Fedora
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	18 Aug 2009 10:07:03 -0000	1.21
+++ sources	3 Dec 2009 15:20:17 -0000	1.22
@@ -1 +1 @@
-2803e35be6650f5b739e6e91faa824dd  httpd-2.2.13.tar.gz
+2c1e3c7ba00bcaa0163da7b3e66aaa1e  httpd-2.2.14.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-12/upstream,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- upstream	18 Aug 2009 10:07:03 -0000	1.14
+++ upstream	3 Dec 2009 15:20:17 -0000	1.15
@@ -1 +1 @@
-httpd-2.2.13.tar.gz
+httpd-2.2.14.tar.gz


--- httpd-2.2.13.tar.gz.asc DELETED ---



From ellert at fedoraproject.org  Thu Dec  3 15:21:49 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:21:49 +0000 (UTC)
Subject: File globus_duct_common-2.1.tar.gz uploaded to lookaside cache by
	ellert
Message-ID: <20091203152149.2692810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for globus-duct-common:

53b05b2c435180b8062b308b55d48453  globus_duct_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:23:11 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:23:11 +0000 (UTC)
Subject: rpms/globus-duct-common/devel globus-duct-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203152311.1589311C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duct-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21650/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duct-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duct-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duct-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Duct Common

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duct/common/source globus_duct_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duct_common-2.1
#		tar -zcf globus_duct_common-2.1.tar.gz globus_duct_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Duct Common Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Duct Common

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Duct Common Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duct-common-2_1-1_fc11:HEAD:globus-duct-common-2.1-1.fc11.src.rpm:1259853772


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:36:19 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:23:10 -0000	1.2
@@ -0,0 +1 @@
+globus_duct_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:36:19 -0000	1.1
+++ sources	3 Dec 2009 15:23:10 -0000	1.2
@@ -0,0 +1 @@
+53b05b2c435180b8062b308b55d48453  globus_duct_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:24:16 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:24:16 +0000 (UTC)
Subject: rpms/globus-duct-common/F-12 globus-duct-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203152416.333B711C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duct-common/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22151/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duct-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duct-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duct-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Duct Common

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duct/common/source globus_duct_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duct_common-2.1
#		tar -zcf globus_duct_common-2.1.tar.gz globus_duct_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Duct Common Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Duct Common

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Duct Common Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duct-common-2_1-1_fc11:F-12:globus-duct-common-2.1-1.fc11.src.rpm:1259853839


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:36:19 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:24:15 -0000	1.2
@@ -0,0 +1 @@
+globus_duct_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:36:19 -0000	1.1
+++ sources	3 Dec 2009 15:24:16 -0000	1.2
@@ -0,0 +1 @@
+53b05b2c435180b8062b308b55d48453  globus_duct_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:25:11 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:25:11 +0000 (UTC)
Subject: rpms/globus-duct-common/F-11 globus-duct-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203152511.C699311C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duct-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22648/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duct-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duct-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duct-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Duct Common

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duct/common/source globus_duct_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duct_common-2.1
#		tar -zcf globus_duct_common-2.1.tar.gz globus_duct_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Duct Common Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Duct Common

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Duct Common Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duct-common-2_1-1_fc11:F-11:globus-duct-common-2.1-1.fc11.src.rpm:1259853895


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:36:19 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:25:11 -0000	1.2
@@ -0,0 +1 @@
+globus_duct_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:36:19 -0000	1.1
+++ sources	3 Dec 2009 15:25:11 -0000	1.2
@@ -0,0 +1 @@
+53b05b2c435180b8062b308b55d48453  globus_duct_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:26:10 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:26:10 +0000 (UTC)
Subject: rpms/globus-duct-common/EL-5 globus-duct-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203152610.3F2B211C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duct-common/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23078/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duct-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duct-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duct-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Duct Common

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duct/common/source globus_duct_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duct_common-2.1
#		tar -zcf globus_duct_common-2.1.tar.gz globus_duct_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Duct Common Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Duct Common

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Duct Common Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duct-common-2_1-1_fc11:EL-5:globus-duct-common-2.1-1.fc11.src.rpm:1259853947


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:36:19 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:26:10 -0000	1.2
@@ -0,0 +1 @@
+globus_duct_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:36:19 -0000	1.1
+++ sources	3 Dec 2009 15:26:10 -0000	1.2
@@ -0,0 +1 @@
+53b05b2c435180b8062b308b55d48453  globus_duct_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:27:09 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:27:09 +0000 (UTC)
Subject: rpms/globus-duct-common/EL-4 globus-duct-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203152709.5104D11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duct-common/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23628/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duct-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duct-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duct-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Duct Common

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duct/common/source globus_duct_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duct_common-2.1
#		tar -zcf globus_duct_common-2.1.tar.gz globus_duct_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Duct Common Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus Duct Common

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus Duct Common Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duct-common-2_1-1_fc11:EL-4:globus-duct-common-2.1-1.fc11.src.rpm:1259854007


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:36:19 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:27:09 -0000	1.2
@@ -0,0 +1 @@
+globus_duct_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duct-common/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:36:19 -0000	1.1
+++ sources	3 Dec 2009 15:27:09 -0000	1.2
@@ -0,0 +1 @@
+53b05b2c435180b8062b308b55d48453  globus_duct_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:28:35 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:28:35 +0000 (UTC)
Subject: File globus_duroc_common-2.1.tar.gz uploaded to lookaside cache by
	ellert
Message-ID: <20091203152835.D0F4810F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for globus-duroc-common:

91a216a596f08db3b7957a9a7497005e  globus_duroc_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:29:02 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:29:02 +0000 (UTC)
Subject: rpms/globus-duroc-common/devel globus-duroc-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203152902.1776911C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duroc-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24469/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duroc-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duroc-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duroc-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - DUROC Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duroc/common/source globus_duroc_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duroc_common-2.1
#		tar -zcf globus_duroc_common-2.1.tar.gz globus_duroc_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-rsl-devel%{?_isa} >= 2
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - DUROC Common Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-gram-client-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-rsl-devel%{?_isa} >= 2
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
DUROC Common Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
DUROC Common Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duroc-common-2_1-1_fc11:HEAD:globus-duroc-common-2.1-1.fc11.src.rpm:1259854123


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:01 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:29:01 -0000	1.2
@@ -0,0 +1 @@
+globus_duroc_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:01 -0000	1.1
+++ sources	3 Dec 2009 15:29:01 -0000	1.2
@@ -0,0 +1 @@
+91a216a596f08db3b7957a9a7497005e  globus_duroc_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:30:05 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:30:05 +0000 (UTC)
Subject: rpms/globus-duroc-common/F-12 globus-duroc-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153005.3659111C03F6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duroc-common/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24895/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duroc-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duroc-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duroc-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - DUROC Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duroc/common/source globus_duroc_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duroc_common-2.1
#		tar -zcf globus_duroc_common-2.1.tar.gz globus_duroc_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-rsl-devel%{?_isa} >= 2
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - DUROC Common Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-gram-client-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-rsl-devel%{?_isa} >= 2
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
DUROC Common Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
DUROC Common Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duroc-common-2_1-1_fc11:F-12:globus-duroc-common-2.1-1.fc11.src.rpm:1259854186


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:01 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:30:05 -0000	1.2
@@ -0,0 +1 @@
+globus_duroc_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:01 -0000	1.1
+++ sources	3 Dec 2009 15:30:05 -0000	1.2
@@ -0,0 +1 @@
+91a216a596f08db3b7957a9a7497005e  globus_duroc_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:31:00 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:31:00 +0000 (UTC)
Subject: rpms/globus-duroc-common/F-11 globus-duroc-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153100.C92EB11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duroc-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25348/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duroc-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duroc-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duroc-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - DUROC Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duroc/common/source globus_duroc_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duroc_common-2.1
#		tar -zcf globus_duroc_common-2.1.tar.gz globus_duroc_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-rsl-devel%{?_isa} >= 2
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - DUROC Common Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-gram-client-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-rsl-devel%{?_isa} >= 2
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
DUROC Common Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
DUROC Common Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duroc-common-2_1-1_fc11:F-11:globus-duroc-common-2.1-1.fc11.src.rpm:1259854240


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:01 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:31:00 -0000	1.2
@@ -0,0 +1 @@
+globus_duroc_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:01 -0000	1.1
+++ sources	3 Dec 2009 15:31:00 -0000	1.2
@@ -0,0 +1 @@
+91a216a596f08db3b7957a9a7497005e  globus_duroc_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:31:58 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:31:58 +0000 (UTC)
Subject: rpms/globus-duroc-common/EL-5 globus-duroc-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153158.D36BD11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duroc-common/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25769/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duroc-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duroc-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duroc-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - DUROC Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duroc/common/source globus_duroc_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duroc_common-2.1
#		tar -zcf globus_duroc_common-2.1.tar.gz globus_duroc_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-rsl-devel%{?_isa} >= 2
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - DUROC Common Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-gram-client-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-rsl-devel%{?_isa} >= 2
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
DUROC Common Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
DUROC Common Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duroc-common-2_1-1_fc11:EL-5:globus-duroc-common-2.1-1.fc11.src.rpm:1259854303


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:01 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:31:58 -0000	1.2
@@ -0,0 +1 @@
+globus_duroc_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:01 -0000	1.1
+++ sources	3 Dec 2009 15:31:58 -0000	1.2
@@ -0,0 +1 @@
+91a216a596f08db3b7957a9a7497005e  globus_duroc_common-2.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:32:49 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:32:49 +0000 (UTC)
Subject: rpms/globus-duroc-common/EL-4 globus-duroc-common.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153249.B1A2611C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-duroc-common/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26121/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-duroc-common.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-duroc-common.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-duroc-common
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - DUROC Common Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/duroc/common/source globus_duroc_common-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_duroc_common-2.1
#		tar -zcf globus_duroc_common-2.1.tar.gz globus_duroc_common-2.1
Source:		%{_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-nexus-devel%{?_isa} >= 6
BuildRequires:	globus-rsl-devel%{?_isa} >= 2
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - DUROC Common Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-gram-client-devel%{?_isa} >= 3
Requires:	globus-nexus-devel%{?_isa} >= 6
Requires:	globus-rsl-devel%{?_isa} >= 2
Requires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
DUROC Common Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
DUROC Common Library Development Files

%prep
%setup -q -n %{_name}-%{version}

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated


--- NEW FILE import.log ---
globus-duroc-common-2_1-1_fc11:EL-4:globus-duroc-common-2.1-1.fc11.src.rpm:1259854354


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:01 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:32:49 -0000	1.2
@@ -0,0 +1 @@
+globus_duroc_common-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-duroc-common/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:01 -0000	1.1
+++ sources	3 Dec 2009 15:32:49 -0000	1.2
@@ -0,0 +1 @@
+91a216a596f08db3b7957a9a7497005e  globus_duroc_common-2.1.tar.gz



From stevetraylen at fedoraproject.org  Thu Dec  3 15:33:47 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 15:33:47 +0000 (UTC)
Subject: rpms/torque/EL-5 pbs-config-multilib,1.1,1.2
Message-ID: <20091203153347.EF48E11C00EE@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

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

Modified Files:
	pbs-config-multilib 
Log Message:
Update version.



Index: pbs-config-multilib
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/pbs-config-multilib,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pbs-config-multilib	3 Dec 2009 15:09:13 -0000	1.1
+++ pbs-config-multilib	3 Dec 2009 15:33:47 -0000	1.2
@@ -1,7 +1,7 @@
 #! /bin/sh
  
 package="pbs"
-version="2.1.8"
+version="2.4.2"
  
 prefix="/usr"
 exec_prefix="/usr"



From ellert at fedoraproject.org  Thu Dec  3 15:34:09 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:34:09 +0000 (UTC)
Subject: File globus_gass_cache_program-2.7.tar.gz uploaded to lookaside
	cache by ellert
Message-ID: <20091203153409.E688E10F899@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for globus-gass-cache-program:

97db712e000bf64c6394064db4afaf23  globus_gass_cache_program-2.7.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:34:36 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:34:36 +0000 (UTC)
Subject: rpms/globus-gass-cache-program/devel
	globus-gass-cache-program.patch, 
	NONE, 1.1 globus-gass-cache-program.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153436.06C4F11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache-program/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26856/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache-program.patch globus-gass-cache-program.spec 
	import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


globus-gass-cache-program.patch:
 Makefile.am               |    2 +-
 globus-gass-cache         |    8 ++++++--
 globus-gass-cache-destroy |    6 +++++-
 globus-gass-cache-util.pl |    2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

--- NEW FILE globus-gass-cache-program.patch ---
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache globus_gass_cache_program-2.7/globus-gass-cache
--- globus_gass_cache_program-2.7.orig/globus-gass-cache	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache	2009-07-30 23:41:30.527708246 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
-exec $GLOBUS_SH_PERL ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
+exec ${GLOBUS_SH_PERL:-perl} ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy globus_gass_cache_program-2.7/globus-gass-cache-destroy
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-destroy	2009-07-31 00:02:15.091708661 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 #  CVS Information:
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl globus_gass_cache_program-2.7/globus-gass-cache-util.pl
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-util.pl	2009-07-30 23:43:10.133707580 +0200
@@ -49,7 +49,7 @@
 END_OPTIONS
 
 my $Program = $0;
-my $ProgramC = $Globus::Core::Paths::libexecdir . '/globus-gass-cache-util';
+my $ProgramC = $Globus::Core::Paths::sbindir . '/globus-gass-cache-util';
 my $Verbose = 0;
 
 
diff -ur globus_gass_cache_program-2.7.orig/Makefile.am globus_gass_cache_program-2.7/Makefile.am
--- globus_gass_cache_program-2.7.orig/Makefile.am	2004-08-24 17:38:06.000000000 +0200
+++ globus_gass_cache_program-2.7/Makefile.am	2009-07-30 23:39:14.614709802 +0200
@@ -37,7 +37,7 @@
 	globus-gass-cache-destroy
 libexec_SCRIPTS = \
 	globus-gass-cache-util.pl
-libexec_PROGRAMS = \
+sbin_PROGRAMS = \
 	globus-gass-cache-util
 
 # _SOURCES is an automake macro which contains


--- NEW FILE globus-gass-cache-program.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache-program
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Tools to manipulate local and remote GASS caches

Group:		Applications/Internet
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gass/cache_program/source globus_gass_cache_program-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_cache_program-2.7
#		tar -zcf globus_gass_cache_program-2.7.tar.gz globus_gass_cache_program-2.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6818
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-gass-server-ez-devel%{?_isa} >= 2
BuildRequires:	globus-gass-copy-devel%{?_isa} >= 2
BuildRequires:	globus-gass-cache-devel%{?_isa} >= 5
BuildRequires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Tools to manipulate local and remote GASS caches

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-program-2_7-1_fc11:HEAD:globus-gass-cache-program-2.7-1.fc11.src.rpm:1259854457


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:58 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:34:35 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache_program-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:58 -0000	1.1
+++ sources	3 Dec 2009 15:34:35 -0000	1.2
@@ -0,0 +1 @@
+97db712e000bf64c6394064db4afaf23  globus_gass_cache_program-2.7.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:35:35 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:35:35 +0000 (UTC)
Subject: rpms/globus-gass-cache-program/F-12 globus-gass-cache-program.patch,
	NONE, 1.1 globus-gass-cache-program.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153535.54D4A11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache-program/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27437/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache-program.patch globus-gass-cache-program.spec 
	import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


globus-gass-cache-program.patch:
 Makefile.am               |    2 +-
 globus-gass-cache         |    8 ++++++--
 globus-gass-cache-destroy |    6 +++++-
 globus-gass-cache-util.pl |    2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

--- NEW FILE globus-gass-cache-program.patch ---
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache globus_gass_cache_program-2.7/globus-gass-cache
--- globus_gass_cache_program-2.7.orig/globus-gass-cache	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache	2009-07-30 23:41:30.527708246 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
-exec $GLOBUS_SH_PERL ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
+exec ${GLOBUS_SH_PERL:-perl} ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy globus_gass_cache_program-2.7/globus-gass-cache-destroy
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-destroy	2009-07-31 00:02:15.091708661 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 #  CVS Information:
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl globus_gass_cache_program-2.7/globus-gass-cache-util.pl
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-util.pl	2009-07-30 23:43:10.133707580 +0200
@@ -49,7 +49,7 @@
 END_OPTIONS
 
 my $Program = $0;
-my $ProgramC = $Globus::Core::Paths::libexecdir . '/globus-gass-cache-util';
+my $ProgramC = $Globus::Core::Paths::sbindir . '/globus-gass-cache-util';
 my $Verbose = 0;
 
 
diff -ur globus_gass_cache_program-2.7.orig/Makefile.am globus_gass_cache_program-2.7/Makefile.am
--- globus_gass_cache_program-2.7.orig/Makefile.am	2004-08-24 17:38:06.000000000 +0200
+++ globus_gass_cache_program-2.7/Makefile.am	2009-07-30 23:39:14.614709802 +0200
@@ -37,7 +37,7 @@
 	globus-gass-cache-destroy
 libexec_SCRIPTS = \
 	globus-gass-cache-util.pl
-libexec_PROGRAMS = \
+sbin_PROGRAMS = \
 	globus-gass-cache-util
 
 # _SOURCES is an automake macro which contains


--- NEW FILE globus-gass-cache-program.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache-program
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Tools to manipulate local and remote GASS caches

Group:		Applications/Internet
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gass/cache_program/source globus_gass_cache_program-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_cache_program-2.7
#		tar -zcf globus_gass_cache_program-2.7.tar.gz globus_gass_cache_program-2.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6818
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-gass-server-ez-devel%{?_isa} >= 2
BuildRequires:	globus-gass-copy-devel%{?_isa} >= 2
BuildRequires:	globus-gass-cache-devel%{?_isa} >= 5
BuildRequires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Tools to manipulate local and remote GASS caches

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-program-2_7-1_fc11:F-12:globus-gass-cache-program-2.7-1.fc11.src.rpm:1259854519


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:58 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:35:35 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache_program-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:58 -0000	1.1
+++ sources	3 Dec 2009 15:35:35 -0000	1.2
@@ -0,0 +1 @@
+97db712e000bf64c6394064db4afaf23  globus_gass_cache_program-2.7.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:36:31 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:36:31 +0000 (UTC)
Subject: rpms/globus-gass-cache-program/F-11 globus-gass-cache-program.patch,
	NONE, 1.1 globus-gass-cache-program.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153631.196CC11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache-program/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27994/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache-program.patch globus-gass-cache-program.spec 
	import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


globus-gass-cache-program.patch:
 Makefile.am               |    2 +-
 globus-gass-cache         |    8 ++++++--
 globus-gass-cache-destroy |    6 +++++-
 globus-gass-cache-util.pl |    2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

--- NEW FILE globus-gass-cache-program.patch ---
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache globus_gass_cache_program-2.7/globus-gass-cache
--- globus_gass_cache_program-2.7.orig/globus-gass-cache	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache	2009-07-30 23:41:30.527708246 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
-exec $GLOBUS_SH_PERL ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
+exec ${GLOBUS_SH_PERL:-perl} ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy globus_gass_cache_program-2.7/globus-gass-cache-destroy
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-destroy	2009-07-31 00:02:15.091708661 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 #  CVS Information:
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl globus_gass_cache_program-2.7/globus-gass-cache-util.pl
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-util.pl	2009-07-30 23:43:10.133707580 +0200
@@ -49,7 +49,7 @@
 END_OPTIONS
 
 my $Program = $0;
-my $ProgramC = $Globus::Core::Paths::libexecdir . '/globus-gass-cache-util';
+my $ProgramC = $Globus::Core::Paths::sbindir . '/globus-gass-cache-util';
 my $Verbose = 0;
 
 
diff -ur globus_gass_cache_program-2.7.orig/Makefile.am globus_gass_cache_program-2.7/Makefile.am
--- globus_gass_cache_program-2.7.orig/Makefile.am	2004-08-24 17:38:06.000000000 +0200
+++ globus_gass_cache_program-2.7/Makefile.am	2009-07-30 23:39:14.614709802 +0200
@@ -37,7 +37,7 @@
 	globus-gass-cache-destroy
 libexec_SCRIPTS = \
 	globus-gass-cache-util.pl
-libexec_PROGRAMS = \
+sbin_PROGRAMS = \
 	globus-gass-cache-util
 
 # _SOURCES is an automake macro which contains


--- NEW FILE globus-gass-cache-program.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache-program
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Tools to manipulate local and remote GASS caches

Group:		Applications/Internet
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gass/cache_program/source globus_gass_cache_program-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_cache_program-2.7
#		tar -zcf globus_gass_cache_program-2.7.tar.gz globus_gass_cache_program-2.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6818
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-gass-server-ez-devel%{?_isa} >= 2
BuildRequires:	globus-gass-copy-devel%{?_isa} >= 2
BuildRequires:	globus-gass-cache-devel%{?_isa} >= 5
BuildRequires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Tools to manipulate local and remote GASS caches

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-program-2_7-1_fc11:F-11:globus-gass-cache-program-2.7-1.fc11.src.rpm:1259854575


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:58 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:36:30 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache_program-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:58 -0000	1.1
+++ sources	3 Dec 2009 15:36:30 -0000	1.2
@@ -0,0 +1 @@
+97db712e000bf64c6394064db4afaf23  globus_gass_cache_program-2.7.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:37:34 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:37:34 +0000 (UTC)
Subject: rpms/globus-gass-cache-program/EL-5 globus-gass-cache-program.patch,
	NONE, 1.1 globus-gass-cache-program.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153734.E660E11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache-program/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28730/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache-program.patch globus-gass-cache-program.spec 
	import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


globus-gass-cache-program.patch:
 Makefile.am               |    2 +-
 globus-gass-cache         |    8 ++++++--
 globus-gass-cache-destroy |    6 +++++-
 globus-gass-cache-util.pl |    2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

--- NEW FILE globus-gass-cache-program.patch ---
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache globus_gass_cache_program-2.7/globus-gass-cache
--- globus_gass_cache_program-2.7.orig/globus-gass-cache	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache	2009-07-30 23:41:30.527708246 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
-exec $GLOBUS_SH_PERL ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
+exec ${GLOBUS_SH_PERL:-perl} ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy globus_gass_cache_program-2.7/globus-gass-cache-destroy
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-destroy	2009-07-31 00:02:15.091708661 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 #  CVS Information:
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl globus_gass_cache_program-2.7/globus-gass-cache-util.pl
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-util.pl	2009-07-30 23:43:10.133707580 +0200
@@ -49,7 +49,7 @@
 END_OPTIONS
 
 my $Program = $0;
-my $ProgramC = $Globus::Core::Paths::libexecdir . '/globus-gass-cache-util';
+my $ProgramC = $Globus::Core::Paths::sbindir . '/globus-gass-cache-util';
 my $Verbose = 0;
 
 
diff -ur globus_gass_cache_program-2.7.orig/Makefile.am globus_gass_cache_program-2.7/Makefile.am
--- globus_gass_cache_program-2.7.orig/Makefile.am	2004-08-24 17:38:06.000000000 +0200
+++ globus_gass_cache_program-2.7/Makefile.am	2009-07-30 23:39:14.614709802 +0200
@@ -37,7 +37,7 @@
 	globus-gass-cache-destroy
 libexec_SCRIPTS = \
 	globus-gass-cache-util.pl
-libexec_PROGRAMS = \
+sbin_PROGRAMS = \
 	globus-gass-cache-util
 
 # _SOURCES is an automake macro which contains


--- NEW FILE globus-gass-cache-program.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache-program
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Tools to manipulate local and remote GASS caches

Group:		Applications/Internet
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gass/cache_program/source globus_gass_cache_program-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_cache_program-2.7
#		tar -zcf globus_gass_cache_program-2.7.tar.gz globus_gass_cache_program-2.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6818
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-gass-server-ez-devel%{?_isa} >= 2
BuildRequires:	globus-gass-copy-devel%{?_isa} >= 2
BuildRequires:	globus-gass-cache-devel%{?_isa} >= 5
BuildRequires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Tools to manipulate local and remote GASS caches

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-program-2_7-1_fc11:EL-5:globus-gass-cache-program-2.7-1.fc11.src.rpm:1259854637


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:58 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:37:33 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache_program-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:58 -0000	1.1
+++ sources	3 Dec 2009 15:37:34 -0000	1.2
@@ -0,0 +1 @@
+97db712e000bf64c6394064db4afaf23  globus_gass_cache_program-2.7.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:38:31 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:38:31 +0000 (UTC)
Subject: rpms/globus-gass-cache-program/EL-4 globus-gass-cache-program.patch,
	NONE, 1.1 globus-gass-cache-program.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203153831.8840111C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache-program/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29374/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache-program.patch globus-gass-cache-program.spec 
	import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


globus-gass-cache-program.patch:
 Makefile.am               |    2 +-
 globus-gass-cache         |    8 ++++++--
 globus-gass-cache-destroy |    6 +++++-
 globus-gass-cache-util.pl |    2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

--- NEW FILE globus-gass-cache-program.patch ---
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache globus_gass_cache_program-2.7/globus-gass-cache
--- globus_gass_cache_program-2.7.orig/globus-gass-cache	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache	2009-07-30 23:41:30.527708246 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
-exec $GLOBUS_SH_PERL ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
+exec ${GLOBUS_SH_PERL:-perl} ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy globus_gass_cache_program-2.7/globus-gass-cache-destroy
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-destroy	2009-07-31 00:02:15.091708661 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 #  CVS Information:
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl globus_gass_cache_program-2.7/globus-gass-cache-util.pl
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-util.pl	2009-07-30 23:43:10.133707580 +0200
@@ -49,7 +49,7 @@
 END_OPTIONS
 
 my $Program = $0;
-my $ProgramC = $Globus::Core::Paths::libexecdir . '/globus-gass-cache-util';
+my $ProgramC = $Globus::Core::Paths::sbindir . '/globus-gass-cache-util';
 my $Verbose = 0;
 
 
diff -ur globus_gass_cache_program-2.7.orig/Makefile.am globus_gass_cache_program-2.7/Makefile.am
--- globus_gass_cache_program-2.7.orig/Makefile.am	2004-08-24 17:38:06.000000000 +0200
+++ globus_gass_cache_program-2.7/Makefile.am	2009-07-30 23:39:14.614709802 +0200
@@ -37,7 +37,7 @@
 	globus-gass-cache-destroy
 libexec_SCRIPTS = \
 	globus-gass-cache-util.pl
-libexec_PROGRAMS = \
+sbin_PROGRAMS = \
 	globus-gass-cache-util
 
 # _SOURCES is an automake macro which contains


--- NEW FILE globus-gass-cache-program.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache-program
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Tools to manipulate local and remote GASS caches

Group:		Applications/Internet
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gass/cache_program/source globus_gass_cache_program-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_cache_program-2.7
#		tar -zcf globus_gass_cache_program-2.7.tar.gz globus_gass_cache_program-2.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6818
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-gass-server-ez-devel%{?_isa} >= 2
BuildRequires:	globus-gass-copy-devel%{?_isa} >= 2
BuildRequires:	globus-gass-cache-devel%{?_isa} >= 5
BuildRequires:	globus-core%{?_isa} >= 4

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Tools to manipulate local and remote GASS caches

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-program-2_7-1_fc11:EL-4:globus-gass-cache-program-2.7-1.fc11.src.rpm:1259854694


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:58 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:38:31 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache_program-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:58 -0000	1.1
+++ sources	3 Dec 2009 15:38:31 -0000	1.2
@@ -0,0 +1 @@
+97db712e000bf64c6394064db4afaf23  globus_gass_cache_program-2.7.tar.gz



From rdieter at fedoraproject.org  Thu Dec  3 15:38:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 15:38:44 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib-1.1.17-avsync_hack.patch, NONE,
	1.1 xine-lib-1.1.17-no_autopoint.patch, NONE, 1.1
Message-ID: <20091203153844.BDFB111C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29463

Added Files:
	xine-lib-1.1.17-avsync_hack.patch 
	xine-lib-1.1.17-no_autopoint.patch 
Log Message:
awol/rebased patches


xine-lib-1.1.17-avsync_hack.patch:
 audio_out.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE xine-lib-1.1.17-avsync_hack.patch ---
diff -up xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack xine-lib-1.1.17/src/xine-engine/audio_out.c
--- xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack	2009-11-30 19:33:30.000000000 -0600
+++ xine-lib-1.1.17/src/xine-engine/audio_out.c	2009-12-02 09:07:37.622805780 -0600
@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) {
 
     /*
      * calculate gap:
+     *
+     * HACK (rwa): If we have no video stream we do not need an AV sync and so
+     *             we assume a gap of 0. This seems to avoid the skips in the
+     *             first seconds when playing audio-only via the "glitch-free"
+     *             pulseaudio server.
      */
-    gap = in_buf->vpts - hw_vpts;
+    if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) {
+       gap = in_buf->vpts - hw_vpts;
+    } else {
+       gap = 0;
+    }
     lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n",
              hw_vpts, in_buf->vpts, gap);
 

xine-lib-1.1.17-no_autopoint.patch:
 autogen.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xine-lib-1.1.17-no_autopoint.patch ---
diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh
--- xine-lib-1.1.17/autogen.sh.no_autopoint	2009-10-09 09:33:31.000000000 -0500
+++ xine-lib-1.1.17/autogen.sh	2009-12-02 09:15:48.534555467 -0600
@@ -229,10 +229,10 @@ run_aclocal () {
     echo
   fi
   
-  echo $_echo_n " + Running autopoint: $_echo_c"
+  #echo $_echo_n " + Running autopoint: $_echo_c"
   
-  autopoint
-  echo "done." 
+  #autopoint
+  #echo "done." 
 
   echo $_echo_n " + Running aclocal: $_echo_c"
 



From ellert at fedoraproject.org  Thu Dec  3 15:40:07 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:40:07 +0000 (UTC)
Subject: File globus_gram_job_manager_scripts-0.7.tar.gz uploaded to
	lookaside cache by ellert
Message-ID: <20091203154007.F0C3710F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for globus-gram-job-manager-scripts:

f4cfd6a389952ea7326572eda17ef544  globus_gram_job_manager_scripts-0.7.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:40:34 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:40:34 +0000 (UTC)
Subject: rpms/globus-gram-job-manager-scripts/devel
	globus-gram-job-manager-scripts.patch, NONE,
	1.1 globus-gram-job-manager-scripts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203154034.317E711C03F6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-job-manager-scripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30739/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-job-manager-scripts.patch 
	globus-gram-job-manager-scripts.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


globus-gram-job-manager-scripts.patch:
 Makefile.am                  |    4 ++--
 globus-job-manager-script.pl |   21 ++++-----------------
 globus-job-manager-service   |   31 ++++++++-----------------------
 3 files changed, 14 insertions(+), 42 deletions(-)

--- NEW FILE globus-gram-job-manager-scripts.patch ---
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl	2008-08-15 13:19:59.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl	2009-07-31 20:19:41.868499889 +0200
@@ -21,27 +21,14 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
-my $path = $ENV{GLOBUS_LOCATION} . '/lib';
+use Globus::Core::Paths;
+my $path = $Globus::Core::Paths::libdir;
 
 if($^O eq 'irix')
 {
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service globus_gram_job_manager_scripts-0.7/globus-job-manager-service
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-service	2009-07-31 20:27:38.925498454 +0200
@@ -59,29 +59,17 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
 use strict;
 use Getopt::Long;
 use IO::File;
 use File::Copy;
+use Globus::Core::Paths;
 
 my $servicename = 'jobmanager';
 my $method = 'fork';
@@ -90,13 +78,11 @@
 my $help = 0;
 my $gpath;
 
-my $globusdir	= $ENV{GLOBUS_LOCATION};
-my $libexecdir	= "$globusdir/libexec";
-my $sysconfdir	= "$globusdir/etc";
+my $sbindir	= "$Globus::Core::Paths::sbindir";
+my $sysconfdir	= "$Globus::Core::Paths::sysconfdir";
 my $servicesdir	= "$sysconfdir/grid-services";
-my $setupdir = "$globusdir/setup/globus";
 my $job_manager_conf = "$sysconfdir/globus-job-manager.conf";
-my $perljmdir = "$globusdir/lib/perl/Globus/GRAM/JobManager";
+my $perljmdir	= "$Globus::Core::Paths::perlmoduledir/Globus/GRAM/JobManager";
 my $servicename = '';
 my $manager_type = '';
 my $extra_config = '';
@@ -143,7 +129,6 @@
 if( $add )
 {
    &create_services_file("$servicesdir/$servicename");
-   copy("${setupdir}/${manager_type}.pm", "${perljmdir}/");
 
    if($symlink_exists && ! -r "$servicesdir/jobmanager")
    {
@@ -173,7 +158,7 @@
 	exit 4;
     }
     print $service_file "stderr_log,local_cred - ".
-                    "${libexecdir}/globus-job-manager globus-job-manager ".
+		    "${sbindir}/globus-job-manager globus-job-manager ".
 		    "-conf ${job_manager_conf} -type ${manager_type} ".
 		    "-machine-type unknown ".
 		    "-publish-jobs $extra_config\n";
@@ -198,7 +183,7 @@
 {
     my $name = $_[0];
 
-    if("${setupdir}/${name}.pm")
+    if("${perljmdir}/${name}.pm")
     {
 	return 1;
     }
diff -ur globus_gram_job_manager_scripts-0.7.orig/Makefile.am globus_gram_job_manager_scripts-0.7/Makefile.am
--- globus_gram_job_manager_scripts-0.7.orig/Makefile.am	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/Makefile.am	2009-07-31 20:42:05.504495513 +0200
@@ -8,8 +8,8 @@
 	globus-job-manager-script.pl
 
 # Extra directories we install files into
-globusperldir=$(GLOBUS_LOCATION)/lib/perl/Globus/GRAM
-perldocdir=$(GLOBUS_LOCATION)/share/doc/perl/Globus/GRAM
+globusperldir=$(perlmoduledir)/Globus/GRAM
+perldocdir=$(docdir)/$(PACKAGE)/perl/Globus/GRAM
 
 # Where targets are installed
 globusperl_DATA = \


--- NEW FILE globus-gram-job-manager-scripts.spec ---
%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-job-manager-scripts
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Job ManagerScripts

Group:		Applications/Internet
BuildArch:	noarch
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/scripts globus_gram_job_manager_scripts-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-0.7
#		tar -zcf globus_gram_job_manager_scripts-0.7.tar.gz globus_gram_job_manager_scripts-0.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6822
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core

%package doc
Summary:	Globus Toolkit - GRAM Job ManagerScripts Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
GRAM Job ManagerScripts

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Job ManagerScripts Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Don't use /usr/bin/env
sed 's!/usr/bin/env perl!/usr/bin/perl!' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/globus-job-manager-*

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files doc -f package-doc.filelist
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-job-manager-scripts-0_7-1_fc11:HEAD:globus-gram-job-manager-scripts-0.7-1.fc11.src.rpm:1259854815


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:39:24 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:40:33 -0000	1.2
@@ -0,0 +1 @@
+globus_gram_job_manager_scripts-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:39:24 -0000	1.1
+++ sources	3 Dec 2009 15:40:34 -0000	1.2
@@ -0,0 +1 @@
+f4cfd6a389952ea7326572eda17ef544  globus_gram_job_manager_scripts-0.7.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:42:11 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:42:11 +0000 (UTC)
Subject: rpms/globus-gram-job-manager-scripts/F-12
	globus-gram-job-manager-scripts.patch, NONE,
	1.1 globus-gram-job-manager-scripts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203154211.71CFB11C0376@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31602/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-job-manager-scripts.patch 
	globus-gram-job-manager-scripts.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


globus-gram-job-manager-scripts.patch:
 Makefile.am                  |    4 ++--
 globus-job-manager-script.pl |   21 ++++-----------------
 globus-job-manager-service   |   31 ++++++++-----------------------
 3 files changed, 14 insertions(+), 42 deletions(-)

--- NEW FILE globus-gram-job-manager-scripts.patch ---
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl	2008-08-15 13:19:59.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl	2009-07-31 20:19:41.868499889 +0200
@@ -21,27 +21,14 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
-my $path = $ENV{GLOBUS_LOCATION} . '/lib';
+use Globus::Core::Paths;
+my $path = $Globus::Core::Paths::libdir;
 
 if($^O eq 'irix')
 {
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service globus_gram_job_manager_scripts-0.7/globus-job-manager-service
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-service	2009-07-31 20:27:38.925498454 +0200
@@ -59,29 +59,17 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
 use strict;
 use Getopt::Long;
 use IO::File;
 use File::Copy;
+use Globus::Core::Paths;
 
 my $servicename = 'jobmanager';
 my $method = 'fork';
@@ -90,13 +78,11 @@
 my $help = 0;
 my $gpath;
 
-my $globusdir	= $ENV{GLOBUS_LOCATION};
-my $libexecdir	= "$globusdir/libexec";
-my $sysconfdir	= "$globusdir/etc";
+my $sbindir	= "$Globus::Core::Paths::sbindir";
+my $sysconfdir	= "$Globus::Core::Paths::sysconfdir";
 my $servicesdir	= "$sysconfdir/grid-services";
-my $setupdir = "$globusdir/setup/globus";
 my $job_manager_conf = "$sysconfdir/globus-job-manager.conf";
-my $perljmdir = "$globusdir/lib/perl/Globus/GRAM/JobManager";
+my $perljmdir	= "$Globus::Core::Paths::perlmoduledir/Globus/GRAM/JobManager";
 my $servicename = '';
 my $manager_type = '';
 my $extra_config = '';
@@ -143,7 +129,6 @@
 if( $add )
 {
    &create_services_file("$servicesdir/$servicename");
-   copy("${setupdir}/${manager_type}.pm", "${perljmdir}/");
 
    if($symlink_exists && ! -r "$servicesdir/jobmanager")
    {
@@ -173,7 +158,7 @@
 	exit 4;
     }
     print $service_file "stderr_log,local_cred - ".
-                    "${libexecdir}/globus-job-manager globus-job-manager ".
+		    "${sbindir}/globus-job-manager globus-job-manager ".
 		    "-conf ${job_manager_conf} -type ${manager_type} ".
 		    "-machine-type unknown ".
 		    "-publish-jobs $extra_config\n";
@@ -198,7 +183,7 @@
 {
     my $name = $_[0];
 
-    if("${setupdir}/${name}.pm")
+    if("${perljmdir}/${name}.pm")
     {
 	return 1;
     }
diff -ur globus_gram_job_manager_scripts-0.7.orig/Makefile.am globus_gram_job_manager_scripts-0.7/Makefile.am
--- globus_gram_job_manager_scripts-0.7.orig/Makefile.am	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/Makefile.am	2009-07-31 20:42:05.504495513 +0200
@@ -8,8 +8,8 @@
 	globus-job-manager-script.pl
 
 # Extra directories we install files into
-globusperldir=$(GLOBUS_LOCATION)/lib/perl/Globus/GRAM
-perldocdir=$(GLOBUS_LOCATION)/share/doc/perl/Globus/GRAM
+globusperldir=$(perlmoduledir)/Globus/GRAM
+perldocdir=$(docdir)/$(PACKAGE)/perl/Globus/GRAM
 
 # Where targets are installed
 globusperl_DATA = \


--- NEW FILE globus-gram-job-manager-scripts.spec ---
%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-job-manager-scripts
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Job ManagerScripts

Group:		Applications/Internet
BuildArch:	noarch
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/scripts globus_gram_job_manager_scripts-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-0.7
#		tar -zcf globus_gram_job_manager_scripts-0.7.tar.gz globus_gram_job_manager_scripts-0.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6822
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core

%package doc
Summary:	Globus Toolkit - GRAM Job ManagerScripts Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
GRAM Job ManagerScripts

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Job ManagerScripts Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Don't use /usr/bin/env
sed 's!/usr/bin/env perl!/usr/bin/perl!' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/globus-job-manager-*

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files doc -f package-doc.filelist
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-job-manager-scripts-0_7-1_fc11:F-12:globus-gram-job-manager-scripts-0.7-1.fc11.src.rpm:1259854875


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:39:24 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:42:11 -0000	1.2
@@ -0,0 +1 @@
+globus_gram_job_manager_scripts-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:39:24 -0000	1.1
+++ sources	3 Dec 2009 15:42:11 -0000	1.2
@@ -0,0 +1 @@
+f4cfd6a389952ea7326572eda17ef544  globus_gram_job_manager_scripts-0.7.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 15:43:11 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:43:11 +0000 (UTC)
Subject: rpms/globus-gram-job-manager-scripts/F-11
	globus-gram-job-manager-scripts.patch, NONE,
	1.1 globus-gram-job-manager-scripts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203154311.EAFF911C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32111/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-job-manager-scripts.patch 
	globus-gram-job-manager-scripts.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


globus-gram-job-manager-scripts.patch:
 Makefile.am                  |    4 ++--
 globus-job-manager-script.pl |   21 ++++-----------------
 globus-job-manager-service   |   31 ++++++++-----------------------
 3 files changed, 14 insertions(+), 42 deletions(-)

--- NEW FILE globus-gram-job-manager-scripts.patch ---
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl	2008-08-15 13:19:59.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl	2009-07-31 20:19:41.868499889 +0200
@@ -21,27 +21,14 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
-my $path = $ENV{GLOBUS_LOCATION} . '/lib';
+use Globus::Core::Paths;
+my $path = $Globus::Core::Paths::libdir;
 
 if($^O eq 'irix')
 {
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service globus_gram_job_manager_scripts-0.7/globus-job-manager-service
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-service	2009-07-31 20:27:38.925498454 +0200
@@ -59,29 +59,17 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
 use strict;
 use Getopt::Long;
 use IO::File;
 use File::Copy;
+use Globus::Core::Paths;
 
 my $servicename = 'jobmanager';
 my $method = 'fork';
@@ -90,13 +78,11 @@
 my $help = 0;
 my $gpath;
 
-my $globusdir	= $ENV{GLOBUS_LOCATION};
-my $libexecdir	= "$globusdir/libexec";
-my $sysconfdir	= "$globusdir/etc";
+my $sbindir	= "$Globus::Core::Paths::sbindir";
+my $sysconfdir	= "$Globus::Core::Paths::sysconfdir";
 my $servicesdir	= "$sysconfdir/grid-services";
-my $setupdir = "$globusdir/setup/globus";
 my $job_manager_conf = "$sysconfdir/globus-job-manager.conf";
-my $perljmdir = "$globusdir/lib/perl/Globus/GRAM/JobManager";
+my $perljmdir	= "$Globus::Core::Paths::perlmoduledir/Globus/GRAM/JobManager";
 my $servicename = '';
 my $manager_type = '';
 my $extra_config = '';
@@ -143,7 +129,6 @@
 if( $add )
 {
    &create_services_file("$servicesdir/$servicename");
-   copy("${setupdir}/${manager_type}.pm", "${perljmdir}/");
 
    if($symlink_exists && ! -r "$servicesdir/jobmanager")
    {
@@ -173,7 +158,7 @@
 	exit 4;
     }
     print $service_file "stderr_log,local_cred - ".
-                    "${libexecdir}/globus-job-manager globus-job-manager ".
+		    "${sbindir}/globus-job-manager globus-job-manager ".
 		    "-conf ${job_manager_conf} -type ${manager_type} ".
 		    "-machine-type unknown ".
 		    "-publish-jobs $extra_config\n";
@@ -198,7 +183,7 @@
 {
     my $name = $_[0];
 
-    if("${setupdir}/${name}.pm")
+    if("${perljmdir}/${name}.pm")
     {
 	return 1;
     }
diff -ur globus_gram_job_manager_scripts-0.7.orig/Makefile.am globus_gram_job_manager_scripts-0.7/Makefile.am
--- globus_gram_job_manager_scripts-0.7.orig/Makefile.am	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/Makefile.am	2009-07-31 20:42:05.504495513 +0200
@@ -8,8 +8,8 @@
 	globus-job-manager-script.pl
 
 # Extra directories we install files into
-globusperldir=$(GLOBUS_LOCATION)/lib/perl/Globus/GRAM
-perldocdir=$(GLOBUS_LOCATION)/share/doc/perl/Globus/GRAM
+globusperldir=$(perlmoduledir)/Globus/GRAM
+perldocdir=$(docdir)/$(PACKAGE)/perl/Globus/GRAM
 
 # Where targets are installed
 globusperl_DATA = \


--- NEW FILE globus-gram-job-manager-scripts.spec ---
%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-job-manager-scripts
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Job ManagerScripts

Group:		Applications/Internet
BuildArch:	noarch
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/scripts globus_gram_job_manager_scripts-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-0.7
#		tar -zcf globus_gram_job_manager_scripts-0.7.tar.gz globus_gram_job_manager_scripts-0.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6822
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core

%package doc
Summary:	Globus Toolkit - GRAM Job ManagerScripts Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
GRAM Job ManagerScripts

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Job ManagerScripts Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Don't use /usr/bin/env
sed 's!/usr/bin/env perl!/usr/bin/perl!' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/globus-job-manager-*

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files doc -f package-doc.filelist
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-job-manager-scripts-0_7-1_fc11:F-11:globus-gram-job-manager-scripts-0.7-1.fc11.src.rpm:1259854976


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:39:24 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:43:11 -0000	1.2
@@ -0,0 +1 @@
+globus_gram_job_manager_scripts-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:39:24 -0000	1.1
+++ sources	3 Dec 2009 15:43:11 -0000	1.2
@@ -0,0 +1 @@
+f4cfd6a389952ea7326572eda17ef544  globus_gram_job_manager_scripts-0.7.tar.gz



From jzeleny at fedoraproject.org  Thu Dec  3 15:43:14 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu,  3 Dec 2009 15:43:14 +0000 (UTC)
Subject: File dstat-0.7.0.tar.bz2 uploaded to lookaside cache by jzeleny
Message-ID: <20091203154314.28C3210F8A1@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for dstat:

824c0675b514e4d5f3bbb88d0f654b3a  dstat-0.7.0.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec  3 15:43:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:43:30 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20091203154330.7F57210F8A4@bastion2.fedora.phx.redhat.com>

pali has set the commit acl on cherokee (Fedora EPEL 4) to Approved for arbiter

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:43:49 +0000
Subject: [pkgdb] cherokee had acl change status
Message-ID: <20091203154349.F261910F8A1@bastion2.fedora.phx.redhat.com>

pali has set the approveacls acl on cherokee (Fedora EPEL 4) to Approved for arbiter

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



From ellert at fedoraproject.org  Thu Dec  3 15:44:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:44:08 +0000 (UTC)
Subject: rpms/globus-gram-job-manager-scripts/EL-5
	globus-gram-job-manager-scripts.patch, NONE,
	1.1 globus-gram-job-manager-scripts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203154408.A45C111C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32692/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-job-manager-scripts.patch 
	globus-gram-job-manager-scripts.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


globus-gram-job-manager-scripts.patch:
 Makefile.am                  |    4 ++--
 globus-job-manager-script.pl |   21 ++++-----------------
 globus-job-manager-service   |   31 ++++++++-----------------------
 3 files changed, 14 insertions(+), 42 deletions(-)

--- NEW FILE globus-gram-job-manager-scripts.patch ---
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl	2008-08-15 13:19:59.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl	2009-07-31 20:19:41.868499889 +0200
@@ -21,27 +21,14 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
-my $path = $ENV{GLOBUS_LOCATION} . '/lib';
+use Globus::Core::Paths;
+my $path = $Globus::Core::Paths::libdir;
 
 if($^O eq 'irix')
 {
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service globus_gram_job_manager_scripts-0.7/globus-job-manager-service
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-service	2009-07-31 20:27:38.925498454 +0200
@@ -59,29 +59,17 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
 use strict;
 use Getopt::Long;
 use IO::File;
 use File::Copy;
+use Globus::Core::Paths;
 
 my $servicename = 'jobmanager';
 my $method = 'fork';
@@ -90,13 +78,11 @@
 my $help = 0;
 my $gpath;
 
-my $globusdir	= $ENV{GLOBUS_LOCATION};
-my $libexecdir	= "$globusdir/libexec";
-my $sysconfdir	= "$globusdir/etc";
+my $sbindir	= "$Globus::Core::Paths::sbindir";
+my $sysconfdir	= "$Globus::Core::Paths::sysconfdir";
 my $servicesdir	= "$sysconfdir/grid-services";
-my $setupdir = "$globusdir/setup/globus";
 my $job_manager_conf = "$sysconfdir/globus-job-manager.conf";
-my $perljmdir = "$globusdir/lib/perl/Globus/GRAM/JobManager";
+my $perljmdir	= "$Globus::Core::Paths::perlmoduledir/Globus/GRAM/JobManager";
 my $servicename = '';
 my $manager_type = '';
 my $extra_config = '';
@@ -143,7 +129,6 @@
 if( $add )
 {
    &create_services_file("$servicesdir/$servicename");
-   copy("${setupdir}/${manager_type}.pm", "${perljmdir}/");
 
    if($symlink_exists && ! -r "$servicesdir/jobmanager")
    {
@@ -173,7 +158,7 @@
 	exit 4;
     }
     print $service_file "stderr_log,local_cred - ".
-                    "${libexecdir}/globus-job-manager globus-job-manager ".
+		    "${sbindir}/globus-job-manager globus-job-manager ".
 		    "-conf ${job_manager_conf} -type ${manager_type} ".
 		    "-machine-type unknown ".
 		    "-publish-jobs $extra_config\n";
@@ -198,7 +183,7 @@
 {
     my $name = $_[0];
 
-    if("${setupdir}/${name}.pm")
+    if("${perljmdir}/${name}.pm")
     {
 	return 1;
     }
diff -ur globus_gram_job_manager_scripts-0.7.orig/Makefile.am globus_gram_job_manager_scripts-0.7/Makefile.am
--- globus_gram_job_manager_scripts-0.7.orig/Makefile.am	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/Makefile.am	2009-07-31 20:42:05.504495513 +0200
@@ -8,8 +8,8 @@
 	globus-job-manager-script.pl
 
 # Extra directories we install files into
-globusperldir=$(GLOBUS_LOCATION)/lib/perl/Globus/GRAM
-perldocdir=$(GLOBUS_LOCATION)/share/doc/perl/Globus/GRAM
+globusperldir=$(perlmoduledir)/Globus/GRAM
+perldocdir=$(docdir)/$(PACKAGE)/perl/Globus/GRAM
 
 # Where targets are installed
 globusperl_DATA = \


--- NEW FILE globus-gram-job-manager-scripts.spec ---
%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-job-manager-scripts
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Job ManagerScripts

Group:		Applications/Internet
BuildArch:	noarch
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/scripts globus_gram_job_manager_scripts-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-0.7
#		tar -zcf globus_gram_job_manager_scripts-0.7.tar.gz globus_gram_job_manager_scripts-0.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6822
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core

%package doc
Summary:	Globus Toolkit - GRAM Job ManagerScripts Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
GRAM Job ManagerScripts

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Job ManagerScripts Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Don't use /usr/bin/env
sed 's!/usr/bin/env perl!/usr/bin/perl!' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/globus-job-manager-*

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files doc -f package-doc.filelist
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-job-manager-scripts-0_7-1_fc11:EL-5:globus-gram-job-manager-scripts-0.7-1.fc11.src.rpm:1259855032


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:39:24 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:44:08 -0000	1.2
@@ -0,0 +1 @@
+globus_gram_job_manager_scripts-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:39:24 -0000	1.1
+++ sources	3 Dec 2009 15:44:08 -0000	1.2
@@ -0,0 +1 @@
+f4cfd6a389952ea7326572eda17ef544  globus_gram_job_manager_scripts-0.7.tar.gz



From jzeleny at fedoraproject.org  Thu Dec  3 15:44:51 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu,  3 Dec 2009 15:44:51 +0000 (UTC)
Subject: rpms/dstat/F-12 .cvsignore, 1.8, 1.9 dstat-0.6.8-dbus.patch, 1.2,
	1.3 dstat.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <20091203154451.7DB4111C00EE@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/dstat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv773

Modified Files:
	.cvsignore dstat-0.6.8-dbus.patch dstat.spec sources 
Log Message:
rebased to 0.7.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dstat/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Dec 2008 16:15:24 -0000	1.8
+++ .cvsignore	3 Dec 2009 15:44:51 -0000	1.9
@@ -1 +1 @@
-dstat-0.6.9.tar.bz2
+dstat-0.7.0.tar.bz2

dstat-0.6.8-dbus.patch:
 dstat_dbus.py |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Index: dstat-0.6.8-dbus.patch
===================================================================
RCS file: /cvs/extras/rpms/dstat/F-12/dstat-0.6.8-dbus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dstat-0.6.8-dbus.patch	4 Dec 2008 16:15:24 -0000	1.2
+++ dstat-0.6.8-dbus.patch	3 Dec 2009 15:44:51 -0000	1.3
@@ -1,7 +1,7 @@
 diff -up dstat-0.6.8/plugins/dstat_dbus.py.dbus dstat-0.6.8/plugins/dstat_dbus.py
 --- dstat-0.6.8/plugins/dstat_dbus.py.dbus	2007-05-12 06:09:45.000000000 +0200
 +++ dstat-0.6.8/plugins/dstat_dbus.py	2008-09-16 13:26:32.000000000 +0200
-@@ -16,22 +16,23 @@ class dstat_dbus(dstat):
+@@ -18,21 +18,23 @@ class dstat_dbus(dstat):
          try:
              global dbus
              import dbus
@@ -13,7 +13,6 @@ diff -up dstat-0.6.8/plugins/dstat_dbus.
 -                    self.sesbus = None
 -            except:
 -                raise Exception, 'Unable to connect to dbus message bus'
--            return True
          except:
              raise Exception, 'Needs python-dbus module'
 +        try:


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/F-12/dstat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dstat.spec	24 Jul 2009 20:36:12 -0000	1.16
+++ dstat.spec	3 Dec 2009 15:44:51 -0000	1.17
@@ -3,15 +3,14 @@
 
 Summary: Versatile resource statistics tool
 Name: dstat
-Version: 0.6.9
-Release: 5%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/dstat/
 
 Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2
 Patch0: dstat-0.6.8-dbus.patch
-Patch1: dstat-0.6.9-counts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -36,7 +35,6 @@ confusion, less mistakes.
 %prep
 %setup -q
 %patch0 -p1 -b .dbus
-%patch1 -p1 -b .counts
 
 %build
 # Make sure the docs are in unix format
@@ -67,6 +65,9 @@ cd docs
 %{_datadir}/dstat/*.py*
 
 %changelog
+* Thu Dec 03 2009 Jan Zeleny <jzeleny at redhat.com> - 0.7.0-1
+- rebased to 0.7.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dstat/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Dec 2008 16:15:24 -0000	1.8
+++ sources	3 Dec 2009 15:44:51 -0000	1.9
@@ -1 +1 @@
-f0a3cb77d647462f161c44c7071230ec  dstat-0.6.9.tar.bz2
+824c0675b514e4d5f3bbb88d0f654b3a  dstat-0.7.0.tar.bz2



From ellert at fedoraproject.org  Thu Dec  3 15:45:03 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 15:45:03 +0000 (UTC)
Subject: rpms/globus-gram-job-manager-scripts/EL-4
	globus-gram-job-manager-scripts.patch, NONE,
	1.1 globus-gram-job-manager-scripts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203154503.EB3AA11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv938/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-job-manager-scripts.patch 
	globus-gram-job-manager-scripts.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


globus-gram-job-manager-scripts.patch:
 Makefile.am                  |    4 ++--
 globus-job-manager-script.pl |   21 ++++-----------------
 globus-job-manager-service   |   31 ++++++++-----------------------
 3 files changed, 14 insertions(+), 42 deletions(-)

--- NEW FILE globus-gram-job-manager-scripts.patch ---
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl	2008-08-15 13:19:59.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl	2009-07-31 20:19:41.868499889 +0200
@@ -21,27 +21,14 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
-my $path = $ENV{GLOBUS_LOCATION} . '/lib';
+use Globus::Core::Paths;
+my $path = $Globus::Core::Paths::libdir;
 
 if($^O eq 'irix')
 {
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service globus_gram_job_manager_scripts-0.7/globus-job-manager-service
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-service	2009-07-31 20:27:38.925498454 +0200
@@ -59,29 +59,17 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
 use strict;
 use Getopt::Long;
 use IO::File;
 use File::Copy;
+use Globus::Core::Paths;
 
 my $servicename = 'jobmanager';
 my $method = 'fork';
@@ -90,13 +78,11 @@
 my $help = 0;
 my $gpath;
 
-my $globusdir	= $ENV{GLOBUS_LOCATION};
-my $libexecdir	= "$globusdir/libexec";
-my $sysconfdir	= "$globusdir/etc";
+my $sbindir	= "$Globus::Core::Paths::sbindir";
+my $sysconfdir	= "$Globus::Core::Paths::sysconfdir";
 my $servicesdir	= "$sysconfdir/grid-services";
-my $setupdir = "$globusdir/setup/globus";
 my $job_manager_conf = "$sysconfdir/globus-job-manager.conf";
-my $perljmdir = "$globusdir/lib/perl/Globus/GRAM/JobManager";
+my $perljmdir	= "$Globus::Core::Paths::perlmoduledir/Globus/GRAM/JobManager";
 my $servicename = '';
 my $manager_type = '';
 my $extra_config = '';
@@ -143,7 +129,6 @@
 if( $add )
 {
    &create_services_file("$servicesdir/$servicename");
-   copy("${setupdir}/${manager_type}.pm", "${perljmdir}/");
 
    if($symlink_exists && ! -r "$servicesdir/jobmanager")
    {
@@ -173,7 +158,7 @@
 	exit 4;
     }
     print $service_file "stderr_log,local_cred - ".
-                    "${libexecdir}/globus-job-manager globus-job-manager ".
+		    "${sbindir}/globus-job-manager globus-job-manager ".
 		    "-conf ${job_manager_conf} -type ${manager_type} ".
 		    "-machine-type unknown ".
 		    "-publish-jobs $extra_config\n";
@@ -198,7 +183,7 @@
 {
     my $name = $_[0];
 
-    if("${setupdir}/${name}.pm")
+    if("${perljmdir}/${name}.pm")
     {
 	return 1;
     }
diff -ur globus_gram_job_manager_scripts-0.7.orig/Makefile.am globus_gram_job_manager_scripts-0.7/Makefile.am
--- globus_gram_job_manager_scripts-0.7.orig/Makefile.am	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/Makefile.am	2009-07-31 20:42:05.504495513 +0200
@@ -8,8 +8,8 @@
 	globus-job-manager-script.pl
 
 # Extra directories we install files into
-globusperldir=$(GLOBUS_LOCATION)/lib/perl/Globus/GRAM
-perldocdir=$(GLOBUS_LOCATION)/share/doc/perl/Globus/GRAM
+globusperldir=$(perlmoduledir)/Globus/GRAM
+perldocdir=$(docdir)/$(PACKAGE)/perl/Globus/GRAM
 
 # Where targets are installed
 globusperl_DATA = \


--- NEW FILE globus-gram-job-manager-scripts.spec ---
%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-job-manager-scripts
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Job ManagerScripts

Group:		Applications/Internet
BuildArch:	noarch
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/scripts globus_gram_job_manager_scripts-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-0.7
#		tar -zcf globus_gram_job_manager_scripts-0.7.tar.gz globus_gram_job_manager_scripts-0.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6822
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core

%package doc
Summary:	Globus Toolkit - GRAM Job ManagerScripts Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
GRAM Job ManagerScripts

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Job ManagerScripts Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Don't use /usr/bin/env
sed 's!/usr/bin/env perl!/usr/bin/perl!' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/globus-job-manager-*

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files doc -f package-doc.filelist
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-job-manager-scripts-0_7-1_fc11:EL-4:globus-gram-job-manager-scripts-0.7-1.fc11.src.rpm:1259855087


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:39:24 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:45:03 -0000	1.2
@@ -0,0 +1 @@
+globus_gram_job_manager_scripts-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:39:24 -0000	1.1
+++ sources	3 Dec 2009 15:45:03 -0000	1.2
@@ -0,0 +1 @@
+f4cfd6a389952ea7326572eda17ef544  globus_gram_job_manager_scripts-0.7.tar.gz



From jorton at fedoraproject.org  Thu Dec  3 15:46:18 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 15:46:18 +0000 (UTC)
Subject: rpms/httpd/F-11 httpd-2.2.14-CVE-2009-3555.patch, NONE,
	1.1 httpd.spec, 1.136, 1.137 sources, 1.21, 1.22
Message-ID: <20091203154618.1BBE111C00EE@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1570

Modified Files:
	httpd.spec sources 
Added Files:
	httpd-2.2.14-CVE-2009-3555.patch 
Log Message:
* Thu Dec  3 2009 Joe Orton <jorton at redhat.com> - 2.2.14-1
- update to 2.2.14
- relax permissions on /var/run/httpd (#495780)
- Requires(pre): httpd in mod_ssl subpackage (#543275)
- add partial security fix for CVE-2009-3555 (#533125)
- add condrestart in posttrans (#491567)


httpd-2.2.14-CVE-2009-3555.patch:
 ssl_engine_init.c   |    5 -
 ssl_engine_io.c     |   17 +++++
 ssl_engine_kernel.c |  151 +++++++++++++++++++++++++++++++---------------------
 ssl_private.h       |   16 +++++
 4 files changed, 123 insertions(+), 66 deletions(-)

--- NEW FILE httpd-2.2.14-CVE-2009-3555.patch ---
--- httpd-2.2.14/modules/ssl/ssl_engine_init.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_init.c
@@ -501,10 +501,7 @@ static void ssl_init_ctx_callbacks(serve
     SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
     SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);
 
-    if (s->loglevel >= APLOG_DEBUG) {
-        /* this callback only logs if LogLevel >= info */
-        SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);
-    }
+    SSL_CTX_set_info_callback(ctx, ssl_callback_Info);
 }
 
 static void ssl_init_ctx_verify(server_rec *s,
--- httpd-2.2.14/modules/ssl/ssl_engine_io.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_io.c
@@ -103,6 +103,7 @@ typedef struct {
     ap_filter_t        *pInputFilter;
     ap_filter_t        *pOutputFilter;
     int                nobuffer; /* non-zero to prevent buffering */
+    SSLConnRec         *config;
 } ssl_filter_ctx_t;
 
 typedef struct {
@@ -193,7 +194,13 @@ static int bio_filter_out_read(BIO *bio,
 static int bio_filter_out_write(BIO *bio, const char *in, int inl)
 {
     bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)(bio->ptr);
-
+    
+    /* Abort early if the client has initiated a renegotiation. */
+    if (outctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        outctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+    
     /* when handshaking we'll have a small number of bytes.
      * max size SSL will pass us here is about 16k.
      * (16413 bytes to be exact)
@@ -466,6 +473,12 @@ static int bio_filter_in_read(BIO *bio, 
     if (!in)
         return 0;
 
+    /* Abort early if the client has initiated a renegotiation. */
+    if (inctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        inctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+
     /* XXX: flush here only required for SSLv2;
      * OpenSSL calls BIO_flush() at the appropriate times for
      * the other protocols.
@@ -1724,6 +1737,8 @@ void ssl_io_filter_init(conn_rec *c, SSL
 
     filter_ctx = apr_palloc(c->pool, sizeof(ssl_filter_ctx_t));
 
+    filter_ctx->config          = myConnConfig(c);
+
     filter_ctx->nobuffer        = 0;
     filter_ctx->pOutputFilter   = ap_add_output_filter(ssl_io_filter,
                                                    filter_ctx, NULL, c);
--- httpd-2.2.14/modules/ssl/ssl_engine_kernel.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_kernel.c
@@ -729,6 +729,10 @@ int ssl_hook_Access(request_rec *r)
                                        (unsigned char *)&id,
                                        sizeof(id));
 
+            /* Toggle the renegotiation state to allow the new
+             * handshake to proceed. */
+            sslconn->reneg_state = RENEG_ALLOW;
+            
             SSL_renegotiate(ssl);
             SSL_do_handshake(ssl);
 
@@ -750,6 +754,8 @@ int ssl_hook_Access(request_rec *r)
             SSL_set_state(ssl, SSL_ST_ACCEPT);
             SSL_do_handshake(ssl);
 
+            sslconn->reneg_state = RENEG_REJECT;
+
             if (SSL_get_state(ssl) != SSL_ST_OK) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Re-negotiation handshake failed: "
@@ -1844,76 +1850,55 @@ void ssl_callback_DelSessionCacheEntry(S
     return;
 }
 
-/*
- * This callback function is executed while OpenSSL processes the
- * SSL handshake and does SSL record layer stuff. We use it to
- * trace OpenSSL's processing in out SSL logfile.
- */
-void ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
+/* Dump debugginfo trace to the log file. */
+static void log_tracing_state(MODSSL_INFO_CB_ARG_TYPE ssl, conn_rec *c, 
+                              server_rec *s, int where, int rc)
 {
-    conn_rec *c;
-    server_rec *s;
-    SSLSrvConfigRec *sc;
-
-    /*
-     * find corresponding server
-     */
-    if (!(c = (conn_rec *)SSL_get_app_data((SSL *)ssl))) {
-        return;
-    }
-
-    s = mySrvFromConn(c);
-    if (!(sc = mySrvConfig(s))) {
-        return;
-    }
-
     /*
      * create the various trace messages
      */
-    if (s->loglevel >= APLOG_DEBUG) {
-        if (where & SSL_CB_HANDSHAKE_START) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Handshake: start", SSL_LIBRARY_NAME);
-        }
-        else if (where & SSL_CB_HANDSHAKE_DONE) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Handshake: done", SSL_LIBRARY_NAME);
-        }
-        else if (where & SSL_CB_LOOP) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Loop: %s",
-                         SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-        }
-        else if (where & SSL_CB_READ) {
+    if (where & SSL_CB_HANDSHAKE_START) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Handshake: start", SSL_LIBRARY_NAME);
+    }
+    else if (where & SSL_CB_HANDSHAKE_DONE) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Handshake: done", SSL_LIBRARY_NAME);
+    }
+    else if (where & SSL_CB_LOOP) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Loop: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_READ) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Read: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_WRITE) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Write: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_ALERT) {
+        char *str = (where & SSL_CB_READ) ? "read" : "write";
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Alert: %s:%s:%s",
+                     SSL_LIBRARY_NAME, str,
+                     SSL_alert_type_string_long(rc),
+                     SSL_alert_desc_string_long(rc));
+    }
+    else if (where & SSL_CB_EXIT) {
+        if (rc == 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Read: %s",
+                         "%s: Exit: failed in %s",
                          SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
         }
-        else if (where & SSL_CB_WRITE) {
+        else if (rc < 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Write: %s",
+                         "%s: Exit: error in %s",
                          SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
         }
-        else if (where & SSL_CB_ALERT) {
-            char *str = (where & SSL_CB_READ) ? "read" : "write";
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Alert: %s:%s:%s",
-                         SSL_LIBRARY_NAME, str,
-                         SSL_alert_type_string_long(rc),
-                         SSL_alert_desc_string_long(rc));
-        }
-        else if (where & SSL_CB_EXIT) {
-            if (rc == 0) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                             "%s: Exit: failed in %s",
-                             SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-            }
-            else if (rc < 0) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                             "%s: Exit: error in %s",
-                             SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-            }
-        }
     }
 
     /*
@@ -1933,6 +1918,52 @@ void ssl_callback_LogTracingState(MODSSL
     }
 }
 
+/*
+ * This callback function is executed while OpenSSL processes the SSL
+ * handshake and does SSL record layer stuff.  It's used to trap
+ * client-initiated renegotiations, and for dumping everything to the
+ * log.
+ */
+void ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
+{
+    conn_rec *c;
+    server_rec *s;
+    SSLConnRec *scr;
+
+    /* Retrieve the conn_rec and the associated SSLConnRec. */
+    if ((c = (conn_rec *)SSL_get_app_data((SSL *)ssl)) == NULL) {
+        return;
+    }
+
+    if ((scr = myConnConfig(c)) == NULL) {
+        return;
+    }
+
+    /* If the reneg state is to reject renegotiations, check the SSL
+     * state machine and move to ABORT if a Client Hello is being
+     * read. */
+    if ((where & SSL_CB_ACCEPT_LOOP) && scr->reneg_state == RENEG_REJECT) {
+        int state = SSL_get_state(ssl);
+        
+        if (state == SSL3_ST_SR_CLNT_HELLO_A 
+            || state == SSL23_ST_SR_CLNT_HELLO_A) {
+            scr->reneg_state = RENEG_ABORT;
+            ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c,
+                          "rejecting client initiated renegotiation");
+        }
+    }
+    /* If the first handshake is complete, change state to reject any
+     * subsequent client-initated renegotiation. */
+    else if ((where & SSL_CB_HANDSHAKE_DONE) && scr->reneg_state == RENEG_INIT) {
+        scr->reneg_state = RENEG_REJECT;
+    }
+
+    s = mySrvFromConn(c);
+    if (s && s->loglevel >= APLOG_DEBUG) {
+        log_tracing_state(ssl, c, s, where, rc);
+    }
+}
+
 #ifndef OPENSSL_NO_TLSEXT
 /*
  * This callback function is executed when OpenSSL encounters an extended
--- httpd-2.2.14/modules/ssl/ssl_private.h.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_private.h
@@ -356,6 +356,20 @@ typedef struct {
     int is_proxy;
     int disabled;
     int non_ssl_request;
+
+    /* Track the handshake/renegotiation state for the connection so
+     * that all client-initiated renegotiations can be rejected, as a
+     * partial fix for CVE-2009-3555. */
+    enum { 
+        RENEG_INIT = 0, /* Before initial handshake */
+        RENEG_REJECT, /* After initial handshake; any client-initiated
+                       * renegotiation should be rejected */
+        RENEG_ALLOW, /* A server-initated renegotiation is taking
+                      * place (as dictated by configuration) */
+        RENEG_ABORT /* Renegotiation initiated by client, abort the
+                     * connection */
+    } reneg_state;
+    
     server_rec *server;
 } SSLConnRec;
 
@@ -574,7 +588,7 @@ int          ssl_callback_proxy_cert(SSL
 int          ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
 SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
 void         ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);
-void         ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE, int, int);
+void         ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE, int, int);
 #ifndef OPENSSL_NO_TLSEXT
 int          ssl_callback_ServerNameIndication(SSL *, int *, modssl_ctx_t *);
 #endif


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-11/httpd.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- httpd.spec	18 Aug 2009 11:57:27 -0000	1.136
+++ httpd.spec	3 Dec 2009 15:46:17 -0000	1.137
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.13
-Release: 2%{?dist}
+Version: 2.2.14
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -37,6 +37,8 @@ Patch25: httpd-2.2.11-selinux.patch
 Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+# Security fixes
+Patch90: httpd-2.2.14-CVE-2009-3555.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -100,6 +102,7 @@ Summary: SSL/TLS module for the Apache H
 Epoch: 1
 BuildRequires: openssl-devel, distcache-devel
 Requires(post): openssl >= 0.9.7f-4, /bin/cat
+Requires(pre): httpd
 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
 Obsoletes: stronghold-mod_ssl
 
@@ -125,6 +128,8 @@ Security (TLS) protocols.
 
 %patch54 -p1 -b .authnoprov
 
+%patch90 -p1 -b .cve3555
+
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
 
@@ -348,6 +353,9 @@ if [ $1 = 0 ]; then
 	/sbin/chkconfig --del httpd
 fi
 
+%posttrans
+/sbin/service httpd condrestart >/dev/null 2>&1 || :
+
 %define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
 %define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
 
@@ -442,7 +450,7 @@ rm -rf $RPM_BUILD_ROOT
 %config %{contentdir}/error/*.var
 %config %{contentdir}/error/include/*.html
 
-%attr(0700,root,root) %dir %{_localstatedir}/run/httpd
+%attr(0710,root,apache) %dir %{_localstatedir}/run/httpd
 %attr(0700,root,root) %dir %{_localstatedir}/log/httpd
 %attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
 %attr(0700,apache,apache) %dir %{_localstatedir}/cache/mod_proxy
@@ -480,6 +488,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Dec  3 2009 Joe Orton <jorton at redhat.com> - 2.2.14-1
+- update to 2.2.14
+- relax permissions on /var/run/httpd (#495780)
+- Requires(pre): httpd in mod_ssl subpackage (#543275)
+- add partial security fix for CVE-2009-3555 (#533125)
+- add condrestart in posttrans (#491567)
+
 * Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-2
 - use "delaycompress" in logrotate config (#506381)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	18 Aug 2009 10:10:39 -0000	1.21
+++ sources	3 Dec 2009 15:46:17 -0000	1.22
@@ -1 +1 @@
-2803e35be6650f5b739e6e91faa824dd  httpd-2.2.13.tar.gz
+2c1e3c7ba00bcaa0163da7b3e66aaa1e  httpd-2.2.14.tar.gz



From jzeleny at fedoraproject.org  Thu Dec  3 15:49:10 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu,  3 Dec 2009 15:49:10 +0000 (UTC)
Subject: rpms/dstat/devel .cvsignore, 1.8, 1.9 dstat-0.6.8-dbus.patch, 1.2, 
	1.3 dstat.spec, 1.16, 1.17 sources, 1.8,
	1.9 dstat-0.6.9-counts.patch, 1.1, NONE
Message-ID: <20091203154910.3DB9211C00EE@cvs1.fedora.phx.redhat.com>

Author: jzeleny

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

Modified Files:
	.cvsignore dstat-0.6.8-dbus.patch dstat.spec sources 
Removed Files:
	dstat-0.6.9-counts.patch 
Log Message:
rebased to 0.7.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Dec 2008 16:15:24 -0000	1.8
+++ .cvsignore	3 Dec 2009 15:49:09 -0000	1.9
@@ -1 +1 @@
-dstat-0.6.9.tar.bz2
+dstat-0.7.0.tar.bz2

dstat-0.6.8-dbus.patch:
 dstat_dbus.py |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Index: dstat-0.6.8-dbus.patch
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat-0.6.8-dbus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dstat-0.6.8-dbus.patch	4 Dec 2008 16:15:24 -0000	1.2
+++ dstat-0.6.8-dbus.patch	3 Dec 2009 15:49:09 -0000	1.3
@@ -1,7 +1,7 @@
 diff -up dstat-0.6.8/plugins/dstat_dbus.py.dbus dstat-0.6.8/plugins/dstat_dbus.py
 --- dstat-0.6.8/plugins/dstat_dbus.py.dbus	2007-05-12 06:09:45.000000000 +0200
 +++ dstat-0.6.8/plugins/dstat_dbus.py	2008-09-16 13:26:32.000000000 +0200
-@@ -16,22 +16,23 @@ class dstat_dbus(dstat):
+@@ -18,21 +18,23 @@ class dstat_dbus(dstat):
          try:
              global dbus
              import dbus
@@ -13,7 +13,6 @@ diff -up dstat-0.6.8/plugins/dstat_dbus.
 -                    self.sesbus = None
 -            except:
 -                raise Exception, 'Unable to connect to dbus message bus'
--            return True
          except:
              raise Exception, 'Needs python-dbus module'
 +        try:


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dstat.spec	24 Jul 2009 20:36:12 -0000	1.16
+++ dstat.spec	3 Dec 2009 15:49:09 -0000	1.17
@@ -3,15 +3,14 @@
 
 Summary: Versatile resource statistics tool
 Name: dstat
-Version: 0.6.9
-Release: 5%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/dstat/
 
 Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2
 Patch0: dstat-0.6.8-dbus.patch
-Patch1: dstat-0.6.9-counts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -36,7 +35,6 @@ confusion, less mistakes.
 %prep
 %setup -q
 %patch0 -p1 -b .dbus
-%patch1 -p1 -b .counts
 
 %build
 # Make sure the docs are in unix format
@@ -67,6 +65,9 @@ cd docs
 %{_datadir}/dstat/*.py*
 
 %changelog
+* Thu Dec 03 2009 Jan Zeleny <jzeleny at redhat.com> - 0.7.0-1
+- rebased to 0.7.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Dec 2008 16:15:24 -0000	1.8
+++ sources	3 Dec 2009 15:49:09 -0000	1.9
@@ -1 +1 @@
-f0a3cb77d647462f161c44c7071230ec  dstat-0.6.9.tar.bz2
+824c0675b514e4d5f3bbb88d0f654b3a  dstat-0.7.0.tar.bz2


--- dstat-0.6.9-counts.patch DELETED ---



From kasal at fedoraproject.org  Thu Dec  3 15:49:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  3 Dec 2009 15:49:21 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.241,1.242
Message-ID: <20091203154921.2EAAF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	perl.spec 
Log Message:
- be more careful with the libperl.so compatibility symlink (#543936)


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- perl.spec	3 Dec 2009 13:36:22 -0000	1.241
+++ perl.spec	3 Dec 2009 15:49:20 -0000	1.242
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        100%{?dist}
+Release:        101%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1168,8 +1168,8 @@ rm patchlevel.bak
 popd
 
 #FIXME: temporary compatibility hack: for perl(:MODULE_COMPAT_5.10.0)
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}
-ln -s ../../CORE $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE
+ln -s ../../../CORE/libperl.so $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE/libperl.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1197,6 +1197,7 @@ TMPDIR="$PWD/tmp" make test
 
 # libs
 %exclude %{archlib}/CORE/libperl.so
+%exclude %{_libdir}/perl5/5.10.0/%{perl_archname}/CORE/libperl.so
 
 # devel
 %exclude %{_bindir}/enc2xs
@@ -1471,6 +1472,7 @@ TMPDIR="$PWD/tmp" make test
 %files libs
 %defattr(-,root,root)
 %{archlib}/CORE/libperl.so
+%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE/libperl.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -1787,6 +1789,9 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Dec  3 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-101
+- be more careful with the libperl.so compatibility symlink (#543936)
+
 * Wed Dec  2 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-100
 - new upstream version
 - release number must be high, because of stale version numbers of some



From xhorak at fedoraproject.org  Thu Dec  3 15:49:49 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 15:49:49 +0000 (UTC)
Subject: File thunderbird-3.0rc2.source.tar.bz2 uploaded to lookaside cache
	by xhorak
Message-ID: <20091203154949.311BB10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sunbird:

35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2



From stevetraylen at fedoraproject.org  Thu Dec  3 15:52:13 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 15:52:13 +0000 (UTC)
Subject: rpms/torque/EL-5 torque.spec, 1.20,
	1.21 torque-2.1.10-NI_MAXSERV.patch, 1.1, NONE
Message-ID: <20091203155213.4CC3211C00EE@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

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

Modified Files:
	torque.spec 
Removed Files:
	torque-2.1.10-NI_MAXSERV.patch 
Log Message:
NI_MAXSERV not needed.



Index: torque.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/torque.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- torque.spec	3 Dec 2009 15:09:13 -0000	1.20
+++ torque.spec	3 Dec 2009 15:52:13 -0000	1.21
@@ -103,8 +103,6 @@ Requires(preun): /usr/sbin/alternatives
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
-Patch0: torque-2.1.10-NI_MAXSERV.patch
-
 %if %use_tcl
 BuildRequires: tcl-devel
 %endif
@@ -124,7 +122,6 @@ This package holds just a few shared fil
 
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
-%patch0 -p1
 
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
 
@@ -477,6 +474,7 @@ A simple PAM module to authorize users o
    /usr/sbin/qnoded
    /usr/sbin/qschedd
    /usr/sbin/qserverd
+- Remove torque-2.1.10-NI_MAXSERV.patch as not needed any more.
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- torque-2.1.10-NI_MAXSERV.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Dec  3 15:52:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:52:15 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203155215.2557410F895@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora 8 is now owned by rishi

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:52:20 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203155220.9E07310F89C@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora 9 is now owned by jgu

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:52:25 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203155225.732B310F8A5@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora 10 is now owned by rishi

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



From devrim at fedoraproject.org  Thu Dec  3 15:53:40 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  3 Dec 2009 15:53:40 +0000 (UTC)
Subject: File pgadmin3-1.10.1.tar.gz uploaded to lookaside cache by devrim
Message-ID: <20091203155340.38AC610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pgadmin3:

9909334d453483becc534c1eb74a6d63  pgadmin3-1.10.1.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 15:54:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:54:11 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203155411.D2CF110F895@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora devel is now owned by rishi

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



From devrim at fedoraproject.org  Thu Dec  3 15:54:24 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  3 Dec 2009 15:54:24 +0000 (UTC)
Subject: rpms/pgadmin3/devel .cvsignore, 1.12, 1.13 pgadmin3.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20091203155424.4388611C00EE@cvs1.fedora.phx.redhat.com>

Author: devrim

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

Modified Files:
	.cvsignore pgadmin3.spec sources 
Log Message:
Update to 1.10.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jun 2009 15:02:11 -0000	1.12
+++ .cvsignore	3 Dec 2009 15:54:23 -0000	1.13
@@ -1 +1 @@
-pgadmin3-1.10.0.tar.gz
+pgadmin3-1.10.1.tar.gz


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pgadmin3.spec	26 Jul 2009 17:53:36 -0000	1.24
+++ pgadmin3.spec	3 Dec 2009 15:54:23 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.10.0
-Release:	2%{?dist}
+Version:	1.10.1
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source:		ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Thu Dec 3 2009 Devrim GUNDUZ <devrim at gunduz.org> 1.10.1-1
+- Update to 1.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Jun 2009 15:02:11 -0000	1.12
+++ sources	3 Dec 2009 15:54:24 -0000	1.13
@@ -1 +1 @@
-3f2032c78657e3db4e0719613751060c  pgadmin3-1.10.0.tar.gz
+9909334d453483becc534c1eb74a6d63  pgadmin3-1.10.1.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 15:54:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:54:24 +0000
Subject: [pkgdb] emacs: kklic has given up watchbugzilla
Message-ID: <20091203155424.E3F3010F89E@bastion2.fedora.phx.redhat.com>

kklic has given up the watchbugzilla acl on emacs (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:54:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:54:26 +0000
Subject: [pkgdb] emacs: kklic has given up watchbugzilla
Message-ID: <20091203155426.A2AD710F8A5@bastion2.fedora.phx.redhat.com>

kklic has given up the watchbugzilla acl on emacs (Fedora 12)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:54:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:54:31 +0000
Subject: [pkgdb] emacs: kklic has given up watchbugzilla
Message-ID: <20091203155431.8052310F8AA@bastion2.fedora.phx.redhat.com>

kklic has given up the watchbugzilla acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:55:33 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203155533.F08D110F896@bastion2.fedora.phx.redhat.com>

dnovotny has set the watchcommits acl on emacs (Fedora 11) to Approved for kklic

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:55:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:55:38 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203155538.8E76C10F89E@bastion2.fedora.phx.redhat.com>

dnovotny has set the commit acl on emacs (Fedora 11) to Approved for kklic

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:55:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:55:41 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203155541.AE75410F8A5@bastion2.fedora.phx.redhat.com>

dnovotny has set the approveacls acl on emacs (Fedora 11) to Approved for kklic

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:55:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:55:46 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203155546.77EEB10F8AA@bastion2.fedora.phx.redhat.com>

dnovotny has set the watchcommits acl on emacs (Fedora 12) to Approved for kklic

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:55:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:55:50 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203155550.B5F4510F8AD@bastion2.fedora.phx.redhat.com>

dnovotny has set the commit acl on emacs (Fedora 12) to Approved for kklic

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:55:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:55:53 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203155553.B040E10F8B3@bastion2.fedora.phx.redhat.com>

dnovotny has set the approveacls acl on emacs (Fedora 12) to Approved for kklic

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



From jsafrane at fedoraproject.org  Thu Dec  3 15:57:26 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu,  3 Dec 2009 15:57:26 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec, 1.196, 1.197 net-snmpd.init, 1.8,
	1.9 net-snmpd.sysconfig, 1.2, 1.3
Message-ID: <20091203155726.E091711C00EE@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7731

Modified Files:
	net-snmp.spec net-snmpd.init net-snmpd.sysconfig 
Log Message:
lower the default log level of snmpd to get rid of the debug messages


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- net-snmp.spec	3 Dec 2009 14:28:20 -0000	1.196
+++ net-snmp.spec	3 Dec 2009 15:57:26 -0000	1.197
@@ -404,6 +404,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Wed Dec  2 2009 Jan Safranek <jsafrane at redhat.com> 1:5.5-4
 - fix udpTable indexes on big-endian systems (#543352)
 - fix snmptrapd init script to survive with empty /etc/sysconfig/snmptrapd
+- lower the default log level of snmpd to get rid of the debug messages
 
 * Wed Nov 25 2009 Jan Safranek <jsafrane at redhat.com>  1:5.5-3
 - prepare the .spec file for review


Index: net-snmpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmpd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- net-snmpd.init	14 Sep 2009 09:53:25 -0000	1.8
+++ net-snmpd.init	3 Dec 2009 15:57:26 -0000	1.9
@@ -25,7 +25,7 @@
 . /etc/init.d/functions
 
 
-OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd.pid"
+OPTIONS="-LS0-6d -Lf /dev/null -p /var/run/snmpd.pid"
 if [ -e /etc/sysconfig/snmpd ]; then
   . /etc/sysconfig/snmpd
 fi


Index: net-snmpd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmpd.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- net-snmpd.sysconfig	1 Jul 2009 11:03:31 -0000	1.2
+++ net-snmpd.sysconfig	3 Dec 2009 15:57:26 -0000	1.3
@@ -1,2 +1,2 @@
 # snmpd command line options
-# OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd.pid"
+# OPTIONS="-LS0-6d -Lf /dev/null -p /var/run/snmpd.pid"



From pkgdb at fedoraproject.org  Thu Dec  3 15:57:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:57:31 +0000
Subject: [pkgdb] emacs: kklic has given up watchcommits
Message-ID: <20091203155731.E428610F895@bastion2.fedora.phx.redhat.com>

kklic has given up the watchcommits acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:57:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:57:56 +0000
Subject: [pkgdb] emacs: kklic has requested commit
Message-ID: <20091203155756.9C7DF10F8A6@bastion2.fedora.phx.redhat.com>

kklic has requested the commit acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:57:58 +0000
Subject: [pkgdb] emacs: kklic has requested approveacls
Message-ID: <20091203155759.0E3A910F8AB@bastion2.fedora.phx.redhat.com>

kklic has requested the approveacls acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:58:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:58:08 +0000
Subject: [pkgdb] emacs: dnovotny has given up watchbugzilla
Message-ID: <20091203155808.C2B9D10F8B0@bastion2.fedora.phx.redhat.com>

dnovotny has given up the watchbugzilla acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:58:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:58:10 +0000
Subject: [pkgdb] emacs: dnovotny has given up watchcommits
Message-ID: <20091203155810.9F2B710F8B4@bastion2.fedora.phx.redhat.com>

dnovotny has given up the watchcommits acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:58:12 +0000
Subject: [pkgdb] emacs: dnovotny has requested commit
Message-ID: <20091203155813.0D08F10F8B5@bastion2.fedora.phx.redhat.com>

dnovotny has requested the commit acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 15:58:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 15:58:15 +0000
Subject: [pkgdb] emacs: dnovotny has requested approveacls
Message-ID: <20091203155816.0B23010F8B8@bastion2.fedora.phx.redhat.com>

dnovotny has requested the approveacls acl on emacs (Fedora devel)

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



From xhorak at fedoraproject.org  Thu Dec  3 15:59:33 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 15:59:33 +0000 (UTC)
Subject: rpms/sunbird/F-11 .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 sunbird.spec, 1.36, 1.37
Message-ID: <20091203155933.A675D11C00EE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	25 Nov 2009 15:01:07 -0000	1.16
+++ .cvsignore	3 Dec 2009 15:59:33 -0000	1.17
@@ -2,3 +2,4 @@ thunderbird-3.0b3-source.tar.bz2
 sunbird-l10n.tar
 thunderbird-3.0b4-source.tar.bz2
 thunderbird-3.0rc1.source.tar.bz2
+thunderbird-3.0rc2.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	25 Nov 2009 15:01:07 -0000	1.16
+++ sources	3 Dec 2009 15:59:33 -0000	1.17
@@ -1,2 +1,2 @@
 70d060b6f6331c8cf123a39628ee859e  sunbird-l10n.tar
-49028d9de4c4e167d469bbd4c6665b8c  thunderbird-3.0rc1.source.tar.bz2
+35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sunbird.spec	25 Nov 2009 15:01:08 -0000	1.36
+++ sunbird.spec	3 Dec 2009 15:59:33 -0000	1.37
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.9.20090715hg%{?dist}
+Release:        0.10.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0rc1.source.tar.bz2
+Source0:        thunderbird-3.0rc2.source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -71,7 +71,7 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-2.9.rc1
+Requires:       thunderbird >= 3.0-2.10.rc2
 # Do we really need this?
 #Requires:       thunderbird < 3.0-2.7.b5
 
@@ -296,6 +296,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.10.2000715hg
+- Rebuild against new Thunderbird
+
 * Wed Nov 25 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.9.20090715hg
 - Rebuild against new Thunderbird
 



From xhorak at fedoraproject.org  Thu Dec  3 15:59:49 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 15:59:49 +0000 (UTC)
Subject: rpms/sunbird/F-12 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 sunbird.spec, 1.42, 1.43
Message-ID: <20091203155949.4535B11C00EE@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8705

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	25 Nov 2009 13:22:32 -0000	1.17
+++ .cvsignore	3 Dec 2009 15:59:48 -0000	1.18
@@ -1,3 +1,4 @@
 sunbird-l10n.tar
 thunderbird-3.0b4-source.tar.bz2
 thunderbird-3.0rc1.source.tar.bz2
+thunderbird-3.0rc2.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	25 Nov 2009 13:22:32 -0000	1.17
+++ sources	3 Dec 2009 15:59:48 -0000	1.18
@@ -1,2 +1,2 @@
 1d7d4eb4aaea7e7fae9eba3dcc995161  sunbird-l10n.tar
-49028d9de4c4e167d469bbd4c6665b8c  thunderbird-3.0rc1.source.tar.bz2
+35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-12/sunbird.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sunbird.spec	25 Nov 2009 13:22:32 -0000	1.42
+++ sunbird.spec	3 Dec 2009 15:59:49 -0000	1.43
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.14.20090916hg%{?dist}
+Release:        0.15.20090916hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0rc1.source.tar.bz2
+Source0:        thunderbird-3.0rc2.source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -71,7 +71,7 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-3.12.rc1
+Requires:       thunderbird >= 3.0-3.13.rc2
 #Requires:       thunderbird < 3.0-3.9.b5
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
@@ -295,6 +295,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.15.20090916hg
+- Rebuild against new Thunderbird
+
 * Wed Nov 25 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.14.20090916hg
 - Rebuild against new Thunderbird
 



From xhorak at fedoraproject.org  Thu Dec  3 16:00:04 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  3 Dec 2009 16:00:04 +0000 (UTC)
Subject: rpms/sunbird/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 sunbird.spec, 1.41, 1.42
Message-ID: <20091203160004.75E2211C03F6@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	25 Nov 2009 14:16:05 -0000	1.17
+++ .cvsignore	3 Dec 2009 16:00:04 -0000	1.18
@@ -1,3 +1,4 @@
 sunbird-l10n.tar
 thunderbird-3.0b4-source.tar.bz2
 thunderbird-3.0rc1.source.tar.bz2
+thunderbird-3.0rc2.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	25 Nov 2009 14:16:05 -0000	1.17
+++ sources	3 Dec 2009 16:00:04 -0000	1.18
@@ -1,2 +1,2 @@
 1d7d4eb4aaea7e7fae9eba3dcc995161  sunbird-l10n.tar
-49028d9de4c4e167d469bbd4c6665b8c  thunderbird-3.0rc1.source.tar.bz2
+35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sunbird.spec	25 Nov 2009 14:11:02 -0000	1.41
+++ sunbird.spec	3 Dec 2009 16:00:04 -0000	1.42
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.14.20090916hg%{?dist}
+Release:        0.15.20090916hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0rc1.source.tar.bz2
+Source0:        thunderbird-3.0rc2.source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -71,7 +71,7 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-3.12.rc1
+Requires:       thunderbird >= 3.0-3.13.rc2
 #Requires:       thunderbird < 3.0-3.9.b5
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
@@ -295,6 +295,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.15.20090916hg
+- Rebuild against new Thunderbird
+
 * Wed Nov 25 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.14.20090916hg
 - Rebuild against new Thunderbird
 



From pkgdb at fedoraproject.org  Thu Dec  3 16:03:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:03:19 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203160319.7A0BB10F899@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora 11 is now owned by rishi

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:03:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:03:24 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203160324.63D4F10F8A1@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora 12 is now owned by rishi

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



From jorton at fedoraproject.org  Thu Dec  3 16:11:28 2009
From: jorton at fedoraproject.org (jorton)
Date: Thu,  3 Dec 2009 16:11:28 +0000 (UTC)
Subject: rpms/httpd/F-10 httpd-2.2.11-corelimit.patch, NONE,
	1.1 httpd-2.2.11-selinux.patch, NONE,
	1.1 httpd-2.2.11-xfsz.patch, NONE,
	1.1 httpd-2.2.14-CVE-2009-3555.patch, NONE, 1.1 httpd.spec,
	1.129, 1.130 sources, 1.21, 1.22 httpd-2.0.40-xfsz.patch, 1.5,
	NONE httpd-2.0.48-corelimit.patch, 1.2,
	NONE httpd-2.0.54-selinux.patch, 1.3,
	NONE httpd-2.2.4-oldflush.patch, 1.3, NONE
Message-ID: <20091203161128.1EFE511C00EE@cvs1.fedora.phx.redhat.com>

Author: jorton

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

Modified Files:
	httpd.spec sources 
Added Files:
	httpd-2.2.11-corelimit.patch httpd-2.2.11-selinux.patch 
	httpd-2.2.11-xfsz.patch httpd-2.2.14-CVE-2009-3555.patch 
Removed Files:
	httpd-2.0.40-xfsz.patch httpd-2.0.48-corelimit.patch 
	httpd-2.0.54-selinux.patch httpd-2.2.4-oldflush.patch 
Log Message:
* Thu Dec  3 2009 Joe Orton <jorton at redhat.com> - 2.2.14-1
- update to 2.2.14
- Requires(pre): httpd in mod_ssl subpackage (#543275)
- add partial security fix for CVE-2009-3555 (#533125)
- add condrestart in posttrans (#491567)


httpd-2.2.11-corelimit.patch:
 core.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

--- NEW FILE httpd-2.2.11-corelimit.patch ---
--- httpd-2.2.11/server/core.c.corelimit
+++ httpd-2.2.11/server/core.c
@@ -3777,6 +3779,25 @@ static int core_post_config(apr_pool_t *
 
     set_banner(pconf);
     ap_setup_make_content_type(pconf);
+
+#ifdef RLIMIT_CORE
+    if (ap_coredumpdir_configured) {
+        struct rlimit lim;
+
+        if (getrlimit(RLIMIT_CORE, &lim) == 0 && lim.rlim_cur == 0) {
+            lim.rlim_cur = lim.rlim_max;
+            if (setrlimit(RLIMIT_CORE, &lim) == 0) {
+                ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
+                             "core dump file size limit raised to %lu bytes",
+                             lim.rlim_cur);
+            } else {
+                ap_log_error(APLOG_MARK, APLOG_NOTICE, errno, NULL,
+                             "core dump file size is zero, setrlimit failed");
+            }
+        }
+    }
+#endif
+
     return OK;
 }
 

httpd-2.2.11-selinux.patch:
 configure.in  |    4 ++++
 server/core.c |   22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

--- NEW FILE httpd-2.2.11-selinux.patch ---
--- httpd-2.2.11/configure.in.selinux
+++ httpd-2.2.11/configure.in
@@ -412,6 +412,10 @@ getpgid
 dnl confirm that a void pointer is large enough to store a long integer
 APACHE_CHECK_VOID_PTR_LEN
 
+AC_CHECK_LIB(selinux, is_selinux_enabled, [
+   APR_ADDTO(AP_LIBS, [-lselinux])
+])
+
 dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
 AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
 [AC_TRY_COMPILE([#include <sys/types.h>
--- httpd-2.2.11/server/core.c.selinux
+++ httpd-2.2.11/server/core.c
@@ -51,6 +51,8 @@
 
 #include "mod_so.h" /* for ap_find_loaded_module_symbol */
 
+#include <selinux/selinux.h>
+
 /* LimitRequestBody handling */
 #define AP_LIMIT_REQ_BODY_UNSET         ((apr_off_t) -1)
 #define AP_DEFAULT_LIMIT_REQ_BODY       ((apr_off_t) 0)
@@ -3796,6 +3798,26 @@ static int core_post_config(apr_pool_t *
     }
 #endif
 
+    {
+        static int already_warned = 0;
+        int is_enabled = is_selinux_enabled() > 0;
+        
+        if (is_enabled && !already_warned) {
+            security_context_t con;
+            
+            if (getcon(&con) == 0) {
+                
+                ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
+                             "SELinux policy enabled; "
+                             "httpd running as context %s", con);
+                
+                already_warned = 1;
+                
+                freecon(con);
+            }
+        }
+    }
+
     return OK;
 }
 

httpd-2.2.11-xfsz.patch:
 prefork.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE httpd-2.2.11-xfsz.patch ---
--- httpd-2.2.11/server/mpm/prefork/prefork.c.xfsz
+++ httpd-2.2.11/server/mpm/prefork/prefork.c
@@ -399,7 +399,7 @@ static void set_signals(void)
         ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGXCPU)");
 #endif
 #ifdef SIGXFSZ
-    sa.sa_handler = SIG_DFL;
+    sa.sa_handler = SIG_IGN;
     if (sigaction(SIGXFSZ, &sa, NULL) < 0)
         ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGXFSZ)");
 #endif

httpd-2.2.14-CVE-2009-3555.patch:
 ssl_engine_init.c   |    5 -
 ssl_engine_io.c     |   17 +++++
 ssl_engine_kernel.c |  151 +++++++++++++++++++++++++++++++---------------------
 ssl_private.h       |   16 +++++
 4 files changed, 123 insertions(+), 66 deletions(-)

--- NEW FILE httpd-2.2.14-CVE-2009-3555.patch ---
--- httpd-2.2.14/modules/ssl/ssl_engine_init.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_init.c
@@ -501,10 +501,7 @@ static void ssl_init_ctx_callbacks(serve
     SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
     SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);
 
-    if (s->loglevel >= APLOG_DEBUG) {
-        /* this callback only logs if LogLevel >= info */
-        SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);
-    }
+    SSL_CTX_set_info_callback(ctx, ssl_callback_Info);
 }
 
 static void ssl_init_ctx_verify(server_rec *s,
--- httpd-2.2.14/modules/ssl/ssl_engine_io.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_io.c
@@ -103,6 +103,7 @@ typedef struct {
     ap_filter_t        *pInputFilter;
     ap_filter_t        *pOutputFilter;
     int                nobuffer; /* non-zero to prevent buffering */
+    SSLConnRec         *config;
 } ssl_filter_ctx_t;
 
 typedef struct {
@@ -193,7 +194,13 @@ static int bio_filter_out_read(BIO *bio,
 static int bio_filter_out_write(BIO *bio, const char *in, int inl)
 {
     bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)(bio->ptr);
-
+    
+    /* Abort early if the client has initiated a renegotiation. */
+    if (outctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        outctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+    
     /* when handshaking we'll have a small number of bytes.
      * max size SSL will pass us here is about 16k.
      * (16413 bytes to be exact)
@@ -466,6 +473,12 @@ static int bio_filter_in_read(BIO *bio, 
     if (!in)
         return 0;
 
+    /* Abort early if the client has initiated a renegotiation. */
+    if (inctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        inctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+
     /* XXX: flush here only required for SSLv2;
      * OpenSSL calls BIO_flush() at the appropriate times for
      * the other protocols.
@@ -1724,6 +1737,8 @@ void ssl_io_filter_init(conn_rec *c, SSL
 
     filter_ctx = apr_palloc(c->pool, sizeof(ssl_filter_ctx_t));
 
+    filter_ctx->config          = myConnConfig(c);
+
     filter_ctx->nobuffer        = 0;
     filter_ctx->pOutputFilter   = ap_add_output_filter(ssl_io_filter,
                                                    filter_ctx, NULL, c);
--- httpd-2.2.14/modules/ssl/ssl_engine_kernel.c.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_engine_kernel.c
@@ -729,6 +729,10 @@ int ssl_hook_Access(request_rec *r)
                                        (unsigned char *)&id,
                                        sizeof(id));
 
+            /* Toggle the renegotiation state to allow the new
+             * handshake to proceed. */
+            sslconn->reneg_state = RENEG_ALLOW;
+            
             SSL_renegotiate(ssl);
             SSL_do_handshake(ssl);
 
@@ -750,6 +754,8 @@ int ssl_hook_Access(request_rec *r)
             SSL_set_state(ssl, SSL_ST_ACCEPT);
             SSL_do_handshake(ssl);
 
+            sslconn->reneg_state = RENEG_REJECT;
+
             if (SSL_get_state(ssl) != SSL_ST_OK) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Re-negotiation handshake failed: "
@@ -1844,76 +1850,55 @@ void ssl_callback_DelSessionCacheEntry(S
     return;
 }
 
-/*
- * This callback function is executed while OpenSSL processes the
- * SSL handshake and does SSL record layer stuff. We use it to
- * trace OpenSSL's processing in out SSL logfile.
- */
-void ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
+/* Dump debugginfo trace to the log file. */
+static void log_tracing_state(MODSSL_INFO_CB_ARG_TYPE ssl, conn_rec *c, 
+                              server_rec *s, int where, int rc)
 {
-    conn_rec *c;
-    server_rec *s;
-    SSLSrvConfigRec *sc;
-
-    /*
-     * find corresponding server
-     */
-    if (!(c = (conn_rec *)SSL_get_app_data((SSL *)ssl))) {
-        return;
-    }
-
-    s = mySrvFromConn(c);
-    if (!(sc = mySrvConfig(s))) {
-        return;
-    }
-
     /*
      * create the various trace messages
      */
-    if (s->loglevel >= APLOG_DEBUG) {
-        if (where & SSL_CB_HANDSHAKE_START) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Handshake: start", SSL_LIBRARY_NAME);
-        }
-        else if (where & SSL_CB_HANDSHAKE_DONE) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Handshake: done", SSL_LIBRARY_NAME);
-        }
-        else if (where & SSL_CB_LOOP) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Loop: %s",
-                         SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-        }
-        else if (where & SSL_CB_READ) {
+    if (where & SSL_CB_HANDSHAKE_START) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Handshake: start", SSL_LIBRARY_NAME);
+    }
+    else if (where & SSL_CB_HANDSHAKE_DONE) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Handshake: done", SSL_LIBRARY_NAME);
+    }
+    else if (where & SSL_CB_LOOP) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Loop: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_READ) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Read: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_WRITE) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Write: %s",
+                     SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
+    }
+    else if (where & SSL_CB_ALERT) {
+        char *str = (where & SSL_CB_READ) ? "read" : "write";
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                     "%s: Alert: %s:%s:%s",
+                     SSL_LIBRARY_NAME, str,
+                     SSL_alert_type_string_long(rc),
+                     SSL_alert_desc_string_long(rc));
+    }
+    else if (where & SSL_CB_EXIT) {
+        if (rc == 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Read: %s",
+                         "%s: Exit: failed in %s",
                          SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
         }
-        else if (where & SSL_CB_WRITE) {
+        else if (rc < 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Write: %s",
+                         "%s: Exit: error in %s",
                          SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
         }
-        else if (where & SSL_CB_ALERT) {
-            char *str = (where & SSL_CB_READ) ? "read" : "write";
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "%s: Alert: %s:%s:%s",
-                         SSL_LIBRARY_NAME, str,
-                         SSL_alert_type_string_long(rc),
-                         SSL_alert_desc_string_long(rc));
-        }
-        else if (where & SSL_CB_EXIT) {
-            if (rc == 0) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                             "%s: Exit: failed in %s",
-                             SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-            }
-            else if (rc < 0) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                             "%s: Exit: error in %s",
-                             SSL_LIBRARY_NAME, SSL_state_string_long(ssl));
-            }
-        }
     }
 
     /*
@@ -1933,6 +1918,52 @@ void ssl_callback_LogTracingState(MODSSL
     }
 }
 
+/*
+ * This callback function is executed while OpenSSL processes the SSL
+ * handshake and does SSL record layer stuff.  It's used to trap
+ * client-initiated renegotiations, and for dumping everything to the
+ * log.
+ */
+void ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
+{
+    conn_rec *c;
+    server_rec *s;
+    SSLConnRec *scr;
+
+    /* Retrieve the conn_rec and the associated SSLConnRec. */
+    if ((c = (conn_rec *)SSL_get_app_data((SSL *)ssl)) == NULL) {
+        return;
+    }
+
+    if ((scr = myConnConfig(c)) == NULL) {
+        return;
+    }
+
+    /* If the reneg state is to reject renegotiations, check the SSL
+     * state machine and move to ABORT if a Client Hello is being
+     * read. */
+    if ((where & SSL_CB_ACCEPT_LOOP) && scr->reneg_state == RENEG_REJECT) {
+        int state = SSL_get_state(ssl);
+        
+        if (state == SSL3_ST_SR_CLNT_HELLO_A 
+            || state == SSL23_ST_SR_CLNT_HELLO_A) {
+            scr->reneg_state = RENEG_ABORT;
+            ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c,
+                          "rejecting client initiated renegotiation");
+        }
+    }
+    /* If the first handshake is complete, change state to reject any
+     * subsequent client-initated renegotiation. */
+    else if ((where & SSL_CB_HANDSHAKE_DONE) && scr->reneg_state == RENEG_INIT) {
+        scr->reneg_state = RENEG_REJECT;
+    }
+
+    s = mySrvFromConn(c);
+    if (s && s->loglevel >= APLOG_DEBUG) {
+        log_tracing_state(ssl, c, s, where, rc);
+    }
+}
+
 #ifndef OPENSSL_NO_TLSEXT
 /*
  * This callback function is executed when OpenSSL encounters an extended
--- httpd-2.2.14/modules/ssl/ssl_private.h.cve3555
+++ httpd-2.2.14/modules/ssl/ssl_private.h
@@ -356,6 +356,20 @@ typedef struct {
     int is_proxy;
     int disabled;
     int non_ssl_request;
+
+    /* Track the handshake/renegotiation state for the connection so
+     * that all client-initiated renegotiations can be rejected, as a
+     * partial fix for CVE-2009-3555. */
+    enum { 
+        RENEG_INIT = 0, /* Before initial handshake */
+        RENEG_REJECT, /* After initial handshake; any client-initiated
+                       * renegotiation should be rejected */
+        RENEG_ALLOW, /* A server-initated renegotiation is taking
+                      * place (as dictated by configuration) */
+        RENEG_ABORT /* Renegotiation initiated by client, abort the
+                     * connection */
+    } reneg_state;
+    
     server_rec *server;
 } SSLConnRec;
 
@@ -574,7 +588,7 @@ int          ssl_callback_proxy_cert(SSL
 int          ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
 SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
 void         ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);
-void         ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE, int, int);
+void         ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE, int, int);
 #ifndef OPENSSL_NO_TLSEXT
 int          ssl_callback_ServerNameIndication(SSL *, int *, modssl_ctx_t *);
 #endif


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-10/httpd.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- httpd.spec	23 Aug 2009 10:11:04 -0000	1.129
+++ httpd.spec	3 Dec 2009 16:11:27 -0000	1.130
@@ -4,11 +4,9 @@
 %define vstring Fedora
 %define mpms worker event
 
-%define _default_patch_fuzz 2
-
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.13
+Version: 2.2.14
 Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -31,19 +29,21 @@ Patch4: httpd-2.1.10-disablemods.patch
 Patch5: httpd-2.1.10-layout.patch
 # Features/functional changes
 Patch20: httpd-2.0.48-release.patch
-Patch21: httpd-2.0.40-xfsz.patch
+Patch21: httpd-2.2.11-xfsz.patch
 Patch22: httpd-2.1.10-pod.patch
 Patch23: httpd-2.0.45-export.patch
-Patch24: httpd-2.0.48-corelimit.patch
-Patch25: httpd-2.0.54-selinux.patch
+Patch24: httpd-2.2.11-corelimit.patch
+Patch25: httpd-2.2.11-selinux.patch
 Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+# Security fixes
+Patch90: httpd-2.2.14-CVE-2009-3555.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: autoconf, perl, pkgconfig, findutils
+BuildRequires: 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, system-logos >= 7.92.1-1
 Obsoletes: httpd-suexec
@@ -102,6 +102,7 @@ Summary: SSL/TLS module for the Apache H
 Epoch: 1
 BuildRequires: openssl-devel, distcache-devel
 Requires(post): openssl >= 0.9.7f-4, /bin/cat
+Requires(pre): httpd
 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
 Obsoletes: stronghold-mod_ssl
 
@@ -118,7 +119,7 @@ Security (TLS) protocols.
 %patch4 -p1 -b .disablemods
 %patch5 -p1 -b .layout
 
-%patch21 -p0 -b .xfsz
+%patch21 -p1 -b .xfsz
 %patch22 -p1 -b .pod
 %patch23 -p1 -b .export
 %patch24 -p1 -b .corelimit
@@ -127,6 +128,8 @@ Security (TLS) protocols.
 
 %patch54 -p1 -b .authnoprov
 
+%patch90 -p1 -b .cve3555
+
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
 
@@ -349,6 +352,9 @@ if [ $1 = 0 ]; then
 	/sbin/chkconfig --del httpd
 fi
 
+%posttrans
+/sbin/service httpd condrestart >/dev/null 2>&1 || :
+
 %define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
 %define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
 
@@ -480,6 +486,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Dec  3 2009 Joe Orton <jorton at redhat.com> - 2.2.14-1
+- update to 2.2.14
+- Requires(pre): httpd in mod_ssl subpackage (#543275)
+- add partial security fix for CVE-2009-3555 (#533125)
+- add condrestart in posttrans (#491567)
+
 * Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
 - update to 2.2.13
 - add delaycompress to logrotate config


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	23 Aug 2009 10:11:04 -0000	1.21
+++ sources	3 Dec 2009 16:11:27 -0000	1.22
@@ -1 +1 @@
-2803e35be6650f5b739e6e91faa824dd  httpd-2.2.13.tar.gz
+2c1e3c7ba00bcaa0163da7b3e66aaa1e  httpd-2.2.14.tar.gz


--- httpd-2.0.40-xfsz.patch DELETED ---


--- httpd-2.0.48-corelimit.patch DELETED ---


--- httpd-2.0.54-selinux.patch DELETED ---


--- httpd-2.2.4-oldflush.patch DELETED ---



From jzeleny at fedoraproject.org  Thu Dec  3 16:11:25 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu,  3 Dec 2009 16:11:25 +0000 (UTC)
Subject: rpms/dstat/F-11 dstat-0.6.9-path.patch, NONE, 1.1 dstat.spec, 1.15,
	1.16
Message-ID: <20091203161125.2E79C11C00EE@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/dstat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13087

Modified Files:
	dstat.spec 
Added Files:
	dstat-0.6.9-path.patch 
Log Message:
fixed CVE-2009-3894

dstat-0.6.9-path.patch:
 dstat   |    2 --
 dstat15 |    2 --
 2 files changed, 4 deletions(-)

--- NEW FILE dstat-0.6.9-path.patch ---
--- dstat-0.6.9/dstat.orig	2009-12-03 17:06:47.000000000 +0100
+++ dstat-0.6.9/dstat	2009-12-03 17:06:56.000000000 +0100
@@ -28,8 +28,6 @@ try:
     inspath('/usr/local/share/dstat/')
     inspath('/usr/share/dstat/')
     inspath(os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/')    # binary path + /plugins/
-    inspath(os.getcwd() + '/plugins/')                                      # current path + /plugins/
-    inspath(os.getcwd())                                                    # current path
     inspath(os.path.expanduser('~/.dstat/'))                                # home + /.dstat/
 except KeyboardInterrupt, e:
     pass
--- dstat-0.6.9/dstat15.orig	2009-12-03 17:07:08.000000000 +0100
+++ dstat-0.6.9/dstat15	2009-12-03 17:07:14.000000000 +0100
@@ -28,8 +28,6 @@ try:
     inspath('/usr/local/share/dstat/')
     inspath('/usr/share/dstat/')
     inspath(os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/')    # binary path + /plugins/
-    inspath(os.getcwd() + '/plugins/')                                      # current path + /plugins/
-    inspath(os.getcwd())                                                    # current path
     inspath(os.path.expanduser('~/.dstat/'))                                # home + /.dstat/
 except KeyboardInterrupt, e:
     pass


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/F-11/dstat.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dstat.spec	24 Feb 2009 12:53:04 -0000	1.15
+++ dstat.spec	3 Dec 2009 16:11:24 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: Versatile resource statistics tool
 Name: dstat
 Version: 0.6.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/dstat/
@@ -12,6 +12,7 @@ URL: http://dag.wieers.com/home-made/dst
 Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2
 Patch0: dstat-0.6.8-dbus.patch
 Patch1: dstat-0.6.9-counts.patch
+Patch2: dstat-0.6.9-path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -37,6 +38,7 @@ confusion, less mistakes.
 %setup -q
 %patch0 -p1 -b .dbus
 %patch1 -p1 -b .counts
+%patch2 -p1 -b .path
 
 %build
 # Make sure the docs are in unix format
@@ -67,6 +69,9 @@ cd docs
 %{_datadir}/dstat/*.py*
 
 %changelog
+* Thu Dec 03 2009 Jan Zeleny <jzeleny at redhat.com> - 0.6.9-5
+- added patch fixing security issue CVE-2009-3894
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Dec  3 16:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:14:32 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203161432.EF80B10F894@bastion2.fedora.phx.redhat.com>

rishi has set the commit acl on emacs (Fedora devel) to Approved for dnovotny

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:14:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:14:34 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203161434.DE12F10F89C@bastion2.fedora.phx.redhat.com>

rishi has set the approveacls acl on emacs (Fedora devel) to Approved for dnovotny

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:14:39 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203161439.1F8E710F8A3@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora devel is now owned by rishi

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:14:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:14:48 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203161448.AFCB310F8A6@bastion2.fedora.phx.redhat.com>

rishi has set the watchbugzilla acl on emacs (Fedora devel) to Obsolete for rishi

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:14:59 +0000
Subject: [pkgdb] emacs: rishi has given up watchbugzilla
Message-ID: <20091203161459.D463810F896@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:15:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:15:02 +0000
Subject: [pkgdb] emacs: rishi has given up commit
Message-ID: <20091203161503.26BC310F8AA@bastion2.fedora.phx.redhat.com>

rishi has given up the commit acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:15:04 +0000
Subject: [pkgdb] emacs: rishi has given up approveacls
Message-ID: <20091203161504.D686210F8AF@bastion2.fedora.phx.redhat.com>

rishi has given up the approveacls acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:15:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:15:06 +0000
Subject: [pkgdb] emacs: rishi has given up watchcommits
Message-ID: <20091203161506.62A4D10F8B3@bastion2.fedora.phx.redhat.com>

rishi has given up the watchcommits acl on emacs (Fedora devel)

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



From dwayne at fedoraproject.org  Thu Dec  3 16:16:26 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu,  3 Dec 2009 16:16:26 +0000 (UTC)
Subject: File virtaal-0.5.0.tar.bz2 uploaded to lookaside cache by dwayne
Message-ID: <20091203161626.78AD810F894@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for virtaal:

36d6fd363f6e46ec949c3b5dbd268e66  virtaal-0.5.0.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec  3 16:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:16:37 +0000
Subject: [pkgdb] emacs: rishi has given up watchbugzilla
Message-ID: <20091203161637.9B2E410F8A2@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:16:42 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203161642.A248110F89E@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora devel is now owned by jgu

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:10 +0000
Subject: [pkgdb] emacs: rishi has given up watchbugzilla
Message-ID: <20091203161710.9D33E10F894@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on emacs (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:12 +0000
Subject: [pkgdb] emacs: rishi has given up watchcommits
Message-ID: <20091203161712.13E1510F899@bastion2.fedora.phx.redhat.com>

rishi has given up the watchcommits acl on emacs (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:14 +0000
Subject: [pkgdb] emacs: rishi has given up commit
Message-ID: <20091203161714.9ABFB10F8A1@bastion2.fedora.phx.redhat.com>

rishi has given up the commit acl on emacs (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:16 +0000
Subject: [pkgdb] emacs: rishi has given up approveacls
Message-ID: <20091203161716.763FA10F8A4@bastion2.fedora.phx.redhat.com>

rishi has given up the approveacls acl on emacs (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:19 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203161719.8195D10F8A8@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora 10 is now owned by jgu

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:28 +0000
Subject: [pkgdb] emacs: rishi has given up watchcommits
Message-ID: <20091203161728.2284810F8AB@bastion2.fedora.phx.redhat.com>

rishi has given up the watchcommits acl on emacs (Fedora 9)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:27 +0000
Subject: [pkgdb] emacs: rishi has given up watchbugzilla
Message-ID: <20091203161727.0BF4110F895@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on emacs (Fedora 9)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:29 +0000
Subject: [pkgdb] emacs: rishi has given up commit
Message-ID: <20091203161729.C2A9A10F8AD@bastion2.fedora.phx.redhat.com>

rishi has given up the commit acl on emacs (Fedora 9)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:31 +0000
Subject: [pkgdb] emacs: rishi has given up approveacls
Message-ID: <20091203161731.59D2D10F89D@bastion2.fedora.phx.redhat.com>

rishi has given up the approveacls acl on emacs (Fedora 9)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:41 +0000
Subject: [pkgdb] emacs: rishi has given up watchcommits
Message-ID: <20091203161741.159DF10F8B0@bastion2.fedora.phx.redhat.com>

rishi has given up the watchcommits acl on emacs (Fedora 8)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:43 +0000
Subject: [pkgdb] emacs: rishi has given up watchbugzilla
Message-ID: <20091203161743.560CB10F8A3@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on emacs (Fedora 8)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:44 +0000
Subject: [pkgdb] emacs: rishi has given up commit
Message-ID: <20091203161744.933A910F8B3@bastion2.fedora.phx.redhat.com>

rishi has given up the commit acl on emacs (Fedora 8)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:46 +0000
Subject: [pkgdb] emacs: rishi has given up approveacls
Message-ID: <20091203161746.1316210F8B6@bastion2.fedora.phx.redhat.com>

rishi has given up the approveacls acl on emacs (Fedora 8)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:54 +0000
Subject: [pkgdb] emacs: rishi has given up watchbugzilla
Message-ID: <20091203161754.ED1BB10F8BD@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on emacs (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:53 +0000
Subject: [pkgdb] emacs: rishi has given up watchcommits
Message-ID: <20091203161753.4145C10F8BB@bastion2.fedora.phx.redhat.com>

rishi has given up the watchcommits acl on emacs (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:56 +0000
Subject: [pkgdb] emacs: rishi has given up commit
Message-ID: <20091203161756.81FD810F8BF@bastion2.fedora.phx.redhat.com>

rishi has given up the commit acl on emacs (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:17:57 +0000
Subject: [pkgdb] emacs: rishi has given up approveacls
Message-ID: <20091203161757.F389510F8C5@bastion2.fedora.phx.redhat.com>

rishi has given up the approveacls acl on emacs (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:18:01 +0000
Subject: [pkgdb] emacs: rishi has given up approveacls
Message-ID: <20091203161801.61D7910F8CB@bastion2.fedora.phx.redhat.com>

rishi has given up the approveacls acl on emacs (Fedora 12)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:18:02 +0000
Subject: [pkgdb] emacs: rishi has given up commit
Message-ID: <20091203161802.3555010F8CF@bastion2.fedora.phx.redhat.com>

rishi has given up the commit acl on emacs (Fedora 12)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:18:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:18:04 +0000
Subject: [pkgdb] emacs: rishi has given up watchcommits
Message-ID: <20091203161804.71DAE10F8AB@bastion2.fedora.phx.redhat.com>

rishi has given up the watchcommits acl on emacs (Fedora 12)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:18:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:18:06 +0000
Subject: [pkgdb] emacs: rishi has given up watchbugzilla
Message-ID: <20091203161806.690B610F8D6@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on emacs (Fedora 12)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:18:08 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203161809.38F5A10F8DA@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora 12 is now owned by jgu

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:18:14 +0000
Subject: [pkgdb] emacs ownership updated
Message-ID: <20091203161814.90D8C10F8DE@bastion2.fedora.phx.redhat.com>

Package emacs in Fedora 11 is now owned by jgu

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



From dwalsh at fedoraproject.org  Thu Dec  3 16:18:22 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  3 Dec 2009 16:18:22 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.146,
	1.147 selinux-policy.spec, 1.974, 1.975
Message-ID: <20091203161822.48C1511C00EE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15381

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-54
- Add labeling to /usr/lib/win32 textrel_shlib_t
- dontaudit all leaks for abrt_helper
- Fix labeling for mythtv
- Dontaudit setroubleshoot_fix leaks
- Allow xauth_t to read usr_t
- Allow iptables to use fifo files
- Fix labeling on /var/lib/wifiroamd


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   13 
 policy/modules/admin/logrotate.te         |   21 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |   80 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   23 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    3 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    7 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   43 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   42 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |   13 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  417 +++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   44 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  126 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  436 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  108 +
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   52 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  452 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   21 
 policy/modules/services/asterisk.te       |   20 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   28 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   23 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   13 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  117 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.te           |   14 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |    7 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    4 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   22 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   17 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   82 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tor.te            |    1 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  633 ++++++++++-
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  209 +++
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   66 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  183 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   18 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   83 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1684 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   28 
 policy/users                              |   13 
 393 files changed, 19792 insertions(+), 2815 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.146 -r 1.147 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- policy-F12.patch	2 Dec 2009 21:44:32 -0000	1.146
+++ policy-F12.patch	3 Dec 2009 16:18:20 -0000	1.147
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.32/Makefile
 --- nsaserefpolicy/Makefile	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/Makefile	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/Makefile	2009-12-03 08:39:31.781186000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -12,7 +12,7 @@ diff -b -B --ignore-all-space --exclude-
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-12-03 08:39:31.783187000 -0500
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
@@ -23,7 +23,7 @@ diff -b -B --ignore-all-space --exclude-
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.32/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/global_tunables	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/global_tunables	2009-12-03 08:39:31.786186000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -61,7 +61,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.32/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/mcs	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/mcs	2009-12-03 08:39:31.788187000 -0500
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -97,7 +97,7 @@ diff -b -B --ignore-all-space --exclude-
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.6.32/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/alsa.te	2009-10-09 07:40:41.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/alsa.te	2009-12-03 08:39:31.790189000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -109,7 +109,7 @@ diff -b -B --ignore-all-space --exclude-
  init_use_fds(alsa_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.32/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-12-03 08:39:31.793186000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -129,7 +129,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.6.32/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-12-03 08:39:31.795189000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -141,7 +141,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.32/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-12-03 08:39:31.798186000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -153,7 +153,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.6.32/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-10-07 14:44:15.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-12-03 08:39:31.800189000 -0500
 @@ -84,6 +84,7 @@
  optional_policy(`
  	hal_dontaudit_use_fds(consoletype_t)
@@ -164,7 +164,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.32/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-12-03 08:39:31.803185000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
@@ -172,7 +172,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.32/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-10-06 09:52:38.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-12-03 08:39:31.805187000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -216,7 +216,7 @@ diff -b -B --ignore-all-space --exclude-
 +dev_read_raw_memory(dmesg_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.32/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-12-03 08:39:31.807189000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -241,7 +241,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.fc serefpolicy-3.6.32/policy/modules/admin/kismet.fc
 --- nsaserefpolicy/policy/modules/admin/kismet.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/kismet.fc	2009-11-09 13:11:24.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/kismet.fc	2009-12-03 08:39:31.810188000 -0500
 @@ -1,3 +1,5 @@
 +HOME_DIR/\.kismet(/.*)?			gen_context(system_u:object_r:kismet_home_t,s0)
 +
@@ -250,7 +250,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/kismet(/.*)?			gen_context(system_u:object_r:kismet_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.32/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-01 08:03:22.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-03 08:39:31.813186000 -0500
 @@ -26,6 +26,9 @@
  type kismet_var_run_t;
  files_pid_file(kismet_var_run_t)
@@ -289,7 +289,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-11-16 09:58:16.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-03 08:39:31.815189000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -349,7 +349,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-12-01 10:47:58.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-12-03 08:39:31.818186000 -0500
 @@ -93,6 +93,13 @@
  sysnet_exec_ifconfig(logwatch_t)
  
@@ -372,7 +372,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.32/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-12-03 08:39:31.820189000 -0500
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -383,7 +383,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-10-30 14:18:10.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-12-03 08:39:31.823186000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -402,7 +402,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.6.32/policy/modules/admin/ntop.fc
 --- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.fc	2009-10-01 08:24:35.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/ntop.fc	2009-12-03 08:39:31.826191000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
 +
@@ -411,7 +411,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.6.32/policy/modules/admin/ntop.if
 --- nsaserefpolicy/policy/modules/admin/ntop.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.if	2009-10-01 08:24:35.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/ntop.if	2009-12-03 08:39:31.837186000 -0500
 @@ -0,0 +1,158 @@
 +
 +## <summary>policy for ntop</summary>
@@ -573,7 +573,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.te serefpolicy-3.6.32/policy/modules/admin/ntop.te
 --- nsaserefpolicy/policy/modules/admin/ntop.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.te	2009-10-01 08:24:35.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/ntop.te	2009-12-03 08:39:31.839187000 -0500
 @@ -0,0 +1,40 @@
 +policy_module(ntop,1.0.0)
 +
@@ -617,7 +617,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-09-16 10:01:19.000000000 -0400
[...3867 lines suppressed...]
 +allow setfiles_mac_t self:capability2 mac_admin;
 +kernel_relabelto_unlabeled(setfiles_mac_t)
  
--	# cjp: cover up stray file descriptors.
+ ifdef(`hide_broken_symptoms',`
  	optional_policy(`
+-		udev_dontaudit_rw_dgram_sockets(setfiles_t)
+-	')
+-
+-	# cjp: cover up stray file descriptors.
+-	optional_policy(`
 -		unconfined_dontaudit_read_pipes(setfiles_t)
 -		unconfined_dontaudit_rw_tcp_sockets(setfiles_t)
--	')
-+	setroubleshoot_dontaudit_rw_dgram_sockets(setfiles_t)
-+	setroubleshoot_dontaudit_rw_dgram_sockets(setsebool_t)
++		setroubleshoot_dontaudit_leaks(setfiles_t)
++		setroubleshoot_dontaudit_leaks(setsebool_t)
+ 	')
  ')
  
  optional_policy(`
@@ -31353,7 +31380,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.6.32/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/setrans.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/setrans.if	2009-12-03 08:39:32.994123000 -0500
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1, setrans_var_run_t, setrans_var_run_t, setrans_t)
  	files_list_pids($1)
@@ -31380,7 +31407,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-12-03 09:41:51.143602000 -0500
 @@ -11,15 +11,20 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -31403,7 +31430,14 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #
-@@ -57,3 +62,5 @@
+@@ -51,9 +56,12 @@
+ /var/lib/dhcp3?/dhclient.*	gen_context(system_u:object_r:dhcpc_state_t,s0)
+ /var/lib/dhcpcd(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
+ /var/lib/dhclient(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
++/var/lib/wifiroamd(/.*)?	gen_context(system_u:object_r:dhcpc_state_t,s0)
+ 
+ /var/run/dhclient.*	--	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)
  ')
@@ -31411,7 +31445,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.32/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-01 18:03:08.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-03 08:39:32.999117000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -31588,7 +31622,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.32/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-12-01 17:57:37.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-12-03 08:39:33.002112000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -31812,7 +31846,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.32/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-12-03 08:39:33.004110000 -0500
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -31825,7 +31859,7 @@ diff -b -B --ignore-all-space --exclude-
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.32/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-10-22 09:04:35.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-12-03 08:39:33.007105000 -0500
 @@ -168,4 +168,43 @@
  
  	dev_list_all_dev_nodes($1)
@@ -31872,7 +31906,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.32/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-10-22 09:03:07.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-12-03 08:39:33.009108000 -0500
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -31988,7 +32022,7 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.32/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-12-03 08:39:33.012106000 -0500
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -32008,7 +32042,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.32/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-12-03 08:39:33.015106000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -32514,7 +32548,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.32/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-12-03 08:39:33.017108000 -0500
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -32746,7 +32780,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.32/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-11-25 12:24:50.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-12-03 08:39:33.031107000 -0500
 @@ -1,4 +1,9 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -32760,7 +32794,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-02 14:02:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-03 08:39:33.036108000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -35118,7 +35152,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.32/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-11-25 12:23:57.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-12-03 08:39:33.039106000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35209,7 +35243,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.32/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-12-03 08:39:33.041108000 -0500
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -35239,7 +35273,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.32/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-12-03 08:39:33.043110000 -0500
 @@ -71,6 +71,8 @@
  	')
  
@@ -35292,7 +35326,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-10-14 08:25:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-03 08:39:33.046106000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -35592,7 +35626,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-11-30 15:49:46.000000000 -0500
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-03 08:39:33.049105000 -0500
 @@ -181,7 +181,7 @@
  #
  define(`getattr_dir_perms',`{ getattr }')
@@ -35651,7 +35685,7 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
 --- nsaserefpolicy/policy/users	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/users	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/users	2009-12-03 08:39:33.051108000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -p -r1.974 -r1.975
--- selinux-policy.spec	2 Dec 2009 20:15:22 -0000	1.974
+++ selinux-policy.spec	3 Dec 2009 16:18:21 -0000	1.975
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 53%{?dist}
+Release: 54%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,15 @@ exit 0
 %endif
 
 %changelog
+* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-54
+- Add labeling to /usr/lib/win32 textrel_shlib_t
+- dontaudit all leaks for abrt_helper
+- Fix labeling for mythtv
+- Dontaudit setroubleshoot_fix leaks
+- Allow xauth_t to read usr_t
+- Allow iptables to use fifo files
+- Fix labeling on /var/lib/wifiroamd
+
 * Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-53
 - Remove transition from dhcpc_t to consoletype_t, just allow exec
 - Fixes for prelink cron job



From pkgdb at fedoraproject.org  Thu Dec  3 16:25:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:25:47 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203162548.04F0010F89C@bastion2.fedora.phx.redhat.com>

dnovotny has set the commit acl on emacs (Fedora devel) to Approved for kklic

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:25:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:25:50 +0000
Subject: [pkgdb] emacs had acl change status
Message-ID: <20091203162550.B5E5010F8A2@bastion2.fedora.phx.redhat.com>

dnovotny has set the approveacls acl on emacs (Fedora devel) to Approved for kklic

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



From jkratoch at fedoraproject.org  Thu Dec  3 16:26:38 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu,  3 Dec 2009 16:26:38 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-archer.patch,1.36,1.37 gdb.spec,1.398,1.399
Message-ID: <20091203162638.466B711C00EE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17559

Modified Files:
	gdb-archer.patch gdb.spec 
Log Message:
* Thu Dec  3 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-8.fc12
- Fix slowness/hang when printing some variables (Sami Wagiaalla, BZ 541093).
- archer-jankratochvil-fedora12 commit: 6817a81cd411acc9579f04dcc105e9bce72859ff


gdb-archer.patch:
 Makefile.in                                              |   92 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  773 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  294 +-
 cp-support.c                                             |  123 +
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  438 +++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |    9 
 dwarf2expr.c                                             |    7 
 dwarf2expr.h                                             |    2 
 dwarf2loc.c                                              |  227 +
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1761 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  599 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcall.c                                                |    8 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  190 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   73 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |    1 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   14 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   55 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   37 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   41 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |   10 
 testsuite/gdb.cp/cplusfuncs.exp                          |  225 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress-declarations.cc        |   93 
 testsuite/gdb.cp/namespace-stress-declarations.exp       |   50 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   77 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-prettyprint.exp                  |   22 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.exp                        |   31 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  105 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |   76 
 xcoffread.c                                              |    1 
 241 files changed, 18573 insertions(+), 2440 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-archer.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gdb-archer.patch	25 Nov 2009 10:38:23 -0000	1.36
+++ gdb-archer.patch	3 Dec 2009 16:26:36 -0000	1.37
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit b125345fb36abbb9bd00128e2093dc636a859da5
+commit 6817a81cd411acc9579f04dcc105e9bce72859ff
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -3113,7 +3113,7 @@ index 62800b8..97d587b 100644
  			{ $$ = $1.comp;
  			  if ($2) $$ = fill_comp (DEMANGLE_COMPONENT_LOCAL_NAME, $$, $2); }
 diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
-index d2d8f2e..af0ba28 100644
+index d2d8f2e..db26a01 100644
 --- a/gdb/cp-namespace.c
 +++ b/gdb/cp-namespace.c
 @@ -36,14 +36,17 @@ static struct using_direct *cp_copy_usings (struct using_direct *using,
@@ -3293,7 +3293,7 @@ index d2d8f2e..af0ba28 100644
        if (sym != NULL)
  	return sym;
      }
-@@ -320,25 +377,87 @@ lookup_namespace_scope (const char *name,
+@@ -320,25 +377,98 @@ lookup_namespace_scope (const char *name,
    namespace = alloca (scope_len + 1);
    strncpy (namespace, scope, scope_len);
    namespace[scope_len] = '\0';
@@ -3330,6 +3330,16 @@ index d2d8f2e..af0ba28 100644
 +    }
 +}
 +
++/* Used for cleanups to reset the "searched" flag incase
++   of an error.  */
++
++static void
++reset_directive_searched (void *data)
++{
++  struct using_direct *direct = data;
++  direct->searched = 0;
++}
++
 +/* Search for NAME by applying all import statements belonging
 +   to BLOCK which are applicable in SCOPE. If DECLARATION_ONLY the search
 +   is restricted to using declarations.
@@ -3362,11 +3372,11 @@ index d2d8f2e..af0ba28 100644
 -			    const struct block *block,
 -			    const domain_enum domain)
 +cp_lookup_symbol_imports (const char *scope,
-+                            const char *name,
-+                            const struct block *block,
-+                            const domain_enum domain,
-+                            int declaration_only,
-+                            int search_parents)
++                          const char *name,
++                          const struct block *block,
++                          const domain_enum domain,
++                          int declaration_only,
++                          int search_parents)
  {
 -  const struct using_direct *current;
 -  struct symbol *sym;
@@ -3374,6 +3384,7 @@ index d2d8f2e..af0ba28 100644
 +  struct symbol *sym = NULL;
 +  int directive_match;
 +  int current_line;
++  struct cleanup *searched_cleanup;
 +
 +  if(!declaration_only)
 +    /* First, try to find the symbol in the given namespace.  */
@@ -3393,7 +3404,7 @@ index d2d8f2e..af0ba28 100644
       names to the namespace we're searching in, see if we can find a
       match by applying them.  */
  
-@@ -346,39 +465,74 @@ cp_lookup_symbol_namespace (const char *namespace,
+@@ -346,39 +476,78 @@ cp_lookup_symbol_namespace (const char *namespace,
         current != NULL;
         current = current->next)
      {
@@ -3416,6 +3427,8 @@ index d2d8f2e..af0ba28 100644
 -					    block,
 -					    domain);
 +	  current->searched = 1;
++	  searched_cleanup = make_cleanup (reset_directive_searched, current);
++
 +	  /* If there is an import of a single declaration, compare the imported
 +	     declaration with the sought out name. If there is a match pass
 +	     current->import_src as NAMESPACE to direct the search towards the
@@ -3424,23 +3437,25 @@ index d2d8f2e..af0ba28 100644
 +	    {
 +	    if (strcmp (name, current->declaration) == 0)
 +	      {
-+	        sym = cp_lookup_symbol_in_namespace (current->import_src,
-+	                                          name,
-+	                                          block,
-+	                                          domain);
++	      sym = cp_lookup_symbol_in_namespace (current->import_src,
++	                                           name,
++	                                           block,
++	                                           domain);
 +	      }
++
++	    current->searched = 0;
++	    if (sym)
++	      return sym;
++
++	    continue;
 +	    }
 +	   
 +	  if (declaration_only)
-+            {
-+              current->searched = 0;
-+              if (sym)
-+                {
-+                  return sym;
-+                } else {
-+                  continue;
-+                }
-+            }
++	    {
++	    current->searched = 0;
++	    discard_cleanups (searched_cleanup);
++	    continue;
++	    }
 +
 +	  if (strcmp (name, current->alias) == 0)
 +	    /* If the import is creating an alias and the alias matches the
@@ -3448,26 +3463,25 @@ index d2d8f2e..af0ba28 100644
 +	       search towards the aliased namespace */
 +	    {
 +	    sym = cp_lookup_symbol_in_namespace (scope,
-+	                                      current->import_src,
-+	                                      block,
-+	                                      domain);
++	                                         current->import_src,
++	                                         block,
++	                                         domain);
 +	    } else if (strcmp ("", current->alias) == 0){
 +	    /* If this import statement creates no alias, pass current->inner as
 +	       NAMESPACE to direct the search towards the imported namespace. */
 +	      sym = cp_lookup_symbol_imports (current->import_src,
-+		                                name,
-+		                                block,
-+		                                domain,
-+		                                0,
-+		                                0);
++	                                      name,
++	                                      block,
++	                                      domain,
++	                                      0,
++	                                      0);
 +	    }
 +
 +	  current->searched = 0;
++	  discard_cleanups (searched_cleanup);
++
  	  if (sym != NULL)
--	    return sym;
-+	    {
-+	      return sym;
-+	    }
+ 	    return sym;
  	}
      }
  
@@ -3496,7 +3510,7 @@ index d2d8f2e..af0ba28 100644
  }
  
  /* Look up NAME in BLOCK's static block and in global blocks.  If
-@@ -388,17 +542,15 @@ cp_lookup_symbol_namespace (const char *namespace,
+@@ -388,17 +557,15 @@ cp_lookup_symbol_namespace (const char *namespace,
  
  static struct symbol *
  lookup_symbol_file (const char *name,
@@ -3515,7 +3529,7 @@ index d2d8f2e..af0ba28 100644
    if (anonymous_namespace)
      {
        /* Symbols defined in anonymous namespaces have external linkage
-@@ -408,12 +560,11 @@ lookup_symbol_file (const char *name,
+@@ -408,12 +575,11 @@ lookup_symbol_file (const char *name,
        const struct block *global_block = block_global_block (block);
        
        if (global_block != NULL)
@@ -3530,7 +3544,7 @@ index d2d8f2e..af0ba28 100644
      }
  
    if (sym != NULL)
-@@ -434,6 +585,7 @@ lookup_symbol_file (const char *name,
+@@ -434,6 +600,7 @@ lookup_symbol_file (const char *name,
        sym = lookup_possible_namespace_symbol (name);
        if (sym != NULL)
  	return sym;
@@ -3538,7 +3552,7 @@ index d2d8f2e..af0ba28 100644
      }
  
    return NULL;
-@@ -461,9 +613,8 @@ cp_lookup_nested_type (struct type *parent_type,
+@@ -461,9 +628,8 @@ cp_lookup_nested_type (struct type *parent_type,
  	   lookup_symbol_namespace works when looking them up.  */
  
  	const char *parent_name = TYPE_TAG_NAME (parent_type);
@@ -3549,7 +3563,7 @@ index d2d8f2e..af0ba28 100644
  							 block,
  							 VAR_DOMAIN);
  	if (sym == NULL || SYMBOL_CLASS (sym) != LOC_TYPEDEF)
-@@ -709,7 +860,7 @@ check_one_possible_namespace_symbol (const char *name, int len,
+@@ -709,7 +875,7 @@ check_one_possible_namespace_symbol (const char *name, int len,
  
    memcpy (name_copy, name, len);
    name_copy[len] = '\0';
@@ -3558,7 +3572,7 @@ index d2d8f2e..af0ba28 100644
  
    if (sym == NULL)
      {
-@@ -749,7 +900,7 @@ lookup_possible_namespace_symbol (const char *name)
+@@ -749,7 +915,7 @@ lookup_possible_namespace_symbol (const char *name)
        struct symbol *sym;
  
        sym = lookup_block_symbol (get_possible_namespace_block (objfile),
@@ -23262,6 +23276,162 @@ index 0000000..5543757
 +
 +setup_kfail "gdb/10541" "*-*-*"
 +gdb_test "print G::GF::FE::ex" "= 9999"
+diff --git a/gdb/testsuite/gdb.cp/namespace-stress-declarations.cc b/gdb/testsuite/gdb.cp/namespace-stress-declarations.cc
+new file mode 100644
+index 0000000..173e49b
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/namespace-stress-declarations.cc
+@@ -0,0 +1,93 @@
++int a;
++int b;
++int c;
++int d;
++int e;
++int f;
++int g;
++int h;
++int i;
++int j;
++int k;
++int l;
++int m;
++int n;
++int o;
++int p;
++int q;
++int r;
++int s;
++int t;
++int u;
++int v;
++int w;
++int x;
++int y;
++int z;
++
++namespace A
++{
++  int xyz;
++
++  using ::a;
++  using ::b;
++  using ::c;
++  using ::d;
++  using ::e;
++  using ::f;
++  using ::g;
++  using ::h;
++  using ::i;
++  using ::j;
++  using ::k;
++  using ::l;
++  using ::m;
++  using ::n;
++  using ::o;
++  using ::p;
++  using ::q;
++  using ::r;
++  using ::s;
++  using ::t;
++  using ::u;
++  using ::v;
++  using ::w;
++  using ::x;
++  using ::y;
++  using ::z;
++
++}
++
++using A::a;
++using A::b;
++using A::c;
++using A::d;
++using A::e;
++using A::f;
++using A::g;
++using A::h;
++using A::i;
++using A::j;
++using A::k;
++using A::l;
++using A::m;
++using A::n;
++using A::o;
++using A::p;
++using A::q;
++using A::r;
++using A::s;
++using A::t;
++using A::u;
++using A::v;
++using A::w;
++using A::x;
++using A::y;
++using A::z;
++
++using namespace A;
++
++int main ()
++{
++  return 0;
++}
+\ No newline at end of file
+diff --git a/gdb/testsuite/gdb.cp/namespace-stress-declarations.exp b/gdb/testsuite/gdb.cp/namespace-stress-declarations.exp
+new file mode 100644
+index 0000000..f22a14e
+--- /dev/null
++++ b/gdb/testsuite/gdb.cp/namespace-stress-declarations.exp
+@@ -0,0 +1,50 @@
++# Copyright 2008 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++if $tracelevel then {
++    strace $tracelevel
++}
++
++set prms_id 0
++set bug_id 0
++
++set testfile namespace-stress-declarations
++set srcfile ${testfile}.cc
++set binfile ${objdir}/${subdir}/${testfile}
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++if [get_compiler_info ${binfile}] {
++    return -1;
++}
++
++# Get things started.
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++if ![runto_main] then {
++    perror "couldn't run to breakpoint main"
++    continue
++}
++
++############################################
++# Test that the search can fail efficiently 
++
++gdb_test "print fakex" "No symbol \"fakex\" in current context."
 diff --git a/gdb/testsuite/gdb.cp/namespace-stress.cc b/gdb/testsuite/gdb.cp/namespace-stress.cc
 new file mode 100644
 index 0000000..f34083e
@@ -25457,10 +25627,10 @@ index 495ae45..d08d7a4 100644
  		set command "next"
 diff --git a/gdb/testsuite/gdb.java/jnpe.exp b/gdb/testsuite/gdb.java/jnpe.exp
 new file mode 100644
-index 0000000..74d4d58
+index 0000000..e71391e
 --- /dev/null
 +++ b/gdb/testsuite/gdb.java/jnpe.exp
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,77 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -25483,10 +25653,10 @@ index 0000000..74d4d58
 +load_lib "java.exp"
 +
 +set testfile "jnpe"
-+set srcfile ${srcdir}/$subdir/${testfile}.java
++set srcfile ${testfile}.java
 +set binfile ${objdir}/${subdir}/${testfile}
-+if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
-+    untested "Couldn't compile ${srcfile}"
++if  { [compile_java_from_source ${srcdir}/$subdir/${srcfile} ${binfile} "-g"] != "" } {
++    untested "Couldn't compile ${srcdir}/$subdir/${srcfile}"
 +    return -1
 +}
 +
@@ -25504,7 +25674,7 @@ index 0000000..74d4d58
 +gdb_test "break $testfile.java:$line" ""
 +
 +gdb_test "run" \
-+  "Current language.*java" \
++  "// break here.*" \
 +  "run java next-over-throw"
 +
 +# See whether we have the needed unwinder hooks.
@@ -25513,9 +25683,10 @@ index 0000000..74d4d58
 +    -re "= .*_Unwind_DebugHook.*\r\n$gdb_prompt $" {
 +	pass "check for unwinder hook in java"
 +    }
-+    -re "No symbol .* in current context.\r\n$gdb_prompt $" {
++    -re "No symbol .* in current context.?\r\n$gdb_prompt $" {
 +	# Pass the test so we don't get bogus fails in the results.
-+	pass "check for unwinder hook in java"
++	setup_xfail *-*-*
++	fail "check for unwinder hook in java"
 +	set ok 0
 +    }
 +}
@@ -25528,14 +25699,18 @@ index 0000000..74d4d58
 +  "SIGSEGV.*fault" \
 +  "disable SIGSEGV for next-over-NPE"
 +
-+# We sometimes stop at line 37, not line 35.  This seems to be a gcj
-+# oddity -- another next will solve it.
++# The line where we stop differ according to gcj; check just we did not already
++# execute the catch point.
++
 +gdb_test "next" \
-+  "3\[57\].*" \
++  "" \
 +  "next over NPE"
++
++gdb_breakpoint [gdb_get_line_number "catch point"]
++gdb_continue_to_breakpoint "catch point" ".*// catch point.*"
 diff --git a/gdb/testsuite/gdb.java/jnpe.java b/gdb/testsuite/gdb.java/jnpe.java
 new file mode 100644
-index 0000000..ffca3ab
+index 0000000..3524830
 --- /dev/null
 +++ b/gdb/testsuite/gdb.java/jnpe.java
 @@ -0,0 +1,38 @@
@@ -25573,7 +25748,7 @@ index 0000000..ffca3ab
 +      }
 +    catch (NullPointerException n)
 +      {
-+	System.out.println ("success");
++	System.out.println ("success"); // catch point
 +      }
 +  }
 +}


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- gdb.spec	25 Nov 2009 10:38:24 -0000	1.398
+++ gdb.spec	3 Dec 2009 16:26:37 -0000	1.399
@@ -14,7 +14,7 @@ Version: 7.0
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 7%{?_with_upstream:.upstream}%{?dist}
+Release: 8%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -884,6 +884,10 @@ fi
 %endif
 
 %changelog
+* Thu Dec  3 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-8.fc12
+- Fix slowness/hang when printing some variables (Sami Wagiaalla, BZ 541093).
+- archer-jankratochvil-fedora12 commit: 6817a81cd411acc9579f04dcc105e9bce72859ff
+
 * Wed Nov 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-7.fc12
 - Support GNU IFUNCs - indirect functions (BZ 539590).
 - Fix bp conditionals [bp_location-accel] regression (Phil Muldoon, BZ 538626).



From rdieter at fedoraproject.org  Thu Dec  3 16:27:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 16:27:53 +0000 (UTC)
Subject: rpms/kde-settings/F-12 kde-settings.spec,1.97,1.98
Message-ID: <20091203162753.156A811C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18257

Modified Files:
	kde-settings.spec 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-15.1
- -pulseaudio: drop Req: xine-lib-pulseaudio (handled elsewhere)



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/kde-settings.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kde-settings.spec	1 Dec 2009 19:36:05 -0000	1.97
+++ kde-settings.spec	3 Dec 2009 16:27:52 -0000	1.98
@@ -5,7 +5,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}
+Release: %{rel}.1
 
 Group:   System Environment/Base
 License: Public Domain
@@ -58,8 +58,7 @@ Requires: pulseaudio
 Requires: pulseaudio-module-x11
 ## kde3
 Requires: alsa-plugins-pulseaudio
-## kde4
-Requires: xine-lib-pulseaudio
+## kde4: -pulseaudio plugins are installed for all phonon backends by default
 %description pulseaudio
 %{summary}.
 
@@ -164,6 +163,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-15.1
+- -pulseaudio: drop Req: xine-lib-pulseaudio (handled elsewhere)
+
 * Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-15
 - kdmrc: ServerArgsLocal=-nr , for better transition from plymouth
 



From remi at fedoraproject.org  Thu Dec  3 16:28:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 16:28:32 +0000 (UTC)
Subject: File Net_URL2-0.3.0.tgz uploaded to lookaside cache by remi
Message-ID: <20091203162832.C237410F89D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-pear-Net-URL2:

4fca066d249abdc3cd3c3018d424d82b  Net_URL2-0.3.0.tgz



From remi at fedoraproject.org  Thu Dec  3 16:30:11 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 16:30:11 +0000 (UTC)
Subject: rpms/php-pear-Net-URL2/F-12 php-pear-Net-URL2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203163011.CBD0B11C03F6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-URL2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19317

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Net-URL2.spec 
Log Message:
new package


--- NEW FILE php-pear-Net-URL2.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Net_URL2

Name:           php-pear-Net-URL2
Version:        0.3.0
Release:        1%{?dist}
Summary:        Class for parsing and handling URL

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Net_URL2
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR)


%description
Provides parsing of URLs into their constituent parts (scheme, host, path
etc.), URL generation, and resolving of relative URLs.

%prep
%setup -q -c
# package.xml is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir


# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Net


%changelog
* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.3.0-1
- initial RPM



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-URL2/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:31:38 -0000	1.1
+++ .cvsignore	3 Dec 2009 16:30:11 -0000	1.2
@@ -0,0 +1 @@
+Net_URL2-0.3.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-URL2/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:31:38 -0000	1.1
+++ sources	3 Dec 2009 16:30:11 -0000	1.2
@@ -0,0 +1 @@
+4fca066d249abdc3cd3c3018d424d82b  Net_URL2-0.3.0.tgz



From rdieter at fedoraproject.org  Thu Dec  3 16:31:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 16:31:18 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon-4.3.50-xine_pulseaudio.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 phonon.spec, 1.49, 1.50 sources, 1.14,
	1.15 phonon-4.2.96-pulseaudio.patch, 1.3,
	NONE phonon-4.2.96-xine-pulseaudio.patch, 1.1,
	NONE phonon-4.3.1-xineonly.patch, 1.1,
	NONE phonon-4.3.2-gstreamer-utf8-url.patch, 1.3,
	NONE phonon-4.3.2-gstreamer-volumefader.patch, 1.3,
	NONE phonon-4.3.2-kdebug#172242-2.patch, 1.1,
	NONE phonon-4.3.2-kdebug#172242.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch, 1.1, NONE
Message-ID: <20091203163118.8532611C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19806

Modified Files:
	.cvsignore phonon.spec sources 
Added Files:
	phonon-4.3.50-xine_pulseaudio.patch 
Removed Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.2.96-xine-pulseaudio.patch 
	phonon-4.3.1-xineonly.patch 
	phonon-4.3.2-gstreamer-utf8-url.patch 
	phonon-4.3.2-gstreamer-volumefader.patch 
	phonon-4.3.2-kdebug#172242-2.patch 
	phonon-4.3.2-kdebug#172242.patch 
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
sync w/devel branch for phonon/pulseaudio goodness


phonon-4.3.50-xine_pulseaudio.patch:
 backend.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE phonon-4.3.50-xine_pulseaudio.patch ---
diff -up phonon/xine/backend.cpp.pulseaudio phonon/xine/backend.cpp
--- phonon/xine/backend.cpp.pulseaudio	2009-10-03 14:00:19.000000000 -0500
+++ phonon/xine/backend.cpp	2009-10-19 12:23:17.768923476 -0500
@@ -649,7 +649,7 @@ void Backend::checkAudioOutputs()
                             "in KDE2 and KDE3. Its use is discouraged.</p></html>"),
                         /*icon name */"audio-backend-arts", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                addAudioOutput(nextIndex++, 10, tr("PulseAudio"),
+                addAudioOutput(nextIndex++, 2000, tr("PulseAudio"),
                         xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]),
                         /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "esd")) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Oct 2009 15:34:43 -0000	1.12
+++ .cvsignore	3 Dec 2009 16:31:17 -0000	1.13
@@ -6,3 +6,5 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
+phonon-20091118svn.tar.bz2
+phonon-20091124svn.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- phonon.spec	7 Oct 2009 14:22:44 -0000	1.49
+++ phonon.spec	3 Dec 2009 16:31:18 -0000	1.50
@@ -1,12 +1,16 @@
 
+%define snap 20091124svn
+
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.3.1
-Release: 102%{?dist}
+Version: 4.3.50
+Release: 5.%{snap}%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
+#Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
+Source0: phonon-%{snap}.tar.bz2
+Source1: phonon_snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
@@ -17,27 +21,12 @@ Source14: hi48-phonon-gstreamer.png
 Source15: hi64-phonon-gstreamer.png
 Source16: hi128-phonon-gstreamer.png
 
-# Make PulseAudio the default when listed by the backend.
-# Note that this currently only works for the Xine backend. Device selection in
-# the GStreamer backend is weird: there is a setting for "sink" which cannot be
-# set through systemsettings, and listed devices are only those supported by the
-# "sink". So it never lists "PulseAudio" as a supported device, you have to pick
-# it as a "sink", and then the device setting is ignored entirely.
-Patch0:  phonon-4.2.96-pulseaudio.patch
-Patch1:  phonon-4.2.96-xine-pulseaudio.patch
-Patch2:  qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
-
-## define to build phonon-backend-xine only
-#define xine_only 1
-#Patch10: phonon-4.3.1-xineonly.patch
+# Prefer PulseAudio
+# This one was easiest to port, but doesn't seem to work by itself as-is
+# maybe we can just wait for the improvie PA support to land.
+Patch1:  phonon-4.3.50-xine_pulseaudio.patch
 
 ## Upstream patches
-Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
-Patch101: phonon-4.3.2-gstreamer-volumefader.patch
-# fix for non-ascii filenames in xine backend
-Patch102: phonon-4.3.2-kdebug#172242.patch
-# escape '#' too
-Patch103: phonon-4.3.2-kdebug#172242-2.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
@@ -50,14 +39,15 @@ BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
+%if 0%{?fedora} > 11
+BuildRequires: pulseaudio-libs-devel >= 0.9.21
+%else
+%define pa_keep_old_hacks 1
+%endif
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
-%if 0%{?fedora} > 11
-Requires: qt4%{?_isa} >= 4.5.2-21 
-%else
 Requires: qt4%{?_isa} >= %{_qt4_version}
-%endif
 
 %description
 %{summary}.
@@ -84,6 +74,7 @@ Summary: Gstreamer phonon backend
 Group:   Applications/Multimedia
 Epoch:   2
 Requires: %{name} = %{version}-%{release}
+Requires: gstreamer-plugins-good
 Provides: phonon-backend%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
@@ -92,18 +83,10 @@ Provides:  %{name}-backend-gst = %{versi
 
 
 %prep
-%setup -q -n phonon-%{version}%{?alphatag}
-%patch0 -p1 -b .pulseaudio
-%patch1 -p1 -b .xine-pulseaudio
-%patch2 -p4 -b .gst-pulseaudio
-%patch100 -p0 -b .gstreamer-utf8-url
-%patch101 -p0 -b .gstreamer-volumefader
-%patch102 -p1 -b .xine_nonascii
-%patch103 -p1 -b .xine_nonascii-2
-
-# not working?  use -C .../xine hack below instead for now  -- Rex
-%if 0%{?xine_only}
-#patch10 -p1 -b .xineonly
+%setup -q -n phonon%{!?snap:-%{version}}
+
+%if 0%{?pa_keep_old_hacks}
+%patch1 -p1 -b .xine_pulseaudio
 %endif
 
 
@@ -121,6 +104,9 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}%{?xine_only:/xine}
 
+# symlink for qt/phonon compatibility
+ln -s ../KDE/Phonon %{buildroot}%{_includedir}/phonon/Phonon
+
 # move the oxygen-only phonon-xine icons to hicolor
 mv %{buildroot}%{_datadir}/icons/oxygen \
    %{buildroot}%{_datadir}/icons/hicolor
@@ -204,6 +190,22 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-5.20091124
+- backend-gstreamer: Requires: gstreamer-plugins-good
+
+* Fri Nov 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-4.20091124
+- ln -s ../KDE/Phonon %%_includedir/phonon/Phonon (qt/phonon compat)
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-3.20091124
+- phonon-4.3.50 (20091124 snapshot)
+- enable pulseaudio integration (F-12+)
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-2.20091118
+- phonon-4.3.50 (20091118 snapshot)
+
+* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-1.20091019
+- phonon-4.3.50 (20091019 snapshot)
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
 - Requires: qt4 >= 4.5.2-21 (f12+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	3 Oct 2009 15:34:43 -0000	1.14
+++ sources	3 Dec 2009 16:31:18 -0000	1.15
@@ -1,8 +1,8 @@
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-767cb68052c108e95f293f30acdef3fb  phonon-4.3.1.tar.bz2
 60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
 7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
 0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
+0b522b42d9be2b9297ab972b861fdbb8  phonon-20091124svn.tar.bz2


--- phonon-4.2.96-pulseaudio.patch DELETED ---


--- phonon-4.2.96-xine-pulseaudio.patch DELETED ---


--- phonon-4.3.1-xineonly.patch DELETED ---


--- phonon-4.3.2-gstreamer-utf8-url.patch DELETED ---


--- phonon-4.3.2-gstreamer-volumefader.patch DELETED ---


--- phonon-4.3.2-kdebug#172242-2.patch DELETED ---


--- phonon-4.3.2-kdebug#172242.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch DELETED ---



From rdieter at fedoraproject.org  Thu Dec  3 16:35:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 16:35:29 +0000 (UTC)
Subject: File phonon-20091203svn.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091203163529.36E4110F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for phonon:

05f912c4f1bad40838266eda85702195  phonon-20091203svn.tar.bz2



From remi at fedoraproject.org  Thu Dec  3 16:37:03 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 16:37:03 +0000 (UTC)
Subject: rpms/php-pear-Net-URL2/devel php-pear-Net-URL2.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203163703.5CB6111C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-URL2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21561

Modified Files:
	sources 
Added Files:
	php-pear-Net-URL2.spec 
Log Message:
new package


--- NEW FILE php-pear-Net-URL2.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Net_URL2

Name:           php-pear-Net-URL2
Version:        0.3.0
Release:        1%{?dist}
Summary:        Class for parsing and handling URL

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Net_URL2
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR)


%description
Provides parsing of URLs into their constituent parts (scheme, host, path
etc.), URL generation, and resolving of relative URLs.

%prep
%setup -q -c
# package.xml is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir


# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Net


%changelog
* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.3.0-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-URL2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:31:38 -0000	1.1
+++ sources	3 Dec 2009 16:37:03 -0000	1.2
@@ -0,0 +1 @@
+4fca066d249abdc3cd3c3018d424d82b  Net_URL2-0.3.0.tgz



From remi at fedoraproject.org  Thu Dec  3 16:38:16 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 16:38:16 +0000 (UTC)
Subject: rpms/php-pear-Net-URL2/F-11 php-pear-Net-URL2.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203163816.D632F11C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-URL2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22030

Modified Files:
	sources 
Added Files:
	php-pear-Net-URL2.spec 
Log Message:
new package


--- NEW FILE php-pear-Net-URL2.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Net_URL2

Name:           php-pear-Net-URL2
Version:        0.3.0
Release:        1%{?dist}
Summary:        Class for parsing and handling URL

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Net_URL2
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR)


%description
Provides parsing of URLs into their constituent parts (scheme, host, path
etc.), URL generation, and resolving of relative URLs.

%prep
%setup -q -c
# package.xml is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir


# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Net


%changelog
* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.3.0-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-URL2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:31:38 -0000	1.1
+++ sources	3 Dec 2009 16:38:16 -0000	1.2
@@ -0,0 +1 @@
+4fca066d249abdc3cd3c3018d424d82b  Net_URL2-0.3.0.tgz



From rdieter at fedoraproject.org  Thu Dec  3 16:38:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 16:38:26 +0000 (UTC)
Subject: rpms/phonon/devel .cvsignore, 1.15, 1.16 phonon.spec, 1.52,
	1.53 sources, 1.17, 1.18
Message-ID: <20091203163826.AF82411C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-6.20091203
i phonon-4.3.50 (20091203 snapshot)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Nov 2009 16:38:29 -0000	1.15
+++ .cvsignore	3 Dec 2009 16:38:26 -0000	1.16
@@ -1,10 +1,8 @@
 gstreamer-logo.svg
-phonon-4.3.1.tar.bz2
 hi128-phonon-gstreamer.png
 hi16-phonon-gstreamer.png
 hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
-phonon-20091118svn.tar.bz2
-phonon-20091124svn.tar.bz2
+phonon-20091203svn.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- phonon.spec	30 Nov 2009 19:46:37 -0000	1.52
+++ phonon.spec	3 Dec 2009 16:38:26 -0000	1.53
@@ -1,10 +1,10 @@
 
-%define snap 20091124svn
+%define snap 20091203svn
 
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.50
-Release: 5.%{snap}%{?dist}
+Release: 6.%{snap}%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-6.20091203
+i phonon-4.3.50 (20091203 snapshot)
+
 * Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-5.20091124
 - backend-gstreamer: Requires: gstreamer-plugins-good
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	24 Nov 2009 16:38:29 -0000	1.17
+++ sources	3 Dec 2009 16:38:26 -0000	1.18
@@ -5,4 +5,4 @@
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-0b522b42d9be2b9297ab972b861fdbb8  phonon-20091124svn.tar.bz2
+05f912c4f1bad40838266eda85702195  phonon-20091203svn.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec  3 16:39:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:39:24 +0000
Subject: [pkgdb] emacs: dnovotny has given up watchbugzilla
Message-ID: <20091203163924.8790110F896@bastion2.fedora.phx.redhat.com>

dnovotny has given up the watchbugzilla acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:39:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:39:26 +0000
Subject: [pkgdb] emacs: dnovotny has given up watchcommits
Message-ID: <20091203163926.42F4A10F8A1@bastion2.fedora.phx.redhat.com>

dnovotny has given up the watchcommits acl on emacs (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:39:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:39:28 +0000
Subject: [pkgdb] emacs: dnovotny has given up commit
Message-ID: <20091203163928.7230510F8A3@bastion2.fedora.phx.redhat.com>

dnovotny has given up the commit acl on emacs (Fedora devel)

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



From rdieter at fedoraproject.org  Thu Dec  3 16:39:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 16:39:31 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.53,1.54
Message-ID: <20091203163931.E469011C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	phonon.spec 
Log Message:
typo



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- phonon.spec	3 Dec 2009 16:38:26 -0000	1.53
+++ phonon.spec	3 Dec 2009 16:39:31 -0000	1.54
@@ -191,7 +191,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 %changelog
 * Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-6.20091203
-i phonon-4.3.50 (20091203 snapshot)
+- phonon-4.3.50 (20091203 snapshot)
 
 * Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-5.20091124
 - backend-gstreamer: Requires: gstreamer-plugins-good



From pkgdb at fedoraproject.org  Thu Dec  3 16:39:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:39:30 +0000
Subject: [pkgdb] emacs: dnovotny has given up approveacls
Message-ID: <20091203163930.8910010F8A8@bastion2.fedora.phx.redhat.com>

dnovotny has given up the approveacls acl on emacs (Fedora devel)

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



From remi at fedoraproject.org  Thu Dec  3 16:40:05 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 16:40:05 +0000 (UTC)
Subject: rpms/php-pear-Net-URL2/EL-5 php-pear-Net-URL2.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203164005.A71ED11C03F6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-URL2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22880

Modified Files:
	sources 
Added Files:
	php-pear-Net-URL2.spec 
Log Message:
new package


--- NEW FILE php-pear-Net-URL2.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Net_URL2

Name:           php-pear-Net-URL2
Version:        0.3.0
Release:        1%{?dist}
Summary:        Class for parsing and handling URL

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Net_URL2
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR)


%description
Provides parsing of URLs into their constituent parts (scheme, host, path
etc.), URL generation, and resolving of relative URLs.

%prep
%setup -q -c
# package.xml is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir


# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Net


%changelog
* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.3.0-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-URL2/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:31:38 -0000	1.1
+++ sources	3 Dec 2009 16:40:05 -0000	1.2
@@ -0,0 +1 @@
+4fca066d249abdc3cd3c3018d424d82b  Net_URL2-0.3.0.tgz



From rdieter at fedoraproject.org  Thu Dec  3 16:40:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 16:40:23 +0000 (UTC)
Subject: rpms/phonon/F-12 .cvsignore, 1.13, 1.14 phonon.spec, 1.50,
	1.51 sources, 1.15, 1.16
Message-ID: <20091203164023.3275B11C03F6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23031

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-6.20091203
- phonon-4.3.50 (20091203 snapshot)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Dec 2009 16:31:17 -0000	1.13
+++ .cvsignore	3 Dec 2009 16:40:23 -0000	1.14
@@ -1,10 +1,8 @@
 gstreamer-logo.svg
-phonon-4.3.1.tar.bz2
 hi128-phonon-gstreamer.png
 hi16-phonon-gstreamer.png
 hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
-phonon-20091118svn.tar.bz2
-phonon-20091124svn.tar.bz2
+phonon-20091203svn.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- phonon.spec	3 Dec 2009 16:31:18 -0000	1.50
+++ phonon.spec	3 Dec 2009 16:40:23 -0000	1.51
@@ -1,10 +1,10 @@
 
-%define snap 20091124svn
+%define snap 20091203svn
 
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.50
-Release: 5.%{snap}%{?dist}
+Release: 6.%{snap}%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-6.20091203
+- phonon-4.3.50 (20091203 snapshot)
+
 * Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-5.20091124
 - backend-gstreamer: Requires: gstreamer-plugins-good
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	3 Dec 2009 16:31:18 -0000	1.15
+++ sources	3 Dec 2009 16:40:23 -0000	1.16
@@ -5,4 +5,4 @@
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-0b522b42d9be2b9297ab972b861fdbb8  phonon-20091124svn.tar.bz2
+05f912c4f1bad40838266eda85702195  phonon-20091203svn.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec  3 16:45:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:45:33 +0000
Subject: [pkgdb] systemtap: roland has requested approveacls
Message-ID: <20091203164533.7E26810F84E@bastion2.fedora.phx.redhat.com>

roland has requested the approveacls acl on systemtap (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:45:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:45:36 +0000
Subject: [pkgdb] systemtap: roland has requested commit
Message-ID: <20091203164536.D30BB10F89C@bastion2.fedora.phx.redhat.com>

roland has requested the commit acl on systemtap (Fedora devel)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:47:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:47:34 +0000
Subject: [pkgdb] systemtap: roland has requested commit
Message-ID: <20091203164734.8C04410F859@bastion2.fedora.phx.redhat.com>

roland has requested the commit acl on systemtap (Fedora 12)

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



From pkgdb at fedoraproject.org  Thu Dec  3 16:47:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 16:47:37 +0000
Subject: [pkgdb] systemtap: roland has requested approveacls
Message-ID: <20091203164737.BB74210F89D@bastion2.fedora.phx.redhat.com>

roland has requested the approveacls acl on systemtap (Fedora 12)

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



From arbiter at fedoraproject.org  Thu Dec  3 16:50:08 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  3 Dec 2009 16:50:08 +0000 (UTC)
Subject: rpms/cherokee/EL-4 .cvsignore, 1.10, 1.11 cherokee.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <20091203165008.E918E11C03DB@cvs1.fedora.phx.redhat.com>

Author: arbiter

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

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
- New upstream release: 0.99.31



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Nov 2009 19:53:14 -0000	1.10
+++ .cvsignore	3 Dec 2009 16:50:08 -0000	1.11
@@ -1 +1 @@
-cherokee-0.99.27.tar.gz
+cherokee-0.99.31.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/cherokee.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- cherokee.spec	9 Nov 2009 19:53:14 -0000	1.14
+++ cherokee.spec	3 Dec 2009 16:50:08 -0000	1.15
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.27
+Version:        0.99.31
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -24,10 +24,11 @@ Source1:        %{name}.init
 Source2:        %{name}.logrotate
 
 BuildRequires:  openssl-devel pam-devel mysql-devel pcre
+# BuildRequires:  pcre-devel
 BuildRequires:  gettext
 # For spawn-fcgi
-Requires:	    spawn-fcgi
-Requires(post): chkconfig
+Requires:	 spawn-fcgi
+Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
@@ -166,9 +167,30 @@ fi
 
 
 %changelog
-* Mon Nov 09 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.27-1
+* Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
+- New upstream release: 0.99.31
+
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.30-1
+- 0.99.30
+
+* Sun Nov 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.29-1
+- 0.99.29
+
+* Sat Nov 07 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.27-1
 - 0.99.27
 
+* Sat Sep  5 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.24-1
+- 0.99.24
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.99.20-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 11 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.20-1
+- updated to 0.99.20
+
 * Sun Jun 14 2009 Pavel Lisy <pavel.lisy at gmail.com> - 0.99.17-2
 - .spec changes in %files section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Nov 2009 19:53:14 -0000	1.10
+++ sources	3 Dec 2009 16:50:08 -0000	1.11
@@ -1 +1 @@
-83e0933281b9a2154bbf8998913acb55  cherokee-0.99.27.tar.gz
+e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz



From rdieter at fedoraproject.org  Thu Dec  3 16:50:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 16:50:41 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon_snapshot.sh,NONE,1.1
Message-ID: <20091203165041.4CA9911C03DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26326

Added Files:
	phonon_snapshot.sh 
Log Message:
import



--- NEW FILE phonon_snapshot.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=phonon

set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/phonon $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR




From remi at fedoraproject.org  Thu Dec  3 16:56:59 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 16:56:59 +0000 (UTC)
Subject: File HTTP_Request2-0.5.1.tgz uploaded to lookaside cache by remi
Message-ID: <20091203165659.02F8210F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-pear-HTTP-Request2:

8096a3e9bbebf11780006e2c347ef650  HTTP_Request2-0.5.1.tgz



From remi at fedoraproject.org  Thu Dec  3 16:58:35 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 16:58:35 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request2/devel php-pear-HTTP-Request2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203165835.C5EB811C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP-Request2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28818

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-HTTP-Request2.spec 
Log Message:
new package


--- NEW FILE php-pear-HTTP-Request2.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTTP_Request2

Name:           php-pear-HTTP-Request2
Version:        0.5.1
Release:        1%{?dist}
Summary:        Provides an easy way to perform HTTP requests

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTTP_Request2
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear(PEAR) >= 1.5.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(Net_URL2) >= 0.2.0
Requires:       php-pear(PEAR) >= 1.5.4
# Optional dependencies from pci result
Requires:       php-mbstring >= 5.1.4
Requires:       php-pecl(Fileinfo)

%description
PHP5 rewrite of HTTP_Request package. Provides cleaner API and pluggable
Adapters. Currently available are:
  * Socket adapter, based on old HTTP_Request code,
  * Curl adapter, wraps around PHP's cURL extension,
  * Mock adapter, to use for testing packages dependent on HTTP_Request2.
Supports POST requests with data and file uploads, basic and digest 
authentication, cookies, proxies, gzip and deflate encodings, monitoring 
the request progress with Observers...

%prep
%setup -q -c
# Package.xml is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

sed -i -e 's/\r//' docdir/%{pear_name}/docs/examples/upload-rapidshare.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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTTP
%{pear_testdir}/HTTP_Request2


%changelog
* Sun Nov 22 2009 Remi Collet <Fedora at FamilleCollet.com> 0.5.1-1
- new version

* Fri Nov 20 2009 Remi Collet <Fedora at FamilleCollet.com> 0.5.0-1
- new version

* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.4.1-1
- initial RPM



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:32:24 -0000	1.1
+++ .cvsignore	3 Dec 2009 16:58:35 -0000	1.2
@@ -0,0 +1 @@
+HTTP_Request2-0.5.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:32:24 -0000	1.1
+++ sources	3 Dec 2009 16:58:35 -0000	1.2
@@ -0,0 +1 @@
+8096a3e9bbebf11780006e2c347ef650  HTTP_Request2-0.5.1.tgz



From devrim at fedoraproject.org  Thu Dec  3 17:00:12 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  3 Dec 2009 17:00:12 +0000 (UTC)
Subject: rpms/pgadmin3/F-11 .cvsignore, 1.12, 1.13 pgadmin3.spec, 1.23,
	1.24 sources, 1.12, 1.13
Message-ID: <20091203170012.C42FA11C03F6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgadmin3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29239/F-11

Modified Files:
	.cvsignore pgadmin3.spec sources 
Log Message:
Update to 1.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jun 2009 15:02:11 -0000	1.12
+++ .cvsignore	3 Dec 2009 17:00:12 -0000	1.13
@@ -1 +1 @@
-pgadmin3-1.10.0.tar.gz
+pgadmin3-1.10.1.tar.gz


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-11/pgadmin3.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- pgadmin3.spec	29 Jun 2009 15:02:11 -0000	1.23
+++ pgadmin3.spec	3 Dec 2009 17:00:12 -0000	1.24
@@ -1,6 +1,6 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.10.0
+Version:	1.10.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
@@ -85,6 +85,12 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Thu Dec 3 2009 Devrim GUNDUZ <devrim at gunduz.org> 1.10.1-1
+- Update to 1.10.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 29 2009 Devrim GUNDUZ <devrim at gunduz.org> 1.10.0-1
 - Update to 1.10.0
 - Update licence


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Jun 2009 15:02:11 -0000	1.12
+++ sources	3 Dec 2009 17:00:12 -0000	1.13
@@ -1 +1 @@
-3f2032c78657e3db4e0719613751060c  pgadmin3-1.10.0.tar.gz
+9909334d453483becc534c1eb74a6d63  pgadmin3-1.10.1.tar.gz



From devrim at fedoraproject.org  Thu Dec  3 17:00:12 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  3 Dec 2009 17:00:12 +0000 (UTC)
Subject: rpms/pgadmin3/F-10 .cvsignore, 1.12, 1.13 pgadmin3.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20091203170012.4A5D811C03F6@cvs1.fedora.phx.redhat.com>

Author: devrim

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

Modified Files:
	.cvsignore pgadmin3.spec sources 
Log Message:
Update to 1.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jun 2009 15:08:07 -0000	1.12
+++ .cvsignore	3 Dec 2009 17:00:11 -0000	1.13
@@ -1 +1 @@
-pgadmin3-1.10.0.tar.gz
+pgadmin3-1.10.1.tar.gz


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-10/pgadmin3.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pgadmin3.spec	29 Jun 2009 15:08:07 -0000	1.24
+++ pgadmin3.spec	3 Dec 2009 17:00:11 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.10.0
+Version:	1.10.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
@@ -85,6 +85,12 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Thu Dec 3 2009 Devrim GUNDUZ <devrim at gunduz.org> 1.10.1-1
+- Update to 1.10.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 29 2009 Devrim GUNDUZ <devrim at gunduz.org> 1.10.0-1
 - Update to 1.10.0
 - Update licence
@@ -94,9 +100,6 @@ rm -rf %{buildroot}
   Removed useless -docs package, main package shipped it anyway
   Many spec file and package cleanups to get rpmlint very silent
 
-* Wed Dec 31 2008 Devrim GUNDUZ <devrim at commandprompt.com> 1.8.4-3
-- Rebuilt for Fedora 10
-
 * Mon Jul 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.8.4-2
 - Use $RPM_OPT_FLAGS, build with dependency tracking disabled (#229054).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Jun 2009 15:08:07 -0000	1.12
+++ sources	3 Dec 2009 17:00:12 -0000	1.13
@@ -1 +1 @@
-3f2032c78657e3db4e0719613751060c  pgadmin3-1.10.0.tar.gz
+9909334d453483becc534c1eb74a6d63  pgadmin3-1.10.1.tar.gz



From devrim at fedoraproject.org  Thu Dec  3 17:00:13 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu,  3 Dec 2009 17:00:13 +0000 (UTC)
Subject: rpms/pgadmin3/F-12 .cvsignore, 1.12, 1.13 pgadmin3.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20091203170013.A25DE11C03F6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgadmin3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29239/F-12

Modified Files:
	.cvsignore pgadmin3.spec sources 
Log Message:
Update to 1.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jun 2009 15:02:11 -0000	1.12
+++ .cvsignore	3 Dec 2009 17:00:12 -0000	1.13
@@ -1 +1 @@
-pgadmin3-1.10.0.tar.gz
+pgadmin3-1.10.1.tar.gz


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-12/pgadmin3.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pgadmin3.spec	26 Jul 2009 17:53:36 -0000	1.24
+++ pgadmin3.spec	3 Dec 2009 17:00:13 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.10.0
-Release:	2%{?dist}
+Version:	1.10.1
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source:		ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Thu Dec 3 2009 Devrim GUNDUZ <devrim at gunduz.org> 1.10.1-1
+- Update to 1.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Jun 2009 15:02:11 -0000	1.12
+++ sources	3 Dec 2009 17:00:13 -0000	1.13
@@ -1 +1 @@
-3f2032c78657e3db4e0719613751060c  pgadmin3-1.10.0.tar.gz
+9909334d453483becc534c1eb74a6d63  pgadmin3-1.10.1.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 17:02:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 17:02:24 +0000
Subject: [pkgdb] systemtap had acl change status
Message-ID: <20091203170224.1455110F88E@bastion2.fedora.phx.redhat.com>

mjw has set the watchbugzilla acl on systemtap (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Thu Dec  3 17:02:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 17:02:26 +0000
Subject: [pkgdb] systemtap had acl change status
Message-ID: <20091203170226.4229010F89D@bastion2.fedora.phx.redhat.com>

mjw has set the watchcommits acl on systemtap (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Thu Dec  3 17:02:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 17:02:28 +0000
Subject: [pkgdb] systemtap had acl change status
Message-ID: <20091203170228.DD0B910F8A6@bastion2.fedora.phx.redhat.com>

mjw has set the commit acl on systemtap (Fedora devel) to Approved for roland

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



From pkgdb at fedoraproject.org  Thu Dec  3 17:02:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 17:02:51 +0000
Subject: [pkgdb] systemtap had acl change status
Message-ID: <20091203170251.9DD2F10F88E@bastion2.fedora.phx.redhat.com>

mjw has set the watchbugzilla acl on systemtap (Fedora 12) to Approved for roland

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



From pkgdb at fedoraproject.org  Thu Dec  3 17:02:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 17:02:57 +0000
Subject: [pkgdb] systemtap had acl change status
Message-ID: <20091203170258.CD21010F8A5@bastion2.fedora.phx.redhat.com>

mjw has set the commit acl on systemtap (Fedora 12) to Approved for roland

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



From pkgdb at fedoraproject.org  Thu Dec  3 17:03:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 17:03:02 +0000
Subject: [pkgdb] systemtap had acl change status
Message-ID: <20091203170302.90EC910F8A2@bastion2.fedora.phx.redhat.com>

mjw has set the approveacls acl on systemtap (Fedora 12) to Approved for roland

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



From pkgdb at fedoraproject.org  Thu Dec  3 17:02:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 17:02:31 +0000
Subject: [pkgdb] systemtap had acl change status
Message-ID: <20091203170231.A741A10F8AD@bastion2.fedora.phx.redhat.com>

mjw has set the approveacls acl on systemtap (Fedora devel) to Approved for roland

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



From remi at fedoraproject.org  Thu Dec  3 17:03:13 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:03:13 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request2/F-12 php-pear-HTTP-Request2.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20091203170314.079BA11C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP-Request2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30143

Modified Files:
	sources 
Added Files:
	php-pear-HTTP-Request2.spec 
Log Message:
new package


--- NEW FILE php-pear-HTTP-Request2.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTTP_Request2

Name:           php-pear-HTTP-Request2
Version:        0.5.1
Release:        1%{?dist}
Summary:        Provides an easy way to perform HTTP requests

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTTP_Request2
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear(PEAR) >= 1.5.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(Net_URL2) >= 0.2.0
Requires:       php-pear(PEAR) >= 1.5.4
# Optional dependencies from pci result
Requires:       php-mbstring >= 5.1.4
Requires:       php-pecl(Fileinfo)

%description
PHP5 rewrite of HTTP_Request package. Provides cleaner API and pluggable
Adapters. Currently available are:
  * Socket adapter, based on old HTTP_Request code,
  * Curl adapter, wraps around PHP's cURL extension,
  * Mock adapter, to use for testing packages dependent on HTTP_Request2.
Supports POST requests with data and file uploads, basic and digest 
authentication, cookies, proxies, gzip and deflate encodings, monitoring 
the request progress with Observers...

%prep
%setup -q -c
# Package.xml is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

sed -i -e 's/\r//' docdir/%{pear_name}/docs/examples/upload-rapidshare.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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTTP
%{pear_testdir}/HTTP_Request2


%changelog
* Sun Nov 22 2009 Remi Collet <Fedora at FamilleCollet.com> 0.5.1-1
- new version

* Fri Nov 20 2009 Remi Collet <Fedora at FamilleCollet.com> 0.5.0-1
- new version

* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.4.1-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request2/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:32:24 -0000	1.1
+++ sources	3 Dec 2009 17:03:13 -0000	1.2
@@ -0,0 +1 @@
+8096a3e9bbebf11780006e2c347ef650  HTTP_Request2-0.5.1.tgz



From pkgdb at fedoraproject.org  Thu Dec  3 17:02:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 17:02:54 +0000
Subject: [pkgdb] systemtap had acl change status
Message-ID: <20091203170254.6AA2910F89E@bastion2.fedora.phx.redhat.com>

mjw has set the watchcommits acl on systemtap (Fedora 12) to Approved for roland

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



From remi at fedoraproject.org  Thu Dec  3 17:04:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:04:32 +0000 (UTC)
Subject: rpms/php-pear-HTTP-Request2/F-11 php-pear-HTTP-Request2.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20091203170432.AC89511C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP-Request2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30591

Modified Files:
	sources 
Added Files:
	php-pear-HTTP-Request2.spec 
Log Message:
new package


--- NEW FILE php-pear-HTTP-Request2.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTTP_Request2

Name:           php-pear-HTTP-Request2
Version:        0.5.1
Release:        1%{?dist}
Summary:        Provides an easy way to perform HTTP requests

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTTP_Request2
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear(PEAR) >= 1.5.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(Net_URL2) >= 0.2.0
Requires:       php-pear(PEAR) >= 1.5.4
# Optional dependencies from pci result
Requires:       php-mbstring >= 5.1.4
Requires:       php-pecl(Fileinfo)

%description
PHP5 rewrite of HTTP_Request package. Provides cleaner API and pluggable
Adapters. Currently available are:
  * Socket adapter, based on old HTTP_Request code,
  * Curl adapter, wraps around PHP's cURL extension,
  * Mock adapter, to use for testing packages dependent on HTTP_Request2.
Supports POST requests with data and file uploads, basic and digest 
authentication, cookies, proxies, gzip and deflate encodings, monitoring 
the request progress with Observers...

%prep
%setup -q -c
# Package.xml is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

sed -i -e 's/\r//' docdir/%{pear_name}/docs/examples/upload-rapidshare.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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/examples
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTTP
%{pear_testdir}/HTTP_Request2


%changelog
* Sun Nov 22 2009 Remi Collet <Fedora at FamilleCollet.com> 0.5.1-1
- new version

* Fri Nov 20 2009 Remi Collet <Fedora at FamilleCollet.com> 0.5.0-1
- new version

* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.4.1-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:32:24 -0000	1.1
+++ sources	3 Dec 2009 17:04:32 -0000	1.2
@@ -0,0 +1 @@
+8096a3e9bbebf11780006e2c347ef650  HTTP_Request2-0.5.1.tgz



From remi at fedoraproject.org  Thu Dec  3 17:12:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:12:32 +0000 (UTC)
Subject: File HTTP_OAuth-0.1.6.tgz uploaded to lookaside cache by remi
Message-ID: <20091203171232.01FED10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-pear-HTTP-OAuth:

8fe858e0b5abe5d3147a490c2887337d  HTTP_OAuth-0.1.6.tgz



From twaugh at fedoraproject.org  Thu Dec  3 17:12:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 17:12:43 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-browsepoll.patch, NONE,
	1.1 system-config-printer.spec, 1.315, 1.316
Message-ID: <20091203171243.65E7711C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv891

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-browsepoll.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).


system-config-printer-browsepoll.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-browsepoll.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.browsepoll system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.browsepoll	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-03 17:09:32.221925957 +0000
@@ -3379,7 +3379,7 @@ class GUI(GtkGUI, monitor.Watcher):
         self.setDataButtonState()
 
     def save_serversettings(self):
-        setting_dict = self.server_settings.copy()
+        setting_dict = dict()
         for widget, setting in [
             (self.chkServerBrowse, cups.CUPS_SERVER_REMOTE_PRINTERS),
             (self.chkServerShare, cups.CUPS_SERVER_SHARE_PRINTERS),


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- system-config-printer.spec	3 Dec 2009 14:59:37 -0000	1.315
+++ system-config-printer.spec	3 Dec 2009 17:12:43 -0000	1.316
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-localize-statereason.patch
+Patch3: system-config-printer-browsepoll.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -78,6 +79,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .localize-statereason
+%patch3 -p1 -b .browsepoll
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -190,6 +192,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
+- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
 - Handle RuntimeError when localizing state reason (bug #543937).
 



From twaugh at fedoraproject.org  Thu Dec  3 17:13:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 17:13:32 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-browsepoll.patch, NONE,
	1.1 system-config-printer.spec, 1.320, 1.321
Message-ID: <20091203171332.6886C11C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1213

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-browsepoll.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).


system-config-printer-browsepoll.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-browsepoll.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.browsepoll system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.browsepoll	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-03 17:09:32.221925957 +0000
@@ -3379,7 +3379,7 @@ class GUI(GtkGUI, monitor.Watcher):
         self.setDataButtonState()
 
     def save_serversettings(self):
-        setting_dict = self.server_settings.copy()
+        setting_dict = dict()
         for widget, setting in [
             (self.chkServerBrowse, cups.CUPS_SERVER_REMOTE_PRINTERS),
             (self.chkServerShare, cups.CUPS_SERVER_SHARE_PRINTERS),


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- system-config-printer.spec	3 Dec 2009 15:01:12 -0000	1.320
+++ system-config-printer.spec	3 Dec 2009 17:13:32 -0000	1.321
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-localize-statereason.patch
+Patch3: system-config-printer-browsepoll.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -78,6 +79,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .localize-statereason
+%patch3 -p1 -b .browsepoll
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -190,6 +192,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
+- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
 - Handle RuntimeError when localizing state reason (bug #543937).
 



From twaugh at fedoraproject.org  Thu Dec  3 17:14:51 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 17:14:51 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-browsepoll.patch, NONE,
	1.1 system-config-printer.spec, 1.309, 1.310
Message-ID: <20091203171451.E3FB011C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1617

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-browsepoll.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).


system-config-printer-browsepoll.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-browsepoll.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.browsepoll system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.browsepoll	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-03 17:09:32.221925957 +0000
@@ -3379,7 +3379,7 @@ class GUI(GtkGUI, monitor.Watcher):
         self.setDataButtonState()
 
     def save_serversettings(self):
-        setting_dict = self.server_settings.copy()
+        setting_dict = dict()
         for widget, setting in [
             (self.chkServerBrowse, cups.CUPS_SERVER_REMOTE_PRINTERS),
             (self.chkServerShare, cups.CUPS_SERVER_SHARE_PRINTERS),


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -p -r1.309 -r1.310
--- system-config-printer.spec	3 Dec 2009 15:03:00 -0000	1.309
+++ system-config-printer.spec	3 Dec 2009 17:14:51 -0000	1.310
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-localize-statereason.patch
+Patch2: system-config-printer-browsepoll.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,6 +66,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .localize-statereason
+%patch2 -p1 -b .browsepoll
 
 %build
 %configure
@@ -167,6 +169,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
+- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
 - Handle RuntimeError when localizing state reason (bug #543937).
 



From rdieter at fedoraproject.org  Thu Dec  3 17:16:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 17:16:26 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12
	kdebase-runtime-4.3.1-backend-globalconfig.patch, NONE,
	1.1 kdebase-runtime.spec, 1.154, 1.155
Message-ID: <20091203171626.58B6411C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2160

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-backend-globalconfig.patch 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2
- phonon/pulseaudio patch from mandriva, kudos to coling (f12)


kdebase-runtime-4.3.1-backend-globalconfig.patch:
 b/phonon/kcm/CMakeLists.txt                |    2 
 b/phonon/kcm/devicepreference.cpp          |  233 ++++------------------------
 b/phonon/kcm/devicepreference.h            |    1 
 b/phonon/kded-module/CMakeLists.txt        |   14 -
 b/phonon/kded-module/audiodeviceaccess.cpp |    6 
 b/phonon/kded-module/audiodeviceaccess.h   |    5 
 b/phonon/kded-module/phononserver.cpp      |  199 ------------------------
 b/phonon/kded-module/phononserver.h        |    2 
 phonon/kcm/devicepreference.cpp            |    4 
 phonon/kcm/globalconfig.cpp                |  235 -----------------------------
 phonon/kcm/globalconfig_p.h                |   63 -------
 11 files changed, 47 insertions(+), 717 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-backend-globalconfig.patch ---
diff --git a/phonon/kcm/CMakeLists.txt b/phonon/kcm/CMakeLists.txt
index 5ca78b7..9525607 100644
--- a/phonon/kcm/CMakeLists.txt
+++ b/phonon/kcm/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(xine)
 
-set(kcmphonon_SRCS main.cpp devicepreference.cpp backendselection.cpp globalconfig.cpp)
+set(kcmphonon_SRCS main.cpp devicepreference.cpp backendselection.cpp)
 kde4_add_ui_files(kcmphonon_SRCS devicepreference.ui backendselection.ui)
 
 kde4_add_plugin(kcm_phonon ${kcmphonon_SRCS})
diff --git a/phonon/kcm/devicepreference.cpp b/phonon/kcm/devicepreference.cpp
index 5065f3c..71e772b 100644
--- a/phonon/kcm/devicepreference.cpp
+++ b/phonon/kcm/devicepreference.cpp
@@ -34,11 +34,12 @@
 
 #include <Phonon/AudioOutput>
 #include <Phonon/MediaObject>
+#include <phonon/backendinterface.h>
 #include <phonon/backendcapabilities.h>
+#include <phonon/globalconfig.h>
 #include <phonon/objectdescription.h>
 #include <phonon/phononnamespace.h>
-#include "qsettingsgroup_p.h"
-#include "globalconfig_p.h"
+#include "factory_p.h"
 #include <kfadewidgeteffect.h>
 
 #include <kdialog.h>
@@ -55,8 +56,6 @@
 Q_DECLARE_METATYPE(QList<int>)
 #endif
 
-using Phonon::QSettingsGroup;
-
 static const Phonon::Category captureCategories[] = {
     Phonon::NoCategory,
     Phonon::CommunicationCategory,
@@ -318,111 +317,39 @@ void DevicePreference::updateAudioOutputDevices()
 
 QList<Phonon::AudioOutputDevice> DevicePreference::availableAudioOutputDevices() const
 {
-    QList<Phonon::AudioOutputDevice> ret;
-    const QList<int> deviceIndexes = Phonon::GlobalConfig().audioOutputDeviceListFor(Phonon::NoCategory,
-            showCheckBox->isChecked()
-            ? Phonon::GlobalConfig::ShowAdvancedDevices
-            : Phonon::GlobalConfig::HideAdvancedDevices);
-    foreach (int i, deviceIndexes) {
-        ret.append(Phonon::AudioOutputDevice::fromIndex(i));
-    }
-    return ret;
+    return Phonon::BackendCapabilities::availableAudioOutputDevices();
 }
 
 QList<Phonon::AudioCaptureDevice> DevicePreference::availableAudioCaptureDevices() const
 {
-    QList<Phonon::AudioCaptureDevice> ret;
-    const QList<int> deviceIndexes = Phonon::GlobalConfig().audioCaptureDeviceListFor(Phonon::NoCategory,
-            showCheckBox->isChecked()
-            ? Phonon::GlobalConfig::ShowAdvancedDevices
-            : Phonon::GlobalConfig::HideAdvancedDevices);
-    kDebug() << deviceIndexes;
-    foreach (int i, deviceIndexes) {
-        ret.append(Phonon::AudioCaptureDevice::fromIndex(i));
-    }
-    return ret;
+    return Phonon::BackendCapabilities::availableAudioCaptureDevices();
 }
 
 void DevicePreference::load()
 {
-    QSettings phononConfig(QLatin1String("kde.org"), QLatin1String("libphonon"));
-    QSettingsGroup outputDeviceGroup(&phononConfig, QLatin1String("AudioOutputDevice"));
-    QSettingsGroup captureDeviceGroup(&phononConfig, QLatin1String("AudioCaptureDevice"));
-    QSettingsGroup generalGroup(&phononConfig, QLatin1String("General"));
-    showCheckBox->setChecked(!generalGroup.value(QLatin1String("HideAdvancedDevices"), true));
-
-    {
-        // the following call returns ordered according to NoCategory
-        const QList<Phonon::AudioOutputDevice> list = availableAudioOutputDevices();
-        m_outputModel[Phonon::NoCategory]->setModelData(list);
-
-        QHash<int, Phonon::AudioOutputDevice> hash;
-        foreach (const Phonon::AudioOutputDevice &dev, list) {
-            hash.insert(dev.index(), dev);
-        }
-        for (int i = 0; i <= Phonon::LastCategory; ++i) {
-            const QString configKey(QLatin1String("Category_") + QString::number(i));
-            if (!outputDeviceGroup.hasKey(configKey)) {
-                m_outputModel[i]->setModelData(list); // use the NoCategory order
-                continue;
-            }
-            QHash<int, Phonon::AudioOutputDevice> hashCopy(hash);
-            const QList<int> order = outputDeviceGroup.value(configKey, QList<int>());
-            QList<Phonon::AudioOutputDevice> orderedList;
-            foreach (int idx, order) {
-                if (hashCopy.contains(idx)) {
-                    orderedList << hashCopy.take(idx);
-                }
-            }
-            if (hashCopy.size() > 1) {
-                // keep the order of the original list
-                foreach (const Phonon::AudioOutputDevice &dev, list) {
-                    if (hashCopy.contains(dev.index())) {
-                        orderedList << hashCopy.take(dev.index());
-                    }
-                }
-            } else if (hashCopy.size() == 1) {
-                orderedList += hashCopy.values();
-            }
-            m_outputModel[i]->setModelData(orderedList);
-        }
-    }
-    {
-        // the following call returns ordered according to NoCategory
-        QList<Phonon::AudioCaptureDevice> list = availableAudioCaptureDevices();
-        m_captureModel[Phonon::NoCategory]->setModelData(list);
+    showCheckBox->setChecked(!Phonon::GlobalConfig().getHideAdvancedDevices());
+    loadCategoryDevices();
+}
 
-        QHash<int, Phonon::AudioCaptureDevice> hash;
-        foreach (const Phonon::AudioCaptureDevice &dev, list) {
-            hash.insert(dev.index(), dev);
+void DevicePreference::loadCategoryDevices()
+{
+    // "Load" the settings from the backend.
+    for (Phonon::Category cat = Phonon::NoCategory; cat <= Phonon::LastCategory; ++cat) {
+        QList<Phonon::AudioOutputDevice> list;
+        const QList<int> deviceIndexes = Phonon::GlobalConfig().audioOutputDeviceListFor(cat);
+        foreach (int i, deviceIndexes) {
+            list.append(Phonon::AudioOutputDevice::fromIndex(i));
         }
-        for (int i = 1; i < captureCategoriesCount; ++i) { // i == 1 to skip NoCategory
-            const Phonon::Category cat = captureCategories[i];
-            const QString configKey(QLatin1String("Category_") + QString::number(cat));
-            if (!captureDeviceGroup.hasKey(configKey)) {
-                m_captureModel[cat]->setModelData(list); // use the NoCategory order
-                continue;
-            }
-            QHash<int, Phonon::AudioCaptureDevice> hashCopy(hash);
-            const QList<int> order = captureDeviceGroup.value(configKey, QList<int>());
-            QList<Phonon::AudioCaptureDevice> orderedList;
-            foreach (int idx, order) {
-                if (hashCopy.contains(idx)) {
-                    orderedList << hashCopy.take(idx);
-                }
-            }
-            if (hashCopy.size() > 1) {
-                // keep the order of the original list
-                foreach (const Phonon::AudioCaptureDevice &dev, list) {
-                    if (hashCopy.contains(dev.index())) {
-                        orderedList << hashCopy.take(dev.index());
-                    }
-                }
-            } else if (hashCopy.size() == 1) {
-                orderedList += hashCopy.values();
-            }
-            m_captureModel[cat]->setModelData(orderedList);
+        m_outputModel[cat]->setModelData(list);
+    }
+    for (int i = 0; i < captureCategoriesCount; ++i) {
+        const Phonon::Category cat = captureCategories[i];
+        QList<Phonon::AudioCaptureDevice> list;
+        const QList<int> deviceIndexes = Phonon::GlobalConfig().audioCaptureDeviceListFor(cat);
+        foreach (int i, deviceIndexes) {
+            list.append(Phonon::AudioCaptureDevice::fromIndex(i));
         }
+        m_captureModel[cat]->setModelData(list);
     }
 
     deviceList->resizeColumnToContents(0);
@@ -430,11 +357,6 @@ void DevicePreference::load()
 
 void DevicePreference::save()
 {
-    QSettings config(QLatin1String("kde.org"), QLatin1String("libphonon"));
-    {
-        QSettingsGroup generalGroup(&config, QLatin1String("General"));
-        generalGroup.setValue(QLatin1String("HideAdvancedDevices"), !showCheckBox->isChecked());
-    }
     if (!m_removeOnApply.isEmpty()) {
         QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kded", "/modules/phononserver",
                 "org.kde.PhononServer", "removeAudioDevices");
@@ -442,34 +364,17 @@ void DevicePreference::save()
         QDBusConnection::sessionBus().send(msg);
         m_removeOnApply.clear();
     }
-    {
-        QSettingsGroup globalGroup(&config, QLatin1String("AudioOutputDevice"));
-        const QList<int> noCategoryOrder = m_outputModel.value(Phonon::NoCategory)->tupleIndexOrder();
-        globalGroup.setValue(QLatin1String("Category_") + QString::number(Phonon::NoCategory), noCategoryOrder);
-        for (int i = 0; i <= Phonon::LastCategory; ++i) {
-            Q_ASSERT(m_outputModel.value(i));
-            const QList<int> order = m_outputModel.value(i)->tupleIndexOrder();
-            if (order == noCategoryOrder) {
-                globalGroup.removeEntry(QLatin1String("Category_") + QString::number(i));
-            } else {
-                globalGroup.setValue(QLatin1String("Category_") + QString::number(i), order);
-            }
-        }
+
+    for (Phonon::Category cat = Phonon::NoCategory; cat <= Phonon::LastCategory; ++cat) {
+        Q_ASSERT(m_outputModel.value(cat));
+        const QList<int> order = m_outputModel.value(cat)->tupleIndexOrder();
+        Phonon::GlobalConfig().setAudioOutputDeviceListFor(cat, order);
     }
-    {
-        QSettingsGroup globalGroup(&config, QLatin1String("AudioCaptureDevice"));
-        const QList<int> noCategoryOrder = m_captureModel.value(Phonon::NoCategory)->tupleIndexOrder();
-        globalGroup.setValue(QLatin1String("Category_") + QString::number(Phonon::NoCategory), noCategoryOrder);
-        for (int i = 1; i < captureCategoriesCount; ++i) {
-            const Phonon::Category cat = captureCategories[i];
-            Q_ASSERT(m_captureModel.value(cat));
-            const QList<int> order = m_captureModel.value(cat)->tupleIndexOrder();
-            if (order == noCategoryOrder) {
-                globalGroup.removeEntry(QLatin1String("Category_") + QString::number(cat));
-            } else {
-                globalGroup.setValue(QLatin1String("Category_") + QString::number(cat), order);
-            }
-        }
+    for (int i = 1; i < captureCategoriesCount; ++i) {
+        const Phonon::Category cat = captureCategories[i];
+        Q_ASSERT(m_captureModel.value(cat));
+        const QList<int> order = m_captureModel.value(cat)->tupleIndexOrder();
+        Phonon::GlobalConfig().setAudioCaptureDeviceListFor(cat, order);
     }
 }
 
@@ -638,70 +543,10 @@ void DevicePreference::on_applyPreferencesButton_clicked()
 
 void DevicePreference::on_showCheckBox_toggled()
 {
-    {
-        // the following call returns ordered according to NoCategory
-        const QList<Phonon::AudioOutputDevice> list = availableAudioOutputDevices();
-        m_outputModel[Phonon::NoCategory]->setModelData(list);
-
-        QHash<int, Phonon::AudioOutputDevice> hash;
-        foreach (const Phonon::AudioOutputDevice &dev, list) {
-            hash.insert(dev.index(), dev);
-        }
-        for (int i = 0; i <= Phonon::LastCategory; ++i) {
-            QHash<int, Phonon::AudioOutputDevice> hashCopy(hash);
-            const QList<int> order = m_outputModel[i]->tupleIndexOrder();
-            QList<Phonon::AudioOutputDevice> orderedList;
-            foreach (int idx, order) {
-                if (hashCopy.contains(idx)) {
-                    orderedList << hashCopy.take(idx);
-                }
-            }
-            if (hashCopy.size() > 1) {
-                // keep the order of the original list
-                foreach (const Phonon::AudioOutputDevice &dev, list) {
-                    if (hashCopy.contains(dev.index())) {
-                        orderedList << hashCopy.take(dev.index());
-                    }
-                }
-            } else if (hashCopy.size() == 1) {
-                orderedList += hashCopy.values();
-            }
-            m_outputModel[i]->setModelData(orderedList);
-        }
-    }
-    {
-        // the following call returns ordered according to NoCategory
-        const QList<Phonon::AudioCaptureDevice> list = availableAudioCaptureDevices();
-        m_captureModel[Phonon::NoCategory]->setModelData(list);
-
-        QHash<int, Phonon::AudioCaptureDevice> hash;
-        foreach (const Phonon::AudioCaptureDevice &dev, list) {
-            hash.insert(dev.index(), dev);
-        }
-        for (int i = 1; i < captureCategoriesCount; ++i) {
-            const Phonon::Category cat = captureCategories[i];
-            QHash<int, Phonon::AudioCaptureDevice> hashCopy(hash);
-            const QList<int> order = m_captureModel[cat]->tupleIndexOrder();
-            QList<Phonon::AudioCaptureDevice> orderedList;
-            foreach (int idx, order) {
-                if (hashCopy.contains(idx)) {
-                    orderedList << hashCopy.take(idx);
-                }
-            }
-            if (hashCopy.size() > 1) {
-                // keep the order of the original list
-                foreach (const Phonon::AudioCaptureDevice &dev, list) {
-                    if (hashCopy.contains(dev.index())) {
-                        orderedList << hashCopy.take(dev.index());
-                    }
-                }
-            } else if (hashCopy.size() == 1) {
-                orderedList += hashCopy.values();
-            }
-            m_captureModel[cat]->setModelData(orderedList);
-        }
-    }
-    deviceList->resizeColumnToContents(0);
+    // In order to get the right list from the backend, we need to update the settings now
+    // before calling availableAudio{Output,Capture}Devices()
+    Phonon::GlobalConfig().hideAdvancedDevices(!showCheckBox->isChecked());
+    loadCategoryDevices();
 }
 
 void DevicePreference::on_testPlaybackButton_toggled(bool down)
diff --git a/phonon/kcm/devicepreference.h b/phonon/kcm/devicepreference.h
index 83af859..dfd60d2 100644
--- a/phonon/kcm/devicepreference.h
+++ b/phonon/kcm/devicepreference.h
@@ -64,6 +64,7 @@ class DevicePreference : public QWidget, private Ui::DevicePreference
     private:
         template<Phonon::ObjectDescriptionType T> void removeDevice(const Phonon::ObjectDescription<T> &deviceToRemove,
                 QMap<int, Phonon::ObjectDescriptionModel<T> *> *modelMap);
+        void loadCategoryDevices();
         QList<Phonon::AudioOutputDevice> availableAudioOutputDevices() const;
         QList<Phonon::AudioCaptureDevice> availableAudioCaptureDevices() const;
         QList<int> m_removeOnApply;
diff --git a/phonon/kcm/globalconfig.cpp b/phonon/kcm/globalconfig.cpp
deleted file mode 100644
index 4e3a315..0000000
--- a/phonon/kcm/globalconfig.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2006-2008 Matthias Kretz <kretz at kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License version 2 as published by the Free Software Foundation.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-
-*/
-
-#include "globalconfig_p.h"
-
-#include "factory_p.h"
-#include "phonon/objectdescription.h"
-#include "phonondefs_p.h"
-#include "phonon/platformplugin.h"
-#include "phonon/backendinterface.h"
-#include "qsettingsgroup_p.h"
-#include "phononnamespace_p.h"
-
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-
-QT_BEGIN_NAMESPACE
-
-namespace Phonon
-{
-
-GlobalConfig::GlobalConfig(QObject *parent)
-    : QObject(parent)
-    , m_config(QLatin1String("kde.org"), QLatin1String("libphonon"))
-{
-}
-
-GlobalConfig::~GlobalConfig()
-{
-}
-
-enum WhatToFilter {
-    FilterAdvancedDevices = 1,
-    FilterHardwareDevices = 2
-};
-
-static void filter(ObjectDescriptionType type, BackendInterface *backendIface, QList<int> *list, int whatToFilter)
-{
-    QMutableListIterator<int> it(*list);
-    while (it.hasNext()) {
-        const QHash<QByteArray, QVariant> properties = backendIface->objectDescriptionProperties(type, it.next());
-        QVariant var;
-        if (whatToFilter & FilterAdvancedDevices) {
-            var = properties.value("isAdvanced");
-            if (var.isValid() && var.toBool()) {
-                it.remove();
-                continue;
-            }
-        }
-        if (whatToFilter & FilterHardwareDevices) {
-            var = properties.value("isHardwareDevice");
-            if (var.isValid() && var.toBool()) {
-                it.remove();
-                continue;
-            }
-        }
-    }
-}
-
-static QList<int> listSortedByConfig(const QSettingsGroup &backendConfig, Phonon::Category category, QList<int> &defaultList)
-{
-    if (defaultList.size() <= 1) {
-        // nothing to sort
-        return defaultList;
-    } else {
-        // make entries unique
-        QSet<int> seen;
-        QMutableListIterator<int> it(defaultList);
-        while (it.hasNext()) {
-            if (seen.contains(it.next())) {
-                it.remove();
-            } else {
-                seen.insert(it.value());
-            }
-        }
-    }
-
-    QString categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(category));
-    if (!backendConfig.hasKey(categoryKey)) {
-        // no list in config for the given category
-        categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(Phonon::NoCategory));
-        if (!backendConfig.hasKey(categoryKey)) {
-            // no list in config for NoCategory
-            return defaultList;
-        }
-    }
-
-    //Now the list from m_config
-    QList<int> deviceList = backendConfig.value(categoryKey, QList<int>());
-
-    //if there are devices in m_config that the backend doesn't report, remove them from the list
-    QMutableListIterator<int> i(deviceList);
-    while (i.hasNext()) {
-        if (0 == defaultList.removeAll(i.next())) {
-            i.remove();
-        }
-    }
-
-    //if the backend reports more devices that are not in m_config append them to the list
-    deviceList += defaultList;
-
-    return deviceList;
-}
-
-QList<int> GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override) const
-{
-    //The devices need to be stored independently for every backend
-    const QSettingsGroup backendConfig(&m_config, QLatin1String("AudioOutputDevice")); // + Factory::identifier());
-    const QSettingsGroup generalGroup(&m_config, QLatin1String("General"));
-    const bool hideAdvancedDevices = (override == FromSettings
-            ? generalGroup.value(QLatin1String("HideAdvancedDevices"), true)
-            : static_cast<bool>(override));
-
-    PlatformPlugin *platformPlugin = Factory::platformPlugin();
-    BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
-
-    QList<int> defaultList;
-    if (platformPlugin) {
-        // the platform plugin lists the audio devices for the platform
-        // this list already is in default order (as defined by the platform plugin)
-        defaultList = platformPlugin->objectDescriptionIndexes(Phonon::AudioOutputDeviceType);
-        if (hideAdvancedDevices) {
-            QMutableListIterator<int> it(defaultList);
-            while (it.hasNext()) {
-                AudioOutputDevice objDesc = AudioOutputDevice::fromIndex(it.next());
-                const QVariant var = objDesc.property("isAdvanced");
-                if (var.isValid() && var.toBool()) {
-                    it.remove();
-                }
-            }
-        }
-    }
-
-    // lookup the available devices directly from the backend (mostly for virtual devices)
-    if (backendIface) {
-        // this list already is in default order (as defined by the backend)
-        QList<int> list = backendIface->objectDescriptionIndexes(Phonon::AudioOutputDeviceType);
-        if (hideAdvancedDevices || !defaultList.isEmpty()) {
-            filter(AudioOutputDeviceType, backendIface, &list,
-                    (hideAdvancedDevices ? FilterAdvancedDevices : 0)
-                    // the platform plugin already provided the hardware devices
-                    | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
-                    );
-        }
-        defaultList += list;
-    }
-
-    return listSortedByConfig(backendConfig, category, defaultList);
-}
-
-int GlobalConfig::audioOutputDeviceFor(Phonon::Category category) const
-{
-    const QList<int> ret = audioOutputDeviceListFor(category);
-    if (ret.isEmpty())
-        return -1;
-    return ret.first();
-}
-
-QList<int> GlobalConfig::audioCaptureDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override) const
-{
-    //The devices need to be stored independently for every backend
-    const QSettingsGroup backendConfig(&m_config, QLatin1String("AudioCaptureDevice")); // + Factory::identifier());
-    const QSettingsGroup generalGroup(&m_config, QLatin1String("General"));
-    const bool hideAdvancedDevices = (override == FromSettings
-            ? generalGroup.value(QLatin1String("HideAdvancedDevices"), true)
-            : static_cast<bool>(override));
-
-    PlatformPlugin *platformPlugin = Factory::platformPlugin();
-    BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
-
-    QList<int> defaultList;
-    if (platformPlugin) {
-        // the platform plugin lists the audio devices for the platform
-        // this list already is in default order (as defined by the platform plugin)
-        defaultList = platformPlugin->objectDescriptionIndexes(Phonon::AudioCaptureDeviceType);
-        if (hideAdvancedDevices) {
-            QMutableListIterator<int> it(defaultList);
-            while (it.hasNext()) {
-                AudioCaptureDevice objDesc = AudioCaptureDevice::fromIndex(it.next());
-                const QVariant var = objDesc.property("isAdvanced");
-                if (var.isValid() && var.toBool()) {
-                    it.remove();
-                }
-            }
-        }
-    }
-
-    // lookup the available devices directly from the backend (mostly for virtual devices)
-    if (backendIface) {
-        // this list already is in default order (as defined by the backend)
-        QList<int> list = backendIface->objectDescriptionIndexes(Phonon::AudioCaptureDeviceType);
-        if (hideAdvancedDevices || !defaultList.isEmpty()) {
-            filter(AudioCaptureDeviceType, backendIface, &list,
-                    (hideAdvancedDevices ? FilterAdvancedDevices : 0)
-                    // the platform plugin already provided the hardware devices
-                    | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
-                  );
-        }
-        defaultList += list;
-    }
-
-    return listSortedByConfig(backendConfig, category, defaultList);
-}
-
-int GlobalConfig::audioCaptureDeviceFor(Phonon::Category category) const
-{
-    QList<int> ret = audioCaptureDeviceListFor(category);
-    if (ret.isEmpty())
-        return -1;
-    return ret.first();
-}
-
-} // namespace Phonon
-
-QT_END_NAMESPACE
-
-#include "moc_globalconfig_p.cpp"
-
-// vim: sw=4 ts=4
diff --git a/phonon/kcm/globalconfig_p.h b/phonon/kcm/globalconfig_p.h
deleted file mode 100644
index ca4dca6..0000000
--- a/phonon/kcm/globalconfig_p.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  This file is part of the KDE project
-Copyright (C) 2006-2008 Matthias Kretz <kretz at kde.org>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License version 2 as published by the Free Software Foundation.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with this library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
-
-*/
-
-#ifndef PHONON_GLOBALCONFIG_P_H
-#define PHONON_GLOBALCONFIG_P_H
-
-#include <QtCore/QObject>
-#include <QtCore/QSettings>
-
-#include "phonon/phononnamespace.h"
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-namespace Phonon
-{
-    class GlobalConfig : public QObject
-    {
-        Q_OBJECT
-    public:
-        GlobalConfig(QObject *parent = 0);
-        ~GlobalConfig();
-
-        enum HideAdvancedDevicesOverride {
-            ShowAdvancedDevices = 0,
-            HideAdvancedDevices = 1,
-            FromSettings = 2
-        };
-        QList<int> audioOutputDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override = FromSettings) const;
-        int audioOutputDeviceFor(Phonon::Category category) const;
-
-        QList<int> audioCaptureDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override = FromSettings) const;
-        int audioCaptureDeviceFor(Phonon::Category category) const;
-
-    Q_SIGNALS:
-        void audioOutputDeviceConfigChanged();
-        void audioCaptureDeviceConfigChanged();
-
-    private:
-        QSettings m_config;
-    };
-} // namespace Phonon
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#endif // PHONON_GLOBALCONFIG_P_H
diff --git a/phonon/kded-module/CMakeLists.txt b/phonon/kded-module/CMakeLists.txt
index 17e7742..b2c5697 100644
--- a/phonon/kded-module/CMakeLists.txt
+++ b/phonon/kded-module/CMakeLists.txt
@@ -9,17 +9,7 @@ set(HAVE_CURRENT_ALSA FALSE)
 #   macro_log_feature(HAVE_CURRENT_ALSA "ALSA" "current alsa-lib is needed for dmix and virtual device listing" "http://www.alsa-project.org/" TRUE "1.0.14a")
 #endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
-macro_optional_find_package(PulseAudio)
-macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "A cross-platform, networked sound server." "http://www.pulseaudio.org" FALSE "" "Allows audio playback via the PulseAudio soundserver when it is running")
-
-if(PULSEAUDIO_FOUND)
-   add_definitions(-DHAVE_PULSEAUDIO)
-else(PULSEAUDIO_FOUND)
-   set(PULSEAUDIO_INCLUDE_DIR "")
-   set(PULSEAUDIO_LIBRARY "")
-endif(PULSEAUDIO_FOUND)
-
-include_directories(${ALSA_INCLUDES} ${PULSEAUDIO_INCLUDE_DIR})
+include_directories(${ALSA_INCLUDES})
 
 set(kded_phonon_SRCS
    phononserver.cpp
@@ -29,7 +19,7 @@ set(kded_phonon_SRCS
    )
 
 kde4_add_plugin(kded_phononserver ${kded_phonon_SRCS})
-target_link_libraries(kded_phononserver ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${ASOUND_LIBRARY} ${PULSEAUDIO_LIBRARY})
+target_link_libraries(kded_phononserver ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${ASOUND_LIBRARY})
 install(TARGETS kded_phononserver  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 install(FILES phononserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
diff --git a/phonon/kded-module/audiodeviceaccess.cpp b/phonon/kded-module/audiodeviceaccess.cpp
index 6792e72..5815502 100644
--- a/phonon/kded-module/audiodeviceaccess.cpp
+++ b/phonon/kded-module/audiodeviceaccess.cpp
@@ -44,14 +44,8 @@ const QString PS::AudioDeviceAccess::driverName() const
         return i18n("ALSA");
     case OssDriver:
         return i18n("OSS");
-    case PulseAudioDriver:
-        return i18n("PulseAudio");
     case JackdDriver:
         return i18n("Jack");
-    case EsdDriver:
-        return i18n("ESD");
-    case ArtsDriver:
-        return i18n("aRts");
     }
     return QString();
 }
diff --git a/phonon/kded-module/audiodeviceaccess.h b/phonon/kded-module/audiodeviceaccess.h
index 4513419..70a8b3f 100644
--- a/phonon/kded-module/audiodeviceaccess.h
+++ b/phonon/kded-module/audiodeviceaccess.h
@@ -33,10 +33,7 @@ class AudioDeviceAccess
             InvalidDriver = 0,
             AlsaDriver,
             OssDriver,
-            PulseAudioDriver,
-            JackdDriver,
-            EsdDriver,
-            ArtsDriver
+            JackdDriver
         };
 
         inline AudioDeviceAccess(const QStringList &deviceIds, int accessPreference,
diff --git a/phonon/kded-module/phononserver.cpp b/phonon/kded-module/phononserver.cpp
index b76e08c..5dbd17e 100644
--- a/phonon/kded-module/phononserver.cpp
+++ b/phonon/kded-module/phononserver.cpp
@@ -45,10 +45,6 @@
 #include <Solid/Device>
 #include <Solid/DeviceNotifier>
 
-#ifdef HAVE_PULSEAUDIO
-#include <pulse/pulseaudio.h>
-#endif // HAVE_PULSEAUDIO
-
 #include <../config-alsa.h>
 #ifdef HAVE_LIBASOUND2
 #include <alsa/asoundlib.h>
@@ -334,128 +330,6 @@ static void removeOssOnlyDevices(QList<PS::AudioDevice> *list)
     }
 }
 
-#ifdef HAVE_PULSEAUDIO
-class PulseDetectionUserData
-{
-    public:
-        inline PulseDetectionUserData(PhononServer *p, pa_mainloop_api *api)
-            : phononServer(p), mainloopApi(api), ready(2),
-            alsaHandleMatches(QLatin1String(".*\\s(plughw|hw|front|surround\\d\\d):(\\d+)\\s.*")),
-            captureNameMatches(QLatin1String(".*_sound_card_(\\d+)_.*_(?:playback|capture)_(\\d+)(\\.monitor)?")),
-            playbackNameMatches(QLatin1String(".*_sound_card_(\\d+)_.*_playback_(\\d+)"))
-        {}
-
-        PhononServer *const phononServer;
-        QList<QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess> > sinks;
-        QList<QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess> > sources;
-
-        inline void eol() { if (--ready == 0) { quit(); } }
-        inline void quit() { mainloopApi->quit(mainloopApi, 0); }
-    private:
-        pa_mainloop_api *const mainloopApi;
-        int ready;
-    public:
-        QRegExp alsaHandleMatches;
-        QRegExp captureNameMatches;
-        QRegExp playbackNameMatches;
-};
-
-static void pulseSinkInfoListCallback(pa_context *context, const pa_sink_info *i, int eol, void *userdata)
-{
-    PulseDetectionUserData *d = reinterpret_cast<PulseDetectionUserData *>(userdata);
-    if (eol) {
-        d->eol();
-        return;
-    }
-    Q_ASSERT(i);
-    kDebug(601).nospace()
-        << "name: " << i->name
-        << ", index: " << i->index
-        << ", description: " << i->description
-        << ", sample_spec: " << i->sample_spec.format << i->sample_spec.rate << i->sample_spec.channels
-        << ", channel_map: " << i->channel_map.channels << i->channel_map.map
-        << ", owner_module: " << i->owner_module
-        //<< ", volume: " << i->volume
-        << ", mute: " << i->mute
-        << ", monitor_source: " << i->monitor_source
-        << ", latency: " << i->latency
-        << ", driver: " << i->driver
-        << ", flags: " << i->flags;
-    const QString &handle = QString::fromUtf8(i->name);
-    if (d->playbackNameMatches.exactMatch(handle)) {
-        const QString &description = QString::fromUtf8(i->description);
-        const bool m = d->alsaHandleMatches.exactMatch(description);
-        const int cardNumber = m ? d->alsaHandleMatches.cap(2).toInt() : -1; // card_name_X in the name always has X == 0 ;( so we can't use d->playbackNameMatches.cap(1).toInt();
-        const int deviceNumber = d->playbackNameMatches.cap(2).toInt();
-        const PS::AudioDeviceKey key = { QString(), cardNumber, deviceNumber };
-        const PS::AudioDeviceAccess access(QStringList(QString::fromUtf8(pa_context_get_server(context)) + QLatin1Char('\n') + handle), 30, PS::AudioDeviceAccess::PulseAudioDriver, false, true);
-        d->sinks << QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess>(key, access);
-    }
-}
-
-static void pulseSourceInfoListCallback(pa_context *context, const pa_source_info *i, int eol, void *userdata)
-{
-    PulseDetectionUserData *d = reinterpret_cast<PulseDetectionUserData *>(userdata);
-    if (eol) {
-        d->eol();
-        return;
-    }
-    Q_ASSERT(i);
-    kDebug(601).nospace()
-        << "name: " << i->name
-        << ", index: " << i->index
-        << ", description: " << i->description
-        << ", sample_spec: " << i->sample_spec.format << i->sample_spec.rate << i->sample_spec.channels
-        << ", channel_map: " << i->channel_map.channels << i->channel_map.map
-        << ", owner_module: " << i->owner_module
-        //<< ", volume: " << i->volume
-        << ", mute: " << i->mute
-        << ", monitor_of_sink: " << i->monitor_of_sink
-        << ", monitor_of_sink_name: " << i->monitor_of_sink_name
-        << ", latency: " << i->latency
-        << ", driver: " << i->driver
-        << ", flags: " << i->flags;
-    const QString &handle = QString::fromUtf8(i->name);
-    if (d->captureNameMatches.exactMatch(handle)) {
-        if (d->captureNameMatches.cap(3).isEmpty()) {
-            const QString &description = QString::fromUtf8(i->description);
-            const bool m = d->alsaHandleMatches.exactMatch(description);
-            const int cardNumber = m ? d->alsaHandleMatches.cap(2).toInt() : d->captureNameMatches.cap(1).toInt();
-            const int deviceNumber = d->captureNameMatches.cap(2).toInt();
-            const PS::AudioDeviceKey key = {
-                d->captureNameMatches.cap(3).isEmpty() ? QString() : handle, cardNumber, deviceNumber
-            };
-            const PS::AudioDeviceAccess access(QStringList(QString::fromUtf8(pa_context_get_server(context)) + QLatin1Char(':') + handle), 30, PS::AudioDeviceAccess::PulseAudioDriver, true, false);
-            d->sources << QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess>(key, access);
-        } else {
-            const PS::AudioDeviceKey key = {
-                QString::fromUtf8(i->description), -2, -2
-            };
-            const PS::AudioDeviceAccess access(QStringList(QString::fromUtf8(pa_context_get_server(context)) + QLatin1Char(':') + handle), 30, PS::AudioDeviceAccess::PulseAudioDriver, true, false);
-            d->sources << QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess>(key, access);
-        }
-    }
-}
-
-static void pulseContextStateCallback(pa_context *context, void *userdata)
-{
-    switch (pa_context_get_state(context)) {
-    case PA_CONTEXT_READY:
-        /*pa_operation *op1 =*/ pa_context_get_sink_info_list(context, &pulseSinkInfoListCallback, userdata);
-        /*pa_operation *op2 =*/ pa_context_get_source_info_list(context, &pulseSourceInfoListCallback, userdata);
-        break;
-    case PA_CONTEXT_FAILED:
-        {
-            PulseDetectionUserData *d = reinterpret_cast<PulseDetectionUserData *>(userdata);
-            d->quit();
-        }
-        break;
-    default:
-        break;
-    }
-}
-#endif // HAVE_PULSEAUDIO
-
 void PhononServer::findDevices()
 {
     QHash<PS::AudioDeviceKey, PS::AudioDevice> playbackDevices;
@@ -630,73 +504,6 @@ void PhononServer::findDevices()
     m_audioOutputDevices = playbackDevices.values();
     m_audioCaptureDevices = captureDevices.values();
 
-#ifdef HAVE_PULSEAUDIO
-    {
-        pa_mainloop *mainloop = pa_mainloop_new();
-        Q_ASSERT(mainloop);
-        pa_mainloop_api *mainloopApi = pa_mainloop_get_api(mainloop);
-        PulseDetectionUserData userData(this, mainloopApi);
-        // XXX I don't want to show up in the client list. All I want to know is the list of sources
-        // and sinks...
-        pa_context *context = pa_context_new(mainloopApi, "KDE");
-        // XXX stupid cast. report a bug about a missing enum value
-        if (pa_context_connect(context, NULL, static_cast<pa_context_flags_t>(0), 0) >= 0) {
-            pa_context_set_state_callback(context, &pulseContextStateCallback, &userData);
-            pa_mainloop_run(mainloop, NULL);
-            pa_context_disconnect(context);
-        }
-        pa_mainloop_free(mainloop);
-        kDebug(601) << "pulse sources:" << userData.sources;
-        kDebug(601) << "pulse sinks:  " << userData.sinks;
-        QMutableListIterator<PS::AudioDevice> it(m_audioOutputDevices);
-        typedef QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess> MyPair;
-        static int uniqueDeviceNumber = -2;
-        foreach (const MyPair &pair, userData.sinks) {
-            it.toFront();
-            bool needNewDeviceObject = true;
-            while (it.hasNext()) {
-                PS::AudioDevice &dev = it.next();
-                if (dev.key() == pair.first) {
-                    dev.addAccess(pair.second);
-                    needNewDeviceObject = false;
-                    continue;
-                }
-            }
-            if (needNewDeviceObject) {
-                const PS::AudioDeviceKey key = {
-                    pair.second.deviceIds().first() + QLatin1String("playback"),
-                    -1, --uniqueDeviceNumber
-                };
-                PS::AudioDevice dev(pair.first.uniqueId, QLatin1String("audio-backend-pulseaudio"), key, 0, true);
-                dev.addAccess(pair.second);
-                m_audioOutputDevices.append(dev);
-            }
-        }
-        it = m_audioCaptureDevices;
-        foreach (const MyPair &pair, userData.sources) {
-            it.toFront();
-            bool needNewDeviceObject = true;
-            while (it.hasNext()) {
-                PS::AudioDevice &dev = it.next();
-                if (dev.key() == pair.first) {
-                    dev.addAccess(pair.second);
-                    needNewDeviceObject = false;
-                    continue;
-                }
-            }
-            if (needNewDeviceObject) {
-                const PS::AudioDeviceKey key = {
-                    pair.second.deviceIds().first() + QLatin1String("capture"),
-                    -1, --uniqueDeviceNumber
-                };
-                PS::AudioDevice dev(pair.first.uniqueId, QLatin1String("audio-backend-pulseaudio"), key, 0, true);
-                dev.addAccess(pair.second);
-                m_audioCaptureDevices.append(dev);
-            }
-        }
-    }
-#endif // HAVE_PULSEAUDIO
-
     if (haveAlsaDevices) {
         // go through the lists and check for devices that have only OSS and remove them since
         // they're very likely bogus (Solid tells us a device can do capture and playback, even
@@ -855,14 +662,8 @@ static inline QByteArray nameForDriver(PS::AudioDeviceAccess::AudioDriver d)
         return "alsa";
     case PS::AudioDeviceAccess::OssDriver:
         return "oss";
-    case PS::AudioDeviceAccess::PulseAudioDriver:
-        return "pulseaudio";
     case PS::AudioDeviceAccess::JackdDriver:
         return "jackd";
-    case PS::AudioDeviceAccess::EsdDriver:
-        return "esd";
-    case PS::AudioDeviceAccess::ArtsDriver:
-        return "arts";
     case PS::AudioDeviceAccess::InvalidDriver:
         break;
     }
diff --git a/phonon/kded-module/phononserver.h b/phonon/kded-module/phononserver.h
index 2583863..fc04560 100644
--- a/phonon/kded-module/phononserver.h
+++ b/phonon/kded-module/phononserver.h
@@ -51,7 +51,7 @@ class PhononServer : public KDEDModule
     private slots:
         void deviceAdded(const QString &udi);
         void deviceRemoved(const QString &udi);
-        // TODO add callbacks for Pulse, Jack changes and whatever else, if somehow possible
+        // TODO add callbacks for Jack changes and whatever else, if somehow possible (Pulse handled by libphonon)
 
         void alsaConfigChanged();
 
commit 8757fd4431c1fdabf00c0a39f5640e96f7a41726
Author: cguthrie <cguthrie at 283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date:   Fri Nov 20 09:15:57 2009 +0000

    phonon: Fix phonon API due to change in r1051728
    
    git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdebase/runtime at 1051798 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/phonon/kcm/devicepreference.cpp b/phonon/kcm/devicepreference.cpp
index 71e772b..0554269 100644
--- a/phonon/kcm/devicepreference.cpp
+++ b/phonon/kcm/devicepreference.cpp
@@ -327,7 +327,7 @@ QList<Phonon::AudioCaptureDevice> DevicePreference::availableAudioCaptureDevices
 
 void DevicePreference::load()
 {
-    showCheckBox->setChecked(!Phonon::GlobalConfig().getHideAdvancedDevices());
+    showCheckBox->setChecked(!Phonon::GlobalConfig().hideAdvancedDevices());
     loadCategoryDevices();
 }
 
@@ -545,7 +545,7 @@ void DevicePreference::on_showCheckBox_toggled()
 {
     // In order to get the right list from the backend, we need to update the settings now
     // before calling availableAudio{Output,Capture}Devices()
-    Phonon::GlobalConfig().hideAdvancedDevices(!showCheckBox->isChecked());
+    Phonon::GlobalConfig().setHideAdvancedDevices(!showCheckBox->isChecked());
     loadCategoryDevices();
 }
 


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- kdebase-runtime.spec	1 Dec 2009 13:55:13 -0000	1.154
+++ kdebase-runtime.spec	3 Dec 2009 17:16:26 -0000	1.155
@@ -1,11 +1,15 @@
+
 %if 0%{?fedora}
 %define flags 1
+%if 0%{?fedora} > 11
+%define phonon_pa_patch 1
+%endif
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -24,6 +28,8 @@ Patch4:        kdebase-runtime-4.3.0-nep
 Patch5:        kdebase-runtime-4.3.1-manpath.patch
 # add OnlyShowIn=KDE  to Desktop/Home.desktop (like trash.desktop)
 Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch
+# http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/kdebase4-runtime/current/SOURCES/kdebase-runtime-4.3.1-backend-globalconfig.patch
+Patch7:        kdebase-runtime-4.3.1-backend-globalconfig.patch
 
 ## Upstream patches
 
@@ -52,6 +58,12 @@ Requires: htdig
 # beware of bootstrapping, there be dragons
 Requires: oxygen-icon-theme >= %{version}
 
+%if 0%{?phonon_pa_patch}
+%define phonon_ver 4.3.50
+BuildRequires: phonon-devel >= %{phonon_ver}
+Requires: phonon >= %{phonon_ver}
+%endif
+
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
@@ -103,13 +115,18 @@ BuildArch: noarch
 %prep
 %setup -q -n kdebase-runtime-%{version}
 
+%if 0%{?phonon_pa_patch} 
+%patch7 -p1 -b .backend-globalconfig
+%else
 %patch0 -p1 -b .pulseaudio
+%endif
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
 #patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
+%patch7 -p1 -b .backend-globalconfig
 
 
 %build
@@ -227,6 +244,9 @@ fi
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2
+- phonon/pulseaudio patch from mandriva, kudos to coling (f12)
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 



From rdieter at fedoraproject.org  Thu Dec  3 17:19:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 17:19:46 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12 kdebase-runtime.spec,1.155,1.156
Message-ID: <20091203171946.1A75211C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3091

Modified Files:
	kdebase-runtime.spec 
Log Message:
don't apply patch twice



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kdebase-runtime.spec	3 Dec 2009 17:16:26 -0000	1.155
+++ kdebase-runtime.spec	3 Dec 2009 17:19:45 -0000	1.156
@@ -126,7 +126,6 @@ BuildArch: noarch
 %patch4 -p1 -b .nepomuk-autostart
 #patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
-%patch7 -p1 -b .backend-globalconfig
 
 
 %build



From twaugh at fedoraproject.org  Thu Dec  3 17:20:06 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 17:20:06 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-cupsd.conf-parser.patch, NONE,
	1.1 system-config-printer.spec, 1.316, 1.317
Message-ID: <20091203172006.1EBB611C03DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3338

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cupsd.conf-parser.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).


system-config-printer-cupsd.conf-parser.patch:
 AdvancedServerSettings.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-cupsd.conf-parser.patch ---
diff -up system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser system-config-printer-1.1.15/AdvancedServerSettings.py
--- system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.15/AdvancedServerSettings.py	2009-12-03 17:18:29.015925153 +0000
@@ -154,7 +154,7 @@ class AdvancedServerSettingsDialog:
         self.browse_poll = []
         f.seek (0)
         for line in f.readlines ():
-            l = line.lower ()
+            l = line.lower ().strip ()
             if l.startswith ("preservejobhistory "):
                 try:
                     preserve_job_history = parse_yesno (l)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- system-config-printer.spec	3 Dec 2009 17:12:43 -0000	1.316
+++ system-config-printer.spec	3 Dec 2009 17:20:06 -0000	1.317
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-localize-statereason.patch
 Patch3: system-config-printer-browsepoll.patch
+Patch4: system-config-printer-cupsd.conf-parser.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -80,6 +81,7 @@ printers.
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .localize-statereason
 %patch3 -p1 -b .browsepoll
+%patch4 -p1 -b .cupsd.conf-parser
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -193,6 +195,7 @@ exit 0
 
 %changelog
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
+- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
 - Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
 
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2



From mathstuf at fedoraproject.org  Thu Dec  3 17:20:26 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu,  3 Dec 2009 17:20:26 +0000 (UTC)
Subject: rpms/bilbo/devel dead.package,NONE,1.1
Message-ID: <20091203172026.D143911C03DB@cvs1.fedora.phx.redhat.com>

Author: mathstuf

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

Added Files:
	dead.package 
Log Message:
Bilbo is obsoleted by kdepim in KDE 4.4


--- NEW FILE dead.package ---
Bilbo has been renamed and moved into 4.4 as blogilo (trademark issues as well)



From twaugh at fedoraproject.org  Thu Dec  3 17:20:53 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 17:20:53 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-cupsd.conf-parser.patch, NONE,
	1.1 system-config-printer.spec, 1.321, 1.322
Message-ID: <20091203172053.91F8D11C03DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3612

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cupsd.conf-parser.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).


system-config-printer-cupsd.conf-parser.patch:
 AdvancedServerSettings.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-cupsd.conf-parser.patch ---
diff -up system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser system-config-printer-1.1.15/AdvancedServerSettings.py
--- system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.15/AdvancedServerSettings.py	2009-12-03 17:18:29.015925153 +0000
@@ -154,7 +154,7 @@ class AdvancedServerSettingsDialog:
         self.browse_poll = []
         f.seek (0)
         for line in f.readlines ():
-            l = line.lower ()
+            l = line.lower ().strip ()
             if l.startswith ("preservejobhistory "):
                 try:
                     preserve_job_history = parse_yesno (l)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- system-config-printer.spec	3 Dec 2009 17:13:32 -0000	1.321
+++ system-config-printer.spec	3 Dec 2009 17:20:53 -0000	1.322
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-localize-statereason.patch
 Patch3: system-config-printer-browsepoll.patch
+Patch4: system-config-printer-cupsd.conf-parser.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -80,6 +81,7 @@ printers.
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .localize-statereason
 %patch3 -p1 -b .browsepoll
+%patch4 -p1 -b .cupsd.conf-parser
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -193,6 +195,7 @@ exit 0
 
 %changelog
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
+- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
 - Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
 
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2



From twaugh at fedoraproject.org  Thu Dec  3 17:21:46 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 17:21:46 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-cupsd.conf-parser.patch, NONE,
	1.1 system-config-printer.spec, 1.310, 1.311
Message-ID: <20091203172146.DFAF711C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cupsd.conf-parser.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).


system-config-printer-cupsd.conf-parser.patch:
 AdvancedServerSettings.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-cupsd.conf-parser.patch ---
diff -up system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser system-config-printer-1.1.15/AdvancedServerSettings.py
--- system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.15/AdvancedServerSettings.py	2009-12-03 17:18:29.015925153 +0000
@@ -154,7 +154,7 @@ class AdvancedServerSettingsDialog:
         self.browse_poll = []
         f.seek (0)
         for line in f.readlines ():
-            l = line.lower ()
+            l = line.lower ().strip ()
             if l.startswith ("preservejobhistory "):
                 try:
                     preserve_job_history = parse_yesno (l)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -p -r1.310 -r1.311
--- system-config-printer.spec	3 Dec 2009 17:14:51 -0000	1.310
+++ system-config-printer.spec	3 Dec 2009 17:21:46 -0000	1.311
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-localize-statereason.patch
 Patch2: system-config-printer-browsepoll.patch
+Patch3: system-config-printer-cupsd.conf-parser.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -67,6 +68,7 @@ the configuration tool.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .localize-statereason
 %patch2 -p1 -b .browsepoll
+%patch3 -p1 -b .cupsd.conf-parser
 
 %build
 %configure
@@ -170,6 +172,7 @@ exit 0
 
 %changelog
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
+- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
 - Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
 
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2



From wtogami at fedoraproject.org  Thu Dec  3 17:23:51 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  3 Dec 2009 17:23:51 +0000 (UTC)
Subject: File ltsp-5.1.95.tar.bz2 uploaded to lookaside cache by wtogami
Message-ID: <20091203172351.0773E10F896@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ltsp:

ad17aab90e91ec4e647908b0b89835ac  ltsp-5.1.95.tar.bz2



From wtogami at fedoraproject.org  Thu Dec  3 17:24:56 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  3 Dec 2009 17:24:56 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.29, 1.30 ltsp.spec, 1.39, 1.40 sources,
	1.33, 1.34
Message-ID: <20091203172456.3EB8411C00EE@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
Configure Fedora 12 client chroot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	6 Oct 2009 19:24:15 -0000	1.29
+++ .cvsignore	3 Dec 2009 17:24:55 -0000	1.30
@@ -1 +1 @@
-ltsp-5.1.91.tar.bz2
+ltsp-5.1.95.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ltsp.spec	10 Nov 2009 22:58:20 -0000	1.39
+++ ltsp.spec	3 Dec 2009 17:24:55 -0000	1.40
@@ -1,8 +1,8 @@
 Name:           ltsp
-Version:        5.1.91
-%define _datestamp .20090928.15
+Version:        5.1.95
+%define _datestamp .20091203.11
 #Release:        0%{_datestamp}%{?dist}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
 
@@ -413,6 +413,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 03 2009 Warren Togami <wtogami at redhat.com> - 5.1.95-1
+- Configure Fedora 12 client chroot
+
 * Tue Nov 10 2009 Warren Togami <wtogami at redhat.com> - 5.1.91-2
 - ltsp-server requires nfs-utils
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	6 Oct 2009 19:24:16 -0000	1.33
+++ sources	3 Dec 2009 17:24:55 -0000	1.34
@@ -1 +1 @@
-7c498f4669ca9f62ad34f2755bebd49f  ltsp-5.1.91.tar.bz2
+ad17aab90e91ec4e647908b0b89835ac  ltsp-5.1.95.tar.bz2



From wtogami at fedoraproject.org  Thu Dec  3 17:28:24 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  3 Dec 2009 17:28:24 +0000 (UTC)
Subject: rpms/ltsp/F-12 .cvsignore, 1.29, 1.30 ltsp.spec, 1.39, 1.40 sources,
	1.33, 1.34
Message-ID: <20091203172824.99F7A11C00EE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6352

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
Configure Fedora 12 client chroot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	6 Oct 2009 19:26:59 -0000	1.29
+++ .cvsignore	3 Dec 2009 17:28:24 -0000	1.30
@@ -1 +1 @@
-ltsp-5.1.91.tar.bz2
+ltsp-5.1.95.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-12/ltsp.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ltsp.spec	10 Nov 2009 23:15:41 -0000	1.39
+++ ltsp.spec	3 Dec 2009 17:28:24 -0000	1.40
@@ -1,8 +1,8 @@
 Name:           ltsp
-Version:        5.1.91
-%define _datestamp .20090928.15
+Version:        5.1.95
+%define _datestamp .20091203.11
 #Release:        0%{_datestamp}%{?dist}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
 
@@ -413,6 +413,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 03 2009 Warren Togami <wtogami at redhat.com> - 5.1.95-1
+- Configure Fedora 12 client chroot
+
 * Tue Nov 10 2009 Warren Togami <wtogami at redhat.com> - 5.1.91-2
 - ltsp-server requires nfs-utils
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-12/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	6 Oct 2009 19:27:00 -0000	1.33
+++ sources	3 Dec 2009 17:28:24 -0000	1.34
@@ -1 +1 @@
-7c498f4669ca9f62ad34f2755bebd49f  ltsp-5.1.91.tar.bz2
+ad17aab90e91ec4e647908b0b89835ac  ltsp-5.1.95.tar.bz2



From remi at fedoraproject.org  Thu Dec  3 17:28:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:28:32 +0000 (UTC)
Subject: rpms/php-pear-HTTP-OAuth/devel php-pear-HTTP-OAuth.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203172832.7831D11C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6573

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-HTTP-OAuth.spec 
Log Message:
new package


--- NEW FILE php-pear-HTTP-OAuth.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTTP_OAuth

Name:           php-pear-HTTP-OAuth
Version:        0.1.6
Release:        1%{?dist}
Summary:        Implementation of the OAuth spec

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTTP_OAuth
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(HTTP_Request2) >= 0.4.0
Requires:       php-pear(PEAR)
# Optional Dependencies
Requires:       php-pear(Log) >= 1.11.0
# not yet available in Fedora Requires: php-pecl(pecl_http) >= 1.6.0


%description
Allows the use of the consumer and provider angles of the OAuth spec.

%prep
%setup -q -c
# Package is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
# fix rpmlint warnings
sed -i -e 's/\r//' docdir/%{pear_name}/examples/jquery.fade.js

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTTP/OAuth.php
%{pear_phpdir}/HTTP/OAuth
%{pear_testdir}/HTTP_OAuth
# only an empty unused file 
%exclude %{pear_datadir}/HTTP_OAuth/README


%changelog
* Tue Dec 01 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.6-1
- new version

* Fri Nov 20 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.5-1
- new version

* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.4-1
- initial RPM



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-OAuth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:33:13 -0000	1.1
+++ .cvsignore	3 Dec 2009 17:28:32 -0000	1.2
@@ -0,0 +1 @@
+HTTP_OAuth-0.1.6.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-OAuth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:33:13 -0000	1.1
+++ sources	3 Dec 2009 17:28:32 -0000	1.2
@@ -0,0 +1 @@
+8fe858e0b5abe5d3147a490c2887337d  HTTP_OAuth-0.1.6.tgz



From remi at fedoraproject.org  Thu Dec  3 17:31:04 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:31:04 +0000 (UTC)
Subject: rpms/php-pear-HTTP-OAuth/F-12 php-pear-HTTP-OAuth.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203173104.0D3C311C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP-OAuth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7721

Modified Files:
	sources 
Added Files:
	php-pear-HTTP-OAuth.spec 
Log Message:
new package


--- NEW FILE php-pear-HTTP-OAuth.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTTP_OAuth

Name:           php-pear-HTTP-OAuth
Version:        0.1.6
Release:        1%{?dist}
Summary:        Implementation of the OAuth spec

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTTP_OAuth
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(HTTP_Request2) >= 0.4.0
Requires:       php-pear(PEAR)
# Optional Dependencies
Requires:       php-pear(Log) >= 1.11.0
# not yet available in Fedora Requires: php-pecl(pecl_http) >= 1.6.0


%description
Allows the use of the consumer and provider angles of the OAuth spec.

%prep
%setup -q -c
# Package is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
# fix rpmlint warnings
sed -i -e 's/\r//' docdir/%{pear_name}/examples/jquery.fade.js

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTTP/OAuth.php
%{pear_phpdir}/HTTP/OAuth
%{pear_testdir}/HTTP_OAuth
# only an empty unused file 
%exclude %{pear_datadir}/HTTP_OAuth/README


%changelog
* Tue Dec 01 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.6-1
- new version

* Fri Nov 20 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.5-1
- new version

* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.4-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-OAuth/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:33:13 -0000	1.1
+++ sources	3 Dec 2009 17:31:03 -0000	1.2
@@ -0,0 +1 @@
+8fe858e0b5abe5d3147a490c2887337d  HTTP_OAuth-0.1.6.tgz



From remi at fedoraproject.org  Thu Dec  3 17:32:30 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:32:30 +0000 (UTC)
Subject: rpms/php-pear-HTTP-OAuth/F-11 php-pear-HTTP-OAuth.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091203173230.D3AEB11C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTTP-OAuth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8327

Modified Files:
	sources 
Added Files:
	php-pear-HTTP-OAuth.spec 
Log Message:
new package


--- NEW FILE php-pear-HTTP-OAuth.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTTP_OAuth

Name:           php-pear-HTTP-OAuth
Version:        0.1.6
Release:        1%{?dist}
Summary:        Implementation of the OAuth spec

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTTP_OAuth
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(HTTP_Request2) >= 0.4.0
Requires:       php-pear(PEAR)
# Optional Dependencies
Requires:       php-pear(Log) >= 1.11.0
# not yet available in Fedora Requires: php-pecl(pecl_http) >= 1.6.0


%description
Allows the use of the consumer and provider angles of the OAuth spec.

%prep
%setup -q -c
# Package is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
# fix rpmlint warnings
sed -i -e 's/\r//' docdir/%{pear_name}/examples/jquery.fade.js

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTTP/OAuth.php
%{pear_phpdir}/HTTP/OAuth
%{pear_testdir}/HTTP_OAuth
# only an empty unused file 
%exclude %{pear_datadir}/HTTP_OAuth/README


%changelog
* Tue Dec 01 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.6-1
- new version

* Fri Nov 20 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.5-1
- new version

* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.1.4-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-OAuth/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:33:13 -0000	1.1
+++ sources	3 Dec 2009 17:32:30 -0000	1.2
@@ -0,0 +1 @@
+8fe858e0b5abe5d3147a490c2887337d  HTTP_OAuth-0.1.6.tgz



From remi at fedoraproject.org  Thu Dec  3 17:41:08 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:41:08 +0000 (UTC)
Subject: File Services_Twitter-0.4.0.tgz uploaded to lookaside cache by remi
Message-ID: <20091203174108.2536110F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-pear-Services-Twitter:

443aea93d76934b26948e3c5b5c46c8e  Services_Twitter-0.4.0.tgz



From remi at fedoraproject.org  Thu Dec  3 17:48:42 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:48:42 +0000 (UTC)
Subject: rpms/php-pear-Services-Twitter/devel php-pear-Services-Twitter.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203174842.EA53C11C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Twitter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13238

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Services-Twitter.spec 
Log Message:
new package


--- NEW FILE php-pear-Services-Twitter.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Services_Twitter

Name:           php-pear-Services-Twitter
Version:        0.4.0
Release:        1%{?dist}
Summary:        PHP interface to Twitter's API

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Services_Twitter
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR)
Requires:       php-common >= 5.2.0
# Optional (but which requires mandatory HTTP_Request2)
Requires:       php-pear(HTTP_OAuth) >= 0.1.2

%description
An interface for communicating with Twitter's public API.
Send status updates, fetch information, add friends, etc.

%prep
%setup -q -c
# package is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Services
%{pear_datadir}/Services_Twitter
%{pear_testdir}/Services_Twitter


%changelog
* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.4.0-1
- initial RPM



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Services-Twitter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:33:59 -0000	1.1
+++ .cvsignore	3 Dec 2009 17:48:42 -0000	1.2
@@ -0,0 +1 @@
+Services_Twitter-0.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Services-Twitter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:33:59 -0000	1.1
+++ sources	3 Dec 2009 17:48:42 -0000	1.2
@@ -0,0 +1 @@
+443aea93d76934b26948e3c5b5c46c8e  Services_Twitter-0.4.0.tgz



From pbrobinson at fedoraproject.org  Thu Dec  3 17:51:32 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 17:51:32 +0000 (UTC)
Subject: rpms/csound/devel csound-fixpython.patch, 1.1, 1.2 csound.spec, 1.34,
	1.35
Message-ID: <20091203175133.0621111C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	csound-fixpython.patch csound.spec 
Log Message:
- Updated python patch thanks to dsd.

csound-fixpython.patch:
 install.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: csound-fixpython.patch
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound-fixpython.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- csound-fixpython.patch	18 Aug 2009 15:37:52 -0000	1.1
+++ csound-fixpython.patch	3 Dec 2009 17:51:32 -0000	1.2
@@ -1,16 +1,29 @@
---- Csound5.10.1/install.py.orig	2009-08-18 09:58:32.000000000 +0100
-+++ Csound5.10.1/install.py	2009-08-18 09:59:39.000000000 +0100
-@@ -269,9 +269,6 @@
+Index: Csound5.10.1/install.py
+===================================================================
+--- Csound5.10.1.orig/install.py
++++ Csound5.10.1/install.py
+@@ -256,7 +256,7 @@ libList = findFiles('.', 'libcsound\\.a'
+ libList += findFiles('.', 'libcsound64\\.a')
+ libList += findFiles('.', 'libcsound\\.so\\..+')
+ libList += findFiles('.', 'libcsound64\\.so\\..+')
+-libList += findFiles('.', 'libcsnd\\.so')
++libList += findFiles('.', 'libcsnd\\.so\\..+')
+ libList += findFiles('.', 'lib_jcsound\\.so')
+ libList += findFiles('.', 'lib_CsoundVST\\.so')
+ for i in libList:
+@@ -269,9 +269,8 @@ for i in libList:
              err = installLink(i, concatPath([libDir, 'libcsound.so']))
          elif i[:15] == 'libcsound64.so.':
              err = installLink(i, concatPath([libDir, 'libcsound64.so']))
 -        elif i == 'libcsnd.so':
 -            err = installLink(concatPath([libDir, i]),
 -                              concatPath([pythonDir2, '_csnd.so']))
++        elif i[:11] == 'libcsnd.so.':
++            err = installLink(i, concatPath([libDir, 'libcsnd.so']))
          elif i == 'lib_CsoundVST.so':
              err = installLink(concatPath([libDir, i]),
                                concatPath([pythonDir2, '_CsoundVST.so']))
-@@ -287,7 +284,7 @@
+@@ -287,7 +286,7 @@ else:
  #err = installFile('opcodes.dir', pluginDir)
  installErrors = installErrors or err
  pluginList = findFiles('.', 'lib[A-Za-z].*\\.so')
@@ -19,7 +32,7 @@
      if i in pluginList:
          pluginList.remove(i)
  for i in pluginList:
-@@ -304,6 +301,7 @@
+@@ -304,6 +303,7 @@ installErrors = installErrors or err
  
  print ' === Installing language interfaces ==='
  wrapperList = [['csnd\\.py', '0', pythonDir],


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- csound.spec	20 Oct 2009 13:23:07 -0000	1.34
+++ csound.spec	3 Dec 2009 17:51:32 -0000	1.35
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       13%{?dist}
+Release:       14%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -81,6 +81,14 @@ Requires: python
 Contains Python language bindings for developing Python applications that
 use Csound.
 
+%package python-devel
+Summary: Csound python development files and libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description python-devel
+Contains libraries for developing against csound-python.
+
 %package java
 Summary: Java Csound support
 Group: System Environment/Libraries
@@ -373,9 +381,13 @@ fi
 
 %files python
 %defattr(-,root,root,-)
-%{_libdir}/libcsnd.so
+%{_libdir}/libcsnd.so.5.2
 %{_libdir}/python%{pyver}/site-packages/*
 
+%files python-devel
+%defattr(-,root,root,-)
+%{_libdir}/libcsnd.so
+
 %files java
 %defattr(-,root,root,-)
 %{_libdir}/lib_jcsound.so
@@ -433,6 +445,9 @@ fi
 %doc manual/examples
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-14
+- Updated python patch thanks to dsd.
+
 * Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
 - Fix use of multiple midi devices, fix segfault (RHBZ 529293)
 



From remi at fedoraproject.org  Thu Dec  3 17:51:42 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:51:42 +0000 (UTC)
Subject: rpms/php-pear-Services-Twitter/F-12 php-pear-Services-Twitter.spec, 
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091203175142.8677811C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Twitter/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14367

Modified Files:
	sources 
Added Files:
	php-pear-Services-Twitter.spec 
Log Message:
new package


--- NEW FILE php-pear-Services-Twitter.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Services_Twitter

Name:           php-pear-Services-Twitter
Version:        0.4.0
Release:        1%{?dist}
Summary:        PHP interface to Twitter's API

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Services_Twitter
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR)
Requires:       php-common >= 5.2.0
# Optional (but which requires mandatory HTTP_Request2)
Requires:       php-pear(HTTP_OAuth) >= 0.1.2

%description
An interface for communicating with Twitter's public API.
Send status updates, fetch information, add friends, etc.

%prep
%setup -q -c
# package is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Services
%{pear_datadir}/Services_Twitter
%{pear_testdir}/Services_Twitter


%changelog
* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.4.0-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Services-Twitter/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:33:59 -0000	1.1
+++ sources	3 Dec 2009 17:51:42 -0000	1.2
@@ -0,0 +1 @@
+443aea93d76934b26948e3c5b5c46c8e  Services_Twitter-0.4.0.tgz



From remi at fedoraproject.org  Thu Dec  3 17:54:04 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 17:54:04 +0000 (UTC)
Subject: rpms/php-pear-Services-Twitter/F-11 php-pear-Services-Twitter.spec, 
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091203175404.E2F8F11C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Twitter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15260

Modified Files:
	sources 
Added Files:
	php-pear-Services-Twitter.spec 
Log Message:
new package


--- NEW FILE php-pear-Services-Twitter.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Services_Twitter

Name:           php-pear-Services-Twitter
Version:        0.4.0
Release:        1%{?dist}
Summary:        PHP interface to Twitter's API

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Services_Twitter
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR)
Requires:       php-common >= 5.2.0
# Optional (but which requires mandatory HTTP_Request2)
Requires:       php-pear(HTTP_OAuth) >= 0.1.2

%description
An interface for communicating with Twitter's public API.
Send status updates, fetch information, add friends, etc.

%prep
%setup -q -c
# package is V2
mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Services
%{pear_datadir}/Services_Twitter
%{pear_testdir}/Services_Twitter


%changelog
* Wed Nov 11 2009 Remi Collet <Fedora at FamilleCollet.com> 0.4.0-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Services-Twitter/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:33:59 -0000	1.1
+++ sources	3 Dec 2009 17:54:04 -0000	1.2
@@ -0,0 +1 @@
+443aea93d76934b26948e3c5b5c46c8e  Services_Twitter-0.4.0.tgz



From pbrobinson at fedoraproject.org  Thu Dec  3 17:54:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 17:54:20 +0000 (UTC)
Subject: rpms/csound/F-12 csound-fixpython.patch, 1.1, 1.2 csound.spec, 1.34,
	1.35
Message-ID: <20091203175420.A9D8811C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15395

Modified Files:
	csound-fixpython.patch csound.spec 
Log Message:
- Updated python patch thanks to dsd.

csound-fixpython.patch:
 install.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: csound-fixpython.patch
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-12/csound-fixpython.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- csound-fixpython.patch	18 Aug 2009 15:37:52 -0000	1.1
+++ csound-fixpython.patch	3 Dec 2009 17:54:20 -0000	1.2
@@ -1,16 +1,29 @@
---- Csound5.10.1/install.py.orig	2009-08-18 09:58:32.000000000 +0100
-+++ Csound5.10.1/install.py	2009-08-18 09:59:39.000000000 +0100
-@@ -269,9 +269,6 @@
+Index: Csound5.10.1/install.py
+===================================================================
+--- Csound5.10.1.orig/install.py
++++ Csound5.10.1/install.py
+@@ -256,7 +256,7 @@ libList = findFiles('.', 'libcsound\\.a'
+ libList += findFiles('.', 'libcsound64\\.a')
+ libList += findFiles('.', 'libcsound\\.so\\..+')
+ libList += findFiles('.', 'libcsound64\\.so\\..+')
+-libList += findFiles('.', 'libcsnd\\.so')
++libList += findFiles('.', 'libcsnd\\.so\\..+')
+ libList += findFiles('.', 'lib_jcsound\\.so')
+ libList += findFiles('.', 'lib_CsoundVST\\.so')
+ for i in libList:
+@@ -269,9 +269,8 @@ for i in libList:
              err = installLink(i, concatPath([libDir, 'libcsound.so']))
          elif i[:15] == 'libcsound64.so.':
              err = installLink(i, concatPath([libDir, 'libcsound64.so']))
 -        elif i == 'libcsnd.so':
 -            err = installLink(concatPath([libDir, i]),
 -                              concatPath([pythonDir2, '_csnd.so']))
++        elif i[:11] == 'libcsnd.so.':
++            err = installLink(i, concatPath([libDir, 'libcsnd.so']))
          elif i == 'lib_CsoundVST.so':
              err = installLink(concatPath([libDir, i]),
                                concatPath([pythonDir2, '_CsoundVST.so']))
-@@ -287,7 +284,7 @@
+@@ -287,7 +286,7 @@ else:
  #err = installFile('opcodes.dir', pluginDir)
  installErrors = installErrors or err
  pluginList = findFiles('.', 'lib[A-Za-z].*\\.so')
@@ -19,7 +32,7 @@
      if i in pluginList:
          pluginList.remove(i)
  for i in pluginList:
-@@ -304,6 +301,7 @@
+@@ -304,6 +303,7 @@ installErrors = installErrors or err
  
  print ' === Installing language interfaces ==='
  wrapperList = [['csnd\\.py', '0', pythonDir],


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-12/csound.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- csound.spec	20 Oct 2009 13:27:22 -0000	1.34
+++ csound.spec	3 Dec 2009 17:54:20 -0000	1.35
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       13%{?dist}
+Release:       14%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -81,6 +81,14 @@ Requires: python
 Contains Python language bindings for developing Python applications that
 use Csound.
 
+%package python-devel
+Summary: Csound python development files and libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description python-devel
+Contains libraries for developing against csound-python.
+
 %package java
 Summary: Java Csound support
 Group: System Environment/Libraries
@@ -373,9 +381,13 @@ fi
 
 %files python
 %defattr(-,root,root,-)
-%{_libdir}/libcsnd.so
+%{_libdir}/libcsnd.so.5.2
 %{_libdir}/python%{pyver}/site-packages/*
 
+%files python-devel
+%defattr(-,root,root,-)
+%{_libdir}/libcsnd.so
+
 %files java
 %defattr(-,root,root,-)
 %{_libdir}/lib_jcsound.so
@@ -433,6 +445,9 @@ fi
 %doc manual/examples
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-14
+- Updated python patch thanks to dsd.
+
 * Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
 - Fix use of multiple midi devices, fix segfault (RHBZ 529293)
 



From pbrobinson at fedoraproject.org  Thu Dec  3 17:56:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 17:56:26 +0000 (UTC)
Subject: rpms/csound/F-11 csound-fixpython.patch, 1.1, 1.2 csound.spec, 1.27,
	1.28
Message-ID: <20091203175626.0952111C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	csound-fixpython.patch csound.spec 
Log Message:
- Updated python patch thanks to dsd.

csound-fixpython.patch:
 install.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: csound-fixpython.patch
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-11/csound-fixpython.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- csound-fixpython.patch	5 Sep 2009 14:19:11 -0000	1.1
+++ csound-fixpython.patch	3 Dec 2009 17:56:25 -0000	1.2
@@ -1,16 +1,29 @@
---- Csound5.10.1/install.py.orig	2009-08-18 09:58:32.000000000 +0100
-+++ Csound5.10.1/install.py	2009-08-18 09:59:39.000000000 +0100
-@@ -269,9 +269,6 @@
+Index: Csound5.10.1/install.py
+===================================================================
+--- Csound5.10.1.orig/install.py
++++ Csound5.10.1/install.py
+@@ -256,7 +256,7 @@ libList = findFiles('.', 'libcsound\\.a'
+ libList += findFiles('.', 'libcsound64\\.a')
+ libList += findFiles('.', 'libcsound\\.so\\..+')
+ libList += findFiles('.', 'libcsound64\\.so\\..+')
+-libList += findFiles('.', 'libcsnd\\.so')
++libList += findFiles('.', 'libcsnd\\.so\\..+')
+ libList += findFiles('.', 'lib_jcsound\\.so')
+ libList += findFiles('.', 'lib_CsoundVST\\.so')
+ for i in libList:
+@@ -269,9 +269,8 @@ for i in libList:
              err = installLink(i, concatPath([libDir, 'libcsound.so']))
          elif i[:15] == 'libcsound64.so.':
              err = installLink(i, concatPath([libDir, 'libcsound64.so']))
 -        elif i == 'libcsnd.so':
 -            err = installLink(concatPath([libDir, i]),
 -                              concatPath([pythonDir2, '_csnd.so']))
++        elif i[:11] == 'libcsnd.so.':
++            err = installLink(i, concatPath([libDir, 'libcsnd.so']))
          elif i == 'lib_CsoundVST.so':
              err = installLink(concatPath([libDir, i]),
                                concatPath([pythonDir2, '_CsoundVST.so']))
-@@ -287,7 +284,7 @@
+@@ -287,7 +286,7 @@ else:
  #err = installFile('opcodes.dir', pluginDir)
  installErrors = installErrors or err
  pluginList = findFiles('.', 'lib[A-Za-z].*\\.so')
@@ -19,7 +32,7 @@
      if i in pluginList:
          pluginList.remove(i)
  for i in pluginList:
-@@ -304,6 +301,7 @@
+@@ -304,6 +303,7 @@ installErrors = installErrors or err
  
  print ' === Installing language interfaces ==='
  wrapperList = [['csnd\\.py', '0', pythonDir],


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-11/csound.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- csound.spec	20 Oct 2009 13:28:18 -0000	1.27
+++ csound.spec	3 Dec 2009 17:56:25 -0000	1.28
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       13%{?dist}
+Release:       14%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -81,6 +81,14 @@ Requires: python
 Contains Python language bindings for developing Python applications that
 use Csound.
 
+%package python-devel
+Summary: Csound python development files and libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description python-devel
+Contains libraries for developing against csound-python.
+
 %package java
 Summary: Java Csound support
 Group: System Environment/Libraries
@@ -373,9 +381,13 @@ fi
 
 %files python
 %defattr(-,root,root,-)
-%{_libdir}/libcsnd.so
+%{_libdir}/libcsnd.so.5.2
 %{_libdir}/python%{pyver}/site-packages/*
 
+%files python-devel
+%defattr(-,root,root,-)
+%{_libdir}/libcsnd.so
+
 %files java
 %defattr(-,root,root,-)
 %{_libdir}/lib_jcsound.so
@@ -433,6 +445,9 @@ fi
 %doc manual/examples
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-14
+- Updated python patch thanks to dsd.
+
 * Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
 - Fix use of multiple midi devices, fix segfault (RHBZ 529293)
 



From cdamian at fedoraproject.org  Thu Dec  3 18:09:19 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu,  3 Dec 2009 18:09:19 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/EL-5 php-phpunit-File-Iterator.spec, 
	1.1, 1.2
Message-ID: <20091203180919.3639111C03A3@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20712

Modified Files:
	php-phpunit-File-Iterator.spec 
Log Message:
require older pear version


Index: php-phpunit-File-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5/php-phpunit-File-Iterator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-File-Iterator.spec	3 Dec 2009 07:26:04 -0000	1.1
+++ php-phpunit-File-Iterator.spec	3 Dec 2009 18:09:18 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           php-phpunit-File-Iterator
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        FilterIterator implementation that filters files based on a list of suffixes
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@ Source0:        http://pear.phpunit.de/g
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.7.2
+BuildRequires:  php-pear >= 1:1.4.9
 BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
 Requires:       php-common >= 5.2.0
@@ -75,6 +75,9 @@ fi
 %{pear_phpdir}/File
 
 %changelog
+* Thu Dec 3 2009 Christof Damian <christof at damian.net> 1.1.0-5
+- allow older pear version, works for the install anyway
+
 * Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4
 - own pear directories
 



From remi at fedoraproject.org  Thu Dec  3 18:17:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 18:17:32 +0000 (UTC)
Subject: File Mail_mimeDecode-1.5.1.tgz uploaded to lookaside cache by remi
Message-ID: <20091203181732.9127010F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-pear-Mail-mimeDecode:

0a8e7bc71dd78a2811b34cbe2d4b0792  Mail_mimeDecode-1.5.1.tgz



From remi at fedoraproject.org  Thu Dec  3 18:18:19 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 18:18:19 +0000 (UTC)
Subject: rpms/php-pear-Mail-mimeDecode/devel .cvsignore, 1.2,
	1.3 php-pear-Mail-mimeDecode.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091203181819.17C1A11C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail-mimeDecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23537

Modified Files:
	.cvsignore php-pear-Mail-mimeDecode.spec sources 
Log Message:
update to 1.5.1 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-mimeDecode/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Apr 2008 04:09:31 -0000	1.2
+++ .cvsignore	3 Dec 2009 18:18:18 -0000	1.3
@@ -1 +1 @@
-Mail_mimeDecode-1.5.0.tgz
+Mail_mimeDecode-1.5.1.tgz


Index: php-pear-Mail-mimeDecode.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-mimeDecode/devel/php-pear-Mail-mimeDecode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Mail-mimeDecode.spec	26 Jul 2009 18:20:53 -0000	1.3
+++ php-pear-Mail-mimeDecode.spec	3 Dec 2009 18:18:18 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-mimeDecode
-Version:	1.5.0
-Release:	5%{?dist}
+Version:	1.5.1
+Release:	1%{?dist}
 Summary:	Class to decode mime messages
 
 Group:		Development/Libraries
@@ -30,9 +30,8 @@ pear run-tests -p Mail_mimeDecode
 
 %prep
 %setup -q -c
-#cd Mail_mimeDecode-%{version}
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml Mail_mimeDecode-%{version}/Mail_mimeDecode.xml
+# Package.xml is V2
+mv package.xml Mail_mimeDecode-%{version}/%{name}.xml
 
 
 # Empty build section, nothing required
@@ -43,19 +42,14 @@ mv package2.xml Mail_mimeDecode-%{versio
 rm -rf %{buildroot} docdir
 
 cd Mail_mimeDecode-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Mail_mimeDecode.xml
-
-# Move documentation
-# Uncomment these lines whenever this package starts including docs
-#mkdir -p docdir
-#mv %{buildroot}%{pear_docdir}/* docdir
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 Mail_mimeDecode.xml %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
@@ -69,7 +63,7 @@ rm -rf %{buildroot}
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Mail_mimeDecode.xml >/dev/null ||:
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null ||:
 
 
 %postun
@@ -81,14 +75,16 @@ fi
 
 %files
 %defattr(-,root,root,-)
-# Uncomment whenever this package starts including docs
-#%doc Mail_mimeDecode-%{version}/docdir/Mail_mimeDecode/*
-%{pear_xmldir}/Mail_mimeDecode.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/Mail_mimeDecode
 %{pear_phpdir}/Mail/mimeDecode.php
 
 
 %changelog
+* Thu Dec 03 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-1
+- update to 1.5.1
+- rename Mail_mimeDecode.xml to php-pear-Mail-mimeDecode.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-mimeDecode/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Apr 2008 04:09:31 -0000	1.2
+++ sources	3 Dec 2009 18:18:18 -0000	1.3
@@ -1 +1 @@
-e81f99c951eb5f199caa9dcd9c16f97f  Mail_mimeDecode-1.5.0.tgz
+0a8e7bc71dd78a2811b34cbe2d4b0792  Mail_mimeDecode-1.5.1.tgz



From remi at fedoraproject.org  Thu Dec  3 18:24:26 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 18:24:26 +0000 (UTC)
Subject: rpms/php-pear-Mail-mimeDecode/F-12 php-pear-Mail-mimeDecode.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091203182426.5C95711C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail-mimeDecode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25489

Modified Files:
	php-pear-Mail-mimeDecode.spec sources 
Log Message:
update to 1.5.1 (bugfix)


Index: php-pear-Mail-mimeDecode.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-mimeDecode/F-12/php-pear-Mail-mimeDecode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Mail-mimeDecode.spec	26 Jul 2009 18:20:53 -0000	1.3
+++ php-pear-Mail-mimeDecode.spec	3 Dec 2009 18:24:26 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-mimeDecode
-Version:	1.5.0
-Release:	5%{?dist}
+Version:	1.5.1
+Release:	1%{?dist}
 Summary:	Class to decode mime messages
 
 Group:		Development/Libraries
@@ -30,9 +30,8 @@ pear run-tests -p Mail_mimeDecode
 
 %prep
 %setup -q -c
-#cd Mail_mimeDecode-%{version}
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml Mail_mimeDecode-%{version}/Mail_mimeDecode.xml
+# Package.xml is V2
+mv package.xml Mail_mimeDecode-%{version}/%{name}.xml
 
 
 # Empty build section, nothing required
@@ -43,19 +42,14 @@ mv package2.xml Mail_mimeDecode-%{versio
 rm -rf %{buildroot} docdir
 
 cd Mail_mimeDecode-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Mail_mimeDecode.xml
-
-# Move documentation
-# Uncomment these lines whenever this package starts including docs
-#mkdir -p docdir
-#mv %{buildroot}%{pear_docdir}/* docdir
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 Mail_mimeDecode.xml %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
@@ -69,7 +63,7 @@ rm -rf %{buildroot}
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Mail_mimeDecode.xml >/dev/null ||:
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null ||:
 
 
 %postun
@@ -81,14 +75,16 @@ fi
 
 %files
 %defattr(-,root,root,-)
-# Uncomment whenever this package starts including docs
-#%doc Mail_mimeDecode-%{version}/docdir/Mail_mimeDecode/*
-%{pear_xmldir}/Mail_mimeDecode.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/Mail_mimeDecode
 %{pear_phpdir}/Mail/mimeDecode.php
 
 
 %changelog
+* Thu Dec 03 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-1
+- update to 1.5.1
+- rename Mail_mimeDecode.xml to php-pear-Mail-mimeDecode.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-mimeDecode/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Apr 2008 04:09:31 -0000	1.2
+++ sources	3 Dec 2009 18:24:26 -0000	1.3
@@ -1 +1 @@
-e81f99c951eb5f199caa9dcd9c16f97f  Mail_mimeDecode-1.5.0.tgz
+0a8e7bc71dd78a2811b34cbe2d4b0792  Mail_mimeDecode-1.5.1.tgz



From remi at fedoraproject.org  Thu Dec  3 18:26:54 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu,  3 Dec 2009 18:26:54 +0000 (UTC)
Subject: rpms/php-pear-Mail-mimeDecode/F-11 php-pear-Mail-mimeDecode.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091203182654.457F611C00EE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail-mimeDecode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26340

Modified Files:
	php-pear-Mail-mimeDecode.spec sources 
Log Message:
update to 1.5.1 (bugfix)


Index: php-pear-Mail-mimeDecode.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-mimeDecode/F-11/php-pear-Mail-mimeDecode.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-Mail-mimeDecode.spec	26 Feb 2009 21:41:36 -0000	1.2
+++ php-pear-Mail-mimeDecode.spec	3 Dec 2009 18:26:54 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-mimeDecode
-Version:	1.5.0
-Release:	4%{?dist}
+Version:	1.5.1
+Release:	1%{?dist}
 Summary:	Class to decode mime messages
 
 Group:		Development/Libraries
@@ -30,9 +30,8 @@ pear run-tests -p Mail_mimeDecode
 
 %prep
 %setup -q -c
-#cd Mail_mimeDecode-%{version}
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml Mail_mimeDecode-%{version}/Mail_mimeDecode.xml
+# Package.xml is V2
+mv package.xml Mail_mimeDecode-%{version}/%{name}.xml
 
 
 # Empty build section, nothing required
@@ -43,19 +42,14 @@ mv package2.xml Mail_mimeDecode-%{versio
 rm -rf %{buildroot} docdir
 
 cd Mail_mimeDecode-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Mail_mimeDecode.xml
-
-# Move documentation
-# Uncomment these lines whenever this package starts including docs
-#mkdir -p docdir
-#mv %{buildroot}%{pear_docdir}/* docdir
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 Mail_mimeDecode.xml %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
@@ -69,7 +63,7 @@ rm -rf %{buildroot}
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Mail_mimeDecode.xml >/dev/null ||:
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null ||:
 
 
 %postun
@@ -81,14 +75,19 @@ fi
 
 %files
 %defattr(-,root,root,-)
-# Uncomment whenever this package starts including docs
-#%doc Mail_mimeDecode-%{version}/docdir/Mail_mimeDecode/*
-%{pear_xmldir}/Mail_mimeDecode.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/Mail_mimeDecode
 %{pear_phpdir}/Mail/mimeDecode.php
 
 
 %changelog
+* Thu Dec 03 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-1
+- update to 1.5.1
+- rename Mail_mimeDecode.xml to php-pear-Mail-mimeDecode.xml
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-mimeDecode/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Apr 2008 04:09:31 -0000	1.2
+++ sources	3 Dec 2009 18:26:54 -0000	1.3
@@ -1 +1 @@
-e81f99c951eb5f199caa9dcd9c16f97f  Mail_mimeDecode-1.5.0.tgz
+0a8e7bc71dd78a2811b34cbe2d4b0792  Mail_mimeDecode-1.5.1.tgz



From dledford at fedoraproject.org  Thu Dec  3 18:27:59 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:27:59 +0000 (UTC)
Subject: File libibcm-1.0.5.tar.gz uploaded to lookaside cache by dledford
Message-ID: <20091203182759.D2DB310F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libibcm:

7ede8d7e96d6a65f09f289767bd931ea  libibcm-1.0.5.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 18:28:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:28:46 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203182846.B15E210F84E@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora devel was orphaned by prarit

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:28:50 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203182850.1FCCF10F878@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora devel is now owned by prarit

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



From tgl at fedoraproject.org  Thu Dec  3 18:31:52 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu,  3 Dec 2009 18:31:52 +0000 (UTC)
Subject: File tiff-3.9.2.tar.gz uploaded to lookaside cache by tgl
Message-ID: <20091203183152.B6FE310F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libtiff:

93e56e421679c591de7552db13384cb8  tiff-3.9.2.tar.gz



From pbrobinson at fedoraproject.org  Thu Dec  3 18:33:40 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 18:33:40 +0000 (UTC)
Subject: File syncevolution-0.9.2+1.0alpha1.tar.gz uploaded to lookaside
	cache by pbrobinson
Message-ID: <20091203183340.B2B5A10F895@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for syncevolution:

1849a87a955c9ce8707125424b368027  syncevolution-0.9.2+1.0alpha1.tar.gz



From dledford at fedoraproject.org  Thu Dec  3 18:35:04 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:35:04 +0000 (UTC)
Subject: rpms/libibcm/devel .cvsignore, 1.2, 1.3 libibcm.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091203183504.9CA8211C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

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

Modified Files:
	.cvsignore libibcm.spec sources 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-1
- Update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibcm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Jun 2008 01:17:43 -0000	1.2
+++ .cvsignore	3 Dec 2009 18:35:04 -0000	1.3
@@ -1 +1,2 @@
 libibcm-1.0.2.tar.gz
+libibcm-1.0.5.tar.gz


Index: libibcm.spec
===================================================================
RCS file: /cvs/extras/rpms/libibcm/devel/libibcm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libibcm.spec	25 Jul 2009 05:54:27 -0000	1.3
+++ libibcm.spec	3 Dec 2009 18:35:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name: libibcm
-Version: 1.0.2
-Release: 3%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 Summary: Userspace InfiniBand Connection Manager
 Group: System Environment/Libraries
 License: GPLv2 or BSD
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-1
+- Update to latest upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibcm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Jun 2008 01:17:43 -0000	1.2
+++ sources	3 Dec 2009 18:35:04 -0000	1.3
@@ -1 +1 @@
-11ce46edcb45de4276060661b2068749  libibcm-1.0.2.tar.gz
+7ede8d7e96d6a65f09f289767bd931ea  libibcm-1.0.5.tar.gz



From pbrobinson at fedoraproject.org  Thu Dec  3 18:35:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 18:35:25 +0000 (UTC)
Subject: rpms/syncevolution/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 syncevolution.spec, 1.17, 1.18
Message-ID: <20091203183525.2754811C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore sources syncevolution.spec 
Log Message:
- Update to 1.0.0 alpha 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Sep 2009 09:08:34 -0000	1.6
+++ .cvsignore	3 Dec 2009 18:35:24 -0000	1.7
@@ -1 +1 @@
-syncevolution-0.9.tar.gz
+syncevolution-0.9.2+1.0alpha1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Sep 2009 09:08:35 -0000	1.6
+++ sources	3 Dec 2009 18:35:25 -0000	1.7
@@ -1 +1 @@
-480529e14bc895035824f5d7cce71228  syncevolution-0.9.tar.gz
+1849a87a955c9ce8707125424b368027  syncevolution-0.9.2+1.0alpha1.tar.gz


Index: syncevolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/syncevolution.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- syncevolution.spec	17 Nov 2009 13:09:48 -0000	1.17
+++ syncevolution.spec	3 Dec 2009 18:35:25 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: SyncML client for evolution
 Name: syncevolution
-Version: 0.9
-Release: 3%{?dist}
+Version: 0.9.2+1.0alpha1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Productivity
 URL: http://syncevolution.org/
@@ -83,7 +83,7 @@ find . -type d -perm 02755 -exec chmod 0
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/testcases
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 #rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
 
 #Remove libtool archives and static libs
@@ -100,22 +100,25 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS README COPYING HACKING LICENSE.LGPL-21 LICENSE.txt
-%{_sysconfdir}/default/syncevolution
 %{_bindir}/client-test
 %{_bindir}/syncevolution
 %{_libdir}/*so.0*
 %{_libdir}/syncevolution/*so.0*
+%{_libdir}/syncevolution/backends
 %{_libexecdir}/syncevo-dbus-server
-%{_datadir}/dbus-1/services/org.Moblin.SyncEvolution.service
 %{_datadir}/syncevolution/*.png
+%{_datadir}/syncevolution/templates
+%{_datadir}/icons/hicolor/48x48/apps/sync.png
 %{_datadir}/syncevolution/sync-ui.rc
+%{_datadir}/dbus-1/services/org.syncevolution.service
 
 %files devel
 %defattr(-,root,root,-)
+%{_includedir}/gdbus*
+%{_includedir}/syncevo
 %{_includedir}/syncevo-dbus
 %{_includedir}/synthesis
-%{_libdir}/pkgconfig/syncevo-dbus.pc
-%{_libdir}/pkgconfig/synthesis.pc
+%{_libdir}/pkgconfig/s*.pc
 %{_libdir}/*so
 %{_libdir}/syncevolution/*so
 
@@ -135,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/synccompare
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at redhat.com> - 0.9.2+1.0alpha1-1
+- Update to 1.0.0 alpha 1
+
 * Tue Nov 17 2009 Peter Robinson <pbrobinson at redhat.com> - 0.9-3
 - Spec updates, split perl utils into sub-package
 



From pkgdb at fedoraproject.org  Thu Dec  3 18:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:36:03 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183603.3A86410F891@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora devel was orphaned by prarit

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



From dledford at fedoraproject.org  Thu Dec  3 18:36:32 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:36:32 +0000 (UTC)
Subject: rpms/libibcm/F-12 libibcm.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091203183632.2359811C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibcm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29859

Modified Files:
	libibcm.spec sources 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-1
- Update to latest upstream version



Index: libibcm.spec
===================================================================
RCS file: /cvs/extras/rpms/libibcm/F-12/libibcm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libibcm.spec	25 Jul 2009 05:54:27 -0000	1.3
+++ libibcm.spec	3 Dec 2009 18:36:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name: libibcm
-Version: 1.0.2
-Release: 3%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 Summary: Userspace InfiniBand Connection Manager
 Group: System Environment/Libraries
 License: GPLv2 or BSD
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-1
+- Update to latest upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibcm/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Jun 2008 01:17:43 -0000	1.2
+++ sources	3 Dec 2009 18:36:32 -0000	1.3
@@ -1 +1 @@
-11ce46edcb45de4276060661b2068749  libibcm-1.0.2.tar.gz
+7ede8d7e96d6a65f09f289767bd931ea  libibcm-1.0.5.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 18:36:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:36:31 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183631.08CEE10F891@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora devel is now owned by aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:17 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183718.0267910F865@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 7 was orphaned by prarit

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:19 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183719.9936A10F895@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 8 was orphaned by prarit

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:22 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183722.76CBC10F896@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 9 was orphaned by prarit

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:24 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183724.C398910F89C@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 10 was orphaned by prarit

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:27 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183727.61E9D10F89E@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 11 was orphaned by prarit

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:31 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183731.BBAC110F865@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 12 was orphaned by prarit

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:36 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183736.25B4910F894@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 11 is now owned by aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:39 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183739.6BBA510F8A1@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 10 is now owned by aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:37:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:37:49 +0000
Subject: [pkgdb] dmidecode ownership updated
Message-ID: <20091203183749.D2DFF10F89D@bastion2.fedora.phx.redhat.com>

Package dmidecode in Fedora 12 is now owned by aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:38:39 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203183839.6F65110F865@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on dmidecode (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:38:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:38:40 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203183840.C884010F894@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on dmidecode (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:38:42 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203183842.449C710F896@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:38:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:38:44 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203183844.7941A10F89C@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on dmidecode (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:38:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:38:46 +0000
Subject: [pkgdb] dmidecode: aarapov has given up watchbugzilla
Message-ID: <20091203183846.5D8B410F89E@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on dmidecode (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:38:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:38:46 +0000
Subject: [pkgdb] dmidecode: aarapov has given up watchcommits
Message-ID: <20091203183846.E60EA10F8A2@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on dmidecode (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:38:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:38:47 +0000
Subject: [pkgdb] dmidecode: aarapov has requested commit
Message-ID: <20091203183847.3C7C510F8A4@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on dmidecode (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:38:49 +0000
Subject: [pkgdb] dmidecode: aarapov has requested approveacls
Message-ID: <20091203183849.1B3B410F8A6@bastion2.fedora.phx.redhat.com>

aarapov has requested the approveacls acl on dmidecode (Fedora 11)

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



From dledford at fedoraproject.org  Thu Dec  3 18:39:50 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:39:50 +0000 (UTC)
Subject: File librdmacm-1.0.10.tar.gz uploaded to lookaside cache by dledford
Message-ID: <20091203183950.DB62D10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for librdmacm:

20ea35c34a928152af529a647c86f0ba  librdmacm-1.0.10.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 18:39:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:39:52 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203183952.2DE4E10F894@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora 10) to Obsolete for ajax

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:40:23 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184023.9AAA710F896@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora devel) to Obsolete for ajax

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:40:38 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184038.1693E10F891@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora 11) to Obsolete for ajax

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:38 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184138.D3C9910F865@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on dmidecode (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:40 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184140.10EE310F895@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on dmidecode (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:40 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184141.0319410F89C@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora 12) to Obsolete for ajax

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:41 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184141.8FEC010F89E@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:42 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184142.B25C610F8A3@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on dmidecode (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:45 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184145.CA51510F8A5@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:44 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184144.8C44F10F865@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on dmidecode (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:46 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184146.F213510F8A8@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on dmidecode (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:48 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184148.3E77A10F8AA@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on dmidecode (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:54 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184154.1A5F510F894@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on dmidecode (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:55 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184155.234DE10F896@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on dmidecode (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:56 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184156.597A410F8AC@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:41:57 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184157.D366910F8AF@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on dmidecode (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:03 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184203.6283810F8A1@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on dmidecode (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:04 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184204.51A8D10F8B1@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on dmidecode (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:05 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184205.9F5BD10F8B4@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on dmidecode (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:06 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184206.9F84310F8B5@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on dmidecode (Fedora devel) to Approved for aarapov

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



From tgl at fedoraproject.org  Thu Dec  3 18:42:07 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu,  3 Dec 2009 18:42:07 +0000 (UTC)
Subject: rpms/libtiff/devel libtiff-CVE-2009-2347.patch, NONE,
	1.1 libtiff-acversion.patch, NONE, 1.1 libtiff-mantypo.patch,
	NONE, 1.1 .cvsignore, 1.8, 1.9 libtiff.spec, 1.57, 1.58 sources,
	1.8, 1.9 libtiff-3.7.2-persample.patch, 1.1,
	NONE libtiff-3.8.2-CVE-2006-2193.patch, 1.1,
	NONE libtiff-3.8.2-CVE-2009-2347.patch, 1.1,
	NONE libtiff-3.8.2-lzw-bugs.patch, 1.2,
	NONE libtiff-3.8.2-mantypo.patch, 1.1,
	NONE libtiff-3.8.2-ormandy.patch, 1.1,
	NONE libtiff-v3.6.1-64bit.patch, 1.1,
	NONE tiffsplit-overflow.patch, 1.1, NONE
Message-ID: <20091203184207.9816A11C00EE@cvs1.fedora.phx.redhat.com>

Author: tgl

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

Modified Files:
	.cvsignore libtiff.spec sources 
Added Files:
	libtiff-CVE-2009-2347.patch libtiff-acversion.patch 
	libtiff-mantypo.patch 
Removed Files:
	libtiff-3.7.2-persample.patch 
	libtiff-3.8.2-CVE-2006-2193.patch 
	libtiff-3.8.2-CVE-2009-2347.patch libtiff-3.8.2-lzw-bugs.patch 
	libtiff-3.8.2-mantypo.patch libtiff-3.8.2-ormandy.patch 
	libtiff-v3.6.1-64bit.patch tiffsplit-overflow.patch 
Log Message:
Update to libtiff 3.9.2

libtiff-CVE-2009-2347.patch:
 tiff2rgba.c |   35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

--- NEW FILE libtiff-CVE-2009-2347.patch ---
diff -Naur tiff-3.9.2.orig/tools/tiff2rgba.c tiff-3.9.2/tools/tiff2rgba.c
--- tiff-3.9.2.orig/tools/tiff2rgba.c	2009-08-20 16:23:53.000000000 -0400
+++ tiff-3.9.2/tools/tiff2rgba.c	2009-12-03 12:19:07.000000000 -0500
@@ -125,6 +125,17 @@
     return (0);
 }
 
+static tsize_t
+multiply(tsize_t m1, tsize_t m2)
+{
+    tsize_t prod = m1 * m2;
+
+    if (m1 && prod / m1 != m2)
+        prod = 0;		/* overflow */
+
+    return prod;
+}
+
 static int
 cvt_by_tile( TIFF *in, TIFF *out )
 
@@ -134,6 +145,7 @@
     uint32  tile_width, tile_height;
     uint32  row, col;
     uint32  *wrk_line;
+    tsize_t raster_size;
     int	    ok = 1;
 
     TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
@@ -151,7 +163,14 @@
     /*
      * Allocate tile buffer
      */
-    raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof (uint32));
+    raster_size = multiply(multiply(tile_width, tile_height), sizeof (uint32));
+    if (!raster_size) {
+	TIFFError(TIFFFileName(in),
+		  "Can't allocate buffer for raster of size %lux%lu",
+		  (unsigned long) tile_width, (unsigned long) tile_height);
+	return (0);
+    }
+    raster = (uint32*)_TIFFmalloc(raster_size);
     if (raster == 0) {
         TIFFError(TIFFFileName(in), "No space for raster buffer");
         return (0);
@@ -159,7 +178,7 @@
 
     /*
      * Allocate a scanline buffer for swapping during the vertical
-     * mirroring pass.
+     * mirroring pass.  (Request can't overflow given prior checks.)
      */
     wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32));
     if (!wrk_line) {
@@ -236,6 +255,7 @@
     uint32  width, height;		/* image width & height */
     uint32  row;
     uint32  *wrk_line;
+    tsize_t raster_size;
     int	    ok = 1;
 
     TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
@@ -251,7 +271,14 @@
     /*
      * Allocate strip buffer
      */
-    raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32));
+    raster_size = multiply(multiply(width, rowsperstrip), sizeof (uint32));
+    if (!raster_size) {
+	TIFFError(TIFFFileName(in),
+		  "Can't allocate buffer for raster of size %lux%lu",
+		  (unsigned long) width, (unsigned long) rowsperstrip);
+	return (0);
+    }
+    raster = (uint32*)_TIFFmalloc(raster_size);
     if (raster == 0) {
         TIFFError(TIFFFileName(in), "No space for raster buffer");
         return (0);
@@ -259,7 +286,7 @@
 
     /*
      * Allocate a scanline buffer for swapping during the vertical
-     * mirroring pass.
+     * mirroring pass.  (Request can't overflow given prior checks.)
      */
     wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32));
     if (!wrk_line) {

libtiff-acversion.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libtiff-acversion.patch ---
diff -Naur tiff-3.9.2.orig/configure.ac tiff-3.9.2/configure.ac
--- tiff-3.9.2.orig/configure.ac	2009-11-04 12:11:20.000000000 -0500
+++ tiff-3.9.2/configure.ac	2009-12-03 12:52:41.000000000 -0500
@@ -24,7 +24,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.64)
+AC_PREREQ(2.63)
 AC_INIT([LibTIFF Software],[3.9.2],[tiff at lists.maptools.org],[tiff])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(m4)

libtiff-mantypo.patch:
 tiffset.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libtiff-mantypo.patch ---
diff -Naur tiff-3.9.2.orig/man/tiffset.1 tiff-3.9.2/man/tiffset.1
--- tiff-3.9.2.orig/man/tiffset.1	2006-04-20 08:17:19.000000000 -0400
+++ tiff-3.9.2/man/tiffset.1	2009-12-03 12:11:58.000000000 -0500
@@ -60,7 +60,7 @@
 ``Anonymous'':
 .RS
 .nf
-tiffset \-s 305 Anonymous a.tif
+tiffset \-s 315 Anonymous a.tif
 .fi
 .RE
 .PP


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Apr 2006 18:43:45 -0000	1.8
+++ .cvsignore	3 Dec 2009 18:42:07 -0000	1.9
@@ -1 +1 @@
-tiff-3.8.2.tar.gz
+tiff-3.9.2.tar.gz


Index: libtiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/devel/libtiff.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- libtiff.spec	16 Oct 2009 04:08:23 -0000	1.57
+++ libtiff.spec	3 Dec 2009 18:42:07 -0000	1.58
@@ -1,21 +1,21 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
-Version: 3.8.2
-Release: 16%{?dist}
+Version: 3.9.2
+Release: 1%{?dist}
+
 License: libtiff
 Group: System Environment/Libraries
 URL: http://www.remotesensing.org/libtiff/
 
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
-Patch0: tiffsplit-overflow.patch
-Patch1: libtiff-3.8.2-ormandy.patch
-Patch2: libtiff-3.8.2-CVE-2006-2193.patch
-Patch3: libtiff-3.8.2-mantypo.patch
-Patch4: libtiff-3.8.2-lzw-bugs.patch
-Patch5: libtiff-3.8.2-CVE-2009-2347.patch
+Patch1: libtiff-acversion.patch
+Patch2: libtiff-mantypo.patch
+Patch3: libtiff-CVE-2009-2347.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel libjpeg-devel
+BuildRequires: libtool automake autoconf
+
 %define LIBVER %(echo %{version} | cut -f 1-2 -d .)
 
 %description
@@ -51,15 +51,30 @@ The libtiff-static package contains the 
 Linking to static libraries is discouraged for most applications, but it is
 necessary for some boot packages.
 
+%package tools
+Summary: Command-line utility programs for manipulating TIFF files
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description tools
+This package contains command-line programs for manipulating TIFF format
+image files using the libtiff library.
+
 %prep
 %setup -q -n tiff-%{version}
 
-%patch0 -p1 -b .overflow
-%patch1 -p1 -b .ormandy
-%patch2 -p1 -b .CVE-2006-2193
-%patch3 -p1 -b .mantypo
-%patch4 -p1
-%patch5 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+# Use build system's libtool.m4, not the one in the package.
+rm -f libtool.m4
+
+libtoolize --force  --copy
+aclocal -I . -I m4
+automake --add-missing --copy
+autoconf
+autoheader
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -71,7 +86,7 @@ LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH ma
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 # remove what we didn't want installed
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -141,10 +156,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,0755)
 %doc COPYRIGHT README RELEASE-DATE VERSION
-%{_bindir}/*
 %{_libdir}/libtiff.so.*
 %{_libdir}/libtiffxx.so.*
-%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,0755)
@@ -158,7 +171,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_libdir}/*.a
 
+%files tools
+%defattr(-,root,root,0755)
+%{_bindir}/*
+%{_mandir}/man1/*
+
 %changelog
+* Thu Dec  3 2009 Tom Lane <tgl at redhat.com> 3.9.2-1
+- Update to libtiff 3.9.2; stop carrying a lot of old patches
+Resolves: #520734
+- Split command-line tools into libtiff-tools subpackage
+Resolves: #515170
+- Use build system's libtool instead of what package contains;
+  among other cleanup this gets rid of unwanted rpath specs in executables
+Related: #226049
+
 * Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 3.8.2-16
 - add sparc/sparc64 to multilib header support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Apr 2006 18:43:45 -0000	1.8
+++ sources	3 Dec 2009 18:42:07 -0000	1.9
@@ -1 +1 @@
-fbb6f446ea4ed18955e2714934e5b698  tiff-3.8.2.tar.gz
+93e56e421679c591de7552db13384cb8  tiff-3.9.2.tar.gz


--- libtiff-3.7.2-persample.patch DELETED ---


--- libtiff-3.8.2-CVE-2006-2193.patch DELETED ---


--- libtiff-3.8.2-CVE-2009-2347.patch DELETED ---


--- libtiff-3.8.2-lzw-bugs.patch DELETED ---


--- libtiff-3.8.2-mantypo.patch DELETED ---


--- libtiff-3.8.2-ormandy.patch DELETED ---


--- libtiff-v3.6.1-64bit.patch DELETED ---


--- tiffsplit-overflow.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:08 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091203184208.22D1210F8B7@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on dmidecode (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:55 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184255.A42F110F8AC@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on cpufrequtils (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:56 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184256.97DB310F8AF@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on cpufrequtils (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:57 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184257.5E6E210F8B9@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on cpufrequtils (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:42:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:42:59 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184300.1821A10F8A1@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on cpufrequtils (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:01 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184301.6026B10F8BA@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on cpufrequtils (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:03 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184303.23E6810F8B3@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on cpufrequtils (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:05 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184306.140C310F8BF@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on cpufrequtils (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:04 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184304.1C89810F8BC@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on cpufrequtils (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:10 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184310.56C0110F8C2@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on cpufrequtils (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:12 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184312.5FA1210F8B5@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on cpufrequtils (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:13 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184313.B9B6510F8C3@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on cpufrequtils (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:15 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184315.16C8A10F8C5@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on cpufrequtils (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:19 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184319.AC81E10F8C9@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on cpufrequtils (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:18 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184318.7DDBD10F8C7@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on cpufrequtils (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:21 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184321.2155410F8B8@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on cpufrequtils (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:43:22 +0000
Subject: [pkgdb] cpufrequtils had acl change status
Message-ID: <20091203184322.5C80F10F8A3@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on cpufrequtils (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:04 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184404.B913A10F895@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on cpuspeed (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:05 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184405.C7FBC10F8A5@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on cpuspeed (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:08 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184408.1F06110F8A1@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on cpuspeed (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:06 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184406.C512410F899@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on cpuspeed (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:12 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184412.29D3A10F8A8@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on cpuspeed (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:13 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184413.3333510F8AB@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on cpuspeed (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:14 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184414.8F2F510F8AD@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on cpuspeed (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:15 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184415.35C4310F8B0@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on cpuspeed (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:17 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184417.1B55210F8B9@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on cpuspeed (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:19 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184419.880CC10F8B3@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on cpuspeed (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:18 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184418.2F3E510F8BA@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on cpuspeed (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:20 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184420.B906210F8CC@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on cpuspeed (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:26 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184426.C5ACA10F8CE@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on cpuspeed (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:27 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184428.3C32110F8CF@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on cpuspeed (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:28 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184428.C410C10F8BF@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on cpuspeed (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:45 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20091203184445.AF23510F8B4@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on memtest86+ (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:30 +0000
Subject: [pkgdb] cpuspeed had acl change status
Message-ID: <20091203184430.A0AC210F8C1@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on cpuspeed (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:48 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20091203184448.1A3AA10F8D0@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on memtest86+ (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:49 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20091203184449.5EB5210F8D2@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on memtest86+ (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:44:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:44:46 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20091203184447.05FB510F8C2@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on memtest86+ (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:10 +0000
Subject: [pkgdb] memtest86+: aarapov has given up watchbugzilla
Message-ID: <20091203184510.A131710F8C6@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on memtest86+ (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:11 +0000
Subject: [pkgdb] memtest86+: aarapov has given up watchcommits
Message-ID: <20091203184511.AF03A10F8C8@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on memtest86+ (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:12 +0000
Subject: [pkgdb] memtest86+: aarapov has given up commit
Message-ID: <20091203184512.8A8F010F8D5@bastion2.fedora.phx.redhat.com>

aarapov has given up the commit acl on memtest86+ (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:13 +0000
Subject: [pkgdb] memtest86+: aarapov has given up approveacls
Message-ID: <20091203184513.6311110F8D9@bastion2.fedora.phx.redhat.com>

aarapov has given up the approveacls acl on memtest86+ (Fedora 11)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:15 +0000
Subject: [pkgdb] memtest86+: aarapov has given up approveacls
Message-ID: <20091203184515.9C30810F8B8@bastion2.fedora.phx.redhat.com>

aarapov has given up the approveacls acl on memtest86+ (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:17 +0000
Subject: [pkgdb] memtest86+: aarapov has given up commit
Message-ID: <20091203184517.E574810F8DA@bastion2.fedora.phx.redhat.com>

aarapov has given up the commit acl on memtest86+ (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:19 +0000
Subject: [pkgdb] memtest86+: aarapov has given up watchcommits
Message-ID: <20091203184519.9D94810F8E0@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on memtest86+ (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:19 +0000
Subject: [pkgdb] memtest86+: aarapov has given up watchbugzilla
Message-ID: <20091203184519.9F70110F8E1@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on memtest86+ (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:25 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20091203184525.6C0A410F8E5@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on memtest86+ (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:27 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20091203184527.4748110F895@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on memtest86+ (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:28 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20091203184528.58FFA10F8A4@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on memtest86+ (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:29 +0000
Subject: [pkgdb] memtest86+ had acl change status
Message-ID: <20091203184529.7998610F8EB@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on memtest86+ (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:56 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184556.5B12B10F89C@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on sysfsutils (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:57 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184557.0BD2910F8A5@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on sysfsutils (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:59 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184559.F242F10F8AA@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on sysfsutils (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:04 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184604.DE27510F8AF@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on sysfsutils (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:06 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184606.4E6F510F8B1@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on sysfsutils (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:45:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:45:58 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184558.5AFB610F8A8@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on sysfsutils (Fedora devel) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:07 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184607.E99CB10F8ED@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on sysfsutils (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:10 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184610.976BE10F8B2@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on sysfsutils (Fedora 10) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:13 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184613.BC30E10F8B9@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on sysfsutils (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:15 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184615.5DD1C10F8EE@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on sysfsutils (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:16 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184616.EFADB10F8F0@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on sysfsutils (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:18 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184618.40DA110F8F2@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on sysfsutils (Fedora 11) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:20 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184620.28B5E10F8F4@bastion2.fedora.phx.redhat.com>

aarapov has set the approveacls acl on sysfsutils (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:21 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184621.8E8FB10F8BB@bastion2.fedora.phx.redhat.com>

aarapov has set the commit acl on sysfsutils (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:23 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184623.213C810F8CC@bastion2.fedora.phx.redhat.com>

aarapov has set the watchcommits acl on sysfsutils (Fedora 12) to Obsolete for aarapov

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



From pkgdb at fedoraproject.org  Thu Dec  3 18:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:46:24 +0000
Subject: [pkgdb] sysfsutils had acl change status
Message-ID: <20091203184624.7C80510F8F5@bastion2.fedora.phx.redhat.com>

aarapov has set the watchbugzilla acl on sysfsutils (Fedora 12) to Obsolete for aarapov

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sysfsutils



From pkgdb at fedoraproject.org  Thu Dec  3 18:47:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:47:57 +0000
Subject: [pkgdb] libtopology: aarapov has given up approveacls
Message-ID: <20091203184757.0858010F8DA@bastion2.fedora.phx.redhat.com>

aarapov has given up the approveacls acl on libtopology (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtopology



From pkgdb at fedoraproject.org  Thu Dec  3 18:49:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:49:21 +0000
Subject: [pkgdb] bluez: aarapov has given up watchbugzilla
Message-ID: <20091203184921.9093E10F8B3@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on bluez (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From dledford at fedoraproject.org  Thu Dec  3 18:49:15 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:49:15 +0000 (UTC)
Subject: rpms/librdmacm/devel .cvsignore, 1.3, 1.4 librdmacm.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20091203184915.CB5BA11C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/librdmacm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1803

Modified Files:
	.cvsignore librdmacm.spec sources 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.0.10-1
- Update to latest upstream release
- Change Requires on -devel package (bz533937)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/librdmacm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Mar 2008 23:20:42 -0000	1.3
+++ .cvsignore	3 Dec 2009 18:49:15 -0000	1.4
@@ -1 +1,2 @@
 librdmacm-1.0.7.tar.gz
+librdmacm-1.0.10.tar.gz


Index: librdmacm.spec
===================================================================
RCS file: /cvs/extras/rpms/librdmacm/devel/librdmacm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- librdmacm.spec	25 Jul 2009 08:31:52 -0000	1.4
+++ librdmacm.spec	3 Dec 2009 18:49:15 -0000	1.5
@@ -1,6 +1,6 @@
 Name: librdmacm
-Version: 1.0.7
-Release: 3%{?dist}
+Version: 1.0.10
+Release: 1%{?dist}
 Summary: Userspace RDMA Connection Manager
 
 Group: System Environment/Libraries
@@ -9,7 +9,7 @@ Url: http://www.openfabrics.org/
 Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libibverbs-devel >= 1.1-1
+BuildRequires: libibverbs-devel >= 1.1
 
 %description
 librdmacm provides a userspace RDMA Communication Managment API.
@@ -17,7 +17,7 @@ librdmacm provides a userspace RDMA Comm
 %package devel
 Summary: Development files for the librdmacm library
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release} %{_includedir}/infiniband/verbs.h
+Requires: %{name} = %{version}-%{release} libibverbs-devel%{?_isa}
 
 %description devel
 Development files for the librdmacm library.
@@ -80,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.0.10-1
+- Update to latest upstream release
+- Change Requires on -devel package (bz533937)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librdmacm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Mar 2008 23:20:42 -0000	1.3
+++ sources	3 Dec 2009 18:49:15 -0000	1.4
@@ -1 +1 @@
-cf54a6f68be37214408ea0e8e45e0395  librdmacm-1.0.7.tar.gz
+20ea35c34a928152af529a647c86f0ba  librdmacm-1.0.10.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 18:49:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:49:22 +0000
Subject: [pkgdb] bluez: aarapov has given up watchcommits
Message-ID: <20091203184922.A980410F8E1@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on bluez (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez



From pkgdb at fedoraproject.org  Thu Dec  3 18:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:49:36 +0000
Subject: [pkgdb] irqbalance: aarapov has given up watchcommits
Message-ID: <20091203184936.EC4AD10F8EA@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on irqbalance (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/irqbalance



From pkgdb at fedoraproject.org  Thu Dec  3 18:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:49:38 +0000
Subject: [pkgdb] irqbalance: aarapov has given up watchbugzilla
Message-ID: <20091203184938.1FE5910F8ED@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on irqbalance (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/irqbalance



From dledford at fedoraproject.org  Thu Dec  3 18:49:57 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:49:57 +0000 (UTC)
Subject: rpms/librdmacm/F-12 librdmacm.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20091203184957.2C65611C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/librdmacm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2120

Modified Files:
	librdmacm.spec sources 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.0.10-1
- Update to latest upstream release
- Change Requires on -devel package (bz533937)



Index: librdmacm.spec
===================================================================
RCS file: /cvs/extras/rpms/librdmacm/F-12/librdmacm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- librdmacm.spec	25 Jul 2009 08:31:52 -0000	1.4
+++ librdmacm.spec	3 Dec 2009 18:49:57 -0000	1.5
@@ -1,6 +1,6 @@
 Name: librdmacm
-Version: 1.0.7
-Release: 3%{?dist}
+Version: 1.0.10
+Release: 1%{?dist}
 Summary: Userspace RDMA Connection Manager
 
 Group: System Environment/Libraries
@@ -9,7 +9,7 @@ Url: http://www.openfabrics.org/
 Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libibverbs-devel >= 1.1-1
+BuildRequires: libibverbs-devel >= 1.1
 
 %description
 librdmacm provides a userspace RDMA Communication Managment API.
@@ -17,7 +17,7 @@ librdmacm provides a userspace RDMA Comm
 %package devel
 Summary: Development files for the librdmacm library
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release} %{_includedir}/infiniband/verbs.h
+Requires: %{name} = %{version}-%{release} libibverbs-devel%{?_isa}
 
 %description devel
 Development files for the librdmacm library.
@@ -80,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.0.10-1
+- Update to latest upstream release
+- Change Requires on -devel package (bz533937)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librdmacm/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Mar 2008 23:20:42 -0000	1.3
+++ sources	3 Dec 2009 18:49:57 -0000	1.4
@@ -1 +1 @@
-cf54a6f68be37214408ea0e8e45e0395  librdmacm-1.0.7.tar.gz
+20ea35c34a928152af529a647c86f0ba  librdmacm-1.0.10.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 18:50:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:50:05 +0000
Subject: [pkgdb] libhugetlbfs: aarapov has given up commit
Message-ID: <20091203185005.319A510F8F4@bastion2.fedora.phx.redhat.com>

aarapov has given up the commit acl on libhugetlbfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs



From pkgdb at fedoraproject.org  Thu Dec  3 18:50:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:50:13 +0000
Subject: [pkgdb] smartmontools: aarapov has given up watchbugzilla
Message-ID: <20091203185013.6388510F90A@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on smartmontools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Thu Dec  3 18:50:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:50:14 +0000
Subject: [pkgdb] smartmontools: aarapov has given up watchcommits
Message-ID: <20091203185014.F41DC10F8C2@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on smartmontools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smartmontools



From pkgdb at fedoraproject.org  Thu Dec  3 18:50:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:50:56 +0000
Subject: [pkgdb] microcode_ctl: aarapov has given up watchbugzilla
Message-ID: <20091203185056.3960C10F8C5@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on microcode_ctl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Dec  3 18:50:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:50:57 +0000
Subject: [pkgdb] microcode_ctl: aarapov has given up watchcommits
Message-ID: <20091203185057.ABE1710F8D2@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on microcode_ctl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Dec  3 18:50:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:50:58 +0000
Subject: [pkgdb] microcode_ctl: aarapov has given up commit
Message-ID: <20091203185059.0115710F8F3@bastion2.fedora.phx.redhat.com>

aarapov has given up the commit acl on microcode_ctl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/microcode_ctl



From pkgdb at fedoraproject.org  Thu Dec  3 18:51:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:51:19 +0000
Subject: [pkgdb] rng-utils: aarapov has given up watchbugzilla
Message-ID: <20091203185119.C16E610F8C8@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on rng-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rng-utils



From pkgdb at fedoraproject.org  Thu Dec  3 18:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:51:21 +0000
Subject: [pkgdb] rng-utils: aarapov has given up watchcommits
Message-ID: <20091203185121.AEF4510F8D4@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on rng-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rng-utils



From pkgdb at fedoraproject.org  Thu Dec  3 18:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:51:33 +0000
Subject: [pkgdb] x86info: aarapov has given up watchbugzilla
Message-ID: <20091203185133.5273010F8D5@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchbugzilla acl on x86info (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/x86info



From pkgdb at fedoraproject.org  Thu Dec  3 18:51:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 18:51:34 +0000
Subject: [pkgdb] x86info: aarapov has given up watchcommits
Message-ID: <20091203185134.6F5E010F8FF@bastion2.fedora.phx.redhat.com>

aarapov has given up the watchcommits acl on x86info (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/x86info



From dledford at fedoraproject.org  Thu Dec  3 18:53:01 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:53:01 +0000 (UTC)
Subject: File libibumad-1.3.3.tar.gz uploaded to lookaside cache by dledford
Message-ID: <20091203185301.6492910F8A9@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libibumad:

5a77490e7f604043f5f902e4e4f5d056  libibumad-1.3.3.tar.gz



From laxathom at fedoraproject.org  Thu Dec  3 18:56:49 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Thu,  3 Dec 2009 18:56:49 +0000 (UTC)
Subject: File gammu-1.26.1.tar.bz2 uploaded to lookaside cache by laxathom
Message-ID: <20091203185649.CE6FE10F8A8@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gammu:

ba8caab6b21a2ce0fa668f9403b8319a  gammu-1.26.1.tar.bz2



From dledford at fedoraproject.org  Thu Dec  3 18:57:33 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:57:33 +0000 (UTC)
Subject: rpms/libibumad/devel .cvsignore, 1.4, 1.5 libibumad.spec, 1.9,
	1.10 sources, 1.4, 1.5 libibumad-1.3.2-man.patch, 1.1, NONE
Message-ID: <20091203185733.6F9F311C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibumad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4529

Modified Files:
	.cvsignore libibumad.spec sources 
Removed Files:
	libibumad-1.3.2-man.patch 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-1
- Update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibumad/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 16:25:26 -0000	1.4
+++ .cvsignore	3 Dec 2009 18:57:33 -0000	1.5
@@ -1,3 +1,4 @@
 libibumad-1.2.0.tar.gz
 libibumad-1.3.1.tar.gz
 libibumad-1.3.2.tar.gz
+libibumad-1.3.3.tar.gz


Index: libibumad.spec
===================================================================
RCS file: /cvs/extras/rpms/libibumad/devel/libibumad.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libibumad.spec	25 Jul 2009 05:55:13 -0000	1.9
+++ libibumad.spec	3 Dec 2009 18:57:33 -0000	1.10
@@ -1,12 +1,11 @@
 Summary: OpenFabrics Alliance InfiniBand umad (user MAD) library
 Name: libibumad
-Version: 1.3.2
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
-Patch0: libibumad-1.3.2-man.patch
 Url: http://openfabrics.org
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -35,10 +34,6 @@ Static version of the libibumad library.
 
 %prep
 %setup -q
-%patch0 -p1
-libtoolize --copy --force
-touch NEWS README
-autoreconf --install --force
 
 %build
 %configure
@@ -72,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibumad.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-1
+- Update to latest upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibumad/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 16:25:26 -0000	1.4
+++ sources	3 Dec 2009 18:57:33 -0000	1.5
@@ -1 +1 @@
-8d88ad53f0adeb9a5be24754d7c3058c  libibumad-1.3.2.tar.gz
+5a77490e7f604043f5f902e4e4f5d056  libibumad-1.3.3.tar.gz


--- libibumad-1.3.2-man.patch DELETED ---



From dledford at fedoraproject.org  Thu Dec  3 18:58:25 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 18:58:25 +0000 (UTC)
Subject: rpms/libibumad/F-12 libibumad.spec, 1.9, 1.10 sources, 1.4,
	1.5 libibumad-1.3.2-man.patch, 1.1, NONE
Message-ID: <20091203185825.5EA9011C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibumad/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4970

Modified Files:
	libibumad.spec sources 
Removed Files:
	libibumad-1.3.2-man.patch 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-1
- Update to latest upstream version



Index: libibumad.spec
===================================================================
RCS file: /cvs/extras/rpms/libibumad/F-12/libibumad.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libibumad.spec	25 Jul 2009 05:55:13 -0000	1.9
+++ libibumad.spec	3 Dec 2009 18:58:25 -0000	1.10
@@ -1,12 +1,11 @@
 Summary: OpenFabrics Alliance InfiniBand umad (user MAD) library
 Name: libibumad
-Version: 1.3.2
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
-Patch0: libibumad-1.3.2-man.patch
 Url: http://openfabrics.org
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -35,10 +34,6 @@ Static version of the libibumad library.
 
 %prep
 %setup -q
-%patch0 -p1
-libtoolize --copy --force
-touch NEWS README
-autoreconf --install --force
 
 %build
 %configure
@@ -72,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibumad.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-1
+- Update to latest upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibumad/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 16:25:26 -0000	1.4
+++ sources	3 Dec 2009 18:58:25 -0000	1.5
@@ -1 +1 @@
-8d88ad53f0adeb9a5be24754d7c3058c  libibumad-1.3.2.tar.gz
+5a77490e7f604043f5f902e4e4f5d056  libibumad-1.3.3.tar.gz


--- libibumad-1.3.2-man.patch DELETED ---



From mtasaka at fedoraproject.org  Thu Dec  3 19:02:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  3 Dec 2009 19:02:11 +0000 (UTC)
Subject: rpms/gnome-commander/F-10
	gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch,
	NONE, 1.1 gnome-commander.spec, 1.31, 1.32
Message-ID: <20091203190211.A1F6D11C00EE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6587

Modified Files:
	gnome-commander.spec 
Added Files:
	gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch 
Log Message:
* Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-2
- Fix crash when cancelling symlink creation with ESC
  (bug 542366, GNOME bug 603301)


gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch:
 gnome-cmd-dialog.c        |    1 +
 gnome-cmd-string-dialog.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch ---
commit b6cee8a6fa8e026dbbdbea263b7053a958e415af
Author: Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
Date:   Wed Dec 2 23:24:12 2009 +0100

    Fixed problem #603301 (crash when cancelling symlink creation by ESC)

diff --git a/libgcmd/gnome-cmd-dialog.c b/libgcmd/gnome-cmd-dialog.c
index ce89824..97a21a1 100644
--- a/libgcmd/gnome-cmd-dialog.c
+++ b/libgcmd/gnome-cmd-dialog.c
@@ -63,6 +63,7 @@ static void destroy (GtkObject *object)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 
     g_free (dialog->priv);
+    dialog->priv = NULL;
 }
 
 
diff --git a/libgcmd/gnome-cmd-string-dialog.c b/libgcmd/gnome-cmd-string-dialog.c
index 4ab5fab..77d824e 100644
--- a/libgcmd/gnome-cmd-string-dialog.c
+++ b/libgcmd/gnome-cmd-string-dialog.c
@@ -82,8 +82,11 @@ destroy (GtkObject *object)
     if (GTK_OBJECT_CLASS (parent_class)->destroy)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 
-    g_free (dialog->priv->error_desc);
+    if (dialog->priv)
+        g_free (dialog->priv->error_desc);
+ 
     g_free (dialog->priv);
+    dialog->priv = NULL;
 }
 
 


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/gnome-commander.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gnome-commander.spec	29 Oct 2009 16:48:23 -0000	1.31
+++ gnome-commander.spec	3 Dec 2009 19:02:11 -0000	1.32
@@ -1,9 +1,14 @@
 # To use git, follow:
 #
-# git clone  git://git.gnome.org/gnome-commander
-# ln -sf gcmd-1-3 gnome-commander-%%{version}-git_%%{git_pull_JST}
+# git clone git://git.gnome.org/gnome-commander
+# cd gnome-commander/
+# git checkout -b gcmd-1-3 origin/gcmd-1-3
+# git pull
+# ...
+# cd ..
+# ln -sf gcmd-commander gnome-commander-%%{version}-git_%%{git_pull_JST}
 # tar cjf gnome-commander-%%{version}-git_%%{git_pull_JST}.tar.bz2 \
-#    gnome-commander-%%{version}-git_%%{git_pull_JST}
+#    gnome-commander-%%{version}-git_%%{git_pull_JST}/./
 
 # Source10 is created by:
 # svn co http://svn.gnome.org/svn/gnome-commander/branches/gcmd-1-3/tools/mimeedit/
@@ -11,28 +16,36 @@
 #
 # ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html
 
-%define        EXIV2_REQ             0.14
-%define        TAGLIB_REQ            1.4
-%define        LIBGSF_REQ            1.12.0
-%define        POPPLER_REQ           0.6
-
-%define        git_pull_JST          D20090629T1400
-
-%define        use_autotool          0
-%define        if_pre                0
-%define        main_release          1
-%define        extratag              git_%{git_pull_JST}
+%global        EXIV2_REQ             0.14
+%global        TAGLIB_REQ            1.4
+%global        LIBGSF_REQ            1.12.0
+%global        POPPLER_REQ           0.6
+
+%global        git_pull_JST          D20090629T1400
+
+%global        use_autotool          0
+%global        update_po             0
+%global        if_pre                0
+%global        main_release          2
+%global        extratag              git_%{git_pull_JST}
 %undefine      extratag
-%define        mimeedit_rev          1958
+%global        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
-%define        use_autotool          1
+%global        use_autotool          1
+%endif
+%if 0%{?use_autotool} < 1
+%global        update_po             0
 %endif
 
-%define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
+%global        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
 Version:       1.2.8.3
+%if 0%{?fedora} >= 12
+# Downgrade 1 time
+Epoch:         1
+%endif
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad?er plik?w dla GNOME oparty o Norton Commander'a (TM)
@@ -45,6 +58,8 @@ Source0:       ftp://ftp.gnome.org/pub/G
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
 Patch10:       mimeedit-svn1958.diff
+# From upstream
+Patch20:       gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -110,45 +125,18 @@ ansluta till FTP-servrar och SMB-n?tver
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
 
 %if 0%{use_autotool} > 0
-# Workaround to make gnome-autogen support automake 1.11
-# Note that fixed gnome-common-2.26.0-2.fc11 is now in testing
-mkdir TMPBIN ; cd TMPBIN
-sed -e 's|automake-1\.10|automake-1.11 automake-1.10|' \
-	%{_bindir}/gnome-autogen.sh > ./gnome-autogen.sh
-chmod 0755 ./gnome-autogen.sh
-export PATH=$(pwd):$PATH
-cd ..
-
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
 sh autogen.sh
 %endif
 
-cp -p %SOURCE10 mimeedit.sh
+%{__cp} -p %SOURCE10 mimeedit.sh
 %patch10 -p0
+%patch20 -p1 -b .symlink
 
 %{__sed} -i.pylib \
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
-%if 0%{?fedora} >= 10 && 0
-function replace_icon(){
-	find . -name \*.cc | xargs grep -l $1 | \
-		xargs %{__sed} -i.icon -e "s|\"$1\"|\"$2\"|"
-}
-
-
-# Replace icon name due to gnome-icon-theme 2.23.x change
-# (many icons are removed)
-replace_icon	gnome-fs-directory	gtk-directory
-replace_icon	gnome-fs-ftp		folder-remote
-replace_icon	gnome-fs-home		user-home
-replace_icon	gnome-fs-network	gtk-network
-replace_icon	gnome-fs-smb		network-workgroup
-replace_icon	gnome-fs-ssh		folder-remote
-replace_icon	gnome-fs-web		folder-remote
-
-%endif
-
 # gzip
 gzip -9 ChangeLog-*
 
@@ -160,9 +148,13 @@ gzip -9 ChangeLog-*
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
-# Sometimes parallel make fails (perhaps), however once
-# force it.
-%{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
+
+%if %{update_po}
+%{__make} -C po gnome-commander.pot update-po
+%endif
+
+%{__make} %{?_smp_mflags} -k \
+	GMSGFMT="msgfmt --statistics"
 
 %install
 %{__rm} -rf %{buildroot}
@@ -227,6 +219,10 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-2
+- Fix crash when cancelling symlink creation with ESC
+  (bug 542366, GNOME bug 603301)
+
 * Fri Oct 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-1
 - 1.2.8.3
 



From djuran at fedoraproject.org  Thu Dec  3 19:18:38 2009
From: djuran at fedoraproject.org (David Juran)
Date: Thu,  3 Dec 2009 19:18:38 +0000 (UTC)
Subject: rpms/azureus/F-12 azureus.spec,1.81,1.82
Message-ID: <20091203191838.2078011C00EE@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/azureus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11603

Modified Files:
	azureus.spec 
Log Message:
- fix build, even on ppc



Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- azureus.spec	2 Dec 2009 18:10:26 -0000	1.81
+++ azureus.spec	3 Dec 2009 19:18:37 -0000	1.82
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	4.3.0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -149,7 +149,13 @@ chmod 644 *.txt
 mkdir -p build/libs
 build-jar-repository -p build/libs bcprov jakarta-commons-cli log4j \
   gtk2.8 glib0.2 junit
-ln -s %{_libdir}/eclipse/swt.jar build/libs
+
+#ppc seems to have eclipse-swt.ppc64 installed so libdir can't be used
+if [ -e /usr/lib/eclipse/swt.jar ];then
+  ln -s /usr/lib/eclipse/swt.jar build/libs
+else
+  ln -s /usr/lib64/eclipse/swt.jar build/libs
+fi
 
 ant jar
 
@@ -242,6 +248,9 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Thu Dec  3 2009 David Juran <djuran at redhat.com> - 4.3.0.4-2
+- fix build, even on ppc
+
 * Wed Dec  2 2009 David Juran <djuran at redhat.com> - 4.3.0.4-1
 - upgrade to 4.3.0.4 (Bz 540179)
 



From spot at fedoraproject.org  Thu Dec  3 19:18:48 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  3 Dec 2009 19:18:48 +0000 (UTC)
Subject: rpms/mono-sharpcvslib/devel mono-sharpcvslib.spec,1.12,1.13
Message-ID: <20091203191848.DDDA111C00EE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mono-sharpcvslib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11726

Modified Files:
	mono-sharpcvslib.spec 
Log Message:
rebuild for nant


Index: mono-sharpcvslib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-sharpcvslib/devel/mono-sharpcvslib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mono-sharpcvslib.spec	1 Dec 2009 16:56:41 -0000	1.12
+++ mono-sharpcvslib.spec	3 Dec 2009 19:18:48 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:	 	mono-sharpcvslib
 Version:	0.35
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Client cvs library written in C#
 URL:		http://sharpcvslib.sourceforge.net/
 # Exception: Permission is given to use this library in commercial closed-source applications
@@ -95,6 +95,9 @@ mv src/doc/api/msdn/tree.js{.utf8,}
 %{_libdir}/pkgconfig/sharpcvslib.pc
 
 %changelog
+* Thu Dec  3 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.35-14
+- bump it once more for nant
+
 * Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.35-13
 - use the system mono.snk key instead of regenerating on every build
 



From laxathom at fedoraproject.org  Thu Dec  3 19:20:13 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Thu,  3 Dec 2009 19:20:13 +0000 (UTC)
Subject: rpms/gammu/devel gammu.spec,1.32,1.33 sources,1.18,1.19
Message-ID: <20091203192013.93A3E11C03DB@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12345/devel

Modified Files:
	gammu.spec sources 
Log Message:
Update release


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gammu.spec	21 Aug 2009 13:45:18 -0000	1.32
+++ gammu.spec	3 Dec 2009 19:20:13 -0000	1.33
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.25.92
+Version:        1.26.1
 Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
@@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 03 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.26.1-1
+- Update release.
+
 * Fri Aug 21 2009 Xavier Lamien <laxathom at fedorarproject.org> - 1.25.92-1
 - Update release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	21 Aug 2009 13:44:41 -0000	1.18
+++ sources	3 Dec 2009 19:20:13 -0000	1.19
@@ -1 +1 @@
-0846e79a9d5832c574241808b1027c4b  gammu-1.25.92.tar.bz2
+ba8caab6b21a2ce0fa668f9403b8319a  gammu-1.26.1.tar.bz2



From laxathom at fedoraproject.org  Thu Dec  3 19:20:13 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Thu,  3 Dec 2009 19:20:13 +0000 (UTC)
Subject: rpms/gammu/F-12 .cvsignore, 1.18, 1.19 gammu.spec, 1.32,
	1.33 sources, 1.18, 1.19
Message-ID: <20091203192013.6154B11C03DB@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12345/F-12

Modified Files:
	.cvsignore gammu.spec sources 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	21 Aug 2009 13:44:41 -0000	1.18
+++ .cvsignore	3 Dec 2009 19:20:13 -0000	1.19
@@ -1 +1 @@
-gammu-1.25.92.tar.bz2
+gammu-1.26.1.tar.bz2


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/F-12/gammu.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gammu.spec	21 Aug 2009 13:45:18 -0000	1.32
+++ gammu.spec	3 Dec 2009 19:20:13 -0000	1.33
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.25.92
+Version:        1.26.1
 Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
@@ -154,7 +154,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Xavier Lamien <laxathom at fedorarproject.org> - 1.25.92-1
+* Thu Dec 03 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.26.1 
+- Update release.
+
+* Fri Aug 21 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.25.92-1
 - Update release.
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.25.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	21 Aug 2009 13:44:41 -0000	1.18
+++ sources	3 Dec 2009 19:20:13 -0000	1.19
@@ -1 +1 @@
-0846e79a9d5832c574241808b1027c4b  gammu-1.25.92.tar.bz2
+ba8caab6b21a2ce0fa668f9403b8319a  gammu-1.26.1.tar.bz2



From dwalsh at fedoraproject.org  Thu Dec  3 19:23:27 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  3 Dec 2009 19:23:27 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.147,
	1.148 selinux-policy.spec, 1.975, 1.976
Message-ID: <20091203192327.DA76711C00EE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13582

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-54
- Require selinux-policy from selinux-policy-TYPE
- Add labeling to /usr/lib/win32 textrel_shlib_t
- dontaudit all leaks for abrt_helper
- Fix labeling for mythtv
- Dontaudit setroubleshoot_fix leaks
- Allow xauth_t to read usr_t
- Allow iptables to use fifo files
- Fix labeling on /var/lib/wifiroamd


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   13 
 policy/modules/admin/logrotate.te         |   21 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |   80 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   23 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    3 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    7 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   43 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   42 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |   13 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  417 +++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   44 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  126 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  436 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  108 +
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   51 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  452 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   21 
 policy/modules/services/asterisk.te       |   20 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   28 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   23 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   13 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  117 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.te           |   14 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |    7 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    4 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   22 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   17 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   82 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tor.te            |    1 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  633 ++++++++++-
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  209 +++
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   66 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  183 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   18 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   83 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1684 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   28 
 policy/users                              |   13 
 393 files changed, 19792 insertions(+), 2816 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.147 -r 1.148 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- policy-F12.patch	3 Dec 2009 16:18:20 -0000	1.147
+++ policy-F12.patch	3 Dec 2009 19:23:27 -0000	1.148
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.32/Makefile
 --- nsaserefpolicy/Makefile	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/Makefile	2009-12-03 08:39:31.781186000 -0500
++++ serefpolicy-3.6.32/Makefile	2009-12-03 13:45:10.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -12,7 +12,7 @@ diff -b -B --ignore-all-space --exclude-
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-12-03 08:39:31.783187000 -0500
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-12-03 13:45:10.000000000 -0500
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
@@ -23,7 +23,7 @@ diff -b -B --ignore-all-space --exclude-
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.32/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/global_tunables	2009-12-03 08:39:31.786186000 -0500
++++ serefpolicy-3.6.32/policy/global_tunables	2009-12-03 13:45:10.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -61,7 +61,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.32/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/mcs	2009-12-03 08:39:31.788187000 -0500
++++ serefpolicy-3.6.32/policy/mcs	2009-12-03 13:45:10.000000000 -0500
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -97,7 +97,7 @@ diff -b -B --ignore-all-space --exclude-
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.6.32/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/alsa.te	2009-12-03 08:39:31.790189000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/alsa.te	2009-12-03 13:45:10.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -109,7 +109,7 @@ diff -b -B --ignore-all-space --exclude-
  init_use_fds(alsa_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.32/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-12-03 08:39:31.793186000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-12-03 13:45:10.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -129,7 +129,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.6.32/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-12-03 08:39:31.795189000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-12-03 13:45:10.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -141,7 +141,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.32/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-12-03 08:39:31.798186000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-12-03 13:45:10.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -153,7 +153,16 @@ diff -b -B --ignore-all-space --exclude-
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.6.32/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-12-03 08:39:31.800189000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-12-03 14:08:52.000000000 -0500
+@@ -10,7 +10,7 @@
+ type consoletype_exec_t;
+ application_executable_file(consoletype_exec_t)
+ init_domain(consoletype_t, consoletype_exec_t)
+-init_system_domain(consoletype_t, consoletype_exec_t)
++application_domain(consoletype_t, consoletype_exec_t)
+ role system_r types consoletype_t;
+ 
+ ########################################
 @@ -84,6 +84,7 @@
  optional_policy(`
  	hal_dontaudit_use_fds(consoletype_t)
@@ -164,7 +173,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.32/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-12-03 08:39:31.803185000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-12-03 13:45:10.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
@@ -172,7 +181,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.32/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-12-03 08:39:31.805187000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-12-03 13:45:10.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -216,7 +225,7 @@ diff -b -B --ignore-all-space --exclude-
 +dev_read_raw_memory(dmesg_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.32/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-12-03 08:39:31.807189000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-12-03 13:45:10.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -241,7 +250,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.fc serefpolicy-3.6.32/policy/modules/admin/kismet.fc
 --- nsaserefpolicy/policy/modules/admin/kismet.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/kismet.fc	2009-12-03 08:39:31.810188000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/kismet.fc	2009-12-03 13:45:10.000000000 -0500
 @@ -1,3 +1,5 @@
 +HOME_DIR/\.kismet(/.*)?			gen_context(system_u:object_r:kismet_home_t,s0)
 +
@@ -250,7 +259,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/kismet(/.*)?			gen_context(system_u:object_r:kismet_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.32/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-03 08:39:31.813186000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-03 13:45:10.000000000 -0500
 @@ -26,6 +26,9 @@
  type kismet_var_run_t;
  files_pid_file(kismet_var_run_t)
@@ -289,7 +298,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-03 08:39:31.815189000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-03 13:45:10.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -349,7 +358,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-12-03 08:39:31.818186000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-12-03 13:45:10.000000000 -0500
 @@ -93,6 +93,13 @@
  sysnet_exec_ifconfig(logwatch_t)
  
@@ -372,7 +381,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.32/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-12-03 08:39:31.820189000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-12-03 13:45:10.000000000 -0500
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -383,7 +392,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-12-03 08:39:31.823186000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-12-03 13:45:10.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -402,7 +411,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.6.32/policy/modules/admin/ntop.fc
 --- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.fc	2009-12-03 08:39:31.826191000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/ntop.fc	2009-12-03 13:45:10.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
 +
@@ -411,7 +420,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.6.32/policy/modules/admin/ntop.if
 --- nsaserefpolicy/policy/modules/admin/ntop.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.if	2009-12-03 08:39:31.837186000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/ntop.if	2009-12-03 13:45:10.000000000 -0500
 @@ -0,0 +1,158 @@
 +
 +## <summary>policy for ntop</summary>
@@ -573,7 +582,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.te serefpolicy-3.6.32/policy/modules/admin/ntop.te
 --- nsaserefpolicy/policy/modules/admin/ntop.te	1969-12-31 19:00:00.000000000 -0500
[...3190 lines suppressed...]
@@ -30602,7 +30610,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_dontaudit_list_tmpfs(mdadm_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc	2009-12-03 08:39:32.987107000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc	2009-12-03 13:45:11.000000000 -0500
 @@ -6,13 +6,13 @@
  /etc/selinux(/.*)?			gen_context(system_u:object_r:selinux_config_t,s0)
  /etc/selinux/([^/]*/)?contexts(/.*)?	gen_context(system_u:object_r:default_context_t,s0)
@@ -30644,7 +30652,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.6.32/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-12-03 08:39:32.990105000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-12-03 13:45:11.000000000 -0500
 @@ -351,6 +351,27 @@
  
  ########################################
@@ -31002,7 +31010,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.32/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-12-03 10:09:54.075118000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-12-03 13:52:29.000000000 -0500
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -31369,8 +31377,8 @@ diff -b -B --ignore-all-space --exclude-
 -	optional_policy(`
 -		unconfined_dontaudit_read_pipes(setfiles_t)
 -		unconfined_dontaudit_rw_tcp_sockets(setfiles_t)
-+		setroubleshoot_dontaudit_leaks(setfiles_t)
-+		setroubleshoot_dontaudit_leaks(setsebool_t)
++		setroubleshoot_fixit_dontaudit_leaks(setfiles_t)
++		setroubleshoot_fixit_dontaudit_leaks(setsebool_t)
  	')
  ')
  
@@ -31380,7 +31388,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.6.32/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/setrans.if	2009-12-03 08:39:32.994123000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/setrans.if	2009-12-03 13:45:11.000000000 -0500
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1, setrans_var_run_t, setrans_var_run_t, setrans_t)
  	files_list_pids($1)
@@ -31407,7 +31415,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-12-03 09:41:51.143602000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-12-03 13:45:11.000000000 -0500
 @@ -11,15 +11,20 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -31445,7 +31453,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.32/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-03 08:39:32.999117000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-03 13:45:11.000000000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -31622,7 +31630,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.32/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-12-03 08:39:33.002112000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-12-03 13:45:11.000000000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -31846,7 +31854,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.32/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-12-03 08:39:33.004110000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-12-03 13:45:11.000000000 -0500
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -31859,7 +31867,7 @@ diff -b -B --ignore-all-space --exclude-
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.32/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-12-03 08:39:33.007105000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-12-03 13:45:11.000000000 -0500
 @@ -168,4 +168,43 @@
  
  	dev_list_all_dev_nodes($1)
@@ -31906,7 +31914,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.32/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-12-03 08:39:33.009108000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-12-03 13:45:11.000000000 -0500
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -32022,7 +32030,7 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.32/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-12-03 08:39:33.012106000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-12-03 13:45:11.000000000 -0500
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -32042,7 +32050,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.32/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-12-03 08:39:33.015106000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-12-03 13:45:11.000000000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -32548,7 +32556,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.32/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-12-03 08:39:33.017108000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-12-03 13:45:11.000000000 -0500
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -32780,7 +32788,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.32/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-12-03 08:39:33.031107000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-12-03 13:45:11.000000000 -0500
 @@ -1,4 +1,9 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -32794,7 +32802,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-03 08:39:33.036108000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-03 13:45:11.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -35152,7 +35160,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.32/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-12-03 08:39:33.039106000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-12-03 13:45:11.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35243,7 +35251,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.32/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-12-03 08:39:33.041108000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-12-03 13:45:11.000000000 -0500
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -35273,7 +35281,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.32/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-12-03 08:39:33.043110000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-12-03 13:45:11.000000000 -0500
 @@ -71,6 +71,8 @@
  	')
  
@@ -35326,7 +35334,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-03 08:39:33.046106000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-03 13:45:11.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -35626,7 +35634,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-03 08:39:33.049105000 -0500
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-03 13:45:11.000000000 -0500
 @@ -181,7 +181,7 @@
  #
  define(`getattr_dir_perms',`{ getattr }')
@@ -35685,7 +35693,7 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
 --- nsaserefpolicy/policy/users	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/users	2009-12-03 08:39:33.051108000 -0500
++++ serefpolicy-3.6.32/policy/users	2009-12-03 13:45:11.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.975
retrieving revision 1.976
diff -u -p -r1.975 -r1.976
--- selinux-policy.spec	3 Dec 2009 16:18:21 -0000	1.975
+++ selinux-policy.spec	3 Dec 2009 19:23:27 -0000	1.976
@@ -450,6 +450,7 @@ exit 0
 
 %changelog
 * Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-54
+- Require selinux-policy from selinux-policy-TYPE
 - Add labeling to /usr/lib/win32 textrel_shlib_t
 - dontaudit all leaks for abrt_helper
 - Fix labeling for mythtv



From pkgdb at fedoraproject.org  Thu Dec  3 19:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 19:35:17 +0000
Subject: [pkgdb] gnome-commander: epiotr has given up watchcommits
Message-ID: <20091203193517.B1FD310F894@bastion2.fedora.phx.redhat.com>

epiotr has given up the watchcommits acl on gnome-commander (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-commander



From pkgdb at fedoraproject.org  Thu Dec  3 19:35:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 19:35:22 +0000
Subject: [pkgdb] gnome-commander: epiotr has given up watchcommits
Message-ID: <20091203193522.D7F2710F899@bastion2.fedora.phx.redhat.com>

epiotr has given up the watchcommits acl on gnome-commander (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-commander



From pkgdb at fedoraproject.org  Thu Dec  3 19:35:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 19:35:24 +0000
Subject: [pkgdb] gnome-commander: epiotr has given up watchcommits
Message-ID: <20091203193524.896CA10F89E@bastion2.fedora.phx.redhat.com>

epiotr has given up the watchcommits acl on gnome-commander (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-commander



From akurtakov at fedoraproject.org  Thu Dec  3 19:42:02 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Dec 2009 19:42:02 +0000 (UTC)
Subject: File eclipse-R3_5_1-fetched-src.tar.bz2 uploaded to lookaside cache
	by akurtakov
Message-ID: <20091203194202.D2FBD10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse:

55b14de28d6768f3e429388e37d97a9c  eclipse-R3_5_1-fetched-src.tar.bz2



From dwalsh at fedoraproject.org  Thu Dec  3 19:44:21 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  3 Dec 2009 19:44:21 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.148,
	1.149 selinux-policy.spec, 1.976, 1.977
Message-ID: <20091203194421.10D2911C00EE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20111

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-55
- Add fprintd_chat(unconfined_t) to fix su timeout problem


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   13 
 policy/modules/admin/logrotate.te         |   21 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |   80 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   23 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    3 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    7 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   43 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   42 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |   13 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  417 +++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   44 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  126 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  440 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  108 +
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   51 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  452 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   21 
 policy/modules/services/asterisk.te       |   20 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   49 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   28 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   23 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   13 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  117 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.te           |   14 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |    7 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    4 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   22 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   17 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   82 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tor.te            |    1 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  633 ++++++++++-
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  209 +++
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   66 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  183 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   18 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   83 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1684 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   28 
 policy/users                              |   13 
 393 files changed, 19796 insertions(+), 2816 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- policy-F12.patch	3 Dec 2009 19:23:27 -0000	1.148
+++ policy-F12.patch	3 Dec 2009 19:44:20 -0000	1.149
@@ -153,7 +153,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.6.32/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-12-03 14:08:52.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-12-03 14:09:04.000000000 -0500
 @@ -10,7 +10,7 @@
  type consoletype_exec_t;
  application_executable_file(consoletype_exec_t)
@@ -9883,8 +9883,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-03 13:45:11.000000000 -0500
-@@ -0,0 +1,436 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-03 14:43:49.000000000 -0500
+@@ -0,0 +1,440 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -10103,6 +10103,10 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	optional_policy(`
++		fprintd_dbus_chat(unconfined_t)
++	')
++
++	optional_policy(`
 +		gnomeclock_dbus_chat(unconfined_t)
 +	')
 +
@@ -32802,7 +32806,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-03 14:41:25.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.976
retrieving revision 1.977
diff -u -p -r1.976 -r1.977
--- selinux-policy.spec	3 Dec 2009 19:23:27 -0000	1.976
+++ selinux-policy.spec	3 Dec 2009 19:44:20 -0000	1.977
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 54%{?dist}
+Release: 55%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-55
+- Add fprintd_chat(unconfined_t) to fix su timeout problem
+
 * Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-54
 - Require selinux-policy from selinux-policy-TYPE
 - Add labeling to /usr/lib/win32 textrel_shlib_t



From dledford at fedoraproject.org  Thu Dec  3 19:45:50 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 19:45:50 +0000 (UTC)
Subject: File libibmad-1.3.3.tar.gz uploaded to lookaside cache by dledford
Message-ID: <20091203194550.C595E10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libibmad:

5f2615fc152cc6dacdca694c16594351  libibmad-1.3.3.tar.gz



From akurtakov at fedoraproject.org  Thu Dec  3 19:47:42 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Dec 2009 19:47:42 +0000 (UTC)
Subject: File eclipse-build-R0_4_0.tar.gz uploaded to lookaside cache by
	akurtakov
Message-ID: <20091203194742.DFC6510F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse:

8a563a261486607067e00c8eab8f1966  eclipse-build-R0_4_0.tar.gz



From dledford at fedoraproject.org  Thu Dec  3 19:49:38 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 19:49:38 +0000 (UTC)
Subject: rpms/libibmad/devel .cvsignore, 1.4, 1.5 libibmad.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20091203194938.686FF11C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibmad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22091

Modified Files:
	.cvsignore libibmad.spec sources 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-1
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibmad/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 17:46:46 -0000	1.4
+++ .cvsignore	3 Dec 2009 19:49:38 -0000	1.5
@@ -1,3 +1,4 @@
 libibmad-1.2.0.tar.gz
 libibmad-1.3.1.tar.gz
 libibmad-1.3.2.tar.gz
+libibmad-1.3.3.tar.gz


Index: libibmad.spec
===================================================================
RCS file: /cvs/extras/rpms/libibmad/devel/libibmad.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libibmad.spec	25 Jul 2009 05:54:58 -0000	1.6
+++ libibmad.spec	3 Dec 2009 19:49:38 -0000	1.7
@@ -1,13 +1,13 @@
 Summary: OpenFabrics Alliance InfiniBand MAD library
 Name: libibmad
-Version: 1.3.2
-Release: 2%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
 Url: http://openfabrics.org/
-BuildRequires: libibumad-devel = %{version}, libtool, automake, autoconf, glibc-static
+BuildRequires: libibumad-devel = %{version}, libtool, glibc-static
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -34,9 +34,6 @@ Static version of the libibmad library
 
 %prep
 %setup -q
-libtoolize --copy --force
-touch NEWS README
-autoreconf --install --force
 
 %build
 %configure
@@ -69,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibmad.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-1
+- Update to latest upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibmad/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 17:46:46 -0000	1.4
+++ sources	3 Dec 2009 19:49:38 -0000	1.5
@@ -1 +1 @@
-b3af39af187b0d7da13f15fd2fc7987d  libibmad-1.3.2.tar.gz
+5f2615fc152cc6dacdca694c16594351  libibmad-1.3.3.tar.gz



From dledford at fedoraproject.org  Thu Dec  3 19:49:54 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 19:49:54 +0000 (UTC)
Subject: rpms/libibmad/F-12 libibmad.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20091203194954.1D1EE11C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibmad/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22291

Modified Files:
	libibmad.spec sources 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-1
- Update to latest upstream release



Index: libibmad.spec
===================================================================
RCS file: /cvs/extras/rpms/libibmad/F-12/libibmad.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libibmad.spec	25 Jul 2009 05:54:58 -0000	1.6
+++ libibmad.spec	3 Dec 2009 19:49:53 -0000	1.7
@@ -1,13 +1,13 @@
 Summary: OpenFabrics Alliance InfiniBand MAD library
 Name: libibmad
-Version: 1.3.2
-Release: 2%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
 Url: http://openfabrics.org/
-BuildRequires: libibumad-devel = %{version}, libtool, automake, autoconf, glibc-static
+BuildRequires: libibumad-devel = %{version}, libtool, glibc-static
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -34,9 +34,6 @@ Static version of the libibmad library
 
 %prep
 %setup -q
-libtoolize --copy --force
-touch NEWS README
-autoreconf --install --force
 
 %build
 %configure
@@ -69,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibmad.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 1.3.3-1
+- Update to latest upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibmad/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 17:46:46 -0000	1.4
+++ sources	3 Dec 2009 19:49:53 -0000	1.5
@@ -1 +1 @@
-b3af39af187b0d7da13f15fd2fc7987d  libibmad-1.3.2.tar.gz
+5f2615fc152cc6dacdca694c16594351  libibmad-1.3.3.tar.gz



From dledford at fedoraproject.org  Thu Dec  3 19:52:47 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 19:52:47 +0000 (UTC)
Subject: File opensm-3.3.3.tar.gz uploaded to lookaside cache by dledford
Message-ID: <20091203195247.E7A4010F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for opensm:

0a50e041932b4abf240c8d4a519e59a4  opensm-3.3.3.tar.gz



From akurtakov at fedoraproject.org  Thu Dec  3 19:53:34 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  3 Dec 2009 19:53:34 +0000 (UTC)
Subject: rpms/eclipse/devel sources, 1.90, 1.91 eclipse.spec, 1.694,
	1.695 .cvsignore, 1.66, 1.67
Message-ID: <20091203195334.D00B811C00EE@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23738/devel

Modified Files:
	sources eclipse.spec .cvsignore 
Log Message:
* Thu Dec 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-23
- Remove old manipulations to bundles.info.
- Update to eclipse-build 0.4 release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	17 Nov 2009 12:37:53 -0000	1.90
+++ sources	3 Dec 2009 19:53:34 -0000	1.91
@@ -1,2 +1,2 @@
-3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-99ffc4a33f1e0740f840d4851d28e7b3  eclipse-build-0_4_RC4.tar.gz
+55b14de28d6768f3e429388e37d97a9c  eclipse-R3_5_1-fetched-src.tar.bz2
+8a563a261486607067e00c8eab8f1966  eclipse-build-R0_4_0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -p -r1.694 -r1.695
--- eclipse.spec	30 Nov 2009 14:44:09 -0000	1.694
+++ eclipse.spec	3 Dec 2009 19:53:34 -0000	1.695
@@ -27,11 +27,11 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        22%{?dist}
+Release:        23%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-0_4_RC4.tar.gz
+Source0:        %{download_url}eclipse-build-R0_4_0.tar.gz
 Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
 Source2:        eclipse.sh.in
 Source17:       efj.sh.in
@@ -187,7 +187,7 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-0_4_RC4
+%setup -q -n eclipse-build-0_4_RC6
 cp %{SOURCE1} .
 ant -DbuildArch=%{eclipse_arch} applyPatches
 pushd build/eclipse-R3_5_1-fetched-src
@@ -556,14 +556,6 @@ popd
 rm -r $sdkDir/configuration/org.eclipse.update
 
 %if %{initialize}
-#Find better way to fix this
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090525,plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090525,plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090601,plugins/org.eclipse.equinox.ds_1.1.0.v20090601.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090601,plugins/org.eclipse.equinox.ds_1.1.0.v20090601.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-# dump bundles.info and config.ini to check what's wrong with ppc64 build
-cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1104,6 +1096,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Dec 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-23
+- Remove old manipulations to bundles.info.
+- Update to eclipse-build 0.4 release.
+
 * Mon Nov 30 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-22
 - Move ant-nodeps out of bootstrap.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	11 Nov 2009 13:14:21 -0000	1.66
+++ .cvsignore	3 Dec 2009 19:53:34 -0000	1.67
@@ -8,3 +8,4 @@ eclipse-R3_5_1-fetched-src.tar.bz2
 eclipse-build-0.4.0RC0.tar.gz
 eclipse-build-0_4_RC3.tar.gz
 eclipse-build-0_4_RC4.tar.gz
+eclipse-build-R0_4_0.tar.gz



From dwalsh at fedoraproject.org  Thu Dec  3 19:56:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  3 Dec 2009 19:56:23 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.149,
	1.150 selinux-policy.spec, 1.977, 1.978
Message-ID: <20091203195623.2311011C00EE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24762

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-55
- Add fprintd_chat(unconfined_t) to fix su timeout problem
- Make xguest follow allow_execstack boolean
- Dontaudit dbus looking at nfs


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   13 
 policy/modules/admin/logrotate.te         |   21 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |   80 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   23 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    3 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    7 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   43 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   42 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |   13 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  417 +++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   44 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  126 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  440 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  108 +
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   51 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  452 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   21 
 policy/modules/services/asterisk.te       |   20 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   50 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   28 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   23 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   13 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  117 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.te           |   14 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |    7 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    4 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   22 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   17 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   82 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tor.te            |    1 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  633 ++++++++++-
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  209 +++
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   66 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  183 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   18 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   83 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1684 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   28 
 policy/users                              |   13 
 393 files changed, 19797 insertions(+), 2816 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- policy-F12.patch	3 Dec 2009 19:44:20 -0000	1.149
+++ policy-F12.patch	3 Dec 2009 19:56:22 -0000	1.150
@@ -14803,7 +14803,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.32/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dbus.if	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/dbus.if	2009-12-03 14:49:31.000000000 -0500
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -14837,7 +14837,15 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1_dbusd_t $3:process sigkill;
  	allow $3 $1_dbusd_t:fd use;
  	allow $3 $1_dbusd_t:fifo_file rw_fifo_file_perms;
-@@ -146,6 +148,9 @@
+@@ -127,6 +129,7 @@
+ 	fs_getattr_romfs($1_dbusd_t)
+ 	fs_getattr_xattr_fs($1_dbusd_t)
+ 	fs_list_inotifyfs($1_dbusd_t)
++	fs_dontaudit_list_nfs($1_dbusd_t)
+ 
+ 	selinux_get_fs_mount($1_dbusd_t)
+ 	selinux_validate_context($1_dbusd_t)
+@@ -146,6 +149,9 @@
  	seutil_read_config($1_dbusd_t)
  	seutil_read_default_contexts($1_dbusd_t)
  
@@ -14847,7 +14855,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_read_user_home_content_files($1_dbusd_t)
  
  	ifdef(`hide_broken_symptoms', `
-@@ -153,12 +158,15 @@
+@@ -153,12 +159,15 @@
  	')
  
  	optional_policy(`
@@ -14865,7 +14873,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -178,10 +186,12 @@
+@@ -178,10 +187,12 @@
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t, system_dbusd_var_lib_t;
  		class dbus send_msg;
@@ -14878,7 +14886,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	read_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
  	files_search_var_lib($1)
-@@ -190,6 +200,10 @@
+@@ -190,6 +201,10 @@
  	files_search_pids($1)
  	stream_connect_pattern($1, system_dbusd_var_run_t, system_dbusd_var_run_t, system_dbusd_t)
  	dbus_read_config($1)
@@ -14889,7 +14897,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -256,7 +270,7 @@
+@@ -256,7 +271,7 @@
  
  ########################################
  ## <summary>
@@ -14898,7 +14906,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	for service (acquire_svc).
  ## </summary>
  ## <param name="domain">
-@@ -364,6 +378,8 @@
+@@ -364,6 +379,8 @@
  	dbus_system_bus_client($1)
  	dbus_connect_system_bus($1)
  
@@ -14907,7 +14915,7 @@ diff -b -B --ignore-all-space --exclude-
  	ifdef(`hide_broken_symptoms', `
  		dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
  	')
-@@ -405,3 +421,24 @@
+@@ -405,3 +422,24 @@
  
  	typeattribute $1 dbusd_unconfined;
  ')
@@ -14934,7 +14942,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.6.32/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dbus.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/dbus.te	2009-12-03 14:48:57.000000000 -0500
 @@ -86,6 +86,7 @@
  dev_read_sysfs(system_dbusd_t)
  
@@ -18187,7 +18195,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.te serefpolicy-3.6.32/policy/modules/services/nut.te
 --- nsaserefpolicy/policy/modules/services/nut.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/nut.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/nut.te	2009-12-03 14:47:15.000000000 -0500
 @@ -0,0 +1,188 @@
 +
 +policy_module(nut, 1.0.0)
@@ -18229,7 +18237,7 @@ diff -b -B --ignore-all-space --exclude-
 +# Local policy for upsd
 +#
 +
-+allow nut_upsd_t self:capability { setgid setuid };
++allow nut_upsd_t self:capability { setgid setuid dac_override };
 +
 +allow nut_upsd_t self:unix_dgram_socket { create_socket_perms sendto };
 +allow nut_upsd_t self:tcp_socket connected_stream_socket_perms;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.977
retrieving revision 1.978
diff -u -p -r1.977 -r1.978
--- selinux-policy.spec	3 Dec 2009 19:44:20 -0000	1.977
+++ selinux-policy.spec	3 Dec 2009 19:56:22 -0000	1.978
@@ -451,6 +451,8 @@ exit 0
 %changelog
 * Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-55
 - Add fprintd_chat(unconfined_t) to fix su timeout problem
+- Make xguest follow allow_execstack boolean
+- Dontaudit dbus looking at nfs
 
 * Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-54
 - Require selinux-policy from selinux-policy-TYPE



From notting at fedoraproject.org  Thu Dec  3 20:00:00 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  3 Dec 2009 20:00:00 +0000 (UTC)
Subject: rpms/upstart/devel upstart-telinit.patch, NONE, 1.1 upstart.spec,
	1.39, 1.40 events.5, 1.4, NONE upstart-fedora-buglist.patch, 1.3,
	NONE upstart-force-on-shutdown-reboot.patch, 1.1,
	NONE upstart-gcc43.patch, 1.1, NONE upstart-initctl-man.patch,
	1.2, NONE upstart-rpm.patch, 1.3, NONE upstart-telinit-u.patch,
	1.2, NONE upstart-tty-stack.patch, 1.4, NONE
Message-ID: <20091203200000.4B06411C00EE@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/upstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25792

Modified Files:
	upstart.spec 
Added Files:
	upstart-telinit.patch 
Removed Files:
	events.5 upstart-fedora-buglist.patch 
	upstart-force-on-shutdown-reboot.patch upstart-gcc43.patch 
	upstart-initctl-man.patch upstart-rpm.patch 
	upstart-telinit-u.patch upstart-tty-stack.patch 
Log Message:
Make 'telinit u' a no-op until state saving is implemented.

Remove some old dead patches.


upstart-telinit.patch:
 telinit.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE upstart-telinit.patch ---
diff -up upstart-0.6.3/util/telinit.c.foo upstart-0.6.3/util/telinit.c
--- upstart-0.6.3/util/telinit.c.foo	2009-12-03 14:52:58.000000000 -0500
+++ upstart-0.6.3/util/telinit.c	2009-12-03 14:53:06.000000000 -0500
@@ -174,9 +174,6 @@ main (int   argc,
 		break;
 	case 'U':
 	case 'u':
-		ret = kill (1, SIGTERM);
-		if (ret < 0)
-			nih_error_raise_system ();
 		break;
 	default:
 		nih_assert_not_reached ();


Index: upstart.spec
===================================================================
RCS file: /cvs/extras/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- upstart.spec	27 Nov 2009 14:26:05 -0000	1.39
+++ upstart.spec	3 Dec 2009 20:00:00 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -9,6 +9,7 @@ URL:            http://upstart.ubuntu.co
 Source0:        http://upstart.ubuntu.com/download/0.6/upstart-%{version}.tar.bz2
 # remove tests which fail in koji
 Patch0:         upstart-remove-tests.patch
+Patch1:		upstart-telinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -23,6 +24,7 @@ during shutdown and supervising them whi
 %prep
 %setup -q
 %patch0 -p1 -b .tests
+%patch1 -p1 -b .u
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib}
@@ -101,6 +103,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Thu Dec  3 2009 Bill Nottingham <notting at redhat.com> 0.6.3-3
+- make 'telinit u' a no-op, temporarily
+
 * Fri Nov 27 2009 Petr Lautrbach <plautrba at redhat.com> 0.6.3-2
 - Removed tests which fail in koji
 


--- events.5 DELETED ---


--- upstart-fedora-buglist.patch DELETED ---


--- upstart-force-on-shutdown-reboot.patch DELETED ---


--- upstart-gcc43.patch DELETED ---


--- upstart-initctl-man.patch DELETED ---


--- upstart-rpm.patch DELETED ---


--- upstart-telinit-u.patch DELETED ---


--- upstart-tty-stack.patch DELETED ---



From rdieter at fedoraproject.org  Thu Dec  3 20:02:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 20:02:32 +0000 (UTC)
Subject: File phonon-20091203svn.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091203200232.6456110F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for phonon:

a2769fce6a7600345325d413d91d8b76  phonon-20091203svn.tar.bz2



From dledford at fedoraproject.org  Thu Dec  3 20:02:53 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 20:02:53 +0000 (UTC)
Subject: rpms/opensm/devel .cvsignore, 1.4, 1.5 opensm.initd, 1.3,
	1.4 opensm.spec, 1.7, 1.8 sources, 1.4,
	1.5 opensm-3.2.1-elif.patch, 1.2, NONE
Message-ID: <20091203200253.4A3A411C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/opensm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27215

Modified Files:
	.cvsignore opensm.initd opensm.spec sources 
Removed Files:
	opensm-3.2.1-elif.patch 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 3.3.3-1
- Update to latest upstream release
- Minor tweaks to init script for LSB compliance



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 20:06:57 -0000	1.4
+++ .cvsignore	3 Dec 2009 20:02:52 -0000	1.5
@@ -1,3 +1,4 @@
 opensm-3.2.1.tar.gz
 opensm-3.3.1.tar.gz
 opensm-3.3.2.tar.gz
+opensm-3.3.3.tar.gz


Index: opensm.initd
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- opensm.initd	22 Apr 2009 14:24:05 -0000	1.3
+++ opensm.initd	3 Dec 2009 20:02:53 -0000	1.4
@@ -117,6 +117,11 @@ usage ()
 }
 
 case $ACTION in
+	start|stop|restart|reload|condrestart|try-restart|force-reload)
+	    [ `id -u` != "0" ] && exit 4 ;;
+esac
+
+case $ACTION in
 	start) start; RC=$? ;;
 	stop) stop; RC=$? ;;
 	restart) restart; RC=$? ;;


Index: opensm.spec
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/opensm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- opensm.spec	25 Jul 2009 20:53:03 -0000	1.7
+++ opensm.spec	3 Dec 2009 20:02:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name: opensm
-Version: 3.3.2
-Release: 2%{?dist}
+Version: 3.3.3
+Release: 1%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 Group: System Environment/Daemons
 License: GPLv2 or BSD
@@ -9,9 +9,8 @@ Source0: http://www.openfabrics.org/down
 Source1: opensm.conf
 Source2: opensm.logrotate
 Source3: opensm.initd
-Patch1:  opensm-3.2.1-elif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libibmad-devel = 1.3.2, libtool, bison, flex, byacc
+BuildRequires: libibmad-devel = 1.3.3, libtool, bison, flex, byacc
 Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma
 
 %description
@@ -46,7 +45,6 @@ Static version of opensm libraries
 
 %prep
 %setup -q
-%patch1 -p1 -b .elif
 
 %build
 %configure --with-opensm-conf-sub-dir=rdma
@@ -60,7 +58,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm
-install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm
+install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initddir}/opensm
 mkdir -p ${RPM_BUILD_ROOT}/var/cache/opensm
 
 %clean
@@ -88,7 +86,7 @@ fi
 %defattr(-,root,root,-)
 %dir /var/cache/opensm
 %{_sbindir}/*
-%{_initrddir}/opensm
+%{_initddir}/opensm
 %{_mandir}/man8/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/opensm
 %config(noreplace) %{_sysconfdir}/rdma/opensm.conf
@@ -108,6 +106,10 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 3.3.3-1
+- Update to latest upstream release
+- Minor tweaks to init script for LSB compliance
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 20:06:57 -0000	1.4
+++ sources	3 Dec 2009 20:02:53 -0000	1.5
@@ -1 +1 @@
-8925a54defa3e87573a6d127b8790f7f  opensm-3.3.2.tar.gz
+0a50e041932b4abf240c8d4a519e59a4  opensm-3.3.3.tar.gz


--- opensm-3.2.1-elif.patch DELETED ---



From rdieter at fedoraproject.org  Thu Dec  3 20:03:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 20:03:00 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.54,1.55 sources,1.18,1.19
Message-ID: <20091203200300.8B13711C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27301

Modified Files:
	phonon.spec sources 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-1.20091203
- phonon-4.3.80 (20091203 snapshot)



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- phonon.spec	3 Dec 2009 16:39:31 -0000	1.54
+++ phonon.spec	3 Dec 2009 20:03:00 -0000	1.55
@@ -3,8 +3,8 @@
 
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.3.50
-Release: 6.%{snap}%{?dist}
+Version: 4.3.80
+Release: 1.%{snap}%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-1.20091203
+- phonon-4.3.80 (20091203 snapshot)
+
 * Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-6.20091203
 - phonon-4.3.50 (20091203 snapshot)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Dec 2009 16:38:26 -0000	1.18
+++ sources	3 Dec 2009 20:03:00 -0000	1.19
@@ -5,4 +5,4 @@
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-05f912c4f1bad40838266eda85702195  phonon-20091203svn.tar.bz2
+a2769fce6a7600345325d413d91d8b76  phonon-20091203svn.tar.bz2



From dledford at fedoraproject.org  Thu Dec  3 20:04:19 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Thu,  3 Dec 2009 20:04:19 +0000 (UTC)
Subject: rpms/opensm/F-12 opensm.initd, 1.3, 1.4 opensm.spec, 1.7,
	1.8 sources, 1.4, 1.5 opensm-3.2.1-elif.patch, 1.2, NONE
Message-ID: <20091203200419.722F111C00EE@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/opensm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27873

Modified Files:
	opensm.initd opensm.spec sources 
Removed Files:
	opensm-3.2.1-elif.patch 
Log Message:
* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 3.3.3-1
- Update to latest upstream release
- Minor tweaks to init script for LSB compliance



Index: opensm.initd
===================================================================
RCS file: /cvs/extras/rpms/opensm/F-12/opensm.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- opensm.initd	22 Apr 2009 14:24:05 -0000	1.3
+++ opensm.initd	3 Dec 2009 20:04:19 -0000	1.4
@@ -117,6 +117,11 @@ usage ()
 }
 
 case $ACTION in
+	start|stop|restart|reload|condrestart|try-restart|force-reload)
+	    [ `id -u` != "0" ] && exit 4 ;;
+esac
+
+case $ACTION in
 	start) start; RC=$? ;;
 	stop) stop; RC=$? ;;
 	restart) restart; RC=$? ;;


Index: opensm.spec
===================================================================
RCS file: /cvs/extras/rpms/opensm/F-12/opensm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- opensm.spec	25 Jul 2009 20:53:03 -0000	1.7
+++ opensm.spec	3 Dec 2009 20:04:19 -0000	1.8
@@ -1,6 +1,6 @@
 Name: opensm
-Version: 3.3.2
-Release: 2%{?dist}
+Version: 3.3.3
+Release: 1%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 Group: System Environment/Daemons
 License: GPLv2 or BSD
@@ -9,9 +9,8 @@ Source0: http://www.openfabrics.org/down
 Source1: opensm.conf
 Source2: opensm.logrotate
 Source3: opensm.initd
-Patch1:  opensm-3.2.1-elif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libibmad-devel = 1.3.2, libtool, bison, flex, byacc
+BuildRequires: libibmad-devel = 1.3.3, libtool, bison, flex, byacc
 Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma
 
 %description
@@ -46,7 +45,6 @@ Static version of opensm libraries
 
 %prep
 %setup -q
-%patch1 -p1 -b .elif
 
 %build
 %configure --with-opensm-conf-sub-dir=rdma
@@ -60,7 +58,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf
 install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm
-install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm
+install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initddir}/opensm
 mkdir -p ${RPM_BUILD_ROOT}/var/cache/opensm
 
 %clean
@@ -88,7 +86,7 @@ fi
 %defattr(-,root,root,-)
 %dir /var/cache/opensm
 %{_sbindir}/*
-%{_initrddir}/opensm
+%{_initddir}/opensm
 %{_mandir}/man8/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/opensm
 %config(noreplace) %{_sysconfdir}/rdma/opensm.conf
@@ -108,6 +106,10 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Dec 03 2009 Doug Ledford <dledford at redhat.com> - 3.3.3-1
+- Update to latest upstream release
+- Minor tweaks to init script for LSB compliance
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensm/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 20:06:57 -0000	1.4
+++ sources	3 Dec 2009 20:04:19 -0000	1.5
@@ -1 +1 @@
-8925a54defa3e87573a6d127b8790f7f  opensm-3.3.2.tar.gz
+0a50e041932b4abf240c8d4a519e59a4  opensm-3.3.3.tar.gz


--- opensm-3.2.1-elif.patch DELETED ---



From rdieter at fedoraproject.org  Thu Dec  3 20:05:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 20:05:13 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon.spec,1.51,1.52 sources,1.16,1.17
Message-ID: <20091203200513.AD9E811C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28200

Modified Files:
	phonon.spec sources 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-1.20091203
- phonon-4.3.80 (20091203 snapshot)



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- phonon.spec	3 Dec 2009 16:40:23 -0000	1.51
+++ phonon.spec	3 Dec 2009 20:05:13 -0000	1.52
@@ -3,8 +3,8 @@
 
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.3.50
-Release: 6.%{snap}%{?dist}
+Version: 4.3.80
+Release: 1.%{snap}%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-1.20091203
+- phonon-4.3.80 (20091203 snapshot)
+
 * Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-6.20091203
 - phonon-4.3.50 (20091203 snapshot)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	3 Dec 2009 16:40:23 -0000	1.16
+++ sources	3 Dec 2009 20:05:13 -0000	1.17
@@ -5,4 +5,4 @@
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-05f912c4f1bad40838266eda85702195  phonon-20091203svn.tar.bz2
+a2769fce6a7600345325d413d91d8b76  phonon-20091203svn.tar.bz2



From tmz at fedoraproject.org  Thu Dec  3 20:06:15 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Thu,  3 Dec 2009 20:06:15 +0000 (UTC)
Subject: rpms/puppet/devel puppet.spec,1.36,1.37
Message-ID: <20091203200615.D546711C00EE@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/puppet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28627

Modified Files:
	puppet.spec 
Log Message:
Bump and rebuild to get 0.25.1 into rawhide



Index: puppet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/devel/puppet.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- puppet.spec	26 Nov 2009 07:23:04 -0000	1.36
+++ puppet.spec	3 Dec 2009 20:06:15 -0000	1.37
@@ -6,7 +6,7 @@
 
 Name:           puppet
 Version:        0.25.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
@@ -222,6 +222,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Thu Dec 03 2009 Todd Zullinger <tmz at pobox.com> - 0.25.1-1.1
+- Bump and rebuild to get 0.25.1 into rawhide
+
 * Wed Nov 25 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.25.1-1
 - New upstream version
 



From ellert at fedoraproject.org  Thu Dec  3 20:07:18 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 20:07:18 +0000 (UTC)
Subject: File voms-mysql-plugin-3.1.3.1.tar.gz uploaded to lookaside cache by
	ellert
Message-ID: <20091203200718.0C10A10F894@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for voms-mysql-plugin:

d53cae00b28b9bad78e8e8c63354d088  voms-mysql-plugin-3.1.3.1.tar.gz



From ellert at fedoraproject.org  Thu Dec  3 20:07:58 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 20:07:58 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 sources, 1.2, 1.3 voms-mysql-plugin.spec, 1.1, 1.2
Message-ID: <20091203200758.6C7CA11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29164/devel

Modified Files:
	.cvsignore import.log sources voms-mysql-plugin.spec 
Log Message:
* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
- Update to version 3.1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:49:22 -0000	1.2
+++ .cvsignore	3 Dec 2009 20:07:57 -0000	1.3
@@ -1 +1 @@
-voms-mysql-plugin-3.1.1.tar.gz
+voms-mysql-plugin-3.1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:49:22 -0000	1.1
+++ import.log	3 Dec 2009 20:07:57 -0000	1.2
@@ -1 +1,2 @@
 voms-mysql-plugin-3_1_1-1_fc11:HEAD:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252550902
+voms-mysql-plugin-3_1_3_1-1_fc12:HEAD:voms-mysql-plugin-3.1.3.1-1.fc12.src.rpm:1259870842


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:49:22 -0000	1.2
+++ sources	3 Dec 2009 20:07:57 -0000	1.3
@@ -1 +1 @@
-b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz
+d53cae00b28b9bad78e8e8c63354d088  voms-mysql-plugin-3.1.3.1.tar.gz


Index: voms-mysql-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/devel/voms-mysql-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-mysql-plugin.spec	10 Sep 2009 02:49:22 -0000	1.1
+++ voms-mysql-plugin.spec	3 Dec 2009 20:07:57 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		voms-mysql-plugin
-Version:	3.1.1
+Version:	3.1.3.1
 Release:	1%{?dist}
 Summary:	VOMS server plugin for MySQL
 
@@ -8,10 +8,10 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms-mysql_R_3_1_1 \
-#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
-#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
-#		  voms-mysql-plugin-3.1.1
+#		  -r glite-security-voms-mysql_R_3_1_3_1 \
+#		  -d voms-mysql-plugin-3.1.3.1 org.glite.security.voms-mysql
+#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.3.1.tar.gz \
+#		  voms-mysql-plugin-3.1.3.1
 Source:		%{name}-%{version}.tar.gz
 #		Make the mysql library detection portable
 #		https://savannah.cern.ch/bugs/?54438
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/voms/libvomsmysql.so
 
 %changelog
+* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
+- Update to version 3.1.3.1.
+
 * Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
 - Update to version 3.1.1.
 



From ellert at fedoraproject.org  Thu Dec  3 20:09:15 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 20:09:15 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 voms-mysql-plugin.spec, 1.1, 1.2
Message-ID: <20091203200915.CA75511C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29580/F-12

Modified Files:
	.cvsignore import.log sources voms-mysql-plugin.spec 
Log Message:
* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
- Update to version 3.1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:49:22 -0000	1.2
+++ .cvsignore	3 Dec 2009 20:09:15 -0000	1.3
@@ -1 +1 @@
-voms-mysql-plugin-3.1.1.tar.gz
+voms-mysql-plugin-3.1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:49:22 -0000	1.1
+++ import.log	3 Dec 2009 20:09:15 -0000	1.2
@@ -1 +1,2 @@
 voms-mysql-plugin-3_1_1-1_fc11:HEAD:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252550902
+voms-mysql-plugin-3_1_3_1-1_fc12:F-12:voms-mysql-plugin-3.1.3.1-1.fc12.src.rpm:1259870938


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:49:22 -0000	1.2
+++ sources	3 Dec 2009 20:09:15 -0000	1.3
@@ -1 +1 @@
-b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz
+d53cae00b28b9bad78e8e8c63354d088  voms-mysql-plugin-3.1.3.1.tar.gz


Index: voms-mysql-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-12/voms-mysql-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-mysql-plugin.spec	10 Sep 2009 02:49:22 -0000	1.1
+++ voms-mysql-plugin.spec	3 Dec 2009 20:09:15 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		voms-mysql-plugin
-Version:	3.1.1
+Version:	3.1.3.1
 Release:	1%{?dist}
 Summary:	VOMS server plugin for MySQL
 
@@ -8,10 +8,10 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms-mysql_R_3_1_1 \
-#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
-#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
-#		  voms-mysql-plugin-3.1.1
+#		  -r glite-security-voms-mysql_R_3_1_3_1 \
+#		  -d voms-mysql-plugin-3.1.3.1 org.glite.security.voms-mysql
+#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.3.1.tar.gz \
+#		  voms-mysql-plugin-3.1.3.1
 Source:		%{name}-%{version}.tar.gz
 #		Make the mysql library detection portable
 #		https://savannah.cern.ch/bugs/?54438
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/voms/libvomsmysql.so
 
 %changelog
+* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
+- Update to version 3.1.3.1.
+
 * Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
 - Update to version 3.1.1.
 



From ellert at fedoraproject.org  Thu Dec  3 20:10:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 20:10:08 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 voms-mysql-plugin.spec, 1.1, 1.2
Message-ID: <20091203201008.756C611C03F6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30016/F-11

Modified Files:
	.cvsignore import.log sources voms-mysql-plugin.spec 
Log Message:
* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
- Update to version 3.1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:50:53 -0000	1.2
+++ .cvsignore	3 Dec 2009 20:10:08 -0000	1.3
@@ -1 +1 @@
-voms-mysql-plugin-3.1.1.tar.gz
+voms-mysql-plugin-3.1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:50:53 -0000	1.1
+++ import.log	3 Dec 2009 20:10:08 -0000	1.2
@@ -1 +1,2 @@
 voms-mysql-plugin-3_1_1-1_fc11:F-11:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551019
+voms-mysql-plugin-3_1_3_1-1_fc12:F-11:voms-mysql-plugin-3.1.3.1-1.fc12.src.rpm:1259870987


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:50:53 -0000	1.2
+++ sources	3 Dec 2009 20:10:08 -0000	1.3
@@ -1 +1 @@
-b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz
+d53cae00b28b9bad78e8e8c63354d088  voms-mysql-plugin-3.1.3.1.tar.gz


Index: voms-mysql-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-11/voms-mysql-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-mysql-plugin.spec	10 Sep 2009 02:50:53 -0000	1.1
+++ voms-mysql-plugin.spec	3 Dec 2009 20:10:08 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		voms-mysql-plugin
-Version:	3.1.1
+Version:	3.1.3.1
 Release:	1%{?dist}
 Summary:	VOMS server plugin for MySQL
 
@@ -8,10 +8,10 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms-mysql_R_3_1_1 \
-#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
-#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
-#		  voms-mysql-plugin-3.1.1
+#		  -r glite-security-voms-mysql_R_3_1_3_1 \
+#		  -d voms-mysql-plugin-3.1.3.1 org.glite.security.voms-mysql
+#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.3.1.tar.gz \
+#		  voms-mysql-plugin-3.1.3.1
 Source:		%{name}-%{version}.tar.gz
 #		Make the mysql library detection portable
 #		https://savannah.cern.ch/bugs/?54438
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/voms/libvomsmysql.so
 
 %changelog
+* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
+- Update to version 3.1.3.1.
+
 * Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
 - Update to version 3.1.1.
 



From ellert at fedoraproject.org  Thu Dec  3 20:11:03 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 20:11:03 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 voms-mysql-plugin.spec, 1.1, 1.2
Message-ID: <20091203201103.58EEE11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30497/F-10

Modified Files:
	.cvsignore import.log sources voms-mysql-plugin.spec 
Log Message:
* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
- Update to version 3.1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:52:09 -0000	1.2
+++ .cvsignore	3 Dec 2009 20:11:02 -0000	1.3
@@ -1 +1 @@
-voms-mysql-plugin-3.1.1.tar.gz
+voms-mysql-plugin-3.1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:52:09 -0000	1.1
+++ import.log	3 Dec 2009 20:11:03 -0000	1.2
@@ -1 +1,2 @@
 voms-mysql-plugin-3_1_1-1_fc11:F-10:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551105
+voms-mysql-plugin-3_1_3_1-1_fc12:F-10:voms-mysql-plugin-3.1.3.1-1.fc12.src.rpm:1259871041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:52:09 -0000	1.2
+++ sources	3 Dec 2009 20:11:03 -0000	1.3
@@ -1 +1 @@
-b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz
+d53cae00b28b9bad78e8e8c63354d088  voms-mysql-plugin-3.1.3.1.tar.gz


Index: voms-mysql-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-10/voms-mysql-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-mysql-plugin.spec	10 Sep 2009 02:52:09 -0000	1.1
+++ voms-mysql-plugin.spec	3 Dec 2009 20:11:03 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		voms-mysql-plugin
-Version:	3.1.1
+Version:	3.1.3.1
 Release:	1%{?dist}
 Summary:	VOMS server plugin for MySQL
 
@@ -8,10 +8,10 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms-mysql_R_3_1_1 \
-#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
-#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
-#		  voms-mysql-plugin-3.1.1
+#		  -r glite-security-voms-mysql_R_3_1_3_1 \
+#		  -d voms-mysql-plugin-3.1.3.1 org.glite.security.voms-mysql
+#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.3.1.tar.gz \
+#		  voms-mysql-plugin-3.1.3.1
 Source:		%{name}-%{version}.tar.gz
 #		Make the mysql library detection portable
 #		https://savannah.cern.ch/bugs/?54438
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/voms/libvomsmysql.so
 
 %changelog
+* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
+- Update to version 3.1.3.1.
+
 * Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
 - Update to version 3.1.1.
 



From ellert at fedoraproject.org  Thu Dec  3 20:11:53 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 20:11:53 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 voms-mysql-plugin.spec, 1.1, 1.2
Message-ID: <20091203201153.638BF11C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30945/EL-5

Modified Files:
	.cvsignore import.log sources voms-mysql-plugin.spec 
Log Message:
* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
- Update to version 3.1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:53:41 -0000	1.2
+++ .cvsignore	3 Dec 2009 20:11:53 -0000	1.3
@@ -1 +1 @@
-voms-mysql-plugin-3.1.1.tar.gz
+voms-mysql-plugin-3.1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:53:41 -0000	1.1
+++ import.log	3 Dec 2009 20:11:53 -0000	1.2
@@ -1 +1,2 @@
 voms-mysql-plugin-3_1_1-1_fc11:EL-5:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551193
+voms-mysql-plugin-3_1_3_1-1_fc12:EL-5:voms-mysql-plugin-3.1.3.1-1.fc12.src.rpm:1259871096


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:53:41 -0000	1.2
+++ sources	3 Dec 2009 20:11:53 -0000	1.3
@@ -1 +1 @@
-b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz
+d53cae00b28b9bad78e8e8c63354d088  voms-mysql-plugin-3.1.3.1.tar.gz


Index: voms-mysql-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-5/voms-mysql-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-mysql-plugin.spec	10 Sep 2009 02:53:41 -0000	1.1
+++ voms-mysql-plugin.spec	3 Dec 2009 20:11:53 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		voms-mysql-plugin
-Version:	3.1.1
+Version:	3.1.3.1
 Release:	1%{?dist}
 Summary:	VOMS server plugin for MySQL
 
@@ -8,10 +8,10 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms-mysql_R_3_1_1 \
-#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
-#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
-#		  voms-mysql-plugin-3.1.1
+#		  -r glite-security-voms-mysql_R_3_1_3_1 \
+#		  -d voms-mysql-plugin-3.1.3.1 org.glite.security.voms-mysql
+#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.3.1.tar.gz \
+#		  voms-mysql-plugin-3.1.3.1
 Source:		%{name}-%{version}.tar.gz
 #		Make the mysql library detection portable
 #		https://savannah.cern.ch/bugs/?54438
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/voms/libvomsmysql.so
 
 %changelog
+* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
+- Update to version 3.1.3.1.
+
 * Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
 - Update to version 3.1.1.
 



From ellert at fedoraproject.org  Thu Dec  3 20:12:40 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu,  3 Dec 2009 20:12:40 +0000 (UTC)
Subject: rpms/voms-mysql-plugin/EL-4 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 voms-mysql-plugin.spec, 1.1, 1.2
Message-ID: <20091203201240.452B811C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31327/EL-4

Modified Files:
	.cvsignore import.log sources voms-mysql-plugin.spec 
Log Message:
* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
- Update to version 3.1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 02:55:05 -0000	1.2
+++ .cvsignore	3 Dec 2009 20:12:40 -0000	1.3
@@ -1 +1 @@
-voms-mysql-plugin-3.1.1.tar.gz
+voms-mysql-plugin-3.1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2009 02:55:05 -0000	1.1
+++ import.log	3 Dec 2009 20:12:40 -0000	1.2
@@ -1 +1,2 @@
 voms-mysql-plugin-3_1_1-1_fc11:EL-4:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551275
+voms-mysql-plugin-3_1_3_1-1_fc12:EL-4:voms-mysql-plugin-3.1.3.1-1.fc12.src.rpm:1259871143


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 02:55:05 -0000	1.2
+++ sources	3 Dec 2009 20:12:40 -0000	1.3
@@ -1 +1 @@
-b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz
+d53cae00b28b9bad78e8e8c63354d088  voms-mysql-plugin-3.1.3.1.tar.gz


Index: voms-mysql-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/EL-4/voms-mysql-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-mysql-plugin.spec	10 Sep 2009 02:55:05 -0000	1.1
+++ voms-mysql-plugin.spec	3 Dec 2009 20:12:40 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		voms-mysql-plugin
-Version:	3.1.1
+Version:	3.1.3.1
 Release:	1%{?dist}
 Summary:	VOMS server plugin for MySQL
 
@@ -8,10 +8,10 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms-mysql_R_3_1_1 \
-#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
-#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
-#		  voms-mysql-plugin-3.1.1
+#		  -r glite-security-voms-mysql_R_3_1_3_1 \
+#		  -d voms-mysql-plugin-3.1.3.1 org.glite.security.voms-mysql
+#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.3.1.tar.gz \
+#		  voms-mysql-plugin-3.1.3.1
 Source:		%{name}-%{version}.tar.gz
 #		Make the mysql library detection portable
 #		https://savannah.cern.ch/bugs/?54438
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/voms/libvomsmysql.so
 
 %changelog
+* Thu Dec  3 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.3.1-1
+- Update to version 3.1.3.1.
+
 * Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
 - Update to version 3.1.1.
 



From jlayton at fedoraproject.org  Thu Dec  3 20:18:40 2009
From: jlayton at fedoraproject.org (Jeff Layton)
Date: Thu,  3 Dec 2009 20:18:40 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.1-cel-ipv6.patch, NONE,
	1.1.2.1 nfs-utils-1.2.1-relax-insecure-option.patch, NONE,
	1.1.2.1 nfs-utils.spec, 1.253, 1.253.2.1
Message-ID: <20091203201840.DAD0E11C00EE@cvs1.fedora.phx.redhat.com>

Author: jlayton

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv883

Modified Files:
      Tag: private-jlayton-ipv6-3
	nfs-utils.spec 
Added Files:
      Tag: private-jlayton-ipv6-3
	nfs-utils-1.2.1-cel-ipv6.patch 
	nfs-utils-1.2.1-relax-insecure-option.patch 
Log Message:
Add support for IPv6 to nfs-utils


nfs-utils-1.2.1-cel-ipv6.patch:
 b/.gitignore                    |    9 
 b/aclocal/ipv6.m4               |    4 
 b/aclocal/libcap.m4             |   15 
 b/configure.ac                  |    1 
 b/support/Makefile.am           |    2 
 b/support/export/client.c       |   22 
 b/support/export/export.c       |    3 
 b/support/export/hostname.c     |  284 ++++++++++
 b/support/export/nfsctl.c       |   17 
 b/support/export/rmtab.c        |   46 -
 b/support/export/xtab.c         |    4 
 b/support/include/Makefile.am   |    1 
 b/support/include/compaddr.h    |  109 ++++
 b/support/include/exportfs.h    |    4 
 b/support/include/ha-callout.h  |    4 
 b/support/include/misc.h        |    2 
 b/support/include/nfslib.h      |    9 
 b/support/include/nfsrpc.h      |   12 
 b/support/include/nsm.h         |   62 ++
 b/support/include/rpcmisc.h     |    7 
 b/support/include/tcpwrapper.h  |    2 
 b/support/misc/from_local.c     |   20 
 b/support/misc/tcpwrapper.c     |    4 
 b/support/nfs/Makefile.am       |    3 
 b/support/nfs/cacheio.c         |    5 
 b/support/nfs/exports.c         |    2 
 b/support/nfs/getfh.c           |   48 +
 b/support/nfs/getport.c         |   91 +++
 b/support/nfs/svc_create.c      |  252 +++++++++
 b/support/nsm/Makefile.am       |   45 +
 b/support/nsm/file.c            |  772 +++++++++++++++++++++++++++++
 b/support/nsm/rpc.c             |  507 +++++++++++++++++++
 b/support/nsm/sm_inter.x        |  131 ++++
 b/utils/exportfs/exportfs.c     |   11 
 b/utils/exportfs/exportfs.man   |  281 +++++-----
 b/utils/exportfs/exports.man    |   70 +-
 b/utils/mount/network.c         |   30 -
 b/utils/mount/network.h         |    4 
 b/utils/mount/nfs.man           |   86 +--
 b/utils/mount/nfsumount.c       |    9 
 b/utils/mount/stropts.c         |   53 --
 b/utils/mountd/auth.c           |    2 
 b/utils/mountd/cache.c          |   23 
 b/utils/mountd/fsloc.c          |    5 
 b/utils/mountd/mount_dispatch.c |    2 
 b/utils/mountd/mountd.c         |   26 
 b/utils/mountd/mountd.h         |    5 
 b/utils/mountd/mountd.man       |  242 +++++----
 b/utils/mountd/rmtab.c          |   21 
 b/utils/nfsd/nfsd.c             |    9 
 b/utils/nfsd/nfssvc.c           |    9 
 b/utils/statd/Makefile.am       |    4 
 b/utils/statd/callback.c        |    4 
 b/utils/statd/hostname.c        |  122 ++++
 b/utils/statd/misc.c            |   12 
 b/utils/statd/monitor.c         |   47 -
 b/utils/statd/notlist.c         |    4 
 b/utils/statd/rmtcall.c         |   36 -
 b/utils/statd/simu.c            |   10 
 b/utils/statd/simulate.c        |   52 -
 b/utils/statd/sm-notify.c       |  163 ++----
 b/utils/statd/sm-notify.man     |    8 
 b/utils/statd/stat.c            |    8 
 b/utils/statd/statd.c           |   57 --
 b/utils/statd/statd.h           |    9 
 b/utils/statd/statd.man         |  510 +++++++++++++------
 b/utils/statd/svc_run.c         |    7 
 configure.ac                    |    5 
 support/export/client.c         | 1053 ++++++++++++++++++++++++----------------
 support/export/export.c         |  189 ++++---
 support/export/hostname.c       |  352 +------------
 support/export/rmtab.c          |    8 
 support/include/exportfs.h      |   82 ++-
 support/include/misc.h          |    7 
 support/include/nfslib.h        |    3 
 support/include/nsm.h           |   25 
 support/include/tcpwrapper.h    |    7 
 support/misc/from_local.c       |   87 +++
 support/misc/tcpwrapper.c       |  170 +++---
 support/nsm/Makefile.am         |    4 
 support/nsm/file.c              |   50 +
 utils/exportfs/exportfs.c       |  213 ++++----
 utils/mount/network.c           |  100 ++-
 utils/mount/network.h           |    7 
 utils/mount/nfs.man             |    6 
 utils/mount/stropts.c           |   40 +
 utils/mountd/auth.c             |  103 ++-
 utils/mountd/cache.c            |   80 +--
 utils/mountd/mount_dispatch.c   |    6 
 utils/mountd/mountd.c           |  131 ++--
 utils/mountd/mountd.h           |    2 
 utils/mountd/rmtab.c            |   90 +--
 utils/statd/Makefile.am         |   30 -
 utils/statd/callback.c          |   74 ++
 utils/statd/hostname.c          |   95 +++
 utils/statd/log.c               |   95 ---
 utils/statd/log.h               |   42 -
 utils/statd/misc.c              |   24 
 utils/statd/monitor.c           |  201 +++----
 utils/statd/rmtcall.c           |  145 -----
 utils/statd/simu.c              |   38 -
 utils/statd/sm-notify.c         |  873 +++++++++++++++------------------
 utils/statd/sm-notify.man       |  435 +++++++++++-----
 utils/statd/sm_inter.x          |  133 -----
 utils/statd/stat.c              |   10 
 utils/statd/statd.c             |  165 +-----
 utils/statd/statd.h             |   37 -
 utils/statd/statd.man           |   21 
 utils/statd/version.h           |    9 
 109 files changed, 6137 insertions(+), 3550 deletions(-)

--- NEW FILE nfs-utils-1.2.1-cel-ipv6.patch ---
-------------------------------------------------------------------------------
statd-replace-note-with-xlog-i
-------------------------------------------------------------------------------
statd: Replace note() with xlog() in rpc.statd

From: Chuck Lever <chuck.lever at oracle.com>

To facilitate code sharing between statd and sm-notify (and with other
components of nfs-utils), replace rpc.statd's note() with xlog().

Bonus: add debugging xlog() messages to report incoming RPC requests.
These additional messages are enabled when "-d" is specified on the
statd command line.

Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---

 support/include/ha-callout.h |    4 --
 utils/statd/Makefile.am      |    4 +-
 utils/statd/callback.c       |    4 +-
 utils/statd/log.c            |   95 ------------------------------------------
 utils/statd/log.h            |   42 -------------------
 utils/statd/misc.c           |   12 ++---
 utils/statd/monitor.c        |   47 +++++++++++----------
 utils/statd/rmtcall.c        |   36 ++++++++--------
 utils/statd/simu.c           |   10 +++-
 utils/statd/simulate.c       |   52 +++++++++++------------
 utils/statd/stat.c           |    8 ++--
 utils/statd/statd.c          |   57 +++++++++++--------------
 utils/statd/statd.h          |    9 ----
 utils/statd/svc_run.c        |    7 +--
 utils/statd/version.h        |    7 ---
 15 files changed, 118 insertions(+), 276 deletions(-)
 delete mode 100644 utils/statd/log.c
 delete mode 100644 utils/statd/log.h
 delete mode 100644 utils/statd/version.h


diff --git a/support/include/ha-callout.h b/support/include/ha-callout.h
index efb70fb..1164336 100644
--- a/support/include/ha-callout.h
+++ b/support/include/ha-callout.h
@@ -53,11 +53,7 @@ ha_callout(char *event, char *arg1, char *arg2, int arg3)
 		default: pid = waitpid(pid, &ret, 0);
   	}
 	sigaction(SIGCHLD, &oldact, &newact);
-#ifdef dprintf
-	dprintf(N_DEBUG, "ha callout returned %d\n", WEXITSTATUS(ret));
-#else
 	xlog(D_GENERAL, "ha callout returned %d\n", WEXITSTATUS(ret));
-#endif
 }
 
 #endif
diff --git a/utils/statd/Makefile.am b/utils/statd/Makefile.am
index 8a3ba4e..19ba7b4 100644
--- a/utils/statd/Makefile.am
+++ b/utils/statd/Makefile.am
@@ -13,9 +13,9 @@ RPCPREFIX	= rpc.
 KPREFIX		= @kprefix@
 sbin_PROGRAMS	= statd sm-notify
 dist_sbin_SCRIPTS	= start-statd
-statd_SOURCES = callback.c notlist.c log.c misc.c monitor.c \
+statd_SOURCES = callback.c notlist.c misc.c monitor.c \
 	        simu.c stat.c statd.c svc_run.c rmtcall.c \
-	        sm_inter_clnt.c sm_inter_svc.c sm_inter_xdr.c log.h \
+	        sm_inter_clnt.c sm_inter_svc.c sm_inter_xdr.c \
 	        notlist.h statd.h system.h version.h sm_inter.h
 sm_notify_SOURCES = sm-notify.c
 
diff --git a/utils/statd/callback.c b/utils/statd/callback.c
index 8885238..2f98aeb 100644
--- a/utils/statd/callback.c
+++ b/utils/statd/callback.c
@@ -35,12 +35,12 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
 	struct sockaddr_in *sin = nfs_getrpccaller_in(rqstp->rq_xprt);
 	char *ip_addr = xstrdup(inet_ntoa(sin->sin_addr));
 
-	dprintf(N_DEBUG, "Received SM_NOTIFY from %s, state: %d",
+	xlog(D_CALL, "Received SM_NOTIFY from %s, state: %d",
 				argp->mon_name, argp->state);
 
 	/* quick check - don't bother if we're not monitoring anyone */
 	if (rtnl == NULL) {
-		note(N_WARNING, "SM_NOTIFY from %s while not monitoring any hosts.",
+		xlog_warn("SM_NOTIFY from %s while not monitoring any hosts",
 				argp->mon_name);
 		return ((void *) &result);
 	}
diff --git a/utils/statd/log.c b/utils/statd/log.c
deleted file mode 100644
index a6ca996..0000000
--- a/utils/statd/log.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 1995 Olaf Kirch
- * Modified by Jeffrey A. Uphoff, 1995, 1997, 1999.
- * Modified by H.J. Lu, 1998.
- * Modified by Lon Hohberger, Oct. 2000
- *
- * NSM for Linux.
- */
-
-/* 
- * 	log.c - logging functions for lockd/statd
- *	260295	 okir	started with simply syslog logging.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <syslog.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
-#include <sys/types.h>
-#include "log.h"
-#include "statd.h"
-
-static pid_t	mypid;
-								/* Turns on logging to console/stderr. */
-#if 0
-static int	opt_debug = 0;	/* Will be command-line option, eventually */
-#endif
-
-void log_init(void)
-{
-	if (!(run_mode & MODE_LOG_STDERR)) 
-		openlog(name_p, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
-	mypid = getpid();
-
-	note(N_WARNING,"Version %s Starting",version_p);
-}
-
-void log_background(void)
-{
-	/* NOP */
-}
-
-void die(char *fmt, ...)
-{
-	char	buffer[1024];
-	va_list	ap;
-
-	va_start(ap, fmt);
-	vsnprintf (buffer, 1024, fmt, ap);
-	va_end(ap);
-	buffer[1023]=0;
-
-	note(N_FATAL, "%s", buffer);
-
-#ifndef DEBUG
-	exit (2);
-#else
-	abort();	/* make a core */
-#endif
-}
-
-void note(int level, char *fmt, ...)
-{
-	char	buffer[1024];
-	va_list	ap;
-
-	va_start(ap, fmt);
-	vsnprintf (buffer, 1024, fmt, ap);
-	va_end(ap);
-	buffer[1023]=0;
-
-	if ((!(run_mode & MODE_LOG_STDERR)) && (level < N_DEBUG)) {
-		syslog(level, "%s", buffer);
-	} else if (run_mode & MODE_LOG_STDERR) {
-		/* Log everything, including dprintf() stuff to stderr */
-		time_t		now;
-		struct tm *	tm;
-
-		time(&now);
-		tm = localtime(&now);
-		fprintf (stderr, "%02d/%02d/%04d %02d:%02d:%02d %s[%d]: %s\n",
-			tm->tm_mon + 1, tm->tm_mday, tm->tm_year + 1900,
-			tm->tm_hour, tm->tm_min, tm->tm_sec,
-			name_p, mypid,
-			buffer);
-	}
-}
diff --git a/utils/statd/log.h b/utils/statd/log.h
deleted file mode 100644
index fc55d3c..0000000
--- a/utils/statd/log.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 1995 Olaf Kirch
- * Modified by Jeffrey A. Uphoff, 1996, 1997, 1999.
[...17418 lines suppressed...]
+Specify a high availability callout program.
+This program receives callouts for all MOUNT and UNMOUNT requests.
+This allows 
+.B rpc.mountd
+to be used in a High Availability NFS (HA-NFS) environment.
+.IP
+The callout program is run with 4 arguments.
+The first is
 .B mount
 or
 .B unmount
@@ -118,19 +146,30 @@ The second will be the name of the client performing the mount.
 The third will be the path that the client is mounting.
 The last is the number of concurrent mounts that we believe the client
 has of that path.
+.IP
+This callout is not needed with 2.6 and later kernels.
+Instead, mount the nfsd filesystem on
+.IR /proc/fs/nfsd .
 .TP
 .BI "\-s," "" " \-\-state\-directory\-path "  directory
-specify a directory in which to place statd state information.
+Specify a directory in which to place statd state information.
 If this option is not specified the default of
-.BR /var/lib/nfs
+.I /var/lib/nfs
 is used.
 .TP
 .BI "\-r," "" " \-\-reverse\-lookup"
-mountd tracks IP addresses in the rmtab, and when a DUMP request is made (by
-someone running showmount -a, for instance), it returns IP addresses instead
-of hostnames by default. This option causes mountd to do a reverse
-lookup on each IP address and return that hostname instead. Enabling this can
-have a substantial negative effect on performance in some situations.
+.B rpc.mountd
+tracks IP addresses in the
+.I rmtab
+file.  When a DUMP request is made (by
+someone running
+.BR "showmount -a" ,
+for instance), it returns IP addresses instead
+of hostnames by default. This option causes
+.B rpc.mountd
+to perform a reverse lookup on each IP address and return that hostname instead.
+Enabling this can have a substantial negative effect on performance
+in some situations.
 .TP
 .BR "\-t N" " or " "\-\-num\-threads=N"
 This option specifies the number of worker threads that rpc.mountd
@@ -162,41 +201,70 @@ If you use the
 flag, then the list of group ids received from the client will be
 replaced by a list of group ids determined by an appropriate lookup on
 the server. Note that the 'primary' group id is not affected so a
-.I newgroup
+.B newgroup
 command on the client will still be effective.  This function requires
 a Linux Kernel with version at least 2.6.21.
-
 .SH TCP_WRAPPERS SUPPORT
-This
+You can protect your
 .B rpc.mountd
-version is protected by the
+listeners using the
+.B tcp_wrapper
+library or
+.BR iptables (8).
+.PP
+Note that the
 .B tcp_wrapper
-library. You have to give the clients access to
-.B rpc.mountd
-if they should be allowed to use it. To allow connects from clients of
-the .bar.com domain you could use the following line in /etc/hosts.allow:
-
-mountd: .bar.com
-
-You have to use the daemon name 
+library supports only IPv4 networking.
+.PP
+Add the hostnames of NFS peers that are allowed to access
+.B rpc.mountd
+to
+.IR /etc/hosts.allow .
+Use the daemon name
 .B mountd
-for the daemon name (even if the binary has a different name).
-.B Note:
-hostnames used in either access file will be ignored when
+even if the
+.B rpc.mountd
+binary has a different name.
+.PP
+Hostnames used in either access file will be ignored when
 they can not be resolved into IP addresses.
-
-For further information please have a look at the
+For further information see the
 .BR tcpd (8)
 and
 .BR hosts_access (5)
-manual pages.
+man pages.
+.SS IPv6 and TI-RPC support
+TI-RPC is a pre-requisite for supporting NFS on IPv6.
+If TI-RPC support is built into
+.BR rpc.mountd ,
+it attempts to start listeners on network transports marked 'visible' in
+.IR /etc/netconfig .
+As long as at least one network transport listener starts successfully,
+.B rpc.mountd
+will operate.
+.SH FILES
+.TP 2.5i
+.I /etc/exports
+input file for
+.BR exportfs ,
+listing exports, export options, and access control lists
+.TP 2.5i
+.I /var/lib/nfs/rmtab
+table of clients accessing server's exports
 .SH SEE ALSO
-.BR rpc.nfsd (8),
 .BR exportfs (8),
 .BR exports (5),
-.BR rpc.rquotad (8).
-.SH FILES
-.BR /etc/exports ,
-.BR /var/lib/nfs/xtab .
+.BR showmount (8),
+.BR rpc.nfsd (8),
+.BR rpc.rquotad (8),
+.BR nfs (5),
+.BR tcpd (8),
+.BR hosts_access (5),
+.BR iptables (8),
+.BR netconfig (5)
+.sp
+RFC 1094 - "NFS: Network File System Protocol Specification"
+.br
+RFC 1813 - "NFS Version 3 Protocol Specification"
 .SH AUTHOR
 Olaf Kirch, H. J. Lu, G. Allan Morris III, and a host of others.
-------------------------------------------------------------------------------
nfsd-revert-commit-b2a3cd59
-------------------------------------------------------------------------------
nfsd: Revert commit b2a3cd59

From: Chuck Lever <chuck.lever at oracle.com>

Enable IPv6 support in rpc.nfsd again.

Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---

 utils/nfsd/nfsd.c   |    9 ---------
 utils/nfsd/nfssvc.c |    9 ---------
 2 files changed, 0 insertions(+), 18 deletions(-)


diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index 1cda1e5..650c593 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -27,15 +27,6 @@
 #include "nfssvc.h"
 #include "xlog.h"
 
-/*
- * IPv6 support for nfsd was finished before some of the other daemons (mountd
- * and statd in particular). That could be a problem in the future if someone
- * were to boot a kernel that supports IPv6 serving with  an older nfs-utils. For
- * now, hardcode the IPv6 switch into the off position until the other daemons
- * are functional.
- */
-#undef IPV6_SUPPORTED
-
 static void	usage(const char *);
 
 static struct option longopts[] =
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
index b8028bb..119135e 100644
--- a/utils/nfsd/nfssvc.c
+++ b/utils/nfsd/nfssvc.c
@@ -22,15 +22,6 @@
 #include "nfslib.h"
 #include "xlog.h"
 
-/*
- * IPv6 support for nfsd was finished before some of the other daemons (mountd
- * and statd in particular). That could be a problem in the future if someone
- * were to boot a kernel that supports IPv6 serving with an older nfs-utils. For
- * now, hardcode the IPv6 switch into the off position until the other daemons
- * are functional.
- */
-#undef IPV6_SUPPORTED
-
 #define NFSD_PORTS_FILE     "/proc/fs/nfsd/portlist"
 #define NFSD_VERS_FILE    "/proc/fs/nfsd/versions"
 #define NFSD_THREAD_FILE  "/proc/fs/nfsd/threads"

nfs-utils-1.2.1-relax-insecure-option.patch:
 auth.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE nfs-utils-1.2.1-relax-insecure-option.patch ---
>From fa42ac173d1d7e37a4052471dfc15520a09f102e Mon Sep 17 00:00:00 2001
From: Robert Gordon <rbg at openrbg.com>
Date: Mon, 16 Nov 2009 13:25:02 -0500
Subject: [PATCH] relax insecure option on mountd

In nfs-utils 1.2.0, I noticed that the insecure option validates that
the client port is a
subset of IPPORT_RESERVED as opposed to just validating it is a valid
reserved port. The following proposed patch would correct that issue.

Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Robert Gordon <rbg at openrbg.com>
Signed-off-by: Steve Dickson <steved at redhat.com>
---
 utils/mountd/auth.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 575f207..5a7ff8c 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -169,8 +169,7 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
 		}
 	}
 	if (!(exp->m_export.e_flags & NFSEXP_INSECURE_PORT) &&
-		    (ntohs(caller->sin_port) <  IPPORT_RESERVED/2 ||
-		     ntohs(caller->sin_port) >= IPPORT_RESERVED)) {
+		     ntohs(caller->sin_port) >= IPPORT_RESERVED) {
 		*error = illegal_port;
 		return NULL;
 	}
-- 
1.6.5.2



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.253
retrieving revision 1.253.2.1
diff -u -p -r1.253 -r1.253.2.1
--- nfs-utils.spec	12 Nov 2009 19:50:55 -0000	1.253
+++ nfs-utils.spec	3 Dec 2009 20:18:40 -0000	1.253.2.1
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 3.ipv6.1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -18,12 +18,14 @@ Source13: rpcgssd.init
 Source14: rpcsvcgssd.init
 Source15: nfs.sysconfig
 
-Patch00: nfs-utils-1.0.5-statdpath.patch
-Patch01: nfs-utils-1.1.0-smnotify-path.patch
+#Patch00: nfs-utils-1.0.5-statdpath.patch
+#Patch01: nfs-utils-1.1.0-smnotify-path.patch
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
 Patch200: nfs-utils-1.2.0-v4root-rel8.patch
 Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
+Patch300: nfs-utils-1.2.1-relax-insecure-option.patch
+Patch301: nfs-utils-1.2.1-cel-ipv6.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -71,13 +73,16 @@ This package also contains the mount.nfs
 
 %prep
 %setup -q
-%patch00 -p1
-%patch01 -p1
+#%patch00 -p1
+#%patch01 -p1
 %patch02 -p1
 
 %patch200 -p1
 %patch201 -p1
 
+%patch300 -p1
+%patch301 -p1
+
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
@@ -98,7 +103,8 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_F
     CPPFLAGS="$DEFINES" \
     LDFLAGS="-pie" \
     --enable-mount \
-    --enable-mountconfig
+    --enable-mountconfig \
+    --enable-ipv6
 
 make all
 
@@ -248,6 +254,14 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Dec 3 2009 Jeff Layton <jlayton at redhat.com> 1.2.1-3.ipv6.1
+- remove patches to fix statd/sm-notify paths in old statd
+- add patch to relax "insecure" export option (so that later patches apply
+  cleanly)
+- add patches from Chuck Lever's tree to support IPv6 in statd, mountd and
+  exportfs
+- enable IPv6 during configuration
+
 * Thu Nov 12 2009 Steve Dickson <steved at redhat.com> 1.2.1-3
 - Stop rpc.nfsd from failing to startup when the network
   is down (bz 532270)



From behdad at fedoraproject.org  Thu Dec  3 20:29:33 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 20:29:33 +0000 (UTC)
Subject: File fontconfig-2.8.0.tar.gz uploaded to lookaside cache by behdad
Message-ID: <20091203202933.4611D10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fontconfig:

77e15a92006ddc2adbb06f840d591c0e  fontconfig-2.8.0.tar.gz



From behdad at fedoraproject.org  Thu Dec  3 20:36:29 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 20:36:29 +0000 (UTC)
Subject: rpms/fontconfig/F-11 .cvsignore, 1.43, 1.44 fontconfig.spec, 1.134, 
	1.135 sources, 1.48, 1.49
Message-ID: <20091203203629.ACDC811C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7097

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
2.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/F-11/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	27 Jul 2009 22:15:09 -0000	1.43
+++ .cvsignore	3 Dec 2009 20:36:29 -0000	1.44
@@ -1 +1 @@
-fontconfig-2.7.1.tar.gz
+fontconfig-2.8.0.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/F-11/fontconfig.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- fontconfig.spec	31 Aug 2009 21:42:25 -0000	1.134
+++ fontconfig.spec	3 Dec 2009 20:36:29 -0000	1.135
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.7.2
+Version: 2.8.0
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -131,6 +131,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.8.0-1
+- Update to 2.8.0
+
 * Mon Aug 31 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.2-1
 - Update to 2.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/F-11/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	31 Aug 2009 21:42:25 -0000	1.48
+++ sources	3 Dec 2009 20:36:29 -0000	1.49
@@ -1 +1 @@
-8d61fa6835c7f4c2398b7f2ee2feb526  fontconfig-2.7.2.tar.gz
+77e15a92006ddc2adbb06f840d591c0e  fontconfig-2.8.0.tar.gz



From jlayton at fedoraproject.org  Thu Dec  3 20:37:28 2009
From: jlayton at fedoraproject.org (Jeff Layton)
Date: Thu,  3 Dec 2009 20:37:28 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.253.2.1,1.253.2.2
Message-ID: <20091203203728.6ABD711C00EE@cvs1.fedora.phx.redhat.com>

Author: jlayton

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7370

Modified Files:
      Tag: private-jlayton-ipv6-3
	nfs-utils.spec 
Log Message:
Add dependencies on libcap and libcap-devel



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.253.2.1
retrieving revision 1.253.2.2
diff -u -p -r1.253.2.1 -r1.253.2.2
--- nfs-utils.spec	3 Dec 2009 20:18:40 -0000	1.253.2.1
+++ nfs-utils.spec	3 Dec 2009 20:37:28 -0000	1.253.2.2
@@ -52,12 +52,12 @@ Requires: modutils >= 2.4.26-9
 BuildRequires: libgssglue-devel libevent-devel
 BuildRequires: nfs-utils-lib-devel >= 1.1.0-3 libtirpc-devel libblkid-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
-BuildRequires: automake, libtool, glibc-headers
-BuildRequires: e2fsprogs-devel, krb5-devel, tcp_wrappers-devel
+BuildRequires: automake libtool glibc-headers libcap-devel
+BuildRequires: e2fsprogs-devel krb5-devel tcp_wrappers-devel
 Requires(pre): shadow-utils >= 4.0.3-25
 Requires(pre): /sbin/chkconfig /sbin/nologin
 Requires: nfs-utils-lib >= 1.1.0-3 libgssglue libevent
-Requires: libtirpc libblkid
+Requires: libtirpc libblkid libcap
 
 %description
 The nfs-utils package provides a daemon for the kernel NFS server and



From rdieter at fedoraproject.org  Thu Dec  3 20:39:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 20:39:33 +0000 (UTC)
Subject: File phonon-4.3.80.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091203203933.560F910F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for phonon:

6b0c5554291615433c14c3c38f741690  phonon-4.3.80.tar.bz2



From rdieter at fedoraproject.org  Thu Dec  3 20:40:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 20:40:07 +0000 (UTC)
Subject: rpms/phonon/devel .cvsignore, 1.16, 1.17 phonon.spec, 1.55,
	1.56 sources, 1.19, 1.20
Message-ID: <20091203204007.E1BFE11C03F6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8417

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
- phonon-4.3.80 (upstream tarball, yes getting rediculous now)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	3 Dec 2009 16:38:26 -0000	1.16
+++ .cvsignore	3 Dec 2009 20:40:07 -0000	1.17
@@ -5,4 +5,4 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
-phonon-20091203svn.tar.bz2
+phonon-4.3.80.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- phonon.spec	3 Dec 2009 20:03:00 -0000	1.55
+++ phonon.spec	3 Dec 2009 20:40:07 -0000	1.56
@@ -1,15 +1,15 @@
 
-%define snap 20091203svn
+#define snap 20091203svn
 
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.80
-Release: 1.%{snap}%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-#Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
-Source0: phonon-%{snap}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/phonon/phonon-%{version}.tar.bz2
+#Source0: phonon-%{snap}.tar.bz2
 Source1: phonon_snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
+- phonon-4.3.80 (upstream tarball, yes getting rediculous now)
+
 * Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-1.20091203
 - phonon-4.3.80 (20091203 snapshot)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	3 Dec 2009 20:03:00 -0000	1.19
+++ sources	3 Dec 2009 20:40:07 -0000	1.20
@@ -5,4 +5,4 @@
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-a2769fce6a7600345325d413d91d8b76  phonon-20091203svn.tar.bz2
+6b0c5554291615433c14c3c38f741690  phonon-4.3.80.tar.bz2



From dwayne at fedoraproject.org  Thu Dec  3 20:40:29 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu,  3 Dec 2009 20:40:29 +0000 (UTC)
Subject: rpms/virtaal/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 virtaal.spec, 1.15,
	1.16 virtaal-0.5.0-msgfmt_compile_fixes.patch, 1.1, NONE
Message-ID: <20091203204029.3E69711C03F6@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8450

Modified Files:
	.cvsignore sources virtaal.spec 
Removed Files:
	virtaal-0.5.0-msgfmt_compile_fixes.patch 
Log Message:
* Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
- Update to 0.5.0 final
   - Correctly support Open-Tran for languages with regional modifiers
   - Web requests now accept compressed responses if the server offers it
   - New translations: Ukrainian.
   - Various bug fixes
- Drop Korean translation fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	27 Nov 2009 12:57:06 -0000	1.13
+++ .cvsignore	3 Dec 2009 20:40:29 -0000	1.14
@@ -1 +1 @@
-virtaal-0.5.0-rc1.tar.bz2
+virtaal-0.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Nov 2009 12:57:06 -0000	1.13
+++ sources	3 Dec 2009 20:40:29 -0000	1.14
@@ -1 +1 @@
-20dda64495a8cfbd0b581cebff83d4d8  virtaal-0.5.0-rc1.tar.bz2
+36d6fd363f6e46ec949c3b5dbd268e66  virtaal-0.5.0.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/virtaal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- virtaal.spec	1 Dec 2009 16:33:12 -0000	1.15
+++ virtaal.spec	3 Dec 2009 20:40:29 -0000	1.16
@@ -2,19 +2,17 @@
 
 Name:           virtaal
 Version:        0.5.0
-Release:        0.2.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
-#Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
-Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}-rc1.tar.bz2
+Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.5.0-setup_drop_MO_generation.patch
 Patch1:         virtaal-0.3.0-autocorr_shared_location.patch
-Patch2:         virtaal-0.5.0-msgfmt_compile_fixes.patch
 
 BuildArch:      noarch
 BuildRequires:  python
@@ -67,17 +65,16 @@ Placeholders such as variables, abbrevia
 punctutions are highlighted for easy insertion into the translations.
 
 Virtaal is able to edit any of the following formats: XLIFF, Gettext PO and 
-.mo, Qt .ts, .qph and .qm, Wordfast TM, TMX and TBX. The Translate Toolkit 
-converters allow translators to edit: OpenDocument Format (ODF), 
-OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla DTD files,
-subtitles, and other formats.
+.mo, Qt .ts, .qph and .qm, Wordfast TM, TMX, OmegaT glossaries and TBX. The 
+Translate Toolkit converters allow translators to edit: OpenDocument 
+Format (ODF), OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla 
+DTD files, subtitles, and other formats.
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
-%patch2 -p1 -b .msgfmt_compile_fixes
 
 %build
 %{__python} setup.py build
@@ -163,6 +160,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
+- Update to 0.5.0 final
+   - Correctly support Open-Tran for languages with regional modifiers
+   - Web requests now accept compressed responses if the server offers it
+   - New translations: Ukrainian.
+   - Various bug fixes
+- Drop Korean translation fix
+
 * Tue Dec 1 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.2.rc1
 - Typo in postun
 


--- virtaal-0.5.0-msgfmt_compile_fixes.patch DELETED ---



From rdieter at fedoraproject.org  Thu Dec  3 20:40:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  3 Dec 2009 20:40:38 +0000 (UTC)
Subject: rpms/phonon/F-12 .cvsignore, 1.14, 1.15 phonon.spec, 1.52,
	1.53 sources, 1.17, 1.18
Message-ID: <20091203204038.2729711C03F6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8707

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
- phonon-4.3.80 (upstream tarball, yes getting rediculous now)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	3 Dec 2009 16:40:23 -0000	1.14
+++ .cvsignore	3 Dec 2009 20:40:37 -0000	1.15
@@ -5,4 +5,4 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
-phonon-20091203svn.tar.bz2
+phonon-4.3.80.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- phonon.spec	3 Dec 2009 20:05:13 -0000	1.52
+++ phonon.spec	3 Dec 2009 20:40:37 -0000	1.53
@@ -1,15 +1,15 @@
 
-%define snap 20091203svn
+#define snap 20091203svn
 
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.80
-Release: 1.%{snap}%{?dist}
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-#Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
-Source0: phonon-%{snap}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/phonon/phonon-%{version}.tar.bz2
+#Source0: phonon-%{snap}.tar.bz2
 Source1: phonon_snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -190,6 +190,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
+- phonon-4.3.80 (upstream tarball, yes getting rediculous now)
+
 * Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-1.20091203
 - phonon-4.3.80 (20091203 snapshot)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	3 Dec 2009 20:05:13 -0000	1.17
+++ sources	3 Dec 2009 20:40:37 -0000	1.18
@@ -5,4 +5,4 @@
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-a2769fce6a7600345325d413d91d8b76  phonon-20091203svn.tar.bz2
+6b0c5554291615433c14c3c38f741690  phonon-4.3.80.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec  3 20:40:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 20:40:59 +0000
Subject: [pkgdb] egoboo: rakesh has given up watchbugzilla
Message-ID: <20091203204059.70CA810F894@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on egoboo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egoboo



From pkgdb at fedoraproject.org  Thu Dec  3 20:41:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 20:41:02 +0000
Subject: [pkgdb] egoboo: rakesh has given up watchcommits
Message-ID: <20091203204102.56E0B10F899@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on egoboo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egoboo



From pkgdb at fedoraproject.org  Thu Dec  3 20:41:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 20:41:03 +0000
Subject: [pkgdb] egoboo: rakesh has requested commit
Message-ID: <20091203204103.587AC10F8A3@bastion2.fedora.phx.redhat.com>

rakesh has requested the commit acl on egoboo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egoboo



From pkgdb at fedoraproject.org  Thu Dec  3 20:41:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 20:41:04 +0000
Subject: [pkgdb] egoboo: rakesh has requested approveacls
Message-ID: <20091203204104.5732410F8A1@bastion2.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on egoboo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egoboo



From pkgdb at fedoraproject.org  Thu Dec  3 20:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 20:43:19 +0000
Subject: [pkgdb] orsa: rakesh has given up watchbugzilla
Message-ID: <20091203204319.3784B10F894@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchbugzilla acl on orsa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From pkgdb at fedoraproject.org  Thu Dec  3 20:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 20:43:20 +0000
Subject: [pkgdb] orsa: rakesh has given up watchcommits
Message-ID: <20091203204320.519B410F899@bastion2.fedora.phx.redhat.com>

rakesh has given up the watchcommits acl on orsa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From pkgdb at fedoraproject.org  Thu Dec  3 20:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 20:43:20 +0000
Subject: [pkgdb] orsa: rakesh has requested commit
Message-ID: <20091203204321.AD42810F8A3@bastion2.fedora.phx.redhat.com>

rakesh has requested the commit acl on orsa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From pkgdb at fedoraproject.org  Thu Dec  3 20:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 20:43:20 +0000
Subject: [pkgdb] orsa: rakesh has requested approveacls
Message-ID: <20091203204321.A381810F89E@bastion2.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on orsa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From behdad at fedoraproject.org  Thu Dec  3 20:49:55 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 20:49:55 +0000 (UTC)
Subject: rpms/fontconfig/F-12 fontconfig.spec,1.139,1.140 sources,1.51,1.52
Message-ID: <20091203204955.C487D11C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12187

Modified Files:
	fontconfig.spec sources 
Log Message:
2.8.0



Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/F-12/fontconfig.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- fontconfig.spec	8 Sep 2009 15:55:22 -0000	1.139
+++ fontconfig.spec	3 Dec 2009 20:49:55 -0000	1.140
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.7.3
+Version: 2.8.0
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -131,6 +131,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.8.0-1
+- Update to 2.8.0
+
 * Tue Sep  8 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.3-1
 - Update to 2.7.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/F-12/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	8 Sep 2009 15:55:23 -0000	1.51
+++ sources	3 Dec 2009 20:49:55 -0000	1.52
@@ -1 +1 @@
-747d2c691c66b563c8e8c1784ce8d014  fontconfig-2.7.3.tar.gz
+77e15a92006ddc2adbb06f840d591c0e  fontconfig-2.8.0.tar.gz



From caolanm at fedoraproject.org  Thu Dec  3 20:49:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 20:49:54 +0000 (UTC)
Subject: File OOO320_m7.tar.bz2 uploaded to lookaside cache by caolanm
Message-ID: <20091203204954.8F75E10F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for openoffice.org:

c8304a4d0d4f0add0d1df87edba7a88d  OOO320_m7.tar.bz2



From behdad at fedoraproject.org  Thu Dec  3 20:51:14 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 20:51:14 +0000 (UTC)
Subject: rpms/fontconfig/F-12 .cvsignore,1.47,1.48
Message-ID: <20091203205114.90B1811C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12809

Modified Files:
	.cvsignore 
Log Message:
Update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/F-12/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	8 Sep 2009 15:55:22 -0000	1.47
+++ .cvsignore	3 Dec 2009 20:51:14 -0000	1.48
@@ -1 +1 @@
-fontconfig-2.7.3.tar.gz
+fontconfig-2.8.0.tar.gz



From dwayne at fedoraproject.org  Thu Dec  3 20:51:15 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu,  3 Dec 2009 20:51:15 +0000 (UTC)
Subject: rpms/virtaal/F-12 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 virtaal.spec, 1.15,
	1.16 virtaal-0.5.0-msgfmt_compile_fixes.patch, 1.1, NONE
Message-ID: <20091203205115.1D10311C00EE@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12732

Modified Files:
	.cvsignore sources virtaal.spec 
Removed Files:
	virtaal-0.5.0-msgfmt_compile_fixes.patch 
Log Message:
* Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
- Update to 0.5.0 final
   - Correctly support Open-Tran for languages with regional modifiers
   - Web requests now accept compressed responses if the server offers it
   - New translations: Ukrainian.
   - Various bug fixes
- Drop Korean translation fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Nov 2009 13:13:41 -0000	1.12
+++ .cvsignore	3 Dec 2009 20:51:14 -0000	1.13
@@ -1 +1 @@
-virtaal-0.5.0-rc1.tar.bz2
+virtaal-0.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Nov 2009 13:13:41 -0000	1.12
+++ sources	3 Dec 2009 20:51:14 -0000	1.13
@@ -1 +1 @@
-20dda64495a8cfbd0b581cebff83d4d8  virtaal-0.5.0-rc1.tar.bz2
+36d6fd363f6e46ec949c3b5dbd268e66  virtaal-0.5.0.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/virtaal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- virtaal.spec	2 Dec 2009 05:06:09 -0000	1.15
+++ virtaal.spec	3 Dec 2009 20:51:15 -0000	1.16
@@ -2,19 +2,17 @@
 
 Name:           virtaal
 Version:        0.5.0
-Release:        0.2.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
-#Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
-Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}-rc1.tar.bz2
+Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.5.0-setup_drop_MO_generation.patch
 Patch1:         virtaal-0.3.0-autocorr_shared_location.patch
-Patch2:         virtaal-0.5.0-msgfmt_compile_fixes.patch
 
 BuildArch:      noarch
 BuildRequires:  python
@@ -67,17 +65,16 @@ Placeholders such as variables, abbrevia
 punctutions are highlighted for easy insertion into the translations.
 
 Virtaal is able to edit any of the following formats: XLIFF, Gettext PO and 
-.mo, Qt .ts, .qph and .qm, Wordfast TM, TMX and TBX. The Translate Toolkit 
-converters allow translators to edit: OpenDocument Format (ODF), 
-OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla DTD files,
-subtitles, and other formats.
+.mo, Qt .ts, .qph and .qm, Wordfast TM, TMX, OmegaT glossaries and TBX. The 
+Translate Toolkit converters allow translators to edit: OpenDocument 
+Format (ODF), OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla 
+DTD files, subtitles, and other formats.
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
-%patch2 -p1 -b .msgfmt_compile_fixes
 
 %build
 %{__python} setup.py build
@@ -163,6 +160,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
+- Update to 0.5.0 final
+   - Correctly support Open-Tran for languages with regional modifiers
+   - Web requests now accept compressed responses if the server offers it
+   - New translations: Ukrainian.
+   - Various bug fixes
+- Drop Korean translation fix
+
 * Wed Dec 2 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.2.rc1
 - Fix typo in postun
 


--- virtaal-0.5.0-msgfmt_compile_fixes.patch DELETED ---



From behdad at fedoraproject.org  Thu Dec  3 20:51:28 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 20:51:28 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.47, 1.48 fontconfig.spec, 1.139,
	1.140 sources, 1.51, 1.52
Message-ID: <20091203205128.65D6E11C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12895

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
2.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	8 Sep 2009 15:55:22 -0000	1.47
+++ .cvsignore	3 Dec 2009 20:51:28 -0000	1.48
@@ -1 +1 @@
-fontconfig-2.7.3.tar.gz
+fontconfig-2.8.0.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- fontconfig.spec	8 Sep 2009 15:55:22 -0000	1.139
+++ fontconfig.spec	3 Dec 2009 20:51:28 -0000	1.140
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.7.3
+Version: 2.8.0
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -131,6 +131,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.8.0-1
+- Update to 2.8.0
+
 * Tue Sep  8 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.3-1
 - Update to 2.7.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	8 Sep 2009 15:55:23 -0000	1.51
+++ sources	3 Dec 2009 20:51:28 -0000	1.52
@@ -1 +1 @@
-747d2c691c66b563c8e8c1784ce8d014  fontconfig-2.7.3.tar.gz
+77e15a92006ddc2adbb06f840d591c0e  fontconfig-2.8.0.tar.gz



From caolanm at fedoraproject.org  Thu Dec  3 20:51:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  3 Dec 2009 20:51:42 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.236,
	1.237 openoffice.org.spec, 1.2094, 1.2095 sources, 1.383, 1.384
Message-ID: <20091203205142.6FF5711C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13090

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
latest milestone


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- .cvsignore	26 Nov 2009 15:53:40 -0000	1.236
+++ .cvsignore	3 Dec 2009 20:51:41 -0000	1.237
@@ -7,4 +7,4 @@ redhat-registry.tar.gz
 redhat-langpacks.tar.gz
 openoffice.org-javafilter.desktop
 acor_ga-IE.dat
-OOO320_m6.tar.bz2
+OOO320_m7.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2094
retrieving revision 1.2095
diff -u -p -r1.2094 -r1.2095
--- openoffice.org.spec	3 Dec 2009 15:09:40 -0000	1.2094
+++ openoffice.org.spec	3 Dec 2009 20:51:42 -0000	1.2095
@@ -1,6 +1,6 @@
 %define oootag OOO320
-%define ooomilestone 6
-%define rh_rpm_release 4
+%define ooomilestone 7
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4160,6 +4160,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.1
+- latest milestone
+
 * Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-6.4
 - Resolves: rhbz#543934 drop "kid" pseudo-translations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- sources	26 Nov 2009 15:53:40 -0000	1.383
+++ sources	3 Dec 2009 20:51:42 -0000	1.384
@@ -7,4 +7,4 @@ ffa417a9556cdb16028c83718d758bc7  redhat
 39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 ef64057ee7e48ca472e80dd87f3dd426  acor_ga-IE.dat
-ce4e5be022b4c93b86c45c2cad374733  OOO320_m6.tar.bz2
+c8304a4d0d4f0add0d1df87edba7a88d  OOO320_m7.tar.bz2



From stevetraylen at fedoraproject.org  Thu Dec  3 20:52:15 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu,  3 Dec 2009 20:52:15 +0000 (UTC)
Subject: File xmltooling-1.3.3.tar.gz uploaded to lookaside cache by
	stevetraylen
Message-ID: <20091203205215.C219F10F894@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xmltooling:

3074edc8a00bba1d26c02e798ea8039c  xmltooling-1.3.3.tar.gz



From dwayne at fedoraproject.org  Thu Dec  3 20:52:13 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu,  3 Dec 2009 20:52:13 +0000 (UTC)
Subject: rpms/virtaal/F-11 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 virtaal.spec, 1.13,
	1.14 virtaal-0.5.0-msgfmt_compile_fixes.patch, 1.1, NONE
Message-ID: <20091203205213.0276A11C00EE@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13163

Modified Files:
	.cvsignore sources virtaal.spec 
Removed Files:
	virtaal-0.5.0-msgfmt_compile_fixes.patch 
Log Message:
* Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
- Update to 0.5.0 final
   - Correctly support Open-Tran for languages with regional modifiers
   - Web requests now accept compressed responses if the server offers it
   - New translations: Ukrainian.
   - Various bug fixes
- Drop Korean translation fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Nov 2009 13:44:01 -0000	1.12
+++ .cvsignore	3 Dec 2009 20:52:12 -0000	1.13
@@ -1 +1 @@
-virtaal-0.5.0-rc1.tar.bz2
+virtaal-0.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Nov 2009 13:44:01 -0000	1.12
+++ sources	3 Dec 2009 20:52:12 -0000	1.13
@@ -1 +1 @@
-20dda64495a8cfbd0b581cebff83d4d8  virtaal-0.5.0-rc1.tar.bz2
+36d6fd363f6e46ec949c3b5dbd268e66  virtaal-0.5.0.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/virtaal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- virtaal.spec	27 Nov 2009 13:44:02 -0000	1.13
+++ virtaal.spec	3 Dec 2009 20:52:12 -0000	1.14
@@ -2,19 +2,17 @@
 
 Name:           virtaal
 Version:        0.5.0
-Release:        0.1.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
-#Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
-Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}-rc1.tar.bz2
+Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.5.0-setup_drop_MO_generation.patch
 Patch1:         virtaal-0.3.0-autocorr_shared_location.patch
-Patch2:         virtaal-0.5.0-msgfmt_compile_fixes.patch
 
 BuildArch:      noarch
 BuildRequires:  python
@@ -67,17 +65,16 @@ Placeholders such as variables, abbrevia
 punctutions are highlighted for easy insertion into the translations.
 
 Virtaal is able to edit any of the following formats: XLIFF, Gettext PO and 
-.mo, Qt .ts, .qph and .qm, Wordfast TM, TMX and TBX. The Translate Toolkit 
-converters allow translators to edit: OpenDocument Format (ODF), 
-OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla DTD files,
-subtitles, and other formats.
+.mo, Qt .ts, .qph and .qm, Wordfast TM, TMX, OmegaT glossaries and TBX. The 
+Translate Toolkit converters allow translators to edit: OpenDocument 
+Format (ODF), OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla 
+DTD files, subtitles, and other formats.
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
-%patch2 -p1 -b .msgfmt_compile_fixes
 
 %build
 %{__python} setup.py build
@@ -162,6 +159,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
+- Update to 0.5.0 final
+   - Correctly support Open-Tran for languages with regional modifiers
+   - Web requests now accept compressed responses if the server offers it
+   - New translations: Ukrainian.
+   - Various bug fixes
+- Drop Korean translation fix
+
 * Fri Nov 27 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-0.1.rc1
 - Update to 0.5.0 rc1
    - Autoterm: Virtaal can now automatically download terminology files


--- virtaal-0.5.0-msgfmt_compile_fixes.patch DELETED ---



From clumens at fedoraproject.org  Thu Dec  3 21:09:01 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu,  3 Dec 2009 21:09:01 +0000 (UTC)
Subject: File pykickstart-1.67.tar.gz uploaded to lookaside cache by clumens
Message-ID: <20091203210901.922AE10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pykickstart:

87a99c5e47f2290a6d500dc823e57f33  pykickstart-1.67.tar.gz



From clumens at fedoraproject.org  Thu Dec  3 21:09:23 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu,  3 Dec 2009 21:09:23 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.119, 1.120 pykickstart.spec,
	1.130, 1.131 sources, 1.129, 1.130
Message-ID: <20091203210923.4B03A11C00EE@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18523

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- .cvsignore	25 Nov 2009 11:55:32 -0000	1.119
+++ .cvsignore	3 Dec 2009 21:09:22 -0000	1.120
@@ -53,3 +53,4 @@ pykickstart-1.63.tar.gz
 pykickstart-1.64.tar.gz
 pykickstart-1.65.tar.gz
 pykickstart-1.66.tar.gz
+pykickstart-1.67.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- pykickstart.spec	25 Nov 2009 11:55:32 -0000	1.130
+++ pykickstart.spec	3 Dec 2009 21:09:22 -0000	1.131
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.66
+Version: 1.67
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -45,6 +45,13 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
+* Thu Dec 03 2009 Chris Lumens <clumens at redhat.com> - 1.67-1
+- Don't use action="append_const" in firewall.py.
+- Make "make archive" depend on test and check passing again.
+- versionToString now works in all cases we test for.
+- Fix the few pychecker errors outstanding in options.py.
+- Fix make docs to make docs dir before trying to download files there (hdegoede)
+
 * Wed Nov 25 2009 Hans de Goede <hdgoede at redhat.com> - 1.66-1
 - Add --dcb option to fcoe command (#513011)
 - Remove rhpl from tests


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- sources	25 Nov 2009 11:55:32 -0000	1.129
+++ sources	3 Dec 2009 21:09:22 -0000	1.130
@@ -1 +1 @@
-91b989dc8781a15825f005fb8efabf56  pykickstart-1.66.tar.gz
+87a99c5e47f2290a6d500dc823e57f33  pykickstart-1.67.tar.gz



From wtogami at fedoraproject.org  Thu Dec  3 21:09:51 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  3 Dec 2009 21:09:51 +0000 (UTC)
Subject: File Mail-SpamAssassin-3.3.0-beta1.tar.bz2 uploaded to lookaside
	cache by wtogami
Message-ID: <20091203210951.F28F210F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for spamassassin:

9b39e4e4fad09cfe9eff974f3d5a01ea  Mail-SpamAssassin-3.3.0-beta1.tar.bz2



From wtogami at fedoraproject.org  Thu Dec  3 21:09:53 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  3 Dec 2009 21:09:53 +0000 (UTC)
Subject: File Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz uploaded to
	lookaside cache by wtogami
Message-ID: <20091203210953.C06C610F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for spamassassin:

cbd092c4e0e71b531f7aca81d4eb2781  Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz



From behdad at fedoraproject.org  Thu Dec  3 21:10:42 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 21:10:42 +0000 (UTC)
Subject: File pango-1.26.1.tar.bz2 uploaded to lookaside cache by behdad
Message-ID: <20091203211042.EBDE510F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pango:

2cbc1f26639e335905f7d31c0da53fce  pango-1.26.1.tar.bz2



From behdad at fedoraproject.org  Thu Dec  3 21:12:00 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 21:12:00 +0000 (UTC)
Subject: rpms/pango/F-12 .cvsignore, 1.97, 1.98 pango.spec, 1.179,
	1.180 sources, 1.98, 1.99
Message-ID: <20091203211200.8F5F011C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19467

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/F-12/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- .cvsignore	21 Sep 2009 21:26:25 -0000	1.97
+++ .cvsignore	3 Dec 2009 21:12:00 -0000	1.98
@@ -1 +1 @@
-pango-1.26.0.tar.bz2
+pango-1.26.1.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/F-12/pango.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- pango.spec	21 Sep 2009 21:26:25 -0000	1.179
+++ pango.spec	3 Dec 2009 21:12:00 -0000	1.180
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.26.0
+Version: 1.26.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.26.1-1
+- 1.26.1
+
 * Mon Sep 21 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.26.0-1
 - 1.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/F-12/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- sources	21 Sep 2009 21:26:25 -0000	1.98
+++ sources	3 Dec 2009 21:12:00 -0000	1.99
@@ -1 +1 @@
-74ce18cfcc3ad0008a6ad56cfc535061  pango-1.26.0.tar.bz2
+2cbc1f26639e335905f7d31c0da53fce  pango-1.26.1.tar.bz2



From behdad at fedoraproject.org  Thu Dec  3 21:12:37 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 21:12:37 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.97, 1.98 pango.spec, 1.179,
	1.180 sources, 1.98, 1.99
Message-ID: <20091203211237.160DA11C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19752

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.26.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- .cvsignore	21 Sep 2009 21:26:25 -0000	1.97
+++ .cvsignore	3 Dec 2009 21:12:36 -0000	1.98
@@ -1 +1 @@
-pango-1.26.0.tar.bz2
+pango-1.26.1.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- pango.spec	21 Sep 2009 21:26:25 -0000	1.179
+++ pango.spec	3 Dec 2009 21:12:36 -0000	1.180
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.26.0
+Version: 1.26.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.26.1-1
+- 1.26.1
+
 * Mon Sep 21 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.26.0-1
 - 1.26.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- sources	21 Sep 2009 21:26:25 -0000	1.98
+++ sources	3 Dec 2009 21:12:36 -0000	1.99
@@ -1 +1 @@
-74ce18cfcc3ad0008a6ad56cfc535061  pango-1.26.0.tar.bz2
+2cbc1f26639e335905f7d31c0da53fce  pango-1.26.1.tar.bz2



From behdad at fedoraproject.org  Thu Dec  3 21:13:20 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 21:13:20 +0000 (UTC)
Subject: File vte-0.22.5.tar.bz2 uploaded to lookaside cache by behdad
Message-ID: <20091203211320.1CAC010F896@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for vte:

cbb17696e40ee175977bf165ef838da2  vte-0.22.5.tar.bz2



From wtogami at fedoraproject.org  Thu Dec  3 21:13:34 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  3 Dec 2009 21:13:34 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore, 1.54, 1.55 sources, 1.53,
	1.54 spamassassin.spec, 1.134, 1.135
Message-ID: <20091203211334.512EF11C00EE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20250

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
3.3.0-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	20 Nov 2009 20:00:19 -0000	1.54
+++ .cvsignore	3 Dec 2009 21:13:34 -0000	1.55
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
-Mail-SpamAssassin-3.3.0-svn882672.tar.bz2
+Mail-SpamAssassin-3.3.0-beta1.tar.bz2
+Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	20 Nov 2009 20:00:19 -0000	1.53
+++ sources	3 Dec 2009 21:13:34 -0000	1.54
@@ -1,2 +1,2 @@
-daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
-45c4c96e709d38c19b666a55ebfa8007  Mail-SpamAssassin-3.3.0-svn882672.tar.bz2
+9b39e4e4fad09cfe9eff974f3d5a01ea  Mail-SpamAssassin-3.3.0-beta1.tar.bz2
+cbd092c4e0e71b531f7aca81d4eb2781  Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- spamassassin.spec	20 Nov 2009 19:28:05 -0000	1.134
+++ spamassassin.spec	3 Dec 2009 21:13:34 -0000	1.135
@@ -1,6 +1,8 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
 #%%define rhel 4
 
+#%define _source_filedigest_algorithm md5
+
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
 %{?!fedora:%define fedora 0}
@@ -41,13 +43,13 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename svn882672
-Release: 0.20.%{prename}%{?dist}
+%define prename beta1
+Release: 0.21.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
+Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -244,6 +246,9 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 03 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.21.beta1
+- 3.3.0-beta1
+
 * Fri Nov 20 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.20.svn882672
 - svn882672 snapshot
 



From behdad at fedoraproject.org  Thu Dec  3 21:13:58 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 21:13:58 +0000 (UTC)
Subject: rpms/vte/F-12 .cvsignore, 1.89, 1.90 sources, 1.91, 1.92 vte.spec, 
	1.165, 1.166
Message-ID: <20091203211358.97DEC11C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20454

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.22.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-12/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	28 Sep 2009 19:45:24 -0000	1.89
+++ .cvsignore	3 Dec 2009 21:13:58 -0000	1.90
@@ -1 +1 @@
-vte-0.22.2.tar.bz2
+vte-0.22.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-12/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	28 Sep 2009 19:45:24 -0000	1.91
+++ sources	3 Dec 2009 21:13:58 -0000	1.92
@@ -1 +1 @@
-c278925fd7da427998c506d5ba99478e  vte-0.22.2.tar.bz2
+cbb17696e40ee175977bf165ef838da2  vte-0.22.5.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-12/vte.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- vte.spec	28 Sep 2009 19:45:24 -0000	1.165
+++ vte.spec	3 Dec 2009 21:13:58 -0000	1.166
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.22.2
+Version: 0.22.5
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.5-1
+- Update to 0.22.5
+
 * Mon Sep 28 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.2-1
 - Update to 0.22.2
 



From wtogami at fedoraproject.org  Thu Dec  3 21:14:48 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  3 Dec 2009 21:14:48 +0000 (UTC)
Subject: rpms/spamassassin/F-12 .cvsignore, 1.52, 1.53 sources, 1.51,
	1.52 spamassassin.spec, 1.131, 1.132
Message-ID: <20091203211448.274F411C00EE@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20801

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
3.3.0-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	18 Sep 2009 01:34:07 -0000	1.52
+++ .cvsignore	3 Dec 2009 21:14:47 -0000	1.53
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
-Mail-SpamAssassin-3.3.0-svn816416.tar.bz2
+Mail-SpamAssassin-3.3.0-beta1.tar.bz2
+Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	18 Sep 2009 01:34:07 -0000	1.51
+++ sources	3 Dec 2009 21:14:48 -0000	1.52
@@ -1,2 +1,2 @@
-daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
-bc788059349e11bb5875e8c73602cb63  Mail-SpamAssassin-3.3.0-svn816416.tar.bz2
+9b39e4e4fad09cfe9eff974f3d5a01ea  Mail-SpamAssassin-3.3.0-beta1.tar.bz2
+cbd092c4e0e71b531f7aca81d4eb2781  Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/spamassassin.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- spamassassin.spec	25 Sep 2009 04:15:56 -0000	1.131
+++ spamassassin.spec	3 Dec 2009 21:14:48 -0000	1.132
@@ -1,6 +1,8 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
 #%%define rhel 4
 
+#%define _source_filedigest_algorithm md5
+
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
 %{?!fedora:%define fedora 0}
@@ -41,13 +43,13 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename svn816416
-Release: 0.18.%{prename}%{?dist}
+%define prename beta1
+Release: 0.21.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
+Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -80,6 +82,7 @@ Requires: perl(LWP::UserAgent)
 Requires: perl(Net::DNS)
 Requires: perl(Time::HiRes)
 Requires: perl(DB_File)
+Requires: perl(Encode::Detect)
 Requires: procmail
 Requires: gnupg
 
@@ -243,6 +246,15 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 03 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.21.beta1
+- 3.3.0-beta1
+
+* Fri Nov 20 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.20.svn882672
+- svn882672 snapshot
+
+* Thu Nov 12 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.19.svn816416
+- Encode::Detect is important to spamassassin
+
 * Thu Sep 24 2009 Warren Togami <wtogami at redhat.com> - 3.3.3-0.18.svn816416
 - Enable SOUGHT ruleset in nightly sa-update http://wiki.apache.org/spamassassin/SoughtRules
   You must enable the sa-update cron job manually in /etc/cron.d/sa-update



From emaldonado at fedoraproject.org  Thu Dec  3 21:15:23 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  3 Dec 2009 21:15:23 +0000 (UTC)
Subject: File nss-util-3.12.5.tar.bz2 uploaded to lookaside cache by
	emaldonado
Message-ID: <20091203211523.C88A910F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nss-util:

00e44ffb9e3338233bca14d690c176c7  nss-util-3.12.5.tar.bz2



From behdad at fedoraproject.org  Thu Dec  3 21:17:38 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 21:17:38 +0000 (UTC)
Subject: File vte-0.23.1.tar.bz2 uploaded to lookaside cache by behdad
Message-ID: <20091203211738.E981910F894@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for vte:

b7c76fe2435e717b03e1564b868b1238  vte-0.23.1.tar.bz2



From behdad at fedoraproject.org  Thu Dec  3 21:20:01 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 21:20:01 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.89, 1.90 sources, 1.91, 1.92 vte.spec, 
	1.165, 1.166
Message-ID: <20091203212001.D9DF711C03A3@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22426

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.23.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	28 Sep 2009 19:45:24 -0000	1.89
+++ .cvsignore	3 Dec 2009 21:20:01 -0000	1.90
@@ -1 +1 @@
-vte-0.22.2.tar.bz2
+vte-0.23.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	28 Sep 2009 19:45:24 -0000	1.91
+++ sources	3 Dec 2009 21:20:01 -0000	1.92
@@ -1 +1 @@
-c278925fd7da427998c506d5ba99478e  vte-0.22.2.tar.bz2
+b7c76fe2435e717b03e1564b868b1238  vte-0.23.1.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- vte.spec	28 Sep 2009 19:45:24 -0000	1.165
+++ vte.spec	3 Dec 2009 21:20:01 -0000	1.166
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.22.2
+Version: 0.23.1
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Wed Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 0.23.1-1
+- Update to 0.23.1
+
 * Mon Sep 28 2009 Behdad Esfahbod <behdad at redhat.com> 0.22.2-1
 - Update to 0.22.2
 



From emaldonado at fedoraproject.org  Thu Dec  3 21:20:06 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  3 Dec 2009 21:20:06 +0000 (UTC)
Subject: rpms/nss-util/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 nss-util.spec, 1.18, 1.19
Message-ID: <20091203212006.6292A11C03A3@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22514

Modified Files:
	.cvsignore sources nss-util.spec 
Log Message:
Update to 3.12.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Sep 2009 21:35:48 -0000	1.3
+++ .cvsignore	3 Dec 2009 21:20:06 -0000	1.4
@@ -1 +1 @@
-nss-util-3.12.4.tar.bz2
+nss-util-3.12.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Sep 2009 21:35:27 -0000	1.3
+++ sources	3 Dec 2009 21:20:06 -0000	1.4
@@ -1 +1 @@
-f7b73ca36d53c74191f8794fa1a99d1d  nss-util-3.12.4.tar.bz2
+00e44ffb9e3338233bca14d690c176c7  nss-util-3.12.5.tar.bz2


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nss-util.spec	11 Sep 2009 00:05:55 -0000	1.18
+++ nss-util.spec	3 Dec 2009 21:20:06 -0000	1.19
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.4
-Release:          8%{?dist}
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -200,6 +200,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1
+- Update to 3.12.5
+
 * Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-8
 - Retagging for a chained build with nss-softokn and nss
 



From emaldonado at fedoraproject.org  Thu Dec  3 21:30:07 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  3 Dec 2009 21:30:07 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.28,1.29
Message-ID: <20091203213007.E47F111C03F6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25588

Modified Files:
	nss-softokn.spec 
Log Message:
Require nss-util 3.12.5


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nss-softokn.spec	24 Nov 2009 20:25:07 -0000	1.28
+++ nss-softokn.spec	3 Dec 2009 21:30:07 -0000	1.29
@@ -1,6 +1,7 @@
 %global nspr_version 4.8
 %global nss_name nss
-%global nss_util_version 3.12.4
+%global nss_softokn_fips_version 3.12.4
+%global nss_util_version 3.12.5
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 
@@ -17,7 +18,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          11%{?dist}
+Release:          12%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -311,6 +312,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-12
+- Require nss-util 3.12.5
+
 * Fri Nov 20 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-11
 - export freebl devel tools (#538226)
 



From pkgdb at fedoraproject.org  Thu Dec  3 21:31:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 21:31:36 +0000
Subject: [pkgdb] spamassassin: nb has given up watchbugzilla
Message-ID: <20091203213137.65DA210F896@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on spamassassin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Thu Dec  3 21:31:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 21:31:39 +0000
Subject: [pkgdb] spamassassin: nb has given up watchcommits
Message-ID: <20091203213139.CF2F210F89E@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on spamassassin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Thu Dec  3 21:31:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 21:31:48 +0000
Subject: [pkgdb] spamassassin: nb has given up watchbugzilla
Message-ID: <20091203213150.12DE910F891@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on spamassassin (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Thu Dec  3 21:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 21:31:50 +0000
Subject: [pkgdb] spamassassin: nb has given up watchcommits
Message-ID: <20091203213150.DC07710F8A4@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on spamassassin (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Thu Dec  3 21:32:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 21:32:01 +0000
Subject: [pkgdb] spamassassin: nb has given up watchbugzilla
Message-ID: <20091203213202.004E210F89D@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on spamassassin (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Thu Dec  3 21:32:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 21:32:04 +0000
Subject: [pkgdb] spamassassin: nb has given up watchcommits
Message-ID: <20091203213204.AA7D210F8A9@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on spamassassin (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pbrobinson at fedoraproject.org  Thu Dec  3 21:34:41 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 21:34:41 +0000 (UTC)
Subject: rpms/libgee/F-12 libgee-0.5.0-notest.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 libgee.spec, 1.10, 1.11 sources, 1.6,
	1.7 libgee-0.1.4-notest.diff, 1.1, NONE
Message-ID: <20091203213441.435F111C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libgee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27261

Modified Files:
	.cvsignore libgee.spec sources 
Added Files:
	libgee-0.5.0-notest.patch 
Removed Files:
	libgee-0.1.4-notest.diff 
Log Message:
- Update to 0.5.0

libgee-0.5.0-notest.patch:
 Makefile.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libgee-0.5.0-notest.patch ---
--- libgee-0.5.0/Makefile.in.notest	2009-09-28 14:21:10.000000000 -0400
+++ libgee-0.5.0/Makefile.in	2009-10-03 06:26:02.167603717 -0400
@@ -98,7 +98,7 @@
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = gee tests doc benchmark
+DIST_SUBDIRS = gee doc benchmark
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -274,7 +274,6 @@
 
 SUBDIRS = \
 	gee \
-	tests \
 	$(DOC_SUBDIR) \
 	$(BENCHMARK_SUBDIR) \
 	$(NULL)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgee/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Aug 2009 21:27:11 -0000	1.6
+++ .cvsignore	3 Dec 2009 21:34:40 -0000	1.7
@@ -1 +1 @@
-libgee-0.3.0.tar.bz2
+libgee-0.5.0.tar.bz2


Index: libgee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgee/F-12/libgee.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libgee.spec	20 Aug 2009 21:27:11 -0000	1.10
+++ libgee.spec	3 Dec 2009 21:34:41 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           libgee
-Version:        0.3.0
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        GObject collection library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/Libgee
-Source0:        http://download.gnome.org/sources/libgee/0.3/libgee-%{version}.tar.bz2
-Patch0:         libgee-0.1.4-notest.diff
+Source0:        http://download.gnome.org/sources/libgee/0.5/libgee-%{version}.tar.bz2
+Patch0:         libgee-0.5.0-notest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct  3 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.3.0-1
 - Update to 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgee/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Aug 2009 21:27:11 -0000	1.6
+++ sources	3 Dec 2009 21:34:41 -0000	1.7
@@ -1 +1 @@
-1ca2b8a87950ef1b14342fb32db3e558  libgee-0.3.0.tar.bz2
+45e3e069dc3488e4bfe0c8411b85b987  libgee-0.5.0.tar.bz2


--- libgee-0.1.4-notest.diff DELETED ---



From jdennis at fedoraproject.org  Thu Dec  3 21:44:54 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Thu,  3 Dec 2009 21:44:54 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius-radiusd-init, 1.1,
	1.2 freeradius.spec, 1.87, 1.88
Message-ID: <20091203214454.84DF211C00EE@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30354

Modified Files:
	freeradius-radiusd-init freeradius.spec 
Log Message:
resolves: bug #522111 non-conformant initscript
also change permission of /var/run/radiusd from 0700 to 0755
so that "service radiusd status" can be run as non-root



Index: freeradius-radiusd-init
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-radiusd-init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freeradius-radiusd-init	29 Feb 2008 18:18:34 -0000	1.1
+++ freeradius-radiusd-init	3 Dec 2009 21:44:54 -0000	1.2
@@ -1,80 +1,110 @@
 #!/bin/sh
 #
-# chkconfig: - 88 10
-# description: Start/Stop the RADIUS server daemon
-#
-#    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
-#
-#    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
+# radiusd Start/Stop the FreeRADIUS daemon
 #
+# chkconfig: - 88 10
+# description: Extensible, configurable, high performance RADIUS server.
+
+### BEGIN INIT INFO
+# Provides: radiusd
+# Required-Start: $network
+# Required-Stop:
+# Should-Start: $time $syslog mysql ldap postgresql samba krb5-kdc
+# Should-Stop:
+# Short-Description: FreeRADIUS server
+# Description: Extensible, configurable, high performance RADIUS server.
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-RADIUSD=/usr/sbin/radiusd
-LOCKF=/var/lock/subsys/radiusd
-CONFIG=/etc/raddb/radiusd.conf
-
-[ -f $RADIUSD ] || exit 0
-[ -f $CONFIG ] || exit 0
+initname=${0##*/}
+prog=radiusd
+exec=/usr/sbin/$prog
+config=/etc/raddb/radiusd.conf
+pidfile=/var/run/$prog/$prog.pid
+lockfile=/var/lock/subsys/$initname
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+start() {
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon --pidfile $pidfile $exec
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
+}
+
+stop() {
+    echo -n $"Stopping $prog: "
+    killproc -p $pidfile $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    # radiusd may not be capable of a 100% configuration reload depending
+    # on which loadable modules are in use, if sending the server a
+    # HUP is not sufficient then use restart here instead. However, we
+    # prefer by default to use HUP since it's what is usually desired.
+    #    
+    # restart
+
+    kill -HUP `pidofproc -p $pidfile $prog`
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status -p $pidfile $prog
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
 
-RETVAL=0
 
 case "$1" in
-  start)
-	echo -n $"Starting RADIUS server: "
-	daemon $RADIUSD
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch $LOCKF &&
-	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
-	;;
-  stop)
-	echo -n $"Stopping RADIUS server: "
-	killproc $RADIUSD
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f $LOCKF
-	;;
-  status)
-	status radiusd
-	RETVAL=$?
-        ;;
-  reload)
-	echo -n $"Reloading RADIUS server: "
-	killproc $RADIUSD -HUP
-	RETVAL=$?
-	echo
-	;;
-  restart)
-	$0 stop
-	sleep 3
-	$0 start
-	RETVAL=$?
-	;;
-  condrestart)
-	if [ -f $LOCKF ]; then
-		$0 stop
-		sleep 3
-		$0 start
-		RETVAL=$?
-	fi
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
-	exit 1
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL
+exit $?


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- freeradius.spec	16 Sep 2009 12:21:41 -0000	1.87
+++ freeradius.spec	3 Dec 2009 21:44:54 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -15,6 +15,7 @@ Obsoletes: freeradius-dialupadmin >= 2.0
 Obsoletes: freeradius-dialupadmin-mysql >= 2.0 freeradius-dialupadmin-postgresql >= 2.0
 
 %define docdir %{_docdir}/freeradius-%{version}
+%define initddir %{?_initddir:%{_initddir}}%{!?_initddir:%{_initrddir}}
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -192,7 +193,8 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/var/run/radiusd
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{logrotate.d,pam.d,rc.d/init.d}
+mkdir -p $RPM_BUILD_ROOT/%{initddir}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{logrotate.d,pam.d}
 mkdir -p $RPM_BUILD_ROOT/var/lib/radiusd
 # fix for bad libtool bug - can not rebuild dependent libs and bins
 #FIXME export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}
@@ -206,7 +208,7 @@ perl -i -pe 's/^#group =.*$/group = radi
 mkdir -p $RPM_BUILD_ROOT/var/log/radius/radacct
 touch $RPM_BUILD_ROOT/var/log/radius/{radutmp,radius.log}
 
-install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{_initrddir}/radiusd
+install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{initddir}/radiusd
 install -m 644 %{SOURCE102} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/radiusd
 install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/radiusd
 
@@ -330,7 +332,7 @@ fi
 %doc %{docdir}/
 %config(noreplace) %{_sysconfdir}/pam.d/radiusd
 %config(noreplace) %{_sysconfdir}/logrotate.d/radiusd
-%config(noreplace) %{_initrddir}/radiusd
+%config(noreplace) %{initddir}/radiusd
 %dir %attr(755,radiusd,radiusd) /var/lib/radiusd
 # configs
 %dir %attr(755,root,radiusd) /etc/raddb
@@ -409,7 +411,7 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/sradutmp
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/unix
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/wimax
-%dir %attr(700,radiusd,radiusd) /var/run/radiusd/
+%dir %attr(755,radiusd,radiusd) /var/run/radiusd/
 # binaries
 %defattr(-,root,root)
 /usr/sbin/checkrad
@@ -621,6 +623,11 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Thu Dec  3 2009 John Dennis <jdennis at redhat.com> - 2.1.7-3
+- resolves: bug #522111 non-conformant initscript
+  also change permission of /var/run/radiusd from 0700 to 0755
+  so that "service radiusd status" can be run as non-root
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.7-2
 - use password-auth common PAM configuration instead of system-auth
 



From dwalsh at fedoraproject.org  Thu Dec  3 21:53:10 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  3 Dec 2009 21:53:10 +0000 (UTC)
Subject: File setroubleshoot-2.2.52.tar.gz uploaded to lookaside cache by
	dwalsh
Message-ID: <20091203215310.1583310F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for setroubleshoot:

e3c6b7be85740e3b54f59aef80ad9097  setroubleshoot-2.2.52.tar.gz



From dwalsh at fedoraproject.org  Thu Dec  3 21:54:35 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  3 Dec 2009 21:54:35 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.143,
	1.144 setroubleshoot.spec, 1.183, 1.184 sources, 1.156, 1.157
Message-ID: <20091203215435.3D25811C00EE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1141

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.52-1
- Fix ignore button
- Add delete button



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- .cvsignore	30 Nov 2009 16:00:43 -0000	1.143
+++ .cvsignore	3 Dec 2009 21:54:34 -0000	1.144
@@ -61,3 +61,4 @@ setroubleshoot-2.2.46.tar.gz
 setroubleshoot-2.2.47.tar.gz
 setroubleshoot-2.2.48.tar.gz
 setroubleshoot-2.2.50.tar.gz
+setroubleshoot-2.2.52.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- setroubleshoot.spec	30 Nov 2009 16:00:43 -0000	1.183
+++ setroubleshoot.spec	3 Dec 2009 21:54:34 -0000	1.184
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.50
+Version: 2.2.52
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,10 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.52-1
+- Fix ignore button
+- Add delete button
+
 * Mon Nov 30 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.50-1
 - Exit with error code if you run sealert as root and try to connect to session bus
 - Fix Crash when ino is not defined


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- sources	30 Nov 2009 16:00:43 -0000	1.156
+++ sources	3 Dec 2009 21:54:35 -0000	1.157
@@ -1 +1 @@
-59bd015bb5dea3b91085ca5c4a88bb3b  setroubleshoot-2.2.50.tar.gz
+e3c6b7be85740e3b54f59aef80ad9097  setroubleshoot-2.2.52.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 22:02:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:02:33 +0000
Subject: [pkgdb] dovecot: nb has given up watchbugzilla
Message-ID: <20091203220233.2E5C010F894@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on dovecot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Dec  3 22:02:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:02:35 +0000
Subject: [pkgdb] dovecot: nb has given up watchcommits
Message-ID: <20091203220235.DF04410F89D@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on dovecot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Dec  3 22:02:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:02:45 +0000
Subject: [pkgdb] dovecot: nb has given up watchbugzilla
Message-ID: <20091203220245.8168D10F8A1@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on dovecot (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Dec  3 22:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:02:47 +0000
Subject: [pkgdb] dovecot: nb has given up watchcommits
Message-ID: <20091203220247.E822A10F8A5@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on dovecot (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Dec  3 22:02:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:02:52 +0000
Subject: [pkgdb] dovecot: nb has given up watchcommits
Message-ID: <20091203220252.27F4E10F8AA@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on dovecot (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Dec  3 22:02:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:02:55 +0000
Subject: [pkgdb] dovecot: nb has given up watchbugzilla
Message-ID: <20091203220255.AA86910F8AD@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on dovecot (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Dec  3 22:03:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:03:31 +0000
Subject: [pkgdb] postfix: nb has given up watchbugzilla
Message-ID: <20091203220331.5B7FD10F8A1@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on postfix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postfix



From pkgdb at fedoraproject.org  Thu Dec  3 22:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:03:33 +0000
Subject: [pkgdb] postfix: nb has given up watchcommits
Message-ID: <20091203220334.1211A10F8A5@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on postfix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postfix



From pkgdb at fedoraproject.org  Thu Dec  3 22:03:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:03:44 +0000
Subject: [pkgdb] postfix: nb has given up watchbugzilla
Message-ID: <20091203220344.A783C10F8A9@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on postfix (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postfix



From pkgdb at fedoraproject.org  Thu Dec  3 22:03:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:03:47 +0000
Subject: [pkgdb] postfix: nb has given up watchcommits
Message-ID: <20091203220347.56A0610F8B0@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on postfix (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postfix



From pkgdb at fedoraproject.org  Thu Dec  3 22:03:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:03:51 +0000
Subject: [pkgdb] postfix: nb has given up watchbugzilla
Message-ID: <20091203220351.D298310F8B3@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on postfix (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postfix



From pkgdb at fedoraproject.org  Thu Dec  3 22:03:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:03:54 +0000
Subject: [pkgdb] postfix: nb has given up watchcommits
Message-ID: <20091203220354.ACD2110F89D@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on postfix (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postfix



From pkgdb at fedoraproject.org  Thu Dec  3 22:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:03:59 +0000
Subject: [pkgdb] postfix: nb has given up watchbugzilla
Message-ID: <20091203220359.DE83C10F8B8@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on postfix (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postfix



From pkgdb at fedoraproject.org  Thu Dec  3 22:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:04:03 +0000
Subject: [pkgdb] postfix: nb has given up watchcommits
Message-ID: <20091203220403.A808E10F8BB@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on postfix (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postfix



From dwalsh at fedoraproject.org  Thu Dec  3 22:04:25 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  3 Dec 2009 22:04:25 +0000 (UTC)
Subject: rpms/setroubleshoot/F-12 .cvsignore, 1.131,
	1.132 setroubleshoot.spec, 1.177, 1.178 sources, 1.150, 1.151
Message-ID: <20091203220426.0953F11C00EE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4400

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.52-1
- Fix ignore button
- Add delete button



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- .cvsignore	30 Nov 2009 16:02:07 -0000	1.131
+++ .cvsignore	3 Dec 2009 22:04:25 -0000	1.132
@@ -61,3 +61,4 @@ setroubleshoot-2.2.46.tar.gz
 setroubleshoot-2.2.47.tar.gz
 setroubleshoot-2.2.48.tar.gz
 setroubleshoot-2.2.50.tar.gz
+setroubleshoot-2.2.52.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/setroubleshoot.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- setroubleshoot.spec	30 Nov 2009 16:02:08 -0000	1.177
+++ setroubleshoot.spec	3 Dec 2009 22:04:25 -0000	1.178
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.50
+Version: 2.2.52
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,10 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.52-1
+- Fix ignore button
+- Add delete button
+
 * Mon Nov 30 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.50-1
 - Exit with error code if you run sealert as root and try to connect to session bus
 - Fix Crash when ino is not defined


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- sources	30 Nov 2009 16:02:08 -0000	1.150
+++ sources	3 Dec 2009 22:04:25 -0000	1.151
@@ -1 +1 @@
-59bd015bb5dea3b91085ca5c4a88bb3b  setroubleshoot-2.2.50.tar.gz
+e3c6b7be85740e3b54f59aef80ad9097  setroubleshoot-2.2.52.tar.gz



From robert at fedoraproject.org  Thu Dec  3 22:08:01 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  3 Dec 2009 22:08:01 +0000 (UTC)
Subject: File phpMyAdmin-3.2.4-all-languages.tar.bz2 uploaded to lookaside
	cache by robert
Message-ID: <20091203220801.363B710F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for phpMyAdmin:

b927655abd701d8e35079f9e5ec24ee2  phpMyAdmin-3.2.4-all-languages.tar.bz2



From nb at fedoraproject.org  Thu Dec  3 22:08:31 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu,  3 Dec 2009 22:08:31 +0000 (UTC)
Subject: File bad-behavior.2.0.32.zip uploaded to lookaside cache by nb
Message-ID: <20091203220831.B575010F895@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for wordpress-plugin-bad-behavior:

c050e3ba5a165c722c43f49b1071e307  bad-behavior.2.0.32.zip



From pkgdb at fedoraproject.org  Thu Dec  3 22:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:09:05 +0000
Subject: [pkgdb] maildrop: nb has given up watchcommits
Message-ID: <20091203220905.30AD710F894@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on maildrop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maildrop



From pkgdb at fedoraproject.org  Thu Dec  3 22:09:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:09:07 +0000
Subject: [pkgdb] maildrop: nb has given up watchbugzilla
Message-ID: <20091203220908.07CBA10F89C@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on maildrop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maildrop



From pkgdb at fedoraproject.org  Thu Dec  3 22:09:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:09:11 +0000
Subject: [pkgdb] maildrop: nb has given up watchcommits
Message-ID: <20091203220912.2E41210F8A4@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on maildrop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maildrop



From pkgdb at fedoraproject.org  Thu Dec  3 22:09:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:09:12 +0000
Subject: [pkgdb] maildrop: nb has given up watchbugzilla
Message-ID: <20091203220912.876A510F8A3@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on maildrop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maildrop



From pkgdb at fedoraproject.org  Thu Dec  3 22:09:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:09:13 +0000
Subject: [pkgdb] maildrop: nb has given up watchcommits
Message-ID: <20091203220913.D3A7810F8A9@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on maildrop (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maildrop



From pkgdb at fedoraproject.org  Thu Dec  3 22:09:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:09:14 +0000
Subject: [pkgdb] maildrop: nb has given up watchbugzilla
Message-ID: <20091203220914.81BE910F8AC@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on maildrop (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maildrop



From pkgdb at fedoraproject.org  Thu Dec  3 22:09:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:09:18 +0000
Subject: [pkgdb] maildrop: nb has given up watchcommits
Message-ID: <20091203220918.BE56E10F8AD@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on maildrop (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maildrop



From pkgdb at fedoraproject.org  Thu Dec  3 22:09:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:09:21 +0000
Subject: [pkgdb] maildrop: nb has given up watchbugzilla
Message-ID: <20091203220921.E473E10F8B1@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on maildrop (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maildrop



From robert at fedoraproject.org  Thu Dec  3 22:10:00 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  3 Dec 2009 22:10:00 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-10 phpMyAdmin-3.2.4-blowfish.patch, NONE,
	1.1 .cvsignore, 1.44, 1.45 phpMyAdmin-config.inc.php, 1.1,
	1.2 phpMyAdmin.spec, 1.48, 1.49 sources, 1.44, 1.45
Message-ID: <20091203221000.5FDFA11C00EE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6229/F-10

Modified Files:
	.cvsignore phpMyAdmin-config.inc.php phpMyAdmin.spec sources 
Added Files:
	phpMyAdmin-3.2.4-blowfish.patch 
Log Message:
Upstream released 3.2.4 (#540871, #540891)


phpMyAdmin-3.2.4-blowfish.patch:
 Documentation.html                 |    4 ++--
 libraries/auth/cookie.auth.lib.php |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE phpMyAdmin-3.2.4-blowfish.patch ---
Backport from upstream http://sourceforge.net/tracker/?func=detail&atid=377408&aid=2905629&group_id=23067,
will be included with phpMyAdmin 3.2.5.

--- phpMyAdmin-3.2.4-all-languages/Documentation.html				2009/11/23 17:45:37	13121
+++ phpMyAdmin-3.2.4-all-languages/Documentation.html.blowfish			2009/11/29 21:36:13	13139
@@ -626,8 +626,8 @@
         algorithm to encrypt the password.<br />
         If you are using the &quot;cookie&quot; auth_type, enter here a random
         passphrase of your choice. It will be used internally by the blowfish
-        algorithm: you won&#8217;t be prompted for this passphrase. The maximum
-        number of characters for this parameter seems to be 46.<br /><br />
+        algorithm: you won&#8217;t be prompted for this passphrase. There is
+        no maximum length for this secret.<br /><br />
         
         Since version 3.1.0 phpMyAdmin can generate this on the fly, but it
         makes a bit weaker security as this generated secret is stored in
--- phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php		2009/05/18 14:20:25	12438
+++ phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php.blowfish	2009/11/29 21:36:13	13139
@@ -95,11 +95,13 @@
 function PMA_get_blowfish_secret() {
     if (empty($GLOBALS['cfg']['blowfish_secret'])) {
         if (empty($_SESSION['auto_blowfish_secret'])) {
+            // this returns 23 characters 
             $_SESSION['auto_blowfish_secret'] = uniqid('', true);
         }
         return $_SESSION['auto_blowfish_secret'];
     } else {
-        return $GLOBALS['cfg']['blowfish_secret'];
+        // apply md5() to work around too long secrets (returns 32 characters)
+        return md5($GLOBALS['cfg']['blowfish_secret']);
     }
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	5 Nov 2009 20:04:13 -0000	1.44
+++ .cvsignore	3 Dec 2009 22:09:59 -0000	1.45
@@ -1 +1 @@
-phpMyAdmin-3.2.3-all-languages.tar.bz2
+phpMyAdmin-3.2.4-all-languages.tar.bz2


Index: phpMyAdmin-config.inc.php
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin-config.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- phpMyAdmin-config.inc.php	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin-config.inc.php	3 Dec 2009 22:10:00 -0000	1.2
@@ -1,5 +1,11 @@
 <?php
 
+/*
+ * This is needed for cookie based authentication to encrypt password in
+ * cookie
+ */
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+
 /**
  * Server(s) configuration
  */
@@ -24,8 +30,8 @@ $cfg['Servers'][$i]['controlpass']   = '
                                                     // The controluser is also
                                                     // used for all relational
                                                     // features (pmadb)
-$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (config, http or cookie based)?
-$cfg['Servers'][$i]['user']          = '';      // MySQL user
+$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['user']          = '';          // MySQL user
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                     // with 'config' auth_type)
 $cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- phpMyAdmin.spec	5 Nov 2009 20:04:14 -0000	1.48
+++ phpMyAdmin.spec	3 Dec 2009 22:10:00 -0000	1.49
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.3
+Version: 3.2.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -9,6 +9,7 @@ URL: http://www.phpmyadmin.net/	
 Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
+Patch0: phpMyAdmin-3.2.4-blowfish.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,6 +29,7 @@ is available in 50 languages
 
 %prep
 %setup -qn phpMyAdmin-%{version}-all-languages
+%patch0 -p1
 
 %install
 rm -rf %{buildroot}
@@ -55,6 +57,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Robert Scheck <robert at fedoraproject.org> 3.2.4-1
+- Upstream released 3.2.4 (#540871, #540891)
+
 * Thu Nov 05 2009 Robert Scheck <robert at fedoraproject.org> 3.2.3-1
 - Upstream released 3.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	5 Nov 2009 20:04:14 -0000	1.44
+++ sources	3 Dec 2009 22:10:00 -0000	1.45
@@ -1 +1 @@
-69fc1d7118f16ccd7ea6f7b330723684  phpMyAdmin-3.2.3-all-languages.tar.bz2
+b927655abd701d8e35079f9e5ec24ee2  phpMyAdmin-3.2.4-all-languages.tar.bz2



From robert at fedoraproject.org  Thu Dec  3 22:10:00 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  3 Dec 2009 22:10:00 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-11 phpMyAdmin-3.2.4-blowfish.patch, NONE,
	1.1 .cvsignore, 1.44, 1.45 phpMyAdmin-config.inc.php, 1.1,
	1.2 phpMyAdmin.spec, 1.49, 1.50 sources, 1.44, 1.45
Message-ID: <20091203221000.AAA1111C00EE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6229/F-11

Modified Files:
	.cvsignore phpMyAdmin-config.inc.php phpMyAdmin.spec sources 
Added Files:
	phpMyAdmin-3.2.4-blowfish.patch 
Log Message:
Upstream released 3.2.4 (#540871, #540891)


phpMyAdmin-3.2.4-blowfish.patch:
 Documentation.html                 |    4 ++--
 libraries/auth/cookie.auth.lib.php |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE phpMyAdmin-3.2.4-blowfish.patch ---
Backport from upstream http://sourceforge.net/tracker/?func=detail&atid=377408&aid=2905629&group_id=23067,
will be included with phpMyAdmin 3.2.5.

--- phpMyAdmin-3.2.4-all-languages/Documentation.html				2009/11/23 17:45:37	13121
+++ phpMyAdmin-3.2.4-all-languages/Documentation.html.blowfish			2009/11/29 21:36:13	13139
@@ -626,8 +626,8 @@
         algorithm to encrypt the password.<br />
         If you are using the &quot;cookie&quot; auth_type, enter here a random
         passphrase of your choice. It will be used internally by the blowfish
-        algorithm: you won&#8217;t be prompted for this passphrase. The maximum
-        number of characters for this parameter seems to be 46.<br /><br />
+        algorithm: you won&#8217;t be prompted for this passphrase. There is
+        no maximum length for this secret.<br /><br />
         
         Since version 3.1.0 phpMyAdmin can generate this on the fly, but it
         makes a bit weaker security as this generated secret is stored in
--- phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php		2009/05/18 14:20:25	12438
+++ phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php.blowfish	2009/11/29 21:36:13	13139
@@ -95,11 +95,13 @@
 function PMA_get_blowfish_secret() {
     if (empty($GLOBALS['cfg']['blowfish_secret'])) {
         if (empty($_SESSION['auto_blowfish_secret'])) {
+            // this returns 23 characters 
             $_SESSION['auto_blowfish_secret'] = uniqid('', true);
         }
         return $_SESSION['auto_blowfish_secret'];
     } else {
-        return $GLOBALS['cfg']['blowfish_secret'];
+        // apply md5() to work around too long secrets (returns 32 characters)
+        return md5($GLOBALS['cfg']['blowfish_secret']);
     }
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	5 Nov 2009 20:04:14 -0000	1.44
+++ .cvsignore	3 Dec 2009 22:10:00 -0000	1.45
@@ -1 +1 @@
-phpMyAdmin-3.2.3-all-languages.tar.bz2
+phpMyAdmin-3.2.4-all-languages.tar.bz2


Index: phpMyAdmin-config.inc.php
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/phpMyAdmin-config.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- phpMyAdmin-config.inc.php	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin-config.inc.php	3 Dec 2009 22:10:00 -0000	1.2
@@ -1,5 +1,11 @@
 <?php
 
+/*
+ * This is needed for cookie based authentication to encrypt password in
+ * cookie
+ */
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+
 /**
  * Server(s) configuration
  */
@@ -24,8 +30,8 @@ $cfg['Servers'][$i]['controlpass']   = '
                                                     // The controluser is also
                                                     // used for all relational
                                                     // features (pmadb)
-$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (config, http or cookie based)?
-$cfg['Servers'][$i]['user']          = '';      // MySQL user
+$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['user']          = '';          // MySQL user
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                     // with 'config' auth_type)
 $cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/phpMyAdmin.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- phpMyAdmin.spec	5 Nov 2009 20:04:14 -0000	1.49
+++ phpMyAdmin.spec	3 Dec 2009 22:10:00 -0000	1.50
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.3
+Version: 3.2.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -9,6 +9,7 @@ URL: http://www.phpmyadmin.net/	
 Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
+Patch0: phpMyAdmin-3.2.4-blowfish.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,6 +29,7 @@ is available in 50 languages
 
 %prep
 %setup -qn phpMyAdmin-%{version}-all-languages
+%patch0 -p1
 
 %install
 rm -rf %{buildroot}
@@ -55,6 +57,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Robert Scheck <robert at fedoraproject.org> 3.2.4-1
+- Upstream released 3.2.4 (#540871, #540891)
+
 * Thu Nov 05 2009 Robert Scheck <robert at fedoraproject.org> 3.2.3-1
 - Upstream released 3.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	5 Nov 2009 20:04:14 -0000	1.44
+++ sources	3 Dec 2009 22:10:00 -0000	1.45
@@ -1 +1 @@
-69fc1d7118f16ccd7ea6f7b330723684  phpMyAdmin-3.2.3-all-languages.tar.bz2
+b927655abd701d8e35079f9e5ec24ee2  phpMyAdmin-3.2.4-all-languages.tar.bz2



From robert at fedoraproject.org  Thu Dec  3 22:10:01 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  3 Dec 2009 22:10:01 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-12 phpMyAdmin-3.2.4-blowfish.patch, NONE,
	1.1 .cvsignore, 1.44, 1.45 phpMyAdmin-config.inc.php, 1.1,
	1.2 phpMyAdmin.spec, 1.50, 1.51 sources, 1.44, 1.45
Message-ID: <20091203221001.1CD2211C00EE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6229/F-12

Modified Files:
	.cvsignore phpMyAdmin-config.inc.php phpMyAdmin.spec sources 
Added Files:
	phpMyAdmin-3.2.4-blowfish.patch 
Log Message:
Upstream released 3.2.4 (#540871, #540891)


phpMyAdmin-3.2.4-blowfish.patch:
 Documentation.html                 |    4 ++--
 libraries/auth/cookie.auth.lib.php |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE phpMyAdmin-3.2.4-blowfish.patch ---
Backport from upstream http://sourceforge.net/tracker/?func=detail&atid=377408&aid=2905629&group_id=23067,
will be included with phpMyAdmin 3.2.5.

--- phpMyAdmin-3.2.4-all-languages/Documentation.html				2009/11/23 17:45:37	13121
+++ phpMyAdmin-3.2.4-all-languages/Documentation.html.blowfish			2009/11/29 21:36:13	13139
@@ -626,8 +626,8 @@
         algorithm to encrypt the password.<br />
         If you are using the &quot;cookie&quot; auth_type, enter here a random
         passphrase of your choice. It will be used internally by the blowfish
-        algorithm: you won&#8217;t be prompted for this passphrase. The maximum
-        number of characters for this parameter seems to be 46.<br /><br />
+        algorithm: you won&#8217;t be prompted for this passphrase. There is
+        no maximum length for this secret.<br /><br />
         
         Since version 3.1.0 phpMyAdmin can generate this on the fly, but it
         makes a bit weaker security as this generated secret is stored in
--- phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php		2009/05/18 14:20:25	12438
+++ phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php.blowfish	2009/11/29 21:36:13	13139
@@ -95,11 +95,13 @@
 function PMA_get_blowfish_secret() {
     if (empty($GLOBALS['cfg']['blowfish_secret'])) {
         if (empty($_SESSION['auto_blowfish_secret'])) {
+            // this returns 23 characters 
             $_SESSION['auto_blowfish_secret'] = uniqid('', true);
         }
         return $_SESSION['auto_blowfish_secret'];
     } else {
-        return $GLOBALS['cfg']['blowfish_secret'];
+        // apply md5() to work around too long secrets (returns 32 characters)
+        return md5($GLOBALS['cfg']['blowfish_secret']);
     }
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-12/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	5 Nov 2009 20:04:14 -0000	1.44
+++ .cvsignore	3 Dec 2009 22:10:00 -0000	1.45
@@ -1 +1 @@
-phpMyAdmin-3.2.3-all-languages.tar.bz2
+phpMyAdmin-3.2.4-all-languages.tar.bz2


Index: phpMyAdmin-config.inc.php
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-12/phpMyAdmin-config.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- phpMyAdmin-config.inc.php	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin-config.inc.php	3 Dec 2009 22:10:00 -0000	1.2
@@ -1,5 +1,11 @@
 <?php
 
+/*
+ * This is needed for cookie based authentication to encrypt password in
+ * cookie
+ */
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+
 /**
  * Server(s) configuration
  */
@@ -24,8 +30,8 @@ $cfg['Servers'][$i]['controlpass']   = '
                                                     // The controluser is also
                                                     // used for all relational
                                                     // features (pmadb)
-$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (config, http or cookie based)?
-$cfg['Servers'][$i]['user']          = '';      // MySQL user
+$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['user']          = '';          // MySQL user
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                     // with 'config' auth_type)
 $cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-12/phpMyAdmin.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- phpMyAdmin.spec	5 Nov 2009 20:04:14 -0000	1.50
+++ phpMyAdmin.spec	3 Dec 2009 22:10:00 -0000	1.51
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.3
+Version: 3.2.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -9,6 +9,7 @@ URL: http://www.phpmyadmin.net/	
 Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
+Patch0: phpMyAdmin-3.2.4-blowfish.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,6 +29,7 @@ is available in 50 languages
 
 %prep
 %setup -qn phpMyAdmin-%{version}-all-languages
+%patch0 -p1
 
 %install
 rm -rf %{buildroot}
@@ -55,6 +57,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Robert Scheck <robert at fedoraproject.org> 3.2.4-1
+- Upstream released 3.2.4 (#540871, #540891)
+
 * Thu Nov 05 2009 Robert Scheck <robert at fedoraproject.org> 3.2.3-1
 - Upstream released 3.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-12/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	5 Nov 2009 20:04:14 -0000	1.44
+++ sources	3 Dec 2009 22:10:00 -0000	1.45
@@ -1 +1 @@
-69fc1d7118f16ccd7ea6f7b330723684  phpMyAdmin-3.2.3-all-languages.tar.bz2
+b927655abd701d8e35079f9e5ec24ee2  phpMyAdmin-3.2.4-all-languages.tar.bz2



From robert at fedoraproject.org  Thu Dec  3 22:10:01 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu,  3 Dec 2009 22:10:01 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel phpMyAdmin-3.2.4-blowfish.patch, NONE,
	1.1 .cvsignore, 1.44, 1.45 phpMyAdmin-config.inc.php, 1.1,
	1.2 phpMyAdmin.spec, 1.50, 1.51 sources, 1.44, 1.45
Message-ID: <20091203221001.87C5511C00EE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6229/devel

Modified Files:
	.cvsignore phpMyAdmin-config.inc.php phpMyAdmin.spec sources 
Added Files:
	phpMyAdmin-3.2.4-blowfish.patch 
Log Message:
Upstream released 3.2.4 (#540871, #540891)


phpMyAdmin-3.2.4-blowfish.patch:
 Documentation.html                 |    4 ++--
 libraries/auth/cookie.auth.lib.php |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE phpMyAdmin-3.2.4-blowfish.patch ---
Backport from upstream http://sourceforge.net/tracker/?func=detail&atid=377408&aid=2905629&group_id=23067,
will be included with phpMyAdmin 3.2.5.

--- phpMyAdmin-3.2.4-all-languages/Documentation.html				2009/11/23 17:45:37	13121
+++ phpMyAdmin-3.2.4-all-languages/Documentation.html.blowfish			2009/11/29 21:36:13	13139
@@ -626,8 +626,8 @@
         algorithm to encrypt the password.<br />
         If you are using the &quot;cookie&quot; auth_type, enter here a random
         passphrase of your choice. It will be used internally by the blowfish
-        algorithm: you won&#8217;t be prompted for this passphrase. The maximum
-        number of characters for this parameter seems to be 46.<br /><br />
+        algorithm: you won&#8217;t be prompted for this passphrase. There is
+        no maximum length for this secret.<br /><br />
         
         Since version 3.1.0 phpMyAdmin can generate this on the fly, but it
         makes a bit weaker security as this generated secret is stored in
--- phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php		2009/05/18 14:20:25	12438
+++ phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php.blowfish	2009/11/29 21:36:13	13139
@@ -95,11 +95,13 @@
 function PMA_get_blowfish_secret() {
     if (empty($GLOBALS['cfg']['blowfish_secret'])) {
         if (empty($_SESSION['auto_blowfish_secret'])) {
+            // this returns 23 characters 
             $_SESSION['auto_blowfish_secret'] = uniqid('', true);
         }
         return $_SESSION['auto_blowfish_secret'];
     } else {
-        return $GLOBALS['cfg']['blowfish_secret'];
+        // apply md5() to work around too long secrets (returns 32 characters)
+        return md5($GLOBALS['cfg']['blowfish_secret']);
     }
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	5 Nov 2009 20:04:14 -0000	1.44
+++ .cvsignore	3 Dec 2009 22:10:01 -0000	1.45
@@ -1 +1 @@
-phpMyAdmin-3.2.3-all-languages.tar.bz2
+phpMyAdmin-3.2.4-all-languages.tar.bz2


Index: phpMyAdmin-config.inc.php
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin-config.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- phpMyAdmin-config.inc.php	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin-config.inc.php	3 Dec 2009 22:10:01 -0000	1.2
@@ -1,5 +1,11 @@
 <?php
 
+/*
+ * This is needed for cookie based authentication to encrypt password in
+ * cookie
+ */
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+
 /**
  * Server(s) configuration
  */
@@ -24,8 +30,8 @@ $cfg['Servers'][$i]['controlpass']   = '
                                                     // The controluser is also
                                                     // used for all relational
                                                     // features (pmadb)
-$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (config, http or cookie based)?
-$cfg['Servers'][$i]['user']          = '';      // MySQL user
+$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['user']          = '';          // MySQL user
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                     // with 'config' auth_type)
 $cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- phpMyAdmin.spec	5 Nov 2009 20:04:14 -0000	1.50
+++ phpMyAdmin.spec	3 Dec 2009 22:10:01 -0000	1.51
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.3
+Version: 3.2.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -9,6 +9,7 @@ URL: http://www.phpmyadmin.net/	
 Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
+Patch0: phpMyAdmin-3.2.4-blowfish.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,6 +29,7 @@ is available in 50 languages
 
 %prep
 %setup -qn phpMyAdmin-%{version}-all-languages
+%patch0 -p1
 
 %install
 rm -rf %{buildroot}
@@ -55,6 +57,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Dec 03 2009 Robert Scheck <robert at fedoraproject.org> 3.2.4-1
+- Upstream released 3.2.4 (#540871, #540891)
+
 * Thu Nov 05 2009 Robert Scheck <robert at fedoraproject.org> 3.2.3-1
 - Upstream released 3.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	5 Nov 2009 20:04:14 -0000	1.44
+++ sources	3 Dec 2009 22:10:01 -0000	1.45
@@ -1 +1 @@
-69fc1d7118f16ccd7ea6f7b330723684  phpMyAdmin-3.2.3-all-languages.tar.bz2
+b927655abd701d8e35079f9e5ec24ee2  phpMyAdmin-3.2.4-all-languages.tar.bz2



From emaldonado at fedoraproject.org  Thu Dec  3 22:10:12 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  3 Dec 2009 22:10:12 +0000 (UTC)
Subject: File nss-3.12.5-stripped.tar.bz2 uploaded to lookaside cache by
	emaldonado
Message-ID: <20091203221012.47B0A10F8A2@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nss:

51c5958153b6c01fada2e74cedc66835  nss-3.12.5-stripped.tar.bz2



From nb at fedoraproject.org  Thu Dec  3 22:10:24 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu,  3 Dec 2009 22:10:24 +0000 (UTC)
Subject: rpms/wordpress-plugin-bad-behavior/devel import.log, NONE,
	1.1 wordpress-plugin-bad-behavior.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091203221024.CA2C811C03F6@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/wordpress-plugin-bad-behavior/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6649/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log wordpress-plugin-bad-behavior.spec 
Log Message:
import wordpress-plugin-bad-behavior


--- NEW FILE import.log ---
wordpress-plugin-bad-behavior-2_0_32-2_fc12:HEAD:wordpress-plugin-bad-behavior-2.0.32-2.fc12.src.rpm:1259878071


--- NEW FILE wordpress-plugin-bad-behavior.spec ---
%global plugin_name bad-behavior
%global plugin_human_name Bad Behavior


Name:		wordpress-plugin-%{plugin_name}
Version:	2.0.32
Release:	2%{?dist}
Summary:	%{plugin_human_name} plugin for WordPress

Group:		Applications/Publishing
# According to http://plugins.trac.wordpress.org/ all plugins are licensed
# under the GPL unless otherwise stated in the plugin source.
License:	GPLv2+
URL:		http://www.bad-behavior.ioerror.us/
Source0:	http://downloads.wordpress.org/plugin/%{plugin_name}.%{version}.zip
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires:	wordpress
BuildArch:	noarch

%description
Bad Behavior is a PHP-based solution for blocking link spam and the robots
which deliver it.

Bad Behavior complements other link spam solutions by acting as a gatekeeper,
preventing spammers from ever delivering their junk, and in many cases, from
ever reading your site in the first place. This keeps your site's load down,
makes your site logs cleaner, and can help prevent denial of service conditions
caused by spammers.

Bad Behavior also transcends other link spam solutions by working in a
completely different, unique way. Instead of merely looking at the content of
potential spam, Bad Behavior analyzes the delivery method as well as the
software the spammer is using. In this way, Bad Behavior can stop spam attacks
even when nobody has ever seen the particular spam before.

Bad Behavior is designed to work alongside existing spam prevention services to
increase their effectiveness and efficiency. Whenever possible, you should run
it in combination with a more traditional spam prevention service.

This package is built for use with WordPress (wordpress), not WordPress MU. Use
wordpress-mu-plugin-%{plugin_name} for WordPress MU.


%package -n wordpress-mu-plugin-%{plugin_name}
Summary:	%{plugin_human_name} plugin for WordPress MU
Group:		Applications/Publishing
# According to http://plugins.trac.wordpress.org/ all plugins are licensed
# under the GPL unless otherwise stated in the plugin source.
License:	GPLv2+
Requires:	wordpress-mu
BuildArch:	noarch

%description -n wordpress-mu-plugin-%{plugin_name}
Bad Behavior is a PHP-based solution for blocking link spam and the robots
which deliver it.

Bad Behavior complements other link spam solutions by acting as a gatekeeper,
preventing spammers from ever delivering their junk, and in many cases, from
ever reading your site in the first place. This keeps your site's load down,
makes your site logs cleaner, and can help prevent denial of service conditions
caused by spammers.

Bad Behavior also transcends other link spam solutions by working in a
completely different, unique way. Instead of merely looking at the content of
potential spam, Bad Behavior analyzes the delivery method as well as the
software the spammer is using. In this way, Bad Behavior can stop spam attacks
even when nobody has ever seen the particular spam before.

Bad Behavior is designed to work alongside existing spam prevention services to
increase their effectiveness and efficiency. Whenever possible, you should run
it in combination with a more traditional spam prevention service.

This package is built for use with WordPress MU (wordpress-mu), not regular
WordPress. Use wordpress-plugin-%{plugin_name} for regular Wordpress.

%prep
%setup -q -c
echo 'To enable "%{plugin_human_name}", go to the administrative section
of your blog, "Plugins", and enable the plugin there.' > README.fedora
echo 'To allow users to enable "%{plugin_human_name}" for their blogs,
be sure to enable this plugin in the administrative control panel
for your website.' > README.fedora.mu


%build


%install
rm -rf %{buildroot}
# Pull doc files up so they aren't duplicated
mv %{plugin_name}/{COPYING,README.txt} .
# Trim some non-WordPress files we don't need
rm -f %{plugin_name}/bad-behavior-{lifetype,mediawiki}.php
mkdir -p %{buildroot}%{_datadir}/wordpress/wp-content/plugins/
cp -a %{plugin_name} %{buildroot}%{_datadir}/wordpress/wp-content/plugins/
mkdir -p %{buildroot}%{_datadir}/wordpress-mu/wp-content/plugins/
cp -a %{plugin_name} %{buildroot}%{_datadir}/wordpress-mu/wp-content/plugins/
# Note, no %find_lang since there are no language files


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README.txt README.fedora
%{_datadir}/wordpress/wp-content/plugins/%{plugin_name}


%files -n wordpress-mu-plugin-%{plugin_name}
%defattr(-,root,root,-)
%doc COPYING README.txt README.fedora.mu
%{_datadir}/wordpress-mu/wp-content/plugins/%{plugin_name}


%changelog
* Tue Nov 10 2009 Nick Bebout <nb at fedoraproject.org> 2.0.32-2
- Remove non-applicable comment about language files
* Mon Nov 9 2009 Nick Bebout <nb at fedoraproject.org> 2.0.32-1
- Fix packaging issues
* Wed Jul 15 2009 Michael Hampton <error at ioerror.us> 2.0.28
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-plugin-bad-behavior/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:56:19 -0000	1.1
+++ .cvsignore	3 Dec 2009 22:10:24 -0000	1.2
@@ -0,0 +1 @@
+bad-behavior.2.0.32.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-plugin-bad-behavior/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:56:19 -0000	1.1
+++ sources	3 Dec 2009 22:10:24 -0000	1.2
@@ -0,0 +1 @@
+c050e3ba5a165c722c43f49b1071e307  bad-behavior.2.0.32.zip



From emaldonado at fedoraproject.org  Thu Dec  3 22:13:39 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  3 Dec 2009 22:13:39 +0000 (UTC)
Subject: rpms/nss/devel sources, 1.29, 1.30 .cvsignore, 1.27, 1.28 nss.spec, 
	1.124, 1.125
Message-ID: <20091203221339.44B4C11C00EE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7972

Modified Files:
	sources .cvsignore nss.spec 
Log Message:
Update to 3.12.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	7 Sep 2009 19:16:20 -0000	1.29
+++ sources	3 Dec 2009 22:13:38 -0000	1.30
@@ -1,2 +1,2 @@
-954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2
+51c5958153b6c01fada2e74cedc66835  nss-3.12.5-stripped.tar.bz2
 895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	7 Sep 2009 19:16:35 -0000	1.27
+++ .cvsignore	3 Dec 2009 22:13:38 -0000	1.28
@@ -1,2 +1,2 @@
-nss-3.12.4-stripped.tar.bz2
+nss-3.12.5-stripped.tar.bz2
 nss-pem-20090907.tar.bz2


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- nss.spec	20 Nov 2009 17:49:08 -0000	1.124
+++ nss.spec	3 Dec 2009 22:13:38 -0000	1.125
@@ -1,18 +1,19 @@
 %global nspr_version 4.8
-%global nss_util_version 3.12.4
+%global nss_util_version 3.12.5
 %global nss_softokn_version 3.12.4
+%global nss_softokn_fips_version 3.12.4
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.4
-Release:          17%{?dist}
+Version:          3.12.5
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-util >= %{nss_util_version}
-Requires:         nss-softokn%{_isa} >= %{nss_softokn_version}
+Requires:         nss-softokn%{_isa} = %{nss_softokn_fips_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    nss-softokn-devel >= %{version}                                                  
@@ -39,8 +40,7 @@ Source12:         %{name}-pem-20090907.t
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           newargs.patch
-Patch8:           sysinit.patch
+Patch7:           533125-ammend.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -106,8 +106,7 @@ low level services.
 
 %patch2 -p0
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .newargs
-%patch8 -p0 -b .sysinit
+%patch7 -p0 -b .533125-ammend
 
 %build
 
@@ -469,6 +468,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1
+- Update to 3.12.5
+- Patch to allow ssl/tls clients to interoperate with servers that require renogiation
+
 * Fri Nov 20 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-14.1
 - Retagging
 



From pkgdb at fedoraproject.org  Thu Dec  3 22:17:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:17:45 +0000
Subject: [pkgdb] pyzor: nb has given up watchcommits
Message-ID: <20091203221745.EA27810F899@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on pyzor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:17:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:17:43 +0000
Subject: [pkgdb] pyzor: nb has given up watchbugzilla
Message-ID: <20091203221743.376DE10F891@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on pyzor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:17:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:17:52 +0000
Subject: [pkgdb] pyzor: nb has given up watchbugzilla
Message-ID: <20091203221752.B100F10F8A1@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on pyzor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:17:59 +0000
Subject: [pkgdb] pyzor: nb has given up watchcommits
Message-ID: <20091203221759.97D1210F841@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on pyzor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:01 +0000
Subject: [pkgdb] pyzor: nb has given up watchcommits
Message-ID: <20091203221801.99DEB10F8A4@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on pyzor (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:03 +0000
Subject: [pkgdb] pyzor: nb has given up watchbugzilla
Message-ID: <20091203221803.34B8E10F8A6@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on pyzor (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From emaldonado at fedoraproject.org  Thu Dec  3 22:18:06 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  3 Dec 2009 22:18:06 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.19,1.20
Message-ID: <20091203221806.DEE9411C00EE@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9388

Modified Files:
	nss-util.spec 
Log Message:
Bump version to 3.12.5


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nss-util.spec	3 Dec 2009 21:20:06 -0000	1.19
+++ nss-util.spec	3 Dec 2009 22:18:06 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
-Version:          3.12.4
+Version:          3.12.5
 Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:08 +0000
Subject: [pkgdb] pyzor: nb has given up watchbugzilla
Message-ID: <20091203221808.9D9E010F89C@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on pyzor (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:08 +0000
Subject: [pkgdb] pyzor: nb has given up watchcommits
Message-ID: <20091203221808.BBCA210F8AA@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on pyzor (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:11 +0000
Subject: [pkgdb] pyzor: nb has given up watchcommits
Message-ID: <20091203221811.E7BD110F8B1@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on pyzor (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:16 +0000
Subject: [pkgdb] pyzor: nb has given up watchbugzilla
Message-ID: <20091203221817.4979810F89D@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on pyzor (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:18 +0000
Subject: [pkgdb] pyzor: nb has given up watchbugzilla
Message-ID: <20091203221818.B369F10F8B2@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on pyzor (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:19 +0000
Subject: [pkgdb] pyzor: nb has given up watchcommits
Message-ID: <20091203221819.29D8B10F8B5@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on pyzor (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:49 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchcommits
Message-ID: <20091203221849.5059D10F89C@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Razor-Agent (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:18:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:18:53 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchbugzilla
Message-ID: <20091203221853.D44BD10F8A6@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Razor-Agent (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:03 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchbugzilla
Message-ID: <20091203221903.E47E710F8AB@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Razor-Agent (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:05 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchcommits
Message-ID: <20091203221905.F260110F8B1@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Razor-Agent (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:07 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchcommits
Message-ID: <20091203221907.A3C9910F8BA@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Razor-Agent (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:09 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchbugzilla
Message-ID: <20091203221909.6455110F8BE@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Razor-Agent (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From jussilehtola at fedoraproject.org  Thu Dec  3 22:19:20 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  3 Dec 2009 22:19:20 +0000 (UTC)
Subject: rpms/gromacs/devel gromacs.spec,1.18,1.19
Message-ID: <20091203221920.EACB611C00EE@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9768

Modified Files:
	gromacs.spec 
Log Message:
Fix file conflict.


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gromacs.spec	1 Dec 2009 19:06:47 -0000	1.18
+++ gromacs.spec	3 Dec 2009 22:19:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -449,7 +449,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/g_*
 %{_libdir}/libgmx.so.*
 %{_libdir}/libgmx_d.so.*
 %{_libdir}/libgmxana.so.*
@@ -517,6 +517,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-6
+- Fix file conflict.
+
 * Tue Dec 01 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-5
 - Put correct MPI devel package requires in place.
 



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:15 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchcommits
Message-ID: <20091203221915.4DB8A10F89E@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Razor-Agent (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:20 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchbugzilla
Message-ID: <20091203221920.28C9710F8BF@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Razor-Agent (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:24 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchcommits
Message-ID: <20091203221924.9F8E410F8C2@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Razor-Agent (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:24 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchbugzilla
Message-ID: <20091203221924.3FB9110F8B4@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Razor-Agent (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:28 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchcommits
Message-ID: <20091203221928.4BD7F10F8C5@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Razor-Agent (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:19:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:19:28 +0000
Subject: [pkgdb] perl-Razor-Agent: nb has given up watchbugzilla
Message-ID: <20091203221928.A1D5C10F8C8@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Razor-Agent (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Razor-Agent



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:11 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchbugzilla
Message-ID: <20091203222011.8525E10F8A4@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-SPF (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:15 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchcommits
Message-ID: <20091203222015.EDE2410F8A8@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-SPF (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:19 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchbugzilla
Message-ID: <20091203222020.190B610F8B1@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-SPF (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:19 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchcommits
Message-ID: <20091203222019.E83BC10F8AC@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-SPF (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:24 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchcommits
Message-ID: <20091203222024.6613310F8B9@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-SPF (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:29 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchbugzilla
Message-ID: <20091203222029.816C510F8BE@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-SPF (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:47 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchbugzilla
Message-ID: <20091203222047.D855610F89E@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-SPF (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:48 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchbugzilla
Message-ID: <20091203222048.B1C2310F8B2@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-SPF (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:51 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchcommits
Message-ID: <20091203222051.B6F3310F8B5@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-SPF (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:52 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchcommits
Message-ID: <20091203222052.910B710F8C1@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-SPF (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:52 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchbugzilla
Message-ID: <20091203222052.CB81110F8C2@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-SPF (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:20:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:20:57 +0000
Subject: [pkgdb] perl-Mail-SPF: nb has given up watchcommits
Message-ID: <20091203222057.971C010F8D1@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-SPF (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-SPF



From pkgdb at fedoraproject.org  Thu Dec  3 22:21:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:21:26 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchcommits
Message-ID: <20091203222127.0536010F891@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-DKIM (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Thu Dec  3 22:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:21:27 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchbugzilla
Message-ID: <20091203222127.5A3D210F899@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-DKIM (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Thu Dec  3 22:21:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:21:35 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchcommits
Message-ID: <20091203222137.38F1810F8D5@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-DKIM (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Thu Dec  3 22:21:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:21:41 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchbugzilla
Message-ID: <20091203222141.AB98610F8A6@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-DKIM (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Thu Dec  3 22:21:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:21:45 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchbugzilla
Message-ID: <20091203222145.3432310F8D3@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-DKIM (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Thu Dec  3 22:21:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:21:45 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchcommits
Message-ID: <20091203222145.A2A4710F8D8@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-DKIM (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From behdad at fedoraproject.org  Thu Dec  3 22:21:59 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 22:21:59 +0000 (UTC)
Subject: rpms/freetype/F-12 .cvsignore, 1.22, 1.23 freetype.spec, 1.75,
	1.76 sources, 1.22, 1.23
Message-ID: <20091203222159.CDCCB11C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/freetype/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10548

Modified Files:
	.cvsignore freetype.spec sources 
Log Message:
2.3.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	13 Mar 2009 22:15:14 -0000	1.22
+++ .cvsignore	3 Dec 2009 22:21:59 -0000	1.23
@@ -1,3 +1,3 @@
-freetype-2.3.9.tar.bz2
-freetype-doc-2.3.9.tar.bz2
-ft2demos-2.3.9.tar.bz2
+freetype-doc-2.3.11.tar.bz2
+ft2demos-2.3.11.tar.bz2
+freetype-2.3.11.tar.bz2


Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/F-12/freetype.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- freetype.spec	30 Jul 2009 18:04:50 -0000	1.75
+++ freetype.spec	3 Dec 2009 22:21:59 -0000	1.76
@@ -8,8 +8,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.9
-Release: 6%{?dist}
+Version: 2.3.11
+Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -230,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-1
+- 2.3.11
+
 * Thu Jul 30 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.9-6
 - Add freetype-2.3.9-aliasing.patch
 - Resolves: 513582


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	13 Mar 2009 22:15:14 -0000	1.22
+++ sources	3 Dec 2009 22:21:59 -0000	1.23
@@ -1,3 +1,3 @@
-d76233108aca9c9606cdbd341562ad9a  freetype-2.3.9.tar.bz2
-ddcb766f7c5abab0e7061dcf32a0268f  freetype-doc-2.3.9.tar.bz2
-144b4c750e91595154a66709c75fdf0d  ft2demos-2.3.9.tar.bz2
+c9d75b659382aef80a8f86efcde08629  freetype-doc-2.3.11.tar.bz2
+7e3df8813fdbad22e996a5dfed7f7361  ft2demos-2.3.11.tar.bz2
+519c7cbf5cbd72ffa822c66844d3114c  freetype-2.3.11.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec  3 22:22:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:22:17 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchbugzilla
Message-ID: <20091203222218.3AB6C10F89D@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-DKIM (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Thu Dec  3 22:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:22:21 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchcommits
Message-ID: <20091203222221.3421310F8B0@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-DKIM (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Thu Dec  3 22:22:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:22:25 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchbugzilla
Message-ID: <20091203222225.12B1F10F8B3@bastion2.fedora.phx.redhat.com>

nb has given up the watchbugzilla acl on perl-Mail-DKIM (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pkgdb at fedoraproject.org  Thu Dec  3 22:22:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 22:22:26 +0000
Subject: [pkgdb] perl-Mail-DKIM: nb has given up watchcommits
Message-ID: <20091203222226.DB3D010F8B8@bastion2.fedora.phx.redhat.com>

nb has given up the watchcommits acl on perl-Mail-DKIM (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-DKIM



From pbrobinson at fedoraproject.org  Thu Dec  3 22:27:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 22:27:15 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel moblin-icon-theme.spec,1.7,1.8
Message-ID: <20091203222715.3864911C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12455

Modified Files:
	moblin-icon-theme.spec 
Log Message:
- Fix some issues with the theme


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/moblin-icon-theme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- moblin-icon-theme.spec	16 Nov 2009 13:16:18 -0000	1.7
+++ moblin-icon-theme.spec	3 Dec 2009 22:27:14 -0000	1.8
@@ -1,6 +1,6 @@
 Name:          moblin-icon-theme
 Version:       0.10.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Moblin icon theme
 
 Group:         User Interface/Desktops
@@ -25,20 +25,20 @@ Moblin icon theme
 rm -rf %{buildroot}
 
 ./create-icon-theme.sh moblin
-mkdir -p %{buildroot}/%{_datadir}/icons/moblin
-cp -p output/moblin/index.theme %{buildroot}/%{_datadir}/icons/moblin
-cp -rp output/moblin/16x16 %{buildroot}/%{_datadir}/icons/moblin
-cp -rp output/moblin/24x24 %{buildroot}/%{_datadir}/icons/moblin
-cp -rp output/moblin/48x48 %{buildroot}/%{_datadir}/icons/moblin
+mkdir -p %{buildroot}/%{_datadir}/icons/Moblin
+cp -p output/moblin/index.theme %{buildroot}/%{_datadir}/icons/Moblin
+cp -rp output/moblin/16x16 %{buildroot}/%{_datadir}/icons/Moblin
+cp -rp output/moblin/24x24 %{buildroot}/%{_datadir}/icons/Moblin
+cp -rp output/moblin/48x48 %{buildroot}/%{_datadir}/icons/Moblin
 
 # create an empty cache file so its removed when the package is
-touch %{buildroot}/%{_datadir}/icons/moblin/icon-theme.cache
+touch %{buildroot}/%{_datadir}/icons/Moblin/icon-theme.cache
 
 #Remove Makefile.am files
 find %{buildroot} -name 'Makefile.am' -exec rm -f {} ';'
 
 # create symlinks for missing stock icons
-cd %{buildroot}/%{_datadir}/icons/moblin
+cd %{buildroot}/%{_datadir}/icons/Moblin
 for size in 16x16 24x24 48x48; do
   (
   cd $size
@@ -54,31 +54,34 @@ for size in 16x16 24x24 48x48; do
 done
 
 # Name the theme correctly
-sed -i 's|moblin|Moblin|g' %{buildroot}/%{_datadir}/icons/moblin/index.theme
+sed -i 's|moblin|Moblin|g' %{buildroot}/%{_datadir}/icons/Moblin/index.theme
 
 %clean
 rm -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
+touch --no-create %{_datadir}/icons/Moblin &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
+touch --no-create %{_datadir}/icons/Moblin &>/dev/null || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin &>/dev/null || :
+    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/Moblin &>/dev/null || :
 fi
 
 %posttrans
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin &>/dev/null || :
+    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/Moblin &>/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_datadir}/icons/moblin
+%{_datadir}/icons/Moblin
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.0-2
+- Fix some issues with the theme
+
 * Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.0-1
 - New upstream 0.10.0 release
 



From kkofler at fedoraproject.org  Thu Dec  3 22:27:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  3 Dec 2009 22:27:46 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.56,1.57
Message-ID: <20091203222746.BEEC511C00EE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12722/devel

Modified Files:
	phonon.spec 
Log Message:
Fix spelling of "ridiculous". ;-)


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- phonon.spec	3 Dec 2009 20:40:07 -0000	1.56
+++ phonon.spec	3 Dec 2009 22:27:46 -0000	1.57
@@ -191,7 +191,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 %changelog
 * Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
-- phonon-4.3.80 (upstream tarball, yes getting rediculous now)
+- phonon-4.3.80 (upstream tarball, yes getting ridiculous now)
 
 * Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-1.20091203
 - phonon-4.3.80 (20091203 snapshot)



From behdad at fedoraproject.org  Thu Dec  3 22:31:24 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 22:31:24 +0000 (UTC)
Subject: rpms/freetype/F-12 freetype.spec, 1.76,
	1.77 freetype-2.2.1-memcpy-fix.patch, 1.1,
	NONE freetype-2.3.9-aliasing.patch, 1.1, NONE
Message-ID: <20091203223124.9548311C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/freetype/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13786

Modified Files:
	freetype.spec 
Removed Files:
	freetype-2.2.1-memcpy-fix.patch freetype-2.3.9-aliasing.patch 
Log Message:
Second try



Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/F-12/freetype.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- freetype.spec	3 Dec 2009 22:21:59 -0000	1.76
+++ freetype.spec	3 Dec 2009 22:31:24 -0000	1.77
@@ -9,7 +9,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -28,12 +28,6 @@ Patch46:  freetype-2.2.1-enable-valid.pa
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
 
-# Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
-Patch89:  freetype-2.2.1-memcpy-fix.patch
-
-# Fix aliasing issue
-Patch90: freetype-2.3.9-aliasing.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
@@ -99,8 +93,6 @@ popd
 %patch46  -p1 -b .enable-valid
 
 %patch88 -p1 -b .multilib
-%patch89 -p1 -b .memcpy
-%patch90 -p1 -b .aliasing
 
 %build
 
@@ -230,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-2
+- Second try.  Drop upstreamed patches.
+
 * Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-1
 - 2.3.11
 


--- freetype-2.2.1-memcpy-fix.patch DELETED ---


--- freetype-2.3.9-aliasing.patch DELETED ---



From pbrobinson at fedoraproject.org  Thu Dec  3 22:34:32 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 22:34:32 +0000 (UTC)
Subject: rpms/moblin-icon-theme/F-12 moblin-icon-theme.spec,1.8,1.9
Message-ID: <20091203223432.9F45A11C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-icon-theme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15106

Modified Files:
	moblin-icon-theme.spec 
Log Message:
- Fix some issues with the theme


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/F-12/moblin-icon-theme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- moblin-icon-theme.spec	16 Nov 2009 13:23:12 -0000	1.8
+++ moblin-icon-theme.spec	3 Dec 2009 22:34:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          moblin-icon-theme
 Version:       0.10.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Moblin icon theme
 
 Group:         User Interface/Desktops
@@ -25,20 +25,20 @@ Moblin icon theme
 rm -rf %{buildroot}
 
 ./create-icon-theme.sh moblin
-mkdir -p %{buildroot}/%{_datadir}/icons/moblin
-cp -p output/moblin/index.theme %{buildroot}/%{_datadir}/icons/moblin
-cp -rp output/moblin/16x16 %{buildroot}/%{_datadir}/icons/moblin
-cp -rp output/moblin/24x24 %{buildroot}/%{_datadir}/icons/moblin
-cp -rp output/moblin/48x48 %{buildroot}/%{_datadir}/icons/moblin
+mkdir -p %{buildroot}/%{_datadir}/icons/Moblin
+cp -p output/moblin/index.theme %{buildroot}/%{_datadir}/icons/Moblin
+cp -rp output/moblin/16x16 %{buildroot}/%{_datadir}/icons/Moblin
+cp -rp output/moblin/24x24 %{buildroot}/%{_datadir}/icons/Moblin
+cp -rp output/moblin/48x48 %{buildroot}/%{_datadir}/icons/Moblin
 
 # create an empty cache file so its removed when the package is
-touch %{buildroot}/%{_datadir}/icons/moblin/icon-theme.cache
+touch %{buildroot}/%{_datadir}/icons/Moblin/icon-theme.cache
 
 #Remove Makefile.am files
 find %{buildroot} -name 'Makefile.am' -exec rm -f {} ';'
 
 # create symlinks for missing stock icons
-cd %{buildroot}/%{_datadir}/icons/moblin
+cd %{buildroot}/%{_datadir}/icons/Moblin
 for size in 16x16 24x24 48x48; do
   (
   cd $size
@@ -54,31 +54,34 @@ for size in 16x16 24x24 48x48; do
 done
 
 # Name the theme correctly
-sed -i 's|moblin|Moblin|g' %{buildroot}/%{_datadir}/icons/moblin/index.theme
+sed -i 's|moblin|Moblin|g' %{buildroot}/%{_datadir}/icons/Moblin/index.theme
 
 %clean
 rm -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
+touch --no-create %{_datadir}/icons/Moblin &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
+touch --no-create %{_datadir}/icons/Moblin &>/dev/null || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin &>/dev/null || :
+    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/Moblin &>/dev/null || :
 fi
 
 %posttrans
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin &>/dev/null || :
+    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/Moblin &>/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_datadir}/icons/moblin
+%{_datadir}/icons/Moblin
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.0-2
+- Fix some issues with the theme
+
 * Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.0-1
 - New upstream 0.10.0 release
 



From crobinso at fedoraproject.org  Thu Dec  3 22:36:39 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  3 Dec 2009 22:36:39 +0000 (UTC)
Subject: File virtinst-0.500.1.tar.gz uploaded to lookaside cache by crobinso
Message-ID: <20091203223639.034E310F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-virtinst:

f87ccfe2b77823c9e06d32e8b6f20424  virtinst-0.500.1.tar.gz



From crobinso at fedoraproject.org  Thu Dec  3 22:39:05 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  3 Dec 2009 22:39:05 +0000 (UTC)
Subject: rpms/python-virtinst/F-12 .cvsignore, 1.19,
	1.20 python-virtinst.spec, 1.74, 1.75 sources, 1.19,
	1.20 virtinst-0.500.0-bogus-driver-xml.patch, 1.1,
	NONE virtinst-0.500.0-change-path-perms.patch, 1.1,
	NONE virtinst-0.500.0-disk-format.patch, 1.1,
	NONE virtinst-0.500.0-f12-distro.patch, 1.1,
	NONE virtinst-0.500.0-more-translations.patch, 1.1,
	NONE virtinst-0.500.0-no-default-keymap.patch, 1.1,
	NONE virtinst-0.500.0-no-iso-driver.patch, 1.1,
	NONE virtinst-0.500.0-nonroot-qemu-net.patch, 1.1,
	NONE virtinst-0.500.0-update-testsuite.patch, 1.1,
	NONE virtinst-0.500.0-virtio-cdrom.patch, 1.1,
	NONE virtinst-0.500.0-virtio-dev-limit.patch, 1.1, NONE
Message-ID: <20091203223905.E74AD11C00EE@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16423

Modified Files:
	.cvsignore python-virtinst.spec sources 
Removed Files:
	virtinst-0.500.0-bogus-driver-xml.patch 
	virtinst-0.500.0-change-path-perms.patch 
	virtinst-0.500.0-disk-format.patch 
	virtinst-0.500.0-f12-distro.patch 
	virtinst-0.500.0-more-translations.patch 
	virtinst-0.500.0-no-default-keymap.patch 
	virtinst-0.500.0-no-iso-driver.patch 
	virtinst-0.500.0-nonroot-qemu-net.patch 
	virtinst-0.500.0-update-testsuite.patch 
	virtinst-0.500.0-virtio-cdrom.patch 
	virtinst-0.500.0-virtio-dev-limit.patch 
Log Message:
- Update to version 0.500.1
- virt-install now attempts --os-variant detection by default.
- New --disk option 'format', for creating image formats like qcow2 or vmdk
- Many improvements and bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	29 Jul 2009 02:17:47 -0000	1.19
+++ .cvsignore	3 Dec 2009 22:39:04 -0000	1.20
@@ -1 +1 @@
-virtinst-0.500.0.tar.gz
+virtinst-0.500.1.tar.gz


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-12/python-virtinst.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- python-virtinst.spec	5 Oct 2009 17:27:09 -0000	1.74
+++ python-virtinst.spec	3 Dec 2009 22:39:04 -0000	1.75
@@ -16,31 +16,9 @@
 
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
-Version: 0.500.0
-Release: 5%{_extra_release}
+Version: 0.500.1
+Release: 1%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-# Don't erroneously set limit for amount of virtio devices (bz 499654)
-Patch1: %{appname}-%{version}-virtio-dev-limit.patch
-# Don't use virtio for cdrom devices (bz 517151)
-Patch2: %{appname}-%{version}-virtio-cdrom.patch
-# Rawhide/F11 can auto detect keymapping (bz 487735)
-Patch3: %{appname}-%{version}-no-default-keymap.patch
-# Update test suite to verify patches
-Patch4: %{appname}-%{version}-update-testsuite.patch
-# Don't generate bogus disk driver XML.
-Patch5: /home/boston/crobinso/virtinst-0.500.0-bogus-driver-xml.patch
-# Add '--disk format=' for specifying format (qcow2, ...) when provisioning
-Patch6: /home/boston/crobinso/virtinst-0.500.0-disk-format.patch
-# Add Fedora12 to os dictionary
-Patch7: /home/boston/crobinso/virtinst-0.500.0-f12-distro.patch
-# Don't use usermode net for non-root qemu:///system via virt-install
-Patch8: %{appname}-%{version}-nonroot-qemu-net.patch
-# Fix cdrom installs where the iso is a storage volume (bz 524109)
-Patch9: %{appname}-%{version}-no-iso-driver.patch
-# Fix path permissions for kernel/initrd download location (bz 523960)
-Patch10: %{appname}-%{version}-change-path-perms.patch
-# Update translations (bz 493795)
-Patch11: %{appname}-%{version}-more-translations.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -68,17 +46,6 @@ and install new VMs) and virt-clone (clo
 
 %prep
 %setup -q -n %{appname}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 python setup.py build
@@ -114,6 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.500.1-1.fc12
+- Update to version 0.500.1
+- virt-install now attempts --os-variant detection by default.
+- New --disk option 'format', for creating image formats like qcow2 or vmdk
+- Many improvements and bugfixes
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-5.fc12
 - Update translations (bz 493795)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Jul 2009 02:17:47 -0000	1.19
+++ sources	3 Dec 2009 22:39:04 -0000	1.20
@@ -1 +1 @@
-c3bfe1d05a00435a03f39fb9f0b8a17a  virtinst-0.500.0.tar.gz
+f87ccfe2b77823c9e06d32e8b6f20424  virtinst-0.500.1.tar.gz


--- virtinst-0.500.0-bogus-driver-xml.patch DELETED ---


--- virtinst-0.500.0-change-path-perms.patch DELETED ---


--- virtinst-0.500.0-disk-format.patch DELETED ---


--- virtinst-0.500.0-f12-distro.patch DELETED ---


--- virtinst-0.500.0-more-translations.patch DELETED ---


--- virtinst-0.500.0-no-default-keymap.patch DELETED ---


--- virtinst-0.500.0-no-iso-driver.patch DELETED ---


--- virtinst-0.500.0-nonroot-qemu-net.patch DELETED ---


--- virtinst-0.500.0-update-testsuite.patch DELETED ---


--- virtinst-0.500.0-virtio-cdrom.patch DELETED ---


--- virtinst-0.500.0-virtio-dev-limit.patch DELETED ---



From crobinso at fedoraproject.org  Thu Dec  3 22:39:17 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  3 Dec 2009 22:39:17 +0000 (UTC)
Subject: rpms/python-virtinst/devel python-virtinst.spec, 1.74, 1.75 sources,
	1.19, 1.20 virtinst-0.500.0-bogus-driver-xml.patch, 1.1,
	NONE virtinst-0.500.0-change-path-perms.patch, 1.1,
	NONE virtinst-0.500.0-disk-format.patch, 1.1,
	NONE virtinst-0.500.0-f12-distro.patch, 1.1,
	NONE virtinst-0.500.0-more-translations.patch, 1.1,
	NONE virtinst-0.500.0-no-default-keymap.patch, 1.1,
	NONE virtinst-0.500.0-no-iso-driver.patch, 1.1,
	NONE virtinst-0.500.0-nonroot-qemu-net.patch, 1.1,
	NONE virtinst-0.500.0-update-testsuite.patch, 1.1,
	NONE virtinst-0.500.0-virtio-cdrom.patch, 1.1,
	NONE virtinst-0.500.0-virtio-dev-limit.patch, 1.1, NONE
Message-ID: <20091203223917.4C59911C00EE@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16534

Modified Files:
	python-virtinst.spec sources 
Removed Files:
	virtinst-0.500.0-bogus-driver-xml.patch 
	virtinst-0.500.0-change-path-perms.patch 
	virtinst-0.500.0-disk-format.patch 
	virtinst-0.500.0-f12-distro.patch 
	virtinst-0.500.0-more-translations.patch 
	virtinst-0.500.0-no-default-keymap.patch 
	virtinst-0.500.0-no-iso-driver.patch 
	virtinst-0.500.0-nonroot-qemu-net.patch 
	virtinst-0.500.0-update-testsuite.patch 
	virtinst-0.500.0-virtio-cdrom.patch 
	virtinst-0.500.0-virtio-dev-limit.patch 
Log Message:
- Update to version 0.500.1
- virt-install now attempts --os-variant detection by default.
- New --disk option 'format', for creating image formats like qcow2 or vmdk
- Many improvements and bugfixes



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- python-virtinst.spec	5 Oct 2009 14:21:22 -0000	1.74
+++ python-virtinst.spec	3 Dec 2009 22:39:16 -0000	1.75
@@ -16,31 +16,9 @@
 
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
-Version: 0.500.0
-Release: 5%{_extra_release}
+Version: 0.500.1
+Release: 1%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-# Don't erroneously set limit for amount of virtio devices (bz 499654)
-Patch1: %{appname}-%{version}-virtio-dev-limit.patch
-# Don't use virtio for cdrom devices (bz 517151)
-Patch2: %{appname}-%{version}-virtio-cdrom.patch
-# Rawhide/F11 can auto detect keymapping (bz 487735)
-Patch3: %{appname}-%{version}-no-default-keymap.patch
-# Update test suite to verify patches
-Patch4: %{appname}-%{version}-update-testsuite.patch
-# Don't generate bogus disk driver XML.
-Patch5: /home/boston/crobinso/virtinst-0.500.0-bogus-driver-xml.patch
-# Add '--disk format=' for specifying format (qcow2, ...) when provisioning
-Patch6: /home/boston/crobinso/virtinst-0.500.0-disk-format.patch
-# Add Fedora12 to os dictionary
-Patch7: /home/boston/crobinso/virtinst-0.500.0-f12-distro.patch
-# Don't use usermode net for non-root qemu:///system via virt-install
-Patch8: %{appname}-%{version}-nonroot-qemu-net.patch
-# Fix cdrom installs where the iso is a storage volume (bz 524109)
-Patch9: %{appname}-%{version}-no-iso-driver.patch
-# Fix path permissions for kernel/initrd download location (bz 523960)
-Patch10: %{appname}-%{version}-change-path-perms.patch
-# Update translations (bz 493795)
-Patch11: %{appname}-%{version}-more-translations.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -68,17 +46,6 @@ and install new VMs) and virt-clone (clo
 
 %prep
 %setup -q -n %{appname}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 python setup.py build
@@ -114,6 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.500.1-1.fc13
+- Update to version 0.500.1
+- virt-install now attempts --os-variant detection by default.
+- New --disk option 'format', for creating image formats like qcow2 or vmdk
+- Many improvements and bugfixes
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-5.fc12
 - Update translations (bz 493795)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Jul 2009 02:17:47 -0000	1.19
+++ sources	3 Dec 2009 22:39:16 -0000	1.20
@@ -1 +1 @@
-c3bfe1d05a00435a03f39fb9f0b8a17a  virtinst-0.500.0.tar.gz
+f87ccfe2b77823c9e06d32e8b6f20424  virtinst-0.500.1.tar.gz


--- virtinst-0.500.0-bogus-driver-xml.patch DELETED ---


--- virtinst-0.500.0-change-path-perms.patch DELETED ---


--- virtinst-0.500.0-disk-format.patch DELETED ---


--- virtinst-0.500.0-f12-distro.patch DELETED ---


--- virtinst-0.500.0-more-translations.patch DELETED ---


--- virtinst-0.500.0-no-default-keymap.patch DELETED ---


--- virtinst-0.500.0-no-iso-driver.patch DELETED ---


--- virtinst-0.500.0-nonroot-qemu-net.patch DELETED ---


--- virtinst-0.500.0-update-testsuite.patch DELETED ---


--- virtinst-0.500.0-virtio-cdrom.patch DELETED ---


--- virtinst-0.500.0-virtio-dev-limit.patch DELETED ---



From behdad at fedoraproject.org  Thu Dec  3 22:43:12 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 22:43:12 +0000 (UTC)
Subject: rpms/freetype/F-12 freetype-2.3.11-more-demos.patch, NONE,
	1.1 freetype.spec, 1.77, 1.78
Message-ID: <20091203224312.86BBD11C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/freetype/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17714

Modified Files:
	freetype.spec 
Added Files:
	freetype-2.3.11-more-demos.patch 
Log Message:
Try again


freetype-2.3.11-more-demos.patch:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE freetype-2.3.11-more-demos.patch ---
diff -up freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile
--- freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos	2009-10-22 16:02:26.000000000 -0400
+++ freetype-2.3.11/ft2demos-2.3.11/Makefile	2009-10-22 16:02:32.000000000 -0400
@@ -288,10 +288,10 @@ else
   # Note that ttdebug only works if the FreeType's `truetype' driver has
   # been compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined.
   #
-  # EXES += ftchkwd
-  # EXES += ftmemchk
-  # EXES += ftpatchk
-  # EXES += fttimer
+  EXES += ftchkwd
+  EXES += ftmemchk
+  EXES += ftpatchk
+  EXES += fttimer
   # EXES += testname
   # EXES += ttdebug
 


Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/F-12/freetype.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- freetype.spec	3 Dec 2009 22:31:24 -0000	1.77
+++ freetype.spec	3 Dec 2009 22:43:12 -0000	1.78
@@ -9,7 +9,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.3.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -24,6 +24,8 @@ Patch21:  freetype-2.3.0-enable-spr.patc
 
 # Enable otvalid and gxvalid modules
 Patch46:  freetype-2.2.1-enable-valid.patch
+# Enable additional demos
+Patch47:  freetype-2.3.11-more-demos.patch
 
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
@@ -91,6 +93,7 @@ popd
 %endif
 
 %patch46  -p1 -b .enable-valid
+%patch47  -p1 -b .more-demos
 
 %patch88 -p1 -b .multilib
 
@@ -222,6 +225,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+
+* Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-3
+- Add freetype-2.3.11-more-demos.patch
+- New demo programs ftmemchk, ftpatchk, and fttimer
+
 * Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-2
 - Second try.  Drop upstreamed patches.
 



From crobinso at fedoraproject.org  Thu Dec  3 22:43:38 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  3 Dec 2009 22:43:38 +0000 (UTC)
Subject: File virt-manager-0.8.1.tar.gz uploaded to lookaside cache by
	crobinso
Message-ID: <20091203224338.56AB810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for virt-manager:

6e461e91d679dc87d9fc506f34832d90  virt-manager-0.8.1.tar.gz



From behdad at fedoraproject.org  Thu Dec  3 22:43:53 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  3 Dec 2009 22:43:53 +0000 (UTC)
Subject: rpms/freetype/devel freetype.spec, 1.77,
	1.78 freetype-2.2.1-memcpy-fix.patch, 1.1, NONE
Message-ID: <20091203224353.342FC11C00EE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/freetype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18000

Modified Files:
	freetype.spec 
Removed Files:
	freetype-2.2.1-memcpy-fix.patch 
Log Message:
* Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-2
- Drop upstreamed patch.
- Enable patented bytecode interpretter now that the patents are expired.



Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- freetype.spec	22 Oct 2009 20:07:58 -0000	1.77
+++ freetype.spec	3 Dec 2009 22:43:53 -0000	1.78
@@ -1,7 +1,5 @@
-# Patented bytecode interpreter and patented subpixel rendering disabled by default.
-# Pass '--with bytecode_interpreter' and '--with subpixel_rendering' on rpmbuild
-# command-line to enable them.
-%{!?_with_bytecode_interpreter: %{!?_without_bytecode_interpreter: %define _without_bytecode_interpreter --without-bytecode_interpreter}}
+# Patented subpixel rendering disabled by default.
+# Pass '--with subpixel_rendering' on rpmbuild command-line to enable.
 %{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}}
 
 %{!?with_xfree86:%define with_xfree86 1}
@@ -9,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -30,16 +28,11 @@ Patch47:  freetype-2.3.11-more-demos.pat
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
 
-# Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
-Patch89:  freetype-2.2.1-memcpy-fix.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
 
-%if %{?_with_bytecode_interpreter:1}%{!?_with_bytecode_interpreter:0}
 Provides: %{name}-bytecode
-%endif
 %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
 Provides: %{name}-subpixel
 %endif
@@ -87,9 +80,7 @@ pushd ft2demos-%{version}
 %patch5 -p1 -b .mathlib
 popd
 
-%if %{?_with_bytecode_interpreter:1}%{!?_with_bytecode_interpreter:0}
 %patch20  -p1 -b .enable-ft2-bci
-%endif
 
 %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
 %patch21  -p1 -b .enable-spr
@@ -99,7 +90,6 @@ popd
 %patch47  -p1 -b .more-demos
 
 %patch88 -p1 -b .multilib
-%patch89 -p1 -b .memcpy
 
 %build
 
@@ -232,6 +222,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-2
+- Drop upstreamed patch.
+- Enable patented bytecode interpretter now that the patents are expired.
+
 * Thu Oct 22 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.11-1
 - Update to 2.3.11.
 - Add freetype-2.3.11-more-demos.patch


--- freetype-2.2.1-memcpy-fix.patch DELETED ---



From crobinso at fedoraproject.org  Thu Dec  3 22:44:52 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  3 Dec 2009 22:44:52 +0000 (UTC)
Subject: rpms/virt-manager/F-12 virt-manager-0.8.1-perms-qemu-user.patch,
	NONE, 
	1.1 virt-manager-0.8.1-prefer-hal.patch, NONE, 1.1 .cvsignore,
	1.23, 1.24 sources, 1.23, 1.24 virt-manager.spec, 1.62,
	1.63 state_paused.png, 1.1, NONE state_running.png, 1.1,
	NONE state_shutoff.png, 1.1,
	NONE virt-manager-0.8.0-addhw-errmsg-typo.patch, 1.1,
	NONE virt-manager-0.8.0-cdrom-eject-driver.patch, 1.1,
	NONE virt-manager-0.8.0-conn-close-exception.patch, 1.1,
	NONE virt-manager-0.8.0-createvol-alloc.patch, 1.1,
	NONE virt-manager-0.8.0-createvol-name.patch, 1.1,
	NONE virt-manager-0.8.0-fix-path-perms.patch, 1.1,
	NONE virt-manager-0.8.0-fix-vcpu-hotplug.patch, 1.1,
	NONE virt-manager-0.8.0-hide-help-docs.patch, 1.1,
	NONE virt-manager-0.8.0-manager-ui-tweaks.patch, 1.1,
	NONE virt-manager-0.8.0-more-translations.patch, 1.1,
	NONE virt-manager-0.8.0-newvm-storage-cb.patch, 1.1,
	NONE virt-manager-0.8.0-no-delete-active.patch, 1.1,
	NONE virt-manager-0.8.0-pylint-tweak.patch, 1.1,
	NONE virt-manager-0.8.0-refresh-disk-space.patch, 1.1,
	NONE virt-manager-0.8.0-stats-logging.patch, 1.1,
	NONE virt-manager-0.8.0-toolbar-tooltips.patch, 1.1,
	NONE virt-manager-0.8.0-update-translations.patch, 1.1,
	NONE virt-manager-0.8.0-update-vm-state.patch, 1.1, NONE
Message-ID: <20091203224452.CEB4811C00EE@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18389

Modified Files:
	.cvsignore sources virt-manager.spec 
Added Files:
	virt-manager-0.8.1-perms-qemu-user.patch 
	virt-manager-0.8.1-prefer-hal.patch 
Removed Files:
	state_paused.png state_running.png state_shutoff.png 
	virt-manager-0.8.0-addhw-errmsg-typo.patch 
	virt-manager-0.8.0-cdrom-eject-driver.patch 
	virt-manager-0.8.0-conn-close-exception.patch 
	virt-manager-0.8.0-createvol-alloc.patch 
	virt-manager-0.8.0-createvol-name.patch 
	virt-manager-0.8.0-fix-path-perms.patch 
	virt-manager-0.8.0-fix-vcpu-hotplug.patch 
	virt-manager-0.8.0-hide-help-docs.patch 
	virt-manager-0.8.0-manager-ui-tweaks.patch 
	virt-manager-0.8.0-more-translations.patch 
	virt-manager-0.8.0-newvm-storage-cb.patch 
	virt-manager-0.8.0-no-delete-active.patch 
	virt-manager-0.8.0-pylint-tweak.patch 
	virt-manager-0.8.0-refresh-disk-space.patch 
	virt-manager-0.8.0-stats-logging.patch 
	virt-manager-0.8.0-toolbar-tooltips.patch 
	virt-manager-0.8.0-update-translations.patch 
	virt-manager-0.8.0-update-vm-state.patch 
Log Message:
Update to release 0.8.1
VM Migration wizard, exposing various migration options
Enumerate CDROM and bridge devices on remote connections
Support storage pool source enumeration for LVM, NFS, and SCSI


virt-manager-0.8.1-perms-qemu-user.patch:
 uihelpers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-manager-0.8.1-perms-qemu-user.patch ---
diff -rup virt-manager-0.8.1/src/virtManager/uihelpers.py new/src/virtManager/uihelpers.py
--- virt-manager-0.8.1/src/virtManager/uihelpers.py	2009-12-03 16:15:01.000000000 -0500
+++ new/src/virtManager/uihelpers.py	2009-12-03 17:15:09.101994000 -0500
@@ -38,7 +38,7 @@ OPTICAL_MEDIA_KEY = 4
 # may use a nonroot user, so simply changing this will cause several UI
 # pieces to attempt to verify that permissions are correct. Eventually this
 # should be exposed via capabilities so we can determine this programmatically.
-QEMU_SYSTEM_EMULATOR_USER = "root"
+QEMU_SYSTEM_EMULATOR_USER = "qemu"
 
 ##############################################################
 # Initialize an error object to use for validation functions #

virt-manager-0.8.1-prefer-hal.patch:
 connection.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE virt-manager-0.8.1-prefer-hal.patch ---
diff -rup new/src/virtManager/connection.py new2/src/virtManager/connection.py
--- new/src/virtManager/connection.py	2009-12-03 17:14:57.324966000 -0500
+++ new2/src/virtManager/connection.py	2009-12-03 17:16:34.904055000 -0500
@@ -170,7 +170,8 @@ class vmmConnection(gobject.GObject):
         """
         Determine how we will be polling for net devices (HAL or libvirt)
         """
-        if self.is_nodedev_capable() and self.interface_capable:
+        if (self.is_remote() and
+            self.is_nodedev_capable() and self.interface_capable):
             try:
                 self._build_libvirt_netdev_list()
                 self.netdev_use_libvirt = True
@@ -207,7 +208,7 @@ class vmmConnection(gobject.GObject):
                 logging.debug("Using HAL for netdev enumeration")
 
     def _init_optical(self):
-        if self.is_nodedev_capable():
+        if self.is_remote() and self.is_nodedev_capable():
             try:
                 self.connect("nodedev-added", self._nodedev_optical_added)
                 self.connect("nodedev-removed", self._nodedev_optical_removed)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	29 Jul 2009 02:35:38 -0000	1.23
+++ .cvsignore	3 Dec 2009 22:44:49 -0000	1.24
@@ -1 +1 @@
-virt-manager-0.8.0.tar.gz
+virt-manager-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	29 Jul 2009 02:35:38 -0000	1.23
+++ sources	3 Dec 2009 22:44:49 -0000	1.24
@@ -1 +1 @@
-0b6cb9144e3933f2c9af07e2d409842d  virt-manager-0.8.0.tar.gz
+6e461e91d679dc87d9fc506f34832d90  virt-manager-0.8.1.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/virt-manager.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- virt-manager.spec	5 Oct 2009 17:40:55 -0000	1.62
+++ virt-manager.spec	3 Dec 2009 22:44:52 -0000	1.63
@@ -7,55 +7,20 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.8.0
-Release: 7%{_extra_release}
+Version: 0.8.1
+Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
 License: GPLv2+
 URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
-Source1: state_paused.png
-Source2: state_running.png
-Source3: state_shutoff.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-# Fix disk XML mangling via connect/eject cdrom (bz 516116)
-Patch1: %{name}-%{version}-cdrom-eject-driver.patch
-# Fix delete button sensitivity (bz 518536)
-Patch2: %{name}-%{version}-no-delete-active.patch
-# Fix populating text box from storage browser in 'New VM' (bz 517263)
-Patch3: %{name}-%{version}-newvm-storage-cb.patch
-# Fix a traceback in an 'Add Hardware' error path (bz 517286)
-Patch4: %{name}-%{version}-addhw-errmsg-typo.patch
-# Fixes for pylint script to return nicer results on F11/F12
-Patch5: %{name}-%{version}-pylint-tweak.patch
-# Don't close libvirt connection for non-fatal errors (bz 522168)
-Patch6: %{name}-%{version}-conn-close-exception.patch
-# Manager UI tweaks
-Patch7: %{name}-%{version}-manager-ui-tweaks.patch
-# Generate better errors is disk/net stats polling fails
-Patch8: %{name}-%{version}-stats-logging.patch
-# Refresh host disk space in create wizard (bz 502777)
-Patch9: %{name}-%{version}-refresh-disk-space.patch
-# Offer to fix disk permission issues (bz 517379)
-Patch10: %{name}-%{version}-fix-path-perms.patch
-# Fix VCPU hotplug
-Patch11: %{name}-%{version}-fix-vcpu-hotplug.patch
-# Remove access to outdated docs (bz 522823, bz 524805)
-Patch12: %{name}-%{version}-hide-help-docs.patch
-# Update VM state text in manager view (bz 526182)
-Patch13: %{name}-%{version}-update-vm-state.patch
-# Update translations (bz 493795)
-Patch14: %{name}-%{version}-update-translations.patch
-# More translations (bz 493795)
-Patch15: %{name}-%{version}-more-translations.patch
-# Don't allow creating a volume without a name (bz 526111)
-Patch16: %{name}-%{version}-createvol-name.patch
-# Don't allow volume allocation > capacity (bz 526077)
-Patch17: %{name}-%{version}-createvol-alloc.patch
-# Add tooltips for toolbar buttons (bz 524083)
-Patch18: %{name}-%{version}-toolbar-tooltips.patch
+# Check QEMU permissions against the qemu user
+Patch1: %{name}-%{version}-perms-qemu-user.patch
+# Prefer HAL for device enumeration, to avoid possible regressions
+Patch2: %{name}-%{version}-prefer-hal.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -72,12 +37,6 @@ Requires: gnome-keyring >= 0.4.9
 # will work just fine - keyring functionality will simply be
 # disabled
 Requires: gnome-python2-gnomekeyring >= 2.15.4
-Requires: gnome-python2-gnomevfs >= 2.15.4
-%if 0%{?fedora} <= 9
-Requires: gnome-python2
-%else
-Requires: gnome-python2-gnome
-%endif
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
@@ -120,27 +79,8 @@ management API.
 
 %prep
 %setup -q
-cp %{SOURCE1} pixmaps
-cp %{SOURCE2} pixmaps
-cp %{SOURCE3} pixmaps
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
 
 %build
 %configure
@@ -214,6 +154,12 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-1.fc12
+- Update to release 0.8.1
+- VM Migration wizard, exposing various migration options
+- Enumerate CDROM and bridge devices on remote connections
+- Support storage pool source enumeration for LVM, NFS, and SCSI
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-7.fc12
 - More translations (bz 493795)
 - Don't allow creating a volume without a name (bz 526111)


--- virt-manager-0.8.0-addhw-errmsg-typo.patch DELETED ---


--- virt-manager-0.8.0-cdrom-eject-driver.patch DELETED ---


--- virt-manager-0.8.0-conn-close-exception.patch DELETED ---


--- virt-manager-0.8.0-createvol-alloc.patch DELETED ---


--- virt-manager-0.8.0-createvol-name.patch DELETED ---


--- virt-manager-0.8.0-fix-path-perms.patch DELETED ---


--- virt-manager-0.8.0-fix-vcpu-hotplug.patch DELETED ---


--- virt-manager-0.8.0-hide-help-docs.patch DELETED ---


--- virt-manager-0.8.0-manager-ui-tweaks.patch DELETED ---


--- virt-manager-0.8.0-more-translations.patch DELETED ---


--- virt-manager-0.8.0-newvm-storage-cb.patch DELETED ---


--- virt-manager-0.8.0-no-delete-active.patch DELETED ---


--- virt-manager-0.8.0-pylint-tweak.patch DELETED ---


--- virt-manager-0.8.0-refresh-disk-space.patch DELETED ---


--- virt-manager-0.8.0-stats-logging.patch DELETED ---


--- virt-manager-0.8.0-toolbar-tooltips.patch DELETED ---


--- virt-manager-0.8.0-update-translations.patch DELETED ---


--- virt-manager-0.8.0-update-vm-state.patch DELETED ---



From crobinso at fedoraproject.org  Thu Dec  3 22:45:15 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu,  3 Dec 2009 22:45:15 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.8.1-perms-qemu-user.patch,
	NONE, 
	1.1 .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 virt-manager.spec,
	1.63, 1.64 state_paused.png, 1.1, NONE state_running.png, 1.1,
	NONE state_shutoff.png, 1.1,
	NONE virt-manager-0.8.0-addhw-errmsg-typo.patch, 1.1,
	NONE virt-manager-0.8.0-cdrom-eject-driver.patch, 1.1,
	NONE virt-manager-0.8.0-conn-close-exception.patch, 1.1,
	NONE virt-manager-0.8.0-createvol-alloc.patch, 1.1,
	NONE virt-manager-0.8.0-createvol-name.patch, 1.1,
	NONE virt-manager-0.8.0-fix-path-perms.patch, 1.1,
	NONE virt-manager-0.8.0-fix-vcpu-hotplug.patch, 1.1,
	NONE virt-manager-0.8.0-hide-help-docs.patch, 1.1,
	NONE virt-manager-0.8.0-manager-ui-tweaks.patch, 1.1,
	NONE virt-manager-0.8.0-more-translations.patch, 1.1,
	NONE virt-manager-0.8.0-newvm-storage-cb.patch, 1.1,
	NONE virt-manager-0.8.0-no-delete-active.patch, 1.1,
	NONE virt-manager-0.8.0-pylint-tweak.patch, 1.1,
	NONE virt-manager-0.8.0-refresh-disk-space.patch, 1.1,
	NONE virt-manager-0.8.0-stats-logging.patch, 1.1,
	NONE virt-manager-0.8.0-toolbar-tooltips.patch, 1.1,
	NONE virt-manager-0.8.0-update-translations.patch, 1.1,
	NONE virt-manager-0.8.0-update-vm-state.patch, 1.1, NONE
Message-ID: <20091203224515.0ECA311C00EE@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18510

Modified Files:
	.cvsignore sources virt-manager.spec 
Added Files:
	virt-manager-0.8.1-perms-qemu-user.patch 
Removed Files:
	state_paused.png state_running.png state_shutoff.png 
	virt-manager-0.8.0-addhw-errmsg-typo.patch 
	virt-manager-0.8.0-cdrom-eject-driver.patch 
	virt-manager-0.8.0-conn-close-exception.patch 
	virt-manager-0.8.0-createvol-alloc.patch 
	virt-manager-0.8.0-createvol-name.patch 
	virt-manager-0.8.0-fix-path-perms.patch 
	virt-manager-0.8.0-fix-vcpu-hotplug.patch 
	virt-manager-0.8.0-hide-help-docs.patch 
	virt-manager-0.8.0-manager-ui-tweaks.patch 
	virt-manager-0.8.0-more-translations.patch 
	virt-manager-0.8.0-newvm-storage-cb.patch 
	virt-manager-0.8.0-no-delete-active.patch 
	virt-manager-0.8.0-pylint-tweak.patch 
	virt-manager-0.8.0-refresh-disk-space.patch 
	virt-manager-0.8.0-stats-logging.patch 
	virt-manager-0.8.0-toolbar-tooltips.patch 
	virt-manager-0.8.0-update-translations.patch 
	virt-manager-0.8.0-update-vm-state.patch 
Log Message:
- Update to release 0.8.1
- VM Migration wizard, exposing various migration options
- Enumerate CDROM and bridge devices on remote connections
- Support storage pool source enumeration for LVM, NFS, and SCSI


virt-manager-0.8.1-perms-qemu-user.patch:
 uihelpers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-manager-0.8.1-perms-qemu-user.patch ---
diff -rup virt-manager-0.8.1/src/virtManager/uihelpers.py new/src/virtManager/uihelpers.py
--- virt-manager-0.8.1/src/virtManager/uihelpers.py	2009-12-03 16:15:01.000000000 -0500
+++ new/src/virtManager/uihelpers.py	2009-12-03 17:15:09.101994000 -0500
@@ -38,7 +38,7 @@ OPTICAL_MEDIA_KEY = 4
 # may use a nonroot user, so simply changing this will cause several UI
 # pieces to attempt to verify that permissions are correct. Eventually this
 # should be exposed via capabilities so we can determine this programmatically.
-QEMU_SYSTEM_EMULATOR_USER = "root"
+QEMU_SYSTEM_EMULATOR_USER = "qemu"
 
 ##############################################################
 # Initialize an error object to use for validation functions #


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	29 Jul 2009 02:35:38 -0000	1.23
+++ .cvsignore	3 Dec 2009 22:45:10 -0000	1.24
@@ -1 +1 @@
-virt-manager-0.8.0.tar.gz
+virt-manager-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	29 Jul 2009 02:35:38 -0000	1.23
+++ sources	3 Dec 2009 22:45:10 -0000	1.24
@@ -1 +1 @@
-0b6cb9144e3933f2c9af07e2d409842d  virt-manager-0.8.0.tar.gz
+6e461e91d679dc87d9fc506f34832d90  virt-manager-0.8.1.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- virt-manager.spec	5 Oct 2009 17:25:32 -0000	1.63
+++ virt-manager.spec	3 Dec 2009 22:45:14 -0000	1.64
@@ -7,55 +7,18 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.8.0
-Release: 8%{_extra_release}
+Version: 0.8.1
+Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
 License: GPLv2+
 URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
-Source1: state_paused.png
-Source2: state_running.png
-Source3: state_shutoff.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-# Fix disk XML mangling via connect/eject cdrom (bz 516116)
-Patch1: %{name}-%{version}-cdrom-eject-driver.patch
-# Fix delete button sensitivity (bz 518536)
-Patch2: %{name}-%{version}-no-delete-active.patch
-# Fix populating text box from storage browser in 'New VM' (bz 517263)
-Patch3: %{name}-%{version}-newvm-storage-cb.patch
-# Fix a traceback in an 'Add Hardware' error path (bz 517286)
-Patch4: %{name}-%{version}-addhw-errmsg-typo.patch
-# Fixes for pylint script to return nicer results on F11/F12
-Patch5: %{name}-%{version}-pylint-tweak.patch
-# Don't close libvirt connection for non-fatal errors (bz 522168)
-Patch6: %{name}-%{version}-conn-close-exception.patch
-# Manager UI tweaks
-Patch7: %{name}-%{version}-manager-ui-tweaks.patch
-# Generate better errors is disk/net stats polling fails
-Patch8: %{name}-%{version}-stats-logging.patch
-# Refresh host disk space in create wizard (bz 502777)
-Patch9: %{name}-%{version}-refresh-disk-space.patch
-# Offer to fix disk permission issues (bz 517379)
-Patch10: %{name}-%{version}-fix-path-perms.patch
-# Fix VCPU hotplug
-Patch11: %{name}-%{version}-fix-vcpu-hotplug.patch
-# Remove access to outdated docs (bz 522823, bz 524805)
-Patch12: %{name}-%{version}-hide-help-docs.patch
-# Update VM state text in manager view (bz 526182)
-Patch13: %{name}-%{version}-update-vm-state.patch
-# Update translations (bz 493795)
-Patch14: %{name}-%{version}-update-translations.patch
-# More translations (bz 493795)
-Patch15: %{name}-%{version}-more-translations.patch
-# Don't allow creating a volume without a name (bz 526111)
-Patch16: %{name}-%{version}-createvol-name.patch
-# Don't allow volume allocation > capacity (bz 526077)
-Patch17: %{name}-%{version}-createvol-alloc.patch
-# Add tooltips for toolbar buttons (bz 524083)
-Patch18: %{name}-%{version}-toolbar-tooltips.patch
+# Check QEMU permissions against the qemu user
+Patch1: %{name}-%{version}-perms-qemu-user.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -72,12 +35,6 @@ Requires: gnome-keyring >= 0.4.9
 # will work just fine - keyring functionality will simply be
 # disabled
 Requires: gnome-python2-gnomekeyring >= 2.15.4
-Requires: gnome-python2-gnomevfs >= 2.15.4
-%if 0%{?fedora} <= 9
-Requires: gnome-python2
-%else
-Requires: gnome-python2-gnome
-%endif
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
@@ -120,27 +77,7 @@ management API.
 
 %prep
 %setup -q
-cp %{SOURCE1} pixmaps
-cp %{SOURCE2} pixmaps
-cp %{SOURCE3} pixmaps
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
 
 %build
 %configure
@@ -214,6 +151,12 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-1.fc13
+- Update to release 0.8.1
+- VM Migration wizard, exposing various migration options
+- Enumerate CDROM and bridge devices on remote connections
+- Support storage pool source enumeration for LVM, NFS, and SCSI
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-8.fc13
 - Don't allow creating a volume without a name (bz 526111)
 - Don't allow volume allocation > capacity (bz 526077)


--- virt-manager-0.8.0-addhw-errmsg-typo.patch DELETED ---


--- virt-manager-0.8.0-cdrom-eject-driver.patch DELETED ---


--- virt-manager-0.8.0-conn-close-exception.patch DELETED ---


--- virt-manager-0.8.0-createvol-alloc.patch DELETED ---


--- virt-manager-0.8.0-createvol-name.patch DELETED ---


--- virt-manager-0.8.0-fix-path-perms.patch DELETED ---


--- virt-manager-0.8.0-fix-vcpu-hotplug.patch DELETED ---


--- virt-manager-0.8.0-hide-help-docs.patch DELETED ---


--- virt-manager-0.8.0-manager-ui-tweaks.patch DELETED ---


--- virt-manager-0.8.0-more-translations.patch DELETED ---


--- virt-manager-0.8.0-newvm-storage-cb.patch DELETED ---


--- virt-manager-0.8.0-no-delete-active.patch DELETED ---


--- virt-manager-0.8.0-pylint-tweak.patch DELETED ---


--- virt-manager-0.8.0-refresh-disk-space.patch DELETED ---


--- virt-manager-0.8.0-stats-logging.patch DELETED ---


--- virt-manager-0.8.0-toolbar-tooltips.patch DELETED ---


--- virt-manager-0.8.0-update-translations.patch DELETED ---


--- virt-manager-0.8.0-update-vm-state.patch DELETED ---



From rakesh at fedoraproject.org  Thu Dec  3 22:45:54 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 22:45:54 +0000 (UTC)
Subject: File ctemplate-0.96.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091203224554.323A610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ctemplate:

57569994c2e714b8bcf09c169e5652fe  ctemplate-0.96.tar.gz



From rakesh at fedoraproject.org  Thu Dec  3 22:58:30 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 22:58:30 +0000 (UTC)
Subject: rpms/ctemplate/devel .cvsignore, 1.4, 1.5 ctemplate.spec, 1.9,
	1.10 import.log, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091203225830.3030411C00EE@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22366/devel

Modified Files:
	.cvsignore ctemplate.spec import.log sources 
Log Message:
Updated to 0.96



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Aug 2009 18:53:50 -0000	1.4
+++ .cvsignore	3 Dec 2009 22:58:29 -0000	1.5
@@ -1 +1 @@
-ctemplate-0.95.tar.gz
+ctemplate-0.96.tar.gz


Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/ctemplate.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ctemplate.spec	1 Sep 2009 20:51:29 -0000	1.9
+++ ctemplate.spec	3 Dec 2009 22:58:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ctemplate
-Version:        0.95
-Release:        2%{?dist}
+Version:        0.96
+Release:        1%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.96-1
+- Updated to 0.96
+
 * Tue Sep 01 2009 Dennis Gilmore <dennis at ausil.us> - 0.95-2
 - make sure that the namespace is ctemplate not google
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	5 Aug 2009 18:53:50 -0000	1.4
+++ import.log	3 Dec 2009 22:58:29 -0000	1.5
@@ -2,3 +2,4 @@ ctemplate-0_91-2_fc10:HEAD:ctemplate-0.9
 ctemplate-0_93-1_fc11:HEAD:ctemplate-0.93-1.fc11.src.rpm:1239551194
 ctemplate-0_93-2_fc11:HEAD:ctemplate-0.93-2.fc11.src.rpm:1239559001
 ctemplate-0_95-1_fc11:HEAD:ctemplate-0.95-1.fc11.src.rpm:1249498503
+ctemplate-0_96-1_fc12:HEAD:ctemplate-0.96-1.fc12.src.rpm:1259879854


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Aug 2009 18:53:50 -0000	1.4
+++ sources	3 Dec 2009 22:58:29 -0000	1.5
@@ -1 +1 @@
-d6cfabbe1742dbe6f3bd10b77be319f1  ctemplate-0.95.tar.gz
+57569994c2e714b8bcf09c169e5652fe  ctemplate-0.96.tar.gz



From rakesh at fedoraproject.org  Thu Dec  3 22:59:39 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 22:59:39 +0000 (UTC)
Subject: File enet-1.2.1.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091203225939.A327B10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for enet:

892fa7318812658e4485019d55abeea0  enet-1.2.1.tar.gz



From rakesh at fedoraproject.org  Thu Dec  3 23:00:43 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 23:00:43 +0000 (UTC)
Subject: rpms/enet/devel .cvsignore, 1.3, 1.4 enet.spec, 1.5, 1.6 import.log,
	1.1, 1.2 sources, 1.4, 1.5
Message-ID: <20091203230043.C93CA11C032A@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/enet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23126/devel

Modified Files:
	.cvsignore enet.spec import.log sources 
Log Message:
Updated to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enet/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jan 2009 21:33:10 -0000	1.3
+++ .cvsignore	3 Dec 2009 23:00:43 -0000	1.4
@@ -1 +1 @@
-enet-1.2.tar.gz
+enet-1.2.1.tar.gz


Index: enet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enet/devel/enet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- enet.spec	24 Jul 2009 22:10:24 -0000	1.5
+++ enet.spec	3 Dec 2009 23:00:43 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           enet
-Version:        1.2
-Release:        3%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        Thin, simple and robust network layer on top of UDP
 Group:          System Environment/Libraries
 License:        MIT
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.2.1-1
+- Updated to 1.2.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/enet/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Jan 2009 21:33:10 -0000	1.1
+++ import.log	3 Dec 2009 23:00:43 -0000	1.2
@@ -1 +1,2 @@
 enet-1_2-1_fc10:HEAD:enet-1.2-1.fc10.src.rpm:1232011456
+enet-1_2_1-1_fc12:HEAD:enet-1.2.1-1.fc12.src.rpm:1259880675


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Jan 2009 21:33:11 -0000	1.4
+++ sources	3 Dec 2009 23:00:43 -0000	1.5
@@ -1 +1 @@
-e0d9f468d8c6f6bfd07083b3b40f5e69  enet-1.2.tar.gz
+892fa7318812658e4485019d55abeea0  enet-1.2.1.tar.gz



From twaugh at fedoraproject.org  Thu Dec  3 23:05:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 23:05:54 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.546,1.547
Message-ID: <20091203230554.423E911C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24953

Modified Files:
	cups.spec 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -p -r1.546 -r1.547
--- cups.spec	23 Nov 2009 13:08:59 -0000	1.546
+++ cups.spec	3 Dec 2009 23:05:53 -0000	1.547
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -59,6 +59,7 @@ Patch33: cups-str3407.patch
 Patch34: cups-str3418.patch
 Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
+Patch37: cups-str3413.patch
 
 Patch100: cups-lspp.patch
 
@@ -228,6 +229,7 @@ module. 
 %patch34 -p1 -b .str3418
 %patch35 -p1 -b .CVE-2009-3553
 %patch36 -p1 -b .str3422
+%patch37 -p1 -b .str3413
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -520,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
+- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
+
 * Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-10
 - Undo last change as it was incorrect.
 



From twaugh at fedoraproject.org  Thu Dec  3 23:08:23 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 23:08:23 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3413.patch,NONE,1.1 cups.spec,1.539,1.540
Message-ID: <20091203230823.857F311C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25704

Modified Files:
	cups.spec 
Added Files:
	cups-str3413.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).


cups-str3413.patch:
 snmp.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3413.patch ---
diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c
--- cups-1.4.2/backend/snmp.c.str3413	2009-01-14 22:40:58.000000000 +0000
+++ cups-1.4.2/backend/snmp.c	2009-12-03 10:01:27.933335209 +0000
@@ -999,7 +999,7 @@ read_snmp_response(int fd)		/* I - SNMP 
 		       DEVICE_PRODUCT, LexmarkProductOID2);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
-		       DEVICE_URI, LexmarkDeviceIdOID);
+		       DEVICE_ID, LexmarkDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
@@ -1064,7 +1064,19 @@ read_snmp_response(int fd)		/* I - SNMP 
 
 
 	  if (device->id)
+	  {
+	    if (strlen (device->id) >
+		strlen ((char *)packet.object_value.string.bytes))
+	    {
+	     /*
+	      * The Device ID we already saw was more complete.
+	      */
+
+	      break;
+	    }
+
 	    free(device->id);
+	  }
 
 	  device->id = strdup((char *)packet.object_value.string.bytes);
 
@@ -1107,7 +1119,8 @@ read_snmp_response(int fd)		/* I - SNMP 
 
     case DEVICE_URI :
 	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
-	    !device->uri)
+	    !device->uri &&
+	    (char *)packet.object_value.string.bytes[0] != '\0')
 	{
 	 /*
 	  * Update an existing cache entry...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -p -r1.539 -r1.540
--- cups.spec	23 Nov 2009 13:11:17 -0000	1.539
+++ cups.spec	3 Dec 2009 23:08:23 -0000	1.540
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -61,6 +61,7 @@ Patch47: cups-str3407.patch
 Patch48: cups-str3418.patch
 Patch49: cups-CVE-2009-3553.patch
 Patch50: cups-str3422.patch
+Patch51: cups-str3413.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -226,6 +227,7 @@ module. 
 %patch48 -p1 -b .str3418
 %patch49 -p1 -b .CVE-2009-3553
 %patch50 -p1 -b .str3422
+%patch51 -p1 -b .str3413
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -519,6 +521,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
+- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
+
 * Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-10
 - Undo last change as it was incorrect.
 



From twaugh at fedoraproject.org  Thu Dec  3 23:09:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  3 Dec 2009 23:09:28 +0000 (UTC)
Subject: rpms/cups/devel cups-str3413.patch,NONE,1.1 cups.spec,1.547,1.548
Message-ID: <20091203230928.B0DFC11C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26207

Modified Files:
	cups.spec 
Added Files:
	cups-str3413.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
- Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).


cups-str3413.patch:
 snmp.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3413.patch ---
diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c
--- cups-1.4.2/backend/snmp.c.str3413	2009-01-14 22:40:58.000000000 +0000
+++ cups-1.4.2/backend/snmp.c	2009-12-03 10:01:27.933335209 +0000
@@ -999,7 +999,7 @@ read_snmp_response(int fd)		/* I - SNMP 
 		       DEVICE_PRODUCT, LexmarkProductOID2);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
-		       DEVICE_URI, LexmarkDeviceIdOID);
+		       DEVICE_ID, LexmarkDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
@@ -1064,7 +1064,19 @@ read_snmp_response(int fd)		/* I - SNMP 
 
 
 	  if (device->id)
+	  {
+	    if (strlen (device->id) >
+		strlen ((char *)packet.object_value.string.bytes))
+	    {
+	     /*
+	      * The Device ID we already saw was more complete.
+	      */
+
+	      break;
+	    }
+
 	    free(device->id);
+	  }
 
 	  device->id = strdup((char *)packet.object_value.string.bytes);
 
@@ -1107,7 +1119,8 @@ read_snmp_response(int fd)		/* I - SNMP 
 
     case DEVICE_URI :
 	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
-	    !device->uri)
+	    !device->uri &&
+	    (char *)packet.object_value.string.bytes[0] != '\0')
 	{
 	 /*
 	  * Update an existing cache entry...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -p -r1.547 -r1.548
--- cups.spec	3 Dec 2009 23:05:53 -0000	1.547
+++ cups.spec	3 Dec 2009 23:09:28 -0000	1.548
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -522,7 +522,7 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
 - Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
 
 * Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-10



From bpepple at fedoraproject.org  Thu Dec  3 23:09:39 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu,  3 Dec 2009 23:09:39 +0000 (UTC)
Subject: File telepathy-glib-0.9.2.tar.gz uploaded to lookaside cache by
	bpepple
Message-ID: <20091203230939.D9A4010F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for telepathy-glib:

83be89144539472eac4ee4a4487f68c4  telepathy-glib-0.9.2.tar.gz



From rakesh at fedoraproject.org  Thu Dec  3 23:12:16 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 23:12:16 +0000 (UTC)
Subject: File fuse-zip-0.2.8.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091203231216.3FEB410F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fuse-zip:

6c285506d9f39aaf2e02db85dbb73089  fuse-zip-0.2.8.tar.gz



From than at fedoraproject.org  Thu Dec  3 23:12:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  3 Dec 2009 23:12:52 +0000 (UTC)
Subject: rpms/kdeadmin/F-12 kdeadmin.spec,1.151,1.152
Message-ID: <20091203231252.F047911C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27392

Modified Files:
	kdeadmin.spec 
Log Message:
fix rhel conditionals



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-12/kdeadmin.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kdeadmin.spec	1 Dec 2009 13:39:03 -0000	1.151
+++ kdeadmin.spec	3 Dec 2009 23:12:52 -0000	1.152
@@ -7,7 +7,7 @@ Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
 Version:        4.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -69,6 +69,15 @@ a CUPS print server.
 
 %build
 
+%if ! 0%{?system_config_printer_kde}
+sed -i -e 's:macro_optional_add_subdirectory(system-config-printer-kde):#macro_optional_add_subdirectory(system-config-printer-kde):g' CMakeLists.txt
+%endif
+
+%if ! 0%{?include_kpackage}
+sed -i -e 's:macro_optional_add_subdirectory(kpackage):#macro_optional_add_subdirectory(kpackage):g' CMakeLists.txt
+sed -i -e 's:add_subdirectory(kpackage):#add_subdirectory(kpackage):g' doc/CMakeLists.txt
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -159,6 +168,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+- fix rhel conditionals
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 



From than at fedoraproject.org  Thu Dec  3 23:13:56 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  3 Dec 2009 23:13:56 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.153,1.154
Message-ID: <20091203231356.35C1F11C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27817

Modified Files:
	kdeadmin.spec 
Log Message:
- fix rhel conditionals




Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- kdeadmin.spec	1 Dec 2009 14:38:45 -0000	1.153
+++ kdeadmin.spec	3 Dec 2009 23:13:55 -0000	1.154
@@ -7,7 +7,7 @@ Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
 Version:        4.3.80
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -69,6 +69,15 @@ a CUPS print server.
 
 %build
 
+%if ! 0%{?system_config_printer_kde}
+sed -i -e 's:macro_optional_add_subdirectory(system-config-printer-kde):#macro_optional_add_subdirectory(system-config-printer-kde):g' CMakeLists.txt
+%endif
+
+%if ! 0%{?include_kpackage}
+sed -i -e 's:macro_optional_add_subdirectory(kpackage):#macro_optional_add_subdirectory(kpackage):g' CMakeLists.txt
+sed -i -e 's:add_subdirectory(kpackage):#add_subdirectory(kpackage):g' doc/CMakeLists.txt
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -159,6 +168,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
+- fix rhel conditionals
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From jcollie at fedoraproject.org  Thu Dec  3 23:13:59 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  3 Dec 2009 23:13:59 +0000 (UTC)
Subject: rpms/pitivi/devel pitivi.spec,1.41,1.42
Message-ID: <20091203231359.D75A011C00EE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27876

Modified Files:
	pitivi.spec 
Log Message:
* Thu Dec  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3
- Add Req on python-setuptools for BZ#540192



Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- pitivi.spec	23 Sep 2009 19:28:50 -0000	1.41
+++ pitivi.spec	3 Dec 2009 23:13:59 -0000	1.42
@@ -2,7 +2,7 @@
 %define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -19,25 +19,12 @@ Requires:       gstreamer-plugins-base >
 Requires:       pygtk2 >= 2.14.0
 Requires:       python-zope-interface
 Requires:       pygoocanvas
+Requires:       python-setuptools
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool => 0.35.0
 BuildRequires:  python-setuptools
 
-#BuildRequires:  gnonlin >= 0.10.12.2
-#BuildRequires:  gstreamer-python >= 0.10.16
-#BuildRequires:  gstreamer-devel >= 0.10.24
-#BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
-#BuildRequires:  GConf2-devel
-#BuildRequires:  gtk2-devel >= 2.8
-#BuildRequires:  pygtk2-devel >= 2.14.0
-#BuildRequires:  pygtk2-libglade >= 2.14.0
-#BuildRequires:  gtk-doc
-#BuildRequires:  pkgconfig
-#BuildRequires:  gnome-python2
-#BuildRequires:  perl(XML::Parser)
-#BuildRequires:  gettext
-
 %description
 Pitivi is an application using the GStreamer multimedia framework to
 manipulate a large set of multimedia sources.
@@ -76,12 +63,14 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING NEWS
 %{_bindir}/pitivi
 %{_datadir}/pitivi
-#%{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/pitivi.*
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Thu Dec  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3
+- Add Req on python-setuptools for BZ#540192
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.13.3-2
 - Update desktop file according to F-12 FedoraStudio feature
 



From pbrobinson at fedoraproject.org  Thu Dec  3 23:15:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 23:15:15 +0000 (UTC)
Subject: rpms/bisho/devel bisho.spec,1.14,1.15
Message-ID: <20091203231515.4AA4F11C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28362

Modified Files:
	bisho.spec 
Log Message:
- Require gvfs to fix issues with gtk_show_uri


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- bisho.spec	13 Nov 2009 16:40:10 -0000	1.14
+++ bisho.spec	3 Dec 2009 23:15:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           bisho
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -27,6 +27,8 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+Requires: gvfs
+
 %description
 A tool to configure user and account details for the mojito social network 
 aggregation service.
@@ -92,6 +94,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.17-2
+- Require gvfs to fix issues with gtk_show_uri
+
 * Fri Nov 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.17-1
 - New upstream 0.17 release
 



From pbrobinson at fedoraproject.org  Thu Dec  3 23:16:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 23:16:29 +0000 (UTC)
Subject: rpms/bisho/F-12 bisho.spec,1.13,1.14
Message-ID: <20091203231629.3A4FC11C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28826

Modified Files:
	bisho.spec 
Log Message:
- Require gvfs to fix issues with gtk_show_uri


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/bisho.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- bisho.spec	13 Nov 2009 16:54:35 -0000	1.13
+++ bisho.spec	3 Dec 2009 23:16:29 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           bisho
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -27,6 +27,8 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+Requires: gvfs
+
 %description
 A tool to configure user and account details for the mojito social network 
 aggregation service.
@@ -92,6 +94,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.17-2
+- Require gvfs to fix issues with gtk_show_uri
+
 * Fri Nov 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.17-1
 - New upstream 0.17 release
 



From nalin at fedoraproject.org  Thu Dec  3 23:17:28 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu,  3 Dec 2009 23:17:28 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-selinux-label.patch,1.6,1.7
Message-ID: <20091203231728.6FE3411C00EE@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29315

Modified Files:
	krb5-1.7-selinux-label.patch 
Log Message:
- selinux: set the user part of creation context to match the current
  context instead of what we looked up


krb5-1.7-selinux-label.patch:
 aclocal.m4                                      |   51 +++
 appl/bsd/configure.in                           |    1 
 appl/gssftp/configure.in                        |    1 
 appl/telnet/configure.in                        |    1 
 config/pre.in                                   |    3 
 configure.in                                    |    2 
 include/autoconf.h.in                           |   13 
 include/k5-int.h                                |    1 
 include/k5-label.h                              |   27 +
 include/krb5/krb5.hin                           |    6 
 kadmin/dbutil/dump.c                            |    2 
 krb5-config.in                                  |    3 
 lib/kadm5/logger.c                              |    4 
 lib/krb5/keytab/kt_file.c                       |    4 
 plugins/kdb/db2/adb_openclose.c                 |    2 
 plugins/kdb/db2/kdb_db2.c                       |    4 
 plugins/kdb/db2/libdb2/btree/bt_open.c          |    3 
 plugins/kdb/db2/libdb2/hash/hash.c              |    3 
 plugins/kdb/db2/libdb2/recno/rec_open.c         |    3 
 plugins/kdb/db2/libdb2/test/Makefile.in         |    3 
 plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c |   12 
 slave/kpropd.c                                  |    2 
 util/profile/prof_file.c                        |    3 
 util/support/Makefile.in                        |    3 
 util/support/selinux.c                          |  340 ++++++++++++++++++++++++
 25 files changed, 474 insertions(+), 23 deletions(-)

Index: krb5-1.7-selinux-label.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-selinux-label.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- krb5-1.7-selinux-label.patch	23 Oct 2009 20:29:53 -0000	1.6
+++ krb5-1.7-selinux-label.patch	3 Dec 2009 23:17:28 -0000	1.7
@@ -541,7 +541,7 @@ diff -up krb5-1.7/src/util/support/Makef
 diff -up /dev/null krb5-1.7/src/util/support/selinux.c
 --- /dev/null	2009-06-04 10:34:55.169007373 -0400
 +++ krb5-1.7/src/util/support/selinux.c	2009-06-04 13:47:20.000000000 -0400
-@@ -0,0 +1,314 @@
+@@ -0,0 +1,340 @@
 +/*
 + * Copyright 2007,2008,2009 Red Hat, Inc.  All Rights Reserved.
 + *
@@ -593,6 +593,7 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +#include <string.h>
 +#include <unistd.h>
 +#include <selinux/selinux.h>
++#include <selinux/context.h>
 +#ifdef HAVE_SELINUX_LABEL_H
 +#include <selinux/label.h>
 +#endif
@@ -613,8 +614,9 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +static security_context_t
 +push_fscreatecon(const char *pathname, mode_t mode)
 +{
-+	security_context_t previous, next;
-+	const char *fullpath;
++	security_context_t previous, configuredsc, currentsc, derivedsc;
++	context_t current, derived;
++	const char *fullpath, *currentuser;
 +#ifdef HAVE_SELINUX_LABEL_H
 +	struct selabel_handle *ctx;
 +#endif
@@ -650,17 +652,17 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +			} else {
 +				fullpath = pathname;
 +			}
-+			next = NULL;
 +#ifdef DEBUG
 +			if (isatty(fileno(stderr))) {
 +				fprintf(stderr, "Looking up context for "
 +					"\"%s\"(%05o).\n", fullpath, mode);
 +			}
 +#endif
++			configuredsc = NULL;
 +#ifdef HAVE_SELINUX_LABEL_H
 +			ctx = selabel_open(SELABEL_CTX_FILE, NULL, 0);
 +			if (ctx != NULL) {
-+				if (selabel_lookup(ctx, &next,
++				if (selabel_lookup(ctx, &configuredsc,
 +						   fullpath, mode) != 0) {
 +					selabel_close(ctx);
 +					free(genpath);
@@ -672,7 +674,7 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +				selabel_close(ctx);
 +			}
 +#else
-+			if (matchpathcon(fullpath, mode, &next) != 0) {
++			if (matchpathcon(fullpath, mode, &configuredsc) != 0) {
 +				free(genpath);
 +				if (previous != NULL) {
 +					freecon(previous);
@@ -681,20 +683,44 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +			}
 +#endif
 +			free(genpath);
++			currentsc = NULL;
++			getcon(&currentsc);
++			if (currentsc != NULL) {
++				derived = context_new(configuredsc);
++				if (derived != NULL) {
++					current = context_new(currentsc);
++					if (current != NULL) {
++						currentuser = context_user_get(current);
++						if (currentuser != NULL) {
++							if (context_user_set(derived,
++									     currentuser) == 0) {
++								derivedsc = context_str(derived);
++								if (derivedsc != NULL) {
++									freecon(configuredsc);
++									configuredsc = strdup(derivedsc);
++								}
++							}
++						}
++						context_free(current);
++					}
++					context_free(derived);
++				}
++				freecon(currentsc);
++			}
 +#ifdef DEBUG
 +			if (isatty(fileno(stderr))) {
 +				fprintf(stderr, "Setting file creation context "
-+					"to \"%s\".\n", next);
++					"to \"%s\".\n", configured);
 +			}
 +#endif
-+			if (setfscreatecon(next) != 0) {
-+				freecon(next);
++			if (setfscreatecon(configuredsc) != 0) {
++				freecon(configuredsc);
 +				if (previous != NULL) {
 +					freecon(previous);
 +				}
 +				return NULL;
 +			}
-+			freecon(next);
++			freecon(configuredsc);
 +#ifdef DEBUG
 +		} else {
 +			if (isatty(fileno(stderr))) {



From rakesh at fedoraproject.org  Thu Dec  3 23:17:32 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 23:17:32 +0000 (UTC)
Subject: rpms/fuse-zip/devel .cvsignore, 1.3, 1.4 fuse-zip.spec, 1.7,
	1.8 import.log, 1.4, 1.5 sources, 1.3,
	1.4 fuse-zip-man-page.patch, 1.1, NONE
Message-ID: <20091203231732.57C9B11C00EE@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/fuse-zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29265/devel

Modified Files:
	.cvsignore fuse-zip.spec import.log sources 
Removed Files:
	fuse-zip-man-page.patch 
Log Message:
Updated to 0.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-zip/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Dec 2008 10:20:36 -0000	1.3
+++ .cvsignore	3 Dec 2009 23:17:31 -0000	1.4
@@ -1 +1 @@
-fuse-zip-0.2.7.tar.gz
+fuse-zip-0.2.8.tar.gz


Index: fuse-zip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-zip/devel/fuse-zip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fuse-zip.spec	17 Sep 2009 06:17:05 -0000	1.7
+++ fuse-zip.spec	3 Dec 2009 23:17:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           fuse-zip
-Version:        0.2.7
-Release:        4%{?dist}
+Version:        0.2.8
+Release:        1%{?dist}
 Summary:        Fuse-zip is a fs to navigate, extract, create and modify ZIP archives
 Group:          System Environment/Libraries
 License:        GPLv3+
@@ -9,8 +9,6 @@ Source0:        http://%{name}.googlecod
 # Submitted patch
 # http://code.google.com/p/fuse-zip/issues/detail?id=15
 Patch0:         fuse-zip-makefile.patch
-# http://code.google.com/p/fuse-zip/issues/detail?id=16
-Patch1:         fuse-zip-man-page.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libzip-devel, pkgconfig, fuse-devel, zlib-devel
 Requires:       fuse
@@ -30,7 +28,6 @@ on large archives with many files.
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .man-page
 
 %build
 make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"
@@ -50,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.2.8-1
+- Updated to 0.2.8
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.2.7-4
 - Rebuilt with new fuse
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-zip/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	29 Dec 2008 10:20:36 -0000	1.4
+++ import.log	3 Dec 2009 23:17:32 -0000	1.5
@@ -2,3 +2,4 @@ fuse-zip-0_2_6-4_fc10:HEAD:fuse-zip-0.2.
 fuse-zip-0_2_6-5_fc10:HEAD:fuse-zip-0.2.6-5.fc10.src.rpm:1228615506
 fuse-zip-0_2_6-6_fc10:HEAD:fuse-zip-0.2.6-6.fc10.src.rpm:1230501854
 fuse-zip-0_2_7-1_fc10:HEAD:fuse-zip-0.2.7-1.fc10.src.rpm:1230502702
+fuse-zip-0_2_8-1_fc12:HEAD:fuse-zip-0.2.8-1.fc12.src.rpm:1259881437


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-zip/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Dec 2008 10:20:36 -0000	1.3
+++ sources	3 Dec 2009 23:17:32 -0000	1.4
@@ -1 +1 @@
-2545ced227741e6e59a27f0c86353ad6  fuse-zip-0.2.7.tar.gz
+6c285506d9f39aaf2e02db85dbb73089  fuse-zip-0.2.8.tar.gz


--- fuse-zip-man-page.patch DELETED ---



From bpepple at fedoraproject.org  Thu Dec  3 23:17:57 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu,  3 Dec 2009 23:17:57 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.40, 1.41 sources, 1.40,
	1.41 telepathy-glib.spec, 1.49, 1.50
Message-ID: <20091203231757.A069111C00EE@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29595

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Thu Dec  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.2-1
- Update to 0.9.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	15 Oct 2009 22:44:52 -0000	1.40
+++ .cvsignore	3 Dec 2009 23:17:57 -0000	1.41
@@ -1 +1 @@
-telepathy-glib-0.9.1.tar.gz
+telepathy-glib-0.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	15 Oct 2009 22:44:52 -0000	1.40
+++ sources	3 Dec 2009 23:17:57 -0000	1.41
@@ -1 +1 @@
-fa82a4474b3a5436b5b3cb44cbc9a9b4  telepathy-glib-0.9.1.tar.gz
+83be89144539472eac4ee4a4487f68c4  telepathy-glib-0.9.2.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- telepathy-glib.spec	15 Oct 2009 22:44:53 -0000	1.49
+++ telepathy-glib.spec	3 Dec 2009 23:17:57 -0000	1.50
@@ -1,9 +1,9 @@
 %define	dbus_ver	0.95
-%define	dbus_glib_ver	0.73
+%define	dbus_glib_ver	0.82
 %define	glib_ver	2.20
 
 Name:           telepathy-glib
-Version:        0.9.1
+Version:        0.9.2
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.2-1
+- Update to 0.9.2.
+
 * Thu Oct 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.1-1
 - Update to 0.9.1.
 



From rakesh at fedoraproject.org  Thu Dec  3 23:18:32 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 23:18:32 +0000 (UTC)
Subject: File gflags-1.2.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091203231832.6868110F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gflags:

cf1b55773e49b721fa8e1faf01c0384b  gflags-1.2.tar.gz



From pkgdb at fedoraproject.org  Thu Dec  3 23:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 23:19:17 +0000
Subject: [pkgdb] orsa had acl change status
Message-ID: <20091203231917.DDE3A10F89C@bastion2.fedora.phx.redhat.com>

mjakubicek has set the commit acl on orsa (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From pkgdb at fedoraproject.org  Thu Dec  3 23:19:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 03 Dec 2009 23:19:19 +0000
Subject: [pkgdb] orsa had acl change status
Message-ID: <20091203231919.DB81810F8A3@bastion2.fedora.phx.redhat.com>

mjakubicek has set the approveacls acl on orsa (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/orsa



From rakesh at fedoraproject.org  Thu Dec  3 23:19:45 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  3 Dec 2009 23:19:45 +0000 (UTC)
Subject: rpms/gflags/devel .cvsignore, 1.4, 1.5 gflags.spec, 1.7,
	1.8 import.log, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091203231945.3CB9411C00EE@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gflags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30320/devel

Modified Files:
	.cvsignore gflags.spec import.log sources 
Log Message:
Updated to 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Aug 2009 06:53:29 -0000	1.4
+++ .cvsignore	3 Dec 2009 23:19:44 -0000	1.5
@@ -1 +1 @@
-gflags-1.1.tar.gz
+gflags-1.2.tar.gz


Index: gflags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/gflags.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gflags.spec	5 Aug 2009 06:53:30 -0000	1.7
+++ gflags.spec	3 Dec 2009 23:19:44 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gflags
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Library for commandline flag processing
 
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/google/*.h
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.2-1
+- Updated to 1.2
+
 * Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.1-1
 - removed extra files included in %%files section and updated to 1.1
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Aug 2009 06:53:30 -0000	1.3
+++ import.log	3 Dec 2009 23:19:44 -0000	1.4
@@ -1,3 +1,4 @@
 gflags-0_9-6_fc10:HEAD:gflags-0.9-6.fc10.src.rpm:1222674675
 gflags-1_0-1_fc10:HEAD:gflags-1.0-1.fc10.src.rpm:1232013079
 gflags-1_1-1_fc11:HEAD:gflags-1.1-1.fc11.src.rpm:1249455264
+gflags-1_2-1_fc12:HEAD:gflags-1.2-1.fc12.src.rpm:1259881814


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Aug 2009 06:53:30 -0000	1.4
+++ sources	3 Dec 2009 23:19:45 -0000	1.5
@@ -1 +1 @@
-91816d7c96f06d1929f4a4fff6b47864  gflags-1.1.tar.gz
+cf1b55773e49b721fa8e1faf01c0384b  gflags-1.2.tar.gz



From nalin at fedoraproject.org  Thu Dec  3 23:23:54 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu,  3 Dec 2009 23:23:54 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-pam.patch,1.3,1.4
Message-ID: <20091203232354.9113211C00EE@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31609

Modified Files:
	krb5-1.7-pam.patch 
Log Message:
- ksu: move account management checks to before we drop privileges, like
  su does (#540769)


krb5-1.7-pam.patch:
 aclocal.m4                   |   83 ++++++++
 appl/bsd/Makefile.in         |   11 -
 appl/bsd/configure.in        |    1 
 appl/bsd/krshd.c             |   64 +++++-
 appl/bsd/login.c             |   61 ++++++
 appl/bsd/pam.c               |  433 +++++++++++++++++++++++++++++++++++++++++++
 appl/bsd/pam.h               |   65 ++++++
 appl/gssftp/configure.in     |    1 
 appl/gssftp/ftpd/Makefile.in |    8 
 appl/gssftp/ftpd/ftpd.c      |   72 ++++++-
 clients/ksu/Makefile.in      |    7 
 clients/ksu/main.c           |   75 +++++++
 config/pre.in                |    1 
 configure.in                 |    2 
 14 files changed, 862 insertions(+), 22 deletions(-)

Index: krb5-1.7-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-pam.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- krb5-1.7-pam.patch	26 Jun 2009 22:08:03 -0000	1.3
+++ krb5-1.7-pam.patch	3 Dec 2009 23:23:54 -0000	1.4
@@ -1092,45 +1092,61 @@ diff -up krb5-1.7/src/clients/ksu/main.c
  #include "ksu.h"
  #include "adm_proto.h"
  #include <sys/types.h>
-@@ -32,6 +33,11 @@
+@@ -32,6 +33,10 @@
  #include <signal.h>
  #include <grp.h>
  
 +#ifdef USE_PAM
 +#include "../../appl/bsd/pam.h"
-+int force_fork = 0;
 +#endif
 +
  /* globals */
  char * prog_name;
  int auth_debug =0;     
-@@ -791,7 +797,24 @@ main (argc, argv)
- 	fprintf(stderr, "program to be execed %s\n",params[0]);
-     }
-     
--    if( keep_target_cache ) {
+@@ -39,6 +44,7 @@
+ char k5users_path[MAXPATHLEN];
+ char * gb_err = NULL;
+ int quiet = 0;
++int force_fork = 0;
+ /***********/
+ 
+ #define _DEF_CSH "/bin/csh" 
+@@ -585,6 +591,25 @@
+ 	       prog_name,target_user,client_name,
+ 	       source_user,ontty());
+ 	
 +#ifdef USE_PAM
-+    if (appl_pam_enabled(ksu_context, "ksu")) {
-+	if (appl_pam_acct_mgmt(KSU_PAM_SERVICE, 1, target_user, NULL,
-+			       NULL, source_user, ttyname(STDERR_FILENO)) != 0) {
-+	    fprintf(stderr, "Access denied for %s.\n", target_user);
-+	    sweep_up(ksu_context, cc_target);
-+	    exit(1);
-+	}
-+	if (appl_pam_requires_chauthtok()) {
-+	    fprintf(stderr, "Password change required for %s.\n", target_user);
-+	    sweep_up(ksu_context, cc_target);
-+	    exit(1);
++	if (appl_pam_enabled(ksu_context, "ksu")) {
++	    if (appl_pam_acct_mgmt(KSU_PAM_SERVICE, 1, target_user, NULL,
++				   NULL, source_user,
++				   ttyname(STDERR_FILENO)) != 0) {
++		fprintf(stderr, "Access denied for %s.\n", target_user);
++		sweep_up(ksu_context, cc_target);
++		exit(1);
++	    }
++	    if (appl_pam_requires_chauthtok()) {
++		fprintf(stderr, "Password change required for %s.\n",
++			target_user);
++		sweep_up(ksu_context, cc_target);
++		exit(1);
++	    }
++	    force_fork++;
 +	}
-+	force_fork++;
-+    }
 +#endif
 +
+ 	/* Run authorization as target.*/
+ 	if (krb5_seteuid(target_uid)) {
+ 	    com_err(prog_name, errno, "while switching to target for authorization check");
+@@ -791,7 +816,7 @@
+ 	fprintf(stderr, "program to be execed %s\n",params[0]);
+     }
+     
+-    if( keep_target_cache ) {
 +    if( keep_target_cache && !force_fork ) {
  	execv(params[0], params);
  	com_err(prog_name, errno, "while trying to execv %s",
  		params[0]);
-@@ -799,6 +822,33 @@ main (argc, argv)
+@@ -799,6 +824,33 @@
  	exit(1);
      }else{
  	statusp = 1;
@@ -1164,7 +1180,7 @@ diff -up krb5-1.7/src/clients/ksu/main.c
  	switch ((child_pid = fork())) {
  	default:
  	    if (auth_debug){
-@@ -822,15 +872,34 @@ main (argc, argv)
+@@ -822,15 +874,34 @@
  	    if (ret_pid == -1) {
  	    	com_err(prog_name, errno, "while calling waitpid");
  	    }



From nalin at fedoraproject.org  Thu Dec  3 23:26:03 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu,  3 Dec 2009 23:26:03 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.215,1.216
Message-ID: <20091203232603.3043111C00EE@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32211

Modified Files:
	krb5.spec 
Log Message:
- configure with --enable-dns-for-realm instead of --enable-dns, which isn't
  recognized any more



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- krb5.spec	20 Nov 2009 16:09:35 -0000	1.215
+++ krb5.spec	3 Dec 2009 23:26:02 -0000	1.216
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 10%{?dist}
+Release: 11%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -215,6 +215,14 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Thu Dec  3 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-11
+- ksu: move account management checks to before we drop privileges, like
+  su does (#540769)
+- selinux: set the user part of file creation contexts to match the current
+  context instead of what we looked up
+- configure with --enable-dns-for-realm instead of --enable-dns, which isn't
+  recognized any more
+
 * Fri Nov 20 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-10
 - move /etc/pam.d/ksu from krb5-workstation-servers to krb5-workstation,
   where it's actually needed (#538703)
@@ -1565,7 +1573,7 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`"
 	--with-system-ss \
 	--with-netlib=-lresolv \
 	--without-tcl \
-	--enable-dns \
+	--enable-dns-for-realm \
 %if %{WITH_LDAP}
 %if %{WITH_DIRSRV}
 	--with-dirsrv \



From pbrobinson at fedoraproject.org  Thu Dec  3 23:50:38 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 23:50:38 +0000 (UTC)
Subject: File tangogps-0.99.2.tar.gz uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091203235038.532B910F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tangogps:

ba0b28f9f87f6b47cf32a4f2c935cc28  tangogps-0.99.2.tar.gz



From pbrobinson at fedoraproject.org  Thu Dec  3 23:51:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 23:51:34 +0000 (UTC)
Subject: rpms/tangogps/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tangogps.spec, 1.10, 1.11
Message-ID: <20091203235134.208E411C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6819

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
- New upstream 0.99.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	1 Dec 2009 05:36:45 -0000	1.8
+++ .cvsignore	3 Dec 2009 23:51:33 -0000	1.9
@@ -1 +1 @@
-tangogps-0.99.1.tar.gz
+tangogps-0.99.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	1 Dec 2009 05:36:45 -0000	1.8
+++ sources	3 Dec 2009 23:51:33 -0000	1.9
@@ -1 +1 @@
-bf99c9510481681651434eb943fe3294  tangogps-0.99.1.tar.gz
+ba0b28f9f87f6b47cf32a4f2c935cc28  tangogps-0.99.2.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/tangogps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tangogps.spec	1 Dec 2009 05:36:45 -0000	1.10
+++ tangogps.spec	3 Dec 2009 23:51:33 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           tangogps
-Version:        0.99.1
+Version:        0.99.2
 Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.2-1
+- New upstream 0.99.2 release
+
 * Mon Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.1-1
 - New upstream 0.99.1 release
 



From pbrobinson at fedoraproject.org  Thu Dec  3 23:57:18 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 23:57:18 +0000 (UTC)
Subject: rpms/tangogps/F-12 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tangogps.spec, 1.10, 1.11
Message-ID: <20091203235718.DC70711C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8392

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
- New upstream 0.99.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	1 Dec 2009 06:33:12 -0000	1.8
+++ .cvsignore	3 Dec 2009 23:57:18 -0000	1.9
@@ -1 +1 @@
-tangogps-0.99.1.tar.gz
+tangogps-0.99.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	1 Dec 2009 06:33:12 -0000	1.8
+++ sources	3 Dec 2009 23:57:18 -0000	1.9
@@ -1 +1 @@
-bf99c9510481681651434eb943fe3294  tangogps-0.99.1.tar.gz
+ba0b28f9f87f6b47cf32a4f2c935cc28  tangogps-0.99.2.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-12/tangogps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tangogps.spec	1 Dec 2009 06:33:12 -0000	1.10
+++ tangogps.spec	3 Dec 2009 23:57:18 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           tangogps
-Version:        0.99.1
+Version:        0.99.2
 Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.2-1
+- New upstream 0.99.2 release
+
 * Mon Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.1-1
 - New upstream 0.99.1 release
 



From pbrobinson at fedoraproject.org  Thu Dec  3 23:58:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  3 Dec 2009 23:58:11 +0000 (UTC)
Subject: rpms/tangogps/F-11 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tangogps.spec, 1.9, 1.10
Message-ID: <20091203235811.52FC411C00EE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8777

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
- New upstream 0.99.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	1 Dec 2009 06:41:36 -0000	1.8
+++ .cvsignore	3 Dec 2009 23:58:11 -0000	1.9
@@ -1 +1 @@
-tangogps-0.99.1.tar.gz
+tangogps-0.99.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	1 Dec 2009 06:41:36 -0000	1.8
+++ sources	3 Dec 2009 23:58:11 -0000	1.9
@@ -1 +1 @@
-bf99c9510481681651434eb943fe3294  tangogps-0.99.1.tar.gz
+ba0b28f9f87f6b47cf32a4f2c935cc28  tangogps-0.99.2.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-11/tangogps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tangogps.spec	1 Dec 2009 06:41:36 -0000	1.9
+++ tangogps.spec	3 Dec 2009 23:58:11 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           tangogps
-Version:        0.99.1
+Version:        0.99.2
 Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.2-1
+- New upstream 0.99.2 release
+
 * Mon Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.1-1
 - New upstream 0.99.1 release
 



From kasal at fedoraproject.org  Fri Dec  4 00:10:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 00:10:52 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.242,1.243
Message-ID: <20091204001052.D988E11C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12070

Modified Files:
	perl.spec 
Log Message:
- switch off check for ppc64 and s390x
- remove the hack for "make test," it is no longer needed


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- perl.spec	3 Dec 2009 15:49:20 -0000	1.242
+++ perl.spec	4 Dec 2009 00:10:52 -0000	1.243
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        101%{?dist}
+Release:        102%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1175,11 +1175,11 @@ ln -s ../../../CORE/libperl.so $RPM_BUIL
 rm -rf $RPM_BUILD_ROOT
 
 %check
-%ifnarch sparc64
-# work around a bug in Module::Build tests by setting TMPDIR to a directory
-# inside the source tree
-mkdir "$PWD/tmp"
-TMPDIR="$PWD/tmp" make test
+# one test fails on ppc64 and s390x:
+# ext/threads-shared/t/stress......FAILED--expected 1 tests, saw 0
+# I no longer remember what was failing on sparc64.
+%ifnarch ppc64 s390x sparc64
+make test
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -1789,6 +1789,10 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Dec  3 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-102
+- switch off check for ppc64 and s390x
+- remove the hack for "make test," it is no longer needed
+
 * Thu Dec  3 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-101
 - be more careful with the libperl.so compatibility symlink (#543936)
 



From ndim at fedoraproject.org  Fri Dec  4 00:28:50 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 00:28:50 +0000 (UTC)
Subject: File xf86-video-radeonhd-1.3.0-20091204git.tar.lzma uploaded to
	lookaside cache by ndim
Message-ID: <20091204002850.EA3B710F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xorg-x11-drv-radeonhd:

1bab87280d94db5197c3b700b05024a3  xf86-video-radeonhd-1.3.0-20091204git.tar.lzma



From ndim at fedoraproject.org  Fri Dec  4 00:33:01 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 00:33:01 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/devel
	xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch,
	NONE, 1.1 .cvsignore, 1.50, 1.51 sources, 1.51,
	1.52 xorg-x11-drv-radeonhd-README.fedora, 1.51,
	1.52 xorg-x11-drv-radeonhd.spec, 1.67, 1.68
Message-ID: <20091204003301.5675311C00EE@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17562

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Added Files:
	xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch 
Log Message:
* Fri Dec 04 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-4.2.20091204git
- Abort driver startup if kernel modesetting (KMS) is enabled
- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
  - 98d1d5f6: Blacklist: Marking 0x9710, 0x1043, 0x83A2 hotplug unusable.
  - f7aed406: conntest: Update PCI ID list.


xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch:
 rhd_driver.c |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch ---
>From e6e4a2ff28a841f788d4ff28d3fb175c9ae69a63 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Fri, 4 Dec 2009 01:26:25 +0100
Subject: [PATCH] Fail PciProbe if KMS is enabled

This copies the radeon_kernel_mode_enabled() function from radeon's
radeon_probe.c's radeon_get_scrninfo(), and puts it into
rhd_driver.c's RHDPciProbe().

If kernel modesetting (KMS) is detected and active, we abort the
PciProbe and do not touch the GPU in any way.

Then at least the KMS console continues working, and there is an
error message for the user to read.
---
 src/rhd_driver.c |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/src/rhd_driver.c b/src/rhd_driver.c
index 2d7f803..058a308 100644
--- a/src/rhd_driver.c
+++ b/src/rhd_driver.c
@@ -2,6 +2,7 @@
  * Copyright 2007-2009  Luc Verhaegen <libv at exsuse.de>
  * Copyright 2007-2009  Matthias Hopf <mhopf at novell.com>
  * Copyright 2007-2009  Egbert Eich   <eich at novell.com>
+ * Copyright      2009  Dave Airlie   <airlied at redhat.com>
  * Copyright 2007-2009  Advanced Micro Devices, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -88,6 +89,7 @@
 #define _XF86DRI_SERVER_
 #include "dri.h"
 #include "GL/glxint.h"
+#include "xf86drmMode.h"
 #endif
 
 #if HAVE_XF86_ANSIC_H
@@ -398,6 +400,34 @@ RHDAvailableOptions(int chipid, int busid)
  *
  */
 #ifdef XSERVER_LIBPCIACCESS
+
+/* The radeon_kernel_mode_enabled() function is taken verbatim from
+ * radeon's radeon_probe.c file. */
+static Bool radeon_kernel_mode_enabled(ScrnInfoPtr pScrn, struct pci_device *pci_dev)
+{
+    char *busIdString;
+    int ret;
+
+    if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
+      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] No DRICreatePCIBusID symbol, no kernel modesetting.\n");
+	return FALSE;
+    }
+
+    busIdString = DRICreatePCIBusID(pci_dev);
+    ret = drmCheckModesettingSupported(busIdString);
+    xfree(busIdString);
+    if (ret) {
+      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] drm report modesetting isn't supported.\n");
+	return FALSE;
+    }
+
+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] Kernel modesetting enabled.\n");
+    return TRUE;
+}
+
 static Bool
 RHDPciProbe(DriverPtr drv, int entityNum,
 	    struct pci_device *dev, intptr_t matchData)
@@ -409,6 +439,18 @@ RHDPciProbe(DriverPtr drv, int entityNum,
 				RES_SHARED_VGA, NULL, NULL, NULL, NULL);
     if (pScrn != NULL) {
 
+	if (dev) {
+	    Bool kms = radeon_kernel_mode_enabled(pScrn, dev);
+	    if (kms) {
+		xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 0,
+		    "FATAL: RADEONHD does not work with kernel modesetting (KMS).\n"
+		    "\tAppend \"nomodeset\" or \"radeon.modeset=0\" (depending\n"
+		    "\ton your kernel version, or just add both to be sure) to \n"
+		    "\tyour kernel command line in /boot/grub/grub.conf.\n");
+		return FALSE;
+	    }
+	}
+
 	pScrn->driverVersion = RHD_VERSION;
 	pScrn->driverName    = RHD_DRIVER_NAME;
 	pScrn->name          = RHD_NAME;
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	12 Nov 2009 15:30:07 -0000	1.50
+++ .cvsignore	4 Dec 2009 00:33:00 -0000	1.51
@@ -1 +1 @@
-xf86-video-radeonhd-1.3.0-20091112git.tar.lzma
+xf86-video-radeonhd-1.3.0-20091204git.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	12 Nov 2009 15:30:08 -0000	1.51
+++ sources	4 Dec 2009 00:33:00 -0000	1.52
@@ -1 +1 @@
-5b4c5aa647b53866f78c2aea479739ee  xf86-video-radeonhd-1.3.0-20091112git.tar.lzma
+1bab87280d94db5197c3b700b05024a3  xf86-video-radeonhd-1.3.0-20091204git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xorg-x11-drv-radeonhd-README.fedora	12 Nov 2009 15:30:08 -0000	1.51
+++ xorg-x11-drv-radeonhd-README.fedora	4 Dec 2009 00:33:01 -0000	1.52
@@ -11,7 +11,7 @@ quickly (and releases happen too infrequ
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a
+Latest upstream commit: 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8
 
 
 Contents
@@ -57,7 +57,8 @@ handled by radeon(4) from the xorg-x11-d
 
 To use the radeonhd(4) driver from the xorg-x11-drv-radeonhd
 package instead, you need to adapt your /etc/X11/xorg.conf file,
-or create it if it does not exist yet.
+or create[https://fedoraproject.org/wiki/How_to_create_xorg.conf]
+it if it does not exist yet.
 
 A minimal /etc/X11/xorg.conf file could look like this:
 
@@ -67,6 +68,12 @@ A minimal /etc/X11/xorg.conf file could 
         Option "DRI" "on"
     EndSection
 
+Additionally, you need to modify your /boot/grub/grub.conf file to
+add the "nomodeset" or "radeon.modeset=0" kernel boot command
+line parameter to disable KMS.
+
+If unsure, just adding both parameters should do the job.
+
 
 4. Known Issues
 ===============


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- xorg-x11-drv-radeonhd.spec	12 Nov 2009 15:30:08 -0000	1.67
+++ xorg-x11-drv-radeonhd.spec	4 Dec 2009 00:33:01 -0000	1.68
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20091112
-%define git_commit 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a
+%define date 20091204
+%define git_commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -30,10 +30,10 @@
 %define ship_utils 1
 %endif
 
-Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
+Summary:       Xorg X11 radeonhd driver for AMD GPG r[5-8]xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.3.0
-Release:       3.15%{?alphatag}%{?dist}
+Release:       4.2%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -64,6 +64,9 @@ Source11:      %{name}-Generate-xinf-fil
 # Upstream does not install rhd_conntest, but we do. Adapt docs accordingly.
 Patch100:      xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch
 
+# Abort driver init and Xorg startup when KMS is enabled
+Patch110:      xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch
+
 # 200-299: Misc patches
 
 ExcludeArch:   s390 s390x
@@ -105,7 +108,7 @@ BuildRequires: libXext-devel
 
 
 %description
-X.org X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets.
+X.org X11 radeonhd driver for AMD GPG r5xx/r6xx/r7xx/r8xx Chipsets.
 %if %{snapshot}
 This package is a snapshot of a work in progress. You may experience
 regressions, bugs, errors, broken displays, and other undesirable phenomena.
@@ -119,6 +122,7 @@ Built from git commit: %{git_commit}
 %setup -q -n %{tarball}
 %if %{snapshot}
 %patch100 -p1 -b .conntest-docrefs
+%patch110 -p1 -b .kms-check
 %endif
 sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c
 
@@ -170,6 +174,12 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %endif
 
 %changelog
+* Fri Dec 04 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-4.2.20091204git
+- Abort driver startup if kernel modesetting (KMS) is enabled
+- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
+  - 98d1d5f6: Blacklist: Marking 0x9710, 0x1043, 0x83A2 hotplug unusable.
+  - f7aed406: conntest: Update PCI ID list.
+
 * Thu Nov 12 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-3.15.20091112git
 - Skipping the 1.3.0 release due to a838114e and probably other fixes.
 - New snapshot (upstream commit 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a):



From ndim at fedoraproject.org  Fri Dec  4 00:43:52 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 00:43:52 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/F-12
	xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch,
	NONE, 1.1 .cvsignore, 1.50, 1.51 sources, 1.51,
	1.52 xorg-x11-drv-radeonhd-README.fedora, 1.51,
	1.52 xorg-x11-drv-radeonhd.spec, 1.67, 1.68
Message-ID: <20091204004352.B055511C00EE@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20877

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Added Files:
	xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch 
Log Message:
* Fri Dec 04 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-4.2.20091204git
- Abort driver startup if kernel modesetting (KMS) is enabled
- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
  - 98d1d5f6: Blacklist: Marking 0x9710, 0x1043, 0x83A2 hotplug unusable.
  - f7aed406: conntest: Update PCI ID list.


xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch:
 rhd_driver.c |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch ---
>From e6e4a2ff28a841f788d4ff28d3fb175c9ae69a63 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Fri, 4 Dec 2009 01:26:25 +0100
Subject: [PATCH] Fail PciProbe if KMS is enabled

This copies the radeon_kernel_mode_enabled() function from radeon's
radeon_probe.c's radeon_get_scrninfo(), and puts it into
rhd_driver.c's RHDPciProbe().

If kernel modesetting (KMS) is detected and active, we abort the
PciProbe and do not touch the GPU in any way.

Then at least the KMS console continues working, and there is an
error message for the user to read.
---
 src/rhd_driver.c |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/src/rhd_driver.c b/src/rhd_driver.c
index 2d7f803..058a308 100644
--- a/src/rhd_driver.c
+++ b/src/rhd_driver.c
@@ -2,6 +2,7 @@
  * Copyright 2007-2009  Luc Verhaegen <libv at exsuse.de>
  * Copyright 2007-2009  Matthias Hopf <mhopf at novell.com>
  * Copyright 2007-2009  Egbert Eich   <eich at novell.com>
+ * Copyright      2009  Dave Airlie   <airlied at redhat.com>
  * Copyright 2007-2009  Advanced Micro Devices, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -88,6 +89,7 @@
 #define _XF86DRI_SERVER_
 #include "dri.h"
 #include "GL/glxint.h"
+#include "xf86drmMode.h"
 #endif
 
 #if HAVE_XF86_ANSIC_H
@@ -398,6 +400,34 @@ RHDAvailableOptions(int chipid, int busid)
  *
  */
 #ifdef XSERVER_LIBPCIACCESS
+
+/* The radeon_kernel_mode_enabled() function is taken verbatim from
+ * radeon's radeon_probe.c file. */
+static Bool radeon_kernel_mode_enabled(ScrnInfoPtr pScrn, struct pci_device *pci_dev)
+{
+    char *busIdString;
+    int ret;
+
+    if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
+      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] No DRICreatePCIBusID symbol, no kernel modesetting.\n");
+	return FALSE;
+    }
+
+    busIdString = DRICreatePCIBusID(pci_dev);
+    ret = drmCheckModesettingSupported(busIdString);
+    xfree(busIdString);
+    if (ret) {
+      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] drm report modesetting isn't supported.\n");
+	return FALSE;
+    }
+
+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] Kernel modesetting enabled.\n");
+    return TRUE;
+}
+
 static Bool
 RHDPciProbe(DriverPtr drv, int entityNum,
 	    struct pci_device *dev, intptr_t matchData)
@@ -409,6 +439,18 @@ RHDPciProbe(DriverPtr drv, int entityNum,
 				RES_SHARED_VGA, NULL, NULL, NULL, NULL);
     if (pScrn != NULL) {
 
+	if (dev) {
+	    Bool kms = radeon_kernel_mode_enabled(pScrn, dev);
+	    if (kms) {
+		xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 0,
+		    "FATAL: RADEONHD does not work with kernel modesetting (KMS).\n"
+		    "\tAppend \"nomodeset\" or \"radeon.modeset=0\" (depending\n"
+		    "\ton your kernel version, or just add both to be sure) to \n"
+		    "\tyour kernel command line in /boot/grub/grub.conf.\n");
+		return FALSE;
+	    }
+	}
+
 	pScrn->driverVersion = RHD_VERSION;
 	pScrn->driverName    = RHD_DRIVER_NAME;
 	pScrn->name          = RHD_NAME;
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	12 Nov 2009 15:30:50 -0000	1.50
+++ .cvsignore	4 Dec 2009 00:43:52 -0000	1.51
@@ -1 +1 @@
-xf86-video-radeonhd-1.3.0-20091112git.tar.lzma
+xf86-video-radeonhd-1.3.0-20091204git.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	12 Nov 2009 15:30:50 -0000	1.51
+++ sources	4 Dec 2009 00:43:52 -0000	1.52
@@ -1 +1 @@
-5b4c5aa647b53866f78c2aea479739ee  xf86-video-radeonhd-1.3.0-20091112git.tar.lzma
+1bab87280d94db5197c3b700b05024a3  xf86-video-radeonhd-1.3.0-20091204git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xorg-x11-drv-radeonhd-README.fedora	12 Nov 2009 15:30:50 -0000	1.51
+++ xorg-x11-drv-radeonhd-README.fedora	4 Dec 2009 00:43:52 -0000	1.52
@@ -11,7 +11,7 @@ quickly (and releases happen too infrequ
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a
+Latest upstream commit: 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8
 
 
 Contents
@@ -57,7 +57,8 @@ handled by radeon(4) from the xorg-x11-d
 
 To use the radeonhd(4) driver from the xorg-x11-drv-radeonhd
 package instead, you need to adapt your /etc/X11/xorg.conf file,
-or create it if it does not exist yet.
+or create[https://fedoraproject.org/wiki/How_to_create_xorg.conf]
+it if it does not exist yet.
 
 A minimal /etc/X11/xorg.conf file could look like this:
 
@@ -67,6 +68,12 @@ A minimal /etc/X11/xorg.conf file could 
         Option "DRI" "on"
     EndSection
 
+Additionally, you need to modify your /boot/grub/grub.conf file to
+add the "nomodeset" or "radeon.modeset=0" kernel boot command
+line parameter to disable KMS.
+
+If unsure, just adding both parameters should do the job.
+
 
 4. Known Issues
 ===============


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-12/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- xorg-x11-drv-radeonhd.spec	12 Nov 2009 15:30:50 -0000	1.67
+++ xorg-x11-drv-radeonhd.spec	4 Dec 2009 00:43:52 -0000	1.68
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20091112
-%define git_commit 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a
+%define date 20091204
+%define git_commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -30,10 +30,10 @@
 %define ship_utils 1
 %endif
 
-Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
+Summary:       Xorg X11 radeonhd driver for AMD GPG r[5-8]xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.3.0
-Release:       3.15%{?alphatag}%{?dist}
+Release:       4.2%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -64,6 +64,9 @@ Source11:      %{name}-Generate-xinf-fil
 # Upstream does not install rhd_conntest, but we do. Adapt docs accordingly.
 Patch100:      xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch
 
+# Abort driver init and Xorg startup when KMS is enabled
+Patch110:      xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch
+
 # 200-299: Misc patches
 
 ExcludeArch:   s390 s390x
@@ -105,7 +108,7 @@ BuildRequires: libXext-devel
 
 
 %description
-X.org X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets.
+X.org X11 radeonhd driver for AMD GPG r5xx/r6xx/r7xx/r8xx Chipsets.
 %if %{snapshot}
 This package is a snapshot of a work in progress. You may experience
 regressions, bugs, errors, broken displays, and other undesirable phenomena.
@@ -119,6 +122,7 @@ Built from git commit: %{git_commit}
 %setup -q -n %{tarball}
 %if %{snapshot}
 %patch100 -p1 -b .conntest-docrefs
+%patch110 -p1 -b .kms-check
 %endif
 sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c
 
@@ -170,6 +174,12 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %endif
 
 %changelog
+* Fri Dec 04 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-4.2.20091204git
+- Abort driver startup if kernel modesetting (KMS) is enabled
+- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
+  - 98d1d5f6: Blacklist: Marking 0x9710, 0x1043, 0x83A2 hotplug unusable.
+  - f7aed406: conntest: Update PCI ID list.
+
 * Thu Nov 12 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-3.15.20091112git
 - Skipping the 1.3.0 release due to a838114e and probably other fixes.
 - New snapshot (upstream commit 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a):



From ndim at fedoraproject.org  Fri Dec  4 00:43:52 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 00:43:52 +0000 (UTC)
Subject: rpms/xorg-x11-drv-radeonhd/F-11
	xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch,
	NONE, 1.1 .cvsignore, 1.50, 1.51 sources, 1.51,
	1.52 xorg-x11-drv-radeonhd-README.fedora, 1.51,
	1.52 xorg-x11-drv-radeonhd.spec, 1.64, 1.65
Message-ID: <20091204004352.7018D11C00EE@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20888

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd.spec 
Added Files:
	xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch 
Log Message:
* Fri Dec 04 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-4.2.20091204git
- Abort driver startup if kernel modesetting (KMS) is enabled
- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
  - 98d1d5f6: Blacklist: Marking 0x9710, 0x1043, 0x83A2 hotplug unusable.
  - f7aed406: conntest: Update PCI ID list.


xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch:
 rhd_driver.c |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch ---
>From e6e4a2ff28a841f788d4ff28d3fb175c9ae69a63 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Fri, 4 Dec 2009 01:26:25 +0100
Subject: [PATCH] Fail PciProbe if KMS is enabled

This copies the radeon_kernel_mode_enabled() function from radeon's
radeon_probe.c's radeon_get_scrninfo(), and puts it into
rhd_driver.c's RHDPciProbe().

If kernel modesetting (KMS) is detected and active, we abort the
PciProbe and do not touch the GPU in any way.

Then at least the KMS console continues working, and there is an
error message for the user to read.
---
 src/rhd_driver.c |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/src/rhd_driver.c b/src/rhd_driver.c
index 2d7f803..058a308 100644
--- a/src/rhd_driver.c
+++ b/src/rhd_driver.c
@@ -2,6 +2,7 @@
  * Copyright 2007-2009  Luc Verhaegen <libv at exsuse.de>
  * Copyright 2007-2009  Matthias Hopf <mhopf at novell.com>
  * Copyright 2007-2009  Egbert Eich   <eich at novell.com>
+ * Copyright      2009  Dave Airlie   <airlied at redhat.com>
  * Copyright 2007-2009  Advanced Micro Devices, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -88,6 +89,7 @@
 #define _XF86DRI_SERVER_
 #include "dri.h"
 #include "GL/glxint.h"
+#include "xf86drmMode.h"
 #endif
 
 #if HAVE_XF86_ANSIC_H
@@ -398,6 +400,34 @@ RHDAvailableOptions(int chipid, int busid)
  *
  */
 #ifdef XSERVER_LIBPCIACCESS
+
+/* The radeon_kernel_mode_enabled() function is taken verbatim from
+ * radeon's radeon_probe.c file. */
+static Bool radeon_kernel_mode_enabled(ScrnInfoPtr pScrn, struct pci_device *pci_dev)
+{
+    char *busIdString;
+    int ret;
+
+    if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
+      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] No DRICreatePCIBusID symbol, no kernel modesetting.\n");
+	return FALSE;
+    }
+
+    busIdString = DRICreatePCIBusID(pci_dev);
+    ret = drmCheckModesettingSupported(busIdString);
+    xfree(busIdString);
+    if (ret) {
+      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] drm report modesetting isn't supported.\n");
+	return FALSE;
+    }
+
+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+		   "[KMS] Kernel modesetting enabled.\n");
+    return TRUE;
+}
+
 static Bool
 RHDPciProbe(DriverPtr drv, int entityNum,
 	    struct pci_device *dev, intptr_t matchData)
@@ -409,6 +439,18 @@ RHDPciProbe(DriverPtr drv, int entityNum,
 				RES_SHARED_VGA, NULL, NULL, NULL, NULL);
     if (pScrn != NULL) {
 
+	if (dev) {
+	    Bool kms = radeon_kernel_mode_enabled(pScrn, dev);
+	    if (kms) {
+		xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 0,
+		    "FATAL: RADEONHD does not work with kernel modesetting (KMS).\n"
+		    "\tAppend \"nomodeset\" or \"radeon.modeset=0\" (depending\n"
+		    "\ton your kernel version, or just add both to be sure) to \n"
+		    "\tyour kernel command line in /boot/grub/grub.conf.\n");
+		return FALSE;
+	    }
+	}
+
 	pScrn->driverVersion = RHD_VERSION;
 	pScrn->driverName    = RHD_DRIVER_NAME;
 	pScrn->name          = RHD_NAME;
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	12 Nov 2009 15:30:53 -0000	1.50
+++ .cvsignore	4 Dec 2009 00:43:52 -0000	1.51
@@ -1 +1 @@
-xf86-video-radeonhd-1.3.0-20091112git.tar.lzma
+xf86-video-radeonhd-1.3.0-20091204git.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	12 Nov 2009 15:30:53 -0000	1.51
+++ sources	4 Dec 2009 00:43:52 -0000	1.52
@@ -1 +1 @@
-5b4c5aa647b53866f78c2aea479739ee  xf86-video-radeonhd-1.3.0-20091112git.tar.lzma
+1bab87280d94db5197c3b700b05024a3  xf86-video-radeonhd-1.3.0-20091204git.tar.lzma


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xorg-x11-drv-radeonhd-README.fedora	12 Nov 2009 15:30:53 -0000	1.51
+++ xorg-x11-drv-radeonhd-README.fedora	4 Dec 2009 00:43:52 -0000	1.52
@@ -11,7 +11,7 @@ quickly (and releases happen too infrequ
 package tarball releases. For this reason, we are packaging selected
 snapshots of upstream's git repository here.
 
-Latest upstream commit: 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a
+Latest upstream commit: 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8
 
 
 Contents
@@ -57,7 +57,8 @@ handled by radeon(4) from the xorg-x11-d
 
 To use the radeonhd(4) driver from the xorg-x11-drv-radeonhd
 package instead, you need to adapt your /etc/X11/xorg.conf file,
-or create it if it does not exist yet.
+or create[https://fedoraproject.org/wiki/How_to_create_xorg.conf]
+it if it does not exist yet.
 
 A minimal /etc/X11/xorg.conf file could look like this:
 
@@ -67,6 +68,12 @@ A minimal /etc/X11/xorg.conf file could 
         Option "DRI" "on"
     EndSection
 
+Additionally, you need to modify your /boot/grub/grub.conf file to
+add the "nomodeset" or "radeon.modeset=0" kernel boot command
+line parameter to disable KMS.
+
+If unsure, just adding both parameters should do the job.
+
 
 4. Known Issues
 ===============


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-11/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- xorg-x11-drv-radeonhd.spec	12 Nov 2009 15:30:53 -0000	1.64
+++ xorg-x11-drv-radeonhd.spec	4 Dec 2009 00:43:52 -0000	1.65
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20091112
-%define git_commit 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a
+%define date 20091204
+%define git_commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -30,10 +30,10 @@
 %define ship_utils 1
 %endif
 
-Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
+Summary:       Xorg X11 radeonhd driver for AMD GPG r[5-8]xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.3.0
-Release:       3.15%{?alphatag}%{?dist}
+Release:       4.2%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -64,6 +64,9 @@ Source11:      %{name}-Generate-xinf-fil
 # Upstream does not install rhd_conntest, but we do. Adapt docs accordingly.
 Patch100:      xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch
 
+# Abort driver init and Xorg startup when KMS is enabled
+Patch110:      xorg-x11-drv-radeonhd-Fail-PciProbe-if-KMS-is-enabled.patch
+
 # 200-299: Misc patches
 
 ExcludeArch:   s390 s390x
@@ -105,7 +108,7 @@ BuildRequires: libXext-devel
 
 
 %description
-X.org X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets.
+X.org X11 radeonhd driver for AMD GPG r5xx/r6xx/r7xx/r8xx Chipsets.
 %if %{snapshot}
 This package is a snapshot of a work in progress. You may experience
 regressions, bugs, errors, broken displays, and other undesirable phenomena.
@@ -119,6 +122,7 @@ Built from git commit: %{git_commit}
 %setup -q -n %{tarball}
 %if %{snapshot}
 %patch100 -p1 -b .conntest-docrefs
+%patch110 -p1 -b .kms-check
 %endif
 sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c
 
@@ -170,6 +174,12 @@ sed -i 's|\(built from %%s\)\\n\\n"|\1\\
 %endif
 
 %changelog
+* Fri Dec 04 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-4.2.20091204git
+- Abort driver startup if kernel modesetting (KMS) is enabled
+- New snapshot (upstream commit 98d1d5f68f5be3f9dc3cd4b483ca4bea708e1eb8):
+  - 98d1d5f6: Blacklist: Marking 0x9710, 0x1043, 0x83A2 hotplug unusable.
+  - f7aed406: conntest: Update PCI ID list.
+
 * Thu Nov 12 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.3.0-3.15.20091112git
 - Skipping the 1.3.0 release due to a838114e and probably other fixes.
 - New snapshot (upstream commit 6387ab4c1d0ff71e556b1c96f21b4e765a6c8e5a):



From guidograzioli at fedoraproject.org  Fri Dec  4 00:51:43 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri,  4 Dec 2009 00:51:43 +0000 (UTC)
Subject: File mygui-2.3.0-2332svn.tar.bz2 uploaded to lookaside cache by
	guidograzioli
Message-ID: <20091204005143.9672010F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mygui:

4b4fb317f253c42b56756faeeb3ef8c4  mygui-2.3.0-2332svn.tar.bz2



From guidograzioli at fedoraproject.org  Fri Dec  4 00:53:41 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri,  4 Dec 2009 00:53:41 +0000 (UTC)
Subject: rpms/mygui/devel MyGUI-Demos, NONE, 1.1 MyGUI-Tools, NONE,
	1.1 import.log, NONE, 1.1 mygui-layouteditor.desktop, NONE,
	1.1 mygui.spec, NONE, 1.1 mygui_missing_headers.patch, NONE,
	1.1 mygui_multilib_cflags.patch, NONE, 1.1 resources.xml, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091204005341.6A5AA11C00EE@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/mygui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23677/devel

Modified Files:
	.cvsignore sources 
Added Files:
	MyGUI-Demos MyGUI-Tools import.log mygui-layouteditor.desktop 
	mygui.spec mygui_missing_headers.patch 
	mygui_multilib_cflags.patch resources.xml 
Log Message:
* Fri Nov 27 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.4.2332svn
- Install OGRE platform headers

* Wed Nov 18 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.3.2332svn
- Fix macros usage
- Fix Release tag
- Add desktop entry for LayoutEditor
- Update patch to fix missing undefined non-weak symbols
- Improve summaries and descriptions
- Remove redundant VERBOSE flag
- Add graphviz BR to generate doxygen graphs

* Fri Oct 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-2.2332svn
- Fix includes dir
- Remove plugin

* Fri Oct 13 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-1.2332svn
- Upstream to svn revision 2332
- Patch cmake build scripts to support multilib
- Fix package summaries
- Fix changelog
- Fix %%doc
- Add Require: ogre-devel to -devel subpackage
- Add -devel-doc subpackage
- Revert source tarball from xz to bzip2

* Sat Oct 03 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-4.1861svn
- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480)

* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-3.1861svn
- Improve package summary
- Provide scripts to run MyGUI tools

* Wed Sep 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-2.1861svn
- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+
- Fix License

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-1.1861svn
- Rename from libmygui to mygui
- Symlink fonts in media dir to dejavu-sans-fonts ones
- Add doxygen generated docs to -devel
- Provide a generic script to setup and run demos
- Fix rpmlint warnings

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-0.1861svn
- Initial packaging




--- NEW FILE MyGUI-Demos ---
#!/bin/sh
# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.

runSample()
{
  sample=$1
  echo "Running $sample..."
  $LIBDIR/MYGUI/Demos/$sample
}

set -e

# find out LIBDIR
if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then
  LIBDIR=/usr/lib64
else
  LIBDIR=/usr/lib
fi

mkdir -p $HOME/.mygui-demos
cd $HOME/.mygui-demos

for i in plugins.cfg resources.xml; do
  cp -f $LIBDIR/MYGUI/Demos/$i .
done

set +e

if [ "$1" = "-a" ]; then
  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
    runSample `echo $i | sed 's|./||'`
  done
elif [ $# -ge 1 ]; then
  while [ $# -ge 1 ]; do
    runSample $1
    shift
  done
else
  echo "Usage:" `basename $0` "(sample)"
  echo
  echo "sample - runs specified sample from list"
  echo
  echo -n "Available samples:"
  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
    echo -n " $i" | sed 's|./||'
  done
  echo
fi


--- NEW FILE MyGUI-Tools ---
#!/bin/sh
# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.

runSample()
{
  sample=$1
  echo "Running $sample..."
  $LIBDIR/MYGUI/Tools/$sample
}

set -e

# find out LIBDIR
if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then
  LIBDIR=/usr/lib64
else
  LIBDIR=/usr/lib
fi

mkdir -p $HOME/.mygui-tools
cd $HOME/.mygui-tools

for i in plugins.cfg resources.xml; do
  cp -f $LIBDIR/MYGUI/Tools/$i .
done

set +e

if [ "$1" = "-a" ]; then
  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
    runSample `echo $i | sed 's|./||'`
  done
elif [ $# -ge 1 ]; then
  while [ $# -ge 1 ]; do
    runSample $1
    shift
  done
else
  echo "Usage:" `basename $0` "(tool)"
  echo
  echo "tool - Runs specified tool from list"
  echo
  echo -n "Available tools:"
  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
    echo -n " $i" | sed 's|./||'
  done
  echo
fi


--- NEW FILE import.log ---
mygui-3_0_0-0_4_2332svn_fc11:HEAD:mygui-3.0.0-0.4.2332svn.fc11.src.rpm:1259887933


--- NEW FILE mygui-layouteditor.desktop ---
[Desktop Entry]
Name=MyGUI Layout Editor
GenericName=MyGUI Layout Editor
Comment=Design UIs usgin MyGUI library
Exec=MyGUI-Tools LayoutEditor
Icon=preferences-system-windows.png
Terminal=false
Type=Application
Categories=Development;


--- NEW FILE mygui.spec ---
Name:           mygui
Version:        3.0.0
Release:        0.4.2332svn%{?dist}
Summary:        Fast, simple and flexible GUI library for Ogre
Group:          Development/Libraries
# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here)
License:        LGPLv3+ 
URL:            http://my-gui.sourceforge.net/
## tar creation instructions
# svn export -r 2332 https://my-gui.svn.sourceforge.net/svnroot/my-gui/trunk mygui
# tar cfj mygui-2.3.0-2332svn.tar.bz2 mygui
Source0:        mygui-2.3.0-2332svn.tar.bz2
# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples
Source1:        MyGUI-Demos
# Another helper for the tools
Source2:        MyGUI-Tools
# Demo and tools resources configuration
Source3:        resources.xml
# LayoutEditor desktop entry
Source4:        mygui-layouteditor.desktop
# Fix multilib and flags with cmake
Patch0:         mygui_multilib_cflags.patch
# Fix compilation problems with gcc4.4
Patch1:         mygui_missing_headers.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake, autoconf, libtool, freetype-devel, desktop-file-utils
BuildRequires:  ois-devel, ogre-devel, doxygen, graphviz, cmake
%if 0%{?fedora} < 12
BuildRequires:  e2fsprogs-devel
%else
BuildRequires:  libuuid-devel
%endif

Requires:       dejavu-sans-fonts


%description
MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast, 
flexible and simple in using. 

%package        devel
Summary:        Development files for MyGUI
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig, ois-devel, ogre-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        devel-doc
Summary:        Development documentation for MyGUI
Group:          Development/Libraries
BuildArch:      noarch

%description    devel-doc
The %{name}-devel-doc package contains reference documentation for
developing applications that use %{name}.


%package demos
Summary:        MyGUI demo executables and media
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description demos
This package contains the compiled (not the source) sample applications coming
with MyGUI.  It also contains some media (meshes, textures,...) needed by these
samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper
script MyGUI-Demos is provided and installed in %{_bindir}.


%package tools
Summary:        MyGUI tools 
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description tools
This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. 
LayoutEditor is an application for designing UIs using MyGUI library,
ImageSetViewer and FontViewer are simple tools to preview graphical
resources in the media repository. 
An helper script MyGUI-Tools is provided and installed in %{_bindir}.


%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
# Fix eol 
sed -i 's/\r//' COPYING.LESSER
# Fix non-UTF8 files
for file in Tools/LayoutEditor/Readme.txt ; do
   mv $file timestamp && \
   iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \
   touch -r timestamp $file && \
   rm timestamp
done
# Generate README for -tools and -demos
cat > Tools/README << EOT
This package contains the MyGUI tools: ImageSetViewer, FontViewer 
and LayoutEditor; to run the tools, launch the helper script
%{_bindir}/MyGUI-Tools
EOT
cat > Demos/README << EOT
This package contains MyGUI demos; to run the demos, launch the
helper script %{_bindir}/MyGUI-Demos
EOT


%build
# Have to run it two times to make it find ogre and freetype
%cmake . 
# Plugins are windows only atm
%cmake . \
   -DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \
   -DMYGUI_BUILD_PLUGINS:BOOL=OFF 
# -DTARGET_LINK_LIBRARIES:STRING="-luuid -ldl"
make %{?_smp_mflags}
# Generate doxygen documentation
pushd Docs
doxygen
rm -f html/installdox
popd


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
# install missing headers
install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI
install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI

# Remove any archive
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# Remove binaries installed in %%{_bindir}
rm -rf %{buildroot}/%{_bindir}/

# Create config for ldconfig
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{_libdir}/MYGUI" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf 

# Install the samples 
mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos 
cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
    %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
    %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
# Remove sample showing plugin usage
rm bin/Demo_PluginStrangeButton
for file in bin/Demo_* ; do
  install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file`
done
mkdir -p %{buildroot}%{_bindir}
install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}

# Install the tools
mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools
cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
    %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg
sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
    %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg
for file in bin/LayoutEditor bin/ImageSetViewer bin/FontViewer ; do
  install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file`
done
install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}

# Install desktop entry for LayoutEditor
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}

# Copy Media files
mkdir -p %{buildroot}%{_datadir}/MyGUI/
cp -a Media %{buildroot}%{_datadir}/MyGUI/

# Install libMyGUI.OgrePlatform.so
mkdir -p %{buildroot}%{_libdir}/MYGUI
install -Dp -m 755 %{_lib}/libMyGUI.OgrePlatform.so %{buildroot}%{_libdir}/MYGUI/

# Move plugins to %{libdir}/MYGUI (no plugins atm)
#mv %{buildroot}%{_libdir}/libPlugin*.so %{buildroot}%{_libdir}/MYGUI

# Strip away code in media dir
#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/
# Strip away unittests media 
rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests

# Link fonts from dejavu package
ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \
  %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf
ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \
  %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.LESSER
%{_libdir}/*.so.*
%{_libdir}/MYGUI
%dir %{_datadir}/MyGUI/Media
%{_datadir}/MyGUI/Media/Common
%{_datadir}/MyGUI/Media/MyGUI_Media
%{_datadir}/MyGUI/Media/*.layout
%{_datadir}/MyGUI/Media/*.xml
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* 


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%files devel-doc
%defattr(-,root,root,-)
%doc Docs/html


%files demos
%defattr(-,root,root,-)
%doc Demos/README
%{_bindir}/MyGUI-Demos
%{_libdir}/MYGUI/Demos
%{_datadir}/MyGUI/Media/Demos


%files tools
%defattr(-,root,root,-)
%doc Tools/README Tools/LayoutEditor/Readme.txt
%{_bindir}/MyGUI-Tools
%{_libdir}/MYGUI/Tools
%{_datadir}/MyGUI/Media/Tools
%{_datadir}/applications/mygui-layouteditor.desktop


%changelog
* Fri Nov 27 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.4.2332svn
- Install OGRE platform headers

* Wed Nov 18 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.3.2332svn
- Fix macros usage
- Fix Release tag
- Add desktop entry for LayoutEditor
- Update patch to fix missing undefined non-weak symbols
- Improve summaries and descriptions
- Remove redundant VERBOSE flag
- Add graphviz BR to generate doxygen graphs

* Fri Oct 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-2.2332svn
- Fix includes dir
- Remove plugin

* Fri Oct 13 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-1.2332svn
- Upstream to svn revision 2332
- Patch cmake build scripts to support multilib
- Fix package summaries
- Fix changelog
- Fix %%doc
- Add Require: ogre-devel to -devel subpackage
- Add -devel-doc subpackage
- Revert source tarball from xz to bzip2

* Sat Oct 03 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-4.1861svn
- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480)

* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-3.1861svn
- Improve package summary
- Provide scripts to run MyGUI tools

* Wed Sep 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-2.1861svn
- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+
- Fix License

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-1.1861svn
- Rename from libmygui to mygui
- Symlink fonts in media dir to dejavu-sans-fonts ones
- Add doxygen generated docs to -devel
- Provide a generic script to setup and run demos 
- Fix rpmlint warnings

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-0.1861svn
- Initial packaging

mygui_missing_headers.patch:
 MyGUIEngine/include/MyGUI_IRenderTarget.h                     |    1 +
 MyGUIEngine/include/MyGUI_ITexture.h                          |    1 +
 MyGUIEngine/include/MyGUI_RenderFormat.h                      |    2 ++
 MyGUIEngine/include/MyGUI_VertexData.h                        |    1 +
 Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h      |    2 +-
 Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h |    1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE mygui_missing_headers.patch ---
--- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2009-09-30 01:35:13.000000000 +0200
+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2009-11-27 17:19:29.488111573 +0100
@@ -29,7 +29,7 @@
 #include "MyGUI_OgreRenderManager.h"
 #include "MyGUI_OgreDataManager.h"
 #include "MyGUI_OgreDiagnostic.h"
-#include "MyGUI_OgreTexture.h"
+#include "MyGUI_LogManager.h"
 
 namespace MyGUI
 {
--- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2009-09-30 02:10:57.000000000 +0200
+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2009-11-27 17:08:52.381859930 +0100
@@ -27,6 +27,7 @@
 #include "MyGUI_RenderFormat.h"
 #include "MyGUI_IVertexBuffer.h"
 #include "MyGUI_RenderManager.h"
+#include "MyGUI_Types.h"
 
 #include <Ogre.h>
 
--- A/MyGUIEngine/include/MyGUI_IRenderTarget.h	2009-09-24 01:54:35.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_IRenderTarget.h	2009-11-27 17:41:13.102861792 +0100
@@ -23,6 +23,7 @@
 #ifndef __MYGUI_I_RENDER_TARGET_H__
 #define __MYGUI_I_RENDER_TARGET_H__
 
+#include <string>
 #include "MyGUI_Prerequest.h"
 #include "MyGUI_RenderTargetInfo.h"
 
--- A/MyGUIEngine/include/MyGUI_ITexture.h	2009-09-24 01:54:35.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_ITexture.h	2009-11-27 17:41:48.046874847 +0100
@@ -26,6 +26,7 @@
 #include "MyGUI_Prerequest.h"
 #include "MyGUI_IRenderTarget.h"
 #include "MyGUI_RenderFormat.h"
+#include <string>
 
 namespace MyGUI
 {
--- A/MyGUIEngine/include/MyGUI_RenderFormat.h	2009-09-28 03:19:58.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_RenderFormat.h	2009-11-27 17:02:14.622875175 +0100
@@ -23,6 +23,8 @@
 #ifndef __MYGUI_RENDER_FORMAT_H__
 #define __MYGUI_RENDER_FORMAT_H__
 
+#include "MyGUI_Macros.h"
+
 namespace MyGUI
 {
 
--- A/MyGUIEngine/include/MyGUI_VertexData.h	2009-06-04 04:34:12.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_VertexData.h	2009-11-27 17:08:23.382859907 +0100
@@ -24,6 +24,7 @@
 #define __MYGUI_VERTEX_DATA_H__
 
 #include "MyGUI_Prerequest.h"
+#include "MyGUI_Types.h"
 
 namespace MyGUI
 {

mygui_multilib_cflags.patch:
 CMake/ConfigureBuild.cmake           |    2 +-
 CMake/Templates/MYGUI.pc.in          |    6 +++---
 CMake/Utils/MyGUIConfigTargets.cmake |   10 ++++++----
 CMakeLists.txt                       |   10 +++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE mygui_multilib_cflags.patch ---
--- A/CMakeLists.txt	2009-10-12 23:45:57.564750326 +0200
+++ B/CMakeLists.txt	2009-10-12 23:46:25.879489254 +0200
@@ -46,9 +46,9 @@
 endif ()
 
 # Set compiler specific build flags
-if (CMAKE_COMPILER_IS_GNUCXX)
-	add_definitions(-msse)
-endif ()
+#if (CMAKE_COMPILER_IS_GNUCXX)
+#	add_definitions(-msse)
+#endif ()
 if (MSVC)
 	add_definitions(/fp:fast)
 endif ()
@@ -87,8 +87,8 @@
 set(MYGUI_LIBRARIES MyGUIEngine)
 
 # Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
 if (WIN32 OR APPLE)
 	if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
--- A/CMake/ConfigureBuild.cmake	2009-10-12 23:53:41.447496281 +0200
+++ B/CMake/ConfigureBuild.cmake	2009-10-13 00:02:30.243489356 +0200
@@ -44,7 +44,7 @@
   else ()
     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
   endif ()
-  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
+  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
   # configure additional packages
   
--- A/CMake/Utils/MyGUIConfigTargets.cmake	2009-10-13 00:44:05.003749853 +0200
+++ B/CMake/Utils/MyGUIConfigTargets.cmake	2009-10-13 00:48:18.378490236 +0200
@@ -38,8 +38,8 @@
 function(mygui_install_target TARGETNAME SUFFIX)
   install(TARGETS ${TARGETNAME}
     RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
-    LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-    ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+    LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+    ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
     FRAMEWORK DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
   )
   install(TARGETS ${TARGETNAME}
@@ -65,8 +65,8 @@
 # setup common target settings
 function(mygui_config_common TARGETNAME)
   set_target_properties(${TARGETNAME} PROPERTIES
-    ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
-    LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
+    ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
+    LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
     RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
   )
   mygui_create_vcproj_userfile(${TARGETNAME})
@@ -198,6 +198,8 @@
     set_target_properties(${LIBNAME} PROPERTIES OUTPUT_NAME ${LIBNAME}Static)
   else (MYGUI_STATIC)
     if (CMAKE_COMPILER_IS_GNUCXX)
+      target_link_libraries(${LIBNAME} uuid)
+      target_link_libraries(${LIBNAME} dl)
       # add GCC visibility flags to shared library build
       set_target_properties(${LIBNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")
 	endif (CMAKE_COMPILER_IS_GNUCXX)
--- A/CMake/Templates/MYGUI.pc.in	2009-10-13 00:29:15.429738822 +0200
+++ B/CMake/Templates/MYGUI.pc.in	2009-10-30 15:22:03.687723109 +0100
@@ -1,11 +1,11 @@
 prefix=@MYGUI_PREFIX_PATH@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=${prefix}/lib at LIB_SUFFIX@
 includedir=${prefix}/include
 
 Name: MyGUI
 Description: Fast, flexible and simple GUI
 Version: @MYGUI_VERSION@
 URL: http://www.my-gui.sourceforge.net
-Libs: -L${libdir} -lMyGUIEngine at MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
-Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine at MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
+Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@



--- NEW FILE resources.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<Paths>
  <Path root="true">/usr/share/MyGUI/Media</Path>
  <Path>/usr/share/MyGUI/Media/MyGUI_Media</Path>
  <Path>/usr/share/MyGUI/Media/Tools/LayoutEditor</Path>
</Paths>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mygui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:51:10 -0000	1.1
+++ .cvsignore	4 Dec 2009 00:53:40 -0000	1.2
@@ -0,0 +1 @@
+mygui-2.3.0-2332svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mygui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:51:10 -0000	1.1
+++ sources	4 Dec 2009 00:53:41 -0000	1.2
@@ -0,0 +1 @@
+4b4fb317f253c42b56756faeeb3ef8c4  mygui-2.3.0-2332svn.tar.bz2



From jcollie at fedoraproject.org  Fri Dec  4 01:01:01 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  4 Dec 2009 01:01:01 +0000 (UTC)
Subject: rpms/pitivi/F-12 pitivi.spec,1.41,1.42
Message-ID: <20091204010101.784BD11C00EE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25919

Modified Files:
	pitivi.spec 
Log Message:
* Thu Dec  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3
- Add Req on python-setuptools for BZ#540192



Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-12/pitivi.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- pitivi.spec	23 Sep 2009 19:28:50 -0000	1.41
+++ pitivi.spec	4 Dec 2009 01:01:01 -0000	1.42
@@ -2,7 +2,7 @@
 %define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -19,25 +19,12 @@ Requires:       gstreamer-plugins-base >
 Requires:       pygtk2 >= 2.14.0
 Requires:       python-zope-interface
 Requires:       pygoocanvas
+Requires:       python-setuptools
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool => 0.35.0
 BuildRequires:  python-setuptools
 
-#BuildRequires:  gnonlin >= 0.10.12.2
-#BuildRequires:  gstreamer-python >= 0.10.16
-#BuildRequires:  gstreamer-devel >= 0.10.24
-#BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
-#BuildRequires:  GConf2-devel
-#BuildRequires:  gtk2-devel >= 2.8
-#BuildRequires:  pygtk2-devel >= 2.14.0
-#BuildRequires:  pygtk2-libglade >= 2.14.0
-#BuildRequires:  gtk-doc
-#BuildRequires:  pkgconfig
-#BuildRequires:  gnome-python2
-#BuildRequires:  perl(XML::Parser)
-#BuildRequires:  gettext
-
 %description
 Pitivi is an application using the GStreamer multimedia framework to
 manipulate a large set of multimedia sources.
@@ -76,12 +63,14 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING NEWS
 %{_bindir}/pitivi
 %{_datadir}/pitivi
-#%{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/pitivi.*
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Thu Dec  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3
+- Add Req on python-setuptools for BZ#540192
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.13.3-2
 - Update desktop file according to F-12 FedoraStudio feature
 



From kasal at fedoraproject.org  Fri Dec  4 01:03:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 01:03:42 +0000 (UTC)
Subject: rpms/perl-XML-Parser/devel perl-XML-Parser.spec,1.30,1.31
Message-ID: <20091204010342.8067911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26705

Modified Files:
	perl-XML-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser/devel/perl-XML-Parser.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- perl-XML-Parser.spec	24 Aug 2009 14:47:40 -0000	1.30
+++ perl-XML-Parser.spec	4 Dec 2009 01:03:42 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           perl-XML-Parser
 Version:        2.36
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl module for parsing XML files
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.36-7
+- rebuild against perl 5.10.1
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.36-6
 - rebuild against perl without DEBUGGING defined
 



From kasal at fedoraproject.org  Fri Dec  4 01:11:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 01:11:21 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.40,1.41
Message-ID: <20091204011121.8A17E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29105

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- perl-HTML-Parser.spec	2 Nov 2009 09:53:33 -0000	1.40
+++ perl-HTML-Parser.spec	4 Dec 2009 01:11:21 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name:           perl-%{real_name}
 Version:        3.64
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for parsing HTML
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.64-2
+- rebuild against perl 5.10.1
+
 * Mon Nov  2 2009 Stepan Kasal <skasal at redhat.com> - 3.64-1
 - new upstream version
 



From ndim at fedoraproject.org  Fri Dec  4 01:31:10 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 01:31:10 +0000 (UTC)
Subject: File terminus-font-4.30.tar.gz uploaded to lookaside cache by ndim
Message-ID: <20091204013110.D9D1510F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for terminus-fonts:

6f8bd95b593851f9f5c210a9d33cbbf1  terminus-font-4.30.tar.gz



From ndim at fedoraproject.org  Fri Dec  4 01:34:18 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 01:34:18 +0000 (UTC)
Subject: File terminus-font-4.30-dv1.diff.gz uploaded to lookaside cache by
	ndim
Message-ID: <20091204013418.ABD8210F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for terminus-fonts:

a94f276f1ce268e81a1a85dbf1d97376  terminus-font-4.30-dv1.diff.gz



From ndim at fedoraproject.org  Fri Dec  4 01:34:22 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 01:34:22 +0000 (UTC)
Subject: File terminus-font-4.30-ge1.diff.gz uploaded to lookaside cache by
	ndim
Message-ID: <20091204013422.2101510F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for terminus-fonts:

4313d28cdf524c3f8b0539e45031dacc  terminus-font-4.30-ge1.diff.gz



From ndim at fedoraproject.org  Fri Dec  4 01:34:25 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 01:34:25 +0000 (UTC)
Subject: File terminus-font-4.30-ij1.diff.gz uploaded to lookaside cache by
	ndim
Message-ID: <20091204013425.723A910F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for terminus-fonts:

1700ce92665bd8c4f2082e68e1957570  terminus-font-4.30-ij1.diff.gz



From ndim at fedoraproject.org  Fri Dec  4 01:35:52 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 01:35:52 +0000 (UTC)
Subject: rpms/terminus-fonts/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 terminus-fonts.spec, 1.4, 1.5
Message-ID: <20091204013552.79C5D11C00EE@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/terminus-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3188

Modified Files:
	.cvsignore sources terminus-fonts.spec 
Log Message:
* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.30-1
- update to 4.30 release:
  - new size 22 (not very good)
  - 25 additional characters
  - various small fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Feb 2009 20:47:39 -0000	1.2
+++ .cvsignore	4 Dec 2009 01:35:52 -0000	1.3
@@ -1,4 +1,4 @@
-terminus-font-4.28-dv1.diff.gz
-terminus-font-4.28-ge1.diff.gz
-terminus-font-4.28-ij1.diff.gz
-terminus-font-4.28.tar.gz
+terminus-font-4.30.tar.gz
+terminus-font-4.30-dv1.diff.gz
+terminus-font-4.30-ge1.diff.gz
+terminus-font-4.30-ij1.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Feb 2009 20:47:39 -0000	1.2
+++ sources	4 Dec 2009 01:35:52 -0000	1.3
@@ -1,4 +1,4 @@
-74e2db5288065403a58c28672590c1cd  terminus-font-4.28-dv1.diff.gz
-7815830460294d79d8508199499e1408  terminus-font-4.28-ge1.diff.gz
-54ea26d7671d57d611ee4229f000fc10  terminus-font-4.28-ij1.diff.gz
-15bf2f17b625312383fd9dae0925a17e  terminus-font-4.28.tar.gz
+6f8bd95b593851f9f5c210a9d33cbbf1  terminus-font-4.30.tar.gz
+a94f276f1ce268e81a1a85dbf1d97376  terminus-font-4.30-dv1.diff.gz
+4313d28cdf524c3f8b0539e45031dacc  terminus-font-4.30-ge1.diff.gz
+1700ce92665bd8c4f2082e68e1957570  terminus-font-4.30-ij1.diff.gz


Index: terminus-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/devel/terminus-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- terminus-fonts.spec	27 Jul 2009 05:46:58 -0000	1.4
+++ terminus-fonts.spec	4 Dec 2009 01:35:52 -0000	1.5
@@ -16,12 +16,12 @@
 The Terminus Font is designed for long (8 and more hours per day)\
 work with computers.\
 \
-Version 4.28 contains 825 characters, covers about 120 language\
+Version 4.30 contains 850 characters, covers about 120 language\
 sets and supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254,\
 KOI8-R/U/E/F, Esperanto, many IBM, Windows and Macintosh code pages,\
 as well as the IBM VGA, vt100 and xterm pseudographic characters.\
 \
-The sizes present are 6x12, 8x14, 8x16, 10x20, 12x24, 14x28\
+The sizes present are 6x12, 8x14, 8x16, 10x20, 11x22, 12x24, 14x28\
 and 16x32. The styles are normal and bold (except for 6x12),\
 plus EGA/VGA-bold for 8x14 and 8x16.\
 \
@@ -29,8 +29,8 @@ The font is available for the Linux cons
 
 
 Name:		%{fontname}-fonts
-Version:	4.28
-Release:	9%{?dist}
+Version:	4.30
+Release:	1%{?dist}
 Summary:	Clean fixed width font
 
 Group:		User Interface/X
@@ -141,6 +141,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-116n.psf.gz
 %{consolefontdir}/ter-120b.psf.gz
 %{consolefontdir}/ter-120n.psf.gz
+%{consolefontdir}/ter-122b.psf.gz
+%{consolefontdir}/ter-122n.psf.gz
 %{consolefontdir}/ter-124b.psf.gz
 %{consolefontdir}/ter-124n.psf.gz
 %{consolefontdir}/ter-128b.psf.gz
@@ -156,6 +158,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-216n.psf.gz
 %{consolefontdir}/ter-220b.psf.gz
 %{consolefontdir}/ter-220n.psf.gz
+%{consolefontdir}/ter-222b.psf.gz
+%{consolefontdir}/ter-222n.psf.gz
 %{consolefontdir}/ter-224b.psf.gz
 %{consolefontdir}/ter-224n.psf.gz
 %{consolefontdir}/ter-228b.psf.gz
@@ -171,6 +175,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-716n.psf.gz
 %{consolefontdir}/ter-720b.psf.gz
 %{consolefontdir}/ter-720n.psf.gz
+%{consolefontdir}/ter-722b.psf.gz
+%{consolefontdir}/ter-722n.psf.gz
 %{consolefontdir}/ter-724b.psf.gz
 %{consolefontdir}/ter-724n.psf.gz
 %{consolefontdir}/ter-728b.psf.gz
@@ -186,6 +192,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-916n.psf.gz
 %{consolefontdir}/ter-920b.psf.gz
 %{consolefontdir}/ter-920n.psf.gz
+%{consolefontdir}/ter-922b.psf.gz
+%{consolefontdir}/ter-922n.psf.gz
 %{consolefontdir}/ter-924b.psf.gz
 %{consolefontdir}/ter-924n.psf.gz
 %{consolefontdir}/ter-928b.psf.gz
@@ -201,6 +209,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-c16n.psf.gz
 %{consolefontdir}/ter-c20b.psf.gz
 %{consolefontdir}/ter-c20n.psf.gz
+%{consolefontdir}/ter-c22b.psf.gz
+%{consolefontdir}/ter-c22n.psf.gz
 %{consolefontdir}/ter-c24b.psf.gz
 %{consolefontdir}/ter-c24n.psf.gz
 %{consolefontdir}/ter-c28b.psf.gz
@@ -216,6 +226,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-d16n.psf.gz
 %{consolefontdir}/ter-d20b.psf.gz
 %{consolefontdir}/ter-d20n.psf.gz
+%{consolefontdir}/ter-d22b.psf.gz
+%{consolefontdir}/ter-d22n.psf.gz
 %{consolefontdir}/ter-d24b.psf.gz
 %{consolefontdir}/ter-d24n.psf.gz
 %{consolefontdir}/ter-d28b.psf.gz
@@ -231,6 +243,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-g16n.psf.gz
 %{consolefontdir}/ter-g20b.psf.gz
 %{consolefontdir}/ter-g20n.psf.gz
+%{consolefontdir}/ter-g22b.psf.gz
+%{consolefontdir}/ter-g22n.psf.gz
 %{consolefontdir}/ter-g24b.psf.gz
 %{consolefontdir}/ter-g24n.psf.gz
 %{consolefontdir}/ter-g28b.psf.gz
@@ -246,6 +260,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-i16n.psf.gz
 %{consolefontdir}/ter-i20b.psf.gz
 %{consolefontdir}/ter-i20n.psf.gz
+%{consolefontdir}/ter-i22b.psf.gz
+%{consolefontdir}/ter-i22n.psf.gz
 %{consolefontdir}/ter-i24b.psf.gz
 %{consolefontdir}/ter-i24n.psf.gz
 %{consolefontdir}/ter-i28b.psf.gz
@@ -261,6 +277,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-k16n.psf.gz
 %{consolefontdir}/ter-k20b.psf.gz
 %{consolefontdir}/ter-k20n.psf.gz
+%{consolefontdir}/ter-k22b.psf.gz
+%{consolefontdir}/ter-k22n.psf.gz
 %{consolefontdir}/ter-k24b.psf.gz
 %{consolefontdir}/ter-k24n.psf.gz
 %{consolefontdir}/ter-k28b.psf.gz
@@ -276,6 +294,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-m16n.psf.gz
 %{consolefontdir}/ter-m20b.psf.gz
 %{consolefontdir}/ter-m20n.psf.gz
+%{consolefontdir}/ter-m22b.psf.gz
+%{consolefontdir}/ter-m22n.psf.gz
 %{consolefontdir}/ter-m24b.psf.gz
 %{consolefontdir}/ter-m24n.psf.gz
 %{consolefontdir}/ter-m28b.psf.gz
@@ -291,6 +311,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-p16n.psf.gz
 %{consolefontdir}/ter-p20b.psf.gz
 %{consolefontdir}/ter-p20n.psf.gz
+%{consolefontdir}/ter-p22b.psf.gz
+%{consolefontdir}/ter-p22n.psf.gz
 %{consolefontdir}/ter-p24b.psf.gz
 %{consolefontdir}/ter-p24n.psf.gz
 %{consolefontdir}/ter-p28b.psf.gz
@@ -306,6 +328,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-u16n.psf.gz
 %{consolefontdir}/ter-u20b.psf.gz
 %{consolefontdir}/ter-u20n.psf.gz
+%{consolefontdir}/ter-u22b.psf.gz
+%{consolefontdir}/ter-u22n.psf.gz
 %{consolefontdir}/ter-u24b.psf.gz
 %{consolefontdir}/ter-u24n.psf.gz
 %{consolefontdir}/ter-u28b.psf.gz
@@ -321,6 +345,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-v16n.psf.gz
 %{consolefontdir}/ter-v20b.psf.gz
 %{consolefontdir}/ter-v20n.psf.gz
+%{consolefontdir}/ter-v22b.psf.gz
+%{consolefontdir}/ter-v22n.psf.gz
 %{consolefontdir}/ter-v24b.psf.gz
 %{consolefontdir}/ter-v24n.psf.gz
 %{consolefontdir}/ter-v28b.psf.gz
@@ -330,6 +356,12 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.30-1
+- update to 4.30 release:
+  - new size 22 (not very good)
+  - 25 additional characters
+  - various small fixes
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.28-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ndim at fedoraproject.org  Fri Dec  4 01:38:04 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 01:38:04 +0000 (UTC)
Subject: rpms/terminus-fonts/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 terminus-fonts.spec, 1.4, 1.5
Message-ID: <20091204013804.3025211C00EE@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/terminus-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4088

Modified Files:
	.cvsignore sources terminus-fonts.spec 
Log Message:
* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.30-1
- update to 4.30 release:
  - new size 22 (not very good)
  - 25 additional characters
  - various small fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Feb 2009 20:47:39 -0000	1.2
+++ .cvsignore	4 Dec 2009 01:38:03 -0000	1.3
@@ -1,4 +1,4 @@
-terminus-font-4.28-dv1.diff.gz
-terminus-font-4.28-ge1.diff.gz
-terminus-font-4.28-ij1.diff.gz
-terminus-font-4.28.tar.gz
+terminus-font-4.30.tar.gz
+terminus-font-4.30-dv1.diff.gz
+terminus-font-4.30-ge1.diff.gz
+terminus-font-4.30-ij1.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Feb 2009 20:47:39 -0000	1.2
+++ sources	4 Dec 2009 01:38:03 -0000	1.3
@@ -1,4 +1,4 @@
-74e2db5288065403a58c28672590c1cd  terminus-font-4.28-dv1.diff.gz
-7815830460294d79d8508199499e1408  terminus-font-4.28-ge1.diff.gz
-54ea26d7671d57d611ee4229f000fc10  terminus-font-4.28-ij1.diff.gz
-15bf2f17b625312383fd9dae0925a17e  terminus-font-4.28.tar.gz
+6f8bd95b593851f9f5c210a9d33cbbf1  terminus-font-4.30.tar.gz
+a94f276f1ce268e81a1a85dbf1d97376  terminus-font-4.30-dv1.diff.gz
+4313d28cdf524c3f8b0539e45031dacc  terminus-font-4.30-ge1.diff.gz
+1700ce92665bd8c4f2082e68e1957570  terminus-font-4.30-ij1.diff.gz


Index: terminus-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/F-12/terminus-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- terminus-fonts.spec	27 Jul 2009 05:46:58 -0000	1.4
+++ terminus-fonts.spec	4 Dec 2009 01:38:03 -0000	1.5
@@ -16,12 +16,12 @@
 The Terminus Font is designed for long (8 and more hours per day)\
 work with computers.\
 \
-Version 4.28 contains 825 characters, covers about 120 language\
+Version 4.30 contains 850 characters, covers about 120 language\
 sets and supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254,\
 KOI8-R/U/E/F, Esperanto, many IBM, Windows and Macintosh code pages,\
 as well as the IBM VGA, vt100 and xterm pseudographic characters.\
 \
-The sizes present are 6x12, 8x14, 8x16, 10x20, 12x24, 14x28\
+The sizes present are 6x12, 8x14, 8x16, 10x20, 11x22, 12x24, 14x28\
 and 16x32. The styles are normal and bold (except for 6x12),\
 plus EGA/VGA-bold for 8x14 and 8x16.\
 \
@@ -29,8 +29,8 @@ The font is available for the Linux cons
 
 
 Name:		%{fontname}-fonts
-Version:	4.28
-Release:	9%{?dist}
+Version:	4.30
+Release:	1%{?dist}
 Summary:	Clean fixed width font
 
 Group:		User Interface/X
@@ -141,6 +141,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-116n.psf.gz
 %{consolefontdir}/ter-120b.psf.gz
 %{consolefontdir}/ter-120n.psf.gz
+%{consolefontdir}/ter-122b.psf.gz
+%{consolefontdir}/ter-122n.psf.gz
 %{consolefontdir}/ter-124b.psf.gz
 %{consolefontdir}/ter-124n.psf.gz
 %{consolefontdir}/ter-128b.psf.gz
@@ -156,6 +158,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-216n.psf.gz
 %{consolefontdir}/ter-220b.psf.gz
 %{consolefontdir}/ter-220n.psf.gz
+%{consolefontdir}/ter-222b.psf.gz
+%{consolefontdir}/ter-222n.psf.gz
 %{consolefontdir}/ter-224b.psf.gz
 %{consolefontdir}/ter-224n.psf.gz
 %{consolefontdir}/ter-228b.psf.gz
@@ -171,6 +175,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-716n.psf.gz
 %{consolefontdir}/ter-720b.psf.gz
 %{consolefontdir}/ter-720n.psf.gz
+%{consolefontdir}/ter-722b.psf.gz
+%{consolefontdir}/ter-722n.psf.gz
 %{consolefontdir}/ter-724b.psf.gz
 %{consolefontdir}/ter-724n.psf.gz
 %{consolefontdir}/ter-728b.psf.gz
@@ -186,6 +192,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-916n.psf.gz
 %{consolefontdir}/ter-920b.psf.gz
 %{consolefontdir}/ter-920n.psf.gz
+%{consolefontdir}/ter-922b.psf.gz
+%{consolefontdir}/ter-922n.psf.gz
 %{consolefontdir}/ter-924b.psf.gz
 %{consolefontdir}/ter-924n.psf.gz
 %{consolefontdir}/ter-928b.psf.gz
@@ -201,6 +209,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-c16n.psf.gz
 %{consolefontdir}/ter-c20b.psf.gz
 %{consolefontdir}/ter-c20n.psf.gz
+%{consolefontdir}/ter-c22b.psf.gz
+%{consolefontdir}/ter-c22n.psf.gz
 %{consolefontdir}/ter-c24b.psf.gz
 %{consolefontdir}/ter-c24n.psf.gz
 %{consolefontdir}/ter-c28b.psf.gz
@@ -216,6 +226,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-d16n.psf.gz
 %{consolefontdir}/ter-d20b.psf.gz
 %{consolefontdir}/ter-d20n.psf.gz
+%{consolefontdir}/ter-d22b.psf.gz
+%{consolefontdir}/ter-d22n.psf.gz
 %{consolefontdir}/ter-d24b.psf.gz
 %{consolefontdir}/ter-d24n.psf.gz
 %{consolefontdir}/ter-d28b.psf.gz
@@ -231,6 +243,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-g16n.psf.gz
 %{consolefontdir}/ter-g20b.psf.gz
 %{consolefontdir}/ter-g20n.psf.gz
+%{consolefontdir}/ter-g22b.psf.gz
+%{consolefontdir}/ter-g22n.psf.gz
 %{consolefontdir}/ter-g24b.psf.gz
 %{consolefontdir}/ter-g24n.psf.gz
 %{consolefontdir}/ter-g28b.psf.gz
@@ -246,6 +260,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-i16n.psf.gz
 %{consolefontdir}/ter-i20b.psf.gz
 %{consolefontdir}/ter-i20n.psf.gz
+%{consolefontdir}/ter-i22b.psf.gz
+%{consolefontdir}/ter-i22n.psf.gz
 %{consolefontdir}/ter-i24b.psf.gz
 %{consolefontdir}/ter-i24n.psf.gz
 %{consolefontdir}/ter-i28b.psf.gz
@@ -261,6 +277,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-k16n.psf.gz
 %{consolefontdir}/ter-k20b.psf.gz
 %{consolefontdir}/ter-k20n.psf.gz
+%{consolefontdir}/ter-k22b.psf.gz
+%{consolefontdir}/ter-k22n.psf.gz
 %{consolefontdir}/ter-k24b.psf.gz
 %{consolefontdir}/ter-k24n.psf.gz
 %{consolefontdir}/ter-k28b.psf.gz
@@ -276,6 +294,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-m16n.psf.gz
 %{consolefontdir}/ter-m20b.psf.gz
 %{consolefontdir}/ter-m20n.psf.gz
+%{consolefontdir}/ter-m22b.psf.gz
+%{consolefontdir}/ter-m22n.psf.gz
 %{consolefontdir}/ter-m24b.psf.gz
 %{consolefontdir}/ter-m24n.psf.gz
 %{consolefontdir}/ter-m28b.psf.gz
@@ -291,6 +311,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-p16n.psf.gz
 %{consolefontdir}/ter-p20b.psf.gz
 %{consolefontdir}/ter-p20n.psf.gz
+%{consolefontdir}/ter-p22b.psf.gz
+%{consolefontdir}/ter-p22n.psf.gz
 %{consolefontdir}/ter-p24b.psf.gz
 %{consolefontdir}/ter-p24n.psf.gz
 %{consolefontdir}/ter-p28b.psf.gz
@@ -306,6 +328,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-u16n.psf.gz
 %{consolefontdir}/ter-u20b.psf.gz
 %{consolefontdir}/ter-u20n.psf.gz
+%{consolefontdir}/ter-u22b.psf.gz
+%{consolefontdir}/ter-u22n.psf.gz
 %{consolefontdir}/ter-u24b.psf.gz
 %{consolefontdir}/ter-u24n.psf.gz
 %{consolefontdir}/ter-u28b.psf.gz
@@ -321,6 +345,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-v16n.psf.gz
 %{consolefontdir}/ter-v20b.psf.gz
 %{consolefontdir}/ter-v20n.psf.gz
+%{consolefontdir}/ter-v22b.psf.gz
+%{consolefontdir}/ter-v22n.psf.gz
 %{consolefontdir}/ter-v24b.psf.gz
 %{consolefontdir}/ter-v24n.psf.gz
 %{consolefontdir}/ter-v28b.psf.gz
@@ -330,6 +356,12 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.30-1
+- update to 4.30 release:
+  - new size 22 (not very good)
+  - 25 additional characters
+  - various small fixes
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.28-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ndim at fedoraproject.org  Fri Dec  4 01:39:16 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 01:39:16 +0000 (UTC)
Subject: rpms/terminus-fonts/F-11 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 terminus-fonts.spec, 1.3, 1.4
Message-ID: <20091204013916.C1CAE11C00EE@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/terminus-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4623

Modified Files:
	.cvsignore sources terminus-fonts.spec 
Log Message:
* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.30-1
- update to 4.30 release:
  - new size 22 (not very good)
  - 25 additional characters
  - various small fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Feb 2009 20:47:39 -0000	1.2
+++ .cvsignore	4 Dec 2009 01:39:15 -0000	1.3
@@ -1,4 +1,4 @@
-terminus-font-4.28-dv1.diff.gz
-terminus-font-4.28-ge1.diff.gz
-terminus-font-4.28-ij1.diff.gz
-terminus-font-4.28.tar.gz
+terminus-font-4.30.tar.gz
+terminus-font-4.30-dv1.diff.gz
+terminus-font-4.30-ge1.diff.gz
+terminus-font-4.30-ij1.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Feb 2009 20:47:39 -0000	1.2
+++ sources	4 Dec 2009 01:39:16 -0000	1.3
@@ -1,4 +1,4 @@
-74e2db5288065403a58c28672590c1cd  terminus-font-4.28-dv1.diff.gz
-7815830460294d79d8508199499e1408  terminus-font-4.28-ge1.diff.gz
-54ea26d7671d57d611ee4229f000fc10  terminus-font-4.28-ij1.diff.gz
-15bf2f17b625312383fd9dae0925a17e  terminus-font-4.28.tar.gz
+6f8bd95b593851f9f5c210a9d33cbbf1  terminus-font-4.30.tar.gz
+a94f276f1ce268e81a1a85dbf1d97376  terminus-font-4.30-dv1.diff.gz
+4313d28cdf524c3f8b0539e45031dacc  terminus-font-4.30-ge1.diff.gz
+1700ce92665bd8c4f2082e68e1957570  terminus-font-4.30-ij1.diff.gz


Index: terminus-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-fonts/F-11/terminus-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- terminus-fonts.spec	24 Mar 2009 23:01:34 -0000	1.3
+++ terminus-fonts.spec	4 Dec 2009 01:39:16 -0000	1.4
@@ -16,12 +16,12 @@
 The Terminus Font is designed for long (8 and more hours per day)\
 work with computers.\
 \
-Version 4.28 contains 825 characters, covers about 120 language\
+Version 4.30 contains 850 characters, covers about 120 language\
 sets and supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254,\
 KOI8-R/U/E/F, Esperanto, many IBM, Windows and Macintosh code pages,\
 as well as the IBM VGA, vt100 and xterm pseudographic characters.\
 \
-The sizes present are 6x12, 8x14, 8x16, 10x20, 12x24, 14x28\
+The sizes present are 6x12, 8x14, 8x16, 10x20, 11x22, 12x24, 14x28\
 and 16x32. The styles are normal and bold (except for 6x12),\
 plus EGA/VGA-bold for 8x14 and 8x16.\
 \
@@ -29,8 +29,8 @@ The font is available for the Linux cons
 
 
 Name:		%{fontname}-fonts
-Version:	4.28
-Release:	8%{?dist}
+Version:	4.30
+Release:	1%{?dist}
 Summary:	Clean fixed width font
 
 Group:		User Interface/X
@@ -141,6 +141,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-116n.psf.gz
 %{consolefontdir}/ter-120b.psf.gz
 %{consolefontdir}/ter-120n.psf.gz
+%{consolefontdir}/ter-122b.psf.gz
+%{consolefontdir}/ter-122n.psf.gz
 %{consolefontdir}/ter-124b.psf.gz
 %{consolefontdir}/ter-124n.psf.gz
 %{consolefontdir}/ter-128b.psf.gz
@@ -156,6 +158,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-216n.psf.gz
 %{consolefontdir}/ter-220b.psf.gz
 %{consolefontdir}/ter-220n.psf.gz
+%{consolefontdir}/ter-222b.psf.gz
+%{consolefontdir}/ter-222n.psf.gz
 %{consolefontdir}/ter-224b.psf.gz
 %{consolefontdir}/ter-224n.psf.gz
 %{consolefontdir}/ter-228b.psf.gz
@@ -171,6 +175,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-716n.psf.gz
 %{consolefontdir}/ter-720b.psf.gz
 %{consolefontdir}/ter-720n.psf.gz
+%{consolefontdir}/ter-722b.psf.gz
+%{consolefontdir}/ter-722n.psf.gz
 %{consolefontdir}/ter-724b.psf.gz
 %{consolefontdir}/ter-724n.psf.gz
 %{consolefontdir}/ter-728b.psf.gz
@@ -186,6 +192,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-916n.psf.gz
 %{consolefontdir}/ter-920b.psf.gz
 %{consolefontdir}/ter-920n.psf.gz
+%{consolefontdir}/ter-922b.psf.gz
+%{consolefontdir}/ter-922n.psf.gz
 %{consolefontdir}/ter-924b.psf.gz
 %{consolefontdir}/ter-924n.psf.gz
 %{consolefontdir}/ter-928b.psf.gz
@@ -201,6 +209,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-c16n.psf.gz
 %{consolefontdir}/ter-c20b.psf.gz
 %{consolefontdir}/ter-c20n.psf.gz
+%{consolefontdir}/ter-c22b.psf.gz
+%{consolefontdir}/ter-c22n.psf.gz
 %{consolefontdir}/ter-c24b.psf.gz
 %{consolefontdir}/ter-c24n.psf.gz
 %{consolefontdir}/ter-c28b.psf.gz
@@ -216,6 +226,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-d16n.psf.gz
 %{consolefontdir}/ter-d20b.psf.gz
 %{consolefontdir}/ter-d20n.psf.gz
+%{consolefontdir}/ter-d22b.psf.gz
+%{consolefontdir}/ter-d22n.psf.gz
 %{consolefontdir}/ter-d24b.psf.gz
 %{consolefontdir}/ter-d24n.psf.gz
 %{consolefontdir}/ter-d28b.psf.gz
@@ -231,6 +243,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-g16n.psf.gz
 %{consolefontdir}/ter-g20b.psf.gz
 %{consolefontdir}/ter-g20n.psf.gz
+%{consolefontdir}/ter-g22b.psf.gz
+%{consolefontdir}/ter-g22n.psf.gz
 %{consolefontdir}/ter-g24b.psf.gz
 %{consolefontdir}/ter-g24n.psf.gz
 %{consolefontdir}/ter-g28b.psf.gz
@@ -246,6 +260,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-i16n.psf.gz
 %{consolefontdir}/ter-i20b.psf.gz
 %{consolefontdir}/ter-i20n.psf.gz
+%{consolefontdir}/ter-i22b.psf.gz
+%{consolefontdir}/ter-i22n.psf.gz
 %{consolefontdir}/ter-i24b.psf.gz
 %{consolefontdir}/ter-i24n.psf.gz
 %{consolefontdir}/ter-i28b.psf.gz
@@ -261,6 +277,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-k16n.psf.gz
 %{consolefontdir}/ter-k20b.psf.gz
 %{consolefontdir}/ter-k20n.psf.gz
+%{consolefontdir}/ter-k22b.psf.gz
+%{consolefontdir}/ter-k22n.psf.gz
 %{consolefontdir}/ter-k24b.psf.gz
 %{consolefontdir}/ter-k24n.psf.gz
 %{consolefontdir}/ter-k28b.psf.gz
@@ -276,6 +294,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-m16n.psf.gz
 %{consolefontdir}/ter-m20b.psf.gz
 %{consolefontdir}/ter-m20n.psf.gz
+%{consolefontdir}/ter-m22b.psf.gz
+%{consolefontdir}/ter-m22n.psf.gz
 %{consolefontdir}/ter-m24b.psf.gz
 %{consolefontdir}/ter-m24n.psf.gz
 %{consolefontdir}/ter-m28b.psf.gz
@@ -291,6 +311,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-p16n.psf.gz
 %{consolefontdir}/ter-p20b.psf.gz
 %{consolefontdir}/ter-p20n.psf.gz
+%{consolefontdir}/ter-p22b.psf.gz
+%{consolefontdir}/ter-p22n.psf.gz
 %{consolefontdir}/ter-p24b.psf.gz
 %{consolefontdir}/ter-p24n.psf.gz
 %{consolefontdir}/ter-p28b.psf.gz
@@ -306,6 +328,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-u16n.psf.gz
 %{consolefontdir}/ter-u20b.psf.gz
 %{consolefontdir}/ter-u20n.psf.gz
+%{consolefontdir}/ter-u22b.psf.gz
+%{consolefontdir}/ter-u22n.psf.gz
 %{consolefontdir}/ter-u24b.psf.gz
 %{consolefontdir}/ter-u24n.psf.gz
 %{consolefontdir}/ter-u28b.psf.gz
@@ -321,6 +345,8 @@ rm -fr %{buildroot}
 %{consolefontdir}/ter-v16n.psf.gz
 %{consolefontdir}/ter-v20b.psf.gz
 %{consolefontdir}/ter-v20n.psf.gz
+%{consolefontdir}/ter-v22b.psf.gz
+%{consolefontdir}/ter-v22n.psf.gz
 %{consolefontdir}/ter-v24b.psf.gz
 %{consolefontdir}/ter-v24n.psf.gz
 %{consolefontdir}/ter-v28b.psf.gz
@@ -330,6 +356,15 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.30-1
+- update to 4.30 release:
+  - new size 22 (not very good)
+  - 25 additional characters
+  - various small fixes
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.28-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Mar 25 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.28-8
 - Rebuild for Fedora 11 to pick up font autodeps (#491973)
 



From mclasen at fedoraproject.org  Fri Dec  4 01:40:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 01:40:59 +0000 (UTC)
Subject: rpms/shotwell/F-12 prefixly-correct.patch, NONE, 1.1 shotwell.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091204014059.6A09711C00EE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5115

Modified Files:
	shotwell.spec sources 
Added Files:
	prefixly-correct.patch 
Log Message:
0.3.2


prefixly-correct.patch:
 Makefile |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE prefixly-correct.patch ---
diff -up shotwell-0.3.2/Makefile.desktop-file-install shotwell-0.3.2/Makefile
--- shotwell-0.3.2/Makefile.desktop-file-install	2009-11-12 11:13:43.728916255 -0500
+++ shotwell-0.3.2/Makefile	2009-11-12 11:15:35.467916317 -0500
@@ -212,16 +212,16 @@ install:
 	$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
 	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
-	mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps
-	$(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps
+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
+	$(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
 ifndef XDG_DISABLE_MAKEFILE_UPDATES
-	-gtk-update-icon-cache $(DESTDIR)/usr/share/icons/hicolor || :
+	-gtk-update-icon-cache $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
 endif
 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/ui
 	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
-	mkdir -p $(DESTDIR)$(PREFIX)/usr/share/applications
-	$(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)/usr/share/applications
-	$(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)/usr/share/applications
+	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
 ifndef XDG_DISABLE_MAKEFILE_UPDATES
 	-update-desktop-database || :
 endif
@@ -238,9 +238,9 @@ endif
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
 	rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
-	rm -fr $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/shotwell.svg
-	rm -f $(DESTDIR)/usr/share/applications/shotwell.desktop
-	rm -f $(DESTDIR)/usr/share/applications/shotwell-viewer.desktop
+	rm -fr $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/shotwell.svg
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell.desktop
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell-viewer.desktop
 ifndef XDG_DISABLE_MAKEFILE_UPDATES
 	-update-desktop-database || :
 endif


Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/F-12/shotwell.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- shotwell.spec	20 Aug 2009 21:30:56 -0000	1.3
+++ shotwell.spec	4 Dec 2009 01:40:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           shotwell
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.2
+Release:        2%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -8,10 +8,12 @@ Group:          Applications/Multimedia
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
-Source0:        http://www.yorba.org/download/shotwell/0.2/shotwell-0.2.0.tar.bz2
+Source0:        http://www.yorba.org/download/shotwell/0.3/shotwell-%{version}.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
+BuildRequires:  GConf2-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  vala-devel
 BuildRequires:  libgee-devel
@@ -21,7 +23,9 @@ BuildRequires:  unique-devel
 BuildRequires:  libexif-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 
+Patch0: prefixly-correct.patch
 
 %description
 Shotwell is a new open source photo organizer designed for the GNOME desktop
@@ -30,21 +34,25 @@ them, and share them with others.
 
 %prep
 %setup -q
+%patch0 -p1 -b .prefixly-correct
 
 %build
 ./configure --prefix=/usr
 sed -i -e 's/\\n/\n/g' configure.mk
-sed -i -e 's/^CFLAGS = .*$/CFLAGS=%{optflags}/' Makefile
+sed -i -e 's/^CFLAGS=.*$/CFLAGS=%{optflags}/' Makefile
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+export XDG_DISABLE_MAKEFILE_UPDATES=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell-viewer.desktop
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +60,20 @@ rm -rf $RPM_BUILD_ROOT
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database &> /dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/shotwell.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/shotwell.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/shotwell.schemas > /dev/null || :
+fi
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -63,16 +85,24 @@ update-desktop-database &> /dev/null || 
 %posttrans
 gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
+%{_sysconfdir}/gconf/schemas/shotwell.schemas
 %{_bindir}/shotwell
 %{_datadir}/shotwell
 %{_datadir}/applications/shotwell.desktop
+%{_datadir}/applications/shotwell-viewer.desktop
 %{_datadir}/icons/hicolor/scalable/apps/shotwell.svg
 
 
 %changelog
+* Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.2-1
+- Update to 0.3.2
+
+* Tue Nov  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.0-1
+- Version 0.3.0
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.2.0-3
 - Rebuild against new libgee
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 00:13:10 -0000	1.2
+++ sources	4 Dec 2009 01:40:59 -0000	1.3
@@ -1 +1 @@
-2ea693170b4285d30015366d8c2844af  shotwell-0.2.0.tar.bz2
+9415fcceb9663de6815dd805f45c0905  shotwell-0.3.2.tar.bz2



From kasal at fedoraproject.org  Fri Dec  4 01:58:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 01:58:34 +0000 (UTC)
Subject: rpms/ack/devel ack.spec,1.12,1.13
Message-ID: <20091204015834.DFF3611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/ack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9162

Modified Files:
	ack.spec 
Log Message:
- rebuild against perl 5.10.1


Index: ack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ack/devel/ack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ack.spec	24 Jul 2009 16:33:30 -0000	1.12
+++ ack.spec	4 Dec 2009 01:58:34 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ack
 Version:        1.86
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Grep-like text finder
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.86-4
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.86-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 01:58:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 01:58:59 +0000 (UTC)
Subject: rpms/amanda/devel amanda.spec,1.65,1.66
Message-ID: <20091204015859.242FF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9334

Modified Files:
	amanda.spec 
Log Message:
- rebuild against perl 5.10.1


Index: amanda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- amanda.spec	15 Oct 2009 12:56:18 -0000	1.65
+++ amanda.spec	4 Dec 2009 01:58:58 -0000	1.66
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 14%{?dist}
+Release: 15%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 #Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz
 Source1: amanda.crontab
@@ -380,6 +380,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
 %{_libdir}/libamandad.so
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.6.0p2-15
+- rebuild against perl 5.10.1
+
 * Thu Oct 15 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-14
 - add amanda user to group "tape" (#529159)
 



From kasal at fedoraproject.org  Fri Dec  4 01:59:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 01:59:28 +0000 (UTC)
Subject: rpms/backup-manager/devel backup-manager.spec,1.6,1.7
Message-ID: <20091204015928.3FF8B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/backup-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9550

Modified Files:
	backup-manager.spec 
Log Message:
- rebuild against perl 5.10.1


Index: backup-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/devel/backup-manager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- backup-manager.spec	24 Jul 2009 17:47:03 -0000	1.6
+++ backup-manager.spec	4 Dec 2009 01:59:27 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           backup-manager
 Version:        0.7.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A command line backup tool for GNU/Linux
 
 Group:          Applications/System
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.7.8-6
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 01:59:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 01:59:41 +0000 (UTC)
Subject: rpms/perl-Class-InsideOut/devel perl-Class-InsideOut.spec, 1.14,
	1.15
Message-ID: <20091204015941.6C8CC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-InsideOut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9672

Modified Files:
	perl-Class-InsideOut.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-InsideOut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-InsideOut/devel/perl-Class-InsideOut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Class-InsideOut.spec	26 Jul 2009 04:29:11 -0000	1.14
+++ perl-Class-InsideOut.spec	4 Dec 2009 01:59:41 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Class-InsideOut
 Version:        1.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A safe, simple inside-out object construction kit 
 
 Group:          Development/Libraries
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.09-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 01:59:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 01:59:55 +0000 (UTC)
Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.46,1.47
Message-ID: <20091204015955.E4D8C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9852

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- rebuild against perl 5.10.1


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- claws-mail-plugins.spec	13 Oct 2009 19:25:44 -0000	1.46
+++ claws-mail-plugins.spec	4 Dec 2009 01:59:55 -0000	1.47
@@ -21,7 +21,7 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -668,6 +668,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.7.3-2
+- rebuild against perl 5.10.1
+
 * Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.3-1
 - version upgrade



From kasal at fedoraproject.org  Fri Dec  4 02:00:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:00:04 +0000 (UTC)
Subject: rpms/perl-Class-Inspector/devel perl-Class-Inspector.spec, 1.25,
	1.26
Message-ID: <20091204020004.D352611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Inspector/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9921

Modified Files:
	perl-Class-Inspector.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Inspector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-Class-Inspector.spec	26 Jul 2009 04:29:26 -0000	1.25
+++ perl-Class-Inspector.spec	4 Dec 2009 02:00:04 -0000	1.26
@@ -1,6 +1,6 @@
 Name: 		perl-Class-Inspector
 Version: 	1.24
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Get information about a class and its structure
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -53,6 +53,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.24-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:00:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:00:24 +0000 (UTC)
Subject: rpms/clearsilver/devel clearsilver.spec,1.23,1.24
Message-ID: <20091204020024.38E8811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/clearsilver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10195

Modified Files:
	clearsilver.spec 
Log Message:
- rebuild against perl 5.10.1


Index: clearsilver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clearsilver/devel/clearsilver.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- clearsilver.spec	24 Jul 2009 19:03:59 -0000	1.23
+++ clearsilver.spec	4 Dec 2009 02:00:24 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           clearsilver
 Version:        0.10.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Fast and powerful HTML templating system
 Group:          Development/Libraries
 # Technically, the license is "Neotonic ClearSilver", but it is a copy of 
@@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.10.5-8
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:00:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:00:28 +0000 (UTC)
Subject: rpms/perl-Class-Loader/devel perl-Class-Loader.spec,1.9,1.10
Message-ID: <20091204020028.D270B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Loader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10238

Modified Files:
	perl-Class-Loader.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Loader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Loader/devel/perl-Class-Loader.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-Loader.spec	26 Jul 2009 04:29:41 -0000	1.9
+++ perl-Class-Loader.spec	4 Dec 2009 02:00:28 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Load modules and create objects on demand
 Name:		perl-Class-Loader
 Version:	2.03
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Class-Loader/
@@ -53,6 +53,9 @@ names that can be used in place of modul
 %{_mandir}/man3/Class::Loader.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.03-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.03-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:00:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:00:35 +0000 (UTC)
Subject: rpms/perl-GD-Barcode/devel perl-GD-Barcode.spec,1.5,1.6
Message-ID: <20091204020035.F39B511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GD-Barcode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10369

Modified Files:
	perl-GD-Barcode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GD-Barcode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GD-Barcode/devel/perl-GD-Barcode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-GD-Barcode.spec	26 Jul 2009 06:08:54 -0000	1.5
+++ perl-GD-Barcode.spec	4 Dec 2009 02:00:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-GD-Barcode
 Version:        1.15
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Create barcode image with GD
 # see Barcode.pm
 License:        GPL+ or Artistic
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.15-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:00:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:00:50 +0000 (UTC)
Subject: rpms/clive/devel clive.spec,1.25,1.26
Message-ID: <20091204020050.F0AF811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/clive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10593

Modified Files:
	clive.spec 
Log Message:
- rebuild against perl 5.10.1


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- clive.spec	1 Oct 2009 20:21:33 -0000	1.25
+++ clive.spec	4 Dec 2009 02:00:50 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           clive
 Version:        2.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.2.7-2
+- rebuild against perl 5.10.1
+
 * Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.7-1
 - Update to 2.2.7
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.6-1



From kasal at fedoraproject.org  Fri Dec  4 02:00:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:00:54 +0000 (UTC)
Subject: rpms/perl-Class-MakeMethods/devel perl-Class-MakeMethods.spec, 1.8, 
	1.9
Message-ID: <20091204020054.7E4EC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-MakeMethods/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10672

Modified Files:
	perl-Class-MakeMethods.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-MakeMethods.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-MakeMethods/devel/perl-Class-MakeMethods.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-MakeMethods.spec	26 Jul 2009 04:30:14 -0000	1.8
+++ perl-Class-MakeMethods.spec	4 Dec 2009 02:00:54 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Class-MakeMethods
 Version:        1.01        
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Generate common types of methods
 
 Group:          Development/Libraries
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.01-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:02 +0000 (UTC)
Subject: rpms/perl-GDGraph/devel perl-GDGraph.spec,1.17,1.18
Message-ID: <20091204020102.9124711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GDGraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10796

Modified Files:
	perl-GDGraph.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GDGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GDGraph/devel/perl-GDGraph.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-GDGraph.spec	26 Jul 2009 06:09:23 -0000	1.17
+++ perl-GDGraph.spec	4 Dec 2009 02:01:02 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-GDGraph
 Version:        1.44
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        Graph generation package for Perl
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.44-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.44-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:20 +0000 (UTC)
Subject: rpms/perl-Class-MethodMaker/devel perl-Class-MethodMaker.spec, 1.20,
	1.21
Message-ID: <20091204020120.AA91011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11092

Modified Files:
	perl-Class-MethodMaker.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Class-MethodMaker.spec	26 Jul 2009 04:30:48 -0000	1.20
+++ perl-Class-MethodMaker.spec	4 Dec 2009 02:01:20 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-Class-MethodMaker
 Version:        2.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for creating generic object-oriented methods
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.15-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:22 +0000 (UTC)
Subject: rpms/code2html/devel code2html.spec,1.4,1.5
Message-ID: <20091204020122.2EE7E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/code2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11123

Modified Files:
	code2html.spec 
Log Message:
- rebuild against perl 5.10.1


Index: code2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/code2html/devel/code2html.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- code2html.spec	24 Jul 2009 19:12:54 -0000	1.4
+++ code2html.spec	4 Dec 2009 02:01:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           code2html
 Version:        0.9.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Convert source code to HTML
 
 Group:          Applications/Publishing     
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.9.1-6
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:26 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute/devel
	perl-MooseX-ClassAttribute.spec, 1.5, 1.6
Message-ID: <20091204020126.6AF3411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11210

Modified Files:
	perl-MooseX-ClassAttribute.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-ClassAttribute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/devel/perl-MooseX-ClassAttribute.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-ClassAttribute.spec	19 Sep 2009 18:56:14 -0000	1.5
+++ perl-MooseX-ClassAttribute.spec	4 Dec 2009 02:01:26 -0000	1.6
@@ -1,7 +1,7 @@
 %define tarname MooseX-ClassAttribute
 Name:           perl-MooseX-ClassAttribute
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Declare class attributes Moose-style
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.10-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
 - add perl_default_filter
 - auto-update to 0.10 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Fri Dec  4 02:01:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:29 +0000 (UTC)
Subject: rpms/perl-GDGraph3d/devel perl-GDGraph3d.spec,1.15,1.16
Message-ID: <20091204020129.3E2AC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GDGraph3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11251

Modified Files:
	perl-GDGraph3d.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GDGraph3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GDGraph3d/devel/perl-GDGraph3d.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-GDGraph3d.spec	26 Jul 2009 06:09:38 -0000	1.15
+++ perl-GDGraph3d.spec	4 Dec 2009 02:01:28 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-GDGraph3d
 Version:        0.63
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        3D graph generation package for Perl
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.63-12
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:49 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/devel
	perl-Class-Method-Modifiers.spec, 1.7, 1.8
Message-ID: <20091204020149.70ACB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Method-Modifiers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11688

Modified Files:
	perl-Class-Method-Modifiers.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Method-Modifiers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Method-Modifiers/devel/perl-Class-Method-Modifiers.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Class-Method-Modifiers.spec	31 Jul 2009 07:19:17 -0000	1.7
+++ perl-Class-Method-Modifiers.spec	4 Dec 2009 02:01:49 -0000	1.8
@@ -1,7 +1,7 @@
 
 Name:       perl-Class-Method-Modifiers
 Version:    1.04
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Provides Moose-like method modifiers
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.04-2
+- rebuild against perl 5.10.1
+
 * Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
 - auto-update to 1.04 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:43 +0000 (UTC)
Subject: rpms/perl-Term-Prompt/devel perl-Term-Prompt.spec,1.2,1.3
Message-ID: <20091204020143.0F5E811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Term-Prompt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11625

Modified Files:
	perl-Term-Prompt.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Term-Prompt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Prompt/devel/perl-Term-Prompt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Term-Prompt.spec	26 Jul 2009 16:43:16 -0000	1.2
+++ perl-Term-Prompt.spec	4 Dec 2009 02:01:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Term-Prompt
 Version:        1.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for prompting a user for information
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.04-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:53 +0000 (UTC)
Subject: rpms/perl-MooseX-ConfigFromFile/devel
	perl-MooseX-ConfigFromFile.spec, 1.3, 1.4
Message-ID: <20091204020153.C018411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-ConfigFromFile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11785

Modified Files:
	perl-MooseX-ConfigFromFile.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-ConfigFromFile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-ConfigFromFile/devel/perl-MooseX-ConfigFromFile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-ConfigFromFile.spec	26 Jul 2009 11:25:21 -0000	1.3
+++ perl-MooseX-ConfigFromFile.spec	4 Dec 2009 02:01:53 -0000	1.4
@@ -1,7 +1,7 @@
 
 Name:       perl-MooseX-ConfigFromFile 
 Version:    0.02 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/MooseX/ConfigFromFile.pm
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:51 +0000 (UTC)
Subject: rpms/collectd/devel collectd.spec,1.27,1.28
Message-ID: <20091204020151.231AD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11702

Modified Files:
	collectd.spec 
Log Message:
- rebuild against perl 5.10.1


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- collectd.spec	26 Nov 2009 23:20:21 -0000	1.27
+++ collectd.spec	4 Dec 2009 02:01:50 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -439,6 +439,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 4.8.1-3
+- rebuild against perl 5.10.1
+
 * Fri Nov 27 2009 Alan Pevec <apevec at redhat.com> 4.8.1-2
 - use Fedora libiptc, owniptc in collectd sources fails to compile
 



From kasal at fedoraproject.org  Fri Dec  4 02:01:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:01:54 +0000 (UTC)
Subject: rpms/perl-GD-SVG/devel perl-GD-SVG.spec,1.11,1.12
Message-ID: <20091204020154.6689811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GD-SVG/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11818

Modified Files:
	perl-GD-SVG.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GD-SVG/devel/perl-GD-SVG.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-GD-SVG.spec	26 Jul 2009 06:09:08 -0000	1.11
+++ perl-GD-SVG.spec	4 Dec 2009 02:01:54 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-GD-SVG
 Version:        0.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.32-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:10 +0000 (UTC)
Subject: rpms/perl-TermReadKey/devel perl-TermReadKey.spec,1.23,1.24
Message-ID: <20091204020210.95C9C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-TermReadKey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12272

Modified Files:
	perl-TermReadKey.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-TermReadKey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TermReadKey/devel/perl-TermReadKey.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-TermReadKey.spec	26 Jul 2009 16:44:51 -0000	1.23
+++ perl-TermReadKey.spec	4 Dec 2009 02:02:10 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-TermReadKey
 Version:        2.30
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A perl module for simple terminal control
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.30-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.30-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:14 +0000 (UTC)
Subject: rpms/perl-Class-Mix/devel perl-Class-Mix.spec,1.3,1.4
Message-ID: <20091204020214.98AD711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Mix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12357

Modified Files:
	perl-Class-Mix.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Mix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Mix/devel/perl-Class-Mix.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Class-Mix.spec	26 Jul 2009 04:31:01 -0000	1.3
+++ perl-Class-Mix.spec	4 Dec 2009 02:02:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Class-Mix
 Version:        0.003
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Dynamic class mixing
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.003-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.003-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:19 +0000 (UTC)
Subject: rpms/perl-MooseX-Daemonize/devel perl-MooseX-Daemonize.spec, 1.3,
	1.4
Message-ID: <20091204020219.B26EE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Daemonize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12442

Modified Files:
	perl-MooseX-Daemonize.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Daemonize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/devel/perl-MooseX-Daemonize.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-Daemonize.spec	26 Jul 2009 11:25:39 -0000	1.3
+++ perl-MooseX-Daemonize.spec	4 Dec 2009 02:02:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Daemonize
 Version:        0.08
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Role for daemonizing your Moose based application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:20 +0000 (UTC)
Subject: rpms/perl-GDTextUtil/devel perl-GDTextUtil.spec,1.15,1.16
Message-ID: <20091204020220.9AFE411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GDTextUtil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12463

Modified Files:
	perl-GDTextUtil.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GDTextUtil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GDTextUtil/devel/perl-GDTextUtil.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-GDTextUtil.spec	26 Jul 2009 06:09:53 -0000	1.15
+++ perl-GDTextUtil.spec	4 Dec 2009 02:02:20 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-GDTextUtil
 Version:        0.86
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Text utilities for use with GD
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.86-15
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.86-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:21 +0000 (UTC)
Subject: rpms/cpanspec/devel cpanspec.spec,1.29,1.30
Message-ID: <20091204020221.E30DD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/cpanspec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12491

Modified Files:
	cpanspec.spec 
Log Message:
- rebuild against perl 5.10.1


Index: cpanspec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/devel/cpanspec.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- cpanspec.spec	24 Jul 2009 19:32:09 -0000	1.29
+++ cpanspec.spec	4 Dec 2009 02:02:21 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           cpanspec
 Version:        1.78
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL+ or Artistic
 Group:          Development/Tools
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.78-4
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.78-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:40 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel perl-Class-MOP.spec,1.43,1.44
Message-ID: <20091204020240.EFE7A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-MOP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12974

Modified Files:
	perl-Class-MOP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- perl-Class-MOP.spec	27 Sep 2009 00:43:36 -0000	1.43
+++ perl-Class-MOP.spec	4 Dec 2009 02:02:40 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           perl-Class-MOP
 Version:        0.94
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Meta Object Protocol for Perl 5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.94-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.94-1
 - auto-update to 0.94 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:44 +0000 (UTC)
Subject: rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel
	perl-MooseX-Emulate-Class-Accessor-Fast.spec, 1.9, 1.10
Message-ID: <20091204020244.E8AFB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13062

Modified Files:
	perl-MooseX-Emulate-Class-Accessor-Fast.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Emulate-Class-Accessor-Fast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/perl-MooseX-Emulate-Class-Accessor-Fast.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-MooseX-Emulate-Class-Accessor-Fast.spec	19 Sep 2009 18:44:19 -0000	1.9
+++ perl-MooseX-Emulate-Class-Accessor-Fast.spec	4 Dec 2009 02:02:44 -0000	1.10
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Emulate-Class-Accessor-Fast
 Version:    0.00903
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/MooseX/Adopt/Class/Accessor/Fast.pm -> GPL+ or Artistic
 # lib/MooseX/Emulate/Class/Accessor/Fast.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.00903-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.00903-1
 - auto-update to 0.00903 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:38 +0000 (UTC)
Subject: rpms/perl-Term-ReadLine-Gnu/devel perl-Term-ReadLine-Gnu.spec, 1.5, 
	1.6
Message-ID: <20091204020238.41F4A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12948

Modified Files:
	perl-Term-ReadLine-Gnu.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Term-ReadLine-Gnu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-ReadLine-Gnu/devel/perl-Term-ReadLine-Gnu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Term-ReadLine-Gnu.spec	26 Jul 2009 16:43:33 -0000	1.5
+++ perl-Term-ReadLine-Gnu.spec	4 Dec 2009 02:02:38 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Term-ReadLine-Gnu
 Version:        1.19
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for the GNU Readline/History Library
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.19-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:45 +0000 (UTC)
Subject: rpms/perl-Gearman/devel perl-Gearman.spec,1.4,1.5
Message-ID: <20091204020245.CD7D111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gearman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13100

Modified Files:
	perl-Gearman.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gearman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gearman/devel/perl-Gearman.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Gearman.spec	26 Jul 2009 06:11:48 -0000	1.4
+++ perl-Gearman.spec	4 Dec 2009 02:02:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Gearman
 Version:        1.09
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Distributed job system
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.09-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:02:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:02:48 +0000 (UTC)
Subject: rpms/cpan-upload/devel cpan-upload.spec,1.4,1.5
Message-ID: <20091204020248.16F5E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/cpan-upload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13123

Modified Files:
	cpan-upload.spec 
Log Message:
- rebuild against perl 5.10.1


Index: cpan-upload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpan-upload/devel/cpan-upload.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cpan-upload.spec	24 Jul 2009 19:31:56 -0000	1.4
+++ cpan-upload.spec	4 Dec 2009 02:02:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           cpan-upload
 Version:        2.2       
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Automate the uploading of files to the CPAN (PAUSE)
 
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.2-6
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:11 +0000 (UTC)
Subject: rpms/perl-MooseX-Getopt/devel perl-MooseX-Getopt.spec,1.12,1.13
Message-ID: <20091204020311.6D9EF11C02C4@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Getopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13700

Modified Files:
	perl-MooseX-Getopt.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Getopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Getopt/devel/perl-MooseX-Getopt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-MooseX-Getopt.spec	19 Sep 2009 18:46:06 -0000	1.12
+++ perl-MooseX-Getopt.spec	4 Dec 2009 02:03:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Getopt
 Version:        0.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moose role for processing command line options
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.22-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
 - auto-update to 0.22 (by cpan-spec-update 0.01)
 - altered br on perl(Getopt::Long::Descriptive) (0 => 0.077)



From kasal at fedoraproject.org  Fri Dec  4 02:03:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:05 +0000 (UTC)
Subject: rpms/perl-Term-ReadPassword/devel perl-Term-ReadPassword.spec, 1.5, 
	1.6
Message-ID: <20091204020305.0800911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Term-ReadPassword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13586

Modified Files:
	perl-Term-ReadPassword.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Term-ReadPassword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-ReadPassword/devel/perl-Term-ReadPassword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Term-ReadPassword.spec	26 Jul 2009 16:43:49 -0000	1.5
+++ perl-Term-ReadPassword.spec	4 Dec 2009 02:03:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Term-ReadPassword
 Version:        0.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Asking the user for a password
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:06 +0000 (UTC)
Subject: rpms/perl-Class-Observable/devel perl-Class-Observable.spec, 1.5,
	1.6
Message-ID: <20091204020306.2790511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Observable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13607

Modified Files:
	perl-Class-Observable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Observable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Observable/devel/perl-Class-Observable.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Class-Observable.spec	26 Jul 2009 04:31:16 -0000	1.5
+++ perl-Class-Observable.spec	4 Dec 2009 02:03:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Class-Observable
 Version:        1.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Allow other classes and objects to respond to events in yours
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.04-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:11 +0000 (UTC)
Subject: rpms/perl-Gearman-Client-Async/devel perl-Gearman-Client-Async.spec,
	1.4, 1.5
Message-ID: <20091204020311.5DA0511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gearman-Client-Async/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13687

Modified Files:
	perl-Gearman-Client-Async.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gearman-Client-Async.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gearman-Client-Async/devel/perl-Gearman-Client-Async.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Gearman-Client-Async.spec	26 Jul 2009 06:12:03 -0000	1.4
+++ perl-Gearman-Client-Async.spec	4 Dec 2009 02:03:11 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Gearman-Client-Async
 Version:        0.94
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Asynchronous Client for the Gearman distributed job system
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.94-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:22 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.spec,1.68,1.69
Message-ID: <20091204020322.980E711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13954

Modified Files:
	cyrus-imapd.spec 
Log Message:
- rebuild against perl 5.10.1


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- cyrus-imapd.spec	26 Nov 2009 13:32:55 -0000	1.68
+++ cyrus-imapd.spec	4 Dec 2009 02:03:22 -0000	1.69
@@ -2,7 +2,7 @@
 
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -520,6 +520,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.3.15-9
+- rebuild against perl 5.10.1
+
 * Thu Nov 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-8
 - spec cleanup
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:30 +0000 (UTC)
Subject: rpms/perl-Term-Size/devel perl-Term-Size.spec,1.4,1.5
Message-ID: <20091204020330.EC46711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Term-Size/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14193

Modified Files:
	perl-Term-Size.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Term-Size.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size/devel/perl-Term-Size.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Term-Size.spec	26 Jul 2009 16:44:06 -0000	1.4
+++ perl-Term-Size.spec	4 Dec 2009 02:03:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-Term-Size 
 Version:    0.2
-Release:    4%{?dist}
+Release:    5%{?dist}
 # see Copyright
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -69,6 +69,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.2-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:31 +0000 (UTC)
Subject: rpms/perl-Class-Prototyped/devel perl-Class-Prototyped.spec, 1.7,
	1.8
Message-ID: <20091204020331.7533811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Prototyped/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14224

Modified Files:
	perl-Class-Prototyped.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Prototyped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Prototyped/devel/perl-Class-Prototyped.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Class-Prototyped.spec	26 Jul 2009 04:31:29 -0000	1.7
+++ perl-Class-Prototyped.spec	4 Dec 2009 02:03:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Class-Prototyped
 Version:        1.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Fast prototype-based OO programming in Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.11-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:48 +0000 (UTC)
Subject: rpms/dahdi-tools/devel dahdi-tools.spec,1.9,1.10
Message-ID: <20091204020348.C556111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/dahdi-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14632

Modified Files:
	dahdi-tools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: dahdi-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/dahdi-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dahdi-tools.spec	19 Aug 2009 23:03:15 -0000	1.9
+++ dahdi-tools.spec	4 Dec 2009 02:03:48 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           dahdi-tools
 Version:        %{tools_version}
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Userspace tools to configure the DAHDI kernel modules
 
 Group:          System Environment/Libraries
@@ -164,6 +164,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.1.0.2-9
+- rebuild against perl 5.10.1
+
 * Wed Aug 19 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.1.0.2-8
 - fix bz 495453 (/etc/modprobe.d/dahdi.blacklist and /etc/modprobe.d/dahdi doesn't end with.conf)
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:39 +0000 (UTC)
Subject: rpms/perl-MooseX-GlobRef-Object/devel
	perl-MooseX-GlobRef-Object.spec, 1.4, 1.5
Message-ID: <20091204020339.EC02B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-GlobRef-Object/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14418

Modified Files:
	perl-MooseX-GlobRef-Object.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-GlobRef-Object.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-GlobRef-Object/devel/perl-MooseX-GlobRef-Object.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-GlobRef-Object.spec	26 Jul 2009 11:26:44 -0000	1.4
+++ perl-MooseX-GlobRef-Object.spec	4 Dec 2009 02:03:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-GlobRef-Object
 Version:        0.07
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Store a Moose object in glob reference
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.07-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:39 +0000 (UTC)
Subject: rpms/perl-Gearman-Server/devel perl-Gearman-Server.spec,1.4,1.5
Message-ID: <20091204020339.04F1111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gearman-Server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14394

Modified Files:
	perl-Gearman-Server.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gearman-Server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gearman-Server/devel/perl-Gearman-Server.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Gearman-Server.spec	26 Jul 2009 06:12:22 -0000	1.4
+++ perl-Gearman-Server.spec	4 Dec 2009 02:03:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Gearman-Server
 Version:        1.09
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Function call "router" and load balancer
 License:        GPL+ or Artistic
 Group:          System Environment/Daemons
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.09-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:55 +0000 (UTC)
Subject: rpms/perl-Term-Size-Any/devel perl-Term-Size-Any.spec,1.2,1.3
Message-ID: <20091204020355.C46B111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Term-Size-Any/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14843

Modified Files:
	perl-Term-Size-Any.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Term-Size-Any.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Any/devel/perl-Term-Size-Any.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Term-Size-Any.spec	26 Jul 2009 16:44:21 -0000	1.2
+++ perl-Term-Size-Any.spec	4 Dec 2009 02:03:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Term-Size-Any
 Version:        0.001
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Retrieve terminal size
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.001-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.001-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:03:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:03:56 +0000 (UTC)
Subject: rpms/perl-Class-ReturnValue/devel perl-Class-ReturnValue.spec, 1.11,
	1.12
Message-ID: <20091204020356.187B011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-ReturnValue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14855

Modified Files:
	perl-Class-ReturnValue.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-ReturnValue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/devel/perl-Class-ReturnValue.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Class-ReturnValue.spec	26 Jul 2009 04:31:45 -0000	1.11
+++ perl-Class-ReturnValue.spec	4 Dec 2009 02:03:55 -0000	1.12
@@ -1,7 +1,7 @@
 Name:      	perl-Class-ReturnValue
 Summary:   	Class::ReturnValue Perl module
 Version:   	0.55
-Release:   	4%{?dist}
+Release:   	5%{?dist}
 License:   	GPL+ or Artistic
 Group: 		Development/Libraries
 URL:       	http://search.cpan.org/dist/Class-ReturnValue
@@ -44,6 +44,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.55-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.55-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:06 +0000 (UTC)
Subject: rpms/perl-MooseX-Iterator/devel perl-MooseX-Iterator.spec,1.5,1.6
Message-ID: <20091204020406.33B6F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Iterator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15053

Modified Files:
	perl-MooseX-Iterator.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Iterator/devel/perl-MooseX-Iterator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-Iterator.spec	19 Sep 2009 18:57:33 -0000	1.5
+++ perl-MooseX-Iterator.spec	4 Dec 2009 02:04:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Iterator
 Version:        0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Iterate over collections
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
 - auto-update to 0.11 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)



From kasal at fedoraproject.org  Fri Dec  4 02:04:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:06 +0000 (UTC)
Subject: rpms/perl-Geo-Constants/devel perl-Geo-Constants.spec,1.6,1.7
Message-ID: <20091204020406.3E82B11C02C4@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geo-Constants/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15041

Modified Files:
	perl-Geo-Constants.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geo-Constants.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geo-Constants/devel/perl-Geo-Constants.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Geo-Constants.spec	26 Jul 2009 06:12:36 -0000	1.6
+++ perl-Geo-Constants.spec	4 Dec 2009 02:04:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Geo-Constants
 Version:        0.06
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Standard Geo:: constants
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.06-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:13 +0000 (UTC)
Subject: rpms/dbxml-perl/devel dbxml-perl.spec,1.10,1.11
Message-ID: <20091204020413.EAE5311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/dbxml-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15270

Modified Files:
	dbxml-perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: dbxml-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbxml-perl/devel/dbxml-perl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dbxml-perl.spec	24 Jul 2009 20:04:12 -0000	1.10
+++ dbxml-perl.spec	4 Dec 2009 02:04:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name: dbxml-perl
 Version: 2.0040016
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Perl bindings for Oracle DB XML
 Group: Development/Languages
 License: GPL+ or Artistic
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_defaultdocdir}/dbxml-perl-%{version}
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.0040016-3
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0040016-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:24 +0000 (UTC)
Subject: rpms/perl-Class-Singleton/devel perl-Class-Singleton.spec,1.9,1.10
Message-ID: <20091204020424.989FC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Singleton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15512

Modified Files:
	perl-Class-Singleton.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Singleton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Singleton/devel/perl-Class-Singleton.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-Singleton.spec	26 Jul 2009 04:32:03 -0000	1.9
+++ perl-Class-Singleton.spec	4 Dec 2009 02:04:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Class-Singleton
 Version:        1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Implementation of a "Singleton" class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.4-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:22 +0000 (UTC)
Subject: rpms/perl-Term-Size-Perl/devel perl-Term-Size-Perl.spec,1.2,1.3
Message-ID: <20091204020422.EA98D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Term-Size-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15485

Modified Files:
	perl-Term-Size-Perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Term-Size-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Size-Perl/devel/perl-Term-Size-Perl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Term-Size-Perl.spec	26 Jul 2009 16:44:36 -0000	1.2
+++ perl-Term-Size-Perl.spec	4 Dec 2009 02:04:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Term-Size-Perl
 Version:        0.029
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension for retrieving terminal size (Perl version)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.029-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.029-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:34 +0000 (UTC)
Subject: rpms/perl-MooseX-LazyLogDispatch/devel
	perl-MooseX-LazyLogDispatch.spec, 1.3, 1.4
Message-ID: <20091204020434.DD8DA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-LazyLogDispatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15666

Modified Files:
	perl-MooseX-LazyLogDispatch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-LazyLogDispatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-LazyLogDispatch/devel/perl-MooseX-LazyLogDispatch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-LazyLogDispatch.spec	26 Jul 2009 11:27:18 -0000	1.3
+++ perl-MooseX-LazyLogDispatch.spec	4 Dec 2009 02:04:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-LazyLogDispatch
 Version:        0.02
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Logging Role for Moose
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:35 +0000 (UTC)
Subject: rpms/perl-Geo-Ellipsoids/devel perl-Geo-Ellipsoids.spec,1.10,1.11
Message-ID: <20091204020435.1314F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geo-Ellipsoids/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15701

Modified Files:
	perl-Geo-Ellipsoids.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geo-Ellipsoids.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geo-Ellipsoids/devel/perl-Geo-Ellipsoids.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Geo-Ellipsoids.spec	26 Jul 2009 06:12:51 -0000	1.10
+++ perl-Geo-Ellipsoids.spec	4 Dec 2009 02:04:34 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Geo-Ellipsoids
 Version:        0.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Standard Geo:: ellipsoids
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.16-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:42 +0000 (UTC)
Subject: rpms/dnssec-tools/devel dnssec-tools.spec,1.27,1.28
Message-ID: <20091204020442.4AF1511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/dnssec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15918

Modified Files:
	dnssec-tools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnssec-tools/devel/dnssec-tools.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- dnssec-tools.spec	21 Aug 2009 13:06:35 -0000	1.27
+++ dnssec-tools.spec	4 Dec 2009 02:04:42 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -287,6 +287,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.5-5
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-4
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:50 +0000 (UTC)
Subject: rpms/perl-Test-Aggregate/devel perl-Test-Aggregate.spec,1.2,1.3
Message-ID: <20091204020450.E8A6411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Aggregate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16165

Modified Files:
	perl-Test-Aggregate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Aggregate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Aggregate/devel/perl-Test-Aggregate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Test-Aggregate.spec	26 Jul 2009 16:45:06 -0000	1.2
+++ perl-Test-Aggregate.spec	4 Dec 2009 02:04:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Test-Aggregate 
 Version:    0.35 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Test/Aggregate.pm -> GPL+ or Artistic
 # lib/Test/Aggregate/Builder.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
@@ -64,6 +64,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.35-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:04:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:04:51 +0000 (UTC)
Subject: rpms/perl-Class-Std/devel perl-Class-Std.spec,1.5,1.6
Message-ID: <20091204020451.1D5C811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Std/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16183

Modified Files:
	perl-Class-Std.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Std.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Std/devel/perl-Class-Std.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Class-Std.spec	26 Jul 2009 04:32:18 -0000	1.5
+++ perl-Class-Std.spec	4 Dec 2009 02:04:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Class-Std
 Version:        0.0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Support for creating standard "inside-out" classes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.0.8-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:00 +0000 (UTC)
Subject: rpms/perl-MooseX-LogDispatch/devel perl-MooseX-LogDispatch.spec, 1.4,
	1.5
Message-ID: <20091204020500.3685A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-LogDispatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16361

Modified Files:
	perl-MooseX-LogDispatch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-LogDispatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-LogDispatch/devel/perl-MooseX-LogDispatch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-LogDispatch.spec	26 Jul 2009 11:27:53 -0000	1.4
+++ perl-MooseX-LogDispatch.spec	4 Dec 2009 02:05:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-LogDispatch
 Version:        1.2000
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Logging Role for Moose
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.2000-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2000-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:02 +0000 (UTC)
Subject: rpms/perl-Geo-Forward/devel perl-Geo-Forward.spec,1.5,1.6
Message-ID: <20091204020502.4672C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geo-Forward/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16430

Modified Files:
	perl-Geo-Forward.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geo-Forward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geo-Forward/devel/perl-Geo-Forward.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Geo-Forward.spec	26 Jul 2009 06:13:06 -0000	1.5
+++ perl-Geo-Forward.spec	4 Dec 2009 02:05:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Geo-Forward
 Version:        0.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Calculate geographic location from lat, lon, distance, and heading
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:09 +0000 (UTC)
Subject: rpms/docbook2X/devel docbook2X.spec,1.11,1.12
Message-ID: <20091204020509.B90F011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/docbook2X/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16586

Modified Files:
	docbook2X.spec 
Log Message:
- rebuild against perl 5.10.1


Index: docbook2X.spec
===================================================================
RCS file: /cvs/pkgs/rpms/docbook2X/devel/docbook2X.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- docbook2X.spec	24 Jul 2009 20:26:28 -0000	1.11
+++ docbook2X.spec	4 Dec 2009 02:05:09 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           docbook2X
 Version:        0.8.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
@@ -77,6 +77,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.8.8-6
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:17 +0000 (UTC)
Subject: rpms/perl-Test-Assert/devel perl-Test-Assert.spec,1.3,1.4
Message-ID: <20091204020517.DF6B011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Assert/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16791

Modified Files:
	perl-Test-Assert.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Assert.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Assert/devel/perl-Test-Assert.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-Assert.spec	26 Jul 2009 16:45:21 -0000	1.3
+++ perl-Test-Assert.spec	4 Dec 2009 02:05:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-Assert
 Version:        0.0501
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Assertion methods for those who like JUnit
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.0501-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0501-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:18 +0000 (UTC)
Subject: rpms/perl-Class-Throwable/devel perl-Class-Throwable.spec,1.3,1.4
Message-ID: <20091204020518.5CE4211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Throwable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16832

Modified Files:
	perl-Class-Throwable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Throwable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Throwable/devel/perl-Class-Throwable.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Class-Throwable.spec	26 Jul 2009 04:32:34 -0000	1.3
+++ perl-Class-Throwable.spec	4 Dec 2009 02:05:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Class-Throwable
 Version:        0.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A minimal lightweight exception class
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.10-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:28 +0000 (UTC)
Subject: rpms/perl-MooseX-Log-Log4perl/devel perl-MooseX-Log-Log4perl.spec,
	1.5, 1.6
Message-ID: <20091204020528.ACF4611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Log-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17029

Modified Files:
	perl-MooseX-Log-Log4perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Log-Log4perl/devel/perl-MooseX-Log-Log4perl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-Log-Log4perl.spec	26 Jul 2009 11:27:37 -0000	1.5
+++ perl-MooseX-Log-Log4perl.spec	4 Dec 2009 02:05:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Log-Log4perl
 Version:    0.40
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/MooseX/Log/Log4perl.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.40-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.40-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:32 +0000 (UTC)
Subject: rpms/perl-Geo-Functions/devel perl-Geo-Functions.spec,1.8,1.9
Message-ID: <20091204020532.6EF8E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geo-Functions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17089

Modified Files:
	perl-Geo-Functions.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geo-Functions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geo-Functions/devel/perl-Geo-Functions.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Geo-Functions.spec	26 Jul 2009 06:13:23 -0000	1.8
+++ perl-Geo-Functions.spec	4 Dec 2009 02:05:31 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Geo-Functions
 Version:        0.07
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Standard Geo:: functions
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.07-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:43 +0000 (UTC)
Subject: rpms/dxcc/devel dxcc.spec,1.4,1.5
Message-ID: <20091204020543.4DF8411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/dxcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17312

Modified Files:
	dxcc.spec 
Log Message:
- rebuild against perl 5.10.1


Index: dxcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dxcc/devel/dxcc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dxcc.spec	24 Jul 2009 20:42:45 -0000	1.4
+++ dxcc.spec	4 Dec 2009 02:05:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           dxcc
 Version:        20080225
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Small utility which determines the ARRL DXCC entity of a ham radio callsign
 
 Group:          Applications/Communications
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 20080225-7
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080225-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:44 +0000 (UTC)
Subject: rpms/perl-Test-Assertions/devel perl-Test-Assertions.spec,1.2,1.3
Message-ID: <20091204020544.54F6B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Assertions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17385

Modified Files:
	perl-Test-Assertions.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Assertions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Assertions/devel/perl-Test-Assertions.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Test-Assertions.spec	26 Jul 2009 16:45:35 -0000	1.2
+++ perl-Test-Assertions.spec	4 Dec 2009 02:05:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-Assertions
 Version:        1.054
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple set of building blocks for both unit and runtime testing
 License:        GPLv2
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.054-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.054-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:45 +0000 (UTC)
Subject: rpms/perl-Class-Trigger/devel perl-Class-Trigger.spec,1.9,1.10
Message-ID: <20091204020545.92ED811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Trigger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17435

Modified Files:
	perl-Class-Trigger.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Trigger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Trigger/devel/perl-Class-Trigger.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-Trigger.spec	26 Jul 2009 04:32:49 -0000	1.9
+++ perl-Class-Trigger.spec	4 Dec 2009 02:05:45 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Class-Trigger
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mixin to add / call inheritable triggers
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.13-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:05:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:05:59 +0000 (UTC)
Subject: rpms/perl-Geography-Countries/devel perl-Geography-Countries.spec,
	1.5, 1.6
Message-ID: <20091204020559.01E8E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geography-Countries/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17744

Modified Files:
	perl-Geography-Countries.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geography-Countries.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geography-Countries/devel/perl-Geography-Countries.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Geography-Countries.spec	26 Jul 2009 06:14:47 -0000	1.5
+++ perl-Geography-Countries.spec	4 Dec 2009 02:05:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Geography-Countries
 Version:        1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        2-letter, 3-letter, and numerical codes for countries
 Group:          Development/Libraries
 License:        MIT
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.4-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:12 +0000 (UTC)
Subject: rpms/perl-Class-XSAccessor-Array/devel
	perl-Class-XSAccessor-Array.spec, 1.4, 1.5
Message-ID: <20091204020612.803C511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17960

Modified Files:
	perl-Class-XSAccessor-Array.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-XSAccessor-Array.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel/perl-Class-XSAccessor-Array.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Class-XSAccessor-Array.spec	27 Jul 2009 11:37:58 -0000	1.4
+++ perl-Class-XSAccessor-Array.spec	4 Dec 2009 02:06:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Class-XSAccessor-Array
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate fast XS accessors without runtime compilation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.04-2
+- rebuild against perl 5.10.1
+
 * Mon Jul 27 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.04-1
 - update
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:15 +0000 (UTC)
Subject: rpms/epylog/devel epylog.spec,1.12,1.13
Message-ID: <20091204020615.3822B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/epylog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18029

Modified Files:
	epylog.spec 
Log Message:
- rebuild against perl 5.10.1


Index: epylog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epylog/devel/epylog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- epylog.spec	24 Jul 2009 22:14:23 -0000	1.12
+++ epylog.spec	4 Dec 2009 02:06:15 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           epylog
 Version:        1.0.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        New logs analyzer and parser
 
 Group:          Applications/System
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.0.3-11
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:18 +0000 (UTC)
Subject: rpms/perl-Test-Base/devel perl-Test-Base.spec,1.13,1.14
Message-ID: <20091204020618.7173011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18067

Modified Files:
	perl-Test-Base.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Base/devel/perl-Test-Base.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Test-Base.spec	26 Jul 2009 16:46:08 -0000	1.13
+++ perl-Test-Base.spec	4 Dec 2009 02:06:18 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Test-Base
 Version:        0.58
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Data Driven Testing Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.58-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.58-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:24 +0000 (UTC)
Subject: rpms/perl-Clipboard/devel perl-Clipboard.spec,1.2,1.3
Message-ID: <20091204020624.2FB8E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Clipboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18170

Modified Files:
	perl-Clipboard.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Clipboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Clipboard/devel/perl-Clipboard.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Clipboard.spec	26 Jul 2009 04:34:07 -0000	1.2
+++ perl-Clipboard.spec	4 Dec 2009 02:06:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clipboard
 Version:        0.09
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Copy and paste with any OS
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.09-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:25 +0000 (UTC)
Subject: rpms/perl-Geo-Inverse/devel perl-Geo-Inverse.spec,1.6,1.7
Message-ID: <20091204020625.AE4B211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geo-Inverse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18200

Modified Files:
	perl-Geo-Inverse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geo-Inverse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geo-Inverse/devel/perl-Geo-Inverse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Geo-Inverse.spec	26 Jul 2009 06:14:14 -0000	1.6
+++ perl-Geo-Inverse.spec	4 Dec 2009 02:06:25 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Geo-Inverse
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Calculate geographic distance from a lat & lon pair
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:35 +0000 (UTC)
Subject: rpms/perl-Test-ClassAPI/devel perl-Test-ClassAPI.spec,1.15,1.16
Message-ID: <20091204020635.1894411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18379

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/devel/perl-Test-ClassAPI.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Test-ClassAPI.spec	26 Jul 2009 16:47:09 -0000	1.15
+++ perl-Test-ClassAPI.spec	4 Dec 2009 02:06:34 -0000	1.16
@@ -1,6 +1,6 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.06
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -63,6 +63,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.06-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:35 +0000 (UTC)
Subject: rpms/perl-Clone/devel perl-Clone.spec,1.15,1.16
Message-ID: <20091204020635.E27D211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Clone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18390

Modified Files:
	perl-Clone.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Clone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Clone/devel/perl-Clone.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Clone.spec	26 Jul 2009 04:34:23 -0000	1.15
+++ perl-Clone.spec	4 Dec 2009 02:06:35 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Clone
 Version:        0.31
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.31-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:41 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.69,1.70
Message-ID: <20091204020641.9886D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18513

Modified Files:
	exim.spec 
Log Message:
- rebuild against perl 5.10.1


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- exim.spec	5 Oct 2009 06:43:53 -0000	1.69
+++ exim.spec	4 Dec 2009 02:06:41 -0000	1.70
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -487,6 +487,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 4.69-19
+- rebuild against perl 5.10.1
+
 * Mon Oct 05 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-18
 - Fix typo in clamd %%post (#527085)
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:47 +0000 (UTC)
Subject: rpms/perl-Color-Library/devel perl-Color-Library.spec,1.4,1.5
Message-ID: <20091204020647.122FA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Color-Library/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18577

Modified Files:
	perl-Color-Library.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Color-Library.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Color-Library/devel/perl-Color-Library.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Color-Library.spec	26 Jul 2009 04:34:39 -0000	1.4
+++ perl-Color-Library.spec	4 Dec 2009 02:06:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Color-Library
 Version:        0.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Easy-to-use and comprehensive named-color library
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:47 +0000 (UTC)
Subject: rpms/perl-Test-Cmd/devel perl-Test-Cmd.spec,1.5,1.6
Message-ID: <20091204020647.61C8811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18593

Modified Files:
	perl-Test-Cmd.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Cmd/devel/perl-Test-Cmd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-Cmd.spec	26 Jul 2009 16:47:25 -0000	1.5
+++ perl-Test-Cmd.spec	4 Dec 2009 02:06:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-Cmd
 Version:        1.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl module for portable testing of commands and scripts
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.05-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:00 +0000 (UTC)
Subject: rpms/perl-common-sense/devel perl-common-sense.spec,1.1,1.2
Message-ID: <20091204020700.45ADE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-common-sense/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18808

Modified Files:
	perl-common-sense.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-common-sense.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-common-sense/devel/perl-common-sense.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-common-sense.spec	30 Sep 2009 01:47:16 -0000	1.1
+++ perl-common-sense.spec	4 Dec 2009 02:07:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-common-sense
 Version:    1.0
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see LICENSE 
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.0-3
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0-2
 - update summary (though now we deviate from upstream)
 



From kasal at fedoraproject.org  Fri Dec  4 02:06:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:06:59 +0000 (UTC)
Subject: rpms/perl-Test-Compile/devel perl-Test-Compile.spec,1.3,1.4
Message-ID: <20091204020659.E37BC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Compile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18798

Modified Files:
	perl-Test-Compile.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Compile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Compile/devel/perl-Test-Compile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-Compile.spec	26 Jul 2009 16:47:42 -0000	1.3
+++ perl-Test-Compile.spec	4 Dec 2009 02:06:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-Compile
 Version:        0.08
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Check whether Perl module files compile correctly
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:10 +0000 (UTC)
Subject: rpms/perl-Test-CPAN-Meta/devel perl-Test-CPAN-Meta.spec,1.6,1.7
Message-ID: <20091204020710.AED1D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18955

Modified Files:
	perl-Test-CPAN-Meta.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-CPAN-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel/perl-Test-CPAN-Meta.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Test-CPAN-Meta.spec	7 Oct 2009 13:57:45 -0000	1.6
+++ perl-Test-CPAN-Meta.spec	4 Dec 2009 02:07:10 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Test-CPAN-Meta
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Validation of the META.yml file in a CPAN distribution
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.13-1
 - update to new upstream release
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:10 +0000 (UTC)
Subject: rpms/fcgi/devel fcgi.spec,1.10,1.11
Message-ID: <20091204020710.E106011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/fcgi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18938

Modified Files:
	fcgi.spec 
Log Message:
- rebuild against perl 5.10.1


Index: fcgi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fcgi/devel/fcgi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fcgi.spec	24 Jul 2009 22:33:30 -0000	1.10
+++ fcgi.spec	4 Dec 2009 02:07:10 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           fcgi
 Version:        2.4.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        FastCGI development kit
 
 Group:          Development/Languages
@@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.4.0-11
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:22 +0000 (UTC)
Subject: rpms/perl-Test-Deep/devel perl-Test-Deep.spec,1.17,1.18
Message-ID: <20091204020722.41F6D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Deep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19168

Modified Files:
	perl-Test-Deep.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Deep/devel/perl-Test-Deep.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Test-Deep.spec	30 Oct 2009 12:32:13 -0000	1.17
+++ perl-Test-Deep.spec	4 Dec 2009 02:07:22 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Test-Deep
 Version:        0.106
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.106-2
+- rebuild against perl 5.10.1
+
 * Fri Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 0.106-1
 - new upstream version
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:12 +0000 (UTC)
Subject: rpms/perl-Config-Any/devel perl-Config-Any.spec,1.10,1.11
Message-ID: <20091204020712.627CF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Any/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18981

Modified Files:
	perl-Config-Any.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Any.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Any/devel/perl-Config-Any.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Config-Any.spec	26 Jul 2009 04:35:31 -0000	1.10
+++ perl-Config-Any.spec	4 Dec 2009 02:07:12 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Config-Any
 Version:        0.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Load configuration from different file formats, transparently
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.17-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:24 +0000 (UTC)
Subject: rpms/perl-Config-Augeas/devel perl-Config-Augeas.spec,1.11,1.12
Message-ID: <20091204020724.3400711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19204

Modified Files:
	perl-Config-Augeas.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Augeas/devel/perl-Config-Augeas.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Config-Augeas.spec	24 Nov 2009 19:02:28 -0000	1.11
+++ perl-Config-Augeas.spec	4 Dec 2009 02:07:24 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Config-Augeas
 Version:        0.501
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Edit configuration files through Augeas C library
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.501-3
+- rebuild against perl 5.10.1
+
 * Tue Nov 24 2009 Alan Pevec <apevec at redhat.com> 0.501-2
 - workaround in %%check for https://fedorahosted.org/augeas/ticket/35
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:34 +0000 (UTC)
Subject: rpms/perl-Test-Dependencies/devel perl-Test-Dependencies.spec, 1.3, 
	1.4
Message-ID: <20091204020734.268DE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Dependencies/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19322

Modified Files:
	perl-Test-Dependencies.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Dependencies.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Dependencies/devel/perl-Test-Dependencies.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-Dependencies.spec	26 Jul 2009 16:48:16 -0000	1.3
+++ perl-Test-Dependencies.spec	4 Dec 2009 02:07:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-Test-Dependencies 
 Version:    0.11 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/Test/Dependencies.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:35 +0000 (UTC)
Subject: rpms/perl-Config-Auto/devel perl-Config-Auto.spec,1.2,1.3
Message-ID: <20091204020735.EEE1F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Auto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19340

Modified Files:
	perl-Config-Auto.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Auto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Auto/devel/perl-Config-Auto.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Config-Auto.spec	26 Jul 2009 04:36:08 -0000	1.2
+++ perl-Config-Auto.spec	4 Dec 2009 02:07:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Config-Auto
 Version:        0.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Magical config file parser
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.20-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:44 +0000 (UTC)
Subject: rpms/perl-Test-Differences/devel perl-Test-Differences.spec, 1.10, 
	1.11
Message-ID: <20091204020744.CB13A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Differences/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447

Modified Files:
	perl-Test-Differences.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Differences.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Differences/devel/perl-Test-Differences.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Test-Differences.spec	20 Aug 2009 02:22:02 -0000	1.10
+++ perl-Test-Differences.spec	4 Dec 2009 02:07:44 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Test-Differences
 Version:        0.4801
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Test strings and data structures and show differences if not ok
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.4801-4
+- rebuild against perl 5.10.1
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4801-3
 - fix source url
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:47 +0000 (UTC)
Subject: rpms/perl-Config-General/devel perl-Config-General.spec,1.23,1.24
Message-ID: <20091204020747.C8EAE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-General/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19466

Modified Files:
	perl-Config-General.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Config-General.spec	8 Sep 2009 17:13:57 -0000	1.23
+++ perl-Config-General.spec	4 Dec 2009 02:07:47 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-Config-General
 Version:        2.44
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.44-2
+- rebuild against perl 5.10.1
+
 * Tue Sep  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.44-1
 - Update to 2.44 (#521756).
 - Prune pre-2005 %%changelog entries.



From kasal at fedoraproject.org  Fri Dec  4 02:07:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:56 +0000 (UTC)
Subject: rpms/perl-Test-Distribution/devel perl-Test-Distribution.spec, 1.9, 
	1.10
Message-ID: <20091204020756.6409B11C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Distribution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19645

Modified Files:
	perl-Test-Distribution.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Distribution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Distribution/devel/perl-Test-Distribution.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Test-Distribution.spec	26 Jul 2009 16:48:47 -0000	1.9
+++ perl-Test-Distribution.spec	4 Dec 2009 02:07:55 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           perl-Test-Distribution
 Version:        2.00
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perform tests on all modules of a distribution
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.00-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:07:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:07:59 +0000 (UTC)
Subject: rpms/perl-Config-Grammar/devel perl-Config-Grammar.spec,1.3,1.4
Message-ID: <20091204020759.03D5A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Grammar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19678

Modified Files:
	perl-Config-Grammar.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Grammar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Grammar/devel/perl-Config-Grammar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Config-Grammar.spec	26 Jul 2009 04:36:40 -0000	1.3
+++ perl-Config-Grammar.spec	4 Dec 2009 02:07:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Config-Grammar
 Version:        1.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Grammar-based, user-friendly config parser
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ find %{buildroot} -type f -name .packlis
 %{_mandir}/man3//Config::Grammar*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.10-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:11 +0000 (UTC)
Subject: rpms/perl-Test-Email/devel perl-Test-Email.spec,1.3,1.4
Message-ID: <20091204020811.5757511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Email/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19794

Modified Files:
	perl-Test-Email.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Email.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Email/devel/perl-Test-Email.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-Email.spec	26 Jul 2009 16:49:01 -0000	1.3
+++ perl-Test-Email.spec	4 Dec 2009 02:08:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-Email
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Test Email Contents
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:13 +0000 (UTC)
Subject: rpms/perl-Config-INI/devel perl-Config-INI.spec,1.2,1.3
Message-ID: <20091204020813.C2AE111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-INI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19826

Modified Files:
	perl-Config-INI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-INI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-INI/devel/perl-Config-INI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Config-INI.spec	26 Jul 2009 04:36:53 -0000	1.2
+++ perl-Config-INI.spec	4 Dec 2009 02:08:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Config-INI
 Version:        0.014
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Config::INI Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.014-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.014-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:22 +0000 (UTC)
Subject: rpms/perl-Test-Exception/devel perl-Test-Exception.spec,1.14,1.15
Message-ID: <20091204020822.0A08711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Exception/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20058

Modified Files:
	perl-Test-Exception.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Exception.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Exception/devel/perl-Test-Exception.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Test-Exception.spec	26 Jul 2009 16:49:15 -0000	1.14
+++ perl-Test-Exception.spec	4 Dec 2009 02:08:21 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Test-Exception
 Version:        0.27
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library of test functions for exception based Perl code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.27-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:34 +0000 (UTC)
Subject: rpms/perl-Test-Expect/devel perl-Test-Expect.spec,1.6,1.7
Message-ID: <20091204020834.A5FC611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Expect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20203

Modified Files:
	perl-Test-Expect.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Expect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Expect/devel/perl-Test-Expect.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Test-Expect.spec	26 Jul 2009 16:49:28 -0000	1.6
+++ perl-Test-Expect.spec	4 Dec 2009 02:08:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Test-Expect
 Version:        0.31
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automated driving and testing of terminal-based programs
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.31-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:23 +0000 (UTC)
Subject: rpms/perl-Config-IniFiles/devel perl-Config-IniFiles.spec, 1.13,
	1.14
Message-ID: <20091204020823.966EA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-IniFiles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20079

Modified Files:
	perl-Config-IniFiles.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-IniFiles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-IniFiles/devel/perl-Config-IniFiles.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Config-IniFiles.spec	26 Jul 2009 04:37:08 -0000	1.13
+++ perl-Config-IniFiles.spec	4 Dec 2009 02:08:23 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Config-IniFiles
 Version:        2.47
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A module for reading .ini-style configuration files
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.47-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.47-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:35 +0000 (UTC)
Subject: rpms/perl-Config-IniHash/devel perl-Config-IniHash.spec,1.7,1.8
Message-ID: <20091204020835.3360E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-IniHash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20219

Modified Files:
	perl-Config-IniHash.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-IniHash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-IniHash/devel/perl-Config-IniHash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Config-IniHash.spec	26 Jul 2009 04:37:22 -0000	1.7
+++ perl-Config-IniHash.spec	4 Dec 2009 02:08:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Config-IniHash
 Version:        3.00.00 
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for reading and writing INI files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.00.00-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.00.00-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:46 +0000 (UTC)
Subject: rpms/perl-Config-JFDI/devel perl-Config-JFDI.spec,1.5,1.6
Message-ID: <20091204020846.E97DA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-JFDI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20350

Modified Files:
	perl-Config-JFDI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-JFDI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/devel/perl-Config-JFDI.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Config-JFDI.spec	25 Oct 2009 09:03:48 -0000	1.5
+++ perl-Config-JFDI.spec	4 Dec 2009 02:08:46 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Config-JFDI
 Version:        0.064
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Just * Do it: A Catalyst::Plugin::ConfigLoader-style layer over Config::Any
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.064-2
+- rebuild against perl 5.10.1
+
 * Sun Oct 25 2009 Iain Arnell <iarnell at gmail.com> 0.064-1
 - update to latest upstream release
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:45 +0000 (UTC)
Subject: rpms/perl-Test-File/devel perl-Test-File.spec,1.8,1.9
Message-ID: <20091204020845.5981E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-File/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20324

Modified Files:
	perl-Test-File.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-File.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/devel/perl-Test-File.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Test-File.spec	26 Jul 2009 16:49:42 -0000	1.8
+++ perl-Test-File.spec	4 Dec 2009 02:08:45 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Test-File
 Version:        1.25
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Test file attributes
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.25-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:55 +0000 (UTC)
Subject: rpms/perl-Test-File-Contents/devel perl-Test-File-Contents.spec, 1.4,
	1.5
Message-ID: <20091204020855.8D07511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-File-Contents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20453

Modified Files:
	perl-Test-File-Contents.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-File-Contents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File-Contents/devel/perl-Test-File-Contents.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Test-File-Contents.spec	26 Jul 2009 16:49:55 -0000	1.4
+++ perl-Test-File-Contents.spec	4 Dec 2009 02:08:55 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Test-File-Contents
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Test routines for examining the contents of files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:08:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:08:57 +0000 (UTC)
Subject: rpms/perl-Config-Model/devel perl-Config-Model.spec,1.1,1.2
Message-ID: <20091204020857.6DA6411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Model/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20467

Modified Files:
	perl-Config-Model.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Model.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Model/devel/perl-Config-Model.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Config-Model.spec	10 Aug 2009 17:38:29 -0000	1.1
+++ perl-Config-Model.spec	4 Dec 2009 02:08:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Config-Model
 Version:        0.638
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Framework to create configuration validation tools and editors
 License:        LGPLv2+ 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/config-edit
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.638-5
+- rebuild against perl 5.10.1
+
 * Sun Aug 09 2009 David Hannequin david.hannequin at gmail.com 0.638-4
 - Modify license.
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:16 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple/devel
	perl-Test-HTTP-Server-Simple.spec, 1.5, 1.6
Message-ID: <20091204020916.4BBDC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20681

Modified Files:
	perl-Test-HTTP-Server-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple/devel/perl-Test-HTTP-Server-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-HTTP-Server-Simple.spec	23 Nov 2009 06:52:10 -0000	1.5
+++ perl-Test-HTTP-Server-Simple.spec	4 Dec 2009 02:09:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-HTTP-Server-Simple
 Version:        0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Test::More functions for HTTP::Server::Simple
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-2
+- rebuild against perl 5.10.1
+
 * Mon Nov 23 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.11-1
 - Upstream update.
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:05 +0000 (UTC)
Subject: rpms/perl-Test-Harness-Straps/devel perl-Test-Harness-Straps.spec,
	1.3, 1.4
Message-ID: <20091204020905.E0AD811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Harness-Straps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20565

Modified Files:
	perl-Test-Harness-Straps.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Harness-Straps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Harness-Straps/devel/perl-Test-Harness-Straps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-Harness-Straps.spec	26 Jul 2009 16:50:40 -0000	1.3
+++ perl-Test-Harness-Straps.spec	4 Dec 2009 02:09:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-Harness-Straps
 Version:        0.30
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Detailed analysis of test results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.30-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:13 +0000 (UTC)
Subject: rpms/perl-Config-Properties/devel perl-Config-Properties.spec, 1.2, 
	1.3
Message-ID: <20091204020913.0DCC211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Properties/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20648

Modified Files:
	perl-Config-Properties.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Properties/devel/perl-Config-Properties.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Config-Properties.spec	26 Jul 2009 04:37:50 -0000	1.2
+++ perl-Config-Properties.spec	4 Dec 2009 02:09:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Config-Properties
 Version:        1.70
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Read and write property files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.70-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.70-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:24 +0000 (UTC)
Subject: rpms/perl-ConfigReader/devel perl-ConfigReader.spec,1.4,1.5
Message-ID: <20091204020924.994F811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ConfigReader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20775

Modified Files:
	perl-ConfigReader.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ConfigReader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ConfigReader/devel/perl-ConfigReader.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-ConfigReader.spec	26 Jul 2009 04:38:48 -0000	1.4
+++ perl-ConfigReader.spec	4 Dec 2009 02:09:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-ConfigReader
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Read directives from a configuration file
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.5-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:27 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel
	perl-Test-HTTP-Server-Simple-StashWarnings.spec, 1.5, 1.6
Message-ID: <20091204020927.80E5B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20796

Modified Files:
	perl-Test-HTTP-Server-Simple-StashWarnings.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-HTTP-Server-Simple-StashWarnings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel/perl-Test-HTTP-Server-Simple-StashWarnings.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-HTTP-Server-Simple-StashWarnings.spec	26 Jul 2009 16:50:27 -0000	1.5
+++ perl-Test-HTTP-Server-Simple-StashWarnings.spec	4 Dec 2009 02:09:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-HTTP-Server-Simple-StashWarnings
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Catch your forked server's warnings
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:36 +0000 (UTC)
Subject: rpms/perl-Config-Record/devel perl-Config-Record.spec,1.13,1.14
Message-ID: <20091204020936.4729F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Record/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20882

Modified Files:
	perl-Config-Record.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Record.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Record/devel/perl-Config-Record.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Config-Record.spec	26 Jul 2009 04:38:04 -0000	1.13
+++ perl-Config-Record.spec	4 Dec 2009 02:09:35 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Config-Record
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module for Configuration file access
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.1.2-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:38 +0000 (UTC)
Subject: rpms/perl-Test-Inline/devel perl-Test-Inline.spec,1.17,1.18
Message-ID: <20091204020938.7DB0911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Inline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20902

Modified Files:
	perl-Test-Inline.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/devel/perl-Test-Inline.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Test-Inline.spec	26 Jul 2009 16:50:54 -0000	1.17
+++ perl-Test-Inline.spec	4 Dec 2009 02:09:38 -0000	1.18
@@ -1,6 +1,6 @@
 Name: 		perl-Test-Inline
 Version: 	2.211
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Test::Inline Perl module
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -79,6 +79,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.211-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.211-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:46 +0000 (UTC)
Subject: rpms/perl-Config-Simple/devel perl-Config-Simple.spec,1.4,1.5
Message-ID: <20091204020946.CB5CC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21003

Modified Files:
	perl-Config-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Simple/devel/perl-Config-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Config-Simple.spec	26 Jul 2009 04:38:18 -0000	1.4
+++ perl-Config-Simple.spec	4 Dec 2009 02:09:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Config-Simple
 Version:        4.59
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple configuration file class 
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 4.59-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.59-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:48 +0000 (UTC)
Subject: rpms/perl-Test-JSON/devel perl-Test-JSON.spec,1.2,1.3
Message-ID: <20091204020948.C225811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-JSON/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21018

Modified Files:
	perl-Test-JSON.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-JSON.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-JSON/devel/perl-Test-JSON.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Test-JSON.spec	26 Jul 2009 16:51:08 -0000	1.2
+++ perl-Test-JSON.spec	4 Dec 2009 02:09:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-JSON
 Version:        0.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Test JSON data
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.06-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:58 +0000 (UTC)
Subject: rpms/perl-Config-Tiny/devel perl-Config-Tiny.spec,1.24,1.25
Message-ID: <20091204020958.9FF3511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Config-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21106

Modified Files:
	perl-Config-Tiny.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-Config-Tiny.spec	26 Jul 2009 04:38:33 -0000	1.24
+++ perl-Config-Tiny.spec	4 Dec 2009 02:09:58 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-Config-Tiny
 Version:        2.12
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.12-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:09:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:09:59 +0000 (UTC)
Subject: rpms/perl-Test-Kwalitee/devel perl-Test-Kwalitee.spec,1.3,1.4
Message-ID: <20091204020959.D6D0011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Kwalitee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21127

Modified Files:
	perl-Test-Kwalitee.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Kwalitee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Kwalitee/devel/perl-Test-Kwalitee.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-Kwalitee.spec	26 Jul 2009 16:51:22 -0000	1.3
+++ perl-Test-Kwalitee.spec	4 Dec 2009 02:09:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-Kwalitee
 Version:        1.01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Test the Kwalitee of a distribution before you release it
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.01-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:11 +0000 (UTC)
Subject: rpms/perl-Test-LongString/devel perl-Test-LongString.spec, 1.12,
	1.13
Message-ID: <20091204021011.F1DA211C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-LongString/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21265

Modified Files:
	perl-Test-LongString.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-LongString/devel/perl-Test-LongString.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Test-LongString.spec	26 Jul 2009 16:51:35 -0000	1.12
+++ perl-Test-LongString.spec	4 Dec 2009 02:10:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name: 		perl-Test-LongString
 Version: 	0.11
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Perl module to test long strings
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -57,6 +57,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:21 +0000 (UTC)
Subject: rpms/perl-Contextual-Return/devel perl-Contextual-Return.spec, 1.8, 
	1.9
Message-ID: <20091204021021.A76DF11C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Contextual-Return/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21380

Modified Files:
	perl-Contextual-Return.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Contextual-Return.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Contextual-Return/devel/perl-Contextual-Return.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Contextual-Return.spec	26 Jul 2009 04:39:02 -0000	1.8
+++ perl-Contextual-Return.spec	4 Dec 2009 02:10:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:     perl-Contextual-Return
 Version:  0.2.1 
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary:  Create context-senstive return values
 
 Group:    Development/Libraries
@@ -61,6 +61,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.2.1-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:10 +0000 (UTC)
Subject: rpms/perl-constant-boolean/devel perl-constant-boolean.spec, 1.4,
	1.5
Message-ID: <20091204021010.CD5D811C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-constant-boolean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21235

Modified Files:
	perl-constant-boolean.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-constant-boolean.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-constant-boolean/devel/perl-constant-boolean.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-constant-boolean.spec	26 Jul 2009 17:45:58 -0000	1.4
+++ perl-constant-boolean.spec	4 Dec 2009 02:10:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-constant-boolean
 Version:        0.01
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Define TRUE and FALSE constants
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.01-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:22 +0000 (UTC)
Subject: rpms/perl-Test-Manifest/devel perl-Test-Manifest.spec,1.19,1.20
Message-ID: <20091204021022.B332411C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Manifest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21396

Modified Files:
	perl-Test-Manifest.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Manifest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Manifest/devel/perl-Test-Manifest.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-Test-Manifest.spec	26 Jul 2009 16:51:50 -0000	1.19
+++ perl-Test-Manifest.spec	4 Dec 2009 02:10:22 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-Test-Manifest
 Version:        1.22
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Test case module for Perl
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.22-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:32 +0000 (UTC)
Subject: rpms/perl-Convert-ASCII-Armour/devel perl-Convert-ASCII-Armour.spec,
	1.7, 1.8
Message-ID: <20091204021032.9836411C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-ASCII-Armour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21498

Modified Files:
	perl-Convert-ASCII-Armour.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-ASCII-Armour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-ASCII-Armour/devel/perl-Convert-ASCII-Armour.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Convert-ASCII-Armour.spec	26 Jul 2009 04:39:16 -0000	1.7
+++ perl-Convert-ASCII-Armour.spec	4 Dec 2009 02:10:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Convert-ASCII-Armour
 Version:        1.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Convert binary octets into ASCII armoured messages
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.4-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:43 +0000 (UTC)
Subject: rpms/perl-Convert-ASN1/devel perl-Convert-ASN1.spec,1.15,1.16
Message-ID: <20091204021043.0604511C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-ASN1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21615

Modified Files:
	perl-Convert-ASN1.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-ASN1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-ASN1/devel/perl-Convert-ASN1.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Convert-ASN1.spec	27 Jul 2009 10:39:34 -0000	1.15
+++ perl-Convert-ASN1.spec	4 Dec 2009 02:10:42 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:        ASN.1 Encode/Decode library
 Name:           perl-Convert-ASN1
 Version:        0.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.22-2
+- rebuild against perl 5.10.1
+
 * Mon Jul 27 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.22-1
 - update to 0.22
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:33 +0000 (UTC)
Subject: rpms/perl-Test-Memory-Cycle/devel perl-Test-Memory-Cycle.spec, 1.12,
	1.13
Message-ID: <20091204021033.A443F11C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Memory-Cycle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21516

Modified Files:
	perl-Test-Memory-Cycle.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Memory-Cycle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Memory-Cycle/devel/perl-Test-Memory-Cycle.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Test-Memory-Cycle.spec	26 Jul 2009 16:52:05 -0000	1.12
+++ perl-Test-Memory-Cycle.spec	4 Dec 2009 02:10:33 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Test-Memory-Cycle
 Version:        1.04
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Check for memory leaks and circular memory references
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.04-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:44 +0000 (UTC)
Subject: rpms/perl-Test-MinimumVersion/devel perl-Test-MinimumVersion.spec, 
	1.11, 1.12
Message-ID: <20091204021044.71A1911C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-MinimumVersion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21634

Modified Files:
	perl-Test-MinimumVersion.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MinimumVersion/devel/perl-Test-MinimumVersion.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Test-MinimumVersion.spec	26 Jul 2009 16:52:20 -0000	1.11
+++ perl-Test-MinimumVersion.spec	4 Dec 2009 02:10:44 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		perl-Test-MinimumVersion
 Version:	0.011
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Check whether your code requires a newer perl
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -49,6 +49,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.011-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.011-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:53 +0000 (UTC)
Subject: rpms/perl-Convert-BER/devel perl-Convert-BER.spec,1.3,1.4
Message-ID: <20091204021053.7BED911C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-BER/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21729

Modified Files:
	perl-Convert-BER.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-BER.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-BER/devel/perl-Convert-BER.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Convert-BER.spec	26 Jul 2009 04:39:53 -0000	1.3
+++ perl-Convert-BER.spec	4 Dec 2009 02:10:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Convert-BER
 Version:        1.3101
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        ASN.1 Basic Encoding Rules
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.3101-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3101-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:10:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:10:59 +0000 (UTC)
Subject: rpms/perl-Test-MockModule/devel perl-Test-MockModule.spec,1.7,1.8
Message-ID: <20091204021059.8F5C011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-MockModule/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21784

Modified Files:
	perl-Test-MockModule.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-MockModule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockModule/devel/perl-Test-MockModule.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Test-MockModule.spec	26 Jul 2009 16:52:51 -0000	1.7
+++ perl-Test-MockModule.spec	4 Dec 2009 02:10:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Test-MockModule
 Version:        0.05
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Override subroutines in a module for unit testing
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:05 +0000 (UTC)
Subject: rpms/perl-Convert-Binary-C/devel perl-Convert-Binary-C.spec, 1.14, 
	1.15
Message-ID: <20091204021105.6F78211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-Binary-C/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21846

Modified Files:
	perl-Convert-Binary-C.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-Binary-C.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-Binary-C/devel/perl-Convert-Binary-C.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Convert-Binary-C.spec	26 Jul 2009 04:40:26 -0000	1.14
+++ perl-Convert-Binary-C.spec	4 Dec 2009 02:11:05 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Convert-Binary-C
 Version:        0.74
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Binary data conversion using C types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.74-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.74-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:10 +0000 (UTC)
Subject: rpms/perl-Test-MockObject/devel perl-Test-MockObject.spec, 1.20,
	1.21
Message-ID: <20091204021110.5F38111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-MockObject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21891

Modified Files:
	perl-Test-MockObject.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Test-MockObject.spec	26 Jul 2009 16:53:06 -0000	1.20
+++ perl-Test-MockObject.spec	4 Dec 2009 02:11:10 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-Test-MockObject
 Version:        1.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.09-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:17 +0000 (UTC)
Subject: rpms/perl-Convert-BinHex/devel perl-Convert-BinHex.spec,1.13,1.14
Message-ID: <20091204021117.1A42F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-BinHex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21957

Modified Files:
	perl-Convert-BinHex.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-BinHex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-BinHex/devel/perl-Convert-BinHex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Convert-BinHex.spec	26 Jul 2009 04:40:10 -0000	1.13
+++ perl-Convert-BinHex.spec	4 Dec 2009 02:11:16 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		perl-Convert-BinHex
 Version:	1.119
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Macintosh BinHex extractor library for Perl
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -45,6 +45,9 @@ Convert::BinHex extracts data from Macin
 %{_mandir}/man3/Convert::BinHex.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.119-11
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.119-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:21 +0000 (UTC)
Subject: rpms/perl-Test-MockTime/devel perl-Test-MockTime.spec,1.4,1.5
Message-ID: <20091204021121.B3A7B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-MockTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22017

Modified Files:
	perl-Test-MockTime.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-MockTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-MockTime/devel/perl-Test-MockTime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Test-MockTime.spec	26 Jul 2009 16:53:20 -0000	1.4
+++ perl-Test-MockTime.spec	4 Dec 2009 02:11:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Test-MockTime
 Version:        0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Replaces actual time with simulated time
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.12-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:28 +0000 (UTC)
Subject: rpms/perl-Convert-NLS_DATE_FORMAT/devel
	perl-Convert-NLS_DATE_FORMAT.spec, 1.5, 1.6
Message-ID: <20091204021128.19DA911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-NLS_DATE_FORMAT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22069

Modified Files:
	perl-Convert-NLS_DATE_FORMAT.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-NLS_DATE_FORMAT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-NLS_DATE_FORMAT/devel/perl-Convert-NLS_DATE_FORMAT.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Convert-NLS_DATE_FORMAT.spec	26 Jul 2009 04:40:42 -0000	1.5
+++ perl-Convert-NLS_DATE_FORMAT.spec	4 Dec 2009 02:11:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Convert-NLS_DATE_FORMAT
 Version:        0.02
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Convert Oracle NLS_DATE_FORMAT <-> strftime Format Strings
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:33 +0000 (UTC)
Subject: rpms/perl-Test-Most/devel perl-Test-Most.spec,1.2,1.3
Message-ID: <20091204021133.30E6211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Most/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22135

Modified Files:
	perl-Test-Most.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Most.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Most/devel/perl-Test-Most.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Test-Most.spec	26 Jul 2009 16:53:34 -0000	1.2
+++ perl-Test-Most.spec	4 Dec 2009 02:11:33 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-Most
 Version:        0.21
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl module with test functions and features
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.21-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:39 +0000 (UTC)
Subject: rpms/perl-Convert-PEM/devel perl-Convert-PEM.spec,1.7,1.8
Message-ID: <20091204021139.7971411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-PEM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22189

Modified Files:
	perl-Convert-PEM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-PEM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-PEM/devel/perl-Convert-PEM.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Convert-PEM.spec	26 Jul 2009 04:40:59 -0000	1.7
+++ perl-Convert-PEM.spec	4 Dec 2009 02:11:39 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Convert-PEM
 Version:        0.07
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Read/write encrypted ASN.1 PEM files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.07-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:50 +0000 (UTC)
Subject: rpms/perl-Convert-TNEF/devel perl-Convert-TNEF.spec,1.13,1.14
Message-ID: <20091204021150.95D7F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-TNEF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22309

Modified Files:
	perl-Convert-TNEF.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-TNEF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-TNEF/devel/perl-Convert-TNEF.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Convert-TNEF.spec	26 Jul 2009 04:41:14 -0000	1.13
+++ perl-Convert-TNEF.spec	4 Dec 2009 02:11:50 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Convert-TNEF
 Version:        0.17
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Perl module to read TNEF files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Convert::TNEF.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.17-11
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:45 +0000 (UTC)
Subject: rpms/perl-Test-NeedsDisplay/devel perl-Test-NeedsDisplay.spec, 1.3, 
	1.4
Message-ID: <20091204021145.19FDC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-NeedsDisplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22257

Modified Files:
	perl-Test-NeedsDisplay.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-NeedsDisplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-NeedsDisplay/devel/perl-Test-NeedsDisplay.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-NeedsDisplay.spec	26 Jul 2009 16:53:48 -0000	1.3
+++ perl-Test-NeedsDisplay.spec	4 Dec 2009 02:11:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-NeedsDisplay
 Version:        1.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Ensure that tests needing a display have one
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.05-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:00 +0000 (UTC)
Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.23,1.24
Message-ID: <20091204021200.AF5AA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Convert-UUlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22415

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Convert-UUlib.spec	24 Jul 2009 22:31:46 -0000	1.23
+++ perl-Convert-UUlib.spec	4 Dec 2009 02:12:00 -0000	1.24
@@ -3,7 +3,7 @@
 Name:    perl-%{cpanname}
 Version: 1.12
 Epoch:   1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Perl interface to the uulib library
 
 Group:     Development/Libraries
@@ -62,6 +62,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.12-2
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Robert Scheck <robert at fedoraproject.org> 1:1.12-1
 - Upgrade to 1.12
 



From kasal at fedoraproject.org  Fri Dec  4 02:11:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:11:55 +0000 (UTC)
Subject: rpms/perl-Test-NoWarnings/devel perl-Test-NoWarnings.spec, 1.10,
	1.11
Message-ID: <20091204021155.971D711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-NoWarnings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22364

Modified Files:
	perl-Test-NoWarnings.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-NoWarnings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-NoWarnings/devel/perl-Test-NoWarnings.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Test-NoWarnings.spec	26 Jul 2009 16:54:03 -0000	1.10
+++ perl-Test-NoWarnings.spec	4 Dec 2009 02:11:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Test-NoWarnings
 Version:        0.084
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Make sure you didn't emit any warnings while testing
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.084-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.084-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:06 +0000 (UTC)
Subject: rpms/perl-Test-Number-Delta/devel perl-Test-Number-Delta.spec, 1.5, 
	1.6
Message-ID: <20091204021206.0315E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Number-Delta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22473

Modified Files:
	perl-Test-Number-Delta.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Number-Delta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Number-Delta/devel/perl-Test-Number-Delta.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-Number-Delta.spec	26 Jul 2009 16:54:20 -0000	1.5
+++ perl-Test-Number-Delta.spec	4 Dec 2009 02:12:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-Number-Delta
 Version:        1.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Compare the difference between numbers against a given tolerance
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.03-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:11 +0000 (UTC)
Subject: rpms/perl-CPAN-Checksums/devel perl-CPAN-Checksums.spec,1.1,1.2
Message-ID: <20091204021211.4972E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CPAN-Checksums/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22542

Modified Files:
	perl-CPAN-Checksums.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CPAN-Checksums.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPAN-Checksums/devel/perl-CPAN-Checksums.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-CPAN-Checksums.spec	20 Nov 2009 07:17:31 -0000	1.1
+++ perl-CPAN-Checksums.spec	4 Dec 2009 02:12:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CPAN-Checksums
 Version:        2.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Write a CHECKSUMS file for a directory as on CPAN
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,5 +50,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.04-2
+- rebuild against perl 5.10.1
+
 * Wed Nov 18 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 2.04-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Fri Dec  4 02:12:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:18 +0000 (UTC)
Subject: rpms/perl-Test-Object/devel perl-Test-Object.spec,1.7,1.8
Message-ID: <20091204021218.BF31D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Object/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22603

Modified Files:
	perl-Test-Object.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Object.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Object/devel/perl-Test-Object.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Test-Object.spec	26 Jul 2009 16:54:36 -0000	1.7
+++ perl-Test-Object.spec	4 Dec 2009 02:12:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Test-Object
 Version:        0.07
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Thoroughly testing objects via registered handlers
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.07-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:23 +0000 (UTC)
Subject: rpms/perl-CPAN-DistnameInfo/devel perl-CPAN-DistnameInfo.spec, 1.8, 
	1.9
Message-ID: <20091204021223.B5EB911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CPAN-DistnameInfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22660

Modified Files:
	perl-CPAN-DistnameInfo.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CPAN-DistnameInfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPAN-DistnameInfo/devel/perl-CPAN-DistnameInfo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-CPAN-DistnameInfo.spec	26 Jul 2009 04:01:07 -0000	1.8
+++ perl-CPAN-DistnameInfo.spec	4 Dec 2009 02:12:23 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-CPAN-DistnameInfo
 Version:        0.08
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extract distribution name and version from a distribution filename
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:29 +0000 (UTC)
Subject: rpms/perl-Test-Output/devel perl-Test-Output.spec,1.7,1.8
Message-ID: <20091204021229.6735211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Output/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22733

Modified Files:
	perl-Test-Output.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Output.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Output/devel/perl-Test-Output.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Test-Output.spec	26 Jul 2009 16:54:53 -0000	1.7
+++ perl-Test-Output.spec	4 Dec 2009 02:12:29 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Test-Output
 Version:        0.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Utilities to test STDOUT and STDERR messages
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.12-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:34 +0000 (UTC)
Subject: rpms/perl-CPAN-Mini/devel perl-CPAN-Mini.spec,1.5,1.6
Message-ID: <20091204021234.5A1E811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CPAN-Mini/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22804

Modified Files:
	perl-CPAN-Mini.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CPAN-Mini.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPAN-Mini/devel/perl-CPAN-Mini.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-CPAN-Mini.spec	26 Jul 2009 04:01:23 -0000	1.5
+++ perl-CPAN-Mini.spec	4 Dec 2009 02:12:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-CPAN-Mini
 Version:        0.576
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Create a minimal mirror of CPAN
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man[13]/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.576-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.576-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:40 +0000 (UTC)
Subject: rpms/perl-Test-Perl-Critic/devel perl-Test-Perl-Critic.spec, 1.9,
	1.10
Message-ID: <20091204021240.E665011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Perl-Critic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22861

Modified Files:
	perl-Test-Perl-Critic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Perl-Critic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Perl-Critic/devel/perl-Test-Perl-Critic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Test-Perl-Critic.spec	26 Jul 2009 16:55:12 -0000	1.9
+++ perl-Test-Perl-Critic.spec	4 Dec 2009 02:12:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Test-Perl-Critic
 Version:        1.01
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Use Perl::Critic in test programs
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.01-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:51 +0000 (UTC)
Subject: rpms/perl-Test-Pod/devel perl-Test-Pod.spec,1.16,1.17
Message-ID: <20091204021251.CC08811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Pod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22974

Modified Files:
	perl-Test-Pod.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Pod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Pod/devel/perl-Test-Pod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Test-Pod.spec	30 Oct 2009 14:42:56 -0000	1.16
+++ perl-Test-Pod.spec	4 Dec 2009 02:12:51 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Test-Pod
 Version:        1.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for checking for POD errors in files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.40-2
+- rebuild against perl 5.10.1
+
 * Fri Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 1.40-1
 - new upstream version
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:46 +0000 (UTC)
Subject: rpms/perl-CPANPLUS-Shell-Default-Plugins-Changes/devel
	perl-CPANPLUS-Shell-Default-Plugins-Changes.spec, 1.3, 1.4
Message-ID: <20091204021246.37BD111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CPANPLUS-Shell-Default-Plugins-Changes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22914

Modified Files:
	perl-CPANPLUS-Shell-Default-Plugins-Changes.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CPANPLUS-Shell-Default-Plugins-Changes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPANPLUS-Shell-Default-Plugins-Changes/devel/perl-CPANPLUS-Shell-Default-Plugins-Changes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-CPANPLUS-Shell-Default-Plugins-Changes.spec	26 Jul 2009 04:01:37 -0000	1.3
+++ perl-CPANPLUS-Shell-Default-Plugins-Changes.spec	4 Dec 2009 02:12:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-CPANPLUS-Shell-Default-Plugins-Changes 
 Version:    0.02 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/CPANPLUS/Shell/Default/Plugins/Changes.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:12:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:12:57 +0000 (UTC)
Subject: rpms/perl-CPANPLUS-Shell-Default-Plugins-Diff/devel
	perl-CPANPLUS-Shell-Default-Plugins-Diff.spec, 1.3, 1.4
Message-ID: <20091204021257.BBA6011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CPANPLUS-Shell-Default-Plugins-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23026

Modified Files:
	perl-CPANPLUS-Shell-Default-Plugins-Diff.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CPANPLUS-Shell-Default-Plugins-Diff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPANPLUS-Shell-Default-Plugins-Diff/devel/perl-CPANPLUS-Shell-Default-Plugins-Diff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-CPANPLUS-Shell-Default-Plugins-Diff.spec	26 Jul 2009 04:01:51 -0000	1.3
+++ perl-CPANPLUS-Shell-Default-Plugins-Diff.spec	4 Dec 2009 02:12:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-CPANPLUS-Shell-Default-Plugins-Diff
 Version:        0.01
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Diff module versions from the CPANPLUS shell
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.01-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:03 +0000 (UTC)
Subject: rpms/perl-Test-Pod-Coverage/devel perl-Test-Pod-Coverage.spec, 1.12,
	1.13
Message-ID: <20091204021303.33FE311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Pod-Coverage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23085

Modified Files:
	perl-Test-Pod-Coverage.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Pod-Coverage/devel/perl-Test-Pod-Coverage.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Test-Pod-Coverage.spec	26 Jul 2009 16:55:44 -0000	1.12
+++ perl-Test-Pod-Coverage.spec	4 Dec 2009 02:13:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Test-Pod-Coverage
 Version:        1.08
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.08-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:08 +0000 (UTC)
Subject: rpms/perl-CPANPLUS-Shell-Default-Plugins-RT/devel
	perl-CPANPLUS-Shell-Default-Plugins-RT.spec, 1.3, 1.4
Message-ID: <20091204021308.B2A0C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CPANPLUS-Shell-Default-Plugins-RT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23134

Modified Files:
	perl-CPANPLUS-Shell-Default-Plugins-RT.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CPANPLUS-Shell-Default-Plugins-RT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CPANPLUS-Shell-Default-Plugins-RT/devel/perl-CPANPLUS-Shell-Default-Plugins-RT.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-CPANPLUS-Shell-Default-Plugins-RT.spec	26 Jul 2009 04:02:07 -0000	1.3
+++ perl-CPANPLUS-Shell-Default-Plugins-RT.spec	4 Dec 2009 02:13:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-CPANPLUS-Shell-Default-Plugins-RT 
 Version:    0.01 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see README 
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot} 
 %{perl_vendorlib}/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.01-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:14 +0000 (UTC)
Subject: rpms/perl-Test-Portability-Files/devel
	perl-Test-Portability-Files.spec, 1.8, 1.9
Message-ID: <20091204021314.CC00211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Portability-Files/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23202

Modified Files:
	perl-Test-Portability-Files.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Portability-Files.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Portability-Files/devel/perl-Test-Portability-Files.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Test-Portability-Files.spec	26 Jul 2009 16:55:59 -0000	1.8
+++ perl-Test-Portability-Files.spec	4 Dec 2009 02:13:14 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Test-Portability-Files
 Version:        0.05
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Check file names portability
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:25 +0000 (UTC)
Subject: rpms/perl-Test-Prereq/devel perl-Test-Prereq.spec,1.11,1.12
Message-ID: <20091204021325.C454B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Prereq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23306

Modified Files:
	perl-Test-Prereq.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Prereq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Prereq/devel/perl-Test-Prereq.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Test-Prereq.spec	30 Oct 2009 16:05:10 -0000	1.11
+++ perl-Test-Prereq.spec	4 Dec 2009 02:13:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Test-Prereq
 Version:        1.037
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Check if Makefile.PL has the right pre-requisites
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.037-2
+- rebuild against perl 5.10.1
+
 * Fri Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 1.037-1
 - new upstream version
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:36 +0000 (UTC)
Subject: rpms/perl-Test-Refcount/devel perl-Test-Refcount.spec,1.1,1.2
Message-ID: <20091204021336.EB52511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Refcount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23433

Modified Files:
	perl-Test-Refcount.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Refcount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/devel/perl-Test-Refcount.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Test-Refcount.spec	3 Aug 2009 12:00:27 -0000	1.1
+++ perl-Test-Refcount.spec	4 Dec 2009 02:13:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Test-Refcount
 Version:        0.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Assert reference counts on objects
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Fri Jul 31 2009 kwizart < kwizart at gmail.com > - 0.05-2
 - Add missing BR
 - Use %%{_fixperms}



From kasal at fedoraproject.org  Fri Dec  4 02:13:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:19 +0000 (UTC)
Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec,1.11,1.12
Message-ID: <20091204021319.A9ED511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-Blowfish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23245

Modified Files:
	perl-Crypt-Blowfish.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-Blowfish/devel/perl-Crypt-Blowfish.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-Blowfish.spec	26 Jul 2009 04:41:32 -0000	1.11
+++ perl-Crypt-Blowfish.spec	4 Dec 2009 02:13:19 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: XS Blowfish implementation for Perl
 Name: perl-Crypt-Blowfish
 Version: 2.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Copyright only
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Crypt-Blowfish/
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.10-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:30 +0000 (UTC)
Subject: rpms/perl-Crypt-CAST5_PP/devel perl-Crypt-CAST5_PP.spec,1.3,1.4
Message-ID: <20091204021330.C0E3511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-CAST5_PP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23374

Modified Files:
	perl-Crypt-CAST5_PP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-CAST5_PP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CAST5_PP/devel/perl-Crypt-CAST5_PP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Crypt-CAST5_PP.spec	26 Jul 2009 04:41:46 -0000	1.3
+++ perl-Crypt-CAST5_PP.spec	4 Dec 2009 02:13:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-CAST5_PP
 Version:        1.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CAST5 block cipher in pure Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.04-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:41 +0000 (UTC)
Subject: rpms/perl-Crypt-CBC/devel perl-Crypt-CBC.spec,1.11,1.12
Message-ID: <20091204021341.F259F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-CBC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23489

Modified Files:
	perl-Crypt-CBC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-CBC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CBC/devel/perl-Crypt-CBC.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-CBC.spec	26 Jul 2009 04:42:08 -0000	1.11
+++ perl-Crypt-CBC.spec	4 Dec 2009 02:13:41 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Encrypt Data with Cipher Block Chaining Mode
 Name: perl-Crypt-CBC
 Version: 2.29
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Upstream confirms that they're under the same license as perl.
 # Wording in CBC.pm is less than clear, but still.
 License: GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.29-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.29-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:48 +0000 (UTC)
Subject: rpms/perl-Test-Script/devel perl-Test-Script.spec,1.7,1.8
Message-ID: <20091204021348.7252F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Script/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23537

Modified Files:
	perl-Test-Script.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/perl-Test-Script.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Test-Script.spec	28 Sep 2009 09:18:43 -0000	1.7
+++ perl-Test-Script.spec	4 Dec 2009 02:13:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Test-Script
 Version:        1.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform basic tests for scripts
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.06-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
 - Upstream update.
 - BR: perl(Probe::Perl)



From kasal at fedoraproject.org  Fri Dec  4 02:13:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:52 +0000 (UTC)
Subject: rpms/perl-Crypt-CipherSaber/devel perl-Crypt-CipherSaber.spec, 1.2, 
	1.3
Message-ID: <20091204021352.9769111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-CipherSaber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23595

Modified Files:
	perl-Crypt-CipherSaber.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-CipherSaber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-CipherSaber/devel/perl-Crypt-CipherSaber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Crypt-CipherSaber.spec	26 Jul 2009 04:42:25 -0000	1.2
+++ perl-Crypt-CipherSaber.spec	4 Dec 2009 02:13:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-CipherSaber
 Version:        1.00
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module implementing CipherSaber encryption
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.00-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:13:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:13:58 +0000 (UTC)
Subject: rpms/perl-Test-Signature/devel perl-Test-Signature.spec,1.3,1.4
Message-ID: <20091204021358.8F94B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Signature/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23653

Modified Files:
	perl-Test-Signature.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Signature.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Signature/devel/perl-Test-Signature.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-Signature.spec	26 Jul 2009 16:56:45 -0000	1.3
+++ perl-Test-Signature.spec	4 Dec 2009 02:13:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Test-Signature
 Version:        1.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Automated SIGNATURE testing
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.10-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:03 +0000 (UTC)
Subject: rpms/perl-Crypt-DES/devel perl-Crypt-DES.spec,1.9,1.10
Message-ID: <20091204021403.D705611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-DES/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23722

Modified Files:
	perl-Crypt-DES.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-DES.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-DES/devel/perl-Crypt-DES.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Crypt-DES.spec	26 Jul 2009 04:42:41 -0000	1.9
+++ perl-Crypt-DES.spec	4 Dec 2009 02:14:03 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-DES
 Version:        2.05
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Perl DES encryption module
 License:        BSD
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.05-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.05-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:09 +0000 (UTC)
Subject: rpms/perl-Test-Spelling/devel perl-Test-Spelling.spec,1.6,1.7
Message-ID: <20091204021409.5967C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Spelling/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23764

Modified Files:
	perl-Test-Spelling.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Spelling.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Spelling/devel/perl-Test-Spelling.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Test-Spelling.spec	26 Jul 2009 16:57:00 -0000	1.6
+++ perl-Test-Spelling.spec	4 Dec 2009 02:14:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Test-Spelling
 Version:        0.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Check for spelling errors in POD files
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:14 +0000 (UTC)
Subject: rpms/perl-Crypt-DES_EDE3/devel perl-Crypt-DES_EDE3.spec,1.7,1.8
Message-ID: <20091204021414.DB03511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-DES_EDE3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23827

Modified Files:
	perl-Crypt-DES_EDE3.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-DES_EDE3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-DES_EDE3/devel/perl-Crypt-DES_EDE3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Crypt-DES_EDE3.spec	26 Jul 2009 04:42:57 -0000	1.7
+++ perl-Crypt-DES_EDE3.spec	4 Dec 2009 02:14:14 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-DES_EDE3
 Version:        0.01
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Triple-DES EDE encryption/decryption module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.01-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:30 +0000 (UTC)
Subject: rpms/perl-Test-SubCalls/devel perl-Test-SubCalls.spec,1.10,1.11
Message-ID: <20091204021430.36DF511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-SubCalls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23971

Modified Files:
	perl-Test-SubCalls.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-SubCalls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-SubCalls/devel/perl-Test-SubCalls.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Test-SubCalls.spec	7 Oct 2009 10:50:46 -0000	1.10
+++ perl-Test-SubCalls.spec	4 Dec 2009 02:14:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Test-SubCalls
 Version:        1.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Track the number of times subs are called
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.09-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.09-1
 - update to new upstream release
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:19 +0000 (UTC)
Subject: rpms/perl-Test-Strict/devel perl-Test-Strict.spec,1.5,1.6
Message-ID: <20091204021419.9F3CD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Strict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23863

Modified Files:
	perl-Test-Strict.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Strict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Strict/devel/perl-Test-Strict.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-Strict.spec	26 Jul 2009 16:57:17 -0000	1.5
+++ perl-Test-Strict.spec	4 Dec 2009 02:14:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-Test-Strict 
 Version:        0.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 # see lib/Test/Strict.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.13-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:24 +0000 (UTC)
Subject: rpms/perl-Crypt-DH/devel perl-Crypt-DH.spec,1.12,1.13
Message-ID: <20091204021424.E6C9611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-DH/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23920

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-DH/devel/perl-Crypt-DH.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Crypt-DH.spec	26 Jul 2009 04:43:12 -0000	1.12
+++ perl-Crypt-DH.spec	4 Dec 2009 02:14:24 -0000	1.13
@@ -4,7 +4,7 @@
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -58,6 +58,9 @@ private keys, between them.
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.06-12
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:36 +0000 (UTC)
Subject: rpms/perl-Crypt-DSA/devel perl-Crypt-DSA.spec,1.12,1.13
Message-ID: <20091204021436.3FBD411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-DSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24055

Modified Files:
	perl-Crypt-DSA.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-DSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Crypt-DSA.spec	13 Sep 2009 19:20:49 -0000	1.12
+++ perl-Crypt-DSA.spec	4 Dec 2009 02:14:36 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Perl module for DSA signatures and key generation
 Name:		perl-Crypt-DSA
 Version:	1.16
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DSA/
@@ -79,6 +79,9 @@ verification, and key generation.
 %{_mandir}/man3/Crypt::DSA::Util.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.16-2
+- rebuild against perl 5.10.1
+
 * Fri Sep 11 2009 Paul Howarth <paul at city-fan.org> 1.16-1
 - Update to 1.16 (first production release)
 - New upstream maintainer -> change source URL



From kasal at fedoraproject.org  Fri Dec  4 02:14:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:53 +0000 (UTC)
Subject: rpms/perl-Test-TempDir/devel perl-Test-TempDir.spec,1.4,1.5
Message-ID: <20091204021453.EA60611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-TempDir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24235

Modified Files:
	perl-Test-TempDir.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-TempDir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-TempDir/devel/perl-Test-TempDir.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Test-TempDir.spec	25 Aug 2009 15:40:35 -0000	1.4
+++ perl-Test-TempDir.spec	4 Dec 2009 02:14:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Test-TempDir
 Version:        0.05
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Temporary files support for testing
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Test::TempDir*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Stepan Kasal <skasal at redhat.com> - 0.05-1
 - new upstream version
 - spec file cleanup



From kasal at fedoraproject.org  Fri Dec  4 02:14:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:42 +0000 (UTC)
Subject: rpms/perl-Test-Taint/devel perl-Test-Taint.spec,1.10,1.11
Message-ID: <20091204021442.4838C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Taint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24115

Modified Files:
	perl-Test-Taint.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Taint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Taint/devel/perl-Test-Taint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Test-Taint.spec	26 Jul 2009 16:57:45 -0000	1.10
+++ perl-Test-Taint.spec	4 Dec 2009 02:14:42 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: 	Tools to test taintedness
 Name: 		perl-Test-Taint
 Version: 	1.04
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-Taint/
@@ -55,6 +55,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.04-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:47 +0000 (UTC)
Subject: rpms/perl-Crypt-Eksblowfish/devel perl-Crypt-Eksblowfish.spec, 1.2, 
	1.3
Message-ID: <20091204021447.EC15611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-Eksblowfish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24173

Modified Files:
	perl-Crypt-Eksblowfish.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-Eksblowfish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-Eksblowfish/devel/perl-Crypt-Eksblowfish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Crypt-Eksblowfish.spec	26 Jul 2009 05:14:43 -0000	1.2
+++ perl-Crypt-Eksblowfish.spec	4 Dec 2009 02:14:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-Eksblowfish
 Version:        0.007
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Eksblowfish block cipher
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.007-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.007-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:14:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:14:59 +0000 (UTC)
Subject: rpms/perl-Crypt-GeneratePassword/devel
	perl-Crypt-GeneratePassword.spec, 1.4, 1.5
Message-ID: <20091204021459.7066611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-GeneratePassword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24281

Modified Files:
	perl-Crypt-GeneratePassword.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-GeneratePassword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-GeneratePassword/devel/perl-Crypt-GeneratePassword.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Crypt-GeneratePassword.spec	26 Jul 2009 05:15:17 -0000	1.4
+++ perl-Crypt-GeneratePassword.spec	4 Dec 2009 02:14:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-GeneratePassword
 Version:        0.03
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Generate secure random pronounceable passwords
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-17
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:05 +0000 (UTC)
Subject: rpms/perl-Test-Tester/devel perl-Test-Tester.spec,1.10,1.11
Message-ID: <20091204021505.6C68911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Tester/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24351

Modified Files:
	perl-Test-Tester.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Tester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Tester/devel/perl-Test-Tester.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Test-Tester.spec	26 Jul 2009 16:58:13 -0000	1.10
+++ perl-Test-Tester.spec	4 Dec 2009 02:15:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Test-Tester
 Version:        0.107
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Ease testing test modules built with Test::Builder
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.107-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.107-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:11 +0000 (UTC)
Subject: rpms/perl-Crypt-GPG/devel perl-Crypt-GPG.spec,1.2,1.3
Message-ID: <20091204021511.24C7F11C032A@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-GPG/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24409

Modified Files:
	perl-Crypt-GPG.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-GPG.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-GPG/devel/perl-Crypt-GPG.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Crypt-GPG.spec	26 Jul 2009 05:14:58 -0000	1.2
+++ perl-Crypt-GPG.spec	4 Dec 2009 02:15:11 -0000	1.3
@@ -3,7 +3,7 @@
 Summary:	Perl Object Oriented Interface to GnuPG
 Name:		perl-Crypt-GPG
 Version:	1.63
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/%{pkgname}/
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Crypt::GPG.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.63-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.63-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:16 +0000 (UTC)
Subject: rpms/perl-Test-Unit/devel perl-Test-Unit.spec,1.4,1.5
Message-ID: <20091204021516.3EC7E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Unit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24456

Modified Files:
	perl-Test-Unit.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Unit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Unit/devel/perl-Test-Unit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Test-Unit.spec	26 Jul 2009 16:58:27 -0000	1.4
+++ perl-Test-Unit.spec	4 Dec 2009 02:15:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Test-Unit
 Version:        0.25
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The PerlUnit testing framework
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.25-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:24 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-AES/devel perl-Crypt-OpenSSL-AES.spec, 1.11,
	1.12
Message-ID: <20091204021524.BF7A011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-AES/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24556

Modified Files:
	perl-Crypt-OpenSSL-AES.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-OpenSSL-AES.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-AES/devel/perl-Crypt-OpenSSL-AES.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-OpenSSL-AES.spec	21 Aug 2009 15:16:20 -0000	1.11
+++ perl-Crypt-OpenSSL-AES.spec	4 Dec 2009 02:15:24 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-AES
 Version:        0.02
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Perl interface to OpenSSL for AES
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-10
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.02-9
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:27 +0000 (UTC)
Subject: rpms/perl-Test-Unit-Lite/devel perl-Test-Unit-Lite.spec,1.5,1.6
Message-ID: <20091204021527.227A311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Unit-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24586

Modified Files:
	perl-Test-Unit-Lite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Unit-Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Unit-Lite/devel/perl-Test-Unit-Lite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-Unit-Lite.spec	26 Jul 2009 16:58:41 -0000	1.5
+++ perl-Test-Unit-Lite.spec	4 Dec 2009 02:15:27 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           perl-Test-Unit-Lite
 Epoch:          1
 Version:        0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Unit testing without external dependencies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:0.12-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:35 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-Bignum/devel perl-Crypt-OpenSSL-Bignum.spec,
	1.11, 1.12
Message-ID: <20091204021535.44AEC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Bignum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24684

Modified Files:
	perl-Crypt-OpenSSL-Bignum.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-OpenSSL-Bignum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Bignum/devel/perl-Crypt-OpenSSL-Bignum.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-OpenSSL-Bignum.spec	21 Aug 2009 15:16:57 -0000	1.11
+++ perl-Crypt-OpenSSL-Bignum.spec	4 Dec 2009 02:15:35 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-Bignum
 Version:        0.04
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl interface to OpenSSL for Bignum
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-9
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.04-8
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:46 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-DSA/devel perl-Crypt-OpenSSL-DSA.spec, 1.12,
	1.13
Message-ID: <20091204021546.E61A211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-DSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24874

Modified Files:
	perl-Crypt-OpenSSL-DSA.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-OpenSSL-DSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-DSA/devel/perl-Crypt-OpenSSL-DSA.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Crypt-OpenSSL-DSA.spec	31 Aug 2009 13:24:57 -0000	1.12
+++ perl-Crypt-OpenSSL-DSA.spec	4 Dec 2009 02:15:46 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-DSA
 Version:        0.13
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Perl interface to OpenSSL for DSA
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.13-15
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 Stepan Kasal <skasal at redhat.com> - 0.13-14
 - re-enable tests
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:39 +0000 (UTC)
Subject: rpms/perl-Test-Unit-Runner-Xml/devel perl-Test-Unit-Runner-Xml.spec,
	1.2, 1.3
Message-ID: <20091204021539.427BD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Unit-Runner-Xml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24745

Modified Files:
	perl-Test-Unit-Runner-Xml.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Unit-Runner-Xml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Unit-Runner-Xml/devel/perl-Test-Unit-Runner-Xml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Test-Unit-Runner-Xml.spec	26 Jul 2009 16:58:55 -0000	1.2
+++ perl-Test-Unit-Runner-Xml.spec	4 Dec 2009 02:15:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-Unit-Runner-Xml
 Version:        0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Generate XML reports from unit test results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.1-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:49 +0000 (UTC)
Subject: rpms/perl-Test-use-ok/devel perl-Test-use-ok.spec,1.5,1.6
Message-ID: <20091204021549.7B81E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-use-ok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24900

Modified Files:
	perl-Test-use-ok.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-use-ok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-use-ok/devel/perl-Test-use-ok.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-use-ok.spec	26 Jul 2009 17:01:38 -0000	1.5
+++ perl-Test-use-ok.spec	4 Dec 2009 02:15:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-use-ok
 Version:        0.02
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Alternative to Test::More::use_ok
 License:        MIT 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:15:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:15:57 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-PKCS10/devel perl-Crypt-OpenSSL-PKCS10.spec,
	1.10, 1.11
Message-ID: <20091204021557.95BF611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24992

Modified Files:
	perl-Crypt-OpenSSL-PKCS10.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-OpenSSL-PKCS10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel/perl-Crypt-OpenSSL-PKCS10.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Crypt-OpenSSL-PKCS10.spec	25 Aug 2009 19:12:10 -0000	1.10
+++ perl-Crypt-OpenSSL-PKCS10.spec	4 Dec 2009 02:15:57 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-PKCS10
 Version:        0.06
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Perl interface to OpenSSL for PKCS10
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.06-14
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.06-13
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:00 +0000 (UTC)
Subject: rpms/perl-Test-Warn/devel perl-Test-Warn.spec,1.12,1.13
Message-ID: <20091204021600.EEF5811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Warn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25042

Modified Files:
	perl-Test-Warn.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Warn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Warn/devel/perl-Test-Warn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Test-Warn.spec	11 Sep 2009 16:23:17 -0000	1.12
+++ perl-Test-Warn.spec	4 Dec 2009 02:16:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Test-Warn
 Version:        0.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension to test methods for warnings
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.21-2
+- rebuild against perl 5.10.1
+
 * Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
 - add perl default filter (pro forma)
 - use _fixperms incantation



From kasal at fedoraproject.org  Fri Dec  4 02:16:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:09 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-Random/devel perl-Crypt-OpenSSL-Random.spec,
	1.8, 1.9
Message-ID: <20091204021609.AE81411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Random/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25136

Modified Files:
	perl-Crypt-OpenSSL-Random.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-OpenSSL-Random.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Random/devel/perl-Crypt-OpenSSL-Random.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Crypt-OpenSSL-Random.spec	21 Aug 2009 15:19:15 -0000	1.8
+++ perl-Crypt-OpenSSL-Random.spec	4 Dec 2009 02:16:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-Random
 Version:        0.04
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Perl interface to OpenSSL for Random
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-10
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.04-9
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:20 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-RSA/devel perl-Crypt-OpenSSL-RSA.spec, 1.11,
	1.12
Message-ID: <20091204021620.489EB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-RSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25267

Modified Files:
	perl-Crypt-OpenSSL-RSA.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-OpenSSL-RSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-RSA/devel/perl-Crypt-OpenSSL-RSA.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-OpenSSL-RSA.spec	21 Aug 2009 15:18:42 -0000	1.11
+++ perl-Crypt-OpenSSL-RSA.spec	4 Dec 2009 02:16:20 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-RSA
 Version:        0.25
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Perl interface to OpenSSL for RSA
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.25-11
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.25-10
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:12 +0000 (UTC)
Subject: rpms/perl-Test-WWW-Mechanize/devel perl-Test-WWW-Mechanize.spec,
	1.12, 1.13
Message-ID: <20091204021612.2242A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-WWW-Mechanize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25177

Modified Files:
	perl-Test-WWW-Mechanize.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-WWW-Mechanize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Mechanize/devel/perl-Test-WWW-Mechanize.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Test-WWW-Mechanize.spec	26 Jul 2009 16:59:13 -0000	1.12
+++ perl-Test-WWW-Mechanize.spec	4 Dec 2009 02:16:12 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Test-WWW-Mechanize
 Version:        1.24
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Testing-specific WWW::Mechanize subclass
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.24-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:32 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-X509/devel perl-Crypt-OpenSSL-X509.spec,
	1.12, 1.13
Message-ID: <20091204021632.4401E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25411

Modified Files:
	perl-Crypt-OpenSSL-X509.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-OpenSSL-X509.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Crypt-OpenSSL-X509.spec	25 Aug 2009 19:42:22 -0000	1.12
+++ perl-Crypt-OpenSSL-X509.spec	4 Dec 2009 02:16:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-X509
 Version:        0.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to OpenSSL for X509
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.7-6
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:23 +0000 (UTC)
Subject: rpms/perl-Test-WWW-Mechanize-Catalyst/devel
	perl-Test-WWW-Mechanize-Catalyst.spec, 1.9, 1.10
Message-ID: <20091204021623.AA28911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-WWW-Mechanize-Catalyst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25308

Modified Files:
	perl-Test-WWW-Mechanize-Catalyst.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-WWW-Mechanize-Catalyst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Mechanize-Catalyst/devel/perl-Test-WWW-Mechanize-Catalyst.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Test-WWW-Mechanize-Catalyst.spec	26 Jul 2009 16:59:41 -0000	1.9
+++ perl-Test-WWW-Mechanize-Catalyst.spec	4 Dec 2009 02:16:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Test-WWW-Mechanize-Catalyst
 Version:        0.51
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Test::WWW::Mechanize for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.51-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.51-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:35 +0000 (UTC)
Subject: rpms/perl-Test-WWW-Mechanize-CGIApp/devel
	perl-Test-WWW-Mechanize-CGIApp.spec, 1.2, 1.3
Message-ID: <20091204021635.80DE611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-WWW-Mechanize-CGIApp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25437

Modified Files:
	perl-Test-WWW-Mechanize-CGIApp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-WWW-Mechanize-CGIApp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Mechanize-CGIApp/devel/perl-Test-WWW-Mechanize-CGIApp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Test-WWW-Mechanize-CGIApp.spec	26 Jul 2009 16:59:26 -0000	1.2
+++ perl-Test-WWW-Mechanize-CGIApp.spec	4 Dec 2009 02:16:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-WWW-Mechanize-CGIApp
 Version:        0.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Test::WWW::Mechanize for CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:45 +0000 (UTC)
Subject: rpms/perl-Test-WWW-Selenium/devel perl-Test-WWW-Selenium.spec, 1.6, 
	1.7
Message-ID: <20091204021645.D242D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-WWW-Selenium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25578

Modified Files:
	perl-Test-WWW-Selenium.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-WWW-Selenium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Selenium/devel/perl-Test-WWW-Selenium.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Test-WWW-Selenium.spec	7 Sep 2009 10:25:26 -0000	1.6
+++ perl-Test-WWW-Selenium.spec	4 Dec 2009 02:16:45 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           perl-Test-WWW-Selenium
 Version:        1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl Client for the Selenium Remote Control test tool
 License:        (GPL+ or Artistic) and ASL 2.0
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.18-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.18-1
 - Newer release, update API support to 1.0.1
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:43 +0000 (UTC)
Subject: rpms/perl-Crypt-PasswdMD5/devel perl-Crypt-PasswdMD5.spec,1.5,1.6
Message-ID: <20091204021643.B2E4F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-PasswdMD5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25542

Modified Files:
	perl-Crypt-PasswdMD5.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-PasswdMD5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-PasswdMD5/devel/perl-Crypt-PasswdMD5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Crypt-PasswdMD5.spec	26 Jul 2009 05:17:23 -0000	1.5
+++ perl-Crypt-PasswdMD5.spec	4 Dec 2009 02:16:43 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Crypt-PasswdMD5
 Version:	1.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Provides interoperable MD5-based crypt() functions 
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -46,6 +46,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.3-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:54 +0000 (UTC)
Subject: rpms/perl-Crypt-Primes/devel perl-Crypt-Primes.spec,1.8,1.9
Message-ID: <20091204021654.AF11611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-Primes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25723

Modified Files:
	perl-Crypt-Primes.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-Primes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-Primes/devel/perl-Crypt-Primes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Crypt-Primes.spec	26 Jul 2009 05:17:38 -0000	1.8
+++ perl-Crypt-Primes.spec	4 Dec 2009 02:16:53 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	Provable prime number generator for cryptographic applications
 Name:		perl-Crypt-Primes
 Version:	0.50
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-Primes/
@@ -53,6 +53,9 @@ Parameters" (1994).
 %{_mandir}/man3/Crypt::Primes.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.50-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.50-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:16:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:16:55 +0000 (UTC)
Subject: rpms/perl-Test-YAML-Meta/devel perl-Test-YAML-Meta.spec,1.6,1.7
Message-ID: <20091204021655.B744A11C02A7@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-YAML-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25739

Modified Files:
	perl-Test-YAML-Meta.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-YAML-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-YAML-Meta/devel/perl-Test-YAML-Meta.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Test-YAML-Meta.spec	26 Jul 2009 17:00:58 -0000	1.6
+++ perl-Test-YAML-Meta.spec	4 Dec 2009 02:16:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Test-YAML-Meta
 Version:        0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Validation of the META.yml file in a distribution
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.12-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:05 +0000 (UTC)
Subject: rpms/perl-Crypt-Random/devel perl-Crypt-Random.spec,1.9,1.10
Message-ID: <20091204021705.B9ACB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-Random/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25831

Modified Files:
	perl-Crypt-Random.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-Random.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-Random/devel/perl-Crypt-Random.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Crypt-Random.spec	26 Jul 2009 05:18:06 -0000	1.9
+++ perl-Crypt-Random.spec	4 Dec 2009 02:17:05 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Cryptographically Secure, True Random Number Generator
 Name:		perl-Crypt-Random
 Version:	1.25
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-Random/
@@ -52,6 +52,9 @@ interval.
 %{_mandir}/man3/Crypt::Random.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.25-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:06 +0000 (UTC)
Subject: rpms/perl-Test-YAML-Valid/devel perl-Test-YAML-Valid.spec,1.5,1.6
Message-ID: <20091204021706.9924C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-YAML-Valid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25846

Modified Files:
	perl-Test-YAML-Valid.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-YAML-Valid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-YAML-Valid/devel/perl-Test-YAML-Valid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-YAML-Valid.spec	26 Jul 2009 17:01:18 -0000	1.5
+++ perl-Test-YAML-Valid.spec	4 Dec 2009 02:17:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-YAML-Valid
 Version:        0.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Lets you test the validity of YAML files in unit tests
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:16 +0000 (UTC)
Subject: rpms/perl-Crypt-Rijndael/devel perl-Crypt-Rijndael.spec,1.3,1.4
Message-ID: <20091204021716.D897F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-Rijndael/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25957

Modified Files:
	perl-Crypt-Rijndael.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-Rijndael.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-Rijndael/devel/perl-Crypt-Rijndael.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Crypt-Rijndael.spec	26 Jul 2009 05:18:21 -0000	1.3
+++ perl-Crypt-Rijndael.spec	4 Dec 2009 02:17:16 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-Rijndael
 Version:        1.06
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Crypt::CBC compliant Rijndael encryption module
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.06-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:17 +0000 (UTC)
Subject: rpms/perl-TeX-Hyphen/devel perl-TeX-Hyphen.spec,1.14,1.15
Message-ID: <20091204021717.D655C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-TeX-Hyphen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25975

Modified Files:
	perl-TeX-Hyphen.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-TeX-Hyphen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TeX-Hyphen/devel/perl-TeX-Hyphen.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-TeX-Hyphen.spec	26 Jul 2009 16:40:47 -0000	1.14
+++ perl-TeX-Hyphen.spec	4 Dec 2009 02:17:17 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-TeX-Hyphen
 Version:        0.140
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Hyphenate words using TeX's patterns
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.140-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.140-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:28 +0000 (UTC)
Subject: rpms/perl-Crypt-RSA/devel perl-Crypt-RSA.spec,1.14,1.15
Message-ID: <20091204021728.8B26B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-RSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26082

Modified Files:
	perl-Crypt-RSA.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-RSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/perl-Crypt-RSA.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Crypt-RSA.spec	26 Jul 2009 05:17:51 -0000	1.14
+++ perl-Crypt-RSA.spec	4 Dec 2009 02:17:28 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	RSA public-key cryptosystem
 Name:		perl-Crypt-RSA
 Version:	1.99
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-RSA/
@@ -89,6 +89,9 @@ done
 %{_mandir}/man3/crypt-rsa-interoperablity-template.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.99-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.99-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:29 +0000 (UTC)
Subject: rpms/perl-Text-Aligner/devel perl-Text-Aligner.spec,1.3,1.4
Message-ID: <20091204021729.8ABF711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Aligner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26097

Modified Files:
	perl-Text-Aligner.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Aligner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Aligner/devel/perl-Text-Aligner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Text-Aligner.spec	26 Jul 2009 17:02:13 -0000	1.3
+++ perl-Text-Aligner.spec	4 Dec 2009 02:17:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Text-Aligner
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Text::Aligner Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:40 +0000 (UTC)
Subject: rpms/perl-Crypt-Simple/devel perl-Crypt-Simple.spec,1.7,1.8
Message-ID: <20091204021740.9F8BB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26185

Modified Files:
	perl-Crypt-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-Simple/devel/perl-Crypt-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Crypt-Simple.spec	26 Jul 2009 05:18:52 -0000	1.7
+++ perl-Crypt-Simple.spec	4 Dec 2009 02:17:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-Simple
 Version:        0.06
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Encrypt stuff simply 
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.06-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:41 +0000 (UTC)
Subject: rpms/perl-Text-ASCIITable/devel perl-Text-ASCIITable.spec,1.5,1.6
Message-ID: <20091204021741.04D2E11C02A7@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-ASCIITable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26210

Modified Files:
	perl-Text-ASCIITable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-ASCIITable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-ASCIITable/devel/perl-Text-ASCIITable.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Text-ASCIITable.spec	26 Jul 2009 17:01:55 -0000	1.5
+++ perl-Text-ASCIITable.spec	4 Dec 2009 02:17:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Text-ASCIITable
 Version:        0.18
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Create a nice formatted table using ASCII characters
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.18-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:52 +0000 (UTC)
Subject: rpms/perl-Crypt-SmbHash/devel perl-Crypt-SmbHash.spec,1.10,1.11
Message-ID: <20091204021752.CE43211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-SmbHash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26305

Modified Files:
	perl-Crypt-SmbHash.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-SmbHash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-SmbHash/devel/perl-Crypt-SmbHash.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Crypt-SmbHash.spec	26 Jul 2009 05:19:07 -0000	1.10
+++ perl-Crypt-SmbHash.spec	4 Dec 2009 02:17:52 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Pure-perl Lanman and NT MD4 hash functions
 Name:		perl-Crypt-SmbHash
 Version:	0.12
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPLv2+
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-SmbHash/
@@ -44,6 +44,9 @@ systems.
 %{_mandir}/man3/Crypt::SmbHash.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.12-11
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:17:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:17:53 +0000 (UTC)
Subject: rpms/perl-Text-Aspell/devel perl-Text-Aspell.spec,1.9,1.10
Message-ID: <20091204021753.245C111C02A7@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Aspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26320

Modified Files:
	perl-Text-Aspell.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Aspell/devel/perl-Text-Aspell.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Text-Aspell.spec	26 Jul 2009 17:02:36 -0000	1.9
+++ perl-Text-Aspell.spec	4 Dec 2009 02:17:53 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           perl-%{base}
 Version:        0.09
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to the GNU Aspell library
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.09-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:18:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:18:04 +0000 (UTC)
Subject: rpms/perl-Text-Autoformat/devel perl-Text-Autoformat.spec, 1.13,
	1.14
Message-ID: <20091204021804.7DD6511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Autoformat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26428

Modified Files:
	perl-Text-Autoformat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Autoformat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Autoformat/devel/perl-Text-Autoformat.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Text-Autoformat.spec	26 Jul 2009 17:02:52 -0000	1.13
+++ perl-Text-Autoformat.spec	4 Dec 2009 02:18:04 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Text-Autoformat
 Version:        1.14.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Automatic text wrapping and reformatting
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_provides
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.14.0-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:18:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:18:21 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS/devel perl-CSS-Minifier-XS.spec,1.3,1.4
Message-ID: <20091204021821.EB3ED11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CSS-Minifier-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26610

Modified Files:
	perl-CSS-Minifier-XS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CSS-Minifier-XS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Minifier-XS/devel/perl-CSS-Minifier-XS.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-CSS-Minifier-XS.spec	11 Aug 2009 07:45:08 -0000	1.3
+++ perl-CSS-Minifier-XS.spec	4 Dec 2009 02:18:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-CSS-Minifier-XS
 Version:    0.04
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/CSS/Minifier/XS.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -61,6 +61,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
 - auto-update to 0.04 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Fri Dec  4 02:18:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:18:14 +0000 (UTC)
Subject: rpms/perl-Text-CharWidth/devel perl-Text-CharWidth.spec,1.8,1.9
Message-ID: <20091204021814.83F0511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-CharWidth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26511

Modified Files:
	perl-Text-CharWidth.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-CharWidth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CharWidth/devel/perl-Text-CharWidth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Text-CharWidth.spec	26 Jul 2009 17:04:14 -0000	1.8
+++ perl-Text-CharWidth.spec	4 Dec 2009 02:18:14 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Get number of occupied columns of a string on terminal
 Name: perl-Text-CharWidth
 Version: 0.04
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Text-CharWidth/
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Text::CharWidth.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:18:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:18:14 +0000 (UTC)
Subject: rpms/perl-CSS/devel perl-CSS.spec,1.5,1.6
Message-ID: <20091204021814.B7AFE11C02A7@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CSS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26523

Modified Files:
	perl-CSS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CSS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS/devel/perl-CSS.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-CSS.spec	26 Jul 2009 04:02:27 -0000	1.5
+++ perl-CSS.spec	4 Dec 2009 02:18:14 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-CSS
 Version:        1.08
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Object oriented access to Cascading Style Sheets (CSS)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ find %{buildroot} -depth -type d -exec r
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.08-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:18:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:18:25 +0000 (UTC)
Subject: rpms/perl-Text-CHM/devel perl-Text-CHM.spec,1.7,1.8
Message-ID: <20091204021825.63A8811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-CHM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26635

Modified Files:
	perl-Text-CHM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-CHM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CHM/devel/perl-Text-CHM.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Text-CHM.spec	26 Jul 2009 17:03:15 -0000	1.7
+++ perl-Text-CHM.spec	4 Dec 2009 02:18:25 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Text-CHM
 Version:        0.01
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl extension for handling MS Compiled HtmlHelp Files
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.01-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:18:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:18:45 +0000 (UTC)
Subject: rpms/perl-Text-Context-EitherSide/devel
	perl-Text-Context-EitherSide.spec, 1.2, 1.3
Message-ID: <20091204021845.F022311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Context-EitherSide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26783

Modified Files:
	perl-Text-Context-EitherSide.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Context-EitherSide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Context-EitherSide/devel/perl-Text-Context-EitherSide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-Context-EitherSide.spec	26 Jul 2009 17:04:56 -0000	1.2
+++ perl-Text-Context-EitherSide.spec	4 Dec 2009 02:18:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Text-Context-EitherSide
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Get n words either side of search keywords
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.4-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:18:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:18:35 +0000 (UTC)
Subject: rpms/perl-Text-Context/devel perl-Text-Context.spec,1.2,1.3
Message-ID: <20091204021835.C869511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Context/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26719

Modified Files:
	perl-Text-Context.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Context.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Context/devel/perl-Text-Context.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-Context.spec	26 Jul 2009 17:04:38 -0000	1.2
+++ perl-Text-Context.spec	4 Dec 2009 02:18:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Text-Context
 Version:        3.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Handle highlighting search result context snippets
 License:        GPLv2+
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.6-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:18:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:18:56 +0000 (UTC)
Subject: rpms/perl-Text-CSV/devel perl-Text-CSV.spec,1.2,1.3
Message-ID: <20091204021856.A8C4E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-CSV/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26845

Modified Files:
	perl-Text-CSV.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-CSV.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV/devel/perl-Text-CSV.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-CSV.spec	26 Jul 2009 17:03:30 -0000	1.2
+++ perl-Text-CSV.spec	4 Dec 2009 02:18:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		perl-Text-CSV
 Version:	1.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Comma-separated values manipulator
 
 Group:		Development/Libraries
@@ -56,6 +56,9 @@ find %{buildroot} -depth -type d -exec r
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.10-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:19:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:19:18 +0000 (UTC)
Subject: rpms/perl-Text-CSV_XS/devel perl-Text-CSV_XS.spec,1.19,1.20
Message-ID: <20091204021918.0A24111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-CSV_XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26987

Modified Files:
	perl-Text-CSV_XS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-CSV_XS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/devel/perl-Text-CSV_XS.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-Text-CSV_XS.spec	2 Nov 2009 09:59:46 -0000	1.19
+++ perl-Text-CSV_XS.spec	4 Dec 2009 02:19:17 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-Text-CSV_XS
 Version:        0.69
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Comma-separated values manipulation routines
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.69-2
+- rebuild against perl 5.10.1
+
 * Mon Nov  2 2009 Stepan Kasal <skasal at redhat.com> - 0.69
 - new upstream release
 



From kasal at fedoraproject.org  Fri Dec  4 02:19:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:19:28 +0000 (UTC)
Subject: rpms/perl-Text-Diff/devel perl-Text-Diff.spec,1.9,1.10
Message-ID: <20091204021928.C4CD111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27067

Modified Files:
	perl-Text-Diff.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Diff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff/devel/perl-Text-Diff.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Text-Diff.spec	27 Sep 2009 04:52:24 -0000	1.9
+++ perl-Text-Diff.spec	4 Dec 2009 02:19:28 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Text-Diff
 Version:        1.37
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perform diffs on files and record sets
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.37-3
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.37-2
 - add Test::More as a BR (rt#50040)
 



From kasal at fedoraproject.org  Fri Dec  4 02:19:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:19:07 +0000 (UTC)
Subject: rpms/perl-Text-CSV-Separator/devel perl-Text-CSV-Separator.spec, 1.4,
	1.5
Message-ID: <20091204021907.BE06811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-CSV-Separator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26916

Modified Files:
	perl-Text-CSV-Separator.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-CSV-Separator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV-Separator/devel/perl-Text-CSV-Separator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Text-CSV-Separator.spec	26 Jul 2009 17:03:43 -0000	1.4
+++ perl-Text-CSV-Separator.spec	4 Dec 2009 02:19:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Text-CSV-Separator
 Version:        0.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Determine the field separator of a CSV file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.19-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:19:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:19:38 +0000 (UTC)
Subject: rpms/perl-Text-Diff-HTML/devel perl-Text-Diff-HTML.spec,1.6,1.7
Message-ID: <20091204021938.E1E5B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Diff-HTML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27136

Modified Files:
	perl-Text-Diff-HTML.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Diff-HTML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-HTML/devel/perl-Text-Diff-HTML.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Text-Diff-HTML.spec	26 Jul 2009 17:05:33 -0000	1.6
+++ perl-Text-Diff-HTML.spec	4 Dec 2009 02:19:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Text-Diff-HTML
 Version:        0.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        XHTML format for Text::Diff::Unified
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:19:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:19:49 +0000 (UTC)
Subject: rpms/perl-Text-Diff-Parser/devel perl-Text-Diff-Parser.spec, 1.1,
	1.2
Message-ID: <20091204021949.AD79811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Diff-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27192

Modified Files:
	perl-Text-Diff-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Diff-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Diff-Parser/devel/perl-Text-Diff-Parser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Text-Diff-Parser.spec	24 Sep 2009 07:41:23 -0000	1.1
+++ perl-Text-Diff-Parser.spec	4 Dec 2009 02:19:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-Diff-Parser
 Version:        0.1001
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parse patch files containing unified and standard diffs
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.1001-2
+- rebuild against perl 5.10.1
+
 * Fri Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.1001-1
 - Update to 0.1001 which includes Source1
 



From kasal at fedoraproject.org  Fri Dec  4 02:20:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:20:00 +0000 (UTC)
Subject: rpms/perl-Text-Emoticon/devel perl-Text-Emoticon.spec,1.2,1.3
Message-ID: <20091204022000.4242C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Emoticon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27262

Modified Files:
	perl-Text-Emoticon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Emoticon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Emoticon/devel/perl-Text-Emoticon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-Emoticon.spec	26 Jul 2009 17:05:49 -0000	1.2
+++ perl-Text-Emoticon.spec	4 Dec 2009 02:20:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Text-Emoticon
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Factory class for Yahoo! and MSN emoticons
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:20:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:20:11 +0000 (UTC)
Subject: rpms/perl-Text-Emoticon-MSN/devel perl-Text-Emoticon-MSN.spec, 1.2, 
	1.3
Message-ID: <20091204022011.8C7CD11C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Emoticon-MSN/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27375

Modified Files:
	perl-Text-Emoticon-MSN.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Emoticon-MSN.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Emoticon-MSN/devel/perl-Text-Emoticon-MSN.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-Emoticon-MSN.spec	26 Jul 2009 17:06:04 -0000	1.2
+++ perl-Text-Emoticon-MSN.spec	4 Dec 2009 02:20:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Text-Emoticon-MSN
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Emoticon filter of MSN Messenger
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:20:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:20:21 +0000 (UTC)
Subject: rpms/perl-Text-FindIndent/devel perl-Text-FindIndent.spec,1.3,1.4
Message-ID: <20091204022021.7575B11C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-FindIndent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27440

Modified Files:
	perl-Text-FindIndent.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-FindIndent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FindIndent/devel/perl-Text-FindIndent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Text-FindIndent.spec	26 Jul 2009 17:06:20 -0000	1.3
+++ perl-Text-FindIndent.spec	4 Dec 2009 02:20:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Text-FindIndent
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Heuristically determine the indent style
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:20:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:20:31 +0000 (UTC)
Subject: rpms/perl-Text-Format/devel perl-Text-Format.spec,1.4,1.5
Message-ID: <20091204022031.F1C2D11C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Format/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27507

Modified Files:
	perl-Text-Format.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Format/devel/perl-Text-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Text-Format.spec	26 Jul 2009 17:06:38 -0000	1.4
+++ perl-Text-Format.spec	4 Dec 2009 02:20:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Text-Format
 Version:        0.52
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Various subroutines to format text
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.52-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.52-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:20:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:20:42 +0000 (UTC)
Subject: rpms/perl-Text-FormatTable/devel perl-Text-FormatTable.spec, 1.1,
	1.2
Message-ID: <20091204022042.4B5FB11C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-FormatTable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27582

Modified Files:
	perl-Text-FormatTable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-FormatTable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FormatTable/devel/perl-Text-FormatTable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Text-FormatTable.spec	18 Sep 2009 06:28:42 -0000	1.1
+++ perl-Text-FormatTable.spec	4 Dec 2009 02:20:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-FormatTable
 Version:        1.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Format text tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,5 +48,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.03-2
+- rebuild against perl 5.10.1
+
 * Tue Sep 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.03-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Fri Dec  4 02:20:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:20:53 +0000 (UTC)
Subject: rpms/perl-Text-Glob/devel perl-Text-Glob.spec,1.11,1.12
Message-ID: <20091204022053.AA8D211C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Glob/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27657

Modified Files:
	perl-Text-Glob.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Glob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Glob/devel/perl-Text-Glob.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Text-Glob.spec	26 Jul 2009 17:06:53 -0000	1.11
+++ perl-Text-Glob.spec	4 Dec 2009 02:20:53 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		perl-Text-Glob
 Version: 	0.08
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary: 	Perl module to match globbing patterns against text
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -45,6 +45,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:21:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:21:03 +0000 (UTC)
Subject: rpms/perl-Text-Iconv/devel perl-Text-Iconv.spec,1.16,1.17
Message-ID: <20091204022103.B993311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Iconv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27724

Modified Files:
	perl-Text-Iconv.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Iconv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Iconv/devel/perl-Text-Iconv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Text-Iconv.spec	26 Jul 2009 17:07:10 -0000	1.16
+++ perl-Text-Iconv.spec	4 Dec 2009 02:21:03 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Text-Iconv
 Version:        1.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl interface to iconv() codeset conversion function
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.7-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:21:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:21:13 +0000 (UTC)
Subject: rpms/perl-Text-Kakasi/devel perl-Text-Kakasi.spec,1.13,1.14
Message-ID: <20091204022113.4AB6011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Kakasi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27796

Modified Files:
	perl-Text-Kakasi.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Kakasi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Kakasi/devel/perl-Text-Kakasi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Text-Kakasi.spec	26 Jul 2009 17:07:26 -0000	1.13
+++ perl-Text-Kakasi.spec	4 Dec 2009 02:21:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Text-Kakasi
 Version:        2.04
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Kakasi library module for perl
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.04-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:21:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:21:24 +0000 (UTC)
Subject: rpms/perl-Text-Levenshtein/devel perl-Text-Levenshtein.spec, 1.7,
	1.8
Message-ID: <20091204022124.2A74A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Levenshtein/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27870

Modified Files:
	perl-Text-Levenshtein.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Levenshtein.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Levenshtein/devel/perl-Text-Levenshtein.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Text-Levenshtein.spec	26 Jul 2009 17:07:43 -0000	1.7
+++ perl-Text-Levenshtein.spec	4 Dec 2009 02:21:24 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Text-Levenshtein
 Version:        0.05
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Implementation of the Levenshtein edit distance
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:21:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:21:35 +0000 (UTC)
Subject: rpms/perl-Text-LevenshteinXS/devel perl-Text-LevenshteinXS.spec, 1.7,
	1.8
Message-ID: <20091204022135.2C3E111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-LevenshteinXS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27966

Modified Files:
	perl-Text-LevenshteinXS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-LevenshteinXS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-LevenshteinXS/devel/perl-Text-LevenshteinXS.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Text-LevenshteinXS.spec	26 Jul 2009 17:08:00 -0000	1.7
+++ perl-Text-LevenshteinXS.spec	4 Dec 2009 02:21:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Text-LevenshteinXS
 Version:        0.03
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        XS implementation of the Levenshtein edit distance
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:21:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:21:46 +0000 (UTC)
Subject: rpms/perl-Text-Markdown/devel perl-Text-Markdown.spec,1.5,1.6
Message-ID: <20091204022146.C78C611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Markdown/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28063

Modified Files:
	perl-Text-Markdown.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Markdown/devel/perl-Text-Markdown.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Text-Markdown.spec	26 Jul 2009 17:08:17 -0000	1.5
+++ perl-Text-Markdown.spec	4 Dec 2009 02:21:46 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Text-Markdown
 Version:        1.0.24
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A text-to-HTML filter
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.0.24-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:21:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:21:48 +0000 (UTC)
Subject: rpms/perl-CSS-Squish/devel perl-CSS-Squish.spec,1.5,1.6
Message-ID: <20091204022148.6E96111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CSS-Squish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28082

Modified Files:
	perl-CSS-Squish.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CSS-Squish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/devel/perl-CSS-Squish.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-CSS-Squish.spec	26 Jul 2009 04:03:32 -0000	1.5
+++ perl-CSS-Squish.spec	4 Dec 2009 02:21:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-CSS-Squish
 Version:        0.08
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Compact many CSS files into one big file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:21:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:21:58 +0000 (UTC)
Subject: rpms/perl-Text-Password-Pronounceable/devel
	perl-Text-Password-Pronounceable.spec, 1.2, 1.3
Message-ID: <20091204022158.339C811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Password-Pronounceable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28165

Modified Files:
	perl-Text-Password-Pronounceable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Password-Pronounceable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Password-Pronounceable/devel/perl-Text-Password-Pronounceable.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-Password-Pronounceable.spec	26 Jul 2009 17:08:48 -0000	1.2
+++ perl-Text-Password-Pronounceable.spec	4 Dec 2009 02:21:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Text-Password-Pronounceable 
 Version:    0.28 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Text/Password/Pronounceable.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.28-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:22:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:22:00 +0000 (UTC)
Subject: rpms/perl-CSS-Tiny/devel perl-CSS-Tiny.spec,1.7,1.8
Message-ID: <20091204022200.299DF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CSS-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28180

Modified Files:
	perl-CSS-Tiny.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CSS-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Tiny/devel/perl-CSS-Tiny.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-CSS-Tiny.spec	26 Jul 2009 04:03:50 -0000	1.7
+++ perl-CSS-Tiny.spec	4 Dec 2009 02:22:00 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-CSS-Tiny
 Version:        1.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Read/Write .css files with as little code as possible
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.15-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:22:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:22:10 +0000 (UTC)
Subject: rpms/perl-Text-PDF/devel perl-Text-PDF.spec,1.2,1.3
Message-ID: <20091204022210.6B1E711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-PDF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28289

Modified Files:
	perl-Text-PDF.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-PDF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-PDF/devel/perl-Text-PDF.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-PDF.spec	26 Jul 2009 17:08:32 -0000	1.2
+++ perl-Text-PDF.spec	4 Dec 2009 02:22:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Text-PDF 
 Version:    0.29a 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Text/PDF.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -75,6 +75,9 @@ rm -rf %{buildroot} 
 %{_bindir}/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.29a-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.29a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:22:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:22:12 +0000 (UTC)
Subject: rpms/perl-Curses/devel perl-Curses.spec,1.14,1.15
Message-ID: <20091204022212.5FE2A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Curses/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28327

Modified Files:
	perl-Curses.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses/devel/perl-Curses.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Curses.spec	26 Jul 2009 05:19:39 -0000	1.14
+++ perl-Curses.spec	4 Dec 2009 02:22:12 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Curses
 Version:        1.27
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl bindings for ncurses
 
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.27-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:22:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:22:21 +0000 (UTC)
Subject: rpms/perl-Text-Quoted/devel perl-Text-Quoted.spec,1.16,1.17
Message-ID: <20091204022221.6B25B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Quoted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28389

Modified Files:
	perl-Text-Quoted.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Quoted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Quoted/devel/perl-Text-Quoted.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Text-Quoted.spec	26 Jul 2009 17:09:03 -0000	1.16
+++ perl-Text-Quoted.spec	4 Dec 2009 02:22:21 -0000	1.17
@@ -1,6 +1,6 @@
 Name: 		perl-Text-Quoted
 Version: 	2.05
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Extract the structure of a quoted mail message
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -50,6 +50,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.05-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Dec  4 02:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 02:22:21 +0000
Subject: [pkgdb] clearsilver ownership updated
Message-ID: <20091204022221.CE52010F8A3@bastion2.fedora.phx.redhat.com>

Package clearsilver in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clearsilver



From kasal at fedoraproject.org  Fri Dec  4 02:22:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:22:31 +0000 (UTC)
Subject: rpms/perl-Text-RecordParser/devel perl-Text-RecordParser.spec, 1.6, 
	1.7
Message-ID: <20091204022231.7E56F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-RecordParser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28467

Modified Files:
	perl-Text-RecordParser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-RecordParser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-RecordParser/devel/perl-Text-RecordParser.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Text-RecordParser.spec	26 Jul 2009 17:09:18 -0000	1.6
+++ perl-Text-RecordParser.spec	4 Dec 2009 02:22:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Text-RecordParser
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Read record-oriented files
 License:        GPLv2
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_mandir}/man[13]/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.3.0-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Dec  4 02:22:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 02:22:34 +0000
Subject: [pkgdb] clearsilver ownership updated
Message-ID: <20091204022234.69E4F10F894@bastion2.fedora.phx.redhat.com>

Package clearsilver in Fedora 10 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clearsilver



From pkgdb at fedoraproject.org  Fri Dec  4 02:22:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 02:22:38 +0000
Subject: [pkgdb] clearsilver ownership updated
Message-ID: <20091204022238.9A0FD10F899@bastion2.fedora.phx.redhat.com>

Package clearsilver in Fedora 11 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clearsilver



From pkgdb at fedoraproject.org  Fri Dec  4 02:22:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 02:22:41 +0000
Subject: [pkgdb] clearsilver ownership updated
Message-ID: <20091204022241.A931110F8A1@bastion2.fedora.phx.redhat.com>

Package clearsilver in Fedora 12 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clearsilver



From kasal at fedoraproject.org  Fri Dec  4 02:22:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:22:42 +0000 (UTC)
Subject: rpms/perl-Text-Reform/devel perl-Text-Reform.spec,1.16,1.17
Message-ID: <20091204022242.D8B9E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Reform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28548

Modified Files:
	perl-Text-Reform.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Reform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Reform/devel/perl-Text-Reform.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Text-Reform.spec	26 Jul 2009 17:09:35 -0000	1.16
+++ perl-Text-Reform.spec	4 Dec 2009 02:22:42 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Text-Reform
 Version:        1.12.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Manual text wrapping and reformatting
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.12.2-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:22:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:22:53 +0000 (UTC)
Subject: rpms/perl-Text-Shellwords/devel perl-Text-Shellwords.spec,1.9,1.10
Message-ID: <20091204022253.ED5F411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Shellwords/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28631

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Shellwords/devel/perl-Text-Shellwords.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Text-Shellwords.spec	26 Jul 2009 17:09:52 -0000	1.9
+++ perl-Text-Shellwords.spec	4 Dec 2009 02:22:53 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Text-Shellwords
 Version:        1.08
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A thin wrapper around the shellwords.pl package
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.08-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:23:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:23:04 +0000 (UTC)
Subject: rpms/perl-Text-SimpleTable/devel perl-Text-SimpleTable.spec, 1.10, 
	1.11
Message-ID: <20091204022304.7F41811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-SimpleTable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28730

Modified Files:
	perl-Text-SimpleTable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-SimpleTable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-SimpleTable/devel/perl-Text-SimpleTable.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Text-SimpleTable.spec	19 Aug 2009 02:29:10 -0000	1.10
+++ perl-Text-SimpleTable.spec	4 Dec 2009 02:23:04 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Text-SimpleTable
 Version:        2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple Eyecandy ASCII Tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.0-3
+- rebuild against perl 5.10.1
+
 * Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-2
 - drop old patch
 



From kasal at fedoraproject.org  Fri Dec  4 02:23:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:23:14 +0000 (UTC)
Subject: rpms/perl-Text-Smart/devel perl-Text-Smart.spec,1.3,1.4
Message-ID: <20091204022314.61FBD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28867

Modified Files:
	perl-Text-Smart.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Smart/devel/perl-Text-Smart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Text-Smart.spec	26 Jul 2009 17:10:33 -0000	1.3
+++ perl-Text-Smart.spec	4 Dec 2009 02:23:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Text-Smart
 Version:        1.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Processor for 'smart text' markup
 License:        GPLv2
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.0.2-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:23:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:23:24 +0000 (UTC)
Subject: rpms/perl-Text-Smart-Plugin/devel perl-Text-Smart-Plugin.spec, 1.4, 
	1.5
Message-ID: <20091204022324.D0F0411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Smart-Plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28957

Modified Files:
	perl-Text-Smart-Plugin.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Smart-Plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Smart-Plugin/devel/perl-Text-Smart-Plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Text-Smart-Plugin.spec	26 Jul 2009 17:11:10 -0000	1.4
+++ perl-Text-Smart-Plugin.spec	4 Dec 2009 02:23:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Text-Smart-Plugin
 Version:        1.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Template Toolkit plugin for Text::Smart
 License:        GPLv2
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.0.1-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:23:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:23:42 +0000 (UTC)
Subject: rpms/perl-Text-Table/devel perl-Text-Table.spec,1.3,1.4
Message-ID: <20091204022342.234FE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29084

Modified Files:
	perl-Text-Table.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Table/devel/perl-Text-Table.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Text-Table.spec	26 Jul 2009 17:11:47 -0000	1.3
+++ perl-Text-Table.spec	4 Dec 2009 02:23:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Text-Table
 Version:        1.114
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Organize Data in Tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.114-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.114-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:28:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:28:24 +0000 (UTC)
Subject: rpms/perl-Text-TabularDisplay/devel perl-Text-TabularDisplay.spec,
	1.5, 1.6
Message-ID: <20091204022824.DFBEE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-TabularDisplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30273

Modified Files:
	perl-Text-TabularDisplay.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-TabularDisplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-TabularDisplay/devel/perl-Text-TabularDisplay.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Text-TabularDisplay.spec	26 Jul 2009 17:12:04 -0000	1.5
+++ perl-Text-TabularDisplay.spec	4 Dec 2009 02:28:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Text-TabularDisplay
 Version:        1.22
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Display text in formatted table output
 # see TabularDisplay.pm's header
 License:        GPLv2
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.22-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:28:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:28:41 +0000 (UTC)
Subject: rpms/perl-Text-Template/devel perl-Text-Template.spec,1.10,1.11
Message-ID: <20091204022841.C393E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Template/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30402

Modified Files:
	perl-Text-Template.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Template.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Template/devel/perl-Text-Template.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Text-Template.spec	26 Jul 2009 17:12:24 -0000	1.10
+++ perl-Text-Template.spec	4 Dec 2009 02:28:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Text-Template
 Version:        1.45
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Expand template text with embedded Perl
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.45-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:31:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:31:31 +0000 (UTC)
Subject: rpms/perl-Text-Tree/devel perl-Text-Tree.spec,1.7,1.8
Message-ID: <20091204023131.0159B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Tree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31106

Modified Files:
	perl-Text-Tree.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Tree/devel/perl-Text-Tree.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Text-Tree.spec	26 Jul 2009 17:12:55 -0000	1.7
+++ perl-Text-Tree.spec	4 Dec 2009 02:31:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Text-Tree
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Format a simple tree of strings into a textual tree graph
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.0-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:31:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:31:41 +0000 (UTC)
Subject: rpms/perl-Text-Unidecode/devel perl-Text-Unidecode.spec,1.9,1.10
Message-ID: <20091204023141.AE99411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Unidecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31174

Modified Files:
	perl-Text-Unidecode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Unidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Unidecode/devel/perl-Text-Unidecode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Text-Unidecode.spec	26 Jul 2009 17:13:11 -0000	1.9
+++ perl-Text-Unidecode.spec	4 Dec 2009 02:31:41 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Text-Unidecode
 Version:        0.04
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        US-ASCII transliterations of Unicode text
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:31:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:31:52 +0000 (UTC)
Subject: rpms/perl-Text-vFile-asData/devel perl-Text-vFile-asData.spec, 1.3, 
	1.4
Message-ID: <20091204023152.C14A511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-vFile-asData/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31251

Modified Files:
	perl-Text-vFile-asData.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-vFile-asData.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-vFile-asData/devel/perl-Text-vFile-asData.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Text-vFile-asData.spec	26 Jul 2009 17:14:42 -0000	1.3
+++ perl-Text-vFile-asData.spec	4 Dec 2009 02:31:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Text-vFile-asData
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parse vFile formatted files into data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:32:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:32:03 +0000 (UTC)
Subject: rpms/perl-Text-VimColor/devel perl-Text-VimColor.spec,1.2,1.3
Message-ID: <20091204023203.73B6511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-VimColor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31326

Modified Files:
	perl-Text-VimColor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-VimColor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-VimColor/devel/perl-Text-VimColor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-VimColor.spec	26 Jul 2009 17:13:26 -0000	1.2
+++ perl-Text-VimColor.spec	4 Dec 2009 02:32:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Text-VimColor
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Syntax color text in HTML or XML using Vim
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/text-vimcolor.1.gz
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:32:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:32:13 +0000 (UTC)
Subject: rpms/perl-Text-WikiFormat/devel perl-Text-WikiFormat.spec,1.9,1.10
Message-ID: <20091204023213.C293711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-WikiFormat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31434

Modified Files:
	perl-Text-WikiFormat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-WikiFormat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-WikiFormat/devel/perl-Text-WikiFormat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Text-WikiFormat.spec	26 Jul 2009 17:13:41 -0000	1.9
+++ perl-Text-WikiFormat.spec	4 Dec 2009 02:32:13 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Text-WikiFormat
 Version:        0.79
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Translate Wiki formatted text into other formats
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.79-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.79-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:32:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:32:23 +0000 (UTC)
Subject: rpms/perl-Text-WordDiff/devel perl-Text-WordDiff.spec,1.5,1.6
Message-ID: <20091204023223.C227411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-WordDiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31545

Modified Files:
	perl-Text-WordDiff.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-WordDiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-WordDiff/devel/perl-Text-WordDiff.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Text-WordDiff.spec	26 Jul 2009 17:13:55 -0000	1.5
+++ perl-Text-WordDiff.spec	4 Dec 2009 02:32:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Text-WordDiff
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Track changes between documents
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:32:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:32:34 +0000 (UTC)
Subject: rpms/perl-Text-WrapI18N/devel perl-Text-WrapI18N.spec,1.7,1.8
Message-ID: <20091204023234.25C2611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-WrapI18N/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31622

Modified Files:
	perl-Text-WrapI18N.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-WrapI18N.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-WrapI18N/devel/perl-Text-WrapI18N.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Text-WrapI18N.spec	26 Jul 2009 17:14:09 -0000	1.7
+++ perl-Text-WrapI18N.spec	4 Dec 2009 02:32:33 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Line wrapping with support for several locale setups
 Name: perl-Text-WrapI18N
 Version: 0.06
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Text-WrapI18N/
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Text::WrapI18N.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.06-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:32:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:32:46 +0000 (UTC)
Subject: rpms/perl-Text-Wrapper/devel perl-Text-Wrapper.spec,1.11,1.12
Message-ID: <20091204023246.08BCA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Wrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757

Modified Files:
	perl-Text-Wrapper.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Wrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Wrapper/devel/perl-Text-Wrapper.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Text-Wrapper.spec	26 Jul 2009 17:14:27 -0000	1.11
+++ perl-Text-Wrapper.spec	4 Dec 2009 02:32:45 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		perl-Text-Wrapper
 Version: 	1.02
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary:	Simple word wrapping perl module
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -50,6 +50,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:32:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:32:57 +0000 (UTC)
Subject: rpms/perl-TheSchwartz/devel perl-TheSchwartz.spec,1.2,1.3
Message-ID: <20091204023257.B917B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-TheSchwartz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31845

Modified Files:
	perl-TheSchwartz.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-TheSchwartz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TheSchwartz/devel/perl-TheSchwartz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-TheSchwartz.spec	26 Jul 2009 17:14:58 -0000	1.2
+++ perl-TheSchwartz.spec	4 Dec 2009 02:32:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-TheSchwartz
 Version:        1.07
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reliable job queue
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/schwartzmon
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.07-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:33:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:33:08 +0000 (UTC)
Subject: rpms/perltidy/devel perltidy.spec,1.23,1.24
Message-ID: <20091204023308.8173811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perltidy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31925

Modified Files:
	perltidy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perltidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perltidy/devel/perltidy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perltidy.spec	26 Jul 2009 17:51:11 -0000	1.23
+++ perltidy.spec	4 Dec 2009 02:33:08 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perltidy
 Version:        20090616
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for indenting and reformatting Perl scripts
 
 Group:          Development/Tools
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 20090616-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090616-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:33:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:33:18 +0000 (UTC)
Subject: rpms/perl-Tie-DBI/devel perl-Tie-DBI.spec,1.7,1.8
Message-ID: <20091204023318.E931511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tie-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31992

Modified Files:
	perl-Tie-DBI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tie-DBI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tie-DBI/devel/perl-Tie-DBI.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Tie-DBI.spec	26 Jul 2009 17:15:18 -0000	1.7
+++ perl-Tie-DBI.spec	4 Dec 2009 02:33:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Tie-DBI
 Version:        1.02
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tie hashes to DBI relational databases
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.02-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:33:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:33:30 +0000 (UTC)
Subject: rpms/perl-Tie-EncryptedHash/devel perl-Tie-EncryptedHash.spec, 1.9, 
	1.10
Message-ID: <20091204023330.2170911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tie-EncryptedHash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32068

Modified Files:
	perl-Tie-EncryptedHash.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tie-EncryptedHash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tie-EncryptedHash/devel/perl-Tie-EncryptedHash.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Tie-EncryptedHash.spec	26 Jul 2009 17:15:37 -0000	1.9
+++ perl-Tie-EncryptedHash.spec	4 Dec 2009 02:33:30 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Hashes (and objects based on hashes) with encrypting fields
 Name:		perl-Tie-EncryptedHash
 Version:	1.24
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Tie-EncryptedHash/
@@ -60,6 +60,9 @@ default, but can be instructed to employ
 %{_mandir}/man3/Tie::EncryptedHash.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.24-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:33:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:33:42 +0000 (UTC)
Subject: rpms/perl-Tie-IxHash/devel perl-Tie-IxHash.spec,1.14,1.15
Message-ID: <20091204023342.153AD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tie-IxHash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32161

Modified Files:
	perl-Tie-IxHash.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tie-IxHash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tie-IxHash/devel/perl-Tie-IxHash.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Tie-IxHash.spec	26 Jul 2009 17:15:55 -0000	1.14
+++ perl-Tie-IxHash.spec	4 Dec 2009 02:33:41 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Tie-IxHash
 Version:        1.21
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Ordered associative arrays for Perl
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.21-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:33:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:33:53 +0000 (UTC)
Subject: rpms/perl-Tie-RefHash-Weak/devel perl-Tie-RefHash-Weak.spec, 1.3,
	1.4
Message-ID: <20091204023353.0A0D311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tie-RefHash-Weak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32242

Modified Files:
	perl-Tie-RefHash-Weak.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tie-RefHash-Weak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tie-RefHash-Weak/devel/perl-Tie-RefHash-Weak.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Tie-RefHash-Weak.spec	26 Jul 2009 17:16:13 -0000	1.3
+++ perl-Tie-RefHash-Weak.spec	4 Dec 2009 02:33:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Tie-RefHash-Weak
 Version:        0.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tie::RefHash subclass with weakened references in the keys
 License:        GPL+ or Artistic)
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.09-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:34:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:34:05 +0000 (UTC)
Subject: rpms/perl-Tie-ToObject/devel perl-Tie-ToObject.spec,1.4,1.5
Message-ID: <20091204023405.31FD911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tie-ToObject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32308

Modified Files:
	perl-Tie-ToObject.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tie-ToObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tie-ToObject/devel/perl-Tie-ToObject.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Tie-ToObject.spec	26 Jul 2009 17:16:29 -0000	1.4
+++ perl-Tie-ToObject.spec	4 Dec 2009 02:34:05 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:       perl-Tie-ToObject 
 Version:    0.03 
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Tie to an existing object 
@@ -58,6 +58,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:34:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:34:16 +0000 (UTC)
Subject: rpms/perl-TimeDate/devel perl-TimeDate.spec,1.17,1.18
Message-ID: <20091204023416.2C2CD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-TimeDate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32387

Modified Files:
	perl-TimeDate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-TimeDate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TimeDate/devel/perl-TimeDate.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-TimeDate.spec	26 Jul 2009 17:18:56 -0000	1.17
+++ perl-TimeDate.spec	4 Dec 2009 02:34:16 -0000	1.18
@@ -1,7 +1,7 @@
 Name:           perl-TimeDate
 Version:        1.16
 Epoch:          1
-Release: 	11%{?dist}
+Release: 	12%{?dist}
 Summary:        A Perl module for time and date manipulation
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.16-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.16-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:34:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:34:27 +0000 (UTC)
Subject: rpms/perl-Time-Duration/devel perl-Time-Duration.spec,1.5,1.6
Message-ID: <20091204023427.2DF2011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Time-Duration/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32459

Modified Files:
	perl-Time-Duration.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Time-Duration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/devel/perl-Time-Duration.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Time-Duration.spec	26 Jul 2009 17:16:47 -0000	1.5
+++ perl-Time-Duration.spec	4 Dec 2009 02:34:27 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           perl-Time-Duration
 Summary:        Time-Duration - rounded or exact English expression of durations
 Version:        1.06
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPLv2+ or Artistic 2.0
 Group:          Development/Libraries
 Url:            http://search.cpan.org/dist/Time-Duration/
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.06-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:34:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:34:37 +0000 (UTC)
Subject: rpms/perl-Time-Duration-Parse/devel perl-Time-Duration-Parse.spec,
	1.3, 1.4
Message-ID: <20091204023437.D48B911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Time-Duration-Parse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32535

Modified Files:
	perl-Time-Duration-Parse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Time-Duration-Parse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration-Parse/devel/perl-Time-Duration-Parse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Time-Duration-Parse.spec	26 Jul 2009 17:17:04 -0000	1.3
+++ perl-Time-Duration-Parse.spec	4 Dec 2009 02:34:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-Time-Duration-Parse 
 Version:    0.06 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/Time/Duration/Parse.pm
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.06-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:34:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:34:47 +0000 (UTC)
Subject: rpms/perl-Time-modules/devel perl-Time-modules.spec,1.14,1.15
Message-ID: <20091204023447.D9E1111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Time-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32603

Modified Files:
	perl-Time-modules.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Time-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-modules/devel/perl-Time-modules.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Time-modules.spec	26 Jul 2009 17:18:39 -0000	1.14
+++ perl-Time-modules.spec	4 Dec 2009 02:34:47 -0000	1.15
@@ -1,6 +1,6 @@
 Name: perl-Time-modules
 Version: 2006.0814
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Perl modules for parsing dates and times       
 Group: Development/Libraries
 License: Copyright only and Public Domain
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2006.0814-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2006.0814-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:34:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:34:58 +0000 (UTC)
Subject: rpms/perl-Time-Period/devel perl-Time-Period.spec,1.5,1.6
Message-ID: <20091204023458.B0C8511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Time-Period/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32669

Modified Files:
	perl-Time-Period.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Time-Period.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Period/devel/perl-Time-Period.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Time-Period.spec	26 Jul 2009 17:17:24 -0000	1.5
+++ perl-Time-Period.spec	4 Dec 2009 02:34:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Time-Period
 Version:        1.20
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Perl module to deal with time periods
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.20-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:35:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:35:09 +0000 (UTC)
Subject: rpms/perl-Time-Piece-MySQL/devel perl-Time-Piece-MySQL.spec, 1.7,
	1.8
Message-ID: <20091204023509.EAAF411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Time-Piece-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32762

Modified Files:
	perl-Time-Piece-MySQL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Time-Piece-MySQL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Piece-MySQL/devel/perl-Time-Piece-MySQL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Time-Piece-MySQL.spec	26 Jul 2009 17:17:45 -0000	1.7
+++ perl-Time-Piece-MySQL.spec	4 Dec 2009 02:35:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Time-Piece-MySQL
 Version:        0.05
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        MySQL-specific methods for Time::Piece
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:35:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:35:21 +0000 (UTC)
Subject: rpms/perl-Time-Progress/devel perl-Time-Progress.spec,1.3,1.4
Message-ID: <20091204023521.07BBD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Time-Progress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv453

Modified Files:
	perl-Time-Progress.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Time-Progress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Progress/devel/perl-Time-Progress.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Time-Progress.spec	26 Jul 2009 17:18:03 -0000	1.3
+++ perl-Time-Progress.spec	4 Dec 2009 02:35:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Time-Progress
 Version:        1.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Elapsed and estimated finish time reporting
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.4-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:35:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:35:32 +0000 (UTC)
Subject: rpms/perl-Time-Warp/devel perl-Time-Warp.spec,1.2,1.3
Message-ID: <20091204023532.1F65E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Time-Warp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv525

Modified Files:
	perl-Time-Warp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Time-Warp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Warp/devel/perl-Time-Warp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Time-Warp.spec	26 Jul 2009 17:18:19 -0000	1.2
+++ perl-Time-Warp.spec	4 Dec 2009 02:35:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Time-Warp 
 Version:    0.5 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # Warp.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.5-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:35:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:35:42 +0000 (UTC)
Subject: rpms/perl-Titanium/devel perl-Titanium.spec,1.2,1.3
Message-ID: <20091204023542.ECA8711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Titanium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv584

Modified Files:
	perl-Titanium.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Titanium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Titanium/devel/perl-Titanium.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Titanium.spec	24 Jul 2009 08:53:14 -0000	1.2
+++ perl-Titanium.spec	4 Dec 2009 02:35:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Titanium
 Version:        1.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Strong, lightweight web application famework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.03-2
+- rebuild against perl 5.10.1
+
 * Sat Jun 27 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.03-1
 - Update to 1.03
 



From kasal at fedoraproject.org  Fri Dec  4 02:35:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:35:54 +0000 (UTC)
Subject: rpms/perl-Tk/devel perl-Tk.spec,1.20,1.21
Message-ID: <20091204023554.0695511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv659

Modified Files:
	perl-Tk.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk/devel/perl-Tk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Tk.spec	26 Jul 2009 17:19:11 -0000	1.20
+++ perl-Tk.spec	4 Dec 2009 02:35:53 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name:           perl-Tk
 Version:        804.028
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Perl Graphical User Interface ToolKit
 
 Group:          Development/Libraries
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{perl_vendorarch}/Tk/reindex.pl
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 804.028-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 804.028-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:36:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:36:04 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac/devel perl-Tk-ProgressBar-Mac.spec, 1.1,
	1.2
Message-ID: <20091204023604.9BB8711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv723

Modified Files:
	perl-Tk-ProgressBar-Mac.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tk-ProgressBar-Mac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/devel/perl-Tk-ProgressBar-Mac.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Tk-ProgressBar-Mac.spec	12 Oct 2009 20:45:45 -0000	1.1
+++ perl-Tk-ProgressBar-Mac.spec	4 Dec 2009 02:36:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Tk-ProgressBar-Mac
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mac ProgressBar for Perl::Tk
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.2-4
+- rebuild against perl 5.10.1
+
 * Mon Sep 14 2009 David Hannequin <david.hannequin at gmail.com> 1.2-3
 - Fix license 
 



From kasal at fedoraproject.org  Fri Dec  4 02:36:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:36:14 +0000 (UTC)
Subject: rpms/perl-Tk-Stderr/devel perl-Tk-Stderr.spec,1.2,1.3
Message-ID: <20091204023614.BB93411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tk-Stderr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv809

Modified Files:
	perl-Tk-Stderr.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tk-Stderr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-Stderr/devel/perl-Tk-Stderr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Tk-Stderr.spec	26 Jul 2009 17:19:25 -0000	1.2
+++ perl-Tk-Stderr.spec	4 Dec 2009 02:36:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Tk-Stderr
 Version:        1.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Capture standard error output, display in separate window for Perl::Tk
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.2-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:36:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:36:25 +0000 (UTC)
Subject: rpms/perl-Tk-TableMatrix/devel perl-Tk-TableMatrix.spec,1.3,1.4
Message-ID: <20091204023626.0022D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tk-TableMatrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv898

Modified Files:
	perl-Tk-TableMatrix.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tk-TableMatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-TableMatrix/devel/perl-Tk-TableMatrix.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Tk-TableMatrix.spec	26 Jul 2009 17:19:42 -0000	1.3
+++ perl-Tk-TableMatrix.spec	4 Dec 2009 02:36:25 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Tk-TableMatrix
 Version:        1.23
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl module for creating and manipulating tables
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.23-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:36:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:36:36 +0000 (UTC)
Subject: rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node.spec,1.10,1.11
Message-ID: <20091204023636.D888611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tree-DAG_Node/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv977

Modified Files:
	perl-Tree-DAG_Node.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tree-DAG_Node.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tree-DAG_Node/devel/perl-Tree-DAG_Node.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Tree-DAG_Node.spec	26 Jul 2009 17:19:58 -0000	1.10
+++ perl-Tree-DAG_Node.spec	4 Dec 2009 02:36:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Tree-DAG_Node
 Version:        1.06
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Class for representing nodes in a tree
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.06-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:36:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:36:46 +0000 (UTC)
Subject: rpms/perl-Tree-Simple/devel perl-Tree-Simple.spec,1.11,1.12
Message-ID: <20091204023646.A4AC411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tree-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1080

Modified Files:
	perl-Tree-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tree-Simple/devel/perl-Tree-Simple.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Tree-Simple.spec	26 Jul 2009 17:20:15 -0000	1.11
+++ perl-Tree-Simple.spec	4 Dec 2009 02:36:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
 Version: 	1.18
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -51,6 +51,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.18-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:36:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:36:58 +0000 (UTC)
Subject: rpms/perl-Tree-Simple-VisitorFactory/devel
	perl-Tree-Simple-VisitorFactory.spec, 1.5, 1.6
Message-ID: <20091204023658.0856C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Tree-Simple-VisitorFactory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1148

Modified Files:
	perl-Tree-Simple-VisitorFactory.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Tree-Simple-VisitorFactory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tree-Simple-VisitorFactory/devel/perl-Tree-Simple-VisitorFactory.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Tree-Simple-VisitorFactory.spec	26 Jul 2009 17:20:31 -0000	1.5
+++ perl-Tree-Simple-VisitorFactory.spec	4 Dec 2009 02:36:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Tree-Simple-VisitorFactory
 Version:        0.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Factory object for dispensing Visitor objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.10-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:37:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:37:08 +0000 (UTC)
Subject: rpms/perl-Try-Tiny/devel perl-Try-Tiny.spec,1.1,1.2
Message-ID: <20091204023708.D4A9211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Try-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1245

Modified Files:
	perl-Try-Tiny.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Try-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Try-Tiny/devel/perl-Try-Tiny.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Try-Tiny.spec	18 Sep 2009 00:34:44 -0000	1.1
+++ perl-Try-Tiny.spec	4 Dec 2009 02:37:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-Try-Tiny 
 Version:    0.02 
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/Try/Tiny.pm -> MIT
 License:    MIT 
 Group:      Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-2
+- rebuild against perl 5.10.1
+
 * Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
 - submission
 



From kasal at fedoraproject.org  Fri Dec  4 02:37:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:37:20 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-can/devel perl-UNIVERSAL-can.spec,1.7,1.8
Message-ID: <20091204023720.1AC9111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-UNIVERSAL-can/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1340

Modified Files:
	perl-UNIVERSAL-can.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-UNIVERSAL-can.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-can/devel/perl-UNIVERSAL-can.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-UNIVERSAL-can.spec	7 Oct 2009 10:36:35 -0000	1.7
+++ perl-UNIVERSAL-can.spec	4 Dec 2009 02:37:19 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-can
 Version:        1.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Hack around people calling UNIVERSAL::can() as a function
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.15-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.15-1
 - update to new upstream release
 



From rdieter at fedoraproject.org  Fri Dec  4 02:37:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  4 Dec 2009 02:37:35 +0000 (UTC)
Subject: File tidy-20091203cvs.tar.gz uploaded to lookaside cache by rdieter
Message-ID: <20091204023735.C4F8210F894@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tidy:

38ecfd181ae95098112e7f87428a27f8  tidy-20091203cvs.tar.gz



From kasal at fedoraproject.org  Fri Dec  4 02:37:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:37:30 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-exports/devel perl-UNIVERSAL-exports.spec, 1.8, 
	1.9
Message-ID: <20091204023730.DFDE711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-UNIVERSAL-exports/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1431

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-exports/devel/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-UNIVERSAL-exports.spec	26 Jul 2009 17:21:01 -0000	1.8
+++ perl-UNIVERSAL-exports.spec	4 Dec 2009 02:37:30 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:37:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:37:40 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-isa/devel perl-UNIVERSAL-isa.spec,1.11,1.12
Message-ID: <20091204023740.D68BF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-UNIVERSAL-isa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1525

Modified Files:
	perl-UNIVERSAL-isa.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-UNIVERSAL-isa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-isa/devel/perl-UNIVERSAL-isa.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-UNIVERSAL-isa.spec	7 Oct 2009 10:39:09 -0000	1.11
+++ perl-UNIVERSAL-isa.spec	4 Dec 2009 02:37:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-isa
 Version:        1.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Hack around module authors using UNIVERSAL::isa as a function
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.03-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.03-1
 - update to new upstream release
 



From kasal at fedoraproject.org  Fri Dec  4 02:37:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:37:50 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-moniker/devel perl-UNIVERSAL-moniker.spec, 1.7, 
	1.8
Message-ID: <20091204023750.A53BE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-UNIVERSAL-moniker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1643

Modified Files:
	perl-UNIVERSAL-moniker.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-UNIVERSAL-moniker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-moniker/devel/perl-UNIVERSAL-moniker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-UNIVERSAL-moniker.spec	26 Jul 2009 17:21:36 -0000	1.7
+++ perl-UNIVERSAL-moniker.spec	4 Dec 2009 02:37:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-moniker
 Version:        0.08
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Real world naming for classes
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Fri Dec  4 02:37:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  4 Dec 2009 02:37:51 +0000 (UTC)
Subject: rpms/tidy/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 tidy.spec, 
	1.26, 1.27
Message-ID: <20091204023751.C487011C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/tidy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1669

Modified Files:
	.cvsignore sources tidy.spec 
Log Message:
* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.99.0-20.20091203
- 20091203 snapshot
- spec housecleaning
- Tidy erroniously removes whitespace, causing mangled text (#481350)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tidy/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 Jul 2007 20:02:19 -0000	1.9
+++ .cvsignore	4 Dec 2009 02:37:51 -0000	1.10
@@ -1,4 +1 @@
-tidy_src_051025.tgz
-tidy_docs_051020.tgz
-tidy-20070228cvs.tar.gz
-tidy-20070615cvs.tar.gz
+tidy-20091203cvs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tidy/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	9 Jul 2007 20:02:19 -0000	1.9
+++ sources	4 Dec 2009 02:37:51 -0000	1.10
@@ -1 +1 @@
-1a2058632249d6005c5205d5caa0dd5f  tidy-20070615cvs.tar.gz
+38ecfd181ae95098112e7f87428a27f8  tidy-20091203cvs.tar.gz


Index: tidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- tidy.spec	27 Jul 2009 05:56:24 -0000	1.26
+++ tidy.spec	4 Dec 2009 02:37:51 -0000	1.27
@@ -1,19 +1,18 @@
 
 %define libname libtidy
 
-%define snap 20070615 
+%define snap 20091203
 
 Name:    tidy
 Summary: Utility to clean up and pretty print HTML/XHTML/XML
 Version: 0.99.0
-Release: 19.%{snap}%{?dist}
+Release: 20.%{snap}%{?dist}
 
 Group:   Applications/Text
 License: W3C
 URL:     http://tidy.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# timestamp 01-Feb-2007
 Source0: tidy-%{snap}cvs.tar.gz
 Source10: tidy-cvs_checkout.sh 
 
@@ -21,6 +20,8 @@ BuildRequires: libtool
 BuildRequires: doxygen
 BuildRequires: libxslt
 
+Requires: %{libname}%{?_isa} = %{version}-%{release}
+
 %description
 When editing HTML it's easy to make mistakes. Wouldn't it be nice if
 there was a simple way to fix these mistakes automatically and tidy up
@@ -32,17 +33,17 @@ identify where you need to pay further a
 more accessible to people with disabilities.
 
 %package -n %{libname} 
-Summary: Shared libraries for tidy
+Summary: Shared libraries for %{name}
 Group:	 System Environment/Libraries
 %description -n %{libname} 
 %{summary}.
 
 %package -n %{libname}-devel
-Summary: Development files for libtidy 
+Summary: Development files for %{name} 
 Group:   Development/Libraries
-Obsoletes: tidy-devel < %{version}-%{release}
+Obsoletes: tidy-devel < 0.99.0-10 
 Provides:  tidy-devel = %{version}-%{release}
-Requires: %{libname} = %{version}-%{release}
+Requires: %{libname}%{?_isa} = %{version}-%{release}
 %description -n %{libname}-devel
 %{summary}.
 
@@ -98,21 +99,27 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc htmldoc/*.html htmldoc/*.css htmldoc/*.gif
-%{_bindir}/*
-%{_mandir}/man1/*
+%{_bindir}/tab2space
+%{_bindir}/tidy
+%{_mandir}/man1/tidy.1*
 
 %files -n %{libname} 
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libtidy-0.99.so.0*
 
 %files -n %{libname}-devel
 %defattr(-,root,root,-)
 %doc htmldoc/api/*
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/*.h
+%{_libdir}/libtidy.so
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.99.0-20.20091203
+- 20091203 snapshot
+- spec housecleaning
+- Tidy erroniously removes whitespace, causing mangled text (#481350)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.0-19.20070615
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:38:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:38:01 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-require/devel perl-UNIVERSAL-require.spec, 1.9, 
	1.10
Message-ID: <20091204023801.25C5911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-UNIVERSAL-require/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1807

Modified Files:
	perl-UNIVERSAL-require.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-UNIVERSAL-require.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-require/devel/perl-UNIVERSAL-require.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-UNIVERSAL-require.spec	7 Oct 2009 10:42:53 -0000	1.9
+++ perl-UNIVERSAL-require.spec	4 Dec 2009 02:38:01 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-require
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Require() modules from a variable
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.13-1
 - update to new upstream release
 



From kasal at fedoraproject.org  Fri Dec  4 02:38:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:38:12 +0000 (UTC)
Subject: rpms/perl-Unix-Statgrab/devel perl-Unix-Statgrab.spec,1.11,1.12
Message-ID: <20091204023812.E13E811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Unix-Statgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1910

Modified Files:
	perl-Unix-Statgrab.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Unix-Statgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unix-Statgrab/devel/perl-Unix-Statgrab.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Unix-Statgrab.spec	26 Jul 2009 17:24:14 -0000	1.11
+++ perl-Unix-Statgrab.spec	4 Dec 2009 02:38:12 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Unix-Statgrab
 Version:        0.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl extension for collecting information about the machine
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:39:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:39:18 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/devel
	perl-MooseX-MethodAttributes.spec, 1.9, 1.10
Message-ID: <20091204023918.A2E4C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-MethodAttributes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2572

Modified Files:
	perl-MooseX-MethodAttributes.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-MethodAttributes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-MethodAttributes/devel/perl-MooseX-MethodAttributes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-MooseX-MethodAttributes.spec	26 Sep 2009 05:43:32 -0000	1.9
+++ perl-MooseX-MethodAttributes.spec	4 Dec 2009 02:39:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-MethodAttributes
 Version:    0.18
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/MooseX/MethodAttributes.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.18-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
 - auto-update to 0.18 (by cpan-spec-update 0.01)
 - altered br on perl(Moose) (0.79 => 0.90)



From kasal at fedoraproject.org  Fri Dec  4 02:39:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:39:42 +0000 (UTC)
Subject: rpms/perl-MooseX-MultiInitArg/devel perl-MooseX-MultiInitArg.spec,
	1.3, 1.4
Message-ID: <20091204023942.1CACA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-MultiInitArg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2780

Modified Files:
	perl-MooseX-MultiInitArg.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-MultiInitArg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-MultiInitArg/devel/perl-MooseX-MultiInitArg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-MultiInitArg.spec	26 Jul 2009 11:28:25 -0000	1.3
+++ perl-MooseX-MultiInitArg.spec	4 Dec 2009 02:39:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-MultiInitArg 
 Version:    0.01 
-Release:    4%{?dist}
+Release:    5%{?dist}
 # lib/MooseX/MultiInitArg.pm -> GPL+ or Artistic
 # lib/MooseX/MultiInitArg/Attribute.pm -> GPL+ or Artistic
 # lib/MooseX/MultiInitArg/Trait.pm -> GPL+ or Artistic
@@ -53,6 +53,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.01-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:40:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:40:06 +0000 (UTC)
Subject: rpms/perl-MooseX-Object-Pluggable/devel
	perl-MooseX-Object-Pluggable.spec, 1.11, 1.12
Message-ID: <20091204024006.D11D911C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Object-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2975

Modified Files:
	perl-MooseX-Object-Pluggable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Object-Pluggable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Object-Pluggable/devel/perl-MooseX-Object-Pluggable.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-MooseX-Object-Pluggable.spec	26 Jul 2009 11:28:39 -0000	1.11
+++ perl-MooseX-Object-Pluggable.spec	4 Dec 2009 02:40:06 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Object-Pluggable
 Version:        0.0011
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Make your Moose classes pluggable
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.0011-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0011-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:40:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:40:32 +0000 (UTC)
Subject: rpms/perl-MooseX-Param/devel perl-MooseX-Param.spec,1.3,1.4
Message-ID: <20091204024032.1689011C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Param/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3279

Modified Files:
	perl-MooseX-Param.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Param.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Param/devel/perl-MooseX-Param.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-Param.spec	26 Jul 2009 11:29:11 -0000	1.3
+++ perl-MooseX-Param.spec	4 Dec 2009 02:40:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Param
 Version:        0.02
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simple role to provide a standard param method
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:40:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:40:57 +0000 (UTC)
Subject: rpms/perl-MooseX-Params-Validate/devel
	perl-MooseX-Params-Validate.spec, 1.12, 1.13
Message-ID: <20091204024057.7487F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Params-Validate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3598

Modified Files:
	perl-MooseX-Params-Validate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Params-Validate/devel/perl-MooseX-Params-Validate.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-MooseX-Params-Validate.spec	8 Aug 2009 04:19:31 -0000	1.12
+++ perl-MooseX-Params-Validate.spec	4 Dec 2009 02:40:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Params-Validate
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extension of Params::Validate using Moose's types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.12-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
 - auto-update to 0.12 (by cpan-spec-update 0.01)
 - added a new br on perl(Carp) (version 0)



From kasal at fedoraproject.org  Fri Dec  4 02:41:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:41:02 +0000 (UTC)
Subject: rpms/perl-Class-Unload/devel perl-Class-Unload.spec,1.3,1.4
Message-ID: <20091204024102.8C5EE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Unload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3663

Modified Files:
	perl-Class-Unload.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Unload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Unload/devel/perl-Class-Unload.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Class-Unload.spec	26 Jul 2009 04:33:04 -0000	1.3
+++ perl-Class-Unload.spec	4 Dec 2009 02:41:02 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Class-Unload
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Unload given Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:41:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:41:20 +0000 (UTC)
Subject: rpms/perl-MooseX-POE/devel perl-MooseX-POE.spec,1.8,1.9
Message-ID: <20091204024120.D084511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-POE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3896

Modified Files:
	perl-MooseX-POE.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-POE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/devel/perl-MooseX-POE.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-MooseX-POE.spec	22 Oct 2009 18:25:11 -0000	1.8
+++ perl-MooseX-POE.spec	4 Dec 2009 02:41:20 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-POE
 Version:        0.205
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Illicit Love Child of Moose and POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.205-2
+- rebuild against perl 5.10.1
+
 * Thu Oct 22 2009 Allisson Azevedo <allisson at gmail.com> 0.205-1
 - Update to 0.205.
 - Added perl(Test::Moose) to BR.



From kasal at fedoraproject.org  Fri Dec  4 02:41:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:41:30 +0000 (UTC)
Subject: rpms/perl-Class-XSAccessor/devel perl-Class-XSAccessor.spec, 1.6,
	1.7
Message-ID: <20091204024130.1842411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-XSAccessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3993

Modified Files:
	perl-Class-XSAccessor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-XSAccessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-XSAccessor/devel/perl-Class-XSAccessor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Class-XSAccessor.spec	16 Nov 2009 09:14:04 -0000	1.6
+++ perl-Class-XSAccessor.spec	4 Dec 2009 02:41:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Class-XSAccessor
 Version:        1.05
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate fast XS accessors without runtime compilation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.05-2
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:41:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:41:45 +0000 (UTC)
Subject: rpms/perl-MooseX-Policy-SemiAffordanceAccessor/devel
	perl-MooseX-Policy-SemiAffordanceAccessor.spec, 1.3, 1.4
Message-ID: <20091204024145.BB2FB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Policy-SemiAffordanceAccessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4232

Modified Files:
	perl-MooseX-Policy-SemiAffordanceAccessor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Policy-SemiAffordanceAccessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Policy-SemiAffordanceAccessor/devel/perl-MooseX-Policy-SemiAffordanceAccessor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-Policy-SemiAffordanceAccessor.spec	26 Jul 2009 11:29:42 -0000	1.3
+++ perl-MooseX-Policy-SemiAffordanceAccessor.spec	4 Dec 2009 02:41:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Policy-SemiAffordanceAccessor
 Version:        0.02
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Policy to name accessors foo() and set_foo()
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:42:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:42:09 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Cmd/devel perl-MooseX-Role-Cmd.spec,1.5,1.6
Message-ID: <20091204024209.EECAB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Role-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4543

Modified Files:
	perl-MooseX-Role-Cmd.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Role-Cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Role-Cmd/devel/perl-MooseX-Role-Cmd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-Role-Cmd.spec	26 Jul 2009 11:29:57 -0000	1.5
+++ perl-MooseX-Role-Cmd.spec	4 Dec 2009 02:42:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Role-Cmd
 Version:        0.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Wrap system command binaries the Moose way
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:42:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:42:35 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/devel
	perl-MooseX-Role-Parameterized.spec, 1.10, 1.11
Message-ID: <20091204024235.4F3DE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Role-Parameterized/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4955

Modified Files:
	perl-MooseX-Role-Parameterized.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Role-Parameterized.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Role-Parameterized/devel/perl-MooseX-Role-Parameterized.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-MooseX-Role-Parameterized.spec	19 Sep 2009 18:40:06 -0000	1.10
+++ perl-MooseX-Role-Parameterized.spec	4 Dec 2009 02:42:35 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Role-Parameterized
 Version:    0.13
-Release:    1%{?dist}
+Release:    2%{?dist}
 # see LICENSE
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - auto-update to 0.13 (by cpan-spec-update 0.01)
 - added a new br on perl(Test::Moose) (version 0)



From kasal at fedoraproject.org  Fri Dec  4 02:43:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:43:01 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-XMLRPC-Client/devel
	perl-MooseX-Role-XMLRPC-Client.spec, 1.2, 1.3
Message-ID: <20091204024301.A7D4F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Role-XMLRPC-Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5434

Modified Files:
	perl-MooseX-Role-XMLRPC-Client.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Role-XMLRPC-Client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Role-XMLRPC-Client/devel/perl-MooseX-Role-XMLRPC-Client.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-MooseX-Role-XMLRPC-Client.spec	26 Jul 2009 11:30:29 -0000	1.2
+++ perl-MooseX-Role-XMLRPC-Client.spec	4 Dec 2009 02:43:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Role-XMLRPC-Client 
 Version:    0.04 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/MooseX/Role/XMLRPC/Client.pm -> LGPLv2+
 License:    LGPLv2+
 Group:      Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:43:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:43:02 +0000 (UTC)
Subject: rpms/perl-Test-Block/devel perl-Test-Block.spec,1.4,1.5
Message-ID: <20091204024302.F192411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Block/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5476

Modified Files:
	perl-Test-Block.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Block.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Block/devel/perl-Test-Block.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Test-Block.spec	26 Jul 2009 16:46:23 -0000	1.4
+++ perl-Test-Block.spec	4 Dec 2009 02:43:02 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:       perl-Test-Block 
 Version:    0.11 
-Release:        4%{?dist}
+Release:        5%{?dist}
 # see lib/Test/Block.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.11-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:43:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:43:27 +0000 (UTC)
Subject: rpms/perl-MooseX-SemiAffordanceAccessor/devel
	perl-MooseX-SemiAffordanceAccessor.spec, 1.3, 1.4
Message-ID: <20091204024327.82E8C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-SemiAffordanceAccessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6045

Modified Files:
	perl-MooseX-SemiAffordanceAccessor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-SemiAffordanceAccessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-SemiAffordanceAccessor/devel/perl-MooseX-SemiAffordanceAccessor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-SemiAffordanceAccessor.spec	8 Aug 2009 04:21:46 -0000	1.3
+++ perl-MooseX-SemiAffordanceAccessor.spec	4 Dec 2009 02:43:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-SemiAffordanceAccessor
 Version:    0.05
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/MooseX/SemiAffordanceAccessor.pm -> GPL+ or Artistic
 # lib/MooseX/SemiAffordanceAccessor/Role/Attribute.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - auto-update to 0.05 (by cpan-spec-update 0.01)
 - altered br on perl(Moose) (0.56 => 0.84)



From kasal at fedoraproject.org  Fri Dec  4 02:43:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:43:27 +0000 (UTC)
Subject: rpms/perl-Test-Class/devel perl-Test-Class.spec,1.8,1.9
Message-ID: <20091204024327.A9E0911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6033

Modified Files:
	perl-Test-Class.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Class.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Class/devel/perl-Test-Class.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Test-Class.spec	21 Sep 2009 20:00:46 -0000	1.8
+++ perl-Test-Class.spec	4 Dec 2009 02:43:27 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Test-Class
 Version:        0.33
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easily create test classes in an xUnit/JUnit style
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.33-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 21 2009 Steven Pritchard <steve at kspei.com> 0.33-1
 - Update to 0.33.
 - Update Source0 URL.



From kasal at fedoraproject.org  Fri Dec  4 02:43:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:43:52 +0000 (UTC)
Subject: rpms/perl-Geo-IP/devel perl-Geo-IP.spec,1.10,1.11
Message-ID: <20091204024352.5FC0C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geo-IP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6647

Modified Files:
	perl-Geo-IP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geo-IP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geo-IP/devel/perl-Geo-IP.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Geo-IP.spec	26 Jul 2009 06:13:43 -0000	1.10
+++ perl-Geo-IP.spec	4 Dec 2009 02:43:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name:  perl-Geo-IP
 Version: 1.38
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Efficient Perl bindings for the GeoIP location database       
 
 Group: Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Geo::Mirror.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.38-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.38-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:43:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:43:53 +0000 (UTC)
Subject: rpms/perl-MooseX-SimpleConfig/devel perl-MooseX-SimpleConfig.spec,
	1.3, 1.4
Message-ID: <20091204024353.CEE3E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-SimpleConfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6683

Modified Files:
	perl-MooseX-SimpleConfig.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-SimpleConfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-SimpleConfig/devel/perl-MooseX-SimpleConfig.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-SimpleConfig.spec	26 Jul 2009 11:31:01 -0000	1.3
+++ perl-MooseX-SimpleConfig.spec	4 Dec 2009 02:43:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-SimpleConfig
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Moose role for setting attributes from a simple configfile
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:44:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:44:19 +0000 (UTC)
Subject: rpms/perl-MooseX-Singleton/devel perl-MooseX-Singleton.spec, 1.4,
	1.5
Message-ID: <20091204024419.82C5711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Singleton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7352

Modified Files:
	perl-MooseX-Singleton.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Singleton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/devel/perl-MooseX-Singleton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Singleton.spec	19 Sep 2009 18:52:39 -0000	1.4
+++ perl-MooseX-Singleton.spec	4 Dec 2009 02:44:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Singleton
 Version:        0.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn your Moose class into a singleton
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.21-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
 - auto-update to 0.21 (by cpan-spec-update 0.01)
 - altered br on perl(Moose) (0.74 => 0.82)



From kasal at fedoraproject.org  Fri Dec  4 02:44:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:44:18 +0000 (UTC)
Subject: rpms/perl-Geo-IPfree/devel perl-Geo-IPfree.spec,1.3,1.4
Message-ID: <20091204024418.86A0311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geo-IPfree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7322

Modified Files:
	perl-Geo-IPfree.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geo-IPfree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geo-IPfree/devel/perl-Geo-IPfree.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Geo-IPfree.spec	26 Jul 2009 06:13:58 -0000	1.3
+++ perl-Geo-IPfree.spec	4 Dec 2009 02:44:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Geo-IPfree
 Version:        0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Look up country of IP Address
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.4-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:44:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:44:47 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage/devel perl-MooseX-Storage.spec,1.5,1.6
Message-ID: <20091204024447.B1C5B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Storage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8050

Modified Files:
	perl-MooseX-Storage.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Storage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Storage/devel/perl-MooseX-Storage.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-Storage.spec	11 Aug 2009 07:41:53 -0000	1.5
+++ perl-MooseX-Storage.spec	4 Dec 2009 02:44:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Storage
 Version:    0.21
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/MooseX/Storage.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.21-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
 - auto-update to 0.21 (by cpan-spec-update 0.01)
 - added a new req on perl(Moose) (version 0.39)



From kasal at fedoraproject.org  Fri Dec  4 02:44:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:44:44 +0000 (UTC)
Subject: rpms/perl-Geo-METAR/devel perl-Geo-METAR.spec,1.6,1.7
Message-ID: <20091204024444.334FC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Geo-METAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7973

Modified Files:
	perl-Geo-METAR.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Geo-METAR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Geo-METAR/devel/perl-Geo-METAR.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Geo-METAR.spec	26 Jul 2009 06:14:31 -0000	1.6
+++ perl-Geo-METAR.spec	4 Dec 2009 02:44:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Geo-METAR
 Version:        1.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl module for accessing aviation weather information
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.15-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:45:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:45:13 +0000 (UTC)
Subject: rpms/perl-MooseX-StrictConstructor/devel
	perl-MooseX-StrictConstructor.spec, 1.6, 1.7
Message-ID: <20091204024513.9A2EA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-StrictConstructor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8605

Modified Files:
	perl-MooseX-StrictConstructor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-StrictConstructor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-StrictConstructor/devel/perl-MooseX-StrictConstructor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-MooseX-StrictConstructor.spec	26 Jul 2009 11:31:49 -0000	1.6
+++ perl-MooseX-StrictConstructor.spec	4 Dec 2009 02:45:13 -0000	1.7
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-StrictConstructor 
 Version:        0.08
-Release:        2%{?dist}
+Release:        3%{?dist}
 # see lib/MooseX/StrictConstructor.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:45:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:45:36 +0000 (UTC)
Subject: rpms/perl-Crypt-Twofish/devel perl-Crypt-Twofish.spec,1.2,1.3
Message-ID: <20091204024536.48ED611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-Twofish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8932

Modified Files:
	perl-Crypt-Twofish.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-Twofish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-Twofish/devel/perl-Crypt-Twofish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Crypt-Twofish.spec	26 Jul 2009 05:19:23 -0000	1.2
+++ perl-Crypt-Twofish.spec	4 Dec 2009 02:45:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-Twofish
 Version:        2.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Twofish Encryption Algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.13-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:45:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:45:39 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel
	perl-MooseX-Traits-Attribute-CascadeClear.spec, 1.4, 1.5
Message-ID: <20091204024539.D538911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8953

Modified Files:
	perl-MooseX-Traits-Attribute-CascadeClear.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Traits-Attribute-CascadeClear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel/perl-MooseX-Traits-Attribute-CascadeClear.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Traits-Attribute-CascadeClear.spec	26 Jul 2009 11:32:03 -0000	1.4
+++ perl-MooseX-Traits-Attribute-CascadeClear.spec	4 Dec 2009 02:45:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Traits-Attribute-CascadeClear 
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 # lib/Moose/Meta/Attribute/Custom/Trait/CascadeClear.pm -> LGPLv2, LGPLv3
 # lib/Moose/Meta/Attribute/Custom/Trait/CascadeClearMaster.pm -> LGPLv2, LGPLv3
 # lib/MooseX/Traits/Attribute/CascadeClear.pm -> LGPLv2, LGPLv3
@@ -58,6 +58,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:46:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:46:04 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Pluggable/devel
	perl-MooseX-Traits-Pluggable.spec, 1.1, 1.2
Message-ID: <20091204024604.CB06A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9258

Modified Files:
	perl-MooseX-Traits-Pluggable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Traits-Pluggable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Traits-Pluggable/devel/perl-MooseX-Traits-Pluggable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-MooseX-Traits-Pluggable.spec	4 Sep 2009 02:32:52 -0000	1.1
+++ perl-MooseX-Traits-Pluggable.spec	4 Dec 2009 02:46:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Traits-Pluggable 
 Version:    0.08 
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/MooseX/Traits/Pluggable.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-2
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
 - submission
 - br CPAN for inc::Module::Install::AutoInstall



From rakesh at fedoraproject.org  Fri Dec  4 02:50:27 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 02:50:27 +0000 (UTC)
Subject: File ginac-1.5.5.tar.bz2 uploaded to lookaside cache by rakesh
Message-ID: <20091204025027.3C97810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ginac:

cb5334e3269f4c234a6c4d81d7ebd47e  ginac-1.5.5.tar.bz2



From kasal at fedoraproject.org  Fri Dec  4 02:50:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:50:55 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/devel perl-MooseX-Types.spec,1.16,1.17
Message-ID: <20091204025055.BA0C011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Types/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10979

Modified Files:
	perl-MooseX-Types.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Types/devel/perl-MooseX-Types.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-MooseX-Types.spec	19 Sep 2009 18:39:59 -0000	1.16
+++ perl-MooseX-Types.spec	4 Dec 2009 02:50:55 -0000	1.17
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Types
 Version:    0.20
-Release:    1%{?dist}
+Release:    2%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.20-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
 - auto-update to 0.20 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Fri Dec  4 02:53:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:53:57 +0000 (UTC)
Subject: rpms/perl-Getopt-Euclid/devel perl-Getopt-Euclid.spec,1.5,1.6
Message-ID: <20091204025357.3A90411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Getopt-Euclid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13101

Modified Files:
	perl-Getopt-Euclid.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Getopt-Euclid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-Euclid/devel/perl-Getopt-Euclid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Getopt-Euclid.spec	26 Jul 2009 06:15:19 -0000	1.5
+++ perl-Getopt-Euclid.spec	4 Dec 2009 02:53:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Getopt-Euclid
 Version:        0.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Executable Uniform Command-Line Interface Descriptions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.2.1-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Dec  4 02:54:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:54:40 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec,1.230,1.231
Message-ID: <20091204025440.C1CC711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13916

Modified Files:
	foomatic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- foomatic.spec	10 Nov 2009 12:34:59 -0000	1.230
+++ foomatic.spec	4 Dec 2009 02:54:40 -0000	1.231
@@ -4,7 +4,7 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    5%{?dist}
+Release:    6%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -156,6 +156,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 4.0.3-6
+- rebuild against perl 5.10.1
+
 * Tue Nov 10 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-5
 - Build requires cups.
 



From kasal at fedoraproject.org  Fri Dec  4 02:55:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:55:05 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime/devel
	perl-MooseX-Types-DateTime.spec, 1.5, 1.6
Message-ID: <20091204025505.12C1A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Types-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14349

Modified Files:
	perl-MooseX-Types-DateTime.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Types-DateTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Types-DateTime/devel/perl-MooseX-Types-DateTime.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-Types-DateTime.spec	19 Sep 2009 18:40:47 -0000	1.5
+++ perl-MooseX-Types-DateTime.spec	4 Dec 2009 02:55:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Types-DateTime
 Version:    0.05
-Release:    1%{?dist}
+Release:    2%{?dist}
 # see, e.g., lib/MooseX/Types/DateTime.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - auto-update to 0.05 (by cpan-spec-update 0.01)
 - altered br on perl(MooseX::Types) (0.04 => 0.19)



From kasal at fedoraproject.org  Fri Dec  4 02:56:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  4 Dec 2009 02:56:34 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier/devel perl-CSS-Minifier.spec,1.2,1.3
Message-ID: <20091204025634.D3A2D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CSS-Minifier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15522

Modified Files:
	perl-CSS-Minifier.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CSS-Minifier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CSS-Minifier/devel/perl-CSS-Minifier.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CSS-Minifier.spec	26 Jul 2009 04:02:50 -0000	1.2
+++ perl-CSS-Minifier.spec	4 Dec 2009 02:56:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-CSS-Minifier 
 Version:    0.01 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/CSS/Minifier.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.01-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tagoh at fedoraproject.org  Fri Dec  4 02:58:25 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri,  4 Dec 2009 02:58:25 +0000 (UTC)
Subject: File VLGothic-20091202.tar.bz2 uploaded to lookaside cache by tagoh
Message-ID: <20091204025825.CA7DA10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for vlgothic-fonts:

db66b71975c6ffc54ca37f0d13451e0a  VLGothic-20091202.tar.bz2



From rakesh at fedoraproject.org  Fri Dec  4 03:01:26 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 03:01:26 +0000 (UTC)
Subject: rpms/ginac/devel .cvsignore, 1.12, 1.13 ginac.spec, 1.23,
	1.24 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20091204030126.0D5B011C00EE@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ginac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18598/devel

Modified Files:
	.cvsignore ginac.spec import.log sources 
Log Message:
Updated to 1.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Mar 2009 04:58:21 -0000	1.12
+++ .cvsignore	4 Dec 2009 03:01:25 -0000	1.13
@@ -1 +1 @@
-ginac-1.5.1.tar.bz2
+ginac-1.5.5.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ginac.spec	25 Jul 2009 00:11:53 -0000	1.23
+++ ginac.spec	4 Dec 2009 03:01:25 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           ginac
-Version:        1.5.1
-Release:        3%{?dist}
+Version:        1.5.5
+Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
@@ -62,6 +62,8 @@ the tool "viewgar" which displays the co
 
 %build
 %configure --disable-dependency-tracking --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
@@ -104,6 +106,9 @@ fi
 %{_mandir}/man?/*
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.5.5-1
+- Updated to 1.5.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	17 Mar 2009 04:58:21 -0000	1.2
+++ import.log	4 Dec 2009 03:01:25 -0000	1.3
@@ -1,2 +1,3 @@
 ginac-1_4_4-1_fc10:HEAD:ginac-1.4.4-1.fc10.src.rpm:1232014772
 ginac-1_5_1-1_fc10:HEAD:ginac-1.5.1-1.fc10.src.rpm:1237265621
+ginac-1_5_5-1_fc12:HEAD:ginac-1.5.5-1.fc12.src.rpm:1259894522


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Mar 2009 04:58:21 -0000	1.12
+++ sources	4 Dec 2009 03:01:25 -0000	1.13
@@ -1 +1 @@
-ef05970ea87d1808ec7e75dad833deca  ginac-1.5.1.tar.bz2
+cb5334e3269f4c234a6c4d81d7ebd47e  ginac-1.5.5.tar.bz2



From rakesh at fedoraproject.org  Fri Dec  4 03:09:54 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 03:09:54 +0000 (UTC)
Subject: File zile-2.3.14.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091204030954.75BE310F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for zile:

88322abbb8146f3c4e7bb31fa4d351c6  zile-2.3.14.tar.gz



From rakesh at fedoraproject.org  Fri Dec  4 03:10:35 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 03:10:35 +0000 (UTC)
Subject: rpms/zile/devel .cvsignore, 1.8, 1.9 import.log, 1.4, 1.5 sources,
	1.8, 1.9 zile.spec, 1.14, 1.15
Message-ID: <20091204031035.D919111C03F6@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/zile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21287/devel

Modified Files:
	.cvsignore import.log sources zile.spec 
Log Message:
Updated to 2.3.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	15 Jul 2009 16:41:57 -0000	1.8
+++ .cvsignore	4 Dec 2009 03:10:35 -0000	1.9
@@ -1 +1 @@
-zile-2.3.9.tar.gz
+zile-2.3.14.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	15 Jul 2009 16:41:57 -0000	1.4
+++ import.log	4 Dec 2009 03:10:35 -0000	1.5
@@ -2,3 +2,4 @@ zile-2_2_61-2_fc9:HEAD:zile-2.2.61-2.fc9
 zile-2_3_0-1_fc10:HEAD:zile-2.3.0-1.fc10.src.rpm:1232045193
 zile-2_3_6-1_fc11:HEAD:zile-2.3.6-1.fc11.src.rpm:1239565544
 zile-2_3_9-1_fc11:HEAD:zile-2.3.9-1.fc11.src.rpm:1247676184
+zile-2_3_14-1_fc12:HEAD:zile-2.3.14-1.fc12.src.rpm:1259895688


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	15 Jul 2009 16:41:57 -0000	1.8
+++ sources	4 Dec 2009 03:10:35 -0000	1.9
@@ -1 +1 @@
-51f2fb489b81d80f997644e872445370  zile-2.3.9.tar.gz
+88322abbb8146f3c4e7bb31fa4d351c6  zile-2.3.14.tar.gz


Index: zile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/zile.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- zile.spec	27 Jul 2009 09:02:58 -0000	1.14
+++ zile.spec	4 Dec 2009 03:10:35 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.3.9
-Release: 2%{?dist}
+Version: 2.3.14
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Editors
 URL: http://www.gnu.org/software/%{name}/
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.3.14-1
+- Updated to 2.3.14
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rakesh at fedoraproject.org  Fri Dec  4 03:23:27 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 03:23:27 +0000 (UTC)
Subject: File up-imapproxy-1.2.7rc3.tar.gz uploaded to lookaside cache by
	rakesh
Message-ID: <20091204032327.E35CC10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for up-imapproxy:

ec298d6404e02ffe73a0adbbed0b6d0e  up-imapproxy-1.2.7rc3.tar.gz



From rakesh at fedoraproject.org  Fri Dec  4 03:24:15 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 03:24:15 +0000 (UTC)
Subject: rpms/up-imapproxy/devel .cvsignore, 1.5, 1.6 import.log, 1.2,
	1.3 sources, 1.5, 1.6 up-imapproxy.spec, 1.18, 1.19
Message-ID: <20091204032415.7CC1F11C00D5@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/up-imapproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24032/devel

Modified Files:
	.cvsignore import.log sources up-imapproxy.spec 
Log Message:
Updated to 1.2.7rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Oct 2008 06:00:15 -0000	1.5
+++ .cvsignore	4 Dec 2009 03:24:15 -0000	1.6
@@ -1 +1 @@
-up-imapproxy-1.2.7rc1.tar.gz
+up-imapproxy-1.2.7rc3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 Oct 2008 06:00:15 -0000	1.2
+++ import.log	4 Dec 2009 03:24:15 -0000	1.3
@@ -1,2 +1,3 @@
 up-imapproxy-1_2_6-2_fc9:HEAD:up-imapproxy-1.2.6-2.fc9.src.rpm:1220190717
 up-imapproxy-1_2_7_rc1-1_fc10:HEAD:up-imapproxy-1.2.7.rc1-1.fc10.src.rpm:1224761054
+up-imapproxy-1_2_7-0_7_rc3_fc12:HEAD:up-imapproxy-1.2.7-0.7.rc3.fc12.src.rpm:1259896501


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Oct 2008 06:00:15 -0000	1.5
+++ sources	4 Dec 2009 03:24:15 -0000	1.6
@@ -1 +1 @@
-d2d045de8f25677f50bed3e6b8fb1e42  up-imapproxy-1.2.7rc1.tar.gz
+ec298d6404e02ffe73a0adbbed0b6d0e  up-imapproxy-1.2.7rc3.tar.gz


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- up-imapproxy.spec	21 Aug 2009 16:19:26 -0000	1.18
+++ up-imapproxy.spec	4 Dec 2009 03:24:15 -0000	1.19
@@ -1,11 +1,11 @@
 Name:           up-imapproxy
 Summary:        University of Pittsburgh IMAP Proxy
 Version:        1.2.7
-Release:        0.6.rc1%{?dist}
+Release:        0.7.rc3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 URL:            http://www.imapproxy.org
-Source0:        http://www.imapproxy.org/downloads/up-imapproxy-1.2.7rc1.tar.gz
+Source0:        http://www.imapproxy.org/downloads/up-imapproxy-1.2.7rc3.tar.gz
 Source1:        imapproxy.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel tcp_wrappers ncurses-devel
@@ -25,7 +25,7 @@ will determine if there's a cached conne
 if possible.
 
 %prep
-%setup -q -n %{name}-1.2.7rc1
+%setup -q -n %{name}-1.2.7rc3
 
 %build
 %configure
@@ -76,6 +76,9 @@ fi
 %{_sbindir}/*
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.7-0.7.rc3
+- Updated to 1.2.7-0.7.rc3
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.7-0.6.rc1
 - rebuilt with new openssl
 



From mclasen at fedoraproject.org  Fri Dec  4 03:37:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 03:37:42 +0000 (UTC)
Subject: rpms/eog/devel eog.spec,1.154,1.155
Message-ID: <20091204033742.9548F11C00D5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26623

Modified Files:
	eog.spec 
Log Message:
don't ship .la files



Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- eog.spec	1 Dec 2009 14:38:25 -0000	1.154
+++ eog.spec	4 Dec 2009 03:37:42 -0000	1.155
@@ -100,7 +100,7 @@ desktop-file-install --vendor gnome --de
 # grr, --disable-scrollkeeper seems broken
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/eog/plugins
+rm -rf $RPM_BUILD_ROOT%{_libdir}/eog/plugins/*.la
 
 # save space by linking identical images in translated docs
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}



From mclasen at fedoraproject.org  Fri Dec  4 03:43:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 03:43:47 +0000 (UTC)
Subject: rpms/eog/devel eog.spec,1.155,1.156
Message-ID: <20091204034347.DB95711C00D5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27957

Modified Files:
	eog.spec 
Log Message:
bump rev



Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- eog.spec	4 Dec 2009 03:37:42 -0000	1.155
+++ eog.spec	4 Dec 2009 03:43:47 -0000	1.156
@@ -12,7 +12,7 @@
 Summary: Eye of GNOME image viewer
 Name:    eog
 Version: 2.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.28/%{name}-%{version}.tar.bz2
 Patch0: libxml.patch
@@ -170,6 +170,9 @@ fi
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> 2.29.3-2
+- Don't ship .la files
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From mclasen at fedoraproject.org  Fri Dec  4 03:53:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 03:53:45 +0000 (UTC)
Subject: rpms/gedit/devel gedit.spec,1.207,1.208
Message-ID: <20091204035345.25ADC11C00D5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29934

Modified Files:
	gedit.spec 
Log Message:
don't ship .la files



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- gedit.spec	1 Dec 2009 16:48:30 -0000	1.207
+++ gedit.spec	4 Dec 2009 03:53:44 -0000	1.208
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.29.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -151,6 +151,7 @@ desktop-file-install --delete-original  
 ## clean up all the static libs for plugins (workaround for no -module)
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.a"`
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.la"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugin-loaders -name "*.la"`
 
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
@@ -230,6 +231,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.29.3-3
+- Don't ship .la files
+
 * Tue Dec  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 1:2.29.3-2
 - Rebase fix python path patch.
 



From mclasen at fedoraproject.org  Fri Dec  4 04:11:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 04:11:10 +0000 (UTC)
Subject: rpms/tsclient/devel tsclient.spec,1.46,1.47
Message-ID: <20091204041110.4E0FB11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tsclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25089

Modified Files:
	tsclient.spec 
Log Message:
don't ship .la files



Index: tsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- tsclient.spec	29 Aug 2009 14:16:32 -0000	1.46
+++ tsclient.spec	4 Dec 2009 04:11:09 -0000	1.47
@@ -8,7 +8,7 @@
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
 Version: 2.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://sourceforge.net/projects/tsclient
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
@@ -89,7 +89,7 @@ desktop-file-install --vendor tsclient -
   --remove-category Application                               \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
-rm -rf $RPM_BUILD_ROOT/usr/lib/tsclient/plugins/*.{a,la}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/tsclient/plugins/*.{a,la}
 
 %find_lang %{name}
 
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.2-6
+- Don't ship .la files
+
 * Sat Aug 29 2009 Caol?n McNamara <caolanm at redhat.com> - 2.0.2-5
 - Rebuild for dependencies
 



From emaldonado at fedoraproject.org  Fri Dec  4 04:20:19 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Dec 2009 04:20:19 +0000 (UTC)
Subject: rpms/nss/devel newargs.patch,1.1,NONE sysinit.patch,1.3,NONE
Message-ID: <20091204042019.9465511C03DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27059

Removed Files:
	newargs.patch sysinit.patch 
Log Message:
No longer needed with update to 3.12.5


--- newargs.patch DELETED ---


--- sysinit.patch DELETED ---



From emaldonado at fedoraproject.org  Fri Dec  4 04:22:50 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Dec 2009 04:22:50 +0000 (UTC)
Subject: rpms/nss/devel nss-sysinit.patch,NONE,1.1
Message-ID: <20091204042250.93E0411C00E0@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27594

Added Files:
	nss-sysinit.patch 
Log Message:
Patch manifest.man so nsssysint library is created and added missing #include

nss-sysinit.patch:
 manifest.mn   |    1 +
 nss/nssinit.c |    2 ++
 2 files changed, 3 insertions(+)

--- NEW FILE nss-sysinit.patch ---
Index: mozilla/security/nss/lib/manifest.mn
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/manifest.mn,v
retrieving revision 1.20
diff -u -p -r1.20 manifest.mn
--- mozilla/security/nss/lib/manifest.mn	7 Nov 2009 05:57:41 -0000	1.20
+++ mozilla/security/nss/lib/manifest.mn	4 Dec 2009 02:27:20 -0000
@@ -56,6 +56,7 @@ DIRS =  util freebl softoken \
 	pkcs12 pkcs7 smime \
 	crmf jar \
 	ckfw      \
+	sysinit \
 	$(NULL)
 
 #  fortcrypt  is no longer built
Index: mozilla/security/nss/lib/nss/nssinit.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/nss/nssinit.c,v
retrieving revision 1.103
diff -u -p -r1.103 nssinit.c
--- mozilla/security/nss/lib/nss/nssinit.c	29 Oct 2009 21:33:10 -0000	1.103
+++ mozilla/security/nss/lib/nss/nssinit.c	4 Dec 2009 01:25:06 -0000
@@ -52,6 +52,7 @@
 #include "secoid.h"
 #include "nss.h"
 #include "pk11func.h"
+#include "pk11priv.h"
 #include "secerr.h"
 #include "nssbase.h"
 #include "pkixt.h"
@@ -64,6 +65,7 @@
 #include "ocspti.h"
 #include "ocspi.h"
 
+
 /*
  * On Windows nss3.dll needs to export the symbol 'mktemp' to be
  * fully backward compatible with the nss3.dll in NSS 3.2.x and



From mkent at fedoraproject.org  Fri Dec  4 04:23:05 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri,  4 Dec 2009 04:23:05 +0000 (UTC)
Subject: File ruby_parser-2.0.4.gem uploaded to lookaside cache by mkent
Message-ID: <20091204042305.4188D10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rubygem-ruby_parser:

595afe36d992e34181a2f69b0cd41d54  ruby_parser-2.0.4.gem



From mkent at fedoraproject.org  Fri Dec  4 04:23:36 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri,  4 Dec 2009 04:23:36 +0000 (UTC)
Subject: rpms/rubygem-ruby_parser/devel import.log, NONE, 1.1 pt_testcase.rb,
	NONE, 1.1 rubygem-ruby_parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091204042336.06F6B11C00E0@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ruby_parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27868/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pt_testcase.rb rubygem-ruby_parser.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ruby_parser-2_0_4-3_fc13:HEAD:rubygem-ruby_parser-2.0.4-3.fc13.src.rpm:1259900271


--- NEW FILE pt_testcase.rb ---
$TESTING = true

require 'minitest/unit'
require 'sexp_processor' # for deep_clone

# key:
# wwtt = what were they thinking?

# TODO: <ko1_> 1.8.7 support {|&b|} syntax

class Examples
  attr_reader :reader
  attr_writer :writer

  def a_method(x); x+1; end
  alias an_alias a_method

  define_method(:bmethod_noargs) do
    x + 1
  end

  define_method(:unsplatted) do |x|
    x + 1
  end

  define_method :splatted do |*args|
    y = args.first
    y + 42
  end

  define_method :dmethod_added, instance_method(:a_method) if
    RUBY_VERSION < "1.9"
end

class ParseTreeTestCase < MiniTest::Unit::TestCase
  attr_accessor :processor # to be defined by subclass

  def setup
    super
    @processor = nil
  end

  def after_process_hook klass, node, data, input_name, output_name
  end

  def before_process_hook klass, node, data, input_name, output_name
  end

  def self.add_test name, data, klass = self.name[4..-1]
    name = name.to_s
    klass = klass.to_s

    if testcases.has_key? name then
      if testcases[name].has_key? klass then
        warn "testcase #{klass}##{name} already has data"
      else
        testcases[name][klass] = data
      end
    else
      warn "testcase #{name} does not exist"
    end
  end

  def self.add_tests name, hash
    name = name.to_s

    hash.each do |klass, data|
      warn "testcase #{klass}##{name} already has data" if
        testcases[name].has_key? klass
      testcases[name][klass] = data
    end
  end

  def self.clone_same
    @@testcases.each do |node, data|
      data.each do |key, val|
        if val == :same then
          prev_key = self.previous(key)
          data[key] = data[prev_key].deep_clone
        end
      end
    end
  end

  def self.copy_test_case nonverbose, klass
    verbose = nonverbose + "_mri_verbose_flag"
    testcases[verbose][klass] = testcases[nonverbose][klass]
  end

  def self.generate_test klass, node, data, input_name, output_name
    klass.send(:define_method, "test_#{node}".to_sym) do
      flunk "Processor is nil" if processor.nil?

      assert data.has_key?(input_name), "Unknown input data"
      assert data.has_key?(output_name), "Missing test data"

      $missing[node] << output_name unless data.has_key? output_name

      input    = data[input_name].deep_clone
      expected = data[output_name].deep_clone

      case expected
      when :unsupported then
        assert_raises(UnsupportedNodeError) do
          processor.process(input)
        end
      else
        extra_expected = []
        extra_input = []

        _, expected, extra_expected = *expected if
          Array === expected and expected.first == :defx
        _, input, extra_input = *input if
          Array === input and input.first == :defx

        # OMG... I can't believe I have to do this this way.  these
        # hooks are here instead of refactoring this define_method
        # body into an assertion. It'll allow subclasses to hook in
        # and add behavior before or after the processor does it's
        # thing. If you go the body refactor route, some of the
        # RawParseTree test casese fail for completely bogus reasons.

        before_process_hook klass, node, data, input_name, output_name
        refute_nil data[input_name], "testcase does not exist?"
        @result = processor.process input
        assert_equal(expected, @result,
                     "failed on input: #{data[input_name].inspect}")
        after_process_hook klass, node, data, input_name, output_name

        extra_input.each do |extra|
          processor.process(extra)
        end
        extra = processor.extra_methods rescue []
        assert_equal extra_expected, extra
      end
    end
  end

  def self.generate_tests klass
    install_missing_reporter
    clone_same

    output_name = klass.name.to_s.sub(/^Test/, '')

    input_name = self.previous(output_name)

    @@testcases.each do |node, data|
      next if [:skip, :unsupported].include? data[input_name]
      next if data[output_name] == :skip

      generate_test klass, node, data, input_name, output_name
    end
  end

  def self.inherited klass
    super

    generate_tests klass unless klass.name =~ /TestCase/
  end

  def self.install_missing_reporter
    unless defined? $missing then
      $missing = Hash.new { |h,k| h[k] = [] }
      at_exit {
        at_exit {
          warn ""
          $missing.sort.each do |name, klasses|
            warn "add_tests(#{name.inspect},"
            klasses.map! { |klass| "          #{klass.inspect} => :same" }
            warn klasses.join("\n") + ")"
          end
          warn ""
        }
      }
    end
  end

  def self.previous(key, extra=0) # FIX: remove R2C code
    idx = @@testcase_order.index(key)

    raise "Unknown class #{key} in @@testcase_order" if idx.nil?

    case key
    when "RubyToRubyC" then
      idx -= 1
    end
    @@testcase_order[idx - 1 - extra]
  end

  def self.testcase_order; @@testcase_order; end
  def self.testcases; @@testcases; end

  def self.unsupported_tests *tests
    tests.flatten.each do |name|
      add_test name, :unsupported
    end
  end

  ############################################################
[...4018 lines suppressed...]
  add_tests("unless_pre_not",
            "Ruby"         => "unless not b then a end",
            "RawParseTree" => [:if, [:vcall, :b], [:vcall, :a], nil],
            "ParseTree"    => s(:if, s(:call, nil, :b, s(:arglist)),
                                s(:call, nil, :a, s(:arglist)), nil),
            "Ruby2Ruby"    => "a if b")

  add_tests("until_post",
            "Ruby"         => "begin\n  (1 + 1)\nend until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("until_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend while true")

  add_tests("until_pre",
            "Ruby"         => "until false do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("until_pre_mod",
            "Ruby"         => "(1 + 1) until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until false do\n  (1 + 1)\nend")

  add_tests("until_pre_not",
            "Ruby"         => "until not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("until_pre_not_mod",
            "Ruby"         => "(1 + 1) until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("valias",
            "Ruby"         => "alias $y $x",
            "RawParseTree" => [:valias, :$y, :$x],
            "ParseTree"    => s(:valias, :$y, :$x))

  add_tests("vcall",
            "Ruby"         => "method",
            "RawParseTree" => [:vcall, :method],
            "ParseTree"    => s(:call, nil, :method, s(:arglist)))

  add_tests("while_post",
            "Ruby"         => "begin\n  (1 + 1)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("while_post2",
            "Ruby"         => "begin\n  (1 + 2)\n  (3 + 4)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:block,
                                [:call, [:lit, 1], :+, [:array, [:lit, 2]]],
                                [:call, [:lit, 3], :+, [:array, [:lit, 4]]]],
                               false],
            "ParseTree"    => s(:while, s(:false),
                                s(:block,
                                  s(:call, s(:lit, 1), :+,
                                    s(:arglist, s(:lit, 2))),
                                  s(:call, s(:lit, 3), :+,
                                    s(:arglist, s(:lit, 4)))),
                                false))

  add_tests("while_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend until true")

  add_tests("while_pre",
            "Ruby"         => "while false do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("while_pre_mod",
            "Ruby"         => "(1 + 1) while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while false do\n  (1 + 1)\nend") # FIX can be one liner

  add_tests("while_pre_nil",
            "Ruby"         => "while false do\nend",
            "RawParseTree" => [:while, [:false], nil, true],
            "ParseTree"    => s(:while, s(:false), nil, true))

  add_tests("while_pre_not",
            "Ruby"         => "while not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend")

  add_tests("while_pre_not_mod",
            "Ruby"         => "(1 + 1) while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend") # FIX

  add_tests("xstr",
            "Ruby"         => "`touch 5`",
            "RawParseTree" => [:xstr, 'touch 5'],
            "ParseTree"    => s(:xstr, 'touch 5'))

  add_tests("yield_0",
            "Ruby"         => "yield",
            "RawParseTree" => [:yield],
            "ParseTree"    => s(:yield))

  add_tests("yield_1",
            "Ruby"         => "yield(42)",
            "RawParseTree" => [:yield, [:lit, 42]],
            "ParseTree"    => s(:yield, s(:lit, 42)))

  add_tests("yield_array_0",
            "Ruby"         => "yield([])",
            "RawParseTree" => [:yield, [:zarray], true],
            "ParseTree"    => s(:yield, s(:array)))

  add_tests("yield_array_1",
            "Ruby"         => "yield([42])",
            "RawParseTree" => [:yield, [:array, [:lit, 42]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42))))

  add_tests("yield_array_n",
            "Ruby"         => "yield([42, 24])",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42), s(:lit, 24))))

  add_tests("yield_n",
            "Ruby"         => "yield(42, 24)",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]]],
            "ParseTree"    => s(:yield, s(:lit, 42), s(:lit, 24)))

  add_tests("zarray",
            "Ruby"         => "a = []",
            "RawParseTree" => [:lasgn, :a, [:zarray]],
            "ParseTree"    => s(:lasgn, :a, s(:array)))

  add_tests("zsuper",
            "Ruby"         => "def x\n  super\nend",
            "RawParseTree" => [:defn, :x,
                               [:scope, [:block, [:args], [:zsuper]]]],
            "ParseTree"    => s(:defn, :x, s(:args),
                                s(:scope, s(:block, s(:zsuper)))))
end


--- NEW FILE rubygem-ruby_parser.spec ---
# Generated from ruby_parser-2.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby_parser
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: A ruby parser written in pure ruby
Name: rubygem-%{gemname}
Version: 2.0.4
Release: 3%{?dist}
Group: Development/Languages
License: MIT
URL: http://parsetree.rubyforge.org/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
# These test cases are carried in the ParseTree gem in test/. Carry them here
# rather than attempting to install ParseTree-doc in check and introducing a circular
# dependency
Source1: pt_testcase.rb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygem(sexp_processor)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest), rubygem(sexp_processor)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
racc - which does by default use a C extension). RP's output is
the same as ParseTree's output: s-expressions using ruby's arrays and
base types.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

cp -p %{SOURCE1} $(pwd)/%{geminstdir}/test/

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway. One instance in lib as well
find %{buildroot}%{geminstdir}/{test,lib} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/bin -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/ruby_parse
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
# Script creates a circular dependency and is primarily for development
# Included, but it's dependencies aren't met.
#%{geminstdir}/lib/gauntlet_rubyparser.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/.autotest
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Nov 30 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-3
- Remove exclude for gauntlet_rubyparser.rb, let user deal with dependencies if
  they need it.

* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-2
- Move pt_testcase.rb to the build stage so it's included in the rpm (#541491).
- Drop version requirements for sexp_processor as it is a new package
  (#541491).
- Exclude gauntlet_rubyparser.rb as it introduces a circular dependency
  (#541491).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby_parser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:47:02 -0000	1.1
+++ .cvsignore	4 Dec 2009 04:23:35 -0000	1.2
@@ -0,0 +1 @@
+ruby_parser-2.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby_parser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:47:03 -0000	1.1
+++ sources	4 Dec 2009 04:23:35 -0000	1.2
@@ -0,0 +1 @@
+595afe36d992e34181a2f69b0cd41d54  ruby_parser-2.0.4.gem



From mkent at fedoraproject.org  Fri Dec  4 04:24:40 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri,  4 Dec 2009 04:24:40 +0000 (UTC)
Subject: rpms/rubygem-ruby_parser/F-11 import.log, NONE, 1.1 pt_testcase.rb, 
	NONE, 1.1 rubygem-ruby_parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091204042440.40A0F11C00E0@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ruby_parser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28297/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pt_testcase.rb rubygem-ruby_parser.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ruby_parser-2_0_4-3_fc13:F-11:rubygem-ruby_parser-2.0.4-3.fc13.src.rpm:1259900337


--- NEW FILE pt_testcase.rb ---
$TESTING = true

require 'minitest/unit'
require 'sexp_processor' # for deep_clone

# key:
# wwtt = what were they thinking?

# TODO: <ko1_> 1.8.7 support {|&b|} syntax

class Examples
  attr_reader :reader
  attr_writer :writer

  def a_method(x); x+1; end
  alias an_alias a_method

  define_method(:bmethod_noargs) do
    x + 1
  end

  define_method(:unsplatted) do |x|
    x + 1
  end

  define_method :splatted do |*args|
    y = args.first
    y + 42
  end

  define_method :dmethod_added, instance_method(:a_method) if
    RUBY_VERSION < "1.9"
end

class ParseTreeTestCase < MiniTest::Unit::TestCase
  attr_accessor :processor # to be defined by subclass

  def setup
    super
    @processor = nil
  end

  def after_process_hook klass, node, data, input_name, output_name
  end

  def before_process_hook klass, node, data, input_name, output_name
  end

  def self.add_test name, data, klass = self.name[4..-1]
    name = name.to_s
    klass = klass.to_s

    if testcases.has_key? name then
      if testcases[name].has_key? klass then
        warn "testcase #{klass}##{name} already has data"
      else
        testcases[name][klass] = data
      end
    else
      warn "testcase #{name} does not exist"
    end
  end

  def self.add_tests name, hash
    name = name.to_s

    hash.each do |klass, data|
      warn "testcase #{klass}##{name} already has data" if
        testcases[name].has_key? klass
      testcases[name][klass] = data
    end
  end

  def self.clone_same
    @@testcases.each do |node, data|
      data.each do |key, val|
        if val == :same then
          prev_key = self.previous(key)
          data[key] = data[prev_key].deep_clone
        end
      end
    end
  end

  def self.copy_test_case nonverbose, klass
    verbose = nonverbose + "_mri_verbose_flag"
    testcases[verbose][klass] = testcases[nonverbose][klass]
  end

  def self.generate_test klass, node, data, input_name, output_name
    klass.send(:define_method, "test_#{node}".to_sym) do
      flunk "Processor is nil" if processor.nil?

      assert data.has_key?(input_name), "Unknown input data"
      assert data.has_key?(output_name), "Missing test data"

      $missing[node] << output_name unless data.has_key? output_name

      input    = data[input_name].deep_clone
      expected = data[output_name].deep_clone

      case expected
      when :unsupported then
        assert_raises(UnsupportedNodeError) do
          processor.process(input)
        end
      else
        extra_expected = []
        extra_input = []

        _, expected, extra_expected = *expected if
          Array === expected and expected.first == :defx
        _, input, extra_input = *input if
          Array === input and input.first == :defx

        # OMG... I can't believe I have to do this this way.  these
        # hooks are here instead of refactoring this define_method
        # body into an assertion. It'll allow subclasses to hook in
        # and add behavior before or after the processor does it's
        # thing. If you go the body refactor route, some of the
        # RawParseTree test casese fail for completely bogus reasons.

        before_process_hook klass, node, data, input_name, output_name
        refute_nil data[input_name], "testcase does not exist?"
        @result = processor.process input
        assert_equal(expected, @result,
                     "failed on input: #{data[input_name].inspect}")
        after_process_hook klass, node, data, input_name, output_name

        extra_input.each do |extra|
          processor.process(extra)
        end
        extra = processor.extra_methods rescue []
        assert_equal extra_expected, extra
      end
    end
  end

  def self.generate_tests klass
    install_missing_reporter
    clone_same

    output_name = klass.name.to_s.sub(/^Test/, '')

    input_name = self.previous(output_name)

    @@testcases.each do |node, data|
      next if [:skip, :unsupported].include? data[input_name]
      next if data[output_name] == :skip

      generate_test klass, node, data, input_name, output_name
    end
  end

  def self.inherited klass
    super

    generate_tests klass unless klass.name =~ /TestCase/
  end

  def self.install_missing_reporter
    unless defined? $missing then
      $missing = Hash.new { |h,k| h[k] = [] }
      at_exit {
        at_exit {
          warn ""
          $missing.sort.each do |name, klasses|
            warn "add_tests(#{name.inspect},"
            klasses.map! { |klass| "          #{klass.inspect} => :same" }
            warn klasses.join("\n") + ")"
          end
          warn ""
        }
      }
    end
  end

  def self.previous(key, extra=0) # FIX: remove R2C code
    idx = @@testcase_order.index(key)

    raise "Unknown class #{key} in @@testcase_order" if idx.nil?

    case key
    when "RubyToRubyC" then
      idx -= 1
    end
    @@testcase_order[idx - 1 - extra]
  end

  def self.testcase_order; @@testcase_order; end
  def self.testcases; @@testcases; end

  def self.unsupported_tests *tests
    tests.flatten.each do |name|
      add_test name, :unsupported
    end
  end

  ############################################################
[...4018 lines suppressed...]
  add_tests("unless_pre_not",
            "Ruby"         => "unless not b then a end",
            "RawParseTree" => [:if, [:vcall, :b], [:vcall, :a], nil],
            "ParseTree"    => s(:if, s(:call, nil, :b, s(:arglist)),
                                s(:call, nil, :a, s(:arglist)), nil),
            "Ruby2Ruby"    => "a if b")

  add_tests("until_post",
            "Ruby"         => "begin\n  (1 + 1)\nend until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("until_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend while true")

  add_tests("until_pre",
            "Ruby"         => "until false do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("until_pre_mod",
            "Ruby"         => "(1 + 1) until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until false do\n  (1 + 1)\nend")

  add_tests("until_pre_not",
            "Ruby"         => "until not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("until_pre_not_mod",
            "Ruby"         => "(1 + 1) until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("valias",
            "Ruby"         => "alias $y $x",
            "RawParseTree" => [:valias, :$y, :$x],
            "ParseTree"    => s(:valias, :$y, :$x))

  add_tests("vcall",
            "Ruby"         => "method",
            "RawParseTree" => [:vcall, :method],
            "ParseTree"    => s(:call, nil, :method, s(:arglist)))

  add_tests("while_post",
            "Ruby"         => "begin\n  (1 + 1)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("while_post2",
            "Ruby"         => "begin\n  (1 + 2)\n  (3 + 4)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:block,
                                [:call, [:lit, 1], :+, [:array, [:lit, 2]]],
                                [:call, [:lit, 3], :+, [:array, [:lit, 4]]]],
                               false],
            "ParseTree"    => s(:while, s(:false),
                                s(:block,
                                  s(:call, s(:lit, 1), :+,
                                    s(:arglist, s(:lit, 2))),
                                  s(:call, s(:lit, 3), :+,
                                    s(:arglist, s(:lit, 4)))),
                                false))

  add_tests("while_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend until true")

  add_tests("while_pre",
            "Ruby"         => "while false do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("while_pre_mod",
            "Ruby"         => "(1 + 1) while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while false do\n  (1 + 1)\nend") # FIX can be one liner

  add_tests("while_pre_nil",
            "Ruby"         => "while false do\nend",
            "RawParseTree" => [:while, [:false], nil, true],
            "ParseTree"    => s(:while, s(:false), nil, true))

  add_tests("while_pre_not",
            "Ruby"         => "while not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend")

  add_tests("while_pre_not_mod",
            "Ruby"         => "(1 + 1) while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend") # FIX

  add_tests("xstr",
            "Ruby"         => "`touch 5`",
            "RawParseTree" => [:xstr, 'touch 5'],
            "ParseTree"    => s(:xstr, 'touch 5'))

  add_tests("yield_0",
            "Ruby"         => "yield",
            "RawParseTree" => [:yield],
            "ParseTree"    => s(:yield))

  add_tests("yield_1",
            "Ruby"         => "yield(42)",
            "RawParseTree" => [:yield, [:lit, 42]],
            "ParseTree"    => s(:yield, s(:lit, 42)))

  add_tests("yield_array_0",
            "Ruby"         => "yield([])",
            "RawParseTree" => [:yield, [:zarray], true],
            "ParseTree"    => s(:yield, s(:array)))

  add_tests("yield_array_1",
            "Ruby"         => "yield([42])",
            "RawParseTree" => [:yield, [:array, [:lit, 42]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42))))

  add_tests("yield_array_n",
            "Ruby"         => "yield([42, 24])",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42), s(:lit, 24))))

  add_tests("yield_n",
            "Ruby"         => "yield(42, 24)",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]]],
            "ParseTree"    => s(:yield, s(:lit, 42), s(:lit, 24)))

  add_tests("zarray",
            "Ruby"         => "a = []",
            "RawParseTree" => [:lasgn, :a, [:zarray]],
            "ParseTree"    => s(:lasgn, :a, s(:array)))

  add_tests("zsuper",
            "Ruby"         => "def x\n  super\nend",
            "RawParseTree" => [:defn, :x,
                               [:scope, [:block, [:args], [:zsuper]]]],
            "ParseTree"    => s(:defn, :x, s(:args),
                                s(:scope, s(:block, s(:zsuper)))))
end


--- NEW FILE rubygem-ruby_parser.spec ---
# Generated from ruby_parser-2.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby_parser
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: A ruby parser written in pure ruby
Name: rubygem-%{gemname}
Version: 2.0.4
Release: 3%{?dist}
Group: Development/Languages
License: MIT
URL: http://parsetree.rubyforge.org/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
# These test cases are carried in the ParseTree gem in test/. Carry them here
# rather than attempting to install ParseTree-doc in check and introducing a circular
# dependency
Source1: pt_testcase.rb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygem(sexp_processor)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest), rubygem(sexp_processor)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
racc - which does by default use a C extension). RP's output is
the same as ParseTree's output: s-expressions using ruby's arrays and
base types.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

cp -p %{SOURCE1} $(pwd)/%{geminstdir}/test/

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway. One instance in lib as well
find %{buildroot}%{geminstdir}/{test,lib} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/bin -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/ruby_parse
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
# Script creates a circular dependency and is primarily for development
# Included, but it's dependencies aren't met.
#%{geminstdir}/lib/gauntlet_rubyparser.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/.autotest
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Nov 30 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-3
- Remove exclude for gauntlet_rubyparser.rb, let user deal with dependencies if
  they need it.

* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-2
- Move pt_testcase.rb to the build stage so it's included in the rpm (#541491).
- Drop version requirements for sexp_processor as it is a new package
  (#541491).
- Exclude gauntlet_rubyparser.rb as it introduces a circular dependency
  (#541491).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby_parser/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:47:02 -0000	1.1
+++ .cvsignore	4 Dec 2009 04:24:39 -0000	1.2
@@ -0,0 +1 @@
+ruby_parser-2.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby_parser/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:47:03 -0000	1.1
+++ sources	4 Dec 2009 04:24:40 -0000	1.2
@@ -0,0 +1 @@
+595afe36d992e34181a2f69b0cd41d54  ruby_parser-2.0.4.gem



From emaldonado at fedoraproject.org  Fri Dec  4 04:24:51 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Dec 2009 04:24:51 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.125,1.126
Message-ID: <20091204042451.91B5711C00E0@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28419

Modified Files:
	nss.spec 
Log Message:
Update to 3.12.5


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- nss.spec	3 Dec 2009 22:13:38 -0000	1.125
+++ nss.spec	4 Dec 2009 04:24:51 -0000	1.126
@@ -14,9 +14,10 @@ Group:            System Environment/Lib
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-util >= %{nss_util_version}
 Requires:         nss-softokn%{_isa} = %{nss_softokn_fips_version}
+Requires:         nss-system-init
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-softokn-devel >= %{version}                                                  
+BuildRequires:    nss-softokn-devel = %{nss_softokn_version}                                                  
 BuildRequires:    nss-util-devel >= %{nss_util_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
@@ -41,6 +42,7 @@ Source12:         %{name}-pem-20090907.t
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           533125-ammend.patch
+Patch8:           nss-sysinit.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -68,7 +70,7 @@ manipulate the NSS certificate and key d
 %package sysinit
 Summary:          System NSS Initilization
 Group:            System Environment/Base
-Provides:         nss-sysinit = %{version}-%{release}
+Provides:         nss-system-init
 Requires:         nss = %{version}-%{release}
 
 %description sysinit
@@ -107,6 +109,7 @@ low level services.
 %patch2 -p0
 %patch6 -p0 -b .libpem
 %patch7 -p0 -b .533125-ammend
+%patch8 -p0 -b .sysinit
 
 %build
 
@@ -136,8 +139,8 @@ export NSPR_LIB_DIR
 NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
 NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss-util | sed 's/-L//'`
 
-export NSS_INCLUDE_DIR
-export NSS_LIB_DIR
+#export NSS_INCLUDE_DIR
+#export NSS_LIB_DIR
 
 %ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1



From mkent at fedoraproject.org  Fri Dec  4 04:25:33 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri,  4 Dec 2009 04:25:33 +0000 (UTC)
Subject: rpms/rubygem-ruby_parser/F-12 import.log, NONE, 1.1 pt_testcase.rb, 
	NONE, 1.1 rubygem-ruby_parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091204042533.CCCE711C00E0@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ruby_parser/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28659/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pt_testcase.rb rubygem-ruby_parser.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ruby_parser-2_0_4-3_fc13:F-12:rubygem-ruby_parser-2.0.4-3.fc13.src.rpm:1259900394


--- NEW FILE pt_testcase.rb ---
$TESTING = true

require 'minitest/unit'
require 'sexp_processor' # for deep_clone

# key:
# wwtt = what were they thinking?

# TODO: <ko1_> 1.8.7 support {|&b|} syntax

class Examples
  attr_reader :reader
  attr_writer :writer

  def a_method(x); x+1; end
  alias an_alias a_method

  define_method(:bmethod_noargs) do
    x + 1
  end

  define_method(:unsplatted) do |x|
    x + 1
  end

  define_method :splatted do |*args|
    y = args.first
    y + 42
  end

  define_method :dmethod_added, instance_method(:a_method) if
    RUBY_VERSION < "1.9"
end

class ParseTreeTestCase < MiniTest::Unit::TestCase
  attr_accessor :processor # to be defined by subclass

  def setup
    super
    @processor = nil
  end

  def after_process_hook klass, node, data, input_name, output_name
  end

  def before_process_hook klass, node, data, input_name, output_name
  end

  def self.add_test name, data, klass = self.name[4..-1]
    name = name.to_s
    klass = klass.to_s

    if testcases.has_key? name then
      if testcases[name].has_key? klass then
        warn "testcase #{klass}##{name} already has data"
      else
        testcases[name][klass] = data
      end
    else
      warn "testcase #{name} does not exist"
    end
  end

  def self.add_tests name, hash
    name = name.to_s

    hash.each do |klass, data|
      warn "testcase #{klass}##{name} already has data" if
        testcases[name].has_key? klass
      testcases[name][klass] = data
    end
  end

  def self.clone_same
    @@testcases.each do |node, data|
      data.each do |key, val|
        if val == :same then
          prev_key = self.previous(key)
          data[key] = data[prev_key].deep_clone
        end
      end
    end
  end

  def self.copy_test_case nonverbose, klass
    verbose = nonverbose + "_mri_verbose_flag"
    testcases[verbose][klass] = testcases[nonverbose][klass]
  end

  def self.generate_test klass, node, data, input_name, output_name
    klass.send(:define_method, "test_#{node}".to_sym) do
      flunk "Processor is nil" if processor.nil?

      assert data.has_key?(input_name), "Unknown input data"
      assert data.has_key?(output_name), "Missing test data"

      $missing[node] << output_name unless data.has_key? output_name

      input    = data[input_name].deep_clone
      expected = data[output_name].deep_clone

      case expected
      when :unsupported then
        assert_raises(UnsupportedNodeError) do
          processor.process(input)
        end
      else
        extra_expected = []
        extra_input = []

        _, expected, extra_expected = *expected if
          Array === expected and expected.first == :defx
        _, input, extra_input = *input if
          Array === input and input.first == :defx

        # OMG... I can't believe I have to do this this way.  these
        # hooks are here instead of refactoring this define_method
        # body into an assertion. It'll allow subclasses to hook in
        # and add behavior before or after the processor does it's
        # thing. If you go the body refactor route, some of the
        # RawParseTree test casese fail for completely bogus reasons.

        before_process_hook klass, node, data, input_name, output_name
        refute_nil data[input_name], "testcase does not exist?"
        @result = processor.process input
        assert_equal(expected, @result,
                     "failed on input: #{data[input_name].inspect}")
        after_process_hook klass, node, data, input_name, output_name

        extra_input.each do |extra|
          processor.process(extra)
        end
        extra = processor.extra_methods rescue []
        assert_equal extra_expected, extra
      end
    end
  end

  def self.generate_tests klass
    install_missing_reporter
    clone_same

    output_name = klass.name.to_s.sub(/^Test/, '')

    input_name = self.previous(output_name)

    @@testcases.each do |node, data|
      next if [:skip, :unsupported].include? data[input_name]
      next if data[output_name] == :skip

      generate_test klass, node, data, input_name, output_name
    end
  end

  def self.inherited klass
    super

    generate_tests klass unless klass.name =~ /TestCase/
  end

  def self.install_missing_reporter
    unless defined? $missing then
      $missing = Hash.new { |h,k| h[k] = [] }
      at_exit {
        at_exit {
          warn ""
          $missing.sort.each do |name, klasses|
            warn "add_tests(#{name.inspect},"
            klasses.map! { |klass| "          #{klass.inspect} => :same" }
            warn klasses.join("\n") + ")"
          end
          warn ""
        }
      }
    end
  end

  def self.previous(key, extra=0) # FIX: remove R2C code
    idx = @@testcase_order.index(key)

    raise "Unknown class #{key} in @@testcase_order" if idx.nil?

    case key
    when "RubyToRubyC" then
      idx -= 1
    end
    @@testcase_order[idx - 1 - extra]
  end

  def self.testcase_order; @@testcase_order; end
  def self.testcases; @@testcases; end

  def self.unsupported_tests *tests
    tests.flatten.each do |name|
      add_test name, :unsupported
    end
  end

  ############################################################
[...4018 lines suppressed...]
  add_tests("unless_pre_not",
            "Ruby"         => "unless not b then a end",
            "RawParseTree" => [:if, [:vcall, :b], [:vcall, :a], nil],
            "ParseTree"    => s(:if, s(:call, nil, :b, s(:arglist)),
                                s(:call, nil, :a, s(:arglist)), nil),
            "Ruby2Ruby"    => "a if b")

  add_tests("until_post",
            "Ruby"         => "begin\n  (1 + 1)\nend until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("until_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend while true")

  add_tests("until_pre",
            "Ruby"         => "until false do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("until_pre_mod",
            "Ruby"         => "(1 + 1) until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until false do\n  (1 + 1)\nend")

  add_tests("until_pre_not",
            "Ruby"         => "until not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("until_pre_not_mod",
            "Ruby"         => "(1 + 1) until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("valias",
            "Ruby"         => "alias $y $x",
            "RawParseTree" => [:valias, :$y, :$x],
            "ParseTree"    => s(:valias, :$y, :$x))

  add_tests("vcall",
            "Ruby"         => "method",
            "RawParseTree" => [:vcall, :method],
            "ParseTree"    => s(:call, nil, :method, s(:arglist)))

  add_tests("while_post",
            "Ruby"         => "begin\n  (1 + 1)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("while_post2",
            "Ruby"         => "begin\n  (1 + 2)\n  (3 + 4)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:block,
                                [:call, [:lit, 1], :+, [:array, [:lit, 2]]],
                                [:call, [:lit, 3], :+, [:array, [:lit, 4]]]],
                               false],
            "ParseTree"    => s(:while, s(:false),
                                s(:block,
                                  s(:call, s(:lit, 1), :+,
                                    s(:arglist, s(:lit, 2))),
                                  s(:call, s(:lit, 3), :+,
                                    s(:arglist, s(:lit, 4)))),
                                false))

  add_tests("while_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend until true")

  add_tests("while_pre",
            "Ruby"         => "while false do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("while_pre_mod",
            "Ruby"         => "(1 + 1) while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while false do\n  (1 + 1)\nend") # FIX can be one liner

  add_tests("while_pre_nil",
            "Ruby"         => "while false do\nend",
            "RawParseTree" => [:while, [:false], nil, true],
            "ParseTree"    => s(:while, s(:false), nil, true))

  add_tests("while_pre_not",
            "Ruby"         => "while not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend")

  add_tests("while_pre_not_mod",
            "Ruby"         => "(1 + 1) while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend") # FIX

  add_tests("xstr",
            "Ruby"         => "`touch 5`",
            "RawParseTree" => [:xstr, 'touch 5'],
            "ParseTree"    => s(:xstr, 'touch 5'))

  add_tests("yield_0",
            "Ruby"         => "yield",
            "RawParseTree" => [:yield],
            "ParseTree"    => s(:yield))

  add_tests("yield_1",
            "Ruby"         => "yield(42)",
            "RawParseTree" => [:yield, [:lit, 42]],
            "ParseTree"    => s(:yield, s(:lit, 42)))

  add_tests("yield_array_0",
            "Ruby"         => "yield([])",
            "RawParseTree" => [:yield, [:zarray], true],
            "ParseTree"    => s(:yield, s(:array)))

  add_tests("yield_array_1",
            "Ruby"         => "yield([42])",
            "RawParseTree" => [:yield, [:array, [:lit, 42]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42))))

  add_tests("yield_array_n",
            "Ruby"         => "yield([42, 24])",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42), s(:lit, 24))))

  add_tests("yield_n",
            "Ruby"         => "yield(42, 24)",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]]],
            "ParseTree"    => s(:yield, s(:lit, 42), s(:lit, 24)))

  add_tests("zarray",
            "Ruby"         => "a = []",
            "RawParseTree" => [:lasgn, :a, [:zarray]],
            "ParseTree"    => s(:lasgn, :a, s(:array)))

  add_tests("zsuper",
            "Ruby"         => "def x\n  super\nend",
            "RawParseTree" => [:defn, :x,
                               [:scope, [:block, [:args], [:zsuper]]]],
            "ParseTree"    => s(:defn, :x, s(:args),
                                s(:scope, s(:block, s(:zsuper)))))
end


--- NEW FILE rubygem-ruby_parser.spec ---
# Generated from ruby_parser-2.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby_parser
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: A ruby parser written in pure ruby
Name: rubygem-%{gemname}
Version: 2.0.4
Release: 3%{?dist}
Group: Development/Languages
License: MIT
URL: http://parsetree.rubyforge.org/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
# These test cases are carried in the ParseTree gem in test/. Carry them here
# rather than attempting to install ParseTree-doc in check and introducing a circular
# dependency
Source1: pt_testcase.rb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygem(sexp_processor)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest), rubygem(sexp_processor)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
racc - which does by default use a C extension). RP's output is
the same as ParseTree's output: s-expressions using ruby's arrays and
base types.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

cp -p %{SOURCE1} $(pwd)/%{geminstdir}/test/

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway. One instance in lib as well
find %{buildroot}%{geminstdir}/{test,lib} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/bin -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/ruby_parse
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
# Script creates a circular dependency and is primarily for development
# Included, but it's dependencies aren't met.
#%{geminstdir}/lib/gauntlet_rubyparser.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/.autotest
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Nov 30 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-3
- Remove exclude for gauntlet_rubyparser.rb, let user deal with dependencies if
  they need it.

* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-2
- Move pt_testcase.rb to the build stage so it's included in the rpm (#541491).
- Drop version requirements for sexp_processor as it is a new package
  (#541491).
- Exclude gauntlet_rubyparser.rb as it introduces a circular dependency
  (#541491).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 2.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby_parser/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:47:02 -0000	1.1
+++ .cvsignore	4 Dec 2009 04:25:33 -0000	1.2
@@ -0,0 +1 @@
+ruby_parser-2.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby_parser/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:47:03 -0000	1.1
+++ sources	4 Dec 2009 04:25:33 -0000	1.2
@@ -0,0 +1 @@
+595afe36d992e34181a2f69b0cd41d54  ruby_parser-2.0.4.gem



From mkent at fedoraproject.org  Fri Dec  4 04:27:48 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri,  4 Dec 2009 04:27:48 +0000 (UTC)
Subject: File ruby2ruby-1.2.4.gem uploaded to lookaside cache by mkent
Message-ID: <20091204042748.D03FB10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rubygem-ruby2ruby:

30cfdb7213e23639a4139a78308206ea  ruby2ruby-1.2.4.gem



From mkent at fedoraproject.org  Fri Dec  4 04:28:15 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri,  4 Dec 2009 04:28:15 +0000 (UTC)
Subject: rpms/rubygem-ruby2ruby/devel import.log, NONE, 1.1 pt_testcase.rb, 
	NONE, 1.1 rubygem-ruby2ruby.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091204042815.4EBA011C00E0@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ruby2ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29601/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pt_testcase.rb rubygem-ruby2ruby.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ruby2ruby-1_2_4-2_fc13:HEAD:rubygem-ruby2ruby-1.2.4-2.fc13.src.rpm:1259900554


--- NEW FILE pt_testcase.rb ---
$TESTING = true

require 'minitest/unit'
require 'sexp_processor' # for deep_clone

# key:
# wwtt = what were they thinking?

# TODO: <ko1_> 1.8.7 support {|&b|} syntax

class Examples
  attr_reader :reader
  attr_writer :writer

  def a_method(x); x+1; end
  alias an_alias a_method

  define_method(:bmethod_noargs) do
    x + 1
  end

  define_method(:unsplatted) do |x|
    x + 1
  end

  define_method :splatted do |*args|
    y = args.first
    y + 42
  end

  define_method :dmethod_added, instance_method(:a_method) if
    RUBY_VERSION < "1.9"
end

class ParseTreeTestCase < MiniTest::Unit::TestCase
  attr_accessor :processor # to be defined by subclass

  def setup
    super
    @processor = nil
  end

  def after_process_hook klass, node, data, input_name, output_name
  end

  def before_process_hook klass, node, data, input_name, output_name
  end

  def self.add_test name, data, klass = self.name[4..-1]
    name = name.to_s
    klass = klass.to_s

    if testcases.has_key? name then
      if testcases[name].has_key? klass then
        warn "testcase #{klass}##{name} already has data"
      else
        testcases[name][klass] = data
      end
    else
      warn "testcase #{name} does not exist"
    end
  end

  def self.add_tests name, hash
    name = name.to_s

    hash.each do |klass, data|
      warn "testcase #{klass}##{name} already has data" if
        testcases[name].has_key? klass
      testcases[name][klass] = data
    end
  end

  def self.clone_same
    @@testcases.each do |node, data|
      data.each do |key, val|
        if val == :same then
          prev_key = self.previous(key)
          data[key] = data[prev_key].deep_clone
        end
      end
    end
  end

  def self.copy_test_case nonverbose, klass
    verbose = nonverbose + "_mri_verbose_flag"
    testcases[verbose][klass] = testcases[nonverbose][klass]
  end

  def self.generate_test klass, node, data, input_name, output_name
    klass.send(:define_method, "test_#{node}".to_sym) do
      flunk "Processor is nil" if processor.nil?

      assert data.has_key?(input_name), "Unknown input data"
      assert data.has_key?(output_name), "Missing test data"

      $missing[node] << output_name unless data.has_key? output_name

      input    = data[input_name].deep_clone
      expected = data[output_name].deep_clone

      case expected
      when :unsupported then
        assert_raises(UnsupportedNodeError) do
          processor.process(input)
        end
      else
        extra_expected = []
        extra_input = []

        _, expected, extra_expected = *expected if
          Array === expected and expected.first == :defx
        _, input, extra_input = *input if
          Array === input and input.first == :defx

        # OMG... I can't believe I have to do this this way.  these
        # hooks are here instead of refactoring this define_method
        # body into an assertion. It'll allow subclasses to hook in
        # and add behavior before or after the processor does it's
        # thing. If you go the body refactor route, some of the
        # RawParseTree test casese fail for completely bogus reasons.

        before_process_hook klass, node, data, input_name, output_name
        refute_nil data[input_name], "testcase does not exist?"
        @result = processor.process input
        assert_equal(expected, @result,
                     "failed on input: #{data[input_name].inspect}")
        after_process_hook klass, node, data, input_name, output_name

        extra_input.each do |extra|
          processor.process(extra)
        end
        extra = processor.extra_methods rescue []
        assert_equal extra_expected, extra
      end
    end
  end

  def self.generate_tests klass
    install_missing_reporter
    clone_same

    output_name = klass.name.to_s.sub(/^Test/, '')

    input_name = self.previous(output_name)

    @@testcases.each do |node, data|
      next if [:skip, :unsupported].include? data[input_name]
      next if data[output_name] == :skip

      generate_test klass, node, data, input_name, output_name
    end
  end

  def self.inherited klass
    super

    generate_tests klass unless klass.name =~ /TestCase/
  end

  def self.install_missing_reporter
    unless defined? $missing then
      $missing = Hash.new { |h,k| h[k] = [] }
      at_exit {
        at_exit {
          warn ""
          $missing.sort.each do |name, klasses|
            warn "add_tests(#{name.inspect},"
            klasses.map! { |klass| "          #{klass.inspect} => :same" }
            warn klasses.join("\n") + ")"
          end
          warn ""
        }
      }
    end
  end

  def self.previous(key, extra=0) # FIX: remove R2C code
    idx = @@testcase_order.index(key)

    raise "Unknown class #{key} in @@testcase_order" if idx.nil?

    case key
    when "RubyToRubyC" then
      idx -= 1
    end
    @@testcase_order[idx - 1 - extra]
  end

  def self.testcase_order; @@testcase_order; end
  def self.testcases; @@testcases; end

  def self.unsupported_tests *tests
    tests.flatten.each do |name|
      add_test name, :unsupported
    end
  end

  ############################################################
[...4018 lines suppressed...]
  add_tests("unless_pre_not",
            "Ruby"         => "unless not b then a end",
            "RawParseTree" => [:if, [:vcall, :b], [:vcall, :a], nil],
            "ParseTree"    => s(:if, s(:call, nil, :b, s(:arglist)),
                                s(:call, nil, :a, s(:arglist)), nil),
            "Ruby2Ruby"    => "a if b")

  add_tests("until_post",
            "Ruby"         => "begin\n  (1 + 1)\nend until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("until_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend while true")

  add_tests("until_pre",
            "Ruby"         => "until false do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("until_pre_mod",
            "Ruby"         => "(1 + 1) until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until false do\n  (1 + 1)\nend")

  add_tests("until_pre_not",
            "Ruby"         => "until not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("until_pre_not_mod",
            "Ruby"         => "(1 + 1) until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("valias",
            "Ruby"         => "alias $y $x",
            "RawParseTree" => [:valias, :$y, :$x],
            "ParseTree"    => s(:valias, :$y, :$x))

  add_tests("vcall",
            "Ruby"         => "method",
            "RawParseTree" => [:vcall, :method],
            "ParseTree"    => s(:call, nil, :method, s(:arglist)))

  add_tests("while_post",
            "Ruby"         => "begin\n  (1 + 1)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("while_post2",
            "Ruby"         => "begin\n  (1 + 2)\n  (3 + 4)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:block,
                                [:call, [:lit, 1], :+, [:array, [:lit, 2]]],
                                [:call, [:lit, 3], :+, [:array, [:lit, 4]]]],
                               false],
            "ParseTree"    => s(:while, s(:false),
                                s(:block,
                                  s(:call, s(:lit, 1), :+,
                                    s(:arglist, s(:lit, 2))),
                                  s(:call, s(:lit, 3), :+,
                                    s(:arglist, s(:lit, 4)))),
                                false))

  add_tests("while_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend until true")

  add_tests("while_pre",
            "Ruby"         => "while false do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("while_pre_mod",
            "Ruby"         => "(1 + 1) while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while false do\n  (1 + 1)\nend") # FIX can be one liner

  add_tests("while_pre_nil",
            "Ruby"         => "while false do\nend",
            "RawParseTree" => [:while, [:false], nil, true],
            "ParseTree"    => s(:while, s(:false), nil, true))

  add_tests("while_pre_not",
            "Ruby"         => "while not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend")

  add_tests("while_pre_not_mod",
            "Ruby"         => "(1 + 1) while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend") # FIX

  add_tests("xstr",
            "Ruby"         => "`touch 5`",
            "RawParseTree" => [:xstr, 'touch 5'],
            "ParseTree"    => s(:xstr, 'touch 5'))

  add_tests("yield_0",
            "Ruby"         => "yield",
            "RawParseTree" => [:yield],
            "ParseTree"    => s(:yield))

  add_tests("yield_1",
            "Ruby"         => "yield(42)",
            "RawParseTree" => [:yield, [:lit, 42]],
            "ParseTree"    => s(:yield, s(:lit, 42)))

  add_tests("yield_array_0",
            "Ruby"         => "yield([])",
            "RawParseTree" => [:yield, [:zarray], true],
            "ParseTree"    => s(:yield, s(:array)))

  add_tests("yield_array_1",
            "Ruby"         => "yield([42])",
            "RawParseTree" => [:yield, [:array, [:lit, 42]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42))))

  add_tests("yield_array_n",
            "Ruby"         => "yield([42, 24])",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42), s(:lit, 24))))

  add_tests("yield_n",
            "Ruby"         => "yield(42, 24)",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]]],
            "ParseTree"    => s(:yield, s(:lit, 42), s(:lit, 24)))

  add_tests("zarray",
            "Ruby"         => "a = []",
            "RawParseTree" => [:lasgn, :a, [:zarray]],
            "ParseTree"    => s(:lasgn, :a, s(:array)))

  add_tests("zsuper",
            "Ruby"         => "def x\n  super\nend",
            "RawParseTree" => [:defn, :x,
                               [:scope, [:block, [:args], [:zsuper]]]],
            "ParseTree"    => s(:defn, :x, s(:args),
                                s(:scope, s(:block, s(:zsuper)))))
end


--- NEW FILE rubygem-ruby2ruby.spec ---
# Generated from ruby2ruby-1.2.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby2ruby
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Generate pure ruby from RubyParser compatible Sexps
Name: rubygem-%{gemname}
Version: 1.2.4
Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://seattlerb.rubyforge.org/ruby2ruby/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
# These test cases are carried in the ParseTree gem in test/. Carry them here
# rather than attempting to install ParseTree-doc in check and introducing a circular
# dependency
Source1: pt_testcase.rb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygem(sexp_processor)
Requires: rubygem(ruby_parser)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest)
BuildRequires(check): rubygem(sexp_processor), rubygem(ruby_parser)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ruby2ruby provides a means of generating pure ruby code easily from
RubyParser compatible Sexps. This makes making dynamic language
processors in ruby easier than ever!

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

cp -p %{SOURCE1} $(pwd)/%{geminstdir}/test/

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway.
find %{buildroot}%{geminstdir}/test -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
find %{buildroot}%{geminstdir}/lib -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/bin\/env.*/d'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/bin -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/r2r_show
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/.autotest
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 1.2.4-2
- Move pt_testcase.rb to the build stage so it's included in the rpm (#541512).
- Drop version requirements for sexp_processor and ruby_parser as they are new
  packages (#541512).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 1.2.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby2ruby/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:38:47 -0000	1.1
+++ .cvsignore	4 Dec 2009 04:28:14 -0000	1.2
@@ -0,0 +1 @@
+ruby2ruby-1.2.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby2ruby/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:38:47 -0000	1.1
+++ sources	4 Dec 2009 04:28:14 -0000	1.2
@@ -0,0 +1 @@
+30cfdb7213e23639a4139a78308206ea  ruby2ruby-1.2.4.gem



From mkent at fedoraproject.org  Fri Dec  4 04:29:12 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri,  4 Dec 2009 04:29:12 +0000 (UTC)
Subject: rpms/rubygem-ruby2ruby/F-11 import.log, NONE, 1.1 pt_testcase.rb,
	NONE, 1.1 rubygem-ruby2ruby.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091204042912.6CCF711C00E0@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ruby2ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29994/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pt_testcase.rb rubygem-ruby2ruby.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ruby2ruby-1_2_4-2_fc13:F-11:rubygem-ruby2ruby-1.2.4-2.fc13.src.rpm:1259900613


--- NEW FILE pt_testcase.rb ---
$TESTING = true

require 'minitest/unit'
require 'sexp_processor' # for deep_clone

# key:
# wwtt = what were they thinking?

# TODO: <ko1_> 1.8.7 support {|&b|} syntax

class Examples
  attr_reader :reader
  attr_writer :writer

  def a_method(x); x+1; end
  alias an_alias a_method

  define_method(:bmethod_noargs) do
    x + 1
  end

  define_method(:unsplatted) do |x|
    x + 1
  end

  define_method :splatted do |*args|
    y = args.first
    y + 42
  end

  define_method :dmethod_added, instance_method(:a_method) if
    RUBY_VERSION < "1.9"
end

class ParseTreeTestCase < MiniTest::Unit::TestCase
  attr_accessor :processor # to be defined by subclass

  def setup
    super
    @processor = nil
  end

  def after_process_hook klass, node, data, input_name, output_name
  end

  def before_process_hook klass, node, data, input_name, output_name
  end

  def self.add_test name, data, klass = self.name[4..-1]
    name = name.to_s
    klass = klass.to_s

    if testcases.has_key? name then
      if testcases[name].has_key? klass then
        warn "testcase #{klass}##{name} already has data"
      else
        testcases[name][klass] = data
      end
    else
      warn "testcase #{name} does not exist"
    end
  end

  def self.add_tests name, hash
    name = name.to_s

    hash.each do |klass, data|
      warn "testcase #{klass}##{name} already has data" if
        testcases[name].has_key? klass
      testcases[name][klass] = data
    end
  end

  def self.clone_same
    @@testcases.each do |node, data|
      data.each do |key, val|
        if val == :same then
          prev_key = self.previous(key)
          data[key] = data[prev_key].deep_clone
        end
      end
    end
  end

  def self.copy_test_case nonverbose, klass
    verbose = nonverbose + "_mri_verbose_flag"
    testcases[verbose][klass] = testcases[nonverbose][klass]
  end

  def self.generate_test klass, node, data, input_name, output_name
    klass.send(:define_method, "test_#{node}".to_sym) do
      flunk "Processor is nil" if processor.nil?

      assert data.has_key?(input_name), "Unknown input data"
      assert data.has_key?(output_name), "Missing test data"

      $missing[node] << output_name unless data.has_key? output_name

      input    = data[input_name].deep_clone
      expected = data[output_name].deep_clone

      case expected
      when :unsupported then
        assert_raises(UnsupportedNodeError) do
          processor.process(input)
        end
      else
        extra_expected = []
        extra_input = []

        _, expected, extra_expected = *expected if
          Array === expected and expected.first == :defx
        _, input, extra_input = *input if
          Array === input and input.first == :defx

        # OMG... I can't believe I have to do this this way.  these
        # hooks are here instead of refactoring this define_method
        # body into an assertion. It'll allow subclasses to hook in
        # and add behavior before or after the processor does it's
        # thing. If you go the body refactor route, some of the
        # RawParseTree test casese fail for completely bogus reasons.

        before_process_hook klass, node, data, input_name, output_name
        refute_nil data[input_name], "testcase does not exist?"
        @result = processor.process input
        assert_equal(expected, @result,
                     "failed on input: #{data[input_name].inspect}")
        after_process_hook klass, node, data, input_name, output_name

        extra_input.each do |extra|
          processor.process(extra)
        end
        extra = processor.extra_methods rescue []
        assert_equal extra_expected, extra
      end
    end
  end

  def self.generate_tests klass
    install_missing_reporter
    clone_same

    output_name = klass.name.to_s.sub(/^Test/, '')

    input_name = self.previous(output_name)

    @@testcases.each do |node, data|
      next if [:skip, :unsupported].include? data[input_name]
      next if data[output_name] == :skip

      generate_test klass, node, data, input_name, output_name
    end
  end

  def self.inherited klass
    super

    generate_tests klass unless klass.name =~ /TestCase/
  end

  def self.install_missing_reporter
    unless defined? $missing then
      $missing = Hash.new { |h,k| h[k] = [] }
      at_exit {
        at_exit {
          warn ""
          $missing.sort.each do |name, klasses|
            warn "add_tests(#{name.inspect},"
            klasses.map! { |klass| "          #{klass.inspect} => :same" }
            warn klasses.join("\n") + ")"
          end
          warn ""
        }
      }
    end
  end

  def self.previous(key, extra=0) # FIX: remove R2C code
    idx = @@testcase_order.index(key)

    raise "Unknown class #{key} in @@testcase_order" if idx.nil?

    case key
    when "RubyToRubyC" then
      idx -= 1
    end
    @@testcase_order[idx - 1 - extra]
  end

  def self.testcase_order; @@testcase_order; end
  def self.testcases; @@testcases; end

  def self.unsupported_tests *tests
    tests.flatten.each do |name|
      add_test name, :unsupported
    end
  end

  ############################################################
[...4018 lines suppressed...]
  add_tests("unless_pre_not",
            "Ruby"         => "unless not b then a end",
            "RawParseTree" => [:if, [:vcall, :b], [:vcall, :a], nil],
            "ParseTree"    => s(:if, s(:call, nil, :b, s(:arglist)),
                                s(:call, nil, :a, s(:arglist)), nil),
            "Ruby2Ruby"    => "a if b")

  add_tests("until_post",
            "Ruby"         => "begin\n  (1 + 1)\nend until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("until_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend while true")

  add_tests("until_pre",
            "Ruby"         => "until false do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("until_pre_mod",
            "Ruby"         => "(1 + 1) until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until false do\n  (1 + 1)\nend")

  add_tests("until_pre_not",
            "Ruby"         => "until not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("until_pre_not_mod",
            "Ruby"         => "(1 + 1) until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("valias",
            "Ruby"         => "alias $y $x",
            "RawParseTree" => [:valias, :$y, :$x],
            "ParseTree"    => s(:valias, :$y, :$x))

  add_tests("vcall",
            "Ruby"         => "method",
            "RawParseTree" => [:vcall, :method],
            "ParseTree"    => s(:call, nil, :method, s(:arglist)))

  add_tests("while_post",
            "Ruby"         => "begin\n  (1 + 1)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("while_post2",
            "Ruby"         => "begin\n  (1 + 2)\n  (3 + 4)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:block,
                                [:call, [:lit, 1], :+, [:array, [:lit, 2]]],
                                [:call, [:lit, 3], :+, [:array, [:lit, 4]]]],
                               false],
            "ParseTree"    => s(:while, s(:false),
                                s(:block,
                                  s(:call, s(:lit, 1), :+,
                                    s(:arglist, s(:lit, 2))),
                                  s(:call, s(:lit, 3), :+,
                                    s(:arglist, s(:lit, 4)))),
                                false))

  add_tests("while_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend until true")

  add_tests("while_pre",
            "Ruby"         => "while false do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("while_pre_mod",
            "Ruby"         => "(1 + 1) while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while false do\n  (1 + 1)\nend") # FIX can be one liner

  add_tests("while_pre_nil",
            "Ruby"         => "while false do\nend",
            "RawParseTree" => [:while, [:false], nil, true],
            "ParseTree"    => s(:while, s(:false), nil, true))

  add_tests("while_pre_not",
            "Ruby"         => "while not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend")

  add_tests("while_pre_not_mod",
            "Ruby"         => "(1 + 1) while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend") # FIX

  add_tests("xstr",
            "Ruby"         => "`touch 5`",
            "RawParseTree" => [:xstr, 'touch 5'],
            "ParseTree"    => s(:xstr, 'touch 5'))

  add_tests("yield_0",
            "Ruby"         => "yield",
            "RawParseTree" => [:yield],
            "ParseTree"    => s(:yield))

  add_tests("yield_1",
            "Ruby"         => "yield(42)",
            "RawParseTree" => [:yield, [:lit, 42]],
            "ParseTree"    => s(:yield, s(:lit, 42)))

  add_tests("yield_array_0",
            "Ruby"         => "yield([])",
            "RawParseTree" => [:yield, [:zarray], true],
            "ParseTree"    => s(:yield, s(:array)))

  add_tests("yield_array_1",
            "Ruby"         => "yield([42])",
            "RawParseTree" => [:yield, [:array, [:lit, 42]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42))))

  add_tests("yield_array_n",
            "Ruby"         => "yield([42, 24])",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42), s(:lit, 24))))

  add_tests("yield_n",
            "Ruby"         => "yield(42, 24)",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]]],
            "ParseTree"    => s(:yield, s(:lit, 42), s(:lit, 24)))

  add_tests("zarray",
            "Ruby"         => "a = []",
            "RawParseTree" => [:lasgn, :a, [:zarray]],
            "ParseTree"    => s(:lasgn, :a, s(:array)))

  add_tests("zsuper",
            "Ruby"         => "def x\n  super\nend",
            "RawParseTree" => [:defn, :x,
                               [:scope, [:block, [:args], [:zsuper]]]],
            "ParseTree"    => s(:defn, :x, s(:args),
                                s(:scope, s(:block, s(:zsuper)))))
end


--- NEW FILE rubygem-ruby2ruby.spec ---
# Generated from ruby2ruby-1.2.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby2ruby
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Generate pure ruby from RubyParser compatible Sexps
Name: rubygem-%{gemname}
Version: 1.2.4
Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://seattlerb.rubyforge.org/ruby2ruby/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
# These test cases are carried in the ParseTree gem in test/. Carry them here
# rather than attempting to install ParseTree-doc in check and introducing a circular
# dependency
Source1: pt_testcase.rb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygem(sexp_processor)
Requires: rubygem(ruby_parser)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest)
BuildRequires(check): rubygem(sexp_processor), rubygem(ruby_parser)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ruby2ruby provides a means of generating pure ruby code easily from
RubyParser compatible Sexps. This makes making dynamic language
processors in ruby easier than ever!

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

cp -p %{SOURCE1} $(pwd)/%{geminstdir}/test/

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway.
find %{buildroot}%{geminstdir}/test -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
find %{buildroot}%{geminstdir}/lib -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/bin\/env.*/d'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/bin -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/r2r_show
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/.autotest
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 1.2.4-2
- Move pt_testcase.rb to the build stage so it's included in the rpm (#541512).
- Drop version requirements for sexp_processor and ruby_parser as they are new
  packages (#541512).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 1.2.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby2ruby/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:38:47 -0000	1.1
+++ .cvsignore	4 Dec 2009 04:29:12 -0000	1.2
@@ -0,0 +1 @@
+ruby2ruby-1.2.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby2ruby/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:38:47 -0000	1.1
+++ sources	4 Dec 2009 04:29:12 -0000	1.2
@@ -0,0 +1 @@
+30cfdb7213e23639a4139a78308206ea  ruby2ruby-1.2.4.gem



From emaldonado at fedoraproject.org  Fri Dec  4 04:29:29 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Dec 2009 04:29:29 +0000 (UTC)
Subject: rpms/nss/devel 533125-ammend.patch,NONE,1.1
Message-ID: <20091204042929.DD65011C00E0@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30139

Added Files:
	533125-ammend.patch 
Log Message:
Allows clients to interoperate with unpatched servers that still require renegotiation

533125-ammend.patch:
 ssl3con.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE 533125-ammend.patch ---
Index: mozilla/security/nss/lib/ssl/ssl3con.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ssl/ssl3con.c,v
retrieving revision 1.121
diff -u -p -r1.121 ssl3con.c
--- mozilla/security/nss/lib/ssl/ssl3con.c	12 Nov 2009 05:08:27 -0000	1.121
+++ mozilla/security/nss/lib/ssl/ssl3con.c	20 Nov 2009 19:36:30 -0000
@@ -4004,6 +4004,7 @@ ssl3_HandleHelloRequest(sslSocket *ss)
 	PORT_SetError(SSL_ERROR_RX_UNEXPECTED_HELLO_REQUEST);
 	return SECFailure;
     }
+    /*
     if (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER) {
 	ssl_GetXmitBufLock(ss);
 	rv = SSL3_SendAlert(ss, alert_warning, no_renegotiation);
@@ -4011,6 +4012,7 @@ ssl3_HandleHelloRequest(sslSocket *ss)
 	PORT_SetError(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED);
 	return SECFailure;
     }
+    */
 
     if (sid) {
 	ss->sec.uncache(sid);



From kyle at fedoraproject.org  Fri Dec  4 04:29:53 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 04:29:53 +0000 (UTC)
Subject: rpms/kernel/F-11 ipv4-fix-null-ptr-deref-in-ip_fragment.patch, NONE,
	1.1 kernel.spec, 1.1780, 1.1781
Message-ID: <20091204042953.7DCBE11C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30376

Modified Files:
	kernel.spec 
Added Files:
	ipv4-fix-null-ptr-deref-in-ip_fragment.patch 
Log Message:
* Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.9-102
- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: null ptr deref
  bug fix.


ipv4-fix-null-ptr-deref-in-ip_fragment.patch:
 ip_fragment.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ipv4-fix-null-ptr-deref-in-ip_fragment.patch ---
From: David Ford <david at blue-labs.org>
Date: Mon, 30 Nov 2009 07:02:22 +0000 (-0800)
Subject: ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr... 
X-Git-Tag: v2.6.32~40^2~6
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=bbf31bf18d34caa87dd01f08bf713635593697f2

ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr OOPS

ipv4 ip_frag_reasm(), fully replace 'dev_net(dev)' with 'net', defined
previously patched into 2.6.29.

Between 2.6.28.10 and 2.6.29, net/ipv4/ip_fragment.c was patched,
changing from dev_net(dev) to container_of(...).  Unfortunately the goto
section (out_fail) on oversized packets inside ip_frag_reasm() didn't
get touched up as well.  Oversized IP packets cause a NULL pointer
dereference and immediate hang.

I discovered this running openvasd and my previous email on this is
titled:  NULL pointer dereference at 2.6.32-rc8:net/ipv4/ip_fragment.c:566

Signed-off-by: David Ford <david at blue-labs.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 575f9bd..d3fe10b 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -563,7 +563,7 @@ out_oversize:
 		printk(KERN_INFO "Oversized IP packet from %pI4.\n",
 			&qp->saddr);
 out_fail:
-	IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_REASMFAILS);
+	IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
 	return err;
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1780
retrieving revision 1.1781
diff -u -p -r1.1780 -r1.1781
--- kernel.spec	19 Nov 2009 14:38:34 -0000	1.1780
+++ kernel.spec	4 Dec 2009 04:29:53 -0000	1.1781
@@ -841,6 +841,9 @@ Patch16470: sata_nv-use-hardreset-only-f
 # rhbz#538734 (CVE-tbd) [f60311d5f7670d9539b424e4ed8b5c0872fc9e83]
 Patch16471: fuse-prevent-fuse_put_request-in-invalid-ptr.patch
 
+# rhbz#544144 [bbf31bf18d34caa87dd01f08bf713635593697f2]
+Patch16472: ipv4-fix-null-ptr-deref-in-ip_fragment.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1580,6 +1583,9 @@ ApplyPatch sata_nv-make-sure-link-is-bro
 
 ApplyPatch fuse-prevent-fuse_put_request-in-invalid-ptr.patch
 
+# rhbz#544144
+ApplyPatch ipv4-fix-null-ptr-deref-in-ip_fragment.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2168,6 +2174,10 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.9-102
+- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: null ptr deref
+  bug fix.
+
 * Thu Nov 19 2009 Kyle McMartin <kyle at redhat.com>
 - fuse-prevent-fuse_put_request-in-invalid-ptr.patch: fix oops in fuse
   when low on memory. rhbz#538734.



From mkent at fedoraproject.org  Fri Dec  4 04:30:05 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri,  4 Dec 2009 04:30:05 +0000 (UTC)
Subject: rpms/rubygem-ruby2ruby/F-12 import.log, NONE, 1.1 pt_testcase.rb,
	NONE, 1.1 rubygem-ruby2ruby.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091204043005.C12FB11C03F6@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ruby2ruby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30418/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pt_testcase.rb rubygem-ruby2ruby.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ruby2ruby-1_2_4-2_fc13:F-12:rubygem-ruby2ruby-1.2.4-2.fc13.src.rpm:1259900663


--- NEW FILE pt_testcase.rb ---
$TESTING = true

require 'minitest/unit'
require 'sexp_processor' # for deep_clone

# key:
# wwtt = what were they thinking?

# TODO: <ko1_> 1.8.7 support {|&b|} syntax

class Examples
  attr_reader :reader
  attr_writer :writer

  def a_method(x); x+1; end
  alias an_alias a_method

  define_method(:bmethod_noargs) do
    x + 1
  end

  define_method(:unsplatted) do |x|
    x + 1
  end

  define_method :splatted do |*args|
    y = args.first
    y + 42
  end

  define_method :dmethod_added, instance_method(:a_method) if
    RUBY_VERSION < "1.9"
end

class ParseTreeTestCase < MiniTest::Unit::TestCase
  attr_accessor :processor # to be defined by subclass

  def setup
    super
    @processor = nil
  end

  def after_process_hook klass, node, data, input_name, output_name
  end

  def before_process_hook klass, node, data, input_name, output_name
  end

  def self.add_test name, data, klass = self.name[4..-1]
    name = name.to_s
    klass = klass.to_s

    if testcases.has_key? name then
      if testcases[name].has_key? klass then
        warn "testcase #{klass}##{name} already has data"
      else
        testcases[name][klass] = data
      end
    else
      warn "testcase #{name} does not exist"
    end
  end

  def self.add_tests name, hash
    name = name.to_s

    hash.each do |klass, data|
      warn "testcase #{klass}##{name} already has data" if
        testcases[name].has_key? klass
      testcases[name][klass] = data
    end
  end

  def self.clone_same
    @@testcases.each do |node, data|
      data.each do |key, val|
        if val == :same then
          prev_key = self.previous(key)
          data[key] = data[prev_key].deep_clone
        end
      end
    end
  end

  def self.copy_test_case nonverbose, klass
    verbose = nonverbose + "_mri_verbose_flag"
    testcases[verbose][klass] = testcases[nonverbose][klass]
  end

  def self.generate_test klass, node, data, input_name, output_name
    klass.send(:define_method, "test_#{node}".to_sym) do
      flunk "Processor is nil" if processor.nil?

      assert data.has_key?(input_name), "Unknown input data"
      assert data.has_key?(output_name), "Missing test data"

      $missing[node] << output_name unless data.has_key? output_name

      input    = data[input_name].deep_clone
      expected = data[output_name].deep_clone

      case expected
      when :unsupported then
        assert_raises(UnsupportedNodeError) do
          processor.process(input)
        end
      else
        extra_expected = []
        extra_input = []

        _, expected, extra_expected = *expected if
          Array === expected and expected.first == :defx
        _, input, extra_input = *input if
          Array === input and input.first == :defx

        # OMG... I can't believe I have to do this this way.  these
        # hooks are here instead of refactoring this define_method
        # body into an assertion. It'll allow subclasses to hook in
        # and add behavior before or after the processor does it's
        # thing. If you go the body refactor route, some of the
        # RawParseTree test casese fail for completely bogus reasons.

        before_process_hook klass, node, data, input_name, output_name
        refute_nil data[input_name], "testcase does not exist?"
        @result = processor.process input
        assert_equal(expected, @result,
                     "failed on input: #{data[input_name].inspect}")
        after_process_hook klass, node, data, input_name, output_name

        extra_input.each do |extra|
          processor.process(extra)
        end
        extra = processor.extra_methods rescue []
        assert_equal extra_expected, extra
      end
    end
  end

  def self.generate_tests klass
    install_missing_reporter
    clone_same

    output_name = klass.name.to_s.sub(/^Test/, '')

    input_name = self.previous(output_name)

    @@testcases.each do |node, data|
      next if [:skip, :unsupported].include? data[input_name]
      next if data[output_name] == :skip

      generate_test klass, node, data, input_name, output_name
    end
  end

  def self.inherited klass
    super

    generate_tests klass unless klass.name =~ /TestCase/
  end

  def self.install_missing_reporter
    unless defined? $missing then
      $missing = Hash.new { |h,k| h[k] = [] }
      at_exit {
        at_exit {
          warn ""
          $missing.sort.each do |name, klasses|
            warn "add_tests(#{name.inspect},"
            klasses.map! { |klass| "          #{klass.inspect} => :same" }
            warn klasses.join("\n") + ")"
          end
          warn ""
        }
      }
    end
  end

  def self.previous(key, extra=0) # FIX: remove R2C code
    idx = @@testcase_order.index(key)

    raise "Unknown class #{key} in @@testcase_order" if idx.nil?

    case key
    when "RubyToRubyC" then
      idx -= 1
    end
    @@testcase_order[idx - 1 - extra]
  end

  def self.testcase_order; @@testcase_order; end
  def self.testcases; @@testcases; end

  def self.unsupported_tests *tests
    tests.flatten.each do |name|
      add_test name, :unsupported
    end
  end

  ############################################################
[...4018 lines suppressed...]
  add_tests("unless_pre_not",
            "Ruby"         => "unless not b then a end",
            "RawParseTree" => [:if, [:vcall, :b], [:vcall, :a], nil],
            "ParseTree"    => s(:if, s(:call, nil, :b, s(:arglist)),
                                s(:call, nil, :a, s(:arglist)), nil),
            "Ruby2Ruby"    => "a if b")

  add_tests("until_post",
            "Ruby"         => "begin\n  (1 + 1)\nend until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("until_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend while true")

  add_tests("until_pre",
            "Ruby"         => "until false do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("until_pre_mod",
            "Ruby"         => "(1 + 1) until false",
            "RawParseTree" => [:until, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until false do\n  (1 + 1)\nend")

  add_tests("until_pre_not",
            "Ruby"         => "until not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("until_pre_not_mod",
            "Ruby"         => "(1 + 1) until not true",
            "RawParseTree" => [:while, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while true do\n  (1 + 1)\nend")

  add_tests("valias",
            "Ruby"         => "alias $y $x",
            "RawParseTree" => [:valias, :$y, :$x],
            "ParseTree"    => s(:valias, :$y, :$x))

  add_tests("vcall",
            "Ruby"         => "method",
            "RawParseTree" => [:vcall, :method],
            "ParseTree"    => s(:call, nil, :method, s(:arglist)))

  add_tests("while_post",
            "Ruby"         => "begin\n  (1 + 1)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false))

  add_tests("while_post2",
            "Ruby"         => "begin\n  (1 + 2)\n  (3 + 4)\nend while false",
            "RawParseTree" => [:while, [:false],
                               [:block,
                                [:call, [:lit, 1], :+, [:array, [:lit, 2]]],
                                [:call, [:lit, 3], :+, [:array, [:lit, 4]]]],
                               false],
            "ParseTree"    => s(:while, s(:false),
                                s(:block,
                                  s(:call, s(:lit, 1), :+,
                                    s(:arglist, s(:lit, 2))),
                                  s(:call, s(:lit, 3), :+,
                                    s(:arglist, s(:lit, 4)))),
                                false))

  add_tests("while_post_not",
            "Ruby"         => "begin\n  (1 + 1)\nend while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], false],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), false),
            "Ruby2Ruby"    => "begin\n  (1 + 1)\nend until true")

  add_tests("while_pre",
            "Ruby"         => "while false do\n  (1 + 1)\nend",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true))

  add_tests("while_pre_mod",
            "Ruby"         => "(1 + 1) while false",
            "RawParseTree" => [:while, [:false],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:while, s(:false),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "while false do\n  (1 + 1)\nend") # FIX can be one liner

  add_tests("while_pre_nil",
            "Ruby"         => "while false do\nend",
            "RawParseTree" => [:while, [:false], nil, true],
            "ParseTree"    => s(:while, s(:false), nil, true))

  add_tests("while_pre_not",
            "Ruby"         => "while not true do\n  (1 + 1)\nend",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend")

  add_tests("while_pre_not_mod",
            "Ruby"         => "(1 + 1) while not true",
            "RawParseTree" => [:until, [:true],
                               [:call, [:lit, 1], :+,
                                [:array, [:lit, 1]]], true],
            "ParseTree"    => s(:until, s(:true),
                                s(:call, s(:lit, 1), :+,
                                  s(:arglist, s(:lit, 1))), true),
            "Ruby2Ruby"    => "until true do\n  (1 + 1)\nend") # FIX

  add_tests("xstr",
            "Ruby"         => "`touch 5`",
            "RawParseTree" => [:xstr, 'touch 5'],
            "ParseTree"    => s(:xstr, 'touch 5'))

  add_tests("yield_0",
            "Ruby"         => "yield",
            "RawParseTree" => [:yield],
            "ParseTree"    => s(:yield))

  add_tests("yield_1",
            "Ruby"         => "yield(42)",
            "RawParseTree" => [:yield, [:lit, 42]],
            "ParseTree"    => s(:yield, s(:lit, 42)))

  add_tests("yield_array_0",
            "Ruby"         => "yield([])",
            "RawParseTree" => [:yield, [:zarray], true],
            "ParseTree"    => s(:yield, s(:array)))

  add_tests("yield_array_1",
            "Ruby"         => "yield([42])",
            "RawParseTree" => [:yield, [:array, [:lit, 42]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42))))

  add_tests("yield_array_n",
            "Ruby"         => "yield([42, 24])",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]], true],
            "ParseTree"    => s(:yield, s(:array, s(:lit, 42), s(:lit, 24))))

  add_tests("yield_n",
            "Ruby"         => "yield(42, 24)",
            "RawParseTree" => [:yield, [:array, [:lit, 42], [:lit, 24]]],
            "ParseTree"    => s(:yield, s(:lit, 42), s(:lit, 24)))

  add_tests("zarray",
            "Ruby"         => "a = []",
            "RawParseTree" => [:lasgn, :a, [:zarray]],
            "ParseTree"    => s(:lasgn, :a, s(:array)))

  add_tests("zsuper",
            "Ruby"         => "def x\n  super\nend",
            "RawParseTree" => [:defn, :x,
                               [:scope, [:block, [:args], [:zsuper]]]],
            "ParseTree"    => s(:defn, :x, s(:args),
                                s(:scope, s(:block, s(:zsuper)))))
end


--- NEW FILE rubygem-ruby2ruby.spec ---
# Generated from ruby2ruby-1.2.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby2ruby
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Generate pure ruby from RubyParser compatible Sexps
Name: rubygem-%{gemname}
Version: 1.2.4
Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://seattlerb.rubyforge.org/ruby2ruby/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
# These test cases are carried in the ParseTree gem in test/. Carry them here
# rather than attempting to install ParseTree-doc in check and introducing a circular
# dependency
Source1: pt_testcase.rb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygem(sexp_processor)
Requires: rubygem(ruby_parser)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest)
BuildRequires(check): rubygem(sexp_processor), rubygem(ruby_parser)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ruby2ruby provides a means of generating pure ruby code easily from
RubyParser compatible Sexps. This makes making dynamic language
processors in ruby easier than ever!

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

cp -p %{SOURCE1} $(pwd)/%{geminstdir}/test/

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway.
find %{buildroot}%{geminstdir}/test -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
find %{buildroot}%{geminstdir}/lib -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/bin\/env.*/d'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/bin -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/r2r_show
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/.autotest
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 1.2.4-2
- Move pt_testcase.rb to the build stage so it's included in the rpm (#541512).
- Drop version requirements for sexp_processor and ruby_parser as they are new
  packages (#541512).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 1.2.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby2ruby/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:38:47 -0000	1.1
+++ .cvsignore	4 Dec 2009 04:30:05 -0000	1.2
@@ -0,0 +1 @@
+ruby2ruby-1.2.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby2ruby/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:38:47 -0000	1.1
+++ sources	4 Dec 2009 04:30:05 -0000	1.2
@@ -0,0 +1 @@
+30cfdb7213e23639a4139a78308206ea  ruby2ruby-1.2.4.gem



From kyle at fedoraproject.org  Fri Dec  4 04:38:00 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 04:38:00 +0000 (UTC)
Subject: rpms/kernel/F-12 ipv4-fix-null-ptr-deref-in-ip_fragment.patch, NONE,
	1.1 kernel.spec, 1.1947, 1.1948
Message-ID: <20091204043800.EFD4611C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32040

Modified Files:
	kernel.spec 
Added Files:
	ipv4-fix-null-ptr-deref-in-ip_fragment.patch 
Log Message:
* Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.6-162
- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: null ptr deref
  bug fix.


ipv4-fix-null-ptr-deref-in-ip_fragment.patch:
 ip_fragment.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ipv4-fix-null-ptr-deref-in-ip_fragment.patch ---
From: David Ford <david at blue-labs.org>
Date: Mon, 30 Nov 2009 07:02:22 +0000 (-0800)
Subject: ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr... 
X-Git-Tag: v2.6.32~40^2~6
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=bbf31bf18d34caa87dd01f08bf713635593697f2

ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr OOPS

ipv4 ip_frag_reasm(), fully replace 'dev_net(dev)' with 'net', defined
previously patched into 2.6.29.

Between 2.6.28.10 and 2.6.29, net/ipv4/ip_fragment.c was patched,
changing from dev_net(dev) to container_of(...).  Unfortunately the goto
section (out_fail) on oversized packets inside ip_frag_reasm() didn't
get touched up as well.  Oversized IP packets cause a NULL pointer
dereference and immediate hang.

I discovered this running openvasd and my previous email on this is
titled:  NULL pointer dereference at 2.6.32-rc8:net/ipv4/ip_fragment.c:566

Signed-off-by: David Ford <david at blue-labs.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 575f9bd..d3fe10b 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -563,7 +563,7 @@ out_oversize:
 		printk(KERN_INFO "Oversized IP packet from %pI4.\n",
 			&qp->saddr);
 out_fail:
-	IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_REASMFAILS);
+	IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
 	return err;
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1947
retrieving revision 1.1948
diff -u -p -r1.1947 -r1.1948
--- kernel.spec	2 Dec 2009 23:02:45 -0000	1.1947
+++ kernel.spec	4 Dec 2009 04:38:00 -0000	1.1948
@@ -809,6 +809,9 @@ Patch14462: highmem-fix-arm-powerpc-kmap
 
 Patch14463: dlm-fix-connection-close-handling.patch
 
+# rhbz#544144 [bbf31bf18d34caa87dd01f08bf713635593697f2]
+Patch14464: ipv4-fix-null-ptr-deref-in-ip_fragment.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1512,6 +1515,9 @@ ApplyPatch highmem-fix-arm-powerpc-kmap_
 
 ApplyPatch dlm-fix-connection-close-handling.patch
 
+# rhbz#544144
+ApplyPatch ipv4-fix-null-ptr-deref-in-ip_fragment.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2161,6 +2167,10 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.6-162
+- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: null ptr deref
+  bug fix.
+
 * Thu Dec 03 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-161
 - rv410 LVDS on resume test fix from AMD (#541562)
 



From bskeggs at fedoraproject.org  Fri Dec  4 04:48:59 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri,  4 Dec 2009 04:48:59 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.69, 1.70 kernel.spec, 1.1948, 
	1.1949
Message-ID: <20091204044859.B9AAC11C00E0@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1914

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Fri Dec 04 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-163
- nouveau: reduce debug level of some warning messages (rh#543883)
- nouveau: modesetting fixes on nva5/nva8
- nouveau: suspend/resume fixes on nva5/nva8 (bios opcode 0x8d)
- nouveau: cleanup chipset/arch handling, fail init on unknown chipsets
- nouveau: fix failure to detect some outputs when dcb table is odd
- nouveau: eliminate unnecessary cursor state changes on nv50



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   56 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   30 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 6046 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  289 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  663 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  478 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  468 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  812 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   54 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  155 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  157 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1270 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  380 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   47 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  976 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1080 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  455 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  257 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  693 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  583 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  196 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  321 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  865 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1002 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  528 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  316 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  271 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  208 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  260 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  892 
 drivers/gpu/drm/nouveau/nv17_gpio.c         |   92 
 drivers/gpu/drm/nouveau/nv17_tv.c           |  681 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  780 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  314 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2239 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  769 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  156 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  304 
 drivers/gpu/drm/nouveau/nv50_display.c      |  998 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  273 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  494 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  470 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |26832 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  509 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  269 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  220 
 85 files changed, 64024 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- drm-nouveau.patch	1 Dec 2009 23:24:14 -0000	1.69
+++ drm-nouveau.patch	4 Dec 2009 04:48:58 -0000	1.70
@@ -1486,7 +1486,7 @@ index 0000000..fd75226
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
 new file mode 100644
-index 0000000..ec0f2f3
+index 0000000..1cf4882
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
 @@ -0,0 +1,125 @@
@@ -1554,7 +1554,7 @@ index 0000000..ec0f2f3
 +
 +	err = acpi_evaluate_object(handle, "_DSM", &input, &output);
 +	if (err) {
-+		NV_ERROR(dev, "failed to evaluate _DSM: %d\n", err);
++		NV_INFO(dev, "failed to evaluate _DSM: %d\n", err);
 +		return err;
 +	}
 +
@@ -1778,10 +1778,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..6ddeca2
+index 0000000..3595be1
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5988 @@
+@@ -0,0 +1,6046 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -1870,11 +1870,12 @@ index 0000000..6ddeca2
 +
 +static void load_vbios_prom(struct drm_device *dev, uint8_t *data)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	uint32_t pci_nv_20, save_pci_nv_20;
 +	int pcir_ptr;
 +	int i;
 +
-+	if (nv_arch(dev) >= NV_50)
++	if (dev_priv->card_type >= NV_50)
 +		pci_nv_20 = 0x88050;
 +	else
 +		pci_nv_20 = NV_PBUS_PCI_NV_20;
@@ -1913,10 +1914,11 @@ index 0000000..6ddeca2
 +
 +static void load_vbios_pramin(struct drm_device *dev, uint8_t *data)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	uint32_t old_bar0_pramin = 0;
 +	int i;
 +
-+	if (nv_arch(dev) >= NV_50) {
++	if (dev_priv->card_type >= NV_50) {
 +		uint32_t vbios_vram = (nv_rd32(dev, 0x619f04) & ~0xff) << 8;
 +
 +		if (!vbios_vram)
@@ -1935,7 +1937,7 @@ index 0000000..6ddeca2
 +		data[i] = nv_rd08(dev, NV_PRAMIN_OFFSET + i);
 +
 +out:
-+	if (nv_arch(dev) >= NV_50)
++	if (dev_priv->card_type >= NV_50)
 +		nv_wr32(dev, 0x1700, old_bar0_pramin);
 +}
 +
@@ -2075,18 +2077,21 @@ index 0000000..6ddeca2
 +static uint32_t
 +munge_reg(struct nvbios *bios, uint32_t reg)
 +{
-+	if (nv_arch(bios->dev) < NV_50)
-+		return reg;
++	struct drm_nouveau_private *dev_priv = bios->dev->dev_private;
++	struct dcb_entry *dcbent = bios->display.output;
 +
-+	if (!(reg & 0x40000000))
++	if (dev_priv->card_type < NV_50)
 +		return reg;
 +
-+	BUG_ON(!bios->display.output);
++	if (reg & 0x40000000) {
++		BUG_ON(!dcbent);
 +
-+	if (reg & 0x40000000)
-+		reg += (ffs(bios->display.output->or) - 1) * 0x800;
++		reg += (ffs(dcbent->or) - 1) * 0x800;
++		if ((reg & 0x20000000) && !(dcbent->sorconf.link & 1))
++			reg += 0x00000080;
++	}
 +
-+	reg &= ~0x40000000;
++	reg &= ~0x60000000;
 +	return reg;
 +}
 +
@@ -4313,7 +4318,20 @@ index 0000000..6ddeca2
 +init_8c(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
 +{
 +	/*
-+	 * INIT_85   opcode: 0x8C ('')
++	 * INIT_8C   opcode: 0x8C ('')
++	 *
++	 * NOP so far....
++	 *
++	 */
++
++	return true;
++}
++
++static bool
++init_8d(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++{
++	/*
++	 * INIT_8D   opcode: 0x8D ('')
 +	 *
 +	 * NOP so far....
 +	 *
@@ -4768,6 +4786,7 @@ index 0000000..6ddeca2
 +	/* INIT_RAM_RESTRICT_PLL's length is adjusted by the BIT M table */
 +	{ "INIT_RAM_RESTRICT_PLL"             , 0x87, 2       , 0       , 0       , init_ram_restrict_pll           },
 +	{ "INIT_8C"                           , 0x8C, 1       , 0       , 0       , init_8c                         },
++	{ "INIT_8D"                           , 0x8D, 1       , 0       , 0       , init_8d                         },
 +	{ "INIT_GPIO"                         , 0x8E, 1       , 0       , 0       , init_gpio                       },
 +	/* INIT_RAM_RESTRICT_ZM_REG_GROUP's mult is loaded by M table in BIT */
 +	{ "INIT_RAM_RESTRICT_ZM_REG_GROUP"    , 0x8F, 7       , 6       , 0       , init_ram_restrict_zm_reg_group  },
@@ -5139,8 +5158,11 @@ index 0000000..6ddeca2
 +	return 0;
 +}
 +
-+static int get_fp_strap(struct drm_device *dev, struct nvbios *bios)
++static int
++get_fp_strap(struct drm_device *dev, struct nvbios *bios)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++
 +	/*
 +	 * The fp strap is normally dictated by the "User Strap" in
 +	 * PEXTDEV_BOOT_0[20:16], but on BMP cards when bit 2 of the
@@ -5153,7 +5175,7 @@ index 0000000..6ddeca2
 +	if (bios->major_version < 5 && bios->data[0x48] & 0x4)
 +		return NVReadVgaCrtc5758(dev, 0, 0xf) & 0xf;
 +
-+	if (nv_arch(dev) >= NV_50)
++	if (dev_priv->card_type >= NV_50)
 +		return (bios_rd32(bios, NV_PEXTDEV_BOOT_0) >> 24) & 0xf;
 +	else
 +		return (bios_rd32(bios, NV_PEXTDEV_BOOT_0) >> 16) & 0xf;
@@ -5774,6 +5796,7 @@ index 0000000..6ddeca2
 +	case 0x20:
 +	case 0x21:
 +	case 0x30:
++	case 0x40:
 +		headerlen = bios->data[bios->pll_limit_tbl_ptr + 1];
 +		recordlen = bios->data[bios->pll_limit_tbl_ptr + 2];
 +		entries = bios->data[bios->pll_limit_tbl_ptr + 3];
@@ -5922,7 +5945,7 @@ index 0000000..6ddeca2
 +					pll_lim->refclk = 25000;
 +			}
 +		}
-+	} else if (pll_lim_ver) { /* ver 0x30 */
++	} else if (pll_lim_ver == 0x30) { /* ver 0x30 */
 +		uint8_t *entry = &bios->data[bios->pll_limit_tbl_ptr + headerlen];
 +		uint8_t *record = NULL;
 +		int i;
@@ -5962,6 +5985,42 @@ index 0000000..6ddeca2
 +		pll_lim->max_usable_log2p = pll_lim->max_log2p = record[25];
 +		pll_lim->log2p_bias = record[27];
 +		pll_lim->refclk = ROM32(record[28]);
++	} else if (pll_lim_ver) { /* ver 0x40 */
++		uint8_t *entry = &bios->data[bios->pll_limit_tbl_ptr + headerlen];
++		uint8_t *record = NULL;
++		int i;
++
++		BIOSLOG(bios, "Loading PLL limits for register 0x%08x\n",
++			limit_match);
++
++		for (i = 0; i < entries; i++, entry += recordlen) {
++			if (ROM32(entry[3]) == limit_match) {
++				record = &bios->data[ROM16(entry[1])];
++				break;
++			}
++		}
++
++		if (!record) {
++			NV_ERROR(dev, "Register 0x%08x not found in PLL "
++				 "limits table", limit_match);
++			return -ENOENT;
++		}
++
++		pll_lim->vco1.minfreq = ROM16(record[0]) * 1000;
++		pll_lim->vco1.maxfreq = ROM16(record[2]) * 1000;
++		pll_lim->vco1.min_inputfreq = ROM16(record[4]) * 1000;
++		pll_lim->vco1.max_inputfreq = ROM16(record[6]) * 1000;
++		pll_lim->vco1.min_m = record[8];
++		pll_lim->vco1.max_m = record[9];
++		pll_lim->vco1.min_n = record[10];
++		pll_lim->vco1.max_n = record[11];
++		pll_lim->min_p = record[12];
++		pll_lim->max_p = record[13];
++		/* where did this go to?? */
++		if (limit_match == 0x00614100 || limit_match == 0x00614900)
++			pll_lim->refclk = 27000;
++		else
++			pll_lim->refclk = 100000;
 +	}
 +
 +	/*
@@ -6420,8 +6479,11 @@ index 0000000..6ddeca2
 +
 +#define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
 +
-+static int parse_bit_table(struct drm_device *dev, struct nvbios *bios, const uint16_t bitoffset, struct bit_table *table)
++static int
++parse_bit_table(struct nvbios *bios, const uint16_t bitoffset,
++		struct bit_table *table)
 +{
++	struct drm_device *dev = bios->dev;
 +	uint8_t maxentries = bios->data[bitoffset + 4];
 +	int i, offset;
 +	struct bit_entry bitentry;
@@ -6439,13 +6501,12 @@ index 0000000..6ddeca2
 +		return table->parse_fn(dev, bios, &bitentry);
 +	}
 +
-+	NV_ERROR(dev, "BIT table '%c' not found\n", table->id);
-+
++	NV_INFO(dev, "BIT table '%c' not found\n", table->id);
 +	return -ENOSYS;
 +}
 +
-+static int parse_bit_structure(struct drm_device *dev, struct nvbios *bios,
-+				const uint16_t bitoffset)
++static int
++parse_bit_structure(struct nvbios *bios, const uint16_t bitoffset)
 +{
 +	int ret;
 +
@@ -6455,23 +6516,23 @@ index 0000000..6ddeca2
 +	 * functions shouldn't be actually *doing* anything apart from pulling
 +	 * data from the image into the bios struct, thus no interdependencies
 +	 */
-+	ret = parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('i', i));
++	ret = parse_bit_table(bios, bitoffset, &BIT_TABLE('i', i));
 +	if (ret) /* info? */
 +		return ret;
 +	if (bios->major_version >= 0x60) /* g80+ */
-+		parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('A', A));
-+	ret = parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('C', C));
++		parse_bit_table(bios, bitoffset, &BIT_TABLE('A', A));
++	ret = parse_bit_table(bios, bitoffset, &BIT_TABLE('C', C));
 +	if (ret)
 +		return ret;
-+	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('D', display));
-+	ret = parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('I', init));
++	parse_bit_table(bios, bitoffset, &BIT_TABLE('D', display));
++	ret = parse_bit_table(bios, bitoffset, &BIT_TABLE('I', init));
 +	if (ret)
 +		return ret;
-+	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('M', M)); /* memory? */
-+	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('L', lvds));
-+	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('T', tmds));
-+	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('U', U));
-+	parse_bit_table(dev, bios, bitoffset, &BIT_TABLE('d', displayport));
++	parse_bit_table(bios, bitoffset, &BIT_TABLE('M', M)); /* memory? */
++	parse_bit_table(bios, bitoffset, &BIT_TABLE('L', lvds));
++	parse_bit_table(bios, bitoffset, &BIT_TABLE('T', tmds));
++	parse_bit_table(bios, bitoffset, &BIT_TABLE('U', U));
++	parse_bit_table(bios, bitoffset, &BIT_TABLE('d', displayport));
 +
 +	return 0;
 +}
@@ -7095,6 +7156,7 @@ index 0000000..6ddeca2
 +		break;
 +	}
 +	case OUTPUT_DP:
++		entry->dpconf.sor.link = (conf & 0x00000030) >> 4;
 +		entry->dpconf.link_bw = (conf & 0x00e00000) >> 21;
 +		switch ((conf & 0x0f000000) >> 24) {
 +		case 0xf:
@@ -7109,7 +7171,7 @@ index 0000000..6ddeca2
 +		}
 +		break;
 +	case OUTPUT_TMDS:
-+		entry->tmdsconf.sor_link = (conf & 0x00000030) >> 4;
++		entry->tmdsconf.sor.link = (conf & 0x00000030) >> 4;
 +		break;
 +	case 0xe:
 +		/* weird g80 mobile type that "nv" treats as a terminator */
@@ -7383,13 +7445,9 @@ index 0000000..6ddeca2
 +		if (configblock)
 +			config = ROM32(dcbtable[headerlen + confofs + recordlength * i]);
 +
-+		/*
-+		 * Should we allow discontinuous DCBs? Certainly DCB I2C
-+		 * tables can be discontinuous.
-+		 */
 +		if ((connection & 0x0000000f) == 0x0000000f)
-+			/* end of records */
-+			break;
++			continue;
++
 +		if (connection == 0x00000000)
 +			/* seen on an NV11 with DCB v1.5 */
 +			break;
@@ -7618,7 +7676,7 @@ index 0000000..6ddeca2
 +					bit_signature, sizeof(bit_signature));
 +	if (offset) {
 +		NV_TRACE(dev, "BIT BIOS found\n");
-+		return parse_bit_structure(dev, bios, offset + 6);
++		return parse_bit_structure(bios, offset + 6);
 +	}
 +
 +	offset = findstr(bios->data, bios->length,
@@ -7772,10 +7830,10 @@ index 0000000..6ddeca2
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
 new file mode 100644
-index 0000000..7cd7288
+index 0000000..1d5f10b
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
-@@ -0,0 +1,280 @@
+@@ -0,0 +1,289 @@
 +/*
 + * Copyright 2007-2008 Nouveau Project
 + *
@@ -7823,10 +7881,14 @@ index 0000000..7cd7288
 +	uint8_t or;
 +	bool duallink_possible;
 +	union {
++		struct sor_conf {
++			int link;
++		} sorconf;
 +		struct {
 +			int maxfreq;
 +		} crtconf;
 +		struct {
++			struct sor_conf sor;
 +			bool use_straps_for_mode;
 +			bool use_power_scripts;
 +		} lvdsconf;
@@ -7834,11 +7896,12 @@ index 0000000..7cd7288
 +			bool has_component_output;
 +		} tvconf;
 +		struct {
++			struct sor_conf sor;
 +			int link_nr;
 +			int link_bw;
 +		} dpconf;
 +		struct {
-+			int sor_link;
++			struct sor_conf sor;
 +		} tmdsconf;
 +	};
 +	bool i2c_upper_default;
@@ -7956,6 +8019,10 @@ index 0000000..7cd7288
 +	 */
 +	uint8_t max_usable_log2p;
 +	uint8_t log2p_bias;
++
++	uint8_t min_p;
++	uint8_t max_p;
++
 +	int refclk;
 +};
 +
@@ -8727,10 +8794,10 @@ index 0000000..8d1383a
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_calc.c b/drivers/gpu/drm/nouveau/nouveau_calc.c
 new file mode 100644
-index 0000000..81271d6
+index 0000000..ee2b845
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_calc.c
-@@ -0,0 +1,469 @@
+@@ -0,0 +1,478 @@
 +/*
 + * Copyright 1993-2003 NVIDIA, Corporation
 + * Copyright 2007-2009 Stuart Bennett
@@ -8928,6 +8995,7 @@ index 0000000..81271d6
 +nv04_update_arb(struct drm_device *dev, int VClk, int bpp,
 +		int *burst, int *lwm)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nv_fifo_info fifo_data;
 +	struct nv_sim_state sim_data;
 +	int MClk = nouveau_hw_get_clock(dev, MPLL);
@@ -8956,7 +9024,7 @@ index 0000000..81271d6
 +		sim_data.mem_page_miss = ((cfg1 >> 4) & 0xf) + ((cfg1 >> 31) & 0x1);
 +	}
 +
-+	if (nv_arch(dev) == NV_04)
++	if (dev_priv->card_type == NV_04)
 +		nv04_calc_arb(&fifo_data, &sim_data);
 +	else
 +		nv10_calc_arb(&fifo_data, &sim_data);
@@ -8981,7 +9049,9 @@ index 0000000..81271d6
 +void
 +nouveau_calc_arb(struct drm_device *dev, int vclk, int bpp, int *burst, int *lwm)
 +{
-+	if (nv_arch(dev) < NV_30)
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++
++	if (dev_priv->card_type < NV_30)
 +		nv04_update_arb(dev, vclk, bpp, burst, lwm);
 +	else if ((dev->pci_device & 0xfff0) == 0x0240 /*CHIPSET_C51*/ ||
 +		 (dev->pci_device & 0xfff0) == 0x03d0 /*CHIPSET_C512*/) {
@@ -9008,40 +9078,46 @@ index 0000000..81271d6
 +	int minvco = pll_lim->vco1.minfreq, maxvco = pll_lim->vco1.maxfreq;
 +	int minM = pll_lim->vco1.min_m, maxM = pll_lim->vco1.max_m;
 +	int minN = pll_lim->vco1.min_n, maxN = pll_lim->vco1.max_n;
-+	int minU = pll_lim->vco1.min_inputfreq, maxU = pll_lim->vco1.max_inputfreq;
-+	int maxlog2P = pll_lim->max_usable_log2p;
++	int minU = pll_lim->vco1.min_inputfreq;
++	int maxU = pll_lim->vco1.max_inputfreq;
++	int minP = pll_lim->max_p ? pll_lim->min_p : 0;
++	int maxP = pll_lim->max_p ? pll_lim->max_p : pll_lim->max_usable_log2p;
 +	int crystal = pll_lim->refclk;
-+	int M, N, log2P, P;
++	int M, N, thisP, P;
 +	int clkP, calcclk;
 +	int delta, bestdelta = INT_MAX;
 +	int bestclk = 0;
 +
 +	/* this division verified for nv20, nv18, nv28 (Haiku), and nv34 */
 +	/* possibly correlated with introduction of 27MHz crystal */
-+	if (cv < 0x17 || cv == 0x1a || cv == 0x20) {
-+		if (clk > 250000)
-+			maxM = 6;
-+		if (clk > 340000)
-+			maxM = 2;
-+	} else if (cv < 0x40) {
-+		if (clk > 150000)
-+			maxM = 6;
-+		if (clk > 200000)
-+			maxM = 4;
-+		if (clk > 340000)
-+			maxM = 2;
++	if (dev_priv->card_type < NV_50) {
++		if (cv < 0x17 || cv == 0x1a || cv == 0x20) {
++			if (clk > 250000)
++				maxM = 6;
++			if (clk > 340000)
++				maxM = 2;
++		} else if (cv < 0x40) {
++			if (clk > 150000)
++				maxM = 6;
++			if (clk > 200000)
++				maxM = 4;
++			if (clk > 340000)
++				maxM = 2;
++		}
 +	}
 +
-+	if ((clk << maxlog2P) < minvco) {
-+		minvco = clk << maxlog2P;
++	P = pll_lim->max_p ? maxP : (1 << maxP);
++	if ((clk * P) < minvco) {
++		minvco = clk * maxP;
 +		maxvco = minvco * 2;
 +	}
++
 +	if (clk + clk/200 > maxvco)	/* +0.5% */
 +		maxvco = clk + clk/200;
 +
 +	/* NV34 goes maxlog2P->0, NV20 goes 0->maxlog2P */
-+	for (log2P = 0; log2P <= maxlog2P; log2P++) {
-+		P = 1 << log2P;
++	for (thisP = minP; thisP <= maxP; thisP++) {
++		P = pll_lim->max_p ? thisP : (1 << thisP);
 +		clkP = clk * P;
 +
 +		if (clkP < minvco)
@@ -9074,7 +9150,7 @@ index 0000000..81271d6
 +				bestclk = calcclk;
 +				bestpv->N1 = N;
 +				bestpv->M1 = M;
-+				bestpv->log2P = log2P;
++				bestpv->log2P = thisP;
 +				if (delta == 0)	/* except this one */
 +					return bestclk;
 +			}
@@ -11731,10 +11807,10 @@ index 0000000..d8de3f6
 +MODULE_LICENSE("GPL and additional rights");
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
 new file mode 100644
-index 0000000..a4ab9d1
+index 0000000..106dfe6
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,1299 @@
+@@ -0,0 +1,1270 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -12193,16 +12269,12 @@ index 0000000..a4ab9d1
 +};
 +
 +enum nouveau_card_type {
-+	NV_UNKNOWN = 0,
-+	NV_04      = 4,
-+	NV_05      = 5,
-+	NV_10      = 10,
-+	NV_11      = 11,
-+	NV_17      = 17,
-+	NV_20      = 20,
-+	NV_30      = 30,
-+	NV_40      = 40,
-+	NV_50      = 50,
++	NV_04      = 0x00,
++	NV_10      = 0x10,
++	NV_20      = 0x20,
++	NV_30      = 0x30,
++	NV_40      = 0x40,
++	NV_50      = 0x50,
 +};
 +
 +struct drm_nouveau_private {
@@ -12968,39 +13040,13 @@ index 0000000..a4ab9d1
 +		NV_PRINTK(KERN_DEBUG, dev, "%s: " fmt, __func__, ##arg); \
 +} while (0)
 +
-+static inline enum nouveau_card_type
-+nv_arch(struct drm_device *dev)
-+{
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
-+
-+	switch (dev_priv->chipset & 0xf0) {
-+	case 0x00:
-+		return NV_04;
-+	case 0x10:
-+		return NV_10;
-+	case 0x20:
-+		return NV_20;
-+	case 0x30:
-+		return NV_30;
-+	case 0x40:
-+	case 0x60:
-+		return NV_40;
-+	case 0x50:
-+	case 0x80:
-+	case 0x90:
-+	case 0xa0:
-+		return NV_50;
-+	default:
-+		return NV_UNKNOWN;
-+	}
-+}
-+
 +static inline bool
 +nv_two_heads(struct drm_device *dev)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	const int impl = dev->pci_device & 0x0ff0;
 +
-+	if (nv_arch(dev) >= NV_10 && impl != 0x0100 &&
++	if (dev_priv->card_type >= NV_10 && impl != 0x0100 &&
 +	    impl != 0x0150 && impl != 0x01a0 && impl != 0x0200)
 +		return true;
 +
@@ -13016,9 +13062,10 @@ index 0000000..a4ab9d1
 +static inline bool
 +nv_two_reg_pll(struct drm_device *dev)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	const int impl = dev->pci_device & 0x0ff0;
 +
-+	if (impl == 0x0310 || impl == 0x0340 || nv_arch(dev) >= NV_40)
++	if (impl == 0x0310 || impl == 0x0340 || dev_priv->card_type >= NV_40)
 +		return true;
 +	return false;
 +}
@@ -14850,10 +14897,10 @@ index 0000000..f10b53b
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c b/drivers/gpu/drm/nouveau/nouveau_hw.c
 new file mode 100644
-index 0000000..e78ee53
+index 0000000..fa137b9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_hw.c
-@@ -0,0 +1,1078 @@
+@@ -0,0 +1,1080 @@
 +/*
 + * Copyright 2006 Dave Airlie
 + * Copyright 2007 Maarten Maathuis
@@ -15282,6 +15329,7 @@ index 0000000..e78ee53
 +nouveau_hw_get_pllvals(struct drm_device *dev, enum pll_types plltype,
 +		       struct nouveau_pll_vals *pllvals)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	const uint32_t nv04_regs[MAX_PLL_TYPES] = { NV_PRAMDAC_NVPLL_COEFF,
 +						    NV_PRAMDAC_MPLL_COEFF,
 +						    NV_PRAMDAC_VPLL_COEFF,
@@ -15294,7 +15342,7 @@ index 0000000..e78ee53
 +	struct pll_lims pll_lim;
 +	int ret;
 +
-+	if (nv_arch(dev) < NV_40)
++	if (dev_priv->card_type < NV_40)
 +		reg1 = nv04_regs[plltype];
 +	else
 +		reg1 = nv40_regs[plltype];
@@ -15309,7 +15357,7 @@ index 0000000..e78ee53
 +		pll2 = nvReadMC(dev, reg2);
 +	}
 +
-+	if (nv_arch(dev) == 0x40 && reg1 >= NV_PRAMDAC_VPLL_COEFF) {
++	if (dev_priv->card_type == 0x40 && reg1 >= NV_PRAMDAC_VPLL_COEFF) {
 +		uint32_t ramdac580 = NVReadRAMDAC(dev, 0, NV_PRAMDAC_580);
 +
 +		/* check whether vpll has been forced into single stage mode */
@@ -15513,7 +15561,7 @@ index 0000000..e78ee53
 +	struct nv04_crtc_reg *regp = &state->crtc_reg[head];
 +	int i;
 +
-+	if (nv_arch(dev) >= NV_10)
++	if (dev_priv->card_type >= NV_10)
 +		regp->nv10_cursync = NVReadRAMDAC(dev, head, NV_RAMDAC_NV10_CURSYNC);
 +
 +	nouveau_hw_get_pllvals(dev, head ? VPLL2 : VPLL1, &regp->pllvals);
@@ -15566,10 +15614,10 @@ index 0000000..e78ee53
 +
 +	regp->fp_margin_color = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_MARGIN_COLOR);
 +
-+	if (nv_arch(dev) >= NV_30)
++	if (dev_priv->card_type >= NV_30)
 +		regp->ramdac_8c0 = NVReadRAMDAC(dev, head, NV_PRAMDAC_8C0);
 +
-+	if (nv_arch(dev) == NV_40) {
++	if (dev_priv->card_type == NV_40) {
 +		regp->ramdac_a20 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A20);
 +		regp->ramdac_a24 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A24);
 +		regp->ramdac_a34 = NVReadRAMDAC(dev, head, NV_PRAMDAC_A34);
@@ -15589,7 +15637,7 @@ index 0000000..e78ee53
 +	uint32_t pllreg = head ? NV_RAMDAC_VPLL2 : NV_PRAMDAC_VPLL_COEFF;
 +	int i;
 +
-+	if (nv_arch(dev) >= NV_10)
++	if (dev_priv->card_type >= NV_10)
 +		NVWriteRAMDAC(dev, head, NV_RAMDAC_NV10_CURSYNC, regp->nv10_cursync);
 +
 +	nouveau_hw_setpll(dev, pllreg, &regp->pllvals);
@@ -15637,10 +15685,10 @@ index 0000000..e78ee53
 +
 +	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_MARGIN_COLOR, regp->fp_margin_color);
 +
-+	if (nv_arch(dev) >= NV_30)
++	if (dev_priv->card_type >= NV_30)
 +		NVWriteRAMDAC(dev, head, NV_PRAMDAC_8C0, regp->ramdac_8c0);
 +
-+	if (nv_arch(dev) == NV_40) {
++	if (dev_priv->card_type == NV_40) {
 +		NVWriteRAMDAC(dev, head, NV_PRAMDAC_A20, regp->ramdac_a20);
 +		NVWriteRAMDAC(dev, head, NV_PRAMDAC_A24, regp->ramdac_a24);
 +		NVWriteRAMDAC(dev, head, NV_PRAMDAC_A34, regp->ramdac_a34);
@@ -15705,6 +15753,7 @@ index 0000000..e78ee53
 +nv_save_state_ext(struct drm_device *dev, int head,
 +		  struct nv04_mode_state *state)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nv04_crtc_reg *regp = &state->crtc_reg[head];
 +	int i;
 +
@@ -15719,7 +15768,7 @@ index 0000000..e78ee53
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_FF_INDEX);
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_FFLWM__INDEX);
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_21);
-+	if (nv_arch(dev) >= NV_30)
++	if (dev_priv->card_type >= NV_30)
 +		rd_cio_state(dev, head, regp, NV_CIO_CRE_47);
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_49);
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR0_INDEX);
@@ -15727,14 +15776,14 @@ index 0000000..e78ee53
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR2_INDEX);
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_ILACE__INDEX);
 +
-+	if (nv_arch(dev) >= NV_10) {
++	if (dev_priv->card_type >= NV_10) {
 +		regp->crtc_830 = NVReadCRTC(dev, head, NV_PCRTC_830);
 +		regp->crtc_834 = NVReadCRTC(dev, head, NV_PCRTC_834);
 +
-+		if (nv_arch(dev) >= NV_30)
++		if (dev_priv->card_type >= NV_30)
 +			regp->gpio_ext = NVReadCRTC(dev, head, NV_PCRTC_GPIO_EXT);
 +
-+		if (nv_arch(dev) == NV_40)
++		if (dev_priv->card_type == NV_40)
 +			regp->crtc_850 = NVReadCRTC(dev, head, NV_PCRTC_850);
 +
 +		if (nv_two_heads(dev))
@@ -15746,7 +15795,7 @@ index 0000000..e78ee53
 +
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_SCRATCH3__INDEX);
 +	rd_cio_state(dev, head, regp, NV_CIO_CRE_SCRATCH4__INDEX);
-+	if (nv_arch(dev) >= NV_10) {
++	if (dev_priv->card_type >= NV_10) {
 +		rd_cio_state(dev, head, regp, NV_CIO_CRE_EBR_INDEX);
 +		rd_cio_state(dev, head, regp, NV_CIO_CRE_CSB);
 +		rd_cio_state(dev, head, regp, NV_CIO_CRE_4B);
@@ -15778,7 +15827,7 @@ index 0000000..e78ee53
 +	uint32_t reg900;
 +	int i;
 +
-+	if (nv_arch(dev) >= NV_10) {
++	if (dev_priv->card_type >= NV_10) {
 +		if (nv_two_heads(dev))
 +			/* setting ENGINE_CTRL (EC) *must* come before
 +			 * CIO_CRE_LCD, as writing CRE_LCD sets bits 16 & 17 in
@@ -15800,10 +15849,10 @@ index 0000000..e78ee53
 +		NVWriteCRTC(dev, head, NV_PCRTC_830, regp->crtc_830);
 +		NVWriteCRTC(dev, head, NV_PCRTC_834, regp->crtc_834);
 +
-+		if (nv_arch(dev) >= NV_30)
++		if (dev_priv->card_type >= NV_30)
 +			NVWriteCRTC(dev, head, NV_PCRTC_GPIO_EXT, regp->gpio_ext);
 +
-+		if (nv_arch(dev) == NV_40) {
++		if (dev_priv->card_type == NV_40) {
 +			NVWriteCRTC(dev, head, NV_PCRTC_850, regp->crtc_850);
 +
 +			reg900 = NVReadRAMDAC(dev, head, NV_PRAMDAC_900);
@@ -15825,20 +15874,20 @@ index 0000000..e78ee53
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_ENH_INDEX);
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_FF_INDEX);
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_FFLWM__INDEX);
-+	if (nv_arch(dev) >= NV_30)
++	if (dev_priv->card_type >= NV_30)
 +		wr_cio_state(dev, head, regp, NV_CIO_CRE_47);
 +
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_49);
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR0_INDEX);
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR1_INDEX);
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_HCUR_ADDR2_INDEX);
-+	if (nv_arch(dev) == NV_40)
++	if (dev_priv->card_type == NV_40)
 +		nv_fix_nv40_hw_cursor(dev, head);
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_ILACE__INDEX);
 +
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_SCRATCH3__INDEX);
 +	wr_cio_state(dev, head, regp, NV_CIO_CRE_SCRATCH4__INDEX);
-+	if (nv_arch(dev) >= NV_10) {
++	if (dev_priv->card_type >= NV_10) {
 +		wr_cio_state(dev, head, regp, NV_CIO_CRE_EBR_INDEX);
 +		wr_cio_state(dev, head, regp, NV_CIO_CRE_CSB);
 +		wr_cio_state(dev, head, regp, NV_CIO_CRE_4B);
@@ -15846,7 +15895,7 @@ index 0000000..e78ee53
 +	}
 +	/* NV11 and NV20 stop at 0x52. */
 +	if (nv_gf4_disp_arch(dev)) {
-+		if (nv_arch(dev) == NV_10) {
++		if (dev_priv->card_type == NV_10) {
 +			/* Not waiting for vertical retrace before modifying
 +			   CRE_53/CRE_54 causes lockups. */
 +			nouveau_wait_until(dev, 650000000, NV_PRMCIO_INP0__COLOR, 0x8, 0x8);
@@ -15934,10 +15983,10 @@ index 0000000..e78ee53
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.h b/drivers/gpu/drm/nouveau/nouveau_hw.h
 new file mode 100644
-index 0000000..ff4993a
+index 0000000..869130f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_hw.h
-@@ -0,0 +1,448 @@
+@@ -0,0 +1,455 @@
 +/*
 + * Copyright 2008 Stuart Bennett
 + *
@@ -16170,10 +16219,12 @@ index 0000000..ff4993a
 +static inline uint8_t NVReadPRMVIO(struct drm_device *dev,
 +					int head, uint32_t reg)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	uint8_t val;
++
 +	/* Only NV4x have two pvio ranges; other twoHeads cards MUST call
 +	 * NVSetOwner for the relevant head to be programmed */
-+	if (head && nv_arch(dev) == NV_40)
++	if (head && dev_priv->card_type == NV_40)
 +		reg += NV_PRMVIO_SIZE;
 +
 +	val = nv_rd08(dev, reg);
@@ -16184,9 +16235,11 @@ index 0000000..ff4993a
 +static inline void NVWritePRMVIO(struct drm_device *dev,
 +					int head, uint32_t reg, uint8_t value)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++
 +	/* Only NV4x have two pvio ranges; other twoHeads cards MUST call
 +	 * NVSetOwner for the relevant head to be programmed */
-+	if (head && nv_arch(dev) == NV_40)
++	if (head && dev_priv->card_type == NV_40)
 +		reg += NV_PRMVIO_SIZE;
 +
 +	NV_REG_DEBUG(RMVIO, dev, "head %d reg %08x val %02x\n",
@@ -16334,7 +16387,9 @@ index 0000000..ff4993a
 +
 +static inline int nv_cursor_width(struct drm_device *dev)
 +{
-+	return nv_arch(dev) >= NV_10 ? NV10_CURSOR_SIZE : NV04_CURSOR_SIZE;
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++
++	return dev_priv->card_type >= NV_10 ? NV10_CURSOR_SIZE : NV04_CURSOR_SIZE;
 +}
 +
 +static inline void
@@ -16362,13 +16417,14 @@ index 0000000..ff4993a
 +		*curctl1 &= ~MASK(NV_CIO_CRE_HCUR_ADDR1_ENABLE);
 +	NVWriteVgaCrtc(dev, head, NV_CIO_CRE_HCUR_ADDR1_INDEX, *curctl1);
 +
-+	if (nv_arch(dev) == NV_40)
++	if (dev_priv->card_type == NV_40)
 +		nv_fix_nv40_hw_cursor(dev, head);
 +}
 +
 +static inline uint32_t
 +nv_pitch_align(struct drm_device *dev, uint32_t width, int bpp)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int mask;
 +
 +	if (bpp == 15)
@@ -16377,7 +16433,7 @@ index 0000000..ff4993a
 +		bpp = 8;
 +
 +	/* Alignment requirements taken from the Haiku driver */
-+	if (nv_arch(dev) == NV_04)
++	if (dev_priv->card_type == NV_04)
 +		mask = 128 / bpp - 1;
 +	else
 +		mask = 512 / bpp - 1;
@@ -16780,10 +16836,10 @@ index 0000000..a2c30f4
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
 new file mode 100644
-index 0000000..597007a
+index 0000000..39b9f51
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
-@@ -0,0 +1,696 @@
+@@ -0,0 +1,693 @@
 +/*
 + * Copyright (C) 2006 Ben Skeggs.
 + *
@@ -17280,12 +17336,9 @@ index 0000000..597007a
 +
 +	switch (dev_priv->card_type) {
 +	case NV_04:
-+	case NV_05:
 +		nv04_graph_context_switch(dev);
 +		break;
 +	case NV_10:
-+	case NV_11:
-+	case NV_17:
 +		nv10_graph_context_switch(dev);
 +		break;
 +	default:
@@ -17482,10 +17535,10 @@ index 0000000..597007a
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
 new file mode 100644
-index 0000000..4a6fde6
+index 0000000..7d35bd5
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
-@@ -0,0 +1,585 @@
+@@ -0,0 +1,583 @@
 +/*
 + * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
 + * Copyright 2005 Stephane Marchesin
@@ -17852,10 +17905,11 @@ index 0000000..4a6fde6
 +uint64_t nouveau_mem_fb_amount(struct drm_device *dev)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	uint32_t boot0;
++
 +	switch (dev_priv->card_type) {
 +	case NV_04:
-+	case NV_05: {
-+		uint32_t boot0 = nv_rd32(dev, NV03_BOOT_0);
++		boot0 = nv_rd32(dev, NV03_BOOT_0);
 +		if (boot0 & 0x00000100)
 +			return (((boot0 >> 12) & 0xf) * 2 + 2) * 1024 * 1024;
 +
@@ -17870,10 +17924,7 @@ index 0000000..4a6fde6
 +			return 4 * 1024 * 1024;
 +		}
 +		break;
-+	}
 +	case NV_10:
-+	case NV_11:
-+	case NV_17:
 +	case NV_20:
 +	case NV_30:
 +	case NV_40:
@@ -20696,10 +20747,10 @@ index 0000000..4c7f1e4
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..205b6d9
+index 0000000..0de87b8
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,876 @@
+@@ -0,0 +1,865 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -21047,13 +21098,6 @@ index 0000000..205b6d9
 +	if (dev_priv->init_state == NOUVEAU_CARD_INIT_DONE)
 +		return 0;
 +
-+	/* Determine exact chipset we're running on */
-+	if (dev_priv->card_type < NV_10)
-+		dev_priv->chipset = dev_priv->card_type;
-+	else
-+		dev_priv->chipset =
-+			(nv_rd32(dev, NV03_PMC_BOOT_0) & 0x0ff00000) >> 20;
-+
 +	/* Initialise internal driver API hooks */
 +	ret = nouveau_init_engine_ptrs(dev);
 +	if (ret)
@@ -21267,7 +21311,6 @@ index 0000000..205b6d9
 +{
 +	struct drm_nouveau_private *dev_priv;
 +	uint32_t reg0;
-+	uint8_t architecture = 0;
 +	resource_size_t mmio_start_offs;
 +
 +	dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
@@ -21321,41 +21364,38 @@ index 0000000..205b6d9
 +	/* We're dealing with >=NV10 */
 +	if ((reg0 & 0x0f000000) > 0) {
 +		/* Bit 27-20 contain the architecture in hex */
-+		architecture = (reg0 & 0xff00000) >> 20;
++		dev_priv->chipset = (reg0 & 0xff00000) >> 20;
 +	/* NV04 or NV05 */
 +	} else if ((reg0 & 0xff00fff0) == 0x20004000) {
-+		architecture = 0x04;
-+	}
++		dev_priv->chipset = 0x04;
++	} else
++		dev_priv->chipset = 0xff;
 +
-+	if (architecture >= 0x80)
-+		dev_priv->card_type = NV_50;
-+	else if (architecture >= 0x60)
++	switch (dev_priv->chipset & 0xf0) {
++	case 0x00:
++	case 0x10:
++	case 0x20:
++	case 0x30:
++		dev_priv->card_type = dev_priv->chipset & 0xf0;
++		break;
++	case 0x40:
++	case 0x60:
 +		dev_priv->card_type = NV_40;
-+	else if (architecture >= 0x50)
++		break;
++	case 0x50:
++	case 0x80:
++	case 0x90:
++	case 0xa0:
 +		dev_priv->card_type = NV_50;
-+	else if (architecture >= 0x40)
-+		dev_priv->card_type = NV_40;
-+	else if (architecture >= 0x30)
-+		dev_priv->card_type = NV_30;
-+	else if (architecture >= 0x20)
-+		dev_priv->card_type = NV_20;
-+	else if (architecture >= 0x17)
-+		dev_priv->card_type = NV_17;
-+	else if (architecture >= 0x11)
-+		dev_priv->card_type = NV_11;
-+	else if (architecture >= 0x10)
-+		dev_priv->card_type = NV_10;
-+	else if (architecture >= 0x04)
-+		dev_priv->card_type = NV_04;
-+	else
-+		dev_priv->card_type = NV_UNKNOWN;
++		break;
++	default:
++		NV_INFO(dev, "Unsupported chipset 0x%08x\n", reg0);
++		return -EINVAL;
++	}
 +
-+	NV_INFO(dev, "Detected an NV%d generation card (0x%08x)\n",
++	NV_INFO(dev, "Detected an NV%2x generation card (0x%08x)\n",
 +		dev_priv->card_type, reg0);
 +
-+	if (dev_priv->card_type == NV_UNKNOWN)
-+		return -EINVAL;
-+
 +	/* map larger RAMIN aperture on NV40 cards */
 +	dev_priv->ramin  = NULL;
 +	if (dev_priv->card_type >= NV_40) {
@@ -21715,10 +21755,10 @@ index 0000000..7818981
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
 new file mode 100644
-index 0000000..0a5cfc1
+index 0000000..b913636
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
-@@ -0,0 +1,1001 @@
+@@ -0,0 +1,1002 @@
 +/*
 + * Copyright 1993-2003 NVIDIA, Corporation
 + * Copyright 2006 Dave Airlie
@@ -21855,7 +21895,7 @@ index 0000000..0a5cfc1
 +	state->pllsel &= PLLSEL_VPLL1_MASK | PLLSEL_VPLL2_MASK | PLLSEL_TV_MASK;
 +
 +	/* The blob uses this always, so let's do the same */
-+	if (nv_arch(dev) == NV_40)
++	if (dev_priv->card_type == NV_40)
 +		state->pllsel |= NV_PRAMDAC_PLL_COEFF_SELECT_USE_VPLL2_TRUE;
 +	/* again nv40 and some nv43 act more like nv3x as described above */
 +	if (dev_priv->chipset < 0x41)
@@ -21984,7 +22024,7 @@ index 0000000..0a5cfc1
 +		horizEnd = horizTotal - 2;
 +		horizBlankEnd = horizTotal + 4;
 +#if 0
-+		if (dev->overlayAdaptor && nv_arch(dev) >= NV_10)
++		if (dev->overlayAdaptor && dev_priv->card_type >= NV_10)
 +			/* This reportedly works around some video overlay bandwidth problems */
 +			horizTotal += 2;
 +#endif
@@ -22261,17 +22301,17 @@ index 0000000..0a5cfc1
 +	regp->crtc_830 = mode->crtc_vdisplay - 3;
 +	regp->crtc_834 = mode->crtc_vdisplay - 1;
 +
-+	if (nv_arch(dev) == NV_40)
++	if (dev_priv->card_type == NV_40)
 +		/* This is what the blob does */
 +		regp->crtc_850 = NVReadCRTC(dev, 0, NV_PCRTC_850);
 +
-+	if (nv_arch(dev) >= NV_30)
++	if (dev_priv->card_type >= NV_30)
 +		regp->gpio_ext = NVReadCRTC(dev, 0, NV_PCRTC_GPIO_EXT);
 +
 +	regp->crtc_cfg = NV_PCRTC_CONFIG_START_ADDRESS_HSYNC;
 +
 +	/* Some misc regs */
-+	if (nv_arch(dev) == NV_40) {
++	if (dev_priv->card_type == NV_40) {
 +		regp->CRTC[NV_CIO_CRE_85] = 0xFF;
 +		regp->CRTC[NV_CIO_CRE_86] = 0x1;
 +	}
@@ -22283,7 +22323,7 @@ index 0000000..0a5cfc1
 +
 +	/* Generic PRAMDAC regs */
 +
-+	if (nv_arch(dev) >= NV_10)
++	if (dev_priv->card_type >= NV_10)
 +		/* Only bit that bios and blob set. */
 +		regp->nv10_cursync = (1 << 25);
 +
@@ -22332,7 +22372,7 @@ index 0000000..0a5cfc1
 +
 +	nv_crtc_mode_set_vga(crtc, adjusted_mode);
 +	/* calculated in nv04_dfp_prepare, nv40 needs it written before calculating PLLs */
-+	if (nv_arch(dev) == NV_40)
++	if (dev_priv->card_type == NV_40)
 +		NVWriteRAMDAC(dev, 0, NV_PRAMDAC_SEL_CLK, dev_priv->mode_reg.sel_clk);
 +	nv_crtc_mode_set_regs(crtc, adjusted_mode);
 +	nv_crtc_calc_state_ext(crtc, mode, adjusted_mode->clock);
@@ -22379,6 +22419,7 @@ index 0000000..0a5cfc1
 +static void nv_crtc_prepare(struct drm_crtc *crtc)
 +{
 +	struct drm_device *dev = crtc->dev;
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
 +	struct drm_crtc_helper_funcs *funcs = crtc->helper_private;
 +
@@ -22391,7 +22432,7 @@ index 0000000..0a5cfc1
 +
 +	/* Some more preperation. */
 +	NVWriteCRTC(dev, nv_crtc->index, NV_PCRTC_CONFIG, NV_PCRTC_CONFIG_START_ADDRESS_NON_VGA);
-+	if (nv_arch(dev) == NV_40) {
++	if (dev_priv->card_type == NV_40) {
 +		uint32_t reg900 = NVReadRAMDAC(dev, nv_crtc->index, NV_PRAMDAC_900);
 +		NVWriteRAMDAC(dev, nv_crtc->index, NV_PRAMDAC_900, reg900 & ~0x10000);
 +	}
@@ -22540,7 +22581,7 @@ index 0000000..0a5cfc1
 +	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_FF_INDEX);
 +	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_FFLWM__INDEX);
 +
-+	if (nv_arch(dev) >= NV_30) {
++	if (dev_priv->card_type >= NV_30) {
 +		regp->CRTC[NV_CIO_CRE_47] = arb_lwm >> 8;
 +		crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_47);
 +	}
@@ -22722,7 +22763,7 @@ index 0000000..0a5cfc1
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_cursor.c b/drivers/gpu/drm/nouveau/nv04_cursor.c
 new file mode 100644
-index 0000000..fc9156e
+index 0000000..89a91b9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_cursor.c
 @@ -0,0 +1,70 @@
@@ -22782,7 +22823,7 @@ index 0000000..fc9156e
 +	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_HCUR_ADDR0_INDEX);
 +	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_HCUR_ADDR1_INDEX);
 +	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_HCUR_ADDR2_INDEX);
-+	if (nv_arch(dev) == NV_40)
++	if (dev_priv->card_type == NV_40)
 +		nv_fix_nv40_hw_cursor(dev, nv_crtc->index);
 +}
 +
@@ -22798,7 +22839,7 @@ index 0000000..fc9156e
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
 new file mode 100644
-index 0000000..f781761
+index 0000000..a5fa517
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_dac.c
 @@ -0,0 +1,528 @@
@@ -23071,7 +23112,7 @@ index 0000000..f781761
 +	/* nv driver and nv31 use 0xfffffeee, nv34 and 6600 use 0xfffffece */
 +	routput = (saved_routput & 0xfffffece) | head << 8;
 +
-+	if (nv_arch(dev) >= NV_40) {
++	if (dev_priv->card_type >= NV_40) {
 +		if (dcb->type == OUTPUT_TV)
 +			routput |= 0x1a << 16;
 +		else
@@ -25469,10 +25510,10 @@ index 0000000..396ee92
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
 new file mode 100644
-index 0000000..d87a426
+index 0000000..a20c206
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c
-@@ -0,0 +1,210 @@
+@@ -0,0 +1,208 @@
 +#include "drmP.h"
 +#include "drm.h"
 +#include "nouveau_drv.h"
@@ -25483,10 +25524,10 @@ index 0000000..d87a426
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +
-+	if (dev_priv->card_type >= NV_40)
++	if (dev_priv->chipset >= 0x40)
 +		return 128;
 +	else
-+	if (dev_priv->card_type >= NV_17)
++	if (dev_priv->chipset >= 0x17)
 +		return 64;
 +
 +	return 32;
@@ -25567,8 +25608,6 @@ index 0000000..d87a426
 +		break;
 +	case NV_30:
 +	case NV_20:
-+	case NV_17:
-+	case NV_11:
 +	case NV_10:
 +	case NV_04:
 +	default:
@@ -26109,7 +26148,7 @@ index 0000000..79e2d10
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c b/drivers/gpu/drm/nouveau/nv10_fifo.c
 new file mode 100644
-index 0000000..877f00e
+index 0000000..7aeabf2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv10_fifo.c
 @@ -0,0 +1,260 @@
@@ -26331,12 +26370,12 @@ index 0000000..877f00e
 +				       (dev_priv->ramht_offset >> 8));
 +	nv_wr32(dev, NV03_PFIFO_RAMRO, dev_priv->ramro_offset>>8);
 +
-+	if (dev_priv->card_type > NV_11) {
++	if (dev_priv->chipset < 0x17) {
++		nv_wr32(dev, NV03_PFIFO_RAMFC, dev_priv->ramfc_offset >> 8);
++	} else {
 +		nv_wr32(dev, NV03_PFIFO_RAMFC, (dev_priv->ramfc_offset >> 8) |
 +					       (1 << 16) /* 64 Bytes entry*/);
 +		/* XXX nvidia blob set bit 18, 21,23 for nv20 & nv30 */
-+	} else {
-+		nv_wr32(dev, NV03_PFIFO_RAMFC, dev_priv->ramfc_offset >> 8);
 +	}
 +}
 +
@@ -27371,7 +27410,7 @@ index 0000000..2e58c33
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
 new file mode 100644
-index 0000000..009fa48
+index 0000000..46cfd9c
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv17_tv.c
 @@ -0,0 +1,681 @@
@@ -27668,7 +27707,7 @@ index 0000000..009fa48
 +	/* Set the DACCLK register */
 +	dacclk = (NVReadRAMDAC(dev, 0, dacclk_off) & ~0x30) | 0x1;
 +
-+	if (nv_arch(dev) == NV_40)
++	if (dev_priv->card_type == NV_40)
 +		dacclk |= 0x1a << 16;
 +
 +	if (tv_norm->kind == CTV_ENC_MODE) {
@@ -27725,7 +27764,7 @@ index 0000000..009fa48
 +			tv_regs->ptv_614 = 0x13;
 +		}
 +
-+		if (nv_arch(dev) >= NV_30) {
++		if (dev_priv->card_type >= NV_30) {
 +			tv_regs->ptv_500 = 0xe8e0;
 +			tv_regs->ptv_504 = 0x1710;
 +			tv_regs->ptv_604 = 0x0;
@@ -32272,10 +32311,10 @@ index 0000000..2a3495e
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
 new file mode 100644
-index 0000000..768fb4f
+index 0000000..f8e28a1
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
-@@ -0,0 +1,788 @@
+@@ -0,0 +1,769 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -32368,7 +32407,6 @@ index 0000000..768fb4f
 +		BEGIN_RING(evo, 0, NV50_EVO_CRTC(index, FB_DMA), 1);
 +		OUT_RING(evo, NV50_EVO_CRTC_FB_DMA_HANDLE_NONE);
 +	} else {
-+		nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);
 +		if (nv_crtc->cursor.visible)
 +			nv_crtc->cursor.show(nv_crtc, false);
 +		else
@@ -32553,23 +32591,6 @@ index 0000000..768fb4f
 +	if (ret)
 +		return ret;
 +
-+	/*XXX: need a vbios image from one of these cards to look at
-+	 *     rather than just guessing.  P isn't log2P on these
-+	 *     cards, it's uncertain at this stage what the PLL
-+	 *     limits tables have to say about these chips.
-+	 *
-+	 *     getPLL_single will need some modifications to calculate
-+	 *     this properly too.
-+	 *
-+	 *     for the moment, hacking up the PLL limits table with
-+	 *     a log2 value matching nv's maximum.
-+	 */
-+	if (!limits.vco2.maxfreq) {
-+		NV_ERROR(dev, "single-stage PLL, please report: %d!!\n",
-+			 limits.max_usable_log2p);
-+		limits.max_usable_log2p = 6;
-+	}
-+
 +	ret = nouveau_calc_pll_mnp(dev, &limits, pclk, &pll);
 +	if (ret <= 0)
 +		return ret;
@@ -32585,7 +32606,7 @@ index 0000000..768fb4f
 +		reg1 = nv_rd32(dev, pll_reg + 4) & 0xffc00000;
 +		nv_wr32(dev, pll_reg, 0x50000610);
 +		nv_wr32(dev, pll_reg + 4, reg1 |
-+			(((1<<pll.log2P)-1) << 16) | (pll.M1 << 8) | pll.N1);
++			(pll.log2P << 16) | (pll.M1 << 8) | pll.N1);
 +	}
 +
 +	return 0;
@@ -32646,9 +32667,8 @@ index 0000000..768fb4f
 +
 +	nouveau_bo_unmap(cursor);
 +
-+	nv_crtc->cursor.offset  = nv_crtc->cursor.nvbo->bo.offset;
-+	nv_crtc->cursor.offset -= dev_priv->vm_vram_base;
-+	nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);
++	nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.nvbo->bo.offset -
++					    dev_priv->vm_vram_base);
 +	nv_crtc->cursor.show(nv_crtc, true);
 +
 +out:
@@ -33066,10 +33086,10 @@ index 0000000..768fb4f
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
 new file mode 100644
-index 0000000..aa7baad
+index 0000000..e2e79a8
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_cursor.c
-@@ -0,0 +1,153 @@
+@@ -0,0 +1,156 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -33106,55 +33126,63 @@ index 0000000..aa7baad
 +#include "nv50_display.h"
 +
 +static void
-+nv50_cursor_show(struct nouveau_crtc *crtc, bool update)
++nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
 +{
-+	struct drm_nouveau_private *dev_priv = crtc->base.dev->dev_private;
++	struct drm_nouveau_private *dev_priv = nv_crtc->base.dev->dev_private;
 +	struct nouveau_channel *evo = dev_priv->evo;
-+	struct drm_device *dev = crtc->base.dev;
++	struct drm_device *dev = nv_crtc->base.dev;
 +	int ret;
 +
 +	NV_DEBUG(dev, "\n");
 +
-+	ret = RING_SPACE(evo, (dev_priv->chipset != 0x50 ? 4 : 2) + update * 2);
++	if (update && nv_crtc->cursor.visible)
++		return;
++
++	ret = RING_SPACE(evo, (dev_priv->chipset != 0x50 ? 5 : 3) + update * 2);
 +	if (ret) {
 +		NV_ERROR(dev, "no space while unhiding cursor\n");
 +		return;
 +	}
 +
 +	if (dev_priv->chipset != 0x50) {
-+		BEGIN_RING(evo, 0, NV84_EVO_CRTC(crtc->index, CURSOR_DMA), 1);
++		BEGIN_RING(evo, 0, NV84_EVO_CRTC(nv_crtc->index, CURSOR_DMA), 1);
 +		OUT_RING(evo, NvEvoVRAM);
 +	}
-+	BEGIN_RING(evo, 0, NV50_EVO_CRTC(crtc->index, CURSOR_CTRL), 1);
++	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc->index, CURSOR_CTRL), 2);
 +	OUT_RING(evo, NV50_EVO_CRTC_CURSOR_CTRL_SHOW);
++	OUT_RING(evo, nv_crtc->cursor.offset >> 8);
 +
 +	if (update) {
 +		BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
 +		OUT_RING(evo, 0);
 +		FIRE_RING(evo);
-+		crtc->cursor.visible = true;
++		nv_crtc->cursor.visible = true;
 +	}
 +}
 +
 +static void
-+nv50_cursor_hide(struct nouveau_crtc *crtc, bool update)
++nv50_cursor_hide(struct nouveau_crtc *nv_crtc, bool update)
 +{
-+	struct drm_nouveau_private *dev_priv = crtc->base.dev->dev_private;
++	struct drm_nouveau_private *dev_priv = nv_crtc->base.dev->dev_private;
 +	struct nouveau_channel *evo = dev_priv->evo;
-+	struct drm_device *dev = crtc->base.dev;
++	struct drm_device *dev = nv_crtc->base.dev;
 +	int ret;
 +
 +	NV_DEBUG(dev, "\n");
 +
-+	ret = RING_SPACE(evo, (dev_priv->chipset != 0x50 ? 4 : 2) + update * 2);
++	if (update && !nv_crtc->cursor.visible)
++		return;
++
++	ret = RING_SPACE(evo, (dev_priv->chipset != 0x50 ? 5 : 3) + update * 2);
 +	if (ret) {
 +		NV_ERROR(dev, "no space while hiding cursor\n");
 +		return;
 +	}
-+	BEGIN_RING(evo, 0, NV50_EVO_CRTC(crtc->index, CURSOR_CTRL), 1);
++	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc->index, CURSOR_CTRL), 2);
 +	OUT_RING(evo, NV50_EVO_CRTC_CURSOR_CTRL_HIDE);
++	OUT_RING(evo, 0);
 +	if (dev_priv->chipset != 0x50) {
-+		BEGIN_RING(evo, 0, NV84_EVO_CRTC(crtc->index, CURSOR_DMA), 1);
++		BEGIN_RING(evo, 0, NV84_EVO_CRTC(nv_crtc->index, CURSOR_DMA), 1);
 +		OUT_RING(evo, NV84_EVO_CRTC_CURSOR_DMA_HANDLE_NONE);
 +	}
 +
@@ -33162,55 +33190,50 @@ index 0000000..aa7baad
 +		BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
 +		OUT_RING(evo, 0);
 +		FIRE_RING(evo);
-+		crtc->cursor.visible = false;
++		nv_crtc->cursor.visible = false;
 +	}
 +}
 +
 +static void
-+nv50_cursor_set_pos(struct nouveau_crtc *crtc, int x, int y)
++nv50_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y)
 +{
-+	struct drm_device *dev = crtc->base.dev;
++	struct drm_device *dev = nv_crtc->base.dev;
 +
-+	nv_wr32(dev, NV50_PDISPLAY_CURSOR_USER_POS(crtc->index),
++	nv_wr32(dev, NV50_PDISPLAY_CURSOR_USER_POS(nv_crtc->index),
 +		((y & 0xFFFF) << 16) | (x & 0xFFFF));
 +	/* Needed to make the cursor move. */
-+	nv_wr32(dev, NV50_PDISPLAY_CURSOR_USER_POS_CTRL(crtc->index), 0);
++	nv_wr32(dev, NV50_PDISPLAY_CURSOR_USER_POS_CTRL(nv_crtc->index), 0);
 +}
 +
 +static void
-+nv50_cursor_set_offset(struct nouveau_crtc *crtc, uint32_t offset)
++nv50_cursor_set_offset(struct nouveau_crtc *nv_crtc, uint32_t offset)
 +{
-+	struct drm_nouveau_private *dev_priv = crtc->base.dev->dev_private;
-+	struct nouveau_channel *evo = dev_priv->evo;
-+	struct drm_device *dev = crtc->base.dev;
-+	int ret;
-+
-+	NV_DEBUG(dev, "\n");
-+
-+	ret = RING_SPACE(evo, 2);
-+	if (ret) {
-+		NV_ERROR(dev, "no space while setting cursor image\n");
++	NV_DEBUG(nv_crtc->base.dev, "\n");
++	if (offset == nv_crtc->cursor.offset)
 +		return;
++
++	nv_crtc->cursor.offset = offset;
++	if (nv_crtc->cursor.visible) {
++		nv_crtc->cursor.visible = false;
++		nv_crtc->cursor.show(nv_crtc, true);
 +	}
-+	BEGIN_RING(evo, 0, NV50_EVO_CRTC(crtc->index, CURSOR_OFFSET), 1);
-+	OUT_RING(evo, offset >> 8);
 +}
 +
 +int
-+nv50_cursor_init(struct nouveau_crtc *crtc)
++nv50_cursor_init(struct nouveau_crtc *nv_crtc)
 +{
-+	crtc->cursor.set_offset = nv50_cursor_set_offset;
-+	crtc->cursor.set_pos = nv50_cursor_set_pos;
-+	crtc->cursor.hide = nv50_cursor_hide;
-+	crtc->cursor.show = nv50_cursor_show;
++	nv_crtc->cursor.set_offset = nv50_cursor_set_offset;
++	nv_crtc->cursor.set_pos = nv50_cursor_set_pos;
++	nv_crtc->cursor.hide = nv50_cursor_hide;
++	nv_crtc->cursor.show = nv50_cursor_show;
 +	return 0;
 +}
 +
 +void
-+nv50_cursor_fini(struct nouveau_crtc *crtc)
++nv50_cursor_fini(struct nouveau_crtc *nv_crtc)
 +{
-+	struct drm_device *dev = crtc->base.dev;
-+	int idx = crtc->index;
++	struct drm_device *dev = nv_crtc->base.dev;
++	int idx = nv_crtc->index;
 +
 +	NV_DEBUG(dev, "\n");
 +
@@ -33535,10 +33558,10 @@ index 0000000..fb5838e
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
 new file mode 100644
-index 0000000..8a1dd89
+index 0000000..dd4bff2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_display.c
-@@ -0,0 +1,994 @@
+@@ -0,0 +1,998 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -33737,27 +33760,31 @@ index 0000000..8a1dd89
 +	 * that enables things.
 +	 */
 +	/* CRTC? */
-+	nv_wr32(dev, 0x00610190 + 0 * 0x10, nv_rd32(dev, 0x00616100 + 0 * 0x800));
-+	nv_wr32(dev, 0x00610190 + 1 * 0x10, nv_rd32(dev, 0x00616100 + 1 * 0x800));
-+	nv_wr32(dev, 0x00610194 + 0 * 0x10, nv_rd32(dev, 0x00616104 + 0 * 0x800));
-+	nv_wr32(dev, 0x00610194 + 1 * 0x10, nv_rd32(dev, 0x00616104 + 1 * 0x800));
-+	nv_wr32(dev, 0x00610198 + 0 * 0x10, nv_rd32(dev, 0x00616108 + 0 * 0x800));
-+	nv_wr32(dev, 0x00610198 + 1 * 0x10, nv_rd32(dev, 0x00616108 + 1 * 0x800));
-+	nv_wr32(dev, 0x0061019c + 0 * 0x10, nv_rd32(dev, 0x0061610c + 0 * 0x800));
-+	nv_wr32(dev, 0x0061019c + 1 * 0x10, nv_rd32(dev, 0x0061610c + 1 * 0x800));
++	for (i = 0; i < 2; i++) {
++		val = nv_rd32(dev, 0x00616100 + (i * 0x800));
++		nv_wr32(dev, 0x00610190 + (i * 0x10), val);
++		val = nv_rd32(dev, 0x00616104 + (i * 0x800));
++		nv_wr32(dev, 0x00610194 + (i * 0x10), val);
++		val = nv_rd32(dev, 0x00616108 + (i * 0x800));
++		nv_wr32(dev, 0x00610198 + (i * 0x10), val);
++		val = nv_rd32(dev, 0x0061610c + (i * 0x800));
++		nv_wr32(dev, 0x0061019c + (i * 0x10), val);
++	}
 +	/* DAC */
-+	nv_wr32(dev, 0x006101d0 + 0 * 0x4, nv_rd32(dev, 0x0061a000 + 0 * 0x800));
-+	nv_wr32(dev, 0x006101d0 + 1 * 0x4, nv_rd32(dev, 0x0061a000 + 1 * 0x800));
-+	nv_wr32(dev, 0x006101d0 + 2 * 0x4, nv_rd32(dev, 0x0061a000 + 2 * 0x800));
++	for (i = 0; i < 3; i++) {
++		val = nv_rd32(dev, 0x0061a000 + (i * 0x800));
++		nv_wr32(dev, 0x006101d0 + (i * 0x04), val);
++	}
 +	/* SOR */
-+	nv_wr32(dev, 0x006101e0 + 0 * 0x4, nv_rd32(dev, 0x0061c000 + 0 * 0x800));
-+	nv_wr32(dev, 0x006101e0 + 1 * 0x4, nv_rd32(dev, 0x0061c000 + 1 * 0x800));
-+	nv_wr32(dev, 0x006101e0 + 2 * 0x4, nv_rd32(dev, 0x0061c000 + 2 * 0x800));
-+	nv_wr32(dev, 0x006101e0 + 3 * 0x4, nv_rd32(dev, 0x0061c000 + 3 * 0x800));
++	for (i = 0; i < 4; i++) {
++		val = nv_rd32(dev, 0x0061c000 + (i * 0x800));
++		nv_wr32(dev, 0x006101e0 + (i * 0x04), val);
++	}
 +	/* Something not yet in use, tv-out maybe. */
-+	nv_wr32(dev, 0x006101f0 + 0 * 0x4, nv_rd32(dev, 0x0061e000 + 0 * 0x800));
-+	nv_wr32(dev, 0x006101f0 + 1 * 0x4, nv_rd32(dev, 0x0061e000 + 1 * 0x800));
-+	nv_wr32(dev, 0x006101f0 + 2 * 0x4, nv_rd32(dev, 0x0061e000 + 2 * 0x800));
++	for (i = 0; i < 3; i++) {
++		val = nv_rd32(dev, 0x0061e000 + (i * 0x800));
++		nv_wr32(dev, 0x006101f0 + (i * 0x04), val);
++	}
 +
 +	for (i = 0; i < 3; i++) {
 +		nv_wr32(dev, NV50_PDISPLAY_DAC_DPMS_CTRL(i), 0x00550000 |
@@ -35485,10 +35512,10 @@ index 0000000..77ae1aa
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..eef3ebd
+index 0000000..7ff54c8
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,479 @@
+@@ -0,0 +1,470 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -35844,32 +35871,23 @@ index 0000000..eef3ebd
 +	return nv50_graph_do_load_context(chan->dev, inst);
 +}
 +
-+static int
-+nv50_graph_do_save_context(struct drm_device *dev, uint32_t inst)
++int
++nv50_graph_unload_context(struct drm_device *dev)
 +{
-+	uint32_t fifo = nv_rd32(dev, 0x400500);
++	uint32_t inst, fifo = nv_rd32(dev, 0x400500);
++
++	inst  = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
++	if (!(inst & NV50_PGRAPH_CTXCTL_CUR_LOADED))
++		return 0;
++	inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE;
 +
 +	nv_wr32(dev, 0x400500, fifo & ~1);
 +	nv_wr32(dev, 0x400784, inst);
 +	nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) | 0x20);
 +	nv_wr32(dev, 0x400304, nv_rd32(dev, 0x400304) | 0x01);
 +	nouveau_wait_for_idle(dev);
-+
 +	nv_wr32(dev, 0x400500, fifo);
-+	return 0;
-+}
 +
-+int
-+nv50_graph_unload_context(struct drm_device *dev)
-+{
-+	uint32_t inst;
-+	int ret;
-+
-+	inst  = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
-+	if (!(inst & NV50_PGRAPH_CTXCTL_CUR_LOADED))
-+		return 0;
-+	inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE;
-+	ret = nv50_graph_do_save_context(dev, inst);
 +	nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR, inst);
 +	return 0;
 +}
@@ -63369,7 +63387,7 @@ index 0000000..e0a9c3f
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
 new file mode 100644
-index 0000000..019a1bf
+index 0000000..ef9dc02
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
 @@ -0,0 +1,269 @@
@@ -63530,7 +63548,7 @@ index 0000000..019a1bf
 +
 +	switch (nv_encoder->dcb->type) {
 +	case OUTPUT_TMDS:
-+		if (nv_encoder->dcb->tmdsconf.sor_link & 1) {
++		if (nv_encoder->dcb->sorconf.link & 1) {
 +			if (adjusted_mode->clock < 165000)
 +				mode_ctl = 0x0100;
 +			else


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1948
retrieving revision 1.1949
diff -u -p -r1.1948 -r1.1949
--- kernel.spec	4 Dec 2009 04:38:00 -0000	1.1948
+++ kernel.spec	4 Dec 2009 04:48:59 -0000	1.1949
@@ -2167,6 +2167,14 @@ fi
 # and build.
 
 %changelog
+* Fri Dec 04 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-163
+- nouveau: reduce debug level of some warning messages (rh#543883)
+- nouveau: modesetting fixes on nva5/nva8
+- nouveau: suspend/resume fixes on nva5/nva8 (bios opcode 0x8d)
+- nouveau: cleanup chipset/arch handling, fail init on unknown chipsets
+- nouveau: fix failure to detect some outputs when dcb table is odd
+- nouveau: eliminate unnecessary cursor state changes on nv50
+
 * Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.6-162
 - ipv4-fix-null-ptr-deref-in-ip_fragment.patch: null ptr deref
   bug fix.



From emaldonado at fedoraproject.org  Fri Dec  4 05:07:05 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Dec 2009 05:07:05 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.126,1.127
Message-ID: <20091204050705.1430511C00E0@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5580

Modified Files:
	nss.spec 
Log Message:
Reatagging to pick up another patch


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- nss.spec	4 Dec 2009 04:24:51 -0000	1.126
+++ nss.spec	4 Dec 2009 05:07:04 -0000	1.127
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}
+Release:          1%{?dist}.1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -471,6 +471,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.1
+- Retagging to include missing patch
+
 * Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1
 - Update to 3.12.5
 - Patch to allow ssl/tls clients to interoperate with servers that require renogiation



From tagoh at fedoraproject.org  Fri Dec  4 05:11:00 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri,  4 Dec 2009 05:11:00 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/devel knm-new-fixed-fonts.spec,1.2,1.3
Message-ID: <20091204051100.80D5411C00E0@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm-new-fixed-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6511

Modified Files:
	knm-new-fixed-fonts.spec 
Log Message:
* Fri Dec  4 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-10
- revert the previous change and set the priority to 69 to ensure loading
  the rule later according to the result of
  https://bugzilla.redhat.com/show_bug.cgi?id=532237#c6
  (#532237)


Index: knm-new-fixed-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/devel/knm-new-fixed-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- knm-new-fixed-fonts.spec	29 Oct 2009 07:33:43 -0000	1.2
+++ knm-new-fixed-fonts.spec	4 Dec 2009 05:11:00 -0000	1.3
@@ -1,11 +1,11 @@
-%global		priority	65
+%global		priority	69
 %global		fontname	knm-new-fixed
 %global		fontconf	%{priority}-%{fontname}.conf
 %global		catalogue	%{_sysconfdir}/X11/fontpath.d
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 Summary:	12x12 JIS X 0208 Bitmap fonts
 Group:		User Interface/X
@@ -68,6 +68,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-10
+- revert the previous change and set the priority to 69 to ensure loading
+  the rule later according to the result of
+  https://bugzilla.redhat.com/show_bug.cgi?id=532237#c6
+  (#532237)
+
 * Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
 - change the priority to 65 to make this the less priority.
 



From tagoh at fedoraproject.org  Fri Dec  4 05:19:05 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri,  4 Dec 2009 05:19:05 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-12 knm-new-fixed-fonts.spec,1.2,1.3
Message-ID: <20091204051905.C3C6D11C00E0@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm-new-fixed-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8157

Modified Files:
	knm-new-fixed-fonts.spec 
Log Message:
* Fri Dec  4 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-10
- revert the previous change and set the priority to 69 to ensure loading
  the rule later according to the result of
  https://bugzilla.redhat.com/show_bug.cgi?id=532237#c6
  (#532237)


Index: knm-new-fixed-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-12/knm-new-fixed-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- knm-new-fixed-fonts.spec	29 Oct 2009 07:47:32 -0000	1.2
+++ knm-new-fixed-fonts.spec	4 Dec 2009 05:19:05 -0000	1.3
@@ -1,11 +1,11 @@
-%global		priority	65
+%global		priority	69
 %global		fontname	knm-new-fixed
 %global		fontconf	%{priority}-%{fontname}.conf
 %global		catalogue	%{_sysconfdir}/X11/fontpath.d
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 Summary:	12x12 JIS X 0208 Bitmap fonts
 Group:		User Interface/X
@@ -68,6 +68,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-10
+- revert the previous change and set the priority to 69 to ensure loading
+  the rule later according to the result of
+  https://bugzilla.redhat.com/show_bug.cgi?id=532237#c6
+  (#532237)
+
 * Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
 - change the priority to 65 to make this the less priority.
 



From pbrobinson at fedoraproject.org  Fri Dec  4 05:29:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Dec 2009 05:29:12 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel
	network-manager-netbook-full-desktop.patch, 1.1,
	1.2 network-manager-netbook.spec, 1.10, 1.11 nmn-desktop.patch,
	1.2, NONE
Message-ID: <20091204052912.64B8D11C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/network-manager-netbook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10189

Modified Files:
	network-manager-netbook-full-desktop.patch 
	network-manager-netbook.spec 
Removed Files:
	nmn-desktop.patch 
Log Message:
- Update n-m-n desktop file patch

network-manager-netbook-full-desktop.patch:
 Makefile.am                           |    7 +++++--
 configure.in                          |    1 +
 network-manager-netbook.desktop       |    8 --------
 network-manager-netbook.desktop.in.in |    8 ++++++++
 4 files changed, 14 insertions(+), 10 deletions(-)

Index: network-manager-netbook-full-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook-full-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- network-manager-netbook-full-desktop.patch	26 Aug 2009 22:37:46 -0000	1.1
+++ network-manager-netbook-full-desktop.patch	4 Dec 2009 05:29:11 -0000	1.2
@@ -1,7 +1,6 @@
-diff -Nru network-manager-netbook.git/configure.in network-manager-netbook/configure.in
---- network-manager-netbook.git/configure.in	2009-08-07 14:08:31.266337000 -0400
-+++ network-manager-netbook/configure.in	2009-08-11 20:58:54.215576000 -0400
-@@ -31,6 +31,7 @@
+--- network-manager-netbook-1.3.1/configure.in.orig	2009-11-17 12:56:44.000000000 +0000
++++ network-manager-netbook-1.3.1/configure.in	2009-12-04 02:18:06.000000000 +0000
+@@ -36,6 +36,7 @@
  icons/32/Makefile
  icons/48/Makefile
  po/Makefile.in
@@ -9,9 +8,8 @@ diff -Nru network-manager-netbook.git/co
  src/marshallers/Makefile
  src/gconf-helpers/Makefile
  src/wireless-security/Makefile
-diff -Nru network-manager-netbook.git/Makefile.am network-manager-netbook/Makefile.am
---- network-manager-netbook.git/Makefile.am	2009-08-07 14:08:31.256338000 -0400
-+++ network-manager-netbook/Makefile.am	2009-08-11 21:20:16.753452000 -0400
+--- network-manager-netbook-1.3.1/Makefile.am.orig	2009-11-17 12:56:44.000000000 +0000
++++ network-manager-netbook-1.3.1/Makefile.am	2009-12-04 02:20:25.000000000 +0000
 @@ -1,7 +1,9 @@
  SUBDIRS = icons src po
  
@@ -21,18 +19,28 @@ diff -Nru network-manager-netbook.git/Ma
 +autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 + at INTLTOOL_DESKTOP_RULE@
  
- EXTRA_DIST = \
- 	$(autostart_DATA) \
-@@ -9,5 +11,5 @@
- 	intltool-merge.in \
- 	intltool-update.in
- 
--DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-+DISTCLEANFILES = intltool-extract intltool-merge intltool-update network-manager-netbook.desktop
- 
-diff -Nru network-manager-netbook.git/network-manager-netbook.desktop network-manager-netbook/network-manager-netbook.desktop
---- network-manager-netbook.git/network-manager-netbook.desktop	2009-08-07 14:08:31.435337000 -0400
-+++ network-manager-netbook/network-manager-netbook.desktop	1969-12-31 19:00:00.000000000 -0500
+ servicedir = $(datadir)/dbus-1/services
+ service_in_files = org.moblin.UX.Shell.Panels.network.service.in
+@@ -31,4 +33,5 @@
+ 	intltool-extract \
+ 	intltool-merge \
+ 	intltool-update \
+-	network-manager-netbook.css
++	network-manager-netbook.css \
++	network-manager-netbook.desktop
+--- /dev/null	2009-12-03 02:30:01.379397882 +0000
++++ network-manager-netbook-1.3.1/network-manager-netbook.desktop.in.in	2009-12-04 02:18:06.000000000 +0000
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++_Name=network-manager-netbook
++_Comment=Control your network connections
++Icon=nm-device-wireless
++Exec=/usr/libexec/network-manager-netbook
++Terminal=false
++Type=Application
++OnlyShowIn=MOBLIN;
+--- network-manager-netbook-1.3.1/network-manager-netbook.desktop	2009-11-17 12:56:44.000000000 +0000
++++ network-manager-netbook-1.3.1/network-manager-netbook.desktop	2009-12-04 02:20:25.000000000 +0000
 @@ -1,8 +0,0 @@
 -[Desktop Entry]
 -_Name=network-manager-netbook
@@ -42,24 +50,3 @@ diff -Nru network-manager-netbook.git/ne
 -Terminal=false
 -Type=Application
 -X-GNOME-Autostart-enabled=true
-diff -Nru network-manager-netbook.git/network-manager-netbook.desktop.in.in network-manager-netbook/network-manager-netbook.desktop.in.in
---- network-manager-netbook.git/network-manager-netbook.desktop.in.in	1969-12-31 19:00:00.000000000 -0500
-+++ network-manager-netbook/network-manager-netbook.desktop.in.in	2009-08-07 14:08:31.435337000 -0400
-@@ -0,0 +1,8 @@
-+[Desktop Entry]
-+_Name=network-manager-netbook
-+_Comment=Control your network connections
-+Icon=nm-device-wireless
-+Exec=network-manager-netbook
-+Terminal=false
-+Type=Application
-+OnlyShowIn=MOBLIN;
-+X-GNOME-Autostart-enabled=true
-diff -Nru network-manager-netbook.git/po/POTFILES.in network-manager-netbook/po/POTFILES.in
---- network-manager-netbook.git/po/POTFILES.in	2009-08-07 14:08:31.444337000 -0400
-+++ network-manager-netbook/po/POTFILES.in	2009-08-11 21:19:53.634046000 -0400
-@@ -1,3 +1,4 @@
-+network-manager-netbook.desktop.in
- src/nbtk-gtk-light-switch.c
- src/nmn-item.c
- src/network-manager-netbook.ui


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- network-manager-netbook.spec	30 Nov 2009 00:37:53 -0000	1.10
+++ network-manager-netbook.spec	4 Dec 2009 05:29:12 -0000	1.11
@@ -7,15 +7,14 @@
 
 Name:           network-manager-netbook
 Version:        1.3.1
-Release:        0.5%{?dist}
+Release:        0.6%{?dist}
 Summary:        Moblin Netbook GUI for NetworkManger
 
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://projects.gnome.org/NetworkManager/
 Source0:        %{tarfile}
-#Patch0:         network-manager-netbook-full-desktop.patch
-Patch1:         nmn-desktop.patch
+Patch0:         network-manager-netbook-full-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -44,8 +43,7 @@ NetworkManager to connect to wired, wire
 
 %prep
 %setup -q
-#%patch0 -p1 -b .fixdesktop
-%patch1 -p1 -b .desktop
+%patch0 -p1 -b .fixdesktop
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -90,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Fri Dec  4 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.6
+- Update n-m-n desktop file patch
+
 * Sun Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.5
 - Add patch to fix starting on other DE.
 


--- nmn-desktop.patch DELETED ---



From tagoh at fedoraproject.org  Fri Dec  4 05:35:17 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri,  4 Dec 2009 05:35:17 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-11 knm-new-fixed-fonts.spec,1.2,1.3
Message-ID: <20091204053517.6C74911C00E0@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm-new-fixed-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11530

Modified Files:
	knm-new-fixed-fonts.spec 
Log Message:
* Fri Dec  4 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-10
- revert the previous change and set the priority to 69 to ensure loading
  the rule later according to the result of
  https://bugzilla.redhat.com/show_bug.cgi?id=532237#c6
  (#532237)


Index: knm-new-fixed-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-11/knm-new-fixed-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- knm-new-fixed-fonts.spec	29 Oct 2009 08:12:50 -0000	1.2
+++ knm-new-fixed-fonts.spec	4 Dec 2009 05:35:17 -0000	1.3
@@ -1,11 +1,11 @@
-%global		priority	65
+%global		priority	69
 %global		fontname	knm-new-fixed
 %global		fontconf	%{priority}-%{fontname}.conf
 %global		catalogue	%{_sysconfdir}/X11/fontpath.d
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 Summary:	12x12 JIS X 0208 Bitmap fonts
 Group:		User Interface/X
@@ -68,6 +68,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-10
+- revert the previous change and set the priority to 69 to ensure loading
+  the rule later according to the result of
+  https://bugzilla.redhat.com/show_bug.cgi?id=532237#c6
+  (#532237)
+
 * Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
 - change the priority to 65 to make this the less priority.
 



From tagoh at fedoraproject.org  Fri Dec  4 05:43:50 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri,  4 Dec 2009 05:43:50 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-10 knm-new-fixed-fonts.spec,1.2,1.3
Message-ID: <20091204054350.1792711C00E0@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm-new-fixed-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13339

Modified Files:
	knm-new-fixed-fonts.spec 
Log Message:
* Fri Dec  4 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-10
- revert the previous change and set the priority to 69 to ensure loading
  the rule later according to the result of
  https://bugzilla.redhat.com/show_bug.cgi?id=532237#c6
  (#532237)


Index: knm-new-fixed-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-10/knm-new-fixed-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- knm-new-fixed-fonts.spec	29 Oct 2009 08:24:51 -0000	1.2
+++ knm-new-fixed-fonts.spec	4 Dec 2009 05:43:49 -0000	1.3
@@ -1,11 +1,11 @@
-%global		priority	65
+%global		priority	69
 %global		fontname	knm-new-fixed
 %global		fontconf	%{priority}-%{fontname}.conf
 %global		catalogue	%{_sysconfdir}/X11/fontpath.d
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 Summary:	12x12 JIS X 0208 Bitmap fonts
 Group:		User Interface/X
@@ -68,6 +68,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-10
+- revert the previous change and set the priority to 69 to ensure loading
+  the rule later according to the result of
+  https://bugzilla.redhat.com/show_bug.cgi?id=532237#c6
+  (#532237)
+
 * Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
 - change the priority to 65 to make this the less priority.
 



From mtasaka at fedoraproject.org  Fri Dec  4 06:13:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Dec 2009 06:13:03 +0000 (UTC)
Subject: File gnome-commander-1.2.8.4.tar.bz2 uploaded to lookaside cache by
	mtasaka
Message-ID: <20091204061303.69FF910F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-commander:

cca72a8c2f13bf47d5aaf3c2aad53eb2  gnome-commander-1.2.8.4.tar.bz2



From mtasaka at fedoraproject.org  Fri Dec  4 06:21:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Dec 2009 06:21:17 +0000 (UTC)
Subject: rpms/gnome-commander/F-10 .cvsignore, 1.14,
	1.15 gnome-commander.spec, 1.32, 1.33 sources, 1.14, 1.15
Message-ID: <20091204062118.0AE0311C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20106/F-10

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
1.2.8.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	29 Oct 2009 16:48:23 -0000	1.14
+++ .cvsignore	4 Dec 2009 06:21:16 -0000	1.15
@@ -1 +1 @@
-gnome-commander-1.2.8.3.tar.bz2
+gnome-commander-1.2.8.4.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/gnome-commander.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gnome-commander.spec	3 Dec 2009 19:02:11 -0000	1.32
+++ gnome-commander.spec	4 Dec 2009 06:21:16 -0000	1.33
@@ -26,7 +26,7 @@
 %global        use_autotool          0
 %global        update_po             0
 %global        if_pre                0
-%global        main_release          2
+%global        main_release          1
 %global        extratag              git_%{git_pull_JST}
 %undefine      extratag
 %global        mimeedit_rev          1958
@@ -41,7 +41,7 @@
 %global        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8.3
+Version:       1.2.8.4
 %if 0%{?fedora} >= 12
 # Downgrade 1 time
 Epoch:         1
@@ -58,8 +58,6 @@ Source0:       ftp://ftp.gnome.org/pub/G
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
 Patch10:       mimeedit-svn1958.diff
-# From upstream
-Patch20:       gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -131,7 +129,6 @@ sh autogen.sh
 
 %{__cp} -p %SOURCE10 mimeedit.sh
 %patch10 -p0
-%patch20 -p1 -b .symlink
 
 %{__sed} -i.pylib \
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
@@ -219,6 +216,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.4-1
+- Update to 1.2.8.4
+
 * Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-2
 - Fix crash when cancelling symlink creation with ESC
   (bug 542366, GNOME bug 603301)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	29 Oct 2009 16:48:23 -0000	1.14
+++ sources	4 Dec 2009 06:21:17 -0000	1.15
@@ -1 +1 @@
-68bbc1a4a642376e47e6c6e3b3a291b2  gnome-commander-1.2.8.3.tar.bz2
+cca72a8c2f13bf47d5aaf3c2aad53eb2  gnome-commander-1.2.8.4.tar.bz2



From mtasaka at fedoraproject.org  Fri Dec  4 06:21:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Dec 2009 06:21:17 +0000 (UTC)
Subject: rpms/gnome-commander/F-11 .cvsignore, 1.39,
	1.40 gnome-commander.spec, 1.65, 1.66 sources, 1.39, 1.40
Message-ID: <20091204062118.0E57211C00EF@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20106/F-11

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
1.2.8.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	29 Oct 2009 16:48:23 -0000	1.39
+++ .cvsignore	4 Dec 2009 06:21:17 -0000	1.40
@@ -1 +1 @@
-gnome-commander-1.2.8.3.tar.bz2
+gnome-commander-1.2.8.4.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- gnome-commander.spec	3 Dec 2009 07:49:42 -0000	1.65
+++ gnome-commander.spec	4 Dec 2009 06:21:17 -0000	1.66
@@ -26,7 +26,7 @@
 %global        use_autotool          0
 %global        update_po             0
 %global        if_pre                0
-%global        main_release          2
+%global        main_release          1
 %global        extratag              git_%{git_pull_JST}
 %undefine      extratag
 %global        mimeedit_rev          1958
@@ -41,7 +41,7 @@
 %global        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8.3
+Version:       1.2.8.4
 %if 0%{?fedora} >= 12
 # Downgrade 1 time
 Epoch:         1
@@ -58,8 +58,6 @@ Source0:       ftp://ftp.gnome.org/pub/G
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
 Patch10:       mimeedit-svn1958.diff
-# From upstream
-Patch20:       gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -131,7 +129,6 @@ sh autogen.sh
 
 %{__cp} -p %SOURCE10 mimeedit.sh
 %patch10 -p0
-%patch20 -p1 -b .symlink
 
 %{__sed} -i.pylib \
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
@@ -219,6 +216,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.4-1
+- Update to 1.2.8.4
+
 * Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-2
 - Fix crash when cancelling symlink creation with ESC
   (bug 542366, GNOME bug 603301)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	29 Oct 2009 16:48:23 -0000	1.39
+++ sources	4 Dec 2009 06:21:17 -0000	1.40
@@ -1 +1 @@
-68bbc1a4a642376e47e6c6e3b3a291b2  gnome-commander-1.2.8.3.tar.bz2
+cca72a8c2f13bf47d5aaf3c2aad53eb2  gnome-commander-1.2.8.4.tar.bz2



From mtasaka at fedoraproject.org  Fri Dec  4 06:21:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Dec 2009 06:21:17 +0000 (UTC)
Subject: rpms/gnome-commander/F-12 .cvsignore, 1.39,
	1.40 gnome-commander.spec, 1.65, 1.66 sources, 1.40, 1.41
Message-ID: <20091204062118.11E5111C032A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20106/F-12

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
1.2.8.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	25 Nov 2009 16:02:53 -0000	1.39
+++ .cvsignore	4 Dec 2009 06:21:17 -0000	1.40
@@ -1 +1 @@
-gnome-commander-1.2.8.3.tar.bz2
+gnome-commander-1.2.8.4.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/gnome-commander.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- gnome-commander.spec	3 Dec 2009 07:24:09 -0000	1.65
+++ gnome-commander.spec	4 Dec 2009 06:21:17 -0000	1.66
@@ -26,7 +26,7 @@
 %global        use_autotool          0
 %global        update_po             0
 %global        if_pre                0
-%global        main_release          2
+%global        main_release          1
 %global        extratag              git_%{git_pull_JST}
 %undefine      extratag
 %global        mimeedit_rev          1958
@@ -41,9 +41,11 @@
 %global        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8.3
+Version:       1.2.8.4
+%if 0%{?fedora} >= 12
 # Downgrade 1 time
 Epoch:         1
+%endif
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad?er plik?w dla GNOME oparty o Norton Commander'a (TM)
@@ -56,8 +58,6 @@ Source0:       ftp://ftp.gnome.org/pub/G
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
 Patch10:       mimeedit-svn1958.diff
-# From upstream
-Patch20:       gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -129,7 +129,6 @@ sh autogen.sh
 
 %{__cp} -p %SOURCE10 mimeedit.sh
 %patch10 -p0
-%patch20 -p1 -b .symlink
 
 %{__sed} -i.pylib \
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
@@ -217,6 +216,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:1.2.8.4-1
+- Update to 1.2.8.4
+
 * Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:1.2.8.3-2
 - Fix crash when cancelling symlink creation with ESC
   (bug 542366, GNOME bug 603301)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-12/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	25 Nov 2009 16:02:53 -0000	1.40
+++ sources	4 Dec 2009 06:21:17 -0000	1.41
@@ -1 +1 @@
-68bbc1a4a642376e47e6c6e3b3a291b2  gnome-commander-1.2.8.3.tar.bz2
+cca72a8c2f13bf47d5aaf3c2aad53eb2  gnome-commander-1.2.8.4.tar.bz2



From kyle at fedoraproject.org  Fri Dec  4 06:41:19 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 06:41:19 +0000 (UTC)
Subject: File patch-2.6.30.10.bz2 uploaded to lookaside cache by kyle
Message-ID: <20091204064119.9187A10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kernel:

6485fe0cf0f0220493647505bfd2f7b0  patch-2.6.30.10.bz2



From kyle at fedoraproject.org  Fri Dec  4 06:44:04 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 06:44:04 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.10.bz2.sign, NONE, 1.1 .cvsignore,
	1.1059, 1.1060 kernel.spec, 1.1781, 1.1782 sources, 1.1021,
	1.1022 upstream, 1.932,
	1.933 ipv4-fix-null-ptr-deref-in-ip_fragment.patch, 1.1,
	NONE patch-2.6.30.9.bz2.sign, 1.1, NONE
Message-ID: <20091204064404.DA6AA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24948

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.10.bz2.sign 
Removed Files:
	ipv4-fix-null-ptr-deref-in-ip_fragment.patch 
	patch-2.6.30.9.bz2.sign 
Log Message:
* Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-103
- 2.6.30.10
- nuke ipv4-fix-null-ptr-deref-in-ip_fragment.patch, it's in the latest
  stable release.



--- NEW FILE patch-2.6.30.10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLGKhoyGugalF9Dw4RAjj1AJ97LzenvsrWfd+ZNP6xeYLg3E29kQCgjZxs
yO+ta4aQYHWkeqp/wTjJgvA=
=9P42
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1059
retrieving revision 1.1060
diff -u -p -r1.1059 -r1.1060
--- .cvsignore	5 Oct 2009 23:14:06 -0000	1.1059
+++ .cvsignore	4 Dec 2009 06:44:02 -0000	1.1060
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.30.9.bz2
+patch-2.6.30.10.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1781
retrieving revision 1.1782
diff -u -p -r1.1781 -r1.1782
--- kernel.spec	4 Dec 2009 04:29:53 -0000	1.1781
+++ kernel.spec	4 Dec 2009 06:44:03 -0000	1.1782
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 9
+%define stable_update 10
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -841,9 +841,6 @@ Patch16470: sata_nv-use-hardreset-only-f
 # rhbz#538734 (CVE-tbd) [f60311d5f7670d9539b424e4ed8b5c0872fc9e83]
 Patch16471: fuse-prevent-fuse_put_request-in-invalid-ptr.patch
 
-# rhbz#544144 [bbf31bf18d34caa87dd01f08bf713635593697f2]
-Patch16472: ipv4-fix-null-ptr-deref-in-ip_fragment.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1583,9 +1580,6 @@ ApplyPatch sata_nv-make-sure-link-is-bro
 
 ApplyPatch fuse-prevent-fuse_put_request-in-invalid-ptr.patch
 
-# rhbz#544144
-ApplyPatch ipv4-fix-null-ptr-deref-in-ip_fragment.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2174,6 +2168,11 @@ fi
 # and build.
 
 %changelog
+* Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-103
+- 2.6.30.10
+- nuke ipv4-fix-null-ptr-deref-in-ip_fragment.patch, it's in the latest
+  stable release.
+
 * Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.9-102
 - ipv4-fix-null-ptr-deref-in-ip_fragment.patch: null ptr deref
   bug fix.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1021
retrieving revision 1.1022
diff -u -p -r1.1021 -r1.1022
--- sources	5 Oct 2009 23:14:07 -0000	1.1021
+++ sources	4 Dec 2009 06:44:03 -0000	1.1022
@@ -1,2 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-ae8a07de27292d2957772e89f2dd921b  patch-2.6.30.9.bz2
+6485fe0cf0f0220493647505bfd2f7b0  patch-2.6.30.10.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -p -r1.932 -r1.933
--- upstream	5 Oct 2009 23:14:07 -0000	1.932
+++ upstream	4 Dec 2009 06:44:03 -0000	1.933
@@ -1,3 +1,2 @@
 linux-2.6.30.tar.bz2
-patch-2.6.30.9.bz2
-
+patch-2.6.30.10.bz2


--- ipv4-fix-null-ptr-deref-in-ip_fragment.patch DELETED ---


--- patch-2.6.30.9.bz2.sign DELETED ---



From pravins at fedoraproject.org  Fri Dec  4 07:01:43 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri,  4 Dec 2009 07:01:43 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts/F-12 .cvsignore, 1.3,
	1.4 lohit-tamil-fonts.spec, 1.4, 1.5 sources, 1.3,
	1.4 anchor-bug.patch, 1.1, NONE
Message-ID: <20091204070143.34E6811C00E0@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-tamil-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28229

Modified Files:
	.cvsignore lohit-tamil-fonts.spec sources 
Removed Files:
	anchor-bug.patch 
Log Message:
* Fri Dec 04 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-1
- upstream new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Sep 2009 12:13:20 -0000	1.3
+++ .cvsignore	4 Dec 2009 07:01:42 -0000	1.4
@@ -1,2 +1,3 @@
 lohit-tamil-2.4.3.tar.gz
 lohit-tamil-2.4.4.tar.gz
+lohit-tamil-2.4.5.tar.gz


Index: lohit-tamil-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/F-12/lohit-tamil-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lohit-tamil-fonts.spec	11 Nov 2009 04:47:37 -0000	1.4
+++ lohit-tamil-fonts.spec	4 Dec 2009 07:01:42 -0000	1.5
@@ -2,8 +2,8 @@
 %global fontconf 66-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.4
-Release:        3%{?dist}
+Version:        2.4.5
+Release:        1%{?dist}
 Summary:        Free Tamil font
 
 Group:          User Interface/X
@@ -16,7 +16,6 @@ BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
 Obsoletes: lohit-fonts-common < %{version}-%{release}
-Patch1: anchor-bug.patch
 
 %description
 This package provides a free Tamil truetype/opentype font.
@@ -24,7 +23,6 @@ This package provides a free Tamil truet
 
 %prep
 %setup -q -n %{fontname}-%{version}
-%patch1 -p1 -b  .1-anchor-problem
 
 
 %build
@@ -55,6 +53,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-1
+- upstream new release
+
 * Wed Nov 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-3
 - resolved rh bug 536724
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Sep 2009 12:13:20 -0000	1.3
+++ sources	4 Dec 2009 07:01:42 -0000	1.4
@@ -1 +1 @@
-5ca4933b344fca080c013c2f572351df  lohit-tamil-2.4.4.tar.gz
+02c4b530a9f1c29355941d1958978f10  lohit-tamil-2.4.5.tar.gz


--- anchor-bug.patch DELETED ---



From chitlesh at fedoraproject.org  Fri Dec  4 07:03:09 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 07:03:09 +0000 (UTC)
Subject: File ng-spice-rework-20.tar.gz uploaded to lookaside cache by
	chitlesh
Message-ID: <20091204070309.77F9910F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ngspice:

81bc667a4190ef31081a6957d3c7f7b5  ng-spice-rework-20.tar.gz



From chitlesh at fedoraproject.org  Fri Dec  4 07:04:20 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 07:04:20 +0000 (UTC)
Subject: rpms/ngspice/F-11 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 ngspice-xcircuit_bridge.patch, 1.1, 1.2 ngspice.spec, 1.18,
	1.19 sources, 1.4, 1.5 ngspice-rework-19.memusage_warning.patch,
	1.1, NONE
Message-ID: <20091204070420.78EDB11C00E0@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28859/F-11

Modified Files:
	.cvsignore import.log ngspice-xcircuit_bridge.patch 
	ngspice.spec sources 
Removed Files:
	ngspice-rework-19.memusage_warning.patch 
Log Message:
added arbitrary source device and improved .measure spice command


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Aug 2009 15:55:22 -0000	1.4
+++ .cvsignore	4 Dec 2009 07:04:19 -0000	1.5
@@ -1 +1 @@
-ng-spice-rework-19.tar.gz
+ng-spice-rework-20.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Aug 2009 15:55:22 -0000	1.3
+++ import.log	4 Dec 2009 07:04:20 -0000	1.4
@@ -1,3 +1,4 @@
 ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10.src.rpm:1231713849
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
 ngspice-19-1_fc11:F-11:ngspice-19-1.fc11.src.rpm:1249833216
+ngspice-20-1_fc12:F-11:ngspice-20-1.fc12.src.rpm:1259910146

ngspice-xcircuit_bridge.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: ngspice-xcircuit_bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/ngspice-xcircuit_bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ngspice-xcircuit_bridge.patch	9 Aug 2009 15:55:22 -0000	1.1
+++ ngspice-xcircuit_bridge.patch	4 Dec 2009 07:04:20 -0000	1.2
@@ -1,14 +1,14 @@
---- src/main.c	2009-04-12 23:08:18.000000000 +0200
-+++ main.c	2009-08-01 14:10:46.785485894 +0200
-@@ -566,6 +566,7 @@
+--- src/main.c	2009-10-24 08:28:09.000000000 +0200
++++ main.c	2009-11-16 15:05:57.196403105 +0100
+@@ -553,6 +553,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"
++       "  -p, --pipe                run in I/O pipe mode\n"       
         "  -q, --completion          activate command completion\n"
-        "  -r, --rawfile=FILE        set the rawfile output\n"             
+        "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -772,6 +773,7 @@
+@@ -759,6 +760,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +16,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -779,7 +781,7 @@
+@@ -766,7 +768,7 @@
              {0, 0, 0, 0}
          };
  


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/ngspice.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ngspice.spec	9 Aug 2009 15:55:22 -0000	1.18
+++ ngspice.spec	4 Dec 2009 07:04:20 -0000	1.19
@@ -1,5 +1,5 @@
 Name:              ngspice
-Version:           19
+Version:           20
 Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
@@ -12,13 +12,12 @@ BuildRoot:         %{_tmppath}/%{name}-%
 
 # Ensuring interoperability with xcircuit via Tcl
 Patch0:            %{name}-xcircuit_bridge.patch
-Patch1:            %{name}-rework-19.memusage_warning.patch
 
 Requires(post):    /sbin/install-info
 Requires(preun):   /sbin/install-info
 
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
-BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
+BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel, automake, libtool
 
 
 %description
@@ -70,7 +69,6 @@ code base with many improvements.
 %setup -q
 
 %patch0 -p0 -b .xcircuit
-%patch1 -p0 -b .mem
 
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
@@ -101,12 +99,17 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
+%{__libtoolize} --force --copy
+%{__aclocal}
+%{__automake} --add-missing
+%{__autoconf}
+
 %build
 
 
 # ---- Tclspice ----------------------------------------------------------------
 # Adding BLT support
-export CFLAGS="$CFLAGS -I%{_includedir}/blt"
+export CFLAGS="%{optflags} -I%{_includedir}/blt"
 
 # Make builddir for tclspice
 %{__mkdir} -p tclspice
@@ -128,6 +131,7 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-numparam \
     --enable-dot-global \
     --enable-shared \
+    --enable-ndev \
     --with-tcl=%{_libdir}/tcl8.5/ \
     --libdir=%{_libdir}/tclspice
 
@@ -148,6 +152,7 @@ cd ..
     --enable-numparam \
     --enable-dot-global \
     --enable-shared \
+    --enable-ndev \
     --libdir=%{_libdir}
 
 %{__make} %{?_smp_mflags}
@@ -178,6 +183,7 @@ cp -pr AUTHORS COPYING README BUGS Chang
 
 # pull as debuginfo
 chmod +x %{buildroot}%{_libdir}/spice/*.cm
+chmod +x %{buildroot}%{_libdir}/tclspice/spice/*.cm
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
@@ -192,7 +198,7 @@ chmod +x %{buildroot}%{_libdir}/spice/*.
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun doc
-/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
+/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 
 %files
@@ -217,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/spice/*.
 
 
 %changelog
+* Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
+- new upstream release
+
 * Sun Aug 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 19-1
 - new upstream release
 - RHBZ #514484 A Long Warning Message (patched)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 15:55:22 -0000	1.4
+++ sources	4 Dec 2009 07:04:20 -0000	1.5
@@ -1 +1 @@
-52d01ef53332b8a0e58bf4f7ac7f2c42  ng-spice-rework-19.tar.gz
+81bc667a4190ef31081a6957d3c7f7b5  ng-spice-rework-20.tar.gz


--- ngspice-rework-19.memusage_warning.patch DELETED ---



From chitlesh at fedoraproject.org  Fri Dec  4 07:05:52 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 07:05:52 +0000 (UTC)
Subject: rpms/ngspice/F-12 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 ngspice-xcircuit_bridge.patch, 1.1, 1.2 ngspice.spec, 1.19,
	1.20 sources, 1.4, 1.5 ngspice-rework-19.memusage_warning.patch,
	1.1, NONE
Message-ID: <20091204070552.C638611C00E0@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29306/F-12

Modified Files:
	.cvsignore import.log ngspice-xcircuit_bridge.patch 
	ngspice.spec sources 
Removed Files:
	ngspice-rework-19.memusage_warning.patch 
Log Message:
added arbitrary source device and improved .measure spice command


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Aug 2009 15:54:16 -0000	1.4
+++ .cvsignore	4 Dec 2009 07:05:52 -0000	1.5
@@ -1 +1 @@
-ng-spice-rework-19.tar.gz
+ng-spice-rework-20.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Aug 2009 15:54:16 -0000	1.3
+++ import.log	4 Dec 2009 07:05:52 -0000	1.4
@@ -1,3 +1,4 @@
 ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10.src.rpm:1231713849
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
 ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11.src.rpm:1249833090
+ngspice-20-1_fc12:F-12:ngspice-20-1.fc12.src.rpm:1259910264

ngspice-xcircuit_bridge.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: ngspice-xcircuit_bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/ngspice-xcircuit_bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ngspice-xcircuit_bridge.patch	9 Aug 2009 15:54:16 -0000	1.1
+++ ngspice-xcircuit_bridge.patch	4 Dec 2009 07:05:52 -0000	1.2
@@ -1,14 +1,14 @@
---- src/main.c	2009-04-12 23:08:18.000000000 +0200
-+++ main.c	2009-08-01 14:10:46.785485894 +0200
-@@ -566,6 +566,7 @@
+--- src/main.c	2009-10-24 08:28:09.000000000 +0200
++++ main.c	2009-11-16 15:05:57.196403105 +0100
+@@ -553,6 +553,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"
++       "  -p, --pipe                run in I/O pipe mode\n"       
         "  -q, --completion          activate command completion\n"
-        "  -r, --rawfile=FILE        set the rawfile output\n"             
+        "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -772,6 +773,7 @@
+@@ -759,6 +760,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +16,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -779,7 +781,7 @@
+@@ -766,7 +768,7 @@
              {0, 0, 0, 0}
          };
  


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/ngspice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ngspice.spec	9 Aug 2009 15:54:16 -0000	1.19
+++ ngspice.spec	4 Dec 2009 07:05:52 -0000	1.20
@@ -1,5 +1,5 @@
 Name:              ngspice
-Version:           19
+Version:           20
 Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
@@ -12,13 +12,12 @@ BuildRoot:         %{_tmppath}/%{name}-%
 
 # Ensuring interoperability with xcircuit via Tcl
 Patch0:            %{name}-xcircuit_bridge.patch
-Patch1:            %{name}-rework-19.memusage_warning.patch
 
 Requires(post):    /sbin/install-info
 Requires(preun):   /sbin/install-info
 
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
-BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
+BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel, automake, libtool
 
 
 %description
@@ -70,7 +69,6 @@ code base with many improvements.
 %setup -q
 
 %patch0 -p0 -b .xcircuit
-%patch1 -p0 -b .mem
 
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
@@ -101,12 +99,17 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
+%{__libtoolize} --force --copy
+%{__aclocal}
+%{__automake} --add-missing
+%{__autoconf}
+
 %build
 
 
 # ---- Tclspice ----------------------------------------------------------------
 # Adding BLT support
-export CFLAGS="$CFLAGS -I%{_includedir}/blt"
+export CFLAGS="%{optflags} -I%{_includedir}/blt"
 
 # Make builddir for tclspice
 %{__mkdir} -p tclspice
@@ -128,6 +131,7 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-numparam \
     --enable-dot-global \
     --enable-shared \
+    --enable-ndev \
     --with-tcl=%{_libdir}/tcl8.5/ \
     --libdir=%{_libdir}/tclspice
 
@@ -148,6 +152,7 @@ cd ..
     --enable-numparam \
     --enable-dot-global \
     --enable-shared \
+    --enable-ndev \
     --libdir=%{_libdir}
 
 %{__make} %{?_smp_mflags}
@@ -178,6 +183,7 @@ cp -pr AUTHORS COPYING README BUGS Chang
 
 # pull as debuginfo
 chmod +x %{buildroot}%{_libdir}/spice/*.cm
+chmod +x %{buildroot}%{_libdir}/tclspice/spice/*.cm
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
@@ -192,7 +198,7 @@ chmod +x %{buildroot}%{_libdir}/spice/*.
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun doc
-/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
+/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 
 %files
@@ -217,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/spice/*.
 
 
 %changelog
+* Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
+- new upstream release
+
 * Sun Aug 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 19-1
 - new upstream release
 - RHBZ #514484 A Long Warning Message (patched)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 15:54:16 -0000	1.4
+++ sources	4 Dec 2009 07:05:52 -0000	1.5
@@ -1 +1 @@
-52d01ef53332b8a0e58bf4f7ac7f2c42  ng-spice-rework-19.tar.gz
+81bc667a4190ef31081a6957d3c7f7b5  ng-spice-rework-20.tar.gz


--- ngspice-rework-19.memusage_warning.patch DELETED ---



From chitlesh at fedoraproject.org  Fri Dec  4 07:07:39 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 07:07:39 +0000 (UTC)
Subject: rpms/ngspice/devel .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 ngspice-xcircuit_bridge.patch, 1.1, 1.2 ngspice.spec, 1.19,
	1.20 sources, 1.4, 1.5 ngspice-rework-19.memusage_warning.patch,
	1.1, NONE
Message-ID: <20091204070739.BBEB611C00E0@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29819/devel

Modified Files:
	.cvsignore import.log ngspice-xcircuit_bridge.patch 
	ngspice.spec sources 
Removed Files:
	ngspice-rework-19.memusage_warning.patch 
Log Message:
added arbitrary source device and improved .measure spice command


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Aug 2009 15:54:16 -0000	1.4
+++ .cvsignore	4 Dec 2009 07:07:39 -0000	1.5
@@ -1 +1 @@
-ng-spice-rework-19.tar.gz
+ng-spice-rework-20.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Aug 2009 15:54:16 -0000	1.3
+++ import.log	4 Dec 2009 07:07:39 -0000	1.4
@@ -1,3 +1,4 @@
 ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10.src.rpm:1231713849
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
 ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11.src.rpm:1249833090
+ngspice-20-1_fc12:HEAD:ngspice-20-1.fc12.src.rpm:1259910372

ngspice-xcircuit_bridge.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: ngspice-xcircuit_bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/ngspice-xcircuit_bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ngspice-xcircuit_bridge.patch	9 Aug 2009 15:54:16 -0000	1.1
+++ ngspice-xcircuit_bridge.patch	4 Dec 2009 07:07:39 -0000	1.2
@@ -1,14 +1,14 @@
---- src/main.c	2009-04-12 23:08:18.000000000 +0200
-+++ main.c	2009-08-01 14:10:46.785485894 +0200
-@@ -566,6 +566,7 @@
+--- src/main.c	2009-10-24 08:28:09.000000000 +0200
++++ main.c	2009-11-16 15:05:57.196403105 +0100
+@@ -553,6 +553,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"
++       "  -p, --pipe                run in I/O pipe mode\n"       
         "  -q, --completion          activate command completion\n"
-        "  -r, --rawfile=FILE        set the rawfile output\n"             
+        "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -772,6 +773,7 @@
+@@ -759,6 +760,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +16,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -779,7 +781,7 @@
+@@ -766,7 +768,7 @@
              {0, 0, 0, 0}
          };
  


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ngspice.spec	9 Aug 2009 15:54:16 -0000	1.19
+++ ngspice.spec	4 Dec 2009 07:07:39 -0000	1.20
@@ -1,5 +1,5 @@
 Name:              ngspice
-Version:           19
+Version:           20
 Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
@@ -12,13 +12,12 @@ BuildRoot:         %{_tmppath}/%{name}-%
 
 # Ensuring interoperability with xcircuit via Tcl
 Patch0:            %{name}-xcircuit_bridge.patch
-Patch1:            %{name}-rework-19.memusage_warning.patch
 
 Requires(post):    /sbin/install-info
 Requires(preun):   /sbin/install-info
 
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
-BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
+BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel, automake, libtool
 
 
 %description
@@ -70,7 +69,6 @@ code base with many improvements.
 %setup -q
 
 %patch0 -p0 -b .xcircuit
-%patch1 -p0 -b .mem
 
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
@@ -101,12 +99,17 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
+%{__libtoolize} --force --copy
+%{__aclocal}
+%{__automake} --add-missing
+%{__autoconf}
+
 %build
 
 
 # ---- Tclspice ----------------------------------------------------------------
 # Adding BLT support
-export CFLAGS="$CFLAGS -I%{_includedir}/blt"
+export CFLAGS="%{optflags} -I%{_includedir}/blt"
 
 # Make builddir for tclspice
 %{__mkdir} -p tclspice
@@ -128,6 +131,7 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-numparam \
     --enable-dot-global \
     --enable-shared \
+    --enable-ndev \
     --with-tcl=%{_libdir}/tcl8.5/ \
     --libdir=%{_libdir}/tclspice
 
@@ -148,6 +152,7 @@ cd ..
     --enable-numparam \
     --enable-dot-global \
     --enable-shared \
+    --enable-ndev \
     --libdir=%{_libdir}
 
 %{__make} %{?_smp_mflags}
@@ -178,6 +183,7 @@ cp -pr AUTHORS COPYING README BUGS Chang
 
 # pull as debuginfo
 chmod +x %{buildroot}%{_libdir}/spice/*.cm
+chmod +x %{buildroot}%{_libdir}/tclspice/spice/*.cm
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
@@ -192,7 +198,7 @@ chmod +x %{buildroot}%{_libdir}/spice/*.
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun doc
-/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
+/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 
 %files
@@ -217,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/spice/*.
 
 
 %changelog
+* Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
+- new upstream release
+
 * Sun Aug 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 19-1
 - new upstream release
 - RHBZ #514484 A Long Warning Message (patched)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 15:54:16 -0000	1.4
+++ sources	4 Dec 2009 07:07:39 -0000	1.5
@@ -1 +1 @@
-52d01ef53332b8a0e58bf4f7ac7f2c42  ng-spice-rework-19.tar.gz
+81bc667a4190ef31081a6957d3c7f7b5  ng-spice-rework-20.tar.gz


--- ngspice-rework-19.memusage_warning.patch DELETED ---



From chitlesh at fedoraproject.org  Fri Dec  4 07:09:57 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 07:09:57 +0000 (UTC)
Subject: rpms/ngspice/EL-5 .cvsignore, 1.4, 1.5 import.log, 1.2,
	1.3 ngspice-xcircuit_bridge.patch, 1.1, 1.2 ngspice.spec, 1.9,
	1.10 sources, 1.4, 1.5 ngspice-rework-19.memusage_warning.patch,
	1.1, NONE
Message-ID: <20091204070957.D19B811C00E0@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30386/EL-5

Modified Files:
	.cvsignore import.log ngspice-xcircuit_bridge.patch 
	ngspice.spec sources 
Removed Files:
	ngspice-rework-19.memusage_warning.patch 
Log Message:
added arbitrary source device and improved .measure spice command


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Aug 2009 15:58:12 -0000	1.4
+++ .cvsignore	4 Dec 2009 07:09:57 -0000	1.5
@@ -1 +1 @@
-ng-spice-rework-19.tar.gz
+ng-spice-rework-20.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Aug 2009 15:58:12 -0000	1.2
+++ import.log	4 Dec 2009 07:09:57 -0000	1.3
@@ -1,2 +1,3 @@
 ngspice-18-1_fc10:EL-5:ngspice-18-1.fc10.src.rpm:1231713953
 ngspice-19-1_fc11:EL-5:ngspice-19-1.fc11.src.rpm:1249833383
+ngspice-20-1_fc12:EL-5:ngspice-20-1.fc12.src.rpm:1259910513

ngspice-xcircuit_bridge.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: ngspice-xcircuit_bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/ngspice-xcircuit_bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ngspice-xcircuit_bridge.patch	9 Aug 2009 15:58:12 -0000	1.1
+++ ngspice-xcircuit_bridge.patch	4 Dec 2009 07:09:57 -0000	1.2
@@ -1,14 +1,14 @@
---- src/main.c	2009-04-12 23:08:18.000000000 +0200
-+++ main.c	2009-08-01 14:10:46.785485894 +0200
-@@ -566,6 +566,7 @@
+--- src/main.c	2009-10-24 08:28:09.000000000 +0200
++++ main.c	2009-11-16 15:05:57.196403105 +0100
+@@ -553,6 +553,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"
++       "  -p, --pipe                run in I/O pipe mode\n"       
         "  -q, --completion          activate command completion\n"
-        "  -r, --rawfile=FILE        set the rawfile output\n"             
+        "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -772,6 +773,7 @@
+@@ -759,6 +760,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +16,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -779,7 +781,7 @@
+@@ -766,7 +768,7 @@
              {0, 0, 0, 0}
          };
  


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/ngspice.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ngspice.spec	9 Aug 2009 15:58:12 -0000	1.9
+++ ngspice.spec	4 Dec 2009 07:09:57 -0000	1.10
@@ -1,5 +1,5 @@
 Name:              ngspice
-Version:           19
+Version:           20
 Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
@@ -12,13 +12,12 @@ BuildRoot:         %{_tmppath}/%{name}-%
 
 # Ensuring interoperability with xcircuit via Tcl
 Patch0:            %{name}-xcircuit_bridge.patch
-Patch1:            %{name}-rework-19.memusage_warning.patch
 
 Requires(post):    /sbin/install-info
 Requires(preun):   /sbin/install-info
 
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
-BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
+BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel, automake, libtool
 
 
 %description
@@ -70,7 +69,6 @@ code base with many improvements.
 %setup -q
 
 %patch0 -p0 -b .xcircuit
-%patch1 -p0 -b .mem
 
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
@@ -101,12 +99,17 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
+%{__libtoolize} --force --copy
+%{__aclocal}
+%{__automake} --add-missing
+%{__autoconf}
+
 %build
 
 
 # ---- Tclspice ----------------------------------------------------------------
 # Adding BLT support
-export CFLAGS="$CFLAGS -I%{_includedir}/blt"
+export CFLAGS="%{optflags} -I%{_includedir}/blt"
 
 # Make builddir for tclspice
 %{__mkdir} -p tclspice
@@ -128,6 +131,7 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-numparam \
     --enable-dot-global \
     --enable-shared \
+    --enable-ndev \
     --with-tcl=%{_libdir}/tcl8.5/ \
     --libdir=%{_libdir}/tclspice
 
@@ -148,6 +152,7 @@ cd ..
     --enable-numparam \
     --enable-dot-global \
     --enable-shared \
+    --enable-ndev \
     --libdir=%{_libdir}
 
 %{__make} %{?_smp_mflags}
@@ -178,6 +183,7 @@ cp -pr AUTHORS COPYING README BUGS Chang
 
 # pull as debuginfo
 chmod +x %{buildroot}%{_libdir}/spice/*.cm
+chmod +x %{buildroot}%{_libdir}/tclspice/spice/*.cm
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
@@ -192,7 +198,7 @@ chmod +x %{buildroot}%{_libdir}/spice/*.
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun doc
-/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
+/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 
 %files
@@ -217,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/spice/*.
 
 
 %changelog
+* Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
+- new upstream release
+
 * Sun Aug 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 19-1
 - new upstream release
 - RHBZ #514484 A Long Warning Message (patched)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 15:58:12 -0000	1.4
+++ sources	4 Dec 2009 07:09:57 -0000	1.5
@@ -1 +1 @@
-52d01ef53332b8a0e58bf4f7ac7f2c42  ng-spice-rework-19.tar.gz
+81bc667a4190ef31081a6957d3c7f7b5  ng-spice-rework-20.tar.gz


--- ngspice-rework-19.memusage_warning.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Dec  4 07:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 07:33:47 +0000
Subject: [pkgdb] egoboo had acl change status
Message-ID: <20091204073347.8A9C310F894@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on egoboo (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egoboo



From pkgdb at fedoraproject.org  Fri Dec  4 07:33:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 07:33:48 +0000
Subject: [pkgdb] egoboo had acl change status
Message-ID: <20091204073348.60FCC10F899@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on egoboo (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egoboo



From mtasaka at fedoraproject.org  Fri Dec  4 07:56:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Dec 2009 07:56:17 +0000 (UTC)
Subject: rpms/rubygem-activeldap/devel rubygem-activeldap.spec,1.12,1.13
Message-ID: <20091204075617.2723411C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activeldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7076

Modified Files:
	rubygem-activeldap.spec 
Log Message:
* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-4
- Change the dependency against locale/gettext/active*
  from "strictly equal (=)" to "not less than (>=)"
  (bug 542917)



Index: rubygem-activeldap.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activeldap/devel/rubygem-activeldap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-activeldap.spec	22 Sep 2009 13:24:06 -0000	1.12
+++ rubygem-activeldap.spec	4 Dec 2009 07:56:15 -0000	1.13
@@ -9,7 +9,7 @@
 Summary:        Ruby/ActiveLdap is a object-oriented API to LDAP
 Name:           rubygem-%{gemname}
 Version:        1.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://rubyforge.org/projects/ruby-activeldap/
@@ -18,9 +18,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Requires:       ruby(abi) = 1.8
 Requires:       rubygems
 Requires:       rubygem(activerecord) >= 2.3.4
-Requires:       rubygem(locale) = 2.0.4
-Requires:       rubygem(gettext) = 2.0.4
-Requires:       rubygem(gettext_activerecord) = 2.0.4
+Requires:       rubygem(locale) >= 2.0.4
+Requires:       rubygem(gettext) >= 2.0.4
+Requires:       rubygem(gettext_activerecord) >= 2.0.4
 Requires:       rubygem(hoe) >= 2.3.3
 Requires:       ruby-ldap
 BuildRequires:  rubygems
@@ -44,6 +44,15 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+# Change the dependency against locale/gettext/active*
+# from "strictly equal (=)" to "not less than (>=)"
+# (bug 542917)
+
+pushd %{buildroot}%{geminstdir}
+grep -rl require_gem_if_need . | \
+	xargs sed -i -e '/require_gem_if_need/s|"= \([0-9\.][0-9\.]*\)"|">= \1"|'
+popd
+
 rm -f %{examplesdir}/al-admin/public/.htaccess
 rm -f %{examplesdir}/al-admin/public/favicon.ico
 rm -f %{examplesdir}/al-admin/public/stylesheets/welcome.css
@@ -87,6 +96,11 @@ rm -rf %{buildroot}
 %lang(nl) %{geminstdir}/examples/al-admin/locale/nl/LC_MESSAGES/al-admin.mo
 
 %changelog
+* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-4
+- Change the dependency against locale/gettext/active*
+  from "strictly equal (=)" to "not less than (>=)"
+  (bug 542917)
+
 * Tue Sep 22 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.2.0-1
 - Release 1.2.0 of ActiveLDAP.
 - Changed dependency on rubygem-activerecord to be >= 2.3.4



From mtasaka at fedoraproject.org  Fri Dec  4 07:57:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Dec 2009 07:57:34 +0000 (UTC)
Subject: rpms/rubygem-activeldap/F-12 rubygem-activeldap.spec,1.12,1.13
Message-ID: <20091204075734.01E9811C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activeldap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7403

Modified Files:
	rubygem-activeldap.spec 
Log Message:
* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-4
- Change the dependency against locale/gettext/active*
  from "strictly equal (=)" to "not less than (>=)"
  (bug 542917)



Index: rubygem-activeldap.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activeldap/F-12/rubygem-activeldap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-activeldap.spec	22 Sep 2009 13:24:06 -0000	1.12
+++ rubygem-activeldap.spec	4 Dec 2009 07:57:33 -0000	1.13
@@ -9,7 +9,7 @@
 Summary:        Ruby/ActiveLdap is a object-oriented API to LDAP
 Name:           rubygem-%{gemname}
 Version:        1.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://rubyforge.org/projects/ruby-activeldap/
@@ -18,9 +18,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Requires:       ruby(abi) = 1.8
 Requires:       rubygems
 Requires:       rubygem(activerecord) >= 2.3.4
-Requires:       rubygem(locale) = 2.0.4
-Requires:       rubygem(gettext) = 2.0.4
-Requires:       rubygem(gettext_activerecord) = 2.0.4
+Requires:       rubygem(locale) >= 2.0.4
+Requires:       rubygem(gettext) >= 2.0.4
+Requires:       rubygem(gettext_activerecord) >= 2.0.4
 Requires:       rubygem(hoe) >= 2.3.3
 Requires:       ruby-ldap
 BuildRequires:  rubygems
@@ -44,6 +44,15 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+# Change the dependency against locale/gettext/active*
+# from "strictly equal (=)" to "not less than (>=)"
+# (bug 542917)
+
+pushd %{buildroot}%{geminstdir}
+grep -rl require_gem_if_need . | \
+	xargs sed -i -e '/require_gem_if_need/s|"= \([0-9\.][0-9\.]*\)"|">= \1"|'
+popd
+
 rm -f %{examplesdir}/al-admin/public/.htaccess
 rm -f %{examplesdir}/al-admin/public/favicon.ico
 rm -f %{examplesdir}/al-admin/public/stylesheets/welcome.css
@@ -87,6 +96,11 @@ rm -rf %{buildroot}
 %lang(nl) %{geminstdir}/examples/al-admin/locale/nl/LC_MESSAGES/al-admin.mo
 
 %changelog
+* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.0-4
+- Change the dependency against locale/gettext/active*
+  from "strictly equal (=)" to "not less than (>=)"
+  (bug 542917)
+
 * Tue Sep 22 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.2.0-1
 - Release 1.2.0 of ActiveLDAP.
 - Changed dependency on rubygem-activerecord to be >= 2.3.4



From mtasaka at fedoraproject.org  Fri Dec  4 08:05:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  4 Dec 2009 08:05:54 +0000 (UTC)
Subject: rpms/rubygem-activeldap/F-11 rubygem-activeldap.spec,1.10,1.11
Message-ID: <20091204080554.E0A0011C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-activeldap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9251

Modified Files:
	rubygem-activeldap.spec 
Log Message:
* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.0-3
- Change the dependency against locale/gettext/active*
  from "strictly equal (=)" to "not less than (>=)"
  (bug 542917)



Index: rubygem-activeldap.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-activeldap/F-11/rubygem-activeldap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-activeldap.spec	30 Jul 2009 12:37:00 -0000	1.10
+++ rubygem-activeldap.spec	4 Dec 2009 08:05:54 -0000	1.11
@@ -9,7 +9,7 @@
 Summary:        Ruby/ActiveLdap is a object-oriented API to LDAP
 Name:           rubygem-%{gemname}
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://rubyforge.org/projects/ruby-activeldap/
@@ -18,9 +18,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Requires:       ruby(abi) = 1.8
 Requires:       rubygems
 Requires:       rubygem(activerecord) >= 2.3.2
-Requires:       rubygem(locale) = 2.0.4
-Requires:       rubygem(gettext) = 2.0.4
-Requires:       rubygem(gettext_activerecord) = 2.0.4
+Requires:       rubygem(locale) >= 2.0.4
+Requires:       rubygem(gettext) >= 2.0.4
+Requires:       rubygem(gettext_activerecord) >= 2.0.4
 Requires:       rubygem(hoe) >= 2.3.2
 Requires:       ruby-ldap
 BuildRequires:  rubygems
@@ -44,6 +44,15 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+# Change the dependency against locale/gettext/active*
+# from "strictly equal (=)" to "not less than (>=)"
+# (bug 542917)
+
+pushd %{buildroot}%{geminstdir}
+grep -rl require_gem_if_need . | \
+	xargs sed -i -e '/require_gem_if_need/s|"= \([0-9\.][0-9\.]*\)"|">= \1"|'
+popd
+
 rm -f %{examplesdir}/al-admin/public/.htaccess
 rm -f %{examplesdir}/al-admin/public/favicon.ico
 rm -f %{examplesdir}/al-admin/public/stylesheets/welcome.css
@@ -86,6 +95,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.0-3
+- Change the dependency against locale/gettext/active*
+  from "strictly equal (=)" to "not less than (>=)"
+  (bug 542917)
+
 * Thu Jul 30 2009 Darryl Pierce <dpierce at redhat.com> - 1.1.0-2
 - Changed dependency on rubygem-activerecord to be >= 2.3.2.
 



From rakesh at fedoraproject.org  Fri Dec  4 08:19:17 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 08:19:17 +0000 (UTC)
Subject: File unhide20090810.tgz uploaded to lookaside cache by rakesh
Message-ID: <20091204081917.4C3AE10F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for unhide:

f9842175046e6eb10d22f5a988293171  unhide20090810.tgz



From abompard at fedoraproject.org  Fri Dec  4 08:22:06 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri,  4 Dec 2009 08:22:06 +0000 (UTC)
Subject: rpms/psi/F-11 .cvsignore, 1.13, 1.14 psi.spec, 1.29, 1.30 sources, 
	1.15, 1.16
Message-ID: <20091204082206.6E36011C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/psi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12778/F-11

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
* Thu Dec 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-1
- 0.14 final
- patch1 merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	29 Jul 2009 20:42:29 -0000	1.13
+++ .cvsignore	4 Dec 2009 08:22:05 -0000	1.14
@@ -1,4 +1,4 @@
-psi-0.13.tar.bz2
 emoticons-0.10.tar.gz
 psi-lang-packs-0.13-1.tar.gz
 rostericons-0.10.tar.gz
+psi-0.14.tar.bz2


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-11/psi.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- psi.spec	29 Jul 2009 20:42:29 -0000	1.29
+++ psi.spec	4 Dec 2009 08:22:06 -0000	1.30
@@ -1,5 +1,5 @@
 Name:       psi
-Version:    0.13
+Version:    0.14
 Release:    1%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
@@ -12,7 +12,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 
 BuildRequires:  qt4-devel, zlib-devel, desktop-file-utils
 BuildRequires:  qca2-devel, glib2-devel
-BuildRequires:  aspell-devel, libXScrnSaver-devel
+BuildRequires:  enchant-devel, libXScrnSaver-devel
 
 Requires(hint): sox
 Requires(hint): gnupg
@@ -67,7 +67,7 @@ More icons can be found on http://jisp.n
 
 %prep
 %setup -q
-%patch0 -p0 -b .qca
+%patch0 -p1 -b .qca
 
 %build
 unset QTDIR
@@ -76,7 +76,10 @@ unset QTDIR
         --bindir=%{_bindir}        \
         --libdir=%{_libdir}        \
         --datadir=%{_datadir}      \
-        --disable-bundled-qca
+        --disable-bundled-qca      \
+        --disable-aspell           \
+        --debug                    \
+        --no-separate-debug-info
 
 make %{?_smp_mflags}
 
@@ -90,6 +93,7 @@ make install
 # Install language packs
 tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
 rm -f $RPM_BUILD_ROOT%{_datadir}/%name/getlangs.sh
+rm -f $RPM_BUILD_ROOT%{_bindir}/psi.debug
 
 ## Install iconsets
 tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
@@ -126,6 +130,7 @@ fi
 %defattr(0644,root,root,0755)
 %doc README COPYING
 %attr(0755,root,root) %{_bindir}/psi
+#%attr(0755,root,root) %{_bindir}/psi.debug
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%name.png
@@ -145,6 +150,20 @@ fi
 
 
 %changelog
+* Thu Dec 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-1
+- 0.14 final
+- patch1 merged upstream
+
+* Sun Nov 29 2009 Sven Lankes <sven at lank.es> 0.14-0.2.rc3
+- Add (upstream) patch to make enchant spelling-suggestions work
+- Remove old patches
+
+* Sun Nov 29 2009 Sven Lankes <sven at lank.es> 0.14-0.1.rc3
+- 0.14 rc3
+
+* Mon Nov 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-0.1.rc1
+- 0.14 rc1
+
 * Tue Jul 28 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.13-1
 - 0.13 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	29 Jul 2009 20:42:29 -0000	1.15
+++ sources	4 Dec 2009 08:22:06 -0000	1.16
@@ -1,4 +1,4 @@
-ddc1a2a35dc155ca46ad6ecaeccdf894  psi-0.13.tar.bz2
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
-749688094206e3282e466ee696998290  psi-lang-packs-0.13-1.tar.gz
+054311487f6bad8e749b6034461bb293  psi-lang-packs-0.13-1.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
+9d7dcce3bcab53b741a712199bd986be  psi-0.14.tar.bz2



From abompard at fedoraproject.org  Fri Dec  4 08:22:06 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri,  4 Dec 2009 08:22:06 +0000 (UTC)
Subject: rpms/psi/F-12 .cvsignore, 1.17, 1.18 psi.spec, 1.36, 1.37 sources, 
	1.20, 1.21
Message-ID: <20091204082206.9B21E11C0266@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/psi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12778/F-12

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
* Thu Dec 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-1
- 0.14 final
- patch1 merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	29 Jul 2009 06:09:34 -0000	1.17
+++ .cvsignore	4 Dec 2009 08:22:06 -0000	1.18
@@ -1,4 +1,4 @@
-psi-0.13.tar.bz2
 emoticons-0.10.tar.gz
 psi-lang-packs-0.13-1.tar.gz
 rostericons-0.10.tar.gz
+psi-0.14.tar.bz2


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-12/psi.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- psi.spec	29 Jul 2009 06:09:36 -0000	1.36
+++ psi.spec	4 Dec 2009 08:22:06 -0000	1.37
@@ -1,5 +1,5 @@
 Name:       psi
-Version:    0.13
+Version:    0.14
 Release:    1%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
@@ -12,7 +12,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 
 BuildRequires:  qt4-devel, zlib-devel, desktop-file-utils
 BuildRequires:  qca2-devel, glib2-devel
-BuildRequires:  aspell-devel, libXScrnSaver-devel
+BuildRequires:  enchant-devel, libXScrnSaver-devel
 
 Requires(hint): sox
 Requires(hint): gnupg
@@ -67,7 +67,7 @@ More icons can be found on http://jisp.n
 
 %prep
 %setup -q
-%patch0 -p0 -b .qca
+%patch0 -p1 -b .qca
 
 %build
 unset QTDIR
@@ -76,7 +76,10 @@ unset QTDIR
         --bindir=%{_bindir}        \
         --libdir=%{_libdir}        \
         --datadir=%{_datadir}      \
-        --disable-bundled-qca
+        --disable-bundled-qca      \
+        --disable-aspell           \
+        --debug                    \
+        --no-separate-debug-info
 
 make %{?_smp_mflags}
 
@@ -90,6 +93,7 @@ make install
 # Install language packs
 tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
 rm -f $RPM_BUILD_ROOT%{_datadir}/%name/getlangs.sh
+rm -f $RPM_BUILD_ROOT%{_bindir}/psi.debug
 
 ## Install iconsets
 tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
@@ -126,6 +130,7 @@ fi
 %defattr(0644,root,root,0755)
 %doc README COPYING
 %attr(0755,root,root) %{_bindir}/psi
+#%attr(0755,root,root) %{_bindir}/psi.debug
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%name.png
@@ -145,6 +150,20 @@ fi
 
 
 %changelog
+* Thu Dec 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-1
+- 0.14 final
+- patch1 merged upstream
+
+* Sun Nov 29 2009 Sven Lankes <sven at lank.es> 0.14-0.2.rc3
+- Add (upstream) patch to make enchant spelling-suggestions work
+- Remove old patches
+
+* Sun Nov 29 2009 Sven Lankes <sven at lank.es> 0.14-0.1.rc3
+- 0.14 rc3
+
+* Mon Nov 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-0.1.rc1
+- 0.14 rc1
+
 * Tue Jul 28 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.13-1
 - 0.13 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	29 Jul 2009 06:09:36 -0000	1.20
+++ sources	4 Dec 2009 08:22:06 -0000	1.21
@@ -1,4 +1,4 @@
-ddc1a2a35dc155ca46ad6ecaeccdf894  psi-0.13.tar.bz2
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
-749688094206e3282e466ee696998290  psi-lang-packs-0.13-1.tar.gz
+054311487f6bad8e749b6034461bb293  psi-lang-packs-0.13-1.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
+9d7dcce3bcab53b741a712199bd986be  psi-0.14.tar.bz2



From abompard at fedoraproject.org  Fri Dec  4 08:22:06 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri,  4 Dec 2009 08:22:06 +0000 (UTC)
Subject: rpms/psi/devel .cvsignore, 1.18, 1.19 psi.spec, 1.38, 1.39 sources, 
	1.21, 1.22
Message-ID: <20091204082206.EEBE611C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/psi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12778/devel

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
* Thu Dec 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-1
- 0.14 final
- patch1 merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Nov 2009 20:25:09 -0000	1.18
+++ .cvsignore	4 Dec 2009 08:22:06 -0000	1.19
@@ -1,4 +1,4 @@
 emoticons-0.10.tar.gz
 psi-lang-packs-0.13-1.tar.gz
 rostericons-0.10.tar.gz
-psi-0.14-rc3.tar.bz2
+psi-0.14.tar.bz2


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/psi.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- psi.spec	29 Nov 2009 23:15:23 -0000	1.38
+++ psi.spec	4 Dec 2009 08:22:06 -0000	1.39
@@ -1,13 +1,12 @@
 Name:       psi
 Version:    0.14
-Release:    0.2.rc3%{?dist}
+Release:    1%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://psi-im.org
-Source0:    http://dl.sf.net/psi/psi-%{version}-rc3.tar.bz2
+Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
 Patch0:     psi-0.12-qca.patch
-Patch1:     psi-0.14-enchant.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -67,9 +66,8 @@ More icons can be found on http://jisp.n
 
 
 %prep
-%setup -q -n psi-0.14-rc3
+%setup -q
 %patch0 -p1 -b .qca
-%patch1 -p0 -b .enchant
 
 %build
 unset QTDIR
@@ -79,7 +77,9 @@ unset QTDIR
         --libdir=%{_libdir}        \
         --datadir=%{_datadir}      \
         --disable-bundled-qca      \
-        --disable-aspell
+        --disable-aspell           \
+        --debug                    \
+        --no-separate-debug-info
 
 make %{?_smp_mflags}
 
@@ -130,6 +130,7 @@ fi
 %defattr(0644,root,root,0755)
 %doc README COPYING
 %attr(0755,root,root) %{_bindir}/psi
+#%attr(0755,root,root) %{_bindir}/psi.debug
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%name.png
@@ -149,6 +150,10 @@ fi
 
 
 %changelog
+* Thu Dec 03 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-1
+- 0.14 final
+- patch1 merged upstream
+
 * Sun Nov 29 2009 Sven Lankes <sven at lank.es> 0.14-0.2.rc3
 - Add (upstream) patch to make enchant spelling-suggestions work
 - Remove old patches
@@ -156,6 +161,9 @@ fi
 * Sun Nov 29 2009 Sven Lankes <sven at lank.es> 0.14-0.1.rc3
 - 0.14 rc3
 
+* Mon Nov 09 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.14-0.1.rc1
+- 0.14 rc1
+
 * Tue Jul 28 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.13-1
 - 0.13 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	29 Nov 2009 20:25:09 -0000	1.21
+++ sources	4 Dec 2009 08:22:06 -0000	1.22
@@ -1,4 +1,4 @@
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
-749688094206e3282e466ee696998290  psi-lang-packs-0.13-1.tar.gz
+054311487f6bad8e749b6034461bb293  psi-lang-packs-0.13-1.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
-e73bc9b23ee622b625bd924c9265269a  psi-0.14-rc3.tar.bz2
+9d7dcce3bcab53b741a712199bd986be  psi-0.14.tar.bz2



From akurtakov at fedoraproject.org  Fri Dec  4 08:23:10 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Dec 2009 08:23:10 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.695,1.696
Message-ID: <20091204082310.3BC5B11C00E0@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13201/devel

Modified Files:
	eclipse.spec 
Log Message:
* Fri Dec 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-24
- Replace gecko BR/Rs with xulrunner.
- Drop xulrunner-devel-unstable now that it's merged in xulrunner-devel.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -p -r1.695 -r1.696
--- eclipse.spec	3 Dec 2009 19:53:34 -0000	1.695
+++ eclipse.spec	4 Dec 2009 08:23:09 -0000	1.696
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        23%{?dist}
+Release:        24%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -57,7 +57,6 @@ BuildRequires:  glib2-devel
 BuildRequires:  libgnome-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  gcc-c++
-BuildRequires:  gecko-devel >= 1.9
 BuildRequires:  nspr-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  mesa-libGL-devel
@@ -68,7 +67,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
 BuildRequires:  libXt-devel
-BuildRequires:  xulrunner-devel-unstable
+BuildRequires:  xulrunner-devel
 
 %if !%{bootstrap}
 BuildRequires:  icu4j-eclipse >= 1:4.0.1-3
@@ -102,7 +101,7 @@ Group:          Text Editors/Integrated 
 # %{_libdir}/java directory owned by jpackage-utils
 Requires:       jpackage-utils
 Requires:       gtk2
-Requires:       gecko-libs >= 1.9
+Requires:       xulrunner >= 1.9
 Conflicts:      mozilla
 Provides:       libswt3-gtk2 = 1:%{version}-%{release}
 # The 20 is more than the currently (2008-06-25) latest 3.3.2 package
@@ -1096,6 +1095,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Dec 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-24
+- Replace gecko BR/Rs with xulrunner.
+- Drop xulrunner-devel-unstable now that it's merged in xulrunner-devel.
+
 * Thu Dec 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-23
 - Remove old manipulations to bundles.info.
 - Update to eclipse-build 0.4 release.



From rakesh at fedoraproject.org  Fri Dec  4 08:23:15 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 08:23:15 +0000 (UTC)
Subject: rpms/unhide/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources,
	1.2, 1.3 unhide.spec, 1.3, 1.4
Message-ID: <20091204082315.26E5F11C00E0@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/unhide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13215/devel

Modified Files:
	.cvsignore import.log sources unhide.spec 
Log Message:
Updated to 20090810



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Jan 2009 05:39:35 -0000	1.2
+++ .cvsignore	4 Dec 2009 08:23:14 -0000	1.3
@@ -1 +1 @@
-unhide20080519.tgz
+unhide20090810.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	8 Jan 2009 05:39:35 -0000	1.1
+++ import.log	4 Dec 2009 08:23:14 -0000	1.2
@@ -1 +1,2 @@
 unhide-1_0-2_fc10_20080519:HEAD:unhide-1.0-2.fc10.20080519.src.rpm:1231349998
+unhide-1_0-5_fc12_20090810:HEAD:unhide-1.0-5.fc12.20090810.src.rpm:1259914250


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Jan 2009 05:39:35 -0000	1.2
+++ sources	4 Dec 2009 08:23:14 -0000	1.3
@@ -1 +1 @@
-1194ec0f89c6f28e8eb64fb66836f70f  unhide20080519.tgz
+f9842175046e6eb10d22f5a988293171  unhide20090810.tgz


Index: unhide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/devel/unhide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- unhide.spec	27 Jul 2009 06:32:02 -0000	1.3
+++ unhide.spec	4 Dec 2009 08:23:14 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           unhide
 Version:        1.0
-Release:        4%{?dist}.20080519
+Release:        5%{?dist}.20090810
 Summary:        Tool to find hidden processes and TCP/UDP ports from rootkits
 
 Group:          Applications/System
 License:        GPLv3
 URL:            http://www.security-projects.com/?Unhide
-Source0:        http://www.security-projects.com/unhide20080519.tgz
+Source0:        http://www.security-projects.com/unhide20090810.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,7 +26,7 @@ in /bin/netstat through brute forcing of
 
 
 %prep
-%setup -q -n %{name}-20080519
+%setup -q -n %{name}-20090810
 
 %build
 %{__cc} %{optflags} unhide-linux26.c -o unhide
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_sbindir}/unhide-tcp
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-5.20090810
+- Updated to 20090810
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4.20080519
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rakesh at fedoraproject.org  Fri Dec  4 08:35:36 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 08:35:36 +0000 (UTC)
Subject: File lynis-1.2.7.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091204083536.A6EF010F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lynis:

62919d09a862f24dffb224f758dcdb9a  lynis-1.2.7.tar.gz



From nucleo at fedoraproject.org  Fri Dec  4 08:36:02 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri,  4 Dec 2009 08:36:02 +0000 (UTC)
Subject: File 12956-knemo-0.6.0.tar.gz uploaded to lookaside cache by nucleo
Message-ID: <20091204083602.8158910F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for knemo:

c7612c7a559cd20b0a6c3775240abd9f  12956-knemo-0.6.0.tar.gz



From nucleo at fedoraproject.org  Fri Dec  4 08:36:52 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri,  4 Dec 2009 08:36:52 +0000 (UTC)
Subject: rpms/knemo/devel .cvsignore, 1.9, 1.10 knemo.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20091204083652.05A7611C00E0@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16235

Modified Files:
	.cvsignore knemo.spec sources 
Log Message:
Update to version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Nov 2009 00:45:03 -0000	1.9
+++ .cvsignore	4 Dec 2009 08:36:51 -0000	1.10
@@ -1 +1 @@
-12956-knemo-0.5.80.tar.gz
+12956-knemo-0.6.0.tar.gz


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/knemo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- knemo.spec	19 Nov 2009 13:52:10 -0000	1.19
+++ knemo.spec	4 Dec 2009 08:36:51 -0000	1.20
@@ -1,6 +1,6 @@
 Name:             knemo
-Version:          0.5.80
-Release:          2%{?dist}
+Version:          0.6.0
+Release:          1%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
 License:          GPLv2+
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/22x22/status/%{name}*
 
 %changelog
+* Fri Dec  4 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.6.0-1
+- update to 0.6.0
+
 * Thu Nov 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.80-2
 - rebuild (qt-4.6.0-rc1, fc13+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Nov 2009 00:45:03 -0000	1.10
+++ sources	4 Dec 2009 08:36:51 -0000	1.11
@@ -1 +1 @@
-d8e5600eda795c1acc1ec56dd5242391  12956-knemo-0.5.80.tar.gz
+c7612c7a559cd20b0a6c3775240abd9f  12956-knemo-0.6.0.tar.gz



From rakesh at fedoraproject.org  Fri Dec  4 08:41:22 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri,  4 Dec 2009 08:41:22 +0000 (UTC)
Subject: rpms/lynis/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 lynis.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091204084122.6A56F11C00E0@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/lynis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17107/devel

Modified Files:
	.cvsignore import.log lynis.spec sources 
Log Message:
Updated to 1.2.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lynis/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Apr 2009 14:38:37 -0000	1.3
+++ .cvsignore	4 Dec 2009 08:41:22 -0000	1.4
@@ -1 +1 @@
-lynis-1.2.6.tar.gz
+lynis-1.2.7.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lynis/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Apr 2009 14:38:37 -0000	1.2
+++ import.log	4 Dec 2009 08:41:22 -0000	1.3
@@ -1,2 +1,3 @@
 lynis-1_2_1-3_fc10:HEAD:lynis-1.2.1-3.fc10.src.rpm:1226137230
 lynis-1_2_6-1_fc11:HEAD:lynis-1.2.6-1.fc11.src.rpm:1239546793
+lynis-1_2_7-1_fc12:HEAD:lynis-1.2.7-1.fc12.src.rpm:1259915229


Index: lynis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lynis/devel/lynis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lynis.spec	25 Jul 2009 11:33:24 -0000	1.5
+++ lynis.spec	4 Dec 2009 08:41:22 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lynis
-Version:        1.2.6
-Release:        3%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 Summary:        Security and system auditing tool
 Group:          Applications/System
 License:        GPLv3
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/%{name}/default.prf
 
 %changelog
+* Fri Dec 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.2.7-1
+- Updated to 1.2.7
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lynis/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2009 14:38:37 -0000	1.3
+++ sources	4 Dec 2009 08:41:22 -0000	1.4
@@ -1 +1 @@
-46921fc56873a53074f4cf6775ce9007  lynis-1.2.6.tar.gz
+62919d09a862f24dffb224f758dcdb9a  lynis-1.2.7.tar.gz



From nucleo at fedoraproject.org  Fri Dec  4 08:45:03 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri,  4 Dec 2009 08:45:03 +0000 (UTC)
Subject: rpms/knemo/F-12 .cvsignore, 1.9, 1.10 knemo.spec, 1.18, 1.19 sources,
	1.10, 1.11
Message-ID: <20091204084504.080D411C00E0@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18039

Modified Files:
	.cvsignore knemo.spec sources 
Log Message:
Update to version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Nov 2009 02:12:52 -0000	1.9
+++ .cvsignore	4 Dec 2009 08:45:03 -0000	1.10
@@ -1 +1 @@
-12956-knemo-0.5.80.tar.gz
+12956-knemo-0.6.0.tar.gz


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-12/knemo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- knemo.spec	6 Nov 2009 02:12:52 -0000	1.18
+++ knemo.spec	4 Dec 2009 08:45:03 -0000	1.19
@@ -1,5 +1,5 @@
 Name:             knemo
-Version:          0.5.80
+Version:          0.6.0
 Release:          1%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
@@ -70,6 +70,12 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/22x22/status/%{name}*
 
 %changelog
+* Fri Dec  4 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.6.0-1
+- update to 0.6.0
+
+* Thu Nov 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.80-2
+- rebuild (qt-4.6.0-rc1, fc13+)
+
 * Fri Nov  6 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.80-1
 - update to 0.5.80 (0.6.0 beta1)
 - drop xdg-utils references


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Nov 2009 02:12:52 -0000	1.10
+++ sources	4 Dec 2009 08:45:03 -0000	1.11
@@ -1 +1 @@
-d8e5600eda795c1acc1ec56dd5242391  12956-knemo-0.5.80.tar.gz
+c7612c7a559cd20b0a6c3775240abd9f  12956-knemo-0.6.0.tar.gz



From nucleo at fedoraproject.org  Fri Dec  4 08:47:21 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri,  4 Dec 2009 08:47:21 +0000 (UTC)
Subject: rpms/knemo/F-11 .cvsignore, 1.9, 1.10 knemo.spec, 1.17, 1.18 sources,
	1.10, 1.11
Message-ID: <20091204084721.1695911C00E0@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18804

Modified Files:
	.cvsignore knemo.spec sources 
Log Message:
Update to version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Nov 2009 02:05:53 -0000	1.9
+++ .cvsignore	4 Dec 2009 08:47:20 -0000	1.10
@@ -1 +1 @@
-12956-knemo-0.5.80.tar.gz
+12956-knemo-0.6.0.tar.gz


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-11/knemo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- knemo.spec	6 Nov 2009 02:05:53 -0000	1.17
+++ knemo.spec	4 Dec 2009 08:47:20 -0000	1.18
@@ -1,5 +1,5 @@
 Name:             knemo
-Version:          0.5.80
+Version:          0.6.0
 Release:          1%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
@@ -70,6 +70,12 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/22x22/status/%{name}*
 
 %changelog
+* Fri Dec  4 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.6.0-1
+- update to 0.6.0
+
+* Thu Nov 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.80-2
+- rebuild (qt-4.6.0-rc1, fc13+)
+
 * Fri Nov  6 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.80-1
 - update to 0.5.80 (0.6.0 beta1)
 - drop xdg-utils references


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Nov 2009 02:05:53 -0000	1.10
+++ sources	4 Dec 2009 08:47:20 -0000	1.11
@@ -1 +1 @@
-d8e5600eda795c1acc1ec56dd5242391  12956-knemo-0.5.80.tar.gz
+c7612c7a559cd20b0a6c3775240abd9f  12956-knemo-0.6.0.tar.gz



From phuang at fedoraproject.org  Fri Dec  4 08:48:39 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Dec 2009 08:48:39 +0000 (UTC)
Subject: File ibus-1.2.0.20091204.tar.gz uploaded to lookaside cache by
	phuang
Message-ID: <20091204084839.876EE10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ibus:

89b15760649c7edb6326163112a47865  ibus-1.2.0.20091204.tar.gz



From jzeleny at fedoraproject.org  Fri Dec  4 08:50:23 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri,  4 Dec 2009 08:50:23 +0000 (UTC)
Subject: File fcoe-utils-1.0.9.tar.gz uploaded to lookaside cache by jzeleny
Message-ID: <20091204085023.EE04210F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fcoe-utils:

7a60e3063c3888cabcb40421a4525100  fcoe-utils-1.0.9.tar.gz



From phuang at fedoraproject.org  Fri Dec  4 08:50:50 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Dec 2009 08:50:50 +0000 (UTC)
Subject: rpms/ibus/F-12 .cvsignore, 1.47, 1.48 ibus.spec, 1.96, 1.97 sources,
	1.54, 1.55
Message-ID: <20091204085050.EE20711C03DB@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19563

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20091204


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	24 Nov 2009 05:02:35 -0000	1.47
+++ .cvsignore	4 Dec 2009 08:50:50 -0000	1.48
@@ -1 +1 @@
-ibus-1.2.0.20091124.tar.gz
+ibus-1.2.0.20091204.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ibus.spec	24 Nov 2009 05:02:35 -0000	1.96
+++ ibus.spec	4 Dec 2009 08:50:50 -0000	1.97
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20091124
+Version:    1.2.0.20091204
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -223,6 +223,11 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
+- Update to 1.2.0.20091204
+- Fix Bug 529920 - language panel pops up on the wrong monitor
+- Fix Bug 541197 - Ibus crash
+
 * Tue Nov 24 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001124-1
 - Update to 1.2.0.20091124
 - Update some translations.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	24 Nov 2009 05:02:35 -0000	1.54
+++ sources	4 Dec 2009 08:50:50 -0000	1.55
@@ -1 +1 @@
-4227ffb5befefee2c66b592b6fa01209  ibus-1.2.0.20091124.tar.gz
+89b15760649c7edb6326163112a47865  ibus-1.2.0.20091204.tar.gz



From nucleo at fedoraproject.org  Fri Dec  4 08:51:41 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri,  4 Dec 2009 08:51:41 +0000 (UTC)
Subject: rpms/knemo/F-10 .cvsignore, 1.9, 1.10 knemo.spec, 1.17, 1.18 sources,
	1.10, 1.11
Message-ID: <20091204085141.792FB11C00E0@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/knemo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19859

Modified Files:
	.cvsignore knemo.spec sources 
Log Message:
Update to version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Nov 2009 02:08:53 -0000	1.9
+++ .cvsignore	4 Dec 2009 08:51:41 -0000	1.10
@@ -1 +1 @@
-12956-knemo-0.5.80.tar.gz
+12956-knemo-0.6.0.tar.gz


Index: knemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-10/knemo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- knemo.spec	6 Nov 2009 02:08:53 -0000	1.17
+++ knemo.spec	4 Dec 2009 08:51:41 -0000	1.18
@@ -1,5 +1,5 @@
 Name:             knemo
-Version:          0.5.80
+Version:          0.6.0
 Release:          1%{?dist}
 Summary:          A KDE network monitoring tool
 Group:            Applications/Internet
@@ -70,6 +70,12 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/22x22/status/%{name}*
 
 %changelog
+* Fri Dec  4 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.6.0-1
+- update to 0.6.0
+
+* Thu Nov 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.80-2
+- rebuild (qt-4.6.0-rc1, fc13+)
+
 * Fri Nov  6 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.5.80-1
 - update to 0.5.80 (0.6.0 beta1)
 - drop xdg-utils references


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knemo/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Nov 2009 02:08:53 -0000	1.10
+++ sources	4 Dec 2009 08:51:41 -0000	1.11
@@ -1 +1 @@
-d8e5600eda795c1acc1ec56dd5242391  12956-knemo-0.5.80.tar.gz
+c7612c7a559cd20b0a6c3775240abd9f  12956-knemo-0.6.0.tar.gz



From phuang at fedoraproject.org  Fri Dec  4 08:51:50 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Dec 2009 08:51:50 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.46, 1.47 ibus.spec, 1.94, 1.95 sources,
	1.52, 1.53
Message-ID: <20091204085150.C7F6511C00E0@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19905

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20091204


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	24 Nov 2009 04:50:23 -0000	1.46
+++ .cvsignore	4 Dec 2009 08:51:50 -0000	1.47
@@ -1 +1 @@
-ibus-1.2.0.20091124.tar.gz
+ibus-1.2.0.20091204.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- ibus.spec	24 Nov 2009 04:50:23 -0000	1.94
+++ ibus.spec	4 Dec 2009 08:51:50 -0000	1.95
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20091124
+Version:    1.2.0.20091204
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -223,6 +223,11 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
+- Update to 1.2.0.20091204
+- Fix Bug 529920 - language panel pops up on the wrong monitor
+- Fix Bug 541197 - Ibus crash
+
 * Tue Nov 24 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001124-1
 - Update to 1.2.0.20091124
 - Update some translations.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	24 Nov 2009 04:50:23 -0000	1.52
+++ sources	4 Dec 2009 08:51:50 -0000	1.53
@@ -1 +1 @@
-4227ffb5befefee2c66b592b6fa01209  ibus-1.2.0.20091124.tar.gz
+89b15760649c7edb6326163112a47865  ibus-1.2.0.20091204.tar.gz



From jzeleny at fedoraproject.org  Fri Dec  4 08:53:05 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri,  4 Dec 2009 08:53:05 +0000 (UTC)
Subject: rpms/fcoe-utils/devel .cvsignore, 1.3,
	1.4 fcoe-utils-1.0.8-includes.patch, 1.1, 1.2 fcoe-utils.spec,
	1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20091204085305.3CBC211C00E0@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20284

Modified Files:
	.cvsignore fcoe-utils-1.0.8-includes.patch fcoe-utils.spec 
	sources 
Log Message:
rebase to latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 Jul 2009 17:51:09 -0000	1.3
+++ .cvsignore	4 Dec 2009 08:53:04 -0000	1.4
@@ -1 +1 @@
-fcoe-utils-1.0.8.tar.gz
+fcoe-utils-1.0.9.tar.gz

fcoe-utils-1.0.8-includes.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: fcoe-utils-1.0.8-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils-1.0.8-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fcoe-utils-1.0.8-includes.patch	31 Jul 2009 17:51:10 -0000	1.1
+++ fcoe-utils-1.0.8-includes.patch	4 Dec 2009 08:53:05 -0000	1.2
@@ -4,8 +4,8 @@
  endif
  
  ## all targets should look for headers in the include directory
--AM_CPPFLAGS = -I${srcdir}/include
-+AM_CPPFLAGS = -I${srcdir}/include -I/lib/modules/`rpm -q --list kernel | grep "^/lib/modules/.*/build$$" | cut -f4 -d"/" | sort -r | head -1`/build/include
+-AM_CPPFLAGS = -Wall -I${srcdir}/include
++AM_CPPFLAGS = -Wall -I${srcdir}/include -I/lib/modules/`rpm -q --list kernel | grep "^/lib/modules/.*/build$$" | cut -f4 -d"/" | sort -r | head -1`/build/include
  
  ## pass the sysconfdir into the C proprocessor
  AM_CFLAGS = -DSYSCONFDIR="\"${sysconfdir}\""


Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fcoe-utils.spec	14 Sep 2009 10:28:16 -0000	1.8
+++ fcoe-utils.spec	4 Dec 2009 08:53:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
-Version:        1.0.8
-Release:        3%{?dist}
+Version:        1.0.9
+Release:        1.20091204git%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -17,7 +17,7 @@ Patch0:         fcoe-utils-1.0.7-init.pa
 Patch1:         fcoe-utils-1.0.7-init-condrestart.patch
 Patch2:         fcoe-utils-1.0.8-includes.patch
 Patch3:         fcoe-utils-1.0.8-init-LSB.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      1{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libhbaapi-devel dcbd-devel libtool automake kernel-devel
 Requires:         dcbd libhbalinux >= 1.0.8
@@ -98,6 +98,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.9-1.20091204git
+- rebase to latest version of fcoe-utils
+
 * Mon Sep 14 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-3
 - update of init script to be LSB-compliant
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Jul 2009 17:51:10 -0000	1.3
+++ sources	4 Dec 2009 08:53:05 -0000	1.4
@@ -1 +1 @@
-0f8ddd3e4a5d75dc9568fe7141364894  fcoe-utils-1.0.8.tar.gz
+7a60e3063c3888cabcb40421a4525100  fcoe-utils-1.0.9.tar.gz



From phuang at fedoraproject.org  Fri Dec  4 08:53:05 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Dec 2009 08:53:05 +0000 (UTC)
Subject: rpms/ibus/F-12 ibus.spec,1.97,1.98
Message-ID: <20091204085305.C17A111C00E0@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20295

Modified Files:
	ibus.spec 
Log Message:
Fix a typo in spec file


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- ibus.spec	4 Dec 2009 08:50:50 -0000	1.97
+++ ibus.spec	4 Dec 2009 08:53:05 -0000	1.98
@@ -223,7 +223,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Oct 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
+* Fri Dec 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
 - Update to 1.2.0.20091204
 - Fix Bug 529920 - language panel pops up on the wrong monitor
 - Fix Bug 541197 - Ibus crash



From phuang at fedoraproject.org  Fri Dec  4 08:53:33 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Dec 2009 08:53:33 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.95,1.96
Message-ID: <20091204085333.CEE0A11C00E0@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20489

Modified Files:
	ibus.spec 
Log Message:
Fix a typo in spec file


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ibus.spec	4 Dec 2009 08:51:50 -0000	1.95
+++ ibus.spec	4 Dec 2009 08:53:33 -0000	1.96
@@ -223,7 +223,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Oct 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
+* Fri Dec 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
 - Update to 1.2.0.20091204
 - Fix Bug 529920 - language panel pops up on the wrong monitor
 - Fix Bug 541197 - Ibus crash



From jzeleny at fedoraproject.org  Fri Dec  4 09:11:36 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri,  4 Dec 2009 09:11:36 +0000 (UTC)
Subject: File libhbalinux-1.0.9.tar.gz uploaded to lookaside cache by jzeleny
Message-ID: <20091204091136.4DF4310F896@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libhbalinux:

3cf4c908f5f6023df8bf0a95fb35ad06  libhbalinux-1.0.9.tar.gz



From jzeleny at fedoraproject.org  Fri Dec  4 09:14:28 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Fri,  4 Dec 2009 09:14:28 +0000 (UTC)
Subject: rpms/libhbalinux/devel .cvsignore, 1.3, 1.4 libhbalinux.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <20091204091428.05ED711C00E0@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/libhbalinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25160

Modified Files:
	.cvsignore libhbalinux.spec sources 
Log Message:
rebased to the latest git snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libhbalinux/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jul 2009 12:46:46 -0000	1.3
+++ .cvsignore	4 Dec 2009 09:14:27 -0000	1.4
@@ -1 +1 @@
-libhbalinux-1.0.8.tar.gz
+libhbalinux-1.0.9.tar.gz


Index: libhbalinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libhbalinux/devel/libhbalinux.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libhbalinux.spec	30 Jul 2009 12:46:46 -0000	1.3
+++ libhbalinux.spec	4 Dec 2009 09:14:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libhbalinux
-Version:        1.0.8
-Release:        1%{?dist}
+Version:        1.0.9
+Release:        1.20091204git%{?dist}
 Summary:        FC-HBAAPI implementation using scsi_transport_fc interfaces
 
 Group:          System Environment/Libraries
@@ -74,6 +74,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.9-20091204git
+- rebased to the latest version in upstream git
+
 * Thu Jul 30 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-1
 - rebase of libhbalinux, spec file adjusted to match changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libhbalinux/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 12:46:46 -0000	1.3
+++ sources	4 Dec 2009 09:14:27 -0000	1.4
@@ -1 +1 @@
-b8d61c5dd44392f3120c9c176375a629  libhbalinux-1.0.8.tar.gz
+3cf4c908f5f6023df8bf0a95fb35ad06  libhbalinux-1.0.9.tar.gz



From pmatilai at fedoraproject.org  Fri Dec  4 09:32:33 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri,  4 Dec 2009 09:32:33 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.2-chmod-selinux.patch, NONE,
	1.1 rpm-4.7.2-pgp-subkey.patch, NONE,
	1.1 rpm-4.7.2-rpmfc-unknown.patch, NONE,
	1.1 rpm-4.7.2-sign-passcheck.patch, NONE, 1.1 rpm.spec, 1.367, 1.368
Message-ID: <20091204093233.6F39B11C00E0@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29544

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.2-chmod-selinux.patch rpm-4.7.2-pgp-subkey.patch 
	rpm-4.7.2-rpmfc-unknown.patch rpm-4.7.2-sign-passcheck.patch 
Log Message:
- missing error exit code from signing password checking (#496754)
- dont fail build on unrecognized data files (#532489)
- dont try to parse subkeys and secret keys (#436812)
- fix chmod test on selinux, breaking %%{_fixperms} macro (#543035)


rpm-4.7.2-chmod-selinux.patch:
 configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rpm-4.7.2-chmod-selinux.patch ---
diff -up rpm-4.7.2/configure.ac.chmod-test rpm-4.7.2/configure.ac
--- rpm-4.7.2/configure.ac.chmod-test	2009-11-25 09:19:30.000000000 +0200
+++ rpm-4.7.2/configure.ac	2009-12-04 11:23:39.000000000 +0200
@@ -61,7 +61,7 @@ AC_MSG_CHECKING(POSIX chmod)
 touch foo.chmodtest
 chmod 744 foo.chmodtest
 chmod +X foo.chmodtest 2>/dev/null
-a=`ls -l foo.chmodtest | awk '{print $1}'`
+a=`ls -l foo.chmodtest | awk '{print substr($1,1,10)}'`
 rm -f foo.chmodtest
 if test "$a" = "-rwxr-xr-x"; then
     AC_MSG_RESULT(yes)
diff -up rpm-4.7.2/configure.chmod-test rpm-4.7.2/configure
--- rpm-4.7.2/configure.chmod-test	2009-12-04 11:24:06.000000000 +0200
+++ rpm-4.7.2/configure	2009-12-04 11:24:51.000000000 +0200
@@ -17626,7 +17626,7 @@ $as_echo_n "checking POSIX chmod... " >&
 touch foo.chmodtest
 chmod 744 foo.chmodtest
 chmod +X foo.chmodtest 2>/dev/null
-a=`ls -l foo.chmodtest | awk '{print $1}'`
+a=`ls -l foo.chmodtest | awk '{print substr($1,1,10)}'`
 rm -f foo.chmodtest
 if test "$a" = "-rwxr-xr-x"; then
     { $as_echo "$as_me:$LINENO: result: yes" >&5

rpm-4.7.2-pgp-subkey.patch:
 rpmpgp.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE rpm-4.7.2-pgp-subkey.patch ---
commit 6eeb0bb06466d9eb75eb55efd514d3ecfe089042
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Nov 25 15:07:17 2009 +0200

    We can't handle OpenPGP subkeys or secret keys, so dont even try
    - parsing subkeys ends up overwriting data in the main key, causing
      bogus signature checking failures
    - this is the final missing piece of RhBug:436812, short of adding
      proper support for subkeys (maybe someday...)
    (cherry picked from commit 98213fc4192c7af07037a0f3e9cce9e3b8509c02)

diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index d7bbb5e..f76fc2b 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -1190,11 +1190,6 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft,
 	    else
 		memset(_digp->signid, 0, sizeof(_digp->signid));
 	}
-    case PGPTAG_PUBLIC_SUBKEY:
-	rc = pgpPrtKey(tag, h, hlen, _dig, _digp);
-	break;
-    case PGPTAG_SECRET_KEY:
-    case PGPTAG_SECRET_SUBKEY:
 	rc = pgpPrtKey(tag, h, hlen, _dig, _digp);
 	break;
     case PGPTAG_USER_ID:
@@ -1205,6 +1200,9 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft,
 	rc = pgpPrtComment(tag, h, hlen);
 	break;
 
+    case PGPTAG_PUBLIC_SUBKEY:
+    case PGPTAG_SECRET_KEY:
+    case PGPTAG_SECRET_SUBKEY:
     case PGPTAG_RESERVED:
     case PGPTAG_PUBLIC_SESSION_KEY:
     case PGPTAG_SYMMETRIC_SESSION_KEY:

rpm-4.7.2-rpmfc-unknown.patch:
 rpmfc.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.7.2-rpmfc-unknown.patch ---
commit fa9fcc89146f08bce3b51d96d0ec9d4175db6978
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Thu Nov 26 10:22:41 2009 +0200

    Dont fail build on unrecognized non-executable files (ticket #105)
    - Generally only executable files are critical for dependency extraction,
      whereas oddball application data files can cause unnecessary build
      failure due to libmagic misdetections etc, so just let non-executables
      pass with a warning and mark them as unknown data
    (cherry picked from commit cfcd1f9bd98d5d0fc46a84931984efec3b9d47e2)

diff --git a/build/rpmfc.c b/build/rpmfc.c
index bcb5383..e4ba6b2 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1245,6 +1245,7 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
     for (fc->ix = 0; fc->ix < fc->nfiles; fc->ix++) {
 	const char * ftype;
 	rpm_mode_t mode = (fmode ? fmode[fc->ix] : 0);
+	int is_executable = (mode & (S_IXUSR|S_IXGRP|S_IXOTH));
 
 	s = argv[fc->ix];
 	slen = strlen(s);
@@ -1277,11 +1278,16 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
 		ftype = magic_file(ms, s);
 
 	    if (ftype == NULL) {
-		rpmlog(RPMLOG_ERR, 
+		rpmlog(is_executable ? RPMLOG_ERR : RPMLOG_WARNING, 
 		       _("Recognition of file \"%s\" failed: mode %06o %s\n"),
 		       s, mode, magic_error(ms));
-		magic_close(ms);
-		return RPMRC_FAIL;
+		/* only executable files are critical to dep extraction */
+		if (is_executable) {
+		    magic_close(ms);
+		    return RPMRC_FAIL;
+		}
+		/* unrecognized non-executables get treated as "data" */
+		ftype = "data";
 	    }
 	}
 

rpm-4.7.2-sign-passcheck.patch:
 signature.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE rpm-4.7.2-sign-passcheck.patch ---
commit 31c5e0f9b7b09661611b50d84d26ba47ce97fffe
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Nov 25 16:42:43 2009 +0200

    Fix signature password checking result on abnormal conditions (RhBug:496754)
    - Execve() failure wasn't returning an error code, causing rpm to
      think the password was ok when we couldn't even try verifying
    - Stricter return code checking from the password checking child:
      the password can only be ok if the child exits with WIFEXITED() *and*
      WIFEXITCODE() of 0. Also WIFEXITCODE() should only be called if
      WIFEXITED() returns true.
    (cherry picked from commit 2b41860984f0c4ebba5ebce93a18c9c0ca5e1065)

diff --git a/lib/signature.c b/lib/signature.c
index a501f3e..a2eaf9b 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -883,6 +883,7 @@ static int checkPassPhrase(const char * passPhrase, const rpmSigTag sigTag)
 
 	    rpmlog(RPMLOG_ERR, _("Could not exec %s: %s\n"), "gpg",
 			strerror(errno));
+	    _exit(EXIT_FAILURE);
 	}   break;
 	case RPMSIGTAG_RSA:
 	case RPMSIGTAG_PGP5:	/* XXX legacy */
@@ -932,7 +933,7 @@ static int checkPassPhrase(const char * passPhrase, const rpmSigTag sigTag)
 
     (void) waitpid(pid, &status, 0);
 
-    return ((!WIFEXITED(status) || WEXITSTATUS(status)) ? 1 : 0);
+    return ((WIFEXITED(status) && WEXITSTATUS(status) == 0)) ? 0 : 1;
 }
 
 char * rpmGetPassPhrase(const char * prompt, const rpmSigTag sigTag)


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -p -r1.367 -r1.368
--- rpm.spec	25 Nov 2009 08:23:31 -0000	1.367
+++ rpm.spec	4 Dec 2009 09:32:33 -0000	1.368
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -42,6 +42,10 @@ Patch3: rpm-4.6.0-fedora-specspo.patch
 Patch200: rpm-4.7.1-bugurl.patch
 Patch201: rpm-4.7.0-extra-provides.patch
 Patch202: rpm-4.7.1-python-bytecompile.patch
+Patch203: rpm-4.7.2-sign-passcheck.patch
+Patch204: rpm-4.7.2-rpmfc-unknown.patch
+Patch205: rpm-4.7.2-pgp-subkey.patch
+Patch206: rpm-4.7.2-chmod-selinux.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -197,6 +201,10 @@ packages on a system.
 %patch200 -p1 -b .bugurl
 %patch201 -p1 -b .extra-prov
 %patch202 -p1 -b .python-bytecompile
+%patch203 -p1 -b .sign-passcheck
+%patch204 -p1 -b .rpmfc-unknown
+%patch205 -p1 -b .pgp-subkey
+%patch206 -p1 -b .chmod-test
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -411,6 +419,12 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Dec 04 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.2-2
+- missing error exit code from signing password checking (#496754)
+- dont fail build on unrecognized data files (#532489)
+- dont try to parse subkeys and secret keys (#436812)
+- fix chmod test on selinux, breaking %%{_fixperms} macro (#543035)
+
 * Wed Nov 25 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.2-1
 - update to 4.7.2 (http://rpm.org/wiki/Releases/4.7.2)
 - fixes #464750, #529214



From jkratoch at fedoraproject.org  Fri Dec  4 09:32:47 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri,  4 Dec 2009 09:32:47 +0000 (UTC)
Subject: rpms/libunwind/devel libunwind.spec,1.32,1.33
Message-ID: <20091204093247.724BE11C00E0@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/libunwind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29660

Modified Files:
	libunwind.spec 
Log Message:
* Fri Dec  4 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.13.20090430betagit4b8404d1
- The devel package now requires also base package's %{release}.
- Update the obsolete macro %{package_version}.



Index: libunwind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libunwind.spec	25 Jul 2009 08:49:38 -0000	1.32
+++ libunwind.spec	4 Dec 2009 09:32:47 -0000	1.33
@@ -9,7 +9,7 @@ Summary: An unwinding library
 Name: libunwind
 Version: 0.99
 %define snapshot 20090430betagit4b8404d1
-Release: 0.12.%{snapshot}%{?dist}
+Release: 0.13.%{snapshot}%{?dist}
 License: BSD
 Group: Development/Debuggers
 Source: libunwind-%{snapshot}.tar.bz2
@@ -30,7 +30,7 @@ This version of libunwind is targetted f
 %package devel
 Summary: Development package for libunwind
 Group: Development/Debuggers
-Requires: libunwind = %{PACKAGE_VERSION}
+Requires: libunwind = %{version}-%{release}
 %description devel
 The libunwind-devel package includes the libraries and header files for
 libunwind.
@@ -82,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libunwind*.h
 
 %changelog
+* Fri Dec  4 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.13.20090430betagit4b8404d1
+- The devel package now requires also base package's %{release}.
+- Update the obsolete macro %%{package_version}.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.12.20090430betagit4b8404d1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Fri Dec  4 09:37:21 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  4 Dec 2009 09:37:21 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch, NONE,
	1.1 openoffice.org.spec, 1.2039, 1.2040
Message-ID: <20091204093721.E5B6211C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31038/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch 
Log Message:
Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch

openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch:
 editeng.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch ---
diff -r 3ee4cb3a17dd svx/source/editeng/editeng.cxx
--- a/svx/source/editeng/editeng.cxx	Fri Oct 30 09:44:02 2009 +0000
+++ b/svx/source/editeng/editeng.cxx	Fri Oct 30 17:46:26 2009 +0000
@@ -1783,7 +1783,8 @@
 					ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( n );
 					pNode->CreateWrongList();
 				}
-				pImpEditEngine->StartOnlineSpellTimer();
+				if (pImpEditEngine->IsFormatted())
+					pImpEditEngine->StartOnlineSpellTimer();
 			}
 			else
 			{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2039
retrieving revision 1.2040
diff -u -p -r1.2039 -r1.2040
--- openoffice.org.spec	27 Nov 2009 09:22:35 -0000	1.2039
+++ openoffice.org.spec	4 Dec 2009 09:37:20 -0000	1.2040
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 20
+%define rh_rpm_release 21
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -176,6 +176,7 @@ Patch99: openoffice.org-3.2.0.oooXXXXX.c
 Patch100: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 Patch101: openoffice.org-3.3.0.ooo102645.fix.es.patch
 Patch102: openoffice.org-3.2.0.ooo107260.dtrans.clipboard.shutdown.patch
+Patch103: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1738,6 +1739,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch100 -p1 -b .ooo107151.sc.pop-empty-cell.patch
 %patch101 -p0 -b .ooo102645.fix.es.patch
 %patch102 -p0 -b .ooo107260.dtrans.clipboard.shutdown.patch
+%patch103 -p1 -b .ooo106502.svx.fixspelltimer.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4271,6 +4273,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Dec 04 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-19.21.UNBUILT
+- Resolves: rhbz#544124 add 
+  openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+
 * Fri Nov 27 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.20
 - Resolves: rhbz#541222 add
   openoffice.org-3.2.0.ooo107260.dtrans.clipboard.shutdown.patch (caolanm)



From caolanm at fedoraproject.org  Fri Dec  4 09:37:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  4 Dec 2009 09:37:22 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch, NONE,
	1.1 openoffice.org.spec, 1.2095, 1.2096
Message-ID: <20091204093722.4FCA311C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31038/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch 
Log Message:
Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch

openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch:
 editeng.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch ---
diff -r 3ee4cb3a17dd svx/source/editeng/editeng.cxx
--- a/svx/source/editeng/editeng.cxx	Fri Oct 30 09:44:02 2009 +0000
+++ b/svx/source/editeng/editeng.cxx	Fri Oct 30 17:46:26 2009 +0000
@@ -1783,7 +1783,8 @@
 					ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( n );
 					pNode->CreateWrongList();
 				}
-				pImpEditEngine->StartOnlineSpellTimer();
+				if (pImpEditEngine->IsFormatted())
+					pImpEditEngine->StartOnlineSpellTimer();
 			}
 			else
 			{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2095
retrieving revision 1.2096
diff -u -p -r1.2095 -r1.2096
--- openoffice.org.spec	3 Dec 2009 20:51:42 -0000	1.2095
+++ openoffice.org.spec	4 Dec 2009 09:37:22 -0000	1.2096
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 7
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -132,6 +132,7 @@ Patch54: openoffice.org-3.2.0.ooo107151.
 Patch55: openoffice.org-3.3.0.ooo102645.fix.es.patch
 Patch56: workspace.vcl108.patch
 Patch57: workspace.pythonssldedux.patch
+Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1658,6 +1659,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch55 -p0 -b .ooo102645.fix.es.patch
 %patch56 -p0 -b .workspace.vcl108.patch
 %patch57 -p1 -b .workspace.pythonssldedux.patch
+%patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4160,6 +4162,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec 04 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.2
+- Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+
 * Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.1
 - latest milestone
 



From twaugh at fedoraproject.org  Fri Dec  4 09:37:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Dec 2009 09:37:39 +0000 (UTC)
Subject: rpms/foomatic/F-12 foomatic-db-engine-perl.patch, NONE,
	1.1 foomatic.spec, 1.230, 1.231
Message-ID: <20091204093739.DEFC311C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31173

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-db-engine-perl.patch 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 4.0.3-7
- Fixed installation path for perl module.


foomatic-db-engine-perl.patch:
 configure    |    4 ++--
 configure.ac |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE foomatic-db-engine-perl.patch ---
diff -up foomatic-db-engine-4.0.3/configure.ac.perl foomatic-db-engine-4.0.3/configure.ac
--- foomatic-db-engine-4.0.3/configure.ac.perl	2009-12-04 09:26:14.236782616 +0000
+++ foomatic-db-engine-4.0.3/configure.ac	2009-12-04 09:29:08.819781206 +0000
@@ -184,13 +184,13 @@ else
   PREFIX=$prefix
 fi
 echo -n Checking whether Perl will find libraries installed under $PREFIX...
-if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[[0-9]]?|)(/site_perl|)/[[0-9]]" > /dev/null); then
+if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[[0-9]]?|)(/site_perl|)" > /dev/null); then
   PERLPREFIX=$PREFIX
   echo " yes"
 else
   echo " no"
   echo -n Checking whether Perl will find libraries installed under /usr/local...
-  if ( $PERL -V | egrep "^ */usr/local/lib(/perl[[0-9]]?|)(/site_perl|)/[[0-9]]" > /dev/null); then
+  if ( $PERL -V | egrep "^ */usr/local/lib(/perl[[0-9]]?|)(/site_perl|)" > /dev/null); then
     PERLPREFIX=/usr/local
     echo " yes"
     echo Installing the Perl libraries with prefix /usr/local.
diff -up foomatic-db-engine-4.0.3/configure.perl foomatic-db-engine-4.0.3/configure
--- foomatic-db-engine-4.0.3/configure.perl	2009-12-04 09:29:12.117906609 +0000
+++ foomatic-db-engine-4.0.3/configure	2009-12-04 09:29:34.709782105 +0000
@@ -4519,13 +4519,13 @@ else
   PREFIX=$prefix
 fi
 echo -n Checking whether Perl will find libraries installed under $PREFIX...
-if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[0-9]?|)(/site_perl|)/[0-9]" > /dev/null); then
+if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[0-9]?|)(/site_perl|)" > /dev/null); then
   PERLPREFIX=$PREFIX
   echo " yes"
 else
   echo " no"
   echo -n Checking whether Perl will find libraries installed under /usr/local...
-  if ( $PERL -V | egrep "^ */usr/local/lib(/perl[0-9]?|)(/site_perl|)/[0-9]" > /dev/null); then
+  if ( $PERL -V | egrep "^ */usr/local/lib(/perl[0-9]?|)(/site_perl|)" > /dev/null); then
     PERLPREFIX=/usr/local
     echo " yes"
     echo Installing the Perl libraries with prefix /usr/local.
diff -up foomatic-db-engine-4.0.3/Makefile.in.perl foomatic-db-engine-4.0.3/Makefile.in


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-12/foomatic.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- foomatic.spec	10 Nov 2009 12:41:20 -0000	1.230
+++ foomatic.spec	4 Dec 2009 09:37:39 -0000	1.231
@@ -4,7 +4,7 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    5%{?dist}
+Release:    7%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -28,6 +28,9 @@ Patch101: foomatic-db-engine-libdir.patc
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch102: foomatic-bad-utf8.patch
 
+# Fixed installation path for perl module.
+Patch103: foomatic-db-engine-perl.patch
+
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
 Url:		http://www.linuxprinting.org
@@ -79,6 +82,7 @@ pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch101 -p1 -b .libdir
 %patch102 -p1
+%patch103 -p1 -b .perl
 aclocal
 autoconf
 popd
@@ -156,6 +160,12 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 4.0.3-7
+- Fixed installation path for perl module.
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 4.0.3-6
+- rebuild against perl 5.10.1
+
 * Tue Nov 10 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-5
 - Build requires cups.
 



From caolanm at fedoraproject.org  Fri Dec  4 09:37:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  4 Dec 2009 09:37:55 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 openoffice.org.spec,1.2040,1.2041
Message-ID: <20091204093755.6925E11C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31262

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -p -r1.2040 -r1.2041
--- openoffice.org.spec	4 Dec 2009 09:37:20 -0000	1.2040
+++ openoffice.org.spec	4 Dec 2009 09:37:55 -0000	1.2041
@@ -4273,7 +4273,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Dec 04 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-19.21.UNBUILT
+* Fri Dec 04 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.21.UNBUILT
 - Resolves: rhbz#544124 add 
   openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 



From twaugh at fedoraproject.org  Fri Dec  4 09:38:24 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Dec 2009 09:38:24 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-db-engine-perl.patch, NONE,
	1.1 foomatic.spec, 1.231, 1.232
Message-ID: <20091204093824.646DE11C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31522

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-db-engine-perl.patch 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 4.0.3-7
- Fixed installation path for perl module.


foomatic-db-engine-perl.patch:
 configure    |    4 ++--
 configure.ac |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE foomatic-db-engine-perl.patch ---
diff -up foomatic-db-engine-4.0.3/configure.ac.perl foomatic-db-engine-4.0.3/configure.ac
--- foomatic-db-engine-4.0.3/configure.ac.perl	2009-12-04 09:26:14.236782616 +0000
+++ foomatic-db-engine-4.0.3/configure.ac	2009-12-04 09:29:08.819781206 +0000
@@ -184,13 +184,13 @@ else
   PREFIX=$prefix
 fi
 echo -n Checking whether Perl will find libraries installed under $PREFIX...
-if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[[0-9]]?|)(/site_perl|)/[[0-9]]" > /dev/null); then
+if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[[0-9]]?|)(/site_perl|)" > /dev/null); then
   PERLPREFIX=$PREFIX
   echo " yes"
 else
   echo " no"
   echo -n Checking whether Perl will find libraries installed under /usr/local...
-  if ( $PERL -V | egrep "^ */usr/local/lib(/perl[[0-9]]?|)(/site_perl|)/[[0-9]]" > /dev/null); then
+  if ( $PERL -V | egrep "^ */usr/local/lib(/perl[[0-9]]?|)(/site_perl|)" > /dev/null); then
     PERLPREFIX=/usr/local
     echo " yes"
     echo Installing the Perl libraries with prefix /usr/local.
diff -up foomatic-db-engine-4.0.3/configure.perl foomatic-db-engine-4.0.3/configure
--- foomatic-db-engine-4.0.3/configure.perl	2009-12-04 09:29:12.117906609 +0000
+++ foomatic-db-engine-4.0.3/configure	2009-12-04 09:29:34.709782105 +0000
@@ -4519,13 +4519,13 @@ else
   PREFIX=$prefix
 fi
 echo -n Checking whether Perl will find libraries installed under $PREFIX...
-if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[0-9]?|)(/site_perl|)/[0-9]" > /dev/null); then
+if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[0-9]?|)(/site_perl|)" > /dev/null); then
   PERLPREFIX=$PREFIX
   echo " yes"
 else
   echo " no"
   echo -n Checking whether Perl will find libraries installed under /usr/local...
-  if ( $PERL -V | egrep "^ */usr/local/lib(/perl[0-9]?|)(/site_perl|)/[0-9]" > /dev/null); then
+  if ( $PERL -V | egrep "^ */usr/local/lib(/perl[0-9]?|)(/site_perl|)" > /dev/null); then
     PERLPREFIX=/usr/local
     echo " yes"
     echo Installing the Perl libraries with prefix /usr/local.
diff -up foomatic-db-engine-4.0.3/Makefile.in.perl foomatic-db-engine-4.0.3/Makefile.in


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- foomatic.spec	4 Dec 2009 02:54:40 -0000	1.231
+++ foomatic.spec	4 Dec 2009 09:38:24 -0000	1.232
@@ -4,7 +4,7 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -28,6 +28,9 @@ Patch101: foomatic-db-engine-libdir.patc
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch102: foomatic-bad-utf8.patch
 
+# Fixed installation path for perl module.
+Patch103: foomatic-db-engine-perl.patch
+
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
 Url:		http://www.linuxprinting.org
@@ -79,6 +82,7 @@ pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch101 -p1 -b .libdir
 %patch102 -p1
+%patch103 -p1 -b .perl
 aclocal
 autoconf
 popd
@@ -156,6 +160,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 4.0.3-7
+- Fixed installation path for perl module.
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 4.0.3-6
 - rebuild against perl 5.10.1
 



From phuang at fedoraproject.org  Fri Dec  4 09:58:04 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  4 Dec 2009 09:58:04 +0000 (UTC)
Subject: rpms/ibus/F-11 .cvsignore, 1.37, 1.38 ibus.spec, 1.85, 1.86 sources,
	1.42, 1.43
Message-ID: <20091204095804.6BE0111C00E0@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4342

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
back port from fedora 12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	27 Sep 2009 07:18:15 -0000	1.37
+++ .cvsignore	4 Dec 2009 09:58:04 -0000	1.38
@@ -1 +1 @@
-ibus-1.2.0.20090927.tar.gz
+ibus-1.2.0.20091204.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ibus.spec	27 Sep 2009 07:19:15 -0000	1.85
+++ ibus.spec	4 Dec 2009 09:58:04 -0000	1.86
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090927
+Version:    1.2.0.20091204
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -33,7 +33,6 @@ BuildRequires:  gtk-doc
 BuildRequires:  GConf2-devel
 BuildRequires:  pygobject2-devel
 BuildRequires:  intltool
-# BuildRequires:  qt-devel
 
 Requires:   %{name}-libs = %{version}-%{release}
 Requires:   %{name}-gtk = %{version}-%{release}
@@ -83,15 +82,6 @@ Requires(post): glib2 >= %{glib_ver}
 %description gtk
 This package contains ibus im module for gtk2
 
-# %package qt
-# Summary:    IBus im module for qt4
-# Group:      System Environment/Libraries
-# Requires:   %{name} = %{version}-%{release}
-# Requires:   qt >= 4.4.2
-# 
-# %description qt
-# This package contains ibus im module for qt4
-
 %package devel
 Summary:    Development tools for ibus
 Group:      Development/Libraries
@@ -203,8 +193,7 @@ fi
 %{_bindir}/ibus-setup
 %{_datadir}/ibus/*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/hicolor/*/status/*
+%{_datadir}/icons/hicolor/*/apps/*
 %{_libexecdir}/ibus-gconf
 %{_libexecdir}/ibus-ui-gtk
 %{_libexecdir}/ibus-x11
@@ -234,6 +223,23 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Dec 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
+- Update to 1.2.0.20091204
+- Fix Bug 529920 - language panel pops up on the wrong monitor
+- Fix Bug 541197 - Ibus crash
+
+* Tue Nov 24 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001124-1
+- Update to 1.2.0.20091124
+- Update some translations.
+- Fix bug 538147 - [abrt] crash detected in firefox-3.5.5-1.fc12 
+
+* Sat Oct 24 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001024-1
+- Update to 1.2.0.20091024
+
+* Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001014-2
+- Update to 1.2.0.20091014
+- Change ICON in ibus.conf 
+
 * Mon Sep 27 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090927-1
 - Update to 1.2.0.20090927
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	27 Sep 2009 07:18:16 -0000	1.42
+++ sources	4 Dec 2009 09:58:04 -0000	1.43
@@ -1 +1 @@
-300bf18ac0a4d3f1364412a52c9e9746  ibus-1.2.0.20090927.tar.gz
+89b15760649c7edb6326163112a47865  ibus-1.2.0.20091204.tar.gz



From pkgdb at fedoraproject.org  Fri Dec  4 10:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 10:24:41 +0000
Subject: [pkgdb] volume_key: huzaifas has given up watchcommits
Message-ID: <20091204102441.E28F410F894@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchcommits acl on volume_key (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 10:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 10:24:41 +0000
Subject: [pkgdb] volume_key: huzaifas has given up watchbugzilla
Message-ID: <20091204102442.046A010F899@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchbugzilla acl on volume_key (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 10:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 10:24:42 +0000
Subject: [pkgdb] volume_key: huzaifas has requested approveacls
Message-ID: <20091204102442.72EC910F89E@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on volume_key (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 10:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 10:24:45 +0000
Subject: [pkgdb] volume_key: huzaifas has requested commit
Message-ID: <20091204102445.4777210F8A3@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on volume_key (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 10:24:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 10:24:49 +0000
Subject: [pkgdb] volume_key: huzaifas has given up watchbugzilla
Message-ID: <20091204102450.08F8310F8A4@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchbugzilla acl on volume_key (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 10:24:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 10:24:53 +0000
Subject: [pkgdb] volume_key: huzaifas has given up watchcommits
Message-ID: <20091204102453.3C74610F8AB@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchcommits acl on volume_key (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 10:24:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 10:24:50 +0000
Subject: [pkgdb] volume_key: huzaifas has requested commit
Message-ID: <20091204102450.CAF1E10F8A8@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on volume_key (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 10:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 10:24:54 +0000
Subject: [pkgdb] volume_key: huzaifas has requested approveacls
Message-ID: <20091204102454.7F63410F8AF@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on volume_key (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pmatilai at fedoraproject.org  Fri Dec  4 10:29:34 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri,  4 Dec 2009 10:29:34 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.2-chmod-selinux.patch, 1.1, 1.2 rpm.spec,
	1.368, 1.369
Message-ID: <20091204102934.D975011C00E0@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13499

Modified Files:
	rpm-4.7.2-chmod-selinux.patch rpm.spec 
Log Message:
- bah, test-suite autofoo breaks due to chmod-test change in configure.ac,
  buildrequire autoconf for now


rpm-4.7.2-chmod-selinux.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: rpm-4.7.2-chmod-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.7.2-chmod-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpm-4.7.2-chmod-selinux.patch	4 Dec 2009 09:32:32 -0000	1.1
+++ rpm-4.7.2-chmod-selinux.patch	4 Dec 2009 10:29:34 -0000	1.2
@@ -10,15 +10,3 @@ diff -up rpm-4.7.2/configure.ac.chmod-te
  rm -f foo.chmodtest
  if test "$a" = "-rwxr-xr-x"; then
      AC_MSG_RESULT(yes)
-diff -up rpm-4.7.2/configure.chmod-test rpm-4.7.2/configure
---- rpm-4.7.2/configure.chmod-test	2009-12-04 11:24:06.000000000 +0200
-+++ rpm-4.7.2/configure	2009-12-04 11:24:51.000000000 +0200
-@@ -17626,7 +17626,7 @@ $as_echo_n "checking POSIX chmod... " >&
- touch foo.chmodtest
- chmod 744 foo.chmodtest
- chmod +X foo.chmodtest 2>/dev/null
--a=`ls -l foo.chmodtest | awk '{print $1}'`
-+a=`ls -l foo.chmodtest | awk '{print substr($1,1,10)}'`
- rm -f foo.chmodtest
- if test "$a" = "-rwxr-xr-x"; then
-     { $as_echo "$as_me:$LINENO: result: yes" >&5


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -p -r1.368 -r1.369
--- rpm.spec	4 Dec 2009 09:32:33 -0000	1.368
+++ rpm.spec	4 Dec 2009 10:29:34 -0000	1.369
@@ -97,6 +97,9 @@ BuildRequires: xz-devel >= 4.999.8
 BuildRequires: sqlite-devel
 %endif
 
+# XXX temporarily for chmod-test patch
+BuildRequires: autoconf
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description



From hadess at fedoraproject.org  Fri Dec  4 10:49:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  4 Dec 2009 10:49:28 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-12 gstreamer-plugins-good.spec, 1.112,
	1.113
Message-ID: <20091204104929.02E0511C00E0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19705

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
* Fri Dec 04 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-3
- Disable LADSPA plugins, they should be in -bad (#540198)



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/gstreamer-plugins-good.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- gstreamer-plugins-good.spec	30 Nov 2009 15:08:37 -0000	1.112
+++ gstreamer-plugins-good.spec	4 Dec 2009 10:49:28 -0000	1.113
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.17
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -44,7 +44,6 @@ BuildRequires:  gtk2-devel
 BuildRequires:  libshout-devel
 BuildRequires:  taglib-devel
 BuildRequires:	wavpack-devel
-BuildRequires:	ladspa-devel
 BuildRequires:  libsoup-devel
 BuildRequires:  kernel-headers
 BuildRequires:  pulseaudio-libs-devel
@@ -121,30 +120,16 @@ autoreconf
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
   --disable-gtk-doc \
   --enable-experimental \
-  --enable-ladspa \
   --disable-esd --disable-libcaca --disable-aalib \
   --with-default-visualizer=autoaudiosink
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=478449
-# ladspa looks in the wrong directory for libraries
-%if %{_lib} == "lib64"
-sed -i 's^:/usr/lib/ladspa:^:/usr/lib64/ladspa:^' ext/ladspa/load.c
-sed -i 's^:/usr/lib/ladspa:^:/usr/lib64/ladspa:^' ext/ladspa/search.c
-%endif
-
 make %{?_smp_mflags}
-pushd ext/ladspa
-make %{?_smp_mflags}
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
-pushd ext/ladspa
-make install DESTDIR=%{buildroot}
-popd
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Clean out files that should not be part of the rpm.
@@ -230,11 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstgconfelements.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstwavpack.so
-%{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsouphttpsrc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstshout2.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttaglib.so
-# %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 # %{_libdir}/gstreamer-%{majorminor}/libgstaasink.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpulse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
@@ -276,6 +259,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Fri Dec 04 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-3
+- Disable LADSPA plugins, they should be in -bad (#540198)
+
 * Mon Nov 30 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-2
 - Add support for authenticating RTSP sources
 



From hadess at fedoraproject.org  Fri Dec  4 10:52:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  4 Dec 2009 10:52:15 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.114,
	1.115
Message-ID: <20091204105215.91EAF11C00E0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20643

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
* Fri Dec 04 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-3
- Disable LADSPA plugins, they should be in -bad (#540198)



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- gstreamer-plugins-good.spec	30 Nov 2009 15:45:07 -0000	1.114
+++ gstreamer-plugins-good.spec	4 Dec 2009 10:52:15 -0000	1.115
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.17
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -44,7 +44,6 @@ BuildRequires:  gtk2-devel
 BuildRequires:  libshout-devel
 BuildRequires:  taglib-devel
 BuildRequires:	wavpack-devel
-BuildRequires:	ladspa-devel
 BuildRequires:  libsoup-devel
 BuildRequires:  kernel-headers
 BuildRequires:  pulseaudio-libs-devel
@@ -121,30 +120,16 @@ autoreconf
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
   --disable-gtk-doc \
   --enable-experimental \
-  --enable-ladspa \
   --disable-esd --disable-libcaca --disable-aalib \
   --with-default-visualizer=autoaudiosink
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=478449
-# ladspa looks in the wrong directory for libraries
-%if %{_lib} == "lib64"
-sed -i 's^:/usr/lib/ladspa:^:/usr/lib64/ladspa:^' ext/ladspa/load.c
-sed -i 's^:/usr/lib/ladspa:^:/usr/lib64/ladspa:^' ext/ladspa/search.c
-%endif
-
 make %{?_smp_mflags}
-pushd ext/ladspa
-make %{?_smp_mflags}
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
-pushd ext/ladspa
-make install DESTDIR=%{buildroot}
-popd
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Clean out files that should not be part of the rpm.
@@ -230,11 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstgconfelements.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstwavpack.so
-%{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsouphttpsrc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstshout2.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttaglib.so
-# %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 # %{_libdir}/gstreamer-%{majorminor}/libgstaasink.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpulse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
@@ -276,6 +259,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Fri Dec 04 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-3
+- Disable LADSPA plugins, they should be in -bad (#540198)
+
 * Mon Nov 30 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-2
 - Add support for authenticating RTSP sources
 



From jakub at fedoraproject.org  Fri Dec  4 11:10:03 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  4 Dec 2009 11:10:03 +0000 (UTC)
Subject: File gcc-4.4.2-20091204.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091204111003.2297810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gcc:

dcff137d5ba8e70cd5cf8fcd0b34ede6  gcc-4.4.2-20091204.tar.bz2



From jakub at fedoraproject.org  Fri Dec  4 11:13:08 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  4 Dec 2009 11:13:08 +0000 (UTC)
Subject: rpms/gcc/F-12 .cvsignore, 1.312, 1.313 gcc.spec, 1.95, 1.96 sources,
	1.319, 1.320 gcc44-CVE-2009-3736.patch, 1.1, NONE
Message-ID: <20091204111308.BEAD811C00E0@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26603

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-CVE-2009-3736.patch 
Log Message:
4.4.2-14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- .cvsignore	2 Dec 2009 10:21:44 -0000	1.312
+++ .cvsignore	4 Dec 2009 11:13:08 -0000	1.313
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091202.tar.bz2
+gcc-4.4.2-20091204.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- gcc.spec	2 Dec 2009 22:55:26 -0000	1.95
+++ gcc.spec	4 Dec 2009 11:13:08 -0000	1.96
@@ -1,9 +1,9 @@
-%global DATE 20091202
-%global SVNREV 154912
+%global DATE 20091204
+%global SVNREV 154977
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 13
+%global gcc_release 14
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,7 +161,6 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
-Patch20: gcc44-CVE-2009-3736.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -467,7 +466,6 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
-%patch20 -p0 -b .CVE-2009-3736~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1851,6 +1849,13 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Dec  4 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-14
+- update from gcc-4_4-branch
+  - PRs libstdc++/42261, middle-end/42049
+- backport C++0x ICE fix from trunk (PR c++/42266)
+- fortran !$omp workshare improvements (PR fortran/35423)
+- FMA4 and XOP fixes
+
 * Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-13
 - fix security issues in libltdl bundled within libgcj (CVE-2009-3736)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- sources	2 Dec 2009 14:58:27 -0000	1.319
+++ sources	4 Dec 2009 11:13:08 -0000	1.320
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-74a02ed7bf5efa323ab4113d7e5331b5  gcc-4.4.2-20091202.tar.bz2
+dcff137d5ba8e70cd5cf8fcd0b34ede6  gcc-4.4.2-20091204.tar.bz2


--- gcc44-CVE-2009-3736.patch DELETED ---



From snecker at fedoraproject.org  Fri Dec  4 11:18:48 2009
From: snecker at fedoraproject.org (Christopher Brown)
Date: Fri,  4 Dec 2009 11:18:48 +0000 (UTC)
Subject: rpms/log4net/F-12 log4net.spec,1.10,1.11
Message-ID: <20091204111848.38DFF11C00E0@cvs1.fedora.phx.redhat.com>

Author: snecker

Update of /cvs/pkgs/rpms/log4net/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28116

Modified Files:
	log4net.spec 
Log Message:
Use system mono.snk instead of generating one on each build



Index: log4net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4net/F-12/log4net.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- log4net.spec	29 Nov 2009 20:15:48 -0000	1.10
+++ log4net.spec	4 Dec 2009 11:18:48 -0000	1.11
@@ -12,7 +12,7 @@ URL:		http://logging.apache.org/log4net/
 License:	ASL 2.0
 Group:		System Environment/Libraries
 Version:	1.2.10
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	A .NET framework for logging
 Source:		http://cvs.apache.org/dist/incubator/log4net/1.2.10/incubating-log4net-1.2.10.zip
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -46,8 +46,8 @@ framework to the .NET runtime
 rm -rf bin/
 
 %build
-# create a Strong Name key to allow build to run
-sn -k log4net.snk
+# use system mono.snk key
+-ln -s /etc/pki/mono/mono.snk log4net.snk
 # ASF recommend using nant to build log4net
 nant -buildfile:log4net.build compile-all
 
@@ -84,6 +84,9 @@ gacutil -i bin/mono/1.0/release/log4net.
 
 
 %changelog
+* Fri Dec  4 2009 Christopher Brown <snecklifter at gmail.com> - 1.2.10-11
+- Uses system mono.snk instead of generating one each time
+
 * Sun Nov 29 2009 Christopher Brown <snecklifter at gmail.com> - 1.2.10-10
 - Fix libdir location for pkgconfig
 



From corsepiu at fedoraproject.org  Fri Dec  4 11:22:12 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  4 Dec 2009 11:22:12 +0000 (UTC)
Subject: rpms/rt3/devel rt-3.8.4-rh-bz543962.diff, NONE, 1.1 rt3.spec, 1.46,
	1.47
Message-ID: <20091204112212.E78FF11C00E0@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29629

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.4-rh-bz543962.diff 
Log Message:
* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.5-2
- Add rt-3.8.4-rh-bz543962.diff (BZ #543962).


rt-3.8.4-rh-bz543962.diff:
 SetupSessionCookie |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE rt-3.8.4-rh-bz543962.diff ---
diff -Naur rt-3.8.4.orig/share/html/Elements/SetupSessionCookie rt-3.8.4/share/html/Elements/SetupSessionCookie
--- rt-3.8.4.orig/share/html/Elements/SetupSessionCookie	2009-06-10 20:40:27.000000000 +0200
+++ rt-3.8.4/share/html/Elements/SetupSessionCookie	2009-12-04 11:56:31.000000000 +0100
@@ -53,11 +53,17 @@
 my %cookies      = CGI::Cookie->fetch;
 my $cookiename   = "RT_SID_". RT->Config->Get('rtname');
 $cookiename     .= ".". $ENV{'SERVER_PORT'} if $ENV{'SERVER_PORT'};
-$SessionCookie ||= ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef ),
+$SessionCookie = ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef );
 
 tie %session, 'RT::Interface::Web::Session', $SessionCookie;
 undef $cookies{$cookiename} unless $SessionCookie && $session{'_session_id'} eq $SessionCookie;
 
+unless ($session{'CurrentUser'} && $session{CurrentUser}->id) {
+	tied(%session)->delete;
+	undef $cookies{$cookiename};
+	tie %session, 'RT::Interface::Web::Session', undef;
+}
+
 if ( int RT->Config->Get('AutoLogoff') ) {
     my $now = int(time/60);
     my $last_update = $session{'_session_last_update'} || 0;


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rt3.spec	12 Oct 2009 16:03:21 -0000	1.46
+++ rt3.spec	4 Dec 2009 11:22:12 -0000	1.47
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -55,6 +55,11 @@ Patch0:		rt-3.8.4-config.diff
 Patch2:		rt-3.8.4-Makefile.diff
 Patch3:		rt-3.8.4-test-dependencies.diff
 
+# http://bugzilla.redhat.com/show_bug.cgi?id=543962
+# Patch from http://bestpractical.typepad.com/files/rt-3.8-session_fixation.patch
+# Fixed in rt >= 3.8.6
+Patch6:		rt-3.8.4-rh-bz543962.diff
+
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -232,6 +237,7 @@ find etc -type f -exec chmod a-x {} \;
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
+%patch6 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -431,6 +437,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.5-2
+- Add rt-3.8.4-rh-bz543962.diff (BZ #543962).
+
 * Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.5-1
 - Upstream update.
 - Remove rt-3.8.4-rh-bz526870.diff.



From corsepiu at fedoraproject.org  Fri Dec  4 11:23:35 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  4 Dec 2009 11:23:35 +0000 (UTC)
Subject: rpms/rt3/F-12 rt-3.8.4-rh-bz543962.diff, NONE, 1.1 rt3.spec, 1.45,
	1.46
Message-ID: <20091204112335.381F511C00E0@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30104

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.4-rh-bz543962.diff 
Log Message:
* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-7
- Add rt-3.8.4-rh-bz543962.diff (BZ #543962).


rt-3.8.4-rh-bz543962.diff:
 SetupSessionCookie |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE rt-3.8.4-rh-bz543962.diff ---
diff -Naur rt-3.8.4.orig/share/html/Elements/SetupSessionCookie rt-3.8.4/share/html/Elements/SetupSessionCookie
--- rt-3.8.4.orig/share/html/Elements/SetupSessionCookie	2009-06-10 20:40:27.000000000 +0200
+++ rt-3.8.4/share/html/Elements/SetupSessionCookie	2009-12-04 11:56:31.000000000 +0100
@@ -53,11 +53,17 @@
 my %cookies      = CGI::Cookie->fetch;
 my $cookiename   = "RT_SID_". RT->Config->Get('rtname');
 $cookiename     .= ".". $ENV{'SERVER_PORT'} if $ENV{'SERVER_PORT'};
-$SessionCookie ||= ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef ),
+$SessionCookie = ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef );
 
 tie %session, 'RT::Interface::Web::Session', $SessionCookie;
 undef $cookies{$cookiename} unless $SessionCookie && $session{'_session_id'} eq $SessionCookie;
 
+unless ($session{'CurrentUser'} && $session{CurrentUser}->id) {
+	tied(%session)->delete;
+	undef $cookies{$cookiename};
+	tie %session, 'RT::Interface::Web::Session', undef;
+}
+
 if ( int RT->Config->Get('AutoLogoff') ) {
     my $now = int(time/60);
     my $last_update = $session{'_session_last_update'} || 0;


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-12/rt3.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- rt3.spec	13 Oct 2009 01:55:10 -0000	1.45
+++ rt3.spec	4 Dec 2009 11:23:35 -0000	1.46
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -60,6 +60,11 @@ Patch3:		rt-3.8.4-test-dependencies.diff
 # Fixed in rt >= 3.8.5
 Patch5:		rt-3.8.4-rh-bz526870.diff
 
+# http://bugzilla.redhat.com/show_bug.cgi?id=543962
+# Patch from http://bestpractical.typepad.com/files/rt-3.8-session_fixation.patch
+# Fixed in rt >= 3.8.6
+Patch6:		rt-3.8.4-rh-bz543962.diff
+
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -238,6 +243,7 @@ find etc -type f -exec chmod a-x {} \;
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -437,6 +443,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-7
+- Add rt-3.8.4-rh-bz543962.diff (BZ #543962).
+
 * Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-6
 - Update rt-3.8.4-rh-bz526870.diff.
 



From corsepiu at fedoraproject.org  Fri Dec  4 11:25:50 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  4 Dec 2009 11:25:50 +0000 (UTC)
Subject: rpms/rt3/F-11 rt-3.8.2-rh-bz543962.diff, NONE, 1.1 rt3.spec, 1.43,
	1.44
Message-ID: <20091204112550.EC50211C00E0@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30846

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.2-rh-bz543962.diff 
Log Message:
* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-12
- Add rt-3.8.2-rh-bz543962.diff (BZ #543962).


rt-3.8.2-rh-bz543962.diff:
 SetupSessionCookie |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE rt-3.8.2-rh-bz543962.diff ---
diff -Naur rt-3.8.2.orig/share/html/Elements/SetupSessionCookie rt-3.8.2/share/html/Elements/SetupSessionCookie
--- rt-3.8.2.orig/share/html/Elements/SetupSessionCookie	2009-01-07 02:15:29.000000000 +0100
+++ rt-3.8.2/share/html/Elements/SetupSessionCookie	2009-12-04 11:30:01.000000000 +0100
@@ -53,11 +53,17 @@
 my %cookies      = CGI::Cookie->fetch;
 my $cookiename   = "RT_SID_". RT->Config->Get('rtname');
 $cookiename     .= ".". $ENV{'SERVER_PORT'} if $ENV{'SERVER_PORT'};
-$SessionCookie ||= ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef ),
+$SessionCookie = ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef );
 
 tie %session, 'RT::Interface::Web::Session', $SessionCookie;
 undef $cookies{$cookiename} unless $SessionCookie && $session{'_session_id'} eq $SessionCookie;
 
+unless ($session{'CurrentUser'} && $session{CurrentUser}->id) {
+	tied(%session)->delete;
+	undef $cookies{$cookiename};
+	tie %session, 'RT::Interface::Web::Session', undef;
+}
+
 if ( int RT->Config->Get('AutoLogoff') ) {
     my $now = int(time/60);
     my $last_update = $session{'_session_last_update'} || 0;


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-11/rt3.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- rt3.spec	13 Oct 2009 02:10:40 -0000	1.43
+++ rt3.spec	4 Dec 2009 11:25:50 -0000	1.44
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -65,6 +65,10 @@ Patch4:		rt-3.8.2-rh-bz506236.diff
 # Fixed in rt >= 3.8.5
 Patch5:		rt-3.8.2-rh-bz526870.diff
 
+# http://bugzilla.redhat.com/show_bug.cgi?id=543962
+# Patch from http://bestpractical.typepad.com/files/rt-3.8-session_fixation.patch
+# Fixed in rt >= 3.8.6
+Patch6:		rt-3.8.2-rh-bz543962.diff
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -245,6 +249,7 @@ find etc -type f -exec chmod a-x {} \;
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -444,6 +449,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-12
+- Add rt-3.8.2-rh-bz543962.diff (BZ #543962).
+
 * Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-11
 - Update rt-3.8.2-rh-bz526870.diff.
 



From corsepiu at fedoraproject.org  Fri Dec  4 11:27:30 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  4 Dec 2009 11:27:30 +0000 (UTC)
Subject: rpms/rt3/F-10 rt-3.8.2-rh-bz543962.diff, NONE, 1.1 rt3.spec, 1.42,
	1.43
Message-ID: <20091204112730.B723011C00E0@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31386

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.2-rh-bz543962.diff 
Log Message:
* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-12
- Add rt-3.8.2-rh-bz543962.diff (BZ #543962).


rt-3.8.2-rh-bz543962.diff:
 SetupSessionCookie |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE rt-3.8.2-rh-bz543962.diff ---
diff -Naur rt-3.8.2.orig/share/html/Elements/SetupSessionCookie rt-3.8.2/share/html/Elements/SetupSessionCookie
--- rt-3.8.2.orig/share/html/Elements/SetupSessionCookie	2009-01-07 02:15:29.000000000 +0100
+++ rt-3.8.2/share/html/Elements/SetupSessionCookie	2009-12-04 11:30:01.000000000 +0100
@@ -53,11 +53,17 @@
 my %cookies      = CGI::Cookie->fetch;
 my $cookiename   = "RT_SID_". RT->Config->Get('rtname');
 $cookiename     .= ".". $ENV{'SERVER_PORT'} if $ENV{'SERVER_PORT'};
-$SessionCookie ||= ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef ),
+$SessionCookie = ( $cookies{$cookiename} ? $cookies{$cookiename}->value : undef );
 
 tie %session, 'RT::Interface::Web::Session', $SessionCookie;
 undef $cookies{$cookiename} unless $SessionCookie && $session{'_session_id'} eq $SessionCookie;
 
+unless ($session{'CurrentUser'} && $session{CurrentUser}->id) {
+	tied(%session)->delete;
+	undef $cookies{$cookiename};
+	tie %session, 'RT::Interface::Web::Session', undef;
+}
+
 if ( int RT->Config->Get('AutoLogoff') ) {
     my $now = int(time/60);
     my $last_update = $session{'_session_last_update'} || 0;


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- rt3.spec	13 Oct 2009 02:41:00 -0000	1.42
+++ rt3.spec	4 Dec 2009 11:27:30 -0000	1.43
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -65,6 +65,10 @@ Patch4:		rt-3.8.2-rh-bz506236.diff
 # Fixed in rt >= 3.8.5
 Patch5:		rt-3.8.2-rh-bz526870.diff
 
+# http://bugzilla.redhat.com/show_bug.cgi?id=543962
+# Patch from http://bestpractical.typepad.com/files/rt-3.8-session_fixation.patch
+# Fixed in rt >= 3.8.6
+Patch6:		rt-3.8.2-rh-bz543962.diff
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -245,6 +249,7 @@ find etc -type f -exec chmod a-x {} \;
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -444,6 +449,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-12
+- Add rt-3.8.2-rh-bz543962.diff (BZ #543962).
+
 * Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-11
 - Update rt-3.8.2-rh-bz526870.diff.
 



From dsd at fedoraproject.org  Fri Dec  4 11:31:03 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri,  4 Dec 2009 11:31:03 +0000 (UTC)
Subject: File olpc-utils-1.0.13.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091204113103.CF5FE10F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for olpc-utils:

b3dc4f96d43063c7675c906e2fec2929  olpc-utils-1.0.13.tar.bz2



From snecker at fedoraproject.org  Fri Dec  4 11:34:53 2009
From: snecker at fedoraproject.org (Christopher Brown)
Date: Fri,  4 Dec 2009 11:34:53 +0000 (UTC)
Subject: rpms/log4net/F-12 log4net.spec,1.11,1.12
Message-ID: <20091204113453.8614311C00E0@cvs1.fedora.phx.redhat.com>

Author: snecker

Update of /cvs/pkgs/rpms/log4net/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv886

Modified Files:
	log4net.spec 
Log Message:
Fix type to get mono.snk linking


Index: log4net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4net/F-12/log4net.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- log4net.spec	4 Dec 2009 11:18:48 -0000	1.11
+++ log4net.spec	4 Dec 2009 11:34:53 -0000	1.12
@@ -12,7 +12,7 @@ URL:		http://logging.apache.org/log4net/
 License:	ASL 2.0
 Group:		System Environment/Libraries
 Version:	1.2.10
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A .NET framework for logging
 Source:		http://cvs.apache.org/dist/incubator/log4net/1.2.10/incubating-log4net-1.2.10.zip
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -47,7 +47,7 @@ rm -rf bin/
 
 %build
 # use system mono.snk key
--ln -s /etc/pki/mono/mono.snk log4net.snk
+ln -s /etc/pki/mono/mono.snk log4net.snk
 # ASF recommend using nant to build log4net
 nant -buildfile:log4net.build compile-all
 
@@ -84,6 +84,9 @@ gacutil -i bin/mono/1.0/release/log4net.
 
 
 %changelog
+* Fri Dec  4 2009 Christopher Brown <snecklifter at gmail.com> - 1.2.10-12
+- Argh, Fix typo
+
 * Fri Dec  4 2009 Christopher Brown <snecklifter at gmail.com> - 1.2.10-11
 - Uses system mono.snk instead of generating one each time
 



From dsd at fedoraproject.org  Fri Dec  4 11:35:33 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri,  4 Dec 2009 11:35:33 +0000 (UTC)
Subject: rpms/olpc-utils/devel .cvsignore, 1.12, 1.13 olpc-utils.spec, 1.21, 
	1.22 sources, 1.14, 1.15
Message-ID: <20091204113533.9688911C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1121

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Dec 2009 09:35:14 -0000	1.12
+++ .cvsignore	4 Dec 2009 11:35:33 -0000	1.13
@@ -1 +1 @@
-olpc-utils-1.0.12.tar.bz2
+olpc-utils-1.0.13.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- olpc-utils.spec	1 Dec 2009 09:35:14 -0000	1.21
+++ olpc-utils.spec	4 Dec 2009 11:35:33 -0000	1.22
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.12
+Version:    1.0.13
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -19,9 +19,6 @@ Requires:   /usr/bin/find
 #comment out for the moment as olpcupdate isn't in Fedora mainline
 #Requires:   olpcupdate >= 2.10
 
-# for olpc-session
-Requires:   /usr/share/sugar/data
-
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -64,7 +61,6 @@ rm -rf %{buildroot}
 %{_bindir}/olpc-clean-previews
 %{_bindir}/olpc-audit
 %{_bindir}/olpc-test-devkey
-%attr(0644, -, -) %{_datadir}/sugar/data/sugar-xo.gtkrc
 %{_sysconfdir}/profile.d/zzz_olpc.sh
 %{_sysconfdir}/cron.d/olpc-pwr-prof.cron
 %{_sysconfdir}/rc.d/init.d/olpc-configure
@@ -82,7 +78,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
-* Tue Dec  2 2009 Daniel Drake <dsd at laptop.org> - 1.0.12-1
+* Fri Dec  4 2009 Daniel Drake <dsd at laptop.org> - 1.0.13-1
+- Bump to v1.0.13
+
+* Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 1.0.12-1
 - Bump to v1.0.12
 
 * Thu Nov 26 2009 Daniel Drake <dsd at laptop.org> - 1.0.11-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	1 Dec 2009 09:35:14 -0000	1.14
+++ sources	4 Dec 2009 11:35:33 -0000	1.15
@@ -1 +1 @@
-b12a2ae5b1ad4a7fea518a7626150476  olpc-utils-1.0.12.tar.bz2
+b3dc4f96d43063c7675c906e2fec2929  olpc-utils-1.0.13.tar.bz2



From dsd at fedoraproject.org  Fri Dec  4 11:36:11 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri,  4 Dec 2009 11:36:11 +0000 (UTC)
Subject: rpms/olpc-utils/F-11 .cvsignore, 1.10, 1.11 olpc-utils.spec, 1.19, 
	1.20 sources, 1.13, 1.14
Message-ID: <20091204113611.DFD6711C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1373

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Dec 2009 09:42:28 -0000	1.10
+++ .cvsignore	4 Dec 2009 11:36:11 -0000	1.11
@@ -1 +1 @@
-olpc-utils-1.0.12.tar.bz2
+olpc-utils-1.0.13.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- olpc-utils.spec	1 Dec 2009 09:42:28 -0000	1.19
+++ olpc-utils.spec	4 Dec 2009 11:36:11 -0000	1.20
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.12
+Version:    1.0.13
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -19,9 +19,6 @@ Requires:   /usr/bin/find
 #comment out for the moment as olpcupdate isn't in Fedora mainline
 #Requires:   olpcupdate >= 2.10
 
-# for olpc-session
-Requires:   /usr/share/sugar/data
-
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -64,7 +61,6 @@ rm -rf %{buildroot}
 %{_bindir}/olpc-clean-previews
 %{_bindir}/olpc-audit
 %{_bindir}/olpc-test-devkey
-%attr(0644, -, -) %{_datadir}/sugar/data/sugar-xo.gtkrc
 %{_sysconfdir}/profile.d/zzz_olpc.sh
 %{_sysconfdir}/cron.d/olpc-pwr-prof.cron
 %{_sysconfdir}/rc.d/init.d/olpc-configure
@@ -82,7 +78,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
-* Tue Dec  2 2009 Daniel Drake <dsd at laptop.org> - 1.0.12-1
+* Fri Dec  4 2009 Daniel Drake <dsd at laptop.org> - 1.0.13-1
+- Bump to v1.0.13
+
+* Tue Dec  1 2009 Daniel Drake <dsd at laptop.org> - 1.0.12-1
 - Bump to v1.0.12
 
 * Thu Nov 26 2009 Daniel Drake <dsd at laptop.org> - 1.0.11-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	1 Dec 2009 09:42:28 -0000	1.13
+++ sources	4 Dec 2009 11:36:11 -0000	1.14
@@ -1 +1 @@
-b12a2ae5b1ad4a7fea518a7626150476  olpc-utils-1.0.12.tar.bz2
+b3dc4f96d43063c7675c906e2fec2929  olpc-utils-1.0.13.tar.bz2



From dsd at fedoraproject.org  Fri Dec  4 11:45:36 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri,  4 Dec 2009 11:45:36 +0000 (UTC)
Subject: rpms/olpc-utils/F-12 olpc-utils.spec,1.15,1.16
Message-ID: <20091204114536.412B011C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4078

Modified Files:
	olpc-utils.spec 
Log Message:
v1.0.13


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-12/olpc-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- olpc-utils.spec	10 Nov 2009 15:29:04 -0000	1.15
+++ olpc-utils.spec	4 Dec 2009 11:45:35 -0000	1.16
@@ -1,6 +1,6 @@
 Name:       olpc-utils
-Version:    1.0.6
-Release:    2%{?dist}
+Version:    1.0.13
+Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -19,9 +19,6 @@ Requires:   /usr/bin/find
 #comment out for the moment as olpcupdate isn't in Fedora mainline
 #Requires:   olpcupdate >= 2.10
 
-# for olpc-session
-Requires:   /usr/share/sugar/data
-
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -64,7 +61,6 @@ rm -rf %{buildroot}
 %{_bindir}/olpc-clean-previews
 %{_bindir}/olpc-audit
 %{_bindir}/olpc-test-devkey
-%attr(0644, -, -) %{_datadir}/sugar/data/sugar-xo.gtkrc
 %{_sysconfdir}/profile.d/zzz_olpc.sh
 %{_sysconfdir}/cron.d/olpc-pwr-prof.cron
 %{_sysconfdir}/rc.d/init.d/olpc-configure
@@ -73,6 +69,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/hal/fdi/information/30-keymap-olpc.fdi
 %config(noreplace) %{_sysconfdir}/motd.olpc
 %config(noreplace) %{_sysconfdir}/event.d/ttyS0
+%config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-sd.rules
 %config(noreplace) %{_sysconfdir}/X11/xorg-dcon.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg-xo1.5-dcon.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg-emu.conf
@@ -81,6 +78,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Fri Dec  4 2009 Daniel Drake <dsd at laptop.org> - 1.0.13-1
+- Bump to v1.0.13
+
 * Tue Nov 10 2009 Daniel Drake <dsd at laptop.org> - 1.0.6-2
 - retag (??)
 



From dsd at fedoraproject.org  Fri Dec  4 11:48:58 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri,  4 Dec 2009 11:48:58 +0000 (UTC)
Subject: rpms/olpc-utils/F-12 .cvsignore, 1.5, 1.6 olpc-utils.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <20091204114858.89A1211C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4981

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Nov 2009 11:04:46 -0000	1.5
+++ .cvsignore	4 Dec 2009 11:48:58 -0000	1.6
@@ -1 +1 @@
-olpc-utils-1.0.4.tar.bz2
+olpc-utils-1.0.13.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-12/olpc-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- olpc-utils.spec	4 Dec 2009 11:45:35 -0000	1.16
+++ olpc-utils.spec	4 Dec 2009 11:48:58 -0000	1.17
@@ -1,6 +1,6 @@
 Name:       olpc-utils
 Version:    1.0.13
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Fri Dec  4 2009 Daniel Drake <dsd at laptop.org> - 1.0.13-2
+- retag after commit sources files
+
 * Fri Dec  4 2009 Daniel Drake <dsd at laptop.org> - 1.0.13-1
 - Bump to v1.0.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Nov 2009 15:27:35 -0000	1.7
+++ sources	4 Dec 2009 11:48:58 -0000	1.8
@@ -1 +1 @@
-ce2f306ae9895e41641323f8dac86c7f  olpc-utils-1.0.6.tar.bz2
+b3dc4f96d43063c7675c906e2fec2929  olpc-utils-1.0.13.tar.bz2



From matt at fedoraproject.org  Fri Dec  4 12:00:36 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  4 Dec 2009 12:00:36 +0000 (UTC)
Subject: rpms/condor/F-12 fix_platform_check.patch, NONE,
	1.1 guess_version_from_release_dir.patch, NONE,
	1.1 only_dynamic_unstripped.patch, NONE, 1.1 chkconfig_off.patch,
	1.1, 1.2 condor.spec, 1.24, 1.25 condor_config.generic.patch,
	1.3, 1.4 generate-tarball.sh, 1.3, 1.4 NOTICE.txt, 1.1,
	NONE no_basename.patch, 1.1, NONE no_rpmdb_query.patch, 1.1, NONE
Message-ID: <20091204120036.13DD511C02C4@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8280

Modified Files:
	chkconfig_off.patch condor.spec condor_config.generic.patch 
	generate-tarball.sh 
Added Files:
	fix_platform_check.patch guess_version_from_release_dir.patch 
	only_dynamic_unstripped.patch 
Removed Files:
	NOTICE.txt no_basename.patch no_rpmdb_query.patch 
Log Message:
7.4.0-0.1

fix_platform_check.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_platform_check.patch ---
--- condor-7.4.0/src/configure.ac	2009-10-28 11:05:25.000000000 -0400
+++ condor-7.4.0mf/src/configure.ac	2009-12-04 06:22:47.000000000 -0500
@@ -608,7 +608,7 @@
 AC_SUBST(_cv_kernel_rev,$_cv_kernel_rev)
 
 AC_MSG_CHECKING([platform name])
-AC_MSG_RESULT([$_platform])
+AC_MSG_RESULT([$_cv_platform])
 AC_SUBST(_cv_platform,$_cv_platform)
 
 # check out the libc

guess_version_from_release_dir.patch:
 make_final_tarballs |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE guess_version_from_release_dir.patch ---
--- condor-7.4.0/src/condor_scripts/make_final_tarballs	2009-10-28 11:05:25.000000000 -0400
+++ condor-7.4.0mf/src/condor_scripts/make_final_tarballs	2009-12-04 06:19:34.000000000 -0500
@@ -111,10 +111,12 @@
 } else {
     # If we weren't told on the command line, use the condor_master
     # binary with -version to find the version string.
-    if( -f "strip_dir/sbin/condor_master" ) {
-        $vers_string=`./strip_dir/sbin/condor_master -version`;
+    if( -f "release_dir/sbin/condor_master" ) {
+        $vers_string=`./release_dir/sbin/condor_master -version`;
     } elsif ( -f "static_dir/sbin/condor_master" ) {
         $vers_string=`./static_dir/sbin/condor_master -version`;
+    } elsif ( -f "strip_dir/sbin/condor_master" ) {
+        $vers_string=`./strip_dir/sbin/condor_master -version`;
     } else {
 	die "ERROR: can't find a condor_version, and no -v specified";
     }

only_dynamic_unstripped.patch:
 Imakefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE only_dynamic_unstripped.patch ---
--- condor-7.4.0/src/Imakefile	2009-10-28 11:05:25.000000000 -0400
+++ condor-7.4.0mf/src/Imakefile	2009-12-04 06:00:50.000000000 -0500
@@ -575,9 +575,9 @@
 SHA1Constraint = --no-require-sha1
 #endif
 
-public: release all_tarballs
+public: release unstrip.tar
 	if test ! -d ../public; then mkdir ../public; fi
-	perl condor_scripts/make_final_tarballs --sys=$(SYSNAME) --platform=$(MFT_PLATFORM) --tarcmd="$(TAR_CMD)" --cpcmd="$(CP_CMD)" --target=../public
+	perl condor_scripts/make_final_tarballs --sys=$(SYSNAME) --platform=$(MFT_PLATFORM) --tarcmd="$(TAR_CMD)" --cpcmd="$(CP_CMD)" --target=../public --linktype=unstripped-dynamic
 	$(MakeRPMs)
 	perl condor_scripts/make_checksums --target=../public --md5sum="$(MD5SUM)" --sha1sum="$(SHA1SUM)" $(MD5Constraint) $(SHA1Constraint)
 

chkconfig_off.patch:
 condor.init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: chkconfig_off.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/chkconfig_off.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- chkconfig_off.patch	15 Jan 2009 05:01:05 -0000	1.1
+++ chkconfig_off.patch	4 Dec 2009 12:00:30 -0000	1.2
@@ -5,8 +5,8 @@ diff -ru condor-7.2.0/src/condor_example
  #
  # condor	This script allows for starting and stopping Condor.
  #
--# chkconfig: 2345 90 10
-+# chkconfig: - 90 10
+-# chkconfig: 2345 98 10
++# chkconfig: - 98 10
  # description: Condor is a high throughput computing batch processing
  # 	       platform.
  # processname: condor_master


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/condor.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- condor.spec	28 Aug 2009 18:02:12 -0000	1.24
+++ condor.spec	4 Dec 2009 12:00:31 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.2.4
+Version: 7.4.0
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
@@ -20,16 +20,17 @@ URL: http://www.cs.wisc.edu/condor/
 #   a2dd96ea537b2c6d105b6c8dad563ddc  condor_src-7.2.0-all-all.tar.gz
 #   edbac8267130ac0a0e016d0f113b4616  condor_src-7.2.1-all-all.tar.gz
 #   6d9b0ef74d575623af11e396fa274174  condor_src-7.2.4-all-all.tar.gz
+#   ee72b65fad02d21af0dc8f1aa5872110  condor_src-7.4.0-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.2.4-159529-RH.tar.gz
+Source0: condor-7.4.0-193173-RH.tar.gz
 Source1: generate-tarball.sh
-Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
 Patch1: stdsoap2.h.patch.patch
 Patch3: chkconfig_off.patch
-Patch4: no_rpmdb_query.patch
-Patch5: no_basename.patch
 Patch6: log_lock_run.patch
+Patch7: only_dynamic_unstripped.patch
+Patch8: guess_version_from_release_dir.patch
+Patch9: fix_platform_check.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -108,14 +109,13 @@ exit 0
 %prep
 %setup -q -n %{name}-%{version}
 
-cp %{SOURCE2} .
-
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -135,6 +135,7 @@ export USE_OLD_IMAKE
 cd src
 ./build_init
 %configure --with-buildid=Fedora-%{version}-%{release} \
+   --with-platform=$(uname -s)-$(uname -p) \
    --enable-proper \
    --disable-full-port \
    --disable-gcc-version-check \
@@ -173,7 +174,7 @@ rm -rf %{buildroot}
 
 # make public creates release tarballs which we will install
 oldpwd=$PWD
-cd public/v7.2
+cd public/v7.4
 gzip -cd condor-%{version}-*-dynamic-unstripped.tar.gz | tar x
 cd condor-%{version}
 
@@ -263,7 +264,8 @@ rm $PREFIX/lib/webservice/condorStarter.
 rm $PREFIX/lib/webservice/condorTransferd.wsdl
 rm $PREFIX/lib/webservice/condorTt.wsdl
 rm $PREFIX/lib/webservice/condorVMgahp.wsdl
-
+rm $PREFIX/lib/webservice/condorRooster.wsdl
+rm $PREFIX/lib/webservice/condorTest.wsdl
 
 # not packaging glexec support right now
 rm $PREFIX/libexec/condor_glexec_cleanup
@@ -398,6 +400,7 @@ rm -rf %{buildroot}
 %_datadir/condor/CondorJavaWrapper.class
 %_datadir/condor/Condor.pm
 %_datadir/condor/scimark2lib.jar
+%_datadir/condor/condor_ssh_to_job_sshd_config_template
 %dir %_datadir/condor/webservice/
 %_datadir/condor/webservice/condorCollector.wsdl
 %_datadir/condor/webservice/condorMaster.wsdl
@@ -414,6 +417,13 @@ rm -rf %{buildroot}
 %_libexecdir/condor/sshd.sh
 %_libexecdir/condor/condor_job_router
 %_libexecdir/condor/gridftp_wrapper.sh
+%_libexecdir/condor/condor_glexec_update_proxy
+%_libexecdir/condor/condor_limits_wrapper.sh
+%_libexecdir/condor/condor_rooster
+%_libexecdir/condor/condor_ssh_to_job_shell_setup
+%_libexecdir/condor/condor_ssh_to_job_sshd_setup
+%_libexecdir/condor/libvirt_simple_script.awk
+%_libexecdir/condor/power_state
 %_mandir/man1/condor_advertise.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
 %_mandir/man1/condor_chirp.1.gz
@@ -485,6 +495,7 @@ rm -rf %{buildroot}
 %_bindir/condor_wait
 %_bindir/condor_hold
 %_bindir/condor_submit
+%_bindir/condor_ssh_to_job
 # sbin/condor is a link for master_off, off, on, reconfig,
 # reconfig_schedd, restart
 %_sbindir/condor_advertise
@@ -556,7 +567,7 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled
 if [ $? = 0 ]; then
-   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd 2>&1| grep -v "already defined"
+   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd
    restorecon  %_sbindir/condor_startd
 fi
 
@@ -576,6 +587,17 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009  <matt at redhat> - 7.4.0-1
+- Upgrade to 7.4.0 release
+- Fixed POSTIN error (BZ540439)
+- Removed NOTICE.txt source, now provided by upstream
+- Removed no_rpmdb_query.patch, applied upstream
+- Removed no_basename.patch, applied upstream
+- Added only_dynamic_unstripped.patch to reduce build time
+- Added guess_version_from_release_dir.patch, for previous
+- Added fix_platform_check.patch
+- Use new --with-platform, to avoid modification of make_final_tarballs
+
 * Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
 - Upgrade to 7.2.4 release
 - Removed gcc44_const.patch, accepted upstream

condor_config.generic.patch:
 condor_config.generic |   52 +++++++++++++++++++++++++++++++++-----------------
 customize             |    2 -
 2 files changed, 36 insertions(+), 18 deletions(-)

Index: condor_config.generic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/condor_config.generic.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- condor_config.generic.patch	24 Feb 2009 14:52:24 -0000	1.3
+++ condor_config.generic.patch	4 Dec 2009 12:00:31 -0000	1.4
@@ -89,15 +89,9 @@ index f3f60a5..94c146f 100644
  
  ##  This macro is used to specify a short description of your pool. 
  ##  It should be about 20 characters long. For example, the name of 
-@@ -218,7 +230,7 @@ HOSTALLOW_READ = *
- ##    HOSTALLOW_WRITE = *
- ##  but note that this will allow anyone to submit jobs or add
- ##  machines to your pool and is serious security risk.
--HOSTALLOW_WRITE = YOU_MUST_CHANGE_THIS_INVALID_CONDOR_CONFIGURATION_VALUE
-+HOSTALLOW_WRITE = $(FULL_HOSTNAME)
- #HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
- #HOSTDENY_WRITE = bad-machine.your.domain
- 
+@@ -214,1 +231,1 @@
+-ALLOW_WRITE = YOU_MUST_CHANGE_THIS_INVALID_CONDOR_CONFIGURATION_VALUE
++ALLOW_WRITE = $(FULL_HOSTNAME)
 @@ -872,9 +883,10 @@ SPOOL		= $(LOCAL_DIR)/spool
  EXECUTE		= $(LOCAL_DIR)/execute
  BIN		= $(RELEASE_DIR)/bin


Index: generate-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/generate-tarball.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- generate-tarball.sh	7 Jan 2009 19:22:17 -0000	1.3
+++ generate-tarball.sh	4 Dec 2009 12:00:32 -0000	1.4
@@ -25,9 +25,6 @@ echo "...recording BUILD-ID: $build"
 
 for f in \
     src/condor_mail \
-    src/condor_vm-gahp/cygwin1.dll \
-    src/condor_vm-gahp/mkisofs.exe \
-    config/CONDOR_TEST_LRG \
     src/condor_tests/job_vmu_basic.sh \
     src/condor_tests/job_vmu_cdrom.run \
     src/condor_tests/job_vmu_cdrom.sh \
@@ -40,12 +37,9 @@ for f in \
     src/condor_tests/x_vm_utils.pm \
     src/condor_tests/x_param.vmware \
     src/condor_tests/x_vmware_test_vm.cmd \
-    src/condor_tests/x_vmware_test_vm.tar.gz \
     src/condor_tests/x_vmware_configpostsrc \
-    config/CONDOR_TEST_CNFDTL \
     src/condor_tests/job_ligo_x86-64-chkpttst.cmd \
     src/condor_tests/job_ligo_x86-64-chkpttst.run \
-    src/condor_tests/x_job_ligo_x86-64-chkpttst.tar.gz \
     src/condor_tests/job_quill_basic.cmd \
     src/condor_tests/job_quill_basic.pl \
     src/condor_tests/job_quill_basic.run \


--- NOTICE.txt DELETED ---


--- no_basename.patch DELETED ---


--- no_rpmdb_query.patch DELETED ---



From jwrdegoede at fedoraproject.org  Fri Dec  4 12:06:54 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  4 Dec 2009 12:06:54 +0000 (UTC)
Subject: rpms/DevIL/devel DevIL-1.7.8-CVE-2009-3994.patch, NONE,
	1.1 DevIL.spec, 1.16, 1.17
Message-ID: <20091204120654.18C4111C00E0@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10102

Modified Files:
	DevIL.spec 
Added Files:
	DevIL-1.7.8-CVE-2009-3994.patch 
Log Message:
* Fri Dec  4 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-4
- Fix DICOM Processing Buffer Overflow Vulnerability CVE-2009-3994 (#542700)


DevIL-1.7.8-CVE-2009-3994.patch:
 il_dicom.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE DevIL-1.7.8-CVE-2009-3994.patch ---
diff -up devil-1.7.8/src-IL/src/il_dicom.c~ devil-1.7.8/src-IL/src/il_dicom.c
--- devil-1.7.8/src-IL/src/il_dicom.c~	2009-03-08 08:10:09.000000000 +0100
+++ devil-1.7.8/src-IL/src/il_dicom.c	2009-12-03 12:07:45.000000000 +0100
@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID)
 		return IL_FALSE;
 
 	ValLen = GetLittleUShort();
+	if (ValLen > 64)
+		return IL_FALSE;
 	if (iread(UID, ValLen, 1) != 1)
 		return IL_FALSE;
-	UID[64] = 0;  // Just to make sure that our string is terminated.
+	UID[ValLen] = 0;  // Just to make sure that our string is terminated.
 
 	return IL_TRUE;
 }


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- DevIL.spec	21 Aug 2009 13:18:30 -0000	1.16
+++ DevIL.spec	4 Dec 2009 12:06:53 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           DevIL
 Version:        1.7.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -8,6 +8,7 @@ URL:            http://openil.sourceforg
 Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
 Patch0:         DevIL-1.7.5-allegropicfix.patch
 Patch1:         DevIL-1.7.5-il_endian_h.patch
+Patch2:         DevIL-1.7.8-CVE-2009-3994.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
@@ -65,6 +66,7 @@ Development files for the libILUT compon
 %setup -q -n devil-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
 touch -r CREDITS CREDITS.conv
 mv CREDITS.conv CREDITS
@@ -138,6 +140,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-4
+- Fix DICOM Processing Buffer Overflow Vulnerability CVE-2009-3994 (#542700)
+
 * Fri Aug 21 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-3
 - Switch Source0 to respun upstream tarbal (added a missing header)
 



From jwrdegoede at fedoraproject.org  Fri Dec  4 12:09:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  4 Dec 2009 12:09:23 +0000 (UTC)
Subject: rpms/DevIL/F-12 DevIL-1.7.8-CVE-2009-3994.patch, NONE,
	1.1 DevIL.spec, 1.16, 1.17
Message-ID: <20091204120923.57CF311C00E0@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10855

Modified Files:
	DevIL.spec 
Added Files:
	DevIL-1.7.8-CVE-2009-3994.patch 
Log Message:
* Fri Dec  4 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-4
- Fix DICOM Processing Buffer Overflow Vulnerability CVE-2009-3994 (#542700)


DevIL-1.7.8-CVE-2009-3994.patch:
 il_dicom.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE DevIL-1.7.8-CVE-2009-3994.patch ---
diff -up devil-1.7.8/src-IL/src/il_dicom.c~ devil-1.7.8/src-IL/src/il_dicom.c
--- devil-1.7.8/src-IL/src/il_dicom.c~	2009-03-08 08:10:09.000000000 +0100
+++ devil-1.7.8/src-IL/src/il_dicom.c	2009-12-03 12:07:45.000000000 +0100
@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID)
 		return IL_FALSE;
 
 	ValLen = GetLittleUShort();
+	if (ValLen > 64)
+		return IL_FALSE;
 	if (iread(UID, ValLen, 1) != 1)
 		return IL_FALSE;
-	UID[64] = 0;  // Just to make sure that our string is terminated.
+	UID[ValLen] = 0;  // Just to make sure that our string is terminated.
 
 	return IL_TRUE;
 }


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-12/DevIL.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- DevIL.spec	21 Aug 2009 13:18:30 -0000	1.16
+++ DevIL.spec	4 Dec 2009 12:09:23 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           DevIL
 Version:        1.7.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -8,6 +8,7 @@ URL:            http://openil.sourceforg
 Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
 Patch0:         DevIL-1.7.5-allegropicfix.patch
 Patch1:         DevIL-1.7.5-il_endian_h.patch
+Patch2:         DevIL-1.7.8-CVE-2009-3994.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
@@ -65,6 +66,7 @@ Development files for the libILUT compon
 %setup -q -n devil-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
 touch -r CREDITS CREDITS.conv
 mv CREDITS.conv CREDITS
@@ -138,6 +140,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-4
+- Fix DICOM Processing Buffer Overflow Vulnerability CVE-2009-3994 (#542700)
+
 * Fri Aug 21 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-3
 - Switch Source0 to respun upstream tarbal (added a missing header)
 



From jwrdegoede at fedoraproject.org  Fri Dec  4 12:10:24 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  4 Dec 2009 12:10:24 +0000 (UTC)
Subject: rpms/DevIL/F-11 DevIL-1.7.8-CVE-2009-3994.patch, NONE,
	1.1 DevIL.spec, 1.14, 1.15 sources, 1.6, 1.7
Message-ID: <20091204121024.9CDED11C03F6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11255

Modified Files:
	DevIL.spec sources 
Added Files:
	DevIL-1.7.8-CVE-2009-3994.patch 
Log Message:
* Fri Dec  4 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-4
- Fix DICOM Processing Buffer Overflow Vulnerability CVE-2009-3994 (#542700)


DevIL-1.7.8-CVE-2009-3994.patch:
 il_dicom.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE DevIL-1.7.8-CVE-2009-3994.patch ---
diff -up devil-1.7.8/src-IL/src/il_dicom.c~ devil-1.7.8/src-IL/src/il_dicom.c
--- devil-1.7.8/src-IL/src/il_dicom.c~	2009-03-08 08:10:09.000000000 +0100
+++ devil-1.7.8/src-IL/src/il_dicom.c	2009-12-03 12:07:45.000000000 +0100
@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID)
 		return IL_FALSE;
 
 	ValLen = GetLittleUShort();
+	if (ValLen > 64)
+		return IL_FALSE;
 	if (iread(UID, ValLen, 1) != 1)
 		return IL_FALSE;
-	UID[64] = 0;  // Just to make sure that our string is terminated.
+	UID[ValLen] = 0;  // Just to make sure that our string is terminated.
 
 	return IL_TRUE;
 }


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-11/DevIL.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- DevIL.spec	9 Mar 2009 09:25:04 -0000	1.14
+++ DevIL.spec	4 Dec 2009 12:10:24 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           DevIL
 Version:        1.7.8
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -8,6 +8,7 @@ URL:            http://openil.sourceforg
 Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
 Patch0:         DevIL-1.7.5-allegropicfix.patch
 Patch1:         DevIL-1.7.5-il_endian_h.patch
+Patch2:         DevIL-1.7.8-CVE-2009-3994.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
@@ -65,6 +66,7 @@ Development files for the libILUT compon
 %setup -q -n devil-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
 touch -r CREDITS CREDITS.conv
 mv CREDITS.conv CREDITS
@@ -138,6 +140,15 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-4
+- Fix DICOM Processing Buffer Overflow Vulnerability CVE-2009-3994 (#542700)
+
+* Fri Aug 21 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-3
+- Switch Source0 to respun upstream tarbal (added a missing header)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar  9 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-1
 - Update to latest upstream: 1.7.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Mar 2009 09:25:04 -0000	1.6
+++ sources	4 Dec 2009 12:10:24 -0000	1.7
@@ -1 +1 @@
-963ab2ef991b5921b2a981502fe43e74  DevIL-1.7.8.tar.gz
+7918f215524589435e5ec2e8736d5e1d  DevIL-1.7.8.tar.gz



From matt at fedoraproject.org  Fri Dec  4 12:13:25 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  4 Dec 2009 12:13:25 +0000 (UTC)
Subject: File condor-7.4.0-193173-RH.tar.gz uploaded to lookaside cache by
	matt
Message-ID: <20091204121325.C196D10F88E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for condor:

cd4fcdd518227fcc8782a02de500f39b  condor-7.4.0-193173-RH.tar.gz



From matt at fedoraproject.org  Fri Dec  4 12:18:12 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  4 Dec 2009 12:18:12 +0000 (UTC)
Subject: rpms/condor/F-12 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20091204121812.C9C7C11C00E0@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13469

Modified Files:
	.cvsignore sources 
Log Message:
7.4.0-0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	28 Aug 2009 17:23:52 -0000	1.7
+++ .cvsignore	4 Dec 2009 12:18:12 -0000	1.8
@@ -1 +1 @@
-condor-7.2.4-159529-RH.tar.gz
+condor-7.4.0-193173-RH.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Aug 2009 17:23:52 -0000	1.7
+++ sources	4 Dec 2009 12:18:12 -0000	1.8
@@ -1 +1 @@
-08d488cb94a8c111e968b609702a5ab3  condor-7.2.4-159529-RH.tar.gz
+cd4fcdd518227fcc8782a02de500f39b  condor-7.4.0-193173-RH.tar.gz



From mhlavink at fedoraproject.org  Fri Dec  4 12:30:03 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  4 Dec 2009 12:30:03 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.cron-daily, 1.3,
	1.4 cyrus-imapd.spec, 1.69, 1.70
Message-ID: <20091204123003.3344F11C03F6@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16777

Modified Files:
	cyrus-imapd.cron-daily cyrus-imapd.spec 
Log Message:
* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-10
- fix shell for daily cron job (#544182)



Index: cyrus-imapd.cron-daily
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.cron-daily,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd.cron-daily	8 Feb 2008 09:56:50 -0000	1.3
+++ cyrus-imapd.cron-daily	4 Dec 2009 12:30:02 -0000	1.4
@@ -30,7 +30,7 @@ done
 [ -f ${MBOXLIST}.gz ] && mv -f ${MBOXLIST}.gz ${MBOXLIST}.1.gz
 
 # export mailboxes.db
-$RUNUSER - cyrus -c "umask 077 < /dev/null ; /usr/lib/cyrus-imapd/ctl_mboxlist -d | gzip > ${MBOXLIST}.gz"
+$RUNUSER - cyrus -s /bin/sh -c "umask 077 < /dev/null ; /usr/lib/cyrus-imapd/ctl_mboxlist -d | gzip > ${MBOXLIST}.gz"
 
 exit 0
 # EOF


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- cyrus-imapd.spec	4 Dec 2009 02:03:22 -0000	1.69
+++ cyrus-imapd.spec	4 Dec 2009 12:30:02 -0000	1.70
@@ -2,7 +2,7 @@
 
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -520,7 +520,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.3.15-9
+* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-10
+- fix shell for daily cron job (#544182)
+
+* Fri Dec 04 2009 Stepan Kasal <skasal at redhat.com> - 2.3.15-9
 - rebuild against perl 5.10.1
 
 * Thu Nov 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-8



From mhlavink at fedoraproject.org  Fri Dec  4 12:31:35 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  4 Dec 2009 12:31:35 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-12 cyrus-imapd.cron-daily, 1.3,
	1.4 cyrus-imapd.spec, 1.64, 1.65
Message-ID: <20091204123135.9070B11C00E0@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17322

Modified Files:
	cyrus-imapd.cron-daily cyrus-imapd.spec 
Log Message:
* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-6
- fix cyrus shell for daily cron job (#544182)



Index: cyrus-imapd.cron-daily
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-12/cyrus-imapd.cron-daily,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd.cron-daily	8 Feb 2008 09:56:50 -0000	1.3
+++ cyrus-imapd.cron-daily	4 Dec 2009 12:31:35 -0000	1.4
@@ -30,7 +30,7 @@ done
 [ -f ${MBOXLIST}.gz ] && mv -f ${MBOXLIST}.gz ${MBOXLIST}.1.gz
 
 # export mailboxes.db
-$RUNUSER - cyrus -c "umask 077 < /dev/null ; /usr/lib/cyrus-imapd/ctl_mboxlist -d | gzip > ${MBOXLIST}.gz"
+$RUNUSER - cyrus -s /bin/sh -c "umask 077 < /dev/null ; /usr/lib/cyrus-imapd/ctl_mboxlist -d | gzip > ${MBOXLIST}.gz"
 
 exit 0
 # EOF


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-12/cyrus-imapd.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- cyrus-imapd.spec	6 Nov 2009 13:25:02 -0000	1.64
+++ cyrus-imapd.spec	4 Dec 2009 12:31:35 -0000	1.65
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -736,6 +736,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-6
+- fix cyrus shell for daily cron job (#544182)
+
 * Fri Nov 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-5
 - fix sourcing of /etc/sysconfig/cyrus-imapd (#533320)
 



From mhlavink at fedoraproject.org  Fri Dec  4 12:32:34 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  4 Dec 2009 12:32:34 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-11 cyrus-imapd.cron-daily, 1.3,
	1.4 cyrus-imapd.spec, 1.59, 1.60
Message-ID: <20091204123234.55C5911C00E0@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17636

Modified Files:
	cyrus-imapd.cron-daily cyrus-imapd.spec 
Log Message:
* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-5
- fix shell for daily cron job (#544182)



Index: cyrus-imapd.cron-daily
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd.cron-daily,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd.cron-daily	8 Feb 2008 09:56:50 -0000	1.3
+++ cyrus-imapd.cron-daily	4 Dec 2009 12:32:34 -0000	1.4
@@ -30,7 +30,7 @@ done
 [ -f ${MBOXLIST}.gz ] && mv -f ${MBOXLIST}.gz ${MBOXLIST}.1.gz
 
 # export mailboxes.db
-$RUNUSER - cyrus -c "umask 077 < /dev/null ; /usr/lib/cyrus-imapd/ctl_mboxlist -d | gzip > ${MBOXLIST}.gz"
+$RUNUSER - cyrus -s /bin/sh -c "umask 077 < /dev/null ; /usr/lib/cyrus-imapd/ctl_mboxlist -d | gzip > ${MBOXLIST}.gz"
 
 exit 0
 # EOF


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- cyrus-imapd.spec	6 Nov 2009 13:13:38 -0000	1.59
+++ cyrus-imapd.spec	4 Dec 2009 12:32:34 -0000	1.60
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -736,6 +736,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-5
+- fix shell for daily cron job (#544182)
+
 * Fri Nov 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-4
 - fix sourcing of /etc/sysconfig/cyrus-imapd (#533320)
 



From akurtakov at fedoraproject.org  Fri Dec  4 12:34:22 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Dec 2009 12:34:22 +0000 (UTC)
Subject: File eclipse-rpmstubby-fetched-src-0.4.0.tar.bz2 uploaded to
	lookaside cache by akurtakov
Message-ID: <20091204123422.29EB610F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-rpmstubby:

a54252a429cde74930d86bb83f5183ee  eclipse-rpmstubby-fetched-src-0.4.0.tar.bz2



From akurtakov at fedoraproject.org  Fri Dec  4 12:37:49 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Dec 2009 12:37:49 +0000 (UTC)
Subject: rpms/eclipse-rpmstubby/devel eclipse-rpmstubby.spec, 1.6,
	1.7 eclipse-rpmstubby-fetch-src.sh, 1.4, 1.5 .cvsignore, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20091204123749.1BAFB11C00E0@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-rpmstubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19796/devel

Modified Files:
	eclipse-rpmstubby.spec eclipse-rpmstubby-fetch-src.sh 
	.cvsignore sources 
Log Message:
- Update to Linux Tools 0.4 release.


Index: eclipse-rpmstubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/eclipse-rpmstubby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eclipse-rpmstubby.spec	1 Sep 2009 12:15:46 -0000	1.6
+++ eclipse-rpmstubby.spec	4 Dec 2009 12:37:48 -0000	1.7
@@ -1,9 +1,9 @@
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_datadir}/eclipse/dropins/rpmstubby
-%define qualifier      200908180856
+%define qualifier      200911191630
 
 Name:           eclipse-rpmstubby
-Version:        0.3.0
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        Rpm specfile generator for Eclipse features
 
@@ -51,6 +51,9 @@ install -d -m 755 %{buildroot}%{install_
 %doc org.eclipse.linuxtools.rpmstubby/ChangeLog
 
 %changelog
+* Fri Dec 4 2009 Alexander Kurtakov <akurtako at redhat.com> 0.4.0-1
+- Update to Linux Tools 0.4 release.
+
 * Tue Sep 1 2009 Alexander Kurtakov <akurtako at redhat.com> 0.3.0-1
 - Update to Linux Tools 0.3 release.
 


Index: eclipse-rpmstubby-fetch-src.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/eclipse-rpmstubby-fetch-src.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-rpmstubby-fetch-src.sh	1 Sep 2009 12:15:46 -0000	1.4
+++ eclipse-rpmstubby-fetch-src.sh	4 Dec 2009 12:37:48 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/sh
 usage='usage: $0 <tag>'
 name=eclipse-rpmstubby
-tag=LinuxTools_0_3_0
-tar_name=$name-fetched-src-0.3.0
+tag=R0_4_0
+tar_name=$name-fetched-src-0.4.0
 
 # example of fetch command:
 # fetch_cmd=cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/dsdp \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Sep 2009 12:15:46 -0000	1.4
+++ .cvsignore	4 Dec 2009 12:37:48 -0000	1.5
@@ -1,3 +1,4 @@
 eclipse-rpmstubby-fetched-src-0.1.0.tar.bz2
 eclipse-rpmstubby-fetched-src-0.1.1.tar.bz2
 eclipse-rpmstubby-fetched-src-0.3.0.tar.bz2
+eclipse-rpmstubby-fetched-src-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Sep 2009 12:15:46 -0000	1.5
+++ sources	4 Dec 2009 12:37:48 -0000	1.6
@@ -1 +1 @@
-84d2553064e552084a4965240dfa7254  eclipse-rpmstubby-fetched-src-0.3.0.tar.bz2
+a54252a429cde74930d86bb83f5183ee  eclipse-rpmstubby-fetched-src-0.4.0.tar.bz2



From than at fedoraproject.org  Fri Dec  4 12:37:55 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 12:37:55 +0000 (UTC)
Subject: rpms/qt/devel qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch, 
	NONE, 1.1 qt.spec, 1.357, 1.358
Message-ID: <20091204123755.AD25511C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19739

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch 
Log Message:
Stop using the NameOwnerChanged signal without arg0 in QtDBus itself



qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch:
 qdbusconnection.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch ---
>From a06da644f9293424f0f537c1d9288796403cd979 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira at nokia.com>
Date: Thu, 19 Nov 2009 10:01:47 +0100
Subject: [PATCH] Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"

This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188.

Task-number: QTBUG-5972
(cherry picked from commit db1cff73726ff12d50139769dc8071f9e9173261)
---
 src/dbus/qdbusconnection.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index b2a88ef..79ac8de 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1005,6 +1005,9 @@ void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection)
     busService = new QDBusConnectionInterface(connection, this);
     ref.deref(); // busService has increased the refcounting to us
                  // avoid cyclic refcounting
+//    if (mode != PeerMode)
+    QObject::connect(busService, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
+                     this, SIGNAL(serviceOwnerChanged(QString,QString,QString)));
 
     QObject::connect(this, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)),
                      busService, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)),
-- 
1.6.1



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -p -r1.357 -r1.358
--- qt.spec	1 Dec 2009 12:31:32 -0000	1.357
+++ qt.spec	4 Dec 2009 12:37:55 -0000	1.358
@@ -13,7 +13,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -79,6 +79,7 @@ Patch210: 0010-Fix-error-line-not-to-hav
 Patch211: 0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
 Patch213: 0013-Fix-QNativeImage-constructor.patch
+Patch214: qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -433,6 +434,7 @@ Qt libraries used for drawing widgets an
 #patch211 -p1 -b .kde-qt-0011
 %patch212 -p1 -b .kde-qt-0012
 #patch213 -p1 -b .kde-qt-0013
+%patch214 -p1 -b .QTBUG-5972
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -1017,6 +1019,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.6.0-2
+- Stop using the NameOwnerChanged signal without arg0 in QtDBus itself
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.6.0-1
 - 4.6.0
 



From jakub at fedoraproject.org  Fri Dec  4 12:41:27 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  4 Dec 2009 12:41:27 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.296, 1.297 gcc.spec, 1.75,
	1.76 gcc44-hack.patch, 1.5, 1.6 import.log, 1.2, 1.3 sources,
	1.300, 1.301 gcc44-raw-string.patch, 1.3,
	NONE gcc44-vta-rh521991.patch, 1.1, NONE
Message-ID: <20091204124127.9839111C00E0@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21808/devel

Modified Files:
	.cvsignore gcc.spec gcc44-hack.patch import.log sources 
Removed Files:
	gcc44-raw-string.patch gcc44-vta-rh521991.patch 
Log Message:
4.4.2-13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- .cvsignore	1 Oct 2009 08:07:34 -0000	1.296
+++ .cvsignore	4 Dec 2009 12:41:27 -0000	1.297
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20091001.tar.bz2
+gcc-4.4.2-20091204.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- gcc.spec	1 Oct 2009 08:07:34 -0000	1.75
+++ gcc.spec	4 Dec 2009 12:41:27 -0000	1.76
@@ -1,9 +1,9 @@
-%global DATE 20091001
-%global SVNREV 152364
-%global gcc_version 4.4.1
+%global DATE 20091204
+%global SVNREV 154977
+%global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 18
+%global gcc_release 14
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -40,7 +40,7 @@
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}
+Release: %{gcc_release}%{?dist}
 # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@@ -65,7 +65,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # Need binutils which support mffgpr and mftgpr >= 2.17.50.0.2-8
 # Need binutils which support --build-id >= 2.17.50.0.17-3
 # Need binutils which support %gnu_unique_object >= 2.19.51.0.14
-BuildRequires: binutils >= 2.19.51.0.14
+# Need binutils which support .cfi_sections >= 2.19.51.0.14-33
+BuildRequires: binutils >= 2.19.51.0.14-33
 # While gcc doesn't include statically linked binaries, during testing
 # -static is used several times.
 BuildRequires: glibc-static
@@ -118,8 +119,9 @@ Requires: cpp = %{version}-%{release}
 # Need binutils that supports --hash-style=gnu
 # Need binutils that support mffgpr/mftgpr
 # Need binutils that support --build-id
-# Need binutils which support %gnu_unique_object
-Requires: binutils >= 2.19.51.0.14
+# Need binutils that support %gnu_unique_object
+# Need binutils that support .cfi_sections
+Requires: binutils >= 2.19.51.0.14-33
 # Make sure gdb will understand DW_FORM_strp
 Conflicts: gdb < 5.1-2
 Requires: glibc-devel >= 2.2.90-12
@@ -155,12 +157,10 @@ Patch11: gcc44-sparc-config-detection.pa
 Patch12: gcc44-libgomp-omp_h-multilib.patch
 Patch13: gcc44-libtool-no-rpath.patch
 Patch14: gcc44-cloog-dl.patch
-Patch15: gcc44-raw-string.patch
 Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
-Patch20: gcc44-vta-rh521991.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -218,7 +218,7 @@ C++ Library.
 %package -n libstdc++-devel
 Summary: Header files and libraries for C++ development
 Group: Development/Libraries
-Requires: libstdc++ = %{version}-%{release}, %{_prefix}/%{_lib}/libstdc++.so.6
+Requires: libstdc++%{?_isa} = %{version}-%{release}
 Autoreq: true
 
 %description -n libstdc++-devel
@@ -362,8 +362,8 @@ programs compiled using the Java compile
 %package -n libgcj-devel
 Summary: Libraries for Java development using GCC
 Group: Development/Languages
-Requires: libgcj = %{version}-%{release}, %{_prefix}/%{_lib}/libgcj.so.10
-Requires: zlib-devel, %{_prefix}/%{_lib}/libz.so
+Requires: libgcj%{?_isa} = %{version}-%{release}
+Requires: zlib-devel%{?_isa}
 Requires: /bin/awk
 Autoreq: false
 Autoprov: false
@@ -460,14 +460,12 @@ which are required to compile with the G
 %if %{build_cloog}
 %patch14 -p0 -b .cloog-dl~
 %endif
-%patch15 -p0 -b .raw-string~
 %patch16 -p0 -b .unwind-debug-hook~
 %patch17 -p0 -b .pr38757~
 %if %{build_libstdcxx_docs}
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
-%patch20 -p0 -b .vta-rh521991~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -480,7 +478,7 @@ tar xzf %{SOURCE4}
 tar xjf %{SOURCE10}
 %endif
 
-sed -i -e 's/4\.4\.2/4.4.1/' gcc/BASE-VER
+sed -i -e 's/4\.4\.3/4.4.2/' gcc/BASE-VER
 echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
 
 # Default to -gdwarf-3 rather than -gdwarf-2
@@ -643,6 +641,11 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`
 %ifarch sparc sparcv9
 	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7
 %endif
+%if 0%{?rhel} >= 6
+%ifarch ppc ppc64
+	--with-cpu-32=power4 --with-tune-32=power6 --with-cpu-64=power4 --with-tune-64=power6 \
+%endif
+%endif
 %ifarch ppc
 	--build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
 %endif
@@ -1170,6 +1173,13 @@ chmod 644 %{buildroot}%{_mandir}/man1/un
 %check
 cd obj-%{gcc_target_platform}
 
+%if %{build_java}
+export PATH=`pwd`/../fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}${PATH:+:$PATH}
+%if !%{bootstrap_java}
+export PATH=`pwd`/java_hacks${PATH:+:$PATH}
+%endif
+%endif
+
 # run the tests.
 make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector}'" || :
 echo ====================TESTING=========================
@@ -1371,6 +1381,8 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/avxintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/x86intrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/fma4intrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xopintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/lwpintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm_malloc.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm3dnow.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cpuid.h
@@ -1837,6 +1849,157 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Dec  4 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-14
+- update from gcc-4_4-branch
+  - PRs libstdc++/42261, middle-end/42049
+- backport C++0x ICE fix from trunk (PR c++/42266)
+- fortran !$omp workshare improvements (PR fortran/35423)
+- FMA4 and XOP fixes
+
+* Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-13
+- fix security issues in libltdl bundled within libgcj (CVE-2009-3736)
+
+* Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-12
+- update from gcc-4_4-branch
+  - PRs c++/42234, fortran/41278, fortran/41807, fortran/42162, target/42113,
+	target/42165
+  - don't ICE on -O256 (#539923)
+- fix -mregnames on ppc/ppc64
+- optimize even COMDAT constructors and destructors without virtual
+  bases (PR c++/3187)
+
+* Mon Nov 23 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-11
+- update from gcc-4_4-branch
+  - PRs c++/42059, c++/42061, libgfortran/42090
+- VTA backports
+  - PRs debug/41886, debug/41888, debug/41926, tree-optimization/42078
+- optimize non-COMDAT constructors and destructors without virtual
+  bases by making the base and complete ctor or dtor aliases of
+  each other (PR c++/3187)
+
+* Sat Nov 14 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-10
+- update from gcc-4_4-branch
+  - PRs c++/21008, c++/37037, c++/41972, c++/41994, middle-end/40946,
+	middle-end/42029
+- VTA backports
+  - PR middle-end/41930
+- optimize deleting destructors for size (PR c++/3187)
+- try to avoid file Requires by requiring package%%{?_isa} (#533947)
+
+* Mon Nov  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-9
+- update from gcc-4_4-branch
+  - PRs c++/35067, c++/36912, c++/36959, c++/37093, c++/38699, c++/39786,
+	c++/41856, c++/41876, c++/41967, c++/9381, fortran/41772,
+	fortran/41909, middle-end/41963, rtl-optimization/41917,
+	target/41900, tree-optimization/41643
+- selected backports from trunk
+  - PRs debug/41801, middle-end/41837, target/41985, tree-optimization/41841
+- initial AMD Orochi -mxop and -mlwp support
+- try to avoid wrapping CONST_INTs/VOIDmode CONST_DOUBLEs into CONST
+
+* Mon Nov  2 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-8
+- update from gcc-4_4-branch
+  - PRs c++/41754, fortran/41777, fortran/41850, libstdc++/40852
+- fix ICE with unmatched #pragma GCC visibility push/pop (PR c++/41774)
+- fix VTA ICE with -combine (#531385, PR debug/41893)
+- fix RTTI for anon namespace classes
+- fix incorrect uses of __restrict keyword in valarray (PR libstdc++/41763)
+
+* Tue Oct 27 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-7
+- update from gcc-4_4-branch
+  - PRs c++/40808, c/41842, cp-tools/39177
+- VTA backports
+  - PR bootstrap/41345
+- don't emit DW_AT_name: <anonymous struct> etc. into debug info
+  (#530304, PR debug/41828)
+- power7 ABI fixes (PR target/41787)
+- fix ICE in ix86_pic_register_p (PR target/41762)
+
+* Thu Oct 22 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-6
+- update from gcc-4_4-branch
+  - PR target/41702
+  - fix a pod2man error in gcc.1 (#530102)
+  - fix mangling of very large names
+- document -print-multi-os-directory in gcc.info and gcc.1
+  (#529659, PR other/25507)
+
+* Mon Oct 19 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-5
+- update from gcc-4_4-branch
+  - PR fortran/41755
+  - s390 z10 tuning fixes
+- provide accurate attributes for powerpc builtins (PR target/23983)
+- fix -fcompare-debug differences caused by DCE removal of debug stmts
+- fix updating of speculation status with VTA (PR debug/41739)
+
+* Sun Oct 18 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-4
+- update from gcc-4_4-branch
+  - PRs c++/37204, c++/37766, c++/37875, c++/38798, c++/40092,
+	libstdc++/40654, libstdc++/40826
+- fix VTA ICE on invalid pointer arithmetics (#529512)
+
+* Sat Oct 17 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-3
+- fix VTA handling in the scheduler (PR debug/41535)
+- fix up %%check section to be able to find ecj1
+
+* Fri Oct 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-2
+- update from gcc-4_4-branch
+  - PR target/40913
+- VTA backports
+  - PR debug/41717
+- fix Ada .eh_frame generation (PR debug/40521)
+
+* Thu Oct 15 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-1
+- update from gcc-4_4-branch
+  - GCC 4.4.2 release
+  - PRs middle-end/22072, target/41665
+- don't emit -Wpadded warnings for builtin structures
+- don't generate .eh_frame, but generate .debug_frame when -g and none of
+  -fasynchronous-unwind-tables/-fexceptions/-funwind-tables is used
+  (PR debug/40521)
+
+* Wed Oct 14 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-22
+- update from gcc-4_4-branch
+  - PRs target/26515, target/38948
+  - fix s390{,x} BLKmode symbol handling
+  - fix i?86 testqi splitter (#528206, PR target/41680)
+- VTA backports
+  - introduce debug temps (PRs debug/41264, debug/41338, debug/41343,
+    debug/41447, target/41693)
+  - build debug stmts on updates (PR debug/41616)
+  - fix another with/without -save-temps debug info difference
+    (#526841, PR preprocessor/41543)
+  - fix invalid ranges in .debug_loc section (PR debug/41695)
+%if 0%{?rhel} >= 6
+- if -mcpu= isn't specified, default to -mcpu=power4 (#463549)
+%endif
+
+* Sat Oct 10 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-21
+- update from gcc-4_4-branch
+  - fix s390{,x} prefetch for pre-z10 CPUs (#524552)
+- VTA backports
+  - fix debug info differences with/without -save-temps
+    (PR preprocessor/41445)
+- fix ICE with small BLKmode returning call (#516028,
+  PR rtl-optimization/41646)
+
+* Thu Oct  8 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-20
+- update from gcc-4_4-branch
+  - PRs c++/39863, c++/41038
+- avoid redundant DW_AT_const_value when abstract origin already has one
+  (#527430) 
+- another VTA debug stmt renaming bugfix (#521991)
+
+* Mon Oct  5 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-19
+- update from gcc-4_4-branch
+  - PRs fortran/41479, fortran/41515
+- VTA backports
+  - PRs debug/41353, debug/41404, rtl-optimization/41511
+  - another debug info fix for decls passed by reference (#527057,
+    PR debug/41558)
+  - don't emit DW_AT_name on DW_TAG_const_type (#526970)
+- avoid invalid folding of casts to addresses of first fields
+  (#527121, PR middle-end/41317)
+
 * Thu Oct  1 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-18
 - update from gcc-4_4-branch
   - PRs ada/41100, target/22093

gcc44-hack.patch:
 gcc/ada/make.adb   |    1 +
 libada/Makefile.in |   32 +++++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

Index: gcc44-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-hack.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gcc44-hack.patch	9 Apr 2009 12:54:27 -0000	1.5
+++ gcc44-hack.patch	4 Dec 2009 12:41:27 -0000	1.6
@@ -1,6 +1,6 @@
 --- libada/Makefile.in.jj	2009-01-14 12:07:35.000000000 +0100
 +++ libada/Makefile.in	2009-01-15 14:25:33.000000000 +0100
-@@ -67,17 +67,39 @@ version := $(shell cat $(srcdir)/../gcc/
+@@ -69,18 +69,40 @@ version := $(shell cat $(srcdir)/../gcc/
  libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
  ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
  
@@ -38,12 +38,14 @@
          "SHELL=$(SHELL)" \
 -        "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS)" \
 -        "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS)" \
+-        "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS)" \
 +        "GNATLIBFLAGS=$(strip $(GNATLIBFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS))" \
 +        "GNATLIBCFLAGS=$(strip $(GNATLIBCFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS))" \
++        "GNATLIBCFLAGS_FOR_C=$(strip $(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS))" \
          "TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
          "THREAD_KIND=$(THREAD_KIND)" \
          "TRACE=$(TRACE)" \
-@@ -88,7 +110,7 @@ LIBADA_FLAGS_TO_PASS = \
+@@ -91,7 +113,7 @@ LIBADA_FLAGS_TO_PASS = \
          "exeext=.exeext.should.not.be.used " \
  	'CC=the.host.compiler.should.not.be.needed' \
  	"GCC_FOR_TARGET=$(CC)" \


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	14 May 2009 08:52:31 -0000	1.2
+++ import.log	4 Dec 2009 12:41:27 -0000	1.3
@@ -1,2 +1,3 @@
 gcc-4_4_0-0_3:HEAD:gcc-4.4.0-0.3.src.rpm:1232130841
 gcc-4_4_0-5:HEAD:gcc-4.4.0-5.src.rpm:1242291126
+gcc-4_4_2-14_fc13:HEAD:gcc-4.4.2-14.fc13.src.rpm:1259930464


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- sources	1 Oct 2009 08:07:34 -0000	1.300
+++ sources	4 Dec 2009 12:41:27 -0000	1.301
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-18fe22db9e055b13b9cc290f6cbbf1fa  gcc-4.4.1-20091001.tar.bz2
+dcff137d5ba8e70cd5cf8fcd0b34ede6  gcc-4.4.2-20091204.tar.bz2


--- gcc44-raw-string.patch DELETED ---


--- gcc44-vta-rh521991.patch DELETED ---



From matt at fedoraproject.org  Fri Dec  4 12:52:55 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  4 Dec 2009 12:52:55 +0000 (UTC)
Subject: rpms/condor/F-12 condor.spec,1.25,1.26
Message-ID: <20091204125255.42A6911C00E0@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25149

Modified Files:
	condor.spec 
Log Message:
7.4.0-0.1


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/condor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- condor.spec	4 Dec 2009 12:00:31 -0000	1.25
+++ condor.spec	4 Dec 2009 12:52:55 -0000	1.26
@@ -42,13 +42,14 @@ BuildRequires: postgresql-devel
 BuildRequires: openssl-devel
 BuildRequires: krb5-devel
 BuildRequires: gsoap-devel >= 2.7.12-1
+BuildRequires: libvirt-devel
 BuildRequires: bind-utils
 BuildRequires: m4
 BuildRequires: autoconf
-BuildRequires: classads-devel
+BuildRequires: classads-devel >= 1.0.4
 BuildRequires: libX11-devel
 
-Requires: gsoap >= 2.7.12-1
+Requires: gsoap >= 2.7.12
 Requires: mailx
 Requires: python >= 2.2
 
@@ -98,6 +99,17 @@ useful on systems where no device (e.g. 
 determine console idle time.
 
 
+%package vm-gahp
+Summary: Condor's VM Gahp
+Group: Applications/System
+Requires: %name = %version-%release
+
+%description vm-gahp
+The condor_vm-gahp enables the Virtual Machine Universe feature of
+Condor. The VM Universe uses libvirt to start and control VMs under
+Condor's Startd.
+
+
 %pre
 getent group condor >/dev/null || groupadd -r condor
 getent passwd condor >/dev/null || \
@@ -145,9 +157,11 @@ cd src
    --enable-kbdd \
    --disable-hibernation \
    --disable-lease-manager \
+   --disable-hdfs \
    --without-zlib \
    --with-openssl \
    --with-krb5 \
+   --with-libvirt \
    --with-postgresql \
    --with-gsoap \
    --with-classads \
@@ -422,7 +436,6 @@ rm -rf %{buildroot}
 %_libexecdir/condor/condor_rooster
 %_libexecdir/condor/condor_ssh_to_job_shell_setup
 %_libexecdir/condor/condor_ssh_to_job_sshd_setup
-%_libexecdir/condor/libvirt_simple_script.awk
 %_libexecdir/condor/power_state
 %_mandir/man1/condor_advertise.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
@@ -524,10 +537,7 @@ rm -rf %{buildroot}
 %_sbindir/condor_store_cred
 %_sbindir/condor_transferd
 %_sbindir/condor_updates_stats
-%_sbindir/condor_vm-gahp
 %_sbindir/amazon_gahp
-%_sbindir/condor_vm_vmware.pl
-%_sbindir/condor_vm_xen.sh
 %_sbindir/condor_gridmanager
 %config(noreplace) %_var/lib/condor/condor_config.local
 %defattr(-,condor,condor,-)
@@ -562,6 +572,15 @@ rm -rf %{buildroot}
 %_sbindir/condor_kbdd
 
 
+%files vm-gahp
+%defattr(-,root,root,-)
+%doc LICENSE-2.0.txt NOTICE.txt
+%_sbindir/condor_vm-gahp
+%_sbindir/condor_vm_vmware.pl
+%_sbindir/condor_vm_xen.sh
+%_libexecdir/condor/libvirt_simple_script.awk
+
+
 %post -n condor
 /sbin/chkconfig --add condor
 /sbin/ldconfig
@@ -597,6 +616,7 @@ fi
 - Added guess_version_from_release_dir.patch, for previous
 - Added fix_platform_check.patch
 - Use new --with-platform, to avoid modification of make_final_tarballs
+- Introduced vm-gahp package to hold libvirt deps
 
 * Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
 - Upgrade to 7.2.4 release



From karsten at fedoraproject.org  Fri Dec  4 12:53:04 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri,  4 Dec 2009 12:53:04 +0000 (UTC)
Subject: rpms/x3270/F-12 x3270-3.3.4-path.patch,1.1,NONE
Message-ID: <20091204125304.4519311C00E0@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/x3270/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25219

Removed Files:
	x3270-3.3.4-path.patch 
Log Message:
- remove unused patch


--- x3270-3.3.4-path.patch DELETED ---



From akurtakov at fedoraproject.org  Fri Dec  4 12:59:35 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Dec 2009 12:59:35 +0000 (UTC)
Subject: rpms/eclipse-rpmstubby/F-12 sources, 1.5,
	1.6 eclipse-rpmstubby-fetch-src.sh, 1.4,
	1.5 eclipse-rpmstubby.spec, 1.6, 1.7 .cvsignore, 1.4, 1.5
Message-ID: <20091204125935.75E7511C00E0@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-rpmstubby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28131/F-12

Modified Files:
	sources eclipse-rpmstubby-fetch-src.sh eclipse-rpmstubby.spec 
	.cvsignore 
Log Message:
Update to Linux Tools 0.4 release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Sep 2009 12:15:46 -0000	1.5
+++ sources	4 Dec 2009 12:59:33 -0000	1.6
@@ -1 +1 @@
-84d2553064e552084a4965240dfa7254  eclipse-rpmstubby-fetched-src-0.3.0.tar.bz2
+a54252a429cde74930d86bb83f5183ee  eclipse-rpmstubby-fetched-src-0.4.0.tar.bz2


Index: eclipse-rpmstubby-fetch-src.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/F-12/eclipse-rpmstubby-fetch-src.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-rpmstubby-fetch-src.sh	1 Sep 2009 12:15:46 -0000	1.4
+++ eclipse-rpmstubby-fetch-src.sh	4 Dec 2009 12:59:33 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/sh
 usage='usage: $0 <tag>'
 name=eclipse-rpmstubby
-tag=LinuxTools_0_3_0
-tar_name=$name-fetched-src-0.3.0
+tag=R0_4_0
+tar_name=$name-fetched-src-0.4.0
 
 # example of fetch command:
 # fetch_cmd=cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/dsdp \


Index: eclipse-rpmstubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/F-12/eclipse-rpmstubby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eclipse-rpmstubby.spec	1 Sep 2009 12:15:46 -0000	1.6
+++ eclipse-rpmstubby.spec	4 Dec 2009 12:59:33 -0000	1.7
@@ -1,9 +1,9 @@
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_datadir}/eclipse/dropins/rpmstubby
-%define qualifier      200908180856
+%define qualifier      200911191630
 
 Name:           eclipse-rpmstubby
-Version:        0.3.0
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        Rpm specfile generator for Eclipse features
 
@@ -51,6 +51,9 @@ install -d -m 755 %{buildroot}%{install_
 %doc org.eclipse.linuxtools.rpmstubby/ChangeLog
 
 %changelog
+* Fri Dec 4 2009 Alexander Kurtakov <akurtako at redhat.com> 0.4.0-1
+- Update to Linux Tools 0.4 release.
+
 * Tue Sep 1 2009 Alexander Kurtakov <akurtako at redhat.com> 0.3.0-1
 - Update to Linux Tools 0.3 release.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Sep 2009 12:15:46 -0000	1.4
+++ .cvsignore	4 Dec 2009 12:59:33 -0000	1.5
@@ -1,3 +1,4 @@
 eclipse-rpmstubby-fetched-src-0.1.0.tar.bz2
 eclipse-rpmstubby-fetched-src-0.1.1.tar.bz2
 eclipse-rpmstubby-fetched-src-0.3.0.tar.bz2
+eclipse-rpmstubby-fetched-src-0.4.0.tar.bz2



From jcollie at fedoraproject.org  Fri Dec  4 13:01:50 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  4 Dec 2009 13:01:50 +0000 (UTC)
Subject: rpms/asterisk-sounds-core/devel asterisk-sounds-core.spec,1.6,1.7
Message-ID: <20091204130150.24E8511C00E0@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk-sounds-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29272

Modified Files:
	asterisk-sounds-core.spec 
Log Message:
* Fri Dec  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.16-3
- Add fr/1.g729 back and build with new version of RPM.



Index: asterisk-sounds-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/devel/asterisk-sounds-core.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- asterisk-sounds-core.spec	2 Nov 2009 18:26:51 -0000	1.6
+++ asterisk-sounds-core.spec	4 Dec 2009 13:01:49 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           asterisk-sounds-core
 Version:        1.4.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Core sounds for Asterisk
 
 Group:          Applications/Internet
@@ -43,6 +43,8 @@ Source28:       http://downloads.asteris
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  rpm >= 4.7.2-2
+
 %description
 Core sound files for Asterisk.
 
@@ -364,7 +366,7 @@ mkdir fr
 
 for file in %{S:20} %{S:21} %{S:22} %{S:23} %{S:24} %{S:25} %{S:26} %{S:27} %{S:28}
 do
-  tar tf $file | grep -v '1.g729' | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/fr/!' > `basename $file .tar.gz`.list
+  tar --list --file $file | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/fr/!' > `basename $file .tar.gz`.list
   tar --extract --directory ./fr/  --file $file
 done
 
@@ -535,6 +537,9 @@ rm -rf %{buildroot}
 %doc asterisk-core-sounds-fr-wav-%{version}.list
 
 %changelog
+* Fri Dec  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.16-3
+- Add fr/1.g729 back and build with new version of RPM.
+
 * Mon Nov  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.16-2
 - Remove fr/1.g729 as it's triggering an error in magic_file(3) (BZ#532489)
 



From rhughes at fedoraproject.org  Fri Dec  4 13:02:40 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri,  4 Dec 2009 13:02:40 +0000 (UTC)
Subject: File hal-0.5.14.tar.bz2 uploaded to lookaside cache by rhughes
Message-ID: <20091204130240.8AF7810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hal:

c627d8fb0f9afff94f3c687b5216bc06  hal-0.5.14.tar.bz2



From akurtakov at fedoraproject.org  Fri Dec  4 13:10:09 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Dec 2009 13:10:09 +0000 (UTC)
Subject: File specfile-editor-fetched-src-0.4.3.tar.bz2 uploaded to lookaside
	cache by akurtakov
Message-ID: <20091204131009.DB3F310F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-rpm-editor:

d482500ddd277edee2cd4e6a5f82bc3d  specfile-editor-fetched-src-0.4.3.tar.bz2



From akurtakov at fedoraproject.org  Fri Dec  4 13:10:52 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Dec 2009 13:10:52 +0000 (UTC)
Subject: rpms/eclipse-rpm-editor/devel eclipse-rpm-editor.spec, 1.29,
	1.30 sources, 1.16, 1.17
Message-ID: <20091204131052.751AC11C00E0@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32011/devel

Modified Files:
	eclipse-rpm-editor.spec sources 
Log Message:
- Update to Linux Tools 0.4 release.


Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- eclipse-rpm-editor.spec	1 Sep 2009 12:09:05 -0000	1.29
+++ eclipse-rpm-editor.spec	4 Dec 2009 13:10:52 -0000	1.30
@@ -1,10 +1,10 @@
 %define eclipse_base        %{_libdir}/eclipse
 %define install_loc         %{_datadir}/eclipse/dropins
-%define qualifier           200908180856
+%define qualifier           200911191630
 
 Name:           eclipse-rpm-editor
 Version:        0.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %{install_loc}/rpm-editor
 
 %changelog
+* Fri Dec 4 2009 Alexander Kurtakov <akurtako at redhat.com> 0.4.3-2
+- Update to Linux Tools 0.4 release.
+
 * Tue Sep 1 2009 Alexander Kurtakov <akurtako at redhat.com> 0.4.3-1
 - Update to Linux Tools 0.3 release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	1 Sep 2009 12:09:05 -0000	1.16
+++ sources	4 Dec 2009 13:10:52 -0000	1.17
@@ -1 +1 @@
-161b0d30f217b54d8dc737862ff7477b  specfile-editor-fetched-src-0.4.3.tar.bz2
+d482500ddd277edee2cd4e6a5f82bc3d  specfile-editor-fetched-src-0.4.3.tar.bz2



From akurtakov at fedoraproject.org  Fri Dec  4 13:12:38 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  4 Dec 2009 13:12:38 +0000 (UTC)
Subject: rpms/eclipse-rpm-editor/F-12 eclipse-rpm-editor.spec, 1.29,
	1.30 sources, 1.16, 1.17
Message-ID: <20091204131238.DFE4C11C00E0@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv340/F-12

Modified Files:
	eclipse-rpm-editor.spec sources 
Log Message:
- Update to Linux Tools 0.4 release.


Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/F-12/eclipse-rpm-editor.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- eclipse-rpm-editor.spec	1 Sep 2009 12:09:05 -0000	1.29
+++ eclipse-rpm-editor.spec	4 Dec 2009 13:12:38 -0000	1.30
@@ -1,10 +1,10 @@
 %define eclipse_base        %{_libdir}/eclipse
 %define install_loc         %{_datadir}/eclipse/dropins
-%define qualifier           200908180856
+%define qualifier           200911191630
 
 Name:           eclipse-rpm-editor
 Version:        0.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %{install_loc}/rpm-editor
 
 %changelog
+* Fri Dec 4 2009 Alexander Kurtakov <akurtako at redhat.com> 0.4.3-2
+- Update to Linux Tools 0.4 release.
+
 * Tue Sep 1 2009 Alexander Kurtakov <akurtako at redhat.com> 0.4.3-1
 - Update to Linux Tools 0.3 release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	1 Sep 2009 12:09:05 -0000	1.16
+++ sources	4 Dec 2009 13:12:38 -0000	1.17
@@ -1 +1 @@
-161b0d30f217b54d8dc737862ff7477b  specfile-editor-fetched-src-0.4.3.tar.bz2
+d482500ddd277edee2cd4e6a5f82bc3d  specfile-editor-fetched-src-0.4.3.tar.bz2



From varekova at fedoraproject.org  Fri Dec  4 13:13:38 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri,  4 Dec 2009 13:13:38 +0000 (UTC)
Subject: rpms/aspell/devel aspell.spec,1.52,1.53
Message-ID: <20091204131338.CA4C711C00E0@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32737

Modified Files:
	aspell.spec 
Log Message:
- fix rpath problem (chrpath)



Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- aspell.spec	2 Dec 2009 07:36:42 -0000	1.52
+++ aspell.spec	4 Dec 2009 13:13:38 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Spell checker
 Name: aspell
 Version: 0.60.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 12
 # LGPLv2+ .. aspell-0.60.6/misc/po-filter.c, ltmain.sh, modules/speller/default/affix.cpp
 # GPLv2+  .. aspell-0.60.6/misc/po-filter.c, aspell-0.60.6/ltmain.sh
@@ -17,6 +17,7 @@ Patch7: aspell-0.60.5-pspell_conf.patch
 Patch8: aspell-0.60.6-zero.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext, ncurses-devel, pkgconfig
+BuildRequires: chrpath
 Requires(pre): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -59,7 +60,6 @@ cp scripts/aspell-import examples/aspell
 chmod 644 examples/aspell-import
 cp manual/aspell-import.1 examples/aspell-import.1
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
@@ -69,6 +69,16 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/asp
 mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/ispell ${RPM_BUILD_ROOT}%{_bindir}
 mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/spell ${RPM_BUILD_ROOT}%{_bindir}
 
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//nroff-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//sgml-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//context-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//email-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//tex-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//texinfo-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_bindir}/aspell
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/libpspell.so.*
+
+
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la
@@ -137,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Fri Dec  4 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-10
+- fix rpath problem (chrpath)
+
 * Tue Dec  1 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-9
 - add --disable-rpath to configure part
   remove remanent obsolete tags



From rhughes at fedoraproject.org  Fri Dec  4 13:14:36 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri,  4 Dec 2009 13:14:36 +0000 (UTC)
Subject: rpms/hal/devel hal-0.5.13-touchpad.patch, NONE,
	1.1 hal-xen-unignore-axes.patch, NONE, 1.1 .cvsignore, 1.65,
	1.66 hal.spec, 1.206, 1.207 sources, 1.67, 1.68
Message-ID: <20091204131436.BAD8E11C00E0@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1094

Modified Files:
	.cvsignore hal.spec sources 
Added Files:
	hal-0.5.13-touchpad.patch hal-xen-unignore-axes.patch 
Log Message:
* Fri Dec 04 2009 Richard Hughes <rhughes at redhat.com> - 0.5.14-1
- New release.
- See http://lists.freedesktop.org/archives/hal/2009-November/013671.html


hal-0.5.13-touchpad.patch:
 device.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE hal-0.5.13-touchpad.patch ---
diff -up hal-0.5.13/hald/linux/device.c.jx hal-0.5.13/hald/linux/device.c
--- hal-0.5.13/hald/linux/device.c.jx	2009-07-15 02:54:11.000000000 -0400
+++ hal-0.5.13/hald/linux/device.c	2009-11-18 11:25:01.000000000 -0500
@@ -1164,7 +1164,10 @@ input_test_abs (HalDevice *d, const char
 				goto out;
 			}
 
-			if (test_bit (BTN_TOUCH, bitmask_key)) {
+			if ((test_bit (BTN_TOUCH, bitmask_key) ||
+			     test_bit (ABS_PRESSURE, bitmask_abs)) &&
+			    test_bit (BTN_TOOL_FINGER, bitmask_key) &&
+			    !test_bit (BTN_TOOL_PEN, bitmask_key)) {
 				hal_device_add_capability (d, "input.touchpad");
 				goto out;
 			}

hal-xen-unignore-axes.patch:
 10-x11-input.fdi |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE hal-xen-unignore-axes.patch ---
>From e48f59d2b9bcb43ea8a7b8c884dcb73c8f65b170 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 19 Oct 2009 14:27:20 +1000
Subject: [PATCH] Un-ignore absolute axes for the Xen Virtual Pointer.

The evdev-internal axis type picking fails for the Xen Virtual Pointer as it
exposes both relative and absolute axes. Evdev picks the relative axes by
default, leading to a immovable pointer if the Xen backend only sends
absolute coordinates.

Explicitly tell evdev to not ignore the absolute axes.

https://bugzilla.redhat.com/show_bug.cgi?id=523914

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 fdi/policy/10osvendor/10-x11-input.fdi |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
index 89ba672..752c4ab 100644
--- a/fdi/policy/10osvendor/10-x11-input.fdi
+++ b/fdi/policy/10osvendor/10-x11-input.fdi
@@ -44,5 +44,12 @@
     <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
         <remove key="input.x11_driver" />
     </match>
+
+    <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914
+         Mouse does not move in PV Xen guest -->
+    <match key="info.product" contains="Xen Virtual Pointer">
+      <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge>
+      <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge>
+    </match>
   </device>
 </deviceinfo>
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	11 Aug 2009 11:50:10 -0000	1.65
+++ .cvsignore	4 Dec 2009 13:14:36 -0000	1.66
@@ -1 +1 @@
-hal-0.5.13.tar.bz2
+hal-0.5.14.tar.bz2


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- hal.spec	11 Aug 2009 11:50:10 -0000	1.206
+++ hal.spec	4 Dec 2009 13:14:36 -0000	1.207
@@ -25,8 +25,8 @@
 
 Summary: Hardware Abstraction Layer
 Name: hal
-Version: 0.5.13
-Release: 8%{?dist}
+Version: 0.5.14
+Release: 1%{?dist}
 #Release: 1.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
@@ -46,8 +46,8 @@ Patch9: hal-KVM-evdev.patch
 # http://bugs.freedesktop.org/show_bug.cgi?id=22442
 Patch11: hal-HDAPS-blacklist.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=507782
-Patch12: hal-mdfind.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=523914
+Patch13: hal-xen-unignore-axes.patch
 
 Patch100: hal-use-at-console.patch
 
@@ -140,7 +140,7 @@ API docs for HAL.
 %patch4 -p1 -b .dell-killswitch
 %patch9 -p1 -b .kvm-evdev
 %patch11 -p1 -b .hdaps-blacklist
-%patch12 -p1 -b .mdfind
+%patch13 -p1 -b .xen-unignore
 %patch100 -p1 -b .drop-polkit
 
 autoreconf -i -f
@@ -155,7 +155,13 @@ autoreconf -i -f
     --disable-policy-kit			\
     --disable-acpi-ibm				\
     --disable-smbios				\
-    --enable-umount-helper			\
+    --disable-umount-helper			\
+    --disable-parted				\
+    --disable-acpi-acpid			\
+    --disable-acpi-proc				\
+    --disable-acl-management			\
+    --disable-sonypic				\
+    --without-deprecated-keys			\
     --without-usb-csr				\
     --without-cpufreq				\
     --with-eject=%{_sbindir}/eject
@@ -237,7 +243,6 @@ fi
 %dir %{_sysconfdir}/hal
 %{_sysconfdir}/hal/*
 
-/sbin/umount.hal
 %{_sbindir}/hald
 %{_bindir}/*
 
@@ -282,6 +287,10 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Fri Dec 04 2009 Richard Hughes <rhughes at redhat.com> - 0.5.14-1
+- New release.
+- See http://lists.freedesktop.org/archives/hal/2009-November/013671.html
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.13-8
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	11 Aug 2009 11:50:10 -0000	1.67
+++ sources	4 Dec 2009 13:14:36 -0000	1.68
@@ -1 +1 @@
-43440854e04abdd29509ddc00c9c3fb1  hal-0.5.13.tar.bz2
+c627d8fb0f9afff94f3c687b5216bc06  hal-0.5.14.tar.bz2



From rhughes at fedoraproject.org  Fri Dec  4 13:19:21 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri,  4 Dec 2009 13:19:21 +0000 (UTC)
Subject: rpms/hal/F-12 .cvsignore, 1.65, 1.66 hal.spec, 1.208, 1.209 sources,
	1.67, 1.68
Message-ID: <20091204131922.015A211C00E0@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/hal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2714

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
* Fri Dec 04 2009 Richard Hughes <rhughes at redhat.com> - 0.5.14-1
- New release.
- See http://lists.freedesktop.org/archives/hal/2009-November/013671.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-12/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	11 Aug 2009 11:50:10 -0000	1.65
+++ .cvsignore	4 Dec 2009 13:19:21 -0000	1.66
@@ -1 +1 @@
-hal-0.5.13.tar.bz2
+hal-0.5.14.tar.bz2


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-12/hal.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- hal.spec	18 Nov 2009 16:26:12 -0000	1.208
+++ hal.spec	4 Dec 2009 13:19:21 -0000	1.209
@@ -25,8 +25,8 @@
 
 Summary: Hardware Abstraction Layer
 Name: hal
-Version: 0.5.13
-Release: 10%{?dist}
+Version: 0.5.14
+Release: 1%{?dist}
 #Release: 1.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
@@ -46,14 +46,10 @@ Patch9: hal-KVM-evdev.patch
 # http://bugs.freedesktop.org/show_bug.cgi?id=22442
 Patch11: hal-HDAPS-blacklist.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=507782
-Patch12: hal-mdfind.patch
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=523914
 Patch13: hal-xen-unignore-axes.patch
 
 Patch100: hal-use-at-console.patch
-Patch101: hal-0.5.13-touchpad.patch
 
 License: AFL or GPLv2
 Group: System Environment/Libraries
@@ -144,10 +140,8 @@ API docs for HAL.
 %patch4 -p1 -b .dell-killswitch
 %patch9 -p1 -b .kvm-evdev
 %patch11 -p1 -b .hdaps-blacklist
-%patch12 -p1 -b .mdfind
 %patch13 -p1 -b .xen-unignore
 %patch100 -p1 -b .drop-polkit
-%patch101 -p1 -b .touchpad
 
 autoreconf -i -f
 
@@ -288,6 +282,10 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Fri Dec 04 2009 Richard Hughes <rhughes at redhat.com> - 0.5.14-1
+- New release.
+- See http://lists.freedesktop.org/archives/hal/2009-November/013671.html
+
 * Wed Nov 18 2009 Adam Jackson <ajax at redhat.com> 0.5.13-10
 - hal-0.5.13-touchpad.patch: Make the logic for input.touchpad match the
   logic in the synaptics driver.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-12/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	11 Aug 2009 11:50:10 -0000	1.67
+++ sources	4 Dec 2009 13:19:21 -0000	1.68
@@ -1 +1 @@
-43440854e04abdd29509ddc00c9c3fb1  hal-0.5.13.tar.bz2
+c627d8fb0f9afff94f3c687b5216bc06  hal-0.5.14.tar.bz2



From jfch2222 at fedoraproject.org  Fri Dec  4 13:31:18 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  4 Dec 2009 13:31:18 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.181,1.182 sshd.init,1.5,1.6
Message-ID: <20091204133118.71E1611C00E0@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6222

Modified Files:
	openssh.spec sshd.init 
Log Message:
Add possibility to autocreate only RSA key into initscript



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- openssh.spec	27 Nov 2009 13:22:15 -0000	1.181
+++ openssh.spec	4 Dec 2009 13:31:18 -0000	1.182
@@ -69,7 +69,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 11%{?dist}%{?rescue_rel}
+Release: 12%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #URL1: http://pamsshauth.sourceforge.net
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -525,6 +525,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec  4 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-12
+- Add possibility to autocreate only RSA key into initscript (#533339)
+
 * Fri Nov 27 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-11
 - Prepare NSS key patch for future SEC_ERROR_LOCKED_PASSWORD (#537411)
 


Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sshd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sshd.init	29 Oct 2009 09:30:48 -0000	1.5
+++ sshd.init	4 Dec 2009 13:31:18 -0000	1.6
@@ -122,9 +122,11 @@ start()
 	[ -f /etc/ssh/sshd_config ] || exit 6
 	# Create keys if necessary
 	if [ "x${AUTOCREATE_SERVER_KEYS}" != xNO ]; then
-		do_rsa1_keygen
 		do_rsa_keygen
-		do_dsa_keygen
+		if [ "x${AUTOCREATE_SERVER_KEYS}" != xRSAONLY ]; then
+			do_rsa1_keygen
+			do_dsa_keygen
+		fi
 	fi
 
 	echo -n $"Starting $prog: "



From james at fedoraproject.org  Fri Dec  4 13:35:01 2009
From: james at fedoraproject.org (James Antill)
Date: Fri,  4 Dec 2009 13:35:01 +0000 (UTC)
Subject: rpms/yum/devel rpmdb-cache-BIG-post-releasever.path, 1.1,
	1.2 yum.spec, 1.284, 1.285
Message-ID: <20091204133501.1759111C00E0@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7234

Modified Files:
	rpmdb-cache-BIG-post-releasever.path yum.spec 
Log Message:
* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-3
- Fixes for yum clean all, BZ 544173



Index: rpmdb-cache-BIG-post-releasever.path
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/rpmdb-cache-BIG-post-releasever.path,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpmdb-cache-BIG-post-releasever.path	3 Dec 2009 15:07:05 -0000	1.1
+++ rpmdb-cache-BIG-post-releasever.path	4 Dec 2009 13:35:00 -0000	1.2
@@ -924,3 +924,48 @@ index b809216..f123c16 100644
              for group in groups:
                  if group not in extcmds[1:]:
                      continue
+commit 8bd4293b0ad62b302df415b5d09dd670e68e504a
+Author: James Antill <james at and.org>
+Date:   Fri Dec 4 08:27:01 2009 -0500
+
+     Fixes for clean functions, BZ 544173
+    
+     When nothing to be done, set removed.
+     When doing "clean all" fix the var. name.
+     When doing anything but clean rpmdb, fix the return.
+
+diff --git a/cli.py b/cli.py
+index f93a706..2c6c9a4 100644
+--- a/cli.py
++++ b/cli.py
+@@ -897,7 +897,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+             rpmcode, rpmresults = self.cleanRpmDB()
+             self.plugins.run('clean')
+             
+-            code = hdrcode + pkgcode + xmlcode + dbcode + rpmdb
++            code = hdrcode + pkgcode + xmlcode + dbcode + rpmcode
+             results = (hdrresults + pkgresults + xmlresults + dbresults +
+                        rpmresults)
+             for msg in results:
+diff --git a/yum/__init__.py b/yum/__init__.py
+index affa92b..1c82144 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -1714,15 +1714,15 @@ class YumBase(depsolve.Depsolve):
+ 
+     def _cleanFiles(self, exts, pathattr, filetype):
+         filelist = []
+-        removed = 0
+         for ext in exts:
+             for repo in self.repos.listEnabled():
+                 path = getattr(repo, pathattr)
+                 if os.path.exists(path) and os.path.isdir(path):
+                     filelist = misc.getFileList(path, ext, filelist)
+-        self._cleanFilelist(filetype, filelist)
++        return self._cleanFilelist(filetype, filelist)
+ 
+     def _cleanFilelist(self, filetype, filelist):
++        removed = 0
+         for item in filelist:
+             try:
+                 misc.unlink_f(item)


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- yum.spec	3 Dec 2009 15:07:06 -0000	1.284
+++ yum.spec	4 Dec 2009 13:35:00 -0000	1.285
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.25
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-3
+- Fixes for yum clean all, BZ 544173
+
 * Thu Dec  3 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-2
 - rebuild yum with latest HEAD patch
 - add rpmdb caching patch james wrote to see if it breaks everyone :)



From toshio at fedoraproject.org  Fri Dec  4 13:43:28 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri,  4 Dec 2009 13:43:28 +0000 (UTC)
Subject: rpms/python-cherrypy2/devel python-cherrypy-deprecation.patch, NONE,
	1.1 python-cherrypy2.spec, 1.9, 1.10
Message-ID: <20091204134328.2B37511C00E0@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-cherrypy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9789

Modified Files:
	python-cherrypy2.spec 
Added Files:
	python-cherrypy-deprecation.patch 
Log Message:

* Fri Dec 4 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.0-11
- Fix deprecation warnings.
- Change setuptools BuildRequirement as we're back to one package in F-13.


python-cherrypy-deprecation.patch:
 filters/sessionfilter.py |    8 ++++++--
 lib/cptools.py           |    8 +++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE python-cherrypy-deprecation.patch ---
Index: CherryPy-2.3.0/cherrypy/lib/cptools.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/lib/cptools.py
+++ CherryPy-2.3.0/cherrypy/lib/cptools.py
@@ -1,6 +1,8 @@
 """Tools which both CherryPy and application developers may invoke."""
-
-import md5
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import new as md5
 import mimetools
 import mimetypes
 mimetypes.init()
@@ -99,7 +101,7 @@ def validate_etags(autotags=False):
     if (not etag) and autotags:
         if status == 200:
             etag = response.collapse_body()
-            etag = '"%s"' % md5.new(etag).hexdigest()
+            etag = '"%s"' % md5(etag).hexdigest()
             response.headers['ETag'] = etag
     
     response.ETag = etag
Index: CherryPy-2.3.0/cherrypy/filters/sessionfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/sessionfilter.py
+++ CherryPy-2.3.0/cherrypy/filters/sessionfilter.py
@@ -30,7 +30,11 @@ try:
 except ImportError:
     import pickle
 import random
-import sha
+try:
+    from hashlib import sha1
+except ImportError:
+    from sha import new as sha1
+
 import time
 import thread
 import threading
@@ -450,7 +454,7 @@ except (AttributeError, NotImplementedEr
     # os.urandom not available until Python 2.4. Fall back to random.random.
     def generate_session_id():
         """Return a new session id."""
-        return sha.new('%s' % random.random()).hexdigest()
+        return sha1('%s' % random.random()).hexdigest()
 else:
     def generate_session_id():
         """Return a new session id."""


Index: python-cherrypy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy2/devel/python-cherrypy2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-cherrypy2.spec	12 Aug 2009 22:18:11 -0000	1.9
+++ python-cherrypy2.spec	4 Dec 2009 13:43:27 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           python-cherrypy2
 Version:        2.3.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
@@ -13,11 +13,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch0:         python-cherrypy-tutorial-doc.patch
 Patch1:         python-cherrypy-2.3.0-EINTR.patch
 Patch2:         python-cherrypy-2.3.0-py26-test.patch
+Patch3:         python-cherrypy-deprecation.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
+%if 0%{?fedora} && 0%{?fedora} <= 12
 BuildRequires: python-setuptools-devel
 %else
 BuildRequires: python-setuptools
@@ -38,6 +39,7 @@ CherryPy.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1 -b .depr
 
 %{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt
 cp -p %{SOURCE1} .
@@ -65,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Fri Dec 4 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.0-11
+- Fix deprecation warnings.
+- Change setuptools BuildRequirement as we're back to one package in F-13.
+
 * Wed Aug 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.0-10
 - Remove the touch of easy_install.pth.  It's not necessary and leads to file
   conflicts with other packages.



From mschwendt at fedoraproject.org  Fri Dec  4 13:47:37 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  4 Dec 2009 13:47:37 +0000 (UTC)
Subject: rpms/audacity/F-12 audacity-1.3.9-getmaxpeak.patch, NONE,
	1.1 audacity.spec, 1.86, 1.87
Message-ID: <20091204134737.6167411C00E0@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11201/F-12

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.9-getmaxpeak.patch 
Log Message:
* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.5.beta
- Prevent race-condition segfault with Sound Activated Recording (#544125).


audacity-1.3.9-getmaxpeak.patch:
 AudioIO.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-getmaxpeak.patch ---
diff -Nur audacity-src-1.3.9-orig/src/AudioIO.cpp audacity-src-1.3.9/src/AudioIO.cpp
--- audacity-src-1.3.9-orig/src/AudioIO.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/AudioIO.cpp	2009-12-04 14:40:41.559205870 +0100
@@ -2750,7 +2750,7 @@
 
    // Stop recording if 'silence' is detected
    if(gAudioIO->mPauseRec && inputBuffer) {
-      if(gAudioIO->mInputMeter->GetMaxPeak() < gAudioIO->mSilenceLevel ) {
+      if(gAudioIO->mInputMeter && (gAudioIO->mInputMeter->GetMaxPeak() < gAudioIO->mSilenceLevel) ) {
          if(!gAudioIO->IsPaused()) {
             AudacityProject *p = GetActiveProject();
             wxCommandEvent dummyEvt;


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-12/audacity.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- audacity.spec	23 Sep 2009 05:43:44 -0000	1.86
+++ audacity.spec	4 Dec 2009 13:47:37 -0000	1.87
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.9
-Release: 0.4.beta%{?dist}
+Release: 0.5.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -21,6 +21,7 @@ Patch3: audacity-1.3.8-gsocket-conflict.
 Patch4: audacity-1.3.9-labeltrack-crash.patch
 Patch5: audacity-1.3.9-labelpopup.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
+Patch7: audacity-1.3.9-getmaxpeak.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -75,6 +76,7 @@ grep -q -s __RPM_LIB * -R && exit 1
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
+%patch7 -p1 -b .getmaxpeak
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -150,6 +152,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.5.beta
+- Prevent race-condition segfault with Sound Activated Recording (#544125).
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.3.9-0.4.beta
 - Update desktop file according to F-12 FedoraStudio feature
 



From mschwendt at fedoraproject.org  Fri Dec  4 13:47:37 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  4 Dec 2009 13:47:37 +0000 (UTC)
Subject: rpms/audacity/devel audacity-1.3.9-getmaxpeak.patch, NONE,
	1.1 audacity.spec, 1.86, 1.87
Message-ID: <20091204134737.9C33E11C00E0@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11201/devel

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.9-getmaxpeak.patch 
Log Message:
* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.5.beta
- Prevent race-condition segfault with Sound Activated Recording (#544125).


audacity-1.3.9-getmaxpeak.patch:
 AudioIO.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-getmaxpeak.patch ---
diff -Nur audacity-src-1.3.9-orig/src/AudioIO.cpp audacity-src-1.3.9/src/AudioIO.cpp
--- audacity-src-1.3.9-orig/src/AudioIO.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/AudioIO.cpp	2009-12-04 14:40:41.559205870 +0100
@@ -2750,7 +2750,7 @@
 
    // Stop recording if 'silence' is detected
    if(gAudioIO->mPauseRec && inputBuffer) {
-      if(gAudioIO->mInputMeter->GetMaxPeak() < gAudioIO->mSilenceLevel ) {
+      if(gAudioIO->mInputMeter && (gAudioIO->mInputMeter->GetMaxPeak() < gAudioIO->mSilenceLevel) ) {
          if(!gAudioIO->IsPaused()) {
             AudacityProject *p = GetActiveProject();
             wxCommandEvent dummyEvt;


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- audacity.spec	23 Sep 2009 05:43:44 -0000	1.86
+++ audacity.spec	4 Dec 2009 13:47:37 -0000	1.87
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.9
-Release: 0.4.beta%{?dist}
+Release: 0.5.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -21,6 +21,7 @@ Patch3: audacity-1.3.8-gsocket-conflict.
 Patch4: audacity-1.3.9-labeltrack-crash.patch
 Patch5: audacity-1.3.9-labelpopup.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
+Patch7: audacity-1.3.9-getmaxpeak.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -75,6 +76,7 @@ grep -q -s __RPM_LIB * -R && exit 1
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
+%patch7 -p1 -b .getmaxpeak
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -150,6 +152,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.5.beta
+- Prevent race-condition segfault with Sound Activated Recording (#544125).
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.3.9-0.4.beta
 - Update desktop file according to F-12 FedoraStudio feature
 



From oget at fedoraproject.org  Fri Dec  4 13:50:43 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri,  4 Dec 2009 13:50:43 +0000 (UTC)
Subject: rpms/ardour/F-11 ardour-SConscript.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 ardour.spec, 1.28, 1.29 sources, 1.14,
	1.15 ardour-SConstruct.patch, 1.3, NONE
Message-ID: <20091204135043.69B4111C03DB@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ardour/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12705

Modified Files:
	.cvsignore ardour.spec sources 
Added Files:
	ardour-SConscript.patch 
Removed Files:
	ardour-SConstruct.patch 
Log Message:
* Sat Nov 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.4-1
- New upstream release 2.8.4.


ardour-SConscript.patch:
 midi++2/SConscript  |    2 +-
 vamp-sdk/SConscript |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ardour-SConscript.patch ---
diff -rupN ardour-2.8.3.old/libs/midi++2/SConscript ardour-2.8.3/libs/midi++2/SConscript
--- ardour-2.8.3.old/libs/midi++2/SConscript	2009-03-19 13:52:43.000000000 -0400
+++ ardour-2.8.3/libs/midi++2/SConscript	2009-11-12 04:01:48.000000000 -0500
@@ -42,7 +42,7 @@ if env['SYSMIDI'] == 'CoreMIDI':
 else:
    sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
    midi2.Append (CCFLAGS="-DWITH_ALSA")
-
+   midi2.Append (LIBS = "-lasound")
 midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 
diff -rupN ardour-2.8.3.old/libs/vamp-sdk/SConscript ardour-2.8.3/libs/vamp-sdk/SConscript
--- ardour-2.8.3.old/libs/vamp-sdk/SConscript	2009-03-26 11:20:21.000000000 -0400
+++ ardour-2.8.3/libs/vamp-sdk/SConscript	2009-11-12 04:04:32.000000000 -0500
@@ -27,7 +27,7 @@ vampsdk.Merge ([libraries['fftw3'], libr
 # HAVE_FFTW3 is used to help improve some performance aspects of VAMP's InputDomainAdapter
 
 vampsdk.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk -DHAVE_FFTW3")
-
+vampsdk.Append (LIBS = "-ldl")
 libvampsdk = vampsdk.SharedLibrary('vampsdk', vampsdk_files)
 libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	22 Jul 2009 02:29:31 -0000	1.14
+++ .cvsignore	4 Dec 2009 13:50:42 -0000	1.15
@@ -1 +1 @@
-ardour-2.8.2.tar.bz2
+ardour-2.8.4.tar.bz2


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-11/ardour.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ardour.spec	22 Jul 2009 03:22:23 -0000	1.28
+++ ardour.spec	4 Dec 2009 13:50:43 -0000	1.29
@@ -1,12 +1,12 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.8.2
-Release:       2%{?dist}
+Version:       2.8.4
+Release:       1%{?dist}
 # No more direct links. Download from
 # http://ardour.org/download
 Source:        ardour-%{version}.tar.bz2
 Source2:       ardour.script
-Patch0:        ardour-SConstruct.patch
+Patch0:        ardour-SConscript.patch
 Patch1:        ardour-2.8-session.cc-no_stomp.patch
 Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
 URL:           http://ardour.org
@@ -30,6 +30,7 @@ BuildRequires: libgnomecanvasmm26-devel 
 BuildRequires: liblo-devel
 BuildRequires: liblrdf-devel >= 0.3.1
 BuildRequires: libsamplerate-devel >= 0.0.13
+BuildRequires: libsndfile-devel >= 1.0.18
 BuildRequires: libtool
 BuildRequires: libusb-devel
 BuildRequires: libxslt-devel
@@ -60,7 +61,7 @@ digital mixers.
 
 %prep
 %setup -q
-%patch0 -p1 -b .SConstruct
+%patch0 -p1 -b .SConscript
 %patch1 -p1 -b .no_stomp
 %patch3 -p0 -b .host.not.found
 
@@ -93,6 +94,7 @@ scons %{?_smp_mflags} PREFIX=%{_prefix} 
       DIST_TARGET="${TARGETCPU}" \
       ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS" \
       AUSTATE=1 \
+      DIST_LIBDIR=%{_lib} \
       WIIMOTE=1
 
 %install
@@ -175,6 +177,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_mandir}/ru/man1/ardour.1*
 
 %changelog
+* Sat Nov 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.4-1
+- New upstream release 2.8.4.
+
+* Thu Nov 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.3-1
+- New upstream release 2.8.3.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.2-2
 - Fix libdir once more
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Jul 2009 02:29:31 -0000	1.14
+++ sources	4 Dec 2009 13:50:43 -0000	1.15
@@ -1 +1 @@
-054640c746e806be81857754fc72c02e  ardour-2.8.2.tar.bz2
+7ab850e9153bb4282f2ed95aad152805  ardour-2.8.4.tar.bz2


--- ardour-SConstruct.patch DELETED ---



From oget at fedoraproject.org  Fri Dec  4 13:53:26 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri,  4 Dec 2009 13:53:26 +0000 (UTC)
Subject: rpms/ardour/F-10 ardour-SConscript.patch, NONE, 1.1 .cvsignore, 1.13,
	1.14 ardour.spec, 1.27, 1.28 sources, 1.14,
	1.15 ardour-SConstruct.patch, 1.3, NONE
Message-ID: <20091204135326.7DAC611C00E0@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ardour/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13964

Modified Files:
	.cvsignore ardour.spec sources 
Added Files:
	ardour-SConscript.patch 
Removed Files:
	ardour-SConstruct.patch 
Log Message:
* Sat Nov 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.4-1
- New upstream release 2.8.4.


ardour-SConscript.patch:
 midi++2/SConscript  |    2 +-
 vamp-sdk/SConscript |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ardour-SConscript.patch ---
diff -rupN ardour-2.8.3.old/libs/midi++2/SConscript ardour-2.8.3/libs/midi++2/SConscript
--- ardour-2.8.3.old/libs/midi++2/SConscript	2009-03-19 13:52:43.000000000 -0400
+++ ardour-2.8.3/libs/midi++2/SConscript	2009-11-12 04:01:48.000000000 -0500
@@ -42,7 +42,7 @@ if env['SYSMIDI'] == 'CoreMIDI':
 else:
    sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
    midi2.Append (CCFLAGS="-DWITH_ALSA")
-
+   midi2.Append (LIBS = "-lasound")
 midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 
diff -rupN ardour-2.8.3.old/libs/vamp-sdk/SConscript ardour-2.8.3/libs/vamp-sdk/SConscript
--- ardour-2.8.3.old/libs/vamp-sdk/SConscript	2009-03-26 11:20:21.000000000 -0400
+++ ardour-2.8.3/libs/vamp-sdk/SConscript	2009-11-12 04:04:32.000000000 -0500
@@ -27,7 +27,7 @@ vampsdk.Merge ([libraries['fftw3'], libr
 # HAVE_FFTW3 is used to help improve some performance aspects of VAMP's InputDomainAdapter
 
 vampsdk.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk -DHAVE_FFTW3")
-
+vampsdk.Append (LIBS = "-ldl")
 libvampsdk = vampsdk.SharedLibrary('vampsdk', vampsdk_files)
 libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Jul 2009 02:31:48 -0000	1.13
+++ .cvsignore	4 Dec 2009 13:53:26 -0000	1.14
@@ -1 +1 @@
-ardour-2.8.2.tar.bz2
+ardour-2.8.4.tar.bz2


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-10/ardour.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ardour.spec	22 Jul 2009 03:23:03 -0000	1.27
+++ ardour.spec	4 Dec 2009 13:53:26 -0000	1.28
@@ -1,12 +1,12 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.8.2
-Release:       2%{?dist}
+Version:       2.8.4
+Release:       1%{?dist}
 # No more direct links. Download from
 # http://ardour.org/download
 Source:        ardour-%{version}.tar.bz2
 Source2:       ardour.script
-Patch0:        ardour-SConstruct.patch
+Patch0:        ardour-SConscript.patch
 Patch1:        ardour-2.8-session.cc-no_stomp.patch
 Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
 URL:           http://ardour.org
@@ -30,6 +30,7 @@ BuildRequires: libgnomecanvasmm26-devel 
 BuildRequires: liblo-devel
 BuildRequires: liblrdf-devel >= 0.3.1
 BuildRequires: libsamplerate-devel >= 0.0.13
+BuildRequires: libsndfile-devel >= 1.0.18
 BuildRequires: libtool
 BuildRequires: libusb-devel
 BuildRequires: libxslt-devel
@@ -60,7 +61,7 @@ digital mixers.
 
 %prep
 %setup -q
-%patch0 -p1 -b .SConstruct
+%patch0 -p1 -b .SConscript
 %patch1 -p1 -b .no_stomp
 %patch3 -p0 -b .host.not.found
 
@@ -93,6 +94,7 @@ scons %{?_smp_mflags} PREFIX=%{_prefix} 
       DIST_TARGET="${TARGETCPU}" \
       ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS" \
       AUSTATE=1 \
+      DIST_LIBDIR=%{_lib} \
       WIIMOTE=1
 
 %install
@@ -175,6 +177,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_mandir}/ru/man1/ardour.1*
 
 %changelog
+* Sat Nov 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.4-1
+- New upstream release 2.8.4.
+
+* Thu Nov 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.3-1
+- New upstream release 2.8.3.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.2-2
 - Fix libdir once more
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Jul 2009 02:31:49 -0000	1.14
+++ sources	4 Dec 2009 13:53:26 -0000	1.15
@@ -1 +1 @@
-054640c746e806be81857754fc72c02e  ardour-2.8.2.tar.bz2
+7ab850e9153bb4282f2ed95aad152805  ardour-2.8.4.tar.bz2


--- ardour-SConstruct.patch DELETED ---



From iankent at fedoraproject.org  Fri Dec  4 13:54:23 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Fri,  4 Dec 2009 13:54:23 +0000 (UTC)
Subject: rpms/autofs/F-11 autofs-5.0.4-fix-rpc-large-export-list.patch, NONE,
	1.1 autofs.spec, 1.296, 1.297
Message-ID: <20091204135423.B8CBE11C00E0@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14271

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-fix-rpc-large-export-list.patch 
Log Message:
%changelog
* Fri Dec 4 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.4-48
- fix rpc fail on large export list (bz543023).


autofs-5.0.4-fix-rpc-large-export-list.patch:
 rpc_subs.c |   47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

--- NEW FILE autofs-5.0.4-fix-rpc-large-export-list.patch ---
autofs-5.0.4 - fix rpc fail on large export list

From: Ian Kent <raven at themaw.net>

If the export list on a server is larger than the UDP transport packet
size the transfer will fail and autofs will try TCP instead, but there
were some problems with the conversion to allow for IPv6 using libtirpc.

When creating the local socket for an RPC connection we incorrectly
performed a connect instead of a bind to the ilocal TCP socket. Aslo the
timed connect, which should be done before creating the RPC client was
not being done, which can lead to lengthy timeouts.
---

 lib/rpc_subs.c |   47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)


--- autofs-5.0.4.orig/lib/rpc_subs.c
+++ autofs-5.0.4/lib/rpc_subs.c
@@ -53,6 +53,7 @@
 /* Get numeric value of the n bits starting at position p */
 #define getbits(x, p, n)      ((x >> (p + 1 - n)) & ~(~0 << n))
 
+static int connect_nb(int, struct sockaddr *, socklen_t, struct timeval *);
 inline void dump_core(void);
 
 static CLIENT *rpc_clntudp_create(struct sockaddr *addr, struct conn_info *info, int *fd)
@@ -97,11 +98,17 @@ static CLIENT *rpc_clnttcp_create(struct
 	struct sockaddr_in *in4_raddr;
 	struct sockaddr_in6 *in6_raddr;
 	CLIENT *client = NULL;
+	socklen_t slen;
 
 	switch (addr->sa_family) {
 	case AF_INET:
 		in4_raddr = (struct sockaddr_in *) addr;
 		in4_raddr->sin_port = htons(info->port);
+		slen = sizeof(struct sockaddr_in);
+
+		if (connect_nb(*fd, addr, slen, &info->timeout) < 0)
+			break;
+
 		client = clnttcp_create(in4_raddr,
 					info->program, info->version, fd,
 					info->send_sz, info->recv_sz);
@@ -114,6 +121,11 @@ static CLIENT *rpc_clnttcp_create(struct
 #else
 		in6_raddr = (struct sockaddr_in6 *) addr;
 		in6_raddr->sin6_port = htons(info->port);
+		slen = sizeof(struct sockaddr_in6);
+
+		if (connect_nb(*fd, addr, slen, &info->timeout) < 0)
+			break;
+
 		client = clnttcp6_create(in6_raddr,
 					 info->program, info->version, fd,
 					 info->send_sz, info->recv_sz);
@@ -260,32 +272,21 @@ static CLIENT *rpc_do_create_client(stru
 		return NULL;
 	}
 
+	if (!info->client) {
+		*fd = open_sock(addr->sa_family, type, proto);
+		if (*fd < 0)
+			return NULL;
+
+		if (bind(*fd, laddr, slen) < 0)
+			return NULL;
+	}
+
 	switch (info->proto->p_proto) {
 	case IPPROTO_UDP:
-		if (!info->client) {
-			*fd = open_sock(addr->sa_family, type, proto);
-			if (*fd < 0)
-				return NULL;
-
-			if (bind(*fd, laddr, slen) < 0) {
-				close(*fd);
-				return NULL;
-			}
-		}
 		client = rpc_clntudp_create(addr, info, fd);
 		break;
 
 	case IPPROTO_TCP:
-		if (!info->client) {
-			*fd = open_sock(addr->sa_family, type, proto);
-			if (*fd < 0)
-				return NULL;
-
-			if (connect_nb(*fd, laddr, slen, &info->timeout) < 0) {
-				close(*fd);
-				return NULL;
-			}
-		}
 		client = rpc_clnttcp_create(addr, info, fd);
 		break;
 
@@ -327,7 +328,7 @@ static CLIENT *create_udp_client(struct 
 		if (client)
 			goto done;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}
@@ -352,7 +353,7 @@ static CLIENT *create_udp_client(struct 
 		if (client)
 			break;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}
@@ -477,7 +478,7 @@ static CLIENT *create_tcp_client(struct 
 		if (client)
 			break;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- autofs.spec	25 Nov 2009 01:43:15 -0000	1.296
+++ autofs.spec	4 Dec 2009 13:54:23 -0000	1.297
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 47
+Release: 48
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -81,6 +81,7 @@ Patch68: autofs-5.0.5-fix-ext4-fsck-at-m
 Patch69: autofs-5.0.4-fix-typo-in-init-script.patch
 Patch70: autofs-5.0.4-fix-timeout-in-connect_nb.patch
 Patch71: autofs-5.0.5-fix-pidof-init-script-usage.patch
+Patch72: autofs-5.0.4-fix-rpc-large-export-list.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -193,6 +194,7 @@ echo %{version}-%{release} > .version
 %patch69 -p1
 %patch70 -p1
 %patch71 -p1
+%patch72 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -245,6 +247,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Fri Dec 4 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.4-48
+- fix rpc fail on large export list (bz543023).
+
 * Wed Nov 25 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-47
 - fix pidof init script usage.
 



From iankent at fedoraproject.org  Fri Dec  4 14:09:31 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Fri,  4 Dec 2009 14:09:31 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.5-fix-rpc-large-export-list.patch, NONE,
	1.1 autofs.spec, 1.297, 1.298
Message-ID: <20091204140931.35C5A11C00E0@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18234

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.5-fix-rpc-large-export-list.patch 
Log Message:
* Fri Dec 4 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-14
- fix rpc fail on large export list (bz543023).


autofs-5.0.5-fix-rpc-large-export-list.patch:
 CHANGELOG      |    1 +
 lib/rpc_subs.c |   47 ++++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

--- NEW FILE autofs-5.0.5-fix-rpc-large-export-list.patch ---
autofs-5.0.5 - fix rpc fail on large export list

From: Ian Kent <raven at themaw.net>

If the export list on a server is larger than the UDP transport packet
size the transfer will fail and autofs will try TCP instead, but there
were some problems with the conversion to allow for IPv6 using libtirpc.

When creating the local socket for an RPC connection we incorrectly
performed a connect instead of a bind to the ilocal TCP socket. Aslo the
timed connect, which should be done before creating the RPC client was
not being done, which can lead to lengthy timeouts.
---

 CHANGELOG      |    1 +
 lib/rpc_subs.c |   47 ++++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 23 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 88bcc1b..20566a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@
 - fix pidof init script usage.
 - check for path mount location in generic module.
 - dont fail mount on access fail.
+- fix rpc fail on large export list.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 628f0fc..3b11dce 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -53,6 +53,7 @@
 /* Get numeric value of the n bits starting at position p */
 #define getbits(x, p, n)      ((x >> (p + 1 - n)) & ~(~0 << n))
 
+static int connect_nb(int, struct sockaddr *, socklen_t, struct timeval *);
 inline void dump_core(void);
 
 static CLIENT *rpc_clntudp_create(struct sockaddr *addr, struct conn_info *info, int *fd)
@@ -97,11 +98,17 @@ static CLIENT *rpc_clnttcp_create(struct sockaddr *addr, struct conn_info *info,
 	struct sockaddr_in *in4_raddr;
 	struct sockaddr_in6 *in6_raddr;
 	CLIENT *client = NULL;
+	socklen_t slen;
 
 	switch (addr->sa_family) {
 	case AF_INET:
 		in4_raddr = (struct sockaddr_in *) addr;
 		in4_raddr->sin_port = htons(info->port);
+		slen = sizeof(struct sockaddr_in);
+
+		if (connect_nb(*fd, addr, slen, &info->timeout) < 0)
+			break;
+
 		client = clnttcp_create(in4_raddr,
 					info->program, info->version, fd,
 					info->send_sz, info->recv_sz);
@@ -114,6 +121,11 @@ static CLIENT *rpc_clnttcp_create(struct sockaddr *addr, struct conn_info *info,
 #else
 		in6_raddr = (struct sockaddr_in6 *) addr;
 		in6_raddr->sin6_port = htons(info->port);
+		slen = sizeof(struct sockaddr_in6);
+
+		if (connect_nb(*fd, addr, slen, &info->timeout) < 0)
+			break;
+
 		client = clnttcp6_create(in6_raddr,
 					 info->program, info->version, fd,
 					 info->send_sz, info->recv_sz);
@@ -260,32 +272,21 @@ static CLIENT *rpc_do_create_client(struct sockaddr *addr, struct conn_info *inf
 		return NULL;
 	}
 
+	if (!info->client) {
+		*fd = open_sock(addr->sa_family, type, proto);
+		if (*fd < 0)
+			return NULL;
+
+		if (bind(*fd, laddr, slen) < 0)
+			return NULL;
+	}
+
 	switch (info->proto->p_proto) {
 	case IPPROTO_UDP:
-		if (!info->client) {
-			*fd = open_sock(addr->sa_family, type, proto);
-			if (*fd < 0)
-				return NULL;
-
-			if (bind(*fd, laddr, slen) < 0) {
-				close(*fd);
-				return NULL;
-			}
-		}
 		client = rpc_clntudp_create(addr, info, fd);
 		break;
 
 	case IPPROTO_TCP:
-		if (!info->client) {
-			*fd = open_sock(addr->sa_family, type, proto);
-			if (*fd < 0)
-				return NULL;
-
-			if (connect_nb(*fd, laddr, slen, &info->timeout) < 0) {
-				close(*fd);
-				return NULL;
-			}
-		}
 		client = rpc_clnttcp_create(addr, info, fd);
 		break;
 
@@ -327,7 +328,7 @@ static CLIENT *create_udp_client(struct conn_info *info)
 		if (client)
 			goto done;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}
@@ -352,7 +353,7 @@ static CLIENT *create_udp_client(struct conn_info *info)
 		if (client)
 			break;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}
@@ -477,7 +478,7 @@ static CLIENT *create_tcp_client(struct conn_info *info)
 		if (client)
 			break;
 
-		if (!info->client) {
+		if (!info->client && fd != RPC_ANYSOCK) {
 			close(fd);
 			fd = RPC_ANYSOCK;
 		}


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- autofs.spec	30 Nov 2009 00:25:37 -0000	1.297
+++ autofs.spec	4 Dec 2009 14:09:29 -0000	1.298
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.5
-Release: 12%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -25,6 +25,7 @@ Patch12: autofs-5.0.5-fix-timeout-in-con
 Patch13: autofs-5.0.5-fix-pidof-init-script-usage.patch
 Patch14: autofs-5.0.5-check-for-path-mount-location-in-generic-module.patch
 Patch15: autofs-5.0.5-dont-fail-mount-on-access-fail.patch
+Patch16: autofs-5.0.5-fix-rpc-large-export-list.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -81,6 +82,7 @@ echo %{version}-%{release} > .version
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -133,6 +135,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Fri Dec 4 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-14
+- fix rpc fail on large export list (bz543023).
+
 * Mon Nov 30 2009 Ian Kent <ikent at redhat.com> - 1:5.0.5-12
 - check for path mount location in generic module.
 - dont fail mount on access fail.



From than at fedoraproject.org  Fri Dec  4 14:23:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 14:23:03 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.358,1.359
Message-ID: <20091204142303.3C9C111C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20999

Modified Files:
	qt.spec 
Log Message:
drop qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch since it's included in 4.6.0



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -p -r1.358 -r1.359
--- qt.spec	4 Dec 2009 12:37:55 -0000	1.358
+++ qt.spec	4 Dec 2009 14:23:03 -0000	1.359
@@ -79,7 +79,6 @@ Patch210: 0010-Fix-error-line-not-to-hav
 Patch211: 0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
 Patch213: 0013-Fix-QNativeImage-constructor.patch
-Patch214: qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -434,7 +433,6 @@ Qt libraries used for drawing widgets an
 #patch211 -p1 -b .kde-qt-0011
 %patch212 -p1 -b .kde-qt-0012
 #patch213 -p1 -b .kde-qt-0013
-%patch214 -p1 -b .QTBUG-5972
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`



From james at fedoraproject.org  Fri Dec  4 14:26:32 2009
From: james at fedoraproject.org (James Antill)
Date: Fri,  4 Dec 2009 14:26:32 +0000 (UTC)
Subject: rpms/yum/devel rpmdb-cache-BIG-post-releasever.path, 1.2,
	1.3 yum.spec, 1.285, 1.286
Message-ID: <20091204142632.1F36E11C00E0@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24504

Modified Files:
	rpmdb-cache-BIG-post-releasever.path yum.spec 
Log Message:
* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4
- Fixes for yum clean all, BZ 544173
- Also allow "yum clean rpmdb" to work, bad tester, bad.



Index: rpmdb-cache-BIG-post-releasever.path
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/rpmdb-cache-BIG-post-releasever.path,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rpmdb-cache-BIG-post-releasever.path	4 Dec 2009 13:35:00 -0000	1.2
+++ rpmdb-cache-BIG-post-releasever.path	4 Dec 2009 14:26:31 -0000	1.3
@@ -924,7 +924,7 @@ index b809216..f123c16 100644
              for group in groups:
                  if group not in extcmds[1:]:
                      continue
-commit 8bd4293b0ad62b302df415b5d09dd670e68e504a
+commit 366c3e6bb9ebd7ad3f121bdf2c089b0132d51604
 Author: James Antill <james at and.org>
 Date:   Fri Dec 4 08:27:01 2009 -0500
 
@@ -933,6 +933,8 @@ Date:   Fri Dec 4 08:27:01 2009 -0500
      When nothing to be done, set removed.
      When doing "clean all" fix the var. name.
      When doing anything but clean rpmdb, fix the return.
+     Allow rpmdb as a valid arg.
+     Fix getFileList() with ext == ''
 
 diff --git a/cli.py b/cli.py
 index f93a706..2c6c9a4 100644
@@ -969,3 +971,29 @@ index affa92b..1c82144 100644
          for item in filelist:
              try:
                  misc.unlink_f(item)
+diff --git a/yum/misc.py b/yum/misc.py
+index 642f9a2..f221f1d 100644
+--- a/yum/misc.py
++++ b/yum/misc.py
+@@ -336,7 +336,7 @@ def getFileList(path, ext, filelist):
+         if os.path.isdir(path + '/' + d):
+             filelist = getFileList(path + '/' + d, ext, filelist)
+         else:
+-            if d[-extlen:].lower() == '%s' % (ext):
++            if not ext or d[-extlen:].lower() == '%s' % (ext):
+                 newpath = os.path.normpath(path + '/' + d)
+                 filelist.append(newpath)
+                     
+diff --git a/yumcommands.py b/yumcommands.py
+index 83d9d00..4fe2fe1 100644
+--- a/yumcommands.py
++++ b/yumcommands.py
+@@ -85,7 +85,7 @@ def checkGroupArg(base, basecmd, extcmds):
+ 
+ def checkCleanArg(base, basecmd, extcmds):
+     VALID_ARGS = ('headers', 'packages', 'metadata', 'dbcache', 'plugins',
+-                  'expire-cache', 'all')
++                  'expire-cache', 'rpmdb', 'all')
+ 
+     if len(extcmds) == 0:
+         base.logger.critical(_('Error: clean requires an option: %s') % (


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- yum.spec	4 Dec 2009 13:35:00 -0000	1.285
+++ yum.spec	4 Dec 2009 14:26:31 -0000	1.286
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.25
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -112,8 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
-* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-3
+* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4
 - Fixes for yum clean all, BZ 544173
+- Also allow "yum clean rpmdb" to work, bad tester, bad.
 
 * Thu Dec  3 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-2
 - rebuild yum with latest HEAD patch



From clumens at fedoraproject.org  Fri Dec  4 14:36:30 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri,  4 Dec 2009 14:36:30 +0000 (UTC)
Subject: File system-config-kickstart-2.8.3.tar.gz uploaded to lookaside
	cache by clumens
Message-ID: <20091204143630.2C57410F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for system-config-kickstart:

1c8534e9e9a137045a9778c4c7b4eed6  system-config-kickstart-2.8.3.tar.gz



From clumens at fedoraproject.org  Fri Dec  4 14:37:01 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri,  4 Dec 2009 14:37:01 +0000 (UTC)
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.63, 1.64 sources, 
	1.77, 1.78 system-config-kickstart.spec, 1.85, 1.86
Message-ID: <20091204143701.710CB11C00E0@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27322

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.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	14 Sep 2009 19:34:00 -0000	1.63
+++ .cvsignore	4 Dec 2009 14:37:01 -0000	1.64
@@ -7,3 +7,4 @@ system-config-kickstart-2.7.22.tar.gz
 system-config-kickstart-2.8.0.tar.gz
 system-config-kickstart-2.8.1.tar.gz
 system-config-kickstart-2.8.2.tar.gz
+system-config-kickstart-2.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	14 Sep 2009 19:34:00 -0000	1.77
+++ sources	4 Dec 2009 14:37:01 -0000	1.78
@@ -1 +1 @@
-86d2f4272a525afdd1e8336c6d19464a  system-config-kickstart-2.8.2.tar.gz
+1c8534e9e9a137045a9778c4c7b4eed6  system-config-kickstart-2.8.3.tar.gz


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- system-config-kickstart.spec	27 Sep 2009 21:14:21 -0000	1.85
+++ system-config-kickstart.spec	4 Dec 2009 14:37:01 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files
 Name: system-config-kickstart
-Version: 2.8.2
-Release: 2%{?dist}
+Version: 2.8.3
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
 ExclusiveOS: Linux
@@ -69,7 +69,13 @@ fi
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
-* Mon Sep 14 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.8.2-2
+* Fri Dec 04 2009 Chris Lumens <clumens at redhat.com> - 2.8.3-1
+- Add ext4, make it the default (#544079).
+- Add support for authconfig --enablefingerprint (#539371).
+- Fix an import error (#530739, nelsoninva AT gmail.com).
+- Update lots of translations.
+
+* Mon Sep 14 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.8.2-2
 - Convert specfile to UTF-8.
 
 * Tue Jul 28 2009 Chris Lumens <clumens at redhat.com> - 2.8.1-1
@@ -666,7 +672,7 @@ fi
 * Mon May 13 2002 Brent Fox <bfox at redhat.com> 2.0-8
 - Fixed bug #64835 to make UK keyboard 'uk' not 'gb'
 
-* Mon Apr 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 2.0-7
+* Mon Apr 15 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.0-7
 - Update translations
 
 * Thu Apr 11 2002 Brent Fox <bfox at redhat.com>



From twaugh at fedoraproject.org  Fri Dec  4 14:41:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Dec 2009 14:41:41 +0000 (UTC)
Subject: rpms/foomatic-db/F-12 foomatic-db.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20091204144141.6B0AC11C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic-db/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28781

Modified Files:
	foomatic-db.spec sources 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> 4.0-8.20091126
- Added foomatic-db-hpijs tarball back in.



Index: foomatic-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/F-12/foomatic-db.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- foomatic-db.spec	26 Nov 2009 10:29:18 -0000	1.5
+++ foomatic-db.spec	4 Dec 2009 14:41:41 -0000	1.6
@@ -1,16 +1,18 @@
 %define dbver_rel 4.0
 %define dbver_snap 20091126
+%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 7.%{dbver_snap}%{?dist}
+Release: 8.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
 Requires: %{name}-ppds = %{version}-%{release}
 
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
+Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,10 +52,12 @@ Requires: %{name}-filesystem = %{version
 PPDs from printer manufacturers.
 
 %prep
-%setup -q -n %{name}-%{dbver_snap}
+%setup -q -c -a 1
 
 find -type d | xargs chmod g-s
 
+pushd foomatic-db-%{dbver_snap}
+
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@@ -80,16 +84,32 @@ done
 # Use sed instead of perl in the PPDs (bug #512739).
 find PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
 
+popd
+
 %build
+pushd foomatic-db-hpijs-%{hpijsver}
+%configure
+make PREFIX=%{_prefix}
+popd
+
+pushd foomatic-db-%{dbver_snap}
 %configure
 make PREFIX=%{_prefix}
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+pushd foomatic-db-%{dbver_snap}
 make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 	install
+popd
+
+pushd foomatic-db-hpijs-%{hpijsver}
+make	DESTDIR=%buildroot PREFIX=%{_prefix} \
+	install
+popd
 
 # Remove ghostscript UPP drivers that are gone in 7.07
 rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
@@ -116,9 +136,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc db/source/PPD/Kyocera/*.htm
-%doc README
-%doc COPYING
+%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.htm
+%doc foomatic-db-%{dbver_snap}/README
+%doc foomatic-db-%{dbver_snap}/COPYING
 %{_datadir}/foomatic/db/oldprinterids
 %{_datadir}/foomatic/db/source/printer
 %{_datadir}/foomatic/db/source/driver
@@ -130,6 +150,9 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> 4.0-8.20091126
+- Added foomatic-db-hpijs tarball back in.
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 4.0-7.20091126
 - Updated to foomatic-db-4.0-20091126 (bug #538994).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Nov 2009 10:29:18 -0000	1.4
+++ sources	4 Dec 2009 14:41:41 -0000	1.5
@@ -1 +1,2 @@
 8e14309e17e7544f94f8df429bc691e4  foomatic-db-4.0-20091126.tar.gz
+2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz



From matt at fedoraproject.org  Fri Dec  4 14:41:57 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  4 Dec 2009 14:41:57 +0000 (UTC)
Subject: rpms/condor/F-12 gcc44_const.patch,1.1,NONE
Message-ID: <20091204144157.60F9B11C00E0@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28969

Removed Files:
	gcc44_const.patch 
Log Message:



--- gcc44_const.patch DELETED ---



From twaugh at fedoraproject.org  Fri Dec  4 14:51:10 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Dec 2009 14:51:10 +0000 (UTC)
Subject: rpms/foomatic-db/devel foomatic-db.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20091204145110.694B711C03A3@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31489

Modified Files:
	foomatic-db.spec sources 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> 4.0-8.20091126
- Added foomatic-db-hpijs tarball back in.



Index: foomatic-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/foomatic-db.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- foomatic-db.spec	26 Nov 2009 10:25:19 -0000	1.5
+++ foomatic-db.spec	4 Dec 2009 14:51:10 -0000	1.6
@@ -1,16 +1,18 @@
 %define dbver_rel 4.0
 %define dbver_snap 20091126
+%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 7.%{dbver_snap}%{?dist}
+Release: 8.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
 Requires: %{name}-ppds = %{version}-%{release}
 
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
+Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,10 +52,12 @@ Requires: %{name}-filesystem = %{version
 PPDs from printer manufacturers.
 
 %prep
-%setup -q -n %{name}-%{dbver_snap}
+%setup -q -c -a 1
 
 find -type d | xargs chmod g-s
 
+pushd foomatic-db-%{dbver_snap}
+
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@@ -80,16 +84,32 @@ done
 # Use sed instead of perl in the PPDs (bug #512739).
 find PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
 
+popd
+
 %build
+pushd foomatic-db-hpijs-%{hpijsver}
+%configure
+make PREFIX=%{_prefix}
+popd
+
+pushd foomatic-db-%{dbver_snap}
 %configure
 make PREFIX=%{_prefix}
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+pushd foomatic-db-%{dbver_snap}
 make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 	install
+popd
+
+pushd foomatic-db-hpijs-%{hpijsver}
+make	DESTDIR=%buildroot PREFIX=%{_prefix} \
+	install
+popd
 
 # Remove ghostscript UPP drivers that are gone in 7.07
 rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
@@ -116,9 +136,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc db/source/PPD/Kyocera/*.htm
-%doc README
-%doc COPYING
+%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.htm
+%doc foomatic-db-%{dbver_snap}/README
+%doc foomatic-db-%{dbver_snap}/COPYING
 %{_datadir}/foomatic/db/oldprinterids
 %{_datadir}/foomatic/db/source/printer
 %{_datadir}/foomatic/db/source/driver
@@ -130,6 +150,9 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> 4.0-8.20091126
+- Added foomatic-db-hpijs tarball back in.
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 4.0-7.20091126
 - Updated to foomatic-db-4.0-20091126 (bug #538994).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Nov 2009 10:25:19 -0000	1.4
+++ sources	4 Dec 2009 14:51:10 -0000	1.5
@@ -1 +1,2 @@
 8e14309e17e7544f94f8df429bc691e4  foomatic-db-4.0-20091126.tar.gz
+2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz



From varekova at fedoraproject.org  Fri Dec  4 14:52:36 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri,  4 Dec 2009 14:52:36 +0000 (UTC)
Subject: rpms/aspell/F-12 aspell.spec,1.51,1.52
Message-ID: <20091204145236.77A9B11C00E0@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32051

Modified Files:
	aspell.spec 
Log Message:
- fix rpath problem (chrpath)



Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/F-12/aspell.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- aspell.spec	1 Dec 2009 14:19:38 -0000	1.51
+++ aspell.spec	4 Dec 2009 14:52:36 -0000	1.52
@@ -1,10 +1,11 @@
 Summary: Spell checker
 Name: aspell
 Version: 0.60.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 12
-# LGPLv2+ .. aspell-0.60.6/misc/po-filter.c, ltmain.sh,
+# LGPLv2+ .. aspell-0.60.6/misc/po-filter.c, ltmain.sh, modules/speller/default/affix.cpp
 # GPLv2+  .. aspell-0.60.6/misc/po-filter.c, aspell-0.60.6/ltmain.sh
+# BSD     .. myspell/munch.c
 License: LGPLv2 and LGPLv2+ and GPLv2+ and MIT
 Group: Applications/Text
 URL: http://aspell.net/
@@ -16,6 +17,7 @@ Patch7: aspell-0.60.5-pspell_conf.patch
 Patch8: aspell-0.60.6-zero.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext, ncurses-devel, pkgconfig
+BuildRequires: chrpath
 Requires(pre): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -58,7 +60,6 @@ cp scripts/aspell-import examples/aspell
 chmod 644 examples/aspell-import
 cp manual/aspell-import.1 examples/aspell-import.1
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
@@ -68,6 +69,16 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/asp
 mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/ispell ${RPM_BUILD_ROOT}%{_bindir}
 mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/spell ${RPM_BUILD_ROOT}%{_bindir}
 
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//nroff-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//sgml-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//context-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//email-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//tex-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//texinfo-filter.so
+chrpath --delete ${RPM_BUILD_ROOT}%{_bindir}/aspell
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/libpspell.so.*
+
+
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la
@@ -136,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Fri Dec  4 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-10
+- fix rpath problem (chrpath)
+
 * Tue Dec  1 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-9
 - add --disable-rpath to configure part
   remove remanent obsolete tags



From corsepiu at fedoraproject.org  Fri Dec  4 14:55:13 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  4 Dec 2009 14:55:13 +0000 (UTC)
Subject: rpms/rt3/devel rt-3.8.4-test-dependencies.diff, 1.1,
	NONE rt-3.8.4-Makefile.diff, 1.1, NONE rt-3.8.4-rh-bz543962.diff,
	1.1, NONE
Message-ID: <20091204145513.EF16011C00E0@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv757

Removed Files:
	rt-3.8.4-test-dependencies.diff rt-3.8.4-Makefile.diff 
	rt-3.8.4-rh-bz543962.diff 
Log Message:
Remove.


--- rt-3.8.4-test-dependencies.diff DELETED ---


--- rt-3.8.4-Makefile.diff DELETED ---


--- rt-3.8.4-rh-bz543962.diff DELETED ---



From corsepiu at fedoraproject.org  Fri Dec  4 14:58:16 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  4 Dec 2009 14:58:16 +0000 (UTC)
Subject: rpms/rt3/devel rt-3.8.6-Makefile.diff, NONE,
	1.1 rt-3.8.6-test-dependencies.diff, NONE, 1.1
Message-ID: <20091204145816.C859211C00E0@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1639

Added Files:
	rt-3.8.6-Makefile.diff rt-3.8.6-test-dependencies.diff 
Log Message:
New.

rt-3.8.6-Makefile.diff:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rt-3.8.6-Makefile.diff ---
diff -Naur rt-3.8.6.orig/Makefile.in rt-3.8.6/Makefile.in
--- rt-3.8.6.orig/Makefile.in	2009-10-19 21:55:31.000000000 +0200
+++ rt-3.8.6/Makefile.in	2009-12-04 15:42:18.000000000 +0100
@@ -282,7 +282,7 @@
 	@echo "    $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action upgrade"
 
 
-upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
+upgrade: testdeps config-install dirs files-install upgrade-instruct
 
 upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install fixperms
 
@@ -362,7 +362,7 @@
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
 # }}}
 
-install: testdeps config-install dirs files-install fixperms instruct
+install: testdeps config-install dirs files-install instruct
 
 files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install
 

rt-3.8.6-test-dependencies.diff:
 rt-test-dependencies.in |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE rt-3.8.6-test-dependencies.diff ---
diff -Naur rt-3.8.6.orig/sbin/rt-test-dependencies.in rt-3.8.6/sbin/rt-test-dependencies.in
--- rt-3.8.6.orig/sbin/rt-test-dependencies.in	2009-10-19 21:55:31.000000000 +0200
+++ rt-3.8.6/sbin/rt-test-dependencies.in	2009-12-04 15:44:07.000000000 +0100
@@ -278,7 +278,6 @@
 
 $deps{'DEV'} = [ text_to_hash( << '.') ];
 HTML::Form
-HTML::TokeParser
 WWW::Mechanize
 Test::WWW::Mechanize 1.04
 Module::Refresh 0.03



From corsepiu at fedoraproject.org  Fri Dec  4 14:59:12 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  4 Dec 2009 14:59:12 +0000 (UTC)
Subject: File rt-3.8.6.tar.gz uploaded to lookaside cache by corsepiu
Message-ID: <20091204145912.11DF710F89E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rt3:

522f93e39c6978ba9f49efa00eb5621e  rt-3.8.6.tar.gz



From limb at fedoraproject.org  Fri Dec  4 15:00:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  4 Dec 2009 15:00:35 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.35,1.36
Message-ID: <20091204150035.EA4DB11C03F6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2260

Modified Files:
	bacula.spec 
Log Message:
Add applybaculadate, BZ 540861.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- bacula.spec	24 Nov 2009 22:14:56 -0000	1.35
+++ bacula.spec	4 Dec 2009 15:00:35 -0000	1.36
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 3.0.3
-Release: 2%{?dist}
+Release: 4%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -598,6 +598,7 @@ install -m 644 -D %{SOURCE6} %{buildroot
 
 # And logwatch
 install -m 755 -D bacula-sqlite/scripts/logwatch/bacula %{buildroot}%{_sysconfdir}/logwatch/scripts/services/bacula
+install -m 755 -D bacula-sqlite/scripts/logwatch/applybaculadate %{buildroot}%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
 install -m 644 -D bacula-sqlite/scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
 install -m 644 -D bacula-sqlite/scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
 
@@ -869,6 +870,7 @@ fi
 %config %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
 %config %{_sysconfdir}/logwatch/conf/services/bacula.conf
 %{_sysconfdir}/logwatch/scripts/services/bacula
+%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
 %{_initrddir}/bacula-dir
 %{_sbindir}/bregex
 %{_sbindir}/bwild
@@ -1007,6 +1009,12 @@ fi
 
 
 %changelog
+* Thu Dec 03 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-4
+- Fix applybaculadate location.
+
+* Tue Dec 01 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-3
+- Add applybaculadate, BZ 540861.
+
 * Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.0.3-2
 - Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
 



From corsepiu at fedoraproject.org  Fri Dec  4 15:02:42 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  4 Dec 2009 15:02:42 +0000 (UTC)
Subject: rpms/rt3/devel .cvsignore, 1.15, 1.16 rt3.spec, 1.47, 1.48 sources, 
	1.15, 1.16
Message-ID: <20091204150242.C37F811C00E0@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2945

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.6-1
- Upstream update.
- Remove rt-3.8.4-Makefile.diff, rt-3.8.4-test-dependencies.diff, 
  rt-3.8.4-rh-bz543962.diff.
- Add rt-3.8.6-Makefile.diff, rt-3.8.6-test-dependencies.diff



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Oct 2009 16:03:21 -0000	1.15
+++ .cvsignore	4 Dec 2009 15:02:42 -0000	1.16
@@ -1 +1 @@
-rt-3.8.5.tar.gz
+rt-3.8.6.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- rt3.spec	4 Dec 2009 11:22:12 -0000	1.47
+++ rt3.spec	4 Dec 2009 15:02:42 -0000	1.48
@@ -39,8 +39,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.8.5
-Release:	2%{?dist}
+Version:	3.8.6
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -52,13 +52,8 @@ Source4:	README.fedora.in
 Source5:	rt3.logrotate.in
 
 Patch0:		rt-3.8.4-config.diff
-Patch2:		rt-3.8.4-Makefile.diff
-Patch3:		rt-3.8.4-test-dependencies.diff
-
-# http://bugzilla.redhat.com/show_bug.cgi?id=543962
-# Patch from http://bestpractical.typepad.com/files/rt-3.8-session_fixation.patch
-# Fixed in rt >= 3.8.6
-Patch6:		rt-3.8.4-rh-bz543962.diff
+Patch2:		rt-3.8.6-Makefile.diff
+Patch3:		rt-3.8.6-test-dependencies.diff
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -237,7 +232,6 @@ find etc -type f -exec chmod a-x {} \;
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
-%patch6 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -437,6 +431,12 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.6-1
+- Upstream update.
+- Remove rt-3.8.4-Makefile.diff, rt-3.8.4-test-dependencies.diff, 
+  rt-3.8.4-rh-bz543962.diff.
+- Add rt-3.8.6-Makefile.diff, rt-3.8.6-test-dependencies.diff
+
 * Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.5-2
 - Add rt-3.8.4-rh-bz543962.diff (BZ #543962).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Oct 2009 16:03:21 -0000	1.15
+++ sources	4 Dec 2009 15:02:42 -0000	1.16
@@ -1 +1 @@
-177addb62ec3c7ee7335b696dcb0b0a1  rt-3.8.5.tar.gz
+522f93e39c6978ba9f49efa00eb5621e  rt-3.8.6.tar.gz



From linville at fedoraproject.org  Fri Dec  4 15:12:29 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri,  4 Dec 2009 15:12:29 +0000 (UTC)
Subject: rpms/iwl3945-firmware/devel iwl3945-firmware.spec,1.6,1.7
Message-ID: <20091204151229.8C11D11C00E0@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iwl3945-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5965

Modified Files:
	iwl3945-firmware.spec 
Log Message:
Use reasonable permissions for text files


Index: iwl3945-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl3945-firmware/devel/iwl3945-firmware.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- iwl3945-firmware.spec	25 Jul 2009 03:44:05 -0000	1.6
+++ iwl3945-firmware.spec	4 Dec 2009 15:12:29 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Firmware for Intel? PRO/Wireless 3945 A/B/G network adaptors
 Name: iwl3945-firmware
 Version: 15.32.2.9
-Release: 2
+Release: 3
 License: Redistributable, no modification permitted
 Group: System Environment/Kernel
 URL: http://intellinuxwireless.org/
@@ -32,6 +32,8 @@ inside the provided LICENSE file. Please
 %{__sed} -i 's/\r//' LICENSE README
 # Put timestamp back (it's the same on all files)
 touch -r iwlwifi-3945*.ucode LICENSE README
+# Use reasonable permissions for text files
+chmod 0644 LICENSE README
 
 
 %build
@@ -55,6 +57,9 @@ touch -r iwlwifi-3945*.ucode LICENSE REA
 
 
 %changelog
+* Fri Dec  4 2009 John W. Linville <linville at redhat.com> 15.32.2.9-3
+- Use reasonable permissions for text files
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.32.2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From linville at fedoraproject.org  Fri Dec  4 15:14:22 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri,  4 Dec 2009 15:14:22 +0000 (UTC)
Subject: rpms/iwl3945-firmware/devel iwl3945-firmware.spec,1.7,1.8
Message-ID: <20091204151422.8579011C00E0@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iwl3945-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6586

Modified Files:
	iwl3945-firmware.spec 
Log Message:
Use of a dist tag is now back in favor...


Index: iwl3945-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl3945-firmware/devel/iwl3945-firmware.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- iwl3945-firmware.spec	4 Dec 2009 15:12:29 -0000	1.7
+++ iwl3945-firmware.spec	4 Dec 2009 15:14:22 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Firmware for Intel? PRO/Wireless 3945 A/B/G network adaptors
 Name: iwl3945-firmware
 Version: 15.32.2.9
-Release: 3
+Release: 4{?dist}
 License: Redistributable, no modification permitted
 Group: System Environment/Kernel
 URL: http://intellinuxwireless.org/
@@ -57,6 +57,9 @@ chmod 0644 LICENSE README
 
 
 %changelog
+* Fri Dec  4 2009 John W. Linville <linville at redhat.com> 15.32.2.9-4
+- Use of a dist tag is now back in favor...
+
 * Fri Dec  4 2009 John W. Linville <linville at redhat.com> 15.32.2.9-3
 - Use reasonable permissions for text files
 



From linville at fedoraproject.org  Fri Dec  4 15:15:43 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri,  4 Dec 2009 15:15:43 +0000 (UTC)
Subject: rpms/iwl3945-firmware/devel iwl3945-firmware.spec,1.8,1.9
Message-ID: <20091204151543.291A611C00E0@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iwl3945-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7033

Modified Files:
	iwl3945-firmware.spec 
Log Message:



Index: iwl3945-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwl3945-firmware/devel/iwl3945-firmware.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- iwl3945-firmware.spec	4 Dec 2009 15:14:22 -0000	1.8
+++ iwl3945-firmware.spec	4 Dec 2009 15:15:43 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Firmware for Intel? PRO/Wireless 3945 A/B/G network adaptors
 Name: iwl3945-firmware
 Version: 15.32.2.9
-Release: 4{?dist}
+Release: 4%{?dist}
 License: Redistributable, no modification permitted
 Group: System Environment/Kernel
 URL: http://intellinuxwireless.org/



From than at fedoraproject.org  Fri Dec  4 15:17:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:17:03 +0000 (UTC)
Subject: File kdelibs-4.3.80.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091204151703.E4FEE10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdelibs:

3d4fe702be4a85c02e56e80a8f06ae76  kdelibs-4.3.80.tar.bz2



From stransky at fedoraproject.org  Fri Dec  4 15:20:20 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Fri,  4 Dec 2009 15:20:20 +0000 (UTC)
Subject: rpms/nspluginwrapper/F-12 nspluginwrapper-1.3.0-compiz.patch, NONE, 
	1.1 nspluginwrapper.spec, 1.82, 1.83
Message-ID: <20091204152020.E4BB611C03DB@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8540

Modified Files:
	nspluginwrapper.spec 
Added Files:
	nspluginwrapper-1.3.0-compiz.patch 
Log Message:
added Compiz workaround (#542424)

nspluginwrapper-1.3.0-compiz.patch:
 npw-viewer.sh |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE nspluginwrapper-1.3.0-compiz.patch ---
diff -up nspluginwrapper-1.3.0/src/npw-viewer.sh.old nspluginwrapper-1.3.0/src/npw-viewer.sh
--- nspluginwrapper-1.3.0/src/npw-viewer.sh.old	2009-11-16 12:57:53.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-viewer.sh	2009-12-04 16:16:27.000000000 +0100
@@ -77,6 +77,9 @@ NPW_USE_XSHM=${NPW_USE_XSHM:-yes}
 NPW_USE_VALGRIND=${NPW_USE_VALGRIND:-no}
 can_use_valgrind="no"
 
+# Compiz/Flash workaround (rhbz#542424)
+export GDK_NATIVE_WINDOWS=1
+
 if test "$ARCH" != "$TARGET_ARCH"; then
     case $TARGET_ARCH in
     i386)


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-12/nspluginwrapper.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- nspluginwrapper.spec	10 Nov 2009 09:24:36 -0000	1.82
+++ nspluginwrapper.spec	4 Dec 2009 15:20:20 -0000	1.83
@@ -73,7 +73,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.3.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
@@ -83,6 +83,7 @@ Patch2:         nspluginwrapper-1.3.0-co
 Patch3:         nspluginwrapper-1.3.0-directory.patch
 Patch4:         nspluginwrapper-20090625-fix-npident-array-sending.patch
 Patch5:         nspluginwrapper-1.3.0-inst.patch
+Patch6:         nspluginwrapper-1.3.0-compiz.patch
 Patch100:       plugin-config-setuid.patch
 Patch101:       plugin-config-umask.patch
 Patch102:       plugin-config-print.patch
@@ -117,6 +118,7 @@ This package consists in:
 %patch3 -p1 -b .dir
 %patch4 -p0 -b .array
 %patch5 -p1 -b .inst
+%patch6 -p1 -b .compiz
 
 # Plugin-config patches
 pushd %plugin_config_name
@@ -248,6 +250,9 @@ fi;
 
 
 %changelog
+* Fri Dec 4 2009 Martin Stransky <stransky at redhat.com> 1.3.0-10
+- added Compiz workaround (#542424)
+
 * Tue Nov 10 2009 Martin Stransky <stransky at redhat.com> 1.3.0-9
 - added NULL check (#531669)
 



From than at fedoraproject.org  Fri Dec  4 15:20:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:20:31 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.545,1.546 sources,1.99,1.100
Message-ID: <20091204152031.E3BE211C03DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8603

Modified Files:
	kdelibs.spec sources 
Log Message:
respin



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -p -r1.545 -r1.546
--- kdelibs.spec	3 Dec 2009 13:36:24 -0000	1.545
+++ kdelibs.spec	4 Dec 2009 15:20:31 -0000	1.546
@@ -8,7 +8,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -417,6 +417,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-3
+- respin
+
 * Thu Dec 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
 - BR polkit-qt-devel
 - fix the build of the KAuth PolkitQt-1 backend (upstream patch)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- sources	2 Dec 2009 13:21:54 -0000	1.99
+++ sources	4 Dec 2009 15:20:31 -0000	1.100
@@ -1 +1 @@
-d31fc3d08875b33fe0802352b8671c83  kdelibs-4.3.80.tar.bz2
+3d4fe702be4a85c02e56e80a8f06ae76  kdelibs-4.3.80.tar.bz2



From stransky at fedoraproject.org  Fri Dec  4 15:21:31 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Fri,  4 Dec 2009 15:21:31 +0000 (UTC)
Subject: rpms/nspluginwrapper/devel nspluginwrapper-1.3.0-compiz.patch, NONE,
	1.1 nspluginwrapper.spec, 1.82, 1.83
Message-ID: <20091204152131.44F9211C00E0@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9107

Modified Files:
	nspluginwrapper.spec 
Added Files:
	nspluginwrapper-1.3.0-compiz.patch 
Log Message:
added Compiz workaround (#542424)

nspluginwrapper-1.3.0-compiz.patch:
 npw-viewer.sh |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE nspluginwrapper-1.3.0-compiz.patch ---
diff -up nspluginwrapper-1.3.0/src/npw-viewer.sh.old nspluginwrapper-1.3.0/src/npw-viewer.sh
--- nspluginwrapper-1.3.0/src/npw-viewer.sh.old	2009-11-16 12:57:53.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-viewer.sh	2009-12-04 16:16:27.000000000 +0100
@@ -77,6 +77,9 @@ NPW_USE_XSHM=${NPW_USE_XSHM:-yes}
 NPW_USE_VALGRIND=${NPW_USE_VALGRIND:-no}
 can_use_valgrind="no"
 
+# Compiz/Flash workaround (rhbz#542424)
+export GDK_NATIVE_WINDOWS=1
+
 if test "$ARCH" != "$TARGET_ARCH"; then
     case $TARGET_ARCH in
     i386)


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- nspluginwrapper.spec	10 Nov 2009 09:08:13 -0000	1.82
+++ nspluginwrapper.spec	4 Dec 2009 15:21:31 -0000	1.83
@@ -73,7 +73,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.3.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
@@ -83,6 +83,7 @@ Patch2:         nspluginwrapper-1.3.0-co
 Patch3:         nspluginwrapper-1.3.0-directory.patch
 Patch4:         nspluginwrapper-20090625-fix-npident-array-sending.patch
 Patch5:         nspluginwrapper-1.3.0-inst.patch
+Patch6:         nspluginwrapper-1.3.0-compiz.patch
 Patch100:       plugin-config-setuid.patch
 Patch101:       plugin-config-umask.patch
 Patch102:       plugin-config-print.patch
@@ -117,6 +118,7 @@ This package consists in:
 %patch3 -p1 -b .dir
 %patch4 -p0 -b .array
 %patch5 -p1 -b .inst
+%patch6 -p1 -b .compiz
 
 # Plugin-config patches
 pushd %plugin_config_name
@@ -248,6 +250,9 @@ fi;
 
 
 %changelog
+* Fri Dec 4 2009 Martin Stransky <stransky at redhat.com> 1.3.0-10
+- added Compiz workaround (#542424)
+
 * Tue Nov 10 2009 Martin Stransky <stransky at redhat.com> 1.3.0-9
 - added NULL check (#531669)
 



From emaldonado at fedoraproject.org  Fri Dec  4 15:23:52 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Dec 2009 15:23:52 +0000 (UTC)
Subject: rpms/nss-util/F-12 .cvsignore, 1.3, 1.4 nss-util.spec, 1.18,
	1.19 sources, 1.3, 1.4
Message-ID: <20091204152352.4D03A11C00E0@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10170

Modified Files:
	.cvsignore nss-util.spec sources 
Log Message:
Update to 3.12.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss-util/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Sep 2009 21:35:48 -0000	1.3
+++ .cvsignore	4 Dec 2009 15:23:51 -0000	1.4
@@ -1 +1 @@
-nss-util-3.12.4.tar.bz2
+nss-util-3.12.5.tar.bz2


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/F-12/nss-util.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nss-util.spec	11 Sep 2009 00:05:55 -0000	1.18
+++ nss-util.spec	4 Dec 2009 15:23:52 -0000	1.19
@@ -2,8 +2,8 @@
 
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
-Version:          3.12.4
-Release:          8%{?dist}
+Version:          3.12.5
+Release:          1%{?dist}.1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -200,6 +200,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.1
+- Update to 3.12.5
+
 * Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-8
 - Retagging for a chained build with nss-softokn and nss
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss-util/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Sep 2009 21:35:27 -0000	1.3
+++ sources	4 Dec 2009 15:23:52 -0000	1.4
@@ -1 +1 @@
-f7b73ca36d53c74191f8794fa1a99d1d  nss-util-3.12.4.tar.bz2
+00e44ffb9e3338233bca14d690c176c7  nss-util-3.12.5.tar.bz2



From than at fedoraproject.org  Fri Dec  4 15:26:48 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:26:48 +0000 (UTC)
Subject: File kdebindings-4.3.80.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091204152648.CC5C810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdebindings:

3fd12db9000aa2c11e8812182d7a0820  kdebindings-4.3.80.tar.bz2



From limb at fedoraproject.org  Fri Dec  4 15:27:18 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  4 Dec 2009 15:27:18 +0000 (UTC)
Subject: rpms/bacula/F-12 bacula.spec,1.33,1.34 sources,1.9,1.10
Message-ID: <20091204152718.BF20811C00E0@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11337

Modified Files:
	bacula.spec sources 
Log Message:
Add applybaculadate, BZ 540861.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-12/bacula.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- bacula.spec	22 Aug 2009 12:59:19 -0000	1.33
+++ bacula.spec	4 Dec 2009 15:27:18 -0000	1.34
@@ -7,7 +7,7 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 3.0.2
+Version: 3.0.3
 Release: 4%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
@@ -598,6 +598,7 @@ install -m 644 -D %{SOURCE6} %{buildroot
 
 # And logwatch
 install -m 755 -D bacula-sqlite/scripts/logwatch/bacula %{buildroot}%{_sysconfdir}/logwatch/scripts/services/bacula
+install -m 755 -D bacula-sqlite/scripts/logwatch/applybaculadate %{buildroot}%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
 install -m 644 -D bacula-sqlite/scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
 install -m 644 -D bacula-sqlite/scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
 
@@ -869,6 +870,7 @@ fi
 %config %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
 %config %{_sysconfdir}/logwatch/conf/services/bacula.conf
 %{_sysconfdir}/logwatch/scripts/services/bacula
+%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
 %{_initrddir}/bacula-dir
 %{_sbindir}/bregex
 %{_sbindir}/bwild
@@ -1007,6 +1009,18 @@ fi
 
 
 %changelog
+* Thu Dec 03 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-4
+- Fix applybaculadate location.
+
+* Tue Dec 01 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-3
+- Add applybaculadate, BZ 540861.
+
+* Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.0.3-2
+- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
+
+* Mon Oct 19 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-1
+- New upstream, 3.0.3.
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.2-4
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Jul 2009 15:33:17 -0000	1.9
+++ sources	4 Dec 2009 15:27:18 -0000	1.10
@@ -1,2 +1,2 @@
-52f4bc25d8988dffcff429bb5e1ee81b  bacula-3.0.2.tar.gz
-456ec1f95a4fad967fdb32609f9d2490  bacula-docs-3.0.2.tar.bz2
+feba58691b674b12056359d459ad6940  bacula-3.0.3.tar.gz
+26f7cfd76480e97ca489bd0ec8b0ee89  bacula-docs-3.0.3.tar.bz2



From than at fedoraproject.org  Fri Dec  4 15:30:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:30:20 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec, 1.265, 1.266 sources, 1.75,
	1.76
Message-ID: <20091204153020.1913211C03F6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12258

Modified Files:
	kdebindings.spec sources 
Log Message:
respin



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -r1.265 -r1.266
--- kdebindings.spec	3 Dec 2009 02:33:57 -0000	1.265
+++ kdebindings.spec	4 Dec 2009 15:30:19 -0000	1.266
@@ -52,7 +52,7 @@
 
 Name: kdebindings
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -547,6 +547,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
+- respin
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	1 Dec 2009 15:50:22 -0000	1.75
+++ sources	4 Dec 2009 15:30:19 -0000	1.76
@@ -1 +1 @@
-dc060b2d2c88cf5860dc60d563396f17  kdebindings-4.3.80.tar.bz2
+3fd12db9000aa2c11e8812182d7a0820  kdebindings-4.3.80.tar.bz2



From than at fedoraproject.org  Fri Dec  4 15:31:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:31:35 +0000 (UTC)
Subject: File kdepim-4.3.80.tar.bz2 uploaded to lookaside cache by than
Message-ID: <20091204153135.D534810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdepim:

938c4686506d3dd4729774b20a7234e4  kdepim-4.3.80.tar.bz2



From than at fedoraproject.org  Fri Dec  4 15:32:05 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:32:05 +0000 (UTC)
Subject: rpms/kdepim/devel sources,1.80,1.81
Message-ID: <20091204153205.0B2D011C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12979

Modified Files:
	sources 
Log Message:
respin



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	2 Dec 2009 13:45:36 -0000	1.80
+++ sources	4 Dec 2009 15:32:04 -0000	1.81
@@ -1 +1 @@
-12bfcada24033e61ad4942639cf0a8f0  kdepim-4.3.80.tar.bz2
+938c4686506d3dd4729774b20a7234e4  kdepim-4.3.80.tar.bz2



From limb at fedoraproject.org  Fri Dec  4 15:33:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  4 Dec 2009 15:33:55 +0000 (UTC)
Subject: rpms/nexuiz/F-12 nexuiz.spec,1.34,1.35 sources,1.15,1.16
Message-ID: <20091204153355.23B6611C00E0@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13650

Modified Files:
	nexuiz.spec sources 
Log Message:
Updating to 2.5.2, 544196.



Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/F-12/nexuiz.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- nexuiz.spec	25 Jul 2009 19:16:41 -0000	1.34
+++ nexuiz.spec	4 Dec 2009 15:33:54 -0000	1.35
@@ -1,15 +1,15 @@
-%global dpver 20090501
+%global dpver 20091001
 
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 2.5.1
-Release: 3%{?dist}
+Version: 2.5.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://downloads.sourceforge.net/nexuiz/nexuiz-251.zip
-# unzip -j nexuiz-251.zip Nexuiz/sources/enginesource20090501.zip
+# wget http://downloads.sourceforge.net/nexuiz/nexuiz-252.zip
+# unzip -j nexuiz-251.zip Nexuiz/sources/enginesource20091001.zip
 Source: enginesource%{dpver}.zip
 Source1: %{name}.desktop
 Source10: darkplaces-quake.sh
@@ -97,7 +97,7 @@ DarkPlaces server required for hosting m
 export DP_FS_BASEDIR=%{_datadir}/nexuiz
 # no %{?_smp_mflags}, parallel build issues as of 2.5.1 (#502271)
 %{__make} nexuiz OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=:
-convert nexuiz.ico nexuiz.png
+convert nexuiz.xpm nexuiz.png
 
 
 %install
@@ -217,6 +217,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Mon Oct 12 2009 Jon Ciesla <limb at jcomserv.net> - 2.5.2-1
+- Update to 2.5.2, BZ 528356.
+- Derive icon from .xpm instead of .ico to satisfy new ImageMagick.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	26 May 2009 19:07:25 -0000	1.15
+++ sources	4 Dec 2009 15:33:54 -0000	1.16
@@ -1 +1 @@
-06e12ba8ac47f34a40eaf36e31cb6fee  enginesource20090501.zip
+aa4e586e58e1c35a5e3ed76cc9348fbd  enginesource20091001.zip



From than at fedoraproject.org  Fri Dec  4 15:34:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:34:57 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.107,1.108
Message-ID: <20091204153457.C095611C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14106

Modified Files:
	kdepimlibs.spec 
Log Message:
respin



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- kdepimlibs.spec	3 Dec 2009 13:39:00 -0000	1.107
+++ kdepimlibs.spec	4 Dec 2009 15:34:57 -0000	1.108
@@ -4,7 +4,7 @@
 
 Name: kdepimlibs
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -198,6 +198,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
+- respin
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From hadess at fedoraproject.org  Fri Dec  4 15:35:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  4 Dec 2009 15:35:16 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.241,1.242
Message-ID: <20091204153516.88D8C11C00E0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14341

Modified Files:
	gnome-games.spec 
Log Message:
remove lightsoff, no seed in fedora


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- gnome-games.spec	2 Dec 2009 13:02:42 -0000	1.241
+++ gnome-games.spec	4 Dec 2009 15:35:16 -0000	1.242
@@ -174,6 +174,13 @@ desktop-file-install --vendor gnome --de
 perl -pi -e 's@<default></default>@<default>[Joe,Jim,James]</default>@g' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
 %endif
 
+# Remove lightsoff, seed isn't packaged
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/lightsoff.schemas		\
+	$RPM_BUILD_ROOT%{_bindir}/lightsoff					\
+	$RPM_BUILD_ROOT%{_datadir}/applications/gnome-lightsoff.desktop		\
+	$RPM_BUILD_ROOT%{_datadir}/gnome-games/lightsoff/			\
+	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gnome-lightsoff.svg
+
 # but we don't want this
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
 



From than at fedoraproject.org  Fri Dec  4 15:36:05 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:36:05 +0000 (UTC)
Subject: File kdepim-runtime-4.3.80.tar.bz2 uploaded to lookaside cache by
	than
Message-ID: <20091204153605.B162C10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kdepim-runtime:

c86fcb4f0378069fea24bce05b6e2853  kdepim-runtime-4.3.80.tar.bz2



From than at fedoraproject.org  Fri Dec  4 15:36:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 15:36:33 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel kdepim-runtime.spec, 1.13, 1.14 sources, 
	1.10, 1.11
Message-ID: <20091204153633.55A5A11C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14873

Modified Files:
	kdepim-runtime.spec sources 
Log Message:
respin



Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kdepim-runtime.spec	2 Dec 2009 13:52:35 -0000	1.13
+++ kdepim-runtime.spec	4 Dec 2009 15:36:33 -0000	1.14
@@ -3,7 +3,7 @@
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -131,6 +131,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
+- respin
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Dec 2009 13:49:30 -0000	1.10
+++ sources	4 Dec 2009 15:36:33 -0000	1.11
@@ -1 +1 @@
-49e298e02b5684903f5680071d004bde  kdepim-runtime-4.3.80.tar.bz2
+c86fcb4f0378069fea24bce05b6e2853  kdepim-runtime-4.3.80.tar.bz2



From limb at fedoraproject.org  Fri Dec  4 15:36:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  4 Dec 2009 15:36:55 +0000 (UTC)
Subject: rpms/nexuiz-data/F-12 nexuiz-data.spec,1.19,1.20 sources,1.15,1.16
Message-ID: <20091204153655.8562711C00E0@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz-data/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14656

Modified Files:
	nexuiz-data.spec sources 
Log Message:
Updating to 2.5.2, 544196.



Index: nexuiz-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz-data/F-12/nexuiz-data.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nexuiz-data.spec	25 Jul 2009 19:17:03 -0000	1.19
+++ nexuiz-data.spec	4 Dec 2009 15:36:55 -0000	1.20
@@ -1,19 +1,19 @@
-%define datadate 20090501
+%define datadate 20091001
 
 Summary: Game data for the Nexuiz first person shooter
 Name: nexuiz-data
-Version: 2.5.1
-Release: 2%{?dist}
+Version: 2.5.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget  http://downloads.sourceforge.net/nexuiz/nexuiz-251.zip
-# unzip nexuiz-251.zip
-# mkdir nexuiz-data-2.5.1/
+# wget  http://downloads.sourceforge.net/nexuiz/nexuiz-252.zip
+# unzip nexuiz-252.zip
+# mkdir nexuiz-data-2.5.2/
 # mv Nexuiz/data/ Nexuiz/Docs/* \
-#    Nexuiz/gpl.txt nexuiz-data-2.5.1/
-# tar cvf nexuiz-data-2.5.1.tar nexuiz-data-2.5.1/
+#    Nexuiz/gpl.txt nexuiz-data-2.5.2/
+# tar cvf nexuiz-data-2.5.2.tar nexuiz-data-2.5.2/
 Source0: nexuiz-data-%{version}.tar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -58,6 +58,9 @@ Data (textures, maps, sounds and models)
 %{_datadir}/nexuiz/
 
 %changelog
+* Mon Oct 12 2009 Jon Ciesla <limb at jcomserv.net> - 2.5.2-1
+- Update to 2.5.2, BZ 528356.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz-data/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	27 May 2009 12:02:49 -0000	1.15
+++ sources	4 Dec 2009 15:36:55 -0000	1.16
@@ -1 +1 @@
-aa489a20cdb2740bd6fa3433fc820f33  nexuiz-data-2.5.1.tar
+f698cd974a26a810594d36ed6f3579aa  nexuiz-data-2.5.2.tar



From twaugh at fedoraproject.org  Fri Dec  4 15:49:10 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Dec 2009 15:49:10 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3439.patch,NONE,1.1 cups.spec,1.545,1.546
Message-ID: <20091204154910.2D95711C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18817

Modified Files:
	cups.spec 
Added Files:
	cups-str3439.patch 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
- The web interface prevented conflicting options from being adjusted
  (bug #533426, STR #3439).


cups-str3439.patch:
 admin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3439.patch ---
diff -up cups-1.4.2/cgi-bin/admin.c.str3439 cups-1.4.2/cgi-bin/admin.c
--- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-04 15:48:21.181907084 +0000
+++ cups-1.4.2/cgi-bin/admin.c	2009-12-04 15:48:21.199906005 +0000
@@ -3327,7 +3327,7 @@ do_set_options(http_t *http,		/* I - HTT
       }
   }
 
-  if (!have_options || ppdConflicts(ppd))
+  if (!have_options)
   {
    /*
     * Show the options to the user...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -p -r1.545 -r1.546
--- cups.spec	3 Dec 2009 10:06:20 -0000	1.545
+++ cups.spec	4 Dec 2009 15:49:09 -0000	1.546
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -62,6 +62,7 @@ Patch34: cups-str3418.patch
 Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
+Patch38: cups-conflicts.patch
 
 Patch100: cups-lspp.patch
 
@@ -232,6 +233,7 @@ module. 
 %patch35 -p1 -b .CVE-2009-3553
 %patch36 -p1 -b .str3422
 %patch37 -p1 -b .str3413
+%patch38 -p1 -b .str3439
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -532,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
+- The web interface prevented conflicting options from being adjusted
+  (bug #533426, STR #3439).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
 - Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
 



From twaugh at fedoraproject.org  Fri Dec  4 15:50:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Dec 2009 15:50:13 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3439.patch,NONE,1.1 cups.spec,1.540,1.541
Message-ID: <20091204155013.2D7A811C03DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19180

Modified Files:
	cups.spec 
Added Files:
	cups-str3439.patch 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
- The web interface prevented conflicting options from being adjusted
  (bug #533426, STR #3439).


cups-str3439.patch:
 admin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3439.patch ---
diff -up cups-1.4.2/cgi-bin/admin.c.str3439 cups-1.4.2/cgi-bin/admin.c
--- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-04 15:48:21.181907084 +0000
+++ cups-1.4.2/cgi-bin/admin.c	2009-12-04 15:48:21.199906005 +0000
@@ -3327,7 +3327,7 @@ do_set_options(http_t *http,		/* I - HTT
       }
   }
 
-  if (!have_options || ppdConflicts(ppd))
+  if (!have_options)
   {
    /*
     * Show the options to the user...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -p -r1.540 -r1.541
--- cups.spec	3 Dec 2009 23:08:23 -0000	1.540
+++ cups.spec	4 Dec 2009 15:50:13 -0000	1.541
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -62,6 +62,7 @@ Patch48: cups-str3418.patch
 Patch49: cups-CVE-2009-3553.patch
 Patch50: cups-str3422.patch
 Patch51: cups-str3413.patch
+Patch52: cups-str3439.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -228,6 +229,7 @@ module. 
 %patch49 -p1 -b .CVE-2009-3553
 %patch50 -p1 -b .str3422
 %patch51 -p1 -b .str3413
+%patch52 -p1 -b .str3439
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -521,6 +523,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
+- The web interface prevented conflicting options from being adjusted
+  (bug #533426, STR #3439).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-11
 - Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
 



From twaugh at fedoraproject.org  Fri Dec  4 15:51:36 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Dec 2009 15:51:36 +0000 (UTC)
Subject: rpms/cups/devel cups-str3439.patch,NONE,1.1 cups.spec,1.548,1.549
Message-ID: <20091204155136.2186511C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19610

Modified Files:
	cups.spec 
Added Files:
	cups-str3439.patch 
Log Message:
* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
- The web interface prevented conflicting options from being adjusted
  (bug #533426, STR #3439).


cups-str3439.patch:
 admin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3439.patch ---
diff -up cups-1.4.2/cgi-bin/admin.c.str3439 cups-1.4.2/cgi-bin/admin.c
--- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-04 15:48:21.181907084 +0000
+++ cups-1.4.2/cgi-bin/admin.c	2009-12-04 15:48:21.199906005 +0000
@@ -3327,7 +3327,7 @@ do_set_options(http_t *http,		/* I - HTT
       }
   }
 
-  if (!have_options || ppdConflicts(ppd))
+  if (!have_options)
   {
    /*
     * Show the options to the user...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -p -r1.548 -r1.549
--- cups.spec	3 Dec 2009 23:09:28 -0000	1.548
+++ cups.spec	4 Dec 2009 15:51:35 -0000	1.549
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -60,6 +60,7 @@ Patch34: cups-str3418.patch
 Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
+Patch38: cups-str3439.patch
 
 Patch100: cups-lspp.patch
 
@@ -230,6 +231,7 @@ module. 
 %patch35 -p1 -b .CVE-2009-3553
 %patch36 -p1 -b .str3422
 %patch37 -p1 -b .str3413
+%patch38 -p1 -b .str3439
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -522,6 +524,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
+- The web interface prevented conflicting options from being adjusted
+  (bug #533426, STR #3439).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
 - Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).
 



From than at fedoraproject.org  Fri Dec  4 16:00:58 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 16:00:58 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec, 1.546,
	1.547 kdelibs-4.3.80-findqt4-typo.patch, 1.1, NONE
Message-ID: <20091204160058.BFAF111C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22281

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.3.80-findqt4-typo.patch 
Log Message:
drop, it's included in new tarball



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -p -r1.546 -r1.547
--- kdelibs.spec	4 Dec 2009 15:20:31 -0000	1.546
+++ kdelibs.spec	4 Dec 2009 16:00:58 -0000	1.547
@@ -85,8 +85,6 @@ Patch26: kdelibs-4.3.3-khtml_svg_no_var_
 # upstream
 # kubuntu working to upstream this
 Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff
-# Backport fix, needed for kdeedu (kde-packager list)
-Patch100: kdelibs-4.3.80-findqt4-typo.patch
 # Another backported typo fix, this one for KAuth PolkitQt-1
 Patch101: kdelibs-4.3.80-fix-kauth-polkitqt-1.patch
 
@@ -221,7 +219,6 @@ format for easy browsing.
 %patch50 -p1 -b .kaction_qt_keys
 
 # upstream patches
-%patch100 -p0 -b .findqt4-typo
 %patch101 -p0 -b .kauth-polkitqt-1
 
 # security fix


--- kdelibs-4.3.80-findqt4-typo.patch DELETED ---



From twaugh at fedoraproject.org  Fri Dec  4 16:06:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  4 Dec 2009 16:06:43 +0000 (UTC)
Subject: rpms/cups/F-12 cups.spec,1.546,1.547
Message-ID: <20091204160643.6B13B11C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24176

Modified Files:
	cups.spec 
Log Message:
Fixed patch reference.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -p -r1.546 -r1.547
--- cups.spec	4 Dec 2009 15:49:09 -0000	1.546
+++ cups.spec	4 Dec 2009 16:06:43 -0000	1.547
@@ -62,7 +62,7 @@ Patch34: cups-str3418.patch
 Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
-Patch38: cups-conflicts.patch
+Patch38: cups-str3439.patch
 
 Patch100: cups-lspp.patch
 



From mhlavink at fedoraproject.org  Fri Dec  4 16:15:19 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  4 Dec 2009 16:15:19 +0000 (UTC)
Subject: File INIT.2009-11-30.tgz uploaded to lookaside cache by mhlavink
Message-ID: <20091204161519.5102910F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ksh:

5f81da2ae8b0cc77798f369c882394f2  INIT.2009-11-30.tgz



From mhlavink at fedoraproject.org  Fri Dec  4 16:15:24 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  4 Dec 2009 16:15:24 +0000 (UTC)
Subject: File ast-ksh.2009-11-30.tgz uploaded to lookaside cache by mhlavink
Message-ID: <20091204161524.A3C4E10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ksh:

2289670fd801d45ebabae3c2893c9cf2  ast-ksh.2009-11-30.tgz



From mhlavink at fedoraproject.org  Fri Dec  4 16:20:16 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  4 Dec 2009 16:20:16 +0000 (UTC)
Subject: rpms/ksh/devel .cvsignore, 1.19, 1.20 ksh.spec, 1.52, 1.53 sources, 
	1.20, 1.21
Message-ID: <20091204162016.55EBB11C03DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28162

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
- updated to 2009-11-30



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	18 Nov 2009 16:10:59 -0000	1.19
+++ .cvsignore	4 Dec 2009 16:20:15 -0000	1.20
@@ -1,2 +1,2 @@
-INIT.2009-10-21.tgz
-ast-ksh.2009-10-21.tgz
+INIT.2009-11-30.tgz
+ast-ksh.2009-11-30.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ksh.spec	18 Nov 2009 16:14:14 -0000	1.52
+++ ksh.spec	4 Dec 2009 16:20:15 -0000	1.53
@@ -1,11 +1,11 @@
-%define       releasedate   2009-10-21
+%define       releasedate   2009-11-30
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20091021
+Version:      20091130
 Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
@@ -88,6 +88,9 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
+- updated to 2009-11-30
+
 * Wed Nov 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091021-1
 - updated to 2009-10-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Nov 2009 16:11:00 -0000	1.20
+++ sources	4 Dec 2009 16:20:15 -0000	1.21
@@ -1,2 +1,2 @@
-c572fdb6a781de93156043919651bd8f  INIT.2009-10-21.tgz
-9bee79e562b655cc6293884045b7baf1  ast-ksh.2009-10-21.tgz
+5f81da2ae8b0cc77798f369c882394f2  INIT.2009-11-30.tgz
+2289670fd801d45ebabae3c2893c9cf2  ast-ksh.2009-11-30.tgz



From mhlavink at fedoraproject.org  Fri Dec  4 16:20:17 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  4 Dec 2009 16:20:17 +0000 (UTC)
Subject: rpms/ksh/F-12 .cvsignore, 1.19, 1.20 ksh.spec, 1.51, 1.52 sources, 
	1.20, 1.21
Message-ID: <20091204162017.1F84411C03DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28200

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
- updated to 2009-11-30



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	11 Nov 2009 16:04:37 -0000	1.19
+++ .cvsignore	4 Dec 2009 16:20:16 -0000	1.20
@@ -1,2 +1,2 @@
-INIT.2009-10-21.tgz
-ast-ksh.2009-10-21.tgz
+INIT.2009-11-30.tgz
+ast-ksh.2009-11-30.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-12/ksh.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ksh.spec	11 Nov 2009 16:04:37 -0000	1.51
+++ ksh.spec	4 Dec 2009 16:20:16 -0000	1.52
@@ -1,11 +1,11 @@
-%define       releasedate   2009-10-21
+%define       releasedate   2009-11-30
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20091021
+Version:      20091130
 Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
@@ -88,6 +88,9 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
+- updated to 2009-11-30
+
 * Thu Aug 27 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091021-1
 - updated to 2009-10-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	11 Nov 2009 16:04:37 -0000	1.20
+++ sources	4 Dec 2009 16:20:16 -0000	1.21
@@ -1,2 +1,2 @@
-c572fdb6a781de93156043919651bd8f  INIT.2009-10-21.tgz
-9bee79e562b655cc6293884045b7baf1  ast-ksh.2009-10-21.tgz
+5f81da2ae8b0cc77798f369c882394f2  INIT.2009-11-30.tgz
+2289670fd801d45ebabae3c2893c9cf2  ast-ksh.2009-11-30.tgz



From mhlavink at fedoraproject.org  Fri Dec  4 16:20:20 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  4 Dec 2009 16:20:20 +0000 (UTC)
Subject: rpms/ksh/F-11 .cvsignore, 1.20, 1.21 ksh.spec, 1.52, 1.53 sources, 
	1.21, 1.22
Message-ID: <20091204162020.3A64411C03DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28235

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
- updated to 2009-11-30



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	18 Nov 2009 16:14:28 -0000	1.20
+++ .cvsignore	4 Dec 2009 16:20:19 -0000	1.21
@@ -1,2 +1,2 @@
-INIT.2009-10-21.tgz
-ast-ksh.2009-10-21.tgz
+INIT.2009-11-30.tgz
+ast-ksh.2009-11-30.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/ksh.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ksh.spec	18 Nov 2009 16:14:28 -0000	1.52
+++ ksh.spec	4 Dec 2009 16:20:20 -0000	1.53
@@ -1,11 +1,11 @@
-%define       releasedate   2009-10-21
+%define       releasedate   2009-11-30
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20091021
+Version:      20091130
 Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
@@ -88,6 +88,9 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
+- updated to 2009-11-30
+
 * Wed Nov 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091021-1
 - updated to 2009-10-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	18 Nov 2009 16:14:29 -0000	1.21
+++ sources	4 Dec 2009 16:20:20 -0000	1.22
@@ -1,2 +1,2 @@
-c572fdb6a781de93156043919651bd8f  INIT.2009-10-21.tgz
-9bee79e562b655cc6293884045b7baf1  ast-ksh.2009-10-21.tgz
+5f81da2ae8b0cc77798f369c882394f2  INIT.2009-11-30.tgz
+2289670fd801d45ebabae3c2893c9cf2  ast-ksh.2009-11-30.tgz



From emaldonado at fedoraproject.org  Fri Dec  4 16:23:46 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  4 Dec 2009 16:23:46 +0000 (UTC)
Subject: rpms/nss/F-12 533125-ammend.patch, NONE, 1.1 nss-sysinit.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 nss.spec, 1.123, 1.124 sources, 1.29,
	1.30 newargs.patch, 1.1, NONE sysinit.patch, 1.3, NONE
Message-ID: <20091204162346.53DF111C00E0@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29484

Modified Files:
	.cvsignore nss.spec sources 
Added Files:
	533125-ammend.patch nss-sysinit.patch 
Removed Files:
	newargs.patch sysinit.patch 
Log Message:
Update to 3.12.5

533125-ammend.patch:
 ssl3con.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE 533125-ammend.patch ---
Index: mozilla/security/nss/lib/ssl/ssl3con.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ssl/ssl3con.c,v
retrieving revision 1.121
diff -u -p -r1.121 ssl3con.c
--- mozilla/security/nss/lib/ssl/ssl3con.c	12 Nov 2009 05:08:27 -0000	1.121
+++ mozilla/security/nss/lib/ssl/ssl3con.c	20 Nov 2009 19:36:30 -0000
@@ -4004,6 +4004,7 @@ ssl3_HandleHelloRequest(sslSocket *ss)
 	PORT_SetError(SSL_ERROR_RX_UNEXPECTED_HELLO_REQUEST);
 	return SECFailure;
     }
+    /*
     if (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER) {
 	ssl_GetXmitBufLock(ss);
 	rv = SSL3_SendAlert(ss, alert_warning, no_renegotiation);
@@ -4011,6 +4012,7 @@ ssl3_HandleHelloRequest(sslSocket *ss)
 	PORT_SetError(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED);
 	return SECFailure;
     }
+    */
 
     if (sid) {
 	ss->sec.uncache(sid);

nss-sysinit.patch:
 manifest.mn   |    1 +
 nss/nssinit.c |    2 ++
 2 files changed, 3 insertions(+)

--- NEW FILE nss-sysinit.patch ---
Index: mozilla/security/nss/lib/manifest.mn
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/manifest.mn,v
retrieving revision 1.20
diff -u -p -r1.20 manifest.mn
--- mozilla/security/nss/lib/manifest.mn	7 Nov 2009 05:57:41 -0000	1.20
+++ mozilla/security/nss/lib/manifest.mn	4 Dec 2009 02:27:20 -0000
@@ -56,6 +56,7 @@ DIRS =  util freebl softoken \
 	pkcs12 pkcs7 smime \
 	crmf jar \
 	ckfw      \
+	sysinit \
 	$(NULL)
 
 #  fortcrypt  is no longer built
Index: mozilla/security/nss/lib/nss/nssinit.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/nss/nssinit.c,v
retrieving revision 1.103
diff -u -p -r1.103 nssinit.c
--- mozilla/security/nss/lib/nss/nssinit.c	29 Oct 2009 21:33:10 -0000	1.103
+++ mozilla/security/nss/lib/nss/nssinit.c	4 Dec 2009 01:25:06 -0000
@@ -52,6 +52,7 @@
 #include "secoid.h"
 #include "nss.h"
 #include "pk11func.h"
+#include "pk11priv.h"
 #include "secerr.h"
 #include "nssbase.h"
 #include "pkixt.h"
@@ -64,6 +65,7 @@
 #include "ocspti.h"
 #include "ocspi.h"
 
+
 /*
  * On Windows nss3.dll needs to export the symbol 'mktemp' to be
  * fully backward compatible with the nss3.dll in NSS 3.2.x and


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	7 Sep 2009 19:16:35 -0000	1.27
+++ .cvsignore	4 Dec 2009 16:23:45 -0000	1.28
@@ -1,2 +1,2 @@
-nss-3.12.4-stripped.tar.bz2
+nss-3.12.5-stripped.tar.bz2
 nss-pem-20090907.tar.bz2


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/nss.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- nss.spec	26 Oct 2009 18:28:33 -0000	1.123
+++ nss.spec	4 Dec 2009 16:23:46 -0000	1.124
@@ -1,21 +1,23 @@
 %global nspr_version 4.8
-%global nss_util_version 3.12.4
+%global nss_util_version 3.12.5
 %global nss_softokn_version 3.12.4
+%global nss_softokn_fips_version 3.12.4
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.4
-Release:          15%{?dist}
+Version:          3.12.5
+Release:          1%{?dist}.2
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-util >= %{nss_util_version}
-Requires:         nss-softokn%{_isa} >= %{nss_softokn_version}
+Requires:         nss-softokn%{_isa} = %{nss_softokn_fips_version}
+Requires:         nss-system-init
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-softokn-devel >= %{version}                                                  
+BuildRequires:    nss-softokn-devel = %{nss_softokn_version}                                                  
 BuildRequires:    nss-util-devel >= %{nss_util_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
@@ -39,8 +41,8 @@ Source12:         %{name}-pem-20090907.t
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           newargs.patch
-Patch8:           sysinit.patch
+Patch7:           533125-ammend.patch
+Patch8:           nss-sysinit.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -68,7 +70,7 @@ manipulate the NSS certificate and key d
 %package sysinit
 Summary:          System NSS Initilization
 Group:            System Environment/Base
-Provides:         nss-sysinit = %{version}-%{release}
+Provides:         nss-system-init
 Requires:         nss = %{version}-%{release}
 
 %description sysinit
@@ -106,7 +108,7 @@ low level services.
 
 %patch2 -p0
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .newargs
+%patch7 -p0 -b .533125
 %patch8 -p0 -b .sysinit
 
 %build
@@ -137,8 +139,8 @@ export NSPR_LIB_DIR
 NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
 NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss-util | sed 's/-L//'`
 
-export NSS_INCLUDE_DIR
-export NSS_LIB_DIR
+#export NSS_INCLUDE_DIR
+#export NSS_LIB_DIR
 
 %ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
@@ -469,6 +471,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Dec 04 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.2
+- Update to 3.12.5
+- CVE-2009-3555 TLS: MITM attacks via session renegotiation
+
 * Mon Oct 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-15
 - Require nss-softoken of same arch as nss (#527867)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	7 Sep 2009 19:16:20 -0000	1.29
+++ sources	4 Dec 2009 16:23:46 -0000	1.30
@@ -1,2 +1,2 @@
-954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2
+51c5958153b6c01fada2e74cedc66835  nss-3.12.5-stripped.tar.bz2
 895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2


--- newargs.patch DELETED ---


--- sysinit.patch DELETED ---



From kkofler at fedoraproject.org  Fri Dec  4 16:32:47 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  4 Dec 2009 16:32:47 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.108,1.109
Message-ID: <20091204163247.DEBDB11C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32689/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
Revert, this wasn't actually respun.


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- kdepimlibs.spec	4 Dec 2009 15:34:57 -0000	1.108
+++ kdepimlibs.spec	4 Dec 2009 16:32:47 -0000	1.109
@@ -4,7 +4,7 @@
 
 Name: kdepimlibs
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -198,9 +198,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
-- respin
-
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:02 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has given up watchbugzilla
Message-ID: <20091204163702.7777E10F894@bastion2.fedora.phx.redhat.com>

kkofler has given up the watchbugzilla acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:05 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has requested commit
Message-ID: <20091204163705.5005810F8A2@bastion2.fedora.phx.redhat.com>

kkofler has requested the commit acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:03 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has given up watchcommits
Message-ID: <20091204163703.CCC0410F89C@bastion2.fedora.phx.redhat.com>

kkofler has given up the watchcommits acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:07 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has requested approveacls
Message-ID: <20091204163707.BC20910F8A6@bastion2.fedora.phx.redhat.com>

kkofler has requested the approveacls acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:13 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has given up watchbugzilla
Message-ID: <20091204163713.4FB8F10F8AC@bastion2.fedora.phx.redhat.com>

kkofler has given up the watchbugzilla acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:15 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has given up watchcommits
Message-ID: <20091204163715.6057F10F8B0@bastion2.fedora.phx.redhat.com>

kkofler has given up the watchcommits acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:16 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has requested commit
Message-ID: <20091204163717.10D4C10F8B4@bastion2.fedora.phx.redhat.com>

kkofler has requested the commit acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:18 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has requested approveacls
Message-ID: <20091204163718.EEF9B10F8B8@bastion2.fedora.phx.redhat.com>

kkofler has requested the approveacls acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:21 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has given up watchbugzilla
Message-ID: <20091204163721.95AB110F8BC@bastion2.fedora.phx.redhat.com>

kkofler has given up the watchbugzilla acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:22 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has given up watchcommits
Message-ID: <20091204163722.D6B4010F8C0@bastion2.fedora.phx.redhat.com>

kkofler has given up the watchcommits acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:24 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has requested commit
Message-ID: <20091204163724.E021010F8C4@bastion2.fedora.phx.redhat.com>

kkofler has requested the commit acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:26 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has requested approveacls
Message-ID: <20091204163726.D6C2010F896@bastion2.fedora.phx.redhat.com>

kkofler has requested the approveacls acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:30 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has given up watchbugzilla
Message-ID: <20091204163730.81E2810F8C7@bastion2.fedora.phx.redhat.com>

kkofler has given up the watchbugzilla acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:31 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has given up watchcommits
Message-ID: <20091204163732.1D81810F8CB@bastion2.fedora.phx.redhat.com>

kkofler has given up the watchcommits acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:34 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has requested commit
Message-ID: <20091204163734.F327710F8CF@bastion2.fedora.phx.redhat.com>

kkofler has requested the commit acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:37:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:37:36 +0000
Subject: [pkgdb] kdepim-runtime: kkofler has requested approveacls
Message-ID: <20091204163737.1A3C710F8D0@bastion2.fedora.phx.redhat.com>

kkofler has requested the approveacls acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:40:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:40:19 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091204164019.B841310F895@bastion2.fedora.phx.redhat.com>

than has set the commit acl on kdepim-runtime (Fedora devel) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:40:23 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091204164023.55BCF10F89C@bastion2.fedora.phx.redhat.com>

than has set the approveacls acl on kdepim-runtime (Fedora devel) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:40:28 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091204164028.DFC8B10F89E@bastion2.fedora.phx.redhat.com>

than has set the commit acl on kdepim-runtime (Fedora 10) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:40:31 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091204164031.55C1710F8A6@bastion2.fedora.phx.redhat.com>

than has set the approveacls acl on kdepim-runtime (Fedora 10) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:40:38 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091204164038.18A9D10F8A1@bastion2.fedora.phx.redhat.com>

than has set the commit acl on kdepim-runtime (Fedora 11) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:40:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:40:39 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091204164039.82D4310F8AB@bastion2.fedora.phx.redhat.com>

than has set the approveacls acl on kdepim-runtime (Fedora 11) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:40:42 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091204164042.D1CC810F8B0@bastion2.fedora.phx.redhat.com>

than has set the commit acl on kdepim-runtime (Fedora 12) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Dec  4 16:40:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:40:46 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091204164046.8907F10F8B3@bastion2.fedora.phx.redhat.com>

than has set the approveacls acl on kdepim-runtime (Fedora 12) to Approved for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From mef at fedoraproject.org  Fri Dec  4 16:44:20 2009
From: mef at fedoraproject.org (mef)
Date: Fri,  4 Dec 2009 16:44:20 +0000 (UTC)
Subject: rpms/mysql-connector-java/F-11 mysql-connector-java.spec,1.8,1.9
Message-ID: <20091204164420.6CB2F11C00E0@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/mysql-connector-java/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3777/F-11

Modified Files:
	mysql-connector-java.spec 
Log Message:
Add Maven POM and metadata


Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/F-11/mysql-connector-java.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mysql-connector-java.spec	26 Aug 2009 01:55:36 -0000	1.8
+++ mysql-connector-java.spec	4 Dec 2009 16:44:20 -0000	1.9
@@ -8,7 +8,7 @@
 Summary:	Official JDBC driver for MySQL
 Name:		mysql-connector-java
 Version:	5.1.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1 
 
 # MySQL FLOSS Exception
@@ -59,6 +59,11 @@ BuildRequires:		log4j
 BuildRequires:		java-1.6.0-openjdk-devel
 BuildRequires:		java-1.5.0-gcj-devel
 BuildRequires:		jakarta-commons-logging
+
+Requires:               jpackage-utils
+Requires(post):         jpackage-utils
+Requires(postun):       jpackage-utils
+
 Provides:			mm.mysql
 Obsoletes:			mm.mysql
 
@@ -99,7 +104,6 @@ rm src/testsuite/simple/ReadOnlyCallable
 
 ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -114,21 +118,30 @@ install -m 644 %{builddir}/%{name}-%{ver
 %{_bindir}/aot-compile-rpm
 %endif
 
+# Install the Maven build information
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 src/doc/sources/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+sed -i 's/>@.*</>%{version}</' $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
+%add_to_maven_depmap mysql %{name} %{version} JPP %{name}
 
-%if %{gcj_support}
 
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
+%endif
 
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-
 %endif
 
 %clean
@@ -138,11 +151,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 %doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs
 %attr(0644,root,root) %{_javadir}/*.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Fri Dec  4 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:5.1.8-2
+- Add Maven POM and depmap fragment
+
 * Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.8-1
 - Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
 - Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging



From mef at fedoraproject.org  Fri Dec  4 16:44:20 2009
From: mef at fedoraproject.org (mef)
Date: Fri,  4 Dec 2009 16:44:20 +0000 (UTC)
Subject: rpms/mysql-connector-java/devel mysql-connector-java.spec, 1.10,
	1.11
Message-ID: <20091204164420.AEF8E11C00E0@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/mysql-connector-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3777/devel

Modified Files:
	mysql-connector-java.spec 
Log Message:
Add Maven POM and metadata


Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/mysql-connector-java.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mysql-connector-java.spec	26 Aug 2009 01:45:48 -0000	1.10
+++ mysql-connector-java.spec	4 Dec 2009 16:44:20 -0000	1.11
@@ -8,7 +8,7 @@
 Summary:	Official JDBC driver for MySQL
 Name:		mysql-connector-java
 Version:	5.1.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1 
 
 # MySQL FLOSS Exception
@@ -59,6 +59,11 @@ BuildRequires:		log4j
 BuildRequires:		java-1.6.0-openjdk-devel
 BuildRequires:		java-1.5.0-gcj-devel
 BuildRequires:		jakarta-commons-logging
+
+Requires:               jpackage-utils
+Requires(post):         jpackage-utils
+Requires(postun):       jpackage-utils
+
 Provides:			mm.mysql
 Obsoletes:			mm.mysql
 
@@ -99,7 +104,6 @@ rm src/testsuite/simple/ReadOnlyCallable
 
 ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -114,21 +118,30 @@ install -m 644 %{builddir}/%{name}-%{ver
 %{_bindir}/aot-compile-rpm
 %endif
 
+# Install the Maven build information
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 src/doc/sources/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+sed -i 's/>@.*</>%{version}</' $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
+%add_to_maven_depmap mysql %{name} %{version} JPP %{name}
 
-%if %{gcj_support}
 
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
+%endif
 
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-
 %endif
 
 %clean
@@ -138,11 +151,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 %doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs
 %attr(0644,root,root) %{_javadir}/*.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Fri Dec  4 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:5.1.8-2
+- Add Maven POM and depmap fragment
+
 * Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.8-1
 - Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
 - Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging



From mef at fedoraproject.org  Fri Dec  4 16:44:20 2009
From: mef at fedoraproject.org (mef)
Date: Fri,  4 Dec 2009 16:44:20 +0000 (UTC)
Subject: rpms/mysql-connector-java/F-12 mysql-connector-java.spec,1.10,1.11
Message-ID: <20091204164420.8845311C00E0@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/mysql-connector-java/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3777/F-12

Modified Files:
	mysql-connector-java.spec 
Log Message:
Add Maven POM and metadata


Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/F-12/mysql-connector-java.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mysql-connector-java.spec	26 Aug 2009 01:45:48 -0000	1.10
+++ mysql-connector-java.spec	4 Dec 2009 16:44:20 -0000	1.11
@@ -8,7 +8,7 @@
 Summary:	Official JDBC driver for MySQL
 Name:		mysql-connector-java
 Version:	5.1.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1 
 
 # MySQL FLOSS Exception
@@ -59,6 +59,11 @@ BuildRequires:		log4j
 BuildRequires:		java-1.6.0-openjdk-devel
 BuildRequires:		java-1.5.0-gcj-devel
 BuildRequires:		jakarta-commons-logging
+
+Requires:               jpackage-utils
+Requires(post):         jpackage-utils
+Requires(postun):       jpackage-utils
+
 Provides:			mm.mysql
 Obsoletes:			mm.mysql
 
@@ -99,7 +104,6 @@ rm src/testsuite/simple/ReadOnlyCallable
 
 ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -114,21 +118,30 @@ install -m 644 %{builddir}/%{name}-%{ver
 %{_bindir}/aot-compile-rpm
 %endif
 
+# Install the Maven build information
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 src/doc/sources/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+sed -i 's/>@.*</>%{version}</' $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
+%add_to_maven_depmap mysql %{name} %{version} JPP %{name}
 
-%if %{gcj_support}
 
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
+%endif
 
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-
 %endif
 
 %clean
@@ -138,11 +151,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 %doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs
 %attr(0644,root,root) %{_javadir}/*.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Fri Dec  4 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:5.1.8-2
+- Add Maven POM and depmap fragment
+
 * Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.8-1
 - Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
 - Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging



From iarnell at fedoraproject.org  Fri Dec  4 16:46:20 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri,  4 Dec 2009 16:46:20 +0000 (UTC)
Subject: File Text-Markdown-1.000029.tar.gz uploaded to lookaside cache by
	iarnell
Message-ID: <20091204164620.C53E110F899@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Text-Markdown:

d994947eb12d15bd628905497b965828  Text-Markdown-1.000029.tar.gz



From iarnell at fedoraproject.org  Fri Dec  4 16:47:15 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri,  4 Dec 2009 16:47:15 +0000 (UTC)
Subject: rpms/perl-Text-Markdown/devel .cvsignore, 1.3,
	1.4 perl-Text-Markdown.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091204164715.62D8411C00E0@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Text-Markdown/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4945

Modified Files:
	.cvsignore perl-Text-Markdown.spec sources 
Log Message:
* Fri Dec 04 2009 Iain Arnell <iarnell at gmail.com> 1.000029-1
- update to latest upstream version
- perl-Text-MultiMarkdown split into separate package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Markdown/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Feb 2009 05:27:56 -0000	1.3
+++ .cvsignore	4 Dec 2009 16:47:15 -0000	1.4
@@ -1 +1 @@
-Text-Markdown-1.0.24.tar.gz
+Text-Markdown-1.000029.tar.gz


Index: perl-Text-Markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Markdown/devel/perl-Text-Markdown.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Text-Markdown.spec	4 Dec 2009 02:21:46 -0000	1.6
+++ perl-Text-Markdown.spec	4 Dec 2009 16:47:15 -0000	1.7
@@ -1,22 +1,28 @@
 Name:           perl-Text-Markdown
-Version:        1.0.24
-Release:        4%{?dist}
-Summary:        A text-to-HTML filter
+Version:        1.000029
+Release:        1%{?dist}
+Summary:        Convert Markdown syntax to (X)HTML
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://search.cpan.org/dist/Text-Markdown/
-Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Text-Markdown-%{version}.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Text/Text-Markdown-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Digest::MD5)
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(File::Slurp) >= 9999.08
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(HTML::Tidy)
+BuildRequires:  perl(List::MoreUtils)
+BuildRequires:  perl(Test::Differences)
+BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::More) >= 0.42
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
-BuildRequires:  perl(File::Slurp)
-BuildRequires:  perl(Test::Exception)
-BuildRequires:  perl(List::MoreUtils)
+BuildRequires:  perl(Text::Balanced)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -43,13 +49,16 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $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
+TEST_POD=1 make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,9 +68,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changes License.text README Readme.text Todo
 # For noarch packages: vendorlib
 %{perl_vendorlib}/*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*
 
 %changelog
+* Fri Dec 04 2009 Iain Arnell <iarnell at gmail.com> 1.000029-1
+- update to latest upstream version
+- perl-Text-MultiMarkdown split into separate package
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.0.24-4
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Markdown/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Feb 2009 05:27:56 -0000	1.3
+++ sources	4 Dec 2009 16:47:15 -0000	1.4
@@ -1 +1 @@
-471d61df7fdf66a791d66ad37074bd7b  Text-Markdown-1.0.24.tar.gz
+d994947eb12d15bd628905497b965828  Text-Markdown-1.000029.tar.gz



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:00 +0000
Subject: [pkgdb] bochs: limb has given up watchbugzilla
Message-ID: <20091204164800.6161810F895@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:00 +0000
Subject: [pkgdb] bochs: limb has given up watchcommits
Message-ID: <20091204164800.A415410F89C@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:01 +0000
Subject: [pkgdb] bochs: limb has requested commit
Message-ID: <20091204164801.CAD7C10F8A1@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:03 +0000
Subject: [pkgdb] bochs: limb has requested approveacls
Message-ID: <20091204164803.AE23B10F8A3@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:13 +0000
Subject: [pkgdb] bochs: limb has given up watchbugzilla
Message-ID: <20091204164813.D409C10F8AB@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on bochs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:17 +0000
Subject: [pkgdb] bochs: limb has given up watchcommits
Message-ID: <20091204164817.8EBD310F895@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on bochs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:23 +0000
Subject: [pkgdb] bochs: limb has requested approveacls
Message-ID: <20091204164823.3F0D210F8B1@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on bochs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:18 +0000
Subject: [pkgdb] bochs: limb has requested commit
Message-ID: <20091204164818.8D5CD10F8AF@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on bochs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:25 +0000
Subject: [pkgdb] bochs: limb has given up watchbugzilla
Message-ID: <20091204164825.3BD8210F8B4@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on bochs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:25 +0000
Subject: [pkgdb] bochs: limb has given up watchcommits
Message-ID: <20091204164825.8C8C610F8B8@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on bochs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:26 +0000
Subject: [pkgdb] bochs: limb has requested commit
Message-ID: <20091204164827.B426410F8A1@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on bochs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:28 +0000
Subject: [pkgdb] bochs: limb has requested approveacls
Message-ID: <20091204164828.1C4DB10F8BA@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on bochs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:30 +0000
Subject: [pkgdb] bochs: limb has given up watchbugzilla
Message-ID: <20091204164830.EED6810F8C2@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on bochs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:31 +0000
Subject: [pkgdb] bochs: limb has given up watchcommits
Message-ID: <20091204164831.13E4110F8C4@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on bochs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:31 +0000
Subject: [pkgdb] bochs: limb has requested commit
Message-ID: <20091204164831.D23DF10F8C6@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on bochs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:48:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:48:33 +0000
Subject: [pkgdb] bochs: limb has requested approveacls
Message-ID: <20091204164833.454E710F8CB@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on bochs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:49:14 +0000
Subject: [pkgdb] bochs: limb has given up watchbugzilla
Message-ID: <20091204164914.2D70010F899@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:49:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:49:15 +0000
Subject: [pkgdb] bochs: limb has given up watchcommits
Message-ID: <20091204164915.BCF9A10F8AA@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:49:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:49:16 +0000
Subject: [pkgdb] bochs: limb has given up commit
Message-ID: <20091204164916.679FC10F8AD@bastion2.fedora.phx.redhat.com>

limb has given up the commit acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Fri Dec  4 16:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 16:49:17 +0000
Subject: [pkgdb] bochs: limb has given up approveacls
Message-ID: <20091204164917.860A210F8B1@bastion2.fedora.phx.redhat.com>

limb has given up the approveacls acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From tgl at fedoraproject.org  Fri Dec  4 17:09:33 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri,  4 Dec 2009 17:09:33 +0000 (UTC)
Subject: rpms/libtiff/devel libtiff-CVE-2009-2347.patch, 1.1,
	1.2 libtiff-acversion.patch, 1.1, 1.2 libtiff-mantypo.patch, 1.1, 1.2
Message-ID: <20091204170933.373B211C00E0@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libtiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12159

Modified Files:
	libtiff-CVE-2009-2347.patch libtiff-acversion.patch 
	libtiff-mantypo.patch 
Log Message:
Add comments and upstream URLs to patch files, per merge review suggestion.

libtiff-CVE-2009-2347.patch:
 tiff2rgba.c |   35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

Index: libtiff-CVE-2009-2347.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/devel/libtiff-CVE-2009-2347.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libtiff-CVE-2009-2347.patch	3 Dec 2009 18:42:07 -0000	1.1
+++ libtiff-CVE-2009-2347.patch	4 Dec 2009 17:09:32 -0000	1.2
@@ -1,3 +1,9 @@
+This is a portion of the patch we were carrying for CVE-2009-2347 in 3.8.2.
+Unfortunately the upstream fix in 3.9.2 is incomplete, so we still need this
+part.  Reported upstream at
+http://bugzilla.maptools.org/show_bug.cgi?id=2079
+
+
 diff -Naur tiff-3.9.2.orig/tools/tiff2rgba.c tiff-3.9.2/tools/tiff2rgba.c
 --- tiff-3.9.2.orig/tools/tiff2rgba.c	2009-08-20 16:23:53.000000000 -0400
 +++ tiff-3.9.2/tools/tiff2rgba.c	2009-12-03 12:19:07.000000000 -0500

libtiff-acversion.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libtiff-acversion.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/devel/libtiff-acversion.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libtiff-acversion.patch	3 Dec 2009 18:42:07 -0000	1.1
+++ libtiff-acversion.patch	4 Dec 2009 17:09:32 -0000	1.2
@@ -1,3 +1,7 @@
+This patch is needed for building the package as of F-11.  It can be
+dropped whenever autoconf 2.63 is no longer used on any live branch.
+
+
 diff -Naur tiff-3.9.2.orig/configure.ac tiff-3.9.2/configure.ac
 --- tiff-3.9.2.orig/configure.ac	2009-11-04 12:11:20.000000000 -0500
 +++ tiff-3.9.2/configure.ac	2009-12-03 12:52:41.000000000 -0500

libtiff-mantypo.patch:
 tiffset.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libtiff-mantypo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/devel/libtiff-mantypo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libtiff-mantypo.patch	3 Dec 2009 18:42:07 -0000	1.1
+++ libtiff-mantypo.patch	4 Dec 2009 17:09:32 -0000	1.2
@@ -1,3 +1,8 @@
+Minor typo, reported upstream at
+http://bugzilla.maptools.org/show_bug.cgi?id=2129
+This patch should not be needed as of libtiff 4.0.
+
+
 diff -Naur tiff-3.9.2.orig/man/tiffset.1 tiff-3.9.2/man/tiffset.1
 --- tiff-3.9.2.orig/man/tiffset.1	2006-04-20 08:17:19.000000000 -0400
 +++ tiff-3.9.2/man/tiffset.1	2009-12-03 12:11:58.000000000 -0500



From kyle at fedoraproject.org  Fri Dec  4 17:32:39 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 17:32:39 +0000 (UTC)
Subject: rpms/microcode_ctl/devel .cvsignore, 1.15, 1.16 microcode_ctl.init, 
	1.15, 1.16 microcode_ctl.spec, 1.55, 1.56 sources, 1.12, 1.13
Message-ID: <20091204173239.075C311C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/microcode_ctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20315

Modified Files:
	.cvsignore microcode_ctl.init microcode_ctl.spec sources 
Log Message:
* Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.56
- Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
  Doesn't need microcode_ctl modifications as it's loaded by
  request_firmware() like any other sensible driver.
- Eventually, this AMD firmware can probably live inside
  kernel-firmware once it is split out.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	1 Oct 2009 02:21:44 -0000	1.15
+++ .cvsignore	4 Dec 2009 17:32:38 -0000	1.16
@@ -1,5 +1,5 @@
 clog
 microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
-microcode-20090330.dat
 microcode-20090927.dat
+amd-ucode-2009-10-09.tar


Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- microcode_ctl.init	11 Sep 2009 18:36:22 -0000	1.15
+++ microcode_ctl.init	4 Dec 2009 17:32:38 -0000	1.16
@@ -15,13 +15,20 @@ RETVAL=0
 function start ()
 {
 	RETVAL=1
-	# Make sure we are on an Intel machine
-	vendor=`grep "^vendor_id" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
-	[ "$vendor" != "GenuineIntel" ] && return
 
-	# Microcode wasn't available until 686's.
+	# Intel 686 and above, AMD family 16 and above
+	vendor=`grep "^vendor_id" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
 	family=`grep "^cpu family" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
-	[ $family -lt 6 ] && return
+
+	if [ "$vendor" = "GenuineIntel" ] && [ $family -ge 6 ]; then
+		echo -n $"Applying Intel CPU microcode update: "
+	elif [ "$vendor" = "AuthenticAMD" ] && [ $family -ge 16 ]; then
+		echo $"Loading AMD microcode update module"
+		/sbin/modprobe microcode
+		return
+	else
+		return
+	fi
 
 	echo -n $"Applying Intel CPU microcode update: "
 
@@ -49,6 +56,7 @@ function start ()
 
 stop()
 {
+	return
 }
 
 case "$1" in


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- microcode_ctl.spec	1 Oct 2009 02:21:44 -0000	1.55
+++ microcode_ctl.spec	4 Dec 2009 17:32:38 -0000	1.56
@@ -11,6 +11,8 @@ Source1:        microcode_ctl.init
 # Microcode now distributed directly by Intel, at
 # http://downloadcenter.intel.com (just search for microcode)
 Source2:        microcode-20090927.dat
+# http://www.amd64.org/support/microcode.html
+Source3:	amd-ucode-2009-10-09.tar
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires(pre):  /sbin/chkconfig /sbin/service
 Requires(pre):  grep gawk coreutils
@@ -20,11 +22,12 @@ ExclusiveArch:  %{ix86} x86_64
 Patch1: microcode_ctl.patch
 
 %description
-microcode_ctl - updates the microcode on Intel x86/x86-64 CPU's
+microcode_ctl - updates the microcode on Intel and AMD x86/x86-64 CPU's
 
 %prep
 %setup -q
 %patch1 -p1
+tar xf %{SOURCE3}
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -34,6 +37,7 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/usr/share/man/man{1,8}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}/lib/firmware/amd-ucode/
 
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
      INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} install clean
@@ -41,6 +45,11 @@ make DESTDIR=%{buildroot} PREFIX=%{_pref
 install %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/microcode_ctl
 install -m 644 %{SOURCE2} %{buildroot}/lib/firmware/microcode.dat
 
+install -m 644 amd-ucode-2009-10-09/microcode_amd.bin %{buildroot}/lib/firmware/amd-ucode/microcode_amd.bin
+install -m 644 amd-ucode-2009-10-09/LICENSE LICENSE.microcode_amd
+install -m 644 amd-ucode-2009-10-09/README README.microcode_amd
+install -m 644 amd-ucode-2009-10-09/INSTALL INSTALL.microcode_amd
+
 chmod -R a-s %{buildroot}
 
 %clean
@@ -51,6 +60,7 @@ rm -rf %{buildroot}
 %{_sysconfdir}/init.d/microcode_ctl
 /lib/firmware/*
 /sbin/microcode_ctl
+%doc LICENSE.microcode_amd README.microcode_amd INSTALL.microcode_amd
 %attr(0644,root,root) %{_mandir}/*/*
 
 
@@ -61,23 +71,43 @@ if [ "$1" = "0" ] ; then
 fi
 
 %post
-# Only enable on Intel 686's and above.
+# Only enable on Intel 686's and above or AMD family 0x10 and above
 vendor=`cat /proc/cpuinfo | grep "^vendor_id" | sort -u | awk -F ": " '{ print $2 }'`
-[ "$vendor" != "GenuineIntel" ] && exit 0
 family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print $2 }'`
-[ $family -lt 6 ] && exit 0
+if [ "$vendor" = "GenuineIntel" ]; then
+ [ $family -lt 6 ] && exit 0
+elif [ "$vendor" = "AuthenticAMD" ]; then
+ [ $family -lt 16 ] && exit 0
+else
+ exit 0
+fi
+
 /sbin/chkconfig --add microcode_ctl
+exit 0
 
 %triggerpostun -- kernel-utils
-# Only enable on Intel 686's and above.
+# Only enable on Intel 686's and above or AMD family 0x10 and above
 vendor=`cat /proc/cpuinfo | grep "^vendor_id" | sort -u | awk -F ": " '{ print $2 }'`
-[ "$vendor" != "GenuineIntel" ] && exit 0
 family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print $2 }'`
-[ $family -lt 6 ] && exit 0
+if [ "$vendor" = "GenuineIntel" ]; then
+ [ $family -lt 6 ] && exit 0
+elif [ "$vendor" = "AuthenticAMD" ]; then
+ [ $family -lt 16 ] && exit 0
+else
+ exit 0
+fi
+
 /sbin/chkconfig --add microcode_ctl
 exit 0
 
 %changelog
+* Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.56
+- Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
+  Doesn't need microcode_ctl modifications as it's loaded by
+  request_firmware() like any other sensible driver.
+- Eventually, this AMD firmware can probably live inside
+  kernel-firmware once it is split out.
+
 * Wed Sep 30 2009 Dave Jones <davej at redhat.com>
 - Update to microcode-20090927.dat
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Oct 2009 02:21:44 -0000	1.12
+++ sources	4 Dec 2009 17:32:38 -0000	1.13
@@ -1,2 +1,3 @@
 98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
 98427bffc4c803655785ca2093da0a92  microcode-20090927.dat
+524c5680aae1de04da1bf3371fd07a2d  amd-ucode-2009-10-09.tar



From kyle at fedoraproject.org  Fri Dec  4 17:34:41 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 17:34:41 +0000 (UTC)
Subject: rpms/microcode_ctl/F-12 .cvsignore, 1.15, 1.16 microcode_ctl.init, 
	1.15, 1.16 microcode_ctl.spec, 1.55, 1.56 sources, 1.12, 1.13
Message-ID: <20091204173441.113A811C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/microcode_ctl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21509

Modified Files:
	.cvsignore microcode_ctl.init microcode_ctl.spec sources 
Log Message:
* Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.56
- Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
  Doesn't need microcode_ctl modifications as it's loaded by
  request_firmware() like any other sensible driver.
- Eventually, this AMD firmware can probably live inside
  kernel-firmware once it is split out.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	1 Oct 2009 02:23:00 -0000	1.15
+++ .cvsignore	4 Dec 2009 17:34:40 -0000	1.16
@@ -1,5 +1,5 @@
 clog
 microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
-microcode-20090330.dat
 microcode-20090927.dat
+amd-ucode-2009-10-09.tar


Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/microcode_ctl.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- microcode_ctl.init	11 Sep 2009 18:36:22 -0000	1.15
+++ microcode_ctl.init	4 Dec 2009 17:34:40 -0000	1.16
@@ -15,13 +15,20 @@ RETVAL=0
 function start ()
 {
 	RETVAL=1
-	# Make sure we are on an Intel machine
-	vendor=`grep "^vendor_id" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
-	[ "$vendor" != "GenuineIntel" ] && return
 
-	# Microcode wasn't available until 686's.
+	# Intel 686 and above, AMD family 16 and above
+	vendor=`grep "^vendor_id" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
 	family=`grep "^cpu family" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
-	[ $family -lt 6 ] && return
+
+	if [ "$vendor" = "GenuineIntel" ] && [ $family -ge 6 ]; then
+		echo -n $"Applying Intel CPU microcode update: "
+	elif [ "$vendor" = "AuthenticAMD" ] && [ $family -ge 16 ]; then
+		echo $"Loading AMD microcode update module"
+		/sbin/modprobe microcode	# and we're done!
+		return
+	else
+		return
+	fi
 
 	echo -n $"Applying Intel CPU microcode update: "
 


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/microcode_ctl.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- microcode_ctl.spec	1 Oct 2009 02:23:00 -0000	1.55
+++ microcode_ctl.spec	4 Dec 2009 17:34:40 -0000	1.56
@@ -11,6 +11,8 @@ Source1:        microcode_ctl.init
 # Microcode now distributed directly by Intel, at
 # http://downloadcenter.intel.com (just search for microcode)
 Source2:        microcode-20090927.dat
+# http://www.amd64.org/support/microcode.html
+Source3:	amd-ucode-2009-10-09.tar
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires(pre):  /sbin/chkconfig /sbin/service
 Requires(pre):  grep gawk coreutils
@@ -20,11 +22,12 @@ ExclusiveArch:  %{ix86} x86_64
 Patch1: microcode_ctl.patch
 
 %description
-microcode_ctl - updates the microcode on Intel x86/x86-64 CPU's
+microcode_ctl - updates the microcode on Intel and AMD x86/x86-64 CPU's
 
 %prep
 %setup -q
 %patch1 -p1
+tar xf %{SOURCE3}
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -34,6 +37,7 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/usr/share/man/man{1,8}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}/lib/firmware/amd-ucode/
 
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
      INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} install clean
@@ -41,6 +45,11 @@ make DESTDIR=%{buildroot} PREFIX=%{_pref
 install %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/microcode_ctl
 install -m 644 %{SOURCE2} %{buildroot}/lib/firmware/microcode.dat
 
+install -m 644 amd-ucode-2009-10-09/microcode_amd.bin %{buildroot}/lib/firmware/amd-ucode/microcode_amd.bin
+install -m 644 amd-ucode-2009-10-09/LICENSE LICENSE.microcode_amd
+install -m 644 amd-ucode-2009-10-09/README README.microcode_amd
+install -m 644 amd-ucode-2009-10-09/INSTALL INSTALL.microcode_amd
+
 chmod -R a-s %{buildroot}
 
 %clean
@@ -51,6 +60,7 @@ rm -rf %{buildroot}
 %{_sysconfdir}/init.d/microcode_ctl
 /lib/firmware/*
 /sbin/microcode_ctl
+%doc LICENSE.microcode_amd README.microcode_amd INSTALL.microcode_amd
 %attr(0644,root,root) %{_mandir}/*/*
 
 
@@ -61,23 +71,43 @@ if [ "$1" = "0" ] ; then
 fi
 
 %post
-# Only enable on Intel 686's and above.
+# Only enable on Intel 686's and above or AMD family 0x10 and above
 vendor=`cat /proc/cpuinfo | grep "^vendor_id" | sort -u | awk -F ": " '{ print $2 }'`
-[ "$vendor" != "GenuineIntel" ] && exit 0
 family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print $2 }'`
-[ $family -lt 6 ] && exit 0
+if [ "$vendor" = "GenuineIntel" ]; then
+ [ $family -lt 6 ] && exit 0
+elif [ "$vendor" = "AuthenticAMD" ]; then
+ [ $family -lt 16 ] && exit 0
+else
+ exit 0
+fi
+
 /sbin/chkconfig --add microcode_ctl
+exit 0
 
 %triggerpostun -- kernel-utils
-# Only enable on Intel 686's and above.
+# Only enable on Intel 686's and above or AMD family 0x10 and above
 vendor=`cat /proc/cpuinfo | grep "^vendor_id" | sort -u | awk -F ": " '{ print $2 }'`
-[ "$vendor" != "GenuineIntel" ] && exit 0
 family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print $2 }'`
-[ $family -lt 6 ] && exit 0
+if [ "$vendor" = "GenuineIntel" ]; then
+ [ $family -lt 6 ] && exit 0
+elif [ "$vendor" = "AuthenticAMD" ]; then
+ [ $family -lt 16 ] && exit 0
+else
+ exit 0
+fi
+
 /sbin/chkconfig --add microcode_ctl
 exit 0
 
 %changelog
+* Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.56
+- Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
+  Doesn't need microcode_ctl modifications as it's loaded by
+  request_firmware() like any other sensible driver.
+- Eventually, this AMD firmware can probably live inside
+  kernel-firmware once it is split out.
+
 * Wed Sep 30 2009 Dave Jones <davej at redhat.com>
 - Update to microcode-20090927.dat
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Oct 2009 02:23:00 -0000	1.12
+++ sources	4 Dec 2009 17:34:40 -0000	1.13
@@ -1,2 +1,3 @@
 98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
 98427bffc4c803655785ca2093da0a92  microcode-20090927.dat
+524c5680aae1de04da1bf3371fd07a2d  amd-ucode-2009-10-09.tar



From kyle at fedoraproject.org  Fri Dec  4 17:40:22 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 17:40:22 +0000 (UTC)
Subject: rpms/microcode_ctl/F-11 .cvsignore, 1.14, 1.15 microcode_ctl.init, 
	1.13, 1.14 microcode_ctl.spec, 1.51, 1.52 sources, 1.11, 1.12
Message-ID: <20091204174022.1597511C03F6@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/microcode_ctl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23492

Modified Files:
	.cvsignore microcode_ctl.init microcode_ctl.spec sources 
Log Message:
* Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.52
- Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
  Doesn't need microcode_ctl modifications as it's loaded by
  request_firmware() like any other sensible driver.
- Eventually, this AMD firmware can probably live inside
  kernel-firmware once it is split out.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 May 2009 01:28:16 -0000	1.14
+++ .cvsignore	4 Dec 2009 17:40:21 -0000	1.15
@@ -2,3 +2,4 @@ clog
 microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
 microcode-20090330.dat
+amd-ucode-2009-10-09.tar


Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-11/microcode_ctl.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- microcode_ctl.init	22 Feb 2008 20:01:12 -0000	1.13
+++ microcode_ctl.init	4 Dec 2009 17:40:21 -0000	1.14
@@ -2,20 +2,9 @@
 # chkconfig: 2345 0 99
 # description: script to apply cpu microcode
 
-# vars:
-#
-# START			distribution specific way of kicking programs
-# END			distribution specific way of checking return status
-# PROGRAM		the executable to run
-# ARGUMENTS		the argument we're going to call PROGRAM with
-
 # Check that we're a priviledged user
 [ `id -u` = 0 ] || exit 0
 
-DEVICE=/dev/cpu/microcode
-ARGUMENTS=-Qu
-RETVAL=0
-PROGRAM=/sbin/microcode_ctl
 DATAFILE=/lib/firmware/microcode.dat
 
 . /etc/init.d/functions
@@ -26,13 +15,20 @@ RETVAL=0
 function start ()
 {
 	RETVAL=1
-	# Make sure we are on an Intel machine
-	vendor=`grep "^vendor_id" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
-	[ "$vendor" != "GenuineIntel" ] && return
 
-	# Microcode wasn't available until 686's.
+	# Intel 686 and above, AMD family 16 and above
+	vendor=`grep "^vendor_id" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
 	family=`grep "^cpu family" /proc/cpuinfo | head -n1 | awk -F ": " '{ print $2 }'`
-	[ $family -lt 6 ] && return
+
+	if [ "$vendor" = "GenuineIntel" ] && [ $family -ge 6 ]; then
+		echo -n $"Applying Intel CPU microcode update: "
+	elif [ "$vendor" = "AuthenticAMD" ] && [ $family -ge 16 ]; then
+		echo $"Loading AMD microcode update module"
+		/sbin/modprobe microcode	# and we're done!
+		return
+	else
+		return
+	fi
 
 	echo -n $"Applying Intel CPU microcode update: "
 
@@ -44,38 +40,22 @@ function start ()
 	/sbin/modprobe microcode
 
 	lt=0
-	while [ ! -c $DEVICE ]; do
+	while [ ! -c /dev/cpu/microcode ]; do
 		lt=$[lt+1];
 		[ $lt -gt 5 ] && break;
-		sleep 1;
+		sleep 0.1;
 	done
 
-	# Lets just be sure we have a device file...
-	if [ ! -e $DEVICE ]; then
-		echo $"$0: microcode device $DEVICE doesn't exist?"
-		exit 1
-	elif [ ! -c $DEVICE ]; then
-		echo $"$0: $DEVICE not a character device?"
-		exit 1
-	fi
-
-	daemon $PROGRAM $ARGUMENTS
+	/sbin/microcode_ctl -Qu
 	RETVAL=$?
 
-	# trap the most common case, errno 19 = no device
-	if [ $RETVAL -eq 19 ]; then
-		echo $"$0: kernel does not have CPU microcode device support"
-	fi
 	/sbin/rmmod microcode
-	echo
 
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/microcode_ctl
 	return $RETVAL
 }
 
 stop()
 {
-	rm -f /var/lock/subsys/microcode_ctl
 }
 
 case "$1" in
@@ -87,7 +67,7 @@ case "$1" in
 	stop
 	;;
   restart|reload|force-reload)
-    stop
+	stop
 	start
 	;;
   status)


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-11/microcode_ctl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- microcode_ctl.spec	3 Jun 2009 18:45:24 -0000	1.51
+++ microcode_ctl.spec	4 Dec 2009 17:40:21 -0000	1.52
@@ -11,6 +11,8 @@ Source1:        microcode_ctl.init
 # Microcode now distributed directly by Intel, at
 # http://downloadcenter.intel.com (just search for microcode)
 Source2:        microcode-20090330.dat
+# http://www.amd64.org/support/microcode.html
+Source3:        amd-ucode-2009-10-09.tar
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires(pre):  /sbin/chkconfig /sbin/service
 Requires(pre):  grep gawk coreutils
@@ -20,11 +22,12 @@ ExclusiveArch:  i586 x86_64
 Patch1: microcode_ctl.patch
 
 %description
-microcode_ctl - updates the microcode on Intel x86/x86-64 CPU's
+microcode_ctl - updates the microcode on Intel and AMD x86/x86-64 CPU's
 
 %prep
 %setup -q
 %patch1 -p1
+tar xvf %{SOURCE3}
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -34,6 +37,7 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/usr/share/man/man{1,8}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}/lib/firmware/amd-ucode/
 
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
      INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} install clean
@@ -41,6 +45,11 @@ make DESTDIR=%{buildroot} PREFIX=%{_pref
 install %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/microcode_ctl
 install -m 644 %{SOURCE2} %{buildroot}/lib/firmware/microcode.dat
 
+install -m 644 amd-ucode-2009-10-09/microcode_amd.bin %{buildroot}/lib/firmware/amd-ucode/microcode_amd.bin
+install -m 644 amd-ucode-2009-10-09/LICENSE LICENSE.microcode_amd
+install -m 644 amd-ucode-2009-10-09/README README.microcode_amd
+install -m 644 amd-ucode-2009-10-09/INSTALL INSTALL.microcode_amd
+
 chmod -R a-s %{buildroot}
 
 %clean
@@ -51,33 +60,52 @@ rm -rf %{buildroot}
 %{_sysconfdir}/init.d/microcode_ctl
 /lib/firmware/*
 /sbin/microcode_ctl
+%doc LICENSE.microcode_amd README.microcode_amd INSTALL.microcode_amd
 %attr(0644,root,root) %{_mandir}/*/*
 
-
-
 %preun
 if [ "$1" = "0" ] ; then
     /sbin/chkconfig --del microcode_ctl
 fi
 
 %post
-# Only enable on Intel 686's and above.
+# Only enable on Intel 686's and above or AMD family 0x10 and above
 vendor=`cat /proc/cpuinfo | grep "^vendor_id" | sort -u | awk -F ": " '{ print $2 }'`
-[ "$vendor" != "GenuineIntel" ] && exit 0
 family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print $2 }'`
-[ $family -lt 6 ] && exit 0
+if [ "$vendor" = "GenuineIntel" ]; then
+ [ $family -lt 6 ] && exit 0
+elif [ "$vendor" = "AuthenticAMD" ]; then
+ [ $family -lt 16 ] && exit 0
+else
+ exit 0
+fi
+
 /sbin/chkconfig --add microcode_ctl
+exit 0
 
 %triggerpostun -- kernel-utils
-# Only enable on Intel 686's and above.
+# Only enable on Intel 686's and above or AMD family 0x10 and above
 vendor=`cat /proc/cpuinfo | grep "^vendor_id" | sort -u | awk -F ": " '{ print $2 }'`
-[ "$vendor" != "GenuineIntel" ] && exit 0
 family=`cat /proc/cpuinfo | grep "^cpu family" | sort -u | awk -F ": " '{ print $2 }'`
-[ $family -lt 6 ] && exit 0
+if [ "$vendor" = "GenuineIntel" ]; then
+ [ $family -lt 6 ] && exit 0
+elif [ "$vendor" = "AuthenticAMD" ]; then
+ [ $family -lt 16 ] && exit 0
+else
+ exit 0
+fi
+
 /sbin/chkconfig --add microcode_ctl
 exit 0
 
 %changelog
+* Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.52
+- Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
+  Doesn't need microcode_ctl modifications as it's loaded by
+  request_firmware() like any other sensible driver.
+- Eventually, this AMD firmware can probably live inside
+  kernel-firmware once it is split out.
+
 * Wed Jun  3 2009 Kyle McMartin <kyle at redhat.com>
 - s/i686/i586/
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 May 2009 01:28:16 -0000	1.11
+++ sources	4 Dec 2009 17:40:21 -0000	1.12
@@ -1,2 +1,3 @@
 98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
 d4e108cf99867c1a350c62a92197873d  microcode-20090330.dat
+524c5680aae1de04da1bf3371fd07a2d  amd-ucode-2009-10-09.tar



From pingou at fedoraproject.org  Fri Dec  4 17:41:31 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri,  4 Dec 2009 17:41:31 +0000 (UTC)
Subject: rpms/R-Biostrings/F-10 R-Biostrings.spec,1.7,1.8
Message-ID: <20091204174131.F20F911C00E0@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23825/F-10

Modified Files:
	R-Biostrings.spec 
Log Message:
Fix build


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-10/R-Biostrings.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-Biostrings.spec	21 Nov 2009 11:12:22 -0000	1.7
+++ R-Biostrings.spec	4 Dec 2009 17:41:31 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name:             R-%{packname}
 Version:          2.14.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -70,7 +70,6 @@ rm -rf %{buildroot}
 %doc %{_libdir}/R/library/%{packname}/NEWS
 %{_libdir}/R/library/%{packname}/help
 %{_libdir}/R/library/%{packname}/R
-%{_libdir}/R/library/%{packname}/R-ex
 %{_libdir}/R/library/%{packname}/extdata
 %{_libdir}/R/library/%{packname}/data
 %{_libdir}/R/library/%{packname}/libs
@@ -84,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Fri Dec 04 2009 pingou <pingou at pingoured.fr> 2.14.7-2
+- Remove the folder R-ex
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 2.14.7-1
 - Update to 2.14.7
 - Remove %%post and %%postun



From pingou at fedoraproject.org  Fri Dec  4 17:41:32 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri,  4 Dec 2009 17:41:32 +0000 (UTC)
Subject: rpms/R-Biostrings/F-11 R-Biostrings.spec,1.7,1.8
Message-ID: <20091204174132.26EF211C00E0@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23825/F-11

Modified Files:
	R-Biostrings.spec 
Log Message:
Fix build


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-11/R-Biostrings.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-Biostrings.spec	21 Nov 2009 11:12:22 -0000	1.7
+++ R-Biostrings.spec	4 Dec 2009 17:41:32 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name:             R-%{packname}
 Version:          2.14.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -70,7 +70,6 @@ rm -rf %{buildroot}
 %doc %{_libdir}/R/library/%{packname}/NEWS
 %{_libdir}/R/library/%{packname}/help
 %{_libdir}/R/library/%{packname}/R
-%{_libdir}/R/library/%{packname}/R-ex
 %{_libdir}/R/library/%{packname}/extdata
 %{_libdir}/R/library/%{packname}/data
 %{_libdir}/R/library/%{packname}/libs
@@ -84,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Fri Dec 04 2009 pingou <pingou at pingoured.fr> 2.14.7-2
+- Remove the folder R-ex
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 2.14.7-1
 - Update to 2.14.7
 - Remove %%post and %%postun



From pingou at fedoraproject.org  Fri Dec  4 17:41:32 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri,  4 Dec 2009 17:41:32 +0000 (UTC)
Subject: rpms/R-Biostrings/devel R-Biostrings.spec,1.8,1.9
Message-ID: <20091204174132.6EA4D11C00E0@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23825/devel

Modified Files:
	R-Biostrings.spec 
Log Message:
Fix build


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/R-Biostrings.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-Biostrings.spec	21 Nov 2009 11:12:23 -0000	1.8
+++ R-Biostrings.spec	4 Dec 2009 17:41:32 -0000	1.9
@@ -5,7 +5,7 @@
 
 Name:             R-%{packname}
 Version:          2.14.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -70,7 +70,6 @@ rm -rf %{buildroot}
 %doc %{_libdir}/R/library/%{packname}/NEWS
 %{_libdir}/R/library/%{packname}/help
 %{_libdir}/R/library/%{packname}/R
-%{_libdir}/R/library/%{packname}/R-ex
 %{_libdir}/R/library/%{packname}/extdata
 %{_libdir}/R/library/%{packname}/data
 %{_libdir}/R/library/%{packname}/libs
@@ -84,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Fri Dec 04 2009 pingou <pingou at pingoured.fr> 2.14.7-2
+- Remove the folder R-ex
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 2.14.7-1
 - Update to 2.14.7
 - Remove %%post and %%postun



From pingou at fedoraproject.org  Fri Dec  4 17:41:32 2009
From: pingou at fedoraproject.org (pingou)
Date: Fri,  4 Dec 2009 17:41:32 +0000 (UTC)
Subject: rpms/R-Biostrings/F-12 R-Biostrings.spec,1.8,1.9
Message-ID: <20091204174132.4B7B111C00E0@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23825/F-12

Modified Files:
	R-Biostrings.spec 
Log Message:
Fix build


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-12/R-Biostrings.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-Biostrings.spec	21 Nov 2009 11:12:23 -0000	1.8
+++ R-Biostrings.spec	4 Dec 2009 17:41:32 -0000	1.9
@@ -5,7 +5,7 @@
 
 Name:             R-%{packname}
 Version:          2.14.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -70,7 +70,6 @@ rm -rf %{buildroot}
 %doc %{_libdir}/R/library/%{packname}/NEWS
 %{_libdir}/R/library/%{packname}/help
 %{_libdir}/R/library/%{packname}/R
-%{_libdir}/R/library/%{packname}/R-ex
 %{_libdir}/R/library/%{packname}/extdata
 %{_libdir}/R/library/%{packname}/data
 %{_libdir}/R/library/%{packname}/libs
@@ -84,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Fri Dec 04 2009 pingou <pingou at pingoured.fr> 2.14.7-2
+- Remove the folder R-ex
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 2.14.7-1
 - Update to 2.14.7
 - Remove %%post and %%postun



From than at fedoraproject.org  Fri Dec  4 17:42:15 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  4 Dec 2009 17:42:15 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs.spec,1.531,1.532
Message-ID: <20091204174215.A045111C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24099

Modified Files:
	kdelibs.spec 
Log Message:
add workaound for low-mem systems




Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -p -r1.531 -r1.532
--- kdelibs.spec	1 Dec 2009 15:28:20 -0000	1.531
+++ kdelibs.spec	4 Dec 2009 17:42:15 -0000	1.532
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -76,7 +76,7 @@ Patch20: kdelibs-4.1.70-cmake.patch
 Patch22: kdelibs-4.3.0-bookmarks.patch
 Patch24: kdelibs-4.3.1-drkonq.patch
 # use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
-# workaound for low-mem systems (ppc64)
+# workaound for low-mem systems (ppc64, x86_64)
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
 
 # upstream
@@ -203,7 +203,7 @@ format for easy browsing.
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
-%ifarch ppc64
+%ifarch ppc64 x86_64
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
 %endif
 
@@ -403,6 +403,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+- add workaound for low-mem systems
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 



From pkgdb at fedoraproject.org  Fri Dec  4 17:47:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 17:47:17 +0000
Subject: [pkgdb] volume_key had acl change status
Message-ID: <20091204174717.A5DFF10F891@bastion2.fedora.phx.redhat.com>

mitr has set the commit acl on volume_key (Fedora devel) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 17:47:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 17:47:21 +0000
Subject: [pkgdb] volume_key had acl change status
Message-ID: <20091204174721.82A6510F899@bastion2.fedora.phx.redhat.com>

mitr has set the approveacls acl on volume_key (Fedora devel) to Denied for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 17:47:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 17:47:27 +0000
Subject: [pkgdb] volume_key had acl change status
Message-ID: <20091204174727.4720210F8A1@bastion2.fedora.phx.redhat.com>

mitr has set the commit acl on volume_key (Fedora 12) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pkgdb at fedoraproject.org  Fri Dec  4 17:47:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 04 Dec 2009 17:47:29 +0000
Subject: [pkgdb] volume_key had acl change status
Message-ID: <20091204174730.00C2910F8A4@bastion2.fedora.phx.redhat.com>

mitr has set the approveacls acl on volume_key (Fedora 12) to Denied for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/volume_key



From pwouters at fedoraproject.org  Fri Dec  4 18:04:41 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  4 Dec 2009 18:04:41 +0000 (UTC)
Subject: File ldns-1.6.3.tar.gz uploaded to lookaside cache by pwouters
Message-ID: <20091204180441.EFFCB10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ldns:

4234fc56f087d852b2f6d1e6ccd9b7da  ldns-1.6.3.tar.gz



From pwouters at fedoraproject.org  Fri Dec  4 18:12:04 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  4 Dec 2009 18:12:04 +0000 (UTC)
Subject: rpms/ldns/devel .cvsignore, 1.12, 1.13 ldns.spec, 1.52, 1.53 sources,
	1.16, 1.17
Message-ID: <20091204181204.B020311C00E0@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv568

Modified Files:
	.cvsignore ldns.spec sources 
Log Message:
* Fri Dec 04 2009 Paul Wouters <paul at xelerance.com> - 1.6.3-1
- Upgraded to 1.6.3, which has minor bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	13 Nov 2009 14:51:15 -0000	1.12
+++ .cvsignore	4 Dec 2009 18:12:04 -0000	1.13
@@ -7,3 +7,4 @@ ldns-1.5.1.tar.gz
 ldns-1.6.0.tar.gz
 ldns-1.6.1.tar.gz
 ldns-1.6.2.tar.gz
+ldns-1.6.3.tar.gz


Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ldns.spec	13 Nov 2009 14:51:15 -0000	1.52
+++ ldns.spec	4 Dec 2009 18:12:04 -0000	1.53
@@ -1,6 +1,6 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.6.2
+Version: 1.6.3
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 04 2009 Paul Wouters <paul at xelerance.com> - 1.6.3-1
+- Upgraded to 1.6.3, which has minor bugfixes
+
 * Fri Nov 13 2009 Paul Wouters <paul at xelerance.com> - 1.6.2-1
 - Upgraded to 1.6.2. This fixes various bugs.
   (upstream released mostly to default with sha2 for the imminent


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 Nov 2009 14:51:15 -0000	1.16
+++ sources	4 Dec 2009 18:12:04 -0000	1.17
@@ -1,2 +1,3 @@
 a44dafecdcc49aaea5d20ae15bc738c0  ldns-1.6.1.tar.gz
 88ade81d5ffafbb5a31316aacb262696  ldns-1.6.2.tar.gz
+4234fc56f087d852b2f6d1e6ccd9b7da  ldns-1.6.3.tar.gz



From devrim at fedoraproject.org  Fri Dec  4 18:13:11 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 18:13:11 +0000 (UTC)
Subject: File mapserver-5.6.0-rc1.tar.gz uploaded to lookaside cache by
	devrim
Message-ID: <20091204181311.4E7D310F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mapserver:

7dbf7151b75af8af87a67741f317bf2f  mapserver-5.6.0-rc1.tar.gz



From ndim at fedoraproject.org  Fri Dec  4 18:16:46 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 18:16:46 +0000 (UTC)
Subject: File nted-1.9.10.tar.gz uploaded to lookaside cache by ndim
Message-ID: <20091204181646.CDECC10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nted:

9d65b818a83a698d0d63bb3694d00ed3  nted-1.9.10.tar.gz



From ndim at fedoraproject.org  Fri Dec  4 18:19:00 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 18:19:00 +0000 (UTC)
Subject: rpms/nted/devel .cvsignore, 1.15, 1.16 nted.spec, 1.23, 1.24 sources,
	1.15, 1.16
Message-ID: <20091204181900.6FBEA11C00E0@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2736

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
- Update to 1.9.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	31 Oct 2009 10:10:10 -0000	1.15
+++ .cvsignore	4 Dec 2009 18:19:00 -0000	1.16
@@ -1 +1 @@
-nted-1.9.2.tar.gz
+nted-1.9.10.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- nted.spec	31 Oct 2009 10:10:11 -0000	1.23
+++ nted.spec	4 Dec 2009 18:19:00 -0000	1.24
@@ -14,10 +14,9 @@
 
 
 Name:           nted
-Version:        1.9.2
+Version:        1.9.10
 Release:        1%{?dist}
 Summary:        Musical score editor
-Summary(de):    Partitureditor
 
 Group:          Applications/Publishing
 # Program source is GPLv2+, HTML manuals are GFDL 1.2+.
@@ -125,6 +124,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
+- Update to 1.9.10
+
 * Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
 - Update to 1.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	31 Oct 2009 10:10:11 -0000	1.15
+++ sources	4 Dec 2009 18:19:00 -0000	1.16
@@ -1 +1 @@
-361c8112c60a9d5bb276ad79c534926b  nted-1.9.2.tar.gz
+9d65b818a83a698d0d63bb3694d00ed3  nted-1.9.10.tar.gz



From ndim at fedoraproject.org  Fri Dec  4 18:20:34 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 18:20:34 +0000 (UTC)
Subject: rpms/nted/F-12 .cvsignore, 1.15, 1.16 nted.spec, 1.23, 1.24 sources,
	1.15, 1.16
Message-ID: <20091204182034.6375611C03DB@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3374

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
- Update to 1.9.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	31 Oct 2009 10:11:26 -0000	1.15
+++ .cvsignore	4 Dec 2009 18:20:34 -0000	1.16
@@ -1 +1 @@
-nted-1.9.2.tar.gz
+nted-1.9.10.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/nted.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- nted.spec	31 Oct 2009 10:11:26 -0000	1.23
+++ nted.spec	4 Dec 2009 18:20:34 -0000	1.24
@@ -14,10 +14,9 @@
 
 
 Name:           nted
-Version:        1.9.2
+Version:        1.9.10
 Release:        1%{?dist}
 Summary:        Musical score editor
-Summary(de):    Partitureditor
 
 Group:          Applications/Publishing
 # Program source is GPLv2+, HTML manuals are GFDL 1.2+.
@@ -125,6 +124,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
+- Update to 1.9.10
+
 * Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
 - Update to 1.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	31 Oct 2009 10:11:26 -0000	1.15
+++ sources	4 Dec 2009 18:20:34 -0000	1.16
@@ -1 +1 @@
-361c8112c60a9d5bb276ad79c534926b  nted-1.9.2.tar.gz
+9d65b818a83a698d0d63bb3694d00ed3  nted-1.9.10.tar.gz



From ndim at fedoraproject.org  Fri Dec  4 18:20:34 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Fri,  4 Dec 2009 18:20:34 +0000 (UTC)
Subject: rpms/nted/F-11 .cvsignore, 1.15, 1.16 nted.spec, 1.21, 1.22 sources,
	1.15, 1.16
Message-ID: <20091204182034.75F6C11C044D@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3361

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
- Update to 1.9.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	31 Oct 2009 10:11:28 -0000	1.15
+++ .cvsignore	4 Dec 2009 18:20:34 -0000	1.16
@@ -1 +1 @@
-nted-1.9.2.tar.gz
+nted-1.9.10.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/nted.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- nted.spec	31 Oct 2009 10:11:28 -0000	1.21
+++ nted.spec	4 Dec 2009 18:20:34 -0000	1.22
@@ -14,10 +14,9 @@
 
 
 Name:           nted
-Version:        1.9.2
+Version:        1.9.10
 Release:        1%{?dist}
 Summary:        Musical score editor
-Summary(de):    Partitureditor
 
 Group:          Applications/Publishing
 # Program source is GPLv2+, HTML manuals are GFDL 1.2+.
@@ -125,6 +124,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
+- Update to 1.9.10
+
 * Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
 - Update to 1.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	31 Oct 2009 10:11:28 -0000	1.15
+++ sources	4 Dec 2009 18:20:34 -0000	1.16
@@ -1 +1 @@
-361c8112c60a9d5bb276ad79c534926b  nted-1.9.2.tar.gz
+9d65b818a83a698d0d63bb3694d00ed3  nted-1.9.10.tar.gz



From devrim at fedoraproject.org  Fri Dec  4 18:26:23 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 18:26:23 +0000 (UTC)
Subject: rpms/mapserver/devel .cvsignore, 1.12, 1.13 mapserver.spec, 1.31,
	1.32 sources, 1.14, 1.15
Message-ID: <20091204182623.C050F11C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5018

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
Update to 5.6.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Nov 2009 18:57:00 -0000	1.12
+++ .cvsignore	4 Dec 2009 18:26:23 -0000	1.13
@@ -1 +1 @@
-mapserver-5.4.2.tar.gz
+mapserver-5.6.0-rc1.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- mapserver.spec	30 Aug 2009 21:07:09 -0000	1.31
+++ mapserver.spec	4 Dec 2009 18:26:23 -0000	1.32
@@ -1,11 +1,11 @@
 Name:           mapserver
-Version:        5.4.2
-Release:        1%{?dist}
+Version:        5.6.0
+Release:        rc1_1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
 URL:            http://mapserver.gis.umn.edu
-Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
+Source:         http://download.osgeo.org/mapserver/mapserver-%{version}-rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd
 Requires:       bitstream-vera-sans-fonts
@@ -69,7 +69,7 @@ The Java/Mapscript extension provides fu
 within the Java programming language.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 # fix spurious perm bits
 chmod -x tests/home.png
 chmod -x mapscript/php3/php_mapscript.c
@@ -239,6 +239,10 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Fri Dec 4 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.6.0-rc1-1
+- Update to 5.6.0-rc1, which includes fixes described in:
+  http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-0-rc1/mapserver/HISTORY.TXT
+
 * Mon Aug 31 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.4.2-1
 - Update to 5.4.2, which fixes CVE-2009-0840 and various fixes
   described in :


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	19 Nov 2009 18:57:00 -0000	1.14
+++ sources	4 Dec 2009 18:26:23 -0000	1.15
@@ -1 +1 @@
-7c58bb90f5003fcfaec4320cc652a669  mapserver-5.4.2.tar.gz
+7dbf7151b75af8af87a67741f317bf2f  mapserver-5.6.0-rc1.tar.gz



From devrim at fedoraproject.org  Fri Dec  4 18:29:03 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 18:29:03 +0000 (UTC)
Subject: rpms/grass/devel grass.spec,1.28,1.29
Message-ID: <20091204182903.468C711C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/grass/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5954

Modified Files:
	grass.spec 
Log Message:
- Rebuilt with new geos




Index: grass.spec
===================================================================
RCS file: /cvs/extras/rpms/grass/devel/grass.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- grass.spec	21 Aug 2009 13:45:12 -0000	1.28
+++ grass.spec	4 Dec 2009 18:29:02 -0000	1.29
@@ -1,6 +1,6 @@
 Name:      grass
 Version:   6.3.0
-Release:   14%{?dist}
+Release:   15%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPLv2
@@ -331,6 +331,9 @@ rm -rf %{buildroot}
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Fri Dec 4 2009 Devrim G?ND?Z <devrim at gunduz.org> - 6.3.0-15
+- Rebuilt with new geos
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.3.0-14
 - rebuilt with new openssl
 



From devrim at fedoraproject.org  Fri Dec  4 18:36:51 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 18:36:51 +0000 (UTC)
Subject: rpms/qgis/devel qgis.spec,1.39,1.40
Message-ID: <20091204183651.490E111C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/qgis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8174

Modified Files:
	qgis.spec 
Log Message:
Rebuild for new Geos.




Index: qgis.spec
===================================================================
RCS file: /cvs/extras/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- qgis.spec	17 Nov 2009 17:06:58 -0000	1.39
+++ qgis.spec	4 Dec 2009 18:36:51 -0000	1.40
@@ -3,7 +3,7 @@
 
 Name: qgis
 Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A user friendly Open Source Geographic Information System
 
 Group: Applications/Engineering
@@ -246,6 +246,9 @@ desktop-file-install --vendor="fedora" \
 
 
 %changelog
+* Fri Dec 04 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.0.2-3
+- Rebuild for new Geos.
+
 * Tue Nov 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-2 
 - -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api (#538119) 
 



From devrim at fedoraproject.org  Fri Dec  4 18:38:40 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 18:38:40 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver.spec,1.32,1.33
Message-ID: <20091204183840.DF85711C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8728

Modified Files:
	mapserver.spec 
Log Message:
Add libxslt-devel to BR



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- mapserver.spec	4 Dec 2009 18:26:23 -0000	1.32
+++ mapserver.spec	4 Dec 2009 18:38:40 -0000	1.33
@@ -11,7 +11,7 @@ Requires:       httpd
 Requires:       bitstream-vera-sans-fonts
 
 BuildRequires:  libXpm-devel
-BuildRequires:  httpd-devel php-devel
+BuildRequires:  httpd-devel php-devel libxslt-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  postgresql-devel mysql-devel java-1.6.0-openjdk-devel
 BuildRequires:  java-devel swig > 1.3.24 java java-1.5.0-gcj-devel



From pbrobinson at fedoraproject.org  Fri Dec  4 18:40:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Dec 2009 18:40:03 +0000 (UTC)
Subject: File gssdp-0.7.1.tar.gz uploaded to lookaside cache by pbrobinson
Message-ID: <20091204184003.6BFD010F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gssdp:

725c32e8f92a072cc34f0e091937df2a  gssdp-0.7.1.tar.gz



From pbrobinson at fedoraproject.org  Fri Dec  4 18:42:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Dec 2009 18:42:22 +0000 (UTC)
Subject: rpms/gssdp/devel .cvsignore, 1.6, 1.7 gssdp.spec, 1.15, 1.16 sources,
	1.6, 1.7
Message-ID: <20091204184222.CB4C911C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9985

Modified Files:
	.cvsignore gssdp.spec sources 
Log Message:
- Update to 0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Sep 2009 13:24:35 -0000	1.6
+++ .cvsignore	4 Dec 2009 18:42:22 -0000	1.7
@@ -1 +1 @@
-gssdp-0.7.0.tar.gz
+gssdp-0.7.1.tar.gz


Index: gssdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/gssdp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gssdp.spec	17 Sep 2009 15:12:50 -0000	1.15
+++ gssdp.spec	4 Dec 2009 18:42:22 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gssdp
-Version:        0.7.0
-Release:        2%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Resource discovery and announcement over SSDP
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Dec  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.7.1-1
+- Update to 0.7.1
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-2
 - Remove unneeded libglade BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Sep 2009 13:24:35 -0000	1.6
+++ sources	4 Dec 2009 18:42:22 -0000	1.7
@@ -1 +1 @@
-dd21e0898adfe9277fd5cb2ec9a8fbd7  gssdp-0.7.0.tar.gz
+725c32e8f92a072cc34f0e091937df2a  gssdp-0.7.1.tar.gz



From pbrobinson at fedoraproject.org  Fri Dec  4 18:42:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Dec 2009 18:42:58 +0000 (UTC)
Subject: File gupnp-0.13.2.tar.gz uploaded to lookaside cache by pbrobinson
Message-ID: <20091204184258.EEA8810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gupnp:

eca3f79b32deb43f5de752d6cf2c160d  gupnp-0.13.2.tar.gz



From kyle at fedoraproject.org  Fri Dec  4 18:43:44 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 18:43:44 +0000 (UTC)
Subject: rpms/microcode_ctl/devel microcode_ctl.init, 1.16,
	1.17 microcode_ctl.spec, 1.56, 1.57
Message-ID: <20091204184344.2F05C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/microcode_ctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10482

Modified Files:
	microcode_ctl.init microcode_ctl.spec 
Log Message:
* Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.57
- Fix duplicate message pointed out by Edward Sheldrake.



Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- microcode_ctl.init	4 Dec 2009 17:32:38 -0000	1.16
+++ microcode_ctl.init	4 Dec 2009 18:43:44 -0000	1.17
@@ -30,8 +30,6 @@ function start ()
 		return
 	fi
 
-	echo -n $"Applying Intel CPU microcode update: "
-
 	if [ ! -e $DATAFILE ]; then 
 		echo $"$0: CPU microcode data file not present ($DATAFILE)"
 		exit 1


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- microcode_ctl.spec	4 Dec 2009 17:32:38 -0000	1.56
+++ microcode_ctl.spec	4 Dec 2009 18:43:44 -0000	1.57
@@ -101,6 +101,9 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.57
+- Fix duplicate message pointed out by Edward Sheldrake.
+
 * Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.56
 - Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
   Doesn't need microcode_ctl modifications as it's loaded by



From kyle at fedoraproject.org  Fri Dec  4 18:44:24 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 18:44:24 +0000 (UTC)
Subject: rpms/microcode_ctl/F-11 microcode_ctl.init, 1.14,
	1.15 microcode_ctl.spec, 1.52, 1.53
Message-ID: <20091204184424.1B3C511C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/microcode_ctl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10718

Modified Files:
	microcode_ctl.init microcode_ctl.spec 
Log Message:
* Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.53
- Copy initscript fix from devel/ (#527701)
- Fix duplicate message pointed out by Edward Sheldrake.



Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-11/microcode_ctl.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- microcode_ctl.init	4 Dec 2009 17:40:21 -0000	1.14
+++ microcode_ctl.init	4 Dec 2009 18:44:23 -0000	1.15
@@ -30,8 +30,6 @@ function start ()
 		return
 	fi
 
-	echo -n $"Applying Intel CPU microcode update: "
-
 	if [ ! -e $DATAFILE ]; then 
 		echo $"$0: CPU microcode data file not present ($DATAFILE)"
 		exit 1
@@ -56,6 +54,7 @@ function start ()
 
 stop()
 {
+	return
 }
 
 case "$1" in


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-11/microcode_ctl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- microcode_ctl.spec	4 Dec 2009 17:40:21 -0000	1.52
+++ microcode_ctl.spec	4 Dec 2009 18:44:24 -0000	1.53
@@ -99,6 +99,10 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.53
+- Copy initscript fix from devel/ (#527701)
+- Fix duplicate message pointed out by Edward Sheldrake.
+
 * Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.52
 - Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
   Doesn't need microcode_ctl modifications as it's loaded by



From kyle at fedoraproject.org  Fri Dec  4 18:44:27 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  4 Dec 2009 18:44:27 +0000 (UTC)
Subject: rpms/microcode_ctl/F-12 microcode_ctl.init, 1.16,
	1.17 microcode_ctl.spec, 1.56, 1.57
Message-ID: <20091204184427.A259511C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/microcode_ctl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10774

Modified Files:
	microcode_ctl.init microcode_ctl.spec 
Log Message:
* Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.57
- Copy initscript fix from devel/ (#527701)
- Fix duplicate message pointed out by Edward Sheldrake.



Index: microcode_ctl.init
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/microcode_ctl.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- microcode_ctl.init	4 Dec 2009 17:34:40 -0000	1.16
+++ microcode_ctl.init	4 Dec 2009 18:44:27 -0000	1.17
@@ -30,8 +30,6 @@ function start ()
 		return
 	fi
 
-	echo -n $"Applying Intel CPU microcode update: "
-
 	if [ ! -e $DATAFILE ]; then 
 		echo $"$0: CPU microcode data file not present ($DATAFILE)"
 		exit 1
@@ -56,6 +54,7 @@ function start ()
 
 stop()
 {
+	return
 }
 
 case "$1" in


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/microcode_ctl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- microcode_ctl.spec	4 Dec 2009 17:34:40 -0000	1.56
+++ microcode_ctl.spec	4 Dec 2009 18:44:27 -0000	1.57
@@ -101,6 +101,10 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.57
+- Copy initscript fix from devel/ (#527701)
+- Fix duplicate message pointed out by Edward Sheldrake.
+
 * Wed Dec 02 2009 Kyle McMartin <kyle at redhat.com> 1.17-1.56
 - Add AMD x86/x86-64 microcode. (Dated: 2009-10-09)
   Doesn't need microcode_ctl modifications as it's loaded by



From pbrobinson at fedoraproject.org  Fri Dec  4 18:44:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Dec 2009 18:44:37 +0000 (UTC)
Subject: rpms/gupnp/devel .cvsignore, 1.11, 1.12 gupnp.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20091204184437.9434111C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10851

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
- Update to 0.13.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Oct 2009 21:33:06 -0000	1.11
+++ .cvsignore	4 Dec 2009 18:44:37 -0000	1.12
@@ -1 +1 @@
-gupnp-0.13.1.tar.gz
+gupnp-0.13.2.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gupnp.spec	7 Oct 2009 21:33:07 -0000	1.27
+++ gupnp.spec	4 Dec 2009 18:44:37 -0000	1.28
@@ -1,5 +1,5 @@
 Name:           gupnp
-Version:        0.13.1
+Version:        0.13.2
 Release:        1%{?dist}
 Summary:        A framework for creating UPnP devices & control points
 
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Dev  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.2-1
+- Update to 0.13.2
+
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.1-1
 - Update to 0.13.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Oct 2009 21:33:07 -0000	1.11
+++ sources	4 Dec 2009 18:44:37 -0000	1.12
@@ -1 +1 @@
-9b5fcf8146ba9a2bd84382f61717aa0e  gupnp-0.13.1.tar.gz
+eca3f79b32deb43f5de752d6cf2c160d  gupnp-0.13.2.tar.gz



From pbrobinson at fedoraproject.org  Fri Dec  4 18:45:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Dec 2009 18:45:09 +0000 (UTC)
Subject: rpms/gupnp/devel gupnp.spec,1.28,1.29
Message-ID: <20091204184509.6EB0511C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11053

Modified Files:
	gupnp.spec 
Log Message:
- Update to 0.13.2


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gupnp.spec	4 Dec 2009 18:44:37 -0000	1.28
+++ gupnp.spec	4 Dec 2009 18:45:09 -0000	1.29
@@ -85,7 +85,7 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
-* Fri Dev  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.2-1
+* Fri Dec  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.2-1
 - Update to 0.13.2
 
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.1-1



From pbrobinson at fedoraproject.org  Fri Dec  4 18:48:32 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  4 Dec 2009 18:48:32 +0000 (UTC)
Subject: rpms/gssdp/F-12 .cvsignore, 1.6, 1.7 gssdp.spec, 1.15, 1.16 sources,
	1.6, 1.7
Message-ID: <20091204184832.3B72B11C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12545

Modified Files:
	.cvsignore gssdp.spec sources 
Log Message:
- Update to 0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Sep 2009 13:24:35 -0000	1.6
+++ .cvsignore	4 Dec 2009 18:48:32 -0000	1.7
@@ -1 +1 @@
-gssdp-0.7.0.tar.gz
+gssdp-0.7.1.tar.gz


Index: gssdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/F-12/gssdp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gssdp.spec	17 Sep 2009 15:12:50 -0000	1.15
+++ gssdp.spec	4 Dec 2009 18:48:32 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gssdp
-Version:        0.7.0
-Release:        2%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Resource discovery and announcement over SSDP
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Dec  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.7.1-1
+- Update to 0.7.1
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-2
 - Remove unneeded libglade BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Sep 2009 13:24:35 -0000	1.6
+++ sources	4 Dec 2009 18:48:32 -0000	1.7
@@ -1 +1 @@
-dd21e0898adfe9277fd5cb2ec9a8fbd7  gssdp-0.7.0.tar.gz
+725c32e8f92a072cc34f0e091937df2a  gssdp-0.7.1.tar.gz



From mclasen at fedoraproject.org  Fri Dec  4 18:49:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 18:49:42 +0000 (UTC)
Subject: File at-spi-1.29.3.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091204184942.417B110F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for at-spi:

bb3f199340ba559a1de8746f58676a11  at-spi-1.29.3.tar.bz2



From devrim at fedoraproject.org  Fri Dec  4 18:50:57 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 18:50:57 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver.spec,1.33,1.34
Message-ID: <20091204185057.A6DF011C03DB@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13771

Modified Files:
	mapserver.spec 
Log Message:
Add pam-devel to BR



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- mapserver.spec	4 Dec 2009 18:38:40 -0000	1.33
+++ mapserver.spec	4 Dec 2009 18:50:56 -0000	1.34
@@ -11,7 +11,7 @@ Requires:       httpd
 Requires:       bitstream-vera-sans-fonts
 
 BuildRequires:  libXpm-devel
-BuildRequires:  httpd-devel php-devel libxslt-devel
+BuildRequires:  httpd-devel php-devel libxslt-devel pam-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  postgresql-devel mysql-devel java-1.6.0-openjdk-devel
 BuildRequires:  java-devel swig > 1.3.24 java java-1.5.0-gcj-devel



From devrim at fedoraproject.org  Fri Dec  4 18:59:42 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 18:59:42 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver.spec,1.34,1.35
Message-ID: <20091204185942.9AD0E11C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16491

Modified Files:
	mapserver.spec 
Log Message:
Add readline-devel to BR...



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- mapserver.spec	4 Dec 2009 18:50:56 -0000	1.34
+++ mapserver.spec	4 Dec 2009 18:59:42 -0000	1.35
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Requires:       httpd
 Requires:       bitstream-vera-sans-fonts
 
-BuildRequires:  libXpm-devel
+BuildRequires:  libXpm-devel readline-devel
 BuildRequires:  httpd-devel php-devel libxslt-devel pam-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  postgresql-devel mysql-devel java-1.6.0-openjdk-devel



From devrim at fedoraproject.org  Fri Dec  4 19:15:28 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 19:15:28 +0000 (UTC)
Subject: File proj-4.7.0.tar.gz uploaded to lookaside cache by devrim
Message-ID: <20091204191528.2D95D10F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for proj:

927d34623b52e0209ba2bfcca18fe8cd  proj-4.7.0.tar.gz



From devrim at fedoraproject.org  Fri Dec  4 19:16:21 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 19:16:21 +0000 (UTC)
Subject: File proj-datumgrid-1.5.zip uploaded to lookaside cache by devrim
Message-ID: <20091204191621.D3E7B10F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for proj:

f5bf28a2a9c6afe9a3f670f0c0adb783  proj-datumgrid-1.5.zip



From devrim at fedoraproject.org  Fri Dec  4 19:18:35 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 19:18:35 +0000 (UTC)
Subject: rpms/proj/devel .cvsignore, 1.7, 1.8 proj.spec, 1.18, 1.19 sources, 
	1.7, 1.8
Message-ID: <20091204191835.AF3D911C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/proj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21573

Modified Files:
	.cvsignore proj.spec sources 
Log Message:
- Update to 4.7.0
- Update to new datumgrid (1.5)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Sep 2008 11:48:03 -0000	1.7
+++ .cvsignore	4 Dec 2009 19:18:35 -0000	1.8
@@ -1,2 +1,2 @@
-proj-4.6.1.tar.gz
-proj-datumgrid-1.4.zip
+proj-4.7.0.tar.gz
+proj-datumgrid-1.5.zip


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- proj.spec	26 Jul 2009 19:28:33 -0000	1.18
+++ proj.spec	4 Dec 2009 19:18:35 -0000	1.19
@@ -1,31 +1,31 @@
-Name:      proj
-Version:   4.6.1
-Release:   3%{?dist}
-Summary:   Cartographic projection software (PROJ.4)
-
-Group:     Applications/Engineering
-License:   MIT
-URL:       http://proj.osgeo.org
-Source0:   http://download.osgeo.org/proj/proj-%{version}.tar.gz
-Source1:   http://download.osgeo.org/proj/proj-datumgrid-1.4.zip
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		proj
+Version:	4.7.0
+Release:	1%{?dist}
+Summary:	Cartographic projection software (PROJ.4)
+
+Group:		Applications/Engineering
+License:	MIT
+URL:		http://proj.osgeo.org
+Source0:	http://download.osgeo.org/proj/proj-%{version}.tar.gz
+Source1:	http://download.osgeo.org/proj/proj-datumgrid-1.5.zip
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libtool
+BuildRequires:	libtool
 
 %package devel
-Summary: Development files for PROJ.4
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary:	Development files for PROJ.4
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %package nad
-Summary: US and Canadian datum shift grids for PROJ.4
-Group: Applications/Engineering
-Requires: %{name} = %{version}-%{release}
+Summary:	US and Canadian datum shift grids for PROJ.4
+Group:		Applications/Engineering
+Requires:	%{name} = %{version}-%{release}
 
 %package epsg
-Summary: EPSG dataset for PROJ.4
-Group: Applications/Engineering
-Requires: %{name} = %{version}-%{release}
+Summary:	EPSG dataset for PROJ.4
+Group:		Applications/Engineering
+Requires:	%{name} = %{version}-%{release}
 
 %description
 Proj and invproj perform respective forward and inverse transformation of
@@ -122,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_datadir}/%{name}/epsg
 
 %changelog
+* Fri Dec 4 2009 Devrim G?ND?Z <devrim at gunduz.org> 4.7.0-1
+- Update to 4.7.0
+- Update to new datumgrid (1.5)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Sep 2008 11:48:04 -0000	1.7
+++ sources	4 Dec 2009 19:18:35 -0000	1.8
@@ -1,2 +1,2 @@
-7dbaab8431ad50c25669fd3fb28dc493  proj-4.6.1.tar.gz
-a975779e65f1125a28f55f9d18b4333d  proj-datumgrid-1.4.zip
+927d34623b52e0209ba2bfcca18fe8cd  proj-4.7.0.tar.gz
+f5bf28a2a9c6afe9a3f670f0c0adb783  proj-datumgrid-1.5.zip



From shakthimaan at fedoraproject.org  Fri Dec  4 19:27:46 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri,  4 Dec 2009 19:27:46 +0000 (UTC)
Subject: File vrq-1.0.67.tar.gz uploaded to lookaside cache by shakthimaan
Message-ID: <20091204192746.79A3D10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for vrq:

31d9dd089c7d59d902deffe9fcb51ede  vrq-1.0.67.tar.gz



From shakthimaan at fedoraproject.org  Fri Dec  4 19:29:00 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri,  4 Dec 2009 19:29:00 +0000 (UTC)
Subject: rpms/vrq/devel .cvsignore, 1.6, 1.7 import.log, 1.6, 1.7 sources,
	1.6, 1.7 vrq.spec, 1.5, 1.6
Message-ID: <20091204192900.97C4511C00E0@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24792/devel

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to upstream vrq-1.0.67 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Nov 2009 18:04:42 -0000	1.6
+++ .cvsignore	4 Dec 2009 19:29:00 -0000	1.7
@@ -1 +1 @@
-vrq-1.0.65.tar.gz
+vrq-1.0.67.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	9 Nov 2009 18:04:42 -0000	1.6
+++ import.log	4 Dec 2009 19:29:00 -0000	1.7
@@ -4,3 +4,4 @@ vrq-1_0_62-1_fc11:HEAD:vrq-1.0.62-1.fc11
 vrq-1_0_62-1_fc11:HEAD:vrq-1.0.62-1.fc11.src.rpm:1255712917
 vrq-1_0_63-1_fc11:HEAD:vrq-1.0.63-1.fc11.src.rpm:1256471225
 vrq-1_0_65-1_fc11:HEAD:vrq-1.0.65-1.fc11.src.rpm:1257790300
+vrq-1_0_67-1_fc12:HEAD:vrq-1.0.67-1.fc12.src.rpm:1259955384


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Nov 2009 18:04:42 -0000	1.6
+++ sources	4 Dec 2009 19:29:00 -0000	1.7
@@ -1 +1 @@
-7ebc6f324ddc8515d5b4fb1d889e4692  vrq-1.0.65.tar.gz
+31d9dd089c7d59d902deffe9fcb51ede  vrq-1.0.67.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/vrq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vrq.spec	9 Nov 2009 18:04:42 -0000	1.5
+++ vrq.spec	4 Dec 2009 19:29:00 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.65
+Version:        1.0.67
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Wed Dec 04 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.67-1
+- Updated to upstream package 1.0.67
+
 * Mon Nov 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.65-1
 - Updated to upstream package 1.0.65
 



From devrim at fedoraproject.org  Fri Dec  4 19:30:07 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 19:30:07 +0000 (UTC)
Subject: File gdal-1.6.3.tar.gz uploaded to lookaside cache by devrim
Message-ID: <20091204193007.BD73A10F894@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gdal:

a8aade344a29ae4a92a0f17cc33f561a  gdal-1.6.3.tar.gz



From shakthimaan at fedoraproject.org  Fri Dec  4 19:31:24 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri,  4 Dec 2009 19:31:24 +0000 (UTC)
Subject: rpms/vrq/F-11 .cvsignore, 1.6, 1.7 import.log, 1.5, 1.6 sources, 1.6,
	1.7 vrq.spec, 1.5, 1.6
Message-ID: <20091204193124.BE36011C00E0@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25727/F-11

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to upstream 1.0.67 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Nov 2009 18:13:10 -0000	1.6
+++ .cvsignore	4 Dec 2009 19:31:24 -0000	1.7
@@ -1 +1 @@
-vrq-1.0.65.tar.gz
+vrq-1.0.67.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	9 Nov 2009 18:13:10 -0000	1.5
+++ import.log	4 Dec 2009 19:31:24 -0000	1.6
@@ -3,3 +3,4 @@ vrq-1_0_61-1_fc11:F-11:vrq-1.0.61-1.fc11
 vrq-1_0_62-1_fc11:F-11:vrq-1.0.62-1.fc11.src.rpm:1255713227
 vrq-1_0_63-1_fc11:F-11:vrq-1.0.63-1.fc11.src.rpm:1256471645
 vrq-1_0_65-1_fc11:F-11:vrq-1.0.65-1.fc11.src.rpm:1257790773
+vrq-1_0_67-1_fc12:F-11:vrq-1.0.67-1.fc12.src.rpm:1259955535


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Nov 2009 18:13:10 -0000	1.6
+++ sources	4 Dec 2009 19:31:24 -0000	1.7
@@ -1 +1 @@
-7ebc6f324ddc8515d5b4fb1d889e4692  vrq-1.0.65.tar.gz
+31d9dd089c7d59d902deffe9fcb51ede  vrq-1.0.67.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/vrq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vrq.spec	9 Nov 2009 18:13:10 -0000	1.5
+++ vrq.spec	4 Dec 2009 19:31:24 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.65
+Version:        1.0.67
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Wed Dec 04 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.67-1
+- Updated to upstream package 1.0.67
+
 * Mon Nov 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.65-1
 - Updated to upstream package 1.0.65
 



From shakthimaan at fedoraproject.org  Fri Dec  4 19:34:32 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri,  4 Dec 2009 19:34:32 +0000 (UTC)
Subject: rpms/vrq/F-12 .cvsignore, 1.6, 1.7 import.log, 1.4, 1.5 sources, 1.6,
	1.7 vrq.spec, 1.5, 1.6
Message-ID: <20091204193432.4969C11C00E0@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26572/F-12

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to upstream 1.0.67 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Nov 2009 18:15:06 -0000	1.6
+++ .cvsignore	4 Dec 2009 19:34:29 -0000	1.7
@@ -1 +1 @@
-vrq-1.0.65.tar.gz
+vrq-1.0.67.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	9 Nov 2009 18:15:06 -0000	1.4
+++ import.log	4 Dec 2009 19:34:30 -0000	1.5
@@ -2,3 +2,4 @@ vrq-1_0_61-1_fc11:F-12:vrq-1.0.61-1.fc11
 vrq-1_0_62-1_fc11:F-12:vrq-1.0.62-1.fc11.src.rpm:1255713304
 vrq-1_0_63-1_fc11:F-12:vrq-1.0.63-1.fc11.src.rpm:1256471760
 vrq-1_0_65-1_fc11:F-12:vrq-1.0.65-1.fc11.src.rpm:1257790930
+vrq-1_0_67-1_fc12:F-12:vrq-1.0.67-1.fc12.src.rpm:1259955672


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Nov 2009 18:15:06 -0000	1.6
+++ sources	4 Dec 2009 19:34:31 -0000	1.7
@@ -1 +1 @@
-7ebc6f324ddc8515d5b4fb1d889e4692  vrq-1.0.65.tar.gz
+31d9dd089c7d59d902deffe9fcb51ede  vrq-1.0.67.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/vrq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vrq.spec	9 Nov 2009 18:15:06 -0000	1.5
+++ vrq.spec	4 Dec 2009 19:34:31 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.65
+Version:        1.0.67
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Wed Dec 04 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.67-1
+- Updated to upstream package 1.0.67
+
 * Mon Nov 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.65-1
 - Updated to upstream package 1.0.65
 



From jlayton at fedoraproject.org  Fri Dec  4 19:35:54 2009
From: jlayton at fedoraproject.org (Jeff Layton)
Date: Fri,  4 Dec 2009 19:35:54 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.1-cel-ipv6.patch, 1.1.2.1,
	1.1.2.2 nfs-utils.spec, 1.253.2.2,
	1.253.2.3 nfs-utils-1.2.1-relax-insecure-option.patch, 1.1.2.1, NONE
Message-ID: <20091204193554.B294411C00E0@cvs1.fedora.phx.redhat.com>

Author: jlayton

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27141

Modified Files:
      Tag: private-jlayton-ipv6-3
	nfs-utils-1.2.1-cel-ipv6.patch nfs-utils.spec 
Removed Files:
      Tag: private-jlayton-ipv6-3
	nfs-utils-1.2.1-relax-insecure-option.patch 
Log Message:
Remove server-side bits since they're not quite baked yet


nfs-utils-1.2.1-cel-ipv6.patch:
 b/.gitignore                    |    9 
 b/aclocal/ipv6.m4               |    4 
 b/aclocal/libcap.m4             |   15 
 b/configure.ac                  |    1 
 b/support/Makefile.am           |    2 
 b/support/include/Makefile.am   |    1 
 b/support/include/compaddr.h    |  109 ++++
 b/support/include/ha-callout.h  |    4 
 b/support/include/nfsrpc.h      |   12 
 b/support/include/nsm.h         |   62 ++
 b/support/include/rpcmisc.h     |    7 
 b/support/include/tcpwrapper.h  |    2 
 b/support/misc/from_local.c     |   20 
 b/support/misc/tcpwrapper.c     |    4 
 b/support/nfs/Makefile.am       |    3 
 b/support/nfs/getport.c         |   91 +++-
 b/support/nfs/svc_create.c      |  252 +++++++++++
 b/support/nsm/Makefile.am       |   45 ++
 b/support/nsm/file.c            |  772 +++++++++++++++++++++++++++++++++++
 b/support/nsm/rpc.c             |  507 +++++++++++++++++++++++
 b/support/nsm/sm_inter.x        |  131 ++++++
 b/utils/mount/network.c         |   30 -
 b/utils/mount/network.h         |    4 
 b/utils/mount/nfs.man           |   86 ++-
 b/utils/mount/nfsumount.c       |    9 
 b/utils/mount/stropts.c         |   53 +-
 b/utils/mountd/mount_dispatch.c |    2 
 b/utils/statd/Makefile.am       |    4 
 b/utils/statd/callback.c        |    4 
 b/utils/statd/hostname.c        |  122 +++++
 b/utils/statd/misc.c            |   12 
 b/utils/statd/monitor.c         |   47 +-
 b/utils/statd/notlist.c         |    4 
 b/utils/statd/rmtcall.c         |   36 -
 b/utils/statd/simu.c            |   10 
 b/utils/statd/simulate.c        |   52 +-
 b/utils/statd/sm-notify.c       |  163 ++-----
 b/utils/statd/sm-notify.man     |    8 
 b/utils/statd/stat.c            |    8 
 b/utils/statd/statd.c           |   57 +-
 b/utils/statd/statd.h           |    9 
 b/utils/statd/statd.man         |  510 ++++++++++++++++-------
 b/utils/statd/svc_run.c         |    7 
 configure.ac                    |    5 
 support/include/nsm.h           |   25 +
 support/include/tcpwrapper.h    |    7 
 support/misc/from_local.c       |   87 +++
 support/misc/tcpwrapper.c       |  170 ++++---
 support/nsm/Makefile.am         |    4 
 support/nsm/file.c              |   50 ++
 utils/mount/network.c           |  100 +++-
 utils/mount/network.h           |    7 
 utils/mount/nfs.man             |    6 
 utils/mount/stropts.c           |   38 +
 utils/mountd/mount_dispatch.c   |    6 
 utils/statd/Makefile.am         |   30 -
 utils/statd/callback.c          |   74 ++-
 utils/statd/hostname.c          |   95 ++++
 utils/statd/log.c               |   95 ----
 utils/statd/log.h               |   42 -
 utils/statd/misc.c              |   24 -
 utils/statd/monitor.c           |  201 +++------
 utils/statd/rmtcall.c           |  145 +-----
 utils/statd/simu.c              |   38 -
 utils/statd/sm-notify.c         |  873 ++++++++++++++++++----------------------
 utils/statd/sm-notify.man       |  435 +++++++++++++------
 utils/statd/sm_inter.x          |  133 ------
 utils/statd/stat.c              |   10 
 utils/statd/statd.c             |  165 ++-----
 utils/statd/statd.h             |   37 -
 utils/statd/statd.man           |   21 
 utils/statd/version.h           |    9 
 72 files changed, 4185 insertions(+), 2037 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1.2.1 -r 1.1.2.2 nfs-utils-1.2.1-cel-ipv6.patchIndex: nfs-utils-1.2.1-cel-ipv6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/Attic/nfs-utils-1.2.1-cel-ipv6.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- nfs-utils-1.2.1-cel-ipv6.patch	3 Dec 2009 20:18:40 -0000	1.1.2.1
+++ nfs-utils-1.2.1-cel-ipv6.patch	4 Dec 2009 19:35:51 -0000	1.1.2.2
@@ -10385,7433 +10385,3 @@ index 84d4122..d64fd8e 100644
  		return 0;
  	}
  
--------------------------------------------------------------------------------
-libexport-a-remove-dead-code
--------------------------------------------------------------------------------
-libexport.a: Remove dead code
-
-From: Chuck Lever <chuck.lever at oracle.com>
-
-Clean up:  I can't find any call sites for client_find() or
-client_match().
-
-Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
----
-
- support/export/client.c    |   22 ----------------------
- support/include/exportfs.h |    2 --
- 2 files changed, 0 insertions(+), 24 deletions(-)
-
-
-diff --git a/support/export/client.c b/support/export/client.c
-index 5fcf355..2af07da 100644
---- a/support/export/client.c
-+++ b/support/export/client.c
-@@ -211,28 +211,6 @@ client_freeall(void)
- 	}
- }
- 
--nfs_client *
--client_find(struct hostent *hp)
--{
--	nfs_client	*clp;
--	int		i;
--
--	for (i = 0; i < MCL_MAXTYPES; i++) {
--		for (clp = clientlist[i]; clp; clp = clp->m_next) {
--			if (!client_check(clp, hp))
--				continue;
--#ifdef notdef
--			if (clp->m_type == MCL_FQDN)
--				return clp;
--			return client_dup(clp, hp);
--#else
--			return clp;
--#endif
--		}
--	}
--	return NULL;
--}
--
- struct hostent *
- client_resolve(struct in_addr addr)
- {
-diff --git a/support/include/exportfs.h b/support/include/exportfs.h
-index 1ad41e2..ef96a02 100644
---- a/support/include/exportfs.h
-+++ b/support/include/exportfs.h
-@@ -80,12 +80,10 @@ extern exp_hash_table exportlist[MCL_MAXTYPES];
- extern nfs_client *		clientlist[MCL_MAXTYPES];
- 
- nfs_client *			client_lookup(char *hname, int canonical);
--nfs_client *			client_find(struct hostent *);
- void				client_add(nfs_client *);
- nfs_client *			client_dup(nfs_client *, struct hostent *);
- int				client_gettype(char *hname);
- int				client_check(nfs_client *, struct hostent *);
--int				client_match(nfs_client *, char *hname);
- void				client_release(nfs_client *);
- void				client_freeall(void);
- char *				client_compose(struct hostent *he);
--------------------------------------------------------------------------------
-libexport-a-eliminate-nfs_clie
--------------------------------------------------------------------------------
-libexport.a: Eliminate nfs_client.m_count field
-
-From: Chuck Lever <chuck.lever at oracle.com>
-
-Since nfs_client records are not garbage collected, there doesn't seem
-to be any real need to maintain a reference count for each record.
-
-In addition to removing nominally dead code, this commit gets rid of a
-site where a mountd or exportfs process can exit suddenly due to a
-software bug.
-
-Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
----
-
- support/export/client.c    |    9 ---------
- support/export/export.c    |    3 ---
- support/include/exportfs.h |    2 --
- 3 files changed, 0 insertions(+), 14 deletions(-)
-
-
-diff --git a/support/export/client.c b/support/export/client.c
-index 2af07da..b08dda2 100644
---- a/support/export/client.c
-+++ b/support/export/client.c
-@@ -135,7 +135,6 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
- 		clp->m_hostname = xstrdup(hname);
- 
- 	clp->m_exported = 0;
--	clp->m_count = 0;
- 
- 	if (clp->m_type == MCL_SUBNETWORK) {
- 		char	*cp = strchr(clp->m_hostname, '/');
-@@ -188,14 +187,6 @@ client_add(nfs_client *clp)
- }
- 
- void
--client_release(nfs_client *clp)
--{
--	if (clp->m_count <= 0)
--		xlog(L_FATAL, "client_free: m_count <= 0!");
--	clp->m_count--;
--}
--
--void
- client_freeall(void)
- {
- 	nfs_client	*clp, **head;
-diff --git a/support/export/export.c b/support/export/export.c
-index e5e6cb0..f5846d0 100644
---- a/support/export/export.c
-+++ b/support/export/export.c
-@@ -95,7 +95,6 @@ export_init(nfs_export *exp, nfs_client *clp, struct exportent *nep)
- 	exp->m_changed = 0;
- 	exp->m_warned = 0;
- 	exp->m_client = clp;
--	clp->m_count++;
- }
- 
- /*
-@@ -115,7 +114,6 @@ export_dup(nfs_export *exp, struct hostent *hp)
- 	if (exp->m_export.e_hostname)
- 		new->m_export.e_hostname = xstrdup(exp->m_export.e_hostname);
- 	clp = client_dup(exp->m_client, hp);
--	clp->m_count++;
- 	new->m_client = clp;
- 	new->m_mayexport = exp->m_mayexport;
- 	new->m_exported = 0;
-@@ -266,7 +264,6 @@ export_freeall(void)
- 	for (i = 0; i < MCL_MAXTYPES; i++) {
- 		for (exp = exportlist[i].p_head; exp; exp = nxt) {
- 			nxt = exp->m_next;
--			client_release(exp->m_client);
- 			if (exp->m_export.e_squids)
- 				xfree(exp->m_export.e_squids);
- 			if (exp->m_export.e_sqgids)
-diff --git a/support/include/exportfs.h b/support/include/exportfs.h
-index ef96a02..6dec3d6 100644
---- a/support/include/exportfs.h
-+++ b/support/include/exportfs.h
-@@ -48,7 +48,6 @@ typedef struct mclient {
- 	int			m_naddr;
- 	struct in_addr		m_addrlist[NFSCLNT_ADDRMAX];
- 	int			m_exported;	/* exported to nfsd */
--	int			m_count;
- } nfs_client;
- 
- typedef struct mexport {
-@@ -84,7 +83,6 @@ void				client_add(nfs_client *);
- nfs_client *			client_dup(nfs_client *, struct hostent *);
- int				client_gettype(char *hname);
- int				client_check(nfs_client *, struct hostent *);
--void				client_release(nfs_client *);
- void				client_freeall(void);
- char *				client_compose(struct hostent *he);
- struct hostent *		client_resolve(struct in_addr addr);
--------------------------------------------------------------------------------
-libexport-a-clean-up-client_co
--------------------------------------------------------------------------------
-libexport.a: Clean up client_compose() and client_member()
-
-From: Chuck Lever <chuck.lever at oracle.com>
-
-Clean up:  Replace outdated comments, and fix some function
-declarations.
-
-Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
----
-
- support/export/client.c |   32 +++++++++++++++++++++-----------
- 1 files changed, 21 insertions(+), 11 deletions(-)
-
-
-diff --git a/support/export/client.c b/support/export/client.c
-index b08dda2..179471f 100644
---- a/support/export/client.c
-+++ b/support/export/client.c
-@@ -28,6 +28,8 @@
[...7042 lines suppressed...]
-+Specify a high availability callout program.
-+This program receives callouts for all MOUNT and UNMOUNT requests.
-+This allows 
-+.B rpc.mountd
-+to be used in a High Availability NFS (HA-NFS) environment.
-+.IP
-+The callout program is run with 4 arguments.
-+The first is
- .B mount
- or
- .B unmount
-@@ -118,19 +146,30 @@ The second will be the name of the client performing the mount.
- The third will be the path that the client is mounting.
- The last is the number of concurrent mounts that we believe the client
- has of that path.
-+.IP
-+This callout is not needed with 2.6 and later kernels.
-+Instead, mount the nfsd filesystem on
-+.IR /proc/fs/nfsd .
- .TP
- .BI "\-s," "" " \-\-state\-directory\-path "  directory
--specify a directory in which to place statd state information.
-+Specify a directory in which to place statd state information.
- If this option is not specified the default of
--.BR /var/lib/nfs
-+.I /var/lib/nfs
- is used.
- .TP
- .BI "\-r," "" " \-\-reverse\-lookup"
--mountd tracks IP addresses in the rmtab, and when a DUMP request is made (by
--someone running showmount -a, for instance), it returns IP addresses instead
--of hostnames by default. This option causes mountd to do a reverse
--lookup on each IP address and return that hostname instead. Enabling this can
--have a substantial negative effect on performance in some situations.
-+.B rpc.mountd
-+tracks IP addresses in the
-+.I rmtab
-+file.  When a DUMP request is made (by
-+someone running
-+.BR "showmount -a" ,
-+for instance), it returns IP addresses instead
-+of hostnames by default. This option causes
-+.B rpc.mountd
-+to perform a reverse lookup on each IP address and return that hostname instead.
-+Enabling this can have a substantial negative effect on performance
-+in some situations.
- .TP
- .BR "\-t N" " or " "\-\-num\-threads=N"
- This option specifies the number of worker threads that rpc.mountd
-@@ -162,41 +201,70 @@ If you use the
- flag, then the list of group ids received from the client will be
- replaced by a list of group ids determined by an appropriate lookup on
- the server. Note that the 'primary' group id is not affected so a
--.I newgroup
-+.B newgroup
- command on the client will still be effective.  This function requires
- a Linux Kernel with version at least 2.6.21.
--
- .SH TCP_WRAPPERS SUPPORT
--This
-+You can protect your
- .B rpc.mountd
--version is protected by the
-+listeners using the
-+.B tcp_wrapper
-+library or
-+.BR iptables (8).
-+.PP
-+Note that the
- .B tcp_wrapper
--library. You have to give the clients access to
--.B rpc.mountd
--if they should be allowed to use it. To allow connects from clients of
--the .bar.com domain you could use the following line in /etc/hosts.allow:
--
--mountd: .bar.com
--
--You have to use the daemon name 
-+library supports only IPv4 networking.
-+.PP
-+Add the hostnames of NFS peers that are allowed to access
-+.B rpc.mountd
-+to
-+.IR /etc/hosts.allow .
-+Use the daemon name
- .B mountd
--for the daemon name (even if the binary has a different name).
--.B Note:
--hostnames used in either access file will be ignored when
-+even if the
-+.B rpc.mountd
-+binary has a different name.
-+.PP
-+Hostnames used in either access file will be ignored when
- they can not be resolved into IP addresses.
--
--For further information please have a look at the
-+For further information see the
- .BR tcpd (8)
- and
- .BR hosts_access (5)
--manual pages.
-+man pages.
-+.SS IPv6 and TI-RPC support
-+TI-RPC is a pre-requisite for supporting NFS on IPv6.
-+If TI-RPC support is built into
-+.BR rpc.mountd ,
-+it attempts to start listeners on network transports marked 'visible' in
-+.IR /etc/netconfig .
-+As long as at least one network transport listener starts successfully,
-+.B rpc.mountd
-+will operate.
-+.SH FILES
-+.TP 2.5i
-+.I /etc/exports
-+input file for
-+.BR exportfs ,
-+listing exports, export options, and access control lists
-+.TP 2.5i
-+.I /var/lib/nfs/rmtab
-+table of clients accessing server's exports
- .SH SEE ALSO
--.BR rpc.nfsd (8),
- .BR exportfs (8),
- .BR exports (5),
--.BR rpc.rquotad (8).
--.SH FILES
--.BR /etc/exports ,
--.BR /var/lib/nfs/xtab .
-+.BR showmount (8),
-+.BR rpc.nfsd (8),
-+.BR rpc.rquotad (8),
-+.BR nfs (5),
-+.BR tcpd (8),
-+.BR hosts_access (5),
-+.BR iptables (8),
-+.BR netconfig (5)
-+.sp
-+RFC 1094 - "NFS: Network File System Protocol Specification"
-+.br
-+RFC 1813 - "NFS Version 3 Protocol Specification"
- .SH AUTHOR
- Olaf Kirch, H. J. Lu, G. Allan Morris III, and a host of others.
--------------------------------------------------------------------------------
-nfsd-revert-commit-b2a3cd59
--------------------------------------------------------------------------------
-nfsd: Revert commit b2a3cd59
-
-From: Chuck Lever <chuck.lever at oracle.com>
-
-Enable IPv6 support in rpc.nfsd again.
-
-Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
----
-
- utils/nfsd/nfsd.c   |    9 ---------
- utils/nfsd/nfssvc.c |    9 ---------
- 2 files changed, 0 insertions(+), 18 deletions(-)
-
-
-diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
-index 1cda1e5..650c593 100644
---- a/utils/nfsd/nfsd.c
-+++ b/utils/nfsd/nfsd.c
-@@ -27,15 +27,6 @@
- #include "nfssvc.h"
- #include "xlog.h"
- 
--/*
-- * IPv6 support for nfsd was finished before some of the other daemons (mountd
-- * and statd in particular). That could be a problem in the future if someone
-- * were to boot a kernel that supports IPv6 serving with  an older nfs-utils. For
-- * now, hardcode the IPv6 switch into the off position until the other daemons
-- * are functional.
-- */
--#undef IPV6_SUPPORTED
--
- static void	usage(const char *);
- 
- static struct option longopts[] =
-diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
-index b8028bb..119135e 100644
---- a/utils/nfsd/nfssvc.c
-+++ b/utils/nfsd/nfssvc.c
-@@ -22,15 +22,6 @@
- #include "nfslib.h"
- #include "xlog.h"
- 
--/*
-- * IPv6 support for nfsd was finished before some of the other daemons (mountd
-- * and statd in particular). That could be a problem in the future if someone
-- * were to boot a kernel that supports IPv6 serving with an older nfs-utils. For
-- * now, hardcode the IPv6 switch into the off position until the other daemons
-- * are functional.
-- */
--#undef IPV6_SUPPORTED
--
- #define NFSD_PORTS_FILE     "/proc/fs/nfsd/portlist"
- #define NFSD_VERS_FILE    "/proc/fs/nfsd/versions"
- #define NFSD_THREAD_FILE  "/proc/fs/nfsd/threads"


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.253.2.2
retrieving revision 1.253.2.3
diff -u -p -r1.253.2.2 -r1.253.2.3
--- nfs-utils.spec	3 Dec 2009 20:37:28 -0000	1.253.2.2
+++ nfs-utils.spec	4 Dec 2009 19:35:54 -0000	1.253.2.3
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 3.ipv6.1%{?dist}
+Release: 3.ipv6.2%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -24,8 +24,7 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
 
 Patch200: nfs-utils-1.2.0-v4root-rel8.patch
 Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
-Patch300: nfs-utils-1.2.1-relax-insecure-option.patch
-Patch301: nfs-utils-1.2.1-cel-ipv6.patch
+Patch300: nfs-utils-1.2.1-cel-ipv6.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -81,7 +80,6 @@ This package also contains the mount.nfs
 %patch201 -p1
 
 %patch300 -p1
-%patch301 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -254,12 +252,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Thu Dec 3 2009 Jeff Layton <jlayton at redhat.com> 1.2.1-3.ipv6.1
+* Fri Dec 4 2009 Jeff Layton <jlayton at redhat.com> 1.2.1-3.ipv6.2
 - remove patches to fix statd/sm-notify paths in old statd
-- add patch to relax "insecure" export option (so that later patches apply
-  cleanly)
-- add patches from Chuck Lever's tree to support IPv6 in statd, mountd and
-  exportfs
+- add patches from Chuck Lever's tree to support IPv6 in statd and mount.nfs
 - enable IPv6 during configuration
 
 * Thu Nov 12 2009 Steve Dickson <steved at redhat.com> 1.2.1-3


--- nfs-utils-1.2.1-relax-insecure-option.patch DELETED ---



From shakthimaan at fedoraproject.org  Fri Dec  4 19:36:53 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri,  4 Dec 2009 19:36:53 +0000 (UTC)
Subject: rpms/vrq/EL-5 .cvsignore, 1.6, 1.7 import.log, 1.5, 1.6 sources, 1.6,
	1.7 vrq.spec, 1.5, 1.6
Message-ID: <20091204193653.D393511C00E0@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27770/EL-5

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to upstream 1.0.67 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Nov 2009 18:07:06 -0000	1.6
+++ .cvsignore	4 Dec 2009 19:36:53 -0000	1.7
@@ -1 +1 @@
-vrq-1.0.65.tar.gz
+vrq-1.0.67.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	9 Nov 2009 18:07:07 -0000	1.5
+++ import.log	4 Dec 2009 19:36:53 -0000	1.6
@@ -3,3 +3,4 @@ vrq-1_0_61-1_fc11:EL-5:vrq-1.0.61-1.fc11
 vrq-1_0_62-1_fc11:EL-5:vrq-1.0.62-1.fc11.src.rpm:1255713045
 vrq-1_0_63-1_fc11:EL-5:vrq-1.0.63-1.fc11.src.rpm:1256471376
 vrq-1_0_65-1_fc11:EL-5:vrq-1.0.65-1.fc11.src.rpm:1257790434
+vrq-1_0_67-1_fc12:EL-5:vrq-1.0.67-1.fc12.src.rpm:1259955865


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Nov 2009 18:07:07 -0000	1.6
+++ sources	4 Dec 2009 19:36:53 -0000	1.7
@@ -1 +1 @@
-7ebc6f324ddc8515d5b4fb1d889e4692  vrq-1.0.65.tar.gz
+31d9dd089c7d59d902deffe9fcb51ede  vrq-1.0.67.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/vrq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vrq.spec	9 Nov 2009 18:07:07 -0000	1.5
+++ vrq.spec	4 Dec 2009 19:36:53 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.65
+Version:        1.0.67
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Wed Dec 04 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.67-1
+- Updated to upstream package 1.0.67
+
 * Mon Nov 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.65-1
 - Updated to upstream package 1.0.65
 



From jjames at fedoraproject.org  Fri Dec  4 19:57:28 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri,  4 Dec 2009 19:57:28 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-12
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,
	1.2, 1.3 xemacs-packages-extra.spec, 1.15, 1.16
Message-ID: <20091204195729.0860411C03E3@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1983/F-12

Modified Files:
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch 
	xemacs-packages-extra.spec 
Log Message:
* Fri Dec  4 2009 Jerry James <loganjerry at gmail.com> - 20090217-7
- Fix one more ediff problem found during testing (bz 537531).


xemacs-packages-extra-20091103-ediff-coding-system-532620.patch:
 ChangeLog     |   45 +++++++++++
 Makefile      |    2 
 ediff-diff.el |   45 +++++------
 ediff-help.el |    6 -
 ediff-hook.el |  137 ++++++++++++++++++-----------------
 ediff-init.el |   71 +++++++++---------
 ediff-merg.el |   36 ++++-----
 ediff-mult.el |  130 +++++++++++++++++++++++++--------
 ediff-ptch.el |   22 ++---
 ediff-util.el |   38 ++++-----
 ediff-vers.el |   27 +++---
 ediff-wind.el |   30 +++----
 ediff.el      |  225 +++++++++++++++++++++++++++++++++++-----------------------
 ediff.texi    |  224 ++++++++++++++++++++++++++++++---------------------------
 14 files changed, 608 insertions(+), 430 deletions(-)

Index: xemacs-packages-extra-20091103-ediff-coding-system-532620.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-12/xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	1 Dec 2009 17:58:49 -0000	1.2
+++ xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	4 Dec 2009 19:57:28 -0000	1.3
@@ -1,6 +1,6 @@
 diff -dur xemacs-packages.ORIG/ediff/ChangeLog xemacs-packages/ediff/ChangeLog
 --- xemacs-packages.ORIG/ediff/ChangeLog	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/ChangeLog	2009-12-01 09:39:07.126858310 -0700
++++ xemacs-packages/ediff/ChangeLog	2009-12-04 12:48:38.679838745 -0700
 @@ -1,3 +1,48 @@
 +2009-11-27  Norbert Koch  <viteno at xemacs.org>
 +
@@ -52,7 +52,7 @@ diff -dur xemacs-packages.ORIG/ediff/Cha
  	* Makefile (VERSION): XEmacs package 1.77 released.
 diff -dur xemacs-packages.ORIG/ediff/ediff-diff.el xemacs-packages/ediff/ediff-diff.el
 --- xemacs-packages.ORIG/ediff/ediff-diff.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-diff.el	2009-12-01 09:39:07.132860465 -0700
++++ xemacs-packages/ediff/ediff-diff.el	2009-12-04 12:48:38.680839121 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-diff.el --- diff-related utilities
  
@@ -207,7 +207,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-diff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.el xemacs-packages/ediff/ediff.el
 --- xemacs-packages.ORIG/ediff/ediff.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff.el	2009-12-01 09:39:07.214982518 -0700
++++ xemacs-packages/ediff/ediff.el	2009-12-04 12:48:38.681838988 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff.el --- a comprehensive visual interface to diff & patch
  
@@ -514,7 +514,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-help.el xemacs-packages/ediff/ediff-help.el
 --- xemacs-packages.ORIG/ediff/ediff-help.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-help.el	2009-08-15 00:16:33.000000000 -0600
++++ xemacs-packages/ediff/ediff-help.el	2009-12-04 12:48:38.682839151 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
  
@@ -544,7 +544,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-hook.el xemacs-packages/ediff/ediff-hook.el
 --- xemacs-packages.ORIG/ediff/ediff-hook.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff-hook.el	2009-12-01 09:39:07.134857315 -0700
++++ xemacs-packages/ediff/ediff-hook.el	2009-12-04 12:48:38.682839151 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
  
@@ -751,7 +751,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-init.el xemacs-packages/ediff/ediff-init.el
 --- xemacs-packages.ORIG/ediff/ediff-init.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-init.el	2009-12-01 09:39:07.140861277 -0700
++++ xemacs-packages/ediff/ediff-init.el	2009-12-04 12:50:03.743022940 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
  
@@ -969,8 +969,14 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    :type 'integer
    :group 'ediff)
  
-@@ -1549,6 +1551,9 @@
-       (if (eventp event-or-key) (event-key event-or-key) event-or-key)
+@@ -1545,10 +1547,13 @@
+ 	(t (error "Error"))))
+ 
+ (defun ediff-event-key (event-or-key)
+-  (if (featurep 'xemacs)
+-      (if (eventp event-or-key) (event-key event-or-key) event-or-key)
++  (if (and (featurep 'xemacs) (eventp event-or-key))
++      (event-to-character event-or-key t t)
      event-or-key))
  
 +(defun ediff-last-command-char ()
@@ -981,7 +987,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    (and (ediff-window-display-p) (frame-live-p frame)
 diff -dur xemacs-packages.ORIG/ediff/ediff-merg.el xemacs-packages/ediff/ediff-merg.el
 --- xemacs-packages.ORIG/ediff/ediff-merg.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-merg.el	2009-12-01 09:39:07.142859733 -0700
++++ xemacs-packages/ediff/ediff-merg.el	2009-12-04 12:48:38.684839380 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-merg.el --- merging utilities
  
@@ -1093,7 +1099,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-merg.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-mult.el xemacs-packages/ediff/ediff-mult.el
 --- xemacs-packages.ORIG/ediff/ediff-mult.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-mult.el	2009-12-01 09:39:07.149875626 -0700
++++ xemacs-packages/ediff/ediff-mult.el	2009-12-04 12:48:38.685839135 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
  
@@ -1330,7 +1336,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-mult.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-ptch.el xemacs-packages/ediff/ediff-ptch.el
 --- xemacs-packages.ORIG/ediff/ediff-ptch.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-ptch.el	2009-08-15 00:16:34.000000000 -0600
++++ xemacs-packages/ediff/ediff-ptch.el	2009-12-04 12:48:38.685839135 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-ptch.el --- Ediff's  patch support
  
@@ -1401,7 +1407,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-ptch.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.texi xemacs-packages/ediff/ediff.texi
 --- xemacs-packages.ORIG/ediff/ediff.texi	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff.texi	2009-08-15 00:16:35.000000000 -0600
++++ xemacs-packages/ediff/ediff.texi	2009-12-04 12:48:38.686839033 -0700
 @@ -25,12 +25,12 @@
  This file documents Ediff, a comprehensive visual interface to Unix diff
  and patch utilities.
@@ -1688,7 +1694,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  @ignore
 diff -dur xemacs-packages.ORIG/ediff/ediff-util.el xemacs-packages/ediff/ediff-util.el
 --- xemacs-packages.ORIG/ediff/ediff-util.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-util.el	2009-12-01 09:39:07.203961749 -0700
++++ xemacs-packages/ediff/ediff-util.el	2009-12-04 12:48:38.688839037 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-util.el --- the core commands and utilities of ediff
  
@@ -1816,7 +1822,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	(with-current-buffer ediff-custom-diff-buffer
 diff -dur xemacs-packages.ORIG/ediff/ediff-vers.el xemacs-packages/ediff/ediff-vers.el
 --- xemacs-packages.ORIG/ediff/ediff-vers.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-vers.el	2009-12-01 09:39:07.212891653 -0700
++++ xemacs-packages/ediff/ediff-vers.el	2009-12-04 12:48:38.688839037 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-vers.el --- version control interface to Ediff
  
@@ -1890,7 +1896,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-vers.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-wind.el xemacs-packages/ediff/ediff-wind.el
 --- xemacs-packages.ORIG/ediff/ediff-wind.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-wind.el	2009-08-15 00:16:35.000000000 -0600
++++ xemacs-packages/ediff/ediff-wind.el	2009-12-04 12:48:38.689839136 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-wind.el --- window manipulation utilities
  
@@ -2000,7 +2006,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-wind.el ends here
 diff -dur xemacs-packages.ORIG/ediff/Makefile xemacs-packages/ediff/Makefile
 --- xemacs-packages.ORIG/ediff/Makefile	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/Makefile	2009-12-01 09:39:07.130861623 -0700
++++ xemacs-packages/ediff/Makefile	2009-12-04 12:48:38.689839136 -0700
 @@ -17,7 +17,7 @@
  # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  # Boston, MA 02111-1307, USA.


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-12/xemacs-packages-extra.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xemacs-packages-extra.spec	1 Dec 2009 18:28:52 -0000	1.15
+++ xemacs-packages-extra.spec	4 Dec 2009 19:57:28 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -249,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Jerry James <loganjerry at gmail.com> - 20090217-7
+- Fix one more ediff problem found during testing (bz 537531).
+
 * Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
 - The last ediff fix included more Emacs-specific code (bz 537531).
 - Don't package x-symbol fonts, which are only needed on Windows anyway.



From jjames at fedoraproject.org  Fri Dec  4 19:57:28 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri,  4 Dec 2009 19:57:28 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-11
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,
	1.2, 1.3 xemacs-packages-extra.spec, 1.14, 1.15
Message-ID: <20091204195729.0532411C0376@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1983/F-11

Modified Files:
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch 
	xemacs-packages-extra.spec 
Log Message:
* Fri Dec  4 2009 Jerry James <loganjerry at gmail.com> - 20090217-7
- Fix one more ediff problem found during testing (bz 537531).


xemacs-packages-extra-20091103-ediff-coding-system-532620.patch:
 ChangeLog     |   45 +++++++++++
 Makefile      |    2 
 ediff-diff.el |   45 +++++------
 ediff-help.el |    6 -
 ediff-hook.el |  137 ++++++++++++++++++-----------------
 ediff-init.el |   71 +++++++++---------
 ediff-merg.el |   36 ++++-----
 ediff-mult.el |  130 +++++++++++++++++++++++++--------
 ediff-ptch.el |   22 ++---
 ediff-util.el |   38 ++++-----
 ediff-vers.el |   27 +++---
 ediff-wind.el |   30 +++----
 ediff.el      |  225 +++++++++++++++++++++++++++++++++++-----------------------
 ediff.texi    |  224 ++++++++++++++++++++++++++++++---------------------------
 14 files changed, 608 insertions(+), 430 deletions(-)

Index: xemacs-packages-extra-20091103-ediff-coding-system-532620.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	1 Dec 2009 17:58:49 -0000	1.2
+++ xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	4 Dec 2009 19:57:27 -0000	1.3
@@ -1,6 +1,6 @@
 diff -dur xemacs-packages.ORIG/ediff/ChangeLog xemacs-packages/ediff/ChangeLog
 --- xemacs-packages.ORIG/ediff/ChangeLog	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/ChangeLog	2009-12-01 09:39:07.126858310 -0700
++++ xemacs-packages/ediff/ChangeLog	2009-12-04 12:48:38.679838745 -0700
 @@ -1,3 +1,48 @@
 +2009-11-27  Norbert Koch  <viteno at xemacs.org>
 +
@@ -52,7 +52,7 @@ diff -dur xemacs-packages.ORIG/ediff/Cha
  	* Makefile (VERSION): XEmacs package 1.77 released.
 diff -dur xemacs-packages.ORIG/ediff/ediff-diff.el xemacs-packages/ediff/ediff-diff.el
 --- xemacs-packages.ORIG/ediff/ediff-diff.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-diff.el	2009-12-01 09:39:07.132860465 -0700
++++ xemacs-packages/ediff/ediff-diff.el	2009-12-04 12:48:38.680839121 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-diff.el --- diff-related utilities
  
@@ -207,7 +207,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-diff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.el xemacs-packages/ediff/ediff.el
 --- xemacs-packages.ORIG/ediff/ediff.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff.el	2009-12-01 09:39:07.214982518 -0700
++++ xemacs-packages/ediff/ediff.el	2009-12-04 12:48:38.681838988 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff.el --- a comprehensive visual interface to diff & patch
  
@@ -514,7 +514,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-help.el xemacs-packages/ediff/ediff-help.el
 --- xemacs-packages.ORIG/ediff/ediff-help.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-help.el	2009-08-15 00:16:33.000000000 -0600
++++ xemacs-packages/ediff/ediff-help.el	2009-12-04 12:48:38.682839151 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
  
@@ -544,7 +544,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-hook.el xemacs-packages/ediff/ediff-hook.el
 --- xemacs-packages.ORIG/ediff/ediff-hook.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff-hook.el	2009-12-01 09:39:07.134857315 -0700
++++ xemacs-packages/ediff/ediff-hook.el	2009-12-04 12:48:38.682839151 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
  
@@ -751,7 +751,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-init.el xemacs-packages/ediff/ediff-init.el
 --- xemacs-packages.ORIG/ediff/ediff-init.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-init.el	2009-12-01 09:39:07.140861277 -0700
++++ xemacs-packages/ediff/ediff-init.el	2009-12-04 12:50:03.743022940 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
  
@@ -969,8 +969,14 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    :type 'integer
    :group 'ediff)
  
-@@ -1549,6 +1551,9 @@
-       (if (eventp event-or-key) (event-key event-or-key) event-or-key)
+@@ -1545,10 +1547,13 @@
+ 	(t (error "Error"))))
+ 
+ (defun ediff-event-key (event-or-key)
+-  (if (featurep 'xemacs)
+-      (if (eventp event-or-key) (event-key event-or-key) event-or-key)
++  (if (and (featurep 'xemacs) (eventp event-or-key))
++      (event-to-character event-or-key t t)
      event-or-key))
  
 +(defun ediff-last-command-char ()
@@ -981,7 +987,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    (and (ediff-window-display-p) (frame-live-p frame)
 diff -dur xemacs-packages.ORIG/ediff/ediff-merg.el xemacs-packages/ediff/ediff-merg.el
 --- xemacs-packages.ORIG/ediff/ediff-merg.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-merg.el	2009-12-01 09:39:07.142859733 -0700
++++ xemacs-packages/ediff/ediff-merg.el	2009-12-04 12:48:38.684839380 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-merg.el --- merging utilities
  
@@ -1093,7 +1099,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-merg.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-mult.el xemacs-packages/ediff/ediff-mult.el
 --- xemacs-packages.ORIG/ediff/ediff-mult.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-mult.el	2009-12-01 09:39:07.149875626 -0700
++++ xemacs-packages/ediff/ediff-mult.el	2009-12-04 12:48:38.685839135 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
  
@@ -1330,7 +1336,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-mult.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-ptch.el xemacs-packages/ediff/ediff-ptch.el
 --- xemacs-packages.ORIG/ediff/ediff-ptch.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-ptch.el	2009-08-15 00:16:34.000000000 -0600
++++ xemacs-packages/ediff/ediff-ptch.el	2009-12-04 12:48:38.685839135 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-ptch.el --- Ediff's  patch support
  
@@ -1401,7 +1407,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-ptch.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.texi xemacs-packages/ediff/ediff.texi
 --- xemacs-packages.ORIG/ediff/ediff.texi	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff.texi	2009-08-15 00:16:35.000000000 -0600
++++ xemacs-packages/ediff/ediff.texi	2009-12-04 12:48:38.686839033 -0700
 @@ -25,12 +25,12 @@
  This file documents Ediff, a comprehensive visual interface to Unix diff
  and patch utilities.
@@ -1688,7 +1694,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  @ignore
 diff -dur xemacs-packages.ORIG/ediff/ediff-util.el xemacs-packages/ediff/ediff-util.el
 --- xemacs-packages.ORIG/ediff/ediff-util.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-util.el	2009-12-01 09:39:07.203961749 -0700
++++ xemacs-packages/ediff/ediff-util.el	2009-12-04 12:48:38.688839037 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-util.el --- the core commands and utilities of ediff
  
@@ -1816,7 +1822,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	(with-current-buffer ediff-custom-diff-buffer
 diff -dur xemacs-packages.ORIG/ediff/ediff-vers.el xemacs-packages/ediff/ediff-vers.el
 --- xemacs-packages.ORIG/ediff/ediff-vers.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-vers.el	2009-12-01 09:39:07.212891653 -0700
++++ xemacs-packages/ediff/ediff-vers.el	2009-12-04 12:48:38.688839037 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-vers.el --- version control interface to Ediff
  
@@ -1890,7 +1896,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-vers.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-wind.el xemacs-packages/ediff/ediff-wind.el
 --- xemacs-packages.ORIG/ediff/ediff-wind.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-wind.el	2009-08-15 00:16:35.000000000 -0600
++++ xemacs-packages/ediff/ediff-wind.el	2009-12-04 12:48:38.689839136 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-wind.el --- window manipulation utilities
  
@@ -2000,7 +2006,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-wind.el ends here
 diff -dur xemacs-packages.ORIG/ediff/Makefile xemacs-packages/ediff/Makefile
 --- xemacs-packages.ORIG/ediff/Makefile	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/Makefile	2009-12-01 09:39:07.130861623 -0700
++++ xemacs-packages/ediff/Makefile	2009-12-04 12:48:38.689839136 -0700
 @@ -17,7 +17,7 @@
  # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  # Boston, MA 02111-1307, USA.


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xemacs-packages-extra.spec	1 Dec 2009 18:28:52 -0000	1.14
+++ xemacs-packages-extra.spec	4 Dec 2009 19:57:27 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -249,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
+- Fix one more ediff problem found during testing (bz 537531).
+
 * Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-5
 - The last ediff fix included more Emacs-specific code (bz 537531).
 - Don't package x-symbol fonts, which are only needed on Windows anyway.



From jjames at fedoraproject.org  Fri Dec  4 19:57:28 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri,  4 Dec 2009 19:57:28 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/devel
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,
	1.2, 1.3 xemacs-packages-extra.spec, 1.15, 1.16
Message-ID: <20091204195729.0B9DE11C03F6@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1983/devel

Modified Files:
	xemacs-packages-extra-20091103-ediff-coding-system-532620.patch 
	xemacs-packages-extra.spec 
Log Message:
* Fri Dec  4 2009 Jerry James <loganjerry at gmail.com> - 20090217-7
- Fix one more ediff problem found during testing (bz 537531).


xemacs-packages-extra-20091103-ediff-coding-system-532620.patch:
 ChangeLog     |   45 +++++++++++
 Makefile      |    2 
 ediff-diff.el |   45 +++++------
 ediff-help.el |    6 -
 ediff-hook.el |  137 ++++++++++++++++++-----------------
 ediff-init.el |   71 +++++++++---------
 ediff-merg.el |   36 ++++-----
 ediff-mult.el |  130 +++++++++++++++++++++++++--------
 ediff-ptch.el |   22 ++---
 ediff-util.el |   38 ++++-----
 ediff-vers.el |   27 +++---
 ediff-wind.el |   30 +++----
 ediff.el      |  225 +++++++++++++++++++++++++++++++++++-----------------------
 ediff.texi    |  224 ++++++++++++++++++++++++++++++---------------------------
 14 files changed, 608 insertions(+), 430 deletions(-)

Index: xemacs-packages-extra-20091103-ediff-coding-system-532620.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	1 Dec 2009 17:58:49 -0000	1.2
+++ xemacs-packages-extra-20091103-ediff-coding-system-532620.patch	4 Dec 2009 19:57:28 -0000	1.3
@@ -1,6 +1,6 @@
 diff -dur xemacs-packages.ORIG/ediff/ChangeLog xemacs-packages/ediff/ChangeLog
 --- xemacs-packages.ORIG/ediff/ChangeLog	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/ChangeLog	2009-12-01 09:39:07.126858310 -0700
++++ xemacs-packages/ediff/ChangeLog	2009-12-04 12:48:38.679838745 -0700
 @@ -1,3 +1,48 @@
 +2009-11-27  Norbert Koch  <viteno at xemacs.org>
 +
@@ -52,7 +52,7 @@ diff -dur xemacs-packages.ORIG/ediff/Cha
  	* Makefile (VERSION): XEmacs package 1.77 released.
 diff -dur xemacs-packages.ORIG/ediff/ediff-diff.el xemacs-packages/ediff/ediff-diff.el
 --- xemacs-packages.ORIG/ediff/ediff-diff.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-diff.el	2009-12-01 09:39:07.132860465 -0700
++++ xemacs-packages/ediff/ediff-diff.el	2009-12-04 12:48:38.680839121 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-diff.el --- diff-related utilities
  
@@ -207,7 +207,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-diff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.el xemacs-packages/ediff/ediff.el
 --- xemacs-packages.ORIG/ediff/ediff.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff.el	2009-12-01 09:39:07.214982518 -0700
++++ xemacs-packages/ediff/ediff.el	2009-12-04 12:48:38.681838988 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff.el --- a comprehensive visual interface to diff & patch
  
@@ -514,7 +514,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-help.el xemacs-packages/ediff/ediff-help.el
 --- xemacs-packages.ORIG/ediff/ediff-help.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-help.el	2009-08-15 00:16:33.000000000 -0600
++++ xemacs-packages/ediff/ediff-help.el	2009-12-04 12:48:38.682839151 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
  
@@ -544,7 +544,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-hook.el xemacs-packages/ediff/ediff-hook.el
 --- xemacs-packages.ORIG/ediff/ediff-hook.el	2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff-hook.el	2009-12-01 09:39:07.134857315 -0700
++++ xemacs-packages/ediff/ediff-hook.el	2009-12-04 12:48:38.682839151 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
  
@@ -751,7 +751,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  
 diff -dur xemacs-packages.ORIG/ediff/ediff-init.el xemacs-packages/ediff/ediff-init.el
 --- xemacs-packages.ORIG/ediff/ediff-init.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-init.el	2009-12-01 09:39:07.140861277 -0700
++++ xemacs-packages/ediff/ediff-init.el	2009-12-04 12:50:03.743022940 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
  
@@ -969,8 +969,14 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    :type 'integer
    :group 'ediff)
  
-@@ -1549,6 +1551,9 @@
-       (if (eventp event-or-key) (event-key event-or-key) event-or-key)
+@@ -1545,10 +1547,13 @@
+ 	(t (error "Error"))))
+ 
+ (defun ediff-event-key (event-or-key)
+-  (if (featurep 'xemacs)
+-      (if (eventp event-or-key) (event-key event-or-key) event-or-key)
++  (if (and (featurep 'xemacs) (eventp event-or-key))
++      (event-to-character event-or-key t t)
      event-or-key))
  
 +(defun ediff-last-command-char ()
@@ -981,7 +987,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
    (and (ediff-window-display-p) (frame-live-p frame)
 diff -dur xemacs-packages.ORIG/ediff/ediff-merg.el xemacs-packages/ediff/ediff-merg.el
 --- xemacs-packages.ORIG/ediff/ediff-merg.el	2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-merg.el	2009-12-01 09:39:07.142859733 -0700
++++ xemacs-packages/ediff/ediff-merg.el	2009-12-04 12:48:38.684839380 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-merg.el --- merging utilities
  
@@ -1093,7 +1099,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-merg.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-mult.el xemacs-packages/ediff/ediff-mult.el
 --- xemacs-packages.ORIG/ediff/ediff-mult.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-mult.el	2009-12-01 09:39:07.149875626 -0700
++++ xemacs-packages/ediff/ediff-mult.el	2009-12-04 12:48:38.685839135 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
  
@@ -1330,7 +1336,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-mult.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-ptch.el xemacs-packages/ediff/ediff-ptch.el
 --- xemacs-packages.ORIG/ediff/ediff-ptch.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-ptch.el	2009-08-15 00:16:34.000000000 -0600
++++ xemacs-packages/ediff/ediff-ptch.el	2009-12-04 12:48:38.685839135 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-ptch.el --- Ediff's  patch support
  
@@ -1401,7 +1407,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-ptch.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff.texi xemacs-packages/ediff/ediff.texi
 --- xemacs-packages.ORIG/ediff/ediff.texi	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff.texi	2009-08-15 00:16:35.000000000 -0600
++++ xemacs-packages/ediff/ediff.texi	2009-12-04 12:48:38.686839033 -0700
 @@ -25,12 +25,12 @@
  This file documents Ediff, a comprehensive visual interface to Unix diff
  and patch utilities.
@@ -1688,7 +1694,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  @ignore
 diff -dur xemacs-packages.ORIG/ediff/ediff-util.el xemacs-packages/ediff/ediff-util.el
 --- xemacs-packages.ORIG/ediff/ediff-util.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-util.el	2009-12-01 09:39:07.203961749 -0700
++++ xemacs-packages/ediff/ediff-util.el	2009-12-04 12:48:38.688839037 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-util.el --- the core commands and utilities of ediff
  
@@ -1816,7 +1822,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  	(with-current-buffer ediff-custom-diff-buffer
 diff -dur xemacs-packages.ORIG/ediff/ediff-vers.el xemacs-packages/ediff/ediff-vers.el
 --- xemacs-packages.ORIG/ediff/ediff-vers.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-vers.el	2009-12-01 09:39:07.212891653 -0700
++++ xemacs-packages/ediff/ediff-vers.el	2009-12-04 12:48:38.688839037 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-vers.el --- version control interface to Ediff
  
@@ -1890,7 +1896,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-vers.el ends here
 diff -dur xemacs-packages.ORIG/ediff/ediff-wind.el xemacs-packages/ediff/ediff-wind.el
 --- xemacs-packages.ORIG/ediff/ediff-wind.el	2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-wind.el	2009-08-15 00:16:35.000000000 -0600
++++ xemacs-packages/ediff/ediff-wind.el	2009-12-04 12:48:38.689839136 -0700
 @@ -1,7 +1,7 @@
  ;;; ediff-wind.el --- window manipulation utilities
  
@@ -2000,7 +2006,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
  ;;; ediff-wind.el ends here
 diff -dur xemacs-packages.ORIG/ediff/Makefile xemacs-packages/ediff/Makefile
 --- xemacs-packages.ORIG/ediff/Makefile	2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/Makefile	2009-12-01 09:39:07.130861623 -0700
++++ xemacs-packages/ediff/Makefile	2009-12-04 12:48:38.689839136 -0700
 @@ -17,7 +17,7 @@
  # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  # Boston, MA 02111-1307, USA.


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xemacs-packages-extra.spec	1 Dec 2009 18:28:52 -0000	1.15
+++ xemacs-packages-extra.spec	4 Dec 2009 19:57:28 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -249,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Jerry James <loganjerry at gmail.com> - 20090217-7
+- Fix one more ediff problem found during testing (bz 537531).
+
 * Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
 - The last ediff fix included more Emacs-specific code (bz 537531).
 - Don't package x-symbol fonts, which are only needed on Windows anyway.



From stevetraylen at fedoraproject.org  Fri Dec  4 20:11:25 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Fri,  4 Dec 2009 20:11:25 +0000 (UTC)
Subject: File myproxy-5.0.tar.gz uploaded to lookaside cache by stevetraylen
Message-ID: <20091204201125.1F5FD10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for myproxy:

056f24d00d090844bf851c488a036b28  myproxy-5.0.tar.gz



From fabbione at fedoraproject.org  Fri Dec  4 20:11:50 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  4 Dec 2009 20:11:50 +0000 (UTC)
Subject: rpms/fence-agents/devel fence_head.diff, NONE, 1.1 fence-agents.spec,
	1.21, 1.22
Message-ID: <20091204201150.72E9411C00E0@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6609

Modified Files:
	fence-agents.spec 
Added Files:
	fence_head.diff 
Log Message:
Drop fence_xvm from upstream and other cleanups


fence_head.diff:
 a/fence/agents/xvm/fence_xvm.c |  380 -----------------------------------------
 a/fence/agents/xvm/ip_lookup.c |  307 ---------------------------------
 a/fence/agents/xvm/ip_lookup.h |   22 --
 fence/agents/xvm/Makefile      |   51 +----
 4 files changed, 17 insertions(+), 743 deletions(-)

--- NEW FILE fence_head.diff ---
--- a/fence/agents/xvm/Makefile
+++ b/fence/agents/xvm/Makefile
@@ -1,12 +1,9 @@
-TARGET1= fence_xvm
-TARGET2= fence_xvmd
-TARGET3= testprog
+TARGET1= fence_xvmd
+TARGET2= testprog
 
-SBINDIRT=$(TARGET1) $(TARGET2)
+SBINDIRT=$(TARGET1)
 
-MANTARGET= fence_xvm.8
-
-all: ${TARGET1} ${TARGET2} ${MANTARGET}
+all: ${TARGET1}
 
 include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
@@ -14,22 +11,19 @@ include $(OBJDIR)/make/clean.mk
 include $(OBJDIR)/make/install.mk
 include $(OBJDIR)/make/uninstall.mk
 
-OBJS1=	fence_xvm.o \
-	ip_lookup.o
-
-OBJS2=	fence_xvmd.o \
+OBJS1=	fence_xvmd.o \
 	virt.o \
 	options-ccs.o \
 	vm_states.o \
-	xml.o
+	xml.o \
+	mcast.o \
+	simple_auth.o \
+	tcp.o \
+	options.o \
+	debug.o
 
-OBJS3=	xml-standalone.o
 
-SHAREDOBJS=	mcast.o \
-		simple_auth.o \
-		tcp.o \
-		options.o \
-		debug.o
+OBJS2=	xml-standalone.o
 
 CFLAGS += -D_GNU_SOURCE
 CFLAGS += -I${ccsincdir} -I${cmanincdir}
@@ -44,30 +38,19 @@ STANDALONE_CFLAGS += -DSTANDALONE
 LDFLAGS += -L${nsslibdir} -lnss3
 LDFLAGS += -L${logtlibdir} -llogthread
 LDFLAGS += -L${libdir}
+LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman
+LDFLAGS += -L${virtlibdir} -lvirt
+LDFLAGS += -L${openaislibdir} -lSaCkpt
 
-EXTRA_LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman
-EXTRA_LDFLAGS += -L${virtlibdir} -lvirt
-EXTRA_LDFLAGS += -L${openaislibdir} -lSaCkpt
 XML_LDFLAGS += `xml2-config --libs`
 
 ${TARGET1}: ${SHAREDOBJS} ${OBJS1}
-	$(CC) -o $@ $^ $(LDFLAGS)
+	$(CC) -o $@ $^ $(XML_LDFLAGS) $(LDFLAGS)
 
-${TARGET2}: ${SHAREDOBJS} ${OBJS2}
-	$(CC) -o $@ $^ $(EXTRA_LDFLAGS) $(XML_LDFLAGS) $(LDFLAGS)
-
-${TARGET3}: ${OBJS3}
+${TARGET2}: ${OBJS2}
 	$(CC) -o $@ $^ $(XML_LDFLAGS)
 
-$(MANTARGET): $(TARGET1) ${SRCDIR}/fence/agents/lib/fence2man.xsl
-	set -e && \
-	LD_LIBRARY_PATH=${logtlibdir} ./$(TARGET1) -o metadata > .$@.tmp && \
-	xsltproc ${SRCDIR}/fence/agents/lib/fence2man.xsl .$@.tmp > $@
-
 clean: generalclean
-	rm -f $(MANTARGET) .$(MANTARGET).tmp
 
 -include $(OBJS1:.o=.d)
 -include $(OBJS2:.o=.d)
--include $(OBJS3:.o=.d)
--include $(SHAREDOBJS:.o=.d)
--- a/fence/agents/xvm/fence_xvm.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * @file fence_xvmd.c: Implementation of server daemon for Xen virtual
- * machine fencing.  This uses SA AIS CKPT b.1.0 checkpointing API to 
- * store virtual machine states.
- *
- * Author: Lon Hohberger <lhh at redhat.com>
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/un.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/ioctl.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <pthread.h>
-#include <libgen.h>
-#include <nss.h>
-#include <liblogthread.h>
-
-/* Local includes */
-#include "xvm.h"
-#include "ip_lookup.h"
-#include "simple_auth.h"
-#include "options.h"
-#include "tcp.h"
-#include "mcast.h"
-#include "debug.h"
-
-#define LOG_DAEMON_NAME "fence_xvm"
-
-static int
-tcp_wait_connect(int lfd, int retry_tenths)
-{
-	int fd;
-	fd_set rfds;
-	int n;
-	struct timeval tv;
-
-	dbg_printf(3, "Waiting for connection from XVM host daemon.\n");
-	FD_ZERO(&rfds);
-	FD_SET(lfd, &rfds);
-	tv.tv_sec = retry_tenths / 10;
-	tv.tv_usec = (retry_tenths % 10) * 100000;
-
-	n = select(lfd + 1, &rfds, NULL, NULL, &tv);
-	if (n == 0) {
-		errno = ETIMEDOUT;
-		return -1;
-	} else if (n < 0) {
-		return -1;
-	}
-
-	fd = accept(lfd, NULL, 0);
-	if (fd < 0)
-		return -1;
-
-	return fd;
-}
-
-
-static int
-tcp_exchange(int fd, fence_auth_type_t auth, void *key,
-	      size_t key_len, int timeout)
-{
-	char ret;
-	fd_set rfds;
-	struct timeval tv;
-
-	/* Ok, we're connected */
-	dbg_printf(3, "Issuing TCP challenge\n");
-	if (tcp_challenge(fd, auth, key, key_len, timeout) <= 0) {
-		/* Challenge failed */
-		logt_print(LOG_ERR, "Invalid response to challenge\n");
-		return 0;
-	}
-
-	/* Now they'll send us one, so we need to respond here */
-	dbg_printf(3, "Responding to TCP challenge\n");
-	if (tcp_response(fd, auth, key, key_len, timeout) <= 0) {
-		logt_print(LOG_ERR, "Invalid response to challenge\n");
-		return 0;
-	}
-
-	dbg_printf(2, "TCP Exchange + Authentication done... \n");
-
-	FD_ZERO(&rfds);
-	FD_SET(fd, &rfds);
-	tv.tv_sec = timeout;
-	tv.tv_usec = 0;
-
-	ret = 1;
-	dbg_printf(3, "Waiting for return value from XVM host\n");
-	if (select(fd + 1, &rfds, NULL, NULL, &tv) <= 0)
-		return -1;
-
-	/* Read return code */
-	if (read(fd, &ret, 1) < 0)
-		return -1;
-
-	close(fd);
-	if (ret == 0)
-		logt_print(LOG_INFO, "Remote: Operation was successful\n");
-	else
-		logt_print(LOG_INFO, "Remote: Operation failed\n");
-	return ret;
-}
-
-
-static int
-send_multicast_packets(ip_list_t *ipl, fence_xvm_args_t *args, void *key,
-		       size_t key_len)
-{
-	fence_req_t freq;
-	int mc_sock;
-	ip_addr_t *ipa;
-	struct sockaddr_in tgt4;
-	struct sockaddr_in6 tgt6;
-	struct sockaddr *tgt;
-	socklen_t tgt_len;
-
-	for (ipa = ipl->tqh_first; ipa; ipa = ipa->ipa_entries.tqe_next) {
-
-		if (ipa->ipa_family != args->family) {
-			dbg_printf(2, "Ignoring %s: wrong family\n", ipa->ipa_address);
-			continue;
-		}
-
-		if (args->family == PF_INET) {
-			mc_sock = ipv4_send_sk(ipa->ipa_address, args->addr,
-					       args->port,
-					       (struct sockaddr *)&tgt4,
-					       sizeof(struct sockaddr_in),
-					       args->ttl);
-			tgt = (struct sockaddr *)&tgt4;
-			tgt_len = sizeof(tgt4);
-			
-		} else if (args->family == PF_INET6) {
-			mc_sock = ipv6_send_sk(ipa->ipa_address, args->addr,
-					       args->port,
-					       (struct sockaddr *)&tgt6,
-					       sizeof(struct sockaddr_in6),
-					       args->ttl);
-			tgt = (struct sockaddr *)&tgt6;
-			tgt_len = sizeof(tgt6);
-		} else {
-			dbg_printf(2, "Unsupported family %d\n", args->family);
-			return -1;
-		}
-
-		if (mc_sock < 0)
-			continue;
-
-		/* Build our packet */
-		memset(&freq, 0, sizeof(freq));
-		strncpy((char *)freq.domain, args->domain,
-			sizeof(freq.domain));
-		freq.request = args->op;
-		freq.hashtype = args->hash;
-
-		/* Store source address */
-		if (ipa->ipa_family == PF_INET) {
-			freq.addrlen = sizeof(struct in_addr);
-			/* XXX Swap order for in_addr ? XXX */
-			inet_pton(PF_INET, ipa->ipa_address, freq.address);
-		} else if (ipa->ipa_family == PF_INET6) {
-			freq.addrlen = sizeof(struct in6_addr);
-			inet_pton(PF_INET6, ipa->ipa_address, freq.address);
-		}
-
-		freq.flags = 0;
-		if (args->flags & F_USE_UUID)
-			freq.flags |= RF_UUID;
-		freq.family = ipa->ipa_family;
-		freq.port = args->port;
-
-		sign_request(&freq, key, key_len);
-
-		dbg_printf(3, "Sending to %s via %s\n", args->addr,
-		        ipa->ipa_address);
-
-		sendto(mc_sock, &freq, sizeof(freq), 0,
-		       (struct sockaddr *)tgt, tgt_len);
-
-		close(mc_sock);
-	}
-
-	return 0;
-}
-
-
-/* TODO: Clean this up!!! */
-static int
-fence_xen_domain(fence_xvm_args_t *args)
-{
-	ip_list_t ipl;
-	char key[MAX_KEY_LEN];
-	int lfd, key_len = 0, fd;
-	int attempts = 0;
-	
-	if (args->auth != AUTH_NONE || args->hash != HASH_NONE) {
-		key_len = read_key_file(args->key_file, key, sizeof(key));
-		if (key_len < 0) {
-			logt_print(LOG_INFO,
-				   "Could not read %s; trying without "
-			           "authentication\n", args->key_file);
-			args->auth = AUTH_NONE;
-			args->hash = HASH_NONE;
-		}
-	}
-
-	/* Do the real work */
-	if (ip_build_list(&ipl) < 0) {
-		logt_print(LOG_ERR, "Error building IP address list\n");
-		return 1;
-	}
-
-	switch (args->auth) {
-		case AUTH_NONE:
-		case AUTH_SHA1:
-		case AUTH_SHA256:
-		case AUTH_SHA512:
-			if (args->family == PF_INET) {
-				lfd = ipv4_listen(args->port, 10);
-			} else {
-				lfd = ipv6_listen(args->port, 10);
-			}
-			break;
-		/*case AUTH_X509:*/
-			/* XXX Setup SSL listener socket here */
-		default:
-			return 1;
-	}
-
-	if (lfd < 0) {
-		logt_print(LOG_ERR, "Failed to listen: %s\n", strerror(errno));
-		return 1;
-	}
-
-	attempts = args->timeout * 10 / args->retr_time;
-
-	logt_print(LOG_INFO, "Sending fence request for %s\n", 
-		   args->domain);
-
-	do {
-		if (send_multicast_packets(&ipl, args, key, key_len)) {
-			return -1;
-		}
-
-		switch (args->auth) {
-			case AUTH_NONE:
-			case AUTH_SHA1:
-			case AUTH_SHA256:
-			case AUTH_SHA512:
-				fd = tcp_wait_connect(lfd, args->retr_time);
-				if (fd < 0 && (errno == ETIMEDOUT ||
-					       errno == EINTR))
-					continue;
-				break;
-			/* case AUTH_X509:
-				... = ssl_wait_connect... */
-			break;
-		default:
-			return 1;
-		}
-
-		break;
-	} while (--attempts);
-
-	if (fd < 0) {
-		if (attempts <= 0) {
-			logt_print(LOG_ERR,
-				   "Timed out waiting for response\n");
-			return 1;
-		}
-		logt_print(LOG_ERR, "Fencing failed: %s\n", strerror(errno));
-		return -1;
-	}
-
-	switch (args->auth) {
-		case AUTH_NONE:
-		case AUTH_SHA1:
-		case AUTH_SHA256:
-		case AUTH_SHA512:
-			return tcp_exchange(fd, args->auth, key, key_len,
-					    args->timeout);
-			break;
-		/* case AUTH_X509: 
-			return ssl_exchange(...); */
-		default:
-			return 1;
-	}
-
-	return 1;
-}
-
-
-int
-main(int argc, char **argv)
-{
-	fence_xvm_args_t args;
-	const char *my_options = "di:a:p:T:r:C:c:k:H:uo:t:?hV";
-
-	/* Print to stderr.  Fenced will report our output for us */
-	logt_init(LOG_DAEMON_NAME, LOG_MODE_OUTPUT_STDERR,
-		  SYSLOGFACILITY, SYSLOGLEVEL, SYSLOGLEVEL, NULL);
-
-	args_init(&args);
-
-	if (argc == 1) {
-		args_get_stdin(my_options, &args);
-	} else {
-		args_get_getopt(argc, argv, my_options, &args);
-	}
-
-	if (args.flags & F_HELP) {
-		args_usage(argv[0], my_options, 0);
-
-                printf("With no command line argument, arguments are "
-                       "read from standard input.\n");
-                printf("Arguments read from standard input take "
-                       "the form of:\n\n");
-                printf("    arg1=value1\n");
-                printf("    arg2=value2\n\n");
-
-		args_usage(argv[0], my_options, 1);
-		exit(0);
-	}
-
-	if (args.flags & F_METADATA) {
-		args_metadata(argv[0], my_options);
-		exit(0);
-	}
-
-	if (args.flags & F_VERSION) {
-		printf("%s %s\n", basename(argv[0]), XVM_VERSION);
-		printf("fence release %s\n", RELEASE_VERSION);
-		exit(0);
-	}
-
-	args_finalize(&args);
-	dset(args.debug);
-	
-	if (args.debug > 0) {
-		logt_conf(LOG_DAEMON_NAME, LOG_MODE_OUTPUT_STDERR,
-			  SYSLOGFACILITY, LOG_DEBUG, LOG_DEBUG, NULL);
-		args_print(&args);
-	}
-
-	/* Additional validation here */
-	if (!args.domain) {
-		logt_print(LOG_ERR, "No domain specified!\n");
-		args.flags |= F_ERR;
-	}
-
-	if (args.flags & F_ERR) {
-		args_usage(argv[0], my_options, (argc == 1));
-		exit(1);
-	}
-
-	/* Initialize NSS; required to do hashing, as silly as that
-	   sounds... */
-	if (NSS_NoDB_Init(NULL) != SECSuccess) {
-		logt_print(LOG_ERR, "Could not initialize NSS\n");
-		return 1;
-	}
-
-	return fence_xen_domain(&args);
-}
--- a/fence/agents/xvm/ip_lookup.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/** @file
- * Build lists of IPs on the system, excepting loopback ipv6 link-local
- */
-#include <asm/types.h>
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <netdb.h>
-#include <liblogthread.h>
-
-#ifndef IFA_MAX
-#include <linux/if_addr.h>
-#endif
-
-/* Local includes */
-#include "ip_lookup.h"
-#include "debug.h"
-
-static int
-send_addr_dump(int fd, int family)
-{
-	struct nlmsghdr *nh;
-	struct rtgenmsg *g;
-	char buf[256];
-	struct sockaddr_nl addr;
-
-	memset(&addr,0,sizeof(addr));
-	addr.nl_family = PF_NETLINK;
-
-	memset(buf, 0, sizeof(buf));
-	nh = (struct nlmsghdr *)buf;
-	g = (struct rtgenmsg *)(buf + sizeof(struct nlmsghdr));
-
-	nh->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg));
-	nh->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP;
-	nh->nlmsg_type = RTM_GETADDR;
-	g->rtgen_family = family;
-
-	return sendto(fd, buf, nh->nlmsg_len, 0, (struct sockaddr *)&addr,
-	   	      sizeof(addr));
-}
-
-
-static int
-add_ip(ip_list_t *ipl, char *ipaddr, char family)
-{
-	ip_addr_t *ipa;
-
-	if (family == PF_INET6) {
-		/* Avoid loopback */
-		if (!strcmp(ipaddr, "::1"))
-			return -1;
-
-		/* Avoid link-local addresses */
-		if (!strncmp(ipaddr, "fe80", 4))
-			return -1;
-		if (!strncmp(ipaddr, "fe90", 4))
-			return -1;
-		if (!strncmp(ipaddr, "fea0", 4))
-			return -1;
-		if (!strncmp(ipaddr, "feb0", 4))
-			return -1;
-	}
-	
-	dbg_printf(4, "Adding IP %s to list (family %d)\n", ipaddr, family);
-
-	ipa = malloc(sizeof(*ipa));
-	if (!ipa)
-		return -1;
-	memset(ipa, 0, sizeof(*ipa));
-	ipa->ipa_family = family;
-	ipa->ipa_address = strdup(ipaddr);
-
-	TAILQ_INSERT_TAIL(ipl, ipa, ipa_entries);
-
-	return 0;
-}
-
-
-static int
-add_ip_addresses(int family, ip_list_t *ipl)
-{
-	/* List ipv4 addresses */
-	struct nlmsghdr *nh;
-	struct ifaddrmsg *ifa;
-	struct rtattr *rta, *nrta;
-	struct nlmsgerr *err;
-	char buf[10240];
-	char outbuf[256];
-	int x, fd, len;
-
-	dbg_printf(5, "Connecting to Netlink...\n");
-	fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
-	if (fd < 0) {
-		perror("socket");
-		exit(1);
-	}
-	
-	dbg_printf(5, "Sending address dump request\n");
-	send_addr_dump(fd, family);
-	memset(buf, 0, sizeof(buf));
-	
-	dbg_printf(5, "Waiting for response\n");
-	x = recvfrom(fd, buf, sizeof(buf), 0, NULL, 0);
-	if (x < 0) {
-		perror("recvfrom");
-		return -1;
-	}
-	
-	dbg_printf(5, "Received %d bytes\n", x);
-
-	nh = (struct nlmsghdr *)buf;
-	while (NLMSG_OK(nh, x)) {
-
-		switch(nh->nlmsg_type) {
-		case NLMSG_DONE:
-			close(fd);
-    			return 0;
-
-		case NLMSG_ERROR:
-			err = (struct nlmsgerr*)NLMSG_DATA(nh);
-			if (nh->nlmsg_len <
-			    NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
-				fprintf(stderr, "ERROR truncated");
-			} else {
-				errno = -err->error;
-				perror("RTNETLINK answers");
-			}
-			close(fd);
-			return -1;
-
-		case RTM_NEWADDR:
-			break;
-
-		default:
-			nh = NLMSG_NEXT(nh, x);
-			continue;
-		}
-
-		/* RTM_NEWADDR */
-		len = NLMSG_PAYLOAD(nh,0);
-		ifa = NLMSG_DATA(nh);
-
-		/* Make sure we got the type we expect back */
-		if (ifa->ifa_family != family) {
-			nh = NLMSG_NEXT(nh, x);
-			continue;
-		}
-
-		rta = (struct rtattr *)((char *)ifa + sizeof(*ifa));
-		len -= sizeof(*ifa);
-		do {
-			/* Make sure we've got a valid rtaddr field */
-			if (!RTA_OK(rta, len)) {
-				dbg_printf(5, "!RTA_OK(rta, len)\n");
-				break;
-			}
-
-			if (rta->rta_type == IFA_ADDRESS) {
-				inet_ntop(family, RTA_DATA(rta), outbuf,
-					  sizeof(outbuf) );
-				add_ip(ipl, outbuf, family);
-			}
-
-			if (rta->rta_type == IFA_LABEL) {
-				dbg_printf(5, "Skipping label: %s\n",
-					(char *)RTA_DATA(rta));
-			}
-
-			nrta = RTA_NEXT(rta, len);
-			if (!nrta)
-				break;
-
-			len -= ((char *)nrta - (char *)rta);
-			rta = nrta;
-		} while (RTA_OK(rta, len));
-
-		nh = NLMSG_NEXT(nh, x);
-	}
-
-	dbg_printf(5, "Closing Netlink connection\n");
-	close(fd);
-	return 0;
-}
-
-
-int
-ip_search(ip_list_t *ipl, char *ip_name)
-{
-	ip_addr_t *ipa;
-	
-	dbg_printf(5, "Looking for IP address %s in IP list %p...", ip_name, ipl);
-	ipa = ipl->tqh_first;
-	for (ipa = ipl->tqh_first; ipa; ipa = ipa->ipa_entries.tqe_next) {
-		if (!strcmp(ip_name, ipa->ipa_address)) {
-			dbg_printf(4,"Found\n");
-			return 0;
-		}
-	}
-	dbg_printf(5, "Not found\n");
-	return 1;
-}
-
-
-int
-ip_free_list(ip_list_t *ipl)
-{
-	ip_addr_t *ipa;
-	
-	dbg_printf(5, "Tearing down IP list @ %p\n", ipl);
-	while ((ipa = ipl->tqh_first)) {
-		TAILQ_REMOVE(ipl, ipa, ipa_entries);
-		free(ipa->ipa_address);
-		free(ipa);
-	}
-	return 0;
-}
-
-
-int
-ip_build_list(ip_list_t *ipl)
-{
-	dbg_printf(5, "Build IP address list\n");
-	TAILQ_INIT(ipl);
-	if (add_ip_addresses(PF_INET6, ipl) < 0) {
-		ip_free_list(ipl);
-		return -1;
-	}
-	if (add_ip_addresses(PF_INET, ipl) < 0) {
-		ip_free_list(ipl);
-		return -1;
-	}
-	return 0;
-}
-
-
-/**
-  Look up the interface name which corresponds to the given hostname and
-  return the list of matching attrinfo structures.  We do this by looking
-  up all the possible physical and virtual network interfaces on the machine
-  and checking the hostname/IP mappings for each active IP address incurred.
-
-  @param nodename	Interface name
-  @param ret_ai		Structure pointer to allocate & return.
-  @return		-1 on failure or 0 on success.
- */
-int
-ip_lookup(char *nodename, struct addrinfo **ret_ai)
-{
-	char ip_name[256];
-	struct addrinfo *ai = NULL;
-	struct addrinfo *n;
-	void *p;
-	ip_list_t ipl;
-	int ret = -1;
-
-	dbg_printf(5, "Looking for IP matching %s\n", nodename);
-	/* Build list of IP addresses configured locally */
-	if (ip_build_list(&ipl) < 0)
-		return -1;
-
-	/* Get list of addresses for the host-name/ip */
-	if (getaddrinfo(nodename, NULL, NULL, &ai) != 0) 
-		return -1;
-	
-
-	/* Traverse list of addresses for given host-name/ip */
-	for (n = ai; n; n = n->ai_next) {
-		if (n->ai_family != PF_INET && n->ai_family != PF_INET6)
-			continue;
-
-		if (n->ai_family == PF_INET)
-			p = &(((struct sockaddr_in *)n->ai_addr)->sin_addr);
-		else
-			p = &(((struct sockaddr_in6 *)n->ai_addr)->sin6_addr);
-
-		if (!inet_ntop(n->ai_family, p, ip_name,
-			       sizeof(ip_name)))
-			continue;
-
-		/* Search local interfaces for this IP address */
-		if (ip_search(&ipl, ip_name) != 0)
-			continue;
-
-		/* Found it */
-		ret = 0;
-		break;
-	}
-
-	/* Clean up */
-	if (!ret_ai)
-		freeaddrinfo(ai);
-	else
-		*ret_ai = ai;
-
-	ip_free_list(&ipl);
-
-	return ret;
-}
-
--- a/fence/agents/xvm/ip_lookup.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/** @file
- * Header for ip_lookup.c
- */
-#ifndef _IP_LOOKUP_H
-#define _IP_LOOKUP_H
-
-#include <sys/queue.h>
-
-typedef struct _ip_address {
-	TAILQ_ENTRY(_ip_address) ipa_entries;
-	char ipa_family;
-	char *ipa_address;
-} ip_addr_t;
-
-typedef TAILQ_HEAD(_ip_list, _ip_address) ip_list_t;
-
-int ip_search(ip_list_t *ipl, char *ip_name);
-int ip_free_list(ip_list_t *ipl);
-int ip_build_list(ip_list_t *ipl);
-int ip_lookup(char *, struct addrinfo **);
-
-#endif


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- fence-agents.spec	20 Nov 2009 11:55:30 -0000	1.21
+++ fence-agents.spec	4 Dec 2009 20:11:50 -0000	1.22
@@ -10,25 +10,24 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+%global alphatag git0a6184070
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.5
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/fence-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: ftp://sources.redhat.com/pub/cluster/releases/fence-agents-%{version}.tar.gz
+Patch0: fence_head.diff
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
+Requires: fence-virt >= 0.1.3-1
 
 # This is required by fence_virsh. Per discussion on fedora-devel
 # switching from package to file based require.
@@ -49,7 +48,8 @@ BuildRequires: corosynclib-devel >= 1.0.
 BuildRequires: openaislib-devel >= 1.0.0-1
 
 %prep
-%setup -q -n fence-agents-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n fence-agents-%{version}
+%patch0 -p1
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -89,6 +89,13 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-2.git0a6184070
+- Drop fence_xvm from upstream (fence_head.diff)
+- spec file updates:
+  * Drop unrequired comments
+  * Readd alpha tag and clean it's usage around
+  * Requires: fence-virt in sufficient version to provide fence_xvm
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 



From abompard at fedoraproject.org  Fri Dec  4 20:15:04 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri,  4 Dec 2009 20:15:04 +0000 (UTC)
Subject: rpms/psi/F-11 psi-0.12-qca.patch,1.1,1.2
Message-ID: <20091204201504.16A2311C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/psi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7678/F-11

Modified Files:
	psi-0.12-qca.patch 
Log Message:
Adapt patches in old branches

psi-0.12-qca.patch:
 configure |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: psi-0.12-qca.patch
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-11/psi-0.12-qca.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- psi-0.12-qca.patch	13 Aug 2008 20:46:11 -0000	1.1
+++ psi-0.12-qca.patch	4 Dec 2009 20:15:03 -0000	1.2
@@ -1,19 +1,22 @@
---- configure.qca	2008-08-13 19:00:52.000000000 +0200
-+++ configure	2008-08-13 21:49:20.000000000 +0200
-@@ -497,10 +497,11 @@
- 
- 		QString proextra =
- 		"CONFIG += qt crypto\n"
-+		"INCLUDEPATH += /usr/include/QtCrypto\n"
- 		"QT -= gui\n";
+diff --git a/configure b/configure
+index a5bdd58..9c89ed4 100755
+--- a/configure
++++ b/configure
+@@ -741,11 +741,12 @@ public:
+ 		} else {
+ 			proextra =
+ 			"CONFIG += qt crypto\n"
++            "INCLUDEPATH += /usr/include/QtCrypto\n"
+ 			"QT -= gui\n";
+ 		}
  
  		QString str =
 -		"#include <QtCrypto>\n"
-+		"#include <QtCrypto/QtCrypto>\n"
++        "#include <QtCrypto/QtCrypto>\n"
  		"\n"
  		"int main()\n"
  		"{\n"
-@@ -2107,9 +2108,10 @@
+@@ -2634,9 +2635,10 @@ int main()
  		if(!conf->INCLUDEPATH.isEmpty())
  			str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';
  		if(!conf->LIBS.isEmpty())



From abompard at fedoraproject.org  Fri Dec  4 20:15:04 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri,  4 Dec 2009 20:15:04 +0000 (UTC)
Subject: rpms/psi/F-12 psi-0.12-qca.patch,1.1,1.2
Message-ID: <20091204201504.37D5B11C0264@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/psi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7678/F-12

Modified Files:
	psi-0.12-qca.patch 
Log Message:
Adapt patches in old branches

psi-0.12-qca.patch:
 configure |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: psi-0.12-qca.patch
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-12/psi-0.12-qca.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- psi-0.12-qca.patch	13 Aug 2008 20:46:11 -0000	1.1
+++ psi-0.12-qca.patch	4 Dec 2009 20:15:04 -0000	1.2
@@ -1,19 +1,22 @@
---- configure.qca	2008-08-13 19:00:52.000000000 +0200
-+++ configure	2008-08-13 21:49:20.000000000 +0200
-@@ -497,10 +497,11 @@
- 
- 		QString proextra =
- 		"CONFIG += qt crypto\n"
-+		"INCLUDEPATH += /usr/include/QtCrypto\n"
- 		"QT -= gui\n";
+diff --git a/configure b/configure
+index a5bdd58..9c89ed4 100755
+--- a/configure
++++ b/configure
+@@ -741,11 +741,12 @@ public:
+ 		} else {
+ 			proextra =
+ 			"CONFIG += qt crypto\n"
++            "INCLUDEPATH += /usr/include/QtCrypto\n"
+ 			"QT -= gui\n";
+ 		}
  
  		QString str =
 -		"#include <QtCrypto>\n"
-+		"#include <QtCrypto/QtCrypto>\n"
++        "#include <QtCrypto/QtCrypto>\n"
  		"\n"
  		"int main()\n"
  		"{\n"
-@@ -2107,9 +2108,10 @@
+@@ -2634,9 +2635,10 @@ int main()
  		if(!conf->INCLUDEPATH.isEmpty())
  			str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';
  		if(!conf->LIBS.isEmpty())



From jjh at fedoraproject.org  Fri Dec  4 20:19:30 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri,  4 Dec 2009 20:19:30 +0000 (UTC)
Subject: File nginx-0.7.64.tar.gz uploaded to lookaside cache by jjh
Message-ID: <20091204201930.318D510F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nginx:

cfa97c0f784532820110b5eee57fef6d  nginx-0.7.64.tar.gz



From jjh at fedoraproject.org  Fri Dec  4 20:20:42 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri,  4 Dec 2009 20:20:42 +0000 (UTC)
Subject: rpms/nginx/devel .cvsignore, 1.25, 1.26 nginx.spec, 1.39,
	1.40 sources, 1.25, 1.26
Message-ID: <20091204202042.4506B11C03DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9909

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.64


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	30 Oct 2009 05:27:50 -0000	1.25
+++ .cvsignore	4 Dec 2009 20:20:41 -0000	1.26
@@ -1 +1 @@
-nginx-0.7.63.tar.gz
+nginx-0.7.64.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- nginx.spec	30 Oct 2009 05:27:51 -0000	1.39
+++ nginx.spec	4 Dec 2009 20:20:42 -0000	1.40
@@ -174,6 +174,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.64-1
+- Update to new stable 0.7.64
+
 * Tue Oct 29 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.63-1
 - Update to new stable 0.7.63
 - reinstate zlib dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	30 Oct 2009 05:27:51 -0000	1.25
+++ sources	4 Dec 2009 20:20:42 -0000	1.26
@@ -1 +1 @@
-ddbdbeca5206dcc0cd7a4d9cbac00240  nginx-0.7.63.tar.gz
+cfa97c0f784532820110b5eee57fef6d  nginx-0.7.64.tar.gz



From jjh at fedoraproject.org  Fri Dec  4 20:21:41 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri,  4 Dec 2009 20:21:41 +0000 (UTC)
Subject: rpms/nginx/devel nginx.spec,1.40,1.41
Message-ID: <20091204202141.8DF6511C00E0@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10216

Modified Files:
	nginx.spec 
Log Message:
bump version


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- nginx.spec	4 Dec 2009 20:20:42 -0000	1.40
+++ nginx.spec	4 Dec 2009 20:21:41 -0000	1.41
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.63
+Version:        0.7.64
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   



From kevin at fedoraproject.org  Fri Dec  4 20:22:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Dec 2009 20:22:15 +0000 (UTC)
Subject: File munin-1.4.1.tar.gz uploaded to lookaside cache by kevin
Message-ID: <20091204202215.EB34F10F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for munin:

04086f23b657e05e4e5e5a8fa6082f16  munin-1.4.1.tar.gz



From kevin at fedoraproject.org  Fri Dec  4 20:24:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  4 Dec 2009 20:24:07 +0000 (UTC)
Subject: rpms/munin/devel munin.spec, 1.28, 1.29 sources, 1.5, 1.6 .cvsignore,
	1.5, 1.6
Message-ID: <20091204202407.B04AC11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11005

Modified Files:
	munin.spec sources .cvsignore 
Log Message:
Update to 1.4.1



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- munin.spec	1 Dec 2009 05:47:50 -0000	1.28
+++ munin.spec	4 Dec 2009 20:24:07 -0000	1.29
@@ -1,5 +1,5 @@
 Name:      munin
-Version:   1.4.0
+Version:   1.4.1
 Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
@@ -8,7 +8,7 @@ URL:       http://munin.projects.linpro.
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
 
 Patch1: munin-1.4.0-config.patch
 
@@ -16,7 +16,6 @@ Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
 Source3: munin-node.logrotate
 Source4: munin.logrotate
-Source5: nf_conntrack
 Source6: munin-1.2.6-postfix-config
 
 BuildArchitectures: noarch
@@ -24,6 +23,7 @@ BuildArchitectures: noarch
 BuildRequires: perl-Module-Build
 # needed for hostname for the defaut config
 BuildRequires: net-tools
+# java buildrequires on fedora
 BuildRequires: java-devel >= 1.6
 BuildRequires: mx4j
 BuildRequires: jpackage-utils
@@ -167,8 +167,6 @@ install -m 0644 %{SOURCE2} %{buildroot}/
 # install logrotate scripts
 install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
 install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
-# install config for nf_conntrack
-install -m 0644 %{SOURCE5} %{buildroot}/etc/munin/plugin-conf.d/nf_conntrack
 # install config for postfix under fedora
 install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
 
@@ -232,7 +230,6 @@ exit 0
 %attr(-, munin, munin) %dir /var/run/munin
 %attr(-, munin, munin) %dir /var/log/munin
 %attr(-, munin, munin) /var/www/html/munin
-%attr(-, root, root) %dir /var/www/html/munin/cgi
 %doc %{_mandir}/man8/munin*
 %doc %{_mandir}/man5/munin.conf*
 
@@ -243,7 +240,6 @@ exit 0
 %config(noreplace) /etc/munin/plugin-conf.d/munin-node
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
 %config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
-%config(noreplace) /etc/munin/plugin-conf.d/nf_conntrack
 %config(noreplace) /etc/munin/plugin-conf.d/postfix
 %config(noreplace) /etc/logrotate.d/munin-node
 /etc/rc.d/init.d/munin-node
@@ -274,6 +270,9 @@ exit 0
 %{_datadir}/java/%{name}-jmx-plugins.jar
 
 %changelog
+* Fri Dec 04 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Sat Nov 28 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-1
 - Update to final 1.4.0 version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Dec 2009 05:47:50 -0000	1.5
+++ sources	4 Dec 2009 20:24:07 -0000	1.6
@@ -1 +1 @@
-95be0e6eb98c4c7b2a4f2f922b358414  munin_1.4.0.tar.gz
+04086f23b657e05e4e5e5a8fa6082f16  munin-1.4.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Dec 2009 05:47:50 -0000	1.5
+++ .cvsignore	4 Dec 2009 20:24:07 -0000	1.6
@@ -1 +1 @@
-munin_1.4.0.tar.gz
+munin-1.4.1.tar.gz



From fabbione at fedoraproject.org  Fri Dec  4 20:28:51 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  4 Dec 2009 20:28:51 +0000 (UTC)
Subject: File openais-1.1.1.tar.gz uploaded to lookaside cache by fabbione
Message-ID: <20091204202851.60DC610F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for openais:

51cf8d1633fb7b4fd1f2457ca62b4475  openais-1.1.1.tar.gz



From jjh at fedoraproject.org  Fri Dec  4 20:38:15 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri,  4 Dec 2009 20:38:15 +0000 (UTC)
Subject: rpms/nginx/F-10 .cvsignore, 1.25, 1.26 nginx.spec, 1.33,
	1.34 sources, 1.25, 1.26
Message-ID: <20091204203815.2433511C00E0@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15018/F-10

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.64


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	30 Oct 2009 05:36:22 -0000	1.25
+++ .cvsignore	4 Dec 2009 20:38:14 -0000	1.26
@@ -1 +1 @@
-nginx-0.7.63.tar.gz
+nginx-0.7.64.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/nginx.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- nginx.spec	30 Oct 2009 05:36:22 -0000	1.33
+++ nginx.spec	4 Dec 2009 20:38:14 -0000	1.34
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.63
+Version:        0.7.64
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.64-1
+- update to 0.7.64
+
 * Thu Oct 29 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.63-1
 - update to 0.7.63
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	30 Oct 2009 05:36:22 -0000	1.25
+++ sources	4 Dec 2009 20:38:14 -0000	1.26
@@ -1 +1 @@
-ddbdbeca5206dcc0cd7a4d9cbac00240  nginx-0.7.63.tar.gz
+cfa97c0f784532820110b5eee57fef6d  nginx-0.7.64.tar.gz



From jjh at fedoraproject.org  Fri Dec  4 20:38:15 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri,  4 Dec 2009 20:38:15 +0000 (UTC)
Subject: rpms/nginx/F-12 .cvsignore, 1.25, 1.26 nginx.spec, 1.39,
	1.40 sources, 1.25, 1.26
Message-ID: <20091204203815.8AD3711C00E0@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15018/F-12

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.64


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	30 Oct 2009 05:36:24 -0000	1.25
+++ .cvsignore	4 Dec 2009 20:38:15 -0000	1.26
@@ -1 +1 @@
-nginx-0.7.63.tar.gz
+nginx-0.7.64.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-12/nginx.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- nginx.spec	30 Oct 2009 05:36:25 -0000	1.39
+++ nginx.spec	4 Dec 2009 20:38:15 -0000	1.40
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.63
+Version:        0.7.64
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -174,6 +174,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.64-1
+- Update to new stable 0.7.64
+
 * Tue Oct 29 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.63-1
 - Update to new stable 0.7.63
 - reinstate zlib dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	30 Oct 2009 05:36:25 -0000	1.25
+++ sources	4 Dec 2009 20:38:15 -0000	1.26
@@ -1 +1 @@
-ddbdbeca5206dcc0cd7a4d9cbac00240  nginx-0.7.63.tar.gz
+cfa97c0f784532820110b5eee57fef6d  nginx-0.7.64.tar.gz



From jjh at fedoraproject.org  Fri Dec  4 20:38:15 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri,  4 Dec 2009 20:38:15 +0000 (UTC)
Subject: rpms/nginx/F-11 .cvsignore, 1.25, 1.26 nginx.spec, 1.36,
	1.37 sources, 1.25, 1.26
Message-ID: <20091204203815.40EF911C029D@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15018/F-11

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.64


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	30 Oct 2009 05:36:23 -0000	1.25
+++ .cvsignore	4 Dec 2009 20:38:14 -0000	1.26
@@ -1 +1 @@
-nginx-0.7.63.tar.gz
+nginx-0.7.64.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/nginx.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- nginx.spec	30 Oct 2009 05:36:23 -0000	1.36
+++ nginx.spec	4 Dec 2009 20:38:14 -0000	1.37
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.63
+Version:        0.7.64
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.64-1
+- update to 0.7.64
+
 * Thu Oct 29 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.63-1
 - update to 0.7.63
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	30 Oct 2009 05:36:23 -0000	1.25
+++ sources	4 Dec 2009 20:38:15 -0000	1.26
@@ -1 +1 @@
-ddbdbeca5206dcc0cd7a4d9cbac00240  nginx-0.7.63.tar.gz
+cfa97c0f784532820110b5eee57fef6d  nginx-0.7.64.tar.gz



From fabbione at fedoraproject.org  Fri Dec  4 20:40:56 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  4 Dec 2009 20:40:56 +0000 (UTC)
Subject: rpms/openais/devel .cvsignore, 1.20, 1.21 openais.spec, 1.51,
	1.52 sources, 1.21, 1.22
Message-ID: <20091204204056.4558111C00E0@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16064

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release and other small cleanup bits



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	25 Sep 2009 09:55:19 -0000	1.20
+++ .cvsignore	4 Dec 2009 20:40:55 -0000	1.21
@@ -1 +1 @@
-openais-1.1.0.tar.gz
+openais-1.1.1.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- openais.spec	25 Sep 2009 09:55:19 -0000	1.51
+++ openais.spec	4 Dec 2009 20:40:55 -0000	1.52
@@ -2,12 +2,12 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
-Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz
+Source0: http://www.osdl.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires(post): /sbin/chkconfig
@@ -20,7 +20,6 @@ Conflicts: openais-devel <= 0.89
 BuildRequires: corosynclib-devel >= 1.0.0-1
 
 %define buildtrunk 0
-%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -30,7 +29,7 @@ BuildRequires: autoconf automake
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n openais-%{version}
+%setup -q -n %{name}-%{version}
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -57,7 +56,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 rm -rf %{buildroot}
 
-%description 
+%description
 This package contains the openais service handlers, default configuration
 files and init script.
 
@@ -73,7 +72,7 @@ fi
 %postun
 [ "$1" -ge "1" ] && %{_initrddir}/openais condrestart &>/dev/null || :
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc LICENSE README.amf
 %dir %{_sysconfdir}/corosync
@@ -97,10 +96,10 @@ fi
 %package -n openaislib
 Summary: The openais Standards-Based Cluster Framework libraries
 Group: System Environment/Libraries
-Conflicts: openais < 0.91-6
+Requires: %{name} = %{version}-%{release}
 
 %description -n openaislib
-This package contains openais libraries. 
+This package contains openais libraries.
 
 %files -n openaislib
 %defattr(-,root,root,-)
@@ -150,6 +149,13 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
+- New upstream release.
+- spec file updates:
+  * Cleanup macro usage
+  * Drop Conflict: in favour of correct Requires:
+  * Whitespace cleanup
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 09:55:19 -0000	1.21
+++ sources	4 Dec 2009 20:40:55 -0000	1.22
@@ -1 +1 @@
-6b73c7438e230c31aec53d6af78a6b0d  openais-1.1.0.tar.gz
+51cf8d1633fb7b4fd1f2457ca62b4475  openais-1.1.1.tar.gz



From mschwendt at fedoraproject.org  Fri Dec  4 20:50:49 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  4 Dec 2009 20:50:49 +0000 (UTC)
Subject: File audacity-minsrc-1.3.10.tar.bz2 uploaded to lookaside cache by
	mschwendt
Message-ID: <20091204205049.BF28510F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for audacity:

ffa698188e2e8f48c499268a478c579c  audacity-minsrc-1.3.10.tar.bz2



From mschwendt at fedoraproject.org  Fri Dec  4 20:53:01 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  4 Dec 2009 20:53:01 +0000 (UTC)
Subject: rpms/audacity/devel .cvsignore, 1.12, 1.13 audacity.spec, 1.87,
	1.88 sources, 1.14, 1.15 audacity-1.3.8-gsocket-conflict.patch,
	1.2, NONE audacity-1.3.9-labelpopup.patch, 1.1,
	NONE audacity-1.3.9-labeltrack-crash.patch, 1.1, NONE
Message-ID: <20091204205301.39F0511C00E0@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19785

Modified Files:
	.cvsignore audacity.spec sources 
Removed Files:
	audacity-1.3.8-gsocket-conflict.patch 
	audacity-1.3.9-labelpopup.patch 
	audacity-1.3.9-labeltrack-crash.patch 
Log Message:
* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
- Upgrade to 1.3.10-beta.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	5 Sep 2009 08:56:54 -0000	1.12
+++ .cvsignore	4 Dec 2009 20:53:00 -0000	1.13
@@ -1 +1 @@
-audacity-minsrc-1.3.9.tar.bz2
+audacity-minsrc-1.3.10.tar.bz2


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- audacity.spec	4 Dec 2009 13:47:37 -0000	1.87
+++ audacity.spec	4 Dec 2009 20:53:01 -0000	1.88
@@ -1,11 +1,11 @@
 # Compile options:
 # --with mp3          : enable mp3 support
 
-%define tartopdir audacity-src-1.3.9
+%define tartopdir audacity-src-1.3.10
 
 Name: audacity
-Version: 1.3.9
-Release: 0.5.beta%{?dist}
+Version: 1.3.10
+Release: 0.1.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -17,9 +17,6 @@ Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
-Patch3: audacity-1.3.8-gsocket-conflict.patch
-Patch4: audacity-1.3.9-labeltrack-crash.patch
-Patch5: audacity-1.3.9-labelpopup.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 Patch7: audacity-1.3.9-getmaxpeak.patch
 
@@ -70,9 +67,6 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%patch3 -p1 -b .gsocket-conflict
-%patch4 -p1 -b .labeltrack-crash
-%patch5 -p1 -b .labelpopup
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
@@ -152,6 +146,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
+- Upgrade to 1.3.10-beta.
+
 * Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.5.beta
 - Prevent race-condition segfault with Sound Activated Recording (#544125).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	5 Sep 2009 08:56:55 -0000	1.14
+++ sources	4 Dec 2009 20:53:01 -0000	1.15
@@ -1 +1 @@
-0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2
+ffa698188e2e8f48c499268a478c579c  audacity-minsrc-1.3.10.tar.bz2


--- audacity-1.3.8-gsocket-conflict.patch DELETED ---


--- audacity-1.3.9-labelpopup.patch DELETED ---


--- audacity-1.3.9-labeltrack-crash.patch DELETED ---



From lon at fedoraproject.org  Fri Dec  4 20:59:50 2009
From: lon at fedoraproject.org (Lon Hohberger)
Date: Fri,  4 Dec 2009 20:59:50 +0000 (UTC)
Subject: File fence-virt-0.1.3.tar.gz uploaded to lookaside cache by lon
Message-ID: <20091204205950.315D110F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fence-virt:

db5e1c2211c04c7c8a7f1d3047bbe778  fence-virt-0.1.3.tar.gz



From lon at fedoraproject.org  Fri Dec  4 21:00:24 2009
From: lon at fedoraproject.org (Lon Hohberger)
Date: Fri,  4 Dec 2009 21:00:24 +0000 (UTC)
Subject: rpms/fence-virt/devel .cvsignore, 1.2, 1.3 fence-virt.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091204210024.7B52811C03F6@cvs1.fedora.phx.redhat.com>

Author: lon

Update of /cvs/extras/rpms/fence-virt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22072

Modified Files:
	.cvsignore fence-virt.spec sources 
Log Message:
Rebase to fence-virt 0.1.3: add libvirt-qpid support; fix minor bug


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fence-virt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 18:00:50 -0000	1.2
+++ .cvsignore	4 Dec 2009 21:00:24 -0000	1.3
@@ -1 +1,2 @@
 fence-virt-0.1.2.tar.gz
+fence-virt-0.1.3.tar.gz


Index: fence-virt.spec
===================================================================
RCS file: /cvs/extras/rpms/fence-virt/devel/fence-virt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fence-virt.spec	25 Sep 2009 18:00:50 -0000	1.1
+++ fence-virt.spec	4 Dec 2009 21:00:24 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		fence-virt
-Version:	0.1.2
+Version:	0.1.3
 Release:	1%{?dist}
 Summary:	A pluggable fencing framework for virtual machines
 Group:		System Environment/Base
@@ -8,9 +8,11 @@ URL:		http://voxel.dl.sourceforge.net/pr
 Source0:	%{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:	corosynclib-devel cman-devel libvirt-devel openaislib-devel
+BuildRequires:	corosynclib-devel clusterlib-devel libvirt-devel
+BuildRequires:	openaislib-devel qmf-devel qpidc-devel
 BuildRequires:	automake autoconf libxml2-devel nss-devel nspr-devel
 BuildRequires:	flex bison
+Conflicts:	fence-agents < 3.0.5-2
 
 %description
 Fencing agent for virtual machines.
@@ -49,7 +51,7 @@ machines on a desktop.
 
 
 %package -n fence-virtd-checkpoint
-Summary:	Libvirt backend for fence-virtd
+Summary:	Cluster+libvirt backend for fence-virtd
 Group:		System Environment/Base
 Requires:	fence-virtd
 
@@ -61,6 +63,17 @@ machine states across a cluster and make
 about whether a virtual machine is running.
 
 
+%package -n fence-virtd-qpid
+Summary:	Libvirt-qpid backend for fence-virtd
+Group:		System Environment/Base
+Requires:	fence-virtd
+
+%description -n fence-virtd-qpid
+Provides fence_virtd with a connection to libvirt-qpid to fence
+virtual machines.  Allows fence_virtd to operate as a QMF console
+and uses QMF to route fencing requests. 
+
+
 %prep
 %setup -q
 
@@ -84,11 +97,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING TODO README
 %{_sbindir}/fence_virt
+%{_sbindir}/fence_xvm
+%{_mandir}/man8/*
 
 %files -n fence-virtd
 %defattr(-,root,root,-)
 %{_sbindir}/fence_virtd
-%config(noreplace) /etc/fence_virt.conf
+%config(noreplace) %{_sysconfdir}/fence_virt.conf
 %dir %{_libdir}/%{name}
 # TODO: init script to start fence_virtd
 # TODO: auto-config utility
@@ -105,7 +120,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/checkpoint.so
 
+%files -n fence-virtd-qpid
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libvirt-qpid.so
+
+
 %changelog
+* Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1.3-1
+- Update to latest upstream version
+- Adds libvirt-qpid backend support
+- Fixes UUID operation with libvirt backend
+- Adds man page for fence_xvm and fence_virt
+- Provides fence_xvm compatibility for cluster 3.0.6
+
 * Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1.2-1
 - Update to latest upstream version
 - Fix build issue on i686


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fence-virt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 18:00:50 -0000	1.2
+++ sources	4 Dec 2009 21:00:24 -0000	1.3
@@ -1 +1 @@
-57b25e050119071ca3a581d55b30a187  fence-virt-0.1.2.tar.gz
+db5e1c2211c04c7c8a7f1d3047bbe778  fence-virt-0.1.3.tar.gz



From nhorman at fedoraproject.org  Fri Dec  4 21:04:01 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri,  4 Dec 2009 21:04:01 +0000 (UTC)
Subject: rpms/coda/F-12 coda-6.9.4-venus-coda-client-convert.patch, NONE,
	1.1 coda.spec, 1.18, 1.19
Message-ID: <20091204210401.8042E11C00E0@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/coda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23298

Modified Files:
	coda.spec 
Added Files:
	coda-6.9.4-venus-coda-client-convert.patch 
Log Message:
Resolves bz 544096

coda-6.9.4-venus-coda-client-convert.patch:
 venus-setup.8 |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE coda-6.9.4-venus-coda-client-convert.patch ---
diff -up coda-6.9.4/coda-src/scripts/venus-setup.8.orig coda-6.9.4/coda-src/scripts/venus-setup.8
--- coda-6.9.4/coda-src/scripts/venus-setup.8.orig	2007-09-24 12:29:02.000000000 -0400
+++ coda-6.9.4/coda-src/scripts/venus-setup.8	2009-12-04 15:30:00.000000000 -0500
@@ -2,7 +2,7 @@
 .if t .ds Q ``
 .if n .ds U \&"
 .if t .ds U ''
-.TH "venus-setup" 8
+.TH "coda-client-setup" 8
 .tr \&
 .nr bi 0
 .nr ll 0
@@ -31,18 +31,18 @@
 .SH NAME  
 
 .Pp
-\fBvenus-setup\fP setup \fBvenus\fP on a client
+\fBcoda-client-setup\fP setup \fBvenus\fP on a client
 .Pp
 .SH SYNOPSIS
 
 .Pp
-\fBvenus-setup\fP [comma,separated,list,of,servers] [cachesize in kb]
+\fBcoda-client-setup\fP [comma,separated,list,of,servers] [cachesize in kb]
 .Pp
 .Pp
 .SH DESCRIPTION
 
 .Pp
-The \fBvenus-setup\fP command takes a list of servers separated
+The \fBcoda-client-setup\fP command takes a list of servers separated
 by commas, one of which must be the SCM and a cache size given in 
 kilobytes.  \fINOTE\fP: at least one server must be specified.  And
 if only one server is specified, it must be the SCM for the Coda Cell.
@@ -95,7 +95,7 @@ cache.
 .SH BUGS
 
 .Pp
-The [cachesize in kb] option to venus-setup is not very smart.  In
+The [cachesize in kb] option to coda-client-setup is not very smart.  In
 fact, it is quite dumb.  No abbreviations are allowed after the
 number and the number is taken literally to be kilobytes.
 .Pp


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/F-12/coda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- coda.spec	17 Sep 2009 19:43:45 -0000	1.18
+++ coda.spec	4 Dec 2009 21:04:01 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           coda
 Version:        6.9.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -17,6 +17,7 @@ Patch3:         coda-6.9.4-gcc44.patch
 Patch4:         coda-configure.patch
 Patch5:         coda-6.9.4-sname-fault.patch
 Patch6:         coda-6.9.4-kill-modulesconf.patch
+Patch7:		coda-6.9.4-venus-coda-client-convert.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel >= 2.5
 BuildRequires:  rpc2-devel >= 2.8
@@ -106,6 +107,9 @@ system client.
 # totally unnecessary with our init script
 %patch6 -p1
 
+# convert venus-setup to coda-client-setup
+%patch7 -p1
+
 %build
 # note: remove the -I and -l here when upstream releases fix for krb5 building
 export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et"
@@ -125,6 +129,8 @@ install -p -m 755 %{SOURCE1} $RPM_BUILD_
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/codasrv
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/auth2
 install -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/update
+mv $RPM_BUILD_ROOT/usr/sbin/venus-setup $RPM_BUILD_ROOT/usr/sbin/coda-client-setup
+mv $RPM_BUILD_ROOT/usr/share/man/man8/venus-setup.8 $RPM_BUILD_ROOT/usr/share/man/man8/coda-client-setup.8
 
 # coda mount point for the client
 mkdir -p $RPM_BUILD_ROOT/coda
@@ -183,7 +189,7 @@ fi
 /usr/sbin/asrlauncher
 /usr/sbin/codaconfedit
 /usr/sbin/venus
-/usr/sbin/venus-setup
+/usr/sbin/coda-client-setup
 /usr/sbin/volmunge
 /usr/sbin/vutil
 /usr/bin/au
@@ -218,7 +224,7 @@ fi
 /usr/share/man/man1/repair.1.gz
 /usr/share/man/man1/spy.1.gz
 /usr/share/man/man8/venus.8.gz
-/usr/share/man/man8/venus-setup.8.gz
+/usr/share/man/man8/coda-client-setup.8.gz
 /usr/share/man/man8/volmunge.8.gz
 /usr/share/man/man8/vutil.8.gz
 %ghost %dir /coda
@@ -315,6 +321,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Neil Horman <nhorman at redhat.com> - 6.9.4-9
+- Convert venus-setup to coda-client-setup (bz 544096)
+
 * Thu Sep 17 2009 Adam Goode <adam at spicenitz.org> - 6.9.4-8
 - Patch venus-setup.in to remove unnecessary modules.conf stuff
 



From abompard at fedoraproject.org  Fri Dec  4 21:05:23 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri,  4 Dec 2009 21:05:23 +0000 (UTC)
Subject: File pure-ftpd-1.0.27.tar.bz2 uploaded to lookaside cache by
	abompard
Message-ID: <20091204210523.16BA510F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pure-ftpd:

7d18544384aa1649d483ba86518ed34e  pure-ftpd-1.0.27.tar.bz2



From nhorman at fedoraproject.org  Fri Dec  4 21:05:23 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri,  4 Dec 2009 21:05:23 +0000 (UTC)
Subject: rpms/coda/devel coda-6.9.4-venus-coda-client-convert.patch, NONE,
	1.1 coda.spec, 1.18, 1.19
Message-ID: <20091204210523.921FE11C00E0@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/coda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23909

Modified Files:
	coda.spec 
Added Files:
	coda-6.9.4-venus-coda-client-convert.patch 
Log Message:
Resolves: bz 544096

coda-6.9.4-venus-coda-client-convert.patch:
 venus-setup.8 |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE coda-6.9.4-venus-coda-client-convert.patch ---
diff -up coda-6.9.4/coda-src/scripts/venus-setup.8.orig coda-6.9.4/coda-src/scripts/venus-setup.8
--- coda-6.9.4/coda-src/scripts/venus-setup.8.orig	2007-09-24 12:29:02.000000000 -0400
+++ coda-6.9.4/coda-src/scripts/venus-setup.8	2009-12-04 15:30:00.000000000 -0500
@@ -2,7 +2,7 @@
 .if t .ds Q ``
 .if n .ds U \&"
 .if t .ds U ''
-.TH "venus-setup" 8
+.TH "coda-client-setup" 8
 .tr \&
 .nr bi 0
 .nr ll 0
@@ -31,18 +31,18 @@
 .SH NAME  
 
 .Pp
-\fBvenus-setup\fP setup \fBvenus\fP on a client
+\fBcoda-client-setup\fP setup \fBvenus\fP on a client
 .Pp
 .SH SYNOPSIS
 
 .Pp
-\fBvenus-setup\fP [comma,separated,list,of,servers] [cachesize in kb]
+\fBcoda-client-setup\fP [comma,separated,list,of,servers] [cachesize in kb]
 .Pp
 .Pp
 .SH DESCRIPTION
 
 .Pp
-The \fBvenus-setup\fP command takes a list of servers separated
+The \fBcoda-client-setup\fP command takes a list of servers separated
 by commas, one of which must be the SCM and a cache size given in 
 kilobytes.  \fINOTE\fP: at least one server must be specified.  And
 if only one server is specified, it must be the SCM for the Coda Cell.
@@ -95,7 +95,7 @@ cache.
 .SH BUGS
 
 .Pp
-The [cachesize in kb] option to venus-setup is not very smart.  In
+The [cachesize in kb] option to coda-client-setup is not very smart.  In
 fact, it is quite dumb.  No abbreviations are allowed after the
 number and the number is taken literally to be kilobytes.
 .Pp


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/devel/coda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- coda.spec	17 Sep 2009 19:43:45 -0000	1.18
+++ coda.spec	4 Dec 2009 21:05:23 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           coda
 Version:        6.9.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -17,6 +17,7 @@ Patch3:         coda-6.9.4-gcc44.patch
 Patch4:         coda-configure.patch
 Patch5:         coda-6.9.4-sname-fault.patch
 Patch6:         coda-6.9.4-kill-modulesconf.patch
+Patch7:		coda-6.9.4-venus-coda-client-convert.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel >= 2.5
 BuildRequires:  rpc2-devel >= 2.8
@@ -106,6 +107,9 @@ system client.
 # totally unnecessary with our init script
 %patch6 -p1
 
+# convert venus-setup to coda-client-setup
+%patch7 -p1
+
 %build
 # note: remove the -I and -l here when upstream releases fix for krb5 building
 export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et"
@@ -125,6 +129,8 @@ install -p -m 755 %{SOURCE1} $RPM_BUILD_
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/codasrv
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/auth2
 install -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/update
+mv $RPM_BUILD_ROOT/usr/sbin/venus-setup $RPM_BUILD_ROOT/usr/sbin/coda-client-setup
+mv $RPM_BUILD_ROOT/usr/share/man/man8/venus-setup.8 $RPM_BUILD_ROOT/usr/share/man/man8/coda-client-setup.8
 
 # coda mount point for the client
 mkdir -p $RPM_BUILD_ROOT/coda
@@ -183,7 +189,7 @@ fi
 /usr/sbin/asrlauncher
 /usr/sbin/codaconfedit
 /usr/sbin/venus
-/usr/sbin/venus-setup
+/usr/sbin/coda-client-setup
 /usr/sbin/volmunge
 /usr/sbin/vutil
 /usr/bin/au
@@ -218,7 +224,7 @@ fi
 /usr/share/man/man1/repair.1.gz
 /usr/share/man/man1/spy.1.gz
 /usr/share/man/man8/venus.8.gz
-/usr/share/man/man8/venus-setup.8.gz
+/usr/share/man/man8/coda-client-setup.8.gz
 /usr/share/man/man8/volmunge.8.gz
 /usr/share/man/man8/vutil.8.gz
 %ghost %dir /coda
@@ -315,6 +321,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Neil Horman <nhorman at redhat.com> - 6.9.4-9
+- Convert venus-setup to coda-client-setup (bz 544096)
+
 * Thu Sep 17 2009 Adam Goode <adam at spicenitz.org> - 6.9.4-8
 - Patch venus-setup.in to remove unnecessary modules.conf stuff
 



From jjh at fedoraproject.org  Fri Dec  4 21:20:52 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri,  4 Dec 2009 21:20:52 +0000 (UTC)
Subject: rpms/nginx/EL-4 nginx-cve-2009-3555.patch, NONE, 1.1 nginx.spec,
	1.23, 1.24
Message-ID: <20091204212053.0770811C03DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29110

Modified Files:
	nginx.spec 
Added Files:
	nginx-cve-2009-3555.patch 
Log Message:
update to fix CVE-2009-3555

nginx-cve-2009-3555.patch:
 ngx_event_openssl.c |   40 ++++++++++++++++++++++++++++++++++++++++
 ngx_event_openssl.h |    1 +
 2 files changed, 41 insertions(+)

--- NEW FILE nginx-cve-2009-3555.patch ---
--- src/event/ngx_event_openssl.c
+++ src/event/ngx_event_openssl.c
@@ -15,6 +15,8 @@
 
 
 static int ngx_http_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store);
+static void ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where,
+    int ret);
 static void ngx_ssl_handshake_handler(ngx_event_t *ev);
 static ngx_int_t ngx_ssl_handle_recv(ngx_connection_t *c, int n);
 static void ngx_ssl_write_handler(ngx_event_t *wev);
@@ -175,6 +177,8 @@
 
     SSL_CTX_set_read_ahead(ssl->ctx, 1);
 
+    SSL_CTX_set_info_callback(ssl->ctx, ngx_ssl_info_callback);
+
     return NGX_OK;
 }
 
@@ -350,6 +354,22 @@
 }
 
 
+static void
+ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
+{
+    ngx_connection_t  *c;
+
+    if (where & SSL_CB_HANDSHAKE_START) {
+        c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+
+        if (c->ssl->handshaked) {
+            c->ssl->renegotiation = 1;
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL renegotiation");
+        }
+    }
+}
+
+
 ngx_int_t
 ngx_ssl_generate_rsa512_key(ngx_ssl_t *ssl)
 {
@@ -587,6 +607,11 @@
         c->recv_chain = ngx_ssl_recv_chain;
         c->send_chain = ngx_ssl_send_chain;
 
+        /* initial handshake done, disable renegotiation (CVE-2009-3555) */
+        if (c->ssl->connection->s3) {
+            c->ssl->connection->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
+        }
+
         return NGX_OK;
     }
 
@@ -789,6 +814,21 @@
     int        sslerr;
     ngx_err_t  err;
 
+    if (c->ssl->renegotiation) {
+        /*
+         * disable renegotiation (CVE-2009-3555):
+         * OpenSSL (at least up to 0.9.8l) does not handle disabled
+         * renegotiation gracefully, so drop connection here
+         */
+
+        ngx_log_error(NGX_LOG_NOTICE, c->log, 0, "SSL renegotiation disabled");
+
+        c->ssl->no_wait_shutdown = 1;
+        c->ssl->no_send_shutdown = 1;
+
+        return NGX_ERROR;
+    }
+
     if (n > 0) {
 
         if (c->ssl->saved_write_handler) {
--- src/event/ngx_event_openssl.h
+++ src/event/ngx_event_openssl.h
@@ -41,6 +41,7 @@
     ngx_event_handler_pt        saved_write_handler;
 
     unsigned                    handshaked:1;
+    unsigned                    renegotiation:1;
     unsigned                    buffer:1;
     unsigned                    no_wait_shutdown:1;
     unsigned                    no_send_shutdown:1;


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- nginx.spec	14 Sep 2009 20:03:52 -0000	1.23
+++ nginx.spec	4 Dec 2009 21:20:51 -0000	1.24
@@ -8,7 +8,7 @@
 
 Name:           nginx
 Version:        0.6.39
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -37,6 +37,9 @@ Patch0:     nginx-auto-cc-gcc.patch
 # etc.
 Patch1:     nginx-conf.patch
 
+# patch for http://www.kb.cert.org/vuls/id/120541
+Patch2:     nginx-cve-2009-3555.patch
+
 %description
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
 proxy server written by Igor Sysoev.
@@ -46,6 +49,7 @@ proxy server written by Igor Sysoev.
 
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 # nginx does not utilize a standard configure script.  It has its own
@@ -152,6 +156,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.39-2
+- fixes CVE-2009-3555
+
 * Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.39-1
 - update to 0.6.39
 - fixes CVE-2009-2629



From xavierb at fedoraproject.org  Fri Dec  4 21:21:27 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Fri,  4 Dec 2009 21:21:27 +0000 (UTC)
Subject: File rt-3.6.10.tar.gz uploaded to lookaside cache by xavierb
Message-ID: <20091204212127.EC65710F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rt3:

ce58755cb2e91ec40c05fd4b3cb50135  rt-3.6.10.tar.gz



From jjh at fedoraproject.org  Fri Dec  4 21:27:02 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri,  4 Dec 2009 21:27:02 +0000 (UTC)
Subject: rpms/nginx/EL-5 nginx-cve-2009-3555.patch, NONE, 1.1 nginx.spec,
	1.24, 1.25
Message-ID: <20091204212702.153B511C00E0@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30986

Modified Files:
	nginx.spec 
Added Files:
	nginx-cve-2009-3555.patch 
Log Message:
update to fix CVE-2009-3555

nginx-cve-2009-3555.patch:
 ngx_event_openssl.c |   40 ++++++++++++++++++++++++++++++++++++++++
 ngx_event_openssl.h |    1 +
 2 files changed, 41 insertions(+)

--- NEW FILE nginx-cve-2009-3555.patch ---
--- src/event/ngx_event_openssl.c
+++ src/event/ngx_event_openssl.c
@@ -15,6 +15,8 @@
 
 
 static int ngx_http_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store);
+static void ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where,
+    int ret);
 static void ngx_ssl_handshake_handler(ngx_event_t *ev);
 static ngx_int_t ngx_ssl_handle_recv(ngx_connection_t *c, int n);
 static void ngx_ssl_write_handler(ngx_event_t *wev);
@@ -175,6 +177,8 @@
 
     SSL_CTX_set_read_ahead(ssl->ctx, 1);
 
+    SSL_CTX_set_info_callback(ssl->ctx, ngx_ssl_info_callback);
+
     return NGX_OK;
 }
 
@@ -350,6 +354,22 @@
 }
 
 
+static void
+ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
+{
+    ngx_connection_t  *c;
+
+    if (where & SSL_CB_HANDSHAKE_START) {
+        c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+
+        if (c->ssl->handshaked) {
+            c->ssl->renegotiation = 1;
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL renegotiation");
+        }
+    }
+}
+
+
 ngx_int_t
 ngx_ssl_generate_rsa512_key(ngx_ssl_t *ssl)
 {
@@ -587,6 +607,11 @@
         c->recv_chain = ngx_ssl_recv_chain;
         c->send_chain = ngx_ssl_send_chain;
 
+        /* initial handshake done, disable renegotiation (CVE-2009-3555) */
+        if (c->ssl->connection->s3) {
+            c->ssl->connection->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
+        }
+
         return NGX_OK;
     }
 
@@ -789,6 +814,21 @@
     int        sslerr;
     ngx_err_t  err;
 
+    if (c->ssl->renegotiation) {
+        /*
+         * disable renegotiation (CVE-2009-3555):
+         * OpenSSL (at least up to 0.9.8l) does not handle disabled
+         * renegotiation gracefully, so drop connection here
+         */
+
+        ngx_log_error(NGX_LOG_NOTICE, c->log, 0, "SSL renegotiation disabled");
+
+        c->ssl->no_wait_shutdown = 1;
+        c->ssl->no_send_shutdown = 1;
+
+        return NGX_ERROR;
+    }
+
     if (n > 0) {
 
         if (c->ssl->saved_write_handler) {
--- src/event/ngx_event_openssl.h
+++ src/event/ngx_event_openssl.h
@@ -41,6 +41,7 @@
     ngx_event_handler_pt        saved_write_handler;
 
     unsigned                    handshaked:1;
+    unsigned                    renegotiation:1;
     unsigned                    buffer:1;
     unsigned                    no_wait_shutdown:1;
     unsigned                    no_send_shutdown:1;


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/nginx.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nginx.spec	14 Sep 2009 20:06:10 -0000	1.24
+++ nginx.spec	4 Dec 2009 21:27:01 -0000	1.25
@@ -9,7 +9,7 @@
 
 Name:           nginx
 Version:        0.6.39
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -51,6 +51,10 @@ Patch0:     nginx-auto-cc-gcc.patch
 # etc.
 Patch1:     nginx-conf.patch
 
+#patch for http://www.kb.cert.org/vuls/id/120541
+Patch2:     nginx-cve-2009-3555.patch
+
+
 %description
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
 proxy server written by Igor Sysoev.
@@ -180,6 +184,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.39-2
+- fixes CVE-2009-3555
+
 * Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.39-1
 - update to 0.6.39
 - fixes CVE-2009-2629



From xavierb at fedoraproject.org  Fri Dec  4 21:31:00 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Fri,  4 Dec 2009 21:31:00 +0000 (UTC)
Subject: rpms/rt3/EL-5 .cvsignore, 1.8, 1.9 rt3.spec, 1.27, 1.28 sources,
	1.10, 1.11
Message-ID: <20091204213100.EF35E11C0264@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/rt3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32638

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
rt 3.6.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Oct 2009 08:58:02 -0000	1.8
+++ .cvsignore	4 Dec 2009 21:31:00 -0000	1.9
@@ -1 +1 @@
-rt-3.6.9.tar.gz
+rt-3.6.10.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/rt3.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- rt3.spec	2 Oct 2009 08:58:02 -0000	1.27
+++ rt3.spec	4 Dec 2009 21:31:00 -0000	1.28
@@ -12,7 +12,7 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.6.9
+Version:	3.6.10
 Release:	1%{?dist}
 Summary:	Request tracker 3
 
@@ -280,6 +280,9 @@ fi
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
+* Thu Dec 03 2009 Xavier Bachelot <xavier at bachelot.org> - 3.6.10-1
+- Update to 3.6.10 for CVE-2009-3585 : session hijack.
+
 * Fri Oct 02 2009 Xavier Bachelot <xavier at bachelot.org> - 3.6.9-1
 - Update to 3.6.9 [SECURITY] (BZ #526872).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Oct 2009 08:58:02 -0000	1.10
+++ sources	4 Dec 2009 21:31:00 -0000	1.11
@@ -1 +1 @@
-0426548efc55281f610d628cf56870f0  rt-3.6.9.tar.gz
+ce58755cb2e91ec40c05fd4b3cb50135  rt-3.6.10.tar.gz



From stevetraylen at fedoraproject.org  Fri Dec  4 21:45:23 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Fri,  4 Dec 2009 21:45:23 +0000 (UTC)
Subject: rpms/myproxy/devel myproxy-globus-usage-location.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 myproxy.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20091204214523.9A99311C00E0@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4362

Modified Files:
	.cvsignore myproxy.spec sources 
Added Files:
	myproxy-globus-usage-location.patch 
Log Message:
Upstream 5.0 and globus bz#6897


myproxy-globus-usage-location.patch:
 configure.in |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

--- NEW FILE myproxy-globus-usage-location.patch ---
diff -uNr myproxy-5.0.ORIG/configure.in myproxy-5.0/configure.in
--- myproxy-5.0.ORIG/configure.in	2009-12-04 21:50:19.000000000 +0100
+++ myproxy-5.0/configure.in	2009-12-04 22:06:55.000000000 +0100
@@ -88,16 +88,13 @@
 dnl
 dnl Check for globus_usage_stats_send_array
 dnl
-AC_CHECK_LIB(globus_usage_$GLOBUS_FLAVOR_NAME,
-             globus_usage_stats_send_array,
-[            LIBS="$LIBS -lglobus_usage_$GLOBUS_FLAVOR_NAME -lglobus_xio_$GLOBUS_FLAVOR_NAME"],
-             AC_DEFINE(NO_GLOBUS_USAGE))
+AC_SEARCH_LIBS(globus_usage_stats_send_array,globus_usage globus_usage_$GLOBUS_FLAVOR_NAME, ,
+               AC_DEFINE(NO_GLOBUS_USAGE))
 dnl
 dnl Check for globus_gsi_proxy_handle_set_extensions
 dnl
-AC_CHECK_LIB(globus_gsi_proxy_core_$GLOBUS_FLAVOR_NAME,
-             globus_gsi_proxy_handle_set_extensions,
-             AC_DEFINE(HAVE_GLOBUS_GSI_PROXY_HANDLE_SET_EXTENSIONS))
+AC_SEARCH_LIBS(globus_gsi_proxy_handle_set_extensions, globus_gsi_proxy_core globus_gsi_proxy_core_$GLOBUS_FLAVOR_NAME, 
+               AC_DEFINE(HAVE_GLOBUS_GSI_PROXY_HANDLE_SET_EXTENSIONS))
 dnl
 dnl Check for OCSP
 dnl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Nov 2009 19:07:29 -0000	1.3
+++ .cvsignore	4 Dec 2009 21:45:21 -0000	1.4
@@ -1 +1 @@
-myproxy-4.9.tar.gz
+myproxy-5.0.tar.gz


Index: myproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/devel/myproxy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- myproxy.spec	13 Nov 2009 21:47:31 -0000	1.8
+++ myproxy.spec	4 Dec 2009 21:45:22 -0000	1.9
@@ -7,21 +7,24 @@
 %endif
 
 Name:           myproxy
-Version:        4.9
-Release:        6%{?dist}
+Version:        5.0
+Release:        1%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
 License:        NCSA and BSD and ASL 2.0
 URL:            http://grid.ncsa.illinois.edu/myproxy/
-Source0:        http://www.globus.org/ftppub/myproxy/myproxy-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/cilogon/myproxy-%{version}.tar.gz
 Source1:        myproxy.init
 Source2:        myproxy.sysconfig
 Source3:        README.Fedora
+## https://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6897
+Patch0:         %{name}-globus-usage-location.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  globus-gss-assist-devel > 3
+BuildRequires:  globus-usage-devel
 BuildRequires:  pam-devel
 BuildRequires:  graphviz
 BuildRequires:  voms-devel >= 1.9.12.1
@@ -151,6 +154,7 @@ Package %{name}-doc contains the MyProxy
 
 %prep
 %setup -q
+%patch0 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -391,6 +395,12 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Fri Dec 4 2009 Steve Traylen <steve.traylen at cern.ch> - 5.0-1
+- Add globus-globus-usage-location.patch
+  https://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6897
+- Addition of globus-usage-devel to BR.
+- New upstream 5.0
+- Upstream source hosting changed from globus to sourceforge.
 * Fri Nov 13 2009 Steve Traylen <steve.traylen at cern.ch> - 4.9-6
 - Add requires globus-gsi-cert-utils-progs for grid-proxy-info
   to myproxy-admin package rhbz#536927


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Nov 2009 19:07:29 -0000	1.3
+++ sources	4 Dec 2009 21:45:22 -0000	1.4
@@ -1 +1 @@
-05b5540ac141de40ac6d2b90b72a4877  myproxy-4.9.tar.gz
+056f24d00d090844bf851c488a036b28  myproxy-5.0.tar.gz



From mclasen at fedoraproject.org  Fri Dec  4 21:50:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 21:50:46 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.63, 1.64 at-spi.spec, 1.123,
	1.124 sources, 1.63, 1.64 at-spi-1.21.92-firefoxperf1.patch, 1.1,
	NONE at-spi-fixed-sm.patch, 1.1,
	NONE at-spi-silence-no-event-spew.patch, 1.1,
	NONE at-spi-unneeded-deps.patch, 1.2,
	NONE liyuan-greeter-crash.patch, 1.2, NONE
Message-ID: <20091204215046.565D211C0376@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5816

Modified Files:
	.cvsignore at-spi.spec sources 
Removed Files:
	at-spi-1.21.92-firefoxperf1.patch at-spi-fixed-sm.patch 
	at-spi-silence-no-event-spew.patch at-spi-unneeded-deps.patch 
	liyuan-greeter-crash.patch 
Log Message:
1.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	24 Sep 2009 00:03:51 -0000	1.63
+++ .cvsignore	4 Dec 2009 21:50:45 -0000	1.64
@@ -1 +1 @@
-at-spi-1.28.0.tar.bz2
+at-spi-1.29.3.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- at-spi.spec	27 Sep 2009 21:45:17 -0000	1.123
+++ at-spi.spec	4 Dec 2009 21:50:46 -0000	1.124
@@ -9,10 +9,10 @@
 
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
-Version: 1.28.0
-Release: 2%{?dist}
+Version: 1.29.3
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
-Source0: http://download.gnome.org/sources/at-spi/1.28/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/at-spi/1.29/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -48,8 +48,6 @@ BuildRequires: automake, autoconf, libto
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=548782
 Patch0: evo-crash.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=578334
-Patch1: at-spi-fixed-sm.patch
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -87,7 +85,6 @@ This package contains Python bindings al
 %prep
 %setup -q
 %patch0 -p1 -b .evo-crash
-%patch1 -p1 -b .fixed-sm
 
 autoreconf -i -f
 
@@ -157,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-1
+- Update to 1.29.3
+
 * Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-2
 - Use dbus sm api instead of xsmp, avoid segfault at logout (#519239)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	24 Sep 2009 00:03:52 -0000	1.63
+++ sources	4 Dec 2009 21:50:46 -0000	1.64
@@ -1 +1 @@
-06f6da7873dffc8a26b04e304236e222  at-spi-1.28.0.tar.bz2
+bb3f199340ba559a1de8746f58676a11  at-spi-1.29.3.tar.bz2


--- at-spi-1.21.92-firefoxperf1.patch DELETED ---


--- at-spi-fixed-sm.patch DELETED ---


--- at-spi-silence-no-event-spew.patch DELETED ---


--- at-spi-unneeded-deps.patch DELETED ---


--- liyuan-greeter-crash.patch DELETED ---



From mclasen at fedoraproject.org  Fri Dec  4 22:03:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 22:03:19 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec,1.124,1.125
Message-ID: <20091204220319.D07CD11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9534

Modified Files:
	at-spi.spec 
Log Message:
fix file lists



Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- at-spi.spec	4 Dec 2009 21:50:46 -0000	1.124
+++ at-spi.spec	4 Dec 2009 22:03:19 -0000	1.125
@@ -150,12 +150,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files python
 %defattr(-,root,root)
-%{python_sitearch}/pyatspi/
+%{python_sitearch}/pyatspi-corba/
 
 
 %changelog
 * Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-1
 - Update to 1.29.3
+- The Python bindings have been relocated to pyatspi-corba to
+  coexist with the new dbus-based bindings
 
 * Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-2
 - Use dbus sm api instead of xsmp, avoid segfault at logout (#519239)



From nalin at fedoraproject.org  Fri Dec  4 22:16:39 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Fri,  4 Dec 2009 22:16:39 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-buildconf.patch, 1.1, 1.2 krb5.spec, 1.216,
	1.217
Message-ID: <20091204221639.BCAE011C00E0@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13671

Modified Files:
	krb5-1.7-buildconf.patch krb5.spec 
Log Message:
- make krb5-config suppress CFLAGS output when called with --libs (#544391)


krb5-1.7-buildconf.patch:
 config/shlib.conf |    2 ++
 krb5-config.in    |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: krb5-1.7-buildconf.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-buildconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- krb5-1.7-buildconf.patch	4 Jun 2009 19:09:04 -0000	1.1
+++ krb5-1.7-buildconf.patch	4 Dec 2009 22:16:38 -0000	1.2
@@ -1,6 +1,7 @@
-Build binaries in this package as PIEs, install shared libraries with the
-execute bit set on them, and prune out the -L/usr/lib* and PIE flags where they
-might leak out and affect apps which want to link with the libraries.
+Build binaries in this package as PIEs and install shared libraries with the
+execute bit set on them.  Prune out the -L/usr/lib*, PIE flags, and CFLAGS
+where they might leak out and affect apps which just want to link with the
+libraries (RT#TBD).
 
 diff -up krb5-1.7/src/config/shlib.conf krb5-1.7/src/config/shlib.conf
 --- krb5-1.7/src/config/shlib.conf	2008-12-08 17:33:07.000000000 -0500
@@ -17,9 +18,12 @@ diff -up krb5-1.7/src/config/shlib.conf 
 diff -up krb5-1.7/src/krb5-config.in krb5-1.7/src/krb5-config.in
 --- krb5-1.7/src/krb5-config.in	2009-06-04 14:01:28.000000000 -0400
 +++ krb5-1.7/src/krb5-config.in	2009-06-04 14:01:28.000000000 -0400
-@@ -189,6 +189,11 @@ if test -n "$do_libs"; then
+@@ -187,8 +187,13 @@ if test -n "$do_libs"; then
+ 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+ 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
  	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
+-	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
++	    -e 's#\$(CFLAGS)##'`
  
 +    if test `dirname $libdir` = /usr ; then
 +        lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##" -e "s#$RPATH_FLAG$libdir##"`


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- krb5.spec	3 Dec 2009 23:26:02 -0000	1.216
+++ krb5.spec	4 Dec 2009 22:16:38 -0000	1.217
@@ -215,6 +215,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Fri Dec  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-12
+- make krb5-config suppress CFLAGS output when called with --libs (#544391)
+
 * Thu Dec  3 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-11
 - ksu: move account management checks to before we drop privileges, like
   su does (#540769)



From mclasen at fedoraproject.org  Fri Dec  4 22:29:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 22:29:29 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec,1.125,1.126
Message-ID: <20091204222929.A53BD11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16351

Modified Files:
	at-spi.spec 
Log Message:
another file list fix



Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- at-spi.spec	4 Dec 2009 22:03:19 -0000	1.125
+++ at-spi.spec	4 Dec 2009 22:29:28 -0000	1.126
@@ -151,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %files python
 %defattr(-,root,root)
 %{python_sitearch}/pyatspi-corba/
+%{python_sitearch}/pyatspi-corba.pth/
 
 
 %changelog



From chitlesh at fedoraproject.org  Fri Dec  4 22:31:21 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 22:31:21 +0000 (UTC)
Subject: File verilog-20091204.tar.bz2 uploaded to lookaside cache by
	chitlesh
Message-ID: <20091204223121.9430210F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for iverilog:

366ae53f359c4cb7e1c02409e203bade  verilog-20091204.tar.bz2



From chitlesh at fedoraproject.org  Fri Dec  4 22:35:03 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 22:35:03 +0000 (UTC)
Subject: rpms/iverilog/devel .cvsignore, 1.10, 1.11 import.log, 1.4,
	1.5 iverilog.spec, 1.13, 1.14 sources, 1.11,
	1.12 iverilog-pagesize.patch, 1.1, NONE
Message-ID: <20091204223503.CDE2611C00E0@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18913/devel

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Removed Files:
	iverilog-pagesize.patch 
Log Message:
0.9.2 prerelease


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Mar 2009 22:57:24 -0000	1.10
+++ .cvsignore	4 Dec 2009 22:35:03 -0000	1.11
@@ -1 +1 @@
-verilog-0.9.1.tar.gz
+verilog-20091204.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	13 Jul 2009 22:29:17 -0000	1.4
+++ import.log	4 Dec 2009 22:35:03 -0000	1.5
@@ -2,3 +2,4 @@ iverilog-0_9_20080905-1_fc10:HEAD:iveril
 iverilog-0_9_20081118-1_fc11:HEAD:iverilog-0.9.20081118-1.fc11.src.rpm:1228641275
 iverilog-0_9_20090423-4__fc10:HEAD:iverilog-0.9.20090423-4..fc10.src.rpm:1237848668
 iverilog-0_9_20090423-5_fc11:HEAD:iverilog-0.9.20090423-5.fc11.src.rpm:1247523987
+iverilog-0_9_20091204-1_fc12:HEAD:iverilog-0.9.20091204-1.fc12.src.rpm:1259965837


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/iverilog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- iverilog.spec	25 Jul 2009 03:42:43 -0000	1.13
+++ iverilog.spec	4 Dec 2009 22:35:03 -0000	1.14
@@ -1,14 +1,21 @@
-%define      snapshot 20090423
+# TODO for 1.0 release - redefine
+#Version:     0.9.%{snapshot}
+#Release:     6%{?dist}
+# to
+#Version:     1.0
+#Release:     1.snap%{snapshot}%{?dist}
+
+%define      snapshot 20091204
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
-Release:     6%{?dist}
+Release:     1%{?dist}
 Summary:     Icarus Verilog is a verilog compiler and simulator
 Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
-Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-0.9.1.tar.gz
-Patch0:      %{name}-pagesize.patch
+Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+#Patch0:      %{name}-pagesize.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
@@ -27,19 +34,23 @@ Requires:    %{name} = %{version}-%{rele
 Icarus Verilog devel files.
 
 %prep
-%setup -q -n verilog-0.9.1
-%patch0 -p0 -b .pagesize~
+%setup -q -n verilog-%{snapshot}
+
+sed -i "s|tail +2|tail -n +2|" Makefile.in driver/Makefile.in vvp/Makefile.in
+sh autoconf.sh
 
 # clean junks from tarball
-find . -type f -name ".cvsignore" -exec rm '{}' \;
+find . -type f -name ".git" -exec rm '{}' \;
 rm -rf `find . -type d -name "autom4te.cache" -exec echo '{}' \;`
 
+
 %build
 
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 %configure
 
-make %{?_smp_mflags}
+make 
+#{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -81,6 +92,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091204-1
+- New development snapshot - 0.9.2 prerelease snapshot
+
+* Sat Nov 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091130-1
+- New development snapshot
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.20090423-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Jul 2009 22:29:17 -0000	1.11
+++ sources	4 Dec 2009 22:35:03 -0000	1.12
@@ -1 +1 @@
-91e8f40d995bf5ded7b847fcc02a98bf  verilog-0.9.1.tar.gz
+366ae53f359c4cb7e1c02409e203bade  verilog-20091204.tar.bz2


--- iverilog-pagesize.patch DELETED ---



From chitlesh at fedoraproject.org  Fri Dec  4 22:42:57 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 22:42:57 +0000 (UTC)
Subject: rpms/iverilog/F-11 .cvsignore, 1.10, 1.11 import.log, 1.4,
	1.5 iverilog.spec, 1.12, 1.13 sources, 1.11,
	1.12 iverilog-pagesize.patch, 1.1, NONE
Message-ID: <20091204224257.D881711C00E0@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21217/F-11

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Removed Files:
	iverilog-pagesize.patch 
Log Message:
0.9.2 prerelease


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Mar 2009 22:57:24 -0000	1.10
+++ .cvsignore	4 Dec 2009 22:42:56 -0000	1.11
@@ -1 +1 @@
-verilog-0.9.1.tar.gz
+verilog-20091204.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	13 Jul 2009 22:26:24 -0000	1.4
+++ import.log	4 Dec 2009 22:42:56 -0000	1.5
@@ -2,3 +2,4 @@ iverilog-0_9_20080905-1_fc10:HEAD:iveril
 iverilog-0_9_20081118-1_fc11:HEAD:iverilog-0.9.20081118-1.fc11.src.rpm:1228641275
 iverilog-0_9_20090423-4__fc10:HEAD:iverilog-0.9.20090423-4..fc10.src.rpm:1237848668
 iverilog-0_9_20090423-5_fc11:F-11:iverilog-0.9.20090423-5.fc11.src.rpm:1247523896
+iverilog-0_9_20091204-1_fc12:F-11:iverilog-0.9.20091204-1.fc12.src.rpm:1259966454


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/iverilog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- iverilog.spec	13 Jul 2009 22:26:24 -0000	1.12
+++ iverilog.spec	4 Dec 2009 22:42:57 -0000	1.13
@@ -1,14 +1,21 @@
-%define      snapshot 20090423
+# TODO for 1.0 release - redefine
+#Version:     0.9.%{snapshot}
+#Release:     6%{?dist}
+# to
+#Version:     1.0
+#Release:     1.snap%{snapshot}%{?dist}
+
+%define      snapshot 20091204
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
-Release:     5%{?dist}
+Release:     1%{?dist}
 Summary:     Icarus Verilog is a verilog compiler and simulator
 Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
-Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-0.9.1.tar.gz
-Patch0:      %{name}-pagesize.patch
+Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+#Patch0:      %{name}-pagesize.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
@@ -27,19 +34,23 @@ Requires:    %{name} = %{version}-%{rele
 Icarus Verilog devel files.
 
 %prep
-%setup -q -n verilog-0.9.1
-%patch0 -p0 -b .pagesize~
+%setup -q -n verilog-%{snapshot}
+
+sed -i "s|tail +2|tail -n +2|" Makefile.in driver/Makefile.in vvp/Makefile.in
+sh autoconf.sh
 
 # clean junks from tarball
-find . -type f -name ".cvsignore" -exec rm '{}' \;
+find . -type f -name ".git" -exec rm '{}' \;
 rm -rf `find . -type d -name "autom4te.cache" -exec echo '{}' \;`
 
+
 %build
 
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 %configure
 
-make %{?_smp_mflags}
+make 
+#{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -81,6 +92,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091204-1
+- New development snapshot - 0.9.2 prerelease snapshot
+
+* Sat Nov 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091130-1
+- New development snapshot
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.20090423-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 13 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20090423-5
 - Improved VPI support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Jul 2009 22:26:24 -0000	1.11
+++ sources	4 Dec 2009 22:42:57 -0000	1.12
@@ -1 +1 @@
-91e8f40d995bf5ded7b847fcc02a98bf  verilog-0.9.1.tar.gz
+366ae53f359c4cb7e1c02409e203bade  verilog-20091204.tar.bz2


--- iverilog-pagesize.patch DELETED ---



From arbiter at fedoraproject.org  Fri Dec  4 22:46:22 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri,  4 Dec 2009 22:46:22 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.160,1.161
Message-ID: <20091204224622.292E211C00E0@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22084

Modified Files:
	kdebase-runtime.spec 
Log Message:
first try


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- kdebase-runtime.spec	1 Dec 2009 15:05:08 -0000	1.160
+++ kdebase-runtime.spec	4 Dec 2009 22:46:21 -0000	1.161
@@ -57,7 +57,6 @@ BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libsmbclient-devel
 BuildRequires: libssh-devel >= 0.3.92
@@ -254,7 +253,7 @@ fi
 - 4.3.3
 
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-4
-- Conflicts: kdebase4 < 4.3.0 instead 
+- Conflicts: kdebase4 < 4.3.0 instead
 
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
 - Conflicts: kdebase < 6:4.3.0
@@ -300,7 +299,7 @@ fi
 - 4.3rc3
 
 * Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
-- respin (soprano-2.3.0) 
+- respin (soprano-2.3.0)
 - License: LGPLv2+
 
 * Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1



From devrim at fedoraproject.org  Fri Dec  4 22:52:15 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 22:52:15 +0000 (UTC)
Subject: rpms/pgbouncer/F-10 pgbouncer.init,1.1,1.2 pgbouncer.spec,1.1,1.2
Message-ID: <20091204225215.35DE011C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgbouncer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23421/F-10

Modified Files:
	pgbouncer.init pgbouncer.spec 
Log Message:
Fix init script, per report from Scott Bowers: http://lists.pgfoundry.org/pipermail/pgbouncer-general/2009-December/000477.html




Index: pgbouncer.init
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-10/pgbouncer.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgbouncer.init	31 Aug 2008 10:49:05 -0000	1.1
+++ pgbouncer.init	4 Dec 2009 22:52:14 -0000	1.2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postgresql    This is the init script for starting up the pgbouncer
+# pgbouncer    This is the init script for starting up the pgbouncer
 #
 # chkconfig: - 64 36
 # description: Starts and stops the pgbouncer daemon.
@@ -66,13 +66,11 @@ start(){
 	chown postgres: /var/run/${NAME}
 
 	$SU -l postgres -c "pgbouncer '$BOUNCERCONF' & " >> "$BOUNCERLOG" 2>&1 < /dev/null
-	sleep 2
 	pid=`pidof -s pgbouncer`
         if [ $pid ]
         then
           success "$BOUNCER_START"
           touch /var/lock/subsys/${NAME}
-          echo "$pid" > "/var/run/${NAME}/${NAME}.pid"
           echo
         else
           failure "$BOUNCER_START"


Index: pgbouncer.spec
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-10/pgbouncer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgbouncer.spec	31 Aug 2008 10:49:05 -0000	1.1
+++ pgbouncer.spec	4 Dec 2009 22:52:14 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pgbouncer
 Version:	1.2.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Lightweight connection pooler for PostgreSQL
 Group:		Applications/Databases
 License:	MIT and BSD
@@ -82,6 +82,10 @@ rm -rf %{buildroot}
 %{_mandir}/man5/%{name}.*
 
 %changelog
+* Sat Dec 05 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.2.3-4
+- Fix init script, per report from Scott Bowers:
+  http://lists.pgfoundry.org/pipermail/pgbouncer-general/2009-December/000477.html
+
 * Fri Aug 29 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.3-3
 - More fixes, per Fedora review.
 



From devrim at fedoraproject.org  Fri Dec  4 22:52:15 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 22:52:15 +0000 (UTC)
Subject: rpms/pgbouncer/F-11 pgbouncer.init,1.2,1.3 pgbouncer.spec,1.3,1.4
Message-ID: <20091204225215.417AB11C02A5@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgbouncer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23421/F-11

Modified Files:
	pgbouncer.init pgbouncer.spec 
Log Message:
Fix init script, per report from Scott Bowers: http://lists.pgfoundry.org/pipermail/pgbouncer-general/2009-December/000477.html




Index: pgbouncer.init
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-11/pgbouncer.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pgbouncer.init	1 Dec 2009 22:22:04 -0000	1.2
+++ pgbouncer.init	4 Dec 2009 22:52:15 -0000	1.3
@@ -66,13 +66,11 @@ start(){
 	chown postgres: /var/run/${NAME}
 
 	$SU -l postgres -c "pgbouncer '$BOUNCERCONF' & " >> "$BOUNCERLOG" 2>&1 < /dev/null
-	sleep 2
 	pid=`pidof -s pgbouncer`
         if [ $pid ]
         then
           success "$BOUNCER_START"
           touch /var/lock/subsys/${NAME}
-          echo "$pid" > "/var/run/${NAME}/${NAME}.pid"
           echo
         else
           failure "$BOUNCER_START"


Index: pgbouncer.spec
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-11/pgbouncer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pgbouncer.spec	1 Dec 2009 22:22:04 -0000	1.3
+++ pgbouncer.spec	4 Dec 2009 22:52:15 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pgbouncer
 Version:	1.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Lightweight connection pooler for PostgreSQL
 Group:		Applications/Databases
 License:	MIT and BSD
@@ -82,6 +82,10 @@ rm -rf %{buildroot}
 %{_mandir}/man5/%{name}.*
 
 %changelog
+* Sat Dec 05 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.3.1-2
+- Fix init script, per report from Scott Bowers:
+  http://lists.pgfoundry.org/pipermail/pgbouncer-general/2009-December/000477.html
+
 * Tue Dec 1 2009 - Devrim GUNDUZ <devrim at gunduz.org> 1.3.1-1
 - Update to 1.3.1
 



From devrim at fedoraproject.org  Fri Dec  4 22:52:15 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 22:52:15 +0000 (UTC)
Subject: rpms/pgbouncer/F-12 pgbouncer.init,1.2,1.3 pgbouncer.spec,1.4,1.5
Message-ID: <20091204225215.82CD511C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgbouncer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23421/F-12

Modified Files:
	pgbouncer.init pgbouncer.spec 
Log Message:
Fix init script, per report from Scott Bowers: http://lists.pgfoundry.org/pipermail/pgbouncer-general/2009-December/000477.html




Index: pgbouncer.init
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-12/pgbouncer.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pgbouncer.init	1 Dec 2009 22:22:04 -0000	1.2
+++ pgbouncer.init	4 Dec 2009 22:52:15 -0000	1.3
@@ -66,13 +66,11 @@ start(){
 	chown postgres: /var/run/${NAME}
 
 	$SU -l postgres -c "pgbouncer '$BOUNCERCONF' & " >> "$BOUNCERLOG" 2>&1 < /dev/null
-	sleep 2
 	pid=`pidof -s pgbouncer`
         if [ $pid ]
         then
           success "$BOUNCER_START"
           touch /var/lock/subsys/${NAME}
-          echo "$pid" > "/var/run/${NAME}/${NAME}.pid"
           echo
         else
           failure "$BOUNCER_START"


Index: pgbouncer.spec
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/F-12/pgbouncer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pgbouncer.spec	1 Dec 2009 22:22:04 -0000	1.4
+++ pgbouncer.spec	4 Dec 2009 22:52:15 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		pgbouncer
 Version:	1.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Lightweight connection pooler for PostgreSQL
 Group:		Applications/Databases
 License:	MIT and BSD
@@ -82,6 +82,10 @@ rm -rf %{buildroot}
 %{_mandir}/man5/%{name}.*
 
 %changelog
+* Sat Dec 05 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.3.1-2
+- Fix init script, per report from Scott Bowers:
+  http://lists.pgfoundry.org/pipermail/pgbouncer-general/2009-December/000477.html
+
 * Tue Dec 1 2009 - Devrim GUNDUZ <devrim at gunduz.org> 1.3.1-1
 - Update to 1.3.1
 



From devrim at fedoraproject.org  Fri Dec  4 22:52:15 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  4 Dec 2009 22:52:15 +0000 (UTC)
Subject: rpms/pgbouncer/devel pgbouncer.init,1.2,1.3 pgbouncer.spec,1.4,1.5
Message-ID: <20091204225215.CCA4A11C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgbouncer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23421/devel

Modified Files:
	pgbouncer.init pgbouncer.spec 
Log Message:
Fix init script, per report from Scott Bowers: http://lists.pgfoundry.org/pipermail/pgbouncer-general/2009-December/000477.html




Index: pgbouncer.init
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/pgbouncer.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pgbouncer.init	1 Dec 2009 22:07:33 -0000	1.2
+++ pgbouncer.init	4 Dec 2009 22:52:15 -0000	1.3
@@ -66,13 +66,11 @@ start(){
 	chown postgres: /var/run/${NAME}
 
 	$SU -l postgres -c "pgbouncer '$BOUNCERCONF' & " >> "$BOUNCERLOG" 2>&1 < /dev/null
-	sleep 2
 	pid=`pidof -s pgbouncer`
         if [ $pid ]
         then
           success "$BOUNCER_START"
           touch /var/lock/subsys/${NAME}
-          echo "$pid" > "/var/run/${NAME}/${NAME}.pid"
           echo
         else
           failure "$BOUNCER_START"


Index: pgbouncer.spec
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/pgbouncer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pgbouncer.spec	1 Dec 2009 21:55:22 -0000	1.4
+++ pgbouncer.spec	4 Dec 2009 22:52:15 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		pgbouncer
 Version:	1.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Lightweight connection pooler for PostgreSQL
 Group:		Applications/Databases
 License:	MIT and BSD
@@ -82,6 +82,10 @@ rm -rf %{buildroot}
 %{_mandir}/man5/%{name}.*
 
 %changelog
+* Sat Dec 05 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.3.1-2
+- Fix init script, per report from Scott Bowers:
+  http://lists.pgfoundry.org/pipermail/pgbouncer-general/2009-December/000477.html
+
 * Tue Dec 1 2009 - Devrim GUNDUZ <devrim at gunduz.org> 1.3.1-1
 - Update to 1.3.1
 



From cjb at fedoraproject.org  Fri Dec  4 22:54:17 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Fri,  4 Dec 2009 22:54:17 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091203git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091204225417.CAB3010F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

79d174f0b3feaa1f03583ebe25530079  ohm-0.1.1-1.20091203git.tar.gz



From cjb at fedoraproject.org  Fri Dec  4 22:54:44 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Fri,  4 Dec 2009 22:54:44 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore, 1.5, 1.6 ohm.spec, 1.10, 1.11 sources, 1.7,
	1.8
Message-ID: <20091204225444.42C9411C00E0@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24376

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
Trac #9802: Check gconf for automatic_pm on startup



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Dec 2009 17:21:54 -0000	1.5
+++ .cvsignore	4 Dec 2009 22:54:43 -0000	1.6
@@ -1 +1 @@
-ohm-0.1.1-1.20091202git.tar.gz
+ohm-0.1.1-1.20091203git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ohm.spec	1 Dec 2009 17:23:21 -0000	1.10
+++ ohm.spec	4 Dec 2009 22:54:43 -0000	1.11
@@ -139,6 +139,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Dec 4 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.29.20091203git.olpc
+- Trac #9802: Check gconf for automatic_pm on startup
+
 * Tue Dec 1 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.28.20091202git.olpc
 - Fade backlight down, but go back up straight away.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Dec 2009 17:21:54 -0000	1.7
+++ sources	4 Dec 2009 22:54:44 -0000	1.8
@@ -1 +1 @@
-f156588b671a62617d9514aec73300e3  ohm-0.1.1-1.20091202git.tar.gz
+79d174f0b3feaa1f03583ebe25530079  ohm-0.1.1-1.20091203git.tar.gz



From cjb at fedoraproject.org  Fri Dec  4 22:55:25 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Fri,  4 Dec 2009 22:55:25 +0000 (UTC)
Subject: rpms/ohm/F-11 ohm.spec,1.11,1.12
Message-ID: <20091204225525.125BE11C00E0@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24575

Modified Files:
	ohm.spec 
Log Message:
update release version



Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ohm.spec	4 Dec 2009 22:54:43 -0000	1.11
+++ ohm.spec	4 Dec 2009 22:55:24 -0000	1.12
@@ -7,7 +7,7 @@
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.28.%{alphatag}%{?dist}
+Release: 9.30.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,7 +139,7 @@ fi
 %{_includedir}/*
 
 %changelog
-* Fri Dec 4 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.29.20091203git.olpc
+* Fri Dec 4 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.30.20091203git.olpc
 - Trac #9802: Check gconf for automatic_pm on startup
 
 * Tue Dec 1 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.28.20091202git.olpc



From cjb at fedoraproject.org  Fri Dec  4 22:55:57 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Fri,  4 Dec 2009 22:55:57 +0000 (UTC)
Subject: rpms/ohm/F-11 ohm.spec,1.12,1.13
Message-ID: <20091204225557.9EE9211C00E0@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24776

Modified Files:
	ohm.spec 
Log Message:
update alphatag



Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ohm.spec	4 Dec 2009 22:55:24 -0000	1.12
+++ ohm.spec	4 Dec 2009 22:55:57 -0000	1.13
@@ -2,7 +2,7 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091202git
+%define alphatag                20091203git
 
 Summary: Open Hardware Manager
 Name: ohm



From chitlesh at fedoraproject.org  Fri Dec  4 22:56:14 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri,  4 Dec 2009 22:56:14 +0000 (UTC)
Subject: rpms/iverilog/F-12 .cvsignore, 1.10, 1.11 import.log, 1.4,
	1.5 iverilog.spec, 1.13, 1.14 sources, 1.11,
	1.12 iverilog-pagesize.patch, 1.1, NONE
Message-ID: <20091204225614.156C511C00E0@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24968/F-12

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Removed Files:
	iverilog-pagesize.patch 
Log Message:
0.9.2 prerelease


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Mar 2009 22:57:24 -0000	1.10
+++ .cvsignore	4 Dec 2009 22:56:13 -0000	1.11
@@ -1 +1 @@
-verilog-0.9.1.tar.gz
+verilog-20091204.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	13 Jul 2009 22:29:17 -0000	1.4
+++ import.log	4 Dec 2009 22:56:13 -0000	1.5
@@ -2,3 +2,4 @@ iverilog-0_9_20080905-1_fc10:HEAD:iveril
 iverilog-0_9_20081118-1_fc11:HEAD:iverilog-0.9.20081118-1.fc11.src.rpm:1228641275
 iverilog-0_9_20090423-4__fc10:HEAD:iverilog-0.9.20090423-4..fc10.src.rpm:1237848668
 iverilog-0_9_20090423-5_fc11:HEAD:iverilog-0.9.20090423-5.fc11.src.rpm:1247523987
+iverilog-0_9_20091204-1_fc12:F-12:iverilog-0.9.20091204-1.fc12.src.rpm:1259966766


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/iverilog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- iverilog.spec	25 Jul 2009 03:42:43 -0000	1.13
+++ iverilog.spec	4 Dec 2009 22:56:13 -0000	1.14
@@ -1,14 +1,21 @@
-%define      snapshot 20090423
+# TODO for 1.0 release - redefine
+#Version:     0.9.%{snapshot}
+#Release:     6%{?dist}
+# to
+#Version:     1.0
+#Release:     1.snap%{snapshot}%{?dist}
+
+%define      snapshot 20091204
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
-Release:     6%{?dist}
+Release:     1%{?dist}
 Summary:     Icarus Verilog is a verilog compiler and simulator
 Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
-Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-0.9.1.tar.gz
-Patch0:      %{name}-pagesize.patch
+Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+#Patch0:      %{name}-pagesize.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
@@ -27,19 +34,23 @@ Requires:    %{name} = %{version}-%{rele
 Icarus Verilog devel files.
 
 %prep
-%setup -q -n verilog-0.9.1
-%patch0 -p0 -b .pagesize~
+%setup -q -n verilog-%{snapshot}
+
+sed -i "s|tail +2|tail -n +2|" Makefile.in driver/Makefile.in vvp/Makefile.in
+sh autoconf.sh
 
 # clean junks from tarball
-find . -type f -name ".cvsignore" -exec rm '{}' \;
+find . -type f -name ".git" -exec rm '{}' \;
 rm -rf `find . -type d -name "autom4te.cache" -exec echo '{}' \;`
 
+
 %build
 
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 %configure
 
-make %{?_smp_mflags}
+make 
+#{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -81,6 +92,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091204-1
+- New development snapshot - 0.9.2 prerelease snapshot
+
+* Sat Nov 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091130-1
+- New development snapshot
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.20090423-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Jul 2009 22:29:17 -0000	1.11
+++ sources	4 Dec 2009 22:56:13 -0000	1.12
@@ -1 +1 @@
-91e8f40d995bf5ded7b847fcc02a98bf  verilog-0.9.1.tar.gz
+366ae53f359c4cb7e1c02409e203bade  verilog-20091204.tar.bz2


--- iverilog-pagesize.patch DELETED ---



From kkofler at fedoraproject.org  Fri Dec  4 23:08:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  4 Dec 2009 23:08:25 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec, 1.161,
	1.162 kdebase-runtime-4.1.70-pulseaudio.patch, 1.1, NONE
Message-ID: <20091204230825.342BA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27925/devel

Modified Files:
	kdebase-runtime.spec 
Removed Files:
	kdebase-runtime-4.1.70-pulseaudio.patch 
Log Message:
rm old PulseAudio patch, the copied globalconfig.cpp no longer exists in 4.4 (an API exported by Phonon is used now)


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- kdebase-runtime.spec	4 Dec 2009 22:46:21 -0000	1.161
+++ kdebase-runtime.spec	4 Dec 2009 23:08:24 -0000	1.162
@@ -16,7 +16,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
 
-Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
@@ -102,7 +101,6 @@ BuildArch: noarch
 %prep
 %setup -q -n kdebase-runtime-%{version}%{?alphatag}
 
-%patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit


--- kdebase-runtime-4.1.70-pulseaudio.patch DELETED ---



From arbiter at fedoraproject.org  Fri Dec  4 23:28:11 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri,  4 Dec 2009 23:28:11 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.162,1.163
Message-ID: <20091204232811.B09EB11C00E0@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv973

Modified Files:
	kdebase-runtime.spec 
Log Message:
Filelist


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- kdebase-runtime.spec	4 Dec 2009 23:08:24 -0000	1.162
+++ kdebase-runtime.spec	4 Dec 2009 23:28:10 -0000	1.163
@@ -176,7 +176,6 @@ fi
 # FIXME(?), currently contains cmake/modules -- Rex
 %{_kde4_appsdir}/*
 %{_kde4_configdir}/*.knsrc
-%{_kde4_datadir}/autostart/nepomukserver.desktop
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
@@ -190,7 +189,6 @@ fi
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libexecdir}/*
-%{_libdir}/strigi/*
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 %{_kde4_iconsdir}/hicolor/*/*/*



From arbiter at fedoraproject.org  Fri Dec  4 23:41:11 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri,  4 Dec 2009 23:41:11 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.163,1.164
Message-ID: <20091204234111.3C1E511C00E0@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4619

Modified Files:
	kdebase-runtime.spec 
Log Message:
only comment missing stuff


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- kdebase-runtime.spec	4 Dec 2009 23:28:10 -0000	1.163
+++ kdebase-runtime.spec	4 Dec 2009 23:41:09 -0000	1.164
@@ -176,6 +176,8 @@ fi
 # FIXME(?), currently contains cmake/modules -- Rex
 %{_kde4_appsdir}/*
 %{_kde4_configdir}/*.knsrc
+# FIXME: Missing stuff from kdelibs -- lvillani
+# %{_kde4_datadir}/autostart/nepomukserver.desktop
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
@@ -189,6 +191,8 @@ fi
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libexecdir}/*
+# FIXME: Missing stuff from kdelibs -- lvillani
+# %{_libdir}/strigi/*
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 %{_kde4_iconsdir}/hicolor/*/*/*



From kdudka at fedoraproject.org  Fri Dec  4 23:50:17 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri,  4 Dec 2009 23:50:17 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.7-s390-sleep.patch, NONE, 1.1 curl.spec, 
	1.129, 1.130
Message-ID: <20091204235017.521F311C03DB@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6721

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-s390-sleep.patch 
Log Message:
- suppress failure of test513 on s390

curl-7.19.7-s390-sleep.patch:
 lib513.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE curl-7.19.7-s390-sleep.patch ---
diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
index b06a3c6..bf14650 100644
--- a/tests/libtest/lib513.c
+++ b/tests/libtest/lib513.c
@@ -12,12 +12,15 @@
 
 #include "memdebug.h"
 
+#include <unistd.h>
+
 static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
 {
   (void)ptr;
   (void)size;
   (void)nmemb;
   (void)userp;
+  sleep(2);
   return CURL_READFUNC_ABORT;
 }
 


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- curl.spec	2 Dec 2009 17:31:14 -0000	1.129
+++ curl.spec	4 Dec 2009 23:50:15 -0000	1.130
@@ -13,6 +13,7 @@ Patch4: curl-7.19.7-nss-warning.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
+Patch104: curl-7.19.7-s390-sleep.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -91,6 +92,10 @@ use cURL's capabilities internally.
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+
+# http://curl.haxx.se/mail/lib-2009-12/0031.html
+%patch104 -p1
+
 autoconf
 
 # Convert docs to UTF-8
@@ -175,8 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
-* Wed Dec 02 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-5
+* Sat Dec 05 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-5
 - avoid use of uninitialized value in lib/nss.c
+- suppress failure of test513 on s390
 
 * Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
 - do not require valgrind on s390 and s390x



From mclasen at fedoraproject.org  Fri Dec  4 23:57:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  4 Dec 2009 23:57:37 +0000 (UTC)
Subject: File gcalctool-5.29.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091204235737.A7AA510F89D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gcalctool:

4fb91ce8b86f621215c1213e1a521e28  gcalctool-5.29.2.tar.bz2



From kdudka at fedoraproject.org  Fri Dec  4 23:58:41 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri,  4 Dec 2009 23:58:41 +0000 (UTC)
Subject: rpms/curl/F-12 curl-7.19.7-s390-sleep.patch, NONE,
	1.1 curl-7.19.7-nss-warning.patch, 1.1, 1.2 curl.spec, 1.125, 1.126
Message-ID: <20091204235841.CCA5811C00E0@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8419

Modified Files:
	curl-7.19.7-nss-warning.patch curl.spec 
Added Files:
	curl-7.19.7-s390-sleep.patch 
Log Message:
- suppress failure of test513 on s390

curl-7.19.7-s390-sleep.patch:
 lib513.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE curl-7.19.7-s390-sleep.patch ---
diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
index b06a3c6..bf14650 100644
--- a/tests/libtest/lib513.c
+++ b/tests/libtest/lib513.c
@@ -12,12 +12,15 @@
 
 #include "memdebug.h"
 
+#include <unistd.h>
+
 static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
 {
   (void)ptr;
   (void)size;
   (void)nmemb;
   (void)userp;
+  sleep(2);
   return CURL_READFUNC_ABORT;
 }
 

curl-7.19.7-nss-warning.patch:
 nss.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: curl-7.19.7-nss-warning.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl-7.19.7-nss-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- curl-7.19.7-nss-warning.patch	2 Dec 2009 17:55:24 -0000	1.1
+++ curl-7.19.7-nss-warning.patch	4 Dec 2009 23:58:40 -0000	1.2
@@ -1,8 +1,8 @@
 diff --git a/lib/nss.c b/lib/nss.c
-index d1a9d1a..637663e 100644
+index 26d751a..51e62ee 100644
 --- a/lib/nss.c
 +++ b/lib/nss.c
-@@ -990,7 +990,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
+@@ -992,7 +992,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
  {
    PRInt32 err;
    PRFileDesc *model = NULL;
@@ -13,7 +13,7 @@ index d1a9d1a..637663e 100644
    struct SessionHandle *data = conn->data;
    curl_socket_t sockfd = conn->sock[sockindex];
    struct ssl_connect_data *connssl = &conn->ssl[sockindex];
-@@ -1106,8 +1108,6 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
+@@ -1100,8 +1102,6 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
    if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) != SECSuccess)
      goto error;
  


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- curl.spec	2 Dec 2009 17:55:24 -0000	1.125
+++ curl.spec	4 Dec 2009 23:58:40 -0000	1.126
@@ -12,6 +12,7 @@ Patch3: curl-7.19.7-nss-warning.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
+Patch104: curl-7.19.7-s390-sleep.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,6 +89,10 @@ use cURL's capabilities internally.
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+
+# http://curl.haxx.se/mail/lib-2009-12/0031.html
+%patch104 -p1
+
 autoconf
 
 # Convert docs to UTF-8
@@ -172,8 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
-* Wed Dec 02 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
+* Sat Dec 05 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
 - avoid use of uninitialized value in lib/nss.c
+- suppress failure of test513 on s390
 
 * Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-3
 - do not require valgrind on s390 and s390x



From mclasen at fedoraproject.org  Sat Dec  5 00:00:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 00:00:12 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.68, 1.69 gcalctool.spec, 1.99,
	1.100 sources, 1.69, 1.70
Message-ID: <20091205000012.8901911C02C4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8747

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.29.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	22 Sep 2009 00:11:49 -0000	1.68
+++ .cvsignore	5 Dec 2009 00:00:12 -0000	1.69
@@ -1 +1 @@
-gcalctool-5.28.0.tar.bz2
+gcalctool-5.29.2.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gcalctool.spec	22 Sep 2009 00:11:50 -0000	1.99
+++ gcalctool.spec	5 Dec 2009 00:00:12 -0000	1.100
@@ -1,12 +1,12 @@
 Name:           gcalctool
-Version:        5.28.0
+Version:        5.29.2
 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.28/gcalctool-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gcalctool/5.29/gcalctool-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 5.29.2-1
+- Update to 5.29.2
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 5.28.0-1
 - Update to 5.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	22 Sep 2009 00:11:50 -0000	1.69
+++ sources	5 Dec 2009 00:00:12 -0000	1.70
@@ -1 +1 @@
-03d8f034ee844888e7ec9ad317096028  gcalctool-5.28.0.tar.bz2
+4fb91ce8b86f621215c1213e1a521e28  gcalctool-5.29.2.tar.bz2



From kkofler at fedoraproject.org  Sat Dec  5 00:02:42 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Dec 2009 00:02:42 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.164,1.165
Message-ID: <20091205000242.1A63F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9320/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
Own %{_kde4_datadir}/locale/currency/ and its contents.


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- kdebase-runtime.spec	4 Dec 2009 23:41:09 -0000	1.164
+++ kdebase-runtime.spec	5 Dec 2009 00:02:40 -0000	1.165
@@ -205,6 +205,7 @@ fi
 %{_kde4_datadir}/emoticons/kde4/
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/
+%{_kde4_datadir}/locale/currency/
 %{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
 



From cwickert at fedoraproject.org  Sat Dec  5 00:06:14 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Dec 2009 00:06:14 +0000 (UTC)
Subject: File xfce4-volumed-0.1.8.tar.bz2 uploaded to lookaside cache by
	cwickert
Message-ID: <20091205000614.D0C2910F8AD@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xfce4-volumed:

9f95a7e002c3c165733e19b70de22c6b  xfce4-volumed-0.1.8.tar.bz2



From cwickert at fedoraproject.org  Sat Dec  5 00:12:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Dec 2009 00:12:37 +0000 (UTC)
Subject: rpms/xfce4-volumed/devel import.log, NONE, 1.1 xfce4-volumed.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091205001237.7971D11C00E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-volumed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11196/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xfce4-volumed.spec 
Log Message:
Initial import of xfce4-volumed. Review was at
https://bugzilla.redhat.com/show_bug.cgi?id=541154



--- NEW FILE import.log ---
xfce4-volumed-0_1_8-1_fc13:HEAD:xfce4-volumed-0.1.8-1.fc13.src.rpm:1259971902


--- NEW FILE xfce4-volumed.spec ---
Name:           xfce4-volumed
Version:        0.1.8
Release:        1%{?dist}
Summary:        Daemon to add additional functionality to the volume keys of the keyboard

Group:          User Interface/Desktops
License:        GPLv3+
URL:            https://launchpad.net/xfce4-volumed
Source0:        http://archive.xfce.org/src/apps/%{name}/0.1/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xfconf-devel
BuildRequires:  libnotify-devel
BuildRequires:  gstreamer-plugins-base-devel
BuildRequires:  xcb-util-devel >= 0.3.3
BuildRequires:  desktop-file-utils
Requires:       xfce4-mixer

%description
The xfce4-volumed adds additional functionality to the volume up/down and mute
keys of the keyboard. It makes the keys work without configuration and uses 
the XFCE 4 mixer's defined card and track for choosing which track to act on. 
The volume level is shown in a notification.

%prep
%setup -q
# fixes for the desktop file
sed -i 's|/usr/bin|%{_bindir}|g' data/%{name}.desktop
echo "Icon=multimedia-volume-control" >> data/%{name}.desktop


%build
%configure
make %{?_smp_mflags} CFLAGS='%{optflags}'


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install \
  --add-category="Utility" \
  --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
  $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/%{name}.desktop
# one launcher is enough, we don't want to have a daemon in the menu
rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README THANKS
%config %{_sysconfdir}/xdg/autostart/%{name}.desktop
%{_bindir}/%{name}


%changelog
* Tue Nov 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.8-1
- Update to 0.1.8

* Sun Nov 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.7-1
- Update to 0.1.7

* Wed Oct 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.5-1
- Update to 0.1.5

* Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.4-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-volumed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:08:44 -0000	1.1
+++ .cvsignore	5 Dec 2009 00:12:35 -0000	1.2
@@ -0,0 +1 @@
+xfce4-volumed-0.1.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-volumed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:08:44 -0000	1.1
+++ sources	5 Dec 2009 00:12:36 -0000	1.2
@@ -0,0 +1 @@
+9f95a7e002c3c165733e19b70de22c6b  xfce4-volumed-0.1.8.tar.bz2



From cwickert at fedoraproject.org  Sat Dec  5 00:13:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Dec 2009 00:13:58 +0000 (UTC)
Subject: rpms/xfce4-volumed/devel xfce4-volumed.spec,1.1,1.2
Message-ID: <20091205001358.B986C11C00E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-volumed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11584

Modified Files:
	xfce4-volumed.spec 
Log Message:
add review URL


Index: xfce4-volumed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-volumed/devel/xfce4-volumed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xfce4-volumed.spec	5 Dec 2009 00:12:36 -0000	1.1
+++ xfce4-volumed.spec	5 Dec 2009 00:13:58 -0000	1.2
@@ -1,3 +1,5 @@
+# https://bugzilla.redhat.com/show_bug.cgi?id=541154
+
 Name:           xfce4-volumed
 Version:        0.1.8
 Release:        1%{?dist}



From mclasen at fedoraproject.org  Sat Dec  5 00:17:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 00:17:04 +0000 (UTC)
Subject: rpms/gcalctool/devel gcalctool.spec,1.100,1.101
Message-ID: <20091205001704.2585811C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12209

Modified Files:
	gcalctool.spec 
Log Message:
Fix BRs



Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gcalctool.spec	5 Dec 2009 00:00:12 -0000	1.100
+++ gcalctool.spec	5 Dec 2009 00:17:02 -0000	1.101
@@ -14,6 +14,7 @@ BuildRequires: glib2-devel
 BuildRequires: gtk2-devel >= 2.6.0
 BuildRequires: libglade2-devel
 BuildRequires: GConf2-devel
+BuildRequires: libsoup-devel
 BuildRequires: desktop-file-utils >= 0.9
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils



From cwickert at fedoraproject.org  Sat Dec  5 00:20:32 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Dec 2009 00:20:32 +0000 (UTC)
Subject: rpms/xfce4-volumed/F-11 xfce4-volumed.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091205002032.4BB2111C03DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-volumed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12873/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-volumed.spec 
Log Message:
initial build of xfce4-volumed for this branch


--- NEW FILE xfce4-volumed.spec ---
# https://bugzilla.redhat.com/show_bug.cgi?id=541154

Name:           xfce4-volumed
Version:        0.1.8
Release:        1%{?dist}
Summary:        Daemon to add additional functionality to the volume keys of the keyboard

Group:          User Interface/Desktops
License:        GPLv3+
URL:            https://launchpad.net/xfce4-volumed
Source0:        http://archive.xfce.org/src/apps/%{name}/0.1/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xfconf-devel
BuildRequires:  libnotify-devel
BuildRequires:  gstreamer-plugins-base-devel
BuildRequires:  xcb-util-devel >= 0.3.3
BuildRequires:  desktop-file-utils
Requires:       xfce4-mixer

%description
The xfce4-volumed adds additional functionality to the volume up/down and mute
keys of the keyboard. It makes the keys work without configuration and uses 
the XFCE 4 mixer's defined card and track for choosing which track to act on. 
The volume level is shown in a notification.

%prep
%setup -q
# fixes for the desktop file
sed -i 's|/usr/bin|%{_bindir}|g' data/%{name}.desktop
echo "Icon=multimedia-volume-control" >> data/%{name}.desktop


%build
%configure
make %{?_smp_mflags} CFLAGS='%{optflags}'


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install \
  --add-category="Utility" \
  --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
  $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/%{name}.desktop
# one launcher is enough, we don't want to have a daemon in the menu
rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README THANKS
%config %{_sysconfdir}/xdg/autostart/%{name}.desktop
%{_bindir}/%{name}


%changelog
* Tue Nov 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.8-1
- Update to 0.1.8

* Sun Nov 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.7-1
- Update to 0.1.7

* Wed Oct 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.5-1
- Update to 0.1.5

* Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.4-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-volumed/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:08:44 -0000	1.1
+++ .cvsignore	5 Dec 2009 00:20:31 -0000	1.2
@@ -0,0 +1 @@
+xfce4-volumed-0.1.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-volumed/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:08:44 -0000	1.1
+++ sources	5 Dec 2009 00:20:31 -0000	1.2
@@ -0,0 +1 @@
+9f95a7e002c3c165733e19b70de22c6b  xfce4-volumed-0.1.8.tar.bz2



From cwickert at fedoraproject.org  Sat Dec  5 00:20:32 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Dec 2009 00:20:32 +0000 (UTC)
Subject: rpms/xfce4-volumed/F-12 xfce4-volumed.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091205002032.76B1E11C03DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-volumed/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12873/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-volumed.spec 
Log Message:
initial build of xfce4-volumed for this branch


--- NEW FILE xfce4-volumed.spec ---
# https://bugzilla.redhat.com/show_bug.cgi?id=541154

Name:           xfce4-volumed
Version:        0.1.8
Release:        1%{?dist}
Summary:        Daemon to add additional functionality to the volume keys of the keyboard

Group:          User Interface/Desktops
License:        GPLv3+
URL:            https://launchpad.net/xfce4-volumed
Source0:        http://archive.xfce.org/src/apps/%{name}/0.1/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xfconf-devel
BuildRequires:  libnotify-devel
BuildRequires:  gstreamer-plugins-base-devel
BuildRequires:  xcb-util-devel >= 0.3.3
BuildRequires:  desktop-file-utils
Requires:       xfce4-mixer

%description
The xfce4-volumed adds additional functionality to the volume up/down and mute
keys of the keyboard. It makes the keys work without configuration and uses 
the XFCE 4 mixer's defined card and track for choosing which track to act on. 
The volume level is shown in a notification.

%prep
%setup -q
# fixes for the desktop file
sed -i 's|/usr/bin|%{_bindir}|g' data/%{name}.desktop
echo "Icon=multimedia-volume-control" >> data/%{name}.desktop


%build
%configure
make %{?_smp_mflags} CFLAGS='%{optflags}'


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install \
  --add-category="Utility" \
  --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
  $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/%{name}.desktop
# one launcher is enough, we don't want to have a daemon in the menu
rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README THANKS
%config %{_sysconfdir}/xdg/autostart/%{name}.desktop
%{_bindir}/%{name}


%changelog
* Tue Nov 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.8-1
- Update to 0.1.8

* Sun Nov 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.7-1
- Update to 0.1.7

* Wed Oct 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.5-1
- Update to 0.1.5

* Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.4-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-volumed/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:08:44 -0000	1.1
+++ .cvsignore	5 Dec 2009 00:20:32 -0000	1.2
@@ -0,0 +1 @@
+xfce4-volumed-0.1.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-volumed/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:08:44 -0000	1.1
+++ sources	5 Dec 2009 00:20:32 -0000	1.2
@@ -0,0 +1 @@
+9f95a7e002c3c165733e19b70de22c6b  xfce4-volumed-0.1.8.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 00:28:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 00:28:24 +0000 (UTC)
Subject: rpms/gcalctool/devel gcalctool.spec,1.101,1.102
Message-ID: <20091205002824.308EC11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14415

Modified Files:
	gcalctool.spec 
Log Message:
fix file list



Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gcalctool.spec	5 Dec 2009 00:17:02 -0000	1.101
+++ gcalctool.spec	5 Dec 2009 00:28:23 -0000	1.102
@@ -92,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING NEWS README
 %{_sysconfdir}/gconf/schemas/gcalctool.schemas
 %{_bindir}/gcalctool
+%{_bindir}/gcalccmd
 %{_bindir}/gnome-calculator
 %{_datadir}/applications/gnome-gcalctool.desktop
 %{_datadir}/gcalctool



From kkofler at fedoraproject.org  Sat Dec  5 00:31:34 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Dec 2009 00:31:34 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.165,1.166
Message-ID: <20091205003134.640BF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15299/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Sat Dec 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
- BR exiv2-devel


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- kdebase-runtime.spec	5 Dec 2009 00:02:40 -0000	1.165
+++ kdebase-runtime.spec	5 Dec 2009 00:31:33 -0000	1.166
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.80
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -54,6 +54,7 @@ BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
+BuildRequires: exiv2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -226,7 +227,10 @@ fi
 
 
 %changelog
-* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+* Sat Dec 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
+- BR exiv2-devel
+
+* Tue Dec 01 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 
 * Mon Nov 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.2.svn1048496



From mclasen at fedoraproject.org  Sat Dec  5 00:39:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 00:39:44 +0000 (UTC)
Subject: File gucharmap-2.29.1.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091205003944.D41A710F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gucharmap:

4d517d0507712899cc4502882c3bb6fc  gucharmap-2.29.1.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 00:41:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 00:41:12 +0000 (UTC)
Subject: rpms/gucharmap/devel .cvsignore, 1.24, 1.25 gucharmap.spec, 1.45,
	1.46 sources, 1.25, 1.26
Message-ID: <20091205004112.8805711C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18264

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.29.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	22 Sep 2009 00:05:38 -0000	1.24
+++ .cvsignore	5 Dec 2009 00:41:11 -0000	1.25
@@ -1 +1 @@
-gucharmap-2.28.0.tar.bz2
+gucharmap-2.29.1.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- gucharmap.spec	2 Nov 2009 04:32:41 -0000	1.45
+++ gucharmap.spec	5 Dec 2009 00:41:11 -0000	1.46
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.28.1
+Version:        2.29.2
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -11,7 +11,7 @@ Group:          Applications/System
 License:        GPLv2+ and GFDL and MIT
 # GPL for the source code, GFDL for the docs, MIT for Unicode data
 URL:            http://live.gnome.org/Gucharmap
-Source:         http://download.gnome.org/sources/gucharmap/2.28/gucharmap-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gucharmap/2.29/gucharmap-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnome-doc-utils >= 0.3.2
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.2-1
+- Update to 2.29.2
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	2 Nov 2009 04:32:41 -0000	1.25
+++ sources	5 Dec 2009 00:41:12 -0000	1.26
@@ -1 +1 @@
-409a08462fab85daa5523e950a794561  gucharmap-2.28.1.tar.bz2
+4d517d0507712899cc4502882c3bb6fc  gucharmap-2.29.1.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 00:44:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 00:44:17 +0000 (UTC)
Subject: File yelp-2.28.1.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091205004417.4F4C210F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for yelp:

faf7eac7abf4eded189566f9ffafc188  yelp-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 00:45:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 00:45:21 +0000 (UTC)
Subject: rpms/yelp/devel .cvsignore, 1.55, 1.56 sources, 1.57, 1.58 yelp.spec,
	1.172, 1.173
Message-ID: <20091205004521.33F8C11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19111

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	22 Sep 2009 00:01:41 -0000	1.55
+++ .cvsignore	5 Dec 2009 00:45:20 -0000	1.56
@@ -1 +1 @@
-yelp-2.28.0.tar.bz2
+yelp-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	22 Sep 2009 00:01:41 -0000	1.57
+++ sources	5 Dec 2009 00:45:20 -0000	1.58
@@ -1 +1 @@
-4e68e796927198e644a57d455c16c389  yelp-2.28.0.tar.bz2
+faf7eac7abf4eded189566f9ffafc188  yelp-2.28.1.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- yelp.spec	2 Dec 2009 21:45:47 -0000	1.172
+++ yelp.spec	5 Dec 2009 00:45:20 -0000	1.173
@@ -19,8 +19,8 @@
 
 Summary: Help browser for the GNOME desktop
 Name: yelp
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.28/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -161,6 +161,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - make mono dep more automatic
 



From mclasen at fedoraproject.org  Sat Dec  5 00:46:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 00:46:01 +0000 (UTC)
Subject: rpms/gucharmap/devel gucharmap.spec,1.46,1.47
Message-ID: <20091205004601.E375E11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19234

Modified Files:
	gucharmap.spec 
Log Message:
fix version



Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gucharmap.spec	5 Dec 2009 00:41:11 -0000	1.46
+++ gucharmap.spec	5 Dec 2009 00:46:01 -0000	1.47
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.29.2
+Version:        2.29.1
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -142,8 +142,8 @@ fi
 
 
 %changelog
-* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.2-1
-- Update to 2.29.2
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.1-1
+- Update to 2.29.1
 
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1



From cwickert at fedoraproject.org  Sat Dec  5 01:42:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Dec 2009 01:42:58 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.342, 1.343 comps-f12.xml.in, 1.209,
	1.210 comps-f13.xml.in, 1.108, 1.109
Message-ID: <20091205014258.9785411C00E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29730

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
add xfce4-volumed


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -p -r1.342 -r1.343
--- comps-f11.xml.in	29 Nov 2009 17:40:24 -0000	1.342
+++ comps-f11.xml.in	5 Dec 2009 01:42:56 -0000	1.343
@@ -6009,6 +6009,7 @@
       <packagereq type="optional">xfce4-timer-plugin</packagereq>
       <packagereq type="optional">xfce4-verve-plugin</packagereq>
       <packagereq type="optional">xfce4-volstatus-icon</packagereq>
+      <packagereq type="optional">xfce4-volumed</packagereq>
       <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- comps-f12.xml.in	30 Nov 2009 19:27:55 -0000	1.209
+++ comps-f12.xml.in	5 Dec 2009 01:42:57 -0000	1.210
@@ -6314,6 +6314,7 @@
       <packagereq type="optional">xfce4-timer-plugin</packagereq>
       <packagereq type="optional">xfce4-verve-plugin</packagereq>
       <packagereq type="optional">xfce4-volstatus-icon</packagereq>
+      <packagereq type="optional">xfce4-volumed</packagereq>
       <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- comps-f13.xml.in	3 Dec 2009 10:30:15 -0000	1.108
+++ comps-f13.xml.in	5 Dec 2009 01:42:57 -0000	1.109
@@ -6320,6 +6320,7 @@
       <packagereq type="optional">xfce4-timer-plugin</packagereq>
       <packagereq type="optional">xfce4-verve-plugin</packagereq>
       <packagereq type="optional">xfce4-volstatus-icon</packagereq>
+      <packagereq type="optional">xfce4-volumed</packagereq>
       <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>



From cwickert at fedoraproject.org  Sat Dec  5 01:48:27 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Dec 2009 01:48:27 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.343, 1.344 comps-f12.xml.in, 1.210,
	1.211 comps-f13.xml.in, 1.109, 1.110
Message-ID: <20091205014827.C41C811C00E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31342

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
add xpaint


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -p -r1.343 -r1.344
--- comps-f11.xml.in	5 Dec 2009 01:42:56 -0000	1.343
+++ comps-f11.xml.in	5 Dec 2009 01:48:27 -0000	1.344
@@ -2727,6 +2727,7 @@
       <packagereq type="optional">viewnior</packagereq>
       <packagereq type="optional">wings</packagereq>
       <packagereq type="optional">xfig</packagereq>
+      <packagereq type="optional">xpaint</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- comps-f12.xml.in	5 Dec 2009 01:42:57 -0000	1.210
+++ comps-f12.xml.in	5 Dec 2009 01:48:27 -0000	1.211
@@ -2922,6 +2922,7 @@
       <packagereq type="optional">viewnior</packagereq>
       <packagereq type="optional">wings</packagereq>
       <packagereq type="optional">xfig</packagereq>
+      <packagereq type="optional">xpaint</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- comps-f13.xml.in	5 Dec 2009 01:42:57 -0000	1.109
+++ comps-f13.xml.in	5 Dec 2009 01:48:27 -0000	1.110
@@ -2930,6 +2930,7 @@
       <packagereq type="optional">viewnior</packagereq>
       <packagereq type="optional">wings</packagereq>
       <packagereq type="optional">xfig</packagereq>
+      <packagereq type="optional">xpaint</packagereq>
     </packagelist>
   </group>
   <group>



From mclasen at fedoraproject.org  Sat Dec  5 01:56:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 01:56:42 +0000 (UTC)
Subject: rpms/yelp/devel ellipsis.patch,1.1,1.2
Message-ID: <20091205015642.3B1FD11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2593

Modified Files:
	ellipsis.patch 
Log Message:
update patch


ellipsis.patch:
 LINGUAS  |    1 
 en_US.po | 1471 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1472 insertions(+)

Index: ellipsis.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/ellipsis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ellipsis.patch	24 Aug 2009 01:24:52 -0000	1.1
+++ ellipsis.patch	5 Dec 2009 01:56:41 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up yelp-2.27.2/po/en_US.po.ellipsis yelp-2.27.2/po/en_US.po
---- yelp-2.27.2/po/en_US.po.ellipsis	2009-08-23 21:20:11.306577494 -0400
-+++ yelp-2.27.2/po/en_US.po	2009-08-23 21:12:19.760570894 -0400
+diff -up yelp-2.28.1/po/en_US.po.ellipsis yelp-2.28.1/po/en_US.po
+--- yelp-2.28.1/po/en_US.po.ellipsis	2009-12-04 20:52:23.148822723 -0500
++++ yelp-2.28.1/po/en_US.po	2009-12-04 20:52:23.148822723 -0500
 @@ -0,0 +1,1471 @@
 +#, fuzzy
 +msgid ""
@@ -1473,14 +1473,14 @@ diff -up yelp-2.27.2/po/en_US.po.ellipsi
 +#: ../yelp.desktop.in.in.h:1
 +msgid "Get help with GNOME"
 +msgstr ""
-diff -up yelp-2.27.2/po/LINGUAS.ellipsis yelp-2.27.2/po/LINGUAS
---- yelp-2.27.2/po/LINGUAS.ellipsis	2009-08-23 21:20:00.333574022 -0400
-+++ yelp-2.27.2/po/LINGUAS	2009-08-23 21:10:52.270843205 -0400
-@@ -20,6 +20,7 @@ da
- de
- dz
+diff -up yelp-2.28.1/po/LINGUAS.ellipsis yelp-2.28.1/po/LINGUAS
+--- yelp-2.28.1/po/LINGUAS.ellipsis	2009-11-19 12:09:56.000000000 -0500
++++ yelp-2.28.1/po/LINGUAS	2009-12-04 20:54:00.140559800 -0500
+@@ -23,6 +23,7 @@ dz
  el
-+en_US
  en_CA
  en_GB
++en_US
+ en at shaw
  eo
+ es



From mclasen at fedoraproject.org  Sat Dec  5 02:03:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 02:03:49 +0000 (UTC)
Subject: File vinagre-2.29.1.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091205020349.024F410F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for vinagre:

c716d8aad8d3074bf6c02d5daba17ec4  vinagre-2.29.1.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 02:04:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 02:04:33 +0000 (UTC)
Subject: rpms/yelp/F-12 ellipsis.patch, 1.1, 1.2 sources, 1.57,
	1.58 yelp.spec, 1.172, 1.173
Message-ID: <20091205020433.78C3711C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5971

Modified Files:
	ellipsis.patch sources yelp.spec 
Log Message:
2.28.1


ellipsis.patch:
 LINGUAS  |    1 
 en_US.po | 1471 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1472 insertions(+)

Index: ellipsis.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-12/ellipsis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ellipsis.patch	24 Aug 2009 01:24:52 -0000	1.1
+++ ellipsis.patch	5 Dec 2009 02:04:31 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up yelp-2.27.2/po/en_US.po.ellipsis yelp-2.27.2/po/en_US.po
---- yelp-2.27.2/po/en_US.po.ellipsis	2009-08-23 21:20:11.306577494 -0400
-+++ yelp-2.27.2/po/en_US.po	2009-08-23 21:12:19.760570894 -0400
+diff -up yelp-2.28.1/po/en_US.po.ellipsis yelp-2.28.1/po/en_US.po
+--- yelp-2.28.1/po/en_US.po.ellipsis	2009-12-04 20:52:23.148822723 -0500
++++ yelp-2.28.1/po/en_US.po	2009-12-04 20:52:23.148822723 -0500
 @@ -0,0 +1,1471 @@
 +#, fuzzy
 +msgid ""
@@ -1473,14 +1473,14 @@ diff -up yelp-2.27.2/po/en_US.po.ellipsi
 +#: ../yelp.desktop.in.in.h:1
 +msgid "Get help with GNOME"
 +msgstr ""
-diff -up yelp-2.27.2/po/LINGUAS.ellipsis yelp-2.27.2/po/LINGUAS
---- yelp-2.27.2/po/LINGUAS.ellipsis	2009-08-23 21:20:00.333574022 -0400
-+++ yelp-2.27.2/po/LINGUAS	2009-08-23 21:10:52.270843205 -0400
-@@ -20,6 +20,7 @@ da
- de
- dz
+diff -up yelp-2.28.1/po/LINGUAS.ellipsis yelp-2.28.1/po/LINGUAS
+--- yelp-2.28.1/po/LINGUAS.ellipsis	2009-11-19 12:09:56.000000000 -0500
++++ yelp-2.28.1/po/LINGUAS	2009-12-04 20:54:00.140559800 -0500
+@@ -23,6 +23,7 @@ dz
  el
-+en_US
  en_CA
  en_GB
++en_US
+ en at shaw
  eo
+ es


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-12/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	22 Sep 2009 00:01:41 -0000	1.57
+++ sources	5 Dec 2009 02:04:31 -0000	1.58
@@ -1 +1 @@
-4e68e796927198e644a57d455c16c389  yelp-2.28.0.tar.bz2
+faf7eac7abf4eded189566f9ffafc188  yelp-2.28.1.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-12/yelp.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- yelp.spec	2 Dec 2009 21:47:34 -0000	1.172
+++ yelp.spec	5 Dec 2009 02:04:32 -0000	1.173
@@ -19,8 +19,8 @@
 
 Summary: Help browser for the GNOME desktop
 Name: yelp
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.28/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -161,8 +161,11 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
-* Wed Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
-- Make mono dep more automatic
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
+* Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- make mono dep more automatic
 
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0



From cjb at fedoraproject.org  Sat Dec  5 02:07:06 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Sat,  5 Dec 2009 02:07:06 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091204git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091205020706.DF53810F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

6b4796bf9ac06e9b0ef51cb1f96292d7  ohm-0.1.1-1.20091204git.tar.gz



From cjb at fedoraproject.org  Sat Dec  5 02:07:50 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Sat,  5 Dec 2009 02:07:50 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore, 1.6, 1.7 ohm.spec, 1.13, 1.14 sources, 1.8,
	1.9
Message-ID: <20091205020750.5474A11C00E0@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7512

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
Trac #9802: Run gconftool as user olpc, to avoid it chown()ing ~olpc/.gconf



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Dec 2009 22:54:43 -0000	1.6
+++ .cvsignore	5 Dec 2009 02:07:49 -0000	1.7
@@ -1 +1 @@
-ohm-0.1.1-1.20091203git.tar.gz
+ohm-0.1.1-1.20091204git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ohm.spec	4 Dec 2009 22:55:57 -0000	1.13
+++ ohm.spec	5 Dec 2009 02:07:50 -0000	1.14
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091203git
+%define alphatag                20091204git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.30.%{alphatag}%{?dist}
+Release: 9.31.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,6 +139,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Dec 4 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.31.20091204git.olpc
+- Trac #9802: Run gconftool as user olpc, to avoid it chown()ing ~olpc/.gconf
+
 * Fri Dec 4 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.30.20091203git.olpc
 - Trac #9802: Check gconf for automatic_pm on startup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Dec 2009 22:54:44 -0000	1.8
+++ sources	5 Dec 2009 02:07:50 -0000	1.9
@@ -1 +1 @@
-79d174f0b3feaa1f03583ebe25530079  ohm-0.1.1-1.20091203git.tar.gz
+6b4796bf9ac06e9b0ef51cb1f96292d7  ohm-0.1.1-1.20091204git.tar.gz



From hicham at fedoraproject.org  Sat Dec  5 02:26:58 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:26:58 +0000 (UTC)
Subject: File jide-oss-2.7.6-1340svn.tar.bz2 uploaded to lookaside cache by
	hicham
Message-ID: <20091205022658.1F6C110F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for jide-oss:

4e1884cf3ec5aa4dba8b44afc128354c  jide-oss-2.7.6-1340svn.tar.bz2



From hicham at fedoraproject.org  Sat Dec  5 02:29:55 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:29:55 +0000 (UTC)
Subject: rpms/jide-oss/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 jide-oss-AquaJidePopupMenuUI.java.patch, 1.1,
	1.2 jide-oss.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091205022955.D9CA411C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15137/devel

Modified Files:
	.cvsignore import.log jide-oss-AquaJidePopupMenuUI.java.patch 
	jide-oss.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Aug 2009 20:31:58 -0000	1.2
+++ .cvsignore	5 Dec 2009 02:29:54 -0000	1.3
@@ -1 +1 @@
-jide-oss-2.7.1-1181svn.tar.bz2
+jide-oss-2.7.6-1340svn.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Aug 2009 20:31:58 -0000	1.1
+++ import.log	5 Dec 2009 02:29:54 -0000	1.2
@@ -1 +1,2 @@
 jide-oss-2_7_1-3_1181svn_fc11:HEAD:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677077
+jide-oss-2_7_6-1_1340svn_fc12:HEAD:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980044

jide-oss-AquaJidePopupMenuUI.java.patch:
 AquaJidePopupMenuUI.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: jide-oss-AquaJidePopupMenuUI.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/jide-oss-AquaJidePopupMenuUI.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss-AquaJidePopupMenuUI.java.patch	7 Aug 2009 20:31:58 -0000	1.1
+++ jide-oss-AquaJidePopupMenuUI.java.patch	5 Dec 2009 02:29:54 -0000	1.2
@@ -1,15 +1,12 @@
-diff -up jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java
---- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-08-06 13:47:15.841910104 +0100
-+++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-08-06 13:55:33.894910534 +0100
-@@ -5,14 +5,14 @@
-  */
+--- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-12-05 00:10:39.000000000 +0000
++++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-12-05 00:27:28.618149194 +0000
+@@ -6,13 +6,13 @@
  
  package com.jidesoft.plaf.aqua;
--
+ 
 -import apple.laf.AquaPopupMenuUI;
-+
 +import javax.swing.plaf.PopupMenuUI;
- import com.jidesoft.swing.SimpleScrollPane;
+ import com.jidesoft.plaf.basic.BasicJidePopupMenuUI;
  
  import javax.swing.*;
  import javax.swing.plaf.ComponentUI;


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/jide-oss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss.spec	7 Aug 2009 20:31:58 -0000	1.1
+++ jide-oss.spec	5 Dec 2009 02:29:54 -0000	1.2
@@ -1,16 +1,16 @@
 # SVN revision used
-%global svnrel 1181
+%global svnrel 1340
 
 Name:		jide-oss
-Version:	2.7.1
-Release:	3.%{svnrel}svn%{?dist}
+Version:	2.7.6
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
 URL:		https://jide-oss.dev.java.net/
 
 #This is an svn snapshot, to get this tarball :
-#then to checkout the project source repository : svn checkout -r %{svnrel} https://jide-oss.dev.java.net/svn/jide-oss/trunk jide-oss --username guest
+#then to checkout the project source repository : svn checkout https://jide-oss.dev.java.net/svn/jide-oss/branches/trunk_%{version} jide-oss --username guest
 #create the tarball : tar -cjvf jide-oss-%{version}-%{svnrel}svn.tar.bz2 jide-oss
 
 Source0:	%{name}-%{version}-%{svnrel}svn.tar.bz2
@@ -44,19 +44,11 @@ so that more and more developers can lev
 building them again.
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Group:		Documentation
-Requires:	%{name} = %{version}
-
-%description javadoc
-Javadoc for %{name}.
-
-%package doc
 Summary:	User documentation for %{name}
 Group:		Documentation
 Requires:	%{name} = %{version}
 
-%description doc
+%description javadoc
 User documentation for %{name}.
 
 %prep
@@ -65,11 +57,11 @@ find -name '*.jar' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
 sed -i "s|\r||g" LICENSE.txt
 
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .unknown_character
+%patch1 -p1 -b .replace_aquapopupmenuui
 
 %build
-%ant javadoc jar
+%ant javadoc jar | grep -v sun
 
 %install
 rm -rf %{buildroot}
@@ -98,14 +90,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
-%files doc
-%defattr(-,root,root,-)
-%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
-
 %changelog
-* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
-- Added doc package.
-
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Aug 2009 20:31:58 -0000	1.2
+++ sources	5 Dec 2009 02:29:54 -0000	1.3
@@ -1 +1 @@
-c6526fefdeeb452c40593a4e4a86850c  jide-oss-2.7.1-1181svn.tar.bz2
+4e1884cf3ec5aa4dba8b44afc128354c  jide-oss-2.7.6-1340svn.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 02:34:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 02:34:06 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.30, 1.31 sources, 1.31,
	1.32 vinagre.spec, 1.62, 1.63
Message-ID: <20091205023406.2492B11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6570

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.29.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	23 Sep 2009 23:14:42 -0000	1.30
+++ .cvsignore	5 Dec 2009 02:34:05 -0000	1.31
@@ -1 +1 @@
-vinagre-2.28.0.1.tar.bz2
+vinagre-2.29.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	2 Nov 2009 04:26:06 -0000	1.31
+++ sources	5 Dec 2009 02:34:05 -0000	1.32
@@ -1 +1 @@
-3fec37a3e20d6f3641d905b580f7306a  vinagre-2.28.1.tar.bz2
+c716d8aad8d3074bf6c02d5daba17ec4  vinagre-2.29.1.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- vinagre.spec	2 Nov 2009 04:26:06 -0000	1.62
+++ vinagre.spec	5 Dec 2009 02:34:05 -0000	1.63
@@ -1,12 +1,12 @@
 Name:		vinagre
-Version:	2.28.1
+Version:	2.29.1
 Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://projects.gnome.org/vinagre/
-Source0:	http://download.gnome.org/sources/vinagre/2.28/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/vinagre/2.29/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -155,6 +155,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> 2.29.1-1
+- 2.29.1
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From hicham at fedoraproject.org  Sat Dec  5 02:35:36 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:35:36 +0000 (UTC)
Subject: rpms/jide-oss/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 jide-oss-AquaJidePopupMenuUI.java.patch, 1.1,
	1.2 jide-oss.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091205023536.254AE11C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17902/F-11

Modified Files:
	.cvsignore import.log jide-oss-AquaJidePopupMenuUI.java.patch 
	jide-oss.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Aug 2009 20:42:29 -0000	1.2
+++ .cvsignore	5 Dec 2009 02:35:35 -0000	1.3
@@ -1 +1 @@
-jide-oss-2.7.1-1181svn.tar.bz2
+jide-oss-2.7.6-1340svn.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Aug 2009 20:42:29 -0000	1.1
+++ import.log	5 Dec 2009 02:35:35 -0000	1.2
@@ -1 +1,2 @@
 jide-oss-2_7_1-3_1181svn_fc11:F-11:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677715
+jide-oss-2_7_6-1_1340svn_fc12:F-11:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980473

jide-oss-AquaJidePopupMenuUI.java.patch:
 AquaJidePopupMenuUI.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: jide-oss-AquaJidePopupMenuUI.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/jide-oss-AquaJidePopupMenuUI.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss-AquaJidePopupMenuUI.java.patch	7 Aug 2009 20:42:29 -0000	1.1
+++ jide-oss-AquaJidePopupMenuUI.java.patch	5 Dec 2009 02:35:35 -0000	1.2
@@ -1,15 +1,12 @@
-diff -up jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java
---- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-08-06 13:47:15.841910104 +0100
-+++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-08-06 13:55:33.894910534 +0100
-@@ -5,14 +5,14 @@
-  */
+--- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-12-05 00:10:39.000000000 +0000
++++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-12-05 00:27:28.618149194 +0000
+@@ -6,13 +6,13 @@
  
  package com.jidesoft.plaf.aqua;
--
+ 
 -import apple.laf.AquaPopupMenuUI;
-+
 +import javax.swing.plaf.PopupMenuUI;
- import com.jidesoft.swing.SimpleScrollPane;
+ import com.jidesoft.plaf.basic.BasicJidePopupMenuUI;
  
  import javax.swing.*;
  import javax.swing.plaf.ComponentUI;


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/jide-oss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss.spec	7 Aug 2009 20:42:29 -0000	1.1
+++ jide-oss.spec	5 Dec 2009 02:35:35 -0000	1.2
@@ -1,16 +1,16 @@
 # SVN revision used
-%global svnrel 1181
+%global svnrel 1340
 
 Name:		jide-oss
-Version:	2.7.1
-Release:	3.%{svnrel}svn%{?dist}
+Version:	2.7.6
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
 URL:		https://jide-oss.dev.java.net/
 
 #This is an svn snapshot, to get this tarball :
-#then to checkout the project source repository : svn checkout -r %{svnrel} https://jide-oss.dev.java.net/svn/jide-oss/trunk jide-oss --username guest
+#then to checkout the project source repository : svn checkout https://jide-oss.dev.java.net/svn/jide-oss/branches/trunk_%{version} jide-oss --username guest
 #create the tarball : tar -cjvf jide-oss-%{version}-%{svnrel}svn.tar.bz2 jide-oss
 
 Source0:	%{name}-%{version}-%{svnrel}svn.tar.bz2
@@ -44,19 +44,11 @@ so that more and more developers can lev
 building them again.
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Group:		Documentation
-Requires:	%{name} = %{version}
-
-%description javadoc
-Javadoc for %{name}.
-
-%package doc
 Summary:	User documentation for %{name}
 Group:		Documentation
 Requires:	%{name} = %{version}
 
-%description doc
+%description javadoc
 User documentation for %{name}.
 
 %prep
@@ -65,11 +57,11 @@ find -name '*.jar' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
 sed -i "s|\r||g" LICENSE.txt
 
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .unknown_character
+%patch1 -p1 -b .replace_aquapopupmenuui
 
 %build
-%ant javadoc jar
+%ant javadoc jar | grep -v sun
 
 %install
 rm -rf %{buildroot}
@@ -98,14 +90,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
-%files doc
-%defattr(-,root,root,-)
-%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
-
 %changelog
-* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
-- Added doc package.
-
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Aug 2009 20:42:29 -0000	1.2
+++ sources	5 Dec 2009 02:35:35 -0000	1.3
@@ -1 +1 @@
-c6526fefdeeb452c40593a4e4a86850c  jide-oss-2.7.1-1181svn.tar.bz2
+4e1884cf3ec5aa4dba8b44afc128354c  jide-oss-2.7.6-1340svn.tar.bz2



From hicham at fedoraproject.org  Sat Dec  5 02:37:21 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:37:21 +0000 (UTC)
Subject: rpms/jide-oss/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 jide-oss-AquaJidePopupMenuUI.java.patch, 1.1,
	1.2 jide-oss.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091205023721.7FC3511C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18616/F-12

Modified Files:
	.cvsignore import.log jide-oss-AquaJidePopupMenuUI.java.patch 
	jide-oss.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Aug 2009 20:31:58 -0000	1.2
+++ .cvsignore	5 Dec 2009 02:37:20 -0000	1.3
@@ -1 +1 @@
-jide-oss-2.7.1-1181svn.tar.bz2
+jide-oss-2.7.6-1340svn.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Aug 2009 20:31:58 -0000	1.1
+++ import.log	5 Dec 2009 02:37:21 -0000	1.2
@@ -1 +1,2 @@
 jide-oss-2_7_1-3_1181svn_fc11:HEAD:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677077
+jide-oss-2_7_6-1_1340svn_fc12:F-12:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980468

jide-oss-AquaJidePopupMenuUI.java.patch:
 AquaJidePopupMenuUI.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: jide-oss-AquaJidePopupMenuUI.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/jide-oss-AquaJidePopupMenuUI.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss-AquaJidePopupMenuUI.java.patch	7 Aug 2009 20:31:58 -0000	1.1
+++ jide-oss-AquaJidePopupMenuUI.java.patch	5 Dec 2009 02:37:21 -0000	1.2
@@ -1,15 +1,12 @@
-diff -up jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java
---- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-08-06 13:47:15.841910104 +0100
-+++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-08-06 13:55:33.894910534 +0100
-@@ -5,14 +5,14 @@
-  */
+--- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-12-05 00:10:39.000000000 +0000
++++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-12-05 00:27:28.618149194 +0000
+@@ -6,13 +6,13 @@
  
  package com.jidesoft.plaf.aqua;
--
+ 
 -import apple.laf.AquaPopupMenuUI;
-+
 +import javax.swing.plaf.PopupMenuUI;
- import com.jidesoft.swing.SimpleScrollPane;
+ import com.jidesoft.plaf.basic.BasicJidePopupMenuUI;
  
  import javax.swing.*;
  import javax.swing.plaf.ComponentUI;


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/jide-oss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss.spec	7 Aug 2009 20:31:58 -0000	1.1
+++ jide-oss.spec	5 Dec 2009 02:37:21 -0000	1.2
@@ -1,16 +1,16 @@
 # SVN revision used
-%global svnrel 1181
+%global svnrel 1340
 
 Name:		jide-oss
-Version:	2.7.1
-Release:	3.%{svnrel}svn%{?dist}
+Version:	2.7.6
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
 URL:		https://jide-oss.dev.java.net/
 
 #This is an svn snapshot, to get this tarball :
-#then to checkout the project source repository : svn checkout -r %{svnrel} https://jide-oss.dev.java.net/svn/jide-oss/trunk jide-oss --username guest
+#then to checkout the project source repository : svn checkout https://jide-oss.dev.java.net/svn/jide-oss/branches/trunk_%{version} jide-oss --username guest
 #create the tarball : tar -cjvf jide-oss-%{version}-%{svnrel}svn.tar.bz2 jide-oss
 
 Source0:	%{name}-%{version}-%{svnrel}svn.tar.bz2
@@ -44,19 +44,11 @@ so that more and more developers can lev
 building them again.
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Group:		Documentation
-Requires:	%{name} = %{version}
-
-%description javadoc
-Javadoc for %{name}.
-
-%package doc
 Summary:	User documentation for %{name}
 Group:		Documentation
 Requires:	%{name} = %{version}
 
-%description doc
+%description javadoc
 User documentation for %{name}.
 
 %prep
@@ -65,11 +57,11 @@ find -name '*.jar' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
 sed -i "s|\r||g" LICENSE.txt
 
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .unknown_character
+%patch1 -p1 -b .replace_aquapopupmenuui
 
 %build
-%ant javadoc jar
+%ant javadoc jar | grep -v sun
 
 %install
 rm -rf %{buildroot}
@@ -98,14 +90,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
-%files doc
-%defattr(-,root,root,-)
-%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
-
 %changelog
-* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
-- Added doc package.
-
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Aug 2009 20:31:58 -0000	1.2
+++ sources	5 Dec 2009 02:37:21 -0000	1.3
@@ -1 +1 @@
-c6526fefdeeb452c40593a4e4a86850c  jide-oss-2.7.1-1181svn.tar.bz2
+4e1884cf3ec5aa4dba8b44afc128354c  jide-oss-2.7.6-1340svn.tar.bz2



From hicham at fedoraproject.org  Sat Dec  5 02:37:30 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:37:30 +0000 (UTC)
Subject: rpms/jide-oss/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 jide-oss-AquaJidePopupMenuUI.java.patch, 1.1,
	1.2 jide-oss.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091205023730.2584F11C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18726/F-10

Modified Files:
	.cvsignore import.log jide-oss-AquaJidePopupMenuUI.java.patch 
	jide-oss.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Aug 2009 20:46:05 -0000	1.2
+++ .cvsignore	5 Dec 2009 02:37:29 -0000	1.3
@@ -1 +1 @@
-jide-oss-2.7.1-1181svn.tar.bz2
+jide-oss-2.7.6-1340svn.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Aug 2009 20:46:05 -0000	1.1
+++ import.log	5 Dec 2009 02:37:29 -0000	1.2
@@ -1 +1,2 @@
 jide-oss-2_7_1-3_1181svn_fc11:F-10:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677941
+jide-oss-2_7_6-1_1340svn_fc12:F-10:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980535

jide-oss-AquaJidePopupMenuUI.java.patch:
 AquaJidePopupMenuUI.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: jide-oss-AquaJidePopupMenuUI.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/jide-oss-AquaJidePopupMenuUI.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss-AquaJidePopupMenuUI.java.patch	7 Aug 2009 20:46:05 -0000	1.1
+++ jide-oss-AquaJidePopupMenuUI.java.patch	5 Dec 2009 02:37:29 -0000	1.2
@@ -1,15 +1,12 @@
-diff -up jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java
---- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-08-06 13:47:15.841910104 +0100
-+++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-08-06 13:55:33.894910534 +0100
-@@ -5,14 +5,14 @@
-  */
+--- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-12-05 00:10:39.000000000 +0000
++++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-12-05 00:27:28.618149194 +0000
+@@ -6,13 +6,13 @@
  
  package com.jidesoft.plaf.aqua;
--
+ 
 -import apple.laf.AquaPopupMenuUI;
-+
 +import javax.swing.plaf.PopupMenuUI;
- import com.jidesoft.swing.SimpleScrollPane;
+ import com.jidesoft.plaf.basic.BasicJidePopupMenuUI;
  
  import javax.swing.*;
  import javax.swing.plaf.ComponentUI;


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/jide-oss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jide-oss.spec	7 Aug 2009 20:46:05 -0000	1.1
+++ jide-oss.spec	5 Dec 2009 02:37:29 -0000	1.2
@@ -1,16 +1,16 @@
 # SVN revision used
-%global svnrel 1181
+%global svnrel 1340
 
 Name:		jide-oss
-Version:	2.7.1
-Release:	3.%{svnrel}svn%{?dist}
+Version:	2.7.6
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
 URL:		https://jide-oss.dev.java.net/
 
 #This is an svn snapshot, to get this tarball :
-#then to checkout the project source repository : svn checkout -r %{svnrel} https://jide-oss.dev.java.net/svn/jide-oss/trunk jide-oss --username guest
+#then to checkout the project source repository : svn checkout https://jide-oss.dev.java.net/svn/jide-oss/branches/trunk_%{version} jide-oss --username guest
 #create the tarball : tar -cjvf jide-oss-%{version}-%{svnrel}svn.tar.bz2 jide-oss
 
 Source0:	%{name}-%{version}-%{svnrel}svn.tar.bz2
@@ -44,19 +44,11 @@ so that more and more developers can lev
 building them again.
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Group:		Documentation
-Requires:	%{name} = %{version}
-
-%description javadoc
-Javadoc for %{name}.
-
-%package doc
 Summary:	User documentation for %{name}
 Group:		Documentation
 Requires:	%{name} = %{version}
 
-%description doc
+%description javadoc
 User documentation for %{name}.
 
 %prep
@@ -65,11 +57,11 @@ find -name '*.jar' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
 sed -i "s|\r||g" LICENSE.txt
 
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .unknown_character
+%patch1 -p1 -b .replace_aquapopupmenuui
 
 %build
-%ant javadoc jar
+%ant javadoc jar | grep -v sun
 
 %install
 rm -rf %{buildroot}
@@ -98,14 +90,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
-%files doc
-%defattr(-,root,root,-)
-%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
-
 %changelog
-* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
-- Added doc package.
-
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Aug 2009 20:46:05 -0000	1.2
+++ sources	5 Dec 2009 02:37:29 -0000	1.3
@@ -1 +1 @@
-c6526fefdeeb452c40593a4e4a86850c  jide-oss-2.7.1-1181svn.tar.bz2
+4e1884cf3ec5aa4dba8b44afc128354c  jide-oss-2.7.6-1340svn.tar.bz2



From kkofler at fedoraproject.org  Sat Dec  5 02:42:47 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Dec 2009 02:42:47 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.80-cmake-targets.patch, NONE,
	1.1 kdebase-workspace.spec, 1.321,
	1.322 kdebase-workspace-4.3.75-cmake-targets.patch, 1.1, NONE
Message-ID: <20091205024247.D9CE211C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21688/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.80-cmake-targets.patch 
Removed Files:
	kdebase-workspace-4.3.75-cmake-targets.patch 
Log Message:
Fix the version in CMakeLists.txt yet again.

kdebase-workspace-4.3.80-cmake-targets.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.80-cmake-targets.patch ---
diff -r -U5 kdebase-workspace-4.3.75svn1048496/CMakeLists.txt kdebase-workspace-4.3.75svn1048496.cmake-targets/CMakeLists.txt
--- kdebase-workspace-4.3.75svn1048496/CMakeLists.txt	2009-11-13 05:57:52.000000000 -0500
+++ kdebase-workspace-4.3.75svn1048496.cmake-targets/CMakeLists.txt	2009-11-21 22:42:23.000000000 -0500
@@ -1,11 +1,11 @@
 project(KDEBASE_WORKSPACE)
 
 # Used e.g. in KDE4WorkspaceConfig.cmake, Alex
 set(KDE4WORKSPACE_VERSION_MAJOR 4)
 set(KDE4WORKSPACE_VERSION_MINOR 3)
-set(KDE4WORKSPACE_VERSION_PATCH 61)
+set(KDE4WORKSPACE_VERSION_PATCH 80)
 set(KDE4WORKSPACE_VERSION ${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH} )
 
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- kdebase-workspace.spec	3 Dec 2009 01:02:25 -0000	1.321
+++ kdebase-workspace.spec	5 Dec 2009 02:42:47 -0000	1.322
@@ -36,7 +36,7 @@ Patch16: kdebase-workspace-4.3.75-batter
 # default Leave submenu
 Patch17: kdebase-workspace-4.3.75-classicmenu-logout.patch
 # Fix the version
-Patch18: kdebase-workspace-4.3.75-cmake-targets.patch
+Patch18: kdebase-workspace-4.3.80-cmake-targets.patch
 Patch19: kdebase-workspace-4.3.3-kdm_plymouth.patch
 
 # upstream patches:


--- kdebase-workspace-4.3.75-cmake-targets.patch DELETED ---



From hicham at fedoraproject.org  Sat Dec  5 02:50:42 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:50:42 +0000 (UTC)
Subject: rpms/jide-oss/devel import.log,1.2,1.3 jide-oss.spec,1.2,1.3
Message-ID: <20091205025042.BF0AF11C03DB@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24685/devel

Modified Files:
	import.log jide-oss.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	5 Dec 2009 02:29:54 -0000	1.2
+++ import.log	5 Dec 2009 02:50:41 -0000	1.3
@@ -1,2 +1,3 @@
 jide-oss-2_7_1-3_1181svn_fc11:HEAD:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677077
 jide-oss-2_7_6-1_1340svn_fc12:HEAD:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980044
+jide-oss-2_7_6-2_1340svn_fc12:HEAD:jide-oss-2.7.6-2.1340svn.fc12.src.rpm:1259981397


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/jide-oss.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jide-oss.spec	5 Dec 2009 02:29:54 -0000	1.2
+++ jide-oss.spec	5 Dec 2009 02:50:42 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	1.%{svnrel}svn%{?dist}
+Release:	2.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -61,7 +61,7 @@ sed -i "s|\r||g" LICENSE.txt
 %patch1 -p1 -b .replace_aquapopupmenuui
 
 %build
-%ant javadoc jar | grep -v sun
+%ant javadoc jar
 
 %install
 rm -rf %{buildroot}
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-2.1340svn
+- New svn snapshot
+
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.



From hicham at fedoraproject.org  Sat Dec  5 02:54:50 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:54:50 +0000 (UTC)
Subject: rpms/jide-oss/F-10 import.log,1.2,1.3 jide-oss.spec,1.2,1.3
Message-ID: <20091205025450.A3D0511C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26502/F-10

Modified Files:
	import.log jide-oss.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	5 Dec 2009 02:37:29 -0000	1.2
+++ import.log	5 Dec 2009 02:54:50 -0000	1.3
@@ -1,2 +1,3 @@
 jide-oss-2_7_1-3_1181svn_fc11:F-10:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677941
 jide-oss-2_7_6-1_1340svn_fc12:F-10:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980535
+jide-oss-2_7_6-2_1340svn_fc12:F-10:jide-oss-2.7.6-2.1340svn.fc12.src.rpm:1259981646


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/jide-oss.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jide-oss.spec	5 Dec 2009 02:37:29 -0000	1.2
+++ jide-oss.spec	5 Dec 2009 02:54:50 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	1.%{svnrel}svn%{?dist}
+Release:	2.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -61,7 +61,7 @@ sed -i "s|\r||g" LICENSE.txt
 %patch1 -p1 -b .replace_aquapopupmenuui
 
 %build
-%ant javadoc jar | grep -v sun
+%ant javadoc jar
 
 %install
 rm -rf %{buildroot}
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-2.1340svn
+- New svn snapshot
+
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.



From hicham at fedoraproject.org  Sat Dec  5 02:54:53 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:54:53 +0000 (UTC)
Subject: rpms/jide-oss/F-11 import.log,1.2,1.3 jide-oss.spec,1.2,1.3
Message-ID: <20091205025453.365BD11C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26552/F-11

Modified Files:
	import.log jide-oss.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	5 Dec 2009 02:35:35 -0000	1.2
+++ import.log	5 Dec 2009 02:54:52 -0000	1.3
@@ -1,2 +1,3 @@
 jide-oss-2_7_1-3_1181svn_fc11:F-11:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677715
 jide-oss-2_7_6-1_1340svn_fc12:F-11:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980473
+jide-oss-2_7_6-2_1340svn_fc12:F-11:jide-oss-2.7.6-2.1340svn.fc12.src.rpm:1259981599


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/jide-oss.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jide-oss.spec	5 Dec 2009 02:35:35 -0000	1.2
+++ jide-oss.spec	5 Dec 2009 02:54:53 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	1.%{svnrel}svn%{?dist}
+Release:	2.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -61,7 +61,7 @@ sed -i "s|\r||g" LICENSE.txt
 %patch1 -p1 -b .replace_aquapopupmenuui
 
 %build
-%ant javadoc jar | grep -v sun
+%ant javadoc jar
 
 %install
 rm -rf %{buildroot}
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-2.1340svn
+- New svn snapshot
+
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.



From hicham at fedoraproject.org  Sat Dec  5 02:54:59 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sat,  5 Dec 2009 02:54:59 +0000 (UTC)
Subject: rpms/jide-oss/F-12 import.log,1.2,1.3 jide-oss.spec,1.2,1.3
Message-ID: <20091205025459.0372E11C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26534/F-12

Modified Files:
	import.log jide-oss.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	5 Dec 2009 02:37:21 -0000	1.2
+++ import.log	5 Dec 2009 02:54:58 -0000	1.3
@@ -1,2 +1,3 @@
 jide-oss-2_7_1-3_1181svn_fc11:HEAD:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677077
 jide-oss-2_7_6-1_1340svn_fc12:F-12:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980468
+jide-oss-2_7_6-2_1340svn_fc12:F-12:jide-oss-2.7.6-2.1340svn.fc12.src.rpm:1259981553


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/jide-oss.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jide-oss.spec	5 Dec 2009 02:37:21 -0000	1.2
+++ jide-oss.spec	5 Dec 2009 02:54:58 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	1.%{svnrel}svn%{?dist}
+Release:	2.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -61,7 +61,7 @@ sed -i "s|\r||g" LICENSE.txt
 %patch1 -p1 -b .replace_aquapopupmenuui
 
 %build
-%ant javadoc jar | grep -v sun
+%ant javadoc jar
 
 %install
 rm -rf %{buildroot}
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-2.1340svn
+- New svn snapshot
+
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.



From cjb at fedoraproject.org  Sat Dec  5 03:59:18 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Sat,  5 Dec 2009 03:59:18 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091205git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091205035918.42B9710F84E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

67772674b7ac831596ea4c8f6c13b739  ohm-0.1.1-1.20091205git.tar.gz



From cjb at fedoraproject.org  Sat Dec  5 04:01:27 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Sat,  5 Dec 2009 04:01:27 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore, 1.7, 1.8 ohm.spec, 1.14, 1.15 sources, 1.9,
	1.10
Message-ID: <20091205040128.0591311C00E0@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21010

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
Trac #9802: Use su to drop privileges for gconf, sudo requires being on a tty



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Dec 2009 02:07:49 -0000	1.7
+++ .cvsignore	5 Dec 2009 04:01:25 -0000	1.8
@@ -1 +1 @@
-ohm-0.1.1-1.20091204git.tar.gz
+ohm-0.1.1-1.20091205git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ohm.spec	5 Dec 2009 02:07:50 -0000	1.14
+++ ohm.spec	5 Dec 2009 04:01:25 -0000	1.15
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091204git
+%define alphatag                20091205git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.31.%{alphatag}%{?dist}
+Release: 9.32.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,6 +139,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Dec 4 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.32.20091205git.olpc
+- Trac #9802: Use su to drop privileges for gconf, sudo requires being on a tty
+
 * Fri Dec 4 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.31.20091204git.olpc
 - Trac #9802: Run gconftool as user olpc, to avoid it chown()ing ~olpc/.gconf
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Dec 2009 02:07:50 -0000	1.9
+++ sources	5 Dec 2009 04:01:26 -0000	1.10
@@ -1 +1 @@
-6b4796bf9ac06e9b0ef51cb1f96292d7  ohm-0.1.1-1.20091204git.tar.gz
+67772674b7ac831596ea4c8f6c13b739  ohm-0.1.1-1.20091205git.tar.gz



From mclasen at fedoraproject.org  Sat Dec  5 04:19:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 04:19:47 +0000 (UTC)
Subject: File gnome-themes-2.29.2.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091205041947.8D31710F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-themes:

79db3479386aee14b8a5c4c1275ce07c  gnome-themes-2.29.2.tar.bz2



From kkofler at fedoraproject.org  Sat Dec  5 04:21:35 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Dec 2009 04:21:35 +0000 (UTC)
Subject: rpms/qt/devel qt.spec, 1.359,
	1.360 qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch, 1.1, NONE
Message-ID: <20091205042135.4A6FE11C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21089/devel

Modified Files:
	qt.spec 
Removed Files:
	qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch 
Log Message:
Fully revert the redundant QTBUG-5792 patch.


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -p -r1.359 -r1.360
--- qt.spec	4 Dec 2009 14:23:03 -0000	1.359
+++ qt.spec	5 Dec 2009 04:21:35 -0000	1.360
@@ -13,7 +13,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -1017,9 +1017,6 @@ fi
 
 
 %changelog
-* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.6.0-2
-- Stop using the NameOwnerChanged signal without arg0 in QtDBus itself
-
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.6.0-1
 - 4.6.0
 


--- qt-everywhere-opensource-src-4.6.0-QTBUG-5972.patch DELETED ---



From mclasen at fedoraproject.org  Sat Dec  5 04:21:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 04:21:27 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.84, 1.85 gnome-themes.spec,
	1.149, 1.150 sources, 1.90, 1.91
Message-ID: <20091205042127.8FFE511C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20721

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.29.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	22 Sep 2009 20:34:37 -0000	1.84
+++ .cvsignore	5 Dec 2009 04:21:25 -0000	1.85
@@ -1 +1 @@
-gnome-themes-2.28.0.tar.bz2
+gnome-themes-2.29.2.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- gnome-themes.spec	2 Nov 2009 04:56:59 -0000	1.149
+++ gnome-themes.spec	5 Dec 2009 04:21:25 -0000	1.150
@@ -1,9 +1,9 @@
 Summary: Themes for GNOME
 Name: gnome-themes
-Version: 2.28.1
-Release: 2%{?dist}
+Version: 2.29.2
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
-Source: http://download.gnome.org/sources/gnome-themes/2.28/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-themes/2.29/%{name}-%{version}.tar.bz2
 # Icons done by Andreas Nilsson for http://live.gnome.org/GnomeArt/ArtRequests/issue26
 # svg versions done by Maureen Duffy
 Source2: mist-folders-xdg.tar.gz
@@ -106,6 +106,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.2-1
+- Update to 2.29.2
+
 * Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
 - Add scalable versions of the xdg folder icons to Mist
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	2 Nov 2009 04:56:59 -0000	1.90
+++ sources	5 Dec 2009 04:21:26 -0000	1.91
@@ -1,2 +1,2 @@
+79db3479386aee14b8a5c4c1275ce07c  gnome-themes-2.29.2.tar.bz2
 7ab4fcb568c768dd8818bb1caf097998  mist-folders-xdg.tar.gz
-0159b27d7f72c74ae9595486fc13814b  gnome-themes-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 04:22:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 04:22:42 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre.spec,1.63,1.64
Message-ID: <20091205042242.58CCA11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21526

Modified Files:
	vinagre.spec 
Log Message:
fix spec



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- vinagre.spec	5 Dec 2009 02:34:05 -0000	1.63
+++ vinagre.spec	5 Dec 2009 04:22:42 -0000	1.64
@@ -22,6 +22,7 @@ BuildRequires:	gnome-keyring-devel
 BuildRequires:	gnome-doc-utils
 BuildRequires:	gnome-panel-devel
 BuildRequires:  telepathy-glib-devel
+BuildRequires:  scrollkeeper
 
 # for /usr/share/dbus-1/services
 Requires: dbus



From mclasen at fedoraproject.org  Sat Dec  5 04:23:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 04:23:52 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.242,1.243
Message-ID: <20091205042352.2470C11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22214

Modified Files:
	gnome-games.spec 
Log Message:
fix spec



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- gnome-games.spec	4 Dec 2009 15:35:16 -0000	1.242
+++ gnome-games.spec	5 Dec 2009 04:23:51 -0000	1.243
@@ -82,6 +82,7 @@ BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: autoconf >= 2.60
 BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: scrollkeeper
 
 Requires(preun): ggz-client-libs
 



From kkofler at fedoraproject.org  Sat Dec  5 04:24:35 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Dec 2009 04:24:35 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.360,1.361
Message-ID: <20091205042435.CE71811C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22832/devel

Modified Files:
	qt.spec 
Log Message:
* Sat Dec 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.0-2
- own %{_qt4_plugindir}/gui_platform


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -p -r1.360 -r1.361
--- qt.spec	5 Dec 2009 04:21:35 -0000	1.360
+++ qt.spec	5 Dec 2009 04:24:35 -0000	1.361
@@ -13,7 +13,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -707,6 +707,8 @@ EOF
 
 # create/own %%_qt4_plugindir/styles
 mkdir %{buildroot}%{_qt4_plugindir}/styles
+# create/own %%_qt4_plugindir/gui_platform
+mkdir %{buildroot}%{_qt4_plugindir}/gui_platform
 
 %if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
@@ -1017,6 +1019,9 @@ fi
 
 
 %changelog
+* Sat Dec 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.0-2
+- own %%{_qt4_plugindir}/gui_platform
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.6.0-1
 - 4.6.0
 



From kkofler at fedoraproject.org  Sat Dec  5 04:26:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  5 Dec 2009 04:26:45 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.322,1.323
Message-ID: <20091205042645.6C78911C0095@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23765/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
Add missing %{_qt4_plugindir}/gui_platform/libkde.so to the file list.


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- kdebase-workspace.spec	5 Dec 2009 02:42:47 -0000	1.322
+++ kdebase-workspace.spec	5 Dec 2009 04:26:44 -0000	1.323
@@ -523,6 +523,7 @@ fi
 %if 0%{?with_polkit_09}
 %exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %endif
+%{_qt4_plugindir}/gui_platform/libkde.so
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so



From mclasen at fedoraproject.org  Sat Dec  5 04:49:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 04:49:09 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.231,1.232
Message-ID: <20091205044910.2560C11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv397

Modified Files:
	gnome-desktop.spec 
Log Message:
2.29.3



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- gnome-desktop.spec	1 Dec 2009 14:57:32 -0000	1.231
+++ gnome-desktop.spec	5 Dec 2009 04:49:08 -0000	1.232
@@ -16,8 +16,6 @@ Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=597874
-Patch2: randr-gamma.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599914
 Patch3: ignore-xrandr-badmatch.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=147808
@@ -83,7 +81,6 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch1 -p1 -b .concatenate-edid-descriptors
-%patch2 -p1 -b .randr-gamma
 %patch3 -p1 -b .ignore-xrandr-badmatch
 %patch4 -p1 -b .per-monitor-background
 %patch5 -p1 -b .slideshow



From mclasen at fedoraproject.org  Sat Dec  5 04:51:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 04:51:35 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre.spec,1.64,1.65
Message-ID: <20091205045135.DD9CE11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1666

Modified Files:
	vinagre.spec 
Log Message:
fix file list



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- vinagre.spec	5 Dec 2009 04:22:42 -0000	1.64
+++ vinagre.spec	5 Dec 2009 04:51:35 -0000	1.65
@@ -143,6 +143,7 @@ fi
 %dir %{_libdir}/vinagre-1/plugins
 %{_libdir}/vinagre-1/plugin-loaders/*.so
 %{_libdir}/vinagre-1/plugins/*.so
+%{_libdir}/vinagre-1/plugins/*.ui
 %{_libdir}/vinagre-1/plugins/*.vinagre-plugin
 %{_datadir}/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.rfb.service
 



From mclasen at fedoraproject.org  Sat Dec  5 04:54:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 04:54:05 +0000 (UTC)
Subject: File gnome-nettool-2.28.0.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091205045405.6D8F410F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-nettool:

e5d44454cfa4c5ca5e640c304f18fe0e  gnome-nettool-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 04:57:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 04:57:47 +0000 (UTC)
Subject: rpms/gnome-nettool/devel .cvsignore, 1.16, 1.17 gnome-nettool.spec, 
	1.39, 1.40 sources, 1.17, 1.18
Message-ID: <20091205045747.B1FDE11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-nettool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4152

Modified Files:
	.cvsignore gnome-nettool.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-nettool/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	17 Mar 2009 04:02:47 -0000	1.16
+++ .cvsignore	5 Dec 2009 04:57:46 -0000	1.17
@@ -1 +1 @@
-gnome-nettool-2.26.0.tar.bz2
+gnome-nettool-2.28.0.tar.bz2


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gnome-nettool.spec	25 Jul 2009 00:43:00 -0000	1.39
+++ gnome-nettool.spec	5 Dec 2009 04:57:47 -0000	1.40
@@ -5,10 +5,10 @@
 
 Summary: Network information tool for GNOME
 Name: gnome-nettool
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 URL: http://projects.gnome.org/gnome-network/
-Source0: http://download.gnome.org/sources/gnome-nettool/2.26/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-nettool/2.28/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%({__id_u} -n)
@@ -25,9 +25,7 @@ BuildRequires: scrollkeeper
 BuildRequires: intltool
 
 Requires(post): desktop-file-utils
-Requires(post): scrollkeeper
 Requires(postun): desktop-file-utils
-Requires(postun): scrollkeeper
 
 %description
 GNOME Nettool is a frontend to various networking commandline
@@ -58,7 +56,6 @@ rm $RPM_BUILD_ROOT%{_datadir}/icons/hico
 %find_lang %{name} --with-gnome
 
 %post
-scrollkeeper-update -q
 update-desktop-database -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -67,7 +64,6 @@ fi
 
 
 %postun
-scrollkeeper-update -q
 update-desktop-database -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -88,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-nettool/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	17 Mar 2009 04:02:47 -0000	1.17
+++ sources	5 Dec 2009 04:57:47 -0000	1.18
@@ -1 +1 @@
-34bc06209bb72bd85d45829eecc078cb  gnome-nettool-2.26.0.tar.bz2
+e5d44454cfa4c5ca5e640c304f18fe0e  gnome-nettool-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 05:03:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 05:03:15 +0000 (UTC)
Subject: File gnome-netstatus-2.28.0.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091205050315.B2FD510F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-netstatus:

c8469bbaae5cb84e17ef02e0e3560623  gnome-netstatus-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 05:05:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 05:05:17 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre.spec,1.65,1.66
Message-ID: <20091205050517.D751111C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7286

Modified Files:
	vinagre.spec 
Log Message:
fix file list, finally



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- vinagre.spec	5 Dec 2009 04:51:35 -0000	1.65
+++ vinagre.spec	5 Dec 2009 05:05:17 -0000	1.66
@@ -143,9 +143,9 @@ fi
 %dir %{_libdir}/vinagre-1/plugins
 %{_libdir}/vinagre-1/plugin-loaders/*.so
 %{_libdir}/vinagre-1/plugins/*.so
-%{_libdir}/vinagre-1/plugins/*.ui
 %{_libdir}/vinagre-1/plugins/*.vinagre-plugin
 %{_datadir}/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.rfb.service
+%{_datadir}/vinagre-1/plugins/vnc/vnc.ui
 
 
 %doc %{_mandir}/man1/vinagre.1.gz



From mclasen at fedoraproject.org  Sat Dec  5 05:05:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 05:05:12 +0000 (UTC)
Subject: rpms/gnome-netstatus/devel .cvsignore, 1.16,
	1.17 gnome-netstatus.spec, 1.46, 1.47 sources, 1.16, 1.17
Message-ID: <20091205050512.D398D11C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-netstatus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7247

Modified Files:
	.cvsignore gnome-netstatus.spec sources 
Log Message:
2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-netstatus/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	25 Jun 2009 17:47:23 -0000	1.16
+++ .cvsignore	5 Dec 2009 05:05:12 -0000	1.17
@@ -1 +1 @@
-gnome-netstatus-2.26.0.tar.bz2
+gnome-netstatus-2.28.0.tar.bz2


Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gnome-netstatus.spec	25 Jul 2009 00:42:45 -0000	1.46
+++ gnome-netstatus.spec	5 Dec 2009 05:05:12 -0000	1.47
@@ -6,10 +6,10 @@
 
 Summary: Network status applet
 Name: gnome-netstatus
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.26/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.28/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 Patch1: iface.patch
@@ -108,6 +108,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Sat Dec  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-netstatus/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	25 Jun 2009 17:47:23 -0000	1.16
+++ sources	5 Dec 2009 05:05:12 -0000	1.17
@@ -1 +1 @@
-f116157535ec185f0ea7503fafc5edd6  gnome-netstatus-2.26.0.tar.bz2
+c8469bbaae5cb84e17ef02e0e3560623  gnome-netstatus-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 05:09:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 05:09:54 +0000 (UTC)
Subject: File gok-2.29.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091205050954.58EB610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gok:

aa0c3dc5031cac80148b216509065215  gok-2.29.2.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 05:19:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 05:19:44 +0000 (UTC)
Subject: rpms/gok/devel .cvsignore, 1.46, 1.47 gok.spec, 1.89, 1.90 sources, 
	1.47, 1.48
Message-ID: <20091205051944.3B0B611C0095@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12926

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
2.29.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	22 Sep 2009 05:22:41 -0000	1.46
+++ .cvsignore	5 Dec 2009 05:19:43 -0000	1.47
@@ -1 +1 @@
-gok-2.28.0.tar.bz2
+gok-2.29.2.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- gok.spec	24 Nov 2009 05:30:56 -0000	1.89
+++ gok.spec	5 Dec 2009 05:19:43 -0000	1.90
@@ -2,21 +2,19 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 2.28.1
-Release: 2%{?dist}
+Version: 2.29.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
 URL: http://www.gok.ca/
-Source0: http://download.gnome.org/sources/gok/2.28/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gok/2.29/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: gok-0.10.2-launcher.patch
 Patch1: lm.patch
 
 Requires(pre):    GConf2
 Requires(post):   GConf2
-Requires(post):   scrollkeeper >= 0.1.4
 Requires(preun):   GConf2
-Requires(postun): scrollkeeper >= 0.1.4
 
 Requires:       at-spi
 # for /usr/share/sounds/freedesktop/stereo
@@ -105,7 +103,6 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INST
 rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gok.schemas > /dev/null || :
 
@@ -121,10 +118,6 @@ if [ "$1" -eq 0 ]; then
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gok.schemas > /dev/null || :
 fi
 
-%postun
-scrollkeeper-update -q
-
-
 %files -f %{po_package}.lang
 %defattr(-,root,root,-)
 %doc README NEWS AUTHORS COPYING
@@ -146,6 +139,9 @@ scrollkeeper-update -q
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Sat Dec  5 2009 Matthias Clasen <mclasen at redhat.com> 2.29.2-1
+- Update to 2.29.2
+
 * Mon Nov 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
 - Drop htmlview dep, launch firefox
 - Update to 2.28.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	24 Nov 2009 05:30:56 -0000	1.47
+++ sources	5 Dec 2009 05:19:43 -0000	1.48
@@ -1 +1 @@
-d7305f12c703e13eeaed796f996dbc86  gok-2.28.1.tar.bz2
+aa0c3dc5031cac80148b216509065215  gok-2.29.2.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 05:31:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 05:31:02 +0000 (UTC)
Subject: File orca-2.29.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091205053102.08F1C10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for orca:

35c36a406fbe5841db9c9196869de681  orca-2.29.2.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 05:40:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 05:40:54 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.59, 1.60 orca.spec, 1.98, 1.99 sources,
	1.60, 1.61
Message-ID: <20091205054054.407E411C03F6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20039

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.29.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	22 Sep 2009 05:30:40 -0000	1.59
+++ .cvsignore	5 Dec 2009 05:40:53 -0000	1.60
@@ -1 +1 @@
-orca-2.28.0.tar.bz2
+orca-2.29.2.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- orca.spec	22 Sep 2009 05:30:40 -0000	1.98
+++ orca.spec	5 Dec 2009 05:40:53 -0000	1.99
@@ -17,14 +17,14 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.28.0
+Version:	2.29.2
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
 Group:		User Interface/Desktops
 License:	LGPLv2+
 URL:		http://projects.gnome.org/orca/
-Source0:	http://download.gnome.org/sources/orca/2.28/orca-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/orca/2.29/orca-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel >= %{python_version}
@@ -108,6 +108,9 @@ fi
 
 
 %changelog
+* Sat Dec  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.2-1
+- Update to 2.29.2
+
 * Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	22 Sep 2009 05:30:40 -0000	1.60
+++ sources	5 Dec 2009 05:40:53 -0000	1.61
@@ -1 +1 @@
-611b83b2200f78e82af2565aa66dfa28  orca-2.28.0.tar.bz2
+35c36a406fbe5841db9c9196869de681  orca-2.29.2.tar.bz2



From mclasen at fedoraproject.org  Sat Dec  5 05:46:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 05:46:03 +0000 (UTC)
Subject: rpms/gok/devel gok.spec,1.90,1.91
Message-ID: <20091205054603.C1F8711C0264@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22323

Modified Files:
	gok.spec 
Log Message:
try again



Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- gok.spec	5 Dec 2009 05:19:43 -0000	1.90
+++ gok.spec	5 Dec 2009 05:46:03 -0000	1.91
@@ -10,7 +10,7 @@ URL: http://www.gok.ca/
 Source0: http://download.gnome.org/sources/gok/2.29/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: gok-0.10.2-launcher.patch
-Patch1: lm.patch
+#Patch1: lm.patch
 
 Requires(pre):    GConf2
 Requires(post):   GConf2
@@ -63,7 +63,7 @@ applications and plugins for gok.
 %prep
 %setup -q
 %patch0 -p1 -b .launcher
-%patch1 -p1 -b .lm
+#%patch1 -p1 -b .lm
 
 %build
 %configure



From mclasen at fedoraproject.org  Sat Dec  5 06:00:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 06:00:05 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec,1.126,1.127
Message-ID: <20091205060005.A6FDD11C03F6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24666

Modified Files:
	at-spi.spec 
Log Message:
undo the relocation for now



Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- at-spi.spec	4 Dec 2009 22:29:28 -0000	1.126
+++ at-spi.spec	5 Dec 2009 06:00:04 -0000	1.127
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
 Version: 1.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.29/%{name}-%{version}.tar.bz2
 
@@ -89,7 +89,7 @@ This package contains Python bindings al
 autoreconf -i -f
 
 %build
-%configure --disable-gtk-doc --disable-static
+%configure --disable-gtk-doc --disable-static --disable-relocate
 make
 
 %install
@@ -150,11 +150,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files python
 %defattr(-,root,root)
-%{python_sitearch}/pyatspi-corba/
-%{python_sitearch}/pyatspi-corba.pth/
+%{python_sitearch}/pyatspi
 
 
 %changelog
+* Sat Dec  5 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-2
+- Undo the relocation for now
+
 * Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-1
 - Update to 1.29.3
 - The Python bindings have been relocated to pyatspi-corba to



From mclasen at fedoraproject.org  Sat Dec  5 06:20:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  5 Dec 2009 06:20:32 +0000 (UTC)
Subject: rpms/pygtksourceview/devel .cvsignore, 1.14,
	1.15 pygtksourceview.spec, 1.26, 1.27 sources, 1.14, 1.15
Message-ID: <20091205062033.506CA11C03DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32529

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:
2.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 Sep 2009 02:28:25 -0000	1.14
+++ .cvsignore	5 Dec 2009 06:20:32 -0000	1.15
@@ -1 +1 @@
-pygtksourceview-2.8.0.tar.bz2
+pygtksourceview-2.9.1.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pygtksourceview.spec	24 Sep 2009 02:28:25 -0000	1.26
+++ pygtksourceview.spec	5 Dec 2009 06:20:32 -0000	1.27
@@ -5,7 +5,7 @@
 %define gtksourceview_version 2.3.0
 
 Name:           pygtksourceview
-Version:        2.8.0
+Version:        2.9.1
 Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
@@ -13,7 +13,7 @@ Group:          Development/Languages
 # No version specified.
 License:        LGPLv2+
 URL:            http://download.gnome.org/sources/pygtksourceview/
-Source0:        http://download.gnome.org/sources/pygtksourceview/2.8/pygtksourceview-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pygtksourceview/2.9/pygtksourceview-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtksourceview2-devel >= %{gtksourceview_version}
@@ -23,7 +23,7 @@ BuildRequires:  python-devel
 
 %description
 The %{name} package contains Python bindings for the gtksourceview
-library. 
+library.
 
 %package devel
 Summary: Development files for using %{name} in Python programs
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtksourceview2
 
 %changelog
+* Sat Dec  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.9.1-1
+- Update to 2.9.1
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.0-1
 - Update to 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 Sep 2009 02:28:25 -0000	1.14
+++ sources	5 Dec 2009 06:20:32 -0000	1.15
@@ -1 +1 @@
-bc344044113a52026b4eb7e433a24c29  pygtksourceview-2.8.0.tar.bz2
+be7a7d3d1046f3af1d7509521a7a3c21  pygtksourceview-2.9.1.tar.bz2



From abompard at fedoraproject.org  Sat Dec  5 06:29:48 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  5 Dec 2009 06:29:48 +0000 (UTC)
Subject: rpms/pure-ftpd/F-12 pure-ftpd-1.0.27-config.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 pure-ftpd.spec, 1.28, 1.29 sources, 1.4,
	1.5 pure-ftpd-1.0.21-config.patch, 1.2, NONE
Message-ID: <20091205062949.005E211C0264@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2916/F-12

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Added Files:
	pure-ftpd-1.0.27-config.patch 
Removed Files:
	pure-ftpd-1.0.21-config.patch 
Log Message:
* Fri Dec 04 2009 Aurelien Bompard <abompard at fedoraproject.org> -  1.0.27-1
- version 1.0.27


pure-ftpd-1.0.27-config.patch:
 configuration-file/pure-ftpd.conf.in |   35 +++++++++++++++++++++--------------
 pureftpd-mysql.conf                  |    2 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

--- NEW FILE pure-ftpd-1.0.27-config.patch ---
diff -up ./configuration-file/pure-ftpd.conf.in.config ./configuration-file/pure-ftpd.conf.in
--- ./configuration-file/pure-ftpd.conf.in.config	2009-11-20 14:15:01.000000000 +0100
+++ ./configuration-file/pure-ftpd.conf.in	2009-12-04 22:09:21.461504212 +0100
@@ -9,7 +9,7 @@
 # instead of command-line options, please run the
 # following command :
 #
-# @prefix@/sbin/pure-config.pl @prefix@/etc/pure-ftpd.conf
+# @sbindir@/pure-config.pl @sysconfdir@/pure-ftpd.conf
 #
 # Please don't forget to have a look at documentation at
 # http://www.pureftpd.org/documentation.shtml for a complete list of
@@ -107,34 +107,34 @@ MaxIdleTime                 15
 
 # LDAP configuration file (see README.LDAP)
 
-# LDAPConfigFile                /etc/pureftpd-ldap.conf
+# LDAPConfigFile                @sysconfdir@/pureftpd-ldap.conf
 
 
 
 # MySQL configuration file (see README.MySQL)
 
-# MySQLConfigFile               /etc/pureftpd-mysql.conf
+# MySQLConfigFile               @sysconfdir@/pureftpd-mysql.conf
 
 
 # Postgres configuration file (see README.PGSQL)
 
-# PGSQLConfigFile               /etc/pureftpd-pgsql.conf
+# PGSQLConfigFile               @sysconfdir@/pureftpd-pgsql.conf
 
 
 # PureDB user database (see README.Virtual-Users)
 
-# PureDB                        /etc/pureftpd.pdb
+# PureDB                        @sysconfdir@/pureftpd.pdb
 
 
 # Path to pure-authd socket (see README.Authentication-Modules)
 
-# ExtAuth                       /var/run/ftpd.sock
+# ExtAuth                       @localstatedir@/run/ftpd.sock
 
 
 
 # If you want to enable PAM authentication, uncomment the following line
 
-# PAMAuthentication             yes
+PAMAuthentication             yes
 
 
 
@@ -237,7 +237,14 @@ Umask                       133:022
 
 # Minimum UID for an authenticated user to log in.
 
-MinUID                      100
+MinUID                      500
+
+
+
+# Do not use the /etc/ftpusers file to disable accounts. We're already
+# using MinUID to block users with uid < 500
+
+UseFtpUsers no
 
 
 
@@ -276,7 +283,7 @@ AutoRename                  no
 
 # Disallow anonymous users to upload new files (no = upload is allowed)
 
-AnonymousCantUpload         no
+AnonymousCantUpload         yes
 
 
 
@@ -301,21 +308,21 @@ AnonymousCantUpload         no
 # fw.c9x.org - jedi [13/Dec/1975:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338
 # This log file can then be processed by www traffic analyzers.
 
-# AltLog                     clf:/var/log/pureftpd.log
+AltLog                     clf:@localstatedir@/log/pureftpd.log
 
 
 
 # Create an additional log file with transfers logged in a format optimized
 # for statistic reports.
 
-# AltLog                     stats:/var/log/pureftpd.log
+# AltLog                     stats:@localstatedir@/log/pureftpd.log
 
 
 
 # Create an additional log file with transfers logged in the standard W3C
 # format (compatible with most commercial log analyzers)
 
-# AltLog                     w3c:/var/log/pureftpd.log
+# AltLog                     w3c:@localstatedir@/log/pureftpd.log
 
 
 
@@ -346,9 +353,9 @@ AnonymousCantUpload         no
 
 
 # If your pure-ftpd has been compiled with standalone support, you can change
-# the location of the pid file. The default is /var/run/pure-ftpd.pid
+# the location of the pid file. The default is @localstatedir@/run/pure-ftpd.pid
 
-#PIDFile                     /var/run/pure-ftpd.pid
+#PIDFile                     @localstatedir@/run/pure-ftpd.pid
 
 
 
diff -up ./pureftpd-mysql.conf.config ./pureftpd-mysql.conf
--- ./pureftpd-mysql.conf.config	2009-10-20 12:17:56.000000000 +0200
+++ ./pureftpd-mysql.conf	2009-12-04 22:05:35.350755132 +0100
@@ -19,7 +19,7 @@
 
 # Optional : define the location of mysql.sock if the server runs on this host.
 
-MYSQLSocket     /tmp/mysql.sock
+MYSQLSocket     /var/lib/mysql/mysql.sock
 
 
 # Mandatory : user to bind the server as.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Apr 2009 10:35:45 -0000	1.4
+++ .cvsignore	5 Dec 2009 06:29:47 -0000	1.5
@@ -1 +1 @@
-pure-ftpd-1.0.22.tar.bz2
+pure-ftpd-1.0.27.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-12/pure-ftpd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- pure-ftpd.spec	16 Sep 2009 18:14:17 -0000	1.28
+++ pure-ftpd.spec	5 Dec 2009 06:29:48 -0000	1.29
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.22
-Release:    4%{?dist}
+Version:    1.0.27
+Release:    1%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.22.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -14,8 +14,8 @@ Source4:    pure-ftpd.pure-ftpwho.pam
 Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Source6:    pure-ftpd.README.SELinux
 Source7:    pure-ftpd.pureftpd.te
-Patch0:     pure-ftpd-1.0.21-config.patch
-Patch1:     pure-ftpd-1.0.20-libdir.patch
+Patch0:     pure-ftpd-1.0.27-config.patch
+#Patch1:     pure-ftpd-1.0.20-libdir.patch
 Patch2:     pure-ftpd-paminclude.patch
 Provides:   ftpserver
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,7 +72,7 @@ Pure-FTPd to be protected in the same wa
 %prep
 %setup -q
 %patch0 -p0 -b .config
-%patch1 -p0 -b .libdir
+#%%patch1 -p0 -b .libdir
 %patch2 -p0 -b .paminclude
 install -pm 644 %{SOURCE6} README.SELinux
 mkdir selinux
@@ -254,6 +254,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Aurelien Bompard <abompard at fedoraproject.org> -  1.0.27-1
+- version 1.0.27
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-4
 - use password-auth common PAM configuration instead of system-auth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Apr 2009 10:35:45 -0000	1.4
+++ sources	5 Dec 2009 06:29:48 -0000	1.5
@@ -1 +1 @@
-7f9ceefafaf9eb8fca757d7358f474fa  pure-ftpd-1.0.22.tar.bz2
+7d18544384aa1649d483ba86518ed34e  pure-ftpd-1.0.27.tar.bz2


--- pure-ftpd-1.0.21-config.patch DELETED ---



From abompard at fedoraproject.org  Sat Dec  5 06:29:49 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  5 Dec 2009 06:29:49 +0000 (UTC)
Subject: rpms/pure-ftpd/devel pure-ftpd-1.0.27-config.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 pure-ftpd.spec, 1.28, 1.29 sources, 1.4,
	1.5 pure-ftpd-1.0.21-config.patch, 1.2, NONE
Message-ID: <20091205062949.08AFB11C02C4@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2916/devel

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Added Files:
	pure-ftpd-1.0.27-config.patch 
Removed Files:
	pure-ftpd-1.0.21-config.patch 
Log Message:
* Fri Dec 04 2009 Aurelien Bompard <abompard at fedoraproject.org> -  1.0.27-1
- version 1.0.27


pure-ftpd-1.0.27-config.patch:
 configuration-file/pure-ftpd.conf.in |   35 +++++++++++++++++++++--------------
 pureftpd-mysql.conf                  |    2 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

--- NEW FILE pure-ftpd-1.0.27-config.patch ---
diff -up ./configuration-file/pure-ftpd.conf.in.config ./configuration-file/pure-ftpd.conf.in
--- ./configuration-file/pure-ftpd.conf.in.config	2009-11-20 14:15:01.000000000 +0100
+++ ./configuration-file/pure-ftpd.conf.in	2009-12-04 22:09:21.461504212 +0100
@@ -9,7 +9,7 @@
 # instead of command-line options, please run the
 # following command :
 #
-# @prefix@/sbin/pure-config.pl @prefix@/etc/pure-ftpd.conf
+# @sbindir@/pure-config.pl @sysconfdir@/pure-ftpd.conf
 #
 # Please don't forget to have a look at documentation at
 # http://www.pureftpd.org/documentation.shtml for a complete list of
@@ -107,34 +107,34 @@ MaxIdleTime                 15
 
 # LDAP configuration file (see README.LDAP)
 
-# LDAPConfigFile                /etc/pureftpd-ldap.conf
+# LDAPConfigFile                @sysconfdir@/pureftpd-ldap.conf
 
 
 
 # MySQL configuration file (see README.MySQL)
 
-# MySQLConfigFile               /etc/pureftpd-mysql.conf
+# MySQLConfigFile               @sysconfdir@/pureftpd-mysql.conf
 
 
 # Postgres configuration file (see README.PGSQL)
 
-# PGSQLConfigFile               /etc/pureftpd-pgsql.conf
+# PGSQLConfigFile               @sysconfdir@/pureftpd-pgsql.conf
 
 
 # PureDB user database (see README.Virtual-Users)
 
-# PureDB                        /etc/pureftpd.pdb
+# PureDB                        @sysconfdir@/pureftpd.pdb
 
 
 # Path to pure-authd socket (see README.Authentication-Modules)
 
-# ExtAuth                       /var/run/ftpd.sock
+# ExtAuth                       @localstatedir@/run/ftpd.sock
 
 
 
 # If you want to enable PAM authentication, uncomment the following line
 
-# PAMAuthentication             yes
+PAMAuthentication             yes
 
 
 
@@ -237,7 +237,14 @@ Umask                       133:022
 
 # Minimum UID for an authenticated user to log in.
 
-MinUID                      100
+MinUID                      500
+
+
+
+# Do not use the /etc/ftpusers file to disable accounts. We're already
+# using MinUID to block users with uid < 500
+
+UseFtpUsers no
 
 
 
@@ -276,7 +283,7 @@ AutoRename                  no
 
 # Disallow anonymous users to upload new files (no = upload is allowed)
 
-AnonymousCantUpload         no
+AnonymousCantUpload         yes
 
 
 
@@ -301,21 +308,21 @@ AnonymousCantUpload         no
 # fw.c9x.org - jedi [13/Dec/1975:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338
 # This log file can then be processed by www traffic analyzers.
 
-# AltLog                     clf:/var/log/pureftpd.log
+AltLog                     clf:@localstatedir@/log/pureftpd.log
 
 
 
 # Create an additional log file with transfers logged in a format optimized
 # for statistic reports.
 
-# AltLog                     stats:/var/log/pureftpd.log
+# AltLog                     stats:@localstatedir@/log/pureftpd.log
 
 
 
 # Create an additional log file with transfers logged in the standard W3C
 # format (compatible with most commercial log analyzers)
 
-# AltLog                     w3c:/var/log/pureftpd.log
+# AltLog                     w3c:@localstatedir@/log/pureftpd.log
 
 
 
@@ -346,9 +353,9 @@ AnonymousCantUpload         no
 
 
 # If your pure-ftpd has been compiled with standalone support, you can change
-# the location of the pid file. The default is /var/run/pure-ftpd.pid
+# the location of the pid file. The default is @localstatedir@/run/pure-ftpd.pid
 
-#PIDFile                     /var/run/pure-ftpd.pid
+#PIDFile                     @localstatedir@/run/pure-ftpd.pid
 
 
 
diff -up ./pureftpd-mysql.conf.config ./pureftpd-mysql.conf
--- ./pureftpd-mysql.conf.config	2009-10-20 12:17:56.000000000 +0200
+++ ./pureftpd-mysql.conf	2009-12-04 22:05:35.350755132 +0100
@@ -19,7 +19,7 @@
 
 # Optional : define the location of mysql.sock if the server runs on this host.
 
-MYSQLSocket     /tmp/mysql.sock
+MYSQLSocket     /var/lib/mysql/mysql.sock
 
 
 # Mandatory : user to bind the server as.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Apr 2009 10:35:45 -0000	1.4
+++ .cvsignore	5 Dec 2009 06:29:48 -0000	1.5
@@ -1 +1 @@
-pure-ftpd-1.0.22.tar.bz2
+pure-ftpd-1.0.27.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- pure-ftpd.spec	16 Sep 2009 18:14:17 -0000	1.28
+++ pure-ftpd.spec	5 Dec 2009 06:29:48 -0000	1.29
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.22
-Release:    4%{?dist}
+Version:    1.0.27
+Release:    1%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.22.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -14,8 +14,8 @@ Source4:    pure-ftpd.pure-ftpwho.pam
 Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Source6:    pure-ftpd.README.SELinux
 Source7:    pure-ftpd.pureftpd.te
-Patch0:     pure-ftpd-1.0.21-config.patch
-Patch1:     pure-ftpd-1.0.20-libdir.patch
+Patch0:     pure-ftpd-1.0.27-config.patch
+#Patch1:     pure-ftpd-1.0.20-libdir.patch
 Patch2:     pure-ftpd-paminclude.patch
 Provides:   ftpserver
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,7 +72,7 @@ Pure-FTPd to be protected in the same wa
 %prep
 %setup -q
 %patch0 -p0 -b .config
-%patch1 -p0 -b .libdir
+#%%patch1 -p0 -b .libdir
 %patch2 -p0 -b .paminclude
 install -pm 644 %{SOURCE6} README.SELinux
 mkdir selinux
@@ -254,6 +254,9 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Aurelien Bompard <abompard at fedoraproject.org> -  1.0.27-1
+- version 1.0.27
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-4
 - use password-auth common PAM configuration instead of system-auth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Apr 2009 10:35:45 -0000	1.4
+++ sources	5 Dec 2009 06:29:48 -0000	1.5
@@ -1 +1 @@
-7f9ceefafaf9eb8fca757d7358f474fa  pure-ftpd-1.0.22.tar.bz2
+7d18544384aa1649d483ba86518ed34e  pure-ftpd-1.0.27.tar.bz2


--- pure-ftpd-1.0.21-config.patch DELETED ---



From abompard at fedoraproject.org  Sat Dec  5 06:29:48 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat,  5 Dec 2009 06:29:48 +0000 (UTC)
Subject: rpms/pure-ftpd/F-11 pure-ftpd-1.0.27-config.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 pure-ftpd.spec, 1.25, 1.26 sources, 1.4,
	1.5 pure-ftpd-1.0.21-config.patch, 1.2, NONE
Message-ID: <20091205062948.F0D0F11C0095@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2916/F-11

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Added Files:
	pure-ftpd-1.0.27-config.patch 
Removed Files:
	pure-ftpd-1.0.21-config.patch 
Log Message:
* Fri Dec 04 2009 Aurelien Bompard <abompard at fedoraproject.org> -  1.0.27-1
- version 1.0.27


pure-ftpd-1.0.27-config.patch:
 configuration-file/pure-ftpd.conf.in |   35 +++++++++++++++++++++--------------
 pureftpd-mysql.conf                  |    2 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

--- NEW FILE pure-ftpd-1.0.27-config.patch ---
diff -up ./configuration-file/pure-ftpd.conf.in.config ./configuration-file/pure-ftpd.conf.in
--- ./configuration-file/pure-ftpd.conf.in.config	2009-11-20 14:15:01.000000000 +0100
+++ ./configuration-file/pure-ftpd.conf.in	2009-12-04 22:09:21.461504212 +0100
@@ -9,7 +9,7 @@
 # instead of command-line options, please run the
 # following command :
 #
-# @prefix@/sbin/pure-config.pl @prefix@/etc/pure-ftpd.conf
+# @sbindir@/pure-config.pl @sysconfdir@/pure-ftpd.conf
 #
 # Please don't forget to have a look at documentation at
 # http://www.pureftpd.org/documentation.shtml for a complete list of
@@ -107,34 +107,34 @@ MaxIdleTime                 15
 
 # LDAP configuration file (see README.LDAP)
 
-# LDAPConfigFile                /etc/pureftpd-ldap.conf
+# LDAPConfigFile                @sysconfdir@/pureftpd-ldap.conf
 
 
 
 # MySQL configuration file (see README.MySQL)
 
-# MySQLConfigFile               /etc/pureftpd-mysql.conf
+# MySQLConfigFile               @sysconfdir@/pureftpd-mysql.conf
 
 
 # Postgres configuration file (see README.PGSQL)
 
-# PGSQLConfigFile               /etc/pureftpd-pgsql.conf
+# PGSQLConfigFile               @sysconfdir@/pureftpd-pgsql.conf
 
 
 # PureDB user database (see README.Virtual-Users)
 
-# PureDB                        /etc/pureftpd.pdb
+# PureDB                        @sysconfdir@/pureftpd.pdb
 
 
 # Path to pure-authd socket (see README.Authentication-Modules)
 
-# ExtAuth                       /var/run/ftpd.sock
+# ExtAuth                       @localstatedir@/run/ftpd.sock
 
 
 
 # If you want to enable PAM authentication, uncomment the following line
 
-# PAMAuthentication             yes
+PAMAuthentication             yes
 
 
 
@@ -237,7 +237,14 @@ Umask                       133:022
 
 # Minimum UID for an authenticated user to log in.
 
-MinUID                      100
+MinUID                      500
+
+
+
+# Do not use the /etc/ftpusers file to disable accounts. We're already
+# using MinUID to block users with uid < 500
+
+UseFtpUsers no
 
 
 
@@ -276,7 +283,7 @@ AutoRename                  no
 
 # Disallow anonymous users to upload new files (no = upload is allowed)
 
-AnonymousCantUpload         no
+AnonymousCantUpload         yes
 
 
 
@@ -301,21 +308,21 @@ AnonymousCantUpload         no
 # fw.c9x.org - jedi [13/Dec/1975:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338
 # This log file can then be processed by www traffic analyzers.
 
-# AltLog                     clf:/var/log/pureftpd.log
+AltLog                     clf:@localstatedir@/log/pureftpd.log
 
 
 
 # Create an additional log file with transfers logged in a format optimized
 # for statistic reports.
 
-# AltLog                     stats:/var/log/pureftpd.log
+# AltLog                     stats:@localstatedir@/log/pureftpd.log
 
 
 
 # Create an additional log file with transfers logged in the standard W3C
 # format (compatible with most commercial log analyzers)
 
-# AltLog                     w3c:/var/log/pureftpd.log
+# AltLog                     w3c:@localstatedir@/log/pureftpd.log
 
 
 
@@ -346,9 +353,9 @@ AnonymousCantUpload         no
 
 
 # If your pure-ftpd has been compiled with standalone support, you can change
-# the location of the pid file. The default is /var/run/pure-ftpd.pid
+# the location of the pid file. The default is @localstatedir@/run/pure-ftpd.pid
 
-#PIDFile                     /var/run/pure-ftpd.pid
+#PIDFile                     @localstatedir@/run/pure-ftpd.pid
 
 
 
diff -up ./pureftpd-mysql.conf.config ./pureftpd-mysql.conf
--- ./pureftpd-mysql.conf.config	2009-10-20 12:17:56.000000000 +0200
+++ ./pureftpd-mysql.conf	2009-12-04 22:05:35.350755132 +0100
@@ -19,7 +19,7 @@
 
 # Optional : define the location of mysql.sock if the server runs on this host.
 
-MYSQLSocket     /tmp/mysql.sock
+MYSQLSocket     /var/lib/mysql/mysql.sock
 
 
 # Mandatory : user to bind the server as.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Apr 2009 10:35:45 -0000	1.4
+++ .cvsignore	5 Dec 2009 06:29:45 -0000	1.5
@@ -1 +1 @@
-pure-ftpd-1.0.22.tar.bz2
+pure-ftpd-1.0.27.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/pure-ftpd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- pure-ftpd.spec	27 Apr 2009 10:35:45 -0000	1.25
+++ pure-ftpd.spec	5 Dec 2009 06:29:46 -0000	1.26
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.22
+Version:    1.0.27
 Release:    1%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.22.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -14,8 +14,8 @@ Source4:    pure-ftpd.pure-ftpwho.pam
 Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Source6:    pure-ftpd.README.SELinux
 Source7:    pure-ftpd.pureftpd.te
-Patch0:     pure-ftpd-1.0.21-config.patch
-Patch1:     pure-ftpd-1.0.20-libdir.patch
+Patch0:     pure-ftpd-1.0.27-config.patch
+#Patch1:     pure-ftpd-1.0.20-libdir.patch
 Patch2:     pure-ftpd-paminclude.patch
 Provides:   ftpserver
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,7 +72,7 @@ Pure-FTPd to be protected in the same wa
 %prep
 %setup -q
 %patch0 -p0 -b .config
-%patch1 -p0 -b .libdir
+#%%patch1 -p0 -b .libdir
 %patch2 -p0 -b .paminclude
 install -pm 644 %{SOURCE6} README.SELinux
 mkdir selinux
@@ -254,6 +254,18 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Aurelien Bompard <abompard at fedoraproject.org> -  1.0.27-1
+- version 1.0.27
+
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-4
+- use password-auth common PAM configuration instead of system-auth
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-3
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
 - version 1.0.22
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Apr 2009 10:35:45 -0000	1.4
+++ sources	5 Dec 2009 06:29:47 -0000	1.5
@@ -1 +1 @@
-7f9ceefafaf9eb8fca757d7358f474fa  pure-ftpd-1.0.22.tar.bz2
+7d18544384aa1649d483ba86518ed34e  pure-ftpd-1.0.27.tar.bz2


--- pure-ftpd-1.0.21-config.patch DELETED ---



From tjikkun at fedoraproject.org  Sat Dec  5 09:17:30 2009
From: tjikkun at fedoraproject.org (Sander Hoentjen)
Date: Sat,  5 Dec 2009 09:17:30 +0000 (UTC)
Subject: rpms/amsn/devel amsn-0.98.1-usesnack.patch, NONE, 1.1 amsn.spec,
	1.26, 1.27
Message-ID: <20091205091730.B25F111C0095@cvs1.fedora.phx.redhat.com>

Author: tjikkun

Update of /cvs/pkgs/rpms/amsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7520

Modified Files:
	amsn.spec 
Added Files:
	amsn-0.98.1-usesnack.patch 
Log Message:
use snack instead of alsa by default


amsn-0.98.1-usesnack.patch:
 config.tcl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE amsn-0.98.1-usesnack.patch ---
--- amsn/config.tcl	(revision 11816)
+++ amsn/config.tcl	(working copy)
@@ -110,7 +110,7 @@
 			::config::setKey notifyYoffset 0
 			::config::setKey filemanager "xdg-open \$location"
 			::config::setKey openfilecommand "xdg-open \$file"
-			::config::setKey usesnack 0
+			::config::setKey usesnack 1
 
 			::config::setKey os "unix"
 		} elseif { [OnWin] } {


Index: amsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/devel/amsn.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- amsn.spec	25 Nov 2009 12:47:08 -0000	1.26
+++ amsn.spec	5 Dec 2009 09:17:29 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           amsn
 Version:        0.98.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -12,6 +12,7 @@ URL:            http://www.amsn-project.
 Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
 Patch0:         amsn-0.98.1-no-exact-http.patch
 Patch1:		amsn-0.98.1-songbird-exception.patch
+Patch2:		amsn-0.98.1-usesnack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
@@ -20,7 +21,8 @@ BuildRequires:  gupnp-igd-devel
 BuildRequires:  libv4l-devel
 BuildRequires:  tcl(abi) = %{tcl_version}
 Requires:       tcl(abi) = %{tcl_version}
-Requires:       tcltls, tclsoap, tcllib, bwidget, tkdnd, xdg-utils, alsa-utils
+Requires:	tcl-snack
+Requires:       tcltls, tclsoap, tcllib, bwidget, tkdnd, xdg-utils
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -41,6 +43,7 @@ snapshots with your webcam to use as you
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 rm -r utils/BWidget-1.9.0
 rm -r skins/default/winicons
@@ -132,6 +135,10 @@ fi
 
 
 %changelog
+* Sat Dec 05 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-3
+- add requires on tcl-snack, it is needed for voice-clip support
+- since we need snack anyway, use it for all audio and drop requirement on alsa-utils
+
 * Wed Nov 25 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-2
 - songbird plugin had a python exception when songbird
   was not installed (bug #539422)



From tjikkun at fedoraproject.org  Sat Dec  5 09:21:34 2009
From: tjikkun at fedoraproject.org (Sander Hoentjen)
Date: Sat,  5 Dec 2009 09:21:34 +0000 (UTC)
Subject: rpms/amsn/F-12 amsn-0.98.1-usesnack.patch, NONE, 1.1 amsn.spec, 1.26,
	1.27
Message-ID: <20091205092134.7C82D11C0095@cvs1.fedora.phx.redhat.com>

Author: tjikkun

Update of /cvs/pkgs/rpms/amsn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8259

Modified Files:
	amsn.spec 
Added Files:
	amsn-0.98.1-usesnack.patch 
Log Message:
use snack instead of alsa by default


amsn-0.98.1-usesnack.patch:
 config.tcl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE amsn-0.98.1-usesnack.patch ---
--- amsn/config.tcl	(revision 11816)
+++ amsn/config.tcl	(working copy)
@@ -110,7 +110,7 @@
 			::config::setKey notifyYoffset 0
 			::config::setKey filemanager "xdg-open \$location"
 			::config::setKey openfilecommand "xdg-open \$file"
-			::config::setKey usesnack 0
+			::config::setKey usesnack 1
 
 			::config::setKey os "unix"
 		} elseif { [OnWin] } {


Index: amsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-12/amsn.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- amsn.spec	25 Nov 2009 12:42:51 -0000	1.26
+++ amsn.spec	5 Dec 2009 09:21:34 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           amsn
 Version:        0.98.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -12,6 +12,7 @@ URL:            http://www.amsn-project.
 Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
 Patch0:         amsn-0.98.1-no-exact-http.patch
 Patch1:		amsn-0.98.1-songbird-exception.patch
+Patch2:		amsn-0.98.1-usesnack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
@@ -20,7 +21,8 @@ BuildRequires:  gupnp-igd-devel
 BuildRequires:  libv4l-devel
 BuildRequires:  tcl(abi) = %{tcl_version}
 Requires:       tcl(abi) = %{tcl_version}
-Requires:       tcltls, tclsoap, tcllib, bwidget, tkdnd, xdg-utils, alsa-utils
+Requires:	tcl-snack
+Requires:       tcltls, tclsoap, tcllib, bwidget, tkdnd, xdg-utils
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -41,6 +43,7 @@ snapshots with your webcam to use as you
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 rm -r utils/BWidget-1.9.0
 rm -r skins/default/winicons
@@ -132,6 +135,10 @@ fi
 
 
 %changelog
+* Sat Dec 05 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-3
+- add requires on tcl-snack, it is needed for voice-clip support
+- since we need snack anyway, use it for all audio and drop requirement on alsa-utils
+
 * Wed Nov 25 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-2
 - songbird plugin had a python exception when songbird
   was not installed (bug #539422)



From mso at fedoraproject.org  Sat Dec  5 09:33:08 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Sat,  5 Dec 2009 09:33:08 +0000 (UTC)
Subject: File icon-artist-0.1.92.tar.bz2 uploaded to lookaside cache by mso
Message-ID: <20091205093308.1AB2310F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ruby-icon-artist:

a0829c3910dbe060f9b790724b7ce2f6  icon-artist-0.1.92.tar.bz2



From jnovy at fedoraproject.org  Sat Dec  5 09:37:35 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  5 Dec 2009 09:37:35 +0000 (UTC)
Subject: File envlab.zip uploaded to lookaside cache by jnovy
Message-ID: <20091205093735.7D52F10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for texlive-texmf:

17e6656e924242a04aba635bbfcfeb6c  envlab.zip



From mso at fedoraproject.org  Sat Dec  5 09:37:51 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Sat,  5 Dec 2009 09:37:51 +0000 (UTC)
Subject: rpms/ruby-icon-artist/F-11 .cvsignore, 1.3,
	1.4 ruby-icon-artist.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091205093751.419C611C0095@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11465/F-11

Modified Files:
	.cvsignore ruby-icon-artist.spec sources 
Log Message:


new upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Aug 2009 16:00:41 -0000	1.3
+++ .cvsignore	5 Dec 2009 09:37:50 -0000	1.4
@@ -1 +1 @@
-icon-artist-0.1.91.tar.bz2
+icon-artist-0.1.92.tar.bz2


Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-11/ruby-icon-artist.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ruby-icon-artist.spec	13 Aug 2009 16:28:53 -0000	1.3
+++ ruby-icon-artist.spec	5 Dec 2009 09:37:51 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 Name:           ruby-icon-artist
-Version:        0.1.91
+Version:        0.1.92
 Release:        1%{?dist}
 Summary:        Supporting libraries for icon artists
 
@@ -51,6 +51,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 05 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.92-1
+- New upstream release
+- Workaround broken remote branches name detection by rubygem(git)
+- Better icon name detection
+
 * Thu Aug 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.91-1
 - New upstream release
 - Patch upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Aug 2009 16:00:41 -0000	1.3
+++ sources	5 Dec 2009 09:37:51 -0000	1.4
@@ -1 +1 @@
-035ad38e5fa0b5594274e77a8109306d  icon-artist-0.1.91.tar.bz2
+a0829c3910dbe060f9b790724b7ce2f6  icon-artist-0.1.92.tar.bz2



From mso at fedoraproject.org  Sat Dec  5 09:37:51 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Sat,  5 Dec 2009 09:37:51 +0000 (UTC)
Subject: rpms/ruby-icon-artist/F-12 .cvsignore, 1.3,
	1.4 ruby-icon-artist.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091205093751.7623611C0095@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11465/F-12

Modified Files:
	.cvsignore ruby-icon-artist.spec sources 
Log Message:


new upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Aug 2009 16:00:41 -0000	1.3
+++ .cvsignore	5 Dec 2009 09:37:51 -0000	1.4
@@ -1 +1 @@
-icon-artist-0.1.91.tar.bz2
+icon-artist-0.1.92.tar.bz2


Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-12/ruby-icon-artist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ruby-icon-artist.spec	13 Aug 2009 16:28:53 -0000	1.5
+++ ruby-icon-artist.spec	5 Dec 2009 09:37:51 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 Name:           ruby-icon-artist
-Version:        0.1.91
+Version:        0.1.92
 Release:        1%{?dist}
 Summary:        Supporting libraries for icon artists
 
@@ -51,6 +51,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 05 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.92-1
+- New upstream release
+- Workaround broken remote branches name detection by rubygem(git)
+- Better icon name detection
+
 * Thu Aug 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.91-1
 - New upstream release
 - Patch upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Aug 2009 16:00:41 -0000	1.3
+++ sources	5 Dec 2009 09:37:51 -0000	1.4
@@ -1 +1 @@
-035ad38e5fa0b5594274e77a8109306d  icon-artist-0.1.91.tar.bz2
+a0829c3910dbe060f9b790724b7ce2f6  icon-artist-0.1.92.tar.bz2



From mso at fedoraproject.org  Sat Dec  5 09:37:51 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Sat,  5 Dec 2009 09:37:51 +0000 (UTC)
Subject: rpms/ruby-icon-artist/devel .cvsignore, 1.3,
	1.4 ruby-icon-artist.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091205093751.B8AE311C0095@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11465/devel

Modified Files:
	.cvsignore ruby-icon-artist.spec sources 
Log Message:


new upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Aug 2009 16:00:41 -0000	1.3
+++ .cvsignore	5 Dec 2009 09:37:51 -0000	1.4
@@ -1 +1 @@
-icon-artist-0.1.91.tar.bz2
+icon-artist-0.1.92.tar.bz2


Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/devel/ruby-icon-artist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ruby-icon-artist.spec	13 Aug 2009 16:28:53 -0000	1.5
+++ ruby-icon-artist.spec	5 Dec 2009 09:37:51 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 Name:           ruby-icon-artist
-Version:        0.1.91
+Version:        0.1.92
 Release:        1%{?dist}
 Summary:        Supporting libraries for icon artists
 
@@ -51,6 +51,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 05 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.92-1
+- New upstream release
+- Workaround broken remote branches name detection by rubygem(git)
+- Better icon name detection
+
 * Thu Aug 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.91-1
 - New upstream release
 - Patch upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Aug 2009 16:00:41 -0000	1.3
+++ sources	5 Dec 2009 09:37:51 -0000	1.4
@@ -1 +1 @@
-035ad38e5fa0b5594274e77a8109306d  icon-artist-0.1.91.tar.bz2
+a0829c3910dbe060f9b790724b7ce2f6  icon-artist-0.1.92.tar.bz2



From jnovy at fedoraproject.org  Sat Dec  5 09:38:02 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  5 Dec 2009 09:38:02 +0000 (UTC)
Subject: File achemso.zip uploaded to lookaside cache by jnovy
Message-ID: <20091205093802.E164510F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for texlive-texmf:

ba238f7a249967c11c048d1b039e4ead  achemso.zip



From jnovy at fedoraproject.org  Sat Dec  5 09:38:21 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  5 Dec 2009 09:38:21 +0000 (UTC)
Subject: File IEEEconf.zip uploaded to lookaside cache by jnovy
Message-ID: <20091205093821.9B27B10F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for texlive-texmf:

ba9184469d3323fd43b42e1568d4b5f6  IEEEconf.zip



From jnovy at fedoraproject.org  Sat Dec  5 09:40:24 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  5 Dec 2009 09:40:24 +0000 (UTC)
Subject: File perltex.zip uploaded to lookaside cache by jnovy
Message-ID: <20091205094024.3D24A10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for texlive-texmf:

fbac0afea54208bd8bc7d71a0d8524a1  perltex.zip



From jnovy at fedoraproject.org  Sat Dec  5 09:41:54 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  5 Dec 2009 09:41:54 +0000 (UTC)
Subject: rpms/texlive-texmf/F-12 .cvsignore, 1.4, 1.5 sources, 1.6,
	1.7 texlive-texmf.spec, 1.36, 1.37
Message-ID: <20091205094154.D6EA311C0095@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12466

Modified Files:
	.cvsignore sources texlive-texmf.spec 
Log Message:
* Fri Dec 04 2009 Jindrich Novy <jnovy at redhat.com> 2007-34
- fix permissions of /var/lib/texmf/web2c (#512459, #531894)
- add IEEEconf (#495877)
- update achemso (#521459)
- update perltex to 2.0 from CTAN
- obsolete tetex-perltex



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Oct 2008 11:34:35 -0000	1.4
+++ .cvsignore	5 Dec 2009 09:41:54 -0000	1.5
@@ -3,4 +3,7 @@ platex209.tar.bz2
 ptex-texmf-2.5.tar.gz
 texlive.texmf-var-2007.zip
 texlive.texmf-2007.tar.lzma
-envlab.tar.lzma
+envlab.zip
+achemso.zip
+IEEEconf.zip
+perltex.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Oct 2008 11:34:35 -0000	1.6
+++ sources	5 Dec 2009 09:41:54 -0000	1.7
@@ -3,4 +3,7 @@ c24f99d1fd399acecc2f3070c23f43f1  platex
 9eb48ecb66cfd626865222564545de1c  ptex-texmf-2.5.tar.gz
 97c26c0067177fb633616f8611561bc7  texlive.texmf-var-2007.zip
 4293cc193a7352544119a6d7cf723105  texlive.texmf-2007.tar.lzma
-ce0ee0fbe363197ee4c390029fc8d587  envlab.tar.lzma
+17e6656e924242a04aba635bbfcfeb6c  envlab.zip
+ba238f7a249967c11c048d1b039e4ead  achemso.zip
+ba9184469d3323fd43b42e1568d4b5f6  IEEEconf.zip
+fbac0afea54208bd8bc7d71a0d8524a1  perltex.zip


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-12/texlive-texmf.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- texlive-texmf.spec	3 Dec 2009 08:32:05 -0000	1.36
+++ texlive-texmf.spec	5 Dec 2009 09:41:54 -0000	1.37
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	33%{?dist}
+Release:	34%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -28,7 +28,6 @@ URL:		http://tug.org/texlive/
 Source0:	texlive.texmf-%{version}.tar.lzma
 # Source1 is http://www.tug.org/texlive/Contents/inst/archive/texmf-var.zip
 Source1:	texlive.texmf-var-%{version}.zip
-Source2:	http://ctan.org/get/systems/texlive/tlnet/2008/archive/envlab.tar.lzma
 
 # pregenerated kpathsea ls-R files in case no binary TeXLive is present to regenerate them
 Source10:	texlive.%{version}.ls-R
@@ -44,6 +43,12 @@ Source91:	texlive.%{version}.zip.list
 Source99: texlive-filter-requires.sh
 %define __perl_requires %{SOURCE99}
 
+# updates of the basic TeX Live 2007 texmf tree
+Source100:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/envlab.zip
+Source101:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/perltex.zip
+Source102:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/achemso.zip
+Source103:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/IEEEconf.zip
+
 # speed up build, run only brp-compress, nothing else is needed
 %define __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
@@ -66,7 +71,7 @@ Patch7:		texlive-2007-latin.patch
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
 
-BuildRequires:  sed >= 3.95 ghostscript lzma
+BuildRequires:  sed >= 3.95 ghostscript lzma tex(latex)
 
 Requires:	texlive-texmf-errata = %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -138,6 +143,8 @@ Obsoletes:	tetex-bytefield < 1.2a-7
 Provides:	tetex-bytefield = 1.2a-7
 Obsoletes:	tetex-prosper < 1.5-7
 Provides:	tetex-prosper = 1.5-7
+Obsoletes:	tetex-perltex < 2.0
+Provides:	tetex-perltex = 2.0
 
 %description latex
 This package contains the components of the TEXMF tree needed for the
@@ -176,7 +183,15 @@ texlive-context package.
 %prep
 %setup -q -c -T
 lzma -dc %{SOURCE0} | tar x
-lzma -dc %{SOURCE2} | tar x
+
+# extract envlab
+unzip %{SOURCE100}
+# extract perltex
+unzip %{SOURCE101}
+# extract achemso
+unzip %{SOURCE102}
+# extract IEEEconf
+unzip %{SOURCE103}
 
 mkdir texmf-var
 unzip -d texmf-var %{SOURCE1}
@@ -356,6 +371,51 @@ rm -rf texmf/ttf2pk/
 #remove ubbold.fd (#458150)
 rm -f texmf/tex/latex/jknapltx/ubbold.fd
 
+# build envlab
+rm -f texmf-dist/tex/latex/envlab/*
+rm -f texmf-dist/doc/latex/envlab/*
+pushd envlab
+latex envlab.ins
+install -p -m 644 *.sty ../texmf-dist/tex/latex/envlab/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/envlab/
+install -p -m 644 README ../texmf-dist/doc/latex/envlab/
+popd
+
+# build perltex
+rm -f texmf-dist/tex/latex/perltex/*
+rm -f texmf-dist/doc/latex/perltex/*
+pushd perltex
+latex perltex.ins
+%{__sed} -i 's,^#! /usr/bin/env perl$,#!%{__perl},' perltex.pl
+install -p -m 644 *.sty ../texmf-dist/tex/latex/perltex/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/perltex/
+install -p -m 644 README ../texmf-dist/doc/latex/perltex/
+popd
+
+# build achemso
+rm -f texmf-dist/tex/latex/achemso/*
+rm -f texmf-dist/doc/latex/achemso/*
+pushd achemso
+latex achemso.ins
+install -p -m 644 *.sty ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.cls ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.bst ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.cfg ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/achemso/
+install -p -m 644 README ../texmf-dist/doc/latex/achemso/
+popd
+
+# build IEEEconf
+mkdir -p texmf-dist/tex/latex/IEEEconf
+mkdir -p texmf-dist/doc/latex/IEEEconf
+pushd IEEEconf
+latex IEEEconf.ins
+install -p -m 644 *.cls ../texmf-dist/tex/latex/IEEEconf/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/IEEEconf/
+install -p -m 644 README ../texmf-dist/doc/latex/IEEEconf/
+popd
+
+
 %install
 rm -rf %{buildroot} && mkdir -p %{buildroot}
 
@@ -434,6 +494,13 @@ rm -rf %{buildroot}%{_texmf_main}/tex/te
 # remove dvipdfm configuration file
 rm -rf %{buildroot}%{_texmf_main}/dvipdfm
 
+# install perltex
+install -d -m755 %{buildroot}%{_bindir}
+install -p -m755 perltex/perltex.pl %{buildroot}%{_bindir}/perltex
+
+# fix permissions of /var/lib/texmf/web2c
+chmod 755 %{buildroot}%{_texmf_var}/web2c
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -813,6 +880,7 @@ fi
 
 %files latex
 %defattr(-,root,root,-)
+%{_bindir}/perltex
 %{_texmf_main}/tex/cslatex/
 %{_texmf_main}/tex/latex/
 %{_texmf_main}/tex/platex/
@@ -832,6 +900,13 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Fri Dec 04 2009 Jindrich Novy <jnovy at redhat.com> 2007-34
+- fix permissions of /var/lib/texmf/web2c (#512459, #531894)
+- add IEEEconf (#495877)
+- update achemso (#521459)
+- update perltex to 2.0 from CTAN
+- obsolete tetex-perltex
+
 * Thu Dec 03 2009 Jindrich Novy <jnovy at redhat.com> 2007-33
 - drop tetex-perltex dependency
 



From pkgdb at fedoraproject.org  Sat Dec  5 09:56:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 09:56:24 +0000
Subject: [pkgdb] bochs had acl change status
Message-ID: <20091205095624.CFBD110F878@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on bochs (Fedora 12) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Sat Dec  5 09:56:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 09:56:26 +0000
Subject: [pkgdb] bochs had acl change status
Message-ID: <20091205095626.7EFA910F895@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on bochs (Fedora 12) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Sat Dec  5 09:56:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 09:56:30 +0000
Subject: [pkgdb] bochs had acl change status
Message-ID: <20091205095630.4CB7710F89C@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on bochs (Fedora 11) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Sat Dec  5 09:56:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 09:56:32 +0000
Subject: [pkgdb] bochs had acl change status
Message-ID: <20091205095632.3606610F8A1@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on bochs (Fedora 11) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From jnovy at fedoraproject.org  Sat Dec  5 10:27:49 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  5 Dec 2009 10:27:49 +0000 (UTC)
Subject: rpms/texlive-texmf/devel .cvsignore, 1.4, 1.5 sources, 1.6,
	1.7 texlive-texmf.spec, 1.36, 1.37
Message-ID: <20091205102749.D03B611C0095@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21341

Modified Files:
	.cvsignore sources texlive-texmf.spec 
Log Message:
* Fri Dec 04 2009 Jindrich Novy <jnovy at redhat.com> 2007-34
- fix permissions of /var/lib/texmf/web2c (#512459, #531894)
- add IEEEconf (#495877)
- update achemso (#521459)
- update perltex to 2.0 from CTAN
- obsolete tetex-perltex



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Oct 2008 11:34:35 -0000	1.4
+++ .cvsignore	5 Dec 2009 10:27:49 -0000	1.5
@@ -3,4 +3,7 @@ platex209.tar.bz2
 ptex-texmf-2.5.tar.gz
 texlive.texmf-var-2007.zip
 texlive.texmf-2007.tar.lzma
-envlab.tar.lzma
+envlab.zip
+achemso.zip
+IEEEconf.zip
+perltex.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Oct 2008 11:34:35 -0000	1.6
+++ sources	5 Dec 2009 10:27:49 -0000	1.7
@@ -3,4 +3,7 @@ c24f99d1fd399acecc2f3070c23f43f1  platex
 9eb48ecb66cfd626865222564545de1c  ptex-texmf-2.5.tar.gz
 97c26c0067177fb633616f8611561bc7  texlive.texmf-var-2007.zip
 4293cc193a7352544119a6d7cf723105  texlive.texmf-2007.tar.lzma
-ce0ee0fbe363197ee4c390029fc8d587  envlab.tar.lzma
+17e6656e924242a04aba635bbfcfeb6c  envlab.zip
+ba238f7a249967c11c048d1b039e4ead  achemso.zip
+ba9184469d3323fd43b42e1568d4b5f6  IEEEconf.zip
+fbac0afea54208bd8bc7d71a0d8524a1  perltex.zip


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- texlive-texmf.spec	27 Oct 2009 22:50:47 -0000	1.36
+++ texlive-texmf.spec	5 Dec 2009 10:27:49 -0000	1.37
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	32%{?dist}
+Release:	34%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -28,7 +28,6 @@ URL:		http://tug.org/texlive/
 Source0:	texlive.texmf-%{version}.tar.lzma
 # Source1 is http://www.tug.org/texlive/Contents/inst/archive/texmf-var.zip
 Source1:	texlive.texmf-var-%{version}.zip
-Source2:	http://ctan.org/get/systems/texlive/tlnet/2008/archive/envlab.tar.lzma
 
 # pregenerated kpathsea ls-R files in case no binary TeXLive is present to regenerate them
 Source10:	texlive.%{version}.ls-R
@@ -44,6 +43,12 @@ Source91:	texlive.%{version}.zip.list
 Source99: texlive-filter-requires.sh
 %define __perl_requires %{SOURCE99}
 
+# updates of the basic TeX Live 2007 texmf tree
+Source100:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/envlab.zip
+Source101:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/perltex.zip
+Source102:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/achemso.zip
+Source103:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/IEEEconf.zip
+
 # speed up build, run only brp-compress, nothing else is needed
 %define __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
@@ -66,7 +71,7 @@ Patch7:		texlive-2007-latin.patch
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
 
-BuildRequires:  sed >= 3.95 ghostscript lzma
+BuildRequires:  sed >= 3.95 ghostscript lzma tex(latex)
 
 Requires:	texlive-texmf-errata = %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -138,9 +143,8 @@ Obsoletes:	tetex-bytefield < 1.2a-7
 Provides:	tetex-bytefield = 1.2a-7
 Obsoletes:	tetex-prosper < 1.5-7
 Provides:	tetex-prosper = 1.5-7
-# The copy in this package is rather old (1.6)
-# We'll use the newer one in tetex-perltex, at least for now.
-Requires:	tetex-perltex
+Obsoletes:	tetex-perltex < 2.0
+Provides:	tetex-perltex = 2.0
 
 %description latex
 This package contains the components of the TEXMF tree needed for the
@@ -179,7 +183,15 @@ texlive-context package.
 %prep
 %setup -q -c -T
 lzma -dc %{SOURCE0} | tar x
-lzma -dc %{SOURCE2} | tar x
+
+# extract envlab
+unzip %{SOURCE100}
+# extract perltex
+unzip %{SOURCE101}
+# extract achemso
+unzip %{SOURCE102}
+# extract IEEEconf
+unzip %{SOURCE103}
 
 mkdir texmf-var
 unzip -d texmf-var %{SOURCE1}
@@ -348,10 +360,6 @@ rm -f texmf/web2c/{mktex.opt,mktexdir,mk
 # these files owned by binary texlive-dvips package
 rm -rf texmf/dvips/base
 
-# these files owned by tetex-perltex package
-rm -rf texmf-dist/tex/latex/perltex/
-rm -rf texmf-dist/doc/latex/perltex/
-
 # remove ttf2pk stuff from bin-ttfutils
 rm -f texmf/doc/man/man1/ttf2pk.1
 rm -rf texmf/doc/ttf2pk/
@@ -363,6 +371,51 @@ rm -rf texmf/ttf2pk/
 #remove ubbold.fd (#458150)
 rm -f texmf/tex/latex/jknapltx/ubbold.fd
 
+# build envlab
+rm -f texmf-dist/tex/latex/envlab/*
+rm -f texmf-dist/doc/latex/envlab/*
+pushd envlab
+latex envlab.ins
+install -p -m 644 *.sty ../texmf-dist/tex/latex/envlab/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/envlab/
+install -p -m 644 README ../texmf-dist/doc/latex/envlab/
+popd
+
+# build perltex
+rm -f texmf-dist/tex/latex/perltex/*
+rm -f texmf-dist/doc/latex/perltex/*
+pushd perltex
+latex perltex.ins
+%{__sed} -i 's,^#! /usr/bin/env perl$,#!%{__perl},' perltex.pl
+install -p -m 644 *.sty ../texmf-dist/tex/latex/perltex/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/perltex/
+install -p -m 644 README ../texmf-dist/doc/latex/perltex/
+popd
+
+# build achemso
+rm -f texmf-dist/tex/latex/achemso/*
+rm -f texmf-dist/doc/latex/achemso/*
+pushd achemso
+latex achemso.ins
+install -p -m 644 *.sty ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.cls ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.bst ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.cfg ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/achemso/
+install -p -m 644 README ../texmf-dist/doc/latex/achemso/
+popd
+
+# build IEEEconf
+mkdir -p texmf-dist/tex/latex/IEEEconf
+mkdir -p texmf-dist/doc/latex/IEEEconf
+pushd IEEEconf
+latex IEEEconf.ins
+install -p -m 644 *.cls ../texmf-dist/tex/latex/IEEEconf/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/IEEEconf/
+install -p -m 644 README ../texmf-dist/doc/latex/IEEEconf/
+popd
+
+
 %install
 rm -rf %{buildroot} && mkdir -p %{buildroot}
 
@@ -441,6 +494,13 @@ rm -rf %{buildroot}%{_texmf_main}/tex/te
 # remove dvipdfm configuration file
 rm -rf %{buildroot}%{_texmf_main}/dvipdfm
 
+# install perltex
+install -d -m755 %{buildroot}%{_bindir}
+install -p -m755 perltex/perltex.pl %{buildroot}%{_bindir}/perltex
+
+# fix permissions of /var/lib/texmf/web2c
+chmod 755 %{buildroot}%{_texmf_var}/web2c
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -603,9 +663,6 @@ fi
 %{_texmf_main}/bibtex/bst/[a-b]*/
 %{_texmf_main}/bibtex/bst/camel/
 %{_texmf_main}/bibtex/bst/[d-x]*/
-#%dir %{_texmf_main}/dvipdfm
-#%dir %{_texmf_main}/dvipdfm/config
-#%{_texmf_main}/dvipdfm/config/config
 %dir %{_texmf_main}/fmtutil
 %{_texmf_main}/makeindex/
 %{_texmf_main}/metafont/
@@ -823,6 +880,7 @@ fi
 
 %files latex
 %defattr(-,root,root,-)
+%{_bindir}/perltex
 %{_texmf_main}/tex/cslatex/
 %{_texmf_main}/tex/latex/
 %{_texmf_main}/tex/platex/
@@ -842,6 +900,13 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Fri Dec 04 2009 Jindrich Novy <jnovy at redhat.com> 2007-34
+- fix permissions of /var/lib/texmf/web2c (#512459, #531894)
+- add IEEEconf (#495877)
+- update achemso (#521459)
+- update perltex to 2.0 from CTAN
+- obsolete tetex-perltex
+
 * Mon Oct 26 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2007-32
 - resolve conflict between texlive-texmf (and -doc) and tetex-perltex
 - resolve conflict between texlive-texmf and tetex-prosper



From jnovy at fedoraproject.org  Sat Dec  5 10:34:43 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  5 Dec 2009 10:34:43 +0000 (UTC)
Subject: rpms/texlive-texmf/F-11 .cvsignore, 1.4, 1.5 sources, 1.6,
	1.7 texlive-texmf.spec, 1.34, 1.35
Message-ID: <20091205103443.342F811C0095@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22827

Modified Files:
	.cvsignore sources texlive-texmf.spec 
Log Message:
* Fri Dec 04 2009 Jindrich Novy <jnovy at redhat.com> 2007-34
- fix permissions of /var/lib/texmf/web2c (#512459, #531894)
- add IEEEconf (#495877)
- update achemso (#521459)
- update perltex to 2.0 from CTAN
- obsolete tetex-perltex



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Oct 2008 11:34:35 -0000	1.4
+++ .cvsignore	5 Dec 2009 10:34:42 -0000	1.5
@@ -3,4 +3,7 @@ platex209.tar.bz2
 ptex-texmf-2.5.tar.gz
 texlive.texmf-var-2007.zip
 texlive.texmf-2007.tar.lzma
-envlab.tar.lzma
+envlab.zip
+achemso.zip
+IEEEconf.zip
+perltex.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Oct 2008 11:34:35 -0000	1.6
+++ sources	5 Dec 2009 10:34:42 -0000	1.7
@@ -3,4 +3,7 @@ c24f99d1fd399acecc2f3070c23f43f1  platex
 9eb48ecb66cfd626865222564545de1c  ptex-texmf-2.5.tar.gz
 97c26c0067177fb633616f8611561bc7  texlive.texmf-var-2007.zip
 4293cc193a7352544119a6d7cf723105  texlive.texmf-2007.tar.lzma
-ce0ee0fbe363197ee4c390029fc8d587  envlab.tar.lzma
+17e6656e924242a04aba635bbfcfeb6c  envlab.zip
+ba238f7a249967c11c048d1b039e4ead  achemso.zip
+ba9184469d3323fd43b42e1568d4b5f6  IEEEconf.zip
+fbac0afea54208bd8bc7d71a0d8524a1  perltex.zip


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-11/texlive-texmf.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- texlive-texmf.spec	16 Nov 2009 21:21:30 -0000	1.34
+++ texlive-texmf.spec	5 Dec 2009 10:34:42 -0000	1.35
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	32%{?dist}
+Release:	34%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -28,7 +28,6 @@ URL:		http://tug.org/texlive/
 Source0:	texlive.texmf-%{version}.tar.lzma
 # Source1 is http://www.tug.org/texlive/Contents/inst/archive/texmf-var.zip
 Source1:	texlive.texmf-var-%{version}.zip
-Source2:	http://ctan.org/get/systems/texlive/tlnet/2008/archive/envlab.tar.lzma
 
 # pregenerated kpathsea ls-R files in case no binary TeXLive is present to regenerate them
 Source10:	texlive.%{version}.ls-R
@@ -44,6 +43,12 @@ Source91:	texlive.%{version}.zip.list
 Source99: texlive-filter-requires.sh
 %define __perl_requires %{SOURCE99}
 
+# updates of the basic TeX Live 2007 texmf tree
+Source100:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/envlab.zip
+Source101:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/perltex.zip
+Source102:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/achemso.zip
+Source103:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/IEEEconf.zip
+
 # speed up build, run only brp-compress, nothing else is needed
 %define __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
@@ -66,7 +71,7 @@ Patch7:		texlive-2007-latin.patch
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
 
-BuildRequires:  sed >= 3.95 ghostscript lzma
+BuildRequires:  sed >= 3.95 ghostscript lzma tex(latex)
 
 Requires:	texlive-texmf-errata = %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -138,9 +143,8 @@ Obsoletes:	tetex-bytefield < 1.2a-7
 Provides:	tetex-bytefield = 1.2a-7
 Obsoletes:	tetex-prosper < 1.5-7
 Provides:	tetex-prosper = 1.5-7
-# The copy in this package is rather old (1.6)
-# We'll use the newer one in tetex-perltex, at least for now.
-Requires:	tetex-perltex
+Obsoletes:	tetex-perltex < 2.0
+Provides:	tetex-perltex = 2.0
 
 %description latex
 This package contains the components of the TEXMF tree needed for the
@@ -179,7 +183,15 @@ texlive-context package.
 %prep
 %setup -q -c -T
 lzma -dc %{SOURCE0} | tar x
-lzma -dc %{SOURCE2} | tar x
+
+# extract envlab
+unzip %{SOURCE100}
+# extract perltex
+unzip %{SOURCE101}
+# extract achemso
+unzip %{SOURCE102}
+# extract IEEEconf
+unzip %{SOURCE103}
 
 mkdir texmf-var
 unzip -d texmf-var %{SOURCE1}
@@ -348,10 +360,6 @@ rm -f texmf/web2c/{mktex.opt,mktexdir,mk
 # these files owned by binary texlive-dvips package
 rm -rf texmf/dvips/base
 
-# these files owned by tetex-perltex package
-rm -rf texmf-dist/tex/latex/perltex/
-rm -rf texmf-dist/doc/latex/perltex/
-
 # remove ttf2pk stuff from bin-ttfutils
 rm -f texmf/doc/man/man1/ttf2pk.1
 rm -rf texmf/doc/ttf2pk/
@@ -363,6 +371,51 @@ rm -rf texmf/ttf2pk/
 #remove ubbold.fd (#458150)
 rm -f texmf/tex/latex/jknapltx/ubbold.fd
 
+# build envlab
+rm -f texmf-dist/tex/latex/envlab/*
+rm -f texmf-dist/doc/latex/envlab/*
+pushd envlab
+latex envlab.ins
+install -p -m 644 *.sty ../texmf-dist/tex/latex/envlab/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/envlab/
+install -p -m 644 README ../texmf-dist/doc/latex/envlab/
+popd
+
+# build perltex
+rm -f texmf-dist/tex/latex/perltex/*
+rm -f texmf-dist/doc/latex/perltex/*
+pushd perltex
+latex perltex.ins
+%{__sed} -i 's,^#! /usr/bin/env perl$,#!%{__perl},' perltex.pl
+install -p -m 644 *.sty ../texmf-dist/tex/latex/perltex/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/perltex/
+install -p -m 644 README ../texmf-dist/doc/latex/perltex/
+popd
+
+# build achemso
+rm -f texmf-dist/tex/latex/achemso/*
+rm -f texmf-dist/doc/latex/achemso/*
+pushd achemso
+latex achemso.ins
+install -p -m 644 *.sty ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.cls ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.bst ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.cfg ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/achemso/
+install -p -m 644 README ../texmf-dist/doc/latex/achemso/
+popd
+
+# build IEEEconf
+mkdir -p texmf-dist/tex/latex/IEEEconf
+mkdir -p texmf-dist/doc/latex/IEEEconf
+pushd IEEEconf
+latex IEEEconf.ins
+install -p -m 644 *.cls ../texmf-dist/tex/latex/IEEEconf/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/IEEEconf/
+install -p -m 644 README ../texmf-dist/doc/latex/IEEEconf/
+popd
+
+
 %install
 rm -rf %{buildroot} && mkdir -p %{buildroot}
 
@@ -441,6 +494,13 @@ rm -rf %{buildroot}%{_texmf_main}/tex/te
 # remove dvipdfm configuration file
 rm -rf %{buildroot}%{_texmf_main}/dvipdfm
 
+# install perltex
+install -d -m755 %{buildroot}%{_bindir}
+install -p -m755 perltex/perltex.pl %{buildroot}%{_bindir}/perltex
+
+# fix permissions of /var/lib/texmf/web2c
+chmod 755 %{buildroot}%{_texmf_var}/web2c
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -820,6 +880,7 @@ fi
 
 %files latex
 %defattr(-,root,root,-)
+%{_bindir}/perltex
 %{_texmf_main}/tex/cslatex/
 %{_texmf_main}/tex/latex/
 %{_texmf_main}/tex/platex/
@@ -839,6 +900,13 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Fri Dec 04 2009 Jindrich Novy <jnovy at redhat.com> 2007-34
+- fix permissions of /var/lib/texmf/web2c (#512459, #531894)
+- add IEEEconf (#495877)
+- update achemso (#521459)
+- update perltex to 2.0 from CTAN
+- obsolete tetex-perltex
+
 * Mon Oct 26 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2007-32
 - resolve conflict between texlive-texmf (and -doc) and tetex-perltex
 - resolve conflict between texlive-texmf and tetex-prosper
@@ -850,9 +918,6 @@ fi
 - update latin.ldf (#469948)
 - do not provide any perl dependencies (#516350)
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jnovy at fedoraproject.org  Sat Dec  5 10:38:32 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat,  5 Dec 2009 10:38:32 +0000 (UTC)
Subject: rpms/texlive-texmf/F-10 .cvsignore, 1.4, 1.5 sources, 1.6,
	1.7 texlive-texmf.spec, 1.31, 1.32
Message-ID: <20091205103832.C498111C0095@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23698

Modified Files:
	.cvsignore sources texlive-texmf.spec 
Log Message:
* Fri Dec 04 2009 Jindrich Novy <jnovy at redhat.com> 2007-34
- fix permissions of /var/lib/texmf/web2c (#512459, #531894)
- add IEEEconf (#495877)
- update achemso (#521459)
- update perltex to 2.0 from CTAN
- obsolete tetex-perltex



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Oct 2008 11:34:35 -0000	1.4
+++ .cvsignore	5 Dec 2009 10:38:32 -0000	1.5
@@ -3,4 +3,7 @@ platex209.tar.bz2
 ptex-texmf-2.5.tar.gz
 texlive.texmf-var-2007.zip
 texlive.texmf-2007.tar.lzma
-envlab.tar.lzma
+envlab.zip
+achemso.zip
+IEEEconf.zip
+perltex.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Oct 2008 11:34:35 -0000	1.6
+++ sources	5 Dec 2009 10:38:32 -0000	1.7
@@ -3,4 +3,7 @@ c24f99d1fd399acecc2f3070c23f43f1  platex
 9eb48ecb66cfd626865222564545de1c  ptex-texmf-2.5.tar.gz
 97c26c0067177fb633616f8611561bc7  texlive.texmf-var-2007.zip
 4293cc193a7352544119a6d7cf723105  texlive.texmf-2007.tar.lzma
-ce0ee0fbe363197ee4c390029fc8d587  envlab.tar.lzma
+17e6656e924242a04aba635bbfcfeb6c  envlab.zip
+ba238f7a249967c11c048d1b039e4ead  achemso.zip
+ba9184469d3323fd43b42e1568d4b5f6  IEEEconf.zip
+fbac0afea54208bd8bc7d71a0d8524a1  perltex.zip


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-10/texlive-texmf.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- texlive-texmf.spec	21 Oct 2009 18:42:26 -0000	1.31
+++ texlive-texmf.spec	5 Dec 2009 10:38:32 -0000	1.32
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	31%{?dist}
+Release:	34%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -28,7 +28,6 @@ URL:		http://tug.org/texlive/
 Source0:	texlive.texmf-%{version}.tar.lzma
 # Source1 is http://www.tug.org/texlive/Contents/inst/archive/texmf-var.zip
 Source1:	texlive.texmf-var-%{version}.zip
-Source2:	http://ctan.org/get/systems/texlive/tlnet/2008/archive/envlab.tar.lzma
 
 # pregenerated kpathsea ls-R files in case no binary TeXLive is present to regenerate them
 Source10:	texlive.%{version}.ls-R
@@ -44,6 +43,12 @@ Source91:	texlive.%{version}.zip.list
 Source99: texlive-filter-requires.sh
 %define __perl_requires %{SOURCE99}
 
+# updates of the basic TeX Live 2007 texmf tree
+Source100:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/envlab.zip
+Source101:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/perltex.zip
+Source102:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/achemso.zip
+Source103:	ftp://dante.ctan.org/tex-archive/macros/latex/contrib/IEEEconf.zip
+
 # speed up build, run only brp-compress, nothing else is needed
 %define __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
@@ -66,7 +71,7 @@ Patch7:		texlive-2007-latin.patch
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
 
-BuildRequires:  sed >= 3.95 ghostscript lzma
+BuildRequires:  sed >= 3.95 ghostscript lzma tex(latex)
 
 Requires:	texlive-texmf-errata = %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -134,6 +139,12 @@ Summary:	Texmf files needed for texlive-
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-latex = %{version}
 Requires:	tex-preview
+Obsoletes:	tetex-bytefield < 1.2a-7
+Provides:	tetex-bytefield = 1.2a-7
+Obsoletes:	tetex-prosper < 1.5-7
+Provides:	tetex-prosper = 1.5-7
+Obsoletes:	tetex-perltex < 2.0
+Provides:	tetex-perltex = 2.0
 
 %description latex
 This package contains the components of the TEXMF tree needed for the
@@ -172,7 +183,15 @@ texlive-context package.
 %prep
 %setup -q -c -T
 lzma -dc %{SOURCE0} | tar x
-lzma -dc %{SOURCE2} | tar x
+
+# extract envlab
+unzip %{SOURCE100}
+# extract perltex
+unzip %{SOURCE101}
+# extract achemso
+unzip %{SOURCE102}
+# extract IEEEconf
+unzip %{SOURCE103}
 
 mkdir texmf-var
 unzip -d texmf-var %{SOURCE1}
@@ -352,6 +371,51 @@ rm -rf texmf/ttf2pk/
 #remove ubbold.fd (#458150)
 rm -f texmf/tex/latex/jknapltx/ubbold.fd
 
+# build envlab
+rm -f texmf-dist/tex/latex/envlab/*
+rm -f texmf-dist/doc/latex/envlab/*
+pushd envlab
+latex envlab.ins
+install -p -m 644 *.sty ../texmf-dist/tex/latex/envlab/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/envlab/
+install -p -m 644 README ../texmf-dist/doc/latex/envlab/
+popd
+
+# build perltex
+rm -f texmf-dist/tex/latex/perltex/*
+rm -f texmf-dist/doc/latex/perltex/*
+pushd perltex
+latex perltex.ins
+%{__sed} -i 's,^#! /usr/bin/env perl$,#!%{__perl},' perltex.pl
+install -p -m 644 *.sty ../texmf-dist/tex/latex/perltex/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/perltex/
+install -p -m 644 README ../texmf-dist/doc/latex/perltex/
+popd
+
+# build achemso
+rm -f texmf-dist/tex/latex/achemso/*
+rm -f texmf-dist/doc/latex/achemso/*
+pushd achemso
+latex achemso.ins
+install -p -m 644 *.sty ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.cls ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.bst ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.cfg ../texmf-dist/tex/latex/achemso/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/achemso/
+install -p -m 644 README ../texmf-dist/doc/latex/achemso/
+popd
+
+# build IEEEconf
+mkdir -p texmf-dist/tex/latex/IEEEconf
+mkdir -p texmf-dist/doc/latex/IEEEconf
+pushd IEEEconf
+latex IEEEconf.ins
+install -p -m 644 *.cls ../texmf-dist/tex/latex/IEEEconf/
+install -p -m 644 *.pdf ../texmf-dist/doc/latex/IEEEconf/
+install -p -m 644 README ../texmf-dist/doc/latex/IEEEconf/
+popd
+
+
 %install
 rm -rf %{buildroot} && mkdir -p %{buildroot}
 
@@ -430,6 +494,13 @@ rm -rf %{buildroot}%{_texmf_main}/tex/te
 # remove dvipdfm configuration file
 rm -rf %{buildroot}%{_texmf_main}/dvipdfm
 
+# install perltex
+install -d -m755 %{buildroot}%{_bindir}
+install -p -m755 perltex/perltex.pl %{buildroot}%{_bindir}/perltex
+
+# fix permissions of /var/lib/texmf/web2c
+chmod 755 %{buildroot}%{_texmf_var}/web2c
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -809,6 +880,7 @@ fi
 
 %files latex
 %defattr(-,root,root,-)
+%{_bindir}/perltex
 %{_texmf_main}/tex/cslatex/
 %{_texmf_main}/tex/latex/
 %{_texmf_main}/tex/platex/
@@ -828,6 +900,18 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Fri Dec 04 2009 Jindrich Novy <jnovy at redhat.com> 2007-34
+- fix permissions of /var/lib/texmf/web2c (#512459, #531894)
+- add IEEEconf (#495877)
+- update achemso (#521459)
+- update perltex to 2.0 from CTAN
+- obsolete tetex-perltex
+
+* Mon Oct 26 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2007-32
+- resolve conflict between texlive-texmf (and -doc) and tetex-perltex
+- resolve conflict between texlive-texmf and tetex-prosper
+- resolve conflict between texlive-texmf and tetex-perltex
+
 * Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
 - do not conflict with dvipdfm
 - update perl requires filter



From guidograzioli at fedoraproject.org  Sat Dec  5 11:16:28 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Sat,  5 Dec 2009 11:16:28 +0000 (UTC)
Subject: rpms/mygui/F-12 MyGUI-Demos, NONE, 1.1 MyGUI-Tools, NONE,
	1.1 mygui-layouteditor.desktop, NONE, 1.1 mygui.spec, NONE,
	1.1 mygui_missing_headers.patch, NONE,
	1.1 mygui_multilib_cflags.patch, NONE, 1.1 resources.xml, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091205111628.372F111C0095@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/mygui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30934/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	MyGUI-Demos MyGUI-Tools mygui-layouteditor.desktop mygui.spec 
	mygui_missing_headers.patch mygui_multilib_cflags.patch 
	resources.xml 
Log Message:
* Fri Nov 27 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.4.2332svn
- Install OGRE platform headers

* Wed Nov 18 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.3.2332svn
- Fix macros usage
- Fix Release tag
- Add desktop entry for LayoutEditor
- Update patch to fix missing undefined non-weak symbols
- Improve summaries and descriptions
- Remove redundant VERBOSE flag
- Add graphviz BR to generate doxygen graphs

* Fri Oct 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-2.2332svn
- Fix includes dir
- Remove plugin

* Fri Oct 13 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-1.2332svn
- Upstream to svn revision 2332
- Patch cmake build scripts to support multilib
- Fix package summaries
- Fix changelog
- Fix %%doc
- Add Require: ogre-devel to -devel subpackage
- Add -devel-doc subpackage
- Revert source tarball from xz to bzip2

* Sat Oct 03 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-4.1861svn
- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480)

* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-3.1861svn
- Improve package summary
- Provide scripts to run MyGUI tools

* Wed Sep 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-2.1861svn
- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+
- Fix License

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-1.1861svn
- Rename from libmygui to mygui
- Symlink fonts in media dir to dejavu-sans-fonts ones
- Add doxygen generated docs to -devel
- Provide a generic script to setup and run demos
- Fix rpmlint warnings

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-0.1861svn
- Initial packaging




--- NEW FILE MyGUI-Demos ---
#!/bin/sh
# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.

runSample()
{
  sample=$1
  echo "Running $sample..."
  $LIBDIR/MYGUI/Demos/$sample
}

set -e

# find out LIBDIR
if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then
  LIBDIR=/usr/lib64
else
  LIBDIR=/usr/lib
fi

mkdir -p $HOME/.mygui-demos
cd $HOME/.mygui-demos

for i in plugins.cfg resources.xml; do
  cp -f $LIBDIR/MYGUI/Demos/$i .
done

set +e

if [ "$1" = "-a" ]; then
  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
    runSample `echo $i | sed 's|./||'`
  done
elif [ $# -ge 1 ]; then
  while [ $# -ge 1 ]; do
    runSample $1
    shift
  done
else
  echo "Usage:" `basename $0` "(sample)"
  echo
  echo "sample - runs specified sample from list"
  echo
  echo -n "Available samples:"
  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
    echo -n " $i" | sed 's|./||'
  done
  echo
fi


--- NEW FILE MyGUI-Tools ---
#!/bin/sh
# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.

runSample()
{
  sample=$1
  echo "Running $sample..."
  $LIBDIR/MYGUI/Tools/$sample
}

set -e

# find out LIBDIR
if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then
  LIBDIR=/usr/lib64
else
  LIBDIR=/usr/lib
fi

mkdir -p $HOME/.mygui-tools
cd $HOME/.mygui-tools

for i in plugins.cfg resources.xml; do
  cp -f $LIBDIR/MYGUI/Tools/$i .
done

set +e

if [ "$1" = "-a" ]; then
  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
    runSample `echo $i | sed 's|./||'`
  done
elif [ $# -ge 1 ]; then
  while [ $# -ge 1 ]; do
    runSample $1
    shift
  done
else
  echo "Usage:" `basename $0` "(tool)"
  echo
  echo "tool - Runs specified tool from list"
  echo
  echo -n "Available tools:"
  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
    echo -n " $i" | sed 's|./||'
  done
  echo
fi


--- NEW FILE mygui-layouteditor.desktop ---
[Desktop Entry]
Name=MyGUI Layout Editor
GenericName=MyGUI Layout Editor
Comment=Design UIs usgin MyGUI library
Exec=MyGUI-Tools LayoutEditor
Icon=preferences-system-windows.png
Terminal=false
Type=Application
Categories=Development;


--- NEW FILE mygui.spec ---
Name:           mygui
Version:        3.0.0
Release:        0.4.2332svn%{?dist}
Summary:        Fast, simple and flexible GUI library for Ogre
Group:          Development/Libraries
# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here)
License:        LGPLv3+ 
URL:            http://my-gui.sourceforge.net/
## tar creation instructions
# svn export -r 2332 https://my-gui.svn.sourceforge.net/svnroot/my-gui/trunk mygui
# tar cfj mygui-2.3.0-2332svn.tar.bz2 mygui
Source0:        mygui-2.3.0-2332svn.tar.bz2
# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples
Source1:        MyGUI-Demos
# Another helper for the tools
Source2:        MyGUI-Tools
# Demo and tools resources configuration
Source3:        resources.xml
# LayoutEditor desktop entry
Source4:        mygui-layouteditor.desktop
# Fix multilib and flags with cmake
Patch0:         mygui_multilib_cflags.patch
# Fix compilation problems with gcc4.4
Patch1:         mygui_missing_headers.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake, autoconf, libtool, freetype-devel, desktop-file-utils
BuildRequires:  ois-devel, ogre-devel, doxygen, graphviz, cmake
%if 0%{?fedora} < 12
BuildRequires:  e2fsprogs-devel
%else
BuildRequires:  libuuid-devel
%endif

Requires:       dejavu-sans-fonts


%description
MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast, 
flexible and simple in using. 

%package        devel
Summary:        Development files for MyGUI
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig, ois-devel, ogre-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        devel-doc
Summary:        Development documentation for MyGUI
Group:          Development/Libraries
BuildArch:      noarch

%description    devel-doc
The %{name}-devel-doc package contains reference documentation for
developing applications that use %{name}.


%package demos
Summary:        MyGUI demo executables and media
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description demos
This package contains the compiled (not the source) sample applications coming
with MyGUI.  It also contains some media (meshes, textures,...) needed by these
samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper
script MyGUI-Demos is provided and installed in %{_bindir}.


%package tools
Summary:        MyGUI tools 
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description tools
This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. 
LayoutEditor is an application for designing UIs using MyGUI library,
ImageSetViewer and FontViewer are simple tools to preview graphical
resources in the media repository. 
An helper script MyGUI-Tools is provided and installed in %{_bindir}.


%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
# Fix eol 
sed -i 's/\r//' COPYING.LESSER
# Fix non-UTF8 files
for file in Tools/LayoutEditor/Readme.txt ; do
   mv $file timestamp && \
   iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \
   touch -r timestamp $file && \
   rm timestamp
done
# Generate README for -tools and -demos
cat > Tools/README << EOT
This package contains the MyGUI tools: ImageSetViewer, FontViewer 
and LayoutEditor; to run the tools, launch the helper script
%{_bindir}/MyGUI-Tools
EOT
cat > Demos/README << EOT
This package contains MyGUI demos; to run the demos, launch the
helper script %{_bindir}/MyGUI-Demos
EOT


%build
# Have to run it two times to make it find ogre and freetype
%cmake . 
# Plugins are windows only atm
%cmake . \
   -DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \
   -DMYGUI_BUILD_PLUGINS:BOOL=OFF 
# -DTARGET_LINK_LIBRARIES:STRING="-luuid -ldl"
make %{?_smp_mflags}
# Generate doxygen documentation
pushd Docs
doxygen
rm -f html/installdox
popd


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
# install missing headers
install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI
install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI

# Remove any archive
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# Remove binaries installed in %%{_bindir}
rm -rf %{buildroot}/%{_bindir}/

# Create config for ldconfig
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{_libdir}/MYGUI" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf 

# Install the samples 
mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos 
cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
    %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
    %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
# Remove sample showing plugin usage
rm bin/Demo_PluginStrangeButton
for file in bin/Demo_* ; do
  install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file`
done
mkdir -p %{buildroot}%{_bindir}
install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}

# Install the tools
mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools
cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
    %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg
sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
    %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg
for file in bin/LayoutEditor bin/ImageSetViewer bin/FontViewer ; do
  install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file`
done
install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}

# Install desktop entry for LayoutEditor
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}

# Copy Media files
mkdir -p %{buildroot}%{_datadir}/MyGUI/
cp -a Media %{buildroot}%{_datadir}/MyGUI/

# Install libMyGUI.OgrePlatform.so
mkdir -p %{buildroot}%{_libdir}/MYGUI
install -Dp -m 755 %{_lib}/libMyGUI.OgrePlatform.so %{buildroot}%{_libdir}/MYGUI/

# Move plugins to %{libdir}/MYGUI (no plugins atm)
#mv %{buildroot}%{_libdir}/libPlugin*.so %{buildroot}%{_libdir}/MYGUI

# Strip away code in media dir
#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/
# Strip away unittests media 
rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests

# Link fonts from dejavu package
ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \
  %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf
ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \
  %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.LESSER
%{_libdir}/*.so.*
%{_libdir}/MYGUI
%dir %{_datadir}/MyGUI/Media
%{_datadir}/MyGUI/Media/Common
%{_datadir}/MyGUI/Media/MyGUI_Media
%{_datadir}/MyGUI/Media/*.layout
%{_datadir}/MyGUI/Media/*.xml
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* 


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%files devel-doc
%defattr(-,root,root,-)
%doc Docs/html


%files demos
%defattr(-,root,root,-)
%doc Demos/README
%{_bindir}/MyGUI-Demos
%{_libdir}/MYGUI/Demos
%{_datadir}/MyGUI/Media/Demos


%files tools
%defattr(-,root,root,-)
%doc Tools/README Tools/LayoutEditor/Readme.txt
%{_bindir}/MyGUI-Tools
%{_libdir}/MYGUI/Tools
%{_datadir}/MyGUI/Media/Tools
%{_datadir}/applications/mygui-layouteditor.desktop


%changelog
* Fri Nov 27 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.4.2332svn
- Install OGRE platform headers

* Wed Nov 18 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.3.2332svn
- Fix macros usage
- Fix Release tag
- Add desktop entry for LayoutEditor
- Update patch to fix missing undefined non-weak symbols
- Improve summaries and descriptions
- Remove redundant VERBOSE flag
- Add graphviz BR to generate doxygen graphs

* Fri Oct 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-2.2332svn
- Fix includes dir
- Remove plugin

* Fri Oct 13 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-1.2332svn
- Upstream to svn revision 2332
- Patch cmake build scripts to support multilib
- Fix package summaries
- Fix changelog
- Fix %%doc
- Add Require: ogre-devel to -devel subpackage
- Add -devel-doc subpackage
- Revert source tarball from xz to bzip2

* Sat Oct 03 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-4.1861svn
- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480)

* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-3.1861svn
- Improve package summary
- Provide scripts to run MyGUI tools

* Wed Sep 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-2.1861svn
- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+
- Fix License

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-1.1861svn
- Rename from libmygui to mygui
- Symlink fonts in media dir to dejavu-sans-fonts ones
- Add doxygen generated docs to -devel
- Provide a generic script to setup and run demos 
- Fix rpmlint warnings

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-0.1861svn
- Initial packaging

mygui_missing_headers.patch:
 MyGUIEngine/include/MyGUI_IRenderTarget.h                     |    1 +
 MyGUIEngine/include/MyGUI_ITexture.h                          |    1 +
 MyGUIEngine/include/MyGUI_RenderFormat.h                      |    2 ++
 MyGUIEngine/include/MyGUI_VertexData.h                        |    1 +
 Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h      |    2 +-
 Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h |    1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE mygui_missing_headers.patch ---
--- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2009-09-30 01:35:13.000000000 +0200
+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2009-11-27 17:19:29.488111573 +0100
@@ -29,7 +29,7 @@
 #include "MyGUI_OgreRenderManager.h"
 #include "MyGUI_OgreDataManager.h"
 #include "MyGUI_OgreDiagnostic.h"
-#include "MyGUI_OgreTexture.h"
+#include "MyGUI_LogManager.h"
 
 namespace MyGUI
 {
--- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2009-09-30 02:10:57.000000000 +0200
+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2009-11-27 17:08:52.381859930 +0100
@@ -27,6 +27,7 @@
 #include "MyGUI_RenderFormat.h"
 #include "MyGUI_IVertexBuffer.h"
 #include "MyGUI_RenderManager.h"
+#include "MyGUI_Types.h"
 
 #include <Ogre.h>
 
--- A/MyGUIEngine/include/MyGUI_IRenderTarget.h	2009-09-24 01:54:35.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_IRenderTarget.h	2009-11-27 17:41:13.102861792 +0100
@@ -23,6 +23,7 @@
 #ifndef __MYGUI_I_RENDER_TARGET_H__
 #define __MYGUI_I_RENDER_TARGET_H__
 
+#include <string>
 #include "MyGUI_Prerequest.h"
 #include "MyGUI_RenderTargetInfo.h"
 
--- A/MyGUIEngine/include/MyGUI_ITexture.h	2009-09-24 01:54:35.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_ITexture.h	2009-11-27 17:41:48.046874847 +0100
@@ -26,6 +26,7 @@
 #include "MyGUI_Prerequest.h"
 #include "MyGUI_IRenderTarget.h"
 #include "MyGUI_RenderFormat.h"
+#include <string>
 
 namespace MyGUI
 {
--- A/MyGUIEngine/include/MyGUI_RenderFormat.h	2009-09-28 03:19:58.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_RenderFormat.h	2009-11-27 17:02:14.622875175 +0100
@@ -23,6 +23,8 @@
 #ifndef __MYGUI_RENDER_FORMAT_H__
 #define __MYGUI_RENDER_FORMAT_H__
 
+#include "MyGUI_Macros.h"
+
 namespace MyGUI
 {
 
--- A/MyGUIEngine/include/MyGUI_VertexData.h	2009-06-04 04:34:12.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_VertexData.h	2009-11-27 17:08:23.382859907 +0100
@@ -24,6 +24,7 @@
 #define __MYGUI_VERTEX_DATA_H__
 
 #include "MyGUI_Prerequest.h"
+#include "MyGUI_Types.h"
 
 namespace MyGUI
 {

mygui_multilib_cflags.patch:
 CMake/ConfigureBuild.cmake           |    2 +-
 CMake/Templates/MYGUI.pc.in          |    6 +++---
 CMake/Utils/MyGUIConfigTargets.cmake |   10 ++++++----
 CMakeLists.txt                       |   10 +++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE mygui_multilib_cflags.patch ---
--- A/CMakeLists.txt	2009-10-12 23:45:57.564750326 +0200
+++ B/CMakeLists.txt	2009-10-12 23:46:25.879489254 +0200
@@ -46,9 +46,9 @@
 endif ()
 
 # Set compiler specific build flags
-if (CMAKE_COMPILER_IS_GNUCXX)
-	add_definitions(-msse)
-endif ()
+#if (CMAKE_COMPILER_IS_GNUCXX)
+#	add_definitions(-msse)
+#endif ()
 if (MSVC)
 	add_definitions(/fp:fast)
 endif ()
@@ -87,8 +87,8 @@
 set(MYGUI_LIBRARIES MyGUIEngine)
 
 # Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
 if (WIN32 OR APPLE)
 	if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
--- A/CMake/ConfigureBuild.cmake	2009-10-12 23:53:41.447496281 +0200
+++ B/CMake/ConfigureBuild.cmake	2009-10-13 00:02:30.243489356 +0200
@@ -44,7 +44,7 @@
   else ()
     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
   endif ()
-  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
+  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
   # configure additional packages
   
--- A/CMake/Utils/MyGUIConfigTargets.cmake	2009-10-13 00:44:05.003749853 +0200
+++ B/CMake/Utils/MyGUIConfigTargets.cmake	2009-10-13 00:48:18.378490236 +0200
@@ -38,8 +38,8 @@
 function(mygui_install_target TARGETNAME SUFFIX)
   install(TARGETS ${TARGETNAME}
     RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
-    LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-    ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+    LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+    ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
     FRAMEWORK DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
   )
   install(TARGETS ${TARGETNAME}
@@ -65,8 +65,8 @@
 # setup common target settings
 function(mygui_config_common TARGETNAME)
   set_target_properties(${TARGETNAME} PROPERTIES
-    ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
-    LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
+    ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
+    LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
     RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
   )
   mygui_create_vcproj_userfile(${TARGETNAME})
@@ -198,6 +198,8 @@
     set_target_properties(${LIBNAME} PROPERTIES OUTPUT_NAME ${LIBNAME}Static)
   else (MYGUI_STATIC)
     if (CMAKE_COMPILER_IS_GNUCXX)
+      target_link_libraries(${LIBNAME} uuid)
+      target_link_libraries(${LIBNAME} dl)
       # add GCC visibility flags to shared library build
       set_target_properties(${LIBNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")
 	endif (CMAKE_COMPILER_IS_GNUCXX)
--- A/CMake/Templates/MYGUI.pc.in	2009-10-13 00:29:15.429738822 +0200
+++ B/CMake/Templates/MYGUI.pc.in	2009-10-30 15:22:03.687723109 +0100
@@ -1,11 +1,11 @@
 prefix=@MYGUI_PREFIX_PATH@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=${prefix}/lib at LIB_SUFFIX@
 includedir=${prefix}/include
 
 Name: MyGUI
 Description: Fast, flexible and simple GUI
 Version: @MYGUI_VERSION@
 URL: http://www.my-gui.sourceforge.net
-Libs: -L${libdir} -lMyGUIEngine at MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
-Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine at MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
+Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@



--- NEW FILE resources.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<Paths>
  <Path root="true">/usr/share/MyGUI/Media</Path>
  <Path>/usr/share/MyGUI/Media/MyGUI_Media</Path>
  <Path>/usr/share/MyGUI/Media/Tools/LayoutEditor</Path>
</Paths>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mygui/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:51:10 -0000	1.1
+++ .cvsignore	5 Dec 2009 11:16:27 -0000	1.2
@@ -0,0 +1 @@
+mygui-2.3.0-2332svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mygui/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:51:10 -0000	1.1
+++ sources	5 Dec 2009 11:16:27 -0000	1.2
@@ -0,0 +1 @@
+4b4fb317f253c42b56756faeeb3ef8c4  mygui-2.3.0-2332svn.tar.bz2



From uwog at fedoraproject.org  Sat Dec  5 11:21:12 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Sat,  5 Dec 2009 11:21:12 +0000 (UTC)
Subject: rpms/enchant/devel enchant.spec,1.26,1.27
Message-ID: <20091205112113.0265311C0095@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/enchant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32614

Modified Files:
	enchant.spec 
Log Message:
Fix 544473: enchant does not provide /usr/lib/libenchant.so




Index: enchant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- enchant.spec	24 Jul 2009 22:09:53 -0000	1.26
+++ enchant.spec	5 Dec 2009 11:21:12 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.5.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -70,6 +70,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant
 %defattr(-,root,root)
 %doc AUTHORS COPYING.LIB README
 %{_bindir}/*
+%{_libdir}/*.so
 %{_libdir}/lib*.so.*
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*myspell.so*
@@ -84,7 +85,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.so
 %{_libdir}/pkgconfig/enchant.pc
 %{_includedir}/enchant
 
@@ -96,6 +96,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Sat Dec 05 2009 Marc Maurer <uwog at abisource.com> 1:1.5.0-4
+- Fix 544473: Move enchant.so from the devel to the main package
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From roma at fedoraproject.org  Sat Dec  5 11:34:35 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Sat,  5 Dec 2009 11:34:35 +0000 (UTC)
Subject: rpms/xpaint/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 
	1.2, 1.3 xpaint.spec, 1.1, 1.2 xpaint-2.8.7-graphic.c.patch, 1.1,
	NONE
Message-ID: <20091205113435.4298D11C0095@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/xpaint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3928/F-10

Modified Files:
	.cvsignore import.log sources xpaint.spec 
Removed Files:
	xpaint-2.8.7-graphic.c.patch 
Log Message:
xpaint 2.8.7.3 update


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Nov 2009 01:38:23 -0000	1.2
+++ .cvsignore	5 Dec 2009 11:34:34 -0000	1.3
@@ -1 +1 @@
-xpaint-2.8.7.tar.bz2
+xpaint-2.8.7.3.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Nov 2009 01:38:23 -0000	1.1
+++ import.log	5 Dec 2009 11:34:35 -0000	1.2
@@ -1 +1,2 @@
 xpaint-2_8_7-1_fc10:F-10:xpaint-2.8.7-1.fc10.src.rpm:1257557842
+xpaint-2_8_7_3-1_fc10:F-10:xpaint-2.8.7.3-1.fc10.src.rpm:1260012854


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Nov 2009 01:38:23 -0000	1.2
+++ sources	5 Dec 2009 11:34:35 -0000	1.3
@@ -1 +1 @@
-7f41711bcbecad10d45045d52ec24021  xpaint-2.8.7.tar.bz2
+3d5f97cd3542b2a13ee2453552ff6656  xpaint-2.8.7.3.tar.bz2


Index: xpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-10/xpaint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xpaint.spec	7 Nov 2009 01:38:23 -0000	1.1
+++ xpaint.spec	5 Dec 2009 11:34:35 -0000	1.2
@@ -4,13 +4,12 @@
 
 Summary:        An X Window System image editing or paint program
 Name:           xpaint
-Version:        2.8.7
+Version:        2.8.7.3
 Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Multimedia
 URL:            http://sourceforge.net/projects/sf-xpaint
 Source0:        http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
-Patch0:         xpaint-2.8.7-graphic.c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bison flex imake chrpath
@@ -56,7 +55,6 @@ This package contains development files 
 
 %prep
 %setup -q
-%patch0 -p1 -b .graphic
 sed -i -e 's|/lib |/%{_lib} |g' Local.config
 sed -i -e 's|@XPMDIR@|%{_prefix}|g' Local.config
 sed -i -e 's|/usr/lib|%{_libdir}|g' configure
@@ -127,6 +125,12 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Wed Nov 19 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.7.3-1
+- Updated to 2.8.7.3
+
+* Wed Nov 16 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.7.2-1
+- Updated to 2.8.7.2
+
 * Wed Nov 04 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.7-1
 - Updated to 2.8.7
 - Changed license to GPLv3+


--- xpaint-2.8.7-graphic.c.patch DELETED ---



From sailer at fedoraproject.org  Sat Dec  5 11:40:02 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 11:40:02 +0000 (UTC)
Subject: rpms/ghdl/F-10 ghdl-svn110-libgnat44.patch, NONE,
	1.1 ghdl-svn131.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 ghdl-grtadac.patch, 1.1, 1.2 ghdl.spec, 1.44, 1.45 sources,
	1.14, 1.15 ghdl-svn89-libgnat43.patch, 1.1, NONE
Message-ID: <20091205114002.7A37911C03F6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5067

Modified Files:
	.cvsignore ghdl-grtadac.patch ghdl.spec sources 
Added Files:
	ghdl-svn110-libgnat44.patch ghdl-svn131.patch 
Removed Files:
	ghdl-svn89-libgnat43.patch 
Log Message:
update to 0.28/svn131


ghdl-svn110-libgnat44.patch:
 Makefile.in |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE ghdl-svn110-libgnat44.patch ---
--- gcc/vhdl/Makefile.in.gnatlib	2008-05-16 11:12:19.000000000 +0200
+++ gcc/vhdl/Makefile.in	2008-05-16 11:15:04.000000000 +0200
@@ -490,6 +490,8 @@
  GRT_EXTRA_LIB+=-lpthread
 endif
 
+GRT_EXTRA_LIB+=-lgnat-4.4
+
 GRT_ARCH?=None
 
 # Configuration pragmas.

ghdl-svn131.patch:
 errorout.adb          |    6 
 ghdldrv/ghdllocal.adb |    2 
 grt/grt-processes.adb |  431 +++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads |   29 +--
 grt/grt-signals.adb   |   31 +--
 grt/grt-signals.ads   |   33 ++-
 grt/grt-types.ads     |    4 
 grt/grt-unithread.adb |    9 -
 grt/grt-unithread.ads |    6 
 ortho-lang.c          |    2 
 version.ads           |    4 
 11 files changed, 333 insertions(+), 224 deletions(-)

--- NEW FILE ghdl-svn131.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-11-29 12:28:59.000000000 +0100
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-11-29 12:28:55.000000000 +0100
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-11-29 12:28:56.000000000 +0100
@@ -36,22 +36,25 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
+   type Process_Id_Array is array (Natural range <>) of Process_Acc;
    type Process_Id_Array_Acc is access Process_Id_Array;
 
    Resume_Process_Table : Process_Id_Array_Acc;
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,63 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+      end if;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +339,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +437,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +453,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +462,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +477,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +495,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +504,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +512,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +522,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +545,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -507,7 +627,7 @@
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,35 +636,30 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
@@ -571,15 +686,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +701,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +755,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +810,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-11-29 12:28:56.000000000 +0100
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -178,8 +174,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-11-29 12:28:56.000000000 +0100
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-11-29 12:28:56.000000000 +0100
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-11-29 12:28:56.000000000 +0100
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-11-29 12:28:56.000000000 +0100
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-11-29 12:28:56.000000000 +0100
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/ortho-lang.c ghdl-0.29dev/vhdl/ortho-lang.c
--- ghdl-0.28/vhdl/ortho-lang.c	2008-08-28 05:29:25.000000000 +0200
+++ ghdl-0.29dev/vhdl/ortho-lang.c	2009-11-29 12:28:57.000000000 +0100
@@ -385,7 +385,7 @@
     filename = in_fnames[0];
 
   linemap_add (line_table, LC_ENTER, 0, filename ? filename :"*no-file*", 1);
-  input_location = linemap_line_start (line_table, 0, 252);
+  input_location = linemap_line_start (line_table, 1, 252);
 
   if (!lang_parse_file (filename))
     errorcount++;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-11-29 12:28:59.000000000 +0100
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Oct 2008 09:48:35 -0000	1.12
+++ .cvsignore	5 Dec 2009 11:40:01 -0000	1.13
@@ -3,3 +3,5 @@ ghdl-0.26.tar.bz2
 ghdl-0.27.tar.bz2
 gcc-core-4.2.4.tar.bz2
 gcc-core-4.3.1.tar.bz2
+gcc-core-4.3.4.tar.bz2
+ghdl-0.28.tar.bz2

ghdl-grtadac.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ghdl-grtadac.patch
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-10/ghdl-grtadac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghdl-grtadac.patch	7 Oct 2008 11:37:49 -0000	1.1
+++ ghdl-grtadac.patch	5 Dec 2009 11:40:01 -0000	1.2
@@ -1,9 +1,9 @@
 --- gcc-4.2.4/gcc/vhdl/Makefile.in.grtadac	2008-10-07 10:08:26.000000000 +0200
 +++ gcc-4.2.4/gcc/vhdl/Makefile.in	2008-10-07 10:09:00.000000000 +0200
-@@ -81,7 +81,7 @@
+@@ -80,7 +80,7 @@
+ X_ADAFLAGS =
  T_ADAFLAGS =
  
- CC = cc
 -ADAC = $(CC)
 +ADAC = gcc
  


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-10/ghdl.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ghdl.spec	26 May 2009 15:32:13 -0000	1.44
+++ ghdl.spec	5 Dec 2009 11:40:02 -0000	1.45
@@ -1,11 +1,11 @@
-%define gccver 4.3.1
-%define ghdlver 0.27
-%define ghdlsvnver 110
+%define gccver 4.3.4
+%define ghdlver 0.28
+%define ghdlsvnver 131
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.3%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -17,7 +17,7 @@ Source0: ftp://gcc.gnu.org/pub/gcc/relea
 Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Patch100: ghdl-svn%{ghdlsvnver}.patch
 Patch103: ghdl-noruntime.patch
-Patch104: ghdl-svn89-libgnat43.patch
+Patch104: ghdl-svn110-libgnat44.patch 
 Patch105: ghdl-grtadac.patch
 # The following patch has been sent to upstream mailing list:
 # From: Thomas Sailer <t.sailer at alumni.ethz.ch>                  
@@ -25,8 +25,6 @@ Patch105: ghdl-grtadac.patch
 # Date: Thu, 02 Apr 2009 15:36:00 +0200                          
 # https://gna.org/bugs/index.php?13389                           
 Patch107: ieee-mathreal.patch                                    
-# https://gna.org/bugs/index.php?13574
-Patch108: ghdl-textio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -128,9 +126,8 @@ pushd ghdl-%{ghdlver}
 %{__mv} vhdl ../gcc/
 popd
 #patch102 -p1 -b .makeinfo
-%patch104 -p0 -b .libgnat43
+%patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
-%patch108 -p0 -b .textio
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -313,6 +310,9 @@ popd
 
 
 %changelog
+* Sat Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
+- update to 0.28/svn131
+
 * Tue May 26 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.3
 - fix bug in std.textio.read (string)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Oct 2008 09:48:35 -0000	1.14
+++ sources	5 Dec 2009 11:40:02 -0000	1.15
@@ -1,2 +1,2 @@
-448b5208d5c2fd611b9fa532746baff5  ghdl-0.27.tar.bz2
-f30652bdee577911681c86f5d7f23d65  gcc-core-4.3.1.tar.bz2
+575b3220bb8e7060939c429fc8608d22  gcc-core-4.3.4.tar.bz2
+07c1883c2fcd795303056a8a95645f94  ghdl-0.28.tar.bz2


--- ghdl-svn89-libgnat43.patch DELETED ---



From sailer at fedoraproject.org  Sat Dec  5 11:41:51 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 11:41:51 +0000 (UTC)
Subject: rpms/ghdl/F-11 ghdl-svn131.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 ghdl-grtadac.patch, 1.1, 1.2 ghdl.spec, 1.50, 1.51 sources,
	1.14, 1.15 ghdl-svn110.patch, 1.1, NONE
Message-ID: <20091205114151.2BC5511C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5478

Modified Files:
	.cvsignore ghdl-grtadac.patch ghdl.spec sources 
Added Files:
	ghdl-svn131.patch 
Removed Files:
	ghdl-svn110.patch 
Log Message:
update to 0.28/svn131


ghdl-svn131.patch:
 errorout.adb          |    6 
 ghdldrv/ghdllocal.adb |    2 
 grt/grt-processes.adb |  431 +++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads |   29 +--
 grt/grt-signals.adb   |   31 +--
 grt/grt-signals.ads   |   33 ++-
 grt/grt-types.ads     |    4 
 grt/grt-unithread.adb |    9 -
 grt/grt-unithread.ads |    6 
 ortho-lang.c          |    2 
 version.ads           |    4 
 11 files changed, 333 insertions(+), 224 deletions(-)

--- NEW FILE ghdl-svn131.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-11-29 12:28:59.000000000 +0100
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-11-29 12:28:55.000000000 +0100
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-11-29 12:28:56.000000000 +0100
@@ -36,22 +36,25 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
+   type Process_Id_Array is array (Natural range <>) of Process_Acc;
    type Process_Id_Array_Acc is access Process_Id_Array;
 
    Resume_Process_Table : Process_Id_Array_Acc;
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,63 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+      end if;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +339,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +437,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +453,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +462,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +477,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +495,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +504,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +512,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +522,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +545,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -507,7 +627,7 @@
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,35 +636,30 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
@@ -571,15 +686,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +701,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +755,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +810,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-11-29 12:28:56.000000000 +0100
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -178,8 +174,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-11-29 12:28:56.000000000 +0100
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-11-29 12:28:56.000000000 +0100
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-11-29 12:28:56.000000000 +0100
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-11-29 12:28:56.000000000 +0100
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-11-29 12:28:56.000000000 +0100
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/ortho-lang.c ghdl-0.29dev/vhdl/ortho-lang.c
--- ghdl-0.28/vhdl/ortho-lang.c	2008-08-28 05:29:25.000000000 +0200
+++ ghdl-0.29dev/vhdl/ortho-lang.c	2009-11-29 12:28:57.000000000 +0100
@@ -385,7 +385,7 @@
     filename = in_fnames[0];
 
   linemap_add (line_table, LC_ENTER, 0, filename ? filename :"*no-file*", 1);
-  input_location = linemap_line_start (line_table, 0, 252);
+  input_location = linemap_line_start (line_table, 1, 252);
 
   if (!lang_parse_file (filename))
     errorcount++;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-11-29 12:28:59.000000000 +0100
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Oct 2008 09:48:35 -0000	1.12
+++ .cvsignore	5 Dec 2009 11:41:50 -0000	1.13
@@ -3,3 +3,5 @@ ghdl-0.26.tar.bz2
 ghdl-0.27.tar.bz2
 gcc-core-4.2.4.tar.bz2
 gcc-core-4.3.1.tar.bz2
+gcc-core-4.3.4.tar.bz2
+ghdl-0.28.tar.bz2

ghdl-grtadac.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ghdl-grtadac.patch
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/ghdl-grtadac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghdl-grtadac.patch	7 Oct 2008 11:37:49 -0000	1.1
+++ ghdl-grtadac.patch	5 Dec 2009 11:41:50 -0000	1.2
@@ -1,9 +1,9 @@
 --- gcc-4.2.4/gcc/vhdl/Makefile.in.grtadac	2008-10-07 10:08:26.000000000 +0200
 +++ gcc-4.2.4/gcc/vhdl/Makefile.in	2008-10-07 10:09:00.000000000 +0200
-@@ -81,7 +81,7 @@
+@@ -80,7 +80,7 @@
+ X_ADAFLAGS =
  T_ADAFLAGS =
  
- CC = cc
 -ADAC = $(CC)
 +ADAC = gcc
  


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/ghdl.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ghdl.spec	26 May 2009 15:32:14 -0000	1.50
+++ ghdl.spec	5 Dec 2009 11:41:50 -0000	1.51
@@ -1,11 +1,11 @@
-%global gccver 4.3.1
-%global ghdlver 0.27
-%global ghdlsvnver 110
+%global gccver 4.3.4
+%global ghdlver 0.28
+%global ghdlsvnver 131
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.7%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,8 +27,6 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
-# https://gna.org/bugs/index.php?13574
-Patch108: ghdl-textio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -128,10 +126,9 @@ pushd ghdl-%{ghdlver}
 %{__mv} vhdl ../gcc/
 popd
 #patch102 -p1 -b .makeinfo
-%patch104 -p0 -b .libgnat43
+%patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
-%patch108 -p0 -b .textio
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -314,6 +311,9 @@ popd
 
 
 %changelog
+* Sat Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
+- update to 0.28/svn131
+
 * Tue May 26 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.7
 - fix bug in std.textio.read (string)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Oct 2008 09:48:35 -0000	1.14
+++ sources	5 Dec 2009 11:41:50 -0000	1.15
@@ -1,2 +1,2 @@
-448b5208d5c2fd611b9fa532746baff5  ghdl-0.27.tar.bz2
-f30652bdee577911681c86f5d7f23d65  gcc-core-4.3.1.tar.bz2
+575b3220bb8e7060939c429fc8608d22  gcc-core-4.3.4.tar.bz2
+07c1883c2fcd795303056a8a95645f94  ghdl-0.28.tar.bz2


--- ghdl-svn110.patch DELETED ---



From sailer at fedoraproject.org  Sat Dec  5 11:46:22 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 11:46:22 +0000 (UTC)
Subject: File cairomm-1.8.4.tar.gz uploaded to lookaside cache by sailer
Message-ID: <20091205114622.9754110F859@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mingw32-cairomm:

559afbc47484ba3fad265e38a3dafe90  cairomm-1.8.4.tar.gz



From guidograzioli at fedoraproject.org  Sat Dec  5 11:46:48 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Sat,  5 Dec 2009 11:46:48 +0000 (UTC)
Subject: rpms/mygui/F-11 MyGUI-Demos, NONE, 1.1 MyGUI-Tools, NONE,
	1.1 import.log, NONE, 1.1 mygui-layouteditor.desktop, NONE,
	1.1 mygui.spec, NONE, 1.1 mygui_missing_headers.patch, NONE,
	1.1 mygui_multilib_cflags.patch, NONE, 1.1 resources.xml, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091205114648.EDCBA11C0095@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/mygui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6267/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	MyGUI-Demos MyGUI-Tools import.log mygui-layouteditor.desktop 
	mygui.spec mygui_missing_headers.patch 
	mygui_multilib_cflags.patch resources.xml 
Log Message:
* Fri Nov 27 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.4.2332svn
- Install OGRE platform headers

* Wed Nov 18 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.3.2332svn
- Fix macros usage
- Fix Release tag
- Add desktop entry for LayoutEditor
- Update patch to fix missing undefined non-weak symbols
- Improve summaries and descriptions
- Remove redundant VERBOSE flag
- Add graphviz BR to generate doxygen graphs

* Fri Oct 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-2.2332svn
- Fix includes dir
- Remove plugin

* Fri Oct 13 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-1.2332svn
- Upstream to svn revision 2332
- Patch cmake build scripts to support multilib
- Fix package summaries
- Fix changelog
- Fix %%doc
- Add Require: ogre-devel to -devel subpackage
- Add -devel-doc subpackage
- Revert source tarball from xz to bzip2

* Sat Oct 03 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-4.1861svn
- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480)

* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-3.1861svn
- Improve package summary
- Provide scripts to run MyGUI tools

* Wed Sep 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-2.1861svn
- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+
- Fix License

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-1.1861svn
- Rename from libmygui to mygui
- Symlink fonts in media dir to dejavu-sans-fonts ones
- Add doxygen generated docs to -devel
- Provide a generic script to setup and run demos
- Fix rpmlint warnings

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-0.1861svn
- Initial packaging




--- NEW FILE MyGUI-Demos ---
#!/bin/sh
# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.

runSample()
{
  sample=$1
  echo "Running $sample..."
  $LIBDIR/MYGUI/Demos/$sample
}

set -e

# find out LIBDIR
if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then
  LIBDIR=/usr/lib64
else
  LIBDIR=/usr/lib
fi

mkdir -p $HOME/.mygui-demos
cd $HOME/.mygui-demos

for i in plugins.cfg resources.xml; do
  cp -f $LIBDIR/MYGUI/Demos/$i .
done

set +e

if [ "$1" = "-a" ]; then
  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
    runSample `echo $i | sed 's|./||'`
  done
elif [ $# -ge 1 ]; then
  while [ $# -ge 1 ]; do
    runSample $1
    shift
  done
else
  echo "Usage:" `basename $0` "(sample)"
  echo
  echo "sample - runs specified sample from list"
  echo
  echo -n "Available samples:"
  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
    echo -n " $i" | sed 's|./||'
  done
  echo
fi


--- NEW FILE MyGUI-Tools ---
#!/bin/sh
# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.

runSample()
{
  sample=$1
  echo "Running $sample..."
  $LIBDIR/MYGUI/Tools/$sample
}

set -e

# find out LIBDIR
if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then
  LIBDIR=/usr/lib64
else
  LIBDIR=/usr/lib
fi

mkdir -p $HOME/.mygui-tools
cd $HOME/.mygui-tools

for i in plugins.cfg resources.xml; do
  cp -f $LIBDIR/MYGUI/Tools/$i .
done

set +e

if [ "$1" = "-a" ]; then
  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
    runSample `echo $i | sed 's|./||'`
  done
elif [ $# -ge 1 ]; then
  while [ $# -ge 1 ]; do
    runSample $1
    shift
  done
else
  echo "Usage:" `basename $0` "(tool)"
  echo
  echo "tool - Runs specified tool from list"
  echo
  echo -n "Available tools:"
  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
    echo -n " $i" | sed 's|./||'
  done
  echo
fi


--- NEW FILE import.log ---
mygui-3_0_0-0_4_2332svn_fc11:F-11:mygui-3.0.0-0.4.2332svn.fc11.src.rpm:1260013405


--- NEW FILE mygui-layouteditor.desktop ---
[Desktop Entry]
Name=MyGUI Layout Editor
GenericName=MyGUI Layout Editor
Comment=Design UIs usgin MyGUI library
Exec=MyGUI-Tools LayoutEditor
Icon=preferences-system-windows.png
Terminal=false
Type=Application
Categories=Development;


--- NEW FILE mygui.spec ---
Name:           mygui
Version:        3.0.0
Release:        0.4.2332svn%{?dist}
Summary:        Fast, simple and flexible GUI library for Ogre
Group:          Development/Libraries
# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here)
License:        LGPLv3+ 
URL:            http://my-gui.sourceforge.net/
## tar creation instructions
# svn export -r 2332 https://my-gui.svn.sourceforge.net/svnroot/my-gui/trunk mygui
# tar cfj mygui-2.3.0-2332svn.tar.bz2 mygui
Source0:        mygui-2.3.0-2332svn.tar.bz2
# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples
Source1:        MyGUI-Demos
# Another helper for the tools
Source2:        MyGUI-Tools
# Demo and tools resources configuration
Source3:        resources.xml
# LayoutEditor desktop entry
Source4:        mygui-layouteditor.desktop
# Fix multilib and flags with cmake
Patch0:         mygui_multilib_cflags.patch
# Fix compilation problems with gcc4.4
Patch1:         mygui_missing_headers.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake, autoconf, libtool, freetype-devel, desktop-file-utils
BuildRequires:  ois-devel, ogre-devel, doxygen, graphviz, cmake
%if 0%{?fedora} < 12
BuildRequires:  e2fsprogs-devel
%else
BuildRequires:  libuuid-devel
%endif

Requires:       dejavu-sans-fonts


%description
MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast, 
flexible and simple in using. 

%package        devel
Summary:        Development files for MyGUI
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig, ois-devel, ogre-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%package        devel-doc
Summary:        Development documentation for MyGUI
Group:          Development/Libraries
BuildArch:      noarch

%description    devel-doc
The %{name}-devel-doc package contains reference documentation for
developing applications that use %{name}.


%package demos
Summary:        MyGUI demo executables and media
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description demos
This package contains the compiled (not the source) sample applications coming
with MyGUI.  It also contains some media (meshes, textures,...) needed by these
samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper
script MyGUI-Demos is provided and installed in %{_bindir}.


%package tools
Summary:        MyGUI tools 
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description tools
This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. 
LayoutEditor is an application for designing UIs using MyGUI library,
ImageSetViewer and FontViewer are simple tools to preview graphical
resources in the media repository. 
An helper script MyGUI-Tools is provided and installed in %{_bindir}.


%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
# Fix eol 
sed -i 's/\r//' COPYING.LESSER
# Fix non-UTF8 files
for file in Tools/LayoutEditor/Readme.txt ; do
   mv $file timestamp && \
   iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \
   touch -r timestamp $file && \
   rm timestamp
done
# Generate README for -tools and -demos
cat > Tools/README << EOT
This package contains the MyGUI tools: ImageSetViewer, FontViewer 
and LayoutEditor; to run the tools, launch the helper script
%{_bindir}/MyGUI-Tools
EOT
cat > Demos/README << EOT
This package contains MyGUI demos; to run the demos, launch the
helper script %{_bindir}/MyGUI-Demos
EOT


%build
# Have to run it two times to make it find ogre and freetype
%cmake . 
# Plugins are windows only atm
%cmake . \
   -DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \
   -DMYGUI_BUILD_PLUGINS:BOOL=OFF 
# -DTARGET_LINK_LIBRARIES:STRING="-luuid -ldl"
make %{?_smp_mflags}
# Generate doxygen documentation
pushd Docs
doxygen
rm -f html/installdox
popd


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
# install missing headers
install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI
install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI

# Remove any archive
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# Remove binaries installed in %%{_bindir}
rm -rf %{buildroot}/%{_bindir}/

# Create config for ldconfig
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{_libdir}/MYGUI" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf 

# Install the samples 
mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos 
cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
    %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
    %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
# Remove sample showing plugin usage
rm bin/Demo_PluginStrangeButton
for file in bin/Demo_* ; do
  install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file`
done
mkdir -p %{buildroot}%{_bindir}
install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}

# Install the tools
mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools
cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
    %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg
sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
    %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg
for file in bin/LayoutEditor bin/ImageSetViewer bin/FontViewer ; do
  install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file`
done
install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}

# Install desktop entry for LayoutEditor
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}

# Copy Media files
mkdir -p %{buildroot}%{_datadir}/MyGUI/
cp -a Media %{buildroot}%{_datadir}/MyGUI/

# Install libMyGUI.OgrePlatform.so
mkdir -p %{buildroot}%{_libdir}/MYGUI
install -Dp -m 755 %{_lib}/libMyGUI.OgrePlatform.so %{buildroot}%{_libdir}/MYGUI/

# Move plugins to %{libdir}/MYGUI (no plugins atm)
#mv %{buildroot}%{_libdir}/libPlugin*.so %{buildroot}%{_libdir}/MYGUI

# Strip away code in media dir
#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/
# Strip away unittests media 
rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests

# Link fonts from dejavu package
ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \
  %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf
ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \
  %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.LESSER
%{_libdir}/*.so.*
%{_libdir}/MYGUI
%dir %{_datadir}/MyGUI/Media
%{_datadir}/MyGUI/Media/Common
%{_datadir}/MyGUI/Media/MyGUI_Media
%{_datadir}/MyGUI/Media/*.layout
%{_datadir}/MyGUI/Media/*.xml
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* 


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%files devel-doc
%defattr(-,root,root,-)
%doc Docs/html


%files demos
%defattr(-,root,root,-)
%doc Demos/README
%{_bindir}/MyGUI-Demos
%{_libdir}/MYGUI/Demos
%{_datadir}/MyGUI/Media/Demos


%files tools
%defattr(-,root,root,-)
%doc Tools/README Tools/LayoutEditor/Readme.txt
%{_bindir}/MyGUI-Tools
%{_libdir}/MYGUI/Tools
%{_datadir}/MyGUI/Media/Tools
%{_datadir}/applications/mygui-layouteditor.desktop


%changelog
* Fri Nov 27 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.4.2332svn
- Install OGRE platform headers

* Wed Nov 18 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.3.2332svn
- Fix macros usage
- Fix Release tag
- Add desktop entry for LayoutEditor
- Update patch to fix missing undefined non-weak symbols
- Improve summaries and descriptions
- Remove redundant VERBOSE flag
- Add graphviz BR to generate doxygen graphs

* Fri Oct 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-2.2332svn
- Fix includes dir
- Remove plugin

* Fri Oct 13 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-1.2332svn
- Upstream to svn revision 2332
- Patch cmake build scripts to support multilib
- Fix package summaries
- Fix changelog
- Fix %%doc
- Add Require: ogre-devel to -devel subpackage
- Add -devel-doc subpackage
- Revert source tarball from xz to bzip2

* Sat Oct 03 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-4.1861svn
- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480)

* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-3.1861svn
- Improve package summary
- Provide scripts to run MyGUI tools

* Wed Sep 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-2.1861svn
- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+
- Fix License

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-1.1861svn
- Rename from libmygui to mygui
- Symlink fonts in media dir to dejavu-sans-fonts ones
- Add doxygen generated docs to -devel
- Provide a generic script to setup and run demos 
- Fix rpmlint warnings

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-0.1861svn
- Initial packaging

mygui_missing_headers.patch:
 MyGUIEngine/include/MyGUI_IRenderTarget.h                     |    1 +
 MyGUIEngine/include/MyGUI_ITexture.h                          |    1 +
 MyGUIEngine/include/MyGUI_RenderFormat.h                      |    2 ++
 MyGUIEngine/include/MyGUI_VertexData.h                        |    1 +
 Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h      |    2 +-
 Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h |    1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE mygui_missing_headers.patch ---
--- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2009-09-30 01:35:13.000000000 +0200
+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2009-11-27 17:19:29.488111573 +0100
@@ -29,7 +29,7 @@
 #include "MyGUI_OgreRenderManager.h"
 #include "MyGUI_OgreDataManager.h"
 #include "MyGUI_OgreDiagnostic.h"
-#include "MyGUI_OgreTexture.h"
+#include "MyGUI_LogManager.h"
 
 namespace MyGUI
 {
--- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2009-09-30 02:10:57.000000000 +0200
+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2009-11-27 17:08:52.381859930 +0100
@@ -27,6 +27,7 @@
 #include "MyGUI_RenderFormat.h"
 #include "MyGUI_IVertexBuffer.h"
 #include "MyGUI_RenderManager.h"
+#include "MyGUI_Types.h"
 
 #include <Ogre.h>
 
--- A/MyGUIEngine/include/MyGUI_IRenderTarget.h	2009-09-24 01:54:35.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_IRenderTarget.h	2009-11-27 17:41:13.102861792 +0100
@@ -23,6 +23,7 @@
 #ifndef __MYGUI_I_RENDER_TARGET_H__
 #define __MYGUI_I_RENDER_TARGET_H__
 
+#include <string>
 #include "MyGUI_Prerequest.h"
 #include "MyGUI_RenderTargetInfo.h"
 
--- A/MyGUIEngine/include/MyGUI_ITexture.h	2009-09-24 01:54:35.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_ITexture.h	2009-11-27 17:41:48.046874847 +0100
@@ -26,6 +26,7 @@
 #include "MyGUI_Prerequest.h"
 #include "MyGUI_IRenderTarget.h"
 #include "MyGUI_RenderFormat.h"
+#include <string>
 
 namespace MyGUI
 {
--- A/MyGUIEngine/include/MyGUI_RenderFormat.h	2009-09-28 03:19:58.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_RenderFormat.h	2009-11-27 17:02:14.622875175 +0100
@@ -23,6 +23,8 @@
 #ifndef __MYGUI_RENDER_FORMAT_H__
 #define __MYGUI_RENDER_FORMAT_H__
 
+#include "MyGUI_Macros.h"
+
 namespace MyGUI
 {
 
--- A/MyGUIEngine/include/MyGUI_VertexData.h	2009-06-04 04:34:12.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_VertexData.h	2009-11-27 17:08:23.382859907 +0100
@@ -24,6 +24,7 @@
 #define __MYGUI_VERTEX_DATA_H__
 
 #include "MyGUI_Prerequest.h"
+#include "MyGUI_Types.h"
 
 namespace MyGUI
 {

mygui_multilib_cflags.patch:
 CMake/ConfigureBuild.cmake           |    2 +-
 CMake/Templates/MYGUI.pc.in          |    6 +++---
 CMake/Utils/MyGUIConfigTargets.cmake |   10 ++++++----
 CMakeLists.txt                       |   10 +++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE mygui_multilib_cflags.patch ---
--- A/CMakeLists.txt	2009-10-12 23:45:57.564750326 +0200
+++ B/CMakeLists.txt	2009-10-12 23:46:25.879489254 +0200
@@ -46,9 +46,9 @@
 endif ()
 
 # Set compiler specific build flags
-if (CMAKE_COMPILER_IS_GNUCXX)
-	add_definitions(-msse)
-endif ()
+#if (CMAKE_COMPILER_IS_GNUCXX)
+#	add_definitions(-msse)
+#endif ()
 if (MSVC)
 	add_definitions(/fp:fast)
 endif ()
@@ -87,8 +87,8 @@
 set(MYGUI_LIBRARIES MyGUIEngine)
 
 # Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
 if (WIN32 OR APPLE)
 	if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
--- A/CMake/ConfigureBuild.cmake	2009-10-12 23:53:41.447496281 +0200
+++ B/CMake/ConfigureBuild.cmake	2009-10-13 00:02:30.243489356 +0200
@@ -44,7 +44,7 @@
   else ()
     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
   endif ()
-  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
+  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
   # configure additional packages
   
--- A/CMake/Utils/MyGUIConfigTargets.cmake	2009-10-13 00:44:05.003749853 +0200
+++ B/CMake/Utils/MyGUIConfigTargets.cmake	2009-10-13 00:48:18.378490236 +0200
@@ -38,8 +38,8 @@
 function(mygui_install_target TARGETNAME SUFFIX)
   install(TARGETS ${TARGETNAME}
     RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
-    LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-    ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+    LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+    ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
     FRAMEWORK DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
   )
   install(TARGETS ${TARGETNAME}
@@ -65,8 +65,8 @@
 # setup common target settings
 function(mygui_config_common TARGETNAME)
   set_target_properties(${TARGETNAME} PROPERTIES
-    ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
-    LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
+    ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
+    LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
     RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
   )
   mygui_create_vcproj_userfile(${TARGETNAME})
@@ -198,6 +198,8 @@
     set_target_properties(${LIBNAME} PROPERTIES OUTPUT_NAME ${LIBNAME}Static)
   else (MYGUI_STATIC)
     if (CMAKE_COMPILER_IS_GNUCXX)
+      target_link_libraries(${LIBNAME} uuid)
+      target_link_libraries(${LIBNAME} dl)
       # add GCC visibility flags to shared library build
       set_target_properties(${LIBNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")
 	endif (CMAKE_COMPILER_IS_GNUCXX)
--- A/CMake/Templates/MYGUI.pc.in	2009-10-13 00:29:15.429738822 +0200
+++ B/CMake/Templates/MYGUI.pc.in	2009-10-30 15:22:03.687723109 +0100
@@ -1,11 +1,11 @@
 prefix=@MYGUI_PREFIX_PATH@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=${prefix}/lib at LIB_SUFFIX@
 includedir=${prefix}/include
 
 Name: MyGUI
 Description: Fast, flexible and simple GUI
 Version: @MYGUI_VERSION@
 URL: http://www.my-gui.sourceforge.net
-Libs: -L${libdir} -lMyGUIEngine at MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
-Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine at MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
+Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@



--- NEW FILE resources.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<Paths>
  <Path root="true">/usr/share/MyGUI/Media</Path>
  <Path>/usr/share/MyGUI/Media/MyGUI_Media</Path>
  <Path>/usr/share/MyGUI/Media/Tools/LayoutEditor</Path>
</Paths>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mygui/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:51:10 -0000	1.1
+++ .cvsignore	5 Dec 2009 11:46:48 -0000	1.2
@@ -0,0 +1 @@
+mygui-2.3.0-2332svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mygui/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:51:10 -0000	1.1
+++ sources	5 Dec 2009 11:46:48 -0000	1.2
@@ -0,0 +1 @@
+4b4fb317f253c42b56756faeeb3ef8c4  mygui-2.3.0-2332svn.tar.bz2



From roma at fedoraproject.org  Sat Dec  5 11:47:12 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Sat,  5 Dec 2009 11:47:12 +0000 (UTC)
Subject: rpms/xpaint/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 
	1.2, 1.3 xpaint.spec, 1.1, 1.2 xpaint-2.8.7-graphic.c.patch, 1.1,
	NONE
Message-ID: <20091205114712.AE21411C0095@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/xpaint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6987/F-11

Modified Files:
	.cvsignore import.log sources xpaint.spec 
Removed Files:
	xpaint-2.8.7-graphic.c.patch 
Log Message:
xpaint 2.8.7.3 update


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Nov 2009 01:28:33 -0000	1.2
+++ .cvsignore	5 Dec 2009 11:47:12 -0000	1.3
@@ -1 +1 @@
-xpaint-2.8.7.tar.bz2
+xpaint-2.8.7.3.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Nov 2009 01:28:33 -0000	1.1
+++ import.log	5 Dec 2009 11:47:12 -0000	1.2
@@ -1 +1,2 @@
 xpaint-2_8_7-1_fc10:F-11:xpaint-2.8.7-1.fc10.src.rpm:1257557234
+xpaint-2_8_7_3-1_fc10:F-11:xpaint-2.8.7.3-1.fc10.src.rpm:1260013613


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Nov 2009 01:28:33 -0000	1.2
+++ sources	5 Dec 2009 11:47:12 -0000	1.3
@@ -1 +1 @@
-7f41711bcbecad10d45045d52ec24021  xpaint-2.8.7.tar.bz2
+3d5f97cd3542b2a13ee2453552ff6656  xpaint-2.8.7.3.tar.bz2


Index: xpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-11/xpaint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xpaint.spec	7 Nov 2009 01:28:33 -0000	1.1
+++ xpaint.spec	5 Dec 2009 11:47:12 -0000	1.2
@@ -4,13 +4,12 @@
 
 Summary:        An X Window System image editing or paint program
 Name:           xpaint
-Version:        2.8.7
+Version:        2.8.7.3
 Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Multimedia
 URL:            http://sourceforge.net/projects/sf-xpaint
 Source0:        http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
-Patch0:         xpaint-2.8.7-graphic.c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bison flex imake chrpath
@@ -56,7 +55,6 @@ This package contains development files 
 
 %prep
 %setup -q
-%patch0 -p1 -b .graphic
 sed -i -e 's|/lib |/%{_lib} |g' Local.config
 sed -i -e 's|@XPMDIR@|%{_prefix}|g' Local.config
 sed -i -e 's|/usr/lib|%{_libdir}|g' configure
@@ -127,6 +125,12 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Wed Nov 19 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.7.3-1
+- Updated to 2.8.7.3
+
+* Wed Nov 16 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.7.2-1
+- Updated to 2.8.7.2
+
 * Wed Nov 04 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.7-1
 - Updated to 2.8.7
 - Changed license to GPLv3+


--- xpaint-2.8.7-graphic.c.patch DELETED ---



From sailer at fedoraproject.org  Sat Dec  5 11:53:19 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 11:53:19 +0000 (UTC)
Subject: rpms/mingw32-cairomm/devel .cvsignore, 1.2, 1.3 mingw32-cairomm.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20091205115319.78E7A11C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8120

Modified Files:
	.cvsignore mingw32-cairomm.spec sources 
Log Message:
update to 1.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Apr 2009 06:46:07 -0000	1.2
+++ .cvsignore	5 Dec 2009 11:53:19 -0000	1.3
@@ -1 +1,2 @@
 cairomm-1.8.0.tar.gz
+cairomm-1.8.4.tar.gz


Index: mingw32-cairomm.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/devel/mingw32-cairomm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-cairomm.spec	25 Jul 2009 12:15:30 -0000	1.4
+++ mingw32-cairomm.spec	5 Dec 2009 11:53:19 -0000	1.5
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-cairomm
-Version:        1.8.0
-Release:        4%{?dist}
+Version:        1.8.4
+Release:        1%{?dist}
 Summary:        MinGW Windows C++ API for the cairo graphics library
 
 License:        LGPLv2+
@@ -50,7 +50,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-
+rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/{devhelp,doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,9 +70,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/pkgconfig/cairomm-win32-1.0.pc
 %{_mingw32_libdir}/pkgconfig/cairomm-win32-font-1.0.pc
 %{_mingw32_includedir}/cairomm-1.0
-
+%{_mingw32_libdir}/cairomm-1.0/include/cairommconfig.h
 
 %changelog
+* Sat Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.8.4-1
+- update to 1.8.44
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-cairomm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Apr 2009 06:46:08 -0000	1.2
+++ sources	5 Dec 2009 11:53:19 -0000	1.3
@@ -1 +1 @@
-15c0f56eee57bb418c38463a6297d715  cairomm-1.8.0.tar.gz
+559afbc47484ba3fad265e38a3dafe90  cairomm-1.8.4.tar.gz



From pbrobinson at fedoraproject.org  Sat Dec  5 12:23:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  5 Dec 2009 12:23:00 +0000 (UTC)
Subject: rpms/tangogps/F-10 .cvsignore, 1.6, 1.7 sources, 1.7,
	1.8 tangogps.spec, 1.7, 1.8
Message-ID: <20091205122300.CC59811C0095@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14163

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
- New upstream 0.99.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Nov 2009 09:50:44 -0000	1.6
+++ .cvsignore	5 Dec 2009 12:23:00 -0000	1.7
@@ -1 +1 @@
-tangogps-0.9.9.tar.gz
+tangogps-0.99.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Nov 2009 09:50:44 -0000	1.7
+++ sources	5 Dec 2009 12:23:00 -0000	1.8
@@ -1 +1 @@
-0ff6bde0f33b712d066cea08934d4808  tangogps-0.9.9.tar.gz
+ba0b28f9f87f6b47cf32a4f2c935cc28  tangogps-0.99.2.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-10/tangogps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tangogps.spec	5 Nov 2009 09:50:44 -0000	1.7
+++ tangogps.spec	5 Dec 2009 12:23:00 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           tangogps
-Version:        0.9.9
+Version:        0.99.2
 Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
@@ -59,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.2-1
+- New upstream 0.99.2 release
+
+* Mon Nov 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.99.1-1
+- New upstream 0.99.1 release
+
 * Thu Nov  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.9-1
 - New upstream 0.9.9 release
 



From sailer at fedoraproject.org  Sat Dec  5 12:25:23 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 12:25:23 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/F-12 .cvsignore, 1.5, 1.6 mingw32-gtkmm24.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091205122523.E4BFA11C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14850

Modified Files:
	.cvsignore mingw32-gtkmm24.spec sources 
Log Message:
update to 2.18.2 to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Sep 2009 16:40:18 -0000	1.5
+++ .cvsignore	5 Dec 2009 12:25:23 -0000	1.6
@@ -2,3 +2,4 @@ gtkmm-2.16.0.tar.bz2
 gtkmm-2.17.2.tar.bz2
 gtkmm-2.17.11.tar.bz2
 gtkmm-2.18.1.tar.bz2
+gtkmm-2.18.2.tar.bz2


Index: mingw32-gtkmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-12/mingw32-gtkmm24.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-gtkmm24.spec	27 Sep 2009 17:07:52 -0000	1.7
+++ mingw32-gtkmm24.spec	5 Dec 2009 12:25:23 -0000	1.8
@@ -6,14 +6,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtkmm24
-Version:        2.18.1
+Version:        2.18.2
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.16/gtkmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +22,7 @@ BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-glibmm24 >= 2.21.2
+BuildRequires:  mingw32-glibmm24
 BuildRequires:  mingw32-atk
 BuildRequires:  mingw32-pango
 BuildRequires:  mingw32-gtk2
@@ -57,6 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtkmm-2.4/demo/
 
+# hack: some headers are not available on win32
+sed -i -e "s,#include <gtkmm/pagesetupunixdialog.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/gtkmm-2.4/gtkmm.h
+sed -i -e "s,#include <gtkmm/printer.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/gtkmm-2.4/gtkmm.h
+sed -i -e "s,#include <gtkmm/printjob.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/gtkmm-2.4/gtkmm.h
+sed -i -e "s,#include <gtkmm/printunixdialog.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/gtkmm-2.4/gtkmm.h
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.18.2-1
+- update to 2.18.2
+- remove includes of nonexistent header files
+
 * Sun Sep 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.18.1-1
 - update to 2.18.1 to match native
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Sep 2009 16:40:19 -0000	1.5
+++ sources	5 Dec 2009 12:25:23 -0000	1.6
@@ -1 +1 @@
-7b36f7ea10f183d14b20cad8c1f70daa  gtkmm-2.18.1.tar.bz2
+3e43e9eef1da8988a76a2815d6b31c91  gtkmm-2.18.2.tar.bz2



From chitlesh at fedoraproject.org  Sat Dec  5 12:51:08 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Dec 2009 12:51:08 +0000 (UTC)
Subject: File verilog-20091205.tar.bz2 uploaded to lookaside cache by
	chitlesh
Message-ID: <20091205125108.E777810F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for iverilog:

fe3bab76aec4b0bc8e6f0bc2f56db4a1  verilog-20091205.tar.bz2



From chitlesh at fedoraproject.org  Sat Dec  5 12:52:48 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Dec 2009 12:52:48 +0000 (UTC)
Subject: rpms/iverilog/F-11 .cvsignore, 1.11, 1.12 import.log, 1.5,
	1.6 iverilog.spec, 1.13, 1.14 sources, 1.12, 1.13
Message-ID: <20091205125248.908DF11C0095@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20216/F-11

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
fix build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Dec 2009 22:42:56 -0000	1.11
+++ .cvsignore	5 Dec 2009 12:52:48 -0000	1.12
@@ -1 +1 @@
-verilog-20091204.tar.bz2
+verilog-20091205.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	4 Dec 2009 22:42:56 -0000	1.5
+++ import.log	5 Dec 2009 12:52:48 -0000	1.6
@@ -3,3 +3,4 @@ iverilog-0_9_20081118-1_fc11:HEAD:iveril
 iverilog-0_9_20090423-4__fc10:HEAD:iverilog-0.9.20090423-4..fc10.src.rpm:1237848668
 iverilog-0_9_20090423-5_fc11:F-11:iverilog-0.9.20090423-5.fc11.src.rpm:1247523896
 iverilog-0_9_20091204-1_fc12:F-11:iverilog-0.9.20091204-1.fc12.src.rpm:1259966454
+iverilog-0_9_20091205-1_fc12:F-11:iverilog-0.9.20091205-1.fc12.src.rpm:1260017424


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/iverilog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- iverilog.spec	4 Dec 2009 22:42:57 -0000	1.13
+++ iverilog.spec	5 Dec 2009 12:52:48 -0000	1.14
@@ -5,7 +5,7 @@
 #Version:     1.0
 #Release:     1.snap%{snapshot}%{?dist}
 
-%define      snapshot 20091204
+%define      snapshot 20091205
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
@@ -15,10 +15,11 @@ Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
 Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
-#Patch0:      %{name}-pagesize.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
+BuildRequires: autoconf
+ 
 
 %description
 Icarus Verilog is a Verilog compiler that generates a variety of
@@ -36,7 +37,6 @@ Icarus Verilog devel files.
 %prep
 %setup -q -n verilog-%{snapshot}
 
-sed -i "s|tail +2|tail -n +2|" Makefile.in driver/Makefile.in vvp/Makefile.in
 sh autoconf.sh
 
 # clean junks from tarball
@@ -49,8 +49,7 @@ rm -rf `find . -type d -name "autom4te.c
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 %configure
 
-make 
-#{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -92,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091205-1
+- New development snapshot - 0.9.2 prerelease snapshot
+
 * Fri Dec 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091204-1
 - New development snapshot - 0.9.2 prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Dec 2009 22:42:57 -0000	1.12
+++ sources	5 Dec 2009 12:52:48 -0000	1.13
@@ -1 +1 @@
-366ae53f359c4cb7e1c02409e203bade  verilog-20091204.tar.bz2
+fe3bab76aec4b0bc8e6f0bc2f56db4a1  verilog-20091205.tar.bz2



From chitlesh at fedoraproject.org  Sat Dec  5 13:04:12 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Dec 2009 13:04:12 +0000 (UTC)
Subject: rpms/iverilog/F-12 .cvsignore, 1.11, 1.12 import.log, 1.5,
	1.6 iverilog.spec, 1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20091205130412.2875111C0095@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22664/F-12

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
fix build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Dec 2009 22:56:13 -0000	1.11
+++ .cvsignore	5 Dec 2009 13:04:11 -0000	1.12
@@ -1 +1 @@
-verilog-20091204.tar.bz2
+verilog-20091205.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	4 Dec 2009 22:56:13 -0000	1.5
+++ import.log	5 Dec 2009 13:04:11 -0000	1.6
@@ -3,3 +3,4 @@ iverilog-0_9_20081118-1_fc11:HEAD:iveril
 iverilog-0_9_20090423-4__fc10:HEAD:iverilog-0.9.20090423-4..fc10.src.rpm:1237848668
 iverilog-0_9_20090423-5_fc11:HEAD:iverilog-0.9.20090423-5.fc11.src.rpm:1247523987
 iverilog-0_9_20091204-1_fc12:F-12:iverilog-0.9.20091204-1.fc12.src.rpm:1259966766
+iverilog-0_9_20091205-1_fc12:F-12:iverilog-0.9.20091205-1.fc12.src.rpm:1260018138


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/iverilog.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- iverilog.spec	4 Dec 2009 22:56:13 -0000	1.14
+++ iverilog.spec	5 Dec 2009 13:04:11 -0000	1.15
@@ -5,7 +5,7 @@
 #Version:     1.0
 #Release:     1.snap%{snapshot}%{?dist}
 
-%define      snapshot 20091204
+%define      snapshot 20091205
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
@@ -15,10 +15,11 @@ Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
 Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
-#Patch0:      %{name}-pagesize.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
+BuildRequires: autoconf
+ 
 
 %description
 Icarus Verilog is a Verilog compiler that generates a variety of
@@ -36,7 +37,6 @@ Icarus Verilog devel files.
 %prep
 %setup -q -n verilog-%{snapshot}
 
-sed -i "s|tail +2|tail -n +2|" Makefile.in driver/Makefile.in vvp/Makefile.in
 sh autoconf.sh
 
 # clean junks from tarball
@@ -49,8 +49,7 @@ rm -rf `find . -type d -name "autom4te.c
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 %configure
 
-make 
-#{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -92,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091205-1
+- New development snapshot - 0.9.2 prerelease snapshot
+
 * Fri Dec 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091204-1
 - New development snapshot - 0.9.2 prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Dec 2009 22:56:13 -0000	1.12
+++ sources	5 Dec 2009 13:04:11 -0000	1.13
@@ -1 +1 @@
-366ae53f359c4cb7e1c02409e203bade  verilog-20091204.tar.bz2
+fe3bab76aec4b0bc8e6f0bc2f56db4a1  verilog-20091205.tar.bz2



From than at fedoraproject.org  Sat Dec  5 13:06:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 13:06:45 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 kdeadmin.spec,1.138,1.139 sources,1.67,1.68
Message-ID: <20091205130645.35C1811C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23301

Modified Files:
	kdeadmin.spec sources 
Log Message:
4.3.4



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- kdeadmin.spec	9 Nov 2009 13:09:00 -0000	1.138
+++ kdeadmin.spec	5 Dec 2009 13:06:44 -0000	1.139
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora}
 %define system_config_printer_kde 1
 %define include_kpackage 1
@@ -7,8 +6,8 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.3
-Release:        1%{?dist}
+Version:        4.3.4
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -70,6 +69,15 @@ a CUPS print server.
 
 %build
 
+%if ! 0%{?system_config_printer_kde}
+sed -i -e 's:macro_optional_add_subdirectory(system-config-printer-kde):#macro_optional_add_subdirectory(system-config-printer-kde):g' CMakeLists.txt
+%endif
+
+%if ! 0%{?include_kpackage}
+sed -i -e 's:macro_optional_add_subdirectory(kpackage):#macro_optional_add_subdirectory(kpackage):g' CMakeLists.txt
+sed -i -e 's:add_subdirectory(kpackage):#add_subdirectory(kpackage):g' doc/CMakeLists.txt
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -160,6 +168,12 @@ fi
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+- fix rhel conditionals
+
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	9 Nov 2009 13:09:00 -0000	1.67
+++ sources	5 Dec 2009 13:06:44 -0000	1.68
@@ -1 +1 @@
-f83af0034fd1f040ec8eb8b3baa3301a  kdeadmin-4.3.3.tar.bz2
+718e117023e93862bed23182b7d1c5d6  kdeadmin-4.3.4.tar.bz2



From sailer at fedoraproject.org  Sat Dec  5 13:07:16 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 13:07:16 +0000 (UTC)
Subject: rpms/ghdl/F-12 ghdl.spec,1.55,1.56 ghdl-svn130.patch,1.1,NONE
Message-ID: <20091205130716.C9D3B11C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23457

Modified Files:
	ghdl.spec 
Removed Files:
	ghdl-svn130.patch 
Log Message:
update to svn131



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-12/ghdl.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- ghdl.spec	23 Sep 2009 18:52:58 -0000	1.55
+++ ghdl.spec	5 Dec 2009 13:07:16 -0000	1.56
@@ -1,6 +1,6 @@
 %global gccver 4.3.4
 %global ghdlver 0.28
-%global ghdlsvnver 130
+%global ghdlsvnver 131
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -311,6 +311,9 @@ popd
 
 
 %changelog
+* Sat Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
+- update to svn131
+
 * Wed Sep 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.130svn.0
 - update to 0.28/svn130
 


--- ghdl-svn130.patch DELETED ---



From chitlesh at fedoraproject.org  Sat Dec  5 13:07:50 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  5 Dec 2009 13:07:50 +0000 (UTC)
Subject: rpms/iverilog/devel .cvsignore, 1.11, 1.12 import.log, 1.5,
	1.6 iverilog.spec, 1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20091205130750.4796011C0095@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23685/devel

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
fix build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Dec 2009 22:35:03 -0000	1.11
+++ .cvsignore	5 Dec 2009 13:07:50 -0000	1.12
@@ -1 +1 @@
-verilog-20091204.tar.bz2
+verilog-20091205.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	4 Dec 2009 22:35:03 -0000	1.5
+++ import.log	5 Dec 2009 13:07:50 -0000	1.6
@@ -3,3 +3,4 @@ iverilog-0_9_20081118-1_fc11:HEAD:iveril
 iverilog-0_9_20090423-4__fc10:HEAD:iverilog-0.9.20090423-4..fc10.src.rpm:1237848668
 iverilog-0_9_20090423-5_fc11:HEAD:iverilog-0.9.20090423-5.fc11.src.rpm:1247523987
 iverilog-0_9_20091204-1_fc12:HEAD:iverilog-0.9.20091204-1.fc12.src.rpm:1259965837
+iverilog-0_9_20091205-1_fc12:HEAD:iverilog-0.9.20091205-1.fc12.src.rpm:1260018305


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/iverilog.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- iverilog.spec	4 Dec 2009 22:35:03 -0000	1.14
+++ iverilog.spec	5 Dec 2009 13:07:50 -0000	1.15
@@ -5,7 +5,7 @@
 #Version:     1.0
 #Release:     1.snap%{snapshot}%{?dist}
 
-%define      snapshot 20091204
+%define      snapshot 20091205
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
@@ -15,10 +15,11 @@ Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
 Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
-#Patch0:      %{name}-pagesize.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
+BuildRequires: autoconf
+ 
 
 %description
 Icarus Verilog is a Verilog compiler that generates a variety of
@@ -36,7 +37,6 @@ Icarus Verilog devel files.
 %prep
 %setup -q -n verilog-%{snapshot}
 
-sed -i "s|tail +2|tail -n +2|" Makefile.in driver/Makefile.in vvp/Makefile.in
 sh autoconf.sh
 
 # clean junks from tarball
@@ -49,8 +49,7 @@ rm -rf `find . -type d -name "autom4te.c
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 %configure
 
-make 
-#{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -92,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091205-1
+- New development snapshot - 0.9.2 prerelease snapshot
+
 * Fri Dec 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091204-1
 - New development snapshot - 0.9.2 prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Dec 2009 22:35:03 -0000	1.12
+++ sources	5 Dec 2009 13:07:50 -0000	1.13
@@ -1 +1 @@
-366ae53f359c4cb7e1c02409e203bade  verilog-20091204.tar.bz2
+fe3bab76aec4b0bc8e6f0bc2f56db4a1  verilog-20091205.tar.bz2



From than at fedoraproject.org  Sat Dec  5 13:10:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 13:10:37 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-11 kdeaccessibility.spec, 1.84, 1.85 sources,
	1.46, 1.47
Message-ID: <20091205131037.4D78211C03F6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeaccessibility/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24353

Modified Files:
	kdeaccessibility.spec sources 
Log Message:
4.3.4



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/kdeaccessibility.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- kdeaccessibility.spec	9 Nov 2009 13:07:00 -0000	1.84
+++ kdeaccessibility.spec	5 Dec 2009 13:10:36 -0000	1.85
@@ -1,8 +1,7 @@
-
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -15,9 +14,11 @@ BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: festival
 # workaround (hopefully) temporary borkage
+%if 0%{?fedora}
 %ifnarch sparcv9 sparc64
 BuildRequires: flite-devel
 %endif
+%endif
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
 ## cmake output to check on
@@ -43,8 +44,6 @@ Included with this package are:
 * kmouth: program that allows people who have lost their voice
 * ktts: text to speech support
 
-# Yes, it's a bit silly to have this, esp since we don't have a -devel pkg,
-# but that's how multilib currently works. -- Rex
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
@@ -144,6 +143,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
+* Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- rhel cleanup, drop BR on flite-devel
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	9 Nov 2009 13:07:00 -0000	1.46
+++ sources	5 Dec 2009 13:10:37 -0000	1.47
@@ -1 +1 @@
-401e733b42d34580b36a9ffe59e5aeba  kdeaccessibility-4.3.3.tar.bz2
+00adeff7e2441fdc7959644cefb07967  kdeaccessibility-4.3.4.tar.bz2



From sailer at fedoraproject.org  Sat Dec  5 13:11:26 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 13:11:26 +0000 (UTC)
Subject: rpms/ghdl/F-12 ghdl-svn131.patch,NONE,1.1
Message-ID: <20091205131126.65C2D11C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24563

Added Files:
	ghdl-svn131.patch 
Log Message:
check in forgotten patch


ghdl-svn131.patch:
 errorout.adb          |    6 
 ghdldrv/ghdllocal.adb |    2 
 grt/grt-processes.adb |  431 +++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads |   29 +--
 grt/grt-signals.adb   |   31 +--
 grt/grt-signals.ads   |   33 ++-
 grt/grt-types.ads     |    4 
 grt/grt-unithread.adb |    9 -
 grt/grt-unithread.ads |    6 
 ortho-lang.c          |    2 
 version.ads           |    4 
 11 files changed, 333 insertions(+), 224 deletions(-)

--- NEW FILE ghdl-svn131.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-11-29 12:28:59.000000000 +0100
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-11-29 12:28:55.000000000 +0100
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-11-29 12:28:56.000000000 +0100
@@ -36,22 +36,25 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
+   type Process_Id_Array is array (Natural range <>) of Process_Acc;
    type Process_Id_Array_Acc is access Process_Id_Array;
 
    Resume_Process_Table : Process_Id_Array_Acc;
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,63 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+      end if;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +339,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +437,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +453,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +462,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +477,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +495,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +504,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +512,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +522,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +545,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -507,7 +627,7 @@
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,35 +636,30 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
@@ -571,15 +686,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +701,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +755,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +810,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-11-29 12:28:56.000000000 +0100
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -178,8 +174,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-11-29 12:28:56.000000000 +0100
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-11-29 12:28:56.000000000 +0100
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-11-29 12:28:56.000000000 +0100
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-11-29 12:28:56.000000000 +0100
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-11-29 12:28:56.000000000 +0100
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/ortho-lang.c ghdl-0.29dev/vhdl/ortho-lang.c
--- ghdl-0.28/vhdl/ortho-lang.c	2008-08-28 05:29:25.000000000 +0200
+++ ghdl-0.29dev/vhdl/ortho-lang.c	2009-11-29 12:28:57.000000000 +0100
@@ -385,7 +385,7 @@
     filename = in_fnames[0];
 
   linemap_add (line_table, LC_ENTER, 0, filename ? filename :"*no-file*", 1);
-  input_location = linemap_line_start (line_table, 0, 252);
+  input_location = linemap_line_start (line_table, 1, 252);
 
   if (!lang_parse_file (filename))
     errorcount++;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-11-29 12:28:59.000000000 +0100
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;



From than at fedoraproject.org  Sat Dec  5 13:13:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 13:13:14 +0000 (UTC)
Subject: rpms/kdeartwork/F-11 kdeartwork.spec,1.113,1.114 sources,1.65,1.66
Message-ID: <20091205131314.1826511C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25180

Modified Files:
	kdeartwork.spec sources 
Log Message:
4.3.4



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/kdeartwork.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- kdeartwork.spec	9 Nov 2009 13:10:53 -0000	1.113
+++ kdeartwork.spec	5 Dec 2009 13:13:13 -0000	1.114
@@ -1,6 +1,5 @@
-
 Name:           kdeartwork
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
@@ -20,12 +19,12 @@ BuildRequires:  kdebase-workspace-devel 
 
 Requires: kdebase-workspace >= %{version}
 
-# upgrade paths
-%if 0%{?fedora} < 11
+# upgrade paths for fedora
+%if 0%{?fedora} && 0%{?fedora} < 11
 Requires: %{name}-sounds = %{version}-%{release}
 Requires: %{name}-wallpapers = %{version}-%{release}
 %endif
-%if 0%{?fedora} < 12
+%if 0%{?fedora} && 0%{?fedora} < 12
 Requires: kde-style-phase = %{version}-%{release}
 %endif
 
@@ -215,6 +214,12 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
+* Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- rhel cleanup, fix conditional for RHEL
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	9 Nov 2009 13:10:53 -0000	1.65
+++ sources	5 Dec 2009 13:13:13 -0000	1.66
@@ -1 +1 @@
-8f6c152530f272dd073753e1b7fc4259  kdeartwork-4.3.3.tar.bz2
+e3c5bb7fbc5b4fb8a5485d8e616f75f6  kdeartwork-4.3.4.tar.bz2



From mycae at fedoraproject.org  Sat Dec  5 13:13:37 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:13:37 +0000 (UTC)
Subject: File skinlf-6.7cvs20091205-clean.tar.gz uploaded to lookaside cache
	by mycae
Message-ID: <20091205131337.6035C10F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for skinlf:

3960a83f0f411df0adbcc275f9b497bb  skinlf-6.7cvs20091205-clean.tar.gz



From than at fedoraproject.org  Sat Dec  5 13:16:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 13:16:06 +0000 (UTC)
Subject: rpms/kdebase/F-11 kdebase.spec,1.386,1.387 sources,1.114,1.115
Message-ID: <20091205131606.BB0D111C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25833

Modified Files:
	kdebase.spec sources 
Log Message:
4.3.4



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- kdebase.spec	11 Nov 2009 12:37:05 -0000	1.386
+++ kdebase.spec	5 Dec 2009 13:16:06 -0000	1.387
@@ -1,9 +1,8 @@
-
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Epoch: 6
-Version: 4.3.3
-Release: 3%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -237,6 +236,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Wed Nov 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-3
 - allow 'Open Folder in Tabs' in Konsole to support SSH bookmarks (kde#177637)
   (upstream patch backported from 4.4)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- sources	9 Nov 2009 13:12:32 -0000	1.114
+++ sources	5 Dec 2009 13:16:06 -0000	1.115
@@ -1 +1 @@
-8072ce9848af28c75c5af2d8c832f985  kdebase-4.3.3.tar.bz2
+e71b470a1846ad29d45d03aae65518c1  kdebase-4.3.4.tar.bz2



From mycae at fedoraproject.org  Sat Dec  5 13:26:21 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:26:21 +0000 (UTC)
Subject: rpms/skinlf/devel skinlf-generate-cvs-tarball.sh, NONE,
	1.1 .cvsignore, 1.3, 1.4 skinlf.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091205132621.16E4C11C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27808

Modified Files:
	.cvsignore skinlf.spec sources 
Added Files:
	skinlf-generate-cvs-tarball.sh 
Log Message:
* Update to latest CVS




--- NEW FILE skinlf-generate-cvs-tarball.sh ---
#!/bin/sh

#
#Execut the following comands to perform checkout. Password is "checkauto" (no quotes).
#cvs -d :pserver:autocheck at cvs.dev.java.net:/cvs login
#cvs -d :pserver:autocheck at cvs.dev.java.net:/cvs checkout skinlf

#Delete non-free example file
find ./skinlf/ -name Clock.java -exec rm -f {} \;

#Delete CVS files
find ./skinlf/ -name CVS -exec rm -rf {} \; 2> /dev/null

#Create CVS tarball
tar -zcvf skinlf-6.7cvs20090501-clean.tar.gz skinlf/ 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Sep 2009 04:32:11 -0000	1.3
+++ .cvsignore	5 Dec 2009 13:26:20 -0000	1.4
@@ -1,2 +1 @@
-skinlf-6.7cvs20090501-clean.tar.gz
-skinlf-generate-cvs-tarball.sh
+skinlf-6.7cvs20091205-clean.tar.gz


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/skinlf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- skinlf.spec	26 Sep 2009 04:32:11 -0000	1.4
+++ skinlf.spec	5 Dec 2009 13:26:20 -0000	1.5
@@ -1,4 +1,4 @@
-%define cvsver cvs20090501
+%define cvsver cvs20091205
 
 Name:		skinlf	
 Version:	6.7
@@ -117,7 +117,10 @@ rm -rf %{buildroot} 
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9cvs20090501
+*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20091205
+- Additional ASL Files
+
+*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20090501
 - Modify to ASL 2.0, upstream has relicenced - fix bug #524784
 - Use CVS co, as upstream does not provide release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Sep 2009 04:32:11 -0000	1.3
+++ sources	5 Dec 2009 13:26:20 -0000	1.4
@@ -1,2 +1 @@
-8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
-8112c470effbac62040f3af6f19a8fd7  skinlf-generate-cvs-tarball.sh
+3960a83f0f411df0adbcc275f9b497bb  skinlf-6.7cvs20091205-clean.tar.gz



From mycae at fedoraproject.org  Sat Dec  5 13:29:01 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:29:01 +0000 (UTC)
Subject: rpms/skinlf/F-11 skinlf-generate-cvs-tarball.sh, NONE,
	1.1 skinlf.spec, 1.3, 1.4
Message-ID: <20091205132901.6263F11C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28407

Modified Files:
	skinlf.spec 
Added Files:
	skinlf-generate-cvs-tarball.sh 
Log Message:
*Update to latest CVS
*Update to latest CVS
*Update to latest CVS
*Update to latest CVS
*Update to latest CVS
*Update to latest CVS
*Update to latest CVS
*Update to latest CVS




--- NEW FILE skinlf-generate-cvs-tarball.sh ---
#!/bin/sh

#
#Execut the following comands to perform checkout. Password is "checkauto" (no quotes).
#cvs -d :pserver:autocheck at cvs.dev.java.net:/cvs login
#cvs -d :pserver:autocheck at cvs.dev.java.net:/cvs checkout skinlf

#Delete non-free example file
find ./skinlf/ -name Clock.java -exec rm -f {} \;

#Delete CVS files
find ./skinlf/ -name CVS -exec rm -rf {} \; 2> /dev/null

#Create CVS tarball
tar -zcvf skinlf-6.7cvs20090501-clean.tar.gz skinlf/ 


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/skinlf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- skinlf.spec	26 Sep 2009 05:11:36 -0000	1.3
+++ skinlf.spec	5 Dec 2009 13:29:01 -0000	1.4
@@ -1,4 +1,4 @@
-%define cvsver cvs20090501
+%define cvsver cvs20091205
 
 Name:		skinlf	
 Version:	6.7
@@ -117,7 +117,10 @@ rm -rf %{buildroot} 
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9cvs20090501
+*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20091205
+- Additional ASL Files
+
+*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20090501
 - Modify to ASL 2.0, upstream has relicenced - fix bug #524784
 - Use CVS co, as upstream does not provide release
 



From mycae at fedoraproject.org  Sat Dec  5 13:30:00 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:30:00 +0000 (UTC)
Subject: rpms/skinlf/F-12 skinlf-generate-cvs-tarball.sh, NONE,
	1.1 skinlf.spec, 1.4, 1.5
Message-ID: <20091205133000.1971511C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28602

Modified Files:
	skinlf.spec 
Added Files:
	skinlf-generate-cvs-tarball.sh 
Log Message:
*Update to latest CVS




--- NEW FILE skinlf-generate-cvs-tarball.sh ---
#!/bin/sh

#
#Execut the following comands to perform checkout. Password is "checkauto" (no quotes).
#cvs -d :pserver:autocheck at cvs.dev.java.net:/cvs login
#cvs -d :pserver:autocheck at cvs.dev.java.net:/cvs checkout skinlf

#Delete non-free example file
find ./skinlf/ -name Clock.java -exec rm -f {} \;

#Delete CVS files
find ./skinlf/ -name CVS -exec rm -rf {} \; 2> /dev/null

#Create CVS tarball
tar -zcvf skinlf-6.7cvs20090501-clean.tar.gz skinlf/ 


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-12/skinlf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- skinlf.spec	26 Sep 2009 04:32:11 -0000	1.4
+++ skinlf.spec	5 Dec 2009 13:30:00 -0000	1.5
@@ -1,4 +1,4 @@
-%define cvsver cvs20090501
+%define cvsver cvs20091205
 
 Name:		skinlf	
 Version:	6.7
@@ -117,7 +117,10 @@ rm -rf %{buildroot} 
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9cvs20090501
+*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20091205
+- Additional ASL Files
+
+*Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20090501
 - Modify to ASL 2.0, upstream has relicenced - fix bug #524784
 - Use CVS co, as upstream does not provide release
 



From mycae at fedoraproject.org  Sat Dec  5 13:31:52 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:31:52 +0000 (UTC)
Subject: rpms/skinlf/F-12 skinlf.spec,1.5,1.6
Message-ID: <20091205133152.9F14311C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28951

Modified Files:
	skinlf.spec 
Log Message:
*Bump release value



Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-12/skinlf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- skinlf.spec	5 Dec 2009 13:30:00 -0000	1.5
+++ skinlf.spec	5 Dec 2009 13:31:52 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		skinlf	
 Version:	6.7
-Release:	9.%{cvsver}%{?dist}
+Release:	10.%{cvsver}%{?dist}
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries
@@ -117,7 +117,7 @@ rm -rf %{buildroot} 
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20091205
+*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-10.cvs20091205
 - Additional ASL Files
 
 *Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20090501



From mycae at fedoraproject.org  Sat Dec  5 13:32:55 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:32:55 +0000 (UTC)
Subject: rpms/skinlf/devel skinlf.spec,1.5,1.6
Message-ID: <20091205133255.8D32C11C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29215

Modified Files:
	skinlf.spec 
Log Message:
* Bump release value



Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/devel/skinlf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- skinlf.spec	5 Dec 2009 13:26:20 -0000	1.5
+++ skinlf.spec	5 Dec 2009 13:32:55 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		skinlf	
 Version:	6.7
-Release:	9.%{cvsver}%{?dist}
+Release:	10.%{cvsver}%{?dist}
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries
@@ -117,7 +117,7 @@ rm -rf %{buildroot} 
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20091205
+*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-10.cvs20091205
 - Additional ASL Files
 
 *Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20090501



From mycae at fedoraproject.org  Sat Dec  5 13:33:32 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:33:32 +0000 (UTC)
Subject: rpms/skinlf/F-11 skinlf.spec,1.4,1.5
Message-ID: <20091205133332.9F1DD11C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29341

Modified Files:
	skinlf.spec 
Log Message:
*Bump release value




Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/skinlf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- skinlf.spec	5 Dec 2009 13:29:01 -0000	1.4
+++ skinlf.spec	5 Dec 2009 13:33:32 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		skinlf	
 Version:	6.7
-Release:	9.%{cvsver}%{?dist}
+Release:	10.%{cvsver}%{?dist}
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries
@@ -117,7 +117,7 @@ rm -rf %{buildroot} 
 %{_javadir}/%{name}-%{version}.jar
 
 %changelog
-*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20091205
+*Sat Dec 05 2009 <mycae(a!t)yahoo.com> 6.7-10.cvs20091205
 - Additional ASL Files
 
 *Sat Sep 26 2009 <mycae(a!t)yahoo.com> 6.7-9.cvs20090501



From sailer at fedoraproject.org  Sat Dec  5 13:40:05 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 13:40:05 +0000 (UTC)
Subject: File sqlite-3.6.20.tar.gz uploaded to lookaside cache by sailer
Message-ID: <20091205134005.3183F10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mingw32-sqlite:

0faf8fc8ccff5297513c6532b2b4ce23  sqlite-3.6.20.tar.gz



From mycae at fedoraproject.org  Sat Dec  5 13:48:10 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:48:10 +0000 (UTC)
Subject: rpms/skinlf/F-11 .cvsignore, 1.3, 1.4 skinlf.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <20091205134811.00D7011C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32470

Modified Files:
	.cvsignore skinlf.spec sources 
Log Message:
* Release bump to make new-files for updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Sep 2009 05:11:35 -0000	1.3
+++ .cvsignore	5 Dec 2009 13:48:10 -0000	1.4
@@ -1,2 +1 @@
 skinlf-6.7cvs20090501-clean.tar.gz
-skinlf-generate-cvs-tarball.sh


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/skinlf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- skinlf.spec	5 Dec 2009 13:33:32 -0000	1.5
+++ skinlf.spec	5 Dec 2009 13:48:10 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		skinlf	
 Version:	6.7
-Release:	10.%{cvsver}%{?dist}
+Release:	10.%{cvsver}%{?dist}.1
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Sep 2009 05:11:36 -0000	1.3
+++ sources	5 Dec 2009 13:48:10 -0000	1.4
@@ -1,2 +1 @@
 8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
-8112c470effbac62040f3af6f19a8fd7  skinlf-generate-cvs-tarball.sh



From mycae at fedoraproject.org  Sat Dec  5 13:50:18 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:50:18 +0000 (UTC)
Subject: rpms/skinlf/F-12 skinlf.spec,1.6,1.7
Message-ID: <20091205135018.4FCED11C03DB@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv875

Modified Files:
	skinlf.spec 
Log Message:
* Bump tag




Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-12/skinlf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- skinlf.spec	5 Dec 2009 13:31:52 -0000	1.6
+++ skinlf.spec	5 Dec 2009 13:50:18 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		skinlf	
 Version:	6.7
-Release:	10.%{cvsver}%{?dist}
+Release:	10.%{cvsver}%{?dist}.1
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries



From mycae at fedoraproject.org  Sat Dec  5 13:55:47 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:55:47 +0000 (UTC)
Subject: rpms/skinlf/F-12 .cvsignore, 1.3, 1.4 skinlf.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <20091205135547.8494811C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2473

Modified Files:
	.cvsignore skinlf.spec sources 
Log Message:
* make new-files 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Sep 2009 04:32:11 -0000	1.3
+++ .cvsignore	5 Dec 2009 13:55:46 -0000	1.4
@@ -1,2 +1 @@
-skinlf-6.7cvs20090501-clean.tar.gz
-skinlf-generate-cvs-tarball.sh
+skinlf-6.7cvs20091205-clean.tar.gz


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-12/skinlf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- skinlf.spec	5 Dec 2009 13:50:18 -0000	1.7
+++ skinlf.spec	5 Dec 2009 13:55:46 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		skinlf	
 Version:	6.7
-Release:	10.%{cvsver}%{?dist}.1
+Release:	10.%{cvsver}%{?dist}.2
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Sep 2009 04:32:11 -0000	1.3
+++ sources	5 Dec 2009 13:55:47 -0000	1.4
@@ -1,2 +1 @@
-8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
-8112c470effbac62040f3af6f19a8fd7  skinlf-generate-cvs-tarball.sh
+3960a83f0f411df0adbcc275f9b497bb  skinlf-6.7cvs20091205-clean.tar.gz



From mycae at fedoraproject.org  Sat Dec  5 13:59:29 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat,  5 Dec 2009 13:59:29 +0000 (UTC)
Subject: rpms/skinlf/F-11 .cvsignore, 1.4, 1.5 skinlf.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <20091205135929.97EC611C0095@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/skinlf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3798

Modified Files:
	.cvsignore skinlf.spec sources 
Log Message:
* make new-sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Dec 2009 13:48:10 -0000	1.4
+++ .cvsignore	5 Dec 2009 13:59:29 -0000	1.5
@@ -1 +1 @@
-skinlf-6.7cvs20090501-clean.tar.gz
+skinlf-6.7cvs20091205-clean.tar.gz


Index: skinlf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/skinlf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- skinlf.spec	5 Dec 2009 13:48:10 -0000	1.6
+++ skinlf.spec	5 Dec 2009 13:59:29 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		skinlf	
 Version:	6.7
-Release:	10.%{cvsver}%{?dist}.1
+Release:	10.%{cvsver}%{?dist}.2
 Summary:	Skin look and feel Skinning library for java
 
 Group:		Development/Libraries


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skinlf/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Dec 2009 13:48:10 -0000	1.4
+++ sources	5 Dec 2009 13:59:29 -0000	1.5
@@ -1 +1 @@
-8239ee8256001401628622396df29d5b  skinlf-6.7cvs20090501-clean.tar.gz
+3960a83f0f411df0adbcc275f9b497bb  skinlf-6.7cvs20091205-clean.tar.gz



From bochecha at fedoraproject.org  Sat Dec  5 14:17:35 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sat,  5 Dec 2009 14:17:35 +0000 (UTC)
Subject: File sugar-artwork-0.87.1.tar.bz2 uploaded to lookaside cache by
	bochecha
Message-ID: <20091205141735.A507710F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-artwork:

fffea23aa4dd3aed39af1e3c26024357  sugar-artwork-0.87.1.tar.bz2



From mtasaka at fedoraproject.org  Sat Dec  5 14:23:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  5 Dec 2009 14:23:30 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.243,1.244
Message-ID: <20091205142330.4A06611C0095@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8591

Modified Files:
	gnome-games.spec 
Log Message:
* Sat Dec 05 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 2.29.3-2
- Fix syntax error on scriptlets



Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- gnome-games.spec	5 Dec 2009 04:23:51 -0000	1.243
+++ gnome-games.spec	5 Dec 2009 14:23:29 -0000	1.244
@@ -44,7 +44,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 2.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -233,8 +233,8 @@ fi
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
-  if test -f same-gnome.schemas ; then gconftool-2 --makefile-uninstall-rule same-gnome.schemas ; done ; \
-  if test -f swell-foop.schemas ; then gconftool-2 --makefile-uninstall-rule swell-foop.schemas ; done ; \
+  if test -f same-gnome.schemas ; then gconftool-2 --makefile-uninstall-rule same-gnome.schemas ; fi ; \
+  if test -f swell-foop.schemas ; then gconftool-2 --makefile-uninstall-rule swell-foop.schemas ; fi ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas}             \
 	gnomine.schemas             \
@@ -247,9 +247,9 @@ fi
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
-  if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
-  if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
-  if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; done ; \
+  if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; fi ; \
+  if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; fi ; \
+  if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; fi ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{gtali_schemas}            \
 	glchess.schemas             \
@@ -267,8 +267,8 @@ fi
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
-  if test -f same-gnome.schemas ; then gconftool-2 --makefile-uninstall-rule same-gnome.schemas ; done ; \
-  if test -f swell-foop.schemas ; then gconftool-2 --makefile-uninstall-rule swell-foop.schemas ; done ; \
+  if test -f same-gnome.schemas ; then gconftool-2 --makefile-uninstall-rule same-gnome.schemas ; fi ; \
+  if test -f swell-foop.schemas ; then gconftool-2 --makefile-uninstall-rule swell-foop.schemas ; fi ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas}             \
 	gnomine.schemas             \
@@ -285,9 +285,9 @@ fi
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
-  if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
-  if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
-  if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; done ; \
+  if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; fi ; \
+  if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; fi ; \
+  if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; fi ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{gtali_schemas}            \
 	glchess.schemas             \
@@ -473,6 +473,9 @@ fi
 
 
 %changelog
+* Sat Dec 05 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 2.29.3-2
+- Fix syntax error on scriptlets
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From bochecha at fedoraproject.org  Sat Dec  5 14:36:39 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sat,  5 Dec 2009 14:36:39 +0000 (UTC)
Subject: rpms/sugar-artwork/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sugar-artwork.spec, 1.31, 1.32
Message-ID: <20091205143639.B6BC911C0095@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11727

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
Update to 0.87.1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	24 Sep 2009 20:12:13 -0000	1.22
+++ .cvsignore	5 Dec 2009 14:36:39 -0000	1.23
@@ -1 +1 @@
-sugar-artwork-0.86.0.tar.bz2
+sugar-artwork-0.87.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	24 Sep 2009 20:12:13 -0000	1.22
+++ sources	5 Dec 2009 14:36:39 -0000	1.23
@@ -1 +1 @@
-360a99ab3ce66c035b19679deb34bad4  sugar-artwork-0.86.0.tar.bz2
+fffea23aa4dd3aed39af1e3c26024357  sugar-artwork-0.87.1.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sugar-artwork.spec	24 Sep 2009 20:12:13 -0000	1.31
+++ sugar-artwork.spec	5 Dec 2009 14:36:39 -0000	1.32
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.86.0
+Version: 0.87.1
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
@@ -63,6 +63,9 @@ touch --no-create %{_datadir}/icons/suga
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Sat Dec 05 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.87.1-1
+- New upstream release
+
 * Thu Sep 24 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.86.0-1
 - New upstream release
 



From bpepple at fedoraproject.org  Sat Dec  5 15:02:32 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat,  5 Dec 2009 15:02:32 +0000 (UTC)
Subject: rpms/libsexy/devel libsexy.spec,1.26,1.27
Message-ID: <20091205150232.6634511C0095@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libsexy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18600

Modified Files:
	libsexy.spec 
Log Message:
* Sat Dec  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-15
- Update url.



Index: libsexy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsexy/devel/libsexy.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libsexy.spec	15 Nov 2009 23:26:41 -0000	1.26
+++ libsexy.spec	5 Dec 2009 15:02:32 -0000	1.27
@@ -1,11 +1,11 @@
 Name:           libsexy
 Version:        0.1.11
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://www.chipx86.com/wiki/Libsexy
+URL:            http://www.chipx86.com/w/index.php/Libsexy
 Source0:        http://releases.chipx86.com/%{name}/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-url-label.patch
 Patch1:		%{name}-icon-name.patch
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-15
+- Update url.
+
 * Sun Nov 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-14
 - Backport patch that allows SexyIconEntry to support images using icon-name.
 



From dledford at fedoraproject.org  Sat Dec  5 15:07:57 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sat,  5 Dec 2009 15:07:57 +0000 (UTC)
Subject: rpms/libibverbs/devel libibverbs.spec,1.18,1.19
Message-ID: <20091205150757.BF9E911C0095@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibverbs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20057

Modified Files:
	libibverbs.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.1.3-3
- Own the /etc/libibverbs.d directory



Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libibverbs.spec	6 Nov 2009 16:44:55 -0000	1.18
+++ libibverbs.spec	5 Dec 2009 15:07:57 -0000	1.19
@@ -1,6 +1,6 @@
 Name: libibverbs
 Version: 1.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A library for direct userspace use of RDMA (InfiniBand/iWARP) hardware
 
 Group: System Environment/Libraries
@@ -55,19 +55,21 @@ displays information about RDMA devices.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
+mkdir -p -m755 %{buildroot}%{_sysconfdir}/libibverbs.d
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
+%dir %{_sysconfdir}/libibverbs.d
 %{_libdir}/libibverbs*.so.*
 %doc AUTHORS COPYING ChangeLog README
 
@@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.1.3-3
+- Own the /etc/libibverbs.d directory
+
 * Fri Nov 06 2009 Doug Ledford <dledford at redhat.com> - 1.1.3-2
 - Add Requires of -devel package to -devel-static package
 - Add Requires of libibverbs-driver (this pulls in the various driver packages



From rishi at fedoraproject.org  Sat Dec  5 15:09:58 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat,  5 Dec 2009 15:09:58 +0000 (UTC)
Subject: File gtest-1.4.0.tar.bz2 uploaded to lookaside cache by rishi
Message-ID: <20091205150958.C64AC10F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gtest:

c91de493522cf1b75902d3b3730ff8de  gtest-1.4.0.tar.bz2



From pkgdb at fedoraproject.org  Sat Dec  5 15:09:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:09:56 +0000
Subject: [pkgdb] v4l2-tool ownership updated
Message-ID: <20091205150956.9985F10F878@bastion2.fedora.phx.redhat.com>

Package v4l2-tool in Fedora 12 was orphaned by paragn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/v4l2-tool



From pkgdb at fedoraproject.org  Sat Dec  5 15:09:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:09:56 +0000
Subject: [pkgdb] v4l2-tool (un)retirement
Message-ID: <20091205150956.B63E110F895@bastion2.fedora.phx.redhat.com>

Package v4l2-tool in Fedora 12 has been retired by paragn

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/v4l2-tool



From rishi at fedoraproject.org  Sat Dec  5 15:10:25 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat,  5 Dec 2009 15:10:25 +0000 (UTC)
Subject: rpms/gtest/F-11 .cvsignore, 1.2, 1.3 gtest.spec, 1.3, 1.4 sources,
	1.3, 1.4 gtest-svnr257.patch, 1.1, NONE
Message-ID: <20091205151025.955C111C03A3@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gtest/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20834

Modified Files:
	.cvsignore gtest.spec sources 
Removed Files:
	gtest-svnr257.patch 
Log Message:
* Sat Nov 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.4.0-1
- Version bump to 1.4.0.
  * New feature: the event listener API.
  * New feature: test shuffling.
  * New feature: the XML report format is closer to junitreport and can
    be parsed by Hudson now.
  * New feature: elapsed time for the tests is printed by default.
  * New feature: comes with a TR1 tuple implementation such that Boost
    is no longer needed for Combine().
  * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
  * New feature: the Xcode project can now produce static gtest libraries in
    addition to a framework.
  * Compatibility fixes for gcc and minGW.
  * Bug fixes and implementation clean-ups.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Jul 2008 08:42:04 -0000	1.2
+++ .cvsignore	5 Dec 2009 15:10:25 -0000	1.3
@@ -1 +1 @@
-gtest-1.0.0.tar.gz
+gtest-1.4.0.tar.bz2


Index: gtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/F-11/gtest.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gtest.spec	1 Jun 2009 19:23:40 -0000	1.3
+++ gtest.spec	5 Dec 2009 15:10:25 -0000	1.4
@@ -1,14 +1,11 @@
 Summary:	Google C++ testing framework
 Name:		gtest
-Version:	1.3.0
-Release:	1.20090601svn257%{?dist}
+Version:	1.4.0
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 URL:		http://code.google.com/p/googletest/
 Source0:	http://googletest.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Update to latest available SVN as of 20090601
-# Chromium needs at least 243.
-Patch0:		gtest-svnr257.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -33,7 +30,6 @@ This package contains development files 
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Keep a clean copy of samples.
 cp -pr ./samples ./samples.orig
@@ -48,7 +44,7 @@ make %{?_smp_mflags}
 
 %check
 # Two tests fail here, unclear as to why.
-make check ||:
+make check
 
 # Restore the clean copy of samples.
 # To be later listed against %doc.
@@ -93,8 +89,37 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/internal
 
 %changelog
-* Mon Jun  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.0-1
-- update to 1.3.0
+* Sat Nov 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.4.0-1
+- Version bump to 1.4.0.
+  * New feature: the event listener API.
+  * New feature: test shuffling.
+  * New feature: the XML report format is closer to junitreport and can
+    be parsed by Hudson now.
+  * New feature: elapsed time for the tests is printed by default.
+  * New feature: comes with a TR1 tuple implementation such that Boost
+    is no longer needed for Combine().
+  * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
+  * New feature: the Xcode project can now produce static gtest libraries in
+    addition to a framework.
+  * Compatibility fixes for gcc and minGW.
+  * Bug fixes and implementation clean-ups.
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-2.20090601svn257
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 01 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.0-1
+- Version bump to 1.3.0.
+  * New feature: ability to use Google Test assertions in other testing
+    frameworks.
+  * New feature: ability to run disabled test via
+    --gtest_also_run_disabled_tests.
+  * New feature: the --help flag for printing the usage.
+  * New feature: access to Google Test flag values in user code.
+  * New feature: a script that packs Google Test into one .h and one .cc file
+    for easy deployment.
+  * New feature: support for distributing test functions to multiple machines
+    (requires support from the test runner).
+  * Bug fixes and implementation clean-ups.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jun 2009 19:23:40 -0000	1.3
+++ sources	5 Dec 2009 15:10:25 -0000	1.4
@@ -1 +1 @@
-ec378387648dbfff9057134347ed6fe2  gtest-1.3.0.tar.bz2
+c91de493522cf1b75902d3b3730ff8de  gtest-1.4.0.tar.bz2


--- gtest-svnr257.patch DELETED ---



From notting at fedoraproject.org  Sat Dec  5 15:10:36 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Sat,  5 Dec 2009 15:10:36 +0000 (UTC)
Subject: File initscripts-9.02.1.tar.bz2 uploaded to lookaside cache by
	notting
Message-ID: <20091205151036.2605F10F895@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for initscripts:

00f9591e57228279130f7764cdbb32ff  initscripts-9.02.1.tar.bz2



From notting at fedoraproject.org  Sat Dec  5 15:10:44 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Sat,  5 Dec 2009 15:10:44 +0000 (UTC)
Subject: File initscripts-8.95.1.tar.bz2 uploaded to lookaside cache by
	notting
Message-ID: <20091205151044.3989410F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for initscripts:

1164e222fb37a80005038992c6f13189  initscripts-8.95.1.tar.bz2



From notting at fedoraproject.org  Sat Dec  5 15:10:53 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Sat,  5 Dec 2009 15:10:53 +0000 (UTC)
Subject: rpms/initscripts/F-12 .cvsignore, 1.172, 1.173 initscripts.spec,
	1.203, 1.204 sources, 1.191, 1.192
Message-ID: <20091205151053.A9D3011C03A3@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21032

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
9.02.1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/.cvsignore,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- .cvsignore	27 Oct 2009 20:19:58 -0000	1.172
+++ .cvsignore	5 Dec 2009 15:10:52 -0000	1.173
@@ -1 +1 @@
-initscripts-9.02.tar.bz2
+initscripts-9.02.1.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/initscripts.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- initscripts.spec	27 Oct 2009 20:19:58 -0000	1.203
+++ initscripts.spec	5 Dec 2009 15:10:53 -0000	1.204
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.02
+Version: 9.02.1
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -248,6 +248,12 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Fri Dec 04 2009 Bill Nottingham <notting at redhat.com> - 9.02.1-1
+- rc.sysinit: handle yet another random return string from dmraid
+- remove never-used 'sulogin' upstart event
+- fix time-setting udev rules for old-style RTC devices (#537595)
+- translation updates: el
+
 * Tue Oct 27 2009 Bill Nottingham <notting at redhat.com> - 9.02-1
 - remove long-since deprecated initlog
 - remove IUCV support (#507217)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/sources,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- sources	27 Oct 2009 20:19:58 -0000	1.191
+++ sources	5 Dec 2009 15:10:53 -0000	1.192
@@ -1 +1 @@
-bd631c5d6f319e25bf5a7209a29a32ec  initscripts-9.02.tar.bz2
+00f9591e57228279130f7764cdbb32ff  initscripts-9.02.1.tar.bz2



From notting at fedoraproject.org  Sat Dec  5 15:10:59 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Sat,  5 Dec 2009 15:10:59 +0000 (UTC)
Subject: rpms/initscripts/F-11 .cvsignore, 1.165, 1.166 initscripts.spec,
	1.194, 1.195 sources, 1.184, 1.185
Message-ID: <20091205151059.D7CB011C03A3@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21098

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.95.1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-11/.cvsignore,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- .cvsignore	1 May 2009 20:37:53 -0000	1.165
+++ .cvsignore	5 Dec 2009 15:10:59 -0000	1.166
@@ -1 +1 @@
-initscripts-8.95.tar.bz2
+initscripts-8.95.1.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-11/initscripts.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- initscripts.spec	1 May 2009 20:37:53 -0000	1.194
+++ initscripts.spec	5 Dec 2009 15:10:59 -0000	1.195
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.95
+Version: 8.95.1
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -249,6 +249,14 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Fri Dec  4 2009 Bill Nottingham <notting at redhat.com> - 8.95.1-1
+- halt: don't try and save mixer settings if it's not writable. (#515771)
+- rc.sysinit: restore context of recreated files. (#519748)
+- remove never-used 'sulogin' upstart event
+- rc, functions/rc1: redirect bash errors on 'unset' to /dev/null. (#482888)
+- rc.sysinit: fix dmraid partition naming (#501476, <hdegoede at redhat.com>)
+- rc: don't quote upstart signals. (#501155)
+
 * Fri May  1 2009 Bill Nottingham <notting at redhat.com> - 8.95-1
 - don't kill runlevel events on subsequent entering of the same runlevel (#498514)
 - lang.*sh: handle spaces in $HOME (#498482)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-11/sources,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- sources	1 May 2009 20:37:53 -0000	1.184
+++ sources	5 Dec 2009 15:10:59 -0000	1.185
@@ -1 +1 @@
-b3c74ef959cf07dd6f9ba4fa878bd559  initscripts-8.95.tar.bz2
+1164e222fb37a80005038992c6f13189  initscripts-8.95.1.tar.bz2



From sailer at fedoraproject.org  Sat Dec  5 15:12:07 2009
From: sailer at fedoraproject.org (sailer)
Date: Sat,  5 Dec 2009 15:12:07 +0000 (UTC)
Subject: rpms/mingw32-sqlite/devel .cvsignore, 1.5, 1.6 mingw32-sqlite.spec, 
	1.11, 1.12 sources, 1.5, 1.6
Message-ID: <20091205151207.3637711C0095@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21560

Modified Files:
	.cvsignore mingw32-sqlite.spec sources 
Log Message:
update to 3.6.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Sep 2009 00:00:11 -0000	1.5
+++ .cvsignore	5 Dec 2009 15:12:06 -0000	1.6
@@ -1,2 +1,3 @@
 sqlite-3.6.14.2.tar.gz
 sqlite-3.6.17.tar.gz
+sqlite-3.6.20.tar.gz


Index: mingw32-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/mingw32-sqlite.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-sqlite.spec	20 Sep 2009 00:00:11 -0000	1.11
+++ mingw32-sqlite.spec	5 Dec 2009 15:12:06 -0000	1.12
@@ -6,11 +6,11 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 # bcond default logic is nicely backwards...
-%bcond_without tcl
+%bcond_with tcl
 %global tclversion 8.5
 
 Name:           mingw32-sqlite
-Version:        3.6.17
+Version:        3.6.20
 Release:        1%{?dist}
 Summary:        MinGW Windows port of sqlite embeddable SQL database engine
 
@@ -26,7 +26,6 @@ BuildArch:      noarch
 Patch1:         sqlite-3.6.12-libdl.patch
 # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian 
 Patch2:         sqlite-3.6.6.2-lemon-snprintf.patch
-Patch3:         sqlite-3.6.13-iotest-nodirsync.patch
 
 # Patches for MinGW port.
 Patch1000:      mingw32-sqlite-3.6.12-no-undefined.patch
@@ -71,7 +70,6 @@ for Windows.
 %setup -q -n sqlite-%{version}
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
-%patch3 -p1 -b .nodirsync
 %patch1000 -p1
 
 # Ships with an old/broken version of libtool which cannot create
@@ -96,6 +94,12 @@ export MINGW32_CFLAGS="%{_mingw32_cflags
            --enable-threadsafe \
            --enable-threads-override-locks \
            --enable-load-extension
+
+# -lc hack
+sed -e s,build_libtool_need_lc=yes,build_libtool_need_lc=no, < libtool > libtool.x
+mv libtool.x libtool
+chmod a+x libtool
+
 make
 
 
@@ -108,6 +112,8 @@ rm $RPM_BUILD_ROOT%{_mingw32_libdir}/lib
 
 chmod 0644 $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3.dll.a
 
+mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3-0.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/
+
 %if %{with tcl}
 install -d -m755 $RPM_BUILD_ROOT%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/
 mv $RPM_BUILD_ROOT%{_datadir}/tcl%{tclversion}/sqlite3/pkgIndex.tcl $RPM_BUILD_ROOT%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/
@@ -122,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README VERSION
 %{_mingw32_bindir}/sqlite3.exe
 %{_mingw32_bindir}/libsqlite3-0.dll
+#%{_mingw32_bindir}/libsqlite3-0.dll.debug
 %{_mingw32_libdir}/libsqlite3.dll.a
 %{_mingw32_libdir}/libsqlite3.la
 %{_mingw32_includedir}/sqlite3.h
@@ -133,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.20-1
+- update to 3.6.20
+
 * Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.17-1
 - update to 3.6.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Sep 2009 00:00:11 -0000	1.5
+++ sources	5 Dec 2009 15:12:06 -0000	1.6
@@ -1 +1 @@
-f89f62afc765e08b3f0e47cdc47a15d4  sqlite-3.6.17.tar.gz
+0faf8fc8ccff5297513c6532b2b4ce23  sqlite-3.6.20.tar.gz



From rishi at fedoraproject.org  Sat Dec  5 15:12:58 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat,  5 Dec 2009 15:12:58 +0000 (UTC)
Subject: rpms/gtest/F-12 .cvsignore, 1.3, 1.4 gtest.spec, 1.4, 1.5 sources,
	1.3, 1.4 gtest-svnr257.patch, 1.1, NONE
Message-ID: <20091205151258.96F9511C0095@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gtest/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21956

Modified Files:
	.cvsignore gtest.spec sources 
Removed Files:
	gtest-svnr257.patch 
Log Message:
* Sat Nov 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.4.0-1
- Version bump to 1.4.0.
  * New feature: the event listener API.
  * New feature: test shuffling.
  * New feature: the XML report format is closer to junitreport and can
    be parsed by Hudson now.
  * New feature: elapsed time for the tests is printed by default.
  * New feature: comes with a TR1 tuple implementation such that Boost
    is no longer needed for Combine().
  * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
  * New feature: the Xcode project can now produce static gtest libraries in
    addition to a framework.
  * Compatibility fixes for gcc and minGW.
  * Bug fixes and implementation clean-ups.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jun 2009 19:23:40 -0000	1.3
+++ .cvsignore	5 Dec 2009 15:12:58 -0000	1.4
@@ -1 +1 @@
-gtest-1.3.0.tar.bz2
+gtest-1.4.0.tar.bz2


Index: gtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/F-12/gtest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gtest.spec	25 Jul 2009 01:38:56 -0000	1.4
+++ gtest.spec	5 Dec 2009 15:12:58 -0000	1.5
@@ -1,14 +1,11 @@
 Summary:	Google C++ testing framework
 Name:		gtest
-Version:	1.3.0
-Release:	2.20090601svn257%{?dist}
+Version:	1.4.0
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 URL:		http://code.google.com/p/googletest/
 Source0:	http://googletest.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Update to latest available SVN as of 20090601
-# Chromium needs at least 243.
-Patch0:		gtest-svnr257.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -33,7 +30,6 @@ This package contains development files 
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Keep a clean copy of samples.
 cp -pr ./samples ./samples.orig
@@ -48,7 +44,7 @@ make %{?_smp_mflags}
 
 %check
 # Two tests fail here, unclear as to why.
-make check ||:
+make check
 
 # Restore the clean copy of samples.
 # To be later listed against %doc.
@@ -93,11 +89,37 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/internal
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-2.20090601svn257
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jun  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.0-1
-- update to 1.3.0
+* Sat Nov 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.4.0-1
+- Version bump to 1.4.0.
+  * New feature: the event listener API.
+  * New feature: test shuffling.
+  * New feature: the XML report format is closer to junitreport and can
+    be parsed by Hudson now.
+  * New feature: elapsed time for the tests is printed by default.
+  * New feature: comes with a TR1 tuple implementation such that Boost
+    is no longer needed for Combine().
+  * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
+  * New feature: the Xcode project can now produce static gtest libraries in
+    addition to a framework.
+  * Compatibility fixes for gcc and minGW.
+  * Bug fixes and implementation clean-ups.
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-2.20090601svn257
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 01 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.0-1
+- Version bump to 1.3.0.
+  * New feature: ability to use Google Test assertions in other testing
+    frameworks.
+  * New feature: ability to run disabled test via
+    --gtest_also_run_disabled_tests.
+  * New feature: the --help flag for printing the usage.
+  * New feature: access to Google Test flag values in user code.
+  * New feature: a script that packs Google Test into one .h and one .cc file
+    for easy deployment.
+  * New feature: support for distributing test functions to multiple machines
+    (requires support from the test runner).
+  * Bug fixes and implementation clean-ups.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jun 2009 19:23:41 -0000	1.3
+++ sources	5 Dec 2009 15:12:58 -0000	1.4
@@ -1 +1 @@
-ec378387648dbfff9057134347ed6fe2  gtest-1.3.0.tar.bz2
+c91de493522cf1b75902d3b3730ff8de  gtest-1.4.0.tar.bz2


--- gtest-svnr257.patch DELETED ---



From rishi at fedoraproject.org  Sat Dec  5 15:15:27 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat,  5 Dec 2009 15:15:27 +0000 (UTC)
Subject: rpms/gtest/devel .cvsignore, 1.3, 1.4 gtest.spec, 1.4, 1.5 sources, 
	1.3, 1.4 gtest-svnr257.patch, 1.1, NONE
Message-ID: <20091205151527.6570011C0095@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gtest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22799

Modified Files:
	.cvsignore gtest.spec sources 
Removed Files:
	gtest-svnr257.patch 
Log Message:
* Sat Nov 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.4.0-1
- Version bump to 1.4.0.
  * New feature: the event listener API.
  * New feature: test shuffling.
  * New feature: the XML report format is closer to junitreport and can
    be parsed by Hudson now.
  * New feature: elapsed time for the tests is printed by default.
  * New feature: comes with a TR1 tuple implementation such that Boost
    is no longer needed for Combine().
  * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
  * New feature: the Xcode project can now produce static gtest libraries in
    addition to a framework.
  * Compatibility fixes for gcc and minGW.
  * Bug fixes and implementation clean-ups.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jun 2009 19:23:40 -0000	1.3
+++ .cvsignore	5 Dec 2009 15:15:27 -0000	1.4
@@ -1 +1 @@
-gtest-1.3.0.tar.bz2
+gtest-1.4.0.tar.bz2


Index: gtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/devel/gtest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gtest.spec	25 Jul 2009 01:38:56 -0000	1.4
+++ gtest.spec	5 Dec 2009 15:15:27 -0000	1.5
@@ -1,14 +1,11 @@
 Summary:	Google C++ testing framework
 Name:		gtest
-Version:	1.3.0
-Release:	2.20090601svn257%{?dist}
+Version:	1.4.0
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 URL:		http://code.google.com/p/googletest/
 Source0:	http://googletest.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Update to latest available SVN as of 20090601
-# Chromium needs at least 243.
-Patch0:		gtest-svnr257.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -33,7 +30,6 @@ This package contains development files 
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Keep a clean copy of samples.
 cp -pr ./samples ./samples.orig
@@ -48,7 +44,7 @@ make %{?_smp_mflags}
 
 %check
 # Two tests fail here, unclear as to why.
-make check ||:
+make check
 
 # Restore the clean copy of samples.
 # To be later listed against %doc.
@@ -93,11 +89,37 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/internal
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-2.20090601svn257
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jun  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.0-1
-- update to 1.3.0
+* Sat Nov 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.4.0-1
+- Version bump to 1.4.0.
+  * New feature: the event listener API.
+  * New feature: test shuffling.
+  * New feature: the XML report format is closer to junitreport and can
+    be parsed by Hudson now.
+  * New feature: elapsed time for the tests is printed by default.
+  * New feature: comes with a TR1 tuple implementation such that Boost
+    is no longer needed for Combine().
+  * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
+  * New feature: the Xcode project can now produce static gtest libraries in
+    addition to a framework.
+  * Compatibility fixes for gcc and minGW.
+  * Bug fixes and implementation clean-ups.
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-2.20090601svn257
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 01 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.0-1
+- Version bump to 1.3.0.
+  * New feature: ability to use Google Test assertions in other testing
+    frameworks.
+  * New feature: ability to run disabled test via
+    --gtest_also_run_disabled_tests.
+  * New feature: the --help flag for printing the usage.
+  * New feature: access to Google Test flag values in user code.
+  * New feature: a script that packs Google Test into one .h and one .cc file
+    for easy deployment.
+  * New feature: support for distributing test functions to multiple machines
+    (requires support from the test runner).
+  * Bug fixes and implementation clean-ups.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jun 2009 19:23:41 -0000	1.3
+++ sources	5 Dec 2009 15:15:27 -0000	1.4
@@ -1 +1 @@
-ec378387648dbfff9057134347ed6fe2  gtest-1.3.0.tar.bz2
+c91de493522cf1b75902d3b3730ff8de  gtest-1.4.0.tar.bz2


--- gtest-svnr257.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Dec  5 15:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:18:08 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20091205151808.BB15410F892@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora devel is now owned by rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:18:22 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20091205151822.A614610F878@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 10 is now owned by rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:18:27 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20091205151827.F354F10F894@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 11 is now owned by rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:20:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:20:46 +0000
Subject: [pkgdb] libopenraw: rishi has given up watchbugzilla
Message-ID: <20091205152046.4558910F878@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:20:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:20:46 +0000
Subject: [pkgdb] libopenraw: rishi has given up watchcommits
Message-ID: <20091205152046.E923110F894@bastion2.fedora.phx.redhat.com>

rishi has given up the watchcommits acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:20:47 +0000
Subject: [pkgdb] libopenraw: rishi has requested commit
Message-ID: <20091205152047.CA79D10F896@bastion2.fedora.phx.redhat.com>

rishi has requested the commit acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:20:50 +0000
Subject: [pkgdb] libopenraw: rishi has requested approveacls
Message-ID: <20091205152050.4273810F89C@bastion2.fedora.phx.redhat.com>

rishi has requested the approveacls acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:20:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:20:53 +0000
Subject: [pkgdb] libopenraw: rishi has given up watchbugzilla
Message-ID: <20091205152053.BF13510F89E@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:20:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:20:55 +0000
Subject: [pkgdb] libopenraw: rishi has given up watchcommits
Message-ID: <20091205152055.9209810F8A2@bastion2.fedora.phx.redhat.com>

rishi has given up the watchcommits acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:20:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:20:56 +0000
Subject: [pkgdb] libopenraw: rishi has given up commit
Message-ID: <20091205152056.9F62710F8A4@bastion2.fedora.phx.redhat.com>

rishi has given up the commit acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:20:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:20:58 +0000
Subject: [pkgdb] libopenraw: rishi has given up approveacls
Message-ID: <20091205152058.B257310F8A6@bastion2.fedora.phx.redhat.com>

rishi has given up the approveacls acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:08 +0000
Subject: [pkgdb] openvpn: huzaifas has requested commit
Message-ID: <20091205152108.5860010F8AF@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on openvpn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:07 +0000
Subject: [pkgdb] openvpn: huzaifas has given up watchbugzilla
Message-ID: <20091205152107.60AC110F8AB@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchbugzilla acl on openvpn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:09 +0000
Subject: [pkgdb] libopenraw: rishi has given up watchbugzilla
Message-ID: <20091205152110.1C7BA10F895@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:10 +0000
Subject: [pkgdb] openvpn: huzaifas has requested approveacls
Message-ID: <20091205152110.3706D10F8B0@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on openvpn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:11 +0000
Subject: [pkgdb] openvpn: huzaifas has given up watchcommits
Message-ID: <20091205152111.80B4A10F8B4@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchcommits acl on openvpn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:11 +0000
Subject: [pkgdb] libopenraw: rishi has given up watchbugzilla
Message-ID: <20091205152111.D073110F8B7@bastion2.fedora.phx.redhat.com>

rishi has given up the watchbugzilla acl on libopenraw (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:22 +0000
Subject: [pkgdb] openvpn: huzaifas has given up watchbugzilla
Message-ID: <20091205152122.DD24210F89C@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchbugzilla acl on openvpn (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:23 +0000
Subject: [pkgdb] openvpn: huzaifas has given up watchcommits
Message-ID: <20091205152123.CC40710F8BA@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchcommits acl on openvpn (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:27 +0000
Subject: [pkgdb] openvpn: huzaifas has requested commit
Message-ID: <20091205152127.49A3410F8BD@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on openvpn (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:30 +0000
Subject: [pkgdb] openvpn: huzaifas has requested approveacls
Message-ID: <20091205152130.922D210F8C1@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on openvpn (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From dledford at fedoraproject.org  Sat Dec  5 15:21:35 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sat,  5 Dec 2009 15:21:35 +0000 (UTC)
Subject: rpms/libibverbs/F-12 libibverbs.spec,1.18,1.19
Message-ID: <20091205152135.CE99811C0095@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libibverbs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24641

Modified Files:
	libibverbs.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.1.3-3
- Own the /etc/libibverbs.d directory



Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/F-12/libibverbs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libibverbs.spec	6 Nov 2009 16:54:05 -0000	1.18
+++ libibverbs.spec	5 Dec 2009 15:21:35 -0000	1.19
@@ -1,6 +1,6 @@
 Name: libibverbs
 Version: 1.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A library for direct userspace use of RDMA (InfiniBand/iWARP) hardware
 
 Group: System Environment/Libraries
@@ -55,19 +55,21 @@ displays information about RDMA devices.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
+mkdir -p -m755 %{buildroot}%{_sysconfdir}/libibverbs.d
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
+%dir %{_sysconfdir}/libibverbs.d
 %{_libdir}/libibverbs*.so.*
 %doc AUTHORS COPYING ChangeLog README
 
@@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.1.3-3
+- Own the /etc/libibverbs.d directory
+
 * Fri Nov 06 2009 Doug Ledford <dledford at redhat.com> - 1.1.3-2
 - Add Requires of -devel package to -devel-static package
 - Add Requires of libibverbs-driver (this pulls in the various driver packages



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:43 +0000
Subject: [pkgdb] openvpn: huzaifas has given up watchbugzilla
Message-ID: <20091205152143.F2BE210F8A6@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchbugzilla acl on openvpn (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:44 +0000
Subject: [pkgdb] openvpn: huzaifas has given up watchcommits
Message-ID: <20091205152144.7DA8C10F8C6@bastion2.fedora.phx.redhat.com>

huzaifas has given up the watchcommits acl on openvpn (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:46 +0000
Subject: [pkgdb] openvpn: huzaifas has requested approveacls
Message-ID: <20091205152146.BCB7510F8C8@bastion2.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on openvpn (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From paragn at fedoraproject.org  Sat Dec  5 15:21:59 2009
From: paragn at fedoraproject.org (paragn)
Date: Sat,  5 Dec 2009 15:21:59 +0000 (UTC)
Subject: rpms/v4l2-tool/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE db.patch, 1.2, NONE sources, 1.4,
	NONE v4l2-tool-1.0.3-lsusb.patch, 1.1, NONE v4l2-tool.spec, 1.7, NONE
Message-ID: <20091205152159.50F1011C0095@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/v4l2-tool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24323

Added Files:
	dead.package 
Removed Files:
	Makefile db.patch sources v4l2-tool-1.0.3-lsusb.patch 
	v4l2-tool.spec 
Log Message:
- No updates from upstream and development is dead.



--- NEW FILE dead.package ---


--- Makefile DELETED ---


--- db.patch DELETED ---


--- sources DELETED ---


--- v4l2-tool-1.0.3-lsusb.patch DELETED ---


--- v4l2-tool.spec DELETED ---



From pkgdb at fedoraproject.org  Sat Dec  5 15:21:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:21:51 +0000
Subject: [pkgdb] openvpn: huzaifas has requested commit
Message-ID: <20091205152151.A79C510F8CC@bastion2.fedora.phx.redhat.com>

huzaifas has requested the commit acl on openvpn (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvpn



From than at fedoraproject.org  Sat Dec  5 15:23:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:23:08 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11
	kdebase-runtime-4.3.1-backend-globalconfig.patch, NONE,
	1.1 kdebase-runtime.spec, 1.128, 1.129 sources, 1.37, 1.38
Message-ID: <20091205152308.927F711C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25212

Modified Files:
	kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.3.1-backend-globalconfig.patch 
Log Message:
4.3.4


kdebase-runtime-4.3.1-backend-globalconfig.patch:
 b/phonon/kcm/CMakeLists.txt                |    2 
 b/phonon/kcm/devicepreference.cpp          |  233 ++++------------------------
 b/phonon/kcm/devicepreference.h            |    1 
 b/phonon/kded-module/CMakeLists.txt        |   14 -
 b/phonon/kded-module/audiodeviceaccess.cpp |    6 
 b/phonon/kded-module/audiodeviceaccess.h   |    5 
 b/phonon/kded-module/phononserver.cpp      |  199 ------------------------
 b/phonon/kded-module/phononserver.h        |    2 
 phonon/kcm/devicepreference.cpp            |    4 
 phonon/kcm/globalconfig.cpp                |  235 -----------------------------
 phonon/kcm/globalconfig_p.h                |   63 -------
 11 files changed, 47 insertions(+), 717 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-backend-globalconfig.patch ---
diff --git a/phonon/kcm/CMakeLists.txt b/phonon/kcm/CMakeLists.txt
index 5ca78b7..9525607 100644
--- a/phonon/kcm/CMakeLists.txt
+++ b/phonon/kcm/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(xine)
 
-set(kcmphonon_SRCS main.cpp devicepreference.cpp backendselection.cpp globalconfig.cpp)
+set(kcmphonon_SRCS main.cpp devicepreference.cpp backendselection.cpp)
 kde4_add_ui_files(kcmphonon_SRCS devicepreference.ui backendselection.ui)
 
 kde4_add_plugin(kcm_phonon ${kcmphonon_SRCS})
diff --git a/phonon/kcm/devicepreference.cpp b/phonon/kcm/devicepreference.cpp
index 5065f3c..71e772b 100644
--- a/phonon/kcm/devicepreference.cpp
+++ b/phonon/kcm/devicepreference.cpp
@@ -34,11 +34,12 @@
 
 #include <Phonon/AudioOutput>
 #include <Phonon/MediaObject>
+#include <phonon/backendinterface.h>
 #include <phonon/backendcapabilities.h>
+#include <phonon/globalconfig.h>
 #include <phonon/objectdescription.h>
 #include <phonon/phononnamespace.h>
-#include "qsettingsgroup_p.h"
-#include "globalconfig_p.h"
+#include "factory_p.h"
 #include <kfadewidgeteffect.h>
 
 #include <kdialog.h>
@@ -55,8 +56,6 @@
 Q_DECLARE_METATYPE(QList<int>)
 #endif
 
-using Phonon::QSettingsGroup;
-
 static const Phonon::Category captureCategories[] = {
     Phonon::NoCategory,
     Phonon::CommunicationCategory,
@@ -318,111 +317,39 @@ void DevicePreference::updateAudioOutputDevices()
 
 QList<Phonon::AudioOutputDevice> DevicePreference::availableAudioOutputDevices() const
 {
-    QList<Phonon::AudioOutputDevice> ret;
-    const QList<int> deviceIndexes = Phonon::GlobalConfig().audioOutputDeviceListFor(Phonon::NoCategory,
-            showCheckBox->isChecked()
-            ? Phonon::GlobalConfig::ShowAdvancedDevices
-            : Phonon::GlobalConfig::HideAdvancedDevices);
-    foreach (int i, deviceIndexes) {
-        ret.append(Phonon::AudioOutputDevice::fromIndex(i));
-    }
-    return ret;
+    return Phonon::BackendCapabilities::availableAudioOutputDevices();
 }
 
 QList<Phonon::AudioCaptureDevice> DevicePreference::availableAudioCaptureDevices() const
 {
-    QList<Phonon::AudioCaptureDevice> ret;
-    const QList<int> deviceIndexes = Phonon::GlobalConfig().audioCaptureDeviceListFor(Phonon::NoCategory,
-            showCheckBox->isChecked()
-            ? Phonon::GlobalConfig::ShowAdvancedDevices
-            : Phonon::GlobalConfig::HideAdvancedDevices);
-    kDebug() << deviceIndexes;
-    foreach (int i, deviceIndexes) {
-        ret.append(Phonon::AudioCaptureDevice::fromIndex(i));
-    }
-    return ret;
+    return Phonon::BackendCapabilities::availableAudioCaptureDevices();
 }
 
 void DevicePreference::load()
 {
-    QSettings phononConfig(QLatin1String("kde.org"), QLatin1String("libphonon"));
-    QSettingsGroup outputDeviceGroup(&phononConfig, QLatin1String("AudioOutputDevice"));
-    QSettingsGroup captureDeviceGroup(&phononConfig, QLatin1String("AudioCaptureDevice"));
-    QSettingsGroup generalGroup(&phononConfig, QLatin1String("General"));
-    showCheckBox->setChecked(!generalGroup.value(QLatin1String("HideAdvancedDevices"), true));
-
-    {
-        // the following call returns ordered according to NoCategory
-        const QList<Phonon::AudioOutputDevice> list = availableAudioOutputDevices();
-        m_outputModel[Phonon::NoCategory]->setModelData(list);
-
-        QHash<int, Phonon::AudioOutputDevice> hash;
-        foreach (const Phonon::AudioOutputDevice &dev, list) {
-            hash.insert(dev.index(), dev);
-        }
-        for (int i = 0; i <= Phonon::LastCategory; ++i) {
-            const QString configKey(QLatin1String("Category_") + QString::number(i));
-            if (!outputDeviceGroup.hasKey(configKey)) {
-                m_outputModel[i]->setModelData(list); // use the NoCategory order
-                continue;
-            }
-            QHash<int, Phonon::AudioOutputDevice> hashCopy(hash);
-            const QList<int> order = outputDeviceGroup.value(configKey, QList<int>());
-            QList<Phonon::AudioOutputDevice> orderedList;
-            foreach (int idx, order) {
-                if (hashCopy.contains(idx)) {
-                    orderedList << hashCopy.take(idx);
-                }
-            }
-            if (hashCopy.size() > 1) {
-                // keep the order of the original list
-                foreach (const Phonon::AudioOutputDevice &dev, list) {
-                    if (hashCopy.contains(dev.index())) {
-                        orderedList << hashCopy.take(dev.index());
-                    }
-                }
-            } else if (hashCopy.size() == 1) {
-                orderedList += hashCopy.values();
-            }
-            m_outputModel[i]->setModelData(orderedList);
-        }
-    }
-    {
-        // the following call returns ordered according to NoCategory
-        QList<Phonon::AudioCaptureDevice> list = availableAudioCaptureDevices();
-        m_captureModel[Phonon::NoCategory]->setModelData(list);
+    showCheckBox->setChecked(!Phonon::GlobalConfig().getHideAdvancedDevices());
+    loadCategoryDevices();
+}
 
-        QHash<int, Phonon::AudioCaptureDevice> hash;
-        foreach (const Phonon::AudioCaptureDevice &dev, list) {
-            hash.insert(dev.index(), dev);
+void DevicePreference::loadCategoryDevices()
+{
+    // "Load" the settings from the backend.
+    for (Phonon::Category cat = Phonon::NoCategory; cat <= Phonon::LastCategory; ++cat) {
+        QList<Phonon::AudioOutputDevice> list;
+        const QList<int> deviceIndexes = Phonon::GlobalConfig().audioOutputDeviceListFor(cat);
+        foreach (int i, deviceIndexes) {
+            list.append(Phonon::AudioOutputDevice::fromIndex(i));
         }
-        for (int i = 1; i < captureCategoriesCount; ++i) { // i == 1 to skip NoCategory
-            const Phonon::Category cat = captureCategories[i];
-            const QString configKey(QLatin1String("Category_") + QString::number(cat));
-            if (!captureDeviceGroup.hasKey(configKey)) {
-                m_captureModel[cat]->setModelData(list); // use the NoCategory order
-                continue;
-            }
-            QHash<int, Phonon::AudioCaptureDevice> hashCopy(hash);
-            const QList<int> order = captureDeviceGroup.value(configKey, QList<int>());
-            QList<Phonon::AudioCaptureDevice> orderedList;
-            foreach (int idx, order) {
-                if (hashCopy.contains(idx)) {
-                    orderedList << hashCopy.take(idx);
-                }
-            }
-            if (hashCopy.size() > 1) {
-                // keep the order of the original list
-                foreach (const Phonon::AudioCaptureDevice &dev, list) {
-                    if (hashCopy.contains(dev.index())) {
-                        orderedList << hashCopy.take(dev.index());
-                    }
-                }
-            } else if (hashCopy.size() == 1) {
-                orderedList += hashCopy.values();
-            }
-            m_captureModel[cat]->setModelData(orderedList);
+        m_outputModel[cat]->setModelData(list);
+    }
+    for (int i = 0; i < captureCategoriesCount; ++i) {
+        const Phonon::Category cat = captureCategories[i];
+        QList<Phonon::AudioCaptureDevice> list;
+        const QList<int> deviceIndexes = Phonon::GlobalConfig().audioCaptureDeviceListFor(cat);
+        foreach (int i, deviceIndexes) {
+            list.append(Phonon::AudioCaptureDevice::fromIndex(i));
         }
+        m_captureModel[cat]->setModelData(list);
     }
 
     deviceList->resizeColumnToContents(0);
@@ -430,11 +357,6 @@ void DevicePreference::load()
 
 void DevicePreference::save()
 {
-    QSettings config(QLatin1String("kde.org"), QLatin1String("libphonon"));
-    {
-        QSettingsGroup generalGroup(&config, QLatin1String("General"));
-        generalGroup.setValue(QLatin1String("HideAdvancedDevices"), !showCheckBox->isChecked());
-    }
     if (!m_removeOnApply.isEmpty()) {
         QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kded", "/modules/phononserver",
                 "org.kde.PhononServer", "removeAudioDevices");
@@ -442,34 +364,17 @@ void DevicePreference::save()
         QDBusConnection::sessionBus().send(msg);
         m_removeOnApply.clear();
     }
-    {
-        QSettingsGroup globalGroup(&config, QLatin1String("AudioOutputDevice"));
-        const QList<int> noCategoryOrder = m_outputModel.value(Phonon::NoCategory)->tupleIndexOrder();
-        globalGroup.setValue(QLatin1String("Category_") + QString::number(Phonon::NoCategory), noCategoryOrder);
-        for (int i = 0; i <= Phonon::LastCategory; ++i) {
-            Q_ASSERT(m_outputModel.value(i));
-            const QList<int> order = m_outputModel.value(i)->tupleIndexOrder();
-            if (order == noCategoryOrder) {
-                globalGroup.removeEntry(QLatin1String("Category_") + QString::number(i));
-            } else {
-                globalGroup.setValue(QLatin1String("Category_") + QString::number(i), order);
-            }
-        }
+
+    for (Phonon::Category cat = Phonon::NoCategory; cat <= Phonon::LastCategory; ++cat) {
+        Q_ASSERT(m_outputModel.value(cat));
+        const QList<int> order = m_outputModel.value(cat)->tupleIndexOrder();
+        Phonon::GlobalConfig().setAudioOutputDeviceListFor(cat, order);
     }
-    {
-        QSettingsGroup globalGroup(&config, QLatin1String("AudioCaptureDevice"));
-        const QList<int> noCategoryOrder = m_captureModel.value(Phonon::NoCategory)->tupleIndexOrder();
-        globalGroup.setValue(QLatin1String("Category_") + QString::number(Phonon::NoCategory), noCategoryOrder);
-        for (int i = 1; i < captureCategoriesCount; ++i) {
-            const Phonon::Category cat = captureCategories[i];
-            Q_ASSERT(m_captureModel.value(cat));
-            const QList<int> order = m_captureModel.value(cat)->tupleIndexOrder();
-            if (order == noCategoryOrder) {
-                globalGroup.removeEntry(QLatin1String("Category_") + QString::number(cat));
-            } else {
-                globalGroup.setValue(QLatin1String("Category_") + QString::number(cat), order);
-            }
-        }
+    for (int i = 1; i < captureCategoriesCount; ++i) {
+        const Phonon::Category cat = captureCategories[i];
+        Q_ASSERT(m_captureModel.value(cat));
+        const QList<int> order = m_captureModel.value(cat)->tupleIndexOrder();
+        Phonon::GlobalConfig().setAudioCaptureDeviceListFor(cat, order);
     }
 }
 
@@ -638,70 +543,10 @@ void DevicePreference::on_applyPreferencesButton_clicked()
 
 void DevicePreference::on_showCheckBox_toggled()
 {
-    {
-        // the following call returns ordered according to NoCategory
-        const QList<Phonon::AudioOutputDevice> list = availableAudioOutputDevices();
-        m_outputModel[Phonon::NoCategory]->setModelData(list);
-
-        QHash<int, Phonon::AudioOutputDevice> hash;
-        foreach (const Phonon::AudioOutputDevice &dev, list) {
-            hash.insert(dev.index(), dev);
-        }
-        for (int i = 0; i <= Phonon::LastCategory; ++i) {
-            QHash<int, Phonon::AudioOutputDevice> hashCopy(hash);
-            const QList<int> order = m_outputModel[i]->tupleIndexOrder();
-            QList<Phonon::AudioOutputDevice> orderedList;
-            foreach (int idx, order) {
-                if (hashCopy.contains(idx)) {
-                    orderedList << hashCopy.take(idx);
-                }
-            }
-            if (hashCopy.size() > 1) {
-                // keep the order of the original list
-                foreach (const Phonon::AudioOutputDevice &dev, list) {
-                    if (hashCopy.contains(dev.index())) {
-                        orderedList << hashCopy.take(dev.index());
-                    }
-                }
-            } else if (hashCopy.size() == 1) {
-                orderedList += hashCopy.values();
-            }
-            m_outputModel[i]->setModelData(orderedList);
-        }
-    }
-    {
-        // the following call returns ordered according to NoCategory
-        const QList<Phonon::AudioCaptureDevice> list = availableAudioCaptureDevices();
-        m_captureModel[Phonon::NoCategory]->setModelData(list);
-
-        QHash<int, Phonon::AudioCaptureDevice> hash;
-        foreach (const Phonon::AudioCaptureDevice &dev, list) {
-            hash.insert(dev.index(), dev);
-        }
-        for (int i = 1; i < captureCategoriesCount; ++i) {
-            const Phonon::Category cat = captureCategories[i];
-            QHash<int, Phonon::AudioCaptureDevice> hashCopy(hash);
-            const QList<int> order = m_captureModel[cat]->tupleIndexOrder();
-            QList<Phonon::AudioCaptureDevice> orderedList;
-            foreach (int idx, order) {
-                if (hashCopy.contains(idx)) {
-                    orderedList << hashCopy.take(idx);
-                }
-            }
-            if (hashCopy.size() > 1) {
-                // keep the order of the original list
-                foreach (const Phonon::AudioCaptureDevice &dev, list) {
-                    if (hashCopy.contains(dev.index())) {
-                        orderedList << hashCopy.take(dev.index());
-                    }
-                }
-            } else if (hashCopy.size() == 1) {
-                orderedList += hashCopy.values();
-            }
-            m_captureModel[cat]->setModelData(orderedList);
-        }
-    }
-    deviceList->resizeColumnToContents(0);
+    // In order to get the right list from the backend, we need to update the settings now
+    // before calling availableAudio{Output,Capture}Devices()
+    Phonon::GlobalConfig().hideAdvancedDevices(!showCheckBox->isChecked());
+    loadCategoryDevices();
 }
 
 void DevicePreference::on_testPlaybackButton_toggled(bool down)
diff --git a/phonon/kcm/devicepreference.h b/phonon/kcm/devicepreference.h
index 83af859..dfd60d2 100644
--- a/phonon/kcm/devicepreference.h
+++ b/phonon/kcm/devicepreference.h
@@ -64,6 +64,7 @@ class DevicePreference : public QWidget, private Ui::DevicePreference
     private:
         template<Phonon::ObjectDescriptionType T> void removeDevice(const Phonon::ObjectDescription<T> &deviceToRemove,
                 QMap<int, Phonon::ObjectDescriptionModel<T> *> *modelMap);
+        void loadCategoryDevices();
         QList<Phonon::AudioOutputDevice> availableAudioOutputDevices() const;
         QList<Phonon::AudioCaptureDevice> availableAudioCaptureDevices() const;
         QList<int> m_removeOnApply;
diff --git a/phonon/kcm/globalconfig.cpp b/phonon/kcm/globalconfig.cpp
deleted file mode 100644
index 4e3a315..0000000
--- a/phonon/kcm/globalconfig.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2006-2008 Matthias Kretz <kretz at kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License version 2 as published by the Free Software Foundation.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-
-*/
-
-#include "globalconfig_p.h"
-
-#include "factory_p.h"
-#include "phonon/objectdescription.h"
-#include "phonondefs_p.h"
-#include "phonon/platformplugin.h"
-#include "phonon/backendinterface.h"
-#include "qsettingsgroup_p.h"
-#include "phononnamespace_p.h"
-
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-
-QT_BEGIN_NAMESPACE
-
-namespace Phonon
-{
-
-GlobalConfig::GlobalConfig(QObject *parent)
-    : QObject(parent)
-    , m_config(QLatin1String("kde.org"), QLatin1String("libphonon"))
-{
-}
-
-GlobalConfig::~GlobalConfig()
-{
-}
-
-enum WhatToFilter {
-    FilterAdvancedDevices = 1,
-    FilterHardwareDevices = 2
-};
-
-static void filter(ObjectDescriptionType type, BackendInterface *backendIface, QList<int> *list, int whatToFilter)
-{
-    QMutableListIterator<int> it(*list);
-    while (it.hasNext()) {
-        const QHash<QByteArray, QVariant> properties = backendIface->objectDescriptionProperties(type, it.next());
-        QVariant var;
-        if (whatToFilter & FilterAdvancedDevices) {
-            var = properties.value("isAdvanced");
-            if (var.isValid() && var.toBool()) {
-                it.remove();
-                continue;
-            }
-        }
-        if (whatToFilter & FilterHardwareDevices) {
-            var = properties.value("isHardwareDevice");
-            if (var.isValid() && var.toBool()) {
-                it.remove();
-                continue;
-            }
-        }
-    }
-}
-
-static QList<int> listSortedByConfig(const QSettingsGroup &backendConfig, Phonon::Category category, QList<int> &defaultList)
-{
-    if (defaultList.size() <= 1) {
-        // nothing to sort
-        return defaultList;
-    } else {
-        // make entries unique
-        QSet<int> seen;
-        QMutableListIterator<int> it(defaultList);
-        while (it.hasNext()) {
-            if (seen.contains(it.next())) {
-                it.remove();
-            } else {
-                seen.insert(it.value());
-            }
-        }
-    }
-
-    QString categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(category));
-    if (!backendConfig.hasKey(categoryKey)) {
-        // no list in config for the given category
-        categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(Phonon::NoCategory));
-        if (!backendConfig.hasKey(categoryKey)) {
-            // no list in config for NoCategory
-            return defaultList;
-        }
-    }
-
-    //Now the list from m_config
-    QList<int> deviceList = backendConfig.value(categoryKey, QList<int>());
-
-    //if there are devices in m_config that the backend doesn't report, remove them from the list
-    QMutableListIterator<int> i(deviceList);
-    while (i.hasNext()) {
-        if (0 == defaultList.removeAll(i.next())) {
-            i.remove();
-        }
-    }
-
-    //if the backend reports more devices that are not in m_config append them to the list
-    deviceList += defaultList;
-
-    return deviceList;
-}
-
-QList<int> GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override) const
-{
-    //The devices need to be stored independently for every backend
-    const QSettingsGroup backendConfig(&m_config, QLatin1String("AudioOutputDevice")); // + Factory::identifier());
-    const QSettingsGroup generalGroup(&m_config, QLatin1String("General"));
-    const bool hideAdvancedDevices = (override == FromSettings
-            ? generalGroup.value(QLatin1String("HideAdvancedDevices"), true)
-            : static_cast<bool>(override));
-
-    PlatformPlugin *platformPlugin = Factory::platformPlugin();
-    BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
-
-    QList<int> defaultList;
-    if (platformPlugin) {
-        // the platform plugin lists the audio devices for the platform
-        // this list already is in default order (as defined by the platform plugin)
-        defaultList = platformPlugin->objectDescriptionIndexes(Phonon::AudioOutputDeviceType);
-        if (hideAdvancedDevices) {
-            QMutableListIterator<int> it(defaultList);
-            while (it.hasNext()) {
-                AudioOutputDevice objDesc = AudioOutputDevice::fromIndex(it.next());
-                const QVariant var = objDesc.property("isAdvanced");
-                if (var.isValid() && var.toBool()) {
-                    it.remove();
-                }
-            }
-        }
-    }
-
-    // lookup the available devices directly from the backend (mostly for virtual devices)
-    if (backendIface) {
-        // this list already is in default order (as defined by the backend)
-        QList<int> list = backendIface->objectDescriptionIndexes(Phonon::AudioOutputDeviceType);
-        if (hideAdvancedDevices || !defaultList.isEmpty()) {
-            filter(AudioOutputDeviceType, backendIface, &list,
-                    (hideAdvancedDevices ? FilterAdvancedDevices : 0)
-                    // the platform plugin already provided the hardware devices
-                    | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
-                    );
-        }
-        defaultList += list;
-    }
-
-    return listSortedByConfig(backendConfig, category, defaultList);
-}
-
-int GlobalConfig::audioOutputDeviceFor(Phonon::Category category) const
-{
-    const QList<int> ret = audioOutputDeviceListFor(category);
-    if (ret.isEmpty())
-        return -1;
-    return ret.first();
-}
-
-QList<int> GlobalConfig::audioCaptureDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override) const
-{
-    //The devices need to be stored independently for every backend
-    const QSettingsGroup backendConfig(&m_config, QLatin1String("AudioCaptureDevice")); // + Factory::identifier());
-    const QSettingsGroup generalGroup(&m_config, QLatin1String("General"));
-    const bool hideAdvancedDevices = (override == FromSettings
-            ? generalGroup.value(QLatin1String("HideAdvancedDevices"), true)
-            : static_cast<bool>(override));
-
-    PlatformPlugin *platformPlugin = Factory::platformPlugin();
-    BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
-
-    QList<int> defaultList;
-    if (platformPlugin) {
-        // the platform plugin lists the audio devices for the platform
-        // this list already is in default order (as defined by the platform plugin)
-        defaultList = platformPlugin->objectDescriptionIndexes(Phonon::AudioCaptureDeviceType);
-        if (hideAdvancedDevices) {
-            QMutableListIterator<int> it(defaultList);
-            while (it.hasNext()) {
-                AudioCaptureDevice objDesc = AudioCaptureDevice::fromIndex(it.next());
-                const QVariant var = objDesc.property("isAdvanced");
-                if (var.isValid() && var.toBool()) {
-                    it.remove();
-                }
-            }
-        }
-    }
-
-    // lookup the available devices directly from the backend (mostly for virtual devices)
-    if (backendIface) {
-        // this list already is in default order (as defined by the backend)
-        QList<int> list = backendIface->objectDescriptionIndexes(Phonon::AudioCaptureDeviceType);
-        if (hideAdvancedDevices || !defaultList.isEmpty()) {
-            filter(AudioCaptureDeviceType, backendIface, &list,
-                    (hideAdvancedDevices ? FilterAdvancedDevices : 0)
-                    // the platform plugin already provided the hardware devices
-                    | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
-                  );
-        }
-        defaultList += list;
-    }
-
-    return listSortedByConfig(backendConfig, category, defaultList);
-}
-
-int GlobalConfig::audioCaptureDeviceFor(Phonon::Category category) const
-{
-    QList<int> ret = audioCaptureDeviceListFor(category);
-    if (ret.isEmpty())
-        return -1;
-    return ret.first();
-}
-
-} // namespace Phonon
-
-QT_END_NAMESPACE
-
-#include "moc_globalconfig_p.cpp"
-
-// vim: sw=4 ts=4
diff --git a/phonon/kcm/globalconfig_p.h b/phonon/kcm/globalconfig_p.h
deleted file mode 100644
index ca4dca6..0000000
--- a/phonon/kcm/globalconfig_p.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  This file is part of the KDE project
-Copyright (C) 2006-2008 Matthias Kretz <kretz at kde.org>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License version 2 as published by the Free Software Foundation.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with this library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
-
-*/
-
-#ifndef PHONON_GLOBALCONFIG_P_H
-#define PHONON_GLOBALCONFIG_P_H
-
-#include <QtCore/QObject>
-#include <QtCore/QSettings>
-
-#include "phonon/phononnamespace.h"
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-namespace Phonon
-{
-    class GlobalConfig : public QObject
-    {
-        Q_OBJECT
-    public:
-        GlobalConfig(QObject *parent = 0);
-        ~GlobalConfig();
-
-        enum HideAdvancedDevicesOverride {
-            ShowAdvancedDevices = 0,
-            HideAdvancedDevices = 1,
-            FromSettings = 2
-        };
-        QList<int> audioOutputDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override = FromSettings) const;
-        int audioOutputDeviceFor(Phonon::Category category) const;
-
-        QList<int> audioCaptureDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override = FromSettings) const;
-        int audioCaptureDeviceFor(Phonon::Category category) const;
-
-    Q_SIGNALS:
-        void audioOutputDeviceConfigChanged();
-        void audioCaptureDeviceConfigChanged();
-
-    private:
-        QSettings m_config;
-    };
-} // namespace Phonon
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#endif // PHONON_GLOBALCONFIG_P_H
diff --git a/phonon/kded-module/CMakeLists.txt b/phonon/kded-module/CMakeLists.txt
index 17e7742..b2c5697 100644
--- a/phonon/kded-module/CMakeLists.txt
+++ b/phonon/kded-module/CMakeLists.txt
@@ -9,17 +9,7 @@ set(HAVE_CURRENT_ALSA FALSE)
 #   macro_log_feature(HAVE_CURRENT_ALSA "ALSA" "current alsa-lib is needed for dmix and virtual device listing" "http://www.alsa-project.org/" TRUE "1.0.14a")
 #endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
-macro_optional_find_package(PulseAudio)
-macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "A cross-platform, networked sound server." "http://www.pulseaudio.org" FALSE "" "Allows audio playback via the PulseAudio soundserver when it is running")
-
-if(PULSEAUDIO_FOUND)
-   add_definitions(-DHAVE_PULSEAUDIO)
-else(PULSEAUDIO_FOUND)
-   set(PULSEAUDIO_INCLUDE_DIR "")
-   set(PULSEAUDIO_LIBRARY "")
-endif(PULSEAUDIO_FOUND)
-
-include_directories(${ALSA_INCLUDES} ${PULSEAUDIO_INCLUDE_DIR})
+include_directories(${ALSA_INCLUDES})
 
 set(kded_phonon_SRCS
    phononserver.cpp
@@ -29,7 +19,7 @@ set(kded_phonon_SRCS
    )
 
 kde4_add_plugin(kded_phononserver ${kded_phonon_SRCS})
-target_link_libraries(kded_phononserver ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${ASOUND_LIBRARY} ${PULSEAUDIO_LIBRARY})
+target_link_libraries(kded_phononserver ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${ASOUND_LIBRARY})
 install(TARGETS kded_phononserver  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 install(FILES phononserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
diff --git a/phonon/kded-module/audiodeviceaccess.cpp b/phonon/kded-module/audiodeviceaccess.cpp
index 6792e72..5815502 100644
--- a/phonon/kded-module/audiodeviceaccess.cpp
+++ b/phonon/kded-module/audiodeviceaccess.cpp
@@ -44,14 +44,8 @@ const QString PS::AudioDeviceAccess::driverName() const
         return i18n("ALSA");
     case OssDriver:
         return i18n("OSS");
-    case PulseAudioDriver:
-        return i18n("PulseAudio");
     case JackdDriver:
         return i18n("Jack");
-    case EsdDriver:
-        return i18n("ESD");
-    case ArtsDriver:
-        return i18n("aRts");
     }
     return QString();
 }
diff --git a/phonon/kded-module/audiodeviceaccess.h b/phonon/kded-module/audiodeviceaccess.h
index 4513419..70a8b3f 100644
--- a/phonon/kded-module/audiodeviceaccess.h
+++ b/phonon/kded-module/audiodeviceaccess.h
@@ -33,10 +33,7 @@ class AudioDeviceAccess
             InvalidDriver = 0,
             AlsaDriver,
             OssDriver,
-            PulseAudioDriver,
-            JackdDriver,
-            EsdDriver,
-            ArtsDriver
+            JackdDriver
         };
 
         inline AudioDeviceAccess(const QStringList &deviceIds, int accessPreference,
diff --git a/phonon/kded-module/phononserver.cpp b/phonon/kded-module/phononserver.cpp
index b76e08c..5dbd17e 100644
--- a/phonon/kded-module/phononserver.cpp
+++ b/phonon/kded-module/phononserver.cpp
@@ -45,10 +45,6 @@
 #include <Solid/Device>
 #include <Solid/DeviceNotifier>
 
-#ifdef HAVE_PULSEAUDIO
-#include <pulse/pulseaudio.h>
-#endif // HAVE_PULSEAUDIO
-
 #include <../config-alsa.h>
 #ifdef HAVE_LIBASOUND2
 #include <alsa/asoundlib.h>
@@ -334,128 +330,6 @@ static void removeOssOnlyDevices(QList<PS::AudioDevice> *list)
     }
 }
 
-#ifdef HAVE_PULSEAUDIO
-class PulseDetectionUserData
-{
-    public:
-        inline PulseDetectionUserData(PhononServer *p, pa_mainloop_api *api)
-            : phononServer(p), mainloopApi(api), ready(2),
-            alsaHandleMatches(QLatin1String(".*\\s(plughw|hw|front|surround\\d\\d):(\\d+)\\s.*")),
-            captureNameMatches(QLatin1String(".*_sound_card_(\\d+)_.*_(?:playback|capture)_(\\d+)(\\.monitor)?")),
-            playbackNameMatches(QLatin1String(".*_sound_card_(\\d+)_.*_playback_(\\d+)"))
-        {}
-
-        PhononServer *const phononServer;
-        QList<QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess> > sinks;
-        QList<QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess> > sources;
-
-        inline void eol() { if (--ready == 0) { quit(); } }
-        inline void quit() { mainloopApi->quit(mainloopApi, 0); }
-    private:
-        pa_mainloop_api *const mainloopApi;
-        int ready;
-    public:
-        QRegExp alsaHandleMatches;
-        QRegExp captureNameMatches;
-        QRegExp playbackNameMatches;
-};
-
-static void pulseSinkInfoListCallback(pa_context *context, const pa_sink_info *i, int eol, void *userdata)
-{
-    PulseDetectionUserData *d = reinterpret_cast<PulseDetectionUserData *>(userdata);
-    if (eol) {
-        d->eol();
-        return;
-    }
-    Q_ASSERT(i);
-    kDebug(601).nospace()
-        << "name: " << i->name
-        << ", index: " << i->index
-        << ", description: " << i->description
-        << ", sample_spec: " << i->sample_spec.format << i->sample_spec.rate << i->sample_spec.channels
-        << ", channel_map: " << i->channel_map.channels << i->channel_map.map
-        << ", owner_module: " << i->owner_module
-        //<< ", volume: " << i->volume
-        << ", mute: " << i->mute
-        << ", monitor_source: " << i->monitor_source
-        << ", latency: " << i->latency
-        << ", driver: " << i->driver
-        << ", flags: " << i->flags;
-    const QString &handle = QString::fromUtf8(i->name);
-    if (d->playbackNameMatches.exactMatch(handle)) {
-        const QString &description = QString::fromUtf8(i->description);
-        const bool m = d->alsaHandleMatches.exactMatch(description);
-        const int cardNumber = m ? d->alsaHandleMatches.cap(2).toInt() : -1; // card_name_X in the name always has X == 0 ;( so we can't use d->playbackNameMatches.cap(1).toInt();
-        const int deviceNumber = d->playbackNameMatches.cap(2).toInt();
-        const PS::AudioDeviceKey key = { QString(), cardNumber, deviceNumber };
-        const PS::AudioDeviceAccess access(QStringList(QString::fromUtf8(pa_context_get_server(context)) + QLatin1Char('\n') + handle), 30, PS::AudioDeviceAccess::PulseAudioDriver, false, true);
-        d->sinks << QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess>(key, access);
-    }
-}
-
-static void pulseSourceInfoListCallback(pa_context *context, const pa_source_info *i, int eol, void *userdata)
-{
-    PulseDetectionUserData *d = reinterpret_cast<PulseDetectionUserData *>(userdata);
-    if (eol) {
-        d->eol();
-        return;
-    }
-    Q_ASSERT(i);
-    kDebug(601).nospace()
-        << "name: " << i->name
-        << ", index: " << i->index
-        << ", description: " << i->description
-        << ", sample_spec: " << i->sample_spec.format << i->sample_spec.rate << i->sample_spec.channels
-        << ", channel_map: " << i->channel_map.channels << i->channel_map.map
-        << ", owner_module: " << i->owner_module
-        //<< ", volume: " << i->volume
-        << ", mute: " << i->mute
-        << ", monitor_of_sink: " << i->monitor_of_sink
-        << ", monitor_of_sink_name: " << i->monitor_of_sink_name
-        << ", latency: " << i->latency
-        << ", driver: " << i->driver
-        << ", flags: " << i->flags;
-    const QString &handle = QString::fromUtf8(i->name);
-    if (d->captureNameMatches.exactMatch(handle)) {
-        if (d->captureNameMatches.cap(3).isEmpty()) {
-            const QString &description = QString::fromUtf8(i->description);
-            const bool m = d->alsaHandleMatches.exactMatch(description);
-            const int cardNumber = m ? d->alsaHandleMatches.cap(2).toInt() : d->captureNameMatches.cap(1).toInt();
-            const int deviceNumber = d->captureNameMatches.cap(2).toInt();
-            const PS::AudioDeviceKey key = {
-                d->captureNameMatches.cap(3).isEmpty() ? QString() : handle, cardNumber, deviceNumber
-            };
-            const PS::AudioDeviceAccess access(QStringList(QString::fromUtf8(pa_context_get_server(context)) + QLatin1Char(':') + handle), 30, PS::AudioDeviceAccess::PulseAudioDriver, true, false);
-            d->sources << QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess>(key, access);
-        } else {
-            const PS::AudioDeviceKey key = {
-                QString::fromUtf8(i->description), -2, -2
-            };
-            const PS::AudioDeviceAccess access(QStringList(QString::fromUtf8(pa_context_get_server(context)) + QLatin1Char(':') + handle), 30, PS::AudioDeviceAccess::PulseAudioDriver, true, false);
-            d->sources << QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess>(key, access);
-        }
-    }
-}
-
-static void pulseContextStateCallback(pa_context *context, void *userdata)
-{
-    switch (pa_context_get_state(context)) {
-    case PA_CONTEXT_READY:
-        /*pa_operation *op1 =*/ pa_context_get_sink_info_list(context, &pulseSinkInfoListCallback, userdata);
-        /*pa_operation *op2 =*/ pa_context_get_source_info_list(context, &pulseSourceInfoListCallback, userdata);
-        break;
-    case PA_CONTEXT_FAILED:
-        {
-            PulseDetectionUserData *d = reinterpret_cast<PulseDetectionUserData *>(userdata);
-            d->quit();
-        }
-        break;
-    default:
-        break;
-    }
-}
-#endif // HAVE_PULSEAUDIO
-
 void PhononServer::findDevices()
 {
     QHash<PS::AudioDeviceKey, PS::AudioDevice> playbackDevices;
@@ -630,73 +504,6 @@ void PhononServer::findDevices()
     m_audioOutputDevices = playbackDevices.values();
     m_audioCaptureDevices = captureDevices.values();
 
-#ifdef HAVE_PULSEAUDIO
-    {
-        pa_mainloop *mainloop = pa_mainloop_new();
-        Q_ASSERT(mainloop);
-        pa_mainloop_api *mainloopApi = pa_mainloop_get_api(mainloop);
-        PulseDetectionUserData userData(this, mainloopApi);
-        // XXX I don't want to show up in the client list. All I want to know is the list of sources
-        // and sinks...
-        pa_context *context = pa_context_new(mainloopApi, "KDE");
-        // XXX stupid cast. report a bug about a missing enum value
-        if (pa_context_connect(context, NULL, static_cast<pa_context_flags_t>(0), 0) >= 0) {
-            pa_context_set_state_callback(context, &pulseContextStateCallback, &userData);
-            pa_mainloop_run(mainloop, NULL);
-            pa_context_disconnect(context);
-        }
-        pa_mainloop_free(mainloop);
-        kDebug(601) << "pulse sources:" << userData.sources;
-        kDebug(601) << "pulse sinks:  " << userData.sinks;
-        QMutableListIterator<PS::AudioDevice> it(m_audioOutputDevices);
-        typedef QPair<PS::AudioDeviceKey, PS::AudioDeviceAccess> MyPair;
-        static int uniqueDeviceNumber = -2;
-        foreach (const MyPair &pair, userData.sinks) {
-            it.toFront();
-            bool needNewDeviceObject = true;
-            while (it.hasNext()) {
-                PS::AudioDevice &dev = it.next();
-                if (dev.key() == pair.first) {
-                    dev.addAccess(pair.second);
-                    needNewDeviceObject = false;
-                    continue;
-                }
-            }
-            if (needNewDeviceObject) {
-                const PS::AudioDeviceKey key = {
-                    pair.second.deviceIds().first() + QLatin1String("playback"),
-                    -1, --uniqueDeviceNumber
-                };
-                PS::AudioDevice dev(pair.first.uniqueId, QLatin1String("audio-backend-pulseaudio"), key, 0, true);
-                dev.addAccess(pair.second);
-                m_audioOutputDevices.append(dev);
-            }
-        }
-        it = m_audioCaptureDevices;
-        foreach (const MyPair &pair, userData.sources) {
-            it.toFront();
-            bool needNewDeviceObject = true;
-            while (it.hasNext()) {
-                PS::AudioDevice &dev = it.next();
-                if (dev.key() == pair.first) {
-                    dev.addAccess(pair.second);
-                    needNewDeviceObject = false;
-                    continue;
-                }
-            }
-            if (needNewDeviceObject) {
-                const PS::AudioDeviceKey key = {
-                    pair.second.deviceIds().first() + QLatin1String("capture"),
-                    -1, --uniqueDeviceNumber
-                };
-                PS::AudioDevice dev(pair.first.uniqueId, QLatin1String("audio-backend-pulseaudio"), key, 0, true);
-                dev.addAccess(pair.second);
-                m_audioCaptureDevices.append(dev);
-            }
-        }
-    }
-#endif // HAVE_PULSEAUDIO
-
     if (haveAlsaDevices) {
         // go through the lists and check for devices that have only OSS and remove them since
         // they're very likely bogus (Solid tells us a device can do capture and playback, even
@@ -855,14 +662,8 @@ static inline QByteArray nameForDriver(PS::AudioDeviceAccess::AudioDriver d)
         return "alsa";
     case PS::AudioDeviceAccess::OssDriver:
         return "oss";
-    case PS::AudioDeviceAccess::PulseAudioDriver:
-        return "pulseaudio";
     case PS::AudioDeviceAccess::JackdDriver:
         return "jackd";
-    case PS::AudioDeviceAccess::EsdDriver:
-        return "esd";
-    case PS::AudioDeviceAccess::ArtsDriver:
-        return "arts";
     case PS::AudioDeviceAccess::InvalidDriver:
         break;
     }
diff --git a/phonon/kded-module/phononserver.h b/phonon/kded-module/phononserver.h
index 2583863..fc04560 100644
--- a/phonon/kded-module/phononserver.h
+++ b/phonon/kded-module/phononserver.h
@@ -51,7 +51,7 @@ class PhononServer : public KDEDModule
     private slots:
         void deviceAdded(const QString &udi);
         void deviceRemoved(const QString &udi);
-        // TODO add callbacks for Pulse, Jack changes and whatever else, if somehow possible
+        // TODO add callbacks for Jack changes and whatever else, if somehow possible (Pulse handled by libphonon)
 
         void alsaConfigChanged();
 
commit 8757fd4431c1fdabf00c0a39f5640e96f7a41726
Author: cguthrie <cguthrie at 283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date:   Fri Nov 20 09:15:57 2009 +0000

    phonon: Fix phonon API due to change in r1051728
    
    git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdebase/runtime at 1051798 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/phonon/kcm/devicepreference.cpp b/phonon/kcm/devicepreference.cpp
index 71e772b..0554269 100644
--- a/phonon/kcm/devicepreference.cpp
+++ b/phonon/kcm/devicepreference.cpp
@@ -327,7 +327,7 @@ QList<Phonon::AudioCaptureDevice> DevicePreference::availableAudioCaptureDevices
 
 void DevicePreference::load()
 {
-    showCheckBox->setChecked(!Phonon::GlobalConfig().getHideAdvancedDevices());
+    showCheckBox->setChecked(!Phonon::GlobalConfig().hideAdvancedDevices());
     loadCategoryDevices();
 }
 
@@ -545,7 +545,7 @@ void DevicePreference::on_showCheckBox_toggled()
 {
     // In order to get the right list from the backend, we need to update the settings now
     // before calling availableAudio{Output,Capture}Devices()
-    Phonon::GlobalConfig().hideAdvancedDevices(!showCheckBox->isChecked());
+    Phonon::GlobalConfig().setHideAdvancedDevices(!showCheckBox->isChecked());
     loadCategoryDevices();
 }
 


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- kdebase-runtime.spec	15 Nov 2009 00:46:33 -0000	1.128
+++ kdebase-runtime.spec	5 Dec 2009 15:23:08 -0000	1.129
@@ -1,11 +1,15 @@
+
 %if 0%{?fedora}
 %define flags 1
+%if 0%{?fedora} > 11
+%define phonon_pa_patch 1
+%endif
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.3
-Release:       5%{?dist}
+Version:       4.3.4
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -24,6 +28,8 @@ Patch4:        kdebase-runtime-4.3.0-nep
 Patch5:        kdebase-runtime-4.3.1-manpath.patch
 # add OnlyShowIn=KDE  to Desktop/Home.desktop (like trash.desktop)
 Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch
+# http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/kdebase4-runtime/current/SOURCES/kdebase-runtime-4.3.1-backend-globalconfig.patch
+Patch7:        kdebase-runtime-4.3.1-backend-globalconfig.patch
 
 ## Upstream patches
 
@@ -52,6 +58,12 @@ Requires: htdig
 # beware of bootstrapping, there be dragons
 Requires: oxygen-icon-theme >= %{version}
 
+%if 0%{?phonon_pa_patch}
+%define phonon_ver 4.3.50
+BuildRequires: phonon-devel >= %{phonon_ver}
+Requires: phonon >= %{phonon_ver}
+%endif
+
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
@@ -103,7 +115,11 @@ BuildArch: noarch
 %prep
 %setup -q -n kdebase-runtime-%{version}
 
+%if 0%{?phonon_pa_patch} 
+%patch7 -p1 -b .backend-globalconfig
+%else
 %patch0 -p1 -b .pulseaudio
+%endif
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
@@ -227,6 +243,12 @@ fi
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2
+- phonon/pulseaudio patch from mandriva, kudos to coling (f12)
+
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-5
 - disable manpath patch for now, does more harm than good (#532071)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	9 Nov 2009 13:19:29 -0000	1.37
+++ sources	5 Dec 2009 15:23:08 -0000	1.38
@@ -1 +1 @@
-88bf28d42d326c16abceaf3f1c6bffde  kdebase-runtime-4.3.3.tar.bz2
+6f5beaaf4ff8f7441113d3236ab6316f  kdebase-runtime-4.3.4.tar.bz2



From pkgdb at fedoraproject.org  Sat Dec  5 15:23:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:23:49 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20091205152350.2C76A10F8AD@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 12 is now owned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sat Dec  5 15:23:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:23:52 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20091205152352.2C20C10F8AB@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 12 was orphaned by toshio

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From paragn at fedoraproject.org  Sat Dec  5 15:24:59 2009
From: paragn at fedoraproject.org (paragn)
Date: Sat,  5 Dec 2009 15:24:59 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.211,1.212 comps-f13.xml.in,1.110,1.111
Message-ID: <20091205152459.4233411C0095@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25656

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Remove dead packages v4l2-tool and scanbuttond



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- comps-f12.xml.in	5 Dec 2009 01:48:27 -0000	1.211
+++ comps-f12.xml.in	5 Dec 2009 15:24:58 -0000	1.212
@@ -2912,7 +2912,6 @@
       <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">sane-frontends</packagereq>
-      <packagereq type="optional">scanbuttond</packagereq>
       <packagereq type="optional">showimg</packagereq>
       <packagereq type="optional">tachyon</packagereq>
       <packagereq type="optional">tuxpaint</packagereq>
@@ -5267,7 +5266,6 @@
       <packagereq type="optional">totem-lirc</packagereq>
       <packagereq type="optional">tvtime</packagereq>
       <packagereq type="optional">ushare</packagereq>
-      <packagereq type="optional">v4l2-tool</packagereq>
       <packagereq type="optional">vdr</packagereq>
       <packagereq type="optional">vdr-epgsearch</packagereq>
       <packagereq type="optional">vdr-femon</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- comps-f13.xml.in	5 Dec 2009 01:48:27 -0000	1.110
+++ comps-f13.xml.in	5 Dec 2009 15:24:58 -0000	1.111
@@ -2920,7 +2920,6 @@
       <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">sane-frontends</packagereq>
-      <packagereq type="optional">scanbuttond</packagereq>
       <packagereq type="optional">showimg</packagereq>
       <packagereq type="optional">tachyon</packagereq>
       <packagereq type="optional">tuxpaint</packagereq>
@@ -5272,7 +5271,6 @@
       <packagereq type="optional">totem-lirc</packagereq>
       <packagereq type="optional">tvtime</packagereq>
       <packagereq type="optional">ushare</packagereq>
-      <packagereq type="optional">v4l2-tool</packagereq>
       <packagereq type="optional">vdr</packagereq>
       <packagereq type="optional">vdr-epgsearch</packagereq>
       <packagereq type="optional">vdr-femon</packagereq>



From pkgdb at fedoraproject.org  Sat Dec  5 15:25:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 15:25:48 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20091205152548.20CA210F894@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 12 is now owned by rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From than at fedoraproject.org  Sat Dec  5 15:25:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:25:53 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec, 1.250,
	1.251 sources, 1.41, 1.42
Message-ID: <20091205152553.3152F11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25995

Modified Files:
	kdebase-workspace.spec sources 
Log Message:
4.3.4



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- kdebase-workspace.spec	2 Dec 2009 14:43:03 -0000	1.250
+++ kdebase-workspace.spec	5 Dec 2009 15:25:53 -0000	1.251
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora} && 0%{?fedora} < 12
 %define with_polkit_09 1
 %endif
@@ -7,8 +6,8 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.3
-Release: 9%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -615,11 +614,9 @@ fi
 
 
 %changelog
-* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-9
-- (better) kdm_plymouth patch (#475890)
-
-* Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
-- force use of ServerVTs(1), if booting from plymouth (#475890)
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+- kdm_plymouth patch (#475890)
 
 * Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7.1
 - Requires: PolicyKit-authentication-agent unconditionally (ie, in F-12 too)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	9 Nov 2009 13:26:30 -0000	1.41
+++ sources	5 Dec 2009 15:25:53 -0000	1.42
@@ -1 +1 @@
-0af67c6ee6385cc86f694bc8e1675ddb  kdebase-workspace-4.3.3.tar.bz2
+5ae53ccb3c7783d466b353bdf7a6e532  kdebase-workspace-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 15:29:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:29:37 +0000 (UTC)
Subject: rpms/kdebindings/F-11 kdebindings.spec, 1.211, 1.212 sources, 1.69,
	1.70
Message-ID: <20091205152937.D602911C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27116

Modified Files:
	kdebindings.spec sources 
Log Message:
4.3.4



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- kdebindings.spec	16 Nov 2009 21:25:33 -0000	1.211
+++ kdebindings.spec	5 Dec 2009 15:29:37 -0000	1.212
@@ -52,8 +52,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.3
-Release: 4%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -545,6 +545,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-4
 - Requires: sip-api(%%_sip_api_major) >= %%_sip_api
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	9 Nov 2009 13:27:55 -0000	1.69
+++ sources	5 Dec 2009 15:29:37 -0000	1.70
@@ -1 +1 @@
-4bc76f60e2c175d4e413a374c87f0e19  kdebindings-4.3.3.tar.bz2
+a89db14d6db8c7783862d385bfb86e9e  kdebindings-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 15:30:58 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:30:58 +0000 (UTC)
Subject: rpms/kdeedu/F-11 kdeedu.spec,1.188,1.189 sources,1.70,1.71
Message-ID: <20091205153058.0AF2B11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27587

Modified Files:
	kdeedu.spec sources 
Log Message:

4.3.4



Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- kdeedu.spec	9 Nov 2009 13:37:46 -0000	1.188
+++ kdeedu.spec	5 Dec 2009 15:30:57 -0000	1.189
@@ -7,7 +7,7 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 
 License: GPLv2
@@ -33,10 +33,10 @@ BuildRequires: libindi-devel
 BuildRequires: libnova-devel
 BuildRequires: libqalculate-devel
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
-%endif
-BuildRequires: desktop-file-utils
 BuildRequires: eigen2-devel >= 2.0.3
 BuildRequires: gpsd-devel
+%endif
+BuildRequires: desktop-file-utils
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
@@ -488,6 +488,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
+* Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- rhel cleanup
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-11/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	9 Nov 2009 13:37:46 -0000	1.70
+++ sources	5 Dec 2009 15:30:57 -0000	1.71
@@ -1 +1 @@
-9d9d7a34bccb0880d1cdf181f92da217  kdeedu-4.3.3.tar.bz2
+2dfdf596efcbc8464afce6a439f32878  kdeedu-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 15:32:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:32:28 +0000 (UTC)
Subject: rpms/kdegames/F-11 kdegames.spec,1.137,1.138 sources,1.74,1.75
Message-ID: <20091205153228.1699C11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28055

Modified Files:
	kdegames.spec sources 
Log Message:
4.3.4



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- kdegames.spec	11 Nov 2009 14:59:42 -0000	1.137
+++ kdegames.spec	5 Dec 2009 15:32:27 -0000	1.138
@@ -2,8 +2,8 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.3
-Release: 2%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -230,6 +230,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rebase kdegames-4.3.3-trademarks.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	9 Nov 2009 13:38:54 -0000	1.74
+++ sources	5 Dec 2009 15:32:27 -0000	1.75
@@ -1 +1 @@
-2e35ec4b2b26b7e7e32712a35cef8912  kdegames-4.3.3.tar.bz2
+6273502fdfb0c0ad604a1b96d79ef34b  kdegames-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 15:35:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:35:14 +0000 (UTC)
Subject: rpms/kdegraphics/F-11 kdegraphics.spec, 1.209, 1.210 sources, 1.71,
	1.72
Message-ID: <20091205153514.2D98E11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28781

Modified Files:
	kdegraphics.spec sources 
Log Message:
4.3.4



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- kdegraphics.spec	9 Nov 2009 13:41:16 -0000	1.209
+++ kdegraphics.spec	5 Dec 2009 15:35:13 -0000	1.210
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -233,6 +233,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	9 Nov 2009 13:41:16 -0000	1.71
+++ sources	5 Dec 2009 15:35:13 -0000	1.72
@@ -1 +1 @@
-e150a9538133a359e3e2e8ccf0c58575  kdegraphics-4.3.3.tar.bz2
+a8c0569f7f11f22a5038ede85b5db77a  kdegraphics-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 15:47:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:47:07 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs.spec, 1.503, 1.504 sources, 1.94,
	1.95 kdelibs-4.3.1-ossl-1.x.patch, 1.1,
	NONE kdelibs-4.3.3-fix-kdefakes-build.patch, 1.1, NONE
Message-ID: <20091205154707.AF54F11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31760

Modified Files:
	kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.1-ossl-1.x.patch 
	kdelibs-4.3.3-fix-kdefakes-build.patch 
Log Message:
4.3.4



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -p -r1.503 -r1.504
--- kdelibs.spec	14 Nov 2009 15:51:23 -0000	1.503
+++ kdelibs.spec	5 Dec 2009 15:47:07 -0000	1.504
@@ -1,14 +1,10 @@
 %define phonon_ver 4.3.1
-%define soprano_ver 2.3.0
-%define strigi_ver 0.7
-
-%if 0%{?fedora} > 11
 %define soprano_ver 2.3.1
-%endif
+%define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.3
-Release: 4%{?dist}
+Version: 4.3.4
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -76,13 +72,11 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
-Patch21: kdelibs-4.3.1-ossl-1.x.patch
 # patch to fix keditbookmarks crash (kde#160679)
 Patch22: kdelibs-4.3.0-bookmarks.patch
 Patch24: kdelibs-4.3.1-drkonq.patch
-# fix build of fakes.c due to missing #include <string.h>
-Patch25: kdelibs-4.3.3-fix-kdefakes-build.patch
 # use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
+# workaound for low-mem systems (ppc64, x86_64)
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
 
 # upstream
@@ -205,13 +199,11 @@ format for easy browsing.
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
-%patch25 -p1 -b .fix-kdefakes-build
-%if 0%{?fedora} > 11
+%ifarch ppc64 x86_64
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
 %endif
 
@@ -411,9 +403,18 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+- add workaound for low-mem systems
+
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
+* Mon Nov 16 2009 Than Ngo <than at redhat.com> - 4.3.3-5
+- fix conditional
+
 * Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-4
 - kubuntu_80_kaction_qt_keys.diff (#475247)
-- soprano_ver 2.3.1 (f12+)
+- soprano_ver 2.3.1
 
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-3
 - rhel cleanup, fix conditional for RHEL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	9 Nov 2009 13:48:32 -0000	1.94
+++ sources	5 Dec 2009 15:47:07 -0000	1.95
@@ -1 +1 @@
-20fd3793d9d23088ecb1d5aed0254216  kdelibs-4.3.3.tar.bz2
+bc781838ad8cafa479e99139f7f403f3  kdelibs-4.3.4.tar.bz2


--- kdelibs-4.3.1-ossl-1.x.patch DELETED ---


--- kdelibs-4.3.3-fix-kdefakes-build.patch DELETED ---



From than at fedoraproject.org  Sat Dec  5 15:47:56 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:47:56 +0000 (UTC)
Subject: rpms/kde-l10n/F-11 kde-l10n.spec,1.90,1.91 sources,1.33,1.34
Message-ID: <20091205154756.AC77211C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32054

Modified Files:
	kde-l10n.spec sources 
Log Message:
4.3.4



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-11/kde-l10n.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- kde-l10n.spec	13 Nov 2009 15:13:37 -0000	1.90
+++ kde-l10n.spec	5 Dec 2009 15:47:56 -0000	1.91
@@ -2,8 +2,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.3
-Release: 2%{dist}
+Version: 4.3.4
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -1504,6 +1504,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup, remove Fedora<=9 conditionals
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	9 Nov 2009 17:07:43 -0000	1.33
+++ sources	5 Dec 2009 15:47:56 -0000	1.34
@@ -1,59 +1,59 @@
-e10628397c084460bca7689656f300ed  kde-l10n-ar-4.3.3.tar.bz2
-d6674ead4ac4eed60c3d84e7c0f8d851  kde-l10n-bg-4.3.3.tar.bz2
-2c57052b5ba91e7c8c8be5e860a55124  kde-l10n-bn_IN-4.3.3.tar.bz2
-adb193ef0a8145537dc687405b962013  kde-l10n-ca-4.3.3.tar.bz2
-b70ab6045f67331d6e87e6e4832d0230  kde-l10n-cs-4.3.3.tar.bz2
-3bd8733cc6ed8b166439f4b8ef72dce9  kde-l10n-csb-4.3.3.tar.bz2
-27f4f50c1a40d1ba5051ea79bd3680ca  kde-l10n-da-4.3.3.tar.bz2
-ceafbce8173de1b0b71ee336550a3e85  kde-l10n-de-4.3.3.tar.bz2
-ac77ebe350583e43ba5870b3f37a662a  kde-l10n-el-4.3.3.tar.bz2
-b5dfb4d185c144f23aff217699112f13  kde-l10n-en_GB-4.3.3.tar.bz2
-61f81f1a8391b84ac6296233d30986a6  kde-l10n-es-4.3.3.tar.bz2
-3ab2b6ab41990966da77d614cb032dc8  kde-l10n-et-4.3.3.tar.bz2
-9f85fafd3b82f427602cc98c0f87e471  kde-l10n-eu-4.3.3.tar.bz2
-a84e2f7795677c60b652a70886ed07c4  kde-l10n-fi-4.3.3.tar.bz2
-942561daa054a8075eddf22509ccf90b  kde-l10n-fr-4.3.3.tar.bz2
-4a33dee026f3786e921a3e894d98810b  kde-l10n-fy-4.3.3.tar.bz2
-f7e01894dd8e2bb244634bde1a3f1277  kde-l10n-ga-4.3.3.tar.bz2
-e9d530e50cfa88e2d71594f08b646348  kde-l10n-gl-4.3.3.tar.bz2
-f48d5d658fd6fcf3347bf430c5031321  kde-l10n-gu-4.3.3.tar.bz2
-b84e05b699de1144e0f709dd717c9c95  kde-l10n-he-4.3.3.tar.bz2
-df069293f0bade11079aad9104e063c8  kde-l10n-hi-4.3.3.tar.bz2
-dff839715ea7d30e74c6fc71b7156f8c  kde-l10n-hne-4.3.3.tar.bz2
-d39bdafa4f2aa3ea77c01c88863ede5c  kde-l10n-hr-4.3.3.tar.bz2
-cece9b2512bf1d735cba47388e19a9bf  kde-l10n-hu-4.3.3.tar.bz2
-92e3a8eba0e69b68d6e8d3b50b71448b  kde-l10n-is-4.3.3.tar.bz2
-c8f74e93088cf211cc23c51def0174bc  kde-l10n-it-4.3.3.tar.bz2
-42c28a67f64a3db230f94f13b03b1757  kde-l10n-ja-4.3.3.tar.bz2
-c073d5307842307b5232c283b096703c  kde-l10n-kk-4.3.3.tar.bz2
-bf99998dcabd9010f57862aae79b1be0  kde-l10n-km-4.3.3.tar.bz2
-c334eb73bd702797c89c8389b08c256d  kde-l10n-kn-4.3.3.tar.bz2
-8a966dabf4a4de53bd730aea32cb0483  kde-l10n-ko-4.3.3.tar.bz2
-cbccd72792c766517e6b0576dce0cce4  kde-l10n-ku-4.3.3.tar.bz2
-91b33909381030b15e704182108e46fc  kde-l10n-lt-4.3.3.tar.bz2
-139b89413834c4d16c2d7566add4bf89  kde-l10n-lv-4.3.3.tar.bz2
-afd970f5ffa4a92ae7ae5c6e99dd3a95  kde-l10n-mai-4.3.3.tar.bz2
-bbb7a681018bbd82fb576a15b4ba64c7  kde-l10n-mk-4.3.3.tar.bz2
-d224b44e67025f8af9b4013ecc5dd800  kde-l10n-ml-4.3.3.tar.bz2
-bcc8d552f154d6c9bff038548b57b0c2  kde-l10n-mr-4.3.3.tar.bz2
-18677afe8de233f19a3cb27d0a44c363  kde-l10n-nb-4.3.3.tar.bz2
-c1803ecd0c054c6248d241e88ec523cf  kde-l10n-nds-4.3.3.tar.bz2
-b719419f77c7ec0555ffd303d8b2680d  kde-l10n-nl-4.3.3.tar.bz2
-c063f2309cb2d5dfc6de1ae83699e72b  kde-l10n-nn-4.3.3.tar.bz2
-f629191f1d6ea55f4b92115cf4025f35  kde-l10n-pa-4.3.3.tar.bz2
-61f7fd6cb1114e7404a789cfe7a71114  kde-l10n-pl-4.3.3.tar.bz2
-ff61640a475220169e8662a1e286bdff  kde-l10n-pt-4.3.3.tar.bz2
-45c83f1230ce08ec859a32ce10fab0ad  kde-l10n-pt_BR-4.3.3.tar.bz2
-92659a0f406005a43f4d6f8b5047e587  kde-l10n-ro-4.3.3.tar.bz2
-dfe031b2aff9b1b857af536c3649adf4  kde-l10n-ru-4.3.3.tar.bz2
-e9470464392df6332bf557ec24ccc3f2  kde-l10n-sk-4.3.3.tar.bz2
-419b15bd4accd6592a84d3428c1f8567  kde-l10n-sl-4.3.3.tar.bz2
-1a3f470a429cd9bf4dd8545f9f565ad6  kde-l10n-sr-4.3.3.tar.bz2
-3a4e7644c33284431da4b3981502349c  kde-l10n-sv-4.3.3.tar.bz2
-de0b886d9e884de5471dfe4bbc80533c  kde-l10n-tg-4.3.3.tar.bz2
-ad44654afa8d389a479c09a0a6bdff11  kde-l10n-th-4.3.3.tar.bz2
-31b9493a5f4b4980430b9b73811ebb43  kde-l10n-tr-4.3.3.tar.bz2
-86f275ea91a748f3f11749267e740287  kde-l10n-uk-4.3.3.tar.bz2
-a4de975e55e4ec179a593c57ad33a1f0  kde-l10n-wa-4.3.3.tar.bz2
-b3ec7c7ac95f2b19a01675862d0087f8  kde-l10n-zh_CN-4.3.3.tar.bz2
-d1c16636ad3a72f6aab0cfb4ce7da54e  kde-l10n-zh_TW-4.3.3.tar.bz2
+2d73adb358b1f3eb0eeec4f0c919ffed  kde-l10n-ar-4.3.4.tar.bz2
+d468203ae533fb59f74f5cc71405d763  kde-l10n-bg-4.3.4.tar.bz2
+cd9d9380d430c9ba3598bccae28b40f7  kde-l10n-bn_IN-4.3.4.tar.bz2
+7dabd7c092d4c166ad3aec4959085f50  kde-l10n-ca-4.3.4.tar.bz2
+4f214f3ea3d989c7be118ab81169d180  kde-l10n-cs-4.3.4.tar.bz2
+add6a35d71363fd302f2e70f6527dc65  kde-l10n-csb-4.3.4.tar.bz2
+80ebea9a323b082a3f9a6b02a3eeb405  kde-l10n-da-4.3.4.tar.bz2
+ba476ae2c6417b7122d5b9bac250171d  kde-l10n-de-4.3.4.tar.bz2
+6d3d77b85ea7d4c9d1f8fe115d618290  kde-l10n-el-4.3.4.tar.bz2
+2ea3bae93419d93c2faac7840a9a27f4  kde-l10n-en_GB-4.3.4.tar.bz2
+24b340a3cfa79b1b4899c84d1f0ad230  kde-l10n-es-4.3.4.tar.bz2
+f5932ae6ed6aec29579ba595c8e3334e  kde-l10n-et-4.3.4.tar.bz2
+7d892b41f864dfaf4d6e9b8cce005395  kde-l10n-eu-4.3.4.tar.bz2
+38d66cd08bf356133b4986a7fa63812f  kde-l10n-fi-4.3.4.tar.bz2
+61ed95c6bb94bbf72154e9a0f431dee8  kde-l10n-fr-4.3.4.tar.bz2
+18fefb04c19f853857608e76ac92d347  kde-l10n-fy-4.3.4.tar.bz2
+cb1a76b150ebe92e5ad525e6ad73120c  kde-l10n-ga-4.3.4.tar.bz2
+d9c2b86c480331baacc5fe2c41dd3ae9  kde-l10n-gl-4.3.4.tar.bz2
+bc9ae9382884c0d47dd78f0337269aa1  kde-l10n-gu-4.3.4.tar.bz2
+1ce3ad54d4c326dc0baf8c93eedad6c3  kde-l10n-he-4.3.4.tar.bz2
+cfb080c77df6786af13ff5f941249dc7  kde-l10n-hi-4.3.4.tar.bz2
+97b855ed04401232870b10850caf3206  kde-l10n-hne-4.3.4.tar.bz2
+41783012c413f2c48e56fcff617cf6d4  kde-l10n-hr-4.3.4.tar.bz2
+0df236588e7e23eccb0076cec1108053  kde-l10n-hu-4.3.4.tar.bz2
+d1bfab3e284d7c410880edf3340af209  kde-l10n-is-4.3.4.tar.bz2
+b86e79c9ac034377db708fb4ca2f9b72  kde-l10n-it-4.3.4.tar.bz2
+1580ec2c425326dd8f950ff0dd00ca87  kde-l10n-ja-4.3.4.tar.bz2
+8d4937b8f9930b131a5f3c5a4e6e3478  kde-l10n-kk-4.3.4.tar.bz2
+4050dd1076eda5be70c2020471935705  kde-l10n-km-4.3.4.tar.bz2
+266540f3cb982d9db697393710d2daba  kde-l10n-kn-4.3.4.tar.bz2
+0202b9ebb86cc26a36384bd598afeb5e  kde-l10n-ko-4.3.4.tar.bz2
+ab7a052798fc51faa0a94a01dd1e1fc3  kde-l10n-ku-4.3.4.tar.bz2
+5efb2bc39d2fa08220897b0f57d6c7ae  kde-l10n-lt-4.3.4.tar.bz2
+8ded0ecb924727cbda41cc7c5dd22658  kde-l10n-lv-4.3.4.tar.bz2
+f9fce92ec2e11282a8f84a5b8f569cf2  kde-l10n-mai-4.3.4.tar.bz2
+5b2ea5d30b4663d6e7a5a1339bd4ddfd  kde-l10n-mk-4.3.4.tar.bz2
+42e04d77fa45304a5a9e13bd7162473a  kde-l10n-ml-4.3.4.tar.bz2
+516925365fcb2a3352ac980528a3326b  kde-l10n-mr-4.3.4.tar.bz2
+9946e4b4effae6b828e9d862f61c842f  kde-l10n-nb-4.3.4.tar.bz2
+da4c91959f13d388e6abe5d1a94d8abe  kde-l10n-nds-4.3.4.tar.bz2
+5d12c9bda8a0391c9eade78d182c3fc0  kde-l10n-nl-4.3.4.tar.bz2
+9b0bf27b084abbd255f0f6ee054db683  kde-l10n-nn-4.3.4.tar.bz2
+ae1ed2219ef4cdee675cb82096d054db  kde-l10n-pa-4.3.4.tar.bz2
+7ec3ee455517911a26cb1cba5128622c  kde-l10n-pl-4.3.4.tar.bz2
+bbeee1f64ba93fbcf79e120c04227b40  kde-l10n-pt-4.3.4.tar.bz2
+3d1067f90b936d23bb94caab66a135d9  kde-l10n-pt_BR-4.3.4.tar.bz2
+8e425bb165cc1d02ec93f849999aa4c6  kde-l10n-ro-4.3.4.tar.bz2
+18ca5f88ca87fc5d99ed72147b43a93c  kde-l10n-ru-4.3.4.tar.bz2
+634dc5ce6ea811f84fa56a0d5db70a07  kde-l10n-sk-4.3.4.tar.bz2
+61c80e183aef028b2905a5421ee56347  kde-l10n-sl-4.3.4.tar.bz2
+bba4106c38955957a423fb8a6439a5ae  kde-l10n-sr-4.3.4.tar.bz2
+bb62f00e607cb1e765e391880851e55e  kde-l10n-sv-4.3.4.tar.bz2
+d2fd9ef0ab4c6d4d6c60e7d36d6d761e  kde-l10n-tg-4.3.4.tar.bz2
+88b9a1d879a604df38457010b1a5b0bb  kde-l10n-th-4.3.4.tar.bz2
+c57769548d09e1bd36893c2487de86b3  kde-l10n-tr-4.3.4.tar.bz2
+4b3e975d13f18cc8e69956f28e4fd362  kde-l10n-uk-4.3.4.tar.bz2
+9346dfae4b59c53412f6edb42687f071  kde-l10n-wa-4.3.4.tar.bz2
+9656da04c983c795f1af7f41a853b3f2  kde-l10n-zh_CN-4.3.4.tar.bz2
+f3d9dfe4e387bfed94ad0b6f8cd191d7  kde-l10n-zh_TW-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 15:52:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:52:37 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-11 kdelibs-experimental.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20091205155237.D9A6711C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs-experimental/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv924

Modified Files:
	kdelibs-experimental.spec sources 
Log Message:
4.3.4



Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-11/kdelibs-experimental.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kdelibs-experimental.spec	9 Nov 2009 13:49:37 -0000	1.4
+++ kdelibs-experimental.spec	5 Dec 2009 15:52:37 -0000	1.5
@@ -1,6 +1,6 @@
 
 Name:    kdelibs-experimental
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -62,6 +62,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Nov 2009 13:49:37 -0000	1.5
+++ sources	5 Dec 2009 15:52:37 -0000	1.6
@@ -1 +1 @@
-b9a048ccf15e90dcfd4790f65e6b54b9  kdelibs-experimental-4.3.3.tar.bz2
+ee3eb713d703b8bba9de61197f6943c4  kdelibs-experimental-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 15:59:55 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 15:59:55 +0000 (UTC)
Subject: rpms/kdemultimedia/F-11 kdemultimedia.spec, 1.147, 1.148 sources,
	1.69, 1.70
Message-ID: <20091205155955.E8D2111C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3054

Modified Files:
	kdemultimedia.spec sources 
Log Message:
4.3.4



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/kdemultimedia.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kdemultimedia.spec	9 Nov 2009 14:00:36 -0000	1.147
+++ kdemultimedia.spec	5 Dec 2009 15:59:55 -0000	1.148
@@ -1,7 +1,6 @@
-
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -13,6 +12,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
+Patch2: kdemultimedia-4.3.2-kscd_doc.patch
 
 ## upstream patches
 
@@ -26,8 +26,6 @@ BuildRequires: glib2-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdelibs-experimental-devel
 BuildRequires: libtheora-devel
-## needed to build Kscd, keep for now -- Kevin
-BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
 # KMix PulseAudio integration is not anywhere near shippable.
 # Almost everything is commented out, it basically does nothing.
@@ -35,6 +33,8 @@ BuildRequires: libvorbis-devel
 BuildRequires: taglib-devel
 %if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
+# needed to build Kscd, keep
+BuildRequires: libtunepimp-devel libmusicbrainz-devel
 %endif
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -51,7 +51,9 @@ The %{name} package contains multimedia 
 * dragonplayer (a simple video player)
 * juk (a music manager and player)
 * kmix (an audio mixer)
+%if 0%{?fedora}
 * kscd (an Audio-CD player)
+%endif
 
 %package libs
 License: LGPLv2+ and GPLv2+
@@ -77,7 +79,7 @@ Requires: kdelibs4-devel
 %setup -q -n kdemultimedia-%{version}
 
 %patch1 -p1 -b .nomplayerthumbs
-
+%patch2 -p1 -b .kscd_doc
 
 %build
 
@@ -131,10 +133,14 @@ fi
 %{_kde4_appsdir}/kmix/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/konqsidebartng/
+%if 0%{?fedora}
 %{_kde4_appsdir}/profiles/
 %{_kde4_appsdir}/kscd/
-%{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_appsdir}/solid/actions/kscd-play-audiocd.desktop
+%{_kde4_docdir}/HTML/en/kscd/
+%{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
+%endif
+%{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -144,11 +150,9 @@ fi
 %{_kde4_docdir}/HTML/en/dragonplayer/
 %{_kde4_docdir}/HTML/en/juk/
 %{_kde4_docdir}/HTML/en/kmix/
-%{_kde4_docdir}/HTML/en/kscd/
 %{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/actions/player-volume-muted.*
-%{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
 %{_kde4_libdir}/libkdeinit*.so
 
 %files libs
@@ -166,6 +170,13 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
+* Tue Nov 10 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- rhel cleanup
+- don't install kscd doc if it's not built
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	9 Nov 2009 14:00:36 -0000	1.69
+++ sources	5 Dec 2009 15:59:55 -0000	1.70
@@ -1 +1 @@
-854ddc7057cac4b8bf8d7aa4b7f57516  kdemultimedia-4.3.3.tar.bz2
+4fa908d0215051e11b6972537cda6333  kdemultimedia-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 16:01:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:01:42 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 kdenetwork.spec,1.199,1.200 sources,1.78,1.79
Message-ID: <20091205160142.C83DD11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3650

Modified Files:
	kdenetwork.spec sources 
Log Message:
4.3.4



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- kdenetwork.spec	25 Nov 2009 12:52:37 -0000	1.199
+++ kdenetwork.spec	5 Dec 2009 16:01:42 -0000	1.200
@@ -2,8 +2,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.3
-Release: 6%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -17,7 +17,6 @@ Patch1: kdenetwork-4.2.98-kdrc-icon.patc
 Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
 
 # upstream patches (4.3 branch):
-Patch100: kdenetwork-4.3.4-webkitkde.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -106,7 +105,6 @@ Requires: kdelibs4-devel
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
-%patch100 -p0 -b .webkitkde
 
 # 4.4 upstream patches
 %patch200 -p0 -b .bz#515586-kopete
@@ -199,6 +197,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Mon Nov 23 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.3-6
 - KPPP fix to read resolv.conf from /var/run/ppp (#540433)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	9 Nov 2009 14:08:35 -0000	1.78
+++ sources	5 Dec 2009 16:01:42 -0000	1.79
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-bb9a20da6e18a4952f7001b581aa9a1d  kdenetwork-4.3.3.tar.bz2
+71de592596681fc59c5bc0a679703fd2  kdenetwork-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 16:02:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:02:52 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim.spec,1.229,1.230 sources,1.75,1.76
Message-ID: <20091205160252.B632D11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4057

Modified Files:
	kdepim.spec sources 
Log Message:
4.3.4



Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- kdepim.spec	9 Nov 2009 16:30:01 -0000	1.229
+++ kdepim.spec	5 Dec 2009 16:02:52 -0000	1.230
@@ -1,4 +1,3 @@
-
 %ifnarch s390 s390x
 %define _with_pilot_link 1
 %endif
@@ -6,7 +5,7 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 
 License: GPLv2
@@ -26,7 +25,7 @@ Provides: kdepim4 = %{version}-%{release
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Upgrade path
-%if 0%{?fedora} < 12
+%if 0%{?fedora} && 0%{?fedora} < 12
 Requires: kdepim-runtime%{?_isa} >= %{version}
 %endif
 
@@ -186,7 +185,9 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kontactsummary/
 %{_kde4_appsdir}/korgac/
 %{_kde4_appsdir}/korganizer/
+%if 0%{?_with_pilot_link:1}
 %{_kde4_appsdir}/kpilot/
+%endif
 %{_kde4_appsdir}/ktimetracker/
 %{_kde4_appsdir}/kwatchgnupg/
 %{_kde4_appsdir}/libkdepim/
@@ -216,6 +217,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
+* Fri Nov 27 2009 Than Ngo <than at redhat.com> - 4.3.3-3
+- fix build issue on s390
+
+* Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- rhel cleanup, fix conditional for RHEL
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	9 Nov 2009 16:30:01 -0000	1.75
+++ sources	5 Dec 2009 16:02:52 -0000	1.76
@@ -1 +1 @@
-3a3c01abd6571cc337fa22d1c3601fe7  kdepim-4.3.3.tar.bz2
+a4f32a268802be8eb852d1de00cbd2f6  kdepim-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 16:04:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:04:03 +0000 (UTC)
Subject: rpms/kdepimlibs/F-11 kdepimlibs.spec,1.93,1.94 sources,1.41,1.42
Message-ID: <20091205160403.8327C11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4469

Modified Files:
	kdepimlibs.spec sources 
Log Message:
4.3.4



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-11/kdepimlibs.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kdepimlibs.spec	9 Nov 2009 16:34:41 -0000	1.93
+++ kdepimlibs.spec	5 Dec 2009 16:04:03 -0000	1.94
@@ -3,7 +3,7 @@
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -134,14 +134,6 @@ do
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
-%if 0%{?fedora} < 10
-# conflicts with kdepim(3)
-    libgpgme++.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so)
-      linktarget=`readlink "$i"`
-      rm -f "$i"
-      ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-%endif
   esac
 done
 popd
@@ -205,6 +197,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
+* Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- rhel cleanup, remove Fedora<=9 conditionals
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	9 Nov 2009 16:34:41 -0000	1.41
+++ sources	5 Dec 2009 16:04:03 -0000	1.42
@@ -1 +1 @@
-ff83c198e0dc8be77c4099c82daae021  kdepimlibs-4.3.3.tar.bz2
+c3aa4a290c3e3b718efc41a60442b57c  kdepimlibs-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 16:05:02 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:05:02 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-11 kdepim-runtime.spec, 1.4, 1.5 sources, 1.5,
	1.6
Message-ID: <20091205160502.3B15C11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4792

Modified Files:
	kdepim-runtime.spec sources 
Log Message:
4.3.4



Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-11/kdepim-runtime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kdepim-runtime.spec	11 Nov 2009 01:52:18 -0000	1.4
+++ kdepim-runtime.spec	5 Dec 2009 16:05:01 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.3
+Version: 4.3.4
 Release: 1%{?dist}
 
 License: GPLv2
@@ -131,6 +131,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Nov 2009 01:52:18 -0000	1.5
+++ sources	5 Dec 2009 16:05:02 -0000	1.6
@@ -1 +1 @@
-025bbb82f273d28c7507b5b366000b3f  kdepim-runtime-4.3.3.tar.bz2
+e6fe3a639f4ab878dba2e84fd974e872  kdepim-runtime-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 16:06:17 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:06:17 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11 kdeplasma-addons.spec, 1.45, 1.46 sources,
	1.18, 1.19
Message-ID: <20091205160617.1EE2111C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5194

Modified Files:
	kdeplasma-addons.spec sources 
Log Message:
4.3.4



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- kdeplasma-addons.spec	9 Nov 2009 16:47:58 -0000	1.45
+++ kdeplasma-addons.spec	5 Dec 2009 16:06:15 -0000	1.46
@@ -1,6 +1,6 @@
 
 Name:           kdeplasma-addons
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -163,6 +163,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	9 Nov 2009 16:47:58 -0000	1.18
+++ sources	5 Dec 2009 16:06:16 -0000	1.19
@@ -1 +1 @@
-f034c8ded22fd0029b3b4b687774c757  kdeplasma-addons-4.3.3.tar.bz2
+c03ab7099a8064ca85bb804408052a2b  kdeplasma-addons-4.3.4.tar.bz2



From terjeros at fedoraproject.org  Sat Dec  5 16:07:07 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 16:07:07 +0000 (UTC)
Subject: File python-ptrace-0.6.2.tar.gz uploaded to lookaside cache by
	terjeros
Message-ID: <20091205160707.CF9A410F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-ptrace:

9fd038446772f9bf8d6d2290b26e5e0a  python-ptrace-0.6.2.tar.gz



From terjeros at fedoraproject.org  Sat Dec  5 16:08:08 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 16:08:08 +0000 (UTC)
Subject: rpms/python-ptrace/devel .cvsignore, 1.2, 1.3 python-ptrace.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20091205160808.3969111C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-ptrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5766

Modified Files:
	.cvsignore python-ptrace.spec sources 
Log Message:
* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.6.2-1
- 0.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-ptrace/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Mar 2009 20:02:48 -0000	1.2
+++ .cvsignore	5 Dec 2009 16:08:07 -0000	1.3
@@ -1 +1 @@
-python-ptrace-0.6.tar.gz
+python-ptrace-0.6.2.tar.gz


Index: python-ptrace.spec
===================================================================
RCS file: /cvs/extras/rpms/python-ptrace/devel/python-ptrace.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-ptrace.spec	26 Jul 2009 20:54:33 -0000	1.4
+++ python-ptrace.spec	5 Dec 2009 16:08:07 -0000	1.5
@@ -5,13 +5,13 @@
 
 Summary:       Debugger using ptrace written in Python
 Name:          python-ptrace
-Version:       0.6
-Release:       5%{?dist}
+Version:       0.6.2
+Release:       1%{?dist}
 License:       GPLv2
 Group:         Development/Tools
 URL  :         http://python-ptrace.hachoir.org/
 Source0:       http://pypi.python.org/packages/source/p/python-ptrace/%{name}-%{version}.tar.gz
-BuildRequires: python-setuptools-devel
+BuildRequires: python-setuptools-devel python-devel
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -61,9 +61,12 @@ Fearures:
 %{python_sitelib}/ptrace/
 %{python_sitelib}/python_ptrace-*-py%{pyver}.egg-info
 %{python_sitelib_arch}/cptrace.so
-%{python_sitelib_arch}/ptrace-*-py%{pyver}.egg-info
+%{python_sitelib_arch}/cptrace-*-py%{pyver}.egg-info
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.6.2-1
+- 0.6.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-ptrace/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Mar 2009 20:02:48 -0000	1.2
+++ sources	5 Dec 2009 16:08:07 -0000	1.3
@@ -1 +1 @@
-510c8c005f373c3e079074c9720bacc9  python-ptrace-0.6.tar.gz
+9fd038446772f9bf8d6d2290b26e5e0a  python-ptrace-0.6.2.tar.gz



From than at fedoraproject.org  Sat Dec  5 16:08:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:08:50 +0000 (UTC)
Subject: rpms/kdesdk/F-11 kdesdk.spec,1.152,1.153 sources,1.64,1.65
Message-ID: <20091205160850.C190311C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdesdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6003

Modified Files:
	kdesdk.spec sources 
Log Message:
4.3.4



Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-11/kdesdk.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- kdesdk.spec	9 Nov 2009 16:51:50 -0000	1.152
+++ kdesdk.spec	5 Dec 2009 16:08:50 -0000	1.153
@@ -1,6 +1,6 @@
 
 Name:           kdesdk
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-11/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	9 Nov 2009 16:51:50 -0000	1.64
+++ sources	5 Dec 2009 16:08:50 -0000	1.65
@@ -1 +1 @@
-0e0aca0f1f13d877918fb49540443e1b  kdesdk-4.3.3.tar.bz2
+9fff7911d3234d29d9073ee83d7e3a64  kdesdk-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 16:09:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:09:43 +0000 (UTC)
Subject: rpms/kdetoys/F-11 kdetoys.spec,1.56,1.57 sources,1.37,1.38
Message-ID: <20091205160943.618DB11C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdetoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6339

Modified Files:
	kdetoys.spec sources 
Log Message:
4.3.4



Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-11/kdetoys.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- kdetoys.spec	9 Nov 2009 16:58:08 -0000	1.56
+++ kdetoys.spec	5 Dec 2009 16:09:43 -0000	1.57
@@ -2,7 +2,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -83,6 +83,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-11/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	9 Nov 2009 16:58:08 -0000	1.37
+++ sources	5 Dec 2009 16:09:43 -0000	1.38
@@ -1 +1 @@
-1a40a60cc6712b744bd987b9278c9b27  kdetoys-4.3.3.tar.bz2
+d823f25bfe8f419923b98be04564e975  kdetoys-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 16:10:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:10:34 +0000 (UTC)
Subject: rpms/kdeutils/F-11 kdeutils.spec,1.182,1.183 sources,1.69,1.70
Message-ID: <20091205161035.000F211C03F6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6668

Modified Files:
	kdeutils.spec sources 
Log Message:
4.3.4



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- kdeutils.spec	9 Nov 2009 16:59:28 -0000	1.182
+++ kdeutils.spec	5 Dec 2009 16:10:34 -0000	1.183
@@ -1,11 +1,10 @@
-
 %if 0%{?fedora}
 %define printer_applet 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.3
+Version:        4.3.4
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -36,7 +35,7 @@ BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 
 %if 0%{?printer_applet}
-%if 0%{?fedora} < 11
+%if 0%{?fedora} &&  0%{?fedora} < 11
 # upgrade path so it doesn't get lost
 Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
 %endif
@@ -44,8 +43,8 @@ Requires: %{name}-printer-applet = %{epo
 Obsoletes: %{name}-printer-applet < %{epoch}:%{version}-%{release}
 %endif
 
-Provides:       okteta = 0.1.0-1
-Obsoletes:      okteta < 0.1.0-1
+Provides:  okteta = 0.1.0-1
+Obsoletes: okteta < 0.1.0-1
 
 Obsoletes: kdeutils-extras < 6:4.0.0
 Obsoletes: kdeutils-devel < 6:4.0.0
@@ -216,6 +215,12 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
+* Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- rhel cleanup, Fix conditional for RHEL
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	9 Nov 2009 16:59:28 -0000	1.69
+++ sources	5 Dec 2009 16:10:34 -0000	1.70
@@ -1 +1 @@
-f3a587fa319d01f5305ef746933f3fb3  kdeutils-4.3.3.tar.bz2
+576852bb88515ccbbb859e245c939d31  kdeutils-4.3.4.tar.bz2



From than at fedoraproject.org  Sat Dec  5 16:11:29 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  5 Dec 2009 16:11:29 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-11 oxygen-icon-theme.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20091205161129.13C8311C0095@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/oxygen-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6980

Modified Files:
	oxygen-icon-theme.spec sources 
Log Message:
4.3.4



Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-11/oxygen-icon-theme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- oxygen-icon-theme.spec	9 Nov 2009 17:03:31 -0000	1.5
+++ oxygen-icon-theme.spec	5 Dec 2009 16:11:28 -0000	1.6
@@ -1,7 +1,7 @@
 
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.3
+Version:       4.3.4
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -14,9 +14,6 @@ BuildArch:     noarch
 BuildRequires: cmake
 BuildRequires: kde-filesystem
 
-# some icons moved here in older kdepim's...
-#Conflicts: kdepim < 4.2.85
-
 Obsoletes: oxygen-icon-theme-scalable < 4.2.85 
 
 
@@ -67,6 +64,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
+- 4.3.4
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Nov 2009 17:03:31 -0000	1.6
+++ sources	5 Dec 2009 16:11:28 -0000	1.7
@@ -1 +1 @@
-4eabdae208de4f9bb49e9049237adfa4  oxygen-icons-4.3.3.tar.bz2
+8029e49f68f38f808e4aff16e491c3cb  oxygen-icons-4.3.4.tar.bz2



From fschwarz at fedoraproject.org  Sat Dec  5 16:14:36 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Sat,  5 Dec 2009 16:14:36 +0000 (UTC)
Subject: File Trac-0.11.6.tar.gz uploaded to lookaside cache by fschwarz
Message-ID: <20091205161436.D6F6610F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for trac:

f5a9542d81d3d50c3d9e46d8e2344f38  Trac-0.11.6.tar.gz



From fschwarz at fedoraproject.org  Sat Dec  5 16:15:12 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Sat,  5 Dec 2009 16:15:12 +0000 (UTC)
Subject: rpms/trac/devel .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 trac.spec,
	1.30, 1.31
Message-ID: <20091205161512.2B22311C0095@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/trac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7939

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
update to new upstream release 0.11.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	5 May 2009 23:31:24 -0000	1.15
+++ .cvsignore	5 Dec 2009 16:15:11 -0000	1.16
@@ -1 +1 @@
-Trac-0.11.4.tar.gz
+Trac-0.11.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 May 2009 23:31:24 -0000	1.15
+++ sources	5 Dec 2009 16:15:11 -0000	1.16
@@ -1 +1 @@
-a765087b22661cf4aa1520518cddecae  Trac-0.11.4.tar.gz
+f5a9542d81d3d50c3d9e46d8e2344f38  Trac-0.11.6.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac/devel/trac.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- trac.spec	27 Jul 2009 06:10:09 -0000	1.30
+++ trac.spec	5 Dec 2009 16:15:11 -0000	1.31
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.11.4
-Release:        2%{?dist}
+Version:        0.11.6
+Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
 License:        BSD
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_var}/www/cgi-bin/trac.fcgi
 
 %changelog
+* Sat Dec 05 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 0.11.6-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From fschwarz at fedoraproject.org  Sat Dec  5 16:26:48 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Sat,  5 Dec 2009 16:26:48 +0000 (UTC)
Subject: rpms/trac/F-12 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 trac.spec,
	1.30, 1.31
Message-ID: <20091205162648.4A9D311C0095@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/trac/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10623

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
update to new upstream release 0.11.6




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	5 May 2009 23:31:24 -0000	1.15
+++ .cvsignore	5 Dec 2009 16:26:46 -0000	1.16
@@ -1 +1 @@
-Trac-0.11.4.tar.gz
+Trac-0.11.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 May 2009 23:31:24 -0000	1.15
+++ sources	5 Dec 2009 16:26:47 -0000	1.16
@@ -1 +1 @@
-a765087b22661cf4aa1520518cddecae  Trac-0.11.4.tar.gz
+f5a9542d81d3d50c3d9e46d8e2344f38  Trac-0.11.6.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac/F-12/trac.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- trac.spec	27 Jul 2009 06:10:09 -0000	1.30
+++ trac.spec	5 Dec 2009 16:26:47 -0000	1.31
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.11.4
-Release:        2%{?dist}
+Version:        0.11.6
+Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
 License:        BSD
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_var}/www/cgi-bin/trac.fcgi
 
 %changelog
+* Sat Dec 05 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 0.11.6-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From terjeros at fedoraproject.org  Sat Dec  5 17:16:13 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 17:16:13 +0000 (UTC)
Subject: File logstalgia-0.9.2.tar.gz uploaded to lookaside cache by terjeros
Message-ID: <20091205171613.ABC2B10F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for logstalgia:

6a7333a1bf78d34521cbae8665aa8380  logstalgia-0.9.2.tar.gz



From terjeros at fedoraproject.org  Sat Dec  5 17:19:13 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 17:19:13 +0000 (UTC)
Subject: rpms/logstalgia/devel .cvsignore, 1.2, 1.3 logstalgia.spec, 1.3,
	1.4 sources, 1.2, 1.3 logstalgia-0.9.1-destdir.patch, 1.1,
	NONE logstalgia-0.9.1-gcc43.patch, 1.1,
	NONE logstalgia-0.9.1-optflags.patch, 1.1, NONE
Message-ID: <20091205171913.70D0311C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/logstalgia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25531

Modified Files:
	.cvsignore logstalgia.spec sources 
Removed Files:
	logstalgia-0.9.1-destdir.patch logstalgia-0.9.1-gcc43.patch 
	logstalgia-0.9.1-optflags.patch 
Log Message:
* Sat Dec 05 2009 Terje R?sten <terje.rosten at ntnu.no> - 0.9.2-1
- 0.9.2
- All patches now upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Oct 2008 17:38:44 -0000	1.2
+++ .cvsignore	5 Dec 2009 17:19:12 -0000	1.3
@@ -1 +1 @@
-logstalgia-0.9.1.tar.gz
+logstalgia-0.9.2.tar.gz


Index: logstalgia.spec
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/devel/logstalgia.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- logstalgia.spec	25 Jul 2009 11:15:40 -0000	1.3
+++ logstalgia.spec	5 Dec 2009 17:19:13 -0000	1.4
@@ -1,17 +1,11 @@
 Summary:        Web server access log visualizer
 Name:           logstalgia
-Version:        0.9.1
-Release:        4%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Group:          Applications/Internet 
 License:        GPLv3+
 URL:            http://code.google.com/p/logstalgia/
 Source0:        http://logstalgia.googlecode.com/files/logstalgia-%{version}.tar.gz
-# Upstream bug
-# http://code.google.com/p/logstalgia/issues/detail?id=3
-Patch0:         logstalgia-0.9.1-gcc43.patch
-# and http://code.google.com/p/logstalgia/issues/detail?id=10
-Patch1:         logstalgia-0.9.1-destdir.patch
-Patch2:         logstalgia-0.9.1-optflags.patch
 BuildRequires:  SDL-devel SDL_image-devel pcre-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %description
@@ -20,9 +14,6 @@ access log (eg access.log) as a retro ar
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure
@@ -43,6 +34,10 @@ access log (eg access.log) as a retro ar
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Dec 05 2009 Terje R?sten <terje.rosten at ntnu.no> - 0.9.2-1
+- 0.9.2
+- All patches now upstream
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Oct 2008 17:38:44 -0000	1.2
+++ sources	5 Dec 2009 17:19:13 -0000	1.3
@@ -1 +1 @@
-3b5ecb1c48341c708e346c379d99ecef  logstalgia-0.9.1.tar.gz
+6a7333a1bf78d34521cbae8665aa8380  logstalgia-0.9.2.tar.gz


--- logstalgia-0.9.1-destdir.patch DELETED ---


--- logstalgia-0.9.1-gcc43.patch DELETED ---


--- logstalgia-0.9.1-optflags.patch DELETED ---



From terjeros at fedoraproject.org  Sat Dec  5 17:38:13 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 17:38:13 +0000 (UTC)
Subject: rpms/logstalgia/F-11 .cvsignore, 1.2, 1.3 logstalgia.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091205173813.CC24A11C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/logstalgia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30896/F-11

Modified Files:
	.cvsignore logstalgia.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Oct 2008 17:38:44 -0000	1.2
+++ .cvsignore	5 Dec 2009 17:38:13 -0000	1.3
@@ -1 +1 @@
-logstalgia-0.9.1.tar.gz
+logstalgia-0.9.2.tar.gz


Index: logstalgia.spec
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/F-11/logstalgia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- logstalgia.spec	25 Feb 2009 20:55:13 -0000	1.2
+++ logstalgia.spec	5 Dec 2009 17:38:13 -0000	1.3
@@ -1,17 +1,11 @@
 Summary:        Web server access log visualizer
 Name:           logstalgia
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Group:          Applications/Internet 
 License:        GPLv3+
 URL:            http://code.google.com/p/logstalgia/
 Source0:        http://logstalgia.googlecode.com/files/logstalgia-%{version}.tar.gz
-# Upstream bug
-# http://code.google.com/p/logstalgia/issues/detail?id=3
-Patch0:         logstalgia-0.9.1-gcc43.patch
-# and http://code.google.com/p/logstalgia/issues/detail?id=10
-Patch1:         logstalgia-0.9.1-destdir.patch
-Patch2:         logstalgia-0.9.1-optflags.patch
 BuildRequires:  SDL-devel SDL_image-devel pcre-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %description
@@ -20,9 +14,6 @@ access log (eg access.log) as a retro ar
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure
@@ -43,6 +34,13 @@ access log (eg access.log) as a retro ar
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Dec 05 2009 Terje R?sten <terje.rosten at ntnu.no> - 0.9.2-1
+- 0.9.2
+- All patches now upstream
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Oct 2008 17:38:44 -0000	1.2
+++ sources	5 Dec 2009 17:38:13 -0000	1.3
@@ -1 +1 @@
-3b5ecb1c48341c708e346c379d99ecef  logstalgia-0.9.1.tar.gz
+6a7333a1bf78d34521cbae8665aa8380  logstalgia-0.9.2.tar.gz



From terjeros at fedoraproject.org  Sat Dec  5 17:38:13 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 17:38:13 +0000 (UTC)
Subject: rpms/logstalgia/F-12 .cvsignore, 1.2, 1.3 logstalgia.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091205173813.F407011C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/logstalgia/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30896/F-12

Modified Files:
	.cvsignore logstalgia.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Oct 2008 17:38:44 -0000	1.2
+++ .cvsignore	5 Dec 2009 17:38:13 -0000	1.3
@@ -1 +1 @@
-logstalgia-0.9.1.tar.gz
+logstalgia-0.9.2.tar.gz


Index: logstalgia.spec
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/F-12/logstalgia.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- logstalgia.spec	25 Jul 2009 11:15:40 -0000	1.3
+++ logstalgia.spec	5 Dec 2009 17:38:13 -0000	1.4
@@ -1,17 +1,11 @@
 Summary:        Web server access log visualizer
 Name:           logstalgia
-Version:        0.9.1
-Release:        4%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Group:          Applications/Internet 
 License:        GPLv3+
 URL:            http://code.google.com/p/logstalgia/
 Source0:        http://logstalgia.googlecode.com/files/logstalgia-%{version}.tar.gz
-# Upstream bug
-# http://code.google.com/p/logstalgia/issues/detail?id=3
-Patch0:         logstalgia-0.9.1-gcc43.patch
-# and http://code.google.com/p/logstalgia/issues/detail?id=10
-Patch1:         logstalgia-0.9.1-destdir.patch
-Patch2:         logstalgia-0.9.1-optflags.patch
 BuildRequires:  SDL-devel SDL_image-devel pcre-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %description
@@ -20,9 +14,6 @@ access log (eg access.log) as a retro ar
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure
@@ -43,6 +34,10 @@ access log (eg access.log) as a retro ar
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Dec 05 2009 Terje R?sten <terje.rosten at ntnu.no> - 0.9.2-1
+- 0.9.2
+- All patches now upstream
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logstalgia/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Oct 2008 17:38:44 -0000	1.2
+++ sources	5 Dec 2009 17:38:13 -0000	1.3
@@ -1 +1 @@
-3b5ecb1c48341c708e346c379d99ecef  logstalgia-0.9.1.tar.gz
+6a7333a1bf78d34521cbae8665aa8380  logstalgia-0.9.2.tar.gz



From terjeros at fedoraproject.org  Sat Dec  5 17:58:36 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 17:58:36 +0000 (UTC)
Subject: File moserial-2.28.0.tar.bz2 uploaded to lookaside cache by terjeros
Message-ID: <20091205175836.DF3A710F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for moserial:

24620415d1d51583278abb533df70ca3  moserial-2.28.0.tar.bz2



From terjeros at fedoraproject.org  Sat Dec  5 17:59:32 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 17:59:32 +0000 (UTC)
Subject: rpms/moserial/devel .cvsignore, 1.4, 1.5 moserial.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20091205175932.4F2C911C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/moserial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4537

Modified Files:
	.cvsignore moserial.spec sources 
Log Message:
* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-1
- 2.28.0
- Fix file perms



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moserial/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Aug 2009 17:40:23 -0000	1.4
+++ .cvsignore	5 Dec 2009 17:59:32 -0000	1.5
@@ -1 +1 @@
-moserial-2.27.3.tar.bz2
+moserial-2.28.0.tar.bz2


Index: moserial.spec
===================================================================
RCS file: /cvs/extras/rpms/moserial/devel/moserial.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moserial.spec	12 Aug 2009 17:40:23 -0000	1.4
+++ moserial.spec	5 Dec 2009 17:59:32 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:       Serial terminal for the gnome desktop
 Name:          moserial
-Version:       2.27.3
-Release:       2%{?dist}
+Version:       2.28.0
+Release:       1%{?dist}
 Group:         Applications/Communications
 License:       GPLv3+
 URL:           http://live.gnome.org/moserial/
@@ -19,6 +19,8 @@ desktop. It is written in Vala for extra
 %prep
 %setup -q
 [ -s README ] && exit 1
+find -name *.c -print0 | xargs --null chmod 0644
+chmod 0644 AUTHORS ChangeLog.pre-git NEWS COPYING MAINTAINERS
 
 %build
 %configure
@@ -58,6 +60,10 @@ fi
 %{_datadir}/omf/%{name}
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-1
+- 2.28.0
+- Fix file perms
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.3-2
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moserial/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 17:40:23 -0000	1.4
+++ sources	5 Dec 2009 17:59:32 -0000	1.5
@@ -1 +1 @@
-6cfeb8177b63ed6586be595bd7dbf56f  moserial-2.27.3.tar.bz2
+24620415d1d51583278abb533df70ca3  moserial-2.28.0.tar.bz2



From orion at fedoraproject.org  Sat Dec  5 18:09:46 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sat,  5 Dec 2009 18:09:46 +0000 (UTC)
Subject: rpms/netcdf/devel netcdf.spec,1.44,1.45
Message-ID: <20091205180946.79E5511C0095@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7554

Modified Files:
	netcdf.spec 
Log Message:
* Sat Dec 5 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.7.2009120100
- Leave include files in /usr/include



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- netcdf.spec	1 Dec 2009 18:46:25 -0000	1.44
+++ netcdf.spec	5 Dec 2009 18:09:45 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.1.0
-Release:        0.6.2009120100%{?dist}
+Release:        0.7.2009120100%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -99,12 +99,9 @@ make #%{?_smp_mflags}
 
 %install
 make install DESTDIR=${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf
 mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
 /bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod  \
   ${RPM_BUILD_ROOT}%{_fmoddir}
-/bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.* \
-  ${RPM_BUILD_ROOT}%{_includedir}/netcdf
 /bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 /bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
@@ -145,7 +142,11 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/nc-config
-%{_includedir}/netcdf
+%{_includedir}/ncvalues.h
+%{_includedir}/netcdf.h
+%{_includedir}/netcdf.hh
+%{_includedir}/netcdf.inc
+%{_includedir}/netcdfcpp.h
 %{_fmoddir}/*.mod
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/netcdf.pc
@@ -157,6 +158,9 @@ fi
 
 
 %changelog
+* Sat Dec 5 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.7.2009120100
+- Leave include files in /usr/include
+
 * Tue Dec 1 2009 Orion Poplawski <orion at cora.nwra.com> - 4.1.0-0.6.2009120100
 - Update snapshot, removes SZIP defines from header
 



From terjeros at fedoraproject.org  Sat Dec  5 18:24:53 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 18:24:53 +0000 (UTC)
Subject: rpms/moserial/devel moserial.spec,1.5,1.6
Message-ID: <20091205182453.25A1311C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/moserial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11747

Modified Files:
	moserial.spec 
Log Message:
* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-2
- rarian-compat needed to build



Index: moserial.spec
===================================================================
RCS file: /cvs/extras/rpms/moserial/devel/moserial.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moserial.spec	5 Dec 2009 17:59:32 -0000	1.5
+++ moserial.spec	5 Dec 2009 18:24:52 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:       Serial terminal for the gnome desktop
 Name:          moserial
 Version:       2.28.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Group:         Applications/Communications
 License:       GPLv3+
 URL:           http://live.gnome.org/moserial/
@@ -9,7 +9,7 @@ Source0:       http://ftp.gnome.org/pub/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      yelp hicolor-icon-theme
 BuildRequires: vala desktop-file-utils GConf2-devel perl(XML::Parser)
-BuildRequires: gnome-doc-utils intltool
+BuildRequires: gnome-doc-utils intltool rarian-compat
 
 
 %description
@@ -60,6 +60,9 @@ fi
 %{_datadir}/omf/%{name}
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-2
+- rarian-compat needed to build
+
 * Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-1
 - 2.28.0
 - Fix file perms



From terjeros at fedoraproject.org  Sat Dec  5 18:30:59 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 18:30:59 +0000 (UTC)
Subject: rpms/moserial/F-12 .cvsignore, 1.4, 1.5 moserial.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20091205183059.88FC111C00EF@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/moserial/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13284/F-12

Modified Files:
	.cvsignore moserial.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moserial/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Aug 2009 17:40:23 -0000	1.4
+++ .cvsignore	5 Dec 2009 18:30:58 -0000	1.5
@@ -1 +1 @@
-moserial-2.27.3.tar.bz2
+moserial-2.28.0.tar.bz2


Index: moserial.spec
===================================================================
RCS file: /cvs/extras/rpms/moserial/F-12/moserial.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moserial.spec	12 Aug 2009 17:40:23 -0000	1.4
+++ moserial.spec	5 Dec 2009 18:30:58 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:       Serial terminal for the gnome desktop
 Name:          moserial
-Version:       2.27.3
+Version:       2.28.0
 Release:       2%{?dist}
 Group:         Applications/Communications
 License:       GPLv3+
@@ -9,7 +9,7 @@ Source0:       http://ftp.gnome.org/pub/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      yelp hicolor-icon-theme
 BuildRequires: vala desktop-file-utils GConf2-devel perl(XML::Parser)
-BuildRequires: gnome-doc-utils intltool
+BuildRequires: gnome-doc-utils intltool rarian-compat
 
 
 %description
@@ -19,6 +19,8 @@ desktop. It is written in Vala for extra
 %prep
 %setup -q
 [ -s README ] && exit 1
+find -name *.c -print0 | xargs --null chmod 0644
+chmod 0644 AUTHORS ChangeLog.pre-git NEWS COPYING MAINTAINERS
 
 %build
 %configure
@@ -58,6 +60,13 @@ fi
 %{_datadir}/omf/%{name}
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-2
+- rarian-compat needed to build
+
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-1
+- 2.28.0
+- Fix file perms
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.3-2
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moserial/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 17:40:23 -0000	1.4
+++ sources	5 Dec 2009 18:30:59 -0000	1.5
@@ -1 +1 @@
-6cfeb8177b63ed6586be595bd7dbf56f  moserial-2.27.3.tar.bz2
+24620415d1d51583278abb533df70ca3  moserial-2.28.0.tar.bz2



From terjeros at fedoraproject.org  Sat Dec  5 18:30:59 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 18:30:59 +0000 (UTC)
Subject: rpms/moserial/F-11 .cvsignore, 1.2, 1.3 moserial.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091205183059.628BB11C00EF@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/moserial/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13284/F-11

Modified Files:
	.cvsignore moserial.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moserial/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 May 2009 20:56:44 -0000	1.2
+++ .cvsignore	5 Dec 2009 18:30:58 -0000	1.3
@@ -1 +1 @@
-moserial-2.26.1.tar.gz
+moserial-2.28.0.tar.bz2


Index: moserial.spec
===================================================================
RCS file: /cvs/extras/rpms/moserial/F-11/moserial.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moserial.spec	31 May 2009 20:56:44 -0000	1.1
+++ moserial.spec	5 Dec 2009 18:30:58 -0000	1.2
@@ -1,15 +1,15 @@
 Summary:       Serial terminal for the gnome desktop
 Name:          moserial
-Version:       2.26.1
+Version:       2.28.0
 Release:       2%{?dist}
 Group:         Applications/Communications
 License:       GPLv3+
 URL:           http://live.gnome.org/moserial/
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/moserial/2.26/moserial-%{version}.tar.gz
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/moserial/2.27/moserial-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      yelp hicolor-icon-theme
 BuildRequires: vala desktop-file-utils GConf2-devel perl(XML::Parser)
-BuildRequires: gnome-doc-utils intltool
+BuildRequires: gnome-doc-utils intltool rarian-compat
 
 
 %description
@@ -19,6 +19,8 @@ desktop. It is written in Vala for extra
 %prep
 %setup -q
 [ -s README ] && exit 1
+find -name *.c -print0 | xargs --null chmod 0644
+chmod 0644 AUTHORS ChangeLog.pre-git NEWS COPYING MAINTAINERS
 
 %build
 %configure
@@ -58,6 +60,22 @@ fi
 %{_datadir}/omf/%{name}
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-2
+- rarian-compat needed to build
+
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.28.0-1
+- 2.28.0
+- Fix file perms
+
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.3-2
+- Use bzipped upstream tarball.
+
+* Fri Jul 31 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.27.3-1
+- 2.27.3
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 30 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.26.1-2
 - add req. on yelp and hicolor-icon-theme
 - fix dir ownership


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moserial/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 May 2009 20:56:44 -0000	1.2
+++ sources	5 Dec 2009 18:30:58 -0000	1.3
@@ -1 +1 @@
-437ebcc0eb7fa56751604eee2a4b4cd0  moserial-2.26.1.tar.gz
+24620415d1d51583278abb533df70ca3  moserial-2.28.0.tar.bz2



From cweyl at fedoraproject.org  Sat Dec  5 18:51:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  5 Dec 2009 18:51:51 +0000 (UTC)
Subject: File App-Cmd-0.303.tar.gz uploaded to lookaside cache by cweyl
Message-ID: <20091205185151.97DDD10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-App-Cmd:

f3e8340d81cd026ca412dd5be540d69f  App-Cmd-0.303.tar.gz



From dledford at fedoraproject.org  Sat Dec  5 18:56:44 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sat,  5 Dec 2009 18:56:44 +0000 (UTC)
Subject: rpms/libmthca/devel libmthca.spec,1.14,1.15
Message-ID: <20091205185644.9CA0211C0095@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libmthca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20585

Modified Files:
	libmthca.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-6
- Tweak the provides and obsoletes a little bit to make sure we only pull in
  the -static package to replace past -devel-static packages, and not past
  -devel packages.



Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/libmthca.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libmthca.spec	2 Dec 2009 19:35:12 -0000	1.14
+++ libmthca.spec	5 Dec 2009 18:56:44 -0000	1.15
@@ -1,6 +1,6 @@
 Name: libmthca
 Version: 1.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 Provides: libibverbs-driver
 Group: System Environment/Libraries
@@ -12,6 +12,7 @@ Patch1: libmthca-Remove-empty-stubs-for-
 Patch2: libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
 Patch3: libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Provides: %{name}-devel = %{version}-%{release}
 BuildRequires: libibverbs-devel >= 1.1.3
 %ifnarch ia64
 BuildRequires: valgrind-devel
@@ -27,8 +28,6 @@ Summary: Development files for the libmt
 Group: System Environment/Libraries
 Provides: %{name}-devel-static = %{version}-%{release}
 Obsoletes: %{name}-devel-static <= 1.0.5-3
-Provides: %{name}-devel = %{version}-%{release}
-Obsoletes: %{name}-devel <= 1.0.5-3
 Requires: %{name} = %{version}-%{release}
 
 %description static
@@ -70,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmthca.a
 
 %changelog
+* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-6
+- Tweak the provides and obsoletes a little bit to make sure we only pull in
+  the -static package to replace past -devel-static packages, and not past
+  -devel packages.
+
 * Wed Dec 02 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-5
 - Rename devel-static package to just -static, it only has a single static
   lib in it and no actual devel files (like headers, those are part of



From dledford at fedoraproject.org  Sat Dec  5 18:57:20 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sat,  5 Dec 2009 18:57:20 +0000 (UTC)
Subject: rpms/libmthca/F-12 libmthca.spec,1.14,1.15
Message-ID: <20091205185720.023E211C0095@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libmthca/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20841

Modified Files:
	libmthca.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-6
- Tweak the provides and obsoletes a little bit to make sure we only pull in
  the -static package to replace past -devel-static packages, and not past
  -devel packages.



Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/F-12/libmthca.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libmthca.spec	2 Dec 2009 19:35:46 -0000	1.14
+++ libmthca.spec	5 Dec 2009 18:57:19 -0000	1.15
@@ -1,6 +1,6 @@
 Name: libmthca
 Version: 1.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 Provides: libibverbs-driver
 Group: System Environment/Libraries
@@ -12,6 +12,7 @@ Patch1: libmthca-Remove-empty-stubs-for-
 Patch2: libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
 Patch3: libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Provides: %{name}-devel = %{version}-%{release}
 BuildRequires: libibverbs-devel >= 1.1.3
 %ifnarch ia64
 BuildRequires: valgrind-devel
@@ -27,8 +28,6 @@ Summary: Development files for the libmt
 Group: System Environment/Libraries
 Provides: %{name}-devel-static = %{version}-%{release}
 Obsoletes: %{name}-devel-static <= 1.0.5-3
-Provides: %{name}-devel = %{version}-%{release}
-Obsoletes: %{name}-devel <= 1.0.5-3
 Requires: %{name} = %{version}-%{release}
 
 %description static
@@ -70,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmthca.a
 
 %changelog
+* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-6
+- Tweak the provides and obsoletes a little bit to make sure we only pull in
+  the -static package to replace past -devel-static packages, and not past
+  -devel packages.
+
 * Wed Dec 02 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-5
 - Rename devel-static package to just -static, it only has a single static
   lib in it and no actual devel files (like headers, those are part of



From dledford at fedoraproject.org  Sat Dec  5 19:01:55 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sat,  5 Dec 2009 19:01:55 +0000 (UTC)
Subject: rpms/libmlx4/devel libmlx4.spec,1.5,1.6
Message-ID: <20091205190155.6A20D11C0095@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libmlx4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22489

Modified Files:
	libmlx4.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-3
- Tweak the provides and obsoletes a little bit to make sure we only pull in
  the -static package to replace past -devel-static packages, and not past
  -devel packages.



Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/devel/libmlx4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libmlx4.spec	2 Dec 2009 01:15:12 -0000	1.5
+++ libmlx4.spec	5 Dec 2009 19:01:55 -0000	1.6
@@ -16,6 +16,7 @@ Patch2: libmlx4-0003-mmap-needs-some-inc
 Patch3: libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch
 Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Provides: libmlx4-devel = %{version}-%{release}
 BuildRequires: libibverbs-devel >= 1.1.3
 %ifnarch ia64
 BuildRequires: valgrind-devel
@@ -28,9 +29,9 @@ ConnectX HCAs for use with the libibverb
 %package static
 Summary: Static version of the libmlx4 driver
 Group: System Environment/Libraries
+Provides: %{name}-devel-static = %{version}-%{release}
+Obsoletes: %{name}-devel-static <= 1.0.1-1
 Requires: %{name} = %{version}-%{release}
-Provides: libmlx4-devel = %{version}-%{release}
-Obsoletes: libmlx4-devel <= 1.0
 
 %description static
 Static version of libmlx4 that may be linked directly to an
@@ -78,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmlx4.a
 
 %changelog
+* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-3
+- Tweak the provides and obsoletes a little bit to make sure we only pull in
+  the -static package to replace past -devel-static packages, and not past
+  -devel packages.
+
 * Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
 - Merge various bits from Red Hat package into Fedora package
 



From dledford at fedoraproject.org  Sat Dec  5 19:02:41 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sat,  5 Dec 2009 19:02:41 +0000 (UTC)
Subject: rpms/libmlx4/devel libmlx4.spec,1.6,1.7
Message-ID: <20091205190241.B069711C0095@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libmlx4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22782

Modified Files:
	libmlx4.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-3
- Tweak the provides and obsoletes a little bit to make sure we only pull in
  the -static package to replace past -devel-static packages, and not past
  -devel packages.



Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/devel/libmlx4.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libmlx4.spec	5 Dec 2009 19:01:55 -0000	1.6
+++ libmlx4.spec	5 Dec 2009 19:02:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name: libmlx4
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
 Provides: libibverbs-driver
 Group: System Environment/Libraries



From dledford at fedoraproject.org  Sat Dec  5 19:03:21 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sat,  5 Dec 2009 19:03:21 +0000 (UTC)
Subject: rpms/libmlx4/F-12 libmlx4.spec,1.5,1.6
Message-ID: <20091205190321.31CA811C03DB@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libmlx4/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23073

Modified Files:
	libmlx4.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-3
- Tweak the provides and obsoletes a little bit to make sure we only pull in
  the -static package to replace past -devel-static packages, and not past
  -devel packages.



Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/F-12/libmlx4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libmlx4.spec	2 Dec 2009 01:17:08 -0000	1.5
+++ libmlx4.spec	5 Dec 2009 19:03:21 -0000	1.6
@@ -1,6 +1,6 @@
 Name: libmlx4
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
 Provides: libibverbs-driver
 Group: System Environment/Libraries
@@ -16,6 +16,7 @@ Patch2: libmlx4-0003-mmap-needs-some-inc
 Patch3: libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch
 Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Provides: libmlx4-devel = %{version}-%{release}
 BuildRequires: libibverbs-devel >= 1.1.3
 %ifnarch ia64
 BuildRequires: valgrind-devel
@@ -28,9 +29,9 @@ ConnectX HCAs for use with the libibverb
 %package static
 Summary: Static version of the libmlx4 driver
 Group: System Environment/Libraries
+Provides: %{name}-devel-static = %{version}-%{release}
+Obsoletes: %{name}-devel-static <= 1.0.1-1
 Requires: %{name} = %{version}-%{release}
-Provides: libmlx4-devel = %{version}-%{release}
-Obsoletes: libmlx4-devel <= 1.0
 
 %description static
 Static version of libmlx4 that may be linked directly to an
@@ -78,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmlx4.a
 
 %changelog
+* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-3
+- Tweak the provides and obsoletes a little bit to make sure we only pull in
+  the -static package to replace past -devel-static packages, and not past
+  -devel packages.
+
 * Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
 - Merge various bits from Red Hat package into Fedora package
 



From terjeros at fedoraproject.org  Sat Dec  5 19:12:00 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 19:12:00 +0000 (UTC)
Subject: File mathomatic-15.0.0.tar.bz2 uploaded to lookaside cache by
	terjeros
Message-ID: <20091205191200.242C010F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mathomatic:

147694e40acc58e83bb285904fdc834a  mathomatic-15.0.0.tar.bz2



From terjeros at fedoraproject.org  Sat Dec  5 19:12:57 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 19:12:57 +0000 (UTC)
Subject: rpms/mathomatic/devel mathomatic-15.0.0-optflags.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 mathomatic.spec, 1.6, 1.7 sources, 1.5,
	1.6 mathomatic-14.2.8-build.patch, 1.1, NONE
Message-ID: <20091205191257.E290D11C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/mathomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25806

Modified Files:
	.cvsignore mathomatic.spec sources 
Added Files:
	mathomatic-15.0.0-optflags.patch 
Removed Files:
	mathomatic-14.2.8-build.patch 
Log Message:
* Sat Dec  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 15.0.0-1
- 15.0.0


mathomatic-15.0.0-optflags.patch:
 makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mathomatic-15.0.0-optflags.patch ---
--- makefile~	2009-11-15 12:11:22.000000000 +0100
+++ makefile	2009-12-05 19:53:57.000000000 +0100
@@ -5,8 +5,8 @@
 # This makefile does create and install all documentation.
 
 VERSION		= `cat VERSION`
-CFLAGS		+= -Wall -Wshadow -Wno-char-subscripts -fomit-frame-pointer # gcc specific flags
-CFLAGS		+= -O -DUNIX -DVERSION=\"$(VERSION)\"
+OPTFLAGS	+= -O -Wall -Wshadow -Wno-char-subscripts -fomit-frame-pointer # gcc specific flags
+CFLAGS		+= $(OPTFLAGS) -DUNIX -DVERSION=\"$(VERSION)\"
 LDLIBS		+= -lm # libraries to link
 
 # "make READLINE=1" to include readline support:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Feb 2009 18:36:59 -0000	1.5
+++ .cvsignore	5 Dec 2009 19:12:57 -0000	1.6
@@ -1 +1 @@
-mathomatic-14.3.1.tar.bz2
+mathomatic-15.0.0.tar.bz2


Index: mathomatic.spec
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/devel/mathomatic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mathomatic.spec	25 Jul 2009 11:50:02 -0000	1.6
+++ mathomatic.spec	5 Dec 2009 19:12:57 -0000	1.7
@@ -1,12 +1,12 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       14.3.1
-Release:       3%{?dist} 
+Version:       15.0.0
+Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
 URL:           http://www.mathomatic.org/
 Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
-Patch0:        mathomatic-14.2.8-build.patch
+Patch0:        mathomatic-15.0.0-optflags.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils readline-devel
 
@@ -31,10 +31,10 @@ This package contains small math tools f
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 %build
-%{__make} %{?_smp_mflags} OPTFLAGS='%{optflags}' READLINE=1 prefix=%{_prefix} 
+%{__make} %{?_smp_mflags} OPTFLAGS="%{optflags}" READLINE=1 prefix=%{_prefix} 
 
 pushd primes
 %{__make} %{?_smp_mflags} prefix=%{_prefix} CFLAGS="%{optflags}"
@@ -71,6 +71,9 @@ pushd primes
 %{_mandir}/man1/matho-sumsq.1*
 
 %changelog
+* Sat Dec  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 15.0.0-1
+- 15.0.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Feb 2009 18:36:59 -0000	1.5
+++ sources	5 Dec 2009 19:12:57 -0000	1.6
@@ -1 +1 @@
-12d9b195cc6d92d65f26d407120cda8b  mathomatic-14.3.1.tar.bz2
+147694e40acc58e83bb285904fdc834a  mathomatic-15.0.0.tar.bz2


--- mathomatic-14.2.8-build.patch DELETED ---



From terjeros at fedoraproject.org  Sat Dec  5 19:21:29 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 19:21:29 +0000 (UTC)
Subject: rpms/mathomatic/F-11 mathomatic-15.0.0-optflags.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 mathomatic.spec, 1.5, 1.6 sources, 1.5,
	1.6 mathomatic-14.2.8-build.patch, 1.1, NONE
Message-ID: <20091205192129.B689F11C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/mathomatic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28073/F-11

Modified Files:
	.cvsignore mathomatic.spec sources 
Added Files:
	mathomatic-15.0.0-optflags.patch 
Removed Files:
	mathomatic-14.2.8-build.patch 
Log Message:
Sync with rawhide.



mathomatic-15.0.0-optflags.patch:
 makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mathomatic-15.0.0-optflags.patch ---
--- makefile~	2009-11-15 12:11:22.000000000 +0100
+++ makefile	2009-12-05 19:53:57.000000000 +0100
@@ -5,8 +5,8 @@
 # This makefile does create and install all documentation.
 
 VERSION		= `cat VERSION`
-CFLAGS		+= -Wall -Wshadow -Wno-char-subscripts -fomit-frame-pointer # gcc specific flags
-CFLAGS		+= -O -DUNIX -DVERSION=\"$(VERSION)\"
+OPTFLAGS	+= -O -Wall -Wshadow -Wno-char-subscripts -fomit-frame-pointer # gcc specific flags
+CFLAGS		+= $(OPTFLAGS) -DUNIX -DVERSION=\"$(VERSION)\"
 LDLIBS		+= -lm # libraries to link
 
 # "make READLINE=1" to include readline support:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Feb 2009 18:36:59 -0000	1.5
+++ .cvsignore	5 Dec 2009 19:21:29 -0000	1.6
@@ -1 +1 @@
-mathomatic-14.3.1.tar.bz2
+mathomatic-15.0.0.tar.bz2


Index: mathomatic.spec
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-11/mathomatic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mathomatic.spec	25 Feb 2009 23:46:37 -0000	1.5
+++ mathomatic.spec	5 Dec 2009 19:21:29 -0000	1.6
@@ -1,12 +1,12 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       14.3.1
-Release:       2%{?dist} 
+Version:       15.0.0
+Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
 URL:           http://www.mathomatic.org/
 Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
-Patch0:        mathomatic-14.2.8-build.patch
+Patch0:        mathomatic-15.0.0-optflags.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils readline-devel
 
@@ -31,10 +31,10 @@ This package contains small math tools f
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 %build
-%{__make} %{?_smp_mflags} OPTFLAGS='%{optflags}' READLINE=1 prefix=%{_prefix} 
+%{__make} %{?_smp_mflags} OPTFLAGS="%{optflags}" READLINE=1 prefix=%{_prefix} 
 
 pushd primes
 %{__make} %{?_smp_mflags} prefix=%{_prefix} CFLAGS="%{optflags}"
@@ -71,6 +71,12 @@ pushd primes
 %{_mandir}/man1/matho-sumsq.1*
 
 %changelog
+* Sat Dec  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 15.0.0-1
+- 15.0.0
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Feb 2009 18:36:59 -0000	1.5
+++ sources	5 Dec 2009 19:21:29 -0000	1.6
@@ -1 +1 @@
-12d9b195cc6d92d65f26d407120cda8b  mathomatic-14.3.1.tar.bz2
+147694e40acc58e83bb285904fdc834a  mathomatic-15.0.0.tar.bz2


--- mathomatic-14.2.8-build.patch DELETED ---



From terjeros at fedoraproject.org  Sat Dec  5 19:21:30 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 19:21:30 +0000 (UTC)
Subject: rpms/mathomatic/F-12 mathomatic-15.0.0-optflags.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 mathomatic.spec, 1.6, 1.7 sources, 1.5,
	1.6 mathomatic-14.2.8-build.patch, 1.1, NONE
Message-ID: <20091205192130.04F0F11C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/mathomatic/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28073/F-12

Modified Files:
	.cvsignore mathomatic.spec sources 
Added Files:
	mathomatic-15.0.0-optflags.patch 
Removed Files:
	mathomatic-14.2.8-build.patch 
Log Message:
Sync with rawhide.



mathomatic-15.0.0-optflags.patch:
 makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mathomatic-15.0.0-optflags.patch ---
--- makefile~	2009-11-15 12:11:22.000000000 +0100
+++ makefile	2009-12-05 19:53:57.000000000 +0100
@@ -5,8 +5,8 @@
 # This makefile does create and install all documentation.
 
 VERSION		= `cat VERSION`
-CFLAGS		+= -Wall -Wshadow -Wno-char-subscripts -fomit-frame-pointer # gcc specific flags
-CFLAGS		+= -O -DUNIX -DVERSION=\"$(VERSION)\"
+OPTFLAGS	+= -O -Wall -Wshadow -Wno-char-subscripts -fomit-frame-pointer # gcc specific flags
+CFLAGS		+= $(OPTFLAGS) -DUNIX -DVERSION=\"$(VERSION)\"
 LDLIBS		+= -lm # libraries to link
 
 # "make READLINE=1" to include readline support:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Feb 2009 18:36:59 -0000	1.5
+++ .cvsignore	5 Dec 2009 19:21:29 -0000	1.6
@@ -1 +1 @@
-mathomatic-14.3.1.tar.bz2
+mathomatic-15.0.0.tar.bz2


Index: mathomatic.spec
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-12/mathomatic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mathomatic.spec	25 Jul 2009 11:50:02 -0000	1.6
+++ mathomatic.spec	5 Dec 2009 19:21:29 -0000	1.7
@@ -1,12 +1,12 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       14.3.1
-Release:       3%{?dist} 
+Version:       15.0.0
+Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
 URL:           http://www.mathomatic.org/
 Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
-Patch0:        mathomatic-14.2.8-build.patch
+Patch0:        mathomatic-15.0.0-optflags.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils readline-devel
 
@@ -31,10 +31,10 @@ This package contains small math tools f
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 %build
-%{__make} %{?_smp_mflags} OPTFLAGS='%{optflags}' READLINE=1 prefix=%{_prefix} 
+%{__make} %{?_smp_mflags} OPTFLAGS="%{optflags}" READLINE=1 prefix=%{_prefix} 
 
 pushd primes
 %{__make} %{?_smp_mflags} prefix=%{_prefix} CFLAGS="%{optflags}"
@@ -71,6 +71,9 @@ pushd primes
 %{_mandir}/man1/matho-sumsq.1*
 
 %changelog
+* Sat Dec  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 15.0.0-1
+- 15.0.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Feb 2009 18:36:59 -0000	1.5
+++ sources	5 Dec 2009 19:21:29 -0000	1.6
@@ -1 +1 @@
-12d9b195cc6d92d65f26d407120cda8b  mathomatic-14.3.1.tar.bz2
+147694e40acc58e83bb285904fdc834a  mathomatic-15.0.0.tar.bz2


--- mathomatic-14.2.8-build.patch DELETED ---



From ksebasti at fedoraproject.org  Sat Dec  5 19:41:50 2009
From: ksebasti at fedoraproject.org (Kent Sebastian)
Date: Sat,  5 Dec 2009 19:41:50 +0000 (UTC)
Subject: File eclipse-oprofile-fetched-src-0.3.0.tar.bz2 uploaded to
	lookaside cache by ksebasti
Message-ID: <20091205194150.9585910F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-oprofile:

721b3b0eb67bdb49e91256338d53bd73  eclipse-oprofile-fetched-src-0.3.0.tar.bz2



From kdudka at fedoraproject.org  Sat Dec  5 19:48:31 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sat,  5 Dec 2009 19:48:31 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.7-localhost6.patch, NONE,
	1.1 curl-7.19.7-s390-sleep.patch, 1.1, 1.2 curl.spec, 1.130, 1.131
Message-ID: <20091205194831.5E57911C0095@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3515

Modified Files:
	curl-7.19.7-s390-sleep.patch curl.spec 
Added Files:
	curl-7.19.7-localhost6.patch 
Log Message:
attempt to improve test suite coverage

curl-7.19.7-localhost6.patch:
 test1083 |    6 +++---
 test241  |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE curl-7.19.7-localhost6.patch ---
diff --git a/tests/data/test1083 b/tests/data/test1083
index e441278..b0958b6 100644
--- a/tests/data/test1083
+++ b/tests/data/test1083
@@ -33,13 +33,13 @@ ipv6
 http-ipv6
 </server>
  <name>
-HTTP-IPv6 GET with ip6-localhost --interface
+HTTP-IPv6 GET with localhost6 --interface
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost
+-g "http://%HOST6IP:%HTTP6PORT/1083" --interface localhost6
 </command>
 <precheck>
-perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
+perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 localhost6'; print 'Cannot run precheck resolve';}"
 </precheck>
 </client>
 
diff --git a/tests/data/test241 b/tests/data/test241
index 46eae1f..4e1632c 100644
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -30,13 +30,13 @@ ipv6
 http-ipv6
 </server>
  <name>
-HTTP-IPv6 GET (using ip6-localhost)
+HTTP-IPv6 GET (using localhost6)
  </name>
  <command>
--g "http://ip6-localhost:%HTTP6PORT/241"
+-g "http://localhost6:%HTTP6PORT/241"
 </command>
 <precheck>
-./server/resolve --ipv6 ip6-localhost
+./server/resolve --ipv6 localhost6
 </precheck>
 </client>
 
@@ -48,7 +48,7 @@ HTTP-IPv6 GET (using ip6-localhost)
 </strip>
 <protocol>
 GET /241 HTTP/1.1
-Host: ip6-localhost:%HTTP6PORT
+Host: localhost6:%HTTP6PORT
 Accept: */*
 
 </protocol>

curl-7.19.7-s390-sleep.patch:
 runtests.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: curl-7.19.7-s390-sleep.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl-7.19.7-s390-sleep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- curl-7.19.7-s390-sleep.patch	4 Dec 2009 23:50:15 -0000	1.1
+++ curl-7.19.7-s390-sleep.patch	5 Dec 2009 19:48:31 -0000	1.2
@@ -1,20 +1,13 @@
-diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
-index b06a3c6..bf14650 100644
---- a/tests/libtest/lib513.c
-+++ b/tests/libtest/lib513.c
-@@ -12,12 +12,15 @@
+diff --git a/tests/runtests.pl b/tests/runtests.pl
+index a6597b9..c900ad8 100755
+--- a/tests/runtests.pl
++++ b/tests/runtests.pl
+@@ -209,7 +209,7 @@ my $sshdverstr;  # for socks server, ssh daemon version string
+ my $sshderror;   # for socks server, ssh daemon version error
  
- #include "memdebug.h"
+ my $defserverlogslocktimeout = 20; # timeout to await server logs lock removal
+-my $defpostcommanddelay = 0; # delay between command and postcheck sections
++my $defpostcommanddelay = 1; # delay between command and postcheck sections
  
-+#include <unistd.h>
-+
- static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
- {
-   (void)ptr;
-   (void)size;
-   (void)nmemb;
-   (void)userp;
-+  sleep(2);
-   return CURL_READFUNC_ABORT;
- }
+ my $testnumcheck; # test number, set in singletest sub.
  


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- curl.spec	4 Dec 2009 23:50:15 -0000	1.130
+++ curl.spec	5 Dec 2009 19:48:31 -0000	1.131
@@ -14,6 +14,7 @@ Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
 Patch104: curl-7.19.7-s390-sleep.patch
+Patch105: curl-7.19.7-localhost6.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +97,9 @@ use cURL's capabilities internally.
 # http://curl.haxx.se/mail/lib-2009-12/0031.html
 %patch104 -p1
 
+# we have localhost6 instead of ip6-localhost as name for ::1
+%patch105 -p1
+
 autoconf
 
 # Convert docs to UTF-8
@@ -120,8 +124,9 @@ make %{?_smp_mflags}
 
 %check
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-make %{?_smp_mflags} -C tests
-cd tests && ./runtests.pl -a -k -p -v
+cd tests
+make %{?_smp_mflags}
+./runtests.pl -a -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT



From kdudka at fedoraproject.org  Sat Dec  5 19:54:15 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sat,  5 Dec 2009 19:54:15 +0000 (UTC)
Subject: rpms/curl/F-12 curl-7.19.7-localhost6.patch, NONE,
	1.1 curl-7.19.7-s390-sleep.patch, 1.1, 1.2 curl.spec, 1.126, 1.127
Message-ID: <20091205195415.9334311C0095@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5202

Modified Files:
	curl-7.19.7-s390-sleep.patch curl.spec 
Added Files:
	curl-7.19.7-localhost6.patch 
Log Message:
attempt to improve test suite coverage

curl-7.19.7-localhost6.patch:
 test1083 |    6 +++---
 test241  |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE curl-7.19.7-localhost6.patch ---
diff --git a/tests/data/test1083 b/tests/data/test1083
index e441278..b0958b6 100644
--- a/tests/data/test1083
+++ b/tests/data/test1083
@@ -33,13 +33,13 @@ ipv6
 http-ipv6
 </server>
  <name>
-HTTP-IPv6 GET with ip6-localhost --interface
+HTTP-IPv6 GET with localhost6 --interface
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost
+-g "http://%HOST6IP:%HTTP6PORT/1083" --interface localhost6
 </command>
 <precheck>
-perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
+perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 localhost6'; print 'Cannot run precheck resolve';}"
 </precheck>
 </client>
 
diff --git a/tests/data/test241 b/tests/data/test241
index 46eae1f..4e1632c 100644
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -30,13 +30,13 @@ ipv6
 http-ipv6
 </server>
  <name>
-HTTP-IPv6 GET (using ip6-localhost)
+HTTP-IPv6 GET (using localhost6)
  </name>
  <command>
--g "http://ip6-localhost:%HTTP6PORT/241"
+-g "http://localhost6:%HTTP6PORT/241"
 </command>
 <precheck>
-./server/resolve --ipv6 ip6-localhost
+./server/resolve --ipv6 localhost6
 </precheck>
 </client>
 
@@ -48,7 +48,7 @@ HTTP-IPv6 GET (using ip6-localhost)
 </strip>
 <protocol>
 GET /241 HTTP/1.1
-Host: ip6-localhost:%HTTP6PORT
+Host: localhost6:%HTTP6PORT
 Accept: */*
 
 </protocol>

curl-7.19.7-s390-sleep.patch:
 runtests.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: curl-7.19.7-s390-sleep.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl-7.19.7-s390-sleep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- curl-7.19.7-s390-sleep.patch	4 Dec 2009 23:58:40 -0000	1.1
+++ curl-7.19.7-s390-sleep.patch	5 Dec 2009 19:54:15 -0000	1.2
@@ -1,20 +1,13 @@
-diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
-index b06a3c6..bf14650 100644
---- a/tests/libtest/lib513.c
-+++ b/tests/libtest/lib513.c
-@@ -12,12 +12,15 @@
+diff --git a/tests/runtests.pl b/tests/runtests.pl
+index a6597b9..c900ad8 100755
+--- a/tests/runtests.pl
++++ b/tests/runtests.pl
+@@ -209,7 +209,7 @@ my $sshdverstr;  # for socks server, ssh daemon version string
+ my $sshderror;   # for socks server, ssh daemon version error
  
- #include "memdebug.h"
+ my $defserverlogslocktimeout = 20; # timeout to await server logs lock removal
+-my $defpostcommanddelay = 0; # delay between command and postcheck sections
++my $defpostcommanddelay = 1; # delay between command and postcheck sections
  
-+#include <unistd.h>
-+
- static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
- {
-   (void)ptr;
-   (void)size;
-   (void)nmemb;
-   (void)userp;
-+  sleep(2);
-   return CURL_READFUNC_ABORT;
- }
+ my $testnumcheck; # test number, set in singletest sub.
  


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- curl.spec	4 Dec 2009 23:58:40 -0000	1.126
+++ curl.spec	5 Dec 2009 19:54:15 -0000	1.127
@@ -13,6 +13,7 @@ Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
 Patch104: curl-7.19.7-s390-sleep.patch
+Patch105: curl-7.19.7-localhost6.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +94,9 @@ use cURL's capabilities internally.
 # http://curl.haxx.se/mail/lib-2009-12/0031.html
 %patch104 -p1
 
+# we have localhost6 instead of ip6-localhost as name for ::1
+%patch105 -p1
+
 autoconf
 
 # Convert docs to UTF-8
@@ -117,8 +121,9 @@ make %{?_smp_mflags}
 
 %check
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-make %{?_smp_mflags} -C tests
-cd tests && ./runtests.pl -a -k -p -v
+cd tests
+make %{?_smp_mflags}
+./runtests.pl -a -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT



From caillon at fedoraproject.org  Sat Dec  5 19:58:03 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Sat,  5 Dec 2009 19:58:03 +0000 (UTC)
Subject: rpms/firefox/F-12 firefox.desktop,1.8,1.9
Message-ID: <20091205195804.061C511C0095@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6127

Modified Files:
	firefox.desktop 
Log Message:
Better adhere to the desktop file spec
rhbz 514349



Index: firefox.desktop
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-12/firefox.desktop,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- firefox.desktop	8 Apr 2008 02:17:24 -0000	1.8
+++ firefox.desktop	5 Dec 2009 19:58:03 -0000	1.9
@@ -1,26 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Name=Firefox Web Browser
-Name[ca]=Navegador web Firefox
-Name[cs]=Firefox Webov? prohl??e?
-Name[es]=Navegador web Firefox
-Name[fa]=?????? ???????? Firefox
-Name[fi]=Firefox-selain
-Name[fr]=Navigateur Web Firefox
-Name[hu]=Firefox webb?ng?sz?
-Name[it]=Firefox Browser Web
-Name[ja]=Firefox ????????
-Name[ko]=Firefox ? ????
-Name[nb]=Firefox Nettleser
-Name[nl]=Firefox webbrowser
-Name[nn]=Firefox Nettlesar
-Name[no]=Firefox Nettleser
-Name[pl]=Przegl?darka WWW Firefox
-Name[pt]=Firefox Navegador Web
-Name[pt_BR]=Navegador Web Firefox
-Name[sk]=Internetov? prehliada? Firefox
-Name[sv]=Webbl?saren Firefox
+Name=Firefox
 GenericName=Web Browser
 GenericName[ca]=Navegador web
 GenericName[cs]=Webov? prohl??e?



From ksebasti at fedoraproject.org  Sat Dec  5 20:14:35 2009
From: ksebasti at fedoraproject.org (Kent Sebastian)
Date: Sat,  5 Dec 2009 20:14:35 +0000 (UTC)
Subject: rpms/eclipse-oprofile/devel eclipse-oprofile-fetch-src.sh, 1.1,
	1.2 eclipse-oprofile.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20091205201435.5B0F211C0095@cvs1.fedora.phx.redhat.com>

Author: ksebasti

Update of /cvs/pkgs/rpms/eclipse-oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10536

Modified Files:
	eclipse-oprofile-fetch-src.sh eclipse-oprofile.spec sources 
Log Message:
* Sat Dec 5 2009 Kent Sebastian <kksebasti at gmail.com> - 0.4.0-1
- 0.4.0 (long overdue)



Index: eclipse-oprofile-fetch-src.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/eclipse-oprofile-fetch-src.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-oprofile-fetch-src.sh	13 May 2009 19:43:00 -0000	1.1
+++ eclipse-oprofile-fetch-src.sh	5 Dec 2009 20:14:35 -0000	1.2
@@ -1,8 +1,8 @@
 #!/bin/sh
 usage='usage: $0 <tag>'
 name=eclipse-oprofile
-tag=RELEASE_0_2_0
-tar_name=$name-fetched-src-0.2.0
+tag=R0_4_0
+tar_name=$name-fetched-src-0.3.0
 
 fetch_cmd="svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/tags/$tag/ $tar_name"
 


Index: eclipse-oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/eclipse-oprofile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- eclipse-oprofile.spec	24 Jul 2009 20:55:48 -0000	1.10
+++ eclipse-oprofile.spec	5 Dec 2009 20:14:35 -0000	1.11
@@ -1,7 +1,7 @@
-%define src_repo_tag   0.2.0
+%define src_repo_tag   0.3.0
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_libdir}/eclipse/dropins/oprofile
-%define qualifier      200905081335
+%define qualifier      200911191630
 %define ver_qual       %{src_repo_tag}.%{qualifier}
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -13,8 +13,8 @@
 
 
 Name:           eclipse-oprofile
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Eclipse plugin for OProfile integration
 
 Group:          Development/Tools
@@ -27,14 +27,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 ExcludeArch: ppc64
 
-BuildRequires: eclipse-pde >= 1:3.4.0
-BuildRequires: eclipse-cdt >= 5.0.1
+BuildRequires: eclipse-pde >= 1:3.5.0
+BuildRequires: eclipse-cdt >= 6.0.0
 BuildRequires: eclipse-linuxprofilingframework >= 0.1.0
 BuildRequires: oprofile >= 0.9.3
 BuildRequires: oprofile-devel >= 0.9.3
 BuildRequires: binutils-devel >= 2.18.50.0.6
-Requires: eclipse-platform >= 3.4.0
-Requires: eclipse-cdt >= 5.0.1
+Requires: eclipse-platform >= 3.5.0
+Requires: eclipse-cdt >= 6.0.0
 Requires: eclipse-linuxprofilingframework >= 0.2.0
 Requires: oprofile >= 0.9.3
 Requires: usermode >= 1.98
@@ -109,6 +109,9 @@ chmod +x \
 %{_sysconfdir}/pam.d/opcontrol
 
 %changelog
+* Sat Dec 5 2009 Kent Sebastian <kksebasti at gmail.com> - 0.4.0-1
+- 0.4.0 (long overdue)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 May 2009 19:47:03 -0000	1.5
+++ sources	5 Dec 2009 20:14:35 -0000	1.6
@@ -1 +1 @@
-70f15b1b2c793fc800ce76834f5860ec  eclipse-oprofile-fetched-src-0.2.0.tar.bz2
+721b3b0eb67bdb49e91256338d53bd73  eclipse-oprofile-fetched-src-0.3.0.tar.bz2



From terjeros at fedoraproject.org  Sat Dec  5 20:24:51 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 20:24:51 +0000 (UTC)
Subject: File xzgv-0.9.1.tar.gz uploaded to lookaside cache by terjeros
Message-ID: <20091205202451.4843110F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xzgv:

d6452ebd4911d986fa1176086afb6e33  xzgv-0.9.1.tar.gz



From terjeros at fedoraproject.org  Sat Dec  5 20:25:33 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 20:25:33 +0000 (UTC)
Subject: rpms/xzgv/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xzgv.spec,
	1.11, 1.12 xzgv-0.9-svn-r41.patch, 1.1, NONE
Message-ID: <20091205202533.4C89E11C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xzgv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13596

Modified Files:
	.cvsignore sources xzgv.spec 
Removed Files:
	xzgv-0.9-svn-r41.patch 
Log Message:
* Sat Dec  5 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.9.1-1
- 0.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xzgv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jan 2008 22:45:34 -0000	1.3
+++ .cvsignore	5 Dec 2009 20:25:32 -0000	1.4
@@ -1 +1 @@
-xzgv-0.9.tar.gz
+xzgv-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xzgv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jan 2008 22:45:34 -0000	1.3
+++ sources	5 Dec 2009 20:25:33 -0000	1.4
@@ -1 +1 @@
-7e2dfad595c97c2abbb392b61ea69f1b  xzgv-0.9.tar.gz
+d6452ebd4911d986fa1176086afb6e33  xzgv-0.9.1.tar.gz


Index: xzgv.spec
===================================================================
RCS file: /cvs/extras/rpms/xzgv/devel/xzgv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xzgv.spec	27 Jul 2009 08:50:35 -0000	1.11
+++ xzgv.spec	5 Dec 2009 20:25:33 -0000	1.12
@@ -1,11 +1,10 @@
 Summary:   Picture viewer
 Name:      xzgv
-Version:   0.9
-Release:   8%{?dist}
+Version:   0.9.1
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Multimedia
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch:     xzgv-0.9-svn-r41.patch
 Patch1:    xzgv-0.9-fix-doc-install.patch
 Patch2:    xzgv-0.9-thumbnail-load-gcc4.patch
 Patch3:    xzgv-0.9-fix-thumbnail-generation.patch
@@ -23,7 +22,6 @@ zgv and the Gimp.
 
 %prep
 %setup -q
-%patch -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -98,6 +96,9 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/xzgv.xpm
 
 %changelog
+* Sat Dec  5 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.9.1-1
+- 0.9.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xzgv-0.9-svn-r41.patch DELETED ---



From ksebasti at fedoraproject.org  Sat Dec  5 20:27:40 2009
From: ksebasti at fedoraproject.org (Kent Sebastian)
Date: Sat,  5 Dec 2009 20:27:40 +0000 (UTC)
Subject: rpms/eclipse-oprofile/devel eclipse-oprofile.spec,1.11,1.12
Message-ID: <20091205202740.95ACF11C0095@cvs1.fedora.phx.redhat.com>

Author: ksebasti

Update of /cvs/pkgs/rpms/eclipse-oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14224

Modified Files:
	eclipse-oprofile.spec 
Log Message:
0.4.0



Index: eclipse-oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/eclipse-oprofile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- eclipse-oprofile.spec	5 Dec 2009 20:14:35 -0000	1.11
+++ eclipse-oprofile.spec	5 Dec 2009 20:27:40 -0000	1.12
@@ -57,9 +57,8 @@ mv opxml \
 
 cd %{_builddir}/%{name}-%{version}
 
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.oprofile.feature \
-                                      -d "cdt linuxprofilingframework" \
-                                      -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -Dosgi.arch=%{eclipse_arch} -Dconfigs=linux,gtk,%{eclipse_arch}"
+%{eclipse_base}/buildscripts/pdebuild -d "cdt linuxprofilingframework" \
+                                      -a "-DforceContextQualifier=%{qualifier} -Dosgi.arch=%{eclipse_arch} -Dconfigs=linux,gtk,%{eclipse_arch}"
 
 %install
 %{__rm} -rf %{buildroot}



From terjeros at fedoraproject.org  Sat Dec  5 20:32:18 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 20:32:18 +0000 (UTC)
Subject: rpms/xzgv/F-12 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xzgv.spec,
	1.11, 1.12 xzgv-0.9-svn-r41.patch, 1.1, NONE
Message-ID: <20091205203218.4238111C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xzgv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15729/F-12

Modified Files:
	.cvsignore sources xzgv.spec 
Removed Files:
	xzgv-0.9-svn-r41.patch 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jan 2008 22:45:34 -0000	1.3
+++ .cvsignore	5 Dec 2009 20:32:17 -0000	1.4
@@ -1 +1 @@
-xzgv-0.9.tar.gz
+xzgv-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jan 2008 22:45:34 -0000	1.3
+++ sources	5 Dec 2009 20:32:18 -0000	1.4
@@ -1 +1 @@
-7e2dfad595c97c2abbb392b61ea69f1b  xzgv-0.9.tar.gz
+d6452ebd4911d986fa1176086afb6e33  xzgv-0.9.1.tar.gz


Index: xzgv.spec
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-12/xzgv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xzgv.spec	27 Jul 2009 08:50:35 -0000	1.11
+++ xzgv.spec	5 Dec 2009 20:32:18 -0000	1.12
@@ -1,11 +1,10 @@
 Summary:   Picture viewer
 Name:      xzgv
-Version:   0.9
-Release:   8%{?dist}
+Version:   0.9.1
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Multimedia
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch:     xzgv-0.9-svn-r41.patch
 Patch1:    xzgv-0.9-fix-doc-install.patch
 Patch2:    xzgv-0.9-thumbnail-load-gcc4.patch
 Patch3:    xzgv-0.9-fix-thumbnail-generation.patch
@@ -23,7 +22,6 @@ zgv and the Gimp.
 
 %prep
 %setup -q
-%patch -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -98,6 +96,9 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/xzgv.xpm
 
 %changelog
+* Sat Dec  5 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.9.1-1
+- 0.9.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xzgv-0.9-svn-r41.patch DELETED ---



From terjeros at fedoraproject.org  Sat Dec  5 20:32:17 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 20:32:17 +0000 (UTC)
Subject: rpms/xzgv/F-11 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xzgv.spec, 1.9,
	1.10 xzgv-0.9-svn-r41.patch, 1.1, NONE
Message-ID: <20091205203217.F2F1011C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xzgv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15729/F-11

Modified Files:
	.cvsignore sources xzgv.spec 
Removed Files:
	xzgv-0.9-svn-r41.patch 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jan 2008 22:45:34 -0000	1.3
+++ .cvsignore	5 Dec 2009 20:32:17 -0000	1.4
@@ -1 +1 @@
-xzgv-0.9.tar.gz
+xzgv-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jan 2008 22:45:34 -0000	1.3
+++ sources	5 Dec 2009 20:32:17 -0000	1.4
@@ -1 +1 @@
-7e2dfad595c97c2abbb392b61ea69f1b  xzgv-0.9.tar.gz
+d6452ebd4911d986fa1176086afb6e33  xzgv-0.9.1.tar.gz


Index: xzgv.spec
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-11/xzgv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xzgv.spec	26 Feb 2009 12:22:11 -0000	1.9
+++ xzgv.spec	5 Dec 2009 20:32:17 -0000	1.10
@@ -1,11 +1,10 @@
 Summary:   Picture viewer
 Name:      xzgv
-Version:   0.9
-Release:   6%{?dist}
+Version:   0.9.1
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Multimedia
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch:     xzgv-0.9-svn-r41.patch
 Patch1:    xzgv-0.9-fix-doc-install.patch
 Patch2:    xzgv-0.9-thumbnail-load-gcc4.patch
 Patch3:    xzgv-0.9-fix-thumbnail-generation.patch
@@ -23,10 +22,15 @@ zgv and the Gimp.
 
 %prep
 %setup -q
-%patch -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt
+touch -r ChangeLog.txt ChangeLog
+mv ChangeLog.txt ChangeLog
+iconv -f iso8859-1 -t utf8 NEWS -o NEWS.txt
+touch -r NEWS.txt NEWS
+mv NEWS.txt NEWS
 
 %build
 %{__sed} -i 's|^CFLAGS.*|CFLAGS=%{optflags}|' config.mk
@@ -35,10 +39,10 @@ zgv and the Gimp.
 
 %{__cat} <<EOF > %{name}.desktop
 [Desktop Entry]
-Encoding=UTF-8
 Name=xzgv Image Viewer
 Comment=View different types of images
 Exec=xzgv
+Icon=xzgv
 Terminal=false
 Type=Application
 Categories=GTK;Graphics;RasterGraphics;Viewer;
@@ -49,6 +53,9 @@ EOF
 
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/applications/
 %{__install} -m 0644 %{name}.desktop %{buildroot}%{_datadir}/applications
+%{__install} -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+%{__install} -p -m 0644 src/icon-48.xpm \
+     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/xzgv.xpm
 
 %{__make} PREFIX=%{buildroot}/%{_prefix} \
      MANDIR=%{buildroot}/%{_mandir}/man1 \
@@ -60,6 +67,16 @@ desktop-file-install --vendor fedora --d
 
 %post
 /sbin/install-info %{_infodir}/xzgv.info.gz %{_infodir}/dir || :
+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
 
 %preun
 if [ "$1" = "0" ]; then
@@ -76,8 +93,19 @@ fi
 %{_mandir}/man1/%{name}*
 %{_infodir}/%{name}*
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xzgv.xpm
 
 %changelog
+* Sat Dec  5 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.9.1-1
+- 0.9.1
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 18 2009 Hans de Goede <hdegoede at redhat.com> - 0.9-7
+- Add an icon for the menu entry
+- Make ChangeLog and NEWS UTF-8
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- xzgv-0.9-svn-r41.patch DELETED ---



From ausil at fedoraproject.org  Sat Dec  5 20:39:25 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat,  5 Dec 2009 20:39:25 +0000 (UTC)
Subject: File ufraw-0.16.tar.gz uploaded to lookaside cache by ausil
Message-ID: <20091205203925.9EB1E10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ufraw:

61e100e42f17e3a7fcfae64506eebd14  ufraw-0.16.tar.gz



From ausil at fedoraproject.org  Sat Dec  5 20:39:46 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat,  5 Dec 2009 20:39:46 +0000 (UTC)
Subject: rpms/ufraw/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 ufraw.spec, 1.45, 1.46 ufraw-0.15-gcc-4.4.patch, 1.1, NONE
Message-ID: <20091205203946.C984711C0095@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ufraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18494

Modified Files:
	.cvsignore sources ufraw.spec 
Removed Files:
	ufraw-0.15-gcc-4.4.patch 
Log Message:
update to 0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	26 Jan 2009 09:57:26 -0000	1.11
+++ .cvsignore	5 Dec 2009 20:39:46 -0000	1.12
@@ -1 +1 @@
-ufraw-0.15.tar.gz
+ufraw-0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	26 Jan 2009 09:57:26 -0000	1.11
+++ sources	5 Dec 2009 20:39:46 -0000	1.12
@@ -1 +1 @@
-6d8f6c98a388c438784cd909dd82d540  ufraw-0.15.tar.gz
+61e100e42f17e3a7fcfae64506eebd14  ufraw-0.16.tar.gz


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ufraw.spec	17 Aug 2009 10:26:04 -0000	1.45
+++ ufraw.spec	5 Dec 2009 20:39:46 -0000	1.46
@@ -35,15 +35,12 @@
 
 Summary: Raw image data retrieval tool for digital cameras
 Name: ufraw
-Version: 0.15
-Release: 4%{?dist}
+Version: 0.16
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://ufraw.sourceforge.net
 Source0: http://downloads.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
-# make dcraw.cc compile correctly, upstream CVS already compiles without this
-# patch
-Patch0: ufraw-0.15-gcc-4.4.patch
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gimp >= 2.0
 %if %{with cinepaint}
@@ -144,7 +141,6 @@ lensfun:        %{with lensfun}
 
 EOF
 %setup -q
-%patch0 -p1 -b .gcc-4.4
 
 #./autogen.sh
 
@@ -231,6 +227,9 @@ update-desktop-database >& /dev/null || 
 %endif
 
 %changelog
+* Sat Dec 05 2009 Dennis Gilmore <dennis at ausil.us> - 0.16-1
+- update to 0.16
+
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> - 0.15-4
 - fix building with lensfun (#517558), only build with lensfun from F-12 on
 - explain gcc-4.4 patch


--- ufraw-0.15-gcc-4.4.patch DELETED ---



From ksebasti at fedoraproject.org  Sat Dec  5 20:41:10 2009
From: ksebasti at fedoraproject.org (Kent Sebastian)
Date: Sat,  5 Dec 2009 20:41:10 +0000 (UTC)
Subject: rpms/eclipse-oprofile/devel eclipse-oprofile.spec,1.12,1.13
Message-ID: <20091205204110.0BF3811C0095@cvs1.fedora.phx.redhat.com>

Author: ksebasti

Update of /cvs/pkgs/rpms/eclipse-oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19089

Modified Files:
	eclipse-oprofile.spec 
Log Message:
0.4.0



Index: eclipse-oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/eclipse-oprofile.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- eclipse-oprofile.spec	5 Dec 2009 20:27:40 -0000	1.12
+++ eclipse-oprofile.spec	5 Dec 2009 20:41:09 -0000	1.13
@@ -57,7 +57,8 @@ mv opxml \
 
 cd %{_builddir}/%{name}-%{version}
 
-%{eclipse_base}/buildscripts/pdebuild -d "cdt linuxprofilingframework" \
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.oprofile \
+				      -d "cdt linuxprofilingframework" \
                                       -a "-DforceContextQualifier=%{qualifier} -Dosgi.arch=%{eclipse_arch} -Dconfigs=linux,gtk,%{eclipse_arch}"
 
 %install



From ausil at fedoraproject.org  Sat Dec  5 20:41:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat,  5 Dec 2009 20:41:12 +0000 (UTC)
Subject: rpms/ufraw/F-12 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 ufraw.spec, 1.45, 1.46 ufraw-0.15-gcc-4.4.patch, 1.1, NONE
Message-ID: <20091205204112.230D711C0095@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ufraw/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19049

Modified Files:
	.cvsignore sources ufraw.spec 
Removed Files:
	ufraw-0.15-gcc-4.4.patch 
Log Message:
update to 0.16 adds support for my camera



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	26 Jan 2009 09:57:26 -0000	1.11
+++ .cvsignore	5 Dec 2009 20:41:11 -0000	1.12
@@ -1 +1 @@
-ufraw-0.15.tar.gz
+ufraw-0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	26 Jan 2009 09:57:26 -0000	1.11
+++ sources	5 Dec 2009 20:41:11 -0000	1.12
@@ -1 +1 @@
-6d8f6c98a388c438784cd909dd82d540  ufraw-0.15.tar.gz
+61e100e42f17e3a7fcfae64506eebd14  ufraw-0.16.tar.gz


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-12/ufraw.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ufraw.spec	17 Aug 2009 10:26:04 -0000	1.45
+++ ufraw.spec	5 Dec 2009 20:41:11 -0000	1.46
@@ -35,15 +35,12 @@
 
 Summary: Raw image data retrieval tool for digital cameras
 Name: ufraw
-Version: 0.15
-Release: 4%{?dist}
+Version: 0.16
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://ufraw.sourceforge.net
 Source0: http://downloads.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
-# make dcraw.cc compile correctly, upstream CVS already compiles without this
-# patch
-Patch0: ufraw-0.15-gcc-4.4.patch
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gimp >= 2.0
 %if %{with cinepaint}
@@ -144,7 +141,6 @@ lensfun:        %{with lensfun}
 
 EOF
 %setup -q
-%patch0 -p1 -b .gcc-4.4
 
 #./autogen.sh
 
@@ -231,6 +227,9 @@ update-desktop-database >& /dev/null || 
 %endif
 
 %changelog
+* Sat Dec 05 2009 Dennis Gilmore <dennis at ausil.us> - 0.16-1
+- update to 0.16
+
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> - 0.15-4
 - fix building with lensfun (#517558), only build with lensfun from F-12 on
 - explain gcc-4.4 patch


--- ufraw-0.15-gcc-4.4.patch DELETED ---



From terjeros at fedoraproject.org  Sat Dec  5 20:46:28 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 20:46:28 +0000 (UTC)
Subject: File cflow-1.3.tar.bz2 uploaded to lookaside cache by terjeros
Message-ID: <20091205204628.C2FA310F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for cflow:

b3fe4bfba9d648447065b3c2d73ae66c  cflow-1.3.tar.bz2



From terjeros at fedoraproject.org  Sat Dec  5 20:47:11 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 20:47:11 +0000 (UTC)
Subject: rpms/cflow/devel .cvsignore, 1.3, 1.4 cflow.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <20091205204711.1717511C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/cflow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21152

Modified Files:
	.cvsignore cflow.spec sources 
Log Message:
* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.3-1
- 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cflow/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Aug 2009 13:25:18 -0000	1.3
+++ .cvsignore	5 Dec 2009 20:47:10 -0000	1.4
@@ -1 +1 @@
-cflow-1.2.tar.bz2
+cflow-1.3.tar.bz2


Index: cflow.spec
===================================================================
RCS file: /cvs/extras/rpms/cflow/devel/cflow.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cflow.spec	10 Aug 2009 13:25:18 -0000	1.4
+++ cflow.spec	5 Dec 2009 20:47:10 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:         Analyzes C files charting control flow within the program
 Name:            cflow
-Version:         1.2
-Release:         5%{?dist}
+Version:         1.3
+Release:         1%{?dist}
 License:         GPLv2+
 Group:           Development/Languages
 URL:             http://www.gnu.org/software/cflow/
@@ -56,6 +56,9 @@ fi
 %{_datadir}/emacs/site-lisp/%{name}-mode.el
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.3-1
+- 1.3
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-5
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cflow/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Aug 2009 13:25:18 -0000	1.3
+++ sources	5 Dec 2009 20:47:10 -0000	1.4
@@ -1 +1 @@
-860fc15fe9e9aaf42930af5191c518a7  cflow-1.2.tar.bz2
+b3fe4bfba9d648447065b3c2d73ae66c  cflow-1.3.tar.bz2



From pkgdb at fedoraproject.org  Sat Dec  5 20:47:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 05 Dec 2009 20:47:33 +0000
Subject: [pkgdb] comgt ownership updated
Message-ID: <20091205204733.D72C710F892@bastion2.fedora.phx.redhat.com>

Package comgt in Fedora devel was orphaned by rathann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/comgt



From wart at fedoraproject.org  Sat Dec  5 20:49:34 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Sat,  5 Dec 2009 20:49:34 +0000 (UTC)
Subject: rpms/iwidgets/devel iwidgets-4.0.2-tkversion.patch, NONE,
	1.1 iwidgets.spec, 1.6, 1.7
Message-ID: <20091205204934.DF46A11C0095@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/iwidgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21813

Modified Files:
	iwidgets.spec 
Added Files:
	iwidgets-4.0.2-tkversion.patch 
Log Message:
Remove Tk version requirement (BZ #537665)



iwidgets-4.0.2-tkversion.patch:
 iwidgets.tcl.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE iwidgets-4.0.2-tkversion.patch ---
--- iwidgets.tcl.in.orig	2009-12-05 11:52:33.000000000 -0800
+++ iwidgets.tcl.in	2009-12-05 11:52:39.000000000 -0800
@@ -14,7 +14,7 @@
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 package require Tcl 8.0
-package require Tk 8.0
+package require Tk
 package require Itcl @ITCL_VERSION@
 package require Itk @ITCL_VERSION@
 


Index: iwidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwidgets/devel/iwidgets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- iwidgets.spec	25 Jul 2009 03:43:50 -0000	1.6
+++ iwidgets.spec	5 Dec 2009 20:49:34 -0000	1.7
@@ -3,13 +3,14 @@
 
 Name:           iwidgets
 Version:        4.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A set of useful widgets based on itcl and itk
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://incrtcl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/incrtcl/iwidgets4.0.1.tar.gz
+Patch0:         iwidgets-4.0.2-tkversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,6 +22,7 @@ A set of useful widgets based on itcl an
 
 %prep
 %setup -q -n iwidgets4.0.1
+%patch0 -p0
 
 %build
 # The configure script and Makefile for this package is horribly broken.
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README license.terms doc/iwidgets.ps
 
 %changelog
+* Sat Dec 5 2009 Wart <wart at kobold.org> - 4.0.2-4
+- Remove version requirement on Tk
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From terjeros at fedoraproject.org  Sat Dec  5 20:52:39 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 20:52:39 +0000 (UTC)
Subject: rpms/cflow/F-11 .cvsignore, 1.2, 1.3 cflow.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091205205239.5FAC411C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/cflow/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23010/F-11

Modified Files:
	.cvsignore cflow.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cflow/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 May 2008 20:13:23 -0000	1.2
+++ .cvsignore	5 Dec 2009 20:52:39 -0000	1.3
@@ -1 +1 @@
-cflow-1.2.tar.gz
+cflow-1.3.tar.bz2


Index: cflow.spec
===================================================================
RCS file: /cvs/extras/rpms/cflow/F-11/cflow.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cflow.spec	24 Feb 2009 07:08:20 -0000	1.2
+++ cflow.spec	5 Dec 2009 20:52:39 -0000	1.3
@@ -1,11 +1,11 @@
 Summary:         Analyzes C files charting control flow within the program
 Name:            cflow
-Version:         1.2
-Release:         3%{?dist}
+Version:         1.3
+Release:         1%{?dist}
 License:         GPLv2+
 Group:           Development/Languages
 URL:             http://www.gnu.org/software/cflow/
-Source0:         http://ftp.gnu.org/gnu/cflow/%{name}-%{version}.tar.gz
+Source0:         http://ftp.gnu.org/gnu/cflow/%{name}-%{version}.tar.bz2
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # to install lisp files
 BuildRequires:   emacs
@@ -56,6 +56,15 @@ fi
 %{_datadir}/emacs/site-lisp/%{name}-mode.el
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.3-1
+- 1.3
+
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-5
+- Use bzipped upstream tarball.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cflow/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 May 2008 20:13:23 -0000	1.2
+++ sources	5 Dec 2009 20:52:39 -0000	1.3
@@ -1 +1 @@
-e0ef18aef99d1e7115b0b50d361ac6f7  cflow-1.2.tar.gz
+b3fe4bfba9d648447065b3c2d73ae66c  cflow-1.3.tar.bz2



From terjeros at fedoraproject.org  Sat Dec  5 20:52:39 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 20:52:39 +0000 (UTC)
Subject: rpms/cflow/F-12 .cvsignore, 1.3, 1.4 cflow.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20091205205239.82DAB11C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/cflow/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23010/F-12

Modified Files:
	.cvsignore cflow.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cflow/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Aug 2009 13:25:18 -0000	1.3
+++ .cvsignore	5 Dec 2009 20:52:39 -0000	1.4
@@ -1 +1 @@
-cflow-1.2.tar.bz2
+cflow-1.3.tar.bz2


Index: cflow.spec
===================================================================
RCS file: /cvs/extras/rpms/cflow/F-12/cflow.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cflow.spec	10 Aug 2009 13:25:18 -0000	1.4
+++ cflow.spec	5 Dec 2009 20:52:39 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:         Analyzes C files charting control flow within the program
 Name:            cflow
-Version:         1.2
-Release:         5%{?dist}
+Version:         1.3
+Release:         1%{?dist}
 License:         GPLv2+
 Group:           Development/Languages
 URL:             http://www.gnu.org/software/cflow/
@@ -56,6 +56,9 @@ fi
 %{_datadir}/emacs/site-lisp/%{name}-mode.el
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.3-1
+- 1.3
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-5
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cflow/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Aug 2009 13:25:18 -0000	1.3
+++ sources	5 Dec 2009 20:52:39 -0000	1.4
@@ -1 +1 @@
-860fc15fe9e9aaf42930af5191c518a7  cflow-1.2.tar.bz2
+b3fe4bfba9d648447065b3c2d73ae66c  cflow-1.3.tar.bz2



From ksebasti at fedoraproject.org  Sat Dec  5 20:54:18 2009
From: ksebasti at fedoraproject.org (Kent Sebastian)
Date: Sat,  5 Dec 2009 20:54:18 +0000 (UTC)
Subject: rpms/eclipse-oprofile/devel eclipse-oprofile.spec,1.13,1.14
Message-ID: <20091205205418.0401411C0095@cvs1.fedora.phx.redhat.com>

Author: ksebasti

Update of /cvs/pkgs/rpms/eclipse-oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23700

Modified Files:
	eclipse-oprofile.spec 
Log Message:
0.4.0



Index: eclipse-oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/eclipse-oprofile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- eclipse-oprofile.spec	5 Dec 2009 20:41:09 -0000	1.13
+++ eclipse-oprofile.spec	5 Dec 2009 20:54:17 -0000	1.14
@@ -59,7 +59,7 @@ cd %{_builddir}/%{name}-%{version}
 
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.oprofile \
 				      -d "cdt linuxprofilingframework" \
-                                      -a "-DforceContextQualifier=%{qualifier} -Dosgi.arch=%{eclipse_arch} -Dconfigs=linux,gtk,%{eclipse_arch}"
+                                      -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -Dosgi.arch=%{eclipse_arch} -Dconfigs=linux,gtk,%{eclipse_arch}"
 
 %install
 %{__rm} -rf %{buildroot}



From wart at fedoraproject.org  Sat Dec  5 20:57:39 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Sat,  5 Dec 2009 20:57:39 +0000 (UTC)
Subject: rpms/iwidgets/F-12 iwidgets-4.0.2-tkversion.patch, NONE,
	1.1 iwidgets.spec, 1.6, 1.7
Message-ID: <20091205205739.2EDD811C0095@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/iwidgets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24749

Modified Files:
	iwidgets.spec 
Added Files:
	iwidgets-4.0.2-tkversion.patch 
Log Message:
Remove version requirement for Tk (BZ #537665)



iwidgets-4.0.2-tkversion.patch:
 iwidgets.tcl.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE iwidgets-4.0.2-tkversion.patch ---
--- iwidgets.tcl.in.orig	2009-12-05 11:52:33.000000000 -0800
+++ iwidgets.tcl.in	2009-12-05 11:52:39.000000000 -0800
@@ -14,7 +14,7 @@
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 package require Tcl 8.0
-package require Tk 8.0
+package require Tk
 package require Itcl @ITCL_VERSION@
 package require Itk @ITCL_VERSION@
 


Index: iwidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwidgets/F-12/iwidgets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- iwidgets.spec	25 Jul 2009 03:43:50 -0000	1.6
+++ iwidgets.spec	5 Dec 2009 20:57:39 -0000	1.7
@@ -3,13 +3,14 @@
 
 Name:           iwidgets
 Version:        4.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A set of useful widgets based on itcl and itk
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://incrtcl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/incrtcl/iwidgets4.0.1.tar.gz
+Patch0:         iwidgets-4.0.2-tkversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,6 +22,7 @@ A set of useful widgets based on itcl an
 
 %prep
 %setup -q -n iwidgets4.0.1
+%patch0 -p0
 
 %build
 # The configure script and Makefile for this package is horribly broken.
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README license.terms doc/iwidgets.ps
 
 %changelog
+* Sat Dec 5 2009 Wart <wart at kobold.org> - 4.0.2-4
+- Remove version requirement on Tk
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From terjeros at fedoraproject.org  Sat Dec  5 21:04:20 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sat,  5 Dec 2009 21:04:20 +0000 (UTC)
Subject: rpms/beediff/devel beediff.spec,1.3,1.4
Message-ID: <20091205210420.D6BF611C0095@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/beediff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27223

Modified Files:
	beediff.spec 
Log Message:
* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.9-3
- Web pages moved



Index: beediff.spec
===================================================================
RCS file: /cvs/extras/rpms/beediff/devel/beediff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- beediff.spec	24 Jul 2009 17:56:45 -0000	1.3
+++ beediff.spec	5 Dec 2009 21:04:20 -0000	1.4
@@ -1,11 +1,11 @@
 Summary:       Visual tool for comparing and merging files
 Name:          beediff
 Version:       1.9
-Release:       4%{?dist}
+Release:       5%{?dist}
 Group:         Development/Tools
 License:       GPLv2+
-URL:           http://www.beesoft.at/index.php?id=beediff
-Source0:       http://www.beesoft.at/download/beediff_%{version}_src.tar.gz
+URL:           http://www.beesoft.org/index.php?id=beediff
+Source0:       http://www.beesoft.org/download/beediff_%{version}_src.tar.gz
 Source1:       beediff.desktop
 BuildRequires: qt4-devel desktop-file-utils
 Requires:      diffutils
@@ -45,6 +45,9 @@ desktop-file-install --dir %{buildroot}%
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Dec 05 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.9-3
+- Web pages moved
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ksebasti at fedoraproject.org  Sat Dec  5 21:56:45 2009
From: ksebasti at fedoraproject.org (Kent Sebastian)
Date: Sat,  5 Dec 2009 21:56:45 +0000 (UTC)
Subject: rpms/eclipse-oprofile/devel eclipse-oprofile.spec,1.14,1.15
Message-ID: <20091205215645.1653A11C0095@cvs1.fedora.phx.redhat.com>

Author: ksebasti

Update of /cvs/pkgs/rpms/eclipse-oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9764

Modified Files:
	eclipse-oprofile.spec 
Log Message:
Typo with feature name in %install


Index: eclipse-oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/devel/eclipse-oprofile.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- eclipse-oprofile.spec	5 Dec 2009 20:54:17 -0000	1.14
+++ eclipse-oprofile.spec	5 Dec 2009 21:56:44 -0000	1.15
@@ -66,7 +66,7 @@ cd %{_builddir}/%{name}-%{version}
 install -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
-     build/rpmBuild/org.eclipse.linuxtools.oprofile.feature.zip 
+     build/rpmBuild/org.eclipse.linuxtools.oprofile.zip 
 
 ### install.sh stuff ###
 %define corepath %{buildroot}%{install_loc}/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_%{ver_qual}



From crobinso at fedoraproject.org  Sat Dec  5 22:10:54 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Sat,  5 Dec 2009 22:10:54 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager.spec,1.64,1.65
Message-ID: <20091205221054.0C13A11C03F6@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13503

Modified Files:
	virt-manager.spec 
Log Message:
Set proper version Requires: for python-virtinst



Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- virt-manager.spec	3 Dec 2009 22:45:14 -0000	1.64
+++ virt-manager.spec	5 Dec 2009 22:10:53 -0000	1.65
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.1
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -38,7 +38,7 @@ Requires: gnome-python2-gnomekeyring >= 
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
-Requires: python-virtinst >= 0.500.0-4
+Requires: python-virtinst >= 0.500.1
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -151,6 +151,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Sat Dec  5 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-2.fc13
+- Set proper version Requires: for python-virtinst
+
 * Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-1.fc13
 - Update to release 0.8.1
 - VM Migration wizard, exposing various migration options



From ksebasti at fedoraproject.org  Sat Dec  5 22:20:52 2009
From: ksebasti at fedoraproject.org (Kent Sebastian)
Date: Sat,  5 Dec 2009 22:20:52 +0000 (UTC)
Subject: rpms/eclipse-oprofile/F-12 .cvsignore, 1.5,
	1.6 eclipse-oprofile-fetch-src.sh, 1.1,
	1.2 eclipse-oprofile.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20091205222052.F320411C03DB@cvs1.fedora.phx.redhat.com>

Author: ksebasti

Update of /cvs/pkgs/rpms/eclipse-oprofile/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16260

Modified Files:
	.cvsignore eclipse-oprofile-fetch-src.sh eclipse-oprofile.spec 
	sources 
Log Message:
* Sat Dec 5 2009 Kent Sebastian <kksebasti at gmail.com> - 0.4.0-1
- 0.4.0 (long overdue)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 May 2009 19:47:03 -0000	1.5
+++ .cvsignore	5 Dec 2009 22:20:52 -0000	1.6
@@ -1 +1 @@
-eclipse-oprofile-fetched-src-0.2.0.tar.bz2
+eclipse-oprofile-fetched-src-0.3.0.tar.bz2


Index: eclipse-oprofile-fetch-src.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/F-12/eclipse-oprofile-fetch-src.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-oprofile-fetch-src.sh	13 May 2009 19:43:00 -0000	1.1
+++ eclipse-oprofile-fetch-src.sh	5 Dec 2009 22:20:52 -0000	1.2
@@ -1,8 +1,8 @@
 #!/bin/sh
 usage='usage: $0 <tag>'
 name=eclipse-oprofile
-tag=RELEASE_0_2_0
-tar_name=$name-fetched-src-0.2.0
+tag=R0_4_0
+tar_name=$name-fetched-src-0.3.0
 
 fetch_cmd="svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/tags/$tag/ $tar_name"
 


Index: eclipse-oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/F-12/eclipse-oprofile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- eclipse-oprofile.spec	24 Jul 2009 20:55:48 -0000	1.10
+++ eclipse-oprofile.spec	5 Dec 2009 22:20:52 -0000	1.11
@@ -1,7 +1,7 @@
-%define src_repo_tag   0.2.0
+%define src_repo_tag   0.3.0
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_libdir}/eclipse/dropins/oprofile
-%define qualifier      200905081335
+%define qualifier      200911191630
 %define ver_qual       %{src_repo_tag}.%{qualifier}
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -13,8 +13,8 @@
 
 
 Name:           eclipse-oprofile
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Eclipse plugin for OProfile integration
 
 Group:          Development/Tools
@@ -27,14 +27,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 ExcludeArch: ppc64
 
-BuildRequires: eclipse-pde >= 1:3.4.0
-BuildRequires: eclipse-cdt >= 5.0.1
+BuildRequires: eclipse-pde >= 1:3.5.0
+BuildRequires: eclipse-cdt >= 6.0.0
 BuildRequires: eclipse-linuxprofilingframework >= 0.1.0
 BuildRequires: oprofile >= 0.9.3
 BuildRequires: oprofile-devel >= 0.9.3
 BuildRequires: binutils-devel >= 2.18.50.0.6
-Requires: eclipse-platform >= 3.4.0
-Requires: eclipse-cdt >= 5.0.1
+Requires: eclipse-platform >= 3.5.0
+Requires: eclipse-cdt >= 6.0.0
 Requires: eclipse-linuxprofilingframework >= 0.2.0
 Requires: oprofile >= 0.9.3
 Requires: usermode >= 1.98
@@ -57,8 +57,8 @@ mv opxml \
 
 cd %{_builddir}/%{name}-%{version}
 
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.oprofile.feature \
-                                      -d "cdt linuxprofilingframework" \
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.oprofile \
+				      -d "cdt linuxprofilingframework" \
                                       -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -Dosgi.arch=%{eclipse_arch} -Dconfigs=linux,gtk,%{eclipse_arch}"
 
 %install
@@ -66,7 +66,7 @@ cd %{_builddir}/%{name}-%{version}
 install -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
-     build/rpmBuild/org.eclipse.linuxtools.oprofile.feature.zip 
+     build/rpmBuild/org.eclipse.linuxtools.oprofile.zip 
 
 ### install.sh stuff ###
 %define corepath %{buildroot}%{install_loc}/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_%{ver_qual}
@@ -109,6 +109,9 @@ chmod +x \
 %{_sysconfdir}/pam.d/opcontrol
 
 %changelog
+* Sat Dec 5 2009 Kent Sebastian <kksebasti at gmail.com> - 0.4.0-1
+- 0.4.0 (long overdue)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-oprofile/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 May 2009 19:47:03 -0000	1.5
+++ sources	5 Dec 2009 22:20:52 -0000	1.6
@@ -1 +1 @@
-70f15b1b2c793fc800ce76834f5860ec  eclipse-oprofile-fetched-src-0.2.0.tar.bz2
+721b3b0eb67bdb49e91256338d53bd73  eclipse-oprofile-fetched-src-0.3.0.tar.bz2



From crobinso at fedoraproject.org  Sat Dec  5 22:35:42 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Sat,  5 Dec 2009 22:35:42 +0000 (UTC)
Subject: rpms/virt-manager/F-12 virt-manager.spec,1.63,1.64
Message-ID: <20091205223542.286B611C0095@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20400

Modified Files:
	virt-manager.spec 
Log Message:
Set proper version Requires: for python-virtinst



Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/virt-manager.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- virt-manager.spec	3 Dec 2009 22:44:52 -0000	1.63
+++ virt-manager.spec	5 Dec 2009 22:35:41 -0000	1.64
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.1
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -40,7 +40,7 @@ Requires: gnome-python2-gnomekeyring >= 
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
-Requires: python-virtinst >= 0.500.0-4
+Requires: python-virtinst >= 0.500.1
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -154,6 +154,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Sat Dec  5 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-2.fc13
+- Set proper version Requires: for python-virtinst
+
 * Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-1.fc12
 - Update to release 0.8.1
 - VM Migration wizard, exposing various migration options



From cwickert at fedoraproject.org  Sat Dec  5 23:27:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  5 Dec 2009 23:27:24 +0000 (UTC)
Subject: rpms/lxmenu-data/devel lxmenu-data-0.1.1-menu.patch, 1.1,
	1.2 lxmenu-data.spec, 1.3, 1.4
Message-ID: <20091205232724.598CF11C0095@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmenu-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4045

Modified Files:
	lxmenu-data-0.1.1-menu.patch lxmenu-data.spec 
Log Message:
* Sun Dec 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-3
- Move Accessibility to Utilities


lxmenu-data-0.1.1-menu.patch:
 lxde-applications.menu |   55 +++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

Index: lxmenu-data-0.1.1-menu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/devel/lxmenu-data-0.1.1-menu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxmenu-data-0.1.1-menu.patch	5 Jul 2009 23:51:55 -0000	1.1
+++ lxmenu-data-0.1.1-menu.patch	5 Dec 2009 23:27:23 -0000	1.2
@@ -1,6 +1,35 @@
 --- lxmenu-data-0.1.1.orig/layout/lxde-applications.menu	2009-05-19 18:52:11.000000000 +0200
-+++ lxmenu-data-0.1.1/layout/lxde-applications.menu	2009-07-06 01:40:17.000000000 +0200
-@@ -148,29 +148,43 @@
++++ lxmenu-data-0.1.1/layout/lxde-applications.menu	2009-12-05 23:24:09.000000000 +0100
+@@ -20,28 +20,11 @@
+ 		<Include>
+ 			<And>
+ 				<Category>Utility</Category>
+-	<!-- Accessibility spec must have either the Utility or Settings
+-			 category, and we display an accessibility submenu already for
+-			 the ones that do not have Settings, so don't display accessibility
+-			 applications here -->
+-				<Not><Category>Accessibility</Category></Not>
+ 				<Not><Category>System</Category></Not>
+ 			</And>
+ 		</Include>
+ 	</Menu> <!-- End Accessories -->
+ 
+-	<!-- Accessibility submenu -->
+-	<Menu>
+-		<Name>Universal Access</Name>
+-		<Directory>lxde-utility-accessibility.directory</Directory>
+-		<Include>
+-			<And>
+-				<Category>Accessibility</Category>
+-				<Not><Category>Settings</Category></Not>
+-			</And>
+-		</Include>
+-	</Menu> <!-- End Accessibility -->
+-
+ 	<!-- Development Tools -->
+ 	<Menu>
+ 		<Name>Development</Name>
+@@ -148,29 +131,43 @@
  		</Include>
  		</Menu> <!-- End Other -->
  
@@ -13,10 +42,7 @@
  		<Include>
 -			<Or>
 +			<And>
- 				<Category>Settings</Category>
--				<Category>PackageManager</Category>
--				<Category>System</Category>
--			</Or>
++				<Category>Settings</Category>
 +				<Not>
 +					<Or>
 +						<Category>System</Category>
@@ -26,24 +52,27 @@
 +					</Or>
 +				</Not>
 +			</And>
- 		</Include>
--		<Layout>
--			<Merge type="menus"/>
--			<Merge type="files"/>
--		</Layout>
++		</Include>
 +	</Menu>		<!-- End Preferences -->
- 
--	</Menu> <!-- End Settings -->
++
 +	<!-- System Settings -->
 +	<Menu>
 +		<Name>Administration</Name>
 +		<Directory>lxde-settings-system.directory</Directory>
 +		<Include>
 +			<And>
-+				<Category>Settings</Category>
-+				<Category>System</Category>
+ 				<Category>Settings</Category>
+-				<Category>PackageManager</Category>
+ 				<Category>System</Category>
+-			</Or>
 +			</And>
-+		</Include>
+ 		</Include>
+-		<Layout>
+-			<Merge type="menus"/>
+-			<Merge type="files"/>
+-		</Layout>
+-
+-	</Menu> <!-- End Settings -->
 +	</Menu>		 <!-- End System Settings -->
  
  	<Layout>


Index: lxmenu-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/devel/lxmenu-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxmenu-data.spec	25 Jul 2009 11:31:03 -0000	1.3
+++ lxmenu-data.spec	5 Dec 2009 23:27:23 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           lxmenu-data
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Data files for the LXDE menu
 
 Group:          User Interface/Desktops
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-3
+- Move Accessibility to Utilities
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ultrafredde at fedoraproject.org  Sat Dec  5 23:37:33 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sat,  5 Dec 2009 23:37:33 +0000 (UTC)
Subject: File task-1.8.5.tar.gz uploaded to lookaside cache by ultrafredde
Message-ID: <20091205233733.3951410F841@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for task:

83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz



From ultrafredde at fedoraproject.org  Sat Dec  5 23:37:54 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sat,  5 Dec 2009 23:37:54 +0000 (UTC)
Subject: rpms/task/devel .cvsignore, 1.8, 1.9 import.log, 1.8, 1.9 sources,
	1.9, 1.10 task.spec, 1.9, 1.10
Message-ID: <20091205233754.5A91211C0095@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7817/devel

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Nov 2009 21:23:15 -0000	1.8
+++ .cvsignore	5 Dec 2009 23:37:53 -0000	1.9
@@ -1 +1 @@
-task-1.8.4.tar.gz
+task-1.8.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	17 Nov 2009 21:23:15 -0000	1.8
+++ import.log	5 Dec 2009 23:37:53 -0000	1.9
@@ -6,3 +6,4 @@ task-1_8_1-1_fc10:HEAD:task-1.8.1-1.fc10
 task-1_8_2-1_fc10:HEAD:task-1.8.2-1.fc10.src.rpm:1252319639
 task-1_8_3-1_fc10:HEAD:task-1.8.3-1.fc10.src.rpm:1256164568
 task-1_8_4-1_fc11:HEAD:task-1.8.4-1.fc11.src.rpm:1258468735
+task-1_8_5-1_fc11:HEAD:task-1.8.5-1.fc11.src.rpm:1260056257


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Nov 2009 21:23:15 -0000	1.9
+++ sources	5 Dec 2009 23:37:53 -0000	1.10
@@ -1 +1 @@
-f78071a21d493ba0ea575878d3aaff20  task-1.8.4.tar.gz
+83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/task.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- task.spec	17 Nov 2009 21:23:15 -0000	1.9
+++ task.spec	5 Dec 2009 23:37:54 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.4
+Version:        1.8.5
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-1
+  Intial RPM for task bugfix release 1.8.5
 * Tue Nov 17 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.4-1
   Intial RPM for task bugfix release 1.8.4
+* Wed Oct 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.3-1
+  Intial RPM for task bugfix release 1.8.3
 * Mon Sep 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.2-1
   Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.1-1



From ultrafredde at fedoraproject.org  Sat Dec  5 23:40:32 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sat,  5 Dec 2009 23:40:32 +0000 (UTC)
Subject: rpms/task/F-10 .cvsignore, 1.8, 1.9 import.log, 1.8, 1.9 sources,
	1.9, 1.10 task.spec, 1.8, 1.9
Message-ID: <20091205234032.216C911C03F6@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8915/F-10

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Nov 2009 14:04:58 -0000	1.8
+++ .cvsignore	5 Dec 2009 23:40:31 -0000	1.9
@@ -1 +1 @@
-task-1.8.4.tar.gz
+task-1.8.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	17 Nov 2009 14:04:58 -0000	1.8
+++ import.log	5 Dec 2009 23:40:31 -0000	1.9
@@ -6,3 +6,4 @@ task-1_8_1-1_fc10:F-10:task-1.8.1-1.fc10
 task-1_8_2-1_fc10:F-10:task-1.8.2-1.fc10.src.rpm:1252317762
 task-1_8_3-1_fc10:F-10:task-1.8.3-1.fc10.src.rpm:1256161807
 task-1_8_4-1_fc11:F-10:task-1.8.4-1.fc11.src.rpm:1258466669
+task-1_8_5-1_fc11:F-10:task-1.8.5-1.fc11.src.rpm:1260056409


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Nov 2009 14:04:59 -0000	1.9
+++ sources	5 Dec 2009 23:40:31 -0000	1.10
@@ -1 +1 @@
-f78071a21d493ba0ea575878d3aaff20  task-1.8.4.tar.gz
+83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/task.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- task.spec	17 Nov 2009 14:04:59 -0000	1.8
+++ task.spec	5 Dec 2009 23:40:31 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.4
+Version:        1.8.5
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-1
+  Intial RPM for task bugfix release 1.8.5
 * Tue Nov 17 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.4-1
   Intial RPM for task bugfix release 1.8.4
+* Wed Oct 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.3-1
+  Intial RPM for task bugfix release 1.8.3
 * Mon Sep 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.2-1
   Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.1-1



From ultrafredde at fedoraproject.org  Sat Dec  5 23:42:15 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sat,  5 Dec 2009 23:42:15 +0000 (UTC)
Subject: rpms/task/F-11 .cvsignore, 1.8, 1.9 import.log, 1.8, 1.9 sources,
	1.9, 1.10 task.spec, 1.8, 1.9
Message-ID: <20091205234215.88BDC11C03F6@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9709/F-11

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Nov 2009 14:08:54 -0000	1.8
+++ .cvsignore	5 Dec 2009 23:42:14 -0000	1.9
@@ -1 +1 @@
-task-1.8.4.tar.gz
+task-1.8.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	17 Nov 2009 14:08:54 -0000	1.8
+++ import.log	5 Dec 2009 23:42:15 -0000	1.9
@@ -6,3 +6,4 @@ task-1_8_1-1_fc10:F-11:task-1.8.1-1.fc10
 task-1_8_2-1_fc10:F-11:task-1.8.2-1.fc10.src.rpm:1252318424
 task-1_8_3-1_fc10:F-11:task-1.8.3-1.fc10.src.rpm:1256163372
 task-1_8_4-1_fc11:F-11:task-1.8.4-1.fc11.src.rpm:1258466873
+task-1_8_5-1_fc11:F-11:task-1.8.5-1.fc11.src.rpm:1260056516


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Nov 2009 14:08:55 -0000	1.9
+++ sources	5 Dec 2009 23:42:15 -0000	1.10
@@ -1 +1 @@
-f78071a21d493ba0ea575878d3aaff20  task-1.8.4.tar.gz
+83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/task.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- task.spec	17 Nov 2009 14:08:55 -0000	1.8
+++ task.spec	5 Dec 2009 23:42:15 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.4
+Version:        1.8.5
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-1
+  Intial RPM for task bugfix release 1.8.5
 * Tue Nov 17 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.4-1
   Intial RPM for task bugfix release 1.8.4
+* Wed Oct 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.3-1
+  Intial RPM for task bugfix release 1.8.3
 * Mon Sep 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.2-1
   Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.1-1



From ultrafredde at fedoraproject.org  Sat Dec  5 23:44:27 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sat,  5 Dec 2009 23:44:27 +0000 (UTC)
Subject: rpms/task/F-12 .cvsignore, 1.8, 1.9 import.log, 1.8, 1.9 sources,
	1.9, 1.10 task.spec, 1.9, 1.10
Message-ID: <20091205234427.DC7B611C0095@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10645/F-12

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Nov 2009 21:20:53 -0000	1.8
+++ .cvsignore	5 Dec 2009 23:44:27 -0000	1.9
@@ -1 +1 @@
-task-1.8.4.tar.gz
+task-1.8.5.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	17 Nov 2009 21:20:53 -0000	1.8
+++ import.log	5 Dec 2009 23:44:27 -0000	1.9
@@ -6,3 +6,4 @@ task-1_8_1-1_fc10:HEAD:task-1.8.1-1.fc10
 task-1_8_2-1_fc10:F-12:task-1.8.2-1.fc10.src.rpm:1252318919
 task-1_8_3-1_fc10:F-12:task-1.8.3-1.fc10.src.rpm:1256163996
 task-1_8_4-1_fc11:F-12:task-1.8.4-1.fc11.src.rpm:1258468591
+task-1_8_5-1_fc11:F-12:task-1.8.5-1.fc11.src.rpm:1260056647


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Nov 2009 21:20:53 -0000	1.9
+++ sources	5 Dec 2009 23:44:27 -0000	1.10
@@ -1 +1 @@
-f78071a21d493ba0ea575878d3aaff20  task-1.8.4.tar.gz
+83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/task.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- task.spec	17 Nov 2009 21:20:53 -0000	1.9
+++ task.spec	5 Dec 2009 23:44:27 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.4
+Version:        1.8.5
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-1
+  Intial RPM for task bugfix release 1.8.5
 * Tue Nov 17 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.4-1
   Intial RPM for task bugfix release 1.8.4
+* Wed Oct 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.3-1
+  Intial RPM for task bugfix release 1.8.3
 * Mon Sep 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.2-1
   Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.1-1



From rathann at fedoraproject.org  Sat Dec  5 23:48:56 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat,  5 Dec 2009 23:48:56 +0000 (UTC)
Subject: File freefem++-3.6-1.tar.gz uploaded to lookaside cache by rathann
Message-ID: <20091205234856.86B9310F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for freefem++:

664b3838eb977461e3b92ac37d32d699  freefem++-3.6-1.tar.gz



From rathann at fedoraproject.org  Sat Dec  5 23:53:21 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat,  5 Dec 2009 23:53:21 +0000 (UTC)
Subject: rpms/freefem++/devel .cvsignore, 1.8, 1.9 freefem++-rpm.patch, 1.5, 
	1.6 freefem++.spec, 1.24, 1.25 sources, 1.8,
	1.9 freefem++-gcc44-link.patch, 1.2, NONE freefem++-gcc44.patch,
	1.2, NONE
Message-ID: <20091205235321.7EBD111C0095@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13830

Modified Files:
	.cvsignore freefem++-rpm.patch freefem++.spec sources 
Removed Files:
	freefem++-gcc44-link.patch freefem++-gcc44.patch 
Log Message:
* Sat Dec  5 2009 Dominik Mierzejewski <rpm at greysector.net> 3.6-1.1
- update to 3.6-1
- drop upstream'd/obsolete patches
- move scripts to %{_datadir}
- reenable testsuite



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 20:57:16 -0000	1.8
+++ .cvsignore	5 Dec 2009 23:53:20 -0000	1.9
@@ -1,2 +1,2 @@
 FreeFem++.1
-freefem++-3.5.tar.gz
+freefem++-3.6-1.tar.gz

freefem++-rpm.patch:
 Makefile.am                  |   10 +++++-----
 acoptim.m4                   |   22 +++++++++++-----------
 configure.ac                 |    4 ++--
 examples++-3d/Makefile.am    |    4 ++--
 examples++-load/Makefile.am  |   22 +++++++++++-----------
 examples++-load/load.link.in |   14 +++++++-------
 src/lglib/Makefile.am        |    4 ++--
 7 files changed, 40 insertions(+), 40 deletions(-)

Index: freefem++-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-rpm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- freefem++-rpm.patch	20 Sep 2009 20:57:17 -0000	1.5
+++ freefem++-rpm.patch	5 Dec 2009 23:53:21 -0000	1.6
@@ -1,7 +1,7 @@
-diff -up freefem++-3.5/acoptim.m4.r freefem++-3.5/acoptim.m4
---- freefem++-3.5/acoptim.m4.r	2009-05-17 21:03:14.000000000 +0200
-+++ freefem++-3.5/acoptim.m4	2009-09-20 21:42:32.000000000 +0200
-@@ -30,14 +30,6 @@ AC_MSG_CHECKING(whether to generate debu
+diff -up freefem++-3.6-1/acoptim.m4.r freefem++-3.6-1/acoptim.m4
+--- freefem++-3.6-1/acoptim.m4.r	2009-10-26 09:46:52.000000000 +0100
++++ freefem++-3.6-1/acoptim.m4	2009-12-05 23:56:25.000000000 +0100
+@@ -47,14 +47,6 @@ AC_MSG_CHECKING(whether to generate debu
  AC_ARG_ENABLE(debug,[  --enable-debug	Turn on debug versions of FreeFem++])
  AC_ARG_ENABLE(optim,[  --enable-optim	Turn on compiler optimization])
  
@@ -16,7 +16,7 @@ diff -up freefem++-3.5/acoptim.m4.r free
  if test "$enable_debug" = yes;
  then
  	AC_MSG_RESULT(yes)
-@@ -46,9 +38,9 @@ else
+@@ -63,9 +55,9 @@ else
  
  	# No debugging information in optimized code
  
@@ -29,7 +29,7 @@ diff -up freefem++-3.5/acoptim.m4.r free
  fi
  
  # Hardware-independant optimization
-@@ -82,6 +74,14 @@ if test "$enable_debug" != yes \
+@@ -99,6 +91,14 @@ if test "$enable_debug" != yes \
      -a "$enable_generic" != yes
  then
  
@@ -44,10 +44,10 @@ diff -up freefem++-3.5/acoptim.m4.r free
      # MacOS X Darwin
      if test -x /usr/bin/hostinfo
  	then
-diff -up freefem++-3.5/configure.ac.r freefem++-3.5/configure.ac
---- freefem++-3.5/configure.ac.r	2009-08-27 16:03:13.000000000 +0200
-+++ freefem++-3.5/configure.ac	2009-09-20 21:42:32.000000000 +0200
-@@ -247,7 +247,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
+diff -up freefem++-3.6-1/configure.ac.r freefem++-3.6-1/configure.ac
+--- freefem++-3.6-1/configure.ac.r	2009-11-10 20:28:06.000000000 +0100
++++ freefem++-3.6-1/configure.ac	2009-12-05 23:56:25.000000000 +0100
+@@ -284,7 +284,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
  # date is only useful for config-version.h
  
  test "$prefix" = NONE && prefix="$ac_default_prefix"
@@ -56,7 +56,7 @@ diff -up freefem++-3.5/configure.ac.r fr
  AC_MSG_CHECKING(prefix dir freefem++  )
  AC_MSG_RESULT($ff_prefix_dir)	 
  
-@@ -1093,7 +1093,7 @@ then
+@@ -1150,7 +1150,7 @@ then
  		AC_CHECK_LIB(umfpack,umf_i_malloc,
  			ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
  			ff_umfpack_ok=yes,,$ff_umfpack_libs)
@@ -65,39 +65,41 @@ diff -up freefem++-3.5/configure.ac.r fr
  			AC_MSG_WARN([		Sorry we find UMFPACK lib but not the include umfpack.h file])
  		fi
  	fi	
-diff -up freefem++-3.5/examples++-3d/Makefile.am.r freefem++-3.5/examples++-3d/Makefile.am
---- freefem++-3.5/examples++-3d/Makefile.am.r	2009-06-15 22:38:58.000000000 +0200
-+++ freefem++-3.5/examples++-3d/Makefile.am	2009-09-20 21:50:02.000000000 +0200
+diff -up freefem++-3.6-1/examples++-3d/Makefile.am.r freefem++-3.6-1/examples++-3d/Makefile.am
+--- freefem++-3.6-1/examples++-3d/Makefile.am.r	2009-11-10 20:28:06.000000000 +0100
++++ freefem++-3.6-1/examples++-3d/Makefile.am	2009-12-05 23:56:25.000000000 +0100
 @@ -31,8 +31,8 @@ freefem++.pref:
  	echo loadpath += \"./\" >>freefem++.pref
  
  install-exec-local:: 
 -	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/idp
--	$(INSTALL)  -m 555 $ $(LIST_IDP)  $(DESTDIR)$(ff_prefix_dir)/lib
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++/idp
-+	$(INSTALL)  -m 755 $ $(LIST_IDP)  $(DESTDIR)$(libdir)/freefem++
+-	$(INSTALL)  -m 555  $(LIST_IDP)  $(DESTDIR)$(ff_prefix_dir)/idp
++	$(mkinstalldirs) -m 755 $(DESTDIR)$(datadir)/freefem++/idp
++	$(INSTALL)  -m 555  $(LIST_IDP)  $(DESTDIR)$(datadir)/freefem++/idp
  
  
- # To check the scripts against their reference values
-diff -up freefem++-3.5/examples++-load/load.link.in.r freefem++-3.5/examples++-load/load.link.in
---- freefem++-3.5/examples++-load/load.link.in.r	2009-07-10 11:02:37.000000000 +0200
-+++ freefem++-3.5/examples++-load/load.link.in	2009-09-20 21:42:32.000000000 +0200
-@@ -6,10 +6,10 @@ FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
- INCFF=
+ 
+diff -up freefem++-3.6-1/examples++-load/load.link.in.r freefem++-3.6-1/examples++-load/load.link.in
+--- freefem++-3.6-1/examples++-load/load.link.in.r	2009-11-03 21:41:00.000000000 +0100
++++ freefem++-3.6-1/examples++-load/load.link.in	2009-12-05 23:56:25.000000000 +0100
+@@ -10,11 +10,11 @@ INCFF=
  if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
+ if [ -z "$MPICXX" ] ; then MPICXX='@MPICXX@' ; fi
  if [ -z "$F77" ] ; then F77='@F77@' ; fi
 -if [ "$CXX" = '@'CXX'@' ] ; then CXX=""; fi
+-if [ "$MPICXX" = '@'MPICXX'@' ] ; then MPICXX=""; fi
 -if [ "$F77" = '@'F77'@' ] ; then F77=""; fi
 -if [ "$FFCXXFLAGS" = '@'CXXFLAGS'@' ] ; then FFCXXFLAGS=""; fi
 -if [ "$FFVERSION" = '@'VERSION'@' ] ; then FFVERSION=""; fi
 +if [ "$CXX" = '@CXX@' ] ; then CXX=""; fi
++if [ "$MPICXX" = '@MPICXX@' ] ; then MPICXX=""; fi
 +if [ "$F77" = '@F77@' ] ; then F77=""; fi
 +if [ "$FFCXXFLAGS" = '@CXXFLAGS@' ] ; then FFCXXFLAGS=""; fi
 +if [ "$FFVERSION" = '@VERSION@' ] ; then FFVERSION=""; fi
  if [ -z "$INCFF" ] ; then
      if [ -f "@INCFF@/ff++.hpp" ] ; then
  	INCFF="-I at INCFF@"
-@@ -17,8 +17,8 @@ if [ -z "$INCFF" ] ; then
+@@ -22,8 +22,8 @@ if [ -z "$INCFF" ] ; then
  	INCFF="-Iinclude"
      elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then 
  	INCFF="-IFFAPPLI_INC" 
@@ -108,10 +110,28 @@ diff -up freefem++-3.5/examples++-load/l
      else
  	ff=`which freefem++.exe`;
  	ffinc=`dirname "$ff"`/examples++-load/include
-diff -up freefem++-3.5/examples++-load/Makefile.am.r freefem++-3.5/examples++-load/Makefile.am
---- freefem++-3.5/examples++-load/Makefile.am.r	2009-06-16 10:30:42.000000000 +0200
-+++ freefem++-3.5/examples++-load/Makefile.am	2009-09-20 21:50:15.000000000 +0200
-@@ -141,16 +141,16 @@ load.link:load.link.in  Makefile
+diff -up freefem++-3.6-1/examples++-load/Makefile.am.r freefem++-3.6-1/examples++-load/Makefile.am
+--- freefem++-3.6-1/examples++-load/Makefile.am.r	2009-11-10 21:20:31.000000000 +0100
++++ freefem++-3.6-1/examples++-load/Makefile.am	2009-12-06 00:19:31.000000000 +0100
+@@ -71,7 +71,7 @@ include: include.tar.gz
+ 	rm -rf include 
+ 	gunzip -c include.tar.gz| tar xvf -
+ 	-rm -f include/._*
+-	-cp -rf ../download/include/* include/.
++	@-cp -rf ../download/include/* include/.
+ 
+ Ref: makeref.edp
+ 	../src/nw/FreeFem++-nw makeref.edp
+@@ -94,7 +94,7 @@ all.edp: 
+ regtests.edp: regtests.m4 ../regtests.m4
+ 	m4 -DASSERT regtests.m4 > regtests.edp
+ 
+-$(LIST_COMPILE):ff-c++ include Makefile 
++$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile 
+ 
+ clean-local:
+ 	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
+@@ -120,19 +120,19 @@ WHERE_LIBRARY-download:ff-pkg-download 
  freefem++.pref:
  	echo loadpath = \"./\" >freefem++.pref
  install-exec-local:: load_compile
@@ -127,19 +147,22 @@ diff -up freefem++-3.5/examples++-load/M
 +	$(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++
 +	$(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir)
 +	$(INSTALL_DATA)  include/* $(DESTDIR)$(includedir)/freefem++
-+	$(INSTALL)  -m 755 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
++	$(INSTALL)  -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
 +	echo loadpath += \"./\"  >$(DESTDIR)$(sysconfdir)/freefem++.pref
-+	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
-+	echo includepath += \"$(ff_prefix_dir)/edp\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++	echo loadpath += \"$(libdir)/freefem++\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++	echo includepath += \"$(datadir)/freefem++/edp\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
  	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
--	-$(INSTALL)  -m 555 $(LIST_COMPILE_PKG) $(DESTDIR)$(ff_prefix_dir)/lib
-+	-$(INSTALL)  -m 755 $(LIST_COMPILE_PKG) $(DESTDIR)$(libdir)/freefem++
+ 	$(INSTALL_SCRIPT) ff-pkg-download  $(DESTDIR)${bindir}
+ 	$(INSTALL_SCRIPT) ff-get-dep  $(DESTDIR)${bindir}
+ 	-for i in $(LIST_COMPILE_PKG); do \
+-	 if [ -f $$i ] ; then 	$(INSTALL)  -m 555 $$i $(DESTDIR)$(ff_prefix_dir)/lib; fi; done
++	 if [ -f $$i ] ; then 	$(INSTALL)  -m 555 $$i $(DESTDIR)$(libdir)/freefem++; fi; done
  
  
  
-diff -up freefem++-3.5/Makefile.am.r freefem++-3.5/Makefile.am
---- freefem++-3.5/Makefile.am.r	2009-07-10 09:36:21.000000000 +0200
-+++ freefem++-3.5/Makefile.am	2009-09-20 21:52:46.000000000 +0200
+diff -up freefem++-3.6-1/Makefile.am.r freefem++-3.6-1/Makefile.am
+--- freefem++-3.6-1/Makefile.am.r	2009-11-10 14:33:47.000000000 +0100
++++ freefem++-3.6-1/Makefile.am	2009-12-05 23:56:25.000000000 +0100
 @@ -25,14 +25,14 @@ examples-bamg/test/dotest*.pl 0ldUserRea
  
  FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
@@ -154,7 +177,7 @@ diff -up freefem++-3.5/Makefile.am.r fre
  ./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh  \
 -./download/fftw/Makefile ./download/fftw/Makefile.am \
 +./download/fftw/Makefile \
- examples++*/*.[ie]dp 
+ examples++*/*.[ie]dp  CheckAllEdp
  
  
 @@ -148,8 +148,8 @@ clean-local::
@@ -177,10 +200,9 @@ diff -up freefem++-3.5/Makefile.am.r fre
  	find .  -name '*.[ei]dp' -o -name '*.h*' -o -name '*.cpp'  |egrep  '[.]/examples++' >>$@
  	find .   -name '*.h*' -o -name '*.cpp'  |egrep  '[.]/examples++' >>$@
  List-agl-dylib: src/nw/FreeFem++
-diff -up freefem++-3.5/src/Carbon.r freefem++-3.5/src/Carbon
-diff -up freefem++-3.5/src/lglib/Makefile.am.r freefem++-3.5/src/lglib/Makefile.am
---- freefem++-3.5/src/lglib/Makefile.am.r	2006-04-10 22:51:52.000000000 +0200
-+++ freefem++-3.5/src/lglib/Makefile.am	2009-09-20 21:42:32.000000000 +0200
+diff -up freefem++-3.6-1/src/lglib/Makefile.am.r freefem++-3.6-1/src/lglib/Makefile.am
+--- freefem++-3.6-1/src/lglib/Makefile.am.r	2006-04-10 22:51:52.000000000 +0200
++++ freefem++-3.6-1/src/lglib/Makefile.am	2009-12-05 23:56:25.000000000 +0100
 @@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
  BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
  


Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- freefem++.spec	20 Sep 2009 22:04:49 -0000	1.24
+++ freefem++.spec	5 Dec 2009 23:53:21 -0000	1.25
@@ -1,19 +1,17 @@
-%define dotpl %{nil}
-%define dashpl %{nil}
+%define dotpl .1
+%define dashpl -1
 
 Summary: PDE solving tool
 Name: freefem++
-Version: 3.5
-Release: 2%{dotpl}%{?dist}
+Version: 3.6
+Release: 1%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Group: Applications/Engineering
 Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
 Source1: FreeFem++.1
 Patch0: %{name}-rpm.patch
-Patch1: %{name}-gcc44.patch
 Patch2: %{name}-name.patch
 Patch3: %{name}-tex.patch
-Patch4: %{name}-gcc44-link.patch
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	arpack-devel
@@ -82,7 +80,6 @@ This package contains the MPI version of
 %prep
 %setup -q -n %{name}-%{version}%{dashpl}
 %patch0 -p1 -b .r
-%patch1 -p1 -b .gcc44
 %patch2 -p1
 %patch3 -p1 -b .t
 find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" -o -name "*.edp" \) | xargs chmod 644
@@ -105,10 +102,8 @@ autoreconf -vif
 	--with-blas="-L%{_libdir}/atlas -llapack -lf77blas -lcblas -latlas" \
 	--with-mpi=mpic++
 
-# work around gcc44 bug
-patch -p1 -b --suffix .gcc44-link < %{PATCH4}
-
 %{__make} %{?_smp_mflags}
+%{__make} -C examples++-load load_compile %{?_smp_mflags}
 %{__make} documentation
 
 %install
@@ -116,15 +111,17 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -d $RPM_BUILD_ROOT%{_datadir}/freefem++/edp
 pushd $RPM_BUILD_ROOT%{_datadir}/freefem++
 rm -r download
 rm BUGS COPYRIGHT HISTORY* INNOVATION INSTALL README TODO freefem++doc.pdf mode-mi-edp.zip
 popd
+rm $RPM_BUILD_ROOT%{_bindir}/ff-pkg-download
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0
+%if 1
 %check
 . /etc/profile.d/modules.sh
 module load openmpi-%{_arch}
@@ -148,12 +145,16 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{_libdir}/freefem++
 %{_sysconfdir}/freefem++.pref
 %dir %{_datadir}/freefem++
+%{_datadir}/freefem++/edp
+%{_datadir}/freefem++/idp
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/ff-c++
+%{_bindir}/ff-get-dep
 %{_includedir}/freefem++
 %{_datadir}/freefem++/examples*
+%{_datadir}/freefem++/CheckAllEdp
 
 %files glx
 %defattr(-,root,root,-)
@@ -164,6 +165,12 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Sat Dec  5 2009 Dominik Mierzejewski <rpm at greysector.net> 3.6-1.1
+- update to 3.6-1
+- drop upstream'd/obsolete patches
+- move scripts to %%{_datadir}
+- reenable testsuite
+
 * Mon Sep 21 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-2
 - disable testsuite
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 20:57:17 -0000	1.8
+++ sources	5 Dec 2009 23:53:21 -0000	1.9
@@ -1,2 +1,2 @@
 f1accc292794bbafb66e963080f9d15b  FreeFem++.1
-3dea51f61d8f04ca1d2382c55589816d  freefem++-3.5.tar.gz
+664b3838eb977461e3b92ac37d32d699  freefem++-3.6-1.tar.gz


--- freefem++-gcc44-link.patch DELETED ---


--- freefem++-gcc44.patch DELETED ---



From phuang at fedoraproject.org  Sun Dec  6 00:30:40 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun,  6 Dec 2009 00:30:40 +0000 (UTC)
Subject: File ibus-qt-1.2.0.20091206-Source.tar.gz uploaded to lookaside
	cache by phuang
Message-ID: <20091206003040.27A8510F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ibus-qt:

450aad990d4dacf554a2f306414f891c  ibus-qt-1.2.0.20091206-Source.tar.gz



From phuang at fedoraproject.org  Sun Dec  6 00:31:52 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun,  6 Dec 2009 00:31:52 +0000 (UTC)
Subject: rpms/ibus-qt/devel .cvsignore, 1.5, 1.6 ibus-qt.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20091206003152.1950711C0095@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26994

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20091206


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Oct 2009 03:48:04 -0000	1.5
+++ .cvsignore	6 Dec 2009 00:31:51 -0000	1.6
@@ -1 +1 @@
-ibus-qt-1.2.0.20091014-Source.tar.gz
+ibus-qt-1.2.0.20091206-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ibus-qt.spec	23 Nov 2009 17:04:31 -0000	1.9
+++ ibus-qt.spec	6 Dec 2009 00:31:51 -0000	1.10
@@ -1,5 +1,5 @@
 Name:       ibus-qt
-Version:    1.2.0.20091014
+Version:    1.2.0.20091206
 Release:    2%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibus-qt.so
 
 %changelog
+* Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091206-1
+- Update to 1.2.0.20091206.
+
 * Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0.20091014-2
 - rebuild (for qt-4.6.0-rc1, f13+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Oct 2009 03:48:04 -0000	1.6
+++ sources	6 Dec 2009 00:31:51 -0000	1.7
@@ -1 +1 @@
-781d3bb431452b6d019a2c1983010bb7  ibus-qt-1.2.0.20091014-Source.tar.gz
+450aad990d4dacf554a2f306414f891c  ibus-qt-1.2.0.20091206-Source.tar.gz



From phuang at fedoraproject.org  Sun Dec  6 00:44:58 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun,  6 Dec 2009 00:44:58 +0000 (UTC)
Subject: rpms/ibus-qt/F-12 .cvsignore, 1.5, 1.6 ibus-qt.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20091206004458.2EF2311C0095@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31197

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20091206


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	14 Oct 2009 01:51:43 -0000	1.5
+++ .cvsignore	6 Dec 2009 00:44:57 -0000	1.6
@@ -1 +1 @@
-ibus-qt-1.2.0.20091014-Source.tar.gz
+ibus-qt-1.2.0.20091206-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/ibus-qt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ibus-qt.spec	14 Oct 2009 01:51:44 -0000	1.8
+++ ibus-qt.spec	6 Dec 2009 00:44:57 -0000	1.9
@@ -1,6 +1,6 @@
 Name:       ibus-qt
-Version:    1.2.0.20091014
-Release:    1%{?dist}
+Version:    1.2.0.20091206
+Release:    2%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibus-qt.so
 
 %changelog
+* Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091206-1
+- Update to 1.2.0.20091206.
+
 * Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091014-1
 - Update to 1.2.0.20091014.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Oct 2009 01:51:44 -0000	1.6
+++ sources	6 Dec 2009 00:44:57 -0000	1.7
@@ -1 +1 @@
-781d3bb431452b6d019a2c1983010bb7  ibus-qt-1.2.0.20091014-Source.tar.gz
+450aad990d4dacf554a2f306414f891c  ibus-qt-1.2.0.20091206-Source.tar.gz



From rathann at fedoraproject.org  Sun Dec  6 00:57:32 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 00:57:32 +0000 (UTC)
Subject: File libgadu-1.9.0-rc2.tar.gz uploaded to lookaside cache by rathann
Message-ID: <20091206005732.9394B10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libgadu:

2d2a96a98e33d3a0055bc76f67a19f04  libgadu-1.9.0-rc2.tar.gz



From rathann at fedoraproject.org  Sun Dec  6 01:05:01 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 01:05:01 +0000 (UTC)
Subject: rpms/libgadu/devel .cvsignore, 1.8, 1.9 libgadu.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <20091206010501.75C7111C0095@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libgadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4901

Modified Files:
	.cvsignore libgadu.spec sources 
Log Message:
* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> 1.9.0-0.2.rc2
- updated to 1.9.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 Sep 2009 19:44:01 -0000	1.8
+++ .cvsignore	6 Dec 2009 01:05:00 -0000	1.9
@@ -1 +1 @@
-libgadu-1.9.0-rc1.tar.gz
+libgadu-1.9.0-rc2.tar.gz


Index: libgadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/libgadu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libgadu.spec	13 Sep 2009 19:44:01 -0000	1.13
+++ libgadu.spec	6 Dec 2009 01:05:01 -0000	1.14
@@ -1,10 +1,13 @@
+%define dashrc -rc2
+%define dotrc .rc2
+
 Name:		libgadu
 Version:	1.9.0
-Release:	0.1.rc1%{?dist}
+Release:	0.2%{dotrc}%{?dist}
 Summary:	A Gadu-gadu protocol compatible communications library
 License:	LGPLv2
 Group:		System Environment/Libraries
-Source0:	http://toxygen.net/libgadu/files/%{name}-%{version}-rc1.tar.gz
+Source0:	http://toxygen.net/libgadu/files/%{name}-%{version}%{dashrc}.tar.gz
 URL:		http://toxygen.net/libgadu/
 BuildRequires:	openssl-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
@@ -35,7 +38,7 @@ Pakiet libgadu-devel zawiera pliki nag?
 potrzebne do kompilowania aplikacji korzystaj?cych z libgadu.
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}%{dashrc}
 
 %build
 %configure \
@@ -69,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> 1.9.0-0.2.rc2
+- updated to 1.9.0-rc2
+
 * Sun Sep 13 2009 Dominik Mierzejewski <rpm at greysector.net> 1.9.0-0.1.rc1
 - updated to 1.9.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	13 Sep 2009 19:44:01 -0000	1.8
+++ sources	6 Dec 2009 01:05:01 -0000	1.9
@@ -1 +1 @@
-96d2e3e48803ff6cd2a281c0b52d2167  libgadu-1.9.0-rc1.tar.gz
+2d2a96a98e33d3a0055bc76f67a19f04  libgadu-1.9.0-rc2.tar.gz



From ultrafredde at fedoraproject.org  Sun Dec  6 01:30:40 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sun,  6 Dec 2009 01:30:40 +0000 (UTC)
Subject: File task-1.8.5.tar.gz uploaded to lookaside cache by ultrafredde
Message-ID: <20091206013040.0332010F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for task:

b7e5ab3abf624027068d9a01bf684035  task-1.8.5.tar.gz



From ultrafredde at fedoraproject.org  Sun Dec  6 01:31:10 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sun,  6 Dec 2009 01:31:10 +0000 (UTC)
Subject: rpms/task/devel import.log, 1.9, 1.10 sources, 1.10, 1.11 task.spec,
	1.10, 1.11
Message-ID: <20091206013110.4E48511C00C5@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833/devel

Modified Files:
	import.log sources task.spec 
Log Message:
task updated to 1.8.5


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	5 Dec 2009 23:37:53 -0000	1.9
+++ import.log	6 Dec 2009 01:31:09 -0000	1.10
@@ -7,3 +7,4 @@ task-1_8_2-1_fc10:HEAD:task-1.8.2-1.fc10
 task-1_8_3-1_fc10:HEAD:task-1.8.3-1.fc10.src.rpm:1256164568
 task-1_8_4-1_fc11:HEAD:task-1.8.4-1.fc11.src.rpm:1258468735
 task-1_8_5-1_fc11:HEAD:task-1.8.5-1.fc11.src.rpm:1260056257
+task-1_8_5-2_fc11:HEAD:task-1.8.5-2.fc11.src.rpm:1260063044


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Dec 2009 23:37:53 -0000	1.10
+++ sources	6 Dec 2009 01:31:09 -0000	1.11
@@ -1 +1 @@
-83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz
+b7e5ab3abf624027068d9a01bf684035  task-1.8.5.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/task.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- task.spec	5 Dec 2009 23:37:54 -0000	1.10
+++ task.spec	6 Dec 2009 01:31:09 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           task
 Version:        1.8.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A command-line to do list manager
 
 Group:          Applications/Productivity
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-2
+  Fixed wrong ChangeLog file
 * Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-1
   Intial RPM for task bugfix release 1.8.5
 * Tue Nov 17 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.4-1



From ultrafredde at fedoraproject.org  Sun Dec  6 01:33:20 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sun,  6 Dec 2009 01:33:20 +0000 (UTC)
Subject: rpms/task/F-10 import.log, 1.9, 1.10 sources, 1.10, 1.11 task.spec, 
	1.9, 1.10
Message-ID: <20091206013320.70F0E11C00C5@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13657/F-10

Modified Files:
	import.log sources task.spec 
Log Message:
task updated to 1.8.5


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	5 Dec 2009 23:40:31 -0000	1.9
+++ import.log	6 Dec 2009 01:33:19 -0000	1.10
@@ -7,3 +7,4 @@ task-1_8_2-1_fc10:F-10:task-1.8.2-1.fc10
 task-1_8_3-1_fc10:F-10:task-1.8.3-1.fc10.src.rpm:1256161807
 task-1_8_4-1_fc11:F-10:task-1.8.4-1.fc11.src.rpm:1258466669
 task-1_8_5-1_fc11:F-10:task-1.8.5-1.fc11.src.rpm:1260056409
+task-1_8_5-2_fc11:F-10:task-1.8.5-2.fc11.src.rpm:1260063182


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Dec 2009 23:40:31 -0000	1.10
+++ sources	6 Dec 2009 01:33:20 -0000	1.11
@@ -1 +1 @@
-83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz
+b7e5ab3abf624027068d9a01bf684035  task-1.8.5.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/task.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- task.spec	5 Dec 2009 23:40:31 -0000	1.9
+++ task.spec	6 Dec 2009 01:33:20 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           task
 Version:        1.8.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A command-line to do list manager
 
 Group:          Applications/Productivity
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-2
+  Fixed wrong ChangeLog file
 * Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-1
   Intial RPM for task bugfix release 1.8.5
 * Tue Nov 17 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.4-1



From ultrafredde at fedoraproject.org  Sun Dec  6 01:35:52 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sun,  6 Dec 2009 01:35:52 +0000 (UTC)
Subject: rpms/task/F-11 import.log, 1.9, 1.10 sources, 1.10, 1.11 task.spec, 
	1.9, 1.10
Message-ID: <20091206013552.EFBA211C00C5@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14573/F-11

Modified Files:
	import.log sources task.spec 
Log Message:
task updated to 1.8.5


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	5 Dec 2009 23:42:15 -0000	1.9
+++ import.log	6 Dec 2009 01:35:52 -0000	1.10
@@ -7,3 +7,4 @@ task-1_8_2-1_fc10:F-11:task-1.8.2-1.fc10
 task-1_8_3-1_fc10:F-11:task-1.8.3-1.fc10.src.rpm:1256163372
 task-1_8_4-1_fc11:F-11:task-1.8.4-1.fc11.src.rpm:1258466873
 task-1_8_5-1_fc11:F-11:task-1.8.5-1.fc11.src.rpm:1260056516
+task-1_8_5-2_fc11:F-11:task-1.8.5-2.fc11.src.rpm:1260063281


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Dec 2009 23:42:15 -0000	1.10
+++ sources	6 Dec 2009 01:35:52 -0000	1.11
@@ -1 +1 @@
-83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz
+b7e5ab3abf624027068d9a01bf684035  task-1.8.5.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/task.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- task.spec	5 Dec 2009 23:42:15 -0000	1.9
+++ task.spec	6 Dec 2009 01:35:52 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           task
 Version:        1.8.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A command-line to do list manager
 
 Group:          Applications/Productivity
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-2
+  Fixed wrong ChangeLog file
 * Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-1
   Intial RPM for task bugfix release 1.8.5
 * Tue Nov 17 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.4-1



From ultrafredde at fedoraproject.org  Sun Dec  6 01:37:42 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Sun,  6 Dec 2009 01:37:42 +0000 (UTC)
Subject: rpms/task/F-12 import.log, 1.9, 1.10 sources, 1.10, 1.11 task.spec, 
	1.10, 1.11
Message-ID: <20091206013742.163E411C00C5@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15308/F-12

Modified Files:
	import.log sources task.spec 
Log Message:
task updated to 1.8.5


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	5 Dec 2009 23:44:27 -0000	1.9
+++ import.log	6 Dec 2009 01:37:41 -0000	1.10
@@ -7,3 +7,4 @@ task-1_8_2-1_fc10:F-12:task-1.8.2-1.fc10
 task-1_8_3-1_fc10:F-12:task-1.8.3-1.fc10.src.rpm:1256163996
 task-1_8_4-1_fc11:F-12:task-1.8.4-1.fc11.src.rpm:1258468591
 task-1_8_5-1_fc11:F-12:task-1.8.5-1.fc11.src.rpm:1260056647
+task-1_8_5-2_fc11:F-12:task-1.8.5-2.fc11.src.rpm:1260063445


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Dec 2009 23:44:27 -0000	1.10
+++ sources	6 Dec 2009 01:37:41 -0000	1.11
@@ -1 +1 @@
-83e1ddd9494be56606a4b8e068359aa4  task-1.8.5.tar.gz
+b7e5ab3abf624027068d9a01bf684035  task-1.8.5.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/task.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- task.spec	5 Dec 2009 23:44:27 -0000	1.10
+++ task.spec	6 Dec 2009 01:37:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           task
 Version:        1.8.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A command-line to do list manager
 
 Group:          Applications/Productivity
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-2
+  Fixed wrong ChangeLog file
 * Sat Dec 05 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.5-1
   Intial RPM for task bugfix release 1.8.5
 * Tue Nov 17 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.4-1



From rathann at fedoraproject.org  Sun Dec  6 02:00:34 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 02:00:34 +0000 (UTC)
Subject: File mkvtoolnix-2.9.9.tar.bz2 uploaded to lookaside cache by rathann
Message-ID: <20091206020034.8D6D410F861@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mkvtoolnix:

4bad0301e94cc24ec8f847c84502ab4d  mkvtoolnix-2.9.9.tar.bz2



From rathann at fedoraproject.org  Sun Dec  6 02:01:51 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 02:01:51 +0000 (UTC)
Subject: rpms/mkvtoolnix/devel mkvtoolnix-compile.patch, 1.2, 1.3 .cvsignore,
	1.13, 1.14 mkvtoolnix.spec, 1.30, 1.31 sources, 1.13, 1.14
Message-ID: <20091206020151.5646D11C00C5@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21994

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Added Files:
	mkvtoolnix-compile.patch 
Log Message:
* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.9-1
- updated to 2.9.9
  * new CLI tool: mkvpropedit
- fixed compilation of vc1parser


mkvtoolnix-compile.patch:
 vc1parser.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mkvtoolnix-compile.patch
===================================================================
RCS file: mkvtoolnix-compile.patch
diff -N mkvtoolnix-compile.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mkvtoolnix-compile.patch	6 Dec 2009 02:01:50 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up mkvtoolnix-2.9.9/src/tools/vc1parser.cpp.compile mkvtoolnix-2.9.9/src/tools/vc1parser.cpp
+--- mkvtoolnix-2.9.9/src/tools/vc1parser.cpp.compile	2009-11-25 22:29:02.000000000 +0100
++++ mkvtoolnix-2.9.9/src/tools/vc1parser.cpp	2009-12-06 02:39:02.000000000 +0100
+@@ -280,7 +280,7 @@ show_version() {
+   mxexit(0);
+ }
+ 
+-void
++static std::string
+ parse_args(std::vector<std::string> &args) {
+   std::string file_name;
+ 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Aug 2009 01:35:44 -0000	1.13
+++ .cvsignore	6 Dec 2009 02:01:50 -0000	1.14
@@ -1 +1 @@
-mkvtoolnix-2.9.8.tar.bz2
+mkvtoolnix-2.9.9.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mkvtoolnix.spec	27 Sep 2009 07:20:53 -0000	1.30
+++ mkvtoolnix.spec	6 Dec 2009 02:01:50 -0000	1.31
@@ -1,13 +1,15 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.9.8
-Release: 2%{?dist}
+Version: 2.9.9
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
 Patch0: %{name}-noman.patch
+# https://www.bunkus.org/bugzilla/show_bug.cgi?id=446
+Patch1: %{name}-compile.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -43,6 +45,7 @@ This package contains the graphical inte
 %prep
 %setup -q
 %patch0 -p1 -b .noman
+%patch1 -p1 -b .compile
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -98,9 +101,11 @@ gtk-update-icon-cache --quiet %{_datadir
 %attr(755,root,root) %{_bindir}/ebml_validator
 %attr(755,root,root) %{_bindir}/mkvextract
 %attr(755,root,root) %{_bindir}/mkvmerge
+%attr(755,root,root) %{_bindir}/mkvpropedit
 %attr(755,root,root) %{_bindir}/vc1parser
 %{_mandir}/man1/mkvextract*
 %{_mandir}/man1/mkvmerge*
+%{_mandir}/man1/mkvpropedit.1*
 
 %files gui
 %defattr(644,root,root,0755)
@@ -116,6 +121,11 @@ gtk-update-icon-cache --quiet %{_datadir
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.9-1
+- updated to 2.9.9
+  * new CLI tool: mkvpropedit
+- fixed compilation of vc1parser
+
 * Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.9.8-2
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Aug 2009 01:35:44 -0000	1.13
+++ sources	6 Dec 2009 02:01:50 -0000	1.14
@@ -1 +1 @@
-7b049aa43c6b39dfcb19f5a46d5574ac  mkvtoolnix-2.9.8.tar.bz2
+4bad0301e94cc24ec8f847c84502ab4d  mkvtoolnix-2.9.9.tar.bz2



From cweyl at fedoraproject.org  Sun Dec  6 02:09:28 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 02:09:28 +0000 (UTC)
Subject: File CatalystX-Component-Traits-0.14.tar.gz uploaded to lookaside
	cache by cweyl
Message-ID: <20091206020928.F0C7B10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-CatalystX-Component-Traits:

ebf80365de2e4557eef14f4cec0c3195  CatalystX-Component-Traits-0.14.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 02:11:15 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 02:11:15 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits/devel .cvsignore, 1.2,
	1.3 perl-CatalystX-Component-Traits.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091206021115.ADA5311C00C5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CatalystX-Component-Traits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25050

Modified Files:
	.cvsignore perl-CatalystX-Component-Traits.spec sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
- auto-update to 0.14 (by cpan-spec-update 0.01)
- altered br on perl(Test::More) (0 => 0.88)
- added a new req on perl(List::MoreUtils) (version 0)
- added a new req on perl(Scalar::Util) (version 0)
- added a new req on perl(namespace::autoclean) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Sep 2009 20:06:08 -0000	1.2
+++ .cvsignore	6 Dec 2009 02:11:15 -0000	1.3
@@ -1 +1 @@
-CatalystX-Component-Traits-0.10.tar.gz
+CatalystX-Component-Traits-0.14.tar.gz


Index: perl-CatalystX-Component-Traits.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/devel/perl-CatalystX-Component-Traits.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-CatalystX-Component-Traits.spec	10 Sep 2009 20:06:08 -0000	1.1
+++ perl-CatalystX-Component-Traits.spec	6 Dec 2009 02:11:15 -0000	1.2
@@ -1,5 +1,5 @@
 Name:       perl-CatalystX-Component-Traits
-Version:    0.10
+Version:    0.14
 Release:    1%{?dist}
 # lib/CatalystX/Component/Traits.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -19,22 +19,27 @@ BuildRequires: perl(Moose::Autobox)
 BuildRequires: perl(MooseX::Traits::Pluggable) >= 0.08
 BuildRequires: perl(namespace::autoclean)
 BuildRequires: perl(Scalar::Util)
-BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::More) >= 0.88
 BuildRequires: perl(CPAN)
 # optional tests
 BuildRequires: perl(Test::Pod)
 
-# autoreq really doesn't have a clue when it comes to Moosey bits 
+# autoreq really doesn't have a clue when it comes to Moosey bits
 Requires:       perl(Catalyst::Runtime) >= 5.80005
 Requires:       perl(Moose::Autobox)
 Requires:       perl(MooseX::Traits::Pluggable) >= 0.08
 
 %{?perl_default_filter}
 
+### auto-added reqs!
+Requires:       perl(List::MoreUtils)
+Requires:       perl(Scalar::Util)
+Requires:       perl(namespace::autoclean)
+
 %description
 Adds a "COMPONENT" method to your Catalyst component base class that
 reads the optional 'traits' parameter from app and component config
-and instantiates the component subclass with those traits using 
+and instantiates the component subclass with those traits using
 MooseX::Traits/new_with_traits from MooseX::Traits::Pluggable.
 
 
@@ -67,6 +72,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- auto-update to 0.14 (by cpan-spec-update 0.01)
+- altered br on perl(Test::More) (0 => 0.88)
+- added a new req on perl(List::MoreUtils) (version 0)
+- added a new req on perl(Scalar::Util) (version 0)
+- added a new req on perl(namespace::autoclean) (version 0)
+
 * Fri Sep 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
 - submission
 - add standard req/prov filter


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 20:06:08 -0000	1.2
+++ sources	6 Dec 2009 02:11:15 -0000	1.3
@@ -1 +1 @@
-bf83abe598cae65a2efdf17e38cbced5  CatalystX-Component-Traits-0.10.tar.gz
+ebf80365de2e4557eef14f4cec0c3195  CatalystX-Component-Traits-0.14.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 02:12:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 02:12:30 +0000 (UTC)
Subject: File Catalyst-View-TT-0.31.tar.gz uploaded to lookaside cache by
	cweyl
Message-ID: <20091206021230.D92BA10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-View-TT:

cc5def1a9825e5433bbb5284a69bfa22  Catalyst-View-TT-0.31.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 02:13:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 02:13:45 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-TT/devel .cvsignore, 1.5,
	1.6 perl-Catalyst-View-TT.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091206021345.C4C0611C00C5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-View-TT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25874

Modified Files:
	.cvsignore perl-Catalyst-View-TT.spec sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.31-1
- auto-update to 0.31 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-View-TT/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Sep 2009 05:53:25 -0000	1.5
+++ .cvsignore	6 Dec 2009 02:13:45 -0000	1.6
@@ -1 +1 @@
-Catalyst-View-TT-0.30.tar.gz
+Catalyst-View-TT-0.31.tar.gz


Index: perl-Catalyst-View-TT.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-View-TT/devel/perl-Catalyst-View-TT.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Catalyst-View-TT.spec	26 Sep 2009 05:53:25 -0000	1.7
+++ perl-Catalyst-View-TT.spec	6 Dec 2009 02:13:45 -0000	1.8
@@ -1,11 +1,11 @@
 Name:           perl-Catalyst-View-TT
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Template Toolkit View Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-View-TT/
-Source0:        http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Catalyst-View-TT-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-View-TT-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.31-1
+- auto-update to 0.31 (by cpan-spec-update 0.01)
+
 * Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.30-1
 - update filtering
 - auto-update to 0.30 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-View-TT/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Sep 2009 05:53:25 -0000	1.5
+++ sources	6 Dec 2009 02:13:45 -0000	1.6
@@ -1 +1 @@
-11d69501f57f4a85c541dbd1ab506278  Catalyst-View-TT-0.30.tar.gz
+cc5def1a9825e5433bbb5284a69bfa22  Catalyst-View-TT-0.31.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 02:25:57 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 02:25:57 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits/F-12
	perl-CatalystX-Component-Traits.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091206022557.368C611C00C5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29624

Modified Files:
	perl-CatalystX-Component-Traits.spec sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
- auto-update to 0.14 (by cpan-spec-update 0.01)
- altered br on perl(Test::More) (0 => 0.88)
- added a new req on perl(List::MoreUtils) (version 0)
- added a new req on perl(Scalar::Util) (version 0)
- added a new req on perl(namespace::autoclean) (version 0)



Index: perl-CatalystX-Component-Traits.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-12/perl-CatalystX-Component-Traits.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-CatalystX-Component-Traits.spec	10 Sep 2009 20:06:08 -0000	1.1
+++ perl-CatalystX-Component-Traits.spec	6 Dec 2009 02:25:56 -0000	1.2
@@ -1,5 +1,5 @@
 Name:       perl-CatalystX-Component-Traits
-Version:    0.10
+Version:    0.14
 Release:    1%{?dist}
 # lib/CatalystX/Component/Traits.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -19,22 +19,27 @@ BuildRequires: perl(Moose::Autobox)
 BuildRequires: perl(MooseX::Traits::Pluggable) >= 0.08
 BuildRequires: perl(namespace::autoclean)
 BuildRequires: perl(Scalar::Util)
-BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::More) >= 0.88
 BuildRequires: perl(CPAN)
 # optional tests
 BuildRequires: perl(Test::Pod)
 
-# autoreq really doesn't have a clue when it comes to Moosey bits 
+# autoreq really doesn't have a clue when it comes to Moosey bits
 Requires:       perl(Catalyst::Runtime) >= 5.80005
 Requires:       perl(Moose::Autobox)
 Requires:       perl(MooseX::Traits::Pluggable) >= 0.08
 
 %{?perl_default_filter}
 
+### auto-added reqs!
+Requires:       perl(List::MoreUtils)
+Requires:       perl(Scalar::Util)
+Requires:       perl(namespace::autoclean)
+
 %description
 Adds a "COMPONENT" method to your Catalyst component base class that
 reads the optional 'traits' parameter from app and component config
-and instantiates the component subclass with those traits using 
+and instantiates the component subclass with those traits using
 MooseX::Traits/new_with_traits from MooseX::Traits::Pluggable.
 
 
@@ -67,6 +72,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- auto-update to 0.14 (by cpan-spec-update 0.01)
+- altered br on perl(Test::More) (0 => 0.88)
+- added a new req on perl(List::MoreUtils) (version 0)
+- added a new req on perl(Scalar::Util) (version 0)
+- added a new req on perl(namespace::autoclean) (version 0)
+
 * Fri Sep 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
 - submission
 - add standard req/prov filter


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CatalystX-Component-Traits/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Sep 2009 20:06:08 -0000	1.2
+++ sources	6 Dec 2009 02:25:57 -0000	1.3
@@ -1 +1 @@
-bf83abe598cae65a2efdf17e38cbced5  CatalystX-Component-Traits-0.10.tar.gz
+ebf80365de2e4557eef14f4cec0c3195  CatalystX-Component-Traits-0.14.tar.gz



From pkgdb at fedoraproject.org  Sun Dec  6 02:26:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 02:26:36 +0000
Subject: [pkgdb] erlang: donv has given up watchcommits
Message-ID: <20091206022636.D6E8A10F861@bastion2.fedora.phx.redhat.com>

donv has given up the watchcommits acl on erlang (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Sun Dec  6 02:26:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 02:26:47 +0000
Subject: [pkgdb] erlang: donv has requested commit
Message-ID: <20091206022647.8966010F89D@bastion2.fedora.phx.redhat.com>

donv has requested the commit acl on erlang (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Sun Dec  6 02:26:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 02:26:51 +0000
Subject: [pkgdb] erlang: donv has requested approveacls
Message-ID: <20091206022651.AD46810F8A2@bastion2.fedora.phx.redhat.com>

donv has requested the approveacls acl on erlang (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Sun Dec  6 02:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 02:26:55 +0000
Subject: [pkgdb] erlang: donv has given up watchbugzilla
Message-ID: <20091206022655.DF46910F8A6@bastion2.fedora.phx.redhat.com>

donv has given up the watchbugzilla acl on erlang (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Sun Dec  6 02:27:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 02:27:28 +0000
Subject: [pkgdb] erlang: donv has given up commit
Message-ID: <20091206022728.8D60010F899@bastion2.fedora.phx.redhat.com>

donv has given up the commit acl on erlang (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Sun Dec  6 02:27:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 02:27:31 +0000
Subject: [pkgdb] erlang: donv has given up approveacls
Message-ID: <20091206022731.E0EAB10F89E@bastion2.fedora.phx.redhat.com>

donv has given up the approveacls acl on erlang (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From cweyl at fedoraproject.org  Sun Dec  6 03:15:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:15:01 +0000 (UTC)
Subject: File Catalyst-Plugin-SubRequest-0.15.tar.gz uploaded to lookaside
	cache by cweyl
Message-ID: <20091206031501.703AF10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-Plugin-SubRequest:

f28e1870100fb79a470bc01fb9369faa  Catalyst-Plugin-SubRequest-0.15.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:19:32 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:19:32 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-SubRequest/devel .cvsignore, 1.3,
	1.4 perl-Catalyst-Plugin-SubRequest.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091206031932.8615D11C00C5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-SubRequest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12402

Modified Files:
	.cvsignore perl-Catalyst-Plugin-SubRequest.spec sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- add default filtering
- auto-update to 0.15 (by cpan-spec-update 0.01)
- added a new br on perl(Catalyst::Runtime) (version 5.7012)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-SubRequest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 May 2008 06:11:14 -0000	1.3
+++ .cvsignore	6 Dec 2009 03:19:31 -0000	1.4
@@ -1 +1 @@
-Catalyst-Plugin-SubRequest-0.13.tar.gz
+Catalyst-Plugin-SubRequest-0.15.tar.gz


Index: perl-Catalyst-Plugin-SubRequest.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-SubRequest/devel/perl-Catalyst-Plugin-SubRequest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Catalyst-Plugin-SubRequest.spec	26 Jul 2009 04:17:03 -0000	1.6
+++ perl-Catalyst-Plugin-SubRequest.spec	6 Dec 2009 03:19:31 -0000	1.7
@@ -1,17 +1,17 @@
 Name:           perl-Catalyst-Plugin-SubRequest
-Version:        0.13
-Release:        3%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        Make subrequests to actions in Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-SubRequest/
-Source0:        http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-SubRequest-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-SubRequest-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # core
-BuildRequires:  perl(ExtUtils::MakeMaker) 
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Time::HiRes)
 # cpan
@@ -23,34 +23,15 @@ BuildRequires:  perl(HTTP::Request::AsCG
 
 Requires:       perl(Catalyst) >= 5.00
 
+%{?perl_default_filter}
+
 %description
-Make subrequests to actions in Catalyst. Uses the catalyst dispatcher, so
+Make subrequests to actions in Catalyst. Uses the Catalyst dispatcher, so
 it will work like an external url call.
 
 %prep
 %setup -q -n Catalyst-Plugin-SubRequest-%{version}
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(TestApp)/d'
-EOF
-
-%define __perl_provides %{_builddir}/Catalyst-Plugin-SubRequest-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(Test::More)/d; /perl(Catalyst::Test)/d; /perl(HTTP::Date)/d' \
-      -e '/perl(lib)/d; /perl(File::stat)/d'
-EOF
-
-%define __perl_requires %{_builddir}/Catalyst-Plugin-SubRequest-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -73,11 +54,17 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README t/ 
+%doc Changes README t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
+- add default filtering
+- auto-update to 0.15 (by cpan-spec-update 0.01)
+- added a new br on perl(Catalyst::Runtime) (version 5.7012)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-SubRequest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 May 2008 06:11:14 -0000	1.3
+++ sources	6 Dec 2009 03:19:31 -0000	1.4
@@ -1 +1 @@
-9132b2e32629964c57db261a83b4e8bb  Catalyst-Plugin-SubRequest-0.13.tar.gz
+f28e1870100fb79a470bc01fb9369faa  Catalyst-Plugin-SubRequest-0.15.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:21:41 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:21:41 +0000 (UTC)
Subject: File Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz uploaded to
	lookaside cache by cweyl
Message-ID: <20091206032141.A098E10F85B@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-Plugin-Session-State-Cookie:

f2a2d43d80777ceb2687b9e682cf5c76  Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:23:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:23:17 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel .cvsignore, 1.6,
	1.7 perl-Catalyst-Plugin-Session-State-Cookie.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20091206032317.9661E11C00C5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13680

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-State-Cookie.spec 
	sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-1
- auto-update to 0.17 (by cpan-spec-update 0.01)
- altered br on perl(Catalyst::Plugin::Session) (0.19 => 0.27)
- altered req on perl(Catalyst::Plugin::Session) (0.19 => 0.27)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	1 Sep 2009 07:50:51 -0000	1.6
+++ .cvsignore	6 Dec 2009 03:23:17 -0000	1.7
@@ -1 +1 @@
-Catalyst-Plugin-Session-State-Cookie-0.14.tar.gz
+Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz


Index: perl-Catalyst-Plugin-Session-State-Cookie.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/perl-Catalyst-Plugin-Session-State-Cookie.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Catalyst-Plugin-Session-State-Cookie.spec	1 Sep 2009 07:50:51 -0000	1.9
+++ perl-Catalyst-Plugin-Session-State-Cookie.spec	6 Dec 2009 03:23:17 -0000	1.10
@@ -1,18 +1,18 @@
 Name:           perl-Catalyst-Plugin-Session-State-Cookie
-Version:        0.14
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Maintain session IDs using cookies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-State-Cookie/
-Source0:        http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Catalyst) >= 5.80005
-BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.19
+BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.27
 BuildRequires:  perl(Moose)
 BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(namespace::autoclean)
@@ -25,19 +25,13 @@ BuildRequires:  perl(Test::WWW::Mechaniz
 # until M::I is brought up...
 BuildRequires:  perl(CPAN)
 
-Requires:       perl(Catalyst::Plugin::Session) >= 0.19
+Requires:       perl(Catalyst::Plugin::Session) >= 0.27
 Requires:       perl(Moose)
 Requires:       perl(namespace::autoclean)
 Requires:       perl(Catalyst) >= 5.80005
 Requires:       perl(MRO::Compat)
 
-# use the whole kit-n-kaboodle, as perl_default_filter isn't in F-11 (yet)
-%{?filter_setup: %{expand:
-%filter_provides_in %{perl_vendorarch}/.*\\.so$
-%filter_provides_in %{_docdir}
-%filter_requires_in %{_docdir}
-%filter_setup
-}}
+%{?perl_default_filter}
 
 %description
 In order for Catalyst::Plugin::Session to work the session ID needs to
@@ -75,6 +69,11 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-1
+- auto-update to 0.17 (by cpan-spec-update 0.01)
+- altered br on perl(Catalyst::Plugin::Session) (0.19 => 0.27)
+- altered req on perl(Catalyst::Plugin::Session) (0.19 => 0.27)
+
 * Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
 - switch req/prov filtering systems...
 - auto-update to 0.14 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	1 Sep 2009 07:50:51 -0000	1.6
+++ sources	6 Dec 2009 03:23:17 -0000	1.7
@@ -1 +1 @@
-d6d98d026613ccf54c55bb1dba7aa7a1  Catalyst-Plugin-Session-State-Cookie-0.14.tar.gz
+f2a2d43d80777ceb2687b9e682cf5c76  Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:24:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:24:24 +0000 (UTC)
Subject: File Catalyst-Plugin-Session-0.29.tar.gz uploaded to lookaside cache
	by cweyl
Message-ID: <20091206032424.3286A10F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-Plugin-Session:

b580af6ccd996e4a86f3fbd9dd56b255  Catalyst-Plugin-Session-0.29.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:25:49 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:25:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session/devel .cvsignore, 1.5,
	1.6 perl-Catalyst-Plugin-Session.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20091206032549.8BE8F11C00C5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14573

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session.spec sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.29-1
- auto-update to 0.29 (by cpan-spec-update 0.01)
- added a new req on perl(Test::More) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Oct 2009 07:30:23 -0000	1.5
+++ .cvsignore	6 Dec 2009 03:25:49 -0000	1.6
@@ -1 +1 @@
-Catalyst-Plugin-Session-0.27.tar.gz
+Catalyst-Plugin-Session-0.29.tar.gz


Index: perl-Catalyst-Plugin-Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session/devel/perl-Catalyst-Plugin-Session.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Catalyst-Plugin-Session.spec	10 Oct 2009 07:30:23 -0000	1.9
+++ perl-Catalyst-Plugin-Session.spec	6 Dec 2009 03:25:49 -0000	1.10
@@ -1,11 +1,11 @@
 Name:           perl-Catalyst-Plugin-Session
-Version:        0.27
+Version:        0.29
 Release:        1%{?dist}
 Summary:        Catalyst generic session plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session/
-Source0:        http://cpan.org/modules/by-module/Catalyst/Catalyst-Plugin-Session-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(MooseX::Emulate::Class::Accessor::Fast) >= 0.00801
@@ -37,7 +37,6 @@ BuildRequires:  perl(Test::Pod::Coverage
 # C::P::S::State::Cookie.  We must not BR C::P::S::State::Cookie to avoid
 # circular build deps.
 
-### auto-added reqs!
 Requires:  perl(Catalyst::Runtime) >= 5.71001
 Requires:  perl(Digest)
 Requires:  perl(File::Spec)
@@ -94,6 +93,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.29-1
+- auto-update to 0.29 (by cpan-spec-update 0.01)
+- added a new req on perl(Test::More) (version 0)
+
 * Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.27-1
 - update to 0.27
 - remove buildreq on perl(Text::MockObject)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Oct 2009 07:30:23 -0000	1.6
+++ sources	6 Dec 2009 03:25:49 -0000	1.7
@@ -1 +1 @@
-c9a349b7ff0674efba58a7f3fa1f5b05  Catalyst-Plugin-Session-0.27.tar.gz
+b580af6ccd996e4a86f3fbd9dd56b255  Catalyst-Plugin-Session-0.29.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:29:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:29:36 +0000 (UTC)
Subject: File Catalyst-Manual-5.8002.tar.gz uploaded to lookaside cache by
	cweyl
Message-ID: <20091206032936.8835810F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-Manual:

27e138077d0e6b5ab64ced344e64464c  Catalyst-Manual-5.8002.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:30:15 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:30:15 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/devel .cvsignore, 1.10,
	1.11 perl-Catalyst-Manual.spec, 1.17, 1.18 sources, 1.10, 1.11
Message-ID: <20091206033015.2F80211C03F6@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Manual/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15986

Modified Files:
	.cvsignore perl-Catalyst-Manual.spec sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.8002-1
- auto-update to 5.8002 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	31 May 2009 07:11:25 -0000	1.10
+++ .cvsignore	6 Dec 2009 03:30:14 -0000	1.11
@@ -1 +1 @@
-Catalyst-Manual-5.8000.tar.gz
+Catalyst-Manual-5.8002.tar.gz


Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Catalyst-Manual.spec	26 Jul 2009 04:11:26 -0000	1.17
+++ perl-Catalyst-Manual.spec	6 Dec 2009 03:30:14 -0000	1.18
@@ -1,7 +1,7 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
-Version:        5.8000
-Release:        3%{?dist}
+Version:        5.8002
+Release:        1%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -20,6 +20,8 @@ BuildRequires: perl(Test::Pod::Coverage)
 # argh
 BuildRequires: perl(CPAN)
 
+%{?perl_default_filter}
+
 %description
 This is the manual to the Catalyst web framework.
 
@@ -53,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.8002-1
+- auto-update to 5.8002 (by cpan-spec-update 0.01)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.8000-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	31 May 2009 07:11:25 -0000	1.10
+++ sources	6 Dec 2009 03:30:14 -0000	1.11
@@ -1 +1 @@
-9648aba17195f86b201c82f373c315dd  Catalyst-Manual-5.8000.tar.gz
+27e138077d0e6b5ab64ced344e64464c  Catalyst-Manual-5.8002.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:38:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:38:01 +0000 (UTC)
Subject: File Catalyst-Action-RenderView-0.13.tar.gz uploaded to lookaside
	cache by cweyl
Message-ID: <20091206033801.84FE610F838@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-Action-RenderView:

49144fd677f39e8e8ad5455fa4f647a6  Catalyst-Action-RenderView-0.13.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:39:55 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:39:55 +0000 (UTC)
Subject: rpms/perl-Catalyst-Action-RenderView/devel .cvsignore, 1.7,
	1.8 perl-Catalyst-Action-RenderView.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20091206033955.A2AD211C00C5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18781

Modified Files:
	.cvsignore perl-Catalyst-Action-RenderView.spec sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
- auto-update to 0.13 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Aug 2009 06:04:02 -0000	1.7
+++ .cvsignore	6 Dec 2009 03:39:55 -0000	1.8
@@ -1 +1 @@
-Catalyst-Action-RenderView-0.11.tar.gz
+Catalyst-Action-RenderView-0.13.tar.gz


Index: perl-Catalyst-Action-RenderView.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/perl-Catalyst-Action-RenderView.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Catalyst-Action-RenderView.spec	8 Aug 2009 18:08:03 -0000	1.12
+++ perl-Catalyst-Action-RenderView.spec	6 Dec 2009 03:39:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Action-RenderView
-Version:        0.11
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Sensible default end action for view rendering
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -33,11 +33,7 @@ Requires:       perl(Catalyst::Runtime) 
 Requires:       perl(Data::Visitor) >= 0.24
 Requires:       perl(MRO::Compat)
 
-# don't "provide" private Perl libs; or things from _docdir
-%global _use_internal_dependency_generator 0
-%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
-%global __find_provides /bin/sh -c "%{__grep} -v '%_docdir' | %{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
-%global __find_requires /bin/sh -c "%{__grep} -v '%_docdir' | %{__deploop R}"
+%{?perl_default_filter}
 
 %description
 This action implements a sensible default end action, which will forward to
@@ -82,6 +78,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- auto-update to 0.13 (by cpan-spec-update 0.01)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-2
 - drop req on Test::More; open RT#48537
 - switch to more compact filtering (until we have perl_default_filter)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 06:04:02 -0000	1.7
+++ sources	6 Dec 2009 03:39:55 -0000	1.8
@@ -1 +1 @@
-6231f873a1ad77dc22815eacf1b88976  Catalyst-Action-RenderView-0.11.tar.gz
+49144fd677f39e8e8ad5455fa4f647a6  Catalyst-Action-RenderView-0.13.tar.gz



From cweyl at fedoraproject.org  Sun Dec  6 03:41:26 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  6 Dec 2009 03:41:26 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/F-12 perl-Catalyst-Manual.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20091206034126.93A3211C00C5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Manual/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19326

Modified Files:
	perl-Catalyst-Manual.spec sources 
Log Message:
* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.8002-1
- auto-update to 5.8002 (by cpan-spec-update 0.01)



Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-12/perl-Catalyst-Manual.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Catalyst-Manual.spec	26 Jul 2009 04:11:26 -0000	1.17
+++ perl-Catalyst-Manual.spec	6 Dec 2009 03:41:26 -0000	1.18
@@ -1,7 +1,7 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
-Version:        5.8000
-Release:        3%{?dist}
+Version:        5.8002
+Release:        1%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -20,6 +20,8 @@ BuildRequires: perl(Test::Pod::Coverage)
 # argh
 BuildRequires: perl(CPAN)
 
+%{?perl_default_filter}
+
 %description
 This is the manual to the Catalyst web framework.
 
@@ -53,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.8002-1
+- auto-update to 5.8002 (by cpan-spec-update 0.01)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.8000-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	31 May 2009 07:11:25 -0000	1.10
+++ sources	6 Dec 2009 03:41:26 -0000	1.11
@@ -1 +1 @@
-9648aba17195f86b201c82f373c315dd  Catalyst-Manual-5.8000.tar.gz
+27e138077d0e6b5ab64ced344e64464c  Catalyst-Manual-5.8002.tar.gz



From scop at fedoraproject.org  Sun Dec  6 10:20:10 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  6 Dec 2009 10:20:10 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.344,1.345
Message-ID: <20091206102010.9C6E811C03E3@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4276

Modified Files:
	comps-f11.xml.in 
Log Message:
svn2cl obsoleted by subversion-svn2cl.


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -p -r1.344 -r1.345
--- comps-f11.xml.in	5 Dec 2009 01:48:27 -0000	1.344
+++ comps-f11.xml.in	6 Dec 2009 10:20:09 -0000	1.345
@@ -1068,8 +1068,8 @@
       <packagereq type="optional">Sprog</packagereq>
       <packagereq type="optional">srecord</packagereq>
       <packagereq type="optional">subcommander</packagereq>
+      <packagereq type="optional">subversion-svn2cl</packagereq>
       <packagereq type="optional">sunifdef</packagereq>
-      <packagereq type="optional">svn2cl</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
       <packagereq type="optional">tailor</packagereq>



From pkgdb at fedoraproject.org  Sun Dec  6 10:21:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 10:21:56 +0000
Subject: [pkgdb] svn2cl ownership updated
Message-ID: <20091206102157.0802510F874@bastion2.fedora.phx.redhat.com>

Package svn2cl in Fedora 10 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svn2cl



From ensc at fedoraproject.org  Sun Dec  6 10:42:27 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 10:42:27 +0000 (UTC)
Subject: rpms/tor/devel tor.upstart,1.4,1.5 tor.spec,1.41,1.42
Message-ID: <20091206104227.1618611C00E0@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10963

Modified Files:
	tor.upstart tor.spec 
Log Message:
updated -upstart to upstart 0.6.3



Index: tor.upstart
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.upstart,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tor.upstart	22 Nov 2009 10:41:28 -0000	1.4
+++ tor.upstart	6 Dec 2009 10:42:26 -0000	1.5
@@ -2,9 +2,9 @@
 
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 limit nofile 4096
 


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- tor.spec	15 Nov 2009 11:40:58 -0000	1.41
+++ tor.spec	6 Dec 2009 10:42:26 -0000	1.42
@@ -13,7 +13,7 @@
 
 Name:		tor
 Version:	0.2.1.20
-Release:	%release_func 1300
+Release:	%release_func 1301
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -62,8 +62,7 @@ Group:			System Environment/Base
 Source20:		%name.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -135,7 +134,7 @@ mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/lo
 install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
 install -p -m0644 %SOURCE2  $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
 
-install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/event.d/tor
+install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor
 
 
 %pre core
@@ -222,10 +221,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files upstart
 %defattr(-,root,root,-)
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1301
+- updated -upstart to upstart 0.6.3
+
 * Sat Nov 14 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1300
 - updated URLs (#532373)
 - removed (inactive) update mechanism for GeoIP data; this might



From terjeros at fedoraproject.org  Sun Dec  6 10:43:05 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 10:43:05 +0000 (UTC)
Subject: File extrema-4.4.2.tar.gz uploaded to lookaside cache by terjeros
Message-ID: <20091206104305.355C010F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for extrema:

8801113705584f8be72b4825fb1061f2  extrema-4.4.2.tar.gz



From ensc at fedoraproject.org  Sun Dec  6 10:44:10 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 10:44:10 +0000 (UTC)
Subject: rpms/tor/devel tor.spec,1.42,1.43
Message-ID: <20091206104410.61E4811C00E0@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11612

Modified Files:
	tor.spec 
Log Message:
use correct new for upstart script



Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- tor.spec	6 Dec 2009 10:42:26 -0000	1.42
+++ tor.spec	6 Dec 2009 10:44:10 -0000	1.43
@@ -134,7 +134,7 @@ mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/lo
 install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
 install -p -m0644 %SOURCE2  $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
 
-install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor
+install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor.conf
 
 
 %pre core



From ensc at fedoraproject.org  Sun Dec  6 10:50:24 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 10:50:24 +0000 (UTC)
Subject: rpms/milter-greylist/devel milter-greylist.upstart, 1.2,
	1.3 milter-greylist.spec, 1.36, 1.37
Message-ID: <20091206105024.31E5C11C03E3@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13468

Modified Files:
	milter-greylist.upstart milter-greylist.spec 
Log Message:
updated -upstart to upstart 0.6.3



Index: milter-greylist.upstart
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.upstart,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- milter-greylist.upstart	19 Aug 2009 19:52:04 -0000	1.2
+++ milter-greylist.upstart	6 Dec 2009 10:50:23 -0000	1.3
@@ -1,7 +1,7 @@
-### Uncomment matching 'start' lines below.
+### Uncomment (only) *one* matching 'start' line below
 
-### Uncomment these two lines when you want milter-greylist to be a
-### milter for a remote machine.
+### Uncomment this line when you want milter-greylist to be a milter
+### for a remote machine.
 
 #start on starting local
 
@@ -18,9 +18,9 @@
 #start on starting postfix
 
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 respawn
 exec /usr/sbin/milter-greylist -D


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- milter-greylist.spec	19 Aug 2009 20:53:46 -0000	1.36
+++ milter-greylist.spec	6 Dec 2009 10:50:23 -0000	1.37
@@ -20,7 +20,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	4.2.3
-Release:	%release_func 2%{?beta}
+Release:	%release_func 1300%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -58,8 +58,7 @@ Group:			System Environment/Daemons
 Source10:		%name.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -143,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%rundir,%dbdir,%_var/run}
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
-%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/milter-greylist
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/milter-greylist.conf
 
 # create temporary files
 touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
@@ -209,10 +208,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files upstart
 %defattr(-,root,root,-)
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1300
+- updated -upstart to upstart 0.6.3
+
 * Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-2
 - moved pre-2007 %%changelog entries into ChangeLog.rpm
 - do not link against libbind anymore; recent glibc seems to have



From terjeros at fedoraproject.org  Sun Dec  6 10:51:42 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 10:51:42 +0000 (UTC)
Subject: rpms/extrema/devel .cvsignore, 1.6, 1.7 extrema.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20091206105142.A86F111C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/extrema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13947

Modified Files:
	.cvsignore extrema.spec sources 
Log Message:
* Sat Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.4.2-1
- 4.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/extrema/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Aug 2008 17:18:06 -0000	1.6
+++ .cvsignore	6 Dec 2009 10:51:42 -0000	1.7
@@ -1 +1 @@
-extrema-4.3.6.tar.gz
+extrema-4.4.2.tar.gz


Index: extrema.spec
===================================================================
RCS file: /cvs/extras/rpms/extrema/devel/extrema.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- extrema.spec	18 Aug 2009 19:46:08 -0000	1.12
+++ extrema.spec	6 Dec 2009 10:51:42 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:   Extrema is a powerful visualization and data analysis tool
 Name:      extrema
-Version:   4.3.6
-Release:   5%{?dist}
+Version:   4.4.2
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Engineering
 URL:       http://exsitewebware.com/extrema/
@@ -77,6 +77,9 @@ desktop-file-install --vendor=fedora \
 %doc doc/*.pdf
 
 %changelog
+* Sat Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.4.2-1
+- 4.4.2
+
 * Tue Aug 18 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.3.6-5
 - Split out documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/extrema/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Aug 2008 17:18:06 -0000	1.6
+++ sources	6 Dec 2009 10:51:42 -0000	1.7
@@ -1 +1 @@
-438d69cd52ad1be129fa28cee8d481c7  extrema-4.3.6.tar.gz
+8801113705584f8be72b4825fb1061f2  extrema-4.4.2.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 10:53:02 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 10:53:02 +0000 (UTC)
Subject: rpms/extrema/F-12 .cvsignore, 1.6, 1.7 extrema.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20091206105302.A76DA11C02A5@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/extrema/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14344/F-12

Modified Files:
	.cvsignore extrema.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/extrema/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Aug 2008 17:18:06 -0000	1.6
+++ .cvsignore	6 Dec 2009 10:53:02 -0000	1.7
@@ -1 +1 @@
-extrema-4.3.6.tar.gz
+extrema-4.4.2.tar.gz


Index: extrema.spec
===================================================================
RCS file: /cvs/extras/rpms/extrema/F-12/extrema.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- extrema.spec	18 Aug 2009 19:46:08 -0000	1.12
+++ extrema.spec	6 Dec 2009 10:53:02 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:   Extrema is a powerful visualization and data analysis tool
 Name:      extrema
-Version:   4.3.6
-Release:   5%{?dist}
+Version:   4.4.2
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Engineering
 URL:       http://exsitewebware.com/extrema/
@@ -77,6 +77,9 @@ desktop-file-install --vendor=fedora \
 %doc doc/*.pdf
 
 %changelog
+* Sat Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.4.2-1
+- 4.4.2
+
 * Tue Aug 18 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.3.6-5
 - Split out documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/extrema/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Aug 2008 17:18:06 -0000	1.6
+++ sources	6 Dec 2009 10:53:02 -0000	1.7
@@ -1 +1 @@
-438d69cd52ad1be129fa28cee8d481c7  extrema-4.3.6.tar.gz
+8801113705584f8be72b4825fb1061f2  extrema-4.4.2.tar.gz



From ensc at fedoraproject.org  Sun Dec  6 10:53:13 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 10:53:13 +0000 (UTC)
Subject: rpms/ip-sentinel/devel ip-sentinel.spec,1.18,1.19
Message-ID: <20091206105313.6DC5911C00E0@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14580

Modified Files:
	ip-sentinel.spec 
Log Message:
whitespace cleanup



Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ip-sentinel.spec	25 Jul 2009 03:29:03 -0000	1.18
+++ ip-sentinel.spec	6 Dec 2009 10:53:13 -0000	1.19
@@ -1,30 +1,30 @@
 ## $id: ip-sentinel.spec.in,v 1.3 2003/05/26 21:53:02 ensc Exp $		--*- rpm-spec -*--
 
 # Copyright (C) 2004,2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
-#  
+#
 # 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 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 package understands the following switches:
-## --without dietlibc   	...   disable usage of dietlibc
-## --without fedora     	...   disable fedora specific parts
-## --with    minit      	...   disable creation of 'minit' subpackage
-## --define  username\ name  	...   set the name of the user running the daemon
+## --without dietlibc		...   disable usage of dietlibc
+## --without fedora		...   disable fedora specific parts
+## --with    minit		...   disable creation of 'minit' subpackage
+## --define  username\ name	...   set the name of the user running the daemon
 
 
 ## Fedora Extras specific customization below...
-%bcond_without 			fedora
+%bcond_without			fedora
 %bcond_without			dietlibc
 %bcond_with			minit
 ##
@@ -79,7 +79,7 @@ Source10:		ip-sentinel.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 BuildArch:		noarch
@@ -159,7 +159,7 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 %__fe_groupadd 1 -r %username &>/dev/null || :
 %__fe_useradd  1 -r -s /sbin/nologin -M -d %homedir		\
-	         -c 'IP sentinel user' -g %username %username &>/dev/null || :
+		 -c 'IP sentinel user' -g %username %username &>/dev/null || :
 
 
 %postun



From terjeros at fedoraproject.org  Sun Dec  6 10:53:02 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 10:53:02 +0000 (UTC)
Subject: rpms/extrema/F-11 .cvsignore, 1.6, 1.7 extrema.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20091206105302.6C12D11C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/extrema/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14344/F-11

Modified Files:
	.cvsignore extrema.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/extrema/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Aug 2008 17:18:06 -0000	1.6
+++ .cvsignore	6 Dec 2009 10:53:02 -0000	1.7
@@ -1 +1 @@
-extrema-4.3.6.tar.gz
+extrema-4.4.2.tar.gz


Index: extrema.spec
===================================================================
RCS file: /cvs/extras/rpms/extrema/F-11/extrema.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- extrema.spec	24 Feb 2009 15:58:41 -0000	1.10
+++ extrema.spec	6 Dec 2009 10:53:02 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:   Extrema is a powerful visualization and data analysis tool
 Name:      extrema
-Version:   4.3.6
-Release:   3%{?dist}
+Version:   4.4.2
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Engineering
 URL:       http://exsitewebware.com/extrema/
@@ -20,13 +20,25 @@ power allow you to easily develop your o
 customized graphs.
 
 %package help
-Summary:  Help files for Extrema
-Group:    Applications/Engineering
-Requires: %{name} = %{version}
+Summary:   Help files for Extrema
+Group:     Applications/Engineering
+BuildArch: noarch
+Requires:  %{name} = %{version}-%{release}
+Obsoletes: %{name}-help < 4.3.6-5
 
 %description help
 This package contains help files for Extrema.
 
+%package doc
+Summary:   Extrema documentation in PDF format
+Group:     Applications/Engineering
+BuildArch: noarch
+Requires:  %{name} = %{version}-%{release}
+
+%description doc
+This package contains Getting Started, User Guide and other
+documentation in PDF format for Extrema.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -49,7 +61,7 @@ desktop-file-install --vendor=fedora \
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/Images
@@ -60,7 +72,20 @@ desktop-file-install --vendor=fedora \
 %defattr(-, root, root, -)
 %{_datadir}/%{name}/Help
 
+%files doc
+%defattr(-, root, root, -)
+%doc doc/*.pdf
+
 %changelog
+* Sat Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.4.2-1
+- 4.4.2
+
+* Tue Aug 18 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.3.6-5
+- Split out documentation
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/extrema/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Aug 2008 17:18:06 -0000	1.6
+++ sources	6 Dec 2009 10:53:02 -0000	1.7
@@ -1 +1 @@
-438d69cd52ad1be129fa28cee8d481c7  extrema-4.3.6.tar.gz
+8801113705584f8be72b4825fb1061f2  extrema-4.4.2.tar.gz



From ensc at fedoraproject.org  Sun Dec  6 11:10:45 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 11:10:45 +0000 (UTC)
Subject: rpms/ip-sentinel/devel ip-sentinel.upstart, 1.2,
	1.3 ip-sentinel.spec, 1.19, 1.20
Message-ID: <20091206111045.1849A11C03FC@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19739

Modified Files:
	ip-sentinel.upstart ip-sentinel.spec 
Log Message:
updated -upstart to upstart 0.6.3



Index: ip-sentinel.upstart
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.upstart,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ip-sentinel.upstart	22 Nov 2009 10:43:09 -0000	1.2
+++ ip-sentinel.upstart	6 Dec 2009 11:10:44 -0000	1.3
@@ -1,12 +1,12 @@
 # NOTE: you will have to create an 'ips.cfg' file in ~ip-sentinel/
 # before service can be enabled
 
-### Uncomment the 'start' lines below
+### Uncomment *one* 'start' line below
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 respawn
 exec /usr/sbin/ip-sentinel -u ip-sentinel -g ip-sentinel -n eth0


Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ip-sentinel.spec	6 Dec 2009 10:53:13 -0000	1.19
+++ ip-sentinel.spec	6 Dec 2009 11:10:44 -0000	1.20
@@ -41,7 +41,7 @@
 Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
 Version:	0.12
-Release:	%release_func 15
+Release:	%release_func 1300
 License:	GPLv2
 Group:		System Environment/Daemons
 URL:		http://www.nongnu.org/ip-sentinel/
@@ -78,8 +78,7 @@ Group:			System Environment/Base
 Source10:		ip-sentinel.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 BuildArch:		noarch
@@ -143,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
 %__install -m750 -d $RPM_BUILD_ROOT%homedir
-%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/ip-sentinel
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/ip-sentinel.conf
 
 %{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
@@ -203,7 +202,7 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 %files upstart
 %defattr(-,root,root,-)
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
 
 
 %if 0%{?with_minit:1}
@@ -219,6 +218,9 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.12-1300
+- updated -upstart to upstart 0.6.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hguemar at fedoraproject.org  Sun Dec  6 11:11:42 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Sun,  6 Dec 2009 11:11:42 +0000 (UTC)
Subject: rpms/opencv/devel opencv-2.0.0-apps-automake.patch, NONE,
	1.1 opencv-2.0.0-data-automake.patch, NONE, 1.1 opencv.spec,
	1.38, 1.39
Message-ID: <20091206111142.1E8FD11C00E0@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/opencv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20081

Modified Files:
	opencv.spec 
Added Files:
	opencv-2.0.0-apps-automake.patch 
	opencv-2.0.0-data-automake.patch 
Log Message:
Fix autotools scripts (missing LBP features) - #544167

opencv-2.0.0-apps-automake.patch:
 Makefile.am |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE opencv-2.0.0-apps-automake.patch ---
--- OpenCV-2.0.0/apps/Makefile.am.orig	2009-10-01 01:20:58.000000000 +0100
+++ OpenCV-2.0.0/apps/Makefile.am	2009-12-04 13:36:09.000000000 +0100
@@ -4,11 +4,16 @@ AM_LDFLAGS  = @OPENMP_CXXFLAGS@
 
 EXTRA_DIST = \
   CMakeLists.txt \
-  haartraining/CMakeLists.txt 
+  haartraining/CMakeLists.txt \
+  transcascade/CMakeLists.txt
 
 noinst_LTLIBRARIES = libcvhaartraining.la
 
-bin_PROGRAMS = opencv-haartraining opencv-createsamples opencv-performance
+bin_PROGRAMS = \
+  opencv-haartraining \
+  opencv-createsamples \
+  opencv-performance \
+  opencv-traincascade
 
 ALL_CV_LIBS = \
   $(top_builddir)/src/libhighgui.la       \
@@ -27,7 +32,12 @@ noinst_HEADERS = \
   haartraining/cvclassifier.h    \
   haartraining/cvhaartraining.h  \
   haartraining/_cvhaartraining.h \
-  haartraining/_cvcommon.h
+  haartraining/_cvcommon.h \
+  traincascade/boost.h \
+  traincascade/cascadeclassifier.h \
+  traincascade/features.h \
+  traincascade/imagestorage.h \
+  traincascade/lbpfeatures.h
 
 opencv_haartraining_SOURCES = haartraining/haartraining.cpp
 opencv_haartraining_LDADD = libcvhaartraining.la $(ALL_CV_LIBS)
@@ -38,3 +48,14 @@ opencv_createsamples_LDADD = libcvhaartr
 opencv_performance_SOURCES = haartraining/performance.cpp
 opencv_performance_LDADD = libcvhaartraining.la $(ALL_CV_LIBS)
 
+opencv_traincascade_SOURCES = \
+  traincascade/traincascade.cpp \
+  traincascade/cascadeclassifier.cpp \
+  traincascade/boost.cpp \ 
+  traincascade/features.cpp \
+  traincascade/haarfeatures.cpp \
+  traincascade/lbpfeatures.cpp \
+  traincascade/imagestorage.cpp 
+opencv_traincascade_LDADD = \
+  $(ALL_CV_LIBS) \
+  $(top_builddir)/src/libml.la

opencv-2.0.0-data-automake.patch:
 Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE opencv-2.0.0-data-automake.patch ---
--- OpenCV-2.0.0/data/Makefile.am.orig	2009-10-01 01:20:58.000000000 +0100
+++ OpenCV-2.0.0/data/Makefile.am	2009-12-04 13:05:11.000000000 +0100
@@ -25,4 +25,6 @@
   haarcascades/haarcascade_mcs_mouth.xml \
   haarcascades/haarcascade_mcs_nose.xml \
   haarcascades/haarcascade_mcs_righteye.xml \
-  haarcascades/haarcascade_mcs_upperbody.xml
+  haarcascades/haarcascade_mcs_upperbody.xml \
+  \
+  lbpcascades/lbpcascade_frontalface.xml


Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- opencv.spec	27 Nov 2009 16:58:26 -0000	1.38
+++ opencv.spec	6 Dec 2009 11:11:41 -0000	1.39
@@ -4,7 +4,7 @@
 
 Name:           opencv
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@ License:        BSD
 URL:            http://opencv.willowgarage.com/wiki/
 Source0:        http://prdownloads.sourceforge.net/opencvlibrary/%{tar_name}-%{version}.tar.bz2
 Source1:        opencv-samples-Makefile
+Patch0:         opencv-2.0.0-data-automake.patch
+Patch1:	        opencv-2.0.0-apps-automake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -69,6 +71,8 @@ This package contains Python bindings fo
 
 %prep
 %setup -q -n %{tar_name}-%{version}
+%patch0 -p1 -b .automake
+%patch1 -p1 -b .automake
 #Renew the autotools (and remove rpath).
 autoreconf -vif
 
@@ -128,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/opencv
 %{_datadir}/opencv/haarcascades
+%{_datadir}/opencv/lbpcascades
 %{_datadir}/opencv/readme.txt
 
 
@@ -149,11 +154,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.0.0-2
+- Fix autotools scripts (missing LBP features) - #544167 
+
 * Fri Nov 27 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.0.0-1
 - Updated to 2.0.0
 - Removed upstream-ed patches
 - Ugly hack (added cvconfig.h)
-- disable %check on ppc64
+- Disable %check on ppc64
 
 * Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> - 1.1.0-0.7.pre1
 - fix build on s390x where we don't have libraw1394 and devel
@@ -162,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 - Fix typo I introduced that prevented build on i386/i586
 
 * Fri Jul 30 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.1.0.0.5.pre1
-- Added 1394libs and unicap support
+- Added 1394 libs and unicap support
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-0.4.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From ensc at fedoraproject.org  Sun Dec  6 11:12:46 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 11:12:46 +0000 (UTC)
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.26,1.27
Message-ID: <20091206111246.35EDB11C00E0@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20486

Modified Files:
	dhcp-forwarder.spec 
Log Message:
whitespace cleanup



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- dhcp-forwarder.spec	24 Jul 2009 20:13:29 -0000	1.26
+++ dhcp-forwarder.spec	6 Dec 2009 11:12:45 -0000	1.27
@@ -5,7 +5,7 @@
 
 
 ## Fedora Extras specific customization below...
-%bcond_without       	fedora
+%bcond_without		fedora
 %bcond_without		dietlibc
 %bcond_with		minit
 ##
@@ -58,7 +58,7 @@ Source10:		dhcp-forwarder.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 BuildArch:		noarch



From ensc at fedoraproject.org  Sun Dec  6 11:13:49 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 11:13:49 +0000 (UTC)
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.upstart, 1.2,
	1.3 dhcp-forwarder.spec, 1.27, 1.28
Message-ID: <20091206111349.6F46C11C00E0@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20895

Modified Files:
	dhcp-forwarder.upstart dhcp-forwarder.spec 
Log Message:
updated -upstart to upstart 0.6.3



Index: dhcp-forwarder.upstart
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.upstart,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dhcp-forwarder.upstart	22 Nov 2009 10:44:10 -0000	1.2
+++ dhcp-forwarder.upstart	6 Dec 2009 11:13:49 -0000	1.3
@@ -1,9 +1,9 @@
-### Uncomment the 'start' lines below
+### Uncomment *one* of the 'start' lines below
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 respawn
 exec /usr/sbin/dhcp-fwd -n -c /etc/dhcp-fwd.conf


Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- dhcp-forwarder.spec	6 Dec 2009 11:12:45 -0000	1.27
+++ dhcp-forwarder.spec	6 Dec 2009 11:13:49 -0000	1.28
@@ -22,7 +22,7 @@
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.8
-Release:	%release_func 5
+Release:	%release_func 1300
 License:	GPLv3
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
@@ -57,8 +57,7 @@ Group:			System Environment/Base
 Source10:		dhcp-forwarder.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 BuildArch:		noarch
@@ -127,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
 %__install -d  -m 0700 $RPM_BUILD_ROOT%homedir
-%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/dhcp-forwarder
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/dhcp-forwarder.conf
 
 %{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
@@ -192,7 +191,7 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 %files upstart
 %defattr(-,root,root,-)
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
 
 
 %if 0%{?with_minit:1}
@@ -208,6 +207,9 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8-1300
+- updated -upstart to upstart 0.6.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ensc at fedoraproject.org  Sun Dec  6 11:18:54 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 11:18:54 +0000 (UTC)
Subject: rpms/clamav/devel clamd.scan.upstart, 1.3, 1.4 clamav.spec, 1.95,
	1.96 clamav-milter.upstart, 1.4, 1.5
Message-ID: <20091206111854.2FEAF11C00E0@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22661

Modified Files:
	clamd.scan.upstart clamav.spec clamav-milter.upstart 
Log Message:
updated -upstart to upstart 0.6.3



Index: clamd.scan.upstart
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamd.scan.upstart,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- clamd.scan.upstart	22 Nov 2009 10:47:15 -0000	1.3
+++ clamd.scan.upstart	6 Dec 2009 11:18:53 -0000	1.4
@@ -1,14 +1,16 @@
-### Uncomment these lines when you want clamd.scan to be a scanner
-### for a locally running clamav-milter
+### !!! Uncomment only *one* of the 'start on' statements !!!
+
+### Uncomment this line when you want clamd.scan to be a scanner for a
+### locally running clamav-milter
 #start on starting clamav-milter
 
-### Uncomment these lines when you want clamd.scan to be a generic
+### Uncomment this line when you want clamd.scan to be a generic
 ### scanner service
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+	  runlevel 1 or
+	  runlevel 6)
 
 respawn
 exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- clamav.spec	21 Nov 2009 20:18:21 -0000	1.95
+++ clamav.spec	6 Dec 2009 11:18:53 -0000	1.96
@@ -26,7 +26,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.3
-Release:	%release_func 1300%{?snapshot:.%snapshot}
+Release:	%release_func 1301%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -162,8 +162,7 @@ Group:		System Environment/Daemons
 Source410:	clamd.scan.upstart
 Provides:	init(clamav-scanner) = upstart
 Requires:	clamav-scanner = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -211,8 +210,7 @@ Group:		System Environment/Daemons
 Source310:	clamav-milter.upstart
 Provides:	init(clamav-milter) = upstart
 Requires:	clamav-milter = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -389,7 +387,7 @@ function smartsubst() {
 
 
 install -d -m755 \
-	${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \
+	${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,init} \
 	${RPM_BUILD_ROOT}%_var/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
@@ -445,7 +443,7 @@ sed -e 's!<SERVICE>!scan!g;s!<USER>!%sca
 sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \
     > $RPM_BUILD_ROOT%_initrddir/clamd.scan
 
-install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan
+install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf
 
 touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock
 
@@ -459,14 +457,14 @@ sed -r \
     -e 's! /tmp/clamav-milter.log! %milterlog!g' \
     etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf
 
-install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter
+install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf
 install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter
 
 
 rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf
 touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog}
 
-%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d}
+%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
 
 ## ------------------------------------------------------------
 
@@ -671,7 +669,7 @@ test "$1" != "0" || /sbin/initctl -q sto
 %if 0%{?with_upstart:1}
 %files scanner-upstart
 %defattr(-,root,root,-)
-%config(noreplace) %_sysconfdir/event.d/clamd.scan
+%config(noreplace) %_sysconfdir/init/clamd.scan*
 %endif
 
 ## -----------------------
@@ -693,11 +691,14 @@ test "$1" != "0" || /sbin/initctl -q sto
 %if 0%{?with_upstart:1}
 %files milter-upstart
 %defattr(-,root,root,-)
-%config(noreplace) %_sysconfdir/event.d/clamav-milter
+%config(noreplace) %_sysconfdir/init/clamav-milter*
 %endif
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1301
+- updated -upstart to upstart 0.6.3
+
 * Sat Nov 21 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - adjusted chkconfig positions for clamav-milter (#530101)
 - use %%apply instead of %%patch


Index: clamav-milter.upstart
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav-milter.upstart,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- clamav-milter.upstart	22 Nov 2009 10:47:15 -0000	1.4
+++ clamav-milter.upstart	6 Dec 2009 11:18:53 -0000	1.5
@@ -1,15 +1,16 @@
+### !!! Uncomment only *one* of the 'start on' statements !!!
+
 ### Uncomment these lines when you want clamav-milter to be a milter
 ### for a locally running MTA
-#start on starting sendmail
-#start on starting postfix
+#start on (starting sendmail or starting postfix)
 
 ### Uncomment these lines when you want clamav-milter to be a milter
 ### for a remotely running MTA
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 respawn
 exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes



From lkundrak at fedoraproject.org  Sun Dec  6 11:22:29 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  6 Dec 2009 11:22:29 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape-0.47-newpoppler.patch, NONE,
	1.1 inkscape.spec, 1.92, 1.93
Message-ID: <20091206112229.10D5511C00E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23887

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.47-newpoppler.patch 
Log Message:
* Sun Dec 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-2
- Fix Rawhide build.


inkscape-0.47-newpoppler.patch:
 pdf-parser.cpp |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

--- NEW FILE inkscape-0.47-newpoppler.patch ---
Fix Rawhide build (more recent poppler)

Lubomir Rintel <lkundrak at v3.sk>


Index: inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp
===================================================================
--- inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp	(revision 22620)
+++ inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp	(working copy)
@@ -56,6 +56,13 @@
 #define M_PI 3.14159265358979323846
 #endif
 
+#include <glib/poppler-features.h>
+#if POPPLER_CHECK_VERSION(0,12,2)
+#define PGFX ,NULL
+#else
+#define PGFX
+#endif
+
 //------------------------------------------------------------------------
 // constants
 //------------------------------------------------------------------------
@@ -809,7 +816,7 @@
 	  blendingColorSpace = NULL;
 	  isolated = knockout = gFalse;
 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
-	    blendingColorSpace = GfxColorSpace::parse(&obj5);
+	    blendingColorSpace = GfxColorSpace::parse(&obj5 PGFX);
 	  }
 	  obj5.free();
 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
@@ -1009,9 +1016,9 @@
   state->setFillPattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0]);
+    colorSpace = GfxColorSpace::parse(&args[0] PGFX);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj);
+    colorSpace = GfxColorSpace::parse(&obj PGFX);
   }
   obj.free();
   if (colorSpace) {
@@ -1032,9 +1039,9 @@
   state->setStrokePattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0]);
+    colorSpace = GfxColorSpace::parse(&args[0] PGFX);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj);
+    colorSpace = GfxColorSpace::parse(&obj PGFX);
   }
   obj.free();
   if (colorSpace) {
@@ -1101,7 +1108,7 @@
       builder->updateStyle(state);
     }
     if (args[numArgs-1].isName() &&
-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+	(pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
       state->setFillPattern(pattern);
       builder->updateStyle(state);
     }
@@ -1145,7 +1152,7 @@
       builder->updateStyle(state);
     }
     if (args[numArgs-1].isName() &&
-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+	(pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
       state->setStrokePattern(pattern);
       builder->updateStyle(state);
     }
@@ -1543,7 +1550,7 @@
   double *matrix = NULL;
   GBool savedState = gFalse;
 
-  if (!(shading = res->lookupShading(args[0].getName()))) {
+  if (!(shading = res->lookupShading(args[0].getName() PGFX))) {
     return;
   }
 
@@ -2507,7 +2514,7 @@
       }
     }
     if (!obj1.isNull()) {
-      colorSpace = GfxColorSpace::parse(&obj1);
+      colorSpace = GfxColorSpace::parse(&obj1 PGFX);
     } else if (csMode == streamCSDeviceGray) {
       colorSpace = new GfxDeviceGrayColorSpace();
     } else if (csMode == streamCSDeviceRGB) {
@@ -2592,7 +2599,7 @@
 	  obj2.free();
 	}
       }
-      maskColorSpace = GfxColorSpace::parse(&obj1);
+      maskColorSpace = GfxColorSpace::parse(&obj1 PGFX);
       obj1.free();
       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
 	goto err1;
@@ -2767,7 +2774,7 @@
     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
       transpGroup = gTrue;
       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
-	blendingColorSpace = GfxColorSpace::parse(&obj3);
+	blendingColorSpace = GfxColorSpace::parse(&obj3 PGFX);
       }
       obj3.free();
       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- inkscape.spec	30 Nov 2009 13:35:59 -0000	1.92
+++ inkscape.spec	6 Dec 2009 11:22:28 -0000	1.93
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.47
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -12,6 +12,7 @@ Patch0:         inkscape-20090410svn-uni
 Patch4:         inkscape-20090410svn-formats.patch
 Patch5:         inkscape-20090925svn-el5.patch
 Patch6:         inkscape-20091101svn-icon.patch
+Patch7:         inkscape-0.47-newpoppler.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -127,6 +128,7 @@ graphics in W3C standard Scalable Vector
 %patch4 -p1 -b .formats
 %patch5 -p1 -b .el5
 %patch6 -p0 -b .japierdole
+%patch7 -p0 -b .poppler
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -218,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-2
+- Fix Rawhide build.
+
 * Wed Nov 25 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-1
 - Stable release
 



From leigh123linux at fedoraproject.org  Sun Dec  6 11:28:22 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun,  6 Dec 2009 11:28:22 +0000 (UTC)
Subject: File qbittorrent-3043svn.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091206112822.B439410F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qbittorrent:

68f604bc9b978a183166decfa90927ce  qbittorrent-3043svn.tar.gz



From leigh123linux at fedoraproject.org  Sun Dec  6 11:28:58 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun,  6 Dec 2009 11:28:58 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.28, 1.29 qbittorrent.spec, 1.51,
	1.52 sources, 1.28, 1.29
Message-ID: <20091206112858.D84C011C00E0@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26027

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Sun Dec 06 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.10.svn3043
- update to svn 3043



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	2 Dec 2009 11:12:20 -0000	1.28
+++ .cvsignore	6 Dec 2009 11:28:58 -0000	1.29
@@ -1 +1 @@
-qbittorrent-3027svn.tar.gz
+qbittorrent-3043svn.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- qbittorrent.spec	2 Dec 2009 11:12:20 -0000	1.51
+++ qbittorrent.spec	6 Dec 2009 11:28:58 -0000	1.52
@@ -1,9 +1,9 @@
-%define svn_rev 3027
+%define svn_rev 3043
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.0.0
-Release: 0.9.svn%{svn_rev}%{?dist}
+Release: 0.10.svn%{svn_rev}%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -75,6 +75,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sun Dec 06 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.10.svn3043
+- update to svn 3043
+
 * Wed Dec 02 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.9.svn3027
 - update to svn 3027
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	2 Dec 2009 11:12:21 -0000	1.28
+++ sources	6 Dec 2009 11:28:58 -0000	1.29
@@ -1 +1 @@
-6d306c69e07787ebaad6c9a33ea7ff8a  qbittorrent-3027svn.tar.gz
+68f604bc9b978a183166decfa90927ce  qbittorrent-3043svn.tar.gz



From lkundrak at fedoraproject.org  Sun Dec  6 11:39:26 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  6 Dec 2009 11:39:26 +0000 (UTC)
Subject: File dosfstools-3.0.6.tar.bz2 uploaded to lookaside cache by
	lkundrak
Message-ID: <20091206113926.A612110F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for dosfstools:

ae64c11d3963cd49758aba2854a60b6e  dosfstools-3.0.6.tar.bz2



From lkundrak at fedoraproject.org  Sun Dec  6 11:39:52 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  6 Dec 2009 11:39:52 +0000 (UTC)
Subject: rpms/dosfstools/devel dosfstools-3.0.6-bounds.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 dosfstools.spec, 1.39, 1.40 sources,
	1.9, 1.10 dosfstools-exit.patch, 1.1,
	NONE dosfstools-install-p.patch, 1.1, NONE
Message-ID: <20091206113952.AFD2711C00E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/dosfstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29142

Modified Files:
	.cvsignore dosfstools.spec sources 
Added Files:
	dosfstools-3.0.6-bounds.patch 
Removed Files:
	dosfstools-exit.patch dosfstools-install-p.patch 
Log Message:
* Sun Dec 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.6-1
- Bump to newer release
- Fix numerous out-of-bound writes


dosfstools-3.0.6-bounds.patch:
 check.c   |   12 +++++++++---
 dosfsck.h |    2 +-
 mkdosfs.c |    3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE dosfstools-3.0.6-bounds.patch ---
From: Lubomir Rintel <lkundrak at v3.sk> 
Date: Wed, 2 Dec 2009 22:49:11 +0100 
Subject: [PATCH] Fix out-of bound writes 

Firstly, packed attribute is added to the structure so that extension 
is guarranteed to immediately follow name for the cross-name-extension 
reads to succeed. 
 
Secondly, writes into dir_entry->name that span through the extension as 
well are split into two, so that FORTIFY_SOURCE's bound checking does 
not abort dosfsck. There also was an off-by-one error in auto_rename()'s
sprintf().

diff -up dosfstools-3.0.6/src/check.c.bounds dosfstools-3.0.6/src/check.c
--- dosfstools-3.0.6/src/check.c.bounds	2009-10-04 09:15:58.000000000 +0200
+++ dosfstools-3.0.6/src/check.c	2009-12-06 12:32:42.922639364 +0100
@@ -131,7 +131,10 @@ loff_t alloc_rootdir_entry(DOS_FS *fs, D
 	}
 	memset(de,0,sizeof(DIR_ENT));
 	while (1) {
-	    sprintf(de->name,pattern,curr_num);
+	    char expanded[12];
+	    sprintf(expanded, pattern, curr_num);
+	    memcpy(de->name+4, expanded, 4);
+	    memcpy(de->ext, expanded+4, 3);
 	    clu_num = fs->root_cluster;
 	    i = 0;
 	    offset2 = cluster_start(fs,clu_num);
@@ -349,8 +352,11 @@ static void auto_rename(DOS_FILE *file)
     first = file->parent ? file->parent->first : root;
     number = 0;
     while (1) {
-	sprintf(file->dir_ent.name, "FSCK%04d", number / 1000);
-	sprintf(file->dir_ent.ext, "%03d", number % 1000);
+	char num[8];
+	sprintf(num, "%07d", number);
+	memcpy(file->dir_ent.name, "FSCK", 4);
+	memcpy(file->dir_ent.name+4, num, 4);
+	memcpy(file->dir_ent.ext, num+4, 3);
 	for (walk = first; walk; walk = walk->next)
 	    if (walk != file && !strncmp(walk->dir_ent.name,file->dir_ent.
 	      name,MSDOS_NAME)) break;
diff -up dosfstools-3.0.6/src/dosfsck.h.bounds dosfstools-3.0.6/src/dosfsck.h
--- dosfstools-3.0.6/src/dosfsck.h.bounds	2009-10-04 09:15:58.000000000 +0200
+++ dosfstools-3.0.6/src/dosfsck.h	2009-12-06 12:31:49.042643675 +0100
@@ -149,7 +149,7 @@ typedef struct {
     __u16	starthi;	/* High 16 bits of cluster in FAT32 */
     __u16	time,date,start;/* time, date and first cluster */
     __u32	size;		/* file size (in bytes) */
-} DIR_ENT;
+} __attribute__ ((packed)) DIR_ENT;
 
 typedef struct _dos_file {
     DIR_ENT dir_ent;
diff -up dosfstools-3.0.6/src/mkdosfs.c.bounds dosfstools-3.0.6/src/mkdosfs.c
--- dosfstools-3.0.6/src/mkdosfs.c.bounds	2009-10-04 09:15:58.000000000 +0200
+++ dosfstools-3.0.6/src/mkdosfs.c	2009-12-06 12:31:49.048645872 +0100
@@ -1254,7 +1254,8 @@ setup_tables (void)
   if ( memcmp(volume_name, "           ", 11) )
     {
       struct msdos_dir_entry *de = &root_dir[0];
-      memcpy(de->name, volume_name, 11);
+      memcpy(de->name, volume_name, 8);
+      memcpy(de->ext, volume_name+8, 3);
       de->attr = ATTR_VOLUME;
       ctime = localtime(&create_time);
       de->time = CT_LE_W((unsigned short)((ctime->tm_sec >> 1) +


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	10 Aug 2009 15:02:00 -0000	1.9
+++ .cvsignore	6 Dec 2009 11:39:52 -0000	1.10
@@ -1 +1 @@
-dosfstools-3.0.1.tar.bz2
+dosfstools-3.0.6.tar.bz2


Index: dosfstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- dosfstools.spec	10 Aug 2009 15:02:00 -0000	1.39
+++ dosfstools.spec	6 Dec 2009 11:39:52 -0000	1.40
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
-Version: 3.0.1
-Release: 6%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.bz2
@@ -11,9 +11,7 @@ Obsoletes: mkdosfs-ygg
 Provides: mkdosfs-ygg = %{version}
 
 # Mailed to Daniel Baumann
-Patch0: dosfstools-install-p.patch
-# Mailed to Daniel Baumann
-Patch1: dosfstools-exit.patch
+Patch0: dosfstools-3.0.6-bounds.patch
 
 %description
 The dosfstools package includes the mkdosfs and dosfsck utilities,
@@ -22,8 +20,7 @@ drives or on floppies.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .bounds
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -42,6 +39,10 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Sun Dec 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.6-1
+- Bump to newer release
+- Fix numerous out-of-bound writes
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0.1-6
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Aug 2009 15:02:00 -0000	1.9
+++ sources	6 Dec 2009 11:39:52 -0000	1.10
@@ -1 +1 @@
-b8ed17de873367a1782f85c661563411  dosfstools-3.0.1.tar.bz2
+ae64c11d3963cd49758aba2854a60b6e  dosfstools-3.0.6.tar.bz2


--- dosfstools-exit.patch DELETED ---


--- dosfstools-install-p.patch DELETED ---



From ensc at fedoraproject.org  Sun Dec  6 11:42:49 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 11:42:49 +0000 (UTC)
Subject: File kismet-2009-11-R1.tar.gz uploaded to lookaside cache by ensc
Message-ID: <20091206114249.EB33310F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kismet:

6987fb1dd8574a6b85ca3af3c068568e  kismet-2009-11-R1.tar.gz



From ensc at fedoraproject.org  Sun Dec  6 11:42:52 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 11:42:52 +0000 (UTC)
Subject: File kismet-2009-11-R1.tar.gz.asc uploaded to lookaside cache by
	ensc
Message-ID: <20091206114252.D938210F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kismet:

c619b1a50ccb042472b22b0a341ad29b  kismet-2009-11-R1.tar.gz.asc



From lkundrak at fedoraproject.org  Sun Dec  6 11:53:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  6 Dec 2009 11:53:07 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape.spec,1.93,1.94
Message-ID: <20091206115307.8811311C00E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv419

Modified Files:
	inkscape.spec 
Log Message:
Fix patch directory level


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- inkscape.spec	6 Dec 2009 11:22:28 -0000	1.93
+++ inkscape.spec	6 Dec 2009 11:53:07 -0000	1.94
@@ -128,7 +128,7 @@ graphics in W3C standard Scalable Vector
 %patch4 -p1 -b .formats
 %patch5 -p1 -b .el5
 %patch6 -p0 -b .japierdole
-%patch7 -p0 -b .poppler
+%patch7 -p1 -b .poppler
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,



From rathann at fedoraproject.org  Sun Dec  6 12:02:18 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 12:02:18 +0000 (UTC)
Subject: rpms/libgadu/devel libgadu.spec,1.14,1.15
Message-ID: <20091206120218.9A04911C00E0@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libgadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3229

Modified Files:
	libgadu.spec 
Log Message:
* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> 1.9.0-0.3.rc2
- disabled OpenSSL support (not used in practice),
  fixes license trouble for GPL apps



Index: libgadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/libgadu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libgadu.spec	6 Dec 2009 01:05:01 -0000	1.14
+++ libgadu.spec	6 Dec 2009 12:02:18 -0000	1.15
@@ -3,13 +3,12 @@
 
 Name:		libgadu
 Version:	1.9.0
-Release:	0.2%{dotrc}%{?dist}
+Release:	0.3%{dotrc}%{?dist}
 Summary:	A Gadu-gadu protocol compatible communications library
 License:	LGPLv2
 Group:		System Environment/Libraries
 Source0:	http://toxygen.net/libgadu/files/%{name}-%{version}%{dashrc}.tar.gz
 URL:		http://toxygen.net/libgadu/
-BuildRequires:	openssl-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,6 +42,7 @@ potrzebne do kompilowania aplikacji korz
 %build
 %configure \
 	--disable-static \
+	--without-openssl \
 	--with-pthread
 
 %{__make} %{?_smp_mflags}
@@ -72,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> 1.9.0-0.3.rc2
+- disabled OpenSSL support (not used in practice),
+  fixes license trouble for GPL apps
+
 * Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> 1.9.0-0.2.rc2
 - updated to 1.9.0-rc2
 



From jussilehtola at fedoraproject.org  Sun Dec  6 12:20:18 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 12:20:18 +0000 (UTC)
Subject: File unetbootin-source-377.tar.gz uploaded to lookaside cache by
	jussilehtola
Message-ID: <20091206122018.805A910F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for unetbootin:

18f524f35ac5a64d4fd367b1521c1f5d  unetbootin-source-377.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec  6 12:20:34 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 12:20:34 +0000 (UTC)
Subject: rpms/unetbootin/devel .cvsignore, 1.2, 1.3 sources, 1.3,
	1.4 unetbootin.spec, 1.8, 1.9
Message-ID: <20091206122034.DAE7611C03E3@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/unetbootin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8502

Modified Files:
	.cvsignore sources unetbootin.spec 
Log Message:
Update to revision 377.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Jul 2009 18:35:10 -0000	1.2
+++ .cvsignore	6 Dec 2009 12:20:34 -0000	1.3
@@ -1 +1 @@
-unetbootin-source-356.tar.gz
+unetbootin-source-377.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Oct 2009 00:07:45 -0000	1.3
+++ sources	6 Dec 2009 12:20:34 -0000	1.4
@@ -1 +1 @@
-4a8e72ab32afbb8564519a211c798f71  unetbootin-source-358.tar.gz
+18f524f35ac5a64d4fd367b1521c1f5d  unetbootin-source-377.tar.gz


Index: unetbootin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/devel/unetbootin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- unetbootin.spec	24 Oct 2009 00:07:45 -0000	1.8
+++ unetbootin.spec	6 Dec 2009 12:20:34 -0000	1.9
@@ -1,8 +1,8 @@
-%global rel 358
+%global rel 377
 
 Name:		unetbootin
 Version:	0
-Release:	6.%{rel}bzr%{?dist}
+Release:	7.%{rel}bzr%{?dist}
 Summary:	Create bootable Live USB drives for a variety of Linux distributions
 Group:		System Environment/Base
 License:	GPLv2+
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/unetbootin.desktop
 
 %changelog
+* Sun Dec 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-7.377bzr
+- Update to revision 377.
+
 * Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> 0-6.358bzr
 - Fix FTBFS: bump release to be able to tag in new branch and sync source name
 



From ensc at fedoraproject.org  Sun Dec  6 12:23:03 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 12:23:03 +0000 (UTC)
Subject: rpms/kismet/devel kismet-2009-11-R1-pluginlibs.patch, NONE,
	1.1 sources, 1.6, 1.7 lastver, 1.4, 1.5 kismet.spec, 1.29,
	1.30 .cvsignore, 1.5, 1.6
Message-ID: <20091206122303.C7A7A11C00E0@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9328

Modified Files:
	sources lastver kismet.spec .cvsignore 
Added Files:
	kismet-2009-11-R1-pluginlibs.patch 
Log Message:
updated to 2009-11-R1


kismet-2009-11-R1-pluginlibs.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kismet-2009-11-R1-pluginlibs.patch ---
Index: kismet-2009-11-R1/plugin-ptw/Makefile
===================================================================
--- kismet-2009-11-R1.orig/plugin-ptw/Makefile
+++ kismet-2009-11-R1/plugin-ptw/Makefile
@@ -9,7 +9,7 @@ top_builddir = $(BLDHOME)
 
 PLUGINLDFLAGS ?= $(LDFLAGS)
 PLUGINLDFLAGS += -shared -rdynamic
-LIBS	+= -lstdc++ -lssl -lpthread
+LIBS	+= -lstdc++ -lssl -lcrypto -lpthread
 CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
 
 PLUGOBJS = aircrack-crypto.o aircrack-ptw2-lib.o aircrack-kismet.o


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Aug 2009 15:01:09 -0000	1.6
+++ sources	6 Dec 2009 12:23:03 -0000	1.7
@@ -1,2 +1,2 @@
-8d77138020ace39f175a906dc0d3b267  kismet-2009-06-R1.tar.gz
-6eb095566baea5727a08aa269655119c  kismet-2009-06-R1.tar.gz.asc
+6987fb1dd8574a6b85ca3af3c068568e  kismet-2009-11-R1.tar.gz
+c619b1a50ccb042472b22b0a341ad29b  kismet-2009-11-R1.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/lastver,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lastver	9 Aug 2009 15:01:09 -0000	1.4
+++ lastver	6 Dec 2009 12:23:03 -0000	1.5
@@ -1 +1 @@
-2009-06-R1
+2009-11-R1


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- kismet.spec	9 Aug 2009 20:49:14 -0000	1.29
+++ kismet.spec	6 Dec 2009 12:23:03 -0000	1.30
@@ -1,4 +1,4 @@
-%global _version	2009-06-R1
+%global _version	2009-11-R1
 
 ## {Local macros...
 %global cfgdir		%_sysconfdir/%name
@@ -10,7 +10,7 @@
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
 Version:	%_rpmversion
-Release:	%release_func 2
+Release:	%release_func 1300
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.kismetwireless.net/
@@ -23,6 +23,7 @@ Source13:	kismet_capture.console
 Patch16:	kismet-2009-06-R1-fmt.patch
 Patch17:	kismet-2009-06-R1-perms.patch
 Patch18:	kismet-2009-06-R1-envp.patch
+Patch19:	kismet-2009-11-R1-pluginlibs.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 BuildRequires:	ncurses-devel diffutils
@@ -68,9 +69,13 @@ This subpackage contains plugins shipped
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 /bin/cp -a /usr/lib/rpm/config.sub .
 
+sed -i 's!\$(prefix)/lib/!%_libdir/!g' plugin-*/Makefile
+
+
 # set our 'kismet' user, disable GPS and log into %logdir by
 # default
 sed -i \
@@ -89,11 +94,11 @@ export LDFLAGS='-Wl,--as-needed'
 make clean
 make %{?_smp_mflags} HOME="$HOME"
 
-for i in plugin-{ptw,spectools}; do
+for i in plugin-{ptw,spectools,autowep}; do
     make -C $i KIS_SRC_DIR=`pwd` \
-    	 CXX='%__cxx' CC='%__cc' LD='%__cxx' \
+	 CXX='%__cxx' CC='%__cc' LD='%__cxx' \
 	 CFLAGS="-I\$(KIS_SRC_DIR) -fPIC $RPM_OPT_FLAGS" \
-	 LDFLAGS="-shared -rdynamic -Wl,--as-needed"
+	 PLUGINLDFLAGS="-shared -rdynamic -Wl,--as-needed"
 done
 
 
@@ -104,12 +109,11 @@ diet %__cc $RPM_OPT_FLAGS %SOURCE50 -o k
 %install
 rm -rf $RPM_BUILD_ROOT _tmp
 
-make install	\
+for i in . plugin-{ptw,spectools,autowep}; do
+    make -C $i install	\
+        KIS_SRC_DIR=`pwd` \
 	DESTDIR="$RPM_BUILD_ROOT" \
 	INSTUSR="$(id -un)" INSTGRP="$(id -gn)" MANGRP="$(id -gn)"
-
-for i in plugin-{ptw,spectools}; do
-    make -C $i install KIS_DEST_DIR=`pwd`/_tmp
 done
 
 install -d $RPM_BUILD_ROOT{%homedir,%crontabdir,%_libdir/kismet{,_client},%_libexecdir,%_sysconfdir/{sysconfig,pam.d,security/console.apps}}
@@ -118,8 +122,7 @@ install -p -m 0644 %SOURCE12     $RPM_BU
 install -p -m 0644 %SOURCE13     $RPM_BUILD_ROOT%_sysconfdir/security/console.apps/kismet_capture
 install -p -m 0755 kismet_capture $RPM_BUILD_ROOT%_libexecdir/
 
-install -Dp -m 0755 _tmp/lib/kismet/*        $RPM_BUILD_ROOT%_libdir/kismet/
-install -Dp -m 0755 _tmp/lib/kismet_client/* $RPM_BUILD_ROOT%_libdir/kismet_client/
+chmod 0755 $RPM_BUILD_ROOT%_libdir/kismet*/*.so
 
 
 #ln -s ./consolehelper            $RPM_BUILD_ROOT%_bindir/kismet_capture
@@ -154,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.11.R1-1300
+- updated to 2009-11-R1
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - enhanced kismet_capture's pam configuration file
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Aug 2009 15:01:08 -0000	1.5
+++ .cvsignore	6 Dec 2009 12:23:03 -0000	1.6
@@ -1,2 +1,2 @@
-kismet-2009-06-R1.tar.gz
-kismet-2009-06-R1.tar.gz.asc
+kismet-2009-11-R1.tar.gz
+kismet-2009-11-R1.tar.gz.asc



From ensc at fedoraproject.org  Sun Dec  6 12:27:35 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 12:27:35 +0000 (UTC)
Subject: rpms/kismet/F-12 kismet-2009-11-R1-pluginlibs.patch, NONE,
	1.1 sources, 
	1.6, 1.7 lastver, 1.4, 1.5 kismet.spec, 1.29, 1.30 .cvsignore,
	1.5, 1.6
Message-ID: <20091206122735.975D611C00E0@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11118

Modified Files:
	sources lastver kismet.spec .cvsignore 
Added Files:
	kismet-2009-11-R1-pluginlibs.patch 
Log Message:
updated to 2009-11-R1


kismet-2009-11-R1-pluginlibs.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kismet-2009-11-R1-pluginlibs.patch ---
Index: kismet-2009-11-R1/plugin-ptw/Makefile
===================================================================
--- kismet-2009-11-R1.orig/plugin-ptw/Makefile
+++ kismet-2009-11-R1/plugin-ptw/Makefile
@@ -9,7 +9,7 @@ top_builddir = $(BLDHOME)
 
 PLUGINLDFLAGS ?= $(LDFLAGS)
 PLUGINLDFLAGS += -shared -rdynamic
-LIBS	+= -lstdc++ -lssl -lpthread
+LIBS	+= -lstdc++ -lssl -lcrypto -lpthread
 CFLAGS 	+= -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
 
 PLUGOBJS = aircrack-crypto.o aircrack-ptw2-lib.o aircrack-kismet.o


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Aug 2009 15:01:09 -0000	1.6
+++ sources	6 Dec 2009 12:27:35 -0000	1.7
@@ -1,2 +1,2 @@
-8d77138020ace39f175a906dc0d3b267  kismet-2009-06-R1.tar.gz
-6eb095566baea5727a08aa269655119c  kismet-2009-06-R1.tar.gz.asc
+6987fb1dd8574a6b85ca3af3c068568e  kismet-2009-11-R1.tar.gz
+c619b1a50ccb042472b22b0a341ad29b  kismet-2009-11-R1.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/kismet/F-12/lastver,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lastver	9 Aug 2009 15:01:09 -0000	1.4
+++ lastver	6 Dec 2009 12:27:35 -0000	1.5
@@ -1 +1 @@
-2009-06-R1
+2009-11-R1


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/F-12/kismet.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- kismet.spec	9 Aug 2009 20:49:14 -0000	1.29
+++ kismet.spec	6 Dec 2009 12:27:35 -0000	1.30
@@ -1,4 +1,4 @@
-%global _version	2009-06-R1
+%global _version	2009-11-R1
 
 ## {Local macros...
 %global cfgdir		%_sysconfdir/%name
@@ -10,7 +10,7 @@
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
 Version:	%_rpmversion
-Release:	%release_func 2
+Release:	%release_func 1200
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.kismetwireless.net/
@@ -23,6 +23,7 @@ Source13:	kismet_capture.console
 Patch16:	kismet-2009-06-R1-fmt.patch
 Patch17:	kismet-2009-06-R1-perms.patch
 Patch18:	kismet-2009-06-R1-envp.patch
+Patch19:	kismet-2009-11-R1-pluginlibs.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 BuildRequires:	ncurses-devel diffutils
@@ -68,9 +69,13 @@ This subpackage contains plugins shipped
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 /bin/cp -a /usr/lib/rpm/config.sub .
 
+sed -i 's!\$(prefix)/lib/!%_libdir/!g' plugin-*/Makefile
+
+
 # set our 'kismet' user, disable GPS and log into %logdir by
 # default
 sed -i \
@@ -89,11 +94,11 @@ export LDFLAGS='-Wl,--as-needed'
 make clean
 make %{?_smp_mflags} HOME="$HOME"
 
-for i in plugin-{ptw,spectools}; do
+for i in plugin-{ptw,spectools,autowep}; do
     make -C $i KIS_SRC_DIR=`pwd` \
-    	 CXX='%__cxx' CC='%__cc' LD='%__cxx' \
+	 CXX='%__cxx' CC='%__cc' LD='%__cxx' \
 	 CFLAGS="-I\$(KIS_SRC_DIR) -fPIC $RPM_OPT_FLAGS" \
-	 LDFLAGS="-shared -rdynamic -Wl,--as-needed"
+	 PLUGINLDFLAGS="-shared -rdynamic -Wl,--as-needed"
 done
 
 
@@ -104,12 +109,11 @@ diet %__cc $RPM_OPT_FLAGS %SOURCE50 -o k
 %install
 rm -rf $RPM_BUILD_ROOT _tmp
 
-make install	\
+for i in . plugin-{ptw,spectools,autowep}; do
+    make -C $i install	\
+        KIS_SRC_DIR=`pwd` \
 	DESTDIR="$RPM_BUILD_ROOT" \
 	INSTUSR="$(id -un)" INSTGRP="$(id -gn)" MANGRP="$(id -gn)"
-
-for i in plugin-{ptw,spectools}; do
-    make -C $i install KIS_DEST_DIR=`pwd`/_tmp
 done
 
 install -d $RPM_BUILD_ROOT{%homedir,%crontabdir,%_libdir/kismet{,_client},%_libexecdir,%_sysconfdir/{sysconfig,pam.d,security/console.apps}}
@@ -118,8 +122,7 @@ install -p -m 0644 %SOURCE12     $RPM_BU
 install -p -m 0644 %SOURCE13     $RPM_BUILD_ROOT%_sysconfdir/security/console.apps/kismet_capture
 install -p -m 0755 kismet_capture $RPM_BUILD_ROOT%_libexecdir/
 
-install -Dp -m 0755 _tmp/lib/kismet/*        $RPM_BUILD_ROOT%_libdir/kismet/
-install -Dp -m 0755 _tmp/lib/kismet_client/* $RPM_BUILD_ROOT%_libdir/kismet_client/
+chmod 0755 $RPM_BUILD_ROOT%_libdir/kismet*/*.so
 
 
 #ln -s ./consolehelper            $RPM_BUILD_ROOT%_bindir/kismet_capture
@@ -154,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.11.R1-1200
+- updated to 2009-11-R1
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - enhanced kismet_capture's pam configuration file
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kismet/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Aug 2009 15:01:08 -0000	1.5
+++ .cvsignore	6 Dec 2009 12:27:35 -0000	1.6
@@ -1,2 +1,2 @@
-kismet-2009-06-R1.tar.gz
-kismet-2009-06-R1.tar.gz.asc
+kismet-2009-11-R1.tar.gz
+kismet-2009-11-R1.tar.gz.asc



From jussilehtola at fedoraproject.org  Sun Dec  6 12:30:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 12:30:23 +0000 (UTC)
Subject: rpms/unetbootin/F-12 sources,1.3,1.4 unetbootin.spec,1.8,1.9
Message-ID: <20091206123023.9FD6811C03FC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/unetbootin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12064/F-12

Modified Files:
	sources unetbootin.spec 
Log Message:
Update to revision 377.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Oct 2009 00:07:44 -0000	1.3
+++ sources	6 Dec 2009 12:30:23 -0000	1.4
@@ -1 +1 @@
-4a8e72ab32afbb8564519a211c798f71  unetbootin-source-358.tar.gz
+18f524f35ac5a64d4fd367b1521c1f5d  unetbootin-source-377.tar.gz


Index: unetbootin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/F-12/unetbootin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- unetbootin.spec	24 Oct 2009 00:07:44 -0000	1.8
+++ unetbootin.spec	6 Dec 2009 12:30:23 -0000	1.9
@@ -1,8 +1,8 @@
-%global rel 358
+%global rel 377
 
 Name:		unetbootin
 Version:	0
-Release:	6.%{rel}bzr%{?dist}
+Release:	7.%{rel}bzr%{?dist}
 Summary:	Create bootable Live USB drives for a variety of Linux distributions
 Group:		System Environment/Base
 License:	GPLv2+
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/unetbootin.desktop
 
 %changelog
+* Sun Dec 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-7.377bzr
+- Update to revision 377.
+
 * Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> 0-6.358bzr
 - Fix FTBFS: bump release to be able to tag in new branch and sync source name
 



From jussilehtola at fedoraproject.org  Sun Dec  6 12:30:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 12:30:23 +0000 (UTC)
Subject: rpms/unetbootin/F-11 sources,1.2,1.3 unetbootin.spec,1.5,1.6
Message-ID: <20091206123023.72A5211C03FC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/unetbootin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12064/F-11

Modified Files:
	sources unetbootin.spec 
Log Message:
Update to revision 377.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jul 2009 18:40:25 -0000	1.2
+++ sources	6 Dec 2009 12:30:23 -0000	1.3
@@ -1 +1 @@
-4a8e72ab32afbb8564519a211c798f71  unetbootin-source-356.tar.gz
+18f524f35ac5a64d4fd367b1521c1f5d  unetbootin-source-377.tar.gz


Index: unetbootin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/F-11/unetbootin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- unetbootin.spec	16 Jul 2009 13:09:55 -0000	1.5
+++ unetbootin.spec	6 Dec 2009 12:30:23 -0000	1.6
@@ -1,8 +1,8 @@
-%global rel 356
+%global rel 377
 
 Name:		unetbootin
 Version:	0
-Release:	6.%{rel}bzr%{?dist}
+Release:	7.%{rel}bzr%{?dist}
 Summary:	Create bootable Live USB drives for a variety of Linux distributions
 Group:		System Environment/Base
 License:	GPLv2+
@@ -73,6 +73,15 @@ rm -rf %{buildroot}
 %{_datadir}/applications/unetbootin.desktop
 
 %changelog
+* Sun Dec 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-7.377bzr
+- Update to revision 377.
+
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> 0-6.358bzr
+- Fix FTBFS: bump release to be able to tag in new branch and sync source name
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-6.357bzr
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-6.356bzr
 - Add ExclusiveArch to prevent build on architectures lacking syslinux.
 



From pbrobinson at fedoraproject.org  Sun Dec  6 12:57:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Dec 2009 12:57:10 +0000 (UTC)
Subject: rpms/anerley/devel anerley-no-self-contact.patch, NONE,
	1.1 anerley.spec, 1.13, 1.14
Message-ID: <20091206125710.0C9B611C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19620

Modified Files:
	anerley.spec 
Added Files:
	anerley-no-self-contact.patch 
Log Message:
- Add patch from upstream to fix segfault when no self contact is found

anerley-no-self-contact.patch:
 anerley-ebook-feed.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE anerley-no-self-contact.patch ---
>From e604bdf50e2b05ed6977564ea8d6aac948af0e03 Mon Sep 17 00:00:00 2001
From: Geoff Gustafson <geoff at linux.intel.com>
Date: Tue, 10 Nov 2009 23:01:47 +0000
Subject: anerley-ebook-feed: Fix segfault when no self contact is found

---
diff --git a/anerley/anerley-ebook-feed.c b/anerley/anerley-ebook-feed.c
index 59b2eb0..72c4529 100644
--- a/anerley/anerley-ebook-feed.c
+++ b/anerley/anerley-ebook-feed.c
@@ -134,13 +134,12 @@ anerley_ebook_feed_constructed (GObject *object)
                                     E_CONTACT_UID);
     g_debug (G_STRLOC ": Found self contact: %s",
              priv->self_uid);
+    g_object_unref (self_contact);
   } else {
     g_warning (G_STRLOC ": Error getting self contact: %s",
                error->message);
   }
 
-  g_object_unref (self_contact);
-
   if (G_OBJECT_CLASS (anerley_ebook_feed_parent_class)->constructed)
     G_OBJECT_CLASS (anerley_ebook_feed_parent_class)->constructed (object);
 }
--
cgit v0.8.3-13-ge633


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- anerley.spec	13 Nov 2009 16:14:31 -0000	1.13
+++ anerley.spec	6 Dec 2009 12:57:09 -0000	1.14
@@ -1,12 +1,13 @@
 Name:           anerley
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:         anerley-no-self-contact.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: evolution-data-server-devel
@@ -35,6 +36,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch -p1 -b .no-self-contact
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -72,6 +74,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sat Dec  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-2
+- Add patch from upstream to fix segfault when no self contact is found
+
 * Fri Nov 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-1
 - New upstream 0.2.0 release
 



From rathann at fedoraproject.org  Sun Dec  6 13:19:28 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 13:19:28 +0000 (UTC)
Subject: File tre-0.8.0.tar.bz2 uploaded to lookaside cache by rathann
Message-ID: <20091206131928.0B71410F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tre:

b4d3232593dadf6746f4727bdda20b41  tre-0.8.0.tar.bz2



From rathann at fedoraproject.org  Sun Dec  6 13:21:28 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 13:21:28 +0000 (UTC)
Subject: rpms/tre/devel import.log,1.1,NONE
Message-ID: <20091206132128.9CD9C11C00E0@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26327

Removed Files:
	import.log 
Log Message:
remove unnecessary log file



--- import.log DELETED ---



From chkr at fedoraproject.org  Sun Dec  6 13:32:15 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  6 Dec 2009 13:32:15 +0000 (UTC)
Subject: File pianobooster-src-0.6.4.tar.gz uploaded to lookaside cache by
	chkr
Message-ID: <20091206133215.8D2DE10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pianobooster:

af1bb513c93ac7b1c8cc919b60146d1c  pianobooster-src-0.6.4.tar.gz



From rathann at fedoraproject.org  Sun Dec  6 13:33:48 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 13:33:48 +0000 (UTC)
Subject: rpms/tre/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tre-chicken.patch, 1.1, 1.2 tre.spec, 1.15, 1.16
Message-ID: <20091206133348.5CE9D11C00E0@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30703

Modified Files:
	.cvsignore sources tre-chicken.patch tre.spec 
Log Message:
* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 0.8.0-1
- updated to 0.8.0 (ABI change)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tre/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Jul 2009 14:28:35 -0000	1.4
+++ .cvsignore	6 Dec 2009 13:33:47 -0000	1.5
@@ -1 +1 @@
-tre-0.7.6.tar.bz2
+tre-0.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tre/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Jul 2009 14:28:36 -0000	1.4
+++ sources	6 Dec 2009 13:33:47 -0000	1.5
@@ -1 +1 @@
-ada884f6524093aa7d4961f0c97dfe01  tre-0.7.6.tar.bz2
+b4d3232593dadf6746f4727bdda20b41  tre-0.8.0.tar.bz2

tre-chicken.patch:
 setup.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: tre-chicken.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tre/devel/tre-chicken.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tre-chicken.patch	8 Nov 2007 17:16:28 -0000	1.1
+++ tre-chicken.patch	6 Dec 2009 13:33:47 -0000	1.2
@@ -1,21 +1,21 @@
-diff -up tre-0.7.5/python/tre-python.c.chicken tre-0.7.5/python/tre-python.c
-diff -up tre-0.7.5/python/setup.py.chicken tre-0.7.5/python/setup.py
---- tre-0.7.5/python/setup.py.chicken	2006-12-10 07:02:57.000000000 +0100
-+++ tre-0.7.5/python/setup.py	2007-11-08 18:10:12.000000000 +0100
-@@ -32,6 +32,8 @@ SOURCES = ["tre-python.c"]
+diff -up tre-0.8.0/python/setup.py.chicken tre-0.8.0/python/setup.py
+--- tre-0.8.0/python/setup.py.chicken	2009-09-20 09:51:01.000000000 +0200
++++ tre-0.8.0/python/setup.py	2009-09-20 15:43:45.000000000 +0200
+@@ -10,7 +10,8 @@ import shutil
  
- INCDIRS = ospath(["..", "../lib"])
+ version = "0.8.0"
+ data_files = []
+-include_dirs = ["../lib"]
++include_dirs = ["..", "../lib"]
++library_dirs = ["../lib/.libs"]
+ libraries = ["tre"]
  
-+LIBDIRS = ospath(["../lib/.libs"])
-+
- setup(
-     name = "tre",
-     version = VERSION,
-@@ -46,6 +48,7 @@ setup(
- 	    SOURCES,
- 	    include_dirs = INCDIRS,
-             define_macros = [("HAVE_CONFIG_H", None)],
-+	    library_dirs = LIBDIRS,
- 	    libraries=["tre"]
- 	),
-     ],
+ if sys.platform == "win32":
+@@ -31,6 +32,7 @@ setup(name = "tre",
+                                sources = ["tre-python.c"],
+                                define_macros = [("HAVE_CONFIG_H", None)],
+                                include_dirs = include_dirs,
++                               library_dirs = library_dirs,
+                                libraries = libraries
+                                ),
+                      ],


Index: tre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tre/devel/tre.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- tre.spec	22 Aug 2009 19:12:53 -0000	1.15
+++ tre.spec	6 Dec 2009 13:33:47 -0000	1.16
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: tre
-Version: 0.7.6
-Release: 2%{?dist}
+Version: 0.8.0
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Libraries
 Source0: http://laurikari.net/tre/%{name}-%{version}.tar.bz2
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/agrep.1*
 
 %changelog
+* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 0.8.0-1
+- updated to 0.8.0 (ABI change)
+
 * Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-2
 - added missing defattr for python subpackage
 - dropped conditionals for Fedora <10



From chkr at fedoraproject.org  Sun Dec  6 13:34:20 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  6 Dec 2009 13:34:20 +0000 (UTC)
Subject: rpms/pianobooster/devel .cvsignore, 1.2, 1.3 pianobooster.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091206133420.9157A11C00E0@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/pianobooster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30875

Modified Files:
	.cvsignore pianobooster.spec sources 
Log Message:
* Sun Dec 06 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
- Update to new upstream version 0.6.4
- Fix icon permissions



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Apr 2009 18:29:48 -0000	1.2
+++ .cvsignore	6 Dec 2009 13:34:20 -0000	1.3
@@ -1 +1 @@
-pianobooster-src-0.6.2.tgz
+pianobooster-src-0.6.4.tar.gz


Index: pianobooster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/devel/pianobooster.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pianobooster.spec	26 Jul 2009 18:40:56 -0000	1.3
+++ pianobooster.spec	6 Dec 2009 13:34:20 -0000	1.4
@@ -1,11 +1,11 @@
 Name:            pianobooster
 Summary:         A MIDI file player that teaches you how to play the piano
-Version:         0.6.2
-Release:         5%{?dist}
+Version:         0.6.4
+Release:         1%{?dist}
 License:         GPLv3+
 Group:           Applications/Multimedia
 URL:             http://pianobooster.sourceforge.net/
-Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tgz
+Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
 Source1:         %{name}.desktop
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:   cmake
@@ -56,9 +56,9 @@ desktop-file-install \
 
 
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -m 644 -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-install -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -m 644 -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -83,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Dec 06 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
+- Update to new upstream version 0.6.4
+- Fix icon permissions
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Apr 2009 18:29:48 -0000	1.2
+++ sources	6 Dec 2009 13:34:20 -0000	1.3
@@ -1 +1 @@
-b644305e706721af1cba0debcb4390e2  pianobooster-src-0.6.2.tgz
+af1bb513c93ac7b1c8cc919b60146d1c  pianobooster-src-0.6.4.tar.gz



From rathann at fedoraproject.org  Sun Dec  6 13:41:04 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 13:41:04 +0000 (UTC)
Subject: rpms/gnomeradio/devel gnomeradio-v4l2.patch, NONE, 1.1 gnomeradio.sh,
	NONE, 1.1 gnomeradio.spec, 1.11, 1.12
Message-ID: <20091206134104.C8D5711C00E0@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/gnomeradio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv387

Modified Files:
	gnomeradio.spec 
Added Files:
	gnomeradio-v4l2.patch gnomeradio.sh 
Log Message:
* Sat Dec 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.8-4
- Changed defaults for using v4l2 (based on a patch by Paulo Roma)
- Included script gnomeradio.sh (Paulo Roma)
- fixed URL


gnomeradio-v4l2.patch:
 prefs.c |    2 +-
 radio.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnomeradio-v4l2.patch ---
diff -up gnomeradio-1.8/src/prefs.c.v4l2 gnomeradio-1.8/src/prefs.c
--- gnomeradio-1.8/src/prefs.c.v4l2	2008-04-13 15:04:52.000000000 +0200
+++ gnomeradio-1.8/src/prefs.c	2009-12-06 12:43:45.000000000 +0100
@@ -112,7 +112,7 @@ gboolean load_settings(void)
 	/* Load general settings */
 	settings.device = gconf_client_get_string(client, "/apps/gnomeradio/device" , NULL);
 	if (!settings.device)
-		settings.device = g_strdup("/dev/radio");
+		settings.device = g_strdup("/dev/radio0");
 	settings.driver = gconf_client_get_string(client, "/apps/gnomeradio/driver" , NULL);
 	if (!settings.driver)
 		settings.driver = g_strdup("any");
diff -up gnomeradio-1.8/src/radio.c.v4l2 gnomeradio-1.8/src/radio.c
--- gnomeradio-1.8/src/radio.c.v4l2	2008-04-13 14:55:43.000000000 +0200
+++ gnomeradio-1.8/src/radio.c	2009-12-06 12:44:01.000000000 +0100
@@ -41,9 +41,9 @@ int radio_init(char *device, DriverType 
 	}
 
 	switch (driver) {
+		case DRIVER_ANY:
 		case DRIVER_V4L2:
 			goto try_v4l2;
-		case DRIVER_ANY:
 		case DRIVER_V4L1:
 		default:
 			goto try_v4l1;


--- NEW FILE gnomeradio.sh ---
#!/bin/sh
# Route the capture sources on the sound card back in as PCM audio

PROG=/usr/bin/gnomeradio

sox -c 2 -s -r 44100 -t ossdsp /dev/audio -t ossdsp -r 44100 /dev/dsp &
# a bit noisy for my taste
#sox -c 2 -s -r 44100 -t alsa hw:0,0 -t alsa -r 44100 &

# if someone wants to start always with the same volume
# amixer -c 0 sset Master 80%,80% unmute

$PROG
wait $PROG
t=`pidof sox`;
kill $t;


Index: gnomeradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomeradio/devel/gnomeradio.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gnomeradio.spec	25 Jul 2009 00:52:28 -0000	1.11
+++ gnomeradio.spec	6 Dec 2009 13:41:04 -0000	1.12
@@ -1,11 +1,13 @@
 Summary: Graphical FM-Tuner program for GNOME
 Name: gnomeradio
 Version: 1.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
-URL: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/
-Source: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/%{name}-%{version}.tar.gz
+URL: http://projects.gnome.org/gnomeradio/
+Source0: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/%{name}-%{version}.tar.gz
+Source1: gnomeradio.sh
+Patch0: %{name}-v4l2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -31,6 +33,8 @@ Ogg files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .v4l2
+%{__install} -m 755 %{SOURCE1} .
 
 %build
 %configure \
@@ -93,7 +97,7 @@ scrollkeeper-update -q || :
 
 %files -f %{name}.lang
 %defattr(644,root,root,0755)
-%doc AUTHORS ChangeLog COPYING README README.lirc README.recording
+%doc AUTHORS ChangeLog COPYING README README.lirc README.recording gnomeradio.sh
 %{_datadir}/gnome/help/%{name}/
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %attr(755,root,root) %{_bindir}/%{name}
@@ -103,6 +107,11 @@ scrollkeeper-update -q || :
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
+* Sat Dec 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.8-4
+- Changed defaults for using v4l2 (based on a patch by Paulo Roma)
+- Included script gnomeradio.sh (Paulo Roma)
+- fixed URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rishi at fedoraproject.org  Sun Dec  6 13:42:51 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun,  6 Dec 2009 13:42:51 +0000 (UTC)
Subject: File libopenraw-0.0.8.tar.gz uploaded to lookaside cache by rishi
Message-ID: <20091206134251.11BBB10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libopenraw:

fc26f146586a4b601326130bce6ffd88  libopenraw-0.0.8.tar.gz



From rathann at fedoraproject.org  Sun Dec  6 13:49:10 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 13:49:10 +0000 (UTC)
Subject: rpms/crm114/devel crm114-tre.patch,NONE,1.1 crm114.spec,1.11,1.12
Message-ID: <20091206134910.1A0EB11C00E0@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/crm114/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2805

Modified Files:
	crm114.spec 
Added Files:
	crm114-tre.patch 
Log Message:
* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.12.20090807
- included missing shuffle.crm (rhbz#520397)
- rebuilt against new tre
- improved Summary:


crm114-tre.patch:
 crm114_sysincludes.h |    2 +-
 crmregex_tre.c       |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE crm114-tre.patch ---
diff -up crm114-20090807-BlameThorstenAndJenny.src/crm114_sysincludes.h.tre crm114-20090807-BlameThorstenAndJenny.src/crm114_sysincludes.h
--- crm114-20090807-BlameThorstenAndJenny.src/crm114_sysincludes.h.tre	2009-08-07 17:22:37.000000000 +0200
+++ crm114-20090807-BlameThorstenAndJenny.src/crm114_sysincludes.h	2009-09-20 15:56:23.000000000 +0200
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 
 // Only TRE regex library is currently supported
-#include <tre/regex.h>
+#include <tre/tre.h>
 
 // Normally declared from tre/regex.h
 //#ifndef REG_LITERAL
diff -up crm114-20090807-BlameThorstenAndJenny.src/crmregex_tre.c.tre crm114-20090807-BlameThorstenAndJenny.src/crmregex_tre.c
--- crm114-20090807-BlameThorstenAndJenny.src/crmregex_tre.c.tre	2009-08-07 17:22:37.000000000 +0200
+++ crm114-20090807-BlameThorstenAndJenny.src/crmregex_tre.c	2009-09-20 15:59:11.000000000 +0200
@@ -90,7 +90,7 @@ int crm_regcomp (regex_t *preg, char *re
   //    matches the same thing).
   if (regex_len == 0)
     {
-      return (regncomp (preg, "()", 2, cflags));
+      return (tre_regncomp (preg, "()", 2, cflags));
     };
 
   //   Are we cacheing compiled regexes?  Maybe not...
@@ -99,7 +99,7 @@ int crm_regcomp (regex_t *preg, char *re
   if (internal_trace)
     fpe_regex("compiling regex ", regex, regex_len, "\n");
 
-  return ( regncomp (preg, regex, regex_len, cflags));
+  return ( tre_regncomp (preg, regex, regex_len, cflags));
 
 #else	// !CRM_REGEX_CACHESIZE == 0
 
@@ -164,7 +164,7 @@ int crm_regcomp (regex_t *preg, char *re
 	new.regex_len = regex_len;
 	new.cflags = cflags;
 	new.status =
-	  regncomp (&new.reg, new.regex, new.regex_len, new.cflags);
+	  tre_regncomp (&new.reg, new.regex, new.regex_len, new.cflags);
 
 	// i is the bucket to throw away, if any
 	// i may or may not be where new stuff will go
@@ -172,7 +172,7 @@ int crm_regcomp (regex_t *preg, char *re
 	  {
 	    if (internal_trace)
 	      fpe_bucket("discarding ", i);
-	    regfree (&regex_cache[i].reg);
+	    tre_regfree (&regex_cache[i].reg);
 	    free (regex_cache[i].regex);
 	  }
       }
@@ -223,7 +223,7 @@ int crm_regexec ( regex_t *preg, char *s
   if (aux_string == NULL
       || strlen (aux_string) < 1)
     {
-      return (regnexec (preg, string, string_len, nmatch, pmatch, eflags));
+      return (tre_regnexec (preg, string, string_len, nmatch, pmatch, eflags));
     }
   else
     {
@@ -247,7 +247,7 @@ int crm_regexec ( regex_t *preg, char *s
 		 pblock.cost_del);
 
       //  now we can run the actual match
-      i = reganexec (preg, string, string_len, &mblock, pblock, eflags);
+      i = tre_reganexec (preg, string, string_len, &mblock, pblock, eflags);
       if (user_trace)
 	fprintf (stderr, "approximate Regex match returned %d .\n", i);
       return (i);
@@ -259,7 +259,7 @@ size_t crm_regerror (int errorcode, rege
 		     size_t errbuf_size)
 
 {
-  return (regerror (errorcode, preg, errbuf, errbuf_size));
+  return (tre_regerror (errorcode, preg, errbuf, errbuf_size));
 };
 
 void crm_regfree (regex_t *preg)
@@ -269,7 +269,7 @@ void crm_regfree (regex_t *preg)
   //  till and unless we decache, so crm_regfree is a noop.
   return;
 #else	// !CRM_REGEX_CACHESIZE > 0
-   return (regfree (preg));
+   return (tre_regfree (preg));
 #endif	// !CRM_REGEX_CACHESIZE > 0
 };
 


Index: crm114.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- crm114.spec	23 Aug 2009 16:13:07 -0000	1.11
+++ crm114.spec	6 Dec 2009 13:49:09 -0000	1.12
@@ -1,17 +1,18 @@
 %define cvsver 20090807
 %define codename BlameThorstenAndJenny
 
-Summary: CRM114 Bayesian Spam Detector
+Summary: Controllable Regex Mutilator: multi-method content classifier and filter
 Name: crm114
 Version: 0
-Release: 1.11.%{cvsver}%{?dist}
+Release: 1.12.%{cvsver}%{?dist}
 URL: http://crm114.sourceforge.net/
 License: GPLv3
 Group: Applications/Text
 Source0: http://crm114.sourceforge.net/tarballs/%{name}-%{cvsver}-%{codename}.src.tar.gz
 Patch0: %{name}-rpm.patch
+Patch1: %{name}-tre.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: tre-devel
+BuildRequires: tre-devel >= 0.8.0
 
 %description 
 CRM114 is a system to examine incoming e-mail, system log streams,
@@ -32,6 +33,7 @@ Major Emacs mode for editing crm114 scri
 %prep
 %setup -q -n %{name}-%{cvsver}-%{codename}.src
 %patch0 -p1 -b .r
+%patch1 -p1 -b .tre
 chmod 644 mailfilter.cf
 
 %build
@@ -45,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name},emacs/site-lisp}}
 make DESTDIR=$RPM_BUILD_ROOT INSTALLFLAGS="-m 755 -p" install
 install -pm 755 mail{filter,reaver,trainer}.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
-install -pm 644 maillib.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
+install -pm 644 maillib.crm shuffle.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 %check
 make megatest
@@ -61,6 +63,11 @@ make megatest
 %{_datadir}/emacs/site-lisp/*.el
 
 %changelog
+* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.12.20090807
+- included missing shuffle.crm (rhbz#520397)
+- rebuilt against new tre
+- improved Summary:
+
 * Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.11.20090807
 - updated to 20090807 "BlameThorstenAndJenny"
 - dropped upstreamed patch hunks, rebased patch



From rathann at fedoraproject.org  Sun Dec  6 13:53:10 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 13:53:10 +0000 (UTC)
Subject: rpms/msort/devel msort-tre.patch,NONE,1.1 msort.spec,1.4,1.5
Message-ID: <20091206135310.72F1511C00E0@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/msort/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4047

Modified Files:
	msort.spec 
Added Files:
	msort-tre.patch 
Log Message:
* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> - 8.46-5
- rebuilt for new tre


msort-tre.patch:
 configure    |    8 ++++----
 configure.ac |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE msort-tre.patch ---
diff -up msort-8.46/configure.ac.tre msort-8.46/configure.ac
--- msort-8.46/configure.ac.tre	2008-05-28 02:23:13.000000000 +0200
+++ msort-8.46/configure.ac	2009-12-06 13:43:45.984378670 +0100
@@ -69,7 +69,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 
 # Checks for libraries.
-AC_CHECK_LIB([tre], [regwcomp],,[AC_MSG_ERROR([libtre not found. see http://laurikari.net/tre/])])
+AC_CHECK_LIB([tre], [tre_regwcomp],,[AC_MSG_ERROR([libtre not found. see http://laurikari.net/tre/])])
 
 # Checks for header files.
 AC_HEADER_STDC
diff -up msort-8.46/configure.tre msort-8.46/configure
--- msort-8.46/configure.tre	2008-05-28 02:23:47.000000000 +0200
+++ msort-8.46/configure	2009-12-06 13:44:53.027621362 +0100
@@ -3045,8 +3045,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
 # Checks for libraries.
 
 
-echo "$as_me:$LINENO: checking for regwcomp in -ltre" >&5
-echo $ECHO_N "checking for regwcomp in -ltre... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for tre_regwcomp in -ltre" >&5
+echo $ECHO_N "checking for tre_regwcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_regwcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3065,11 +3065,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char regwcomp ();
+char tre_regwcomp ();
 int
 main ()
 {
-regwcomp ();
+tre_regwcomp ();
   ;
   return 0;
 }


Index: msort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msort/devel/msort.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- msort.spec	25 Jul 2009 15:17:05 -0000	1.4
+++ msort.spec	6 Dec 2009 13:53:10 -0000	1.5
@@ -1,12 +1,13 @@
 Summary:       Sort files in sophisticated ways
 Name:          msort
 Version:       8.46
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       GPLv3
 Group:         Applications/Publishing
 URL:           http://billposer.org/Software/msort.html
 Source0:       http://billposer.org/Software/Downloads/%{name}-%{version}.tar.gz
-BuildRequires: tre-devel libuninum-devel >= 2.5 libicu-devel gmp-devel
+Patch0:        %{name}-tre.patch
+BuildRequires: tre-devel >= 0.8.0 libuninum-devel >= 2.5 libicu-devel gmp-devel
 Requires:      iwidgets
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +24,7 @@ line interface, but may be driven by an 
 
 %prep
 %setup -q
+%patch0 -p1 -b .tre
 
 %build
 %configure --disable-utf8proc
@@ -44,6 +46,9 @@ line interface, but may be driven by an 
 %{_mandir}/man1/msort.1*
 
 %changelog
+* Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> - 8.46-5
+- rebuilt for new tre
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.46-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chkr at fedoraproject.org  Sun Dec  6 14:25:12 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  6 Dec 2009 14:25:12 +0000 (UTC)
Subject: rpms/pianobooster/F-12 .cvsignore, 1.2, 1.3 pianobooster.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20091206142512.BAC2211C00E0@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/pianobooster/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13671

Modified Files:
	.cvsignore pianobooster.spec sources 
Log Message:
* Sun Dec 06 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
- Update to new upstream version 0.6.4
- Fix icon permissions



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Apr 2009 18:29:48 -0000	1.2
+++ .cvsignore	6 Dec 2009 14:25:12 -0000	1.3
@@ -1 +1 @@
-pianobooster-src-0.6.2.tgz
+pianobooster-src-0.6.4.tar.gz


Index: pianobooster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-12/pianobooster.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pianobooster.spec	26 Jul 2009 18:40:56 -0000	1.3
+++ pianobooster.spec	6 Dec 2009 14:25:12 -0000	1.4
@@ -1,11 +1,11 @@
 Name:            pianobooster
 Summary:         A MIDI file player that teaches you how to play the piano
-Version:         0.6.2
-Release:         5%{?dist}
+Version:         0.6.4
+Release:         1%{?dist}
 License:         GPLv3+
 Group:           Applications/Multimedia
 URL:             http://pianobooster.sourceforge.net/
-Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tgz
+Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
 Source1:         %{name}.desktop
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:   cmake
@@ -56,9 +56,9 @@ desktop-file-install \
 
 
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -m 644 -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-install -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -m 644 -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -83,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Dec 06 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
+- Update to new upstream version 0.6.4
+- Fix icon permissions
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Apr 2009 18:29:48 -0000	1.2
+++ sources	6 Dec 2009 14:25:12 -0000	1.3
@@ -1 +1 @@
-b644305e706721af1cba0debcb4390e2  pianobooster-src-0.6.2.tgz
+af1bb513c93ac7b1c8cc919b60146d1c  pianobooster-src-0.6.4.tar.gz



From pbrobinson at fedoraproject.org  Sun Dec  6 14:32:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Dec 2009 14:32:06 +0000 (UTC)
Subject: File gupnp-igd-0.1.5.tar.gz uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091206143206.0428010F861@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gupnp-igd:

991156298967b586bb888cacce202dea  gupnp-igd-0.1.5.tar.gz



From pbrobinson at fedoraproject.org  Sun Dec  6 14:32:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Dec 2009 14:32:12 +0000 (UTC)
Subject: rpms/anerley/devel anerley.spec,1.14,1.15
Message-ID: <20091206143212.7249911C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15745

Modified Files:
	anerley.spec 
Log Message:
- Fix spec file. Damn FUDCon hotel wifi


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- anerley.spec	6 Dec 2009 12:57:09 -0000	1.14
+++ anerley.spec	6 Dec 2009 14:32:12 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           anerley
 Version:        0.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -36,7 +36,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch -p1 -b .no-self-contact
+%patch0 -p1 -b .no-self-contact
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-3
+- Fix spec file. Damn FUDCon hotel wifi
+
 * Sat Dec  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-2
 - Add patch from upstream to fix segfault when no self contact is found
 



From pbrobinson at fedoraproject.org  Sun Dec  6 14:33:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun,  6 Dec 2009 14:33:47 +0000 (UTC)
Subject: rpms/gupnp-igd/devel .cvsignore, 1.5, 1.6 gupnp-igd.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091206143347.2A14811C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-igd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16269

Modified Files:
	.cvsignore gupnp-igd.spec sources 
Log Message:
- Update to 0.1.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Nov 2009 03:05:24 -0000	1.5
+++ .cvsignore	6 Dec 2009 14:33:46 -0000	1.6
@@ -1 +1 @@
-gupnp-igd-0.1.4.tar.gz
+gupnp-igd-0.1.5.tar.gz


Index: gupnp-igd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/devel/gupnp-igd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gupnp-igd.spec	17 Nov 2009 03:05:24 -0000	1.7
+++ gupnp-igd.spec	6 Dec 2009 14:33:46 -0000	1.8
@@ -2,7 +2,7 @@
 %define glib2_ver 2.16
 
 Name:           gupnp-igd
-Version:        0.1.4
+Version:        0.1.5
 Release:        1%{?dist}
 Summary:	Library to handle UPnP IGD port mapping        
 
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Peter Robinson <pbrobinson at gmail.com> - 0.1.5-1
+- Update to 0.1.5.
+
 * Mon Nov 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.4-1
 - Update to 0.1.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Nov 2009 03:05:24 -0000	1.5
+++ sources	6 Dec 2009 14:33:46 -0000	1.6
@@ -1 +1 @@
-3bb5aa45fff68583cc8ad3d3e2b3906f  gupnp-igd-0.1.4.tar.gz
+991156298967b586bb888cacce202dea  gupnp-igd-0.1.5.tar.gz



From mtasaka at fedoraproject.org  Sun Dec  6 14:47:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 14:47:10 +0000 (UTC)
Subject: File jd-2.5.0-091206.tgz uploaded to lookaside cache by mtasaka
Message-ID: <20091206144710.04F8710F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for jd:

a9775428a2b33c471ca60cf56bae6c5c  jd-2.5.0-091206.tgz



From mtasaka at fedoraproject.org  Sun Dec  6 14:48:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 14:48:29 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.414, 1.415 jd.spec, 1.475, 1.476 sources,
	1.415, 1.416
Message-ID: <20091206144829.2F2E111C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20356/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
- 2.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- .cvsignore	29 Nov 2009 15:59:21 -0000	1.414
+++ .cvsignore	6 Dec 2009 14:48:28 -0000	1.415
@@ -1 +1 @@
-jd-2.5.0-rc091129.tgz
+jd-2.5.0-091206.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -p -r1.475 -r1.476
--- jd.spec	29 Nov 2009 15:59:21 -0000	1.475
+++ jd.spec	6 Dec 2009 14:48:28 -0000	1.476
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        rc091129
-%define         repoid        44658
+%define         strtag        091206
+%define         repoid        44788
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
+- 2.5.0
+
 * Mon Nov 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-0.5.rc091129
 - 2.5.0 rc 091129
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- sources	29 Nov 2009 15:59:21 -0000	1.415
+++ sources	6 Dec 2009 14:48:28 -0000	1.416
@@ -1 +1 @@
-b1e6147fd02a69bf2e32440b8de227b0  jd-2.5.0-rc091129.tgz
+a9775428a2b33c471ca60cf56bae6c5c  jd-2.5.0-091206.tgz



From mtasaka at fedoraproject.org  Sun Dec  6 14:48:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 14:48:29 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.412, 1.413 jd.spec, 1.475, 1.476 sources,
	1.413, 1.414
Message-ID: <20091206144829.465C011C02BB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20356/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
- 2.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- .cvsignore	29 Nov 2009 15:59:21 -0000	1.412
+++ .cvsignore	6 Dec 2009 14:48:28 -0000	1.413
@@ -1 +1 @@
-jd-2.5.0-rc091129.tgz
+jd-2.5.0-091206.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -p -r1.475 -r1.476
--- jd.spec	29 Nov 2009 15:59:22 -0000	1.475
+++ jd.spec	6 Dec 2009 14:48:28 -0000	1.476
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        rc091129
-%define         repoid        44658
+%define         strtag        091206
+%define         repoid        44788
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
+- 2.5.0
+
 * Mon Nov 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-0.5.rc091129
 - 2.5.0 rc 091129
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- sources	29 Nov 2009 15:59:22 -0000	1.413
+++ sources	6 Dec 2009 14:48:29 -0000	1.414
@@ -1 +1 @@
-b1e6147fd02a69bf2e32440b8de227b0  jd-2.5.0-rc091129.tgz
+a9775428a2b33c471ca60cf56bae6c5c  jd-2.5.0-091206.tgz



From mtasaka at fedoraproject.org  Sun Dec  6 14:48:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 14:48:29 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.412, 1.413 jd.spec, 1.476, 1.477 sources,
	1.413, 1.414
Message-ID: <20091206144829.A63AA11C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20356/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
- 2.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- .cvsignore	29 Nov 2009 15:59:22 -0000	1.412
+++ .cvsignore	6 Dec 2009 14:48:29 -0000	1.413
@@ -1 +1 @@
-jd-2.5.0-rc091129.tgz
+jd-2.5.0-091206.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -p -r1.476 -r1.477
--- jd.spec	29 Nov 2009 15:59:22 -0000	1.476
+++ jd.spec	6 Dec 2009 14:48:29 -0000	1.477
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        rc091129
-%define         repoid        44658
+%define         strtag        091206
+%define         repoid        44788
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
+- 2.5.0
+
 * Mon Nov 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-0.5.rc091129
 - 2.5.0 rc 091129
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- sources	29 Nov 2009 15:59:22 -0000	1.413
+++ sources	6 Dec 2009 14:48:29 -0000	1.414
@@ -1 +1 @@
-b1e6147fd02a69bf2e32440b8de227b0  jd-2.5.0-rc091129.tgz
+a9775428a2b33c471ca60cf56bae6c5c  jd-2.5.0-091206.tgz



From mtasaka at fedoraproject.org  Sun Dec  6 14:48:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 14:48:30 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.401, 1.402 jd.spec, 1.464, 1.465 sources,
	1.402, 1.403
Message-ID: <20091206144830.3862D11C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20356/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
- 2.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- .cvsignore	29 Nov 2009 15:59:22 -0000	1.401
+++ .cvsignore	6 Dec 2009 14:48:29 -0000	1.402
@@ -1 +1 @@
-jd-2.5.0-rc091129.tgz
+jd-2.5.0-091206.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -p -r1.464 -r1.465
--- jd.spec	29 Nov 2009 15:59:22 -0000	1.464
+++ jd.spec	6 Dec 2009 14:48:29 -0000	1.465
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        rc091129
-%define         repoid        44658
+%define         strtag        091206
+%define         repoid        44788
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
+- 2.5.0
+
 * Mon Nov 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-0.5.rc091129
 - 2.5.0 rc 091129
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- sources	29 Nov 2009 15:59:22 -0000	1.402
+++ sources	6 Dec 2009 14:48:30 -0000	1.403
@@ -1 +1 @@
-b1e6147fd02a69bf2e32440b8de227b0  jd-2.5.0-rc091129.tgz
+a9775428a2b33c471ca60cf56bae6c5c  jd-2.5.0-091206.tgz



From rathann at fedoraproject.org  Sun Dec  6 15:05:51 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun,  6 Dec 2009 15:05:51 +0000 (UTC)
Subject: rpms/mnemosyne/F-11 .cvsignore, 1.3, 1.4 mnemosyne.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091206150551.8CFF111C00E0@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25738

Modified Files:
	.cvsignore mnemosyne.spec sources 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2.1-1
- updated to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Jan 2009 00:28:15 -0000	1.3
+++ .cvsignore	6 Dec 2009 15:05:51 -0000	1.4
@@ -1 +1 @@
-mnemosyne-1.2-r1.tgz
+mnemosyne-1.2.1.tgz


Index: mnemosyne.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-11/mnemosyne.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mnemosyne.spec	26 Feb 2009 01:49:26 -0000	1.3
+++ mnemosyne.spec	6 Dec 2009 15:05:51 -0000	1.4
@@ -2,16 +2,17 @@
 
 Name:		mnemosyne
 Summary:	Flash-card learning tool
-Version:	1.2
-Release:	2.r1%{?dist}
+Version:	1.2.1
+Release:	1%{?dist}
 URL:		http://www.mnemosyne-proj.org/
-Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
+Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}.tgz
 Patch0:		%{name}-desktop.patch
 License:	GPLv2+
 Group:		Amusements/Games
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	desktop-file-utils
-BuildRequires:	python-setuptools-devel
+BuildRequires:	python-devel
+BuildRequires:	python-setuptools
 BuildArch:	noarch
 Requires:	hicolor-icon-theme
 Requires:	pygame
@@ -72,6 +73,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2.1-1
+- updated to 1.2.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2.r1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Jan 2009 00:28:15 -0000	1.3
+++ sources	6 Dec 2009 15:05:51 -0000	1.4
@@ -1 +1 @@
-156f9e80352ea1012ea707bcbeaf2cfb  mnemosyne-1.2-r1.tgz
+0640f5d45eec102b68da77c815cc1b29  mnemosyne-1.2.1.tgz



From terjeros at fedoraproject.org  Sun Dec  6 15:09:00 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 15:09:00 +0000 (UTC)
Subject: File djview4-4.5.tar.gz uploaded to lookaside cache by terjeros
Message-ID: <20091206150900.7582310F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for djview4:

0461a26dbcac33dcc5eb7955ac357504  djview4-4.5.tar.gz



From rishi at fedoraproject.org  Sun Dec  6 15:09:13 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun,  6 Dec 2009 15:09:13 +0000 (UTC)
Subject: rpms/libopenraw/devel .cvsignore, 1.5, 1.6 libopenraw.spec, 1.10,
	1.11 sources, 1.5, 1.6 libopenraw-0.0.5-includes.patch, 1.1, NONE
Message-ID: <20091206150913.142DF11C00E0@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libopenraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26825

Modified Files:
	.cvsignore libopenraw.spec sources 
Removed Files:
	libopenraw-0.0.5-includes.patch 
Log Message:
* Sat Dec 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.0.8-1
- Version bump to 0.0.8.
  * Fixed a huge memory leak. (FreeDesktop Bugzilla #21435)
  * cfa output should write the data in PGM as big endian.
  * Better handling of Canon CR2 "slices" to fix crasher with Canon
    450D/Digital Rebel XSi files (and possibly others).
  * Added new API or_rawfile_new_from_memory() to load a Raw file from a
    memory buffer.
  * Added new API or_rawfile_get_typeid() and the associated consts.
  * Added new API or_rawdata_get_minmax().
  * Added new API or_get_file_extensions().
  * Added new API or_rawfile_get_rendered_image() to get a rendered image.
  * Added new API or_bitmapdata_*().
  * New GdkPixbuf loader.
  * Decompress NEF files.
- License changed to LGPLv3 or later.
- Missing includes fixed by upstream.
- Replaced 'BuildRequires: chrpath glib2-devel' with 'BuildRequires:
  exempi-devel libcurl-devel'.
- Added 'Requires: gtk2' to pixbuf-loader for directory ownership.
- Added a %check stanza.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libopenraw/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Mar 2008 07:16:38 -0000	1.5
+++ .cvsignore	6 Dec 2009 15:09:12 -0000	1.6
@@ -1 +1 @@
-libopenraw-0.0.5.tar.gz
+libopenraw-0.0.8.tar.gz


Index: libopenraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopenraw/devel/libopenraw.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libopenraw.spec	25 Jul 2009 06:17:04 -0000	1.10
+++ libopenraw.spec	6 Dec 2009 15:09:12 -0000	1.11
@@ -1,22 +1,20 @@
-Name:           libopenraw
-Version:        0.0.5
-Release:        4%{?dist}
-Summary:        Decode camera RAW files
-
-Group:          System Environment/Libraries
-License:        LGPLv2+
-URL:            http://%{name}.freedesktop.org/wiki
-Source0:        http://%{name}.freedesktop.org/download/%{name}-%{version}.tar.gz
-Patch0:         libopenraw-0.0.5-includes.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  boost-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  glib2-devel
-BuildRequires:  gtk2-devel
-BuildRequires:  chrpath
-BuildRequires:  libxml2-devel
-
+Summary:	Decode camera RAW files
+Name:		libopenraw
+Version:	0.0.8
+Release:	1%{?dist}
+License:	LGPLv3+
+Group:		System Environment/Libraries
+URL:		http://libopenraw.freedesktop.org/wiki
+Source0:	http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.gz
+
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:	boost-devel
+BuildRequires:	exempi-devel >= 1.99.5
+BuildRequires:	gtk2-devel
+BuildRequires:	libcurl-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	libxml2-devel
 
 %description
 libopenraw is an ongoing project to provide a free software
@@ -25,107 +23,160 @@ that dcraw is not suited for easy integr
 there is a need for an easy to use API to build free software digital
 image processing application.
 
+%package gnome
+Summary:	GUI components of %{name}
+Group:		System Environment/Libraries
 
-%package        gnome
-Summary:        GUI components of %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
-%description    gnome 
+%description gnome 
 The %{name}-gnome package contains gui components of %{name}.
 
+%package devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries
 
-%package        devel
-Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
 
-%description    devel
+%description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-
-%package        gnome-devel
-Summary:        Development files for %{name}-gnome
-Group:          Development/Libraries
-Requires:       %{name}-gnome = %{version}-%{release}
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       pkgconfig
+%package gnome-devel
+Summary:	Development files for %{name}-gnome
+Group:		Development/Libraries
+
+Requires:	%{name}-gnome = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	pkgconfig
 
 %description    gnome-devel
 The %{name}-gnome-devel package contains libraries and header files for
 developing applications that use %{name}-gnome.
 
+%package pixbuf-loader
+Summary:	RAW image loader for GTK+ applications
+Group:		System Environment/Libraries
+
+Requires:	gtk2
+Requires:	%{name} = %{version}-%{release}
+Requires(post):	gtk2
+Requires(postun): gtk2
+
+%description pixbuf-loader
+%{name}-pixbuf-loader contains a plugin to load RAW images, as created by
+digital cameras, in GTK+ applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
-
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-gnome
+
+# Omit unused direct shared library dependencies.
+sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
+
 make %{?_smp_mflags}
 
+%check
+make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-chrpath --delete $RPM_BUILD_ROOT/%{_libdir}/libopenrawgnome.so.1.4.0
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %post gnome -p /sbin/ldconfig
+
 %postun gnome -p /sbin/ldconfig
 
+%post pixbuf-loader
+/usr/bin/update-gdk-pixbuf-loaders %{_target_platform}
+
+%postun pixbuf-loader
+if [ $1 = 0 ]; then 
+  /usr/bin/update-gdk-pixbuf-loaders %{_target_platform}
+fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO 
+%doc AUTHORS
+%doc ChangeLog
+%doc COPYING
+%doc NEWS
+%doc README
+%doc TODO 
 %{_libdir}/%{name}.so.*
 
-
 %files gnome
 %defattr(-,root,root,-)
 %{_libdir}/%{name}gnome.so.*
 
-
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/%{name}-1.0
-%{_includedir}/%{name}-1.0/%{name}
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}-1.0.pc
 
+%dir %{_includedir}/%{name}-1.0
+%{_includedir}/%{name}-1.0/%{name}/*.h
 
 %files gnome-devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}-1.0/%{name}-gnome
 %{_libdir}/%{name}gnome.so
 %{_libdir}/pkgconfig/%{name}-gnome-1.0.pc
 
+%dir %{_includedir}/%{name}-1.0/%{name}-gnome
+%{_includedir}/%{name}-1.0/%{name}-gnome/gdkpixbuf.h
+
+%files pixbuf-loader
+%defattr(-,root,root,-)
+%{_libdir}/gtk-2.0/2.10.0/loaders/%{name}_pixbuf.so
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sat Dec 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.0.8-1
+- Version bump to 0.0.8.
+  * Fixed a huge memory leak. (FreeDesktop Bugzilla #21435)
+  * cfa output should write the data in PGM as big endian.
+  * Better handling of Canon CR2 "slices" to fix crasher with Canon
+    450D/Digital Rebel XSi files (and possibly others).
+  * Added new API or_rawfile_new_from_memory() to load a Raw file from a
+    memory buffer.
+  * Added new API or_rawfile_get_typeid() and the associated consts.
+  * Added new API or_rawdata_get_minmax().
+  * Added new API or_get_file_extensions().
+  * Added new API or_rawfile_get_rendered_image() to get a rendered image.
+  * Added new API or_bitmapdata_*().
+  * New GdkPixbuf loader.
+  * Decompress NEF files.
+- License changed to LGPLv3 or later.
+- Missing includes fixed by upstream.
+- Replaced 'BuildRequires: chrpath glib2-devel' with 'BuildRequires:
+  exempi-devel libcurl-devel'.
+- Added 'Requires: gtk2' to pixbuf-loader for directory ownership.
+- Added a %%check stanza.
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.0.5-4
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Feb 25 2009 Caol?n McNamara <caolanm at redhat.com> - 0.0.5-3
 - add stdio.h for fopen and friends
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Feb 25 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.0.5-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Mar 04 2008 Trond Danielsen <trond.danielsen at gmail.com> - 0.0.5-1
 - New upstream version.
 
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.0.4-3
+* Wed Feb 20 2008 Release Engineering <rel-eng at fedoraproject.org> - 0.0.4-3
 - Autorebuild for GCC 4.3
 
 * Wed Jan 30 2008 Trond Danielsen <trond.danielsen at gmail.com> - 0.0.4-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libopenraw/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Mar 2008 07:16:38 -0000	1.5
+++ sources	6 Dec 2009 15:09:12 -0000	1.6
@@ -1 +1 @@
-90f9038cc6b47374ea1dd9aa347dfe5a  libopenraw-0.0.5.tar.gz
+fc26f146586a4b601326130bce6ffd88  libopenraw-0.0.8.tar.gz


--- libopenraw-0.0.5-includes.patch DELETED ---



From terjeros at fedoraproject.org  Sun Dec  6 15:09:43 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 15:09:43 +0000 (UTC)
Subject: rpms/djview4/devel .cvsignore, 1.3, 1.4 djview4.spec, 1.5,
	1.6 sources, 1.3, 1.4 djview4-4.3-desktop.patch, 1.1, NONE
Message-ID: <20091206150943.E752811C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/djview4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27069

Modified Files:
	.cvsignore djview4.spec sources 
Removed Files:
	djview4-4.3-desktop.patch 
Log Message:
* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.5-1
- 4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/djview4/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Feb 2009 09:54:39 -0000	1.3
+++ .cvsignore	6 Dec 2009 15:09:43 -0000	1.4
@@ -1 +1 @@
-djview4-4.4.tar.gz
+djview4-4.5.tar.gz


Index: djview4.spec
===================================================================
RCS file: /cvs/extras/rpms/djview4/devel/djview4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- djview4.spec	24 Jul 2009 20:21:56 -0000	1.5
+++ djview4.spec	6 Dec 2009 15:09:43 -0000	1.6
@@ -1,12 +1,11 @@
 Summary:       DjVu viewer
 Name:          djview4
-Version:       4.4
-Release:       3%{?dist}
+Version:       4.5
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Publishing
 URL:           http://djvu.sourceforge.net/djview4.html
 Source:        http://downloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz
-Patch:         djview4-4.3-desktop.patch
 BuildRequires: qt4-devel >= 4.2 djvulibre-devel >= 3.5.19 desktop-file-utils
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,7 +22,7 @@ It's based on DjVuLibre and Qt4.
 
 %prep
 %setup -q
-%patch -p1
+%{__sed} -i -e '1 d' desktopfiles/djvulibre-djview4.desktop
 
 %build
 QTDIR=%{_libdir}/qt4 QMAKE=qmake-qt4 %configure
@@ -70,6 +69,9 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/djvulibre-%{name}.png
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.5-1
+- 4.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/djview4/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Feb 2009 09:54:39 -0000	1.3
+++ sources	6 Dec 2009 15:09:43 -0000	1.4
@@ -1 +1 @@
-466225c5546aed90008d612cdb490a4e  djview4-4.4.tar.gz
+0461a26dbcac33dcc5eb7955ac357504  djview4-4.5.tar.gz


--- djview4-4.3-desktop.patch DELETED ---



From terjeros at fedoraproject.org  Sun Dec  6 15:11:35 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 15:11:35 +0000 (UTC)
Subject: rpms/djview4/F-11 .cvsignore, 1.3, 1.4 djview4.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20091206151135.4B6D211C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/djview4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27629/F-11

Modified Files:
	.cvsignore djview4.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/djview4/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Feb 2009 09:54:39 -0000	1.3
+++ .cvsignore	6 Dec 2009 15:11:34 -0000	1.4
@@ -1 +1 @@
-djview4-4.4.tar.gz
+djview4-4.5.tar.gz


Index: djview4.spec
===================================================================
RCS file: /cvs/extras/rpms/djview4/F-11/djview4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- djview4.spec	24 Feb 2009 12:04:33 -0000	1.4
+++ djview4.spec	6 Dec 2009 15:11:35 -0000	1.5
@@ -1,12 +1,11 @@
 Summary:       DjVu viewer
 Name:          djview4
-Version:       4.4
-Release:       2%{?dist}
+Version:       4.5
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Publishing
 URL:           http://djvu.sourceforge.net/djview4.html
 Source:        http://downloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz
-Patch:         djview4-4.3-desktop.patch
 BuildRequires: qt4-devel >= 4.2 djvulibre-devel >= 3.5.19 desktop-file-utils
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,7 +22,7 @@ It's based on DjVuLibre and Qt4.
 
 %prep
 %setup -q
-%patch -p1
+%{__sed} -i -e '1 d' desktopfiles/djvulibre-djview4.desktop
 
 %build
 QTDIR=%{_libdir}/qt4 QMAKE=qmake-qt4 %configure
@@ -70,6 +69,12 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/djvulibre-%{name}.png
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.5-1
+- 4.5
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/djview4/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Feb 2009 09:54:39 -0000	1.3
+++ sources	6 Dec 2009 15:11:35 -0000	1.4
@@ -1 +1 @@
-466225c5546aed90008d612cdb490a4e  djview4-4.4.tar.gz
+0461a26dbcac33dcc5eb7955ac357504  djview4-4.5.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 15:11:35 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 15:11:35 +0000 (UTC)
Subject: rpms/djview4/F-12 .cvsignore, 1.3, 1.4 djview4.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20091206151135.87A4011C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/djview4/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27629/F-12

Modified Files:
	.cvsignore djview4.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/djview4/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Feb 2009 09:54:39 -0000	1.3
+++ .cvsignore	6 Dec 2009 15:11:35 -0000	1.4
@@ -1 +1 @@
-djview4-4.4.tar.gz
+djview4-4.5.tar.gz


Index: djview4.spec
===================================================================
RCS file: /cvs/extras/rpms/djview4/F-12/djview4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- djview4.spec	24 Jul 2009 20:21:56 -0000	1.5
+++ djview4.spec	6 Dec 2009 15:11:35 -0000	1.6
@@ -1,12 +1,11 @@
 Summary:       DjVu viewer
 Name:          djview4
-Version:       4.4
-Release:       3%{?dist}
+Version:       4.5
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Publishing
 URL:           http://djvu.sourceforge.net/djview4.html
 Source:        http://downloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz
-Patch:         djview4-4.3-desktop.patch
 BuildRequires: qt4-devel >= 4.2 djvulibre-devel >= 3.5.19 desktop-file-utils
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,7 +22,7 @@ It's based on DjVuLibre and Qt4.
 
 %prep
 %setup -q
-%patch -p1
+%{__sed} -i -e '1 d' desktopfiles/djvulibre-djview4.desktop
 
 %build
 QTDIR=%{_libdir}/qt4 QMAKE=qmake-qt4 %configure
@@ -70,6 +69,9 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/djvulibre-%{name}.png
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.5-1
+- 4.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/djview4/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Feb 2009 09:54:39 -0000	1.3
+++ sources	6 Dec 2009 15:11:35 -0000	1.4
@@ -1 +1 @@
-466225c5546aed90008d612cdb490a4e  djview4-4.4.tar.gz
+0461a26dbcac33dcc5eb7955ac357504  djview4-4.5.tar.gz



From pkgdb at fedoraproject.org  Sun Dec  6 15:37:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:37:36 +0000
Subject: [pkgdb] ferm: slankes has given up watchbugzilla
Message-ID: <20091206153736.6419B10F87F@bastion2.fedora.phx.redhat.com>

slankes has given up the watchbugzilla acl on ferm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From pkgdb at fedoraproject.org  Sun Dec  6 15:37:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:37:36 +0000
Subject: [pkgdb] ferm: slankes has given up watchcommits
Message-ID: <20091206153736.CF7E210F891@bastion2.fedora.phx.redhat.com>

slankes has given up the watchcommits acl on ferm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From pkgdb at fedoraproject.org  Sun Dec  6 15:37:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:37:38 +0000
Subject: [pkgdb] ferm: slankes has requested commit
Message-ID: <20091206153738.51A5210F89D@bastion2.fedora.phx.redhat.com>

slankes has requested the commit acl on ferm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From pkgdb at fedoraproject.org  Sun Dec  6 15:37:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:37:59 +0000
Subject: [pkgdb] ferm: slankes has given up watchbugzilla
Message-ID: <20091206153759.78E1F10F89E@bastion2.fedora.phx.redhat.com>

slankes has given up the watchbugzilla acl on ferm (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From pkgdb at fedoraproject.org  Sun Dec  6 15:38:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:38:05 +0000
Subject: [pkgdb] ferm: slankes has requested commit
Message-ID: <20091206153805.DFE4210F890@bastion2.fedora.phx.redhat.com>

slankes has requested the commit acl on ferm (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From pkgdb at fedoraproject.org  Sun Dec  6 15:38:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:38:08 +0000
Subject: [pkgdb] ferm: slankes has given up watchcommits
Message-ID: <20091206153808.52B2710F8A1@bastion2.fedora.phx.redhat.com>

slankes has given up the watchcommits acl on ferm (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From pkgdb at fedoraproject.org  Sun Dec  6 15:38:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:38:13 +0000
Subject: [pkgdb] ferm: slankes has given up watchbugzilla
Message-ID: <20091206153813.EE6E010F89C@bastion2.fedora.phx.redhat.com>

slankes has given up the watchbugzilla acl on ferm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From pkgdb at fedoraproject.org  Sun Dec  6 15:38:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:38:15 +0000
Subject: [pkgdb] ferm: slankes has given up watchcommits
Message-ID: <20091206153815.5E3C310F8A3@bastion2.fedora.phx.redhat.com>

slankes has given up the watchcommits acl on ferm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From pkgdb at fedoraproject.org  Sun Dec  6 15:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 15:38:17 +0000
Subject: [pkgdb] ferm: slankes has requested commit
Message-ID: <20091206153817.8BCC510F8A9@bastion2.fedora.phx.redhat.com>

slankes has requested the commit acl on ferm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ferm



From chkr at fedoraproject.org  Sun Dec  6 15:58:14 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  6 Dec 2009 15:58:14 +0000 (UTC)
Subject: rpms/pianobooster/F-11 .cvsignore, 1.2, 1.3 pianobooster.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20091206155814.CEB3911C00E0@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/pianobooster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8171

Modified Files:
	.cvsignore pianobooster.spec sources 
Log Message:
* Sun Dec 06 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
- Update to new upstream version 0.6.4
- Fix icon permissions



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Apr 2009 20:28:39 -0000	1.2
+++ .cvsignore	6 Dec 2009 15:58:14 -0000	1.3
@@ -1 +1 @@
-pianobooster-src-0.6.2.tgz
+pianobooster-src-0.6.4.tar.gz


Index: pianobooster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-11/pianobooster.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pianobooster.spec	17 Apr 2009 20:28:39 -0000	1.1
+++ pianobooster.spec	6 Dec 2009 15:58:14 -0000	1.2
@@ -1,11 +1,11 @@
 Name:            pianobooster
 Summary:         A MIDI file player that teaches you how to play the piano
-Version:         0.6.2
-Release:         4%{?dist}
+Version:         0.6.4
+Release:         1%{?dist}
 License:         GPLv3+
 Group:           Applications/Multimedia
 URL:             http://pianobooster.sourceforge.net/
-Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tgz
+Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
 Source1:         %{name}.desktop
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:   cmake
@@ -56,9 +56,9 @@ desktop-file-install \
 
 
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -m 644 -p src/images/Logo32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-install -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -m 644 -p src/images/logo64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -83,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Dec 06 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
+- Update to new upstream version 0.6.4
+- Fix icon permissions
+
 * Fri Apr 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.2-4
 - preserve timestamps of README.txt and license.txt
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Apr 2009 20:28:39 -0000	1.2
+++ sources	6 Dec 2009 15:58:14 -0000	1.3
@@ -1 +1 @@
-b644305e706721af1cba0debcb4390e2  pianobooster-src-0.6.2.tgz
+af1bb513c93ac7b1c8cc919b60146d1c  pianobooster-src-0.6.4.tar.gz



From danielsmw at fedoraproject.org  Sun Dec  6 16:00:24 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Sun,  6 Dec 2009 16:00:24 +0000 (UTC)
Subject: rpms/xinha/F-12 xinha.spec,1.1,1.2
Message-ID: <20091206160024.8A8E311C03FC@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8982

Modified Files:
	xinha.spec 
Log Message:
Bump release for missed tag



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-12/xinha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xinha.spec	2 Dec 2009 23:55:38 -0000	1.1
+++ xinha.spec	6 Dec 2009 16:00:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xinha
 Version:	0.96
-Release:	0.1.b2
+Release:	0.1.b2%{?dist}.1
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages



From danielsmw at fedoraproject.org  Sun Dec  6 16:07:04 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Sun,  6 Dec 2009 16:07:04 +0000 (UTC)
Subject: rpms/xinha/F-12 xinha.spec,1.2,1.3
Message-ID: <20091206160704.8CE3F11C00E0@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11089

Modified Files:
	xinha.spec 
Log Message:
Corrected Source0 line.



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-12/xinha.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xinha.spec	6 Dec 2009 16:00:24 -0000	1.2
+++ xinha.spec	6 Dec 2009 16:07:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xinha
 Version:	0.96
-Release:	0.1.b2%{?dist}.1
+Release:	0.1.b2%{?dist}.2
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages
@@ -13,7 +13,7 @@ URL:		http://www.xinha.org
 #  svn export -r 1191 http://svn.xinha.org/trunk %{name}-%{version}-%{release}
 #  tar -czf %{name}-%{version}-%{release}.tar.gz %{name}-%{version}-%{release}/*
 
-Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{release}.tar.gz
+Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-0.1.b2.tar.gz
 Source1:	xinha.conf
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)



From danielsmw at fedoraproject.org  Sun Dec  6 16:18:38 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Sun,  6 Dec 2009 16:18:38 +0000 (UTC)
Subject: rpms/xinha/F-12 xinha.spec,1.3,1.4
Message-ID: <20091206161838.EB54711C00E0@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14683

Modified Files:
	xinha.spec 
Log Message:
Changed release tag to alphatag throughout



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-12/xinha.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xinha.spec	6 Dec 2009 16:07:04 -0000	1.3
+++ xinha.spec	6 Dec 2009 16:18:37 -0000	1.4
@@ -1,3 +1,5 @@
+%global alphatag 0.1.b2
+
 Name:		xinha
 Version:	0.96
 Release:	0.1.b2%{?dist}.2
@@ -13,7 +15,7 @@ URL:		http://www.xinha.org
 #  svn export -r 1191 http://svn.xinha.org/trunk %{name}-%{version}-%{release}
 #  tar -czf %{name}-%{version}-%{release}.tar.gz %{name}-%{version}-%{release}/*
 
-Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-0.1.b2.tar.gz
+Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{alphatag}.tar.gz
 Source1:	xinha.conf
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -34,33 +36,33 @@ HTML. It can be used on its own or as pa
 Scribite.
 
 %prep
-%setup -q -c -n %{name}-%{version}-%{release} -a 0
+%setup -q -c -n %{name}-%{version}-%{alphatag} -a 0
 cp -p %SOURCE1 .
 
 # Remove precompiled binaries and other illegal files
-find %{name}-%{version}-%{release} | grep \.jar$ | xargs rm
-find %{name}-%{version}-%{release} | grep \.htaccess$ | xargs rm
+find %{name}-%{version}-%{alphatag} | grep \.jar$ | xargs rm
+find %{name}-%{version}-%{alphatag} | grep \.htaccess$ | xargs rm
 
 # Fix permissions on non-executables
-find %{name}-%{version}-%{release} | grep \.js$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.php$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.css$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.html$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.svg$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.js$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.php$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.css$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.html$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.svg$ | xargs chmod a-x
 
 # Remove plugins that contain unresolvable dependecies
-rm -rf %{name}-%{version}-%{release}/plugins/ImageManager/
-rm -rf %{name}-%{version}-%{release}/plugins/ExtendedFileManager/
-rm -rf %{name}-%{version}-%{release}/unsupported_plugins/
-rm -rf %{name}-%{version}-%{release}/contrib/
+rm -rf %{name}-%{version}-%{alphatag}/plugins/ImageManager/
+rm -rf %{name}-%{version}-%{alphatag}/plugins/ExtendedFileManager/
+rm -rf %{name}-%{version}-%{alphatag}/unsupported_plugins/
+rm -rf %{name}-%{version}-%{alphatag}/contrib/
 
 # Remove carriage returns
-cat %{name}-%{version}-%{release}/skins/inditreuse/README | tr -d "\r \n" > README.unix
-mv README.unix %{name}-%{version}-%{release}/skins/inditreuse/README
-cat %{name}-%{version}-%{release}/license.txt| tr -d "\r \n" > license.unix
-mv license.unix %{name}-%{version}-%{release}/license.txt
-cat %{name}-%{version}-%{release}/skins/titan/README | tr -d "\r \n" > README.unix
-mv README.unix %{name}-%{version}-%{release}/skins/titan/README
+cat %{name}-%{version}-%{alphatag}/skins/inditreuse/README | tr -d "\r \n" > README.unix
+mv README.unix %{name}-%{version}-%{alphatag}/skins/inditreuse/README
+cat %{name}-%{version}-%{alphatag}/license.txt| tr -d "\r \n" > license.unix
+mv license.unix %{name}-%{version}-%{alphatag}/license.txt
+cat %{name}-%{version}-%{alphatag}/skins/titan/README | tr -d "\r \n" > README.unix
+mv README.unix %{name}-%{version}-%{alphatag}/skins/titan/README
 
 
 # Organize the documentation files into folders. We can't just
@@ -72,31 +74,31 @@ mkdir doc/inditreuse-skin doc/titan-skin
 mkdir doc/InsertSmiley doc/SmartReplace doc/Equation doc/SpellChecker
 mkdir doc/SaveSubmit doc/FormOperations doc/InsertSnippet doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/license.txt doc
-mv %{name}-%{version}-%{release}/release-notes.txt doc
-mv %{name}-%{version}-%{release}/XinhaLoader_readme.txt doc
-
-mv %{name}-%{version}-%{release}/images/tango/COPYING doc/tango-images
-
-mv %{name}-%{version}-%{release}/iconsets/Tango/LICENSE doc/tango-icons
-mv %{name}-%{version}-%{release}/iconsets/Tango/README doc/tango-icons
-mv %{name}-%{version}-%{release}/iconsets/Crystal/LICENSE doc/crystal-icons
-mv %{name}-%{version}-%{release}/iconsets/Crystal/README doc/crystal-icons
-
-mv %{name}-%{version}-%{release}/skins/inditreuse/README doc/inditreuse-skin
-mv %{name}-%{version}-%{release}/skins/titan/README doc/titan-skin
-
-mv %{name}-%{version}-%{release}/plugins/InsertSmiley/README.txt doc/InsertSmiley
-mv %{name}-%{version}-%{release}/plugins/SmartReplace/readme.txt doc/SmartReplace
-mv %{name}-%{version}-%{release}/plugins/Equation/readme.txt doc/Equation
-mv %{name}-%{version}-%{release}/plugins/SpellChecker/README doc/SpellChecker
-mv %{name}-%{version}-%{release}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
-mv %{name}-%{version}-%{release}/plugins/SaveSubmit/README.txt doc/SaveSubmit
-mv %{name}-%{version}-%{release}/plugins/FormOperations/README doc/FormOperations
-mv %{name}-%{version}-%{release}/plugins/InsertSnippet/readme.html doc/InsertSnippet
-mv %{name}-%{version}-%{release}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
+mv %{name}-%{version}-%{alphatag}/license.txt doc
+mv %{name}-%{version}-%{alphatag}/release-notes.txt doc
+mv %{name}-%{version}-%{alphatag}/XinhaLoader_readme.txt doc
+
+mv %{name}-%{version}-%{alphatag}/images/tango/COPYING doc/tango-images
+
+mv %{name}-%{version}-%{alphatag}/iconsets/Tango/LICENSE doc/tango-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Tango/README doc/tango-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/LICENSE doc/crystal-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/README doc/crystal-icons
+
+mv %{name}-%{version}-%{alphatag}/skins/inditreuse/README doc/inditreuse-skin
+mv %{name}-%{version}-%{alphatag}/skins/titan/README doc/titan-skin
+
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSmiley/README.txt doc/InsertSmiley
+mv %{name}-%{version}-%{alphatag}/plugins/SmartReplace/readme.txt doc/SmartReplace
+mv %{name}-%{version}-%{alphatag}/plugins/Equation/readme.txt doc/Equation
+mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/README doc/SpellChecker
+mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
+mv %{name}-%{version}-%{alphatag}/plugins/SaveSubmit/README.txt doc/SaveSubmit
+mv %{name}-%{version}-%{alphatag}/plugins/FormOperations/README doc/FormOperations
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet/readme.html doc/InsertSnippet
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/examples doc/examples
+mv %{name}-%{version}-%{alphatag}/examples doc/examples
 
 %build
 
@@ -109,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # Create the directory (if not already there) where js is supposed to go
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/js
-cp -a %{name}-%{version}-%{release} $RPM_BUILD_ROOT%{_datadir}/js/
+cp -a %{name}-%{version}-%{alphatag} $RPM_BUILD_ROOT%{_datadir}/js/
 
 # Create conf.d, if it's not there already, and copy over our .conf file
 mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
@@ -120,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/js/%{name}-%{version}-%{release}
+%{_datadir}/js/%{name}-%{version}-%{alphatag}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 # Install documentation



From danielsmw at fedoraproject.org  Sun Dec  6 16:21:52 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Sun,  6 Dec 2009 16:21:52 +0000 (UTC)
Subject: rpms/xinha/F-12 xinha.spec,1.4,1.5
Message-ID: <20091206162152.A062D11C00E0@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15580

Modified Files:
	xinha.spec 
Log Message:
Updated changelog and some build tags in xinha.spec



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-12/xinha.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xinha.spec	6 Dec 2009 16:18:37 -0000	1.4
+++ xinha.spec	6 Dec 2009 16:21:52 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		xinha
 Version:	0.96
-Release:	0.1.b2%{?dist}.2
+Release:	0.1.b2%{?dist}.3
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages
@@ -137,5 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 # a better protocol for doing so.
 
 %changelog
+* Sun Dec 6 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2.3
+- Updated some tags to make cvs and building work, and updated with dist tag.
 * Mon Oct 19 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2
 - Spec file submission (initial package creation) 



From terjeros at fedoraproject.org  Sun Dec  6 16:28:17 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 16:28:17 +0000 (UTC)
Subject: File pyinotify-0.8.8.tar.gz uploaded to lookaside cache by terjeros
Message-ID: <20091206162817.B2B3410F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-inotify:

3c4214f10955e6be0ac2d054efa55cf8  pyinotify-0.8.8.tar.gz



From ausil at fedoraproject.org  Sun Dec  6 16:28:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sun,  6 Dec 2009 16:28:33 +0000 (UTC)
Subject: rpms/koji/EL-5 0001-soft-dependencies-for-livecd-code.patch, NONE, 
	1.1 koji.spec, 1.9, 1.10
Message-ID: <20091206162833.73B1F11C00E0@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/koji/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17441

Modified Files:
	koji.spec 
Added Files:
	0001-soft-dependencies-for-livecd-code.patch 
Log Message:
add patch to make livcd optional. the pykickstart in rhel5 is too old to work


0001-soft-dependencies-for-livecd-code.patch:
 builder/kojid |   21 +++++++++++++++++----
 koji.spec     |    3 ---
 2 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE 0001-soft-dependencies-for-livecd-code.patch ---
>From 43af4add203e01803f32c4847e0a79afc16916e5 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem at redhat.com>
Date: Thu, 3 Dec 2009 15:52:23 -0500
Subject: [PATCH 1/2] soft dependencies for livecd code

---
 builder/kojid |   21 +++++++++++++++++----
 koji.spec     |    2 --
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/builder/kojid b/builder/kojid
index 8e2ea80..af81534 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -58,10 +58,18 @@ from gzip import GzipFile
 from optparse import OptionParser
 from StringIO import StringIO
 from xmlrpclib import Fault
-import pykickstart.parser as ksparser
-import pykickstart.handlers.control as kscontrol
-import hashlib
-import iso9660 # from pycdio
+
+#imports for LiveCD handler
+livecd_enabled = False
+try:
+    import pykickstart.parser as ksparser
+    import pykickstart.handlers.control as kscontrol
+    import hashlib
+    import iso9660 # from pycdio
+    livecd_enabled = True
+except ImportError:
+    pass
+
 
 # our private modules
 sys.path.insert(0, '/usr/share/koji-builder/lib')
@@ -2181,6 +2189,11 @@ class LiveCDTask(BaseTaskHandler):
         if not opts:
             opts = {}
 
+        if not livecd_enabled:
+            self.logger.error("LiveCD features require the following dependencies: "
+                    "pykickstart, pycdio, and possibly python-hashlib")
+            raise koji.LiveCDError, 'LiveCD functions not available'
+
         global options
         target_info = session.getBuildTarget(target, strict=True)
         build_tag = target_info['build_tag']
diff --git a/koji.spec b/koji.spec
index 6eada73..7899e8c 100644
--- a/koji.spec
+++ b/koji.spec
@@ -68,8 +68,6 @@ Requires: /usr/bin/svn
 Requires: /usr/bin/git
 Requires: rpm-build
 Requires: redhat-rpm-config
-Requires: pykickstart
-Requires: pycdio
 %if 0%{?rhel} >= 5
 Requires: createrepo >= 0.4.11-2
 %endif
-- 
1.6.5.2



Index: koji.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koji/EL-5/koji.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- koji.spec	20 Nov 2009 19:20:55 -0000	1.9
+++ koji.spec	6 Dec 2009 16:28:33 -0000	1.10
@@ -2,12 +2,14 @@
 
 Name: koji
 Version: 1.3.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: LGPLv2
 Summary: Build system tools
 Group: Applications/System
 URL: http://fedorahosted.org/koji
+#customises koji for Fedora's koji
 Patch0: fedora-config.patch
+Patch1: 0001-soft-dependencies-for-livecd-code.patch
 Source: https://fedorahosted.org/koji/attachment/wiki/KojiRelease/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -58,10 +60,10 @@ Requires: /usr/bin/svn
 Requires: /usr/bin/git
 Requires: rpm-build
 Requires: redhat-rpm-config
-Requires: pykickstart                                                                               
-Requires: pycdio   
 %if 0%{?fedora}
 Requires: createrepo >= 0.9.6
+Requires: pykickstart                                                                               
+Requires: pycdio   
 %endif
 %if 0%{?rhel}
 Requires: python-createrepo >= 0.9.6
@@ -181,6 +183,9 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Sun Dec 06 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.2-1.1
+- add patch to make livecd support optional. the pykickstart in RHEL 5 is too old
+
 * Fri Nov 20 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.2-1
 - update to 1.3.2
 



From terjeros at fedoraproject.org  Sun Dec  6 16:28:59 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 16:28:59 +0000 (UTC)
Subject: rpms/python-inotify/devel .cvsignore, 1.7, 1.8 python-inotify.spec, 
	1.13, 1.14 sources, 1.8, 1.9
Message-ID: <20091206162859.F419D11C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-inotify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17773

Modified Files:
	.cvsignore python-inotify.spec sources 
Log Message:
* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.8.8-1
- 0.8.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 May 2009 09:11:23 -0000	1.7
+++ .cvsignore	6 Dec 2009 16:28:59 -0000	1.8
@@ -1 +1 @@
-pyinotify-0.8.6-20090518.tar.bz2
+pyinotify-0.8.8.tar.gz


Index: python-inotify.spec
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/devel/python-inotify.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-inotify.spec	26 Jul 2009 20:28:32 -0000	1.13
+++ python-inotify.spec	6 Dec 2009 16:28:59 -0000	1.14
@@ -1,21 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
 
-%define oname  pyinotify
-%define git    affbbb02
-%define date   20090518
+%global oname  pyinotify
 
 Summary:       Monitor filesystem events with Python under Linux
 Name:          python-inotify
-Version:       0.8.6
-Release:       2.git%{date}%{?dist}
+Version:       0.8.8
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Development/Libraries
 URL:           http://trac.dbzteam.org/pyinotify
-# Tarball created by
-# $ git clone http://git.dbzteam.org/pyinotify.git/
-# $ cd pyinotify
-# $ git-archive --format=tar --prefix=%{oname}-%{version}/ %{gitver} | bzip2 > %{oname}-%{version}-%{date}.tar.bz2 
-Source0:       %{oname}-%{version}-%{date}.tar.bz2
+Source0:       http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-%{version}.tar.gz
 Source1:       %{oname}
 BuildRequires: python-devel
 BuildArch:     noarch
@@ -38,9 +32,9 @@ This package includes some examples usag
 extensive documentation is also included.
 
 %prep
-%setup -q -n %{oname}-%{version}
+%setup -q -n %{oname}
 
-for f in ChangeLog ; do
+for f in ChangeLog_old ; do
     mv $f $f.iso88591
     iconv -o $f -f iso88591 -t utf8 $f.iso88591
     rm -f $f.iso88591
@@ -53,8 +47,8 @@ done
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 %{__install} -d %{buildroot}%{_datadir}/%{name}
-%{__cp} -a loop.py chain.py daemon.py loop.py not_quiet.py stats.py \
-    stats_threaded.py transient_file.py %{buildroot}%{_datadir}/%{name}
+#{__cp} -a loop.py chain.py daemon.py loop.py not_quiet.py stats.py \
+#    stats_threaded.py transient_file.py %{buildroot}%{_datadir}/%{name}
 %{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}%{_bindir}/%{oname}
 %{__chmod} 0755 %{buildroot}%{python_sitelib}/%{oname}.py
 
@@ -63,7 +57,7 @@ done
 
 %files
 %defattr(-, root, root, -)
-%doc ChangeLog NEWS
+%doc ChangeLog_old NEWS
 %{python_sitelib}/%{oname}*
 %{_bindir}/%{oname}
 
@@ -73,6 +67,9 @@ done
 %{_datadir}/%{name}
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.8.8-1
+- 0.8.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-2.git20090518
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 May 2009 09:11:23 -0000	1.8
+++ sources	6 Dec 2009 16:28:59 -0000	1.9
@@ -1 +1 @@
-2ef313d58bad2fbdefd6e7378338569b  pyinotify-0.8.6-20090518.tar.bz2
+3c4214f10955e6be0ac2d054efa55cf8  pyinotify-0.8.8.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 16:31:18 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 16:31:18 +0000 (UTC)
Subject: rpms/python-inotify/F-11 .cvsignore, 1.7, 1.8 python-inotify.spec, 
	1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20091206163118.2148111C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-inotify/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18445/F-11

Modified Files:
	.cvsignore python-inotify.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 May 2009 11:32:19 -0000	1.7
+++ .cvsignore	6 Dec 2009 16:31:17 -0000	1.8
@@ -1 +1 @@
-pyinotify-0.8.6-20090518.tar.bz2
+pyinotify-0.8.8.tar.gz


Index: python-inotify.spec
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/F-11/python-inotify.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-inotify.spec	18 May 2009 11:32:19 -0000	1.12
+++ python-inotify.spec	6 Dec 2009 16:31:17 -0000	1.13
@@ -1,21 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
 
-%define oname  pyinotify
-%define git    affbbb02
-%define date   20090518
+%global oname  pyinotify
 
 Summary:       Monitor filesystem events with Python under Linux
 Name:          python-inotify
-Version:       0.8.6
-Release:       1.git%{date}%{?dist}
+Version:       0.8.8
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Development/Libraries
 URL:           http://trac.dbzteam.org/pyinotify
-# Tarball created by
-# $ git clone http://git.dbzteam.org/pyinotify.git/
-# $ cd pyinotify
-# $ git-archive --format=tar --prefix=%{oname}-%{version}/ %{gitver} | bzip2 > %{oname}-%{version}-%{date}.tar.bz2 
-Source0:       %{oname}-%{version}-%{date}.tar.bz2
+Source0:       http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-%{version}.tar.gz
 Source1:       %{oname}
 BuildRequires: python-devel
 BuildArch:     noarch
@@ -38,9 +32,9 @@ This package includes some examples usag
 extensive documentation is also included.
 
 %prep
-%setup -q -n %{oname}-%{version}
+%setup -q -n %{oname}
 
-for f in ChangeLog ; do
+for f in ChangeLog_old ; do
     mv $f $f.iso88591
     iconv -o $f -f iso88591 -t utf8 $f.iso88591
     rm -f $f.iso88591
@@ -53,8 +47,8 @@ done
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 %{__install} -d %{buildroot}%{_datadir}/%{name}
-%{__cp} -a loop.py chain.py daemon.py loop.py not_quiet.py stats.py \
-    stats_threaded.py transient_file.py %{buildroot}%{_datadir}/%{name}
+#{__cp} -a loop.py chain.py daemon.py loop.py not_quiet.py stats.py \
+#    stats_threaded.py transient_file.py %{buildroot}%{_datadir}/%{name}
 %{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}%{_bindir}/%{oname}
 %{__chmod} 0755 %{buildroot}%{python_sitelib}/%{oname}.py
 
@@ -63,7 +57,7 @@ done
 
 %files
 %defattr(-, root, root, -)
-%doc ChangeLog NEWS
+%doc ChangeLog_old NEWS
 %{python_sitelib}/%{oname}*
 %{_bindir}/%{oname}
 
@@ -73,6 +67,12 @@ done
 %{_datadir}/%{name}
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.8.8-1
+- 0.8.8
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-2.git20090518
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 18 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.8.6-1.git20090518
 - Update to latest git, fixing bz #500934.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 May 2009 11:32:19 -0000	1.8
+++ sources	6 Dec 2009 16:31:17 -0000	1.9
@@ -1 +1 @@
-2ef313d58bad2fbdefd6e7378338569b  pyinotify-0.8.6-20090518.tar.bz2
+3c4214f10955e6be0ac2d054efa55cf8  pyinotify-0.8.8.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 16:31:18 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 16:31:18 +0000 (UTC)
Subject: rpms/python-inotify/F-12 .cvsignore, 1.7, 1.8 python-inotify.spec, 
	1.13, 1.14 sources, 1.8, 1.9
Message-ID: <20091206163118.C70B511C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-inotify/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18445/F-12

Modified Files:
	.cvsignore python-inotify.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 May 2009 09:11:23 -0000	1.7
+++ .cvsignore	6 Dec 2009 16:31:18 -0000	1.8
@@ -1 +1 @@
-pyinotify-0.8.6-20090518.tar.bz2
+pyinotify-0.8.8.tar.gz


Index: python-inotify.spec
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/F-12/python-inotify.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-inotify.spec	26 Jul 2009 20:28:32 -0000	1.13
+++ python-inotify.spec	6 Dec 2009 16:31:18 -0000	1.14
@@ -1,21 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
 
-%define oname  pyinotify
-%define git    affbbb02
-%define date   20090518
+%global oname  pyinotify
 
 Summary:       Monitor filesystem events with Python under Linux
 Name:          python-inotify
-Version:       0.8.6
-Release:       2.git%{date}%{?dist}
+Version:       0.8.8
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Development/Libraries
 URL:           http://trac.dbzteam.org/pyinotify
-# Tarball created by
-# $ git clone http://git.dbzteam.org/pyinotify.git/
-# $ cd pyinotify
-# $ git-archive --format=tar --prefix=%{oname}-%{version}/ %{gitver} | bzip2 > %{oname}-%{version}-%{date}.tar.bz2 
-Source0:       %{oname}-%{version}-%{date}.tar.bz2
+Source0:       http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-%{version}.tar.gz
 Source1:       %{oname}
 BuildRequires: python-devel
 BuildArch:     noarch
@@ -38,9 +32,9 @@ This package includes some examples usag
 extensive documentation is also included.
 
 %prep
-%setup -q -n %{oname}-%{version}
+%setup -q -n %{oname}
 
-for f in ChangeLog ; do
+for f in ChangeLog_old ; do
     mv $f $f.iso88591
     iconv -o $f -f iso88591 -t utf8 $f.iso88591
     rm -f $f.iso88591
@@ -53,8 +47,8 @@ done
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 %{__install} -d %{buildroot}%{_datadir}/%{name}
-%{__cp} -a loop.py chain.py daemon.py loop.py not_quiet.py stats.py \
-    stats_threaded.py transient_file.py %{buildroot}%{_datadir}/%{name}
+#{__cp} -a loop.py chain.py daemon.py loop.py not_quiet.py stats.py \
+#    stats_threaded.py transient_file.py %{buildroot}%{_datadir}/%{name}
 %{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}%{_bindir}/%{oname}
 %{__chmod} 0755 %{buildroot}%{python_sitelib}/%{oname}.py
 
@@ -63,7 +57,7 @@ done
 
 %files
 %defattr(-, root, root, -)
-%doc ChangeLog NEWS
+%doc ChangeLog_old NEWS
 %{python_sitelib}/%{oname}*
 %{_bindir}/%{oname}
 
@@ -73,6 +67,9 @@ done
 %{_datadir}/%{name}
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.8.8-1
+- 0.8.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-2.git20090518
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-inotify/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 May 2009 09:11:23 -0000	1.8
+++ sources	6 Dec 2009 16:31:18 -0000	1.9
@@ -1 +1 @@
-2ef313d58bad2fbdefd6e7378338569b  pyinotify-0.8.6-20090518.tar.bz2
+3c4214f10955e6be0ac2d054efa55cf8  pyinotify-0.8.8.tar.gz



From danielsmw at fedoraproject.org  Sun Dec  6 16:47:03 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Sun,  6 Dec 2009 16:47:03 +0000 (UTC)
Subject: rpms/xinha/EL-5 xinha.spec,1.1,1.2
Message-ID: <20091206164703.6A70B11C00E0@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22917

Modified Files:
	xinha.spec 
Log Message:
Edited the spec file to use an alpha tag and avoid tag clashing.



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/EL-5/xinha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xinha.spec	8 Nov 2009 18:07:50 -0000	1.1
+++ xinha.spec	6 Dec 2009 16:47:03 -0000	1.2
@@ -1,6 +1,8 @@
+%global alphatag 0.1.b2
+
 Name:		xinha
 Version:	0.96
-Release:	0.1.b2
+Release:	0.1.b2%{?dist}.1
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages
@@ -13,7 +15,7 @@ URL:		http://www.xinha.org
 #  svn export -r 1191 http://svn.xinha.org/trunk %{name}-%{version}-%{release}
 #  tar -czf %{name}-%{version}-%{release}.tar.gz %{name}-%{version}-%{release}/*
 
-Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{release}.tar.gz
+Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{alphatag}.tar.gz
 Source1:	xinha.conf
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -34,33 +36,33 @@ HTML. It can be used on its own or as pa
 Scribite.
 
 %prep
-%setup -q -c -n %{name}-%{version}-%{release} -a 0
+%setup -q -c -n %{name}-%{version}-%{alphatag} -a 0
 cp -p %SOURCE1 .
 
 # Remove precompiled binaries and other illegal files
-find %{name}-%{version}-%{release} | grep \.jar$ | xargs rm
-find %{name}-%{version}-%{release} | grep \.htaccess$ | xargs rm
+find %{name}-%{version}-%{alphatag} | grep \.jar$ | xargs rm
+find %{name}-%{version}-%{alphatag} | grep \.htaccess$ | xargs rm
 
 # Fix permissions on non-executables
-find %{name}-%{version}-%{release} | grep \.js$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.php$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.css$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.html$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.svg$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.js$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.php$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.css$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.html$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.svg$ | xargs chmod a-x
 
 # Remove plugins that contain unresolvable dependecies
-rm -rf %{name}-%{version}-%{release}/plugins/ImageManager/
-rm -rf %{name}-%{version}-%{release}/plugins/ExtendedFileManager/
-rm -rf %{name}-%{version}-%{release}/unsupported_plugins/
-rm -rf %{name}-%{version}-%{release}/contrib/
+rm -rf %{name}-%{version}-%{alphatag}/plugins/ImageManager/
+rm -rf %{name}-%{version}-%{alphatag}/plugins/ExtendedFileManager/
+rm -rf %{name}-%{version}-%{alphatag}/unsupported_plugins/
+rm -rf %{name}-%{version}-%{alphatag}/contrib/
 
 # Remove carriage returns
-cat %{name}-%{version}-%{release}/skins/inditreuse/README | tr -d "\r \n" > README.unix
-mv README.unix %{name}-%{version}-%{release}/skins/inditreuse/README
-cat %{name}-%{version}-%{release}/license.txt| tr -d "\r \n" > license.unix
-mv license.unix %{name}-%{version}-%{release}/license.txt
-cat %{name}-%{version}-%{release}/skins/titan/README | tr -d "\r \n" > README.unix
-mv README.unix %{name}-%{version}-%{release}/skins/titan/README
+cat %{name}-%{version}-%{alphatag}/skins/inditreuse/README | tr -d "\r \n" > README.unix
+mv README.unix %{name}-%{version}-%{alphatag}/skins/inditreuse/README
+cat %{name}-%{version}-%{alphatag}/license.txt| tr -d "\r \n" > license.unix
+mv license.unix %{name}-%{version}-%{alphatag}/license.txt
+cat %{name}-%{version}-%{alphatag}/skins/titan/README | tr -d "\r \n" > README.unix
+mv README.unix %{name}-%{version}-%{alphatag}/skins/titan/README
 
 
 # Organize the documentation files into folders. We can't just
@@ -72,31 +74,31 @@ mkdir doc/inditreuse-skin doc/titan-skin
 mkdir doc/InsertSmiley doc/SmartReplace doc/Equation doc/SpellChecker
 mkdir doc/SaveSubmit doc/FormOperations doc/InsertSnippet doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/license.txt doc
-mv %{name}-%{version}-%{release}/release-notes.txt doc
-mv %{name}-%{version}-%{release}/XinhaLoader_readme.txt doc
-
-mv %{name}-%{version}-%{release}/images/tango/COPYING doc/tango-images
-
-mv %{name}-%{version}-%{release}/iconsets/Tango/LICENSE doc/tango-icons
-mv %{name}-%{version}-%{release}/iconsets/Tango/README doc/tango-icons
-mv %{name}-%{version}-%{release}/iconsets/Crystal/LICENSE doc/crystal-icons
-mv %{name}-%{version}-%{release}/iconsets/Crystal/README doc/crystal-icons
-
-mv %{name}-%{version}-%{release}/skins/inditreuse/README doc/inditreuse-skin
-mv %{name}-%{version}-%{release}/skins/titan/README doc/titan-skin
-
-mv %{name}-%{version}-%{release}/plugins/InsertSmiley/README.txt doc/InsertSmiley
-mv %{name}-%{version}-%{release}/plugins/SmartReplace/readme.txt doc/SmartReplace
-mv %{name}-%{version}-%{release}/plugins/Equation/readme.txt doc/Equation
-mv %{name}-%{version}-%{release}/plugins/SpellChecker/README doc/SpellChecker
-mv %{name}-%{version}-%{release}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
-mv %{name}-%{version}-%{release}/plugins/SaveSubmit/README.txt doc/SaveSubmit
-mv %{name}-%{version}-%{release}/plugins/FormOperations/README doc/FormOperations
-mv %{name}-%{version}-%{release}/plugins/InsertSnippet/readme.html doc/InsertSnippet
-mv %{name}-%{version}-%{release}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
+mv %{name}-%{version}-%{alphatag}/license.txt doc
+mv %{name}-%{version}-%{alphatag}/release-notes.txt doc
+mv %{name}-%{version}-%{alphatag}/XinhaLoader_readme.txt doc
+
+mv %{name}-%{version}-%{alphatag}/images/tango/COPYING doc/tango-images
+
+mv %{name}-%{version}-%{alphatag}/iconsets/Tango/LICENSE doc/tango-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Tango/README doc/tango-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/LICENSE doc/crystal-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/README doc/crystal-icons
+
+mv %{name}-%{version}-%{alphatag}/skins/inditreuse/README doc/inditreuse-skin
+mv %{name}-%{version}-%{alphatag}/skins/titan/README doc/titan-skin
+
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSmiley/README.txt doc/InsertSmiley
+mv %{name}-%{version}-%{alphatag}/plugins/SmartReplace/readme.txt doc/SmartReplace
+mv %{name}-%{version}-%{alphatag}/plugins/Equation/readme.txt doc/Equation
+mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/README doc/SpellChecker
+mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
+mv %{name}-%{version}-%{alphatag}/plugins/SaveSubmit/README.txt doc/SaveSubmit
+mv %{name}-%{version}-%{alphatag}/plugins/FormOperations/README doc/FormOperations
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet/readme.html doc/InsertSnippet
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/examples doc/examples
+mv %{name}-%{version}-%{alphatag}/examples doc/examples
 
 %build
 
@@ -109,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # Create the directory (if not already there) where js is supposed to go
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/js
-cp -a %{name}-%{version}-%{release} $RPM_BUILD_ROOT%{_datadir}/js/
+cp -a %{name}-%{version}-%{alphatag} $RPM_BUILD_ROOT%{_datadir}/js/
 
 # Create conf.d, if it's not there already, and copy over our .conf file
 mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
@@ -120,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/js/%{name}-%{version}-%{release}
+%{_datadir}/js/%{name}-%{version}-%{alphatag}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 # Install documentation
@@ -135,5 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 # a better protocol for doing so.
 
 %changelog
+* Sun Dec 6 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2.1
+- Changed release tag format to add the dist tag and a build number
 * Mon Oct 19 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2
 - Spec file submission (initial package creation) 



From mtasaka at fedoraproject.org  Sun Dec  6 16:57:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 16:57:21 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-10
	rubygem-actionpack-2.1.x-verify-also-text.patch, NONE,
	1.1 rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch,
	NONE, 1.1 rubygem-actionpack.spec, 1.8, 1.9
Message-ID: <20091206165721.365ED11C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26307

Modified Files:
	rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.1.x-verify-also-text.patch 
	rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch 
Log Message:
* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-4
- Fix for potential CSRF protection circumvention (bug 544329)
- Fix for XSS weakness in strip_tags (bug 542786)


rubygem-actionpack-2.1.x-verify-also-text.patch:
 mime_type.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rubygem-actionpack-2.1.x-verify-also-text.patch ---
commit 099a98e9b7108dae3e0f78b207e0a7dc5913bd1a
Author: Michael Koziarski <michael at koziarski.com>
Date:   Sun Nov 16 20:35:25 2008 +0100

    Verify form submissions for text/plain posts too.
    
    Some browsers can POST requests with text/plain encoding, allowing attackers to  potentially subvert the request forgery prevention.
    
    http://pseudo-flaw.net/content/web-browsers/form-data-encoding-roundup/

diff --git a/actionpack/lib/action_controller/mime_type.rb b/actionpack/lib/action_controller/mime_type.rb
index fa123f7..453fc67 100644
--- a/actionpack/lib/action_controller/mime_type.rb
+++ b/actionpack/lib/action_controller/mime_type.rb
@@ -18,7 +18,7 @@ module Mime
   #   end
   class Type
     @@html_types = Set.new [:html, :all]
-    @@unverifiable_types = Set.new [:text, :json, :csv, :xml, :rss, :atom, :yaml]
+    @@unverifiable_types = Set.new [:json, :csv, :xml, :rss, :atom, :yaml]
     cattr_reader :html_types, :unverifiable_types
 
     # A simple helper class used in parsing the accept header

rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch:
 node.rb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch ---
>From 785281ade8c2347614525e9aceb5e62c80eec6f8 Mon Sep 17 00:00:00 2001
From: Gabe da Silveira <gabe at websaviour.com>
Date: Mon, 16 Nov 2009 21:17:35 -0800
Subject: [PATCH] Make sure strip_tags removes tags which start with a non-printable character

Signed-off-by: Michael Koziarski <michael at koziarski.com>
---
 .../vendor/html-scanner/html/node.rb               |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
index 6c03316..0cd05d8 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -162,7 +162,7 @@ module HTML #:nodoc:
           end
           
           closing = ( scanner.scan(/\//) ? :close : nil )
-          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[\w:-]+/)
+          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[-:\w\x00-\x09\x0b-\x0c\x0e-\x1f]+/)
           name.downcase!
   
           unless closing
index bae0f5c..51baba6 100644
@@ -19,6 +19,7 @@ class SanitizerTest < Test::Unit::TestCase
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <!-- comment --> here.")
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <![CDATA[<section>]]> here.")
     assert_equal "This has an unclosed ", sanitizer.sanitize("This has an unclosed <![CDATA[<section>]] here...")
+    assert_equal "non printable char is a tag", sanitizer.sanitize("<\x07a href='/hello'>non printable char is a tag</a>")
     [nil, '', '   '].each { |blank| assert_equal blank, sanitizer.sanitize(blank) }
   end
 
-- 
1.6.0.1



Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/F-10/rubygem-actionpack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rubygem-actionpack.spec	20 Sep 2009 19:54:09 -0000	1.8
+++ rubygem-actionpack.spec	6 Dec 2009 16:57:21 -0000	1.9
@@ -7,7 +7,7 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -15,6 +15,10 @@ Source0: http://gems.rubyforge.org/gems/
 Patch1: rubygem-actionpack-2.1.2-CVE-2008-5189.patch
 # http://weblog.rubyonrails.org/2009/9/4/xss-vulnerability-in-ruby-on-rails
 Patch2: rubygem-actionpack-2.1.x-CVE-2009-3009.patch
+# bug 544329
+Patch3: rubygem-actionpack-2.1.x-verify-also-text.patch
+# bug 542786
+Patch4: rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
@@ -33,6 +37,8 @@ unit/integration testing that doesn't re
 %setup -q -n %{gemname}-%{version}
 %patch1 -p2
 %patch2 -p2
+%patch3 -p2
+%patch4 -p2
 
 %build
 rake gem
@@ -65,6 +71,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-4
+- Fix for potential CSRF protection circumvention (bug 544329)
+- Fix for XSS weakness in strip_tags (bug 542786)
+
 * Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-3
 - Patch for CVE-2009-3009 (bug 520843)
 



From eponyme at fedoraproject.org  Sun Dec  6 17:00:10 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  6 Dec 2009 17:00:10 +0000 (UTC)
Subject: File abby-0.4.6.1.tar.bz2 uploaded to lookaside cache by eponyme
Message-ID: <20091206170010.9398910F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for abby:

f8ca71a7c4a07b4aa1c51bc1b66d24d7  abby-0.4.6.1.tar.bz2



From eponyme at fedoraproject.org  Sun Dec  6 17:00:46 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  6 Dec 2009 17:00:46 +0000 (UTC)
Subject: rpms/abby/devel .cvsignore, 1.8, 1.9 abby.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <20091206170046.D5E6B11C039C@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27465

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Nov 2009 19:25:16 -0000	1.8
+++ .cvsignore	6 Dec 2009 17:00:45 -0000	1.9
@@ -1 +1 @@
-abby-0.4.5.tar.bz2
+abby-0.4.6.1.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/abby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- abby.spec	28 Nov 2009 19:25:16 -0000	1.9
+++ abby.spec	6 Dec 2009 17:00:45 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.5
+Version:        0.4.6.1
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6.1-1
+- Update to 0.4.6.1
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1
 - Update to 0.4.5
 * Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.4.4-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Nov 2009 19:25:16 -0000	1.8
+++ sources	6 Dec 2009 17:00:45 -0000	1.9
@@ -1 +1 @@
-7ac13b41a5964f9f726d22d66d5d4195  abby-0.4.5.tar.bz2
+f8ca71a7c4a07b4aa1c51bc1b66d24d7  abby-0.4.6.1.tar.bz2



From danielsmw at fedoraproject.org  Sun Dec  6 17:00:46 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Sun,  6 Dec 2009 17:00:46 +0000 (UTC)
Subject: rpms/xinha/F-11 xinha.spec,1.1,1.2
Message-ID: <20091206170046.DD05E11C03DB@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27393

Modified Files:
	xinha.spec 
Log Message:
Edited the release tag with a dist macro and changed usage of release to alphtag throughout.



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-11/xinha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xinha.spec	3 Nov 2009 19:10:07 -0000	1.1
+++ xinha.spec	6 Dec 2009 17:00:46 -0000	1.2
@@ -1,6 +1,8 @@
+%global alphatag 0.1.b2
+
 Name:		xinha
 Version:	0.96
-Release:	0.1.b2
+Release:	0.1.b2%{?dist}.1
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages
@@ -13,7 +15,7 @@ URL:		http://www.xinha.org
 #  svn export -r 1191 http://svn.xinha.org/trunk %{name}-%{version}-%{release}
 #  tar -czf %{name}-%{version}-%{release}.tar.gz %{name}-%{version}-%{release}/*
 
-Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{release}.tar.gz
+Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{alphatag}.tar.gz
 Source1:	xinha.conf
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -34,33 +36,33 @@ HTML. It can be used on its own or as pa
 Scribite.
 
 %prep
-%setup -q -c -n %{name}-%{version}-%{release} -a 0
+%setup -q -c -n %{name}-%{version}-%{alphatag} -a 0
 cp -p %SOURCE1 .
 
 # Remove precompiled binaries and other illegal files
-find %{name}-%{version}-%{release} | grep \.jar$ | xargs rm
-find %{name}-%{version}-%{release} | grep \.htaccess$ | xargs rm
+find %{name}-%{version}-%{alphatag} | grep \.jar$ | xargs rm
+find %{name}-%{version}-%{alphatag} | grep \.htaccess$ | xargs rm
 
 # Fix permissions on non-executables
-find %{name}-%{version}-%{release} | grep \.js$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.php$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.css$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.html$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.svg$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.js$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.php$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.css$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.html$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.svg$ | xargs chmod a-x
 
 # Remove plugins that contain unresolvable dependecies
-rm -rf %{name}-%{version}-%{release}/plugins/ImageManager/
-rm -rf %{name}-%{version}-%{release}/plugins/ExtendedFileManager/
-rm -rf %{name}-%{version}-%{release}/unsupported_plugins/
-rm -rf %{name}-%{version}-%{release}/contrib/
+rm -rf %{name}-%{version}-%{alphatag}/plugins/ImageManager/
+rm -rf %{name}-%{version}-%{alphatag}/plugins/ExtendedFileManager/
+rm -rf %{name}-%{version}-%{alphatag}/unsupported_plugins/
+rm -rf %{name}-%{version}-%{alphatag}/contrib/
 
 # Remove carriage returns
-cat %{name}-%{version}-%{release}/skins/inditreuse/README | tr -d "\r \n" > README.unix
-mv README.unix %{name}-%{version}-%{release}/skins/inditreuse/README
-cat %{name}-%{version}-%{release}/license.txt| tr -d "\r \n" > license.unix
-mv license.unix %{name}-%{version}-%{release}/license.txt
-cat %{name}-%{version}-%{release}/skins/titan/README | tr -d "\r \n" > README.unix
-mv README.unix %{name}-%{version}-%{release}/skins/titan/README
+cat %{name}-%{version}-%{alphatag}/skins/inditreuse/README | tr -d "\r \n" > README.unix
+mv README.unix %{name}-%{version}-%{alphatag}/skins/inditreuse/README
+cat %{name}-%{version}-%{alphatag}/license.txt| tr -d "\r \n" > license.unix
+mv license.unix %{name}-%{version}-%{alphatag}/license.txt
+cat %{name}-%{version}-%{alphatag}/skins/titan/README | tr -d "\r \n" > README.unix
+mv README.unix %{name}-%{version}-%{alphatag}/skins/titan/README
 
 
 # Organize the documentation files into folders. We can't just
@@ -72,31 +74,31 @@ mkdir doc/inditreuse-skin doc/titan-skin
 mkdir doc/InsertSmiley doc/SmartReplace doc/Equation doc/SpellChecker
 mkdir doc/SaveSubmit doc/FormOperations doc/InsertSnippet doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/license.txt doc
-mv %{name}-%{version}-%{release}/release-notes.txt doc
-mv %{name}-%{version}-%{release}/XinhaLoader_readme.txt doc
-
-mv %{name}-%{version}-%{release}/images/tango/COPYING doc/tango-images
-
-mv %{name}-%{version}-%{release}/iconsets/Tango/LICENSE doc/tango-icons
-mv %{name}-%{version}-%{release}/iconsets/Tango/README doc/tango-icons
-mv %{name}-%{version}-%{release}/iconsets/Crystal/LICENSE doc/crystal-icons
-mv %{name}-%{version}-%{release}/iconsets/Crystal/README doc/crystal-icons
-
-mv %{name}-%{version}-%{release}/skins/inditreuse/README doc/inditreuse-skin
-mv %{name}-%{version}-%{release}/skins/titan/README doc/titan-skin
-
-mv %{name}-%{version}-%{release}/plugins/InsertSmiley/README.txt doc/InsertSmiley
-mv %{name}-%{version}-%{release}/plugins/SmartReplace/readme.txt doc/SmartReplace
-mv %{name}-%{version}-%{release}/plugins/Equation/readme.txt doc/Equation
-mv %{name}-%{version}-%{release}/plugins/SpellChecker/README doc/SpellChecker
-mv %{name}-%{version}-%{release}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
-mv %{name}-%{version}-%{release}/plugins/SaveSubmit/README.txt doc/SaveSubmit
-mv %{name}-%{version}-%{release}/plugins/FormOperations/README doc/FormOperations
-mv %{name}-%{version}-%{release}/plugins/InsertSnippet/readme.html doc/InsertSnippet
-mv %{name}-%{version}-%{release}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
+mv %{name}-%{version}-%{alphatag}/license.txt doc
+mv %{name}-%{version}-%{alphatag}/release-notes.txt doc
+mv %{name}-%{version}-%{alphatag}/XinhaLoader_readme.txt doc
+
+mv %{name}-%{version}-%{alphatag}/images/tango/COPYING doc/tango-images
+
+mv %{name}-%{version}-%{alphatag}/iconsets/Tango/LICENSE doc/tango-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Tango/README doc/tango-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/LICENSE doc/crystal-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/README doc/crystal-icons
+
+mv %{name}-%{version}-%{alphatag}/skins/inditreuse/README doc/inditreuse-skin
+mv %{name}-%{version}-%{alphatag}/skins/titan/README doc/titan-skin
+
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSmiley/README.txt doc/InsertSmiley
+mv %{name}-%{version}-%{alphatag}/plugins/SmartReplace/readme.txt doc/SmartReplace
+mv %{name}-%{version}-%{alphatag}/plugins/Equation/readme.txt doc/Equation
+mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/README doc/SpellChecker
+mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
+mv %{name}-%{version}-%{alphatag}/plugins/SaveSubmit/README.txt doc/SaveSubmit
+mv %{name}-%{version}-%{alphatag}/plugins/FormOperations/README doc/FormOperations
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet/readme.html doc/InsertSnippet
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/examples doc/examples
+mv %{name}-%{version}-%{alphatag}/examples doc/examples
 
 %build
 
@@ -109,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # Create the directory (if not already there) where js is supposed to go
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/js
-cp -a %{name}-%{version}-%{release} $RPM_BUILD_ROOT%{_datadir}/js/
+cp -a %{name}-%{version}-%{alphatag} $RPM_BUILD_ROOT%{_datadir}/js/
 
 # Create conf.d, if it's not there already, and copy over our .conf file
 mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
@@ -135,5 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 # a better protocol for doing so.
 
 %changelog
+* Sun Dec 6 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2.1
+- Changed release tag format to add the dist tag and a build number
 * Mon Oct 19 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2
 - Spec file submission (initial package creation) 



From eponyme at fedoraproject.org  Sun Dec  6 17:01:55 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  6 Dec 2009 17:01:55 +0000 (UTC)
Subject: rpms/abby/F-12 .cvsignore, 1.8, 1.9 abby.spec, 1.8, 1.9 sources, 1.8,
	1.9
Message-ID: <20091206170155.9569711C00E0@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28261

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Nov 2009 19:28:06 -0000	1.8
+++ .cvsignore	6 Dec 2009 17:01:55 -0000	1.9
@@ -1 +1 @@
-abby-0.4.5.tar.bz2
+abby-0.4.6.1.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/abby.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- abby.spec	28 Nov 2009 19:28:06 -0000	1.8
+++ abby.spec	6 Dec 2009 17:01:55 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.5
+Version:        0.4.6.1
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6.1-1
+- Update to 0.4.6.1
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1
 - Update to 0.4.5
 * Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.4.4-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Nov 2009 19:28:06 -0000	1.8
+++ sources	6 Dec 2009 17:01:55 -0000	1.9
@@ -1 +1 @@
-7ac13b41a5964f9f726d22d66d5d4195  abby-0.4.5.tar.bz2
+f8ca71a7c4a07b4aa1c51bc1b66d24d7  abby-0.4.6.1.tar.bz2



From eponyme at fedoraproject.org  Sun Dec  6 17:03:06 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  6 Dec 2009 17:03:06 +0000 (UTC)
Subject: rpms/abby/F-11 .cvsignore, 1.8, 1.9 abby.spec, 1.7, 1.8 sources, 1.8,
	1.9
Message-ID: <20091206170306.AF12F11C00E0@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28814

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Nov 2009 19:29:12 -0000	1.8
+++ .cvsignore	6 Dec 2009 17:03:06 -0000	1.9
@@ -1 +1 @@
-abby-0.4.5.tar.bz2
+abby-0.4.6.1.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/abby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- abby.spec	28 Nov 2009 19:29:12 -0000	1.7
+++ abby.spec	6 Dec 2009 17:03:06 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.5
+Version:        0.4.6.1
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6.1-1
+- Update to 0.4.6.1
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1
 - Update to 0.4.5
 * Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.4.4-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Nov 2009 19:29:12 -0000	1.8
+++ sources	6 Dec 2009 17:03:06 -0000	1.9
@@ -1 +1 @@
-7ac13b41a5964f9f726d22d66d5d4195  abby-0.4.5.tar.bz2
+f8ca71a7c4a07b4aa1c51bc1b66d24d7  abby-0.4.6.1.tar.bz2



From eponyme at fedoraproject.org  Sun Dec  6 17:05:22 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  6 Dec 2009 17:05:22 +0000 (UTC)
Subject: File cclive-0.5.6.tar.bz2 uploaded to lookaside cache by eponyme
Message-ID: <20091206170522.F1AFA10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for cclive:

b051bfbd3d9741f5e0cb3280d966a34a  cclive-0.5.6.tar.bz2



From mtasaka at fedoraproject.org  Sun Dec  6 17:05:37 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 17:05:37 +0000 (UTC)
Subject: rpms/rubygem-actionpack/EL-5
	rubygem-actionpack-2.1.x-verify-also-text.patch, NONE,
	1.1 rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch,
	NONE, 1.1 rubygem-actionpack.spec, 1.7, 1.8
Message-ID: <20091206170537.E7D5211C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29813

Modified Files:
	rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.1.x-verify-also-text.patch 
	rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch 
Log Message:
* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-4
- Fix for potential CSRF protection circumvention (bug 544329)
- Fix for XSS weakness in strip_tags (bug 542786)


rubygem-actionpack-2.1.x-verify-also-text.patch:
 mime_type.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rubygem-actionpack-2.1.x-verify-also-text.patch ---
commit 099a98e9b7108dae3e0f78b207e0a7dc5913bd1a
Author: Michael Koziarski <michael at koziarski.com>
Date:   Sun Nov 16 20:35:25 2008 +0100

    Verify form submissions for text/plain posts too.
    
    Some browsers can POST requests with text/plain encoding, allowing attackers to  potentially subvert the request forgery prevention.
    
    http://pseudo-flaw.net/content/web-browsers/form-data-encoding-roundup/

diff --git a/actionpack/lib/action_controller/mime_type.rb b/actionpack/lib/action_controller/mime_type.rb
index fa123f7..453fc67 100644
--- a/actionpack/lib/action_controller/mime_type.rb
+++ b/actionpack/lib/action_controller/mime_type.rb
@@ -18,7 +18,7 @@ module Mime
   #   end
   class Type
     @@html_types = Set.new [:html, :all]
-    @@unverifiable_types = Set.new [:text, :json, :csv, :xml, :rss, :atom, :yaml]
+    @@unverifiable_types = Set.new [:json, :csv, :xml, :rss, :atom, :yaml]
     cattr_reader :html_types, :unverifiable_types
 
     # A simple helper class used in parsing the accept header

rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch:
 node.rb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch ---
>From 785281ade8c2347614525e9aceb5e62c80eec6f8 Mon Sep 17 00:00:00 2001
From: Gabe da Silveira <gabe at websaviour.com>
Date: Mon, 16 Nov 2009 21:17:35 -0800
Subject: [PATCH] Make sure strip_tags removes tags which start with a non-printable character

Signed-off-by: Michael Koziarski <michael at koziarski.com>
---
 .../vendor/html-scanner/html/node.rb               |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
index 6c03316..0cd05d8 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -162,7 +162,7 @@ module HTML #:nodoc:
           end
           
           closing = ( scanner.scan(/\//) ? :close : nil )
-          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[\w:-]+/)
+          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[-:\w\x00-\x09\x0b-\x0c\x0e-\x1f]+/)
           name.downcase!
   
           unless closing
index bae0f5c..51baba6 100644
@@ -19,6 +19,7 @@ class SanitizerTest < Test::Unit::TestCase
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <!-- comment --> here.")
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <![CDATA[<section>]]> here.")
     assert_equal "This has an unclosed ", sanitizer.sanitize("This has an unclosed <![CDATA[<section>]] here...")
+    assert_equal "non printable char is a tag", sanitizer.sanitize("<\x07a href='/hello'>non printable char is a tag</a>")
     [nil, '', '   '].each { |blank| assert_equal blank, sanitizer.sanitize(blank) }
   end
 
-- 
1.6.0.1



Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/EL-5/rubygem-actionpack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rubygem-actionpack.spec	20 Sep 2009 20:02:37 -0000	1.7
+++ rubygem-actionpack.spec	6 Dec 2009 17:05:37 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -15,6 +15,10 @@ Source0: http://gems.rubyforge.org/gems/
 Patch1: rubygem-actionpack-2.1.2-CVE-2008-5189.patch
 # http://weblog.rubyonrails.org/2009/9/4/xss-vulnerability-in-ruby-on-rails
 Patch2: rubygem-actionpack-2.1.x-CVE-2009-3009.patch
+# bug 544329
+Patch3: rubygem-actionpack-2.1.x-verify-also-text.patch
+# bug 542786
+Patch4: rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
@@ -33,6 +37,8 @@ unit/integration testing that doesn't re
 %setup -q -n %{gemname}-%{version}
 %patch1 -p2
 %patch2 -p2
+%patch3 -p2
+%patch4 -p2
 
 %build
 rake gem
@@ -65,6 +71,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-4
+- Fix for potential CSRF protection circumvention (bug 544329)
+- Fix for XSS weakness in strip_tags (bug 542786)
+
 * Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-3
 - Patch for CVE-2009-3009 (bug 520843)
 



From eponyme at fedoraproject.org  Sun Dec  6 17:05:53 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  6 Dec 2009 17:05:53 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, 1.12, 1.13 cclive.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <20091206170553.7132A11C00E0@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29948

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Nov 2009 18:57:12 -0000	1.12
+++ .cvsignore	6 Dec 2009 17:05:53 -0000	1.13
@@ -1 +1 @@
-cclive-0.5.5.tar.bz2
+cclive-0.5.6.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/cclive.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cclive.spec	28 Nov 2009 18:57:12 -0000	1.12
+++ cclive.spec	6 Dec 2009 17:05:53 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.5
+Version:        0.5.6
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.6-1
+- Update to 0.5.6
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.5-1
 - Update to 0.5.5
 * Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Nov 2009 18:57:12 -0000	1.12
+++ sources	6 Dec 2009 17:05:53 -0000	1.13
@@ -1 +1 @@
-76334f42df40d1dfb6c6cdc0ed256405  cclive-0.5.5.tar.bz2
+b051bfbd3d9741f5e0cb3280d966a34a  cclive-0.5.6.tar.bz2



From danielsmw at fedoraproject.org  Sun Dec  6 17:08:04 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Sun,  6 Dec 2009 17:08:04 +0000 (UTC)
Subject: rpms/xinha/F-11 xinha.spec,1.2,1.3
Message-ID: <20091206170804.B5C8411C00E0@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30813

Modified Files:
	xinha.spec 
Log Message:
Edited build tag to avoid a CVS tag clash



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-11/xinha.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xinha.spec	6 Dec 2009 17:00:46 -0000	1.2
+++ xinha.spec	6 Dec 2009 17:08:04 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		xinha
 Version:	0.96
-Release:	0.1.b2%{?dist}.1
+Release:	0.1.b2%{?dist}.2
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages
@@ -137,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 # a better protocol for doing so.
 
 %changelog
-* Sun Dec 6 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2.1
+* Sun Dec 6 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2.2
 - Changed release tag format to add the dist tag and a build number
 * Mon Oct 19 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2
 - Spec file submission (initial package creation) 



From eponyme at fedoraproject.org  Sun Dec  6 17:08:31 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  6 Dec 2009 17:08:31 +0000 (UTC)
Subject: rpms/cclive/F-12 .cvsignore, 1.12, 1.13 cclive.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <20091206170831.EA6B511C00E0@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31089

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Nov 2009 18:58:32 -0000	1.12
+++ .cvsignore	6 Dec 2009 17:08:31 -0000	1.13
@@ -1 +1 @@
-cclive-0.5.5.tar.bz2
+cclive-0.5.6.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/cclive.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cclive.spec	28 Nov 2009 18:58:32 -0000	1.12
+++ cclive.spec	6 Dec 2009 17:08:31 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.5
+Version:        0.5.6
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.6-1
+- Update to 0.5.6
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.5-1
 - Update to 0.5.5
 * Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Nov 2009 18:58:32 -0000	1.12
+++ sources	6 Dec 2009 17:08:31 -0000	1.13
@@ -1 +1 @@
-76334f42df40d1dfb6c6cdc0ed256405  cclive-0.5.5.tar.bz2
+b051bfbd3d9741f5e0cb3280d966a34a  cclive-0.5.6.tar.bz2



From eponyme at fedoraproject.org  Sun Dec  6 17:10:20 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  6 Dec 2009 17:10:20 +0000 (UTC)
Subject: rpms/cclive/F-11 .cvsignore, 1.12, 1.13 cclive.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20091206171020.16E3A11C03FC@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31673

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Nov 2009 19:03:16 -0000	1.12
+++ .cvsignore	6 Dec 2009 17:10:19 -0000	1.13
@@ -1 +1 @@
-cclive-0.5.5.tar.bz2
+cclive-0.5.6.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/cclive.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- cclive.spec	28 Nov 2009 19:03:16 -0000	1.11
+++ cclive.spec	6 Dec 2009 17:10:19 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.5
+Version:        0.5.6
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.6-1
+- Update to 0.5.6
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.5-1
 - Update to 0.5.5
 * Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Nov 2009 19:03:16 -0000	1.12
+++ sources	6 Dec 2009 17:10:19 -0000	1.13
@@ -1 +1 @@
-76334f42df40d1dfb6c6cdc0ed256405  cclive-0.5.5.tar.bz2
+b051bfbd3d9741f5e0cb3280d966a34a  cclive-0.5.6.tar.bz2



From danielsmw at fedoraproject.org  Sun Dec  6 17:19:07 2009
From: danielsmw at fedoraproject.org (Matthew Daniels)
Date: Sun,  6 Dec 2009 17:19:07 +0000 (UTC)
Subject: rpms/xinha/F-11 xinha.spec,1.3,1.4
Message-ID: <20091206171907.070EB11C00E0@cvs1.fedora.phx.redhat.com>

Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1565

Modified Files:
	xinha.spec 
Log Message:
Fixed a problem in the spec file where a {release} should have been {alphatag}



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-11/xinha.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xinha.spec	6 Dec 2009 17:08:04 -0000	1.3
+++ xinha.spec	6 Dec 2009 17:19:06 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		xinha
 Version:	0.96
-Release:	0.1.b2%{?dist}.2
+Release:	0.1.b2%{?dist}.3
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages
@@ -122,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/js/%{name}-%{version}-%{release}
+%{_datadir}/js/%{name}-%{version}-%{alphatag}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 # Install documentation
@@ -137,6 +137,8 @@ rm -rf $RPM_BUILD_ROOT
 # a better protocol for doing so.
 
 %changelog
+* Sun Dec 6 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2.3
+- Missed a release <-> alphatag interchange on line 125; fixed now.
 * Sun Dec 6 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2.2
 - Changed release tag format to add the dist tag and a build number
 * Mon Oct 19 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2



From abompard at fedoraproject.org  Sun Dec  6 17:26:40 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun,  6 Dec 2009 17:26:40 +0000 (UTC)
Subject: File springlobby-0.40.tar.bz2 uploaded to lookaside cache by
	abompard
Message-ID: <20091206172640.1577510F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for springlobby:

8dd959b55de4ae85c419afdc23535417  springlobby-0.40.tar.bz2



From mtasaka at fedoraproject.org  Sun Dec  6 17:36:23 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 17:36:23 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-10
	rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch, 1.1,
	1.2 rubygem-actionpack.spec, 1.9, 1.10
Message-ID: <20091206173623.A9CF111C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6539

Modified Files:
	rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch 
	rubygem-actionpack.spec 
Log Message:
Fix patch

rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch:
 node.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/F-10/rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch	6 Dec 2009 16:57:21 -0000	1.1
+++ rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch	6 Dec 2009 17:36:22 -0000	1.2
@@ -6,6 +6,7 @@ Subject: [PATCH] Make sure strip_tags re
 Signed-off-by: Michael Koziarski <michael at koziarski.com>
 ---
  .../vendor/html-scanner/html/node.rb               |    2 +-
+ .../test/controller/html-scanner/sanitizer_test.rb |    1 +
  2 files changed, 2 insertions(+), 1 deletions(-)
 
 diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -21,15 +22,3 @@ index 6c03316..0cd05d8 100644
            name.downcase!
    
            unless closing
-index bae0f5c..51baba6 100644
-@@ -19,6 +19,7 @@ class SanitizerTest < Test::Unit::TestCase
-     assert_equal "This has a  here.", sanitizer.sanitize("This has a <!-- comment --> here.")
-     assert_equal "This has a  here.", sanitizer.sanitize("This has a <![CDATA[<section>]]> here.")
-     assert_equal "This has an unclosed ", sanitizer.sanitize("This has an unclosed <![CDATA[<section>]] here...")
-+    assert_equal "non printable char is a tag", sanitizer.sanitize("<\x07a href='/hello'>non printable char is a tag</a>")
-     [nil, '', '   '].each { |blank| assert_equal blank, sanitizer.sanitize(blank) }
-   end
- 
--- 
-1.6.0.1
-


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/F-10/rubygem-actionpack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-actionpack.spec	6 Dec 2009 16:57:21 -0000	1.9
+++ rubygem-actionpack.spec	6 Dec 2009 17:36:23 -0000	1.10
@@ -7,7 +7,7 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -71,7 +71,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-4
+* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-5
 - Fix for potential CSRF protection circumvention (bug 544329)
 - Fix for XSS weakness in strip_tags (bug 542786)
 



From transif at fedoraproject.org  Sun Dec  6 17:36:57 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun,  6 Dec 2009 17:36:57 +0000 (UTC)
Subject: comps/po he.po,1.18,1.19
Message-ID: <20091206173657.AC58311C00E0@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6909/po

Modified Files:
	he.po 
Log Message:
Sending translation for Hebrew


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.18 -r 1.19 he.poIndex: he.po
===================================================================
RCS file: /cvs/pkgs/comps/po/he.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- he.po	29 Apr 2009 20:00:19 -0000	1.18
+++ he.po	6 Dec 2009 17:36:57 -0000	1.19
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2008-09-19 01:28GMT\n"
-"Last-Translator: Oron Peled <oron at actcom.co.il>\n"
+"POT-Creation-Date: 2009-12-06 14:13+0000\n"
+"PO-Revision-Date: 2009-12-06 19:35+0200\n"
+"Last-Translator: Elad <el.il at doom.co.il>\n"
 "Language-Team: Hebrew\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,1488 +19,2262 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1
+#: ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "?????????? ?????????????? ?????? ???????????? ???????? ???? ???? ???????????? ?????????? ?????? ????????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3
+#: ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5
+#: ../comps-f13.xml.in.h:5
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "?????? ??????????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4
+#: ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6
+#: ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "?????????? ??????????????????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5
+#: ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7
+#: ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "?????????? ??????????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6
+#: ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9
+#: ../comps-f13.xml.in.h:9
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7
+#: ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10
+#: ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "???????????? ???????????? ????????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8
+#: ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11
+#: ../comps-f13.xml.in.h:11
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "?????????? ????????????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12
+#: ../comps-f13.xml.in.h:12
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????? ??????????????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10
+#: ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13
+#: ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "?????????? ????Assamese (????????)"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11
+#: ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14
+#: ../comps-f13.xml.in.h:14
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????????? ???????????? ????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12
+#: ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16
+#: ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13
+#: ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17
+#: ../comps-f13.xml.in.h:17
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "?????????? ????????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18
+#: ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "?????????? ???????????? ???????? ???????????? Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19
+#: ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "?????????? ????????????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20
+#: ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "?????????? ??????????????????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17
+#: ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21
+#: ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "?????????? ??????????????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17
[...2686 lines suppressed...]
-#, fuzzy
+#: ../comps-f11.xml.in.h:238
+#: ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
-msgstr "?????????? ????????????"
+msgstr "?????????? ?????????????? ??????????"
 
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
+#: ../comps-f12.xml.in.h:2
+#: ../comps-f13.xml.in.h:2
+msgid "A set of packages that provide the Critical Path functionality for the GNOME desktop"
+msgstr "?????????? ???????????? ?????????????? ???????????????? ???????????? ?????????????????????????? Critical Path ???????? ?????????? ???????????? GNOME"
+
+#: ../comps-f12.xml.in.h:3
+#: ../comps-f13.xml.in.h:3
+msgid "A set of packages that provide the shared platform for Critical Path functionality on all Fedora spins"
+msgstr "?????????? ???????????? ?????????????? ???????????????? ???????????? ?????????????????????????? Critical Path ?????? ?????????????? ???? ??????????"
+
+#: ../comps-f12.xml.in.h:23
+#: ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????????? ????????????????"
+
+#: ../comps-f12.xml.in.h:24
+#: ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "?????????? ???????????????? ?????????????? ???????????? Fedora"
+
+#: ../comps-f12.xml.in.h:37
+#: ../comps-f13.xml.in.h:38
+msgid "Critical Path (Base)"
+msgstr "Critical Path (????????)"
+
+#: ../comps-f12.xml.in.h:38
+#: ../comps-f13.xml.in.h:39
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50
+#: ../comps-f13.xml.in.h:51
+msgid "Directory Server"
+msgstr "???????? ????????????"
+
+#: ../comps-f12.xml.in.h:88
+#: ../comps-f13.xml.in.h:89
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123
+#: ../comps-f13.xml.in.h:124
+msgid "LXDE is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ?????? ?????????? ?????????? ?????????? ?????? ???????? ???????? X11, ?????????????? ???????? ???????????? ???? ?????????? ????????, ?????? ???????????? ????????-????????????, ???????????? ???????????? ???? ???????????? ??????????."
+
+#: ../comps-f12.xml.in.h:136
+#: ../comps-f13.xml.in.h:137
+msgid "Machine and user identity servers."
+msgstr "?????????? ???????????? ?????????????? ??????????????."
+
+#: ../comps-f12.xml.in.h:147
+#: ../comps-f13.xml.in.h:148
+msgid "Moblin Desktop Environment"
+msgstr "?????????? ?????????? ???????????? Moblin"
+
+#: ../comps-f12.xml.in.h:148
+#: ../comps-f13.xml.in.h:149
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ?????? ?????????? ?????????? ?????????? ???????? NetBooks/NetTops/?????????? MID."
+
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "???????? ?????????? ?????????? ??????."
+
+#: ../comps-el4.xml.in.h:3
+#: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????????? ?????????????? ??????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "?????????? ?????????? ????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"?????????? GNOME ?????????? ???????? ?????????? ???????? ????-???????? ?????????? ??????, ?????????? ??????????, ???????????? "
-"?????????? ?????????? ?????????? ????????."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"?????????? KDE ?????????? ???????? ?????????? ???????? ????-???????? ?????????? ??????, ?????????? ??????????, ???????????? ?????????? "
-"?????????? ?????????? ????????."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"???????? ?????????????? \"?????????? ????????\" ???????????????? ???? ?????????? ???????????? ??????????. ???????????? ?????? "
-"???????????? ???? Emacs ????Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:26
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "?????????? GNOME ?????????? ???????? ?????????? ???????? ????-???????? ?????????? ??????, ?????????? ??????????, ???????????? ?????????? ?????????? ?????????? ????????."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:38
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "?????????? KDE ?????????? ???????? ?????????? ???????? ????-???????? ?????????? ??????, ?????????? ??????????, ???????????? ?????????? ?????????? ?????????? ????????."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:47
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "???????? ?????????????? \"?????????? ????????\" ???????????????? ???? ?????????? ???????????? ??????????. ???????????? ?????? ???????????? ???? Emacs ????Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "???????? ?????????? XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"???????? ???????????????? ?????????? ?????????? ???????????? DocBook ?????????????? ????HTML, PDF, Postscript "
-"?????????? ????????."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:55
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "???????? ???????????????? ?????????? ?????????? ???????????? DocBook ?????????????? ????HTML, PDF, Postscript ?????????? ????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "???????? ???????? ?????? ?????????????? ????????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "???? ???????? ???????? ?????????????? ???????????? ?????????? ??????????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:69
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????? ???????? ???????? ?????????????? ???????????? ?????????? ??????????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:70
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ???????? ???????? ?????????????? ???????????? ?????????? ??????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+#: ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???? ???????? ???????? ?????????????? ???????????? ?????????? ??'??????."
 
+#~ msgid "Eclipse"
+#~ msgstr "Eclipse"
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "?????????? ???????????? ?????????????? Eclipse."
+
 #, fuzzy
 #~ msgid "British Support"
 #~ msgstr "?????????? ????????????"
@@ -1534,3 +2308,4 @@ msgstr "???? ???????? ???????? ?????????
 #, fuzzy
 #~ msgid "Virtualization Support."
 #~ msgstr "???????????? (????????????????????????)"
+



From mtasaka at fedoraproject.org  Sun Dec  6 17:38:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 17:38:02 +0000 (UTC)
Subject: rpms/rubygem-actionpack/EL-5
	rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch, 1.1,
	1.2 rubygem-actionpack.spec, 1.8, 1.9
Message-ID: <20091206173802.9D61B11C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7143

Modified Files:
	rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch 
	rubygem-actionpack.spec 
Log Message:
fix patch

rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch:
 node.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/EL-5/rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch	6 Dec 2009 17:05:37 -0000	1.1
+++ rubygem-actionpack-2.2.x-strip_tag-for-nonprintable.patch	6 Dec 2009 17:38:02 -0000	1.2
@@ -6,6 +6,7 @@ Subject: [PATCH] Make sure strip_tags re
 Signed-off-by: Michael Koziarski <michael at koziarski.com>
 ---
  .../vendor/html-scanner/html/node.rb               |    2 +-
+ .../test/controller/html-scanner/sanitizer_test.rb |    1 +
  2 files changed, 2 insertions(+), 1 deletions(-)
 
 diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -21,15 +22,3 @@ index 6c03316..0cd05d8 100644
            name.downcase!
    
            unless closing
-index bae0f5c..51baba6 100644
-@@ -19,6 +19,7 @@ class SanitizerTest < Test::Unit::TestCase
-     assert_equal "This has a  here.", sanitizer.sanitize("This has a <!-- comment --> here.")
-     assert_equal "This has a  here.", sanitizer.sanitize("This has a <![CDATA[<section>]]> here.")
-     assert_equal "This has an unclosed ", sanitizer.sanitize("This has an unclosed <![CDATA[<section>]] here...")
-+    assert_equal "non printable char is a tag", sanitizer.sanitize("<\x07a href='/hello'>non printable char is a tag</a>")
-     [nil, '', '   '].each { |blank| assert_equal blank, sanitizer.sanitize(blank) }
-   end
- 
--- 
-1.6.0.1
-


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/EL-5/rubygem-actionpack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rubygem-actionpack.spec	6 Dec 2009 17:05:37 -0000	1.8
+++ rubygem-actionpack.spec	6 Dec 2009 17:38:02 -0000	1.9
@@ -7,7 +7,7 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -71,7 +71,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-4
+* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.1-5
 - Fix for potential CSRF protection circumvention (bug 544329)
 - Fix for XSS weakness in strip_tags (bug 542786)
 



From abompard at fedoraproject.org  Sun Dec  6 17:39:27 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun,  6 Dec 2009 17:39:27 +0000 (UTC)
Subject: rpms/springlobby/F-11 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 springlobby.spec, 1.14, 1.15
Message-ID: <20091206173927.6862611C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7548/F-11

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Dec 06 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.40-1
- version 0.40



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Nov 2009 20:28:01 -0000	1.10
+++ .cvsignore	6 Dec 2009 17:39:27 -0000	1.11
@@ -1 +1 @@
-springlobby-0.35.tar.bz2
+springlobby-0.40.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Nov 2009 20:28:01 -0000	1.10
+++ sources	6 Dec 2009 17:39:27 -0000	1.11
@@ -1 +1 @@
-75a4c7617dfc9345275801d024267e45  springlobby-0.35.tar.bz2
+8dd959b55de4ae85c419afdc23535417  springlobby-0.40.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/springlobby.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- springlobby.spec	9 Nov 2009 20:28:01 -0000	1.14
+++ springlobby.spec	6 Dec 2009 17:39:27 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.35
+Version:        0.40
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -34,7 +34,7 @@ SpringLobby is a free cross-platform lob
 
 
 %build
-%configure
+%cmake
 make %{?_smp_mflags}
 
 
@@ -54,11 +54,6 @@ desktop-file-install  \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# Move icon to the Freedesktop directory
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \
-   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-
 %find_lang %{name}
 
 
@@ -88,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.40-1
+- version 0.40
+
 * Mon Nov 09 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.35-1
 - version 0.35
 



From abompard at fedoraproject.org  Sun Dec  6 17:39:27 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun,  6 Dec 2009 17:39:27 +0000 (UTC)
Subject: rpms/springlobby/F-12 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 springlobby.spec, 1.16, 1.17
Message-ID: <20091206173927.A375511C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7548/F-12

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Dec 06 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.40-1
- version 0.40



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Nov 2009 20:28:02 -0000	1.10
+++ .cvsignore	6 Dec 2009 17:39:27 -0000	1.11
@@ -1 +1 @@
-springlobby-0.35.tar.bz2
+springlobby-0.40.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Nov 2009 20:28:02 -0000	1.10
+++ sources	6 Dec 2009 17:39:27 -0000	1.11
@@ -1 +1 @@
-75a4c7617dfc9345275801d024267e45  springlobby-0.35.tar.bz2
+8dd959b55de4ae85c419afdc23535417  springlobby-0.40.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-12/springlobby.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- springlobby.spec	9 Nov 2009 20:28:02 -0000	1.16
+++ springlobby.spec	6 Dec 2009 17:39:27 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.35
+Version:        0.40
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -34,7 +34,7 @@ SpringLobby is a free cross-platform lob
 
 
 %build
-%configure
+%cmake
 make %{?_smp_mflags}
 
 
@@ -54,11 +54,6 @@ desktop-file-install  \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# Move icon to the Freedesktop directory
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \
-   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-
 %find_lang %{name}
 
 
@@ -88,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.40-1
+- version 0.40
+
 * Mon Nov 09 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.35-1
 - version 0.35
 



From abompard at fedoraproject.org  Sun Dec  6 17:39:27 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun,  6 Dec 2009 17:39:27 +0000 (UTC)
Subject: rpms/springlobby/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 springlobby.spec, 1.16, 1.17
Message-ID: <20091206173927.D1D9311C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7548/devel

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Dec 06 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.40-1
- version 0.40



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Nov 2009 20:28:02 -0000	1.10
+++ .cvsignore	6 Dec 2009 17:39:27 -0000	1.11
@@ -1 +1 @@
-springlobby-0.35.tar.bz2
+springlobby-0.40.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Nov 2009 20:28:02 -0000	1.10
+++ sources	6 Dec 2009 17:39:27 -0000	1.11
@@ -1 +1 @@
-75a4c7617dfc9345275801d024267e45  springlobby-0.35.tar.bz2
+8dd959b55de4ae85c419afdc23535417  springlobby-0.40.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- springlobby.spec	9 Nov 2009 20:28:02 -0000	1.16
+++ springlobby.spec	6 Dec 2009 17:39:27 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.35
+Version:        0.40
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -34,7 +34,7 @@ SpringLobby is a free cross-platform lob
 
 
 %build
-%configure
+%cmake
 make %{?_smp_mflags}
 
 
@@ -54,11 +54,6 @@ desktop-file-install  \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# Move icon to the Freedesktop directory
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \
-   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-
 %find_lang %{name}
 
 
@@ -88,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.40-1
+- version 0.40
+
 * Mon Nov 09 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.35-1
 - version 0.35
 



From abompard at fedoraproject.org  Sun Dec  6 17:49:34 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun,  6 Dec 2009 17:49:34 +0000 (UTC)
Subject: rpms/springlobby/F-11 springlobby.spec,1.15,1.16
Message-ID: <20091206174934.9BF4D11C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10757/F-11

Modified Files:
	springlobby.spec 
Log Message:
Forgot BR


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/springlobby.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- springlobby.spec	6 Dec 2009 17:39:27 -0000	1.15
+++ springlobby.spec	6 Dec 2009 17:49:34 -0000	1.16
@@ -11,6 +11,7 @@ Source0:        http://www.springlobby.i
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake
 BuildRequires:  wxGTK-devel, rb_libtorrent-devel
 BuildRequires:  SDL-devel, SDL_sound-devel, SDL_mixer-devel
 BuildRequires:  pkgconfig, desktop-file-utils, gettext



From abompard at fedoraproject.org  Sun Dec  6 17:49:34 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun,  6 Dec 2009 17:49:34 +0000 (UTC)
Subject: rpms/springlobby/F-12 springlobby.spec,1.17,1.18
Message-ID: <20091206174934.BA2C311C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10757/F-12

Modified Files:
	springlobby.spec 
Log Message:
Forgot BR


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-12/springlobby.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- springlobby.spec	6 Dec 2009 17:39:27 -0000	1.17
+++ springlobby.spec	6 Dec 2009 17:49:34 -0000	1.18
@@ -11,6 +11,7 @@ Source0:        http://www.springlobby.i
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake
 BuildRequires:  wxGTK-devel, rb_libtorrent-devel
 BuildRequires:  SDL-devel, SDL_sound-devel, SDL_mixer-devel
 BuildRequires:  pkgconfig, desktop-file-utils, gettext



From abompard at fedoraproject.org  Sun Dec  6 17:49:34 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun,  6 Dec 2009 17:49:34 +0000 (UTC)
Subject: rpms/springlobby/devel springlobby.spec,1.17,1.18
Message-ID: <20091206174934.E413A11C00E0@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10757/devel

Modified Files:
	springlobby.spec 
Log Message:
Forgot BR


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- springlobby.spec	6 Dec 2009 17:39:27 -0000	1.17
+++ springlobby.spec	6 Dec 2009 17:49:34 -0000	1.18
@@ -11,6 +11,7 @@ Source0:        http://www.springlobby.i
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake
 BuildRequires:  wxGTK-devel, rb_libtorrent-devel
 BuildRequires:  SDL-devel, SDL_sound-devel, SDL_mixer-devel
 BuildRequires:  pkgconfig, desktop-file-utils, gettext



From pkgdb at fedoraproject.org  Sun Dec  6 17:54:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 17:54:49 +0000
Subject: [pkgdb] erlang: arbiter has given up watchbugzilla
Message-ID: <20091206175449.4A8BC10F89C@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchbugzilla acl on erlang (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Sun Dec  6 17:54:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 17:54:51 +0000
Subject: [pkgdb] erlang: arbiter has given up watchcommits
Message-ID: <20091206175451.B24AD10F8A3@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchcommits acl on erlang (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From pkgdb at fedoraproject.org  Sun Dec  6 17:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 17:54:53 +0000
Subject: [pkgdb] erlang: arbiter has requested commit
Message-ID: <20091206175453.D2C3010F8A8@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on erlang (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang



From terjeros at fedoraproject.org  Sun Dec  6 18:08:03 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 18:08:03 +0000 (UTC)
Subject: File BeautifulSoup-3.0.8.tar.gz uploaded to lookaside cache by
	terjeros
Message-ID: <20091206180803.BC55510F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-BeautifulSoup:

1ed94bfdb601055f467007859366e3c4  BeautifulSoup-3.0.8.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 18:08:48 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 18:08:48 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/devel .cvsignore, 1.6,
	1.7 python-BeautifulSoup.spec, 1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20091206180849.036FC11C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-BeautifulSoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16862

Modified Files:
	.cvsignore python-BeautifulSoup.spec sources 
Log Message:
* Sun Dec  6 2009 Terje Rosten <terje.rosten at ntnu.no> - 1:3.0.8-1
- 3.0.8
- Fix source url



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Jan 2009 20:59:51 -0000	1.6
+++ .cvsignore	6 Dec 2009 18:08:48 -0000	1.7
@@ -1 +1 @@
-BeautifulSoup-3.1.0.1.tar.gz
+BeautifulSoup-3.0.8.tar.gz


Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/devel/python-BeautifulSoup.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-BeautifulSoup.spec	25 Oct 2009 15:35:39 -0000	1.17
+++ python-BeautifulSoup.spec	6 Dec 2009 18:08:48 -0000	1.18
@@ -5,14 +5,14 @@
 
 Name:           python-BeautifulSoup
 Epoch:          1
-Version:        3.0.7a
-Release:        2%{?dist}
+Version:        3.0.8
+Release:        1%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.crummy.com/software/BeautifulSoup/
-Source0:        http://www.crummy.com/software/BeautifulSoup/download/%{oname}-%{version}.tar.gz
+Source0:        http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -74,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Dec  6 2009 Terje Rosten <terje.rosten at ntnu.no> - 1:3.0.8-1
+- 3.0.8
+- Fix source url
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.7a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Jun 2009 16:13:28 -0000	1.7
+++ sources	6 Dec 2009 18:08:48 -0000	1.8
@@ -1 +1 @@
-d28c8148bb770e72762eb202fa797b56  BeautifulSoup-3.0.7a.tar.gz
+1ed94bfdb601055f467007859366e3c4  BeautifulSoup-3.0.8.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 18:10:30 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 18:10:30 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/F-11 .cvsignore, 1.7,
	1.8 python-BeautifulSoup.spec, 1.15, 1.16 sources, 1.7, 1.8
Message-ID: <20091206181030.2D39211C03FC@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-BeautifulSoup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17396/F-11

Modified Files:
	.cvsignore python-BeautifulSoup.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Jun 2009 15:58:14 -0000	1.7
+++ .cvsignore	6 Dec 2009 18:10:29 -0000	1.8
@@ -1 +1 @@
-BeautifulSoup-3.0.7a.tar.gz
+BeautifulSoup-3.0.8.tar.gz


Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/F-11/python-BeautifulSoup.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-BeautifulSoup.spec	10 Jun 2009 15:58:14 -0000	1.15
+++ python-BeautifulSoup.spec	6 Dec 2009 18:10:29 -0000	1.16
@@ -5,14 +5,14 @@
 
 Name:           python-BeautifulSoup
 Epoch:          1
-Version:        3.0.7a
+Version:        3.0.8
 Release:        1%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.crummy.com/software/BeautifulSoup/
-Source0:        http://www.crummy.com/software/BeautifulSoup/download/%{oname}-%{version}.tar.gz
+Source0:        http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -69,11 +69,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %{python_sitelib}/%{oname}.py*
 %exclude %{python_sitelib}/%{oname}Tests.py*
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
 %{python_sitelib}/%{oname}-%{version}-py%{pyver}.egg-info
 %endif
 
 %changelog
+* Sun Dec  6 2009 Terje Rosten <terje.rosten at ntnu.no> - 1:3.0.8-1
+- 3.0.8
+- Fix source url
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.7a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 10 2009 kwizart < kwizart at gmail.com > - 1:3.0.7a-1
 - Revert to 3.0.7a and bump Epoch - Fix #505043
   http://www.crummy.com/software/BeautifulSoup/3.1-problems.html


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Jun 2009 15:58:14 -0000	1.7
+++ sources	6 Dec 2009 18:10:29 -0000	1.8
@@ -1 +1 @@
-d28c8148bb770e72762eb202fa797b56  BeautifulSoup-3.0.7a.tar.gz
+1ed94bfdb601055f467007859366e3c4  BeautifulSoup-3.0.8.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 18:10:30 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 18:10:30 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/F-12 .cvsignore, 1.6,
	1.7 python-BeautifulSoup.spec, 1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20091206181030.5A45811C03FC@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-BeautifulSoup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17396/F-12

Modified Files:
	.cvsignore python-BeautifulSoup.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Jan 2009 20:59:51 -0000	1.6
+++ .cvsignore	6 Dec 2009 18:10:30 -0000	1.7
@@ -1 +1 @@
-BeautifulSoup-3.1.0.1.tar.gz
+BeautifulSoup-3.0.8.tar.gz


Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/F-12/python-BeautifulSoup.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-BeautifulSoup.spec	25 Oct 2009 15:35:40 -0000	1.17
+++ python-BeautifulSoup.spec	6 Dec 2009 18:10:30 -0000	1.18
@@ -5,14 +5,14 @@
 
 Name:           python-BeautifulSoup
 Epoch:          1
-Version:        3.0.7a
-Release:        2%{?dist}
+Version:        3.0.8
+Release:        1%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.crummy.com/software/BeautifulSoup/
-Source0:        http://www.crummy.com/software/BeautifulSoup/download/%{oname}-%{version}.tar.gz
+Source0:        http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -74,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Dec  6 2009 Terje Rosten <terje.rosten at ntnu.no> - 1:3.0.8-1
+- 3.0.8
+- Fix source url
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.7a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-BeautifulSoup/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Jun 2009 16:13:28 -0000	1.7
+++ sources	6 Dec 2009 18:10:30 -0000	1.8
@@ -1 +1 @@
-d28c8148bb770e72762eb202fa797b56  BeautifulSoup-3.0.7a.tar.gz
+1ed94bfdb601055f467007859366e3c4  BeautifulSoup-3.0.8.tar.gz



From acme at fedoraproject.org  Sun Dec  6 18:30:56 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Sun,  6 Dec 2009 18:30:56 +0000 (UTC)
Subject: File dwarves-1.8.tar.bz2 uploaded to lookaside cache by acme
Message-ID: <20091206183056.A024B10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for dwarves:

92ef945346d087ff3d29fb03c0e08625  dwarves-1.8.tar.bz2



From kevin at fedoraproject.org  Sun Dec  6 18:36:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 18:36:44 +0000 (UTC)
Subject: rpms/rkhunter/F-12 rkhunter-1.3.6-fedoraconfig.patch, NONE,
	1.1 sources, 1.10, 1.11 .cvsignore, 1.9, 1.10 rkhunter.spec,
	1.27, 1.28 rkhunter-1.3.4-fedoraconfig.patch, 1.5, NONE
Message-ID: <20091206183644.927EF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26609

Modified Files:
	sources .cvsignore rkhunter.spec 
Added Files:
	rkhunter-1.3.6-fedoraconfig.patch 
Removed Files:
	rkhunter-1.3.4-fedoraconfig.patch 
Log Message:
Disable apps check by default - bug #543065
Update to 1.3.6


rkhunter-1.3.6-fedoraconfig.patch:
 rkhunter.conf |   81 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

--- NEW FILE rkhunter-1.3.6-fedoraconfig.patch ---
diff -Nur rkhunter-1.3.6.orig/files/rkhunter.conf rkhunter-1.3.6/files/rkhunter.conf
--- rkhunter-1.3.6.orig/files/rkhunter.conf	2009-11-28 15:13:19.000000000 -0700
+++ rkhunter-1.3.6/files/rkhunter.conf	2009-12-01 17:43:15.000000000 -0700
@@ -71,7 +71,7 @@
 # NOTE: This option should be present in the configuration file.
 #
 #MAIL-ON-WARNING=me at mydomain   root at mydomain
-MAIL-ON-WARNING=""
+MAIL-ON-WARNING="root at localhost"
 
 #
 # Specify the mail command to use if MAIL-ON-WARNING is set.
@@ -87,17 +87,17 @@
 # important files will be written to this directory, so be
 # sure that the directory permissions are tight.
 #
-#TMPDIR=/var/lib/rkhunter/tmp
+TMPDIR=/var/lib/rkhunter
 
 #
 # Specify the database directory to use.
 #
-#DBDIR=/var/lib/rkhunter/db
+DBDIR=/var/lib/rkhunter/db
 
 #
 # Specify the script directory to use.
 #
-#SCRIPTDIR=/usr/local/lib/rkhunter/scripts
+SCRIPTDIR=/usr/share/rkhunter/scripts
 
 #
 # Specify the root directory to use.
@@ -138,13 +138,13 @@
 #
 # NOTE: This option should be present in the configuration file.
 #
-LOGFILE=/var/log/rkhunter.log
+LOGFILE=/var/log/rkhunter/rkhunter.log
 
 #
 # Set the following option to 1 if the log file is to be appended to
 # whenever rkhunter is run.
 #
-APPEND_LOG=0
+APPEND_LOG=1
 
 #
 # Set the following option to 1 if the log file is to be copied when
@@ -166,7 +166,7 @@
 # Setting the value to 'none', or just leaving the option commented out,
 # disables the use of syslog.
 #
-#USE_SYSLOG=authpriv.notice
+USE_SYSLOG=authpriv.notice
 
 #
 # Set the following option to 1 if the second colour set is to be used.
@@ -196,7 +196,7 @@
 # file, then a value here of 'yes' or 'unset' will not cause a warning.
 # This option has a default value of 'no'.
 #
-ALLOW_SSH_ROOT_USER=no
+ALLOW_SSH_ROOT_USER=yes
 
 #
 # Set this option to '1' to allow the use of the SSH-1 protocol, but note
@@ -236,7 +236,7 @@
 # tests, the test names, and how rkhunter behaves when these options are used.
 #
 ENABLE_TESTS="all"
-DISABLE_TESTS="suspscan hidden_procs deleted_files packet_cap_apps"
+DISABLE_TESTS="apps suspscan hidden_procs deleted_files packet_cap_apps"
 
 #
 # The HASH_FUNC option can be used to specify the command to use
@@ -299,7 +299,7 @@
 #
 # Whenever this option is changed 'rkhunter --propupd' must be run.
 #
-#PKGMGR=NONE
+PKGMGR=RPM
 
 #
 # It is possible that a file which is part of a package may be modified
@@ -392,9 +392,12 @@
 # Allow the specified commands to be scripts.
 # One command per line (use multiple SCRIPTWHITELIST lines).
 #
-#SCRIPTWHITELIST=/sbin/ifup
-#SCRIPTWHITELIST=/sbin/ifdown
-#SCRIPTWHITELIST=/usr/bin/groups
+SCRIPTWHITELIST=/usr/bin/whatis
+SCRIPTWHITELIST=/usr/bin/ldd
+SCRIPTWHITELIST=/usr/bin/groups
+SCRIPTWHITELIST=/usr/bin/GET
+SCRIPTWHITELIST=/sbin/ifup
+SCRIPTWHITELIST=/sbin/ifdown
 
 #
 # Allow the specified commands to have the immutable attribute set.
@@ -406,37 +409,35 @@
 # Allow the specified hidden directories.
 # One directory per line (use multiple ALLOWHIDDENDIR lines).
 #
-#ALLOWHIDDENDIR=/etc/.java
-#ALLOWHIDDENDIR=/dev/.udev
-#ALLOWHIDDENDIR=/dev/.udevdb
-#ALLOWHIDDENDIR=/dev/.udev.tdb
-#ALLOWHIDDENDIR=/dev/.static
-#ALLOWHIDDENDIR=/dev/.initramfs
-#ALLOWHIDDENDIR=/dev/.SRC-unix
-#ALLOWHIDDENDIR=/dev/.mdadm
+ALLOWHIDDENDIR=/dev/.udev
+ALLOWHIDDENDIR=/dev/.udevdb
+ALLOWHIDDENDIR=/dev/.udev.tdb
+ALLOWHIDDENDIR=/dev/.static
+ALLOWHIDDENDIR=/dev/.initramfs
+ALLOWHIDDENDIR=/dev/.SRC-unix
+ALLOWHIDDENDIR=/dev/.mdadm
 
 #
 # Allow the specified hidden files.
 # One file per line (use multiple ALLOWHIDDENFILE lines).
 # 
-#ALLOWHIDDENFILE=/etc/.java
-#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
+ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
 #ALLOWHIDDENFILE=/etc/.pwd.lock
 #ALLOWHIDDENFILE=/etc/.init.state
-#ALLOWHIDDENFILE=/lib/.libcrypto.so.0.9.8e.hmac
-#ALLOWHIDDENFILE=/lib/.libcrypto.so.6.hmac
-#ALLOWHIDDENFILE=/lib/.libssl.so.0.9.8e.hmac
-#ALLOWHIDDENFILE=/lib/.libssl.so.6.hmac
-#ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
-#ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.1.0.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libgcrypt.so.11.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha384hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha512hmac.hmac
-#ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
+ALLOWHIDDENFILE=/lib/.libcrypto.so.0.9.8e.hmac
+ALLOWHIDDENFILE=/lib/.libcrypto.so.6.hmac
+ALLOWHIDDENFILE=/lib/.libssl.so.0.9.8e.hmac
+ALLOWHIDDENFILE=/lib/.libssl.so.6.hmac
+ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
+ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.1.1.0.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.1.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.11.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
+ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
 
 #
 # Allow the specified processes to use deleted files.
@@ -495,7 +496,7 @@
 # ALLOWDEVFILE lines).
 #
 #ALLOWDEVFILE=/dev/abc
-#ALLOWDEVFILE=/dev/shm/pulse-shm-*
+ALLOWDEVFILE=/dev/shm/pulse-shm-*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_ReadPrefs_*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_REL_*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_WritePrefs_*
@@ -536,7 +537,7 @@
 # This setting tells rkhunter where the xinetd configuration
 # file is located.
 #
-#XINETD_CONF_PATH=/etc/xinetd.conf
+XINETD_CONF_PATH=/etc/xinetd.conf
 
 #
 # Allow the following enabled xinetd services. Whilst it would be
@@ -822,3 +823,5 @@
 # Enabling this feature implies you have the knowledge to interprete results properly. 
 #
 #SCANROOTKITMODE=THOROUGH
+
+INSTALLDIR="/usr"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jan 2009 23:22:15 -0000	1.10
+++ sources	6 Dec 2009 18:36:44 -0000	1.11
@@ -1 +1 @@
-31eaacc4d01ad138d1a4283f105088e6  rkhunter-1.3.4.tar.gz
+41bd92b1ea0803401c4a45215c8293a2  rkhunter-1.3.6.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Jan 2009 23:22:15 -0000	1.9
+++ .cvsignore	6 Dec 2009 18:36:44 -0000	1.10
@@ -1 +1 @@
-rkhunter-1.3.4.tar.gz
+rkhunter-1.3.6.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-12/rkhunter.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- rkhunter.spec	27 Nov 2009 05:24:16 -0000	1.27
+++ rkhunter.spec	6 Dec 2009 18:36:44 -0000	1.28
@@ -1,16 +1,15 @@
 Name:           rkhunter
-Version:        1.3.4
-Release:        9%{?dist}
+Version:        1.3.6
+Release:        2%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://rkhunter.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
-Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
-Patch0:         rkhunter-1.3.4-fedoraconfig.patch
+Patch0:         rkhunter-1.3.6-fedoraconfig.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,27 +55,19 @@ EOF
 %{__install} -m755 -p files/%{name}             ${RPM_BUILD_ROOT}%{_bindir}/
 
 %{__install} -m644 -p files/backdoorports.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/defaulthashes.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/md5blacklist.dat    ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/mirrors.dat         ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/os.dat              ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/programs_bad.dat    ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/programs_good.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/i18n/cn             ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/i18n/
 %{__install} -m644 -p files/i18n/en             ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/i18n/
 
 %{__install} -m644 -p files/CHANGELOG           ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m755 -p files/check_modules.pl    ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
-%{__install} -m755 -p files/check_port.pl       ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
-%{__install} -m755 -p files/check_update.sh     ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
 %{__install} -m644 -p files/*.8                 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 # Don't ship these unless we want to Require the perl modules
 #%{__install} -m750 -p files/filehashmd5.pl      ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
 #%{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
-%{__install} -m755 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
 %{__install} -m755 -p %{SOURCE2}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/%{name}
 %{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
@@ -104,6 +95,12 @@ EOF
 %{_mandir}/man8/*
 
 %changelog
+* Tue Dec 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.6-2
+- Disable apps check by default - bug #543065
+
+* Sun Nov 29 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.6-1
+- Update to 1.3.6
+
 * Thu Nov 26 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-9
 - Add exception for /dev/.mdadm file - bug #539405
 


--- rkhunter-1.3.4-fedoraconfig.patch DELETED ---



From acme at fedoraproject.org  Sun Dec  6 18:39:57 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Sun,  6 Dec 2009 18:39:57 +0000 (UTC)
Subject: rpms/dwarves/F-12 .cvsignore, 1.5, 1.6 dwarves.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091206183957.4EF7F11C00E0@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/dwarves/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27044

Modified Files:
	.cvsignore dwarves.spec sources 
Log Message:
New upstream release: 1.8

Fixes: 540955

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Feb 2009 14:16:38 -0000	1.5
+++ .cvsignore	6 Dec 2009 18:39:56 -0000	1.6
@@ -1 +1 @@
-dwarves-1.7.tar.bz2
+dwarves-1.8.tar.bz2


Index: dwarves.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/F-12/dwarves.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dwarves.spec	24 Jul 2009 20:41:11 -0000	1.7
+++ dwarves.spec	6 Dec 2009 18:39:57 -0000	1.8
@@ -2,20 +2,19 @@
 %define libver 1
 
 Name: dwarves
-Version: 1.7
-Release: 5
+Version: 1.8
+Release: 1%{?dist}
 License: GPLv2
-Summary: Dwarf Tools
+Summary: Debugging Information Manipulation Tools
 Group: Development/Tools
 URL: http://oops.ghostprotocols.net:81/blog
 Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.bz2
 BuildRequires: cmake
 BuildRequires: elfutils-devel >= 0.130
-BuildRequires: zlib-devel
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
-dwarves is a set of tools that use the DWARF debugging information inserted in
+dwarves is a set of tools that use the debugging information inserted in
 ELF binaries by compilers such as GCC, used by well known debuggers such as
 GDB, and more recent ones such as systemtap.
 
@@ -32,23 +31,20 @@ code generate on the resulting binaries.
 Another tool is pfunct, that can be used to find all sorts of information about
 functions, inlines, decisions made by the compiler about inlining, etc.
 
-The documentation about ctracer is not updated to the latest developments: it
-now generates systemtap scripts, stay tuned for improvements in this area!
-
 %package -n %{libname}%{libver}
-Summary: DWARF processing library
+Summary: Debugging information  processing library
 Group: Development/Libraries
 
 %description -n %{libname}%{libver}
-DWARF processing library
+Debugging information processing library.
 
 %package -n %{libname}%{libver}-devel
-Summary: DWARF processing library development files
+Summary: Debugging information library development files
 Group: Development/Libraries
 Requires: %{libname}%{libver} = %{version}-%{release}
 
 %description -n %{libname}%{libver}-devel
-DWARF processing library development files
+Debugging information processing library development files.
 
 %prep
 %setup -q -c -n %{name}-%{version}
@@ -103,22 +99,21 @@ rm -rf %{buildroot}
 %files -n %{libname}%{libver}-devel
 %defattr(0644,root,root,0755)
 %doc MANIFEST README
-%{_includedir}/dwarves.h
-%{_includedir}/dwarves_emit.h
-%{_includedir}/dwarves_reorganize.h
+%{_includedir}/dwarves/dwarves.h
+%{_includedir}/dwarves/dwarves_emit.h
+%{_includedir}/dwarves/dwarves_reorganize.h
+%{_includedir}/dwarves/dutil.h
+%{_includedir}/dwarves/gobuffer.h
+%{_includedir}/dwarves/list.h
+%{_includedir}/dwarves/rbtree.h
+%{_includedir}/dwarves/strings.h
 %{_libdir}/%{libname}.so
 %{_libdir}/%{libname}_emit.so
 %{_libdir}/%{libname}_reorganize.so
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 13 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.7-3
-- Add BuildRequires for zlib-devel
+* Fri Dec  4 2009 Apr 23 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.8-1
+- New release
 
 * Fri Feb 13 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.7-2
 - Own /usr/share/dwarves, fixes #473645 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Feb 2009 14:16:38 -0000	1.5
+++ sources	6 Dec 2009 18:39:57 -0000	1.6
@@ -1 +1 @@
-30dfc01981e139269fcfed72c6784d2f  dwarves-1.7.tar.bz2
+92ef945346d087ff3d29fb03c0e08625  dwarves-1.8.tar.bz2



From kevin at fedoraproject.org  Sun Dec  6 18:52:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 18:52:41 +0000 (UTC)
Subject: rpms/rkhunter/F-11 rkhunter-1.3.6-fedoraconfig.patch, NONE,
	1.1 sources, 1.10, 1.11 .cvsignore, 1.9, 1.10 rkhunter.spec,
	1.25, 1.26 rkhunter-1.3.4-fedoraconfig.patch, 1.4, NONE
Message-ID: <20091206185241.3517411C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31248

Modified Files:
	sources .cvsignore rkhunter.spec 
Added Files:
	rkhunter-1.3.6-fedoraconfig.patch 
Removed Files:
	rkhunter-1.3.4-fedoraconfig.patch 
Log Message:
Disable apps check by default - bug #543065
Update to 1.3.6


rkhunter-1.3.6-fedoraconfig.patch:
 rkhunter.conf |   81 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

--- NEW FILE rkhunter-1.3.6-fedoraconfig.patch ---
diff -Nur rkhunter-1.3.6.orig/files/rkhunter.conf rkhunter-1.3.6/files/rkhunter.conf
--- rkhunter-1.3.6.orig/files/rkhunter.conf	2009-11-28 15:13:19.000000000 -0700
+++ rkhunter-1.3.6/files/rkhunter.conf	2009-12-01 17:43:15.000000000 -0700
@@ -71,7 +71,7 @@
 # NOTE: This option should be present in the configuration file.
 #
 #MAIL-ON-WARNING=me at mydomain   root at mydomain
-MAIL-ON-WARNING=""
+MAIL-ON-WARNING="root at localhost"
 
 #
 # Specify the mail command to use if MAIL-ON-WARNING is set.
@@ -87,17 +87,17 @@
 # important files will be written to this directory, so be
 # sure that the directory permissions are tight.
 #
-#TMPDIR=/var/lib/rkhunter/tmp
+TMPDIR=/var/lib/rkhunter
 
 #
 # Specify the database directory to use.
 #
-#DBDIR=/var/lib/rkhunter/db
+DBDIR=/var/lib/rkhunter/db
 
 #
 # Specify the script directory to use.
 #
-#SCRIPTDIR=/usr/local/lib/rkhunter/scripts
+SCRIPTDIR=/usr/share/rkhunter/scripts
 
 #
 # Specify the root directory to use.
@@ -138,13 +138,13 @@
 #
 # NOTE: This option should be present in the configuration file.
 #
-LOGFILE=/var/log/rkhunter.log
+LOGFILE=/var/log/rkhunter/rkhunter.log
 
 #
 # Set the following option to 1 if the log file is to be appended to
 # whenever rkhunter is run.
 #
-APPEND_LOG=0
+APPEND_LOG=1
 
 #
 # Set the following option to 1 if the log file is to be copied when
@@ -166,7 +166,7 @@
 # Setting the value to 'none', or just leaving the option commented out,
 # disables the use of syslog.
 #
-#USE_SYSLOG=authpriv.notice
+USE_SYSLOG=authpriv.notice
 
 #
 # Set the following option to 1 if the second colour set is to be used.
@@ -196,7 +196,7 @@
 # file, then a value here of 'yes' or 'unset' will not cause a warning.
 # This option has a default value of 'no'.
 #
-ALLOW_SSH_ROOT_USER=no
+ALLOW_SSH_ROOT_USER=yes
 
 #
 # Set this option to '1' to allow the use of the SSH-1 protocol, but note
@@ -236,7 +236,7 @@
 # tests, the test names, and how rkhunter behaves when these options are used.
 #
 ENABLE_TESTS="all"
-DISABLE_TESTS="suspscan hidden_procs deleted_files packet_cap_apps"
+DISABLE_TESTS="apps suspscan hidden_procs deleted_files packet_cap_apps"
 
 #
 # The HASH_FUNC option can be used to specify the command to use
@@ -299,7 +299,7 @@
 #
 # Whenever this option is changed 'rkhunter --propupd' must be run.
 #
-#PKGMGR=NONE
+PKGMGR=RPM
 
 #
 # It is possible that a file which is part of a package may be modified
@@ -392,9 +392,12 @@
 # Allow the specified commands to be scripts.
 # One command per line (use multiple SCRIPTWHITELIST lines).
 #
-#SCRIPTWHITELIST=/sbin/ifup
-#SCRIPTWHITELIST=/sbin/ifdown
-#SCRIPTWHITELIST=/usr/bin/groups
+SCRIPTWHITELIST=/usr/bin/whatis
+SCRIPTWHITELIST=/usr/bin/ldd
+SCRIPTWHITELIST=/usr/bin/groups
+SCRIPTWHITELIST=/usr/bin/GET
+SCRIPTWHITELIST=/sbin/ifup
+SCRIPTWHITELIST=/sbin/ifdown
 
 #
 # Allow the specified commands to have the immutable attribute set.
@@ -406,37 +409,35 @@
 # Allow the specified hidden directories.
 # One directory per line (use multiple ALLOWHIDDENDIR lines).
 #
-#ALLOWHIDDENDIR=/etc/.java
-#ALLOWHIDDENDIR=/dev/.udev
-#ALLOWHIDDENDIR=/dev/.udevdb
-#ALLOWHIDDENDIR=/dev/.udev.tdb
-#ALLOWHIDDENDIR=/dev/.static
-#ALLOWHIDDENDIR=/dev/.initramfs
-#ALLOWHIDDENDIR=/dev/.SRC-unix
-#ALLOWHIDDENDIR=/dev/.mdadm
+ALLOWHIDDENDIR=/dev/.udev
+ALLOWHIDDENDIR=/dev/.udevdb
+ALLOWHIDDENDIR=/dev/.udev.tdb
+ALLOWHIDDENDIR=/dev/.static
+ALLOWHIDDENDIR=/dev/.initramfs
+ALLOWHIDDENDIR=/dev/.SRC-unix
+ALLOWHIDDENDIR=/dev/.mdadm
 
 #
 # Allow the specified hidden files.
 # One file per line (use multiple ALLOWHIDDENFILE lines).
 # 
-#ALLOWHIDDENFILE=/etc/.java
-#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
+ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
 #ALLOWHIDDENFILE=/etc/.pwd.lock
 #ALLOWHIDDENFILE=/etc/.init.state
-#ALLOWHIDDENFILE=/lib/.libcrypto.so.0.9.8e.hmac
-#ALLOWHIDDENFILE=/lib/.libcrypto.so.6.hmac
-#ALLOWHIDDENFILE=/lib/.libssl.so.0.9.8e.hmac
-#ALLOWHIDDENFILE=/lib/.libssl.so.6.hmac
-#ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
-#ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.1.0.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libgcrypt.so.11.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha384hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha512hmac.hmac
-#ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
+ALLOWHIDDENFILE=/lib/.libcrypto.so.0.9.8e.hmac
+ALLOWHIDDENFILE=/lib/.libcrypto.so.6.hmac
+ALLOWHIDDENFILE=/lib/.libssl.so.0.9.8e.hmac
+ALLOWHIDDENFILE=/lib/.libssl.so.6.hmac
+ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
+ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.1.1.0.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.1.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.11.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
+ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
 
 #
 # Allow the specified processes to use deleted files.
@@ -495,7 +496,7 @@
 # ALLOWDEVFILE lines).
 #
 #ALLOWDEVFILE=/dev/abc
-#ALLOWDEVFILE=/dev/shm/pulse-shm-*
+ALLOWDEVFILE=/dev/shm/pulse-shm-*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_ReadPrefs_*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_REL_*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_WritePrefs_*
@@ -536,7 +537,7 @@
 # This setting tells rkhunter where the xinetd configuration
 # file is located.
 #
-#XINETD_CONF_PATH=/etc/xinetd.conf
+XINETD_CONF_PATH=/etc/xinetd.conf
 
 #
 # Allow the following enabled xinetd services. Whilst it would be
@@ -822,3 +823,5 @@
 # Enabling this feature implies you have the knowledge to interprete results properly. 
 #
 #SCANROOTKITMODE=THOROUGH
+
+INSTALLDIR="/usr"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jan 2009 23:22:15 -0000	1.10
+++ sources	6 Dec 2009 18:52:40 -0000	1.11
@@ -1 +1 @@
-31eaacc4d01ad138d1a4283f105088e6  rkhunter-1.3.4.tar.gz
+41bd92b1ea0803401c4a45215c8293a2  rkhunter-1.3.6.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Jan 2009 23:22:15 -0000	1.9
+++ .cvsignore	6 Dec 2009 18:52:40 -0000	1.10
@@ -1 +1 @@
-rkhunter-1.3.4.tar.gz
+rkhunter-1.3.6.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-11/rkhunter.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- rkhunter.spec	3 Jul 2009 23:29:36 -0000	1.25
+++ rkhunter.spec	6 Dec 2009 18:52:40 -0000	1.26
@@ -1,16 +1,15 @@
 Name:           rkhunter
-Version:        1.3.4
-Release:        7%{?dist}
+Version:        1.3.6
+Release:        2%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://rkhunter.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
-Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
-Patch0:         rkhunter-1.3.4-fedoraconfig.patch
+Patch0:         rkhunter-1.3.6-fedoraconfig.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,27 +55,19 @@ EOF
 %{__install} -m755 -p files/%{name}             ${RPM_BUILD_ROOT}%{_bindir}/
 
 %{__install} -m644 -p files/backdoorports.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/defaulthashes.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/md5blacklist.dat    ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/mirrors.dat         ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/os.dat              ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/programs_bad.dat    ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/programs_good.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/i18n/cn             ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/i18n/
 %{__install} -m644 -p files/i18n/en             ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/i18n/
 
 %{__install} -m644 -p files/CHANGELOG           ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m755 -p files/check_modules.pl    ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
-%{__install} -m755 -p files/check_port.pl       ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
-%{__install} -m755 -p files/check_update.sh     ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
 %{__install} -m644 -p files/*.8                 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 # Don't ship these unless we want to Require the perl modules
 #%{__install} -m750 -p files/filehashmd5.pl      ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
 #%{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
-%{__install} -m755 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
 %{__install} -m755 -p %{SOURCE2}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/%{name}
 %{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
@@ -104,6 +95,18 @@ EOF
 %{_mandir}/man8/*
 
 %changelog
+* Tue Dec 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.6-2
+- Disable apps check by default - bug #543065
+
+* Sun Nov 29 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.6-1
+- Update to 1.3.6
+
+* Thu Nov 26 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-9
+- Add exception for /dev/.mdadm file - bug #539405
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 03 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-7
 - Add exception for software raid udev file - bug #509253
 


--- rkhunter-1.3.4-fedoraconfig.patch DELETED ---



From acme at fedoraproject.org  Sun Dec  6 18:54:02 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Sun,  6 Dec 2009 18:54:02 +0000 (UTC)
Subject: rpms/dwarves/F-12 dwarves.spec,1.8,1.9
Message-ID: <20091206185402.8C43711C00E0@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/dwarves/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31670

Modified Files:
	dwarves.spec 
Log Message:
Add BuildRequires zlib-devel

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



Index: dwarves.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/F-12/dwarves.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dwarves.spec	6 Dec 2009 18:39:57 -0000	1.8
+++ dwarves.spec	6 Dec 2009 18:54:02 -0000	1.9
@@ -10,6 +10,7 @@ Group: Development/Tools
 URL: http://oops.ghostprotocols.net:81/blog
 Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.bz2
 BuildRequires: cmake
+BuildRequires: zlib-devel
 BuildRequires: elfutils-devel >= 0.130
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 



From pkgdb at fedoraproject.org  Sun Dec  6 19:35:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:35:52 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has given up watchbugzilla
Message-ID: <20091206193553.0982F10F861@bastion2.fedora.phx.redhat.com>

ke4qqq has given up the watchbugzilla acl on zikula-module-pagemaster (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:00 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has requested commit
Message-ID: <20091206193600.EF62710F89D@bastion2.fedora.phx.redhat.com>

ke4qqq has requested the commit acl on zikula-module-pagemaster (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:04 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has requested approveacls
Message-ID: <20091206193604.923B910F8A5@bastion2.fedora.phx.redhat.com>

ke4qqq has requested the approveacls acl on zikula-module-pagemaster (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:37 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has given up watchcommits
Message-ID: <20091206193638.5732F10F878@bastion2.fedora.phx.redhat.com>

ke4qqq has given up the watchcommits acl on zikula-module-pagemaster (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:43 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has given up watchbugzilla
Message-ID: <20091206193643.751A910F8A1@bastion2.fedora.phx.redhat.com>

ke4qqq has given up the watchbugzilla acl on zikula-module-pagemaster (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:44 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has given up watchcommits
Message-ID: <20091206193644.69E0210F8A6@bastion2.fedora.phx.redhat.com>

ke4qqq has given up the watchcommits acl on zikula-module-pagemaster (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:44 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has requested commit
Message-ID: <20091206193644.DE15C10F8AC@bastion2.fedora.phx.redhat.com>

ke4qqq has requested the commit acl on zikula-module-pagemaster (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:47 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has requested approveacls
Message-ID: <20091206193647.72EE210F8B1@bastion2.fedora.phx.redhat.com>

ke4qqq has requested the approveacls acl on zikula-module-pagemaster (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:54 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has given up watchbugzilla
Message-ID: <20091206193654.632AA10F8B3@bastion2.fedora.phx.redhat.com>

ke4qqq has given up the watchbugzilla acl on zikula-module-pagemaster (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:36:55 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has requested commit
Message-ID: <20091206193655.5F5FE10F8B8@bastion2.fedora.phx.redhat.com>

ke4qqq has requested the commit acl on zikula-module-pagemaster (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:37:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:37:00 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has requested approveacls
Message-ID: <20091206193700.E660110F89E@bastion2.fedora.phx.redhat.com>

ke4qqq has requested the approveacls acl on zikula-module-pagemaster (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:37:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:37:03 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has given up watchcommits
Message-ID: <20091206193703.229B210F8BD@bastion2.fedora.phx.redhat.com>

ke4qqq has given up the watchcommits acl on zikula-module-pagemaster (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:37:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:37:11 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has given up watchbugzilla
Message-ID: <20091206193711.D98D310F8C0@bastion2.fedora.phx.redhat.com>

ke4qqq has given up the watchbugzilla acl on zikula-module-pagemaster (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:37:12 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has requested commit
Message-ID: <20091206193712.C10C610F8C3@bastion2.fedora.phx.redhat.com>

ke4qqq has requested the commit acl on zikula-module-pagemaster (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:37:15 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has requested approveacls
Message-ID: <20091206193715.659D710F8C9@bastion2.fedora.phx.redhat.com>

ke4qqq has requested the approveacls acl on zikula-module-pagemaster (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:37:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:37:17 +0000
Subject: [pkgdb] zikula-module-pagemaster: ke4qqq has given up watchcommits
Message-ID: <20091206193717.5D24510F8CE@bastion2.fedora.phx.redhat.com>

ke4qqq has given up the watchcommits acl on zikula-module-pagemaster (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:45:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:45:17 +0000
Subject: [pkgdb] zikula-module-pagemaster had acl change status
Message-ID: <20091206194517.B2E5010F85F@bastion2.fedora.phx.redhat.com>

mchua has set the commit acl on zikula-module-pagemaster (Fedora devel) to Approved for ke4qqq

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Sun Dec  6 19:45:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 19:45:19 +0000
Subject: [pkgdb] zikula-module-pagemaster had acl change status
Message-ID: <20091206194519.B544210F8A1@bastion2.fedora.phx.redhat.com>

mchua has set the approveacls acl on zikula-module-pagemaster (Fedora devel) to Approved for ke4qqq

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-pagemaster



From kevin at fedoraproject.org  Sun Dec  6 19:47:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 19:47:47 +0000 (UTC)
Subject: rpms/rkhunter/EL-5 rkhunter-1.3.6-fedoraconfig.patch, NONE,
	1.1 rkhunter.spec, 1.18, 1.19 sources, 1.10, 1.11 .cvsignore,
	1.9, 1.10 rkhunter-1.3.2.tar.gz.sha1.txt, 1.1,
	NONE rkhunter-1.3.4-fedoraconfig.patch, 1.2, NONE
Message-ID: <20091206194747.79D0A11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12292

Modified Files:
	rkhunter.spec sources .cvsignore 
Added Files:
	rkhunter-1.3.6-fedoraconfig.patch 
Removed Files:
	rkhunter-1.3.2.tar.gz.sha1.txt 
	rkhunter-1.3.4-fedoraconfig.patch 
Log Message:
Disable apps check by default - bug #543065
Update to 1.3.6


rkhunter-1.3.6-fedoraconfig.patch:
 rkhunter.conf |   81 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

--- NEW FILE rkhunter-1.3.6-fedoraconfig.patch ---
diff -Nur rkhunter-1.3.6.orig/files/rkhunter.conf rkhunter-1.3.6/files/rkhunter.conf
--- rkhunter-1.3.6.orig/files/rkhunter.conf	2009-11-28 15:13:19.000000000 -0700
+++ rkhunter-1.3.6/files/rkhunter.conf	2009-12-01 17:43:15.000000000 -0700
@@ -71,7 +71,7 @@
 # NOTE: This option should be present in the configuration file.
 #
 #MAIL-ON-WARNING=me at mydomain   root at mydomain
-MAIL-ON-WARNING=""
+MAIL-ON-WARNING="root at localhost"
 
 #
 # Specify the mail command to use if MAIL-ON-WARNING is set.
@@ -87,17 +87,17 @@
 # important files will be written to this directory, so be
 # sure that the directory permissions are tight.
 #
-#TMPDIR=/var/lib/rkhunter/tmp
+TMPDIR=/var/lib/rkhunter
 
 #
 # Specify the database directory to use.
 #
-#DBDIR=/var/lib/rkhunter/db
+DBDIR=/var/lib/rkhunter/db
 
 #
 # Specify the script directory to use.
 #
-#SCRIPTDIR=/usr/local/lib/rkhunter/scripts
+SCRIPTDIR=/usr/share/rkhunter/scripts
 
 #
 # Specify the root directory to use.
@@ -138,13 +138,13 @@
 #
 # NOTE: This option should be present in the configuration file.
 #
-LOGFILE=/var/log/rkhunter.log
+LOGFILE=/var/log/rkhunter/rkhunter.log
 
 #
 # Set the following option to 1 if the log file is to be appended to
 # whenever rkhunter is run.
 #
-APPEND_LOG=0
+APPEND_LOG=1
 
 #
 # Set the following option to 1 if the log file is to be copied when
@@ -166,7 +166,7 @@
 # Setting the value to 'none', or just leaving the option commented out,
 # disables the use of syslog.
 #
-#USE_SYSLOG=authpriv.notice
+USE_SYSLOG=authpriv.notice
 
 #
 # Set the following option to 1 if the second colour set is to be used.
@@ -196,7 +196,7 @@
 # file, then a value here of 'yes' or 'unset' will not cause a warning.
 # This option has a default value of 'no'.
 #
-ALLOW_SSH_ROOT_USER=no
+ALLOW_SSH_ROOT_USER=yes
 
 #
 # Set this option to '1' to allow the use of the SSH-1 protocol, but note
@@ -236,7 +236,7 @@
 # tests, the test names, and how rkhunter behaves when these options are used.
 #
 ENABLE_TESTS="all"
-DISABLE_TESTS="suspscan hidden_procs deleted_files packet_cap_apps"
+DISABLE_TESTS="apps suspscan hidden_procs deleted_files packet_cap_apps"
 
 #
 # The HASH_FUNC option can be used to specify the command to use
@@ -299,7 +299,7 @@
 #
 # Whenever this option is changed 'rkhunter --propupd' must be run.
 #
-#PKGMGR=NONE
+PKGMGR=RPM
 
 #
 # It is possible that a file which is part of a package may be modified
@@ -392,9 +392,12 @@
 # Allow the specified commands to be scripts.
 # One command per line (use multiple SCRIPTWHITELIST lines).
 #
-#SCRIPTWHITELIST=/sbin/ifup
-#SCRIPTWHITELIST=/sbin/ifdown
-#SCRIPTWHITELIST=/usr/bin/groups
+SCRIPTWHITELIST=/usr/bin/whatis
+SCRIPTWHITELIST=/usr/bin/ldd
+SCRIPTWHITELIST=/usr/bin/groups
+SCRIPTWHITELIST=/usr/bin/GET
+SCRIPTWHITELIST=/sbin/ifup
+SCRIPTWHITELIST=/sbin/ifdown
 
 #
 # Allow the specified commands to have the immutable attribute set.
@@ -406,37 +409,35 @@
 # Allow the specified hidden directories.
 # One directory per line (use multiple ALLOWHIDDENDIR lines).
 #
-#ALLOWHIDDENDIR=/etc/.java
-#ALLOWHIDDENDIR=/dev/.udev
-#ALLOWHIDDENDIR=/dev/.udevdb
-#ALLOWHIDDENDIR=/dev/.udev.tdb
-#ALLOWHIDDENDIR=/dev/.static
-#ALLOWHIDDENDIR=/dev/.initramfs
-#ALLOWHIDDENDIR=/dev/.SRC-unix
-#ALLOWHIDDENDIR=/dev/.mdadm
+ALLOWHIDDENDIR=/dev/.udev
+ALLOWHIDDENDIR=/dev/.udevdb
+ALLOWHIDDENDIR=/dev/.udev.tdb
+ALLOWHIDDENDIR=/dev/.static
+ALLOWHIDDENDIR=/dev/.initramfs
+ALLOWHIDDENDIR=/dev/.SRC-unix
+ALLOWHIDDENDIR=/dev/.mdadm
 
 #
 # Allow the specified hidden files.
 # One file per line (use multiple ALLOWHIDDENFILE lines).
 # 
-#ALLOWHIDDENFILE=/etc/.java
-#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
+ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
 #ALLOWHIDDENFILE=/etc/.pwd.lock
 #ALLOWHIDDENFILE=/etc/.init.state
-#ALLOWHIDDENFILE=/lib/.libcrypto.so.0.9.8e.hmac
-#ALLOWHIDDENFILE=/lib/.libcrypto.so.6.hmac
-#ALLOWHIDDENFILE=/lib/.libssl.so.0.9.8e.hmac
-#ALLOWHIDDENFILE=/lib/.libssl.so.6.hmac
-#ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
-#ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.1.0.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.hmac
-#ALLOWHIDDENFILE=/usr/lib/.libgcrypt.so.11.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha384hmac.hmac
-#ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha512hmac.hmac
-#ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
+ALLOWHIDDENFILE=/lib/.libcrypto.so.0.9.8e.hmac
+ALLOWHIDDENFILE=/lib/.libcrypto.so.6.hmac
+ALLOWHIDDENFILE=/lib/.libssl.so.0.9.8e.hmac
+ALLOWHIDDENFILE=/lib/.libssl.so.6.hmac
+ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
+ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.1.1.0.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.1.hmac
+ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.11.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
+ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
 
 #
 # Allow the specified processes to use deleted files.
@@ -495,7 +496,7 @@
 # ALLOWDEVFILE lines).
 #
 #ALLOWDEVFILE=/dev/abc
-#ALLOWDEVFILE=/dev/shm/pulse-shm-*
+ALLOWDEVFILE=/dev/shm/pulse-shm-*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_ReadPrefs_*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_REL_*
 #ALLOWDEVFILE=/dev/shm/sem.ADBE_WritePrefs_*
@@ -536,7 +537,7 @@
 # This setting tells rkhunter where the xinetd configuration
 # file is located.
 #
-#XINETD_CONF_PATH=/etc/xinetd.conf
+XINETD_CONF_PATH=/etc/xinetd.conf
 
 #
 # Allow the following enabled xinetd services. Whilst it would be
@@ -822,3 +823,5 @@
 # Enabling this feature implies you have the knowledge to interprete results properly. 
 #
 #SCANROOTKITMODE=THOROUGH
+
+INSTALLDIR="/usr"


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/EL-5/rkhunter.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- rkhunter.spec	28 Oct 2009 03:21:05 -0000	1.18
+++ rkhunter.spec	6 Dec 2009 19:47:47 -0000	1.19
@@ -1,16 +1,15 @@
 Name:           rkhunter
-Version:        1.3.4
-Release:        8%{?dist}
+Version:        1.3.6
+Release:        2%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://rkhunter.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
-Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
-Patch0:         rkhunter-1.3.4-fedoraconfig.patch
+Patch0:         rkhunter-1.3.6-fedoraconfig.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,27 +55,19 @@ EOF
 %{__install} -m755 -p files/%{name}             ${RPM_BUILD_ROOT}%{_bindir}/
 
 %{__install} -m644 -p files/backdoorports.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/defaulthashes.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/md5blacklist.dat    ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/mirrors.dat         ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/os.dat              ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/programs_bad.dat    ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
-%{__install} -m644 -p files/programs_good.dat   ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/
 %{__install} -m644 -p files/i18n/cn             ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/i18n/
 %{__install} -m644 -p files/i18n/en             ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/i18n/
 
 %{__install} -m644 -p files/CHANGELOG           ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m755 -p files/check_modules.pl    ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
-%{__install} -m755 -p files/check_port.pl       ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
-%{__install} -m755 -p files/check_update.sh     ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
 %{__install} -m644 -p files/*.8                 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 # Don't ship these unless we want to Require the perl modules
 #%{__install} -m750 -p files/filehashmd5.pl      ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
 #%{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
-%{__install} -m755 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
 %{__install} -m755 -p %{SOURCE2}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/%{name}
 %{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
@@ -104,6 +95,15 @@ EOF
 %{_mandir}/man8/*
 
 %changelog
+* Tue Dec 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.6-2
+- Disable apps check by default - bug #543065
+
+* Sun Nov 29 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.6-1
+- Update to 1.3.6
+
+* Thu Nov 26 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-9
+- Add exception for /dev/.mdadm file - bug #539405
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Mar 2009 04:47:10 -0000	1.10
+++ sources	6 Dec 2009 19:47:47 -0000	1.11
@@ -1 +1 @@
-31eaacc4d01ad138d1a4283f105088e6  rkhunter-1.3.4.tar.gz
+41bd92b1ea0803401c4a45215c8293a2  rkhunter-1.3.6.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	12 Mar 2009 04:47:10 -0000	1.9
+++ .cvsignore	6 Dec 2009 19:47:47 -0000	1.10
@@ -1 +1 @@
-rkhunter-1.3.4.tar.gz
+rkhunter-1.3.6.tar.gz


--- rkhunter-1.3.2.tar.gz.sha1.txt DELETED ---


--- rkhunter-1.3.4-fedoraconfig.patch DELETED ---



From sharkcz at fedoraproject.org  Sun Dec  6 19:47:54 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  6 Dec 2009 19:47:54 +0000 (UTC)
Subject: File lsscsi-0.23.tgz uploaded to lookaside cache by sharkcz
Message-ID: <20091206194754.9DCE010F861@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lsscsi:

de3e51358ddf046a139483196106c1ac  lsscsi-0.23.tgz



From sharkcz at fedoraproject.org  Sun Dec  6 19:50:01 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  6 Dec 2009 19:50:01 +0000 (UTC)
Subject: rpms/lsscsi/devel .cvsignore, 1.4, 1.5 lsscsi.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20091206195001.2E5A611C00E0@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/lsscsi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13139

Modified Files:
	.cvsignore lsscsi.spec sources 
Log Message:
* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
- update to 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Feb 2009 11:46:54 -0000	1.4
+++ .cvsignore	6 Dec 2009 19:50:00 -0000	1.5
@@ -1 +1 @@
-lsscsi-0.22.tgz
+lsscsi-0.23.tgz


Index: lsscsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/devel/lsscsi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- lsscsi.spec	25 Jul 2009 11:22:05 -0000	1.10
+++ lsscsi.spec	6 Dec 2009 19:50:00 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:        List SCSI devices (or hosts) and associated information
 Name:           lsscsi
-Version:        0.22
-Release:        3%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 Source0:        http://sg.danny.cz/scsi/%{name}-%{version}.tgz
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
+- update to 0.23
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Feb 2009 11:46:54 -0000	1.4
+++ sources	6 Dec 2009 19:50:00 -0000	1.5
@@ -1 +1 @@
-7175cd6525fcbd5cd56129893c1c4f7b  lsscsi-0.22.tgz
+de3e51358ddf046a139483196106c1ac  lsscsi-0.23.tgz



From mtasaka at fedoraproject.org  Sun Dec  6 19:55:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  6 Dec 2009 19:55:54 +0000 (UTC)
Subject: rpms/ruby/F-10 ruby-1.8.6-CVE-2009-1904-bigdecimal.patch, NONE,
	1.1 ruby.spec, 1.126, 1.127
Message-ID: <20091206195554.24F4011C00E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15052

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.6-CVE-2009-1904-bigdecimal.patch 
Log Message:
* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.386-2
- Patch for bigdecimal DOS issue (CVE-2009-1904, bug 504958)


ruby-1.8.6-CVE-2009-1904-bigdecimal.patch:
 bigdecimal.c |   80 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 25 deletions(-)

--- NEW FILE ruby-1.8.6-CVE-2009-1904-bigdecimal.patch ---
--- branches/ruby_1_8_6/ext/bigdecimal/bigdecimal.c	2009/02/11 14:36:59	22241
+++ branches/ruby_1_8_6/ext/bigdecimal/bigdecimal.c	2009/06/08 19:01:00	23652
@@ -306,17 +306,22 @@
 BigDecimal_dump(int argc, VALUE *argv, VALUE self)
 {
     ENTER(5);
-    char sz[50];
     Real *vp;
     char *psz;
     VALUE dummy;
+    volatile VALUE dump;
+
     rb_scan_args(argc, argv, "01", &dummy);
     GUARD_OBJ(vp,GetVpValue(self,1));
-    sprintf(sz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
-    psz = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E")+strlen(sz));
-    sprintf(psz,"%s",sz);
+
+    dump = rb_str_new(0,VpNumOfChars(vp,"E")+50);
+    psz = RSTRING_PTR(dump);
+    sprintf(psz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
+
     VpToString(vp, psz+strlen(psz), 0, 0);
-    return rb_str_new2(psz);
+
+    rb_str_resize(dump, strlen(psz));
+    return dump;
 }
 
 /*
@@ -520,6 +525,7 @@
     ENTER(5);
     int e,n,i,nf;
     U_LONG v,b,j;
+    volatile VALUE str;
     char *psz,*pch;
     Real *p;
 
@@ -534,7 +540,7 @@
        return Qnil;
     } else if(VpIsNegInf(p)) {
        VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
-       return Qnil;
+       return Qnil; 
     }
 
     e = VpExponent10(p);
@@ -544,10 +550,12 @@
         e = VpGetSign(p)*p->frac[0];
         return INT2FIX(e);
     }
-    psz = ALLOCA_N(char,(unsigned int)(e+nf+2));
 
+    str = rb_str_new(0, e+nf+2);
+    psz = RSTRING_PTR(str);
     n = (e+nf-1)/nf;
     pch = psz;
+
     if(VpGetSign(p)<0) *pch++ = '-';
     for(i=0;i<n;++i) {
         b = VpBaseVal()/10;
@@ -567,6 +575,7 @@
         }
     }
     *pch++ = 0;
+
     return rb_cstr2inum(psz,10);
 }
 
@@ -589,14 +598,19 @@
     double d;
     S_LONG e;
     char *buf;
+    volatile VALUE str;
 
     GUARD_OBJ(p,GetVpValue(self,1));
     if(VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
-    buf = ALLOCA_N(char,(unsigned int)VpNumOfChars(p,"E"));
+    if (e > DBL_MAX_10_EXP) goto erange;
+    str = rb_str_new(0, VpNumOfChars(p,"E"));
+    buf = RSTRING_PTR(str);
+
     VpToString(p, buf, 0, 0);
     errno = 0;
     d = strtod(buf, 0);
     if(errno == ERANGE) {
+      erange:
        VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
        if(d>0.0) return rb_float_new(DBL_MAX);
        else      return rb_float_new(-DBL_MAX);
@@ -1491,6 +1505,7 @@
     int   fmt=0;   /* 0:E format */
     int   fPlus=0; /* =0:default,=1: set ' ' before digits ,set '+' before digits. */
     Real  *vp;
+    volatile VALUE str;
     char  *psz;
     char   ch;
     U_LONG nc;
@@ -1527,14 +1542,17 @@
     }
     if(mc>0) nc += (nc + mc - 1) / mc + 1;
 
-    psz = ALLOCA_N(char,(unsigned int)nc);
+    str = rb_str_new(0, nc);
+    psz = RSTRING_PTR(str);
 
     if(fmt) {
         VpToFString(vp, psz, mc, fPlus);
     } else {
         VpToString (vp, psz, mc, fPlus);
     }
-    return rb_str_new2(psz);
+
+    rb_str_resize(str, strlen(psz));
+    return str;
 }
 
 /* Splits a BigDecimal number into four parts, returned as an array of values.
@@ -1566,24 +1584,29 @@
 {
     ENTER(5);
     Real *vp;
-    VALUE obj,obj1;
+    VALUE obj,str;
     S_LONG e;
     S_LONG s;
     char *psz1;
 
     GUARD_OBJ(vp,GetVpValue(self,1));
-    psz1 = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E"));
+    str = rb_str_new(0, VpNumOfChars(vp,"E"));
+    psz1 = RSTRING_PTR(str);
+
     VpSzMantissa(vp,psz1);
     s = 1;
     if(psz1[0]=='-') {
-        s = -1; ++psz1;
+	int len = strlen(psz1+1);
+	memmove(psz1, psz1+1, len);
+	psz1[len] = '\0';
+        s = -1;
     }
     if(psz1[0]=='N') s=0; /* NaN */
     e = VpExponent10(vp);
-    obj1 = rb_str_new2(psz1);
     obj  = rb_ary_new2(4);
     rb_ary_push(obj, INT2FIX(s));
-    rb_ary_push(obj, obj1);
+    rb_ary_push(obj, str);
+    rb_str_resize(str, strlen(psz1));
     rb_ary_push(obj, INT2FIX(10));
     rb_ary_push(obj, INT2NUM(e));
     return obj;
@@ -1616,20 +1639,23 @@
 {
     ENTER(5);
     Real *vp;
-    VALUE obj;
+    volatile VALUE obj;
     unsigned int nc;
-    char *psz1;
-    char *pszAll;
+    char *psz, *tmp;
 
     GUARD_OBJ(vp,GetVpValue(self,1));
     nc = VpNumOfChars(vp,"E");
     nc +=(nc + 9) / 10;
 
-    psz1   = ALLOCA_N(char,nc);
-    pszAll = ALLOCA_N(char,nc+256);
-    VpToString(vp, psz1, 10, 0);
-    sprintf(pszAll,"#<BigDecimal:%lx,'%s',%lu(%lu)>",self,psz1,VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
-    obj = rb_str_new2(pszAll);
+    obj = rb_str_new(0, nc+256);
+    psz = RSTRING_PTR(obj);
+    sprintf(psz,"#<BigDecimal:%lx,'",self);
+    tmp = psz + strlen(psz);
+    VpToString(vp, tmp, 10, 0);
+    tmp += strlen(tmp);
+    sprintf(tmp,"',%lu(%lu)>",VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
+    rb_str_resize(obj, strlen(psz));
+
     return obj;
 }
 
@@ -2482,6 +2508,7 @@
     int  sign=1;
     Real *vp = NULL;
     U_LONG mf = VpGetPrecLimit();
+    volatile VALUE buf;
 
     mx = (mx + BASE_FIG - 1) / BASE_FIG + 1;    /* Determine allocation unit. */
     if(szVal) {
@@ -2509,7 +2536,9 @@
 
     /* Skip all '_' after digit: 2006-6-30 */
     ni = 0;
-    psz = ALLOCA_N(char,strlen(szVal)+1);
+    buf = rb_str_new(0,strlen(szVal)+1);
+    psz = RSTRING_PTR(buf);
+
     i   = 0;
     ipn = 0;
     while((psz[i]=szVal[ipn])!=0) {
@@ -3601,7 +3630,7 @@
                 nc += fprintf(fp, "0.");
                 n = a->Prec;
                 for(i=0;i < n;++i) {
-                 m = BASE1;
+                    m = BASE1;
                     e = a->frac[i];
                     while(m) {
                         nn = e / m;
@@ -3778,6 +3807,7 @@
     return 0;
 }
 
+
 VP_EXPORT void
 VpToString(Real *a,char *psz,int fFmt,int fPlus)
 /* fPlus =0:default, =1: set ' ' before digits , =2:set '+' before digits. */


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-10/ruby.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- ruby.spec	31 May 2009 08:39:25 -0000	1.126
+++ ruby.spec	6 Dec 2009 19:55:53 -0000	1.127
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,7 @@ Patch26:        ruby-1.8.6-rexml-CVE-200
 Patch27:        ruby-1.8.6-p287-CVE-2008-5189.patch
 Patch28:        ruby-1.8.6-p287-remove-ssl-rand-range.patch
 Patch29:	ruby-always-use-i386.patch
+Patch30:	ruby-1.8.6-CVE-2009-1904-bigdecimal.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -173,6 +174,7 @@ pushd %{name}-%{arcver}
 %patch27 -p0
 %patch28 -p1
 %patch29 -p1
+%patch30 -p2
 popd
 
 %build
@@ -531,6 +533,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Mon Dec  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.386-2
+- Patch for bigdecimal DOS issue (CVE-2009-1904, bug 504958)
+
 * Sun May 31 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.8.6.368-1
 - New upstream release (p368)
 



From jussilehtola at fedoraproject.org  Sun Dec  6 20:08:32 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 20:08:32 +0000 (UTC)
Subject: File gromacs-4.0.6.tar.gz uploaded to lookaside cache by
	jussilehtola
Message-ID: <20091206200832.2CE0710F878@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gromacs:

a903b9b0a87f941a5ce9c59d1529b2d2  gromacs-4.0.6.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec  6 20:08:58 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 20:08:58 +0000 (UTC)
Subject: rpms/gromacs/devel .cvsignore, 1.9, 1.10 gromacs.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <20091206200858.609D011C00E0@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18609

Modified Files:
	.cvsignore gromacs.spec sources 
Log Message:
Update to 4.0.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 May 2009 09:30:08 -0000	1.9
+++ .cvsignore	6 Dec 2009 20:08:58 -0000	1.10
@@ -1,2 +1,2 @@
+gromacs-4.0.6.tar.gz
 manual-4.0.pdf
-gromacs-4.0.5.tar.gz


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gromacs.spec	3 Dec 2009 22:19:20 -0000	1.19
+++ gromacs.spec	6 Dec 2009 20:08:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		gromacs
-Version:	4.0.5
-Release:	6%{?dist}
+Version:	4.0.6
+Release:	1%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -28,7 +28,6 @@ BuildRequires:	lapack-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libX11-devel
 
-
 Requires:	gromacs-common = %{version}-%{release}
 Obsoletes:	gromacs-libs < %{version}-%{release}
 
@@ -517,6 +516,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.6-1
+- Update to 4.0.6.
+
 * Fri Dec 04 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-6
 - Fix file conflict.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 May 2009 09:30:08 -0000	1.9
+++ sources	6 Dec 2009 20:08:58 -0000	1.10
@@ -1,2 +1,2 @@
+a903b9b0a87f941a5ce9c59d1529b2d2  gromacs-4.0.6.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
-2db2261852a4d3a97547979f379dee94  gromacs-4.0.5.tar.gz



From than at fedoraproject.org  Sun Dec  6 20:13:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  6 Dec 2009 20:13:24 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-12 kdebase-workspace.spec,1.312,1.313
Message-ID: <20091206201324.97E4211C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19695

Modified Files:
	kdebase-workspace.spec 
Log Message:
fix conditional for RHEL



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- kdebase-workspace.spec	2 Dec 2009 14:36:59 -0000	1.312
+++ kdebase-workspace.spec	6 Dec 2009 20:13:24 -0000	1.313
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -131,7 +131,7 @@ Requires: solar-kde-theme
 Requires: leonidas-kde-theme
 %endif
 
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+%if 0%{?fedora} > 11
 Requires: system-backgrounds-kde
 Requires: system-ksplash-theme
 %endif
@@ -614,6 +614,9 @@ fi
 
 
 %changelog
+* Sun Dec 06 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+- fix conditional for RHEL
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 - kdm_plymouth patch (#475890)



From than at fedoraproject.org  Sun Dec  6 20:28:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  6 Dec 2009 20:28:06 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs.spec,1.504,1.505
Message-ID: <20091206202806.1DCF211C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23447/F-11

Modified Files:
	kdelibs.spec 
Log Message:
add workaound for low-mem systems



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -p -r1.504 -r1.505
--- kdelibs.spec	5 Dec 2009 15:47:07 -0000	1.504
+++ kdelibs.spec	6 Dec 2009 20:28:05 -0000	1.505
@@ -203,9 +203,7 @@ format for easy browsing.
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
-%ifarch ppc64 x86_64
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
-%endif
 
 # upstream patches
 %patch50 -p1 -b .kaction_qt_keys



From than at fedoraproject.org  Sun Dec  6 20:28:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  6 Dec 2009 20:28:06 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs.spec,1.532,1.533
Message-ID: <20091206202806.7F1F111C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23447/F-12

Modified Files:
	kdelibs.spec 
Log Message:
add workaound for low-mem systems



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -p -r1.532 -r1.533
--- kdelibs.spec	4 Dec 2009 17:42:15 -0000	1.532
+++ kdelibs.spec	6 Dec 2009 20:28:06 -0000	1.533
@@ -203,9 +203,7 @@ format for easy browsing.
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
-%ifarch ppc64 x86_64
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
-%endif
 
 # upstream patches
 %patch50 -p1 -b .kaction_qt_keys



From pkgdb at fedoraproject.org  Sun Dec  6 20:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:34:48 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchbugzilla
Message-ID: <20091206203448.3432610F88C@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:34:48 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchcommits
Message-ID: <20091206203448.BAD4610F89C@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:34:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:34:50 +0000
Subject: [pkgdb] cobbler: kanarip has requested commit
Message-ID: <20091206203450.CF2C610F8A2@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:34:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:34:52 +0000
Subject: [pkgdb] cobbler: kanarip has requested approveacls
Message-ID: <20091206203452.3946110F8A8@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on cobbler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:35:01 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchbugzilla
Message-ID: <20091206203501.6353C10F8AC@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:35:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:35:02 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchcommits
Message-ID: <20091206203502.8B33E10F8B2@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:35:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:35:04 +0000
Subject: [pkgdb] cobbler: kanarip has requested commit
Message-ID: <20091206203504.46E0710F8B8@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:35:05 +0000
Subject: [pkgdb] cobbler: kanarip has requested approveacls
Message-ID: <20091206203505.61DD210F8BD@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From laxathom at fedoraproject.org  Sun Dec  6 20:35:25 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sun,  6 Dec 2009 20:35:25 +0000 (UTC)
Subject: File gst-python-0.10.17.tar.bz2 uploaded to lookaside cache by
	laxathom
Message-ID: <20091206203525.0372310F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gstreamer-python:

3998753de6500ee8c18ce1456df43df6  gst-python-0.10.17.tar.bz2



From pkgdb at fedoraproject.org  Sun Dec  6 20:35:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:35:26 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchcommits
Message-ID: <20091206203526.D4B2410F8A1@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:35:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:35:26 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchbugzilla
Message-ID: <20091206203527.045F210F8C4@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:35:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:35:29 +0000
Subject: [pkgdb] cobbler: kanarip has requested commit
Message-ID: <20091206203529.8202210F8C9@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:35:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:35:29 +0000
Subject: [pkgdb] cobbler: kanarip has requested approveacls
Message-ID: <20091206203529.B854110F8CE@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:36:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:36:15 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchcommits
Message-ID: <20091206203615.A485510F8A9@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on cobbler (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:36:16 +0000
Subject: [pkgdb] cobbler: kanarip has requested commit
Message-ID: <20091206203616.DF4EB10F8AD@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on cobbler (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:36:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:36:18 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchbugzilla
Message-ID: <20091206203618.4AC9B10F8B2@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on cobbler (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:36:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:36:18 +0000
Subject: [pkgdb] cobbler: kanarip has requested approveacls
Message-ID: <20091206203618.8604310F8B5@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on cobbler (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:36:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:36:24 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchbugzilla
Message-ID: <20091206203624.63D4C10F8D0@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on cobbler (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:36:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:36:25 +0000
Subject: [pkgdb] cobbler: kanarip has requested commit
Message-ID: <20091206203625.8234610F8D4@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on cobbler (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:36:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:36:30 +0000
Subject: [pkgdb] cobbler: kanarip has requested approveacls
Message-ID: <20091206203631.0B60410F8D5@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on cobbler (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:36:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:36:32 +0000
Subject: [pkgdb] cobbler: kanarip has given up watchcommits
Message-ID: <20091206203632.247F810F8D9@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on cobbler (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Sun Dec  6 20:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:37:19 +0000
Subject: [pkgdb] koan: kanarip has given up watchcommits
Message-ID: <20091206203719.3F88010F8BF@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on koan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:37:19 +0000
Subject: [pkgdb] koan: kanarip has given up watchbugzilla
Message-ID: <20091206203719.6E77410F8C2@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on koan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:37:19 +0000
Subject: [pkgdb] koan: kanarip has requested commit
Message-ID: <20091206203719.EF40610F8C5@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on koan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:37:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:37:20 +0000
Subject: [pkgdb] koan: kanarip has requested approveacls
Message-ID: <20091206203720.858FE10F8C8@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on koan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:38:02 +0000
Subject: [pkgdb] koan: kanarip has given up watchbugzilla
Message-ID: <20091206203802.D86FA10F8A6@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on koan (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:38:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:38:03 +0000
Subject: [pkgdb] koan: kanarip has given up watchcommits
Message-ID: <20091206203803.7DDC910F8AA@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on koan (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:38:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:38:04 +0000
Subject: [pkgdb] koan: kanarip has requested commit
Message-ID: <20091206203804.B47A910F8AD@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on koan (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:38:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:38:05 +0000
Subject: [pkgdb] koan: kanarip has requested approveacls
Message-ID: <20091206203805.3F68B10F8CB@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on koan (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:38:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:38:26 +0000
Subject: [pkgdb] koan: kanarip has given up watchcommits
Message-ID: <20091206203826.BBD9F10F8B5@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on koan (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:38:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:38:32 +0000
Subject: [pkgdb] koan: kanarip has given up watchbugzilla
Message-ID: <20091206203833.9E73410F8CD@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on koan (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:38:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:38:33 +0000
Subject: [pkgdb] koan: kanarip has requested commit
Message-ID: <20091206203833.A7A7210F8CE@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on koan (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:38:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:38:34 +0000
Subject: [pkgdb] koan: kanarip has requested approveacls
Message-ID: <20091206203834.A7D2F10F8D1@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on koan (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:39:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:39:12 +0000
Subject: [pkgdb] koan: kanarip has given up watchbugzilla
Message-ID: <20091206203912.ACFE910F891@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on koan (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:39:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:39:13 +0000
Subject: [pkgdb] koan: kanarip has requested commit
Message-ID: <20091206203913.46C7610F8D2@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on koan (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:39:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:39:14 +0000
Subject: [pkgdb] koan: kanarip has requested approveacls
Message-ID: <20091206203914.4C7DE10F8BF@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on koan (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:39:18 +0000
Subject: [pkgdb] koan: kanarip has given up watchcommits
Message-ID: <20091206203918.4CCB210F8D5@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on koan (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:39:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:39:21 +0000
Subject: [pkgdb] koan: kanarip has given up watchbugzilla
Message-ID: <20091206203921.8789710F8D8@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchbugzilla acl on koan (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:39:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:39:22 +0000
Subject: [pkgdb] koan: kanarip has given up watchcommits
Message-ID: <20091206203922.2093710F8DC@bastion2.fedora.phx.redhat.com>

kanarip has given up the watchcommits acl on koan (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:39:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:39:25 +0000
Subject: [pkgdb] koan: kanarip has requested approveacls
Message-ID: <20091206203926.2AE3810F8C2@bastion2.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on koan (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Sun Dec  6 20:39:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 20:39:23 +0000
Subject: [pkgdb] koan: kanarip has requested commit
Message-ID: <20091206203923.581F910F8E0@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on koan (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koan



From ensc at fedoraproject.org  Sun Dec  6 20:40:30 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  6 Dec 2009 20:40:30 +0000 (UTC)
Subject: rpms/xmlrpc-c/devel xmlrpc-c-cmake.patch,1.3,1.4
Message-ID: <20091206204030.F40C511C03FC@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26403

Modified Files:
	xmlrpc-c-cmake.patch 
Log Message:
restored cmake 2.4 compatibility


xmlrpc-c-cmake.patch:
 CMakeLists.txt                              |  279 ++++++++++++++++++++++++++++
 cmake/try-attr.cc                           |    3 
 cmake/va-list-is-array.c                    |    9 
 examples/CMakeLists.txt                     |   57 +++++
 examples/config.h                           |    1 
 examples/cpp/CMakeLists.txt                 |   34 +++
 include/CMakeLists.txt                      |    3 
 include/xmlrpc-c/CMakeLists.txt             |   73 +++++++
 include/xmlrpc-c/config.h.cmake             |   30 +++
 lib/CMakeLists.txt                          |   12 +
 lib/abyss/CMakeLists.txt                    |    3 
 lib/abyss/src/CMakeLists.txt                |   66 ++++++
 lib/abyss/src/xmlrpc_abyss.pc.cmake         |   12 +
 lib/curl_transport/CMakeLists.txt           |   20 ++
 lib/expat/CMakeLists.txt                    |    9 
 lib/expat/gennmtab/CMakeLists.txt           |    3 
 lib/expat/xmlparse/CMakeLists.txt           |    7 
 lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake |   12 +
 lib/expat/xmltok/CMakeLists.txt             |   22 ++
 lib/expat/xmltok/xmlrpc_xmltok.pc.cmake     |    9 
 lib/libutil/CMakeLists.txt                  |   25 ++
 lib/libutil/xmlrpc_util.pc.cmake            |   10 +
 lib/libwww_transport/CMakeLists.txt         |    7 
 lib/util/CMakeLists.txt                     |   17 +
 lib/wininet_transport/CMakeLists.txt        |    7 
 src/CMakeLists.txt                          |  121 ++++++++++++
 src/cpp/CMakeLists.txt                      |   70 +++++++
 src/cpp/test/CMakeLists.txt                 |   17 +
 src/cpp/xmlrpc++.pc.cmake                   |   12 +
 src/cpp/xmlrpc_client++.pc.cmake            |   12 +
 src/cpp/xmlrpc_cpp.pc.cmake                 |   12 +
 src/cpp/xmlrpc_packetsocket.pc.cmake        |   12 +
 src/cpp/xmlrpc_server++.pc.cmake            |   12 +
 src/cpp/xmlrpc_server_abyss++.pc.cmake      |   12 +
 src/cpp/xmlrpc_server_cgi++.pc.cmake        |   12 +
 src/cpp/xmlrpc_server_pstream++.pc.cmake    |   12 +
 src/test/CMakeLists.txt                     |   37 +++
 src/xmlrpc.pc.cmake                         |   12 +
 src/xmlrpc_client.pc.cmake                  |   12 +
 src/xmlrpc_server.pc.cmake                  |   12 +
 src/xmlrpc_server_abyss.pc.cmake            |   12 +
 src/xmlrpc_server_cgi.pc.cmake              |   12 +
 tools/CMakeLists.txt                        |   21 ++
 tools/binmode-rpc-kit/CMakeLists.txt        |    2 
 tools/lib/CMakefiles.txt                    |    1 
 tools/turbocharger/CMakeLists.txt           |    1 
 tools/xml-rpc-api2cpp/CMakeLists.txt        |   15 +
 tools/xml-rpc-api2txt/CMakeLists.txt        |    7 
 tools/xmlrpc/CMakeLists.txt                 |   17 +
 tools/xmlrpc/config.h                       |    1 
 tools/xmlrpc_cpp_proxy/CMakeLists.txt       |   17 +
 tools/xmlrpc_pstream/CMakeLists.txt         |   16 +
 tools/xmlrpc_transport/CMakeLists.txt       |    9 
 tools/xmlrpc_transport/config.h             |    1 
 transport_config.h.cmake                    |   16 +
 version.h.cmake                             |    5 
 xmlrpc-c-config                             |  108 ++++++++++
 xmlrpc_config.h.cmake                       |  106 ++++++++++
 58 files changed, 1473 insertions(+), 1 deletion(-)

Index: xmlrpc-c-cmake.patch
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/xmlrpc-c-cmake.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmlrpc-c-cmake.patch	21 Nov 2009 14:02:53 -0000	1.3
+++ xmlrpc-c-cmake.patch	6 Dec 2009 20:40:30 -0000	1.4
@@ -1,10 +1,10 @@
-From afe99001ee31f4cf827fc6aee0b2088bd4e7b85b Mon Sep 17 00:00:00 2001
+From da14b3bc703ec3ec2b8332e2d9452d9526f3c1af Mon Sep 17 00:00:00 2001
 From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 Date: Sat, 5 Apr 2008 10:55:02 +0200
 Subject: [PATCH 1/6] make -> cmake transition
 
 ---
- CMakeLists.txt                              |  275 +++++++++++++++++++++++++++
+ CMakeLists.txt                              |  279 +++++++++++++++++++++++++++
  cmake/try-attr.cc                           |    3 +
  cmake/va-list-is-array.c                    |    9 +
  examples/CMakeLists.txt                     |   57 ++++++
@@ -62,7 +62,7 @@ Subject: [PATCH 1/6] make -> cmake trans
  version.h.cmake                             |    5 +
  xmlrpc-c-config                             |  108 +++++++++++
  xmlrpc_config.h.cmake                       |  105 ++++++++++
- 58 files changed, 1469 insertions(+), 0 deletions(-)
+ 58 files changed, 1473 insertions(+), 0 deletions(-)
  create mode 100644 CMakeLists.txt
  create mode 100644 cmake/try-attr.cc
  create mode 100644 cmake/va-list-is-array.c
@@ -124,17 +124,21 @@ Subject: [PATCH 1/6] make -> cmake trans
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 new file mode 100644
-index 0000000..f64b143
+index 0000000..3b8ad6a
 --- /dev/null
 +++ b/CMakeLists.txt
-@@ -0,0 +1,275 @@
+@@ -0,0 +1,279 @@
 +## -*- cmake -*-
 +project(xmlrpc-c)
 +include(FindPkgConfig)
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.4)
++
++if(COMMAND cmake_policy)
++  cmake_policy(SET CMP0003 NEW)
++endif()
 +
 +
 +set(XMLRPC_C_VERSION_MAJOR "1"  CACHE STRING "Version (major) of xmlrpc-c")



From kevin at fedoraproject.org  Sun Dec  6 21:02:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 21:02:43 +0000 (UTC)
Subject: rpms/munin/F-12 munin-1.4.0-config.patch, NONE, 1.1 munin.spec, 1.27,
	1.28 sources, 1.4, 1.5 .cvsignore, 1.4,
	1.5 munin-1.2.4-conf.patch, 1.1, NONE munin-1.2.4-cron.patch,
	1.1, NONE munin-1.2.5-amp-degree.patch, 1.1,
	NONE munin-1.2.5-nf-conntrack.patch, 1.1,
	NONE munin-1.2.6-hddtemp_smartctl-spinup.patch, 1.1,
	NONE munin-1.2.6-ntp_offset.patch, 1.1, NONE
Message-ID: <20091206210243.7345911C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31135

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.4.0-config.patch 
Removed Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
	munin-1.2.5-amp-degree.patch munin-1.2.5-nf-conntrack.patch 
	munin-1.2.6-hddtemp_smartctl-spinup.patch 
	munin-1.2.6-ntp_offset.patch 
Log Message:
Update to 1.4.1


munin-1.4.0-config.patch:
 dists/redhat/Makefile.config |    2 +-
 master/munin.conf.in         |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE munin-1.4.0-config.patch ---
diff -Nur munin-1.4.0.orig/dists/redhat/Makefile.config munin-1.4.0/dists/redhat/Makefile.config
--- munin-1.4.0.orig/dists/redhat/Makefile.config	2009-11-27 04:17:14.000000000 -0700
+++ munin-1.4.0/dists/redhat/Makefile.config	2009-11-30 22:28:20.000000000 -0700
@@ -23,7 +23,7 @@
 VERSION    = $(shell cat RELEASE)
 USER       = munin
 GROUP      = munin
-PLUGINUSER = nobody
+PLUGINUSER = munin
 GETENT     = $(shell which getent || which true 2>/dev/null)
 CHECKUSER  = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
 CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
diff -Nur munin-1.4.0.orig/master/munin.conf.in munin-1.4.0/master/munin.conf.in
--- munin-1.4.0.orig/master/munin.conf.in	2009-11-27 04:17:18.000000000 -0700
+++ munin-1.4.0/master/munin.conf.in	2009-11-30 22:28:20.000000000 -0700
@@ -15,7 +15,7 @@
 
 # (Exactly one) directory to include all files from.
 #
-includedir @@CONFDIR@@/munin-conf.d
+# includedir @@CONFDIR@@/munin-conf.d
 
 # Make graphs show values per minute instead of per second
 #graph_period minute
@@ -57,7 +57,7 @@
 #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/F-12/munin.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- munin.spec	25 Jul 2009 15:24:58 -0000	1.27
+++ munin.spec	6 Dec 2009 21:02:43 -0000	1.28
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.6
-Release:   10%{?dist}
+Version:   1.4.1
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -8,19 +8,28 @@ URL:       http://munin.projects.linpro.
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
+
+Patch1: munin-1.4.0-config.patch
+
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
 Source3: munin-node.logrotate
 Source4: munin.logrotate
-Source5: nf_conntrack
 Source6: munin-1.2.6-postfix-config
-Patch1: munin-1.2.4-conf.patch
-Patch2: munin-1.2.5-nf-conntrack.patch
-Patch3: munin-1.2.5-amp-degree.patch
-Patch4: munin-1.2.6-ntp_offset.patch
-Patch5: munin-1.2.6-hddtemp_smartctl-spinup.patch
+
 BuildArchitectures: noarch
+
+BuildRequires: perl-Module-Build
+# needed for hostname for the defaut config
+BuildRequires: net-tools
+# java buildrequires on fedora
+BuildRequires: java-devel >= 1.6
+BuildRequires: mx4j
+BuildRequires: jpackage-utils
+BuildRequires: perl-Net-SNMP
+
+Requires: %{name}-common = %{version}
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
@@ -46,6 +55,7 @@ RRDtool. 
 Group: System Environment/Daemons
 Summary: Network-wide graphing framework (node)
 BuildArchitectures: noarch
+Requires: %{name}-common = %{version}
 Requires: perl-Net-Server
 Requires: procps >= 2.0.7
 Requires: sysstat, /usr/bin/which, hdparm
@@ -76,30 +86,47 @@ SNMP or similar technology.
 Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
 RRDtool. 
 
+%package common
+Group: System Environment/Daemons
+Summary: Network-wide graphing framework (common files)
+BuildArchitectures: noarch
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description common
+Munin is a highly flexible and powerful solution used to create graphs of
+virtually everything imaginable throughout your network, while still
+maintaining a rattling ease of installation and configuration.
+
+This package contains common files that are used by both the server (munin)
+and node (munin-node) packages. 
+
+%package java-plugins
+Group: System Environment/Daemons
+Summary: java-plugins for munin
+Requires: %{name}-node = %{version}
+BuildArchitectures: noarch
+
+%description java-plugins
+java-plugins for munin-node. 
+
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
-
-# htmldoc and html2text are not available for Red Hat. Quick hack with perl:
-# Skip the PDFs.
-perl -pi -e 's,htmldoc munin,cat munin, or s,html(2text|doc),# $&,' Makefile
-perl -pi -e 's,\$\(INSTALL.+\.(pdf|txt) \$\(DOCDIR,# $&,' Makefile
-make 	CONFIG=dists/redhat/Makefile.config build
+export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
+make 	CONFIG=dists/redhat/Makefile.config
 
 %install
 
 ## Node
-make 	CONFIG=dists/redhat/Makefile.config \
-	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
+make	CONFIG=dists/redhat/Makefile.config \
+	JAVALIBDIR=%{buildroot}%{_datadir}/java \
+	PREFIX=%{buildroot}%{_prefix} \
+ 	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
 	MANDIR=%{buildroot}%{_mandir} \
 	DESTDIR=%{buildroot} \
-    	install-main install-node install-node-plugins install-doc install-man
+	install
 
 mkdir -p %{buildroot}/etc/rc.d/init.d
 mkdir -p %{buildroot}/etc/munin/plugins
@@ -123,17 +150,16 @@ install -m0644 dists/tarball/plugins.con
 rm -f %{buildroot}/usr/share/munin/plugins/sybase_space
 
 ## Server
-make 	CONFIG=dists/redhat/Makefile.config \
-	DESTDIR=%{buildroot} \
-	install-main
 
 mkdir -p %{buildroot}/var/www/html/munin
 mkdir -p %{buildroot}/var/log/munin
 mkdir -p %{buildroot}/etc/cron.d
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
 
 install -m 0644 dists/redhat/munin.cron.d %{buildroot}/etc/cron.d/munin
-install -m 0644 server/style.css %{buildroot}/var/www/html/munin
 install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog
+cp -a master/www/* %{buildroot}/var/www/html/munin/
+
 # install config for sendmail under fedora
 install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
 # install config for hddtemp_smartctl
@@ -141,20 +167,14 @@ install -m 0644 %{SOURCE2} %{buildroot}/
 # install logrotate scripts
 install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
 install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
-# install config for nf_conntrack
-install -m 0644 %{SOURCE5} %{buildroot}/etc/munin/plugin-conf.d/nf_conntrack
 # install config for postfix under fedora
 install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
 
-# fix MUNIN_LIBDIR issue. 
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/ps_
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/multips
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/df_abs
-
 # Use font from bitstream-vera-fonts-sans-mono
 rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
 ln -s /usr/share/fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,33 +211,26 @@ exit 0
 %doc %{_docdir}/%{name}-%{version}/
 %{_bindir}/munin-cron
 %{_bindir}/munindoc
+%{_bindir}/munin-check
 %dir %{_datadir}/munin
 %{_datadir}/munin/munin-graph
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
 %{_datadir}/munin/VeraMono.ttf
-%{perl_vendorlib}/Munin.pm
-%dir %{perl_vendorlib}/Munin
-/var/www/html/munin/cgi/munin-cgi-graph
+%{perl_vendorlib}/Munin/Master
 %dir /etc/munin/templates
 %dir /etc/munin
 %config(noreplace) /etc/munin/templates/*
 %config(noreplace) /etc/cron.d/munin
 %config(noreplace) /etc/munin/munin.conf
 %config(noreplace) /etc/logrotate.d/munin
-
 %attr(-, munin, munin) %dir /var/lib/munin
+%attr(-, nobody, munin) %dir /var/lib/munin/plugin-state
 %attr(-, munin, munin) %dir /var/run/munin
 %attr(-, munin, munin) %dir /var/log/munin
-%attr(-, munin, munin) %dir /var/www/html/munin
-%attr(-, root, root) %dir /var/www/html/munin/cgi
-%attr(-, root, root) /var/www/html/munin/style.css
-%doc %{_mandir}/man8/munin-graph*
-%doc %{_mandir}/man8/munin-update*
-%doc %{_mandir}/man8/munin-limits*
-%doc %{_mandir}/man8/munin-html*
-%doc %{_mandir}/man8/munin-cron*
+%attr(-, munin, munin) /var/www/html/munin
+%doc %{_mandir}/man8/munin*
 %doc %{_mandir}/man5/munin.conf*
 
 %files node
@@ -227,15 +240,12 @@ exit 0
 %config(noreplace) /etc/munin/plugin-conf.d/munin-node
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
 %config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
-%config(noreplace) /etc/munin/plugin-conf.d/nf_conntrack
 %config(noreplace) /etc/munin/plugin-conf.d/postfix
 %config(noreplace) /etc/logrotate.d/munin-node
-%{perl_vendorlib}/Munin/Plugin.pm
 /etc/rc.d/init.d/munin-node
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%{_sbindir}/munin-node-configure-snmp
 %attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
@@ -244,11 +254,35 @@ exit 0
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/
 %doc %{_docdir}/%{name}-%{version}/
-%doc %{_mandir}/man8/munin-run*
-%doc %{_mandir}/man8/munin-node*
 %doc %{_mandir}/man5/munin-node*
+%doc %{_mandir}/man3/Munin*
+%doc %{_mandir}/man1/munin*
+%{perl_vendorlib}/Munin/Node
+%{perl_vendorlib}/Munin/Plugin*
+
+%files common
+%defattr(-, root, root)
+%dir %{perl_vendorlib}/Munin
+%{perl_vendorlib}/Munin/Common
+
+%files java-plugins
+%defattr(-, root, root)
+%{_datadir}/java/%{name}-jmx-plugins.jar
 
 %changelog
+* Fri Dec 04 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Sat Nov 28 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-1
+- Update to final 1.4.0 version
+
+* Sat Nov 21 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-0.1.beta
+- Update to beta 1.4.0 version. 
+- Add common subpackage for common files. 
+
+* Sun Nov 08 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-0.1.alpha
+- Initial alpha version of 1.4.0 
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Jun 2008 21:42:17 -0000	1.4
+++ sources	6 Dec 2009 21:02:43 -0000	1.5
@@ -1 +1 @@
-45f84d58f80642ce914f147232f0d396  munin_1.2.6.tar.gz
+04086f23b657e05e4e5e5a8fa6082f16  munin-1.4.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Jun 2008 21:42:17 -0000	1.4
+++ .cvsignore	6 Dec 2009 21:02:43 -0000	1.5
@@ -1 +1 @@
-munin_1.2.6.tar.gz
+munin-1.4.1.tar.gz


--- munin-1.2.4-conf.patch DELETED ---


--- munin-1.2.4-cron.patch DELETED ---


--- munin-1.2.5-amp-degree.patch DELETED ---


--- munin-1.2.5-nf-conntrack.patch DELETED ---


--- munin-1.2.6-hddtemp_smartctl-spinup.patch DELETED ---


--- munin-1.2.6-ntp_offset.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Dec  6 21:09:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:09:49 +0000
Subject: [pkgdb] gnome-shell: maxamillion has given up watchbugzilla
Message-ID: <20091206210949.AF6D910F88C@bastion2.fedora.phx.redhat.com>

maxamillion has given up the watchbugzilla acl on gnome-shell (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Sun Dec  6 21:09:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:09:55 +0000
Subject: [pkgdb] gnome-shell: maxamillion has given up watchcommits
Message-ID: <20091206210955.A1E1E10F89C@bastion2.fedora.phx.redhat.com>

maxamillion has given up the watchcommits acl on gnome-shell (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Sun Dec  6 21:09:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:09:57 +0000
Subject: [pkgdb] gnome-shell: maxamillion has requested commit
Message-ID: <20091206210957.C8B1B10F8A1@bastion2.fedora.phx.redhat.com>

maxamillion has requested the commit acl on gnome-shell (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Sun Dec  6 21:10:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:10:02 +0000
Subject: [pkgdb] gnome-shell: maxamillion has given up watchbugzilla
Message-ID: <20091206211002.E585C10F8A4@bastion2.fedora.phx.redhat.com>

maxamillion has given up the watchbugzilla acl on gnome-shell (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Sun Dec  6 21:10:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:10:09 +0000
Subject: [pkgdb] gnome-shell: maxamillion has given up watchcommits
Message-ID: <20091206211009.C614510F8A9@bastion2.fedora.phx.redhat.com>

maxamillion has given up the watchcommits acl on gnome-shell (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Sun Dec  6 21:10:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:10:11 +0000
Subject: [pkgdb] gnome-shell: maxamillion has requested commit
Message-ID: <20091206211011.6B6E510F892@bastion2.fedora.phx.redhat.com>

maxamillion has requested the commit acl on gnome-shell (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From terjeros at fedoraproject.org  Sun Dec  6 21:10:35 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 21:10:35 +0000 (UTC)
Subject: File gle-graphics-4.2.1-src.tar.gz uploaded to lookaside cache by
	terjeros
Message-ID: <20091206211035.47C4610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gle:

6b483c2b262bfa4ad3f1a60226d05d51  gle-graphics-4.2.1-src.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 21:11:35 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 21:11:35 +0000 (UTC)
Subject: rpms/gle/devel .cvsignore, 1.6, 1.7 gle.spec, 1.14, 1.15 sources,
	1.6, 1.7
Message-ID: <20091206211135.E95C711C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv963

Modified Files:
	.cvsignore gle.spec sources 
Log Message:
* Sun Dec  6 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.1-1
- 4.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gle/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 May 2009 06:46:39 -0000	1.6
+++ .cvsignore	6 Dec 2009 21:11:35 -0000	1.7
@@ -1,3 +1,4 @@
 GLE-4.2.0-src.zip
 gle-manual-4.2.0.pdf
 GLEusersguide.pdf
+gle-graphics-4.2.1-src.tar.gz


Index: gle.spec
===================================================================
RCS file: /cvs/extras/rpms/gle/devel/gle.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gle.spec	31 Jul 2009 14:01:15 -0000	1.14
+++ gle.spec	6 Dec 2009 21:11:35 -0000	1.15
@@ -1,13 +1,15 @@
+%global mver   4.2.0
+%global oname  gle-graphics
 
 Summary:       Graphics Layout Engine
 Name:          gle
-Version:       4.2.0
-Release:       4%{?dist}
+Version:       4.2.1
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.gle-graphics.org/
-Source:        http://downloads.sourceforge.net/glx/GLE-%{version}-src.zip
-Source1:       http://downloads.sourceforge.net/glx/gle-manual-%{version}.pdf
+Source0:       http://downloads.sourceforge.net/glx/gle4%20%28Current%20Active%20Version%29/%{version}/gle-graphics-%{version}-src.tar.gz
+Source1:       http://downloads.sourceforge.net/glx/gle-manual-%{mver}.pdf
 Source2:       http://downloads.sourceforge.net/glx/GLEusersguide.pdf
 BuildRequires: libstdc++-devel >= 3.0
 BuildRequires: libpng-devel libtiff-devel libjpeg-devel 
@@ -28,13 +30,14 @@ simple looping structures. Current outpu
 JPEG, and PNG.
 
 %prep
-%setup -q -n gle4
+%setup -q -n %{oname}-%{version}
 %{__install} -p -m 0644 %{SOURCE1} .
 %{__install} -p -m 0644 %{SOURCE2} .
 
 %build
 export CPPFLAGS="%{optflags}"
-%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no
+export CXXFLAGS="%{optflags}"
+%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no --with-debug=yes CPPFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
 %{__make}
 # %{?_smp_mflags} build fails.
 
@@ -56,11 +59,14 @@ dos2unix LICENSE.txt
 %{_bindir}/%{name}
 %{_bindir}/q%{name}
 %{_bindir}/manip
-%{_datadir}/%{name}
+%{_datadir}/%{oname}
 %{_mandir}/man1/%{name}*
-%{_libdir}/lib%{name}-graphics-%{version}.so
+%{_libdir}/lib%{oname}-%{version}.so
 
 %changelog
+* Sun Dec  6 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.1-1
+- 4.2.1
+
 * Fri Jul 31 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.0-4
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gle/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	19 May 2009 06:46:40 -0000	1.6
+++ sources	6 Dec 2009 21:11:35 -0000	1.7
@@ -1,3 +1,3 @@
-3b69e0508d94069ce4aed96f66da02c6  GLE-4.2.0-src.zip
 38f7a13e3a41cd386dc2d0a845cb86bc  gle-manual-4.2.0.pdf
 ab3f3787b96a602a486f5f39e72fc276  GLEusersguide.pdf
+6b483c2b262bfa4ad3f1a60226d05d51  gle-graphics-4.2.1-src.tar.gz



From pkgdb at fedoraproject.org  Sun Dec  6 21:14:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:14:38 +0000
Subject: [pkgdb] gnome-shell had acl change status
Message-ID: <20091206211438.A2F7410F88C@bastion2.fedora.phx.redhat.com>

walters has set the commit acl on gnome-shell (Fedora devel) to Approved for maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Sun Dec  6 21:14:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:14:48 +0000
Subject: [pkgdb] gnome-shell had acl change status
Message-ID: <20091206211448.5652510F892@bastion2.fedora.phx.redhat.com>

walters has set the commit acl on gnome-shell (Fedora 12) to Obsolete for maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Sun Dec  6 21:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 21:14:51 +0000
Subject: [pkgdb] gnome-shell had acl change status
Message-ID: <20091206211451.19ADF10F8A1@bastion2.fedora.phx.redhat.com>

walters has set the commit acl on gnome-shell (Fedora 12) to Approved for maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From terjeros at fedoraproject.org  Sun Dec  6 21:15:48 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 21:15:48 +0000 (UTC)
Subject: rpms/gle/F-11 .cvsignore, 1.5, 1.6 gle.spec, 1.10, 1.11 sources, 1.5,
	1.6
Message-ID: <20091206211548.0F28811C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1809/F-11

Modified Files:
	.cvsignore gle.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gle/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Mar 2008 10:49:09 -0000	1.5
+++ .cvsignore	6 Dec 2009 21:15:47 -0000	1.6
@@ -1,2 +1,4 @@
-GLE-4.1.2-src.zip
-GLE-4.0.13-manual.pdf
+GLE-4.2.0-src.zip
+gle-manual-4.2.0.pdf
+GLEusersguide.pdf
+gle-graphics-4.2.1-src.tar.gz


Index: gle.spec
===================================================================
RCS file: /cvs/extras/rpms/gle/F-11/gle.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gle.spec	24 Feb 2009 21:58:58 -0000	1.10
+++ gle.spec	6 Dec 2009 21:15:47 -0000	1.11
@@ -1,19 +1,20 @@
-%define mver 4.0.13
+%global mver   4.2.0
+%global oname  gle-graphics
 
 Summary:       Graphics Layout Engine
 Name:          gle
-Version:       4.1.2
-Release:       3%{?dist}
+Version:       4.2.1
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.gle-graphics.org/
-Source:        http://downloads.sourceforge.net/glx/GLE-%{version}-src.zip
-Source1:       http://www.cs.kuleuven.be/~jan/gle/GLE-%{mver}-manual.pdf
-Patch0:        gle-4.1.2-gcc44.patch
+Source0:       http://downloads.sourceforge.net/glx/gle4%20%28Current%20Active%20Version%29/%{version}/gle-graphics-%{version}-src.tar.gz
+Source1:       http://downloads.sourceforge.net/glx/gle-manual-%{mver}.pdf
+Source2:       http://downloads.sourceforge.net/glx/GLEusersguide.pdf
 BuildRequires: libstdc++-devel >= 3.0
 BuildRequires: libpng-devel libtiff-devel libjpeg-devel 
 BuildRequires: ncurses-devel zlib-devel xorg-x11-proto-devel
-BuildRequires: qt4-devel >= 4.1.1
+BuildRequires: qt4-devel >= 4.1.1 cairo-devel
 BuildRequires: dos2unix
 Requires:      ghostscript
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,13 +30,15 @@ simple looping structures. Current outpu
 JPEG, and PNG.
 
 %prep
-%setup -q -n gle4
-%patch0 -p1 
+%setup -q -n %{oname}-%{version}
 %{__install} -p -m 0644 %{SOURCE1} .
+%{__install} -p -m 0644 %{SOURCE2} .
 
 %build
-%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no
-%{__make} 
+export CPPFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no --with-debug=yes CPPFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+%{__make}
 # %{?_smp_mflags} build fails.
 
 %install
@@ -51,15 +54,34 @@ dos2unix LICENSE.txt
 
 %files
 %defattr(-, root, root, -)
-%doc README.txt LICENSE.txt src/gui/readme.txt GLE-%{mver}-manual.pdf
+%doc README.txt LICENSE.txt src/gui/readme.txt 
+%doc gle-manual-4.2.0.pdf GLEusersguide.pdf
 %{_bindir}/%{name}
 %{_bindir}/q%{name}
 %{_bindir}/manip
-%{_datadir}/%{name}
+%{_datadir}/%{oname}
 %{_mandir}/man1/%{name}*
-%{_libdir}/lib%{name}-graphics-%{version}.so
+%{_libdir}/lib%{oname}-%{version}.so
 
 %changelog
+* Sun Dec  6 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.1-1
+- 4.2.1
+
+* Fri Jul 31 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.0-4
+- Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 19 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.0-2
+- Build with cairo support 
+- Use correct optflags
+
+* Tue May 19 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.0-1
+- 4.2.0
+- Drop gcc43 patch now upstream
+- Add more documentation
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gle/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Mar 2008 10:49:09 -0000	1.5
+++ sources	6 Dec 2009 21:15:47 -0000	1.6
@@ -1,2 +1,3 @@
-f689adc8294b657d37cc98f9ea788e81  GLE-4.1.2-src.zip
-98a9398f95d661bff49473561fec27f3  GLE-4.0.13-manual.pdf
+38f7a13e3a41cd386dc2d0a845cb86bc  gle-manual-4.2.0.pdf
+ab3f3787b96a602a486f5f39e72fc276  GLEusersguide.pdf
+6b483c2b262bfa4ad3f1a60226d05d51  gle-graphics-4.2.1-src.tar.gz



From terjeros at fedoraproject.org  Sun Dec  6 21:15:48 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 21:15:48 +0000 (UTC)
Subject: rpms/gle/F-12 .cvsignore, 1.6, 1.7 gle.spec, 1.14, 1.15 sources, 1.6,
	1.7
Message-ID: <20091206211548.35B1011C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gle/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1809/F-12

Modified Files:
	.cvsignore gle.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gle/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 May 2009 06:46:39 -0000	1.6
+++ .cvsignore	6 Dec 2009 21:15:48 -0000	1.7
@@ -1,3 +1,4 @@
 GLE-4.2.0-src.zip
 gle-manual-4.2.0.pdf
 GLEusersguide.pdf
+gle-graphics-4.2.1-src.tar.gz


Index: gle.spec
===================================================================
RCS file: /cvs/extras/rpms/gle/F-12/gle.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gle.spec	31 Jul 2009 14:01:15 -0000	1.14
+++ gle.spec	6 Dec 2009 21:15:48 -0000	1.15
@@ -1,13 +1,15 @@
+%global mver   4.2.0
+%global oname  gle-graphics
 
 Summary:       Graphics Layout Engine
 Name:          gle
-Version:       4.2.0
-Release:       4%{?dist}
+Version:       4.2.1
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.gle-graphics.org/
-Source:        http://downloads.sourceforge.net/glx/GLE-%{version}-src.zip
-Source1:       http://downloads.sourceforge.net/glx/gle-manual-%{version}.pdf
+Source0:       http://downloads.sourceforge.net/glx/gle4%20%28Current%20Active%20Version%29/%{version}/gle-graphics-%{version}-src.tar.gz
+Source1:       http://downloads.sourceforge.net/glx/gle-manual-%{mver}.pdf
 Source2:       http://downloads.sourceforge.net/glx/GLEusersguide.pdf
 BuildRequires: libstdc++-devel >= 3.0
 BuildRequires: libpng-devel libtiff-devel libjpeg-devel 
@@ -28,13 +30,14 @@ simple looping structures. Current outpu
 JPEG, and PNG.
 
 %prep
-%setup -q -n gle4
+%setup -q -n %{oname}-%{version}
 %{__install} -p -m 0644 %{SOURCE1} .
 %{__install} -p -m 0644 %{SOURCE2} .
 
 %build
 export CPPFLAGS="%{optflags}"
-%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no
+export CXXFLAGS="%{optflags}"
+%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no --with-debug=yes CPPFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
 %{__make}
 # %{?_smp_mflags} build fails.
 
@@ -56,11 +59,14 @@ dos2unix LICENSE.txt
 %{_bindir}/%{name}
 %{_bindir}/q%{name}
 %{_bindir}/manip
-%{_datadir}/%{name}
+%{_datadir}/%{oname}
 %{_mandir}/man1/%{name}*
-%{_libdir}/lib%{name}-graphics-%{version}.so
+%{_libdir}/lib%{oname}-%{version}.so
 
 %changelog
+* Sun Dec  6 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.1-1
+- 4.2.1
+
 * Fri Jul 31 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.0-4
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gle/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	19 May 2009 06:46:40 -0000	1.6
+++ sources	6 Dec 2009 21:15:48 -0000	1.7
@@ -1,3 +1,3 @@
-3b69e0508d94069ce4aed96f66da02c6  GLE-4.2.0-src.zip
 38f7a13e3a41cd386dc2d0a845cb86bc  gle-manual-4.2.0.pdf
 ab3f3787b96a602a486f5f39e72fc276  GLEusersguide.pdf
+6b483c2b262bfa4ad3f1a60226d05d51  gle-graphics-4.2.1-src.tar.gz



From mapleoin at fedoraproject.org  Sun Dec  6 21:27:48 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Sun,  6 Dec 2009 21:27:48 +0000 (UTC)
Subject: File calibre-0.6.26-nofonts.tar.gz uploaded to lookaside cache by
	mapleoin
Message-ID: <20091206212748.0C29710F87E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for calibre:

08d305ccbeb887eefa7238523ebb85cf  calibre-0.6.26-nofonts.tar.gz



From mapleoin at fedoraproject.org  Sun Dec  6 21:29:41 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Sun,  6 Dec 2009 21:29:41 +0000 (UTC)
Subject: rpms/calibre/devel .cvsignore, 1.6, 1.7 calibre-no-update.patch, 1.2,
	1.3 calibre.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20091206212941.1177C11C00E0@cvs1.fedora.phx.redhat.com>

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4655

Modified Files:
	.cvsignore calibre-no-update.patch calibre.spec sources 
Log Message:
New upstream version 0.6.26


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Dec 2009 09:42:17 -0000	1.6
+++ .cvsignore	6 Dec 2009 21:29:40 -0000	1.7
@@ -1 +1 @@
-calibre-0.6.25-nofonts.tar.gz
+calibre-0.6.26-nofonts.tar.gz

calibre-no-update.patch:
 ui.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: calibre-no-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre-no-update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- calibre-no-update.patch	2 Dec 2009 09:42:17 -0000	1.2
+++ calibre-no-update.patch	6 Dec 2009 21:29:40 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up calibre/src/calibre/gui2/main.py.no_update calibre/src/calibre/gui2/main.py
---- calibre/src/calibre/gui2/main.py.no_update	2009-12-02 11:16:14.357372471 +0200
-+++ calibre/src/calibre/gui2/main.py	2009-12-02 11:17:30.421373426 +0200
-@@ -220,11 +220,11 @@ class Main(MainWindow, Ui_MainWindow, De
+diff -up calibre/src/calibre/gui2/ui.py.no_update calibre/src/calibre/gui2/ui.py
+--- calibre/src/calibre/gui2/ui.py.no_update	2009-12-06 23:21:12.298917664 +0200
++++ calibre/src/calibre/gui2/ui.py	2009-12-06 23:21:18.054898861 +0200
+@@ -226,11 +226,11 @@ class Main(MainWindow, Ui_MainWindow, De
          self.latest_version = ' '
          self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
          self.device_info = ' '


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- calibre.spec	2 Dec 2009 09:42:17 -0000	1.6
+++ calibre.spec	6 Dec 2009 21:29:40 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           calibre
-Version:        0.6.25
+Version:        0.6.26
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -246,6 +246,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Dec  6 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.26-1
+- New upstream version
+- Regenerated no-update patch because of code relocation
+
 * Wed Dec  2 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.25-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Dec 2009 09:42:17 -0000	1.6
+++ sources	6 Dec 2009 21:29:40 -0000	1.7
@@ -1 +1 @@
-d0bcbe90ad50ca9dcafca6e28e9e568e  calibre-0.6.25-nofonts.tar.gz
+08d305ccbeb887eefa7238523ebb85cf  calibre-0.6.26-nofonts.tar.gz



From mapleoin at fedoraproject.org  Sun Dec  6 21:37:28 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Sun,  6 Dec 2009 21:37:28 +0000 (UTC)
Subject: rpms/calibre/F-12 .cvsignore, 1.7, 1.8 calibre-no-update.patch, 1.2,
	1.3 calibre.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20091206213728.0870711C00E0@cvs1.fedora.phx.redhat.com>

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6215

Modified Files:
	.cvsignore calibre-no-update.patch calibre.spec sources 
Log Message:
upstream release 0.6.26


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Dec 2009 09:54:42 -0000	1.7
+++ .cvsignore	6 Dec 2009 21:37:27 -0000	1.8
@@ -1 +1 @@
-calibre-0.6.25-nofonts.tar.gz
+calibre-0.6.26-nofonts.tar.gz

calibre-no-update.patch:
 ui.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: calibre-no-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/calibre-no-update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- calibre-no-update.patch	2 Dec 2009 09:54:42 -0000	1.2
+++ calibre-no-update.patch	6 Dec 2009 21:37:27 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up calibre/src/calibre/gui2/main.py.no_update calibre/src/calibre/gui2/main.py
---- calibre/src/calibre/gui2/main.py.no_update	2009-12-02 11:16:14.357372471 +0200
-+++ calibre/src/calibre/gui2/main.py	2009-12-02 11:17:30.421373426 +0200
-@@ -220,11 +220,11 @@ class Main(MainWindow, Ui_MainWindow, De
+diff -up calibre/src/calibre/gui2/ui.py.no_update calibre/src/calibre/gui2/ui.py
+--- calibre/src/calibre/gui2/ui.py.no_update	2009-12-06 23:21:12.298917664 +0200
++++ calibre/src/calibre/gui2/ui.py	2009-12-06 23:21:18.054898861 +0200
+@@ -226,11 +226,11 @@ class Main(MainWindow, Ui_MainWindow, De
          self.latest_version = ' '
          self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
          self.device_info = ' '


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/calibre.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- calibre.spec	2 Dec 2009 09:54:42 -0000	1.6
+++ calibre.spec	6 Dec 2009 21:37:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           calibre
-Version:        0.6.25
+Version:        0.6.26
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -246,6 +246,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Dec  6 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.26-1
+- New upstream version
+- Regenerated no-update patch because of code relocation
+
 * Wed Dec  2 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.25-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Dec 2009 09:54:42 -0000	1.7
+++ sources	6 Dec 2009 21:37:27 -0000	1.8
@@ -1 +1 @@
-d0bcbe90ad50ca9dcafca6e28e9e568e  calibre-0.6.25-nofonts.tar.gz
+08d305ccbeb887eefa7238523ebb85cf  calibre-0.6.26-nofonts.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec  6 22:01:22 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 22:01:22 +0000 (UTC)
Subject: File gromacs-4.0.7.tar.gz uploaded to lookaside cache by
	jussilehtola
Message-ID: <20091206220122.ABA8210F87F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gromacs:

51369bd553e6bba4085a58bcf23d337d  gromacs-4.0.7.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec  6 22:01:34 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 22:01:34 +0000 (UTC)
Subject: rpms/gromacs/devel .cvsignore, 1.10, 1.11 gromacs.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <20091206220134.197C311C00E0@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10452

Modified Files:
	.cvsignore gromacs.spec sources 
Log Message:
Update to 4.0.7.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Dec 2009 20:08:58 -0000	1.10
+++ .cvsignore	6 Dec 2009 22:01:33 -0000	1.11
@@ -1,2 +1 @@
-gromacs-4.0.6.tar.gz
-manual-4.0.pdf
+gromacs-4.0.7.tar.gz


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gromacs.spec	6 Dec 2009 20:08:58 -0000	1.20
+++ gromacs.spec	6 Dec 2009 22:01:33 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		gromacs
-Version:	4.0.6
+Version:	4.0.7
 Release:	1%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
@@ -516,6 +516,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.7-1
+- Update to 4.0.7.
+
 * Sun Dec 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.6-1
 - Update to 4.0.6.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Dec 2009 20:08:58 -0000	1.10
+++ sources	6 Dec 2009 22:01:33 -0000	1.11
@@ -1,2 +1 @@
-a903b9b0a87f941a5ce9c59d1529b2d2  gromacs-4.0.6.tar.gz
-2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
+51369bd553e6bba4085a58bcf23d337d  gromacs-4.0.7.tar.gz



From lkundrak at fedoraproject.org  Sun Dec  6 22:04:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  6 Dec 2009 22:04:09 +0000 (UTC)
Subject: File ETL-0.04.13.tar.gz uploaded to lookaside cache by lkundrak
Message-ID: <20091206220409.3A28B10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ETL:

d52253adeb219d2fa554cbd744dfff29  ETL-0.04.13.tar.gz



From lkundrak at fedoraproject.org  Sun Dec  6 22:04:34 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  6 Dec 2009 22:04:34 +0000 (UTC)
Subject: rpms/ETL/devel .cvsignore,1.2,1.3 ETL.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091206220434.D2DB311C00E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/ETL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11016

Modified Files:
	.cvsignore ETL.spec sources 
Log Message:
* Sat Nov 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.04.13-1
- New upstream release
- Drop our build patch, since upstream fixed necessary bits



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ETL/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 10:44:41 -0000	1.2
+++ .cvsignore	6 Dec 2009 22:04:34 -0000	1.3
@@ -1 +1 @@
-ETL-0.04.12.tar.gz
+ETL-0.04.13.tar.gz


Index: ETL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ETL/devel/ETL.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ETL.spec	24 Jul 2009 15:08:39 -0000	1.2
+++ ETL.spec	6 Dec 2009 22:04:34 -0000	1.3
@@ -1,15 +1,14 @@
 %define debug_package %{nil}
 
 Name:           ETL
-Version:        0.04.12
-Release:        2%{?dist}
+Version:        0.04.13
+Release:        1%{?dist}
 Summary:        Extended Template Library
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://synfig.org
 Source0:        http://downloads.sourceforge.net/synfig/ETL-%{version}.tar.gz
-Patch0:         ETL-0.04.12-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  doxygen
 Buildrequires:  autoconf automake
@@ -32,8 +31,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .build
-autoreconf
 
 
 %build
@@ -65,6 +62,10 @@ make check
 
 
 %changelog
+* Sat Nov 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.04.13-1
+- New upstream release
+- Drop our build patch, since upstream fixed necessary bits
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ETL/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Mar 2009 10:44:41 -0000	1.2
+++ sources	6 Dec 2009 22:04:34 -0000	1.3
@@ -1 +1 @@
-4cd7fb673fa5c77cfa1986aeecdb3ffe  ETL-0.04.12.tar.gz
+d52253adeb219d2fa554cbd744dfff29  ETL-0.04.13.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec  6 22:08:13 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 22:08:13 +0000 (UTC)
Subject: rpms/gromacs/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20091206220813.2AF4111C00E0@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11826

Modified Files:
	.cvsignore sources 
Log Message:
Re-add manual to sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	6 Dec 2009 22:01:33 -0000	1.11
+++ .cvsignore	6 Dec 2009 22:08:12 -0000	1.12
@@ -1 +1,2 @@
 gromacs-4.0.7.tar.gz
+manual-4.0.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Dec 2009 22:01:33 -0000	1.11
+++ sources	6 Dec 2009 22:08:12 -0000	1.12
@@ -1 +1,2 @@
 51369bd553e6bba4085a58bcf23d337d  gromacs-4.0.7.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From rdieter at fedoraproject.org  Sun Dec  6 22:22:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  6 Dec 2009 22:22:22 +0000 (UTC)
Subject: rpms/k3b/F-12 k3b-1.0.5-progress_rate.patch, NONE, 1.1 k3b.spec,
	1.77, 1.78
Message-ID: <20091206222222.5565711C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14735

Modified Files:
	k3b.spec 
Added Files:
	k3b-1.0.5-progress_rate.patch 
Log Message:
* Sun Dec 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-11
- transcode --progress_rate 0 (#524348)


k3b-1.0.5-progress_rate.patch:
 k3bvideodvdtitletranscodingjob.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE k3b-1.0.5-progress_rate.patch ---
--- branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2007/06/02 15:56:08	670810
+++ branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009/12/06 22:04:47	1059542
@@ -206,10 +206,11 @@
     *d->process << "--nice" << "19";
 
   // we only need 100 steps, but to make sure we use 150
+  int progressRate = qMax( 1, ( int )m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150 );
   if ( d->usedTranscodeBin->version.simplify() >= K3bVersion( 1, 1, 0 ) )
-      *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
+      *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(progressRate);
   else
-      *d->process << "--print_status" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
+      *d->process << "--print_status" << QString::number(progressRate);
 
   // the input
   *d->process << "-i" << m_dvd.device()->blockDeviceName();


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/k3b.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- k3b.spec	26 Sep 2009 18:03:01 -0000	1.77
+++ k3b.spec	6 Dec 2009 22:22:21 -0000	1.78
@@ -22,7 +22,7 @@ Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   1
 Version: 1.0.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -51,6 +51,8 @@ Patch102: reload-for-verification.diff
 Patch105: k3b-1.0.5-hidden.patch
 # 
 Patch106: k3b-1.0.5-desktopfile.patch
+# http://websvn.kde.org/branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp?r1=670810&r2=1059542&pathrev=1059542&view=patch
+Patch107: k3b-1.0.5-progress_rate.patch
 
 BuildRequires: %{kdelibs3}-devel
 BuildRequires: desktop-file-utils
@@ -142,6 +144,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch
 %patch102 -p0 -b .kde#156684
 %patch105 -p1 -b .hidden
 %patch106 -p1 -b .desktopfile
+%patch107 -p5 -b .progress_rate
 
 
 %build
@@ -274,6 +277,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Sun Dec 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-11
+- transcode --progress_rate 0 (#524348)
+
 * Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-10
 - Epoch: 1 (increment Release too, to minimize confusion)
 - -common: noarch subpkg



From terjeros at fedoraproject.org  Sun Dec  6 22:32:08 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 22:32:08 +0000 (UTC)
Subject: File argparse-1.0.1.zip uploaded to lookaside cache by terjeros
Message-ID: <20091206223208.8AA1B10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-argparse:

2d04a5fa1504c93a3e7523cd97bfd8b2  argparse-1.0.1.zip



From terjeros at fedoraproject.org  Sun Dec  6 22:33:36 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun,  6 Dec 2009 22:33:36 +0000 (UTC)
Subject: rpms/python-argparse/devel .cvsignore, 1.2, 1.3 python-argparse.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091206223336.309FD11C00E0@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-argparse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16933

Modified Files:
	.cvsignore python-argparse.spec sources 
Log Message:
* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.0.1-1
- 1.0.1
- Ship more docs
- Project has moved
- Disable test for now
- Change license to Apache 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Feb 2009 18:08:53 -0000	1.2
+++ .cvsignore	6 Dec 2009 22:33:35 -0000	1.3
@@ -1 +1 @@
-argparse-0.8.0.zip
+argparse-1.0.1.zip


Index: python-argparse.spec
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/devel/python-argparse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-argparse.spec	26 Jul 2009 20:08:43 -0000	1.3
+++ python-argparse.spec	6 Dec 2009 22:33:35 -0000	1.4
@@ -1,15 +1,15 @@
-%{!?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]")}
-%define oname  argparse
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+%global oname  argparse
 
 Summary:       Optparse inspired command line parser for Python
 Name:          python-argparse
-Version:       0.8.0
-Release:       4%{?dist}
-License:       BSD
+Version:       1.0.1
+Release:       1%{?dist}
+License:       ASL 2.0
 Group:         Development/Languages
-URL:           http://argparse.python-hosting.com/
-Source0:       http://pypi.python.org/packages/source/a/%{oname}/%{oname}-%{version}.zip
+URL:           http://code.google.com/p/argparse/
+Source0:       http://argparse.googlecode.com/files/argparse-%{version}.zip
 BuildRequires: python-setuptools-devel dos2unix
 BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@ optparse API.
 %prep
 %setup -q -n %{oname}-%{version}
 dos2unix -k README.txt
+%{__rm} -rf doc/source
 
 %build
 %{__python} setup.py build
@@ -39,19 +40,27 @@ dos2unix -k README.txt
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-%check
-%{__python} test_%{oname}.py
+#check
+#pushd test
+#PYTHONPATH=../ %{__python} test_%{oname}.py
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc README.txt
+%doc README.txt doc/*
 %{python_sitelib}/%{oname}.py*
 %{python_sitelib}/%{oname}-%{version}-py%{pyver}.egg-info/
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.0.1-1
+- 1.0.1
+- Ship more docs
+- Project has moved
+- Disable test for now
+- Change license to Apache 2.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Feb 2009 18:08:53 -0000	1.2
+++ sources	6 Dec 2009 22:33:35 -0000	1.3
@@ -1 +1 @@
-fc3ac46fecf541e8ca25caeae75b1b8d  argparse-0.8.0.zip
+2d04a5fa1504c93a3e7523cd97bfd8b2  argparse-1.0.1.zip



From than at fedoraproject.org  Sun Dec  6 22:35:18 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  6 Dec 2009 22:35:18 +0000 (UTC)
Subject: rpms/arts/F-12 arts.spec,1.97,1.98
Message-ID: <20091206223518.A689611C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17375

Modified Files:
	arts.spec 
Log Message:
fix url



Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/F-12/arts.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- arts.spec	1 Sep 2009 22:08:02 -0000	1.97
+++ arts.spec	6 Dec 2009 22:35:18 -0000	1.98
@@ -11,12 +11,12 @@ Summary: aRts (analog realtime synthesiz
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/%{name}-%{version}.tar.bz2
 Source1: gslconfig-wrapper.h
 
 Patch1: arts-1.1.4-debug.patch
@@ -185,6 +185,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
+- fix url
+
 * Wed Sep 02 2009 Than Ngo <than at redhat.com> - 1.5.10-8
 - drop support fedora < 10
 



From jussilehtola at fedoraproject.org  Sun Dec  6 22:35:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun,  6 Dec 2009 22:35:39 +0000 (UTC)
Subject: rpms/gromacs/F-12 gromacs.spec,1.13,1.14 sources,1.9,1.10
Message-ID: <20091206223539.1E63011C00E0@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17524

Modified Files:
	gromacs.spec sources 
Log Message:
Update to 4.0.7.


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-12/gromacs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gromacs.spec	25 Jul 2009 01:30:46 -0000	1.13
+++ gromacs.spec	6 Dec 2009 22:35:38 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		gromacs
-Version:	4.0.5
-Release:	2%{?dist}
+Version:	4.0.7
+Release:	1%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -21,48 +21,15 @@ Patch1:		gromacs-gmxdemo.patch
 # Patch configure for the library suffix
 Patch2:		gromacs-configure.patch
 
-Requires:	gromacs-common = %{version}-%{release}
-
+BuildRequires:	blas-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	openmpi-devel
-
-%if 0%{?rhel} == 4
-BuildRequires:	blas
-BuildRequires:	lapack
-BuildRequires:	xorg-x11-devel
-%else
-BuildRequires:	blas-devel
 BuildRequires:	lapack-devel
+BuildRequires:	libxml2-devel
 BuildRequires:	libX11-devel
-%endif
-
-# Check for mpi-selector or environment-modules
-
-%global selector 0
-%global modules 0
-
-%if 0%{?fedora} > 9
-%global modules 1
-%endif
-
-%if 0%{?rhel} == 4
-%global selector 1
-%endif
-
-%if 0%{?rhel} == 5
-%global selector 1
-%endif
-
-%if %modules == 1
-BuildRequires:	environment-modules
-%endif
-
-%if %selector == 1
-BuildRequires:	mpi-selector
-%endif
 
+Requires:	gromacs-common = %{version}-%{release}
+Obsoletes:	gromacs-libs < %{version}-%{release}
 
 %description
 GROMACS is a versatile and extremely well optimized package to perform
@@ -78,95 +45,12 @@ N.B. All binaries have names starting wi
 renamed to g_mdrun.
 
 
-%package debug
-Summary:	GROMACS debugging binaries without assembly loops
-Group:		Applications/Engineering
-Requires:	gromacs-common = %{version}-%{release}
-
-%description debug
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
-
-This package provides debugging versions of single and
-double precision binaries, compiled without assembly loops.
-The documentation is in the package gromacs-common.
-You do not want this package for production purposes.
-
-N.B. All binaries have names starting with g_, for example mdrun has been
-renamed to g_mdrun.
-
-
-%package libs
-Summary:	GROMACS libraries
-Group:		Applications/Engineering
-Requires:	gromacs-common = %{version}-%{release}
-
-%description libs
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
-
-This package provides runtime libraries needed for the single and double
-precision binaries.
-
-
-%package debug-libs
-Summary:	GROMACS libraries without assembly loops for debugging
-Group:		Applications/Engineering
-Requires:	gromacs-common = %{version}-%{release}
-
-%description debug-libs
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
-
-This package provides runtime libraries needed for the debugging versions of
-the single and double precision binaries.
-
-
-
-%package mpi
-Summary:	GROMACS MPI binaries
-Group:		Applications/Engineering
-Requires:	gromacs-common = %{version}-%{release}
-
-%description mpi
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
-
-This package provides MPI single precision and double precision binaries.
-
-
-%package debug-mpi
-Summary:	GROMACS debugging MPI binaries without assembly loops
-Group:		Applications/Engineering
-Requires:	gromacs-common = %{version}-%{release}
-
-%description debug-mpi
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
-
-This package provides debugging versions of MPI single precision and double
-precision binaries.
-
-
-
 %package common
 Summary:	GROMACS shared data and documentation
 Group:		Applications/Engineering
+BuildArch:	noarch
+# Due to switch to noarch package
+Obsoletes:	gromacs-common < %{version}-%{release}
 
 %description common
 GROMACS is a versatile and extremely well optimized package to perform
@@ -181,8 +65,7 @@ This package includes architecture indep
 %package devel
 Summary:	GROMACS header files and development libraries
 Group:		Applications/Engineering
-Requires:	gromacs-common = %{version}-%{release}
-Requires:	gromacs-libs = %{version}-%{release}
+Requires:	gromacs = %{version}-%{release}
 
 %description devel
 GROMACS is a versatile and extremely well optimized package to perform
@@ -196,104 +79,91 @@ molecular dynamics software. You need it
 programs.
 
 
-
-%package debug-devel
-Summary:	GROMACS debugging header files and development libraries
+%package openmpi
+Summary:	GROMACS Open MPI binaries and libraries
 Group:		Applications/Engineering
+Obsoletes:	gromacs-mpi < %{version}-%{release}
+Obsoletes:	gromacs-mpi-libs < %{version}-%{release}
 Requires:	gromacs-common = %{version}-%{release}
-Requires:	gromacs-devel = %{version}-%{release}
-Requires:	gromacs-debug-libs = %{version}-%{release}
+BuildRequires:	openmpi-devel
+Requires:	openmpi
 
-%description debug-devel
+%description openmpi
 GROMACS is a versatile and extremely well optimized package to perform
 molecular dynamics computer simulations and subsequent trajectory analysis.
 It is developed for biomolecules like proteins, but the extremely high
 performance means it is used also in several other field like polymer chemistry
 and solid state physics.
 
-This package contains header files and development libraries for the debugging
-version of the GROMACS molecular dynamics software.
-
+This package provides Open MPI single precision and double precision binaries
+and libraries.
 
 
-%package mpi-devel
-Summary:	GROMACS MPI development libraries
+%package openmpi-devel
+Summary:	GROMACS Open MPI development libraries
 Group:		Applications/Engineering
-Requires:	gromacs-mpi-libs = %{version}-%{release}
+Obsoletes:	gromacs-mpi-devel < %{version}-%{release}
 Requires:	gromacs-devel = %{version}-%{release}
-# Need to have this so that yum doesn't install LAM instead
-Requires:	openmpi
+Requires:	gromacs-openmpi = %{version}-%{release}
+Requires:	openmpi-devel
 
-%description mpi-devel
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
 
-This package contains development libraries for GROMACS MPI.
-You need it if you want to write your own analysis programs.
-
-
-%package debug-mpi-devel
-Summary:	GROMACS debugging MPI development libraries
-Group:		Applications/Engineering
-Requires:	gromacs-debug-mpi-libs = %{version}-%{release}
-Requires:	gromacs-debug-devel = %{version}-%{release}
-# Need to have this so that yum doesn't install LAM instead
-Requires:	openmpi
-
-%description debug-mpi-devel
+%description openmpi-devel
 GROMACS is a versatile and extremely well optimized package to perform
 molecular dynamics computer simulations and subsequent trajectory analysis.
 It is developed for biomolecules like proteins, but the extremely high
 performance means it is used also in several other field like polymer chemistry
 and solid state physics.
 
-This package contains debugging versions of development libraries for the MPI
-version of GROMACS.
+This package contains development libraries for GROMACS Open MPI.
+You need it if you want to write your own analysis programs.
 
 
-%package mpi-libs
-Summary:	GROMACS MPI libraries
+%package mpich2
+Summary:	GROMACS MPICH2 binaries and libraries
 Group:		Applications/Engineering
 Requires:	gromacs-common = %{version}-%{release}
-# Need to have this so that yum doesn't install LAM instead
-Requires:	openmpi
+Requires:	mpich2
 
-%description mpi-libs
+%description mpich2
 GROMACS is a versatile and extremely well optimized package to perform
 molecular dynamics computer simulations and subsequent trajectory analysis.
 It is developed for biomolecules like proteins, but the extremely high
 performance means it is used also in several other field like polymer chemistry
 and solid state physics.
 
-This package provides runtime libraries needed for the MPI single and double
-precision binaries.
+This package provides MPICH2 single precision and double precision binaries
+and libraries.
 
 
-%package debug-mpi-libs
-Summary:	GROMACS debugging MPI libraries
+%package mpich2-devel
+Summary:	GROMACS MPICH2 development libraries
 Group:		Applications/Engineering
-Requires:	gromacs-common = %{version}-%{release}
-# Need to have this so that yum doesn't install LAM instead
-Requires:	openmpi
+Requires:	gromacs-devel = %{version}-%{release}
+Requires:	gromacs-mpich2 = %{version}-%{release}
+BuildRequires:	mpich2-devel
+Requires:	mpich2-devel
 
-%description debug-mpi-libs
+%description mpich2-devel
 GROMACS is a versatile and extremely well optimized package to perform
 molecular dynamics computer simulations and subsequent trajectory analysis.
 It is developed for biomolecules like proteins, but the extremely high
 performance means it is used also in several other field like polymer chemistry
 and solid state physics.
 
-This package provides debugging versions of runtime libraries needed for the
-debug versions of the MPI single and double precision binaries.
+This package contains development libraries for GROMACS MPICH2.
+You need it if you want to write your own analysis programs.
+
 
 
 %package bash
 Summary:	GROMACS bash completion
 Group:		Applications/Engineering
 Requires:	bash-completion
+BuildArch:	noarch
+# Due to switch to noarch package
+Obsoletes:	gromacs-bash < %{version}-%{release}
+
 
 %description bash
 GROMACS is a versatile and extremely well optimized package to perform
@@ -309,6 +179,10 @@ This package provides bash completion fo
 Summary:	GROMACS zsh support
 Group:		Applications/Engineering
 Requires:	zsh
+BuildArch:	noarch
+# Due to switch to noarch package
+Obsoletes:	gromacs-zsh < %{version}-%{release}
+
 
 %description zsh
 GROMACS is a versatile and extremely well optimized package to perform
@@ -325,6 +199,10 @@ completion.
 Summary:	GROMACS csh support
 Group:		Applications/Engineering
 Requires:	csh
+BuildArch:	noarch
+# Due to switch to noarch package
+Obsoletes:	gromacs-csh < %{version}-%{release}
+
 
 %description csh
 GROMACS is a versatile and extremely well optimized package to perform
@@ -340,6 +218,9 @@ script.
 Summary:	GROMACS tutorial files
 Group:		Applications/Engineering
 Requires:	gromacs-common = %{version}-%{release}
+BuildArch:	noarch
+# Due to switch to noarch package
+Obsoletes:	gromacs-tutor < %{version}-%{release}
 
 %description tutor
 GROMACS is a versatile and extremely well optimized package to perform
@@ -375,6 +256,8 @@ export DEFOPTS="--enable-shared --disabl
 export SINGLE="--enable-float" # Single precision
 export DOUBLE="--disable-float" # Double precision
 export MPI="--enable-mpi"
+
+# Add this to the configure options if you want to build a debug version
 export NOASM="--disable-ia32-3dnow --disable-ia32-sse --disable-x86-64-sse \
 	--disable-ppc-altivec --disable-ia64-asm"
 
@@ -390,19 +273,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpa
 make %{?_smp_mflags}
 cd ..
 
-# Single precision, debug version with no assembly loops
-mkdir single-debug
-cd single-debug
-sed "s|@LIBSUFFIX@|_debug|g" < ../configure > configure; chmod 777 configure
-%configure $DEFOPTS $SINGLE $NOASM --program-suffix="_debug"
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags}
-cd ..
-
-
-
 # Double precision
 mkdir double
 cd double
@@ -414,140 +284,98 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpa
 make %{?_smp_mflags}
 cd ..
 
-# Double precision, debug version with no assembly loops
-mkdir double-debug
-cd double-debug
-sed "s|@LIBSUFFIX@|_d_debug|g" < ../configure > configure; chmod 777 configure
-%configure $DEFOPTS $DOUBLE $NOASM --program-suffix="_d_debug"
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags}
-cd ..
-
-
-
-# Load MPI enviroment
-
-%if %modules == 1
-. /etc/profile.d/modules.sh
-module load %{_libdir}/openmpi/*/openmpi.module
-# The module overrides CFLAGS, need to set them again..
-export CFLAGS="%optflags -Wa,--noexecstack -fPIC"
-%endif
-
-%if %selector == 1
-# Set MPI environment
-mpi-selector --set `mpi-selector --list | grep openmpi`
-source /etc/profile.d/mpi-selector.sh
-%endif
-
 
-# MPI, single precision
-
-mkdir mpi-single
-cd mpi-single
+### MPI versions
+export CC=mpicc
+export CXX=mpicxx
+export F77=mpif77
+export F90=mpif90
+export FC=mpif90
+
+## Open MPI
+%{_openmpi_load}
+# single precision
+mkdir openmpi-single
+cd openmpi-single
 sed "s|@LIBSUFFIX@|_mpi|g" < ../configure > configure; chmod 777 configure
-%configure $DEFOPTS $SINGLE $MPI --program-suffix="_mpi"
+%configure $DEFOPTS $SINGLE $MPI --program-suffix=${MPI_SUFFIX} --bindir=${MPI_BIN} --libdir=${MPI_LIB}
 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} mdrun
-#make %{?_smp_mflags}
 cd ..
-
-mkdir mpi-single-debug
-cd mpi-single-debug
-sed "s|@LIBSUFFIX@|_mpi_debug|g" < ../configure > configure; chmod 777 configure
-%configure $DEFOPTS $SINGLE $MPI $NOASM --program-suffix="_mpi_debug"
+# double precision
+mkdir openmpi-double
+cd openmpi-double
+sed "s|@LIBSUFFIX@|_mpi_d|g" < ../configure > configure; chmod 777 configure
+%configure $DEFOPTS $DOUBLE $MPI --program-suffix=${MPI_SUFFIX}_d --bindir=${MPI_BIN} --libdir=${MPI_LIB}
 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} mdrun
-#make %{?_smp_mflags}
 cd ..
+# unload
+%{_openmpi_unload}
 
-
-
-# MPI, double precision
-mkdir mpi-double
-cd mpi-double
-sed "s|@LIBSUFFIX@|_mpi_d|g" < ../configure > configure; chmod 777 configure
-%configure $DEFOPTS $DOUBLE $MPI --program-suffix="_mpi_d"
+## MPICH2
+%{_mpich2_load}
+# single precision
+mkdir mpich2-single
+cd mpich2-single
+sed "s|@LIBSUFFIX@|_mpi|g" < ../configure > configure; chmod 777 configure
+%configure $DEFOPTS $SINGLE $MPI --program-suffix=${MPI_SUFFIX} --bindir=${MPI_BIN} --libdir=${MPI_LIB}
 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} mdrun
-#make %{?_smp_mflags}
 cd ..
-
-mkdir mpi-double-debug
-cd mpi-double-debug
-sed "s|@LIBSUFFIX@|_mpi_d_debug|g" < ../configure > configure; chmod 777 configure
-%configure $DEFOPTS $DOUBLE $MPI $NOASM --program-suffix="_mpi_d_debug"
+# double precision
+mkdir mpich2-double
+cd mpich2-double
+sed "s|@LIBSUFFIX@|_mpi_d|g" < ../configure > configure; chmod 777 configure
+%configure $DEFOPTS $DOUBLE $MPI --program-suffix=${MPI_SUFFIX}_d --bindir=${MPI_BIN} --libdir=${MPI_LIB}
 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} mdrun
-#make %{?_smp_mflags}
 cd ..
+%{_mpich2_unload}
 
 
 %install
 rm -rf %{buildroot}
 
-# 4.0.3 needs this to build in EPEL-4
-# Load MPI enviroment
-%if %modules == 1
-. /etc/profile.d/modules.sh
-module load %{_libdir}/openmpi/*/openmpi.module
-export CFLAGS="%optflags -Wa,--noexecstack -fPIC"
-%endif
-
-%if %selector == 1
-# Set MPI environment
-mpi-selector --set `mpi-selector --list | grep openmpi`
-source /etc/profile.d/mpi-selector.sh
-%endif
-
-
-# Single precision
-cd single
-make DESTDIR=%{buildroot} INSTALL="install -p" install
-cd ..
 
-cd single-debug
-make DESTDIR=%{buildroot} INSTALL="install -p" install
+## Open MPI
+%{_openmpi_load}
+# single precision
+cd openmpi-single
+make DESTDIR=%{buildroot} INSTALL="install -p" BINDIR=${MPI_BIN} LIBDIR=${MPI_LIB} install-mdrun
 cd ..
-
-# Double precision
-cd double
-make DESTDIR=%{buildroot} INSTALL="install -p" install
+# double precision
+cd openmpi-double
+make DESTDIR=%{buildroot} INSTALL="install -p" BINDIR=${MPI_BIN} LIBDIR=${MPI_LIB} install-mdrun
 cd ..
+%{_openmpi_unload}
 
-cd double-debug
-make DESTDIR=%{buildroot} INSTALL="install -p" install
+## MPICH 2
+%{_mpich2_load}
+# single precision
+cd mpich2-single
+make DESTDIR=%{buildroot} INSTALL="install -p" BINDIR=${MPI_BIN} LIBDIR=${MPI_LIB} install-mdrun
 cd ..
-
-
-
-# MPI, single precision
-cd mpi-single
-make DESTDIR=%{buildroot} INSTALL="install -p" install-mdrun
+# double precision
+cd mpich2-double
+make DESTDIR=%{buildroot} INSTALL="install -p" BINDIR=${MPI_BIN} LIBDIR=${MPI_LIB} install-mdrun
 cd ..
+%{_mpich2_unload}
 
-cd mpi-single-debug
-make DESTDIR=%{buildroot} INSTALL="install -p" install-mdrun
-cd ..
 
+## Serial versions
 
-# MPI, double precision
-cd mpi-double
-make DESTDIR=%{buildroot} INSTALL="install -p" install-mdrun
+# Single precision
+cd single
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 cd ..
-
-cd mpi-double-debug
-make DESTDIR=%{buildroot} INSTALL="install -p" install-mdrun
+# Double precision
+cd double
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 cd ..
 
 
@@ -571,9 +399,7 @@ chmod a+x %{buildroot}%{_bindir}/GMXRC %
 # (This is done here so that we don't need to mess with machine generated makefiles.
 for bin in anadock do_dssp editconf eneconv genbox genconf genion genrestr gmxcheck gmxdump grompp highway luck make_edi make_ndx mdrun mk_angndx ngmx pdb2gmx protonate sigeps tpbconv trjcat trjconv trjorder wheel x2top xpm2ps xrama ; do 
 mv %{buildroot}%{_bindir}/${bin} %{buildroot}%{_bindir}/g_${bin}
-mv %{buildroot}%{_bindir}/${bin}_debug %{buildroot}%{_bindir}/g_${bin}_debug
 mv %{buildroot}%{_bindir}/${bin}_d %{buildroot}%{_bindir}/g_${bin}_d
-mv %{buildroot}%{_bindir}/${bin}_d_debug %{buildroot}%{_bindir}/g_${bin}_d_debug
 done
 
 for bin in demux.pl xplor2gmx.pl; do
@@ -582,11 +408,11 @@ done
 
 # MPI-enabled binaries (list will continue when the makefile has
 # the possibility to compile all mpi-enabled files
-for mpibin in mdrun; do
-mv %{buildroot}%{_bindir}/${mpibin}_mpi %{buildroot}%{_bindir}/g_${mpibin}_mpi
-mv %{buildroot}%{_bindir}/${mpibin}_mpi_debug %{buildroot}%{_bindir}/g_${mpibin}_mpi_debug
-mv %{buildroot}%{_bindir}/${mpibin}_mpi_d %{buildroot}%{_bindir}/g_${mpibin}_mpi_d
-mv %{buildroot}%{_bindir}/${mpibin}_mpi_d_debug %{buildroot}%{_bindir}/g_${mpibin}_mpi_d_debug
+for mpi in openmpi mpich2; do
+ for mpibin in mdrun; do
+  mv %{buildroot}%{_libdir}/$mpi/bin/${mpibin}_${mpi} %{buildroot}%{_libdir}/$mpi/bin/g_${mpibin}_${mpi}
+  mv %{buildroot}%{_libdir}/$mpi/bin/${mpibin}_${mpi}_d %{buildroot}%{_libdir}/$mpi/bin/g_${mpibin}_${mpi}_d
+ done
 done
 
 # Man pages
@@ -607,51 +433,22 @@ mv %{buildroot}%{_bindir}/completion.bas
 mv %{buildroot}%{_bindir}/completion.csh . 
 
 # Remove .la files
-rm -rf %{buildroot}/%{_libdir}/*.la
-
-# Post install for libs
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%post debug-libs -p /sbin/ldconfig
-
-%postun debug-libs -p /sbin/ldconfig
-
-%post mpi-libs -p /sbin/ldconfig
-
-%postun mpi-libs -p /sbin/ldconfig
-
-%post debug-mpi-libs -p /sbin/ldconfig
-
-%postun debug-mpi-libs -p /sbin/ldconfig
+find %{buildroot} -name *.la -exec rm -rf {} \;
 
+# Post install for libs. MPI packages don't need this.
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
 
 
-
-
 # Files section
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%exclude %{_bindir}/*_debug
-%exclude %{_bindir}/g_mdrun_mpi*
-%exclude %{_bindir}/GMXRC*
-
-%files debug
-%defattr(-,root,root,-)
-%{_bindir}/*_debug
-%exclude %{_bindir}/g_mdrun_mpi_debug
-%exclude %{_bindir}/g_mdrun_mpi_d_debug
-
-%files libs
-%defattr(-,root,root,-)
+%{_bindir}/g_*
 %{_libdir}/libgmx.so.*
 %{_libdir}/libgmx_d.so.*
 %{_libdir}/libgmxana.so.*
@@ -659,50 +456,15 @@ rm -rf %{buildroot}
 %{_libdir}/libmd.so.*
 %{_libdir}/libmd_d.so.*
 
-%files debug-libs
-%defattr(-,root,root,-)
-%{_libdir}/libgmx_debug.so.*
-%{_libdir}/libgmx_d_debug.so.*
-%{_libdir}/libgmxana_debug.so.*
-%{_libdir}/libgmxana_d_debug.so.*
-%{_libdir}/libmd_debug.so.*
-%{_libdir}/libmd_d_debug.so.*
-
-
-%files mpi
-%defattr(-,root,root,-)
-%{_bindir}/g_mdrun_mpi
-%{_bindir}/g_mdrun_mpi_d
-
-%files debug-mpi
-%defattr(-,root,root,-)
-%{_bindir}/g_mdrun_mpi_debug
-%{_bindir}/g_mdrun_mpi_d_debug
-
-%files mpi-libs
-%defattr(-,root,root,-)
-%{_libdir}/libgmx_mpi.so.*
-%{_libdir}/libgmx_mpi_d.so.*
-%{_libdir}/libmd_mpi.so.*
-%{_libdir}/libmd_mpi_d.so.*
-
-%files debug-mpi-libs
-%defattr(-,root,root,-)
-%{_libdir}/libgmx_mpi_debug.so.*
-%{_libdir}/libgmx_mpi_d_debug.so.*
-%{_libdir}/libmd_mpi_debug.so.*
-%{_libdir}/libmd_mpi_d_debug.so.*
-
-
 %files common
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README manual-4.0.pdf README.fedora
 %{_bindir}/GMXRC
 %{_bindir}/GMXRC.bash
 %{_mandir}/man1/*
-%{_datadir}/%{name}
-%exclude %{_datadir}/%{name}/template
-%exclude %{_datadir}/%{name}/tutor
+%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/template/
+%exclude %{_datadir}/%{name}/tutor/
 
 %files devel
 %defattr(-,root,root,-)
@@ -713,33 +475,26 @@ rm -rf %{buildroot}
 %{_libdir}/libgmxana_d.so
 %{_libdir}/libmd.so
 %{_libdir}/libmd_d.so
-%{_datadir}/%{name}/template
+%{_datadir}/%{name}/template/
 %exclude %{_datadir}/%{name}/template/Makefile.mpi.*
 
-%files debug-devel
+%files openmpi
 %defattr(-,root,root,-)
-%{_libdir}/libgmx_debug.so
-%{_libdir}/libgmx_d_debug.so
-%{_libdir}/libgmxana_debug.so
-%{_libdir}/libgmxana_d_debug.so
-%{_libdir}/libmd_debug.so
-%{_libdir}/libmd_d_debug.so
-
-%files mpi-devel
-%defattr(-,root,root,-)
-%{_libdir}/libgmx_mpi.so
-%{_libdir}/libgmx_mpi_d.so
-%{_libdir}/libmd_mpi.so
-%{_libdir}/libmd_mpi_d.so
-%{_datadir}/%{name}/template/Makefile.mpi.*
-
-%files debug-mpi-devel
-%defattr(-,root,root,-)
-%{_libdir}/libgmx_mpi_debug.so
-%{_libdir}/libgmx_mpi_d_debug.so
-%{_libdir}/libmd_mpi_debug.so
-%{_libdir}/libmd_mpi_d_debug.so
+%{_libdir}/openmpi/bin/g_mdrun*
+%{_libdir}/openmpi/lib/lib*.so.*
 
+%files openmpi-devel
+%defattr(-,root,root,-)
+%{_libdir}/openmpi/lib/lib*.so
+
+%files mpich2
+%defattr(-,root,root,-)
+%{_libdir}/mpich2/bin/g_mdrun*
+%{_libdir}/mpich2/lib/lib*.so.*
+
+%files mpich2-devel
+%defattr(-,root,root,-)
+%{_libdir}/mpich2/lib/lib*.so
 
 %files zsh
 %defattr(-,root,root,-)
@@ -750,7 +505,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/bash_completion.d/gromacs
 
-
 %files csh
 %defattr(-,root,root,-)
 %doc completion.csh
@@ -758,10 +512,30 @@ rm -rf %{buildroot}
 
 %files tutor
 %defattr(-,root,root,-)
-%{_datadir}/%{name}/tutor
+%{_datadir}/%{name}/tutor/
 
 
 %changelog
+* Sun Dec 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.7-1
+- Update to 4.0.7.
+
+* Sun Dec 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.6-1
+- Update to 4.0.6.
+
+* Fri Dec 04 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-6
+- Fix file conflict.
+
+* Tue Dec 01 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-5
+- Put correct MPI devel package requires in place.
+
+* Tue Dec 01 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-4
+- Fix obsoletes.
+
+* Mon Nov 30 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-3
+- Combine libs with binaries and drop debug packages to avoid explosion of
+  number of packages.
+- Adopt use of MPI guidelines.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 May 2009 09:30:08 -0000	1.9
+++ sources	6 Dec 2009 22:35:38 -0000	1.10
@@ -1,2 +1,2 @@
+51369bd553e6bba4085a58bcf23d337d  gromacs-4.0.7.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
-2db2261852a4d3a97547979f379dee94  gromacs-4.0.5.tar.gz



From than at fedoraproject.org  Sun Dec  6 22:36:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  6 Dec 2009 22:36:03 +0000 (UTC)
Subject: rpms/arts/devel arts.spec,1.97,1.98
Message-ID: <20091206223603.7673111C00E0@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17657

Modified Files:
	arts.spec 
Log Message:
fix url



Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/devel/arts.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- arts.spec	1 Sep 2009 22:08:02 -0000	1.97
+++ arts.spec	6 Dec 2009 22:36:03 -0000	1.98
@@ -11,12 +11,12 @@ Summary: aRts (analog realtime synthesiz
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/%{name}-%{version}.tar.bz2
 Source1: gslconfig-wrapper.h
 
 Patch1: arts-1.1.4-debug.patch
@@ -185,6 +185,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
+- fix url
+
 * Wed Sep 02 2009 Than Ngo <than at redhat.com> - 1.5.10-8
 - drop support fedora < 10
 



From maxamillion at fedoraproject.org  Sun Dec  6 22:36:26 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Sun,  6 Dec 2009 22:36:26 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.10,1.11
Message-ID: <20091206223626.9A88411C00E0@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17809

Modified Files:
	gnome-shell.spec 
Log Message:
Updated to git snapshot created on 20091206




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gnome-shell.spec	8 Oct 2009 01:47:06 -0000	1.10
+++ gnome-shell.spec	6 Dec 2009 22:36:26 -0000	1.11
@@ -1,12 +1,19 @@
+%define         alphatag    20091206git
+
 Name:           gnome-shell
-Version:        2.28.0
-Release:        4
+Version:        2.28.0.%{alphatag}
+Release:        1
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://live.gnome.org/GnomeShell
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.27/%{name}-%{version}.tar.bz2
+#Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.27/%{name}-%{version}.tar.bz2
+# git clone git://git.gnome.org/gnome-shell
+# rm -fr gnome-shell/.git/
+# tar -cvzf gnome-shell.tar.gz gnome-shell
+Source0:        %{name}.tar.gz
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %define clutter_version 1.0.0
@@ -118,6 +125,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Sun Dec 06 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-1
+- Update to git snapshot on 20091206
+
 * Wed Oct  7 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-2
 - Update to 2.28.0
 



From maxamillion at fedoraproject.org  Sun Dec  6 22:38:38 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Sun,  6 Dec 2009 22:38:38 +0000 (UTC)
Subject: File gnome-shell.tar.gz uploaded to lookaside cache by maxamillion
Message-ID: <20091206223838.9949310F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-shell:

f7076bc4516486100e419bc90f4565f6  gnome-shell.tar.gz



From spot at fedoraproject.org  Sun Dec  6 22:43:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  6 Dec 2009 22:43:49 +0000 (UTC)
Subject: rpms/Maelstrom/F-11 Maelstrom-3.0.6-DESTDIR.patch, NONE,
	1.1 Maelstrom-Content-License.txt, NONE, 1.1 Maelstrom.spec,
	1.21, 1.22
Message-ID: <20091206224350.0621F11C00E0@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/Maelstrom/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19865/F-11

Modified Files:
	Maelstrom.spec 
Added Files:
	Maelstrom-3.0.6-DESTDIR.patch Maelstrom-Content-License.txt 
Log Message:
revive dead package

Maelstrom-3.0.6-DESTDIR.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Maelstrom-3.0.6-DESTDIR.patch ---
diff -up Maelstrom-3.0.6/Makefile.am.BAD Maelstrom-3.0.6/Makefile.am
--- Maelstrom-3.0.6/Makefile.am.BAD	2009-12-06 17:37:05.042119272 -0500
+++ Maelstrom-3.0.6/Makefile.am	2009-12-06 17:37:39.040120370 -0500
@@ -65,7 +65,7 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs
 
 # Special install rule for the game
 install:
-	make install_gamedata target=@GAME_INSTALLDIR@
+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
 
 install_gamedata:
 	sh mkinstalldirs $(target)/
diff -up Maelstrom-3.0.6/Makefile.in.BAD Maelstrom-3.0.6/Makefile.in
--- Maelstrom-3.0.6/Makefile.in.BAD	2009-12-06 17:37:58.555119622 -0500
+++ Maelstrom-3.0.6/Makefile.in	2009-12-06 17:38:04.208119720 -0500
@@ -431,7 +431,7 @@ maintainer-clean-generic clean mostlycle
 
 # Special install rule for the game
 install:
-	make install_gamedata target=@GAME_INSTALLDIR@
+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
 
 install_gamedata:
 	sh mkinstalldirs $(target)/


--- NEW FILE Maelstrom-Content-License.txt ---
*****
On Tuesday, November 17, 2009, the copyright holders for the artwork and 
animations in Maelstrom (Mark Lewis, Ian Gilman, and Andrew Welch) all 
agreed to relicense their contributions under the terms of the Creative Commons
Attribution 3.0 License (unported).

http://creativecommons.org/licenses/by/3.0/legalcode

Their permissions are recorded below, as plaintext copies of email sent to 
Tom Callaway.

*****

Subject: Fwd: My permissions:
From: Mark Lewis <markwlewis at cox.net>
Date: Tue, 17 Nov 2009 14:12:07 -0800
To: Tom spot Callaway <tcallawa at redhat.com>

From: Mark Lewis <markwlewis at cox.net>
Date: November 17, 2009 2:08:57 PM PST
To: Andrew_Welch <andrew at AmbrosiaSW.com>
Subject: My permissions:

I explicitly give permission for the artwork created by me within =
Maelstrom to be used under the terms of the Creative Commons Attribution =
3.0 license (unported):

Signed:

Mark W. Lewis
5 Harveston
Mission Viejo, CA 92692
markwlewis at cox.net

From: Ian Gilman <ian at iangilman.com>
Subject: Re: License on art/sounds for Maelstrom
Date: Tue, 17 Nov 2009 21:15:55 -0800
To: andrew welch <andrew at AmbrosiaSW.com>,
        Tom spot Callaway <tcallawa at redhat.com>,
        Mark Lewis <markwlewis at cox.net>, slouken at gmail.com

I explicitly give permission for the artwork and animations in Maelstrom =
to be used under the terms of the Creative Commons Attribution 3.0 =
license (unported):

http://creativecommons.org/licenses/by/3.0/legalcode

-- Ian Gilman
-- digital renaissance man
-- www.iangilman.com=

Cc: Mark Lewis <markwlewis at cox.net>, slouken at gmail.com,
        Ian Gilman <ian at iangilman.com>
From: Andrew Welch <andrew at AmbrosiaSW.com>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Subject: Re: License on art/sounds for Maelstrom
Date: Tue, 17 Nov 2009 15:59:37 -0500

I explicitly give permission for the artwork and sounds in Maelstrom
to be used under the terms of the Creative Commons Attribution 3.0
license (unported):

http://creativecommons.org/licenses/by/3.0/legalcode

Andrew Welch / el Presidente / Ambrosia Software, Inc. -- http://www.AmbrosiaSW.com/



Index: Maelstrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Maelstrom/F-11/Maelstrom.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- Maelstrom.spec	23 Feb 2009 21:59:17 -0000	1.21
+++ Maelstrom.spec	6 Dec 2009 22:43:49 -0000	1.22
@@ -1,67 +1,66 @@
-Summary: Space combat game
-Name: Maelstrom
-Version: 3.0.6
-Release: 17
-License: GPLv2+
-Group: Amusements/Games
-Source0: http://www.devolution.com/~slouken/Maelstrom/src/Maelstrom-%{version}.tar.gz
-Source1: maelstrom.png
-Source2: Maelstrom.desktop
-Patch0: Maelstrom-3.0.6-setgid.patch
-Patch1: Maelstrom-3.0.6-gcc34.patch
-Patch2: Maelstrom-3.0.6-64bit.patch
-Patch3: Maelstrom-3.0.6-install.patch
-Patch4: Maelstrom-open.patch
-URL:       http://www.devolution.com/~slouken/Maelstrom/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL_net-devel, desktop-file-utils, libtool
-Requires(post): coreutils
-Requires(postun): coreutils
+Name:			Maelstrom
+Summary:		A space combat game
+Version:		3.0.6
+Release:		19%{?dist}
+# See Maelstrom-Content-License.txt for details on the updated content licensing
+License:		GPLv2+ and CC-BY
+Group:			Amusements/Games
+Source0:		http://www.devolution.com/~slouken/Maelstrom/src/Maelstrom-%{version}.tar.gz
+Source1:		maelstrom.png
+Source2:		Maelstrom.desktop
+Source3:		Maelstrom-Content-License.txt
+Patch0:			Maelstrom-3.0.6-setgid.patch
+Patch1:			Maelstrom-3.0.6-gcc34.patch
+Patch2:			Maelstrom-3.0.6-64bit.patch
+Patch3:			Maelstrom-3.0.6-install.patch
+Patch4:			Maelstrom-open.patch
+Patch5:			Maelstrom-3.0.6-DESTDIR.patch
+URL:			http://www.devolution.com/~slouken/Maelstrom/
+BuildRequires:		SDL_net-devel, desktop-file-utils, libtool
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description
-Maelstrom is a space combat game, originally ported from the Macintosh
-platform. Brave pilots get to dodge asteroids and fight off other
-ships at the same time.
+Maelstrom is a space combat game, originally ported from the Macintosh 
+platform. Brave pilots get to dodge asteroids and fight off other ships 
+at the same time.
 
 %prep
-
 %setup -q
 %patch0 -p1 -b .setgid
 %patch1 -p1 -b .gcc34
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .install
 %patch4 -p1 -b .open
+%patch5 -p1 -b .destdir
+cp %{SOURCE3} .
 
 %build
-cp /usr/share/libtool/config/config.{sub,guess} .
+cp %{_datadir}/libtool/config/config.{sub,guess} .
 %configure
-
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+make DESTDIR=%{buildroot} install
 
+mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora --dir \
-	$RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora %{SOURCE2}
+	%{buildroot}%{_datadir}/applications \
+	%{SOURCE2}
 
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav}
-
-mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+rm -f %{buildroot}%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav}
 
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
-mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/games
-mv $RPM_BUILD_ROOT%{_datadir}/Maelstrom/*Scores $RPM_BUILD_ROOT%{_localstatedir}/lib/games
+mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/games
+mv %{buildroot}%{_datadir}/Maelstrom/*Scores %{buildroot}%{_localstatedir}/lib/games
 
-find $RPM_BUILD_ROOT -name "Makefile*" -exec rm -f {} \;
+find %{buildroot} -name "Makefile*" -exec rm -f {} \;
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -74,11 +73,12 @@ touch --no-create /usr/share/icons/hicol
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q /usr/share/icons/hicolor
 fi
-  
+
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING* CREDITS README* Changelog Docs
+%doc Maelstrom-Content-License.txt
 %attr(2755,root,games) %{_bindir}/Maelstrom
 %{_datadir}/Maelstrom
 %{_datadir}/applications/*
@@ -86,6 +86,12 @@ fi
 %config(noreplace) %attr(0664,root,games) %{_localstatedir}/lib/games/Maelstrom-Scores
 
 %changelog
+* Sun Dec  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.6-19
+- Revived and cleaned up, license issues resolved
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -129,7 +135,7 @@ fi
 - make some files again owned by root
 
 * Tue Mar 23 2004 Bill Nottingham <notting at redhat.com> 3.0.6-3
-- make score file %config (#108386)
+- make score file %%config (#108386)
 - move icon (#111583)
 
 * Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
@@ -231,7 +237,7 @@ fi
 - changed to valid group
 
 * Wed Dec  8 1999 Bill Nottingham <notting at redhat.com>
-- don't echo in %pre/%post, don't add desktop entries to $HOME
+- don't echo in %%pre/%%post, don't add desktop entries to $HOME
 
 * Tue Sep 21 1999 Sam Lantinga <slouken at devolution.com>
 



From spot at fedoraproject.org  Sun Dec  6 22:43:50 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  6 Dec 2009 22:43:50 +0000 (UTC)
Subject: rpms/Maelstrom/F-12 Maelstrom-3.0.6-DESTDIR.patch, NONE,
	1.1 Maelstrom-Content-License.txt, NONE, 1.1 Maelstrom.spec,
	1.22, 1.23
Message-ID: <20091206224350.2071311C0265@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/Maelstrom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19865/F-12

Modified Files:
	Maelstrom.spec 
Added Files:
	Maelstrom-3.0.6-DESTDIR.patch Maelstrom-Content-License.txt 
Log Message:
revive dead package

Maelstrom-3.0.6-DESTDIR.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Maelstrom-3.0.6-DESTDIR.patch ---
diff -up Maelstrom-3.0.6/Makefile.am.BAD Maelstrom-3.0.6/Makefile.am
--- Maelstrom-3.0.6/Makefile.am.BAD	2009-12-06 17:37:05.042119272 -0500
+++ Maelstrom-3.0.6/Makefile.am	2009-12-06 17:37:39.040120370 -0500
@@ -65,7 +65,7 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs
 
 # Special install rule for the game
 install:
-	make install_gamedata target=@GAME_INSTALLDIR@
+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
 
 install_gamedata:
 	sh mkinstalldirs $(target)/
diff -up Maelstrom-3.0.6/Makefile.in.BAD Maelstrom-3.0.6/Makefile.in
--- Maelstrom-3.0.6/Makefile.in.BAD	2009-12-06 17:37:58.555119622 -0500
+++ Maelstrom-3.0.6/Makefile.in	2009-12-06 17:38:04.208119720 -0500
@@ -431,7 +431,7 @@ maintainer-clean-generic clean mostlycle
 
 # Special install rule for the game
 install:
-	make install_gamedata target=@GAME_INSTALLDIR@
+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
 
 install_gamedata:
 	sh mkinstalldirs $(target)/


--- NEW FILE Maelstrom-Content-License.txt ---
*****
On Tuesday, November 17, 2009, the copyright holders for the artwork and 
animations in Maelstrom (Mark Lewis, Ian Gilman, and Andrew Welch) all 
agreed to relicense their contributions under the terms of the Creative Commons
Attribution 3.0 License (unported).

http://creativecommons.org/licenses/by/3.0/legalcode

Their permissions are recorded below, as plaintext copies of email sent to 
Tom Callaway.

*****

Subject: Fwd: My permissions:
From: Mark Lewis <markwlewis at cox.net>
Date: Tue, 17 Nov 2009 14:12:07 -0800
To: Tom spot Callaway <tcallawa at redhat.com>

From: Mark Lewis <markwlewis at cox.net>
Date: November 17, 2009 2:08:57 PM PST
To: Andrew_Welch <andrew at AmbrosiaSW.com>
Subject: My permissions:

I explicitly give permission for the artwork created by me within =
Maelstrom to be used under the terms of the Creative Commons Attribution =
3.0 license (unported):

Signed:

Mark W. Lewis
5 Harveston
Mission Viejo, CA 92692
markwlewis at cox.net

From: Ian Gilman <ian at iangilman.com>
Subject: Re: License on art/sounds for Maelstrom
Date: Tue, 17 Nov 2009 21:15:55 -0800
To: andrew welch <andrew at AmbrosiaSW.com>,
        Tom spot Callaway <tcallawa at redhat.com>,
        Mark Lewis <markwlewis at cox.net>, slouken at gmail.com

I explicitly give permission for the artwork and animations in Maelstrom =
to be used under the terms of the Creative Commons Attribution 3.0 =
license (unported):

http://creativecommons.org/licenses/by/3.0/legalcode

-- Ian Gilman
-- digital renaissance man
-- www.iangilman.com=

Cc: Mark Lewis <markwlewis at cox.net>, slouken at gmail.com,
        Ian Gilman <ian at iangilman.com>
From: Andrew Welch <andrew at AmbrosiaSW.com>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Subject: Re: License on art/sounds for Maelstrom
Date: Tue, 17 Nov 2009 15:59:37 -0500

I explicitly give permission for the artwork and sounds in Maelstrom
to be used under the terms of the Creative Commons Attribution 3.0
license (unported):

http://creativecommons.org/licenses/by/3.0/legalcode

Andrew Welch / el Presidente / Ambrosia Software, Inc. -- http://www.AmbrosiaSW.com/



Index: Maelstrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Maelstrom/F-12/Maelstrom.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- Maelstrom.spec	24 Jul 2009 15:37:19 -0000	1.22
+++ Maelstrom.spec	6 Dec 2009 22:43:49 -0000	1.23
@@ -1,67 +1,66 @@
-Summary: Space combat game
-Name: Maelstrom
-Version: 3.0.6
-Release: 18
-License: GPLv2+
-Group: Amusements/Games
-Source0: http://www.devolution.com/~slouken/Maelstrom/src/Maelstrom-%{version}.tar.gz
-Source1: maelstrom.png
-Source2: Maelstrom.desktop
-Patch0: Maelstrom-3.0.6-setgid.patch
-Patch1: Maelstrom-3.0.6-gcc34.patch
-Patch2: Maelstrom-3.0.6-64bit.patch
-Patch3: Maelstrom-3.0.6-install.patch
-Patch4: Maelstrom-open.patch
-URL:       http://www.devolution.com/~slouken/Maelstrom/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL_net-devel, desktop-file-utils, libtool
-Requires(post): coreutils
-Requires(postun): coreutils
+Name:			Maelstrom
+Summary:		A space combat game
+Version:		3.0.6
+Release:		19%{?dist}
+# See Maelstrom-Content-License.txt for details on the updated content licensing
+License:		GPLv2+ and CC-BY
+Group:			Amusements/Games
+Source0:		http://www.devolution.com/~slouken/Maelstrom/src/Maelstrom-%{version}.tar.gz
+Source1:		maelstrom.png
+Source2:		Maelstrom.desktop
+Source3:		Maelstrom-Content-License.txt
+Patch0:			Maelstrom-3.0.6-setgid.patch
+Patch1:			Maelstrom-3.0.6-gcc34.patch
+Patch2:			Maelstrom-3.0.6-64bit.patch
+Patch3:			Maelstrom-3.0.6-install.patch
+Patch4:			Maelstrom-open.patch
+Patch5:			Maelstrom-3.0.6-DESTDIR.patch
+URL:			http://www.devolution.com/~slouken/Maelstrom/
+BuildRequires:		SDL_net-devel, desktop-file-utils, libtool
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description
-Maelstrom is a space combat game, originally ported from the Macintosh
-platform. Brave pilots get to dodge asteroids and fight off other
-ships at the same time.
+Maelstrom is a space combat game, originally ported from the Macintosh 
+platform. Brave pilots get to dodge asteroids and fight off other ships 
+at the same time.
 
 %prep
-
 %setup -q
 %patch0 -p1 -b .setgid
 %patch1 -p1 -b .gcc34
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .install
 %patch4 -p1 -b .open
+%patch5 -p1 -b .destdir
+cp %{SOURCE3} .
 
 %build
-cp /usr/share/libtool/config/config.{sub,guess} .
+cp %{_datadir}/libtool/config/config.{sub,guess} .
 %configure
-
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+make DESTDIR=%{buildroot} install
 
+mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora --dir \
-	$RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora %{SOURCE2}
+	%{buildroot}%{_datadir}/applications \
+	%{SOURCE2}
 
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav}
-
-mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+rm -f %{buildroot}%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav}
 
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
-mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/games
-mv $RPM_BUILD_ROOT%{_datadir}/Maelstrom/*Scores $RPM_BUILD_ROOT%{_localstatedir}/lib/games
+mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/games
+mv %{buildroot}%{_datadir}/Maelstrom/*Scores %{buildroot}%{_localstatedir}/lib/games
 
-find $RPM_BUILD_ROOT -name "Makefile*" -exec rm -f {} \;
+find %{buildroot} -name "Makefile*" -exec rm -f {} \;
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -74,11 +73,12 @@ touch --no-create /usr/share/icons/hicol
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q /usr/share/icons/hicolor
 fi
-  
+
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING* CREDITS README* Changelog Docs
+%doc Maelstrom-Content-License.txt
 %attr(2755,root,games) %{_bindir}/Maelstrom
 %{_datadir}/Maelstrom
 %{_datadir}/applications/*
@@ -86,6 +86,9 @@ fi
 %config(noreplace) %attr(0664,root,games) %{_localstatedir}/lib/games/Maelstrom-Scores
 
 %changelog
+* Sun Dec  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.6-19
+- Revived and cleaned up, license issues resolved
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -132,7 +135,7 @@ fi
 - make some files again owned by root
 
 * Tue Mar 23 2004 Bill Nottingham <notting at redhat.com> 3.0.6-3
-- make score file %config (#108386)
+- make score file %%config (#108386)
 - move icon (#111583)
 
 * Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
@@ -234,7 +237,7 @@ fi
 - changed to valid group
 
 * Wed Dec  8 1999 Bill Nottingham <notting at redhat.com>
-- don't echo in %pre/%post, don't add desktop entries to $HOME
+- don't echo in %%pre/%%post, don't add desktop entries to $HOME
 
 * Tue Sep 21 1999 Sam Lantinga <slouken at devolution.com>
 



From spot at fedoraproject.org  Sun Dec  6 22:43:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun,  6 Dec 2009 22:43:51 +0000 (UTC)
Subject: rpms/Maelstrom/devel Maelstrom-3.0.6-64bit.patch, 1.3,
	1.4 Maelstrom-3.0.6-DESTDIR.patch, NONE,
	1.1 Maelstrom-3.0.6-gcc34.patch, 1.2,
	1.3 Maelstrom-3.0.6-install.patch, 1.2,
	1.3 Maelstrom-3.0.6-setgid.patch, 1.4,
	1.5 Maelstrom-Content-License.txt, NONE,
	1.1 Maelstrom-open.patch, 1.2, 1.3 Maelstrom.desktop, 1.2,
	1.3 Maelstrom.spec, 1.23, 1.24 Makefile, 1.2, 1.3 maelstrom.png,
	1.2, 1.3 sources, 1.4, 1.5 dead.package, 1.1, NONE
Message-ID: <20091206224351.6319511C00E0@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/Maelstrom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19865/devel

Added Files:
	Maelstrom-3.0.6-64bit.patch Maelstrom-3.0.6-DESTDIR.patch 
	Maelstrom-3.0.6-gcc34.patch Maelstrom-3.0.6-install.patch 
	Maelstrom-3.0.6-setgid.patch Maelstrom-Content-License.txt 
	Maelstrom-open.patch Maelstrom.desktop Maelstrom.spec Makefile 
	maelstrom.png sources 
Removed Files:
	dead.package 
Log Message:
revive dead package

Maelstrom-3.0.6-64bit.patch:
 SDL_FrameBuf.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: Maelstrom-3.0.6-64bit.patch
===================================================================
RCS file: Maelstrom-3.0.6-64bit.patch
diff -N Maelstrom-3.0.6-64bit.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Maelstrom-3.0.6-64bit.patch	6 Dec 2009 22:43:50 -0000	1.4
@@ -0,0 +1,13 @@
+--- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp.ook	2006-02-14 01:50:13.000000000 -0500
++++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp	2006-02-14 01:50:58.000000000 -0500
+@@ -848,8 +848,8 @@
+ 			for ( i=0; i<dirtymaplen; ++i ) {
+ 				if ( dirtymap[i] != NULL ) {
+ 					dirtymap[i] = (SDL_Rect *)(
+-					((int)dirtymap[i]-(int)updatelist) +
+-								(int)newlist
++					((long)dirtymap[i]-(long)updatelist) +
++								(long)newlist
+ 					);
+ 				}
+ 			}

Maelstrom-3.0.6-DESTDIR.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Maelstrom-3.0.6-DESTDIR.patch ---
diff -up Maelstrom-3.0.6/Makefile.am.BAD Maelstrom-3.0.6/Makefile.am
--- Maelstrom-3.0.6/Makefile.am.BAD	2009-12-06 17:37:05.042119272 -0500
+++ Maelstrom-3.0.6/Makefile.am	2009-12-06 17:37:39.040120370 -0500
@@ -65,7 +65,7 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs
 
 # Special install rule for the game
 install:
-	make install_gamedata target=@GAME_INSTALLDIR@
+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
 
 install_gamedata:
 	sh mkinstalldirs $(target)/
diff -up Maelstrom-3.0.6/Makefile.in.BAD Maelstrom-3.0.6/Makefile.in
--- Maelstrom-3.0.6/Makefile.in.BAD	2009-12-06 17:37:58.555119622 -0500
+++ Maelstrom-3.0.6/Makefile.in	2009-12-06 17:38:04.208119720 -0500
@@ -431,7 +431,7 @@ maintainer-clean-generic clean mostlycle
 
 # Special install rule for the game
 install:
-	make install_gamedata target=@GAME_INSTALLDIR@
+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
 
 install_gamedata:
 	sh mkinstalldirs $(target)/

Maelstrom-3.0.6-gcc34.patch:
 buttonlist.h |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Index: Maelstrom-3.0.6-gcc34.patch
===================================================================
RCS file: Maelstrom-3.0.6-gcc34.patch
diff -N Maelstrom-3.0.6-gcc34.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Maelstrom-3.0.6-gcc34.patch	6 Dec 2009 22:43:50 -0000	1.3
@@ -0,0 +1,56 @@
+--- Maelstrom-3.0.6/buttonlist.h.sopwith	2004-06-18 15:33:49.000000000 -0400
++++ Maelstrom-3.0.6/buttonlist.h	2004-06-18 15:47:39.000000000 -0400
+@@ -7,6 +7,13 @@
+ class ButtonList {
+ 
+ public:
++	typedef struct _button {
++		/* Sensitive area */
++		Uint16 x1, y1;
++		Uint16 x2, y2;
++		void (*callback)(void);
++		struct _button *next;
++	} button;
+ 	ButtonList() {
+ 		button_list.next = NULL;
+ 	}
+@@ -16,7 +23,7 @@
+ 
+ 	void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, 
+ 						void (*callback)(void)) {
+-		struct button *belem;
++		button *belem;
+ 		
+ 		for ( belem=&button_list; belem->next; belem=belem->next );
+ 		belem->next = new button;
+@@ -30,7 +37,7 @@
+ 	}
+ 
+ 	void Activate_Button(Uint16 x, Uint16 y) {
+-		struct button *belem;
++		button *belem;
+ 
+ 		for ( belem=button_list.next; belem; belem=belem->next ) {
+ 			if ( (x >= belem->x1) && (x <= belem->x2) &&
+@@ -42,7 +49,7 @@
+ 	}
+ 
+ 	void Delete_Buttons(void) {
+-		struct button *belem, *btemp;
++		button *belem, *btemp;
+ 
+ 		for ( belem=button_list.next; belem; ) {
+ 			btemp = belem;
+@@ -53,12 +60,5 @@
+ 	}
+ 	
+ private:
+-	typedef struct button {
+-		/* Sensitive area */
+-		Uint16 x1, y1;
+-		Uint16 x2, y2;
+-		void (*callback)(void);
+-		struct button *next;
+-	} button;
+ 	button button_list;
+ };

Maelstrom-3.0.6-install.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: Maelstrom-3.0.6-install.patch
===================================================================
RCS file: Maelstrom-3.0.6-install.patch
diff -N Maelstrom-3.0.6-install.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Maelstrom-3.0.6-install.patch	6 Dec 2009 22:43:50 -0000	1.3
@@ -0,0 +1,11 @@
+--- Maelstrom-3.0.6/configure.foo	2006-05-09 00:08:43.000000000 -0400
++++ Maelstrom-3.0.6/configure	2006-05-09 00:09:00.000000000 -0400
+@@ -3232,7 +3232,7 @@
+         GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
+         ;;
+     *)
+-        GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
++        GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
+         ;;
+ esac
+ 

Maelstrom-3.0.6-setgid.patch:
 main.cpp   |    9 ++++++
 scores.cpp |   88 ++++++++++++++++++++++++++++++++++++++-----------------------
 scores.h   |    1 
 3 files changed, 65 insertions(+), 33 deletions(-)

Index: Maelstrom-3.0.6-setgid.patch
===================================================================
RCS file: Maelstrom-3.0.6-setgid.patch
diff -N Maelstrom-3.0.6-setgid.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Maelstrom-3.0.6-setgid.patch	6 Dec 2009 22:43:50 -0000	1.5
@@ -0,0 +1,175 @@
+diff -ru Maelstrom-3.0.6/main.cpp Maelstrom-3.0.6-new/main.cpp
+--- Maelstrom-3.0.6/main.cpp	2002-10-19 22:53:32.000000000 -0400
++++ Maelstrom-3.0.6-new/main.cpp	2006-05-09 01:05:07.000000000 -0400
+@@ -170,12 +170,21 @@
+ 	/* Command line flags */
+ 	int doprinthigh = 0;
+ 	int speedtest = 0;
++	gid_t gid;
++	
+ 	Uint32 video_flags = SDL_SWSURFACE;
+ 
+ 	/* Normal variables */
+ 	SDL_Event event;
+ 	LibPath::SetExePath(argv[0]);
+ 
++	GetScoreFile();
++	gid = getgid();
++	if (setresgid(-1,gid,gid) != 0) {
++		error("Could not drop privleges. -- Exiting.\n");
++		exit(1);
++	}
++	
+ #ifndef __WIN95__
+ 	/* The first thing we do is calculate our checksum */
+ 	(void) checksum();
+diff -ru Maelstrom-3.0.6/scores.cpp Maelstrom-3.0.6-new/scores.cpp
+--- Maelstrom-3.0.6/scores.cpp	2000-09-24 13:55:39.000000000 -0400
++++ Maelstrom-3.0.6-new/scores.cpp	2006-05-09 01:26:19.000000000 -0400
+@@ -4,6 +4,8 @@
+ */
+ 
+ #ifdef unix
++#include <arpa/inet.h>
++#include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
+@@ -15,22 +17,42 @@
+ #include "load.h"
+ #include "dialog.h"
+ 
+-#define MAELSTROM_SCORES	"Maelstrom-Scores"
++#define MAELSTROM_SCORES	"/var/lib/games/Maelstrom-Scores"
+ #define NUM_SCORES		10		// Do not change this!
+ 
+ /* Everyone can write to scores file if defined to 0 */
+-#define SCORES_PERMMASK		0
++#define SCORES_PERMMASK		002
+ 
+ #define CLR_DIALOG_WIDTH	281
+ #define CLR_DIALOG_HEIGHT	111
+ 
+ Bool gNetScores = 0;
+ Scores hScores[NUM_SCORES];
++int gScoreFile = -1;
++
++void GetScoreFile(void)
++{
++#ifdef unix
++	int omask;
++#endif
++	int f;
++	
++#ifdef unix
++	omask=umask(SCORES_PERMMASK);
++#endif
++	f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT);
++	if (f == -1)
++		f = open(MAELSTROM_SCORES,O_RDONLY);
++	if (f == -1)
++		error("Couldn't open score file %s.\n",MAELSTROM_SCORES);
++	gScoreFile = f;
++#ifdef unix
++	umask(omask);
++#endif
++}
+ 
+ void LoadScores(void)
+ {
+-	LibPath path;
+-	SDL_RWops *scores_src;
+ 	int i;
+ 
+ 	/* Try to load network scores, if we can */
+@@ -44,50 +64,50 @@
+ 	}
+ 	memset(&hScores, 0, sizeof(hScores));
+ 
+-	scores_src = SDL_RWFromFile(path.Path(MAELSTROM_SCORES), "rb");
+-	if ( scores_src != NULL ) {
++	if (gScoreFile != -1) {
++		lseek(gScoreFile,0,SEEK_SET);
+ 		for ( i=0; i<NUM_SCORES; ++i ) {
+-			SDL_RWread(scores_src, hScores[i].name,
+-			           sizeof(hScores[i].name), 1);
+-			hScores[i].wave = SDL_ReadBE32(scores_src);
+-			hScores[i].score = SDL_ReadBE32(scores_src);
++			Uint32 tmp;
++		       
++			if (read(gScoreFile,hScores[i].name,sizeof(hScores[i].name)) != sizeof(hScores[i].name))
++				break;
++			if (read(gScoreFile,&tmp,sizeof(Uint32)) != sizeof(Uint32))
++				break;
++			hScores[i].wave = ntohl(tmp);
++			if (read(gScoreFile,&tmp,sizeof(Uint32)) != sizeof(Uint32))
++				break;
++			hScores[i].score = ntohl(tmp);
+ 		}
+-		SDL_RWclose(scores_src);
+ 	}
+ }
+ 
+ void SaveScores(void)
+ {
+-	LibPath path;
+-	SDL_RWops *scores_src;
+ 	int i;
+-#ifdef unix
+-	int omask;
+-#endif
+ 
+ 	/* Don't save network scores */
+ 	if ( gNetScores )
+ 		return;
+-
+-#ifdef unix
+-	omask=umask(SCORES_PERMMASK);
+-#endif
+-	scores_src = SDL_RWFromFile(path.Path(MAELSTROM_SCORES), "wb");
+-	if ( scores_src != NULL ) {
++	
++	if (gScoreFile != -1) {
++		lseek(gScoreFile,0,SEEK_SET);
+ 		for ( i=0; i<NUM_SCORES; ++i ) {
+-			SDL_RWwrite(scores_src, hScores[i].name,
+-			            sizeof(hScores[i].name), 1);
+-			SDL_WriteBE32(scores_src, hScores[i].wave);
+-			SDL_WriteBE32(scores_src, hScores[i].score);
++			Uint32 tmp;
++			
++			if (write(gScoreFile, hScores[i].name, sizeof(hScores[i].name)) != sizeof(hScores[i].name))
++				goto out_err;
++			tmp = htonl(hScores[i].wave);
++			if (write(gScoreFile, &tmp,sizeof(Uint32)) != sizeof(Uint32))
++				goto out_err;
++			tmp = htonl(hScores[i].score);
++			if (write(gScoreFile, &tmp,sizeof(Uint32)) != sizeof(Uint32))
++				goto out_err;
+ 		}
+-		SDL_RWclose(scores_src);
+-	} else {
+-		error("Warning: Couldn't save scores to %s\n",
+-						path.Path(MAELSTROM_SCORES));
++		fsync(gScoreFile);
++		return;
+ 	}
+-#ifdef unix
+-	umask(omask);
+-#endif
++out_err:
++	error("Warning: Couldn't save scores to %s\n", MAELSTROM_SCORES);
+ }
+ 
+ /* Just show the high scores */
+diff -ru Maelstrom-3.0.6/scores.h Maelstrom-3.0.6-new/scores.h
+--- Maelstrom-3.0.6/scores.h	1998-07-13 21:50:17.000000000 -0400
++++ Maelstrom-3.0.6-new/scores.h	2006-05-09 01:05:25.000000000 -0400
+@@ -2,6 +2,7 @@
+ // Functions from scores.cc
+ extern void	LoadScores(void);
+ extern void	SaveScores(void);
++extern void	GetScoreFile(void);
+ extern int	ZapHighScores(void);
+ extern int	GetStartLevel(void);
+ extern void	PrintHighScores(void);


--- NEW FILE Maelstrom-Content-License.txt ---
*****
On Tuesday, November 17, 2009, the copyright holders for the artwork and 
animations in Maelstrom (Mark Lewis, Ian Gilman, and Andrew Welch) all 
agreed to relicense their contributions under the terms of the Creative Commons
Attribution 3.0 License (unported).

http://creativecommons.org/licenses/by/3.0/legalcode

Their permissions are recorded below, as plaintext copies of email sent to 
Tom Callaway.

*****

Subject: Fwd: My permissions:
From: Mark Lewis <markwlewis at cox.net>
Date: Tue, 17 Nov 2009 14:12:07 -0800
To: Tom spot Callaway <tcallawa at redhat.com>

From: Mark Lewis <markwlewis at cox.net>
Date: November 17, 2009 2:08:57 PM PST
To: Andrew_Welch <andrew at AmbrosiaSW.com>
Subject: My permissions:

I explicitly give permission for the artwork created by me within =
Maelstrom to be used under the terms of the Creative Commons Attribution =
3.0 license (unported):

Signed:

Mark W. Lewis
5 Harveston
Mission Viejo, CA 92692
markwlewis at cox.net

From: Ian Gilman <ian at iangilman.com>
Subject: Re: License on art/sounds for Maelstrom
Date: Tue, 17 Nov 2009 21:15:55 -0800
To: andrew welch <andrew at AmbrosiaSW.com>,
        Tom spot Callaway <tcallawa at redhat.com>,
        Mark Lewis <markwlewis at cox.net>, slouken at gmail.com

I explicitly give permission for the artwork and animations in Maelstrom =
to be used under the terms of the Creative Commons Attribution 3.0 =
license (unported):

http://creativecommons.org/licenses/by/3.0/legalcode

-- Ian Gilman
-- digital renaissance man
-- www.iangilman.com=

Cc: Mark Lewis <markwlewis at cox.net>, slouken at gmail.com,
        Ian Gilman <ian at iangilman.com>
From: Andrew Welch <andrew at AmbrosiaSW.com>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Subject: Re: License on art/sounds for Maelstrom
Date: Tue, 17 Nov 2009 15:59:37 -0500

I explicitly give permission for the artwork and sounds in Maelstrom
to be used under the terms of the Creative Commons Attribution 3.0
license (unported):

http://creativecommons.org/licenses/by/3.0/legalcode

Andrew Welch / el Presidente / Ambrosia Software, Inc. -- http://www.AmbrosiaSW.com/


Maelstrom-open.patch:
 scores.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: Maelstrom-open.patch
===================================================================
RCS file: Maelstrom-open.patch
diff -N Maelstrom-open.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Maelstrom-open.patch	6 Dec 2009 22:43:50 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up Maelstrom-3.0.6/scores.cpp.foo Maelstrom-3.0.6/scores.cpp
+--- Maelstrom-3.0.6/scores.cpp.foo	2007-10-10 16:10:17.000000000 -0400
++++ Maelstrom-3.0.6/scores.cpp	2007-10-10 16:11:33.000000000 -0400
+@@ -40,7 +40,7 @@ void GetScoreFile(void)
+ #ifdef unix
+ 	omask=umask(SCORES_PERMMASK);
+ #endif
+-	f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT);
++	f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT,S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP);
+ 	if (f == -1)
+ 		f = open(MAELSTROM_SCORES,O_RDONLY);
+ 	if (f == -1)


Index: Maelstrom.desktop
===================================================================
RCS file: Maelstrom.desktop
diff -N Maelstrom.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Maelstrom.desktop	6 Dec 2009 22:43:50 -0000	1.3
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Maelstrom
+Comment=Space combat game
+Exec=Maelstrom
+Icon=maelstrom.png
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Categories=Application;Game;ArcadeGame;


Index: Maelstrom.spec
===================================================================
RCS file: Maelstrom.spec
diff -N Maelstrom.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Maelstrom.spec	6 Dec 2009 22:43:50 -0000	1.24
@@ -0,0 +1,245 @@
+Name:			Maelstrom
+Summary:		A space combat game
+Version:		3.0.6
+Release:		19%{?dist}
+# See Maelstrom-Content-License.txt for details on the updated content licensing
+License:		GPLv2+ and CC-BY
+Group:			Amusements/Games
+Source0:		http://www.devolution.com/~slouken/Maelstrom/src/Maelstrom-%{version}.tar.gz
+Source1:		maelstrom.png
+Source2:		Maelstrom.desktop
+Source3:		Maelstrom-Content-License.txt
+Patch0:			Maelstrom-3.0.6-setgid.patch
+Patch1:			Maelstrom-3.0.6-gcc34.patch
+Patch2:			Maelstrom-3.0.6-64bit.patch
+Patch3:			Maelstrom-3.0.6-install.patch
+Patch4:			Maelstrom-open.patch
+Patch5:			Maelstrom-3.0.6-DESTDIR.patch
+URL:			http://www.devolution.com/~slouken/Maelstrom/
+BuildRequires:		SDL_net-devel, desktop-file-utils, libtool
+Requires(post):		coreutils
+Requires(postun):	coreutils
+
+%description
+Maelstrom is a space combat game, originally ported from the Macintosh 
+platform. Brave pilots get to dodge asteroids and fight off other ships 
+at the same time.
+
+%prep
+%setup -q
+%patch0 -p1 -b .setgid
+%patch1 -p1 -b .gcc34
+%patch2 -p1 -b .64bit
+%patch3 -p1 -b .install
+%patch4 -p1 -b .open
+%patch5 -p1 -b .destdir
+cp %{SOURCE3} .
+
+%build
+cp %{_datadir}/libtool/config/config.{sub,guess} .
+%configure
+make %{?_smp_mflags}
+
+%install
+make DESTDIR=%{buildroot} install
+
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor fedora --dir \
+	%{buildroot}%{_datadir}/applications \
+	%{SOURCE2}
+
+# remove unpackaged files from the buildroot
+rm -f %{buildroot}%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav}
+
+mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+
+mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/games
+mv %{buildroot}%{_datadir}/Maelstrom/*Scores %{buildroot}%{_localstatedir}/lib/games
+
+find %{buildroot} -name "Makefile*" -exec rm -f {} \;
+
+%clean
+rm -rf %{buildroot}
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create /usr/share/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q /usr/share/icons/hicolor
+fi
+
+
+%files
+%defattr(-, root, root, -)
+%doc COPYING* CREDITS README* Changelog Docs
+%doc Maelstrom-Content-License.txt
+%attr(2755,root,games) %{_bindir}/Maelstrom
+%{_datadir}/Maelstrom
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/48x48/apps/*
+%config(noreplace) %attr(0664,root,games) %{_localstatedir}/lib/games/Maelstrom-Scores
+
+%changelog
+* Sun Dec  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.6-19
+- Revived and cleaned up, license issues resolved
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 11 2008 Bill Nottingham <notting at redhat.com> 3.0.6-16
+- fix requirements for scriptlets (#475922)
+
+* Thu Feb 14 2008 Bill Nottingham <notting at redhat.com> 3.0.6-15
+- rebuild for gcc-4.3
+
+* Wed Oct 10 2007 Bill Nottingham <notting at redhat.com> 3.0.6-14
+- rebuild for buildid
+
+* Fri Aug  3 2007 Bill Nottingham <notting at redhat.com>
+- tweak license tag
+
+* Mon Sep 11 2006 Bill Nottingham <notting at redhat.com> 3.0.6-13
+- fix build
+
+* Fri Jun  2 2006 Bill Nottingham <notting at redhat.com> 3.0.6-12
+- more fixes from review (#189375)
+
+* Tue May  9 2006 Bill Nottingham <notting at redhat.com> 3.0.6-11
+- various fixes from review:
+  - update the icon cache
+  - move out of /usr/games
+  - move scores to /var
+  - rework setuid code
+  - use desktop-file-install
+  
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> 3.0.6-10
+- rebuild
+
+* Thu May 26 2005 Bill Nottingham <notting at redhat.com>
+- fix x86_64 build
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+- Add gcc34.patch
+
+* Sun May 23 2004 Florian La Roche <Florian.LaRoche at redhat.de>
+- make some files again owned by root
+
+* Tue Mar 23 2004 Bill Nottingham <notting at redhat.com> 3.0.6-3
+- make score file %%config (#108386)
+- move icon (#111583)
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Sep 30 2003 Bill Nottingham <notting at redhat.com> 3.0.6-1
+- tweak desktop file (#79668, #105792 <ville.skytta at iki.fi>)
+- update to 3.0.6
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 3.0.5-8
+- fix desktop (#81096)
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 3.0.5-6
+- remove unpackaged files from the buildroot
+
+* Fri Aug 23 2002 Tim Powers <timp at redhat.com>
+- bump release number and rebuild
+
+* Thu Aug 22 2002 Preston Brown <pbrown at redhat.com>
+- set maelstrom to setgid and access high score file safely (#70768)
+- BuildReq on SDL_net-devel (#69105)
+
+* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com>
+- rebuilt with gcc-3.2 (we hope)
+
+* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.5-2
+- build using gcc-3.2-0.1
+
+* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 3.0.5-1
+- update to 3.0.5
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Fri Jan 25 2002 Bill Nottingham <notting at redhat.com>
+- rebuild
+
+* Wed Sep 12 2001 Tim Powers <timp at redhat.com>
+- rebuild with new gcc and binutils
+
+* Tue Jul 10 2001 Elliot Lee <sopwith at redhat.com>
+- Rebuild to remove libXv/libXxf86dga deps
+
+* Mon Jun 25 2001 Bill Nottingham <notting at redhat.com>
+- add buildprereq (#44884)
+
+* Tue Jun 12 2001 Nalin Dahyabhai <nalin at redhat.com>
+- rebuild in new environment
+
+* Mon May  7 2001 Bill Nottingham <notting at redhat.com>
+- fix some prototypes in the network daemon
+- rebuild against fixed SDL (#24119)
+
+* Mon Apr 30 2001 Bill Nottingham <notting at redhat.com>
+- use official tarball, fixes a minor /tmp issue (#38393)
+
+* Fri Apr 27 2001 Bill Nottingham <notting at redhat.com>
+- rebuild for C++ exception handling on ia64
+
+* Mon Mar 12 2001 Bill Nottingham <notting at redhat.com>
+- move desktop file to /etc/X11/applnk (#31492)
+
+* Tue Feb 27 2001 Bill Nottingham <notting at redhat.com>
+- fix Packager: tag
+
+* Fri Dec  1 2000 Bill Nottingham <notting at redhat.com>
+- Maelstrom is cool. Let's put it in the base distro.
+
+* Mon Jul 24 2000 Prospector <prospector at redhat.com>
+- rebuilt
+
+* Mon Jul 10 2000 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Wed Jul 05 2000 Tim Powers <timp at redhat.com>
+- cleaned up spec file, shoudln't try to install files in the post or preun
+  sections
+- use %%configure and %%makeinstall
+- use predefined RPM macros whenever possible
+- don't use redundant defines at top of spec
+- patched to buld with gcc-2.96
+
+* Mon Apr 24 2000 Tim Powers <timp at redhat.com>
+- rebuilt for 7.0
+
+* Tue Feb 08 2000 Tim Powers <timp at redhat.com>
+- strip binaries
+
+* Fri Jan 28 2000 Tim Powers <timp at redhat.com>
+- changed to valid group
+
+* Wed Dec  8 1999 Bill Nottingham <notting at redhat.com>
+- don't echo in %%pre/%%post, don't add desktop entries to $HOME
+
+* Tue Sep 21 1999 Sam Lantinga <slouken at devolution.com>
+
+- first attempt at a spec file
+


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	6 Dec 2009 22:43:50 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: Maelstrom
+# $Id$
+NAME := Maelstrom
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I 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	6 Dec 2009 22:43:51 -0000	1.5
@@ -0,0 +1 @@
+4fbeb6070eebdf161bd156b083b8804e  Maelstrom-3.0.6.tar.gz


--- dead.package DELETED ---



From mclasen at fedoraproject.org  Sun Dec  6 22:49:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  6 Dec 2009 22:49:03 +0000 (UTC)
Subject: rpms/gok/devel gok.spec,1.91,1.92
Message-ID: <20091206224903.16D2311C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20684

Modified Files:
	gok.spec 
Log Message:
try again



Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- gok.spec	5 Dec 2009 05:46:03 -0000	1.91
+++ gok.spec	6 Dec 2009 22:49:02 -0000	1.92
@@ -10,7 +10,6 @@ URL: http://www.gok.ca/
 Source0: http://download.gnome.org/sources/gok/2.29/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: gok-0.10.2-launcher.patch
-#Patch1: lm.patch
 
 Requires(pre):    GConf2
 Requires(post):   GConf2
@@ -63,7 +62,6 @@ applications and plugins for gok.
 %prep
 %setup -q
 %patch0 -p1 -b .launcher
-#%patch1 -p1 -b .lm
 
 %build
 %configure



From rdieter at fedoraproject.org  Sun Dec  6 22:57:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  6 Dec 2009 22:57:03 +0000 (UTC)
Subject: rpms/k3b/F-12 k3b-1.0.5-progress_rate.patch, 1.1, 1.2 k3b.spec, 1.78,
	1.79
Message-ID: <20091206225703.6287311C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22519

Modified Files:
	k3b-1.0.5-progress_rate.patch k3b.spec 
Log Message:
fix/rebase progress_rate patch


k3b-1.0.5-progress_rate.patch:
 k3bvideodvdtitletranscodingjob.cpp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: k3b-1.0.5-progress_rate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/k3b-1.0.5-progress_rate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- k3b-1.0.5-progress_rate.patch	6 Dec 2009 22:22:21 -0000	1.1
+++ k3b-1.0.5-progress_rate.patch	6 Dec 2009 22:57:02 -0000	1.2
@@ -1,6 +1,15 @@
---- branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2007/06/02 15:56:08	670810
-+++ branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009/12/06 22:04:47	1059542
-@@ -206,10 +206,11 @@
+diff -up k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp.progress_rate k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+--- k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp.progress_rate	2008-05-27 03:24:20.000000000 -0500
++++ k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009-12-06 16:56:02.389585008 -0600
+@@ -27,6 +27,7 @@
+ #include <qfile.h>
+ #include <qfileinfo.h>
+ 
++inline const int qMax(const int a, const int b) { if (a < b) return b; return a; }
+ 
+ class K3bVideoDVDTitleTranscodingJob::Private
+ {
+@@ -206,10 +207,11 @@ void K3bVideoDVDTitleTranscodingJob::sta
      *d->process << "--nice" << "19";
  
    // we only need 100 steps, but to make sure we use 150


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/k3b.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- k3b.spec	6 Dec 2009 22:22:21 -0000	1.78
+++ k3b.spec	6 Dec 2009 22:57:02 -0000	1.79
@@ -51,7 +51,7 @@ Patch102: reload-for-verification.diff
 Patch105: k3b-1.0.5-hidden.patch
 # 
 Patch106: k3b-1.0.5-desktopfile.patch
-# http://websvn.kde.org/branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp?r1=670810&r2=1059542&pathrev=1059542&view=patch
+# based on http://websvn.kde.org/branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp?r1=670810&r2=1059542&pathrev=1059542&view=patch
 Patch107: k3b-1.0.5-progress_rate.patch
 
 BuildRequires: %{kdelibs3}-devel
@@ -144,7 +144,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch
 %patch102 -p0 -b .kde#156684
 %patch105 -p1 -b .hidden
 %patch106 -p1 -b .desktopfile
-%patch107 -p5 -b .progress_rate
+%patch107 -p1 -b .progress_rate
 
 
 %build



From kasal at fedoraproject.org  Sun Dec  6 23:09:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:09:10 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.88,1.89
Message-ID: <20091206230910.4BBE511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25489

Modified Files:
	freeradius.spec 
Log Message:
- rebuild against perl 5.10.1


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- freeradius.spec	3 Dec 2009 21:44:54 -0000	1.88
+++ freeradius.spec	6 Dec 2009 23:09:08 -0000	1.89
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -623,6 +623,9 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.1.7-4
+- rebuild against perl 5.10.1
+
 * Thu Dec  3 2009 John Dennis <jdennis at redhat.com> - 2.1.7-3
 - resolves: bug #522111 non-conformant initscript
   also change permission of /var/run/radiusd from 0700 to 0755



From kasal at fedoraproject.org  Sun Dec  6 23:09:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:09:27 +0000 (UTC)
Subject: rpms/gg2/devel gg2.spec,1.14,1.15
Message-ID: <20091206230927.B295D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/gg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25614

Modified Files:
	gg2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: gg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gg2/devel/gg2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gg2.spec	21 Aug 2009 13:29:41 -0000	1.14
+++ gg2.spec	6 Dec 2009 23:09:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name: gg2
 Version: 2.3.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: GNU Gadu 2 - free talking
 Summary(es): GNU Gadu 2 - charlar libremente
 Summary(pl): GNU Gadu 2 - wolne gadanie
@@ -360,6 +360,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gg2_core.pc
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.3.0-14
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.0-13
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Sun Dec  6 23:09:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:09:19 +0000 (UTC)
Subject: rpms/frozen-bubble/devel frozen-bubble.spec,1.16,1.17
Message-ID: <20091206230919.B823911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/frozen-bubble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25552

Modified Files:
	frozen-bubble.spec 
Log Message:
- rebuild against perl 5.10.1


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/devel/frozen-bubble.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- frozen-bubble.spec	1 Dec 2009 11:03:29 -0000	1.16
+++ frozen-bubble.spec	6 Dec 2009 23:09:19 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Frozen Bubble arcade game
 Name: frozen-bubble
 Version: 2.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.frozen-bubble.org/
@@ -161,6 +161,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.2.0-5
+- rebuild against perl 5.10.1
+
 * Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 2.2.0-4
 - Do not remove server user (#542423), per:
   http://fedoraproject.org/wiki/Packaging/UsersAndGroups



From kasal at fedoraproject.org  Sun Dec  6 23:09:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:09:37 +0000 (UTC)
Subject: rpms/git/devel git.spec,1.100,1.101
Message-ID: <20091206230937.CCD9211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25686

Modified Files:
	git.spec 
Log Message:
- rebuild against perl 5.10.1


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- git.spec	27 Nov 2009 03:10:18 -0000	1.100
+++ git.spec	6 Dec 2009 23:09:37 -0000	1.101
@@ -7,7 +7,7 @@
 
 Name:           git
 Version:        1.6.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
@@ -427,6 +427,9 @@ rm -rf %{buildroot}
 # No files for you!
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.6.5.3-2
+- rebuild against perl 5.10.1
+
 * Sat Nov 21 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.3-1
 - git-1.6.5.3
 - Only BR perl(Error) on Fedora and RHEL >= 5



From kasal at fedoraproject.org  Sun Dec  6 23:09:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:09:47 +0000 (UTC)
Subject: rpms/globus-common/devel globus-common.spec,1.8,1.9
Message-ID: <20091206230947.E2CA211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/globus-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25744

Modified Files:
	globus-common.spec 
Log Message:
- rebuild against perl 5.10.1


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/globus-common.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- globus-common.spec	8 Nov 2009 18:52:22 -0000	1.8
+++ globus-common.spec	6 Dec 2009 23:09:47 -0000	1.9
@@ -10,7 +10,7 @@ Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -369,6 +369,9 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 10.2-9
+- rebuild against perl 5.10.1
+
 * Sun Nov 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-8
 - Let globus-makefile-header fail gracefully when GPT is not present
 - Workaround a bug in doxygen



From kasal at fedoraproject.org  Sun Dec  6 23:09:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:09:57 +0000 (UTC)
Subject: rpms/globus-gram-protocol/devel globus-gram-protocol.spec,1.1,1.2
Message-ID: <20091206230957.A7C5F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/globus-gram-protocol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25882

Modified Files:
	globus-gram-protocol.spec 
Log Message:
- rebuild against perl 5.10.1


Index: globus-gram-protocol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/devel/globus-gram-protocol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gram-protocol.spec	11 Oct 2009 06:48:08 -0000	1.1
+++ globus-gram-protocol.spec	6 Dec 2009 23:09:57 -0000	1.2
@@ -9,7 +9,7 @@
 Name:		globus-gram-protocol
 %global _name %(tr - _ <<< %{name})
 Version:	7.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - GRAM Protocol Library
 
 Group:		System Environment/Libraries
@@ -208,5 +208,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 7.4-2
+- rebuild against perl 5.10.1
+
 * Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
 - Autogenerated



From kasal at fedoraproject.org  Sun Dec  6 23:10:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:10:07 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric.spec,1.49,1.50
Message-ID: <20091206231007.EF8AF11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25959

Modified Files:
	gnumeric.spec 
Log Message:
- rebuild against perl 5.10.1


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- gnumeric.spec	2 Dec 2009 05:01:42 -0000	1.49
+++ gnumeric.spec	6 Dec 2009 23:10:07 -0000	1.50
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.9.16
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -189,6 +189,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.9.16-2
+- rebuild against perl 5.10.1
+
 * Mon Nov 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.9.16-1
 - New upstream
 



From kasal at fedoraproject.org  Sun Dec  6 23:10:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:10:19 +0000 (UTC)
Subject: rpms/GraphicsMagick/devel GraphicsMagick.spec,1.31,1.32
Message-ID: <20091206231019.74AC311C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26037

Modified Files:
	GraphicsMagick.spec 
Log Message:
- rebuild against perl 5.10.1


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- GraphicsMagick.spec	6 Nov 2009 14:33:47 -0000	1.31
+++ GraphicsMagick.spec	6 Dec 2009 23:10:19 -0000	1.32
@@ -2,7 +2,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
@@ -242,6 +242,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.3.7-3
+- rebuild against perl 5.10.1
+
 * Fri Nov 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-2
 - cleanup/uncruftify .spec
 



From kasal at fedoraproject.org  Sun Dec  6 23:10:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:10:31 +0000 (UTC)
Subject: rpms/grepmail/devel grepmail.spec,1.12,1.13
Message-ID: <20091206231031.E605311C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/grepmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26161

Modified Files:
	grepmail.spec 
Log Message:
- rebuild against perl 5.10.1


Index: grepmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grepmail/devel/grepmail.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- grepmail.spec	2 Sep 2009 13:46:36 -0000	1.12
+++ grepmail.spec	6 Dec 2009 23:10:31 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Search mailboxes for a particular email
 Name:		grepmail
 Version:	5.3034
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL+
 Group:		Applications/Text
 Url:		http://search.cpan.org/dist/grepmail/
@@ -65,6 +65,9 @@ export TZ=GMT0
 %{_mandir}/man1/grepmail.1*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 5.3034-2
+- rebuild against perl 5.10.1
+
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 5.3034-1
 - Update to 5.3034
   - fix man page year typo (Debian bug #428973)



From kasal at fedoraproject.org  Sun Dec  6 23:10:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:10:41 +0000 (UTC)
Subject: rpms/grid-packaging-tools/devel grid-packaging-tools.spec,1.5,1.6
Message-ID: <20091206231041.8CBCB11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/grid-packaging-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26235

Modified Files:
	grid-packaging-tools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/devel/grid-packaging-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- grid-packaging-tools.spec	9 Aug 2009 08:47:31 -0000	1.5
+++ grid-packaging-tools.spec	6 Dec 2009 23:10:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	20%{?dist}
+Release:	21%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
@@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.2-21
+- rebuild against perl 5.10.1
+
 * Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
 - Rename config.guess script
 



From kasal at fedoraproject.org  Sun Dec  6 23:10:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:10:51 +0000 (UTC)
Subject: rpms/gscan2pdf/devel gscan2pdf.spec,1.31,1.32
Message-ID: <20091206231051.EB96811C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/gscan2pdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26319

Modified Files:
	gscan2pdf.spec 
Log Message:
- rebuild against perl 5.10.1


Index: gscan2pdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gscan2pdf/devel/gscan2pdf.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gscan2pdf.spec	25 Jul 2009 01:32:18 -0000	1.31
+++ gscan2pdf.spec	6 Dec 2009 23:10:51 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           gscan2pdf
 Version:        0.9.27
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GUI for producing a multipage PDF from a scan
 
 Group:          Applications/Publishing
@@ -81,6 +81,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.9.27-6
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.27-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:11:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:11:01 +0000 (UTC)
Subject: rpms/ikiwiki/devel ikiwiki.spec,1.32,1.33
Message-ID: <20091206231101.3D71111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26412

Modified Files:
	ikiwiki.spec 
Log Message:
- rebuild against perl 5.10.1


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ikiwiki.spec	17 Nov 2009 08:38:11 -0000	1.32
+++ ikiwiki.spec	6 Dec 2009 23:11:01 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           ikiwiki
 Version:        3.20091113
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
@@ -144,6 +144,9 @@ meta-wrapper in this package.
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.20091113-2
+- rebuild against perl 5.10.1
+
 * Tue Nov 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.20091113-1
 - Update to 3.20091113.
 



From kasal at fedoraproject.org  Sun Dec  6 23:11:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:11:11 +0000 (UTC)
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.94,1.95
Message-ID: <20091206231111.7362D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/ImageMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26474

Modified Files:
	ImageMagick.spec 
Log Message:
- rebuild against perl 5.10.1


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- ImageMagick.spec	30 Nov 2009 21:35:32 -0000	1.94
+++ ImageMagick.spec	6 Dec 2009 23:11:11 -0000	1.95
@@ -3,7 +3,7 @@
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
@@ -303,6 +303,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 6.5.4.7-5
+- rebuild against perl 5.10.1
+
 * Mon Nov 30 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 6.5.4.7-4
 - Explude file Generic.ttf from -perl subpackage demos. Demos perfectly work without it, but with bundled font
 	package does not pass QA (Unfortunately no bugreport there, only mail from Nicolas Mailhot)



From kasal at fedoraproject.org  Sun Dec  6 23:11:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:11:21 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape.spec,1.94,1.95
Message-ID: <20091206231121.818EA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26534

Modified Files:
	inkscape.spec 
Log Message:
- rebuild against perl 5.10.1


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- inkscape.spec	6 Dec 2009 11:53:07 -0000	1.94
+++ inkscape.spec	6 Dec 2009 23:11:21 -0000	1.95
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.47
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.47-3
+- rebuild against perl 5.10.1
+
 * Sun Dec 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-2
 - Fix Rawhide build.
 



From kasal at fedoraproject.org  Sun Dec  6 23:11:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:11:31 +0000 (UTC)
Subject: rpms/inn/devel inn.spec,1.70,1.71
Message-ID: <20091206231131.8AF3611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26602

Modified Files:
	inn.spec 
Log Message:
- rebuild against perl 5.10.1


Index: inn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inn/devel/inn.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- inn.spec	19 Oct 2009 10:01:48 -0000	1.70
+++ inn.spec	6 Dec 2009 23:11:31 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -547,6 +547,9 @@ exit 0
 %{_mandir}/man1/inews*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.5.1-2
+- rebuild against perl 5.10.1
+
 * Tue Oct 13 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.1-1
 - New upstream release
 



From kasal at fedoraproject.org  Sun Dec  6 23:11:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:11:47 +0000 (UTC)
Subject: rpms/irssi/devel irssi.spec,1.43,1.44
Message-ID: <20091206231147.C743111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/irssi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26713

Modified Files:
	irssi.spec 
Log Message:
- rebuild against perl 5.10.1


Index: irssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- irssi.spec	21 Aug 2009 14:01:21 -0000	1.43
+++ irssi.spec	6 Dec 2009 23:11:47 -0000	1.44
@@ -3,7 +3,7 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.14
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Communications
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.8.14-4
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.14-3
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Sun Dec  6 23:11:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:11:39 +0000 (UTC)
Subject: rpms/innotop/devel innotop.spec,1.7,1.8
Message-ID: <20091206231139.ECBD511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/innotop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26644

Modified Files:
	innotop.spec 
Log Message:
- rebuild against perl 5.10.1


Index: innotop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/innotop/devel/innotop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- innotop.spec	25 Jul 2009 03:25:06 -0000	1.7
+++ innotop.spec	6 Dec 2009 23:11:39 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           innotop
 Version:        1.6.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A MySQL and InnoDB monitor program
 
 Group:          Applications/Databases
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.6.0-5
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:11:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:11:55 +0000 (UTC)
Subject: rpms/JSDoc/devel JSDoc.spec,1.6,1.7
Message-ID: <20091206231155.35D3B11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/JSDoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26838

Modified Files:
	JSDoc.spec 
Log Message:
- rebuild against perl 5.10.1


Index: JSDoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/JSDoc/devel/JSDoc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- JSDoc.spec	24 Jul 2009 15:34:30 -0000	1.6
+++ JSDoc.spec	6 Dec 2009 23:11:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           JSDoc
 Version:        1.10.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Produces javadoc-style documentation from JavaScript sourcefiles
 Group:          Development/Tools
 # No license attribution in code, only COPYING.
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/jsdoc
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.10.2-9
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:12:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:12:12 +0000 (UTC)
Subject: rpms/libapreq2/devel libapreq2.spec,1.48,1.49
Message-ID: <20091206231212.AB04D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/libapreq2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26978

Modified Files:
	libapreq2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- libapreq2.spec	25 Jul 2009 05:18:35 -0000	1.48
+++ libapreq2.spec	6 Dec 2009 23:12:12 -0000	1.49
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.12-3
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:12:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:12:24 +0000 (UTC)
Subject: rpms/libconcord/devel libconcord.spec,1.11,1.12
Message-ID: <20091206231224.617D811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/libconcord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27096

Modified Files:
	libconcord.spec 
Log Message:
- rebuild against perl 5.10.1


Index: libconcord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/devel/libconcord.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libconcord.spec	31 Jul 2009 16:55:33 -0000	1.11
+++ libconcord.spec	6 Dec 2009 23:12:24 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name: libconcord
 Version: 0.21
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Library to talk to Logitech Harmony universal remote controls
 
 Group: Development/Libraries
@@ -173,6 +173,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.21-8
+- rebuild against perl 5.10.1
+
 * Fri Jul 31 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-7
 - updating mime patch with different source:
   http://stuff.onse.fi/concordance-mime2.patch



From kasal at fedoraproject.org  Sun Dec  6 23:12:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:12:35 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.112,1.113
Message-ID: <20091206231235.1E60B11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27221

Modified Files:
	libguestfs.spec 
Log Message:
- rebuild against perl 5.10.1


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- libguestfs.spec	18 Nov 2009 17:28:54 -0000	1.112
+++ libguestfs.spec	6 Dec 2009 23:12:34 -0000	1.113
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.79
-Release:     2%{?dist}
+Release:     3%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -596,6 +596,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.0.79-3
+- rebuild against perl 5.10.1
+
 * Wed Nov 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.79-2
 - New upstream release 1.0.79.
 - Adds FUSE test script and multiple fixes for FUSE (RHBZ#538069).



From pkgdb at fedoraproject.org  Sun Dec  6 23:13:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:13:11 +0000
Subject: [pkgdb] ldapvi (Fedora EPEL, 4) updated by kevin
Message-ID: <20091206231311.DA98510F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for ldapvi
kevin has set commit to Approved for 107427 on ldapvi (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on ldapvi (Fedora EPEL 4)
kevin has set build to Approved for 107427 on ldapvi (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldapvi



From pkgdb at fedoraproject.org  Sun Dec  6 23:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:19:41 +0000
Subject: [pkgdb] genesis was added for musuruan
Message-ID: <20091206231941.A131710F890@bastion2.fedora.phx.redhat.com>

kevin has added Package genesis with summary Graphical frontend to SyncEvolution
kevin has approved Package genesis
kevin has added a Fedora devel branch for genesis with an owner of musuruan
kevin has approved genesis in Fedora devel
kevin has approved Package genesis
kevin has set commit to Approved for 107427 on genesis (Fedora devel)
kevin has set checkout to Approved for 107427 on genesis (Fedora devel)
kevin has set build to Approved for 107427 on genesis (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/genesis



From kevin at fedoraproject.org  Sun Dec  6 23:19:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:19:59 +0000 (UTC)
Subject: rpms/genesis - New directory
Message-ID: <20091206231959.28F9E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/genesis
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX29479/rpms/genesis

Log Message:
Directory /cvs/pkgs/rpms/genesis added to the repository




From pkgdb at fedoraproject.org  Sun Dec  6 23:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:19:43 +0000
Subject: [pkgdb] genesis summary updated by kevin
Message-ID: <20091206231943.687F010F892@bastion2.fedora.phx.redhat.com>

kevin set package genesis summary to Graphical frontend to SyncEvolution

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/genesis



From pkgdb at fedoraproject.org  Sun Dec  6 23:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:19:43 +0000
Subject: [pkgdb] genesis (Fedora, 12) updated by kevin
Message-ID: <20091206231943.749F510F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for genesis
kevin has set commit to Approved for 107427 on genesis (Fedora 12)
kevin has set checkout to Approved for 107427 on genesis (Fedora 12)
kevin has set build to Approved for 107427 on genesis (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/genesis



From kevin at fedoraproject.org  Sun Dec  6 23:19:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:19:59 +0000 (UTC)
Subject: rpms/genesis/devel - New directory
Message-ID: <20091206231959.492EE11C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/genesis/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX29479/rpms/genesis/devel

Log Message:
Directory /cvs/pkgs/rpms/genesis/devel added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:20:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:20:07 +0000 (UTC)
Subject: rpms/genesis Makefile,NONE,1.1
Message-ID: <20091206232007.6390811C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/genesis
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX29479/rpms/genesis

Added Files:
	Makefile 
Log Message:
Setup of module genesis


--- NEW FILE Makefile ---
# Top level Makefile for module genesis
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Dec  6 23:20:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:20:07 +0000 (UTC)
Subject: rpms/genesis/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091206232007.C613311C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/genesis/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX29479/rpms/genesis/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module genesis


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: genesis
# $Id: Makefile,v 1.1 2009/12/06 23:20:07 kevin Exp $
NAME := genesis
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kasal at fedoraproject.org  Sun Dec  6 23:20:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:20:20 +0000 (UTC)
Subject: rpms/perl-Test-Mock-LWP/devel perl-Test-Mock-LWP.spec,1.4,1.5
Message-ID: <20091206232020.61C9211C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Test-Mock-LWP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29806

Modified Files:
	perl-Test-Mock-LWP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Test-Mock-LWP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Mock-LWP/devel/perl-Test-Mock-LWP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Test-Mock-LWP.spec	26 Jul 2009 16:52:36 -0000	1.4
+++ perl-Test-Mock-LWP.spec	6 Dec 2009 23:20:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Test-Mock-LWP
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Easy mocking of LWP packages
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Sun Dec  6 23:20:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:20:46 +0000
Subject: [pkgdb] php-gettext summary updated by kevin
Message-ID: <20091206232046.288B910F891@bastion2.fedora.phx.redhat.com>

kevin set package php-gettext summary to Gettext emulation in php

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-gettext



From pkgdb at fedoraproject.org  Sun Dec  6 23:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:20:44 +0000
Subject: [pkgdb] php-gettext was added for ke4qqq
Message-ID: <20091206232044.CE18810F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package php-gettext with summary Gettext emulation in php
kevin has approved Package php-gettext
kevin has added a Fedora devel branch for php-gettext with an owner of ke4qqq
kevin has approved php-gettext in Fedora devel
kevin has approved Package php-gettext
kevin has set commit to Approved for 107427 on php-gettext (Fedora devel)
kevin has set checkout to Approved for 107427 on php-gettext (Fedora devel)
kevin has set build to Approved for 107427 on php-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-gettext



From pkgdb at fedoraproject.org  Sun Dec  6 23:20:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:20:46 +0000
Subject: [pkgdb] php-gettext (Fedora EPEL, 5) updated by kevin
Message-ID: <20091206232046.2FF4010F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-gettext
kevin has set commit to Approved for 107427 on php-gettext (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-gettext (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-gettext (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-gettext



From pkgdb at fedoraproject.org  Sun Dec  6 23:20:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:20:46 +0000
Subject: [pkgdb] php-gettext (Fedora, 11) updated by kevin
Message-ID: <20091206232046.38F0810F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-gettext
kevin has set commit to Approved for 107427 on php-gettext (Fedora 11)
kevin has set checkout to Approved for 107427 on php-gettext (Fedora 11)
kevin has set build to Approved for 107427 on php-gettext (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-gettext



From kevin at fedoraproject.org  Sun Dec  6 23:20:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:20:54 +0000 (UTC)
Subject: rpms/php-gettext - New directory
Message-ID: <20091206232054.1DDBC11C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-gettext
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30069/rpms/php-gettext

Log Message:
Directory /cvs/pkgs/rpms/php-gettext added to the repository




From pkgdb at fedoraproject.org  Sun Dec  6 23:20:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:20:46 +0000
Subject: [pkgdb] php-gettext (Fedora, 12) updated by kevin
Message-ID: <20091206232046.4CE9D10F8A5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-gettext
kevin has set commit to Approved for 107427 on php-gettext (Fedora 12)
kevin has set checkout to Approved for 107427 on php-gettext (Fedora 12)
kevin has set build to Approved for 107427 on php-gettext (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-gettext



From kevin at fedoraproject.org  Sun Dec  6 23:21:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:21:02 +0000 (UTC)
Subject: rpms/php-gettext Makefile,NONE,1.1
Message-ID: <20091206232102.BD12511C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-gettext
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30069/rpms/php-gettext

Added Files:
	Makefile 
Log Message:
Setup of module php-gettext


--- NEW FILE Makefile ---
# Top level Makefile for module php-gettext
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Dec  6 23:20:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:20:54 +0000 (UTC)
Subject: rpms/php-gettext/devel - New directory
Message-ID: <20091206232054.491D511C04BA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30069/rpms/php-gettext/devel

Log Message:
Directory /cvs/pkgs/rpms/php-gettext/devel added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:21:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:21:03 +0000 (UTC)
Subject: rpms/php-gettext/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091206232103.216E711C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30069/rpms/php-gettext/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-gettext


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-gettext
# $Id: Makefile,v 1.1 2009/12/06 23:21:02 kevin Exp $
NAME := php-gettext
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Dec  6 23:21:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:21:43 +0000
Subject: [pkgdb] pxe-kexec was added for boodle
Message-ID: <20091206232143.5BA5510F8A1@bastion2.fedora.phx.redhat.com>

kevin has added Package pxe-kexec with summary Linux boots Linux via network
kevin has approved Package pxe-kexec
kevin has added a Fedora devel branch for pxe-kexec with an owner of boodle
kevin has approved pxe-kexec in Fedora devel
kevin has approved Package pxe-kexec
kevin has set commit to Approved for 107427 on pxe-kexec (Fedora devel)
kevin has set checkout to Approved for 107427 on pxe-kexec (Fedora devel)
kevin has set build to Approved for 107427 on pxe-kexec (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pxe-kexec



From pkgdb at fedoraproject.org  Sun Dec  6 23:21:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:21:44 +0000
Subject: [pkgdb] pxe-kexec summary updated by kevin
Message-ID: <20091206232145.133D010F8A6@bastion2.fedora.phx.redhat.com>

kevin set package pxe-kexec summary to Linux boots Linux via network

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pxe-kexec



From pkgdb at fedoraproject.org  Sun Dec  6 23:21:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:21:45 +0000
Subject: [pkgdb] pxe-kexec (Fedora EPEL, 5) updated by kevin
Message-ID: <20091206232145.17BB510F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pxe-kexec
kevin has set commit to Approved for 107427 on pxe-kexec (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on pxe-kexec (Fedora EPEL 5)
kevin has set build to Approved for 107427 on pxe-kexec (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pxe-kexec



From pkgdb at fedoraproject.org  Sun Dec  6 23:21:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:21:45 +0000
Subject: [pkgdb] pxe-kexec (Fedora, 11) updated by kevin
Message-ID: <20091206232145.249D010F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pxe-kexec
kevin has set commit to Approved for 107427 on pxe-kexec (Fedora 11)
kevin has set checkout to Approved for 107427 on pxe-kexec (Fedora 11)
kevin has set build to Approved for 107427 on pxe-kexec (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pxe-kexec



From pkgdb at fedoraproject.org  Sun Dec  6 23:21:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:21:45 +0000
Subject: [pkgdb] pxe-kexec (Fedora EPEL, 4) updated by kevin
Message-ID: <20091206232145.3000510F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for pxe-kexec
kevin has set commit to Approved for 107427 on pxe-kexec (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on pxe-kexec (Fedora EPEL 4)
kevin has set build to Approved for 107427 on pxe-kexec (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pxe-kexec



From pkgdb at fedoraproject.org  Sun Dec  6 23:21:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:21:45 +0000
Subject: [pkgdb] pxe-kexec (Fedora, 12) updated by kevin
Message-ID: <20091206232145.3C7A110F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for pxe-kexec
kevin has set commit to Approved for 107427 on pxe-kexec (Fedora 12)
kevin has set checkout to Approved for 107427 on pxe-kexec (Fedora 12)
kevin has set build to Approved for 107427 on pxe-kexec (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pxe-kexec



From kevin at fedoraproject.org  Sun Dec  6 23:22:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:22:06 +0000 (UTC)
Subject: rpms/pxe-kexec - New directory
Message-ID: <20091206232206.23A0211C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pxe-kexec
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb30964/rpms/pxe-kexec

Log Message:
Directory /cvs/pkgs/rpms/pxe-kexec added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:22:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:22:06 +0000 (UTC)
Subject: rpms/pxe-kexec/devel - New directory
Message-ID: <20091206232206.570DA11C03AD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pxe-kexec/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb30964/rpms/pxe-kexec/devel

Log Message:
Directory /cvs/pkgs/rpms/pxe-kexec/devel added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:22:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:22:14 +0000 (UTC)
Subject: rpms/pxe-kexec Makefile,NONE,1.1
Message-ID: <20091206232214.AAC3E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pxe-kexec
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb30964/rpms/pxe-kexec

Added Files:
	Makefile 
Log Message:
Setup of module pxe-kexec


--- NEW FILE Makefile ---
# Top level Makefile for module pxe-kexec
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Dec  6 23:22:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:22:15 +0000 (UTC)
Subject: rpms/pxe-kexec/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091206232215.0535211C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pxe-kexec/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb30964/rpms/pxe-kexec/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pxe-kexec


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pxe-kexec
# $Id: Makefile,v 1.1 2009/12/06 23:22:14 kevin Exp $
NAME := pxe-kexec
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kasal at fedoraproject.org  Sun Dec  6 23:23:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:23:06 +0000 (UTC)
Subject: rpms/perl-Text-SpellChecker/devel perl-Text-SpellChecker.spec, 1.5, 
	1.6
Message-ID: <20091206232306.4E03311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-SpellChecker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31783

Modified Files:
	perl-Text-SpellChecker.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-SpellChecker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-SpellChecker/devel/perl-Text-SpellChecker.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Text-SpellChecker.spec	26 Jul 2009 17:11:31 -0000	1.5
+++ perl-Text-SpellChecker.spec	6 Dec 2009 23:23:06 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	OO interface for spell-checking a block of text 
 Name:		perl-Text-SpellChecker
 Version:	0.05
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Text-SpellChecker/
@@ -45,6 +45,9 @@ left off), and highlighting the current 
 %{_mandir}/man3/Text::SpellChecker.3pm*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:23:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:23:20 +0000 (UTC)
Subject: rpms/perl-Text-Textile/devel perl-Text-Textile.spec,1.4,1.5
Message-ID: <20091206232320.8555311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Text-Textile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31906

Modified Files:
	perl-Text-Textile.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Text-Textile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Textile/devel/perl-Text-Textile.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Text-Textile.spec	22 Aug 2009 07:03:48 -0000	1.4
+++ perl-Text-Textile.spec	6 Dec 2009 23:23:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Text-Textile
 Version:        2.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A humane web text generator
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.12-3
+- rebuild against perl 5.10.1
+
 * Sat Aug 22 2009 Iain Arnell <iarnell at gmail.com> 2.12-2
 - BR perl(Test::Pod)
 



From pkgdb at fedoraproject.org  Sun Dec  6 23:23:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:23:21 +0000
Subject: [pkgdb] f2c was added for carllibpst
Message-ID: <20091206232321.52C9A10F8A1@bastion2.fedora.phx.redhat.com>

kevin has added Package f2c with summary A Fortran 77 to C/C++ conversion program
kevin has approved Package f2c
kevin has added a Fedora devel branch for f2c with an owner of carllibpst
kevin has approved f2c in Fedora devel
kevin has approved Package f2c
kevin has set commit to Approved for 107427 on f2c (Fedora devel)
kevin has set checkout to Approved for 107427 on f2c (Fedora devel)
kevin has set build to Approved for 107427 on f2c (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f2c



From pkgdb at fedoraproject.org  Sun Dec  6 23:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:23:22 +0000
Subject: [pkgdb] f2c summary updated by kevin
Message-ID: <20091206232322.C881C10F8A2@bastion2.fedora.phx.redhat.com>

kevin set package f2c summary to A Fortran 77 to C/C++ conversion program

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f2c



From pkgdb at fedoraproject.org  Sun Dec  6 23:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:23:22 +0000
Subject: [pkgdb] f2c (Fedora, 11) updated by kevin
Message-ID: <20091206232322.D1D0310F8A5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for f2c
kevin has set commit to Approved for 107427 on f2c (Fedora 11)
kevin has set checkout to Approved for 107427 on f2c (Fedora 11)
kevin has set build to Approved for 107427 on f2c (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f2c



From kevin at fedoraproject.org  Sun Dec  6 23:23:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:23:35 +0000 (UTC)
Subject: rpms/f2c - New directory
Message-ID: <20091206232335.20AD011C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/f2c
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32010/rpms/f2c

Log Message:
Directory /cvs/pkgs/rpms/f2c added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:23:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:23:35 +0000 (UTC)
Subject: rpms/f2c/devel - New directory
Message-ID: <20091206232335.4CD4E11C03B8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/f2c/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32010/rpms/f2c/devel

Log Message:
Directory /cvs/pkgs/rpms/f2c/devel added to the repository




From pkgdb at fedoraproject.org  Sun Dec  6 23:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:23:22 +0000
Subject: [pkgdb] f2c (Fedora, 12) updated by kevin
Message-ID: <20091206232322.DE01710F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for f2c
kevin has set commit to Approved for 107427 on f2c (Fedora 12)
kevin has set checkout to Approved for 107427 on f2c (Fedora 12)
kevin has set build to Approved for 107427 on f2c (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f2c



From kevin at fedoraproject.org  Sun Dec  6 23:23:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:23:44 +0000 (UTC)
Subject: rpms/f2c Makefile,NONE,1.1
Message-ID: <20091206232344.60E4011C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/f2c
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32010/rpms/f2c

Added Files:
	Makefile 
Log Message:
Setup of module f2c


--- NEW FILE Makefile ---
# Top level Makefile for module f2c
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Dec  6 23:23:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:23:44 +0000 (UTC)
Subject: rpms/f2c/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091206232344.BCCCB11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/f2c/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32010/rpms/f2c/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module f2c


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: f2c
# $Id: Makefile,v 1.1 2009/12/06 23:23:44 kevin Exp $
NAME := f2c
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Dec  6 23:24:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:24:30 +0000
Subject: [pkgdb] rubygem-ParseTree was added for mkent
Message-ID: <20091206232430.B833310F891@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-ParseTree with summary Extracts the parse tree for a class/method and returns an s-expression
kevin has approved Package rubygem-ParseTree
kevin has added a Fedora devel branch for rubygem-ParseTree with an owner of mkent
kevin has approved rubygem-ParseTree in Fedora devel
kevin has approved Package rubygem-ParseTree
kevin has set commit to Approved for 107427 on rubygem-ParseTree (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-ParseTree (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-ParseTree (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ParseTree



From pkgdb at fedoraproject.org  Sun Dec  6 23:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:24:31 +0000
Subject: [pkgdb] rubygem-ParseTree summary updated by kevin
Message-ID: <20091206232432.1726A10F890@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-ParseTree summary to Extracts the parse tree for a class/method and returns an s-expression

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ParseTree



From pkgdb at fedoraproject.org  Sun Dec  6 23:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:24:31 +0000
Subject: [pkgdb] rubygem-ParseTree (Fedora, 11) updated by kevin
Message-ID: <20091206232432.285CF10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-ParseTree
kevin has set commit to Approved for 107427 on rubygem-ParseTree (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-ParseTree (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-ParseTree (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ParseTree



From kevin at fedoraproject.org  Sun Dec  6 23:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:24:41 +0000 (UTC)
Subject: rpms/rubygem-ParseTree - New directory
Message-ID: <20091206232441.1793511C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ParseTree
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf32643/rpms/rubygem-ParseTree

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ParseTree added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:24:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:24:41 +0000 (UTC)
Subject: rpms/rubygem-ParseTree/devel - New directory
Message-ID: <20091206232441.37C7911C03B8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ParseTree/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf32643/rpms/rubygem-ParseTree/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ParseTree/devel added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:24:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:24:49 +0000 (UTC)
Subject: rpms/rubygem-ParseTree Makefile,NONE,1.1
Message-ID: <20091206232449.4524811C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ParseTree
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf32643/rpms/rubygem-ParseTree

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-ParseTree


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-ParseTree
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Sun Dec  6 23:24:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:24:32 +0000
Subject: [pkgdb] rubygem-ParseTree (Fedora, 12) updated by kevin
Message-ID: <20091206232432.34D8D10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-ParseTree
kevin has set commit to Approved for 107427 on rubygem-ParseTree (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-ParseTree (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-ParseTree (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ParseTree



From kevin at fedoraproject.org  Sun Dec  6 23:24:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:24:49 +0000 (UTC)
Subject: rpms/rubygem-ParseTree/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091206232449.9CFF111C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ParseTree/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf32643/rpms/rubygem-ParseTree/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-ParseTree


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-ParseTree
# $Id: Makefile,v 1.1 2009/12/06 23:24:49 kevin Exp $
NAME := rubygem-ParseTree
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Dec  6 23:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:25:07 +0000
Subject: [pkgdb] rubygem-rcov was added for mkent
Message-ID: <20091206232507.9C90410F88C@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-rcov with summary Code coverage analysis tool for Ruby
kevin has approved Package rubygem-rcov
kevin has added a Fedora devel branch for rubygem-rcov with an owner of mkent
kevin has approved rubygem-rcov in Fedora devel
kevin has approved Package rubygem-rcov
kevin has set commit to Approved for 107427 on rubygem-rcov (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-rcov (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-rcov (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rcov



From pkgdb at fedoraproject.org  Sun Dec  6 23:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:25:09 +0000
Subject: [pkgdb] rubygem-rcov summary updated by kevin
Message-ID: <20091206232509.8F25710F89D@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-rcov summary to Code coverage analysis tool for Ruby

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rcov



From pkgdb at fedoraproject.org  Sun Dec  6 23:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:25:09 +0000
Subject: [pkgdb] rubygem-rcov (Fedora, 12) updated by kevin
Message-ID: <20091206232509.AC5D310F8A5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-rcov
kevin has set commit to Approved for 107427 on rubygem-rcov (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-rcov (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-rcov (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rcov



From pkgdb at fedoraproject.org  Sun Dec  6 23:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:25:09 +0000
Subject: [pkgdb] rubygem-rcov (Fedora, 11) updated by kevin
Message-ID: <20091206232509.9CAAF10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-rcov
kevin has set commit to Approved for 107427 on rubygem-rcov (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-rcov (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-rcov (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-rcov



From kevin at fedoraproject.org  Sun Dec  6 23:25:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:25:18 +0000 (UTC)
Subject: rpms/rubygem-rcov - New directory
Message-ID: <20091206232518.1858C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-rcov
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnWU449/rpms/rubygem-rcov

Log Message:
Directory /cvs/pkgs/rpms/rubygem-rcov added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:25:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:25:18 +0000 (UTC)
Subject: rpms/rubygem-rcov/devel - New directory
Message-ID: <20091206232518.40A5411C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-rcov/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnWU449/rpms/rubygem-rcov/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-rcov/devel added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:25:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:25:26 +0000 (UTC)
Subject: rpms/rubygem-rcov Makefile,NONE,1.1
Message-ID: <20091206232526.E66AF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-rcov
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnWU449/rpms/rubygem-rcov

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-rcov


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-rcov
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Dec  6 23:25:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:25:27 +0000 (UTC)
Subject: rpms/rubygem-rcov/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091206232527.49F3311C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-rcov/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnWU449/rpms/rubygem-rcov/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-rcov


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-rcov
# $Id: Makefile,v 1.1 2009/12/06 23:25:27 kevin Exp $
NAME := rubygem-rcov
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Dec  6 23:26:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:26:02 +0000
Subject: [pkgdb] lamson was added for silas
Message-ID: <20091206232602.B1C9D10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package lamson with summary A Python SMTP server
kevin has approved Package lamson
kevin has added a Fedora devel branch for lamson with an owner of silas
kevin has approved lamson in Fedora devel
kevin has approved Package lamson
kevin has set commit to Approved for 107427 on lamson (Fedora devel)
kevin has set checkout to Approved for 107427 on lamson (Fedora devel)
kevin has set build to Approved for 107427 on lamson (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lamson



From pkgdb at fedoraproject.org  Sun Dec  6 23:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:26:03 +0000
Subject: [pkgdb] lamson summary updated by kevin
Message-ID: <20091206232604.0253910F891@bastion2.fedora.phx.redhat.com>

kevin set package lamson summary to A Python SMTP server

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lamson



From kevin at fedoraproject.org  Sun Dec  6 23:26:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:26:13 +0000 (UTC)
Subject: rpms/lamson - New directory
Message-ID: <20091206232613.14B5811C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lamson
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjuh806/rpms/lamson

Log Message:
Directory /cvs/pkgs/rpms/lamson added to the repository




From pkgdb at fedoraproject.org  Sun Dec  6 23:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:26:03 +0000
Subject: [pkgdb] lamson (Fedora, 12) updated by kevin
Message-ID: <20091206232604.109D710F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for lamson
kevin has set commit to Approved for 107427 on lamson (Fedora 12)
kevin has set checkout to Approved for 107427 on lamson (Fedora 12)
kevin has set build to Approved for 107427 on lamson (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lamson



From kevin at fedoraproject.org  Sun Dec  6 23:26:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:26:13 +0000 (UTC)
Subject: rpms/lamson/devel - New directory
Message-ID: <20091206232613.395A811C03B8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lamson/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjuh806/rpms/lamson/devel

Log Message:
Directory /cvs/pkgs/rpms/lamson/devel added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:26:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:26:21 +0000 (UTC)
Subject: rpms/lamson Makefile,NONE,1.1
Message-ID: <20091206232621.5A9E111C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lamson
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjuh806/rpms/lamson

Added Files:
	Makefile 
Log Message:
Setup of module lamson


--- NEW FILE Makefile ---
# Top level Makefile for module lamson
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Dec  6 23:26:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:26:21 +0000 (UTC)
Subject: rpms/lamson/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091206232621.AB8AF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/lamson/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjuh806/rpms/lamson/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lamson


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lamson
# $Id: Makefile,v 1.1 2009/12/06 23:26:21 kevin Exp $
NAME := lamson
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Dec  6 23:27:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:27:06 +0000
Subject: [pkgdb] unicornscan was added for robert
Message-ID: <20091206232706.7495310F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package unicornscan with summary Scalable, accurate, flexible and efficient network probing
kevin has approved Package unicornscan
kevin has added a Fedora devel branch for unicornscan with an owner of robert
kevin has approved unicornscan in Fedora devel
kevin has approved Package unicornscan
kevin has set commit to Approved for 107427 on unicornscan (Fedora devel)
kevin has set checkout to Approved for 107427 on unicornscan (Fedora devel)
kevin has set build to Approved for 107427 on unicornscan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicornscan



From pkgdb at fedoraproject.org  Sun Dec  6 23:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:27:08 +0000
Subject: [pkgdb] unicornscan summary updated by kevin
Message-ID: <20091206232708.88BD110F87D@bastion2.fedora.phx.redhat.com>

kevin set package unicornscan summary to Scalable, accurate, flexible and efficient network probing

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicornscan



From pkgdb at fedoraproject.org  Sun Dec  6 23:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:27:08 +0000
Subject: [pkgdb] unicornscan (Fedora, 11) updated by kevin
Message-ID: <20091206232708.8F76D10F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for unicornscan
kevin has set commit to Approved for 107427 on unicornscan (Fedora 11)
kevin has set checkout to Approved for 107427 on unicornscan (Fedora 11)
kevin has set build to Approved for 107427 on unicornscan (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicornscan



From pkgdb at fedoraproject.org  Sun Dec  6 23:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:27:08 +0000
Subject: [pkgdb] unicornscan (Fedora EPEL, 5) updated by kevin
Message-ID: <20091206232708.9355510F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for unicornscan
kevin has set commit to Approved for 107427 on unicornscan (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on unicornscan (Fedora EPEL 5)
kevin has set build to Approved for 107427 on unicornscan (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicornscan



From kevin at fedoraproject.org  Sun Dec  6 23:27:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:27:15 +0000 (UTC)
Subject: rpms/unicornscan - New directory
Message-ID: <20091206232715.1B56211C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/unicornscan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOm1111/rpms/unicornscan

Log Message:
Directory /cvs/pkgs/rpms/unicornscan added to the repository




From pkgdb at fedoraproject.org  Sun Dec  6 23:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:27:08 +0000
Subject: [pkgdb] unicornscan (Fedora, 12) updated by kevin
Message-ID: <20091206232708.9FFEE10F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for unicornscan
kevin has set commit to Approved for 107427 on unicornscan (Fedora 12)
kevin has set checkout to Approved for 107427 on unicornscan (Fedora 12)
kevin has set build to Approved for 107427 on unicornscan (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicornscan



From pkgdb at fedoraproject.org  Sun Dec  6 23:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 06 Dec 2009 23:27:08 +0000
Subject: [pkgdb] unicornscan (Fedora EPEL, 4) updated by kevin
Message-ID: <20091206232708.A7B5410F8A5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for unicornscan
kevin has set commit to Approved for 107427 on unicornscan (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on unicornscan (Fedora EPEL 4)
kevin has set build to Approved for 107427 on unicornscan (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicornscan



From kevin at fedoraproject.org  Sun Dec  6 23:27:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:27:15 +0000 (UTC)
Subject: rpms/unicornscan/devel - New directory
Message-ID: <20091206232715.3C93411C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/unicornscan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOm1111/rpms/unicornscan/devel

Log Message:
Directory /cvs/pkgs/rpms/unicornscan/devel added to the repository




From kevin at fedoraproject.org  Sun Dec  6 23:27:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:27:24 +0000 (UTC)
Subject: rpms/unicornscan Makefile,NONE,1.1
Message-ID: <20091206232724.D1E4711C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/unicornscan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOm1111/rpms/unicornscan

Added Files:
	Makefile 
Log Message:
Setup of module unicornscan


--- NEW FILE Makefile ---
# Top level Makefile for module unicornscan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Dec  6 23:27:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:27:25 +0000 (UTC)
Subject: rpms/unicornscan/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091206232725.351AF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/unicornscan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOm1111/rpms/unicornscan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module unicornscan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: unicornscan
# $Id: Makefile,v 1.1 2009/12/06 23:27:25 kevin Exp $
NAME := unicornscan
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From whot at fedoraproject.org  Sun Dec  6 23:34:19 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun,  6 Dec 2009 23:34:19 +0000 (UTC)
Subject: rpms/xorg-x11-drv-wacom/F-12 xorg-x11-drv-wacom.spec,1.4,1.5
Message-ID: <20091206233419.F1B4611C00E0@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2680

Modified Files:
	xorg-x11-drv-wacom.spec 
Log Message:
* Mon Dec 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.2-2
- xorg-x11-drv-wacom-devel provides linuxwacom-devel: resolves
  updates-testing conflict between new linuxwacom and xorg-x11-drv-wacom
  if linuxwacom-devel is installed.



Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/xorg-x11-drv-wacom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xorg-x11-drv-wacom.spec	1 Dec 2009 03:53:28 -0000	1.4
+++ xorg-x11-drv-wacom.spec	6 Dec 2009 23:34:19 -0000	1.5
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -65,6 +65,9 @@ Group:      Development/Libraries
 Requires: xorg-x11-server-devel >= 1.7.0
 Requires: pkgconfig
 
+Provides: linuxwacom-devel = %{version}-%{release}
+Obsoletes: linuxwacom-devel <= 0.8.4.3
+
 %description devel
 X.Org X11 wacom input driver development files.
 
@@ -75,6 +78,11 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Mon Dec 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.2-2
+- xorg-x11-drv-wacom-devel provides linuxwacom-devel: resolves
+  updates-testing conflict between new linuxwacom and xorg-x11-drv-wacom
+  if linuxwacom-devel is installed.
+
 * Tue Dec 01 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.2-1
 - wacom 0.10.2
 



From kasal at fedoraproject.org  Sun Dec  6 23:36:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:36:44 +0000 (UTC)
Subject: rpms/zoneminder/devel zoneminder.spec,1.24,1.25
Message-ID: <20091206233644.E7B0411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3348

Modified Files:
	zoneminder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- zoneminder.spec	27 Jul 2009 09:04:40 -0000	1.24
+++ zoneminder.spec	6 Dec 2009 23:36:44 -0000	1.25
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.2
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -200,6 +200,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.24.2-4
+- rebuild against perl 5.10.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:40:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:40:11 +0000 (UTC)
Subject: rpms/perl-MooseX-CascadeClearing/devel
	perl-MooseX-CascadeClearing.spec, 1.1, 1.2
Message-ID: <20091206234011.91FF311C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4295

Modified Files:
	perl-MooseX-CascadeClearing.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-CascadeClearing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel/perl-MooseX-CascadeClearing.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-MooseX-CascadeClearing.spec	22 Oct 2009 07:30:15 -0000	1.1
+++ perl-MooseX-CascadeClearing.spec	6 Dec 2009 23:40:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-CascadeClearing
 Version:        0.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cascade clearer actions across attributes
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -53,5 +53,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.02-2
+- rebuild against perl 5.10.1
+
 * Tue Oct 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.02-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Sun Dec  6 23:40:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:40:07 +0000 (UTC)
Subject: rpms/perl-Term-ProgressBar/devel perl-Term-ProgressBar.spec, 1.6,
	1.7
Message-ID: <20091206234007.E59B311C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Term-ProgressBar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4235

Modified Files:
	perl-Term-ProgressBar.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Term-ProgressBar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-ProgressBar/devel/perl-Term-ProgressBar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Term-ProgressBar.spec	26 Jul 2009 16:43:00 -0000	1.6
+++ perl-Term-ProgressBar.spec	6 Dec 2009 23:40:07 -0000	1.7
@@ -11,7 +11,7 @@
 
 Name:           perl-Term-ProgressBar
 Version:        2.09
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Provide a progress meter on a standard terminal
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.09-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.09-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:40:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:40:17 +0000 (UTC)
Subject: rpms/perl-GD/devel perl-GD.spec,1.30,1.31
Message-ID: <20091206234017.DA3A911C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GD/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4450

Modified Files:
	perl-GD.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GD.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- perl-GD.spec	29 Oct 2009 18:54:29 -0000	1.30
+++ perl-GD.spec	6 Dec 2009 23:40:17 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           perl-GD
 Version:        2.44
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.44-3
+- rebuild against perl 5.10.1
+
 * Thu Oct 29 2009 Stepan Kasal <skasal at redhat.com> - 2.44-2
 - give up tests on ppc
 



From kasal at fedoraproject.org  Sun Dec  6 23:40:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:40:20 +0000 (UTC)
Subject: rpms/perl-Class-Inner/devel perl-Class-Inner.spec,1.5,1.6
Message-ID: <20091206234020.D89FC11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Inner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4542

Modified Files:
	perl-Class-Inner.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Inner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Inner/devel/perl-Class-Inner.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Class-Inner.spec	26 Jul 2009 04:28:55 -0000	1.5
+++ perl-Class-Inner.spec	6 Dec 2009 23:40:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Class-Inner
 Version:        0.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A perlish implementation of Java like inner classes
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.1-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:41:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:41:29 +0000 (UTC)
Subject: rpms/znc/devel znc.spec,1.18,1.19
Message-ID: <20091206234129.AAC2D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5016

Modified Files:
	znc.spec 
Log Message:
- rebuild against perl 5.10.1


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- znc.spec	25 Sep 2009 06:08:55 -0000	1.18
+++ znc.spec	6 Dec 2009 23:41:29 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.076
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
@@ -125,6 +125,9 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.076-3
+- rebuild against perl 5.10.1
+
 * Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
 - Fix missing dist tag
 



From kasal at fedoraproject.org  Sun Dec  6 23:44:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:44:19 +0000 (UTC)
Subject: rpms/perl-Class-Factory-Util/devel perl-Class-Factory-Util.spec, 1.8,
	1.9
Message-ID: <20091206234419.9C3AC11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Factory-Util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5736

Modified Files:
	perl-Class-Factory-Util.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Factory-Util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Factory-Util/devel/perl-Class-Factory-Util.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-Factory-Util.spec	26 Jul 2009 04:28:40 -0000	1.8
+++ perl-Class-Factory-Util.spec	6 Dec 2009 23:44:19 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Class-Factory-Util
 Version:        1.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Provide utility methods for factory classes 
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.7-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:44:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:44:19 +0000 (UTC)
Subject: rpms/perl-Term-Completion/devel perl-Term-Completion.spec,1.2,1.3
Message-ID: <20091206234419.C497211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Term-Completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5735

Modified Files:
	perl-Term-Completion.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Term-Completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Term-Completion/devel/perl-Term-Completion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Term-Completion.spec	26 Jul 2009 16:42:41 -0000	1.2
+++ perl-Term-Completion.spec	6 Dec 2009 23:44:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Term-Completion 
 Version:    0.91 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Term/Completion.pm -> GPL+ or Artistic
 # lib/Term/Completion/_POSIX.pm -> GPL+ or Artistic
 # lib/Term/Completion/_readkey.pm -> GPL+ or Artistic
@@ -67,6 +67,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.91-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:44:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:44:58 +0000 (UTC)
Subject: rpms/perl-Frontier-RPC/devel perl-Frontier-RPC.spec,1.17,1.18
Message-ID: <20091206234458.D8A0211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Frontier-RPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6029

Modified Files:
	perl-Frontier-RPC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Frontier-RPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Frontier-RPC/devel/perl-Frontier-RPC.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Frontier-RPC.spec	26 Jul 2009 06:08:25 -0000	1.17
+++ perl-Frontier-RPC.spec	6 Dec 2009 23:44:58 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:        A Perl interface for making and serving XML-RPC calls
 Name:           perl-Frontier-RPC
 Version:        0.07b4p1
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Frontier-RPC/
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Frontier::RPC2.3pm.gz
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.07b4p1-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07b4p1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:45:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:45:20 +0000 (UTC)
Subject: rpms/perl-MooseX-AttributeHelpers/devel
	perl-MooseX-AttributeHelpers.spec, 1.17, 1.18
Message-ID: <20091206234520.E685611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-AttributeHelpers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6211

Modified Files:
	perl-MooseX-AttributeHelpers.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-AttributeHelpers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-AttributeHelpers/devel/perl-MooseX-AttributeHelpers.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-MooseX-AttributeHelpers.spec	19 Sep 2009 18:43:37 -0000	1.17
+++ perl-MooseX-AttributeHelpers.spec	6 Dec 2009 23:45:20 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-AttributeHelpers
 Version:        0.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extended Moose attribute interfaces
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.22-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
 - auto-update to 0.22 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Sun Dec  6 23:46:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:46:54 +0000 (UTC)
Subject: rpms/Zim/devel Zim.spec,1.15,1.16
Message-ID: <20091206234654.CA71411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/Zim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6560

Modified Files:
	Zim.spec 
Log Message:
- rebuild against perl 5.10.1


Index: Zim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Zim/devel/Zim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- Zim.spec	24 Jul 2009 16:28:08 -0000	1.15
+++ Zim.spec	6 Dec 2009 23:46:54 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           Zim
 Version:        0.28
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Desktop wiki & notekeeper
 
 Group:          Applications/Editors
@@ -100,6 +100,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.28-3
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:48:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:48:24 +0000 (UTC)
Subject: rpms/perl-Class-Factory/devel perl-Class-Factory.spec,1.6,1.7
Message-ID: <20091206234824.A714511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Factory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6957

Modified Files:
	perl-Class-Factory.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Factory/devel/perl-Class-Factory.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Class-Factory.spec	26 Jul 2009 04:28:23 -0000	1.6
+++ perl-Class-Factory.spec	6 Dec 2009 23:48:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Class-Factory
 Version:        1.06
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Base class for dynamic factory classes
 # see lib/Class/Factory.pm
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.06-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:48:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:48:44 +0000 (UTC)
Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.15, 
	1.16
Message-ID: <20091206234844.8C7A811C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Template-Toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7162

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Template-Toolkit.spec	25 Jul 2009 14:39:56 -0000	1.15
+++ perl-Template-Toolkit.spec	6 Dec 2009 23:48:44 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.22-2
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.22-1
 - update to 2.22
 - obsolete examples package, upstream got rid of them



From kasal at fedoraproject.org  Sun Dec  6 23:48:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:48:44 +0000 (UTC)
Subject: rpms/perl-FreezeThaw/devel perl-FreezeThaw.spec,1.12,1.13
Message-ID: <20091206234844.5BBCD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-FreezeThaw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7151

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-FreezeThaw/devel/perl-FreezeThaw.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-FreezeThaw.spec	26 Jul 2009 06:08:11 -0000	1.12
+++ perl-FreezeThaw.spec	6 Dec 2009 23:48:44 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-FreezeThaw
 Version:        0.45
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Convert Perl structures to strings and back
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.45-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.45-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:50:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:50:42 +0000 (UTC)
Subject: rpms/perl-MooseX-Async/devel perl-MooseX-Async.spec,1.3,1.4
Message-ID: <20091206235042.9E50011C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Async/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7688

Modified Files:
	perl-MooseX-Async.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Async.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Async/devel/perl-MooseX-Async.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-Async.spec	26 Jul 2009 11:24:27 -0000	1.3
+++ perl-MooseX-Async.spec	6 Dec 2009 23:50:42 -0000	1.4
@@ -1,7 +1,7 @@
 %define tarname MooseX-Async
 Name:           perl-MooseX-Async
 Version:        0.07
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Set of Metaclasses for MooseX::POE and it's siblings
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.07-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:51:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:51:57 +0000 (UTC)
Subject: rpms/xmms2/devel xmms2.spec,1.10,1.11
Message-ID: <20091206235157.D245E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/xmms2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8065

Modified Files:
	xmms2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: xmms2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms2/devel/xmms2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xmms2.spec	21 Aug 2009 16:34:05 -0000	1.10
+++ xmms2.spec	6 Dec 2009 23:51:57 -0000	1.11
@@ -6,7 +6,7 @@
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.6
-Release:		4%{?dist}
+Release:		5%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -195,6 +195,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/nyxmms2.*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.6-5
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6-4
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Sun Dec  6 23:52:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:52:29 +0000 (UTC)
Subject: rpms/perl-Class-Exporter/devel perl-Class-Exporter.spec,1.3,1.4
Message-ID: <20091206235229.1639911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Exporter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8257

Modified Files:
	perl-Class-Exporter.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Exporter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Exporter/devel/perl-Class-Exporter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Class-Exporter.spec	26 Jul 2009 04:28:08 -0000	1.3
+++ perl-Class-Exporter.spec	6 Dec 2009 23:52:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Class-Exporter
 Version:        0.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Export class methods as regular subroutines
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:53:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:53:05 +0000 (UTC)
Subject: rpms/perl-Font-TTF/devel perl-Font-TTF.spec,1.16,1.17
Message-ID: <20091206235305.6827811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Font-TTF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8532

Modified Files:
	perl-Font-TTF.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Font-TTF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Font-TTF/devel/perl-Font-TTF.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Font-TTF.spec	26 Jul 2009 06:07:56 -0000	1.16
+++ perl-Font-TTF.spec	6 Dec 2009 23:53:05 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:    perl-%{cpanname}
 Version: 0.45
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Perl library for modifying TTF font files
 
 Group:     Development/Libraries
@@ -83,6 +83,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.45-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.45-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kevin at fedoraproject.org  Sun Dec  6 23:53:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  6 Dec 2009 23:53:36 +0000 (UTC)
Subject: rpms/munin/F-11 munin-1.4.0-config.patch, NONE, 1.1 munin.spec, 1.26,
	1.27 sources, 1.4, 1.5 .cvsignore, 1.4,
	1.5 munin-1.2.4-conf.patch, 1.1, NONE munin-1.2.4-cron.patch,
	1.1, NONE munin-1.2.5-amp-degree.patch, 1.1,
	NONE munin-1.2.5-nf-conntrack.patch, 1.1,
	NONE munin-1.2.6-hddtemp_smartctl-spinup.patch, 1.1,
	NONE munin-1.2.6-ntp_offset.patch, 1.1, NONE
Message-ID: <20091206235336.2DFE211C00E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8752

Modified Files:
	munin.spec sources .cvsignore 
Added Files:
	munin-1.4.0-config.patch 
Removed Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
	munin-1.2.5-amp-degree.patch munin-1.2.5-nf-conntrack.patch 
	munin-1.2.6-hddtemp_smartctl-spinup.patch 
	munin-1.2.6-ntp_offset.patch 
Log Message:
Update to 1.4.1


munin-1.4.0-config.patch:
 dists/redhat/Makefile.config |    2 +-
 master/munin.conf.in         |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE munin-1.4.0-config.patch ---
diff -Nur munin-1.4.0.orig/dists/redhat/Makefile.config munin-1.4.0/dists/redhat/Makefile.config
--- munin-1.4.0.orig/dists/redhat/Makefile.config	2009-11-27 04:17:14.000000000 -0700
+++ munin-1.4.0/dists/redhat/Makefile.config	2009-11-30 22:28:20.000000000 -0700
@@ -23,7 +23,7 @@
 VERSION    = $(shell cat RELEASE)
 USER       = munin
 GROUP      = munin
-PLUGINUSER = nobody
+PLUGINUSER = munin
 GETENT     = $(shell which getent || which true 2>/dev/null)
 CHECKUSER  = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
 CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
diff -Nur munin-1.4.0.orig/master/munin.conf.in munin-1.4.0/master/munin.conf.in
--- munin-1.4.0.orig/master/munin.conf.in	2009-11-27 04:17:18.000000000 -0700
+++ munin-1.4.0/master/munin.conf.in	2009-11-30 22:28:20.000000000 -0700
@@ -15,7 +15,7 @@
 
 # (Exactly one) directory to include all files from.
 #
-includedir @@CONFDIR@@/munin-conf.d
+# includedir @@CONFDIR@@/munin-conf.d
 
 # Make graphs show values per minute instead of per second
 #graph_period minute
@@ -57,7 +57,7 @@
 #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/F-11/munin.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- munin.spec	26 Feb 2009 03:25:23 -0000	1.26
+++ munin.spec	6 Dec 2009 23:53:35 -0000	1.27
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.2.6
-Release:   9%{?dist}
+Version:   1.4.1
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -8,19 +8,28 @@ URL:       http://munin.projects.linpro.
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
+
+Patch1: munin-1.4.0-config.patch
+
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
 Source3: munin-node.logrotate
 Source4: munin.logrotate
-Source5: nf_conntrack
 Source6: munin-1.2.6-postfix-config
-Patch1: munin-1.2.4-conf.patch
-Patch2: munin-1.2.5-nf-conntrack.patch
-Patch3: munin-1.2.5-amp-degree.patch
-Patch4: munin-1.2.6-ntp_offset.patch
-Patch5: munin-1.2.6-hddtemp_smartctl-spinup.patch
+
 BuildArchitectures: noarch
+
+BuildRequires: perl-Module-Build
+# needed for hostname for the defaut config
+BuildRequires: net-tools
+# java buildrequires on fedora
+BuildRequires: java-devel >= 1.6
+BuildRequires: mx4j
+BuildRequires: jpackage-utils
+BuildRequires: perl-Net-SNMP
+
+Requires: %{name}-common = %{version}
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
@@ -46,6 +55,7 @@ RRDtool. 
 Group: System Environment/Daemons
 Summary: Network-wide graphing framework (node)
 BuildArchitectures: noarch
+Requires: %{name}-common = %{version}
 Requires: perl-Net-Server
 Requires: procps >= 2.0.7
 Requires: sysstat, /usr/bin/which, hdparm
@@ -76,30 +86,47 @@ SNMP or similar technology.
 Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
 RRDtool. 
 
+%package common
+Group: System Environment/Daemons
+Summary: Network-wide graphing framework (common files)
+BuildArchitectures: noarch
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description common
+Munin is a highly flexible and powerful solution used to create graphs of
+virtually everything imaginable throughout your network, while still
+maintaining a rattling ease of installation and configuration.
+
+This package contains common files that are used by both the server (munin)
+and node (munin-node) packages. 
+
+%package java-plugins
+Group: System Environment/Daemons
+Summary: java-plugins for munin
+Requires: %{name}-node = %{version}
+BuildArchitectures: noarch
+
+%description java-plugins
+java-plugins for munin-node. 
+
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
-
-# htmldoc and html2text are not available for Red Hat. Quick hack with perl:
-# Skip the PDFs.
-perl -pi -e 's,htmldoc munin,cat munin, or s,html(2text|doc),# $&,' Makefile
-perl -pi -e 's,\$\(INSTALL.+\.(pdf|txt) \$\(DOCDIR,# $&,' Makefile
-make 	CONFIG=dists/redhat/Makefile.config build
+export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
+make 	CONFIG=dists/redhat/Makefile.config
 
 %install
 
 ## Node
-make 	CONFIG=dists/redhat/Makefile.config \
-	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
+make	CONFIG=dists/redhat/Makefile.config \
+	JAVALIBDIR=%{buildroot}%{_datadir}/java \
+	PREFIX=%{buildroot}%{_prefix} \
+ 	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
 	MANDIR=%{buildroot}%{_mandir} \
 	DESTDIR=%{buildroot} \
-    	install-main install-node install-node-plugins install-doc install-man
+	install
 
 mkdir -p %{buildroot}/etc/rc.d/init.d
 mkdir -p %{buildroot}/etc/munin/plugins
@@ -123,17 +150,16 @@ install -m0644 dists/tarball/plugins.con
 rm -f %{buildroot}/usr/share/munin/plugins/sybase_space
 
 ## Server
-make 	CONFIG=dists/redhat/Makefile.config \
-	DESTDIR=%{buildroot} \
-	install-main
 
 mkdir -p %{buildroot}/var/www/html/munin
 mkdir -p %{buildroot}/var/log/munin
 mkdir -p %{buildroot}/etc/cron.d
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
 
 install -m 0644 dists/redhat/munin.cron.d %{buildroot}/etc/cron.d/munin
-install -m 0644 server/style.css %{buildroot}/var/www/html/munin
 install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog
+cp -a master/www/* %{buildroot}/var/www/html/munin/
+
 # install config for sendmail under fedora
 install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
 # install config for hddtemp_smartctl
@@ -141,20 +167,14 @@ install -m 0644 %{SOURCE2} %{buildroot}/
 # install logrotate scripts
 install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
 install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
-# install config for nf_conntrack
-install -m 0644 %{SOURCE5} %{buildroot}/etc/munin/plugin-conf.d/nf_conntrack
 # install config for postfix under fedora
 install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
 
-# fix MUNIN_LIBDIR issue. 
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/ps_
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/multips
-sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/df_abs
-
 # Use font from bitstream-vera-fonts-sans-mono
 rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
 ln -s /usr/share/fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,33 +211,26 @@ exit 0
 %doc %{_docdir}/%{name}-%{version}/
 %{_bindir}/munin-cron
 %{_bindir}/munindoc
+%{_bindir}/munin-check
 %dir %{_datadir}/munin
 %{_datadir}/munin/munin-graph
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
 %{_datadir}/munin/VeraMono.ttf
-%{perl_vendorlib}/Munin.pm
-%dir %{perl_vendorlib}/Munin
-/var/www/html/munin/cgi/munin-cgi-graph
+%{perl_vendorlib}/Munin/Master
 %dir /etc/munin/templates
 %dir /etc/munin
 %config(noreplace) /etc/munin/templates/*
 %config(noreplace) /etc/cron.d/munin
 %config(noreplace) /etc/munin/munin.conf
 %config(noreplace) /etc/logrotate.d/munin
-
 %attr(-, munin, munin) %dir /var/lib/munin
+%attr(-, nobody, munin) %dir /var/lib/munin/plugin-state
 %attr(-, munin, munin) %dir /var/run/munin
 %attr(-, munin, munin) %dir /var/log/munin
-%attr(-, munin, munin) %dir /var/www/html/munin
-%attr(-, root, root) %dir /var/www/html/munin/cgi
-%attr(-, root, root) /var/www/html/munin/style.css
-%doc %{_mandir}/man8/munin-graph*
-%doc %{_mandir}/man8/munin-update*
-%doc %{_mandir}/man8/munin-limits*
-%doc %{_mandir}/man8/munin-html*
-%doc %{_mandir}/man8/munin-cron*
+%attr(-, munin, munin) /var/www/html/munin
+%doc %{_mandir}/man8/munin*
 %doc %{_mandir}/man5/munin.conf*
 
 %files node
@@ -227,15 +240,12 @@ exit 0
 %config(noreplace) /etc/munin/plugin-conf.d/munin-node
 %config(noreplace) /etc/munin/plugin-conf.d/sendmail
 %config(noreplace) /etc/munin/plugin-conf.d/hddtemp_smartctl
-%config(noreplace) /etc/munin/plugin-conf.d/nf_conntrack
 %config(noreplace) /etc/munin/plugin-conf.d/postfix
 %config(noreplace) /etc/logrotate.d/munin-node
-%{perl_vendorlib}/Munin/Plugin.pm
 /etc/rc.d/init.d/munin-node
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%{_sbindir}/munin-node-configure-snmp
 %attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
@@ -244,11 +254,38 @@ exit 0
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/
 %doc %{_docdir}/%{name}-%{version}/
-%doc %{_mandir}/man8/munin-run*
-%doc %{_mandir}/man8/munin-node*
 %doc %{_mandir}/man5/munin-node*
+%doc %{_mandir}/man3/Munin*
+%doc %{_mandir}/man1/munin*
+%{perl_vendorlib}/Munin/Node
+%{perl_vendorlib}/Munin/Plugin*
+
+%files common
+%defattr(-, root, root)
+%dir %{perl_vendorlib}/Munin
+%{perl_vendorlib}/Munin/Common
+
+%files java-plugins
+%defattr(-, root, root)
+%{_datadir}/java/%{name}-jmx-plugins.jar
 
 %changelog
+* Fri Dec 04 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Sat Nov 28 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-1
+- Update to final 1.4.0 version
+
+* Sat Nov 21 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-0.1.beta
+- Update to beta 1.4.0 version. 
+- Add common subpackage for common files. 
+
+* Sun Nov 08 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.0-0.1.alpha
+- Initial alpha version of 1.4.0 
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Jun 2008 21:42:17 -0000	1.4
+++ sources	6 Dec 2009 23:53:35 -0000	1.5
@@ -1 +1 @@
-45f84d58f80642ce914f147232f0d396  munin_1.2.6.tar.gz
+04086f23b657e05e4e5e5a8fa6082f16  munin-1.4.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Jun 2008 21:42:17 -0000	1.4
+++ .cvsignore	6 Dec 2009 23:53:35 -0000	1.5
@@ -1 +1 @@
-munin_1.2.6.tar.gz
+munin-1.4.1.tar.gz


--- munin-1.2.4-conf.patch DELETED ---


--- munin-1.2.4-cron.patch DELETED ---


--- munin-1.2.5-amp-degree.patch DELETED ---


--- munin-1.2.5-nf-conntrack.patch DELETED ---


--- munin-1.2.6-hddtemp_smartctl-spinup.patch DELETED ---


--- munin-1.2.6-ntp_offset.patch DELETED ---



From kasal at fedoraproject.org  Sun Dec  6 23:54:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:54:51 +0000 (UTC)
Subject: rpms/perl-MooseX-App-Cmd/devel perl-MooseX-App-Cmd.spec,1.5,1.6
Message-ID: <20091206235451.4696011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-App-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9171

Modified Files:
	perl-MooseX-App-Cmd.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-App-Cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-App-Cmd/devel/perl-MooseX-App-Cmd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-App-Cmd.spec	19 Sep 2009 18:48:21 -0000	1.5
+++ perl-MooseX-App-Cmd.spec	6 Dec 2009 23:54:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-App-Cmd
 Version:    0.06
-Release:    1%{?dist}
+Release:    2%{?dist}
 # see lib/MooseX/App/Cmd.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
 - switch filtering systems
 - auto-update to 0.06 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Sun Dec  6 23:54:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:54:45 +0000 (UTC)
Subject: rpms/zoneminder/devel zoneminder.spec,1.25,1.26
Message-ID: <20091206235445.BE08E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9105

Modified Files:
	zoneminder.spec 
Log Message:
- use Perl vendorarch and archlib variables correctly


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- zoneminder.spec	6 Dec 2009 23:36:44 -0000	1.25
+++ zoneminder.spec	6 Dec 2009 23:54:45 -0000	1.26
@@ -114,8 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run
 make install DESTDIR=$RPM_BUILD_ROOT \
 	     INSTALLDIRS=vendor
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{_lib}/perl5/vendor_perl/*.*/*-*
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{_lib}/perl5/*.*/*-*
+rm -rf $RPM_BUILD_ROOT%{perl_vendorarch} $RPM_BUILD_ROOT%{perl_archlib}
 rm -f $RPM_BUILD_ROOT%{_bindir}/zmx10.pl
 
 install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/zoneminder
@@ -202,6 +201,7 @@ fi
 %changelog
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.24.2-4
 - rebuild against perl 5.10.1
+- use Perl vendorarch and archlib variables correctly
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kasal at fedoraproject.org  Sun Dec  6 23:55:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:55:58 +0000 (UTC)
Subject: rpms/perl-Template-Timer/devel perl-Template-Timer.spec,1.5,1.6
Message-ID: <20091206235558.A63CF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Template-Timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9520

Modified Files:
	perl-Template-Timer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Template-Timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Template-Timer/devel/perl-Template-Timer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Template-Timer.spec	26 Jul 2009 16:42:23 -0000	1.5
+++ perl-Template-Timer.spec	6 Dec 2009 23:55:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Template-Timer
 Version:        1.00
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Template::Timer Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:57:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:57:13 +0000 (UTC)
Subject: rpms/perl-Font-AFM/devel perl-Font-AFM.spec,1.11,1.12
Message-ID: <20091206235713.852FA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Font-AFM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9940

Modified Files:
	perl-Font-AFM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Font-AFM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Font-AFM/devel/perl-Font-AFM.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Font-AFM.spec	26 Jul 2009 06:07:39 -0000	1.11
+++ perl-Font-AFM.spec	6 Dec 2009 23:57:13 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Font-AFM
 Version:        1.20
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary:        Perl interface to Adobe Font Metrics files
 
 Group: 		Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Font*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.20-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Sun Dec  6 23:59:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Sun,  6 Dec 2009 23:59:05 +0000 (UTC)
Subject: rpms/perl-Moose-Policy/devel perl-Moose-Policy.spec,1.6,1.7
Message-ID: <20091206235905.7FB1D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Moose-Policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10459

Modified Files:
	perl-Moose-Policy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Moose-Policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Moose-Policy/devel/perl-Moose-Policy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Moose-Policy.spec	26 Jul 2009 11:23:49 -0000	1.6
+++ perl-Moose-Policy.spec	6 Dec 2009 23:59:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Moose-Policy
 Version:        0.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Police your project/company-wide Moose policies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:00:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:00:01 +0000 (UTC)
Subject: rpms/perl-Class-ErrorHandler/devel perl-Class-ErrorHandler.spec, 1.6,
	1.7
Message-ID: <20091207000001.2D3B611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-ErrorHandler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10744

Modified Files:
	perl-Class-ErrorHandler.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-ErrorHandler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ErrorHandler/devel/perl-Class-ErrorHandler.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Class-ErrorHandler.spec	26 Jul 2009 04:27:53 -0000	1.6
+++ perl-Class-ErrorHandler.spec	7 Dec 2009 00:00:01 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Class-ErrorHandler
 Version:        0.01
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Class::ErrorHandler Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:00:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:00:58 +0000 (UTC)
Subject: rpms/perl-Template-Provider-Encoding/devel
	perl-Template-Provider-Encoding.spec, 1.4, 1.5
Message-ID: <20091207000058.40B6011C039C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Template-Provider-Encoding/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11092

Modified Files:
	perl-Template-Provider-Encoding.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Template-Provider-Encoding.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Template-Provider-Encoding/devel/perl-Template-Provider-Encoding.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Template-Provider-Encoding.spec	26 Jul 2009 16:42:05 -0000	1.4
+++ perl-Template-Provider-Encoding.spec	7 Dec 2009 00:00:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Provider-Encoding
 Version:        0.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Explicitly declare encodings of your templates
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:02:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:02:40 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload/devel perl-Flickr-Upload.spec,1.2,1.3
Message-ID: <20091207000240.C5FF911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Flickr-Upload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11538

Modified Files:
	perl-Flickr-Upload.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Flickr-Upload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/devel/perl-Flickr-Upload.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Flickr-Upload.spec	12 Aug 2009 13:28:04 -0000	1.2
+++ perl-Flickr-Upload.spec	7 Dec 2009 00:02:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Flickr-Upload
 Version:        1.32
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Flickr.com upload module and script
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.32-3
+- rebuild against perl 5.10.1
+
 * Wed Aug 12 2009 Michal Ingeli <mi at v3.sk> 1.32-2
 - Added missing buildrequire for Test::Simple
 - Removed test that interact with api.flickr.com



From kasal at fedoraproject.org  Mon Dec  7 00:03:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:03:27 +0000 (UTC)
Subject: rpms/perl-Moose-Autobox/devel perl-Moose-Autobox.spec,1.1,1.2
Message-ID: <20091207000327.9935B11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Moose-Autobox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11827

Modified Files:
	perl-Moose-Autobox.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Moose-Autobox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Moose-Autobox/devel/perl-Moose-Autobox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Moose-Autobox.spec	4 Sep 2009 02:30:12 -0000	1.1
+++ perl-Moose-Autobox.spec	7 Dec 2009 00:03:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-Moose-Autobox 
 Version:    0.09 
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/Moose/Autobox.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-2
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-1
 - submission
 



From kasal at fedoraproject.org  Mon Dec  7 00:04:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:04:11 +0000 (UTC)
Subject: rpms/perl-Class-DBI-SQLite/devel perl-Class-DBI-SQLite.spec, 1.8,
	1.9
Message-ID: <20091207000411.AEF3711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-SQLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12068

Modified Files:
	perl-Class-DBI-SQLite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-SQLite/devel/perl-Class-DBI-SQLite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-DBI-SQLite.spec	26 Jul 2009 04:26:34 -0000	1.8
+++ perl-Class-DBI-SQLite.spec	7 Dec 2009 00:04:11 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-SQLite
 Version:        0.11
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Extension to Class::DBI for sqlite
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:04:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:04:29 +0000 (UTC)
Subject: rpms/xls2csv/devel xls2csv.spec,1.1,1.2
Message-ID: <20091207000429.9DA1411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/xls2csv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12245

Modified Files:
	xls2csv.spec 
Log Message:
- rebuild against perl 5.10.1


Index: xls2csv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xls2csv/devel/xls2csv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xls2csv.spec	24 Sep 2009 19:28:00 -0000	1.1
+++ xls2csv.spec	7 Dec 2009 00:04:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xls2csv
 Version:		1.06
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		A script that recodes a spreadsheet's charset and saves as CSV
 
 Group:		Applications/Text
@@ -59,6 +59,9 @@ find %{buildroot} -depth -type d -exec r
 %{_mandir}/man1/convert%{name}.1.gz
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.06-6
+- rebuild against perl 5.10.1
+
 * Thu Sep 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.06-5
 - Rename /usr/bin/xls2csv to /usr/bin/convertxls2csv to avoid name conflict with package catdoc (Thank you Jan Klepek)
 



From kasal at fedoraproject.org  Mon Dec  7 00:05:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:05:01 +0000 (UTC)
Subject: rpms/perl-Template-Plugin-JavaScript/devel
	perl-Template-Plugin-JavaScript.spec, 1.3, 1.4
Message-ID: <20091207000501.B64FB11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Template-Plugin-JavaScript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12480

Modified Files:
	perl-Template-Plugin-JavaScript.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Template-Plugin-JavaScript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Template-Plugin-JavaScript/devel/perl-Template-Plugin-JavaScript.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Template-Plugin-JavaScript.spec	26 Jul 2009 16:41:50 -0000	1.3
+++ perl-Template-Plugin-JavaScript.spec	7 Dec 2009 00:05:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-Template-Plugin-JavaScript 
 Version:    0.01 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/Template/Plugin/JavaScript.pm 
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:07:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:07:19 +0000 (UTC)
Subject: rpms/perl-Flickr-API/devel perl-Flickr-API.spec,1.1,1.2
Message-ID: <20091207000719.6FE1311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Flickr-API/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13019

Modified Files:
	perl-Flickr-API.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Flickr-API.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-API/devel/perl-Flickr-API.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Flickr-API.spec	10 Aug 2009 18:39:19 -0000	1.1
+++ perl-Flickr-API.spec	7 Dec 2009 00:07:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Flickr-API
 Version:        1.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the Flickr API
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-2
+- rebuild against perl 5.10.1
+
 * Sun Aug 1 2009 Michal Ingeli <mi at v3.sk> - 1.02-1
 - Update to newer version with fixed license
 - Cleaned up requires



From kasal at fedoraproject.org  Mon Dec  7 00:08:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:08:15 +0000 (UTC)
Subject: rpms/perl-Moose/devel perl-Moose.spec,1.47,1.48
Message-ID: <20091207000815.01D7811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13299

Modified Files:
	perl-Moose.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- perl-Moose.spec	27 Sep 2009 01:45:47 -0000	1.47
+++ perl-Moose.spec	7 Dec 2009 00:08:14 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           perl-Moose
 Version:        0.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -133,6 +133,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Test::Moose*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.92-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.92-1
 - auto-update to 0.92 (by cpan-spec-update 0.01)
 - altered br on perl(Class::MOP) (0.93 => 0.94)



From kasal at fedoraproject.org  Mon Dec  7 00:08:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:08:49 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Plugin-Type/devel
	perl-Class-DBI-Plugin-Type.spec, 1.7, 1.8
Message-ID: <20091207000849.7B4A511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-Plugin-Type/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13483

Modified Files:
	perl-Class-DBI-Plugin-Type.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-Plugin-Type.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Plugin-Type/devel/perl-Class-DBI-Plugin-Type.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Class-DBI-Plugin-Type.spec	26 Jul 2009 04:26:20 -0000	1.7
+++ perl-Class-DBI-Plugin-Type.spec	7 Dec 2009 00:08:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin-Type
 Version:        0.02
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Determine type information for columns
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:09:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:09:18 +0000 (UTC)
Subject: rpms/perl-Template-Plugin-Class/devel
	perl-Template-Plugin-Class.spec, 1.11, 1.12
Message-ID: <20091207000918.8841711C03AD@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Template-Plugin-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13673

Modified Files:
	perl-Template-Plugin-Class.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Template-Plugin-Class.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Template-Plugin-Class/devel/perl-Template-Plugin-Class.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Template-Plugin-Class.spec	26 Jul 2009 16:41:33 -0000	1.11
+++ perl-Template-Plugin-Class.spec	7 Dec 2009 00:09:18 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Template-Plugin-Class
 Version:        0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Allow calling of class methods on arbitrary classes
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:09:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:09:31 +0000 (UTC)
Subject: rpms/xfconf/devel xfconf.spec,1.14,1.15
Message-ID: <20091207000931.C42D311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13847

Modified Files:
	xfconf.spec 
Log Message:
- rebuild against perl 5.10.1


Index: xfconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xfconf.spec	20 Oct 2009 16:45:58 -0000	1.14
+++ xfconf.spec	7 Dec 2009 00:09:31 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           xfconf
 Version:        4.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.6.1-5
+- rebuild against perl 5.10.1
+
 * Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 4.6.1-4
 - Add BR perl(ExtUtils::MakeMaker) and perl(Glib::MakeHelper)
 



From kasal at fedoraproject.org  Mon Dec  7 00:11:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:11:21 +0000 (UTC)
Subject: rpms/perl-Finance-YahooQuote/devel perl-Finance-YahooQuote.spec, 1.6,
	1.7
Message-ID: <20091207001121.EB44211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Finance-YahooQuote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14319

Modified Files:
	perl-Finance-YahooQuote.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Finance-YahooQuote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Finance-YahooQuote/devel/perl-Finance-YahooQuote.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Finance-YahooQuote.spec	26 Jul 2009 06:07:22 -0000	1.6
+++ perl-Finance-YahooQuote.spec	7 Dec 2009 00:11:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Finance-YahooQuote
 Version:        0.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl interface to get stock quotes from Yahoo! Finance
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:12:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:12:51 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.8, 1.9
Message-ID: <20091207001251.5D7C411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14896

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-DBI-Plugin-RetrieveAll.spec	26 Jul 2009 04:26:06 -0000	1.8
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	7 Dec 2009 00:12:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
 Version:        1.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:13:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:13:37 +0000 (UTC)
Subject: rpms/perl-Template-GD/devel perl-Template-GD.spec,1.5,1.6
Message-ID: <20091207001337.BC04611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Template-GD/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15143

Modified Files:
	perl-Template-GD.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Template-GD.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Template-GD/devel/perl-Template-GD.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Template-GD.spec	26 Jul 2009 16:41:17 -0000	1.5
+++ perl-Template-GD.spec	7 Dec 2009 00:13:37 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Template-GD
 Version:        2.66
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GD plugin(s) for the Template Toolkit
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.66-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.66-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:14:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:14:06 +0000 (UTC)
Subject: rpms/perl-Mon/devel perl-Mon.spec,1.3,1.4
Message-ID: <20091207001406.DC54111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15330

Modified Files:
	perl-Mon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mon/devel/perl-Mon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Mon.spec	26 Jul 2009 11:23:10 -0000	1.3
+++ perl-Mon.spec	7 Dec 2009 00:14:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Mon
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mon Perl module
 License:        GPLv2+
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:15:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:15:19 +0000 (UTC)
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.65,1.66
Message-ID: <20091207001519.C7AF711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15630

Modified Files:
	xchat-gnome.spec 
Log Message:
- rebuild against perl 5.10.1


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xchat-gnome.spec	21 Aug 2009 16:32:11 -0000	1.65
+++ xchat-gnome.spec	7 Dec 2009 00:15:19 -0000	1.66
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.26.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -140,6 +140,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.26.1-6
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.26.1-5
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Mon Dec  7 00:15:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:15:41 +0000 (UTC)
Subject: rpms/perl-Finance-Quote/devel perl-Finance-Quote.spec,1.10,1.11
Message-ID: <20091207001541.8D3BF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Finance-Quote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15810

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Finance-Quote/devel/perl-Finance-Quote.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Finance-Quote.spec	23 Nov 2009 18:16:02 -0000	1.10
+++ perl-Finance-Quote.spec	7 Dec 2009 00:15:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		perl-Finance-Quote
 Version:        1.17
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        A Perl module that retrieves stock and mutual fund quotes
 Group:          Development/Libraries
 License:        GPLv2+
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.17-2
+- rebuild against perl 5.10.1
+
 * Mon Nov 23 2009 Bradley Baetz <bbaetz at gmail.com> - 1.17-1
 - Update to 1.17
 - Add extra BuildRequires needed for tests to pass



From kasal at fedoraproject.org  Mon Dec  7 00:16:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:16:53 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Plugin-DeepAbstractSearch/devel
	perl-Class-DBI-Plugin-DeepAbstractSearch.spec, 1.2, 1.3
Message-ID: <20091207001653.9AB2511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-Plugin-DeepAbstractSearch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16130

Modified Files:
	perl-Class-DBI-Plugin-DeepAbstractSearch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-Plugin-DeepAbstractSearch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Plugin-DeepAbstractSearch/devel/perl-Class-DBI-Plugin-DeepAbstractSearch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Class-DBI-Plugin-DeepAbstractSearch.spec	26 Jul 2009 04:25:52 -0000	1.2
+++ perl-Class-DBI-Plugin-DeepAbstractSearch.spec	7 Dec 2009 00:16:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Class-DBI-Plugin-DeepAbstractSearch 
 Version:    0.08 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Class/DBI/Plugin/DeepAbstractSearch.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:17:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:17:41 +0000 (UTC)
Subject: rpms/perl-Template-Alloy/devel perl-Template-Alloy.spec,1.8,1.9
Message-ID: <20091207001741.AA5AF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Template-Alloy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16366

Modified Files:
	perl-Template-Alloy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Template-Alloy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Template-Alloy/devel/perl-Template-Alloy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Template-Alloy.spec	26 Jul 2009 16:41:01 -0000	1.8
+++ perl-Template-Alloy.spec	7 Dec 2009 00:17:41 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Template-Alloy
 Version:        1.013
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Templating tool supporting multiple markup formats 
 # see lib/Template/Alloy.pod
 License:        GPL+ or Artistic
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.013-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.013-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:17:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:17:52 +0000 (UTC)
Subject: rpms/perl-MogileFS-Utils/devel perl-MogileFS-Utils.spec,1.5,1.6
Message-ID: <20091207001752.7C02211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MogileFS-Utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16510

Modified Files:
	perl-MogileFS-Utils.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MogileFS-Utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MogileFS-Utils/devel/perl-MogileFS-Utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MogileFS-Utils.spec	26 Jul 2009 11:22:52 -0000	1.5
+++ perl-MogileFS-Utils.spec	7 Dec 2009 00:17:52 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MogileFS-Utils
 Version:        2.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utilities for MogileFS
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.12-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:20:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:20:37 +0000 (UTC)
Subject: rpms/perl-File-Which/devel perl-File-Which.spec,1.9,1.10
Message-ID: <20091207002037.8CC5611C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Which/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17149

Modified Files:
	perl-File-Which.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Which.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Which/devel/perl-File-Which.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-File-Which.spec	5 Oct 2009 17:04:19 -0000	1.9
+++ perl-File-Which.spec	7 Dec 2009 00:20:37 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-File-Which
 Version:        1.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable implementation of the 'which' utility
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.09-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1.09-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 00:21:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:21:04 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Plugin/devel perl-Class-DBI-Plugin.spec, 1.8,
	1.9
Message-ID: <20091207002104.9469C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-Plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17359

Modified Files:
	perl-Class-DBI-Plugin.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-Plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Plugin/devel/perl-Class-DBI-Plugin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-DBI-Plugin.spec	26 Jul 2009 04:25:38 -0000	1.8
+++ perl-Class-DBI-Plugin.spec	7 Dec 2009 00:21:04 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin
 Version:        0.03
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Abstract base class for Class::DBI plugins
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:22:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:22:13 +0000 (UTC)
Subject: rpms/xchat/devel xchat.spec,1.107,1.108
Message-ID: <20091207002213.8EB9811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17774

Modified Files:
	xchat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- xchat.spec	10 Sep 2009 19:52:20 -0000	1.107
+++ xchat.spec	7 Dec 2009 00:22:13 -0000	1.108
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   13%{?dist}
+Release:   14%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -165,6 +165,9 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:2.8.6-14
+- rebuild against perl 5.10.1
+
 * Thu Sep 10 2009 Christopher Aillon <caillon at redhat.com> - 1:2.8.6-13
 - Drop the antiquated OPN reference
 



From kasal at fedoraproject.org  Mon Dec  7 00:22:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:22:11 +0000 (UTC)
Subject: rpms/perl-mogilefs-server/devel perl-mogilefs-server.spec, 1.12,
	1.13
Message-ID: <20091207002211.3C05911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-mogilefs-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17754

Modified Files:
	perl-mogilefs-server.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-mogilefs-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/devel/perl-mogilefs-server.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-mogilefs-server.spec	26 Jul 2009 17:48:02 -0000	1.12
+++ perl-mogilefs-server.spec	7 Dec 2009 00:22:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:       perl-mogilefs-server
 Version:    2.30
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Server part of the MogileFS distributed filesystem
 License:    GPL+ or Artistic
 Group:      System Environment/Daemons
@@ -255,6 +255,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.30-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.30-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:22:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:22:44 +0000 (UTC)
Subject: rpms/perl-Task-Weaken/devel perl-Task-Weaken.spec,1.4,1.5
Message-ID: <20091207002244.B7C8511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Task-Weaken/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18047

Modified Files:
	perl-Task-Weaken.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Task-Weaken.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Task-Weaken/devel/perl-Task-Weaken.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Task-Weaken.spec	26 Jul 2009 16:40:32 -0000	1.4
+++ perl-Task-Weaken.spec	7 Dec 2009 00:22:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Task-Weaken
 Version:        1.02
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Ensure that a platform has weaken support
 License:        GPLv2+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:24:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:24:26 +0000 (UTC)
Subject: rpms/perl-File-Type/devel perl-File-Type.spec,1.7,1.8
Message-ID: <20091207002426.99BFD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Type/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18465

Modified Files:
	perl-File-Type.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Type.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Type/devel/perl-File-Type.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-File-Type.spec	26 Jul 2009 06:05:10 -0000	1.7
+++ perl-File-Type.spec	7 Dec 2009 00:24:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-Type
 Version:        0.22
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Determine file type using magic
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:25:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:25:24 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Pg/devel perl-Class-DBI-Pg.spec,1.9,1.10
Message-ID: <20091207002524.7740011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-Pg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18737

Modified Files:
	perl-Class-DBI-Pg.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-Pg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Pg/devel/perl-Class-DBI-Pg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-DBI-Pg.spec	26 Jul 2009 04:25:22 -0000	1.9
+++ perl-Class-DBI-Pg.spec	7 Dec 2009 00:25:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Pg
 Version:        0.09
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Class::DBI extension for PostgreSQL
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:27:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:27:10 +0000 (UTC)
Subject: rpms/perl-MogileFS-Client/devel perl-MogileFS-Client.spec,1.5,1.6
Message-ID: <20091207002710.E6A7811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MogileFS-Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19184

Modified Files:
	perl-MogileFS-Client.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MogileFS-Client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MogileFS-Client/devel/perl-MogileFS-Client.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MogileFS-Client.spec	26 Jul 2009 11:22:31 -0000	1.5
+++ perl-MogileFS-Client.spec	7 Dec 2009 00:27:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MogileFS-Client
 Version:        1.08
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Client library for the MogileFS distributed file system
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.08-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:27:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:27:26 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-JUnit/devel perl-TAP-Harness-JUnit.spec, 1.11,
	1.12
Message-ID: <20091207002726.F353411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19417

Modified Files:
	perl-TAP-Harness-JUnit.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-TAP-Harness-JUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel/perl-TAP-Harness-JUnit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-TAP-Harness-JUnit.spec	26 Jul 2009 16:39:48 -0000	1.11
+++ perl-TAP-Harness-JUnit.spec	7 Dec 2009 00:27:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-TAP-Harness-JUnit
 Version:        0.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Generate JUnit compatible output from TAP results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.32-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From agoode at fedoraproject.org  Mon Dec  7 00:28:18 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Mon,  7 Dec 2009 00:28:18 +0000 (UTC)
Subject: File openjpeg_v1_3.tar.gz uploaded to lookaside cache by agoode
Message-ID: <20091207002818.DE2E010F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for mingw32-openjpeg:

f9a3ccfa91ac34b589e9bf7577ce8ff9  openjpeg_v1_3.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 00:28:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:28:27 +0000 (UTC)
Subject: rpms/whatsup/devel whatsup.spec,1.4,1.5
Message-ID: <20091207002827.F22D411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/whatsup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20010

Modified Files:
	whatsup.spec 
Log Message:
- rebuild against perl 5.10.1


Index: whatsup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/whatsup/devel/whatsup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- whatsup.spec	27 Jul 2009 07:13:53 -0000	1.4
+++ whatsup.spec	7 Dec 2009 00:28:27 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:       Node up/down detection utility
 Name:          whatsup
 Version:       1.9
-Release:       2%{?dist}
+Release:       3%{?dist}
 Group:         Applications/Communications
 License:       GPLv2+
 URL:           https://computing.llnl.gov/linux/whatsup.html
@@ -199,6 +199,9 @@ fi
 %config(noreplace) %{_sysconfdir}/hostsfile
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9-3
+- rebuild against perl 5.10.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:28:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:28:37 +0000 (UTC)
Subject: rpms/perl-File-Tail/devel perl-File-Tail.spec,1.15,1.16
Message-ID: <20091207002837.1A17411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Tail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20162

Modified Files:
	perl-File-Tail.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Tail/devel/perl-File-Tail.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-File-Tail.spec	26 Jul 2009 06:04:55 -0000	1.15
+++ perl-File-Tail.spec	7 Dec 2009 00:28:36 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-File-Tail
 Version:        0.99.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.99.3-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From agoode at fedoraproject.org  Mon Dec  7 00:28:53 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Mon,  7 Dec 2009 00:28:53 +0000 (UTC)
Subject: rpms/mingw32-openjpeg/devel import.log, NONE,
	1.1 mingw32-openjpeg.spec, NONE, 1.1 openjpeg-1.3-libm.patch,
	NONE, 1.1 openjpeg-1.3-mingw32-cmake.patch, NONE,
	1.1 openjpeg-1.3-reverse-bogus-aligned-malloc.patch, NONE,
	1.1 openjpeg-1.3-tcd_init_encode-alloc-fix.patch, NONE,
	1.1 openjpeg-20070717svn-codec-libtiff.patch, NONE,
	1.1 openjpeg-20070717svn-mqc-optimize.patch, NONE,
	1.1 openjpeg-20070719svn-mqc-more-optimize.patch, NONE,
	1.1 openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch,
	NONE, 1.1 openjpeg-20070719svn-t1-x86_64-flags-branchless.patch,
	NONE, 1.1 openjpeg-20070821svn-t1-flags-stride.patch, NONE,
	1.1 openjpeg-20070821svn-t1-remove-macro.patch, NONE,
	1.1 openjpeg-20070821svn-t1-updateflags-x86_64.patch, NONE,
	1.1 openjpeg-svn468-mj2-noscroll.patch, NONE,
	1.1 openjpeg-svn470-t1-flags-mmx.patch, NONE,
	1.1 openjpeg-svn480-cmake.patch, NONE,
	1.1 openjpeg-svn480-use-stdbool.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207002853.3EF1011C00E0@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mingw32-openjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20341/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-openjpeg.spec openjpeg-1.3-libm.patch 
	openjpeg-1.3-mingw32-cmake.patch 
	openjpeg-1.3-reverse-bogus-aligned-malloc.patch 
	openjpeg-1.3-tcd_init_encode-alloc-fix.patch 
	openjpeg-20070717svn-codec-libtiff.patch 
	openjpeg-20070717svn-mqc-optimize.patch 
	openjpeg-20070719svn-mqc-more-optimize.patch 
	openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch 
	openjpeg-20070719svn-t1-x86_64-flags-branchless.patch 
	openjpeg-20070821svn-t1-flags-stride.patch 
	openjpeg-20070821svn-t1-remove-macro.patch 
	openjpeg-20070821svn-t1-updateflags-x86_64.patch 
	openjpeg-svn468-mj2-noscroll.patch 
	openjpeg-svn470-t1-flags-mmx.patch openjpeg-svn480-cmake.patch 
	openjpeg-svn480-use-stdbool.patch 
Log Message:
Initial import (#537897).


--- NEW FILE import.log ---
mingw32-openjpeg-1_3-5_fc13:HEAD:mingw32-openjpeg-1.3-5.fc13.src.rpm:1260145704


--- NEW FILE mingw32-openjpeg.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}

# reset patch fuzz, rebasing patches will require delicate surgery -- Rex
%global _default_patch_fuzz 2

Name:    mingw32-openjpeg
Version: 1.3
Release: 5%{?dist}
Summary: MinGW Windows openjpeg library

Group:     Development/Libraries
License:   BSD
URL:       http://www.openjpeg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: cmake

BuildRequires: mingw32-filesystem >= 52
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-libtiff

Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz

# Patches from native Fedora package:
Patch1: openjpeg-20070717svn-codec-libtiff.patch
Patch4: openjpeg-svn480-cmake.patch
Patch5: openjpeg-svn480-use-stdbool.patch
Patch6: openjpeg-1.3-tcd_init_encode-alloc-fix.patch
Patch7: openjpeg-1.3-reverse-bogus-aligned-malloc.patch
Patch44: openjpeg-svn468-mj2-noscroll.patch
Patch21: openjpeg-20070717svn-mqc-optimize.patch
Patch22: openjpeg-20070821svn-t1-remove-macro.patch
Patch23: openjpeg-20070719svn-t1-x86_64-flags-branchless.patch
Patch24: openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch
Patch25: openjpeg-20070821svn-t1-flags-stride.patch
Patch26: openjpeg-20070821svn-t1-updateflags-x86_64.patch
Patch27: openjpeg-svn470-t1-flags-mmx.patch
Patch28: openjpeg-20070719svn-mqc-more-optimize.patch

# libopenjpeg has undefined references, http://bugzilla.redhat.com/467661
Patch50: openjpeg-1.3-libm.patch

# Patches for MinGW:
Patch1000: openjpeg-1.3-mingw32-cmake.patch


%description
%{_mingw32_description}


%{_mingw32_debug_package}


%prep
%setup -q -n OpenJPEG_v1_3
# Make sure we use system libraries
rm -rf libs
%patch1 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch44 -p1
%patch22 -p1
%patch23 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch24 -p1
%patch21 -p1
%patch28 -p1
%patch50 -p1 -b .libm

%patch1000 -p1

# Fix permissions
chmod a-x ChangeLog license.txt


%build
mkdir build
pushd build
export MINGW32_CFLAGS="%{_mingw32_cflags} -DWIN32"
%{_mingw32_cmake} ..
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT
pushd build
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libopenjpeg.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
popd

# HACK: until pkg-config support lands, temporarily provide
# openjpeg.h header in legacy location
ln -s openjpeg/openjpeg.h $RPM_BUILD_ROOT%{_mingw32_includedir}/openjpeg.h


%check
# mostly pointless without test images, but it's a start -- Rex
make test -C build


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc license.txt
%{_mingw32_includedir}/openjpeg.h
%{_mingw32_includedir}/openjpeg
%{_mingw32_bindir}/libopenjpeg.dll
%{_mingw32_libdir}/libopenjpeg.dll.a


%changelog
* Mon Nov 16 2009 Adam Goode <adam at spicenitz.org> - 1.3-5
- Initial release, tracking Fedora native openjpeg-1.3-5

openjpeg-1.3-libm.patch:
 codec/CMakeLists.txt       |    4 ----
 libopenjpeg/CMakeLists.txt |    5 +++++
 mj2/CMakeLists.txt         |   12 ------------
 3 files changed, 5 insertions(+), 16 deletions(-)

--- NEW FILE openjpeg-1.3-libm.patch ---
diff -up OpenJPEG_v1_3/codec/CMakeLists.txt.libm OpenJPEG_v1_3/codec/CMakeLists.txt
--- OpenJPEG_v1_3/codec/CMakeLists.txt.libm	2007-11-27 06:38:52.000000000 -0600
+++ OpenJPEG_v1_3/codec/CMakeLists.txt	2009-06-19 09:20:59.473980422 -0500
@@ -46,10 +46,6 @@ FOREACH(exe j2k_to_image image_to_j2k)
   ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
   # calling those exe without option will make them fail always:
   SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)
-  # On unix you need to link to the math library:
-  IF(UNIX)
-    TARGET_LINK_LIBRARIES(${exe} m)
-  ENDIF(UNIX)
   # Install exe
   INSTALL_TARGETS(/bin/ ${exe})
 ENDFOREACH(exe)
diff -up OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt.libm OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt
--- OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt.libm	2009-06-19 09:18:44.021229314 -0500
+++ OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt	2009-06-19 09:18:44.074248015 -0500
@@ -35,6 +35,11 @@ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${O
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
 	${OPENJPEG_LIBRARY_PROPERTIES})
 
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
+  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} LINK_INTERFACE_LIBRARIES)
+ENDIF(UNIX)
+
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
 	DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff -up OpenJPEG_v1_3/mj2/CMakeLists.txt.libm OpenJPEG_v1_3/mj2/CMakeLists.txt
--- OpenJPEG_v1_3/mj2/CMakeLists.txt.libm	2007-09-12 04:04:03.000000000 -0500
+++ OpenJPEG_v1_3/mj2/CMakeLists.txt	2009-06-19 09:18:44.074248015 -0500
@@ -10,33 +10,21 @@ ADD_EXECUTABLE(frames_to_mj2
   compat/getopt.c 
   mj2_convert.c mj2.c )
 TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(frames_to_mj2 m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(mj2_to_frames
     mj2_to_frames.c
     compat/getopt.c mj2_convert.c mj2.c )
 TARGET_LINK_LIBRARIES(mj2_to_frames ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(mj2_to_frames m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(extract_j2k_from_mj2
     extract_j2k_from_mj2.c
     mj2.c )
 TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(wrap_j2k_in_mj2
     wrap_j2k_in_mj2.c
     mj2.c )
 TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m)
-ENDIF(UNIX)
 
 INSTALL(TARGETS frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
 	DESTINATION bin)

openjpeg-1.3-mingw32-cmake.patch:
 CMakeLists.txt |    9 ---------
 1 file changed, 9 deletions(-)

--- NEW FILE openjpeg-1.3-mingw32-cmake.patch ---
diff -ur OpenJPEG_v1_3~/CMakeLists.txt OpenJPEG_v1_3/CMakeLists.txt
--- OpenJPEG_v1_3~/CMakeLists.txt	2009-06-03 09:40:53.000000000 -0400
+++ OpenJPEG_v1_3/CMakeLists.txt	2009-06-03 09:41:28.000000000 -0400
@@ -67,19 +67,10 @@
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 SUBDIRS(
   libopenjpeg
-  mj2
   # cmake 2.4.5 has poor java support
   #j2kviewer/src
   )
 
-IF(NOT UNIX)
-SUBDIRS(
-  jpwl
-  jp3d
-  indexer_JPIP
-  )
-ENDIF(NOT UNIX)
-
 #-----------------------------------------------------------------------------
 # Build example only if requested
 IF(BUILD_EXAMPLES)

openjpeg-1.3-reverse-bogus-aligned-malloc.patch:
 opj_malloc.h |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE openjpeg-1.3-reverse-bogus-aligned-malloc.patch ---
--- OpenJPEG_v1_3/libopenjpeg/opj_malloc.h	2007-12-21 04:19:01.000000000 -0600
+++ trunk/libopenjpeg/opj_malloc.h	2007-10-18 07:26:11.000000000 -0500
@@ -75,9 +75,6 @@
 #else /* Not WIN32 */
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
-		#elif defined(__GNUC__)
-			#define HAVE_MEMALIGN
-			#include <malloc.h>		
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
 		#elif !defined(__amd64__) && !defined(__APPLE__)	
 			/* FIXME: Yes, this is a big assumption */
@@ -85,8 +82,6 @@
 	#endif
 #endif
 
-
-
 #define opj_aligned_malloc(size) malloc(size)
 #define opj_aligned_free(m) free(m)
 

openjpeg-1.3-tcd_init_encode-alloc-fix.patch:
 tcd.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openjpeg-1.3-tcd_init_encode-alloc-fix.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/tcd.c OpenJPEG.patched/libopenjpeg/tcd.c
--- OpenJPEG.orig/libopenjpeg/tcd.c	2007-12-19 06:28:40.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/tcd.c	2007-12-27 21:58:57.000000000 -0600
@@ -584,7 +584,9 @@
 							cblk->y0 = int_max(cblkystart, prc->y0);
 							cblk->x1 = int_min(cblkxend, prc->x1);
 							cblk->y1 = int_min(cblkyend, prc->y1);
-							cblk->data = (unsigned char*) opj_calloc(8192, sizeof(unsigned char));
+							cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
+							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
+							cblk->data += 2;
 							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
 							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
 						}

openjpeg-20070717svn-codec-libtiff.patch:
 convert.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openjpeg-20070717svn-codec-libtiff.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/codec/convert.c OpenJPEG.patched/codec/convert.c
--- OpenJPEG.orig/codec/convert.c	2007-07-17 11:19:41.000000000 -0500
+++ OpenJPEG.patched/codec/convert.c	2007-07-17 19:40:02.000000000 -0500
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "openjpeg.h"
-#include "../libs/libtiff/tiffio.h"
+#include "tiffio.h"
 #include "convert.h"
 
 /*

openjpeg-20070717svn-mqc-optimize.patch:
 mqc.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE openjpeg-20070717svn-mqc-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/mqc.c OpenJPEG.patched/libopenjpeg/mqc.c
--- OpenJPEG.orig/libopenjpeg/mqc.c	2007-07-17 20:07:22.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/mqc.c	2007-07-17 20:07:44.000000000 -0500
@@ -507,20 +507,20 @@
 
 int mqc_decode(opj_mqc_t *mqc) {
 	int d;
-	mqc->a -= (*mqc->curctx)->qeval;
-	if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
+	unsigned int qeval = (*mqc->curctx)->qeval;
+	mqc->a -= qeval;
+	qeval <<= 16;
+	if (mqc->c < qeval) {
 		d = mqc_lpsexchange(mqc);
-		mqc_renormd(mqc);
 	} else {
-		mqc->c -= (*mqc->curctx)->qeval << 16;
+		mqc->c -= qeval;
 		if ((mqc->a & 0x8000) == 0) {
 			d = mqc_mpsexchange(mqc);
-			mqc_renormd(mqc);
 		} else {
-			d = (*mqc->curctx)->mps;
+			return (*mqc->curctx)->mps;
 		}
 	}
-
+	mqc_renormd(mqc);
 	return d;
 }
 

openjpeg-20070719svn-mqc-more-optimize.patch:
 mqc.c |   58 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

--- NEW FILE openjpeg-20070719svn-mqc-more-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/mqc.c OpenJPEG.patched/libopenjpeg/mqc.c
--- OpenJPEG.orig/libopenjpeg/mqc.c	2007-08-06 16:16:00.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/mqc.c	2007-08-06 19:07:28.000000000 -0500
@@ -68,13 +68,13 @@
 @param mqc MQC handle
 @return 
 */
-static int mqc_mpsexchange(opj_mqc_t *mqc);
+//static int mqc_mpsexchange(opj_mqc_t *mqc);
 /**
 FIXME: documentation ???
 @param mqc MQC handle
 @return 
 */
-static int mqc_lpsexchange(opj_mqc_t *mqc);
+//static int mqc_lpsexchange(opj_mqc_t *mqc);
 /**
 Input a byte
 @param mqc MQC handle
@@ -271,33 +271,22 @@
 	}
 }
 
+/*
 static int mqc_mpsexchange(opj_mqc_t *mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	} else {
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	}
-	
-	return d;
+	int d = (*mqc->curctx)->mps;
+	int tmp = (mqc->a < (*mqc->curctx)->qeval);
+	*mqc->curctx = tmp ? (*mqc->curctx)->nlps : (*mqc->curctx)->nmps;
+	return tmp ^ d;
 }
 
 static int mqc_lpsexchange(opj_mqc_t *mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	} else {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	}
-	
-	return d;
+	int d = (*mqc->curctx)->mps;
+	int tmp = !(mqc->a < (*mqc->curctx)->qeval);
+	mqc->a = (*mqc->curctx)->qeval;
+	*mqc->curctx = tmp ? (*mqc->curctx)->nlps : (*mqc->curctx)->nmps;
+	return tmp ^ d;
 }
+*/
 
 static void mqc_bytein(opj_mqc_t *mqc) {
 	if (mqc->bp != mqc->end) {
@@ -506,22 +495,27 @@
 }
 
 int mqc_decode(opj_mqc_t *mqc) {
-	int d;
 	unsigned int qeval = (*mqc->curctx)->qeval;
 	mqc->a -= qeval;
+	bool tmp = (mqc->a < qeval);
 	qeval <<= 16;
-	if (mqc->c < qeval) {
-		d = mqc_lpsexchange(mqc);
-	} else {
+	if (mqc->c >= qeval) {
 		mqc->c -= qeval;
-		if ((mqc->a & 0x8000) == 0) {
-			d = mqc_mpsexchange(mqc);
-		} else {
+		if (mqc->a & 0x8000) {
 			return (*mqc->curctx)->mps;
 		}
+	}else{
+		tmp = !tmp;
+		mqc->a = (*mqc->curctx)->qeval;
 	}
+
+	opj_mqc_state_t* nmps = (*mqc->curctx)->nmps;
+	opj_mqc_state_t* nlps = (*mqc->curctx)->nlps;
+	int mps = (*mqc->curctx)->mps ^ tmp;
+	*mqc->curctx = tmp ? nlps : nmps;
+
 	mqc_renormd(mqc);
-	return d;
+	return mps;
 }
 
 void mqc_resetstates(opj_mqc_t *mqc) {

openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch:
 t1.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-09 19:26:57.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-09 19:44:25.000000000 -0500
@@ -40,7 +40,7 @@
 /*@{*/
 
 static INLINE char t1_getctxno_zc(int f, int orient);
-static char t1_getctxno_sc(int f);
+static INLINE char t1_getctxno_sc(int f);
 static INLINE int t1_getctxno_mag(int f);
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
@@ -334,6 +334,7 @@
 	
 	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
 	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+		*flagsp |= T1_VISIT;
 		if (type == T1_TYPE_RAW) {
 			if (raw_decode(raw)) {
 				v = raw_decode(raw);	/* ESSAI */
@@ -349,7 +350,6 @@
 				t1_updateflags(flagsp, v, t1->flags_stride);
 			}
 		}
-		*flagsp |= T1_VISIT;
 	}
 }				/* VSC and  BYPASS by Antonin */
 

openjpeg-20070719svn-t1-x86_64-flags-branchless.patch:
 t1.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE openjpeg-20070719svn-t1-x86_64-flags-branchless.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-06 14:07:59.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-06 15:54:31.000000000 -0500
@@ -669,6 +669,17 @@
 	for (k = 0; k < t1->h; k += 4) {
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
+#ifdef __amd64__
+				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*t1->flags_stride]);
+				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
+				}
+				tmp &= (int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<16)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<32)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<48);
+				agg = !tmp;
+#else
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
 					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
@@ -681,6 +692,7 @@
 					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
 					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
+#endif
 			} else {
 				agg = 0;
 			}

openjpeg-20070821svn-t1-flags-stride.patch:
 t1.c |   59 +++++++++++++++++++++++++++++------------------------------
 t1.h |    1 -
 2 files changed, 29 insertions(+), 31 deletions(-)

--- NEW FILE openjpeg-20070821svn-t1-flags-stride.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:48:09.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:50:29.000000000 -0500
@@ -312,7 +312,7 @@
 			} else {
 				mqc_encode(mqc, v ^ t1_getspb(flag));
 			}
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 		*flagsp |= T1_VISIT;
 	}
@@ -339,7 +339,7 @@
 			if (raw_decode(raw)) {
 				v = raw_decode(raw);	/* ESSAI */
 				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
+				t1_updateflags(flagsp, v, (t1->h+2));
 			}
 		} else {
 			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
@@ -347,7 +347,7 @@
 				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 				v = mqc_decode(mqc) ^ t1_getspb(flag);
 				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
+				t1_updateflags(flagsp, v, (t1->h+2));
 			}
 		}
 	}
@@ -370,7 +370,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_sigpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -400,7 +400,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_sigpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -483,7 +483,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_refpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						bpno,
 						one,
@@ -512,7 +512,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_refpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						poshalf,
 						neghalf,
@@ -552,7 +552,7 @@
 			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 			v = *datap < 0 ? 1 : 0;
 			mqc_encode(mqc, v ^ t1_getspb(flag));
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 	}
 	*flagsp &= ~T1_VISIT;
@@ -582,7 +582,7 @@
 			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 			v = mqc_decode(mqc) ^ t1_getspb(flag);
 			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 	}
 	*flagsp &= ~T1_VISIT;
@@ -605,16 +605,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
 					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -639,7 +639,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_clnpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -670,7 +670,7 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 #ifdef __amd64__
-				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*t1->flags_stride]);
+				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*(t1->h+2)]);
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
 				}
@@ -681,16 +681,16 @@
 				agg = !tmp;
 #else
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
 					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 #endif
 			} else {
@@ -711,7 +711,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_clnpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -779,8 +779,7 @@
 	}
 	memset(t1->data,0,datasize * sizeof(int));
 
-	t1->flags_stride=h+2;
-	flagssize=t1->flags_stride * (w+2);
+	flagssize=(h+2) * (w+2);
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.h OpenJPEG.patched/libopenjpeg/t1.h
--- OpenJPEG.orig/libopenjpeg/t1.h	2007-08-23 05:48:09.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.h	2007-08-23 05:48:37.000000000 -0500
@@ -105,7 +105,6 @@
 	int h;
 	int datasize;
 	int flagssize;
-	int flags_stride;
 } opj_t1_t;
 
 /** @name Exported functions */

openjpeg-20070821svn-t1-remove-macro.patch:
 t1.c |   77 ++++++++++++++++++++++++++++++++-----------------------------------
 t1.h |    2 -
 2 files changed, 37 insertions(+), 42 deletions(-)

--- NEW FILE openjpeg-20070821svn-t1-remove-macro.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:43:10.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:46:31.000000000 -0500
@@ -259,27 +259,24 @@
 }
 
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
-	flag_t *np = flagsp - stride;
-	flag_t *sp = flagsp + stride;
-
 	static const flag_t mod[] = {
-		T1_SIG_S, T1_SIG_S|T1_SGN_S,
 		T1_SIG_E, T1_SIG_E|T1_SGN_E,
-		T1_SIG_W, T1_SIG_W|T1_SGN_W,
-		T1_SIG_N, T1_SIG_N|T1_SGN_N
+		T1_SIG_S, T1_SIG_S|T1_SGN_S,
+		T1_SIG_N, T1_SIG_N|T1_SGN_N,
+		T1_SIG_W, T1_SIG_W|T1_SGN_W
 	};
 
-	np[-1] |= T1_SIG_SE;
-	np[0]  |= mod[s];
-	np[1]  |= T1_SIG_SW;
+	flagsp[-1 - stride] |= T1_SIG_SE;
+	flagsp[ 0 - stride] |= mod[s];
+	flagsp[ 1 - stride] |= T1_SIG_NE;
 
 	flagsp[-1] |= mod[s+2];
-	flagsp[0]  |= T1_SIG;
-	flagsp[1]  |= mod[s+4];
+	flagsp[ 0] |= T1_SIG;
+	flagsp[ 1] |= mod[s+4];
 
-	sp[-1] |= T1_SIG_NE;
-	sp[0]  |= mod[s+6];
-	sp[1]  |= T1_SIG_NW;
+	flagsp[-1 + stride] |= T1_SIG_SW;
+	flagsp[ 0 + stride] |= mod[s+6];
+	flagsp[ 1 + stride] |= T1_SIG_NW;
 }
 
 static void t1_enc_sigpass_step(
@@ -373,7 +370,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_sigpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -403,7 +400,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_sigpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -486,7 +483,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_refpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						bpno,
 						one,
@@ -515,7 +512,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_refpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						poshalf,
 						neghalf,
@@ -608,16 +605,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -642,7 +639,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_clnpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -673,16 +670,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -702,7 +699,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_clnpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -770,8 +767,8 @@
 	}
 	memset(t1->data,0,datasize * sizeof(int));
 
-	t1->flags_stride=w+2;
-	flagssize=t1->flags_stride * (h+2);
+	t1->flags_stride=h+2;
+	flagssize=t1->flags_stride * (w+2);
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.h OpenJPEG.patched/libopenjpeg/t1.h
--- OpenJPEG.orig/libopenjpeg/t1.h	2007-05-22 08:14:13.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.h	2007-08-23 05:44:00.000000000 -0500
@@ -108,8 +108,6 @@
 	int flags_stride;
 } opj_t1_t;
 
-#define MACRO_t1_flags(x,y) t1->flags[((x)*(t1->flags_stride))+(y)]
-
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */

openjpeg-20070821svn-t1-updateflags-x86_64.patch:
 t1.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

--- NEW FILE openjpeg-20070821svn-t1-updateflags-x86_64.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:53:17.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:56:33.000000000 -0500
@@ -45,7 +45,11 @@
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
 static short t1_getnmsedec_ref(int x, int bitpos);
+#ifdef __amd64__
+static INLINE void t1_updateflags(flag_t *flagsp, int s, int stride);
+#else
 static void t1_updateflags(flag_t *flagsp, int s, int stride);
+#endif
 /**
 Encode significant pass
 */
@@ -258,6 +262,38 @@
     return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
 }
 
+#ifdef __amd64__
+
+/* On 64 bit platforms we can set three flags at a time. (SWAR) */
+/* FIXME: Assumes little endian? */
+
+#define VEC(x,y,z) (int64)(x)|((int64)(y)<<16)|((int64)(z)<<32)
+
+static void t1_updateflags(flag_t *flagsp, int s, int stride) {
+	static const int64 mod[] = {
+		VEC(T1_SIG_SE,         T1_SIG_E,          T1_SIG_NE),
+		VEC(T1_SIG_SE,         T1_SIG_E|T1_SGN_E, T1_SIG_NE),
+		VEC(T1_SIG_S,          T1_SIG,            T1_SIG_N),
+		VEC(T1_SIG_S|T1_SGN_S, T1_SIG,            T1_SIG_N|T1_SGN_N),
+		VEC(T1_SIG_SW,         T1_SIG_W,          T1_SIG_NW),
+		VEC(T1_SIG_SW,         T1_SIG_W|T1_SGN_W, T1_SIG_NW)
+	};
+
+	int64 tmp1 = *(int64*)((void*)&flagsp[-1 - stride]);
+	int64 tmp2 = *(int64*)((void*)&flagsp[-1         ]);
+	int64 tmp3 = *(int64*)((void*)&flagsp[-1 + stride]);
+
+	tmp1 |= mod[s];
+	tmp2 |= mod[s+2];
+	tmp3 |= mod[s+4];
+
+	*(int64*)((void*)&flagsp[-1 - stride]) = tmp1;
+	*(int64*)((void*)&flagsp[-1         ]) = tmp2;
+	*(int64*)((void*)&flagsp[-1 + stride]) = tmp3;
+}
+
+#else
+
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
 	static const flag_t mod[] = {
 		T1_SIG_E, T1_SIG_E|T1_SGN_E,
@@ -279,6 +315,8 @@
 	flagsp[ 1 + stride] |= T1_SIG_NW;
 }
 
+#endif
+
 static void t1_enc_sigpass_step(
 		opj_t1_t *t1,
 		flag_t *flagsp,
@@ -670,6 +708,8 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 #ifdef __amd64__
+				/* 64 bit SWAR */
+				/* FIXME: Assumes little endian? */
 				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*(t1->h+2)]);
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
@@ -780,6 +820,11 @@
 	memset(t1->data,0,datasize * sizeof(int));
 
 	flagssize=(h+2) * (w+2);
+#ifdef __amd64__
+	/* 64 bit SIMD/SWAR in t1_updateflags requires one short of headroom
+	   because three shorts = 48 bits. */
+	++flagssize;
+#endif
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);

openjpeg-svn468-mj2-noscroll.patch:
 frames_to_mj2.c |    4 ++--
 mj2_to_frames.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openjpeg-svn468-mj2-noscroll.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.patched/mj2/frames_to_mj2.c OpenJPEG.foo/mj2/frames_to_mj2.c
--- OpenJPEG.patched/mj2/frames_to_mj2.c	2007-10-18 07:26:11.000000000 -0500
+++ OpenJPEG.foo/mj2/frames_to_mj2.c	2007-11-03 22:48:45.000000000 -0500
@@ -758,7 +758,7 @@
 				fwrite(buf, 1, len+8, mj2file);				
 				offset += len+8;				
 				elapsed_time = opj_clock()-init_time;
-				fprintf(stderr, "Frame number %d/%d encoded in %.2f mseconds\n", sampleno + 1, numframes, elapsed_time*1000);
+				fprintf(stderr, "Frame number %d/%d encoded in %.2f mseconds \r", sampleno + 1, numframes, elapsed_time*1000);
 				total_time += elapsed_time;
 
       }
@@ -787,7 +787,7 @@
   fwrite(buf,cio_tell(cio),1,mj2file);
   free(buf);
 
-	fprintf(stdout,"Total encoding time: %.2f s for %d frames (%.1f fps)\n", total_time, numframes, (float)numframes/total_time);
+	fprintf(stdout,"\nTotal encoding time: %.2f s for %d frames (%.1f fps)\n", total_time, numframes, (float)numframes/total_time);
   
   // Ending program 
   
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.patched/mj2/mj2_to_frames.c OpenJPEG.foo/mj2/mj2_to_frames.c
--- OpenJPEG.patched/mj2/mj2_to_frames.c	2007-10-18 07:26:11.000000000 -0500
+++ OpenJPEG.foo/mj2/mj2_to_frames.c	2007-11-03 22:48:45.000000000 -0500
@@ -204,7 +204,7 @@
 		/* free image data structure */
 		opj_image_destroy(img);
 		elapsed_time = opj_clock()-init_time;
-		fprintf(stderr, "Frame number %d/%d decoded in %.2f mseconds\n", snum + 1, numframes, elapsed_time*1000);
+		fprintf(stderr, "Frame number %d/%d decoded in %.2f mseconds \r", snum + 1, numframes, elapsed_time*1000);
 		total_time += elapsed_time;
 
   }
@@ -218,7 +218,7 @@
 	}
 	free(dinfo);
 	
-	fprintf(stdout, "%d frame(s) correctly decompressed\n", snum);
+	fprintf(stdout, "\n%d frame(s) correctly decompressed\n", snum);
 	fprintf(stdout,"Total decoding time: %.2f seconds (%.1f fps)\n", total_time, (float)numframes/total_time);
 		
   return 0;

openjpeg-svn470-t1-flags-mmx.patch:
 t1.c |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 12 deletions(-)

--- NEW FILE openjpeg-svn470-t1-flags-mmx.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-11-13 13:52:05.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-11-14 01:09:40.000000000 -0600
@@ -33,6 +33,17 @@
 #include "opj_includes.h"
 #include "t1_luts.h"
 
+/* Don't use MMX on amd64 */
+/* Note that merely including mmintrin.h, even if we don't use it, changes the code gcc */
+/* outputs on amd64, and it is measurably slower. A bug in gcc? */
+#ifdef __amd64__
+#undef __MMX__
+#endif
+
+#ifdef __MMX__
+#include <mmintrin.h>
+#endif
+
 /** @defgroup T1 T1 - Implementation of the tier-1 coding */
 /*@{*/
 
@@ -45,7 +56,7 @@
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
 static short t1_getnmsedec_ref(int x, int bitpos);
-#ifdef __amd64__
+#if defined(__amd64__) || defined(__MMX__)
 static INLINE void t1_updateflags(flag_t *flagsp, int s, int stride);
 #else
 static void t1_updateflags(flag_t *flagsp, int s, int stride);
@@ -293,6 +304,32 @@
 }
 
 #else
+#ifdef __MMX__
+
+static void t1_updateflags(flag_t *flagsp, int s, int stride) {
+	static const __v4hi mod[] = {
+		{T1_SIG_SE,         T1_SIG_E,          T1_SIG_NE,         0},
+		{T1_SIG_SE,         T1_SIG_E|T1_SGN_E, T1_SIG_NE,         0},
+		{T1_SIG_S,          T1_SIG,            T1_SIG_N,          0},
+		{T1_SIG_S|T1_SGN_S, T1_SIG,            T1_SIG_N|T1_SGN_N, 0},
+		{T1_SIG_SW,         T1_SIG_W,          T1_SIG_NW,         0},
+		{T1_SIG_SW,         T1_SIG_W|T1_SGN_W, T1_SIG_NW,         0}
+	};
+
+	__m64 tmp1 = *(__m64*)((void*)&flagsp[-1 - stride]);
+	__m64 tmp2 = *(__m64*)((void*)&flagsp[-1         ]);
+	__m64 tmp3 = *(__m64*)((void*)&flagsp[-1 + stride]);
+
+	tmp1 = _mm_or_si64(tmp1, mod[s]);
+	tmp2 = _mm_or_si64(tmp2, mod[s+2]);
+	tmp3 = _mm_or_si64(tmp3, mod[s+4]);
+
+	*(__m64*)((void*)&flagsp[-1 - stride]) = tmp1;
+	*(__m64*)((void*)&flagsp[-1         ]) = tmp2;
+	*(__m64*)((void*)&flagsp[-1 + stride]) = tmp3;
+}
+
+#else
 
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
 	static const flag_t mod[] = {
@@ -316,6 +353,7 @@
 }
 
 #endif
+#endif
 
 static void t1_enc_sigpass_step(
 		opj_t1_t *t1,
@@ -720,18 +758,14 @@
 				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<48);
 				agg = !tmp;
 #else
+				int* flagsp = (int*)&t1->flags[(k+1) + (i+1)*(t1->h+2)];
+				agg = flagsp[1];
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
-					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg &= ~((T1_SIG_S|T1_SIG_SE|T1_SIG_SW|T1_SGN_S)<<16);
 				}
+				agg |= flagsp[0];
+				agg &= (T1_SIG|T1_VISIT|T1_SIG_OTH)|(T1_SIG|T1_VISIT|T1_SIG_OTH)<<16;
+				agg = !agg;
 #endif
 			} else {
 				agg = 0;
@@ -820,7 +854,7 @@
 	memset(t1->data,0,datasize * sizeof(int));
 
 	flagssize=(h+2) * (w+2);
-#ifdef __amd64__
+#if defined(__amd64__) || defined(__MMX__)
 	/* 64 bit SIMD/SWAR in t1_updateflags requires one short of headroom
 	   because three shorts = 48 bits. */
 	++flagssize;
@@ -886,6 +920,9 @@
 		int correction = 3;
 		type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
 		
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 		switch (passtype) {
 			case 0:
 				t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
@@ -900,6 +937,9 @@
 					mqc_segmark_enc(mqc);
 				break;
 		}
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 		
 		/* fixed_quality */
 		cumwmsedec += t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps);
@@ -1004,6 +1044,9 @@
 	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
 	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 	
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 	for (segno = 0; segno < cblk->numsegs; ++segno) {
 		opj_tcd_seg_t *seg = &cblk->segs[segno];
 		
@@ -1044,6 +1087,9 @@
 			}
 		}
 	}
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 }
 
 /* ----------------------------------------------------------------------- */

openjpeg-svn480-cmake.patch:
 CMakeLists.txt             |    9 +++++++--
 libopenjpeg/CMakeLists.txt |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE openjpeg-svn480-cmake.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/CMakeLists.txt OpenJPEG.patched/CMakeLists.txt
--- OpenJPEG.orig/CMakeLists.txt	2007-09-25 09:54:49.000000000 -0500
+++ OpenJPEG.patched/CMakeLists.txt	2007-09-26 00:34:22.000000000 -0500
@@ -24,6 +24,7 @@
 
 #-----------------------------------------------------------------------------
 # OPENJPEG version number, useful for packaging and doxygen doc:
+SET(OPENJPEG_SOVERSION 2)
 SET(OPENJPEG_VERSION_MAJOR 1)
 SET(OPENJPEG_VERSION_MINOR 2)
 SET(OPENJPEG_VERSION_BUILD 0)
@@ -33,8 +34,8 @@
 # This setting of SOVERSION assumes that any API change
 # will increment either the minor or major version number of openjpeg
 SET(OPENJPEG_LIBRARY_PROPERTIES
-  VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
-  SOVERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}"
+  VERSION   "${OPENJPEG_SOVERSION}.${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
+  SOVERSION ${OPENJPEG_SOVERSION}
 )
 
 
@@ -116,6 +117,10 @@
   $ENV{JPEG2000_CONFORMANCE_DATA_ROOT}
 )
 
+IF(NOT CMAKE_INSTALL_LIBDIR)
+SET(CMAKE_INSTALL_LIBDIR lib)
+ENDIF(NOT CMAKE_INSTALL_LIBDIR)
+
 #-----------------------------------------------------------------------------
 # Compiler specific flags:
 IF(CMAKE_COMPILER_IS_GNUCC)
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/CMakeLists.txt OpenJPEG.patched/libopenjpeg/CMakeLists.txt
--- OpenJPEG.orig/libopenjpeg/CMakeLists.txt	2007-09-25 09:54:49.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/CMakeLists.txt	2007-09-26 00:31:12.000000000 -0500
@@ -37,7 +37,7 @@
 
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
-	DESTINATION lib)
+	DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 # Install includes files
 INSTALL(FILES openjpeg.h

openjpeg-svn480-use-stdbool.patch:
 openjpeg.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openjpeg-svn480-use-stdbool.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/openjpeg.h OpenJPEG.patched/libopenjpeg/openjpeg.h
--- OpenJPEG.orig/libopenjpeg/openjpeg.h	2007-11-14 05:34:48.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/openjpeg.h	2007-11-16 20:41:53.000000000 -0600
@@ -61,7 +61,7 @@
 #endif /* !OPJ_STATIC || !WIN32 */
 
 #ifndef __cplusplus
-#if defined(HAVE_STDBOOL_H)
+#if 1
 /*
 The C language implementation does correctly provide the standard header
 file "stdbool.h".


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-openjpeg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:37:12 -0000	1.1
+++ .cvsignore	7 Dec 2009 00:28:52 -0000	1.2
@@ -0,0 +1 @@
+openjpeg_v1_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-openjpeg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:37:12 -0000	1.1
+++ sources	7 Dec 2009 00:28:53 -0000	1.2
@@ -0,0 +1 @@
+f9a3ccfa91ac34b589e9bf7577ce8ff9  openjpeg_v1_3.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 00:29:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:29:24 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Pager/devel perl-Class-DBI-Pager.spec,1.9,1.10
Message-ID: <20091207002924.914B511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-Pager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20580

Modified Files:
	perl-Class-DBI-Pager.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Pager/devel/perl-Class-DBI-Pager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-DBI-Pager.spec	26 Jul 2009 04:25:07 -0000	1.9
+++ perl-Class-DBI-Pager.spec	7 Dec 2009 00:29:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Pager
 Version:        0.08
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From agoode at fedoraproject.org  Mon Dec  7 00:31:31 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Mon,  7 Dec 2009 00:31:31 +0000 (UTC)
Subject: rpms/mingw32-openjpeg/F-12 mingw32-openjpeg.spec, NONE,
	1.1 openjpeg-1.3-libm.patch, NONE,
	1.1 openjpeg-1.3-mingw32-cmake.patch, NONE,
	1.1 openjpeg-1.3-reverse-bogus-aligned-malloc.patch, NONE,
	1.1 openjpeg-1.3-tcd_init_encode-alloc-fix.patch, NONE,
	1.1 openjpeg-20070717svn-codec-libtiff.patch, NONE,
	1.1 openjpeg-20070717svn-mqc-optimize.patch, NONE,
	1.1 openjpeg-20070719svn-mqc-more-optimize.patch, NONE,
	1.1 openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch,
	NONE, 1.1 openjpeg-20070719svn-t1-x86_64-flags-branchless.patch,
	NONE, 1.1 openjpeg-20070821svn-t1-flags-stride.patch, NONE,
	1.1 openjpeg-20070821svn-t1-remove-macro.patch, NONE,
	1.1 openjpeg-20070821svn-t1-updateflags-x86_64.patch, NONE,
	1.1 openjpeg-svn468-mj2-noscroll.patch, NONE,
	1.1 openjpeg-svn470-t1-flags-mmx.patch, NONE,
	1.1 openjpeg-svn480-cmake.patch, NONE,
	1.1 openjpeg-svn480-use-stdbool.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207003131.A438111C00E0@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mingw32-openjpeg/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21270

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-openjpeg.spec openjpeg-1.3-libm.patch 
	openjpeg-1.3-mingw32-cmake.patch 
	openjpeg-1.3-reverse-bogus-aligned-malloc.patch 
	openjpeg-1.3-tcd_init_encode-alloc-fix.patch 
	openjpeg-20070717svn-codec-libtiff.patch 
	openjpeg-20070717svn-mqc-optimize.patch 
	openjpeg-20070719svn-mqc-more-optimize.patch 
	openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch 
	openjpeg-20070719svn-t1-x86_64-flags-branchless.patch 
	openjpeg-20070821svn-t1-flags-stride.patch 
	openjpeg-20070821svn-t1-remove-macro.patch 
	openjpeg-20070821svn-t1-updateflags-x86_64.patch 
	openjpeg-svn468-mj2-noscroll.patch 
	openjpeg-svn470-t1-flags-mmx.patch openjpeg-svn480-cmake.patch 
	openjpeg-svn480-use-stdbool.patch 
Log Message:
* Mon Nov 16 2009 Adam Goode <adam at spicenitz.org> - 1.3-5
- Initial release, tracking Fedora native openjpeg-1.3-5



--- NEW FILE mingw32-openjpeg.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}

# reset patch fuzz, rebasing patches will require delicate surgery -- Rex
%global _default_patch_fuzz 2

Name:    mingw32-openjpeg
Version: 1.3
Release: 5%{?dist}
Summary: MinGW Windows openjpeg library

Group:     Development/Libraries
License:   BSD
URL:       http://www.openjpeg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: cmake

BuildRequires: mingw32-filesystem >= 52
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-libtiff

Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz

# Patches from native Fedora package:
Patch1: openjpeg-20070717svn-codec-libtiff.patch
Patch4: openjpeg-svn480-cmake.patch
Patch5: openjpeg-svn480-use-stdbool.patch
Patch6: openjpeg-1.3-tcd_init_encode-alloc-fix.patch
Patch7: openjpeg-1.3-reverse-bogus-aligned-malloc.patch
Patch44: openjpeg-svn468-mj2-noscroll.patch
Patch21: openjpeg-20070717svn-mqc-optimize.patch
Patch22: openjpeg-20070821svn-t1-remove-macro.patch
Patch23: openjpeg-20070719svn-t1-x86_64-flags-branchless.patch
Patch24: openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch
Patch25: openjpeg-20070821svn-t1-flags-stride.patch
Patch26: openjpeg-20070821svn-t1-updateflags-x86_64.patch
Patch27: openjpeg-svn470-t1-flags-mmx.patch
Patch28: openjpeg-20070719svn-mqc-more-optimize.patch

# libopenjpeg has undefined references, http://bugzilla.redhat.com/467661
Patch50: openjpeg-1.3-libm.patch

# Patches for MinGW:
Patch1000: openjpeg-1.3-mingw32-cmake.patch


%description
%{_mingw32_description}


%{_mingw32_debug_package}


%prep
%setup -q -n OpenJPEG_v1_3
# Make sure we use system libraries
rm -rf libs
%patch1 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch44 -p1
%patch22 -p1
%patch23 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch24 -p1
%patch21 -p1
%patch28 -p1
%patch50 -p1 -b .libm

%patch1000 -p1

# Fix permissions
chmod a-x ChangeLog license.txt


%build
mkdir build
pushd build
export MINGW32_CFLAGS="%{_mingw32_cflags} -DWIN32"
%{_mingw32_cmake} ..
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT
pushd build
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libopenjpeg.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
popd

# HACK: until pkg-config support lands, temporarily provide
# openjpeg.h header in legacy location
ln -s openjpeg/openjpeg.h $RPM_BUILD_ROOT%{_mingw32_includedir}/openjpeg.h


%check
# mostly pointless without test images, but it's a start -- Rex
make test -C build


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc license.txt
%{_mingw32_includedir}/openjpeg.h
%{_mingw32_includedir}/openjpeg
%{_mingw32_bindir}/libopenjpeg.dll
%{_mingw32_libdir}/libopenjpeg.dll.a


%changelog
* Mon Nov 16 2009 Adam Goode <adam at spicenitz.org> - 1.3-5
- Initial release, tracking Fedora native openjpeg-1.3-5

openjpeg-1.3-libm.patch:
 codec/CMakeLists.txt       |    4 ----
 libopenjpeg/CMakeLists.txt |    5 +++++
 mj2/CMakeLists.txt         |   12 ------------
 3 files changed, 5 insertions(+), 16 deletions(-)

--- NEW FILE openjpeg-1.3-libm.patch ---
diff -up OpenJPEG_v1_3/codec/CMakeLists.txt.libm OpenJPEG_v1_3/codec/CMakeLists.txt
--- OpenJPEG_v1_3/codec/CMakeLists.txt.libm	2007-11-27 06:38:52.000000000 -0600
+++ OpenJPEG_v1_3/codec/CMakeLists.txt	2009-06-19 09:20:59.473980422 -0500
@@ -46,10 +46,6 @@ FOREACH(exe j2k_to_image image_to_j2k)
   ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
   # calling those exe without option will make them fail always:
   SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)
-  # On unix you need to link to the math library:
-  IF(UNIX)
-    TARGET_LINK_LIBRARIES(${exe} m)
-  ENDIF(UNIX)
   # Install exe
   INSTALL_TARGETS(/bin/ ${exe})
 ENDFOREACH(exe)
diff -up OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt.libm OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt
--- OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt.libm	2009-06-19 09:18:44.021229314 -0500
+++ OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt	2009-06-19 09:18:44.074248015 -0500
@@ -35,6 +35,11 @@ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${O
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
 	${OPENJPEG_LIBRARY_PROPERTIES})
 
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
+  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} LINK_INTERFACE_LIBRARIES)
+ENDIF(UNIX)
+
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
 	DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff -up OpenJPEG_v1_3/mj2/CMakeLists.txt.libm OpenJPEG_v1_3/mj2/CMakeLists.txt
--- OpenJPEG_v1_3/mj2/CMakeLists.txt.libm	2007-09-12 04:04:03.000000000 -0500
+++ OpenJPEG_v1_3/mj2/CMakeLists.txt	2009-06-19 09:18:44.074248015 -0500
@@ -10,33 +10,21 @@ ADD_EXECUTABLE(frames_to_mj2
   compat/getopt.c 
   mj2_convert.c mj2.c )
 TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(frames_to_mj2 m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(mj2_to_frames
     mj2_to_frames.c
     compat/getopt.c mj2_convert.c mj2.c )
 TARGET_LINK_LIBRARIES(mj2_to_frames ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(mj2_to_frames m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(extract_j2k_from_mj2
     extract_j2k_from_mj2.c
     mj2.c )
 TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(wrap_j2k_in_mj2
     wrap_j2k_in_mj2.c
     mj2.c )
 TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m)
-ENDIF(UNIX)
 
 INSTALL(TARGETS frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
 	DESTINATION bin)

openjpeg-1.3-mingw32-cmake.patch:
 CMakeLists.txt |    9 ---------
 1 file changed, 9 deletions(-)

--- NEW FILE openjpeg-1.3-mingw32-cmake.patch ---
diff -ur OpenJPEG_v1_3~/CMakeLists.txt OpenJPEG_v1_3/CMakeLists.txt
--- OpenJPEG_v1_3~/CMakeLists.txt	2009-06-03 09:40:53.000000000 -0400
+++ OpenJPEG_v1_3/CMakeLists.txt	2009-06-03 09:41:28.000000000 -0400
@@ -67,19 +67,10 @@
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 SUBDIRS(
   libopenjpeg
-  mj2
   # cmake 2.4.5 has poor java support
   #j2kviewer/src
   )
 
-IF(NOT UNIX)
-SUBDIRS(
-  jpwl
-  jp3d
-  indexer_JPIP
-  )
-ENDIF(NOT UNIX)
-
 #-----------------------------------------------------------------------------
 # Build example only if requested
 IF(BUILD_EXAMPLES)

openjpeg-1.3-reverse-bogus-aligned-malloc.patch:
 opj_malloc.h |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE openjpeg-1.3-reverse-bogus-aligned-malloc.patch ---
--- OpenJPEG_v1_3/libopenjpeg/opj_malloc.h	2007-12-21 04:19:01.000000000 -0600
+++ trunk/libopenjpeg/opj_malloc.h	2007-10-18 07:26:11.000000000 -0500
@@ -75,9 +75,6 @@
 #else /* Not WIN32 */
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
-		#elif defined(__GNUC__)
-			#define HAVE_MEMALIGN
-			#include <malloc.h>		
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
 		#elif !defined(__amd64__) && !defined(__APPLE__)	
 			/* FIXME: Yes, this is a big assumption */
@@ -85,8 +82,6 @@
 	#endif
 #endif
 
-
-
 #define opj_aligned_malloc(size) malloc(size)
 #define opj_aligned_free(m) free(m)
 

openjpeg-1.3-tcd_init_encode-alloc-fix.patch:
 tcd.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openjpeg-1.3-tcd_init_encode-alloc-fix.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/tcd.c OpenJPEG.patched/libopenjpeg/tcd.c
--- OpenJPEG.orig/libopenjpeg/tcd.c	2007-12-19 06:28:40.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/tcd.c	2007-12-27 21:58:57.000000000 -0600
@@ -584,7 +584,9 @@
 							cblk->y0 = int_max(cblkystart, prc->y0);
 							cblk->x1 = int_min(cblkxend, prc->x1);
 							cblk->y1 = int_min(cblkyend, prc->y1);
-							cblk->data = (unsigned char*) opj_calloc(8192, sizeof(unsigned char));
+							cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
+							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
+							cblk->data += 2;
 							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
 							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
 						}

openjpeg-20070717svn-codec-libtiff.patch:
 convert.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openjpeg-20070717svn-codec-libtiff.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/codec/convert.c OpenJPEG.patched/codec/convert.c
--- OpenJPEG.orig/codec/convert.c	2007-07-17 11:19:41.000000000 -0500
+++ OpenJPEG.patched/codec/convert.c	2007-07-17 19:40:02.000000000 -0500
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "openjpeg.h"
-#include "../libs/libtiff/tiffio.h"
+#include "tiffio.h"
 #include "convert.h"
 
 /*

openjpeg-20070717svn-mqc-optimize.patch:
 mqc.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE openjpeg-20070717svn-mqc-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/mqc.c OpenJPEG.patched/libopenjpeg/mqc.c
--- OpenJPEG.orig/libopenjpeg/mqc.c	2007-07-17 20:07:22.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/mqc.c	2007-07-17 20:07:44.000000000 -0500
@@ -507,20 +507,20 @@
 
 int mqc_decode(opj_mqc_t *mqc) {
 	int d;
-	mqc->a -= (*mqc->curctx)->qeval;
-	if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
+	unsigned int qeval = (*mqc->curctx)->qeval;
+	mqc->a -= qeval;
+	qeval <<= 16;
+	if (mqc->c < qeval) {
 		d = mqc_lpsexchange(mqc);
-		mqc_renormd(mqc);
 	} else {
-		mqc->c -= (*mqc->curctx)->qeval << 16;
+		mqc->c -= qeval;
 		if ((mqc->a & 0x8000) == 0) {
 			d = mqc_mpsexchange(mqc);
-			mqc_renormd(mqc);
 		} else {
-			d = (*mqc->curctx)->mps;
+			return (*mqc->curctx)->mps;
 		}
 	}
-
+	mqc_renormd(mqc);
 	return d;
 }
 

openjpeg-20070719svn-mqc-more-optimize.patch:
 mqc.c |   58 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

--- NEW FILE openjpeg-20070719svn-mqc-more-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/mqc.c OpenJPEG.patched/libopenjpeg/mqc.c
--- OpenJPEG.orig/libopenjpeg/mqc.c	2007-08-06 16:16:00.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/mqc.c	2007-08-06 19:07:28.000000000 -0500
@@ -68,13 +68,13 @@
 @param mqc MQC handle
 @return 
 */
-static int mqc_mpsexchange(opj_mqc_t *mqc);
+//static int mqc_mpsexchange(opj_mqc_t *mqc);
 /**
 FIXME: documentation ???
 @param mqc MQC handle
 @return 
 */
-static int mqc_lpsexchange(opj_mqc_t *mqc);
+//static int mqc_lpsexchange(opj_mqc_t *mqc);
 /**
 Input a byte
 @param mqc MQC handle
@@ -271,33 +271,22 @@
 	}
 }
 
+/*
 static int mqc_mpsexchange(opj_mqc_t *mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	} else {
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	}
-	
-	return d;
+	int d = (*mqc->curctx)->mps;
+	int tmp = (mqc->a < (*mqc->curctx)->qeval);
+	*mqc->curctx = tmp ? (*mqc->curctx)->nlps : (*mqc->curctx)->nmps;
+	return tmp ^ d;
 }
 
 static int mqc_lpsexchange(opj_mqc_t *mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	} else {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	}
-	
-	return d;
+	int d = (*mqc->curctx)->mps;
+	int tmp = !(mqc->a < (*mqc->curctx)->qeval);
+	mqc->a = (*mqc->curctx)->qeval;
+	*mqc->curctx = tmp ? (*mqc->curctx)->nlps : (*mqc->curctx)->nmps;
+	return tmp ^ d;
 }
+*/
 
 static void mqc_bytein(opj_mqc_t *mqc) {
 	if (mqc->bp != mqc->end) {
@@ -506,22 +495,27 @@
 }
 
 int mqc_decode(opj_mqc_t *mqc) {
-	int d;
 	unsigned int qeval = (*mqc->curctx)->qeval;
 	mqc->a -= qeval;
+	bool tmp = (mqc->a < qeval);
 	qeval <<= 16;
-	if (mqc->c < qeval) {
-		d = mqc_lpsexchange(mqc);
-	} else {
+	if (mqc->c >= qeval) {
 		mqc->c -= qeval;
-		if ((mqc->a & 0x8000) == 0) {
-			d = mqc_mpsexchange(mqc);
-		} else {
+		if (mqc->a & 0x8000) {
 			return (*mqc->curctx)->mps;
 		}
+	}else{
+		tmp = !tmp;
+		mqc->a = (*mqc->curctx)->qeval;
 	}
+
+	opj_mqc_state_t* nmps = (*mqc->curctx)->nmps;
+	opj_mqc_state_t* nlps = (*mqc->curctx)->nlps;
+	int mps = (*mqc->curctx)->mps ^ tmp;
+	*mqc->curctx = tmp ? nlps : nmps;
+
 	mqc_renormd(mqc);
-	return d;
+	return mps;
 }
 
 void mqc_resetstates(opj_mqc_t *mqc) {

openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch:
 t1.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-09 19:26:57.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-09 19:44:25.000000000 -0500
@@ -40,7 +40,7 @@
 /*@{*/
 
 static INLINE char t1_getctxno_zc(int f, int orient);
-static char t1_getctxno_sc(int f);
+static INLINE char t1_getctxno_sc(int f);
 static INLINE int t1_getctxno_mag(int f);
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
@@ -334,6 +334,7 @@
 	
 	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
 	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+		*flagsp |= T1_VISIT;
 		if (type == T1_TYPE_RAW) {
 			if (raw_decode(raw)) {
 				v = raw_decode(raw);	/* ESSAI */
@@ -349,7 +350,6 @@
 				t1_updateflags(flagsp, v, t1->flags_stride);
 			}
 		}
-		*flagsp |= T1_VISIT;
 	}
 }				/* VSC and  BYPASS by Antonin */
 

openjpeg-20070719svn-t1-x86_64-flags-branchless.patch:
 t1.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE openjpeg-20070719svn-t1-x86_64-flags-branchless.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-06 14:07:59.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-06 15:54:31.000000000 -0500
@@ -669,6 +669,17 @@
 	for (k = 0; k < t1->h; k += 4) {
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
+#ifdef __amd64__
+				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*t1->flags_stride]);
+				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
+				}
+				tmp &= (int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<16)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<32)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<48);
+				agg = !tmp;
+#else
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
 					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
@@ -681,6 +692,7 @@
 					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
 					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
+#endif
 			} else {
 				agg = 0;
 			}

openjpeg-20070821svn-t1-flags-stride.patch:
 t1.c |   59 +++++++++++++++++++++++++++++------------------------------
 t1.h |    1 -
 2 files changed, 29 insertions(+), 31 deletions(-)

--- NEW FILE openjpeg-20070821svn-t1-flags-stride.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:48:09.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:50:29.000000000 -0500
@@ -312,7 +312,7 @@
 			} else {
 				mqc_encode(mqc, v ^ t1_getspb(flag));
 			}
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 		*flagsp |= T1_VISIT;
 	}
@@ -339,7 +339,7 @@
 			if (raw_decode(raw)) {
 				v = raw_decode(raw);	/* ESSAI */
 				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
+				t1_updateflags(flagsp, v, (t1->h+2));
 			}
 		} else {
 			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
@@ -347,7 +347,7 @@
 				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 				v = mqc_decode(mqc) ^ t1_getspb(flag);
 				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
+				t1_updateflags(flagsp, v, (t1->h+2));
 			}
 		}
 	}
@@ -370,7 +370,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_sigpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -400,7 +400,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_sigpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -483,7 +483,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_refpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						bpno,
 						one,
@@ -512,7 +512,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_refpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						poshalf,
 						neghalf,
@@ -552,7 +552,7 @@
 			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 			v = *datap < 0 ? 1 : 0;
 			mqc_encode(mqc, v ^ t1_getspb(flag));
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 	}
 	*flagsp &= ~T1_VISIT;
@@ -582,7 +582,7 @@
 			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 			v = mqc_decode(mqc) ^ t1_getspb(flag);
 			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 	}
 	*flagsp &= ~T1_VISIT;
@@ -605,16 +605,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
 					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -639,7 +639,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_clnpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -670,7 +670,7 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 #ifdef __amd64__
-				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*t1->flags_stride]);
+				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*(t1->h+2)]);
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
 				}
@@ -681,16 +681,16 @@
 				agg = !tmp;
 #else
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
 					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 #endif
 			} else {
@@ -711,7 +711,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_clnpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -779,8 +779,7 @@
 	}
 	memset(t1->data,0,datasize * sizeof(int));
 
-	t1->flags_stride=h+2;
-	flagssize=t1->flags_stride * (w+2);
+	flagssize=(h+2) * (w+2);
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.h OpenJPEG.patched/libopenjpeg/t1.h
--- OpenJPEG.orig/libopenjpeg/t1.h	2007-08-23 05:48:09.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.h	2007-08-23 05:48:37.000000000 -0500
@@ -105,7 +105,6 @@
 	int h;
 	int datasize;
 	int flagssize;
-	int flags_stride;
 } opj_t1_t;
 
 /** @name Exported functions */

openjpeg-20070821svn-t1-remove-macro.patch:
 t1.c |   77 ++++++++++++++++++++++++++++++++-----------------------------------
 t1.h |    2 -
 2 files changed, 37 insertions(+), 42 deletions(-)

--- NEW FILE openjpeg-20070821svn-t1-remove-macro.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:43:10.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:46:31.000000000 -0500
@@ -259,27 +259,24 @@
 }
 
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
-	flag_t *np = flagsp - stride;
-	flag_t *sp = flagsp + stride;
-
 	static const flag_t mod[] = {
-		T1_SIG_S, T1_SIG_S|T1_SGN_S,
 		T1_SIG_E, T1_SIG_E|T1_SGN_E,
-		T1_SIG_W, T1_SIG_W|T1_SGN_W,
-		T1_SIG_N, T1_SIG_N|T1_SGN_N
+		T1_SIG_S, T1_SIG_S|T1_SGN_S,
+		T1_SIG_N, T1_SIG_N|T1_SGN_N,
+		T1_SIG_W, T1_SIG_W|T1_SGN_W
 	};
 
-	np[-1] |= T1_SIG_SE;
-	np[0]  |= mod[s];
-	np[1]  |= T1_SIG_SW;
+	flagsp[-1 - stride] |= T1_SIG_SE;
+	flagsp[ 0 - stride] |= mod[s];
+	flagsp[ 1 - stride] |= T1_SIG_NE;
 
 	flagsp[-1] |= mod[s+2];
-	flagsp[0]  |= T1_SIG;
-	flagsp[1]  |= mod[s+4];
+	flagsp[ 0] |= T1_SIG;
+	flagsp[ 1] |= mod[s+4];
 
-	sp[-1] |= T1_SIG_NE;
-	sp[0]  |= mod[s+6];
-	sp[1]  |= T1_SIG_NW;
+	flagsp[-1 + stride] |= T1_SIG_SW;
+	flagsp[ 0 + stride] |= mod[s+6];
+	flagsp[ 1 + stride] |= T1_SIG_NW;
 }
 
 static void t1_enc_sigpass_step(
@@ -373,7 +370,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_sigpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -403,7 +400,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_sigpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -486,7 +483,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_refpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						bpno,
 						one,
@@ -515,7 +512,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_refpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						poshalf,
 						neghalf,
@@ -608,16 +605,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -642,7 +639,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_clnpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -673,16 +670,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -702,7 +699,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_clnpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -770,8 +767,8 @@
 	}
 	memset(t1->data,0,datasize * sizeof(int));
 
-	t1->flags_stride=w+2;
-	flagssize=t1->flags_stride * (h+2);
+	t1->flags_stride=h+2;
+	flagssize=t1->flags_stride * (w+2);
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.h OpenJPEG.patched/libopenjpeg/t1.h
--- OpenJPEG.orig/libopenjpeg/t1.h	2007-05-22 08:14:13.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.h	2007-08-23 05:44:00.000000000 -0500
@@ -108,8 +108,6 @@
 	int flags_stride;
 } opj_t1_t;
 
-#define MACRO_t1_flags(x,y) t1->flags[((x)*(t1->flags_stride))+(y)]
-
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */

openjpeg-20070821svn-t1-updateflags-x86_64.patch:
 t1.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

--- NEW FILE openjpeg-20070821svn-t1-updateflags-x86_64.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:53:17.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:56:33.000000000 -0500
@@ -45,7 +45,11 @@
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
 static short t1_getnmsedec_ref(int x, int bitpos);
+#ifdef __amd64__
+static INLINE void t1_updateflags(flag_t *flagsp, int s, int stride);
+#else
 static void t1_updateflags(flag_t *flagsp, int s, int stride);
+#endif
 /**
 Encode significant pass
 */
@@ -258,6 +262,38 @@
     return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
 }
 
+#ifdef __amd64__
+
+/* On 64 bit platforms we can set three flags at a time. (SWAR) */
+/* FIXME: Assumes little endian? */
+
+#define VEC(x,y,z) (int64)(x)|((int64)(y)<<16)|((int64)(z)<<32)
+
+static void t1_updateflags(flag_t *flagsp, int s, int stride) {
+	static const int64 mod[] = {
+		VEC(T1_SIG_SE,         T1_SIG_E,          T1_SIG_NE),
+		VEC(T1_SIG_SE,         T1_SIG_E|T1_SGN_E, T1_SIG_NE),
+		VEC(T1_SIG_S,          T1_SIG,            T1_SIG_N),
+		VEC(T1_SIG_S|T1_SGN_S, T1_SIG,            T1_SIG_N|T1_SGN_N),
+		VEC(T1_SIG_SW,         T1_SIG_W,          T1_SIG_NW),
+		VEC(T1_SIG_SW,         T1_SIG_W|T1_SGN_W, T1_SIG_NW)
+	};
+
+	int64 tmp1 = *(int64*)((void*)&flagsp[-1 - stride]);
+	int64 tmp2 = *(int64*)((void*)&flagsp[-1         ]);
+	int64 tmp3 = *(int64*)((void*)&flagsp[-1 + stride]);
+
+	tmp1 |= mod[s];
+	tmp2 |= mod[s+2];
+	tmp3 |= mod[s+4];
+
+	*(int64*)((void*)&flagsp[-1 - stride]) = tmp1;
+	*(int64*)((void*)&flagsp[-1         ]) = tmp2;
+	*(int64*)((void*)&flagsp[-1 + stride]) = tmp3;
+}
+
+#else
+
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
 	static const flag_t mod[] = {
 		T1_SIG_E, T1_SIG_E|T1_SGN_E,
@@ -279,6 +315,8 @@
 	flagsp[ 1 + stride] |= T1_SIG_NW;
 }
 
+#endif
+
 static void t1_enc_sigpass_step(
 		opj_t1_t *t1,
 		flag_t *flagsp,
@@ -670,6 +708,8 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 #ifdef __amd64__
+				/* 64 bit SWAR */
+				/* FIXME: Assumes little endian? */
 				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*(t1->h+2)]);
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
@@ -780,6 +820,11 @@
 	memset(t1->data,0,datasize * sizeof(int));
 
 	flagssize=(h+2) * (w+2);
+#ifdef __amd64__
+	/* 64 bit SIMD/SWAR in t1_updateflags requires one short of headroom
+	   because three shorts = 48 bits. */
+	++flagssize;
+#endif
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);

openjpeg-svn468-mj2-noscroll.patch:
 frames_to_mj2.c |    4 ++--
 mj2_to_frames.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openjpeg-svn468-mj2-noscroll.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.patched/mj2/frames_to_mj2.c OpenJPEG.foo/mj2/frames_to_mj2.c
--- OpenJPEG.patched/mj2/frames_to_mj2.c	2007-10-18 07:26:11.000000000 -0500
+++ OpenJPEG.foo/mj2/frames_to_mj2.c	2007-11-03 22:48:45.000000000 -0500
@@ -758,7 +758,7 @@
 				fwrite(buf, 1, len+8, mj2file);				
 				offset += len+8;				
 				elapsed_time = opj_clock()-init_time;
-				fprintf(stderr, "Frame number %d/%d encoded in %.2f mseconds\n", sampleno + 1, numframes, elapsed_time*1000);
+				fprintf(stderr, "Frame number %d/%d encoded in %.2f mseconds \r", sampleno + 1, numframes, elapsed_time*1000);
 				total_time += elapsed_time;
 
       }
@@ -787,7 +787,7 @@
   fwrite(buf,cio_tell(cio),1,mj2file);
   free(buf);
 
-	fprintf(stdout,"Total encoding time: %.2f s for %d frames (%.1f fps)\n", total_time, numframes, (float)numframes/total_time);
+	fprintf(stdout,"\nTotal encoding time: %.2f s for %d frames (%.1f fps)\n", total_time, numframes, (float)numframes/total_time);
   
   // Ending program 
   
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.patched/mj2/mj2_to_frames.c OpenJPEG.foo/mj2/mj2_to_frames.c
--- OpenJPEG.patched/mj2/mj2_to_frames.c	2007-10-18 07:26:11.000000000 -0500
+++ OpenJPEG.foo/mj2/mj2_to_frames.c	2007-11-03 22:48:45.000000000 -0500
@@ -204,7 +204,7 @@
 		/* free image data structure */
 		opj_image_destroy(img);
 		elapsed_time = opj_clock()-init_time;
-		fprintf(stderr, "Frame number %d/%d decoded in %.2f mseconds\n", snum + 1, numframes, elapsed_time*1000);
+		fprintf(stderr, "Frame number %d/%d decoded in %.2f mseconds \r", snum + 1, numframes, elapsed_time*1000);
 		total_time += elapsed_time;
 
   }
@@ -218,7 +218,7 @@
 	}
 	free(dinfo);
 	
-	fprintf(stdout, "%d frame(s) correctly decompressed\n", snum);
+	fprintf(stdout, "\n%d frame(s) correctly decompressed\n", snum);
 	fprintf(stdout,"Total decoding time: %.2f seconds (%.1f fps)\n", total_time, (float)numframes/total_time);
 		
   return 0;

openjpeg-svn470-t1-flags-mmx.patch:
 t1.c |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 12 deletions(-)

--- NEW FILE openjpeg-svn470-t1-flags-mmx.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-11-13 13:52:05.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-11-14 01:09:40.000000000 -0600
@@ -33,6 +33,17 @@
 #include "opj_includes.h"
 #include "t1_luts.h"
 
+/* Don't use MMX on amd64 */
+/* Note that merely including mmintrin.h, even if we don't use it, changes the code gcc */
+/* outputs on amd64, and it is measurably slower. A bug in gcc? */
+#ifdef __amd64__
+#undef __MMX__
+#endif
+
+#ifdef __MMX__
+#include <mmintrin.h>
+#endif
+
 /** @defgroup T1 T1 - Implementation of the tier-1 coding */
 /*@{*/
 
@@ -45,7 +56,7 @@
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
 static short t1_getnmsedec_ref(int x, int bitpos);
-#ifdef __amd64__
+#if defined(__amd64__) || defined(__MMX__)
 static INLINE void t1_updateflags(flag_t *flagsp, int s, int stride);
 #else
 static void t1_updateflags(flag_t *flagsp, int s, int stride);
@@ -293,6 +304,32 @@
 }
 
 #else
+#ifdef __MMX__
+
+static void t1_updateflags(flag_t *flagsp, int s, int stride) {
+	static const __v4hi mod[] = {
+		{T1_SIG_SE,         T1_SIG_E,          T1_SIG_NE,         0},
+		{T1_SIG_SE,         T1_SIG_E|T1_SGN_E, T1_SIG_NE,         0},
+		{T1_SIG_S,          T1_SIG,            T1_SIG_N,          0},
+		{T1_SIG_S|T1_SGN_S, T1_SIG,            T1_SIG_N|T1_SGN_N, 0},
+		{T1_SIG_SW,         T1_SIG_W,          T1_SIG_NW,         0},
+		{T1_SIG_SW,         T1_SIG_W|T1_SGN_W, T1_SIG_NW,         0}
+	};
+
+	__m64 tmp1 = *(__m64*)((void*)&flagsp[-1 - stride]);
+	__m64 tmp2 = *(__m64*)((void*)&flagsp[-1         ]);
+	__m64 tmp3 = *(__m64*)((void*)&flagsp[-1 + stride]);
+
+	tmp1 = _mm_or_si64(tmp1, mod[s]);
+	tmp2 = _mm_or_si64(tmp2, mod[s+2]);
+	tmp3 = _mm_or_si64(tmp3, mod[s+4]);
+
+	*(__m64*)((void*)&flagsp[-1 - stride]) = tmp1;
+	*(__m64*)((void*)&flagsp[-1         ]) = tmp2;
+	*(__m64*)((void*)&flagsp[-1 + stride]) = tmp3;
+}
+
+#else
 
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
 	static const flag_t mod[] = {
@@ -316,6 +353,7 @@
 }
 
 #endif
+#endif
 
 static void t1_enc_sigpass_step(
 		opj_t1_t *t1,
@@ -720,18 +758,14 @@
 				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<48);
 				agg = !tmp;
 #else
+				int* flagsp = (int*)&t1->flags[(k+1) + (i+1)*(t1->h+2)];
+				agg = flagsp[1];
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
-					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg &= ~((T1_SIG_S|T1_SIG_SE|T1_SIG_SW|T1_SGN_S)<<16);
 				}
+				agg |= flagsp[0];
+				agg &= (T1_SIG|T1_VISIT|T1_SIG_OTH)|(T1_SIG|T1_VISIT|T1_SIG_OTH)<<16;
+				agg = !agg;
 #endif
 			} else {
 				agg = 0;
@@ -820,7 +854,7 @@
 	memset(t1->data,0,datasize * sizeof(int));
 
 	flagssize=(h+2) * (w+2);
-#ifdef __amd64__
+#if defined(__amd64__) || defined(__MMX__)
 	/* 64 bit SIMD/SWAR in t1_updateflags requires one short of headroom
 	   because three shorts = 48 bits. */
 	++flagssize;
@@ -886,6 +920,9 @@
 		int correction = 3;
 		type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
 		
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 		switch (passtype) {
 			case 0:
 				t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
@@ -900,6 +937,9 @@
 					mqc_segmark_enc(mqc);
 				break;
 		}
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 		
 		/* fixed_quality */
 		cumwmsedec += t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps);
@@ -1004,6 +1044,9 @@
 	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
 	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 	
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 	for (segno = 0; segno < cblk->numsegs; ++segno) {
 		opj_tcd_seg_t *seg = &cblk->segs[segno];
 		
@@ -1044,6 +1087,9 @@
 			}
 		}
 	}
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 }
 
 /* ----------------------------------------------------------------------- */

openjpeg-svn480-cmake.patch:
 CMakeLists.txt             |    9 +++++++--
 libopenjpeg/CMakeLists.txt |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE openjpeg-svn480-cmake.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/CMakeLists.txt OpenJPEG.patched/CMakeLists.txt
--- OpenJPEG.orig/CMakeLists.txt	2007-09-25 09:54:49.000000000 -0500
+++ OpenJPEG.patched/CMakeLists.txt	2007-09-26 00:34:22.000000000 -0500
@@ -24,6 +24,7 @@
 
 #-----------------------------------------------------------------------------
 # OPENJPEG version number, useful for packaging and doxygen doc:
+SET(OPENJPEG_SOVERSION 2)
 SET(OPENJPEG_VERSION_MAJOR 1)
 SET(OPENJPEG_VERSION_MINOR 2)
 SET(OPENJPEG_VERSION_BUILD 0)
@@ -33,8 +34,8 @@
 # This setting of SOVERSION assumes that any API change
 # will increment either the minor or major version number of openjpeg
 SET(OPENJPEG_LIBRARY_PROPERTIES
-  VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
-  SOVERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}"
+  VERSION   "${OPENJPEG_SOVERSION}.${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
+  SOVERSION ${OPENJPEG_SOVERSION}
 )
 
 
@@ -116,6 +117,10 @@
   $ENV{JPEG2000_CONFORMANCE_DATA_ROOT}
 )
 
+IF(NOT CMAKE_INSTALL_LIBDIR)
+SET(CMAKE_INSTALL_LIBDIR lib)
+ENDIF(NOT CMAKE_INSTALL_LIBDIR)
+
 #-----------------------------------------------------------------------------
 # Compiler specific flags:
 IF(CMAKE_COMPILER_IS_GNUCC)
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/CMakeLists.txt OpenJPEG.patched/libopenjpeg/CMakeLists.txt
--- OpenJPEG.orig/libopenjpeg/CMakeLists.txt	2007-09-25 09:54:49.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/CMakeLists.txt	2007-09-26 00:31:12.000000000 -0500
@@ -37,7 +37,7 @@
 
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
-	DESTINATION lib)
+	DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 # Install includes files
 INSTALL(FILES openjpeg.h

openjpeg-svn480-use-stdbool.patch:
 openjpeg.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openjpeg-svn480-use-stdbool.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/openjpeg.h OpenJPEG.patched/libopenjpeg/openjpeg.h
--- OpenJPEG.orig/libopenjpeg/openjpeg.h	2007-11-14 05:34:48.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/openjpeg.h	2007-11-16 20:41:53.000000000 -0600
@@ -61,7 +61,7 @@
 #endif /* !OPJ_STATIC || !WIN32 */
 
 #ifndef __cplusplus
-#if defined(HAVE_STDBOOL_H)
+#if 1
 /*
 The C language implementation does correctly provide the standard header
 file "stdbool.h".


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-openjpeg/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:37:12 -0000	1.1
+++ .cvsignore	7 Dec 2009 00:31:31 -0000	1.2
@@ -0,0 +1 @@
+openjpeg_v1_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-openjpeg/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:37:12 -0000	1.1
+++ sources	7 Dec 2009 00:31:31 -0000	1.2
@@ -0,0 +1 @@
+f9a3ccfa91ac34b589e9bf7577ce8ff9  openjpeg_v1_3.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 00:31:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:31:32 +0000 (UTC)
Subject: rpms/perl-Module-Versions-Report/devel
	perl-Module-Versions-Report.spec, 1.10, 1.11
Message-ID: <20091207003132.0BC6611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Versions-Report/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21284

Modified Files:
	perl-Module-Versions-Report.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Versions-Report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Versions-Report/devel/perl-Module-Versions-Report.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Module-Versions-Report.spec	26 Jul 2009 11:22:14 -0000	1.10
+++ perl-Module-Versions-Report.spec	7 Dec 2009 00:31:31 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Module-Versions-Report
 Version:        1.06
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Report versions of all modules in memory
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.06-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:31:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:31:49 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-Archive/devel perl-TAP-Harness-Archive.spec,
	1.7, 1.8
Message-ID: <20091207003149.1332D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21523

Modified Files:
	perl-TAP-Harness-Archive.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-TAP-Harness-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-Archive/devel/perl-TAP-Harness-Archive.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-TAP-Harness-Archive.spec	7 Sep 2009 09:32:55 -0000	1.7
+++ perl-TAP-Harness-Archive.spec	7 Dec 2009 00:31:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-TAP-Harness-Archive
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Create an archive of TAP test results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.14-1
 - New upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 00:33:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:33:32 +0000 (UTC)
Subject: rpms/perl-Filesys-Df/devel perl-Filesys-Df.spec,1.4,1.5
Message-ID: <20091207003332.24CC911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Filesys-Df/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22057

Modified Files:
	perl-Filesys-Df.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Filesys-Df.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Filesys-Df/devel/perl-Filesys-Df.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Filesys-Df.spec	26 Jul 2009 06:06:51 -0000	1.4
+++ perl-Filesys-Df.spec	7 Dec 2009 00:33:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Filesys-Df
 Version:        0.92
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl extension for filesystem disk space information
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.92-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.92-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:33:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:33:57 +0000 (UTC)
Subject: rpms/weechat/devel weechat.spec,1.15,1.16
Message-ID: <20091207003357.0434A11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/weechat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22240

Modified Files:
	weechat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: weechat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/weechat/devel/weechat.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- weechat.spec	28 Nov 2009 17:20:17 -0000	1.15
+++ weechat.spec	7 Dec 2009 00:33:56 -0000	1.16
@@ -1,7 +1,7 @@
 Name:      weechat
 Summary:   Portable, fast, light and extensible IRC client
 Version:   0.3.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Source:    http://weechat.org/files/src/%{name}-%{version}.tar.bz2
 Patch0:    weechat-0.3.0-cmake-paths.patch
 Patch1:    weechat-0.3.0-cmake-pie.patch
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.3.0-3
+- rebuild against perl 5.10.1
+
 * Sat Nov 28 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.3.0-2
 - use enchant as spelling provider (instead of aspell), patch by Caolan McNamara
 



From petersen at fedoraproject.org  Mon Dec  7 00:34:00 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon,  7 Dec 2009 00:34:00 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.111,1.112
Message-ID: <20091207003400.0339611C00E0@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22279

Modified Files:
	comps-f13.xml.in 
Log Message:
[ko] make m17n-db-korean conditional


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- comps-f13.xml.in	5 Dec 2009 15:24:58 -0000	1.111
+++ comps-f13.xml.in	7 Dec 2009 00:33:59 -0000	1.112
@@ -3920,6 +3920,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ko</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ko</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ko_KR</packagereq>
+      <packagereq type="conditional" requires="m17n-db">m17n-db-korean</packagereq>
       <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="default">un-core-batang-fonts</packagereq>
       <packagereq type="default">un-core-dinaru-fonts</packagereq>
@@ -3933,7 +3934,6 @@
       <packagereq type="optional">baekmuk-ttf-gulim-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-hline-fonts</packagereq>
       <packagereq type="optional">lv</packagereq>
-      <packagereq type="optional">m17n-db-korean</packagereq>
       <packagereq type="optional">nabi</packagereq>
       <packagereq type="optional">un-extra-fonts-bom</packagereq>
       <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>



From kasal at fedoraproject.org  Mon Dec  7 00:34:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:34:27 +0000 (UTC)
Subject: rpms/perl-Class-DBI-mysql/devel perl-Class-DBI-mysql.spec,1.8,1.9
Message-ID: <20091207003427.DD09111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22466

Modified Files:
	perl-Class-DBI-mysql.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-mysql/devel/perl-Class-DBI-mysql.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-DBI-mysql.spec	26 Jul 2009 04:26:48 -0000	1.8
+++ perl-Class-DBI-mysql.spec	7 Dec 2009 00:34:27 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-mysql
 Version:        1.00
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Extensions to Class::DBI for MySQL
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:35:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:35:20 +0000 (UTC)
Subject: rpms/perl-Module-Util/devel perl-Module-Util.spec,1.5,1.6
Message-ID: <20091207003520.99B9B11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22755

Modified Files:
	perl-Module-Util.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Util/devel/perl-Module-Util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Module-Util.spec	26 Jul 2009 11:21:57 -0000	1.5
+++ perl-Module-Util.spec	7 Dec 2009 00:35:20 -0000	1.6
@@ -1,7 +1,7 @@
 
 Name:       perl-Module-Util
 Version:    1.07
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see lib/Module/Util.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man[13]/*.[13]*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:35:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:35:33 +0000 (UTC)
Subject: rpms/perl-TAP-Formatter-HTML/devel perl-TAP-Formatter-HTML.spec, 1.2,
	1.3
Message-ID: <20091207003533.CBA4911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-TAP-Formatter-HTML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22900

Modified Files:
	perl-TAP-Formatter-HTML.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-TAP-Formatter-HTML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Formatter-HTML/devel/perl-TAP-Formatter-HTML.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-TAP-Formatter-HTML.spec	26 Jul 2009 16:39:17 -0000	1.2
+++ perl-TAP-Formatter-HTML.spec	7 Dec 2009 00:35:33 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-TAP-Formatter-HTML
 Version:        0.07
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        TAP Test Harness output delegate for html output
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:37:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:37:36 +0000 (UTC)
Subject: rpms/perl-File-Sync/devel perl-File-Sync.spec,1.7,1.8
Message-ID: <20091207003736.1DAA811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Sync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23430

Modified Files:
	perl-File-Sync.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Sync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Sync/devel/perl-File-Sync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-File-Sync.spec	26 Jul 2009 06:04:39 -0000	1.7
+++ perl-File-Sync.spec	7 Dec 2009 00:37:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-Sync
 Version:        0.09
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl access to fsync() and sync() function calls
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:39:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:39:23 +0000 (UTC)
Subject: rpms/perl-Module-Used/devel perl-Module-Used.spec,1.2,1.3
Message-ID: <20091207003923.0821D11C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Used/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23856

Modified Files:
	perl-Module-Used.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Used.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Used/devel/perl-Module-Used.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Module-Used.spec	26 Jul 2009 11:21:42 -0000	1.2
+++ perl-Module-Used.spec	7 Dec 2009 00:39:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Module-Used
 Version:        1.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Find modules loaded by Perl code without running it
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2.0-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:39:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:39:33 +0000 (UTC)
Subject: rpms/virt-v2v/devel virt-v2v.spec,1.3,1.4
Message-ID: <20091207003933.9A9B811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/virt-v2v/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24003

Modified Files:
	virt-v2v.spec 
Log Message:
- rebuild against perl 5.10.1


Index: virt-v2v.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/devel/virt-v2v.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- virt-v2v.spec	9 Nov 2009 17:20:06 -0000	1.3
+++ virt-v2v.spec	7 Dec 2009 00:39:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           virt-v2v
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Convert a virtual machine to run on KVM
 
 Group:          Applications/System
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.3.2-2
+- rebuild against perl 5.10.1
+
 * Mon Nov 9 2009 Matthew Booth <mbooth at redhat.com> - 0.3.2-1
 - Update to release 0.3.2
 - Add BuildRequires gettext



From kasal at fedoraproject.org  Mon Dec  7 00:39:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:39:47 +0000 (UTC)
Subject: rpms/perl-Taint-Runtime/devel perl-Taint-Runtime.spec,1.10,1.11
Message-ID: <20091207003947.9E8C611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Taint-Runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24141

Modified Files:
	perl-Taint-Runtime.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Taint-Runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Taint-Runtime/devel/perl-Taint-Runtime.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Taint-Runtime.spec	26 Jul 2009 16:40:01 -0000	1.10
+++ perl-Taint-Runtime.spec	7 Dec 2009 00:39:47 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Taint-Runtime
 Version:        0.03
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Runtime enable taint checking
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:40:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:40:49 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel
	perl-Class-DBI-Loader-Relationship.spec, 1.13, 1.14
Message-ID: <20091207004049.7106D11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24431

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Loader-Relationship/devel/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Class-DBI-Loader-Relationship.spec	19 Aug 2009 22:11:19 -0000	1.13
+++ perl-Class-DBI-Loader-Relationship.spec	7 Dec 2009 00:40:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.3-11
+- rebuild against perl 5.10.1
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-10
 - fix source0 url
 



From kasal at fedoraproject.org  Mon Dec  7 00:41:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:41:28 +0000 (UTC)
Subject: rpms/perl-File-Slurp/devel perl-File-Slurp.spec,1.14,1.15
Message-ID: <20091207004128.975B311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Slurp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24662

Modified Files:
	perl-File-Slurp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-File-Slurp.spec	26 Jul 2009 06:04:24 -0000	1.14
+++ perl-File-Slurp.spec	7 Dec 2009 00:41:28 -0000	1.15
@@ -1,6 +1,6 @@
 Name: 		perl-File-Slurp
 Version: 	9999.13
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -54,6 +54,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 9999.13-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9999.13-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:43:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:43:55 +0000 (UTC)
Subject: rpms/perl-Module-Starter-Plugin-CGIApp/devel
	perl-Module-Starter-Plugin-CGIApp.spec, 1.2, 1.3
Message-ID: <20091207004355.D2DBC11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Starter-Plugin-CGIApp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25428

Modified Files:
	perl-Module-Starter-Plugin-CGIApp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Starter-Plugin-CGIApp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Starter-Plugin-CGIApp/devel/perl-Module-Starter-Plugin-CGIApp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Module-Starter-Plugin-CGIApp.spec	26 Jul 2009 11:21:28 -0000	1.2
+++ perl-Module-Starter-Plugin-CGIApp.spec	7 Dec 2009 00:43:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Module-Starter-Plugin-CGIApp
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Template based module starter for CGI apps
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:44:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:44:49 +0000 (UTC)
Subject: rpms/perl-Sys-Virt/devel perl-Sys-Virt.spec,1.18,1.19
Message-ID: <20091207004449.EE26711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sys-Virt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25774

Modified Files:
	perl-Sys-Virt.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sys-Virt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sys-Virt/devel/perl-Sys-Virt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-Sys-Virt.spec	26 Aug 2009 15:03:35 -0000	1.18
+++ perl-Sys-Virt.spec	7 Dec 2009 00:44:49 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Sys-Virt
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Represent and manage a libvirt hypervisor connection
 License:        GPLv2+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2.1-2
+- rebuild against perl 5.10.1
+
 * Wed Aug 26 2009 Stepan Kasal <skasal at redhat.com> - 0.2.1-1
 - new upstream version
 - remove upstreamed patch



From kasal at fedoraproject.org  Mon Dec  7 00:44:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:44:40 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Loader/devel perl-Class-DBI-Loader.spec, 1.8,
	1.9
Message-ID: <20091207004440.9D95111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-Loader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25649

Modified Files:
	perl-Class-DBI-Loader.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Loader/devel/perl-Class-DBI-Loader.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-DBI-Loader.spec	26 Jul 2009 04:24:37 -0000	1.8
+++ perl-Class-DBI-Loader.spec	7 Dec 2009 00:44:40 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
 Version:        0.34
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.34-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:45:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:45:25 +0000 (UTC)
Subject: rpms/perl-File-ShareDir-PAR/devel perl-File-ShareDir-PAR.spec, 1.5, 
	1.6
Message-ID: <20091207004525.7C0A011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-ShareDir-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26046

Modified Files:
	perl-File-ShareDir-PAR.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-ShareDir-PAR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-ShareDir-PAR/devel/perl-File-ShareDir-PAR.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-File-ShareDir-PAR.spec	26 Jul 2009 06:04:08 -0000	1.5
+++ perl-File-ShareDir-PAR.spec	7 Dec 2009 00:45:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-File-ShareDir-PAR
 Version:        0.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        File::ShareDir with PAR support
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:45:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:45:25 +0000 (UTC)
Subject: rpms/vim/devel vim.spec,1.242,1.243
Message-ID: <20091207004525.1D24C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26031

Modified Files:
	vim.spec 
Log Message:
- rebuild against perl 5.10.1


Index: vim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim/devel/vim.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- vim.spec	3 Dec 2009 13:34:31 -0000	1.242
+++ vim.spec	7 Dec 2009 00:45:24 -0000	1.243
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -1298,6 +1298,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2:7.2.315-2
+- rebuild against perl 5.10.1
+
 * Wed Dec 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.315-1
 - patchlevel 315
 - fix vimrc location in man page (#456992)



From kasal at fedoraproject.org  Mon Dec  7 00:47:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:47:34 +0000 (UTC)
Subject: rpms/perl-Module-Starter-PBP/devel perl-Module-Starter-PBP.spec, 1.6,
	1.7
Message-ID: <20091207004734.8ECB511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Starter-PBP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26715

Modified Files:
	perl-Module-Starter-PBP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Starter-PBP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Starter-PBP/devel/perl-Module-Starter-PBP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Module-Starter-PBP.spec	26 Jul 2009 11:21:14 -0000	1.6
+++ perl-Module-Starter-PBP.spec	7 Dec 2009 00:47:34 -0000	1.7
@@ -8,7 +8,7 @@
 
 Name:           perl-Module-Starter-PBP
 Version:        0.000003        
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Create a module as recommended in "Perl Best Practices" 
 
 Group:          Development/Libraries
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.000003-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.000003-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:48:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:48:48 +0000 (UTC)
Subject: rpms/perl-Class-DBI-FromCGI/devel perl-Class-DBI-FromCGI.spec, 1.7, 
	1.8
Message-ID: <20091207004848.01B0C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-FromCGI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27076

Modified Files:
	perl-Class-DBI-FromCGI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-FromCGI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-FromCGI/devel/perl-Class-DBI-FromCGI.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Class-DBI-FromCGI.spec	26 Jul 2009 04:24:22 -0000	1.7
+++ perl-Class-DBI-FromCGI.spec	7 Dec 2009 00:48:47 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-FromCGI
 Version:        1.00
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Update Class::DBI data using CGI::Untaint
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:49:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:49:49 +0000 (UTC)
Subject: rpms/perl-SystemPerl/devel perl-SystemPerl.spec,1.4,1.5
Message-ID: <20091207004949.A378711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SystemPerl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27371

Modified Files:
	perl-SystemPerl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SystemPerl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemPerl/devel/perl-SystemPerl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-SystemPerl.spec	15 Sep 2009 09:10:13 -0000	1.4
+++ perl-SystemPerl.spec	7 Dec 2009 00:49:49 -0000	1.5
@@ -12,7 +12,7 @@
 
 Name:           perl-SystemPerl
 Version:        1.331
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SystemPerl Perl module
 
 License:        LGPLv3+ or Artistic 2.0
@@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.331-2
+- rebuild against perl 5.10.1
+
 * Tue Sep 15 2009 Chitlesh GOORAH < chitlesh [AT] fedoraproject DOT org > 1.331-1
 - New upsteam release
 



From kasal at fedoraproject.org  Mon Dec  7 00:50:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:50:10 +0000 (UTC)
Subject: rpms/perl-File-ShareDir/devel perl-File-ShareDir.spec,1.3,1.4
Message-ID: <20091207005010.0E85A11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-ShareDir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27557

Modified Files:
	perl-File-ShareDir.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-ShareDir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-ShareDir/devel/perl-File-ShareDir.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-File-ShareDir.spec	26 Jul 2009 06:03:53 -0000	1.3
+++ perl-File-ShareDir.spec	7 Dec 2009 00:50:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-File-ShareDir
 Version:        1.00
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Locate per-dist and per-module shared files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:51:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:51:42 +0000 (UTC)
Subject: rpms/perl-Module-Signature/devel perl-Module-Signature.spec, 1.15, 
	1.16
Message-ID: <20091207005142.CEAE011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Signature/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28002

Modified Files:
	perl-Module-Signature.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Module-Signature.spec	19 Nov 2009 17:09:21 -0000	1.15
+++ perl-Module-Signature.spec	7 Dec 2009 00:51:42 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Module-Signature
 Version:        0.61
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CPAN signature management utilities and modules
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.61-2
+- rebuild against perl 5.10.1
+
 * Thu Nov 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.61-1
 - Update to 0.61 (#538780).
 



From kasal at fedoraproject.org  Mon Dec  7 00:52:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:52:57 +0000 (UTC)
Subject: rpms/perl-Class-DBI-AsForm/devel perl-Class-DBI-AsForm.spec, 1.10, 
	1.11
Message-ID: <20091207005257.A47AD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-AsForm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28319

Modified Files:
	perl-Class-DBI-AsForm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-AsForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-AsForm/devel/perl-Class-DBI-AsForm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Class-DBI-AsForm.spec	26 Jul 2009 04:24:03 -0000	1.10
+++ perl-Class-DBI-AsForm.spec	7 Dec 2009 00:52:57 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AsForm
 Version:        2.42
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Produce HTML form elements for database columns
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.42-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.42-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:53:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:53:32 +0000 (UTC)
Subject: rpms/uuid/devel uuid.spec,1.17,1.18
Message-ID: <20091207005332.268A711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/uuid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28552

Modified Files:
	uuid.spec 
Log Message:
- rebuild against perl 5.10.1


Index: uuid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uuid/devel/uuid.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- uuid.spec	27 Jul 2009 06:41:51 -0000	1.17
+++ uuid.spec	7 Dec 2009 00:53:32 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           uuid
 Version:        1.6.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.6.1-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:53:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:53:54 +0000 (UTC)
Subject: rpms/perl-File-RsyncP/devel perl-File-RsyncP.spec,1.9,1.10
Message-ID: <20091207005354.D86BB11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-RsyncP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28710

Modified Files:
	perl-File-RsyncP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-RsyncP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-RsyncP/devel/perl-File-RsyncP.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-File-RsyncP.spec	26 Jul 2009 06:03:38 -0000	1.9
+++ perl-File-RsyncP.spec	7 Dec 2009 00:53:54 -0000	1.10
@@ -1,6 +1,6 @@
 Name: perl-File-RsyncP
 Version: 0.68
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A perl implementation of an Rsync client
 License: GPLv2
 Group: Development/Libraries
@@ -51,6 +51,9 @@ make test
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.68-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.68-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:54:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:54:13 +0000 (UTC)
Subject: rpms/perl-SystemC-Vregs/devel perl-SystemC-Vregs.spec,1.4,1.5
Message-ID: <20091207005413.8A2FE11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SystemC-Vregs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28886

Modified Files:
	perl-SystemC-Vregs.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SystemC-Vregs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SystemC-Vregs/devel/perl-SystemC-Vregs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-SystemC-Vregs.spec	26 Jul 2009 16:38:49 -0000	1.4
+++ perl-SystemC-Vregs.spec	7 Dec 2009 00:54:13 -0000	1.5
@@ -12,7 +12,7 @@
 
 Name:           perl-SystemC-Vregs
 Version:        1.463
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility routines used by vregs
 
 License:        LGPLv3+ or Artistic 2.0
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.463-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.463-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:56:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:56:34 +0000 (UTC)
Subject: rpms/perl-Module-ScanDeps/devel perl-Module-ScanDeps.spec, 1.25,
	1.26
Message-ID: <20091207005634.D511911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-ScanDeps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29377

Modified Files:
	perl-Module-ScanDeps.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-Module-ScanDeps.spec	27 Sep 2009 06:15:01 -0000	1.25
+++ perl-Module-ScanDeps.spec	7 Dec 2009 00:56:34 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-Module-ScanDeps
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.95-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.95-1
 - auto-update to 0.95 (by cpan-spec-update 0.01)
 - add perl_default_filter (pro forma)



From kasal at fedoraproject.org  Mon Dec  7 00:57:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:57:05 +0000 (UTC)
Subject: rpms/perl-Class-DBI-AbstractSearch/devel
	perl-Class-DBI-AbstractSearch.spec, 1.9, 1.10
Message-ID: <20091207005705.6AFB611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI-AbstractSearch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29571

Modified Files:
	perl-Class-DBI-AbstractSearch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI-AbstractSearch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-AbstractSearch/devel/perl-Class-DBI-AbstractSearch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-DBI-AbstractSearch.spec	26 Jul 2009 04:23:48 -0000	1.9
+++ perl-Class-DBI-AbstractSearch.spec	7 Dec 2009 00:57:05 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AbstractSearch
 Version:        0.07
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Abstract Class::DBI's SQL with SQL::Abstract
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:58:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:58:17 +0000 (UTC)
Subject: rpms/perl-File-Remove/devel perl-File-Remove.spec,1.27,1.28
Message-ID: <20091207005817.E648911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Remove/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29865

Modified Files:
	perl-File-Remove.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- perl-File-Remove.spec	26 Jul 2009 06:03:24 -0000	1.27
+++ perl-File-Remove.spec	7 Dec 2009 00:58:17 -0000	1.28
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
 Version:	1.42
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -53,6 +53,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.42-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.42-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 00:59:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:59:10 +0000 (UTC)
Subject: rpms/udunits/devel udunits.spec,1.22,1.23
Message-ID: <20091207005910.7275411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/udunits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30112

Modified Files:
	udunits.spec 
Log Message:
- rebuild against perl 5.10.1


Index: udunits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/udunits.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- udunits.spec	20 Aug 2009 02:47:15 -0000	1.22
+++ udunits.spec	7 Dec 2009 00:59:10 -0000	1.23
@@ -1,6 +1,6 @@
 Name: udunits
 Version: 1.12.9
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A library for manipulating units of physical quantities
 License: MIT
 Group: System Environment/Libraries
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/udunitsperl.1.gz
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12.9-6
+- rebuild against perl 5.10.1
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.9-5
 - fix upstream URL
 



From kasal at fedoraproject.org  Mon Dec  7 00:59:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 00:59:53 +0000 (UTC)
Subject: rpms/perl-Sys-Syscall/devel perl-Sys-Syscall.spec,1.4,1.5
Message-ID: <20091207005953.D3DE811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sys-Syscall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30374

Modified Files:
	perl-Sys-Syscall.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sys-Syscall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sys-Syscall/devel/perl-Sys-Syscall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Sys-Syscall.spec	26 Jul 2009 16:37:46 -0000	1.4
+++ perl-Sys-Syscall.spec	7 Dec 2009 00:59:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Sys-Syscall
 Version:        0.22
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Access system calls that Perl doesn't normally provide access to
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec  7 01:00:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 01:00:56 +0000 (UTC)
Subject: rpms/anerley/F-12 anerley-no-self-contact.patch, NONE,
	1.1 anerley.spec, 1.13, 1.14
Message-ID: <20091207010056.3202011C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30671

Modified Files:
	anerley.spec 
Added Files:
	anerley-no-self-contact.patch 
Log Message:
- Fix spec file. Damn FUDCon hotel wifi

anerley-no-self-contact.patch:
 anerley-ebook-feed.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE anerley-no-self-contact.patch ---
>From e604bdf50e2b05ed6977564ea8d6aac948af0e03 Mon Sep 17 00:00:00 2001
From: Geoff Gustafson <geoff at linux.intel.com>
Date: Tue, 10 Nov 2009 23:01:47 +0000
Subject: anerley-ebook-feed: Fix segfault when no self contact is found

---
diff --git a/anerley/anerley-ebook-feed.c b/anerley/anerley-ebook-feed.c
index 59b2eb0..72c4529 100644
--- a/anerley/anerley-ebook-feed.c
+++ b/anerley/anerley-ebook-feed.c
@@ -134,13 +134,12 @@ anerley_ebook_feed_constructed (GObject *object)
                                     E_CONTACT_UID);
     g_debug (G_STRLOC ": Found self contact: %s",
              priv->self_uid);
+    g_object_unref (self_contact);
   } else {
     g_warning (G_STRLOC ": Error getting self contact: %s",
                error->message);
   }
 
-  g_object_unref (self_contact);
-
   if (G_OBJECT_CLASS (anerley_ebook_feed_parent_class)->constructed)
     G_OBJECT_CLASS (anerley_ebook_feed_parent_class)->constructed (object);
 }
--
cgit v0.8.3-13-ge633


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/anerley.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- anerley.spec	13 Nov 2009 16:28:40 -0000	1.13
+++ anerley.spec	7 Dec 2009 01:00:56 -0000	1.14
@@ -1,12 +1,13 @@
 Name:           anerley
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:         anerley-no-self-contact.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: evolution-data-server-devel
@@ -35,6 +36,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-self-contact
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -72,6 +74,12 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-3
+- Fix spec file. Damn FUDCon hotel wifi
+
+* Sat Dec  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-2
+- Add patch from upstream to fix segfault when no self contact is found
+
 * Fri Nov 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-1
 - New upstream 0.2.0 release
 



From kasal at fedoraproject.org  Mon Dec  7 01:01:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:01:19 +0000 (UTC)
Subject: rpms/perl-Class-DBI/devel perl-Class-DBI.spec,1.11,1.12
Message-ID: <20091207010119.53C2711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30766

Modified Files:
	perl-Class-DBI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI/devel/perl-Class-DBI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Class-DBI.spec	26 Jul 2009 04:23:32 -0000	1.11
+++ perl-Class-DBI.spec	7 Dec 2009 01:01:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI
 Version:        3.0.17
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.0.17-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.17-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From silas at fedoraproject.org  Mon Dec  7 01:02:12 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Mon,  7 Dec 2009 01:02:12 +0000 (UTC)
Subject: File lamson-1.0pre7.tar.gz uploaded to lookaside cache by silas
Message-ID: <20091207010212.14A9610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lamson:

7970ef8cc818ffbb3235e934efb3b969  lamson-1.0pre7.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 01:02:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:02:25 +0000 (UTC)
Subject: rpms/perl-Module-Refresh/devel perl-Module-Refresh.spec,1.12,1.13
Message-ID: <20091207010225.DD3B411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Refresh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31210

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Refresh/devel/perl-Module-Refresh.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Module-Refresh.spec	26 Jul 2009 11:20:15 -0000	1.12
+++ perl-Module-Refresh.spec	7 Dec 2009 01:02:25 -0000	1.13
@@ -1,6 +1,6 @@
 Name: 		perl-Module-Refresh
 Version: 	0.13
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Refresh %INC files when updated on disk
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -46,6 +46,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From silas at fedoraproject.org  Mon Dec  7 01:02:31 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Mon,  7 Dec 2009 01:02:31 +0000 (UTC)
Subject: rpms/lamson/devel import.log, NONE, 1.1 lamson.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207010231.A2BEA11C00E0@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/lamson/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31238/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lamson.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
lamson-1_0-0_3_pre7_fc13:HEAD:lamson-1.0-0.3.pre7.fc13.src.rpm:1260146625


--- NEW FILE lamson.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global pre_release pre7

Name:           lamson
Version:        1.0
Release:        0.3.%{pre_release}%{?dist}
Summary:        A Python mail server framework

Group:          Development/Languages
License:        GPLv3
URL:            http://lamsonproject.org
Source0:        http://pypi.python.org/packages/source/l/lamson/%{name}-%{version}%{pre_release}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       python-chardet
Requires:       python-daemon
Requires:       python-jinja2
# python-lockfile is required until 513546 is fixed
Requires:       python-lockfile
Requires:       python-nose
Requires:       python-sqlalchemy

%description
Lamson is a pure Python SMTP server designed to create robust and complex mail
applications in the style of modern web frameworks such as Django. Unlike
traditional SMTP servers like Postfix or Sendmail, Lamson has all the features
of a web application stack (ORM, templates, routing, handlers, state machines,
Python) without needing to configure alias files, run newaliases, or juggle
tons of tiny fragile processes.

%package        doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    doc
This package contains documentation for %{name}.

%prep
%setup -q -n %{name}-%{version}%{pre_release}
# Fix wrong-script-end-of-line-encoding error
%{__sed} -i 's/\r//' README
# Fix lots of issues with metaphonp
metaphone='examples/librelist/lib/metaphone.py'
# Fix wrong-script-end-of-line-encoding error
%{__sed} -i 's/\r//' $metaphone
# Fix file-not-utf8 warning
iconv -f ISO_8859-1 -t UTF8 $metaphone -o $metaphone.tmp
%{__mv} -f $metaphone.tmp $metaphone
# Fix wrong-script-interpreter error
%{__sed} -i '/^#!python$/,+1 d' $metaphone
# Fix hidden-file-or-dir warnings
find doc examples -name '.*' -delete
# Fix zero-length errors
find doc examples -size 0 -delete
# Fix doc-file-dependency and spurious-executable-perm warnings
find examples -name '*.py' -exec chmod 0644 {} \;

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE PKG-INFO README
%{_bindir}/lamson
%{python_sitelib}/%{name}
%{python_sitelib}/%{name}-*.egg-info

%files doc
%defattr(-,root,root,-)
%doc examples/ doc/lamsonproject.org/output

%changelog
* Sat Dec 05 2009 Silas Sewell <silas at sewell.ch> - 1.0-0.3.pre7
- Update to 1.0pre7

* Sat Dec 05 2009 Silas Sewell <silas at sewell.ch> - 1.0-0.2.pre6
- Update to 1.0pre6
- Add doc subpackage

* Thu Jul 23 2009 Silas Sewell <silas at sewell.ch> - 1.0-0.1.pre1
- Update to 1.0pre1

* Sat May 25 2009 Silas Sewell <silas at sewell.ch> - 0.9.0-1
- Update to 0.9.0

* Sat May 25 2009 Silas Sewell <silas at sewell.ch> - 0.8.4-1
- Update to 0.8.4

* Sat May 16 2009 Silas Sewell <silas at sewell.ch> - 0.8.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lamson/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:26:21 -0000	1.1
+++ .cvsignore	7 Dec 2009 01:02:31 -0000	1.2
@@ -0,0 +1 @@
+lamson-1.0pre7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lamson/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:26:21 -0000	1.1
+++ sources	7 Dec 2009 01:02:31 -0000	1.2
@@ -0,0 +1 @@
+7970ef8cc818ffbb3235e934efb3b969  lamson-1.0pre7.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 01:02:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:02:39 +0000 (UTC)
Subject: rpms/perl-File-ReadBackwards/devel perl-File-ReadBackwards.spec, 1.7,
	1.8
Message-ID: <20091207010239.C49F111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-ReadBackwards/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31443

Modified Files:
	perl-File-ReadBackwards.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-ReadBackwards.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-ReadBackwards/devel/perl-File-ReadBackwards.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-File-ReadBackwards.spec	26 Jul 2009 06:03:10 -0000	1.7
+++ perl-File-ReadBackwards.spec	7 Dec 2009 01:02:39 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-ReadBackwards
 Version:        1.04
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        File::ReadBackwards Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:03:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:03:12 +0000 (UTC)
Subject: rpms/sysusage/devel sysusage.spec,1.6,1.7
Message-ID: <20091207010312.9B70A11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/sysusage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31664

Modified Files:
	sysusage.spec 
Log Message:
- rebuild against perl 5.10.1


Index: sysusage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysusage/devel/sysusage.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sysusage.spec	27 Jul 2009 05:27:38 -0000	1.6
+++ sysusage.spec	7 Dec 2009 01:03:12 -0000	1.7
@@ -6,7 +6,7 @@
 Name: %{wname}
 Epoch: 0
 Version: 2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: System monitoring based on perl, rrdtool, and sysstat
 
 Group: System Environment/Daemons
@@ -120,6 +120,9 @@ _EOF3_
 %dir %{webdir}
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.10-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:03:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:03:55 +0000 (UTC)
Subject: rpms/perl-Sys-SigAction/devel perl-Sys-SigAction.spec,1.7,1.8
Message-ID: <20091207010355.BAAA711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sys-SigAction/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31925

Modified Files:
	perl-Sys-SigAction.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sys-SigAction.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sys-SigAction/devel/perl-Sys-SigAction.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Sys-SigAction.spec	26 Jul 2009 16:37:29 -0000	1.7
+++ perl-Sys-SigAction.spec	7 Dec 2009 01:03:55 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Sys-SigAction
 Version:        0.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for Consistent Signal Handling
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:05:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:05:24 +0000 (UTC)
Subject: rpms/perl-Class-Date/devel perl-Class-Date.spec,1.5,1.6
Message-ID: <20091207010524.A8A3911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32503

Modified Files:
	perl-Class-Date.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Date/devel/perl-Class-Date.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Class-Date.spec	26 Jul 2009 04:27:37 -0000	1.5
+++ perl-Class-Date.spec	7 Dec 2009 01:05:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Class-Date
 Version:        1.1.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Class for easy date and time manipulation
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1.9-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:06:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:06:51 +0000 (UTC)
Subject: rpms/perl-Module-Pluggable-Ordered/devel
	perl-Module-Pluggable-Ordered.spec, 1.2, 1.3
Message-ID: <20091207010651.8DD6611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv415

Modified Files:
	perl-Module-Pluggable-Ordered.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Pluggable-Ordered.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Pluggable-Ordered/devel/perl-Module-Pluggable-Ordered.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Module-Pluggable-Ordered.spec	26 Jul 2009 11:20:01 -0000	1.2
+++ perl-Module-Pluggable-Ordered.spec	7 Dec 2009 01:06:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Module-Pluggable-Ordered
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Call module plugins in a specified order
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.5-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:07:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:07:20 +0000 (UTC)
Subject: rpms/swatch/devel swatch.spec,1.15,1.16
Message-ID: <20091207010720.BDB3611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/swatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv587

Modified Files:
	swatch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: swatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swatch/devel/swatch.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- swatch.spec	27 Jul 2009 05:12:09 -0000	1.15
+++ swatch.spec	7 Dec 2009 01:07:20 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           swatch
 Version:        3.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.2.1-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:07:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:07:29 +0000 (UTC)
Subject: rpms/perl-File-pushd/devel perl-File-pushd.spec,1.3,1.4
Message-ID: <20091207010729.A5AFD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-pushd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv679

Modified Files:
	perl-File-pushd.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-pushd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-pushd/devel/perl-File-pushd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-File-pushd.spec	26 Jul 2009 06:06:08 -0000	1.3
+++ perl-File-pushd.spec	7 Dec 2009 01:07:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-File-pushd
 Version:        1.00
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Change directory temporarily for a limited scope
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:08:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:08:21 +0000 (UTC)
Subject: rpms/perl-Sysadm-Install/devel perl-Sysadm-Install.spec,1.8,1.9
Message-ID: <20091207010821.E600311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sysadm-Install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv966

Modified Files:
	perl-Sysadm-Install.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sysadm-Install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/perl-Sysadm-Install.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Sysadm-Install.spec	14 Sep 2009 10:34:26 -0000	1.8
+++ perl-Sysadm-Install.spec	7 Dec 2009 01:08:21 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	Typical installation tasks for system administrators
 Name:		perl-Sysadm-Install
 Version:	0.33
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Sysadm-Install/
@@ -73,6 +73,9 @@ everything, but suppresses any write act
 %{_mandir}/man3/Sysadm::Install.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.33-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 14 2009 Paul Howarth <paul at city-fan.org> 0.33-1
 - Update to 0.33
   - No longer require perl(Encode)



From kasal at fedoraproject.org  Mon Dec  7 01:09:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:09:46 +0000 (UTC)
Subject: rpms/perl-Class-Data-Inheritable/devel
	perl-Class-Data-Inheritable.spec, 1.12, 1.13
Message-ID: <20091207010946.24BDA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Data-Inheritable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1326

Modified Files:
	perl-Class-Data-Inheritable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Data-Inheritable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Data-Inheritable/devel/perl-Class-Data-Inheritable.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Class-Data-Inheritable.spec	26 Jul 2009 04:27:22 -0000	1.12
+++ perl-Class-Data-Inheritable.spec	7 Dec 2009 01:09:45 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Class-Data-Inheritable
 Version:        0.08
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Inheritable, overridable class data
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec  7 01:10:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 01:10:55 +0000 (UTC)
Subject: rpms/anerley/F-12 anerley.spec,1.14,1.15
Message-ID: <20091207011055.B615511C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1642

Modified Files:
	anerley.spec 
Log Message:
- Increment spec file. Damn FUDCon hotel wifi again


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/anerley.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- anerley.spec	7 Dec 2009 01:00:56 -0000	1.14
+++ anerley.spec	7 Dec 2009 01:10:55 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           anerley
 Version:        0.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-4
+- Increment spec file. Damn FUDCon hotel wifi again!
+
 * Sun Dec  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-3
 - Fix spec file. Damn FUDCon hotel wifi
 



From kasal at fedoraproject.org  Mon Dec  7 01:11:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:11:15 +0000 (UTC)
Subject: rpms/perl-Module-Math-Depends/devel perl-Module-Math-Depends.spec,
	1.3, 1.4
Message-ID: <20091207011115.56F8511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Math-Depends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1727

Modified Files:
	perl-Module-Math-Depends.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Math-Depends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Math-Depends/devel/perl-Module-Math-Depends.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Module-Math-Depends.spec	26 Jul 2009 11:19:47 -0000	1.3
+++ perl-Module-Math-Depends.spec	7 Dec 2009 01:11:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Module-Math-Depends
 Version:        0.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Convenience object for manipulating module dependencies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:11:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:11:38 +0000 (UTC)
Subject: rpms/suck/devel suck.spec,1.24,1.25
Message-ID: <20091207011138.C2B0011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/suck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1901

Modified Files:
	suck.spec 
Log Message:
- rebuild against perl 5.10.1


Index: suck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/suck/devel/suck.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- suck.spec	21 Aug 2009 16:02:00 -0000	1.24
+++ suck.spec	7 Dec 2009 01:11:38 -0000	1.25
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 28%{?dist}
+Release: 29%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/news/suck.d/
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.3.2-29
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.3.2-28
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Mon Dec  7 01:11:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:11:44 +0000 (UTC)
Subject: rpms/perl-File-Pid/devel perl-File-Pid.spec,1.2,1.3
Message-ID: <20091207011144.6D90F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Pid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1972

Modified Files:
	perl-File-Pid.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Pid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Pid/devel/perl-File-Pid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-File-Pid.spec	26 Jul 2009 06:02:56 -0000	1.2
+++ perl-File-Pid.spec	7 Dec 2009 01:11:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-File-Pid
 Version:        1.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pid File Manipulation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:13:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:13:04 +0000 (UTC)
Subject: rpms/perl-Syntax-Highlight-Perl-Improved/devel
	perl-Syntax-Highlight-Perl-Improved.spec, 1.2, 1.3
Message-ID: <20091207011304.923A811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Syntax-Highlight-Perl-Improved/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2508

Modified Files:
	perl-Syntax-Highlight-Perl-Improved.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Syntax-Highlight-Perl-Improved.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Syntax-Highlight-Perl-Improved/devel/perl-Syntax-Highlight-Perl-Improved.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Syntax-Highlight-Perl-Improved.spec	26 Jul 2009 16:37:14 -0000	1.2
+++ perl-Syntax-Highlight-Perl-Improved.spec	7 Dec 2009 01:13:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Syntax-Highlight-Perl-Improved
 Version:        1.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Highlighting of Perl Syntactical Structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:13:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:13:49 +0000 (UTC)
Subject: rpms/perl-Class-Data-Accessor/devel perl-Class-Data-Accessor.spec, 
	1.11, 1.12
Message-ID: <20091207011349.9B3EF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Data-Accessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2925

Modified Files:
	perl-Class-Data-Accessor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Data-Accessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Data-Accessor/devel/perl-Class-Data-Accessor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Class-Data-Accessor.spec	26 Jul 2009 04:27:06 -0000	1.11
+++ perl-Class-Data-Accessor.spec	7 Dec 2009 01:13:49 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Class-Data-Accessor
 Version:        0.04004
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Inheritable, overridable class and instance data accessor creation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04004-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04004-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From silas at fedoraproject.org  Mon Dec  7 01:14:58 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Mon,  7 Dec 2009 01:14:58 +0000 (UTC)
Subject: rpms/lamson/F-12 import.log, NONE, 1.1 lamson.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207011458.36B0911C00E0@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/lamson/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3277/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lamson.spec 
Log Message:
Initial spec



--- NEW FILE import.log ---
lamson-1_0-0_3_pre7_fc13:F-12:lamson-1.0-0.3.pre7.fc13.src.rpm:1260147360


--- NEW FILE lamson.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global pre_release pre7

Name:           lamson
Version:        1.0
Release:        0.3.%{pre_release}%{?dist}
Summary:        A Python mail server framework

Group:          Development/Languages
License:        GPLv3
URL:            http://lamsonproject.org
Source0:        http://pypi.python.org/packages/source/l/lamson/%{name}-%{version}%{pre_release}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       python-chardet
Requires:       python-daemon
Requires:       python-jinja2
# python-lockfile is required until 513546 is fixed
Requires:       python-lockfile
Requires:       python-nose
Requires:       python-sqlalchemy

%description
Lamson is a pure Python SMTP server designed to create robust and complex mail
applications in the style of modern web frameworks such as Django. Unlike
traditional SMTP servers like Postfix or Sendmail, Lamson has all the features
of a web application stack (ORM, templates, routing, handlers, state machines,
Python) without needing to configure alias files, run newaliases, or juggle
tons of tiny fragile processes.

%package        doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    doc
This package contains documentation for %{name}.

%prep
%setup -q -n %{name}-%{version}%{pre_release}
# Fix wrong-script-end-of-line-encoding error
%{__sed} -i 's/\r//' README
# Fix lots of issues with metaphonp
metaphone='examples/librelist/lib/metaphone.py'
# Fix wrong-script-end-of-line-encoding error
%{__sed} -i 's/\r//' $metaphone
# Fix file-not-utf8 warning
iconv -f ISO_8859-1 -t UTF8 $metaphone -o $metaphone.tmp
%{__mv} -f $metaphone.tmp $metaphone
# Fix wrong-script-interpreter error
%{__sed} -i '/^#!python$/,+1 d' $metaphone
# Fix hidden-file-or-dir warnings
find doc examples -name '.*' -delete
# Fix zero-length errors
find doc examples -size 0 -delete
# Fix doc-file-dependency and spurious-executable-perm warnings
find examples -name '*.py' -exec chmod 0644 {} \;

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE PKG-INFO README
%{_bindir}/lamson
%{python_sitelib}/%{name}
%{python_sitelib}/%{name}-*.egg-info

%files doc
%defattr(-,root,root,-)
%doc examples/ doc/lamsonproject.org/output

%changelog
* Sat Dec 05 2009 Silas Sewell <silas at sewell.ch> - 1.0-0.3.pre7
- Update to 1.0pre7

* Sat Dec 05 2009 Silas Sewell <silas at sewell.ch> - 1.0-0.2.pre6
- Update to 1.0pre6
- Add doc subpackage

* Thu Jul 23 2009 Silas Sewell <silas at sewell.ch> - 1.0-0.1.pre1
- Update to 1.0pre1

* Sat May 25 2009 Silas Sewell <silas at sewell.ch> - 0.9.0-1
- Update to 0.9.0

* Sat May 25 2009 Silas Sewell <silas at sewell.ch> - 0.8.4-1
- Update to 0.8.4

* Sat May 16 2009 Silas Sewell <silas at sewell.ch> - 0.8.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lamson/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:26:21 -0000	1.1
+++ .cvsignore	7 Dec 2009 01:14:57 -0000	1.2
@@ -0,0 +1 @@
+lamson-1.0pre7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lamson/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:26:21 -0000	1.1
+++ sources	7 Dec 2009 01:14:58 -0000	1.2
@@ -0,0 +1 @@
+7970ef8cc818ffbb3235e934efb3b969  lamson-1.0pre7.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 01:15:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:15:03 +0000 (UTC)
Subject: rpms/perl-Module-Manifest/devel perl-Module-Manifest.spec,1.3,1.4
Message-ID: <20091207011503.727E011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Manifest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3355

Modified Files:
	perl-Module-Manifest.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Manifest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Manifest/devel/perl-Module-Manifest.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Module-Manifest.spec	26 Jul 2009 11:19:33 -0000	1.3
+++ perl-Module-Manifest.spec	7 Dec 2009 01:15:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Module-Manifest
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse and examine a Perl distribution MANIFEST file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:15:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:15:42 +0000 (UTC)
Subject: rpms/perl-File-NFSLock/devel perl-File-NFSLock.spec,1.6,1.7
Message-ID: <20091207011542.D9DCB11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-NFSLock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3703

Modified Files:
	perl-File-NFSLock.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-NFSLock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-NFSLock/devel/perl-File-NFSLock.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-File-NFSLock.spec	26 Jul 2009 06:02:29 -0000	1.6
+++ perl-File-NFSLock.spec	7 Dec 2009 01:15:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-File-NFSLock
 Version:        1.20
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl module to do NFS (or not) locking
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.20-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:16:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:16:17 +0000 (UTC)
Subject: rpms/subversion/devel subversion.spec,1.159,1.160
Message-ID: <20091207011617.5416011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3882

Modified Files:
	subversion.spec 
Log Message:
- rebuild against perl 5.10.1


Index: subversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- subversion.spec	26 Nov 2009 13:37:47 -0000	1.159
+++ subversion.spec	7 Dec 2009 01:16:17 -0000	1.160
@@ -17,7 +17,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -387,6 +387,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/svn2cl.1*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.6.6-4
+- rebuild against perl 5.10.1
+
 * Thu Nov 26 2009 Joe Orton <jorton at redhat.com> - 1.6.6-3
 - rebuild for new db4
 - trim libsvn_* from dependency_libs in *.la



From kasal at fedoraproject.org  Mon Dec  7 01:17:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:17:08 +0000 (UTC)
Subject: rpms/perl-Syntax-Highlight-Engine-Kate/devel
	perl-Syntax-Highlight-Engine-Kate.spec, 1.2, 1.3
Message-ID: <20091207011708.A927E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Syntax-Highlight-Engine-Kate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4127

Modified Files:
	perl-Syntax-Highlight-Engine-Kate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Syntax-Highlight-Engine-Kate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Syntax-Highlight-Engine-Kate/devel/perl-Syntax-Highlight-Engine-Kate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Syntax-Highlight-Engine-Kate.spec	26 Jul 2009 16:36:59 -0000	1.2
+++ perl-Syntax-Highlight-Engine-Kate.spec	7 Dec 2009 01:17:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Syntax-Highlight-Engine-Kate
 Version:        0.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Port to Perl of the syntax highlight engine of the Kate texteditor
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:17:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:17:43 +0000 (UTC)
Subject: rpms/perl-Class-CSV/devel perl-Class-CSV.spec,1.4,1.5
Message-ID: <20091207011743.6E8CB11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-CSV/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4350

Modified Files:
	perl-Class-CSV.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-CSV.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-CSV/devel/perl-Class-CSV.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Class-CSV.spec	26 Jul 2009 04:22:49 -0000	1.4
+++ perl-Class-CSV.spec	7 Dec 2009 01:17:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Class-CSV
 Version:        1.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Class based CSV parser/writer
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:19:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:19:25 +0000 (UTC)
Subject: rpms/perl-Module-Locate/devel perl-Module-Locate.spec,1.6,1.7
Message-ID: <20091207011925.4257C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Locate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4724

Modified Files:
	perl-Module-Locate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Locate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Locate/devel/perl-Module-Locate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Module-Locate.spec	26 Jul 2009 11:19:19 -0000	1.6
+++ perl-Module-Locate.spec	7 Dec 2009 01:19:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Module-Locate
 Version:        1.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Locate modules in the same fashion as "require" and "use"
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.7-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:20:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:20:12 +0000 (UTC)
Subject: rpms/perl-File-Next/devel perl-File-Next.spec,1.7,1.8
Message-ID: <20091207012012.3ED1F11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Next/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4965

Modified Files:
	perl-File-Next.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Next.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Next/devel/perl-File-Next.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-File-Next.spec	26 Jul 2009 06:02:43 -0000	1.7
+++ perl-File-Next.spec	7 Dec 2009 01:20:12 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-Next
 Version:        1.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File::Next Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:21:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:21:41 +0000 (UTC)
Subject: rpms/perl-Class-Container/devel perl-Class-Container.spec,1.9,1.10
Message-ID: <20091207012141.EA6E511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Container/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5356

Modified Files:
	perl-Class-Container.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Container.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Container/devel/perl-Class-Container.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-Container.spec	26 Jul 2009 04:23:18 -0000	1.9
+++ perl-Class-Container.spec	7 Dec 2009 01:21:41 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Class-Container
 Version:        0.12
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Class::Container Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:21:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:21:58 +0000 (UTC)
Subject: rpms/perl-SVN-Simple/devel perl-SVN-Simple.spec,1.6,1.7
Message-ID: <20091207012158.E18FB11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SVN-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5507

Modified Files:
	perl-SVN-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SVN-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SVN-Simple/devel/perl-SVN-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-SVN-Simple.spec	26 Jul 2009 16:27:09 -0000	1.6
+++ perl-SVN-Simple.spec	7 Dec 2009 01:21:58 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-SVN-Simple
 Version:        0.27
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A simple interface for writing a delta editor
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.27-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:23:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:23:37 +0000 (UTC)
Subject: rpms/perl-Module-Install-GithubMeta/devel
	perl-Module-Install-GithubMeta.spec, 1.1, 1.2
Message-ID: <20091207012337.345AA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Install-GithubMeta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5942

Modified Files:
	perl-Module-Install-GithubMeta.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Install-GithubMeta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Install-GithubMeta/devel/perl-Module-Install-GithubMeta.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Module-Install-GithubMeta.spec	17 Sep 2009 03:06:56 -0000	1.1
+++ perl-Module-Install-GithubMeta.spec	7 Dec 2009 01:23:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-Module-Install-GithubMeta 
 Version:    0.10 
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/Module/Install/GithubMeta.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-2
+- rebuild against perl 5.10.1
+
 * Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
 - submission
 



From kasal at fedoraproject.org  Mon Dec  7 01:24:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:24:11 +0000 (UTC)
Subject: rpms/perl-File-NCopy/devel perl-File-NCopy.spec,1.13,1.14
Message-ID: <20091207012411.A81A611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-NCopy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6137

Modified Files:
	perl-File-NCopy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-NCopy/devel/perl-File-NCopy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-File-NCopy.spec	26 Jul 2009 06:02:15 -0000	1.13
+++ perl-File-NCopy.spec	7 Dec 2009 01:24:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name: 		perl-File-NCopy
 Version: 	0.36
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary:	Copy files to directories, or a single file to another file
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.36-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:25:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:25:24 +0000 (UTC)
Subject: rpms/perl-Class-Can/devel perl-Class-Can.spec,1.3,1.4
Message-ID: <20091207012524.DE31511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Can/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6443

Modified Files:
	perl-Class-Can.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Can.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Can/devel/perl-Class-Can.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Class-Can.spec	26 Jul 2009 04:23:02 -0000	1.3
+++ perl-Class-Can.spec	7 Dec 2009 01:25:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Class-Can
 Version:        0.01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Inspect a class/method and say what it can do (and why)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:25:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:25:52 +0000 (UTC)
Subject: rpms/perl-SVN-Mirror/devel perl-SVN-Mirror.spec,1.11,1.12
Message-ID: <20091207012552.7817D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SVN-Mirror/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6618

Modified Files:
	perl-SVN-Mirror.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SVN-Mirror.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SVN-Mirror/devel/perl-SVN-Mirror.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-SVN-Mirror.spec	26 Jul 2009 16:26:51 -0000	1.11
+++ perl-SVN-Mirror.spec	7 Dec 2009 01:25:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-SVN-Mirror
 Version:        0.75
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mirror remote repository to local Subversion repository
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_bindir}/svm
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.75-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.75-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:27:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:27:24 +0000 (UTC)
Subject: rpms/perl-Module-Install-ExtraTests/devel
	perl-Module-Install-ExtraTests.spec, 1.6, 1.7
Message-ID: <20091207012724.9A06411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Install-ExtraTests/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7039

Modified Files:
	perl-Module-Install-ExtraTests.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Install-ExtraTests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Install-ExtraTests/devel/perl-Module-Install-ExtraTests.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Module-Install-ExtraTests.spec	26 Jul 2009 11:19:05 -0000	1.6
+++ perl-Module-Install-ExtraTests.spec	7 Dec 2009 01:27:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:       perl-Module-Install-ExtraTests 
 Version:        0.006
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Ignorable, contextual test support for Module::Install
@@ -53,6 +53,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.006-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.006-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:28:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:28:12 +0000 (UTC)
Subject: rpms/perl-File-Modified/devel perl-File-Modified.spec,1.5,1.6
Message-ID: <20091207012812.D8EB711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Modified/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7264

Modified Files:
	perl-File-Modified.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Modified.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Modified/devel/perl-File-Modified.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-File-Modified.spec	26 Jul 2009 06:02:01 -0000	1.5
+++ perl-File-Modified.spec	7 Dec 2009 01:28:12 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-File-Modified
 Version:        0.07
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Checks intelligently if files have changed
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:29:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:29:43 +0000 (UTC)
Subject: rpms/perl-Class-C3-XS/devel perl-Class-C3-XS.spec,1.13,1.14
Message-ID: <20091207012943.CCCEF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-C3-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7604

Modified Files:
	perl-Class-C3-XS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-C3-XS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-C3-XS/devel/perl-Class-C3-XS.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Class-C3-XS.spec	26 Sep 2009 06:56:03 -0000	1.13
+++ perl-Class-C3-XS.spec	7 Dec 2009 01:29:43 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Class-C3-XS
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        XS speedups for Class::C3
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %exclude %dir %{perl_vendorarch}/auto
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - update filtering
 - auto-update to 0.13 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Mon Dec  7 01:30:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:30:27 +0000 (UTC)
Subject: rpms/perl-SVK/devel perl-SVK.spec,1.15,1.16
Message-ID: <20091207013027.8C47011C039C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SVK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7850

Modified Files:
	perl-SVK.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SVK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SVK/devel/perl-SVK.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-SVK.spec	26 Jul 2009 16:26:36 -0000	1.15
+++ perl-SVK.spec	7 Dec 2009 01:30:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-SVK
 Version:        2.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Distributed Version Control System
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_bindir}/svk
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.2.1-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:31:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:31:44 +0000 (UTC)
Subject: rpms/perl-Module-Install/devel perl-Module-Install.spec,1.23,1.24
Message-ID: <20091207013144.14EB111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8181

Modified Files:
	perl-Module-Install.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Install/devel/perl-Module-Install.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Module-Install.spec	26 Jul 2009 11:18:51 -0000	1.23
+++ perl-Module-Install.spec	7 Dec 2009 01:31:43 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-Module-Install
 Version:        0.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Standalone, extensible Perl module installer
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.91-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:32:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:32:18 +0000 (UTC)
Subject: rpms/perl-File-MMagic-XS/devel perl-File-MMagic-XS.spec,1.10,1.11
Message-ID: <20091207013218.9284811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-MMagic-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8400

Modified Files:
	perl-File-MMagic-XS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-MMagic-XS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-MMagic-XS/devel/perl-File-MMagic-XS.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-File-MMagic-XS.spec	26 Jul 2009 06:01:33 -0000	1.10
+++ perl-File-MMagic-XS.spec	7 Dec 2009 01:32:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-File-MMagic-XS
 Version:        0.09003
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Guess file type with XS
 Group:          Development/Libraries
 License:        ASL 2.0 and (GPL+ or Artistic)
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09003-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09003-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:34:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:34:33 +0000 (UTC)
Subject: rpms/perl-Class-C3-Componentised/devel
	perl-Class-C3-Componentised.spec, 1.9, 1.10
Message-ID: <20091207013433.9DA1311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-C3-Componentised/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8887

Modified Files:
	perl-Class-C3-Componentised.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-C3-Componentised.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-C3-Componentised/devel/perl-Class-C3-Componentised.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-C3-Componentised.spec	26 Sep 2009 06:59:16 -0000	1.9
+++ perl-Class-C3-Componentised.spec	7 Dec 2009 01:34:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Class-C3-Componentised
 Version:        1.0006
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Load mix-ins or components to your C3-based class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.0006-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.0006-1
 - update filtering
 - auto-update to 1.0006 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Mon Dec  7 01:35:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:35:27 +0000 (UTC)
Subject: rpms/perl-SVG-Parser/devel perl-SVG-Parser.spec,1.3,1.4
Message-ID: <20091207013527.222CF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SVG-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9142

Modified Files:
	perl-SVG-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SVG-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SVG-Parser/devel/perl-SVG-Parser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-SVG-Parser.spec	26 Jul 2009 16:26:20 -0000	1.3
+++ perl-SVG-Parser.spec	7 Dec 2009 01:35:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-SVG-Parser
 Version:        1.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        XML Parser for SVG documents
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:35:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:35:53 +0000 (UTC)
Subject: rpms/perl-Module-Inspector/devel perl-Module-Inspector.spec, 1.4,
	1.5
Message-ID: <20091207013553.32A0F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Inspector/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9323

Modified Files:
	perl-Module-Inspector.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Inspector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Inspector/devel/perl-Module-Inspector.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Module-Inspector.spec	26 Jul 2009 11:18:37 -0000	1.4
+++ perl-Module-Inspector.spec	7 Dec 2009 01:35:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Module-Inspector
 Version:        1.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Integrated API for inspecting Perl distributions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:37:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:37:01 +0000 (UTC)
Subject: rpms/perl-File-MMagic/devel perl-File-MMagic.spec,1.21,1.22
Message-ID: <20091207013701.7A30611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-MMagic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9644

Modified Files:
	perl-File-MMagic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-MMagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-MMagic/devel/perl-File-MMagic.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-File-MMagic.spec	26 Jul 2009 06:01:19 -0000	1.21
+++ perl-File-MMagic.spec	7 Dec 2009 01:37:01 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-File-MMagic
 Version:        1.27
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A Perl module emulating the file(1) command
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.27-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:39:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:39:13 +0000 (UTC)
Subject: rpms/perl-Class-C3-Adopt-NEXT/devel perl-Class-C3-Adopt-NEXT.spec,
	1.8, 1.9
Message-ID: <20091207013913.1BB9411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-C3-Adopt-NEXT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10136

Modified Files:
	perl-Class-C3-Adopt-NEXT.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-C3-Adopt-NEXT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-C3-Adopt-NEXT/devel/perl-Class-C3-Adopt-NEXT.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-C3-Adopt-NEXT.spec	26 Jul 2009 04:22:05 -0000	1.8
+++ perl-Class-C3-Adopt-NEXT.spec	7 Dec 2009 01:39:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name:       perl-Class-C3-Adopt-NEXT
 Version:    0.12
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Class/C3/Adopt/NEXT.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:39:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:39:26 +0000 (UTC)
Subject: rpms/perl-SVG-Graph/devel perl-SVG-Graph.spec,1.5,1.6
Message-ID: <20091207013926.C199C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SVG-Graph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10287

Modified Files:
	perl-SVG-Graph.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SVG-Graph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SVG-Graph/devel/perl-SVG-Graph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-SVG-Graph.spec	26 Jul 2009 16:26:02 -0000	1.5
+++ perl-SVG-Graph.spec	7 Dec 2009 01:39:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-SVG-Graph
 Version:        0.02
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Visualize your data in Scalable Vector Graphics (SVG) format
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:40:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:40:47 +0000 (UTC)
Subject: rpms/perl-Module-Info/devel perl-Module-Info.spec,1.10,1.11
Message-ID: <20091207014047.DD5FB11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10639

Modified Files:
	perl-Module-Info.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Info/devel/perl-Module-Info.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Module-Info.spec	26 Jul 2009 11:18:23 -0000	1.10
+++ perl-Module-Info.spec	7 Dec 2009 01:40:47 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Module-Info
 Version:        0.31
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Information about Perl modules
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_provides
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.31-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:41:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:41:40 +0000 (UTC)
Subject: rpms/perl-File-MimeInfo/devel perl-File-MimeInfo.spec,1.8,1.9
Message-ID: <20091207014140.BC01B11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-MimeInfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10962

Modified Files:
	perl-File-MimeInfo.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-MimeInfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-MimeInfo/devel/perl-File-MimeInfo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-File-MimeInfo.spec	26 Jul 2009 06:01:47 -0000	1.8
+++ perl-File-MimeInfo.spec	7 Dec 2009 01:41:40 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-File-MimeInfo
 Version:        0.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Determine file type and open application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From agoode at fedoraproject.org  Mon Dec  7 01:41:51 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Mon,  7 Dec 2009 01:41:51 +0000 (UTC)
Subject: rpms/mingw32-openjpeg/F-11 mingw32-openjpeg.spec, NONE,
	1.1 openjpeg-1.3-libm.patch, NONE,
	1.1 openjpeg-1.3-mingw32-cmake.patch, NONE,
	1.1 openjpeg-1.3-reverse-bogus-aligned-malloc.patch, NONE,
	1.1 openjpeg-1.3-tcd_init_encode-alloc-fix.patch, NONE,
	1.1 openjpeg-20070717svn-codec-libtiff.patch, NONE,
	1.1 openjpeg-20070717svn-mqc-optimize.patch, NONE,
	1.1 openjpeg-20070719svn-mqc-more-optimize.patch, NONE,
	1.1 openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch,
	NONE, 1.1 openjpeg-20070719svn-t1-x86_64-flags-branchless.patch,
	NONE, 1.1 openjpeg-20070821svn-t1-flags-stride.patch, NONE,
	1.1 openjpeg-20070821svn-t1-remove-macro.patch, NONE,
	1.1 openjpeg-20070821svn-t1-updateflags-x86_64.patch, NONE,
	1.1 openjpeg-svn468-mj2-noscroll.patch, NONE,
	1.1 openjpeg-svn470-t1-flags-mmx.patch, NONE,
	1.1 openjpeg-svn480-cmake.patch, NONE,
	1.1 openjpeg-svn480-use-stdbool.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207014151.33EAA11C00E0@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mingw32-openjpeg/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11103

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-openjpeg.spec openjpeg-1.3-libm.patch 
	openjpeg-1.3-mingw32-cmake.patch 
	openjpeg-1.3-reverse-bogus-aligned-malloc.patch 
	openjpeg-1.3-tcd_init_encode-alloc-fix.patch 
	openjpeg-20070717svn-codec-libtiff.patch 
	openjpeg-20070717svn-mqc-optimize.patch 
	openjpeg-20070719svn-mqc-more-optimize.patch 
	openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch 
	openjpeg-20070719svn-t1-x86_64-flags-branchless.patch 
	openjpeg-20070821svn-t1-flags-stride.patch 
	openjpeg-20070821svn-t1-remove-macro.patch 
	openjpeg-20070821svn-t1-updateflags-x86_64.patch 
	openjpeg-svn468-mj2-noscroll.patch 
	openjpeg-svn470-t1-flags-mmx.patch openjpeg-svn480-cmake.patch 
	openjpeg-svn480-use-stdbool.patch 
Log Message:
* Mon Nov 16 2009 Adam Goode <adam at spicenitz.org> - 1.3-5
- Initial release, tracking Fedora native openjpeg-1.3-5



--- NEW FILE mingw32-openjpeg.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}

# reset patch fuzz, rebasing patches will require delicate surgery -- Rex
%global _default_patch_fuzz 2

Name:    mingw32-openjpeg
Version: 1.3
Release: 5%{?dist}
Summary: MinGW Windows openjpeg library

Group:     Development/Libraries
License:   BSD
URL:       http://www.openjpeg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: cmake

BuildRequires: mingw32-filesystem >= 52
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-libtiff

Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz

# Patches from native Fedora package:
Patch1: openjpeg-20070717svn-codec-libtiff.patch
Patch4: openjpeg-svn480-cmake.patch
Patch5: openjpeg-svn480-use-stdbool.patch
Patch6: openjpeg-1.3-tcd_init_encode-alloc-fix.patch
Patch7: openjpeg-1.3-reverse-bogus-aligned-malloc.patch
Patch44: openjpeg-svn468-mj2-noscroll.patch
Patch21: openjpeg-20070717svn-mqc-optimize.patch
Patch22: openjpeg-20070821svn-t1-remove-macro.patch
Patch23: openjpeg-20070719svn-t1-x86_64-flags-branchless.patch
Patch24: openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch
Patch25: openjpeg-20070821svn-t1-flags-stride.patch
Patch26: openjpeg-20070821svn-t1-updateflags-x86_64.patch
Patch27: openjpeg-svn470-t1-flags-mmx.patch
Patch28: openjpeg-20070719svn-mqc-more-optimize.patch

# libopenjpeg has undefined references, http://bugzilla.redhat.com/467661
Patch50: openjpeg-1.3-libm.patch

# Patches for MinGW:
Patch1000: openjpeg-1.3-mingw32-cmake.patch


%description
%{_mingw32_description}


%{_mingw32_debug_package}


%prep
%setup -q -n OpenJPEG_v1_3
# Make sure we use system libraries
rm -rf libs
%patch1 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch44 -p1
%patch22 -p1
%patch23 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch24 -p1
%patch21 -p1
%patch28 -p1
%patch50 -p1 -b .libm

%patch1000 -p1

# Fix permissions
chmod a-x ChangeLog license.txt


%build
mkdir build
pushd build
export MINGW32_CFLAGS="%{_mingw32_cflags} -DWIN32"
%{_mingw32_cmake} ..
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT
pushd build
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libopenjpeg.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
popd

# HACK: until pkg-config support lands, temporarily provide
# openjpeg.h header in legacy location
ln -s openjpeg/openjpeg.h $RPM_BUILD_ROOT%{_mingw32_includedir}/openjpeg.h


%check
# mostly pointless without test images, but it's a start -- Rex
make test -C build


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc license.txt
%{_mingw32_includedir}/openjpeg.h
%{_mingw32_includedir}/openjpeg
%{_mingw32_bindir}/libopenjpeg.dll
%{_mingw32_libdir}/libopenjpeg.dll.a


%changelog
* Mon Nov 16 2009 Adam Goode <adam at spicenitz.org> - 1.3-5
- Initial release, tracking Fedora native openjpeg-1.3-5

openjpeg-1.3-libm.patch:
 codec/CMakeLists.txt       |    4 ----
 libopenjpeg/CMakeLists.txt |    5 +++++
 mj2/CMakeLists.txt         |   12 ------------
 3 files changed, 5 insertions(+), 16 deletions(-)

--- NEW FILE openjpeg-1.3-libm.patch ---
diff -up OpenJPEG_v1_3/codec/CMakeLists.txt.libm OpenJPEG_v1_3/codec/CMakeLists.txt
--- OpenJPEG_v1_3/codec/CMakeLists.txt.libm	2007-11-27 06:38:52.000000000 -0600
+++ OpenJPEG_v1_3/codec/CMakeLists.txt	2009-06-19 09:20:59.473980422 -0500
@@ -46,10 +46,6 @@ FOREACH(exe j2k_to_image image_to_j2k)
   ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
   # calling those exe without option will make them fail always:
   SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)
-  # On unix you need to link to the math library:
-  IF(UNIX)
-    TARGET_LINK_LIBRARIES(${exe} m)
-  ENDIF(UNIX)
   # Install exe
   INSTALL_TARGETS(/bin/ ${exe})
 ENDFOREACH(exe)
diff -up OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt.libm OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt
--- OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt.libm	2009-06-19 09:18:44.021229314 -0500
+++ OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt	2009-06-19 09:18:44.074248015 -0500
@@ -35,6 +35,11 @@ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${O
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
 	${OPENJPEG_LIBRARY_PROPERTIES})
 
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
+  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} LINK_INTERFACE_LIBRARIES)
+ENDIF(UNIX)
+
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
 	DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff -up OpenJPEG_v1_3/mj2/CMakeLists.txt.libm OpenJPEG_v1_3/mj2/CMakeLists.txt
--- OpenJPEG_v1_3/mj2/CMakeLists.txt.libm	2007-09-12 04:04:03.000000000 -0500
+++ OpenJPEG_v1_3/mj2/CMakeLists.txt	2009-06-19 09:18:44.074248015 -0500
@@ -10,33 +10,21 @@ ADD_EXECUTABLE(frames_to_mj2
   compat/getopt.c 
   mj2_convert.c mj2.c )
 TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(frames_to_mj2 m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(mj2_to_frames
     mj2_to_frames.c
     compat/getopt.c mj2_convert.c mj2.c )
 TARGET_LINK_LIBRARIES(mj2_to_frames ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(mj2_to_frames m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(extract_j2k_from_mj2
     extract_j2k_from_mj2.c
     mj2.c )
 TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(wrap_j2k_in_mj2
     wrap_j2k_in_mj2.c
     mj2.c )
 TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m)
-ENDIF(UNIX)
 
 INSTALL(TARGETS frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
 	DESTINATION bin)

openjpeg-1.3-mingw32-cmake.patch:
 CMakeLists.txt |    9 ---------
 1 file changed, 9 deletions(-)

--- NEW FILE openjpeg-1.3-mingw32-cmake.patch ---
diff -ur OpenJPEG_v1_3~/CMakeLists.txt OpenJPEG_v1_3/CMakeLists.txt
--- OpenJPEG_v1_3~/CMakeLists.txt	2009-06-03 09:40:53.000000000 -0400
+++ OpenJPEG_v1_3/CMakeLists.txt	2009-06-03 09:41:28.000000000 -0400
@@ -67,19 +67,10 @@
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 SUBDIRS(
   libopenjpeg
-  mj2
   # cmake 2.4.5 has poor java support
   #j2kviewer/src
   )
 
-IF(NOT UNIX)
-SUBDIRS(
-  jpwl
-  jp3d
-  indexer_JPIP
-  )
-ENDIF(NOT UNIX)
-
 #-----------------------------------------------------------------------------
 # Build example only if requested
 IF(BUILD_EXAMPLES)

openjpeg-1.3-reverse-bogus-aligned-malloc.patch:
 opj_malloc.h |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE openjpeg-1.3-reverse-bogus-aligned-malloc.patch ---
--- OpenJPEG_v1_3/libopenjpeg/opj_malloc.h	2007-12-21 04:19:01.000000000 -0600
+++ trunk/libopenjpeg/opj_malloc.h	2007-10-18 07:26:11.000000000 -0500
@@ -75,9 +75,6 @@
 #else /* Not WIN32 */
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
-		#elif defined(__GNUC__)
-			#define HAVE_MEMALIGN
-			#include <malloc.h>		
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
 		#elif !defined(__amd64__) && !defined(__APPLE__)	
 			/* FIXME: Yes, this is a big assumption */
@@ -85,8 +82,6 @@
 	#endif
 #endif
 
-
-
 #define opj_aligned_malloc(size) malloc(size)
 #define opj_aligned_free(m) free(m)
 

openjpeg-1.3-tcd_init_encode-alloc-fix.patch:
 tcd.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openjpeg-1.3-tcd_init_encode-alloc-fix.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/tcd.c OpenJPEG.patched/libopenjpeg/tcd.c
--- OpenJPEG.orig/libopenjpeg/tcd.c	2007-12-19 06:28:40.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/tcd.c	2007-12-27 21:58:57.000000000 -0600
@@ -584,7 +584,9 @@
 							cblk->y0 = int_max(cblkystart, prc->y0);
 							cblk->x1 = int_min(cblkxend, prc->x1);
 							cblk->y1 = int_min(cblkyend, prc->y1);
-							cblk->data = (unsigned char*) opj_calloc(8192, sizeof(unsigned char));
+							cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
+							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
+							cblk->data += 2;
 							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
 							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
 						}

openjpeg-20070717svn-codec-libtiff.patch:
 convert.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openjpeg-20070717svn-codec-libtiff.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/codec/convert.c OpenJPEG.patched/codec/convert.c
--- OpenJPEG.orig/codec/convert.c	2007-07-17 11:19:41.000000000 -0500
+++ OpenJPEG.patched/codec/convert.c	2007-07-17 19:40:02.000000000 -0500
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "openjpeg.h"
-#include "../libs/libtiff/tiffio.h"
+#include "tiffio.h"
 #include "convert.h"
 
 /*

openjpeg-20070717svn-mqc-optimize.patch:
 mqc.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE openjpeg-20070717svn-mqc-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/mqc.c OpenJPEG.patched/libopenjpeg/mqc.c
--- OpenJPEG.orig/libopenjpeg/mqc.c	2007-07-17 20:07:22.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/mqc.c	2007-07-17 20:07:44.000000000 -0500
@@ -507,20 +507,20 @@
 
 int mqc_decode(opj_mqc_t *mqc) {
 	int d;
-	mqc->a -= (*mqc->curctx)->qeval;
-	if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
+	unsigned int qeval = (*mqc->curctx)->qeval;
+	mqc->a -= qeval;
+	qeval <<= 16;
+	if (mqc->c < qeval) {
 		d = mqc_lpsexchange(mqc);
-		mqc_renormd(mqc);
 	} else {
-		mqc->c -= (*mqc->curctx)->qeval << 16;
+		mqc->c -= qeval;
 		if ((mqc->a & 0x8000) == 0) {
 			d = mqc_mpsexchange(mqc);
-			mqc_renormd(mqc);
 		} else {
-			d = (*mqc->curctx)->mps;
+			return (*mqc->curctx)->mps;
 		}
 	}
-
+	mqc_renormd(mqc);
 	return d;
 }
 

openjpeg-20070719svn-mqc-more-optimize.patch:
 mqc.c |   58 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

--- NEW FILE openjpeg-20070719svn-mqc-more-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/mqc.c OpenJPEG.patched/libopenjpeg/mqc.c
--- OpenJPEG.orig/libopenjpeg/mqc.c	2007-08-06 16:16:00.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/mqc.c	2007-08-06 19:07:28.000000000 -0500
@@ -68,13 +68,13 @@
 @param mqc MQC handle
 @return 
 */
-static int mqc_mpsexchange(opj_mqc_t *mqc);
+//static int mqc_mpsexchange(opj_mqc_t *mqc);
 /**
 FIXME: documentation ???
 @param mqc MQC handle
 @return 
 */
-static int mqc_lpsexchange(opj_mqc_t *mqc);
+//static int mqc_lpsexchange(opj_mqc_t *mqc);
 /**
 Input a byte
 @param mqc MQC handle
@@ -271,33 +271,22 @@
 	}
 }
 
+/*
 static int mqc_mpsexchange(opj_mqc_t *mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	} else {
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	}
-	
-	return d;
+	int d = (*mqc->curctx)->mps;
+	int tmp = (mqc->a < (*mqc->curctx)->qeval);
+	*mqc->curctx = tmp ? (*mqc->curctx)->nlps : (*mqc->curctx)->nmps;
+	return tmp ^ d;
 }
 
 static int mqc_lpsexchange(opj_mqc_t *mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	} else {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	}
-	
-	return d;
+	int d = (*mqc->curctx)->mps;
+	int tmp = !(mqc->a < (*mqc->curctx)->qeval);
+	mqc->a = (*mqc->curctx)->qeval;
+	*mqc->curctx = tmp ? (*mqc->curctx)->nlps : (*mqc->curctx)->nmps;
+	return tmp ^ d;
 }
+*/
 
 static void mqc_bytein(opj_mqc_t *mqc) {
 	if (mqc->bp != mqc->end) {
@@ -506,22 +495,27 @@
 }
 
 int mqc_decode(opj_mqc_t *mqc) {
-	int d;
 	unsigned int qeval = (*mqc->curctx)->qeval;
 	mqc->a -= qeval;
+	bool tmp = (mqc->a < qeval);
 	qeval <<= 16;
-	if (mqc->c < qeval) {
-		d = mqc_lpsexchange(mqc);
-	} else {
+	if (mqc->c >= qeval) {
 		mqc->c -= qeval;
-		if ((mqc->a & 0x8000) == 0) {
-			d = mqc_mpsexchange(mqc);
-		} else {
+		if (mqc->a & 0x8000) {
 			return (*mqc->curctx)->mps;
 		}
+	}else{
+		tmp = !tmp;
+		mqc->a = (*mqc->curctx)->qeval;
 	}
+
+	opj_mqc_state_t* nmps = (*mqc->curctx)->nmps;
+	opj_mqc_state_t* nlps = (*mqc->curctx)->nlps;
+	int mps = (*mqc->curctx)->mps ^ tmp;
+	*mqc->curctx = tmp ? nlps : nmps;
+
 	mqc_renormd(mqc);
-	return d;
+	return mps;
 }
 
 void mqc_resetstates(opj_mqc_t *mqc) {

openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch:
 t1.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-09 19:26:57.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-09 19:44:25.000000000 -0500
@@ -40,7 +40,7 @@
 /*@{*/
 
 static INLINE char t1_getctxno_zc(int f, int orient);
-static char t1_getctxno_sc(int f);
+static INLINE char t1_getctxno_sc(int f);
 static INLINE int t1_getctxno_mag(int f);
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
@@ -334,6 +334,7 @@
 	
 	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
 	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+		*flagsp |= T1_VISIT;
 		if (type == T1_TYPE_RAW) {
 			if (raw_decode(raw)) {
 				v = raw_decode(raw);	/* ESSAI */
@@ -349,7 +350,6 @@
 				t1_updateflags(flagsp, v, t1->flags_stride);
 			}
 		}
-		*flagsp |= T1_VISIT;
 	}
 }				/* VSC and  BYPASS by Antonin */
 

openjpeg-20070719svn-t1-x86_64-flags-branchless.patch:
 t1.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE openjpeg-20070719svn-t1-x86_64-flags-branchless.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-06 14:07:59.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-06 15:54:31.000000000 -0500
@@ -669,6 +669,17 @@
 	for (k = 0; k < t1->h; k += 4) {
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
+#ifdef __amd64__
+				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*t1->flags_stride]);
+				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
+				}
+				tmp &= (int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<16)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<32)
+				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<48);
+				agg = !tmp;
+#else
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
 					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
@@ -681,6 +692,7 @@
 					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
 					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
+#endif
 			} else {
 				agg = 0;
 			}

openjpeg-20070821svn-t1-flags-stride.patch:
 t1.c |   59 +++++++++++++++++++++++++++++------------------------------
 t1.h |    1 -
 2 files changed, 29 insertions(+), 31 deletions(-)

--- NEW FILE openjpeg-20070821svn-t1-flags-stride.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:48:09.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:50:29.000000000 -0500
@@ -312,7 +312,7 @@
 			} else {
 				mqc_encode(mqc, v ^ t1_getspb(flag));
 			}
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 		*flagsp |= T1_VISIT;
 	}
@@ -339,7 +339,7 @@
 			if (raw_decode(raw)) {
 				v = raw_decode(raw);	/* ESSAI */
 				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
+				t1_updateflags(flagsp, v, (t1->h+2));
 			}
 		} else {
 			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
@@ -347,7 +347,7 @@
 				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 				v = mqc_decode(mqc) ^ t1_getspb(flag);
 				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
+				t1_updateflags(flagsp, v, (t1->h+2));
 			}
 		}
 	}
@@ -370,7 +370,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_sigpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -400,7 +400,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_sigpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -483,7 +483,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_refpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						bpno,
 						one,
@@ -512,7 +512,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_refpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						poshalf,
 						neghalf,
@@ -552,7 +552,7 @@
 			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 			v = *datap < 0 ? 1 : 0;
 			mqc_encode(mqc, v ^ t1_getspb(flag));
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 	}
 	*flagsp &= ~T1_VISIT;
@@ -582,7 +582,7 @@
 			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 			v = mqc_decode(mqc) ^ t1_getspb(flag);
 			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
+			t1_updateflags(flagsp, v, (t1->h+2));
 		}
 	}
 	*flagsp &= ~T1_VISIT;
@@ -605,16 +605,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
 					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -639,7 +639,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_clnpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -670,7 +670,7 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 #ifdef __amd64__
-				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*t1->flags_stride]);
+				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*(t1->h+2)]);
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
 				}
@@ -681,16 +681,16 @@
 				agg = !tmp;
 #else
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
 					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 #endif
 			} else {
@@ -711,7 +711,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_clnpass_step(
 						t1,
-						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
+						&t1->flags[(j+1) + (i+1)*(t1->h+2)],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -779,8 +779,7 @@
 	}
 	memset(t1->data,0,datasize * sizeof(int));
 
-	t1->flags_stride=h+2;
-	flagssize=t1->flags_stride * (w+2);
+	flagssize=(h+2) * (w+2);
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.h OpenJPEG.patched/libopenjpeg/t1.h
--- OpenJPEG.orig/libopenjpeg/t1.h	2007-08-23 05:48:09.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.h	2007-08-23 05:48:37.000000000 -0500
@@ -105,7 +105,6 @@
 	int h;
 	int datasize;
 	int flagssize;
-	int flags_stride;
 } opj_t1_t;
 
 /** @name Exported functions */

openjpeg-20070821svn-t1-remove-macro.patch:
 t1.c |   77 ++++++++++++++++++++++++++++++++-----------------------------------
 t1.h |    2 -
 2 files changed, 37 insertions(+), 42 deletions(-)

--- NEW FILE openjpeg-20070821svn-t1-remove-macro.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:43:10.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:46:31.000000000 -0500
@@ -259,27 +259,24 @@
 }
 
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
-	flag_t *np = flagsp - stride;
-	flag_t *sp = flagsp + stride;
-
 	static const flag_t mod[] = {
-		T1_SIG_S, T1_SIG_S|T1_SGN_S,
 		T1_SIG_E, T1_SIG_E|T1_SGN_E,
-		T1_SIG_W, T1_SIG_W|T1_SGN_W,
-		T1_SIG_N, T1_SIG_N|T1_SGN_N
+		T1_SIG_S, T1_SIG_S|T1_SGN_S,
+		T1_SIG_N, T1_SIG_N|T1_SGN_N,
+		T1_SIG_W, T1_SIG_W|T1_SGN_W
 	};
 
-	np[-1] |= T1_SIG_SE;
-	np[0]  |= mod[s];
-	np[1]  |= T1_SIG_SW;
+	flagsp[-1 - stride] |= T1_SIG_SE;
+	flagsp[ 0 - stride] |= mod[s];
+	flagsp[ 1 - stride] |= T1_SIG_NE;
 
 	flagsp[-1] |= mod[s+2];
-	flagsp[0]  |= T1_SIG;
-	flagsp[1]  |= mod[s+4];
+	flagsp[ 0] |= T1_SIG;
+	flagsp[ 1] |= mod[s+4];
 
-	sp[-1] |= T1_SIG_NE;
-	sp[0]  |= mod[s+6];
-	sp[1]  |= T1_SIG_NW;
+	flagsp[-1 + stride] |= T1_SIG_SW;
+	flagsp[ 0 + stride] |= mod[s+6];
+	flagsp[ 1 + stride] |= T1_SIG_NW;
 }
 
 static void t1_enc_sigpass_step(
@@ -373,7 +370,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_sigpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -403,7 +400,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_sigpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -486,7 +483,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_refpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						bpno,
 						one,
@@ -515,7 +512,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_refpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						poshalf,
 						neghalf,
@@ -608,16 +605,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -642,7 +639,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_enc_clnpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						bpno,
@@ -673,16 +670,16 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    ||  t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					    || (t1->flags[(k+4) + (i+1)*t1->flags_stride] 
+					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(t1->flags[(k+1) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+2) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+3) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+					     || t1->flags[(k+4) + (i+1)*t1->flags_stride] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -702,7 +699,7 @@
 				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
 				t1_dec_clnpass_step(
 						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->flags[(j+1) + (i+1)*t1->flags_stride],
 						&t1->data[(j * t1->w) + i],
 						orient,
 						oneplushalf,
@@ -770,8 +767,8 @@
 	}
 	memset(t1->data,0,datasize * sizeof(int));
 
-	t1->flags_stride=w+2;
-	flagssize=t1->flags_stride * (h+2);
+	t1->flags_stride=h+2;
+	flagssize=t1->flags_stride * (w+2);
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.h OpenJPEG.patched/libopenjpeg/t1.h
--- OpenJPEG.orig/libopenjpeg/t1.h	2007-05-22 08:14:13.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.h	2007-08-23 05:44:00.000000000 -0500
@@ -108,8 +108,6 @@
 	int flags_stride;
 } opj_t1_t;
 
-#define MACRO_t1_flags(x,y) t1->flags[((x)*(t1->flags_stride))+(y)]
-
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */

openjpeg-20070821svn-t1-updateflags-x86_64.patch:
 t1.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

--- NEW FILE openjpeg-20070821svn-t1-updateflags-x86_64.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-08-23 05:53:17.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-08-23 05:56:33.000000000 -0500
@@ -45,7 +45,11 @@
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
 static short t1_getnmsedec_ref(int x, int bitpos);
+#ifdef __amd64__
+static INLINE void t1_updateflags(flag_t *flagsp, int s, int stride);
+#else
 static void t1_updateflags(flag_t *flagsp, int s, int stride);
+#endif
 /**
 Encode significant pass
 */
@@ -258,6 +262,38 @@
     return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
 }
 
+#ifdef __amd64__
+
+/* On 64 bit platforms we can set three flags at a time. (SWAR) */
+/* FIXME: Assumes little endian? */
+
+#define VEC(x,y,z) (int64)(x)|((int64)(y)<<16)|((int64)(z)<<32)
+
+static void t1_updateflags(flag_t *flagsp, int s, int stride) {
+	static const int64 mod[] = {
+		VEC(T1_SIG_SE,         T1_SIG_E,          T1_SIG_NE),
+		VEC(T1_SIG_SE,         T1_SIG_E|T1_SGN_E, T1_SIG_NE),
+		VEC(T1_SIG_S,          T1_SIG,            T1_SIG_N),
+		VEC(T1_SIG_S|T1_SGN_S, T1_SIG,            T1_SIG_N|T1_SGN_N),
+		VEC(T1_SIG_SW,         T1_SIG_W,          T1_SIG_NW),
+		VEC(T1_SIG_SW,         T1_SIG_W|T1_SGN_W, T1_SIG_NW)
+	};
+
+	int64 tmp1 = *(int64*)((void*)&flagsp[-1 - stride]);
+	int64 tmp2 = *(int64*)((void*)&flagsp[-1         ]);
+	int64 tmp3 = *(int64*)((void*)&flagsp[-1 + stride]);
+
+	tmp1 |= mod[s];
+	tmp2 |= mod[s+2];
+	tmp3 |= mod[s+4];
+
+	*(int64*)((void*)&flagsp[-1 - stride]) = tmp1;
+	*(int64*)((void*)&flagsp[-1         ]) = tmp2;
+	*(int64*)((void*)&flagsp[-1 + stride]) = tmp3;
+}
+
+#else
+
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
 	static const flag_t mod[] = {
 		T1_SIG_E, T1_SIG_E|T1_SGN_E,
@@ -279,6 +315,8 @@
 	flagsp[ 1 + stride] |= T1_SIG_NW;
 }
 
+#endif
+
 static void t1_enc_sigpass_step(
 		opj_t1_t *t1,
 		flag_t *flagsp,
@@ -670,6 +708,8 @@
 		for (i = 0; i < t1->w; ++i) {
 			if (k + 3 < t1->h) {
 #ifdef __amd64__
+				/* 64 bit SWAR */
+				/* FIXME: Assumes little endian? */
 				int64 tmp = *((int64*)&t1->flags[(k+1) + (i+1)*(t1->h+2)]);
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
 					tmp &= ~((int64)(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S)<<48);
@@ -780,6 +820,11 @@
 	memset(t1->data,0,datasize * sizeof(int));
 
 	flagssize=(h+2) * (w+2);
+#ifdef __amd64__
+	/* 64 bit SIMD/SWAR in t1_updateflags requires one short of headroom
+	   because three shorts = 48 bits. */
+	++flagssize;
+#endif
 
 	if(flagssize > t1->flagssize){
 		opj_aligned_free(t1->flags);

openjpeg-svn468-mj2-noscroll.patch:
 frames_to_mj2.c |    4 ++--
 mj2_to_frames.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openjpeg-svn468-mj2-noscroll.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.patched/mj2/frames_to_mj2.c OpenJPEG.foo/mj2/frames_to_mj2.c
--- OpenJPEG.patched/mj2/frames_to_mj2.c	2007-10-18 07:26:11.000000000 -0500
+++ OpenJPEG.foo/mj2/frames_to_mj2.c	2007-11-03 22:48:45.000000000 -0500
@@ -758,7 +758,7 @@
 				fwrite(buf, 1, len+8, mj2file);				
 				offset += len+8;				
 				elapsed_time = opj_clock()-init_time;
-				fprintf(stderr, "Frame number %d/%d encoded in %.2f mseconds\n", sampleno + 1, numframes, elapsed_time*1000);
+				fprintf(stderr, "Frame number %d/%d encoded in %.2f mseconds \r", sampleno + 1, numframes, elapsed_time*1000);
 				total_time += elapsed_time;
 
       }
@@ -787,7 +787,7 @@
   fwrite(buf,cio_tell(cio),1,mj2file);
   free(buf);
 
-	fprintf(stdout,"Total encoding time: %.2f s for %d frames (%.1f fps)\n", total_time, numframes, (float)numframes/total_time);
+	fprintf(stdout,"\nTotal encoding time: %.2f s for %d frames (%.1f fps)\n", total_time, numframes, (float)numframes/total_time);
   
   // Ending program 
   
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.patched/mj2/mj2_to_frames.c OpenJPEG.foo/mj2/mj2_to_frames.c
--- OpenJPEG.patched/mj2/mj2_to_frames.c	2007-10-18 07:26:11.000000000 -0500
+++ OpenJPEG.foo/mj2/mj2_to_frames.c	2007-11-03 22:48:45.000000000 -0500
@@ -204,7 +204,7 @@
 		/* free image data structure */
 		opj_image_destroy(img);
 		elapsed_time = opj_clock()-init_time;
-		fprintf(stderr, "Frame number %d/%d decoded in %.2f mseconds\n", snum + 1, numframes, elapsed_time*1000);
+		fprintf(stderr, "Frame number %d/%d decoded in %.2f mseconds \r", snum + 1, numframes, elapsed_time*1000);
 		total_time += elapsed_time;
 
   }
@@ -218,7 +218,7 @@
 	}
 	free(dinfo);
 	
-	fprintf(stdout, "%d frame(s) correctly decompressed\n", snum);
+	fprintf(stdout, "\n%d frame(s) correctly decompressed\n", snum);
 	fprintf(stdout,"Total decoding time: %.2f seconds (%.1f fps)\n", total_time, (float)numframes/total_time);
 		
   return 0;

openjpeg-svn470-t1-flags-mmx.patch:
 t1.c |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 12 deletions(-)

--- NEW FILE openjpeg-svn470-t1-flags-mmx.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/t1.c OpenJPEG.patched/libopenjpeg/t1.c
--- OpenJPEG.orig/libopenjpeg/t1.c	2007-11-13 13:52:05.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/t1.c	2007-11-14 01:09:40.000000000 -0600
@@ -33,6 +33,17 @@
 #include "opj_includes.h"
 #include "t1_luts.h"
 
+/* Don't use MMX on amd64 */
+/* Note that merely including mmintrin.h, even if we don't use it, changes the code gcc */
+/* outputs on amd64, and it is measurably slower. A bug in gcc? */
+#ifdef __amd64__
+#undef __MMX__
+#endif
+
+#ifdef __MMX__
+#include <mmintrin.h>
+#endif
+
 /** @defgroup T1 T1 - Implementation of the tier-1 coding */
 /*@{*/
 
@@ -45,7 +56,7 @@
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
 static short t1_getnmsedec_ref(int x, int bitpos);
-#ifdef __amd64__
+#if defined(__amd64__) || defined(__MMX__)
 static INLINE void t1_updateflags(flag_t *flagsp, int s, int stride);
 #else
 static void t1_updateflags(flag_t *flagsp, int s, int stride);
@@ -293,6 +304,32 @@
 }
 
 #else
+#ifdef __MMX__
+
+static void t1_updateflags(flag_t *flagsp, int s, int stride) {
+	static const __v4hi mod[] = {
+		{T1_SIG_SE,         T1_SIG_E,          T1_SIG_NE,         0},
+		{T1_SIG_SE,         T1_SIG_E|T1_SGN_E, T1_SIG_NE,         0},
+		{T1_SIG_S,          T1_SIG,            T1_SIG_N,          0},
+		{T1_SIG_S|T1_SGN_S, T1_SIG,            T1_SIG_N|T1_SGN_N, 0},
+		{T1_SIG_SW,         T1_SIG_W,          T1_SIG_NW,         0},
+		{T1_SIG_SW,         T1_SIG_W|T1_SGN_W, T1_SIG_NW,         0}
+	};
+
+	__m64 tmp1 = *(__m64*)((void*)&flagsp[-1 - stride]);
+	__m64 tmp2 = *(__m64*)((void*)&flagsp[-1         ]);
+	__m64 tmp3 = *(__m64*)((void*)&flagsp[-1 + stride]);
+
+	tmp1 = _mm_or_si64(tmp1, mod[s]);
+	tmp2 = _mm_or_si64(tmp2, mod[s+2]);
+	tmp3 = _mm_or_si64(tmp3, mod[s+4]);
+
+	*(__m64*)((void*)&flagsp[-1 - stride]) = tmp1;
+	*(__m64*)((void*)&flagsp[-1         ]) = tmp2;
+	*(__m64*)((void*)&flagsp[-1 + stride]) = tmp3;
+}
+
+#else
 
 static void t1_updateflags(flag_t *flagsp, int s, int stride) {
 	static const flag_t mod[] = {
@@ -316,6 +353,7 @@
 }
 
 #endif
+#endif
 
 static void t1_enc_sigpass_step(
 		opj_t1_t *t1,
@@ -720,18 +758,14 @@
 				    | ((int64)(T1_SIG | T1_VISIT | T1_SIG_OTH)<<48);
 				agg = !tmp;
 #else
+				int* flagsp = (int*)&t1->flags[(k+1) + (i+1)*(t1->h+2)];
+				agg = flagsp[1];
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    ||  t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					    || (t1->flags[(k+4) + (i+1)*(t1->h+2)] 
-					   & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				} else {
-					agg = !(t1->flags[(k+1) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+2) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+3) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					     || t1->flags[(k+4) + (i+1)*(t1->h+2)] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg &= ~((T1_SIG_S|T1_SIG_SE|T1_SIG_SW|T1_SGN_S)<<16);
 				}
+				agg |= flagsp[0];
+				agg &= (T1_SIG|T1_VISIT|T1_SIG_OTH)|(T1_SIG|T1_VISIT|T1_SIG_OTH)<<16;
+				agg = !agg;
 #endif
 			} else {
 				agg = 0;
@@ -820,7 +854,7 @@
 	memset(t1->data,0,datasize * sizeof(int));
 
 	flagssize=(h+2) * (w+2);
-#ifdef __amd64__
+#if defined(__amd64__) || defined(__MMX__)
 	/* 64 bit SIMD/SWAR in t1_updateflags requires one short of headroom
 	   because three shorts = 48 bits. */
 	++flagssize;
@@ -886,6 +920,9 @@
 		int correction = 3;
 		type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
 		
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 		switch (passtype) {
 			case 0:
 				t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
@@ -900,6 +937,9 @@
 					mqc_segmark_enc(mqc);
 				break;
 		}
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 		
 		/* fixed_quality */
 		cumwmsedec += t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps);
@@ -1004,6 +1044,9 @@
 	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
 	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 	
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 	for (segno = 0; segno < cblk->numsegs; ++segno) {
 		opj_tcd_seg_t *seg = &cblk->segs[segno];
 		
@@ -1044,6 +1087,9 @@
 			}
 		}
 	}
+#if !defined(__amd64__) && defined(__MMX__)
+	_mm_empty();
+#endif
 }
 
 /* ----------------------------------------------------------------------- */

openjpeg-svn480-cmake.patch:
 CMakeLists.txt             |    9 +++++++--
 libopenjpeg/CMakeLists.txt |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE openjpeg-svn480-cmake.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/CMakeLists.txt OpenJPEG.patched/CMakeLists.txt
--- OpenJPEG.orig/CMakeLists.txt	2007-09-25 09:54:49.000000000 -0500
+++ OpenJPEG.patched/CMakeLists.txt	2007-09-26 00:34:22.000000000 -0500
@@ -24,6 +24,7 @@
 
 #-----------------------------------------------------------------------------
 # OPENJPEG version number, useful for packaging and doxygen doc:
+SET(OPENJPEG_SOVERSION 2)
 SET(OPENJPEG_VERSION_MAJOR 1)
 SET(OPENJPEG_VERSION_MINOR 2)
 SET(OPENJPEG_VERSION_BUILD 0)
@@ -33,8 +34,8 @@
 # This setting of SOVERSION assumes that any API change
 # will increment either the minor or major version number of openjpeg
 SET(OPENJPEG_LIBRARY_PROPERTIES
-  VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
-  SOVERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}"
+  VERSION   "${OPENJPEG_SOVERSION}.${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
+  SOVERSION ${OPENJPEG_SOVERSION}
 )
 
 
@@ -116,6 +117,10 @@
   $ENV{JPEG2000_CONFORMANCE_DATA_ROOT}
 )
 
+IF(NOT CMAKE_INSTALL_LIBDIR)
+SET(CMAKE_INSTALL_LIBDIR lib)
+ENDIF(NOT CMAKE_INSTALL_LIBDIR)
+
 #-----------------------------------------------------------------------------
 # Compiler specific flags:
 IF(CMAKE_COMPILER_IS_GNUCC)
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/CMakeLists.txt OpenJPEG.patched/libopenjpeg/CMakeLists.txt
--- OpenJPEG.orig/libopenjpeg/CMakeLists.txt	2007-09-25 09:54:49.000000000 -0500
+++ OpenJPEG.patched/libopenjpeg/CMakeLists.txt	2007-09-26 00:31:12.000000000 -0500
@@ -37,7 +37,7 @@
 
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
-	DESTINATION lib)
+	DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 # Install includes files
 INSTALL(FILES openjpeg.h

openjpeg-svn480-use-stdbool.patch:
 openjpeg.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openjpeg-svn480-use-stdbool.patch ---
diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' OpenJPEG.orig/libopenjpeg/openjpeg.h OpenJPEG.patched/libopenjpeg/openjpeg.h
--- OpenJPEG.orig/libopenjpeg/openjpeg.h	2007-11-14 05:34:48.000000000 -0600
+++ OpenJPEG.patched/libopenjpeg/openjpeg.h	2007-11-16 20:41:53.000000000 -0600
@@ -61,7 +61,7 @@
 #endif /* !OPJ_STATIC || !WIN32 */
 
 #ifndef __cplusplus
-#if defined(HAVE_STDBOOL_H)
+#if 1
 /*
 The C language implementation does correctly provide the standard header
 file "stdbool.h".


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-openjpeg/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:37:12 -0000	1.1
+++ .cvsignore	7 Dec 2009 01:41:50 -0000	1.2
@@ -0,0 +1 @@
+openjpeg_v1_3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-openjpeg/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:37:12 -0000	1.1
+++ sources	7 Dec 2009 01:41:51 -0000	1.2
@@ -0,0 +1 @@
+f9a3ccfa91ac34b589e9bf7577ce8ff9  openjpeg_v1_3.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 01:43:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:43:09 +0000 (UTC)
Subject: rpms/perl-Class-C3/devel perl-Class-C3.spec,1.12,1.13
Message-ID: <20091207014309.F064211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-C3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11483

Modified Files:
	perl-Class-C3.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-C3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-C3/devel/perl-Class-C3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Class-C3.spec	26 Jul 2009 04:21:50 -0000	1.12
+++ perl-Class-C3.spec	7 Dec 2009 01:43:09 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Class-C3
 Version:        0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pragma to use the C3 method resolution order algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.21-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:43:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:43:38 +0000 (UTC)
Subject: rpms/perl-SVG/devel perl-SVG.spec,1.13,1.14
Message-ID: <20091207014338.B273111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SVG/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11848

Modified Files:
	perl-SVG.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SVG.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SVG/devel/perl-SVG.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-SVG.spec	26 Jul 2009 16:25:44 -0000	1.13
+++ perl-SVG.spec	7 Dec 2009 01:43:38 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-SVG
 Version:        2.49
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An extension to generate stand-alone or inline SGV
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.49-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.49-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:45:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:45:10 +0000 (UTC)
Subject: rpms/perl-Module-Find/devel perl-Module-Find.spec,1.7,1.8
Message-ID: <20091207014510.C9F5B11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Find/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12308

Modified Files:
	perl-Module-Find.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Find.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Find/devel/perl-Module-Find.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Module-Find.spec	7 Oct 2009 14:42:03 -0000	1.7
+++ perl-Module-Find.spec	7 Dec 2009 01:45:10 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Module-Find
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Find and use installed modules in a (sub)category
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 01:45:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:45:47 +0000 (UTC)
Subject: rpms/perl-File-LibMagic/devel perl-File-LibMagic.spec,1.5,1.6
Message-ID: <20091207014547.99D3511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-LibMagic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12500

Modified Files:
	perl-File-LibMagic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-LibMagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-LibMagic/devel/perl-File-LibMagic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-File-LibMagic.spec	26 Jul 2009 06:01:04 -0000	1.5
+++ perl-File-LibMagic.spec	7 Dec 2009 01:45:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		perl-%{module}
 Version:	0.91
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Perlwrapper for libmagic
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.91-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:47:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:47:07 +0000 (UTC)
Subject: rpms/stfl/devel stfl.spec,1.1,1.2
Message-ID: <20091207014707.950D811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/stfl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12812

Modified Files:
	stfl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: stfl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/devel/stfl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- stfl.spec	22 Oct 2009 09:01:25 -0000	1.1
+++ stfl.spec	7 Dec 2009 01:47:07 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		stfl
 Version:	0.21
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	The Structured Terminal Forms Language/Library
 
 Group:		System Environment/Libraries
@@ -145,6 +145,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/stfl.so
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.21-8
+- rebuild against perl 5.10.1
+
 * Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
 - Removed empty %%doc
 - Changed sed commands



From kasal at fedoraproject.org  Mon Dec  7 01:47:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:47:23 +0000 (UTC)
Subject: rpms/perl-Class-Base/devel perl-Class-Base.spec,1.5,1.6
Message-ID: <20091207014723.228FD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12959

Modified Files:
	perl-Class-Base.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Base/devel/perl-Class-Base.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Class-Base.spec	26 Jul 2009 04:21:35 -0000	1.5
+++ perl-Class-Base.spec	7 Dec 2009 01:47:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Class-Base
 Version:        0.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Useful base class for deriving other modules
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:47:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:47:55 +0000 (UTC)
Subject: rpms/perl-Sub-WrapPackages/devel perl-Sub-WrapPackages.spec, 1.3,
	1.4
Message-ID: <20091207014755.B5E9E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sub-WrapPackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13157

Modified Files:
	perl-Sub-WrapPackages.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sub-WrapPackages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-WrapPackages/devel/perl-Sub-WrapPackages.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Sub-WrapPackages.spec	20 Aug 2009 09:40:02 -0000	1.3
+++ perl-Sub-WrapPackages.spec	7 Dec 2009 01:47:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Sub-WrapPackages
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Add wrappers around all the subroutines in packages
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.3-2
+- rebuild against perl 5.10.1
+
 * Thu Aug 20 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 1.3-1
 - Update to 1.3
 



From kasal at fedoraproject.org  Mon Dec  7 01:49:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:49:20 +0000 (UTC)
Subject: rpms/perl-Module-ExtractUse/devel perl-Module-ExtractUse.spec, 1.5, 
	1.6
Message-ID: <20091207014920.14E3011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-ExtractUse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13474

Modified Files:
	perl-Module-ExtractUse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-ExtractUse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-ExtractUse/devel/perl-Module-ExtractUse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Module-ExtractUse.spec	26 Jul 2009 11:17:54 -0000	1.5
+++ perl-Module-ExtractUse.spec	7 Dec 2009 01:49:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Module-ExtractUse
 Version:        0.23
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Find out what modules are used
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.23-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:50:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:50:26 +0000 (UTC)
Subject: rpms/perl-File-HomeDir/devel perl-File-HomeDir.spec,1.16,1.17
Message-ID: <20091207015026.AF43911C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-HomeDir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13839

Modified Files:
	perl-File-HomeDir.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-HomeDir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-HomeDir/devel/perl-File-HomeDir.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-File-HomeDir.spec	26 Jul 2009 06:00:50 -0000	1.16
+++ perl-File-HomeDir.spec	7 Dec 2009 01:50:26 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-File-HomeDir
 Version:        0.86
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Get the home directory for yourself or other users
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.86-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.86-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 01:50:51 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 01:50:51 +0000 (UTC)
Subject: rpms/gnome-shell/devel .cvsignore, 1.6, 1.7 gnome-shell.spec, 1.11, 
	1.12 sources, 1.6, 1.7
Message-ID: <20091207015052.0050911C03E3@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13754

Modified Files:
	.cvsignore gnome-shell.spec sources 
Log Message:
New sources for gnome shell git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 Oct 2009 01:26:53 -0000	1.6
+++ .cvsignore	7 Dec 2009 01:50:51 -0000	1.7
@@ -1,5 +1 @@
-gnome-shell-2.27.0.tar.bz2
-gnome-shell-2.27.1.tar.bz2
-gnome-shell-2.27.2.tar.bz2
-gnome-shell-2.27.3.tar.bz2
-gnome-shell-2.28.0.tar.bz2
+gnome-shell.tar.gz


Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gnome-shell.spec	6 Dec 2009 22:36:26 -0000	1.11
+++ gnome-shell.spec	7 Dec 2009 01:50:51 -0000	1.12
@@ -67,6 +67,9 @@ easy to use experience.
 %setup -q
 
 %build
+# This is only because of the git export and should be removed eventually
+cd gnomeshell
+
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Oct 2009 01:26:53 -0000	1.6
+++ sources	7 Dec 2009 01:50:51 -0000	1.7
@@ -1,2 +1 @@
-3b198ac1d5b72d2a04da82ed548249d6  gnome-shell-2.27.3.tar.bz2
-a9f93a6f03da60f2f6e3fb82a9e7dc94  gnome-shell-2.28.0.tar.bz2
+f7076bc4516486100e419bc90f4565f6  gnome-shell.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 01:51:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:51:43 +0000 (UTC)
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec,1.19,1.20
Message-ID: <20091207015143.66A5511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sub-Uplevel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14237

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-Sub-Uplevel.spec	26 Jul 2009 16:36:29 -0000	1.19
+++ perl-Sub-Uplevel.spec	7 Dec 2009 01:51:43 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Uplevel
 Version:        0.2002
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Apparently run a function in a higher stack frame
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2002-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2002-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:51:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:51:56 +0000 (UTC)
Subject: rpms/Sprog/devel Sprog.spec,1.13,1.14
Message-ID: <20091207015156.B23B311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/Sprog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14398

Modified Files:
	Sprog.spec 
Log Message:
- rebuild against perl 5.10.1


Index: Sprog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Sprog/devel/Sprog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Sprog.spec	24 Jul 2009 16:24:22 -0000	1.13
+++ Sprog.spec	7 Dec 2009 01:51:56 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		Sprog
 Version:	0.14
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	A graphical tool to build programs by plugging parts together
 
 Group:		Applications/System
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-Sprog.desktop
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-18
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:52:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:52:07 +0000 (UTC)
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec,1.16,1.17
Message-ID: <20091207015207.B0AD611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Autouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14547

Modified Files:
	perl-Class-Autouse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Class-Autouse.spec	26 Jul 2009 04:21:20 -0000	1.16
+++ perl-Class-Autouse.spec	7 Dec 2009 01:52:07 -0000	1.17
@@ -1,6 +1,6 @@
 Name: 		perl-Class-Autouse
 Version: 	1.29
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary: 	Run-time class loading on first method call
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -58,6 +58,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.29-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.29-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 01:53:29 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 01:53:29 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.12,1.13
Message-ID: <20091207015329.10E5E11C00E0@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14842

Modified Files:
	gnome-shell.spec 
Log Message:
Removed a line used to test a scratch build that introduced another failure.




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gnome-shell.spec	7 Dec 2009 01:50:51 -0000	1.12
+++ gnome-shell.spec	7 Dec 2009 01:53:28 -0000	1.13
@@ -67,9 +67,6 @@ easy to use experience.
 %setup -q
 
 %build
-# This is only because of the git export and should be removed eventually
-cd gnomeshell
-
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath



From kasal at fedoraproject.org  Mon Dec  7 01:53:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:53:39 +0000 (UTC)
Subject: rpms/perl-Module-Extract/devel perl-Module-Extract.spec,1.3,1.4
Message-ID: <20091207015339.7EB9B11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Extract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15001

Modified Files:
	perl-Module-Extract.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Extract/devel/perl-Module-Extract.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Module-Extract.spec	26 Jul 2009 11:17:40 -0000	1.3
+++ perl-Module-Extract.spec	7 Dec 2009 01:53:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Module-Extract
 Version:        0.01
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Base class for working with Perl distributions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:54:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:54:11 +0000 (UTC)
Subject: rpms/perl-FileHandle-Unget/devel perl-FileHandle-Unget.spec, 1.11, 
	1.12
Message-ID: <20091207015411.A6B1111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-FileHandle-Unget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15244

Modified Files:
	perl-FileHandle-Unget.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-FileHandle-Unget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-FileHandle-Unget/devel/perl-FileHandle-Unget.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-FileHandle-Unget.spec	1 Sep 2009 15:14:58 -0000	1.11
+++ perl-FileHandle-Unget.spec	7 Dec 2009 01:54:11 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:	A FileHandle that supports ungetting of multiple bytes
 Name:		perl-FileHandle-Unget
 Version:	0.1623
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL+
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/FileHandle-Unget/
@@ -51,6 +51,9 @@ string of bytes back on the input.
 %{_mandir}/man3/FileHandle::Unget.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.1623-2
+- rebuild against perl 5.10.1
+
 * Tue Sep  1 2009 Paul Howarth <paul at city-fan.org> 0.1623-1
 - Update to 0.1623
   - fix uninitialized value warning and incorrect behaviour (CPAN RT#48528)



From kasal at fedoraproject.org  Mon Dec  7 01:55:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:55:25 +0000 (UTC)
Subject: rpms/perl-Sub-Override/devel perl-Sub-Override.spec,1.3,1.4
Message-ID: <20091207015525.7047E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sub-Override/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15564

Modified Files:
	perl-Sub-Override.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sub-Override.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-Override/devel/perl-Sub-Override.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Sub-Override.spec	26 Jul 2009 16:36:15 -0000	1.3
+++ perl-Sub-Override.spec	7 Dec 2009 01:55:25 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Override
 Version:        0.08
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for easily overriding subroutines
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:56:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:56:10 +0000 (UTC)
Subject: rpms/perl-Class-Adapter/devel perl-Class-Adapter.spec,1.4,1.5
Message-ID: <20091207015610.9258211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Adapter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15801

Modified Files:
	perl-Class-Adapter.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Adapter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Adapter/devel/perl-Class-Adapter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Class-Adapter.spec	25 Nov 2009 11:39:03 -0000	1.4
+++ perl-Class-Adapter.spec	7 Dec 2009 01:56:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Class-Adapter
 Version:        1.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl implementation of the "Adapter" Design Pattern
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.06-2
+- rebuild against perl 5.10.1
+
 * Wed Nov 25 2009 Stepan Kasal <skasal at redhat.com> - 1.06-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 01:57:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:57:19 +0000 (UTC)
Subject: rpms/smbldap-tools/devel smbldap-tools.spec,1.11,1.12
Message-ID: <20091207015719.C5C4111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/smbldap-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16158

Modified Files:
	smbldap-tools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- smbldap-tools.spec	27 Jul 2009 04:29:26 -0000	1.11
+++ smbldap-tools.spec	7 Dec 2009 01:57:19 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 URL:		https://gna.org/projects/smbldap-tools/
@@ -108,6 +108,9 @@ done
 %{_mandir}/man8/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9.5-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:57:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:57:39 +0000 (UTC)
Subject: rpms/perl-Module-Depends/devel perl-Module-Depends.spec,1.7,1.8
Message-ID: <20091207015739.EDCAF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Depends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16340

Modified Files:
	perl-Module-Depends.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Depends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Depends/devel/perl-Module-Depends.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Module-Depends.spec	26 Jul 2009 11:17:26 -0000	1.7
+++ perl-Module-Depends.spec	7 Dec 2009 01:57:39 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Module-Depends
 Version:        0.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Identify the dependencies of a distribution
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:58:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:58:29 +0000 (UTC)
Subject: rpms/perl-FileHandle-Fmode/devel perl-FileHandle-Fmode.spec, 1.5,
	1.6
Message-ID: <20091207015829.6BC8E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-FileHandle-Fmode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16727

Modified Files:
	perl-FileHandle-Fmode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-FileHandle-Fmode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-FileHandle-Fmode/devel/perl-FileHandle-Fmode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-FileHandle-Fmode.spec	26 Jul 2009 06:06:22 -0000	1.5
+++ perl-FileHandle-Fmode.spec	7 Dec 2009 01:58:29 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-FileHandle-Fmode
 Version:        0.09
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        FileHandle::Fmode Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 01:59:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 01:59:11 +0000 (UTC)
Subject: rpms/perl-Sub-Name/devel perl-Sub-Name.spec,1.11,1.12
Message-ID: <20091207015911.87B6911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sub-Name/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16970

Modified Files:
	perl-Sub-Name.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sub-Name.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-Name/devel/perl-Sub-Name.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Sub-Name.spec	28 Aug 2009 05:17:18 -0000	1.11
+++ perl-Sub-Name.spec	7 Dec 2009 01:59:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Name
 Version:        0.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Name -- or rename -- a sub
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-5
+- rebuild against perl 5.10.1
+
 * Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.04-4
 - Filtering errant private provides
 



From kasal at fedoraproject.org  Mon Dec  7 02:00:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:00:29 +0000 (UTC)
Subject: rpms/perl-Class-Accessor-Grouped/devel
	perl-Class-Accessor-Grouped.spec, 1.10, 1.11
Message-ID: <20091207020029.A636311C039C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Accessor-Grouped/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17296

Modified Files:
	perl-Class-Accessor-Grouped.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Accessor-Grouped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Accessor-Grouped/devel/perl-Class-Accessor-Grouped.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Class-Accessor-Grouped.spec	25 Aug 2009 06:21:09 -0000	1.10
+++ perl-Class-Accessor-Grouped.spec	7 Dec 2009 02:00:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor-Grouped
 Version:        0.09000
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lets you build groups of accessors
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09000-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09000-1
 - auto-update to 0.09000 (by cpan-spec-update 0.01)
 - added a new br on perl(Carp) (version 0)



From kasal at fedoraproject.org  Mon Dec  7 02:01:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:01:26 +0000 (UTC)
Subject: rpms/perl-Module-CPANTS-Analyse/devel
	perl-Module-CPANTS-Analyse.spec, 1.8, 1.9
Message-ID: <20091207020126.62FBD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-CPANTS-Analyse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17581

Modified Files:
	perl-Module-CPANTS-Analyse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-CPANTS-Analyse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-CPANTS-Analyse/devel/perl-Module-CPANTS-Analyse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Module-CPANTS-Analyse.spec	26 Jul 2009 11:16:56 -0000	1.8
+++ perl-Module-CPANTS-Analyse.spec	7 Dec 2009 02:01:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Module-CPANTS-Analyse
 Version:        0.85
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate Kwalitee ratings for a distribution
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cpants_lint.pl
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.85-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.85-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:01:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:01:37 +0000 (UTC)
Subject: rpms/rxvt-unicode/devel rxvt-unicode.spec,1.46,1.47
Message-ID: <20091207020137.C1AAA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/rxvt-unicode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17731

Modified Files:
	rxvt-unicode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rxvt-unicode.spec	27 Jul 2009 03:42:26 -0000	1.46
+++ rxvt-unicode.spec	7 Dec 2009 02:01:37 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        9.06
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/urxvt
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 9.06-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:02:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:02:13 +0000 (UTC)
Subject: rpms/perl-File-Flock/devel perl-File-Flock.spec,1.2,1.3
Message-ID: <20091207020213.3EBAA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Flock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17965

Modified Files:
	perl-File-Flock.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Flock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Flock/devel/perl-File-Flock.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-File-Flock.spec	26 Jul 2009 06:00:36 -0000	1.2
+++ perl-File-Flock.spec	7 Dec 2009 02:02:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-File-Flock
 Version:        2008.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        File locking with flock
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2008.01-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:03:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:03:20 +0000 (UTC)
Subject: rpms/perl-Sub-Install/devel perl-Sub-Install.spec,1.8,1.9
Message-ID: <20091207020320.34E9711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sub-Install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18270

Modified Files:
	perl-Sub-Install.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sub-Install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-Install/devel/perl-Sub-Install.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Sub-Install.spec	26 Jul 2009 16:35:44 -0000	1.8
+++ perl-Sub-Install.spec	7 Dec 2009 02:03:20 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Install
 Version:        0.925
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Install subroutines into packages easily
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.925-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.925-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:04:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:04:33 +0000 (UTC)
Subject: rpms/perl-Class-Accessor-Chained/devel
	perl-Class-Accessor-Chained.spec, 1.7, 1.8
Message-ID: <20091207020433.81B0F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Accessor-Chained/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18587

Modified Files:
	perl-Class-Accessor-Chained.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Accessor-Chained.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Accessor-Chained/devel/perl-Class-Accessor-Chained.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Class-Accessor-Chained.spec	26 Jul 2009 04:20:29 -0000	1.7
+++ perl-Class-Accessor-Chained.spec	7 Dec 2009 02:04:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor-Chained
 Version:        0.01
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Make chained accessors
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:05:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:05:56 +0000 (UTC)
Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec,1.14,1.15
Message-ID: <20091207020556.C2C8F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Flat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18912

Modified Files:
	perl-File-Flat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Flat/devel/perl-File-Flat.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-File-Flat.spec	26 Jul 2009 06:00:22 -0000	1.14
+++ perl-File-Flat.spec	7 Dec 2009 02:05:56 -0000	1.15
@@ -1,6 +1,6 @@
 Name: 		perl-File-Flat
 Version: 	1.04
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Implements a flat filesystem
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -60,6 +60,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:06:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:06:07 +0000 (UTC)
Subject: rpms/perl-Module-Compile/devel perl-Module-Compile.spec,1.5,1.6
Message-ID: <20091207020607.4607611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Module-Compile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19066

Modified Files:
	perl-Module-Compile.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Module-Compile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Compile/devel/perl-Module-Compile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Module-Compile.spec	26 Jul 2009 11:17:11 -0000	1.5
+++ perl-Module-Compile.spec	7 Dec 2009 02:06:07 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Module-Compile
 Version:        0.20
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl Module Compilation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.20-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:07:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:07:03 +0000 (UTC)
Subject: rpms/rrdtool/devel rrdtool.spec,1.83,1.84
Message-ID: <20091207020703.2BC0F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/rrdtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19326

Modified Files:
	rrdtool.spec 
Log Message:
- rebuild against perl 5.10.1


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- rrdtool.spec	27 Jul 2009 03:15:04 -0000	1.83
+++ rrdtool.spec	7 Dec 2009 02:07:03 -0000	1.84
@@ -9,7 +9,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.3.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
@@ -323,6 +323,9 @@ find examples/ -type f -exec chmod 0644 
 %endif
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.3.8-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:07:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:07:37 +0000 (UTC)
Subject: rpms/perl-Sub-Identify/devel perl-Sub-Identify.spec,1.12,1.13
Message-ID: <20091207020737.530BD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sub-Identify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19517

Modified Files:
	perl-Sub-Identify.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sub-Identify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-Identify/devel/perl-Sub-Identify.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Sub-Identify.spec	28 Aug 2009 22:22:17 -0000	1.12
+++ perl-Sub-Identify.spec	7 Dec 2009 02:07:37 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Identify
 Version:        0.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Retrieve names of code references
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-7
+- rebuild against perl 5.10.1
+
 * Fri Aug 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-6
 - bump
 



From kasal at fedoraproject.org  Mon Dec  7 02:08:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:08:41 +0000 (UTC)
Subject: rpms/perl-Class-Accessor/devel perl-Class-Accessor.spec,1.14,1.15
Message-ID: <20091207020841.74D2611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Accessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19817

Modified Files:
	perl-Class-Accessor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Accessor/devel/perl-Class-Accessor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Class-Accessor.spec	5 Oct 2009 16:29:24 -0000	1.14
+++ perl-Class-Accessor.spec	7 Dec 2009 02:08:41 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
 Version:        0.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.34-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 0.34-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 02:09:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:09:52 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-VCS/devel perl-File-Find-Rule-VCS.spec, 1.4,
	1.5
Message-ID: <20091207020952.CD3ED11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Find-Rule-VCS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20132

Modified Files:
	perl-File-Find-Rule-VCS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Find-Rule-VCS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-VCS/devel/perl-File-Find-Rule-VCS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-File-Find-Rule-VCS.spec	26 Jul 2009 06:00:01 -0000	1.4
+++ perl-File-Find-Rule-VCS.spec	7 Dec 2009 02:09:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-File-Find-Rule-VCS
 Version:        1.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Exclude files/directories for Version Control Systems
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:10:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:10:07 +0000 (UTC)
Subject: rpms/perl-ModelSim-List/devel perl-ModelSim-List.spec,1.3,1.4
Message-ID: <20091207021007.842EA11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ModelSim-List/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20278

Modified Files:
	perl-ModelSim-List.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ModelSim-List.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ModelSim-List/devel/perl-ModelSim-List.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-ModelSim-List.spec	26 Jul 2009 11:16:42 -0000	1.3
+++ perl-ModelSim-List.spec	7 Dec 2009 02:10:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-ModelSim-List
 Version:        0.06
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Analyse the 'list' output of the ModelSim simulator
 
 License:        GPL+ or Artistic
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:11:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:11:33 +0000 (UTC)
Subject: rpms/perl-Sub-Exporter/devel perl-Sub-Exporter.spec,1.13,1.14
Message-ID: <20091207021133.C032411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sub-Exporter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20627

Modified Files:
	perl-Sub-Exporter.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sub-Exporter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-Exporter/devel/perl-Sub-Exporter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Sub-Exporter.spec	26 Jul 2009 16:35:15 -0000	1.13
+++ perl-Sub-Exporter.spec	7 Dec 2009 02:11:33 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Exporter
 Version:        0.982
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Sophisticated exporter for custom-built routines
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.982-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.982-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:12:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:12:27 +0000 (UTC)
Subject: rpms/perl-Check-ISA/devel perl-Check-ISA.spec,1.4,1.5
Message-ID: <20091207021227.A9FD911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Check-ISA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20923

Modified Files:
	perl-Check-ISA.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Check-ISA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Check-ISA/devel/perl-Check-ISA.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Check-ISA.spec	26 Jul 2009 04:19:57 -0000	1.4
+++ perl-Check-ISA.spec	7 Dec 2009 02:12:27 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:       perl-Check-ISA 
 Version:    0.04 
-Release:        4%{?dist}
+Release:        5%{?dist}
 # see lib/Check/ISA.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:12:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:12:24 +0000 (UTC)
Subject: rpms/rpmorphan/devel rpmorphan.spec,1.2,1.3
Message-ID: <20091207021224.8865211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/rpmorphan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20888

Modified Files:
	rpmorphan.spec 
Log Message:
- rebuild against perl 5.10.1


Index: rpmorphan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmorphan/devel/rpmorphan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rpmorphan.spec	27 Jul 2009 03:13:59 -0000	1.2
+++ rpmorphan.spec	7 Dec 2009 02:12:24 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:          List packages that have no dependencies (like deborphan)
 Name:             rpmorphan
 Version:          1.4
-Release:          6%{?dist}
+Release:          7%{?dist}
 Group:            Applications/System
 License:          GPLv2+
 
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:13:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:13:49 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-PPI/devel perl-File-Find-Rule-PPI.spec, 1.7,
	1.8
Message-ID: <20091207021349.5544611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Find-Rule-PPI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21417

Modified Files:
	perl-File-Find-Rule-PPI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Find-Rule-PPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-PPI/devel/perl-File-Find-Rule-PPI.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-File-Find-Rule-PPI.spec	26 Jul 2009 05:59:34 -0000	1.7
+++ perl-File-Find-Rule-PPI.spec	7 Dec 2009 02:13:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-Find-Rule-PPI
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Add support for PPI queries to File::Find::Rule
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:14:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:14:01 +0000 (UTC)
Subject: rpms/perl-MLDBM/devel perl-MLDBM.spec,1.11,1.12
Message-ID: <20091207021401.7F2FE11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MLDBM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21621

Modified Files:
	perl-MLDBM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MLDBM/devel/perl-MLDBM.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-MLDBM.spec	26 Jul 2009 09:05:23 -0000	1.11
+++ perl-MLDBM.spec	7 Dec 2009 02:14:01 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-MLDBM
 Version:        2.01
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Store multi-level hash structure in single level tied hash
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.01-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.01-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:15:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:15:32 +0000 (UTC)
Subject: rpms/perl-String-ShellQuote/devel perl-String-ShellQuote.spec, 1.15,
	1.16
Message-ID: <20091207021532.A4E3411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-String-ShellQuote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22096

Modified Files:
	perl-String-ShellQuote.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-String-ShellQuote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-ShellQuote/devel/perl-String-ShellQuote.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-String-ShellQuote.spec	26 Jul 2009 16:35:01 -0000	1.15
+++ perl-String-ShellQuote.spec	7 Dec 2009 02:15:32 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-String-ShellQuote
 Version:        1.03
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl module for quoting strings for passing through the shell
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/String::ShellQuote.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:16:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:16:47 +0000 (UTC)
Subject: rpms/perl-Chatbot-Eliza/devel perl-Chatbot-Eliza.spec,1.6,1.7
Message-ID: <20091207021647.70B2D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Chatbot-Eliza/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22455

Modified Files:
	perl-Chatbot-Eliza.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Chatbot-Eliza.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Chatbot-Eliza/devel/perl-Chatbot-Eliza.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Chatbot-Eliza.spec	26 Jul 2009 04:19:41 -0000	1.6
+++ perl-Chatbot-Eliza.spec	7 Dec 2009 02:16:47 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Chatbot-Eliza
 Version:        1.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Implementation of the Eliza algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:16:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:16:45 +0000 (UTC)
Subject: rpms/rpmconf/devel rpmconf.spec,1.5,1.6
Message-ID: <20091207021645.279BE11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/rpmconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22439

Modified Files:
	rpmconf.spec 
Log Message:
- rebuild against perl 5.10.1


Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/rpmconf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rpmconf.spec	31 Aug 2009 10:33:56 -0000	1.5
+++ rpmconf.spec	7 Dec 2009 02:16:45 -0000	1.6
@@ -3,7 +3,7 @@ Summary: Tool to handle rpmnew and rpmsa
 Group:   Applications/System
 License: GPLv3
 Version: 0.1.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL:     http://wiki.github.com/xsuchy/rpmconf
 Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -37,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.1.8-2
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.8-1
 - fix copy and past typo
 



From kasal at fedoraproject.org  Mon Dec  7 02:17:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:17:58 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-Perl/devel perl-File-Find-Rule-Perl.spec, 
	1.11, 1.12
Message-ID: <20091207021758.7D1EA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22893

Modified Files:
	perl-File-Find-Rule-Perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Find-Rule-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/devel/perl-File-Find-Rule-Perl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-File-Find-Rule-Perl.spec	7 Aug 2009 03:01:40 -0000	1.11
+++ perl-File-Find-Rule-Perl.spec	7 Dec 2009 02:17:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		perl-File-Find-Rule-Perl
 Version:	1.09
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Common rules for searching for Perl things
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -60,6 +60,9 @@ cd ..
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.09-2
+- rebuild against perl 5.10.1
+
 * Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.09-1
 - Upstream update.
 



From kasal at fedoraproject.org  Mon Dec  7 02:18:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:18:45 +0000 (UTC)
Subject: rpms/perl-Mixin-Linewise/devel perl-Mixin-Linewise.spec,1.2,1.3
Message-ID: <20091207021845.90D8F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mixin-Linewise/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23233

Modified Files:
	perl-Mixin-Linewise.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mixin-Linewise.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mixin-Linewise/devel/perl-Mixin-Linewise.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Mixin-Linewise.spec	26 Jul 2009 11:16:28 -0000	1.2
+++ perl-Mixin-Linewise.spec	7 Dec 2009 02:18:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Mixin-Linewise
 Version:        0.002
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Write your linewise code for handles; this does the rest
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.002-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.002-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:19:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:19:18 +0000 (UTC)
Subject: rpms/perl-String-RewritePrefix/devel perl-String-RewritePrefix.spec,
	1.2, 1.3
Message-ID: <20091207021918.E664111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-String-RewritePrefix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23401

Modified Files:
	perl-String-RewritePrefix.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-String-RewritePrefix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-RewritePrefix/devel/perl-String-RewritePrefix.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-String-RewritePrefix.spec	26 Jul 2009 16:34:47 -0000	1.2
+++ perl-String-RewritePrefix.spec	7 Dec 2009 02:19:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-String-RewritePrefix 
 Version:    0.004 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/String/RewritePrefix.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.004-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.004-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:20:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:20:47 +0000 (UTC)
Subject: rpms/remoot/devel remoot.spec,1.4,1.5
Message-ID: <20091207022047.3BEC111C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/remoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23811

Modified Files:
	remoot.spec 
Log Message:
- rebuild against perl 5.10.1


Index: remoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/remoot/devel/remoot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- remoot.spec	27 Jul 2009 02:58:15 -0000	1.4
+++ remoot.spec	7 Dec 2009 02:20:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		remoot
 Version:	0.9
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Pseudo-universal remote control wrapper
 
 License:	Artistic 2.0
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:21:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:21:03 +0000 (UTC)
Subject: rpms/perl-Chart/devel perl-Chart.spec,1.13,1.14
Message-ID: <20091207022103.5BC8F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Chart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23972

Modified Files:
	perl-Chart.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Chart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Chart/devel/perl-Chart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Chart.spec	26 Jul 2009 04:19:26 -0000	1.13
+++ perl-Chart.spec	7 Dec 2009 02:21:03 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Chart
 Version:        2.4.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl module for producing many types of charts
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Chart.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.4.1-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:21:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:21:54 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule/devel perl-File-Find-Rule.spec,1.12,1.13
Message-ID: <20091207022154.0C67A11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24248

Modified Files:
	perl-File-Find-Rule.spec 
Log Message:
- rebuild against perl 5.10.1


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.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-File-Find-Rule.spec	26 Jul 2009 05:59:20 -0000	1.12
+++ perl-File-Find-Rule.spec	7 Dec 2009 02:21:53 -0000	1.13
@@ -1,6 +1,6 @@
 Name: 		perl-File-Find-Rule
 Version: 	0.30
-Release: 	8%{?dist}
+Release: 	9%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -50,6 +50,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.30-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:23:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:23:02 +0000 (UTC)
Subject: rpms/perl-MIME-Types/devel perl-MIME-Types.spec,1.23,1.24
Message-ID: <20091207022302.2416C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MIME-Types/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24561

Modified Files:
	perl-MIME-Types.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Types/devel/perl-MIME-Types.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-MIME-Types.spec	7 Oct 2009 13:15:52 -0000	1.23
+++ perl-MIME-Types.spec	7 Dec 2009 02:23:02 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Types
 Version:        1.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MIME types module for Perl
 
 License:        GPL+ or Artistic
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 02:23:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:23:29 +0000 (UTC)
Subject: rpms/perl-String-Random/devel perl-String-Random.spec,1.3,1.4
Message-ID: <20091207022329.A6E5E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-String-Random/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24762

Modified Files:
	perl-String-Random.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-String-Random.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Random/devel/perl-String-Random.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-String-Random.spec	26 Jul 2009 16:34:32 -0000	1.3
+++ perl-String-Random.spec	7 Dec 2009 02:23:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-String-Random
 Version:        0.22
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl module to generate random strings based on a pattern
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:24:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:24:21 +0000 (UTC)
Subject: rpms/remctl/devel remctl.spec,1.6,1.7
Message-ID: <20091207022421.8BAA411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/remctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25034

Modified Files:
	remctl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: remctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/remctl/devel/remctl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- remctl.spec	27 Jul 2009 02:57:50 -0000	1.6
+++ remctl.spec	7 Dec 2009 02:24:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name: remctl
 Version: 2.11
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Client/server for Kerberos-authenticated command execution
 
 Group: Applications/Internet
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Net::Remctl*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.11-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:25:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:25:06 +0000 (UTC)
Subject: rpms/perl-CGI-Untaint-email/devel perl-CGI-Untaint-email.spec, 1.6, 
	1.7
Message-ID: <20091207022506.DD92211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Untaint-email/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25259

Modified Files:
	perl-CGI-Untaint-email.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Untaint-email.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Untaint-email/devel/perl-CGI-Untaint-email.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-CGI-Untaint-email.spec	26 Jul 2009 04:00:53 -0000	1.6
+++ perl-CGI-Untaint-email.spec	7 Dec 2009 02:25:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint-email
 Version:        0.03
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Validate an email address
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:25:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:25:50 +0000 (UTC)
Subject: rpms/perl-File-ExtAttr/devel perl-File-ExtAttr.spec,1.10,1.11
Message-ID: <20091207022550.79EE211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-ExtAttr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25491

Modified Files:
	perl-File-ExtAttr.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-ExtAttr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-ExtAttr/devel/perl-File-ExtAttr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-File-ExtAttr.spec	26 Jul 2009 05:59:06 -0000	1.10
+++ perl-File-ExtAttr.spec	7 Dec 2009 02:25:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-File-ExtAttr
 Version:        1.09
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for accessing extended attributes of files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.09-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 02:26:29 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 02:26:29 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.13,1.14
Message-ID: <20091207022629.9230611C00E0@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25646

Modified Files:
	gnome-shell.spec 
Log Message:
Fixed setup directory name from git repo




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gnome-shell.spec	7 Dec 2009 01:53:28 -0000	1.13
+++ gnome-shell.spec	7 Dec 2009 02:26:29 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        2.28.0.%{alphatag}
-Release:        1
+Release:        2
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -64,7 +64,9 @@ innovative user interface concepts to pr
 easy to use experience.
 
 %prep
-%setup -q
+## The git repository snapshot has a different directory name:
+#%setup -q
+setup -q -n gnome-shell
 
 %build
 %configure
@@ -125,6 +127,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Sun Dec 06 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-2
+- Fixed the setup naming issue with the git snapshot directory naming
+
 * Sun Dec 06 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-1
 - Update to git snapshot on 20091206
 



From kasal at fedoraproject.org  Mon Dec  7 02:27:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:27:12 +0000 (UTC)
Subject: rpms/perl-MIME-tools/devel perl-MIME-tools.spec,1.24,1.25
Message-ID: <20091207022712.EFD6511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MIME-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25931

Modified Files:
	perl-MIME-tools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-MIME-tools.spec	26 Jul 2009 09:05:06 -0000	1.24
+++ perl-MIME-tools.spec	7 Dec 2009 02:27:12 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:		perl-MIME-tools
 Version:	5.427
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Modules for parsing and creating MIME entities in Perl
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -80,6 +80,9 @@ TEST_POD_COVERAGE=0 %{__make} test
 %{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 5.427-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.427-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:27:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:27:37 +0000 (UTC)
Subject: rpms/perl-String-Format/devel perl-String-Format.spec,1.9,1.10
Message-ID: <20091207022737.9A76D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-String-Format/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26100

Modified Files:
	perl-String-Format.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-String-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Format/devel/perl-String-Format.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-String-Format.spec	7 Oct 2009 17:41:54 -0000	1.9
+++ perl-String-Format.spec	7 Dec 2009 02:27:37 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-String-Format
 Version:        1.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sprintf-like string formatting capabilities with arbitrary format definitions
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.16-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.16-1
 - new upstream release
 



From kasal at fedoraproject.org  Mon Dec  7 02:29:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:29:01 +0000 (UTC)
Subject: rpms/perl-CGI-Untaint-date/devel perl-CGI-Untaint-date.spec, 1.8,
	1.9
Message-ID: <20091207022901.80A5E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Untaint-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26492

Modified Files:
	perl-CGI-Untaint-date.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Untaint-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Untaint-date/devel/perl-CGI-Untaint-date.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-CGI-Untaint-date.spec	26 Jul 2009 04:00:38 -0000	1.8
+++ perl-CGI-Untaint-date.spec	7 Dec 2009 02:29:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint-date
 Version:        1.00
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Validate a date
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:29:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:29:28 +0000 (UTC)
Subject: rpms/queuegraph/devel queuegraph.spec,1.6,1.7
Message-ID: <20091207022928.F22FC11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/queuegraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26677

Modified Files:
	queuegraph.spec 
Log Message:
- rebuild against perl 5.10.1


Index: queuegraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/queuegraph/devel/queuegraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- queuegraph.spec	27 Jul 2009 02:40:52 -0000	1.6
+++ queuegraph.spec	7 Dec 2009 02:29:28 -0000	1.7
@@ -7,7 +7,7 @@
 
 Name:           queuegraph
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A RRDtool frontend for Mail statistics
 
 Group:          System Environment/Daemons
@@ -154,6 +154,9 @@ fi
 %endif
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:30:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:30:51 +0000 (UTC)
Subject: rpms/perl-File-DesktopEntry/devel perl-File-DesktopEntry.spec, 1.11,
	1.12
Message-ID: <20091207023051.2BCE511C039C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-DesktopEntry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27053

Modified Files:
	perl-File-DesktopEntry.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-DesktopEntry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-DesktopEntry/devel/perl-File-DesktopEntry.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-File-DesktopEntry.spec	26 Jul 2009 05:58:50 -0000	1.11
+++ perl-File-DesktopEntry.spec	7 Dec 2009 02:30:51 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-File-DesktopEntry
 Version:        0.04
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Object to handle .desktop files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:31:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:31:15 +0000 (UTC)
Subject: rpms/perl-MIME-Lite/devel perl-MIME-Lite.spec,1.13,1.14
Message-ID: <20091207023115.DC59D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MIME-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27249

Modified Files:
	perl-MIME-Lite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MIME-Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Lite/devel/perl-MIME-Lite.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-MIME-Lite.spec	2 Nov 2009 09:55:39 -0000	1.13
+++ perl-MIME-Lite.spec	7 Dec 2009 02:31:15 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Lite
 Version:        3.027
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MIME::Lite - low-calorie MIME generator
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.027-2
+- rebuild against perl 5.10.1
+
 * Mon Nov  2 2009 Stepan Kasal <skasal at redhat.com> - 3.027-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 02:32:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:32:05 +0000 (UTC)
Subject: rpms/perl-String-Diff/devel perl-String-Diff.spec,1.2,1.3
Message-ID: <20091207023205.23D1F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-String-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27516

Modified Files:
	perl-String-Diff.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-String-Diff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Diff/devel/perl-String-Diff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-String-Diff.spec	26 Jul 2009 16:34:03 -0000	1.2
+++ perl-String-Diff.spec	7 Dec 2009 02:32:05 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-String-Diff
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simple diff to String
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:33:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:33:53 +0000 (UTC)
Subject: rpms/publican/devel publican.spec,1.30,1.31
Message-ID: <20091207023353.15B0111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27953

Modified Files:
	publican.spec 
Log Message:
- rebuild against perl 5.10.1


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- publican.spec	4 Nov 2009 05:09:11 -0000	1.30
+++ publican.spec	7 Dec 2009 02:33:52 -0000	1.31
@@ -14,7 +14,7 @@
 # TODO after beta revert to lower case name
 Name:           publican
 Version:        1.2
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
 License:        (GPLv2+ or Artistic) and CC0
@@ -191,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2-1
+- rebuild against perl 5.10.1
+
 * Wed Nov 4 2009 Jeff Fearn <jfearn at redhat.com> 1.2-0
 - Fix images missing from distributed set output. BZ #532837
 - Correct image path when running clean_ids.



From kasal at fedoraproject.org  Mon Dec  7 02:34:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:34:14 +0000 (UTC)
Subject: rpms/perl-CGI-Untaint/devel perl-CGI-Untaint.spec,1.9,1.10
Message-ID: <20091207023414.8B5EC11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Untaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28124

Modified Files:
	perl-CGI-Untaint.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Untaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Untaint/devel/perl-CGI-Untaint.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-CGI-Untaint.spec	26 Jul 2009 04:00:13 -0000	1.9
+++ perl-CGI-Untaint.spec	7 Dec 2009 02:34:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint
 Version:        1.26
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Process CGI input parameters
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.26-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:35:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:35:26 +0000 (UTC)
Subject: rpms/perl-File-Copy-Recursive/devel perl-File-Copy-Recursive.spec, 
	1.15, 1.16
Message-ID: <20091207023526.F056E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Copy-Recursive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28434

Modified Files:
	perl-File-Copy-Recursive.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Copy-Recursive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Copy-Recursive/devel/perl-File-Copy-Recursive.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-File-Copy-Recursive.spec	26 Jul 2009 05:58:35 -0000	1.15
+++ perl-File-Copy-Recursive.spec	7 Dec 2009 02:35:26 -0000	1.16
@@ -1,6 +1,6 @@
 Name: 		perl-File-Copy-Recursive
 Version: 	0.38
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Extension for recursively copying files and directories 
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -47,6 +47,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.38-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.38-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:35:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:35:44 +0000 (UTC)
Subject: rpms/perl-MIME-EncWords/devel perl-MIME-EncWords.spec,1.2,1.3
Message-ID: <20091207023544.B1FC411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MIME-EncWords/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28598

Modified Files:
	perl-MIME-EncWords.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MIME-EncWords.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-EncWords/devel/perl-MIME-EncWords.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-MIME-EncWords.spec	26 Jul 2009 09:04:15 -0000	1.2
+++ perl-MIME-EncWords.spec	7 Dec 2009 02:35:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-MIME-EncWords
 Version:        1.010.101
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Deal with RFC 2047 encoded words (improved)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.010.101-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.010.101-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:36:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:36:39 +0000 (UTC)
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.15,1.16
Message-ID: <20091207023639.8BF3511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-String-CRC32/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28858

Modified Files:
	perl-String-CRC32.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-String-CRC32.spec	26 Jul 2009 16:33:49 -0000	1.15
+++ perl-String-CRC32.spec	7 Dec 2009 02:36:39 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-String-CRC32
 Version:        1.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl interface for cyclic redundancy check generation
 Group:          Development/Libraries
 License:        Public Domain
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:38:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:38:35 +0000 (UTC)
Subject: rpms/perl-CGI-SpeedyCGI/devel perl-CGI-SpeedyCGI.spec,1.6,1.7
Message-ID: <20091207023836.0853611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-SpeedyCGI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29275

Modified Files:
	perl-CGI-SpeedyCGI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-SpeedyCGI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-SpeedyCGI/devel/perl-CGI-SpeedyCGI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-CGI-SpeedyCGI.spec	26 Jul 2009 03:59:52 -0000	1.6
+++ perl-CGI-SpeedyCGI.spec	7 Dec 2009 02:38:35 -0000	1.7
@@ -3,7 +3,7 @@
 Summary:        Speed up perl scripts by running them persistently
 Name:           perl-CGI-SpeedyCGI
 Version:        2.22
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPLv3+
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/%{pkgname}/
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/speedycgi.conf
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.22-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.22-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:39:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:39:26 +0000 (UTC)
Subject: rpms/perl-MIME-Charset/devel perl-MIME-Charset.spec,1.2,1.3
Message-ID: <20091207023926.F3BA011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MIME-Charset/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29526

Modified Files:
	perl-MIME-Charset.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MIME-Charset.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MIME-Charset/devel/perl-MIME-Charset.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-MIME-Charset.spec	26 Jul 2009 09:04:00 -0000	1.2
+++ perl-MIME-Charset.spec	7 Dec 2009 02:39:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Charset
 Version:        1.006.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Charset Informations for MIME
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.006.2-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.006.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:39:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:39:39 +0000 (UTC)
Subject: rpms/perl-File-Comments/devel perl-File-Comments.spec,1.4,1.5
Message-ID: <20091207023939.CDF0111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-Comments/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29646

Modified Files:
	perl-File-Comments.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-Comments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Comments/devel/perl-File-Comments.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-File-Comments.spec	18 Sep 2009 09:31:01 -0000	1.4
+++ perl-File-Comments.spec	7 Dec 2009 02:39:39 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Recognizes file formats and extracts format-specific comments
 Name:		perl-File-Comments
 Version:	0.07
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/File-Comments/
@@ -80,6 +80,9 @@ JavaScript, Python and PHP.
 %{_mandir}/man3/File::Comments::Plugin::Shell.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-5
+- rebuild against perl 5.10.1
+
 * Fri Sep 18 2009 Paul Howarth <paul at city-fan.org> 0.07-4
 - Add runtime dependencies not determined automatically by RPM
 



From kasal at fedoraproject.org  Mon Dec  7 02:41:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:41:00 +0000 (UTC)
Subject: rpms/perl-String-Approx/devel perl-String-Approx.spec,1.7,1.8
Message-ID: <20091207024100.2FD6F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-String-Approx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29986

Modified Files:
	perl-String-Approx.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-String-Approx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-String-Approx/devel/perl-String-Approx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-String-Approx.spec	26 Jul 2009 16:33:32 -0000	1.7
+++ perl-String-Approx.spec	7 Dec 2009 02:41:00 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-String-Approx
 Version:        3.26
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl extension for approximate matching (fuzzy matching)
 License:        LGPLv2+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.26-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.26-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 02:41:26 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 02:41:26 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.14,1.15
Message-ID: <20091207024126.35B5D11C00E0@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30108

Modified Files:
	gnome-shell.spec 
Log Message:
fixed a typo in %setup




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gnome-shell.spec	7 Dec 2009 02:26:29 -0000	1.14
+++ gnome-shell.spec	7 Dec 2009 02:41:26 -0000	1.15
@@ -66,7 +66,7 @@ easy to use experience.
 %prep
 ## The git repository snapshot has a different directory name:
 #%setup -q
-setup -q -n gnome-shell
+%setup -q -n gnome-shell
 
 %build
 %configure



From kasal at fedoraproject.org  Mon Dec  7 02:41:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:41:35 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.spec,1.121,1.122
Message-ID: <20091207024135.5A5A611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30185

Modified Files:
	postgresql.spec 
Log Message:
- rebuild against perl 5.10.1


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- postgresql.spec	16 Oct 2009 03:47:52 -0000	1.121
+++ postgresql.spec	7 Dec 2009 02:41:35 -0000	1.122
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and 
 Name: postgresql
 %define majorversion 8.4
 Version: 8.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 # PostgreSQL calls their license simplified BSD, but the requirements are
 # more similar to other MIT licenses.
 License: MIT
@@ -855,6 +855,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 8.4.1-5
+- rebuild against perl 5.10.1
+
 * Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 8.4.1-4
 - add sparc/sparc64 to multilib header support
 



From kasal at fedoraproject.org  Mon Dec  7 02:43:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:43:18 +0000 (UTC)
Subject: rpms/perl-MD5/devel perl-MD5.spec,1.5,1.6
Message-ID: <20091207024318.E376F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MD5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30623

Modified Files:
	perl-MD5.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MD5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MD5/devel/perl-MD5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MD5.spec	26 Jul 2009 09:03:44 -0000	1.5
+++ perl-MD5.spec	7 Dec 2009 02:43:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MD5
 Version:        2.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to the MD5 Message-Digest Algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.03-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:43:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:43:47 +0000 (UTC)
Subject: rpms/perl-CGI-Simple/devel perl-CGI-Simple.spec,1.11,1.12
Message-ID: <20091207024347.F0DE111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30829

Modified Files:
	perl-CGI-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Simple/devel/perl-CGI-Simple.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-CGI-Simple.spec	26 Jul 2009 03:59:35 -0000	1.11
+++ perl-CGI-Simple.spec	7 Dec 2009 02:43:47 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Simple
 Version:        1.108
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple totally OO CGI interface that is CGI.pm compliant
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.108-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.108-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:44:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:44:03 +0000 (UTC)
Subject: rpms/perl-File-chmod/devel perl-File-chmod.spec,1.5,1.6
Message-ID: <20091207024403.B24E611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-chmod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30989

Modified Files:
	perl-File-chmod.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-chmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-chmod/devel/perl-File-chmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-File-chmod.spec	26 Jul 2009 06:05:54 -0000	1.5
+++ perl-File-chmod.spec	7 Dec 2009 02:44:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-File-chmod
 Version:        0.32
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Implements symbolic and ls chmod modes
 
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.32-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:45:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:45:28 +0000 (UTC)
Subject: rpms/perl-Statistics-Descriptive/devel
	perl-Statistics-Descriptive.spec, 1.7, 1.8
Message-ID: <20091207024528.C2FFE11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Statistics-Descriptive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31573

Modified Files:
	perl-Statistics-Descriptive.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Statistics-Descriptive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Statistics-Descriptive/devel/perl-Statistics-Descriptive.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Statistics-Descriptive.spec	26 Jul 2009 16:33:17 -0000	1.7
+++ perl-Statistics-Descriptive.spec	7 Dec 2009 02:45:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Statistics-Descriptive
 Version:        2.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl module of basic descriptive statistical functions
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.6-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:47:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:47:25 +0000 (UTC)
Subject: rpms/perl-Maypole/devel perl-Maypole.spec,1.8,1.9
Message-ID: <20091207024725.1091C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Maypole/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32032

Modified Files:
	perl-Maypole.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Maypole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Maypole/devel/perl-Maypole.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Maypole.spec	26 Jul 2009 11:16:11 -0000	1.8
+++ perl-Maypole.spec	7 Dec 2009 02:47:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		perl-Maypole
 Version:	2.13
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	MVC web application framework
 Group:		Development/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:2.13-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec  7 02:48:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 02:48:25 +0000 (UTC)
Subject: File usbmuxd-1.0.0.tar.bz2 uploaded to lookaside cache by pbrobinson
Message-ID: <20091207024825.EABB510F87D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for usbmuxd:

75b513c1cf95c488ed71d9f618ce1889  usbmuxd-1.0.0.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 02:48:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:48:19 +0000 (UTC)
Subject: rpms/perl-File-chdir/devel perl-File-chdir.spec,1.6,1.7
Message-ID: <20091207024819.7B7ED11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-chdir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32264

Modified Files:
	perl-File-chdir.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-chdir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-chdir/devel/perl-File-chdir.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-File-chdir.spec	26 Jul 2009 06:05:40 -0000	1.6
+++ perl-File-chdir.spec	7 Dec 2009 02:48:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-File-chdir
 Version:        0.09
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A more sensible way to change directories
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:49:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:49:02 +0000 (UTC)
Subject: rpms/perl-CGI-Session/devel perl-CGI-Session.spec,1.7,1.8
Message-ID: <20091207024902.DE1D311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32502

Modified Files:
	perl-CGI-Session.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Session/devel/perl-CGI-Session.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-CGI-Session.spec	26 Jul 2009 03:59:19 -0000	1.7
+++ perl-CGI-Session.spec	7 Dec 2009 02:49:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Session
 Version:        4.35
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Persistent session data in CGI applications
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.35-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.35-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:49:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:49:54 +0000 (UTC)
Subject: rpms/perl-SQL-Statement/devel perl-SQL-Statement.spec,1.11,1.12
Message-ID: <20091207024954.6B5D911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SQL-Statement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32762

Modified Files:
	perl-SQL-Statement.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SQL-Statement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SQL-Statement/devel/perl-SQL-Statement.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-SQL-Statement.spec	23 Sep 2009 17:42:02 -0000	1.11
+++ perl-SQL-Statement.spec	7 Dec 2009 02:49:54 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Statement
 Version:        1.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SQL parsing and processing engine
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.20-2
+- rebuild against perl 5.10.1
+
 * Wed Sep 23 2009 Stepan Kasal <skasal at redhat.com> - 1.20-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 02:52:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:52:32 +0000 (UTC)
Subject: rpms/perl-File-ChangeNotify/devel perl-File-ChangeNotify.spec, 1.3, 
	1.4
Message-ID: <20091207025232.BF2E511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-ChangeNotify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv910

Modified Files:
	perl-File-ChangeNotify.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-ChangeNotify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-ChangeNotify/devel/perl-File-ChangeNotify.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-File-ChangeNotify.spec	11 Aug 2009 07:54:24 -0000	1.3
+++ perl-File-ChangeNotify.spec	7 Dec 2009 02:52:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-File-ChangeNotify
 Version:    0.07
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/File/ChangeNotify.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Event.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Watcher.pm -> GPL+ or Artistic
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
 - auto-update to 0.07 (by cpan-spec-update 0.01)
 - added a new req on perl(Carp) (version 0)



From kasal at fedoraproject.org  Mon Dec  7 02:52:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:52:34 +0000 (UTC)
Subject: rpms/perl-Math-Vec/devel perl-Math-Vec.spec,1.5,1.6
Message-ID: <20091207025234.98A0711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Vec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv929

Modified Files:
	perl-Math-Vec.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Vec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Vec/devel/perl-Math-Vec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Math-Vec.spec	26 Jul 2009 11:15:56 -0000	1.5
+++ perl-Math-Vec.spec	7 Dec 2009 02:52:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Math-Vec
 Version:        1.01
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl Math::Vec module
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:52:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:52:51 +0000 (UTC)
Subject: rpms/po4a/devel po4a.spec,1.11,1.12
Message-ID: <20091207025251.E456411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/po4a/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1196

Modified Files:
	po4a.spec 
Log Message:
- rebuild against perl 5.10.1


Index: po4a.spec
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/devel/po4a.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- po4a.spec	26 Jul 2009 19:01:44 -0000	1.11
+++ po4a.spec	7 Dec 2009 02:52:51 -0000	1.12
@@ -1,6 +1,6 @@
 Name: po4a
 Version: 0.35
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: A tool maintaining translations anywhere
 Group: Applications/System
 # Nothing in the source tree specifies a version of the GPL.
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.35-14
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:53:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:53:09 +0000 (UTC)
Subject: rpms/perl-CGI-Prototype/devel perl-CGI-Prototype.spec,1.5,1.6
Message-ID: <20091207025309.1C85511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Prototype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1353

Modified Files:
	perl-CGI-Prototype.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Prototype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Prototype/devel/perl-CGI-Prototype.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-CGI-Prototype.spec	26 Jul 2009 03:59:04 -0000	1.5
+++ perl-CGI-Prototype.spec	7 Dec 2009 02:53:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Prototype
 Version:        0.9053
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Create a CGI application by subclassing
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9053-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9053-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:54:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:54:01 +0000 (UTC)
Subject: rpms/perl-SQL-Shell/devel perl-SQL-Shell.spec,1.2,1.3
Message-ID: <20091207025401.BB59411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SQL-Shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1730

Modified Files:
	perl-SQL-Shell.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SQL-Shell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SQL-Shell/devel/perl-SQL-Shell.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-SQL-Shell.spec	26 Jul 2009 16:24:33 -0000	1.2
+++ perl-SQL-Shell.spec	7 Dec 2009 02:54:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-SQL-Shell 
 Version:    1.14 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/SQL/Shell.pm -> GPLv2 (refers to "the GPL", bundled COPYING is GPLv2)
 License:    GPLv2
 Group:      Development/Libraries
@@ -81,6 +81,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man1/sqlsh.1.gz
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.14-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:56:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:56:52 +0000 (UTC)
Subject: rpms/perl-File-BOM/devel perl-File-BOM.spec,1.8,1.9
Message-ID: <20091207025652.CCEF911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-BOM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2511

Modified Files:
	perl-File-BOM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-BOM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-BOM/devel/perl-File-BOM.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-File-BOM.spec	26 Jul 2009 05:57:33 -0000	1.8
+++ perl-File-BOM.spec	7 Dec 2009 02:56:52 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-File-BOM
 Version:        0.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Utilities for handling Byte Order Marks
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:56:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:56:53 +0000 (UTC)
Subject: rpms/perl-Math-Symbolic/devel perl-Math-Symbolic.spec,1.4,1.5
Message-ID: <20091207025653.A50C811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Symbolic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2525

Modified Files:
	perl-Math-Symbolic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Symbolic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Symbolic/devel/perl-Math-Symbolic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Math-Symbolic.spec	26 Jul 2009 11:15:42 -0000	1.4
+++ perl-Math-Symbolic.spec	7 Dec 2009 02:56:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Math-Symbolic
 Version:        0.510
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Symbolic calculations
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.510-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.510-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec  7 02:57:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 02:57:15 +0000 (UTC)
Subject: rpms/usbmuxd/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 usbmuxd.spec, 
	1.5, 1.6 0002-Port-udev-rules-to-newer-kernels.patch, 1.1,
	NONE usbmuxd-fix64.patch, 1.1, NONE
Message-ID: <20091207025715.48CFE11C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2770

Modified Files:
	.cvsignore sources usbmuxd.spec 
Removed Files:
	0002-Port-udev-rules-to-newer-kernels.patch 
	usbmuxd-fix64.patch 
Log Message:
- New stable 1.0.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Oct 2009 10:10:58 -0000	1.4
+++ .cvsignore	7 Dec 2009 02:57:15 -0000	1.5
@@ -1 +1 @@
-usbmuxd-1.0.0-rc2.tar.bz2
+usbmuxd-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Oct 2009 10:10:59 -0000	1.4
+++ sources	7 Dec 2009 02:57:15 -0000	1.5
@@ -1 +1 @@
-996d5ec74fafae9d2fca0c0d7a75ba71  usbmuxd-1.0.0-rc2.tar.bz2
+75b513c1cf95c488ed71d9f618ce1889  usbmuxd-1.0.0.tar.bz2


Index: usbmuxd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/usbmuxd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- usbmuxd.spec	31 Oct 2009 10:10:59 -0000	1.5
+++ usbmuxd.spec	7 Dec 2009 02:57:15 -0000	1.6
@@ -1,14 +1,13 @@
 Name:		usbmuxd
 Version:	1.0.0
-Release:	0.1.rc2%{?dist}
+Release:	1%{?dist}
 Summary:	Daemon for communicating with Apple's iPod Touch and iPhone
 
 Group:		Applications/System
 # All code is dual licenses as GPLv3+ or GPLv2+, except libusbmuxd which is LGPLv2+.
 License:	GPLv3+ or GPLv2+ and LGPLv2+
-URL:		http://cgit.pims.selfip.net/usbmuxd/
-#Source0:	http://cgit.pims.selfip.net/%{name}/snapshot/%{name}-%{version}.tar.gz
-Source0:	%{name}-1.0.0-rc2.tar.bz2
+URL:		http://marcansoft.com/uploads/
+Source0:	http://marcansoft.com/uploads/usbmuxd/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libusb1-devel
@@ -29,7 +28,7 @@ Requires: pkgconfig
 Files for development with %{name}.
 
 %prep
-%setup -q -n %{name}-1.0.0-rc2
+%setup -q
 
 %build
 export CMAKE_PREFIX_PATH=/usr
@@ -65,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libusbmuxd.pc
 
 %changelog
+* Mon Dec  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-1
+- New stable 1.0.0 release
+
 * Sat Oct 31 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1.rc2
 - New 1.0.0-rc2 test release
 


--- 0002-Port-udev-rules-to-newer-kernels.patch DELETED ---


--- usbmuxd-fix64.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 02:58:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:58:24 +0000 (UTC)
Subject: rpms/perl-CGI-FormBuilder/devel perl-CGI-FormBuilder.spec,1.4,1.5
Message-ID: <20091207025824.AE15E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-FormBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3067

Modified Files:
	perl-CGI-FormBuilder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-FormBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-FormBuilder/devel/perl-CGI-FormBuilder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-CGI-FormBuilder.spec	26 Jul 2009 03:58:49 -0000	1.4
+++ perl-CGI-FormBuilder.spec	7 Dec 2009 02:58:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-CGI-FormBuilder
 Version:        3.0501
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Easily generate and process stateful forms
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.0501-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0501-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:58:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:58:32 +0000 (UTC)
Subject: rpms/pisg/devel pisg.spec,1.3,1.4
Message-ID: <20091207025832.B755011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/pisg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3146

Modified Files:
	pisg.spec 
Log Message:
- rebuild against perl 5.10.1


Index: pisg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pisg/devel/pisg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pisg.spec	26 Jul 2009 18:50:18 -0000	1.3
+++ pisg.spec	7 Dec 2009 02:58:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pisg
 Version:        0.72
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        IRC Statistics generator
 
 Group:          Applications/Internet
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace)%{_sysconfdir}/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.72-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.72-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 02:58:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 02:58:39 +0000 (UTC)
Subject: rpms/perl-SQL-Library/devel perl-SQL-Library.spec,1.7,1.8
Message-ID: <20091207025839.E6C7111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SQL-Library/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3262

Modified Files:
	perl-SQL-Library.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SQL-Library.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SQL-Library/devel/perl-SQL-Library.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-SQL-Library.spec	26 Jul 2009 16:24:18 -0000	1.7
+++ perl-SQL-Library.spec	7 Dec 2009 02:58:39 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Library
 Version:        0.0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Manage libraries of SQL easily 
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.0.3-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From boodle at fedoraproject.org  Mon Dec  7 03:00:43 2009
From: boodle at fedoraproject.org (boodle)
Date: Mon,  7 Dec 2009 03:00:43 +0000 (UTC)
Subject: File pxe-kexec-0.2.3.tar.bz2 uploaded to lookaside cache by boodle
Message-ID: <20091207030043.3CCCA10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pxe-kexec:

5bba81d4f4841947a5b59d2e742321e0  pxe-kexec-0.2.3.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 03:01:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:01:25 +0000 (UTC)
Subject: rpms/perl-Math-Spline/devel perl-Math-Spline.spec,1.5,1.6
Message-ID: <20091207030125.2665911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Spline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4092

Modified Files:
	perl-Math-Spline.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Spline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Spline/devel/perl-Math-Spline.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Math-Spline.spec	26 Jul 2009 11:15:27 -0000	1.5
+++ perl-Math-Spline.spec	7 Dec 2009 03:01:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Math-Spline
 Version:        0.01
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cubic Spline Interpolation of data
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:01:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:01:27 +0000 (UTC)
Subject: rpms/perl-File-BaseDir/devel perl-File-BaseDir.spec,1.7,1.8
Message-ID: <20091207030127.24AE911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-File-BaseDir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4112

Modified Files:
	perl-File-BaseDir.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-File-BaseDir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-BaseDir/devel/perl-File-BaseDir.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-File-BaseDir.spec	26 Jul 2009 05:57:49 -0000	1.7
+++ perl-File-BaseDir.spec	7 Dec 2009 03:01:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-BaseDir
 Version:        0.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Use the freedesktop basedir spec
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From boodle at fedoraproject.org  Mon Dec  7 03:02:16 2009
From: boodle at fedoraproject.org (boodle)
Date: Mon,  7 Dec 2009 03:02:16 +0000 (UTC)
Subject: rpms/pxe-kexec/EL-4 import.log, NONE, 1.1 pxe-kexec.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207030216.CF0DD11C00E0@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/pxe-kexec/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4006/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pxe-kexec.spec 
Log Message:
initial EL-4 cvs import




--- NEW FILE import.log ---
pxe-kexec-0_2_3-2_fc12:EL-4:pxe-kexec-0.2.3-2.fc12.src.rpm:1260154839


--- NEW FILE pxe-kexec.spec ---
Name:		pxe-kexec
Version:	0.2.3
Release:	2%{?dist}
Summary:	Linux boots Linux via network

Group:		Applications/System
License:	GPLv2+
URL:		http://pxe-kexec.googlecode.com/
Source0:	http://pxe-kexec.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	cmake, readline-devel, ncurses-devel, libcurl-devel
Requires:	kexec-tools

%description
pxe-kexec reads a PXELINUX configuration file, prompts the user for an
entry like the PXELINUX program would do and finally boots that entry
using Kexec.

%prep
%setup -q

%build
%cmake
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING NEWS README ChangeLog
%doc %{_mandir}/man8/pxe-kexec.8.*
%{_sbindir}/pxe-kexec

%changelog
* Thu Dec 3 2009 Scott Collier <boodle11 at gmail.com> 0.2.3-2
- Fixing spec file 

* Thu Oct 22 2009 Scott Collier	<boodle11 at gmail.com> 0.2.3-1
- Changed Source0 and URL and some tags, changed buildroot line
- and added CFLAGS, declared man page as doc, removed VERBOSE
- from build

* Wed Jul 15 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-3
- Fixed Source0, cleaned up files per package review.

* Mon Jul 13 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-2
- Cleaned up spec file per package review.

* Fri Jun 26 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:22:14 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:02:16 -0000	1.2
@@ -0,0 +1 @@
+pxe-kexec-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:22:14 -0000	1.1
+++ sources	7 Dec 2009 03:02:16 -0000	1.2
@@ -0,0 +1 @@
+5bba81d4f4841947a5b59d2e742321e0  pxe-kexec-0.2.3.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 03:02:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:02:59 +0000 (UTC)
Subject: rpms/pilot-link/devel pilot-link.spec,1.89,1.90
Message-ID: <20091207030259.B115611C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4721

Modified Files:
	pilot-link.spec 
Log Message:
- rebuild against perl 5.10.1


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- pilot-link.spec	16 Nov 2009 00:08:25 -0000	1.89
+++ pilot-link.spec	7 Dec 2009 03:02:59 -0000	1.90
@@ -2,7 +2,7 @@
 
 Name: pilot-link
 Version: 0.12.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -185,6 +185,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2:0.12.4-5
+- rebuild against perl 5.10.1
+
 * Sun Nov 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.4-4
 - Better udev rules, thanks to Kevin Kofler
 



From kasal at fedoraproject.org  Mon Dec  7 03:03:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:03:21 +0000 (UTC)
Subject: rpms/perl-SQL-Abstract-Limit/devel perl-SQL-Abstract-Limit.spec, 1.8,
	1.9
Message-ID: <20091207030321.B735211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SQL-Abstract-Limit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4921

Modified Files:
	perl-SQL-Abstract-Limit.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SQL-Abstract-Limit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SQL-Abstract-Limit/devel/perl-SQL-Abstract-Limit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-SQL-Abstract-Limit.spec	26 Jul 2009 16:24:03 -0000	1.8
+++ perl-SQL-Abstract-Limit.spec	7 Dec 2009 03:03:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract-Limit
 Version:        0.141
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Portable LIMIT Emulation
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.141-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.141-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:03:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:03:22 +0000 (UTC)
Subject: rpms/perl-CGI-FastTemplate/devel perl-CGI-FastTemplate.spec, 1.5,
	1.6
Message-ID: <20091207030322.4D5CD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-FastTemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4942

Modified Files:
	perl-CGI-FastTemplate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-FastTemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-FastTemplate/devel/perl-CGI-FastTemplate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-CGI-FastTemplate.spec	26 Jul 2009 03:58:34 -0000	1.5
+++ perl-CGI-FastTemplate.spec	7 Dec 2009 03:03:22 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-CGI-FastTemplate
 Version:        1.09
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl extension for managing templates and performing variable interpolation
 
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.09-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:04:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:04:52 +0000 (UTC)
Subject: rpms/perl-Math-Round/devel perl-Math-Round.spec,1.8,1.9
Message-ID: <20091207030452.D594E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Round/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5408

Modified Files:
	perl-Math-Round.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Round.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Round/devel/perl-Math-Round.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Math-Round.spec	26 Jul 2009 11:15:12 -0000	1.8
+++ perl-Math-Round.spec	7 Dec 2009 03:04:52 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Math-Round
 Version:        0.06 
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for rounding numbers
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:05:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:05:38 +0000 (UTC)
Subject: rpms/perl-Feed-Find/devel perl-Feed-Find.spec,1.5,1.6
Message-ID: <20091207030538.B6B7A11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Feed-Find/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5643

Modified Files:
	perl-Feed-Find.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Feed-Find.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Feed-Find/devel/perl-Feed-Find.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Feed-Find.spec	26 Jul 2009 05:57:18 -0000	1.5
+++ perl-Feed-Find.spec	7 Dec 2009 03:05:38 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Feed-Find
 Version:        0.06
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Syndication feed auto-discovery
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:06:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:06:47 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.103,1.104
Message-ID: <20091207030647.62B9011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6046

Modified Files:
	pidgin.spec 
Log Message:
- rebuild against perl 5.10.1


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- pidgin.spec	2 Dec 2009 17:19:09 -0000	1.103
+++ pidgin.spec	7 Dec 2009 03:06:47 -0000	1.104
@@ -92,7 +92,7 @@
 
 Name:		pidgin
 Version:	2.6.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -631,6 +631,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.6.4-3
+- rebuild against perl 5.10.1
+
 * Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> 2.6.4-2
 - disable SILC in EL6 builds
 



From kasal at fedoraproject.org  Mon Dec  7 03:07:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:07:51 +0000 (UTC)
Subject: rpms/perl-SQL-Abstract/devel perl-SQL-Abstract.spec,1.17,1.18
Message-ID: <20091207030751.9213411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SQL-Abstract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6438

Modified Files:
	perl-SQL-Abstract.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SQL-Abstract/devel/perl-SQL-Abstract.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-SQL-Abstract.spec	27 Sep 2009 05:00:03 -0000	1.17
+++ perl-SQL-Abstract.spec	7 Dec 2009 03:07:51 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract
 Version:        1.60
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.60-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.60-1
 - auto-update to 1.60 (by cpan-spec-update 0.01)
 



From hicham at fedoraproject.org  Mon Dec  7 03:08:11 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 03:08:11 +0000 (UTC)
Subject: File MiniCopier-source.tar uploaded to lookaside cache by hicham
Message-ID: <20091207030811.8D2F510F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for MiniCopier:

a93211a265f90b04831a60bb65af04ae  MiniCopier-source.tar



From kasal at fedoraproject.org  Mon Dec  7 03:08:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:08:11 +0000 (UTC)
Subject: rpms/perl-CGI-Ex/devel perl-CGI-Ex.spec,1.11,1.12
Message-ID: <20091207030811.6343111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Ex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6596

Modified Files:
	perl-CGI-Ex.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Ex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Ex/devel/perl-CGI-Ex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-CGI-Ex.spec	26 Jul 2009 03:58:19 -0000	1.11
+++ perl-CGI-Ex.spec	7 Dec 2009 03:08:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Ex
 Version:        2.27
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CGI utility suite - makes powerful application writing fun and easy
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.27-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From boodle at fedoraproject.org  Mon Dec  7 03:09:37 2009
From: boodle at fedoraproject.org (boodle)
Date: Mon,  7 Dec 2009 03:09:37 +0000 (UTC)
Subject: rpms/pxe-kexec/EL-5 import.log, NONE, 1.1 pxe-kexec.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207030937.B632511C00E0@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/pxe-kexec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7094/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pxe-kexec.spec 
Log Message:
Initial EL-5 cvs commit




--- NEW FILE import.log ---
pxe-kexec-0_2_3-2_fc12:EL-5:pxe-kexec-0.2.3-2.fc12.src.rpm:1260155340


--- NEW FILE pxe-kexec.spec ---
Name:		pxe-kexec
Version:	0.2.3
Release:	2%{?dist}
Summary:	Linux boots Linux via network

Group:		Applications/System
License:	GPLv2+
URL:		http://pxe-kexec.googlecode.com/
Source0:	http://pxe-kexec.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	cmake, readline-devel, ncurses-devel, libcurl-devel
Requires:	kexec-tools

%description
pxe-kexec reads a PXELINUX configuration file, prompts the user for an
entry like the PXELINUX program would do and finally boots that entry
using Kexec.

%prep
%setup -q

%build
%cmake
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING NEWS README ChangeLog
%doc %{_mandir}/man8/pxe-kexec.8.*
%{_sbindir}/pxe-kexec

%changelog
* Thu Dec 3 2009 Scott Collier <boodle11 at gmail.com> 0.2.3-2
- Fixing spec file 

* Thu Oct 22 2009 Scott Collier	<boodle11 at gmail.com> 0.2.3-1
- Changed Source0 and URL and some tags, changed buildroot line
- and added CFLAGS, declared man page as doc, removed VERBOSE
- from build

* Wed Jul 15 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-3
- Fixed Source0, cleaned up files per package review.

* Mon Jul 13 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-2
- Cleaned up spec file per package review.

* Fri Jun 26 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:22:14 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:09:37 -0000	1.2
@@ -0,0 +1 @@
+pxe-kexec-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:22:14 -0000	1.1
+++ sources	7 Dec 2009 03:09:37 -0000	1.2
@@ -0,0 +1 @@
+5bba81d4f4841947a5b59d2e742321e0  pxe-kexec-0.2.3.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 03:09:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:09:44 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla/devel perl-Fedora-Bugzilla.spec,1.5,1.6
Message-ID: <20091207030944.C16A211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Fedora-Bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7249

Modified Files:
	perl-Fedora-Bugzilla.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Fedora-Bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Fedora-Bugzilla/devel/perl-Fedora-Bugzilla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Fedora-Bugzilla.spec	26 Jul 2009 05:57:01 -0000	1.5
+++ perl-Fedora-Bugzilla.spec	7 Dec 2009 03:09:44 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Fedora-Bugzilla
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Access Fedora's Bugzilla
 
 Group:          Development/Libraries
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:09:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:09:57 +0000 (UTC)
Subject: rpms/perl-Math-Random-MT-Auto/devel perl-Math-Random-MT-Auto.spec,
	1.9, 1.10
Message-ID: <20091207030957.1892311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Random-MT-Auto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7467

Modified Files:
	perl-Math-Random-MT-Auto.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Random-MT-Auto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Random-MT-Auto/devel/perl-Math-Random-MT-Auto.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Math-Random-MT-Auto.spec	26 Jul 2009 11:14:58 -0000	1.9
+++ perl-Math-Random-MT-Auto.spec	7 Dec 2009 03:09:56 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Math-Random-MT-Auto
 Version:        6.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Auto-seeded Mersenne Twister PRNGs
 License:        BSD 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 6.14-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hicham at fedoraproject.org  Mon Dec  7 03:11:01 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 03:11:01 +0000 (UTC)
Subject: rpms/MiniCopier/F-11 MiniCopier-MainFrame.java.patch, 1.1,
	1.2 MiniCopier-MiniCopier.sh.patch, 1.1,
	1.2 MiniCopier-build.xml.patch, 1.1, 1.2 MiniCopier.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091207031101.B6F3911C03FC@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/MiniCopier/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7919/F-11

Modified Files:
	MiniCopier-MainFrame.java.patch MiniCopier-MiniCopier.sh.patch 
	MiniCopier-build.xml.patch MiniCopier.spec import.log sources 
Log Message:


MiniCopier-MainFrame.java.patch:
 MainFrame.java |    7 +++++++
 1 file changed, 7 insertions(+)

Index: MiniCopier-MainFrame.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-11/MiniCopier-MainFrame.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-MainFrame.java.patch	12 Aug 2009 05:20:30 -0000	1.1
+++ MiniCopier-MainFrame.java.patch	7 Dec 2009 03:11:01 -0000	1.2
@@ -1,8 +1,8 @@
-diff -up MiniCopier-source/src/minicopier/gui/MainFrame.java.orig MiniCopier-source/src/minicopier/gui/MainFrame.java
---- MiniCopier-source/src/minicopier/gui/MainFrame.java.orig	2009-07-22 03:18:14.705153248 +0100
-+++ MiniCopier-source/src/minicopier/gui/MainFrame.java	2009-07-22 03:19:02.347154242 +0100
-@@ -85,6 +85,13 @@ public class MainFrame extends JFrame{
- 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+diff -up "Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java.orig" "Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java"
+--- Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java.orig	2009-10-09 11:18:39.000000000 +0000
++++ Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java	2009-12-05 01:12:38.305141071 +0000
+@@ -88,6 +88,13 @@ public class MainFrame extends JFrame{
+ 		this.setLocationRelativeTo(null);
  		this.setIconImage(imageFromJar("img/icon.jpg"));
  		//this.setUndecorated(true);
 +

MiniCopier-MiniCopier.sh.patch:
 MiniCopier.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: MiniCopier-MiniCopier.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-11/MiniCopier-MiniCopier.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-MiniCopier.sh.patch	12 Aug 2009 05:20:30 -0000	1.1
+++ MiniCopier-MiniCopier.sh.patch	7 Dec 2009 03:11:01 -0000	1.2
@@ -1,10 +1,11 @@
-diff -up MiniCopier-source/MiniCopier.sh.orig MiniCopier-source/MiniCopier.sh
---- MiniCopier-source/MiniCopier.sh.orig	2009-07-19 22:39:58.805753849 +0100
-+++ MiniCopier-source/MiniCopier.sh	2009-07-19 23:05:33.488753936 +0100
-@@ -1,5 +1,5 @@
+diff -up "Minicopier-0.5(sources)/MiniCopier.sh.orig" "Minicopier-0.5(sources)/MiniCopier.sh"
+--- Minicopier-0.5(sources)/MiniCopier.sh.orig	2009-07-17 06:04:29.000000000 +0100
++++ Minicopier-0.5(sources)/MiniCopier.sh	2009-12-05 01:07:00.267152132 +0000
+@@ -1,6 +1,6 @@
  #!/bin/bash
--
-+cd /usr/share/java
+ 
  echo "Launching MiniCopier..."
+-cd `dirname $0`
++cd /usr/share/java
  java -jar MiniCopier.jar $*
  echo "MiniCopier terminated."

MiniCopier-build.xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: MiniCopier-build.xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-11/MiniCopier-build.xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-build.xml.patch	12 Aug 2009 05:20:30 -0000	1.1
+++ MiniCopier-build.xml.patch	7 Dec 2009 03:11:01 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up MiniCopier-source/build.xml.orig MiniCopier-source/build.xml
---- MiniCopier-source/build.xml.orig	2009-08-07 20:52:09.856524471 +0100
-+++ MiniCopier-source/build.xml	2009-08-07 20:53:59.638525369 +0100
+diff -up "Minicopier-0.5(sources)/build.xml.orig" "Minicopier-0.5(sources)/build.xml"
+--- Minicopier-0.5(sources)/build.xml.orig	2009-12-05 01:31:10.210140841 +0000
++++ Minicopier-0.5(sources)/build.xml	2009-12-05 02:02:58.992139548 +0000
 @@ -2,7 +2,7 @@
  
  <property name="src" location="src"/>


Index: MiniCopier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-11/MiniCopier.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier.spec	12 Aug 2009 05:20:30 -0000	1.1
+++ MiniCopier.spec	7 Dec 2009 03:11:01 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		MiniCopier
-Version:	0.4
-Release:	3%{?dist}
+Version:	0.5
+Release:	1%{?dist}
 Summary:	Graphical copy manager
 Group:		Applications/File
 License:	GPLv2+
-URL:		http://a.courreges.free.fr/projets/minicopier/minicopier-en.php
-Source0:	http://a.courreges.free.fr/projets/minicopier/releases/%{name}-source.tar
+URL:		http://www.adriancourreges.com/projects/minicopier/
+Source0:	http://www.adriancourreges.com/projects/minicopier/releases/%{name}-source.tar
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -62,7 +62,7 @@ BuildArch:	noarch
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-source
+%setup -q -n Minicopier-%{version}(sources)
 %ant clean
 find -name '*.jar' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
@@ -101,11 +101,14 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc README
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.5-1
+- New upstream release
+
 * Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-3
 - Removed version from the jar.
 - Spec cleanup.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Aug 2009 05:20:30 -0000	1.1
+++ import.log	7 Dec 2009 03:11:01 -0000	1.2
@@ -1 +1,2 @@
 MiniCopier-0_4-3_fc11:F-11:MiniCopier-0.4-3.fc11.src.rpm:1250054341
+MiniCopier-0_5-1_fc12:F-11:MiniCopier-0.5-1.fc12.src.rpm:1260155416


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2009 05:20:31 -0000	1.2
+++ sources	7 Dec 2009 03:11:01 -0000	1.3
@@ -1 +1 @@
-2c6d694c3b42979696c6bc69bbceb474  MiniCopier-source.tar
+a93211a265f90b04831a60bb65af04ae  MiniCopier-source.tar



From hicham at fedoraproject.org  Mon Dec  7 03:11:28 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 03:11:28 +0000 (UTC)
Subject: rpms/MiniCopier/devel MiniCopier-MainFrame.java.patch, 1.1,
	1.2 MiniCopier-MiniCopier.sh.patch, 1.1,
	1.2 MiniCopier-build.xml.patch, 1.1, 1.2 MiniCopier.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091207031128.33FAB11C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/MiniCopier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8156/devel

Modified Files:
	MiniCopier-MainFrame.java.patch MiniCopier-MiniCopier.sh.patch 
	MiniCopier-build.xml.patch MiniCopier.spec import.log sources 
Log Message:


MiniCopier-MainFrame.java.patch:
 MainFrame.java |    7 +++++++
 1 file changed, 7 insertions(+)

Index: MiniCopier-MainFrame.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/devel/MiniCopier-MainFrame.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-MainFrame.java.patch	12 Aug 2009 05:12:00 -0000	1.1
+++ MiniCopier-MainFrame.java.patch	7 Dec 2009 03:11:27 -0000	1.2
@@ -1,8 +1,8 @@
-diff -up MiniCopier-source/src/minicopier/gui/MainFrame.java.orig MiniCopier-source/src/minicopier/gui/MainFrame.java
---- MiniCopier-source/src/minicopier/gui/MainFrame.java.orig	2009-07-22 03:18:14.705153248 +0100
-+++ MiniCopier-source/src/minicopier/gui/MainFrame.java	2009-07-22 03:19:02.347154242 +0100
-@@ -85,6 +85,13 @@ public class MainFrame extends JFrame{
- 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+diff -up "Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java.orig" "Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java"
+--- Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java.orig	2009-10-09 11:18:39.000000000 +0000
++++ Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java	2009-12-05 01:12:38.305141071 +0000
+@@ -88,6 +88,13 @@ public class MainFrame extends JFrame{
+ 		this.setLocationRelativeTo(null);
  		this.setIconImage(imageFromJar("img/icon.jpg"));
  		//this.setUndecorated(true);
 +

MiniCopier-MiniCopier.sh.patch:
 MiniCopier.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: MiniCopier-MiniCopier.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/devel/MiniCopier-MiniCopier.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-MiniCopier.sh.patch	12 Aug 2009 05:12:00 -0000	1.1
+++ MiniCopier-MiniCopier.sh.patch	7 Dec 2009 03:11:27 -0000	1.2
@@ -1,10 +1,11 @@
-diff -up MiniCopier-source/MiniCopier.sh.orig MiniCopier-source/MiniCopier.sh
---- MiniCopier-source/MiniCopier.sh.orig	2009-07-19 22:39:58.805753849 +0100
-+++ MiniCopier-source/MiniCopier.sh	2009-07-19 23:05:33.488753936 +0100
-@@ -1,5 +1,5 @@
+diff -up "Minicopier-0.5(sources)/MiniCopier.sh.orig" "Minicopier-0.5(sources)/MiniCopier.sh"
+--- Minicopier-0.5(sources)/MiniCopier.sh.orig	2009-07-17 06:04:29.000000000 +0100
++++ Minicopier-0.5(sources)/MiniCopier.sh	2009-12-05 01:07:00.267152132 +0000
+@@ -1,6 +1,6 @@
  #!/bin/bash
--
-+cd /usr/share/java
+ 
  echo "Launching MiniCopier..."
+-cd `dirname $0`
++cd /usr/share/java
  java -jar MiniCopier.jar $*
  echo "MiniCopier terminated."

MiniCopier-build.xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: MiniCopier-build.xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/devel/MiniCopier-build.xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-build.xml.patch	12 Aug 2009 05:12:00 -0000	1.1
+++ MiniCopier-build.xml.patch	7 Dec 2009 03:11:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up MiniCopier-source/build.xml.orig MiniCopier-source/build.xml
---- MiniCopier-source/build.xml.orig	2009-08-07 20:52:09.856524471 +0100
-+++ MiniCopier-source/build.xml	2009-08-07 20:53:59.638525369 +0100
+diff -up "Minicopier-0.5(sources)/build.xml.orig" "Minicopier-0.5(sources)/build.xml"
+--- Minicopier-0.5(sources)/build.xml.orig	2009-12-05 01:31:10.210140841 +0000
++++ Minicopier-0.5(sources)/build.xml	2009-12-05 02:02:58.992139548 +0000
 @@ -2,7 +2,7 @@
  
  <property name="src" location="src"/>


Index: MiniCopier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/devel/MiniCopier.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier.spec	12 Aug 2009 05:12:00 -0000	1.1
+++ MiniCopier.spec	7 Dec 2009 03:11:27 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		MiniCopier
-Version:	0.4
-Release:	3%{?dist}
+Version:	0.5
+Release:	1%{?dist}
 Summary:	Graphical copy manager
 Group:		Applications/File
 License:	GPLv2+
-URL:		http://a.courreges.free.fr/projets/minicopier/minicopier-en.php
-Source0:	http://a.courreges.free.fr/projets/minicopier/releases/%{name}-source.tar
+URL:		http://www.adriancourreges.com/projects/minicopier/
+Source0:	http://www.adriancourreges.com/projects/minicopier/releases/%{name}-source.tar
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -62,7 +62,7 @@ BuildArch:	noarch
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-source
+%setup -q -n Minicopier-%{version}(sources)
 %ant clean
 find -name '*.jar' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
@@ -101,11 +101,14 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc README
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.5-1
+- New upstream release
+
 * Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-3
 - Removed version from the jar.
 - Spec cleanup.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Aug 2009 05:12:00 -0000	1.1
+++ import.log	7 Dec 2009 03:11:27 -0000	1.2
@@ -1 +1,2 @@
 MiniCopier-0_4-3_fc11:HEAD:MiniCopier-0.4-3.fc11.src.rpm:1250053633
+MiniCopier-0_5-1_fc12:HEAD:MiniCopier-0.5-1.fc12.src.rpm:1260155298


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2009 05:12:00 -0000	1.2
+++ sources	7 Dec 2009 03:11:27 -0000	1.3
@@ -1 +1 @@
-2c6d694c3b42979696c6bc69bbceb474  MiniCopier-source.tar
+a93211a265f90b04831a60bb65af04ae  MiniCopier-source.tar



From hicham at fedoraproject.org  Mon Dec  7 03:11:42 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 03:11:42 +0000 (UTC)
Subject: rpms/MiniCopier/F-12 MiniCopier-MainFrame.java.patch, 1.1,
	1.2 MiniCopier-MiniCopier.sh.patch, 1.1,
	1.2 MiniCopier-build.xml.patch, 1.1, 1.2 MiniCopier.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091207031142.19C9C11C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/MiniCopier/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8083/F-12

Modified Files:
	MiniCopier-MainFrame.java.patch MiniCopier-MiniCopier.sh.patch 
	MiniCopier-build.xml.patch MiniCopier.spec import.log sources 
Log Message:


MiniCopier-MainFrame.java.patch:
 MainFrame.java |    7 +++++++
 1 file changed, 7 insertions(+)

Index: MiniCopier-MainFrame.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-12/MiniCopier-MainFrame.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-MainFrame.java.patch	12 Aug 2009 05:12:00 -0000	1.1
+++ MiniCopier-MainFrame.java.patch	7 Dec 2009 03:11:41 -0000	1.2
@@ -1,8 +1,8 @@
-diff -up MiniCopier-source/src/minicopier/gui/MainFrame.java.orig MiniCopier-source/src/minicopier/gui/MainFrame.java
---- MiniCopier-source/src/minicopier/gui/MainFrame.java.orig	2009-07-22 03:18:14.705153248 +0100
-+++ MiniCopier-source/src/minicopier/gui/MainFrame.java	2009-07-22 03:19:02.347154242 +0100
-@@ -85,6 +85,13 @@ public class MainFrame extends JFrame{
- 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+diff -up "Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java.orig" "Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java"
+--- Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java.orig	2009-10-09 11:18:39.000000000 +0000
++++ Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java	2009-12-05 01:12:38.305141071 +0000
+@@ -88,6 +88,13 @@ public class MainFrame extends JFrame{
+ 		this.setLocationRelativeTo(null);
  		this.setIconImage(imageFromJar("img/icon.jpg"));
  		//this.setUndecorated(true);
 +

MiniCopier-MiniCopier.sh.patch:
 MiniCopier.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: MiniCopier-MiniCopier.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-12/MiniCopier-MiniCopier.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-MiniCopier.sh.patch	12 Aug 2009 05:12:00 -0000	1.1
+++ MiniCopier-MiniCopier.sh.patch	7 Dec 2009 03:11:41 -0000	1.2
@@ -1,10 +1,11 @@
-diff -up MiniCopier-source/MiniCopier.sh.orig MiniCopier-source/MiniCopier.sh
---- MiniCopier-source/MiniCopier.sh.orig	2009-07-19 22:39:58.805753849 +0100
-+++ MiniCopier-source/MiniCopier.sh	2009-07-19 23:05:33.488753936 +0100
-@@ -1,5 +1,5 @@
+diff -up "Minicopier-0.5(sources)/MiniCopier.sh.orig" "Minicopier-0.5(sources)/MiniCopier.sh"
+--- Minicopier-0.5(sources)/MiniCopier.sh.orig	2009-07-17 06:04:29.000000000 +0100
++++ Minicopier-0.5(sources)/MiniCopier.sh	2009-12-05 01:07:00.267152132 +0000
+@@ -1,6 +1,6 @@
  #!/bin/bash
--
-+cd /usr/share/java
+ 
  echo "Launching MiniCopier..."
+-cd `dirname $0`
++cd /usr/share/java
  java -jar MiniCopier.jar $*
  echo "MiniCopier terminated."

MiniCopier-build.xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: MiniCopier-build.xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-12/MiniCopier-build.xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-build.xml.patch	12 Aug 2009 05:12:00 -0000	1.1
+++ MiniCopier-build.xml.patch	7 Dec 2009 03:11:41 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up MiniCopier-source/build.xml.orig MiniCopier-source/build.xml
---- MiniCopier-source/build.xml.orig	2009-08-07 20:52:09.856524471 +0100
-+++ MiniCopier-source/build.xml	2009-08-07 20:53:59.638525369 +0100
+diff -up "Minicopier-0.5(sources)/build.xml.orig" "Minicopier-0.5(sources)/build.xml"
+--- Minicopier-0.5(sources)/build.xml.orig	2009-12-05 01:31:10.210140841 +0000
++++ Minicopier-0.5(sources)/build.xml	2009-12-05 02:02:58.992139548 +0000
 @@ -2,7 +2,7 @@
  
  <property name="src" location="src"/>


Index: MiniCopier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-12/MiniCopier.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier.spec	12 Aug 2009 05:12:00 -0000	1.1
+++ MiniCopier.spec	7 Dec 2009 03:11:41 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		MiniCopier
-Version:	0.4
-Release:	3%{?dist}
+Version:	0.5
+Release:	1%{?dist}
 Summary:	Graphical copy manager
 Group:		Applications/File
 License:	GPLv2+
-URL:		http://a.courreges.free.fr/projets/minicopier/minicopier-en.php
-Source0:	http://a.courreges.free.fr/projets/minicopier/releases/%{name}-source.tar
+URL:		http://www.adriancourreges.com/projects/minicopier/
+Source0:	http://www.adriancourreges.com/projects/minicopier/releases/%{name}-source.tar
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -62,7 +62,7 @@ BuildArch:	noarch
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-source
+%setup -q -n Minicopier-%{version}(sources)
 %ant clean
 find -name '*.jar' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
@@ -101,11 +101,14 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc README
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.5-1
+- New upstream release
+
 * Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-3
 - Removed version from the jar.
 - Spec cleanup.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Aug 2009 05:12:00 -0000	1.1
+++ import.log	7 Dec 2009 03:11:41 -0000	1.2
@@ -1 +1,2 @@
 MiniCopier-0_4-3_fc11:HEAD:MiniCopier-0.4-3.fc11.src.rpm:1250053633
+MiniCopier-0_5-1_fc12:F-12:MiniCopier-0.5-1.fc12.src.rpm:1260155361


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2009 05:12:00 -0000	1.2
+++ sources	7 Dec 2009 03:11:41 -0000	1.3
@@ -1 +1 @@
-2c6d694c3b42979696c6bc69bbceb474  MiniCopier-source.tar
+a93211a265f90b04831a60bb65af04ae  MiniCopier-source.tar



From hicham at fedoraproject.org  Mon Dec  7 03:11:50 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 03:11:50 +0000 (UTC)
Subject: rpms/MiniCopier/F-10 MiniCopier-MainFrame.java.patch, 1.1,
	1.2 MiniCopier-MiniCopier.sh.patch, 1.1,
	1.2 MiniCopier-build.xml.patch, 1.1, 1.2 MiniCopier.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091207031150.A171411C00E0@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/MiniCopier/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8192/F-10

Modified Files:
	MiniCopier-MainFrame.java.patch MiniCopier-MiniCopier.sh.patch 
	MiniCopier-build.xml.patch MiniCopier.spec import.log sources 
Log Message:


MiniCopier-MainFrame.java.patch:
 MainFrame.java |    7 +++++++
 1 file changed, 7 insertions(+)

Index: MiniCopier-MainFrame.java.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-10/MiniCopier-MainFrame.java.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-MainFrame.java.patch	12 Aug 2009 05:21:42 -0000	1.1
+++ MiniCopier-MainFrame.java.patch	7 Dec 2009 03:11:50 -0000	1.2
@@ -1,8 +1,8 @@
-diff -up MiniCopier-source/src/minicopier/gui/MainFrame.java.orig MiniCopier-source/src/minicopier/gui/MainFrame.java
---- MiniCopier-source/src/minicopier/gui/MainFrame.java.orig	2009-07-22 03:18:14.705153248 +0100
-+++ MiniCopier-source/src/minicopier/gui/MainFrame.java	2009-07-22 03:19:02.347154242 +0100
-@@ -85,6 +85,13 @@ public class MainFrame extends JFrame{
- 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+diff -up "Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java.orig" "Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java"
+--- Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java.orig	2009-10-09 11:18:39.000000000 +0000
++++ Minicopier-0.5(sources)/src/minicopier/gui/MainFrame.java	2009-12-05 01:12:38.305141071 +0000
+@@ -88,6 +88,13 @@ public class MainFrame extends JFrame{
+ 		this.setLocationRelativeTo(null);
  		this.setIconImage(imageFromJar("img/icon.jpg"));
  		//this.setUndecorated(true);
 +

MiniCopier-MiniCopier.sh.patch:
 MiniCopier.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: MiniCopier-MiniCopier.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-10/MiniCopier-MiniCopier.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-MiniCopier.sh.patch	12 Aug 2009 05:21:42 -0000	1.1
+++ MiniCopier-MiniCopier.sh.patch	7 Dec 2009 03:11:50 -0000	1.2
@@ -1,10 +1,11 @@
-diff -up MiniCopier-source/MiniCopier.sh.orig MiniCopier-source/MiniCopier.sh
---- MiniCopier-source/MiniCopier.sh.orig	2009-07-19 22:39:58.805753849 +0100
-+++ MiniCopier-source/MiniCopier.sh	2009-07-19 23:05:33.488753936 +0100
-@@ -1,5 +1,5 @@
+diff -up "Minicopier-0.5(sources)/MiniCopier.sh.orig" "Minicopier-0.5(sources)/MiniCopier.sh"
+--- Minicopier-0.5(sources)/MiniCopier.sh.orig	2009-07-17 06:04:29.000000000 +0100
++++ Minicopier-0.5(sources)/MiniCopier.sh	2009-12-05 01:07:00.267152132 +0000
+@@ -1,6 +1,6 @@
  #!/bin/bash
--
-+cd /usr/share/java
+ 
  echo "Launching MiniCopier..."
+-cd `dirname $0`
++cd /usr/share/java
  java -jar MiniCopier.jar $*
  echo "MiniCopier terminated."

MiniCopier-build.xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: MiniCopier-build.xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-10/MiniCopier-build.xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier-build.xml.patch	12 Aug 2009 05:21:42 -0000	1.1
+++ MiniCopier-build.xml.patch	7 Dec 2009 03:11:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up MiniCopier-source/build.xml.orig MiniCopier-source/build.xml
---- MiniCopier-source/build.xml.orig	2009-08-07 20:52:09.856524471 +0100
-+++ MiniCopier-source/build.xml	2009-08-07 20:53:59.638525369 +0100
+diff -up "Minicopier-0.5(sources)/build.xml.orig" "Minicopier-0.5(sources)/build.xml"
+--- Minicopier-0.5(sources)/build.xml.orig	2009-12-05 01:31:10.210140841 +0000
++++ Minicopier-0.5(sources)/build.xml	2009-12-05 02:02:58.992139548 +0000
 @@ -2,7 +2,7 @@
  
  <property name="src" location="src"/>


Index: MiniCopier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-10/MiniCopier.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MiniCopier.spec	12 Aug 2009 05:21:42 -0000	1.1
+++ MiniCopier.spec	7 Dec 2009 03:11:50 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		MiniCopier
-Version:	0.4
-Release:	3%{?dist}
+Version:	0.5
+Release:	1%{?dist}
 Summary:	Graphical copy manager
 Group:		Applications/File
 License:	GPLv2+
-URL:		http://a.courreges.free.fr/projets/minicopier/minicopier-en.php
-Source0:	http://a.courreges.free.fr/projets/minicopier/releases/%{name}-source.tar
+URL:		http://www.adriancourreges.com/projects/minicopier/
+Source0:	http://www.adriancourreges.com/projects/minicopier/releases/%{name}-source.tar
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -62,7 +62,7 @@ BuildArch:	noarch
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-source
+%setup -q -n Minicopier-%{version}(sources)
 %ant clean
 find -name '*.jar' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
@@ -101,11 +101,14 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc README
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.5-1
+- New upstream release
+
 * Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-3
 - Removed version from the jar.
 - Spec cleanup.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Aug 2009 05:21:42 -0000	1.1
+++ import.log	7 Dec 2009 03:11:50 -0000	1.2
@@ -1 +1,2 @@
 MiniCopier-0_4-3_fc11:F-10:MiniCopier-0.4-3.fc11.src.rpm:1250054452
+MiniCopier-0_5-1_fc12:F-10:MiniCopier-0.5-1.fc12.src.rpm:1260155446


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2009 05:21:42 -0000	1.2
+++ sources	7 Dec 2009 03:11:50 -0000	1.3
@@ -1 +1 @@
-2c6d694c3b42979696c6bc69bbceb474  MiniCopier-source.tar
+a93211a265f90b04831a60bb65af04ae  MiniCopier-source.tar



From kasal at fedoraproject.org  Mon Dec  7 03:12:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:12:39 +0000 (UTC)
Subject: rpms/perl-Spreadsheet-WriteExcel-Simple/devel
	perl-Spreadsheet-WriteExcel-Simple.spec, 1.5, 1.6
Message-ID: <20091207031239.B18C111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8848

Modified Files:
	perl-Spreadsheet-WriteExcel-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Spreadsheet-WriteExcel-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel-Simple/devel/perl-Spreadsheet-WriteExcel-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Spreadsheet-WriteExcel-Simple.spec	26 Jul 2009 16:33:02 -0000	1.5
+++ perl-Spreadsheet-WriteExcel-Simple.spec	7 Dec 2009 03:12:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Spreadsheet-WriteExcel-Simple
 Version:        1.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple single-sheet Excel document creator
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:13:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:13:24 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Structured/devel
	perl-CGI-Application-Structured.spec, 1.1, 1.2
Message-ID: <20091207031324.07AFC11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Structured/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9269

Modified Files:
	perl-CGI-Application-Structured.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Structured.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Structured/devel/perl-CGI-Application-Structured.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-CGI-Application-Structured.spec	27 Nov 2009 10:30:45 -0000	1.1
+++ perl-CGI-Application-Structured.spec	7 Dec 2009 03:13:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Structured
 Version:        0.003
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Medium-weight, MVC, DB web framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,5 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.003-2
+- rebuild against perl 5.10.1
+
 * Thu Oct 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.003-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 03:14:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:14:17 +0000 (UTC)
Subject: rpms/perl-FCGI-ProcManager/devel perl-FCGI-ProcManager.spec, 1.4,
	1.5
Message-ID: <20091207031417.C8A8711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-FCGI-ProcManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9544

Modified Files:
	perl-FCGI-ProcManager.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-FCGI-ProcManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-FCGI-ProcManager/devel/perl-FCGI-ProcManager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-FCGI-ProcManager.spec	11 Aug 2009 07:47:24 -0000	1.4
+++ perl-FCGI-ProcManager.spec	7 Dec 2009 03:14:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-FCGI-ProcManager
 Version:    0.19
-Release:    1%{?dist}
+Release:    2%{?dist}
 # ProcManager.pm -> LGPLv2, LGPLv3
 License:    LGPLv2+
 Group:      Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.19-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
 - auto-update to 0.19 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 03:15:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:15:30 +0000 (UTC)
Subject: rpms/perl-Math-MatrixReal/devel perl-Math-MatrixReal.spec,1.5,1.6
Message-ID: <20091207031530.95A3C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-MatrixReal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10091

Modified Files:
	perl-Math-MatrixReal.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-MatrixReal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-MatrixReal/devel/perl-Math-MatrixReal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Math-MatrixReal.spec	26 Jul 2009 11:14:24 -0000	1.5
+++ perl-Math-MatrixReal.spec	7 Dec 2009 03:15:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Math-MatrixReal
 Version:        2.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Manipulate matrix of reals
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.05-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:16:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:16:10 +0000 (UTC)
Subject: rpms/pgp-tools/devel pgp-tools.spec,1.13,1.14
Message-ID: <20091207031610.2552C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/pgp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10294

Modified Files:
	pgp-tools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pgp-tools/devel/pgp-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pgp-tools.spec	26 Jul 2009 17:54:30 -0000	1.13
+++ pgp-tools.spec	7 Dec 2009 03:16:09 -0000	1.14
@@ -2,7 +2,7 @@
 %define debian_version 1.1
 Name:           pgp-tools
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc __fedora_docs/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:16:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:16:29 +0000 (UTC)
Subject: rpms/perl-Spreadsheet-WriteExcel/devel
	perl-Spreadsheet-WriteExcel.spec, 1.19, 1.20
Message-ID: <20091207031629.5E39A11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10466

Modified Files:
	perl-Spreadsheet-WriteExcel.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel/devel/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-Spreadsheet-WriteExcel.spec	26 Jul 2009 16:32:45 -0000	1.19
+++ perl-Spreadsheet-WriteExcel.spec	7 Dec 2009 03:16:29 -0000	1.20
@@ -1,6 +1,6 @@
 Name:			perl-Spreadsheet-WriteExcel
 Version:		2.25
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Write formatted text and numbers to a cross-platform Excel binary file
 
 Group:			Development/Libraries
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.25-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From konradm at fedoraproject.org  Mon Dec  7 03:18:18 2009
From: konradm at fedoraproject.org (konradm)
Date: Mon,  7 Dec 2009 03:18:18 +0000 (UTC)
Subject: rpms/sdcc/devel sdcc.spec,1.19,1.20
Message-ID: <20091207031818.80C0511C03F6@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10836

Modified Files:
	sdcc.spec 
Log Message:
* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
- Work around rpmbuild failure by disabling brp-strip.



Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/devel/sdcc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sdcc.spec	11 Sep 2009 14:17:35 -0000	1.19
+++ sdcc.spec	7 Dec 2009 03:18:18 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           sdcc
 Version:        2.9.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
@@ -60,25 +60,9 @@ Emacs extensions for SDCC.
 %patch3 -p1
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
+# Disable brp-strip for now because it errors trying to strip foreign
+# binaries.
+%global __os_install_post /usr/lib/rpm/redhat/brp-compress
 
 
 %build
@@ -112,6 +96,10 @@ chmod 755 %{name}-$(basename $x)
 done
 popd
 
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/src/pic16
+find . -type f -name '*.a' -exec chmod 664 '{}' \;
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -137,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
+- Work around rpmbuild failure by disabling brp-strip.
+
 * Fri Sep 11 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-5
 - Fix a bug with single-bit types, logical NOT, and casting to char
   (I'm fuzzy on the details) that was reported by a Fedora user with the



From kasal at fedoraproject.org  Mon Dec  7 03:19:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:19:00 +0000 (UTC)
Subject: rpms/perl-ExtUtils-XSpp/devel perl-ExtUtils-XSpp.spec,1.1,1.2
Message-ID: <20091207031900.A8C1111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-XSpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10991

Modified Files:
	perl-ExtUtils-XSpp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-XSpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-XSpp/devel/perl-ExtUtils-XSpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-ExtUtils-XSpp.spec	5 Sep 2009 12:31:57 -0000	1.1
+++ perl-ExtUtils-XSpp.spec	7 Dec 2009 03:19:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-XSpp
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ variant of Perl's XS language
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Stepan Kasal <skasal at redhat.com> 0.04-2
 - follow suggestions from Parag's review
 



From kasal at fedoraproject.org  Mon Dec  7 03:20:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:20:05 +0000 (UTC)
Subject: rpms/perl-Math-GMP/devel perl-Math-GMP.spec,1.18,1.19
Message-ID: <20091207032005.A3D1B11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-GMP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11293

Modified Files:
	perl-Math-GMP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-GMP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-GMP/devel/perl-Math-GMP.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-Math-GMP.spec	18 Sep 2009 09:32:48 -0000	1.18
+++ perl-Math-GMP.spec	7 Dec 2009 03:20:05 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:	High speed arbitrary size integer math
 Name:		perl-Math-GMP
 Version:	2.06
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-GMP/
@@ -77,6 +77,9 @@ cd -
 %{_mandir}/man3/Math::GMP.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.06-2
+- rebuild against perl 5.10.1
+
 * Fri Sep 18 2009 Paul Howarth <paul at city-fan.org> 2.06-1
 - Update to 2.06
   - Make Makefile.PL more forgiving of gmp library locations (CPAN RT#46323)



From kasal at fedoraproject.org  Mon Dec  7 03:20:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:20:07 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Standard-Config/devel
	perl-CGI-Application-Standard-Config.spec, 1.2, 1.3
Message-ID: <20091207032007.BEEA911C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Standard-Config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11319

Modified Files:
	perl-CGI-Application-Standard-Config.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Standard-Config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Standard-Config/devel/perl-CGI-Application-Standard-Config.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Standard-Config.spec	26 Jul 2009 03:58:04 -0000	1.2
+++ perl-CGI-Application-Standard-Config.spec	7 Dec 2009 03:20:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Standard-Config
 Version:        1.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Defines a standard configuration API for CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From boodle at fedoraproject.org  Mon Dec  7 03:20:44 2009
From: boodle at fedoraproject.org (boodle)
Date: Mon,  7 Dec 2009 03:20:44 +0000 (UTC)
Subject: rpms/pxe-kexec/devel import.log, NONE, 1.1 pxe-kexec.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207032044.A3BBE11C03E3@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/pxe-kexec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11671/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pxe-kexec.spec 
Log Message:
cvs commit of pxe-kxec



--- NEW FILE import.log ---
pxe-kexec-0_2_3-2_fc12:HEAD:pxe-kexec-0.2.3-2.fc12.src.rpm:1260156014


--- NEW FILE pxe-kexec.spec ---
Name:		pxe-kexec
Version:	0.2.3
Release:	2%{?dist}
Summary:	Linux boots Linux via network

Group:		Applications/System
License:	GPLv2+
URL:		http://pxe-kexec.googlecode.com/
Source0:	http://pxe-kexec.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	cmake, readline-devel, ncurses-devel, libcurl-devel
Requires:	kexec-tools

%description
pxe-kexec reads a PXELINUX configuration file, prompts the user for an
entry like the PXELINUX program would do and finally boots that entry
using Kexec.

%prep
%setup -q

%build
%cmake
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING NEWS README ChangeLog
%doc %{_mandir}/man8/pxe-kexec.8.*
%{_sbindir}/pxe-kexec

%changelog
* Thu Dec 3 2009 Scott Collier <boodle11 at gmail.com> 0.2.3-2
- Fixing spec file 

* Thu Oct 22 2009 Scott Collier	<boodle11 at gmail.com> 0.2.3-1
- Changed Source0 and URL and some tags, changed buildroot line
- and added CFLAGS, declared man page as doc, removed VERBOSE
- from build

* Wed Jul 15 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-3
- Fixed Source0, cleaned up files per package review.

* Mon Jul 13 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-2
- Cleaned up spec file per package review.

* Fri Jun 26 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:22:14 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:20:44 -0000	1.2
@@ -0,0 +1 @@
+pxe-kexec-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:22:14 -0000	1.1
+++ sources	7 Dec 2009 03:20:44 -0000	1.2
@@ -0,0 +1 @@
+5bba81d4f4841947a5b59d2e742321e0  pxe-kexec-0.2.3.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 03:21:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:21:33 +0000 (UTC)
Subject: rpms/perl-YAML-Tiny/devel perl-YAML-Tiny.spec,1.14,1.15
Message-ID: <20091207032133.B366D11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-YAML-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11973

Modified Files:
	perl-YAML-Tiny.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-YAML-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Tiny/devel/perl-YAML-Tiny.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-YAML-Tiny.spec	27 Sep 2009 04:29:31 -0000	1.14
+++ perl-YAML-Tiny.spec	7 Dec 2009 03:21:33 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-YAML-Tiny
 Version:        1.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Read/Write YAML files with as little code as possible
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.40-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.40-1
 - auto-update to 1.40 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 03:21:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:21:32 +0000 (UTC)
Subject: rpms/perl-Spreadsheet-ParseExcel-Simple/devel
	perl-Spreadsheet-ParseExcel-Simple.spec, 1.5, 1.6
Message-ID: <20091207032132.C5D4711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11959

Modified Files:
	perl-Spreadsheet-ParseExcel-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Spreadsheet-ParseExcel-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel-Simple/devel/perl-Spreadsheet-ParseExcel-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Spreadsheet-ParseExcel-Simple.spec	26 Jul 2009 16:32:29 -0000	1.5
+++ perl-Spreadsheet-ParseExcel-Simple.spec	7 Dec 2009 03:21:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Spreadsheet-ParseExcel-Simple
 Version:        1.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple interface to Excel data
 License:        GPLv2+
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 03:22:24 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 03:22:24 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.15,1.16
Message-ID: <20091207032224.5DD8B11C00E0@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12374

Modified Files:
	gnome-shell.spec 
Log Message:
Added the autotools needed to build the git snapshot to the build requires




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gnome-shell.spec	7 Dec 2009 02:41:26 -0000	1.15
+++ gnome-shell.spec	7 Dec 2009 03:22:24 -0000	1.16
@@ -20,6 +20,11 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 %define gobject_introspection_version 0.6.5
 %define mutter_version 2.28.0
 
+## Needed by git tree
+BuildRequires   autogen
+BuildRequires   autoconf
+BuildRequires   automake
+
 BuildRequires:  clutter-devel >= %{clutter_version}
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
@@ -69,6 +74,8 @@ easy to use experience.
 %setup -q -n gnome-shell
 
 %build
+## Needed to build the git tree
+autogen
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@@ -127,6 +134,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Sun Dec 06 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-3
+- Added the autotools needed to build the git snapshot to the build requires
+
 * Sun Dec 06 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-2
 - Fixed the setup naming issue with the git snapshot directory naming
 



From boodle at fedoraproject.org  Mon Dec  7 03:22:30 2009
From: boodle at fedoraproject.org (boodle)
Date: Mon,  7 Dec 2009 03:22:30 +0000 (UTC)
Subject: rpms/pxe-kexec/F-11 import.log, NONE, 1.1 pxe-kexec.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207032230.A2B7711C00E0@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/pxe-kexec/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12418/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pxe-kexec.spec 
Log Message:
Initial F-11 cvs commit



--- NEW FILE import.log ---
pxe-kexec-0_2_3-2_fc12:F-11:pxe-kexec-0.2.3-2.fc12.src.rpm:1260156124


--- NEW FILE pxe-kexec.spec ---
Name:		pxe-kexec
Version:	0.2.3
Release:	2%{?dist}
Summary:	Linux boots Linux via network

Group:		Applications/System
License:	GPLv2+
URL:		http://pxe-kexec.googlecode.com/
Source0:	http://pxe-kexec.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	cmake, readline-devel, ncurses-devel, libcurl-devel
Requires:	kexec-tools

%description
pxe-kexec reads a PXELINUX configuration file, prompts the user for an
entry like the PXELINUX program would do and finally boots that entry
using Kexec.

%prep
%setup -q

%build
%cmake
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING NEWS README ChangeLog
%doc %{_mandir}/man8/pxe-kexec.8.*
%{_sbindir}/pxe-kexec

%changelog
* Thu Dec 3 2009 Scott Collier <boodle11 at gmail.com> 0.2.3-2
- Fixing spec file 

* Thu Oct 22 2009 Scott Collier	<boodle11 at gmail.com> 0.2.3-1
- Changed Source0 and URL and some tags, changed buildroot line
- and added CFLAGS, declared man page as doc, removed VERBOSE
- from build

* Wed Jul 15 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-3
- Fixed Source0, cleaned up files per package review.

* Mon Jul 13 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-2
- Cleaned up spec file per package review.

* Fri Jun 26 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:22:14 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:22:30 -0000	1.2
@@ -0,0 +1 @@
+pxe-kexec-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:22:14 -0000	1.1
+++ sources	7 Dec 2009 03:22:30 -0000	1.2
@@ -0,0 +1 @@
+5bba81d4f4841947a5b59d2e742321e0  pxe-kexec-0.2.3.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 03:23:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:23:09 +0000 (UTC)
Subject: rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder.spec, 1.9,
	1.10
Message-ID: <20091207032309.B1AFA11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-XSBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12811

Modified Files:
	perl-ExtUtils-XSBuilder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-XSBuilder/devel/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-ExtUtils-XSBuilder.spec	26 Jul 2009 05:56:26 -0000	1.9
+++ perl-ExtUtils-XSBuilder.spec	7 Dec 2009 03:23:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-XSBuilder
 Version:        0.28
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.28-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From boodle at fedoraproject.org  Mon Dec  7 03:23:10 2009
From: boodle at fedoraproject.org (boodle)
Date: Mon,  7 Dec 2009 03:23:10 +0000 (UTC)
Subject: rpms/pxe-kexec/F-12 import.log, NONE, 1.1 pxe-kexec.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207032310.3CEC611C00E0@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/pxe-kexec/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12779/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pxe-kexec.spec 
Log Message:
Initial F-12 cvs commit




--- NEW FILE import.log ---
pxe-kexec-0_2_3-2_fc12:F-12:pxe-kexec-0.2.3-2.fc12.src.rpm:1260156163


--- NEW FILE pxe-kexec.spec ---
Name:		pxe-kexec
Version:	0.2.3
Release:	2%{?dist}
Summary:	Linux boots Linux via network

Group:		Applications/System
License:	GPLv2+
URL:		http://pxe-kexec.googlecode.com/
Source0:	http://pxe-kexec.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	cmake, readline-devel, ncurses-devel, libcurl-devel
Requires:	kexec-tools

%description
pxe-kexec reads a PXELINUX configuration file, prompts the user for an
entry like the PXELINUX program would do and finally boots that entry
using Kexec.

%prep
%setup -q

%build
%cmake
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING NEWS README ChangeLog
%doc %{_mandir}/man8/pxe-kexec.8.*
%{_sbindir}/pxe-kexec

%changelog
* Thu Dec 3 2009 Scott Collier <boodle11 at gmail.com> 0.2.3-2
- Fixing spec file 

* Thu Oct 22 2009 Scott Collier	<boodle11 at gmail.com> 0.2.3-1
- Changed Source0 and URL and some tags, changed buildroot line
- and added CFLAGS, declared man page as doc, removed VERBOSE
- from build

* Wed Jul 15 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-3
- Fixed Source0, cleaned up files per package review.

* Mon Jul 13 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-2
- Cleaned up spec file per package review.

* Fri Jun 26 2009 Ed Swierk <eswierk at aristanetworks.com> 0.1.7-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:22:14 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:23:10 -0000	1.2
@@ -0,0 +1 @@
+pxe-kexec-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pxe-kexec/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:22:14 -0000	1.1
+++ sources	7 Dec 2009 03:23:10 -0000	1.2
@@ -0,0 +1 @@
+5bba81d4f4841947a5b59d2e742321e0  pxe-kexec-0.2.3.tar.bz2



From maxamillion at fedoraproject.org  Mon Dec  7 03:23:25 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 03:23:25 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.16,1.17
Message-ID: <20091207032325.F313011C00E0@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12849

Modified Files:
	gnome-shell.spec 
Log Message:
Typo fix in buildrequires of auto tools




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gnome-shell.spec	7 Dec 2009 03:22:24 -0000	1.16
+++ gnome-shell.spec	7 Dec 2009 03:23:25 -0000	1.17
@@ -21,9 +21,9 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 %define mutter_version 2.28.0
 
 ## Needed by git tree
-BuildRequires   autogen
-BuildRequires   autoconf
-BuildRequires   automake
+BuildRequires:  autogen
+BuildRequires:  autoconf
+BuildRequires:  automake
 
 BuildRequires:  clutter-devel >= %{clutter_version}
 BuildRequires:  dbus-glib-devel



From kasal at fedoraproject.org  Mon Dec  7 03:24:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:24:40 +0000 (UTC)
Subject: rpms/perl-Math-FFT/devel perl-Math-FFT.spec,1.3,1.4
Message-ID: <20091207032440.A569411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-FFT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13555

Modified Files:
	perl-Math-FFT.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-FFT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-FFT/devel/perl-Math-FFT.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Math-FFT.spec	26 Jul 2009 09:12:24 -0000	1.3
+++ perl-Math-FFT.spec	7 Dec 2009 03:24:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Math-FFT
 Version:        1.28
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module to calculate Fast Fourier Transforms
 # Perl module code is GPL+ or same as Perl itself
 # arrays.c has same licence as Perl itself
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.28-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:24:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:24:39 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Server/devel
	perl-CGI-Application-Server.spec, 1.2, 1.3
Message-ID: <20091207032439.CAC3F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13526

Modified Files:
	perl-CGI-Application-Server.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Server/devel/perl-CGI-Application-Server.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Server.spec	26 Jul 2009 03:57:49 -0000	1.2
+++ perl-CGI-Application-Server.spec	7 Dec 2009 03:24:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Server
 Version:        0.061
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple HTTP server for developing with CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.061-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.061-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:25:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:25:43 +0000 (UTC)
Subject: rpms/perl-YAML-Syck/devel perl-YAML-Syck.spec,1.19,1.20
Message-ID: <20091207032543.EF69211C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-YAML-Syck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14012

Modified Files:
	perl-YAML-Syck.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-YAML-Syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/perl-YAML-Syck.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-YAML-Syck.spec	7 Oct 2009 07:52:37 -0000	1.19
+++ perl-YAML-Syck.spec	7 Dec 2009 03:25:43 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-YAML-Syck
 Version:        1.07 
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fast, lightweight YAML loader and dumper
 License:        BSD and MIT
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-3
+- rebuild against perl 5.10.1
+
 * Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.07-2
 - fix license
 



From kasal at fedoraproject.org  Mon Dec  7 03:25:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:25:37 +0000 (UTC)
Subject: rpms/perl-Spreadsheet-ParseExcel/devel
	perl-Spreadsheet-ParseExcel.spec, 1.19, 1.20
Message-ID: <20091207032537.2057C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13880

Modified Files:
	perl-Spreadsheet-ParseExcel.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Spreadsheet-ParseExcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel/perl-Spreadsheet-ParseExcel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-Spreadsheet-ParseExcel.spec	26 Jul 2009 16:32:13 -0000	1.19
+++ perl-Spreadsheet-ParseExcel.spec	7 Dec 2009 03:25:36 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:           perl-Spreadsheet-ParseExcel
 Version:        0.4900
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extract information from an Excel file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.4900-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4900-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:27:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:27:02 +0000 (UTC)
Subject: rpms/perl-ExtUtils-PkgConfig/devel perl-ExtUtils-PkgConfig.spec,
	1.18, 1.19
Message-ID: <20091207032702.B893811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14482

Modified Files:
	perl-ExtUtils-PkgConfig.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-PkgConfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel/perl-ExtUtils-PkgConfig.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-ExtUtils-PkgConfig.spec	26 Jul 2009 05:56:10 -0000	1.18
+++ perl-ExtUtils-PkgConfig.spec	7 Dec 2009 03:27:02 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-PkgConfig
 Version:        1.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simplistic interface to pkg-config
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:29:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:29:05 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ViewCode/devel
	perl-CGI-Application-Plugin-ViewCode.spec, 1.2, 1.3
Message-ID: <20091207032905.1523311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ViewCode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14930

Modified Files:
	perl-CGI-Application-Plugin-ViewCode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-ViewCode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ViewCode/devel/perl-CGI-Application-Plugin-ViewCode.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-ViewCode.spec	26 Jul 2009 03:57:30 -0000	1.2
+++ perl-CGI-Application-Plugin-ViewCode.spec	7 Dec 2009 03:29:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-ViewCode
 Version:        1.02
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Allows you to view the source of a CGI::Application module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:29:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:29:25 +0000 (UTC)
Subject: rpms/perl-Math-Derivative/devel perl-Math-Derivative.spec,1.5,1.6
Message-ID: <20091207032925.A479011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Derivative/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15109

Modified Files:
	perl-Math-Derivative.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Derivative.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Derivative/devel/perl-Math-Derivative.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Math-Derivative.spec	26 Jul 2009 09:12:07 -0000	1.5
+++ perl-Math-Derivative.spec	7 Dec 2009 03:29:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Math-Derivative
 Version:        0.01
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Numeric 1st and 2nd order differentiation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:31:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:31:05 +0000 (UTC)
Subject: rpms/perl-ExtUtils-MakeMaker-Coverage/devel
	perl-ExtUtils-MakeMaker-Coverage.spec, 1.6, 1.7
Message-ID: <20091207033105.D584111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-MakeMaker-Coverage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15604

Modified Files:
	perl-ExtUtils-MakeMaker-Coverage.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-MakeMaker-Coverage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-MakeMaker-Coverage/devel/perl-ExtUtils-MakeMaker-Coverage.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-ExtUtils-MakeMaker-Coverage.spec	26 Jul 2009 05:55:54 -0000	1.6
+++ perl-ExtUtils-MakeMaker-Coverage.spec	7 Dec 2009 03:31:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-MakeMaker-Coverage
 Version:        0.05
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Allows perl modules to check test coverage with Devel::Cover
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/testcover
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:31:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:31:41 +0000 (UTC)
Subject: rpms/perl-YAML-Parser-Syck/devel perl-YAML-Parser-Syck.spec, 1.10, 
	1.11
Message-ID: <20091207033141.E192111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-YAML-Parser-Syck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15852

Modified Files:
	perl-YAML-Parser-Syck.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-YAML-Parser-Syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Parser-Syck/devel/perl-YAML-Parser-Syck.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-YAML-Parser-Syck.spec	26 Jul 2009 17:42:50 -0000	1.10
+++ perl-YAML-Parser-Syck.spec	7 Dec 2009 03:31:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-YAML-Parser-Syck
 Version:        0.01
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Perl Wrapper for the YAML Parser Extension: libsyck
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-14
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:32:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:32:00 +0000 (UTC)
Subject: rpms/perl-Spoon/devel perl-Spoon.spec,1.9,1.10
Message-ID: <20091207033200.C210511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Spoon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16012

Modified Files:
	perl-Spoon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Spoon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spoon/devel/perl-Spoon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Spoon.spec	26 Jul 2009 16:31:59 -0000	1.9
+++ perl-Spoon.spec	7 Dec 2009 03:32:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Spoon
 Version:        0.24
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Spiffy Application Building Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_provides
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.24-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:33:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:33:36 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ValidateRM/devel
	perl-CGI-Application-Plugin-ValidateRM.spec, 1.2, 1.3
Message-ID: <20091207033336.31AD311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ValidateRM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16510

Modified Files:
	perl-CGI-Application-Plugin-ValidateRM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-ValidateRM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ValidateRM/devel/perl-CGI-Application-Plugin-ValidateRM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-ValidateRM.spec	26 Jul 2009 03:57:16 -0000	1.2
+++ perl-CGI-Application-Plugin-ValidateRM.spec	7 Dec 2009 03:33:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-ValidateRM
 Version:        2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Help validate CGI::Application run modes using Data::FormValidator
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.3-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:33:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:33:51 +0000 (UTC)
Subject: rpms/perl-Math-Curve-Hilbert/devel perl-Math-Curve-Hilbert.spec, 1.2,
	1.3
Message-ID: <20091207033351.18EB511C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Curve-Hilbert/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16677

Modified Files:
	perl-Math-Curve-Hilbert.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Curve-Hilbert.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Curve-Hilbert/devel/perl-Math-Curve-Hilbert.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Math-Curve-Hilbert.spec	26 Jul 2009 09:11:46 -0000	1.2
+++ perl-Math-Curve-Hilbert.spec	7 Dec 2009 03:33:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Math-Curve-Hilbert
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl Implementation of Hilberts space-filling Curve
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 03:34:05 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 03:34:05 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.17,1.18
Message-ID: <20091207033405.9071611C00E0@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16635

Modified Files:
	gnome-shell.spec 
Log Message:
Communication confusion between myself and herlo caused this patch.




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gnome-shell.spec	7 Dec 2009 03:23:25 -0000	1.17
+++ gnome-shell.spec	7 Dec 2009 03:34:05 -0000	1.18
@@ -21,7 +21,6 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 %define mutter_version 2.28.0
 
 ## Needed by git tree
-BuildRequires:  autogen
 BuildRequires:  autoconf
 BuildRequires:  automake
 
@@ -75,7 +74,7 @@ easy to use experience.
 
 %build
 ## Needed to build the git tree
-autogen
+/bin/sh $RPM_BUILD_ROOT/autogen.sh
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath



From kasal at fedoraproject.org  Mon Dec  7 03:35:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:35:30 +0000 (UTC)
Subject: rpms/perl-YAML-LibYAML/devel perl-YAML-LibYAML.spec,1.2,1.3
Message-ID: <20091207033530.BC89711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-YAML-LibYAML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17210

Modified Files:
	perl-YAML-LibYAML.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-YAML-LibYAML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-LibYAML/devel/perl-YAML-LibYAML.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-YAML-LibYAML.spec	26 Jul 2009 17:42:34 -0000	1.2
+++ perl-YAML-LibYAML.spec	7 Dec 2009 03:35:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-YAML-LibYAML
 Version:        0.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        YAML::LibYAML Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.32-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:35:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:35:40 +0000 (UTC)
Subject: rpms/perl-ExtUtils-InstallPAR/devel perl-ExtUtils-InstallPAR.spec,
	1.2, 1.3
Message-ID: <20091207033540.DE0E811C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17358

Modified Files:
	perl-ExtUtils-InstallPAR.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-InstallPAR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-InstallPAR/devel/perl-ExtUtils-InstallPAR.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-ExtUtils-InstallPAR.spec	26 Jul 2009 05:55:37 -0000	1.2
+++ perl-ExtUtils-InstallPAR.spec	7 Dec 2009 03:35:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-InstallPAR
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Install .par's into any installed perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:36:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:36:09 +0000 (UTC)
Subject: rpms/perl-Spiffy/devel perl-Spiffy.spec,1.8,1.9
Message-ID: <20091207033609.75D4E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Spiffy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17545

Modified Files:
	perl-Spiffy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Spiffy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spiffy/devel/perl-Spiffy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Spiffy.spec	26 Jul 2009 16:31:45 -0000	1.8
+++ perl-Spiffy.spec	7 Dec 2009 03:36:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Spiffy
 Version:        0.30
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Framework for doing object oriented (OO) programming in Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_provides
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.30-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:39:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:39:19 +0000 (UTC)
Subject: rpms/perl-Math-Calc-Units/devel perl-Math-Calc-Units.spec,1.1,1.2
Message-ID: <20091207033919.9E8D711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Calc-Units/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18446

Modified Files:
	perl-Math-Calc-Units.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Calc-Units.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Calc-Units/devel/perl-Math-Calc-Units.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Math-Calc-Units.spec	7 Aug 2009 20:27:00 -0000	1.1
+++ perl-Math-Calc-Units.spec	7 Dec 2009 03:39:19 -0000	1.2
@@ -1,7 +1,7 @@
 %define libname Math-Calc-Units
 Name:           perl-%{libname}
 Version:        1.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Human-readable unit-aware calculator
 License:        GPLv2+ or Artistic
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_bindir}/ucalc
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.06-3
+- rebuild against perl 5.10.1
+
 * Wed Jul 29 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.06-2
 - Review fixes (#513874)
 



From kasal at fedoraproject.org  Mon Dec  7 03:40:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:40:37 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-TT/devel
	perl-CGI-Application-Plugin-TT.spec, 1.2, 1.3
Message-ID: <20091207034037.9281D11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-TT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18763

Modified Files:
	perl-CGI-Application-Plugin-TT.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-TT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-TT/devel/perl-CGI-Application-Plugin-TT.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-TT.spec	26 Jul 2009 03:56:59 -0000	1.2
+++ perl-CGI-Application-Plugin-TT.spec	7 Dec 2009 03:40:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-TT
 Version:        1.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Add Template Toolkit support to CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:40:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:40:47 +0000 (UTC)
Subject: rpms/perl-ExtUtils-InferConfig/devel perl-ExtUtils-InferConfig.spec,
	1.2, 1.3
Message-ID: <20091207034047.9180611C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18891

Modified Files:
	perl-ExtUtils-InferConfig.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-InferConfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-InferConfig/devel/perl-ExtUtils-InferConfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-ExtUtils-InferConfig.spec	26 Jul 2009 05:55:23 -0000	1.2
+++ perl-ExtUtils-InferConfig.spec	7 Dec 2009 03:40:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-InferConfig
 Version:        1.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Infer Perl Configuration for non-running interpreters
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:41:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:41:45 +0000 (UTC)
Subject: rpms/perl-Sort-Versions/devel perl-Sort-Versions.spec,1.11,1.12
Message-ID: <20091207034145.35AD011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sort-Versions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19150

Modified Files:
	perl-Sort-Versions.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sort-Versions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sort-Versions/devel/perl-Sort-Versions.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Sort-Versions.spec	26 Jul 2009 16:31:31 -0000	1.11
+++ perl-Sort-Versions.spec	7 Dec 2009 03:41:45 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		perl-Sort-Versions
 Version: 	1.5
-Release: 	12%{?dist}
+Release: 	13%{?dist}
 Summary: 	Perl module for sorting of revision-like numbers 
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -56,6 +56,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.5-13
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:41:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:41:53 +0000 (UTC)
Subject: rpms/perl-YAML/devel perl-YAML.spec,1.25,1.26
Message-ID: <20091207034153.E0A4111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-YAML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19241

Modified Files:
	perl-YAML.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-YAML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML/devel/perl-YAML.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-YAML.spec	7 Oct 2009 08:10:44 -0000	1.25
+++ perl-YAML.spec	7 Dec 2009 03:41:53 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-YAML
 Version:        0.70
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        YAML Ain't Markup Language (tm)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/YAML*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.70-3
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.70-2
 - rebuild for push
 



From kasal at fedoraproject.org  Mon Dec  7 03:43:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:43:24 +0000 (UTC)
Subject: rpms/perl-Math-BigInt-GMP/devel perl-Math-BigInt-GMP.spec,1.3,1.4
Message-ID: <20091207034324.D3D9A11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-BigInt-GMP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19695

Modified Files:
	perl-Math-BigInt-GMP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-BigInt-GMP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-BigInt-GMP/devel/perl-Math-BigInt-GMP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Math-BigInt-GMP.spec	26 Jul 2009 09:11:31 -0000	1.3
+++ perl-Math-BigInt-GMP.spec	7 Dec 2009 03:43:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Math-BigInt-GMP
 Version:        1.24
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Math::BigInt::GMP Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.24-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ke4qqq at fedoraproject.org  Mon Dec  7 03:44:40 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon,  7 Dec 2009 03:44:40 +0000 (UTC)
Subject: File php-gettext-1.0.9.tar.gz uploaded to lookaside cache by ke4qqq
Message-ID: <20091207034440.29E5C10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-gettext:

cdbe7222d0ec1bd05d691e7d10f230b2  php-gettext-1.0.9.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 03:44:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:44:59 +0000 (UTC)
Subject: rpms/perl-ExtUtils-F77/devel perl-ExtUtils-F77.spec,1.4,1.5
Message-ID: <20091207034459.62CDD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-F77/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20149

Modified Files:
	perl-ExtUtils-F77.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-F77.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-F77/devel/perl-ExtUtils-F77.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-ExtUtils-F77.spec	26 Jul 2009 05:55:05 -0000	1.4
+++ perl-ExtUtils-F77.spec	7 Dec 2009 03:44:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-F77
 Version:        1.16
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple interface to F77 libs
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.16-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:45:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:45:04 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-SuperForm/devel
	perl-CGI-Application-Plugin-SuperForm.spec, 1.1, 1.2
Message-ID: <20091207034504.B44E711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-SuperForm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20215

Modified Files:
	perl-CGI-Application-Plugin-SuperForm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-SuperForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-SuperForm/devel/perl-CGI-Application-Plugin-SuperForm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-CGI-Application-Plugin-SuperForm.spec	21 Nov 2009 00:29:51 -0000	1.1
+++ perl-CGI-Application-Plugin-SuperForm.spec	7 Dec 2009 03:45:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-SuperForm
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Create sticky forms with HTML::SuperForm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.4-3
+- rebuild against perl 5.10.1
+
 * Fri Sep 18 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.4-2
 - add perl(Test::More) and perl(Test::Pod) to BuildRequires
 



From maxamillion at fedoraproject.org  Mon Dec  7 03:45:57 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 03:45:57 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.18,1.19
Message-ID: <20091207034557.94E6011C00E0@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20733

Modified Files:
	gnome-shell.spec 
Log Message:
typo in my last patch, I should apparently not be packaging tonight.




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gnome-shell.spec	7 Dec 2009 03:34:05 -0000	1.18
+++ gnome-shell.spec	7 Dec 2009 03:45:57 -0000	1.19
@@ -74,7 +74,7 @@ easy to use experience.
 
 %build
 ## Needed to build the git tree
-/bin/sh $RPM_BUILD_ROOT/autogen.sh
+/bin/sh $RPM_BUILD_ROOT/gnome-shell/autogen.sh
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath



From ke4qqq at fedoraproject.org  Mon Dec  7 03:46:09 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon,  7 Dec 2009 03:46:09 +0000 (UTC)
Subject: rpms/php-gettext/devel import.log, NONE, 1.1 php-gettext.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207034609.9C4B111C00E0@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20648/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-gettext.spec 
Log Message:
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-2
- Initial Packaging




--- NEW FILE import.log ---
php-gettext-1_0_9-2_fc12:HEAD:php-gettext-1.0.9-2.fc12.src.rpm:1260157570


--- NEW FILE php-gettext.spec ---
Name:      php-gettext
Version:   1.0.9
Release:   2%{?dist}
License:   GPLv2+
Summary:   Gettext emulation in PHP 
Group:     Development/Libraries
URL:       https://launchpad.net/php-gettext
Source:    http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php-common
BuildArch: noarch

%description
This library provides PHP functions to read MO files even when gettext is 
not compiled in or when appropriate locale is not present on the system.

%prep
%setup -q
chmod -x *.php
%build
%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php/%{name}
cp -a *.php gettext.inc %{buildroot}%{_datadir}/php/%{name}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README AUTHORS COPYING
%{_datadir}/php/%{name}

%changelog
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-2
- corrected license field 
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-gettext/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:21:02 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:46:09 -0000	1.2
@@ -0,0 +1 @@
+php-gettext-1.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-gettext/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:21:02 -0000	1.1
+++ sources	7 Dec 2009 03:46:09 -0000	1.2
@@ -0,0 +1 @@
+cdbe7222d0ec1bd05d691e7d10f230b2  php-gettext-1.0.9.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 03:46:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:46:11 +0000 (UTC)
Subject: rpms/perl-XXX/devel perl-XXX.spec,1.2,1.3
Message-ID: <20091207034611.3CAD011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XXX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20920

Modified Files:
	perl-XXX.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XXX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XXX/devel/perl-XXX.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XXX.spec	26 Jul 2009 17:42:00 -0000	1.2
+++ perl-XXX.spec	7 Dec 2009 03:46:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XXX
 Version:        0.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        See Your Data in the Nude
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:46:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:46:24 +0000 (UTC)
Subject: rpms/perl-Sort-Naturally/devel perl-Sort-Naturally.spec,1.3,1.4
Message-ID: <20091207034624.D106F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sort-Naturally/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21174

Modified Files:
	perl-Sort-Naturally.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sort-Naturally.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sort-Naturally/devel/perl-Sort-Naturally.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Sort-Naturally.spec	26 Jul 2009 16:31:15 -0000	1.3
+++ perl-Sort-Naturally.spec	7 Dec 2009 03:46:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-Sort-Naturally 
 Version:    1.02 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/Sort/Naturally.pm 
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:48:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:48:05 +0000 (UTC)
Subject: rpms/perl-Math-BaseCnv/devel perl-Math-BaseCnv.spec,1.4,1.5
Message-ID: <20091207034805.39FFD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-BaseCnv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21615

Modified Files:
	perl-Math-BaseCnv.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-BaseCnv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-BaseCnv/devel/perl-Math-BaseCnv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Math-BaseCnv.spec	26 Jul 2009 09:11:17 -0000	1.4
+++ perl-Math-BaseCnv.spec	7 Dec 2009 03:48:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Math-BaseCnv 
 Version:        1.4.75O6Pbr
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fast functions to CoNVert between number Bases
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4.75O6Pbr-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.75O6Pbr-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From konradm at fedoraproject.org  Mon Dec  7 03:48:21 2009
From: konradm at fedoraproject.org (konradm)
Date: Mon,  7 Dec 2009 03:48:21 +0000 (UTC)
Subject: rpms/sdcc/F-12 sdcc.spec,1.21,1.22
Message-ID: <20091207034821.7F0C311C00E0@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21747

Modified Files:
	sdcc.spec 
Log Message:
* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
- Work around rpmbuild failure by disabling brp-strip.



Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-12/sdcc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sdcc.spec	24 Nov 2009 18:13:49 -0000	1.21
+++ sdcc.spec	7 Dec 2009 03:48:21 -0000	1.22
@@ -60,25 +60,9 @@ Emacs extensions for SDCC.
 %patch3 -p1
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
+# Disable brp-strip for now because it errors trying to strip foreign
+# binaries.
+%global __os_install_post /usr/lib/rpm/redhat/brp-compress
 
 
 %build
@@ -141,8 +125,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Nov 24 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
-- Add back missing chmods to 644 for archives.
+* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
+- Work around rpmbuild failure by disabling brp-strip.
 
 * Fri Sep 11 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-5
 - Fix a bug with single-bit types, logical NOT, and casting to char



From kasal at fedoraproject.org  Mon Dec  7 03:49:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:49:15 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Stream/devel
	perl-CGI-Application-Plugin-Stream.spec, 1.2, 1.3
Message-ID: <20091207034915.C36E111C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Stream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22072

Modified Files:
	perl-CGI-Application-Plugin-Stream.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-Stream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Stream/devel/perl-CGI-Application-Plugin-Stream.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-Stream.spec	26 Jul 2009 03:56:46 -0000	1.2
+++ perl-CGI-Application-Plugin-Stream.spec	7 Dec 2009 03:49:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-Stream
 Version:        2.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CGI::Application Plugin for streaming files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.10-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:49:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:49:35 +0000 (UTC)
Subject: rpms/perl-ExtUtils-Depends/devel perl-ExtUtils-Depends.spec, 1.17, 
	1.18
Message-ID: <20091207034935.92A5311C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-Depends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22223

Modified Files:
	perl-ExtUtils-Depends.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-Depends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-Depends/devel/perl-ExtUtils-Depends.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-ExtUtils-Depends.spec	31 Jul 2009 07:17:36 -0000	1.17
+++ perl-ExtUtils-Depends.spec	7 Dec 2009 03:49:35 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-Depends
 Version:        0.302
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easily build XS extensions that depend on XS extensions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.302-2
+- rebuild against perl 5.10.1
+
 * Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.302-1
 - auto-update to 0.302 (by cpan-spec-update 0.01)
 - added a new br on perl(Data::Dumper) (version 0)



From kasal at fedoraproject.org  Mon Dec  7 03:50:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:50:42 +0000 (UTC)
Subject: rpms/perl-XML-XQL/devel perl-XML-XQL.spec,1.9,1.10
Message-ID: <20091207035042.601F311C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-XQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22540

Modified Files:
	perl-XML-XQL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-XQL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-XQL/devel/perl-XML-XQL.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-XML-XQL.spec	26 Jul 2009 17:41:28 -0000	1.9
+++ perl-XML-XQL.spec	7 Dec 2009 03:50:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-XML-XQL
 Version:        0.68
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl module for querying XML tree structures with XQL
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_provides
 %{_mandir}/man3/XML::XQL*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.68-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.68-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:51:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:51:29 +0000 (UTC)
Subject: rpms/perl-Sort-Key/devel perl-Sort-Key.spec,1.2,1.3
Message-ID: <20091207035129.9A13011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sort-Key/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22786

Modified Files:
	perl-Sort-Key.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sort-Key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sort-Key/devel/perl-Sort-Key.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Sort-Key.spec	26 Jul 2009 16:30:59 -0000	1.2
+++ perl-Sort-Key.spec	7 Dec 2009 03:51:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sort-Key
 Version:        1.28
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fastest way to sort anything in Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.28-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:52:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:52:50 +0000 (UTC)
Subject: rpms/perl-Math-Base85/devel perl-Math-Base85.spec,1.5,1.6
Message-ID: <20091207035250.8382711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Math-Base85/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23121

Modified Files:
	perl-Math-Base85.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Math-Base85.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Base85/devel/perl-Math-Base85.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Math-Base85.spec	26 Jul 2009 09:11:02 -0000	1.5
+++ perl-Math-Base85.spec	7 Dec 2009 03:52:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Math-Base85
 Version:        0.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl extension for base 85 numbers, as referenced by RFC 1924
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ke4qqq at fedoraproject.org  Mon Dec  7 03:53:41 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon,  7 Dec 2009 03:53:41 +0000 (UTC)
Subject: rpms/php-gettext/F-11 import.log, NONE, 1.1 php-gettext.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207035341.B14D211C00E0@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-gettext/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23456/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-gettext.spec 
Log Message:
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-2
- Initial Packaging




--- NEW FILE import.log ---
php-gettext-1_0_9-2_fc12:F-11:php-gettext-1.0.9-2.fc12.src.rpm:1260158075


--- NEW FILE php-gettext.spec ---
Name:      php-gettext
Version:   1.0.9
Release:   2%{?dist}
License:   GPLv2+
Summary:   Gettext emulation in PHP 
Group:     Development/Libraries
URL:       https://launchpad.net/php-gettext
Source:    http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php-common
BuildArch: noarch

%description
This library provides PHP functions to read MO files even when gettext is 
not compiled in or when appropriate locale is not present on the system.

%prep
%setup -q
chmod -x *.php
%build
%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php/%{name}
cp -a *.php gettext.inc %{buildroot}%{_datadir}/php/%{name}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README AUTHORS COPYING
%{_datadir}/php/%{name}

%changelog
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-2
- corrected license field 
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-gettext/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:21:02 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:53:41 -0000	1.2
@@ -0,0 +1 @@
+php-gettext-1.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-gettext/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:21:02 -0000	1.1
+++ sources	7 Dec 2009 03:53:41 -0000	1.2
@@ -0,0 +1 @@
+cdbe7222d0ec1bd05d691e7d10f230b2  php-gettext-1.0.9.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 03:53:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:53:49 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Session/devel
	perl-CGI-Application-Plugin-Session.spec, 1.2, 1.3
Message-ID: <20091207035349.DE76C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23531

Modified Files:
	perl-CGI-Application-Plugin-Session.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-Session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Session/devel/perl-CGI-Application-Plugin-Session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-Session.spec	26 Jul 2009 03:56:33 -0000	1.2
+++ perl-CGI-Application-Plugin-Session.spec	7 Dec 2009 03:53:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-Session
 Version:        1.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Add CGI::Session support to CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:54:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:54:07 +0000 (UTC)
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	1.10, 1.11
Message-ID: <20091207035407.CCB7711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23762

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-ExtUtils-AutoInstall.spec	26 Jul 2009 05:54:31 -0000	1.10
+++ perl-ExtUtils-AutoInstall.spec	7 Dec 2009 03:54:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -52,6 +52,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.63-11
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:55:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:55:08 +0000 (UTC)
Subject: rpms/perl-XML-XPathEngine/devel perl-XML-XPathEngine.spec,1.8,1.9
Message-ID: <20091207035508.EE1EF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-XPathEngine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24036

Modified Files:
	perl-XML-XPathEngine.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-XPathEngine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-XPathEngine/devel/perl-XML-XPathEngine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-XML-XPathEngine.spec	26 Jul 2009 17:41:11 -0000	1.8
+++ perl-XML-XPathEngine.spec	7 Dec 2009 03:55:08 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-XML-XPathEngine
 Version:        0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Re-usable XPath engine for DOM-like trees
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:56:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:56:21 +0000 (UTC)
Subject: rpms/perl-Software-License/devel perl-Software-License.spec, 1.4,
	1.5
Message-ID: <20091207035622.152E411C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Software-License/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24343

Modified Files:
	perl-Software-License.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Software-License.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Software-License/devel/perl-Software-License.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Software-License.spec	26 Jul 2009 16:30:45 -0000	1.4
+++ perl-Software-License.spec	7 Dec 2009 03:56:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Software-License
 Version:        0.012
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Package that provides templated software licenses
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.012-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.012-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:56:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:56:51 +0000 (UTC)
Subject: rpms/perl-MasonX-Request-WithApacheSession/devel
	perl-MasonX-Request-WithApacheSession.spec, 1.4, 1.5
Message-ID: <20091207035651.E445E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MasonX-Request-WithApacheSession/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24553

Modified Files:
	perl-MasonX-Request-WithApacheSession.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MasonX-Request-WithApacheSession.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MasonX-Request-WithApacheSession/devel/perl-MasonX-Request-WithApacheSession.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MasonX-Request-WithApacheSession.spec	26 Jul 2009 09:10:44 -0000	1.4
+++ perl-MasonX-Request-WithApacheSession.spec	7 Dec 2009 03:56:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-MasonX-Request-WithApacheSession
 Version:        0.30
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Add a session to the Mason Request object
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.30-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ke4qqq at fedoraproject.org  Mon Dec  7 03:57:42 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon,  7 Dec 2009 03:57:42 +0000 (UTC)
Subject: rpms/php-gettext/F-12 import.log, NONE, 1.1 php-gettext.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207035742.7996B11C00E0@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-gettext/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24836/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-gettext.spec 
Log Message:
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-2
- initial import



--- NEW FILE import.log ---
php-gettext-1_0_9-2_fc12:F-12:php-gettext-1.0.9-2.fc12.src.rpm:1260158304


--- NEW FILE php-gettext.spec ---
Name:      php-gettext
Version:   1.0.9
Release:   2%{?dist}
License:   GPLv2+
Summary:   Gettext emulation in PHP 
Group:     Development/Libraries
URL:       https://launchpad.net/php-gettext
Source:    http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php-common
BuildArch: noarch

%description
This library provides PHP functions to read MO files even when gettext is 
not compiled in or when appropriate locale is not present on the system.

%prep
%setup -q
chmod -x *.php
%build
%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php/%{name}
cp -a *.php gettext.inc %{buildroot}%{_datadir}/php/%{name}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README AUTHORS COPYING
%{_datadir}/php/%{name}

%changelog
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-2
- corrected license field 
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-gettext/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:21:02 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:57:42 -0000	1.2
@@ -0,0 +1 @@
+php-gettext-1.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-gettext/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:21:02 -0000	1.1
+++ sources	7 Dec 2009 03:57:42 -0000	1.2
@@ -0,0 +1 @@
+cdbe7222d0ec1bd05d691e7d10f230b2  php-gettext-1.0.9.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 03:58:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:58:24 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Redirect/devel
	perl-CGI-Application-Plugin-Redirect.spec, 1.2, 1.3
Message-ID: <20091207035824.C6CA011C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Redirect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25167

Modified Files:
	perl-CGI-Application-Plugin-Redirect.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-Redirect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Redirect/devel/perl-CGI-Application-Plugin-Redirect.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-Redirect.spec	26 Jul 2009 03:56:19 -0000	1.2
+++ perl-CGI-Application-Plugin-Redirect.spec	7 Dec 2009 03:58:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-Redirect
 Version:        1.00
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy external redirects in CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ke4qqq at fedoraproject.org  Mon Dec  7 03:59:02 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon,  7 Dec 2009 03:59:02 +0000 (UTC)
Subject: rpms/php-gettext/EL-5 import.log, NONE, 1.1 php-gettext.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207035902.B662411C00E0@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-gettext/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25389/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-gettext.spec 
Log Message:
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-2
- initial upload



--- NEW FILE import.log ---
php-gettext-1_0_9-2_fc12:EL-5:php-gettext-1.0.9-2.fc12.src.rpm:1260158387


--- NEW FILE php-gettext.spec ---
Name:      php-gettext
Version:   1.0.9
Release:   2%{?dist}
License:   GPLv2+
Summary:   Gettext emulation in PHP 
Group:     Development/Libraries
URL:       https://launchpad.net/php-gettext
Source:    http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php-common
BuildArch: noarch

%description
This library provides PHP functions to read MO files even when gettext is 
not compiled in or when appropriate locale is not present on the system.

%prep
%setup -q
chmod -x *.php
%build
%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php/%{name}
cp -a *.php gettext.inc %{buildroot}%{_datadir}/php/%{name}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README AUTHORS COPYING
%{_datadir}/php/%{name}

%changelog
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-2
- corrected license field 
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.9-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-gettext/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:21:02 -0000	1.1
+++ .cvsignore	7 Dec 2009 03:59:02 -0000	1.2
@@ -0,0 +1 @@
+php-gettext-1.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-gettext/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:21:02 -0000	1.1
+++ sources	7 Dec 2009 03:59:02 -0000	1.2
@@ -0,0 +1 @@
+cdbe7222d0ec1bd05d691e7d10f230b2  php-gettext-1.0.9.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 03:59:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:59:22 +0000 (UTC)
Subject: rpms/perl-Exporter-Lite/devel perl-Exporter-Lite.spec,1.7,1.8
Message-ID: <20091207035922.0951711C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Exporter-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25545

Modified Files:
	perl-Exporter-Lite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Exporter-Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Exporter-Lite/devel/perl-Exporter-Lite.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Exporter-Lite.spec	26 Jul 2009 05:54:15 -0000	1.7
+++ perl-Exporter-Lite.spec	7 Dec 2009 03:59:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Exporter-Lite
 Version:        0.02
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Lightweight exporting of variables
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 03:59:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 03:59:38 +0000 (UTC)
Subject: rpms/perl-XML-XPath/devel perl-XML-XPath.spec,1.10,1.11
Message-ID: <20091207035938.EFC9911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-XPath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25687

Modified Files:
	perl-XML-XPath.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-XPath/devel/perl-XML-XPath.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-XML-XPath.spec	26 Jul 2009 17:40:52 -0000	1.10
+++ perl-XML-XPath.spec	7 Dec 2009 03:59:38 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        XPath parser and evaluator for Perl
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.13-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:01:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:01:31 +0000 (UTC)
Subject: rpms/perl-Socket-GetAddrInfo/devel perl-Socket-GetAddrInfo.spec, 1.1,
	1.2
Message-ID: <20091207040131.C801911C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Socket-GetAddrInfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26157

Modified Files:
	perl-Socket-GetAddrInfo.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Socket-GetAddrInfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Socket-GetAddrInfo/devel/perl-Socket-GetAddrInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Socket-GetAddrInfo.spec	27 Jul 2009 09:38:08 -0000	1.1
+++ perl-Socket-GetAddrInfo.spec	7 Dec 2009 04:01:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Socket-GetAddrInfo
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RFC 2553's "getaddrinfo" and "getnameinfo" functions
 
 Group:          Development/Libraries
@@ -60,5 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-2
+- rebuild against perl 5.10.1
+
 * Thu Jul  9 2009 kwizart < kwizart at gmail.com > - 0.12-1
 - Initial spec



From kasal at fedoraproject.org  Mon Dec  7 04:01:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:01:42 +0000 (UTC)
Subject: rpms/perl-MasonX-Interp-WithCallbacks/devel
	perl-MasonX-Interp-WithCallbacks.spec, 1.7, 1.8
Message-ID: <20091207040142.0A36E11C00E0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MasonX-Interp-WithCallbacks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26291

Modified Files:
	perl-MasonX-Interp-WithCallbacks.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MasonX-Interp-WithCallbacks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MasonX-Interp-WithCallbacks/devel/perl-MasonX-Interp-WithCallbacks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-MasonX-Interp-WithCallbacks.spec	26 Jul 2009 09:10:27 -0000	1.7
+++ perl-MasonX-Interp-WithCallbacks.spec	7 Dec 2009 04:01:41 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MasonX-Interp-WithCallbacks
 Version:        1.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mason callback support via Params::CallbackRequest
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.18-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:02:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:02:10 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-LogDispatch/devel
	perl-CGI-Application-Plugin-LogDispatch.spec, 1.2, 1.3
Message-ID: <20091207040210.0EC8011C0297@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-LogDispatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26515

Modified Files:
	perl-CGI-Application-Plugin-LogDispatch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-LogDispatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-LogDispatch/devel/perl-CGI-Application-Plugin-LogDispatch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-LogDispatch.spec	26 Jul 2009 03:56:04 -0000	1.2
+++ perl-CGI-Application-Plugin-LogDispatch.spec	7 Dec 2009 04:02:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-LogDispatch
 Version:        1.02
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Add Log::Dispatch support to CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:04:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:04:07 +0000 (UTC)
Subject: rpms/perl-Expect-Simple/devel perl-Expect-Simple.spec,1.6,1.7
Message-ID: <20091207040407.BD22211C0297@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Expect-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29162

Modified Files:
	perl-Expect-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Expect-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Expect-Simple/devel/perl-Expect-Simple.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Expect-Simple.spec	26 Jul 2009 05:54:02 -0000	1.6
+++ perl-Expect-Simple.spec	7 Dec 2009 04:04:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Expect-Simple
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Wrapper around the Expect module
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:04:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:04:27 +0000 (UTC)
Subject: rpms/perl-XML-Xerces/devel perl-XML-Xerces.spec,1.10,1.11
Message-ID: <20091207040427.67D1E11C0297@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Xerces/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29441

Modified Files:
	perl-XML-Xerces.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Xerces.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Xerces/devel/perl-XML-Xerces.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-XML-Xerces.spec	26 Jul 2009 17:41:45 -0000	1.10
+++ perl-XML-Xerces.spec	7 Dec 2009 04:04:27 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           perl-XML-Xerces
 Version:        %{ver}_%{PatchLevel}
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Perl API to Xerces XML parser
 
 Group:          Development/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.7.0_0-14
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.0_0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:06:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:06:10 +0000 (UTC)
Subject: rpms/perl-Socket6/devel perl-Socket6.spec,1.11,1.12
Message-ID: <20091207040610.C174B11C0297@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Socket6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6893

Modified Files:
	perl-Socket6.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Socket6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Socket6/devel/perl-Socket6.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Socket6.spec	26 Jul 2009 16:30:29 -0000	1.11
+++ perl-Socket6.spec	7 Dec 2009 04:06:10 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Socket6
 Version:        0.23
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        IPv6 related part of the C socket.h defines and structure manipulators
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.23-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:06:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:06:44 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Forward/devel
	perl-CGI-Application-Plugin-Forward.spec, 1.2, 1.3
Message-ID: <20091207040644.2D0FD11C0297@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Forward/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11145

Modified Files:
	perl-CGI-Application-Plugin-Forward.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-Forward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Forward/devel/perl-CGI-Application-Plugin-Forward.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-Forward.spec	26 Jul 2009 03:55:51 -0000	1.2
+++ perl-CGI-Application-Plugin-Forward.spec	7 Dec 2009 04:06:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-Forward
 Version:        1.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pass control from one run mode to another in CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.06-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:07:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:07:22 +0000 (UTC)
Subject: rpms/perl-MARC-Record/devel perl-MARC-Record.spec,1.7,1.8
Message-ID: <20091207040722.993AB11C0297@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MARC-Record/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11382

Modified Files:
	perl-MARC-Record.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MARC-Record.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MARC-Record/devel/perl-MARC-Record.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-MARC-Record.spec	26 Jul 2009 09:03:31 -0000	1.7
+++ perl-MARC-Record.spec	7 Dec 2009 04:07:22 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MARC-Record
 Version:        2.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Object-oriented abstraction of MARC record handling
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.0.0-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:08:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:08:18 +0000 (UTC)
Subject: rpms/perl-Expect/devel perl-Expect.spec,1.10,1.11
Message-ID: <20091207040818.0B33B11C0297@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Expect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15661

Modified Files:
	perl-Expect.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Expect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Expect/devel/perl-Expect.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Expect.spec	26 Jul 2009 05:53:48 -0000	1.10
+++ perl-Expect.spec	7 Dec 2009 04:08:17 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Expect
 Version:        1.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Expect for Perl
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.21-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:10:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:10:15 +0000 (UTC)
Subject: rpms/perl-XML-Writer/devel perl-XML-Writer.spec,1.11,1.12
Message-ID: <20091207041015.49B2C11C0401@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Writer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17202

Modified Files:
	perl-XML-Writer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Writer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Writer/devel/perl-XML-Writer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-XML-Writer.spec	26 Jul 2009 17:40:31 -0000	1.11
+++ perl-XML-Writer.spec	7 Dec 2009 04:10:14 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-XML-Writer
 Version:        0.606
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A simple Perl module for writing XML documents
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.606-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.606-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:10:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:10:22 +0000 (UTC)
Subject: rpms/perl-SNMP_Session/devel perl-SNMP_Session.spec,1.10,1.11
Message-ID: <20091207041022.AEDFB11C0401@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SNMP_Session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19134

Modified Files:
	perl-SNMP_Session.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SNMP_Session/devel/perl-SNMP_Session.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-SNMP_Session.spec	26 Jul 2009 16:23:20 -0000	1.10
+++ perl-SNMP_Session.spec	7 Dec 2009 04:10:22 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
 Version:        1.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:10:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:10:59 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-FillInForm/devel
	perl-CGI-Application-Plugin-FillInForm.spec, 1.4, 1.5
Message-ID: <20091207041059.B84C311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FillInForm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20629

Modified Files:
	perl-CGI-Application-Plugin-FillInForm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-FillInForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FillInForm/devel/perl-CGI-Application-Plugin-FillInForm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-CGI-Application-Plugin-FillInForm.spec	5 Nov 2009 00:45:59 -0000	1.4
+++ perl-CGI-Application-Plugin-FillInForm.spec	7 Dec 2009 04:10:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-FillInForm
 Version:        1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Integrate CGI::Application with HTML::FillInForm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.15-3
+- rebuild against perl 5.10.1
+
 * Thu Nov 05 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.15-2
 - Update Source0 (maintainer change)
 



From kasal at fedoraproject.org  Mon Dec  7 04:11:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:11:31 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser/devel perl-Makefile-Parser.spec,1.1,1.2
Message-ID: <20091207041131.E2E2F11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Makefile-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20835

Modified Files:
	perl-Makefile-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Makefile-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/devel/perl-Makefile-Parser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Makefile-Parser.spec	29 Oct 2009 04:12:03 -0000	1.1
+++ perl-Makefile-Parser.spec	7 Dec 2009 04:11:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Makefile-Parser
 Version:        0.211
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple parser for Makefiles
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,5 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/plmake
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.211-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 07 2009 Scott Radvan <sradvan at redhat.com> 0.211-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 04:13:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:13:40 +0000 (UTC)
Subject: rpms/perl-Exception-Class-TryCatch/devel
	perl-Exception-Class-TryCatch.spec, 1.2, 1.3
Message-ID: <20091207041340.0892811C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Exception-Class-TryCatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21364

Modified Files:
	perl-Exception-Class-TryCatch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Exception-Class-TryCatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Exception-Class-TryCatch/devel/perl-Exception-Class-TryCatch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Exception-Class-TryCatch.spec	26 Jul 2009 05:53:34 -0000	1.2
+++ perl-Exception-Class-TryCatch.spec	7 Dec 2009 04:13:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Exception-Class-TryCatch
 Version:        1.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Syntactic try/catch sugar for use with Exception::Class
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:14:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:14:29 +0000 (UTC)
Subject: rpms/perl-XML-Validator-Schema/devel perl-XML-Validator-Schema.spec,
	1.6, 1.7
Message-ID: <20091207041429.F409111C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21633

Modified Files:
	perl-XML-Validator-Schema.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Validator-Schema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel/perl-XML-Validator-Schema.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-XML-Validator-Schema.spec	26 Jul 2009 17:40:10 -0000	1.6
+++ perl-XML-Validator-Schema.spec	7 Dec 2009 04:14:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-XML-Validator-Schema
 Version:        1.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Validate XML against a subset of W3C XML Schema
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.10-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:14:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:14:45 +0000 (UTC)
Subject: rpms/perl-SNMP-Info/devel perl-SNMP-Info.spec,1.5,1.6
Message-ID: <20091207041445.699F511C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SNMP-Info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21775

Modified Files:
	perl-SNMP-Info.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SNMP-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SNMP-Info/devel/perl-SNMP-Info.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-SNMP-Info.spec	26 Jul 2009 16:23:06 -0000	1.5
+++ perl-SNMP-Info.spec	7 Dec 2009 04:14:45 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-SNMP-Info
 Version:        2.01 
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Object Oriented Perl5 Interface to Network devices and MIBs through SNMP
 License:        BSD
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.01-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:15:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:15:22 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ErrorPage/devel
	perl-CGI-Application-Plugin-ErrorPage.spec, 1.4, 1.5
Message-ID: <20091207041522.5133311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ErrorPage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21996

Modified Files:
	perl-CGI-Application-Plugin-ErrorPage.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-ErrorPage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ErrorPage/devel/perl-CGI-Application-Plugin-ErrorPage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-CGI-Application-Plugin-ErrorPage.spec	26 Jul 2009 03:55:22 -0000	1.4
+++ perl-CGI-Application-Plugin-ErrorPage.spec	7 Dec 2009 04:15:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-ErrorPage
 Version:        1.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simple error page plugin for CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.21-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:16:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:16:30 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM/devel perl-Makefile-DOM.spec,1.1,1.2
Message-ID: <20091207041630.8D44411C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Makefile-DOM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22445

Modified Files:
	perl-Makefile-DOM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Makefile-DOM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/devel/perl-Makefile-DOM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Makefile-DOM.spec	29 Oct 2009 03:21:35 -0000	1.1
+++ perl-Makefile-DOM.spec	7 Dec 2009 04:16:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Makefile-DOM
 Version:        0.004
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple DOM parser for Makefiles
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.004-3
+- rebuild against perl 5.10.1
+
 * Tue Sep 08 2009 Ryan Lerch <rlerch at redhat.com> 0.004-2
 - Added BuildRequires and Provides lines to the specfile, as per the Fedora Perl Packaging Guidelines. 
 * Mon Sep 07 2009 Ryan Lerch <rlerch at redhat.com> 0.004-1



From kasal at fedoraproject.org  Mon Dec  7 04:17:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:17:40 +0000 (UTC)
Subject: rpms/perl-Exception-Class/devel perl-Exception-Class.spec, 1.16,
	1.17
Message-ID: <20091207041740.40AC011C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Exception-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22804

Modified Files:
	perl-Exception-Class.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Exception-Class.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Exception-Class/devel/perl-Exception-Class.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Exception-Class.spec	30 Jul 2009 08:23:10 -0000	1.16
+++ perl-Exception-Class.spec	7 Dec 2009 04:17:40 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Exception-Class
 Version:        1.29
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Module that allows you to declare real exception classes in Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.29-2
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.29-1
 - Upstream update (Required by other packages, fix mass rebuild breakdowns).
 



From kasal at fedoraproject.org  Mon Dec  7 04:18:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:18:43 +0000 (UTC)
Subject: rpms/perl-XML-Twig/devel perl-XML-Twig.spec,1.26,1.27
Message-ID: <20091207041843.779ED11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Twig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23098

Modified Files:
	perl-XML-Twig.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- perl-XML-Twig.spec	19 Oct 2009 15:20:00 -0000	1.26
+++ perl-XML-Twig.spec	7 Dec 2009 04:18:43 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           perl-XML-Twig
 Version:        3.33
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A perl module for processing huge XML documents in tree mode
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.33-2
+- rebuild against perl 5.10.1
+
 * Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.33-1
 - new development release which should fix various bug reports e.g. 529220
 



From kasal at fedoraproject.org  Mon Dec  7 04:18:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:18:57 +0000 (UTC)
Subject: rpms/perl-Smart-Comments/devel perl-Smart-Comments.spec,1.8,1.9
Message-ID: <20091207041857.C7EC011C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Smart-Comments/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23242

Modified Files:
	perl-Smart-Comments.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Smart-Comments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Smart-Comments/devel/perl-Smart-Comments.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Smart-Comments.spec	26 Jul 2009 16:30:14 -0000	1.8
+++ perl-Smart-Comments.spec	7 Dec 2009 04:18:57 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           perl-Smart-Comments
 Epoch:          1
 Version:        v1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Comments that do more than just sit there
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:v1.0.3-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:v1.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:19:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:19:53 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DevPopup/devel
	perl-CGI-Application-Plugin-DevPopup.spec, 1.3, 1.4
Message-ID: <20091207041953.5DD0911C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DevPopup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23500

Modified Files:
	perl-CGI-Application-Plugin-DevPopup.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-DevPopup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DevPopup/devel/perl-CGI-Application-Plugin-DevPopup.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-CGI-Application-Plugin-DevPopup.spec	23 Oct 2009 07:51:12 -0000	1.3
+++ perl-CGI-Application-Plugin-DevPopup.spec	7 Dec 2009 04:19:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-DevPopup
 Version:        1.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Runtime cgiapp info in a popup window
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-2
+- rebuild against perl 5.10.1
+
 * Fri Oct 23 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 1.03-1
 - Update to 1.03
 



From kasal at fedoraproject.org  Mon Dec  7 04:20:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:20:54 +0000 (UTC)
Subject: rpms/perl-Mail-Transport-Dbx/devel perl-Mail-Transport-Dbx.spec, 1.7,
	1.8
Message-ID: <20091207042054.627C311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-Transport-Dbx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23770

Modified Files:
	perl-Mail-Transport-Dbx.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-Transport-Dbx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Transport-Dbx/devel/perl-Mail-Transport-Dbx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Mail-Transport-Dbx.spec	26 Jul 2009 09:09:55 -0000	1.7
+++ perl-Mail-Transport-Dbx.spec	7 Dec 2009 04:20:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Mail-Transport-Dbx
 Version:        0.07
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Parse Outlook Express mailboxes
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:21:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:21:44 +0000 (UTC)
Subject: rpms/perl-Exception-Base/devel perl-Exception-Base.spec,1.3,1.4
Message-ID: <20091207042144.DCEF411C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Exception-Base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24040

Modified Files:
	perl-Exception-Base.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Exception-Base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Exception-Base/devel/perl-Exception-Base.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Exception-Base.spec	26 Jul 2009 05:53:05 -0000	1.3
+++ perl-Exception-Base.spec	7 Dec 2009 04:21:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Exception-Base
 Version:        0.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight exceptions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.21-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:23:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:23:25 +0000 (UTC)
Subject: rpms/perl-SGMLSpm/devel perl-SGMLSpm.spec,1.19,1.20
Message-ID: <20091207042325.28EA211C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SGMLSpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24462

Modified Files:
	perl-SGMLSpm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SGMLSpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SGMLSpm/devel/perl-SGMLSpm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-SGMLSpm.spec	26 Jul 2009 16:22:52 -0000	1.19
+++ perl-SGMLSpm.spec	7 Dec 2009 04:23:25 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-SGMLSpm
 Version:        1.03ii
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Perl library for parsing the output of nsgmls
 
 Group:          Development/Libraries
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03ii-21
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03ii-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:23:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:23:24 +0000 (UTC)
Subject: rpms/perl-XML-TreeBuilder/devel perl-XML-TreeBuilder.spec,1.9,1.10
Message-ID: <20091207042324.508D011C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24448

Modified Files:
	perl-XML-TreeBuilder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-TreeBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel/perl-XML-TreeBuilder.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-XML-TreeBuilder.spec	15 Nov 2009 22:30:43 -0000	1.9
+++ perl-XML-TreeBuilder.spec	7 Dec 2009 04:23:24 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Parser that builds a tree of XML::Element objects
 Name:		perl-XML-TreeBuilder
 Version:	3.09
-Release:	17%{?dist}
+Release:	18%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/XML-TreeBuilder/
@@ -51,6 +51,9 @@ find $RPM_BUILD_ROOT -name .packlist -ex
 %{perl_vendorlib}/XML/
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.09-18
+- rebuild against perl 5.10.1
+
 * Mon Nov 16 2009 Jeff Fearn <jfearn at redhat.com> - 3.09-17
 - Fix Requires
 



From kasal at fedoraproject.org  Mon Dec  7 04:23:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:23:57 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DebugScreen/devel
	perl-CGI-Application-Plugin-DebugScreen.spec, 1.2, 1.3
Message-ID: <20091207042357.0B3E011C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DebugScreen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24728

Modified Files:
	perl-CGI-Application-Plugin-DebugScreen.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-DebugScreen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DebugScreen/devel/perl-CGI-Application-Plugin-DebugScreen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-DebugScreen.spec	26 Jul 2009 03:54:51 -0000	1.2
+++ perl-CGI-Application-Plugin-DebugScreen.spec	7 Dec 2009 04:23:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-DebugScreen
 Version:        0.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Add Debug support to CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:25:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:25:20 +0000 (UTC)
Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.31,1.32
Message-ID: <20091207042520.BC06811C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MailTools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25056

Modified Files:
	perl-MailTools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- perl-MailTools.spec	26 Jul 2009 09:10:12 -0000	1.31
+++ perl-MailTools.spec	7 Dec 2009 04:25:20 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:	Various mail-related perl modules
 Name:		perl-MailTools
 Version:	2.04
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/MailTools/
@@ -64,6 +64,9 @@ cd -
 %{_mandir}/man3/Mail::*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.04-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:25:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:25:31 +0000 (UTC)
Subject: rpms/perl-Event-RPC/devel perl-Event-RPC.spec,1.5,1.6
Message-ID: <20091207042531.E4A7611C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Event-RPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25198

Modified Files:
	perl-Event-RPC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Event-RPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Event-RPC/devel/perl-Event-RPC.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Event-RPC.spec	26 Jul 2009 05:52:48 -0000	1.5
+++ perl-Event-RPC.spec	7 Dec 2009 04:25:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Event-RPC
 Version:        1.01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Event based transparent Client/Server RPC framework
 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:27:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:27:29 +0000 (UTC)
Subject: rpms/perl-SGML-Parser-OpenSP/devel perl-SGML-Parser-OpenSP.spec,
	1.10, 1.11
Message-ID: <20091207042729.D92B011C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25639

Modified Files:
	perl-SGML-Parser-OpenSP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SGML-Parser-OpenSP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel/perl-SGML-Parser-OpenSP.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-SGML-Parser-OpenSP.spec	3 Sep 2009 19:13:37 -0000	1.10
+++ perl-SGML-Parser-OpenSP.spec	7 Dec 2009 04:27:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-SGML-Parser-OpenSP
 Version:        0.994
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to the OpenSP SGML and XML parser
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.994-5
+- rebuild against perl 5.10.1
+
 * Thu Sep  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.994-4
 - Filter out autoprovided OpenSP.so (if %%{perl_default_filter} is available).
 



From kasal at fedoraproject.org  Mon Dec  7 04:27:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:27:52 +0000 (UTC)
Subject: rpms/perl-XML-TokeParser/devel perl-XML-TokeParser.spec,1.2,1.3
Message-ID: <20091207042752.CDC4511C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-TokeParser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25811

Modified Files:
	perl-XML-TokeParser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-TokeParser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TokeParser/devel/perl-XML-TokeParser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-TokeParser.spec	26 Jul 2009 17:39:20 -0000	1.2
+++ perl-XML-TokeParser.spec	7 Dec 2009 04:27:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-TokeParser
 Version:        0.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simplified interface to XML::Parser
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:28:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:28:04 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIx-Class/devel
	perl-CGI-Application-Plugin-DBIx-Class.spec, 1.1, 1.2
Message-ID: <20091207042804.C247F11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIx-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25951

Modified Files:
	perl-CGI-Application-Plugin-DBIx-Class.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-DBIx-Class.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIx-Class/devel/perl-CGI-Application-Plugin-DBIx-Class.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-CGI-Application-Plugin-DBIx-Class.spec	7 Nov 2009 00:37:53 -0000	1.1
+++ perl-CGI-Application-Plugin-DBIx-Class.spec	7 Dec 2009 04:28:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-DBIx-Class
 Version:        0.093011
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Access a DBIx::Class Schema from a CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.093011-3
+- rebuild against perl 5.10.1
+
 * Thu Nov 05 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.093011-2
 - Fix rpmlint output
 



From kasal at fedoraproject.org  Mon Dec  7 04:29:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:29:53 +0000 (UTC)
Subject: rpms/perl-Mail-SPF/devel perl-Mail-SPF.spec,1.5,1.6
Message-ID: <20091207042953.E422611C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-SPF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26329

Modified Files:
	perl-Mail-SPF.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-SPF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-SPF/devel/perl-Mail-SPF.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Mail-SPF.spec	26 Jul 2009 09:08:45 -0000	1.5
+++ perl-Mail-SPF.spec	7 Dec 2009 04:29:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Mail-SPF
 Version:        2.006
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Object-oriented implementation of Sender Policy Framework
 License:        BSD
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.006-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.006-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:30:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:30:13 +0000 (UTC)
Subject: rpms/perl-Event-Lib/devel perl-Event-Lib.spec,1.7,1.8
Message-ID: <20091207043013.2176A11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Event-Lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26510

Modified Files:
	perl-Event-Lib.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Event-Lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Event-Lib/devel/perl-Event-Lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Event-Lib.spec	27 Jul 2009 15:09:21 -0000	1.7
+++ perl-Event-Lib.spec	7 Dec 2009 04:30:13 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Event-Lib
 Version:        1.03
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl wrapper around libevent
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-9
+- rebuild against perl 5.10.1
+
 * Mon Jul 27 2009 kwizart < kwizart at gmail.com > - 1.0.3-8
 - Fix FTBFS
 



From kasal at fedoraproject.org  Mon Dec  7 04:31:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:31:51 +0000 (UTC)
Subject: rpms/perl-Set-Scalar/devel perl-Set-Scalar.spec,1.7,1.8
Message-ID: <20091207043151.46BE611C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Set-Scalar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26879

Modified Files:
	perl-Set-Scalar.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Set-Scalar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-Scalar/devel/perl-Set-Scalar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Set-Scalar.spec	26 Jul 2009 16:30:01 -0000	1.7
+++ perl-Set-Scalar.spec	7 Dec 2009 04:31:51 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Set-Scalar
 Version:        1.23
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Basic set operations
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.23-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:32:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:32:13 +0000 (UTC)
Subject: rpms/perl-XML-Tidy/devel perl-XML-Tidy.spec,1.4,1.5
Message-ID: <20091207043213.B7DF511C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Tidy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27040

Modified Files:
	perl-XML-Tidy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Tidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Tidy/devel/perl-XML-Tidy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-XML-Tidy.spec	26 Jul 2009 17:39:05 -0000	1.4
+++ perl-XML-Tidy.spec	7 Dec 2009 04:32:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-XML-Tidy
 Version:        1.2.54HJnFa
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tidy indenting of XML documents
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2.54HJnFa-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.54HJnFa-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:34:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:34:13 +0000 (UTC)
Subject: rpms/perl-Mail-Sendmail/devel perl-Mail-Sendmail.spec,1.13,1.14
Message-ID: <20091207043413.B421811C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-Sendmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27598

Modified Files:
	perl-Mail-Sendmail.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-Sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Sendmail/devel/perl-Mail-Sendmail.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Mail-Sendmail.spec	26 Jul 2009 09:09:38 -0000	1.13
+++ perl-Mail-Sendmail.spec	7 Dec 2009 04:34:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Mail-Sendmail
 Version:        0.79
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Simple platform independent mailer for Perl
 
 License:        Copyright only
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.79-13
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.79-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:34:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:34:52 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel
	perl-CGI-Application-Plugin-DBIC-Schema.spec, 1.2, 1.3
Message-ID: <20091207043452.BD6BA11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27814

Modified Files:
	perl-CGI-Application-Plugin-DBIC-Schema.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-DBIC-Schema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel/perl-CGI-Application-Plugin-DBIC-Schema.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-DBIC-Schema.spec	19 Oct 2009 13:25:36 -0000	1.2
+++ perl-CGI-Application-Plugin-DBIC-Schema.spec	7 Dec 2009 04:34:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-DBIC-Schema
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easy DBIx::Class access from CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.3-2
+- rebuild against perl 5.10.1
+
 * Mon Oct 19 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.3-1
 - Update to 0.3
 



From kasal at fedoraproject.org  Mon Dec  7 04:35:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:35:23 +0000 (UTC)
Subject: rpms/perl-Event-ExecFlow/devel perl-Event-ExecFlow.spec,1.4,1.5
Message-ID: <20091207043523.94D8D11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Event-ExecFlow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28002

Modified Files:
	perl-Event-ExecFlow.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Event-ExecFlow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Event-ExecFlow/devel/perl-Event-ExecFlow.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Event-ExecFlow.spec	26 Jul 2009 05:52:20 -0000	1.4
+++ perl-Event-ExecFlow.spec	7 Dec 2009 04:35:23 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Event-ExecFlow
 Version:        0.63
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        High level API for event-based execution flow control
 
 Group:          Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.63-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:36:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:36:14 +0000 (UTC)
Subject: rpms/perl-Set-Object/devel perl-Set-Object.spec,1.3,1.4
Message-ID: <20091207043614.1B56611C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Set-Object/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28282

Modified Files:
	perl-Set-Object.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Set-Object.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-Object/devel/perl-Set-Object.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Set-Object.spec	26 Jul 2009 16:29:47 -0000	1.3
+++ perl-Set-Object.spec	7 Dec 2009 04:36:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name: perl-Set-Object
 Version: 1.26
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL+ or Artistic
 Summary: Set of objects and strings
 Group: Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.26-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:36:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:36:49 +0000 (UTC)
Subject: rpms/perl-XML-Stream/devel perl-XML-Stream.spec,1.9,1.10
Message-ID: <20091207043649.EDBD611C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Stream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28514

Modified Files:
	perl-XML-Stream.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Stream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Stream/devel/perl-XML-Stream.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-XML-Stream.spec	26 Jul 2009 17:38:49 -0000	1.9
+++ perl-XML-Stream.spec	7 Dec 2009 04:36:49 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-XML-Stream
 Version:        1.22 
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        XML::Stream - streaming XML library
 
 Group:          Development/Libraries
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.22-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:38:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:38:18 +0000 (UTC)
Subject: rpms/perl-Mail-Sender/devel perl-Mail-Sender.spec,1.10,1.11
Message-ID: <20091207043818.CDD8011C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-Sender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28864

Modified Files:
	perl-Mail-Sender.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-Sender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Sender/devel/perl-Mail-Sender.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Mail-Sender.spec	26 Jul 2009 09:09:20 -0000	1.10
+++ perl-Mail-Sender.spec	7 Dec 2009 04:38:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Mail-Sender
 Version:        0.8.16
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Module for sending mails with attachments through an SMTP server
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.8.16-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:40:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:40:31 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBH/devel
	perl-CGI-Application-Plugin-DBH.spec, 1.2, 1.3
Message-ID: <20091207044031.4574711C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBH/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29348

Modified Files:
	perl-CGI-Application-Plugin-DBH.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-DBH.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBH/devel/perl-CGI-Application-Plugin-DBH.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-DBH.spec	26 Jul 2009 03:54:35 -0000	1.2
+++ perl-CGI-Application-Plugin-DBH.spec	7 Dec 2009 04:40:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-DBH
 Version:        4.00
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy DBI access from CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.00-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:42:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:42:15 +0000 (UTC)
Subject: rpms/perl-Mail-RFC822-Address/devel perl-Mail-RFC822-Address.spec,
	1.4, 1.5
Message-ID: <20091207044215.42A7011C03AD@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-RFC822-Address/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29772

Modified Files:
	perl-Mail-RFC822-Address.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-RFC822-Address.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-RFC822-Address/devel/perl-Mail-RFC822-Address.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Mail-RFC822-Address.spec	26 Jul 2009 09:08:29 -0000	1.4
+++ perl-Mail-RFC822-Address.spec	7 Dec 2009 04:42:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Mail-RFC822-Address
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for validating email addresses according to RFC822
 License:        MIT
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.3-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:44:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:44:42 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ConfigAuto/devel
	perl-CGI-Application-Plugin-ConfigAuto.spec, 1.3, 1.4
Message-ID: <20091207044442.E26A811C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ConfigAuto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30312

Modified Files:
	perl-CGI-Application-Plugin-ConfigAuto.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-ConfigAuto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ConfigAuto/devel/perl-CGI-Application-Plugin-ConfigAuto.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-CGI-Application-Plugin-ConfigAuto.spec	30 Jul 2009 09:56:28 -0000	1.3
+++ perl-CGI-Application-Plugin-ConfigAuto.spec	7 Dec 2009 04:44:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-ConfigAuto
 Version:        1.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easy config file management for CGI::Application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.31-2
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.31-1
 - Upate to 1.31
 



From kasal at fedoraproject.org  Mon Dec  7 04:45:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:45:41 +0000 (UTC)
Subject: rpms/perl-Event/devel perl-Event.spec,1.14,1.15
Message-ID: <20091207044541.3A84D11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Event/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30584

Modified Files:
	perl-Event.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Event.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Event/devel/perl-Event.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Event.spec	1 Sep 2009 07:55:11 -0000	1.14
+++ perl-Event.spec	7 Dec 2009 04:45:41 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Event
 Version:        1.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Event loop processing
 
 Group:          Development/Libraries
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12-2
+- rebuild against perl 5.10.1
+
 * Tue Sep 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.12-1
 - add perl_default_filter
 - auto-update to 1.12 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Mon Dec  7 04:45:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:45:58 +0000 (UTC)
Subject: rpms/perl-Set-IntSpan/devel perl-Set-IntSpan.spec,1.17,1.18
Message-ID: <20091207044558.0F72011C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Set-IntSpan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30731

Modified Files:
	perl-Set-IntSpan.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/devel/perl-Set-IntSpan.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Set-IntSpan.spec	26 Jul 2009 16:29:33 -0000	1.17
+++ perl-Set-IntSpan.spec	7 Dec 2009 04:45:57 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Set-IntSpan
 Version:        1.13
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.13-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:46:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:46:29 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client/devel perl-Mail-POP3Client.spec,1.3,1.4
Message-ID: <20091207044629.1295211C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30923

Modified Files:
	perl-Mail-POP3Client.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-POP3Client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-POP3Client/devel/perl-Mail-POP3Client.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Mail-POP3Client.spec	26 Jul 2009 09:08:13 -0000	1.3
+++ perl-Mail-POP3Client.spec	7 Dec 2009 04:46:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Mail-POP3Client
 Version:        2.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl 5 module to talk to a POP3 (RFC1939) server
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.18-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:46:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:46:48 +0000 (UTC)
Subject: rpms/perl-XML-Smart/devel perl-XML-Smart.spec,1.4,1.5
Message-ID: <20091207044648.02B9311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Smart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31151

Modified Files:
	perl-XML-Smart.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Smart/devel/perl-XML-Smart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-XML-Smart.spec	26 Jul 2009 17:38:35 -0000	1.4
+++ perl-XML-Smart.spec	7 Dec 2009 04:46:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-XML-Smart
 Version:        1.6.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Implementation of XML parser and writer for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.6.9-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:48:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:48:31 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-AutoRunmode/devel
	perl-CGI-Application-Plugin-AutoRunmode.spec, 1.2, 1.3
Message-ID: <20091207044831.1D55211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-AutoRunmode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31745

Modified Files:
	perl-CGI-Application-Plugin-AutoRunmode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Plugin-AutoRunmode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-AutoRunmode/devel/perl-CGI-Application-Plugin-AutoRunmode.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-AutoRunmode.spec	26 Jul 2009 03:54:02 -0000	1.2
+++ perl-CGI-Application-Plugin-AutoRunmode.spec	7 Dec 2009 04:48:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-AutoRunmode
 Version:        0.16
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        CGI::App plugin to automatically register runmodes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:50:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:50:01 +0000 (UTC)
Subject: rpms/perl-Eval-Context/devel perl-Eval-Context.spec,1.3,1.4
Message-ID: <20091207045001.BD74711C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Eval-Context/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32136

Modified Files:
	perl-Eval-Context.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Eval-Context.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Eval-Context/devel/perl-Eval-Context.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Eval-Context.spec	26 Jul 2009 05:51:51 -0000	1.3
+++ perl-Eval-Context.spec	7 Dec 2009 04:50:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-Eval-Context 
 Version:    0.07 
-Release:    4%{?dist}
+Release:    5%{?dist}
 # see lib/Eval/Context.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -81,6 +81,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:50:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:50:02 +0000 (UTC)
Subject: rpms/perl-Set-Infinite/devel perl-Set-Infinite.spec,1.8,1.9
Message-ID: <20091207045002.A1F9D11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Set-Infinite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32150

Modified Files:
	perl-Set-Infinite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Set-Infinite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-Infinite/devel/perl-Set-Infinite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Set-Infinite.spec	26 Jul 2009 16:29:19 -0000	1.8
+++ perl-Set-Infinite.spec	7 Dec 2009 04:50:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Set-Infinite
 Version:        0.63
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Sets of intervals
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.63-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:50:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:50:40 +0000 (UTC)
Subject: rpms/perl-Mail-Mbox-MessageParser/devel
	perl-Mail-Mbox-MessageParser.spec, 1.16, 1.17
Message-ID: <20091207045040.8DC2111C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-Mbox-MessageParser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32431

Modified Files:
	perl-Mail-Mbox-MessageParser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-Mbox-MessageParser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Mbox-MessageParser/devel/perl-Mail-Mbox-MessageParser.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Mail-Mbox-MessageParser.spec	2 Sep 2009 13:58:55 -0000	1.16
+++ perl-Mail-Mbox-MessageParser.spec	7 Dec 2009 04:50:40 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	A fast and simple mbox folder reader
 Name:		perl-Mail-Mbox-MessageParser
 Version:	1.5002
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL+
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Mail-Mbox-MessageParser/
@@ -56,6 +56,9 @@ information, GNU grep, or highly optimiz
 %{_mandir}/man3/Mail::Mbox::MessageParser::Perl.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.5002-2
+- rebuild against perl 5.10.1
+
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 1.5002-1 
 - Update to 1.5002 
   - perl 5.10 patch upstreamed 



From kasal at fedoraproject.org  Mon Dec  7 04:51:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:51:18 +0000 (UTC)
Subject: rpms/perl-XML-Simple-DTDReader/devel perl-XML-Simple-DTDReader.spec,
	1.2, 1.3
Message-ID: <20091207045118.3E4DA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Simple-DTDReader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32643

Modified Files:
	perl-XML-Simple-DTDReader.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Simple-DTDReader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Simple-DTDReader/devel/perl-XML-Simple-DTDReader.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-Simple-DTDReader.spec	26 Jul 2009 17:38:20 -0000	1.2
+++ perl-XML-Simple-DTDReader.spec	7 Dec 2009 04:51:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-Simple-DTDReader
 Version:        0.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple XML file reading based on their DTDs
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:53:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:53:03 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Dispatch/devel
	perl-CGI-Application-Dispatch.spec, 1.2, 1.3
Message-ID: <20091207045303.8F48D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application-Dispatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv584

Modified Files:
	perl-CGI-Application-Dispatch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application-Dispatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Dispatch/devel/perl-CGI-Application-Dispatch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Dispatch.spec	26 Jul 2009 03:53:47 -0000	1.2
+++ perl-CGI-Application-Dispatch.spec	7 Dec 2009 04:53:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Dispatch
 Version:        2.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Dispatch requests to CGI::Application based objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.16-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:54:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:54:36 +0000 (UTC)
Subject: rpms/perl-Set-Crontab/devel perl-Set-Crontab.spec,1.3,1.4
Message-ID: <20091207045436.81A5511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Set-Crontab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1023

Modified Files:
	perl-Set-Crontab.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Set-Crontab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-Crontab/devel/perl-Set-Crontab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Set-Crontab.spec	26 Jul 2009 16:29:04 -0000	1.3
+++ perl-Set-Crontab.spec	7 Dec 2009 04:54:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Set-Crontab
 Version:        1.02
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Expand crontab(5)-style integer lists
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:55:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:55:33 +0000 (UTC)
Subject: rpms/perl-Error/devel perl-Error.spec,1.25,1.26
Message-ID: <20091207045533.7CD7211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1374

Modified Files:
	perl-Error.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-Error.spec	26 Jul 2009 05:51:36 -0000	1.25
+++ perl-Error.spec	7 Dec 2009 04:55:33 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-Error
 Version:        0.17015
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Error/exception handling in an OO-ish way
 License:        GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:0.17015-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.17015-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:55:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:55:35 +0000 (UTC)
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.17,1.18
Message-ID: <20091207045535.9D90B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1395

Modified Files:
	perl-XML-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-XML-Simple.spec	26 Jul 2009 17:38:07 -0000	1.17
+++ perl-XML-Simple.spec	7 Dec 2009 04:55:35 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-XML-Simple
 Version:        2.18
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.18-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.18-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 04:55:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:55:55 +0000 (UTC)
Subject: rpms/perl-Mail-IMAPClient/devel perl-Mail-IMAPClient.spec, 1.11,
	1.12
Message-ID: <20091207045555.D596311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-IMAPClient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1680

Modified Files:
	perl-Mail-IMAPClient.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-IMAPClient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/devel/perl-Mail-IMAPClient.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Mail-IMAPClient.spec	25 Sep 2009 13:10:35 -0000	1.11
+++ perl-Mail-IMAPClient.spec	7 Dec 2009 04:55:55 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Mail-IMAPClient
 Version:        3.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An IMAP Client API
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.21-2
+- rebuild against perl 5.10.1
+
 * Fri Sep 25 2009 Stepan Kasal <skasal at redhat.com> - 3.21-1
 - new upstream source
 



From kasal at fedoraproject.org  Mon Dec  7 04:57:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:57:33 +0000 (UTC)
Subject: rpms/perl-CGI-Application/devel perl-CGI-Application.spec,1.3,1.4
Message-ID: <20091207045733.CD2E411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Application/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2101

Modified Files:
	perl-CGI-Application.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Application.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application/devel/perl-CGI-Application.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-CGI-Application.spec	30 Jul 2009 09:41:58 -0000	1.3
+++ perl-CGI-Application.spec	7 Dec 2009 04:57:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application
 Version:        4.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Framework for building reusable web-applications
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.31-2
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 4.31-1
 - Update to 4.31
 



From kasal at fedoraproject.org  Mon Dec  7 04:59:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 04:59:04 +0000 (UTC)
Subject: rpms/perl-Sendmail-PMilter/devel perl-Sendmail-PMilter.spec, 1.2,
	1.3
Message-ID: <20091207045904.7B51011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sendmail-PMilter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2474

Modified Files:
	perl-Sendmail-PMilter.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sendmail-PMilter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sendmail-PMilter/devel/perl-Sendmail-PMilter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Sendmail-PMilter.spec	26 Jul 2009 16:28:50 -0000	1.2
+++ perl-Sendmail-PMilter.spec	7 Dec 2009 04:59:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sendmail-PMilter
 Version:        0.97
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl binding of Sendmail Milter protocol
 License:        BSD
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.97-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:00:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:00:07 +0000 (UTC)
Subject: rpms/perl-eperl/devel perl-eperl.spec,1.10,1.11
Message-ID: <20091207050007.41CF811C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-eperl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2768

Modified Files:
	perl-eperl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-eperl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-eperl/devel/perl-eperl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-eperl.spec	26 Jul 2009 17:46:14 -0000	1.10
+++ perl-eperl.spec	7 Dec 2009 05:00:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-eperl
 Version:        2.2.14
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Embedded Perl Language
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.2.14-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.14-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:00:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:00:15 +0000 (UTC)
Subject: rpms/perl-XML-SAX-Writer/devel perl-XML-SAX-Writer.spec,1.6,1.7
Message-ID: <20091207050015.6C0F011C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-SAX-Writer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2882

Modified Files:
	perl-XML-SAX-Writer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-SAX-Writer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-SAX-Writer/devel/perl-XML-SAX-Writer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-XML-SAX-Writer.spec	26 Jul 2009 17:37:51 -0000	1.6
+++ perl-XML-SAX-Writer.spec	7 Dec 2009 05:00:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-XML-SAX-Writer
 Version:        0.50
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        SAX2 Writer
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.50-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.50-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:00:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:00:14 +0000 (UTC)
Subject: rpms/perl-Mail-GnuPG/devel perl-Mail-GnuPG.spec,1.12,1.13
Message-ID: <20091207050014.5FFF211C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2855

Modified Files:
	perl-Mail-GnuPG.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-GnuPG.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/perl-Mail-GnuPG.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Mail-GnuPG.spec	26 Jul 2009 09:07:23 -0000	1.12
+++ perl-Mail-GnuPG.spec	7 Dec 2009 05:00:14 -0000	1.13
@@ -1,7 +1,7 @@
 Name: 		perl-Mail-GnuPG
 Summary: 	Process email with GPG
 Version: 	0.15
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License:	GPLv2 or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Mail-GnuPG/
@@ -52,6 +52,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:02:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:02:07 +0000 (UTC)
Subject: rpms/perl-CGI-Ajax/devel perl-CGI-Ajax.spec,1.8,1.9
Message-ID: <20091207050207.5F69011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CGI-Ajax/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3496

Modified Files:
	perl-CGI-Ajax.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CGI-Ajax.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Ajax/devel/perl-CGI-Ajax.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-CGI-Ajax.spec	26 Jul 2009 03:53:14 -0000	1.8
+++ perl-CGI-Ajax.spec	7 Dec 2009 05:02:06 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Ajax
 Version:        0.707
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl-specific system for writing Asynchronous web applications
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.707-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.707-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pmatilai at fedoraproject.org  Mon Dec  7 05:02:37 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Mon,  7 Dec 2009 05:02:37 +0000 (UTC)
Subject: rpms/sqlite/F-12 sqlite-3.6.13-iotest-nodirsync.patch, 1.1,
	NONE sqlite-3.6.17-tkt3951.patch, 1.1, NONE
Message-ID: <20091207050237.87B8711C00EE@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3661

Removed Files:
	sqlite-3.6.13-iotest-nodirsync.patch 
	sqlite-3.6.17-tkt3951.patch 
Log Message:
- lose unused patches



--- sqlite-3.6.13-iotest-nodirsync.patch DELETED ---


--- sqlite-3.6.17-tkt3951.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 05:03:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:03:28 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/devel perl-Search-Xapian.spec,1.2,1.3
Message-ID: <20091207050328.E69DA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Search-Xapian/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3848

Modified Files:
	perl-Search-Xapian.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Search-Xapian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/devel/perl-Search-Xapian.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Search-Xapian.spec	13 Sep 2009 10:34:43 -0000	1.2
+++ perl-Search-Xapian.spec	7 Dec 2009 05:03:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Search-Xapian
 Version:        1.0.15.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Xapian perl bindings
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.0.15.0-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.15.0-1
 - Updated to 1.0.15 to match xapian-core new updates
 



From kasal at fedoraproject.org  Mon Dec  7 05:04:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:04:44 +0000 (UTC)
Subject: rpms/perl-XML-RSS-LibXML/devel perl-XML-RSS-LibXML.spec,1.2,1.3
Message-ID: <20091207050444.4144F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-RSS-LibXML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4217

Modified Files:
	perl-XML-RSS-LibXML.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-RSS-LibXML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-RSS-LibXML/devel/perl-XML-RSS-LibXML.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-RSS-LibXML.spec	26 Jul 2009 17:37:01 -0000	1.2
+++ perl-XML-RSS-LibXML.spec	7 Dec 2009 05:04:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-RSS-LibXML
 Version:        0.3004
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        XML::RSS with XML::LibXML
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.3004-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3004-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:05:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:05:19 +0000 (UTC)
Subject: rpms/perl-Mail-DKIM/devel perl-Mail-DKIM.spec,1.11,1.12
Message-ID: <20091207050519.3849011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-DKIM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4400

Modified Files:
	perl-Mail-DKIM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-DKIM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-DKIM/devel/perl-Mail-DKIM.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Mail-DKIM.spec	9 Sep 2009 17:17:22 -0000	1.11
+++ perl-Mail-DKIM.spec	7 Dec 2009 05:05:18 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Mail-DKIM
 Version:        0.37
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sign and verify Internet mail with DKIM/DomainKey signatures
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.37-2
+- rebuild against perl 5.10.1
+
 * Wed Sep 9 2009 Warren Togami <wtogami at redhat.com> - 0.37-1
 - 0.37
 



From kasal at fedoraproject.org  Mon Dec  7 05:05:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:05:46 +0000 (UTC)
Subject: rpms/perl-Encode-Detect/devel perl-Encode-Detect.spec,1.4,1.5
Message-ID: <20091207050546.E87EF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Encode-Detect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4575

Modified Files:
	perl-Encode-Detect.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Encode-Detect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Encode-Detect/devel/perl-Encode-Detect.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Encode-Detect.spec	12 Nov 2009 19:49:58 -0000	1.4
+++ perl-Encode-Detect.spec	7 Dec 2009 05:05:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name: perl-Encode-Detect
 Version: 1.01
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Encode::Encoding subclass that detects the encoding of data
 
 Group: Development/Libraries
@@ -56,6 +56,9 @@ find "${RPM_BUILD_ROOT}" -depth -type d 
 %{_mandir}/man3/Encode::Detect::Detector.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-2
+- rebuild against perl 5.10.1
+
 * Thu Nov 12 2009 Warren Togami <wtogami at redhat.com> - 1.01-1
 - 1.01 (no changes of consequence, only match latest upstream version)
 



From kasal at fedoraproject.org  Mon Dec  7 05:08:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:08:10 +0000 (UTC)
Subject: rpms/perl-Cflow/devel perl-Cflow.spec,1.11,1.12
Message-ID: <20091207050810.D6FB811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Cflow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5048

Modified Files:
	perl-Cflow.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Cflow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cflow/devel/perl-Cflow.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Cflow.spec	26 Jul 2009 04:19:10 -0000	1.11
+++ perl-Cflow.spec	7 Dec 2009 05:08:10 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Cflow
 Version:        1.053
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Find flows in raw IP flow files
 Group:          Development/Libraries
 License:        GPLv2+
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.053-12
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.053-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:09:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:09:18 +0000 (UTC)
Subject: rpms/perl-Mail-Box-Parser-C/devel perl-Mail-Box-Parser-C.spec, 1.6, 
	1.7
Message-ID: <20091207050918.33B8F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-Box-Parser-C/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5313

Modified Files:
	perl-Mail-Box-Parser-C.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-Box-Parser-C.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box-Parser-C/devel/perl-Mail-Box-Parser-C.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Mail-Box-Parser-C.spec	26 Jul 2009 09:06:49 -0000	1.6
+++ perl-Mail-Box-Parser-C.spec	7 Dec 2009 05:09:18 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Mail-Box-Parser-C
 Version:        3.006
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Parsing folders for MailBox with C routines
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.006-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.006-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:09:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:09:28 +0000 (UTC)
Subject: rpms/perl-SDL/devel perl-SDL.spec,1.10,1.11
Message-ID: <20091207050928.0CBD611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5433

Modified Files:
	perl-SDL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SDL/devel/perl-SDL.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-SDL.spec	26 Jul 2009 16:22:22 -0000	1.10
+++ perl-SDL.spec	7 Dec 2009 05:09:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-SDL
 Version:        2.1.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        SDL bindings for the Perl language
 Group:          Development/Libraries
 License:        LGPLv2+
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.1.3-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:09:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:09:59 +0000 (UTC)
Subject: rpms/perl-XML-RSS/devel perl-XML-RSS.spec,1.14,1.15
Message-ID: <20091207050959.EF27F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-RSS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5643

Modified Files:
	perl-XML-RSS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-RSS/devel/perl-XML-RSS.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-XML-RSS.spec	20 Aug 2009 02:42:24 -0000	1.14
+++ perl-XML-RSS.spec	7 Dec 2009 05:09:59 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-XML-RSS
 Version:        1.45
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.45-2
+- rebuild against perl 5.10.1
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.45-1
 - update to 1.45
 



From kasal at fedoraproject.org  Mon Dec  7 05:10:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:10:05 +0000 (UTC)
Subject: rpms/perl-Email-Valid/devel perl-Email-Valid.spec,1.8,1.9
Message-ID: <20091207051005.6688E11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Valid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5719

Modified Files:
	perl-Email-Valid.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Valid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Valid/devel/perl-Email-Valid.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Email-Valid.spec	26 Jul 2009 05:51:06 -0000	1.8
+++ perl-Email-Valid.spec	7 Dec 2009 05:10:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Email-Valid
 Version:        0.180
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Check validity of internet email address
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.180-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.180-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pmatilai at fedoraproject.org  Mon Dec  7 05:13:58 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Mon,  7 Dec 2009 05:13:58 +0000 (UTC)
Subject: rpms/sqlite/F-11 sources, 1.26, 1.27 sqlite.spec, 1.58,
	1.59 sqlite-3.6.13-iotest-nodirsync.patch, 1.1,
	NONE sqlite-3.6.17-tkt3951.patch, 1.1, NONE
Message-ID: <20091207051358.85ABB11C00EE@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4147

Modified Files:
	sources sqlite.spec 
Removed Files:
	sqlite-3.6.13-iotest-nodirsync.patch 
	sqlite-3.6.17-tkt3951.patch 
Log Message:
- sync with F-12 version to bring it up to 3.6.20
- fixes #531232 but avoid introducing #525477 on F-11



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	29 Oct 2009 10:50:09 -0000	1.26
+++ sources	7 Dec 2009 05:13:58 -0000	1.27
@@ -1,2 +1,2 @@
-f89f62afc765e08b3f0e47cdc47a15d4  sqlite-3.6.17.tar.gz
-a9081064aecf1a512aa0ca442803460c  sqlite_docs_3_6_17.zip
+0faf8fc8ccff5297513c6532b2b4ce23  sqlite-3.6.20.tar.gz
+64d1f3ad4a20f92594fd7263d408ad83  sqlite_docs_3_6_20.zip


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-11/sqlite.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sqlite.spec	29 Oct 2009 10:50:09 -0000	1.58
+++ sqlite.spec	7 Dec 2009 05:13:58 -0000	1.59
@@ -4,7 +4,7 @@
 %bcond_without check
 
 # upstream doesn't provide separate -docs sources for all minor releases
-%define basever 3.6.17
+%define basever 3.6.20
 %define docver %(echo %{basever}|sed -e "s/\\./_/g")
 
 Summary: Library that implements an embeddable SQL database engine
@@ -20,10 +20,6 @@ Source1: http://www.sqlite.org/sqlite_do
 Patch1: sqlite-3.6.12-libdl.patch
 # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
 Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
-# Fixup io-test fsync expectations wrt SQLITE_DISABLE_DIRSYNC
-Patch3: sqlite-3.6.13-iotest-nodirsync.patch
-# Disable two tests failing on at least on x86_64, ticket #3951
-Patch4: sqlite-3.6.17-tkt3951.patch
 BuildRequires: ncurses-devel readline-devel glibc-devel
 # libdl patch needs
 BuildRequires: autoconf
@@ -94,8 +90,6 @@ This package contains the tcl modules fo
 %setup -q -a1
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
-%patch3 -p1 -b .nodirsync
-%patch4 -p1 -b .tkt3951
 
 %build
 autoconf
@@ -178,6 +172,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Nov 17 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.20-1
+- update to 3.6.20 (http://www.sqlite.org/releaselog/3_6_20.html)
+
+* Tue Oct 06 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.18-1
+- update to 3.6.18 (http://www.sqlite.org/releaselog/3_6_18.html)
+- drop no longer needed test-disabler patches
+
 * Fri Aug 21 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.17-1
 - update to 3.6.17 (http://www.sqlite.org/releaselog/3_6_17.html)
 - disable to failing tests until upstream fixes


--- sqlite-3.6.13-iotest-nodirsync.patch DELETED ---


--- sqlite-3.6.17-tkt3951.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 05:14:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:14:22 +0000 (UTC)
Subject: rpms/perl-ccom/devel perl-ccom.spec,1.6,1.7
Message-ID: <20091207051422.E9D5D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ccom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6694

Modified Files:
	perl-ccom.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ccom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ccom/devel/perl-ccom.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-ccom.spec	26 Jul 2009 17:45:44 -0000	1.6
+++ perl-ccom.spec	7 Dec 2009 05:14:22 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: 	Perl module for context-sensitive phonetic string replacement
 Name: 		perl-ccom
 Version: 	1.4.1
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	LGPLv2+
 Group: 		Development/Libraries
 URL: 		http://www.heise.de/ct/ftp/99/25/252/
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/*.pm
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4.1-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:15:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:15:19 +0000 (UTC)
Subject: rpms/perl-Scope-Upper/devel perl-Scope-Upper.spec,1.6,1.7
Message-ID: <20091207051519.4EE0C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Scope-Upper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7039

Modified Files:
	perl-Scope-Upper.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Scope-Upper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Scope-Upper/devel/perl-Scope-Upper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Scope-Upper.spec	26 Jul 2009 16:28:36 -0000	1.6
+++ perl-Scope-Upper.spec	7 Dec 2009 05:15:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:       perl-Scope-Upper
 Version:    0.09
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Scope/Upper.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:15:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:15:42 +0000 (UTC)
Subject: rpms/perl-Mail-Box/devel perl-Mail-Box.spec,1.12,1.13
Message-ID: <20091207051542.C6EFF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-Box/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7267

Modified Files:
	perl-Mail-Box.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-Box.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Box/devel/perl-Mail-Box.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Mail-Box.spec	9 Sep 2009 15:34:36 -0000	1.12
+++ perl-Mail-Box.spec	7 Dec 2009 05:15:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Mail-Box
 Version:        2.091
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manage a mailbox, a folder with messages
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.091-2
+- rebuild against perl 5.10.1
+
 * Wed Sep  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.091-1
 - update to 2.091
 



From kasal at fedoraproject.org  Mon Dec  7 05:16:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:16:08 +0000 (UTC)
Subject: rpms/perl-XML-RegExp/devel perl-XML-RegExp.spec,1.8,1.9
Message-ID: <20091207051608.D328B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-RegExp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7472

Modified Files:
	perl-XML-RegExp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-RegExp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-RegExp/devel/perl-XML-RegExp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-XML-RegExp.spec	26 Jul 2009 17:37:19 -0000	1.8
+++ perl-XML-RegExp.spec	7 Dec 2009 05:16:08 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-XML-RegExp
 Version:        0.03
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Regular expressions for XML tokens
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:16:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:16:39 +0000 (UTC)
Subject: rpms/perl-Email-Simple-Creator/devel perl-Email-Simple-Creator.spec,
	1.9, 1.10
Message-ID: <20091207051639.941C211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Simple-Creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7682

Modified Files:
	perl-Email-Simple-Creator.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Simple-Creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Simple-Creator/devel/perl-Email-Simple-Creator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Email-Simple-Creator.spec	26 Jul 2009 05:50:52 -0000	1.9
+++ perl-Email-Simple-Creator.spec	7 Dec 2009 05:16:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Email-Simple-Creator
 Version:        1.424
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Email::Simple constructor for starting anew
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.424-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.424-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 05:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:16:50 +0000
Subject: [pkgdb] zikula-module-menutree was added for sparks
Message-ID: <20091207051650.75FFA10F88C@bastion2.fedora.phx.redhat.com>

kevin has added Package zikula-module-menutree with summary Menutree allows to create multilevel, hierarchical (tree like) menu for Zikula
kevin has approved Package zikula-module-menutree
kevin has added a Fedora devel branch for zikula-module-menutree with an owner of sparks
kevin has approved zikula-module-menutree in Fedora devel
kevin has approved Package zikula-module-menutree
kevin has set commit to Approved for 107427 on zikula-module-menutree (Fedora devel)
kevin has set checkout to Approved for 107427 on zikula-module-menutree (Fedora devel)
kevin has set build to Approved for 107427 on zikula-module-menutree (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-menutree



From pkgdb at fedoraproject.org  Mon Dec  7 05:16:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:16:53 +0000
Subject: [pkgdb] zikula-module-menutree summary updated by kevin
Message-ID: <20091207051653.279C710F892@bastion2.fedora.phx.redhat.com>

kevin set package zikula-module-menutree summary to Menutree allows to create multilevel, hierarchical (tree like) menu for Zikula

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-menutree



From pkgdb at fedoraproject.org  Mon Dec  7 05:16:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:16:53 +0000
Subject: [pkgdb] zikula-module-menutree (Fedora EPEL, 5) updated by kevin
Message-ID: <20091207051653.39A5010F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for zikula-module-menutree
kevin has set commit to Approved for 107427 on zikula-module-menutree (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on zikula-module-menutree (Fedora EPEL 5)
kevin has set build to Approved for 107427 on zikula-module-menutree (Fedora EPEL 5)
kevin approved watchbugzilla on zikula-module-menutree (Fedora EPEL 5) for ke4qqq
kevin approved watchcommits on zikula-module-menutree (Fedora EPEL 5) for ke4qqq
kevin approved commit on zikula-module-menutree (Fedora EPEL 5) for ke4qqq
kevin approved build on zikula-module-menutree (Fedora EPEL 5) for ke4qqq
kevin approved approveacls on zikula-module-menutree (Fedora EPEL 5) for ke4qqq

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-menutree



From pkgdb at fedoraproject.org  Mon Dec  7 05:16:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:16:53 +0000
Subject: [pkgdb] zikula-module-menutree (Fedora, 12) updated by kevin
Message-ID: <20091207051653.59D0A10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for zikula-module-menutree
kevin has set commit to Approved for 107427 on zikula-module-menutree (Fedora 12)
kevin has set checkout to Approved for 107427 on zikula-module-menutree (Fedora 12)
kevin has set build to Approved for 107427 on zikula-module-menutree (Fedora 12)
kevin approved watchbugzilla on zikula-module-menutree (Fedora 12) for ke4qqq
kevin approved watchcommits on zikula-module-menutree (Fedora 12) for ke4qqq
kevin approved commit on zikula-module-menutree (Fedora 12) for ke4qqq
kevin approved build on zikula-module-menutree (Fedora 12) for ke4qqq
kevin approved approveacls on zikula-module-menutree (Fedora 12) for ke4qqq

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-menutree



From pkgdb at fedoraproject.org  Mon Dec  7 05:16:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:16:53 +0000
Subject: [pkgdb] zikula-module-menutree (Fedora, devel) updated by kevin
Message-ID: <20091207051653.4AF2710F8A6@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on zikula-module-menutree (Fedora devel) for ke4qqq
kevin approved watchcommits on zikula-module-menutree (Fedora devel) for ke4qqq
kevin approved commit on zikula-module-menutree (Fedora devel) for ke4qqq
kevin approved build on zikula-module-menutree (Fedora devel) for ke4qqq
kevin approved approveacls on zikula-module-menutree (Fedora devel) for ke4qqq

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-menutree



From kevin at fedoraproject.org  Mon Dec  7 05:17:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 05:17:01 +0000 (UTC)
Subject: rpms/zikula-module-menutree - New directory
Message-ID: <20091207051701.3363C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-menutree
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshj7845/rpms/zikula-module-menutree

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-menutree added to the repository




From kevin at fedoraproject.org  Mon Dec  7 05:17:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 05:17:01 +0000 (UTC)
Subject: rpms/zikula-module-menutree/devel - New directory
Message-ID: <20091207051701.58AC211C025D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-menutree/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshj7845/rpms/zikula-module-menutree/devel

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-menutree/devel added to the repository




From kevin at fedoraproject.org  Mon Dec  7 05:17:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 05:17:09 +0000 (UTC)
Subject: rpms/zikula-module-menutree Makefile,NONE,1.1
Message-ID: <20091207051709.AF80611C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-menutree
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshj7845/rpms/zikula-module-menutree

Added Files:
	Makefile 
Log Message:
Setup of module zikula-module-menutree


--- NEW FILE Makefile ---
# Top level Makefile for module zikula-module-menutree
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec  7 05:17:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 05:17:09 +0000 (UTC)
Subject: rpms/zikula-module-menutree/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091207051709.EB88011C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-menutree/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshj7845/rpms/zikula-module-menutree/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zikula-module-menutree


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zikula-module-menutree
# $Id: Makefile,v 1.1 2009/12/07 05:17:09 kevin Exp $
NAME := zikula-module-menutree
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec  7 05:17:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:17:29 +0000
Subject: [pkgdb] perl-Number-Format (Fedora EPEL, 5) updated by kevin
Message-ID: <20091207051729.525BB10F89E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Number-Format
kevin has set commit to Approved for 107427 on perl-Number-Format (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-Number-Format (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-Number-Format (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Number-Format



From kasal at fedoraproject.org  Mon Dec  7 05:18:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:18:45 +0000 (UTC)
Subject: rpms/perl-CatalystX-Component-Traits/devel
	perl-CatalystX-Component-Traits.spec, 1.2, 1.3
Message-ID: <20091207051845.C40EA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-CatalystX-Component-Traits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8612

Modified Files:
	perl-CatalystX-Component-Traits.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-CatalystX-Component-Traits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CatalystX-Component-Traits/devel/perl-CatalystX-Component-Traits.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CatalystX-Component-Traits.spec	6 Dec 2009 02:11:15 -0000	1.2
+++ perl-CatalystX-Component-Traits.spec	7 Dec 2009 05:18:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-CatalystX-Component-Traits
 Version:    0.14
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/CatalystX/Component/Traits.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-2
+- rebuild against perl 5.10.1
+
 * Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
 - auto-update to 0.14 (by cpan-spec-update 0.01)
 - altered br on perl(Test::More) (0 => 0.88)



From kasal at fedoraproject.org  Mon Dec  7 05:19:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:19:59 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/devel perl-XML-Parser-Lite-Tree.spec,
	1.2, 1.3
Message-ID: <20091207051959.C50B211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8935

Modified Files:
	perl-XML-Parser-Lite-Tree.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Parser-Lite-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel/perl-XML-Parser-Lite-Tree.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-Parser-Lite-Tree.spec	24 Sep 2009 07:06:34 -0000	1.2
+++ perl-XML-Parser-Lite-Tree.spec	7 Dec 2009 05:19:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-Parser-Lite-Tree
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight XML tree builder
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-2
+- rebuild against perl 5.10.1
+
 * Thu Sep 24 2009 Michal Ingeli <mi at v3.sk> - 0.12-1
 - Update to current version bz#525050
 



From kasal at fedoraproject.org  Mon Dec  7 05:20:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:20:17 +0000 (UTC)
Subject: rpms/perl-Scope-Guard/devel perl-Scope-Guard.spec,1.5,1.6
Message-ID: <20091207052017.B5B1811C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Scope-Guard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9097

Modified Files:
	perl-Scope-Guard.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Scope-Guard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Scope-Guard/devel/perl-Scope-Guard.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Scope-Guard.spec	26 Jul 2009 16:28:23 -0000	1.5
+++ perl-Scope-Guard.spec	7 Dec 2009 05:20:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Scope-Guard
 Version:        0.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Lexically scoped resource management
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:20:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:20:44 +0000 (UTC)
Subject: rpms/perl-Email-Simple/devel perl-Email-Simple.spec,1.18,1.19
Message-ID: <20091207052044.D5EDC11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9266

Modified Files:
	perl-Email-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Simple/devel/perl-Email-Simple.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-Email-Simple.spec	26 Jul 2009 05:50:36 -0000	1.18
+++ perl-Email-Simple.spec	7 Dec 2009 05:20:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Email-Simple
 Version:        2.005
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simple parsing of RFC2822 message format and headers
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.005-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.005-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:21:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:21:17 +0000 (UTC)
Subject: rpms/perl-Mail-Alias/devel perl-Mail-Alias.spec,1.15,1.16
Message-ID: <20091207052117.5A0E611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mail-Alias/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9533

Modified Files:
	perl-Mail-Alias.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mail-Alias.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-Alias/devel/perl-Mail-Alias.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Mail-Alias.spec	26 Jul 2009 09:06:15 -0000	1.15
+++ perl-Mail-Alias.spec	7 Dec 2009 05:21:17 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Mail-Alias
 Version:        1.12
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Module for manipulating e-mail alias files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:24:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:24:00 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-TT/devel perl-Catalyst-View-TT.spec, 1.8,
	1.9
Message-ID: <20091207052400.396AC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-View-TT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10110

Modified Files:
	perl-Catalyst-View-TT.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-View-TT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-TT/devel/perl-Catalyst-View-TT.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Catalyst-View-TT.spec	6 Dec 2009 02:13:45 -0000	1.8
+++ perl-Catalyst-View-TT.spec	7 Dec 2009 05:23:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-View-TT
 Version:        0.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Template Toolkit View Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.31-2
+- rebuild against perl 5.10.1
+
 * Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.31-1
 - auto-update to 0.31 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 05:24:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:24:14 +0000 (UTC)
Subject: rpms/perl-Schedule-Cron-Events/devel perl-Schedule-Cron-Events.spec,
	1.5, 1.6
Message-ID: <20091207052414.23ED711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Schedule-Cron-Events/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10282

Modified Files:
	perl-Schedule-Cron-Events.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Schedule-Cron-Events.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Schedule-Cron-Events/devel/perl-Schedule-Cron-Events.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Schedule-Cron-Events.spec	26 Jul 2009 16:28:07 -0000	1.5
+++ perl-Schedule-Cron-Events.spec	7 Dec 2009 05:24:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Schedule-Cron-Events
 Version:        1.8
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Take a line from a crontab and find out when events will occur
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.8-19
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:24:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:24:42 +0000 (UTC)
Subject: rpms/perl-XML-NamespaceSupport/devel perl-XML-NamespaceSupport.spec,
	1.16, 1.17
Message-ID: <20091207052442.0B94511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-NamespaceSupport/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10477

Modified Files:
	perl-XML-NamespaceSupport.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-NamespaceSupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-NamespaceSupport/devel/perl-XML-NamespaceSupport.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-XML-NamespaceSupport.spec	7 Oct 2009 09:01:25 -0000	1.16
+++ perl-XML-NamespaceSupport.spec	7 Dec 2009 05:24:41 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-XML-NamespaceSupport
 Version:        1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple generic namespace support class
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.10-2
+- rebuild against perl 5.10.1
+
 * Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.10-1
 - update to new upstream release
 



From kasal at fedoraproject.org  Mon Dec  7 05:24:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:24:53 +0000 (UTC)
Subject: rpms/perl-Email-Send/devel perl-Email-Send.spec,1.7,1.8
Message-ID: <20091207052453.BB1ED11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Send/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10617

Modified Files:
	perl-Email-Send.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Send.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Send/devel/perl-Email-Send.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Email-Send.spec	26 Jul 2009 05:50:19 -0000	1.7
+++ perl-Email-Send.spec	7 Dec 2009 05:24:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Email-Send
 Version:        2.194
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Module for sending email
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.194-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.194-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:26:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:26:23 +0000 (UTC)
Subject: rpms/perl-LWP-Online/devel perl-LWP-Online.spec,1.1,1.2
Message-ID: <20091207052623.B196411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-LWP-Online/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10981

Modified Files:
	perl-LWP-Online.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-LWP-Online.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-LWP-Online/devel/perl-LWP-Online.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-LWP-Online.spec	20 Nov 2009 07:20:22 -0000	1.1
+++ perl-LWP-Online.spec	7 Dec 2009 05:26:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-LWP-Online
 Version:        1.07
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Module for accessing web by proccess
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,5 +51,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-2
+- rebuild against perl 5.10.1
+
 * Wed Nov 18 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.07-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 05:28:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:28:23 +0000 (UTC)
Subject: rpms/perl-Scalar-Properties/devel perl-Scalar-Properties.spec, 1.8, 
	1.9
Message-ID: <20091207052823.127BD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Scalar-Properties/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11455

Modified Files:
	perl-Scalar-Properties.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Scalar-Properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Scalar-Properties/devel/perl-Scalar-Properties.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Scalar-Properties.spec	26 Jul 2009 16:27:54 -0000	1.8
+++ perl-Scalar-Properties.spec	7 Dec 2009 05:28:22 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Scalar-Properties
 Version:        0.13
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Run-time properties on scalar variables
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:28:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:28:48 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-PDF-Reuse/devel
	perl-Catalyst-View-PDF-Reuse.spec, 1.2, 1.3
Message-ID: <20091207052848.2CE6711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-View-PDF-Reuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11629

Modified Files:
	perl-Catalyst-View-PDF-Reuse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-View-PDF-Reuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-PDF-Reuse/devel/perl-Catalyst-View-PDF-Reuse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Catalyst-View-PDF-Reuse.spec	26 Jul 2009 04:18:39 -0000	1.2
+++ perl-Catalyst-View-PDF-Reuse.spec	7 Dec 2009 05:28:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Catalyst-View-PDF-Reuse 
 Version:    0.03 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Catalyst/Helper/View/PDF/Reuse.pm -> GPL+ or Artistic
 # lib/Catalyst/View/PDF/Reuse.pm -> GPL+ or Artistic
 # lib/Template/Plugin/Catalyst/View/PDF/Reuse.pm -> GPL+ or Artistic
@@ -62,6 +62,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:28:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:28:58 +0000 (UTC)
Subject: rpms/perl-XML-Merge/devel perl-XML-Merge.spec,1.4,1.5
Message-ID: <20091207052858.BAA2111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Merge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11784

Modified Files:
	perl-XML-Merge.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Merge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Merge/devel/perl-XML-Merge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-XML-Merge.spec	26 Jul 2009 17:36:00 -0000	1.4
+++ perl-XML-Merge.spec	7 Dec 2009 05:28:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-XML-Merge 
 Version:        1.2.565EgGd
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Flexibly merge XML documents
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2.565EgGd-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.565EgGd-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:29:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:29:52 +0000 (UTC)
Subject: rpms/perl-Email-Reply/devel perl-Email-Reply.spec,1.5,1.6
Message-ID: <20091207052952.B8C3C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Reply/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12087

Modified Files:
	perl-Email-Reply.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Reply.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Reply/devel/perl-Email-Reply.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Email-Reply.spec	26 Jul 2009 05:50:05 -0000	1.5
+++ perl-Email-Reply.spec	7 Dec 2009 05:29:52 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Email-Reply
 Version:        1.202
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Reply to an email message
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.202-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.202-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:30:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:30:41 +0000 (UTC)
Subject: rpms/perl-LWP-Authen-Wsse/devel perl-LWP-Authen-Wsse.spec,1.6,1.7
Message-ID: <20091207053041.4AB7611C039C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-LWP-Authen-Wsse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12382

Modified Files:
	perl-LWP-Authen-Wsse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-LWP-Authen-Wsse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-LWP-Authen-Wsse/devel/perl-LWP-Authen-Wsse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-LWP-Authen-Wsse.spec	26 Jul 2009 08:56:15 -0000	1.6
+++ perl-LWP-Authen-Wsse.spec	7 Dec 2009 05:30:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-LWP-Authen-Wsse
 Version:        0.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library for enabling X-WSSE authentication in LWP
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 05:32:24 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 05:32:24 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.19,1.20
Message-ID: <20091207053224.2D10D11C00EE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12713

Modified Files:
	gnome-shell.spec 
Log Message:
Testing different autogen.sh path




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gnome-shell.spec	7 Dec 2009 03:45:57 -0000	1.19
+++ gnome-shell.spec	7 Dec 2009 05:32:23 -0000	1.20
@@ -74,7 +74,7 @@ easy to use experience.
 
 %build
 ## Needed to build the git tree
-/bin/sh $RPM_BUILD_ROOT/gnome-shell/autogen.sh
+/bin/sh $RPM_BUILD_ROOT/autogen.sh
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath



From kasal at fedoraproject.org  Mon Dec  7 05:33:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:33:31 +0000 (UTC)
Subject: rpms/perl-Satcon/devel perl-Satcon.spec,1.4,1.5
Message-ID: <20091207053331.1BBF311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Satcon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13159

Modified Files:
	perl-Satcon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Satcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Satcon/devel/perl-Satcon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Satcon.spec	26 Jul 2009 16:27:41 -0000	1.4
+++ perl-Satcon.spec	7 Dec 2009 05:33:30 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           perl-Satcon
 Summary:        Framework for configuration files
 Version:        1.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Group:          Applications/System
 URL:            https://fedorahosted.org/spacewalk
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.10-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:33:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:33:44 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-Mason/devel perl-Catalyst-View-Mason.spec,
	1.3, 1.4
Message-ID: <20091207053344.8EF3311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-View-Mason/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13326

Modified Files:
	perl-Catalyst-View-Mason.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-View-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-Mason/devel/perl-Catalyst-View-Mason.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Catalyst-View-Mason.spec	23 Aug 2009 14:06:48 -0000	1.3
+++ perl-Catalyst-View-Mason.spec	7 Dec 2009 05:33:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-View-Mason
 Version:        0.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mason View Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-2
+- rebuild against perl 5.10.1
+
 * Sun Aug 23 2009 Iain Arnell <iarnell at gmail.com> 0.18-1
 - update to latest upstream (for compatibility with Catalyst::Runtime 5.80010)
 



From kasal at fedoraproject.org  Mon Dec  7 05:33:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:33:52 +0000 (UTC)
Subject: rpms/perl-XML-LibXSLT/devel perl-XML-LibXSLT.spec,1.22,1.23
Message-ID: <20091207053352.C69B611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-LibXSLT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13445

Modified Files:
	perl-XML-LibXSLT.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-LibXSLT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-LibXSLT/devel/perl-XML-LibXSLT.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-XML-LibXSLT.spec	20 Nov 2009 08:57:55 -0000	1.22
+++ perl-XML-LibXSLT.spec	7 Dec 2009 05:33:52 -0000	1.23
@@ -4,7 +4,7 @@ Name:		perl-XML-LibXSLT
 
 # NOTE: also update perl-XML-LibXML to a compatible version.  See below why.
 Version:	1.70
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	Perl module for interfacing to GNOME's libxslt
 
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.70-2
+- rebuild against perl 5.10.1
+
 * Fri Nov 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1:1.70-1
 - update to fix 539102
 



From kasal at fedoraproject.org  Mon Dec  7 05:34:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:34:17 +0000 (UTC)
Subject: rpms/perl-Email-MIME-Modifier/devel perl-Email-MIME-Modifier.spec, 
	1.12, 1.13
Message-ID: <20091207053417.1E6E211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-MIME-Modifier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13709

Modified Files:
	perl-Email-MIME-Modifier.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-MIME-Modifier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Modifier/devel/perl-Email-MIME-Modifier.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Email-MIME-Modifier.spec	6 Aug 2009 19:13:12 -0000	1.12
+++ perl-Email-MIME-Modifier.spec	7 Dec 2009 05:34:16 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Email-MIME-Modifier
 Version:        1.444
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Modify Email::MIME Objects Easily
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.444-2
+- rebuild against perl 5.10.1
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.444-1
 - update to 1.444
 



From kasal at fedoraproject.org  Mon Dec  7 05:35:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:35:21 +0000 (UTC)
Subject: rpms/perl-Log-Trivial/devel perl-Log-Trivial.spec,1.4,1.5
Message-ID: <20091207053521.664CD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-Trivial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14176

Modified Files:
	perl-Log-Trivial.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-Trivial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Trivial/devel/perl-Log-Trivial.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Log-Trivial.spec	26 Jul 2009 09:03:17 -0000	1.4
+++ perl-Log-Trivial.spec	7 Dec 2009 05:35:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Log-Trivial
 Version:        0.31
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Very simple tool for writing very simple log files
 License:        GPLv3+
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.31-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:38:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:38:41 +0000 (UTC)
Subject: rpms/perl-XML-LibXML/devel perl-XML-LibXML.spec,1.35,1.36
Message-ID: <20091207053841.D6A2411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-LibXML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15086

Modified Files:
	perl-XML-LibXML.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-LibXML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-LibXML/devel/perl-XML-LibXML.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- perl-XML-LibXML.spec	30 Nov 2009 06:43:53 -0000	1.35
+++ perl-XML-LibXML.spec	7 Dec 2009 05:38:41 -0000	1.36
@@ -2,7 +2,7 @@ Name:           perl-XML-LibXML
 # NOTE: also update perl-XML-LibXSLT to the same version, see
 # https://bugzilla.redhat.com/show_bug.cgi?id=469480
 Version:        1.70
-Release:        3%{?dist}
+Release:        4%{?dist}
 # Epoch set when version went from 1.62001 to 1.65
 Epoch:          1
 Summary:        Perl interface to the libxml2 library
@@ -79,6 +79,9 @@ fi
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:1.70-4
+- rebuild against perl 5.10.1
+
 * Mon Nov 30 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1:1.70-3
 - corrected version of obsoletes
 



From kasal at fedoraproject.org  Mon Dec  7 05:38:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:38:36 +0000 (UTC)
Subject: rpms/perl-Sane/devel perl-Sane.spec,1.4,1.5
Message-ID: <20091207053836.4201711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Sane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15027

Modified Files:
	perl-Sane.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Sane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sane/devel/perl-Sane.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Sane.spec	26 Jul 2009 16:27:26 -0000	1.4
+++ perl-Sane.spec	7 Dec 2009 05:38:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Sane
 Version:        0.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for the SANE (Scanner Access Now Easy) Project
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:39:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:39:02 +0000 (UTC)
Subject: rpms/perl-Email-MIME-Encodings/devel perl-Email-MIME-Encodings.spec,
	1.11, 1.12
Message-ID: <20091207053902.3E1C411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-MIME-Encodings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15341

Modified Files:
	perl-Email-MIME-Encodings.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-MIME-Encodings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Encodings/devel/perl-Email-MIME-Encodings.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Email-MIME-Encodings.spec	26 Jul 2009 05:49:23 -0000	1.11
+++ perl-Email-MIME-Encodings.spec	7 Dec 2009 05:39:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Email-MIME-Encodings
 Version:        1.313
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Unified interface to MIME encoding and decoding
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.313-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.313-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:39:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:39:09 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-JSON/devel perl-Catalyst-View-JSON.spec, 1.6,
	1.7
Message-ID: <20091207053909.7DB8411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-View-JSON/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15444

Modified Files:
	perl-Catalyst-View-JSON.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-View-JSON.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-JSON/devel/perl-Catalyst-View-JSON.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Catalyst-View-JSON.spec	6 Sep 2009 07:28:58 -0000	1.6
+++ perl-Catalyst-View-JSON.spec	7 Dec 2009 05:39:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-View-JSON
 Version:        0.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        JSON view for your data
 License:        GPL+ or Artistic 2.0
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.26-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 06 2009 Iain Arnell <iarnell at gmail.com> 0.26-1
 - update to latest upstream release
 



From mkent at fedoraproject.org  Mon Dec  7 05:39:11 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Mon,  7 Dec 2009 05:39:11 +0000 (UTC)
Subject: File rcov-0.9.6.gem uploaded to lookaside cache by mkent
Message-ID: <20091207053911.BE06810F89C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rubygem-rcov:

dbb6711acf626c032d8a93951ce105be  rcov-0.9.6.gem



From kasal at fedoraproject.org  Mon Dec  7 05:40:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:40:06 +0000 (UTC)
Subject: rpms/perl-Log-TraceMessages/devel perl-Log-TraceMessages.spec, 1.4, 
	1.5
Message-ID: <20091207054006.B330911C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-TraceMessages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15915

Modified Files:
	perl-Log-TraceMessages.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-TraceMessages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-TraceMessages/devel/perl-Log-TraceMessages.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Log-TraceMessages.spec	26 Jul 2009 09:03:01 -0000	1.4
+++ perl-Log-TraceMessages.spec	7 Dec 2009 05:40:06 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Log-TraceMessages
 Version:        1.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for trace messages used in debugging
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mkent at fedoraproject.org  Mon Dec  7 05:40:24 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Mon,  7 Dec 2009 05:40:24 +0000 (UTC)
Subject: rpms/rubygem-rcov/devel import.log, NONE, 1.1 rubygem-rcov.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207054024.2966311C03FC@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-rcov/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16051/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-rcov.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-rcov-0_9_6-2_fc13:HEAD:rubygem-rcov-0.9.6-2.fc13.src.rpm:1260163638


--- NEW FILE rubygem-rcov.spec ---
# Generated from rcov-0.9.6.gem by gem2rpm -*- rpm-spec -*-
%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname rcov
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Code coverage analysis tool for Ruby
Name: rubygem-%{gemname}
Version: 0.9.6
Release: 2%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://github.com/relevance/rcov
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby-devel
Provides: rubygem(%{gemname}) = %{version}

%description
rcov is a code coverage tool for Ruby. It is commonly used for viewing overall
test unit coverage of target code.  It features fast execution (20-300 times
faster than previous tools), multiple analysis modes, XHTML and several kinds
of text reports, easy automation with Rake via a RcovTask, fairly accurate
coverage information through code linkage inference using simple heuristics,
colorblind-friendliness...

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Arch dependent files go here
mkdir -p %{buildroot}%{ruby_sitearch}
mv %{buildroot}%{geminstdir}/lib/*.so %{buildroot}%{ruby_sitearch}

pushd %{buildroot}%{geminstdir}/ext/rcovrt
  make clean
popd

# lib is for libraries
chmod 644 %{buildroot}%{geminstdir}/lib/rcov/rcovtask.rb
sed -i -e '/^#!\/usr\/bin\/env ruby/d' \
  %{buildroot}%{geminstdir}/lib/rcov/rcovtask.rb

find %{buildroot}%{geminstdir}/bin -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"'

%clean
rm -rf %{buildroot}

# TODO: Tests are shipped in the gem but broken in 0.9.6, attempt to run in
#       next release. Issue is missing files in test/, specifically
#       test_helper.rb, assets/sample_06.rb and expected_coverage/*
#       Requested resolution in 
#       http://github.com/relevance/rcov/issues/#issue/36 

%files
%defattr(-,root,root,-)
%{_bindir}/rcov
%doc %{geminstdir}/[A-Z]*
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{ruby_sitearch}/*.so
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/doc
%{geminstdir}/ext
%{geminstdir}/test
%{geminstdir}/editor-extensions
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Thu Dec 03 2009 Matthew Kent <mkent at magoazul.com> - 0.9.6-2
- Remove Requires for rubygem(rake) (#543337).
- Move ext to -doc (#543337).

* Tue Dec 01 2009 Matthew Kent <mkent at magoazul.com> - 0.9.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rcov/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:25:26 -0000	1.1
+++ .cvsignore	7 Dec 2009 05:40:23 -0000	1.2
@@ -0,0 +1 @@
+rcov-0.9.6.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rcov/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:25:27 -0000	1.1
+++ sources	7 Dec 2009 05:40:24 -0000	1.2
@@ -0,0 +1 @@
+dbb6711acf626c032d8a93951ce105be  rcov-0.9.6.gem



From mkent at fedoraproject.org  Mon Dec  7 05:42:12 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Mon,  7 Dec 2009 05:42:12 +0000 (UTC)
Subject: rpms/rubygem-rcov/F-11 import.log, NONE, 1.1 rubygem-rcov.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207054212.8AF9011C00EE@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-rcov/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16580/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-rcov.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-rcov-0_9_6-2_fc13:F-11:rubygem-rcov-0.9.6-2.fc13.src.rpm:1260163770


--- NEW FILE rubygem-rcov.spec ---
# Generated from rcov-0.9.6.gem by gem2rpm -*- rpm-spec -*-
%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname rcov
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Code coverage analysis tool for Ruby
Name: rubygem-%{gemname}
Version: 0.9.6
Release: 2%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://github.com/relevance/rcov
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby-devel
Provides: rubygem(%{gemname}) = %{version}

%description
rcov is a code coverage tool for Ruby. It is commonly used for viewing overall
test unit coverage of target code.  It features fast execution (20-300 times
faster than previous tools), multiple analysis modes, XHTML and several kinds
of text reports, easy automation with Rake via a RcovTask, fairly accurate
coverage information through code linkage inference using simple heuristics,
colorblind-friendliness...

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Arch dependent files go here
mkdir -p %{buildroot}%{ruby_sitearch}
mv %{buildroot}%{geminstdir}/lib/*.so %{buildroot}%{ruby_sitearch}

pushd %{buildroot}%{geminstdir}/ext/rcovrt
  make clean
popd

# lib is for libraries
chmod 644 %{buildroot}%{geminstdir}/lib/rcov/rcovtask.rb
sed -i -e '/^#!\/usr\/bin\/env ruby/d' \
  %{buildroot}%{geminstdir}/lib/rcov/rcovtask.rb

find %{buildroot}%{geminstdir}/bin -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"'

%clean
rm -rf %{buildroot}

# TODO: Tests are shipped in the gem but broken in 0.9.6, attempt to run in
#       next release. Issue is missing files in test/, specifically
#       test_helper.rb, assets/sample_06.rb and expected_coverage/*
#       Requested resolution in 
#       http://github.com/relevance/rcov/issues/#issue/36 

%files
%defattr(-,root,root,-)
%{_bindir}/rcov
%doc %{geminstdir}/[A-Z]*
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{ruby_sitearch}/*.so
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/doc
%{geminstdir}/ext
%{geminstdir}/test
%{geminstdir}/editor-extensions
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Thu Dec 03 2009 Matthew Kent <mkent at magoazul.com> - 0.9.6-2
- Remove Requires for rubygem(rake) (#543337).
- Move ext to -doc (#543337).

* Tue Dec 01 2009 Matthew Kent <mkent at magoazul.com> - 0.9.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rcov/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:25:26 -0000	1.1
+++ .cvsignore	7 Dec 2009 05:42:12 -0000	1.2
@@ -0,0 +1 @@
+rcov-0.9.6.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rcov/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:25:27 -0000	1.1
+++ sources	7 Dec 2009 05:42:12 -0000	1.2
@@ -0,0 +1 @@
+dbb6711acf626c032d8a93951ce105be  rcov-0.9.6.gem



From mkent at fedoraproject.org  Mon Dec  7 05:42:54 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Mon,  7 Dec 2009 05:42:54 +0000 (UTC)
Subject: rpms/rubygem-rcov/F-12 import.log, NONE, 1.1 rubygem-rcov.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207054254.C1A6B11C00EE@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-rcov/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16924/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-rcov.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-rcov-0_9_6-2_fc13:F-12:rubygem-rcov-0.9.6-2.fc13.src.rpm:1260163841


--- NEW FILE rubygem-rcov.spec ---
# Generated from rcov-0.9.6.gem by gem2rpm -*- rpm-spec -*-
%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname rcov
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Code coverage analysis tool for Ruby
Name: rubygem-%{gemname}
Version: 0.9.6
Release: 2%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://github.com/relevance/rcov
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby-devel
Provides: rubygem(%{gemname}) = %{version}

%description
rcov is a code coverage tool for Ruby. It is commonly used for viewing overall
test unit coverage of target code.  It features fast execution (20-300 times
faster than previous tools), multiple analysis modes, XHTML and several kinds
of text reports, easy automation with Rake via a RcovTask, fairly accurate
coverage information through code linkage inference using simple heuristics,
colorblind-friendliness...

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Arch dependent files go here
mkdir -p %{buildroot}%{ruby_sitearch}
mv %{buildroot}%{geminstdir}/lib/*.so %{buildroot}%{ruby_sitearch}

pushd %{buildroot}%{geminstdir}/ext/rcovrt
  make clean
popd

# lib is for libraries
chmod 644 %{buildroot}%{geminstdir}/lib/rcov/rcovtask.rb
sed -i -e '/^#!\/usr\/bin\/env ruby/d' \
  %{buildroot}%{geminstdir}/lib/rcov/rcovtask.rb

find %{buildroot}%{geminstdir}/bin -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"'

%clean
rm -rf %{buildroot}

# TODO: Tests are shipped in the gem but broken in 0.9.6, attempt to run in
#       next release. Issue is missing files in test/, specifically
#       test_helper.rb, assets/sample_06.rb and expected_coverage/*
#       Requested resolution in 
#       http://github.com/relevance/rcov/issues/#issue/36 

%files
%defattr(-,root,root,-)
%{_bindir}/rcov
%doc %{geminstdir}/[A-Z]*
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{ruby_sitearch}/*.so
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/doc
%{geminstdir}/ext
%{geminstdir}/test
%{geminstdir}/editor-extensions
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Thu Dec 03 2009 Matthew Kent <mkent at magoazul.com> - 0.9.6-2
- Remove Requires for rubygem(rake) (#543337).
- Move ext to -doc (#543337).

* Tue Dec 01 2009 Matthew Kent <mkent at magoazul.com> - 0.9.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rcov/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:25:26 -0000	1.1
+++ .cvsignore	7 Dec 2009 05:42:54 -0000	1.2
@@ -0,0 +1 @@
+rcov-0.9.6.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rcov/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:25:27 -0000	1.1
+++ sources	7 Dec 2009 05:42:54 -0000	1.2
@@ -0,0 +1 @@
+dbb6711acf626c032d8a93951ce105be  rcov-0.9.6.gem



From kasal at fedoraproject.org  Mon Dec  7 05:43:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:43:35 +0000 (UTC)
Subject: rpms/perl-XML-Handler-YAWriter/devel perl-XML-Handler-YAWriter.spec,
	1.5, 1.6
Message-ID: <20091207054335.62B7F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Handler-YAWriter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17299

Modified Files:
	perl-XML-Handler-YAWriter.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Handler-YAWriter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Handler-YAWriter/devel/perl-XML-Handler-YAWriter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-XML-Handler-YAWriter.spec	26 Jul 2009 17:34:56 -0000	1.5
+++ perl-XML-Handler-YAWriter.spec	7 Dec 2009 05:43:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-XML-Handler-YAWriter
 Version:        0.23
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Yet another Perl SAX XML Writer
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.23-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:43:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:43:45 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-Email/devel perl-Catalyst-View-Email.spec,
	1.2, 1.3
Message-ID: <20091207054345.75E8111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-View-Email/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17432

Modified Files:
	perl-Catalyst-View-Email.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-View-Email.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-Email/devel/perl-Catalyst-View-Email.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Catalyst-View-Email.spec	26 Jul 2009 04:17:50 -0000	1.2
+++ perl-Catalyst-View-Email.spec	7 Dec 2009 05:43:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-View-Email
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Send Email from Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:43:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:43:56 +0000 (UTC)
Subject: rpms/perl-Email-MIME-Creator/devel perl-Email-MIME-Creator.spec, 1.9,
	1.10
Message-ID: <20091207054356.19A3F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-MIME-Creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17581

Modified Files:
	perl-Email-MIME-Creator.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-MIME-Creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Creator/devel/perl-Email-MIME-Creator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Email-MIME-Creator.spec	6 Aug 2009 19:21:22 -0000	1.9
+++ perl-Email-MIME-Creator.spec	7 Dec 2009 05:43:55 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Email-MIME-Creator
 Version:        1.456
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Email::MIME constructor for starting anew
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.456-2
+- rebuild against perl 5.10.1
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.456-1
 - update to 1.456
 



From maxamillion at fedoraproject.org  Mon Dec  7 05:44:04 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 05:44:04 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.20,1.21
Message-ID: <20091207054404.358B011C00EE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16936

Modified Files:
	gnome-shell.spec 
Log Message:
Testing to find the working dir of the script in rpm buildroot




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gnome-shell.spec	7 Dec 2009 05:32:23 -0000	1.20
+++ gnome-shell.spec	7 Dec 2009 05:44:04 -0000	1.21
@@ -75,6 +75,10 @@ easy to use experience.
 %build
 ## Needed to build the git tree
 /bin/sh $RPM_BUILD_ROOT/autogen.sh
+
+## Testing some shit
+pwd
+
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath



From kasal at fedoraproject.org  Mon Dec  7 05:44:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:44:10 +0000 (UTC)
Subject: rpms/perl-Log-Trace/devel perl-Log-Trace.spec,1.2,1.3
Message-ID: <20091207054410.3A26111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-Trace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17781

Modified Files:
	perl-Log-Trace.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-Trace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Trace/devel/perl-Log-Trace.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Log-Trace.spec	26 Jul 2009 09:02:45 -0000	1.2
+++ perl-Log-Trace.spec	7 Dec 2009 05:44:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Log-Trace 
 Version:    1.070 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Log/Trace.pm -> GPLv2+ 
 License:    GPLv2+
 Group:      Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.070-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.070-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:44:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:44:23 +0000 (UTC)
Subject: rpms/perl-RT-Client-REST/devel perl-RT-Client-REST.spec,1.2,1.3
Message-ID: <20091207054423.CC5E211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-RT-Client-REST/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18037

Modified Files:
	perl-RT-Client-REST.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-RT-Client-REST.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-RT-Client-REST/devel/perl-RT-Client-REST.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-RT-Client-REST.spec	26 Jul 2009 16:20:01 -0000	1.2
+++ perl-RT-Client-REST.spec	7 Dec 2009 05:44:23 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-RT-Client-REST 
 Version:    0.37 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/RT/Client/REST.pm -> GPLv2
 # see also /usr/bin/rt from the rt3 package
 License:    GPLv2
@@ -67,6 +67,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.37-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.37-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mkent at fedoraproject.org  Mon Dec  7 05:45:39 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Mon,  7 Dec 2009 05:45:39 +0000 (UTC)
Subject: File ParseTree-3.0.4.gem uploaded to lookaside cache by mkent
Message-ID: <20091207054539.5096B10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rubygem-ParseTree:

0955106bcbac25e87e74b4e852179d8b  ParseTree-3.0.4.gem



From mkent at fedoraproject.org  Mon Dec  7 05:46:11 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Mon,  7 Dec 2009 05:46:11 +0000 (UTC)
Subject: rpms/rubygem-ParseTree/devel import.log, NONE,
	1.1 rubygem-ParseTree-3.0.4-minitest.patch, NONE,
	1.1 rubygem-ParseTree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207054611.3C33F11C00EE@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ParseTree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18651/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ParseTree-3.0.4-minitest.patch 
	rubygem-ParseTree.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ParseTree-3_0_4-4_fc13:HEAD:rubygem-ParseTree-3.0.4-4.fc13.src.rpm:1260164024

rubygem-ParseTree-3.0.4-minitest.patch:
 test_unified_ruby.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rubygem-ParseTree-3.0.4-minitest.patch ---
--- test/test_unified_ruby.rb.orig	2009-11-25 23:52:32.962414853 -0800
+++ test/test_unified_ruby.rb	2009-11-25 23:59:03.282477403 -0800
@@ -2,7 +2,7 @@
 
 $TESTING = true
 
-require 'minitest/autorun' if $0 == __FILE__ unless defined? $ZENTEST and $ZENTEST
+require 'minitest/autorun'
 require 'test/unit/testcase'
 require 'sexp'
 require 'sexp_processor'


--- NEW FILE rubygem-ParseTree.spec ---
# Generated from ParseTree-3.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ParseTree
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Extracts the parse tree for a class/method and returns an s-expression
Name: rubygem-%{gemname}
Version: 3.0.4
Release: 4%{?dist}
Group: Development/Languages
License: MIT
URL: http://parsetree.rubyforge.org/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Reported upstrea via
# http://rubyforge.org/tracker/?func=detail&aid=27491&group_id=439&atid=1780
Patch0: rubygem-ParseTree-3.0.4-minitest.patch
Requires: rubygem(RubyInline)
Requires: rubygem(sexp_processor)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest)
BuildRequires(check): rubygem(RubyInline), rubygem(sexp_processor), rubygem(ruby2ruby)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ParseTree is a C extension (using RubyInline) that extracts the parse
tree for an entire class or a specific method and returns it as a
s-expression (aka sexp) using ruby's arrays, strings, symbols, and
integers.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

pushd .%{geminstdir}
%patch0 -p0

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway. Some shebangs in libraries as well.
find %{buildroot}%{geminstdir}/{test,lib} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
find %{buildroot}%{geminstdir}/{bin,demo} -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/local/bin/ruby"#!/usr/bin/ruby"'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/{bin,demo,validate.sh} -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
# Don't muck within home directories, also reported upstream
sed -i 's^"~/.ruby_inline"^"inline_tmp"^' Rakefile test/test_parse_tree.rb
# Builds in home by default
export INLINEDIR=inline_tmp
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/parse_tree_abc
%{_bindir}/parse_tree_audit
%{_bindir}/parse_tree_deps
%{_bindir}/parse_tree_show
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
# Script creates a circular dependency and is primarily for development
# Included, but it's dependencies aren't met.
#%{geminstdir}/lib/gauntlet_parsetree.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
# Ignore development related files shipped in gem
%exclude %{geminstdir}/validate.sh
%exclude %{geminstdir}/.require_paths

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/test
%{geminstdir}/.autotest
# Ignore non functioning demo
%exclude %{geminstdir}/demo
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Thu Dec 3 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-4
- Drop needless versions from Requires (#541807).
- Exclude demo/ for now as it's non functional (#541807).

* Mon Nov 30 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-3
- Remove exclude for gauntlet_parsetree.rb, let user deal with dependencies if
  they need it.

* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-2
- Exclude gauntlet_parsetree.rb as it introduces a circular dependency.

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ParseTree/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:24:49 -0000	1.1
+++ .cvsignore	7 Dec 2009 05:46:10 -0000	1.2
@@ -0,0 +1 @@
+ParseTree-3.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ParseTree/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:24:49 -0000	1.1
+++ sources	7 Dec 2009 05:46:10 -0000	1.2
@@ -0,0 +1 @@
+0955106bcbac25e87e74b4e852179d8b  ParseTree-3.0.4.gem



From mkent at fedoraproject.org  Mon Dec  7 05:47:02 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Mon,  7 Dec 2009 05:47:02 +0000 (UTC)
Subject: rpms/rubygem-ParseTree/F-11 import.log, NONE,
	1.1 rubygem-ParseTree-3.0.4-minitest.patch, NONE,
	1.1 rubygem-ParseTree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207054702.9729911C00EE@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ParseTree/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19067/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ParseTree-3.0.4-minitest.patch 
	rubygem-ParseTree.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ParseTree-3_0_4-4_fc13:F-11:rubygem-ParseTree-3.0.4-4.fc13.src.rpm:1260164088

rubygem-ParseTree-3.0.4-minitest.patch:
 test_unified_ruby.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rubygem-ParseTree-3.0.4-minitest.patch ---
--- test/test_unified_ruby.rb.orig	2009-11-25 23:52:32.962414853 -0800
+++ test/test_unified_ruby.rb	2009-11-25 23:59:03.282477403 -0800
@@ -2,7 +2,7 @@
 
 $TESTING = true
 
-require 'minitest/autorun' if $0 == __FILE__ unless defined? $ZENTEST and $ZENTEST
+require 'minitest/autorun'
 require 'test/unit/testcase'
 require 'sexp'
 require 'sexp_processor'


--- NEW FILE rubygem-ParseTree.spec ---
# Generated from ParseTree-3.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ParseTree
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Extracts the parse tree for a class/method and returns an s-expression
Name: rubygem-%{gemname}
Version: 3.0.4
Release: 4%{?dist}
Group: Development/Languages
License: MIT
URL: http://parsetree.rubyforge.org/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Reported upstrea via
# http://rubyforge.org/tracker/?func=detail&aid=27491&group_id=439&atid=1780
Patch0: rubygem-ParseTree-3.0.4-minitest.patch
Requires: rubygem(RubyInline)
Requires: rubygem(sexp_processor)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest)
BuildRequires(check): rubygem(RubyInline), rubygem(sexp_processor), rubygem(ruby2ruby)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ParseTree is a C extension (using RubyInline) that extracts the parse
tree for an entire class or a specific method and returns it as a
s-expression (aka sexp) using ruby's arrays, strings, symbols, and
integers.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

pushd .%{geminstdir}
%patch0 -p0

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway. Some shebangs in libraries as well.
find %{buildroot}%{geminstdir}/{test,lib} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
find %{buildroot}%{geminstdir}/{bin,demo} -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/local/bin/ruby"#!/usr/bin/ruby"'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/{bin,demo,validate.sh} -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
# Don't muck within home directories, also reported upstream
sed -i 's^"~/.ruby_inline"^"inline_tmp"^' Rakefile test/test_parse_tree.rb
# Builds in home by default
export INLINEDIR=inline_tmp
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/parse_tree_abc
%{_bindir}/parse_tree_audit
%{_bindir}/parse_tree_deps
%{_bindir}/parse_tree_show
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
# Script creates a circular dependency and is primarily for development
# Included, but it's dependencies aren't met.
#%{geminstdir}/lib/gauntlet_parsetree.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
# Ignore development related files shipped in gem
%exclude %{geminstdir}/validate.sh
%exclude %{geminstdir}/.require_paths

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/test
%{geminstdir}/.autotest
# Ignore non functioning demo
%exclude %{geminstdir}/demo
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Thu Dec 3 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-4
- Drop needless versions from Requires (#541807).
- Exclude demo/ for now as it's non functional (#541807).

* Mon Nov 30 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-3
- Remove exclude for gauntlet_parsetree.rb, let user deal with dependencies if
  they need it.

* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-2
- Exclude gauntlet_parsetree.rb as it introduces a circular dependency.

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ParseTree/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:24:49 -0000	1.1
+++ .cvsignore	7 Dec 2009 05:47:02 -0000	1.2
@@ -0,0 +1 @@
+ParseTree-3.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ParseTree/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:24:49 -0000	1.1
+++ sources	7 Dec 2009 05:47:02 -0000	1.2
@@ -0,0 +1 @@
+0955106bcbac25e87e74b4e852179d8b  ParseTree-3.0.4.gem



From kasal at fedoraproject.org  Mon Dec  7 05:48:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:48:17 +0000 (UTC)
Subject: rpms/perl-XML-Grove/devel perl-XML-Grove.spec,1.27,1.28
Message-ID: <20091207054817.C6BDF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Grove/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19786

Modified Files:
	perl-XML-Grove.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Grove.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Grove/devel/perl-XML-Grove.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- perl-XML-Grove.spec	26 Jul 2009 17:34:39 -0000	1.27
+++ perl-XML-Grove.spec	7 Dec 2009 05:48:16 -0000	1.28
@@ -6,7 +6,7 @@ Name:           perl-XML-Grove
 # better not to use an epoch. If 0.46 is ever released, the epoch way
 # would have to be used, but we are better avoiding that if possible.
 Version:        0.46alpha
-Release:        39%{?dist}
+Release:        40%{?dist}
 Summary:        Simple access to infoset of parsed XML, HTML, or SGML instances
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.46alpha-40
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.46alpha-39
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mkent at fedoraproject.org  Mon Dec  7 05:48:21 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Mon,  7 Dec 2009 05:48:21 +0000 (UTC)
Subject: rpms/rubygem-ParseTree/F-12 import.log, NONE,
	1.1 rubygem-ParseTree-3.0.4-minitest.patch, NONE,
	1.1 rubygem-ParseTree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207054821.85AE111C00EE@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-ParseTree/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19773/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ParseTree-3.0.4-minitest.patch 
	rubygem-ParseTree.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-ParseTree-3_0_4-4_fc13:F-12:rubygem-ParseTree-3.0.4-4.fc13.src.rpm:1260164135

rubygem-ParseTree-3.0.4-minitest.patch:
 test_unified_ruby.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rubygem-ParseTree-3.0.4-minitest.patch ---
--- test/test_unified_ruby.rb.orig	2009-11-25 23:52:32.962414853 -0800
+++ test/test_unified_ruby.rb	2009-11-25 23:59:03.282477403 -0800
@@ -2,7 +2,7 @@
 
 $TESTING = true
 
-require 'minitest/autorun' if $0 == __FILE__ unless defined? $ZENTEST and $ZENTEST
+require 'minitest/autorun'
 require 'test/unit/testcase'
 require 'sexp'
 require 'sexp_processor'


--- NEW FILE rubygem-ParseTree.spec ---
# Generated from ParseTree-3.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ParseTree
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Extracts the parse tree for a class/method and returns an s-expression
Name: rubygem-%{gemname}
Version: 3.0.4
Release: 4%{?dist}
Group: Development/Languages
License: MIT
URL: http://parsetree.rubyforge.org/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Reported upstrea via
# http://rubyforge.org/tracker/?func=detail&aid=27491&group_id=439&atid=1780
Patch0: rubygem-ParseTree-3.0.4-minitest.patch
Requires: rubygem(RubyInline)
Requires: rubygem(sexp_processor)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(rake), rubygem(hoe), rubygem(minitest)
BuildRequires(check): rubygem(RubyInline), rubygem(sexp_processor), rubygem(ruby2ruby)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
ParseTree is a C extension (using RubyInline) that extracts the parse
tree for an entire class or a specific method and returns it as a
s-expression (aka sexp) using ruby's arrays, strings, symbols, and
integers.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

pushd .%{geminstdir}
%patch0 -p0

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

# Drop the standalone mode for tests - won't run that way due to missing 
# rubygems require anyway. Some shebangs in libraries as well.
find %{buildroot}%{geminstdir}/{test,lib} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/.*\/ruby.*/d'
find %{buildroot}%{geminstdir}/{bin,demo} -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/local/bin/ruby"#!/usr/bin/ruby"'
# Ships with extremely tight permissions, bring them inline with other gems
find %{buildroot}%{geminstdir} -type f | \
  xargs chmod 0644
find %{buildroot}%{geminstdir}/{bin,demo,validate.sh} -type f | \
  xargs chmod 0755

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
# Don't muck within home directories, also reported upstream
sed -i 's^"~/.ruby_inline"^"inline_tmp"^' Rakefile test/test_parse_tree.rb
# Builds in home by default
export INLINEDIR=inline_tmp
rake test

%files
%defattr(-,root,root,-)
%{_bindir}/parse_tree_abc
%{_bindir}/parse_tree_audit
%{_bindir}/parse_tree_deps
%{_bindir}/parse_tree_show
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
# Script creates a circular dependency and is primarily for development
# Included, but it's dependencies aren't met.
#%{geminstdir}/lib/gauntlet_parsetree.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
# Ignore development related files shipped in gem
%exclude %{geminstdir}/validate.sh
%exclude %{geminstdir}/.require_paths

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/test
%{geminstdir}/.autotest
# Ignore non functioning demo
%exclude %{geminstdir}/demo
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Thu Dec 3 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-4
- Drop needless versions from Requires (#541807).
- Exclude demo/ for now as it's non functional (#541807).

* Mon Nov 30 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-3
- Remove exclude for gauntlet_parsetree.rb, let user deal with dependencies if
  they need it.

* Sun Nov 29 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-2
- Exclude gauntlet_parsetree.rb as it introduces a circular dependency.

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 3.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ParseTree/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:24:49 -0000	1.1
+++ .cvsignore	7 Dec 2009 05:48:21 -0000	1.2
@@ -0,0 +1 @@
+ParseTree-3.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ParseTree/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:24:49 -0000	1.1
+++ sources	7 Dec 2009 05:48:21 -0000	1.2
@@ -0,0 +1 @@
+0955106bcbac25e87e74b4e852179d8b  ParseTree-3.0.4.gem



From kasal at fedoraproject.org  Mon Dec  7 05:49:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:49:03 +0000 (UTC)
Subject: rpms/perl-Log-LogLite/devel perl-Log-LogLite.spec,1.2,1.3
Message-ID: <20091207054903.2ECD511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-LogLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20150

Modified Files:
	perl-Log-LogLite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-LogLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-LogLite/devel/perl-Log-LogLite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Log-LogLite.spec	26 Jul 2009 09:02:32 -0000	1.2
+++ perl-Log-LogLite.spec	7 Dec 2009 05:49:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Log-LogLite
 Version:        0.82
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Create simple logs
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.82-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 05:49:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:49:19 +0000
Subject: [pkgdb] almanah (un)retirement
Message-ID: <20091207054919.52E9710F88C@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora devel has been unretired by kevin and is now orphan.

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Mon Dec  7 05:49:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:49:25 +0000
Subject: [pkgdb] almanah (un)retirement
Message-ID: <20091207054925.36FF710F890@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 11 has been unretired by kevin and is now orphan.

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Mon Dec  7 05:49:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 05:49:27 +0000
Subject: [pkgdb] almanah (un)retirement
Message-ID: <20091207054927.35B6A10F8A1@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 12 has been unretired by kevin and is now orphan.

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/almanah



From kasal at fedoraproject.org  Mon Dec  7 05:49:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:49:58 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Unicode/devel
	perl-Catalyst-Plugin-Unicode.spec, 1.5, 1.6
Message-ID: <20091207054958.3C5C011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20504

Modified Files:
	perl-Catalyst-Plugin-Unicode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/perl-Catalyst-Plugin-Unicode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-Plugin-Unicode.spec	18 Oct 2009 08:54:49 -0000	1.5
+++ perl-Catalyst-Plugin-Unicode.spec	7 Dec 2009 05:49:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Unicode
 Version:        0.92
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Unicode aware Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.92-3
+- rebuild against perl 5.10.1
+
 * Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.92-2
 - set PERL5_CPANPLUS_IS_RUNNING for Makefile.PL
 



From kasal at fedoraproject.org  Mon Dec  7 05:50:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:50:01 +0000 (UTC)
Subject: rpms/perl-RRD-Simple/devel perl-RRD-Simple.spec,1.11,1.12
Message-ID: <20091207055001.4E9F711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-RRD-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20550

Modified Files:
	perl-RRD-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-RRD-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-RRD-Simple/devel/perl-RRD-Simple.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-RRD-Simple.spec	26 Jul 2009 16:19:47 -0000	1.11
+++ perl-RRD-Simple.spec	7 Dec 2009 05:50:01 -0000	1.12
@@ -1,6 +1,6 @@
 Name:     perl-RRD-Simple
 Version:  1.44
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  Simple interface to create and store data in RRD files
 
 Group:    Development/Libraries
@@ -84,6 +84,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.44-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.44-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:50:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:50:18 +0000 (UTC)
Subject: rpms/perl-Email-MIME-ContentType/devel
	perl-Email-MIME-ContentType.spec, 1.10, 1.11
Message-ID: <20091207055018.6E94211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-MIME-ContentType/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20793

Modified Files:
	perl-Email-MIME-ContentType.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-ContentType/devel/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Email-MIME-ContentType.spec	26 Jul 2009 05:48:54 -0000	1.10
+++ perl-Email-MIME-ContentType.spec	7 Dec 2009 05:50:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Email-MIME-ContentType
 Version:        1.015
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.015-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.015-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:52:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:52:09 +0000 (UTC)
Subject: rpms/perl-XML-Generator-DBI/devel perl-XML-Generator-DBI.spec, 1.5, 
	1.6
Message-ID: <20091207055209.54CAB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Generator-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21295

Modified Files:
	perl-XML-Generator-DBI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Generator-DBI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Generator-DBI/devel/perl-XML-Generator-DBI.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-XML-Generator-DBI.spec	26 Jul 2009 17:34:23 -0000	1.5
+++ perl-XML-Generator-DBI.spec	7 Dec 2009 05:52:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-XML-Generator-DBI
 Version:        1.00    
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Generate SAX events from SQL queries
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:52:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:52:34 +0000 (UTC)
Subject: rpms/perl-Email-MIME-Attachment-Stripper/devel
	perl-Email-MIME-Attachment-Stripper.spec, 1.8, 1.9
Message-ID: <20091207055234.BF59111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-MIME-Attachment-Stripper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21541

Modified Files:
	perl-Email-MIME-Attachment-Stripper.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-MIME-Attachment-Stripper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Attachment-Stripper/devel/perl-Email-MIME-Attachment-Stripper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Email-MIME-Attachment-Stripper.spec	26 Jul 2009 05:48:39 -0000	1.8
+++ perl-Email-MIME-Attachment-Stripper.spec	7 Dec 2009 05:52:34 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Email-MIME-Attachment-Stripper
 Version:        1.316
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Strip the attachments from a mail message
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.316-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.316-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:53:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:53:04 +0000 (UTC)
Subject: rpms/perl-Log-Log4perl/devel perl-Log-Log4perl.spec,1.23,1.24
Message-ID: <20091207055304.8BC3711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21765

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Log-Log4perl.spec	6 Aug 2009 10:46:27 -0000	1.23
+++ perl-Log-Log4perl.spec	7 Dec 2009 05:53:03 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-Log-Log4perl
 Version:        1.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.24-2
+- rebuild against perl 5.10.1
+
 * Thu Aug 06 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.24-1
 - Fix mass rebuild breakdown: Upgrade to upstream 1.24.
 



From kasal at fedoraproject.org  Mon Dec  7 05:54:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:54:27 +0000 (UTC)
Subject: rpms/perl-RPM-Specfile/devel perl-RPM-Specfile.spec,1.21,1.22
Message-ID: <20091207055427.EC75F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-RPM-Specfile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22209

Modified Files:
	perl-RPM-Specfile.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-RPM-Specfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-RPM-Specfile/devel/perl-RPM-Specfile.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-RPM-Specfile.spec	26 Jul 2009 16:19:16 -0000	1.21
+++ perl-RPM-Specfile.spec	7 Dec 2009 05:54:27 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-RPM-Specfile
 Version:        1.51
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl extension for creating RPM specfiles
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.51-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.51-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:55:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:55:27 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-SubRequest/devel
	perl-Catalyst-Plugin-SubRequest.spec, 1.7, 1.8
Message-ID: <20091207055527.71B8311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-SubRequest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22520

Modified Files:
	perl-Catalyst-Plugin-SubRequest.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-SubRequest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-SubRequest/devel/perl-Catalyst-Plugin-SubRequest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Catalyst-Plugin-SubRequest.spec	6 Dec 2009 03:19:31 -0000	1.7
+++ perl-Catalyst-Plugin-SubRequest.spec	7 Dec 2009 05:55:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-SubRequest
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Make subrequests to actions in Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-2
+- rebuild against perl 5.10.1
+
 * Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
 - add default filtering
 - auto-update to 0.15 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Mon Dec  7 05:56:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:56:20 +0000 (UTC)
Subject: rpms/perl-XML-Generator/devel perl-XML-Generator.spec,1.3,1.4
Message-ID: <20091207055620.2098211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Generator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22838

Modified Files:
	perl-XML-Generator.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Generator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Generator/devel/perl-XML-Generator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-XML-Generator.spec	26 Jul 2009 17:34:08 -0000	1.3
+++ perl-XML-Generator.spec	7 Dec 2009 05:56:19 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: XML-Generator Perl module
 Name: perl-XML-Generator
 Version: 1.01
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/XML-Generator/
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:56:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:56:40 +0000 (UTC)
Subject: rpms/perl-Email-MIME/devel perl-Email-MIME.spec,1.16,1.17
Message-ID: <20091207055640.EC31F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-MIME/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23042

Modified Files:
	perl-Email-MIME.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-MIME.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME/devel/perl-Email-MIME.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Email-MIME.spec	26 Jul 2009 05:48:24 -0000	1.16
+++ perl-Email-MIME.spec	7 Dec 2009 05:56:40 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Email-MIME
 Version:        1.863
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy MIME message parsing
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.863-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.863-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:58:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:58:16 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Perl/devel perl-Log-Dispatch-Perl.spec, 1.4, 
	1.5
Message-ID: <20091207055816.628F911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23476

Modified Files:
	perl-Log-Dispatch-Perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-Dispatch-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Perl/devel/perl-Log-Dispatch-Perl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Log-Dispatch-Perl.spec	26 Jul 2009 09:02:02 -0000	1.4
+++ perl-Log-Dispatch-Perl.spec	7 Dec 2009 05:58:15 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Log-Dispatch-Perl
 Version:        0.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Use core Perl functions for logging
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:58:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:58:33 +0000 (UTC)
Subject: rpms/perl-rpm-build-perl/devel perl-rpm-build-perl.spec,1.3,1.4
Message-ID: <20091207055833.B054D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-rpm-build-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23645

Modified Files:
	perl-rpm-build-perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-rpm-build-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-rpm-build-perl/devel/perl-rpm-build-perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-rpm-build-perl.spec	26 Jul 2009 17:50:53 -0000	1.3
+++ perl-rpm-build-perl.spec	7 Dec 2009 05:58:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-rpm-build-perl 
 Version:    0.6.8 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/B/PerlReq.pm, among others
 License:    GPLv2+
 Group:      Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.6.8-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 05:59:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 05:59:53 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-StackTrace/devel
	perl-Catalyst-Plugin-StackTrace.spec, 1.8, 1.9
Message-ID: <20091207055953.ECA9911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-StackTrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23981

Modified Files:
	perl-Catalyst-Plugin-StackTrace.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-StackTrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-StackTrace/devel/perl-Catalyst-Plugin-StackTrace.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Catalyst-Plugin-StackTrace.spec	26 Jul 2009 04:16:32 -0000	1.8
+++ perl-Catalyst-Plugin-StackTrace.spec	7 Dec 2009 05:59:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-StackTrace
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Display a stack trace on the debug screen
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:00:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:00:27 +0000 (UTC)
Subject: rpms/perl-XML-Filter-XInclude/devel perl-XML-Filter-XInclude.spec,
	1.4, 1.5
Message-ID: <20091207060027.E0A1211C039C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Filter-XInclude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24213

Modified Files:
	perl-XML-Filter-XInclude.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Filter-XInclude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Filter-XInclude/devel/perl-XML-Filter-XInclude.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-XML-Filter-XInclude.spec	26 Jul 2009 17:33:52 -0000	1.4
+++ perl-XML-Filter-XInclude.spec	7 Dec 2009 06:00:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-XML-Filter-XInclude
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        XInclude as a SAX Filter
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.0-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:00:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:00:49 +0000 (UTC)
Subject: rpms/perl-Email-MessageID/devel perl-Email-MessageID.spec, 1.10,
	1.11
Message-ID: <20091207060049.28E8F11C039C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-MessageID/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24370

Modified Files:
	perl-Email-MessageID.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-MessageID.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MessageID/devel/perl-Email-MessageID.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Email-MessageID.spec	26 Jul 2009 05:49:51 -0000	1.10
+++ perl-Email-MessageID.spec	7 Dec 2009 06:00:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Email-MessageID
 Version:        1.401
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Generate world unique message-ids
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.401-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.401-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:02:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:02:27 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-FileRotate/devel
	perl-Log-Dispatch-FileRotate.spec, 1.11, 1.12
Message-ID: <20091207060227.B936311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24800

Modified Files:
	perl-Log-Dispatch-FileRotate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-FileRotate/devel/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Log-Dispatch-FileRotate.spec	26 Jul 2009 09:01:48 -0000	1.11
+++ perl-Log-Dispatch-FileRotate.spec	7 Dec 2009 06:02:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Log-Dispatch-FileRotate
 Version:        1.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.19-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:02:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:02:43 +0000 (UTC)
Subject: rpms/perl-RPM2/devel perl-RPM2.spec,1.12,1.13
Message-ID: <20091207060243.22EC711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-RPM2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24948

Modified Files:
	perl-RPM2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-RPM2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-RPM2/devel/perl-RPM2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-RPM2.spec	26 Jul 2009 16:19:32 -0000	1.12
+++ perl-RPM2.spec	7 Dec 2009 06:02:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-RPM2
 Version:        0.68
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl bindings for the RPM Package Manager API
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.68-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.68-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:04:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:04:10 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Singleton/devel
	perl-Catalyst-Plugin-Singleton.spec, 1.2, 1.3
Message-ID: <20091207060410.F363511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25379

Modified Files:
	perl-Catalyst-Plugin-Singleton.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Singleton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Singleton/devel/perl-Catalyst-Plugin-Singleton.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Catalyst-Plugin-Singleton.spec	26 Jul 2009 04:16:17 -0000	1.2
+++ perl-Catalyst-Plugin-Singleton.spec	7 Dec 2009 06:04:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Singleton
 Version:        0.02
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Singleton to context
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:04:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:04:24 +0000 (UTC)
Subject: rpms/perl-XML-Filter-BufferText/devel
	perl-XML-Filter-BufferText.spec, 1.6, 1.7
Message-ID: <20091207060424.03A3511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Filter-BufferText/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25547

Modified Files:
	perl-XML-Filter-BufferText.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Filter-BufferText.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Filter-BufferText/devel/perl-XML-Filter-BufferText.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-XML-Filter-BufferText.spec	26 Jul 2009 17:33:36 -0000	1.6
+++ perl-XML-Filter-BufferText.spec	7 Dec 2009 06:04:23 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-XML-Filter-BufferText
 Version:        1.01
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Filter to put all characters() in one event
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:05:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:05:09 +0000 (UTC)
Subject: rpms/perl-Email-Find/devel perl-Email-Find.spec,1.3,1.4
Message-ID: <20091207060509.4EE9111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Find/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25849

Modified Files:
	perl-Email-Find.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Find.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Find/devel/perl-Email-Find.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Email-Find.spec	26 Jul 2009 05:48:08 -0000	1.3
+++ perl-Email-Find.spec	7 Dec 2009 06:05:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Email-Find
 Version:        0.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Find RFC 822 email addresses in plain text
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:07:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:07:08 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch-Config/devel perl-Log-Dispatch-Config.spec, 
	1.11, 1.12
Message-ID: <20091207060709.0A61511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-Dispatch-Config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26436

Modified Files:
	perl-Log-Dispatch-Config.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-Dispatch-Config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Config/devel/perl-Log-Dispatch-Config.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Log-Dispatch-Config.spec	26 Jul 2009 09:01:34 -0000	1.11
+++ perl-Log-Dispatch-Config.spec	7 Dec 2009 06:07:08 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           perl-Log-Dispatch-Config
 Version:        1.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Log4j for Perl        
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:07:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:07:28 +0000 (UTC)
Subject: rpms/perl-Return-Value/devel perl-Return-Value.spec,1.5,1.6
Message-ID: <20091207060728.0F33611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Return-Value/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26639

Modified Files:
	perl-Return-Value.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Return-Value.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Return-Value/devel/perl-Return-Value.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Return-Value.spec	26 Jul 2009 16:22:06 -0000	1.5
+++ perl-Return-Value.spec	7 Dec 2009 06:07:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Return-Value
 Version:        1.302
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Polymorphic Return Values
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.302-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.302-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:08:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:08:23 +0000 (UTC)
Subject: rpms/perl-XML-Feed/devel perl-XML-Feed.spec,1.2,1.3
Message-ID: <20091207060823.D307811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Feed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27004

Modified Files:
	perl-XML-Feed.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Feed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Feed/devel/perl-XML-Feed.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-Feed.spec	26 Jul 2009 17:33:20 -0000	1.2
+++ perl-XML-Feed.spec	7 Dec 2009 06:08:23 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-Feed
 Version:        0.43
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Syndication feed parser and auto-discovery
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.43-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.43-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:08:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:08:17 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Setenv/devel
	perl-Catalyst-Plugin-Setenv.spec, 1.2, 1.3
Message-ID: <20091207060817.8049C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26923

Modified Files:
	perl-Catalyst-Plugin-Setenv.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Setenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Setenv/devel/perl-Catalyst-Plugin-Setenv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Catalyst-Plugin-Setenv.spec	26 Jul 2009 04:16:02 -0000	1.2
+++ perl-Catalyst-Plugin-Setenv.spec	7 Dec 2009 06:08:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Setenv
 Version:        0.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Catalyst::Plugin::Setenv Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:09:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:09:21 +0000 (UTC)
Subject: rpms/perl-Email-Date-Format/devel perl-Email-Date-Format.spec, 1.4, 
	1.5
Message-ID: <20091207060921.0D15E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Date-Format/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27401

Modified Files:
	perl-Email-Date-Format.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Date-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Date-Format/devel/perl-Email-Date-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Email-Date-Format.spec	26 Jul 2009 05:47:52 -0000	1.4
+++ perl-Email-Date-Format.spec	7 Dec 2009 06:09:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Email-Date-Format
 Version:        1.002
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Produce RFC 2822 date strings
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.002-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.002-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bskeggs at fedoraproject.org  Mon Dec  7 06:11:40 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon,  7 Dec 2009 06:11:40 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.70, 1.71 kernel.spec, 1.1949, 
	1.1950
Message-ID: <20091207061140.5511F11C00EE@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28026

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Mon Dec 07 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-164
- nouveau: fix NV17 breakage caused by NVA8 fixes
- nouveau: use ratelimit for GPU error message



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   56 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   30 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 6050 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  289 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  663 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  478 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  468 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  812 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   54 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  155 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  157 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1270 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  380 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   47 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  976 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1080 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  455 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  257 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  702 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  583 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  196 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  321 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  865 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1002 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  528 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  316 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  271 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  208 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  260 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  892 
 drivers/gpu/drm/nouveau/nv17_gpio.c         |   92 
 drivers/gpu/drm/nouveau/nv17_tv.c           |  681 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  780 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  314 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2240 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  769 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  156 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  304 
 drivers/gpu/drm/nouveau/nv50_display.c      |  998 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  273 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  494 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  470 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |26832 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  509 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  269 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  220 
 85 files changed, 64038 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- drm-nouveau.patch	4 Dec 2009 04:48:58 -0000	1.70
+++ drm-nouveau.patch	7 Dec 2009 06:11:38 -0000	1.71
@@ -1778,10 +1778,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..3595be1
+index 0000000..0b5dc12
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,6046 @@
+@@ -0,0 +1,6050 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -7445,13 +7445,17 @@ index 0000000..3595be1
 +		if (configblock)
 +			config = ROM32(dcbtable[headerlen + confofs + recordlength * i]);
 +
-+		if ((connection & 0x0000000f) == 0x0000000f)
-+			continue;
-+
++		/* seen on an NV11 with DCB v1.5 */
 +		if (connection == 0x00000000)
-+			/* seen on an NV11 with DCB v1.5 */
 +			break;
 +
++		/* seen on an NV17 with DCB v2.0 */
++		if (connection == 0xffffffff)
++			break;
++
++		if ((connection & 0x0000000f) == 0x0000000f)
++			continue;
++
 +		NV_TRACEWARN(dev, "Raw DCB entry %d: %08x %08x\n",
 +			     dcb->entries, connection, config);
 +
@@ -14897,7 +14901,7 @@ index 0000000..f10b53b
 +
 diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c b/drivers/gpu/drm/nouveau/nouveau_hw.c
 new file mode 100644
-index 0000000..fa137b9
+index 0000000..dc46792
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_hw.c
 @@ -0,0 +1,1080 @@
@@ -15614,7 +15618,7 @@ index 0000000..fa137b9
 +
 +	regp->fp_margin_color = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_MARGIN_COLOR);
 +
-+	if (dev_priv->card_type >= NV_30)
++	if (nv_gf4_disp_arch(dev))
 +		regp->ramdac_8c0 = NVReadRAMDAC(dev, head, NV_PRAMDAC_8C0);
 +
 +	if (dev_priv->card_type == NV_40) {
@@ -15685,7 +15689,7 @@ index 0000000..fa137b9
 +
 +	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_MARGIN_COLOR, regp->fp_margin_color);
 +
-+	if (dev_priv->card_type >= NV_30)
++	if (nv_gf4_disp_arch(dev))
 +		NVWriteRAMDAC(dev, head, NV_PRAMDAC_8C0, regp->ramdac_8c0);
 +
 +	if (dev_priv->card_type == NV_40) {
@@ -16836,10 +16840,10 @@ index 0000000..a2c30f4
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
 new file mode 100644
-index 0000000..39b9f51
+index 0000000..370c72c
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
-@@ -0,0 +1,693 @@
+@@ -0,0 +1,702 @@
 +/*
 + * Copyright (C) 2006 Ben Skeggs.
 + *
@@ -16877,6 +16881,7 @@ index 0000000..39b9f51
 +#include "nouveau_drm.h"
 +#include "nouveau_drv.h"
 +#include "nouveau_reg.h"
++#include <linux/ratelimit.h>
 +
 +/* needed for hotplug irq */
 +#include "nouveau_connector.h"
@@ -17304,6 +17309,14 @@ index 0000000..39b9f51
 +		nouveau_graph_dump_trap_info(dev, "PGRAPH_NOTIFY", &trap);
 +}
 +
++static DEFINE_RATELIMIT_STATE(nouveau_ratelimit_state, 3 * HZ, 20);
++
++static int nouveau_ratelimit(void)
++{
++	return __ratelimit(&nouveau_ratelimit_state);
++}
++
++
 +static inline void
 +nouveau_pgraph_intr_error(struct drm_device *dev, uint32_t nsource)
 +{
@@ -17320,7 +17333,7 @@ index 0000000..39b9f51
 +		unhandled = 1;
 +	}
 +
-+	if (unhandled)
++	if (unhandled && nouveau_ratelimit())
 +		nouveau_graph_dump_trap_info(dev, "PGRAPH_ERROR", &trap);
 +}
 +
@@ -30022,10 +30035,10 @@ index 0000000..b4f19cc
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
 new file mode 100644
-index 0000000..9b5e03a
+index 0000000..76c6f21
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv40_graph.c
-@@ -0,0 +1,2239 @@
+@@ -0,0 +1,2240 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -32254,6 +32267,7 @@ index 0000000..9b5e03a
 +	{ 0x0089, false, NULL }, /* sifm */
 +	{ 0x3089, false, NULL }, /* sifm (nv40) */
 +	{ 0x0062, false, NULL }, /* surf2d */
++	{ 0x3062, false, NULL }, /* surf2d (nv40) */
 +	{ 0x0043, false, NULL }, /* rop */
 +	{ 0x0012, false, NULL }, /* beta1 */
 +	{ 0x0072, false, NULL }, /* beta4 */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1949
retrieving revision 1.1950
diff -u -p -r1.1949 -r1.1950
--- kernel.spec	4 Dec 2009 04:48:59 -0000	1.1949
+++ kernel.spec	7 Dec 2009 06:11:39 -0000	1.1950
@@ -2167,6 +2167,10 @@ fi
 # and build.
 
 %changelog
+* Mon Dec 07 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-164
+- nouveau: fix NV17 breakage caused by NVA8 fixes
+- nouveau: use ratelimit for GPU error message
+
 * Fri Dec 04 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-163
 - nouveau: reduce debug level of some warning messages (rh#543883)
 - nouveau: modesetting fixes on nva5/nva8



From kasal at fedoraproject.org  Mon Dec  7 06:11:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:11:51 +0000 (UTC)
Subject: rpms/perl-Regexp-Shellish/devel perl-Regexp-Shellish.spec,1.5,1.6
Message-ID: <20091207061151.C9E5011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Regexp-Shellish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28228

Modified Files:
	perl-Regexp-Shellish.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Regexp-Shellish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Regexp-Shellish/devel/perl-Regexp-Shellish.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Regexp-Shellish.spec	26 Jul 2009 16:21:48 -0000	1.5
+++ perl-Regexp-Shellish.spec	7 Dec 2009 06:11:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Regexp-Shellish
 Version:        0.93
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Shell-like regular expressions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.93-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.93-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:12:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:12:07 +0000 (UTC)
Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec,1.20,1.21
Message-ID: <20091207061207.0E84011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Log-Dispatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28452

Modified Files:
	perl-Log-Dispatch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Log-Dispatch.spec	26 Jul 2009 09:01:19 -0000	1.20
+++ perl-Log-Dispatch.spec	7 Dec 2009 06:12:06 -0000	1.21
@@ -8,7 +8,7 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.22
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.22-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.22-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:13:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:13:05 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-File/devel
	perl-Catalyst-Plugin-Session-Store-File.spec, 1.7, 1.8
Message-ID: <20091207061305.A8C7D11C0264@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28822

Modified Files:
	perl-Catalyst-Plugin-Session-Store-File.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Session-Store-File.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel/perl-Catalyst-Plugin-Session-Store-File.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Catalyst-Plugin-Session-Store-File.spec	10 Oct 2009 08:02:09 -0000	1.7
+++ perl-Catalyst-Plugin-Session-Store-File.spec	7 Dec 2009 06:13:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session-Store-File
 Version:        0.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File storage backend for session data
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-2
+- rebuild against perl 5.10.1
+
 * Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.18-1
 - update to latest upstream version
 



From maxamillion at fedoraproject.org  Mon Dec  7 06:13:05 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 06:13:05 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.21,1.22
Message-ID: <20091207061305.96FB511C00EE@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28650

Modified Files:
	gnome-shell.spec 
Log Message:
Not sure why the autogen.sh isn't found, changing some stuff to test for scratch
builds. We need git so I can branch this and not attack peoples inboxes.




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-shell.spec	7 Dec 2009 05:44:04 -0000	1.21
+++ gnome-shell.spec	7 Dec 2009 06:13:05 -0000	1.22
@@ -74,11 +74,7 @@ easy to use experience.
 
 %build
 ## Needed to build the git tree
-/bin/sh $RPM_BUILD_ROOT/autogen.sh
-
-## Testing some shit
-pwd
-
+/bin/sh $RPM_BUILD_ROOT/gnome-shell/autogen.sh
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath



From kasal at fedoraproject.org  Mon Dec  7 06:13:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:13:34 +0000 (UTC)
Subject: rpms/perl-XML-Entities/devel perl-XML-Entities.spec,1.4,1.5
Message-ID: <20091207061334.8FDF611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Entities/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29142

Modified Files:
	perl-XML-Entities.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Entities.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Entities/devel/perl-XML-Entities.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-XML-Entities.spec	26 Jul 2009 17:33:03 -0000	1.4
+++ perl-XML-Entities.spec	7 Dec 2009 06:13:34 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:      perl-XML-Entities
 Version:   0.03
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Decode strings with XML entities
 
 Group:     Development/Libraries
@@ -69,6 +69,9 @@ make test
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:13:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:13:57 +0000 (UTC)
Subject: rpms/perl-Email-Date/devel perl-Email-Date.spec,1.8,1.9
Message-ID: <20091207061357.F223B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29314

Modified Files:
	perl-Email-Date.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Date/devel/perl-Email-Date.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Email-Date.spec	26 Jul 2009 05:47:36 -0000	1.8
+++ perl-Email-Date.spec	7 Dec 2009 06:13:57 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Email-Date
 Version:        1.103
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Find and format date headers
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.103-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.103-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:16:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:16:02 +0000 (UTC)
Subject: rpms/perl-Regexp-Copy/devel perl-Regexp-Copy.spec,1.3,1.4
Message-ID: <20091207061602.669C911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Regexp-Copy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29913

Modified Files:
	perl-Regexp-Copy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Regexp-Copy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Regexp-Copy/devel/perl-Regexp-Copy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Regexp-Copy.spec	26 Jul 2009 16:21:32 -0000	1.3
+++ perl-Regexp-Copy.spec	7 Dec 2009 06:16:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Regexp-Copy
 Version:        0.06
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Copy Regexp objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:17:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:17:04 +0000 (UTC)
Subject: rpms/perl-LockFile-Simple/devel perl-LockFile-Simple.spec,1.7,1.8
Message-ID: <20091207061704.F089411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-LockFile-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30255

Modified Files:
	perl-LockFile-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-LockFile-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-LockFile-Simple/devel/perl-LockFile-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-LockFile-Simple.spec	26 Jul 2009 09:01:04 -0000	1.7
+++ perl-LockFile-Simple.spec	7 Dec 2009 06:17:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-LockFile-Simple
 Version:        0.207
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple file locking scheme
 License:        GPLv2+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.207-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.207-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:18:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:18:01 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel
	perl-Catalyst-Plugin-Session-Store-FastMmap.spec, 1.8, 1.9
Message-ID: <20091207061801.4ABC011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30616

Modified Files:
	perl-Catalyst-Plugin-Session-Store-FastMmap.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Session-Store-FastMmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel/perl-Catalyst-Plugin-Session-Store-FastMmap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Catalyst-Plugin-Session-Store-FastMmap.spec	18 Oct 2009 08:42:02 -0000	1.8
+++ perl-Catalyst-Plugin-Session-Store-FastMmap.spec	7 Dec 2009 06:18:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session-Store-FastMmap
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FastMmap session storage backend
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-2
+- rebuild against perl 5.10.1
+
 * Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.12-1
 - update to latest upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 06:17:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:17:56 +0000 (UTC)
Subject: rpms/perl-XML-DOM-XPath/devel perl-XML-DOM-XPath.spec,1.6,1.7
Message-ID: <20091207061756.27F9211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-DOM-XPath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30566

Modified Files:
	perl-XML-DOM-XPath.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-DOM-XPath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-DOM-XPath/devel/perl-XML-DOM-XPath.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-XML-DOM-XPath.spec	26 Jul 2009 17:32:31 -0000	1.6
+++ perl-XML-DOM-XPath.spec	7 Dec 2009 06:17:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-XML-DOM-XPath
 Version:        0.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension to add XPath support to XML::DOM, using XML::XPath engine
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:18:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:18:41 +0000 (UTC)
Subject: rpms/perl-Email-Address/devel perl-Email-Address.spec,1.18,1.19
Message-ID: <20091207061841.8E12311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Address/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31077

Modified Files:
	perl-Email-Address.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-Email-Address.spec	26 Jul 2009 05:47:19 -0000	1.18
+++ perl-Email-Address.spec	7 Dec 2009 06:18:41 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Email-Address
 Version:        1.889
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.889-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.889-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:19:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:19:51 +0000 (UTC)
Subject: rpms/perl-Regexp-Common/devel perl-Regexp-Common.spec,1.10,1.11
Message-ID: <20091207061951.DAC9611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Regexp-Common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31564

Modified Files:
	perl-Regexp-Common.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Regexp-Common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Regexp-Common/devel/perl-Regexp-Common.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Regexp-Common.spec	26 Jul 2009 16:21:17 -0000	1.10
+++ perl-Regexp-Common.spec	7 Dec 2009 06:19:51 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		perl-Regexp-Common
 Version: 	2.122
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Regexp::Common Perl module
 # Old Artistic 1.0 is also valid, but we won't list it here since it is non-free.
 # Also, it would throw off the automated license check and flag this package.
@@ -44,6 +44,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.122-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.122-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:21:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:21:07 +0000 (UTC)
Subject: rpms/perl-local-lib/devel perl-local-lib.spec,1.8,1.9
Message-ID: <20091207062107.60DFE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-local-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32000

Modified Files:
	perl-local-lib.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-local-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-local-lib/devel/perl-local-lib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-local-lib.spec	19 Sep 2009 21:46:40 -0000	1.8
+++ perl-local-lib.spec	7 Dec 2009 06:21:06 -0000	1.9
@@ -1,6 +1,6 @@
 Name:       perl-local-lib
 Version:    1.004007
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/local/lib.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.004007-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004007-1
 - auto-update to 1.004007 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 06:22:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:22:28 +0000 (UTC)
Subject: rpms/perl-XML-DOM/devel perl-XML-DOM.spec,1.8,1.9
Message-ID: <20091207062228.8823611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-DOM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32455

Modified Files:
	perl-XML-DOM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-DOM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-DOM/devel/perl-XML-DOM.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-XML-DOM.spec	26 Jul 2009 17:32:17 -0000	1.8
+++ perl-XML-DOM.spec	7 Dec 2009 06:22:28 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-XML-DOM
 Version:        1.44
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        DOM extension to XML::Parser
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.44-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.44-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:22:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:22:42 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel
	perl-Catalyst-Plugin-Session-Store-Cache.spec, 1.1, 1.2
Message-ID: <20091207062242.4088D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32636

Modified Files:
	perl-Catalyst-Plugin-Session-Store-Cache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Session-Store-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel/perl-Catalyst-Plugin-Session-Store-Cache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Catalyst-Plugin-Session-Store-Cache.spec	5 Aug 2009 14:32:23 -0000	1.1
+++ perl-Catalyst-Plugin-Session-Store-Cache.spec	7 Dec 2009 06:22:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session-Store-Cache
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Store sessions using a Catalyst::Plugin::Cache
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,5 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-2
+- rebuild against perl 5.10.1
+
 * Fri Jul 31 2009 Iain Arnell 0.01-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 06:22:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:22:51 +0000 (UTC)
Subject: rpms/perl-Email-Abstract/devel perl-Email-Abstract.spec,1.8,1.9
Message-ID: <20091207062251.E2E2611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Email-Abstract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv308

Modified Files:
	perl-Email-Abstract.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Email-Abstract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Abstract/devel/perl-Email-Abstract.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Email-Abstract.spec	26 Jul 2009 05:47:02 -0000	1.8
+++ perl-Email-Abstract.spec	7 Dec 2009 06:22:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Email-Abstract
 Version:        3.001
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Unified interface to mail representations
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.001-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.001-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:24:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:24:41 +0000 (UTC)
Subject: rpms/perl-Regexp-Assemble/devel perl-Regexp-Assemble.spec,1.3,1.4
Message-ID: <20091207062441.D827111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Regexp-Assemble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv927

Modified Files:
	perl-Regexp-Assemble.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Regexp-Assemble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Regexp-Assemble/devel/perl-Regexp-Assemble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Regexp-Assemble.spec	26 Jul 2009 16:21:01 -0000	1.3
+++ perl-Regexp-Assemble.spec	7 Dec 2009 06:24:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Regexp-Assemble
 Version:        0.34
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Assemble multiple Regular Expressions into a single RE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.34-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:25:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:25:51 +0000 (UTC)
Subject: rpms/perl-Locale-SubCountry/devel perl-Locale-SubCountry.spec, 1.9, 
	1.10
Message-ID: <20091207062551.6E5E711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Locale-SubCountry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1366

Modified Files:
	perl-Locale-SubCountry.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Locale-SubCountry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-SubCountry/devel/perl-Locale-SubCountry.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Locale-SubCountry.spec	26 Jul 2009 09:00:50 -0000	1.9
+++ perl-Locale-SubCountry.spec	7 Dec 2009 06:25:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Locale-SubCountry
 Version:        1.41
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        ISO 3166-2 two letter subcountry codes
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.41-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.41-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:27:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:27:24 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-URI/devel
	perl-Catalyst-Plugin-Session-State-URI.spec, 1.8, 1.9
Message-ID: <20091207062724.D21C811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1951

Modified Files:
	perl-Catalyst-Plugin-Session-State-URI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Session-State-URI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/perl-Catalyst-Plugin-Session-State-URI.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Catalyst-Plugin-Session-State-URI.spec	18 Oct 2009 08:48:10 -0000	1.8
+++ perl-Catalyst-Plugin-Session-State-URI.spec	7 Dec 2009 06:27:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session-State-URI
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Saves session IDs by rewriting URIs delivered to the client
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.13-1
 - update to latest upstream version
 - update BRs for tests



From kasal at fedoraproject.org  Mon Dec  7 06:27:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:27:44 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch-Structured/devel
	perl-Directory-Scratch-Structured.spec, 1.3, 1.4
Message-ID: <20091207062744.B530311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Directory-Scratch-Structured/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2138

Modified Files:
	perl-Directory-Scratch-Structured.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Directory-Scratch-Structured.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Directory-Scratch-Structured/devel/perl-Directory-Scratch-Structured.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Directory-Scratch-Structured.spec	26 Jul 2009 05:46:46 -0000	1.3
+++ perl-Directory-Scratch-Structured.spec	7 Dec 2009 06:27:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-Directory-Scratch-Structured 
 Version:    0.04
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/Directory/Scratch/Structured.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:27:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:27:49 +0000 (UTC)
Subject: rpms/perl-XML-Atom-SimpleFeed/devel perl-XML-Atom-SimpleFeed.spec,
	1.6, 1.7
Message-ID: <20091207062749.E4DE411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Atom-SimpleFeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2191

Modified Files:
	perl-XML-Atom-SimpleFeed.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Atom-SimpleFeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Atom-SimpleFeed/devel/perl-XML-Atom-SimpleFeed.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-XML-Atom-SimpleFeed.spec	7 Sep 2009 09:48:40 -0000	1.6
+++ perl-XML-Atom-SimpleFeed.spec	7 Dec 2009 06:27:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-XML-Atom-SimpleFeed
 Version:        0.86
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        No-fuss generation of Atom syndication feeds
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.86-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.86-1
 - New upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 06:29:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:29:34 +0000 (UTC)
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.18,1.19
Message-ID: <20091207062934.F2AF811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Readonly-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2881

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-Readonly-XS.spec	26 Jul 2009 16:20:45 -0000	1.18
+++ perl-Readonly-XS.spec	7 Dec 2009 06:29:34 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Companion module for Readonly
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:31:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:31:21 +0000 (UTC)
Subject: rpms/perl-Locale-PO/devel perl-Locale-PO.spec,1.2,1.3
Message-ID: <20091207063121.8241911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Locale-PO/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3535

Modified Files:
	perl-Locale-PO.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Locale-PO.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-PO/devel/perl-Locale-PO.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Locale-PO.spec	26 Jul 2009 09:00:29 -0000	1.2
+++ perl-Locale-PO.spec	7 Dec 2009 06:31:21 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Locale-PO
 Version:        0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for manipulating .po entries from GNU gettext
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.21-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:31:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:31:59 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel
	perl-Catalyst-Plugin-Session-State-Cookie.spec, 1.10, 1.11
Message-ID: <20091207063159.9521611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3821

Modified Files:
	perl-Catalyst-Plugin-Session-State-Cookie.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Session-State-Cookie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/perl-Catalyst-Plugin-Session-State-Cookie.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Catalyst-Plugin-Session-State-Cookie.spec	6 Dec 2009 03:23:17 -0000	1.10
+++ perl-Catalyst-Plugin-Session-State-Cookie.spec	7 Dec 2009 06:31:59 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session-State-Cookie
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maintain session IDs using cookies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.17-2
+- rebuild against perl 5.10.1
+
 * Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.17-1
 - auto-update to 0.17 (by cpan-spec-update 0.01)
 - altered br on perl(Catalyst::Plugin::Session) (0.19 => 0.27)



From kasal at fedoraproject.org  Mon Dec  7 06:32:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:32:28 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch/devel perl-Directory-Scratch.spec, 1.3, 
	1.4
Message-ID: <20091207063228.2A62611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Directory-Scratch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4101

Modified Files:
	perl-Directory-Scratch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Directory-Scratch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Directory-Scratch/devel/perl-Directory-Scratch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Directory-Scratch.spec	26 Jul 2009 05:46:30 -0000	1.3
+++ perl-Directory-Scratch.spec	7 Dec 2009 06:32:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-Directory-Scratch 
 Version:    0.14 
-Release:    4%{?dist}
+Release:    5%{?dist}
 # see lib/Directory/Scratch.pm (perl)
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:32:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:32:29 +0000 (UTC)
Subject: rpms/perl-XML-Atom/devel perl-XML-Atom.spec,1.2,1.3
Message-ID: <20091207063229.D340511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-XML-Atom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4122

Modified Files:
	perl-XML-Atom.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-XML-Atom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Atom/devel/perl-XML-Atom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-XML-Atom.spec	26 Jul 2009 17:31:31 -0000	1.2
+++ perl-XML-Atom.spec	7 Dec 2009 06:32:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-Atom
 Version:        0.35
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Atom feed and API implementation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.35-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:34:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:34:07 +0000 (UTC)
Subject: rpms/perl-Readonly/devel perl-Readonly.spec,1.9,1.10
Message-ID: <20091207063407.5FD7211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Readonly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4759

Modified Files:
	perl-Readonly.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Readonly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Readonly/devel/perl-Readonly.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Readonly.spec	26 Jul 2009 16:20:30 -0000	1.9
+++ perl-Readonly.spec	7 Dec 2009 06:34:07 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Readonly
 Version:        1.03
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Facility for creating read-only scalars, arrays, hashes
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:35:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:35:38 +0000 (UTC)
Subject: rpms/perl-Locale-Msgfmt/devel perl-Locale-Msgfmt.spec,1.1,1.2
Message-ID: <20091207063538.BF59311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Locale-Msgfmt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5278

Modified Files:
	perl-Locale-Msgfmt.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Locale-Msgfmt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Msgfmt/devel/perl-Locale-Msgfmt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Locale-Msgfmt.spec	18 Aug 2009 05:57:34 -0000	1.1
+++ perl-Locale-Msgfmt.spec	7 Dec 2009 06:35:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Msgfmt
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Compile .po files to .mo files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,5 +47,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-2
+- rebuild against perl 5.10.1
+
 * Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.14-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 06:36:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:36:29 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session/devel
	perl-Catalyst-Plugin-Session.spec, 1.10, 1.11
Message-ID: <20091207063629.59C5311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5622

Modified Files:
	perl-Catalyst-Plugin-Session.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session/devel/perl-Catalyst-Plugin-Session.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Catalyst-Plugin-Session.spec	6 Dec 2009 03:25:49 -0000	1.10
+++ perl-Catalyst-Plugin-Session.spec	7 Dec 2009 06:36:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session
 Version:        0.29
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Catalyst generic session plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.29-2
+- rebuild against perl 5.10.1
+
 * Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.29-1
 - auto-update to 0.29 (by cpan-spec-update 0.01)
 - added a new req on perl(Test::More) (version 0)



From kasal at fedoraproject.org  Mon Dec  7 06:36:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:36:59 +0000 (UTC)
Subject: rpms/perl-Digest-SHA1/devel perl-Digest-SHA1.spec,1.23,1.24
Message-ID: <20091207063659.505E811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Digest-SHA1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5885

Modified Files:
	perl-Digest-SHA1.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Digest-SHA1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-SHA1/devel/perl-Digest-SHA1.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Digest-SHA1.spec	5 Oct 2009 16:50:04 -0000	1.23
+++ perl-Digest-SHA1.spec	7 Dec 2009 06:36:58 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-Digest-SHA1
 Version:        2.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Digest-SHA1 Perl module
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.12-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.12-1
 - new upstream version
 



From transif at fedoraproject.org  Mon Dec  7 06:37:41 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Dec 2009 06:37:41 +0000 (UTC)
Subject: comps/po gu.po,1.24,1.25
Message-ID: <20091207063741.BE77211C00EE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6278/po

Modified Files:
	gu.po 
Log Message:
Sending translation for Gujarati


Index: gu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/gu.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gu.po	1 Sep 2009 05:41:46 -0000	1.24
+++ gu.po	7 Dec 2009 06:37:41 -0000	1.25
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-01 02:22+0000\n"
-"PO-Revision-Date: 2009-09-01 11:10+0530\n"
+"POT-Creation-Date: 2009-12-07 02:16+0000\n"
+"PO-Revision-Date: 2009-12-07 12:06+0530\n"
 "Last-Translator: Sweta Kothari <swkothar at redhat.com>\n"
 "Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
@@ -170,163 +170,163 @@ msgid "Clustering Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "???????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "???????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "??????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "????????????-?????? ?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "?????? ????????????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "???????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "??????????????? ?????????????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "?????????????????? ????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "???????????????????????? (UK) ????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ???????????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "?????????????????? ??????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????? ?????? ???????????? ?????????????????? ???????????? ?????????????????? ??????????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -335,19 +335,19 @@ msgstr ""
 "??????????????? ????????? ?????????????????? ???????????? ?????????????????? ?????? ????????? ???????????? ???????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "??????????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "??????????????? ???????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -356,170 +356,170 @@ msgstr ""
 "????????? ????????????????????????????????? ???????????? ?????????????????????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "???????????? ????????? ?????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "????????????????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "???????????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+ ????????? ??????????????? ????????????????????????????????? ???????????????????????????????????? ??????????????? ???????????? ???????????? ??? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ????????? XFCE ????????????????????????????????? ?????????????????????????????? ???????????????????????? ???????????? ??? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????????? KDE ????????????????????????????????? ?????????????????????????????? ???????????????????????? ???????????? ??? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "???????????????????????? ??????????????? ???????????? ???????????? ???????????? ??????????????? ??????????????? ????????? ???????????? ?????????????????? ???????????? ???????????? ??? ??????????????? ????????????????????? "
 "?????????."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "????????????????????? ???????????????????????????????????? (X) ?????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??? ??????????????? ?????????????????? ????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ?????????????????? Integrated Development Environments."
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????????????????? ????????????????????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE ???????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -528,142 +528,142 @@ msgstr ""
 "????????? ???????????????????????????????????? ???????????? ?????????????????????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "??????????????? ????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "??????????????? ???????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "??????????????? ?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "???????????? ?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ?????????????????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "?????????????????? ???????????????"
 
@@ -673,37 +673,37 @@ msgstr "?????????????????? ???????????? 
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "?????????????????? ???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "????????????/???????????????????????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "???????????? ?????????????????? ????????? ?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -711,55 +711,55 @@ msgstr "?????????????????? ?????? ??????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "?????????????????? ????????????"
 
@@ -773,73 +773,73 @@ msgstr "SUGAR ??? OLPC XO ???????????? ?
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "??????????????? ????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "???????????? ?????????????????? ????????????????????????????????? ?????? ?????? ???????????? ???????????????????????? ?????????????????????????????? ????????? ?????????."
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "????????????????????? ???????????? ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "????????????????????? ?????????????????? ?????????????????? ???????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -849,127 +849,127 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "??????????????? ????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "????????????????????? ?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "????????????????????? ???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ????????????????????? ?????????????????? ?????????????????????????????? ?????????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "???????????? ?????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "?????????????????????????????? ?????????????????? ??????????????????, PDF ?????????????????? ????????? ????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??? ?????????????????? ?????????????????? ?????????????????? ??? ????????? ?????????????????????????????? ?????? ?????? ?????? ?????????????????????????????? ???????????????????????? ???????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "??? ?????????????????? ???????????? IMAP ???????????? SMTP ???????????? ??????????????? ????????????????????????????????? ???????????? ???????????? ????????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??? ?????????????????? ???????????? X ?????????????????? ???????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ?????????????????? ?????????????????? ????????? ?????????????????????????????? ?????? ????????? ?????????????????? ????????????????????? ??????????????? ????????? ?????????????????? ?????????????????? ??????."
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? ?????????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????? DHCP, ????????????????????? ????????? NIS ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -977,19 +977,19 @@ msgstr "??? ?????????????????? ?????????
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "??? ?????????????????? ????????????????????????????????????????????? ???????????????????????? ??????????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? ?????????????????? ???????????????????????? ???????????????????????? ???????????? ???????????????????????? ???????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -997,7 +997,7 @@ msgstr "??? ?????????????????? ?????????
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1007,19 +1007,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ??????????????? ???????????? ?????????????????? ?????? ????????? ?????????????????? ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ??????????????? ???????????? ?????????????????? ?????? FTP ??????????????? ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1029,19 +1029,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "??? ????????? ???????????? ?????????????????? ??????????????? ??????????????? ????????????????????????????????? ?????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??? ????????? Red Hat ?????? ????????????????????? ??????????????????????????? ????????? ??????????????? ??????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1051,13 +1051,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ????????? ???????????????????????????????????? ???-????????????, ????????? ????????? ??????????????? ??????????????????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1067,13 +1067,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??? ????????? ?????????????????? ???????????? ????????? ?????????????????? ???????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1093,19 +1093,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ????????? ??? ?????????????????????????????? ????????????????????????????????? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ????????? ??? ??????????????? ???????????????????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1115,13 +1115,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "??? ???????????????????????? ????????? ???????????? ?????????????????? ?????? DNS ????????? ???????????? (BIND) ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1129,163 +1129,163 @@ msgstr "??? ????????? ???????????? ?????
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "??? ??????????????? ????????? MySQL ???????????? ?????????????????? ?????????????????? ??????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??? ??????????????? ????????? Postgresql ???????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "?????????????????? ??????????????? ????????????????????? ?????????????????? ??????????????????????????? ???????????? ??????????????? ????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "???????????????????????? ??????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????? ???????????? ????????? ??????????????? ????????? ???????????????????????? ????????? ????????? ?????????????????? ??????."
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "?????????????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "????????????????????? ???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ???????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ???????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "???????????? ????????????"
 
@@ -1299,67 +1299,67 @@ msgid "Haskell Development"
 msgstr "Haskell ???????????????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "??????????????? ?????????????????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????? ????????????????????? ??????????????? ???????????? ??????????????? ?????????????????? ??????????????????."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (??????????????????) ????????????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ???????????????"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ???????????????????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ???????????????????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "??????????????? ????????????"
 
@@ -1375,115 +1375,117 @@ msgstr "Azerbaijani ????????????"
 msgid "Chichewa Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "???????????????????????? ?????????????????? ???????????? ???????????? ????????? ?????????????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "???????????????????????????????????? ?????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "?????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "??????????????? ???????????? ????????? ????????????????????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "???????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "?????????????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "??????????????????????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "???????????? ????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "??????????????????????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "Luxembourgish ????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW ???????????????-????????????????????????"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "?????????????????? ????????? ????????? ????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "???????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1492,36 +1494,36 @@ msgstr ""
 "??????, ????????? ??????????????????????????? ??????????????? ????????? ??????????????? ??????, Fedora ??????????????? ?????????."
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "Objective CAML ???????????????????????????????????? ???????????? ????????? ???????????????????????????????????? ??????????????? ???????????????????????? ???????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "????????????, ????????????????????????, ???????????????????????????, ????????? ??????????????????????????? ???????????????????????? ????????? ??? ????????? ??? ????????????????????? ????????????????????? ?????????????????? ??????."
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "????????? ???????????????????????? ????????????"
 
@@ -1535,7 +1537,9 @@ msgstr "???????????????????????? ???????
 msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
-msgstr "???????????????????????? ???????????? ?????? ?????? ????????? Fedora ?????????????????? ?????? ???????????? ????????? ????????????????????????????????? ???????????? ??????????????????????????? ?????????????????????????????? ???????????? ???????????? ??????"
+msgstr ""
+"???????????????????????? ???????????? ?????? ?????? ????????? Fedora ?????????????????? ?????? ???????????? ????????? ????????????????????????????????? ???????????? ??????????????????????????? ?????????????????????????????? ???????????? "
+"???????????? ??????"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1545,23 +1549,23 @@ msgstr "?????????????????? ????????? ???
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ????????????????????????????????? ????????? ????????????????????????????????? ???????????? ?????????????????? ????????? ???????????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "???????????? ????????? (????????????)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "???????????? ????????? (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "??????????????????????????? ???????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
@@ -1569,27 +1573,35 @@ msgstr ""
 "LXDE ??? ???????????? ???????????????????????? ?????????????????????????????? ???????????? ?????? ?????????????????????, ?????????????????? ?????????????????? ???????????? ???????????? ?????????????????????????????? ???????????? "
 "?????????????????????????????? ???????????? ????????? ?????????????????? X11 ???????????????????????? ???????????????????????? ???????????? ???????????? ??????."
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "???????????? ????????? ?????????????????????????????? ????????? ??????????????????."
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Moblin ???????????????????????? ????????????????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "Moblin ??? NetBook/NetTop/MID ?????????????????? ???????????? ???????????????????????? ???????????????????????? ??????."
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "????????????????????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "???????????? ????????? ???????????? ????????? ????????????????????????."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????????????? ???????????????????????? ????????????????????? ?????????????????? ??????????????????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "?????????????????? ??????????????????????????? ????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1597,7 +1609,7 @@ msgstr ""
 "??????????????? ??? ???????????????????????????, ???????????????????????????????????? ?????????????????????????????? ???????????????????????? ?????? ?????? ?????? ????????????, ????????????????????????, ?????????????????? ?????????????????? "
 "????????? ????????????????????????????????? ???????????? ?????????????????????????????? ??????????????? ??????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1605,7 +1617,7 @@ msgstr ""
 "KDE ??? ???????????????????????????, ???????????????????????????????????? ?????????????????????????????? ???????????????????????? ?????? ?????? ?????? ????????????, ????????????????????????, ?????????????????? ??????????????????, "
 "????????? ???????????????????????????????????? ???????????? ?????????????????????????????? ??????????????? ??????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1613,11 +1625,11 @@ msgstr ""
 "???????????? ???????????? ???????????? ????????????????????? ??????????????? ??????????????? ??????, ??? ?????????????????????????????? ???????????? ??????????????? ???????????????????????? ????????? ?????????????????? "
 "?????????????????? ????????????????????? ????????? ??????. ??? Emacs ????????? Vi ??????????????????????????? ?????? ??????????????? ??????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "XEmacs ???????????? ??????????????????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1625,27 +1637,27 @@ msgstr ""
 "??? ??????????????? ???????????? ?????????????????? ??????????????????????????? ???????????????????????????????????? ???????????????????????? ????????? ??????????????? HTML, PDF, ?????????????????????????????????????????? "
 "????????? ????????????????????? ???????????????????????? ????????????????????? ????????? ??????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?????????????????? ??????????????? ???????????? ??? ????????? ??? ????????????????????? ???????????????????????? ???????????? ??????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 



From tagoh at fedoraproject.org  Mon Dec  7 06:37:59 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon,  7 Dec 2009 06:37:59 +0000 (UTC)
Subject: rpms/vlgothic-fonts/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 vlgothic-fontconfig-gothic.conf, 1.1,
	1.2 vlgothic-fontconfig-pgothic.conf, 1.1,
	1.2 vlgothic-fonts.spec, 1.6, 1.7
Message-ID: <20091207063759.6805211C00EE@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/vlgothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6396

Modified Files:
	.cvsignore sources vlgothic-fontconfig-gothic.conf 
	vlgothic-fontconfig-pgothic.conf vlgothic-fonts.spec 
Log Message:
* Mon Dec  7 2009 Akira TAGOH <tagoh at redhat.com> - 20091202-1
- New upstream release.
- Set the priority to 65 for vlgothic-p-fonts to override the rule in
  vlgothic-fonts for sans-serif.
- Set the priority to 66 and contains both rules for sans-serif and monospace
  to avoid picking up the unrelated fonts in Live. where doesn't have
  vlgothic-p-fonts installed. (#544957)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Jun 2009 11:21:07 -0000	1.4
+++ .cvsignore	7 Dec 2009 06:37:58 -0000	1.5
@@ -1,3 +1,4 @@
 VLGothic-20090204.tar.bz2
 VLGothic-20090422.tar.bz2
 VLGothic-20090612.tar.bz2
+VLGothic-20091202.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Jun 2009 11:21:08 -0000	1.4
+++ sources	7 Dec 2009 06:37:58 -0000	1.5
@@ -1 +1 @@
-2ae45ffcaf4fd75331eb582cfee6cc54  VLGothic-20090612.tar.bz2
+db66b71975c6ffc54ca37f0d13451e0a  VLGothic-20091202.tar.bz2


Index: vlgothic-fontconfig-gothic.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/vlgothic-fontconfig-gothic.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vlgothic-fontconfig-gothic.conf	10 Feb 2009 11:48:21 -0000	1.1
+++ vlgothic-fontconfig-gothic.conf	7 Dec 2009 06:37:59 -0000	1.2
@@ -1,38 +1,51 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-    <match target="font">
+    <!-- Generic names rule -->
+    <alias>
+        <family>VL Gothic</family>
+        <default>
+            <family>monospace</family>
+        </default>
+    </alias>
+    <!-- NOTE: just for fallback - ideally better installing vlgothic-p-fonts -->
+    <alias>
+        <family>VL Gothic</family>
+        <default>
+            <family>sans-serif</family>
+        </default>
+    </alias>
+    <!-- Locale-specific overrides rule -->
+    <match>
+        <test name="lang">
+            <string>ja-jp</string>
+        </test>
         <test name="family">
-            <string>VL Gothic</string>
+            <string>monospace</string>
         </test>
-        <edit name="hinting" mode="assign">
-            <bool>false</bool>
+        <edit name="family" mode="prepend" binding="same">
+            <string>VL Gothic</string>
         </edit>
     </match>
-    
+    <!-- NOTE: just for fallback - ideally better installing vlgothic-p-fonts -->
     <match>
         <test name="lang">
             <string>ja-jp</string>
         </test>
         <test name="family">
-            <string>monospace</string>
+            <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="same">
             <string>VL Gothic</string>
         </edit>
     </match>
-
-    <alias>
-        <family>monospace</family>
-        <prefer>
-            <family>VL Gothic</family>
-        </prefer>
-    </alias>
-
-    <alias>
-        <family>VL Gothic</family>
-        <default>
-            <family>monospace</family>
-        </default>
-    </alias>
+    <!-- disabling hinting rule -->
+    <match target="font">
+        <test name="family">
+            <string>VL Gothic</string>
+        </test>
+        <edit name="hinting" mode="assign">
+            <bool>false</bool>
+        </edit>
+    </match>
 </fontconfig>


Index: vlgothic-fontconfig-pgothic.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/devel/vlgothic-fontconfig-pgothic.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vlgothic-fontconfig-pgothic.conf	10 Feb 2009 11:48:21 -0000	1.1
+++ vlgothic-fontconfig-pgothic.conf	7 Dec 2009 06:37:59 -0000	1.2
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-    <match target="font">
-        <test name="family">
-            <string>VL PGothic</string>
-        </test>
-        <edit name="hinting" mode="assign">
-            <bool>false</bool>
-        </edit>
-    </match>
-
+    <!-- Generic names rule -->
+    <alias>
+        <family>VL PGothic</family>
+        <default>
+            <family>sans-serif</family>
+        </default>
+    </alias>
+    <!-- Locale-specific overrides rule -->
     <match>
         <test name="lang">
             <string>ja-jp</string>
@@ -21,18 +20,13 @@
             <string>VL PGothic</string>
         </edit>
     </match>
-
-    <alias>
-        <family>sans-serif</family>
-        <prefer>
-            <family>VL PGothic</family>
-        </prefer>
-    </alias>
-
-    <alias>
-        <family>VL PGothic</family>
-        <default>
-            <family>sans-serif</family>
-        </default>
-    </alias>
+    <!-- disabling hinting rule -->
+    <match target="font">
+        <test name="family">
+            <string>VL PGothic</string>
+        </test>
+        <edit name="hinting" mode="assign">
+            <bool>false</bool>
+        </edit>
+    </match>
 </fontconfig>


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 -p -r1.6 -r1.7
--- vlgothic-fonts.spec	27 Jul 2009 06:56:34 -0000	1.6
+++ vlgothic-fonts.spec	7 Dec 2009 06:37:59 -0000	1.7
@@ -1,21 +1,23 @@
 %define priority	66
+%define ppriority	65
 %define fontname	vlgothic
 %define	archivename	VLGothic-%{version}
-%define	fontconf	%{priority}-%{fontname}
+%define	fontconf	%{priority}-%{fontname}-gothic
+%define	pfontconf	%{ppriority}-%{fontname}-pgothic
 %define	common_desc	\
 VLGothic provides Japanese TrueType fonts from the Vine Linux project.\
 Most of the glyphs are taken from the M+ and Sazanami Gothic fonts,\
 but some have also been improved by the project.
 
 Name:		%{fontname}-fonts
-Version:	20090612
-Release:	2%{?dist}
+Version:	20091202
+Release:	1%{?dist}
 Summary:	Japanese TrueType font
 
 License:	mplus and BSD
 Group:		User Interface/X
 URL:		http://dicey.org/vlgothic
-Source0:	http://osdn.dl.sourceforge.jp/vlgothic/40480/%{archivename}.tar.bz2
+Source0:	http://osdn.dl.sourceforge.jp/vlgothic/44715/%{archivename}.tar.bz2
 Source1:	%{fontname}-fontconfig-pgothic.conf
 Source2:	%{fontname}-fontconfig-gothic.conf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,10 +72,10 @@ install -m 0644 -p *.ttf $RPM_BUILD_ROOT
 install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir} \
 	 		$RPM_BUILD_ROOT%{_fontconfig_confdir}
 
-install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}-pgothic.conf
-install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}-gothic.conf
+install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{pfontconf}.conf
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}.conf
 
-for fconf in %{fontconf}-pgothic.conf %{fontconf}-gothic.conf; do
+for fconf in %{pfontconf}.conf %{fontconf}.conf; do
 	ln -s %{_fontconfig_templatedir}/$fconf $RPM_BUILD_ROOT%{_fontconfig_confdir}/$fconf
 done
 
@@ -87,12 +89,20 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc README* LICENSE*
 %dir %{_fontdir}
 
-%_font_pkg -f %{fontconf}-gothic.conf VL-Gothic-Regular.ttf
+%_font_pkg -f %{fontconf}.conf VL-Gothic-Regular.ttf
 
-%_font_pkg -n p -f %{fontconf}-pgothic.conf VL-PGothic-Regular.ttf
+%_font_pkg -n p -f %{pfontconf}.conf VL-PGothic-Regular.ttf
 
 
 %changelog
+* Mon Dec  7 2009 Akira TAGOH <tagoh at redhat.com> - 20091202-1
+- New upstream release.
+- Set the priority to 65 for vlgothic-p-fonts to override the rule in
+  vlgothic-fonts for sans-serif.
+- Set the priority to 66 and contains both rules for sans-serif and monospace
+  to avoid picking up the unrelated fonts in Live. where doesn't have
+  vlgothic-p-fonts installed. (#544957)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090612-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:38:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:38:34 +0000 (UTC)
Subject: rpms/perl-Razor-Agent/devel perl-Razor-Agent.spec,1.22,1.23
Message-ID: <20091207063834.B031411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Razor-Agent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6676

Modified Files:
	perl-Razor-Agent.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Razor-Agent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Razor-Agent.spec	2 Nov 2009 03:37:20 -0000	1.22
+++ perl-Razor-Agent.spec	7 Dec 2009 06:38:34 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	Use a Razor catalogue server to filter spam messages
 Name:		perl-Razor-Agent
 Version:	2.85
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	Artistic 2.0
 Group:		Applications/Internet
 URL:		http://razor.sourceforge.net/
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.85-5
+- rebuild against perl 5.10.1
+
 * Sun Nov 01 2009 Warren Togami <wtogami at redhat.com> - 2.85-4
 - Use Digest::SHA instead of Digest::SHA1
 



From kasal at fedoraproject.org  Mon Dec  7 06:38:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:38:33 +0000 (UTC)
Subject: rpms/perl-X11-Protocol/devel perl-X11-Protocol.spec,1.9,1.10
Message-ID: <20091207063833.99FAA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-X11-Protocol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6659

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-X11-Protocol/devel/perl-X11-Protocol.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-X11-Protocol.spec	26 Jul 2009 17:31:15 -0000	1.9
+++ perl-X11-Protocol.spec	7 Dec 2009 06:38:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.56
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.56-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.56-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:39:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:39:47 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon.spec, 1.25, 1.26
Message-ID: <20091207063947.3164B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7269

Modified Files:
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
- rebuild against perl 5.10.1


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.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-Locale-Maketext-Lexicon.spec	26 Jul 2009 09:00:13 -0000	1.25
+++ perl-Locale-Maketext-Lexicon.spec	7 Dec 2009 06:39:46 -0000	1.26
@@ -1,6 +1,6 @@
 Name: 		perl-Locale-Maketext-Lexicon
 Version: 	0.77
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Extract translatable strings from source
 License:	MIT
 Group: 		Development/Libraries
@@ -82,6 +82,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.77-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.77-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:42:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:42:34 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-PageCache/devel
	perl-Catalyst-Plugin-PageCache.spec, 1.1, 1.2
Message-ID: <20091207064234.1159211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8252

Modified Files:
	perl-Catalyst-Plugin-PageCache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-PageCache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/devel/perl-Catalyst-Plugin-PageCache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Catalyst-Plugin-PageCache.spec	5 Aug 2009 14:29:49 -0000	1.1
+++ perl-Catalyst-Plugin-PageCache.spec	7 Dec 2009 06:42:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-PageCache
 Version:        0.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cache the output of entire pages
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,5 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-2
+- rebuild against perl 5.10.1
+
 * Sun Jul 19 2009 Iain Arnell 0.22-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 06:42:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:42:28 +0000 (UTC)
Subject: rpms/perl-Digest-Nilsimsa/devel perl-Digest-Nilsimsa.spec, 1.15,
	1.16
Message-ID: <20091207064228.2509E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Digest-Nilsimsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8184

Modified Files:
	perl-Digest-Nilsimsa.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Digest-Nilsimsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-Nilsimsa/devel/perl-Digest-Nilsimsa.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Digest-Nilsimsa.spec	26 Jul 2009 05:45:59 -0000	1.15
+++ perl-Digest-Nilsimsa.spec	7 Dec 2009 06:42:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Digest-Nilsimsa
 Version:        0.06
-Release:        12%{?dist}
+Release:        13%{?dist}
 
 Summary:        Perl interface to the Nilsima Algorithm
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-13
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:43:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:43:08 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-ProcessStream/devel
	perl-Wx-Perl-ProcessStream.spec, 1.3, 1.4
Message-ID: <20091207064308.6561711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Wx-Perl-ProcessStream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8612

Modified Files:
	perl-Wx-Perl-ProcessStream.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Wx-Perl-ProcessStream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-ProcessStream/devel/perl-Wx-Perl-ProcessStream.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Wx-Perl-ProcessStream.spec	26 Jul 2009 17:30:57 -0000	1.3
+++ perl-Wx-Perl-ProcessStream.spec	7 Dec 2009 06:43:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Wx-Perl-ProcessStream
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Access IO of external processes via events
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:43:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:43:22 +0000 (UTC)
Subject: rpms/perl-QWizard/devel perl-QWizard.spec,1.8,1.9
Message-ID: <20091207064322.0CDBC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-QWizard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8803

Modified Files:
	perl-QWizard.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-QWizard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-QWizard/devel/perl-QWizard.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-QWizard.spec	26 Jul 2009 16:18:44 -0000	1.8
+++ perl-QWizard.spec	7 Dec 2009 06:43:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-QWizard
 Version:        3.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A very portable graphical question and answer wizard system
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.15-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:43:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:43:46 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Gettext/devel
	perl-Locale-Maketext-Gettext.spec, 1.1, 1.2
Message-ID: <20091207064346.6C55211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9026

Modified Files:
	perl-Locale-Maketext-Gettext.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Locale-Maketext-Gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Gettext/devel/perl-Locale-Maketext-Gettext.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Locale-Maketext-Gettext.spec	25 Sep 2009 20:30:47 -0000	1.1
+++ perl-Locale-Maketext-Gettext.spec	7 Dec 2009 06:43:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Gettext
 Version:        1.27
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Joins the gettext and Maketext frameworks
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.27-3
+- rebuild against perl 5.10.1
+
 * Mon Sep 21 2009 R?diger Landmann <rlandman at redhat.com> 1.27-2
 - added BuildRequires:  perl(Test::More) and BuildRequires:  perl(Test::Pod)
 * Mon Sep 07 2009 R?diger Landmann <rlandman at redhat.com> 1.27-1



From kasal at fedoraproject.org  Mon Dec  7 06:47:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:47:29 +0000 (UTC)
Subject: rpms/perl-Digest-MD4/devel perl-Digest-MD4.spec,1.11,1.12
Message-ID: <20091207064729.52F9011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Digest-MD4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10205

Modified Files:
	perl-Digest-MD4.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Digest-MD4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-MD4/devel/perl-Digest-MD4.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Digest-MD4.spec	26 Nov 2009 09:23:04 -0000	1.11
+++ perl-Digest-MD4.spec	7 Dec 2009 06:47:29 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		perl-Digest-MD4
 Version:	1.5
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Perl interface to the MD4 Algorithm
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -48,6 +48,9 @@ message of arbitrary length and produces
 %{_mandir}/man3/Digest::MD4.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.5-11
+- rebuild against perl 5.10.1
+
 * Wed Nov 25 2009 Paul Howarth <paul at city-fan.org> - 1.5-10
 - use %%{?perl_default_filter} for provides filter
 - make %%files list more explicit



From kasal at fedoraproject.org  Mon Dec  7 06:47:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:47:35 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-I18N/devel perl-Catalyst-Plugin-I18N.spec,
	1.5, 1.6
Message-ID: <20091207064735.A89C411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-I18N/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10299

Modified Files:
	perl-Catalyst-Plugin-I18N.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-I18N.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-I18N/devel/perl-Catalyst-Plugin-I18N.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-Plugin-I18N.spec	26 Jul 2009 04:14:16 -0000	1.5
+++ perl-Catalyst-Plugin-I18N.spec	7 Dec 2009 06:47:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-I18N
 Version:        0.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        I18N for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:48:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:48:01 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Fuzzy/devel
	perl-Locale-Maketext-Fuzzy.spec, 1.11, 1.12
Message-ID: <20091207064801.59A2411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Fuzzy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10591

Modified Files:
	perl-Locale-Maketext-Fuzzy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Locale-Maketext-Fuzzy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Fuzzy/devel/perl-Locale-Maketext-Fuzzy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Locale-Maketext-Fuzzy.spec	26 Jul 2009 08:59:45 -0000	1.11
+++ perl-Locale-Maketext-Fuzzy.spec	7 Dec 2009 06:48:01 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Fuzzy
 Version:        0.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Maketext from already interpolated strings
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:48:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:48:11 +0000 (UTC)
Subject: rpms/perl-qooxdoo-compat/devel perl-qooxdoo-compat.spec,1.4,1.5
Message-ID: <20091207064811.1D3C111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-qooxdoo-compat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10748

Modified Files:
	perl-qooxdoo-compat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-qooxdoo-compat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-qooxdoo-compat/devel/perl-qooxdoo-compat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-qooxdoo-compat.spec	12 Aug 2009 20:00:08 -0000	1.4
+++ perl-qooxdoo-compat.spec	7 Dec 2009 06:48:10 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:    Perl backend for Qooxdoo
 Name:       perl-qooxdoo-compat
 Version:    0.7.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 License:    LGPLv2 or EPL
 Group:      Development/Languages
 URL:        http://qooxdoo.org/
@@ -39,6 +39,9 @@ Qooxdoo 0.7.
 %{perl_vendorlib}/Qooxdoo
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.7.3-6
+- rebuild against perl 5.10.1
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.7.3-5
 - Use upstream gzipped tarball instead of zip.
 



From kasal at fedoraproject.org  Mon Dec  7 06:49:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:49:11 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-DataWalker/devel perl-Wx-Perl-DataWalker.spec, 1.3,
	1.4
Message-ID: <20091207064911.BD5B811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Wx-Perl-DataWalker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11220

Modified Files:
	perl-Wx-Perl-DataWalker.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Wx-Perl-DataWalker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-DataWalker/devel/perl-Wx-Perl-DataWalker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Wx-Perl-DataWalker.spec	26 Jul 2009 17:30:33 -0000	1.3
+++ perl-Wx-Perl-DataWalker.spec	7 Dec 2009 06:49:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Wx-Perl-DataWalker
 Version:        0.02
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Implement subclass that shows relatively simple structure
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:52:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:52:02 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Email/devel
	perl-Catalyst-Plugin-Email.spec, 1.2, 1.3
Message-ID: <20091207065202.C2EE611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12247

Modified Files:
	perl-Catalyst-Plugin-Email.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Email.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Email/devel/perl-Catalyst-Plugin-Email.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Catalyst-Plugin-Email.spec	26 Jul 2009 04:14:00 -0000	1.2
+++ perl-Catalyst-Plugin-Email.spec	7 Dec 2009 06:52:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Email
 Version:        0.08
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Send emails with Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:52:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:52:03 +0000 (UTC)
Subject: rpms/perl-List-MoreUtils/devel perl-List-MoreUtils.spec,1.13,1.14
Message-ID: <20091207065203.9A5E911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-List-MoreUtils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12265

Modified Files:
	perl-List-MoreUtils.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-List-MoreUtils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-List-MoreUtils/devel/perl-List-MoreUtils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-List-MoreUtils.spec	26 Jul 2009 08:59:30 -0000	1.13
+++ perl-List-MoreUtils.spec	7 Dec 2009 06:52:03 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-List-MoreUtils
 Version:        0.22
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Provide the stuff missing in List::Util
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:52:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:52:13 +0000 (UTC)
Subject: rpms/perl-Pugs-Compiler-Rule/devel perl-Pugs-Compiler-Rule.spec,
	1.11, 1.12
Message-ID: <20091207065213.08EE911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pugs-Compiler-Rule/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12491

Modified Files:
	perl-Pugs-Compiler-Rule.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pugs-Compiler-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pugs-Compiler-Rule/devel/perl-Pugs-Compiler-Rule.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Pugs-Compiler-Rule.spec	26 Jul 2009 16:18:29 -0000	1.11
+++ perl-Pugs-Compiler-Rule.spec	7 Dec 2009 06:52:12 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Pugs-Compiler-Rule
 Version:        0.37
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Compiler for Perl 6 regexes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.37-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.37-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:53:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:53:48 +0000 (UTC)
Subject: rpms/perl-Digest-MD2/devel perl-Digest-MD2.spec,1.11,1.12
Message-ID: <20091207065348.BC0B011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Digest-MD2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13052

Modified Files:
	perl-Digest-MD2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Digest-MD2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-MD2/devel/perl-Digest-MD2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Digest-MD2.spec	26 Jul 2009 05:45:28 -0000	1.11
+++ perl-Digest-MD2.spec	7 Dec 2009 06:53:48 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Perl interface to the MD2 Algorithm
 Name:		perl-Digest-MD2
 Version:	2.03
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Digest-MD2/
@@ -58,6 +58,9 @@ Digest::MD5.
 %{_mandir}/man3/Digest::MD2.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.03-11
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.03-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:54:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:54:05 +0000 (UTC)
Subject: rpms/perl-Wx/devel perl-Wx.spec,1.35,1.36
Message-ID: <20091207065405.8FEF711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Wx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13224

Modified Files:
	perl-Wx.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- perl-Wx.spec	5 Sep 2009 13:13:42 -0000	1.35
+++ perl-Wx.spec	7 Dec 2009 06:54:05 -0000	1.36
@@ -6,7 +6,7 @@
 
 Name:           perl-Wx
 Version:        0.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
 Group:          Development/Libraries
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.92-2
+- rebuild against perl 5.10.1
+
 * Sat Sep  5 2009 Stepan Kasal <skasal at redhat.com> - 0.92-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 06:56:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:56:20 +0000 (UTC)
Subject: rpms/perl-List-Compare/devel perl-List-Compare.spec,1.10,1.11
Message-ID: <20091207065620.569A511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-List-Compare/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13938

Modified Files:
	perl-List-Compare.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-List-Compare.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-List-Compare/devel/perl-List-Compare.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-List-Compare.spec	26 Jul 2009 08:59:14 -0000	1.10
+++ perl-List-Compare.spec	7 Dec 2009 06:56:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-List-Compare
 Version:        0.37
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Compare elements of two or more lists
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.37-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.37-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 06:56:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:56:50 +0000 (UTC)
Subject: rpms/perl-Proc-Simple/devel perl-Proc-Simple.spec,1.3,1.4
Message-ID: <20091207065650.2530011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Proc-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14212

Modified Files:
	perl-Proc-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Proc-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Proc-Simple/devel/perl-Proc-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Proc-Simple.spec	5 Aug 2009 09:03:01 -0000	1.3
+++ perl-Proc-Simple.spec	7 Dec 2009 06:56:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Proc-Simple
 Version:        1.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Launch and control background processes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.26-2
+- rebuild against perl 5.10.1
+
 * Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.26-1
 - Rebuilt for mass rebuilt breakdown.
 - Update to 1.26 from CPAN.



From kasal at fedoraproject.org  Mon Dec  7 06:57:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:57:07 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/devel
	perl-Catalyst-Plugin-ConfigLoader.spec, 1.13, 1.14
Message-ID: <20091207065707.E508D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-ConfigLoader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14417

Modified Files:
	perl-Catalyst-Plugin-ConfigLoader.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-ConfigLoader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/perl-Catalyst-Plugin-ConfigLoader.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Catalyst-Plugin-ConfigLoader.spec	18 Aug 2009 20:42:48 -0000	1.13
+++ perl-Catalyst-Plugin-ConfigLoader.spec	7 Dec 2009 06:57:07 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
 Version:        0.27
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.27-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.27-1
 - auto-update to 0.27 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 06:58:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 06:58:23 +0000 (UTC)
Subject: rpms/perl-Digest-HMAC/devel perl-Digest-HMAC.spec,1.17,1.18
Message-ID: <20091207065823.2C94411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Digest-HMAC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14899

Modified Files:
	perl-Digest-HMAC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Digest-HMAC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-HMAC/devel/perl-Digest-HMAC.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Digest-HMAC.spec	26 Jul 2009 05:45:11 -0000	1.17
+++ perl-Digest-HMAC.spec	7 Dec 2009 06:58:22 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Digest-HMAC
 Version:        1.01
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Digest-HMAC Perl module
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-22
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From konradm at fedoraproject.org  Mon Dec  7 07:00:02 2009
From: konradm at fedoraproject.org (konradm)
Date: Mon,  7 Dec 2009 07:00:02 +0000 (UTC)
Subject: rpms/sdcc/devel sdcc.spec,1.20,1.21
Message-ID: <20091207070002.5595C11C045F@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15499

Modified Files:
	sdcc.spec 
Log Message:
* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-7
- Only disable brp-strip-static.



Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/devel/sdcc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sdcc.spec	7 Dec 2009 03:18:18 -0000	1.20
+++ sdcc.spec	7 Dec 2009 07:00:02 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           sdcc
 Version:        2.9.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
@@ -60,9 +60,9 @@ Emacs extensions for SDCC.
 %patch3 -p1
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Disable brp-strip for now because it errors trying to strip foreign
-# binaries.
-%global __os_install_post /usr/lib/rpm/redhat/brp-compress
+# Disable brp-strip-static-archive for now because it errors trying to
+# strip foreign binaries.
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's#/usr/lib/rpm/redhat/brp-strip-static-archive .*##g')
 
 
 %build
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-7
+- Only disable brp-strip-static.
+
 * Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
 - Work around rpmbuild failure by disabling brp-strip.
 



From konradm at fedoraproject.org  Mon Dec  7 07:00:18 2009
From: konradm at fedoraproject.org (konradm)
Date: Mon,  7 Dec 2009 07:00:18 +0000 (UTC)
Subject: rpms/sdcc/F-12 sdcc.spec,1.22,1.23
Message-ID: <20091207070018.DBBC411C04B6@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15621

Modified Files:
	sdcc.spec 
Log Message:
* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-7
- Only disable brp-strip-static.



Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-12/sdcc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sdcc.spec	7 Dec 2009 03:48:21 -0000	1.22
+++ sdcc.spec	7 Dec 2009 07:00:18 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           sdcc
 Version:        2.9.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
@@ -60,9 +60,9 @@ Emacs extensions for SDCC.
 %patch3 -p1
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Disable brp-strip for now because it errors trying to strip foreign
-# binaries.
-%global __os_install_post /usr/lib/rpm/redhat/brp-compress
+# Disable brp-strip-static-archive for now because it errors trying to
+# strip foreign binaries.
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's#/usr/lib/rpm/redhat/brp-strip-static-archive .*##g')
 
 
 %build
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-7
+- Only disable brp-strip-static.
+
 * Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
 - Work around rpmbuild failure by disabling brp-strip.
 



From kasal at fedoraproject.org  Mon Dec  7 07:00:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:00:30 +0000 (UTC)
Subject: rpms/perl-Linux-Pid/devel perl-Linux-Pid.spec,1.6,1.7
Message-ID: <20091207070030.25FC511C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Linux-Pid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15768

Modified Files:
	perl-Linux-Pid.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Linux-Pid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Linux-Pid/devel/perl-Linux-Pid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Linux-Pid.spec	26 Jul 2009 08:59:01 -0000	1.6
+++ perl-Linux-Pid.spec	7 Dec 2009 07:00:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Linux-Pid
 Version:        0.04
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Get the native PID and the PPID on Linux 
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tagoh at fedoraproject.org  Mon Dec  7 07:01:13 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon,  7 Dec 2009 07:01:13 +0000 (UTC)
Subject: rpms/vlgothic-fonts/F-12 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 vlgothic-fontconfig-gothic.conf, 1.1,
	1.2 vlgothic-fontconfig-pgothic.conf, 1.1,
	1.2 vlgothic-fonts.spec, 1.6, 1.7
Message-ID: <20091207070113.B1EF911C00EE@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/vlgothic-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16170

Modified Files:
	.cvsignore sources vlgothic-fontconfig-gothic.conf 
	vlgothic-fontconfig-pgothic.conf vlgothic-fonts.spec 
Log Message:
* Mon Dec  7 2009 Akira TAGOH <tagoh at redhat.com> - 20091202-1
- New upstream release.
- Set the priority to 65 for vlgothic-p-fonts to override the rule in
  vlgothic-fonts for sans-serif.
- Set the priority to 66 and contains both rules for sans-serif and monospace
  to avoid picking up the unrelated fonts in Live. where doesn't have
  vlgothic-p-fonts installed. (#544957)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Jun 2009 11:21:07 -0000	1.4
+++ .cvsignore	7 Dec 2009 07:01:13 -0000	1.5
@@ -1,3 +1,4 @@
 VLGothic-20090204.tar.bz2
 VLGothic-20090422.tar.bz2
 VLGothic-20090612.tar.bz2
+VLGothic-20091202.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Jun 2009 11:21:08 -0000	1.4
+++ sources	7 Dec 2009 07:01:13 -0000	1.5
@@ -1 +1 @@
-2ae45ffcaf4fd75331eb582cfee6cc54  VLGothic-20090612.tar.bz2
+db66b71975c6ffc54ca37f0d13451e0a  VLGothic-20091202.tar.bz2


Index: vlgothic-fontconfig-gothic.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-12/vlgothic-fontconfig-gothic.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vlgothic-fontconfig-gothic.conf	10 Feb 2009 11:48:21 -0000	1.1
+++ vlgothic-fontconfig-gothic.conf	7 Dec 2009 07:01:13 -0000	1.2
@@ -1,38 +1,51 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-    <match target="font">
+    <!-- Generic names rule -->
+    <alias>
+        <family>VL Gothic</family>
+        <default>
+            <family>monospace</family>
+        </default>
+    </alias>
+    <!-- NOTE: just for fallback - ideally better installing vlgothic-p-fonts -->
+    <alias>
+        <family>VL Gothic</family>
+        <default>
+            <family>sans-serif</family>
+        </default>
+    </alias>
+    <!-- Locale-specific overrides rule -->
+    <match>
+        <test name="lang">
+            <string>ja-jp</string>
+        </test>
         <test name="family">
-            <string>VL Gothic</string>
+            <string>monospace</string>
         </test>
-        <edit name="hinting" mode="assign">
-            <bool>false</bool>
+        <edit name="family" mode="prepend" binding="same">
+            <string>VL Gothic</string>
         </edit>
     </match>
-    
+    <!-- NOTE: just for fallback - ideally better installing vlgothic-p-fonts -->
     <match>
         <test name="lang">
             <string>ja-jp</string>
         </test>
         <test name="family">
-            <string>monospace</string>
+            <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="same">
             <string>VL Gothic</string>
         </edit>
     </match>
-
-    <alias>
-        <family>monospace</family>
-        <prefer>
-            <family>VL Gothic</family>
-        </prefer>
-    </alias>
-
-    <alias>
-        <family>VL Gothic</family>
-        <default>
-            <family>monospace</family>
-        </default>
-    </alias>
+    <!-- disabling hinting rule -->
+    <match target="font">
+        <test name="family">
+            <string>VL Gothic</string>
+        </test>
+        <edit name="hinting" mode="assign">
+            <bool>false</bool>
+        </edit>
+    </match>
 </fontconfig>


Index: vlgothic-fontconfig-pgothic.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-12/vlgothic-fontconfig-pgothic.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vlgothic-fontconfig-pgothic.conf	10 Feb 2009 11:48:21 -0000	1.1
+++ vlgothic-fontconfig-pgothic.conf	7 Dec 2009 07:01:13 -0000	1.2
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-    <match target="font">
-        <test name="family">
-            <string>VL PGothic</string>
-        </test>
-        <edit name="hinting" mode="assign">
-            <bool>false</bool>
-        </edit>
-    </match>
-
+    <!-- Generic names rule -->
+    <alias>
+        <family>VL PGothic</family>
+        <default>
+            <family>sans-serif</family>
+        </default>
+    </alias>
+    <!-- Locale-specific overrides rule -->
     <match>
         <test name="lang">
             <string>ja-jp</string>
@@ -21,18 +20,13 @@
             <string>VL PGothic</string>
         </edit>
     </match>
-
-    <alias>
-        <family>sans-serif</family>
-        <prefer>
-            <family>VL PGothic</family>
-        </prefer>
-    </alias>
-
-    <alias>
-        <family>VL PGothic</family>
-        <default>
-            <family>sans-serif</family>
-        </default>
-    </alias>
+    <!-- disabling hinting rule -->
+    <match target="font">
+        <test name="family">
+            <string>VL PGothic</string>
+        </test>
+        <edit name="hinting" mode="assign">
+            <bool>false</bool>
+        </edit>
+    </match>
 </fontconfig>


Index: vlgothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vlgothic-fonts/F-12/vlgothic-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vlgothic-fonts.spec	27 Jul 2009 06:56:34 -0000	1.6
+++ vlgothic-fonts.spec	7 Dec 2009 07:01:13 -0000	1.7
@@ -1,21 +1,23 @@
 %define priority	66
+%define ppriority	65
 %define fontname	vlgothic
 %define	archivename	VLGothic-%{version}
-%define	fontconf	%{priority}-%{fontname}
+%define	fontconf	%{priority}-%{fontname}-gothic
+%define	pfontconf	%{ppriority}-%{fontname}-pgothic
 %define	common_desc	\
 VLGothic provides Japanese TrueType fonts from the Vine Linux project.\
 Most of the glyphs are taken from the M+ and Sazanami Gothic fonts,\
 but some have also been improved by the project.
 
 Name:		%{fontname}-fonts
-Version:	20090612
-Release:	2%{?dist}
+Version:	20091202
+Release:	1%{?dist}
 Summary:	Japanese TrueType font
 
 License:	mplus and BSD
 Group:		User Interface/X
 URL:		http://dicey.org/vlgothic
-Source0:	http://osdn.dl.sourceforge.jp/vlgothic/40480/%{archivename}.tar.bz2
+Source0:	http://osdn.dl.sourceforge.jp/vlgothic/44715/%{archivename}.tar.bz2
 Source1:	%{fontname}-fontconfig-pgothic.conf
 Source2:	%{fontname}-fontconfig-gothic.conf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,10 +72,10 @@ install -m 0644 -p *.ttf $RPM_BUILD_ROOT
 install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir} \
 	 		$RPM_BUILD_ROOT%{_fontconfig_confdir}
 
-install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}-pgothic.conf
-install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}-gothic.conf
+install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{pfontconf}.conf
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}.conf
 
-for fconf in %{fontconf}-pgothic.conf %{fontconf}-gothic.conf; do
+for fconf in %{pfontconf}.conf %{fontconf}.conf; do
 	ln -s %{_fontconfig_templatedir}/$fconf $RPM_BUILD_ROOT%{_fontconfig_confdir}/$fconf
 done
 
@@ -87,12 +89,20 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc README* LICENSE*
 %dir %{_fontdir}
 
-%_font_pkg -f %{fontconf}-gothic.conf VL-Gothic-Regular.ttf
+%_font_pkg -f %{fontconf}.conf VL-Gothic-Regular.ttf
 
-%_font_pkg -n p -f %{fontconf}-pgothic.conf VL-PGothic-Regular.ttf
+%_font_pkg -n p -f %{pfontconf}.conf VL-PGothic-Regular.ttf
 
 
 %changelog
+* Mon Dec  7 2009 Akira TAGOH <tagoh at redhat.com> - 20091202-1
+- New upstream release.
+- Set the priority to 65 for vlgothic-p-fonts to override the rule in
+  vlgothic-fonts for sans-serif.
+- Set the priority to 66 and contains both rules for sans-serif and monospace
+  to avoid picking up the unrelated fonts in Live. where doesn't have
+  vlgothic-p-fonts installed. (#544957)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090612-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:01:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:01:51 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-CGI-Untaint/devel
	perl-Catalyst-Plugin-CGI-Untaint.spec, 1.5, 1.6
Message-ID: <20091207070151.0DCF611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-CGI-Untaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16442

Modified Files:
	perl-Catalyst-Plugin-CGI-Untaint.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-CGI-Untaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-CGI-Untaint/devel/perl-Catalyst-Plugin-CGI-Untaint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-Plugin-CGI-Untaint.spec	26 Jul 2009 04:13:14 -0000	1.5
+++ perl-Catalyst-Plugin-CGI-Untaint.spec	7 Dec 2009 07:01:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-CGI-Untaint
 Version:        0.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        CGI::Untaint Plugin for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:02:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:02:00 +0000 (UTC)
Subject: rpms/perl-Proc-ProcessTable/devel perl-Proc-ProcessTable.spec, 1.9, 
	1.10
Message-ID: <20091207070200.9566711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Proc-ProcessTable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16547

Modified Files:
	perl-Proc-ProcessTable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Proc-ProcessTable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Proc-ProcessTable/devel/perl-Proc-ProcessTable.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Proc-ProcessTable.spec	26 Jul 2009 16:17:56 -0000	1.9
+++ perl-Proc-ProcessTable.spec	7 Dec 2009 07:02:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Proc-ProcessTable
 Version:        0.44
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension to access the unix process table
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.44-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:02:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:02:09 +0000 (UTC)
Subject: rpms/perl-WWW-Search/devel perl-WWW-Search.spec,1.11,1.12
Message-ID: <20091207070209.B36EA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Search/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16704

Modified Files:
	perl-WWW-Search.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Search.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Search/devel/perl-WWW-Search.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-WWW-Search.spec	26 Jul 2009 17:28:46 -0000	1.11
+++ perl-WWW-Search.spec	7 Dec 2009 07:02:09 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Search
 Version:        2.507
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Virtual base class for WWW searches
 
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.507-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.507-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From terjeros at fedoraproject.org  Mon Dec  7 07:02:29 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 07:02:29 +0000 (UTC)
Subject: rpms/python-argparse/F-11 .cvsignore, 1.2, 1.3 python-argparse.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091207070229.625D511C00EE@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-argparse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16793/F-11

Modified Files:
	.cvsignore python-argparse.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Feb 2009 18:08:53 -0000	1.2
+++ .cvsignore	7 Dec 2009 07:02:28 -0000	1.3
@@ -1 +1 @@
-argparse-0.8.0.zip
+argparse-1.0.1.zip


Index: python-argparse.spec
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/F-11/python-argparse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-argparse.spec	26 Feb 2009 20:45:33 -0000	1.2
+++ python-argparse.spec	7 Dec 2009 07:02:29 -0000	1.3
@@ -1,15 +1,15 @@
-%{!?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]")}
-%define oname  argparse
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+%global oname  argparse
 
 Summary:       Optparse inspired command line parser for Python
 Name:          python-argparse
-Version:       0.8.0
-Release:       3%{?dist}
-License:       BSD
+Version:       1.0.1
+Release:       1%{?dist}
+License:       ASL 2.0
 Group:         Development/Languages
-URL:           http://argparse.python-hosting.com/
-Source0:       http://pypi.python.org/packages/source/a/%{oname}/%{oname}-%{version}.zip
+URL:           http://code.google.com/p/argparse/
+Source0:       http://argparse.googlecode.com/files/argparse-%{version}.zip
 BuildRequires: python-setuptools-devel dos2unix
 BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@ optparse API.
 %prep
 %setup -q -n %{oname}-%{version}
 dos2unix -k README.txt
+%{__rm} -rf doc/source
 
 %build
 %{__python} setup.py build
@@ -39,19 +40,30 @@ dos2unix -k README.txt
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-%check
-%{__python} test_%{oname}.py
+#check
+#pushd test
+#PYTHONPATH=../ %{__python} test_%{oname}.py
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc README.txt
+%doc README.txt doc/*
 %{python_sitelib}/%{oname}.py*
 %{python_sitelib}/%{oname}-%{version}-py%{pyver}.egg-info/
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.0.1-1
+- 1.0.1
+- Ship more docs
+- Project has moved
+- Disable test for now
+- Change license to Apache 2.0
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Feb 2009 18:08:53 -0000	1.2
+++ sources	7 Dec 2009 07:02:29 -0000	1.3
@@ -1 +1 @@
-fc3ac46fecf541e8ca25caeae75b1b8d  argparse-0.8.0.zip
+2d04a5fa1504c93a3e7523cd97bfd8b2  argparse-1.0.1.zip



From terjeros at fedoraproject.org  Mon Dec  7 07:02:29 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 07:02:29 +0000 (UTC)
Subject: rpms/python-argparse/F-12 .cvsignore, 1.2, 1.3 python-argparse.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091207070229.B73F411C00EE@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/python-argparse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16793/F-12

Modified Files:
	.cvsignore python-argparse.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Feb 2009 18:08:53 -0000	1.2
+++ .cvsignore	7 Dec 2009 07:02:29 -0000	1.3
@@ -1 +1 @@
-argparse-0.8.0.zip
+argparse-1.0.1.zip


Index: python-argparse.spec
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/F-12/python-argparse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-argparse.spec	26 Jul 2009 20:08:43 -0000	1.3
+++ python-argparse.spec	7 Dec 2009 07:02:29 -0000	1.4
@@ -1,15 +1,15 @@
-%{!?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]")}
-%define oname  argparse
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+%global oname  argparse
 
 Summary:       Optparse inspired command line parser for Python
 Name:          python-argparse
-Version:       0.8.0
-Release:       4%{?dist}
-License:       BSD
+Version:       1.0.1
+Release:       1%{?dist}
+License:       ASL 2.0
 Group:         Development/Languages
-URL:           http://argparse.python-hosting.com/
-Source0:       http://pypi.python.org/packages/source/a/%{oname}/%{oname}-%{version}.zip
+URL:           http://code.google.com/p/argparse/
+Source0:       http://argparse.googlecode.com/files/argparse-%{version}.zip
 BuildRequires: python-setuptools-devel dos2unix
 BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@ optparse API.
 %prep
 %setup -q -n %{oname}-%{version}
 dos2unix -k README.txt
+%{__rm} -rf doc/source
 
 %build
 %{__python} setup.py build
@@ -39,19 +40,27 @@ dos2unix -k README.txt
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-%check
-%{__python} test_%{oname}.py
+#check
+#pushd test
+#PYTHONPATH=../ %{__python} test_%{oname}.py
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc README.txt
+%doc README.txt doc/*
 %{python_sitelib}/%{oname}.py*
 %{python_sitelib}/%{oname}-%{version}-py%{pyver}.egg-info/
 
 %changelog
+* Sun Dec 06 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.0.1-1
+- 1.0.1
+- Ship more docs
+- Project has moved
+- Disable test for now
+- Change license to Apache 2.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-argparse/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Feb 2009 18:08:53 -0000	1.2
+++ sources	7 Dec 2009 07:02:29 -0000	1.3
@@ -1 +1 @@
-fc3ac46fecf541e8ca25caeae75b1b8d  argparse-0.8.0.zip
+2d04a5fa1504c93a3e7523cd97bfd8b2  argparse-1.0.1.zip



From kasal at fedoraproject.org  Mon Dec  7 07:03:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:03:13 +0000 (UTC)
Subject: rpms/perl-Digest-CRC/devel perl-Digest-CRC.spec,1.6,1.7
Message-ID: <20091207070313.DA82311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Digest-CRC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306

Modified Files:
	perl-Digest-CRC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Digest-CRC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-CRC/devel/perl-Digest-CRC.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Digest-CRC.spec	26 Jul 2009 05:44:54 -0000	1.6
+++ perl-Digest-CRC.spec	7 Dec 2009 07:03:13 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Digest-CRC
 Version:        0.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Generic CRC functions
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 07:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:04:52 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070452.2349410F85F@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on galeon (Fedora devel) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:04:53 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070453.AC93D10F88C@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on galeon (Fedora devel) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:04:55 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070455.B6F4210F892@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora devel was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:01 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070501.6D40010F89E@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 1 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:00 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070500.35A8D10F801@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 7 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:02 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070502.A2BB110F8A1@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 3 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:04 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070504.0C03710F85C@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 4 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:06 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070506.8F8F110F8A4@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 5 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:08 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070508.74B9810F8A6@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 6 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:09 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070509.E865D10F85F@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 8 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:11 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070511.1744C10F878@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 9 was orphaned by denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:15 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070515.8C54A10F8B0@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on galeon (Fedora 10) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:17 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070517.2423310F8AF@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on galeon (Fedora 10) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:20 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070520.9B99910F8B3@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on galeon (Fedora 10) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:22 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070522.6E04910F892@bastion2.fedora.phx.redhat.com>

denis has set the approveacls acl on galeon (Fedora 10) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:37 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070537.6F2FE10F89D@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 10 is now owned by yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:40 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070540.861AD10F8A2@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on galeon (Fedora 11) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:42 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070542.0D3D110F8B8@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on galeon (Fedora 11) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:43 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070543.A794710F8BE@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on galeon (Fedora 11) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:45 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070545.51F4110F8C1@bastion2.fedora.phx.redhat.com>

denis has set the approveacls acl on galeon (Fedora 11) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From kasal at fedoraproject.org  Mon Dec  7 07:05:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:05:45 +0000 (UTC)
Subject: rpms/perl-Linux-Inotify2/devel perl-Linux-Inotify2.spec,1.2,1.3
Message-ID: <20091207070545.8FB9B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Linux-Inotify2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18249

Modified Files:
	perl-Linux-Inotify2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Linux-Inotify2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Linux-Inotify2/devel/perl-Linux-Inotify2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Linux-Inotify2.spec	26 Jul 2009 08:58:46 -0000	1.2
+++ perl-Linux-Inotify2.spec	7 Dec 2009 07:05:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Linux-Inotify2 
 Version:    1.2 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # COPYING -> GPL+ or Artistic 
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -64,6 +64,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:50 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070550.7BE5C10F861@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 11 is now owned by yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:54 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070554.DBD0F10F8C3@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on galeon (Fedora 12) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:57 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070557.0EE5010F8AD@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on galeon (Fedora 12) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:05:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:05:59 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070559.D6F8310F8C7@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on galeon (Fedora 12) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:06:01 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207070601.7E74310F8CA@bastion2.fedora.phx.redhat.com>

denis has set the approveacls acl on galeon (Fedora 12) to Approved for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:06:04 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207070604.C639010F8CC@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora 12 is now owned by yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From kasal at fedoraproject.org  Mon Dec  7 07:06:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:06:23 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Cache/devel
	perl-Catalyst-Plugin-Cache.spec, 1.2, 1.3
Message-ID: <20091207070623.1794511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18550

Modified Files:
	perl-Catalyst-Plugin-Cache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Cache/devel/perl-Catalyst-Plugin-Cache.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Catalyst-Plugin-Cache.spec	26 Jul 2009 04:13:30 -0000	1.2
+++ perl-Catalyst-Plugin-Cache.spec	7 Dec 2009 07:06:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Cache
 Version:        0.08
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Flexible caching support for Catalyst
 License:        (GPL+ or Artistic) or MIT
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:06:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:06:49 +0000 (UTC)
Subject: rpms/perl-Proc-Daemon/devel perl-Proc-Daemon.spec,1.6,1.7
Message-ID: <20091207070649.DD7C811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Proc-Daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18760

Modified Files:
	perl-Proc-Daemon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Proc-Daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Proc-Daemon/devel/perl-Proc-Daemon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Proc-Daemon.spec	26 Jul 2009 16:17:42 -0000	1.6
+++ perl-Proc-Daemon.spec	7 Dec 2009 07:06:49 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:      perl-Proc-Daemon
 Version:   0.03
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Run Perl program as a daemon process 
 
 Group:     Development/Libraries
@@ -52,6 +52,9 @@ make test
 %{perl_vendorlib}/Proc
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:07:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:07:44 +0000 (UTC)
Subject: rpms/perl-Digest-BubbleBabble/devel perl-Digest-BubbleBabble.spec, 
	1.11, 1.12
Message-ID: <20091207070744.92C4511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Digest-BubbleBabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19143

Modified Files:
	perl-Digest-BubbleBabble.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Digest-BubbleBabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Digest-BubbleBabble/devel/perl-Digest-BubbleBabble.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Digest-BubbleBabble.spec	26 Jul 2009 05:44:40 -0000	1.11
+++ perl-Digest-BubbleBabble.spec	7 Dec 2009 07:07:44 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Create bubble-babble fingerprints
 Name:		perl-Digest-BubbleBabble
 Version:	0.01
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Digest-BubbleBabble/
@@ -52,6 +52,9 @@ fingerprint.
 %{_mandir}/man3/Digest::BubbleBabble.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-11
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:08:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:08:13 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-RafbNet-Create/devel
	perl-WWW-Pastebin-RafbNet-Create.spec, 1.2, 1.3
Message-ID: <20091207070813.D220F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19376

Modified Files:
	perl-WWW-Pastebin-RafbNet-Create.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Pastebin-RafbNet-Create.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-RafbNet-Create/devel/perl-WWW-Pastebin-RafbNet-Create.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-WWW-Pastebin-RafbNet-Create.spec	26 Jul 2009 17:28:31 -0000	1.2
+++ perl-WWW-Pastebin-RafbNet-Create.spec	7 Dec 2009 07:08:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Pastebin-RafbNet-Create
 Version:        0.001
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Create new pastes on http://rafb.net/
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.001-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.001-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:10:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:10:27 +0000 (UTC)
Subject: rpms/perl-Lingua-StopWords/devel perl-Lingua-StopWords.spec, 1.4,
	1.5
Message-ID: <20091207071027.8A24211C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Lingua-StopWords/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20134

Modified Files:
	perl-Lingua-StopWords.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Lingua-StopWords.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-StopWords/devel/perl-Lingua-StopWords.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Lingua-StopWords.spec	26 Jul 2009 08:58:33 -0000	1.4
+++ perl-Lingua-StopWords.spec	7 Dec 2009 07:10:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Lingua-StopWords
 Version:        0.09
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Stop words for several languages
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:11:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:11:20 +0000 (UTC)
Subject: rpms/perl-Probe-Perl/devel perl-Probe-Perl.spec,1.3,1.4
Message-ID: <20091207071120.C763711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Probe-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20502

Modified Files:
	perl-Probe-Perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Probe-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Probe-Perl/devel/perl-Probe-Perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Probe-Perl.spec	26 Jul 2009 16:17:24 -0000	1.3
+++ perl-Probe-Perl.spec	7 Dec 2009 07:11:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Probe-Perl
 Version:        0.01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Information about the currently running perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:11:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:11:29 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-Roles/devel
	perl-Catalyst-Plugin-Authorization-Roles.spec, 1.3, 1.4
Message-ID: <20091207071129.1E0F411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-Roles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20624

Modified Files:
	perl-Catalyst-Plugin-Authorization-Roles.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Authorization-Roles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-Roles/devel/perl-Catalyst-Plugin-Authorization-Roles.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Catalyst-Plugin-Authorization-Roles.spec	26 Jul 2009 04:12:59 -0000	1.3
+++ perl-Catalyst-Plugin-Authorization-Roles.spec	7 Dec 2009 07:11:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Authorization-Roles
 Version:        0.07
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Role based authorization for Catalyst based on Catalyst::Plugin::Authentication
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:11:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:11:58 +0000 (UTC)
Subject: rpms/perl-Device-SerialPort/devel perl-Device-SerialPort.spec, 1.8, 
	1.9
Message-ID: <20091207071158.A0C8011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Device-SerialPort/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20902

Modified Files:
	perl-Device-SerialPort.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Device-SerialPort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Device-SerialPort/devel/perl-Device-SerialPort.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Device-SerialPort.spec	26 Jul 2009 05:44:21 -0000	1.8
+++ perl-Device-SerialPort.spec	7 Dec 2009 07:11:58 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Device-SerialPort
 Version:        1.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Linux/POSIX emulation of Win32::SerialPort functions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:12:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:12:42 +0000 (UTC)
Subject: rpms/perl-WWW-Pastebin-PastebinCom-Create/devel
	perl-WWW-Pastebin-PastebinCom-Create.spec, 1.2, 1.3
Message-ID: <20091207071242.E260711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21234

Modified Files:
	perl-WWW-Pastebin-PastebinCom-Create.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Pastebin-PastebinCom-Create.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Pastebin-PastebinCom-Create/devel/perl-WWW-Pastebin-PastebinCom-Create.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-WWW-Pastebin-PastebinCom-Create.spec	26 Jul 2009 17:28:15 -0000	1.2
+++ perl-WWW-Pastebin-PastebinCom-Create.spec	7 Dec 2009 07:12:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Pastebin-PastebinCom-Create
 Version:        0.002
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Paste to http://pastebin.com from Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.002-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.002-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:14:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:14:33 +0000 (UTC)
Subject: rpms/perl-Lingua-Stem-Snowball/devel perl-Lingua-Stem-Snowball.spec,
	1.4, 1.5
Message-ID: <20091207071433.9550D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Lingua-Stem-Snowball/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21900

Modified Files:
	perl-Lingua-Stem-Snowball.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Lingua-Stem-Snowball.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-Stem-Snowball/devel/perl-Lingua-Stem-Snowball.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Lingua-Stem-Snowball.spec	26 Jul 2009 08:58:18 -0000	1.4
+++ perl-Lingua-Stem-Snowball.spec	7 Dec 2009 07:14:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Lingua-Stem-Snowball
 Version:        0.952
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to Snowball stemmers
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.952-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.952-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:15:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:15:11 +0000 (UTC)
Subject: rpms/perl-prefork/devel perl-prefork.spec,1.12,1.13
Message-ID: <20091207071511.8431611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-prefork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22219

Modified Files:
	perl-prefork.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-prefork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/devel/perl-prefork.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-prefork.spec	29 Jul 2009 05:00:29 -0000	1.12
+++ perl-prefork.spec	7 Dec 2009 07:15:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name: 		perl-prefork
 Version: 	1.04
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Optimized module loading for forking or non-forking processes
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -56,6 +56,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-2
+- rebuild against perl 5.10.1
+
 * Wed Jul 29 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.04-1
 - Upstream update.
 



From fabbione at fedoraproject.org  Mon Dec  7 07:15:24 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon,  7 Dec 2009 07:15:24 +0000 (UTC)
Subject: rpms/openais/F-12 .cvsignore, 1.20, 1.21 openais.spec, 1.51,
	1.52 sources, 1.21, 1.22
Message-ID: <20091207071524.A1F9411C00EE@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22259

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	25 Sep 2009 09:55:19 -0000	1.20
+++ .cvsignore	7 Dec 2009 07:15:24 -0000	1.21
@@ -1 +1 @@
-openais-1.1.0.tar.gz
+openais-1.1.1.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-12/openais.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- openais.spec	25 Sep 2009 09:55:19 -0000	1.51
+++ openais.spec	7 Dec 2009 07:15:24 -0000	1.52
@@ -2,12 +2,12 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
-Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz
+Source0: http://www.osdl.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires(post): /sbin/chkconfig
@@ -20,7 +20,6 @@ Conflicts: openais-devel <= 0.89
 BuildRequires: corosynclib-devel >= 1.0.0-1
 
 %define buildtrunk 0
-%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -30,7 +29,7 @@ BuildRequires: autoconf automake
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n openais-%{version}
+%setup -q -n %{name}-%{version}
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -57,7 +56,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 rm -rf %{buildroot}
 
-%description 
+%description
 This package contains the openais service handlers, default configuration
 files and init script.
 
@@ -73,7 +72,7 @@ fi
 %postun
 [ "$1" -ge "1" ] && %{_initrddir}/openais condrestart &>/dev/null || :
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc LICENSE README.amf
 %dir %{_sysconfdir}/corosync
@@ -97,10 +96,10 @@ fi
 %package -n openaislib
 Summary: The openais Standards-Based Cluster Framework libraries
 Group: System Environment/Libraries
-Conflicts: openais < 0.91-6
+Requires: %{name} = %{version}-%{release}
 
 %description -n openaislib
-This package contains openais libraries. 
+This package contains openais libraries.
 
 %files -n openaislib
 %defattr(-,root,root,-)
@@ -150,6 +149,13 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
+- New upstream release.
+- spec file updates:
+  * Cleanup macro usage
+  * Drop Conflict: in favour of correct Requires:
+  * Whitespace cleanup
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 09:55:19 -0000	1.21
+++ sources	7 Dec 2009 07:15:24 -0000	1.22
@@ -1 +1 @@
-6b73c7438e230c31aec53d6af78a6b0d  openais-1.1.0.tar.gz
+51cf8d1633fb7b4fd1f2457ca62b4475  openais-1.1.1.tar.gz



From fabbione at fedoraproject.org  Mon Dec  7 07:15:55 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon,  7 Dec 2009 07:15:55 +0000 (UTC)
Subject: rpms/openais/F-11 .cvsignore, 1.15, 1.16 openais.spec, 1.45,
	1.46 sources, 1.17, 1.18
Message-ID: <20091207071555.ECB4D11C00EE@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22576

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	9 Oct 2009 05:18:56 -0000	1.15
+++ .cvsignore	7 Dec 2009 07:15:55 -0000	1.16
@@ -1 +1 @@
-openais-1.1.0.tar.gz
+openais-1.1.1.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/openais.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- openais.spec	9 Oct 2009 05:18:56 -0000	1.45
+++ openais.spec	7 Dec 2009 07:15:55 -0000	1.46
@@ -2,12 +2,12 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
-Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz
+Source0: http://www.osdl.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires(post): /sbin/chkconfig
@@ -20,7 +20,6 @@ Conflicts: openais-devel <= 0.89
 BuildRequires: corosynclib-devel >= 1.0.0-1
 
 %define buildtrunk 0
-%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -30,7 +29,7 @@ BuildRequires: autoconf automake
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n openais-%{version}
+%setup -q -n %{name}-%{version}
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -57,7 +56,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 rm -rf %{buildroot}
 
-%description 
+%description
 This package contains the openais service handlers, default configuration
 files and init script.
 
@@ -73,7 +72,7 @@ fi
 %postun
 [ "$1" -ge "1" ] && %{_initrddir}/openais condrestart &>/dev/null || :
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc LICENSE README.amf
 %dir %{_sysconfdir}/corosync
@@ -97,10 +96,10 @@ fi
 %package -n openaislib
 Summary: The openais Standards-Based Cluster Framework libraries
 Group: System Environment/Libraries
-Conflicts: openais < 0.91-6
+Requires: %{name} = %{version}-%{release}
 
 %description -n openaislib
-This package contains openais libraries. 
+This package contains openais libraries.
 
 %files -n openaislib
 %defattr(-,root,root,-)
@@ -150,6 +149,13 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
+- New upstream release.
+- spec file updates:
+  * Cleanup macro usage
+  * Drop Conflict: in favour of correct Requires:
+  * Whitespace cleanup
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	9 Oct 2009 05:18:56 -0000	1.17
+++ sources	7 Dec 2009 07:15:55 -0000	1.18
@@ -1 +1 @@
-6b73c7438e230c31aec53d6af78a6b0d  openais-1.1.0.tar.gz
+51cf8d1633fb7b4fd1f2457ca62b4475  openais-1.1.1.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 07:16:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:16:23 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/devel
	perl-Catalyst-Plugin-Authorization-ACL.spec, 1.5, 1.6
Message-ID: <20091207071623.62ED811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22854

Modified Files:
	perl-Catalyst-Plugin-Authorization-ACL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Plugin-Authorization-ACL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel/perl-Catalyst-Plugin-Authorization-ACL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-Plugin-Authorization-ACL.spec	1 Dec 2009 21:33:49 -0000	1.5
+++ perl-Catalyst-Plugin-Authorization-ACL.spec	7 Dec 2009 07:16:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      perl-Catalyst-Plugin-Authorization-ACL
 Version:   0.15
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   ACL Support for Catalyst Applications
 License:   GPL+ or Artistic
 Group:     Development/Libraries
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-2
+- rebuild against perl 5.10.1
+
 * Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 0.15-1
 - update to 0.15
 



From kasal at fedoraproject.org  Mon Dec  7 07:16:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:16:41 +0000 (UTC)
Subject: rpms/perl-Devel-Symdump/devel perl-Devel-Symdump.spec,1.25,1.26
Message-ID: <20091207071641.25F0F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Symdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23051

Modified Files:
	perl-Devel-Symdump.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Symdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Symdump/devel/perl-Devel-Symdump.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-Devel-Symdump.spec	5 Oct 2009 16:51:36 -0000	1.25
+++ perl-Devel-Symdump.spec	7 Dec 2009 07:16:40 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Symdump
 Version:        2.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        A Perl module for inspecting Perl's symbol table
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:2.08-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1:2.08-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 07:17:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:17:15 +0000 (UTC)
Subject: rpms/perl-WWW-Myspace/devel perl-WWW-Myspace.spec,1.17,1.18
Message-ID: <20091207071715.D4D5A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Myspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23379

Modified Files:
	perl-WWW-Myspace.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Myspace/devel/perl-WWW-Myspace.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-WWW-Myspace.spec	26 Jul 2009 17:27:59 -0000	1.17
+++ perl-WWW-Myspace.spec	7 Dec 2009 07:17:15 -0000	1.18
@@ -12,7 +12,7 @@
 
 Name:     perl-WWW-Myspace
 Version:  0.60
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
 Group:    Development/Libraries
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.60-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:19:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:19:09 +0000 (UTC)
Subject: rpms/perl-PPIx-EditorTools/devel perl-PPIx-EditorTools.spec, 1.2,
	1.3
Message-ID: <20091207071909.C2BFA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PPIx-EditorTools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24031

Modified Files:
	perl-PPIx-EditorTools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PPIx-EditorTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPIx-EditorTools/devel/perl-PPIx-EditorTools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-PPIx-EditorTools.spec	20 Nov 2009 09:17:25 -0000	1.2
+++ perl-PPIx-EditorTools.spec	7 Dec 2009 07:19:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-PPIx-EditorTools
 Version:        0.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utility methods and base class for manipulating Perl via PPI
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-2
+- rebuild against perl 5.10.1
+
 * Fri Nov 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.09-1
 - update
 



From kasal at fedoraproject.org  Mon Dec  7 07:20:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:20:00 +0000 (UTC)
Subject: rpms/perl-Lingua-Preferred/devel perl-Lingua-Preferred.spec, 1.4,
	1.5
Message-ID: <20091207072000.8F34111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Lingua-Preferred/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24436

Modified Files:
	perl-Lingua-Preferred.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Lingua-Preferred.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-Preferred/devel/perl-Lingua-Preferred.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Lingua-Preferred.spec	26 Jul 2009 08:58:03 -0000	1.4
+++ perl-Lingua-Preferred.spec	7 Dec 2009 07:20:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Lingua-Preferred
 Version:        0.2.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl extension to choose a language
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2.4-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:21:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:21:27 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-XMLRPC/devel
	perl-Catalyst-Model-XMLRPC.spec, 1.4, 1.5
Message-ID: <20091207072127.23FD611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Model-XMLRPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25077

Modified Files:
	perl-Catalyst-Model-XMLRPC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Model-XMLRPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Model-XMLRPC/devel/perl-Catalyst-Model-XMLRPC.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Catalyst-Model-XMLRPC.spec	26 Jul 2009 04:12:13 -0000	1.4
+++ perl-Catalyst-Model-XMLRPC.spec	7 Dec 2009 07:21:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Model-XMLRPC
 Version:        0.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        XMLRPC model class for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:21:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:21:39 +0000 (UTC)
Subject: rpms/perl-Devel-StackTrace/devel perl-Devel-StackTrace.spec, 1.21, 
	1.22
Message-ID: <20091207072139.26B4E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-StackTrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25225

Modified Files:
	perl-Devel-StackTrace.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-StackTrace/devel/perl-Devel-StackTrace.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-Devel-StackTrace.spec	26 Jul 2009 05:43:53 -0000	1.21
+++ perl-Devel-StackTrace.spec	7 Dec 2009 07:21:39 -0000	1.22
@@ -2,7 +2,7 @@ Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
 Version:	1.22
 Epoch:		1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:   	GPL+ or Artistic
 Group: 		Development/Libraries
 URL:       	http://search.cpan.org/dist/Devel-StackTrace
@@ -57,6 +57,9 @@ make test IS_MAINTAINER=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:1.22-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 07:22:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:22:37 +0000
Subject: [pkgdb] almanah ownership updated
Message-ID: <20091207072238.044D910F8A1@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora devel is now owned by th0br0

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/almanah



From kasal at fedoraproject.org  Mon Dec  7 07:23:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:23:20 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-TreeBuilder/devel
	perl-WWW-Mechanize-TreeBuilder.spec, 1.2, 1.3
Message-ID: <20091207072320.1C52211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Mechanize-TreeBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25819

Modified Files:
	perl-WWW-Mechanize-TreeBuilder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Mechanize-TreeBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Mechanize-TreeBuilder/devel/perl-WWW-Mechanize-TreeBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-WWW-Mechanize-TreeBuilder.spec	26 Jul 2009 17:27:44 -0000	1.2
+++ perl-WWW-Mechanize-TreeBuilder.spec	7 Dec 2009 07:23:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Mechanize-TreeBuilder
 Version:        1.10000
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        WWW::Mechanize::TreeBuilder Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.10000-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10000-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:23:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:23:38 +0000 (UTC)
Subject: rpms/perl-PPI-Tester/devel perl-PPI-Tester.spec,1.6,1.7
Message-ID: <20091207072338.37BD611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PPI-Tester/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26023

Modified Files:
	perl-PPI-Tester.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PPI-Tester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI-Tester/devel/perl-PPI-Tester.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-PPI-Tester.spec	26 Jul 2009 14:03:26 -0000	1.6
+++ perl-PPI-Tester.spec	7 Dec 2009 07:23:38 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           perl-PPI-Tester
 Version:        0.06
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A wxPerl-based interactive PPI debugger/tester
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:24:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:24:15 +0000 (UTC)
Subject: rpms/perl-Lingua-Flags/devel perl-Lingua-Flags.spec,1.2,1.3
Message-ID: <20091207072415.1D15A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Lingua-Flags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26325

Modified Files:
	perl-Lingua-Flags.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Lingua-Flags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-Flags/devel/perl-Lingua-Flags.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Lingua-Flags.spec	26 Jul 2009 08:57:47 -0000	1.2
+++ perl-Lingua-Flags.spec	7 Dec 2009 07:24:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Lingua-Flags
 Version:        0.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Provide small flag icons
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:27:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:27:14 +0000 (UTC)
Subject: rpms/perl-Devel-SmallProf/devel perl-Devel-SmallProf.spec,1.3,1.4
Message-ID: <20091207072714.4C0AD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-SmallProf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27437

Modified Files:
	perl-Devel-SmallProf.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-SmallProf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-SmallProf/devel/perl-Devel-SmallProf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Devel-SmallProf.spec	26 Jul 2009 05:43:41 -0000	1.3
+++ perl-Devel-SmallProf.spec	7 Dec 2009 07:27:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Devel-SmallProf
 Version:        2.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Per-line Perl profiler
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.02-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:27:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:27:24 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-LDAP/devel perl-Catalyst-Model-LDAP.spec,
	1.5, 1.6
Message-ID: <20091207072724.783C111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Model-LDAP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27609

Modified Files:
	perl-Catalyst-Model-LDAP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Model-LDAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Model-LDAP/devel/perl-Catalyst-Model-LDAP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-Model-LDAP.spec	26 Jul 2009 04:11:55 -0000	1.5
+++ perl-Catalyst-Model-LDAP.spec	7 Dec 2009 07:27:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Model-LDAP
 Version:        0.16
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        LDAP model class for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:27:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:27:42 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize-GZip/devel perl-WWW-Mechanize-GZip.spec, 1.1,
	1.2
Message-ID: <20091207072742.BC0AC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Mechanize-GZip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27825

Modified Files:
	perl-WWW-Mechanize-GZip.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Mechanize-GZip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Mechanize-GZip/devel/perl-WWW-Mechanize-GZip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-WWW-Mechanize-GZip.spec	30 Sep 2009 01:49:07 -0000	1.1
+++ perl-WWW-Mechanize-GZip.spec	7 Dec 2009 07:27:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-WWW-Mechanize-GZip 
 Version:    0.12 
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/WWW/Mechanize/GZip.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
 - submission
 - update filtering



From kasal at fedoraproject.org  Mon Dec  7 07:28:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:28:18 +0000 (UTC)
Subject: rpms/perl-PPI-HTML/devel perl-PPI-HTML.spec,1.6,1.7
Message-ID: <20091207072818.41D6411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PPI-HTML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28101

Modified Files:
	perl-PPI-HTML.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PPI-HTML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI-HTML/devel/perl-PPI-HTML.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-PPI-HTML.spec	26 Jul 2009 14:03:09 -0000	1.6
+++ perl-PPI-HTML.spec	7 Dec 2009 07:28:18 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-PPI-HTML
 Version:        1.07
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Generate syntax-hightlighted HTML for Perl using PPI
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:28:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:28:31 +0000 (UTC)
Subject: rpms/perl-Lingua-EN-Numbers-Ordinate/devel
	perl-Lingua-EN-Numbers-Ordinate.spec, 1.4, 1.5
Message-ID: <20091207072831.94CA611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Lingua-EN-Numbers-Ordinate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28307

Modified Files:
	perl-Lingua-EN-Numbers-Ordinate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Lingua-EN-Numbers-Ordinate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-EN-Numbers-Ordinate/devel/perl-Lingua-EN-Numbers-Ordinate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Lingua-EN-Numbers-Ordinate.spec	26 Jul 2009 08:57:32 -0000	1.4
+++ perl-Lingua-EN-Numbers-Ordinate.spec	7 Dec 2009 07:28:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Lingua-EN-Numbers-Ordinate
 Version:        1.02
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl functions for giving the ordinal form of a number given its cardinal value
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:31:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:31:47 +0000 (UTC)
Subject: rpms/perl-Devel-Size/devel perl-Devel-Size.spec,1.11,1.12
Message-ID: <20091207073147.E56C211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Size/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29487

Modified Files:
	perl-Devel-Size.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Size.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Size/devel/perl-Devel-Size.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Devel-Size.spec	26 Jul 2009 05:43:27 -0000	1.11
+++ perl-Devel-Size.spec	7 Dec 2009 07:31:47 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Size
 Version:        0.71
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for finding the memory usage of Perl variables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.71-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:32:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:32:27 +0000 (UTC)
Subject: rpms/perl-PPI/devel perl-PPI.spec,1.15,1.16
Message-ID: <20091207073227.32CE511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PPI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29766

Modified Files:
	perl-PPI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI/devel/perl-PPI.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-PPI.spec	7 Oct 2009 16:30:06 -0000	1.15
+++ perl-PPI.spec	7 Dec 2009 07:32:26 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-PPI
 Version:        1.206
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parse, Analyze and Manipulate Perl
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.206-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.206-1
 - new upstream version
 - update build requires



From kasal at fedoraproject.org  Mon Dec  7 07:32:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:32:34 +0000 (UTC)
Subject: rpms/perl-Lingua-EN-Inflect-Number/devel
	perl-Lingua-EN-Inflect-Number.spec, 1.9, 1.10
Message-ID: <20091207073234.B65F811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Lingua-EN-Inflect-Number/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29857

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-EN-Inflect-Number/devel/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Lingua-EN-Inflect-Number.spec	26 Jul 2009 08:57:17 -0000	1.9
+++ perl-Lingua-EN-Inflect-Number.spec	7 Dec 2009 07:32:34 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:32:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:32:52 +0000 (UTC)
Subject: rpms/perl-Catalyst-Model-DBIC-Schema/devel
	perl-Catalyst-Model-DBIC-Schema.spec, 1.5, 1.6
Message-ID: <20091207073252.4CFA011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Model-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30132

Modified Files:
	perl-Catalyst-Model-DBIC-Schema.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Model-DBIC-Schema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Model-DBIC-Schema/devel/perl-Catalyst-Model-DBIC-Schema.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-Model-DBIC-Schema.spec	26 Jul 2009 04:11:40 -0000	1.5
+++ perl-Catalyst-Model-DBIC-Schema.spec	7 Dec 2009 07:32:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Model-DBIC-Schema
 Version:        0.23
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DBIx::Class::Schema Model Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.23-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:33:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:33:25 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/devel perl-WWW-Curl.spec,1.6,1.7
Message-ID: <20091207073325.50DB111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30431

Modified Files:
	perl-WWW-Curl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/perl-WWW-Curl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-WWW-Curl.spec	26 Jul 2009 17:27:10 -0000	1.6
+++ perl-WWW-Curl.spec	7 Dec 2009 07:33:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Curl
 Version:        4.09
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MPLv1.1 or MIT
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.09-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:36:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:36:01 +0000 (UTC)
Subject: rpms/perl-Devel-REPL/devel perl-Devel-REPL.spec,1.4,1.5
Message-ID: <20091207073601.72E4F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-REPL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31208

Modified Files:
	perl-Devel-REPL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-REPL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-REPL/devel/perl-Devel-REPL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Devel-REPL.spec	26 Jul 2009 05:43:13 -0000	1.4
+++ perl-Devel-REPL.spec	7 Dec 2009 07:36:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Devel-REPL
 Version:        1.003007
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Modern perl interactive shell
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.003007-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.003007-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:37:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:37:40 +0000 (UTC)
Subject: rpms/perl-PostScript/devel perl-PostScript.spec,1.5,1.6
Message-ID: <20091207073740.1B63B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PostScript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31793

Modified Files:
	perl-PostScript.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PostScript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PostScript/devel/perl-PostScript.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-PostScript.spec	26 Jul 2009 16:17:07 -0000	1.5
+++ perl-PostScript.spec	7 Dec 2009 07:37:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-PostScript
 Version:        0.06
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        PostScript Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:37:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:37:41 +0000 (UTC)
Subject: rpms/perl-WWW-Bugzilla/devel perl-WWW-Bugzilla.spec,1.6,1.7
Message-ID: <20091207073741.E7CC211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31836

Modified Files:
	perl-WWW-Bugzilla.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Bugzilla/devel/perl-WWW-Bugzilla.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-WWW-Bugzilla.spec	26 Jul 2009 17:26:55 -0000	1.6
+++ perl-WWW-Bugzilla.spec	7 Dec 2009 07:37:41 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           perl-WWW-Bugzilla
 Version:        0.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Handles submission/update of bugzilla bugs via WWW::Mechanize
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:39:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:39:20 +0000 (UTC)
Subject: rpms/perl-Lingua-EN-Inflect/devel perl-Lingua-EN-Inflect.spec, 1.8, 
	1.9
Message-ID: <20091207073920.799C611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Lingua-EN-Inflect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32458

Modified Files:
	perl-Lingua-EN-Inflect.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Lingua-EN-Inflect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-EN-Inflect/devel/perl-Lingua-EN-Inflect.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Lingua-EN-Inflect.spec	26 Jul 2009 08:56:55 -0000	1.8
+++ perl-Lingua-EN-Inflect.spec	7 Dec 2009 07:39:20 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Lingua-EN-Inflect
 Version:        1.89
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Convert singular to plural, select "a" or "an"
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.89-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.89-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:40:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:40:13 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/devel perl-Catalyst-Manual.spec, 1.18,
	1.19
Message-ID: <20091207074013.721EE11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Manual/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv384

Modified Files:
	perl-Catalyst-Manual.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-Catalyst-Manual.spec	6 Dec 2009 03:30:14 -0000	1.18
+++ perl-Catalyst-Manual.spec	7 Dec 2009 07:40:13 -0000	1.19
@@ -1,7 +1,7 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
 Version:        5.8002
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:5.8002-2
+- rebuild against perl 5.10.1
+
 * Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.8002-1
 - auto-update to 5.8002 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 07:41:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:41:04 +0000 (UTC)
Subject: rpms/perl-Devel-Refcount/devel perl-Devel-Refcount.spec,1.1,1.2
Message-ID: <20091207074104.178AA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Refcount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv714

Modified Files:
	perl-Devel-Refcount.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Refcount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Refcount/devel/perl-Devel-Refcount.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Devel-Refcount.spec	29 Jul 2009 15:26:45 -0000	1.1
+++ perl-Devel-Refcount.spec	7 Dec 2009 07:41:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Refcount
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Obtain the REFCNT value of a referent
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,5 +47,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-2
+- rebuild against perl 5.10.1
+
 * Tue Jul 21 2009 Nicolas Chauvet (kwizart) 0.06-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 07:42:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:42:16 +0000 (UTC)
Subject: rpms/perl-POE-Wheel-Null/devel perl-POE-Wheel-Null.spec,1.7,1.8
Message-ID: <20091207074216.8EA7311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Wheel-Null/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1141

Modified Files:
	perl-POE-Wheel-Null.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Wheel-Null.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Wheel-Null/devel/perl-POE-Wheel-Null.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-POE-Wheel-Null.spec	26 Jul 2009 14:02:38 -0000	1.7
+++ perl-POE-Wheel-Null.spec	7 Dec 2009 07:42:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-POE-Wheel-Null
 Version:        0.01        
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        POE Wheel that does puts data nowhere, and sends nothing
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:42:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:42:23 +0000 (UTC)
Subject: rpms/perl-WWW-Babelfish/devel perl-WWW-Babelfish.spec,1.7,1.8
Message-ID: <20091207074223.6CCFD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WWW-Babelfish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1240

Modified Files:
	perl-WWW-Babelfish.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WWW-Babelfish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Babelfish/devel/perl-WWW-Babelfish.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-WWW-Babelfish.spec	26 Jul 2009 17:26:39 -0000	1.7
+++ perl-WWW-Babelfish.spec	7 Dec 2009 07:42:23 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Babelfish
 Version:        0.16
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for translation via Babelfish or Google
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:43:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:43:51 +0000 (UTC)
Subject: rpms/perl-libxml-perl/devel perl-libxml-perl.spec,1.18,1.19
Message-ID: <20091207074351.3FA3E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-libxml-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1846

Modified Files:
	perl-libxml-perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-libxml-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libxml-perl/devel/perl-libxml-perl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-libxml-perl.spec	26 Jul 2009 17:47:29 -0000	1.18
+++ perl-libxml-perl.spec	7 Dec 2009 07:43:51 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-libxml-perl
 Version:        0.08
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A collection of Perl modules for working with XML
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:44:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:44:52 +0000 (UTC)
Subject: rpms/perl-Catalyst-Log-Log4perl/devel
	perl-Catalyst-Log-Log4perl.spec, 1.6, 1.7
Message-ID: <20091207074452.C661E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2246

Modified Files:
	perl-Catalyst-Log-Log4perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel/perl-Catalyst-Log-Log4perl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Catalyst-Log-Log4perl.spec	25 Oct 2009 07:37:23 -0000	1.6
+++ perl-Catalyst-Log-Log4perl.spec	7 Dec 2009 07:44:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Log-Log4perl
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log::Log4perl logging for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-2
+- rebuild against perl 5.10.1
+
 * Sun Oct 25 2009 Iain Arnell <iarnell at gmail.com> 1.04-1
 - update to latest upstream
 



From kasal at fedoraproject.org  Mon Dec  7 07:45:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:45:38 +0000 (UTC)
Subject: rpms/perl-Devel-Refactor/devel perl-Devel-Refactor.spec,1.1,1.2
Message-ID: <20091207074538.ED77011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Refactor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2593

Modified Files:
	perl-Devel-Refactor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Refactor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Refactor/devel/perl-Devel-Refactor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Devel-Refactor.spec	20 Nov 2009 07:07:46 -0000	1.1
+++ perl-Devel-Refactor.spec	7 Dec 2009 07:45:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Refactor
 Version:        0.05
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for refactoring Perl code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,5 +45,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-2
+- rebuild against perl 5.10.1
+
 * Wed Nov 18 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.05-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 07:46:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:46:41 +0000 (UTC)
Subject: rpms/perl-POE-Filter-Zlib/devel perl-POE-Filter-Zlib.spec, 1.11,
	1.12
Message-ID: <20091207074641.B4DA511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Filter-Zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3217

Modified Files:
	perl-POE-Filter-Zlib.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Filter-Zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Filter-Zlib/devel/perl-POE-Filter-Zlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-POE-Filter-Zlib.spec	26 Jul 2009 14:02:01 -0000	1.11
+++ perl-POE-Filter-Zlib.spec	7 Dec 2009 07:46:41 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-POE-Filter-Zlib
 Version:        2.02
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        POE filter wrapped around Compress::Zlib
 
 # note license definition in Makefile.PL
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.02-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:47:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:47:17 +0000 (UTC)
Subject: rpms/perl-Workflow/devel perl-Workflow.spec,1.6,1.7
Message-ID: <20091207074717.A257B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Workflow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3576

Modified Files:
	perl-Workflow.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Workflow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Workflow/devel/perl-Workflow.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Workflow.spec	26 Jul 2009 17:29:50 -0000	1.6
+++ perl-Workflow.spec	7 Dec 2009 07:47:17 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Workflow
 Version:        1.32
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple, flexible system to implement workflows
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.32-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:47:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:47:49 +0000 (UTC)
Subject: rpms/perl-libwww-perl/devel perl-libwww-perl.spec,1.36,1.37
Message-ID: <20091207074749.BDB0B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-libwww-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3931

Modified Files:
	perl-libwww-perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- perl-libwww-perl.spec	6 Nov 2009 14:43:47 -0000	1.36
+++ perl-libwww-perl.spec	7 Dec 2009 07:47:49 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
 Version:        5.833
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 5.833-2
+- rebuild against perl 5.10.1
+
 * Fri Nov  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 5.833-1
 - update
 



From petersen at fedoraproject.org  Mon Dec  7 07:48:16 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon,  7 Dec 2009 07:48:16 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.112,1.113
Message-ID: <20091207074816.9AAF511C00EE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31855

Modified Files:
	comps-f13.xml.in 
Log Message:
replace cjkuni-uming-fonts with wqy-zenhei-fonts as the default Chinese font
(#476459)



Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- comps-f13.xml.in	7 Dec 2009 00:33:59 -0000	1.112
+++ comps-f13.xml.in	7 Dec 2009 07:48:15 -0000	1.113
@@ -660,8 +660,9 @@
     <uservisible>true</uservisible>
     <langonly>zh</langonly>
     <packagelist>
-      <packagereq type="mandatory">cjkuni-ukai-fonts</packagereq>
-      <packagereq type="mandatory">cjkuni-uming-fonts</packagereq>
+      <packagereq type="mandatory">wqy-zenhei-fonts</packagereq>
+      <packagereq type="default">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="conditional" requires="autocorr-en">autocorr-zh</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh_TW</packagereq>
@@ -704,7 +705,6 @@
       <packagereq type="optional">taipeifonts</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
       <packagereq type="optional">wqy-unibit-fonts</packagereq>
-      <packagereq type="optional">wqy-zenhei-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1815,7 +1815,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">abyssinica-fonts</packagereq>
-      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
@@ -1859,6 +1858,7 @@
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
+      <packagereq type="default">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-3-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-fonts</packagereq>
@@ -1902,6 +1902,7 @@
       <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">conakry-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
@@ -2090,7 +2091,6 @@
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-shadow-fonts</packagereq>
-      <packagereq type="optional">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">yanone-kaffeesatz-fonts</packagereq>
       <packagereq type="optional">yanone-tagesschrift-fonts</packagereq>



From kasal at fedoraproject.org  Mon Dec  7 07:49:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:49:45 +0000 (UTC)
Subject: rpms/perl-Catalyst-Helper-FastCGI-ExternalServer/devel
	perl-Catalyst-Helper-FastCGI-ExternalServer.spec, 1.2, 1.3
Message-ID: <20091207074945.006E911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Helper-FastCGI-ExternalServer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4861

Modified Files:
	perl-Catalyst-Helper-FastCGI-ExternalServer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Helper-FastCGI-ExternalServer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Helper-FastCGI-ExternalServer/devel/perl-Catalyst-Helper-FastCGI-ExternalServer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Catalyst-Helper-FastCGI-ExternalServer.spec	26 Jul 2009 04:10:54 -0000	1.2
+++ perl-Catalyst-Helper-FastCGI-ExternalServer.spec	7 Dec 2009 07:49:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Catalyst-Helper-FastCGI-ExternalServer 
 Version:    0.05 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Catalyst/Helper/FastCGI/ExternalServer.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:50:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:50:20 +0000 (UTC)
Subject: rpms/perl-Devel-Profiler/devel perl-Devel-Profiler.spec,1.5,1.6
Message-ID: <20091207075020.5FA3C11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Profiler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5112

Modified Files:
	perl-Devel-Profiler.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Profiler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Profiler/devel/perl-Devel-Profiler.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Devel-Profiler.spec	26 Jul 2009 05:42:59 -0000	1.5
+++ perl-Devel-Profiler.spec	7 Dec 2009 07:50:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Profiler
 Version:        0.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl profiler compatible with dprofpp
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:51:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:51:02 +0000 (UTC)
Subject: rpms/perl-POE-Filter-Transparent-SMTP/devel
	perl-POE-Filter-Transparent-SMTP.spec, 1.3, 1.4
Message-ID: <20091207075102.7AD0711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Filter-Transparent-SMTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5483

Modified Files:
	perl-POE-Filter-Transparent-SMTP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Filter-Transparent-SMTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Filter-Transparent-SMTP/devel/perl-POE-Filter-Transparent-SMTP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-POE-Filter-Transparent-SMTP.spec	26 Jul 2009 14:01:46 -0000	1.3
+++ perl-POE-Filter-Transparent-SMTP.spec	7 Dec 2009 07:51:02 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Filter-Transparent-SMTP
 Version:        0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A POE filter for SMTP
 
 # note license definition in Makefile.PL
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ellert at fedoraproject.org  Mon Dec  7 07:52:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon,  7 Dec 2009 07:52:23 +0000 (UTC)
Subject: rpms/globus-core/devel globus-core.spec,1.6,1.7
Message-ID: <20091207075223.1804711C00EE@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6159

Modified Files:
	globus-core.spec 
Log Message:
rebuild against perl 5.10.1


Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/devel/globus-core.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-core.spec	25 Jul 2009 07:26:48 -0000	1.6
+++ globus-core.spec	7 Dec 2009 07:52:22 -0000	1.7
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -208,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Mon Dec 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-7
+- rebuild against perl 5.10.1
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-6
 - The globus-spec-creator script now uses isa tags and noarch doc subpackages
 - Replace /usr/bin/env shebangs



From kasal at fedoraproject.org  Mon Dec  7 07:52:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:52:40 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-HTML-W3C/devel
	perl-WebService-Validator-HTML-W3C.spec, 1.3, 1.4
Message-ID: <20091207075240.DF37511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6264

Modified Files:
	perl-WebService-Validator-HTML-W3C.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WebService-Validator-HTML-W3C.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-HTML-W3C/devel/perl-WebService-Validator-HTML-W3C.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-WebService-Validator-HTML-W3C.spec	18 Nov 2009 15:43:39 -0000	1.3
+++ perl-WebService-Validator-HTML-W3C.spec	7 Dec 2009 07:52:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-WebService-Validator-HTML-W3C
 Version:        0.24
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Access the W3Cs online HTML validator
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.24-4
+- rebuild against perl 5.10.1
+
 * Wed Nov 18 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.24-3
 - add missing requires
 



From kasal at fedoraproject.org  Mon Dec  7 07:53:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:53:09 +0000 (UTC)
Subject: rpms/perl-libwhisker2/devel perl-libwhisker2.spec,1.5,1.6
Message-ID: <20091207075309.D9C4E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-libwhisker2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6547

Modified Files:
	perl-libwhisker2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-libwhisker2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwhisker2/devel/perl-libwhisker2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-libwhisker2.spec	26 Jul 2009 17:46:58 -0000	1.5
+++ perl-libwhisker2.spec	7 Dec 2009 07:53:09 -0000	1.6
@@ -2,7 +2,7 @@ Name:           perl-libwhisker2
 Obsoletes:      perl-libwhisker <= 1.8
 Provides:       perl-libwhisker = %{version}-%{release}
 Version:        2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl module geared specificly for HTTP testing
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.4-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 07:53:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:53:33 +0000
Subject: [pkgdb] galeon ownership updated
Message-ID: <20091207075333.B7AD010F85F@bastion2.fedora.phx.redhat.com>

Package galeon in Fedora devel is now owned by yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:54:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:54:10 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207075410.41C7310F878@bastion2.fedora.phx.redhat.com>

yaneti has set the watchbugzilla acl on galeon (Fedora devel) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 07:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 07:54:12 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207075412.7C62D10F801@bastion2.fedora.phx.redhat.com>

yaneti has set the watchcommits acl on galeon (Fedora devel) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From kasal at fedoraproject.org  Mon Dec  7 07:54:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:54:23 +0000 (UTC)
Subject: rpms/perl-Catalyst-Engine-Apache/devel
	perl-Catalyst-Engine-Apache.spec, 1.3, 1.4
Message-ID: <20091207075423.75E8911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Engine-Apache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7259

Modified Files:
	perl-Catalyst-Engine-Apache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Engine-Apache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Engine-Apache/devel/perl-Catalyst-Engine-Apache.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Catalyst-Engine-Apache.spec	26 Jul 2009 04:10:38 -0000	1.3
+++ perl-Catalyst-Engine-Apache.spec	7 Dec 2009 07:54:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Engine-Apache
 Version:        1.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Catalyst Apache Engines
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:55:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:55:06 +0000 (UTC)
Subject: rpms/perl-Devel-NYTProf/devel perl-Devel-NYTProf.spec,1.3,1.4
Message-ID: <20091207075506.E8D2011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-NYTProf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7677

Modified Files:
	perl-Devel-NYTProf.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-NYTProf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-NYTProf/devel/perl-Devel-NYTProf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Devel-NYTProf.spec	26 Jul 2009 05:42:44 -0000	1.3
+++ perl-Devel-NYTProf.spec	7 Dec 2009 07:55:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Devel-NYTProf
 Version:        2.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Powerful feature-rich perl source code profiler
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.10-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:55:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:55:22 +0000 (UTC)
Subject: rpms/perl-POE-Filter-IRCD/devel perl-POE-Filter-IRCD.spec, 1.12,
	1.13
Message-ID: <20091207075522.99ADF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Filter-IRCD/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7851

Modified Files:
	perl-POE-Filter-IRCD.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Filter-IRCD.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Filter-IRCD/devel/perl-POE-Filter-IRCD.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-POE-Filter-IRCD.spec	26 Jul 2009 14:01:30 -0000	1.12
+++ perl-POE-Filter-IRCD.spec	7 Dec 2009 07:55:22 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-POE-Filter-IRCD
 Version:        2.40
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A POE-based parser for the IRC protocol
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.40-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.40-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:56:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:56:58 +0000 (UTC)
Subject: rpms/perl-WebService-Validator-CSS-W3C/devel
	perl-WebService-Validator-CSS-W3C.spec, 1.3, 1.4
Message-ID: <20091207075658.10DB511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8359

Modified Files:
	perl-WebService-Validator-CSS-W3C.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-WebService-Validator-CSS-W3C.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WebService-Validator-CSS-W3C/devel/perl-WebService-Validator-CSS-W3C.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-WebService-Validator-CSS-W3C.spec	18 Nov 2009 15:29:41 -0000	1.3
+++ perl-WebService-Validator-CSS-W3C.spec	7 Dec 2009 07:56:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-WebService-Validator-CSS-W3C
 Version:        0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Interface to the W3C CSS Validator
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2-4
+- rebuild against perl 5.10.1
+
 * Wed Nov 18 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.2-3
 - add missing requirement
 



From kasal at fedoraproject.org  Mon Dec  7 07:58:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:58:01 +0000 (UTC)
Subject: rpms/perl-libintl/devel perl-libintl.spec,1.12,1.13
Message-ID: <20091207075801.193FC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-libintl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8766

Modified Files:
	perl-libintl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-libintl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libintl/devel/perl-libintl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-libintl.spec	26 Jul 2009 17:46:43 -0000	1.12
+++ perl-libintl.spec	7 Dec 2009 07:58:00 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Internationalization library for Perl, compatible with gettext
 Name: perl-libintl
 Version: 1.16
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/libintl-perl/
@@ -55,6 +55,9 @@ chmod -R u+w %{buildroot}/*
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.16-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 07:58:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:58:54 +0000 (UTC)
Subject: rpms/perl-Catalyst-Devel/devel perl-Catalyst-Devel.spec,1.17,1.18
Message-ID: <20091207075854.A2E6711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Devel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9127

Modified Files:
	perl-Catalyst-Devel.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Devel/devel/perl-Catalyst-Devel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Catalyst-Devel.spec	21 Aug 2009 23:10:07 -0000	1.17
+++ perl-Catalyst-Devel.spec	7 Dec 2009 07:58:54 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Devel
 Version:        1.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Catalyst Development Tools
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 %exclude %{perl_vendorlib}/Catalyst/Restarter/Win32.pm
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.20-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.20-1
 - auto-update to 1.20 (by cpan-spec-update 0.01)
 - altered br on perl(File::ChangeNotify) (0.03 => 0.07)



From kasal at fedoraproject.org  Mon Dec  7 07:59:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 07:59:57 +0000 (UTC)
Subject: rpms/perl-POE-Component-SSLify/devel perl-POE-Component-SSLify.spec,
	1.12, 1.13
Message-ID: <20091207075957.CA2EC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-SSLify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9513

Modified Files:
	perl-POE-Component-SSLify.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-SSLify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-SSLify/devel/perl-POE-Component-SSLify.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-POE-Component-SSLify.spec	26 Jul 2009 13:59:12 -0000	1.12
+++ perl-POE-Component-SSLify.spec	7 Dec 2009 07:59:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-SSLify
 Version:        0.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Makes using SSL in the world of POE easy!
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:01:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:01:33 +0000 (UTC)
Subject: rpms/perl-Devel-LexAlias/devel perl-Devel-LexAlias.spec,1.5,1.6
Message-ID: <20091207080133.5FDCF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-LexAlias/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10113

Modified Files:
	perl-Devel-LexAlias.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-LexAlias.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-LexAlias/devel/perl-Devel-LexAlias.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Devel-LexAlias.spec	26 Jul 2009 05:42:31 -0000	1.5
+++ perl-Devel-LexAlias.spec	7 Dec 2009 08:01:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Devel-LexAlias
 Version:        0.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Alias lexical variables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:01:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:01:43 +0000 (UTC)
Subject: rpms/perl-Want/devel perl-Want.spec,1.15,1.16
Message-ID: <20091207080143.B5D3811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Want/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10265

Modified Files:
	perl-Want.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Want.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Want/devel/perl-Want.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Want.spec	26 Jul 2009 17:29:01 -0000	1.15
+++ perl-Want.spec	7 Dec 2009 08:01:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name: 		perl-Want
 Version: 	0.18
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Perl module implementing a generalisation of wantarray
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -47,6 +47,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:02:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:02:20 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence/devel perl-Lexical-Persistence.spec,
	1.3, 1.4
Message-ID: <20091207080220.BBE8711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10573

Modified Files:
	perl-Lexical-Persistence.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Lexical-Persistence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/devel/perl-Lexical-Persistence.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Lexical-Persistence.spec	10 Aug 2009 16:49:59 -0000	1.3
+++ perl-Lexical-Persistence.spec	7 Dec 2009 08:02:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Lexical-Persistence
 Version:        1.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Persistent lexical variable values for arbitrary calls
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-2
+- rebuild against perl 5.10.1
+
 * Mon Aug 10 2009 Iain Arnell <iarnell at gmail.com> 1.01-1
 - update to latest upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 08:03:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:03:54 +0000 (UTC)
Subject: rpms/perl-Catalyst-Controller-HTML-FormFu/devel
	perl-Catalyst-Controller-HTML-FormFu.spec, 1.6, 1.7
Message-ID: <20091207080354.9635611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11153

Modified Files:
	perl-Catalyst-Controller-HTML-FormFu.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Controller-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/perl-Catalyst-Controller-HTML-FormFu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Catalyst-Controller-HTML-FormFu.spec	26 Jul 2009 04:10:01 -0000	1.6
+++ perl-Catalyst-Controller-HTML-FormFu.spec	7 Dec 2009 08:03:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Controller-HTML-FormFu
 Version:        0.05000
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HTML::FormFu controller for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05000-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05000-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:04:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:04:04 +0000 (UTC)
Subject: rpms/perl-POE-Component-SNMP/devel perl-POE-Component-SNMP.spec,
	1.10, 1.11
Message-ID: <20091207080404.C15B911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-SNMP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11299

Modified Files:
	perl-POE-Component-SNMP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-SNMP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-SNMP/devel/perl-POE-Component-SNMP.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-POE-Component-SNMP.spec	26 Jul 2009 13:58:54 -0000	1.10
+++ perl-POE-Component-SNMP.spec	7 Dec 2009 08:04:03 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-SNMP
 Version:        1.1001
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        POE interface to Net::SNMP 
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1001-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1001-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:05:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:05:43 +0000 (UTC)
Subject: rpms/perl-Devel-LeakGuard-Object/devel
	perl-Devel-LeakGuard-Object.spec, 1.1, 1.2
Message-ID: <20091207080543.4A76311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11866

Modified Files:
	perl-Devel-LeakGuard-Object.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-LeakGuard-Object.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/devel/perl-Devel-LeakGuard-Object.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Devel-LeakGuard-Object.spec	22 Aug 2009 00:50:11 -0000	1.1
+++ perl-Devel-LeakGuard-Object.spec	7 Dec 2009 08:05:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Devel-LeakGuard-Object
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Scoped checks for object leaks
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,5 +46,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 08 2009 Iain Arnell 0.06-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 08:05:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:05:49 +0000 (UTC)
Subject: rpms/perl-Verilog-Readmem/devel perl-Verilog-Readmem.spec,1.2,1.3
Message-ID: <20091207080549.CA1AF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Verilog-Readmem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11933

Modified Files:
	perl-Verilog-Readmem.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Verilog-Readmem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Readmem/devel/perl-Verilog-Readmem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Verilog-Readmem.spec	26 Jul 2009 17:26:25 -0000	1.2
+++ perl-Verilog-Readmem.spec	7 Dec 2009 08:05:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Verilog-Readmem
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parse Verilog $readmemh or $readmemb text file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:07:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:07:13 +0000 (UTC)
Subject: rpms/perl-LDAP/devel perl-LDAP.spec,1.18,1.19
Message-ID: <20091207080713.7C43C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-LDAP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12524

Modified Files:
	perl-LDAP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-LDAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-LDAP/devel/perl-LDAP.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-LDAP.spec	26 Jul 2009 08:56:01 -0000	1.18
+++ perl-LDAP.spec	7 Dec 2009 08:07:12 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-LDAP
 Version:        0.34
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        LDAP Perl module
 
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:0.34-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.34-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:08:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:08:11 +0000 (UTC)
Subject: rpms/perl-POE-Component-SimpleLog/devel
	perl-POE-Component-SimpleLog.spec, 1.9, 1.10
Message-ID: <20091207080811.5E52C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-SimpleLog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12940

Modified Files:
	perl-POE-Component-SimpleLog.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-SimpleLog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-SimpleLog/devel/perl-POE-Component-SimpleLog.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-POE-Component-SimpleLog.spec	26 Jul 2009 14:01:14 -0000	1.9
+++ perl-POE-Component-SimpleLog.spec	7 Dec 2009 08:08:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-SimpleLog
 Version:        1.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A simple logging system for POE 
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:08:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:08:40 +0000 (UTC)
Subject: rpms/perl-Catalyst-Controller-FormBuilder/devel
	perl-Catalyst-Controller-FormBuilder.spec, 1.6, 1.7
Message-ID: <20091207080840.1F0A811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Controller-FormBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13156

Modified Files:
	perl-Catalyst-Controller-FormBuilder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Controller-FormBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-FormBuilder/devel/perl-Catalyst-Controller-FormBuilder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Catalyst-Controller-FormBuilder.spec	26 Jul 2009 04:09:45 -0000	1.6
+++ perl-Catalyst-Controller-FormBuilder.spec	7 Dec 2009 08:08:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Controller-FormBuilder
 Version:        0.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Catalyst FormBuilder Base Controller
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -94,6 +94,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:09:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:09:50 +0000 (UTC)
Subject: rpms/perl-Devel-Leak/devel perl-Devel-Leak.spec,1.9,1.10
Message-ID: <20091207080950.7FA8311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Leak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13551

Modified Files:
	perl-Devel-Leak.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Leak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Leak/devel/perl-Devel-Leak.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Devel-Leak.spec	26 Jul 2009 05:42:16 -0000	1.9
+++ perl-Devel-Leak.spec	7 Dec 2009 08:09:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Leak
 Version:        0.03
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Utility for looking for perl objects that are not reclaimed
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:10:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:10:09 +0000 (UTC)
Subject: rpms/perl-Verilog-Perl/devel perl-Verilog-Perl.spec,1.2,1.3
Message-ID: <20091207081009.7E85011C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Verilog-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13791

Modified Files:
	perl-Verilog-Perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Verilog-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/devel/perl-Verilog-Perl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Verilog-Perl.spec	25 Nov 2009 20:55:56 -0000	1.2
+++ perl-Verilog-Perl.spec	7 Dec 2009 08:10:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:          perl-Verilog-Perl
 Version:       3.222
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Verilog parsing routines
 
 License:       LGPLv3 or Artistic 2.0
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.222-2
+- rebuild against perl 5.10.1
+
 * Wed Nov 25 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.222-1
 - New upstream release
 



From kasal at fedoraproject.org  Mon Dec  7 08:11:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:11:34 +0000 (UTC)
Subject: rpms/perl-latest/devel perl-latest.spec,1.1,1.2
Message-ID: <20091207081134.DBA7011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-latest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14364

Modified Files:
	perl-latest.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-latest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-latest/devel/perl-latest.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-latest.spec	11 Aug 2009 14:44:05 -0000	1.1
+++ perl-latest.spec	7 Dec 2009 08:11:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-latest
 Version:        0.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Use the latest Perl features
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,5 +45,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 08 2009 Iain Arnell 0.03-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 08:12:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:12:28 +0000 (UTC)
Subject: rpms/perl-POE-Component-SimpleDBI/devel
	perl-POE-Component-SimpleDBI.spec, 1.10, 1.11
Message-ID: <20091207081228.06F7911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-SimpleDBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14773

Modified Files:
	perl-POE-Component-SimpleDBI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-SimpleDBI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-SimpleDBI/devel/perl-POE-Component-SimpleDBI.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-POE-Component-SimpleDBI.spec	26 Jul 2009 14:00:55 -0000	1.10
+++ perl-POE-Component-SimpleDBI.spec	7 Dec 2009 08:12:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-SimpleDBI
 Version:        1.27
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Asynchronous non-blocking DBI calls in POE made simple
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.27-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:13:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:13:22 +0000 (UTC)
Subject: rpms/perl-Catalyst-Controller-BindLex/devel
	perl-Catalyst-Controller-BindLex.spec, 1.5, 1.6
Message-ID: <20091207081322.DEA9C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Controller-BindLex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15160

Modified Files:
	perl-Catalyst-Controller-BindLex.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Controller-BindLex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-BindLex/devel/perl-Catalyst-Controller-BindLex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-Controller-BindLex.spec	26 Jul 2009 04:09:23 -0000	1.5
+++ perl-Catalyst-Controller-BindLex.spec	7 Dec 2009 08:13:22 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Controller-BindLex
 Version:        0.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Stash your lexical goodness
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:14:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:14:17 +0000 (UTC)
Subject: rpms/perl-Devel-Hide/devel perl-Devel-Hide.spec,1.2,1.3
Message-ID: <20091207081417.A151611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Hide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15497

Modified Files:
	perl-Devel-Hide.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Hide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Hide/devel/perl-Devel-Hide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Devel-Hide.spec	26 Jul 2009 05:42:03 -0000	1.2
+++ perl-Devel-Hide.spec	7 Dec 2009 08:14:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Hide
 Version:        0.0008
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Forces the unavailability of specified Perl modules (for testing)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.0008-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0008-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:15:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:15:30 +0000 (UTC)
Subject: rpms/perl-Verilog-CodeGen/devel perl-Verilog-CodeGen.spec,1.2,1.3
Message-ID: <20091207081530.F1C2211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Verilog-CodeGen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15906

Modified Files:
	perl-Verilog-CodeGen.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Verilog-CodeGen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-CodeGen/devel/perl-Verilog-CodeGen.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Verilog-CodeGen.spec	26 Jul 2009 17:26:08 -0000	1.2
+++ perl-Verilog-CodeGen.spec	7 Dec 2009 08:15:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Verilog-CodeGen
 Version:        0.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Verilog code generator
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9.4-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:15:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:15:57 +0000 (UTC)
Subject: rpms/perl-Kwiki-Users-Remote/devel perl-Kwiki-Users-Remote.spec, 1.8,
	1.9
Message-ID: <20091207081557.8D32511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-Users-Remote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16141

Modified Files:
	perl-Kwiki-Users-Remote.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-Users-Remote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-Users-Remote/devel/perl-Kwiki-Users-Remote.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Kwiki-Users-Remote.spec	26 Jul 2009 08:55:47 -0000	1.8
+++ perl-Kwiki-Users-Remote.spec	7 Dec 2009 08:15:57 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-Users-Remote
 Version:        0.04
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Automatically set Kwiki user name from HTTP authentication
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:16:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:16:30 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-XMLRPC/devel
	perl-POE-Component-Server-XMLRPC.spec, 1.6, 1.7
Message-ID: <20091207081630.9999011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Server-XMLRPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16392

Modified Files:
	perl-POE-Component-Server-XMLRPC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Server-XMLRPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-XMLRPC/devel/perl-POE-Component-Server-XMLRPC.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-POE-Component-Server-XMLRPC.spec	26 Jul 2009 14:00:38 -0000	1.6
+++ perl-POE-Component-Server-XMLRPC.spec	7 Dec 2009 08:16:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-XMLRPC
 Version:        0.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Publish POE event handlers via XMLRPC over HTTP
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:18:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:18:13 +0000 (UTC)
Subject: rpms/perl-Devel-GlobalDestruction/devel
	perl-Devel-GlobalDestruction.spec, 1.6, 1.7
Message-ID: <20091207081813.B466E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-GlobalDestruction/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17082

Modified Files:
	perl-Devel-GlobalDestruction.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-GlobalDestruction.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-GlobalDestruction/devel/perl-Devel-GlobalDestruction.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Devel-GlobalDestruction.spec	23 Aug 2009 19:27:44 -0000	1.6
+++ perl-Devel-GlobalDestruction.spec	7 Dec 2009 08:18:13 -0000	1.7
@@ -1,6 +1,6 @@
 Name:       perl-Devel-GlobalDestruction 
 Version:    0.02 
-Release:    7%{?dist}
+Release:    8%{?dist}
 # see lib/Devel/GlobalDestruction.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-8
+- rebuild against perl 5.10.1
+
 * Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-7
 - bump
 



From kasal at fedoraproject.org  Mon Dec  7 08:18:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:18:25 +0000 (UTC)
Subject: rpms/perl-Catalyst-Component-InstancePerContext/devel
	perl-Catalyst-Component-InstancePerContext.spec, 1.3, 1.4
Message-ID: <20091207081825.DD9E411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Component-InstancePerContext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17262

Modified Files:
	perl-Catalyst-Component-InstancePerContext.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Component-InstancePerContext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Component-InstancePerContext/devel/perl-Catalyst-Component-InstancePerContext.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Catalyst-Component-InstancePerContext.spec	26 Jul 2009 04:09:05 -0000	1.3
+++ perl-Catalyst-Component-InstancePerContext.spec	7 Dec 2009 08:18:25 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Component-InstancePerContext
 Version:        0.001001
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Return a new instance a component on each request
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.001001-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.001001-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:19:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:19:47 +0000 (UTC)
Subject: rpms/perl-Verilog/devel perl-Verilog.spec,1.11,1.12
Message-ID: <20091207081947.3F34111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Verilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17746

Modified Files:
	perl-Verilog.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/perl-Verilog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Verilog.spec	4 Aug 2009 08:26:20 -0000	1.11
+++ perl-Verilog.spec	7 Dec 2009 08:19:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          perl-Verilog
 Version:       3.212
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Verilog parsing routines
 
 License:       LGPL+ or Artistic
@@ -65,6 +65,9 @@ find %{buildroot} -depth -type d -exec r
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.212-2
+- rebuild against perl 5.10.1
+
 * Mon Jun 20 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.212-1
 - upstream v3.212
 



From jpopelka at fedoraproject.org  Mon Dec  7 08:20:07 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon,  7 Dec 2009 08:20:07 +0000 (UTC)
Subject: File lockdev_1.0.3.orig.tar.gz uploaded to lookaside cache by
	jpopelka
Message-ID: <20091207082007.D193610F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lockdev:

64b9c1b87b125fc348e892e24625524a  lockdev_1.0.3.orig.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 08:20:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:20:25 +0000 (UTC)
Subject: rpms/perl-Kwiki-UserPreferences/devel
	perl-Kwiki-UserPreferences.spec, 1.8, 1.9
Message-ID: <20091207082025.ADDDB11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-UserPreferences/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18061

Modified Files:
	perl-Kwiki-UserPreferences.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-UserPreferences.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-UserPreferences/devel/perl-Kwiki-UserPreferences.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Kwiki-UserPreferences.spec	26 Jul 2009 08:55:33 -0000	1.8
+++ perl-Kwiki-UserPreferences.spec	7 Dec 2009 08:20:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-UserPreferences
 Version:        0.13
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Kwiki User Preferences Plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:20:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:20:51 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-SOAP/devel
	perl-POE-Component-Server-SOAP.spec, 1.11, 1.12
Message-ID: <20091207082051.C58B511C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Server-SOAP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18290

Modified Files:
	perl-POE-Component-Server-SOAP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Server-SOAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-SOAP/devel/perl-POE-Component-Server-SOAP.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-POE-Component-Server-SOAP.spec	26 Jul 2009 14:00:04 -0000	1.11
+++ perl-POE-Component-Server-SOAP.spec	7 Dec 2009 08:20:51 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SOAP
 Version:        1.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Publish POE event handlers via SOAP over HTTP
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.14-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:22:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:22:32 +0000 (UTC)
Subject: rpms/perl-Devel-FindRef/devel perl-Devel-FindRef.spec,1.7,1.8
Message-ID: <20091207082232.06B3E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-FindRef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19015

Modified Files:
	perl-Devel-FindRef.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-FindRef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/devel/perl-Devel-FindRef.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Devel-FindRef.spec	31 Aug 2009 15:11:58 -0000	1.7
+++ perl-Devel-FindRef.spec	7 Dec 2009 08:22:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Devel-FindRef
 Version:        1.42
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Where is that reference to my variable hiding?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Devel*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.42-7
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 Nicolas Chauvet (kwizart) 1.42-5
 - Update internal version to 1.422
 



From kasal at fedoraproject.org  Mon Dec  7 08:22:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:22:37 +0000 (UTC)
Subject: rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel
	perl-Catalyst-Authentication-Store-DBIx-Class.spec, 1.3, 1.4
Message-ID: <20091207082237.95C1811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19061

Modified Files:
	perl-Catalyst-Authentication-Store-DBIx-Class.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Authentication-Store-DBIx-Class.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel/perl-Catalyst-Authentication-Store-DBIx-Class.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Catalyst-Authentication-Store-DBIx-Class.spec	26 Jul 2009 04:08:48 -0000	1.3
+++ perl-Catalyst-Authentication-Store-DBIx-Class.spec	7 Dec 2009 08:22:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      perl-Catalyst-Authentication-Store-DBIx-Class
 Version:   0.1082
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A storage class for Catalyst Authentication using DBIx::Class
 License:   GPL+ or Artistic
 Group:     Development/Libraries
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.1082-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1082-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:24:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:24:33 +0000 (UTC)
Subject: rpms/perl-Kwiki-UserName/devel perl-Kwiki-UserName.spec,1.9,1.10
Message-ID: <20091207082433.08B4D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-UserName/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19968

Modified Files:
	perl-Kwiki-UserName.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-UserName.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-UserName/devel/perl-Kwiki-UserName.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Kwiki-UserName.spec	26 Jul 2009 08:55:18 -0000	1.9
+++ perl-Kwiki-UserName.spec	7 Dec 2009 08:24:32 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-UserName
 Version:        0.14
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Kwiki User Name Plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:24:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:24:33 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-SimpleHTTP/devel
	perl-POE-Component-Server-SimpleHTTP.spec, 1.14, 1.15
Message-ID: <20091207082433.B301311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Server-SimpleHTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19987

Modified Files:
	perl-POE-Component-Server-SimpleHTTP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Server-SimpleHTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-SimpleHTTP/devel/perl-POE-Component-Server-SimpleHTTP.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-POE-Component-Server-SimpleHTTP.spec	27 Sep 2009 09:06:03 -0000	1.14
+++ perl-POE-Component-Server-SimpleHTTP.spec	7 Dec 2009 08:24:33 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SimpleHTTP
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serve HTTP requests in POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.0-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
 - auto-update to 2.0 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)



From kasal at fedoraproject.org  Mon Dec  7 08:24:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:24:46 +0000 (UTC)
Subject: rpms/perl-VCS-LibCVS/devel perl-VCS-LibCVS.spec,1.4,1.5
Message-ID: <20091207082446.612F911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-VCS-LibCVS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20213

Modified Files:
	perl-VCS-LibCVS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-VCS-LibCVS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-VCS-LibCVS/devel/perl-VCS-LibCVS.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-VCS-LibCVS.spec	26 Jul 2009 17:25:14 -0000	1.4
+++ perl-VCS-LibCVS.spec	7 Dec 2009 08:24:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-VCS-LibCVS
 Version:        1.0002
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Access CVS working directories and repositories
 License:        GPLv2+ or Artistic 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.0002-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0002-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:27:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:27:22 +0000 (UTC)
Subject: rpms/perl-Devel-FastProf/devel perl-Devel-FastProf.spec,1.2,1.3
Message-ID: <20091207082722.8881D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-FastProf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21036

Modified Files:
	perl-Devel-FastProf.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-FastProf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FastProf/devel/perl-Devel-FastProf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Devel-FastProf.spec	26 Jul 2009 05:41:36 -0000	1.2
+++ perl-Devel-FastProf.spec	7 Dec 2009 08:27:21 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Devel-FastProf
 Version:        0.08
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fast perl per-line profiler
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:28:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:28:21 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-HTTP/devel
	perl-POE-Component-Server-HTTP.spec, 1.7, 1.8
Message-ID: <20091207082821.2538011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Server-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21465

Modified Files:
	perl-POE-Component-Server-HTTP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Server-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-HTTP/devel/perl-POE-Component-Server-HTTP.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-POE-Component-Server-HTTP.spec	26 Jul 2009 13:59:48 -0000	1.7
+++ perl-POE-Component-Server-HTTP.spec	7 Dec 2009 08:28:20 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-HTTP
 Version:        0.09
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Foundation of a POE HTTP Daemon
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:28:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:28:29 +0000 (UTC)
Subject: rpms/perl-Catalyst-Action-RenderView/devel
	perl-Catalyst-Action-RenderView.spec, 1.13, 1.14
Message-ID: <20091207082829.D8ECE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Catalyst-Action-RenderView/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21565

Modified Files:
	perl-Catalyst-Action-RenderView.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Catalyst-Action-RenderView.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Action-RenderView/devel/perl-Catalyst-Action-RenderView.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Catalyst-Action-RenderView.spec	6 Dec 2009 03:39:55 -0000	1.13
+++ perl-Catalyst-Action-RenderView.spec	7 Dec 2009 08:28:29 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Action-RenderView
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sensible default end action for view rendering
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Sun Dec 06 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
 - auto-update to 0.13 (by cpan-spec-update 0.01)
 



From beekhof at fedoraproject.org  Mon Dec  7 08:28:52 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon,  7 Dec 2009 08:28:52 +0000 (UTC)
Subject: File bc00c0b065d9.tar.bz2 uploaded to lookaside cache by beekhof
Message-ID: <20091207082852.652C010F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for resource-agents:

8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 08:29:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:29:18 +0000 (UTC)
Subject: rpms/perl-Kwiki-Search/devel perl-Kwiki-Search.spec,1.9,1.10
Message-ID: <20091207082918.4208F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-Search/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21990

Modified Files:
	perl-Kwiki-Search.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-Search.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-Search/devel/perl-Kwiki-Search.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Kwiki-Search.spec	26 Jul 2009 08:55:02 -0000	1.9
+++ perl-Kwiki-Search.spec	7 Dec 2009 08:29:17 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-Search
 Version:        0.12
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Kwiki Search Plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From beekhof at fedoraproject.org  Mon Dec  7 08:29:30 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon,  7 Dec 2009 08:29:30 +0000 (UTC)
Subject: rpms/resource-agents/F-12 .cvsignore, 1.19,
	1.20 resource-agents.spec, 1.21, 1.22 sources, 1.19, 1.20
Message-ID: <20091207082930.A339F11C00EE@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/resource-agents/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22137

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
Refresh pacemaker resource agents


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	23 Nov 2009 13:50:44 -0000	1.19
+++ .cvsignore	7 Dec 2009 08:29:30 -0000	1.20
@@ -1,2 +1,2 @@
-e2338892f59f.tar.bz2
+bc00c0b065d9.tar.bz2
 resource-agents-3.0.5.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/resource-agents.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- resource-agents.spec	23 Nov 2009 13:50:44 -0000	1.21
+++ resource-agents.spec	7 Dec 2009 08:29:30 -0000	1.22
@@ -20,12 +20,12 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %define altprefix Cluster-Resource-Agents-
-%define altversion e2338892f59f
+%define altversion bc00c0b065d9
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.5
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -37,6 +37,7 @@ Requires: bash grep sed gawk
 Requires: net-tools mount e2fsprogs
 
 ## Setup/build bits
+BuildRequires: libxslt docbook-style-xsl
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -137,6 +138,7 @@ rm -rf %{buildroot}
 
 %dir %{_datadir}/resource-agents
 %doc %{_datadir}/resource-agents/ra-api-1.dtd
+%{_mandir}/man7/*.7*
 
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/shellfuncs
@@ -158,6 +160,27 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Dec 7 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.5-2
+- Update Pacameker agents to upstream version: bc00c0b065d9
+  + High: RA: introduce OCF_FUNCTIONS_DIR, allow it to be overridden (LF2239)
+  + High: doc: add man pages for all RAs (LF2237)
+  + High: syslog-ng: new RA
+  + High: vmware: make meta-data work and several cleanups (LF 2212)
+  + Medium: .ocf-shellfuncs: add ocf_is_probe function
+  + Medium: Dev: make RAs executable (LF2239)
+  + Medium: IPv6addr: ifdef out the ip offset hack for libnet v1.1.4 (LF 2034)
+  + Medium: add mercurial repository version information to .ocf-shellfuncs
+  + Medium: build: add perl-MailTools runtime dependency to ldirectord package (LF 1469)
+  + Medium: iSCSITarget, iSCSILogicalUnit: support LIO
+  + Medium: nfsserver: use check_binary properly in validate (LF 2211)
+  + Medium: nfsserver: validate should not check if nfs_shared_infodir exists (thanks to eelco at procolix.com) (LF 2219)
+  + Medium: oracle/oralsnr: export variables properly
+  + Medium: pgsql: remove the previous backup_label if it exists
+  + Medium: postfix: fix double stop (thanks to Dinh N. Quoc)
+  + RA: LVM: Make monitor operation quiet in logs (bnc#546353)
+  + RA: Xen: Remove instance_attribute "allow_migrate" (bnc#539968)
+  + ldirectord: OCF agent: overhaul
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New rgmanager resource agents upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	23 Nov 2009 13:50:44 -0000	1.19
+++ sources	7 Dec 2009 08:29:30 -0000	1.20
@@ -1,2 +1,2 @@
-f93e29ce8b480de2f841ca6266bfd864  e2338892f59f.tar.bz2
+8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2
 a7577975345b865dc73ec0b1c0bd24f7  resource-agents-3.0.5.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 08:29:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:29:50 +0000 (UTC)
Subject: rpms/perl-Variable-Magic/devel perl-Variable-Magic.spec,1.6,1.7
Message-ID: <20091207082950.B959311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Variable-Magic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22289

Modified Files:
	perl-Variable-Magic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Variable-Magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Variable-Magic/devel/perl-Variable-Magic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Variable-Magic.spec	27 Sep 2009 04:35:54 -0000	1.6
+++ perl-Variable-Magic.spec	7 Dec 2009 08:29:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Variable-Magic
 Version:        0.37
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Associate user-defined magic to variables from Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.37-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.37-1
 - auto-update to 0.37 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 08:31:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:31:30 +0000 (UTC)
Subject: rpms/perl-Devel-Dumpvar/devel perl-Devel-Dumpvar.spec,1.3,1.4
Message-ID: <20091207083130.686CF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Dumpvar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22989

Modified Files:
	perl-Devel-Dumpvar.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Dumpvar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Dumpvar/devel/perl-Devel-Dumpvar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Devel-Dumpvar.spec	26 Jul 2009 05:41:22 -0000	1.3
+++ perl-Devel-Dumpvar.spec	7 Dec 2009 08:31:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Dumpvar
 Version:        0.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Pure-OO reimplementation of dumpvar.pl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:32:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:32:48 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-Bayeux/devel
	perl-POE-Component-Server-Bayeux.spec, 1.3, 1.4
Message-ID: <20091207083248.E023B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Server-Bayeux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23499

Modified Files:
	perl-POE-Component-Server-Bayeux.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Server-Bayeux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-Bayeux/devel/perl-POE-Component-Server-Bayeux.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-POE-Component-Server-Bayeux.spec	7 Oct 2009 08:06:46 -0000	1.3
+++ perl-POE-Component-Server-Bayeux.spec	7 Dec 2009 08:32:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-Bayeux
 Version:        0.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bayeux/cometd server implementation in POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Yanko Kaneti <yaneti at declera.com> - 0.03-1
 - New upstream release
 



From beekhof at fedoraproject.org  Mon Dec  7 08:32:54 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon,  7 Dec 2009 08:32:54 +0000 (UTC)
Subject: rpms/resource-agents/devel resource-agents.spec,1.20,1.21
Message-ID: <20091207083254.78E7711C00EE@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23556

Modified Files:
	resource-agents.spec 
Log Message:
Refresh pacemaker resource agents


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- resource-agents.spec	20 Nov 2009 12:14:07 -0000	1.20
+++ resource-agents.spec	7 Dec 2009 08:32:54 -0000	1.21
@@ -20,12 +20,12 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %define altprefix Cluster-Resource-Agents-
-%define altversion e2338892f59f
+%define altversion bc00c0b065d9
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.5
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -37,6 +37,7 @@ Requires: bash grep sed gawk
 Requires: net-tools mount e2fsprogs
 
 ## Setup/build bits
+BuildRequires: libxslt docbook-style-xsl
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -142,6 +143,7 @@ rm -rf %{buildroot}
 
 %dir %{_datadir}/resource-agents
 %doc %{_datadir}/resource-agents/ra-api-1.dtd
+%{_mandir}/man7/*.7*
 
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/shellfuncs
@@ -163,6 +165,27 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Dec 7 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.5-2
+- Update Pacameker agents to upstream version: bc00c0b065d9
+  + High: RA: introduce OCF_FUNCTIONS_DIR, allow it to be overridden (LF2239)
+  + High: doc: add man pages for all RAs (LF2237)
+  + High: syslog-ng: new RA
+  + High: vmware: make meta-data work and several cleanups (LF 2212)
+  + Medium: .ocf-shellfuncs: add ocf_is_probe function
+  + Medium: Dev: make RAs executable (LF2239)
+  + Medium: IPv6addr: ifdef out the ip offset hack for libnet v1.1.4 (LF 2034)
+  + Medium: add mercurial repository version information to .ocf-shellfuncs
+  + Medium: build: add perl-MailTools runtime dependency to ldirectord package (LF 1469)
+  + Medium: iSCSITarget, iSCSILogicalUnit: support LIO
+  + Medium: nfsserver: use check_binary properly in validate (LF 2211)
+  + Medium: nfsserver: validate should not check if nfs_shared_infodir exists (thanks to eelco at procolix.com) (LF 2219)
+  + Medium: oracle/oralsnr: export variables properly
+  + Medium: pgsql: remove the previous backup_label if it exists
+  + Medium: postfix: fix double stop (thanks to Dinh N. Quoc)
+  + RA: LVM: Make monitor operation quiet in logs (bnc#546353)
+  + RA: Xen: Remove instance_attribute "allow_migrate" (bnc#539968)
+  + ldirectord: OCF agent: overhaul
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New rgmanager resource agents upstream release
 - Allow pacemaker to use rgmanager resource agents



From kasal at fedoraproject.org  Mon Dec  7 08:33:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:33:35 +0000 (UTC)
Subject: rpms/perl-Kwiki-Revisions/devel perl-Kwiki-Revisions.spec,1.9,1.10
Message-ID: <20091207083335.8412B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-Revisions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23860

Modified Files:
	perl-Kwiki-Revisions.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-Revisions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-Revisions/devel/perl-Kwiki-Revisions.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Kwiki-Revisions.spec	26 Jul 2009 08:54:46 -0000	1.9
+++ perl-Kwiki-Revisions.spec	7 Dec 2009 08:33:35 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-Revisions
 Version:        0.15
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Kwiki Revisions Plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:33:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:33:35 +0000 (UTC)
Subject: rpms/perl-Carp-Clan-Share/devel perl-Carp-Clan-Share.spec,1.2,1.3
Message-ID: <20091207083335.8DE9B11C02BC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Carp-Clan-Share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23862

Modified Files:
	perl-Carp-Clan-Share.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Carp-Clan-Share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Carp-Clan-Share/devel/perl-Carp-Clan-Share.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Carp-Clan-Share.spec	26 Jul 2009 04:08:14 -0000	1.2
+++ perl-Carp-Clan-Share.spec	7 Dec 2009 08:33:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Carp-Clan-Share
 Version:        0.013
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Share your Carp::Clan settings with your whole Clan
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.013-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.013-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:34:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:34:12 +0000 (UTC)
Subject: rpms/perl-V/devel perl-V.spec,1.1,1.2
Message-ID: <20091207083412.85CCE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-V/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24272

Modified Files:
	perl-V.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-V.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-V/devel/perl-V.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-V.spec	1 Nov 2009 10:05:17 -0000	1.1
+++ perl-V.spec	7 Dec 2009 08:34:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		perl-V
 Version:	0.13
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Print version of the specified Perl modules
 
 Group:		Development/Libraries
@@ -47,6 +47,9 @@ find %{buildroot} -depth -type d -exec r
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Thu Oct 22 2009 Johan Vromans <jvromans at squirrel.nl> 0.13-1
 - Initial Fedora RPM version
 



From yaneti at fedoraproject.org  Mon Dec  7 08:34:44 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Mon,  7 Dec 2009 08:34:44 +0000 (UTC)
Subject: rpms/galeon/devel galeon-2.0.7-moz192.patch, NONE,
	1.1 galeon-2.0.7-nojavaconsole.patch, NONE, 1.1 galeon.spec,
	1.68, 1.69
Message-ID: <20091207083444.E1FA411C00EE@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24453

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-moz192.patch galeon-2.0.7-nojavaconsole.patch 
Log Message:
- Add patches so that it actually builds against newer gecko


galeon-2.0.7-moz192.patch:
 EphyXULAppInfo.cpp          |    9 +++++++++
 ExternalProtocolService.cpp |    9 +++++++++
 2 files changed, 18 insertions(+)

--- NEW FILE galeon-2.0.7-moz192.patch ---
diff --git a/mozilla/EphyXULAppInfo.cpp b/mozilla/EphyXULAppInfo.cpp
index 1319431..299cbbf 100644
--- a/mozilla/EphyXULAppInfo.cpp
+++ b/mozilla/EphyXULAppInfo.cpp
@@ -128,3 +128,12 @@ EphyXULAppInfo::GetXPCOMABI(nsACString & aXPCOMABI)
   aXPCOMABI.Assign (EPHY_HOST_CPU "-gcc3");
   return NS_OK;
 }
+
+/* readonly attribute AUTF8String WidgetToolkit; */
+NS_IMETHODIMP
+EphyXULAppInfo::GetWidgetToolkit(nsACString & aWidgetToolkit)
+{
+  aWidgetToolkit.Assign ("gtk");
+  return NS_OK;
+}
+
diff --git a/mozilla/ExternalProtocolService.cpp b/mozilla/ExternalProtocolService.cpp
index 4554998..85ba677 100644
--- a/mozilla/ExternalProtocolService.cpp
+++ b/mozilla/ExternalProtocolService.cpp
@@ -185,3 +185,12 @@ NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfo(const nsACString
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 #endif
+
+NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfoFromOS(const nsACString & aProtocolScheme, PRBool*, nsIHandlerInfo**)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP GExternalProtocolService::SetProtocolHandlerDefaults(nsIHandlerInfo*, int)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}

galeon-2.0.7-nojavaconsole.patch:
 mozilla/mozilla-embed-shell.cpp |    8 --------
 ui/galeon-egg-ui.xml            |    2 --
 2 files changed, 10 deletions(-)

--- NEW FILE galeon-2.0.7-nojavaconsole.patch ---
diff -ur galeon-2.0.7.nojsconsole/mozilla/mozilla-embed-shell.cpp galeon-2.0.7.nojavaconsole/mozilla/mozilla-embed-shell.cpp
--- galeon-2.0.7.nojsconsole/mozilla/mozilla-embed-shell.cpp	2009-11-20 12:48:12.000000000 +0200
+++ galeon-2.0.7.nojavaconsole/mozilla/mozilla-embed-shell.cpp	2009-11-20 12:49:51.000000000 +0200
@@ -62,7 +62,6 @@
 #include <nsCOMPtr.h>
 #include <nsNetCID.h>
 #include <nsIIOService.h>
-#include <nsIJVMManager.h>
 #include <nsIFontEnumerator.h>
 #include <nsISupportsPrimitives.h>
 #include <nsIPermissionManager.h>
@@ -118,8 +117,6 @@
 	MozillaEncodings *encodings;
 };
 
-static NS_DEFINE_CID(kJVMManagerCID, NS_JVMMANAGER_CID);
-
 G_DEFINE_TYPE (MozillaEmbedShell, mozilla_embed_shell, GALEON_TYPE_EMBED_SHELL);
 
 static gboolean
@@ -514,11 +511,6 @@
 static void
 impl_show_java_console (GaleonEmbedShell *shell)
 {
-        nsCOMPtr<nsIJVMManager> JVMManager = do_GetService (kJVMManagerCID);
-	if (JVMManager)
-	{
-		JVMManager->ShowJavaConsole ();
-	}
 }
 
 static GaleonEncodings *
diff -ur galeon-2.0.7.nojsconsole/ui/galeon-egg-ui.xml galeon-2.0.7.nojavaconsole/ui/galeon-egg-ui.xml
--- galeon-2.0.7.nojsconsole/ui/galeon-egg-ui.xml	2009-11-20 12:48:12.000000000 +0200
+++ galeon-2.0.7.nojavaconsole/ui/galeon-egg-ui.xml	2009-11-20 12:49:59.000000000 +0200
@@ -76,8 +76,6 @@
     	<separator name="WSep3" />
     	<menuitem name="WebAllowJava" action="WebAllowJavaAction" />
     	<menuitem name="WebAllowJS" action="WebAllowJSAction" />
-    	<separator name="WSep4" />
-    	<menuitem name="WebJSConsole" action="WebJSConsoleAction" />
     </menu>
     <menu name="Go" action="GoMenuAction">
 	<menuitem name="GoBack" action="GoBack" />


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- galeon.spec	26 Nov 2009 08:51:28 -0000	1.68
+++ galeon.spec	7 Dec 2009 08:34:44 -0000	1.69
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	20%{?dist}
+Release:	21%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -18,6 +18,8 @@ Patch6:		galeon-2.0.7-jsconsole.patch
 Patch7:         galeon-2.0.7-fix-str-fmt.patch
 Patch8:         galeon-1.3.2-home.patch
 Patch9:         galeon-2.0.7-dockcrash.patch
+Patch10:        galeon-2.0.7-moz192.patch
+Patch12:        galeon-2.0.7-nojavaconsole.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -59,6 +61,8 @@ makes sense. Galeon was written to do ju
 %patch7 -p0 -b .fixfmt
 %patch8 -p1 -b .home
 %patch9 -p1 -b .dock
+%patch10 -p1 -b .moz192
+%patch12 -p1 -b .nojavaconsole
 
 
 %build
@@ -133,6 +137,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Mon Dec  7 2009 Yanko Kaneti <yaneti at declera.com> - 2.0.7-21
+- Add patches so that it actually builds against newer gecko
+
 * Thu Nov 26 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-20
 - Rebuild against newer gecko
 



From kasal at fedoraproject.org  Mon Dec  7 08:35:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:35:24 +0000 (UTC)
Subject: rpms/perl-Devel-Cycle/devel perl-Devel-Cycle.spec,1.17,1.18
Message-ID: <20091207083524.F1F4B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Cycle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24733

Modified Files:
	perl-Devel-Cycle.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Cycle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Cycle/devel/perl-Devel-Cycle.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Devel-Cycle.spec	5 Oct 2009 16:34:10 -0000	1.17
+++ perl-Devel-Cycle.spec	7 Dec 2009 08:35:24 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Cycle
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Find memory cycles in objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.11-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1.11-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 08:37:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:37:52 +0000 (UTC)
Subject: rpms/perl-POE-Component-Pluggable/devel
	perl-POE-Component-Pluggable.spec, 1.1, 1.2
Message-ID: <20091207083752.6D38E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25514

Modified Files:
	perl-POE-Component-Pluggable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Pluggable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Pluggable/devel/perl-POE-Component-Pluggable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-POE-Component-Pluggable.spec	17 Sep 2009 03:08:48 -0000	1.1
+++ perl-POE-Component-Pluggable.spec	7 Dec 2009 08:37:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-POE-Component-Pluggable 
 Version:    1.24 
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/POE/Component/Pluggable.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.24-2
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.24-1
 - submission
 



From kasal at fedoraproject.org  Mon Dec  7 08:38:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:38:10 +0000 (UTC)
Subject: rpms/perl-Carp-Clan/devel perl-Carp-Clan.spec,1.21,1.22
Message-ID: <20091207083810.6B1C611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Carp-Clan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25712

Modified Files:
	perl-Carp-Clan.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Carp-Clan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Carp-Clan/devel/perl-Carp-Clan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-Carp-Clan.spec	19 Oct 2009 10:49:05 -0000	1.21
+++ perl-Carp-Clan.spec	7 Dec 2009 08:38:10 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-Carp-Clan
 Version:        6.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module to print improved warning messages
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 6.03-2
+- rebuild against perl 5.10.1
+
 * Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 6.031
 - update to 6.03
 



From kasal at fedoraproject.org  Mon Dec  7 08:38:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:38:05 +0000 (UTC)
Subject: rpms/perl-Kwiki-RecentChanges/devel perl-Kwiki-RecentChanges.spec, 
	1.10, 1.11
Message-ID: <20091207083805.418A711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-RecentChanges/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25667

Modified Files:
	perl-Kwiki-RecentChanges.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-RecentChanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-RecentChanges/devel/perl-Kwiki-RecentChanges.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Kwiki-RecentChanges.spec	26 Jul 2009 08:54:31 -0000	1.10
+++ perl-Kwiki-RecentChanges.spec	7 Dec 2009 08:38:04 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-RecentChanges
 Version:        0.14
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Kwiki Recent Changes Plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:38:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:38:36 +0000 (UTC)
Subject: rpms/perl-User-Identity/devel perl-User-Identity.spec,1.6,1.7
Message-ID: <20091207083836.9A47C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-User-Identity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25971

Modified Files:
	perl-User-Identity.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-User-Identity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-User-Identity/devel/perl-User-Identity.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-User-Identity.spec	26 Jul 2009 17:24:59 -0000	1.6
+++ perl-User-Identity.spec	7 Dec 2009 08:38:35 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-User-Identity
 Version:        0.92
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Maintains info about a physical person
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.92-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.92-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:39:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:39:41 +0000 (UTC)
Subject: rpms/perl-Devel-Cover/devel perl-Devel-Cover.spec,1.15,1.16
Message-ID: <20091207083941.300A011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Cover/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26306

Modified Files:
	perl-Devel-Cover.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Cover.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Cover/devel/perl-Devel-Cover.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Devel-Cover.spec	26 Jul 2009 05:40:54 -0000	1.15
+++ perl-Devel-Cover.spec	7 Dec 2009 08:39:40 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Cover
 Version:        0.64
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Code coverage metrics for Perl
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.64-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.64-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:42:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:42:04 +0000 (UTC)
Subject: rpms/perl-POE-Component-Logger/devel perl-POE-Component-Logger.spec,
	1.6, 1.7
Message-ID: <20091207084204.D620111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Logger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27210

Modified Files:
	perl-POE-Component-Logger.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Logger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Logger/devel/perl-POE-Component-Logger.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-POE-Component-Logger.spec	26 Jul 2009 13:58:36 -0000	1.6
+++ perl-POE-Component-Logger.spec	7 Dec 2009 08:42:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Logger
 Version:        1.00        
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A POE logging class 
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:42:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:42:13 +0000 (UTC)
Subject: rpms/perl-Kwiki-Raw/devel perl-Kwiki-Raw.spec,1.8,1.9
Message-ID: <20091207084213.8FCD011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-Raw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27350

Modified Files:
	perl-Kwiki-Raw.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-Raw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-Raw/devel/perl-Kwiki-Raw.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Kwiki-Raw.spec	26 Jul 2009 08:54:11 -0000	1.8
+++ perl-Kwiki-Raw.spec	7 Dec 2009 08:42:13 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-Raw
 Version:        0.02
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Provide an action to retrieve the raw wikitext of a page
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:42:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:42:20 +0000 (UTC)
Subject: rpms/perl-Carp-Assert-More/devel perl-Carp-Assert-More.spec, 1.8,
	1.9
Message-ID: <20091207084220.2F37411C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Carp-Assert-More/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27433

Modified Files:
	perl-Carp-Assert-More.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Carp-Assert-More.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Carp-Assert-More/devel/perl-Carp-Assert-More.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Carp-Assert-More.spec	26 Jul 2009 04:07:27 -0000	1.8
+++ perl-Carp-Assert-More.spec	7 Dec 2009 08:42:20 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Carp-Assert-More
 Version:        1.12
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Convenience wrappers around Carp::Assert
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:42:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:42:59 +0000 (UTC)
Subject: rpms/perl-User/devel perl-User.spec,1.4,1.5
Message-ID: <20091207084259.1393011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-User/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27821

Modified Files:
	perl-User.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-User.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-User/devel/perl-User.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-User.spec	26 Jul 2009 17:24:45 -0000	1.4
+++ perl-User.spec	7 Dec 2009 08:42:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-User
 Version:        1.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        API for locating user information regardless of OS
 
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.8-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:44:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:44:30 +0000 (UTC)
Subject: rpms/perl-Devel-CheckOS/devel perl-Devel-CheckOS.spec,1.3,1.4
Message-ID: <20091207084430.0CD2B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-CheckOS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28391

Modified Files:
	perl-Devel-CheckOS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-CheckOS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-CheckOS/devel/perl-Devel-CheckOS.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Devel-CheckOS.spec	26 Jul 2009 05:40:38 -0000	1.3
+++ perl-Devel-CheckOS.spec	7 Dec 2009 08:44:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Devel-CheckOS
 Version:        1.50
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Check what OS we're running on
 License:        GPLv2 or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.50-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.50-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Mon Dec  7 08:44:51 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  7 Dec 2009 08:44:51 +0000 (UTC)
Subject: rpms/lsscsi/F-12 .cvsignore, 1.4, 1.5 lsscsi.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20091207084451.7C20211C00EE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/lsscsi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28621

Modified Files:
	.cvsignore lsscsi.spec sources 
Log Message:
* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
- update to 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Feb 2009 11:46:54 -0000	1.4
+++ .cvsignore	7 Dec 2009 08:44:51 -0000	1.5
@@ -1 +1 @@
-lsscsi-0.22.tgz
+lsscsi-0.23.tgz


Index: lsscsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/F-12/lsscsi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- lsscsi.spec	25 Jul 2009 11:22:05 -0000	1.10
+++ lsscsi.spec	7 Dec 2009 08:44:51 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:        List SCSI devices (or hosts) and associated information
 Name:           lsscsi
-Version:        0.22
-Release:        3%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 Source0:        http://sg.danny.cz/scsi/%{name}-%{version}.tgz
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
+- update to 0.23
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Feb 2009 11:46:54 -0000	1.4
+++ sources	7 Dec 2009 08:44:51 -0000	1.5
@@ -1 +1 @@
-7175cd6525fcbd5cd56129893c1c4f7b  lsscsi-0.22.tgz
+de3e51358ddf046a139483196106c1ac  lsscsi-0.23.tgz



From sharkcz at fedoraproject.org  Mon Dec  7 08:45:49 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  7 Dec 2009 08:45:49 +0000 (UTC)
Subject: rpms/lsscsi/F-11 .cvsignore, 1.4, 1.5 lsscsi.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <20091207084549.7F68511C00EE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/lsscsi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29041

Modified Files:
	.cvsignore lsscsi.spec sources 
Log Message:
* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
- update to 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Feb 2009 11:46:54 -0000	1.4
+++ .cvsignore	7 Dec 2009 08:45:49 -0000	1.5
@@ -1 +1 @@
-lsscsi-0.22.tgz
+lsscsi-0.23.tgz


Index: lsscsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/F-11/lsscsi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lsscsi.spec	25 Feb 2009 21:15:53 -0000	1.9
+++ lsscsi.spec	7 Dec 2009 08:45:49 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:        List SCSI devices (or hosts) and associated information
 Name:           lsscsi
-Version:        0.22
-Release:        2%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 Source0:        http://sg.danny.cz/scsi/%{name}-%{version}.tgz
@@ -45,6 +45,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
+- update to 0.23
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Feb 2009 11:46:54 -0000	1.4
+++ sources	7 Dec 2009 08:45:49 -0000	1.5
@@ -1 +1 @@
-7175cd6525fcbd5cd56129893c1c4f7b  lsscsi-0.22.tgz
+de3e51358ddf046a139483196106c1ac  lsscsi-0.23.tgz



From kasal at fedoraproject.org  Mon Dec  7 08:46:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:46:28 +0000 (UTC)
Subject: rpms/perl-POE-Component-Log4perl/devel
	perl-POE-Component-Log4perl.spec, 1.4, 1.5
Message-ID: <20091207084628.3322911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29390

Modified Files:
	perl-POE-Component-Log4perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Log4perl/devel/perl-POE-Component-Log4perl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-POE-Component-Log4perl.spec	4 Oct 2009 05:27:52 -0000	1.4
+++ perl-POE-Component-Log4perl.spec	7 Dec 2009 08:46:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Log4perl
 Version:        0.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Logging extension for the POE environment
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-2
+- rebuild against perl 5.10.1
+
 * Sun Oct  4 2009 Yanko Kaneti <yaneti at declera.com> - 0.03-1
 - New upstream release
 



From kasal at fedoraproject.org  Mon Dec  7 08:46:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:46:32 +0000 (UTC)
Subject: rpms/perl-Kwiki-NewPage/devel perl-Kwiki-NewPage.spec,1.9,1.10
Message-ID: <20091207084632.C686611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-NewPage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29459

Modified Files:
	perl-Kwiki-NewPage.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-NewPage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-NewPage/devel/perl-Kwiki-NewPage.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Kwiki-NewPage.spec	26 Jul 2009 08:53:55 -0000	1.9
+++ perl-Kwiki-NewPage.spec	7 Dec 2009 08:46:32 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-NewPage
 Version:        0.12
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Kwiki New Page Plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:46:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:46:43 +0000 (UTC)
Subject: rpms/perl-Carp-Assert/devel perl-Carp-Assert.spec,1.8,1.9
Message-ID: <20091207084643.E60AC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Carp-Assert/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29674

Modified Files:
	perl-Carp-Assert.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Carp-Assert.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Carp-Assert/devel/perl-Carp-Assert.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Carp-Assert.spec	26 Jul 2009 04:07:12 -0000	1.8
+++ perl-Carp-Assert.spec	7 Dec 2009 08:46:43 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Carp-Assert
 Version:        0.20
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Executable comments
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.20-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:46:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:46:59 +0000 (UTC)
Subject: rpms/perl-URI-FromHash/devel perl-URI-FromHash.spec,1.4,1.5
Message-ID: <20091207084659.2FADE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-URI-FromHash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29861

Modified Files:
	perl-URI-FromHash.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-URI-FromHash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-URI-FromHash/devel/perl-URI-FromHash.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-URI-FromHash.spec	26 Jul 2009 17:22:51 -0000	1.4
+++ perl-URI-FromHash.spec	7 Dec 2009 08:46:59 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:       perl-URI-FromHash 
 Version:    0.03 
-Release:        5%{?dist}
+Release:        6%{?dist}
 # see lib/URI/FromHash.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Mon Dec  7 08:47:48 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  7 Dec 2009 08:47:48 +0000 (UTC)
Subject: rpms/lsscsi/EL-5 .cvsignore, 1.3, 1.4 lsscsi.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20091207084748.8667011C00EE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/lsscsi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30226

Modified Files:
	.cvsignore lsscsi.spec sources 
Log Message:
* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
- update to 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Nov 2009 07:22:46 -0000	1.3
+++ .cvsignore	7 Dec 2009 08:47:48 -0000	1.4
@@ -1 +1 @@
-lsscsi-0.22.tgz
+lsscsi-0.23.tgz


Index: lsscsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/EL-5/lsscsi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lsscsi.spec	27 Nov 2009 07:22:46 -0000	1.4
+++ lsscsi.spec	7 Dec 2009 08:47:48 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:        List SCSI devices (or hosts) and associated information
 Name:           lsscsi
-Version:        0.22
-Release:        3%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 Source0:        http://sg.danny.cz/scsi/%{name}-%{version}.tgz
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
+- update to 0.23
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Nov 2009 07:22:46 -0000	1.3
+++ sources	7 Dec 2009 08:47:48 -0000	1.4
@@ -1 +1 @@
-7175cd6525fcbd5cd56129893c1c4f7b  lsscsi-0.22.tgz
+de3e51358ddf046a139483196106c1ac  lsscsi-0.23.tgz



From transif at fedoraproject.org  Mon Dec  7 08:48:04 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Dec 2009 08:48:04 +0000 (UTC)
Subject: comps/po bn_IN.po,1.22,1.23
Message-ID: <20091207084804.0717E11C00EE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30487/po

Modified Files:
	bn_IN.po 
Log Message:
Sending translation for Bengali (India)


Index: bn_IN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bn_IN.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- bn_IN.po	1 Sep 2009 15:28:27 -0000	1.22
+++ bn_IN.po	7 Dec 2009 08:48:03 -0000	1.23
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-01 02:22+0000\n"
-"PO-Revision-Date: 2009-09-01 11:34+0530\n"
+"POT-Creation-Date: 2009-12-07 08:10+0000\n"
+"PO-Revision-Date: 2009-12-07 14:10+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
 "Language-Team: Bengali INDIA <anubad at lists.ankur.org.in>\n"
 "MIME-Version: 1.0\n"
@@ -173,177 +173,177 @@ msgid "Clustering Support"
 msgstr "??????????????????????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ???????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "?????????????????????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "?????????????????????????????? ??????????????????????????? ???????????? ??????????????????????????? ???????????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "?????????????????????????????? ??????????????????????????? ???????????? ??????????????????????????? ?????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "???????????????-?????? ????????????????????????????????? ????????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "?????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "?????????????????????????????? ??????????????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "???????????????????????????????????? ????????? ??????????????????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "?????????????????? (??????????????????????????????) ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ?????????????????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Fedora ????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????? ?????????????????? ????????????????????? ???????????? ????????????????????? ???????????? ????????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -352,19 +352,19 @@ msgstr ""
 "CD ?????????????????? ????????? ?????? ???????????? CD ????????? ???????????????????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "GNOME ????????????????????? ?????????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -373,109 +373,109 @@ msgstr ""
 "?????????????????????, ????????????????????? ????????????????????? ???????????? ????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "???????????????????????? ????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "??????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "???????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "???????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+ ??? GNOME ????????????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ?????? ????????????????????????????????? ?????????????????? ????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ??? XFCE ????????????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ?????? ????????????????????????????????? ?????????????????? ????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????????? KDE ????????????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ?????? ????????????????????????????????? ?????????????????? ????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "??????????????? ????????????????????? ???????????? ????????????????????? ????????? ???????????? ???????????? ????????????????????? ????????????????????? ?????????????????? ????????????????????? ???????????? ???????????? "
@@ -483,66 +483,66 @@ msgstr ""
 
 # Altered by Progga
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "?????????????????? ??????????????????????????? (X) ??????????????????????????? ??????????????????????????? ???????????? ????????????????????? ????????????????????? ??????????????? ?????????????????? ????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse-??? ????????? ?????????????????? ????????? ????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????????????????????????????? (IDE)???"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "??????????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ????????????????????? ??????????????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE ????????????????????? ?????????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -551,149 +551,149 @@ msgstr ""
 "????????????????????? ????????????????????? ???????????? ????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "???????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "???????????????????????? ??????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "???????????????????????? ?????????????????????????????? ?????????????????????"
 
 # FIXME: [progga]
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "???????????????????????? ?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "?????? ???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "??????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "???????????? ?????????????????????"
 
@@ -703,37 +703,37 @@ msgstr "??????????????? ???????????? ???
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "??????????????? ???????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "????????????/?????????????????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????????? ???????????????????????? ??? ?????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -741,56 +741,56 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "????????? ???????????? ??????????????????????????? ??????????????????"
 
@@ -804,74 +804,74 @@ msgstr "OLPC XO-??? ???????????? ???????
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "????????????????????? ????????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "???????????? ????????????????????? ????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "??????????????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ??????????????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -881,96 +881,96 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "???????????? ??? ???????????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "?????????????????? ???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "?????????????????? ???????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ????????????????????????????????? ???????????? ?????????????????? ????????? ??????????????????????????? ????????????????????? ??????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ????????????????????????????????? ??????????????? ???????????? ??????????????????????????? ??????????????????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "??????????????????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "??????????????????-????????????????????? ??????????????????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "?????? ?????????????????? ????????? ???????????? (office) ????????????????????????????????????, PDF ?????????????????????????????? ??????????????????????????? ????????? ???????????????????????? ???????????? "
@@ -979,19 +979,19 @@ msgstr ""
 # Altered by Progga
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "?????? ?????????????????? ????????????????????? ??????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ?????????????????? ????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????? ???????????????????????????????????? ???????????????????????? ???????????? IMAP ????????? SMTP ???????????? ????????????????????? ????????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "?????? ???????????????????????????????????? ???????????????????????? ???????????? X ?????????????????? ??????????????????????????? ???????????? ???????????????????????????????????? ????????????????????? ???????????? "
@@ -999,13 +999,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????? ???????????????????????????????????? ???????????? ???????????? ????????? ???????????????????????? ??????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "?????? ???????????????????????????????????? ??????????????? DHCP, Kerberos ????????? NIS ????????????????????? ??????????????????????????? ????????????????????? ????????????????????? "
@@ -1013,7 +1013,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -1023,19 +1023,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "?????? ???????????????????????????????????? ?????????????????? ??????????????????????????????????????????????????? ?????????????????? ?????????????????? ????????? ?????????"
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????? ????????????????????????????????? ?????????????????????????????? ??????????????????????????? ???????????? ?????????????????? ???????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -1045,7 +1045,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1055,19 +1055,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????? ???????????????????????????????????? ???????????????????????? ???????????? ??????????????????????????? ??????????????? ????????????-????????????????????? ?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????? ???????????????????????????????????? ???????????????????????? ???????????? ??????????????????????????? ??????????????? FTP ????????????????????? ?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1077,19 +1077,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????? ????????????????????? ???????????????????????? ??????????????? ??????????????????????????? ???????????? ????????????????????? ?????????????????? ????????????????????? ????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "?????? ????????????????????? ??????????????? Red Hat'??? ??????????????? ?????????????????? ????????????????????? ?????????????????????????????? ????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1099,13 +1099,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "?????? ????????????????????? ??????????????? ??????????????? ??????????????????????????? ???-????????????, ???????????? ??? ??????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1115,13 +1115,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "?????? ????????????????????? ???????????????????????????????????? ???????????????????????? ???????????? ????????? ????????????????????? ???????????? ?????? ???????????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1131,7 +1131,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1142,19 +1142,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????? ???????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "????????????????????????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1164,13 +1164,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????? ???????????????????????????????????? ???????????????????????? ???????????????????????? ???????????? DNS ????????? ????????????????????? (BIND) ?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1180,173 +1180,173 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????? ????????????????????? ?????????????????? MySQL'??? ???????????? ???????????????????????????????????? ????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????? ????????????????????? ?????????????????? Postgresql'??? ???????????? ???????????????????????????????????? ????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ????????????????????? ???????????? ????????????????????? ??????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "???????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "??????????????????????????? ????????????????????? ??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "???????????? ???????????? ????????? ????????? ????????????????????? ??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "?????????????????????????????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "???????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "???????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "?????????????????? ?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "Windows ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ????????????????????? ?????????????????????????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X ?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ?????????????????????????????? ?????????????????????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "???????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "???????????? ???????????? ??????????????????????????? ??????????????????"
 
@@ -1361,73 +1361,73 @@ msgid "Haskell Development"
 msgstr "Haskell ?????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "????????????????????? ????????????????????????????????? ??????????????? ??????????????? ???????????? ??????????????????????????? ??????????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (?????????????????????) ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ?????????????????????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ????????????????????????????????? ???????????? ?????????????????? ????????? ??????????????????????????? ????????????????????? ??????????????????????????? ?????????????????????"
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ????????????????????????????????? ???????????? ?????????????????? ????????? ??????????????????????????? ????????????????????? ??????????????????????????? ?????????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
@@ -1444,115 +1444,117 @@ msgstr "????????????????????????????????
 msgid "Chichewa Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "????????????????????????????????? ??????????????????????????????????????? ???????????? ?????????????????? ?????????????????? ??? ?????????????????????????????? ?????????????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "?????????????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "???????????? ????????????????????? ??? ?????????????????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "?????????????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "??????????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "?????????????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW ????????????-???????????????????????????"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "?????????????????? ????????????????????? ?????????????????? ??? ?????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "????????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1561,7 +1563,7 @@ msgstr ""
 "????????????????????? ??? ???????????????????????? ????????????????????? ??????????????????????????? ?????????????????????"
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1571,18 +1573,18 @@ msgstr ""
 
 # modified for RHEL
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 # modified for RHEL
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "??????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1591,12 +1593,12 @@ msgstr ""
 "??????????????????"
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "???????????? ??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
@@ -1620,50 +1622,60 @@ msgstr "?????? ??? ?????????????????????
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ????????????????????????????????? ??? ?????????????????????????????? ???????????? ????????????????????? ?????? ??? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "Critical Path (Base)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "Critical Path (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "??????????????????????????? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
-msgstr "LXDE ????????????, ??????????????? ??????????????????????????????????????? ?????????????????? ???????????? ??????????????????, ?????????????????? ?????????????????? ???????????? ?????????????????? ?????????????????????????????? ???????????? ???????????????????????????????????? ????????????????????????????????? X11 ????????????????????? ?????????????????????"
+msgstr ""
+"LXDE ????????????, ??????????????? ??????????????????????????????????????? ?????????????????? ???????????? ??????????????????, ?????????????????? ?????????????????? ???????????? ?????????????????? "
+"?????????????????????????????? ???????????? ???????????????????????????????????? ????????????????????????????????? X11 ????????????????????? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "??????????????? ??? ?????????????????????????????????????????? ?????????????????????????????? ????????????????????????"
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Moblin ????????????????????? ??????????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "NetBook/NetTop/MID ???????????????????????? ???????????? ???????????????????????????????????? ????????????????????? ?????????????????? Moblin???"
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "????????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "?????????????????? ??? ???????????????????????? ??????????????? ???????????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????????????? ??????????????? ????????????????????? ????????????????????????????????????"
 
 # modified for RHEL
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "???????????????-?????? ????????????????????????????????? ????????????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1671,7 +1683,7 @@ msgstr ""
 "GNOME ???????????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????? ??????????????? ????????????????????????????????? ??????????????? ???????????? ?????????????????????, "
 "?????????????????????, ????????????????????? ????????????????????? ???????????? ????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????????????????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1679,7 +1691,7 @@ msgstr ""
 "KDE ???????????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????? ??????????????? ????????????????????????????????? ??????????????? ???????????? ?????????????????????, ?????????????????????, "
 "????????????????????? ????????????????????? ???????????? ????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????????????????????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1687,11 +1699,11 @@ msgstr ""
 "?????? ?????????????????????????????????????????? ???????????????????????? ???????????? ?????????????????? ???????????? ???????????? ????????? ???????????????????????? ???????????? ????????????????????? "
 "????????????????????? ??????????????? ?????????????????? ??????????????? ???????????? ?????????????????????  ?????? ??????????????? ??????????????? Emacs ????????? Vi???"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "XEmacs ?????????????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1699,35 +1711,35 @@ msgstr ""
 "?????? ?????????????????????????????????????????? ???????????????????????? ???????????? DocBook ???????????????????????? ????????????????????? ????????????????????? ????????? ?????? HTML, PDF, "
 "Postscript ????????? ?????????????????? ???????????? ???????????????????????? ???????????? ?????????????????????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr ""
 "????????????????????????????????? ??????????????? ???????????? ???????????????????????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????? ????????????????????? ??????????????? "
 "????????????????????? ???????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "???????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? "
 "??????????????????"
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "?????????????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? "
 "??????????????????"
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "?????????????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? "
 "????????????????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr ""
 "????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? "



From kasal at fedoraproject.org  Mon Dec  7 08:48:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:48:51 +0000 (UTC)
Subject: rpms/perl-Devel-Caller/devel perl-Devel-Caller.spec,1.7,1.8
Message-ID: <20091207084851.9BCF711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Devel-Caller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30782

Modified Files:
	perl-Devel-Caller.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Devel-Caller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Caller/devel/perl-Devel-Caller.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Devel-Caller.spec	26 Jul 2009 05:40:21 -0000	1.7
+++ perl-Devel-Caller.spec	7 Dec 2009 08:48:51 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Caller
 Version:        2.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Meatier versions of caller
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.03-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Mon Dec  7 08:49:19 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon,  7 Dec 2009 08:49:19 +0000 (UTC)
Subject: rpms/lsscsi/EL-4 .cvsignore, 1.4, 1.5 lsscsi.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20091207084919.DFDB611C00EE@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/lsscsi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31093

Modified Files:
	.cvsignore lsscsi.spec sources 
Log Message:
* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
- update to 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Feb 2009 11:46:54 -0000	1.4
+++ .cvsignore	7 Dec 2009 08:49:19 -0000	1.5
@@ -1 +1 @@
-lsscsi-0.22.tgz
+lsscsi-0.23.tgz


Index: lsscsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/EL-4/lsscsi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- lsscsi.spec	25 Jul 2009 11:22:05 -0000	1.10
+++ lsscsi.spec	7 Dec 2009 08:49:19 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:        List SCSI devices (or hosts) and associated information
 Name:           lsscsi
-Version:        0.22
-Release:        3%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 Source0:        http://sg.danny.cz/scsi/%{name}-%{version}.tgz
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec  6 2009 Dan Hor?k <dan[at]danny.cz> - 0.23-1
+- update to 0.23
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lsscsi/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Feb 2009 11:46:54 -0000	1.4
+++ sources	7 Dec 2009 08:49:19 -0000	1.5
@@ -1 +1 @@
-7175cd6525fcbd5cd56129893c1c4f7b  lsscsi-0.22.tgz
+de3e51358ddf046a139483196106c1ac  lsscsi-0.23.tgz



From kasal at fedoraproject.org  Mon Dec  7 08:50:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:50:27 +0000 (UTC)
Subject: rpms/perl-Kwiki-ModPerl/devel perl-Kwiki-ModPerl.spec,1.8,1.9
Message-ID: <20091207085027.43D7511C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-ModPerl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31668

Modified Files:
	perl-Kwiki-ModPerl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-ModPerl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-ModPerl/devel/perl-Kwiki-ModPerl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Kwiki-ModPerl.spec	26 Jul 2009 08:53:38 -0000	1.8
+++ perl-Kwiki-ModPerl.spec	7 Dec 2009 08:50:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-ModPerl
 Version:        0.09
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Enable Kwiki to work under mod_perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:50:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:50:59 +0000 (UTC)
Subject: rpms/perl-Capture-Tiny/devel perl-Capture-Tiny.spec,1.3,1.4
Message-ID: <20091207085059.3AAB211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Capture-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31931

Modified Files:
	perl-Capture-Tiny.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Capture-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Capture-Tiny/devel/perl-Capture-Tiny.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Capture-Tiny.spec	11 Aug 2009 12:15:05 -0000	1.3
+++ perl-Capture-Tiny.spec	7 Dec 2009 08:50:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Capture-Tiny
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Capture STDOUT and STDERR from Perl, XS or external programs
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.06-1
 - update
 



From kasal at fedoraproject.org  Mon Dec  7 08:51:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:51:47 +0000 (UTC)
Subject: rpms/perl-URI-Find/devel perl-URI-Find.spec,1.6,1.7
Message-ID: <20091207085147.1E8E911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-URI-Find/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32286

Modified Files:
	perl-URI-Find.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-URI-Find.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-URI-Find/devel/perl-URI-Find.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-URI-Find.spec	30 Jul 2009 07:01:40 -0000	1.6
+++ perl-URI-Find.spec	7 Dec 2009 08:51:46 -0000	1.7
@@ -1,6 +1,6 @@
 Name:       perl-URI-Find
 Version:    20090319
-Release:        3%{?dist}
+Release:        4%{?dist}
 # see lib/URI/Find.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 20090319-4
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 20090319-3
 - Use Build.PL (Fix mass rebuild breakdown).
 



From kasal at fedoraproject.org  Mon Dec  7 08:52:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:52:16 +0000 (UTC)
Subject: rpms/perl-POE-Component-JobQueue/devel
	perl-POE-Component-JobQueue.spec, 1.8, 1.9
Message-ID: <20091207085216.1D0C111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-JobQueue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32530

Modified Files:
	perl-POE-Component-JobQueue.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-JobQueue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-JobQueue/devel/perl-POE-Component-JobQueue.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-POE-Component-JobQueue.spec	26 Aug 2009 00:45:39 -0000	1.8
+++ perl-POE-Component-JobQueue.spec	7 Dec 2009 08:52:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-JobQueue
 Version:        0.570
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary: Process a large number of tasks with a finite number of workers
 
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.570-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.570-1
 - auto-update to 0.570 (by cpan-spec-update 0.01)
 - added a new br on perl(ExtUtils::MakeMaker) (version 0)



From kasal at fedoraproject.org  Mon Dec  7 08:53:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:53:32 +0000 (UTC)
Subject: rpms/perl-Declare-Constraints-Simple/devel
	perl-Declare-Constraints-Simple.spec, 1.5, 1.6
Message-ID: <20091207085332.A051511C029D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Declare-Constraints-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv651

Modified Files:
	perl-Declare-Constraints-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Declare-Constraints-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Declare-Constraints-Simple/devel/perl-Declare-Constraints-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Declare-Constraints-Simple.spec	26 Jul 2009 05:40:07 -0000	1.5
+++ perl-Declare-Constraints-Simple.spec	7 Dec 2009 08:53:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Declare-Constraints-Simple
 Version:        0.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Declarative Validation of Data Structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:55:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:55:10 +0000 (UTC)
Subject: rpms/perl-Kwiki-Diff/devel perl-Kwiki-Diff.spec,1.8,1.9
Message-ID: <20091207085510.2661A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1521

Modified Files:
	perl-Kwiki-Diff.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-Diff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-Diff/devel/perl-Kwiki-Diff.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Kwiki-Diff.spec	26 Jul 2009 08:53:22 -0000	1.8
+++ perl-Kwiki-Diff.spec	7 Dec 2009 08:55:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-Diff
 Version:        0.03
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Display differences between the current wiki page and older revisions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:55:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:55:23 +0000 (UTC)
Subject: rpms/perl-Captcha-reCAPTCHA/devel perl-Captcha-reCAPTCHA.spec, 1.3, 
	1.4
Message-ID: <20091207085523.E8CCF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Captcha-reCAPTCHA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1721

Modified Files:
	perl-Captcha-reCAPTCHA.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Captcha-reCAPTCHA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Captcha-reCAPTCHA/devel/perl-Captcha-reCAPTCHA.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Captcha-reCAPTCHA.spec	26 Jul 2009 04:06:38 -0000	1.3
+++ perl-Captcha-reCAPTCHA.spec	7 Dec 2009 08:55:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Captcha-reCAPTCHA
 Version:        0.92
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl implementation of the reCAPTCHA API
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.92-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.92-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:56:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:56:16 +0000 (UTC)
Subject: rpms/perl-POE-Component-IRC/devel perl-POE-Component-IRC.spec, 1.24,
	1.25
Message-ID: <20091207085616.F20A311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-IRC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2095

Modified Files:
	perl-POE-Component-IRC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-IRC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-IRC/devel/perl-POE-Component-IRC.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-POE-Component-IRC.spec	27 Sep 2009 09:03:59 -0000	1.24
+++ perl-POE-Component-IRC.spec	7 Dec 2009 08:56:16 -0000	1.25
@@ -11,7 +11,7 @@
 
 Name:           perl-POE-Component-IRC
 Version:        6.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A POE component for building IRC clients
 
 Group:          Development/Libraries
@@ -114,6 +114,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 6.14-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 6.14-1
 - auto-update to 6.14 (by cpan-spec-update 0.01)
 - altered br on perl(POE::Component::Pluggable) (1.12 => 1.24)



From kasal at fedoraproject.org  Mon Dec  7 08:56:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:56:31 +0000 (UTC)
Subject: rpms/perl-URI-Fetch/devel perl-URI-Fetch.spec,1.5,1.6
Message-ID: <20091207085631.1807411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-URI-Fetch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2288

Modified Files:
	perl-URI-Fetch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-URI-Fetch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-URI-Fetch/devel/perl-URI-Fetch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-URI-Fetch.spec	26 Jul 2009 17:22:23 -0000	1.5
+++ perl-URI-Fetch.spec	7 Dec 2009 08:56:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-URI-Fetch
 Version:        0.08
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Smart URI fetching/caching
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:57:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:57:41 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle/devel perl-DDL-Oracle.spec,1.3,1.4
Message-ID: <20091207085741.E38AD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DDL-Oracle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2781

Modified Files:
	perl-DDL-Oracle.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DDL-Oracle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/devel/perl-DDL-Oracle.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-DDL-Oracle.spec	26 Jul 2009 05:25:38 -0000	1.3
+++ perl-DDL-Oracle.spec	7 Dec 2009 08:57:41 -0000	1.4
@@ -2,7 +2,7 @@ Name: perl-DDL-Oracle
 Summary: DDL generator for Oracle databases 
 Group: Development/Tools
 Version: 1.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+ or Artistic
 Source0: http://search.cpan.org/CPAN/authors/id/R/RV/RVSUTHERL/DDL-Oracle-%{version}.tar.gz
 URL: http://search.cpan.org/~rvsutherl/DDL-Oracle-1.11
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/DDL*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.11-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kzak at fedoraproject.org  Mon Dec  7 08:58:40 2009
From: kzak at fedoraproject.org (kzak)
Date: Mon,  7 Dec 2009 08:58:40 +0000 (UTC)
Subject: rpms/util-linux-ng/F-12 util-linux-ng-2.16-blkid-crypto.path, NONE, 
	1.1 .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 util-linux-ng.spec, 1.63,
	1.64 util-linux-ng-2.14-sfdisk-dump.patch, 1.1,
	NONE util-linux-ng-2.16-blkid-swsuspend.patch, 1.1,
	NONE util-linux-ng-2.16-libblkid-compression.patch, 1.1,
	NONE util-linux-ng-2.16-libblkid-ext2.patch, 1.1,
	NONE util-linux-ng-2.16-libblkid-joliet.patch, 1.1,
	NONE util-linux-ng-2.16-libblkid-packed.patch, 1.1,
	NONE util-linux-ng-2.16-switchroot-tty.patch, 1.1, NONE
Message-ID: <20091207085840.C652E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3149

Modified Files:
	.cvsignore sources util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-blkid-crypto.path 
Removed Files:
	util-linux-ng-2.14-sfdisk-dump.patch 
	util-linux-ng-2.16-blkid-swsuspend.patch 
	util-linux-ng-2.16-libblkid-compression.patch 
	util-linux-ng-2.16-libblkid-ext2.patch 
	util-linux-ng-2.16-libblkid-joliet.patch 
	util-linux-ng-2.16-libblkid-packed.patch 
	util-linux-ng-2.16-switchroot-tty.patch 
Log Message:
* Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-1
- upgrade to 2.16.2 (removes 7 patches)
  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.2-ReleaseNotes
- fix #531992 - not prompted for passphrase



--- NEW FILE util-linux-ng-2.16-blkid-crypto.path ---
From: Scott James Remnant <scott at ubuntu.com>
Subject: [PATCH] libblkid: return first detected crypto device

Crypto devices may sometimes have multiple additional prober matches,
however just like RAID, there's no danger of activating the wrong one
since special help is needed to activate the block device before it
can be used.

Thus modify blkid_do_safeprobe() to break out of the loop when a
crypto device is detected, as it does already for RAID.

[kzak at redhar.com: - backport to 2.16.2 for Fedora-12]

Signed-off-by: Scott James Remnant <scott at ubuntu.com>
Signed-off-by: Karel Zak <kzak at redhat.com>

diff -up util-linux-ng-2.16.2/shlibs/blkid/src/probe.c.kzak util-linux-ng-2.16.2/shlibs/blkid/src/probe.c
--- util-linux-ng-2.16.2/shlibs/blkid/src/probe.c.kzak	2009-12-07 09:44:46.000000000 +0100
+++ util-linux-ng-2.16.2/shlibs/blkid/src/probe.c	2009-12-07 09:47:12.000000000 +0100
@@ -538,9 +538,9 @@ int blkid_do_probe(blkid_probe pr)
  * (cannot be used in while()) and checks for ambivalen results (more
  * filesystems on the device) -- in such case returns -2.
  *
- * The function does not check for filesystems when a RAID signature is
- * detected.  The function also does not check for collision between RAIDs. The
- * first detected RAID is returned.
+ * The function does not check for filesystems when a RAID or crypto signature
+ * is detected.  The function also does not check for collision between RAIDs
+ * and crypto devices. The first detected RAID or crypto device is returned.
  */
 int blkid_do_safeprobe(blkid_probe pr)
 {
@@ -558,7 +558,7 @@ int blkid_do_safeprobe(blkid_probe pr)
 		}
 		count++;
 
-		if (idinfos[pr->idx]->usage & BLKID_USAGE_RAID)
+		if (idinfos[pr->idx]->usage & (BLKID_USAGE_RAID | BLKID_USAGE_CRYPTO))
 			break;
 		if (!(idinfos[pr->idx]->flags & BLKID_IDINFO_TOLERANT))
 			intol++;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	25 Jul 2009 20:18:47 -0000	1.19
+++ .cvsignore	7 Dec 2009 08:58:39 -0000	1.20
@@ -1,2 +1,2 @@
-util-linux-ng-2.16.tar.bz2
+util-linux-ng-2.16.2.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	25 Jul 2009 20:18:47 -0000	1.19
+++ sources	7 Dec 2009 08:58:40 -0000	1.20
@@ -1,2 +1,2 @@
-9623380641b0c2e0449f5b1ecc567663  util-linux-ng-2.16.tar.bz2
+edd1f7a82fd388cc0e1e3d2d1e7ea55a  util-linux-ng-2.16.2.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- util-linux-ng.spec	30 Nov 2009 11:19:21 -0000	1.63
+++ util-linux-ng.spec	7 Dec 2009 08:58:40 -0000	1.64
@@ -1,8 +1,8 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux-ng
-Version: 2.16
-Release: 10.3%{?dist}
+Version: 2.16.2
+Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -105,22 +105,8 @@ Patch7: util-linux-ng-2.13-login-lastlog
 Patch8: util-linux-ng-2.15-ipcs-32bit.patch
 
 ### Upstream patches
-###
-# 513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
-Patch9: util-linux-ng-2.16-libblkid-ext2.patch
-# 518572 -  blkid requires ext2.ko to be decompressed on installation media 
-Patch10: util-linux-ng-2.16-libblkid-compression.patch
-# 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
-Patch11: util-linux-ng-2.14-sfdisk-dump.patch
-# Swsuspend does not work
-Patch12: util-linux-ng-2.16-blkid-swsuspend.patch
-# 514413 -  Extra spaces at the end of CD mount point
-Patch13: util-linux-ng-2.16-libblkid-joliet.patch
-# 519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
-Patch14: util-linux-ng-2.16-switchroot-tty.patch
-# 539325 - fix VIA RAID detection
-# 541708 - libblkid does not recognize ufs partitions
-Patch15: util-linux-ng-2.16-libblkid-packed.patch
+# 531992 -  not prompted for passphrase
+Patch9: util-linux-ng-2.16-blkid-crypto.path
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -216,12 +202,6 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 %build
 unset LINGUAS || :
@@ -732,6 +712,11 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-1
+- upgrade to 2.16.2 (removes 7 patches)
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.2-ReleaseNotes
+- fix #531992 - not prompted for passphrase
+
 * Mon Nov 30 2009 Karel Zak <kzak at redhat.com> 2.16-10.3
 - fix #539325 - fix VIA RAID detection
 - fix #541708 - libblkid does not recognize ufs partitions


--- util-linux-ng-2.14-sfdisk-dump.patch DELETED ---


--- util-linux-ng-2.16-blkid-swsuspend.patch DELETED ---


--- util-linux-ng-2.16-libblkid-compression.patch DELETED ---


--- util-linux-ng-2.16-libblkid-ext2.patch DELETED ---


--- util-linux-ng-2.16-libblkid-joliet.patch DELETED ---


--- util-linux-ng-2.16-libblkid-packed.patch DELETED ---


--- util-linux-ng-2.16-switchroot-tty.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 08:59:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:59:21 +0000 (UTC)
Subject: rpms/perl-Kwiki-Attachments/devel perl-Kwiki-Attachments.spec, 1.8, 
	1.9
Message-ID: <20091207085921.D762311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-Attachments/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3503

Modified Files:
	perl-Kwiki-Attachments.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-Attachments.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-Attachments/devel/perl-Kwiki-Attachments.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Kwiki-Attachments.spec	26 Jul 2009 08:53:09 -0000	1.8
+++ perl-Kwiki-Attachments.spec	7 Dec 2009 08:59:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-Attachments
 Version:        0.18
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Kwiki Page Attachments Plugin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 08:59:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 08:59:41 +0000 (UTC)
Subject: rpms/perl-capitalization/devel perl-capitalization.spec,1.9,1.10
Message-ID: <20091207085941.3040711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-capitalization/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3688

Modified Files:
	perl-capitalization.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-capitalization.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-capitalization/devel/perl-capitalization.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-capitalization.spec	26 Jul 2009 17:45:30 -0000	1.9
+++ perl-capitalization.spec	7 Dec 2009 08:59:41 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-capitalization
 Version:        0.03
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        No capitalization on method names
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:00:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:00:36 +0000 (UTC)
Subject: rpms/perl-URI/devel perl-URI.spec,1.25,1.26
Message-ID: <20091207090036.5C39B11C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-URI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4103

Modified Files:
	perl-URI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-URI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-URI/devel/perl-URI.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-URI.spec	6 Oct 2009 12:48:02 -0000	1.25
+++ perl-URI.spec	7 Dec 2009 09:00:36 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-URI
 Version:        1.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Perl module implementing URI parsing and manipulation
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.40-2
+- rebuild against perl 5.10.1
+
 * Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.40-1
 - update to new upstream release
 



From pkgdb at fedoraproject.org  Mon Dec  7 09:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 09:00:54 +0000
Subject: [pkgdb] gnomeradio: roma has given up watchbugzilla
Message-ID: <20091207090054.8DB0A10F85C@bastion2.fedora.phx.redhat.com>

roma has given up the watchbugzilla acl on gnomeradio (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnomeradio



From pkgdb at fedoraproject.org  Mon Dec  7 09:00:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 09:00:55 +0000
Subject: [pkgdb] gnomeradio: roma has requested commit
Message-ID: <20091207090055.188F510F890@bastion2.fedora.phx.redhat.com>

roma has requested the commit acl on gnomeradio (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnomeradio



From pkgdb at fedoraproject.org  Mon Dec  7 09:00:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 09:00:55 +0000
Subject: [pkgdb] gnomeradio: roma has given up watchcommits
Message-ID: <20091207090055.4D2A810F89C@bastion2.fedora.phx.redhat.com>

roma has given up the watchcommits acl on gnomeradio (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnomeradio



From kasal at fedoraproject.org  Mon Dec  7 09:01:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:01:16 +0000 (UTC)
Subject: rpms/perl-POE-Component-DBIAgent/devel
	perl-POE-Component-DBIAgent.spec, 1.6, 1.7
Message-ID: <20091207090116.83B5F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-DBIAgent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4412

Modified Files:
	perl-POE-Component-DBIAgent.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-DBIAgent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-DBIAgent/devel/perl-POE-Component-DBIAgent.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-POE-Component-DBIAgent.spec	26 Jul 2009 13:57:35 -0000	1.6
+++ perl-POE-Component-DBIAgent.spec	7 Dec 2009 09:01:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-DBIAgent
 Version:        0.26
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        POE Component for running asynchronous DBI calls
 # see tail of DBIAgent.pm
 License:        GPL+ or Artistic
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.26-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 09:01:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 09:01:23 +0000
Subject: [pkgdb] gnomeradio: roma has requested approveacls
Message-ID: <20091207090123.778C910F88C@bastion2.fedora.phx.redhat.com>

roma has requested the approveacls acl on gnomeradio (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnomeradio



From kasal at fedoraproject.org  Mon Dec  7 09:02:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:02:01 +0000 (UTC)
Subject: rpms/perl-DBM-Deep/devel perl-DBM-Deep.spec,1.5,1.6
Message-ID: <20091207090201.3A4A411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBM-Deep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4760

Modified Files:
	perl-DBM-Deep.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBM-Deep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBM-Deep/devel/perl-DBM-Deep.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-DBM-Deep.spec	26 Jul 2009 05:25:24 -0000	1.5
+++ perl-DBM-Deep.spec	7 Dec 2009 09:02:01 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-DBM-Deep
 Version:        0.983
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A pure perl multi-level hash/array DBM
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.983-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.983-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Mon Dec  7 09:02:22 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon,  7 Dec 2009 09:02:22 +0000 (UTC)
Subject: File yawp-0.3.2.tar.bz2 uploaded to lookaside cache by oget
Message-ID: <20091207090222.2E31310F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kde-plasma-yawp:

ba4941e81e61086ccec06584f7ae98dd  yawp-0.3.2.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 09:03:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:03:13 +0000 (UTC)
Subject: rpms/perl-Kwiki-Archive-Rcs/devel perl-Kwiki-Archive-Rcs.spec, 1.9, 
	1.10
Message-ID: <20091207090313.5295211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki-Archive-Rcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5385

Modified Files:
	perl-Kwiki-Archive-Rcs.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki-Archive-Rcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki-Archive-Rcs/devel/perl-Kwiki-Archive-Rcs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Kwiki-Archive-Rcs.spec	26 Jul 2009 08:52:54 -0000	1.9
+++ perl-Kwiki-Archive-Rcs.spec	7 Dec 2009 09:03:13 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki-Archive-Rcs
 Version:        0.15
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Kwiki Page Archival Using RCS
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:03:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:03:47 +0000 (UTC)
Subject: rpms/perl-Callback/devel perl-Callback.spec,1.4,1.5
Message-ID: <20091207090347.416B411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Callback/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5686

Modified Files:
	perl-Callback.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Callback.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Callback/devel/perl-Callback.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Callback.spec	26 Jul 2009 04:06:19 -0000	1.4
+++ perl-Callback.spec	7 Dec 2009 09:03:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Callback
 Version:        1.07
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Object interface for function callbacks
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:04:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:04:43 +0000 (UTC)
Subject: rpms/perl-Unix-Syslog/devel perl-Unix-Syslog.spec,1.18,1.19
Message-ID: <20091207090443.00BAD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Unix-Syslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6116

Modified Files:
	perl-Unix-Syslog.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Unix-Syslog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unix-Syslog/devel/perl-Unix-Syslog.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-Unix-Syslog.spec	26 Jul 2009 17:24:29 -0000	1.18
+++ perl-Unix-Syslog.spec	7 Dec 2009 09:04:42 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Unix-Syslog
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to the UNIX syslog(3) calls
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:05:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:05:33 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-SMTP/devel
	perl-POE-Component-Client-SMTP.spec, 1.4, 1.5
Message-ID: <20091207090533.9B8D111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Client-SMTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6478

Modified Files:
	perl-POE-Component-Client-SMTP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Client-SMTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-SMTP/devel/perl-POE-Component-Client-SMTP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-POE-Component-Client-SMTP.spec	2 Sep 2009 13:24:49 -0000	1.4
+++ perl-POE-Component-Client-SMTP.spec	7 Dec 2009 09:05:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-SMTP
 Version:        0.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Asynchronous mail sending with POE
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-2
+- rebuild against perl 5.10.1
+
 * Wed Sep  2 2009 Yanko Kaneti <yaneti at declera.com> - 0.22-1
 - New upstream release
 



From kasal at fedoraproject.org  Mon Dec  7 09:06:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:06:23 +0000 (UTC)
Subject: rpms/perl-DBIx-SearchBuilder/devel perl-DBIx-SearchBuilder.spec,
	1.22, 1.23
Message-ID: <20091207090623.5C78111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6913

Modified Files:
	perl-DBIx-SearchBuilder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-DBIx-SearchBuilder.spec	29 Jul 2009 10:14:56 -0000	1.22
+++ perl-DBIx-SearchBuilder.spec	7 Dec 2009 09:06:23 -0000	1.23
@@ -7,7 +7,7 @@
 
 Name: 		perl-DBIx-SearchBuilder
 Version: 	1.56
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -94,6 +94,9 @@ DBIx::SearchBuilder bindings for Oracle
 %endif
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.56-2
+- rebuild against perl 5.10.1
+
 * Wed Jul 29 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.56-1
 - Upstream update.
 



From oget at fedoraproject.org  Mon Dec  7 09:07:09 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon,  7 Dec 2009 09:07:09 +0000 (UTC)
Subject: rpms/kde-plasma-yawp/devel .cvsignore, 1.2, 1.3 kde-plasma-yawp.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091207090709.B078111C00EE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/kde-plasma-yawp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7283

Modified Files:
	.cvsignore kde-plasma-yawp.spec sources 
Log Message:
* Sun Dec 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.2-1
- Update to new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2009 23:18:32 -0000	1.2
+++ .cvsignore	7 Dec 2009 09:07:09 -0000	1.3
@@ -1 +1 @@
-yawp-0.2.3.tar.bz2
+yawp-0.3.2.tar.bz2


Index: kde-plasma-yawp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/devel/kde-plasma-yawp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde-plasma-yawp.spec	25 Jul 2009 04:24:16 -0000	1.2
+++ kde-plasma-yawp.spec	7 Dec 2009 09:07:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kde-plasma-yawp
-Version:        0.2.3
-Release:        2%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        Yet Another Weather Plasmoid
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -10,7 +10,9 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
+BuildRequires:  kdebase-workspace-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  kdeplasma-addons-devel
 
 
 %description
@@ -42,11 +44,18 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README TODO
 %{_kde4_libdir}/kde4/plasma_yawp.so
+%{_kde4_libdir}/kde4/ion_accuweather.so
+%{_kde4_libdir}/kde4/ion_google.so
 %{_kde4_datadir}/kde4/services/plasma_yawp.desktop
+%{_kde4_datadir}/kde4/services/ion-accuweather.desktop
+%{_kde4_datadir}/kde4/services/ion-google.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*.svg
 
 
 %changelog
+* Sun Dec 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.2-1
+- Update to new upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 May 2009 23:18:32 -0000	1.2
+++ sources	7 Dec 2009 09:07:09 -0000	1.3
@@ -1 +1 @@
-8b457269ee6bfdf300158885003cb17e  yawp-0.2.3.tar.bz2
+ba4941e81e61086ccec06584f7ae98dd  yawp-0.3.2.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 09:07:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:07:29 +0000 (UTC)
Subject: rpms/perl-Kwiki/devel perl-Kwiki.spec,1.9,1.10
Message-ID: <20091207090729.3764311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Kwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7491

Modified Files:
	perl-Kwiki.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Kwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Kwiki/devel/perl-Kwiki.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Kwiki.spec	26 Jul 2009 08:52:40 -0000	1.9
+++ perl-Kwiki.spec	7 Dec 2009 09:07:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Kwiki
 Version:        0.39
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Kwiki Wiki Building Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.39-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.39-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:07:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:07:32 +0000 (UTC)
Subject: rpms/perl-Calendar-Simple/devel perl-Calendar-Simple.spec, 1.12,
	1.13
Message-ID: <20091207090732.37F6A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Calendar-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7546

Modified Files:
	perl-Calendar-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Calendar-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/devel/perl-Calendar-Simple.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Calendar-Simple.spec	26 Jul 2009 04:05:57 -0000	1.12
+++ perl-Calendar-Simple.spec	7 Dec 2009 09:07:32 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Perl extension to create simple calendars
 Name:		perl-Calendar-Simple
 Version:	1.20
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Calendar-Simple/
@@ -51,6 +51,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.20-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Mon Dec  7 09:08:04 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon,  7 Dec 2009 09:08:04 +0000 (UTC)
Subject: rpms/kde-plasma-yawp/F-12 .cvsignore, 1.2, 1.3 kde-plasma-yawp.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091207090804.B69FF11C00EE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/kde-plasma-yawp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7920

Modified Files:
	.cvsignore kde-plasma-yawp.spec sources 
Log Message:
* Sun Dec 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.2-1
- Update to new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2009 23:18:32 -0000	1.2
+++ .cvsignore	7 Dec 2009 09:08:04 -0000	1.3
@@ -1 +1 @@
-yawp-0.2.3.tar.bz2
+yawp-0.3.2.tar.bz2


Index: kde-plasma-yawp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/F-12/kde-plasma-yawp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde-plasma-yawp.spec	25 Jul 2009 04:24:16 -0000	1.2
+++ kde-plasma-yawp.spec	7 Dec 2009 09:08:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kde-plasma-yawp
-Version:        0.2.3
-Release:        2%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        Yet Another Weather Plasmoid
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -10,7 +10,9 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
+BuildRequires:  kdebase-workspace-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  kdeplasma-addons-devel
 
 
 %description
@@ -42,11 +44,18 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README TODO
 %{_kde4_libdir}/kde4/plasma_yawp.so
+%{_kde4_libdir}/kde4/ion_accuweather.so
+%{_kde4_libdir}/kde4/ion_google.so
 %{_kde4_datadir}/kde4/services/plasma_yawp.desktop
+%{_kde4_datadir}/kde4/services/ion-accuweather.desktop
+%{_kde4_datadir}/kde4/services/ion-google.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*.svg
 
 
 %changelog
+* Sun Dec 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.2-1
+- Update to new upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 May 2009 23:18:32 -0000	1.2
+++ sources	7 Dec 2009 09:08:04 -0000	1.3
@@ -1 +1 @@
-8b457269ee6bfdf300158885003cb17e  yawp-0.2.3.tar.bz2
+ba4941e81e61086ccec06584f7ae98dd  yawp-0.3.2.tar.bz2



From oget at fedoraproject.org  Mon Dec  7 09:08:43 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Mon,  7 Dec 2009 09:08:43 +0000 (UTC)
Subject: rpms/kde-plasma-yawp/F-11 .cvsignore, 1.2, 1.3 kde-plasma-yawp.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091207090843.DB46E11C00EE@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/kde-plasma-yawp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8305

Modified Files:
	.cvsignore kde-plasma-yawp.spec sources 
Log Message:
* Sun Dec 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.2-1
- Update to new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2009 23:21:02 -0000	1.2
+++ .cvsignore	7 Dec 2009 09:08:43 -0000	1.3
@@ -1 +1 @@
-yawp-0.2.3.tar.bz2
+yawp-0.3.2.tar.bz2


Index: kde-plasma-yawp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/F-11/kde-plasma-yawp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kde-plasma-yawp.spec	9 May 2009 23:21:02 -0000	1.1
+++ kde-plasma-yawp.spec	7 Dec 2009 09:08:43 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           kde-plasma-yawp
-Version:        0.2.3
+Version:        0.3.2
 Release:        1%{?dist}
 Summary:        Yet Another Weather Plasmoid
 Group:          User Interface/Desktops
@@ -10,7 +10,9 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
+BuildRequires:  kdebase-workspace-devel
 BuildRequires:  kdelibs-devel
+BuildRequires:  kdeplasma-addons-devel
 
 
 %description
@@ -42,10 +44,20 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README TODO
 %{_kde4_libdir}/kde4/plasma_yawp.so
+%{_kde4_libdir}/kde4/ion_accuweather.so
+%{_kde4_libdir}/kde4/ion_google.so
 %{_kde4_datadir}/kde4/services/plasma_yawp.desktop
+%{_kde4_datadir}/kde4/services/ion-accuweather.desktop
+%{_kde4_datadir}/kde4/services/ion-google.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*.svg
 
 
 %changelog
+* Sun Dec 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.2-1
+- Update to new upstream version
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.2.3-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 May 2009 23:21:02 -0000	1.2
+++ sources	7 Dec 2009 09:08:43 -0000	1.3
@@ -1 +1 @@
-8b457269ee6bfdf300158885003cb17e  yawp-0.2.3.tar.bz2
+ba4941e81e61086ccec06584f7ae98dd  yawp-0.3.2.tar.bz2



From caolanm at fedoraproject.org  Mon Dec  7 09:09:16 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  7 Dec 2009 09:09:16 +0000 (UTC)
Subject: File hunspell-ro.3.3.tar.gz uploaded to lookaside cache by caolanm
Message-ID: <20091207090916.02DBE10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hunspell-ro:

cb6a5082e4de062340389ca934806837  hunspell-ro.3.3.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 09:10:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:10:06 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-LDAP/devel
	perl-POE-Component-Client-LDAP.spec, 1.7, 1.8
Message-ID: <20091207091006.9CF4B11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Client-LDAP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9223

Modified Files:
	perl-POE-Component-Client-LDAP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Client-LDAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-LDAP/devel/perl-POE-Component-Client-LDAP.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-POE-Component-Client-LDAP.spec	26 Jul 2009 13:57:05 -0000	1.7
+++ perl-POE-Component-Client-LDAP.spec	7 Dec 2009 09:10:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-LDAP
 Version:        0.04        
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Async LDAP access for POE
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:10:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:10:39 +0000 (UTC)
Subject: rpms/perl-DBIx-Safe/devel perl-DBIx-Safe.spec,1.3,1.4
Message-ID: <20091207091039.11EFE11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-Safe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9721

Modified Files:
	perl-DBIx-Safe.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-Safe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Safe/devel/perl-DBIx-Safe.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-DBIx-Safe.spec	26 Jul 2009 05:24:57 -0000	1.3
+++ perl-DBIx-Safe.spec	7 Dec 2009 09:10:38 -0000	1.4
@@ -1,7 +1,7 @@
 %define         realname DBIx-Safe
 Name:           perl-DBIx-Safe
 Version:        1.2.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Safer access to your database through a DBI database handle
 License:        BSD
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2.5-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:12:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:12:05 +0000 (UTC)
Subject: rpms/perl-Cairo/devel perl-Cairo.spec,1.23,1.24
Message-ID: <20091207091205.6785211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10865

Modified Files:
	perl-Cairo.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cairo/devel/perl-Cairo.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Cairo.spec	26 Jul 2009 04:05:41 -0000	1.23
+++ perl-Cairo.spec	7 Dec 2009 09:12:05 -0000	1.24
@@ -6,7 +6,7 @@
 
 Name:           perl-Cairo
 Version:        1.060
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl interface to the cairo library
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.060-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.060-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:12:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:12:05 +0000 (UTC)
Subject: rpms/perl-KinoSearch/devel perl-KinoSearch.spec,1.7,1.8
Message-ID: <20091207091205.A1CF011C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-KinoSearch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10853

Modified Files:
	perl-KinoSearch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-KinoSearch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-KinoSearch/devel/perl-KinoSearch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-KinoSearch.spec	26 Jul 2009 08:52:26 -0000	1.7
+++ perl-KinoSearch.spec	7 Dec 2009 09:12:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-KinoSearch
 Version:        0.165
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Search engine library
 # ApacheLicense2.0.txt included is included just becuase the upstream
 # author decided to include it and is only for informative purposes.
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.165-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.165-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Mon Dec  7 09:13:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  7 Dec 2009 09:13:27 +0000 (UTC)
Subject: rpms/hunspell-ro/devel hunspell-ro.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20091207091327.492AE11C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11970/devel

Modified Files:
	hunspell-ro.spec sources 
Log Message:
Resolves: rhbz#544647 latest version


Index: hunspell-ro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ro/devel/hunspell-ro.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hunspell-ro.spec	16 Nov 2009 14:48:15 -0000	1.4
+++ hunspell-ro.spec	7 Dec 2009 09:13:26 -0000	1.5
@@ -2,7 +2,7 @@ Name: hunspell-ro
 Summary: Romanian hunspell dictionaries
 Version: 3.3
 Release: 1%{?dist}
-Source: http://downloads.sourceforge.net/rospell/ro_RO.%{version}.zip
+Source: http://downloads.sourceforge.net/rospell/%{name}.%{version}.tar.gz
 Group: Applications/Text
 URL: http://rospell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,7 +15,7 @@ Requires: hunspell
 Romanian hunspell dictionaries.
 
 %prep
-%setup -q -c
+%setup -q -n %{name}.%{version}
 
 %build
 
@@ -29,7 +29,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_ro_RO.txt COPYING.GPL COPYING.LGPL COPYING.MPL
+%doc README COPYING.GPL COPYING.LGPL COPYING.MPL
 %{_datadir}/myspell/*
 
 %changelog


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ro/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Nov 2009 14:48:16 -0000	1.3
+++ sources	7 Dec 2009 09:13:27 -0000	1.4
@@ -1 +1 @@
-88307c23143a59f269d7ec8660b9fe25  ro_RO.3.3.zip
+cb6a5082e4de062340389ca934806837  hunspell-ro.3.3.tar.gz



From caolanm at fedoraproject.org  Mon Dec  7 09:13:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  7 Dec 2009 09:13:26 +0000 (UTC)
Subject: rpms/hunspell-ro/F-12 .cvsignore, 1.2, 1.3 hunspell-ro.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091207091326.DF85911C00EE@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ro/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11970/F-12

Modified Files:
	.cvsignore hunspell-ro.spec sources 
Log Message:
Resolves: rhbz#544647 latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ro/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Sep 2008 09:47:33 -0000	1.2
+++ .cvsignore	7 Dec 2009 09:13:26 -0000	1.3
@@ -1 +1,2 @@
 hunspell-ro.3.2.tar.gz
+hunspell-ro.3.3.tar.gz


Index: hunspell-ro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ro/F-12/hunspell-ro.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hunspell-ro.spec	25 Jul 2009 02:38:30 -0000	1.3
+++ hunspell-ro.spec	7 Dec 2009 09:13:26 -0000	1.4
@@ -1,8 +1,8 @@
 Name: hunspell-ro
 Summary: Romanian hunspell dictionaries
-Version: 3.2
-Release: 3%{?dist}
-Source0: http://downloads.sourceforge.net/rospell/%{name}.%{version}.tar.gz
+Version: 3.3
+Release: 1%{?dist}
+Source: http://downloads.sourceforge.net/rospell/%{name}.%{version}.tar.gz
 Group: Applications/Text
 URL: http://rospell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Dec 07 2009 Caolan McNamara <caolanm at redhat.com> - 3.3-1
+- Resolves: rhbz#544647 latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ro/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Sep 2008 09:47:33 -0000	1.2
+++ sources	7 Dec 2009 09:13:26 -0000	1.3
@@ -1 +1 @@
-ab70681d2e7a534e638d8c598593cd15  hunspell-ro.3.2.tar.gz
+cb6a5082e4de062340389ca934806837  hunspell-ro.3.3.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 09:14:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:14:59 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-Keepalive/devel
	perl-POE-Component-Client-Keepalive.spec, 1.16, 1.17
Message-ID: <20091207091459.D9EE111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Client-Keepalive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13154

Modified Files:
	perl-POE-Component-Client-Keepalive.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Client-Keepalive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-POE-Component-Client-Keepalive.spec	30 Sep 2009 17:17:01 -0000	1.16
+++ perl-POE-Component-Client-Keepalive.spec	7 Dec 2009 09:14:59 -0000	1.17
@@ -3,7 +3,7 @@ Name:           perl-POE-Component-Clien
 # Keep four digits to stay above the unfortunate 0.0901,
 # so that epoch need not be changed.
 Version:        %{real_ver}0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Manages and keeps alive client connections
 
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2600-4
+- rebuild against perl 5.10.1
+
 * Wed Sep 30 2009 Stepan Kasal <skasal at redhat.com> 0.2600-3
 - keep the version aligned to 0.xxxx to maintain upgrade path
 



From kasal at fedoraproject.org  Mon Dec  7 09:14:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:14:55 +0000 (UTC)
Subject: rpms/perl-DBIx-POS/devel perl-DBIx-POS.spec,1.6,1.7
Message-ID: <20091207091455.C7E5811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-POS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13116

Modified Files:
	perl-DBIx-POS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-POS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-POS/devel/perl-DBIx-POS.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-DBIx-POS.spec	26 Jul 2009 05:24:44 -0000	1.6
+++ perl-DBIx-POS.spec	7 Dec 2009 09:14:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-POS
 Version:        0.03
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Define a dictionary of SQL statements in a POD dialect (POS)
 # There was some code that was taken from Class::Singleton, which was Artistic only at the time.
 # That code has since been relicensed to GPL+ or Artistic.
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:17:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:17:10 +0000 (UTC)
Subject: rpms/perl-JSON-XS/devel perl-JSON-XS.spec,1.17,1.18
Message-ID: <20091207091710.EF3CD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-JSON-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14043

Modified Files:
	perl-JSON-XS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-JSON-XS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JSON-XS/devel/perl-JSON-XS.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-JSON-XS.spec	26 Jul 2009 08:50:58 -0000	1.17
+++ perl-JSON-XS.spec	7 Dec 2009 09:17:10 -0000	1.18
@@ -1,7 +1,7 @@
 Name:           perl-JSON-XS
 Epoch:          1
 Version:        2.24
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        JSON serialising/deserialising, done correctly and fast
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_mandir}/man[13]/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:2.24-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:17:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:17:28 +0000 (UTC)
Subject: rpms/perl-Cache-Simple-TimedExpiry/devel
	perl-Cache-Simple-TimedExpiry.spec, 1.10, 1.11
Message-ID: <20091207091728.01F9111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14224

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
- rebuild against perl 5.10.1


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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Cache-Simple-TimedExpiry.spec	26 Jul 2009 04:05:26 -0000	1.10
+++ perl-Cache-Simple-TimedExpiry.spec	7 Dec 2009 09:17:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -43,6 +43,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.27-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:18:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:18:58 +0000 (UTC)
Subject: rpms/perl-DBIx-DBSchema/devel perl-DBIx-DBSchema.spec,1.15,1.16
Message-ID: <20091207091858.78A8D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14852

Modified Files:
	perl-DBIx-DBSchema.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-DBIx-DBSchema.spec	26 Jul 2009 05:24:30 -0000	1.15
+++ perl-DBIx-DBSchema.spec	7 Dec 2009 09:18:58 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-DBSchema
 Version:        0.36
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.36-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:21:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:21:04 +0000 (UTC)
Subject: rpms/perl-JSON-RPC-Common/devel perl-JSON-RPC-Common.spec,1.2,1.3
Message-ID: <20091207092104.D1B4B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-JSON-RPC-Common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15558

Modified Files:
	perl-JSON-RPC-Common.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-JSON-RPC-Common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JSON-RPC-Common/devel/perl-JSON-RPC-Common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-JSON-RPC-Common.spec	26 Jul 2009 08:50:44 -0000	1.2
+++ perl-JSON-RPC-Common.spec	7 Dec 2009 09:21:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-JSON-RPC-Common
 Version:        0.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl module for handling JSON-RPC objects
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:21:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:21:45 +0000 (UTC)
Subject: rpms/perl-Cache-Mmap/devel perl-Cache-Mmap.spec,1.8,1.9
Message-ID: <20091207092145.F312111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Cache-Mmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15919

Modified Files:
	perl-Cache-Mmap.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Cache-Mmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Mmap/devel/perl-Cache-Mmap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Cache-Mmap.spec	26 Jul 2009 04:05:10 -0000	1.8
+++ perl-Cache-Mmap.spec	7 Dec 2009 09:21:44 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Cache-Mmap
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Shared data cache using memory mapped files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:22:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:22:00 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-HTTP/devel
	perl-POE-Component-Client-HTTP.spec, 1.17, 1.18
Message-ID: <20091207092200.9750811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Client-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16094

Modified Files:
	perl-POE-Component-Client-HTTP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Client-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-HTTP/devel/perl-POE-Component-Client-HTTP.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-POE-Component-Client-HTTP.spec	30 Sep 2009 16:52:26 -0000	1.17
+++ perl-POE-Component-Client-HTTP.spec	7 Dec 2009 09:21:59 -0000	1.18
@@ -11,7 +11,7 @@
 
 Name:           perl-POE-Component-Client-HTTP
 Version:        0.890
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A non-blocking/parallel web requests engine for POE
 
 Group:          Development/Libraries
@@ -103,6 +103,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.890-3
+- rebuild against perl 5.10.1
+
 * Wed Sep 30 2009 Stepan Kasal <skasal at redhat.com> 0.890-2
 - fix the perl(POE::Component::Client::Keepalive) require
   to match our numbering



From kasal at fedoraproject.org  Mon Dec  7 09:23:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:23:11 +0000 (UTC)
Subject: rpms/perl-DBIx-ContextualFetch/devel perl-DBIx-ContextualFetch.spec,
	1.8, 1.9
Message-ID: <20091207092311.2379011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-ContextualFetch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16584

Modified Files:
	perl-DBIx-ContextualFetch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-ContextualFetch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-ContextualFetch/devel/perl-DBIx-ContextualFetch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-DBIx-ContextualFetch.spec	26 Jul 2009 05:24:16 -0000	1.8
+++ perl-DBIx-ContextualFetch.spec	7 Dec 2009 09:23:11 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-ContextualFetch
 Version:        1.03
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Add contextual fetches to DBI
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:25:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:25:04 +0000 (UTC)
Subject: rpms/perl-JSON-RPC/devel perl-JSON-RPC.spec,1.2,1.3
Message-ID: <20091207092504.E92DC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-JSON-RPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17566

Modified Files:
	perl-JSON-RPC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-JSON-RPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JSON-RPC/devel/perl-JSON-RPC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-JSON-RPC.spec	26 Jul 2009 08:50:31 -0000	1.2
+++ perl-JSON-RPC.spec	7 Dec 2009 09:25:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-JSON-RPC
 Version:        0.96
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl implementation of JSON-RPC 1.1 protocol
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.96-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:25:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:25:39 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-DNS/devel
	perl-POE-Component-Client-DNS.spec, 1.10, 1.11
Message-ID: <20091207092539.BB7EA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Client-DNS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17825

Modified Files:
	perl-POE-Component-Client-DNS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Client-DNS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-DNS/devel/perl-POE-Component-Client-DNS.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-POE-Component-Client-DNS.spec	27 Sep 2009 08:28:33 -0000	1.10
+++ perl-POE-Component-Client-DNS.spec	7 Dec 2009 09:25:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-DNS
 Version:        1.050
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Non-blocking/concurrent DNS queries using Net::DNS and POE
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.050-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.050-1
 - auto-update to 1.050 (by cpan-spec-update 0.01)
 - added a new br on perl(Test::NoWarnings) (version 0.084)



From kasal at fedoraproject.org  Mon Dec  7 09:27:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:27:10 +0000 (UTC)
Subject: rpms/perl-Cache-Memcached/devel perl-Cache-Memcached.spec,1.4,1.5
Message-ID: <20091207092710.6058611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Cache-Memcached/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18395

Modified Files:
	perl-Cache-Memcached.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Cache-Memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Memcached/devel/perl-Cache-Memcached.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Cache-Memcached.spec	2 Nov 2009 09:57:38 -0000	1.4
+++ perl-Cache-Memcached.spec	7 Dec 2009 09:27:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Cache-Memcached
 Version:        1.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl client for memcached
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28-2
+- rebuild against perl 5.10.1
+
 * Mon Nov  2 2009 Stepan Kasal <skasal at redhat.com> - 1.28-1
 - new upstream version
 



From dsd at fedoraproject.org  Mon Dec  7 09:27:39 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon,  7 Dec 2009 09:27:39 +0000 (UTC)
Subject: File dracut-modules-olpc-0.3.1.tar.bz2 uploaded to lookaside cache
	by dsd
Message-ID: <20091207092739.09CA110F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for dracut-modules-olpc:

e818ad8a497e05821fe489b2e41e441a  dracut-modules-olpc-0.3.1.tar.bz2



From transif at fedoraproject.org  Mon Dec  7 09:28:09 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Dec 2009 09:28:09 +0000 (UTC)
Subject: comps/po as.po,1.22,1.23
Message-ID: <20091207092809.418F211C00EE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18897/po

Modified Files:
	as.po 
Log Message:
Sending translation for Assamese


Index: as.po
===================================================================
RCS file: /cvs/pkgs/comps/po/as.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- as.po	10 Sep 2009 03:56:22 -0000	1.22
+++ as.po	7 Dec 2009 09:28:08 -0000	1.23
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-06 08:20+0000\n"
-"PO-Revision-Date: 2009-09-07 21:21+0530\n"
+"POT-Creation-Date: 2009-12-07 02:16+0000\n"
+"PO-Revision-Date: 2009-12-07 12:20+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
-"Language-Team: Assamese\n"
+"Language-Team: Assamese <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
@@ -156,163 +156,163 @@ msgid "Clustering Support"
 msgstr "?????????????????????????????? ????????? ????????? ??????????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "?????????'????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "???????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ????????? ????????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "?????????????????? ???????????? ??????????????????????????? ?????????????????????  ?????????????????? ?????????????????????????????? ?????????-??????????????????(???????????????????????????)"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "?????????????????? ???????????? ??????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "??????????????? ????????? ?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "????????????????????????-????????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "?????????????????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "?????????????????? ?????????????????? ???????????? ?????????????????????????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "???????????????????????????????????? ????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "?????????????????? (UK)??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ????????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "?????????'????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Fedora Packager"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "????????????????????????' ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "??????????????????'?????? ????????? ??????????????????????????? ???????????? ????????????????????? ???"
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -321,19 +321,19 @@ msgstr ""
 "???????????????????????? ???????????? ?????????????????? ???????????????????????????????????????????????? ??????????????? ????????? ??????????????? ???????????? ????????????????????? ????????????'?????? ??????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "GNOME ????????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -342,172 +342,172 @@ msgstr ""
 "???????????????, ?????????????????????, ???????????????????????????????????????????????? ??????????????????????????? ????????? ????????? ?????????????????????????????? ??????????????????????????? ?????????????????????  ???"
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "???????????????????????? ????????? ????????????-??????????????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "?????????????????????????????? ????????????????????????'???"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "??????????????? ?????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "??????????????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "?????????????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+ ????????? GNOME ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ????????? XFCE ??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????????? KDE-??? ?????????????????????????????? ??????????????????????????? ??????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "???????????????????????????????????????????????? ?????????????????? ?????????????????? ????????????????????? ?????? ?????????????????? ????????????????????? ???????????? ?????????????????? ????????? ??????????????? ????????????'?????? ?????? "
 "?????????????????????????????? ???????????????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "????????? ?????????????????????????????? (X) ??????????????????????????????????????? ??????????????? ?????????????????? ????????????????????? ????????????'?????? ?????? ????????????????????????????????? ???????????????????????? "
 "????????? ???"
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "??????????????????????????? ?????????????????? ????????? ???????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java??? ??????????????????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ????????????????????? ??????????????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE ????????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -516,142 +516,142 @@ msgstr ""
 "???????????????, ?????????????????????, ???????????????????????????????????????????????? ??????????????????????????? ????????? ????????? ?????????????????????????????? ??????????????????????????? ????????????????????? ???"
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "???'??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "?????????????????? ?????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "?????????????????? ??????'??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "?????????????????? ????????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "?????????????????? ????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "??????' ?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "????????? ??????????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "???????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "??????'??????????????? ???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "??????????????? ????????????"
 
@@ -661,37 +661,37 @@ msgstr "????????????????????? ??????????
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "????????????????????? ???'???' ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "????????????'??? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "?????????????????????????????????/????????????????????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "??????????????? bitmap ????????? vector ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -699,55 +699,55 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "???'??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "????????? ??????????????? ??????????????????"
 
@@ -761,73 +761,73 @@ msgstr "SUGAR ???????????? OLPC XO ??? ?
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "??????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????? ???????????????????????? ????????????????????? ?????? ???????????? ???????????? ??????????????????'??? ????????????????????? ????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "??????????????????????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "??????'??????????????? ???????????? ????????????'?????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "??????'???????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -837,91 +837,91 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "??????????????? ????????? ???????????????'"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "?????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "?????????????????? ???'???' ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr " Java ?????????'????????????????????? ??????????????? ?????????'?????????????????? ??????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ?????????'????????????????????? ??????????????? ?????????'?????????????????? ????????????'?????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "???????????????????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "?????????-?????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "??????????????????????????? ??????????????? ????????????????????????????????? ????????? ????????????????????????????????? ????????????????????????????????? ??????????????? ??????????????? ??????????????????,PDF ?????????????????? "
@@ -929,7 +929,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "?????? ???????????? ????????????????????? ???????????? ?????????????????????????????? ?????????????????? ???????????? ??????????????????????????? ????????? ?????????????????????  ?????????????????? ?????????????????????????????? "
@@ -937,13 +937,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????? ????????????????????? ??????????????? ?????????????????? ??????????????? ????????? IMAP ?????? SMTP ????????? ??????????????? ????????????????????? ???????????? ???????????? ???"
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "?????? ????????????????????? ??????????????? ?????????????????? ??????????????? X ???????????????-????????????????????? ???????????????????????????????????????????????? ???????????? ?????????????????????????????? ??????????????? "
@@ -951,39 +951,40 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????? ??????????????????????????? ?????? ???????????? ????????????????????? ?????????????????? ?????? ????????????????????????????????? ??????????????? ?????? ???"
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????'??????????????? ?????????????????? ???????????? ???????????? DHCP, Kerberos ????????? NIS ???"
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr "?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????????????? ??????'??????????????? ???????????????-??????????????? ???????????? ???????????? rsh ????????? telnet ???"
+msgstr ""
+"?????? ????????????????????? ??????????????? ????????????????????????????????? ????????? ??????????????? ??????'??????????????? ???????????????-??????????????? ???????????? ???????????? rsh ????????? telnet ???"
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "?????? ????????????????????? ??????????????? ??????????????????????????????????????????????????? ????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????? ????????????????????? ??????????????? ???????????????????????? ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -991,7 +992,7 @@ msgstr "?????? ????????????????????? ???
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1001,19 +1002,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????? ?????????????????? ??????????????? ?????????????????? ???????????????????????????????????????????????? ???????????? ???????????? ????????????'?????? ??????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????? ?????????????????? ??????????????? ?????????????????? ???????????????????????????????????????????????? FTP ???????????? ????????????'?????? ??????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1023,19 +1024,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????? ???????????? ?????????????????? ??????????????? ???????????? ???????????? ???????????????????????????????????????????????? ????????????????????? ??????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "?????? ???????????? Red Hat-??? ???????????? ??????????????????????????? ??????????????? ????????????????????? ?????????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1045,13 +1046,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "?????? ???????????? ?????????????????????????????? ????????????, ???????????? ????????? ????????? ??????????????????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1059,13 +1060,13 @@ msgstr "?????? ???????????? ????????????
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "?????? ???????????? ????????????????????????????????? ????????? ?????????????????????????????? ?????????????????????????????? ????????? ??????????????????????????? ???????????? ????????????????????? ???"
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1075,7 +1076,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1085,19 +1086,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????? ????????? ?????????????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "????????????????????? ??????????????????-????????????????????? ???????????????????????? ???????????? ?????? ????????? ???????????????????????? ????????? ?????????????????? ???"
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1107,13 +1108,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????? ???????????????????????? ?????????????????? ???????????????????????????????????????????????? DNS ????????????????????? ????????????(BIND) ??????????????? ??????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1123,163 +1124,163 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????? ???????????????????????? ???????????? ????????? MySQL??? ???????????? ?????????????????? ????????????'?????? ???????????????????????? ????????????????????? ???"
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????? ???????????????????????? ???????????? ????????? Postgresql??? ???????????? ?????????????????? ????????????'?????? ???????????????????????? ????????????????????? ???"
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "???'???????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "????????? Fedora Packager ??? ?????????????????? ????????????????????? ???????????? ????????????????????? ????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "???'???????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "???????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "???????????????????????????????????????????????? ????????????????????? ????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "?????????????????? ??????????????? ????????? ????????????????????? ????????? ???????????? ????????????'?????? ????????????????????? ????????? ???"
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "???????????? ???????????? ???"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "Windows ???????????????????????? ???????????? ???"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ????????????????????????????????? ?????????????????? ???"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X ???????????????-????????????????????? ?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "???????????? ??????????????? ??????????????????"
 
@@ -1293,67 +1294,67 @@ msgid "Haskell Development"
 msgstr "Haskell ??? ???????????????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "????????????????????????????????? ???????????? ??????????????? ?????????????????? ??????????????? ????????????????????? ????????????????????? ???"
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "??????????????????????????? (???????????????????????????) ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ???????????????"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ?????????'????????????????????? ??????????????? ?????????'?????????????????? ??????????????? ???????????? ?????????????????? ???"
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ????????????????????????????????? ???????????? ?????????????????? ????????? ??????????????????????????? ????????????????????? ??????????????????????????? ?????????????????? ???"
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
@@ -1369,115 +1370,117 @@ msgstr "????????????????????????????????
 msgid "Chichewa Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "???'??????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "??????????????????????????? ???????????????????????? ??????????????????????????? ??????????????? ???????????????????????? ????????? ??????????????????????????? ?????????????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "????????????????????????????????? ??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "???'???????????? ???????????????????????? ????????? ?????????????????? ????????? ?????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "?????????????????????????????? ??????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "????????????????????????'??? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "???????????????????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "?????????????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "???????????????????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW cross-compiler"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "???'????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "??????-???????????? ???????????? ????????? ?????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1486,7 +1489,7 @@ msgstr ""
 "?????????, ????????? ???????????????????????? ?????????????????? ?????????, ???????????? Fedora ??? ?????????????????? ???"
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1495,29 +1498,29 @@ msgstr ""
 "?????????????????? ???"
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "?????? ????????? ???'???????????? ????????????????????????, ?????????????????????, ???????????????????????????, ????????? ????????? ??????????????? ???????????????????????? ?????????????????? ???"
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "???????????? ???'????????????????????? ??????????????? ??????????????????"
 
@@ -1531,7 +1534,8 @@ msgstr "GNOME ??????????????????'?????? 
 msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
-msgstr "Fedora-??? ???????????? ?????????????????? ???????????????????????? Critical Path-??? ??????????????????????????? ????????????????????????????????? ???????????????????????? ??????????????? ???"
+msgstr ""
+"Fedora-??? ???????????? ?????????????????? ???????????????????????? Critical Path-??? ??????????????????????????? ????????????????????????????????? ???????????????????????? ??????????????? ???"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1541,69 +1545,77 @@ msgstr "??????????????? ????????? ??????
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ???????????????????????????????????? ????????? ????????????????????? ???????????? ????????????????????? ??????????????? ????????? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "Critical Path (Base)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "Critical Path (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "??????????????????????????? ????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
 msgstr ""
-"LXDE ????????????, ??????????????? ??????????????????????????????????????? ?????????????????? ???????????? ??????????????????, ?????????????????? ?????????????????? ?????? ??????????????? "
-"?????????????????????????????? ???????????? ????????????????????? ???????????? ????????? ?????????????????????????????? X11 ??????????????????'??? ?????????????????? ???"
+"LXDE ????????????, ??????????????? ??????????????????????????????????????? ?????????????????? ???????????? ??????????????????, ?????????????????? ?????????????????? ?????? ??????????????? ?????????????????????????????? "
+"???????????? ????????????????????? ???????????? ????????? ?????????????????????????????? X11 ??????????????????'??? ?????????????????? ???"
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "?????????????????? ????????? ??????????????????????????????????????? ???????????????????????????????????? ???????????? ???"
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Moblin ??????????????????'??? ??????????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "NetBook/NetTop/MID ????????????????????? ???????????? ???????????????????????????????????? ??????????????????'??? ?????????????????? Moblin ???"
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "???????????????????????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "?????????????????? ????????? ???????????? ?????????????????????????????? ??????????????????????????? ???"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????????????????????? ???????????????????????? ???????????? ??????????????????????????? ???"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "??????????????? ????????? ?????????????????????????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
 "GNOME ????????? ???????????????????????????, ?????????????????????????????? ??????????????????????????????????????? ??????????????? ?????????????????? ???'??? ????????????????????????????????? ????????? ????????? "
-"???????????????, ?????????????????????, ???????????????????????????????????????????????? ????????????????????? ??????????????????????????? ????????? ????????? ?????????????????????????????? ??????????????????????????? ????????????????????? "
-" ???"
+"???????????????, ?????????????????????, ???????????????????????????????????????????????? ????????????????????? ??????????????????????????? ????????? ????????? ?????????????????????????????? ??????????????????????????? "
+"?????????????????????  ???"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
 "KDE ????????? ???????????????????????????, ?????????????????????????????? ??????????????????????????????????????? ??????????????? ?????????????????? ???'??? ????????????????????????????????? ????????? ????????? "
-"???????????????, ?????????????????????, ???????????????????????????????????????????????? ????????????????????? ??????????????????????????? ????????? ????????? ?????????????????????????????? ??????????????????????????? ????????????????????? "
-" ???"
+"???????????????, ?????????????????????, ???????????????????????????????????????????????? ????????????????????? ??????????????????????????? ????????? ????????? ?????????????????????????????? ??????????????????????????? "
+"?????????????????????  ???"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1611,11 +1623,11 @@ msgstr ""
 "???????????????????????? ????????? ????????????????????? ?????????????????? ?????????, ?????? ?????????????????????????????????????????? ?????????????????? ????????????????????? ?????????????????? ????????? ????????????????????? "
 "????????????'?????? ??????????????? ????????? ??? ???????????? ????????????????????????????????? ?????? ????????? Emacs ????????? Vi ???"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "X?????????????????? ????????? ?????????????????????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1623,27 +1635,27 @@ msgstr ""
 "?????? ?????????????????? ??????????????? ?????????????????? DocBook ?????????????????? ???????????? ?????????????????? ????????? HTML, PDF, Postscript ????????? "
 "??????????????? ???????????? ?????????????????????????????? ????????????'?????? ??????????????? ????????? ???"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "???????????? ????????????????????????????????? ??????????????? ???????????? ??????'??????????????? ??????????????? ???????????? ????????? ?????????????????? ?????? ???"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ????????? ??????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????? ????????? ????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ????????? ????????????????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ????????? ????????? ????????????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????? ?????????????????? ???"
 



From kasal at fedoraproject.org  Mon Dec  7 09:28:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:28:13 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp/devel perl-DBIx-Class-TimeStamp.spec,
	1.1, 1.2
Message-ID: <20091207092813.C7BB011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18915

Modified Files:
	perl-DBIx-Class-TimeStamp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-Class-TimeStamp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/devel/perl-DBIx-Class-TimeStamp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-DBIx-Class-TimeStamp.spec	5 Aug 2009 14:37:54 -0000	1.1
+++ perl-DBIx-Class-TimeStamp.spec	7 Dec 2009 09:28:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-Class-TimeStamp
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DBIx::Class extension to update and create date and time based fields
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,5 +57,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-2
+- rebuild against perl 5.10.1
+
 * Sun Aug 02 2009 Iain Arnell 0.12-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 09:29:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:29:01 +0000 (UTC)
Subject: rpms/perl-JSON-Any/devel perl-JSON-Any.spec,1.9,1.10
Message-ID: <20091207092901.6006611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-JSON-Any/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19323

Modified Files:
	perl-JSON-Any.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-JSON-Any.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JSON-Any/devel/perl-JSON-Any.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-JSON-Any.spec	11 Aug 2009 07:56:27 -0000	1.9
+++ perl-JSON-Any.spec	7 Dec 2009 09:29:01 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-JSON-Any
 Version:        1.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A meta-module to make working with JSON easier
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.21-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.21-1
 - auto-update to 1.21 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)



From jpopelka at fedoraproject.org  Mon Dec  7 09:28:58 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon,  7 Dec 2009 09:28:58 +0000 (UTC)
Subject: rpms/lockdev/devel lockdev-1.0.3-checkname.patch, NONE,
	1.1 lockdev-1.0.3-cli.patch, NONE,
	1.1 lockdev-1.0.3-gccwarn.patch, NONE,
	1.1 lockdev-1.0.3-man8.patch, NONE,
	1.1 lockdev-1.0.3-pidexists.patch, NONE,
	1.1 lockdev-1.0.3-rh.patch, NONE, 1.1 lockdev-1.0.3-shared.patch,
	NONE, 1.1 .cvsignore, 1.3, 1.4 lockdev.spec, 1.36, 1.37 sources,
	1.3, 1.4 lockdev-1.0.0-cli.patch, 1.1,
	NONE lockdev-1.0.0-rh.patch, 1.5,
	NONE lockdev-1.0.0-shared.patch, 1.2,
	NONE lockdev-1.0.0-signal.patch, 1.1,
	NONE lockdev-1.0.1-32bit.patch, 1.1,
	NONE lockdev-1.0.1-checkname.patch, 1.1,
	NONE lockdev-1.0.1-fcntl.patch, 1.1,
	NONE lockdev-1.0.1-gccwarn.patch, 1.1,
	NONE lockdev-1.0.1-man8.patch, 1.1,
	NONE lockdev-1.0.1-pidexists.patch, 1.1,
	NONE lockdev-1.0.1-subdir.patch, 1.1, NONE
Message-ID: <20091207092858.D35B611C00EE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/lockdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19273

Modified Files:
	.cvsignore lockdev.spec sources 
Added Files:
	lockdev-1.0.3-checkname.patch lockdev-1.0.3-cli.patch 
	lockdev-1.0.3-gccwarn.patch lockdev-1.0.3-man8.patch 
	lockdev-1.0.3-pidexists.patch lockdev-1.0.3-rh.patch 
	lockdev-1.0.3-shared.patch 
Removed Files:
	lockdev-1.0.0-cli.patch lockdev-1.0.0-rh.patch 
	lockdev-1.0.0-shared.patch lockdev-1.0.0-signal.patch 
	lockdev-1.0.1-32bit.patch lockdev-1.0.1-checkname.patch 
	lockdev-1.0.1-fcntl.patch lockdev-1.0.1-gccwarn.patch 
	lockdev-1.0.1-man8.patch lockdev-1.0.1-pidexists.patch 
	lockdev-1.0.1-subdir.patch 
Log Message:
* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-1
- 1.0.3.  No longer need 1.0.0-signal, 1.0.1-subdir, 1.0.1-fcntl, 1.0.1-32bit patches.
- Renumbered patches and sources.


lockdev-1.0.3-checkname.patch:
 lockdev.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE lockdev-1.0.3-checkname.patch ---
diff -up lockdev-1.0.3/src/lockdev.c.checkname lockdev-1.0.3/src/lockdev.c
--- lockdev-1.0.3/src/lockdev.c.checkname	2009-12-05 15:40:16.000000000 +0100
+++ lockdev-1.0.3/src/lockdev.c	2009-12-05 15:55:29.000000000 +0100
@@ -487,18 +487,19 @@ _dl_check_devname (const char *devname)
 		_debug( 3, "_dl_check_devname(%s) stripped name = %s\n", devname, p);
 	} else {
 		/* Otherwise, strip off everything but the device name. */
-		while ( (m=strrchr( p, '/')) != 0 ) {
-			p = m+1;	/* was pointing to the slash */
+		p += strspn(p, " \t\r\n\v\f\a");        /* skip leading whitespace */
+		if (strncmp(p, DEV_PATH, strlen(DEV_PATH)) == 0) {
+			p += strlen(DEV_PATH);	/* 1st char after slash */
 			_debug( 3, "_dl_check_devname(%s) name = %s\n", devname, p);
 		}
 	}
 	if ( strcmp( p, "tty") == 0 )
 		p = ttyname( 0); /* this terminal, if it exists */
-	if ( ((l=strlen( p)) == 0 ) || ( l > (MAXPATHLEN - strlen(LOCK_PATH)) ))
-	 	return 0;
-	if ( ! (m = malloc( 1 + l)) )
-		return 0;
-	return strcpy( m, p);
+	if (((l = strlen(p)) == 0) || (l > (MAXPATHLEN - strlen(LOCK_PATH))))
+	 	return NULL;
+	if ((m = malloc(++l)) == NULL)
+		return NULL;
+	return strcpy(m, p);
 }
 
 

lockdev-1.0.3-cli.patch:
 sample.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE lockdev-1.0.3-cli.patch ---
diff -up lockdev-1.0.3/src/sample.c.cli lockdev-1.0.3/src/sample.c
--- lockdev-1.0.3/src/sample.c.cli	2009-12-05 15:40:16.000000000 +0100
+++ lockdev-1.0.3/src/sample.c	2009-12-05 15:48:39.000000000 +0100
@@ -32,6 +32,8 @@ main (int   argc,
 		}
 		else dev = p;
 	}
+	if (dev == NULL)
+	    usage();
 	i = 0;
 	(void) dev_setpid(getppid());
 	switch( ch ) {

lockdev-1.0.3-gccwarn.patch:
 sample.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE lockdev-1.0.3-gccwarn.patch ---
diff -up lockdev-1.0.3/src/sample.c.gccwarn lockdev-1.0.3/src/sample.c
--- lockdev-1.0.3/src/sample.c.gccwarn	2009-12-05 15:50:04.000000000 +0100
+++ lockdev-1.0.3/src/sample.c	2009-12-05 16:49:40.000000000 +0100
@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include "lockdev.h"
 
 void
@@ -14,7 +16,7 @@ int
 main (int   argc,
       char *argv[])
 {
-	int i, chld;
+	int i;
 	char *p = NULL, *dev = NULL, ch;
 
 	ch = '\0';

lockdev-1.0.3-man8.patch:
 Makefile |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE lockdev-1.0.3-man8.patch ---
diff -up lockdev-1.0.3/Makefile.man8 lockdev-1.0.3/Makefile
--- lockdev-1.0.3/Makefile.man8	2009-12-05 15:43:47.000000000 +0100
+++ lockdev-1.0.3/Makefile	2009-12-05 16:52:13.000000000 +0100
@@ -75,7 +75,9 @@ install_profile:	${static} ${shared}
 
 install_doc:	docs/lockdev.3
 	install -m755 -d	${mandir}/man3
+	install -m755 -d	${mandir}/man8
 	install -m644 docs/lockdev.3	${mandir}/man3
+	install -m644 docs/lockdev.8	${mandir}/man8
 
 install_run:	${shared}
 	install -m755 -d	${libdir}

lockdev-1.0.3-pidexists.patch:
 lockdev.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE lockdev-1.0.3-pidexists.patch ---
diff -up lockdev-1.0.3/src/lockdev.c.pidexists lockdev-1.0.3/src/lockdev.c
--- lockdev-1.0.3/src/lockdev.c.pidexists	2009-12-05 15:56:46.000000000 +0100
+++ lockdev-1.0.3/src/lockdev.c	2009-12-05 16:05:46.000000000 +0100
@@ -148,7 +148,7 @@ static inline	int	_dl_lock_semaphore	( v
 static inline	int	_dl_block_semaphore	( void);
 static		pid_t	_dl_check_lock	( const char * lockname);
 static		char *	_dl_check_devname	( const char * devname);
-
+static inline	int	_dl_pid_exists		( pid_t pid );
 
 #define	SEMAPHORE	"LOCKDEV"
 #define	close_n_return( v)	return( _dl_unlock_semaphore( v))
@@ -394,7 +394,7 @@ _dl_check_lock(const char *lockname)
 	/* checks content's format */
 	if ( j == 1 ) {
 		/* checks process existence */
-		if ( ( kill( pid_read, 0) == 0 ) || (errno == EPERM) ) {
+		if ( _dl_pid_exists( pid_read) || (errno == EPERM) ) {
 			_debug( 2, "_dl_check_lock() locked by %d\n", (int)pid_read);
 			return pid_read;
 		}
@@ -443,7 +443,7 @@ _dl_check_lock(const char *lockname)
 			return -1;
 		}
 		fscanf( fd, "%d", &pid2);
-		if ( pid2 && (pid2 != pid_read) && ( kill( pid2, 0) == 0 )) {
+		if ( pid2 && (pid2 != pid_read) && _dl_pid_exists(pid2) ) {
 			/* lock file was changed! let us quickly
 			 * put it back again
 			 */
@@ -502,6 +502,17 @@ _dl_check_devname (const char *devname)
 	return strcpy(m, p);
 }
 
+/* for internal use */
+/* correctly check if a process with a given pid exists */
+static inline int
+_dl_pid_exists(pid_t pid)
+{
+	if ( !kill( pid, 0))
+		return 1;
+	if ( errno == ESRCH)
+		return 0;
+	return 1;
+}
 
 /* exported by the interface file lockdev.h */
 /* ZERO means that the device wasn't locked, but could have been locked later */

lockdev-1.0.3-rh.patch:
 Makefile      |   19 ++++++--
 src/baudboy.h |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lockdev.c |   48 +++++++++++++++-----
 src/lockdev.h |    4 +
 src/sample.c  |   64 +++++++++++++++++----------
 5 files changed, 234 insertions(+), 38 deletions(-)

--- NEW FILE lockdev-1.0.3-rh.patch ---
diff -up lockdev-1.0.3/Makefile.redhat lockdev-1.0.3/Makefile
--- lockdev-1.0.3/Makefile.redhat	2005-10-03 20:51:53.000000000 +0200
+++ lockdev-1.0.3/Makefile	2009-12-05 17:42:41.000000000 +0100
@@ -6,6 +6,7 @@ pkgname = lockdev
 objs	= src/lockdev.o
 shobjs	= src/lockdev.z
 
+lockdev	= src/sample.c
 
 VER	= $(shell expr `pwd` : '.*-\([0-9.]*\)')
 MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
@@ -18,17 +19,18 @@ soname	= ${libname}.so.${MVER}
 basedir	= /usr/local
 srcdir=.
 
+sbindir	= ${basedir}/sbin
 libdir	= ${basedir}/lib
 incdir	= ${basedir}/include
 mandir	= ${basedir}/share/man
 
 CC	= gcc
-LCFLAGS	= -g -O2 -fPIC -Wall -pipe -D_REENTRANT 
-CFLAGS	= -g
+CFLAGS	= -g -O2 -Wall -pipe
+LCFLAGS	= ${CFLAGS} -fPIC -D_REENTRANT
 LDLIBS	= -llockdev
 
 .PHONY: shared static perl-lib
-ALL:	shared static perl-lib
+ALL:	shared static lockdev perl-lib
 
 static ${static}:       ${objs}
 	$(AR) $(ARFLAGS) ${static} $^
@@ -36,6 +38,12 @@ static ${static}:       ${objs}
 shared ${shared}:	${shobjs}
 	${CC} ${LCFLAGS} -shared -Wl,-soname,${soname} $^ -lc -o ${shared}
 
+lockdev.o: ${lockdev}
+	${CC} ${CFLAGS} -I./src -o $@ -c $^
+
+lockdev: lockdev.o ${static}
+	${CC} -o $@ $^
+
 src/lockdev.z: src/lockdev.c
 	${CC} ${CFLAGS} -c -fPIC -o $@ $?
 
@@ -54,6 +62,7 @@ install_dev:	${static} src/lockdev.h
 	install -m755 -d	${incdir}
 	install -m644 src/lockdev.h	${incdir}
 	install -m644 src/ttylock.h	${incdir}
+	install -m644 src/baudboy.h	${incdir}
 
 install_debug:	${static} ${shared}
 	install -m755 -d	${libdir}/debug
@@ -71,7 +80,9 @@ install_doc:	docs/lockdev.3
 
 install_run:	${shared}
 	install -m755 -d	${libdir}
-	install -m644 ${shared}	${libdir}
+	install -m755 ${shared}	${libdir}
+	install -m755 -d	${sbindir}
+	install -m755 lockdev	${sbindir}
 
 .PHONY: clean distclean perl-clean mostyclean 
 perl-clean:	clean
diff -up /dev/null lockdev-1.0.3/src/baudboy.h
--- /dev/null	2009-12-05 11:05:54.692858210 +0100
+++ lockdev-1.0.3/src/baudboy.h	2009-12-05 17:38:03.000000000 +0100
@@ -0,0 +1,137 @@
+/* Copyright (C) 2001 Red Hat, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   It 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 software; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+
+#ifndef _BAUDBOY_H_
+#define _BAUDBOY_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	LOCKDEV_PATH	"/usr/sbin/lockdev"
+
+static inline int _doit(const char * argv[])
+{
+    pid_t child;
+    int status;
+    void (*osig) (int) = signal(SIGCHLD, SIG_DFL);
+    int rc;
+
+    if (!(child = fork())) {
+	int fd;
+        /* these have to be open to something */
+	if ((fd = open("/dev/null", 2)) < 0)
+	    exit(-1);
+	dup2(fd, 0);
+	dup2(fd, 1);
+	dup2(fd, 2);
+	close(fd);
+	/* Swap egid and gid for lockdev's access(2) device check. */
+	setregid(getegid(), getgid());
+	execv(argv[0], (char *const *)argv);
+	exit(-1);
+    }
+
+    rc = (int) waitpid(child, &status, 0);
+    signal(SIGCHLD, osig);
+    if (rc == child && WIFEXITED(status)) {
+	/*
+	 * Exit		dev_lock	dev_unlock	dev_testlock
+	 *	  0	OK		OK		not locked
+	 *	  1	locked other	locked other	locked
+	 *	  2	EACCES
+	 *	  3	EROFS
+	 *	  4	EFAULT
+	 *	  5	EINVAL
+	 *	  6	ENAMETOOLONG
+	 *	  7	ENOENT
+	 *	  8	ENOTDIR
+	 *	  9	ENOMEM
+	 *	 10	ELOOP
+	 *	 11	EIO
+	 *	255	error		error		error
+	 */
+	rc = WEXITSTATUS(status);
+	switch(rc) {
+	case  0:	rc = 0;		break;
+	default:
+	case  1:	rc = -EPERM;	break;
+	case  2:	rc = -EACCES;	break;
+	case  3:	rc = -EROFS;	break;
+	case  4:	rc = -EFAULT;	break;
+	case  5:	rc = -EINVAL;	break;
+	case  6:	rc = -ENAMETOOLONG;	break;
+	case  7:	rc = -ENOENT;	break;
+	case  8:	rc = -ENOTDIR;	break;
+	case  9:	rc = -ENOMEM;	break;
+	case 10:	rc = -ELOOP;	break;
+	case 11:	rc = -EIO;	break;
+	}
+    } else if (rc == -1)
+	rc = -errno;
+    else
+	rc = -ECHILD;
+
+    return rc;
+
+}
+
+static inline int ttylock(const char * devname)
+{
+    const char * argv[] = { LOCKDEV_PATH, "-l", NULL, NULL};
+    argv[2] = devname;
+    return _doit(argv);
+}
+
+static inline int ttyunlock(const char * devname)
+{
+    const char * argv[] = { LOCKDEV_PATH, "-u", NULL, NULL};
+    argv[2] = devname;
+    return _doit(argv);
+}
+
+static inline int ttylocked(const char * devname)
+{
+    const char * argv[] = { LOCKDEV_PATH, NULL, NULL};
+    argv[1] = devname;
+    return _doit(argv);
+}
+
+static inline int ttywait(const char * devname)
+{
+    int rc;
+    while((rc = ttylocked(devname)) == 0)
+	sleep(1);
+    return rc;
+}
+
+#ifdef	__cplusplus
+};
+#endif
+
+#endif /* _BAUDBOY_H_ */
diff -up lockdev-1.0.3/src/lockdev.c.redhat lockdev-1.0.3/src/lockdev.c
--- lockdev-1.0.3/src/lockdev.c.redhat	2006-04-20 21:11:08.000000000 +0200
+++ lockdev-1.0.3/src/lockdev.c	2009-12-05 17:38:03.000000000 +0100
@@ -177,6 +177,19 @@ liblockdev_reset_debug (void)
 	liblockdev_debug = 0;
 }
 
+static pid_t dev_pid = 0;
+
+pid_t dev_getpid(void)
+{
+    return (dev_pid ? dev_pid : getpid());
+}
+
+pid_t dev_setpid(pid_t newpid)
+{
+    pid_t oldpid = dev_pid;
+    dev_pid = newpid;
+    return oldpid;
+}
 
 /*
  * for internal use *
@@ -423,7 +436,7 @@ _dl_check_lock(const char *lockname)
 		 * maybe also this sprintf should be added to the
 		 * conditional part, as the others
 		 */
-		sprintf( tpname, "%s/.%d", LOCK_PATH, (int)getpid());
+		sprintf( tpname, "%s/.%d", LOCK_PATH, (int)dev_getpid());
 		unlink( tpname);	/* in case there was */
 		rename( lockname, tpname);
 		if ( ! (fd=fopen( tpname, "r")) ) {
@@ -511,7 +524,7 @@ dev_testlock(const char *devname)
 #endif /* DEBUG */
 	_debug( 3, "dev_testlock(%s)\n", devname);
 	if ( ! (p=_dl_check_devname( devname)) )
-	 	close_n_return( -1);
+	 	close_n_return( -errno);
 	strcpy( device, DEV_PATH);
 	strcat( device, p);	/* now device has a copy of the pathname */
 	_debug( 2, "dev_testlock() device = %s\n", device);
@@ -585,7 +598,7 @@ dev_lock (const char *devname)
 #endif /* DEBUG */
 	_debug( 3, "dev_lock(%s)\n", devname);
 	if (oldmask == -1 )
-		oldmask = umask( 0);	/* give full permissions to files created */
+		oldmask = umask( 002);	/* apply o-w to files created */
 	if ( ! (p=_dl_check_devname( devname)) )
 	 	close_n_return( -1);
 	strcpy( device, DEV_PATH);
@@ -596,11 +609,14 @@ dev_lock (const char *devname)
 	 * and minor numbers
 	 */
 	if ( stat( device, &statbuf) == -1 ) {
-		close_n_return( -1);
+		close_n_return(-errno);
+	}
+	if ( access( device, W_OK ) == -1 ) {
+		close_n_return(-errno);
 	}
 
 	/* now get our own pid */
-	our_pid = getpid();
+	our_pid = dev_getpid();
 	_debug( 2, "dev_lock() our own pid = %d\n", (int)our_pid);
 
 	/* We will use this algorithm:
@@ -641,8 +657,9 @@ dev_lock (const char *devname)
 	_dl_filename_1( lock1, &statbuf);
 	while ( ! (pid=_dl_check_lock( lock1)) ) {
 		if (( link( lock0, lock1) == -1 ) && ( errno != EEXIST )) {
+			int rc = -errno;
 			unlink( lock0);
-			close_n_return( -1);
+			close_n_return(rc);
 		}
 	}
 	if ( pid != our_pid ) {
@@ -659,9 +676,10 @@ dev_lock (const char *devname)
 	/* lockfile of type /var/lock/LCK..ttyS2 */
 	while ( ! (pid=_dl_check_lock( lock2)) ) {
 		if (( link( lock0, lock2) == -1 ) && ( errno != EEXIST )) {
+			int rc = -errno;
 			unlink( lock0);
 			unlink( lock1);
-			close_n_return( -1);
+			close_n_return(rc);
 		}
 	}
 	if ( pid != our_pid ) {
@@ -740,7 +758,7 @@ dev_relock (const char  *devname,
 #endif /* DEBUG */
 	_debug( 3, "dev_relock(%s, %d)\n", devname, (int)old_pid);
 	if (oldmask == -1 )
-		oldmask = umask( 0);	/* give full permissions to files created */
+		oldmask = umask( 002);	/* apply o-w to files created */
 	if ( ! (p=_dl_check_devname( devname)) )
 	 	close_n_return( -1);
 	strcpy( device, DEV_PATH);
@@ -751,11 +769,14 @@ dev_relock (const char  *devname,
 	 * and minor numbers
 	 */
 	if ( stat( device, &statbuf) == -1 ) {
-		close_n_return( -1);
+		close_n_return(-errno);
+	}
+	if ( access( device, W_OK ) == -1 ) {
+		close_n_return(-errno);
 	}
 
 	/* now get our own pid */
-	our_pid = getpid();
+	our_pid = dev_getpid();
 	_debug( 2, "dev_relock() our own pid = %d\n", (int)our_pid);
 
 	/* first check for the FSSTND-1.2 lock, get the pid of the
@@ -825,7 +846,7 @@ dev_unlock (const char *devname,
 #endif /* DEBUG */
 	_debug( 3, "dev_unlock(%s, %d)\n", devname, (int)pid);
 	if (oldmask == -1 )
-		oldmask = umask( 0);	/* give full permissions to files created */
+		oldmask = umask( 002);	/* apply o-w to files created */
 	if ( ! (p=_dl_check_devname( devname)) )
 	 	close_n_return( -1);
 	strcpy( device, DEV_PATH);
@@ -836,7 +857,10 @@ dev_unlock (const char *devname,
 	 * and minor numbers
 	 */
 	if ( stat( device, &statbuf) == -1 ) {
-		close_n_return( -1);
+		close_n_return(-errno);
+	}
+	if ( access( device, W_OK ) == -1 ) {
+		close_n_return(-errno);
 	}
 
 	/* first remove the FSSTND-1.2 lock, get the pid of the
diff -up lockdev-1.0.3/src/lockdev.h.redhat lockdev-1.0.3/src/lockdev.h
--- lockdev-1.0.3/src/lockdev.h.redhat	2005-10-03 19:44:33.000000000 +0200
+++ lockdev-1.0.3/src/lockdev.h	2009-12-05 17:38:03.000000000 +0100
@@ -43,12 +43,16 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
+#include <errno.h>
 
 /* API of the library */
 
 void liblockdev_incr_debug (void);
 void liblockdev_reset_debug (void);
 
+pid_t dev_getpid (void);
+pid_t dev_setpid (pid_t pid);
+
 pid_t dev_testlock (const char *devname);
 
 pid_t dev_lock (const char *devname);
diff -up lockdev-1.0.3/src/sample.c.redhat lockdev-1.0.3/src/sample.c
--- lockdev-1.0.3/src/sample.c.redhat	2005-10-03 19:51:17.000000000 +0200
+++ lockdev-1.0.3/src/sample.c	2009-12-05 17:38:03.000000000 +0100
@@ -5,8 +5,8 @@
 void
 usage (void)
 {
-	fprintf( stderr, "Usage: sample [-lurd] <device>\n" );
-	exit( -1 );
+	fprintf(stderr, "Usage: %s [-lud] <device>\n", "lockdev");
+	exit(-1);
 }
 
 
@@ -15,7 +15,7 @@ main (int   argc,
       char *argv[])
 {
 	int i, chld;
-	char *p, *dev, ch;
+	char *p = NULL, *dev = NULL, ch;
 
 	ch = '\0';
 	for( i = argc - 1; i > 0; i-- ) {
@@ -23,8 +23,7 @@ main (int   argc,
 		if( *p == '-' ) {
 			switch( *++p ) {
 			case 'l': 
-			case 'u': 
-			case 'r': ch = *p; break;
+			case 'u': ch = *p; break;
 			case 'd':
 				liblockdev_incr_debug();
 				break;
@@ -33,31 +32,52 @@ main (int   argc,
 		}
 		else dev = p;
 	}
-	fprintf( stderr, "option %c, device %s\n", ch, dev );
 	i = 0;
+	(void) dev_setpid(getppid());
 	switch( ch ) {
 	case 'l':
 		i = dev_lock( dev);
 		break;
 	case 'u':
-		i = dev_unlock( dev, 0);
-		break;
-	case 'r':
-		dev_lock( dev);
-		if(( chld = fork()) == 0 ) {
-			sleep(5);
-		}
-		else {
-			sleep( 1);
-			if (( i = dev_relock( dev, chld)) < 0 ) {
-				fprintf( stderr, "Relock failed in parent.\n" );
-			}
-		}
+		i = dev_unlock(dev, 0);
 		break;
 	default:
-		i = dev_testlock( dev);
+		if (dev)
+			i = dev_testlock(dev);
 		break;
 	}
-	exit( i);
-}
 
+	/*
+	 * Exit		dev_lock	dev_unlock	dev_testlock
+	 *	  0	OK		OK		not locked
+	 *	  1	locked other	locked other	locked
+	 *	  2	EACCES
+	 *	  3	EROFS
+	 *	  4	EFAULT
+	 *	  5	EINVAL
+	 *	  6	ENAMETOOLONG
+	 *	  7	ENOENT
+	 *	  8	ENOTDIR
+	 *	  9	ENOMEM
+	 *	 10	ELOOP
+	 *	 11	EIO
+	 *	255	error		error		error
+	 */
+	switch (i) {
+	case -EACCES:	i = 2;	break;
+	case -EROFS:	i = 3;	break;
+	case -EFAULT:	i = 4;	break;
+	case -EINVAL:	i = 5;	break;
+	case -ENAMETOOLONG:	i = 6;	break;
+	case -ENOENT:	i = 7;	break;
+	case -ENOTDIR:	i = 8;	break;
+	case -ENOMEM:	i = 9;	break;
+	case -ELOOP:	i = 10;	break;
+	case -EIO:	i = 11;	break;
+	default:
+	    if (i < 0) i = 255;
+	    else if (i > 0) 	i = 1;
+	    break;
+	}
+	exit(i);
+}

lockdev-1.0.3-shared.patch:
 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE lockdev-1.0.3-shared.patch ---
diff -up lockdev-1.0.3/Makefile.shared lockdev-1.0.3/Makefile
--- lockdev-1.0.3/Makefile.shared	2009-12-05 15:40:16.000000000 +0100
+++ lockdev-1.0.3/Makefile	2009-12-05 15:41:58.000000000 +0100
@@ -12,7 +12,7 @@ VER	= $(shell expr `pwd` : '.*-\([0-9.]*
 MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
 
 static	= ${libname}.a
-shared	= ${libname}.${VER}.so
+shared	= ${libname}.so.${VER}
 soname	= ${libname}.so.${MVER}
 
 # overwritten by caller (e.g.: debian/rules)
@@ -80,6 +80,7 @@ install_doc:	docs/lockdev.3
 install_run:	${shared}
 	install -m755 -d	${libdir}
 	install -m755 ${shared}	${libdir}
+	ln -s ${shared}		${libdir}/liblockdev.so
 	install -m755 -d	${sbindir}
 	install -m755 lockdev	${sbindir}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 08:00:28 -0000	1.3
+++ .cvsignore	7 Dec 2009 09:28:58 -0000	1.4
@@ -1 +1 @@
-lockdev_1.0.1.orig.tar.gz
+lockdev_1.0.3.orig.tar.gz


Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- lockdev.spec	3 Dec 2009 07:44:55 -0000	1.36
+++ lockdev.spec	7 Dec 2009 09:28:58 -0000	1.37
@@ -1,24 +1,20 @@
 Summary: A library for locking devices
 Name: lockdev
-Version: 1.0.1
-Release: 20%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
 Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
 Source1: lockdev.8
 
-Patch0: lockdev-1.0.0-rh.patch
-Patch1: lockdev-1.0.0-shared.patch
-Patch2: lockdev-1.0.0-signal.patch
-Patch3: lockdev-1.0.0-cli.patch
-Patch4: lockdev-1.0.1-checkname.patch
-Patch5: lockdev-1.0.1-pidexists.patch
-Patch6: lockdev-1.0.1-subdir.patch
-Patch7: lockdev-1.0.1-fcntl.patch
-Patch8: lockdev-1.0.1-32bit.patch
-Patch9: lockdev-1.0.1-gccwarn.patch
-Patch10: lockdev-1.0.1-man8.patch
+Patch0: lockdev-1.0.3-rh.patch
+Patch1: lockdev-1.0.3-shared.patch
+Patch2: lockdev-1.0.3-cli.patch
+Patch3: lockdev-1.0.3-checkname.patch
+Patch4: lockdev-1.0.3-pidexists.patch
+Patch5: lockdev-1.0.3-gccwarn.patch
+Patch6: lockdev-1.0.3-man8.patch
 
 Requires(pre): shadow-utils
 Requires(post): glibc
@@ -46,15 +42,11 @@ package contains the development headers
 %setup -q
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .shared
-%patch2 -p1 -b .signal
-%patch3 -p1 -b .jbj
-%patch4 -p1 -b .checkname
-%patch5 -p1 -b .pidexists
-%patch6 -p1 -b .subdir
-%patch7 -p1 -b .fcntl
-%patch8 -p1 -b .32bit
-%patch9 -p1 -b .warn
-%patch10 -p1 -b .man8
+%patch2 -p1 -b .cli
+%patch3 -p1 -b .checkname
+%patch4 -p1 -b .pidexists
+%patch5 -p1 -b .warn
+%patch6 -p1 -b .man8
 
 cp %SOURCE1 ./docs
 
@@ -98,6 +90,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-1
+- 1.0.3.  No longer need 1.0.0-signal, 1.0.1-subdir, 1.0.1-fcntl, 1.0.1-32bit patches.
+- Renumbered patches and sources.
+
 * Thu Dec 03 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-20
 - Fixed pre section (http://fedoraproject.org/wiki/Packaging/UsersAndGroups)
 - Added back Buildroot to silence rpmlint's false positive


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Sep 2004 08:00:28 -0000	1.3
+++ sources	7 Dec 2009 09:28:58 -0000	1.4
@@ -1 +1 @@
-3deda988583172b673f984b0d1cdeb0d  lockdev_1.0.1.orig.tar.gz
+64b9c1b87b125fc348e892e24625524a  lockdev_1.0.3.orig.tar.gz


--- lockdev-1.0.0-cli.patch DELETED ---


--- lockdev-1.0.0-rh.patch DELETED ---


--- lockdev-1.0.0-shared.patch DELETED ---


--- lockdev-1.0.0-signal.patch DELETED ---


--- lockdev-1.0.1-32bit.patch DELETED ---


--- lockdev-1.0.1-checkname.patch DELETED ---


--- lockdev-1.0.1-fcntl.patch DELETED ---


--- lockdev-1.0.1-gccwarn.patch DELETED ---


--- lockdev-1.0.1-man8.patch DELETED ---


--- lockdev-1.0.1-pidexists.patch DELETED ---


--- lockdev-1.0.1-subdir.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 09:30:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:30:29 +0000 (UTC)
Subject: rpms/perl-POE-Component-Child/devel perl-POE-Component-Child.spec,
	1.7, 1.8
Message-ID: <20091207093029.B29A011C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-Component-Child/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19964

Modified Files:
	perl-POE-Component-Child.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-Component-Child.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Child/devel/perl-POE-Component-Child.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-POE-Component-Child.spec	26 Jul 2009 13:56:05 -0000	1.7
+++ perl-POE-Component-Child.spec	7 Dec 2009 09:30:29 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Child
 Version:        1.39        
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Child management component for POE 
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.39-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.39-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:31:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:31:37 +0000 (UTC)
Subject: rpms/perl-Cache-FastMmap/devel perl-Cache-FastMmap.spec,1.5,1.6
Message-ID: <20091207093137.5DF3711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Cache-FastMmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20467

Modified Files:
	perl-Cache-FastMmap.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Cache-FastMmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-FastMmap/devel/perl-Cache-FastMmap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Cache-FastMmap.spec	26 Jul 2009 04:04:37 -0000	1.5
+++ perl-Cache-FastMmap.spec	7 Dec 2009 09:31:37 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Cache-FastMmap
 Version:        1.34
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Uses an mmap'ed file to act as a shared memory interprocess cache
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.34-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:32:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:32:58 +0000 (UTC)
Subject: rpms/perl-Jemplate/devel perl-Jemplate.spec,1.2,1.3
Message-ID: <20091207093258.21F8711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Jemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21037

Modified Files:
	perl-Jemplate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Jemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Jemplate/devel/perl-Jemplate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Jemplate.spec	26 Jul 2009 08:52:06 -0000	1.2
+++ perl-Jemplate.spec	7 Dec 2009 09:32:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Jemplate 
 Version:    0.23 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/Jemplate.pm -> GPL+ or Artistic
 # lib/Jemplate/Directive.pm -> GPL+ or Artistic
 # lib/Jemplate/Parser.pm -> GPL+ or Artistic
@@ -78,6 +78,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man1/jemplate.1.gz
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.23-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:34:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:34:09 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-Schema-Loader/devel
	perl-DBIx-Class-Schema-Loader.spec, 1.8, 1.9
Message-ID: <20091207093409.BEC0E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-Class-Schema-Loader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21498

Modified Files:
	perl-DBIx-Class-Schema-Loader.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-Class-Schema-Loader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-Schema-Loader/devel/perl-DBIx-Class-Schema-Loader.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-DBIx-Class-Schema-Loader.spec	5 Aug 2009 12:06:08 -0000	1.8
+++ perl-DBIx-Class-Schema-Loader.spec	7 Dec 2009 09:34:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-Class-Schema-Loader
 Version:        0.04006
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Dynamic definition of a DBIx::Class::Schema
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04006-6
+- rebuild against perl 5.10.1
+
 * Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.04006-5
 - Remove R: DBIX::Class.
 



From kasal at fedoraproject.org  Mon Dec  7 09:35:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:35:28 +0000 (UTC)
Subject: rpms/perl-Cache-Cache/devel perl-Cache-Cache.spec,1.15,1.16
Message-ID: <20091207093528.DF6AC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Cache-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22005

Modified Files:
	perl-Cache-Cache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Cache-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Cache/devel/perl-Cache-Cache.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Cache-Cache.spec	26 Jul 2009 04:04:22 -0000	1.15
+++ perl-Cache-Cache.spec	7 Dec 2009 09:35:28 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Cache-Cache
 Version:        1.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generic cache interface and implementations
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.06-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:37:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:37:11 +0000 (UTC)
Subject: rpms/perl-Jcode/devel perl-Jcode.spec,1.20,1.21
Message-ID: <20091207093711.CEEA011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Jcode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22579

Modified Files:
	perl-Jcode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Jcode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Jcode/devel/perl-Jcode.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Jcode.spec	24 Aug 2009 20:49:02 -0000	1.20
+++ perl-Jcode.spec	7 Dec 2009 09:37:11 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		perl-Jcode
 Version:	2.07
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Perl extension interface for converting Japanese text
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -51,6 +51,9 @@ LC_ALL=C %{__make} test
 %{_mandir}/man3/Jcode::Nihongo.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.07-2
+- rebuild against perl 5.10.1
+
 * Mon Aug 24 2009 Paul Howarth <paul at city-fan.org> - 2.07-1
 - Update to 2.07 (fix mime_encode, CPAN RT#29049)
 - Run test suite in "C" locale to support build on old distributions



From dsd at fedoraproject.org  Mon Dec  7 09:39:57 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon,  7 Dec 2009 09:39:57 +0000 (UTC)
Subject: rpms/dracut-modules-olpc/devel .cvsignore, 1.7,
	1.8 dracut-modules-olpc.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20091207093957.9DB4611C00EE@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/dracut-modules-olpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23398

Modified Files:
	.cvsignore dracut-modules-olpc.spec sources 
Log Message:
v0.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Nov 2009 16:16:08 -0000	1.7
+++ .cvsignore	7 Dec 2009 09:39:57 -0000	1.8
@@ -1 +1 @@
-dracut-modules-olpc-0.3.0.tar.bz2
+dracut-modules-olpc-0.3.1.tar.bz2


Index: dracut-modules-olpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/devel/dracut-modules-olpc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dracut-modules-olpc.spec	24 Nov 2009 16:16:09 -0000	1.9
+++ dracut-modules-olpc.spec	7 Dec 2009 09:39:57 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		dracut-modules-olpc
-Version:	0.3.0
+Version:	0.3.1
 Release:	1%{?dist}
 Summary:	OLPC modules for dracut initramfs
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 7 2009 Daniel Drake <dsd at laptop.org> - 0.3.1-1
+- New version to fix booting alternate image
+
 * Tue Nov 24 2009 Daniel Drake <dsd at laptop.org> - 0.3.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Nov 2009 16:16:09 -0000	1.9
+++ sources	7 Dec 2009 09:39:57 -0000	1.10
@@ -1 +1 @@
-5da23709b1d5a0aace6eff0a28929b70  dracut-modules-olpc-0.3.0.tar.bz2
+e818ad8a497e05821fe489b2e41e441a  dracut-modules-olpc-0.3.1.tar.bz2



From dsd at fedoraproject.org  Mon Dec  7 09:40:24 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon,  7 Dec 2009 09:40:24 +0000 (UTC)
Subject: rpms/dracut-modules-olpc/F-11 .cvsignore, 1.8,
	1.9 dracut-modules-olpc.spec, 1.9, 1.10 sources, 1.10, 1.11
Message-ID: <20091207094024.9C7B311C03FC@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/dracut-modules-olpc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23604

Modified Files:
	.cvsignore dracut-modules-olpc.spec sources 
Log Message:
v0.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Nov 2009 16:23:17 -0000	1.8
+++ .cvsignore	7 Dec 2009 09:40:24 -0000	1.9
@@ -1 +1 @@
-dracut-modules-olpc-0.3.0.tar.bz2
+dracut-modules-olpc-0.3.1.tar.bz2


Index: dracut-modules-olpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-11/dracut-modules-olpc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dracut-modules-olpc.spec	24 Nov 2009 16:23:17 -0000	1.9
+++ dracut-modules-olpc.spec	7 Dec 2009 09:40:24 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		dracut-modules-olpc
-Version:	0.3.0
+Version:	0.3.1
 Release:	1%{?dist}
 Summary:	OLPC modules for dracut initramfs
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 7 2009 Daniel Drake <dsd at laptop.org> - 0.3.1-1
+- New version to fix booting alternate image
+
 * Tue Nov 24 2009 Daniel Drake <dsd at laptop.org> - 0.3.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Nov 2009 16:23:17 -0000	1.10
+++ sources	7 Dec 2009 09:40:24 -0000	1.11
@@ -1 +1 @@
-5da23709b1d5a0aace6eff0a28929b70  dracut-modules-olpc-0.3.0.tar.bz2
+e818ad8a497e05821fe489b2e41e441a  dracut-modules-olpc-0.3.1.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 09:40:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:40:52 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-EncodedColumn/devel
	perl-DBIx-Class-EncodedColumn.spec, 1.6, 1.7
Message-ID: <20091207094052.8436711C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23825

Modified Files:
	perl-DBIx-Class-EncodedColumn.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-Class-EncodedColumn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/perl-DBIx-Class-EncodedColumn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-DBIx-Class-EncodedColumn.spec	18 Oct 2009 08:48:48 -0000	1.6
+++ perl-DBIx-Class-EncodedColumn.spec	7 Dec 2009 09:40:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-Class-EncodedColumn
 Version:        0.00005
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Automatically encode columns
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.00005-2
+- rebuild against perl 5.10.1
+
 * Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.00005-1
 - update to latest upstream
 



From kasal at fedoraproject.org  Mon Dec  7 09:40:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:40:52 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.243,1.244
Message-ID: <20091207094052.EEF7211C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23807

Modified Files:
	perl.spec 
Log Message:
- do not pack Bzip2 modules (#544582)
- hack: cheat about Compress::Raw::Zlib version (#544582)


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- perl.spec	4 Dec 2009 00:10:52 -0000	1.243
+++ perl.spec	7 Dec 2009 09:40:52 -0000	1.244
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        102%{?dist}
+Release:        103%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -135,8 +135,9 @@ Patch118:	perl-update-autodie.patch
 Patch119:	perl-update-FileSpec.patch
 %define			    File_Spec_version 3.30
 # FIXME should be 2.023, to preserve upgrade path
+# -- for now, we just cheat with the version number
 Patch120:	perl-update-Compress-Raw-Zlib.patch
-%define			    Compress_Raw_Zlib_version 2.020
+%define			    Compress_Raw_Zlib_version 2.023
 # could be 1.22
 Patch121:	perl-update-Scalar-List-Utils.patch
 %define			    Scalar_List_Utils 1.21
@@ -1171,6 +1172,9 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE
 ln -s ../../../CORE/libperl.so $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE/libperl.so
 
+# for now, remove Bzip2:
+find $RPM_BUILD_ROOT -name 'B*zip2*'|grep -E '/B(un)?zip2(\.pm)?$'| xargs rm -r
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1789,6 +1793,10 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-103
+- do not pack Bzip2 modules (#544582)
+- hack: cheat about Compress::Raw::Zlib version (#544582)
+
 * Thu Dec  3 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-102
 - switch off check for ppc64 and s390x
 - remove the hack for "make test," it is no longer needed



From kasal at fedoraproject.org  Mon Dec  7 09:42:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:42:17 +0000 (UTC)
Subject: rpms/perl-Cache/devel perl-Cache.spec,1.8,1.9
Message-ID: <20091207094217.B441611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24457

Modified Files:
	perl-Cache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache/devel/perl-Cache.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Cache.spec	26 Jul 2009 04:04:07 -0000	1.8
+++ perl-Cache.spec	7 Dec 2009 09:42:17 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Cache
 Version:        2.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Cache interface
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.04-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:42:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:42:31 +0000 (UTC)
Subject: rpms/perl-JavaScript-Minifier-XS/devel
	perl-JavaScript-Minifier-XS.spec, 1.3, 1.4
Message-ID: <20091207094231.37FFB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-JavaScript-Minifier-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24658

Modified Files:
	perl-JavaScript-Minifier-XS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-JavaScript-Minifier-XS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JavaScript-Minifier-XS/devel/perl-JavaScript-Minifier-XS.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-JavaScript-Minifier-XS.spec	27 Sep 2009 07:39:58 -0000	1.3
+++ perl-JavaScript-Minifier-XS.spec	7 Dec 2009 09:42:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-JavaScript-Minifier-XS
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        XS based JavaScript minifier
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
 - update filtering
 - auto-update to 0.06 (by cpan-spec-update 0.01)



From mlichvar at fedoraproject.org  Mon Dec  7 09:43:13 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon,  7 Dec 2009 09:43:13 +0000 (UTC)
Subject: File slang-2.2.2.tar.bz2 uploaded to lookaside cache by mlichvar
Message-ID: <20091207094313.9897310F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for slang:

974437602a781cfe92ab61433dd16d03  slang-2.2.2.tar.bz2



From kzak at fedoraproject.org  Mon Dec  7 09:43:23 2009
From: kzak at fedoraproject.org (kzak)
Date: Mon,  7 Dec 2009 09:43:23 +0000 (UTC)
Subject: rpms/util-linux-ng/F-12 util-linux-ng-2.16-blkid-ntfs.path, NONE,
	1.1 util-linux-ng.spec, 1.64, 1.65
Message-ID: <20091207094323.BE72D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25046

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-blkid-ntfs.path 
Log Message:
* Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-2
- fix #536797 - ntfs volume labels are not correct in hal



--- NEW FILE util-linux-ng-2.16-blkid-ntfs.path ---

  Backport from upstream to Fedora-12, original patch:

  commit 832b3f2eb6a6c5f2e7d8db422767404320e45ced
  Author: Karel Zak <kzak at redhat.com>
  Date:   Fri Nov 13 00:10:48 2009 +0100

    libblkid: fix NTFS non-ASCII labels

    Addresses-Red-Hat-Bug: #536797
    Signed-off-by: Karel Zak <kzak at redhat.com>



diff -up util-linux-ng-2.16.2/shlibs/blkid/src/probers/ntfs.c.kzak util-linux-ng-2.16.2/shlibs/blkid/src/probers/ntfs.c
--- util-linux-ng-2.16.2/shlibs/blkid/src/probers/ntfs.c.kzak	2009-11-30 12:43:13.000000000 +0100
+++ util-linux-ng-2.16.2/shlibs/blkid/src/probers/ntfs.c	2009-12-07 10:34:10.000000000 +0100
@@ -65,10 +65,9 @@ static int probe_ntfs(blkid_probe pr, co
 	struct ntfs_super_block *ns;
 	struct master_file_table_record *mft;
 	struct file_attribute *attr;
-	unsigned char	label_str[129], *cp;
 	int		bytes_per_sector, sectors_per_cluster;
 	int		mft_record_size, attr_off, attr_len;
-	unsigned int	i, attr_type, val_len;
+	unsigned int	attr_type, val_len;
 	int		val_off;
 	uint64_t		nr_clusters;
 	blkid_loff_t off;
@@ -128,7 +127,6 @@ static int probe_ntfs(blkid_probe pr, co
 	mft = (struct master_file_table_record *) buf_mft;
 
 	attr_off = le16_to_cpu(mft->attrs_offset);
-	label_str[0] = 0;
 
 	while (1) {
 		attr = (struct file_attribute *) (buf_mft + attr_off);
@@ -147,16 +145,8 @@ static int probe_ntfs(blkid_probe pr, co
 			break;
 
 		if (attr_type == MFT_RECORD_ATTR_VOLUME_NAME) {
-			if (val_len > sizeof(label_str))
-				val_len = sizeof(label_str)-1;
-
-			for (i=0, cp=label_str; i < val_len; i+=2,cp++) {
-				val = ((uint8_t *) attr) + val_off + i;
-				*cp = val[0];
-				if (val[1])
-					*cp = '?';
-			}
-			*cp = 0;
+			val = ((uint8_t *) attr) + val_off;
+			blkid_probe_set_utf8label(pr, val, val_len, BLKID_ENC_UTF16LE);
 		}
 	}
 
@@ -164,8 +154,6 @@ static int probe_ntfs(blkid_probe pr, co
 			(unsigned char *) &ns->volume_serial,
 			sizeof(ns->volume_serial),
 			"%016" PRIX64, le64_to_cpu(ns->volume_serial));
-	if (label_str[0])
-		blkid_probe_set_label(pr, label_str, strlen((char *)label_str));
 	return 0;
 }
 


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- util-linux-ng.spec	7 Dec 2009 08:58:40 -0000	1.64
+++ util-linux-ng.spec	7 Dec 2009 09:43:23 -0000	1.65
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -107,6 +107,8 @@ Patch8: util-linux-ng-2.15-ipcs-32bit.pa
 ### Upstream patches
 # 531992 -  not prompted for passphrase
 Patch9: util-linux-ng-2.16-blkid-crypto.path
+# 536797 -  ntfs volume labels are not correct in hal
+Patch10: util-linux-ng-2.16-blkid-ntfs.path
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -202,6 +204,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 unset LINGUAS || :
@@ -712,6 +715,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-2
+- fix #536797 - ntfs volume labels are not correct in hal
+
 * Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-1
 - upgrade to 2.16.2 (removes 7 patches)
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.2-ReleaseNotes



From mlichvar at fedoraproject.org  Mon Dec  7 09:44:43 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon,  7 Dec 2009 09:44:43 +0000 (UTC)
Subject: rpms/slang/devel slang-2.2.2-makefile.patch, NONE, 1.1 .cvsignore, 
	1.16, 1.17 slang.spec, 1.57, 1.58 sources, 1.16,
	1.17 slang-2.1.4-makefile.patch, 1.1, NONE
Message-ID: <20091207094443.0A35911C00EE@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25538

Modified Files:
	.cvsignore slang.spec sources 
Added Files:
	slang-2.2.2-makefile.patch 
Removed Files:
	slang-2.1.4-makefile.patch 
Log Message:
- update to 2.2.2


slang-2.2.2-makefile.patch:
 autoconf/Makefile.in |    3 +--
 modules/Makefile.in  |    4 ++--
 slsh/Makefile.in     |    2 +-
 src/Makefile.in      |   22 ++++++++++++++--------
 4 files changed, 18 insertions(+), 13 deletions(-)

--- NEW FILE slang-2.2.2-makefile.patch ---
diff -up slang-2.2.2/autoconf/Makefile.in.makefile slang-2.2.2/autoconf/Makefile.in
--- slang-2.2.2/autoconf/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/autoconf/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -47,8 +47,7 @@ help:
 	@echo "make check : Build the library and run the regression tests"
 static: makefiles
 	cd src; $(MAKE) static
-	cd slsh; $(MAKE) all
-elf: makefiles
+elf: makefiles static
 	cd src; $(MAKE) elf
 	cd slsh; $(MAKE) all
 	cd modules; $(MAKE) all
diff -up slang-2.2.2/modules/Makefile.in.makefile slang-2.2.2/modules/Makefile.in
--- slang-2.2.2/modules/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/modules/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -59,7 +59,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
@@ -73,7 +73,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) @M_LIB@
 #LIBS = $(RPATH) $(DL_LIB) @M_LIB@
diff -up slang-2.2.2/slsh/Makefile.in.makefile slang-2.2.2/slsh/Makefile.in
--- slang-2.2.2/slsh/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/slsh/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -15,7 +15,7 @@ SLANG_SRCINC	= -I at SRCDIR@
 SLANG_SRCLIB	= -L at ELFDIR@
 #---------------------------------------------------------------------------
 OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
-RPATH		= @RPATH@
+RPATH		=
 #----------------------------------------------------------------------------
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
diff -up slang-2.2.2/src/Makefile.in.makefile slang-2.2.2/src/Makefile.in
--- slang-2.2.2/src/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/src/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -139,17 +139,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 \
@@ -160,10 +164,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)
 
@@ -194,9 +200,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.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Sep 2009 12:07:57 -0000	1.16
+++ .cvsignore	7 Dec 2009 09:44:42 -0000	1.17
@@ -1 +1 @@
-slang-2.2.1.tar.bz2
+slang-2.2.2.tar.bz2


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- slang.spec	7 Sep 2009 12:07:57 -0000	1.57
+++ slang.spec	7 Dec 2009 09:44:42 -0000	1.58
@@ -1,12 +1,12 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
-Version: 2.2.1
+Version: 2.2.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v2.2/%{name}-%{version}.tar.bz2
 # fix file permissions, library symlink, parallel build, remove RPATH
-Patch1: slang-2.1.4-makefile.patch
+Patch1: slang-2.2.2-makefile.patch
 # don't use internal glibc symbol
 Patch2: slang-nointerlibc2.patch
 URL: http://www.jedsoft.org/slang/
@@ -114,6 +114,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libslang*.a
 
 %changelog
+* Mon Dec 07 2009 Miroslav Lichvar <mlichvar at redhat.com> - 2.2.2-1
+- update to 2.2.2
+
 * Mon Sep 07 2009 Miroslav Lichvar <mlichvar at redhat.com> - 2.2.1-1
 - update to 2.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Sep 2009 12:07:57 -0000	1.16
+++ sources	7 Dec 2009 09:44:42 -0000	1.17
@@ -1 +1 @@
-51b7e9c29c6812f304531713e2ebf969  slang-2.2.1.tar.bz2
+974437602a781cfe92ab61433dd16d03  slang-2.2.2.tar.bz2


--- slang-2.1.4-makefile.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 09:46:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:46:37 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DynamicDefault/devel
	perl-DBIx-Class-DynamicDefault.spec, 1.3, 1.4
Message-ID: <20091207094637.E9C4211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-Class-DynamicDefault/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26269

Modified Files:
	perl-DBIx-Class-DynamicDefault.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-Class-DynamicDefault.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-DynamicDefault/devel/perl-DBIx-Class-DynamicDefault.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-DBIx-Class-DynamicDefault.spec	26 Jul 2009 05:23:32 -0000	1.3
+++ perl-DBIx-Class-DynamicDefault.spec	7 Dec 2009 09:46:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-DBIx-Class-DynamicDefault 
 Version:    0.03 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/DBIx/Class/DynamicDefault.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -52,6 +52,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dsd at fedoraproject.org  Mon Dec  7 09:46:44 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon,  7 Dec 2009 09:46:44 +0000 (UTC)
Subject: rpms/dracut-modules-olpc/F-12 .cvsignore, 1.3,
	1.4 dracut-modules-olpc.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091207094644.3CC5311C00EE@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/dracut-modules-olpc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26348

Modified Files:
	.cvsignore dracut-modules-olpc.spec sources 
Log Message:
v0.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Nov 2009 07:52:32 -0000	1.3
+++ .cvsignore	7 Dec 2009 09:46:44 -0000	1.4
@@ -1 +1 @@
-dracut-modules-olpc-0.2.3.tar.bz2
+dracut-modules-olpc-0.3.1.tar.bz2


Index: dracut-modules-olpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-12/dracut-modules-olpc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dracut-modules-olpc.spec	9 Nov 2009 07:52:32 -0000	1.3
+++ dracut-modules-olpc.spec	7 Dec 2009 09:46:44 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		dracut-modules-olpc
-Version:	0.2.3
+Version:	0.3.1
 Release:	1%{?dist}
 Summary:	OLPC modules for dracut initramfs
 
@@ -38,11 +38,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README COPYING
-%{_datadir}/dracut/modules.d/30olpc-boot
+%{_datadir}/dracut/modules.d/*
 %{_libdir}/dracut-modules-olpc
 
 
 %changelog
+* Mon Dec 7 2009 Daniel Drake <dsd at laptop.org> - 0.3.1-1
+- New version to fix booting alternate image
+
 * Mon Nov  9 2009 Daniel Drake <dsd at laptop.org> - 0.2.3-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Nov 2009 07:52:32 -0000	1.3
+++ sources	7 Dec 2009 09:46:44 -0000	1.4
@@ -1 +1 @@
-cb9cb0824e7ec7291441545f7371d123  dracut-modules-olpc-0.2.3.tar.bz2
+e818ad8a497e05821fe489b2e41e441a  dracut-modules-olpc-0.3.1.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 09:47:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:47:13 +0000 (UTC)
Subject: rpms/perl-BZ-Client/devel perl-BZ-Client.spec,1.1,1.2
Message-ID: <20091207094713.9B1E411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-BZ-Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26676

Modified Files:
	perl-BZ-Client.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-BZ-Client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BZ-Client/devel/perl-BZ-Client.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-BZ-Client.spec	26 Aug 2009 22:50:59 -0000	1.1
+++ perl-BZ-Client.spec	7 Dec 2009 09:47:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-BZ-Client
 Version:        1.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A client for the Bugzilla web services API
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,5 +47,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.02-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 09:47:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:47:47 +0000 (UTC)
Subject: rpms/perl-JavaScript-Minifier/devel perl-JavaScript-Minifier.spec,
	1.2, 1.3
Message-ID: <20091207094747.5991511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-JavaScript-Minifier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26920

Modified Files:
	perl-JavaScript-Minifier.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-JavaScript-Minifier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JavaScript-Minifier/devel/perl-JavaScript-Minifier.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-JavaScript-Minifier.spec	26 Jul 2009 08:51:27 -0000	1.2
+++ perl-JavaScript-Minifier.spec	7 Dec 2009 09:47:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-JavaScript-Minifier
 Version:        1.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for minifying JavaScript code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dodji at fedoraproject.org  Mon Dec  7 09:48:22 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  7 Dec 2009 09:48:22 +0000 (UTC)
Subject: File nemiver-0.7.3.tar.bz2 uploaded to lookaside cache by dodji
Message-ID: <20091207094822.EBE7F10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nemiver:

7159d64bd78dc55aad892077fb75dfec  nemiver-0.7.3.tar.bz2



From dodji at fedoraproject.org  Mon Dec  7 09:49:13 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  7 Dec 2009 09:49:13 +0000 (UTC)
Subject: rpms/nemiver/devel .cvsignore, 1.20, 1.21 nemiver.spec, 1.31,
	1.32 sources, 1.20, 1.21
Message-ID: <20091207094913.6A1EA11C00EE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27442

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
* Sun Dec 06 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
- Update to new upstream release (0.7.3)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	12 Sep 2009 20:33:19 -0000	1.20
+++ .cvsignore	7 Dec 2009 09:49:13 -0000	1.21
@@ -2,3 +2,4 @@ nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
 nemiver-0.7.1.tar.bz2
 nemiver-0.7.2.tar.bz2
+nemiver-0.7.3.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- nemiver.spec	12 Sep 2009 20:28:21 -0000	1.31
+++ nemiver.spec	7 Dec 2009 09:49:13 -0000	1.32
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.2
+Version:	0.7.3
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -143,6 +143,9 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Sun Dec 06 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
+- Update to new upstream release (0.7.3)
+
 * Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
 - Update to new upstream release (0.7.2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	12 Sep 2009 20:33:20 -0000	1.20
+++ sources	7 Dec 2009 09:49:13 -0000	1.21
@@ -2,3 +2,4 @@ eeb0f56cf70d26746f79486bd5437ac7  nemive
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
 9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2
 a80f3d47b4ebf7fafa0225185112f377  nemiver-0.7.2.tar.bz2
+7159d64bd78dc55aad892077fb75dfec  nemiver-0.7.3.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 09:51:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:51:40 +0000 (UTC)
Subject: rpms/perl-B-Utils/devel perl-B-Utils.spec,1.5,1.6
Message-ID: <20091207095140.D22B811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-B-Utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28435

Modified Files:
	perl-B-Utils.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-B-Utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-B-Utils/devel/perl-B-Utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-B-Utils.spec	2 Sep 2009 03:59:08 -0000	1.5
+++ perl-B-Utils.spec	7 Dec 2009 09:51:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-B-Utils
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Helper functions for op tree manipulation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-2
+- rebuild against perl 5.10.1
+
 * Wed Sep 02 2009 Iain Arnell <iarnell at gmail.com> 0.08-1
 - update to latest upstream
 - use perl_default_filter 



From kasal at fedoraproject.org  Mon Dec  7 09:52:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:52:09 +0000 (UTC)
Subject: rpms/perl-JavaScript-Beautifier/devel
	perl-JavaScript-Beautifier.spec, 1.3, 1.4
Message-ID: <20091207095209.7258411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28708

Modified Files:
	perl-JavaScript-Beautifier.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-JavaScript-Beautifier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel/perl-JavaScript-Beautifier.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-JavaScript-Beautifier.spec	11 Aug 2009 11:39:08 -0000	1.3
+++ perl-JavaScript-Beautifier.spec	7 Dec 2009 09:52:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-JavaScript-Beautifier
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Beautify Javascript (beautifier for javascript)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.13-1
 - fix source url, update
 



From kasal at fedoraproject.org  Mon Dec  7 09:52:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:52:17 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch/devel
	perl-DBIx-Class-DateTime-Epoch.spec, 1.5, 1.6
Message-ID: <20091207095217.37D4E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBIx-Class-DateTime-Epoch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28801

Modified Files:
	perl-DBIx-Class-DateTime-Epoch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBIx-Class-DateTime-Epoch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-DateTime-Epoch/devel/perl-DBIx-Class-DateTime-Epoch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-DBIx-Class-DateTime-Epoch.spec	8 Aug 2009 19:11:04 -0000	1.5
+++ perl-DBIx-Class-DateTime-Epoch.spec	7 Dec 2009 09:52:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-DBIx-Class-DateTime-Epoch
 Version:    0.05
-Release:    4%{?dist}
+Release:    5%{?dist}
 # lib/DBIx/Class/DateTime/Epoch.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-4
 - adjust file ownership
 



From rhughes at fedoraproject.org  Mon Dec  7 09:53:04 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 09:53:04 +0000 (UTC)
Subject: File DeviceKit-power-013.tar.gz uploaded to lookaside cache by
	rhughes
Message-ID: <20091207095304.6B4A510F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for DeviceKit-power:

4fd56be8344556f55f86d476adbc9ab5  DeviceKit-power-013.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 09:55:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:55:47 +0000 (UTC)
Subject: rpms/perl-Business-ISBN-Data/devel perl-Business-ISBN-Data.spec, 1.7,
	1.8
Message-ID: <20091207095547.6032711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Business-ISBN-Data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30296

Modified Files:
	perl-Business-ISBN-Data.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Business-ISBN-Data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Business-ISBN-Data/devel/perl-Business-ISBN-Data.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Business-ISBN-Data.spec	5 Oct 2009 16:11:43 -0000	1.7
+++ perl-Business-ISBN-Data.spec	7 Dec 2009 09:55:47 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Business-ISBN-Data
 Version:        20081208
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The data pack for Business::ISBN
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 20081208-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 20081208-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 09:57:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:57:05 +0000 (UTC)
Subject: rpms/perl-IPTables-Parse/devel perl-IPTables-Parse.spec,1.5,1.6
Message-ID: <20091207095705.6A98A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPTables-Parse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30870

Modified Files:
	perl-IPTables-Parse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPTables-Parse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPTables-Parse/devel/perl-IPTables-Parse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-IPTables-Parse.spec	26 Jul 2009 08:46:55 -0000	1.5
+++ perl-IPTables-Parse.spec	7 Dec 2009 09:57:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-IPTables-Parse
 Version:        0.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for parsing iptables firewall rulesets
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.7-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 09:58:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 09:58:39 +0000 (UTC)
Subject: rpms/perl-DBI-Dumper/devel perl-DBI-Dumper.spec,1.8,1.9
Message-ID: <20091207095839.E248511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBI-Dumper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31613

Modified Files:
	perl-DBI-Dumper.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBI-Dumper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBI-Dumper/devel/perl-DBI-Dumper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-DBI-Dumper.spec	26 Jul 2009 05:22:29 -0000	1.8
+++ perl-DBI-Dumper.spec	7 Dec 2009 09:58:39 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-DBI-Dumper
 Version:        2.01
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Dump data from a DBI datasource to file
 # see http://rt.cpan.org/Public/Bug/Display.html?id=27269
 License:        GPL+ or Artistic
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_mandir}/man[13]/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.01-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.01-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Dec  7 09:59:54 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 09:59:54 +0000 (UTC)
Subject: rpms/DeviceKit-power/devel .cvsignore, 1.18,
	1.19 DeviceKit-power.spec, 1.26, 1.27 sources, 1.18, 1.19
Message-ID: <20091207095954.9AD3511C00EE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32084

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Log Message:
* Mon Dec 07 2009 Richard Hughes <richard at hughsie.com> - 013-1
- Update to 013
- Detect more supported UPS devices.
- Fix the Toshiba battery recall data.
- Fix a crash when the battery NVRAM is invalid.
- Add a couple of fixes for very new battery support.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	19 Oct 2009 10:15:32 -0000	1.18
+++ .cvsignore	7 Dec 2009 09:59:54 -0000	1.19
@@ -1 +1 @@
-DeviceKit-power-012.tar.gz
+DeviceKit-power-013.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- DeviceKit-power.spec	19 Oct 2009 10:15:32 -0000	1.26
+++ DeviceKit-power.spec	7 Dec 2009 09:59:54 -0000	1.27
@@ -7,7 +7,7 @@
 
 Summary: Power Management Service
 Name: DeviceKit-power
-Version: 012
+Version: 013
 #Release: 0.1.%{?alphatag}git%{?dist}
 Release: 1%{?dist}
 License: GPLv2+
@@ -109,6 +109,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Mon Dec 07 2009 Richard Hughes <richard at hughsie.com> - 013-1
+- Update to 013
+- Detect more supported UPS devices.
+- Fix the Toshiba battery recall data.
+- Fix a crash when the battery NVRAM is invalid.
+- Add a couple of fixes for very new battery support.
+
 * Mon Oct 19 2009 Richard Hughes <richard at hughsie.com> - 012-1
 - Update to 012
 - Detect encrypted swap and prevent hibernate in this case.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	19 Oct 2009 10:15:32 -0000	1.18
+++ sources	7 Dec 2009 09:59:54 -0000	1.19
@@ -1 +1 @@
-34b8d698658cce77050443125fa9fab4  DeviceKit-power-012.tar.gz
+4fd56be8344556f55f86d476adbc9ab5  DeviceKit-power-013.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 10:00:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:00:34 +0000 (UTC)
Subject: rpms/perl-Business-ISBN/devel perl-Business-ISBN.spec,1.6,1.7
Message-ID: <20091207100034.0B55611C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Business-ISBN/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32473

Modified Files:
	perl-Business-ISBN.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Business-ISBN.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Business-ISBN/devel/perl-Business-ISBN.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Business-ISBN.spec	5 Oct 2009 15:41:48 -0000	1.6
+++ perl-Business-ISBN.spec	7 Dec 2009 10:00:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Business-ISBN
 Version:        2.05
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module to work with International Standard Book Numbers
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.05-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.05-1
 - new upstream version
 



From jzeleny at fedoraproject.org  Mon Dec  7 10:01:19 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon,  7 Dec 2009 10:01:19 +0000 (UTC)
Subject: rpms/rsync/devel rsync-3.0.6-permissions.patch, NONE, 1.1 rsync.spec,
	1.67, 1.68
Message-ID: <20091207100119.0EBD811C00EE@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/rsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv392

Modified Files:
	rsync.spec 
Added Files:
	rsync-3.0.6-permissions.patch 
Log Message:
fix retouching dir permissions

rsync-3.0.6-permissions.patch:
 generator.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE rsync-3.0.6-permissions.patch ---
diff --git a/generator.c b/generator.c
index 8038feb..4abe6a0 100644
--- a/generator.c
+++ b/generator.c
@@ -2034,6 +2034,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 	static int counter = 0;
 	struct file_struct *file;
 	char *fname;
+	BOOL retouch_perms;
 	int i, start, end;
 
 	if (ndx < 0) {
@@ -2054,11 +2055,13 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 			rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
 				NS(fname), i);
 		}
+		/* Be sure not to retouch permissions with --fake-super. */
+		retouch_perms = !am_root && !(file->mode & S_IWUSR);
 		if (!F_IS_ACTIVE(file) || file->flags & FLAG_MISSING_DIR
-		 || (!need_retouch_dir_times && file->mode & S_IWUSR))
+		 || !(need_retouch_dir_times || retouch_perms))
 			continue;
 		fname = f_name(file, NULL);
-		if (!(file->mode & S_IWUSR))
+		if (retouch_perms)
 			do_chmod(fname, file->mode);
 		if (need_retouch_dir_times) {
 			STRUCT_STAT st;


Index: rsync.spec
===================================================================
RCS file: /cvs/extras/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- rsync.spec	27 Jul 2009 03:17:00 -0000	1.67
+++ rsync.spec	7 Dec 2009 10:01:18 -0000	1.68
@@ -7,13 +7,14 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.6
-Release: 3%{?prerelease}%{?dist}
+Release: 4%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
 Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}%{?prerelease}.tar.gz
 Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}%{?prerelease}.tar.gz
 Source2: rsync.xinetd
+Patch0: rsync-3.0.6-permissions.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
@@ -47,6 +48,8 @@ patch -p1 -i patches/xattrs.diff
 #Enable --copy-devices parameter
 patch -p1 -i patches/copy-devices.diff
 
+%patch0 -p1 -b .permissions
+
 %build
 rm -fr autom4te.cache
 autoconf
@@ -74,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Mon Dec 07 2009 Jan Zeleny <jzeleny at redhat.com> - 3.0.6-4
+- applied patch to avoid retouching dir permissions (#542679)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:02:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:02:03 +0000 (UTC)
Subject: rpms/perl-IPC-System-Simple/devel perl-IPC-System-Simple.spec, 1.2, 
	1.3
Message-ID: <20091207100203.5D2BA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPC-System-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv845

Modified Files:
	perl-IPC-System-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPC-System-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-System-Simple/devel/perl-IPC-System-Simple.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-IPC-System-Simple.spec	26 Jul 2009 08:46:25 -0000	1.2
+++ perl-IPC-System-Simple.spec	7 Dec 2009 10:02:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-IPC-System-Simple 
 Version:    1.18 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/IPC/System/Simple.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -73,6 +73,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.18-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:02:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:02:43 +0000 (UTC)
Subject: rpms/perl-DBICx-TestDatabase/devel perl-DBICx-TestDatabase.spec, 1.3,
	1.4
Message-ID: <20091207100243.A299011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBICx-TestDatabase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1198

Modified Files:
	perl-DBICx-TestDatabase.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBICx-TestDatabase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBICx-TestDatabase/devel/perl-DBICx-TestDatabase.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-DBICx-TestDatabase.spec	26 Jul 2009 05:22:43 -0000	1.3
+++ perl-DBICx-TestDatabase.spec	7 Dec 2009 10:02:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-DBICx-TestDatabase 
 Version:    0.02 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/DBICx/TestDatabase.pm -> GPL+ or Artistic
 # lib/DBICx/TestDatabase/Subclass.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
@@ -64,6 +64,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Dec  7 10:03:23 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 10:03:23 +0000 (UTC)
Subject: rpms/DeviceKit-power/F-12 .cvsignore, 1.18,
	1.19 DeviceKit-power.spec, 1.27, 1.28 sources, 1.18, 1.19
Message-ID: <20091207100323.59A6711C03DB@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1561

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Log Message:
* Mon Dec 07 2009 Richard Hughes <richard at hughsie.com> - 013-1
- Update to 013
- Detect more supported UPS devices.
- Fix the Toshiba battery recall data.
- Fix a crash when the battery NVRAM is invalid.
- Add a couple of fixes for very new battery support.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	18 Nov 2009 09:55:09 -0000	1.18
+++ .cvsignore	7 Dec 2009 10:03:23 -0000	1.19
@@ -1 +1 @@
-DeviceKit-power-013-20091118.tar.gz
+DeviceKit-power-013.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-12/DeviceKit-power.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- DeviceKit-power.spec	18 Nov 2009 09:55:09 -0000	1.27
+++ DeviceKit-power.spec	7 Dec 2009 10:03:23 -0000	1.28
@@ -8,13 +8,13 @@
 Summary: Power Management Service
 Name: DeviceKit-power
 Version: 013
-Release: 0.1.%{?alphatag}git%{?dist}
-#Release: 2%{?dist}
+#Release: 0.1.%{?alphatag}git%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/
-Source0:   http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
-#Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+#Source0:   http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/ldconfig
@@ -37,8 +37,6 @@ Requires: polkit >= %{polkit_version}
 Requires: udev
 Requires: pm-utils >= 1.2.2.1
 
-# Patch0: encrypted-swap.patch
-
 %description
 DeviceKit-power provides a daemon, API and command line tools for
 managing power devices attached to the system.
@@ -52,9 +50,8 @@ Requires: %{name} = %{version}-%{release
 Headers and libraries for DeviceKit-power.
 
 %prep
-#%setup -q
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
-#%patch0 -p1 -b .encrypted-swap
+%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
 %configure
@@ -112,6 +109,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Mon Dec 07 2009 Richard Hughes <richard at hughsie.com> - 013-1
+- Update to 013
+- Detect more supported UPS devices.
+- Fix the Toshiba battery recall data.
+- Fix a crash when the battery NVRAM is invalid.
+- Add a couple of fixes for very new battery support.
+
 * Wed Nov 18 2009 Richard Hughes  <rhughes at redhat.com> - 013-0.1.20091118git
 - Update to a git snapshot
 - Don't crash the daemon if the battery is broken. Fixes #533654


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	18 Nov 2009 09:55:09 -0000	1.18
+++ sources	7 Dec 2009 10:03:23 -0000	1.19
@@ -1 +1 @@
-e854f959bca44c282720267a314466dd  DeviceKit-power-013-20091118.tar.gz
+4fd56be8344556f55f86d476adbc9ab5  DeviceKit-power-013.tar.gz



From jzeleny at fedoraproject.org  Mon Dec  7 10:05:07 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon,  7 Dec 2009 10:05:07 +0000 (UTC)
Subject: rpms/rsync/F-12 rsync-3.0.6-permissions.patch, NONE, 1.1 rsync.spec,
	1.67, 1.68
Message-ID: <20091207100507.38DD911C00EE@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/rsync/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2133

Modified Files:
	rsync.spec 
Added Files:
	rsync-3.0.6-permissions.patch 
Log Message:
fixed retouching dir permissions

rsync-3.0.6-permissions.patch:
 generator.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE rsync-3.0.6-permissions.patch ---
diff --git a/generator.c b/generator.c
index 8038feb..4abe6a0 100644
--- a/generator.c
+++ b/generator.c
@@ -2034,6 +2034,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 	static int counter = 0;
 	struct file_struct *file;
 	char *fname;
+	BOOL retouch_perms;
 	int i, start, end;
 
 	if (ndx < 0) {
@@ -2054,11 +2055,13 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 			rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
 				NS(fname), i);
 		}
+		/* Be sure not to retouch permissions with --fake-super. */
+		retouch_perms = !am_root && !(file->mode & S_IWUSR);
 		if (!F_IS_ACTIVE(file) || file->flags & FLAG_MISSING_DIR
-		 || (!need_retouch_dir_times && file->mode & S_IWUSR))
+		 || !(need_retouch_dir_times || retouch_perms))
 			continue;
 		fname = f_name(file, NULL);
-		if (!(file->mode & S_IWUSR))
+		if (retouch_perms)
 			do_chmod(fname, file->mode);
 		if (need_retouch_dir_times) {
 			STRUCT_STAT st;


Index: rsync.spec
===================================================================
RCS file: /cvs/extras/rpms/rsync/F-12/rsync.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- rsync.spec	27 Jul 2009 03:17:00 -0000	1.67
+++ rsync.spec	7 Dec 2009 10:05:07 -0000	1.68
@@ -7,13 +7,14 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.6
-Release: 3%{?prerelease}%{?dist}
+Release: 4%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
 Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}%{?prerelease}.tar.gz
 Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}%{?prerelease}.tar.gz
 Source2: rsync.xinetd
+Patch0: rsync-3.0.6-permissions.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
@@ -47,6 +48,8 @@ patch -p1 -i patches/xattrs.diff
 #Enable --copy-devices parameter
 patch -p1 -i patches/copy-devices.diff
 
+%patch0 -p1 -b .permissions
+
 %build
 rm -fr autom4te.cache
 autoconf
@@ -74,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Mon Dec 07 2009 Jan Zeleny <jzeleny at redhat.com> - 3.0.6-4
+- applied patch to avoid retouching dir permissions (#542679)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:05:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:05:15 +0000 (UTC)
Subject: rpms/perl-Business-Hours/devel perl-Business-Hours.spec,1.10,1.11
Message-ID: <20091207100515.A346711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Business-Hours/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2220

Modified Files:
	perl-Business-Hours.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Business-Hours.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Business-Hours/devel/perl-Business-Hours.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Business-Hours.spec	26 Jul 2009 03:52:21 -0000	1.10
+++ perl-Business-Hours.spec	7 Dec 2009 10:05:15 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: 	Calculate business hours in a time period
 Name: 		perl-Business-Hours
 Version: 	0.09
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Business-Hours/
@@ -53,6 +53,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:07:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:07:02 +0000 (UTC)
Subject: rpms/perl-IPC-ShareLite/devel perl-IPC-ShareLite.spec,1.20,1.21
Message-ID: <20091207100702.0A10411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPC-ShareLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2943

Modified Files:
	perl-IPC-ShareLite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPC-ShareLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-ShareLite/devel/perl-IPC-ShareLite.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-IPC-ShareLite.spec	26 Jul 2009 08:45:45 -0000	1.20
+++ perl-IPC-ShareLite.spec	7 Dec 2009 10:07:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-IPC-ShareLite
 Version:        0.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight interface to shared memory
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:08:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:08:37 +0000 (UTC)
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.44,1.45
Message-ID: <20091207100837.3B24111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3522

Modified Files:
	perl-DBI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- perl-DBI.spec	24 Sep 2009 15:22:12 -0000	1.44
+++ perl-DBI.spec	7 Dec 2009 10:08:37 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.609
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.609-4
+- rebuild against perl 5.10.1
+
 * Thu Sep 24 2009 Stepan Kasal <skasal at redhat.com> - 1.609-3
 - provide versioned perl(DBI)
 



From kasal at fedoraproject.org  Mon Dec  7 10:09:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:09:20 +0000 (UTC)
Subject: rpms/perl-Business-CreditCard/devel perl-Business-CreditCard.spec,
	1.3, 1.4
Message-ID: <20091207100920.6DA8411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Business-CreditCard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3859

Modified Files:
	perl-Business-CreditCard.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Business-CreditCard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Business-CreditCard/devel/perl-Business-CreditCard.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Business-CreditCard.spec	26 Jul 2009 03:52:07 -0000	1.3
+++ perl-Business-CreditCard.spec	7 Dec 2009 10:09:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Business-CreditCard
 Version:        0.30
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Validate/generate credit card checksums/names
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.30-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:11:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:11:52 +0000 (UTC)
Subject: rpms/perl-IPC-SharedCache/devel perl-IPC-SharedCache.spec, 1.13,
	1.14
Message-ID: <20091207101152.EFAF311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPC-SharedCache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4798

Modified Files:
	perl-IPC-SharedCache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPC-SharedCache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-SharedCache/devel/perl-IPC-SharedCache.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-IPC-SharedCache.spec	26 Jul 2009 08:46:12 -0000	1.13
+++ perl-IPC-SharedCache.spec	7 Dec 2009 10:11:52 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-IPC-SharedCache
 Version:        1.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Perl module to manage a cache in SysV IPC shared memory
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.3-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:13:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:13:30 +0000 (UTC)
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.35,1.36
Message-ID: <20091207101330.414A511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-BSD-Resource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5426

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- perl-BSD-Resource.spec	29 Oct 2009 18:01:35 -0000	1.35
+++ perl-BSD-Resource.spec	7 Dec 2009 10:13:30 -0000	1.36
@@ -1,7 +1,7 @@
 Name:           perl-BSD-Resource
 Version:        1.29.03
 %define module_version 1.2903
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.29.03-3
+- rebuild against perl 5.10.1
+
 * Thu Oct 29 2009 Stepan Kasal <skasal at redhat.com> - 1.29.03-2
 - bump release
 



From mhlavink at fedoraproject.org  Mon Dec  7 10:14:19 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Dec 2009 10:14:19 +0000 (UTC)
Subject: File INIT.2009-12-06.tgz uploaded to lookaside cache by mhlavink
Message-ID: <20091207101419.F082810F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ksh:

a2eb02035559aae26be61f959c185bb0  INIT.2009-12-06.tgz



From mhlavink at fedoraproject.org  Mon Dec  7 10:14:26 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Dec 2009 10:14:26 +0000 (UTC)
Subject: File ast-ksh.2009-12-06.tgz uploaded to lookaside cache by mhlavink
Message-ID: <20091207101426.5BB1B10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ksh:

ef37c6bbe87cde621362990ac715274a  ast-ksh.2009-12-06.tgz



From kasal at fedoraproject.org  Mon Dec  7 10:14:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:14:27 +0000 (UTC)
Subject: rpms/perl-DBD-XBase/devel perl-DBD-XBase.spec,1.11,1.12
Message-ID: <20091207101427.0798411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-XBase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5893

Modified Files:
	perl-DBD-XBase.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-XBase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-XBase/devel/perl-DBD-XBase.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-DBD-XBase.spec	26 Jul 2009 05:21:59 -0000	1.11
+++ perl-DBD-XBase.spec	7 Dec 2009 10:14:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-DBD-XBase
 Version:        0.241
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Perl module for reading and writing the dbf files
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.241-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.241-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Mon Dec  7 10:15:30 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Dec 2009 10:15:30 +0000 (UTC)
Subject: rpms/ksh/devel .cvsignore, 1.20, 1.21 ksh.spec, 1.53, 1.54 sources, 
	1.21, 1.22
Message-ID: <20091207101530.34E6211C00EE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6352

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
* Fri Dec 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091206-1
- updated to 2009-12-06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Dec 2009 16:20:15 -0000	1.20
+++ .cvsignore	7 Dec 2009 10:15:29 -0000	1.21
@@ -1,2 +1,2 @@
-INIT.2009-11-30.tgz
-ast-ksh.2009-11-30.tgz
+INIT.2009-12-06.tgz
+ast-ksh.2009-12-06.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ksh.spec	4 Dec 2009 16:20:15 -0000	1.53
+++ ksh.spec	7 Dec 2009 10:15:30 -0000	1.54
@@ -1,11 +1,11 @@
-%define       releasedate   2009-11-30
+%define       releasedate   2009-12-06
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20091130
+Version:      20091206
 Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
@@ -88,6 +88,9 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Dec 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091206-1
+- updated to 2009-12-06
+
 * Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
 - updated to 2009-11-30
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	4 Dec 2009 16:20:15 -0000	1.21
+++ sources	7 Dec 2009 10:15:30 -0000	1.22
@@ -1,2 +1,2 @@
-5f81da2ae8b0cc77798f369c882394f2  INIT.2009-11-30.tgz
-2289670fd801d45ebabae3c2893c9cf2  ast-ksh.2009-11-30.tgz
+a2eb02035559aae26be61f959c185bb0  INIT.2009-12-06.tgz
+ef37c6bbe87cde621362990ac715274a  ast-ksh.2009-12-06.tgz



From kasal at fedoraproject.org  Mon Dec  7 10:15:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:15:57 +0000 (UTC)
Subject: rpms/perl-IPC-Shareable/devel perl-IPC-Shareable.spec,1.10,1.11
Message-ID: <20091207101557.3D1CB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPC-Shareable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6594

Modified Files:
	perl-IPC-Shareable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPC-Shareable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Shareable/devel/perl-IPC-Shareable.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-IPC-Shareable.spec	26 Jul 2009 08:45:58 -0000	1.10
+++ perl-IPC-Shareable.spec	7 Dec 2009 10:15:57 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-IPC-Shareable
 Version:        0.60
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Share Perl variables between processes
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.60-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:18:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:18:00 +0000 (UTC)
Subject: rpms/perl-Boulder/devel perl-Boulder.spec,1.8,1.9
Message-ID: <20091207101800.0BC2111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Boulder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7398

Modified Files:
	perl-Boulder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Boulder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Boulder/devel/perl-Boulder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Boulder.spec	26 Jul 2009 03:51:51 -0000	1.8
+++ perl-Boulder.spec	7 Dec 2009 10:17:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Boulder
 Version:        1.30
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        An API for hierarchical tag/value structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.30-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.30-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:18:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:18:30 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite2/devel perl-DBD-SQLite2.spec,1.12,1.13
Message-ID: <20091207101830.A279E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-SQLite2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7710

Modified Files:
	perl-DBD-SQLite2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-SQLite2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite2/devel/perl-DBD-SQLite2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-DBD-SQLite2.spec	26 Jul 2009 05:21:44 -0000	1.12
+++ perl-DBD-SQLite2.spec	7 Dec 2009 10:18:30 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite2
 Version:        0.33
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver (sqlite 2.x)
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.33-13
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Mon Dec  7 10:18:48 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Dec 2009 10:18:48 +0000 (UTC)
Subject: rpms/ksh/F-12 .cvsignore, 1.20, 1.21 ksh.spec, 1.52, 1.53 sources, 
	1.21, 1.22
Message-ID: <20091207101848.2A37A11C00EE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7913

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
* Mon Dec 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091206-1
- updated to 2009-12-06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Dec 2009 16:20:16 -0000	1.20
+++ .cvsignore	7 Dec 2009 10:18:47 -0000	1.21
@@ -1,2 +1,2 @@
-INIT.2009-11-30.tgz
-ast-ksh.2009-11-30.tgz
+INIT.2009-12-06.tgz
+ast-ksh.2009-12-06.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-12/ksh.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ksh.spec	4 Dec 2009 16:20:16 -0000	1.52
+++ ksh.spec	7 Dec 2009 10:18:48 -0000	1.53
@@ -1,11 +1,11 @@
-%define       releasedate   2009-11-30
+%define       releasedate   2009-12-06
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20091130
+Version:      20091206
 Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
@@ -88,10 +88,13 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Dec 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091206-1
+- updated to 2009-12-06
+
 * Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
 - updated to 2009-11-30
 
-* Thu Aug 27 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091021-1
+* Wed Nov 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091021-1
 - updated to 2009-10-21
 
 * Thu Aug 27 2009 Michal Hlavinka <mhlavink at redhat.com> - 20090630-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	4 Dec 2009 16:20:16 -0000	1.21
+++ sources	7 Dec 2009 10:18:48 -0000	1.22
@@ -1,2 +1,2 @@
-5f81da2ae8b0cc77798f369c882394f2  INIT.2009-11-30.tgz
-2289670fd801d45ebabae3c2893c9cf2  ast-ksh.2009-11-30.tgz
+a2eb02035559aae26be61f959c185bb0  INIT.2009-12-06.tgz
+ef37c6bbe87cde621362990ac715274a  ast-ksh.2009-12-06.tgz



From devrim at fedoraproject.org  Mon Dec  7 10:19:01 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon,  7 Dec 2009 10:19:01 +0000 (UTC)
Subject: File pgpool-II-2.3.tar.gz uploaded to lookaside cache by devrim
Message-ID: <20091207101901.82A3A10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for postgresql-pgpool-II:

5c3cf3001c95c4d8e28b168ddda1e478  pgpool-II-2.3.tar.gz



From mhlavink at fedoraproject.org  Mon Dec  7 10:18:56 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Dec 2009 10:18:56 +0000 (UTC)
Subject: rpms/ksh/F-11 .cvsignore, 1.21, 1.22 ksh.spec, 1.53, 1.54 sources, 
	1.22, 1.23
Message-ID: <20091207101856.A783011C00EE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8027

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
* Mon Dec 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091206-1
- updated to 2009-12-06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	4 Dec 2009 16:20:19 -0000	1.21
+++ .cvsignore	7 Dec 2009 10:18:56 -0000	1.22
@@ -1,2 +1,2 @@
-INIT.2009-11-30.tgz
-ast-ksh.2009-11-30.tgz
+INIT.2009-12-06.tgz
+ast-ksh.2009-12-06.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/ksh.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ksh.spec	4 Dec 2009 16:20:20 -0000	1.53
+++ ksh.spec	7 Dec 2009 10:18:56 -0000	1.54
@@ -1,11 +1,11 @@
-%define       releasedate   2009-11-30
+%define       releasedate   2009-12-06
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20091130
+Version:      20091206
 Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
@@ -88,6 +88,9 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Dec 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091206-1
+- updated to 2009-12-06
+
 * Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1
 - updated to 2009-11-30
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	4 Dec 2009 16:20:20 -0000	1.22
+++ sources	7 Dec 2009 10:18:56 -0000	1.23
@@ -1,2 +1,2 @@
-5f81da2ae8b0cc77798f369c882394f2  INIT.2009-11-30.tgz
-2289670fd801d45ebabae3c2893c9cf2  ast-ksh.2009-11-30.tgz
+a2eb02035559aae26be61f959c185bb0  INIT.2009-12-06.tgz
+ef37c6bbe87cde621362990ac715274a  ast-ksh.2009-12-06.tgz



From jzeleny at fedoraproject.org  Mon Dec  7 10:20:33 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon,  7 Dec 2009 10:20:33 +0000 (UTC)
Subject: rpms/rsync/F-11 rsync-3.0.6-permissions.patch, NONE, 1.1 rsync.spec,
	1.65, 1.66
Message-ID: <20091207102033.1E35011C03E3@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/rsync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8770

Modified Files:
	rsync.spec 
Added Files:
	rsync-3.0.6-permissions.patch 
Log Message:
fixed retouching dir permissions

rsync-3.0.6-permissions.patch:
 generator.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE rsync-3.0.6-permissions.patch ---
diff --git a/generator.c b/generator.c
index 8038feb..4abe6a0 100644
--- a/generator.c
+++ b/generator.c
@@ -2034,6 +2034,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 	static int counter = 0;
 	struct file_struct *file;
 	char *fname;
+	BOOL retouch_perms;
 	int i, start, end;
 
 	if (ndx < 0) {
@@ -2054,11 +2055,13 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 			rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
 				NS(fname), i);
 		}
+		/* Be sure not to retouch permissions with --fake-super. */
+		retouch_perms = !am_root && !(file->mode & S_IWUSR);
 		if (!F_IS_ACTIVE(file) || file->flags & FLAG_MISSING_DIR
-		 || (!need_retouch_dir_times && file->mode & S_IWUSR))
+		 || !(need_retouch_dir_times || retouch_perms))
 			continue;
 		fname = f_name(file, NULL);
-		if (!(file->mode & S_IWUSR))
+		if (retouch_perms)
 			do_chmod(fname, file->mode);
 		if (need_retouch_dir_times) {
 			STRUCT_STAT st;


Index: rsync.spec
===================================================================
RCS file: /cvs/extras/rpms/rsync/F-11/rsync.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- rsync.spec	1 Jun 2009 16:51:43 -0000	1.65
+++ rsync.spec	7 Dec 2009 10:20:32 -0000	1.66
@@ -7,13 +7,14 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.6
-Release: 0%{?prerelease}%{?dist}
+Release: 1%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
 Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}%{?prerelease}.tar.gz
 Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}%{?prerelease}.tar.gz
 Source2: rsync.xinetd
+Patch0: rsync-3.0.6-permissions.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
@@ -47,6 +48,8 @@ patch -p1 -i patches/xattrs.diff
 #Enable --copy-devices parameter
 patch -p1 -i patches/copy-devices.diff
 
+%patch0 -p1 -b .permissions
+
 %build
 rm -fr autom4te.cache
 autoconf
@@ -74,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Mon Dec 07 2009 Jan Zeleny <jzeleny at redhat.com> - 3.0.6-1
+- fixed retouching dir permissions (#542679)
+
 * Mon Jun  1 2009 Simo Sorce <ssorce at redhat.com> 3.0.6-0.fc11
 - New upstream bugfix release
 - Also backport specfile changes from devel



From kasal at fedoraproject.org  Mon Dec  7 10:20:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:20:37 +0000 (UTC)
Subject: rpms/perl-IPC-Run-SafeHandles/devel perl-IPC-Run-SafeHandles.spec,
	1.4, 1.5
Message-ID: <20091207102037.9871C11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8847

Modified Files:
	perl-IPC-Run-SafeHandles.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPC-Run-SafeHandles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run-SafeHandles/devel/perl-IPC-Run-SafeHandles.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-IPC-Run-SafeHandles.spec	30 Jul 2009 04:47:15 -0000	1.4
+++ perl-IPC-Run-SafeHandles.spec	7 Dec 2009 10:20:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-IPC-Run-SafeHandles
 Version:        0.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Use IPC::Run and IPC::Run3 safely
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-5
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jpopelka at fedoraproject.org  Mon Dec  7 10:21:29 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon,  7 Dec 2009 10:21:29 +0000 (UTC)
Subject: rpms/system-config-network/F-12
	system-config-network-1.5.99-NoneIPLen.patch, NONE,
	1.1 system-config-network.spec, 1.51, 1.52
Message-ID: <20091207102129.B91F211C00EE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-network/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9295

Modified Files:
	system-config-network.spec 
Added Files:
	system-config-network-1.5.99-NoneIPLen.patch 
Log Message:
* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com>  1.5.99-2
- Fixed s-control-network crash when adding new modem (bz #544412)


system-config-network-1.5.99-NoneIPLen.patch:
 NCDevice.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-network-1.5.99-NoneIPLen.patch ---
diff -up system-config-network-1.5.99/src/netconfpkg/NCDevice.py.NoneIPLen system-config-network-1.5.99/src/netconfpkg/NCDevice.py
--- system-config-network-1.5.99/src/netconfpkg/NCDevice.py.NoneIPLen	2009-08-12 16:28:33.000000000 +0200
+++ system-config-network-1.5.99/src/netconfpkg/NCDevice.py	2009-12-07 11:05:08.000000000 +0100
@@ -390,10 +390,10 @@ class Device(Device_base):
         conf.fsf()
 
         if self.BootProto == None:
-            if len(self.IP):
+            if self.IP:
                 self.BootProto = "none"
             else:
-                self.BootProto = 'dhcp'                
+                self.BootProto = 'dhcp'
 
         if self.BootProto:
             self.BootProto = self.BootProto.lower()


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/F-12/system-config-network.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- system-config-network.spec	14 Sep 2009 12:34:10 -0000	1.51
+++ system-config-network.spec	7 Dec 2009 10:21:29 -0000	1.52
@@ -2,9 +2,11 @@
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
 Version: 1.5.99
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: %{name}-%{version}.tar.bz2
+Patch0: system-config-network-1.5.99-NoneIPLen.patch
+
 License: GPLv2+
 Group: Applications/System 
 BuildArch: noarch
@@ -35,6 +37,7 @@ supporting Ethernet, Wireless, TokenRing
 
 %prep
 %setup -q
+%patch0 -p1 -b .NoneIPLen
 
 %build
 %configure
@@ -103,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com>  1.5.99-2
+- Fixed s-control-network crash when adding new modem (bz #544412)
+
 * Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.99-1
 - version 1.5.99
 - removed all rhpl requirements



From kasal at fedoraproject.org  Mon Dec  7 10:22:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:22:03 +0000 (UTC)
Subject: rpms/perl-boolean/devel perl-boolean.spec,1.3,1.4
Message-ID: <20091207102203.CB81F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-boolean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9564

Modified Files:
	perl-boolean.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-boolean.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-boolean/devel/perl-boolean.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-boolean.spec	26 Jul 2009 17:45:16 -0000	1.3
+++ perl-boolean.spec	7 Dec 2009 10:22:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-boolean
 Version:        0.20
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Boolean support for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.20-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:22:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:22:51 +0000 (UTC)
Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.32,1.33
Message-ID: <20091207102251.03B5811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-SQLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9902

Modified Files:
	perl-DBD-SQLite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- perl-DBD-SQLite.spec	25 Nov 2009 11:28:27 -0000	1.32
+++ perl-DBD-SQLite.spec	7 Dec 2009 10:22:50 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite
 Version:        1.27
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.27-2
+- rebuild against perl 5.10.1
+
 * Wed Nov 25 2009 Stepan Kasal <skasal at redhat.com> 1.27-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 10:25:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:25:33 +0000 (UTC)
Subject: rpms/perl-IPC-Run3/devel perl-IPC-Run3.spec,1.18,1.19
Message-ID: <20091207102533.E648E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPC-Run3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11025

Modified Files:
	perl-IPC-Run3.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPC-Run3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/devel/perl-IPC-Run3.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-IPC-Run3.spec	26 Jul 2009 08:45:30 -0000	1.18
+++ perl-IPC-Run3.spec	7 Dec 2009 10:25:33 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-IPC-Run3
 Version:        0.043
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Run a subprocess in batch mode
 License:        (GPL+ or Artistic) or BSD
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.043-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.043-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:26:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:26:17 +0000 (UTC)
Subject: rpms/perl-B-Keywords/devel perl-B-Keywords.spec,1.13,1.14
Message-ID: <20091207102617.BA72511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-B-Keywords/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11319

Modified Files:
	perl-B-Keywords.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-B-Keywords.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-B-Keywords/devel/perl-B-Keywords.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-B-Keywords.spec	26 Jul 2009 01:48:05 -0000	1.13
+++ perl-B-Keywords.spec	7 Dec 2009 10:26:17 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-B-Keywords
 Version:        1.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lists of reserved barewords and symbol names
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.09-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jpopelka at fedoraproject.org  Mon Dec  7 10:27:50 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon,  7 Dec 2009 10:27:50 +0000 (UTC)
Subject: rpms/system-config-network/devel
	system-config-network-1.5.99-NoneIPLen.patch, NONE,
	1.1 system-config-network.spec, 1.51, 1.52
Message-ID: <20091207102750.A05EB11C00EE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11880

Modified Files:
	system-config-network.spec 
Added Files:
	system-config-network-1.5.99-NoneIPLen.patch 
Log Message:
* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com>  1.5.99-2
- Fixed s-control-network crash when adding new modem (bz #544412)


system-config-network-1.5.99-NoneIPLen.patch:
 NCDevice.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-network-1.5.99-NoneIPLen.patch ---
diff -up system-config-network-1.5.99/src/netconfpkg/NCDevice.py.NoneIPLen system-config-network-1.5.99/src/netconfpkg/NCDevice.py
--- system-config-network-1.5.99/src/netconfpkg/NCDevice.py.NoneIPLen	2009-08-12 16:28:33.000000000 +0200
+++ system-config-network-1.5.99/src/netconfpkg/NCDevice.py	2009-12-07 11:05:08.000000000 +0100
@@ -390,10 +390,10 @@ class Device(Device_base):
         conf.fsf()
 
         if self.BootProto == None:
-            if len(self.IP):
+            if self.IP:
                 self.BootProto = "none"
             else:
-                self.BootProto = 'dhcp'                
+                self.BootProto = 'dhcp'
 
         if self.BootProto:
             self.BootProto = self.BootProto.lower()


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- system-config-network.spec	14 Sep 2009 12:34:10 -0000	1.51
+++ system-config-network.spec	7 Dec 2009 10:27:50 -0000	1.52
@@ -5,6 +5,8 @@ Version: 1.5.99
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: %{name}-%{version}.tar.bz2
+Patch0: system-config-network-1.5.99-NoneIPLen.patch
+
 License: GPLv2+
 Group: Applications/System 
 BuildArch: noarch
@@ -35,6 +37,7 @@ supporting Ethernet, Wireless, TokenRing
 
 %prep
 %setup -q
+%patch0 -p1 -b .NoneIPLen
 
 %build
 %configure
@@ -103,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com>  1.5.99-2
+- Fixed s-control-network crash when adding new modem (bz #544412)
+
 * Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.99-1
 - version 1.5.99
 - removed all rhpl requirements



From kasal at fedoraproject.org  Mon Dec  7 10:28:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:28:22 +0000 (UTC)
Subject: rpms/perl-DBD-Pg/devel perl-DBD-Pg.spec,1.54,1.55
Message-ID: <20091207102822.995E111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-Pg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12167

Modified Files:
	perl-DBD-Pg.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-Pg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- perl-DBD-Pg.spec	24 Sep 2009 15:52:22 -0000	1.54
+++ perl-DBD-Pg.spec	7 Dec 2009 10:28:22 -0000	1.55
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Pg
 Version:        2.15.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A PostgreSQL interface for perl
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.15.1-2
+- rebuild against perl 5.10.1
+
 * Thu Sep 24 2009 Stepan Kasal <skasal at redhat.com> - 2.15.1-1
 - new upstream version
 - add versioned provide (#525502)



From kasal at fedoraproject.org  Mon Dec  7 10:29:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:29:44 +0000 (UTC)
Subject: rpms/perl-IPC-Run/devel perl-IPC-Run.spec,1.20,1.21
Message-ID: <20091207102944.DE1E111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPC-Run/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12705

Modified Files:
	perl-IPC-Run.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPC-Run.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-IPC-Run.spec	3 Sep 2009 17:20:16 -0000	1.20
+++ perl-IPC-Run.spec	7 Dec 2009 10:29:44 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-IPC-Run
 Version:        0.84
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for interacting with child processes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.84-2
+- rebuild against perl 5.10.1
+
 * Wed Sep 02 2009 Steven Pritchard <steve at kspei.com> 0.84-1
 - Update to 0.84.
 - Drop IPCRUNDEBUG from "make test" (bug fixed long ago).



From mhlavink at fedoraproject.org  Mon Dec  7 10:29:53 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  7 Dec 2009 10:29:53 +0000 (UTC)
Subject: rpms/ksh/devel ksh.spec,1.54,1.55
Message-ID: <20091207102953.28B5711C00EE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12724

Modified Files:
	ksh.spec 
Log Message:
fix changelog date



Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- ksh.spec	7 Dec 2009 10:15:30 -0000	1.54
+++ ksh.spec	7 Dec 2009 10:29:52 -0000	1.55
@@ -88,7 +88,7 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Dec 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091206-1
+* Mon Dec 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091206-1
 - updated to 2009-12-06
 
 * Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 20091130-1



From dodji at fedoraproject.org  Mon Dec  7 10:31:25 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  7 Dec 2009 10:31:25 +0000 (UTC)
Subject: rpms/nemiver/F-12 nemiver.spec,1.31,1.32
Message-ID: <20091207103125.BFE3A11C00EE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13351

Modified Files:
	nemiver.spec 
Log Message:
Mon Dec 07 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
- Update to new upstream release (0.7.3)




Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-12/nemiver.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- nemiver.spec	12 Sep 2009 20:28:21 -0000	1.31
+++ nemiver.spec	7 Dec 2009 10:31:25 -0000	1.32
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.2
+Version:	0.7.3
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -143,6 +143,9 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+Mon Dec 07 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
+- Update to new upstream release (0.7.3)
+
 * Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
 - Update to new upstream release (0.7.2)
 



From jpopelka at fedoraproject.org  Mon Dec  7 10:31:52 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon,  7 Dec 2009 10:31:52 +0000 (UTC)
Subject: rpms/system-config-network/devel system-config-network.spec, 1.52, 
	1.53
Message-ID: <20091207103152.95A0A11C00EE@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13670

Modified Files:
	system-config-network.spec 
Log Message:
release bump


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- system-config-network.spec	7 Dec 2009 10:27:50 -0000	1.52
+++ system-config-network.spec	7 Dec 2009 10:31:52 -0000	1.53
@@ -2,7 +2,7 @@
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
 Version: 1.5.99
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: %{name}-%{version}.tar.bz2
 Patch0: system-config-network-1.5.99-NoneIPLen.patch



From kasal at fedoraproject.org  Mon Dec  7 10:32:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:32:16 +0000 (UTC)
Subject: rpms/perl-Bit-Vector/devel perl-Bit-Vector.spec,1.31,1.32
Message-ID: <20091207103216.D08D811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Bit-Vector/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13839

Modified Files:
	perl-Bit-Vector.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Bit-Vector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- perl-Bit-Vector.spec	2 Oct 2009 09:12:52 -0000	1.31
+++ perl-Bit-Vector.spec	7 Dec 2009 10:32:16 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           perl-Bit-Vector
 Version:        7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient bit vector, set of integers and "big int" math library
 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 7.1-2
+- rebuild against perl 5.10.1
+
 * Fri Oct  2 2009 Stepan Kasal <skasal at redhat.com> - 7.1-2
 - fixed the license tag
 



From kasal at fedoraproject.org  Mon Dec  7 10:33:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:33:59 +0000 (UTC)
Subject: rpms/perl-IPC-DirQueue/devel perl-IPC-DirQueue.spec,1.1,1.2
Message-ID: <20091207103359.1568A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IPC-DirQueue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14617

Modified Files:
	perl-IPC-DirQueue.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IPC-DirQueue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-DirQueue/devel/perl-IPC-DirQueue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-IPC-DirQueue.spec	26 Sep 2009 13:47:35 -0000	1.1
+++ perl-IPC-DirQueue.spec	7 Dec 2009 10:33:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-IPC-DirQueue
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Disk-based many-to-many task queue
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.0-3
+- rebuild against perl 5.10.1
+
 * Wed Sep 23 2009 Steve Traylen <steve.traylen at cern.ch> 1.0-2
 - Build requires perl(Time::HiRes) explicitly on RHEL4.
 



From dodji at fedoraproject.org  Mon Dec  7 10:34:38 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  7 Dec 2009 10:34:38 +0000 (UTC)
Subject: rpms/nemiver/F-12 nemiver.spec,1.32,1.33
Message-ID: <20091207103438.889D011C00EE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14789

Modified Files:
	nemiver.spec 
Log Message:
* Mon Dec 07 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
- Fix changelog entry syntax




Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-12/nemiver.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- nemiver.spec	7 Dec 2009 10:31:25 -0000	1.32
+++ nemiver.spec	7 Dec 2009 10:34:38 -0000	1.33
@@ -143,7 +143,7 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
-Mon Dec 07 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
+* Mon Dec 07 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
 - Update to new upstream release (0.7.3)
 
 * Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1



From kasal at fedoraproject.org  Mon Dec  7 10:36:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:36:41 +0000 (UTC)
Subject: rpms/perl-bioperl-run/devel perl-bioperl-run.spec,1.7,1.8
Message-ID: <20091207103641.1658211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-bioperl-run/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15570

Modified Files:
	perl-bioperl-run.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-bioperl-run.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-bioperl-run/devel/perl-bioperl-run.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-bioperl-run.spec	26 Jul 2009 17:45:00 -0000	1.7
+++ perl-bioperl-run.spec	7 Dec 2009 10:36:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-bioperl-run
 Version:        1.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Modules to provide a Perl interface to various bioinformatics applications
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.6.1-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:36:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:36:52 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.50,1.51
Message-ID: <20091207103652.C36E511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15751

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- perl-DBD-MySQL.spec	26 Oct 2009 10:12:23 -0000	1.50
+++ perl-DBD-MySQL.spec	7 Dec 2009 10:36:52 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        4.013
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.013-3
+- rebuild against perl 5.10.1
+
 * Mon Oct 26 2009 Stepan Kasal <skasal at redhat.com> - 4.013-2
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 10:40:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:40:21 +0000 (UTC)
Subject: rpms/perl-IO-Tty/devel perl-IO-Tty.spec,1.22,1.23
Message-ID: <20091207104021.2C90711C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Tty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16899

Modified Files:
	perl-IO-Tty.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Tty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-IO-Tty.spec	26 Jul 2009 06:42:57 -0000	1.22
+++ perl-IO-Tty.spec	7 Dec 2009 10:40:20 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-IO-Tty
 Version:        1.08
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to pseudo tty's
 
 License:        GPL+ or Artistic
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.08-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dodji at fedoraproject.org  Mon Dec  7 10:41:16 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  7 Dec 2009 10:41:16 +0000 (UTC)
Subject: rpms/nemiver/F-12 .cvsignore,1.20,1.21 sources,1.20,1.21
Message-ID: <20091207104116.6AE2911C00EE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17172

Modified Files:
	.cvsignore sources 
Log Message:
Mon Dec 07 2009 Dodji Seketeli <dodji at redhat.com>

Uploaded nemiver-0.7.3.tar.bz2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	12 Sep 2009 20:33:19 -0000	1.20
+++ .cvsignore	7 Dec 2009 10:41:16 -0000	1.21
@@ -2,3 +2,4 @@ nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
 nemiver-0.7.1.tar.bz2
 nemiver-0.7.2.tar.bz2
+nemiver-0.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	12 Sep 2009 20:33:20 -0000	1.20
+++ sources	7 Dec 2009 10:41:16 -0000	1.21
@@ -2,3 +2,4 @@ eeb0f56cf70d26746f79486bd5437ac7  nemive
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
 9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2
 a80f3d47b4ebf7fafa0225185112f377  nemiver-0.7.2.tar.bz2
+7159d64bd78dc55aad892077fb75dfec  nemiver-0.7.3.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 10:41:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:41:17 +0000 (UTC)
Subject: rpms/perl-DBD-Multi/devel perl-DBD-Multi.spec,1.4,1.5
Message-ID: <20091207104117.2745511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-Multi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17311

Modified Files:
	perl-DBD-Multi.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-Multi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-Multi/devel/perl-DBD-Multi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-DBD-Multi.spec	26 Jul 2009 05:20:41 -0000	1.4
+++ perl-DBD-Multi.spec	7 Dec 2009 10:41:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-DBD-Multi 
 Version:    0.14 
-Release:        4%{?dist}
+Release:        5%{?dist}
 # see Makefile.PL
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:41:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:41:47 +0000 (UTC)
Subject: rpms/perl-bioperl/devel perl-bioperl.spec,1.24,1.25
Message-ID: <20091207104147.294D711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-bioperl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17561

Modified Files:
	perl-bioperl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-bioperl/devel/perl-bioperl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-bioperl.spec	17 Nov 2009 16:39:47 -0000	1.24
+++ perl-bioperl.spec	7 Dec 2009 10:41:47 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-bioperl
 Version:        1.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl tools for computational molecular biology
 
 Group:          Development/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*    
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.6.1-3
+- rebuild against perl 5.10.1
+
 * Thu Nov 12 2009 Stepan Kasal <skasal at redhat.com> - 1.6.1-2
 - use the new filtering macros (cf #537138)
 



From kasal at fedoraproject.org  Mon Dec  7 10:45:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:45:39 +0000 (UTC)
Subject: rpms/perl-IO-TieCombine/devel perl-IO-TieCombine.spec,1.4,1.5
Message-ID: <20091207104539.129A711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-TieCombine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18927

Modified Files:
	perl-IO-TieCombine.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-TieCombine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-TieCombine/devel/perl-IO-TieCombine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-IO-TieCombine.spec	26 Jul 2009 06:42:43 -0000	1.4
+++ perl-IO-TieCombine.spec	7 Dec 2009 10:45:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-IO-TieCombine 
 Version:    1.000 
-Release:    4%{?dist}
+Release:    5%{?dist}
 # see lib/IO/TieCombine.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.000-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.000-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:46:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:46:27 +0000 (UTC)
Subject: rpms/perl-DBD-Mock/devel perl-DBD-Mock.spec,1.9,1.10
Message-ID: <20091207104627.DB62B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-Mock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19262

Modified Files:
	perl-DBD-Mock.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-Mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-Mock/devel/perl-DBD-Mock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-DBD-Mock.spec	26 Jul 2009 05:20:25 -0000	1.9
+++ perl-DBD-Mock.spec	7 Dec 2009 10:46:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Mock
 Version:        1.39
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mock database driver for testing
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.39-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.39-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atkac at fedoraproject.org  Mon Dec  7 10:48:43 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  7 Dec 2009 10:48:43 +0000 (UTC)
Subject: rpms/swig/devel swig.spec,1.51,1.52
Message-ID: <20091207104843.E0A5811C00EE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/swig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19979

Modified Files:
	swig.spec 
Log Message:
- package review related fixes (#226442)



Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- swig.spec	2 Sep 2009 12:53:12 -0000	1.51
+++ swig.spec	7 Dec 2009 10:48:43 -0000	1.52
@@ -1,11 +1,11 @@
 %{!?tcl:%define tcl 1}
 %{!?guile:%define guile 1}
 
-Summary: Connects C/C++/Objective C to some high-level programming languages.
+Summary: Connects C/C++/Objective C to some high-level programming languages
 Name: swig
 Version: 1.3.40
-Release: 1%{?dist}
-License: BSD
+Release: 2%{?dist}
+License: BSD and MIT
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
 Source: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
@@ -19,7 +19,7 @@ BuildRequires: tcl-devel
 %if %{guile}
 BuildRequires: guile-devel
 %endif
-BuildRequires: autoconf, automake, gawk
+BuildRequires: autoconf, automake, gawk, dos2unix
 
 %description
 Simplified Wrapper and Interface Generator (SWIG) is a software
@@ -28,7 +28,7 @@ variety of high-level programming langua
 with Perl, Python and Tcl/TK, but it has also been extended to Java,
 Eiffel and Guile.  SWIG is normally used to create high-level
 interpreted programming environments, systems integration, and as a
-tool for building user interfaces.
+tool for building user interfaces
 
 %package doc
 Summary: Documentation files for SWIG
@@ -37,7 +37,7 @@ Group: Development/Tools
 BuildArch: noarch
 
 %description doc
-This package contains documentation for SWIG and useful examples.
+This package contains documentation for SWIG and useful examples
 
 %prep
 %setup -q -n swig-%{version}
@@ -63,19 +63,36 @@ EOF
 %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
+for all in CHANGES README; do
+	iconv -f ISO88591 -t UTF8 < $all > $all.new
+	touch -r $all $all.new
+	mv -f $all.new $all
+done
+
 %build
 ./autogen.sh
 %configure
 make %{?_smp_mflags}
+
+# Test suite is currently broken
 #make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# Remove all arch dependent files in Examples/
 pushd Examples/
-for all in `find Makefile.in`; do
-    rm -f "${all%%.in}"
+# Remove all arch dependent files in Examples/
+find -type f -name 'Makefile.in' | xargs rm -f --
+
+# We don't want to ship files below.
+rm -rf test-suite
+find -type f -name '*.dsp' | xargs rm -f --
+find -type f -name '*.dsw' | xargs rm -f --
+
+# Convert files to UNIX format
+for all in `find -type f`; do
+	dos2unix -k $all
+	chmod -x $all
 done
 popd
 
@@ -84,21 +101,21 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/swig
 %{_mandir}/man1/ccache-swig.1*
+%doc ANNOUNCE CHANGES FUTURE INSTALL LICENSE NEW README TODO
 
 %files doc
-%doc ANNOUNCE CHANGES FUTURE INSTALL LICENSE NEW README TODO
+%defattr(-,root,root,-)
 %doc Doc Examples
 
 %changelog
+* Mon Dec 07 2009 Adam Tkac <atkac redhat com> 1.3.40-2
+- package review related fixes (#226442)
+
 * Wed Sep 02 2009 Adam Tkac <atkac redhat com> 1.3.40-1
 - update to 1.3.40
 



From kasal at fedoraproject.org  Mon Dec  7 10:49:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:49:29 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/devel perl-Bio-Graphics.spec,1.7,1.8
Message-ID: <20091207104929.8E64911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Bio-Graphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20357

Modified Files:
	perl-Bio-Graphics.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Bio-Graphics/devel/perl-Bio-Graphics.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Bio-Graphics.spec	26 Jul 2009 03:51:22 -0000	1.7
+++ perl-Bio-Graphics.spec	7 Dec 2009 10:49:29 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Bio-Graphics
 Version:        1.97
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.97-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.97-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:49:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:49:30 +0000 (UTC)
Subject: rpms/perl-IO-String/devel perl-IO-String.spec,1.13,1.14
Message-ID: <20091207104930.B7AAE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-String/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20380

Modified Files:
	perl-IO-String.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-String.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-String/devel/perl-IO-String.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-IO-String.spec	26 Jul 2009 06:42:29 -0000	1.13
+++ perl-IO-String.spec	7 Dec 2009 10:49:30 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-IO-String
 Version:        1.08
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Emulate file interface for in-core strings
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.08-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcepl at fedoraproject.org  Mon Dec  7 10:50:22 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  7 Dec 2009 10:50:22 +0000 (UTC)
Subject: rpms/ldapvi/EL-4 ldapvi.spec,1.11,1.12
Message-ID: <20091207105022.8838611C03E3@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20814

Modified Files:
	ldapvi.spec 
Log Message:
Make .spec file universal for Fedora and RHEL (fixes #543913)


Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/EL-4/ldapvi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ldapvi.spec	19 Sep 2009 20:03:44 -0000	1.11
+++ ldapvi.spec	7 Dec 2009 10:50:22 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ldapvi
 Version:        1.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
@@ -12,8 +12,12 @@ Patch1:         %{name}-1.7-getline.patc
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
-BuildRequires:  popt-devel, libxslt, glib2-devel, openssl-devel
-
+BuildRequires:  libxslt, glib2-devel, openssl-devel
+%if 0%{rhel}
+BuildRequires: popt
+%else
+BuildRequires: popt-devel
+%endif
 
 %description
 ldapvi is an interactive LDAP client for Unix terminals. Using it, you can
@@ -51,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 07 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-10
+- Improving .spec file to work both on Fedora and RHEL
+
 * Fri Sep 18 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-9
 - Fixed build to cure FTBFS (#511746)
   Thanks for sharkcz for making the patch



From kasal at fedoraproject.org  Mon Dec  7 10:51:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:51:37 +0000 (UTC)
Subject: rpms/perl-DBD-CSV/devel perl-DBD-CSV.spec,1.8,1.9
Message-ID: <20091207105137.C4B0311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-CSV/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21302

Modified Files:
	perl-DBD-CSV.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-CSV.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-CSV/devel/perl-DBD-CSV.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-DBD-CSV.spec	26 Jul 2009 05:20:09 -0000	1.8
+++ perl-DBD-CSV.spec	7 Dec 2009 10:51:37 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-DBD-CSV
 Version:        0.22
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        DBI driver for CSV files
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:54:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:54:01 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/devel perl-IO-Socket-SSL.spec,1.26,1.27
Message-ID: <20091207105401.D1B0311C02C8@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22165

Modified Files:
	perl-IO-Socket-SSL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- perl-IO-Socket-SSL.spec	27 Sep 2009 21:01:01 -0000	1.26
+++ perl-IO-Socket-SSL.spec	7 Dec 2009 10:54:01 -0000	1.27
@@ -5,7 +5,7 @@
 
 Name:		perl-IO-Socket-SSL
 Version:	1.31
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -61,6 +61,9 @@ done
 %{_mandir}/man3/IO::Socket::SSL.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.31-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Paul Howarth <paul at city-fan.org> - 1.31-1
 - Update to 1.31 (see Changes for details)
 



From kasal at fedoraproject.org  Mon Dec  7 10:54:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:54:01 +0000 (UTC)
Subject: rpms/perl-Bio-ASN1-EntrezGene/devel perl-Bio-ASN1-EntrezGene.spec,
	1.7, 1.8
Message-ID: <20091207105401.C8C5F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Bio-ASN1-EntrezGene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22168

Modified Files:
	perl-Bio-ASN1-EntrezGene.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Bio-ASN1-EntrezGene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Bio-ASN1-EntrezGene/devel/perl-Bio-ASN1-EntrezGene.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Bio-ASN1-EntrezGene.spec	26 Jul 2009 03:51:09 -0000	1.7
+++ perl-Bio-ASN1-EntrezGene.spec	7 Dec 2009 10:54:01 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Bio-ASN1-EntrezGene
 Version:        1.091
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Regular expression-based Perl Parser for NCBI Entrez Gene
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.091-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.091-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 10:56:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:56:05 +0000 (UTC)
Subject: rpms/perl-DBD-AnyData/devel perl-DBD-AnyData.spec,1.7,1.8
Message-ID: <20091207105605.3496111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DBD-AnyData/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23250

Modified Files:
	perl-DBD-AnyData.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DBD-AnyData.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-AnyData/devel/perl-DBD-AnyData.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-DBD-AnyData.spec	26 Jul 2009 05:19:54 -0000	1.7
+++ perl-DBD-AnyData.spec	7 Dec 2009 10:56:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DBD-AnyData
 Version:        0.09
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        DBI access to XML, CSV and other formats 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atkac at fedoraproject.org  Mon Dec  7 10:56:30 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  7 Dec 2009 10:56:30 +0000 (UTC)
Subject: rpms/swig/devel swig.spec,1.52,1.53
Message-ID: <20091207105630.944BF11C00EE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/swig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23415

Modified Files:
	swig.spec 
Log Message:
s/_builddir/RPM_BUILD_DIR/



Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- swig.spec	7 Dec 2009 10:48:43 -0000	1.52
+++ swig.spec	7 Dec 2009 10:56:30 -0000	1.53
@@ -52,7 +52,7 @@ cat << \EOF > %{name}-prov
 %{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-doc-%{version}\S+||'`
 EOF
 
-%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
+%define __perl_provides $RPM_BUILD_DIR/%{name}-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-req
@@ -60,7 +60,7 @@ cat << \EOF > %{name}-req
 %{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-doc-%{version}\S+||'`
 EOF
 
-%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+%define __perl_requires $RPM_BUILD_DIR/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
 for all in CHANGES README; do



From kasal at fedoraproject.org  Mon Dec  7 10:58:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:58:11 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check-StashChange/devel
	perl-B-Hooks-OP-Check-StashChange.spec, 1.2, 1.3
Message-ID: <20091207105811.8447E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check-StashChange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24166

Modified Files:
	perl-B-Hooks-OP-Check-StashChange.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-B-Hooks-OP-Check-StashChange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-B-Hooks-OP-Check-StashChange/devel/perl-B-Hooks-OP-Check-StashChange.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-B-Hooks-OP-Check-StashChange.spec	26 Jul 2009 01:47:48 -0000	1.2
+++ perl-B-Hooks-OP-Check-StashChange.spec	7 Dec 2009 10:58:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-B-Hooks-OP-Check-StashChange
 Version:        0.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Invoke callbacks when the stash code is being compiled in changes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcepl at fedoraproject.org  Mon Dec  7 10:58:53 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  7 Dec 2009 10:58:53 +0000 (UTC)
Subject: rpms/ldapvi/EL-4 ldapvi.spec,1.12,1.13
Message-ID: <20091207105853.5E6B811C00EE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24459

Modified Files:
	ldapvi.spec 
Log Message:
Fix the conditional


Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/EL-4/ldapvi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ldapvi.spec	7 Dec 2009 10:50:22 -0000	1.12
+++ ldapvi.spec	7 Dec 2009 10:58:53 -0000	1.13
@@ -13,7 +13,7 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
 BuildRequires:  libxslt, glib2-devel, openssl-devel
-%if 0%{rhel}
+%if 0%{?rhel}
 BuildRequires: popt
 %else
 BuildRequires: popt-devel



From kasal at fedoraproject.org  Mon Dec  7 10:59:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 10:59:06 +0000 (UTC)
Subject: rpms/perl-IO-Socket-INET6/devel perl-IO-Socket-INET6.spec,1.9,1.10
Message-ID: <20091207105906.E270911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Socket-INET6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24555

Modified Files:
	perl-IO-Socket-INET6.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Socket-INET6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-INET6/devel/perl-IO-Socket-INET6.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-IO-Socket-INET6.spec	26 Jul 2009 06:41:59 -0000	1.9
+++ perl-IO-Socket-INET6.spec	7 Dec 2009 10:59:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-IO-Socket-INET6
 Version:        2.56
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl Object interface for AF_INET|AF_INET6 domain sockets
 
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.56-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.56-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcepl at fedoraproject.org  Mon Dec  7 11:01:39 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  7 Dec 2009 11:01:39 +0000 (UTC)
Subject: rpms/ldapvi/devel ldapvi.spec,1.11,1.12
Message-ID: <20091207110139.406CF11C00EE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25530

Modified Files:
	ldapvi.spec 
Log Message:
Make .spec file universal for Fedora and RHEL (fixes #543913)


Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/devel/ldapvi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ldapvi.spec	19 Sep 2009 20:03:44 -0000	1.11
+++ ldapvi.spec	7 Dec 2009 11:01:39 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ldapvi
 Version:        1.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
@@ -12,8 +12,12 @@ Patch1:         %{name}-1.7-getline.patc
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
-BuildRequires:  popt-devel, libxslt, glib2-devel, openssl-devel
-
+BuildRequires:  libxslt, glib2-devel, openssl-devel
+%if 0%{?rhel}
+BuildRequires: popt
+%else
+BuildRequires: popt-devel
+%endif
 
 %description
 ldapvi is an interactive LDAP client for Unix terminals. Using it, you can
@@ -51,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 07 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-10
+- Improving .spec file to work both on Fedora and RHEL
+
 * Fri Sep 18 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-9
 - Fixed build to cure FTBFS (#511746)
   Thanks for sharkcz for making the patch



From kasal at fedoraproject.org  Mon Dec  7 11:03:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:03:27 +0000 (UTC)
Subject: rpms/perl-IO-Prompt/devel perl-IO-Prompt.spec,1.6,1.7
Message-ID: <20091207110327.9CD4311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Prompt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26075

Modified Files:
	perl-IO-Prompt.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Prompt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Prompt/devel/perl-IO-Prompt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-IO-Prompt.spec	26 Jul 2009 06:41:45 -0000	1.6
+++ perl-IO-Prompt.spec	7 Dec 2009 11:03:27 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-Prompt
 Version:        0.99.4 
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Interactively prompt for user input
 
 Group:    Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.99.4-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:03:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:03:43 +0000 (UTC)
Subject: rpms/perl-B-Hooks-OP-Check/devel perl-B-Hooks-OP-Check.spec, 1.3,
	1.4
Message-ID: <20091207110343.13FED11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-B-Hooks-OP-Check/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26220

Modified Files:
	perl-B-Hooks-OP-Check.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-B-Hooks-OP-Check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-B-Hooks-OP-Check/devel/perl-B-Hooks-OP-Check.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-B-Hooks-OP-Check.spec	26 Jul 2009 01:47:31 -0000	1.3
+++ perl-B-Hooks-OP-Check.spec	7 Dec 2009 11:03:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-B-Hooks-OP-Check
 Version:    0.17
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/B/Hooks/OP/Check.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.17-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:04:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:04:27 +0000 (UTC)
Subject: rpms/perl-Date-Tiny/devel perl-Date-Tiny.spec,1.3,1.4
Message-ID: <20091207110427.1AC5111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Date-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26525

Modified Files:
	perl-Date-Tiny.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Date-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Tiny/devel/perl-Date-Tiny.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Date-Tiny.spec	26 Jul 2009 05:33:35 -0000	1.3
+++ perl-Date-Tiny.spec	7 Dec 2009 11:04:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Date-Tiny
 Version:        1.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Date object with as little code as possible
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:08:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:08:51 +0000 (UTC)
Subject: rpms/perl-IO-Null/devel perl-IO-Null.spec,1.6,1.7
Message-ID: <20091207110851.E9CBD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Null/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27554

Modified Files:
	perl-IO-Null.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Null.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Null/devel/perl-IO-Null.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-IO-Null.spec	26 Jul 2009 06:41:31 -0000	1.6
+++ perl-IO-Null.spec	7 Dec 2009 11:08:51 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-IO-Null
 Version:        1.01
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Class for null filehandles
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:09:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:09:26 +0000 (UTC)
Subject: rpms/perl-B-Hooks-EndOfScope/devel perl-B-Hooks-EndOfScope.spec, 1.5,
	1.6
Message-ID: <20091207110926.045D911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-B-Hooks-EndOfScope/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27808

Modified Files:
	perl-B-Hooks-EndOfScope.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-B-Hooks-EndOfScope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-B-Hooks-EndOfScope/devel/perl-B-Hooks-EndOfScope.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-B-Hooks-EndOfScope.spec	26 Jul 2009 01:47:11 -0000	1.5
+++ perl-B-Hooks-EndOfScope.spec	7 Dec 2009 11:09:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-B-Hooks-EndOfScope
 Version:    0.08
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see lib/B/Hooks/EndOfScope.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcepl at fedoraproject.org  Mon Dec  7 11:09:31 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  7 Dec 2009 11:09:31 +0000 (UTC)
Subject: rpms/ldapvi/F-11 ldapvi.spec,1.9,1.10
Message-ID: <20091207110931.DCE2511C00EE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27851

Modified Files:
	ldapvi.spec 
Log Message:
Make .spec file universal for Fedora and RHEL (fixes #543913)


Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/F-11/ldapvi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ldapvi.spec	19 Sep 2009 20:41:40 -0000	1.9
+++ ldapvi.spec	7 Dec 2009 11:09:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ldapvi
 Version:        1.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
@@ -12,8 +12,12 @@ Patch1:         %{name}-1.7-getline.patc
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
-BuildRequires:  popt-devel, libxslt, glib2-devel, openssl-devel
-
+BuildRequires:  libxslt, glib2-devel, openssl-devel
+%if 0%{?rhel}
+BuildRequires: popt
+%else
+BuildRequires: popt-devel
+%endif
 
 %description
 ldapvi is an interactive LDAP client for Unix terminals. Using it, you can
@@ -51,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 07 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-10
+- Improving .spec file to work both on Fedora and RHEL
+
 * Fri Sep 18 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-9
 - Fixed build to cure FTBFS (#511746)
   Thanks for sharkcz for making the patch



From mcepl at fedoraproject.org  Mon Dec  7 11:09:42 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  7 Dec 2009 11:09:42 +0000 (UTC)
Subject: rpms/ldapvi/F-12 ldapvi.spec,1.11,1.12
Message-ID: <20091207110942.6D60E11C00EE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27992

Modified Files:
	ldapvi.spec 
Log Message:
Make .spec file universal for Fedora and RHEL (fixes #543913)


Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/F-12/ldapvi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ldapvi.spec	19 Sep 2009 20:03:44 -0000	1.11
+++ ldapvi.spec	7 Dec 2009 11:09:42 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ldapvi
 Version:        1.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
@@ -12,8 +12,12 @@ Patch1:         %{name}-1.7-getline.patc
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
-BuildRequires:  popt-devel, libxslt, glib2-devel, openssl-devel
-
+BuildRequires:  libxslt, glib2-devel, openssl-devel
+%if 0%{?rhel}
+BuildRequires: popt
+%else
+BuildRequires: popt-devel
+%endif
 
 %description
 ldapvi is an interactive LDAP client for Unix terminals. Using it, you can
@@ -51,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 07 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-10
+- Improving .spec file to work both on Fedora and RHEL
+
 * Fri Sep 18 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-9
 - Fixed build to cure FTBFS (#511746)
   Thanks for sharkcz for making the patch



From kasal at fedoraproject.org  Mon Dec  7 11:09:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:09:53 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy/devel perl-DateTimeX-Easy.spec,1.5,1.6
Message-ID: <20091207110953.921AD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTimeX-Easy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28143

Modified Files:
	perl-DateTimeX-Easy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTimeX-Easy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTimeX-Easy/devel/perl-DateTimeX-Easy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-DateTimeX-Easy.spec	4 Aug 2009 07:30:58 -0000	1.5
+++ perl-DateTimeX-Easy.spec	7 Dec 2009 11:09:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-DateTimeX-Easy
 Version:    0.087
-Release:    3%{?dist}
+Release:    4%{?dist}
 # see lib/DateTimeX/Easy.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.087-4
+- rebuild against perl 5.10.1
+
 * Tue Aug 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.087-3
 - Fix mass rebuild breakdown: Add --skipdeps.
 - Use Test::Most.



From kasal at fedoraproject.org  Mon Dec  7 11:13:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:13:09 +0000 (UTC)
Subject: rpms/perl-IO-Multiplex/devel perl-IO-Multiplex.spec,1.9,1.10
Message-ID: <20091207111309.66C0911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Multiplex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29128

Modified Files:
	perl-IO-Multiplex.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Multiplex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Multiplex/devel/perl-IO-Multiplex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-IO-Multiplex.spec	26 Jul 2009 06:41:17 -0000	1.9
+++ perl-IO-Multiplex.spec	7 Dec 2009 11:13:09 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	IO-Multiplex module for perl
 Name:		perl-IO-Multiplex
 Version:	1.10
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/IO-Multiplex/
@@ -45,6 +45,9 @@ one or more listen sockets.
 %{_mandir}/man3/IO::Multiplex.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.10-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcepl at fedoraproject.org  Mon Dec  7 11:15:10 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  7 Dec 2009 11:15:10 +0000 (UTC)
Subject: rpms/ldapvi/EL-5 ldapvi.spec,1.1,1.2
Message-ID: <20091207111510.2EFE211C00EE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29681

Modified Files:
	ldapvi.spec 
Log Message:
Make .spec file universal for Fedora and RHEL (fixes #543913)


Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/EL-5/ldapvi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ldapvi.spec	6 Jul 2007 09:14:15 -0000	1.1
+++ ldapvi.spec	7 Dec 2009 11:15:09 -0000	1.2
@@ -1,18 +1,23 @@
 Name:           ldapvi
 Version:        1.7
-Release:        1%{?dist}
+Release:        10%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
-License:        GPL
+License:        GPLv2+
 URL:            http://www.lichteblau.com/ldapvi/
 Source0:        http://www.lichteblau.com/download/ldapvi-%{version}.tar.gz
 Patch0:         GNUmakefile.in.patch
+Patch1:         %{name}-1.7-getline.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
-BuildRequires:  popt, libxslt, glib2-devel, openssl-devel
-
+BuildRequires:  libxslt, glib2-devel, openssl-devel
+%if 0%{?rhel}
+BuildRequires: popt
+%else
+BuildRequires: popt-devel
+%endif
 
 %description
 ldapvi is an interactive LDAP client for Unix terminals. Using it, you can
@@ -21,7 +26,8 @@ it as vipw(1) for LDAP.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p0 -b .gnumk
+%patch1 -p2 -b .getline
 
 
 %build
@@ -49,5 +55,33 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 07 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-10
+- Improving .spec file to work both on Fedora and RHEL
+
+* Fri Sep 18 2009 Mat?j Cepl <mcepl at redhat.com> - 1.7-9
+- Fixed build to cure FTBFS (#511746)
+  Thanks for sharkcz for making the patch
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.7-7
+- rebuild with new openssl
+
+* Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7-6
+- fix license tag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.7-5
+- Autorebuild for GCC 4.3
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.7-4
+ - Rebuild for deps
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.7-3
+- Build Require popt-devel instead of popt.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.7-2
+- Rebuild for selinux ppc32 issue.
+
 * Thu Jul 05 2007 Gavin Henry <ghenry at suretecsystems.com> - 1.7-1
 - Initial version



From kasal at fedoraproject.org  Mon Dec  7 11:15:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:15:26 +0000 (UTC)
Subject: rpms/perl-DateTime-Set/devel perl-DateTime-Set.spec,1.9,1.10
Message-ID: <20091207111526.22F0A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Set/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29802

Modified Files:
	perl-DateTime-Set.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Set.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Set/devel/perl-DateTime-Set.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-DateTime-Set.spec	26 Jul 2009 05:39:37 -0000	1.9
+++ perl-DateTime-Set.spec	7 Dec 2009 11:15:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Set
 Version:        0.26
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Datetime sets and set math
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.26-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:15:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:15:46 +0000 (UTC)
Subject: rpms/perl-Best/devel perl-Best.spec,1.2,1.3
Message-ID: <20091207111546.2C03011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Best/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29990

Modified Files:
	perl-Best.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Best.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Best/devel/perl-Best.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Best.spec	26 Jul 2009 03:50:53 -0000	1.2
+++ perl-Best.spec	7 Dec 2009 11:15:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Best 
 Version:    0.12 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # note that README says "perl", but the actual source says "MIT"
 # lib/Best.pm -> MIT
 License:    MIT 
@@ -56,6 +56,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kzak at fedoraproject.org  Mon Dec  7 11:17:37 2009
From: kzak at fedoraproject.org (kzak)
Date: Mon,  7 Dec 2009 11:17:37 +0000 (UTC)
Subject: rpms/util-linux-ng/devel mount.tmpfs, 1.3, 1.4 util-linux-ng.spec, 
	1.66, 1.67
Message-ID: <20091207111737.742A611C00EE@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30464

Modified Files:
	mount.tmpfs util-linux-ng.spec 
Log Message:
* Mon Dec  7 2009  Karel Zak <kzak at redhat.com> 2.17-0.4
- add clock.8 man page (manlink to hwclock)
- add --help to mount.tmpfs



Index: mount.tmpfs
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/mount.tmpfs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mount.tmpfs	20 Mar 2009 09:13:48 -0000	1.3
+++ mount.tmpfs	7 Dec 2009 11:17:37 -0000	1.4
@@ -10,6 +10,14 @@
 # /sbin/mount.tmpfs spec dir [-sfnv] [-o options]
 #
 
+case $1 in
+  -h|--help|-?)
+      echo "mount.tmpfs is a private mount(8) wrapper for tmpfs."
+      echo "Don't use it directly!"
+      exit 1
+      ;;
+esac
+
 if ! echo "$@" | grep -q -E '(fs|def|root)?context='; then
   con=$(ls --scontext -d "$2" | cut -f 1 -d ' ')
   if [ -n "$con" ] && [ "$con" != "?" ] && [ "$con" != "unlabeled" ]; then 


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- util-linux-ng.spec	23 Nov 2009 12:34:10 -0000	1.66
+++ util-linux-ng.spec	7 Dec 2009 11:17:37 -0000	1.67
@@ -4,7 +4,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.17
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -303,7 +303,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/su
 
 ln -sf ../../sbin/hwclock ${RPM_BUILD_ROOT}/usr/sbin/hwclock
 ln -sf hwclock ${RPM_BUILD_ROOT}/sbin/clock
-
+echo ".so man8/hwclock.8" > ${RPM_BUILD_ROOT}%{_mandir}/man8/clock.8
 
 # remove libtool junk  (TODO)
 #rm -f ${RPM_BUILD_ROOT}/%{_lib}/libblkid.la
@@ -324,7 +324,7 @@ for I in /usr/{bin,sbin}/{fdformat,tunel
          %{_mandir}/man8/{fdformat,tunelp,floppy}.8* \
          /sbin/{hwclock,clock} \
 	 /usr/sbin/hwclock \
-         %{_mandir}/man8/hwclock.8*; do
+         %{_mandir}/man8/{hwclock,clock}.8*; do
 	
 	rm -f $RPM_BUILD_ROOT$I
 done
@@ -641,6 +641,7 @@ fi
 %{_mandir}/man8/fdformat.8*
 %{_mandir}/man8/floppy.8*
 %{_mandir}/man8/hwclock.8*
+%{_mandir}/man8/clock.8*
 %{_mandir}/man8/tunelp.8*
 %endif
 
@@ -710,6 +711,10 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009  Karel Zak <kzak at redhat.com> 2.17-0.4
+- add clock.8 man page (manlink to hwclock)
+- add --help to mount.tmpfs
+
 * Mon Nov 23 2009  Karel Zak <kzak at redhat.com> 2.17-0.3
 - upgrade to 2.17-rc1
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc1-ChangeLog



From kasal at fedoraproject.org  Mon Dec  7 11:17:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:17:35 +0000 (UTC)
Subject: rpms/perl-IO-Interface/devel perl-IO-Interface.spec,1.12,1.13
Message-ID: <20091207111735.F1AF111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Interface/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30449

Modified Files:
	perl-IO-Interface.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Interface.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Interface/devel/perl-IO-Interface.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-IO-Interface.spec	26 Jul 2009 06:40:49 -0000	1.12
+++ perl-IO-Interface.spec	7 Dec 2009 11:17:35 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-IO-Interface
 Version:        1.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for accessing network card configuration information
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:21:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:21:29 +0000 (UTC)
Subject: rpms/perl-DateTime-Precise/devel perl-DateTime-Precise.spec, 1.4,
	1.5
Message-ID: <20091207112129.62E5D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Precise/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31345

Modified Files:
	perl-DateTime-Precise.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Precise.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Precise/devel/perl-DateTime-Precise.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-DateTime-Precise.spec	26 Jul 2009 05:39:23 -0000	1.4
+++ perl-DateTime-Precise.spec	7 Dec 2009 11:21:29 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Precise
 Version:        1.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Perform common time and date operations with additional GPS operations
 
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:21:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:21:44 +0000 (UTC)
Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.25,1.26
Message-ID: <20091207112144.DA68D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-BerkeleyDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31532

Modified Files:
	perl-BerkeleyDB.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-BerkeleyDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-BerkeleyDB.spec	2 Sep 2009 18:30:44 -0000	1.25
+++ perl-BerkeleyDB.spec	7 Dec 2009 11:21:44 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-BerkeleyDB
 Version:        0.39
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for Berkeley DB version 2, 3 or 4
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.39-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 29 2009 Steven Pritchard <steve at kspei.com> 0.39-1
 - Update to 0.39.
 



From kasal at fedoraproject.org  Mon Dec  7 11:22:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:22:22 +0000 (UTC)
Subject: rpms/perl-IO-Digest/devel perl-IO-Digest.spec,1.6,1.7
Message-ID: <20091207112222.0C34911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Digest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31775

Modified Files:
	perl-IO-Digest.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Digest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Digest/devel/perl-IO-Digest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-IO-Digest.spec	26 Jul 2009 06:40:35 -0000	1.6
+++ perl-IO-Digest.spec	7 Dec 2009 11:22:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-IO-Digest
 Version:        0.10
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Calculate digests while reading or writing
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:26:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:26:31 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-W3CDTF/devel
	perl-DateTime-Format-W3CDTF.spec, 1.7, 1.8
Message-ID: <20091207112631.D6D0411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-W3CDTF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv384

Modified Files:
	perl-DateTime-Format-W3CDTF.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-W3CDTF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-W3CDTF/devel/perl-DateTime-Format-W3CDTF.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-DateTime-Format-W3CDTF.spec	26 Jul 2009 05:39:11 -0000	1.7
+++ perl-DateTime-Format-W3CDTF.spec	7 Dec 2009 11:26:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-W3CDTF
 Version:        0.04
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Parse and format W3CDTF datetime strings
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:27:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:27:43 +0000 (UTC)
Subject: rpms/perl-Beanstalk-Client/devel perl-Beanstalk-Client.spec, 1.1,
	1.2
Message-ID: <20091207112743.C360611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Beanstalk-Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv711

Modified Files:
	perl-Beanstalk-Client.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Beanstalk-Client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Beanstalk-Client/devel/perl-Beanstalk-Client.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Beanstalk-Client.spec	7 Aug 2009 20:55:24 -0000	1.1
+++ perl-Beanstalk-Client.spec	7 Dec 2009 11:27:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Beanstalk-Client
 Version:        1.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Client class to talk to a beanstalkd server
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-3
+- rebuild against perl 5.10.1
+
 * Wed Jul 29 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.05-2
 - Review fixes (#513869)
 



From kasal at fedoraproject.org  Mon Dec  7 11:27:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:27:52 +0000 (UTC)
Subject: rpms/perl-IO-CaptureOutput/devel perl-IO-CaptureOutput.spec, 1.11, 
	1.12
Message-ID: <20091207112752.3268011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-CaptureOutput/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv781

Modified Files:
	perl-IO-CaptureOutput.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-CaptureOutput.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-CaptureOutput/devel/perl-IO-CaptureOutput.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-IO-CaptureOutput.spec	26 Jul 2009 06:40:05 -0000	1.11
+++ perl-IO-CaptureOutput.spec	7 Dec 2009 11:27:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-IO-CaptureOutput
 Version:        1.1101
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Capture STDOUT/STDERR from subprocesses and XS/C modules
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1101-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1101-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:31:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:31:17 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Strptime/devel
	perl-DateTime-Format-Strptime.spec, 1.9, 1.10
Message-ID: <20091207113117.CDEF411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1648

Modified Files:
	perl-DateTime-Format-Strptime.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-Strptime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/devel/perl-DateTime-Format-Strptime.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-DateTime-Format-Strptime.spec	26 Jul 2009 05:38:56 -0000	1.9
+++ perl-DateTime-Format-Strptime.spec	7 Dec 2009 11:31:17 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Strptime
 Version:        1.0800
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse and format strp and strf time patterns
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.0800-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0800-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:33:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:33:24 +0000 (UTC)
Subject: rpms/perl-BDB/devel perl-BDB.spec,1.9,1.10
Message-ID: <20091207113324.58CB711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2198

Modified Files:
	perl-BDB.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-BDB.spec	31 Aug 2009 15:21:53 -0000	1.9
+++ perl-BDB.spec	7 Dec 2009 11:33:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-BDB
 Version:        1.84
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Asynchronous Berkeley DB access
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.84-2
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.84-1
 - Update to 1.84
 - Add Patch to get rid of common:sense



From kasal at fedoraproject.org  Mon Dec  7 11:33:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:33:57 +0000 (UTC)
Subject: rpms/perl-IO-Capture/devel perl-IO-Capture.spec,1.7,1.8
Message-ID: <20091207113357.98D6811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Capture/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2416

Modified Files:
	perl-IO-Capture.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Capture.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Capture/devel/perl-IO-Capture.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-IO-Capture.spec	26 Jul 2009 06:39:49 -0000	1.7
+++ perl-IO-Capture.spec	7 Dec 2009 11:33:57 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-IO-Capture
 Version:        0.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Abstract Base Class to build modules to capture output
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:35:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:35:42 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-SQLite/devel
	perl-DateTime-Format-SQLite.spec, 1.3, 1.4
Message-ID: <20091207113542.50BF411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-SQLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2908

Modified Files:
	perl-DateTime-Format-SQLite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-SQLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-SQLite/devel/perl-DateTime-Format-SQLite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-DateTime-Format-SQLite.spec	26 Jul 2009 05:38:43 -0000	1.3
+++ perl-DateTime-Format-SQLite.spec	7 Dec 2009 11:35:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-DateTime-Format-SQLite 
 Version:    0.10 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/DateTime/Format/SQLite.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:37:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:37:33 +0000 (UTC)
Subject: rpms/Perlbal/devel Perlbal.spec,1.8,1.9
Message-ID: <20091207113733.BA60411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/Perlbal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3507

Modified Files:
	Perlbal.spec 
Log Message:
- rebuild against perl 5.10.1


Index: Perlbal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Perlbal/devel/Perlbal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- Perlbal.spec	24 Jul 2009 15:44:39 -0000	1.8
+++ Perlbal.spec	7 Dec 2009 11:37:33 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           Perlbal
 Version:        1.70
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Reverse-proxy load balancer and webserver
 License:        GPL+ or Artistic
 Group:          System Environment/Daemons
@@ -96,6 +96,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.70-5
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.70-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:38:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:38:45 +0000 (UTC)
Subject: rpms/perl-IO-Async/devel perl-IO-Async.spec,1.3,1.4
Message-ID: <20091207113845.CAF7811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-Async/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4009

Modified Files:
	perl-IO-Async.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-Async.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/devel/perl-IO-Async.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-IO-Async.spec	31 Aug 2009 13:33:42 -0000	1.3
+++ perl-IO-Async.spec	7 Dec 2009 11:38:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-IO-Async
 Version:        0.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of modules that implement asynchronous filehandle IO
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.23-2
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 0.23-1
 - Update to 0.23
 



From atkac at fedoraproject.org  Mon Dec  7 11:38:56 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  7 Dec 2009 11:38:56 +0000 (UTC)
Subject: rpms/swig/devel swig.spec,1.53,1.54
Message-ID: <20091207113856.5DEC211C00EE@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/swig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3751

Modified Files:
	swig.spec 
Log Message:
Fix build issues:
- s/$RPM_BUILD_ROOT/%{buildroot}
- s/$RPM_BUILD_DIR/%{_builddir}



Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- swig.spec	7 Dec 2009 10:56:30 -0000	1.53
+++ swig.spec	7 Dec 2009 11:38:56 -0000	1.54
@@ -52,7 +52,7 @@ cat << \EOF > %{name}-prov
 %{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-doc-%{version}\S+||'`
 EOF
 
-%define __perl_provides $RPM_BUILD_DIR/%{name}-%{version}/%{name}-prov
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-req
@@ -60,7 +60,7 @@ cat << \EOF > %{name}-req
 %{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-doc-%{version}\S+||'`
 EOF
 
-%define __perl_requires $RPM_BUILD_DIR/%{name}-%{version}/%{name}-req
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
 for all in CHANGES README; do
@@ -78,7 +78,7 @@ make %{?_smp_mflags}
 #make check
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 pushd Examples/
 # Remove all arch dependent files in Examples/
@@ -96,10 +96,10 @@ for all in `find -type f`; do
 done
 popd
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)



From kasal at fedoraproject.org  Mon Dec  7 11:39:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:39:53 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/devel perl-DateTime-Format-Pg.spec, 1.6,
	1.7
Message-ID: <20091207113953.BEDB211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Pg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4559

Modified Files:
	perl-DateTime-Format-Pg.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-Pg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Pg/devel/perl-DateTime-Format-Pg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-DateTime-Format-Pg.spec	18 Aug 2009 18:56:54 -0000	1.6
+++ perl-DateTime-Format-Pg.spec	7 Dec 2009 11:39:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Pg
 Version:        0.16004
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parse and format PostgreSQL dates and times
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16004-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16004-1
 - auto-update to 0.16004 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)



From dodji at fedoraproject.org  Mon Dec  7 11:41:27 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  7 Dec 2009 11:41:27 +0000 (UTC)
Subject: rpms/nemiver/F-11 .cvsignore, 1.20, 1.21 nemiver.spec, 1.28,
	1.29 sources, 1.20, 1.21
Message-ID: <20091207114127.C675D11C00EE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3814

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
* Sun Dec 06 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
- Update to new upstream release (0.7.3)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	12 Sep 2009 20:43:28 -0000	1.20
+++ .cvsignore	7 Dec 2009 11:41:27 -0000	1.21
@@ -2,3 +2,4 @@ nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
 nemiver-0.7.1.tar.bz2
 nemiver-0.7.2.tar.bz2
+nemiver-0.7.3.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/nemiver.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nemiver.spec	12 Sep 2009 20:39:10 -0000	1.28
+++ nemiver.spec	7 Dec 2009 11:41:27 -0000	1.29
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.2
+Version:	0.7.3
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -143,6 +143,9 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Sun Dec 06 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
+- Update to new upstream release (0.7.3)
+
 * Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
 - Update to new upstream release (0.7.2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	12 Sep 2009 20:43:28 -0000	1.20
+++ sources	7 Dec 2009 11:41:27 -0000	1.21
@@ -2,3 +2,4 @@ eeb0f56cf70d26746f79486bd5437ac7  nemive
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
 9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2
 a80f3d47b4ebf7fafa0225185112f377  nemiver-0.7.2.tar.bz2
+7159d64bd78dc55aad892077fb75dfec  nemiver-0.7.3.tar.bz2



From mcepl at fedoraproject.org  Mon Dec  7 11:42:41 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon,  7 Dec 2009 11:42:41 +0000 (UTC)
Subject: rpms/ldapvi/EL-5 ldapvi-1.7-getline.patch,NONE,1.1
Message-ID: <20091207114241.5CA0211C00EE@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5549

Added Files:
	ldapvi-1.7-getline.patch 
Log Message:
Forgot to add the ldapvi-1.7-getline.patch

ldapvi-1.7-getline.patch:
 common.h |    2 +-
 ldapvi.c |    2 +-
 misc.c   |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE ldapvi-1.7-getline.patch ---
>From 256ced029c235687bfafdffd07be7d47bf7af39b Mon Sep 17 00:00:00 2001
From: David Lichteblau <david at lichteblau.com>
Date: Thu, 18 Jun 2009 20:07:42 +0200
Subject: [PATCH] renamed getline

---
 ldapvi/common.h |    2 +-
 ldapvi/ldapvi.c |    2 +-
 ldapvi/misc.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ldapvi/common.h b/ldapvi/common.h
index 4c264e8..f731e62 100644
--- a/ldapvi/common.h
+++ b/ldapvi/common.h
@@ -273,7 +273,7 @@ void pipeview_wait(int pid);
 char *home_filename(char *name);
 void read_ldapvi_history(void);
 void write_ldapvi_history(void);
-char *getline(char *prompt, char *value);
+char *ldapvi_getline(char *prompt, char *value);
 char *get_password();
 char *append(char *a, char *b);
 void *xalloc(size_t size);
diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c
index 9d7d77c..7b312f8 100644
--- a/ldapvi/ldapvi.c
+++ b/ldapvi/ldapvi.c
@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)
 		bo->authmethod = LDAP_AUTH_SASL;
 		puts("Switching to SASL authentication.");
 	}
-	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
+	bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
 }
 
 static int
diff --git a/ldapvi/misc.c b/ldapvi/misc.c
index 0a9dba9..3b6896e 100644
--- a/ldapvi/misc.c
+++ b/ldapvi/misc.c
@@ -315,7 +315,7 @@ write_ldapvi_history()
 }
 
 char *
-getline(char *prompt, char *value)
+ldapvi_getline(char *prompt, char *value)
 {
 	tdialog d;
 	init_dialog(&d, DIALOG_DEFAULT, prompt, value);
-- 
1.6.3.3




From kasal at fedoraproject.org  Mon Dec  7 11:44:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:44:03 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Oracle/devel
	perl-DateTime-Format-Oracle.spec, 1.6, 1.7
Message-ID: <20091207114403.BDC7611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Oracle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6187

Modified Files:
	perl-DateTime-Format-Oracle.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-Oracle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Oracle/devel/perl-DateTime-Format-Oracle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-DateTime-Format-Oracle.spec	26 Jul 2009 05:38:15 -0000	1.6
+++ perl-DateTime-Format-Oracle.spec	7 Dec 2009 11:44:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Oracle
 Version:        0.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse and format Oracle dates and timestamps
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:44:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:44:51 +0000 (UTC)
Subject: rpms/perl-POE-API-Peek/devel perl-POE-API-Peek.spec,1.9,1.10
Message-ID: <20091207114451.00E7211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE-API-Peek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6575

Modified Files:
	perl-POE-API-Peek.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE-API-Peek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-API-Peek/devel/perl-POE-API-Peek.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-POE-API-Peek.spec	25 Aug 2009 06:47:27 -0000	1.9
+++ perl-POE-API-Peek.spec	7 Dec 2009 11:44:50 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           perl-POE-API-Peek
 Epoch:          1
 Version:        1.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Peek into the internals of a running POE environment
 License:        BSD
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:1.34-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1:1.34-1
 - drop old workarounds
 - auto-update to 1.34 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Mon Dec  7 11:44:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:44:50 +0000 (UTC)
Subject: rpms/perl-IO-All/devel perl-IO-All.spec,1.14,1.15
Message-ID: <20091207114450.DA87911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-All/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6589

Modified Files:
	perl-IO-All.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-All.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-All/devel/perl-IO-All.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-IO-All.spec	26 Jul 2009 06:39:34 -0000	1.14
+++ perl-IO-All.spec	7 Dec 2009 11:44:50 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-IO-All
 Version:        0.39
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        IO::All Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.39-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.39-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:44:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:44:51 +0000 (UTC)
Subject: rpms/perl-AutoXS-Header/devel perl-AutoXS-Header.spec,1.5,1.6
Message-ID: <20091207114451.1481511C02BB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AutoXS-Header/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6592

Modified Files:
	perl-AutoXS-Header.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AutoXS-Header.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AutoXS-Header/devel/perl-AutoXS-Header.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-AutoXS-Header.spec	26 Jul 2009 01:46:55 -0000	1.5
+++ perl-AutoXS-Header.spec	7 Dec 2009 11:44:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-AutoXS-Header
 Version:        1.02
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Container for the AutoXS header files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:48:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:48:11 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Natural/devel
	perl-DateTime-Format-Natural.spec, 1.10, 1.11
Message-ID: <20091207114811.B856C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7823

Modified Files:
	perl-DateTime-Format-Natural.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-Natural.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/perl-DateTime-Format-Natural.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-DateTime-Format-Natural.spec	30 Oct 2009 18:34:16 -0000	1.10
+++ perl-DateTime-Format-Natural.spec	7 Dec 2009 11:48:11 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Natural
 Version:        0.80
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Create machine readable date/time with natural parsing logic
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.80-2
+- rebuild against perl 5.10.1
+
 * Fri Oct 30 2009 Iain Arnell <iarnell at gmail.com> 0.80-1
 - update to latest upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 11:49:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:49:19 +0000 (UTC)
Subject: rpms/perl-IO-AIO/devel perl-IO-AIO.spec,1.8,1.9
Message-ID: <20091207114919.EC11711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-IO-AIO/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8312

Modified Files:
	perl-IO-AIO.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-IO-AIO.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-AIO/devel/perl-IO-AIO.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-IO-AIO.spec	26 Jul 2009 06:39:18 -0000	1.8
+++ perl-IO-AIO.spec	7 Dec 2009 11:49:19 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-IO-AIO
 Version:        3.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Asynchronous Input/Output
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.17-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:50:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:50:19 +0000 (UTC)
Subject: rpms/perl-POE/devel perl-POE.spec,1.19,1.20
Message-ID: <20091207115019.243F211C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-POE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8809

Modified Files:
	perl-POE.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-POE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE/devel/perl-POE.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-POE.spec	27 Sep 2009 05:49:39 -0000	1.19
+++ perl-POE.spec	7 Dec 2009 11:50:18 -0000	1.20
@@ -1,6 +1,6 @@
 Name:      perl-POE
 Version:   1.269
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   POE - portable multitasking and networking framework for Perl
 
 Group:     Development/Libraries
@@ -129,6 +129,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.269-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.269-1
 - update filtering...
 - auto-update to 1.269 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Mon Dec  7 11:50:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:50:17 +0000 (UTC)
Subject: rpms/perl-AutoClass/devel perl-AutoClass.spec,1.7,1.8
Message-ID: <20091207115017.7380E11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AutoClass/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8785

Modified Files:
	perl-AutoClass.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AutoClass/devel/perl-AutoClass.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-AutoClass.spec	26 Jul 2009 01:46:42 -0000	1.7
+++ perl-AutoClass.spec	7 Dec 2009 11:50:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Automatically define classes and objects for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1_01-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1_01-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:52:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:52:33 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-MySQL/devel
	perl-DateTime-Format-MySQL.spec, 1.8, 1.9
Message-ID: <20091207115233.DB38D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9652

Modified Files:
	perl-DateTime-Format-MySQL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-MySQL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-MySQL/devel/perl-DateTime-Format-MySQL.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-DateTime-Format-MySQL.spec	26 Jul 2009 05:37:47 -0000	1.8
+++ perl-DateTime-Format-MySQL.spec	7 Dec 2009 11:52:33 -0000	1.9
@@ -12,7 +12,7 @@
 
 Name:           perl-DateTime-Format-MySQL
 Version:        0.04        
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Parse and format MySQL dates and times 
 
 Group:          Development/Libraries
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:53:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:53:42 +0000 (UTC)
Subject: rpms/perl-Inline-Files/devel perl-Inline-Files.spec,1.5,1.6
Message-ID: <20091207115342.0472D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Inline-Files/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10088

Modified Files:
	perl-Inline-Files.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Inline-Files.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Inline-Files/devel/perl-Inline-Files.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Inline-Files.spec	26 Jul 2009 08:49:45 -0000	1.5
+++ perl-Inline-Files.spec	7 Dec 2009 11:53:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Inline-Files
 Version:        0.62
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Allows for multiple inline files in a single perl file
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.62-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.62-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:54:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:54:44 +0000 (UTC)
Subject: rpms/perl-autobox/devel perl-autobox.spec,1.3,1.4
Message-ID: <20091207115444.F028611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-autobox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10499

Modified Files:
	perl-autobox.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-autobox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-autobox/devel/perl-autobox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-autobox.spec	26 Jul 2009 17:44:26 -0000	1.3
+++ perl-autobox.spec	7 Dec 2009 11:54:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-autobox
 Version:        2.55
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Call methods on native types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.55-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.55-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:56:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:56:59 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Mail/devel perl-DateTime-Format-Mail.spec,
	1.9, 1.10
Message-ID: <20091207115659.1105F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11354

Modified Files:
	perl-DateTime-Format-Mail.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-Mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Mail/devel/perl-DateTime-Format-Mail.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-DateTime-Format-Mail.spec	26 Jul 2009 05:37:35 -0000	1.9
+++ perl-DateTime-Format-Mail.spec	7 Dec 2009 11:56:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Mail
 Version:        0.3001        
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Convert between DateTime and RFC2822/822 formats
 
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.3001-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3001-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:57:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:57:14 +0000 (UTC)
Subject: rpms/perl-Pod-Xhtml/devel perl-Pod-Xhtml.spec,1.2,1.3
Message-ID: <20091207115714.5B7C311C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-Xhtml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11565

Modified Files:
	perl-Pod-Xhtml.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-Xhtml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Xhtml/devel/perl-Pod-Xhtml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Pod-Xhtml.spec	26 Jul 2009 16:16:50 -0000	1.2
+++ perl-Pod-Xhtml.spec	7 Dec 2009 11:57:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Xhtml
 Version:        1.59
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate well-formed XHTML documents from POD format documentation
 License:        GPLv2+
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.59-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.59-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:57:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:57:39 +0000 (UTC)
Subject: rpms/perl-Inline/devel perl-Inline.spec,1.20,1.21
Message-ID: <20091207115739.A31F611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Inline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11794

Modified Files:
	perl-Inline.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Inline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Inline/devel/perl-Inline.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Inline.spec	26 Jul 2009 08:49:30 -0000	1.20
+++ perl-Inline.spec	7 Dec 2009 11:57:39 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-Inline
 Version:        0.44
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Inline Perl module
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.44-23
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 11:59:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 11:59:03 +0000 (UTC)
Subject: rpms/perl-Authen-Simple/devel perl-Authen-Simple.spec,1.1,1.2
Message-ID: <20091207115903.B101F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Authen-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12345

Modified Files:
	perl-Authen-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Authen-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-Simple/devel/perl-Authen-Simple.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Authen-Simple.spec	21 Nov 2009 00:26:34 -0000	1.1
+++ perl-Authen-Simple.spec	7 Dec 2009 11:59:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Authen-Simple
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Authentication
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,5 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.4-2
+- rebuild against perl 5.10.1
+
 * Wed Oct 07 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.4-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 12:01:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:01:30 +0000 (UTC)
Subject: rpms/perl-Pod-Tests/devel perl-Pod-Tests.spec,1.10,1.11
Message-ID: <20091207120130.7875911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-Tests/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13165

Modified Files:
	perl-Pod-Tests.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-Tests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/devel/perl-Pod-Tests.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Pod-Tests.spec	26 Jul 2009 16:16:32 -0000	1.10
+++ perl-Pod-Tests.spec	7 Dec 2009 12:01:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		perl-Pod-Tests
 Version: 	1.19
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Extract embedded tests and code examples from POD
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -56,6 +56,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.19-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:01:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:01:30 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-ISO8601/devel
	perl-DateTime-Format-ISO8601.spec, 1.2, 1.3
Message-ID: <20091207120130.877B211C029D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-ISO8601/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13164

Modified Files:
	perl-DateTime-Format-ISO8601.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-ISO8601.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-ISO8601/devel/perl-DateTime-Format-ISO8601.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-DateTime-Format-ISO8601.spec	26 Jul 2009 05:37:19 -0000	1.2
+++ perl-DateTime-Format-ISO8601.spec	7 Dec 2009 12:01:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-DateTime-Format-ISO8601 
 Version:    0.06 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # LICENSE, lib/DateTime/Format/ISO8601.pod -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -52,6 +52,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:02:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:02:44 +0000 (UTC)
Subject: rpms/perl-Image-Xpm/devel perl-Image-Xpm.spec,1.15,1.16
Message-ID: <20091207120244.7F20211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Image-Xpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13685

Modified Files:
	perl-Image-Xpm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Image-Xpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Xpm/devel/perl-Image-Xpm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Image-Xpm.spec	26 Jul 2009 08:48:58 -0000	1.15
+++ perl-Image-Xpm.spec	7 Dec 2009 12:02:44 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Image-Xpm
 Version:        1.09
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Load, create, manipulate and save xpm image files in Perl
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.09-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:03:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:03:23 +0000 (UTC)
Subject: rpms/perl-Authen-SASL/devel perl-Authen-SASL.spec,1.14,1.15
Message-ID: <20091207120323.3E70511C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Authen-SASL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13942

Modified Files:
	perl-Authen-SASL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-SASL/devel/perl-Authen-SASL.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Authen-SASL.spec	5 Oct 2009 16:17:16 -0000	1.14
+++ perl-Authen-SASL.spec	7 Dec 2009 12:03:23 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Authen-SASL
 Version:        2.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SASL Authentication framework for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.13-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.13-1
 - new upstream version, BR Test::More
 



From transif at fedoraproject.org  Mon Dec  7 12:05:28 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Dec 2009 12:05:28 +0000 (UTC)
Subject: comps/po or.po,1.21,1.22
Message-ID: <20091207120528.F0F8011C00EE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14649/po

Modified Files:
	or.po 
Log Message:
Sending translation for Oriya


Index: or.po
===================================================================
RCS file: /cvs/pkgs/comps/po/or.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- or.po	2 Sep 2009 12:14:39 -0000	1.21
+++ or.po	7 Dec 2009 12:05:28 -0000	1.22
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-01 02:22+0000\n"
-"PO-Revision-Date: 2009-09-01 14:56+0530\n"
+"POT-Creation-Date: 2009-12-07 08:10+0000\n"
+"PO-Revision-Date: 2009-12-07 17:34+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
 "Language-Team: Oriya <oriya-it at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,8 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\n"
+"\n"
 
 #: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 #: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
@@ -171,163 +173,163 @@ msgid "Clustering Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "??????.?????????.?????????. ????????? ????????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "??????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "????????????-?????? ???????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "?????????????????? ??????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "?????????????????? ???????????? ?????????????????? ??????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "??????????????????????????? ????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "?????????????????? (??????????????????????????????) ??????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "??????.??????.??????. ????????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora ????????????????????????"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Fedora ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "??????????????????????????? ??????????????? ??????????????????????????? ???????????? ???????????????????????? ???????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -336,19 +338,19 @@ msgstr ""
 "?????????????????? ?????? ??????????????????????????? ???????????? ????????? ??????????????? ???????????? ???????????? ????????????????????? ??????????????? ???????????? ?????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "????????? ????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -357,170 +359,170 @@ msgstr ""
 "?????????????????????????????????,????????? ??????????????? ?????????????????? ???????????? ????????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "????????? ????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "?????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "???????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "??????.??????.??????. ???????????? ????????? ????????? ??? ?????????????????? ?????????????????? ??? ??????????????? ???????????? ????????? ????????????????????? ????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ????????? XFCE ?????????????????? ?????????????????? ????????????????????? ??????????????? ???????????? ????????? ????????????????????? ????????????????????? ?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "????????????.??????. ????????? ??????.??????.???. ??? ?????????????????? ?????????????????? ??? ??????????????? ???????????? ????????? ????????????????????? ????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "?????????????????? ?????? ?????????????????? ??????????????? ???????????? ?????????????????? ?????????????????? ???????????? ????????? ????????????????????? ??????????????? ???????????? ????????? ??????????????? ????????????????????? ?????????????????? "
 "??????????????????"
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "????????? ?????????????????? (X) ???????????? ????????????????????????????????? ?????? ????????????????????? ??????????????? ???????????? ????????? ????????????????????? ???????????? ?????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "???????????????????????? ???????????? ?????????????????? ???????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "??????.??????.???. (?????? ???????????????????????? ??????????????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "??????.??????.???. ????????????????????? ??? ???????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -529,142 +531,142 @@ msgstr ""
 "?????????????????? ?????????????????????????????????,????????? ??????????????? ?????????????????? ???????????? ????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "?????????????????? ???????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "????????????????????? ???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "?????????????????? ????????????????????? ??? ??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "?????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "????????? ????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "?????????-?????????.????????????.??????. ????????????????????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "????????? ????????????"
 
@@ -674,37 +676,37 @@ msgstr "?????????????????? ???????????? 
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "??????????????????????????????/?????????????????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????????? ?????????????????? ????????? ??????????????? ???????????????????????? ????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -712,55 +714,55 @@ msgstr "?????????????????? ?????????????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ????????????????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "???????????? ??????????????????"
 
@@ -774,73 +776,73 @@ msgstr "SUGAR ??????????????? OLPC XO ??
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "???????????? ??? ????????????????????? ???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "??????????????? ????????????????????? ????????????????????? ????????????????????? ????????? ????????? ??? ???????????? ?????????????????? ?????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "??????????????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "???????????????????????? ?????????????????? ?????????????????? ???????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -851,103 +853,103 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "?????????????????? ????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "???????????????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ????????????????????????????????? ??????????????????????????? ?????? ??????????????????????????? ????????????????????? ??????????????? ??????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ????????????????????????????????? ??????????????????????????? ?????? ???????????? ????????????????????? ??????????????????????????? ????????????????????? ?????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "?????????????????? ???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "??????????????? ????????? ???????????? ?????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "????????? ?????????????????? ?????? ?????????????????????????????? ???????????????, ??????.??????.??????. ????????????????????????, ????????? ??????????????? ???????????? ?????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "????????? ???????????? ??? ????????????????????? ??????????????? ??????????????? ??? ?????????????????? ???????????? ?????????????????? ????????????????????? ??????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr ""
 "????????? ????????????????????? ??????????????? ????????????????????? ??????????????? IMAP ?????????????????? SMTP ????????? ???????????? ??? ????????????????????? ??????????????? ???????????? ?????????????????? ?????????????????? "
@@ -955,7 +957,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "????????? ????????????????????? ??????????????? ????????????????????? X ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ??????????????? ??????????????????  ?????????????????? ?????????????????? ?????? "
@@ -963,13 +965,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "????????? ????????????????????? ??????????????? ????????? ?????????????????? ?????????????????? ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "????????? ????????????????????? ??????????????? ??????.?????????.??????.??????., ??????????????????????????? ????????? ?????????.??????.?????????. ????????? ???????????????????????? ???????????? ????????????????????? ???????????????????????? "
@@ -977,7 +979,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -985,19 +987,19 @@ msgstr "????????? ????????????????????? 
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "????????? ????????????????????? ??????????????? ??????????????? ???????????????????????? ?????????????????? ?????????????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "????????? ????????????????????? ??????????????? ???????????????????????????????????? ????????????????????? ?????????????????? ???????????? ????????????????????? ?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -1007,7 +1009,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1018,19 +1020,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "????????? ??????????????? ??????????????? ?????????????????? ?????????????????? ?????? ??????????????? ????????? ???????????? ?????????????????? ???????????? ?????????????????? ?????????????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "????????? ??????????????? ??????????????? ?????????????????? ?????????????????? ?????? ??????????????? ??????.??????.??????. ???????????? ?????????????????? ???????????? ?????????????????? ?????????????????? ?????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1040,19 +1042,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "????????? ?????????????????? ?????????????????????, ?????????????????? ?????? ??????????????? ????????? ???????????? ????????? ?????? ????????????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????????"
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "????????? ?????????????????? Red Hat ??? ??????????????? ?????????????????? ???????????? ????????????????????? ??????????????? ????????????????????? ???????????? ????????? ?????????"
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1062,13 +1064,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "????????? ?????????????????? ?????????????????? ???-?????????, ?????????, ????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1078,7 +1080,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
 "????????? ?????????????????? ?????????????????????, ??????????????? ?????????????????? ??? ?????????????????? ????????? ?????????????????????????????? ?????? ??????????????? ???????????? ???????????? ????????????????????? ????????????????????? "
@@ -1086,7 +1088,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1096,7 +1098,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1106,19 +1108,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "????????? ???????????? ?????????????????????????????? ????????????????????? ??????????????? ????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "????????? ?????????????????? ????????????????????? ???????????????????????? ????????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1128,7 +1130,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "????????? ????????????????????? ?????????????????? ????????????????????? ?????????????????? ?????? ??????.?????????.?????????. ????????? ???????????? (??????????????????) ?????? ?????????????????? ???????????? ?????????????????? "
@@ -1136,7 +1138,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1146,13 +1148,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "????????? ????????????????????? ?????????????????? ?????????-?????????.????????????.??????. ???????????? ????????????????????????????????? ?????????????????? ????????????????????? ????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr ""
 "????????? ????????????????????? ?????????????????? ???????????????-??????.??????.???.-?????????.????????????.??????. ???????????? ????????????????????????????????? ?????????????????? ????????????????????? ????????????????????? ???????????? "
@@ -1160,151 +1162,151 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ????????????????????????????????? ???????????? ?????????????????? ????????????????????? ???????????? ????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "????????? ????????????????????? ????????????????????? ????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "?????????????????? ??? ???????????? ????????? ?????? ???????????????????????? ??????????????? ???????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "????????? ????????????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "?????????????????? ????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "Windows ???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ????????????????????? ??? ???????????????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "???????????? ??????????????????"
 
@@ -1318,67 +1320,67 @@ msgid "Haskell Development"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????? ??????????????? ??????????????? ???????????? ??????????????? ?????????????????? ???????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (??????????????????????????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ???????????????"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "??????????????? ??????????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ??????????????? ??????????????? ???????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ??????????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ??????????????? ??????????????? ???????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "??????????????? ??????????????????"
 
@@ -1394,115 +1396,117 @@ msgstr "????????????????????????????????
 msgid "Chichewa Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "???????????????????????? ????????????????????? ???????????? ?????????????????? ????????? ?????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "???????????????????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "???????????????????????? ?????????????????? ????????? ?????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "???????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "??????????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW ??????????????????????????????-???????????????"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "?????????????????? ?????????????????? ????????? ????????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "??????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1511,24 +1515,24 @@ msgstr ""
 "?????????????????? ????????????????????? ?????????, ??????????????? Fedora ?????????????????????"
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "CAML ???????????????????????????????????? ???????????? ????????? ??????????????????????????? ????????????????????? ????????? ????????????????????? ??????????????? ???????????? ?????????????????????"
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1537,12 +1541,12 @@ msgstr ""
 "????????????"
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "????????? ???????????????????????? ??????????????????"
 
@@ -1557,8 +1561,8 @@ msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
 msgstr ""
-"?????????????????????????????????????????? ??????????????? ????????? ?????????????????? ??????????????? Fedora ??????????????????????????????????????? ???????????? ?????? ????????????????????????????????? ???????????? "
-"?????????????????? ??????????????????????????? ?????????????????? ??????????????????"
+"?????????????????????????????????????????? ??????????????? ????????? ?????????????????? ??????????????? Fedora ??????????????????????????????????????? ???????????? ?????? ????????????????????????????????? ???????????? ?????????????????? "
+"??????????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1568,51 +1572,59 @@ msgstr "????????? ????????? ????????????
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ???????????? ????????? ????????????????????????????????????????????? ???????????? ????????? ????????? ??????????????????????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "???????????? ?????? (????????????)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "???????????? ?????? (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "?????????????????????????????? ???????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "??????????????????"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
 msgstr ""
-"LXDE ?????? ??????????????????, ?????????????????? ??????????????? ???????????? ?????????????????? ??????????????????????????????????????? ????????? ?????????????????? ???????????????????????? ???????????????????????????????????? "
-"??????????????? ???????????? ????????????????????? ???????????? ??????????????? ?????????????????? X11 ????????????????????? ?????????????????????"
+"LXDE ?????? ??????????????????, ?????????????????? ??????????????? ???????????? ?????????????????? ??????????????????????????????????????? ????????? ?????????????????? ???????????????????????? ???????????????????????????????????? ??????????????? "
+"???????????? ????????????????????? ???????????? ??????????????? ?????????????????? X11 ????????????????????? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "?????????????????? ????????? ???????????? ??????????????? ????????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Moblin ????????????????????? ??????????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "NetBook/NetTop/MID ??????????????? ???????????? Moblin ??????????????? ????????????????????? ?????????????????????"
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "????????????????????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "??????????????? ????????? ???????????????????????? ??????????????? ??????????????????????????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????????????????????? ????????????????????? ???????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "????????????-?????? ???????????????????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1620,7 +1632,7 @@ msgstr ""
 "????????? ??????????????? ???????????????????????????, ?????????????????? ???????????? ????????????????????????????????? ????????? ?????????????????? ??????????????? ?????????????????????, ????????????????????????, ?????????????????? "
 "?????????????????????????????????,????????? ??????????????? ?????????????????? ???????????? ????????????????????? ???????????? ?????????????????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1628,7 +1640,7 @@ msgstr ""
 "??????.??????.???. ??????????????? ???????????????????????????, ?????????????????? ???????????? ????????????????????????????????? ????????? ?????????????????? ??????????????? ?????????????????????, ????????????????????????, "
 "?????????????????? ??? ?????????????????????????????????,????????? ??????????????? ?????????????????? ???????????? ????????????????????? ???????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1636,11 +1648,11 @@ msgstr ""
 "???????????????????????? ???????????????????????? ??????????????? ????????????????????? ???????????? ??????????????????, ?????????????????? ??????????????? ??????????????? ??????????????????????????? ?????????????????? ????????????????????? "
 "???????????? ?????????????????? ??????????????? ???????????? ?????????????????? ?????????????????? ?????????????????? | ??????????????????  ???-??????????????? ????????? ??????.??????. ?????? ???????????????????????? ????????????????????????"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "????????????-???-??????????????? ??????????????? ?????????????????????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1649,27 +1661,27 @@ msgstr ""
 "??????????????????????????? ??????.??????.??????.??????.,??????.??????.??????., ??????????????????????????????????????????, ????????? ??????????????? ???????????? ?????? ???????????????????????? ??????????????? ???????????? ?????????????????? "
 "?????????????????? ????????? ?????????????????????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "????????? ?????????????????? ????????????????????? ???????????????????????? ????????????????????????????????? ???????????????????????? ?????????????????? ???????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "????????? ???????????? ?????????????????? ????????????????????? ??????????????? ????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "????????? ???????????? ????????????????????? ????????????????????? ??????????????? ????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "????????? ???????????? ????????????????????? ????????????????????? ??????????????? ????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "????????????-???-???????????????"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "????????? ???????????? ????????? ????????????????????? ??????????????? ????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ????????????"
 



From kasal at fedoraproject.org  Mon Dec  7 12:05:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:05:46 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-ICal/devel perl-DateTime-Format-ICal.spec,
	1.8, 1.9
Message-ID: <20091207120546.E6E0A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-ICal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14760

Modified Files:
	perl-DateTime-Format-ICal.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-ICal/devel/perl-DateTime-Format-ICal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-DateTime-Format-ICal.spec	26 Jul 2009 05:37:04 -0000	1.8
+++ perl-DateTime-Format-ICal.spec	7 Dec 2009 12:05:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-ICal
 Version:        0.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse and format iCal datetime and duration strings
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:06:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:06:18 +0000 (UTC)
Subject: rpms/perl-Pod-Strip/devel perl-Pod-Strip.spec,1.5,1.6
Message-ID: <20091207120618.43F4C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-Strip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15010

Modified Files:
	perl-Pod-Strip.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-Strip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Strip/devel/perl-Pod-Strip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Pod-Strip.spec	26 Jul 2009 16:16:16 -0000	1.5
+++ perl-Pod-Strip.spec	7 Dec 2009 12:06:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Strip
 Version:        1.02
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Remove POD from Perl code
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:06:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:06:46 +0000 (UTC)
Subject: rpms/perl-Image-Xbm/devel perl-Image-Xbm.spec,1.15,1.16
Message-ID: <20091207120646.E23F911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Image-Xbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15219

Modified Files:
	perl-Image-Xbm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Image-Xbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Xbm/devel/perl-Image-Xbm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Image-Xbm.spec	26 Jul 2009 08:48:42 -0000	1.15
+++ perl-Image-Xbm.spec	7 Dec 2009 12:06:46 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Image-Xbm
 Version:        1.08
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Load, create, manipulate and save xbm image files in Perl
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.08-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:07:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:07:37 +0000 (UTC)
Subject: rpms/perl-Authen-Radius/devel perl-Authen-Radius.spec,1.8,1.9
Message-ID: <20091207120737.1880E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Authen-Radius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15552

Modified Files:
	perl-Authen-Radius.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Authen-Radius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-Radius/devel/perl-Authen-Radius.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Authen-Radius.spec	26 Jul 2009 01:46:00 -0000	1.8
+++ perl-Authen-Radius.spec	7 Dec 2009 12:07:36 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Authen-Radius
 Version:        0.13
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl Authen::Radius modules
 # See LICENSING.txt
 License:        Artistic 2.0
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:10:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:10:17 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-IBeat/devel
	perl-DateTime-Format-IBeat.spec, 1.7, 1.8
Message-ID: <20091207121017.63BE511C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-IBeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16423

Modified Files:
	perl-DateTime-Format-IBeat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-IBeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-IBeat/devel/perl-DateTime-Format-IBeat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-DateTime-Format-IBeat.spec	26 Jul 2009 05:36:49 -0000	1.7
+++ perl-DateTime-Format-IBeat.spec	7 Dec 2009 12:10:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-IBeat
 Version:        0.161        
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Format times in .beat notation 
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.161-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.161-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:10:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:10:49 +0000 (UTC)
Subject: rpms/perl-Pod-Spell/devel perl-Pod-Spell.spec,1.7,1.8
Message-ID: <20091207121049.76BB711C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-Spell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16653

Modified Files:
	perl-Pod-Spell.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-Spell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Spell/devel/perl-Pod-Spell.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Pod-Spell.spec	26 Jul 2009 16:16:00 -0000	1.7
+++ perl-Pod-Spell.spec	7 Dec 2009 12:10:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Spell
 Version:        1.01
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A formatter for spellchecking Pod
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:11:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:11:31 +0000 (UTC)
Subject: rpms/perl-Image-Size/devel perl-Image-Size.spec,1.17,1.18
Message-ID: <20091207121131.A707D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Image-Size/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16927

Modified Files:
	perl-Image-Size.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Image-Size.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Size/devel/perl-Image-Size.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Image-Size.spec	26 Jul 2009 08:48:26 -0000	1.17
+++ perl-Image-Size.spec	7 Dec 2009 12:11:31 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Image-Size
 Version:        3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Determine the size of images in several common formats in Perl
 
 Group:          Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.2-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:11:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:11:44 +0000 (UTC)
Subject: rpms/perl-Authen-PAM/devel perl-Authen-PAM.spec,1.7,1.8
Message-ID: <20091207121144.A1E3011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Authen-PAM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17088

Modified Files:
	perl-Authen-PAM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Authen-PAM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-PAM/devel/perl-Authen-PAM.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Authen-PAM.spec	26 Jul 2009 01:45:46 -0000	1.7
+++ perl-Authen-PAM.spec	7 Dec 2009 12:11:44 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Authen-PAM
 Version:        0.16
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Authen::PAM Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:14:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:14:51 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-HTTP/devel perl-DateTime-Format-HTTP.spec,
	1.9, 1.10
Message-ID: <20091207121451.E19A611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18086

Modified Files:
	perl-DateTime-Format-HTTP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-HTTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-HTTP/devel/perl-DateTime-Format-HTTP.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-DateTime-Format-HTTP.spec	26 Jul 2009 05:36:34 -0000	1.9
+++ perl-DateTime-Format-HTTP.spec	7 Dec 2009 12:14:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-HTTP
 Version:        0.38
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        HTTP protocol date conversion routines
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.38-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.38-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 12:14:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:14:56 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121456.A786610F89F@bastion2.fedora.phx.redhat.com>

yaneti has set the watchbugzilla acl on galeon (Fedora 10) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:14:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:14:58 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121458.97F0310F8A6@bastion2.fedora.phx.redhat.com>

yaneti has set the watchcommits acl on galeon (Fedora 10) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:00 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121500.33B9A10F8DD@bastion2.fedora.phx.redhat.com>

yaneti has set the commit acl on galeon (Fedora 10) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:01 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121501.D860010F905@bastion2.fedora.phx.redhat.com>

yaneti has set the approveacls acl on galeon (Fedora 10) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:08 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121508.5DF6B10F8DF@bastion2.fedora.phx.redhat.com>

yaneti has set the watchbugzilla acl on galeon (Fedora 11) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:09 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121509.1B06010F8E2@bastion2.fedora.phx.redhat.com>

yaneti has set the watchcommits acl on galeon (Fedora 11) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:10 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121510.62A5510F913@bastion2.fedora.phx.redhat.com>

yaneti has set the commit acl on galeon (Fedora 11) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:11 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121511.326A910F915@bastion2.fedora.phx.redhat.com>

yaneti has set the approveacls acl on galeon (Fedora 11) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:15 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121515.7306510F91A@bastion2.fedora.phx.redhat.com>

yaneti has set the watchbugzilla acl on galeon (Fedora 12) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:16 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121516.63F8C10F8E3@bastion2.fedora.phx.redhat.com>

yaneti has set the watchcommits acl on galeon (Fedora 12) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:17 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121517.B855B10F8E5@bastion2.fedora.phx.redhat.com>

yaneti has set the commit acl on galeon (Fedora 12) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From pkgdb at fedoraproject.org  Mon Dec  7 12:15:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 12:15:18 +0000
Subject: [pkgdb] galeon had acl change status
Message-ID: <20091207121518.D117910F91C@bastion2.fedora.phx.redhat.com>

yaneti has set the approveacls acl on galeon (Fedora 12) to Obsolete for yaneti

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/galeon



From kasal at fedoraproject.org  Mon Dec  7 12:15:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:15:34 +0000 (UTC)
Subject: rpms/perl-Pod-Simple-Wiki/devel perl-Pod-Simple-Wiki.spec,1.5,1.6
Message-ID: <20091207121534.6E46911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-Simple-Wiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18352

Modified Files:
	perl-Pod-Simple-Wiki.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-Simple-Wiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Simple-Wiki/devel/perl-Pod-Simple-Wiki.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Pod-Simple-Wiki.spec	26 Jul 2009 16:15:44 -0000	1.5
+++ perl-Pod-Simple-Wiki.spec	7 Dec 2009 12:15:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Simple-Wiki
 Version:        0.09
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Utility and perl classes for converting POD to Wiki text
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:17:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:17:27 +0000 (UTC)
Subject: rpms/perl-Authen-Krb5-Admin/devel perl-Authen-Krb5-Admin.spec, 1.3, 
	1.4
Message-ID: <20091207121727.B546B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Authen-Krb5-Admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18897

Modified Files:
	perl-Authen-Krb5-Admin.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Authen-Krb5-Admin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-Krb5-Admin/devel/perl-Authen-Krb5-Admin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Authen-Krb5-Admin.spec	26 Jul 2009 01:45:24 -0000	1.3
+++ perl-Authen-Krb5-Admin.spec	7 Dec 2009 12:17:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Authen-Krb5-Admin
 Version:        0.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for MIT Kerberos 5 admin interface
 Group:          Development/Libraries
 # admin.h - MIT
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:17:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:17:54 +0000 (UTC)
Subject: rpms/perl-Imager/devel perl-Imager.spec,1.23,1.24
Message-ID: <20091207121754.B7D5111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Imager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19115

Modified Files:
	perl-Imager.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Imager/devel/perl-Imager.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Imager.spec	26 Jul 2009 08:49:14 -0000	1.23
+++ perl-Imager.spec	7 Dec 2009 12:17:54 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-Imager
 Version:        0.67
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for Generating 24 bit Images
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.67-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.67-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:19:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:19:40 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Flexible/devel
	perl-DateTime-Format-Flexible.spec, 1.5, 1.6
Message-ID: <20091207121940.ED33411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Flexible/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19665

Modified Files:
	perl-DateTime-Format-Flexible.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-Flexible.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Flexible/devel/perl-DateTime-Format-Flexible.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-DateTime-Format-Flexible.spec	26 Jul 2009 05:36:19 -0000	1.5
+++ perl-DateTime-Format-Flexible.spec	7 Dec 2009 12:19:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-DateTime-Format-Flexible
 Version:    0.09
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see LICENSE
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:20:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:20:17 +0000 (UTC)
Subject: rpms/perl-Pod-Readme/devel perl-Pod-Readme.spec,1.8,1.9
Message-ID: <20091207122017.C5FD511C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-Readme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19937

Modified Files:
	perl-Pod-Readme.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-Readme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Readme/devel/perl-Pod-Readme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Pod-Readme.spec	26 Jul 2009 16:15:25 -0000	1.8
+++ perl-Pod-Readme.spec	7 Dec 2009 12:20:17 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Pod-Readme
 Version:        0.090
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Convert POD to README file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.090-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.090-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:22:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:22:21 +0000 (UTC)
Subject: rpms/perl-Authen-Krb5/devel perl-Authen-Krb5.spec,1.6,1.7
Message-ID: <20091207122221.8995F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Authen-Krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20649

Modified Files:
	perl-Authen-Krb5.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Authen-Krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-Krb5/devel/perl-Authen-Krb5.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Authen-Krb5.spec	26 Jul 2009 01:45:09 -0000	1.6
+++ perl-Authen-Krb5.spec	7 Dec 2009 12:22:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Authen-Krb5
 Version:        1.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Krb5 Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.7-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:24:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:24:05 +0000 (UTC)
Subject: rpms/perl-Image-Math-Constrain/devel perl-Image-Math-Constrain.spec,
	1.6, 1.7
Message-ID: <20091207122405.ECBE611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Image-Math-Constrain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21245

Modified Files:
	perl-Image-Math-Constrain.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Image-Math-Constrain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Math-Constrain/devel/perl-Image-Math-Constrain.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Image-Math-Constrain.spec	26 Jul 2009 08:48:10 -0000	1.6
+++ perl-Image-Math-Constrain.spec	7 Dec 2009 12:24:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Image-Math-Constrain
 Version:        1.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Scaling math used in image size constraining (such as thumbnails)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:24:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:24:28 +0000 (UTC)
Subject: rpms/perl-Pod-POM/devel perl-Pod-POM.spec,1.12,1.13
Message-ID: <20091207122428.DC79211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-POM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21484

Modified Files:
	perl-Pod-POM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-POM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-POM/devel/perl-Pod-POM.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Pod-POM.spec	20 Aug 2009 01:42:41 -0000	1.12
+++ perl-Pod-POM.spec	7 Dec 2009 12:24:28 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           perl-Pod-POM
 Version:        0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Object-oriented interface to Perl POD documents
 
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.25-2
+- rebuild against perl 5.10.1
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.25-1
 - update to 0.25
 



From kasal at fedoraproject.org  Mon Dec  7 12:26:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:26:52 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Excel/devel
	perl-DateTime-Format-Excel.spec, 1.3, 1.4
Message-ID: <20091207122652.43D0411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Excel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22309

Modified Files:
	perl-DateTime-Format-Excel.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-Excel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Excel/devel/perl-DateTime-Format-Excel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-DateTime-Format-Excel.spec	24 Jul 2009 09:55:30 -0000	1.3
+++ perl-DateTime-Format-Excel.spec	7 Dec 2009 12:26:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-DateTime-Format-Excel 
 Version:    0.2901 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/DateTime/Format/Excel.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2901-4
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Robert Scheck <robert at fedoraproject.org> 0.2901-3
 - Fixed broken upstream build requirement for perl(DateTime), as
   per RPM versioning 0.1705 > 0.50, but 0.50 is newer than 0.1705



From kasal at fedoraproject.org  Mon Dec  7 12:28:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:28:11 +0000 (UTC)
Subject: rpms/perl-Authen-DigestMD5/devel perl-Authen-DigestMD5.spec, 1.8,
	1.9
Message-ID: <20091207122811.05A9411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Authen-DigestMD5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23025

Modified Files:
	perl-Authen-DigestMD5.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Authen-DigestMD5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-DigestMD5/devel/perl-Authen-DigestMD5.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Authen-DigestMD5.spec	26 Jul 2009 01:44:55 -0000	1.8
+++ perl-Authen-DigestMD5.spec	7 Dec 2009 12:28:10 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	SASL DIGEST-MD5 authentication (RFC2831)
 Name:		perl-Authen-DigestMD5
 Version:	0.04
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Authen-DigestMD5/
@@ -52,6 +52,9 @@ This module supports DIGEST-MD5 SASL aut
 %{_mandir}/man3/Authen::DigestMD5.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:28:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:28:49 +0000 (UTC)
Subject: rpms/perl-Image-Info/devel perl-Image-Info.spec,1.26,1.27
Message-ID: <20091207122849.9B1B711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Image-Info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23254

Modified Files:
	perl-Image-Info.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Image-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- perl-Image-Info.spec	9 Nov 2009 19:24:19 -0000	1.26
+++ perl-Image-Info.spec	7 Dec 2009 12:28:49 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name:           perl-Image-Info
 Version:        1.28
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28-6
+- rebuild against perl 5.10.1
+
 * Mon Nov 09 2009 Adam Jackson <ajax at redhat.com> 1.28-5
 - Requires: rgb, not Requires: /usr/share/X11/rgb.txt
 



From kasal at fedoraproject.org  Mon Dec  7 12:29:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:29:25 +0000 (UTC)
Subject: rpms/perl-Pod-Coverage/devel perl-Pod-Coverage.spec,1.19,1.20
Message-ID: <20091207122925.767CF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-Coverage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23554

Modified Files:
	perl-Pod-Coverage.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-Coverage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Coverage/devel/perl-Pod-Coverage.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-Pod-Coverage.spec	26 Jul 2009 16:14:49 -0000	1.19
+++ perl-Pod-Coverage.spec	7 Dec 2009 12:29:25 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Coverage
 Version:        0.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Checks if the documentation of a module is comprehensive
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Pod::Coverage::Overloader.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.20-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:31:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:31:55 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DBI/devel perl-DateTime-Format-DBI.spec,
	1.6, 1.7
Message-ID: <20091207123155.21BD511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24442

Modified Files:
	perl-DateTime-Format-DBI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-DBI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-DBI/devel/perl-DateTime-Format-DBI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-DateTime-Format-DBI.spec	26 Jul 2009 05:35:33 -0000	1.6
+++ perl-DateTime-Format-DBI.spec	7 Dec 2009 12:31:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-DBI
 Version:        0.032
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Find a parser class for a database connection
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.032-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.032-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:32:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:32:04 +0000 (UTC)
Subject: rpms/perl-Authen-Captcha/devel perl-Authen-Captcha.spec,1.3,1.4
Message-ID: <20091207123204.C2C5411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Authen-Captcha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24632

Modified Files:
	perl-Authen-Captcha.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Authen-Captcha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Authen-Captcha/devel/perl-Authen-Captcha.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Authen-Captcha.spec	26 Jul 2009 01:44:37 -0000	1.3
+++ perl-Authen-Captcha.spec	7 Dec 2009 12:32:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Authen-Captcha
 Version:        1.023
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for creating captchas
 License:        GPLv2
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.023-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.023-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:32:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:32:59 +0000 (UTC)
Subject: rpms/perl-Image-ExifTool/devel perl-Image-ExifTool.spec,1.23,1.24
Message-ID: <20091207123259.0079411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Image-ExifTool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25013

Modified Files:
	perl-Image-ExifTool.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Image-ExifTool.spec	26 Jul 2009 08:47:41 -0000	1.23
+++ perl-Image-ExifTool.spec	7 Dec 2009 12:32:58 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		perl-Image-ExifTool
 Version:	7.67
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL+ or Artistic
 Group:		Applications/Multimedia
 Summary:	Utility for reading and writing image meta info
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 7.67-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.67-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:33:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:33:38 +0000 (UTC)
Subject: rpms/perl-Pod-Abstract/devel perl-Pod-Abstract.spec,1.2,1.3
Message-ID: <20091207123338.02BAF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pod-Abstract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25326

Modified Files:
	perl-Pod-Abstract.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pod-Abstract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Abstract/devel/perl-Pod-Abstract.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Pod-Abstract.spec	26 Jul 2009 16:14:34 -0000	1.2
+++ perl-Pod-Abstract.spec	7 Dec 2009 12:33:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Abstract
 Version:        0.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Abstract document tree for Perl POD documents
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/paf.1.gz
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.17-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:35:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:35:39 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DB2/devel perl-DateTime-Format-DB2.spec,
	1.4, 1.5
Message-ID: <20091207123539.C82FE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-DB2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26039

Modified Files:
	perl-DateTime-Format-DB2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-DB2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-DB2/devel/perl-DateTime-Format-DB2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-DateTime-Format-DB2.spec	26 Jul 2009 05:35:17 -0000	1.4
+++ perl-DateTime-Format-DB2.spec	7 Dec 2009 12:35:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-DB2
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parse and format DB2 dates and times
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:36:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:36:15 +0000 (UTC)
Subject: rpms/perl-Async-MergePoint/devel perl-Async-MergePoint.spec, 1.1,
	1.2
Message-ID: <20091207123615.E2AEC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Async-MergePoint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26343

Modified Files:
	perl-Async-MergePoint.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Async-MergePoint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Async-MergePoint/devel/perl-Async-MergePoint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Async-MergePoint.spec	29 Jul 2009 09:37:26 -0000	1.1
+++ perl-Async-MergePoint.spec	7 Dec 2009 12:36:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Async-MergePoint
 Version:        0.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Resynchronise diverged control flow
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,5 +51,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-2
+- rebuild against perl 5.10.1
+
 * Tue Jul 21 2009 Nicolas Chauvet (kwizart) 0.03-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 12:37:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:37:44 +0000 (UTC)
Subject: rpms/perl-Image-Base/devel perl-Image-Base.spec,1.15,1.16
Message-ID: <20091207123744.6B69A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Image-Base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26881

Modified Files:
	perl-Image-Base.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Image-Base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Base/devel/perl-Image-Base.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Image-Base.spec	26 Jul 2009 08:47:25 -0000	1.15
+++ perl-Image-Base.spec	7 Dec 2009 12:37:44 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Image-Base
 Version:        1.07
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Base class for loading, manipulating and saving images in Perl
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-13
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:37:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:37:47 +0000 (UTC)
Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.11,1.12
Message-ID: <20091207123747.1032C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-pmtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26903

Modified Files:
	perl-pmtools.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-pmtools/devel/perl-pmtools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-pmtools.spec	26 Jul 2009 17:50:04 -0000	1.11
+++ perl-pmtools.spec	7 Dec 2009 12:37:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-pmtools
 Version:        1.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A suite of small programs to help manage Perl modules
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.10-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Mon Dec  7 12:39:50 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Dec 2009 12:39:50 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.115,
	1.116
Message-ID: <20091207123950.A8A3D11C00EE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27610

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-4
- Remove HAL elements, they're unused and obsolete



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- gstreamer-plugins-good.spec	4 Dec 2009 10:52:15 -0000	1.115
+++ gstreamer-plugins-good.spec	7 Dec 2009 12:39:50 -0000	1.116
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.17
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -59,7 +59,6 @@ BuildRequires:  libv4l-devel
 # documentation
 BuildRequires:  gtk-doc
 BuildRequires:  python-devel PyXML
-BuildRequires:  hal-devel
 
 Provides: gstreamer-plugins-pulse = 0.9.8-1
 Obsoletes: gstreamer-plugins-pulse < 0.9.8
@@ -206,7 +205,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstcairo.so
 %{_libdir}/gstreamer-%{majorminor}/libgstflac.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so
-%{_libdir}/gstreamer-%{majorminor}/libgsthalelements.so
 %{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so
 # %{_libdir}/gstreamer-%{majorminor}/libgstmikmod.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpng.so
@@ -259,6 +257,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-4
+- Remove HAL elements, they're unused and obsolete
+
 * Fri Dec 04 2009 Bastien Nocera <bnocera at redhat.com> 0.10.17-3
 - Disable LADSPA plugins, they should be in -bad (#540198)
 



From kasal at fedoraproject.org  Mon Dec  7 12:40:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:40:04 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateParse/devel
	perl-DateTime-Format-DateParse.spec, 1.3, 1.4
Message-ID: <20091207124004.94D9311C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-DateParse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27788

Modified Files:
	perl-DateTime-Format-DateParse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-DateParse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-DateParse/devel/perl-DateTime-Format-DateParse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-DateTime-Format-DateParse.spec	26 Jul 2009 05:36:03 -0000	1.3
+++ perl-DateTime-Format-DateParse.spec	7 Dec 2009 12:40:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-DateParse
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse Date::Parse compatible formats
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:40:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:40:31 +0000 (UTC)
Subject: rpms/perl-Astro-FITS-CFITSIO/devel perl-Astro-FITS-CFITSIO.spec, 1.6,
	1.7
Message-ID: <20091207124031.4C95B11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Astro-FITS-CFITSIO/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28055

Modified Files:
	perl-Astro-FITS-CFITSIO.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Astro-FITS-CFITSIO.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Astro-FITS-CFITSIO/devel/perl-Astro-FITS-CFITSIO.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Astro-FITS-CFITSIO.spec	26 Jul 2009 01:44:20 -0000	1.6
+++ perl-Astro-FITS-CFITSIO.spec	7 Dec 2009 12:40:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Astro-FITS-CFITSIO
 Version:        1.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl extension for using the cfitsio library
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From transif at fedoraproject.org  Mon Dec  7 12:41:51 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Dec 2009 12:41:51 +0000 (UTC)
Subject: comps/po mr.po,1.21,1.22
Message-ID: <20091207124151.CE8BB11C00EE@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28848/po

Modified Files:
	mr.po 
Log Message:
Sending translation for Marathi


Index: mr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/mr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mr.po	2 Sep 2009 11:41:49 -0000	1.21
+++ mr.po	7 Dec 2009 12:41:51 -0000	1.22
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-02 08:22+0000\n"
-"PO-Revision-Date: 2009-09-02 17:09+0530\n"
+"POT-Creation-Date: 2009-12-07 08:10+0000\n"
+"PO-Revision-Date: 2009-12-07 18:03+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak at redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -157,163 +157,163 @@ msgid "Clustering Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ????????? ????????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "??????????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "??????????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "??????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "????????????-?????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "?????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "???????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "???????????????????????????????????? ???????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "???????????????????????????????????? ????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "?????????????????????(UK) ??????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ????????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "??????????????? Support"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora ????????????????????????"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Fedora ????????????????????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "?????????????????????????????? ??????????????? ????????????????????????????????????????????? ??????????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -322,19 +322,19 @@ msgstr ""
 "????????????????????? ????????????????????? ????????????????????????????????? ??????????????? ????????? ????????????????????????????????? ????????? ????????????????????? ????????? ????????????."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????????????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "GNOME ??????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -343,170 +343,170 @@ msgstr ""
 "????????????????????? ????????? ?????????????????? ???????????? ?????????????????????????????? ??????????????? ?????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "????????? ????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+ ????????? GNOME ?????????????????? ??????????????????????????? ?????????????????? ?????????????????????????????? ?????? ?????????????????? ???????????????????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ??? XFCE ?????????????????? ??????????????????????????? ?????????????????? ?????????????????????????????? ?????? ?????????????????? ???????????????????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ????????? KDE ?????????????????? ??????????????????????????? ?????????????????? ?????????????????????????????? ?????? ?????????????????? ???????????????????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "???????????????????????? ?????????????????? ???????????? ??????????????? ?????????????????? ???????????????????????????????????? ???????????????????????? ????????????????????????????????? ?????????????????????????????? ?????? ?????????????????? "
 "???????????????????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "????????????????????? ???????????????????????? ?????????????????????(X) ???????????????????????????????????? ??????????????????????????? ?????? ????????? ???????????????????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "???????????????????????? ?????????????????? ?????????????????? ??????????????? ?????????????????????."
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE(K ??????????????????????????? ?????????????????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE ??????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -515,142 +515,142 @@ msgstr ""
 "????????? ?????????????????? ???????????? ?????????????????????????????? ??????????????? ?????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "??????????????? ?????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "?????????????????? ??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "?????????????????? ??????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "?????????????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "??????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ?????????????????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "??????????????? ????????????"
 
@@ -660,37 +660,37 @@ msgstr "????????????????????? ??????????
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "????????????????????????/???????????????????????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "???????????? ?????????????????? ??? ?????????????????? ???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -698,55 +698,55 @@ msgstr "?????????????????? ?????? ??????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "??????????????? ??????????????????"
 
@@ -760,73 +760,73 @@ msgstr "SUGAR ?????? OLPC XO ???????????
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????? ???????????????????????? ????????????????????????????????????????????? ????????? ?????????????????? ???????????? ??????????????? ??????????????????????????????."
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "?????????????????? ???????????? ???????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "??????????????? ???????????? ???????????????????????????????????? ?????????????????? ?????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -836,127 +836,127 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "??????????????? ????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "????????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ?????? ????????????????????????????????????(???????????????????????????) ??????????????? ??????????????????????????? ?????????????????? ????????????????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ?????? ????????????????????????????????????(???????????????????????????) ??????????????? ???????????????????????? ??????????????????????????? ??????????????????????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "?????????-?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "???????????????????????????????????????????????? ???????????????????????? ?????????, PDF ???????????????, ????????? ???????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "?????? ??????????????? ????????????????????? ????????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????? ???????????????????????????????????? ?????????????????? IMAP ??????????????? SMTP ???????????? ???????????? ??????????????????????????? ????????? ????????????."
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "?????? ????????????????????????????????? ?????????????????? ?????????????????? X ??????????????? ????????????????????????????????? ??????????????????????????? ?????????????????? ????????? ????????????."
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "?????? ????????????????????????????????? ?????????????????? ?????????????????? ????????? ??????????????????????????? ??????????????? ????????? ???????????? ?????????????????? ????????? ????????????."
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "?????? ???????????????????????????????????? ???????????????-?????????????????? ???????????? ????????? DHCP, ???????????????????????? ????????? NIS ??????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -964,19 +964,19 @@ msgstr "?????? ?????????????????????????
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "?????? ?????????????????? ???????????????????????? ????????????????????? ?????????????????????."
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????? ?????????????????? ?????????????????????????????? ????????????????????????????????? ???????????????????????? ?????????????????????."
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -984,7 +984,7 @@ msgstr "?????? ?????????????????? ??????
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -994,19 +994,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????? ?????????????????? ????????????????????? ??????????????????????????? ?????????(?????????) ???????????? ??????????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????? ?????????????????? ????????????????????? ??????????????????????????? FTP ???????????? ??????????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1016,19 +1016,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????? ????????? ????????????????????? ???????????????????????? ??????????????? ???????????? ?????????????????? ????????????????????? ????????? ????????????."
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "?????? ?????????????????? Red Hat ?????? ???????????? ????????????????????????????????? ???????????? ???????????? ??????????????????????????? ??????????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1038,13 +1038,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "?????? ??????????????? ?????????????????? ???????????????(????????????), ?????????, ????????? ?????????(???????????????) ????????????????????? ??????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1054,13 +1054,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "?????? ??????????????? ??????????????????????????????????????? ?????????????????? ???????????? ???????????? ???????????? ??????????????? ????????????????????? ????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1070,7 +1070,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1080,19 +1080,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????? ???????????? ??????????????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????? ???????????? ????????? ??????????????????????????? ????????????????????? ?????????????????????????????????????????????????????? ???????????????????????? ?????? ?????????."
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1102,13 +1102,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????? ??????????????? ????????? ????????????????????? DNS ????????? ???????????? (BIND) ??????????????????????????? ??????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1118,163 +1118,163 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????? ?????????????????????????????????  MySQL ???????????? ??????????????????????????? ????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????? ????????????????????????????????? Postgresql ???????????? ??????????????????????????? ????????????????????? ?????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ?????????????????????????????????????????? ??????????????? ??????????????? ??? ????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "??????????????????????????? ??????????????? ???????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????? ????????? ?????????????????????????????? ????????? ???????????? ???????????????????????? ??????????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "?????????(?????????) ????????????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "???????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "?????????????????? ???????????? ????????????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ??????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X ??????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ??????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "???????????? ??????????????????"
 
@@ -1288,67 +1288,67 @@ msgid "Haskell Development"
 msgstr "??????????????????????????? ???????????????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "?????????????????????????????????????????? ??????????????? ???????????????????????? ????????????????????????????????? ?????????????????? ?????????????????? ???????????????."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (??????????????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ???????????????"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "????????????????????? ???????????????????????????????????? (???????????????????????????) ???????????? ????????????????????? ??????????????????????????? ?????????????????? ????????????????????????????????? ??????????????????."
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ???????????????????????????????????? ??????????????????????????? ????????????????????? ??????????????????????????? ??????????????? ??????????????????."
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "?????????????????? ??????????????????"
 
@@ -1364,115 +1364,117 @@ msgstr "?????????????????????????????? ?
 msgid "Chichewa Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "??????????????????????????? ???????????????????????? ??????????????? ???????????? ??? ?????????????????????????????? ????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "Electronic ?????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "??????????????? ???????????? ??? ??????????????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "??????????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "????????????????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW ???????????????-?????????????????????"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "?????????????????? ????????? ??? ?????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ???????????????????????? ?????????????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1481,7 +1483,7 @@ msgstr ""
 "Fedora ????????????????????? ??????????????????????????? ??????????????? ??????????????????."
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1490,29 +1492,29 @@ msgstr ""
 "??????????????????."
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "?????? ?????? ????????????, ??????????????????, ???????????? ????????????????????? ??? ??????????????? ?????????????????? ????????????????????? ???????????????????????????????????? ???????????????????????? ???????????? ?????????."
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "??????????????? ????????????????????? ??????????????????"
 
@@ -1536,49 +1538,59 @@ msgstr "?????????????????? ??? ?????????
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ??????????????????????????? ??? ???????????????????????? ??????????????? ?????????????????? ??? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "???????????????????????? ????????? (?????????)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "???????????????????????? ????????? (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "?????????????????????????????? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
-msgstr "LXDE ?????? ????????? ??????????????????????????? ????????????????????? ?????????????????? ??????????????? ????????? ?????? ???????????????????????????, ?????????????????? ???????????? ??????????????? ???????????? ??????????????? ??????????????? ???????????? X11 ???????????????????????? ????????????????????? ?????????."
+msgstr ""
+"LXDE ?????? ????????? ??????????????????????????? ????????????????????? ?????????????????? ??????????????? ????????? ?????? ???????????????????????????, ?????????????????? ???????????? ??????????????? ???????????? ??????????????? "
+"??????????????? ???????????? X11 ???????????????????????? ????????????????????? ?????????."
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "???????????? ??? ??????????????????????????? ????????? ????????????????????????."
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Moblin ???????????????????????? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "Moblin ?????? NetBook/NetTop/MID ???????????? ??????????????? ???????????????????????? ????????????????????? ????????? ?????????."
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "???????????????????????? ??????????????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "??????????????? ??? ????????? ???????????? ???????????????????????? ??????????????????."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????????????? ??????????????????????????? ???????????????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "?????????????????? ?????????????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1586,7 +1598,7 @@ msgstr ""
 "GNOME ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ????????? ??????????????????????????? ???????????????, ???????????????????????????????????? , ????????????????????? "
 "????????????????????? ????????? ?????????????????? ???????????? ?????????????????????????????? ??????????????? ?????????????????? ?????????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1594,7 +1606,7 @@ msgstr ""
 "KDE ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ????????? ??????????????????????????? ???????????????, ???????????????????????????????????? , ????????????????????? ????????????????????? "
 "????????? ?????????????????? ???????????? ?????????????????????????????? ??????????????? ?????????????????? ?????????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1602,11 +1614,11 @@ msgstr ""
 "?????????????????? ????????? ?????????????????? ????????????????????? ??????????????????, ?????? ??????????????????????????? ??????????????? ?????? ????????????????????? ?????????????????? ????????????????????? ????????? ?????????????????? "
 "????????? ???????????????. ???????????????????????? Emacs ????????? Vi ??????????????? ?????????????????? ?????????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "XEmacs ????????? ??????????????????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1614,27 +1626,27 @@ msgstr ""
 "?????? ?????????????????? ????????????????????? DocBook ???????????????????????? ???????????????????????? ??????????????? ????????? ????????????????????? HTML, PDF, ??????????????????????????????????????????, "
 "????????? ????????? ???????????????????????? ??????????????????????????? ????????????????????? ????????? ???????????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????? ????????????????????? ?????? ?????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ???????????? ????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????."
 



From kasal at fedoraproject.org  Mon Dec  7 12:41:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:41:53 +0000 (UTC)
Subject: rpms/perl-PlRPC/devel perl-PlRPC.spec,1.2,1.3
Message-ID: <20091207124153.2EACB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PlRPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28754

Modified Files:
	perl-PlRPC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PlRPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PlRPC/devel/perl-PlRPC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-PlRPC.spec	26 Jul 2009 16:14:17 -0000	1.2
+++ perl-PlRPC.spec	7 Dec 2009 12:41:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-PlRPC 
 Version:    0.2020 
-Release:    2%{?dist} 
+Release:    3%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Interface for building pServer Clients 
@@ -59,6 +59,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2020-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2020-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hicham at fedoraproject.org  Mon Dec  7 12:42:04 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 12:42:04 +0000 (UTC)
Subject: rpms/jide-oss/F-10 import.log,1.3,1.4 jide-oss.spec,1.3,1.4
Message-ID: <20091207124204.DFA4C11C00EE@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28892/F-10

Modified Files:
	import.log jide-oss.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Dec 2009 02:54:50 -0000	1.3
+++ import.log	7 Dec 2009 12:42:04 -0000	1.4
@@ -1,3 +1,4 @@
 jide-oss-2_7_1-3_1181svn_fc11:F-10:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677941
 jide-oss-2_7_6-1_1340svn_fc12:F-10:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980535
 jide-oss-2_7_6-2_1340svn_fc12:F-10:jide-oss-2.7.6-2.1340svn.fc12.src.rpm:1259981646
+jide-oss-2_7_6-3_1340svn_fc12:F-10:jide-oss-2.7.6-3.1340svn.fc12.src.rpm:1260189683


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/jide-oss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jide-oss.spec	5 Dec 2009 02:54:50 -0000	1.3
+++ jide-oss.spec	7 Dec 2009 12:42:04 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	2.%{svnrel}svn%{?dist}
+Release:	3.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -51,6 +51,14 @@ Requires:	%{name} = %{version}
 %description javadoc
 User documentation for %{name}.
 
+%package doc
+Summary:	User documentation for %{name}
+Group:		Documentation
+Requires:	%{name} = %{version}
+
+%description doc
+User documentation for %{name}.
+
 %prep
 %setup -q -n %{name}
 find -name '*.jar' -exec rm -f '{}' \;
@@ -90,10 +98,20 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
+%files doc
+%defattr(-,root,root,-)
+%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
+
 %changelog
+* Mon Dec 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-3.1340svn
+- Fix a missing doc package
+
 * Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-2.1340svn
 - New svn snapshot
 
+* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
+- Added doc package.
+
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.



From hicham at fedoraproject.org  Mon Dec  7 12:42:07 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 12:42:07 +0000 (UTC)
Subject: rpms/jide-oss/F-11 import.log,1.3,1.4 jide-oss.spec,1.3,1.4
Message-ID: <20091207124207.F32A911C03AD@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28783/F-11

Modified Files:
	import.log jide-oss.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Dec 2009 02:54:52 -0000	1.3
+++ import.log	7 Dec 2009 12:42:07 -0000	1.4
@@ -1,3 +1,4 @@
 jide-oss-2_7_1-3_1181svn_fc11:F-11:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677715
 jide-oss-2_7_6-1_1340svn_fc12:F-11:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980473
 jide-oss-2_7_6-2_1340svn_fc12:F-11:jide-oss-2.7.6-2.1340svn.fc12.src.rpm:1259981599
+jide-oss-2_7_6-3_1340svn_fc12:F-11:jide-oss-2.7.6-3.1340svn.fc12.src.rpm:1260189658


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/jide-oss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jide-oss.spec	5 Dec 2009 02:54:53 -0000	1.3
+++ jide-oss.spec	7 Dec 2009 12:42:07 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	2.%{svnrel}svn%{?dist}
+Release:	3.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -51,6 +51,14 @@ Requires:	%{name} = %{version}
 %description javadoc
 User documentation for %{name}.
 
+%package doc
+Summary:	User documentation for %{name}
+Group:		Documentation
+Requires:	%{name} = %{version}
+
+%description doc
+User documentation for %{name}.
+
 %prep
 %setup -q -n %{name}
 find -name '*.jar' -exec rm -f '{}' \;
@@ -90,10 +98,20 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
+%files doc
+%defattr(-,root,root,-)
+%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
+
 %changelog
+* Mon Dec 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-3.1340svn
+- Fix a missing doc package
+
 * Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-2.1340svn
 - New svn snapshot
 
+* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
+- Added doc package.
+
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.



From hicham at fedoraproject.org  Mon Dec  7 12:42:10 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 12:42:10 +0000 (UTC)
Subject: rpms/jide-oss/F-12 import.log,1.3,1.4 jide-oss.spec,1.3,1.4
Message-ID: <20091207124210.6C25211C00EE@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28759/F-12

Modified Files:
	import.log jide-oss.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Dec 2009 02:54:58 -0000	1.3
+++ import.log	7 Dec 2009 12:42:10 -0000	1.4
@@ -1,3 +1,4 @@
 jide-oss-2_7_1-3_1181svn_fc11:HEAD:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677077
 jide-oss-2_7_6-1_1340svn_fc12:F-12:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980468
 jide-oss-2_7_6-2_1340svn_fc12:F-12:jide-oss-2.7.6-2.1340svn.fc12.src.rpm:1259981553
+jide-oss-2_7_6-3_1340svn_fc12:F-12:jide-oss-2.7.6-3.1340svn.fc12.src.rpm:1260189671


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-12/jide-oss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jide-oss.spec	5 Dec 2009 02:54:58 -0000	1.3
+++ jide-oss.spec	7 Dec 2009 12:42:10 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	2.%{svnrel}svn%{?dist}
+Release:	3.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -51,6 +51,14 @@ Requires:	%{name} = %{version}
 %description javadoc
 User documentation for %{name}.
 
+%package doc
+Summary:	User documentation for %{name}
+Group:		Documentation
+Requires:	%{name} = %{version}
+
+%description doc
+User documentation for %{name}.
+
 %prep
 %setup -q -n %{name}
 find -name '*.jar' -exec rm -f '{}' \;
@@ -90,10 +98,20 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
+%files doc
+%defattr(-,root,root,-)
+%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
+
 %changelog
+* Mon Dec 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-3.1340svn
+- Fix a missing doc package
+
 * Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-2.1340svn
 - New svn snapshot
 
+* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
+- Added doc package.
+
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.



From hicham at fedoraproject.org  Mon Dec  7 12:42:11 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Mon,  7 Dec 2009 12:42:11 +0000 (UTC)
Subject: rpms/jide-oss/devel import.log,1.3,1.4 jide-oss.spec,1.3,1.4
Message-ID: <20091207124211.D7BF411C00EE@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28651/devel

Modified Files:
	import.log jide-oss.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Dec 2009 02:50:41 -0000	1.3
+++ import.log	7 Dec 2009 12:42:11 -0000	1.4
@@ -1,3 +1,4 @@
 jide-oss-2_7_1-3_1181svn_fc11:HEAD:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677077
 jide-oss-2_7_6-1_1340svn_fc12:HEAD:jide-oss-2.7.6-1.1340svn.fc12.src.rpm:1259980044
 jide-oss-2_7_6-2_1340svn_fc12:HEAD:jide-oss-2.7.6-2.1340svn.fc12.src.rpm:1259981397
+jide-oss-2_7_6-3_1340svn_fc12:HEAD:jide-oss-2.7.6-3.1340svn.fc12.src.rpm:1260189643


Index: jide-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/jide-oss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jide-oss.spec	5 Dec 2009 02:50:42 -0000	1.3
+++ jide-oss.spec	7 Dec 2009 12:42:11 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		jide-oss
 Version:	2.7.6
-Release:	2.%{svnrel}svn%{?dist}
+Release:	3.%{svnrel}svn%{?dist}
 Summary:	Swing component library built on top of Java/Swing
 License:	GPLv2 with exceptions
 Group:		Development/Libraries
@@ -51,6 +51,14 @@ Requires:	%{name} = %{version}
 %description javadoc
 User documentation for %{name}.
 
+%package doc
+Summary:	User documentation for %{name}
+Group:		Documentation
+Requires:	%{name} = %{version}
+
+%description doc
+User documentation for %{name}.
+
 %prep
 %setup -q -n %{name}
 find -name '*.jar' -exec rm -f '{}' \;
@@ -90,10 +98,20 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
+%files doc
+%defattr(-,root,root,-)
+%doc docs/JIDE_Common_Layer_Developer_Guide.pdf
+
 %changelog
+* Mon Dec 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-3.1340svn
+- Fix a missing doc package
+
 * Sat Dec 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.6-2.1340svn
 - New svn snapshot
 
+* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
+- Added doc package.
+
 * Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
 - Removed Build Dependency on dos2unix.
 - Used the svn revision in the rpm name.



From kasal at fedoraproject.org  Mon Dec  7 12:42:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:42:25 +0000 (UTC)
Subject: rpms/perl-Ima-DBI/devel perl-Ima-DBI.spec,1.11,1.12
Message-ID: <20091207124225.D824611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Ima-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29277

Modified Files:
	perl-Ima-DBI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Ima-DBI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Ima-DBI/devel/perl-Ima-DBI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Ima-DBI.spec	26 Jul 2009 08:47:11 -0000	1.11
+++ perl-Ima-DBI.spec	7 Dec 2009 12:42:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Ima-DBI
 Version:        0.35
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Database connection caching and organization
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.35-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:44:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:44:02 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateManip/devel
	perl-DateTime-Format-DateManip.spec, 1.4, 1.5
Message-ID: <20091207124402.3567511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-DateManip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30225

Modified Files:
	perl-DateTime-Format-DateManip.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-DateManip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-DateManip/devel/perl-DateTime-Format-DateManip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-DateTime-Format-DateManip.spec	26 Jul 2009 05:35:48 -0000	1.4
+++ perl-DateTime-Format-DateManip.spec	7 Dec 2009 12:44:02 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-DateManip
 Version:        0.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Convert Date::Manip to DateTime and vice versa
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:46:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:46:27 +0000 (UTC)
Subject: rpms/perl-asa/devel perl-asa.spec,1.4,1.5
Message-ID: <20091207124627.7F26911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-asa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31163

Modified Files:
	perl-asa.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-asa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-asa/devel/perl-asa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-asa.spec	26 Jul 2009 17:44:11 -0000	1.4
+++ perl-asa.spec	7 Dec 2009 12:46:26 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:       perl-asa 
 Version:    0.02 
-Release:        4%{?dist}
+Release:        5%{?dist}
 # see lib/asa.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:46:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:46:47 +0000 (UTC)
Subject: rpms/perl-Pipeline/devel perl-Pipeline.spec,1.8,1.9
Message-ID: <20091207124647.147F511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Pipeline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31362

Modified Files:
	perl-Pipeline.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Pipeline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pipeline/devel/perl-Pipeline.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Pipeline.spec	26 Jul 2009 16:14:01 -0000	1.8
+++ perl-Pipeline.spec	7 Dec 2009 12:46:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Pipeline
 Version:        3.12
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Generic pipeline interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.12-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:46:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:46:56 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple-Static/devel
	perl-HTTP-Server-Simple-Static.spec, 1.2, 1.3
Message-ID: <20091207124656.96CE011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Static/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31507

Modified Files:
	perl-HTTP-Server-Simple-Static.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Server-Simple-Static.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Static/devel/perl-HTTP-Server-Simple-Static.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTTP-Server-Simple-Static.spec	26 Jul 2009 06:36:03 -0000	1.2
+++ perl-HTTP-Server-Simple-Static.spec	7 Dec 2009 12:46:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		perl-HTTP-Server-Simple-Static
 Version:	0.07
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Serve static files with HTTP::Server::Simple
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:48:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:48:19 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Builder/devel
	perl-DateTime-Format-Builder.spec, 1.7, 1.8
Message-ID: <20091207124819.802A111C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Builder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32015

Modified Files:
	perl-DateTime-Format-Builder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Format-Builder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Builder/devel/perl-DateTime-Format-Builder.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-DateTime-Format-Builder.spec	26 Jul 2009 05:34:54 -0000	1.7
+++ perl-DateTime-Format-Builder.spec	7 Dec 2009 12:48:19 -0000	1.8
@@ -12,7 +12,7 @@
 
 Name:           perl-DateTime-Format-Builder
 Version:        0.7901        
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Create DateTime parser classes and objects        
 
 Group:          Development/Libraries
@@ -114,6 +114,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.7901-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7901-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:51:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:51:17 +0000 (UTC)
Subject: rpms/perl-PHP-Serialization/devel perl-PHP-Serialization.spec, 1.3, 
	1.4
Message-ID: <20091207125117.E3CB011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PHP-Serialization/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv551

Modified Files:
	perl-PHP-Serialization.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PHP-Serialization.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PHP-Serialization/devel/perl-PHP-Serialization.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-PHP-Serialization.spec	26 Jul 2009 13:55:19 -0000	1.3
+++ perl-PHP-Serialization.spec	7 Dec 2009 12:51:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-PHP-Serialization
 Version:        0.27
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Converts between PHP's serialize() output and the equivalent Perl structure
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.27-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Mon Dec  7 12:51:19 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 12:51:19 +0000 (UTC)
Subject: rpms/rp-pppoe/F-12 rp-pppoe.spec,1.52,1.53
Message-ID: <20091207125119.8033111C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/rp-pppoe/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv497

Modified Files:
	rp-pppoe.spec 
Log Message:
fix url



Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/F-12/rp-pppoe.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- rp-pppoe.spec	9 Sep 2009 11:05:45 -0000	1.52
+++ rp-pppoe.spec	7 Dec 2009 12:51:19 -0000	1.53
@@ -1,11 +1,11 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
-Source: http://www.roaringpenguin.com/rp-pppoe-%{version}.tar.gz
+Source: http://www.roaringpenguin.com/files/download/rp-pppoe-%{version}.tar.gz
 Source1: pppoe-connect
 Source2: pppoe-setup
 Source3: pppoe-start
@@ -164,6 +164,9 @@ exit 0
 %{_mandir}/man?/*
 
 %changelog
+* Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.10-7
+- fix url
+
 * Wed Sep 09 2009 Than Ngo <than at redhat.com> - 3.10-6
 - rebuilt
 



From kasal at fedoraproject.org  Mon Dec  7 12:51:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:51:43 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple-Mason/devel
	perl-HTTP-Server-Simple-Mason.spec, 1.11, 1.12
Message-ID: <20091207125143.ABE2711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv807

Modified Files:
	perl-HTTP-Server-Simple-Mason.spec 
Log Message:
- rebuild against perl 5.10.1


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.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-HTTP-Server-Simple-Mason.spec	13 Oct 2009 08:52:35 -0000	1.11
+++ perl-HTTP-Server-Simple-Mason.spec	7 Dec 2009 12:51:43 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		perl-HTTP-Server-Simple-Mason
 Version: 	0.13
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -55,6 +55,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-2
+- rebuild against perl 5.10.1
+
 * Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
 - Upstream update.
 



From than at fedoraproject.org  Mon Dec  7 12:51:46 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 12:51:46 +0000 (UTC)
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.52,1.53
Message-ID: <20091207125146.3786A11C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/rp-pppoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv827

Modified Files:
	rp-pppoe.spec 
Log Message:
fix url



Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- rp-pppoe.spec	9 Sep 2009 11:05:45 -0000	1.52
+++ rp-pppoe.spec	7 Dec 2009 12:51:46 -0000	1.53
@@ -1,11 +1,11 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
-Source: http://www.roaringpenguin.com/rp-pppoe-%{version}.tar.gz
+Source: http://www.roaringpenguin.com/files/download/rp-pppoe-%{version}.tar.gz
 Source1: pppoe-connect
 Source2: pppoe-setup
 Source3: pppoe-start
@@ -164,6 +164,9 @@ exit 0
 %{_mandir}/man?/*
 
 %changelog
+* Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.10-7
+- fix url
+
 * Wed Sep 09 2009 Than Ngo <than at redhat.com> - 3.10-6
 - rebuilt
 



From kasal at fedoraproject.org  Mon Dec  7 12:52:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:52:03 +0000 (UTC)
Subject: rpms/perl-Array-RefElem/devel perl-Array-RefElem.spec,1.4,1.5
Message-ID: <20091207125203.EF8B111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Array-RefElem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1116

Modified Files:
	perl-Array-RefElem.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Array-RefElem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Array-RefElem/devel/perl-Array-RefElem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Array-RefElem.spec	26 Jul 2009 01:44:00 -0000	1.4
+++ perl-Array-RefElem.spec	7 Dec 2009 12:52:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Array-RefElem
 Version:        1.00
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Set up array elements as aliases
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dodji at fedoraproject.org  Mon Dec  7 12:53:41 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Mon,  7 Dec 2009 12:53:41 +0000 (UTC)
Subject: rpms/nemiver/F-10 .cvsignore, 1.18, 1.19 nemiver.spec, 1.28,
	1.29 sources, 1.18, 1.19
Message-ID: <20091207125341.1192011C00EE@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/nemiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1615

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
* Sun Dec 06 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
- Update to new upstream release (0.7.3)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	12 Sep 2009 20:58:23 -0000	1.18
+++ .cvsignore	7 Dec 2009 12:53:40 -0000	1.19
@@ -2,3 +2,4 @@ nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
 nemiver-0.7.1.tar.bz2
 nemiver-0.7.2.tar.bz2
+nemiver-0.7.3.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/nemiver.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nemiver.spec	12 Sep 2009 20:45:21 -0000	1.28
+++ nemiver.spec	7 Dec 2009 12:53:40 -0000	1.29
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.2
+Version:	0.7.3
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -156,6 +156,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Sun Dec 06 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
+- Update to new upstream release (0.7.3)
+
 * Sat Sep 12 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.2-1
 - Update to new upstream release (0.7.2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	12 Sep 2009 20:58:23 -0000	1.18
+++ sources	7 Dec 2009 12:53:40 -0000	1.19
@@ -2,3 +2,4 @@ eeb0f56cf70d26746f79486bd5437ac7  nemive
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
 9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2
 a80f3d47b4ebf7fafa0225185112f377  nemiver-0.7.2.tar.bz2
+7159d64bd78dc55aad892077fb75dfec  nemiver-0.7.3.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 12:53:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:53:44 +0000 (UTC)
Subject: rpms/perl-DateTime-Event-Recurrence/devel
	perl-DateTime-Event-Recurrence.spec, 1.7, 1.8
Message-ID: <20091207125344.1092A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Event-Recurrence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1828

Modified Files:
	perl-DateTime-Event-Recurrence.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Event-Recurrence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Event-Recurrence/devel/perl-DateTime-Event-Recurrence.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-DateTime-Event-Recurrence.spec	26 Jul 2009 05:34:39 -0000	1.7
+++ perl-DateTime-Event-Recurrence.spec	7 Dec 2009 12:53:43 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Event-Recurrence
 Version:        0.16
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        DateTime::Set extension for create basic recurrence sets
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:55:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:55:47 +0000 (UTC)
Subject: rpms/perl-pgsql_perl5/devel perl-pgsql_perl5.spec,1.3,1.4
Message-ID: <20091207125547.D219111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-pgsql_perl5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2605

Modified Files:
	perl-pgsql_perl5.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-pgsql_perl5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-pgsql_perl5/devel/perl-pgsql_perl5.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-pgsql_perl5.spec	26 Jul 2009 17:49:48 -0000	1.3
+++ perl-pgsql_perl5.spec	7 Dec 2009 12:55:47 -0000	1.4
@@ -1,7 +1,7 @@
 %define realname pgsql_perl5
 Name:           perl-pgsql_perl5
 Version:        1.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Pg - Perl5 extension for PostgreSQL
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9.0-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:56:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:56:07 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple/devel perl-HTTP-Server-Simple.spec,
	1.20, 1.21
Message-ID: <20091207125607.E20F811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2852

Modified Files:
	perl-HTTP-Server-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-HTTP-Server-Simple.spec	13 Oct 2009 08:38:32 -0000	1.20
+++ perl-HTTP-Server-Simple.spec	7 Dec 2009 12:56:07 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Server-Simple
 Version:        0.41
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.41-2
+- rebuild against perl 5.10.1
+
 * Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
 - Upstream update.
 



From kasal at fedoraproject.org  Mon Dec  7 12:56:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:56:35 +0000 (UTC)
Subject: rpms/perl-Array-Diff/devel perl-Array-Diff.spec,1.5,1.6
Message-ID: <20091207125635.C0EA911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Array-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3070

Modified Files:
	perl-Array-Diff.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Array-Diff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Array-Diff/devel/perl-Array-Diff.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Array-Diff.spec	26 Jul 2009 01:43:38 -0000	1.5
+++ perl-Array-Diff.spec	7 Dec 2009 12:56:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Array-Diff
 Version:        0.05002
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Diff two arrays
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05002-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05002-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 12:57:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 12:57:41 +0000 (UTC)
Subject: rpms/perl-DateTime-Event-ICal/devel perl-DateTime-Event-ICal.spec,
	1.7, 1.8
Message-ID: <20091207125741.78F2811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Event-ICal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3613

Modified Files:
	perl-DateTime-Event-ICal.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Event-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Event-ICal/devel/perl-DateTime-Event-ICal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-DateTime-Event-ICal.spec	26 Jul 2009 05:34:22 -0000	1.7
+++ perl-DateTime-Event-ICal.spec	7 Dec 2009 12:57:41 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Event-ICal
 Version:        0.09
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl DateTime extension for computing rfc2445 recurrences
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pmatilai at fedoraproject.org  Mon Dec  7 12:58:37 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Mon,  7 Dec 2009 12:58:37 +0000 (UTC)
Subject: File rpm-4.8.0-beta1.tar.bz2 uploaded to lookaside cache by pmatilai
Message-ID: <20091207125837.97B9210F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rpm:

dfe8f6b28d85b85b66ddacf712904fc1  rpm-4.8.0-beta1.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 13:00:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:00:08 +0000 (UTC)
Subject: rpms/perl-Perl-Tags/devel perl-Perl-Tags.spec,1.2,1.3
Message-ID: <20091207130008.7D71911C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Perl-Tags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4676

Modified Files:
	perl-Perl-Tags.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Perl-Tags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/devel/perl-Perl-Tags.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Perl-Tags.spec	26 Jul 2009 16:11:36 -0000	1.2
+++ perl-Perl-Tags.spec	7 Dec 2009 13:00:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Perl-Tags
 Version:        0.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate Ctags style tags for Perl sourcecode
 License:        (GPL+ or Artistic) or Vim
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.26-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:00:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:00:59 +0000 (UTC)
Subject: rpms/perl-HTTP-Response-Encoding/devel
	perl-HTTP-Response-Encoding.spec, 1.7, 1.8
Message-ID: <20091207130059.BFF1B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5100

Modified Files:
	perl-HTTP-Response-Encoding.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Response-Encoding.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel/perl-HTTP-Response-Encoding.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-HTTP-Response-Encoding.spec	7 Aug 2009 03:16:12 -0000	1.7
+++ perl-HTTP-Response-Encoding.spec	7 Dec 2009 13:00:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Response-Encoding
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTTP::Response::Encoding Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-2
+- rebuild against perl 5.10.1
+
 * Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-1
 - Upstream update.
 



From kasal at fedoraproject.org  Mon Dec  7 13:02:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:02:28 +0000 (UTC)
Subject: rpms/perl-Array-Compare/devel perl-Array-Compare.spec,1.14,1.15
Message-ID: <20091207130228.717A811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Array-Compare/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5670

Modified Files:
	perl-Array-Compare.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Array-Compare.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Array-Compare/devel/perl-Array-Compare.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Array-Compare.spec	5 Oct 2009 16:20:36 -0000	1.14
+++ perl-Array-Compare.spec	7 Dec 2009 13:02:28 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Array-Compare
 Version:        2.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for comparing arrays
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.01-2
+- rebuild against perl 5.10.1
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.01-1
 - new upstream version, BR perl(Moose)
 



From kwizart at fedoraproject.org  Mon Dec  7 13:03:18 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon,  7 Dec 2009 13:03:18 +0000 (UTC)
Subject: File AnyEvent-5.22.tar.gz uploaded to lookaside cache by kwizart
Message-ID: <20091207130318.03C9010F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-AnyEvent:

b80fb0638ea729ea311aa00a1e2a5432  AnyEvent-5.22.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 13:03:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:03:52 +0000 (UTC)
Subject: rpms/perl-DateTime-Calendar-Mayan/devel
	perl-DateTime-Calendar-Mayan.spec, 1.2, 1.3
Message-ID: <20091207130352.90FBB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime-Calendar-Mayan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6244

Modified Files:
	perl-DateTime-Calendar-Mayan.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime-Calendar-Mayan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Calendar-Mayan/devel/perl-DateTime-Calendar-Mayan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-DateTime-Calendar-Mayan.spec	26 Jul 2009 05:34:07 -0000	1.2
+++ perl-DateTime-Calendar-Mayan.spec	7 Dec 2009 13:03:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-DateTime-Calendar-Mayan 
 Version:    0.0601 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/DateTime/Calendar/Mayan.pod -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.0601-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0601-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:04:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:04:44 +0000 (UTC)
Subject: rpms/perl-Perl-MinimumVersion/devel perl-Perl-MinimumVersion.spec, 
	1.12, 1.13
Message-ID: <20091207130444.AAE1011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6593

Modified Files:
	perl-Perl-MinimumVersion.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Perl-MinimumVersion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-MinimumVersion/devel/perl-Perl-MinimumVersion.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Perl-MinimumVersion.spec	26 Jul 2009 16:11:22 -0000	1.12
+++ perl-Perl-MinimumVersion.spec	7 Dec 2009 13:04:44 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Perl-MinimumVersion
 Version:        1.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Find a minimum required version of perl for Perl code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.20-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:05:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:05:11 +0000 (UTC)
Subject: rpms/perl-HTTP-Request-Params/devel perl-HTTP-Request-Params.spec,
	1.6, 1.7
Message-ID: <20091207130511.9BC5A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Request-Params/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6832

Modified Files:
	perl-HTTP-Request-Params.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Request-Params.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Request-Params/devel/perl-HTTP-Request-Params.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-HTTP-Request-Params.spec	26 Jul 2009 06:35:06 -0000	1.6
+++ perl-HTTP-Request-Params.spec	7 Dec 2009 13:05:11 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Request-Params
 Version:        1.01
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Retrieve GET/POST Parameters from HTTP Requests
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From liangsuilong at fedoraproject.org  Mon Dec  7 13:05:15 2009
From: liangsuilong at fedoraproject.org (Liang Suilong)
Date: Mon,  7 Dec 2009 13:05:15 +0000 (UTC)
Subject: File shutter-0.85.1.tar.gz uploaded to lookaside cache by
	liangsuilong
Message-ID: <20091207130515.A4A0810F861@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for shutter:

65523d7b3199ac1d03c1577e68725e36  shutter-0.85.1.tar.gz



From liangsuilong at fedoraproject.org  Mon Dec  7 13:06:59 2009
From: liangsuilong at fedoraproject.org (Liang Suilong)
Date: Mon,  7 Dec 2009 13:06:59 +0000 (UTC)
Subject: rpms/shutter/F-12 .cvsignore, 1.3, 1.4 shutter.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091207130659.6E87D11C00EE@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7473

Modified Files:
	.cvsignore shutter.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Nov 2009 05:00:47 -0000	1.3
+++ .cvsignore	7 Dec 2009 13:06:59 -0000	1.4
@@ -1 +1,2 @@
 shutter-0.85.tar.gz
+shutter-0.85.1.tar.gz


Index: shutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-12/shutter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- shutter.spec	23 Nov 2009 05:00:47 -0000	1.3
+++ shutter.spec	7 Dec 2009 13:06:59 -0000	1.4
@@ -1,6 +1,6 @@
 #%define  ppa_version ppa6
 Name:		shutter
-Version:	0.85
+Version:	0.85.1
 Release:	1%{?dist}
 Summary:	GTK+ 2.0 screenshot application written in perl
 Group:		Applications/Multimedia
@@ -66,9 +66,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}*
 %{_datadir}/pixmaps/
-
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Dec 7 2009 Liang Suilong <liangsuilong at gmail.com> - 0.85.1-1
+- Upgrade to shutter-0.85.1
+
 * Sat Nov 21 2009 Liang Suilong <liangsuilong at gmail.com> - 0.85-1
 - Upgrade to shutter-0.85
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Nov 2009 05:00:47 -0000	1.3
+++ sources	7 Dec 2009 13:06:59 -0000	1.4
@@ -1 +1,2 @@
 f0fc2d20695b65f22d5489217407cb60  shutter-0.85.tar.gz
+65523d7b3199ac1d03c1577e68725e36  shutter-0.85.1.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 13:07:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:07:05 +0000 (UTC)
Subject: rpms/perl-Archive-Zip/devel perl-Archive-Zip.spec,1.17,1.18
Message-ID: <20091207130705.C36CB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Archive-Zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7566

Modified Files:
	perl-Archive-Zip.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Archive-Zip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-Zip/devel/perl-Archive-Zip.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Archive-Zip.spec	27 Jul 2009 10:31:07 -0000	1.17
+++ perl-Archive-Zip.spec	7 Dec 2009 13:07:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Zip
 Version:        1.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl library for accessing Zip archives
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.30-2
+- rebuild against perl 5.10.1
+
 * Mon Jul 27 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.30-1
 - update to 1.30
 



From kasal at fedoraproject.org  Mon Dec  7 13:08:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:08:15 +0000 (UTC)
Subject: rpms/perl-DateTime/devel perl-DateTime.spec,1.33,1.34
Message-ID: <20091207130815.2D4A011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8173

Modified Files:
	perl-DateTime.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-DateTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/perl-DateTime.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- perl-DateTime.spec	26 Jul 2009 05:33:52 -0000	1.33
+++ perl-DateTime.spec	7 Dec 2009 13:08:15 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name:           perl-DateTime
 Version:        0.4501
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Date and time objects
 License:        GPL+ or Artistic
@@ -148,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:0.4501-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.4501-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:08:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:08:53 +0000 (UTC)
Subject: rpms/perl-perlmenu/devel perl-perlmenu.spec,1.7,1.8
Message-ID: <20091207130853.E7E4E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-perlmenu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8458

Modified Files:
	perl-perlmenu.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-perlmenu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-perlmenu/devel/perl-perlmenu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-perlmenu.spec	26 Jul 2009 17:49:33 -0000	1.7
+++ perl-perlmenu.spec	7 Dec 2009 13:08:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-perlmenu
 Version:        4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Perl library module for curses-based menus & data-entry templates
 
 Group:          Development/Libraries
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.0-10
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:09:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:09:46 +0000 (UTC)
Subject: rpms/perl-HTTP-Request-AsCGI/devel perl-HTTP-Request-AsCGI.spec, 1.7,
	1.8
Message-ID: <20091207130946.59B9711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Request-AsCGI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8860

Modified Files:
	perl-HTTP-Request-AsCGI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Request-AsCGI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Request-AsCGI/devel/perl-HTTP-Request-AsCGI.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-HTTP-Request-AsCGI.spec	26 Jul 2009 06:34:51 -0000	1.7
+++ perl-HTTP-Request-AsCGI.spec	7 Dec 2009 13:09:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Request-AsCGI
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Setup a CGI enviroment from a HTTP::Request
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From liangsuilong at fedoraproject.org  Mon Dec  7 13:10:39 2009
From: liangsuilong at fedoraproject.org (Liang Suilong)
Date: Mon,  7 Dec 2009 13:10:39 +0000 (UTC)
Subject: rpms/shutter/devel .cvsignore, 1.3, 1.4 shutter.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091207131039.8697311C03FC@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8937

Modified Files:
	.cvsignore shutter.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Nov 2009 05:01:49 -0000	1.3
+++ .cvsignore	7 Dec 2009 13:10:39 -0000	1.4
@@ -1 +1,2 @@
 shutter-0.85.tar.gz
+shutter-0.85.1.tar.gz


Index: shutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/devel/shutter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- shutter.spec	23 Nov 2009 05:01:49 -0000	1.3
+++ shutter.spec	7 Dec 2009 13:10:39 -0000	1.4
@@ -1,6 +1,6 @@
 #%define  ppa_version ppa6
 Name:		shutter
-Version:	0.85
+Version:	0.85.1
 Release:	1%{?dist}
 Summary:	GTK+ 2.0 screenshot application written in perl
 Group:		Applications/Multimedia
@@ -66,9 +66,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}*
 %{_datadir}/pixmaps/
-
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Dec 7 2009 Liang Suilong <liangsuilong at gmail.com> - 0.85.1-1
+- Upgrade to shutter-0.85.1
+
 * Sat Nov 21 2009 Liang Suilong <liangsuilong at gmail.com> - 0.85-1
 - Upgrade to shutter-0.85
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Nov 2009 05:01:49 -0000	1.3
+++ sources	7 Dec 2009 13:10:39 -0000	1.4
@@ -1 +1,2 @@
 f0fc2d20695b65f22d5489217407cb60  shutter-0.85.tar.gz
+65523d7b3199ac1d03c1577e68725e36  shutter-0.85.1.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 13:11:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:11:14 +0000 (UTC)
Subject: rpms/perl-Archive-RPM/devel perl-Archive-RPM.spec,1.2,1.3
Message-ID: <20091207131114.6CC4611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Archive-RPM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9471

Modified Files:
	perl-Archive-RPM.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Archive-RPM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-RPM/devel/perl-Archive-RPM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Archive-RPM.spec	26 Jul 2009 01:42:48 -0000	1.2
+++ perl-Archive-RPM.spec	7 Dec 2009 13:11:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Archive-RPM 
 Version:    0.04 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Archive/RPM.pm -> LGPLv2+
 # lib/Archive/RPM/ChangeLogEntry.pm -> LGPLv2+
 License:    LGPLv2+
@@ -62,6 +62,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:13:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:13:27 +0000 (UTC)
Subject: rpms/perl-PerlIO-via-symlink/devel perl-PerlIO-via-symlink.spec, 1.5,
	1.6
Message-ID: <20091207131327.E539911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PerlIO-via-symlink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10409

Modified Files:
	perl-PerlIO-via-symlink.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PerlIO-via-symlink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PerlIO-via-symlink/devel/perl-PerlIO-via-symlink.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-PerlIO-via-symlink.spec	26 Jul 2009 16:13:15 -0000	1.5
+++ perl-PerlIO-via-symlink.spec	7 Dec 2009 13:13:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-PerlIO-via-symlink
 Version:        0.05
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        PerlIO layers for create symlinks
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:14:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:14:04 +0000 (UTC)
Subject: rpms/perl-Date-Simple/devel perl-Date-Simple.spec,1.13,1.14
Message-ID: <20091207131404.BA2A211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Date-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10732

Modified Files:
	perl-Date-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Date-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Simple/devel/perl-Date-Simple.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Date-Simple.spec	26 Jul 2009 05:33:20 -0000	1.13
+++ perl-Date-Simple.spec	7 Dec 2009 13:14:04 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	Simple date object for perl
 Name:		perl-Date-Simple
 Version:	3.03
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Date-Simple/
@@ -59,6 +59,9 @@ BuildRequires:	perl(ExtUtils::MakeMaker)
 %{_mandir}/man3/Date::Simple*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.03-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:14:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:14:26 +0000 (UTC)
Subject: rpms/perl-HTTP-Recorder/devel perl-HTTP-Recorder.spec,1.4,1.5
Message-ID: <20091207131426.D38D311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Recorder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10952

Modified Files:
	perl-HTTP-Recorder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Recorder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Recorder/devel/perl-HTTP-Recorder.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-HTTP-Recorder.spec	26 Jul 2009 06:34:36 -0000	1.4
+++ perl-HTTP-Recorder.spec	7 Dec 2009 13:14:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Recorder
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Record interaction with web sites
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:15:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:15:37 +0000 (UTC)
Subject: rpms/perl-Archive-Any/devel perl-Archive-Any.spec,1.6,1.7
Message-ID: <20091207131537.3668911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Archive-Any/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11406

Modified Files:
	perl-Archive-Any.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Archive-Any.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-Any/devel/perl-Archive-Any.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Archive-Any.spec	26 Jul 2009 01:42:35 -0000	1.6
+++ perl-Archive-Any.spec	7 Dec 2009 13:15:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Any
 Version:        0.0932
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Single interface to deal with file archives
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.0932-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0932-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:17:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:17:28 +0000 (UTC)
Subject: rpms/perl-PerlIO-via-dynamic/devel perl-PerlIO-via-dynamic.spec, 1.5,
	1.6
Message-ID: <20091207131728.1E42A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PerlIO-via-dynamic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12071

Modified Files:
	perl-PerlIO-via-dynamic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PerlIO-via-dynamic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PerlIO-via-dynamic/devel/perl-PerlIO-via-dynamic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-PerlIO-via-dynamic.spec	26 Jul 2009 16:13:00 -0000	1.5
+++ perl-PerlIO-via-dynamic.spec	7 Dec 2009 13:17:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-PerlIO-via-dynamic
 Version:        0.12
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Dynamic PerlIO layers
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From liangsuilong at fedoraproject.org  Mon Dec  7 13:17:40 2009
From: liangsuilong at fedoraproject.org (Liang Suilong)
Date: Mon,  7 Dec 2009 13:17:40 +0000 (UTC)
Subject: rpms/shutter/F-11 .cvsignore, 1.3, 1.4 shutter.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091207131740.6116B11C00EE@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12082

Modified Files:
	.cvsignore shutter.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Nov 2009 05:00:01 -0000	1.3
+++ .cvsignore	7 Dec 2009 13:17:40 -0000	1.4
@@ -1 +1,2 @@
 shutter-0.85.tar.gz
+shutter-0.85.1.tar.gz


Index: shutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-11/shutter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- shutter.spec	23 Nov 2009 05:00:01 -0000	1.3
+++ shutter.spec	7 Dec 2009 13:17:40 -0000	1.4
@@ -1,6 +1,6 @@
 #%define  ppa_version ppa6
 Name:		shutter
-Version:	0.85
+Version:	0.85.1
 Release:	1%{?dist}
 Summary:	GTK+ 2.0 screenshot application written in perl
 Group:		Applications/Multimedia
@@ -66,9 +66,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}*
 %{_datadir}/pixmaps/
-
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Dec 7 2009 Liang Suilong <liangsuilong at gmail.com> - 0.85.1-1
+- Upgrade to shutter-0.85.1
+
 * Sat Nov 21 2009 Liang Suilong <liangsuilong at gmail.com> - 0.85-1
 - Upgrade to shutter-0.85
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Nov 2009 05:00:01 -0000	1.3
+++ sources	7 Dec 2009 13:17:40 -0000	1.4
@@ -1 +1,2 @@
 f0fc2d20695b65f22d5489217407cb60  shutter-0.85.tar.gz
+65523d7b3199ac1d03c1577e68725e36  shutter-0.85.1.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 13:18:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:18:21 +0000 (UTC)
Subject: rpms/perl-Date-Pcalc/devel perl-Date-Pcalc.spec,1.6,1.7
Message-ID: <20091207131821.C38ED11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Date-Pcalc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12563

Modified Files:
	perl-Date-Pcalc.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Date-Pcalc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Pcalc/devel/perl-Date-Pcalc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Date-Pcalc.spec	26 Jul 2009 05:33:05 -0000	1.6
+++ perl-Date-Pcalc.spec	7 Dec 2009 13:18:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Date-Pcalc
 Version:	1.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Gregorian calendar date calculations
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -49,6 +49,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:18:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:18:53 +0000 (UTC)
Subject: rpms/perl-HTTP-Proxy/devel perl-HTTP-Proxy.spec,1.11,1.12
Message-ID: <20091207131853.D4C9711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Proxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12835

Modified Files:
	perl-HTTP-Proxy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Proxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Proxy/devel/perl-HTTP-Proxy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-HTTP-Proxy.spec	26 Jul 2009 06:34:21 -0000	1.11
+++ perl-HTTP-Proxy.spec	7 Dec 2009 13:18:53 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Proxy
 Version:        0.23
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A pure Perl HTTP proxy
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.23-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From liangsuilong at fedoraproject.org  Mon Dec  7 13:19:37 2009
From: liangsuilong at fedoraproject.org (Liang Suilong)
Date: Mon,  7 Dec 2009 13:19:37 +0000 (UTC)
Subject: rpms/shutter/F-10 .cvsignore, 1.2, 1.3 shutter.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091207131937.7052111C00EE@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13151

Modified Files:
	.cvsignore shutter.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2009 06:44:40 -0000	1.2
+++ .cvsignore	7 Dec 2009 13:19:37 -0000	1.3
@@ -1 +1,2 @@
 shutter-0.80.1.tar.gz
+shutter-0.85.1.tar.gz


Index: shutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-10/shutter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- shutter.spec	16 Aug 2009 06:14:07 -0000	1.2
+++ shutter.spec	7 Dec 2009 13:19:37 -0000	1.3
@@ -1,7 +1,7 @@
 #%define  ppa_version ppa6
 Name:		shutter
-Version:	0.80.1
-Release:	2%{?dist}
+Version:	0.85.1
+Release:	1%{?dist}
 Summary:	GTK+ 2.0 screenshot application written in perl
 Group:		Applications/Multimedia
 License:	GPL+ or Artistic
@@ -10,9 +10,10 @@ Source0:	http://shutter-project.org/wp-c
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
-Requires:	gnome-web-photo
+Requires:	gnome-web-photo, gtklp
 Requires:	perl(Gtk2::ImageView)
 Requires:	perl(X11::Protocol)
+Requires:	nautilus-sendto
 
 %description
 Shutter is a GTK+ 2.0 screenshot application written in perl.
@@ -65,11 +66,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}*
 %{_datadir}/pixmaps/
-
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Sun Aug 16 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-2
-- Remove requires: gtklp
+* Mon Dec 7 2009 Liang Suilong <liangsuilong at gmail.com> - 0.85.1-1
+- Upgrade to shutter-0.85.1
+
+* Sat Nov 21 2009 Liang Suilong <liangsuilong at gmail.com> - 0.85-1
+- Upgrade to shutter-0.85
 
 * Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-1
 - Updrade to shutter-0.80.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 06:44:40 -0000	1.2
+++ sources	7 Dec 2009 13:19:37 -0000	1.3
@@ -1 +1,2 @@
 fe328193f496847f0a563f294eed0b1f  shutter-0.80.1.tar.gz
+65523d7b3199ac1d03c1577e68725e36  shutter-0.85.1.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 13:19:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:19:50 +0000 (UTC)
Subject: rpms/perl-App-Nopaste/devel perl-App-Nopaste.spec,1.10,1.11
Message-ID: <20091207131950.CFD0F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-App-Nopaste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13288

Modified Files:
	perl-App-Nopaste.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-App-Nopaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/devel/perl-App-Nopaste.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-App-Nopaste.spec	7 Nov 2009 09:49:05 -0000	1.10
+++ perl-App-Nopaste.spec	7 Dec 2009 13:19:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-App-Nopaste
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easy access to any pastebin
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.17-2
+- rebuild against perl 5.10.1
+
 * Sat Nov 07 2009 Iain Arnell <iarnell at gmail.com> 0.17-1
 - update to latest upstream version (fixes Gist support better)
 



From kasal at fedoraproject.org  Mon Dec  7 13:21:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:21:45 +0000 (UTC)
Subject: rpms/perl-PerlIO-gzip/devel perl-PerlIO-gzip.spec,1.6,1.7
Message-ID: <20091207132145.E487611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PerlIO-gzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14138

Modified Files:
	perl-PerlIO-gzip.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PerlIO-gzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PerlIO-gzip/devel/perl-PerlIO-gzip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-PerlIO-gzip.spec	28 Aug 2009 16:47:50 -0000	1.6
+++ perl-PerlIO-gzip.spec	7 Dec 2009 13:21:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-PerlIO-gzip
 Version:        0.18
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl extension to provide a PerlIO layer to gzip/gunzip
 # See Makefile.PL, gzip.xs, etc.
 License:        GPL+ or Artistic
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-7
+- rebuild against perl 5.10.1
+
 * Fri Aug 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-6
 - bump
 



From kasal at fedoraproject.org  Mon Dec  7 13:22:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:22:21 +0000 (UTC)
Subject: rpms/perl-Date-Manip/devel perl-Date-Manip.spec,1.8,1.9
Message-ID: <20091207132221.8D9E911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Date-Manip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14464

Modified Files:
	perl-Date-Manip.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Date-Manip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Manip/devel/perl-Date-Manip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Date-Manip.spec	26 Jul 2009 05:32:49 -0000	1.8
+++ perl-Date-Manip.spec	7 Dec 2009 13:22:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Date-Manip
 Version:        5.54
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Perl module containing a wide variety of date manipulation routines
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 5.54-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.54-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sparks at fedoraproject.org  Mon Dec  7 13:22:27 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon,  7 Dec 2009 13:22:27 +0000 (UTC)
Subject: File tags_menutree_2.2-r192.zip uploaded to lookaside cache by
	sparks
Message-ID: <20091207132227.7105A10F861@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for zikula-module-menutree:

72f19c4d95d935e29e54a8ecb1f8e795  tags_menutree_2.2-r192.zip



From steved at fedoraproject.org  Mon Dec  7 13:22:33 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  7 Dec 2009 13:22:33 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-v4root-rel9.patch, NONE,
	1.1 nfs-utils.spec, 1.253,
	1.254 nfs-utils-1.2.0-v4root-rel8.patch, 1.1, NONE
Message-ID: <20091207132233.EB62911C00EE@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14401

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-v4root-rel9.patch 
Removed Files:
	nfs-utils-1.2.0-v4root-rel8.patch 
Log Message:
- Updated to the latest pseudo root release (rel9).


nfs-utils-1.2.0-v4root-rel9.patch:
 support/export/xtab.c           |    6 +
 support/include/nfs/export.h    |    3 
 support/include/pseudoflavors.h |    1 
 support/include/v4root.h        |   15 ++
 support/nfs/exports.c           |   24 +++-
 utils/mountd/Makefile.am        |    2 
 utils/mountd/auth.c             |    3 
 utils/mountd/mountd.c           |    4 
 utils/mountd/v4root.c           |  228 ++++++++++++++++++++++++++++++++++++++++
 9 files changed, 280 insertions(+), 6 deletions(-)

--- NEW FILE nfs-utils-1.2.0-v4root-rel9.patch ---
diff --git a/support/export/xtab.c b/support/export/xtab.c
index 3b1dcce..2a43193 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -19,7 +19,9 @@
 #include "exportfs.h"
 #include "xio.h"
 #include "xlog.h"
+#include "v4root.h"
 
+int v4root_needed;
 static void cond_rename(char *newfile, char *oldfile);
 
 static int
@@ -36,6 +38,8 @@ xtab_read(char *xtab, char *lockfn, int is_export)
 	if ((lockid = xflock(lockfn, "r")) < 0)
 		return 0;
 	setexportent(xtab, "r");
+	if (is_export == 1)
+		v4root_needed = 1;
 	while ((xp = getexportent(is_export==0, 0)) != NULL) {
 		if (!(exp = export_lookup(xp->e_hostname, xp->e_path, is_export != 1)) &&
 		    !(exp = export_create(xp, is_export!=1))) {
@@ -48,6 +52,8 @@ xtab_read(char *xtab, char *lockfn, int is_export)
 		case 1:
 			exp->m_xtabent = 1;
 			exp->m_mayexport = 1;
+			if ((xp->e_flags & NFSEXP_FSID) && xp->e_fsid == 0)
+				v4root_needed = 0;
 			break;
 		case 2:
 			exp->m_exported = -1;/* may be exported */
diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h
index f7a99ba..76953ac 100644
--- a/support/include/nfs/export.h
+++ b/support/include/nfs/export.h
@@ -24,6 +24,7 @@
 #define NFSEXP_FSID		0x2000
 #define	NFSEXP_CROSSMOUNT	0x4000
 #define NFSEXP_NOACL		0x8000 /* reserved for possible ACL related use */
-#define NFSEXP_ALLFLAGS		0xFFFF
+#define NFSEXP_V4ROOT       0x10000
+#define NFSEXP_ALLFLAGS		0x1FFFF
 
 #endif /* _NSF_EXPORT_H */
diff --git a/support/include/pseudoflavors.h b/support/include/pseudoflavors.h
index c21087b..c7ba8a2 100644
--- a/support/include/pseudoflavors.h
+++ b/support/include/pseudoflavors.h
@@ -15,3 +15,4 @@ struct flav_info {
 
 extern struct flav_info flav_map[];
 extern const int flav_map_size;
+extern unsigned int flavors_setall(struct exportent *ep);
diff --git a/support/include/v4root.h b/support/include/v4root.h
new file mode 100644
index 0000000..706c15c
--- /dev/null
+++ b/support/include/v4root.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2009 Red Hat <nfs at redhat.com>
+ * support/include/v4root.h
+ *
+ * Support routines for dynamic pseudo roots.
+ *
+ */
+
+#ifndef V4ROOT_H
+#define V4ROOT_H
+
+extern int v4root_needed;
+extern void v4root_set(void);
+
+#endif /* V4ROOT_H */
diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 1aaebf4..fe9ed3a 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -39,16 +39,18 @@ struct flav_info flav_map[] = {
 	{ "krb5",	RPC_AUTH_GSS_KRB5	},
 	{ "krb5i",	RPC_AUTH_GSS_KRB5I	},
 	{ "krb5p",	RPC_AUTH_GSS_KRB5P	},
+	{ "unix",	AUTH_UNIX		},
+	{ "sys",	AUTH_SYS		},
+	{ "null",	AUTH_NULL		},
+	{ "none",	AUTH_NONE		},
+#ifdef NOLONGERSUPPORTED
 	{ "lipkey",	RPC_AUTH_GSS_LKEY	},
 	{ "lipkey-i",	RPC_AUTH_GSS_LKEYI	},
 	{ "lipkey-p",	RPC_AUTH_GSS_LKEYP	},
 	{ "spkm3",	RPC_AUTH_GSS_SPKM	},
 	{ "spkm3i",	RPC_AUTH_GSS_SPKMI	},
 	{ "spkm3p",	RPC_AUTH_GSS_SPKMP	},
-	{ "unix",	AUTH_UNIX		},
-	{ "sys",	AUTH_SYS		},
-	{ "null",	AUTH_NULL		},
-	{ "none",	AUTH_NONE		},
+#endif
 };
 
 const int flav_map_size = sizeof(flav_map)/sizeof(flav_map[0]);
@@ -436,6 +438,20 @@ static unsigned int parse_flavors(char *str, struct exportent *ep)
 	}
 	return out;
 }
+unsigned int flavors_setall(struct exportent *ep)
+{
+	struct flav_info *flav;
+	unsigned int out=0;
+	int bit;
+
+	for (flav = flav_map; flav < flav_map + flav_map_size; flav++) {
+		bit = secinfo_addflavor(flav, ep);
+		if (bit < 0)
+			return 0;
+		out |= 1<<bit;
+	}
+	return out;
+}
 
 /* Sets the bits in @mask for the appropriate security flavor flags. */
 static void setflags(int mask, unsigned int active, struct exportent *ep)
diff --git a/utils/mountd/Makefile.am b/utils/mountd/Makefile.am
index 1e76cf8..eba81fc 100644
--- a/utils/mountd/Makefile.am
+++ b/utils/mountd/Makefile.am
@@ -8,7 +8,7 @@ KPREFIX		= @kprefix@
 sbin_PROGRAMS	= mountd
 
 mountd_SOURCES = mountd.c mount_dispatch.c auth.c rmtab.c cache.c \
-		 svc_run.c fsloc.c mountd.h
+		 svc_run.c fsloc.c v4root.c mountd.h
 mountd_LDADD = ../../support/export/libexport.a \
 	       ../../support/nfs/libnfs.a \
 	       ../../support/misc/libmisc.a \
diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 5a7ff8c..2ed80bc 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -20,6 +20,7 @@
 #include "exportfs.h"
 #include "mountd.h"
 #include "xmalloc.h"
+#include "v4root.h"
 
 enum auth_error
 {
@@ -102,6 +103,8 @@ auth_reload()
 	memset(&my_client, 0, sizeof(my_client));
 	xtab_export_read();
 	check_useipaddr();
+	v4root_set();
+
 	++counter;
 
 	return counter;
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 888fd8c..179ef17 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -540,6 +540,10 @@ get_exportlist(void)
 
 	for (i = 0; i < MCL_MAXTYPES; i++) {
 		for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
+			 /* Don't show pseudo exports */
+			if (exp->m_export.e_flags & NFSEXP_V4ROOT)
+				continue;
+
 			for (e = elist; e != NULL; e = e->ex_next) {
 				if (!strcmp(exp->m_export.e_path, e->ex_dir))
 					break;
diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
new file mode 100644
index 0000000..817dfb4
--- /dev/null
+++ b/utils/mountd/v4root.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2009 Red Hat <nfs at redhat.com>
+ *
+ * support/export/v4root.c
+ *
+ * Routines used to support NFSv4 pseudo roots
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/queue.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <unistd.h>
+#include <errno.h>
+
+#include "xlog.h"
+#include "exportfs.h"
+#include "nfslib.h"
+#include "misc.h"
+#include "pseudoflavors.h"
+#include "v4root.h"
+
+#ifndef _PATH_PSEUDO_ROOT
+#define _PATH_PSEUDO_ROOT		"/"
+#endif
+
+#ifndef _PSEUDO_ROOT_FSID
+#define _PSEUDO_ROOT_FSID	0
+#endif
+
+void v4root_set(void);
+void v4root_unset(void);
+static int v4root_support(void);
+
+static struct exportent *v4root_create(char *, nfs_export *);
+
+int v4root_needed;
+static nfs_export pseudo_root = {
+	.m_next = NULL,
+	.m_client = NULL,
+	.m_export = {
+		.e_hostname = "*",
+		.e_path = _PATH_PSEUDO_ROOT,
+		.e_flags = NFSEXP_READONLY | NFSEXP_ROOTSQUASH
+				| NFSEXP_NOSUBTREECHECK | NFSEXP_FSID
+				| NFSEXP_CROSSMOUNT | NFSEXP_V4ROOT,
+		.e_anonuid = 65534,
+		.e_anongid = 65534,
+		.e_squids = NULL,
+		.e_nsquids = 0,
+		.e_sqgids = NULL,
+		.e_nsqgids = 0,
+		.e_fsid = 0,
+		.e_mountpoint = NULL,
+		.e_secinfo[0].flav = NULL,
+	},
+	.m_exported = 0,
+	.m_xtabent = 1,
+	.m_mayexport = 1,
+	.m_changed = 0,
+	.m_warned = 0,
+};
+
+/*
+ * Create a pseudo export
+ */
+static struct exportent *
+v4root_create(char *path, nfs_export *export)
+{
+	nfs_export *exp;
+	struct exportent eep;
+	struct exportent *curexp = &export->m_export;
+
+	dupexportent(&eep, curexp);
+	eep.e_hostname = strdup(curexp->e_hostname);
+	strncpy(eep.e_path, path, sizeof(eep.e_path));
+	exp = export_create(&eep, 0);
+	if (exp == NULL)
+		return NULL;
+
+	exp->m_export.e_flags |= NFSEXP_V4ROOT;
+	if (strcmp(path, _PATH_PSEUDO_ROOT) != 0)
+		exp->m_export.e_flags &= ~NFSEXP_FSID;
+
+	xlog(D_CALL, "v4root_create: path '%s'", exp->m_export.e_path);
+
+	return &exp->m_export;
+}
+
+/*
+ * Make sure the kernel has pseudo root support.
+ */
+static int
+v4root_support()
+{
+	static int kernel_support = -1;
+	char *ptr, version[64];
+	int major, minor;
+	FILE *fp;
+
+	if (kernel_support != -1)
+		return kernel_support;
+
+	kernel_support = 0;
+	fp = fopen("/proc/fs/nfsd/exports", "r");
+	if (fp == NULL)
+		goto out;
+
+	ptr = fgets(version, 64, fp);
+	fclose(fp);
+	if (ptr == NULL)
+		goto out;
+
+	while(*ptr && isdigit(*ptr) == 0)
+		ptr++;
+	if (*ptr == '\0')
+		goto out;
+
+	major = minor = 0;
+	sscanf(ptr, " %d.%d",&major, &minor);
+	if (major >= 1 && minor >= 2)
+		kernel_support = 1;
+out:
+	if (!kernel_support) {
+		xlog(L_WARNING, "Kernel does not have pseudo root support.");
+		xlog(L_WARNING, "NFS v4 mounts will be disabled unless fsid=0");
+		xlog(L_WARNING, "is specfied in /etc/exports file.");
+	}
+
+	return kernel_support;
+}
+
+/*
+ * Create pseudo exports by running through the real export 
+ * looking at the components of the path that make up the export. 
+ * Those path components, if not exported, will become pseudo 
+ * exports allowing them to be found when the kernel does an upcall 
+ * looking for components of the v4 mount.
+ */
+void
+v4root_set()
+{
+	nfs_export	*exp, *nxt;
+	struct exportent *proot;
+	int	i, insecure = 0, secflavors = 0;
+	char *path, *ptr;
+	char *hostname;
+
+	if (!v4root_needed)
+		return;
+
+	if (!v4root_support())
+		return;
+
+	proot = v4root_create(_PATH_PSEUDO_ROOT, &pseudo_root);
+	if (proot == NULL) {
+		xlog(L_WARNING, "v4root_set: Unable to create "
+			"pseudo export for '%s'", _PATH_PSEUDO_ROOT);
+		return;
+	}
+
+	for (i = 0; i < MCL_MAXTYPES; i++) {
+		for (exp = exportlist[i].p_head; exp; exp = nxt) {
+			nxt = exp->m_next;
+			hostname = exp->m_export.e_hostname;
+
+			path = strdup(exp->m_export.e_path);
+			ptr = path + 1;
+			while ((ptr = strchr(ptr, '/')) != NULL) {
+				*ptr = '\0';
+				if (export_lookup(hostname, path, 0) == NULL)
+					if (v4root_create(path, exp) == NULL) {
+						xlog(L_WARNING, "v4root_set: Unable to create "
+							"pseudo export for '%s'", path);
+						break;
+					}
+				*ptr = '/';
+				ptr++;
+			}
+			/* Make note of insecure exports */
+			if (!insecure)
+				insecure = (exp->m_export.e_flags & NFSEXP_INSECURE_PORT);
+
+			/* Make note of security flavors being set */
+			if (!secflavors)
+				secflavors = (exp->m_export.e_secinfo[0].flav != NULL);
+
+			free(path);
+		}
+	}
+
+	if (insecure && secflavors) {
+		xlog(L_WARNING, "WARNING: The 'sec=' and 'insecure' export options "
+			"are incompatible, causing the security flavors set by "
+			"'sec=' to be ignored on V4 exports");
+	}
+
+	/*
+	 * If there are any insecure exports, the pseudo root
+	 * also has to be insecure
+	 */
+	if (insecure) {
+		proot->e_flags |= NFSEXP_INSECURE_PORT;
+	}
+
+	/*
+	 * Make sure the pseudo root is accessible from all
+	 * security flavors unless the insecure port is set,
+	 * which cause the kernel to silently fail v4 mounts 
+	 * with security flavors set.
+	 */
+	if (secflavors && !insecure) {
+		if (!flavors_setall(proot)) {
+			xlog(L_WARNING, "v4root_set: Unable to set security "
+				"flavors on pseudo root");
+		}
+	}
+}
+
+


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- nfs-utils.spec	12 Nov 2009 19:50:55 -0000	1.253
+++ nfs-utils.spec	7 Dec 2009 13:22:33 -0000	1.254
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -22,7 +22,7 @@ Patch00: nfs-utils-1.0.5-statdpath.patch
 Patch01: nfs-utils-1.1.0-smnotify-path.patch
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
-Patch200: nfs-utils-1.2.0-v4root-rel8.patch
+Patch200: nfs-utils-1.2.0-v4root-rel9.patch
 Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
 
 Group: System Environment/Daemons
@@ -248,6 +248,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 1.2.1-4
+- Updated to the latest pseudo root release (rel9).
+
 * Thu Nov 12 2009 Steve Dickson <steved at redhat.com> 1.2.1-3
 - Stop rpc.nfsd from failing to startup when the network
   is down (bz 532270)


--- nfs-utils-1.2.0-v4root-rel8.patch DELETED ---



From sparks at fedoraproject.org  Mon Dec  7 13:23:28 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon,  7 Dec 2009 13:23:28 +0000 (UTC)
Subject: rpms/zikula-module-menutree/devel import.log, NONE,
	1.1 zikula-module-menutree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207132328.2A72811C00EE@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-menutree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14921/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-menutree.spec 
Log Message:
Initial submission of zikula-module-menutree.



--- NEW FILE import.log ---
zikula-module-menutree-2_2-1_fc12:HEAD:zikula-module-menutree-2.2-1.fc12.src.rpm:1260192153


--- NEW FILE zikula-module-menutree.spec ---
%global zikula_base         %{_datadir}/zikula
%global zikula_moddir       %{zikula_base}/modules
%global zikula_modname      menutree

Name:           zikula-module-%{zikula_modname}
Version:        2.2
Release:        1%{?dist}
Summary:        Menutree allows to create multilevel, hierarchical (tree-like) menu

Group:          Applications/Publishing
License:        GPL+ and ASL 2.0
# The only file that is licensed under ASL2 is cookiejar.js.  All other is GPL+.
URL:            http://code.zikula.org/bianor/changeset/192/tags/menutree/
# http://code.zikula.org/bianor/changeset/192/tags/menutree/2.2?old_path=%2F&format=zip
Source0:        tags_%{zikula_modname}_%{version}-r192.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  dos2unix 
Requires:       zikula >= 1.2

%description
Menutree allows to create multilevel, hierarchical (tree-like) menu. 
Block management can be done through "drag and drop" method, and the 
whole process of creating a block can be done without page reloads.


%prep
%setup -qn tags/%{zikula_modname}/%{version}/modules/menutree
# Remove empty index.html and others
find -size 0 | xargs rm -f
find -name '.htaccess' | xargs rm -f
find pndocs/ -name '*.txt' | xargs dos2unix
iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/credits.txt
iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/pomoc.txt

%build


%install
rm -rf $RPM_BUILD_ROOT
%{__mkdir} -p $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} 
cp -pr . $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}
rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/pndocs




%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc pndocs/changelog.txt pndocs/license.txt pndocs/credits.txt pndocs/help.txt pndocs/pomoc.txt pndocs/readme.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Sun Dec 06 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.2-1
- Upstream fix of license issues.

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.1-2
- Fixed source0 name.

* Sun Jun 14 2009 Fedora Docs Team <docs at fedoraproject.org> - 2.0.1-1
- Initial RPM release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-menutree/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Dec 2009 05:17:09 -0000	1.1
+++ .cvsignore	7 Dec 2009 13:23:27 -0000	1.2
@@ -0,0 +1 @@
+tags_menutree_2.2-r192.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-menutree/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Dec 2009 05:17:09 -0000	1.1
+++ sources	7 Dec 2009 13:23:28 -0000	1.2
@@ -0,0 +1 @@
+72f19c4d95d935e29e54a8ecb1f8e795  tags_menutree_2.2-r192.zip



From kasal at fedoraproject.org  Mon Dec  7 13:23:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:23:41 +0000 (UTC)
Subject: rpms/perl-HTTP-DAV/devel perl-HTTP-DAV.spec,1.6,1.7
Message-ID: <20091207132341.D38DD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-DAV/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15214

Modified Files:
	perl-HTTP-DAV.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-DAV.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-DAV/devel/perl-HTTP-DAV.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-HTTP-DAV.spec	26 Jul 2009 06:34:06 -0000	1.6
+++ perl-HTTP-DAV.spec	7 Dec 2009 13:23:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-DAV
 Version:        0.35
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        WebDAV client library for Perl5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.35-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:24:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:24:46 +0000 (UTC)
Subject: rpms/perl-App-Daemon/devel perl-App-Daemon.spec,1.4,1.5
Message-ID: <20091207132446.DF44311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-App-Daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15744

Modified Files:
	perl-App-Daemon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-App-Daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/devel/perl-App-Daemon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-App-Daemon.spec	7 Nov 2009 09:46:04 -0000	1.4
+++ perl-App-Daemon.spec	7 Dec 2009 13:24:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-App-Daemon
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Start an Application as a Daemon
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-2
+- rebuild against perl 5.10.1
+
 * Sat Nov 07 2009 Iain Arnell <iarnell at gmail.com> 0.08-1
 - update to latest upstream version
 



From pkgdb at fedoraproject.org  Mon Dec  7 13:24:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 13:24:52 +0000
Subject: [pkgdb] gnomeradio had acl change status
Message-ID: <20091207132452.E572110F88C@bastion2.fedora.phx.redhat.com>

rathann has set the commit acl on gnomeradio (Fedora 12) to Approved for roma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnomeradio



From kasal at fedoraproject.org  Mon Dec  7 13:26:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:26:38 +0000 (UTC)
Subject: rpms/perl-Date-Leapyear/devel perl-Date-Leapyear.spec,1.3,1.4
Message-ID: <20091207132638.D1AC911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Date-Leapyear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16417

Modified Files:
	perl-Date-Leapyear.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Date-Leapyear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Leapyear/devel/perl-Date-Leapyear.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Date-Leapyear.spec	26 Jul 2009 05:32:34 -0000	1.3
+++ perl-Date-Leapyear.spec	7 Dec 2009 13:26:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Date-Leapyear
 Version:        1.72
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Is a particular year a leap year?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.72-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.72-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:26:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:26:44 +0000 (UTC)
Subject: rpms/perl-PerlIO-eol/devel perl-PerlIO-eol.spec,1.8,1.9
Message-ID: <20091207132644.923E911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PerlIO-eol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16496

Modified Files:
	perl-PerlIO-eol.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PerlIO-eol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PerlIO-eol/devel/perl-PerlIO-eol.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-PerlIO-eol.spec	26 Jul 2009 16:12:26 -0000	1.8
+++ perl-PerlIO-eol.spec	7 Dec 2009 13:26:44 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-PerlIO-eol
 Version:        0.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        PerlIO layer for normalizing line endings
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From steved at fedoraproject.org  Mon Dec  7 13:28:26 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  7 Dec 2009 13:28:26 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1864,
	1.1865 linux-2.6-nfsd4-proots.patch, 1.4, 1.5
Message-ID: <20091207132826.D8CBB11C00EE@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17218

Modified Files:
	kernel.spec linux-2.6-nfsd4-proots.patch 
Log Message:
- Updated the NFS4 pseudo root code to the latest release.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1864
retrieving revision 1.1865
diff -u -p -r1.1864 -r1.1865
--- kernel.spec	3 Dec 2009 07:04:20 -0000	1.1864
+++ kernel.spec	7 Dec 2009 13:28:26 -0000	1.1865
@@ -1995,6 +1995,9 @@ fi
 # and build.
 
 %changelog
+* Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 2.6.32-2
+- Updated the NFS4 pseudo root code to the latest release.
+
 * Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-1
 - Linux 2.6.32
 

linux-2.6-nfsd4-proots.patch:
 fs/nfsd/export.c            |    9 ++++++---
 fs/nfsd/nfs4xdr.c           |   10 +++++++---
 fs/nfsd/nfsfh.c             |   37 +++++++++++++++++++++++++++++++++++++
 fs/nfsd/vfs.c               |   33 ++++++++++++++++++++++++---------
 include/linux/nfsd/export.h |   12 +++++++++++-
 include/linux/nfsd/nfsd.h   |    5 +++++
 6 files changed, 90 insertions(+), 16 deletions(-)

Index: linux-2.6-nfsd4-proots.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-nfsd4-proots.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-nfsd4-proots.patch	14 Oct 2009 22:28:15 -0000	1.4
+++ linux-2.6-nfsd4-proots.patch	7 Dec 2009 13:28:26 -0000	1.5
@@ -1,52 +1,22 @@
-diff -up linux-2.6.31.noarch/fs/nfsd/export.c.orig linux-2.6.31.noarch/fs/nfsd/export.c
---- linux-2.6.31.noarch/fs/nfsd/export.c.orig	2009-10-14 14:26:23.000000000 -0400
-+++ linux-2.6.31.noarch/fs/nfsd/export.c	2009-10-14 15:02:44.000000000 -0400
-@@ -109,6 +109,7 @@ static int expkey_parse(struct cache_det
- 	if (mesg[mlen-1] != '\n')
- 		return -EINVAL;
- 	mesg[mlen-1] = 0;
-+	dprintk("expkey_parse: '%s'\n", mesg);
- 
- 	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
- 	err = -ENOMEM;
-@@ -186,6 +187,8 @@ static int expkey_parse(struct cache_det
- 	if (dom)
- 		auth_domain_put(dom);
- 	kfree(buf);
-+	if (err)
-+		dprintk("expkey_parse: err %d\n", err);
- 	return err;
- }
- 
-@@ -356,7 +359,10 @@ static void svc_export_request(struct ca
- 		(*bpp)[0] = '\n';
- 		return;
- 	}
-+
- 	qword_add(bpp, blen, pth);
-+	dprintk("svc_export_request: pth %s\n", pth);
-+
- 	(*bpp)[-1] = '\n';
- }
+diff -up linux-2.6.32.i686/fs/nfsd/export.c.save linux-2.6.32.i686/fs/nfsd/export.c
+--- linux-2.6.32.i686/fs/nfsd/export.c.save	2009-12-04 10:24:17.000000000 -0500
++++ linux-2.6.32.i686/fs/nfsd/export.c	2009-12-04 10:40:52.000000000 -0500
+@@ -372,10 +372,12 @@ static struct svc_export *svc_export_loo
+ static int check_export(struct inode *inode, int flags, unsigned char *uuid)
+ {
  
-@@ -510,6 +516,7 @@ static int svc_export_parse(struct cache
- 	if (mesg[mlen-1] != '\n')
- 		return -EINVAL;
- 	mesg[mlen-1] = 0;
-+	dprintk("svc_export_parse: '%s'\n", mesg);
- 
- 	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
- 	if (!buf)
-@@ -629,6 +636,8 @@ out1:
- 	auth_domain_put(dom);
- out:
- 	kfree(buf);
-+	if (err)
-+		dprintk("svc_export_parse: err %d\n", err);
- 	return err;
- }
+-	/* We currently export only dirs and regular files.
+-	 * This is what umountd does.
++	/*
++	 * We currently export only dirs, regular files, and (for v4
++	 * pseudoroot) symlinks.
+ 	 */
+ 	if (!S_ISDIR(inode->i_mode) &&
++	    !S_ISLNK(inode->i_mode) &&
+ 	    !S_ISREG(inode->i_mode))
+ 		return -ENOTDIR;
  
-@@ -1425,6 +1434,7 @@ static struct flags {
+@@ -1425,6 +1427,7 @@ static struct flags {
  	{ NFSEXP_CROSSMOUNT, {"crossmnt", ""}},
  	{ NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
  	{ NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
@@ -54,7 +24,7 @@ diff -up linux-2.6.31.noarch/fs/nfsd/exp
  #ifdef MSNFS
  	{ NFSEXP_MSNFS, {"msnfs", ""}},
  #endif
-@@ -1505,7 +1515,7 @@ static int e_show(struct seq_file *m, vo
+@@ -1505,7 +1508,7 @@ static int e_show(struct seq_file *m, vo
  	struct svc_export *exp = container_of(cp, struct svc_export, h);
  
  	if (p == SEQ_START_TOKEN) {
@@ -63,313 +33,194 @@ diff -up linux-2.6.31.noarch/fs/nfsd/exp
  		seq_puts(m, "# Path Client(Flags) # IPs\n");
  		return 0;
  	}
-diff -up linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c.orig linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c
---- linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c.orig	2009-10-14 14:26:23.000000000 -0400
-+++ linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c	2009-10-14 15:02:44.000000000 -0400
-@@ -2174,28 +2174,61 @@ static inline int attributes_need_mount(
- 	return 0;
- }
- 
--static __be32
--nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,
--		const char *name, int namlen, __be32 *p, int *buflen)
-+struct dentry *
-+nfsd_check_export(struct nfsd4_readdir *cd, const char *name, int namlen)
- {
- 	struct svc_export *exp = cd->rd_fhp->fh_export;
- 	struct dentry *dentry;
--	__be32 nfserr;
--	int ignore_crossmnt = 0;
-+	int err;
- 
- 	dentry = lookup_one_len(name, cd->rd_fhp->fh_dentry, namlen);
- 	if (IS_ERR(dentry))
--		return nfserrno(PTR_ERR(dentry));
-+		return dentry;
- 	if (!dentry->d_inode) {
--		/*
--		 * nfsd_buffered_readdir drops the i_mutex between
--		 * readdir and calling this callback, leaving a window
--		 * where this directory entry could have gone away.
--		 */
- 		dput(dentry);
--		return nfserr_noent;
-+		return ERR_PTR(-ENOENT);
-+	}
-+	
-+	/*
-+	 * Check to see if this dentry is part 
-+	 * of the psuedo root
-+	 */
-+	if ((exp->ex_flags & NFSEXP_V4ROOT) == 0)
-+		return dentry;
-+
-+	/*
-+	 * Only exported directories are visable
-+	 * on psuedo exports
-+	 */
-+	if (!S_ISDIR(dentry->d_inode->i_mode)) {
-+		dput(dentry);
-+		return ERR_PTR(-ENOENT);
- 	}
- 
-+	/*
-+	 * Make the upcall to see if this directory
-+	 * is exported.
-+	 */
-+	exp_get(exp);
-+	err = nfsd_export_lookup(cd->rd_rqstp, dentry, exp);
-+	if (err) {
-+		exp_put(exp);
-+		dput(dentry);
-+		return ERR_PTR(err);
-+	}
-+	exp_put(exp);
-+
-+	return dentry;
-+}
-+
-+static __be32
-+nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,
-+		struct dentry *dentry, __be32 *p, int *buflen)
-+{
-+	struct svc_export *exp = cd->rd_fhp->fh_export;
-+	__be32 nfserr;
-+	int ignore_crossmnt = 0;
-+
- 	exp_get(exp);
- 	/*
- 	 * In the case of a mountpoint, the client may be asking for
-@@ -2256,6 +2289,7 @@ nfsd4_encode_dirent(void *ccdv, const ch
- 	struct readdir_cd *ccd = ccdv;
- 	struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common);
- 	int buflen;
-+	struct dentry *dentry;
- 	__be32 *p = cd->buffer;
- 	__be32 *cookiep;
- 	__be32 nfserr = nfserr_toosmall;
-@@ -2266,19 +2300,40 @@ nfsd4_encode_dirent(void *ccdv, const ch
- 		return 0;
- 	}
- 
-+	/*
-+	 * Do the lookup and make sure the dentry is 
-+	 * visible on the exported directory
-+	 */
-+	dentry = nfsd_check_export(cd, name, namlen);
-+	if (IS_ERR(dentry)) {
-+		if (PTR_ERR(dentry) == -ENOENT) {
-+			cd->common.err = nfs_ok;
-+			return 0;
+diff -up linux-2.6.32.i686/fs/nfsd/nfs4xdr.c.save linux-2.6.32.i686/fs/nfsd/nfs4xdr.c
+--- linux-2.6.32.i686/fs/nfsd/nfs4xdr.c.save	2009-12-04 10:24:17.000000000 -0500
++++ linux-2.6.32.i686/fs/nfsd/nfs4xdr.c	2009-12-04 10:26:49.000000000 -0500
+@@ -2204,11 +2204,14 @@ nfsd4_encode_dirent_fattr(struct nfsd4_r
+ 	 * we will not follow the cross mount and will fill the attribtutes
+ 	 * directly from the mountpoint dentry.
+ 	 */
+-	if (d_mountpoint(dentry) && !attributes_need_mount(cd->rd_bmval))
+-		ignore_crossmnt = 1;
+-	else if (d_mountpoint(dentry)) {
++	if (nfsd_mountpoint(dentry, exp)) {
+ 		int err;
+ 
++		if (!(exp->ex_flags & NFSEXP_V4ROOT)
++				&& !attributes_need_mount(cd->rd_bmval)) {
++			ignore_crossmnt = 1;
++			goto out_encode;
 +		}
-+		cd->common.err = nfserrno(PTR_ERR(dentry));
-+		return -EINVAL;
-+	}
-+ 
- 	if (cd->offset)
- 		xdr_encode_hyper(cd->offset, (u64) offset);
- 
- 	buflen = cd->buflen - 4 - XDR_QUADLEN(namlen);
--	if (buflen < 0)
-+	if (buflen < 0) {
-+		dput(dentry);
- 		goto fail;
-+	}
- 
- 	*p++ = xdr_one;                             /* mark entry present */
- 	cookiep = p;
- 	p = xdr_encode_hyper(p, NFS_OFFSET_MAX);    /* offset of next entry */
- 	p = xdr_encode_array(p, name, namlen);      /* name length & name */
+ 		/*
+ 		 * Why the heck aren't we just using nfsd_lookup??
+ 		 * Different "."/".." handling?  Something else?
+@@ -2224,6 +2227,7 @@ nfsd4_encode_dirent_fattr(struct nfsd4_r
+ 			goto out_put;
  
--	nfserr = nfsd4_encode_dirent_fattr(cd, name, namlen, p, &buflen);
-+	/*
-+	 * Note: the dput() on the dentry is done in 
-+	 * nfsd4_encode_dirent_fattr() since the dentry can
-+	 * change when crossing a mount point.
-+	 */
-+	nfserr = nfsd4_encode_dirent_fattr(cd, dentry, p, &buflen);
- 	switch (nfserr) {
- 	case nfs_ok:
- 		p += buflen;
-diff -up linux-2.6.31.noarch/fs/nfsd/nfsfh.c.orig linux-2.6.31.noarch/fs/nfsd/nfsfh.c
---- linux-2.6.31.noarch/fs/nfsd/nfsfh.c.orig	2009-10-14 14:26:23.000000000 -0400
-+++ linux-2.6.31.noarch/fs/nfsd/nfsfh.c	2009-10-14 15:02:44.000000000 -0400
-@@ -109,6 +109,30 @@ static __be32 nfsd_setuser_and_check_por
+ 	}
++out_encode:
+ 	nfserr = nfsd4_encode_fattr(NULL, exp, dentry, p, buflen, cd->rd_bmval,
+ 					cd->rd_rqstp, ignore_crossmnt);
+ out_put:
+diff -up linux-2.6.32.i686/fs/nfsd/nfsfh.c.save linux-2.6.32.i686/fs/nfsd/nfsfh.c
+--- linux-2.6.32.i686/fs/nfsd/nfsfh.c.save	2009-12-04 10:24:17.000000000 -0500
++++ linux-2.6.32.i686/fs/nfsd/nfsfh.c	2009-12-04 10:38:26.000000000 -0500
+@@ -109,6 +109,36 @@ static __be32 nfsd_setuser_and_check_por
  	return nfserrno(nfsd_setuser(rqstp, exp));
  }
  
 +static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,
 +	struct dentry *dentry, struct svc_export *exp)
 +{
-+	/*
-+	 * Only interested in pseudo roots
-+	 */
 +	if (!(exp->ex_flags & NFSEXP_V4ROOT))
 +		return nfs_ok;
-+
 +	/*
-+	 * Only directories should be on the pseudo root
++	 * v2/v3 clients have no need for the V4ROOT export--they use
++	 * the mount protocl instead; also, further V4ROOT checks may be
++	 * in v4-specific code, in which case v2/v3 clients could bypass
++	 * them.
 +	 */
-+	if (unlikely(!S_ISDIR(dentry->d_inode->i_mode)))
++	if (!nfsd_v4client(rqstp))
 +		return nfserr_stale;
-+
 +	/*
-+	 * Make sure the export is the parent of the dentry
++	 * We're exposing only the directories and symlinks that have to be
++	 * traversed on the way to real exports:
 +	 */
-+	if (unlikely(dentry->d_parent != exp->ex_path.dentry))
++	if (unlikely(!S_ISDIR(dentry->d_inode->i_mode) &&
++		     !S_ISLNK(dentry->d_inode->i_mode)))
++		return nfserr_stale;
++	/*
++	 * A pseudoroot export gives permission to access only one
++	 * single directory; the kernel has to make another upcall
++	 * before granting access to anything else under it:
++	 */
++	if (unlikely(dentry != exp->ex_path.dentry))
 +		return nfserr_stale;
-+
 +	return nfs_ok;
 +}
 +
  /*
   * Use the given filehandle to look up the corresponding export and
   * dentry.  On success, the results are used to set fh_export and
-@@ -315,6 +339,14 @@ fh_verify(struct svc_rqst *rqstp, struct
- 		error = nfsd_setuser_and_check_port(rqstp, exp);
- 		if (error)
+@@ -317,6 +347,13 @@ fh_verify(struct svc_rqst *rqstp, struct
  			goto out;
+ 	}
+ 
++	/*
++	 * Do some spoof checking if we are on the pseudo root
++	 */
++	error = check_pseudo_root(rqstp, dentry, exp);
++	if (error)
++		goto out;
 +
+ 	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
+ 	if (error)
+ 		goto out;
+diff -up linux-2.6.32.i686/fs/nfsd/vfs.c.save linux-2.6.32.i686/fs/nfsd/vfs.c
+--- linux-2.6.32.i686/fs/nfsd/vfs.c.save	2009-12-04 10:24:18.000000000 -0500
++++ linux-2.6.32.i686/fs/nfsd/vfs.c	2009-12-04 10:35:04.000000000 -0500
+@@ -89,12 +89,6 @@ struct raparm_hbucket {
+ #define RAPARM_HASH_MASK	(RAPARM_HASH_SIZE-1)
+ static struct raparm_hbucket	raparm_hash[RAPARM_HASH_SIZE];
+ 
+-static inline int
+-nfsd_v4client(struct svc_rqst *rq)
+-{
+-    return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;
+-}
+-
+ /* 
+  * Called from nfsd_lookup and encode_dirent. Check if we have crossed 
+  * a mount point.
+@@ -116,8 +110,16 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, s
+ 
+ 	exp2 = rqst_exp_get_by_name(rqstp, &path);
+ 	if (IS_ERR(exp2)) {
+-		if (PTR_ERR(exp2) != -ENOENT)
+-			err = PTR_ERR(exp2);
++		err = PTR_ERR(exp2);
 +		/*
-+		 * Do some spoof checking if we are on the pseudo root
++		 * We normally allow NFS clients to continue
++		 * "underneath" a mountpoint that is not exported.
++		 * The exception is V4ROOT, where no traversal is ever
++		 * allowed without an explicit export of the new
++		 * directory.
 +		 */
-+		error = check_pseudo_root(rqstp, dentry, exp);
-+		if (error)
-+			goto out;
-+
++		if (err == -ENOENT && !(exp->ex_flags & NFSEXP_V4ROOT))
++			err = 0;
+ 		path_put(&path);
+ 		goto out;
  	}
- 
- 	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
-diff -up linux-2.6.31.noarch/fs/nfsd/vfs.c.orig linux-2.6.31.noarch/fs/nfsd/vfs.c
---- linux-2.6.31.noarch/fs/nfsd/vfs.c.orig	2009-10-14 14:26:23.000000000 -0400
-+++ linux-2.6.31.noarch/fs/nfsd/vfs.c	2009-10-14 15:03:37.000000000 -0400
-@@ -141,6 +141,55 @@ out:
+@@ -141,6 +143,19 @@ out:
  	return err;
  }
  
 +/*
-+ * Lookup the export the dentry is on. To be
-+ * viewable on a pseudo export, the dentry
-+ * has to be an exported directory. 
++ * For nfsd purposes, we treat V4ROOT exports as though there was an
++ * export at *every* directory.
 + */
-+int
-+nfsd_export_lookup(struct svc_rqst *rqstp, struct dentry *dentry,
-+	struct svc_export *exp)
++int nfsd_mountpoint(struct dentry *dentry, struct svc_export *exp)
 +{
-+	struct svc_export *exp2 = NULL;
-+	struct path path;
-+	int err = 0;
-+
-+	if ((exp->ex_flags & NFSEXP_V4ROOT) == 0)
++	if (d_mountpoint(dentry))
++		return 1;
++	if (!(exp->ex_flags & NFSEXP_V4ROOT))
 +		return 0;
-+
-+	/*
-+	 * Make sure the export is the parent of the dentry
-+	 */
-+	if (unlikely(dentry->d_parent != exp->ex_path.dentry))
-+		return -ENOENT;
-+
-+	/*
-+	 * Only directories are seen on psuedo exports
-+	 */
-+	if (!S_ISDIR(dentry->d_inode->i_mode))
-+		return -ENOENT;
-+
-+	/*
-+	 * Make the upcall 
-+	 */
-+	path.mnt = mntget(exp->ex_path.mnt);
-+	path.dentry = dget(dentry);
-+	while (d_mountpoint(path.dentry) && follow_down(&path));
-+
-+	exp2 = rqst_exp_get_by_name(rqstp, &path);
-+	if (IS_ERR(exp2))
-+		err = PTR_ERR(exp2);
-+	else  {
-+		/*
-+		 * The export exist so allow the access
-+		 */
-+		exp_put(exp2);
-+	}
-+
-+	dput(path.dentry);
-+	mntput(path.mnt);
-+	return err;
++	return dentry->d_inode != NULL;
 +}
++
  __be32
  nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
  		   const char *name, unsigned int len,
-@@ -150,7 +199,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
- 	struct dentry		*dparent;
- 	struct dentry		*dentry;
- 	__be32			err;
--	int			host_err;
-+	int			host_err, v4root;
- 
- 	dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name);
- 
-@@ -162,6 +211,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
- 	dparent = fhp->fh_dentry;
- 	exp  = fhp->fh_export;
- 	exp_get(exp);
-+	v4root = (exp->ex_flags & NFSEXP_V4ROOT);
- 
- 	/* Lookup the name, but don't follow links */
- 	if (isdotent(name, len)) {
-@@ -169,7 +219,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
- 			dentry = dget(dparent);
- 		else if (dparent != exp->ex_path.dentry)
- 			dentry = dget_parent(dparent);
--		else if (!EX_NOHIDE(exp))
-+		else if (!EX_NOHIDE(exp) && !nfsd_v4client(rqstp))
- 			dentry = dget(dparent); /* .. == . just like at / */
- 		else {
- 			/* checking mountpoint crossing is very different when stepping up */
-@@ -206,9 +256,21 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
- 		if (IS_ERR(dentry))
- 			goto out_nfserr;
+@@ -208,7 +223,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
  		/*
-+		 * The export is a pseudo one, make sure the
-+		 * dentry is accessible 
-+		 */
-+		v4root = (dentry->d_inode && v4root);
-+		if (v4root) {
-+			host_err = nfsd_export_lookup(rqstp, dentry, exp);
-+			if (host_err) {
-+				dput(dentry);
-+				goto out_nfserr;
-+			}
-+		}
-+		/*
  		 * check if we have crossed a mount point ...
  		 */
 -		if (d_mountpoint(dentry)) {
-+		if (d_mountpoint(dentry) || v4root) {
++		if (nfsd_mountpoint(dentry, exp)) {
  			if ((host_err = nfsd_cross_mnt(rqstp, &dentry, &exp))) {
  				dput(dentry);
  				goto out_nfserr;
-diff -up linux-2.6.31.noarch/include/linux/nfsd/export.h.orig linux-2.6.31.noarch/include/linux/nfsd/export.h
---- linux-2.6.31.noarch/include/linux/nfsd/export.h.orig	2009-09-09 18:13:59.000000000 -0400
-+++ linux-2.6.31.noarch/include/linux/nfsd/export.h	2009-10-14 15:02:44.000000000 -0400
-@@ -39,7 +39,8 @@
+diff -up linux-2.6.32.i686/include/linux/nfsd/export.h.save linux-2.6.32.i686/include/linux/nfsd/export.h
+--- linux-2.6.32.i686/include/linux/nfsd/export.h.save	2009-12-04 10:24:18.000000000 -0500
++++ linux-2.6.32.i686/include/linux/nfsd/export.h	2009-12-04 10:25:08.000000000 -0500
+@@ -39,7 +39,17 @@
  #define NFSEXP_FSID		0x2000
  #define	NFSEXP_CROSSMOUNT	0x4000
  #define	NFSEXP_NOACL		0x8000	/* reserved for possible ACL related use */
 -#define NFSEXP_ALLFLAGS		0xFE3F
++/*
++ * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
++ * clients, and only to the single directory that is the root of the
++ * export; further lookup and readdir operations are treated as if every
++ * subdirectory was a mountpoint, and ignored if they are not themselves
++ * exported.  This is used by nfsd and mountd to construct the NFSv4
++ * pseudofilesystem, which provides access only to paths leading to each
++ * exported filesystem.
++ */
 +#define	NFSEXP_V4ROOT		0x10000
 +#define NFSEXP_ALLFLAGS		0x1FE3F
  
  /* The flags that may vary depending on security flavor: */
  #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
-diff -up linux-2.6.31.noarch/include/linux/nfsd/nfsd.h.orig linux-2.6.31.noarch/include/linux/nfsd/nfsd.h
---- linux-2.6.31.noarch/include/linux/nfsd/nfsd.h.orig	2009-10-14 14:26:23.000000000 -0400
-+++ linux-2.6.31.noarch/include/linux/nfsd/nfsd.h	2009-10-14 15:02:44.000000000 -0400
-@@ -79,6 +79,8 @@ int		nfsd_racache_init(int);
- void		nfsd_racache_shutdown(void);
- int		nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
- 		                struct svc_export **expp);
-+int		nfsd_export_lookup(struct svc_rqst *rqstp, struct dentry *dpp,
-+		                struct svc_export *exp);
- __be32		nfsd_lookup(struct svc_rqst *, struct svc_fh *,
- 				const char *, unsigned int, struct svc_fh *);
- __be32		 nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *,
+diff -up linux-2.6.32.i686/include/linux/nfsd/nfsd.h.save linux-2.6.32.i686/include/linux/nfsd/nfsd.h
+--- linux-2.6.32.i686/include/linux/nfsd/nfsd.h.save	2009-12-04 10:24:18.000000000 -0500
++++ linux-2.6.32.i686/include/linux/nfsd/nfsd.h	2009-12-04 10:39:18.000000000 -0500
+@@ -86,6 +86,7 @@ __be32		 nfsd_lookup_dentry(struct svc_r
+ 				struct svc_export **, struct dentry **);
+ __be32		nfsd_setattr(struct svc_rqst *, struct svc_fh *,
+ 				struct iattr *, int, time_t);
++int nfsd_mountpoint(struct dentry *, struct svc_export *);
+ #ifdef CONFIG_NFSD_V4
+ __be32          nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
+                     struct nfs4_acl *);
+@@ -394,6 +395,10 @@ static inline u32 nfsd_suppattrs2(u32 mi
+ 	return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD2
+ 			    : NFSD4_SUPPORTED_ATTRS_WORD2;
+ }
++static inline int nfsd_v4client(struct svc_rqst *rq)
++{
++	return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;
++}
+ 
+ /* These will return ERR_INVAL if specified in GETATTR or READDIR. */
+ #define NFSD_WRITEONLY_ATTRS_WORD1							    \



From kasal at fedoraproject.org  Mon Dec  7 13:28:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:28:25 +0000 (UTC)
Subject: rpms/perl-HTTP-Cache-Transparent/devel
	perl-HTTP-Cache-Transparent.spec, 1.4, 1.5
Message-ID: <20091207132825.ACB4211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Cache-Transparent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17432

Modified Files:
	perl-HTTP-Cache-Transparent.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Cache-Transparent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Cache-Transparent/devel/perl-HTTP-Cache-Transparent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-HTTP-Cache-Transparent.spec	26 Jul 2009 06:33:51 -0000	1.4
+++ perl-HTTP-Cache-Transparent.spec	7 Dec 2009 13:28:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Cache-Transparent
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cache the result of http get-requests persistently
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.0-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sparks at fedoraproject.org  Mon Dec  7 13:29:47 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon,  7 Dec 2009 13:29:47 +0000 (UTC)
Subject: rpms/zikula-module-menutree/F-12 import.log, NONE,
	1.1 zikula-module-menutree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207132947.71B0D11C00EE@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-menutree/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17942/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-menutree.spec 
Log Message:
Initial build of menutree for F12.



--- NEW FILE import.log ---
zikula-module-menutree-2_2-1_fc12:F-12:zikula-module-menutree-2.2-1.fc12.src.rpm:1260192566


--- NEW FILE zikula-module-menutree.spec ---
%global zikula_base         %{_datadir}/zikula
%global zikula_moddir       %{zikula_base}/modules
%global zikula_modname      menutree

Name:           zikula-module-%{zikula_modname}
Version:        2.2
Release:        1%{?dist}
Summary:        Menutree allows to create multilevel, hierarchical (tree-like) menu

Group:          Applications/Publishing
License:        GPL+ and ASL 2.0
# The only file that is licensed under ASL2 is cookiejar.js.  All other is GPL+.
URL:            http://code.zikula.org/bianor/changeset/192/tags/menutree/
# http://code.zikula.org/bianor/changeset/192/tags/menutree/2.2?old_path=%2F&format=zip
Source0:        tags_%{zikula_modname}_%{version}-r192.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  dos2unix 
Requires:       zikula >= 1.2

%description
Menutree allows to create multilevel, hierarchical (tree-like) menu. 
Block management can be done through "drag and drop" method, and the 
whole process of creating a block can be done without page reloads.


%prep
%setup -qn tags/%{zikula_modname}/%{version}/modules/menutree
# Remove empty index.html and others
find -size 0 | xargs rm -f
find -name '.htaccess' | xargs rm -f
find pndocs/ -name '*.txt' | xargs dos2unix
iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/credits.txt
iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/pomoc.txt

%build


%install
rm -rf $RPM_BUILD_ROOT
%{__mkdir} -p $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} 
cp -pr . $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}
rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/pndocs




%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc pndocs/changelog.txt pndocs/license.txt pndocs/credits.txt pndocs/help.txt pndocs/pomoc.txt pndocs/readme.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Sun Dec 06 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.2-1
- Upstream fix of license issues.

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.1-2
- Fixed source0 name.

* Sun Jun 14 2009 Fedora Docs Team <docs at fedoraproject.org> - 2.0.1-1
- Initial RPM release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-menutree/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Dec 2009 05:17:09 -0000	1.1
+++ .cvsignore	7 Dec 2009 13:29:47 -0000	1.2
@@ -0,0 +1 @@
+tags_menutree_2.2-r192.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-menutree/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Dec 2009 05:17:09 -0000	1.1
+++ sources	7 Dec 2009 13:29:47 -0000	1.2
@@ -0,0 +1 @@
+72f19c4d95d935e29e54a8ecb1f8e795  tags_menutree_2.2-r192.zip



From kasal at fedoraproject.org  Mon Dec  7 13:30:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:30:06 +0000 (UTC)
Subject: rpms/perl-AppConfig-Std/devel perl-AppConfig-Std.spec,1.4,1.5
Message-ID: <20091207133006.C717811C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AppConfig-Std/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18197

Modified Files:
	perl-AppConfig-Std.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AppConfig-Std.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AppConfig-Std/devel/perl-AppConfig-Std.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-AppConfig-Std.spec	26 Jul 2009 01:42:18 -0000	1.4
+++ perl-AppConfig-Std.spec	7 Dec 2009 13:30:06 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:       perl-AppConfig-Std 
 Version:    1.07 
-Release:        4%{?dist}
+Release:        5%{?dist}
 # see lib/AppConfig/Std.pm
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -55,6 +55,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:30:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:30:31 +0000 (UTC)
Subject: rpms/perl-Date-ICal/devel perl-Date-ICal.spec,1.2,1.3
Message-ID: <20091207133031.457A011C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Date-ICal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18446

Modified Files:
	perl-Date-ICal.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Date-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-ICal/devel/perl-Date-ICal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Date-ICal.spec	26 Jul 2009 05:32:19 -0000	1.2
+++ perl-Date-ICal.spec	7 Dec 2009 13:30:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Date-ICal
 Version:        1.72
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for ICalendar date objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.72-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.72-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:31:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:31:39 +0000 (UTC)
Subject: rpms/perl-Perlilog/devel perl-Perlilog.spec,1.3,1.4
Message-ID: <20091207133139.34B1D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Perlilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18937

Modified Files:
	perl-Perlilog.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Perlilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perlilog/devel/perl-Perlilog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Perlilog.spec	26 Jul 2009 16:13:46 -0000	1.3
+++ perl-Perlilog.spec	7 Dec 2009 13:31:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Perlilog
 Version:        0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Verilog environment and IP core handling in Perl
 License:        GPLv2
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.3-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:32:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:32:14 +0000 (UTC)
Subject: rpms/perl-HTTP-BrowserDetect/devel perl-HTTP-BrowserDetect.spec, 1.8,
	1.9
Message-ID: <20091207133214.C8BB211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-BrowserDetect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19227

Modified Files:
	perl-HTTP-BrowserDetect.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-BrowserDetect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-BrowserDetect/devel/perl-HTTP-BrowserDetect.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-HTTP-BrowserDetect.spec	26 Jul 2009 06:33:36 -0000	1.8
+++ perl-HTTP-BrowserDetect.spec	7 Dec 2009 13:32:14 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-BrowserDetect
 Version:        0.99
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Determine the Web browser, version, and platform from an HTTP user agent string
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.99-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:34:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:34:32 +0000 (UTC)
Subject: rpms/perl-AppConfig/devel perl-AppConfig.spec,1.18,1.19
Message-ID: <20091207133432.6866111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AppConfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20112

Modified Files:
	perl-AppConfig.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AppConfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AppConfig/devel/perl-AppConfig.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-AppConfig.spec	26 Jul 2009 01:42:02 -0000	1.18
+++ perl-AppConfig.spec	7 Dec 2009 13:34:32 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-AppConfig
 Version:        1.66
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl module for reading configuration files
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.66-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.66-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:34:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:34:57 +0000 (UTC)
Subject: rpms/perl-Date-Calc/devel perl-Date-Calc.spec,1.29,1.30
Message-ID: <20091207133457.F1B5C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Date-Calc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20328

Modified Files:
	perl-Date-Calc.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Date-Calc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Calc/devel/perl-Date-Calc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- perl-Date-Calc.spec	18 Nov 2009 08:30:28 -0000	1.29
+++ perl-Date-Calc.spec	7 Dec 2009 13:34:57 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           perl-Date-Calc
 Version:        6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gregorian calendar date calculations
 
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 6.3-2
+- rebuild against perl 5.10.1
+
 * Wed Nov 18 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 6.3-1
 - new upstream version - noarch, because since 6.0 there were bigger
  changes like stripping this module into more of them



From pmatilai at fedoraproject.org  Mon Dec  7 13:35:12 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Mon,  7 Dec 2009 13:35:12 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.90-devel-autodep.patch, NONE,
	1.1 rpm-4.7.90-fedora-specspo.patch, NONE, 1.1 .cvsignore, 1.38,
	1.39 rpm.spec, 1.369, 1.370 sources, 1.144,
	1.145 desktop-file.prov, 1.1, NONE fontconfig.prov, 1.3,
	NONE rpm-4.6.0-fedora-specspo.patch, 1.1,
	NONE rpm-4.7.0-devel-autodep.patch, 1.2,
	NONE rpm-4.7.0-extra-provides.patch, 1.3,
	NONE rpm-4.7.1-bugurl.patch, 1.2,
	NONE rpm-4.7.1-python-bytecompile.patch, 1.1,
	NONE rpm-4.7.2-chmod-selinux.patch, 1.2,
	NONE rpm-4.7.2-pgp-subkey.patch, 1.1,
	NONE rpm-4.7.2-rpmfc-unknown.patch, 1.1,
	NONE rpm-4.7.2-sign-passcheck.patch, 1.1, NONE
Message-ID: <20091207133512.56FF911C00EE@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20047

Modified Files:
	.cvsignore rpm.spec sources 
Added Files:
	rpm-4.7.90-devel-autodep.patch rpm-4.7.90-fedora-specspo.patch 
Removed Files:
	desktop-file.prov fontconfig.prov 
	rpm-4.6.0-fedora-specspo.patch rpm-4.7.0-devel-autodep.patch 
	rpm-4.7.0-extra-provides.patch rpm-4.7.1-bugurl.patch 
	rpm-4.7.1-python-bytecompile.patch 
	rpm-4.7.2-chmod-selinux.patch rpm-4.7.2-pgp-subkey.patch 
	rpm-4.7.2-rpmfc-unknown.patch rpm-4.7.2-sign-passcheck.patch 
Log Message:
- update to rpm 4.8.0-beta1
- drop patches + other sources now included upstream
- add conflict for current ocaml-runtime


rpm-4.7.90-devel-autodep.patch:
 rpmfc.c |  107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 105 insertions(+), 2 deletions(-)

--- NEW FILE rpm-4.7.90-devel-autodep.patch ---
diff -up rpm-4.7.90.git9278/build/rpmfc.c.devel-autodep rpm-4.7.90.git9278/build/rpmfc.c
--- rpm-4.7.90.git9278/build/rpmfc.c.devel-autodep	2009-09-01 10:45:07.000000000 +0300
+++ rpm-4.7.90.git9278/build/rpmfc.c	2009-09-01 11:00:15.000000000 +0300
@@ -501,7 +501,7 @@ static const struct rpmfcTokens_s const 
   { "GLS_BINARY_LSB_FIRST",	RPMFC_WHITE|RPMFC_INCLUDE },
   { " DB ",			RPMFC_WHITE|RPMFC_INCLUDE },
 
-  { "symbolic link to",		RPMFC_SYMLINK },
+  { "symbolic link to",		RPMFC_SYMLINK|RPMFC_INCLUDE },
   { "socket",			RPMFC_DEVICE },
   { "special",			RPMFC_DEVICE },
   { " text",			RPMFC_TEXT|RPMFC_INCLUDE },
@@ -663,6 +663,105 @@ rpmds rpmfcRequires(rpmfc fc)
 
 
 /**
+ * Ensure that symlinks for shared libs generate a dep on the shared lib
+ * @param fc            file classifier
+ * @return              0 on success
+ */
+static int rpmfcSYMLINK(rpmfc fc)
+{
+    const char * fn = fc->fn[fc->ix];
+    struct stat sb;
+    int fdno;
+
+    if (fc->skipReq) 
+	return 0;
+
+    if (stat(fn, &sb) < 0)
+	return -1;
+    if (S_ISLNK(sb.st_mode))
+        return -1;
+    
+    fdno = open(fn, O_RDONLY);
+    if (fdno < 0) {
+	return fdno;
+    }
+
+#if HAVE_GELF_H && HAVE_LIBELF
+    Elf * elf = NULL;
+    GElf_Ehdr ehdr_mem, * ehdr;
+    int isElf64 = 0;
+    int i, cnt;
+    char * soname = NULL;
+    rpmds ds;
+
+    (void) elf_version(EV_CURRENT);
+    elf = NULL;
+    if ((elf = elf_begin (fdno, ELF_C_READ_MMAP, NULL)) == NULL
+        || elf_kind(elf) != ELF_K_ELF
+        || (ehdr = gelf_getehdr(elf, &ehdr_mem)) == NULL
+        || ehdr->e_type != ET_DYN)
+	goto exit;
+
+/* alpha uses /lib, not /lib64 so don't add (64bit) deps */
+#if !defined(__alpha__)
+    isElf64 = ehdr->e_ident[EI_CLASS] == ELFCLASS64;
+#endif
+
+    for (i = 0; i < ehdr->e_phnum; ++i) {
+	GElf_Phdr phdr_mem;
+	GElf_Phdr *phdr = gelf_getphdr (elf, i, &phdr_mem);
+	GElf_Shdr shdr_mem;
+	Elf_Data * data = NULL;
+	Elf_Scn * scn;
+	GElf_Shdr *shdr;
+
+	if (phdr == NULL || phdr->p_type != PT_DYNAMIC)
+	    continue;
+
+	scn = gelf_offscn(elf, phdr->p_offset);
+	shdr = gelf_getshdr(scn, &shdr_mem);
+
+	if (shdr != NULL && shdr->sh_type == SHT_DYNAMIC)
+	    data = elf_getdata (scn, NULL);
+	if (data == NULL)
+	    continue; 
+	  
+	for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) {
+	    GElf_Dyn dynmem;
+	    GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem);
+	    char *depname = NULL;
+
+	    if (dyn == NULL)
+		break;
+	    if (dyn->d_tag != DT_SONAME)
+		continue;
+
+	    /* add the soname to package deps */
+	    soname = elf_strptr(elf, shdr->sh_link, dyn->d_un.d_val);
+	    if (soname == NULL)
+		break;
+
+	    rasprintf(&depname, "%s%s", soname, isElf64 ? "()(64bit)" : "");
+	    /* Add to package dependencies. */
+	    ds = rpmdsSingle(RPMTAG_REQUIRENAME, depname, "", 
+			     RPMSENSE_FIND_REQUIRES);
+	    free(depname);
+
+	    rpmdsMerge(&fc->requires, ds);
+	    rpmfcAddFileDep(&fc->ddict, fc->ix, ds);
+	    ds = rpmdsFree(ds);
+	    break;
+	}
+    }
+exit:
+    if (elf) (void) elf_end(elf);
+    close(fdno);
+    return 0;
+#endif
+    return -1;
+}
+
+/**
  * Extract script dependencies.
  * @param fc		file classifier
  * @return		0 on success
@@ -1118,6 +1217,7 @@ static const struct rpmfcApplyTbl_s cons
 			 RPMFC_PERL|RPMFC_PYTHON|RPMFC_MONO|RPMFC_OCAML|
 			 RPMFC_PKGCONFIG|RPMFC_LIBTOOL) },
     { rpmfcMISC,	RPMFC_FONT|RPMFC_TEXT },
+    { rpmfcSYMLINK,	RPMFC_SYMLINK },
     { NULL, 0 }
 };
 
@@ -1138,6 +1238,7 @@ rpmRC rpmfcApply(rpmfc fc)
     int ix;
     int i;
     int xx;
+    int skipping = 0;
 
     /* Generate package and per-file dependencies. */
     for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
@@ -1192,11 +1293,13 @@ rpmRC rpmfcApply(rpmfc fc)
 	default:
 	    break;
 	case 'P':	
+	    skipping = fc->skipProv;
 	    ds = rpmdsSingle(RPMTAG_PROVIDENAME, N, EVR, Flags);
 	    dix = rpmdsFind(fc->provides, ds);
 	    ds = rpmdsFree(ds);
 	    break;
 	case 'R':
+	    skipping = fc->skipReq;
 	    ds = rpmdsSingle(RPMTAG_REQUIRENAME, N, EVR, Flags);
 	    dix = rpmdsFind(fc->requires, ds);
 	    ds = rpmdsFree(ds);
@@ -1218,7 +1321,7 @@ assert(dix >= 0);
 	    previx = ix;
 	    xx = argiAdd(&fc->fddictx, ix, argiCount(fc->ddictx)-1);
 	}
-	if (fc->fddictn && fc->fddictn->vals)
+	if (fc->fddictn && fc->fddictn->vals && !skipping)
 	    fc->fddictn->vals[ix]++;
     }
 

rpm-4.7.90-fedora-specspo.patch:
 tagexts.c |   68 ++++++++++++--------------------------------------------------
 1 file changed, 14 insertions(+), 54 deletions(-)

--- NEW FILE rpm-4.7.90-fedora-specspo.patch ---
diff -up rpm-4.7.90.git9301/lib/tagexts.c.fedora-specspo rpm-4.7.90.git9301/lib/tagexts.c
--- rpm-4.7.90.git9301/lib/tagexts.c.fedora-specspo	2009-09-02 13:59:38.000000000 +0300
+++ rpm-4.7.90.git9301/lib/tagexts.c	2009-09-02 14:51:10.000000000 +0300
@@ -460,12 +460,6 @@ static int filerequireTag(Header h, rpmt
 }
 
 /* I18N look aside diversions */
-
-#if defined(ENABLE_NLS)
-extern int _nl_msg_cat_cntr;	/* XXX GNU gettext voodoo */
-#endif
-static const char * const language = "LANGUAGE";
-
 static const char * const _macro_i18ndomains = "%{?_i18ndomains}";
 
 /**
@@ -477,61 +471,27 @@ static const char * const _macro_i18ndom
  */
 static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags)
 {
-    char * dstring = rpmExpand(_macro_i18ndomains, NULL);
-    int rc;
-
-    td->type = RPM_STRING_TYPE;
-    td->data = NULL;
-    td->count = 0;
-
-    if (dstring && *dstring) {
-	char *domain, *de;
-	const char * langval;
-	char * msgkey;
-	const char * msgid;
-
-	rasprintf(&msgkey, "%s(%s)", headerGetString(h, RPMTAG_NAME), 
-		  rpmTagGetName(tag));
-
-	/* change to en_US for msgkey -> msgid resolution */
-	langval = getenv(language);
-	(void) setenv(language, "en_US", 1);
-#if defined(ENABLE_NLS)
-        ++_nl_msg_cat_cntr;
-#endif
+    int rc = headerGet(h, tag, td, HEADERGET_ALLOC);
+    if (rc) {
+	char *de, *dstring = rpmExpand(_macro_i18ndomains, NULL);
+	const char *domain;
 
-	msgid = NULL;
 	for (domain = dstring; domain != NULL; domain = de) {
+	    const char *msgid = td->data;
+	    const char *msg = NULL;
+
 	    de = strchr(domain, ':');
 	    if (de) *de++ = '\0';
-	    msgid = dgettext(domain, msgkey);
-	    if (msgid != msgkey) break;
-	}
-
-	/* restore previous environment for msgid -> msgstr resolution */
-	if (langval)
-	    (void) setenv(language, langval, 1);
-	else
-	    unsetenv(language);
-#if defined(ENABLE_NLS)
-        ++_nl_msg_cat_cntr;
-#endif
-
-	if (domain && msgid) {
-	    td->data = dgettext(domain, msgid);
-	    td->data = xstrdup(td->data); /* XXX xstrdup has side effects. */
-	    td->count = 1;
-	    td->flags = RPMTD_ALLOCED;
+	    msg = dgettext(domain, td->data);
+	    if (msg != msgid) {
+		free(td->data);
+		td->data = xstrdup(msg);
+		break;
+	    }
 	}
-	dstring = _free(dstring);
-	free(msgkey);
-	if (td->data)
-	    return 1;
+	free(dstring);
     }
 
-    dstring = _free(dstring);
-
-    rc = headerGet(h, tag, td, HEADERGET_ALLOC);
     return rc;
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	25 Nov 2009 08:23:30 -0000	1.38
+++ .cvsignore	7 Dec 2009 13:35:11 -0000	1.39
@@ -1 +1 @@
-rpm-4.7.2.tar.bz2
+rpm-4.8.0-beta1.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- rpm.spec	4 Dec 2009 10:29:34 -0000	1.369
+++ rpm.spec	7 Dec 2009 13:35:11 -0000	1.370
@@ -11,9 +11,9 @@
 
 %define rpmhome /usr/lib/rpm
 
-%define rpmver 4.7.2
-%define snapver {nil}
-%define srcver %{rpmver}
+%define rpmver 4.8.0
+%define snapver beta1
+%define srcver %{rpmver}-%{snapver}
 
 %define bdbver 4.8.24
 %define dbprefix db
@@ -21,31 +21,22 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 2%{?dist}
+Release: 0.%{snapver}.1
 Group: System Environment/Base
 Url: http://www.rpm.org/
-Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
+Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
 %if %{with int_bdb}
 Source1: db-%{bdbver}.tar.gz
 %endif
-Source10: desktop-file.prov
-Source11: fontconfig.prov
 
-Patch0: rpm-4.7.0-devel-autodep.patch
+Patch0: rpm-4.7.90-devel-autodep.patch
 Patch1: rpm-4.5.90-pkgconfig-path.patch
 Patch2: rpm-4.5.90-gstreamer-provides.patch
 # Fedora specspo is setup differently than what rpm expects, considering
 # this as Fedora-specific patch for now
-Patch3: rpm-4.6.0-fedora-specspo.patch
+Patch3: rpm-4.7.90-fedora-specspo.patch
 
-# Patches already in upstream (but not in 4.7.x)
-Patch200: rpm-4.7.1-bugurl.patch
-Patch201: rpm-4.7.0-extra-provides.patch
-Patch202: rpm-4.7.1-python-bytecompile.patch
-Patch203: rpm-4.7.2-sign-passcheck.patch
-Patch204: rpm-4.7.2-rpmfc-unknown.patch
-Patch205: rpm-4.7.2-pgp-subkey.patch
-Patch206: rpm-4.7.2-chmod-selinux.patch
+# Patches already in upstream
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -97,9 +88,6 @@ BuildRequires: xz-devel >= 4.999.8
 BuildRequires: sqlite-devel
 %endif
 
-# XXX temporarily for chmod-test patch
-BuildRequires: autoconf
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -157,6 +145,7 @@ Requires: elfutils >= 0.128 binutils
 Requires: findutils sed grep gawk diffutils file patch >= 2.5
 Requires: unzip gzip bzip2 cpio lzma xz
 Requires: pkgconfig
+Conflicts: ocaml-runtime < 3.11.1-7
 
 %description build
 The rpm-build package contains the scripts and executable programs
@@ -201,14 +190,6 @@ packages on a system.
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
-%patch200 -p1 -b .bugurl
-%patch201 -p1 -b .extra-prov
-%patch202 -p1 -b .python-bytecompile
-%patch203 -p1 -b .sign-passcheck
-%patch204 -p1 -b .rpmfc-unknown
-%patch205 -p1 -b .pgp-subkey
-%patch206 -p1 -b .chmod-test
-
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 
@@ -255,15 +236,13 @@ install -m 755 scripts/rpm.daily ${RPM_B
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
 install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/rpm
 
-install -p -m 755 %{SOURCE10} %{SOURCE11} ${RPM_BUILD_ROOT}%{rpmhome}/
-
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/rpm
 for dbi in \
     Basenames Conflictname Dirnames Group Installtid Name Packages \
     Providename Provideversion Requirename Requireversion Triggername \
-    Filedigests Pubkeys Sha1header Sigmd5 \
+    Filedigests Pubkeys Sha1header Sigmd5 Obsoletename \
     __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \
     __db.008 __db.009
 do
@@ -377,6 +356,8 @@ exit 0
 %{rpmhome}/javadeps
 %{rpmhome}/mono-find-provides
 %{rpmhome}/mono-find-requires
+%{rpmhome}/ocaml-find-provides.sh
+%{rpmhome}/ocaml-find-requires.sh
 %{rpmhome}/osgideps.pl
 %{rpmhome}/perldeps.pl
 %{rpmhome}/libtooldeps.sh
@@ -422,6 +403,10 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Dec 07 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.1
+- update to 4.8.0-beta1 (http://rpm.org/wiki/Releases/4.8.0)
+- rpm-build conflicts with current ocaml-runtime
+
 * Fri Dec 04 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.2-2
 - missing error exit code from signing password checking (#496754)
 - dont fail build on unrecognized data files (#532489)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- sources	25 Nov 2009 08:23:32 -0000	1.144
+++ sources	7 Dec 2009 13:35:12 -0000	1.145
@@ -1 +1 @@
-224715646325df4cd3904e3ac9e16186  rpm-4.7.2.tar.bz2
+dfe8f6b28d85b85b66ddacf712904fc1  rpm-4.8.0-beta1.tar.bz2


--- desktop-file.prov DELETED ---


--- fontconfig.prov DELETED ---


--- rpm-4.6.0-fedora-specspo.patch DELETED ---


--- rpm-4.7.0-devel-autodep.patch DELETED ---


--- rpm-4.7.0-extra-provides.patch DELETED ---


--- rpm-4.7.1-bugurl.patch DELETED ---


--- rpm-4.7.1-python-bytecompile.patch DELETED ---


--- rpm-4.7.2-chmod-selinux.patch DELETED ---


--- rpm-4.7.2-pgp-subkey.patch DELETED ---


--- rpm-4.7.2-rpmfc-unknown.patch DELETED ---


--- rpm-4.7.2-sign-passcheck.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 13:35:44 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:35:44 +0000 (UTC)
Subject: rpms/perl-Perl-Critic/devel perl-Perl-Critic.spec,1.24,1.25
Message-ID: <20091207133544.33A9E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Perl-Critic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20800

Modified Files:
	perl-Perl-Critic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-Perl-Critic.spec	25 Nov 2009 13:59:21 -0000	1.24
+++ perl-Perl-Critic.spec	7 Dec 2009 13:35:44 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-Perl-Critic
 Version:        1.105
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Critique Perl source code for best-practices
 
 Group:          Development/Libraries
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.105-3
+- rebuild against perl 5.10.1
+
 * Wed Nov 25 2009 Stepan Kasal <skasal at redhat.com> - 1.105-2
 - use the new filtering macros (verified that the resulting provides
   and requires are the same)



From kasal at fedoraproject.org  Mon Dec  7 13:36:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:36:03 +0000 (UTC)
Subject: rpms/perl-HTTP-Body/devel perl-HTTP-Body.spec,1.10,1.11
Message-ID: <20091207133603.8480311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTTP-Body/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21009

Modified Files:
	perl-HTTP-Body.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTTP-Body.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Body/devel/perl-HTTP-Body.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-HTTP-Body.spec	26 Jul 2009 06:33:22 -0000	1.10
+++ perl-HTTP-Body.spec	7 Dec 2009 13:36:03 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Body
 Version:        1.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        HTTP Body Parser
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:38:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:38:30 +0000 (UTC)
Subject: rpms/perl-App-Cmd/devel perl-App-Cmd.spec,1.10,1.11
Message-ID: <20091207133830.36E5C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-App-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21822

Modified Files:
	perl-App-Cmd.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-App-Cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Cmd/devel/perl-App-Cmd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-App-Cmd.spec	19 Sep 2009 18:49:09 -0000	1.10
+++ perl-App-Cmd.spec	7 Dec 2009 13:38:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       perl-App-Cmd
 Version:    0.301
-Release:    1%{?dist}
+Release:    2%{?dist}
 # see lib/App/Cmd.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.301-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.301-1
 - auto-update to 0.301 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 13:39:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:39:08 +0000 (UTC)
Subject: rpms/perl-Data-Visitor/devel perl-Data-Visitor.spec,1.10,1.11
Message-ID: <20091207133908.5954C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Visitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22146

Modified Files:
	perl-Data-Visitor.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Visitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Visitor/devel/perl-Data-Visitor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Data-Visitor.spec	26 Jul 2009 05:31:49 -0000	1.10
+++ perl-Data-Visitor.spec	7 Dec 2009 13:39:08 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Data-Visitor
 Version:        0.25
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Visitor style traversal of Perl data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.25-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atkac at fedoraproject.org  Mon Dec  7 13:40:29 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  7 Dec 2009 13:40:29 +0000 (UTC)
Subject: rpms/mtr/devel mtr075-rh516603.patch,NONE,1.1 mtr.spec,1.52,1.53
Message-ID: <20091207134029.956E711C03FC@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mtr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22596

Modified Files:
	mtr.spec 
Added Files:
	mtr075-rh516603.patch 
Log Message:
- install mtr as SUID binary (#518828)
- use fprintf instead of perror when getaddrinfo fails (#516603)


mtr075-rh516603.patch:
 mtr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mtr075-rh516603.patch ---
diff -up mtr-0.75/mtr.c.rh516603 mtr-0.75/mtr.c
--- mtr-0.75/mtr.c.rh516603	2009-12-07 14:27:27.281726685 +0100
+++ mtr-0.75/mtr.c	2009-12-07 14:28:32.574226121 +0100
@@ -402,7 +402,7 @@ int main(int argc, char **argv) 
   hints.ai_socktype = SOCK_DGRAM;
   error = getaddrinfo( Hostname, NULL, &hints, &res );
   if ( error ) {
-    perror( gai_strerror(error) );
+    fprintf(stderr, "%s\n", gai_strerror(error));
     exit( EXIT_FAILURE );
   }
   /* Convert the first addrinfo into a hostent. */


Index: mtr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- mtr.spec	25 Sep 2009 10:03:49 -0000	1.52
+++ mtr.spec	7 Dec 2009 13:40:29 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool
 Name: mtr
 Version: 0.75
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch:	2
 Group: Applications/Internet
 License: GPLv2+
@@ -11,6 +11,7 @@ Source1: xmtr.consolehelper
 Source2: xmtr.pam
 Source3: net-x%{name}.desktop
 Patch0: mtr-0.75-fd-flags.path
+Patch1: mtr075-rh516603.patch
 BuildRequires: ncurses-devel gtk2-devel desktop-file-utils
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,6 +35,7 @@ diagnostic tool.
 %prep
 %setup -q
 %patch0 -p1 -b .fd-flags
+%patch1 -p1 -b .rh516603
 
 %build
 %configure --enable-gtk2
@@ -71,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING FORMATS NEWS README SECURITY
-%attr(0755,root,root) %{_sbindir}/mtr
+%attr(4755,root,root) %{_sbindir}/mtr
 %{_mandir}/man8/*
 
 %files gtk
@@ -84,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Mon Dec 07 2009 Adam Tkac <atkac redhat com> 2:0.75-6
+- install mtr as SUID binary (#518828)
+- use fprintf instead of perror when getaddrinfo fails (#516603)
+
 * Fri Sep 25 2009 Adam Tkac <atkac redhat com> 2:0.75-5
 - remove unneeded build requires (#525547)
 



From kasal at fedoraproject.org  Mon Dec  7 13:40:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:40:34 +0000 (UTC)
Subject: rpms/perl-HTML-WikiConverter-Markdown/devel
	perl-HTML-WikiConverter-Markdown.spec, 1.2, 1.3
Message-ID: <20091207134034.3623411C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-WikiConverter-Markdown/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22722

Modified Files:
	perl-HTML-WikiConverter-Markdown.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-WikiConverter-Markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-WikiConverter-Markdown/devel/perl-HTML-WikiConverter-Markdown.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-WikiConverter-Markdown.spec	26 Jul 2009 06:33:05 -0000	1.2
+++ perl-HTML-WikiConverter-Markdown.spec	7 Dec 2009 13:40:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-WikiConverter-Markdown
 Version:        0.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Convert HTML to Markdown markup
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:43:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:43:32 +0000 (UTC)
Subject: rpms/perl-Data-TreeDumper-Renderer-GTK/devel
	perl-Data-TreeDumper-Renderer-GTK.spec, 1.5, 1.6
Message-ID: <20091207134332.BEB8D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-TreeDumper-Renderer-GTK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23759

Modified Files:
	perl-Data-TreeDumper-Renderer-GTK.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-TreeDumper-Renderer-GTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-TreeDumper-Renderer-GTK/devel/perl-Data-TreeDumper-Renderer-GTK.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Data-TreeDumper-Renderer-GTK.spec	26 Jul 2009 05:31:34 -0000	1.5
+++ perl-Data-TreeDumper-Renderer-GTK.spec	7 Dec 2009 13:43:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-Data-TreeDumper-Renderer-GTK 
 Version:    0.02 
-Release:    6%{?dist}
+Release:    7%{?dist}
 # see GTK.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -64,6 +64,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:43:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:43:48 +0000 (UTC)
Subject: rpms/perl-App-CLI/devel perl-App-CLI.spec,1.5,1.6
Message-ID: <20091207134348.80E8711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-App-CLI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23929

Modified Files:
	perl-App-CLI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-App-CLI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-CLI/devel/perl-App-CLI.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-App-CLI.spec	26 Jul 2009 01:40:11 -0000	1.5
+++ perl-App-CLI.spec	7 Dec 2009 13:43:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-App-CLI
 Version:        0.07
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Dispatcher module for command line interface programs
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:44:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:44:09 +0000 (UTC)
Subject: rpms/perl-Perlbal-XS-HTTPHeaders/devel
	perl-Perlbal-XS-HTTPHeaders.spec, 1.6, 1.7
Message-ID: <20091207134409.CFB6411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Perlbal-XS-HTTPHeaders/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24139

Modified Files:
	perl-Perlbal-XS-HTTPHeaders.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Perlbal-XS-HTTPHeaders.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perlbal-XS-HTTPHeaders/devel/perl-Perlbal-XS-HTTPHeaders.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Perlbal-XS-HTTPHeaders.spec	26 Jul 2009 16:13:31 -0000	1.6
+++ perl-Perlbal-XS-HTTPHeaders.spec	7 Dec 2009 13:44:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Perlbal-XS-HTTPHeaders
 Version:        0.19
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perlbal extension for processing HTTP headers
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.19-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:45:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:45:45 +0000 (UTC)
Subject: rpms/perl-HTML-WikiConverter/devel perl-HTML-WikiConverter.spec, 1.2,
	1.3
Message-ID: <20091207134545.D3EC211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-WikiConverter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24710

Modified Files:
	perl-HTML-WikiConverter.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-WikiConverter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-WikiConverter/devel/perl-HTML-WikiConverter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-WikiConverter.spec	26 Jul 2009 06:32:49 -0000	1.2
+++ perl-HTML-WikiConverter.spec	7 Dec 2009 13:45:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-WikiConverter
 Version:        0.68
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module to convert HTML to wiki markup
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.68-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.68-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:48:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:48:57 +0000 (UTC)
Subject: rpms/perl-Perl6-Junction/devel perl-Perl6-Junction.spec,1.3,1.4
Message-ID: <20091207134857.1FAAF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Perl6-Junction/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25791

Modified Files:
	perl-Perl6-Junction.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Perl6-Junction.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl6-Junction/devel/perl-Perl6-Junction.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Perl6-Junction.spec	26 Jul 2009 16:12:09 -0000	1.3
+++ perl-Perl6-Junction.spec	7 Dec 2009 13:48:56 -0000	1.4
@@ -1,7 +1,7 @@
 %define tarname Perl6-Junction
 Name:           perl-Perl6-Junction
 Version:        1.40000
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl6 style Junction operators in Perl5
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.40000-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.40000-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sparks at fedoraproject.org  Mon Dec  7 13:48:59 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon,  7 Dec 2009 13:48:59 +0000 (UTC)
Subject: rpms/zikula-module-menutree/EL-5 import.log, NONE,
	1.1 zikula-module-menutree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207134859.4863911C00EE@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-menutree/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25738/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-menutree.spec 
Log Message:
Initial build for EL-5.



--- NEW FILE import.log ---
zikula-module-menutree-2_2-1_fc12:EL-5:zikula-module-menutree-2.2-1.fc12.src.rpm:1260193719


--- NEW FILE zikula-module-menutree.spec ---
%global zikula_base         %{_datadir}/zikula
%global zikula_moddir       %{zikula_base}/modules
%global zikula_modname      menutree

Name:           zikula-module-%{zikula_modname}
Version:        2.2
Release:        1%{?dist}
Summary:        Menutree allows to create multilevel, hierarchical (tree-like) menu

Group:          Applications/Publishing
License:        GPL+ and ASL 2.0
# The only file that is licensed under ASL2 is cookiejar.js.  All other is GPL+.
URL:            http://code.zikula.org/bianor/changeset/192/tags/menutree/
# http://code.zikula.org/bianor/changeset/192/tags/menutree/2.2?old_path=%2F&format=zip
Source0:        tags_%{zikula_modname}_%{version}-r192.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  dos2unix 
Requires:       zikula >= 1.2

%description
Menutree allows to create multilevel, hierarchical (tree-like) menu. 
Block management can be done through "drag and drop" method, and the 
whole process of creating a block can be done without page reloads.


%prep
%setup -qn tags/%{zikula_modname}/%{version}/modules/menutree
# Remove empty index.html and others
find -size 0 | xargs rm -f
find -name '.htaccess' | xargs rm -f
find pndocs/ -name '*.txt' | xargs dos2unix
iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/credits.txt
iconv -f ISO-8859-1 -t UTF8 pndocs/credits.txt -o pndocs/pomoc.txt

%build


%install
rm -rf $RPM_BUILD_ROOT
%{__mkdir} -p $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} 
cp -pr . $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}
rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/pndocs




%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc pndocs/changelog.txt pndocs/license.txt pndocs/credits.txt pndocs/help.txt pndocs/pomoc.txt pndocs/readme.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Sun Dec 06 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.2-1
- Upstream fix of license issues.

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.1-2
- Fixed source0 name.

* Sun Jun 14 2009 Fedora Docs Team <docs at fedoraproject.org> - 2.0.1-1
- Initial RPM release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-menutree/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Dec 2009 05:17:09 -0000	1.1
+++ .cvsignore	7 Dec 2009 13:48:59 -0000	1.2
@@ -0,0 +1 @@
+tags_menutree_2.2-r192.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-menutree/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Dec 2009 05:17:09 -0000	1.1
+++ sources	7 Dec 2009 13:48:59 -0000	1.2
@@ -0,0 +1 @@
+72f19c4d95d935e29e54a8ecb1f8e795  tags_menutree_2.2-r192.zip



From kasal at fedoraproject.org  Mon Dec  7 13:49:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:49:24 +0000 (UTC)
Subject: rpms/perl-App-Cache/devel perl-App-Cache.spec,1.3,1.4
Message-ID: <20091207134924.F183411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-App-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26082

Modified Files:
	perl-App-Cache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-App-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Cache/devel/perl-App-Cache.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-App-Cache.spec	8 Aug 2009 18:53:05 -0000	1.3
+++ perl-App-Cache.spec	7 Dec 2009 13:49:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-App-Cache
 Version:    0.36
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/App/Cache.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.36-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.36-1
 - auto-update to 0.36 (by cpan-spec-update 0.01)
 - added a new req on perl(File::Find::Rule) (version 0)



From kasal at fedoraproject.org  Mon Dec  7 13:50:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:50:07 +0000 (UTC)
Subject: rpms/perl-HTML-TreeBuilder-XPath/devel
	perl-HTML-TreeBuilder-XPath.spec, 1.3, 1.4
Message-ID: <20091207135007.6524E11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-TreeBuilder-XPath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26399

Modified Files:
	perl-HTML-TreeBuilder-XPath.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-TreeBuilder-XPath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-TreeBuilder-XPath/devel/perl-HTML-TreeBuilder-XPath.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-HTML-TreeBuilder-XPath.spec	26 Jul 2009 06:32:32 -0000	1.3
+++ perl-HTML-TreeBuilder-XPath.spec	7 Dec 2009 13:50:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-HTML-TreeBuilder-XPath
 Version:        0.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Add XPath support to HTML::TreeBuilder
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:50:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:50:21 +0000 (UTC)
Subject: rpms/perl-Data-TreeDumper/devel perl-Data-TreeDumper.spec,1.4,1.5
Message-ID: <20091207135021.9CD6E11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-TreeDumper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26585

Modified Files:
	perl-Data-TreeDumper.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-TreeDumper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-TreeDumper/devel/perl-Data-TreeDumper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Data-TreeDumper.spec	26 Jul 2009 05:31:20 -0000	1.4
+++ perl-Data-TreeDumper.spec	7 Dec 2009 13:50:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-Data-TreeDumper 
 Version:    0.35 
-Release:    5%{?dist}
+Release:    6%{?dist}
 # see TreeDumper.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -82,6 +82,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.35-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:52:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:52:46 +0000 (UTC)
Subject: rpms/perl-Perl6-Bible/devel perl-Perl6-Bible.spec,1.6,1.7
Message-ID: <20091207135246.C867411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Perl6-Bible/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27377

Modified Files:
	perl-Perl6-Bible.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Perl6-Bible.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl6-Bible/devel/perl-Perl6-Bible.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Perl6-Bible.spec	26 Jul 2009 16:11:52 -0000	1.6
+++ perl-Perl6-Bible.spec	7 Dec 2009 13:52:46 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Perl6-Bible
 Version:        0.30
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl 6 Design Documentations
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.30-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:53:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:53:49 +0000 (UTC)
Subject: rpms/perl-App-Asciio/devel perl-App-Asciio.spec,1.3,1.4
Message-ID: <20091207135349.B79D811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-App-Asciio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27768

Modified Files:
	perl-App-Asciio.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-App-Asciio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Asciio/devel/perl-App-Asciio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-App-Asciio.spec	26 Jul 2009 01:39:54 -0000	1.3
+++ perl-App-Asciio.spec	7 Dec 2009 13:53:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-App-Asciio 
 Version:    1.02.71 
-Release:    4%{?dist}
+Release:    5%{?dist}
 # see lib/App/Asciio.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -152,6 +152,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02.71-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02.71-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:54:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:54:17 +0000 (UTC)
Subject: rpms/perl-HTML-Tree/devel perl-HTML-Tree.spec,1.17,1.18
Message-ID: <20091207135417.703F411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Tree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28016

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tree/devel/perl-HTML-Tree.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-HTML-Tree.spec	28 Sep 2009 14:33:10 -0000	1.17
+++ perl-HTML-Tree.spec	7 Dec 2009 13:54:17 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Tree
 Version:        3.23
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        HTML tree handling modules for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML::*3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:3.23-10
+- rebuild against perl 5.10.1
+
 * Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.23-9
 - apply Jeff Fearn's fix for the missing close tag bug (bz 535587)
 



From kasal at fedoraproject.org  Mon Dec  7 13:54:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:54:34 +0000 (UTC)
Subject: rpms/perl-Data-Structure-Util/devel perl-Data-Structure-Util.spec, 
	1.10, 1.11
Message-ID: <20091207135434.994C411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Structure-Util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28243

Modified Files:
	perl-Data-Structure-Util.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Structure-Util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Structure-Util/devel/perl-Data-Structure-Util.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Data-Structure-Util.spec	26 Jul 2009 05:31:06 -0000	1.10
+++ perl-Data-Structure-Util.spec	7 Dec 2009 13:54:34 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Data-Structure-Util
 Version:        0.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Change nature of data within a structure
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Mon Dec  7 13:55:57 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Dec 2009 13:55:57 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.79,1.80
Message-ID: <20091207135557.5E1FF11C00EE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28755

Modified Files:
	xine-lib.spec 
Log Message:
* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 1.1.17-2
- Remove gnome-vfs2 plugin, it's mostly useless



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- xine-lib.spec	2 Dec 2009 18:27:27 -0000	1.79
+++ xine-lib.spec	7 Dec 2009 13:55:57 -0000	1.80
@@ -33,7 +33,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.xine-project.org/ 
@@ -110,7 +110,6 @@ BuildRequires:  wavpack-devel
 BuildRequires:  libcdio-devel
 # Other
 BuildRequires:  pkgconfig
-BuildRequires:  gnome-vfs2-devel
 BuildRequires:  gtk2-devel
 %if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires:  libsmbclient-devel
@@ -404,7 +403,6 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{!?_without_imagemagick:1}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
 %endif # imagemagick
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
@@ -431,6 +429,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 1.1.17-2
+- Remove gnome-vfs2 plugin, it's mostly useless
+
 * Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.17-1
 - xine-lib-1.1.17, plugin-abi 1.27
 



From kasal at fedoraproject.org  Mon Dec  7 13:57:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:57:21 +0000 (UTC)
Subject: rpms/perl-PDL-Graphics-PLplot/devel perl-PDL-Graphics-PLplot.spec,
	1.2, 1.3
Message-ID: <20091207135721.7036411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29288

Modified Files:
	perl-PDL-Graphics-PLplot.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PDL-Graphics-PLplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL-Graphics-PLplot/devel/perl-PDL-Graphics-PLplot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-PDL-Graphics-PLplot.spec	5 Nov 2009 03:58:28 -0000	1.2
+++ perl-PDL-Graphics-PLplot.spec	7 Dec 2009 13:57:21 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-PDL-Graphics-PLplot
 Version:        0.51
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Object-oriented interface from perl/PDL to the PLPLOT plotting library
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.51-4
+- rebuild against perl 5.10.1
+
 * Mon Sep 14 2009 Orion Poplawski 0.51-3
 - Add BR on perl(Test::More)
 - Exclude PLplot.bs



From kasal at fedoraproject.org  Mon Dec  7 13:58:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:58:45 +0000 (UTC)
Subject: rpms/perl-HTML-TokeParser-Simple/devel
	perl-HTML-TokeParser-Simple.spec, 1.3, 1.4
Message-ID: <20091207135845.A057E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-TokeParser-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29869

Modified Files:
	perl-HTML-TokeParser-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-TokeParser-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-TokeParser-Simple/devel/perl-HTML-TokeParser-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-HTML-TokeParser-Simple.spec	26 Jul 2009 06:32:00 -0000	1.3
+++ perl-HTML-TokeParser-Simple.spec	7 Dec 2009 13:58:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-HTML-TokeParser-Simple
 Version:        3.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Easy to use HTML::TokeParser interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.15-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:58:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:58:53 +0000 (UTC)
Subject: rpms/perl-Data-Stag/devel perl-Data-Stag.spec,1.7,1.8
Message-ID: <20091207135853.E6A9B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Stag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30018

Modified Files:
	perl-Data-Stag.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Stag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Stag/devel/perl-Data-Stag.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Data-Stag.spec	26 Jul 2009 05:30:53 -0000	1.7
+++ perl-Data-Stag.spec	7 Dec 2009 13:58:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Data-Stag
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl package for Structured Tags datastructures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 13:59:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 13:59:02 +0000 (UTC)
Subject: rpms/perl-Apache-Session-Wrapper/devel
	perl-Apache-Session-Wrapper.spec, 1.10, 1.11
Message-ID: <20091207135902.C195C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30230

Modified Files:
	perl-Apache-Session-Wrapper.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Apache-Session-Wrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Apache-Session-Wrapper/devel/perl-Apache-Session-Wrapper.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Apache-Session-Wrapper.spec	26 Jul 2009 01:39:20 -0000	1.10
+++ perl-Apache-Session-Wrapper.spec	7 Dec 2009 13:59:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Session-Wrapper
 Version:        0.33
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A simple wrapper around Apache::Session
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.33-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:03:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:03:18 +0000 (UTC)
Subject: rpms/perl-HTML-Toc/devel perl-HTML-Toc.spec,1.2,1.3
Message-ID: <20091207140318.AA46C11C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Toc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31728

Modified Files:
	perl-HTML-Toc.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Toc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Toc/devel/perl-HTML-Toc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-Toc.spec	26 Jul 2009 06:31:45 -0000	1.2
+++ perl-HTML-Toc.spec	7 Dec 2009 14:03:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Toc
 Version:        1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate, insert and update HTML Table of Contents
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.11-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:03:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:03:21 +0000 (UTC)
Subject: rpms/perl-Apache-Session/devel perl-Apache-Session.spec,1.15,1.16
Message-ID: <20091207140321.A747B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Apache-Session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31802

Modified Files:
	perl-Apache-Session.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Apache-Session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Apache-Session/devel/perl-Apache-Session.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Apache-Session.spec	26 Jul 2009 01:39:05 -0000	1.15
+++ perl-Apache-Session.spec	7 Dec 2009 14:03:21 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Session
 Version:        1.88
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Persistence framework for session data
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.88-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.88-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:03:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:03:37 +0000 (UTC)
Subject: rpms/perl-Data-Section/devel perl-Data-Section.spec,1.4,1.5
Message-ID: <20091207140337.0100311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Section/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32057

Modified Files:
	perl-Data-Section.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Section.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Section/devel/perl-Data-Section.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Data-Section.spec	26 Jul 2009 05:30:39 -0000	1.4
+++ perl-Data-Section.spec	7 Dec 2009 14:03:36 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Data-Section
 Version:        0.091820
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Read multiple hunks of data out of your DATA section
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.091820-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.091820-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:04:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:04:26 +0000 (UTC)
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.55,1.56
Message-ID: <20091207140426.3F57E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32432

Modified Files:
	perl-PDL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- perl-PDL.spec	18 Sep 2009 21:40:26 -0000	1.55
+++ perl-PDL.spec	7 Dec 2009 14:04:26 -0000	1.56
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.4_05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.4.4_05-6
+- rebuild against perl 5.10.1
+
 * Thu Sep 10 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4_05-5
 - Remove PDL::Graphics::PLplot to make way for separate package
 



From hadess at fedoraproject.org  Mon Dec  7 14:05:39 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Dec 2009 14:05:39 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.277,1.278
Message-ID: <20091207140539.8422711C00EE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv441

Modified Files:
	rhythmbox.spec 
Log Message:
* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-2
- Remove libhal requirement



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- rhythmbox.spec	22 Nov 2009 15:05:19 -0000	1.277
+++ rhythmbox.spec	7 Dec 2009 14:05:39 -0000	1.278
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -39,7 +39,6 @@ BuildRequires: gnome-doc-utils
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
 BuildRequires: libsoup-devel >= 2.3.0
-BuildRequires: hal-devel
 BuildRequires: lirc-devel
 BuildRequires: libmtp-devel
 BuildRequires: gstreamer-python-devel
@@ -217,6 +216,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-2
+- Remove libhal requirement
+
 * Sun Nov 22 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-1
 - Update to 0.12.6
 



From kasal at fedoraproject.org  Mon Dec  7 14:08:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:08:36 +0000 (UTC)
Subject: rpms/perl-HTML-Tiny/devel perl-HTML-Tiny.spec,1.6,1.7
Message-ID: <20091207140836.3154B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1527

Modified Files:
	perl-HTML-Tiny.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tiny/devel/perl-HTML-Tiny.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-HTML-Tiny.spec	26 Jul 2009 06:31:31 -0000	1.6
+++ perl-HTML-Tiny.spec	7 Dec 2009 14:08:35 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Tiny
 Version:        1.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight, dependency free HTML/XML generation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:08:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:08:38 +0000 (UTC)
Subject: rpms/perl-Apache-LogRegex/devel perl-Apache-LogRegex.spec,1.9,1.10
Message-ID: <20091207140838.A6BF811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Apache-LogRegex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1551

Modified Files:
	perl-Apache-LogRegex.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Apache-LogRegex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Apache-LogRegex/devel/perl-Apache-LogRegex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Apache-LogRegex.spec	26 Jul 2009 01:38:49 -0000	1.9
+++ perl-Apache-LogRegex.spec	7 Dec 2009 14:08:38 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Apache-LogRegex
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse a line from an Apache logfile into a hash
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.5-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:08:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:08:42 +0000 (UTC)
Subject: rpms/perl-Data-Report/devel perl-Data-Report.spec,1.3,1.4
Message-ID: <20091207140842.503E611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Report/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1623

Modified Files:
	perl-Data-Report.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/devel/perl-Data-Report.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Data-Report.spec	11 Oct 2009 10:25:37 -0000	1.3
+++ perl-Data-Report.spec	7 Dec 2009 14:08:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		perl-Data-Report
 Version:	0.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A flexible plugin-driven reporting framework
 
 Group:		Development/Libraries
@@ -54,6 +54,9 @@ style sheets.
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-4
+- rebuild against perl 5.10.1
+
 * Sun Oct 11 2009 Johan Vromans <jvromans at squirrel.nl> 0.10-3
 - Remove Text::CSV_XS kludge now Text::CVS is packaged as well.
 



From hadess at fedoraproject.org  Mon Dec  7 14:09:19 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  7 Dec 2009 14:09:19 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.176,
	1.177
Message-ID: <20091207140919.0B79B11C00EE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2009

Modified Files:
	gnome-power-manager.spec 
Log Message:
* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
- Remove HAL dependency



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- gnome-power-manager.spec	2 Nov 2009 05:09:33 -0000	1.176
+++ gnome-power-manager.spec	7 Dec 2009 14:09:18 -0000	1.177
@@ -1,11 +1,10 @@
-%define hal_version  0.5.8
 %define dbus_version 0.61
 %define alphatag                20090730
 
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.28.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -27,7 +26,6 @@ BuildRequires: autoconf automake libtool
 Patch3: 0001-Use-gnome-settings-daemon-popup-code.patch
 
 BuildRequires: libwnck-devel
-BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: libnotify-devel
 BuildRequires: gnome-panel-devel
@@ -45,7 +43,6 @@ Requires: gtk2 >= 2.10.0
 Requires: gnome-icon-theme
 Requires: libnotify >= 0.4.3
 Requires: libcanberra
-Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
 Requires: unique >= 0.9.4
@@ -196,6 +193,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
+- Remove HAL dependency
+
 * Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
 - Match gnome-settings-daemon's positioning for the OSD
 



From kasal at fedoraproject.org  Mon Dec  7 14:12:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:12:39 +0000 (UTC)
Subject: rpms/perl-Data-Password/devel perl-Data-Password.spec,1.5,1.6
Message-ID: <20091207141239.6A00911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Password/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3286

Modified Files:
	perl-Data-Password.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Password.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Password/devel/perl-Data-Password.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Data-Password.spec	26 Jul 2009 05:30:10 -0000	1.5
+++ perl-Data-Password.spec	7 Dec 2009 14:12:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Data-Password
 Version:        1.07
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl extension for assesing password quality
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:12:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:12:54 +0000 (UTC)
Subject: rpms/perl-Apache-Htpasswd/devel perl-Apache-Htpasswd.spec,1.3,1.4
Message-ID: <20091207141254.7818E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Apache-Htpasswd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3490

Modified Files:
	perl-Apache-Htpasswd.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Apache-Htpasswd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Apache-Htpasswd/devel/perl-Apache-Htpasswd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Apache-Htpasswd.spec	26 Jul 2009 01:38:34 -0000	1.3
+++ perl-Apache-Htpasswd.spec	7 Dec 2009 14:12:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Htpasswd
 Version:        1.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Manage Unix crypt-style password file
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.8-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:13:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:13:40 +0000 (UTC)
Subject: rpms/perl-HTML-Tidy/devel perl-HTML-Tidy.spec,1.4,1.5
Message-ID: <20091207141340.871BA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Tidy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3870

Modified Files:
	perl-HTML-Tidy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Tidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tidy/devel/perl-HTML-Tidy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-HTML-Tidy.spec	26 Jul 2009 06:31:16 -0000	1.4
+++ perl-HTML-Tidy.spec	7 Dec 2009 14:13:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Tidy
 Version:        1.08
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        (X)HTML cleanup in a Perl object
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.08-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:16:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:16:59 +0000 (UTC)
Subject: rpms/perl-Apache-DBI-Cache/devel perl-Apache-DBI-Cache.spec, 1.3,
	1.4
Message-ID: <20091207141659.E1BDC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Apache-DBI-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4987

Modified Files:
	perl-Apache-DBI-Cache.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Apache-DBI-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Apache-DBI-Cache/devel/perl-Apache-DBI-Cache.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Apache-DBI-Cache.spec	26 Jul 2009 01:38:20 -0000	1.3
+++ perl-Apache-DBI-Cache.spec	7 Dec 2009 14:16:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Apache-DBI-Cache
 Version:        0.08
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl DBI connection cache
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:17:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:17:26 +0000 (UTC)
Subject: rpms/perl-Data-Page/devel perl-Data-Page.spec,1.9,1.10
Message-ID: <20091207141726.E697411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Page/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5236

Modified Files:
	perl-Data-Page.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Page.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Page/devel/perl-Data-Page.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Data-Page.spec	26 Jul 2009 05:29:57 -0000	1.9
+++ perl-Data-Page.spec	7 Dec 2009 14:17:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Data-Page
 Version:        2.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Help when paging through sets of results
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.01-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:18:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:18:11 +0000 (UTC)
Subject: rpms/perl-HTML-Template-Pro/devel perl-HTML-Template-Pro.spec, 1.10,
	1.11
Message-ID: <20091207141811.86D7611C0401@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5585

Modified Files:
	perl-HTML-Template-Pro.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Template-Pro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Template-Pro/devel/perl-HTML-Template-Pro.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-HTML-Template-Pro.spec	7 Sep 2009 09:47:59 -0000	1.10
+++ perl-HTML-Template-Pro.spec	7 Dec 2009 14:18:11 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template-Pro
 Version:        0.87
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl/XS module to use HTML Templates from CGI scripts
 License:        GPL+ or Artistic or LGPLv2+
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.87-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 07 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.87-1
 - New upstream release
 



From kasal at fedoraproject.org  Mon Dec  7 14:21:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:21:28 +0000 (UTC)
Subject: rpms/perl-Data-OptList/devel perl-Data-OptList.spec,1.7,1.8
Message-ID: <20091207142128.940FA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-OptList/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6719

Modified Files:
	perl-Data-OptList.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-OptList.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-OptList/devel/perl-Data-OptList.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Data-OptList.spec	26 Jul 2009 05:29:42 -0000	1.7
+++ perl-Data-OptList.spec	7 Dec 2009 14:21:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Data-OptList
 Version:        0.104
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse and validate simple name/value option pairs
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.104-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.104-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:21:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:21:42 +0000 (UTC)
Subject: rpms/perl-Apache-DBI/devel perl-Apache-DBI.spec,1.8,1.9
Message-ID: <20091207142142.83BF811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Apache-DBI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6915

Modified Files:
	perl-Apache-DBI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Apache-DBI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Apache-DBI/devel/perl-Apache-DBI.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Apache-DBI.spec	26 Jul 2009 01:38:06 -0000	1.8
+++ perl-Apache-DBI.spec	7 Dec 2009 14:21:42 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:      perl-Apache-DBI
 Version:   1.07
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Persistent database connections with Apache/mod_perl
 
 Group:     Development/Libraries
@@ -69,6 +69,9 @@ make test
 %{perl_vendorlib}/Apache
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:21:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:21:53 +0000 (UTC)
Subject: rpms/perl-PDF-Reuse/devel perl-PDF-Reuse.spec,1.2,1.3
Message-ID: <20091207142153.0337011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PDF-Reuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7075

Modified Files:
	perl-PDF-Reuse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PDF-Reuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-Reuse/devel/perl-PDF-Reuse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-PDF-Reuse.spec	26 Jul 2009 13:54:34 -0000	1.2
+++ perl-PDF-Reuse.spec	7 Dec 2009 14:21:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-PDF-Reuse 
 Version:    0.35 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # Reuse.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -72,6 +72,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.35-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:22:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:22:13 +0000 (UTC)
Subject: rpms/perl-HTML-Template-Expr/devel perl-HTML-Template-Expr.spec,
	1.12, 1.13
Message-ID: <20091207142213.C484D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Template-Expr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7281

Modified Files:
	perl-HTML-Template-Expr.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Template-Expr/devel/perl-HTML-Template-Expr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-HTML-Template-Expr.spec	26 Jul 2009 06:30:47 -0000	1.12
+++ perl-HTML-Template-Expr.spec	7 Dec 2009 14:22:13 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template-Expr
 Version:        0.07
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Expression support extension for HTML::Template
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML::Template::Expr.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.07-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:25:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:25:14 +0000 (UTC)
Subject: rpms/perl-Data-ObjectDriver/devel perl-Data-ObjectDriver.spec, 1.2, 
	1.3
Message-ID: <20091207142514.CAE8D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-ObjectDriver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8274

Modified Files:
	perl-Data-ObjectDriver.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-ObjectDriver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ObjectDriver/devel/perl-Data-ObjectDriver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Data-ObjectDriver.spec	26 Jul 2009 05:29:26 -0000	1.2
+++ perl-Data-ObjectDriver.spec	7 Dec 2009 14:25:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Data-ObjectDriver
 Version:        0.06
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple, transparent data interface, with caching
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:25:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:25:45 +0000 (UTC)
Subject: rpms/perl-Apache2-SOAP/devel perl-Apache2-SOAP.spec,1.3,1.4
Message-ID: <20091207142545.ADE8911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Apache2-SOAP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8497

Modified Files:
	perl-Apache2-SOAP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Apache2-SOAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Apache2-SOAP/devel/perl-Apache2-SOAP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Apache2-SOAP.spec	26 Jul 2009 01:39:38 -0000	1.3
+++ perl-Apache2-SOAP.spec	7 Dec 2009 14:25:45 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:      perl-Apache2-SOAP
 Version:   0.73
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   A replacement for Apache::SOAP designed to work with mod_perl 2
 
 Group:     Development/Libraries
@@ -66,6 +66,9 @@ APACHE_TEST_HTTPD=%{_sbindir}/httpd make
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.73-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.73-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:26:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:26:34 +0000 (UTC)
Subject: rpms/perl-PDF-API2/devel perl-PDF-API2.spec,1.22,1.23
Message-ID: <20091207142634.D303D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PDF-API2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8845

Modified Files:
	perl-PDF-API2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PDF-API2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-API2/devel/perl-PDF-API2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-PDF-API2.spec	26 Jul 2009 13:54:17 -0000	1.22
+++ perl-PDF-API2.spec	7 Dec 2009 14:26:34 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-PDF-API2
 Version:        0.73
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for creation and modification of PDF files
 
 Group:          System Environment/Libraries
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.73-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.73-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:26:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:26:55 +0000 (UTC)
Subject: rpms/perl-HTML-Template/devel perl-HTML-Template.spec,1.17,1.18
Message-ID: <20091207142655.CF5F411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Template/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9085

Modified Files:
	perl-HTML-Template.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Template.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Template/devel/perl-HTML-Template.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-HTML-Template.spec	26 Jul 2009 06:30:33 -0000	1.17
+++ perl-HTML-Template.spec	7 Dec 2009 14:26:55 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template
 Version:        2.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl module to use HTML Templates
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.9-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:29:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:29:55 +0000 (UTC)
Subject: rpms/perl-Data-ICal/devel perl-Data-ICal.spec,1.7,1.8
Message-ID: <20091207142955.0860811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-ICal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10377

Modified Files:
	perl-Data-ICal.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/devel/perl-Data-ICal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Data-ICal.spec	29 Jul 2009 08:10:10 -0000	1.7
+++ perl-Data-ICal.spec	7 Dec 2009 14:29:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Data-ICal
 Version:        0.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generates iCalendar (RFC 2445) calendar files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-2
+- rebuild against perl 5.10.1
+
 * Wed Jul 29 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.16-1
 - Upstream update.
 - Replace broken inc/Module/Install/* with a copy of Module::Install-0.91.



From kasal at fedoraproject.org  Mon Dec  7 14:30:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:30:07 +0000 (UTC)
Subject: rpms/perl-Any-Moose/devel perl-Any-Moose.spec,1.4,1.5
Message-ID: <20091207143007.EB5ED11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Any-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10589

Modified Files:
	perl-Any-Moose.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Any-Moose.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Any-Moose/devel/perl-Any-Moose.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Any-Moose.spec	31 Jul 2009 06:53:53 -0000	1.4
+++ perl-Any-Moose.spec	7 Dec 2009 14:30:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-Any-Moose
 Version:    0.10
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/Any/Moose.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-2
+- rebuild against perl 5.10.1
+
 * Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
 - auto-update to 0.10 (by cpan-spec-update 0.01)
 - altered req on perl(Mouse) (0.20 => 0.21)



From kasal at fedoraproject.org  Mon Dec  7 14:31:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:31:00 +0000 (UTC)
Subject: rpms/perl-HTML-Tagset/devel perl-HTML-Tagset.spec,1.23,1.24
Message-ID: <20091207143100.0B83111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Tagset/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11017

Modified Files:
	perl-HTML-Tagset.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Tagset.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Tagset/devel/perl-HTML-Tagset.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-HTML-Tagset.spec	26 Jul 2009 06:30:13 -0000	1.23
+++ perl-HTML-Tagset.spec	7 Dec 2009 14:30:59 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Tagset
 Version:        3.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        HTML::Tagset - data tables useful in parsing HTML
 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.20-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:31:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:31:01 +0000 (UTC)
Subject: rpms/perl-PBS/devel perl-PBS.spec,1.8,1.9
Message-ID: <20091207143101.A6D0411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PBS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11067

Modified Files:
	perl-PBS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PBS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PBS/devel/perl-PBS.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-PBS.spec	26 Jul 2009 13:53:57 -0000	1.8
+++ perl-PBS.spec	7 Dec 2009 14:31:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-PBS
 Version:        0.33
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl binding for the Portable Batch System client library
 
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.33-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:34:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:34:00 +0000 (UTC)
Subject: rpms/perl-Data-Hierarchy/devel perl-Data-Hierarchy.spec,1.7,1.8
Message-ID: <20091207143400.F311311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Hierarchy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12157

Modified Files:
	perl-Data-Hierarchy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Hierarchy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Hierarchy/devel/perl-Data-Hierarchy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Data-Hierarchy.spec	26 Jul 2009 05:28:56 -0000	1.7
+++ perl-Data-Hierarchy.spec	7 Dec 2009 14:34:00 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Data-Hierarchy
 Version:        0.34
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Handle data in a hierarchical structure
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.34-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:34:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:34:17 +0000 (UTC)
Subject: rpms/perl-AnyEvent-XMPP/devel perl-AnyEvent-XMPP.spec,1.2,1.3
Message-ID: <20091207143417.024C111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AnyEvent-XMPP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12357

Modified Files:
	perl-AnyEvent-XMPP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AnyEvent-XMPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent-XMPP/devel/perl-AnyEvent-XMPP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-AnyEvent-XMPP.spec	26 Jul 2009 01:37:49 -0000	1.2
+++ perl-AnyEvent-XMPP.spec	7 Dec 2009 14:34:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-AnyEvent-XMPP
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Implementation of the XMPP Protocol
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.4-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:34:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:34:59 +0000 (UTC)
Subject: rpms/perl-HTML-TagCloud/devel perl-HTML-TagCloud.spec,1.2,1.3
Message-ID: <20091207143459.269DA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-TagCloud/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12669

Modified Files:
	perl-HTML-TagCloud.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-TagCloud.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-TagCloud/devel/perl-HTML-TagCloud.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-TagCloud.spec	26 Jul 2009 06:29:55 -0000	1.2
+++ perl-HTML-TagCloud.spec	7 Dec 2009 14:34:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-HTML-TagCloud 
 Version:    0.34 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/HTML/TagCloud.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.34-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:35:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:35:56 +0000 (UTC)
Subject: rpms/perl-Path-Class/devel perl-Path-Class.spec,1.5,1.6
Message-ID: <20091207143556.B122F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Path-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13073

Modified Files:
	perl-Path-Class.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Path-Class.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Path-Class/devel/perl-Path-Class.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Path-Class.spec	26 Jul 2009 16:10:47 -0000	1.5
+++ perl-Path-Class.spec	7 Dec 2009 14:35:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Path-Class
 Version:        0.16
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cross-platform path specification manipulation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:37:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:37:45 +0000 (UTC)
Subject: rpms/perl-Data-HexDump/devel perl-Data-HexDump.spec,1.6,1.7
Message-ID: <20091207143745.5570B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-HexDump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13788

Modified Files:
	perl-Data-HexDump.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-HexDump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-HexDump/devel/perl-Data-HexDump.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Data-HexDump.spec	26 Jul 2009 05:28:41 -0000	1.6
+++ perl-Data-HexDump.spec	7 Dec 2009 14:37:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Data-HexDump
 Version:        0.02
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Hexadecial Dumper
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:38:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:38:27 +0000 (UTC)
Subject: rpms/perl-AnyEvent-BDB/devel perl-AnyEvent-BDB.spec,1.4,1.5
Message-ID: <20091207143827.B5E2F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AnyEvent-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14123

Modified Files:
	perl-AnyEvent-BDB.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AnyEvent-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent-BDB/devel/perl-AnyEvent-BDB.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-AnyEvent-BDB.spec	29 Jul 2009 10:20:04 -0000	1.4
+++ perl-AnyEvent-BDB.spec	7 Dec 2009 14:38:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-AnyEvent-BDB
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Truly asynchronous Berkeley DB access
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1-2
+- rebuild against perl 5.10.1
+
 * Wed Jul 29 2009 kwizart < kwizart at gmail.com > - 1.1-1
 - Update to 1.1
 



From kasal at fedoraproject.org  Mon Dec  7 14:39:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:39:03 +0000 (UTC)
Subject: rpms/perl-HTML-TableExtract/devel perl-HTML-TableExtract.spec, 1.9, 
	1.10
Message-ID: <20091207143903.9324911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-TableExtract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14479

Modified Files:
	perl-HTML-TableExtract.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-TableExtract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-TableExtract/devel/perl-HTML-TableExtract.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-HTML-TableExtract.spec	26 Jul 2009 06:29:39 -0000	1.9
+++ perl-HTML-TableExtract.spec	7 Dec 2009 14:39:03 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-HTML-TableExtract
 Version:        2.10
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        A Perl module for extracting content in HTML tables
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.10-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmz at fedoraproject.org  Mon Dec  7 14:39:30 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Mon,  7 Dec 2009 14:39:30 +0000 (UTC)
Subject: File git-1.6.5.5.tar.bz2 uploaded to lookaside cache by tmz
Message-ID: <20091207143930.ADA3E10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for git:

fd575f22e67adbea1d17e5bc66a80f8d  git-1.6.5.5.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 14:40:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:40:17 +0000 (UTC)
Subject: rpms/perl-PatchReader/devel perl-PatchReader.spec,1.8,1.9
Message-ID: <20091207144017.F073E11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PatchReader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15108

Modified Files:
	perl-PatchReader.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PatchReader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PatchReader/devel/perl-PatchReader.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-PatchReader.spec	26 Jul 2009 16:10:29 -0000	1.8
+++ perl-PatchReader.spec	7 Dec 2009 14:40:17 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		perl-PatchReader
 Version: 	0.9.5
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 Summary:	Utilities to read and manipulate patches and CVS
 
 Group: 		Development/Libraries
@@ -63,6 +63,9 @@ make test
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9.5-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:42:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:42:00 +0000 (UTC)
Subject: rpms/perl-Data-FormValidator-Constraints-DateTime/devel
	perl-Data-FormValidator-Constraints-DateTime.spec, 1.2, 1.3
Message-ID: <20091207144200.0FA0011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15710

Modified Files:
	perl-Data-FormValidator-Constraints-DateTime.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-FormValidator-Constraints-DateTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator-Constraints-DateTime/devel/perl-Data-FormValidator-Constraints-DateTime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Data-FormValidator-Constraints-DateTime.spec	26 Jul 2009 05:28:25 -0000	1.2
+++ perl-Data-FormValidator-Constraints-DateTime.spec	7 Dec 2009 14:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Data-FormValidator-Constraints-DateTime
 Version:        1.09
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        D::FV constraints for dates and times
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.09-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:42:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:42:50 +0000 (UTC)
Subject: rpms/perl-AnyEvent-AIO/devel perl-AnyEvent-AIO.spec,1.5,1.6
Message-ID: <20091207144250.DCE5E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AnyEvent-AIO/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16111

Modified Files:
	perl-AnyEvent-AIO.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AnyEvent-AIO.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent-AIO/devel/perl-AnyEvent-AIO.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-AnyEvent-AIO.spec	29 Jul 2009 10:55:37 -0000	1.5
+++ perl-AnyEvent-AIO.spec	7 Dec 2009 14:42:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-AnyEvent-AIO
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Truly asynchronous file and directrory I/O
 
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1-3
+- rebuild against perl 5.10.1
+
 * Wed Jul 29 2009 kwizart < kwizart at gmail.com > - 1.1-2
 - Update to 1.1
 



From kasal at fedoraproject.org  Mon Dec  7 14:42:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:42:58 +0000 (UTC)
Subject: rpms/perl-HTML-Table/devel perl-HTML-Table.spec,1.9,1.10
Message-ID: <20091207144258.0D6A511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16198

Modified Files:
	perl-HTML-Table.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Table/devel/perl-HTML-Table.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-HTML-Table.spec	26 Jul 2009 06:29:23 -0000	1.9
+++ perl-HTML-Table.spec	7 Dec 2009 14:42:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Table
 Version:        2.08a
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Create HTML tables using simple interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.08a-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.08a-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:44:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:44:13 +0000 (UTC)
Subject: rpms/perl-Parse-Yapp/devel perl-Parse-Yapp.spec,1.8,1.9
Message-ID: <20091207144413.A4A2111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Parse-Yapp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16846

Modified Files:
	perl-Parse-Yapp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Parse-Yapp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-Yapp/devel/perl-Parse-Yapp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Parse-Yapp.spec	26 Jul 2009 16:09:34 -0000	1.8
+++ perl-Parse-Yapp.spec	7 Dec 2009 14:44:13 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Parse-Yapp
 Version:        1.05
-Release:        40%{?dist}
+Release:        41%{?dist}
 Summary:        Perl extension for generating and using LALR parsers
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-41
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-40
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:46:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:46:53 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel perl-AnyEvent.spec,1.21,1.22
Message-ID: <20091207144653.0A35A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17648

Modified Files:
	perl-AnyEvent.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AnyEvent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-AnyEvent.spec	31 Aug 2009 14:34:45 -0000	1.21
+++ perl-AnyEvent.spec	7 Dec 2009 14:46:52 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           perl-AnyEvent
 Version:        5.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Framework for multiple event loops
 
 Group:          Development/Libraries
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 5.11-3
+- rebuild against perl 5.10.1
+
 * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 5.11-2
 - Update to 5.112   (rpm version : 5.11 )
 



From kasal at fedoraproject.org  Mon Dec  7 14:47:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:47:04 +0000 (UTC)
Subject: rpms/perl-HTML-SuperForm/devel perl-HTML-SuperForm.spec,1.1,1.2
Message-ID: <20091207144704.8F30111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-SuperForm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17843

Modified Files:
	perl-HTML-SuperForm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-SuperForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-SuperForm/devel/perl-HTML-SuperForm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-HTML-SuperForm.spec	7 Nov 2009 00:22:32 -0000	1.1
+++ perl-HTML-SuperForm.spec	7 Dec 2009 14:47:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-HTML-SuperForm
 Version:        1.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTML form generator
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.09-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 21 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.09-1
 - Creation.
 



From kasal at fedoraproject.org  Mon Dec  7 14:47:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:47:04 +0000 (UTC)
Subject: rpms/perl-Data-FormValidator/devel perl-Data-FormValidator.spec, 1.2,
	1.3
Message-ID: <20091207144704.A57DF11C0297@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-FormValidator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17852

Modified Files:
	perl-Data-FormValidator.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-FormValidator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-FormValidator/devel/perl-Data-FormValidator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Data-FormValidator.spec	26 Jul 2009 05:28:11 -0000	1.2
+++ perl-Data-FormValidator.spec	7 Dec 2009 14:47:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Data-FormValidator
 Version:        4.63
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Validates user input (usually from an HTML form) based on input profile
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.63-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.63-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:48:09 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:48:09 +0000 (UTC)
Subject: rpms/perl-ParseLex/devel perl-ParseLex.spec,1.8,1.9
Message-ID: <20091207144809.9389811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ParseLex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18358

Modified Files:
	perl-ParseLex.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ParseLex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ParseLex/devel/perl-ParseLex.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-ParseLex.spec	15 Nov 2009 21:50:23 -0000	1.8
+++ perl-ParseLex.spec	7 Dec 2009 14:48:09 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		perl-ParseLex
 Summary:	Generator of lexical analyzers
 Version:	2.15
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -68,6 +68,9 @@ find $RPM_BUILD_ROOT -name .packlist -ex
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.15-16
+- rebuild against perl 5.10.1
+
 * Mon Nov 16 2009 Jeff Fearn <jfearn at redhat.com> - 2.15-15
 - Fix Requires
 



From than at fedoraproject.org  Mon Dec  7 14:50:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 14:50:13 +0000 (UTC)
Subject: rpms/arts/F-12 libltdl-CVE-2009-3736.patch, NONE, 1.1 arts.spec,
	1.98, 1.99
Message-ID: <20091207145013.AA2C111C03E3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19075

Modified Files:
	arts.spec 
Added Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libltdl-CVE-2009-3736.patch ---
diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
--- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
@@ -1544,7 +1544,8 @@
   /* try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available */
-  if (old_name && tryall_dlopen(handle, old_name) == 0)
+  if (old_name && tryall_dlopen(handle, old_name,
+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
     {
       return 0;
     }
@@ -2158,7 +2159,7 @@
 	  }
 #endif
       }
-    if (!file)
+    else
       {
 	file = fopen (filename, LT_READTEXT_MODE);
       }


Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/F-12/arts.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- arts.spec	6 Dec 2009 22:35:18 -0000	1.98
+++ arts.spec	7 Dec 2009 14:50:13 -0000	1.99
@@ -3,7 +3,6 @@
 
 %define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
-%define final 1 
 %define make_cvs 1
 
 Name:    arts
@@ -30,6 +29,9 @@ Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
 # upstream patches
 
+# security patches
+CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
+Patch200: libltdl-CVE-2009-3736.patch
 
 # used in artsdsp
 Requires: which
@@ -81,6 +83,8 @@ Install %{name}-devel if you intend to w
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
 
+%patch200 -p1 -b .CVE-2009-3736
+
 %if %{make_cvs}
 # hack/fix for newer automake
   sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
@@ -99,9 +103,7 @@ unset QTDIR && . /etc/profile.d/qt.sh
   --enable-new-ldflags \
   --disable-libmad \
   --with-alsa \
-%if 0%{?final}
   --enable-final
-%endif
 
 ## hack for artsdsp (see http://bugzilla.redhat.com/329671)
 #make %{?_smp_mflags} -k || \
@@ -187,6 +189,7 @@ rm -rf  %{buildroot}
 %changelog
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
 - fix url
+- fix security issues in libltdl (CVE-2009-3736)
 
 * Wed Sep 02 2009 Than Ngo <than at redhat.com> - 1.5.10-8
 - drop support fedora < 10



From kasal at fedoraproject.org  Mon Dec  7 14:50:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:50:38 +0000 (UTC)
Subject: rpms/perl-AnyData/devel perl-AnyData.spec,1.8,1.9
Message-ID: <20091207145038.D66D711C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-AnyData/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19318

Modified Files:
	perl-AnyData.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-AnyData.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyData/devel/perl-AnyData.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-AnyData.spec	26 Jul 2009 01:36:40 -0000	1.8
+++ perl-AnyData.spec	7 Dec 2009 14:50:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-AnyData
 Version:        0.10
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Easy access to data in many formats
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Mon Dec  7 14:50:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 14:50:52 +0000 (UTC)
Subject: rpms/arts/F-12 arts.spec,1.99,1.100
Message-ID: <20091207145052.1670D11C03E3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19460

Modified Files:
	arts.spec 
Log Message:
fix security issues in libltdl (CVE-2009-3736)




Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/F-12/arts.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- arts.spec	7 Dec 2009 14:50:13 -0000	1.99
+++ arts.spec	7 Dec 2009 14:50:51 -0000	1.100
@@ -30,7 +30,7 @@ Patch51: kde-3.5-libtool-shlibext.patch
 # upstream patches
 
 # security patches
-CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
+# CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
 Patch200: libltdl-CVE-2009-3736.patch
 
 # used in artsdsp



From kasal at fedoraproject.org  Mon Dec  7 14:51:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:51:43 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts-Parser/devel
	perl-HTML-StripScripts-Parser.spec, 1.2, 1.3
Message-ID: <20091207145143.4A8B711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19911

Modified Files:
	perl-HTML-StripScripts-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-StripScripts-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts-Parser/devel/perl-HTML-StripScripts-Parser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-StripScripts-Parser.spec	26 Jul 2009 06:29:07 -0000	1.2
+++ perl-HTML-StripScripts-Parser.spec	7 Dec 2009 14:51:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-StripScripts-Parser
 Version:        1.02
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        XSS filter using HTML::Parser
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:52:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:52:03 +0000 (UTC)
Subject: rpms/perl-Parse-ExuberantCTags/devel perl-Parse-ExuberantCTags.spec,
	1.1, 1.2
Message-ID: <20091207145203.A63F711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Parse-ExuberantCTags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20173

Modified Files:
	perl-Parse-ExuberantCTags.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Parse-ExuberantCTags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ExuberantCTags/devel/perl-Parse-ExuberantCTags.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Parse-ExuberantCTags.spec	18 Aug 2009 05:54:27 -0000	1.1
+++ perl-Parse-ExuberantCTags.spec	7 Dec 2009 14:52:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Parse-ExuberantCTags
 Version:        1.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficiently parse exuberant ctags files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,5 +48,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-2
+- rebuild against perl 5.10.1
+
 * Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.01-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 14:52:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:52:02 +0000 (UTC)
Subject: rpms/perl-Data-Dump-Streamer/devel perl-Data-Dump-Streamer.spec, 1.5,
	1.6
Message-ID: <20091207145202.D38CF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Dump-Streamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20156

Modified Files:
	perl-Data-Dump-Streamer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Dump-Streamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/devel/perl-Data-Dump-Streamer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Data-Dump-Streamer.spec	26 Jul 2009 05:27:43 -0000	1.5
+++ perl-Data-Dump-Streamer.spec	7 Dec 2009 14:52:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Data-Dump-Streamer
 Version:        2.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Accurately serialize a data structure as Perl code
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.09-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Mon Dec  7 14:52:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 14:52:14 +0000 (UTC)
Subject: rpms/arts/devel libltdl-CVE-2009-3736.patch, NONE, 1.1 arts.spec,
	1.98, 1.99
Message-ID: <20091207145214.3093A11C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20287

Modified Files:
	arts.spec 
Added Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl CVE-2009-3736



libltdl-CVE-2009-3736.patch:
 ltdl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libltdl-CVE-2009-3736.patch ---
diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
--- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
@@ -1544,7 +1544,8 @@
   /* try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available */
-  if (old_name && tryall_dlopen(handle, old_name) == 0)
+  if (old_name && tryall_dlopen(handle, old_name,
+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
     {
       return 0;
     }
@@ -2158,7 +2159,7 @@
 	  }
 #endif
       }
-    if (!file)
+    else
       {
 	file = fopen (filename, LT_READTEXT_MODE);
       }


Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/devel/arts.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- arts.spec	6 Dec 2009 22:36:03 -0000	1.98
+++ arts.spec	7 Dec 2009 14:52:13 -0000	1.99
@@ -3,7 +3,6 @@
 
 %define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
-%define final 1 
 %define make_cvs 1
 
 Name:    arts
@@ -30,6 +29,9 @@ Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
 # upstream patches
 
+# security patches
+# CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
+Patch200: libltdl-CVE-2009-3736.patch
 
 # used in artsdsp
 Requires: which
@@ -81,6 +83,8 @@ Install %{name}-devel if you intend to w
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
 
+%patch200 -p1 -b .CVE-2009-3736
+
 %if %{make_cvs}
 # hack/fix for newer automake
   sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
@@ -99,9 +103,7 @@ unset QTDIR && . /etc/profile.d/qt.sh
   --enable-new-ldflags \
   --disable-libmad \
   --with-alsa \
-%if 0%{?final}
   --enable-final
-%endif
 
 ## hack for artsdsp (see http://bugzilla.redhat.com/329671)
 #make %{?_smp_mflags} -k || \
@@ -187,6 +189,7 @@ rm -rf  %{buildroot}
 %changelog
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
 - fix url
+- fix security issues in libltdl (CVE-2009-3736)
 
 * Wed Sep 02 2009 Than Ngo <than at redhat.com> - 1.5.10-8
 - drop support fedora < 10



From kasal at fedoraproject.org  Mon Dec  7 14:54:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:54:33 +0000 (UTC)
Subject: rpms/perl-Alien-wxWidgets/devel perl-Alien-wxWidgets.spec, 1.23,
	1.24
Message-ID: <20091207145433.CD43B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Alien-wxWidgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21373

Modified Files:
	perl-Alien-wxWidgets.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Alien-wxWidgets.spec	25 Aug 2009 09:29:32 -0000	1.23
+++ perl-Alien-wxWidgets.spec	7 Dec 2009 14:54:33 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-Alien-wxWidgets
 Version:        0.44
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.44-3
+- rebuild against perl 5.10.1
+
 * Mon Aug 24 2009 Stepan Kasal <skasal at redhat.com> - 0.44-2
 - fix the soname patch
 



From than at fedoraproject.org  Mon Dec  7 14:54:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 14:54:20 +0000 (UTC)
Subject: rpms/arts/F-11 libltdl-CVE-2009-3736.patch, NONE, 1.1 arts.spec,
	1.93, 1.94
Message-ID: <20091207145420.DA74711C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21082

Modified Files:
	arts.spec 
Added Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl CVE-2009-3736


libltdl-CVE-2009-3736.patch:
 ltdl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libltdl-CVE-2009-3736.patch ---
diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
--- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
@@ -1544,7 +1544,8 @@
   /* try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available */
-  if (old_name && tryall_dlopen(handle, old_name) == 0)
+  if (old_name && tryall_dlopen(handle, old_name,
+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
     {
       return 0;
     }
@@ -2158,7 +2159,7 @@
 	  }
 #endif
       }
-    if (!file)
+    else
       {
 	file = fopen (filename, LT_READTEXT_MODE);
       }


Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/F-11/arts.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- arts.spec	2 Mar 2009 16:16:08 -0000	1.93
+++ arts.spec	7 Dec 2009 14:54:20 -0000	1.94
@@ -3,36 +3,19 @@
 
 %define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
-%define final 1 
 %define make_cvs 1
 
-%if 0%{?fedora} < 10
-%define _with_esd --with-esd
-%define _with_nas --with-nas
-%if 0%{?rhel} == 0
-%define _with_jack --with-jack
-%endif
-%endif
-
-%if 0%{?fedora} > 8
-%define qt3 qt3
-%else
-%define qt3 qt
-%define qt3_epoch 1:
-%endif
-%define qt3_ev %{?qt3_epoch}3.3.8
-
 Name:    arts
 Summary: aRts (analog realtime synthesizer) - the KDE sound system 
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 5%{?dist}
+Release: 9%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/%{name}-%{version}.tar.bz2
 Source1: gslconfig-wrapper.h
 
 Patch1: arts-1.1.4-debug.patch
@@ -46,25 +29,22 @@ Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
 # upstream patches
 
+# security patches
+# CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
+Patch200: libltdl-CVE-2009-3736.patch
 
 # used in artsdsp
 Requires: which
 
-BuildRequires: %{qt3}-devel >= %{qt3_ev}
-## Shouldn't be necessary, but some folks won't upgrade, unless we stiff-arm them.  (-;
-#global qt3_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo %{qt3_ev})
-#Requires: %{qt3} >= %{qt3_ver}
+BuildRequires: qt3-devel >= 3.3.8
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif
-%{?_with_esd:BuildRequires: esound-devel}
 BuildRequires: findutils sed
 BuildRequires: glib2-devel
-%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
 BuildRequires: libvorbis-devel
-%{?_with_nas:BuildRequires: nas-devel}
 BuildRequires: pkgconfig
 
 
@@ -83,8 +63,8 @@ playing a wave file with some effects.
 %package devel
 Group: Development/Libraries
 Summary: Development files for the aRts sound server
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: %{qt3}-devel
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: qt3-devel
 Requires: pkgconfig
 Requires: glib2-devel
 %description devel
@@ -103,7 +83,11 @@ Install %{name}-devel if you intend to w
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
 
+%patch200 -p1 -b .CVE-2009-3736
+
 %if %{make_cvs}
+# hack/fix for newer automake
+  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
   make -f admin/Makefile.common cvs
 %endif
 
@@ -119,12 +103,7 @@ unset QTDIR && . /etc/profile.d/qt.sh
   --enable-new-ldflags \
   --disable-libmad \
   --with-alsa \
-  %{?_with_esd} %{!?_with_esd:--without-esd} \
-  %{?_with_jack} %{!?_with_jack:--without-jack}\
-  %{?_with_nas} %{!?_with_nas:--without-nas} \
-%if 0%{?final}
   --enable-final
-%endif
 
 ## hack for artsdsp (see http://bugzilla.redhat.com/329671)
 #make %{?_smp_mflags} -k || \
@@ -208,6 +187,20 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
+- fix url
+- fix security issues in libltdl (CVE-2009-3736)
+
+* Wed Sep 02 2009 Than Ngo <than at redhat.com> - 1.5.10-8
+- drop support fedora < 10
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8:1.5.10-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 8:1.5.10-6
+- FTBFS arts-1.5.10-5.fc11 (#511653)
+- -devel: Requires: %%{name}%%_isa ...
+
 * Mon Mar 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 8:1.5.10-5
 - s/i386/%%ix86/
 



From kasal at fedoraproject.org  Mon Dec  7 14:56:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:56:03 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl/devel
	perl-Parse-ErrorString-Perl.spec, 1.4, 1.5
Message-ID: <20091207145603.E04F611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21996

Modified Files:
	perl-Parse-ErrorString-Perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Parse-ErrorString-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel/perl-Parse-ErrorString-Perl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Parse-ErrorString-Perl.spec	26 Jul 2009 16:09:00 -0000	1.4
+++ perl-Parse-ErrorString-Perl.spec	7 Dec 2009 14:56:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Parse-ErrorString-Perl
 Version:        0.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Module for parsing error messages
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/check_perldiag.1.gz
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 14:56:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:56:14 +0000 (UTC)
Subject: rpms/perl-HTML-StripScripts/devel perl-HTML-StripScripts.spec, 1.2, 
	1.3
Message-ID: <20091207145614.E0BEC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-StripScripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22150

Modified Files:
	perl-HTML-StripScripts.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-StripScripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-StripScripts/devel/perl-HTML-StripScripts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-StripScripts.spec	26 Jul 2009 06:28:51 -0000	1.2
+++ perl-HTML-StripScripts.spec	7 Dec 2009 14:56:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-StripScripts
 Version:        1.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Strip scripting constructs out of HTML
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.04-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Mon Dec  7 14:56:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon,  7 Dec 2009 14:56:47 +0000 (UTC)
Subject: File ocaml-cairo-1.2.0-gita5c5ee9f.tar.gz uploaded to lookaside
	cache by rjones
Message-ID: <20091207145647.F37C110F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ocaml-cairo:

0ff91ee5e4360e84305b66226362b2ca  ocaml-cairo-1.2.0-gita5c5ee9f.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 14:56:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 14:56:41 +0000 (UTC)
Subject: rpms/perl-Data-Dumper-Names/devel perl-Data-Dumper-Names.spec, 1.4, 
	1.5
Message-ID: <20091207145641.08E1E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22410

Modified Files:
	perl-Data-Dumper-Names.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Dumper-Names.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dumper-Names/devel/perl-Data-Dumper-Names.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Data-Dumper-Names.spec	26 Jul 2009 05:27:56 -0000	1.4
+++ perl-Data-Dumper-Names.spec	7 Dec 2009 14:56:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Data-Dumper-Names
 Version:        0.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Data::Dumper like module for printing and eval data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:00:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:00:01 +0000 (UTC)
Subject: rpms/perl-Alien-SeleniumRC/devel perl-Alien-SeleniumRC.spec, 1.3,
	1.4
Message-ID: <20091207150001.4750711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Alien-SeleniumRC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23830

Modified Files:
	perl-Alien-SeleniumRC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Alien-SeleniumRC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Alien-SeleniumRC/devel/perl-Alien-SeleniumRC.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Alien-SeleniumRC.spec	14 Sep 2009 23:22:26 -0000	1.3
+++ perl-Alien-SeleniumRC.spec	7 Dec 2009 15:00:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Alien-SeleniumRC
 Version:        1.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Packages the Selenium Remote Control server
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-2
+- rebuild against perl 5.10.1
+
 * Tue Sep 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 1.01-1
 - Update to 1.01
 



From twaugh at fedoraproject.org  Mon Dec  7 15:00:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  7 Dec 2009 15:00:39 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-troubleshooter-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.311, 1.312
Message-ID: <20091207150039.9528E11C0345@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24293

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-troubleshooter-traceback.patch 
Log Message:
* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-4
- Fixed traceback when troubleshooter operation is cancelled (bug #544356).


system-config-printer-troubleshooter-traceback.patch:
 __init__.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-troubleshooter-traceback.patch ---
diff -up system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback system-config-printer-1.1.15/troubleshoot/__init__.py
--- system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback	2009-09-30 09:35:12.000000000 +0100
+++ system-config-printer-1.1.15/troubleshoot/__init__.py	2009-12-07 14:58:33.260971786 +0000
@@ -178,6 +178,7 @@ class Troubleshooter:
         return text.rstrip () + '\n'
 
     def busy (self):
+        self._in_module_call = True
         self.forward.set_sensitive (False)
         self.back.set_sensitive (False)
         gdkwin = self.get_window ().window
@@ -187,6 +188,7 @@ class Troubleshooter:
                 gtk.main_iteration ()
 
     def ready (self):
+        self._in_module_call = False
         gdkwin = self.get_window ().window
         if gdkwin:
             gdkwin.set_cursor (gtk.gdk.Cursor (gtk.gdk.LEFT_PTR))
@@ -291,13 +293,11 @@ class Troubleshooter:
 
     def _display (self, question):
         result = False
-        self._in_module_call = True
         try:
             result = question.display ()
         except:
             self._report_traceback ()
 
-        self._in_module_call = False
         question.displayed = result
         return result
 
@@ -310,13 +310,11 @@ class Troubleshooter:
 
     def _collect_answer (self, question):
         answer = {}
-        self._in_module_call = True
         try:
             answer = question.collect_answer ()
         except:
             self._report_traceback ()
 
-        self._in_module_call = False
         return answer
 
 QUESTIONS = ["Welcome",


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -p -r1.311 -r1.312
--- system-config-printer.spec	3 Dec 2009 17:21:46 -0000	1.311
+++ system-config-printer.spec	7 Dec 2009 15:00:39 -0000	1.312
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-localize-statereason.patch
 Patch2: system-config-printer-browsepoll.patch
 Patch3: system-config-printer-cupsd.conf-parser.patch
+Patch4: system-config-printer-troubleshooter-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -69,6 +70,7 @@ the configuration tool.
 %patch1 -p1 -b .localize-statereason
 %patch2 -p1 -b .browsepoll
 %patch3 -p1 -b .cupsd.conf-parser
+%patch4 -p1 -b .troubleshooter-traceback
 
 %build
 %configure
@@ -171,6 +173,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-4
+- Fixed traceback when troubleshooter operation is cancelled (bug #544356).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
 - Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
 - Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).



From kasal at fedoraproject.org  Mon Dec  7 15:00:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:00:53 +0000 (UTC)
Subject: rpms/perl-Data-Dump/devel perl-Data-Dump.spec,1.9,1.10
Message-ID: <20091207150053.A70CC11C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Dump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24508

Modified Files:
	perl-Data-Dump.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Dump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump/devel/perl-Data-Dump.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Data-Dump.spec	31 Jul 2009 07:21:19 -0000	1.9
+++ perl-Data-Dump.spec	7 Dec 2009 15:00:53 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Data-Dump
 Version:        1.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pretty printing of data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.15-2
+- rebuild against perl 5.10.1
+
 * Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.15-1
 - auto-update to 1.15 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 15:00:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:00:49 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Packages/devel perl-Parse-CPAN-Packages.spec, 
	1.14, 1.15
Message-ID: <20091207150049.E53E111C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Parse-CPAN-Packages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24434

Modified Files:
	perl-Parse-CPAN-Packages.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Parse-CPAN-Packages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Packages/devel/perl-Parse-CPAN-Packages.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Parse-CPAN-Packages.spec	26 Jul 2009 16:08:45 -0000	1.14
+++ perl-Parse-CPAN-Packages.spec	7 Dec 2009 15:00:49 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Parse-CPAN-Packages
 Version:        2.31
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parse 02packages.details.txt.gz
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.31-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.31-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Mon Dec  7 15:00:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon,  7 Dec 2009 15:00:58 +0000 (UTC)
Subject: rpms/ocaml-cairo/devel .cvsignore, 1.3, 1.4 ocaml-cairo.spec, 1.15, 
	1.16 sources, 1.3, 1.4
Message-ID: <20091207150058.DB1B811C0345@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24471

Modified Files:
	.cvsignore ocaml-cairo.spec sources 
Log Message:
* Mon Dec  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1:1.2.0-0.1.gita5c5ee9f
- So we are wrong, version numbers did NOT roll backwards.
- Revert to current git head (a5c5ee9f) which is a pre-release of 1.2.0
  (RHBZ#541542).
- Replace %%define with %%global.
- Patch0 is now upstream.
- Checked package with rpmlint - no problems.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Oct 2009 11:51:34 -0000	1.3
+++ .cvsignore	7 Dec 2009 15:00:58 -0000	1.4
@@ -1 +1 @@
-cairo-ocaml-1.0.0.tar.bz2
+ocaml-cairo-1.2.0-gita5c5ee9f.tar.gz


Index: ocaml-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocaml-cairo.spec	26 Nov 2009 09:39:41 -0000	1.15
+++ ocaml-cairo.spec	7 Dec 2009 15:00:58 -0000	1.16
@@ -1,10 +1,19 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
+
+# There are no source releases for ocaml-cairo > 1.0.0.  To get the
+# source matching this you have to do:
+#
+# git clone git://anongit.freedesktop.org/cairo-ocaml
+# cd cairo-ocaml
+# git archive --prefix=ocaml-cairo-%{version}/ %{commit} | \
+#   gzip > ../ocaml-cairo-1.2.0-git%{commit}.tar.gz
+%global commit a5c5ee9f
 
 Name:           ocaml-cairo
 Epoch:          1
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        0.1.git%{commit}%{?dist}
 Summary:        OCaml library for accessing cairo graphics
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,15 +23,14 @@ Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://cairographics.org/cairo-ocaml/
 
-Source0:        cairo-ocaml-%{version}.tar.bz2
+Source0:        ocaml-cairo-%{version}-git%{commit}.tar.gz
 Source1:        ocaml-cairo-META
-Patch0:         cairo-ocaml-1.0.0-bigarray.patch
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-lablgtk-devel
-BuildRequires:  cairo-devel
+BuildRequires:  cairo-devel >= 1.2.0
 BuildRequires:  automake
 BuildRequires:  gtk2-devel
 BuildRequires:  chrpath
@@ -60,8 +68,7 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n cairo-ocaml-%{version}
-%patch0 -p1
+%setup -q
 
 aclocal -I support
 autoconf
@@ -116,6 +123,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1:1.2.0-0.1.gita5c5ee9f
+- So we are wrong, version numbers did NOT roll backwards.
+- Revert to current git head (a5c5ee9f) which is a pre-release of 1.2.0
+  (RHBZ#541542).
+- Replace %%define with %%global.
+- Patch0 is now upstream.
+- Checked package with rpmlint - no problems.
+
 * Thu Nov 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1:1.0.0-2
 - ocaml-cairo-devel requires ocaml-lablgtk-devel (RHBZ#541427).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Oct 2009 11:51:35 -0000	1.3
+++ sources	7 Dec 2009 15:00:58 -0000	1.4
@@ -1 +1 @@
-2b7e6f4dc7b78236eadaac16e16af0a9  cairo-ocaml-1.0.0.tar.bz2
+0ff91ee5e4360e84305b66226362b2ca  ocaml-cairo-1.2.0-gita5c5ee9f.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 15:01:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:01:01 +0000 (UTC)
Subject: rpms/perl-HTML-Strip/devel perl-HTML-Strip.spec,1.2,1.3
Message-ID: <20091207150101.D5E1611C0345@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Strip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24701

Modified Files:
	perl-HTML-Strip.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Strip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Strip/devel/perl-HTML-Strip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-Strip.spec	26 Jul 2009 06:28:37 -0000	1.2
+++ perl-HTML-Strip.spec	7 Dec 2009 15:01:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Strip
 Version:        1.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for stripping HTML markup from text
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.06-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Mon Dec  7 15:03:33 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  7 Dec 2009 15:03:33 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-troubleshooter-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.317, 1.318
Message-ID: <20091207150333.39B5211C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25819

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-troubleshooter-traceback.patch 
Log Message:
* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-4
- Fixed traceback when troubleshooter operation is cancelled (bug #544356).


system-config-printer-troubleshooter-traceback.patch:
 __init__.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-troubleshooter-traceback.patch ---
diff -up system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback system-config-printer-1.1.15/troubleshoot/__init__.py
--- system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback	2009-09-30 09:35:12.000000000 +0100
+++ system-config-printer-1.1.15/troubleshoot/__init__.py	2009-12-07 15:01:03.200971984 +0000
@@ -178,6 +178,7 @@ class Troubleshooter:
         return text.rstrip () + '\n'
 
     def busy (self):
+        self._in_module_call = True
         self.forward.set_sensitive (False)
         self.back.set_sensitive (False)
         gdkwin = self.get_window ().window
@@ -187,6 +188,7 @@ class Troubleshooter:
                 gtk.main_iteration ()
 
     def ready (self):
+        self._in_module_call = False
         gdkwin = self.get_window ().window
         if gdkwin:
             gdkwin.set_cursor (gtk.gdk.Cursor (gtk.gdk.LEFT_PTR))
@@ -291,13 +293,11 @@ class Troubleshooter:
 
     def _display (self, question):
         result = False
-        self._in_module_call = True
         try:
             result = question.display ()
         except:
             self._report_traceback ()
 
-        self._in_module_call = False
         question.displayed = result
         return result
 
@@ -310,13 +310,11 @@ class Troubleshooter:
 
     def _collect_answer (self, question):
         answer = {}
-        self._in_module_call = True
         try:
             answer = question.collect_answer ()
         except:
             self._report_traceback ()
 
-        self._in_module_call = False
         return answer
 
 QUESTIONS = ["Welcome",


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- system-config-printer.spec	3 Dec 2009 17:20:06 -0000	1.317
+++ system-config-printer.spec	7 Dec 2009 15:03:32 -0000	1.318
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch1: system-config-printer-no-epydoc.
 Patch2: system-config-printer-localize-statereason.patch
 Patch3: system-config-printer-browsepoll.patch
 Patch4: system-config-printer-cupsd.conf-parser.patch
+Patch5: system-config-printer-troubleshooter-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -82,6 +83,7 @@ printers.
 %patch2 -p1 -b .localize-statereason
 %patch3 -p1 -b .browsepoll
 %patch4 -p1 -b .cupsd.conf-parser
+%patch5 -p1 -b .troubleshooter-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -194,6 +196,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-4
+- Fixed traceback when troubleshooter operation is cancelled (bug #544356).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
 - Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
 - Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).



From pmatilai at fedoraproject.org  Mon Dec  7 15:04:43 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Mon,  7 Dec 2009 15:04:43 +0000 (UTC)
Subject: rpms/apt/devel apt.spec,1.65,1.66
Message-ID: <20091207150443.D1A9F11C00EE@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/apt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26214

Modified Files:
	apt.spec 
Log Message:
- rebuild for rpm 4.8.x



Index: apt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/apt.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- apt.spec	20 Nov 2009 19:08:47 -0000	1.65
+++ apt.spec	7 Dec 2009 15:04:43 -0000	1.66
@@ -10,7 +10,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: %{aptver}
-Release: 0.%{snapver}.5%{?dist}
+Release: 0.%{snapver}.6%{?dist}
 Group: System Environment/Base
 URL: http://apt-rpm.org/
 # SourceLicense: GPLv2+ except lua/ which is MIT
@@ -363,6 +363,9 @@ fi
 
 
 %changelog
+* Mon Dec 07 2009 Panu Matilainen <pmatilai at redhat.com> - 0.5.15lorg3.95-0.git416.6
+- rebuild for rpm 4.8.0
+
 * Fri Mar 06 2009 Panu Matilainen <pmatilai at redhat.com> - 0.5.15lorg3.95-0.git416.4
 - rebuild for rpm 4.7.0
 



From kasal at fedoraproject.org  Mon Dec  7 15:04:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:04:55 +0000 (UTC)
Subject: rpms/perl-aliased/devel perl-aliased.spec,1.8,1.9
Message-ID: <20091207150455.A92DE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-aliased/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26396

Modified Files:
	perl-aliased.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-aliased.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-aliased/devel/perl-aliased.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-aliased.spec	22 Aug 2009 02:41:05 -0000	1.8
+++ perl-aliased.spec	7 Dec 2009 15:04:55 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-aliased
 Version:        0.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Use shorter versions of class names
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.30-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.30-1
 - auto-update to 0.30 (by cpan-spec-update 0.01)
 



From kasal at fedoraproject.org  Mon Dec  7 15:04:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:04:56 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/devel perl-Parse-CPAN-Meta.spec,1.7,1.8
Message-ID: <20091207150456.89A4111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26413

Modified Files:
	perl-Parse-CPAN-Meta.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Parse-CPAN-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel/perl-Parse-CPAN-Meta.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Parse-CPAN-Meta.spec	7 Oct 2009 15:15:28 -0000	1.7
+++ perl-Parse-CPAN-Meta.spec	7 Dec 2009 15:04:56 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Parse-CPAN-Meta
 Version:        1.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parse META.yml and other similar CPAN metadata files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.40-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.40-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 15:05:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:05:18 +0000 (UTC)
Subject: rpms/perl-HTML-SimpleParse/devel perl-HTML-SimpleParse.spec, 1.2,
	1.3
Message-ID: <20091207150518.D482311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-SimpleParse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26743

Modified Files:
	perl-HTML-SimpleParse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-SimpleParse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-SimpleParse/devel/perl-HTML-SimpleParse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-SimpleParse.spec	26 Jul 2009 06:28:21 -0000	1.2
+++ perl-HTML-SimpleParse.spec	7 Dec 2009 15:05:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-SimpleParse
 Version:        0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Bare-bones HTML parser
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:05:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:05:50 +0000 (UTC)
Subject: rpms/perl-Data-Denter/devel perl-Data-Denter.spec,1.2,1.3
Message-ID: <20091207150550.A02EB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Denter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27043

Modified Files:
	perl-Data-Denter.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Denter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Denter/devel/perl-Data-Denter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Data-Denter.spec	26 Jul 2009 05:27:10 -0000	1.2
+++ perl-Data-Denter.spec	7 Dec 2009 15:05:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Data-Denter 
 Version:    0.15 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # Denter.pod -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:09:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:09:02 +0000 (UTC)
Subject: rpms/perl-HTML-Scrubber/devel perl-HTML-Scrubber.spec,1.8,1.9
Message-ID: <20091207150902.8E0F211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Scrubber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28278

Modified Files:
	perl-HTML-Scrubber.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Scrubber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Scrubber/devel/perl-HTML-Scrubber.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-HTML-Scrubber.spec	26 Jul 2009 06:28:07 -0000	1.8
+++ perl-HTML-Scrubber.spec	7 Dec 2009 15:09:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Scrubber
 Version:        0.08
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library for scrubbing/sanitizing html
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:09:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:09:13 +0000 (UTC)
Subject: rpms/perl-Algorithm-Permute/devel perl-Algorithm-Permute.spec, 1.3, 
	1.4
Message-ID: <20091207150913.ECEA011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-Permute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28449

Modified Files:
	perl-Algorithm-Permute.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-Permute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-Permute/devel/perl-Algorithm-Permute.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Algorithm-Permute.spec	30 Jul 2009 22:20:20 -0000	1.3
+++ perl-Algorithm-Permute.spec	7 Dec 2009 15:09:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-Permute
 Version:        0.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Handy and fast permutation with object oriented interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-4
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0.12-3
 - Bump for F12 mass rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:09:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:09:20 +0000 (UTC)
Subject: rpms/perl-Parse-BACKPAN-Packages/devel
	perl-Parse-BACKPAN-Packages.spec, 1.3, 1.4
Message-ID: <20091207150920.8900611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Parse-BACKPAN-Packages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28528

Modified Files:
	perl-Parse-BACKPAN-Packages.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Parse-BACKPAN-Packages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-BACKPAN-Packages/devel/perl-Parse-BACKPAN-Packages.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Parse-BACKPAN-Packages.spec	25 Aug 2009 06:18:59 -0000	1.3
+++ perl-Parse-BACKPAN-Packages.spec	7 Dec 2009 15:09:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-Parse-BACKPAN-Packages
 Version:    0.35
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/Parse/BACKPAN/Packages.pm -> GPL+ or Artistic
 # lib/Parse/BACKPAN/Packages/Distribution.pm -> GPL+ or Artistic
 # lib/Parse/BACKPAN/Packages/File.pm -> GPL+ or Artistic
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.35-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
 - auto-update to 0.35 (by cpan-spec-update 0.01)
 - added a new req on perl(App::Cache) (version 0)



From kasal at fedoraproject.org  Mon Dec  7 15:10:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:10:26 +0000 (UTC)
Subject: rpms/perl-Data-Compare/devel perl-Data-Compare.spec,1.12,1.13
Message-ID: <20091207151026.6731511C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Compare/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29042

Modified Files:
	perl-Data-Compare.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Compare.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Compare/devel/perl-Data-Compare.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Data-Compare.spec	26 Jul 2009 05:26:57 -0000	1.12
+++ perl-Data-Compare.spec	7 Dec 2009 15:10:26 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Data-Compare
 Version:        1.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Compare perl data structures
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.21-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmz at fedoraproject.org  Mon Dec  7 15:11:59 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Mon,  7 Dec 2009 15:11:59 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.86, 1.87 git.spec, 1.101, 1.102 sources,
	1.86, 1.87
Message-ID: <20091207151159.DDBE611C00EE@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29617

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.5.5

Fixes bug 543481 (Unsubstituted Docbook parameters in git manpages)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore	27 Nov 2009 03:10:18 -0000	1.86
+++ .cvsignore	7 Dec 2009 15:11:59 -0000	1.87
@@ -1 +1 @@
-git-1.6.5.3.tar.bz2
+git-1.6.5.5.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- git.spec	6 Dec 2009 23:09:37 -0000	1.101
+++ git.spec	7 Dec 2009 15:11:59 -0000	1.102
@@ -6,8 +6,8 @@
 %endif
 
 Name:           git
-Version:        1.6.5.3
-Release:        2%{?dist}
+Version:        1.6.5.5
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
@@ -427,6 +427,9 @@ rm -rf %{buildroot}
 # No files for you!
 
 %changelog
+* Sun Dec 06 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.5-1
+- git-1.6.5.5
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.6.5.3-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	27 Nov 2009 03:10:18 -0000	1.86
+++ sources	7 Dec 2009 15:11:59 -0000	1.87
@@ -1 +1 @@
-a1dbc3da46cbf33c4367db689853c142  git-1.6.5.3.tar.bz2
+fd575f22e67adbea1d17e5bc66a80f8d  git-1.6.5.5.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 15:13:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:13:53 +0000 (UTC)
Subject: rpms/perl-HTML-RewriteAttributes/devel
	perl-HTML-RewriteAttributes.spec, 1.3, 1.4
Message-ID: <20091207151353.206B011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-RewriteAttributes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30418

Modified Files:
	perl-HTML-RewriteAttributes.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-RewriteAttributes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-RewriteAttributes/devel/perl-HTML-RewriteAttributes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-HTML-RewriteAttributes.spec	26 Jul 2009 06:27:52 -0000	1.3
+++ perl-HTML-RewriteAttributes.spec	7 Dec 2009 15:13:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-HTML-RewriteAttributes
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Concise attribute rewriting
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:14:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:14:02 +0000 (UTC)
Subject: rpms/perl-Algorithm-Merge/devel perl-Algorithm-Merge.spec,1.2,1.3
Message-ID: <20091207151402.C37F611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-Merge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30585

Modified Files:
	perl-Algorithm-Merge.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-Merge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-Merge/devel/perl-Algorithm-Merge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Algorithm-Merge.spec	25 Jul 2009 23:33:46 -0000	1.2
+++ perl-Algorithm-Merge.spec	7 Dec 2009 15:14:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-Merge
 Version:        0.08
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Three-way merge and diff
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pmatilai at fedoraproject.org  Mon Dec  7 15:14:11 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Mon,  7 Dec 2009 15:14:11 +0000 (UTC)
Subject: rpms/synaptic/devel synaptic.spec,1.39,1.40
Message-ID: <20091207151411.7E4DD11C00EE@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/synaptic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30437

Modified Files:
	synaptic.spec 
Log Message:
- rebuild for rpm 4.8.0
- drop nss-hack patch, it shouldn't be needed with rpm >= 4.7.1



Index: synaptic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- synaptic.spec	27 Jul 2009 05:15:47 -0000	1.39
+++ synaptic.spec	7 Dec 2009 15:14:11 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 License: GPLv2+
 Group: Applications/System
@@ -17,7 +17,6 @@ Patch3: http://apt-rpm.org/patches/synap
 Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch
 Patch5: http://apt-rpm.org/patches/synaptic-0.57.2-progressapi-hack.patch
 Patch6: synaptic-0.57.2-gcc43.patch
-Patch7: synaptic-0.57.2-nss-hack.patch
 URL: http://www.nongnu.org/synaptic/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: usermode-gtk
@@ -43,7 +42,6 @@ utility with a GUI front-end based on Gt
 %patch4 -p1 -b .showprog
 %patch5 -p1 -b .progresshack
 %patch6 -p1 -b .gcc43
-%patch7 -p1 -b .nss-hack
 
 %build
 %configure --disable-dependency-tracking
@@ -116,6 +114,10 @@ scrollkeeper-update -q ||:
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Mon Dec 07 2009 Panu Matilainen <pmatilai at redhat.com> - 0.57.2-22
+- rebuild for rpm 4.8.0
+- drop nss-hack patch, it shouldn't be needed with rpm >= 4.7.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.57.2-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:15:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:15:21 +0000 (UTC)
Subject: rpms/perl-PAR-Packer/devel perl-PAR-Packer.spec,1.4,1.5
Message-ID: <20091207151521.7983911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PAR-Packer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31325

Modified Files:
	perl-PAR-Packer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PAR-Packer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR-Packer/devel/perl-PAR-Packer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-PAR-Packer.spec	23 Sep 2009 18:18:38 -0000	1.4
+++ perl-PAR-Packer.spec	7 Dec 2009 15:15:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-PAR-Packer
 Version:        0.991
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PAR Packager
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.991-5
+- rebuild against perl 5.10.1
+
 * Wed Sep 23 2009 Stepan Kasal <skasal at redhat.com> - 0.991-4
 - too hard to build without stripping (#524894)
 



From kasal at fedoraproject.org  Mon Dec  7 15:15:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:15:12 +0000 (UTC)
Subject: rpms/perl-Data-Buffer/devel perl-Data-Buffer.spec,1.9,1.10
Message-ID: <20091207151512.8D0F311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Buffer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31170

Modified Files:
	perl-Data-Buffer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Buffer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Buffer/devel/perl-Data-Buffer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Data-Buffer.spec	26 Jul 2009 05:26:42 -0000	1.9
+++ perl-Data-Buffer.spec	7 Dec 2009 15:15:12 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Read/write buffer class for perl
 Name:		perl-Data-Buffer
 Version:	0.04
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Data-Buffer/
@@ -44,6 +44,9 @@ built-in functions.
 %{_mandir}/man3/Data::Buffer.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Mon Dec  7 15:15:29 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 15:15:29 +0000 (UTC)
Subject: rpms/kdelibs3/F-12 libltdl-CVE-2009-3736.patch, NONE,
	1.1 kdelibs3.spec, 1.76, 1.77
Message-ID: <20091207151529.2F42611C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31308

Modified Files:
	kdelibs3.spec 
Added Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl bundle within kdelibs CVE-2009-3736


libltdl-CVE-2009-3736.patch:
 ltdl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libltdl-CVE-2009-3736.patch ---
diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
--- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
@@ -1544,7 +1544,8 @@
   /* try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available */
-  if (old_name && tryall_dlopen(handle, old_name) == 0)
+  if (old_name && tryall_dlopen(handle, old_name,
+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
     {
       return 0;
     }
@@ -2158,7 +2159,7 @@
 	  }
 #endif
       }
-    if (!file)
+    else
       {
 	file = fopen (filename, LT_READTEXT_MODE);
       }


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-12/kdelibs3.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- kdelibs3.spec	2 Nov 2009 14:55:22 -0000	1.76
+++ kdelibs3.spec	7 Dec 2009 15:15:28 -0000	1.77
@@ -27,7 +27,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -97,6 +97,8 @@ Patch204: kdelibs-3.5.10-cve-2009-1698.p
 Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 #?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs
 Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
+# CVE-2009-3736, libltdl may load and execute code from a library in the current directory
+Patch207: libltdl-CVE-2009-3736.patch
 
 Requires: hicolor-icon-theme
 %if %{kde_settings}
@@ -249,6 +251,7 @@ format for easy browsing
 %patch204 -p1 -b .cve-2009-1698
 %patch205 -p1 -b .cve-2009-2702
 %patch206 -p0 -b .oCERT-2009-015-xmlhttprequest
+%patch207 -p1 -b .CVE-2009-3736
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -572,6 +575,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
+- fix security issues in libltdl bundle within kdelibs CVE-2009-3736
+
 * Mon Nov  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428
 



From than at fedoraproject.org  Mon Dec  7 15:16:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 15:16:22 +0000 (UTC)
Subject: rpms/kdelibs3/devel libltdl-CVE-2009-3736.patch, NONE,
	1.1 kdelibs3.spec, 1.76, 1.77
Message-ID: <20091207151622.C59FD11C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31822

Modified Files:
	kdelibs3.spec 
Added Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl bundle within kdelibs CVE-2009-3736



libltdl-CVE-2009-3736.patch:
 ltdl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libltdl-CVE-2009-3736.patch ---
diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
--- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
@@ -1544,7 +1544,8 @@
   /* try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available */
-  if (old_name && tryall_dlopen(handle, old_name) == 0)
+  if (old_name && tryall_dlopen(handle, old_name,
+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
     {
       return 0;
     }
@@ -2158,7 +2159,7 @@
 	  }
 #endif
       }
-    if (!file)
+    else
       {
 	file = fopen (filename, LT_READTEXT_MODE);
       }


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- kdelibs3.spec	2 Nov 2009 14:55:24 -0000	1.76
+++ kdelibs3.spec	7 Dec 2009 15:16:22 -0000	1.77
@@ -27,7 +27,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -97,6 +97,8 @@ Patch204: kdelibs-3.5.10-cve-2009-1698.p
 Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 #?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs
 Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
+# CVE-2009-3736, libltdl may load and execute code from a library in the current directory
+Patch207: libltdl-CVE-2009-3736.patch
 
 Requires: hicolor-icon-theme
 %if %{kde_settings}
@@ -249,6 +251,7 @@ format for easy browsing
 %patch204 -p1 -b .cve-2009-1698
 %patch205 -p1 -b .cve-2009-2702
 %patch206 -p0 -b .oCERT-2009-015-xmlhttprequest
+%patch207 -p1 -b .CVE-2009-3736
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -572,6 +575,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
+- fix security issues in libltdl bundle within kdelibs CVE-2009-3736
+
 * Mon Nov  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428
 



From kasal at fedoraproject.org  Mon Dec  7 15:17:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:17:47 +0000 (UTC)
Subject: rpms/perl-HTML-Prototype/devel perl-HTML-Prototype.spec,1.3,1.4
Message-ID: <20091207151747.CFBB111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Prototype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32391

Modified Files:
	perl-HTML-Prototype.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Prototype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Prototype/devel/perl-HTML-Prototype.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-HTML-Prototype.spec	26 Jul 2009 06:27:38 -0000	1.3
+++ perl-HTML-Prototype.spec	7 Dec 2009 15:17:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Prototype
 Version:        1.48
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate HTML and Javascript for the Prototype library
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.48-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.48-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:18:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:18:21 +0000 (UTC)
Subject: rpms/perl-Algorithm-IncludeExclude/devel
	perl-Algorithm-IncludeExclude.spec, 1.2, 1.3
Message-ID: <20091207151821.52B4E11C03AD@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-IncludeExclude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32665

Modified Files:
	perl-Algorithm-IncludeExclude.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-IncludeExclude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-IncludeExclude/devel/perl-Algorithm-IncludeExclude.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Algorithm-IncludeExclude.spec	25 Jul 2009 23:33:32 -0000	1.2
+++ perl-Algorithm-IncludeExclude.spec	7 Dec 2009 15:18:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-IncludeExclude
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Build and evaluate include/exclude lists
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:19:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:19:33 +0000 (UTC)
Subject: rpms/perl-Data-AsObject/devel perl-Data-AsObject.spec,1.1,1.2
Message-ID: <20091207151933.6810111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-AsObject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv732

Modified Files:
	perl-Data-AsObject.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-AsObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-AsObject/devel/perl-Data-AsObject.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Data-AsObject.spec	27 Nov 2009 09:58:33 -0000	1.1
+++ perl-Data-AsObject.spec	7 Dec 2009 15:19:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Data-AsObject
 Version:        0.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easy OO access to complex perl data structures
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
+- rebuild against perl 5.10.1
+
 * Thu Nov 26 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.05-2
 - Fix rpmlint warnings
 



From than at fedoraproject.org  Mon Dec  7 15:19:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 15:19:31 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 libltdl-CVE-2009-3736.patch, NONE,
	1.1 kdelibs3.spec, 1.64, 1.65
Message-ID: <20091207151931.0991B11C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv644

Modified Files:
	kdelibs3.spec 
Added Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl bundle within kdelibs CVE-2009-3736


libltdl-CVE-2009-3736.patch:
 ltdl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libltdl-CVE-2009-3736.patch ---
diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
--- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
@@ -1544,7 +1544,8 @@
   /* try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available */
-  if (old_name && tryall_dlopen(handle, old_name) == 0)
+  if (old_name && tryall_dlopen(handle, old_name,
+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
     {
       return 0;
     }
@@ -2158,7 +2159,7 @@
 	  }
 #endif
       }
-    if (!file)
+    else
       {
 	file = fopen (filename, LT_READTEXT_MODE);
       }


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- kdelibs3.spec	2 Nov 2009 14:55:21 -0000	1.64
+++ kdelibs3.spec	7 Dec 2009 15:19:30 -0000	1.65
@@ -4,29 +4,20 @@
 
 %define distname "Fedora"
 
+%if 0%{?rhel}
+%define distname "EL"
+%endif
+
 %define kde_settings 1 
 
-%define arts 1
 %define arts_ev 8:1.5.10
-
-%if 0%{?fedora} > 8
 %define qt3 qt3
-%else
-%define qt3_epoch 1:
-%define qt3 qt
-%endif
 %define qt3_version 3.3.8b
 %define qt3_ev %{?qt3_epoch}%{qt3_version} 
-# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
-#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
-%define qt3_ver %{qt3_version}
-# fix this?... -- Rex
-%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
+%define qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
 
 %define kde_major_version 3
 
-%define make_cvs 1
-
 %define apidocs 1
 
 # We always include this here now because kdeartwork 4 has moved on to
@@ -36,18 +27,11 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 14%{?dist}
+Release: 21%{?dist}
 
-%if 0%{?fedora} > 8
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
 Provides: kdelibs = 6:%{version}-%{release}
-%else
-Name: kdelibs
-Epoch: 6
-Obsoletes: kdelibs3 < %{version}-%{release}
-Provides: kdelibs3 = %{version}-%{release}
-%endif
 
 License: LGPLv2
 Url: http://www.kde.org/
@@ -96,6 +80,7 @@ Patch101: kde-3.5-libtool-shlibext.patch
 # kget ignores simultaneous download limit (kde #101956)
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
+Patch105: kdelibs-3.5.10-ossl-1.x.patch
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -112,40 +97,37 @@ Patch204: kdelibs-3.5.10-cve-2009-1698.p
 Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 #?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs
 Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
+# CVE-2009-3736, libltdl may load and execute code from a library in the current directory
+Patch207: libltdl-CVE-2009-3736.patch
 
-#{?arts:Requires: arts >= %{arts_ev}}
-#Requires: %{qt3} >= %{qt3_ev}
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
 %endif
 Requires: kde-filesystem
-%if "%{name}" != "kdelibs"
 Requires: kdelibs-common
-%endif
 Requires: redhat-menus
 Requires: shadow-utils
 BuildRequires: sudo
 Requires(hint): sudo
 
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define   libkdnssd libkdnssd
-# omit for now, may contribute to http://bugzilla.redhat.com/441222 
-#Requires: %{libkdnssd}
+%if 0%{?fedora}
+%define libkdnssd libkdnssd
+%endif
 %define BuildRequires: xorg-x11-proto-devel libX11-devel
 %define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
 Requires: iceauth
-%endif
 
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires: hunspell
 
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel cups
 BuildRequires: %{qt3}-devel %{qt3}-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
+BuildRequires: arts-devel >= %{arts_ev}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel
@@ -167,30 +149,18 @@ BuildRequires: libart_lgpl-devel
 BuildRequires: bzip2-devel
 BuildRequires: libtiff-devel
 BuildRequires: libacl-devel libattr-devel
-%if 0%{?fedora} >= 9
 BuildRequires: enchant-devel
-Requires: hunspell
-%else
-BuildRequires: aspell-devel
-%endif
 BuildRequires: krb5-devel
 BuildRequires: openldap-devel
 BuildRequires: db4-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: pkgconfig
 BuildRequires: glibc-kernheaders
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
-%define _with_libutempter 1
 BuildRequires: libutempter-devel
-%else
-BuildRequires: utempter
-%endif
 BuildRequires: findutils
 BuildRequires: jasper-devel
 BuildRequires: OpenEXR-devel
-%if %{make_cvs}
 BuildRequires: automake libtool
-%endif
 
 %if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
@@ -215,17 +185,12 @@ kimgio (image manipulation).
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE 3 applications.
-%if "%{name}" == "kdelibs"
-Obsoletes: kdelibs3-devel < %{version}-%{release}
-Provides:  kdelibs3-devel = %{version}-%{release}
-%else
 Obsoletes: kdelibs-devel < 6:%{version}-%{release}
 Provides:  kdelibs-devel = 6:%{version}-%{release}
-%endif
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{qt3}-devel
 Requires: openssl-devel
-%{?arts:Requires: arts-devel}
+Requires: arts-devel
 %{?libkdnssd:Requires: libkdnssd-devel}
 %description devel
 This package includes the header files you will need to compile
@@ -235,15 +200,9 @@ applications for KDE 3.
 Group: Development/Documentation
 Summary: KDE 3 API documentation.
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}
-%if "%{name}" == "kdelibs"
-Provides: kdelibs3-apidocs = %{version}-%{release}
-%else
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 Provides:  kdelibs-apidocs = 6:%{version}-%{release}
-%endif
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 
 %description apidocs
 This package includes the KDE 3 API documentation in HTML
@@ -266,26 +225,23 @@ format for easy browsing
 %patch38 -p1 -b .cupsdconf2-group
 %patch39 -p1 -b .kabc-make
 %patch40 -p1 -b .kdeprint-utf8
-%{?_with_libutempter:%patch41 -p1 -b .utempter}
+%patch41 -p1 -b .utempter
 %patch43 -p1 -b .lang
 %patch45 -p1 -b .xdg-autostart
 %patch46 -p1 -b .kate-vhdl
-%if 0%{?fedora} >= 9
 %patch48 -p1 -b .kspell
 %patch49 -p1 -b .kspell2
 %patch50 -p1 -b .no-ispell
-%endif
 %patch51 -p1 -b .cupsserverbin
 %patch52 -p1 -b .KDE3
-%if "%{name}" != "kdelibs"
 %patch53 -p1 -b .drkonqi-kde4
-%endif
 %patch54 -p1 -b .flock-redefinition
 %patch55 -p1 -b .latex-syntax
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
 %patch104 -p1 -b .gcc44
+%patch105 -p1 -b .ossl-1.x
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -295,14 +251,13 @@ format for easy browsing
 %patch204 -p1 -b .cve-2009-1698
 %patch205 -p1 -b .cve-2009-2702
 %patch206 -p0 -b .oCERT-2009-015-xmlhttprequest
+%patch207 -p1 -b .CVE-2009-3736
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
-%if %{make_cvs}
 # hack/fix for newer automake
-  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-  make -f admin/Makefile.common cvs
-%endif
+sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+make -f admin/Makefile.common cvs
 
 
 %build
@@ -337,17 +292,12 @@ export DO_NOT_COMPILE="libkscreensaver"
    --enable-sendfile \
    --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
    --with-alsa \
-%if 0%{?fedora} >= 9
    --without-aspell \
-%else
-   --with-aspell \
-%endif
    --without-hspell \
    --disable-libfam \
    --enable-dnotify \
    --enable-inotify \
    --with-utempter \
-   %{!?arts:--without-arts} \
    %{?_with_rgbfile} \
    --with-jasper \
    --with-openexr \
@@ -387,14 +337,9 @@ for i in *; do
 done
 popd
 
+%if 0%{?fedora} < 12 && 0%{?rhel} < 6
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
-
-%if "%{name}" == "kdelibs"
-# menus
-mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
-mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
-   %{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
 %endif
 
 # Use hicolor-icon-theme rpm/pkg instead (#178319)
@@ -432,7 +377,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.
 rm -f %{buildroot}%{_libdir}/libkdnssd.la
 %{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
 
-%if "%{name}" != "kdelibs"
 # remove conflicts with kdelibs-4
 rm -f %{buildroot}%{_bindir}/checkXML
 rm -f %{buildroot}%{_bindir}/ksvgtopng
@@ -480,7 +424,7 @@ rm -f %{buildroot}%{_docdir}/HTML/en/com
 rm -rf %{buildroot}%{_datadir}/locale/all_languages
 rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
 rm -rf %{buildroot}%{_datadir}/autostart/
-rm -r %{buildroot}%{_datadir}/config/colors/40.colors
+rm -f %{buildroot}%{_datadir}/config/colors/40.colors
 rm -f %{buildroot}%{_datadir}/config/colors/Rainbow.colors
 rm -f %{buildroot}%{_datadir}/config/colors/Royal.colors
 rm -f %{buildroot}%{_datadir}/config/colors/Web.colors
@@ -490,8 +434,6 @@ rm -f %{buildroot}%{_bindir}/preparetips
 # don't show kresources
 sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
 
-%endif
-
 %if 0%{?include_crystalsvg} == 0
 # remove all crystalsvg icons for now
 rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
@@ -534,7 +476,9 @@ touch --no-create %{_datadir}/icons/crys
 %defattr(-,root,root,-)
 %doc README
 %doc COPYING.LIB
+%if 0%{?fedora} < 12 && 0%{?rhel} < 6
 %config(noreplace) %{_sysconfdir}/profile.d/*
+%endif
 %{_bindir}/artsmessage
 %{_bindir}/cupsdconf
 %{_bindir}/cupsdoprint
@@ -606,28 +550,13 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/servicetypes/*
 %ghost %{_datadir}/services/ksycoca
 %{_docdir}/HTML/en/kspell
-%if "%{name}" == "kdelibs"
-%{_sysconfdir}/xdg/menus/*.menu
-%{_datadir}/autostart/*
-# include also the conflicting file in kdelibs fedora < 9
-%{_docdir}/HTML/en/common
-%{_datadir}/locale/all_languages
-%else
 %{_docdir}/HTML/en/common/*
-%endif
 %if 0%{?include_crystalsvg}
 %{_datadir}/icons/crystalsvg/
 %endif
 
 %files devel
 %defattr(-,root,root,-)
-# include also the conflicting file in kdelibs-devel fedora < 9
-%if "%{name}" == "kdelibs"
-%{_bindir}/checkXML
-%{_bindir}/ksvgtopng
-%{_bindir}/kunittestmodrunner
-%{_bindir}/preparetips
-%endif
 %{_bindir}/dcopidl*
 %{_bindir}/kconfig_compiler
 %{_bindir}/makekdewidgets
@@ -646,12 +575,30 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
-* Mon Nov  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 3.5.10-14
+* Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
+- fix security issues in libltdl bundle within kdelibs CVE-2009-3736
+
+* Mon Nov  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428
 
-* Sun Sep 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13.1
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-19
+- Conflicts with kde-settings (#526109)
+
+* Mon Sep 28 2009 Than Ngo <than at redhat.com> - 3.5.10-18
+- rhel cleanup
+
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17 
+- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)
+
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-16
+- openssl-1.0 build fixes
+
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-15
 - fix for CVE-2009-2702
 
+* Thu Sep 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-14
+- kde.(sh|csh): drop KDE_IS_PRELINKED (workaround bug #515539)
+
 * Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-13
 - fix CVE-2009-2537 - select length DoS
 - fix CVE-2009-1725 - crash, possible ACE in numeric character references



From kasal at fedoraproject.org  Mon Dec  7 15:20:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:20:56 +0000 (UTC)
Subject: rpms/perl-parent/devel perl-parent.spec,1.5,1.6
Message-ID: <20091207152056.BCAAB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-parent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1298

Modified Files:
	perl-parent.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-parent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-parent/devel/perl-parent.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-parent.spec	11 Sep 2009 15:56:46 -0000	1.5
+++ perl-parent.spec	7 Dec 2009 15:20:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-parent
 Version:        0.223
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Establish an ISA relationship with base classes at compile time
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.223-2
+- rebuild against perl 5.10.1
+
 * Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.223-1
 - update filtering
 - auto-update to 0.223 (by cpan-spec-update 0.01)



From kasal at fedoraproject.org  Mon Dec  7 15:22:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:22:07 +0000 (UTC)
Subject: rpms/perl-HTML-PrettyPrinter/devel perl-HTML-PrettyPrinter.spec, 1.5,
	1.6
Message-ID: <20091207152207.B6DCA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-PrettyPrinter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1810

Modified Files:
	perl-HTML-PrettyPrinter.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-PrettyPrinter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-PrettyPrinter/devel/perl-HTML-PrettyPrinter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-HTML-PrettyPrinter.spec	26 Jul 2009 06:27:24 -0000	1.5
+++ perl-HTML-PrettyPrinter.spec	7 Dec 2009 15:22:07 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-HTML-PrettyPrinter
 Version:        0.03
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Generate nice HTML files from HTML syntax trees
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:22:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:22:41 +0000 (UTC)
Subject: rpms/perl-Algorithm-FastPermute/devel
	perl-Algorithm-FastPermute.spec, 1.3, 1.4
Message-ID: <20091207152241.D46B911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-FastPermute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2144

Modified Files:
	perl-Algorithm-FastPermute.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-FastPermute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-FastPermute/devel/perl-Algorithm-FastPermute.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Algorithm-FastPermute.spec	25 Jul 2009 23:33:13 -0000	1.3
+++ perl-Algorithm-FastPermute.spec	7 Dec 2009 15:22:41 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		perl-%{short_name}           
 Version:	0.999
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Rapid generation of permutations
 
 Group:		Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{perl_vendorarch}/Algorithm/perms.pl
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.999-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.999-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:23:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:23:53 +0000 (UTC)
Subject: rpms/perl-Data-Alias/devel perl-Data-Alias.spec,1.15,1.16
Message-ID: <20091207152353.CDC1B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Data-Alias/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2735

Modified Files:
	perl-Data-Alias.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Data-Alias.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Alias/devel/perl-Data-Alias.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Data-Alias.spec	26 Jul 2009 05:26:26 -0000	1.15
+++ perl-Data-Alias.spec	7 Dec 2009 15:23:53 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Data-Alias
 Version:        1.07
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Comprehensive set of aliasing operations
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.07-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:25:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:25:31 +0000 (UTC)
Subject: rpms/perl-PAR-Dist/devel perl-PAR-Dist.spec,1.35,1.36
Message-ID: <20091207152531.68B6C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PAR-Dist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3497

Modified Files:
	perl-PAR-Dist.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- perl-PAR-Dist.spec	21 Sep 2009 16:55:43 -0000	1.35
+++ perl-PAR-Dist.spec	7 Dec 2009 15:25:31 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           perl-PAR-Dist
 Version:        0.46
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.46-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 21 2009 Stepan Kasal <skasal at redhat.com> - 0.46-1
 - new upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 15:26:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:26:38 +0000 (UTC)
Subject: rpms/perl-HTML-Mason/devel perl-HTML-Mason.spec,1.20,1.21
Message-ID: <20091207152638.4416411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Mason/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3959

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-HTML-Mason.spec	26 Jul 2009 06:26:54 -0000	1.20
+++ perl-HTML-Mason.spec	7 Dec 2009 15:26:38 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Mason
 Version:        1.42
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL+ or Artistic
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:1.42-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.42-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:27:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:27:54 +0000 (UTC)
Subject: rpms/perl-Algorithm-Diff/devel perl-Algorithm-Diff.spec,1.9,1.10
Message-ID: <20091207152754.9E29B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-Diff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4540

Modified Files:
	perl-Algorithm-Diff.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-Diff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-Diff/devel/perl-Algorithm-Diff.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Algorithm-Diff.spec	25 Jul 2009 23:32:57 -0000	1.9
+++ perl-Algorithm-Diff.spec	7 Dec 2009 15:27:54 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-Diff
 Version:        1.1902
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Algorithm::Diff Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1902-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1902-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:28:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:28:47 +0000 (UTC)
Subject: rpms/perl-Danga-Socket/devel perl-Danga-Socket.spec,1.5,1.6
Message-ID: <20091207152847.8D77D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Danga-Socket/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4940

Modified Files:
	perl-Danga-Socket.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Danga-Socket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Danga-Socket/devel/perl-Danga-Socket.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Danga-Socket.spec	26 Jul 2009 05:26:10 -0000	1.5
+++ perl-Danga-Socket.spec	7 Dec 2009 15:28:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Danga-Socket
 Version:        1.58
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Event loop and event-driven async socket base class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.58-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.58-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:29:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:29:48 +0000 (UTC)
Subject: rpms/perl-Params-Validate/devel perl-Params-Validate.spec, 1.24,
	1.25
Message-ID: <20091207152948.BA0FC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Params-Validate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5368

Modified Files:
	perl-Params-Validate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-Params-Validate.spec	23 Nov 2009 09:23:16 -0000	1.24
+++ perl-Params-Validate.spec	7 Dec 2009 15:29:48 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
 Version: 	0.92
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
@@ -68,6 +68,9 @@ IS_MAINTAINER=1 ./Build test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.92-2
+- rebuild against perl 5.10.1
+
 * Mon Nov 23 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.92-1
 - Upstream update.
 - Switch to Build.PL.



From rrakus at fedoraproject.org  Mon Dec  7 15:30:05 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon,  7 Dec 2009 15:30:05 +0000 (UTC)
Subject: File system-config-kdump-2.0.2.tar.bz2 uploaded to lookaside cache
	by rrakus
Message-ID: <20091207153005.C9E2D10F88C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for system-config-kdump:

a1b22a0b89038d21cd2d5021d8aac6e0  system-config-kdump-2.0.2.tar.bz2



From rrakus at fedoraproject.org  Mon Dec  7 15:30:32 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon,  7 Dec 2009 15:30:32 +0000 (UTC)
Subject: rpms/system-config-kdump/F-12 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 system-config-kdump.spec, 1.12, 1.13
Message-ID: <20091207153032.BBE9411C04BF@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/system-config-kdump/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5799

Modified Files:
	.cvsignore sources system-config-kdump.spec 
Log Message:
Don't be interested in non linux entries in bootloaders conf. Resolves: #538850


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Oct 2009 10:13:15 -0000	1.6
+++ .cvsignore	7 Dec 2009 15:30:32 -0000	1.7
@@ -1 +1 @@
-system-config-kdump-2.0.1.tar.bz2
+system-config-kdump-2.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Oct 2009 10:13:15 -0000	1.6
+++ sources	7 Dec 2009 15:30:32 -0000	1.7
@@ -1 +1 @@
-ec996bc629ee02278576fb6acfe24f6c  system-config-kdump-2.0.1.tar.bz2
+a1b22a0b89038d21cd2d5021d8aac6e0  system-config-kdump-2.0.2.tar.bz2


Index: system-config-kdump.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/F-12/system-config-kdump.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- system-config-kdump.spec	2 Oct 2009 10:13:16 -0000	1.12
+++ system-config-kdump.spec	7 Dec 2009 15:30:32 -0000	1.13
@@ -1,6 +1,6 @@
 Summary: A graphical interface for configuring kernel crash dumping
 Name: system-config-kdump
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-kdump/
 License: GPLv2+
@@ -83,6 +83,10 @@ fi
 %doc %{_datadir}/omf/system-config-kdump
 
 %changelog
+* Mon Dec 07 2009 Roman Rakus <rrakus at redhat.com> - 2.0.2-1
+- Don't be interested in non linux entries in bootloaders conf.
+  Resolves: #538850
+
 * Fri Oct 02 2009 Roman Rakus <rrakus at redhat.com> - 2.0.1-1
 - Update to version 2.0.1
 



From rhughes at fedoraproject.org  Mon Dec  7 15:30:49 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 15:30:49 +0000 (UTC)
Subject: File PackageKit-0.5.5.tar.bz2 uploaded to lookaside cache by rhughes
Message-ID: <20091207153049.DF4AF10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for PackageKit:

ecdf49ed150ebc4159d5c1bcfd117efb  PackageKit-0.5.5.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 15:31:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:31:37 +0000 (UTC)
Subject: rpms/perl-HTML-Lint/devel perl-HTML-Lint.spec,1.4,1.5
Message-ID: <20091207153137.34B8211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Lint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6466

Modified Files:
	perl-HTML-Lint.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Lint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Lint/devel/perl-HTML-Lint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-HTML-Lint.spec	26 Jul 2009 06:26:39 -0000	1.4
+++ perl-HTML-Lint.spec	7 Dec 2009 15:31:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Lint
 Version:        2.06
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        HTML::Lint Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.06-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:32:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:32:20 +0000 (UTC)
Subject: rpms/perl-Algorithm-Dependency/devel perl-Algorithm-Dependency.spec,
	1.17, 1.18
Message-ID: <20091207153220.DB93E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-Dependency/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6826

Modified Files:
	perl-Algorithm-Dependency.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-Dependency/devel/perl-Algorithm-Dependency.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Algorithm-Dependency.spec	25 Jul 2009 23:32:41 -0000	1.17
+++ perl-Algorithm-Dependency.spec	7 Dec 2009 15:32:20 -0000	1.18
@@ -1,6 +1,6 @@
 Name: 		perl-Algorithm-Dependency
 Version: 	1.110
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -53,6 +53,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.110-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.110-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rrakus at fedoraproject.org  Mon Dec  7 15:32:46 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon,  7 Dec 2009 15:32:46 +0000 (UTC)
Subject: rpms/system-config-kdump/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 system-config-kdump.spec, 1.12, 1.13
Message-ID: <20091207153246.A2F5A11C00EE@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/system-config-kdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7045

Modified Files:
	.cvsignore sources system-config-kdump.spec 
Log Message:
Don't be interested in non linux entries in bootloaders conf. Resolves: #538850


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	30 Sep 2009 16:27:09 -0000	1.6
+++ .cvsignore	7 Dec 2009 15:32:46 -0000	1.7
@@ -1 +1 @@
-system-config-kdump-2.0.1.tar.bz2
+system-config-kdump-2.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Sep 2009 16:27:09 -0000	1.6
+++ sources	7 Dec 2009 15:32:46 -0000	1.7
@@ -1 +1 @@
-ec996bc629ee02278576fb6acfe24f6c  system-config-kdump-2.0.1.tar.bz2
+a1b22a0b89038d21cd2d5021d8aac6e0  system-config-kdump-2.0.2.tar.bz2


Index: system-config-kdump.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/devel/system-config-kdump.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- system-config-kdump.spec	30 Sep 2009 16:27:09 -0000	1.12
+++ system-config-kdump.spec	7 Dec 2009 15:32:46 -0000	1.13
@@ -1,6 +1,6 @@
 Summary: A graphical interface for configuring kernel crash dumping
 Name: system-config-kdump
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-kdump/
 License: GPLv2+
@@ -83,6 +83,10 @@ fi
 %doc %{_datadir}/omf/system-config-kdump
 
 %changelog
+* Mon Dec 07 2009 Roman Rakus <rrakus at redhat.com> - 2.0.2-1
+- Don't be interested in non linux entries in bootloaders conf
+  Resolves: #538850
+
 * Wed Sep 30 2009 Roman Rakus <rrakus at redhat.com> - 2.0.1-1
 - Update to version 2.0.1
 



From kasal at fedoraproject.org  Mon Dec  7 15:32:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:32:56 +0000 (UTC)
Subject: rpms/perl-Daemon-Generic/devel perl-Daemon-Generic.spec,1.2,1.3
Message-ID: <20091207153256.0FFB711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Daemon-Generic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7131

Modified Files:
	perl-Daemon-Generic.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Daemon-Generic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Daemon-Generic/devel/perl-Daemon-Generic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Daemon-Generic.spec	26 Jul 2009 05:25:54 -0000	1.2
+++ perl-Daemon-Generic.spec	7 Dec 2009 15:32:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Daemon-Generic
 Version:        0.61
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Framework to provide start/stop/reload for a daemon
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.61-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.61-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:36:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:36:25 +0000 (UTC)
Subject: rpms/perl-Params-Util/devel perl-Params-Util.spec,1.39,1.40
Message-ID: <20091207153625.CA75811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Params-Util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8470

Modified Files:
	perl-Params-Util.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- perl-Params-Util.spec	26 Jul 2009 14:06:04 -0000	1.39
+++ perl-Params-Util.spec	7 Dec 2009 15:36:25 -0000	1.40
@@ -1,6 +1,6 @@
 Name:		perl-Params-Util
 Version:	1.00
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Simple standalone param-checking functions
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -54,6 +54,9 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From praveenp at fedoraproject.org  Mon Dec  7 15:36:50 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Mon,  7 Dec 2009 15:36:50 +0000 (UTC)
Subject: rpms/sblim-indication_helper/devel missing-stderr-def.patch, NONE, 
	1.1 sblim-indication_helper.spec, 1.1, 1.2
Message-ID: <20091207153650.0F2BE11C00EE@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-indication_helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8450

Modified Files:
	sblim-indication_helper.spec 
Added Files:
	missing-stderr-def.patch 
Log Message:
Fixed the build failure because of missing def of stderr.


missing-stderr-def.patch:
 ind_helper.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE missing-stderr-def.patch ---
diff -up sblim-indication_helper-0.4.2/ind_helper.h.org sblim-indication_helper-0.4.2/ind_helper.h
--- sblim-indication_helper-0.4.2/ind_helper.h.org	2009-11-19 10:35:45.000000000 -0600
+++ sblim-indication_helper-0.4.2/ind_helper.h	2009-11-19 10:36:05.000000000 -0600
@@ -13,7 +13,7 @@
  * Author:       Konrad Rzeszutek <konradr at us.ibm.com>
  * Date  :	      09/20/2004
  */
-
+#include <stdio.h>
 #include <cmpift.h>
 
 typedef unsigned int Uint32;


Index: sblim-indication_helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/devel/sblim-indication_helper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-indication_helper.spec	5 Aug 2009 03:34:06 -0000	1.1
+++ sblim-indication_helper.spec	7 Dec 2009 15:36:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		sblim-indication_helper
 Version:	0.4.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Toolkit for CMPI indication providers
 
 Group:		Development/Libraries
@@ -9,6 +9,7 @@ URL:		http://sblim.wiki.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		sblim-indication_helper-0.4.2_warnings.patch
+Patch1:         missing-stderr-def.patch
 BuildRequires:	sblim-cmpi-devel 
 
 %description
@@ -35,6 +36,7 @@ This package holds the development files
 %prep
 %setup -q
 %patch0
+%patch1 -p1
 
 
 %build
@@ -70,7 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jul 31 2009 Praveen K Paladugu <praveen_paladugu at dell.com> 0.4.2-3
+* Mon Dec  7 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.4.2-4
+-  fixed the build failure because of missing definition of stderr
+* Fri Jul 31 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.4.2-3
 - fixed the rpmlint message. Removed Requries for glibc-devel.
 * Tue Jun 30 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.4.2-1
 - Standardized the spec file and changed the build number to 1 



From acme at fedoraproject.org  Mon Dec  7 15:37:30 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Mon,  7 Dec 2009 15:37:30 +0000 (UTC)
Subject: rpms/dwarves/F-11 .cvsignore, 1.5, 1.6 dwarves.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091207153730.EFE6111C00EE@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/dwarves/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8906

Modified Files:
	.cvsignore dwarves.spec sources 
Log Message:
New upstream release: 1.8

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Feb 2009 14:16:38 -0000	1.5
+++ .cvsignore	7 Dec 2009 15:37:30 -0000	1.6
@@ -1 +1 @@
-dwarves-1.7.tar.bz2
+dwarves-1.8.tar.bz2


Index: dwarves.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/F-11/dwarves.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dwarves.spec	24 Feb 2009 13:10:26 -0000	1.6
+++ dwarves.spec	7 Dec 2009 15:37:30 -0000	1.7
@@ -2,20 +2,20 @@
 %define libver 1
 
 Name: dwarves
-Version: 1.7
-Release: 4
+Version: 1.8
+Release: 1%{?dist}
 License: GPLv2
-Summary: Dwarf Tools
+Summary: Debugging Information Manipulation Tools
 Group: Development/Tools
 URL: http://oops.ghostprotocols.net:81/blog
 Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.bz2
 BuildRequires: cmake
-BuildRequires: elfutils-devel >= 0.130
 BuildRequires: zlib-devel
+BuildRequires: elfutils-devel >= 0.130
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
-dwarves is a set of tools that use the DWARF debugging information inserted in
+dwarves is a set of tools that use the debugging information inserted in
 ELF binaries by compilers such as GCC, used by well known debuggers such as
 GDB, and more recent ones such as systemtap.
 
@@ -32,23 +32,20 @@ code generate on the resulting binaries.
 Another tool is pfunct, that can be used to find all sorts of information about
 functions, inlines, decisions made by the compiler about inlining, etc.
 
-The documentation about ctracer is not updated to the latest developments: it
-now generates systemtap scripts, stay tuned for improvements in this area!
-
 %package -n %{libname}%{libver}
-Summary: DWARF processing library
+Summary: Debugging information  processing library
 Group: Development/Libraries
 
 %description -n %{libname}%{libver}
-DWARF processing library
+Debugging information processing library.
 
 %package -n %{libname}%{libver}-devel
-Summary: DWARF processing library development files
+Summary: Debugging information library development files
 Group: Development/Libraries
 Requires: %{libname}%{libver} = %{version}-%{release}
 
 %description -n %{libname}%{libver}-devel
-DWARF processing library development files
+Debugging information processing library development files.
 
 %prep
 %setup -q -c -n %{name}-%{version}
@@ -103,19 +100,21 @@ rm -rf %{buildroot}
 %files -n %{libname}%{libver}-devel
 %defattr(0644,root,root,0755)
 %doc MANIFEST README
-%{_includedir}/dwarves.h
-%{_includedir}/dwarves_emit.h
-%{_includedir}/dwarves_reorganize.h
+%{_includedir}/dwarves/dwarves.h
+%{_includedir}/dwarves/dwarves_emit.h
+%{_includedir}/dwarves/dwarves_reorganize.h
+%{_includedir}/dwarves/dutil.h
+%{_includedir}/dwarves/gobuffer.h
+%{_includedir}/dwarves/list.h
+%{_includedir}/dwarves/rbtree.h
+%{_includedir}/dwarves/strings.h
 %{_libdir}/%{libname}.so
 %{_libdir}/%{libname}_emit.so
 %{_libdir}/%{libname}_reorganize.so
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 13 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.7-3
-- Add BuildRequires for zlib-devel
+* Fri Dec  4 2009 Apr 23 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.8-1
+- New release
 
 * Fri Feb 13 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.7-2
 - Own /usr/share/dwarves, fixes #473645 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Feb 2009 14:16:38 -0000	1.5
+++ sources	7 Dec 2009 15:37:30 -0000	1.6
@@ -1 +1 @@
-30dfc01981e139269fcfed72c6784d2f  dwarves-1.7.tar.bz2
+92ef945346d087ff3d29fb03c0e08625  dwarves-1.8.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 15:37:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:37:33 +0000 (UTC)
Subject: rpms/perl-HTML-LinkList/devel perl-HTML-LinkList.spec,1.2,1.3
Message-ID: <20091207153733.E1A2211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-LinkList/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9074

Modified Files:
	perl-HTML-LinkList.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-LinkList.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-LinkList/devel/perl-HTML-LinkList.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-LinkList.spec	26 Jul 2009 06:26:24 -0000	1.2
+++ perl-HTML-LinkList.spec	7 Dec 2009 15:37:33 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-HTML-LinkList 
 Version:    0.1503 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/HTML/LinkList.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -67,6 +67,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.1503-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1503-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:38:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:38:35 +0000 (UTC)
Subject: rpms/perl-Algorithm-CurveFit/devel perl-Algorithm-CurveFit.spec, 1.4,
	1.5
Message-ID: <20091207153835.CD16311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-CurveFit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9499

Modified Files:
	perl-Algorithm-CurveFit.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-CurveFit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-CurveFit/devel/perl-Algorithm-CurveFit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Algorithm-CurveFit.spec	25 Jul 2009 23:32:22 -0000	1.4
+++ perl-Algorithm-CurveFit.spec	7 Dec 2009 15:38:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-CurveFit
 Version:        1.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Nonlinear Least Squares Curve Fitting
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:39:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:39:38 +0000 (UTC)
Subject: rpms/perl-Curses-UI/devel perl-Curses-UI.spec,1.1,1.2
Message-ID: <20091207153938.9268511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Curses-UI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10022

Modified Files:
	perl-Curses-UI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Curses-UI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Curses-UI/devel/perl-Curses-UI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Curses-UI.spec	22 Sep 2009 08:01:13 -0000	1.1
+++ perl-Curses-UI.spec	7 Dec 2009 15:39:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Curses-UI
 Version:        0.9607
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Curses based OO user interface framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9607-3
+- rebuild against perl 5.10.1
+
 * Sun Aug 09 2009 David Hannequin david.hannequin at gmail.com 0.9607-2
 - Add require build 
 



From rhughes at fedoraproject.org  Mon Dec  7 15:40:11 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 15:40:11 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.60, 1.61 PackageKit.spec, 1.122,
	1.123 sources, 1.61, 1.62
Message-ID: <20091207154011.7A9A111C03FC@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10301

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.5-1
- New upstream release of 0.5.5.
- Check the filename is valid before exploding. Fixes #537381
- Only check certain transaction elements, not all of them. Fixes #541645
- Handle the cnf error condition where the package name would be invalid. Fixes #533014
- After a successful cnf installation, re-exec new binary not command-not-found. Fixes #533554
- When cnf searches for available files, use our preferred arch. Fixes #534169
- Run the newly installed file sync so we can return a proper exit code. Fixes #540482
- Only email using cron when a useful action was done. Fixes #540949
- Do not split more than one locale hint to fix setting LC_ variables. Fixes #543716



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	6 Oct 2009 09:40:36 -0000	1.60
+++ .cvsignore	7 Dec 2009 15:40:11 -0000	1.61
@@ -1 +1 @@
-PackageKit-0.5.3.tar.gz
+PackageKit-0.5.5.tar.bz2


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- PackageKit.spec	6 Oct 2009 09:40:36 -0000	1.122
+++ PackageKit.spec	7 Dec 2009 15:40:11 -0000	1.123
@@ -2,21 +2,21 @@
 %define dbus_version			1.1.1
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
-%define libnm_glib_version		0.6.4
-%define alphatag			20090928
+%define libnm_glib_version		0.6.5
+%define alphatag			20091029
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.5.3
-#Release:   0.2.%{?alphatag}git%{?dist}
+Version:   0.5.5
+#Release:   0.1.%{?alphatag}git%{?dist}
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
-#Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
-Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
+#Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.bz2
+Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Fedora-specific: set Vendor.conf up for Fedora.
@@ -454,6 +454,17 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.5-1
+- New upstream release of 0.5.5.
+- Check the filename is valid before exploding. Fixes #537381
+- Only check certain transaction elements, not all of them. Fixes #541645
+- Handle the cnf error condition where the package name would be invalid. Fixes #533014
+- After a successful cnf installation, re-exec new binary not command-not-found. Fixes #533554
+- When cnf searches for available files, use our preferred arch. Fixes #534169
+- Run the newly installed file sync so we can return a proper exit code. Fixes #540482
+- Only email using cron when a useful action was done. Fixes #540949
+- Do not split more than one locale hint to fix setting LC_ variables. Fixes #543716
+
 * Mon Oct 05 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-1
 - Update to 0.5.3.
 - Fix double free in pk-gstreamer-install which causes a crash. Fixes #526600
@@ -559,7 +570,7 @@ update-mime-database %{_datadir}/mime &>
 - Backport 4 important patches from upstream.
 
 * Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-2
-- Fix installing local files with a unicode path. Fixes rh#486720
+- Fix installing local files with a unicode path. Fixes #486720
 - Fix the allow cancel duplicate filtering with a patch from upstream.
 
 * Mon Mar 30 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-1
@@ -644,7 +655,7 @@ update-mime-database %{_datadir}/mime &>
   five seconds entering the password the very first time they used PackageKit
   to do an authentication.
   Apply a simple patch to mitigate this, as a more invasive (and correct)
-  patch is upstream. A new release will follow in f10-updates. Fixes rh#469950
+  patch is upstream. A new release will follow in f10-updates. Fixes #469950
 
 * Thu Oct 28 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.9-3
 - Install the usr/share/cmake/Modules/FindQPackageKit.cmake file so we
@@ -700,7 +711,7 @@ update-mime-database %{_datadir}/mime &>
 - Many performance and other bugfixes
 
 * Thu Oct 09 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.6-3
-- Add a patch from upstream to fix rh#466290
+- Add a patch from upstream to fix #466290
 
 * Mon Oct 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.6-2
 - Upload new sources. Ooops.
@@ -813,11 +824,11 @@ update-mime-database %{_datadir}/mime &>
 - New upstream version, only bugfixes.
 
 * Tue Jul 15 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-6
-- Silence the output of update-mime-database to fix rh#454782
+- Silence the output of update-mime-database to fix #454782
 
 * Mon Jun 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-5.20080618
 - Own the /etc/bash_completion.d directory as we don't depend on the
-  bash-completion package. Fixes rh#450964.
+  bash-completion package. Fixes #450964.
 
 * Wed Jun 18 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-4.20080618
 - Pull in a new snapshot from the unstable branch.
@@ -825,7 +836,7 @@ update-mime-database %{_datadir}/mime &>
 
 * Mon Jun 11 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-3.20080611
 - Pull in a new snapshot from the unstable branch.
-- Fixes RH#450594 where there are insane length error messages
+- Fixes #450594 where there are insane length error messages
 - Get the group for the package when we do ::Detail()
 
 * Mon Jun 09 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-2.20080609
@@ -858,11 +869,11 @@ update-mime-database %{_datadir}/mime &>
 
 * Wed Apr 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-3.20080416git
 - Pull in the new snapshot from the stable PACKAGEKIT_0_1_X branch.
-- Fixes rh#439735.
+- Fixes #439735.
 
 * Tue Apr 15 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-2.20080415git
 - Pull in the new snapshot from the stable PACKAGEKIT_0_1_X branch.
-- Fixes rh#442286, rh#442286 and quite a few upstream bugs.
+- Fixes #442286, #442286 and quite a few upstream bugs.
 
 * Sat Apr 12 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-1.20080412git
 - Pull in the new snapshot from the stable PACKAGEKIT_0_1_X branch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	6 Oct 2009 09:40:36 -0000	1.61
+++ sources	7 Dec 2009 15:40:11 -0000	1.62
@@ -1 +1 @@
-cbd7eb264c2536c363dc113eab60def3  PackageKit-0.5.3.tar.gz
+ecdf49ed150ebc4159d5c1bcfd117efb  PackageKit-0.5.5.tar.bz2



From orion at fedoraproject.org  Mon Dec  7 15:41:41 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  7 Dec 2009 15:41:41 +0000 (UTC)
Subject: rpms/environment-modules/F-11 environment-modules.spec,1.24,1.25
Message-ID: <20091207154141.0FDD911C00EE@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10851/F-11

Modified Files:
	environment-modules.spec 
Log Message:
* Mon Nov 30 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-6
- Add Requires: propcs (bug #54272)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- environment-modules.spec	26 Oct 2009 17:01:50 -0000	1.24
+++ environment-modules.spec	7 Dec 2009 15:41:40 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -12,6 +12,8 @@ Patch0:         environment-modules-3.2.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
+#For ps in startup script
+Requires:       procps
 
 %description
 The Environment Modules package provides for the dynamic modification of
@@ -78,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 30 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-6
+- Add Requires: propcs (bug #54272)
+
 * Mon Oct 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-5
 - Don't assume different shell init scripts exist (bug #530770)
 



From orion at fedoraproject.org  Mon Dec  7 15:41:41 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  7 Dec 2009 15:41:41 +0000 (UTC)
Subject: rpms/environment-modules/F-12 environment-modules.spec,1.27,1.28
Message-ID: <20091207154141.4E4C811C00EE@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10851/F-12

Modified Files:
	environment-modules.spec 
Log Message:
* Mon Nov 30 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-6
- Add Requires: propcs (bug #54272)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/environment-modules.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- environment-modules.spec	26 Oct 2009 16:55:06 -0000	1.27
+++ environment-modules.spec	7 Dec 2009 15:41:41 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -12,6 +12,8 @@ Patch0:         environment-modules-3.2.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
+#For ps in startup script
+Requires:       procps
 
 %description
 The Environment Modules package provides for the dynamic modification of
@@ -78,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 30 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-6
+- Add Requires: propcs (bug #54272)
+
 * Mon Oct 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-5
 - Don't assume different shell init scripts exist (bug #530770)
 



From kasal at fedoraproject.org  Mon Dec  7 15:42:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:42:12 +0000 (UTC)
Subject: rpms/perl-HTML-GenToc/devel perl-HTML-GenToc.spec,1.2,1.3
Message-ID: <20091207154212.D7DBD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-GenToc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11079

Modified Files:
	perl-HTML-GenToc.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-GenToc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-GenToc/devel/perl-HTML-GenToc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-GenToc.spec	26 Jul 2009 06:26:08 -0000	1.2
+++ perl-HTML-GenToc.spec	7 Dec 2009 15:42:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-GenToc
 Version:        3.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate a Table of Contents for HTML documents
 License:        GPLv2+
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.10-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:42:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:42:46 +0000 (UTC)
Subject: rpms/perl-Params-Coerce/devel perl-Params-Coerce.spec,1.6,1.7
Message-ID: <20091207154246.175B911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Params-Coerce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11391

Modified Files:
	perl-Params-Coerce.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Params-Coerce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Coerce/devel/perl-Params-Coerce.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Params-Coerce.spec	26 Jul 2009 14:05:31 -0000	1.6
+++ perl-Params-Coerce.spec	7 Dec 2009 15:42:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Params-Coerce
 Version:        0.14
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Allows your classes to do coercion of parameters
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:43:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:43:58 +0000 (UTC)
Subject: rpms/perl-Algorithm-CheckDigits/devel
	perl-Algorithm-CheckDigits.spec, 1.7, 1.8
Message-ID: <20091207154358.DCF1F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-CheckDigits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11923

Modified Files:
	perl-Algorithm-CheckDigits.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-CheckDigits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-CheckDigits/devel/perl-Algorithm-CheckDigits.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Algorithm-CheckDigits.spec	25 Jul 2009 23:32:06 -0000	1.7
+++ perl-Algorithm-CheckDigits.spec	7 Dec 2009 15:43:58 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		perl-Algorithm-CheckDigits
 Version:	0.50
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	Perl extension to generate and test check digits
 
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.50-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.50-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:45:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:45:03 +0000 (UTC)
Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay.spec,1.42,1.43
Message-ID: <20091207154503.C1FC611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12536

Modified Files:
	perl-Crypt-SSLeay.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Crypt-SSLeay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- perl-Crypt-SSLeay.spec	25 Nov 2009 16:08:19 -0000	1.42
+++ perl-Crypt-SSLeay.spec	7 Dec 2009 15:45:03 -0000	1.43
@@ -1,7 +1,7 @@
 Name:           perl-Crypt-SSLeay
 Summary:        Crypt::SSLeay - OpenSSL glue that provides LWP https support
 Version:        0.57
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        http://www.cpan.org/authors/id/D/DL/DLAND/Crypt-SSLeay-%{version}.tar.gz
@@ -88,6 +88,9 @@ make test
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.57-16
+- rebuild against perl 5.10.1
+
 * Wed Nov 25 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.57-14
 - change Makefile for openssl 1.0, which couldn't be found properly before
 



From kasal at fedoraproject.org  Mon Dec  7 15:47:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:47:15 +0000 (UTC)
Subject: rpms/perl-HTML-FromText/devel perl-HTML-FromText.spec,1.4,1.5
Message-ID: <20091207154715.2A9AD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-FromText/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13491

Modified Files:
	perl-HTML-FromText.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-FromText.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FromText/devel/perl-HTML-FromText.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-HTML-FromText.spec	26 Jul 2009 06:25:52 -0000	1.4
+++ perl-HTML-FromText.spec	7 Dec 2009 15:47:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-HTML-FromText
 Version:        2.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Convert plain text to HTML
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.05-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:48:29 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:48:29 +0000 (UTC)
Subject: rpms/perl-Algorithm-C3/devel perl-Algorithm-C3.spec,1.8,1.9
Message-ID: <20091207154829.361F611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-C3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13948

Modified Files:
	perl-Algorithm-C3.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-C3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-C3/devel/perl-Algorithm-C3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Algorithm-C3.spec	25 Jul 2009 23:31:48 -0000	1.8
+++ perl-Algorithm-C3.spec	7 Dec 2009 15:48:28 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-C3
 Version:        0.08
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Module for merging hierarchies using the C3 algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:49:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:49:17 +0000 (UTC)
Subject: rpms/perl-Params-CallbackRequest/devel
	perl-Params-CallbackRequest.spec, 1.6, 1.7
Message-ID: <20091207154917.2E8CE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Params-CallbackRequest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14304

Modified Files:
	perl-Params-CallbackRequest.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Params-CallbackRequest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-CallbackRequest/devel/perl-Params-CallbackRequest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Params-CallbackRequest.spec	26 Jul 2009 14:05:12 -0000	1.6
+++ perl-Params-CallbackRequest.spec	7 Dec 2009 15:49:16 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Params-CallbackRequest
 Version:        1.19
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Functional and object-oriented callback architecture
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.19-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:52:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:52:11 +0000 (UTC)
Subject: rpms/perl-HTML-FormFu-Model-DBIC/devel
	perl-HTML-FormFu-Model-DBIC.spec, 1.3, 1.4
Message-ID: <20091207155211.0BD1011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-FormFu-Model-DBIC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16184

Modified Files:
	perl-HTML-FormFu-Model-DBIC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-FormFu-Model-DBIC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu-Model-DBIC/devel/perl-HTML-FormFu-Model-DBIC.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-HTML-FormFu-Model-DBIC.spec	1 Aug 2009 06:37:20 -0000	1.3
+++ perl-HTML-FormFu-Model-DBIC.spec	7 Dec 2009 15:52:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-HTML-FormFu-Model-DBIC
 Version:    0.05002
-Release:    1%{?dist}
+Release:    2%{?dist}
 # lib/HTML/FormFu/Model/DBIC.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05002-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05002-1
 - auto-update to 0.05002 (by cpan-spec-update 0.01)
 - altered br on perl(DBIx::Class) (0.08002 => 0.08106)



From kasal at fedoraproject.org  Mon Dec  7 15:52:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:52:31 +0000 (UTC)
Subject: rpms/perl-Class-Whitehole/devel perl-Class-Whitehole.spec,1.6,1.7
Message-ID: <20091207155231.9E4A011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Class-Whitehole/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16503

Modified Files:
	perl-Class-Whitehole.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Class-Whitehole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Whitehole/devel/perl-Class-Whitehole.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Class-Whitehole.spec	26 Jul 2009 04:33:20 -0000	1.6
+++ perl-Class-Whitehole.spec	7 Dec 2009 15:52:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Class-Whitehole
 Version:        0.04
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Base class to treat unhandled method calls as errors
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:52:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:52:48 +0000 (UTC)
Subject: rpms/perl-Algorithm-Annotate/devel perl-Algorithm-Annotate.spec, 1.5,
	1.6
Message-ID: <20091207155248.572DD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Algorithm-Annotate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16681

Modified Files:
	perl-Algorithm-Annotate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Algorithm-Annotate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-Annotate/devel/perl-Algorithm-Annotate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Algorithm-Annotate.spec	25 Jul 2009 23:31:33 -0000	1.5
+++ perl-Algorithm-Annotate.spec	7 Dec 2009 15:52:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-Annotate
 Version:        0.10
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Represent a series of changes in annotate form
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:54:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:54:40 +0000 (UTC)
Subject: rpms/perl-Parallel-ForkManager/devel perl-Parallel-ForkManager.spec,
	1.4, 1.5
Message-ID: <20091207155440.991CC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Parallel-ForkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17391

Modified Files:
	perl-Parallel-ForkManager.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Parallel-ForkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parallel-ForkManager/devel/perl-Parallel-ForkManager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Parallel-ForkManager.spec	26 Jul 2009 14:04:52 -0000	1.4
+++ perl-Parallel-ForkManager.spec	7 Dec 2009 15:54:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Parallel-ForkManager
 Version:        0.7.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple parallel processing fork manager
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.7.5-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:57:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:57:11 +0000 (UTC)
Subject: rpms/perl-Affix-Infix2Postfix/devel perl-Affix-Infix2Postfix.spec,
	1.4, 1.5
Message-ID: <20091207155711.08CD511C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Affix-Infix2Postfix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18297

Modified Files:
	perl-Affix-Infix2Postfix.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Affix-Infix2Postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Affix-Infix2Postfix/devel/perl-Affix-Infix2Postfix.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Affix-Infix2Postfix.spec	25 Jul 2009 23:31:16 -0000	1.4
+++ perl-Affix-Infix2Postfix.spec	7 Dec 2009 15:57:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Affix-Infix2Postfix
 Version:        0.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for converting from infix notation to postfix notation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 15:59:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 15:59:06 +0000 (UTC)
Subject: rpms/perl-PAR/devel perl-PAR.spec,1.6,1.7
Message-ID: <20091207155906.3DA0311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19018

Modified Files:
	perl-PAR.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PAR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/perl-PAR.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-PAR.spec	21 Aug 2009 11:19:00 -0000	1.6
+++ perl-PAR.spec	7 Dec 2009 15:59:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-PAR
 Version:        0.994
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl Archive Toolkit
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.994-2
+- rebuild against perl 5.10.1
+
 * Fri Aug 21 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.994-1
 - update and fix 505576 which was probably fixed by new release
 



From kasal at fedoraproject.org  Mon Dec  7 16:02:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:02:17 +0000 (UTC)
Subject: rpms/perl-Acme-PlayCode/devel perl-Acme-PlayCode.spec,1.3,1.4
Message-ID: <20091207160217.9D8CB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Acme-PlayCode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20436

Modified Files:
	perl-Acme-PlayCode.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Acme-PlayCode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Acme-PlayCode/devel/perl-Acme-PlayCode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Acme-PlayCode.spec	18 Nov 2009 13:57:39 -0000	1.3
+++ perl-Acme-PlayCode.spec	7 Dec 2009 16:02:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Acme-PlayCode
 Version:        0.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Play code to win
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-5
+- rebuild against perl 5.10.1
+
 * Wed Nov 18 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.11-4
 - fix missing requirements which broke building of new packages
 



From kasal at fedoraproject.org  Mon Dec  7 16:02:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:02:52 +0000 (UTC)
Subject: rpms/perl-HTML-FormFu/devel perl-HTML-FormFu.spec,1.10,1.11
Message-ID: <20091207160252.7A49C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20790

Modified Files:
	perl-HTML-FormFu.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu/devel/perl-HTML-FormFu.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-HTML-FormFu.spec	26 Jul 2009 06:24:42 -0000	1.10
+++ perl-HTML-FormFu.spec	7 Dec 2009 16:02:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-HTML-FormFu
 Version:        0.05001
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HTML Form Creation, Rendering and Validation Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05001-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05001-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:06:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:06:11 +0000 (UTC)
Subject: rpms/perl-Panotools-Script/devel perl-Panotools-Script.spec, 1.5,
	1.6
Message-ID: <20091207160611.3B44A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Panotools-Script/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22144

Modified Files:
	perl-Panotools-Script.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Panotools-Script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Panotools-Script/devel/perl-Panotools-Script.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Panotools-Script.spec	26 Jul 2009 14:04:31 -0000	1.5
+++ perl-Panotools-Script.spec	7 Dec 2009 16:06:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Panotools-Script
 Version:        0.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for manipulating hugin .pto files
 License:        GPLv2+
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:08:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:08:21 +0000 (UTC)
Subject: rpms/perl-Acme-Damn/devel perl-Acme-Damn.spec,1.9,1.10
Message-ID: <20091207160821.064BB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Acme-Damn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22940

Modified Files:
	perl-Acme-Damn.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Acme-Damn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Acme-Damn/devel/perl-Acme-Damn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Acme-Damn.spec	25 Jul 2009 23:30:45 -0000	1.9
+++ perl-Acme-Damn.spec	7 Dec 2009 16:08:20 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Acme-Damn
 Version:        0.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Unbless Perl objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:09:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:09:26 +0000 (UTC)
Subject: rpms/perl-HTML-FormatText-WithLinks/devel
	perl-HTML-FormatText-WithLinks.spec, 1.11, 1.12
Message-ID: <20091207160926.3F0AC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-FormatText-WithLinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23386

Modified Files:
	perl-HTML-FormatText-WithLinks.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-FormatText-WithLinks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormatText-WithLinks/devel/perl-HTML-FormatText-WithLinks.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-HTML-FormatText-WithLinks.spec	26 Jul 2009 06:25:34 -0000	1.11
+++ perl-HTML-FormatText-WithLinks.spec	7 Dec 2009 16:09:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-HTML-FormatText-WithLinks
 Version:        0.09
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        HTML to text conversion with links as footnotes
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:11:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:11:55 +0000 (UTC)
Subject: rpms/perl-PadWalker/devel perl-PadWalker.spec,1.15,1.16
Message-ID: <20091207161155.1A83611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-PadWalker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24324

Modified Files:
	perl-PadWalker.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PadWalker/devel/perl-PadWalker.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-PadWalker.spec	7 Oct 2009 15:05:13 -0000	1.15
+++ perl-PadWalker.spec	7 Dec 2009 16:11:54 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-PadWalker
 Version:        1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Play with other peoples' lexical variables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9-2
+- rebuild against perl 5.10.1
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9-1
 - new upstream version
 



From rhughes at fedoraproject.org  Mon Dec  7 16:12:21 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 16:12:21 +0000 (UTC)
Subject: rpms/PackageKit/F-12 .cvsignore, 1.61, 1.62 PackageKit.spec, 1.127, 
	1.128 sources, 1.62,
	1.63 PackageKit-0.5.4-change-default-fedora-policy.patch, 1.1,
	NONE PackageKit-0.5.4-fix-cnf-exec.patch, 1.1,
	NONE PackageKit-0.5.4-fix-cnf-more.patch, 1.1, NONE
Message-ID: <20091207161221.7FDE011C00EE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24584

Modified Files:
	.cvsignore PackageKit.spec sources 
Removed Files:
	PackageKit-0.5.4-change-default-fedora-policy.patch 
	PackageKit-0.5.4-fix-cnf-exec.patch 
	PackageKit-0.5.4-fix-cnf-more.patch 
Log Message:
* Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.5-1
- New upstream release of 0.5.5.
- Check the filename is valid before exploding. Fixes #537381
- Only check certain transaction elements, not all of them. Fixes #541645
- After a successful cnf installation, re-exec new binary not command-not-found. Fixes #533554
- Run the newly installed file sync so we can return a proper exit code. Fixes #540482
- Only email using cron when a useful action was done. Fixes #540949
- Do not split more than one locale hint to fix setting LC_ variables. Fixes #543716



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	29 Oct 2009 10:43:33 -0000	1.61
+++ .cvsignore	7 Dec 2009 16:12:20 -0000	1.62
@@ -1 +1 @@
-PackageKit-0.5.4-20091029.tar.bz2
+PackageKit-0.5.5.tar.bz2


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/PackageKit.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- PackageKit.spec	20 Nov 2009 08:53:17 -0000	1.127
+++ PackageKit.spec	7 Dec 2009 16:12:21 -0000	1.128
@@ -2,21 +2,21 @@
 %define dbus_version			1.1.1
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
-%define libnm_glib_version		0.6.4
+%define libnm_glib_version		0.6.5
 %define alphatag			20091029
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.5.4
-Release:   0.4.%{?alphatag}git%{?dist}
-#Release:   1%{?dist}
+Version:   0.5.5
+#Release:   0.1.%{?alphatag}git%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
-Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.bz2
-#Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
+#Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.bz2
+Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Fedora-specific: set Vendor.conf up for Fedora.
@@ -25,13 +25,6 @@ Patch0:    PackageKit-0.3.8-Fedora-Vendo
 # Fedora specific: the yum backend doesn't do time estimation correctly
 Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 
-# already upstream
-Patch2:    PackageKit-0.5.4-fix-cnf-exec.patch
-Patch3:    PackageKit-0.5.4-fix-cnf-more.patch
-
-# being considered upstream
-Patch4:    PackageKit-0.5.4-change-default-fedora-policy.patch
-
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -247,13 +240,10 @@ after firmware has been installed by Pac
 user to restart the computer or remove and re-insert the device.
 
 %prep
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
-#%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
-%patch2 -p1 -b .cnf-fix-exec
-%patch3 -p1 -b .cnf-fix-more
-%patch4 -p1 -b .fedora-install-policy
 
 %build
 %configure \
@@ -464,6 +454,15 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.5-1
+- New upstream release of 0.5.5.
+- Check the filename is valid before exploding. Fixes #537381
+- Only check certain transaction elements, not all of them. Fixes #541645
+- After a successful cnf installation, re-exec new binary not command-not-found. Fixes #533554
+- Run the newly installed file sync so we can return a proper exit code. Fixes #540482
+- Only email using cron when a useful action was done. Fixes #540949
+- Do not split more than one locale hint to fix setting LC_ variables. Fixes #543716
+
 * Thu Nov 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.4-0.4.20091029git
 - Switch the signed install permission to require the root password
 
@@ -485,7 +484,7 @@ update-mime-database %{_datadir}/mime &>
 - Don't allow double clicking SRPM and fix the cryptic message.
 - Fixes #529349, #531105, #530945, #531306 and #530264
 
-* Mon Oct 05 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.4-1
+* Mon Oct 05 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-1
 - Update to 0.5.3.
 - Fix double free in pk-gstreamer-install which causes a crash. Fixes #526600
 - Exit pk-command-not-found with 127 when we have not run a program. Fixes #527044
@@ -590,7 +589,7 @@ update-mime-database %{_datadir}/mime &>
 - Backport 4 important patches from upstream.
 
 * Thu Apr 02 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-2
-- Fix installing local files with a unicode path. Fixes rh#486720
+- Fix installing local files with a unicode path. Fixes #486720
 - Fix the allow cancel duplicate filtering with a patch from upstream.
 
 * Mon Mar 30 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-1
@@ -675,7 +674,7 @@ update-mime-database %{_datadir}/mime &>
   five seconds entering the password the very first time they used PackageKit
   to do an authentication.
   Apply a simple patch to mitigate this, as a more invasive (and correct)
-  patch is upstream. A new release will follow in f10-updates. Fixes rh#469950
+  patch is upstream. A new release will follow in f10-updates. Fixes #469950
 
 * Thu Oct 28 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.9-3
 - Install the usr/share/cmake/Modules/FindQPackageKit.cmake file so we
@@ -731,7 +730,7 @@ update-mime-database %{_datadir}/mime &>
 - Many performance and other bugfixes
 
 * Thu Oct 09 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.6-3
-- Add a patch from upstream to fix rh#466290
+- Add a patch from upstream to fix #466290
 
 * Mon Oct 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.6-2
 - Upload new sources. Ooops.
@@ -844,11 +843,11 @@ update-mime-database %{_datadir}/mime &>
 - New upstream version, only bugfixes.
 
 * Tue Jul 15 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-6
-- Silence the output of update-mime-database to fix rh#454782
+- Silence the output of update-mime-database to fix #454782
 
 * Mon Jun 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-5.20080618
 - Own the /etc/bash_completion.d directory as we don't depend on the
-  bash-completion package. Fixes rh#450964.
+  bash-completion package. Fixes #450964.
 
 * Wed Jun 18 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-4.20080618
 - Pull in a new snapshot from the unstable branch.
@@ -856,7 +855,7 @@ update-mime-database %{_datadir}/mime &>
 
 * Mon Jun 11 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-3.20080611
 - Pull in a new snapshot from the unstable branch.
-- Fixes RH#450594 where there are insane length error messages
+- Fixes #450594 where there are insane length error messages
 - Get the group for the package when we do ::Detail()
 
 * Mon Jun 09 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.3-2.20080609
@@ -889,11 +888,11 @@ update-mime-database %{_datadir}/mime &>
 
 * Wed Apr 16 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-3.20080416git
 - Pull in the new snapshot from the stable PACKAGEKIT_0_1_X branch.
-- Fixes rh#439735.
+- Fixes #439735.
 
 * Tue Apr 15 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-2.20080415git
 - Pull in the new snapshot from the stable PACKAGEKIT_0_1_X branch.
-- Fixes rh#442286, rh#442286 and quite a few upstream bugs.
+- Fixes #442286, #442286 and quite a few upstream bugs.
 
 * Sat Apr 12 2008 Richard Hughes  <rhughes at redhat.com> - 0.1.12-1.20080412git
 - Pull in the new snapshot from the stable PACKAGEKIT_0_1_X branch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	29 Oct 2009 10:43:33 -0000	1.62
+++ sources	7 Dec 2009 16:12:21 -0000	1.63
@@ -1 +1 @@
-9c8d234ee62147f8d953da3cd61fb5a9  PackageKit-0.5.4-20091029.tar.bz2
+ecdf49ed150ebc4159d5c1bcfd117efb  PackageKit-0.5.5.tar.bz2


--- PackageKit-0.5.4-change-default-fedora-policy.patch DELETED ---


--- PackageKit-0.5.4-fix-cnf-exec.patch DELETED ---


--- PackageKit-0.5.4-fix-cnf-more.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 16:13:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:13:08 +0000 (UTC)
Subject: rpms/perl-Ace/devel perl-Ace.spec,1.6,1.7
Message-ID: <20091207161308.0D4B611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Ace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24882

Modified Files:
	perl-Ace.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Ace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Ace/devel/perl-Ace.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Ace.spec	25 Jul 2009 23:30:29 -0000	1.6
+++ perl-Ace.spec	7 Dec 2009 16:13:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Ace
 Version:        1.92
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module for interfacing with ACE bioinformatics databases
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.92-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.92-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nb at fedoraproject.org  Mon Dec  7 16:13:31 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 16:13:31 +0000 (UTC)
Subject: File znc-0.077-1.svn1672.tar.bz2 uploaded to lookaside cache by nb
Message-ID: <20091207161331.AAD2B10F861@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for znc:

7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 16:13:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:13:47 +0000 (UTC)
Subject: rpms/perl-HTML-Format/devel perl-HTML-Format.spec,1.11,1.12
Message-ID: <20091207161347.0DA1B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Format/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25203

Modified Files:
	perl-HTML-Format.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/devel/perl-HTML-Format.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-HTML-Format.spec	26 Jul 2009 06:25:16 -0000	1.11
+++ perl-HTML-Format.spec	7 Dec 2009 16:13:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Format
 Version:        2.04
-Release: 	11%{?dist}
+Release: 	12%{?dist}
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.04-12
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Dec  7 16:16:39 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 16:16:39 +0000 (UTC)
Subject: File gnome-packagekit-2.28.2.tar.gz uploaded to lookaside cache by
	rhughes
Message-ID: <20091207161639.E970010F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-packagekit:

3282c845c2b7a9e157f84a919c7a0105  gnome-packagekit-2.28.2.tar.gz



From nb at fedoraproject.org  Mon Dec  7 16:17:00 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 16:17:00 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 znc.spec, 
	1.19, 1.20
Message-ID: <20091207161700.D7F9B11C00EE@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26333

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Update to svn1672



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	25 Sep 2009 06:01:10 -0000	1.11
+++ .cvsignore	7 Dec 2009 16:17:00 -0000	1.12
@@ -1 +1 @@
-znc-0.076.tar.gz
+znc-0.077-1.svn1672.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	25 Sep 2009 06:01:10 -0000	1.12
+++ sources	7 Dec 2009 16:17:00 -0000	1.13
@@ -1 +1 @@
-03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz
+7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- znc.spec	6 Dec 2009 23:41:29 -0000	1.19
+++ znc.spec	7 Dec 2009 16:17:00 -0000	1.20
@@ -1,11 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.076
-Release:	3%{?dist}
+Version:        0.077
+Release:        1.svn1672%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
+# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
+Source0:        znc-0.077-1.svn1672.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -125,6 +128,33 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+
+* Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
+- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
+- Users cloned via the admin module no longer automatically connect into IRC. (r1653)
+- Inform new clients about their /away status. (r1655)
+- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660)
+- Rewrite znc.conf on SIGUSR1. (r1666)
+- ISpoofFormat now supports ExpandString. (r1670) 
+- Allow specifing port and password for delserver. (r1640)
+- Write the config file on restart and shutdown. (r1641)
+- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645)
+- blockuser was missing an admin check. (r1648)
+- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659)
+- Include a more portable header for uint32_t in SHA256.h. (r1665)
+- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668)
+- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669)
+- Away allowed to accidentally execute IRC commands. (r1672) 
+- Comment out some weird code in Client.cpp. (r1646)
+- Remove connect_throttle since it's obsoleted by fail2ban. (r1649)
+- Remove outdated sample znc.conf. (r1654)
+- route_replies now got a higher timeout before it generates a "BUG" message. (r1657)
+- Documented the signals on which znc reacts better. (r1667) 
+- New module hook OnIRCConnecting(). (r1638)
+- Remove obsolete CUtils::GetHashPass(). (r1642)
+- A module's GetDescription() now returns a C-String. (r1661) (r1662)
+- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) 
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.076-3
 - rebuild against perl 5.10.1
 



From kasal at fedoraproject.org  Mon Dec  7 16:18:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:18:24 +0000 (UTC)
Subject: rpms/perl-Padre/devel perl-Padre.spec,1.9,1.10
Message-ID: <20091207161824.46ADF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Padre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27258

Modified Files:
	perl-Padre.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Padre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Padre/devel/perl-Padre.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Padre.spec	26 Jul 2009 14:04:13 -0000	1.9
+++ perl-Padre.spec	7 Dec 2009 16:18:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Padre
 Version:        0.32
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl Application Development and Refactoring Environment
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.32-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:18:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:18:24 +0000 (UTC)
Subject: rpms/perl-HTML-FillInForm/devel perl-HTML-FillInForm.spec,1.2,1.3
Message-ID: <20091207161824.55D1411C0264@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-FillInForm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27265

Modified Files:
	perl-HTML-FillInForm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-FillInForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FillInForm/devel/perl-HTML-FillInForm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-FillInForm.spec	26 Jul 2009 06:24:25 -0000	1.2
+++ perl-HTML-FillInForm.spec	7 Dec 2009 16:18:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-FillInForm
 Version:        2.00
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Populates HTML Forms with data
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.00-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:19:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:19:01 +0000 (UTC)
Subject: rpms/perl-accessors/devel perl-accessors.spec,1.2,1.3
Message-ID: <20091207161901.8669211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-accessors/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27679

Modified Files:
	perl-accessors.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-accessors.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-accessors/devel/perl-accessors.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-accessors.spec	26 Jul 2009 17:43:39 -0000	1.2
+++ perl-accessors.spec	7 Dec 2009 16:19:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-accessors
 Version:        1.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Create accessor methods in caller's package
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Dec  7 16:21:33 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 16:21:33 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-12 .cvsignore, 1.61,
	1.62 gnome-packagekit.spec, 1.105, 1.106 sources, 1.62, 1.63
Message-ID: <20091207162133.0882B11C00EE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28639

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-1
- Update to 2.28.2
- Remove the original package from the dep-confirmation screen (Richard Hughes)
- Ignore generic errors such as 'Failed' and do not show UI in this case (Richard Hughes)
- Use the desktop icon when we unselect the installed application in gpk-application. Fixes fd#25098 (Richard Hughes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	16 Nov 2009 14:36:02 -0000	1.61
+++ .cvsignore	7 Dec 2009 16:21:31 -0000	1.62
@@ -1 +1 @@
-gnome-packagekit-2.28.2-20091116.tar.gz
+gnome-packagekit-2.28.2.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/gnome-packagekit.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gnome-packagekit.spec	16 Nov 2009 14:36:02 -0000	1.105
+++ gnome-packagekit.spec	7 Dec 2009 16:21:32 -0000	1.106
@@ -14,13 +14,13 @@
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
 Version:   2.28.2
-Release:   0.2.%{?alphatag}git%{?dist}
-#Release:   1%{?dist}
+#Release:   0.2.%{?alphatag}git%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}.tar.bz2
-Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}-%{?alphatag}.tar.gz
+Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}.tar.gz
+#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}-%{?alphatag}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  glib2 >= %{glib2_version}
@@ -86,8 +86,8 @@ Requires: %{name} = %{version}-%{release
 Extra GNOME applications for using PackageKit that are not normally needed.
 
 %prep
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
-#%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -221,10 +221,15 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+- Remove the original package from the dep-confirmation screen (Richard Hughes)
+- Ignore generic errors such as 'Failed' and do not show UI in this case (Richard Hughes)
+- Use the desktop icon when we unselect the installed application in gpk-application. Fixes fd#25098 (Richard Hughes)
+
 * Mon Nov 16 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-0.2.20091116git
 - New snapshot from the gnome-2-28 branch
 - Use the desktop icon when we unselect the installed application in gpk-application.
-- Updated Simplified Chinese translation.
 - Added and Updated translations.
 - Fix crash when removing certain packages with gpk-application.
 - Only wait 3 seconds (not 60) when we get the updates changed signal


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	16 Nov 2009 14:36:02 -0000	1.62
+++ sources	7 Dec 2009 16:21:32 -0000	1.63
@@ -1 +1 @@
-8e8e7019f56a223c95838f93691688b9  gnome-packagekit-2.28.2-20091116.tar.gz
+3282c845c2b7a9e157f84a919c7a0105  gnome-packagekit-2.28.2.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 16:23:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:23:00 +0000 (UTC)
Subject: rpms/perl-HTML-Encoding/devel perl-HTML-Encoding.spec,1.13,1.14
Message-ID: <20091207162300.1DE9611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Encoding/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29154

Modified Files:
	perl-HTML-Encoding.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Encoding.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Encoding/devel/perl-HTML-Encoding.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-HTML-Encoding.spec	26 Jul 2009 06:24:09 -0000	1.13
+++ perl-HTML-Encoding.spec	7 Dec 2009 16:22:59 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Encoding
 Version:        0.60
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Determine the encoding of HTML/XML/XHTML documents
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.60-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mauelsha at fedoraproject.org  Mon Dec  7 16:23:48 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Mon,  7 Dec 2009 16:23:48 +0000 (UTC)
Subject: rpms/dmraid/devel avoid_register.patch, NONE, 1.1 dmraid.spec, 1.113,
	1.114
Message-ID: <20091207162348.66CC911C00EE@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29511

Modified Files:
	dmraid.spec 
Added Files:
	avoid_register.patch 
Log Message:
bz543101: avoid (un)registering devices if no metadata format handler support

avoid_register.patch:
 activate.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE avoid_register.patch ---
diff --git a/lib/activate/activate.c.avoid_register b/lib/activate/activate.c
index 1d71ea8..86882f7 100644
--- a/lib/activate/activate.c.avoid_register
+++ b/lib/activate/activate.c
@@ -964,11 +964,13 @@ activate_subset(struct lib_context *lc, struct raid_set *rs, enum dm_what what)
 {
 	int ret = 0;
 	char *table = NULL;
+	struct dmraid_format *fmt = get_format(rs);
 
 	if (T_GROUP(rs))
 		return 1;
 
-	if (what == DM_REGISTER)
+	if (what == DM_REGISTER &&
+	    fmt->metadata_handler)
 		return register_devices(lc, rs);
 
 	/* Call type handler */
@@ -1053,8 +1055,10 @@ deactivate_superset(struct lib_context *lc, struct raid_set *rs,
 		    enum dm_what what)
 {
 	int ret = 1, status;
+	struct dmraid_format *fmt = get_format(rs);
 
-	if (what == DM_REGISTER)
+	if (what == DM_REGISTER &&
+	    fmt->metadata_handler)
 		return unregister_devices(lc, rs);
 
 	status = dm_status(lc, rs);


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- dmraid.spec	1 Dec 2009 13:34:01 -0000	1.113
+++ dmraid.spec	7 Dec 2009 16:23:48 -0000	1.114
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -28,6 +28,7 @@ Patch1: ddf1_lsi_persistent_name.patch
 Patch2: pdc_raid10_failure.patch
 Patch3: return_error_wo_disks.patch
 Patch4: fix_sil_jbod.patch
+Patch5: avoid_register.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -72,6 +73,7 @@ Device failure reporting has to be activ
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %define _libdir /%{_lib}



From kasal at fedoraproject.org  Mon Dec  7 16:24:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:24:23 +0000 (UTC)
Subject: rpms/pcsc-perl/devel pcsc-perl.spec,1.20,1.21
Message-ID: <20091207162423.BBE9E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/pcsc-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29844

Modified Files:
	pcsc-perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-perl/devel/pcsc-perl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- pcsc-perl.spec	25 Sep 2009 13:35:23 -0000	1.20
+++ pcsc-perl.spec	7 Dec 2009 16:24:23 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:           pcsc-perl
 Version:        1.4.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the PC/SC smart card library
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4.8-2
+- rebuild against perl 5.10.1
+
 * Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.8-1
 - New upstream version
 



From kasal at fedoraproject.org  Mon Dec  7 16:24:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:24:58 +0000 (UTC)
Subject: rpms/perl-Package-Generator/devel perl-Package-Generator.spec, 1.7, 
	1.8
Message-ID: <20091207162458.3FD6711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Package-Generator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30170

Modified Files:
	perl-Package-Generator.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Package-Generator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Package-Generator/devel/perl-Package-Generator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Package-Generator.spec	11 Aug 2009 08:02:58 -0000	1.7
+++ perl-Package-Generator.spec	7 Dec 2009 16:24:57 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Package-Generator
 Version:        0.103
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate new packages quickly and easily
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.103-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.103-1
 - auto-update to 0.103 (by cpan-spec-update 0.01)
 - added a new br on perl(ExtUtils::MakeMaker) (version 6.42)



From wart at fedoraproject.org  Mon Dec  7 16:25:58 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Mon,  7 Dec 2009 16:25:58 +0000 (UTC)
Subject: rpms/itcl/devel itcl-3.4-segfaultinit.patch, NONE, 1.1 itcl.spec,
	1.14, 1.15
Message-ID: <20091207162558.0E6C011C00EE@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/itcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30561

Modified Files:
	itcl.spec 
Added Files:
	itcl-3.4-segfaultinit.patch 
Log Message:
Add patch for BZ #539453



itcl-3.4-segfaultinit.patch:
 itcl_methods.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE itcl-3.4-segfaultinit.patch ---
diff -Naur incrtcl-20071231cvs.orig/generic/itcl_methods.c incrtcl-20071231cvs.new/generic/itcl_methods.c
--- incrtcl-20071231cvs.orig/generic/itcl_methods.c	2007-10-23 00:58:29.000000000 +0200
+++ incrtcl-20071231cvs.new/generic/itcl_methods.c	2009-11-21 01:18:43.000000000 +0100
@@ -622,12 +622,7 @@
      *  Allocate some space to hold the implementation.
      */
     mcode = (ItclMemberCode*)ckalloc(sizeof(ItclMemberCode));
-    mcode->flags        = 0;
-    mcode->argcount     = 0;
-    mcode->arglist      = NULL;
-    mcode->procPtr      = NULL;
-    mcode->cfunc.objCmd = NULL;
-    mcode->clientData   = NULL;
+    memset(mcode, 0, sizeof(ItclMemberCode));
 
     if (arglist) {
         if (Itcl_CreateArgList(interp, arglist, &argc, &args)
@@ -656,6 +651,7 @@
     procPtr->iPtr = (Interp*)interp;
     procPtr->refCount = 1;
     procPtr->cmdPtr = (Command*)ckalloc(sizeof(Command));
+    memset(procPtr->cmdPtr, 0, sizeof(Command));
     procPtr->cmdPtr->nsPtr = (Namespace*)cdefn->namesp;
 
     if (body) {


Index: itcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itcl/devel/itcl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- itcl.spec	25 Jul 2009 03:41:12 -0000	1.14
+++ itcl.spec	7 Dec 2009 16:25:57 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           itcl
 Version:        3.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Object oriented extensions to Tcl and Tk
 
 Group:          Development/Libraries
@@ -16,6 +16,7 @@ Patch0:         itcl-3.4-tclbindir.patch
 Patch1:         itcl-3.4-libdir.patch
 Patch2:         itcl-3.4-soname.patch
 Patch3:         itcl-3.4-findinit.patch
+Patch4:         itcl-3.4-segfaultinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  tcl(abi) = 8.5
@@ -38,6 +39,7 @@ Development headers and libraries for li
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/itclConfig.sh
 
 %changelog
+* Mon Dec 7 2009 Wart <wart at kobold.org> - 3.4-6
+- Fix segfault during startup (BZ #539453)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nb at fedoraproject.org  Mon Dec  7 16:25:59 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 16:25:59 +0000 (UTC)
Subject: rpms/znc/devel znc.spec,1.20,1.21
Message-ID: <20091207162559.1AC7111C00EE@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30652

Modified Files:
	znc.spec 
Log Message:
Fix broken spec



Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- znc.spec	7 Dec 2009 16:17:00 -0000	1.20
+++ znc.spec	7 Dec 2009 16:25:58 -0000	1.21
@@ -44,7 +44,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q
+%setup -q -n znc-0.077-1.svn1672
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 



From kasal at fedoraproject.org  Mon Dec  7 16:27:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:27:55 +0000 (UTC)
Subject: rpms/perl-HTML-DOMbo/devel perl-HTML-DOMbo.spec,1.3,1.4
Message-ID: <20091207162755.2A14B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-DOMbo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31617

Modified Files:
	perl-HTML-DOMbo.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-DOMbo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-DOMbo/devel/perl-HTML-DOMbo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-HTML-DOMbo.spec	26 Jul 2009 06:23:41 -0000	1.3
+++ perl-HTML-DOMbo.spec	7 Dec 2009 16:27:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-HTML-DOMbo
 Version:        3.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Convert between XML::DOM and {XML/HTML}::Element trees
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.10-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:29:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:29:08 +0000 (UTC)
Subject: rpms/p0rn-comfort/devel p0rn-comfort.spec,1.8,1.9
Message-ID: <20091207162908.C66E911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/p0rn-comfort/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32132

Modified Files:
	p0rn-comfort.spec 
Log Message:
- rebuild against perl 5.10.1


Index: p0rn-comfort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/p0rn-comfort/devel/p0rn-comfort.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- p0rn-comfort.spec	25 Jul 2009 21:03:49 -0000	1.8
+++ p0rn-comfort.spec	7 Dec 2009 16:29:08 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           p0rn-comfort
 Version:        0.0.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Support programs for browsing image-gallery sites
 License:        GPL+
 Group:          Applications/Internet
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.0.4-9
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:29:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:29:34 +0000 (UTC)
Subject: rpms/perl-p5-Palm/devel perl-p5-Palm.spec,1.4,1.5
Message-ID: <20091207162934.BDB9C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-p5-Palm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32373

Modified Files:
	perl-p5-Palm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-p5-Palm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-p5-Palm/devel/perl-p5-Palm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-p5-Palm.spec	21 Sep 2009 08:07:21 -0000	1.4
+++ perl-p5-Palm.spec	7 Dec 2009 16:29:34 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-p5-Palm
 Version:        1.011
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Palm OS utility functions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pdbdump.1.gz
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.011-2
+- rebuild against perl 5.10.1
+
 * Mon Sep 21 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.011-1
 - Update to 1.011
 - Fix an rpmlint complaint in the changelog



From pkgdb at fedoraproject.org  Mon Dec  7 16:30:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:30:02 +0000
Subject: [pkgdb] libvirt-cim: veillard has given up watchcommits
Message-ID: <20091207163003.0625D10F861@bastion2.fedora.phx.redhat.com>

veillard has given up the watchcommits acl on libvirt-cim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 16:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:30:09 +0000
Subject: [pkgdb] libvirt-cim: veillard has requested commit
Message-ID: <20091207163009.790D910F890@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on libvirt-cim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 16:30:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:30:13 +0000
Subject: [pkgdb] libvirt-cim: veillard has requested approveacls
Message-ID: <20091207163013.EA2B410F87F@bastion2.fedora.phx.redhat.com>

veillard has requested the approveacls acl on libvirt-cim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 16:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:30:35 +0000
Subject: [pkgdb] libvirt-cim: veillard has given up watchbugzilla
Message-ID: <20091207163035.74AFA10F890@bastion2.fedora.phx.redhat.com>

veillard has given up the watchbugzilla acl on libvirt-cim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 16:30:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:30:44 +0000
Subject: [pkgdb] libvirt-cim: veillard has given up watchcommits
Message-ID: <20091207163044.EBCAC10F89A@bastion2.fedora.phx.redhat.com>

veillard has given up the watchcommits acl on libvirt-cim (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 16:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:30:52 +0000
Subject: [pkgdb] libvirt-cim: veillard has requested commit
Message-ID: <20091207163052.B534710F89D@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on libvirt-cim (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 16:31:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:31:04 +0000
Subject: [pkgdb] libvirt-cim: veillard has requested approveacls
Message-ID: <20091207163104.DC9DE10F891@bastion2.fedora.phx.redhat.com>

veillard has requested the approveacls acl on libvirt-cim (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 16:31:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:31:08 +0000
Subject: [pkgdb] libvirt-cim: veillard has given up watchbugzilla
Message-ID: <20091207163108.CD19910F8A4@bastion2.fedora.phx.redhat.com>

veillard has given up the watchbugzilla acl on libvirt-cim (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 16:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:31:27 +0000
Subject: [pkgdb] gnome-color-manager was added for rhughes
Message-ID: <20091207163127.2A4B010F89D@bastion2.fedora.phx.redhat.com>

kevin has added Package gnome-color-manager with summary Color management for the GNOME desktop
kevin has approved Package gnome-color-manager
kevin has added a Fedora devel branch for gnome-color-manager with an owner of rhughes
kevin has approved gnome-color-manager in Fedora devel
kevin has approved Package gnome-color-manager
kevin has set commit to Approved for 107427 on gnome-color-manager (Fedora devel)
kevin has set checkout to Approved for 107427 on gnome-color-manager (Fedora devel)
kevin has set build to Approved for 107427 on gnome-color-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-color-manager



From pkgdb at fedoraproject.org  Mon Dec  7 16:31:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:31:32 +0000
Subject: [pkgdb] gnome-color-manager summary updated by kevin
Message-ID: <20091207163132.4E23C10F89C@bastion2.fedora.phx.redhat.com>

kevin set package gnome-color-manager summary to Color management for the GNOME desktop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-color-manager



From kevin at fedoraproject.org  Mon Dec  7 16:31:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:31:45 +0000 (UTC)
Subject: rpms/gnome-color-manager - New directory
Message-ID: <20091207163145.2680D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-color-manager
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmcj723/rpms/gnome-color-manager

Log Message:
Directory /cvs/pkgs/rpms/gnome-color-manager added to the repository




From kevin at fedoraproject.org  Mon Dec  7 16:31:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:31:45 +0000 (UTC)
Subject: rpms/gnome-color-manager/devel - New directory
Message-ID: <20091207163145.512A911C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-color-manager/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmcj723/rpms/gnome-color-manager/devel

Log Message:
Directory /cvs/pkgs/rpms/gnome-color-manager/devel added to the repository




From pkgdb at fedoraproject.org  Mon Dec  7 16:31:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:31:32 +0000
Subject: [pkgdb] gnome-color-manager (Fedora, 12) updated by kevin
Message-ID: <20091207163132.6637110F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gnome-color-manager
kevin has set commit to Approved for 107427 on gnome-color-manager (Fedora 12)
kevin has set checkout to Approved for 107427 on gnome-color-manager (Fedora 12)
kevin has set build to Approved for 107427 on gnome-color-manager (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-color-manager



From kevin at fedoraproject.org  Mon Dec  7 16:31:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:31:52 +0000 (UTC)
Subject: rpms/gnome-color-manager Makefile,NONE,1.1
Message-ID: <20091207163152.C204111C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-color-manager
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmcj723/rpms/gnome-color-manager

Added Files:
	Makefile 
Log Message:
Setup of module gnome-color-manager


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-color-manager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec  7 16:31:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:31:53 +0000 (UTC)
Subject: rpms/gnome-color-manager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091207163153.43D1E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-color-manager/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmcj723/rpms/gnome-color-manager/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-color-manager


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-color-manager
# $Id: Makefile,v 1.1 2009/12/07 16:31:52 kevin Exp $
NAME := gnome-color-manager
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec  7 16:32:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:32:04 +0000
Subject: [pkgdb] libcmpiutil: veillard has given up watchcommits
Message-ID: <20091207163204.DA01110F892@bastion2.fedora.phx.redhat.com>

veillard has given up the watchcommits acl on libcmpiutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 16:32:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:32:07 +0000
Subject: [pkgdb] libcmpiutil: veillard has requested commit
Message-ID: <20091207163207.5DAFB10F8A1@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on libcmpiutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 16:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:32:08 +0000
Subject: [pkgdb] libcmpiutil: veillard has given up watchbugzilla
Message-ID: <20091207163208.4E75C10F8AD@bastion2.fedora.phx.redhat.com>

veillard has given up the watchbugzilla acl on libcmpiutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 16:32:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:32:10 +0000
Subject: [pkgdb] libcmpiutil: veillard has requested approveacls
Message-ID: <20091207163210.B050310F8B2@bastion2.fedora.phx.redhat.com>

veillard has requested the approveacls acl on libcmpiutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From kasal at fedoraproject.org  Mon Dec  7 16:32:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:32:19 +0000 (UTC)
Subject: rpms/perl-HTML-Defang/devel perl-HTML-Defang.spec,1.3,1.4
Message-ID: <20091207163219.AF01011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-Defang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1122

Modified Files:
	perl-HTML-Defang.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-Defang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Defang/devel/perl-HTML-Defang.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-HTML-Defang.spec	29 Aug 2009 09:40:47 -0000	1.3
+++ perl-HTML-Defang.spec	7 Dec 2009 16:32:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Defang
 Version:        1.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cleans HTML and CSS of executable contents
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-2
+- rebuild against perl 5.10.1
+
 * Sat Aug 29 2009 Iain Arnell <iarnell at gmail.com> 1.02-1
 - update to latest upstream version
 



From pkgdb at fedoraproject.org  Mon Dec  7 16:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:32:19 +0000
Subject: [pkgdb] libcmpiutil: veillard has given up watchbugzilla
Message-ID: <20091207163219.6774D10F890@bastion2.fedora.phx.redhat.com>

veillard has given up the watchbugzilla acl on libcmpiutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 16:32:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:32:20 +0000
Subject: [pkgdb] libcmpiutil: veillard has given up watchcommits
Message-ID: <20091207163221.029AB10F8A3@bastion2.fedora.phx.redhat.com>

veillard has given up the watchcommits acl on libcmpiutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 16:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:32:23 +0000
Subject: [pkgdb] libcmpiutil: veillard has requested commit
Message-ID: <20091207163223.20B0310F8A6@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on libcmpiutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 16:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:32:25 +0000
Subject: [pkgdb] libcmpiutil: veillard has requested approveacls
Message-ID: <20091207163225.201D810F891@bastion2.fedora.phx.redhat.com>

veillard has requested the approveacls acl on libcmpiutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From kasal at fedoraproject.org  Mon Dec  7 16:34:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:34:04 +0000 (UTC)
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.72,1.73
Message-ID: <20091207163404.3CEEF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2067

Modified Files:
	OpenIPMI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- OpenIPMI.spec	1 Dec 2009 11:18:01 -0000	1.72
+++ OpenIPMI.spec	7 Dec 2009 16:34:03 -0000	1.73
@@ -4,7 +4,7 @@
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.16
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.0.16-7
+- rebuild against perl 5.10.1
+
 * Tue Dec  1 2009 Jan Safranek <jsafrane at redhat.com> - 2.0.16-6
 - fix package compilation to remove rpmlint errors
 



From kasal at fedoraproject.org  Mon Dec  7 16:33:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:33:39 +0000 (UTC)
Subject: rpms/perl-ORLite-Migrate/devel perl-ORLite-Migrate.spec,1.8,1.9
Message-ID: <20091207163339.D279311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ORLite-Migrate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1777

Modified Files:
	perl-ORLite-Migrate.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ORLite-Migrate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite-Migrate/devel/perl-ORLite-Migrate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-ORLite-Migrate.spec	26 Jul 2009 13:51:02 -0000	1.8
+++ perl-ORLite-Migrate.spec	7 Dec 2009 16:33:39 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-ORLite-Migrate
 Version:        0.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Light weight SQLite-specific schema migration
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 16:34:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:34:21 +0000
Subject: [pkgdb] hostname was added for jpopelka
Message-ID: <20091207163421.1D04B10F891@bastion2.fedora.phx.redhat.com>

kevin has added Package hostname with summary Provides commands which can be used to display the system's DNS name, and to display or set its hostname or NIS domain name
kevin has approved Package hostname
kevin has added a Fedora devel branch for hostname with an owner of jpopelka
kevin has approved hostname in Fedora devel
kevin has approved Package hostname
kevin has set commit to Approved for 107427 on hostname (Fedora devel)
kevin has set checkout to Approved for 107427 on hostname (Fedora devel)
kevin has set build to Approved for 107427 on hostname (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hostname



From nb at fedoraproject.org  Mon Dec  7 16:34:28 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 16:34:28 +0000 (UTC)
Subject: rpms/znc/devel znc.spec,1.21,1.22
Message-ID: <20091207163428.7E93811C00EE@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2313

Modified Files:
	znc.spec 
Log Message:
Remove znc.conf from spec


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- znc.spec	7 Dec 2009 16:25:58 -0000	1.21
+++ znc.spec	7 Dec 2009 16:34:28 -0000	1.22
@@ -63,7 +63,7 @@ chmod -x modules/q.cpp
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
+%doc AUTHORS LICENSE LICENSE.OpenSSL README
 %{_bindir}/znc
 %{_mandir}/man1/*
 #%{_libdir}/znc/



From kevin at fedoraproject.org  Mon Dec  7 16:34:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:34:40 +0000 (UTC)
Subject: rpms/hostname - New directory
Message-ID: <20091207163440.1540F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hostname
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYs2390/rpms/hostname

Log Message:
Directory /cvs/pkgs/rpms/hostname added to the repository




From pkgdb at fedoraproject.org  Mon Dec  7 16:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:34:22 +0000
Subject: [pkgdb] hostname summary updated by kevin
Message-ID: <20091207163422.C771C10F89C@bastion2.fedora.phx.redhat.com>

kevin set package hostname summary to Provides commands which can be used to display the system's DNS name, and to display or set its hostname or NIS domain name

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hostname



From kevin at fedoraproject.org  Mon Dec  7 16:34:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:34:40 +0000 (UTC)
Subject: rpms/hostname/devel - New directory
Message-ID: <20091207163440.3DDE611C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hostname/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYs2390/rpms/hostname/devel

Log Message:
Directory /cvs/pkgs/rpms/hostname/devel added to the repository




From kevin at fedoraproject.org  Mon Dec  7 16:34:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:34:48 +0000 (UTC)
Subject: rpms/hostname Makefile,NONE,1.1
Message-ID: <20091207163448.4303311C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hostname
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYs2390/rpms/hostname

Added Files:
	Makefile 
Log Message:
Setup of module hostname


--- NEW FILE Makefile ---
# Top level Makefile for module hostname
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec  7 16:34:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:34:48 +0000 (UTC)
Subject: rpms/hostname/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091207163448.A1FF211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hostname/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYs2390/rpms/hostname/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hostname


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hostname
# $Id: Makefile,v 1.1 2009/12/07 16:34:48 kevin Exp $
NAME := hostname
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec  7 16:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:35:17 +0000
Subject: [pkgdb] udisks was added for davidz
Message-ID: <20091207163517.31D8A10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package udisks with summary Storage Management Service
kevin has approved Package udisks
kevin has added a Fedora devel branch for udisks with an owner of davidz
kevin has approved udisks in Fedora devel
kevin has approved Package udisks
kevin has set commit to Approved for 107427 on udisks (Fedora devel)
kevin has set checkout to Approved for 107427 on udisks (Fedora devel)
kevin has set build to Approved for 107427 on udisks (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/udisks



From pkgdb at fedoraproject.org  Mon Dec  7 16:35:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:35:18 +0000
Subject: [pkgdb] udisks summary updated by kevin
Message-ID: <20091207163519.17B9410F892@bastion2.fedora.phx.redhat.com>

kevin set package udisks summary to Storage Management Service

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/udisks



From kevin at fedoraproject.org  Mon Dec  7 16:35:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:35:28 +0000 (UTC)
Subject: rpms/udisks - New directory
Message-ID: <20091207163528.1E45B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/udisks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCN2730/rpms/udisks

Log Message:
Directory /cvs/pkgs/rpms/udisks added to the repository




From kevin at fedoraproject.org  Mon Dec  7 16:35:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:35:28 +0000 (UTC)
Subject: rpms/udisks/devel - New directory
Message-ID: <20091207163528.A127E11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/udisks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCN2730/rpms/udisks/devel

Log Message:
Directory /cvs/pkgs/rpms/udisks/devel added to the repository




From kevin at fedoraproject.org  Mon Dec  7 16:35:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:35:35 +0000 (UTC)
Subject: rpms/udisks Makefile,NONE,1.1
Message-ID: <20091207163535.D8AE211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/udisks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCN2730/rpms/udisks

Added Files:
	Makefile 
Log Message:
Setup of module udisks


--- NEW FILE Makefile ---
# Top level Makefile for module udisks
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec  7 16:35:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 16:35:36 +0000 (UTC)
Subject: rpms/udisks/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091207163536.606B211C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/udisks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCN2730/rpms/udisks/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module udisks


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: udisks
# $Id: Makefile,v 1.1 2009/12/07 16:35:36 kevin Exp $
NAME := udisks
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec  7 16:36:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 16:36:13 +0000
Subject: [pkgdb] fence-virt (Fedora, 11) updated by kevin
Message-ID: <20091207163613.B7A2D10F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for fence-virt
kevin has set commit to Approved for 107427 on fence-virt (Fedora 11)
kevin has set checkout to Approved for 107427 on fence-virt (Fedora 11)
kevin has set build to Approved for 107427 on fence-virt (Fedora 11)
kevin changed owner of fence-virt in Fedora 11 to lon
kevin approved watchbugzilla on fence-virt (Fedora 11) for fabbione
kevin approved watchcommits on fence-virt (Fedora 11) for fabbione
kevin approved commit on fence-virt (Fedora 11) for fabbione
kevin approved build on fence-virt (Fedora 11) for fabbione
kevin approved approveacls on fence-virt (Fedora 11) for fabbione

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fence-virt



From kasal at fedoraproject.org  Mon Dec  7 16:37:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:37:05 +0000 (UTC)
Subject: rpms/perl-HTML-CalendarMonthSimple/devel
	perl-HTML-CalendarMonthSimple.spec, 1.5, 1.6
Message-ID: <20091207163705.13AFB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-HTML-CalendarMonthSimple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3375

Modified Files:
	perl-HTML-CalendarMonthSimple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-HTML-CalendarMonthSimple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-CalendarMonthSimple/devel/perl-HTML-CalendarMonthSimple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-HTML-CalendarMonthSimple.spec	26 Jul 2009 06:23:27 -0000	1.5
+++ perl-HTML-CalendarMonthSimple.spec	7 Dec 2009 16:37:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-HTML-CalendarMonthSimple
 Version:        1.25
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl Module for Generating HTML Calendars
 License:        Public Domain
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.25-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:37:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:37:52 +0000 (UTC)
Subject: rpms/perl-ORLite/devel perl-ORLite.spec,1.6,1.7
Message-ID: <20091207163752.EC0C911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-ORLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3748

Modified Files:
	perl-ORLite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-ORLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite/devel/perl-ORLite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-ORLite.spec	26 Jul 2009 13:50:48 -0000	1.6
+++ perl-ORLite.spec	7 Dec 2009 16:37:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-ORLite
 Version:        1.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extremely light weight SQLite-specific ORM
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.22-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:38:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:38:18 +0000 (UTC)
Subject: rpms/ocaml-perl4caml/devel ocaml-perl4caml.spec,1.11,1.12
Message-ID: <20091207163818.71C7311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/ocaml-perl4caml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4058

Modified Files:
	ocaml-perl4caml.spec 
Log Message:
- rebuild against perl 5.10.1


Index: ocaml-perl4caml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/devel/ocaml-perl4caml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-perl4caml.spec	25 Jul 2009 20:03:07 -0000	1.11
+++ ocaml-perl4caml.spec	7 Dec 2009 16:38:18 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           ocaml-perl4caml
 Version:        0.9.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OCaml library for calling Perl libraries and code
 
 Group:          Development/Libraries
@@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9.5-11
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Dec  7 16:39:10 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 16:39:10 +0000 (UTC)
Subject: File gnome-color-manager-2.29.1.tar.gz uploaded to lookaside cache
	by rhughes
Message-ID: <20091207163910.C215210F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-color-manager:

ba6a996f19c3826f0f72bfb3f766b288  gnome-color-manager-2.29.1.tar.gz



From dwmw2 at fedoraproject.org  Mon Dec  7 16:41:55 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon,  7 Dec 2009 16:41:55 +0000 (UTC)
Subject: File openconnect-2.12.tar.gz uploaded to lookaside cache by dwmw2
Message-ID: <20091207164155.15EA810F88C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for openconnect:

2a9f97a6dd2627553dbf0c3ffbd5c05f  openconnect-2.12.tar.gz



From nb at fedoraproject.org  Mon Dec  7 16:42:03 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 16:42:03 +0000 (UTC)
Subject: rpms/znc/devel znc.spec,1.22,1.23
Message-ID: <20091207164203.97ACB11C00EE@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5638

Modified Files:
	znc.spec 
Log Message:
Remove connect_throttle.so from spec


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- znc.spec	7 Dec 2009 16:34:28 -0000	1.22
+++ znc.spec	7 Dec 2009 16:42:03 -0000	1.23
@@ -115,7 +115,7 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/antiidle.so
 %{_libdir}/znc/autovoice.so
 %{_libdir}/znc/blockuser.so
-%{_libdir}/znc/connect_throttle.so
+#%{_libdir}/znc/connect_throttle.so
 %{_libdir}/znc/ctcpflood.so
 %{_libdir}/znc/discon_kick.so
 %{_libdir}/znc/droproot.so



From kasal at fedoraproject.org  Mon Dec  7 16:42:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:42:04 +0000 (UTC)
Subject: rpms/perl-Hook-LexWrap/devel perl-Hook-LexWrap.spec,1.12,1.13
Message-ID: <20091207164204.0139711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hook-LexWrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5654

Modified Files:
	perl-Hook-LexWrap.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hook-LexWrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hook-LexWrap/devel/perl-Hook-LexWrap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Hook-LexWrap.spec	26 Jul 2009 06:39:03 -0000	1.12
+++ perl-Hook-LexWrap.spec	7 Dec 2009 16:42:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Hook-LexWrap
 Version:        0.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lexically scoped subroutine wrappers
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.22-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:42:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:42:28 +0000 (UTC)
Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.12,1.13
Message-ID: <20091207164228.D591D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/ocaml-cil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5937

Modified Files:
	ocaml-cil.spec 
Log Message:
- rebuild against perl 5.10.1


Index: ocaml-cil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-cil.spec	23 Oct 2009 08:23:11 -0000	1.12
+++ ocaml-cil.spec	7 Dec 2009 16:42:28 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name:           ocaml-cil
 Version:        1.3.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -196,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.3.7-4
+- rebuild against perl 5.10.1
+
 * Fri Oct 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3.7-3
 - Include natively compiled files and *.mli files (RHBZ#521324).
 



From dwmw2 at fedoraproject.org  Mon Dec  7 16:42:43 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon,  7 Dec 2009 16:42:43 +0000 (UTC)
Subject: rpms/openconnect/devel .cvsignore, 1.11, 1.12 openconnect.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20091207164243.0589311C00EE@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6112

Modified Files:
	.cvsignore openconnect.spec sources 
Log Message:
2.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Nov 2009 15:59:24 -0000	1.11
+++ .cvsignore	7 Dec 2009 16:42:42 -0000	1.12
@@ -1 +1 @@
-openconnect-2.11.tar.gz
+openconnect-2.12.tar.gz


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/openconnect.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- openconnect.spec	17 Nov 2009 15:59:24 -0000	1.17
+++ openconnect.spec	7 Dec 2009 16:42:42 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		openconnect
-Version:	2.11
+Version:	2.12
 Release:	1%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 David Woodhouse <David.Woodhouse at intel.com> - 2.12-1
+- Update to 2.12.
+
 * Tue Nov 17 2009 David Woodhouse <David.Woodhouse at intel.com> - 2.11-1
 - Update to 2.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Nov 2009 15:59:24 -0000	1.11
+++ sources	7 Dec 2009 16:42:42 -0000	1.12
@@ -1 +1 @@
-509ebd34647dc44115289b2ede5319cd  openconnect-2.11.tar.gz
+2a9f97a6dd2627553dbf0c3ffbd5c05f  openconnect-2.12.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 16:42:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:42:42 +0000 (UTC)
Subject: rpms/perl-OpenFrame/devel perl-OpenFrame.spec,1.7,1.8
Message-ID: <20091207164242.D4B5211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-OpenFrame/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6125

Modified Files:
	perl-OpenFrame.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-OpenFrame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-OpenFrame/devel/perl-OpenFrame.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-OpenFrame.spec	26 Jul 2009 13:52:56 -0000	1.7
+++ perl-OpenFrame.spec	7 Dec 2009 16:42:42 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-OpenFrame
 Version:        3.05
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Framework for network enabled applications
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.05-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.05-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:46:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:46:06 +0000 (UTC)
Subject: rpms/perl-Heap/devel perl-Heap.spec,1.9,1.10
Message-ID: <20091207164606.E976211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Heap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7484

Modified Files:
	perl-Heap.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Heap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Heap/devel/perl-Heap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Heap.spec	26 Jul 2009 06:38:48 -0000	1.9
+++ perl-Heap.spec	7 Dec 2009 16:46:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Heap
 Version:        0.80
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for keeping data partially sorted
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.80-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.80-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:47:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:47:11 +0000 (UTC)
Subject: rpms/obexftp/devel obexftp.spec,1.21,1.22
Message-ID: <20091207164711.1F70911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/obexftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7972

Modified Files:
	obexftp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: obexftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexftp/devel/obexftp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- obexftp.spec	25 Jul 2009 19:47:44 -0000	1.21
+++ obexftp.spec	7 Dec 2009 16:47:10 -0000	1.22
@@ -6,7 +6,7 @@ Name: obexftp
 Summary: Tool to access devices via the OBEX protocol
 Group: Applications/File
 Version: 0.23
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://openobex.triq.net/
 Source: http://triq.net/obexftp/%{name}-%{version}.tar.bz2
@@ -159,6 +159,9 @@ chmod 755 %{buildroot}%{python_sitearch}
 %{ruby_sitearch}/obexftp.so
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.23-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:48:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:48:19 +0000 (UTC)
Subject: rpms/perl-OLE-Storage_Lite/devel perl-OLE-Storage_Lite.spec, 1.14, 
	1.15
Message-ID: <20091207164819.A167311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-OLE-Storage_Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8460

Modified Files:
	perl-OLE-Storage_Lite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-OLE-Storage_Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-OLE-Storage_Lite/devel/perl-OLE-Storage_Lite.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-OLE-Storage_Lite.spec	26 Jul 2009 13:50:32 -0000	1.14
+++ perl-OLE-Storage_Lite.spec	7 Dec 2009 16:48:19 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		perl-OLE-Storage_Lite
 Version:	0.18
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Simple Class for OLE document interface
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:50:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:50:50 +0000 (UTC)
Subject: rpms/perl-Hash-WithDefaults/devel perl-Hash-WithDefaults.spec, 1.6, 
	1.7
Message-ID: <20091207165050.64C3011C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hash-WithDefaults/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9403

Modified Files:
	perl-Hash-WithDefaults.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hash-WithDefaults.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-WithDefaults/devel/perl-Hash-WithDefaults.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Hash-WithDefaults.spec	26 Jul 2009 06:38:33 -0000	1.6
+++ perl-Hash-WithDefaults.spec	7 Dec 2009 16:50:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Hash-WithDefaults
 Version:        0.04
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Class for hashes with key-casing requirements supporting defaults
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From acme at fedoraproject.org  Mon Dec  7 16:52:16 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Mon,  7 Dec 2009 16:52:16 +0000 (UTC)
Subject: rpms/dwarves/devel .cvsignore, 1.5, 1.6 dwarves.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091207165216.E931811C00EE@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/dwarves/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9978

Modified Files:
	.cvsignore dwarves.spec sources 
Log Message:
New upstream release: 1.8

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Feb 2009 14:16:38 -0000	1.5
+++ .cvsignore	7 Dec 2009 16:52:16 -0000	1.6
@@ -1 +1 @@
-dwarves-1.7.tar.bz2
+dwarves-1.8.tar.bz2


Index: dwarves.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/devel/dwarves.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dwarves.spec	24 Jul 2009 20:41:11 -0000	1.7
+++ dwarves.spec	7 Dec 2009 16:52:16 -0000	1.8
@@ -2,20 +2,20 @@
 %define libver 1
 
 Name: dwarves
-Version: 1.7
-Release: 5
+Version: 1.8
+Release: 1%{?dist}
 License: GPLv2
-Summary: Dwarf Tools
+Summary: Debugging Information Manipulation Tools
 Group: Development/Tools
 URL: http://oops.ghostprotocols.net:81/blog
 Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.bz2
 BuildRequires: cmake
-BuildRequires: elfutils-devel >= 0.130
 BuildRequires: zlib-devel
+BuildRequires: elfutils-devel >= 0.130
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
-dwarves is a set of tools that use the DWARF debugging information inserted in
+dwarves is a set of tools that use the debugging information inserted in
 ELF binaries by compilers such as GCC, used by well known debuggers such as
 GDB, and more recent ones such as systemtap.
 
@@ -32,23 +32,20 @@ code generate on the resulting binaries.
 Another tool is pfunct, that can be used to find all sorts of information about
 functions, inlines, decisions made by the compiler about inlining, etc.
 
-The documentation about ctracer is not updated to the latest developments: it
-now generates systemtap scripts, stay tuned for improvements in this area!
-
 %package -n %{libname}%{libver}
-Summary: DWARF processing library
+Summary: Debugging information  processing library
 Group: Development/Libraries
 
 %description -n %{libname}%{libver}
-DWARF processing library
+Debugging information processing library.
 
 %package -n %{libname}%{libver}-devel
-Summary: DWARF processing library development files
+Summary: Debugging information library development files
 Group: Development/Libraries
 Requires: %{libname}%{libver} = %{version}-%{release}
 
 %description -n %{libname}%{libver}-devel
-DWARF processing library development files
+Debugging information processing library development files.
 
 %prep
 %setup -q -c -n %{name}-%{version}
@@ -103,22 +100,21 @@ rm -rf %{buildroot}
 %files -n %{libname}%{libver}-devel
 %defattr(0644,root,root,0755)
 %doc MANIFEST README
-%{_includedir}/dwarves.h
-%{_includedir}/dwarves_emit.h
-%{_includedir}/dwarves_reorganize.h
+%{_includedir}/dwarves/dwarves.h
+%{_includedir}/dwarves/dwarves_emit.h
+%{_includedir}/dwarves/dwarves_reorganize.h
+%{_includedir}/dwarves/dutil.h
+%{_includedir}/dwarves/gobuffer.h
+%{_includedir}/dwarves/list.h
+%{_includedir}/dwarves/rbtree.h
+%{_includedir}/dwarves/strings.h
 %{_libdir}/%{libname}.so
 %{_libdir}/%{libname}_emit.so
 %{_libdir}/%{libname}_reorganize.so
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 13 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.7-3
-- Add BuildRequires for zlib-devel
+* Fri Dec  4 2009 Apr 23 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.8-1
+- New release
 
 * Fri Feb 13 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 1.7-2
 - Own /usr/share/dwarves, fixes #473645 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dwarves/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Feb 2009 14:16:38 -0000	1.5
+++ sources	7 Dec 2009 16:52:16 -0000	1.6
@@ -1 +1 @@
-30dfc01981e139269fcfed72c6784d2f  dwarves-1.7.tar.bz2
+92ef945346d087ff3d29fb03c0e08625  dwarves-1.8.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 16:52:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:52:49 +0000 (UTC)
Subject: rpms/perl-Object-Signature/devel perl-Object-Signature.spec, 1.4,
	1.5
Message-ID: <20091207165249.0AFF611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Object-Signature/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10235

Modified Files:
	perl-Object-Signature.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Object-Signature.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Object-Signature/devel/perl-Object-Signature.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Object-Signature.spec	26 Jul 2009 13:52:40 -0000	1.4
+++ perl-Object-Signature.spec	7 Dec 2009 16:52:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Object-Signature
 Version:        1.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cryptographically strong objects 
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:53:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:53:21 +0000 (UTC)
Subject: rpms/ntop/devel ntop.spec,1.13,1.14
Message-ID: <20091207165321.4A23611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/ntop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10555

Modified Files:
	ntop.spec 
Log Message:
- rebuild against perl 5.10.1


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/ntop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntop.spec	10 Oct 2009 06:09:31 -0000	1.13
+++ ntop.spec	7 Dec 2009 16:53:21 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           ntop
 Version:        3.3.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 # Confirmed from fedora legal 488717
@@ -190,6 +190,9 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.3.10-4
+- rebuild against perl 5.10.1
+
 * Sun Sep 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.10-3
 - Patch7: ntop-http_c.patch for #518264 (CVE-2009-2732)
 



From rdieter at fedoraproject.org  Mon Dec  7 16:53:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  7 Dec 2009 16:53:22 +0000 (UTC)
Subject: File akonadi-1.2.80.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091207165322.0DF4810F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for akonadi:

86efecca13035df77d2da534cbd0074e  akonadi-1.2.80.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 16:55:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:55:27 +0000 (UTC)
Subject: rpms/perl-Hash-Util-FieldHash-Compat/devel
	perl-Hash-Util-FieldHash-Compat.spec, 1.3, 1.4
Message-ID: <20091207165527.D9E4C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hash-Util-FieldHash-Compat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11469

Modified Files:
	perl-Hash-Util-FieldHash-Compat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hash-Util-FieldHash-Compat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Util-FieldHash-Compat/devel/perl-Hash-Util-FieldHash-Compat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Hash-Util-FieldHash-Compat.spec	26 Jul 2009 06:38:18 -0000	1.3
+++ perl-Hash-Util-FieldHash-Compat.spec	7 Dec 2009 16:55:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Hash-Util-FieldHash-Compat
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Use Hash::Util::FieldHash or ties, depending on availability
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nb at fedoraproject.org  Mon Dec  7 16:55:20 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 16:55:20 +0000 (UTC)
Subject: rpms/znc/F-10 .cvsignore,1.7,1.8 sources,1.7,1.8 znc.spec,1.8,1.9
Message-ID: <20091207165520.AEE5311C00EE@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11383

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
update to svn1672


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Sep 2009 06:12:33 -0000	1.7
+++ .cvsignore	7 Dec 2009 16:55:20 -0000	1.8
@@ -1 +1 @@
-znc-0.076.tar.gz
+znc-0.077-1.svn1672.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Sep 2009 06:12:34 -0000	1.7
+++ sources	7 Dec 2009 16:55:20 -0000	1.8
@@ -1 +1 @@
-03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz
+7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/znc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- znc.spec	25 Sep 2009 06:12:34 -0000	1.8
+++ znc.spec	7 Dec 2009 16:55:20 -0000	1.9
@@ -1,11 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.076
-Release:	2%{?dist}
+Version:        0.077
+Release:        1.svn1672%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
+# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
+Source0:        znc-0.077-1.svn1672.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -41,7 +44,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q
+%setup -q -n znc-0.077-1.svn1672
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -60,7 +63,7 @@ chmod -x modules/q.cpp
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
+%doc AUTHORS LICENSE LICENSE.OpenSSL README
 %{_bindir}/znc
 %{_mandir}/man1/*
 #%{_libdir}/znc/
@@ -112,7 +115,7 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/antiidle.so
 %{_libdir}/znc/autovoice.so
 %{_libdir}/znc/blockuser.so
-%{_libdir}/znc/connect_throttle.so
+#%{_libdir}/znc/connect_throttle.so
 %{_libdir}/znc/ctcpflood.so
 %{_libdir}/znc/discon_kick.so
 %{_libdir}/znc/droproot.so
@@ -125,6 +128,36 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+
+* Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
+- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
+- Users cloned via the admin module no longer automatically connect into IRC. (r1653)
+- Inform new clients about their /away status. (r1655)
+- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660)
+- Rewrite znc.conf on SIGUSR1. (r1666)
+- ISpoofFormat now supports ExpandString. (r1670) 
+- Allow specifing port and password for delserver. (r1640)
+- Write the config file on restart and shutdown. (r1641)
+- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645)
+- blockuser was missing an admin check. (r1648)
+- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659)
+- Include a more portable header for uint32_t in SHA256.h. (r1665)
+- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668)
+- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669)
+- Away allowed to accidentally execute IRC commands. (r1672) 
+- Comment out some weird code in Client.cpp. (r1646)
+- Remove connect_throttle since it's obsoleted by fail2ban. (r1649)
+- Remove outdated sample znc.conf. (r1654)
+- route_replies now got a higher timeout before it generates a "BUG" message. (r1657)
+- Documented the signals on which znc reacts better. (r1667) 
+- New module hook OnIRCConnecting(). (r1638)
+- Remove obsolete CUtils::GetHashPass(). (r1642)
+- A module's GetDescription() now returns a C-String. (r1661) (r1662)
+- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) 
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.076-3
+- rebuild against perl 5.10.1
+
 * Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
 - Fix missing dist tag
 



From rhughes at fedoraproject.org  Mon Dec  7 16:56:07 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 16:56:07 +0000 (UTC)
Subject: rpms/gnome-color-manager/devel gnome-color-manager.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207165607.EE80B11C00EE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-color-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11259/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-color-manager.spec import.log 
Log Message:



--- NEW FILE gnome-color-manager.spec ---
%define gtk2_version                    2.16.0
%define dbus_glib_version               0.73
%define unique_version                  1.0.0

%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary:   Color management tools for GNOME
Name:      gnome-color-manager
Version:   2.29.1
Release:   1%{?dist}
License:   GPLv2+
Group:     Applications/System
URL:       http://projects.gnome.org/gnome-color-manager/
Source0:   http://download.gnome.org/sources/gnome-color-manager/2.29/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  gtk2 >= %{gtk2_version}
Requires:  gnome-icon-theme
Requires:  unique >= %{unique_version}
Requires:  shared-mime-info
Requires:  dbus-glib >= %{dbus_glib_version}
Requires:  dbus-x11
Requires:  vte
Requires:  argyllcms
Requires(post):   scrollkeeper
Requires(pre):    GConf2
Requires(post):   GConf2
Requires(preun):  GConf2
Requires(postun): scrollkeeper

BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: scrollkeeper
BuildRequires: gnome-doc-utils >= 0.3.2
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libtool
BuildRequires: vte-devel
BuildRequires: gnome-doc-utils
BuildRequires: unique-devel >= %{unique_version}
BuildRequires: intltool
BuildRequires: libgudev1-devel
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: libXxf86vm-devel
BuildRequires: libXrandr-devel
BuildRequires: gnome-desktop-devel

%description
gnome-color-manager is a session framework that makes it easy to manage, install
and generate color profiles in the GNOME desktop.

%prep
%setup -q

%build
%configure --disable-scrollkeeper --disable-schemas-install
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

for i in gcm-prefs gcm-import ; do
  desktop-file-install --delete-original                                \
    --dir=$RPM_BUILD_ROOT%{_datadir}/applications/                      \
    $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
done

%find_lang %name --with-gnome

%clean
rm -rf $RPM_BUILD_ROOT

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
        %{_sysconfdir}/gconf/schemas/gnome-color-manager.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 &> /dev/null || :
fi
update-desktop-database %{_datadir}/applications &> /dev/null || :
update-mime-database %{_datadir}/mime &> /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-color-manager.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-color-manager.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 &> /dev/null || :
fi
update-desktop-database %{_datadir}/applications &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/gcm-*
%dir %{_datadir}/gnome-color-manager
%dir %{_datadir}/gnome-color-manager/profiles
%{_datadir}/gnome-color-manager/profiles/*.ic?
%{_datadir}/gnome-color-manager/gcm-*.ui
%{_datadir}/man/man1/*.1.gz
%{_datadir}/gnome/help/gnome-color-manager
#%{_datadir}/omf/gnome-color-manager
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/*/*.svg*
%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
%{_datadir}/applications/gcm-prefs.desktop
%{_datadir}/applications/gcm-import.desktop
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/dbus-1/services/org.gnome.ColorManager.service

%changelog
* Fri Dec 04 2009 Richard Hughes <richard at hughsie.com> 2.29.1-1
- Initial spec for review.



--- NEW FILE import.log ---
gnome-color-manager-2_29_1-1_fc12:HEAD:gnome-color-manager-2.29.1-1.fc12.src.rpm:1260204645


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Dec 2009 16:31:52 -0000	1.1
+++ .cvsignore	7 Dec 2009 16:56:07 -0000	1.2
@@ -0,0 +1 @@
+gnome-color-manager-2.29.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Dec 2009 16:31:53 -0000	1.1
+++ sources	7 Dec 2009 16:56:07 -0000	1.2
@@ -0,0 +1 @@
+ba6a996f19c3826f0f72bfb3f766b288  gnome-color-manager-2.29.1.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 16:57:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:57:05 +0000 (UTC)
Subject: rpms/perl-Object-Realize-Later/devel perl-Object-Realize-Later.spec,
	1.7, 1.8
Message-ID: <20091207165705.6283E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Object-Realize-Later/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12264

Modified Files:
	perl-Object-Realize-Later.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Object-Realize-Later.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Object-Realize-Later/devel/perl-Object-Realize-Later.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Object-Realize-Later.spec	26 Jul 2009 13:52:24 -0000	1.7
+++ perl-Object-Realize-Later.spec	7 Dec 2009 16:57:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Object-Realize-Later
 Version:        0.18
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Delayed creation of objects
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nb at fedoraproject.org  Mon Dec  7 16:57:40 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 16:57:40 +0000 (UTC)
Subject: rpms/znc/F-11 .cvsignore,1.7,1.8 sources,1.7,1.8 znc.spec,1.9,1.10
Message-ID: <20091207165740.45EF011C00EE@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12528

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
update to svn1672


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Sep 2009 06:03:34 -0000	1.7
+++ .cvsignore	7 Dec 2009 16:57:39 -0000	1.8
@@ -1 +1 @@
-znc-0.076.tar.gz
+znc-0.077-1.svn1672.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Sep 2009 06:03:35 -0000	1.7
+++ sources	7 Dec 2009 16:57:40 -0000	1.8
@@ -1 +1 @@
-03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz
+7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/znc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- znc.spec	25 Sep 2009 06:10:44 -0000	1.9
+++ znc.spec	7 Dec 2009 16:57:40 -0000	1.10
@@ -1,11 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.076
-Release:	2%{?dist}
+Version:        0.077
+Release:        1.svn1672%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
+# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
+Source0:        znc-0.077-1.svn1672.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -41,7 +44,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q
+%setup -q -n znc-0.077-1.svn1672
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -60,7 +63,7 @@ chmod -x modules/q.cpp
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
+%doc AUTHORS LICENSE LICENSE.OpenSSL README
 %{_bindir}/znc
 %{_mandir}/man1/*
 #%{_libdir}/znc/
@@ -112,7 +115,7 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/antiidle.so
 %{_libdir}/znc/autovoice.so
 %{_libdir}/znc/blockuser.so
-%{_libdir}/znc/connect_throttle.so
+#%{_libdir}/znc/connect_throttle.so
 %{_libdir}/znc/ctcpflood.so
 %{_libdir}/znc/discon_kick.so
 %{_libdir}/znc/droproot.so
@@ -125,6 +128,36 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+
+* Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
+- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
+- Users cloned via the admin module no longer automatically connect into IRC. (r1653)
+- Inform new clients about their /away status. (r1655)
+- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660)
+- Rewrite znc.conf on SIGUSR1. (r1666)
+- ISpoofFormat now supports ExpandString. (r1670) 
+- Allow specifing port and password for delserver. (r1640)
+- Write the config file on restart and shutdown. (r1641)
+- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645)
+- blockuser was missing an admin check. (r1648)
+- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659)
+- Include a more portable header for uint32_t in SHA256.h. (r1665)
+- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668)
+- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669)
+- Away allowed to accidentally execute IRC commands. (r1672) 
+- Comment out some weird code in Client.cpp. (r1646)
+- Remove connect_throttle since it's obsoleted by fail2ban. (r1649)
+- Remove outdated sample znc.conf. (r1654)
+- route_replies now got a higher timeout before it generates a "BUG" message. (r1657)
+- Documented the signals on which znc reacts better. (r1667) 
+- New module hook OnIRCConnecting(). (r1638)
+- Remove obsolete CUtils::GetHashPass(). (r1642)
+- A module's GetDescription() now returns a C-String. (r1661) (r1662)
+- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) 
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.076-3
+- rebuild against perl 5.10.1
+
 * Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
 - Fix missing dist tag
 



From kasal at fedoraproject.org  Mon Dec  7 16:58:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:58:25 +0000 (UTC)
Subject: rpms/nkf/devel nkf.spec,1.31,1.32
Message-ID: <20091207165825.5921B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/nkf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12798

Modified Files:
	nkf.spec 
Log Message:
- rebuild against perl 5.10.1


Index: nkf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- nkf.spec	25 Jul 2009 19:24:49 -0000	1.31
+++ nkf.spec	7 Dec 2009 16:58:25 -0000	1.32
@@ -3,7 +3,7 @@
 Name:		nkf
 Epoch:		1
 Version:	2.0.8b
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	BSD
 URL:		http://nkf.sourceforge.jp/
 Source0:	http://osdn.dl.sourceforge.jp/nkf/26243/%{name}-%{version}.tar.gz
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:2.0.8b-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.0.8b-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 16:59:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 16:59:25 +0000 (UTC)
Subject: rpms/perl-Hash-Merge-Simple/devel perl-Hash-Merge-Simple.spec, 1.2, 
	1.3
Message-ID: <20091207165925.C2A5E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hash-Merge-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13362

Modified Files:
	perl-Hash-Merge-Simple.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hash-Merge-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Merge-Simple/devel/perl-Hash-Merge-Simple.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Hash-Merge-Simple.spec	26 Jul 2009 06:38:03 -0000	1.2
+++ perl-Hash-Merge-Simple.spec	7 Dec 2009 16:59:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-Hash-Merge-Simple 
 Version:    0.04 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Hash/Merge/Simple.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From wart at fedoraproject.org  Mon Dec  7 16:59:44 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Mon,  7 Dec 2009 16:59:44 +0000 (UTC)
Subject: rpms/itcl/F-12 itcl.spec,1.14,1.15
Message-ID: <20091207165944.33EA311C00EE@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/itcl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13317

Modified Files:
	itcl.spec 
Log Message:
Fix segfault during init (bz #539453)




Index: itcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itcl/F-12/itcl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- itcl.spec	25 Jul 2009 03:41:12 -0000	1.14
+++ itcl.spec	7 Dec 2009 16:59:43 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           itcl
 Version:        3.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Object oriented extensions to Tcl and Tk
 
 Group:          Development/Libraries
@@ -16,6 +16,7 @@ Patch0:         itcl-3.4-tclbindir.patch
 Patch1:         itcl-3.4-libdir.patch
 Patch2:         itcl-3.4-soname.patch
 Patch3:         itcl-3.4-findinit.patch
+Patch4:         itcl-3.4-segfaultinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  tcl(abi) = 8.5
@@ -38,6 +39,7 @@ Development headers and libraries for li
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/itclConfig.sh
 
 %changelog
+* Mon Dec 7 2009 Wart <wart at kobold.org> - 3.4-6
+- Fix segfault during startup (BZ #539453)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Dec  7 17:00:26 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 17:00:26 +0000 (UTC)
Subject: File gnome-power-manager-2.28.2.tar.gz uploaded to lookaside cache
	by rhughes
Message-ID: <20091207170026.1D48E10F8A3@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-power-manager:

032a9093a211dbfb57a5f7b41cf00ae0  gnome-power-manager-2.28.2.tar.gz



From nb at fedoraproject.org  Mon Dec  7 17:00:25 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 17:00:25 +0000 (UTC)
Subject: rpms/znc/F-12 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 znc.spec, 
	1.18, 1.19
Message-ID: <20091207170025.6228B11C03FC@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13922

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
update to svn1672


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	25 Sep 2009 06:01:10 -0000	1.11
+++ .cvsignore	7 Dec 2009 17:00:24 -0000	1.12
@@ -1 +1 @@
-znc-0.076.tar.gz
+znc-0.077-1.svn1672.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	25 Sep 2009 06:01:10 -0000	1.12
+++ sources	7 Dec 2009 17:00:24 -0000	1.13
@@ -1 +1 @@
-03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz
+7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-12/znc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- znc.spec	25 Sep 2009 06:08:55 -0000	1.18
+++ znc.spec	7 Dec 2009 17:00:25 -0000	1.19
@@ -1,11 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.076
-Release:	2%{?dist}
+Version:        0.077
+Release:        1.svn1672%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
+# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
+Source0:        znc-0.077-1.svn1672.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -41,7 +44,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q
+%setup -q -n znc-0.077-1.svn1672
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -60,7 +63,7 @@ chmod -x modules/q.cpp
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
+%doc AUTHORS LICENSE LICENSE.OpenSSL README
 %{_bindir}/znc
 %{_mandir}/man1/*
 #%{_libdir}/znc/
@@ -112,7 +115,7 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/antiidle.so
 %{_libdir}/znc/autovoice.so
 %{_libdir}/znc/blockuser.so
-%{_libdir}/znc/connect_throttle.so
+#%{_libdir}/znc/connect_throttle.so
 %{_libdir}/znc/ctcpflood.so
 %{_libdir}/znc/discon_kick.so
 %{_libdir}/znc/droproot.so
@@ -125,6 +128,36 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+
+* Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
+- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
+- Users cloned via the admin module no longer automatically connect into IRC. (r1653)
+- Inform new clients about their /away status. (r1655)
+- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660)
+- Rewrite znc.conf on SIGUSR1. (r1666)
+- ISpoofFormat now supports ExpandString. (r1670) 
+- Allow specifing port and password for delserver. (r1640)
+- Write the config file on restart and shutdown. (r1641)
+- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645)
+- blockuser was missing an admin check. (r1648)
+- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659)
+- Include a more portable header for uint32_t in SHA256.h. (r1665)
+- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668)
+- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669)
+- Away allowed to accidentally execute IRC commands. (r1672) 
+- Comment out some weird code in Client.cpp. (r1646)
+- Remove connect_throttle since it's obsoleted by fail2ban. (r1649)
+- Remove outdated sample znc.conf. (r1654)
+- route_replies now got a higher timeout before it generates a "BUG" message. (r1657)
+- Documented the signals on which znc reacts better. (r1667) 
+- New module hook OnIRCConnecting(). (r1638)
+- Remove obsolete CUtils::GetHashPass(). (r1642)
+- A module's GetDescription() now returns a C-String. (r1661) (r1662)
+- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) 
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.076-3
+- rebuild against perl 5.10.1
+
 * Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
 - Fix missing dist tag
 



From wart at fedoraproject.org  Mon Dec  7 17:00:28 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Mon,  7 Dec 2009 17:00:28 +0000 (UTC)
Subject: rpms/itcl/F-12 itcl-3.4-segfaultinit.patch,NONE,1.1
Message-ID: <20091207170028.C3DCB11C03FC@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/itcl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13832

Added Files:
	itcl-3.4-segfaultinit.patch 
Log Message:
Patch for bz# 539453



itcl-3.4-segfaultinit.patch:
 itcl_methods.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE itcl-3.4-segfaultinit.patch ---
diff -Naur incrtcl-20071231cvs.orig/generic/itcl_methods.c incrtcl-20071231cvs.new/generic/itcl_methods.c
--- incrtcl-20071231cvs.orig/generic/itcl_methods.c	2007-10-23 00:58:29.000000000 +0200
+++ incrtcl-20071231cvs.new/generic/itcl_methods.c	2009-11-21 01:18:43.000000000 +0100
@@ -622,12 +622,7 @@
      *  Allocate some space to hold the implementation.
      */
     mcode = (ItclMemberCode*)ckalloc(sizeof(ItclMemberCode));
-    mcode->flags        = 0;
-    mcode->argcount     = 0;
-    mcode->arglist      = NULL;
-    mcode->procPtr      = NULL;
-    mcode->cfunc.objCmd = NULL;
-    mcode->clientData   = NULL;
+    memset(mcode, 0, sizeof(ItclMemberCode));
 
     if (arglist) {
         if (Itcl_CreateArgList(interp, arglist, &argc, &args)
@@ -656,6 +651,7 @@
     procPtr->iPtr = (Interp*)interp;
     procPtr->refCount = 1;
     procPtr->cmdPtr = (Command*)ckalloc(sizeof(Command));
+    memset(procPtr->cmdPtr, 0, sizeof(Command));
     procPtr->cmdPtr->nsPtr = (Namespace*)cdefn->namesp;
 
     if (body) {



From kasal at fedoraproject.org  Mon Dec  7 17:01:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:01:20 +0000 (UTC)
Subject: rpms/perl-Object-MultiType/devel perl-Object-MultiType.spec, 1.3,
	1.4
Message-ID: <20091207170120.8738911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Object-MultiType/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14546

Modified Files:
	perl-Object-MultiType.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Object-MultiType.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Object-MultiType/devel/perl-Object-MultiType.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Object-MultiType.spec	26 Jul 2009 13:52:07 -0000	1.3
+++ perl-Object-MultiType.spec	7 Dec 2009 17:01:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Object-MultiType
 Version:        0.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl Objects as Hash, Array, Scalar, Code and Glob at the same time
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Mon Dec  7 17:03:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  7 Dec 2009 17:03:43 +0000 (UTC)
Subject: rpms/akonadi/devel .cvsignore, 1.16, 1.17 akonadi.spec, 1.48,
	1.49 sources, 1.17, 1.18
Message-ID: <20091207170343.2687811C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15793

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.80-1
- Akonadi 1.2.80
- restore mysql deps



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	24 Nov 2009 16:16:20 -0000	1.16
+++ .cvsignore	7 Dec 2009 17:03:42 -0000	1.17
@@ -1 +1 @@
-akonadi-1.2.61svn1052216.tar.bz2
+akonadi-1.2.80.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- akonadi.spec	24 Nov 2009 16:16:20 -0000	1.48
+++ akonadi.spec	7 Dec 2009 17:03:42 -0000	1.49
@@ -1,19 +1,14 @@
-%define alphatag svn1052216
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.2.61
-Release: 0.1.%{alphatag}%{?dist}
+Version: 1.2.80
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
-# Snapshot created with:
-# svn export -r 1052216 svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akonadi akonadi-1.2.61svn1052216
-# tar cjf akonadi-1.2.61svn1052216.tar.bz2 akonadi-1.2.61svn1052216
-Source0: akonadi-%{version}%{?alphatag}.tar.bz2
 # Official release
-#Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
+Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # shrink default initial db size a bit (approx 140mb->28mb)
@@ -25,8 +20,8 @@ Patch1: akonadi-1.1.1-mysql_conf.patch
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
 BuildRequires: automoc4
-#BuildRequires: mysql-devel
-#BuildRequires: mysql-server
+BuildRequires: mysql-devel
+BuildRequires: mysql-server
 # for xsltproc
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
@@ -35,9 +30,9 @@ BuildRequires: soprano-devel
 
 # when/if akonadi grows support for other backends, consider splitting
 # these similar to how phonon is done currently.
-#Requires: qt4-mysql
+Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
-#Requires: mysql-server
+Requires: mysql-server
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -125,6 +120,10 @@ fi
 
 
 %changelog
+* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.80-1
+- Akonadi 1.2.80
+- restore mysql deps
+
 * Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 1.2.61-0.1.svn1052261
 - Update to SVN snapshot of 1.2.61
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	24 Nov 2009 16:16:20 -0000	1.17
+++ sources	7 Dec 2009 17:03:42 -0000	1.18
@@ -1 +1 @@
-5a2b63aad04954991593c0e7fa8aeeb9  akonadi-1.2.61svn1052216.tar.bz2
+86efecca13035df77d2da534cbd0074e  akonadi-1.2.80.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec  7 17:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:03:48 +0000
Subject: [pkgdb] libvirt-cim had acl change status
Message-ID: <20091207170348.73D2410F881@bastion2.fedora.phx.redhat.com>

kaitlin has set the commit acl on libvirt-cim (Fedora devel) to Approved for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 17:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:03:49 +0000
Subject: [pkgdb] libvirt-cim had acl change status
Message-ID: <20091207170349.946DA10F891@bastion2.fedora.phx.redhat.com>

kaitlin has set the approveacls acl on libvirt-cim (Fedora devel) to Approved for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 17:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:03:56 +0000
Subject: [pkgdb] libvirt-cim had acl change status
Message-ID: <20091207170357.0298810F89A@bastion2.fedora.phx.redhat.com>

kaitlin has set the commit acl on libvirt-cim (Fedora 12) to Approved for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Mon Dec  7 17:03:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:03:58 +0000
Subject: [pkgdb] libvirt-cim had acl change status
Message-ID: <20091207170358.DCCA510F89E@bastion2.fedora.phx.redhat.com>

kaitlin has set the approveacls acl on libvirt-cim (Fedora 12) to Approved for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-cim



From kasal at fedoraproject.org  Mon Dec  7 17:05:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:05:10 +0000 (UTC)
Subject: rpms/perl-Hash-Merge/devel perl-Hash-Merge.spec,1.2,1.3
Message-ID: <20091207170510.5CFFF11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hash-Merge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16640

Modified Files:
	perl-Hash-Merge.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hash-Merge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Merge/devel/perl-Hash-Merge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Hash-Merge.spec	26 Jul 2009 06:37:48 -0000	1.2
+++ perl-Hash-Merge.spec	7 Dec 2009 17:05:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Hash-Merge
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Merges arbitrary deep hashes into a single hash
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -44,6 +44,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:05:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:05:51 +0000 (UTC)
Subject: rpms/perl-Object-InsideOut/devel perl-Object-InsideOut.spec, 1.14, 
	1.15
Message-ID: <20091207170551.4D69811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Object-InsideOut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17057

Modified Files:
	perl-Object-InsideOut.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Object-InsideOut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Object-InsideOut/devel/perl-Object-InsideOut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Object-InsideOut.spec	25 Aug 2009 06:30:47 -0000	1.14
+++ perl-Object-InsideOut.spec	7 Dec 2009 17:05:51 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Object-InsideOut
 Version:        3.56
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Comprehensive inside-out object support module
 
 Group:          Development/Libraries
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.56-2
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 3.56-1
 - auto-update to 3.56 (by cpan-spec-update 0.01)
 - altered br on perl(Scalar::Util) (1.19 => 1.21)



From rdieter at fedoraproject.org  Mon Dec  7 17:06:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  7 Dec 2009 17:06:08 +0000 (UTC)
Subject: rpms/akonadi/F-12 akonadi.spec,1.47,1.48
Message-ID: <20091207170608.4E32911C00EE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17283

Modified Files:
	akonadi.spec 
Log Message:
* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.1-2
- restore mysql-related dependencies



Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-12/akonadi.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- akonadi.spec	1 Sep 2009 12:20:21 -0000	1.47
+++ akonadi.spec	7 Dec 2009 17:06:08 -0000	1.48
@@ -2,7 +2,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -19,8 +19,8 @@ Patch1: akonadi-1.1.1-mysql_conf.patch
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
 BuildRequires: automoc4
-#BuildRequires: mysql-devel
-#BuildRequires: mysql-server
+BuildRequires: mysql-devel
+BuildRequires: mysql-server
 # for xsltproc
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
@@ -29,9 +29,9 @@ BuildRequires: soprano-devel
 
 # when/if akonadi grows support for other backends, consider splitting
 # these similar to how phonon is done currently.
-#Requires: qt4-mysql
+Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
-#Requires: mysql-server
+Requires: mysql-server
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -119,6 +119,9 @@ fi
 
 
 %changelog
+* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.1-2
+- restore mysql-related dependencies
+
 * Tue Sep  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 1.2.1-1
 - Akonadi 1.2.1
 



From kasal at fedoraproject.org  Mon Dec  7 17:07:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:07:43 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.197,1.198
Message-ID: <20091207170743.206D211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18025

Modified Files:
	net-snmp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- net-snmp.spec	3 Dec 2009 15:57:26 -0000	1.197
+++ net-snmp.spec	7 Dec 2009 17:07:42 -0000	1.198
@@ -10,7 +10,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: 5.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -401,6 +401,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:5.5-5
+- rebuild against perl 5.10.1
+
 * Wed Dec  2 2009 Jan Safranek <jsafrane at redhat.com> 1:5.5-4
 - fix udpTable indexes on big-endian systems (#543352)
 - fix snmptrapd init script to survive with empty /etc/sysconfig/snmptrapd



From kasal at fedoraproject.org  Mon Dec  7 17:09:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:09:14 +0000 (UTC)
Subject: rpms/perl-Hash-Flatten/devel perl-Hash-Flatten.spec,1.2,1.3
Message-ID: <20091207170914.A692D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hash-Flatten/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18843

Modified Files:
	perl-Hash-Flatten.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hash-Flatten.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Flatten/devel/perl-Hash-Flatten.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Hash-Flatten.spec	26 Jul 2009 06:37:33 -0000	1.2
+++ perl-Hash-Flatten.spec	7 Dec 2009 17:09:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Hash-Flatten
 Version:        1.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Flatten/unflatten complex data hashes
 License:        GPLv2
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.16-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rhughes at fedoraproject.org  Mon Dec  7 17:09:13 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 17:09:13 +0000 (UTC)
Subject: rpms/gnome-color-manager/F-12 gnome-color-manager.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091207170913.B1E4511C0401@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-color-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18766/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-color-manager.spec import.log 
Log Message:



--- NEW FILE gnome-color-manager.spec ---
%define gtk2_version                    2.16.0
%define dbus_glib_version               0.73
%define unique_version                  1.0.0

%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary:   Color management tools for GNOME
Name:      gnome-color-manager
Version:   2.29.1
Release:   1%{?dist}
License:   GPLv2+
Group:     Applications/System
URL:       http://projects.gnome.org/gnome-color-manager/
Source0:   http://download.gnome.org/sources/gnome-color-manager/2.29/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  gtk2 >= %{gtk2_version}
Requires:  gnome-icon-theme
Requires:  unique >= %{unique_version}
Requires:  shared-mime-info
Requires:  dbus-glib >= %{dbus_glib_version}
Requires:  dbus-x11
Requires:  vte
Requires:  argyllcms
Requires(post):   scrollkeeper
Requires(pre):    GConf2
Requires(post):   GConf2
Requires(preun):  GConf2
Requires(postun): scrollkeeper

BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: scrollkeeper
BuildRequires: gnome-doc-utils >= 0.3.2
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libtool
BuildRequires: vte-devel
BuildRequires: gnome-doc-utils
BuildRequires: unique-devel >= %{unique_version}
BuildRequires: intltool
BuildRequires: libgudev1-devel
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: libXxf86vm-devel
BuildRequires: libXrandr-devel
BuildRequires: gnome-desktop-devel

%description
gnome-color-manager is a session framework that makes it easy to manage, install
and generate color profiles in the GNOME desktop.

%prep
%setup -q

%build
%configure --disable-scrollkeeper --disable-schemas-install
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

for i in gcm-prefs gcm-import ; do
  desktop-file-install --delete-original                                \
    --dir=$RPM_BUILD_ROOT%{_datadir}/applications/                      \
    $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
done

%find_lang %name --with-gnome

%clean
rm -rf $RPM_BUILD_ROOT

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
        %{_sysconfdir}/gconf/schemas/gnome-color-manager.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 &> /dev/null || :
fi
update-desktop-database %{_datadir}/applications &> /dev/null || :
update-mime-database %{_datadir}/mime &> /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-color-manager.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-color-manager.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 &> /dev/null || :
fi
update-desktop-database %{_datadir}/applications &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/gcm-*
%dir %{_datadir}/gnome-color-manager
%dir %{_datadir}/gnome-color-manager/profiles
%{_datadir}/gnome-color-manager/profiles/*.ic?
%{_datadir}/gnome-color-manager/gcm-*.ui
%{_datadir}/man/man1/*.1.gz
%{_datadir}/gnome/help/gnome-color-manager
#%{_datadir}/omf/gnome-color-manager
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/*/*.svg*
%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
%{_datadir}/applications/gcm-prefs.desktop
%{_datadir}/applications/gcm-import.desktop
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/dbus-1/services/org.gnome.ColorManager.service

%changelog
* Fri Dec 04 2009 Richard Hughes <richard at hughsie.com> 2.29.1-1
- Initial spec for review.



--- NEW FILE import.log ---
gnome-color-manager-2_29_1-1_fc12:F-12:gnome-color-manager-2.29.1-1.fc12.src.rpm:1260204973


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Dec 2009 16:31:52 -0000	1.1
+++ .cvsignore	7 Dec 2009 17:09:12 -0000	1.2
@@ -0,0 +1 @@
+gnome-color-manager-2.29.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Dec 2009 16:31:53 -0000	1.1
+++ sources	7 Dec 2009 17:09:13 -0000	1.2
@@ -0,0 +1 @@
+ba6a996f19c3826f0f72bfb3f766b288  gnome-color-manager-2.29.1.tar.gz



From pkgdb at fedoraproject.org  Mon Dec  7 17:10:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:10:22 +0000
Subject: [pkgdb] libcmpiutil had acl change status
Message-ID: <20091207171022.3412610F881@bastion2.fedora.phx.redhat.com>

kaitlin has set the commit acl on libcmpiutil (Fedora devel) to Approved for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:10:26 +0000
Subject: [pkgdb] libcmpiutil had acl change status
Message-ID: <20091207171026.2FB9210F891@bastion2.fedora.phx.redhat.com>

kaitlin has set the approveacls acl on libcmpiutil (Fedora devel) to Approved for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:10:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:10:34 +0000
Subject: [pkgdb] libcmpiutil had acl change status
Message-ID: <20091207171034.D68B810F89C@bastion2.fedora.phx.redhat.com>

kaitlin has set the commit acl on libcmpiutil (Fedora 12) to Approved for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:10:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:10:36 +0000
Subject: [pkgdb] libcmpiutil had acl change status
Message-ID: <20091207171036.6A1B610F8A6@bastion2.fedora.phx.redhat.com>

kaitlin has set the approveacls acl on libcmpiutil (Fedora 12) to Approved for veillard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcmpiutil



From nb at fedoraproject.org  Mon Dec  7 17:11:01 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  7 Dec 2009 17:11:01 +0000 (UTC)
Subject: rpms/znc/EL-5 .cvsignore,1.7,1.8 sources,1.7,1.8 znc.spec,1.9,1.10
Message-ID: <20091207171101.B978011C03FC@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19940

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
update to svn1672


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Sep 2009 06:14:57 -0000	1.7
+++ .cvsignore	7 Dec 2009 17:11:01 -0000	1.8
@@ -1 +1 @@
-znc-0.076.tar.gz
+znc-0.077-1.svn1672.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Sep 2009 06:14:57 -0000	1.7
+++ sources	7 Dec 2009 17:11:01 -0000	1.8
@@ -1 +1 @@
-03c2804b91225e83884f06078f6db568  znc-0.076.tar.gz
+7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/znc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- znc.spec	25 Sep 2009 06:14:57 -0000	1.9
+++ znc.spec	7 Dec 2009 17:11:01 -0000	1.10
@@ -1,11 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.076
-Release:	2%{?dist}
+Version:        0.077
+Release:        1.svn1672%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
+# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
+# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
+Source0:        znc-0.077-1.svn1672.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -41,7 +44,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q
+%setup -q -n znc-0.077-1.svn1672
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -60,7 +63,7 @@ chmod -x modules/q.cpp
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
+%doc AUTHORS LICENSE LICENSE.OpenSSL README
 %{_bindir}/znc
 %{_mandir}/man1/*
 #%{_libdir}/znc/
@@ -112,7 +115,7 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/antiidle.so
 %{_libdir}/znc/autovoice.so
 %{_libdir}/znc/blockuser.so
-%{_libdir}/znc/connect_throttle.so
+#%{_libdir}/znc/connect_throttle.so
 %{_libdir}/znc/ctcpflood.so
 %{_libdir}/znc/discon_kick.so
 %{_libdir}/znc/droproot.so
@@ -125,6 +128,36 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/send_raw.so
 
 %changelog
+
+* Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
+- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
+- Users cloned via the admin module no longer automatically connect into IRC. (r1653)
+- Inform new clients about their /away status. (r1655)
+- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660)
+- Rewrite znc.conf on SIGUSR1. (r1666)
+- ISpoofFormat now supports ExpandString. (r1670) 
+- Allow specifing port and password for delserver. (r1640)
+- Write the config file on restart and shutdown. (r1641)
+- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645)
+- blockuser was missing an admin check. (r1648)
+- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659)
+- Include a more portable header for uint32_t in SHA256.h. (r1665)
+- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668)
+- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669)
+- Away allowed to accidentally execute IRC commands. (r1672) 
+- Comment out some weird code in Client.cpp. (r1646)
+- Remove connect_throttle since it's obsoleted by fail2ban. (r1649)
+- Remove outdated sample znc.conf. (r1654)
+- route_replies now got a higher timeout before it generates a "BUG" message. (r1657)
+- Documented the signals on which znc reacts better. (r1667) 
+- New module hook OnIRCConnecting(). (r1638)
+- Remove obsolete CUtils::GetHashPass(). (r1642)
+- A module's GetDescription() now returns a C-String. (r1661) (r1662)
+- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) 
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.076-3
+- rebuild against perl 5.10.1
+
 * Fri Sep 25 2009 Nick Bebout <nb at fedoraproject.org> - 0.076-2
 - Fix missing dist tag
 



From kasal at fedoraproject.org  Mon Dec  7 17:10:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:10:49 +0000 (UTC)
Subject: rpms/perl-Object-Event/devel perl-Object-Event.spec,1.3,1.4
Message-ID: <20091207171049.E2D7C11C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Object-Event/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19740

Modified Files:
	perl-Object-Event.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Object-Event.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Object-Event/devel/perl-Object-Event.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Object-Event.spec	26 Jul 2009 13:51:33 -0000	1.3
+++ perl-Object-Event.spec	7 Dec 2009 17:10:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Object-Event
 Version:        0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Class that provides an event callback interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.7-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From leigh123linux at fedoraproject.org  Mon Dec  7 17:11:10 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon,  7 Dec 2009 17:11:10 +0000 (UTC)
Subject: File qbittorrent-3054svn.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091207171110.2A00210F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qbittorrent:

f71327536366695a160b46313b297990  qbittorrent-3054svn.tar.gz



From rhughes at fedoraproject.org  Mon Dec  7 17:11:51 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  7 Dec 2009 17:11:51 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12 .cvsignore, 1.70,
	1.71 gnome-power-manager.spec, 1.183, 1.184 sources, 1.71, 1.72
Message-ID: <20091207171151.9192611C00EE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20318

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-1
- Update to 2.28.2
- Translation updates



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	19 Oct 2009 10:32:07 -0000	1.70
+++ .cvsignore	7 Dec 2009 17:11:51 -0000	1.71
@@ -1 +1 @@
-gnome-power-manager-2.28.1.tar.bz2
+gnome-power-manager-2.28.2.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- gnome-power-manager.spec	29 Oct 2009 11:19:55 -0000	1.183
+++ gnome-power-manager.spec	7 Dec 2009 17:11:51 -0000	1.184
@@ -4,12 +4,12 @@
 
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.28.1
-Release: 5%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz
 #Source:   http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -196,6 +196,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+- Translation updates
+
 * Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
 - Fix OSD showing a volume label when switching compositing off
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	19 Oct 2009 10:32:07 -0000	1.71
+++ sources	7 Dec 2009 17:11:51 -0000	1.72
@@ -1 +1 @@
-552945dd50671cdf9cd11ba4bd544bfa  gnome-power-manager-2.28.1.tar.bz2
+032a9093a211dbfb57a5f7b41cf00ae0  gnome-power-manager-2.28.2.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 17:13:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:13:25 +0000 (UTC)
Subject: rpms/perl-Hash-Case/devel perl-Hash-Case.spec,1.6,1.7
Message-ID: <20091207171325.BFA8C11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hash-Case/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21186

Modified Files:
	perl-Hash-Case.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hash-Case.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hash-Case/devel/perl-Hash-Case.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Hash-Case.spec	26 Jul 2009 06:37:18 -0000	1.6
+++ perl-Hash-Case.spec	7 Dec 2009 17:13:25 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Hash-Case
 Version:        1.006
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Base class for hashes with key-casing requirements
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.006-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.006-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From leigh123linux at fedoraproject.org  Mon Dec  7 17:14:08 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon,  7 Dec 2009 17:14:08 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.29, 1.30 qbittorrent.spec, 1.52,
	1.53 sources, 1.29, 1.30
Message-ID: <20091207171408.941EA11C00EE@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21627

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.11.svn3054
- update to svn 3054
- add Br: libnotify-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	6 Dec 2009 11:28:58 -0000	1.29
+++ .cvsignore	7 Dec 2009 17:14:08 -0000	1.30
@@ -1 +1 @@
-qbittorrent-3043svn.tar.gz
+qbittorrent-3054svn.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- qbittorrent.spec	6 Dec 2009 11:28:58 -0000	1.52
+++ qbittorrent.spec	7 Dec 2009 17:14:08 -0000	1.53
@@ -1,9 +1,9 @@
-%define svn_rev 3043
+%define svn_rev 3054
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.0.0
-Release: 0.10.svn%{svn_rev}%{?dist}
+Release: 0.11.svn%{svn_rev}%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -23,6 +23,7 @@ BuildRequires: boost-devel
 BuildRequires: asio-devel
 BuildRequires: rb_libtorrent-devel >= 0.14.4
 BuildRequires: glib2-devel
+BuildRequires: libnotify-devel
 
 Requires: qt4 >= %{_qt4_version}
 
@@ -75,6 +76,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.11.svn3054
+- update to svn 3054
+- add Br: libnotify-devel
+
 * Sun Dec 06 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.10.svn3043
 - update to svn 3043
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	6 Dec 2009 11:28:58 -0000	1.29
+++ sources	7 Dec 2009 17:14:08 -0000	1.30
@@ -1 +1 @@
-68f604bc9b978a183166decfa90927ce  qbittorrent-3043svn.tar.gz
+f71327536366695a160b46313b297990  qbittorrent-3054svn.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 17:15:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:15:35 +0000 (UTC)
Subject: rpms/perl-Object-Deadly/devel perl-Object-Deadly.spec,1.4,1.5
Message-ID: <20091207171535.B417311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Object-Deadly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22436

Modified Files:
	perl-Object-Deadly.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Object-Deadly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Object-Deadly/devel/perl-Object-Deadly.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Object-Deadly.spec	26 Jul 2009 13:51:20 -0000	1.4
+++ perl-Object-Deadly.spec	7 Dec 2009 17:15:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Object-Deadly
 Version:        0.09
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl module providing an object that dies whenever examined
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:16:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:16:57 +0000 (UTC)
Subject: rpms/netcdf-perl/devel netcdf-perl.spec,1.10,1.11
Message-ID: <20091207171657.195CC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/netcdf-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23177

Modified Files:
	netcdf-perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: netcdf-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf-perl/devel/netcdf-perl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- netcdf-perl.spec	12 Nov 2009 16:47:19 -0000	1.10
+++ netcdf-perl.spec	7 Dec 2009 17:16:56 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           netcdf-perl
 Version:        1.2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension module for scientific data access via the netCDF API
 
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2.4-4
+- rebuild against perl 5.10.1
+
 * Thu Nov 11 2009 Orion Poplawski <orion at cora.nwra.com> - 1.2.4-3
 - Rebuild for netcdf 4.1.0
 



From pkgdb at fedoraproject.org  Mon Dec  7 17:17:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:17:56 +0000
Subject: [pkgdb] munin: ingvar has given up watchcommits
Message-ID: <20091207171756.9801D10F892@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchcommits acl on munin (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:17:59 +0000
Subject: [pkgdb] munin: ingvar has requested commit
Message-ID: <20091207171759.1ECA410F8A3@bastion2.fedora.phx.redhat.com>

ingvar has requested the commit acl on munin (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:06 +0000
Subject: [pkgdb] munin: ingvar has given up watchcommits
Message-ID: <20091207171807.86CDC10F801@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchcommits acl on munin (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From kasal at fedoraproject.org  Mon Dec  7 17:18:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:18:07 +0000 (UTC)
Subject: rpms/perl-Hardware-Vhdl-Tidy/devel perl-Hardware-Vhdl-Tidy.spec, 1.4,
	1.5
Message-ID: <20091207171807.98DD411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23727

Modified Files:
	perl-Hardware-Vhdl-Tidy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hardware-Vhdl-Tidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/devel/perl-Hardware-Vhdl-Tidy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Hardware-Vhdl-Tidy.spec	26 Jul 2009 06:37:03 -0000	1.4
+++ perl-Hardware-Vhdl-Tidy.spec	7 Dec 2009 17:18:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Hardware-Vhdl-Tidy
 Version:        0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        VHDL code prettifier
 
 License:        GPL+ or Artistic
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.8-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:08 +0000
Subject: [pkgdb] munin: ingvar has requested commit
Message-ID: <20091207171808.E390510F8AB@bastion2.fedora.phx.redhat.com>

ingvar has requested the commit acl on munin (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:11 +0000
Subject: [pkgdb] munin: ingvar has given up watchcommits
Message-ID: <20091207171811.8A6C310F8B1@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchcommits acl on munin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:14 +0000
Subject: [pkgdb] munin: ingvar has requested commit
Message-ID: <20091207171814.43FBF10F8B5@bastion2.fedora.phx.redhat.com>

ingvar has requested the commit acl on munin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:20 +0000
Subject: [pkgdb] munin: ingvar has given up watchbugzilla
Message-ID: <20091207171821.1D24210F8B6@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchbugzilla acl on munin (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:22 +0000
Subject: [pkgdb] munin: ingvar has given up watchbugzilla
Message-ID: <20091207171822.26FE410F8BB@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchbugzilla acl on munin (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:23 +0000
Subject: [pkgdb] munin: ingvar has given up watchbugzilla
Message-ID: <20091207171823.7F56010F8BF@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchbugzilla acl on munin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:28 +0000
Subject: [pkgdb] munin: ingvar has given up watchbugzilla
Message-ID: <20091207171828.95B5610F89F@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchbugzilla acl on munin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:29 +0000
Subject: [pkgdb] munin: ingvar has given up watchcommits
Message-ID: <20091207171829.8310510F8C2@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchcommits acl on munin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:30 +0000
Subject: [pkgdb] munin: ingvar has requested commit
Message-ID: <20091207171830.E5CE510F8C6@bastion2.fedora.phx.redhat.com>

ingvar has requested the commit acl on munin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:35 +0000
Subject: [pkgdb] munin: ingvar has given up watchbugzilla
Message-ID: <20091207171835.8CF0610F8C9@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchbugzilla acl on munin (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:36 +0000
Subject: [pkgdb] munin: ingvar has given up watchcommits
Message-ID: <20091207171836.76F8410F8A3@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchcommits acl on munin (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:18:37 +0000
Subject: [pkgdb] munin: ingvar has requested commit
Message-ID: <20091207171837.A409B10F8CD@bastion2.fedora.phx.redhat.com>

ingvar has requested the commit acl on munin (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From than at fedoraproject.org  Mon Dec  7 17:19:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 17:19:14 +0000 (UTC)
Subject: rpms/efax/F-12 efax.spec,1.27,1.28
Message-ID: <20091207171914.EB63A11C00EE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/efax/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24218

Modified Files:
	efax.spec 
Log Message:
fix url



Index: efax.spec
===================================================================
RCS file: /cvs/extras/rpms/efax/F-12/efax.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- efax.spec	7 Sep 2009 14:00:31 -0000	1.27
+++ efax.spec	7 Dec 2009 17:19:14 -0000	1.28
@@ -1,11 +1,11 @@
 Summary: A program for faxing using a Class 1, 2 or 2.0 fax modem.
 Name: efax
 Version: 0.9a
-Release: 6.001114%{?dist}
+Release: 7.001114%{?dist}
 License: GPLv2+
 Group: Applications/Communications
 Url: http://www.cce.com/efax/
-Source: http://metalab.unc.edu/pub/Linux/apps/serialcomm/fax/%{name}-%{version}-001114.tar.gz
+Source: http://www.cce.com/efax/download/%{name}-%{version}-001114.tar.gz
 Patch0: efax-0.9-config.patch
 Patch1: efax-0.9-numlines.patch
 Patch2: efax08a-time.patch
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %dir %{_localstatedir}/log/fax
 
 %changelog
+* Mon Dec 07 2009 Than Ngo <than at redhat.com> - 0.9a-7.001114
+- fix url
+
 * Mon Sep 07 2009 Than Ngo <than at redhat.com> - 0.9a-6.001114
 - fix a crash in efix
 



From kasal at fedoraproject.org  Mon Dec  7 17:20:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:20:07 +0000 (UTC)
Subject: rpms/perl-Number-Format/devel perl-Number-Format.spec,1.4,1.5
Message-ID: <20091207172007.A2E8011C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Number-Format/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24759

Modified Files:
	perl-Number-Format.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Number-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/devel/perl-Number-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Number-Format.spec	5 Oct 2009 15:49:44 -0000	1.4
+++ perl-Number-Format.spec	7 Dec 2009 17:20:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Number-Format
 Version:        1.73
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for formatting numbers
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.73-2
+- rebuild against perl 5.10.1
+
 * Mon Oct 05 2009 Iain Arnell <iarnell at gmail.com> 1.73-1
 - update to latest upstream
 



From than at fedoraproject.org  Mon Dec  7 17:20:44 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  7 Dec 2009 17:20:44 +0000 (UTC)
Subject: rpms/efax/devel efax.spec,1.27,1.28
Message-ID: <20091207172044.5E90C11C03E3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/efax/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25090

Modified Files:
	efax.spec 
Log Message:
fix url



Index: efax.spec
===================================================================
RCS file: /cvs/extras/rpms/efax/devel/efax.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- efax.spec	7 Sep 2009 14:00:31 -0000	1.27
+++ efax.spec	7 Dec 2009 17:20:44 -0000	1.28
@@ -1,11 +1,11 @@
 Summary: A program for faxing using a Class 1, 2 or 2.0 fax modem.
 Name: efax
 Version: 0.9a
-Release: 6.001114%{?dist}
+Release: 7.001114%{?dist}
 License: GPLv2+
 Group: Applications/Communications
 Url: http://www.cce.com/efax/
-Source: http://metalab.unc.edu/pub/Linux/apps/serialcomm/fax/%{name}-%{version}-001114.tar.gz
+Source: http://www.cce.com/efax/download/%{name}-%{version}-001114.tar.gz
 Patch0: efax-0.9-config.patch
 Patch1: efax-0.9-numlines.patch
 Patch2: efax08a-time.patch
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %dir %{_localstatedir}/log/fax
 
 %changelog
+* Mon Dec 07 2009 Than Ngo <than at redhat.com> - 0.9a-7.001114
+- fix url
+
 * Mon Sep 07 2009 Than Ngo <than at redhat.com> - 0.9a-6.001114
 - fix a crash in efix
 



From kasal at fedoraproject.org  Mon Dec  7 17:22:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:22:34 +0000 (UTC)
Subject: rpms/NaturalDocs/devel NaturalDocs.spec,1.3,1.4
Message-ID: <20091207172234.30C4B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/NaturalDocs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25949

Modified Files:
	NaturalDocs.spec 
Log Message:
- rebuild against perl 5.10.1


Index: NaturalDocs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NaturalDocs/devel/NaturalDocs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- NaturalDocs.spec	24 Jul 2009 15:39:53 -0000	1.3
+++ NaturalDocs.spec	7 Dec 2009 17:22:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           NaturalDocs
 Version:        1.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Documentation generator for multiple programming languages
 
 Group:          Development/Tools
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4-5
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:22:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:22:32 +0000 (UTC)
Subject: rpms/perl-Hardware-Vhdl-Parser/devel perl-Hardware-Vhdl-Parser.spec,
	1.3, 1.4
Message-ID: <20091207172232.0C93611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hardware-Vhdl-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25863

Modified Files:
	perl-Hardware-Vhdl-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hardware-Vhdl-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Parser/devel/perl-Hardware-Vhdl-Parser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Hardware-Vhdl-Parser.spec	26 Jul 2009 06:36:47 -0000	1.3
+++ perl-Hardware-Vhdl-Parser.spec	7 Dec 2009 17:22:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Hardware-Vhdl-Parser
 Version:        0.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Complete grammar for parsing VHDL code using perl
 
 License:        GPL+ or Artistic
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:24:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:24:07 +0000 (UTC)
Subject: rpms/perl-Number-Compare/devel perl-Number-Compare.spec,1.12,1.13
Message-ID: <20091207172407.C38AA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Number-Compare/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26729

Modified Files:
	perl-Number-Compare.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Number-Compare.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Compare/devel/perl-Number-Compare.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Number-Compare.spec	26 Jul 2009 13:50:00 -0000	1.12
+++ perl-Number-Compare.spec	7 Dec 2009 17:24:07 -0000	1.13
@@ -1,6 +1,6 @@
 Name: 		perl-Number-Compare
 Version: 	0.01
-Release: 	12%{?dist}
+Release: 	13%{?dist}
 Summary: 	Perl module for numeric comparisons
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -48,6 +48,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-13
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kevin at fedoraproject.org  Mon Dec  7 17:24:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  7 Dec 2009 17:24:15 +0000 (UTC)
Subject: rpms/twinkle/devel twinkle-1.4.2-fedora-talk.patch, NONE,
	1.1 twinkle.spec, 1.23, 1.24
Message-ID: <20091207172415.66ADD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26802

Modified Files:
	twinkle.spec 
Added Files:
	twinkle-1.4.2-fedora-talk.patch 
Log Message:
Add patch for Fedora talk in the providers list - bug 530629


twinkle-1.4.2-fedora-talk.patch:
 providers.csv |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE twinkle-1.4.2-fedora-talk.patch ---
diff -Nur twinkle-1.4.2.orig/data/providers.csv twinkle-1.4.2/data/providers.csv
--- twinkle-1.4.2.orig/data/providers.csv	2006-09-18 14:12:56.000000000 -0600
+++ twinkle-1.4.2/data/providers.csv	2009-11-08 19:39:16.000000000 -0700
@@ -4,3 +4,5 @@
 sipgate.co.uk;sipgate.co.uk;;sipgate.co.uk
 sipgate.de;sipgate.de;;sipgate.de
 SIPphone!;proxy01.sipphone.com;;stun01.sipphone.com
+# fedora talk
+Fedora Talk;talk.fedoraproject.org;;


Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- twinkle.spec	27 Jul 2009 06:24:18 -0000	1.23
+++ twinkle.spec	7 Dec 2009 17:24:15 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        1.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
 Patch0:         twinkle-1.1-msg.patch
+Patch1:         twinkle-1.4.2-fedora-talk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -36,6 +37,7 @@ Twinkle is a SIP based soft phone for ma
 %prep
 %setup -q
 %patch0 -p1 -b .msg
+%patch1 -p1 -b .ftalk
 
 %build
 %configure
@@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Nov 23 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.2-4
+- Add patch for Fedora talk in the providers list - bug 530629
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:26:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:26:58 +0000 (UTC)
Subject: rpms/nagios/devel nagios.spec,1.74,1.75
Message-ID: <20091207172658.BE01E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28128

Modified Files:
	nagios.spec 
Log Message:
- rebuild against perl 5.10.1


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- nagios.spec	17 Aug 2009 14:42:23 -0000	1.74
+++ nagios.spec	7 Dec 2009 17:26:58 -0000	1.75
@@ -1,7 +1,7 @@
 Name: nagios
 
 Version: 3.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -204,6 +204,9 @@ fi
 %{_includedir}/%{name}
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.2.0-3
+- rebuild against perl 5.10.1
+
 * Mon Aug 17 2009 Mike McGrath <mmcgrath at redhat.com> - 3.2.0-2
 - s/datarootdir/datadir/
 



From kasal at fedoraproject.org  Mon Dec  7 17:27:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:27:46 +0000 (UTC)
Subject: rpms/perl-Hardware-Vhdl-Lexer/devel perl-Hardware-Vhdl-Lexer.spec,
	1.3, 1.4
Message-ID: <20091207172746.4486711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hardware-Vhdl-Lexer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28627

Modified Files:
	perl-Hardware-Vhdl-Lexer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hardware-Vhdl-Lexer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Lexer/devel/perl-Hardware-Vhdl-Lexer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Hardware-Vhdl-Lexer.spec	26 Jul 2009 06:36:33 -0000	1.3
+++ perl-Hardware-Vhdl-Lexer.spec	7 Dec 2009 17:27:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Hardware-Vhdl-Lexer
 Version:        1.00
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Split VHDL code into lexical tokens
 License:        GPL+ or Artistic
 
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.00-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:28:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:28:11 +0000 (UTC)
Subject: rpms/perl-NOCpulse-Utils/devel perl-NOCpulse-Utils.spec,1.3,1.4
Message-ID: <20091207172811.A9D0311C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-NOCpulse-Utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28907

Modified Files:
	perl-NOCpulse-Utils.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-NOCpulse-Utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NOCpulse-Utils/devel/perl-NOCpulse-Utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-NOCpulse-Utils.spec	26 Jul 2009 11:36:16 -0000	1.3
+++ perl-NOCpulse-Utils.spec	7 Dec 2009 17:28:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         perl-NOCpulse-Utils
 Version:      1.14.11
-Release:      3%{?dist}
+Release:      4%{?dist}
 Summary:      NOCpulse utility packages
 URL:          https://fedorahosted.org/spacewalk
 Source0:      https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3/
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.14.11-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 17:29:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:29:55 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20091207172955.5494010F801@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora EPEL 4) to Approved for ingvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:29:59 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20091207172959.6620D10F89A@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora EPEL 5) to Approved for ingvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:30:06 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20091207173007.0CA9210F89D@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora 10) to Approved for ingvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:30:09 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20091207173009.8571510F8A4@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora 11) to Approved for ingvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From chwang at fedoraproject.org  Mon Dec  7 17:30:17 2009
From: chwang at fedoraproject.org (Charley Wang)
Date: Mon,  7 Dec 2009 17:30:17 +0000 (UTC)
Subject: rpms/eclipse-callgraph/devel eclipse-callgraph.spec,1.3,1.4
Message-ID: <20091207173017.1D6E811C03FC@cvs1.fedora.phx.redhat.com>

Author: chwang

Update of /cvs/pkgs/rpms/eclipse-callgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29920

Modified Files:
	eclipse-callgraph.spec 
Log Message:
Add punctuation to changelog, test connection


Index: eclipse-callgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-callgraph/devel/eclipse-callgraph.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eclipse-callgraph.spec	23 Nov 2009 20:34:52 -0000	1.3
+++ eclipse-callgraph.spec	7 Dec 2009 17:30:16 -0000	1.4
@@ -56,16 +56,16 @@ install -d -m 755 %{buildroot}%{install_
 
 %changelog
 * Mon Nov 23 2009 Charley Wang <chwang at redhat.com> 0.4.0-1
-- Update to version 0.4 of Linux Tools Project and remove tests feature
+- Update to version 0.4 of Linux Tools Project and remove tests feature.
 
 * Fri Sep 25 2009 Charley Wang <chwang at redhat.com> 0.0.1-3
-- Added ExcludeArch for ppc64 because eclipse-cdt is not present
+- Added ExcludeArch for ppc64 because eclipse-cdt is not present.
 
 * Thu Sep 24 2009 Roland Grunberg <rgrunber at redhat.com> 0.0.1-2
-- Some more changes to spec file
+- Some more changes to spec file.
 
 * Thu Sep 24 2009 Charley Wang <chwang at redhat.com> 0.0.1-1
-- Make minor changes to spec file
+- Make minor changes to spec file.
 
 * Thu Sep 24 2009 Charley Wang <chwang at redhat.com> 0.0.1-1
-- Initial creation of eclipse-callgraph
+- Initial creation of eclipse-callgraph.



From pkgdb at fedoraproject.org  Mon Dec  7 17:30:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:30:14 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20091207173014.4FA6710F890@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora 12) to Approved for ingvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From kasal at fedoraproject.org  Mon Dec  7 17:32:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:32:30 +0000 (UTC)
Subject: rpms/MySQL-zrm/devel MySQL-zrm.spec,1.2,1.3
Message-ID: <20091207173230.D6EE411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/MySQL-zrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30937

Modified Files:
	MySQL-zrm.spec 
Log Message:
- rebuild against perl 5.10.1


Index: MySQL-zrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/devel/MySQL-zrm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- MySQL-zrm.spec	12 Oct 2009 10:09:09 -0000	1.2
+++ MySQL-zrm.spec	7 Dec 2009 17:32:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		MySQL-zrm
 Version:	2.1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	MySQL backup manager
 
 Group:		Applications/System
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.1.1-6
+- rebuild against perl 5.10.1
+
 * Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
 - replaced _datarootdir for _datadir
 



From kasal at fedoraproject.org  Mon Dec  7 17:32:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:32:38 +0000 (UTC)
Subject: rpms/perl-NOCpulse-SetID/devel perl-NOCpulse-SetID.spec,1.3,1.4
Message-ID: <20091207173238.10ABC11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-NOCpulse-SetID/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31024

Modified Files:
	perl-NOCpulse-SetID.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-NOCpulse-SetID.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NOCpulse-SetID/devel/perl-NOCpulse-SetID.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-NOCpulse-SetID.spec	26 Jul 2009 11:36:02 -0000	1.3
+++ perl-NOCpulse-SetID.spec	7 Dec 2009 17:32:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         perl-NOCpulse-SetID
 Version:      1.6.9
-Release:      3%{?dist}
+Release:      4%{?dist}
 Summary:      Provides api for correctly changing user identity
 URL:          https://fedorahosted.org/spacewalk
 Source0:      https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.6.9-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:32:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:32:48 +0000 (UTC)
Subject: rpms/perl-Hardware-Verilog-Parser/devel
	perl-Hardware-Verilog-Parser.spec, 1.3, 1.4
Message-ID: <20091207173248.006FB11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Hardware-Verilog-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31256

Modified Files:
	perl-Hardware-Verilog-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Hardware-Verilog-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Verilog-Parser/devel/perl-Hardware-Verilog-Parser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Hardware-Verilog-Parser.spec	26 Jul 2009 06:36:17 -0000	1.3
+++ perl-Hardware-Verilog-Parser.spec	7 Dec 2009 17:32:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Hardware-Verilog-Parser
 Version:        0.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Complete grammar for parsing Verilog code using perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 17:35:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:35:42 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has given up watchbugzilla
Message-ID: <20091207173542.4B18210F88C@bastion2.fedora.phx.redhat.com>

sdz has given up the watchbugzilla acl on zikula-module-filterutil (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:35:43 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has given up watchcommits
Message-ID: <20091207173543.6638B10F89C@bastion2.fedora.phx.redhat.com>

sdz has given up the watchcommits acl on zikula-module-filterutil (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:35:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:35:45 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has requested commit
Message-ID: <20091207173545.4B4D710F8A2@bastion2.fedora.phx.redhat.com>

sdz has requested the commit acl on zikula-module-filterutil (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:35:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:35:46 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has requested approveacls
Message-ID: <20091207173547.7C10B10F8A9@bastion2.fedora.phx.redhat.com>

sdz has requested the approveacls acl on zikula-module-filterutil (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:35:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:35:49 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has given up watchbugzilla
Message-ID: <20091207173549.C9EAD10F8B0@bastion2.fedora.phx.redhat.com>

sdz has given up the watchbugzilla acl on zikula-module-filterutil (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:35:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:35:50 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has given up watchcommits
Message-ID: <20091207173550.2FBA810F8B5@bastion2.fedora.phx.redhat.com>

sdz has given up the watchcommits acl on zikula-module-filterutil (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:35:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:35:52 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has requested commit
Message-ID: <20091207173552.8798710F8BA@bastion2.fedora.phx.redhat.com>

sdz has requested the commit acl on zikula-module-filterutil (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:35:58 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has requested approveacls
Message-ID: <20091207173558.767C310F8BF@bastion2.fedora.phx.redhat.com>

sdz has requested the approveacls acl on zikula-module-filterutil (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:36:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:36:07 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has given up watchbugzilla
Message-ID: <20091207173607.485C110F8C1@bastion2.fedora.phx.redhat.com>

sdz has given up the watchbugzilla acl on zikula-module-filterutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:36:09 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has requested commit
Message-ID: <20091207173609.4AF5410F8C6@bastion2.fedora.phx.redhat.com>

sdz has requested the commit acl on zikula-module-filterutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:36:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:36:12 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has given up watchcommits
Message-ID: <20091207173613.0707B10F8CB@bastion2.fedora.phx.redhat.com>

sdz has given up the watchcommits acl on zikula-module-filterutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:36:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:36:14 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has requested approveacls
Message-ID: <20091207173614.7C7CD10F8D0@bastion2.fedora.phx.redhat.com>

sdz has requested the approveacls acl on zikula-module-filterutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:36:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:36:18 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has given up watchbugzilla
Message-ID: <20091207173618.403E410F89C@bastion2.fedora.phx.redhat.com>

sdz has given up the watchbugzilla acl on zikula-module-filterutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:36:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:36:19 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has requested commit
Message-ID: <20091207173619.1449D10F8D5@bastion2.fedora.phx.redhat.com>

sdz has requested the commit acl on zikula-module-filterutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 17:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:36:21 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has given up watchcommits
Message-ID: <20091207173621.24B6D10F8DA@bastion2.fedora.phx.redhat.com>

sdz has given up the watchcommits acl on zikula-module-filterutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From leigh123linux at fedoraproject.org  Mon Dec  7 17:36:27 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon,  7 Dec 2009 17:36:27 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.53,1.54
Message-ID: <20091207173627.D87CB11C00EE@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv616

Modified Files:
	qbittorrent.spec 
Log Message:
* Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.12.svn3054
- change requires qt4



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- qbittorrent.spec	7 Dec 2009 17:14:08 -0000	1.53
+++ qbittorrent.spec	7 Dec 2009 17:36:27 -0000	1.54
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.0.0
-Release: 0.11.svn%{svn_rev}%{?dist}
+Release: 0.12.svn%{svn_rev}%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -25,7 +25,7 @@ BuildRequires: rb_libtorrent-devel >= 0.
 BuildRequires: glib2-devel
 BuildRequires: libnotify-devel
 
-Requires: qt4 >= %{_qt4_version}
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 
 %description
 A Bittorrent client using rb_libtorrent and a Qt4 Graphical User Interface.
@@ -76,6 +76,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.12.svn3054
+- change requires qt4
+
 * Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.11.svn3054
 - update to svn 3054
 - add Br: libnotify-devel



From pkgdb at fedoraproject.org  Mon Dec  7 17:36:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:36:22 +0000
Subject: [pkgdb] zikula-module-filterutil: sdz has requested approveacls
Message-ID: <20091207173622.9535910F8E0@bastion2.fedora.phx.redhat.com>

sdz has requested the approveacls acl on zikula-module-filterutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From kasal at fedoraproject.org  Mon Dec  7 17:36:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:36:31 +0000 (UTC)
Subject: rpms/perl-NOCpulse-Object/devel perl-NOCpulse-Object.spec,1.3,1.4
Message-ID: <20091207173631.BDFCE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-NOCpulse-Object/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv683

Modified Files:
	perl-NOCpulse-Object.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-NOCpulse-Object.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NOCpulse-Object/devel/perl-NOCpulse-Object.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-NOCpulse-Object.spec	26 Jul 2009 11:35:46 -0000	1.3
+++ perl-NOCpulse-Object.spec	7 Dec 2009 17:36:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         perl-NOCpulse-Object
 Version:      1.26.10
-Release:      3%{?dist}
+Release:      4%{?dist}
 Summary:      NOCpulse Object abstraction for Perl
 URL:          https://fedorahosted.org/spacewalk
 Source0:      https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.26.10-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Mon Dec  7 17:37:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  7 Dec 2009 17:37:49 +0000 (UTC)
Subject: rpms/system-config-printer/F-11 system-config-printer.spec, 1.312, 
	1.313
Message-ID: <20091207173749.B41F211C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1507

Modified Files:
	system-config-printer.spec 
Log Message:
* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
- Fixed traceback when troubleshooter operation is cancelled (bug #544356).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- system-config-printer.spec	7 Dec 2009 15:00:39 -0000	1.312
+++ system-config-printer.spec	7 Dec 2009 17:37:49 -0000	1.313
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -173,7 +173,7 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-4
+* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
 - Fixed traceback when troubleshooter operation is cancelled (bug #544356).
 
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3



From twaugh at fedoraproject.org  Mon Dec  7 17:37:53 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  7 Dec 2009 17:37:53 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-troubleshooter-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.322, 1.323
Message-ID: <20091207173753.1A6AB11C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1560

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-troubleshooter-traceback.patch 
Log Message:
* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
- Fixed traceback when troubleshooter operation is cancelled (bug #544356).


system-config-printer-troubleshooter-traceback.patch:
 __init__.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-troubleshooter-traceback.patch ---
diff -up system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback system-config-printer-1.1.15/troubleshoot/__init__.py
--- system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback	2009-09-30 09:35:12.000000000 +0100
+++ system-config-printer-1.1.15/troubleshoot/__init__.py	2009-12-07 15:01:03.200971984 +0000
@@ -178,6 +178,7 @@ class Troubleshooter:
         return text.rstrip () + '\n'
 
     def busy (self):
+        self._in_module_call = True
         self.forward.set_sensitive (False)
         self.back.set_sensitive (False)
         gdkwin = self.get_window ().window
@@ -187,6 +188,7 @@ class Troubleshooter:
                 gtk.main_iteration ()
 
     def ready (self):
+        self._in_module_call = False
         gdkwin = self.get_window ().window
         if gdkwin:
             gdkwin.set_cursor (gtk.gdk.Cursor (gtk.gdk.LEFT_PTR))
@@ -291,13 +293,11 @@ class Troubleshooter:
 
     def _display (self, question):
         result = False
-        self._in_module_call = True
         try:
             result = question.display ()
         except:
             self._report_traceback ()
 
-        self._in_module_call = False
         question.displayed = result
         return result
 
@@ -310,13 +310,11 @@ class Troubleshooter:
 
     def _collect_answer (self, question):
         answer = {}
-        self._in_module_call = True
         try:
             answer = question.collect_answer ()
         except:
             self._report_traceback ()
 
-        self._in_module_call = False
         return answer
 
 QUESTIONS = ["Welcome",


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- system-config-printer.spec	3 Dec 2009 17:20:53 -0000	1.322
+++ system-config-printer.spec	7 Dec 2009 17:37:52 -0000	1.323
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch1: system-config-printer-no-epydoc.
 Patch2: system-config-printer-localize-statereason.patch
 Patch3: system-config-printer-browsepoll.patch
 Patch4: system-config-printer-cupsd.conf-parser.patch
+Patch5: system-config-printer-troubleshooter-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -82,6 +83,7 @@ printers.
 %patch2 -p1 -b .localize-statereason
 %patch3 -p1 -b .browsepoll
 %patch4 -p1 -b .cupsd.conf-parser
+%patch5 -p1 -b .troubleshooter-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -194,6 +196,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
+- Fixed traceback when troubleshooter operation is cancelled (bug #544356).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
 - Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
 - Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).



From twaugh at fedoraproject.org  Mon Dec  7 17:38:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  7 Dec 2009 17:38:43 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.318, 
	1.319
Message-ID: <20091207173843.CE37011C00EE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2076

Modified Files:
	system-config-printer.spec 
Log Message:
* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
- Fixed traceback when troubleshooter operation is cancelled (bug #544356).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- system-config-printer.spec	7 Dec 2009 15:03:32 -0000	1.318
+++ system-config-printer.spec	7 Dec 2009 17:38:43 -0000	1.319
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -196,7 +196,7 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-4
+* Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
 - Fixed traceback when troubleshooter operation is cancelled (bug #544356).
 
 * Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3



From kasal at fedoraproject.org  Mon Dec  7 17:39:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:39:01 +0000 (UTC)
Subject: rpms/perl-Guard/devel perl-Guard.spec,1.1,1.2
Message-ID: <20091207173901.7BDEA11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Guard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2205

Modified Files:
	perl-Guard.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Guard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Guard/devel/perl-Guard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Guard.spec	11 Nov 2009 10:55:24 -0000	1.1
+++ perl-Guard.spec	7 Dec 2009 17:39:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Guard
 Version:        1.021
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Safe cleanup blocks
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,5 +47,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.021-2
+- rebuild against perl 5.10.1
+
 * Sun Nov 08 2009 Nicolas Chuavet <kwizart at fedoraproject.org> - 1.021-1
 - Specfile autogenerated by cpanspec 1.78.



From kasal at fedoraproject.org  Mon Dec  7 17:39:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:39:02 +0000 (UTC)
Subject: rpms/mr/devel mr.spec,1.7,1.8
Message-ID: <20091207173902.BB17411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/mr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2222

Modified Files:
	mr.spec 
Log Message:
- rebuild against perl 5.10.1


Index: mr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mr/devel/mr.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mr.spec	16 Sep 2009 22:13:46 -0000	1.7
+++ mr.spec	7 Dec 2009 17:39:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mr
 Version:        0.43
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multiple repository management tool
 
 Group:          Applications/Internet
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.43-2
+- rebuild against perl 5.10.1
+
 * Wed Sep 17 2009 Fabian Affolter <fabian at bernewireless.net> - 0.43-1
 - Updated to new upstream version 0.43
 



From kasal at fedoraproject.org  Mon Dec  7 17:41:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:41:24 +0000 (UTC)
Subject: rpms/perl-NOCpulse-Gritch/devel perl-NOCpulse-Gritch.spec,1.2,1.3
Message-ID: <20091207174124.B863A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-NOCpulse-Gritch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3318

Modified Files:
	perl-NOCpulse-Gritch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-NOCpulse-Gritch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NOCpulse-Gritch/devel/perl-NOCpulse-Gritch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-NOCpulse-Gritch.spec	26 Jul 2009 11:35:30 -0000	1.2
+++ perl-NOCpulse-Gritch.spec	7 Dec 2009 17:41:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:         perl-NOCpulse-Gritch
 Version:      1.27.4
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      Perl throttled email notification for Spacewalk
 URL:          https://fedorahosted.org/spacewalk
 Source0:      https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.27.4-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:43:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:43:32 +0000 (UTC)
Subject: rpms/monotone/devel monotone.spec,1.49,1.50
Message-ID: <20091207174332.DFAC111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/monotone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4238

Modified Files:
	monotone.spec 
Log Message:
- rebuild against perl 5.10.1


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- monotone.spec	13 Sep 2009 10:03:48 -0000	1.49
+++ monotone.spec	7 Dec 2009 17:43:32 -0000	1.50
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.45
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -193,6 +193,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.45-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.45-1
 - Update to 0.45.
 



From kwizart at fedoraproject.org  Mon Dec  7 17:44:08 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon,  7 Dec 2009 17:44:08 +0000 (UTC)
Subject: File BDB-1.86.tar.gz uploaded to lookaside cache by kwizart
Message-ID: <20091207174408.F24BF10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-BDB:

e64da0463e5305d5cad4bd63f820df45  BDB-1.86.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 17:44:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:44:42 +0000 (UTC)
Subject: rpms/perl-GTop/devel perl-GTop.spec,1.10,1.11
Message-ID: <20091207174442.D48E811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GTop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4844

Modified Files:
	perl-GTop.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GTop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GTop/devel/perl-GTop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-GTop.spec	26 Jul 2009 06:11:33 -0000	1.10
+++ perl-GTop.spec	7 Dec 2009 17:44:42 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-GTop
 Version:        0.16
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Perl interface to libgtop
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-10
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 17:46:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:46:15 +0000 (UTC)
Subject: rpms/perl-NOCpulse-Debug/devel perl-NOCpulse-Debug.spec,1.3,1.4
Message-ID: <20091207174615.17F1D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-NOCpulse-Debug/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5409

Modified Files:
	perl-NOCpulse-Debug.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-NOCpulse-Debug.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NOCpulse-Debug/devel/perl-NOCpulse-Debug.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-NOCpulse-Debug.spec	26 Jul 2009 11:35:14 -0000	1.3
+++ perl-NOCpulse-Debug.spec	7 Dec 2009 17:46:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         perl-NOCpulse-Debug
 Version:      1.23.15
-Release:      3%{?dist}
+Release:      4%{?dist}
 Summary:      Perl debug output package
 URL:          https://fedorahosted.org/spacewalk
 Source0:      https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.23.15-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kaitlin at fedoraproject.org  Mon Dec  7 17:48:32 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Mon,  7 Dec 2009 17:48:32 +0000 (UTC)
Subject: rpms/libvirt-cim/devel libvirt-cim.spec,1.30,1.31
Message-ID: <20091207174832.7DFB811C00EE@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5953

Modified Files:
	libvirt-cim.spec 
Log Message:
Make some changes based on issues Daniel Veillard pointed out.

- Add missing namespace unreg bits for root/interop, root/cimv2
- Remove additional reg call of root/virt from postinstall
- Do not use /etc directly.  Use sysconfigdir instead
- Remove additional DESTDIR definition




Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libvirt-cim.spec	2 Dec 2009 23:34:04 -0000	1.30
+++ libvirt-cim.spec	7 Dec 2009 17:48:32 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
 Version: 0.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -40,7 +40,6 @@ make %{?_smp_mflags}
 rm -fr $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.la
@@ -84,8 +83,8 @@ rm -fr $RPM_BUILD_ROOT
 	-n root/virt \
 	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
-        -n root/virt \
-        -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
+	-n root/virt \
+	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
         -n root/interop \
         -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
@@ -101,29 +100,42 @@ rm -fr $RPM_BUILD_ROOT
 	-n root/virt \
 	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
+        -n root/interop \
+        -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -d -t pegasus \
         -n root/PG_InterOp \
         -r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -d -t pegasus \
+        -n root/cimv2 \
+        -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
 
 %postun -p /sbin/ldconfig
 
 %files 
 %defattr(-, root, root)
-/etc/libvirt/cim
+%{_sysconfdir}/libvirt/cim
 
 %doc README COPYING doc/CodingStyle doc/SubmittingPatches
 %doc base_schema/README.DMTF
 %doc doc/*.html
 %{_libdir}/lib*.so*
 %{_libdir}/cmpi/lib*.so*
+%{_datadir}/libvirt-cim
 %{_datadir}/libvirt-cim/*.sh
 %{_datadir}/libvirt-cim/*.mof
 %{_datadir}/libvirt-cim/cimv*-interop_mof
 %{_datadir}/libvirt-cim/cimv*-cimv2_mof
 %{_datadir}/libvirt-cim/*.registration
 %{_datadir}/libvirt-cim/cim_schema_*-MOFs.zip
-/etc/ld.so.conf.d/libvirt-cim.conf
+%{_sysconfdir}/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Mon Dec 07 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.8-2
+- Add missing namespace unreg bits for root/interop, root/cimv2 
+- Remove additional reg call of root/virt from postinstall 
+- Do not use /etc directly.  Use sysconfigdir instead
+- Remove additional DESTDIR definition
+
 * Wed Dec 02 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.8-1
 - Updated to latest upstream source
 



From kwizart at fedoraproject.org  Mon Dec  7 17:49:04 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon,  7 Dec 2009 17:49:04 +0000 (UTC)
Subject: rpms/perl-BDB/devel .cvsignore, 1.6, 1.7 sources, 1.7,
	1.8 perl-BDB.spec, 1.10, 1.11
Message-ID: <20091207174904.7140A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6392

Modified Files:
	.cvsignore sources perl-BDB.spec 
Log Message:
Update to 1.86



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	31 Aug 2009 15:15:54 -0000	1.6
+++ .cvsignore	7 Dec 2009 17:49:04 -0000	1.7
@@ -1 +1 @@
-BDB-1.84.tar.gz
+BDB-1.86.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	31 Aug 2009 15:15:54 -0000	1.7
+++ sources	7 Dec 2009 17:49:04 -0000	1.8
@@ -1 +1 @@
-64c976f7850ce4accfb615a301467e8c  BDB-1.84.tar.gz
+e64da0463e5305d5cad4bd63f820df45  BDB-1.86.tar.gz


Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-BDB.spec	7 Dec 2009 11:33:24 -0000	1.10
+++ perl-BDB.spec	7 Dec 2009 17:49:04 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-BDB
-Version:        1.84
-Release:        2%{?dist}
+Version:        1.86
+Release:        1%{?dist}
 Summary:        Asynchronous Berkeley DB access
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 7 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.86-1
+- Update to 1.86
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.84-2
 - rebuild against perl 5.10.1
 



From kasal at fedoraproject.org  Mon Dec  7 17:50:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:50:00 +0000 (UTC)
Subject: rpms/perl-Gtk2-TrayIcon/devel perl-Gtk2-TrayIcon.spec,1.10,1.11
Message-ID: <20091207175000.3DB8011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-TrayIcon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6817

Modified Files:
	perl-Gtk2-TrayIcon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-TrayIcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-TrayIcon/devel/perl-Gtk2-TrayIcon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Gtk2-TrayIcon.spec	5 Aug 2009 04:18:27 -0000	1.10
+++ perl-Gtk2-TrayIcon.spec	7 Dec 2009 17:50:00 -0000	1.11
@@ -12,7 +12,7 @@
 
 Name:           perl-Gtk2-TrayIcon
 Version:        0.06
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl interface to the EggTrayIcon library 
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-8
+- rebuild against perl 5.10.1
+
 * Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-7
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From pkgdb at fedoraproject.org  Mon Dec  7 17:50:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:50:12 +0000
Subject: [pkgdb] munin: ingvar has given up watchbugzilla
Message-ID: <20091207175012.CF32810F87E@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchbugzilla acl on munin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:50:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:50:15 +0000
Subject: [pkgdb] munin: ingvar has given up watchcommits
Message-ID: <20091207175015.9B2A810F891@bastion2.fedora.phx.redhat.com>

ingvar has given up the watchcommits acl on munin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Mon Dec  7 17:50:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:50:18 +0000
Subject: [pkgdb] munin: ingvar has requested commit
Message-ID: <20091207175018.B309810F89D@bastion2.fedora.phx.redhat.com>

ingvar has requested the commit acl on munin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From kasal at fedoraproject.org  Mon Dec  7 17:52:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:52:21 +0000 (UTC)
Subject: rpms/perl-NOCpulse-CLAC/devel perl-NOCpulse-CLAC.spec,1.3,1.4
Message-ID: <20091207175221.162F711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-NOCpulse-CLAC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7795

Modified Files:
	perl-NOCpulse-CLAC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-NOCpulse-CLAC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NOCpulse-CLAC/devel/perl-NOCpulse-CLAC.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-NOCpulse-CLAC.spec	26 Jul 2009 11:34:57 -0000	1.3
+++ perl-NOCpulse-CLAC.spec	7 Dec 2009 17:52:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         perl-NOCpulse-CLAC
 Version:      1.9.8
-Release:      3%{?dist}
+Release:      4%{?dist}
 Summary:      NOCpulse Command Line Application framework for Perl
 URL:          https://fedorahosted.org/spacewalk
 Source0:      https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9.8-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 17:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 17:53:39 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20091207175339.1738810F881@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora devel) to Approved for ingvar

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From kasal at fedoraproject.org  Mon Dec  7 17:55:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:55:20 +0000 (UTC)
Subject: rpms/perl-Gtk2-Spell/devel perl-Gtk2-Spell.spec,1.8,1.9
Message-ID: <20091207175520.1D07411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Spell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8914

Modified Files:
	perl-Gtk2-Spell.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Spell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Spell/devel/perl-Gtk2-Spell.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Gtk2-Spell.spec	5 Aug 2009 03:52:00 -0000	1.8
+++ perl-Gtk2-Spell.spec	7 Dec 2009 17:55:19 -0000	1.9
@@ -1,7 +1,7 @@
 
 Name:           perl-Gtk2-Spell
 Version:        1.03
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Gtk2::Spell perl module
 
 Group:     Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-12
+- rebuild against perl 5.10.1
+
 * Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.03-11
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From kasal at fedoraproject.org  Mon Dec  7 17:57:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 17:57:05 +0000 (UTC)
Subject: rpms/perl-Nmap-Parser/devel perl-Nmap-Parser.spec,1.9,1.10
Message-ID: <20091207175705.5E37B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Nmap-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9682

Modified Files:
	perl-Nmap-Parser.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Nmap-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/perl-Nmap-Parser.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Nmap-Parser.spec	26 Jul 2009 13:49:44 -0000	1.9
+++ perl-Nmap-Parser.spec	7 Dec 2009 17:57:05 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Nmap-Parser
 Version:        1.19
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parse nmap scan data with perl
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.19-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:01:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:01:11 +0000 (UTC)
Subject: rpms/perl-Gtk2-Sexy/devel perl-Gtk2-Sexy.spec,1.12,1.13
Message-ID: <20091207180111.1A4F911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Sexy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11149

Modified Files:
	perl-Gtk2-Sexy.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Sexy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Sexy/devel/perl-Gtk2-Sexy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Gtk2-Sexy.spec	26 Jul 2009 06:22:44 -0000	1.12
+++ perl-Gtk2-Sexy.spec	7 Dec 2009 18:01:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Sexy
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to the sexy widget collection 
 
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:01:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:01:50 +0000 (UTC)
Subject: rpms/perl-Newt/devel perl-Newt.spec,1.10,1.11
Message-ID: <20091207180150.6C2E411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Newt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11453

Modified Files:
	perl-Newt.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Newt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Newt/devel/perl-Newt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Newt.spec	26 Jul 2009 13:49:26 -0000	1.10
+++ perl-Newt.spec	7 Dec 2009 18:01:50 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Perl bindings for the Newt library
 Name: perl-Newt
 Version: 1.08
-Release: 24%{?dist}
+Release: 25%{?dist}
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL: http://search.cpan.org/~amedina/Newt-1.08/
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Newt*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.08-25
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Mon Dec  7 18:02:31 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon,  7 Dec 2009 18:02:31 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel perl-AnyEvent.spec, 1.22, 1.23 sources,
	1.14, 1.15 .cvsignore, 1.14, 1.15
Message-ID: <20091207180231.8DC5511C00EE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11644

Modified Files:
	perl-AnyEvent.spec sources .cvsignore 
Log Message:
Update to 5.22



Index: perl-AnyEvent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-AnyEvent.spec	7 Dec 2009 14:46:52 -0000	1.22
+++ perl-AnyEvent.spec	7 Dec 2009 18:02:31 -0000	1.23
@@ -1,8 +1,8 @@
-%global subver 2
+#global subver 2
 
 Name:           perl-AnyEvent
-Version:        5.11
-Release:        3%{?dist}
+Version:        5.22
+Release:        1%{?dist}
 Summary:        Framework for multiple event loops
 
 Group:          Development/Libraries
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 7 2009 Nicolas Chauvet <kwizart at fedoraproject.org > - 5.22-1
+- Update to 5.22  (rpm version : 5.22)
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 5.11-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	31 Aug 2009 14:27:24 -0000	1.14
+++ sources	7 Dec 2009 18:02:31 -0000	1.15
@@ -1 +1 @@
-21f43e5fc3e55a079f672add72c64262  AnyEvent-5.112.tar.gz
+b80fb0638ea729ea311aa00a1e2a5432  AnyEvent-5.22.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	31 Aug 2009 14:27:25 -0000	1.14
+++ .cvsignore	7 Dec 2009 18:02:31 -0000	1.15
@@ -1 +1 @@
-AnyEvent-5.112.tar.gz
+AnyEvent-5.22.tar.gz



From jforbes at fedoraproject.org  Mon Dec  7 18:05:36 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Mon,  7 Dec 2009 18:05:36 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-userspace_kvmclock_offset.patch, NONE, 
	1.1 kernel.spec, 1.1865, 1.1866
Message-ID: <20091207180536.4F06411C00EE@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12909

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-userspace_kvmclock_offset.patch 
Log Message:
Allow userspace to adjust kvmclock offset (#530389)

linux-2.6-userspace_kvmclock_offset.patch:
 Documentation/kvm/api.txt       |   34 ++++++++++++++++++++++++++++++++++
 arch/x86/include/asm/kvm_host.h |    1 +
 arch/x86/kvm/x86.c              |   36 +++++++++++++++++++++++++++++++++++-
 include/linux/kvm.h             |   10 +++++++++-
 4 files changed, 79 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-userspace_kvmclock_offset.patch ---
>From a6048dd2da5be0dec49739304d310ddfc477d99c Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Fri, 16 Oct 2009 15:28:36 -0400
Subject: [PATCH] KVM: allow userspace to adjust kvmclock offset

When we migrate a kvm guest that uses pvclock between two hosts, we may
suffer a large skew. This is because there can be significant differences
between the monotonic clock of the hosts involved. When a new host with
a much larger monotonic time starts running the guest, the view of time
will be significantly impacted.

Situation is much worse when we do the opposite, and migrate to a host with
a smaller monotonic clock.

This proposed ioctl will allow userspace to inform us what is the monotonic
clock value in the source host, so we can keep the time skew short, and
more importantly, never goes backwards. Userspace may also need to trigger
the current data, since from the first migration onwards, it won't be
reflected by a simple call to clock_gettime() anymore.

Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 Documentation/kvm/api.txt       |   34 ++++++++++++++++++++++++++++++++++
 arch/x86/include/asm/kvm_host.h |    1 +
 arch/x86/kvm/x86.c              |   36 +++++++++++++++++++++++++++++++++++-
 include/linux/kvm.h             |    9 +++++++++
 4 files changed, 79 insertions(+), 1 deletions(-)

diff --git a/Documentation/kvm/api.txt b/Documentation/kvm/api.txt
index 5980113..126419f 100644
--- a/Documentation/kvm/api.txt
+++ b/Documentation/kvm/api.txt
@@ -617,6 +617,40 @@ struct kvm_xen_hvm_config {
 	__u8 pad2[30];
 };
 
+4.27 KVM_GET_CLOCK
+
+Capability: KVM_CAP_ADJUST_CLOCK
+Architectures: x86
+Type: vm ioctl
+Parameters: struct kvm_clock_data (out)
+Returns: 0 on success, -1 on error
+
+Gets the current timestamp of kvmclock as seen by the current guest. In
+conjunction with KVM_SET_CLOCK, it is used to ensure monotonicity on scenarios
+such as migration.
+
+struct kvm_clock_data {
+	__u64 clock;  /* kvmclock current value */
+	__u64 pad[2];
+};
+
+4.28 KVM_SET_CLOCK
+
+Capability: KVM_CAP_ADJUST_CLOCK
+Architectures: x86
+Type: vm ioctl
+Parameters: struct kvm_clock_data (in)
+Returns: 0 on success, -1 on error
+
+Sets the current timestamp of kvmclock to the valued specific in its parameter.
+In conjunction with KVM_GET_CLOCK, it is used to ensure monotonicity on scenarios
+such as migration.
+
+struct kvm_clock_data {
+	__u64 clock;  /* kvmclock current value */
+	__u64 pad[2];
+};
+
 5. The kvm_run structure
 
 Application code obtains a pointer to the kvm_run structure by
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 4d994ad..0558ff8 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -413,6 +413,7 @@ struct kvm_arch{
 	unsigned long irq_sources_bitmap;
 	unsigned long irq_states[KVM_IOAPIC_NUM_PINS];
 	u64 vm_init_tsc;
+	s64 kvmclock_offset;
 };

 struct kvm_vm_stat {
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e3456f8..3270b3b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -680,7 +680,8 @@ static void kvm_write_guest_time(struct kvm_vcpu *v)
 	/* With all the info we got, fill in the values */
 
 	vcpu->hv_clock.system_time = ts.tv_nsec +
-				     (NSEC_PER_SEC * (u64)ts.tv_sec);
+				     (NSEC_PER_SEC * (u64)ts.tv_sec) + v->kvm->arch.kvmclock_offset;
+
 	/*
 	 * The interface expects us to write an even number signaling that the
 	 * update is finished. Since the guest won't see the intermediate
@@ -1261,6 +1262,7 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_PIT2:
 	case KVM_CAP_PIT_STATE2:
 	case KVM_CAP_SET_IDENTITY_MAP_ADDR:
+	case KVM_CAP_ADJUST_CLOCK:
 		r = 1;
 		break;
 	case KVM_CAP_COALESCED_MMIO:
@@ -2464,6 +2466,38 @@ long kvm_arch_vm_ioctl(struct file *filp,
 		r = 0;
 		break;
 	}
+	case KVM_SET_CLOCK: {
+		struct timespec now;
+		struct kvm_clock_data user_ns;
+		u64 now_ns;
+		s64 delta;
+
+		r = -EFAULT;
+		if (copy_from_user(&user_ns, argp, sizeof(user_ns)))
+			goto out;
+
+		r = 0;
+		ktime_get_ts(&now);
+		now_ns = timespec_to_ns(&now);
+		delta = user_ns.clock - now_ns;
+		kvm->arch.kvmclock_offset = delta;
+		break;
+	}
+	case KVM_GET_CLOCK: {
+		struct timespec now;
+		struct kvm_clock_data user_ns;
+		u64 now_ns;
+
+		ktime_get_ts(&now);
+		now_ns = timespec_to_ns(&now);
+		user_ns.clock = kvm->arch.kvmclock_offset + now_ns;
+
+		if (copy_to_user(argp, &user_ns, sizeof(user_ns)))
+			r =  -EFAULT;
+
+		break;
+	}
+
 	default:
 		;
 	}
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index e0ed46c..0e8455b 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -439,6 +439,7 @@ struct kvm_ioeventfd {
 #ifdef __KVM_HAVE_XEN_HVM
 #define KVM_CAP_XEN_HVM 38
 #endif
+#define KVM_CAP_ADJUST_CLOCK 39
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -512,6 +513,11 @@ struct kvm_irqfd {
 	__u8  pad[20];
 };
 
+struct kvm_clock_data {
+	__u64 clock;
+	__u64 pad[2];
+};
+
 /*
  * ioctls for VM fds
  */
@@ -562,6 +568,9 @@ struct kvm_irqfd {
 #define KVM_CREATE_PIT2            _IOW(KVMIO, 0x77, struct kvm_pit_config)
 #define KVM_SET_BOOT_CPU_ID        _IO(KVMIO, 0x78)
 #define KVM_IOEVENTFD             _IOW(KVMIO, 0x79, struct kvm_ioeventfd)
+#define KVM_SET_CLOCK             _IOW(KVMIO, 0x7b, struct kvm_clock_data)
+#define KVM_GET_CLOCK             _IOR(KVMIO, 0x7c, struct kvm_clock_data)
+
 
 /*
  * ioctls for vcpu fds
-- 
1.6.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1865
retrieving revision 1.1866
diff -u -p -r1.1865 -r1.1866
--- kernel.spec	7 Dec 2009 13:28:26 -0000	1.1865
+++ kernel.spec	7 Dec 2009 18:05:35 -0000	1.1866
@@ -681,6 +681,7 @@ Patch1517: hdpvr-ir-enable.patch
 
 # virt + ksm patches
 Patch1551: linux-2.6-ksm-kvm.patch
+Patch1552: linux-2.6-userspace_kvmclock_offset.patch
 
 # nouveau + drm fixes
 Patch1811: drm-radeon-fixes.patch
@@ -1302,6 +1303,7 @@ ApplyPatch hdpvr-ir-enable.patch
 #ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Assorted Virt Fixes
+ApplyPatch linux-2.6-userspace_kvmclock_offset.patch
 
 # Fix block I/O errors in KVM
 #ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1995,6 +1997,9 @@ fi
 # and build.
 
 %changelog
+* Mon Dec  7 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.32-3
+- Allow userspace to adjust kvmclock offset (#530389)
+
 * Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 2.6.32-2
 - Updated the NFS4 pseudo root code to the latest release.
 



From kasal at fedoraproject.org  Mon Dec  7 18:06:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:06:28 +0000 (UTC)
Subject: rpms/perl-Gtk2-Notify/devel perl-Gtk2-Notify.spec,1.13,1.14
Message-ID: <20091207180628.0F1CE11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Notify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13398

Modified Files:
	perl-Gtk2-Notify.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Notify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Notify/devel/perl-Gtk2-Notify.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Gtk2-Notify.spec	4 Aug 2009 13:08:28 -0000	1.13
+++ perl-Gtk2-Notify.spec	7 Dec 2009 18:06:27 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Notify
 Version:        0.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl interface to libnotify
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-7
+- rebuild against perl 5.10.1
+
 * Tue Aug 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.05-6
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From kasal at fedoraproject.org  Mon Dec  7 18:06:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:06:28 +0000 (UTC)
Subject: rpms/mod_perlite/devel mod_perlite.spec,1.3,1.4
Message-ID: <20091207180628.A29AD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/mod_perlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13416

Modified Files:
	mod_perlite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: mod_perlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_perlite/devel/mod_perlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mod_perlite.spec	15 Oct 2009 20:02:42 -0000	1.3
+++ mod_perlite.spec	7 Dec 2009 18:06:28 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           mod_perlite
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kinder, gentler embedded Perl for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-2
+- rebuild against perl 5.10.1
+
 * Wed Oct 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10
 - update to 0.10
 



From kasal at fedoraproject.org  Mon Dec  7 18:06:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:06:43 +0000 (UTC)
Subject: rpms/perl-Net-XMPP/devel perl-Net-XMPP.spec,1.10,1.11
Message-ID: <20091207180643.2310E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-XMPP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13686

Modified Files:
	perl-Net-XMPP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-XMPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-XMPP/devel/perl-Net-XMPP.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Net-XMPP.spec	26 Jul 2009 13:48:19 -0000	1.10
+++ perl-Net-XMPP.spec	7 Dec 2009 18:06:43 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Net-XMPP
 Version:        1.02
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Net::XMPP - perl XMPP library
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:12:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:12:39 +0000 (UTC)
Subject: rpms/perl-Gtk2-ImageView/devel perl-Gtk2-ImageView.spec,1.4,1.5
Message-ID: <20091207181239.1324F11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-ImageView/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15910

Modified Files:
	perl-Gtk2-ImageView.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-ImageView.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-ImageView/devel/perl-Gtk2-ImageView.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Gtk2-ImageView.spec	30 Jul 2009 11:58:50 -0000	1.4
+++ perl-Gtk2-ImageView.spec	7 Dec 2009 18:12:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-ImageView
 Version:        0.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl bindings to the GtkImageView image viewer widget
 
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/Gtk2/ImageView/Install/*.h
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-6
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.04-5
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From kasal at fedoraproject.org  Mon Dec  7 18:13:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:13:57 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/devel perl-Net-UPnP.spec,1.2,1.3
Message-ID: <20091207181357.11B0911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-UPnP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16489

Modified Files:
	perl-Net-UPnP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-UPnP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/devel/perl-Net-UPnP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Net-UPnP.spec	26 Jul 2009 13:48:05 -0000	1.2
+++ perl-Net-UPnP.spec	7 Dec 2009 18:13:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		perl-Net-UPnP
 Version:	1.41
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Perl extension for UPnP
 License:	BSD
 Group:		Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.41-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.41-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:14:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:14:47 +0000 (UTC)
Subject: rpms/maatkit/devel maatkit.spec,1.8,1.9
Message-ID: <20091207181447.8C1B411C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/maatkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16933

Modified Files:
	maatkit.spec 
Log Message:
- rebuild against perl 5.10.1


Index: maatkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maatkit/devel/maatkit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- maatkit.spec	14 Nov 2009 21:21:34 -0000	1.8
+++ maatkit.spec	7 Dec 2009 18:14:47 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           maatkit
 Version:        5014
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Essential command-line utilities for MySQL
 
 Group:          Applications/Databases
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 5014-2
+- rebuild against perl 5.10.1
+
 * Sat Nov 14 2009 Sven Lankes <sven at lank.es> - 5014-1
 - new upstream release
 



From fabbione at fedoraproject.org  Mon Dec  7 18:15:42 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon,  7 Dec 2009 18:15:42 +0000 (UTC)
Subject: rpms/fence-virt/F-12 .cvsignore, 1.2, 1.3 fence-virt.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091207181542.4409311C00EE@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-virt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17342

Modified Files:
	.cvsignore fence-virt.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-virt/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 17:53:15 -0000	1.2
+++ .cvsignore	7 Dec 2009 18:15:42 -0000	1.3
@@ -1 +1,2 @@
 fence-virt-0.1.2.tar.gz
+fence-virt-0.1.3.tar.gz


Index: fence-virt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-virt/F-12/fence-virt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fence-virt.spec	25 Sep 2009 17:53:15 -0000	1.1
+++ fence-virt.spec	7 Dec 2009 18:15:42 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		fence-virt
-Version:	0.1.2
+Version:	0.1.3
 Release:	1%{?dist}
 Summary:	A pluggable fencing framework for virtual machines
 Group:		System Environment/Base
@@ -8,9 +8,11 @@ URL:		http://voxel.dl.sourceforge.net/pr
 Source0:	%{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:	corosynclib-devel cman-devel libvirt-devel openaislib-devel
+BuildRequires:	corosynclib-devel clusterlib-devel libvirt-devel
+BuildRequires:	openaislib-devel qmf-devel qpidc-devel
 BuildRequires:	automake autoconf libxml2-devel nss-devel nspr-devel
 BuildRequires:	flex bison
+Conflicts:	fence-agents < 3.0.5-2
 
 %description
 Fencing agent for virtual machines.
@@ -49,7 +51,7 @@ machines on a desktop.
 
 
 %package -n fence-virtd-checkpoint
-Summary:	Libvirt backend for fence-virtd
+Summary:	Cluster+libvirt backend for fence-virtd
 Group:		System Environment/Base
 Requires:	fence-virtd
 
@@ -61,6 +63,17 @@ machine states across a cluster and make
 about whether a virtual machine is running.
 
 
+%package -n fence-virtd-qpid
+Summary:	Libvirt-qpid backend for fence-virtd
+Group:		System Environment/Base
+Requires:	fence-virtd
+
+%description -n fence-virtd-qpid
+Provides fence_virtd with a connection to libvirt-qpid to fence
+virtual machines.  Allows fence_virtd to operate as a QMF console
+and uses QMF to route fencing requests. 
+
+
 %prep
 %setup -q
 
@@ -84,11 +97,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING TODO README
 %{_sbindir}/fence_virt
+%{_sbindir}/fence_xvm
+%{_mandir}/man8/*
 
 %files -n fence-virtd
 %defattr(-,root,root,-)
 %{_sbindir}/fence_virtd
-%config(noreplace) /etc/fence_virt.conf
+%config(noreplace) %{_sysconfdir}/fence_virt.conf
 %dir %{_libdir}/%{name}
 # TODO: init script to start fence_virtd
 # TODO: auto-config utility
@@ -105,7 +120,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/checkpoint.so
 
+%files -n fence-virtd-qpid
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libvirt-qpid.so
+
+
 %changelog
+* Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1.3-1
+- Update to latest upstream version
+- Adds libvirt-qpid backend support
+- Fixes UUID operation with libvirt backend
+- Adds man page for fence_xvm and fence_virt
+- Provides fence_xvm compatibility for cluster 3.0.6
+
 * Mon Sep 21 2009 Lon Hohberger <lhh at redhat.com> 0.1.2-1
 - Update to latest upstream version
 - Fix build issue on i686


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-virt/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 17:53:15 -0000	1.2
+++ sources	7 Dec 2009 18:15:42 -0000	1.3
@@ -1 +1 @@
-57b25e050119071ca3a581d55b30a187  fence-virt-0.1.2.tar.gz
+db5e1c2211c04c7c8a7f1d3047bbe778  fence-virt-0.1.3.tar.gz



From pkgdb at fedoraproject.org  Mon Dec  7 18:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:15:55 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181555.4929A10F88C@bastion2.fedora.phx.redhat.com>

mchua has set the commit acl on zikula-module-filterutil (Fedora devel) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 18:15:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:15:56 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181556.C162510F89C@bastion2.fedora.phx.redhat.com>

mchua has set the approveacls acl on zikula-module-filterutil (Fedora devel) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 18:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:16:07 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181607.9258610F8A6@bastion2.fedora.phx.redhat.com>

mchua has set the commit acl on zikula-module-filterutil (Fedora 12) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 18:16:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:16:08 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181608.E904E10F8AF@bastion2.fedora.phx.redhat.com>

mchua has set the approveacls acl on zikula-module-filterutil (Fedora 12) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 18:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:16:12 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181612.2054C10F8B4@bastion2.fedora.phx.redhat.com>

mchua has set the approveacls acl on zikula-module-filterutil (Fedora 11) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 18:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:16:13 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181613.7A07310F8B6@bastion2.fedora.phx.redhat.com>

mchua has set the commit acl on zikula-module-filterutil (Fedora 11) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 18:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:16:16 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181616.58D9710F8BA@bastion2.fedora.phx.redhat.com>

mchua has set the approveacls acl on zikula-module-filterutil (Fedora EPEL 5) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 18:16:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:16:17 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181617.D8BEB10F8C1@bastion2.fedora.phx.redhat.com>

mchua has set the commit acl on zikula-module-filterutil (Fedora EPEL 5) to Obsolete for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Mon Dec  7 18:16:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 18:16:19 +0000
Subject: [pkgdb] zikula-module-filterutil had acl change status
Message-ID: <20091207181619.DD58E10F8C7@bastion2.fedora.phx.redhat.com>

mchua has set the commit acl on zikula-module-filterutil (Fedora EPEL 5) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-filterutil



From kasal at fedoraproject.org  Mon Dec  7 18:17:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:17:38 +0000 (UTC)
Subject: rpms/perl-Gtk2-GladeXML/devel perl-Gtk2-GladeXML.spec,1.10,1.11
Message-ID: <20091207181738.A70F711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-GladeXML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18233

Modified Files:
	perl-Gtk2-GladeXML.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-GladeXML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-GladeXML/devel/perl-Gtk2-GladeXML.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Gtk2-GladeXML.spec	5 Aug 2009 03:15:33 -0000	1.10
+++ perl-Gtk2-GladeXML.spec	7 Dec 2009 18:17:38 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-GladeXML
 Version:        1.007
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Create user interfaces directly from Glade XML files
 
 Group:          Development/Libraries
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.007-5
+- rebuild against perl 5.10.1
+
 * Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.007-4
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From kasal at fedoraproject.org  Mon Dec  7 18:18:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:18:05 +0000 (UTC)
Subject: rpms/perl-Net-Stomp/devel perl-Net-Stomp.spec,1.3,1.4
Message-ID: <20091207181805.6138011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Stomp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18521

Modified Files:
	perl-Net-Stomp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Stomp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Stomp/devel/perl-Net-Stomp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-Stomp.spec	26 Jul 2009 13:47:38 -0000	1.3
+++ perl-Net-Stomp.spec	7 Dec 2009 18:18:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-Stomp
 Version:        0.34
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Stomp client module for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.34-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:19:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:19:12 +0000 (UTC)
Subject: rpms/libpreludedb/devel libpreludedb.spec,1.25,1.26
Message-ID: <20091207181912.6062811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/libpreludedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18985

Modified Files:
	libpreludedb.spec 
Log Message:
- rebuild against perl 5.10.1


Index: libpreludedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/libpreludedb.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libpreludedb.spec	25 Aug 2009 15:59:49 -0000	1.25
+++ libpreludedb.spec	7 Dec 2009 18:19:12 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:		libpreludedb		           
 Version:	0.9.15.1 
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9.15.1-6
+- rebuild against perl 5.10.1
+
 * Tue Aug 25 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.15.1-5
 - rebuild for new openssl
 



From kasal at fedoraproject.org  Mon Dec  7 18:22:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:22:21 +0000 (UTC)
Subject: rpms/perl-Net-SSLeay/devel perl-Net-SSLeay.spec,1.17,1.18
Message-ID: <20091207182221.2A06A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SSLeay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20098

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Net-SSLeay.spec	22 Aug 2009 20:18:27 -0000	1.17
+++ perl-Net-SSLeay.spec	7 Dec 2009 18:22:21 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		perl-Net-SSLeay
 Version:	1.35
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Perl extension for using OpenSSL
 Group:		Development/Libraries
 License:	OpenSSL
@@ -71,6 +71,9 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile
 %{_mandir}/man3/Net::SSLeay*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.35-8
+- rebuild against perl 5.10.1
+
 * Sat Aug 22 2009 Paul Howarth <paul at city-fan.org> - 1.35-7
 - update to svn trunk (rev 252), needed due to omission of MD2 functionality
   from OpenSSL 1.0.0 (CPAN RT#48916)



From kasal at fedoraproject.org  Mon Dec  7 18:22:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:22:57 +0000 (UTC)
Subject: rpms/perl-Gtk2-Ex-Utils/devel perl-Gtk2-Ex-Utils.spec,1.5,1.6
Message-ID: <20091207182257.0B17E11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20336

Modified Files:
	perl-Gtk2-Ex-Utils.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Ex-Utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-Utils/devel/perl-Gtk2-Ex-Utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Gtk2-Ex-Utils.spec	26 Jul 2009 06:21:21 -0000	1.5
+++ perl-Gtk2-Ex-Utils.spec	7 Dec 2009 18:22:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-Utils
 Version:        0.09
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:25:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:25:27 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.49,1.50
Message-ID: <20091207182527.5CC9211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21272

Modified Files:
	libprelude.spec 
Log Message:
- rebuild against perl 5.10.1


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- libprelude.spec	29 Sep 2009 20:04:52 -0000	1.49
+++ libprelude.spec	7 Dec 2009 18:25:27 -0000	1.50
@@ -5,7 +5,7 @@
 
 Name:		libprelude
 Version:	0.9.24.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -141,6 +141,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9.24.1-2
+- rebuild against perl 5.10.1
+
 * Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.24.1-1
 - New upstream release
 



From sdz at fedoraproject.org  Mon Dec  7 18:25:40 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Mon,  7 Dec 2009 18:25:40 +0000 (UTC)
Subject: rpms/zikula-module-filterutil/devel
	filterutil-style-bugfix-zikula-trunk.patch, 1.1,
	1.2 zikula-module-filterutil.spec, 1.1, 1.2
Message-ID: <20091207182540.91A4C11C00EE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zikula-module-filterutil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21167

Modified Files:
	filterutil-style-bugfix-zikula-trunk.patch 
	zikula-module-filterutil.spec 
Log Message:
Modify install location and fix typo in bugfix patch


filterutil-style-bugfix-zikula-trunk.patch:
 FilterUtil_Common.class.php         |   16 ++++++++--------
 FilterUtil_Plugin.class.php         |    8 ++++----
 filter/filter.category.class.php    |   17 +++++++++++------
 filter/filter.date.class.php        |   29 ++++++++++++++++++-----------
 filter/filter.default.class.php     |   15 +++++++++------
 filter/filter.replaceName.class.php |   11 +++++++----
 6 files changed, 57 insertions(+), 39 deletions(-)

Index: filterutil-style-bugfix-zikula-trunk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-filterutil/devel/filterutil-style-bugfix-zikula-trunk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- filterutil-style-bugfix-zikula-trunk.patch	21 Oct 2009 20:00:40 -0000	1.1
+++ filterutil-style-bugfix-zikula-trunk.patch	7 Dec 2009 18:25:40 -0000	1.2
@@ -279,7 +279,7 @@ Index: FilterUtil/FilterUtil_Common.clas
  	protected function addJoinToColumn()
  	{
 -	    if (count($this->join) <= 0)
-+	    if (count($this->join) < 1) {
++	    if (count($this->join) < 1)
  	        return;
  
 -	    $pntable =& pnDBGetTables();


Index: zikula-module-filterutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-filterutil/devel/zikula-module-filterutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zikula-module-filterutil.spec	21 Oct 2009 20:00:40 -0000	1.1
+++ zikula-module-filterutil.spec	7 Dec 2009 18:25:40 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           zikula-module-%{zikula_modname}
 Version:        0
-Release:        0.2.20090915svn15%{?dist}
+Release:        0.3.20090915svn15%{?dist}
 Summary:        Pagesetter like filter rules for Zikula
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -35,8 +35,8 @@ find . -type 'f' -exec chmod a-x \{\} \;
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/%{zikula_base}/config/classes/%{zikula_modname}
-cp -pr . %{buildroot}/%{zikula_base}/config/classes/%{zikula_modname}
+mkdir -p %{buildroot}/%{zikula_base}/config/classes
+cp -pr . %{buildroot}/%{zikula_base}/config/classes
 rm -rf %{buildroot}/%{zikula_base}/*.pdf
 
 %clean
@@ -45,10 +45,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc manual-developer.pdf manual-user.pdf
-%{zikula_base}/config/classes/%{zikula_modname}
+%{zikula_base}/config/classes
 
 
 %changelog
+* Sun Dec 06 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.20090915svn15
+- Modify install location and fix typo in bugfix patch
+
 * Thu Sep 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0-0.2.20090915svn15
 - Add fixes from itbegins for putting this in its own zikula directory
 



From kasal at fedoraproject.org  Mon Dec  7 18:27:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:27:02 +0000 (UTC)
Subject: rpms/perl-Gtk2-Ex-Simple-List/devel perl-Gtk2-Ex-Simple-List.spec,
	1.6, 1.7
Message-ID: <20091207182702.EEA0611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-Simple-List/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21878

Modified Files:
	perl-Gtk2-Ex-Simple-List.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Ex-Simple-List.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-Simple-List/devel/perl-Gtk2-Ex-Simple-List.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Gtk2-Ex-Simple-List.spec	30 Jul 2009 17:22:50 -0000	1.6
+++ perl-Gtk2-Ex-Simple-List.spec	7 Dec 2009 18:27:02 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-Simple-List
 Version:        0.50
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Simple interface to Gtk2's complex MVC list widget
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.50-7
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.50-6
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From sdz at fedoraproject.org  Mon Dec  7 18:27:21 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Mon,  7 Dec 2009 18:27:21 +0000 (UTC)
Subject: rpms/zikula-module-filterutil/EL-5
	filterutil-style-bugfix-zikula-trunk.patch, 1.1,
	1.2 zikula-module-filterutil.spec, 1.1, 1.2
Message-ID: <20091207182721.5FE6F11C00EE@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zikula-module-filterutil/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21958

Modified Files:
	filterutil-style-bugfix-zikula-trunk.patch 
	zikula-module-filterutil.spec 
Log Message:
Modify install location and fix typo in bugfix patch


filterutil-style-bugfix-zikula-trunk.patch:
 FilterUtil_Common.class.php         |   16 ++++++++--------
 FilterUtil_Plugin.class.php         |    8 ++++----
 filter/filter.category.class.php    |   17 +++++++++++------
 filter/filter.date.class.php        |   29 ++++++++++++++++++-----------
 filter/filter.default.class.php     |   15 +++++++++------
 filter/filter.replaceName.class.php |   11 +++++++----
 6 files changed, 57 insertions(+), 39 deletions(-)

Index: filterutil-style-bugfix-zikula-trunk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-filterutil/EL-5/filterutil-style-bugfix-zikula-trunk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- filterutil-style-bugfix-zikula-trunk.patch	21 Oct 2009 20:04:37 -0000	1.1
+++ filterutil-style-bugfix-zikula-trunk.patch	7 Dec 2009 18:27:21 -0000	1.2
@@ -279,7 +279,7 @@ Index: FilterUtil/FilterUtil_Common.clas
  	protected function addJoinToColumn()
  	{
 -	    if (count($this->join) <= 0)
-+	    if (count($this->join) < 1) {
++	    if (count($this->join) < 1)
  	        return;
  
 -	    $pntable =& pnDBGetTables();


Index: zikula-module-filterutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-filterutil/EL-5/zikula-module-filterutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zikula-module-filterutil.spec	21 Oct 2009 20:04:37 -0000	1.1
+++ zikula-module-filterutil.spec	7 Dec 2009 18:27:21 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           zikula-module-%{zikula_modname}
 Version:        0
-Release:        0.2.20090915svn15%{?dist}
+Release:        0.3.20090915svn15%{?dist}
 Summary:        Pagesetter like filter rules for Zikula
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -35,8 +35,8 @@ find . -type 'f' -exec chmod a-x \{\} \;
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/%{zikula_base}/config/classes/%{zikula_modname}
-cp -pr . %{buildroot}/%{zikula_base}/config/classes/%{zikula_modname}
+mkdir -p %{buildroot}/%{zikula_base}/config/classes
+cp -pr . %{buildroot}/%{zikula_base}/config/classes
 rm -rf %{buildroot}/%{zikula_base}/*.pdf
 
 %clean
@@ -45,10 +45,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc manual-developer.pdf manual-user.pdf
-%{zikula_base}/config/classes/%{zikula_modname}
+%{zikula_base}/config/classes
 
 
 %changelog
+* Sun Dec 06 2009 Sebastian Dziallas <sebastian at when.com> - 0.3.20090915svn15
+- Modify install location and fix typo in bugfix patch
+
 * Thu Sep 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0-0.2.20090915svn15
 - Add fixes from itbegins for putting this in its own zikula directory
 



From kasal at fedoraproject.org  Mon Dec  7 18:27:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:27:47 +0000 (UTC)
Subject: rpms/perl-Net-SSH-Perl/devel perl-Net-SSH-Perl.spec,1.14,1.15
Message-ID: <20091207182747.98B4B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SSH-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22289

Modified Files:
	perl-Net-SSH-Perl.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SSH-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSH-Perl/devel/perl-Net-SSH-Perl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Net-SSH-Perl.spec	26 Jul 2009 13:46:37 -0000	1.14
+++ perl-Net-SSH-Perl.spec	7 Dec 2009 18:27:47 -0000	1.15
@@ -8,7 +8,7 @@
 Summary:	SSH (Secure Shell) client
 Name:		perl-Net-SSH-Perl
 Version:	1.34
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Net-SSH-Perl/
@@ -97,6 +97,9 @@ LC_ALL=en_US %{__make} test TEST_AUTHOR=
 %{_mandir}/man3/Net::SSH::Perl*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.34-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:31:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:31:33 +0000 (UTC)
Subject: rpms/perl-Gtk2-Ex-PodViewer/devel perl-Gtk2-Ex-PodViewer.spec, 1.7, 
	1.8
Message-ID: <20091207183133.07B0A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-PodViewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23764

Modified Files:
	perl-Gtk2-Ex-PodViewer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Ex-PodViewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-PodViewer/devel/perl-Gtk2-Ex-PodViewer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Gtk2-Ex-PodViewer.spec	26 Jul 2009 06:20:50 -0000	1.7
+++ perl-Gtk2-Ex-PodViewer.spec	7 Dec 2009 18:31:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-PodViewer
 Version:        0.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Gtk2 widget for displaying Plain old Documentation (POD)
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From terjeros at fedoraproject.org  Mon Dec  7 18:33:31 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 18:33:31 +0000 (UTC)
Subject: File e16-1.0.1.tar.gz uploaded to lookaside cache by terjeros
Message-ID: <20091207183331.2086C10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for e16:

3529707b0c7484fa3e156ed7a6c39b1e  e16-1.0.1.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 18:34:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:34:07 +0000 (UTC)
Subject: rpms/perl-Net-SSH2/devel perl-Net-SSH2.spec,1.13,1.14
Message-ID: <20091207183407.D8E6B11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SSH2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25210

Modified Files:
	perl-Net-SSH2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SSH2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSH2/devel/perl-Net-SSH2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Net-SSH2.spec	22 Sep 2009 06:22:55 -0000	1.13
+++ perl-Net-SSH2.spec	7 Dec 2009 18:34:07 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSH2
 Version:        0.27
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.27-2
+- rebuild against perl 5.10.1
+
 * Tue Sep 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.27-1
 - alter filtering
 - auto-update to 0.27 (by cpan-spec-update 0.01)



From terjeros at fedoraproject.org  Mon Dec  7 18:34:28 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 18:34:28 +0000 (UTC)
Subject: rpms/e16/devel .cvsignore, 1.5, 1.6 e16.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <20091207183428.0FB9E11C00EE@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25478

Modified Files:
	.cvsignore e16.spec sources 
Log Message:
* Mon Dec 07 2009 Terje Rosten <terjeros at phys.ntnu.no> - 1.0.1-1
- 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Jan 2009 18:37:53 -0000	1.5
+++ .cvsignore	7 Dec 2009 18:34:27 -0000	1.6
@@ -1 +1 @@
-e16-0.16.8.15.tar.gz
+e16-1.0.1.tar.gz


Index: e16.spec
===================================================================
RCS file: /cvs/extras/rpms/e16/devel/e16.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- e16.spec	24 Jul 2009 20:43:39 -0000	1.10
+++ e16.spec	7 Dec 2009 18:34:27 -0000	1.11
@@ -2,8 +2,8 @@
 
 Summary:       The Enlightenment window manager, DR16
 Name:          e16
-Version:       0.16.8.15
-Release:       3%{?dist}
+Version:       1.0.1
+Release:       1%{?dist}
 License:       MIT with advertising and GPLv2+
 Group:         User Interface/Desktops
 URL:           http://www.enlightenment.org/
@@ -13,7 +13,7 @@ BuildRequires: esound-devel alsa-lib-dev
 BuildRequires: libXrandr-devel libSM-devel xorg-x11-proto-devel
 BuildRequires: libXfixes-devel libXrender-devel libXdamage-devel
 BuildRequires: libXcomposite-devel libXft-devel libXxf86vm-devel
-BuildRequires: pango-devel dbus-devel
+BuildRequires: pango-devel dbus-devel desktop-file-utils
 Requires:      dejavu-sans-fonts
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,7 +35,10 @@ release 16.
 %setup -q
 
 %build
-%configure --enable-pango
+%configure --enable-pango   \
+           --enable-mans    \
+           --enable-modules \
+           --enable-visibility-hiding
 %{__make} %{?_smp_mflags}
 for f in ChangeLog AUTHORS ; do
     mv $f $f.iso88591
@@ -55,6 +58,17 @@ done
 %{__ln_s}  ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/normal.ttf
 %{__ln_s}  ../../fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}%{_datadir}/%{name}/fonts/bold.ttf
 
+# Remove unwanted files
+find %{buildroot}%{_libdir}/e16 -name lib*.la -delete
+%{__rm} -rf %{buildroot}%{_datadir}/doc/%{name}
+
+# Desktop file
+%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{__cp} %{buildroot}%{_datadir}/e16/misc/e16.desktop-app \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop 
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop 
+
 %find_lang %{name}
 
 %clean
@@ -62,15 +76,21 @@ done
 
 %files -f %{name}.lang
 %defattr(-, root, root, -) 
-%doc AUTHORS COPYING ChangeLog README docs/README-0.16.8
+%doc AUTHORS ChangeLog COMPLIANCE COPYING TODO 
+%doc docs/README docs/README.html docs/e16-docs.html
 %{_bindir}/e*
 %{_bindir}/starte16
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libhack.so
+%{_libdir}/%{name}/lib*.so
 %{_datadir}/%{name}
 %{_datadir}/xsessions/*
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Dec 07 2009 Terje Rosten <terjeros at phys.ntnu.no> - 1.0.1-1
+- 1.0.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.8.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Jan 2009 18:37:53 -0000	1.5
+++ sources	7 Dec 2009 18:34:27 -0000	1.6
@@ -1 +1 @@
-65c753282965985a11447bf7a8bfabab  e16-0.16.8.15.tar.gz
+3529707b0c7484fa3e156ed7a6c39b1e  e16-1.0.1.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 18:36:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:36:26 +0000 (UTC)
Subject: rpms/perl-Gtk2-Ex-FormFactory/devel perl-Gtk2-Ex-FormFactory.spec,
	1.3, 1.4
Message-ID: <20091207183626.BBC3211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-FormFactory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26599

Modified Files:
	perl-Gtk2-Ex-FormFactory.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Ex-FormFactory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-FormFactory/devel/perl-Gtk2-Ex-FormFactory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Gtk2-Ex-FormFactory.spec	26 Jul 2009 06:20:35 -0000	1.3
+++ perl-Gtk2-Ex-FormFactory.spec	7 Dec 2009 18:36:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-FormFactory
 Version:        0.65
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Framework for Gtk2 perl applications
 
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.65-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.65-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From terjeros at fedoraproject.org  Mon Dec  7 18:36:35 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 18:36:35 +0000 (UTC)
Subject: rpms/e16/F-11 .cvsignore,1.5,1.6 e16.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <20091207183635.D5E4A11C00EE@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26422/F-11

Modified Files:
	.cvsignore e16.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Jan 2009 18:37:53 -0000	1.5
+++ .cvsignore	7 Dec 2009 18:36:35 -0000	1.6
@@ -1 +1 @@
-e16-0.16.8.15.tar.gz
+e16-1.0.1.tar.gz


Index: e16.spec
===================================================================
RCS file: /cvs/extras/rpms/e16/F-11/e16.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- e16.spec	23 Feb 2009 22:12:29 -0000	1.9
+++ e16.spec	7 Dec 2009 18:36:35 -0000	1.10
@@ -2,8 +2,8 @@
 
 Summary:       The Enlightenment window manager, DR16
 Name:          e16
-Version:       0.16.8.15
-Release:       2%{?dist}
+Version:       1.0.1
+Release:       1%{?dist}
 License:       MIT with advertising and GPLv2+
 Group:         User Interface/Desktops
 URL:           http://www.enlightenment.org/
@@ -13,7 +13,7 @@ BuildRequires: esound-devel alsa-lib-dev
 BuildRequires: libXrandr-devel libSM-devel xorg-x11-proto-devel
 BuildRequires: libXfixes-devel libXrender-devel libXdamage-devel
 BuildRequires: libXcomposite-devel libXft-devel libXxf86vm-devel
-BuildRequires: pango-devel dbus-devel
+BuildRequires: pango-devel dbus-devel desktop-file-utils
 Requires:      dejavu-sans-fonts
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,7 +35,10 @@ release 16.
 %setup -q
 
 %build
-%configure --enable-pango
+%configure --enable-pango   \
+           --enable-mans    \
+           --enable-modules \
+           --enable-visibility-hiding
 %{__make} %{?_smp_mflags}
 for f in ChangeLog AUTHORS ; do
     mv $f $f.iso88591
@@ -55,6 +58,17 @@ done
 %{__ln_s}  ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/normal.ttf
 %{__ln_s}  ../../fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}%{_datadir}/%{name}/fonts/bold.ttf
 
+# Remove unwanted files
+find %{buildroot}%{_libdir}/e16 -name lib*.la -delete
+%{__rm} -rf %{buildroot}%{_datadir}/doc/%{name}
+
+# Desktop file
+%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{__cp} %{buildroot}%{_datadir}/e16/misc/e16.desktop-app \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop 
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop 
+
 %find_lang %{name}
 
 %clean
@@ -62,15 +76,24 @@ done
 
 %files -f %{name}.lang
 %defattr(-, root, root, -) 
-%doc AUTHORS COPYING ChangeLog README docs/README-0.16.8
+%doc AUTHORS ChangeLog COMPLIANCE COPYING TODO 
+%doc docs/README docs/README.html docs/e16-docs.html
 %{_bindir}/e*
 %{_bindir}/starte16
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libhack.so
+%{_libdir}/%{name}/lib*.so
 %{_datadir}/%{name}
 %{_datadir}/xsessions/*
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Dec 07 2009 Terje Rosten <terjeros at phys.ntnu.no> - 1.0.1-1
+- 1.0.1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.8.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.15-2
 - More font work
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Jan 2009 18:37:53 -0000	1.5
+++ sources	7 Dec 2009 18:36:35 -0000	1.6
@@ -1 +1 @@
-65c753282965985a11447bf7a8bfabab  e16-0.16.8.15.tar.gz
+3529707b0c7484fa3e156ed7a6c39b1e  e16-1.0.1.tar.gz



From terjeros at fedoraproject.org  Mon Dec  7 18:36:36 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 18:36:36 +0000 (UTC)
Subject: rpms/e16/F-12 .cvsignore, 1.5, 1.6 e16.spec, 1.10, 1.11 sources, 1.5,
	1.6
Message-ID: <20091207183636.5026A11C00EE@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26422/F-12

Modified Files:
	.cvsignore e16.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Jan 2009 18:37:53 -0000	1.5
+++ .cvsignore	7 Dec 2009 18:36:35 -0000	1.6
@@ -1 +1 @@
-e16-0.16.8.15.tar.gz
+e16-1.0.1.tar.gz


Index: e16.spec
===================================================================
RCS file: /cvs/extras/rpms/e16/F-12/e16.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- e16.spec	24 Jul 2009 20:43:39 -0000	1.10
+++ e16.spec	7 Dec 2009 18:36:35 -0000	1.11
@@ -2,8 +2,8 @@
 
 Summary:       The Enlightenment window manager, DR16
 Name:          e16
-Version:       0.16.8.15
-Release:       3%{?dist}
+Version:       1.0.1
+Release:       1%{?dist}
 License:       MIT with advertising and GPLv2+
 Group:         User Interface/Desktops
 URL:           http://www.enlightenment.org/
@@ -13,7 +13,7 @@ BuildRequires: esound-devel alsa-lib-dev
 BuildRequires: libXrandr-devel libSM-devel xorg-x11-proto-devel
 BuildRequires: libXfixes-devel libXrender-devel libXdamage-devel
 BuildRequires: libXcomposite-devel libXft-devel libXxf86vm-devel
-BuildRequires: pango-devel dbus-devel
+BuildRequires: pango-devel dbus-devel desktop-file-utils
 Requires:      dejavu-sans-fonts
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,7 +35,10 @@ release 16.
 %setup -q
 
 %build
-%configure --enable-pango
+%configure --enable-pango   \
+           --enable-mans    \
+           --enable-modules \
+           --enable-visibility-hiding
 %{__make} %{?_smp_mflags}
 for f in ChangeLog AUTHORS ; do
     mv $f $f.iso88591
@@ -55,6 +58,17 @@ done
 %{__ln_s}  ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/normal.ttf
 %{__ln_s}  ../../fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}%{_datadir}/%{name}/fonts/bold.ttf
 
+# Remove unwanted files
+find %{buildroot}%{_libdir}/e16 -name lib*.la -delete
+%{__rm} -rf %{buildroot}%{_datadir}/doc/%{name}
+
+# Desktop file
+%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{__cp} %{buildroot}%{_datadir}/e16/misc/e16.desktop-app \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop 
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop 
+
 %find_lang %{name}
 
 %clean
@@ -62,15 +76,21 @@ done
 
 %files -f %{name}.lang
 %defattr(-, root, root, -) 
-%doc AUTHORS COPYING ChangeLog README docs/README-0.16.8
+%doc AUTHORS ChangeLog COMPLIANCE COPYING TODO 
+%doc docs/README docs/README.html docs/e16-docs.html
 %{_bindir}/e*
 %{_bindir}/starte16
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libhack.so
+%{_libdir}/%{name}/lib*.so
 %{_datadir}/%{name}
 %{_datadir}/xsessions/*
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Dec 07 2009 Terje Rosten <terjeros at phys.ntnu.no> - 1.0.1-1
+- 1.0.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.8.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Jan 2009 18:37:53 -0000	1.5
+++ sources	7 Dec 2009 18:36:35 -0000	1.6
@@ -1 +1 @@
-65c753282965985a11447bf7a8bfabab  e16-0.16.8.15.tar.gz
+3529707b0c7484fa3e156ed7a6c39b1e  e16-1.0.1.tar.gz



From mclasen at fedoraproject.org  Mon Dec  7 18:36:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Dec 2009 18:36:53 +0000 (UTC)
Subject: rpms/control-center/devel override-redirect.patch, NONE,
	1.1 control-center.spec, 1.495, 1.496
Message-ID: <20091207183653.5FCA211C00EE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26783

Modified Files:
	control-center.spec 
Added Files:
	override-redirect.patch 
Log Message:
Improve typing break handling of multiple monitors


override-redirect.patch:
 drw-break-window.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE override-redirect.patch ---
--- gnome-control-center-2.28.1/typing-break/drw-break-window.c	2009-05-03 14:30:57.000000000 -0400
+++ hacked/typing-break/drw-break-window.c	2009-12-07 13:21:07.187559944 -0500
@@ -146,7 +146,7 @@
 					      NULL);
 	g_object_unref (client);
 
-
+        g_object_set (window, "type", GTK_WINDOW_POPUP, NULL);
 	gtk_window_set_keep_above (GTK_WINDOW (window), TRUE);
 	gtk_window_fullscreen (GTK_WINDOW (window));
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- control-center.spec	10 Nov 2009 01:03:31 -0000	1.495
+++ control-center.spec	7 Dec 2009 18:36:53 -0000	1.496
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -80,6 +80,9 @@ Patch56: best-shapes.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=147808
 Patch57: monitor-aspect.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=492974
+Patch60: override-redirect.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -221,6 +224,7 @@ for the GNOME desktop.
 %patch55 -p1 -b .finger-icons
 %patch56 -p1 -b .best-shapes
 %patch57 -p1 -b .monitor-aspect
+%patch60 -p1 -b .override-redirect
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -411,6 +415,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-6
+- Improve typing break locking for multiple monitors
+
 * Mon Nov  9 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-5
 - Use the primary monitor when determining background
   aspect ratio (gnome #137808)



From jkratoch at fedoraproject.org  Mon Dec  7 18:39:27 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon,  7 Dec 2009 18:39:27 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-archer-pie-addons.patch, NONE,
	1.1 gdb-archer-pie.patch, NONE,
	1.1 gdb-readline-6.0-signal.patch, NONE,
	1.1 gdb-x86_64-i386-syscall-restart.patch, NONE,
	1.1 gdb-6.3-test-pie-20050107.patch, 1.11,
	1.12 gdb-7.0-upstream.patch, 1.1, 1.2 gdb-archer.patch, 1.37,
	1.38 gdb.spec, 1.399,
	1.400 gdb-6.3-nonthreaded-wp-20050117.patch, 1.8,
	NONE gdb-6.3-pie-20050110.patch, 1.26, NONE
Message-ID: <20091207183927.7B38311C00EE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27834

Modified Files:
	gdb-6.3-test-pie-20050107.patch gdb-7.0-upstream.patch 
	gdb-archer.patch gdb.spec 
Added Files:
	gdb-archer-pie-addons.patch gdb-archer-pie.patch 
	gdb-readline-6.0-signal.patch 
	gdb-x86_64-i386-syscall-restart.patch 
Removed Files:
	gdb-6.3-nonthreaded-wp-20050117.patch 
	gdb-6.3-pie-20050110.patch 
Log Message:
* Mon Dec  7 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-9.fc12
- Replace the PIE (Position Indepdent Executable) support patch by a new one.
- Drop gdb-6.3-nonthreaded-wp-20050117.patch as fuzzy + redundant.
- Fix callback-mode readline-6.0 regression for CTRL-C.
- Fix syscall restarts for amd64->i386 biarch.
- Various testsuite results stability fixes.
- Fix crash on reading stabs on 64bit (BZ 537837).
- archer-jankratochvil-fedora12 commit: 16276c1aad1366b92e687c72cab30192280e1906
- archer-jankratochvil-pie-fedora12 ct: 2ae60b5156d43aabfe5757940eaf7b4370fb05d2


gdb-archer-pie-addons.patch:
 dwarf2read.c |   17 +++++++++++++----
 exec.c       |   20 ++++++++++++++++++--
 gdbtypes.h   |    3 +++
 jv-lang.c    |    6 ++++--
 solib-svr4.c |    8 ++++++--
 solib.c      |   13 +++++++++++++
 solib.h      |    2 ++
 solist.h     |    3 +++
 symfile.c    |   35 ++++++++++++++++++++++++++++-------
 value.c      |    6 ++++--
 10 files changed, 94 insertions(+), 19 deletions(-)

--- NEW FILE gdb-archer-pie-addons.patch ---
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -5754,7 +5754,12 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
 {
   struct attribute *attr;
   struct symbol *sym;
-  CORE_ADDR base = (CORE_ADDR) 0;
+  struct objfile *objfile = cu->objfile;
+  CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets,
+				 SECT_OFF_TEXT (objfile));
+  /* This is used only for DW_AT_data_member_location entries.  */
+  CORE_ADDR base = 0;
+  int base_p = 0;
 
   attr = dwarf2_attr (die, DW_AT_location, cu);
   if (attr)
@@ -5763,6 +5768,7 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
       if (attr_form_is_block (attr))
 	{
 	  base = decode_locdesc (DW_BLOCK (attr), cu);
+	  base_p = 1;
 	}
       else if (attr_form_is_section_offset (attr))
 	{
@@ -5824,12 +5830,15 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
 	      else
 		dwarf2_complex_location_expr_complaint ();
 
-	      SYMBOL_VALUE_ADDRESS (sym) = base + byte_offset;
+	      if (!base_p)
+		dwarf2_invalid_attrib_class_complaint
+		  ("DW_AT_data_member_location", "common block member");
+	      SYMBOL_VALUE_ADDRESS (sym) = base + byte_offset + baseaddr;
 	      add_symbol_to_list (sym, &global_symbols);
 	    }
 
 	  if (SYMBOL_CLASS (sym) == LOC_STATIC)
-	    SET_FIELD_PHYSADDR (*field, SYMBOL_VALUE_ADDRESS (sym));
+	    SET_FIELD_PHYSADDR (*field, SYMBOL_VALUE_ADDRESS (sym) - baseaddr);
 	  else
 	    SET_FIELD_PHYSNAME (*field, SYMBOL_LINKAGE_NAME (sym));
 	  FIELD_TYPE (*field) = SYMBOL_TYPE (sym);
@@ -5843,7 +5852,7 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
 
       sym = new_symbol (die, type, cu);
       /* SYMBOL_VALUE_ADDRESS never gets used as all its fields are static.  */
-      SYMBOL_VALUE_ADDRESS (sym) = base;
+      SYMBOL_VALUE_ADDRESS (sym) = base + baseaddr;
 
       set_die_type (die, type, cu);
     }
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -32,6 +32,7 @@
 #include "exec.h"
 #include "observer.h"
 #include "arch-utils.h"
+#include "solib.h"
 
 #include <fcntl.h>
 #include "readline/readline.h"
@@ -220,6 +221,10 @@ exec_file_attach (char *filename, int from_tty)
       char *scratch_pathname;
       int scratch_chan;
       struct target_section *sections = NULL, *sections_end = NULL;
+      struct target_section *p;
+      int addr_bit;
+      CORE_ADDR mask = CORE_ADDR_MAX;
+      CORE_ADDR displacement;
 
       scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, filename,
 		   write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY,
@@ -288,12 +293,23 @@ exec_file_attach (char *filename, int from_tty)
 		 scratch_pathname, bfd_errmsg (bfd_get_error ()));
 	}
 
+      set_gdbarch_from_file (exec_bfd);
+
+      addr_bit = gdbarch_addr_bit (target_gdbarch);
+      if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
+	mask = ((CORE_ADDR) 1 << addr_bit) - 1;
+
+      displacement = solib_exec_displacement ();
+      for (p = sections; p < sections_end; p++)
+	{
+	  p->addr = (p->addr + displacement) & mask;
+	  p->endaddr = (p->endaddr + displacement) & mask;
+	}
+
       exec_bfd_mtime = bfd_get_mtime (exec_bfd);
 
       validate_files ();
 
-      set_gdbarch_from_file (exec_bfd);
-
       /* Add the executable's sections to the current address spaces'
 	 list of sections.  */
       add_target_sections (sections, sections_end);
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -966,6 +966,7 @@ extern void allocate_cplus_struct_type (struct type *);
 #define FIELD_LOC_KIND(thisfld) ((thisfld).loc_kind)
 #define FIELD_BITPOS(thisfld) ((thisfld).loc.bitpos)
 #define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname)
+/* This address is unrelocated by the objfile's ANOFFSET.  */
 #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr)
 #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block)
 #define SET_FIELD_BITPOS(thisfld, bitpos)			\
@@ -974,6 +975,7 @@ extern void allocate_cplus_struct_type (struct type *);
 #define SET_FIELD_PHYSNAME(thisfld, name)			\
   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME,		\
    FIELD_STATIC_PHYSNAME (thisfld) = (name))
+/* This address is unrelocated by the objfile's ANOFFSET.  */
 #define SET_FIELD_PHYSADDR(thisfld, addr)			\
   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR,		\
    FIELD_STATIC_PHYSADDR (thisfld) = (addr))
@@ -989,6 +991,7 @@ extern void allocate_cplus_struct_type (struct type *);
 #define TYPE_FIELD_LOC_KIND(thistype, n) FIELD_LOC_KIND (TYPE_FIELD (thistype, n))
 #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))
 #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n))
+/* This address is unrelocated by the objfile's ANOFFSET.  */
 #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) FIELD_STATIC_PHYSADDR (TYPE_FIELD (thistype, n))
 #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n))
 #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n))
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -416,7 +416,8 @@ java_link_class_type (struct gdbarch *gdbarch,
 
   fields = NULL;
   nfields--;			/* First set up dummy "class" field. */
-  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas));
+  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas)
+    - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
   TYPE_FIELD_NAME (type, nfields) = "class";
   TYPE_FIELD_TYPE (type, nfields) = value_type (clas);
   SET_TYPE_FIELD_PRIVATE (type, nfields);
@@ -462,7 +463,8 @@ java_link_class_type (struct gdbarch *gdbarch,
 	  SET_TYPE_FIELD_PROTECTED (type, i);
 	}
       if (accflags & 0x0008)	/* ACC_STATIC */
-	SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset);
+	SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset
+	  - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
       else
 	TYPE_FIELD_BITPOS (type, i) = 8 * boffset;
       if (accflags & 0x8000)	/* FIELD_UNRESOLVED_FLAG */
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1621,7 +1621,10 @@ svr4_exec_displacement (void)
   if (target_auxv_search (&current_target, AT_ENTRY, &entry_point) == 1)
     return entry_point - exec_entry_point (exec_bfd, &current_target);
 
-  return svr4_static_exec_displacement ();
+  if (!ptid_equal (inferior_ptid, null_ptid))
+    return svr4_static_exec_displacement ();
+
+  return 0;
 }
 
 /* Relocate the main executable.  This function should be called upon
@@ -1632,7 +1635,7 @@ svr4_exec_displacement (void)
 static void
 svr4_relocate_main_executable (void)
 {
-  CORE_ADDR displacement = svr4_exec_displacement ();
+  CORE_ADDR displacement = solib_exec_displacement ();
 
   /* Even if DISPLACEMENT is 0 still try to relocate it as this is a new
      difference of in-memory vs. in-file addresses and we could already
@@ -1975,6 +1978,7 @@ _initialize_svr4_solib (void)
   svr4_so_ops.free_so = svr4_free_so;
   svr4_so_ops.clear_solib = svr4_clear_solib;
   svr4_so_ops.solib_create_inferior_hook = svr4_solib_create_inferior_hook;
+  svr4_so_ops.exec_displacement = svr4_exec_displacement;
   svr4_so_ops.special_symbol_handling = svr4_special_symbol_handling;
   svr4_so_ops.current_sos = svr4_current_sos;
   svr4_so_ops.open_symbol_file_object = open_symbol_file_object;
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -1014,6 +1014,19 @@ solib_create_inferior_hook (int from_tty)
   ops->solib_create_inferior_hook (from_tty);
 }
 
+/* Query the difference of in-memory VMA addresses vs. exec_bfd VMAs.  */
+
+CORE_ADDR
+solib_exec_displacement (void)
+{
+  struct target_so_ops *ops = solib_ops (target_gdbarch);
+
+  if (ops->exec_displacement != NULL)
+    return (*ops->exec_displacement) ();
+  else
+    return 0;
+}
+
 /* GLOBAL FUNCTION
 
    in_solib_dynsym_resolve_code -- check to see if an address is in
--- a/gdb/solib.h
+++ b/gdb/solib.h
@@ -43,6 +43,8 @@ extern int solib_read_symbols (struct so_list *, int);
 
 extern void solib_create_inferior_hook (int from_tty);
 
+extern CORE_ADDR solib_exec_displacement (void);
+
 /* If ADDR lies in a shared library, return its name.  */
 
 extern char *solib_name_from_address (CORE_ADDR);
--- a/gdb/solist.h
+++ b/gdb/solist.h
@@ -89,6 +89,9 @@ struct target_so_ops
     /* Target dependent code to run after child process fork.  */
     void (*solib_create_inferior_hook) (int from_tty);
 
+    /* Query the difference of in-memory VMA addresses vs. exec_bfd VMAs.  */
+    CORE_ADDR (*exec_displacement) (void);
+
     /* Do additional symbol handling, lookup, etc. after symbols
        for a shared object have been loaded.  */
     void (*special_symbol_handling) (void);
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -873,15 +873,36 @@ syms_from_objfile (struct objfile *objfile,
      if an error occurs during symbol reading.  */
   old_chain = make_cleanup_free_objfile (objfile);
 
-  /* If ADDRS and OFFSETS are both NULL, put together a dummy address
-     list.  We now establish the convention that an addr of zero means
-     no load address was specified. */
+  /* If ADDRS and OFFSETS are both NULL, put together a dummy offset list.  */
+
   if (! addrs && ! offsets)
     {
-      local_addr
-	= alloc_section_addr_info (bfd_count_sections (objfile->obfd));
-      make_cleanup (xfree, local_addr);
-      addrs = local_addr;
+      /* Relocateble files have an exception in default_symfile_offsets which
+	 applies only for ADDRS.  But calling solib_exec_displacement is more
+	 suitable for OFFSETS.  Fortunately we never need the both
+	 functionalities simultaneously and in other cases zeroed ADDRS and
+	 zeroed OFFSETS are equivalent.  */
+
+      if ((bfd_get_file_flags (objfile->obfd) & (EXEC_P | DYNAMIC)) == 0)
+	{
+	  local_addr
+		 = alloc_section_addr_info (bfd_count_sections (objfile->obfd));
+	  make_cleanup (xfree, local_addr);
+	  addrs = local_addr;
+	}
+      else
+	{
+	  CORE_ADDR displacement = 0;
+	  int i;
+
+	  if (mainline)
+	    displacement = solib_exec_displacement ();
+
+	  num_offsets = bfd_count_sections (objfile->obfd);
+	  offsets = alloca (SIZEOF_N_SECTION_OFFSETS (num_offsets));
+	  for (i = 0; i < num_offsets; i++)
+	    offsets->offsets[i] = displacement;
+	}
     }
 
   /* Now either addrs or offsets is non-zero.  */
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1890,7 +1890,8 @@ value_static_field (struct type *type, int fieldno)
   if (TYPE_FIELD_LOC_KIND (type, fieldno) == FIELD_LOC_KIND_PHYSADDR)
     {
       retval = value_at (TYPE_FIELD_TYPE (type, fieldno),
-			 TYPE_FIELD_STATIC_PHYSADDR (type, fieldno));
+			 TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)
+			   + (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
     }
   else
     {
@@ -1920,7 +1921,8 @@ value_static_field (struct type *type, int fieldno)
  	}
       if (retval && VALUE_LVAL (retval) == lval_memory)
 	SET_FIELD_PHYSADDR (TYPE_FIELD (type, fieldno),
-			    value_address (retval));
+			    value_address (retval)
+			      - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
     }
   return retval;
 }

gdb-archer-pie.patch:
 b/gdb/auxv.c                                    |  162 ++++++-
 b/gdb/auxv.h                                    |    6 
 b/gdb/breakpoint.c                              |    3 
 b/gdb/defs.h                                    |   15 
 b/gdb/exec.c                                    |   29 +
 b/gdb/infcmd.c                                  |   36 -
 b/gdb/infrun.c                                  |    2 
 b/gdb/linux-nat.c                               |    2 
 b/gdb/linux-tdep.c                              |   31 -
 b/gdb/nto-procfs.c                              |    4 
 b/gdb/objfiles.c                                |   54 ++
 b/gdb/procfs.c                                  |    2 
 b/gdb/solib-darwin.c                            |    2 
 b/gdb/solib-frv.c                               |    2 
 b/gdb/solib-irix.c                              |    4 
 b/gdb/solib-null.c                              |    2 
 b/gdb/solib-osf.c                               |    2 
 b/gdb/solib-pa64.c                              |    2 
 b/gdb/solib-som.c                               |    2 
 b/gdb/solib-spu.c                               |   26 -
 b/gdb/solib-sunos.c                             |    2 
 b/gdb/solib-svr4.c                              |  247 ++++++----
 b/gdb/solib-target.c                            |    2 
 b/gdb/solib.c                                   |   19 
 b/gdb/solib.h                                   |    2 
 b/gdb/solist.h                                  |    2 
 b/gdb/symfile.c                                 |  234 ++++++----
 b/gdb/symfile.h                                 |   10 
 b/gdb/symtab.c                                  |    7 
 b/gdb/testsuite/gdb.base/break-interp-lib.c     |   40 +
 b/gdb/testsuite/gdb.base/break-interp-main.c    |   30 +
 b/gdb/testsuite/gdb.base/break-interp.exp       |  545 ++++++++++++++++++++++++
 b/gdb/testsuite/gdb.base/corefile.exp           |   89 ---
 b/gdb/testsuite/gdb.base/valgrind-db-attach.c   |   30 +
 b/gdb/testsuite/gdb.base/valgrind-db-attach.exp |   74 +++
 b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp       |    6 
 b/gdb/testsuite/lib/gdb.exp                     |   79 +++
 gdb/testsuite/gdb.base/pie-support.c            |   34 -
 gdb/testsuite/gdb.base/pie-support.exp          |   58 --
 39 files changed, 1430 insertions(+), 468 deletions(-)

--- NEW FILE gdb-archer-pie.patch ---
http://sourceware.org/gdb/wiki/ProjectArcher
http://sourceware.org/gdb/wiki/ArcherBranchManagement

archer-jankratochvil-pie-fedora12
GIT snapshot:
commit 2ae60b5156d43aabfe5757940eaf7b4370fb05d2


diff --git a/gdb/auxv.c b/gdb/auxv.c
index 7b4ecbe..7df8eb5 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -25,6 +25,7 @@
 #include "inferior.h"
 #include "valprint.h"
 #include "gdb_assert.h"
+#include "gdbcore.h"
 
 #include "auxv.h"
 #include "elf/common.h"
@@ -33,15 +34,11 @@
 #include <fcntl.h>
 
 
-/* This function is called like a to_xfer_partial hook, but must be
-   called with TARGET_OBJECT_AUXV.  It handles access via
-   /proc/PID/auxv, which is a common method for native targets.  */
+/* This function handles access via /proc/PID/auxv, which is a common method
+   for native targets.  */
 
-LONGEST
-procfs_xfer_auxv (struct target_ops *ops,
-		  enum target_object object,
-		  const char *annex,
-		  gdb_byte *readbuf,
+static LONGEST
+procfs_xfer_auxv (gdb_byte *readbuf,
 		  const gdb_byte *writebuf,
 		  ULONGEST offset,
 		  LONGEST len)
@@ -50,9 +47,6 @@ procfs_xfer_auxv (struct target_ops *ops,
   int fd;
   LONGEST n;
 
-  gdb_assert (object == TARGET_OBJECT_AUXV);
-  gdb_assert (readbuf || writebuf);
-
   pathname = xstrprintf ("/proc/%d/auxv", PIDGET (inferior_ptid));
   fd = open (pathname, writebuf != NULL ? O_WRONLY : O_RDONLY);
   xfree (pathname);
@@ -72,6 +66,152 @@ procfs_xfer_auxv (struct target_ops *ops,
   return n;
 }
 
+/* This function handles access via ld.so's symbol `_dl_auxv'.  */
+
+static LONGEST
+ld_so_xfer_auxv (gdb_byte *readbuf,
+		 const gdb_byte *writebuf,
+		 ULONGEST offset,
+		 LONGEST len)
+{
+  struct minimal_symbol *msym;
+  CORE_ADDR data_address, pointer_address;
+  struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
+  size_t ptr_size = TYPE_LENGTH (ptr_type);
+  size_t auxv_pair_size = 2 * ptr_size;
+  gdb_byte *ptr_buf = alloca (ptr_size);
+  LONGEST retval;
+  size_t block;
+
+  msym = lookup_minimal_symbol ("_dl_auxv", NULL, NULL);
+  if (msym == NULL)
+    return -1;
+
+  if (MSYMBOL_SIZE (msym) != ptr_size)
+    return -1;
+
+  /* POINTER_ADDRESS is a location where the `_dl_auxv' variable resides.
+     DATA_ADDRESS is the inferior value present in `_dl_auxv', therefore the
+     real inferior AUXV address.  */
+
+  pointer_address = SYMBOL_VALUE_ADDRESS (msym);
+
+  data_address = read_memory_typed_address (pointer_address, ptr_type);
+
+  /* Possibly still not initialized such as during an inferior startup.  */
+  if (data_address == 0)
+    return -1;
+
+  data_address += offset;
+
+  if (writebuf != NULL)
+    {
+      if (target_write_memory (data_address, writebuf, len) == 0)
+	return len;
+      else
+	return -1;
+    }
+
+  /* Stop if trying to read past the existing AUXV block.  The final AT_NULL
+     was already returned before.  */
+
+  if (offset >= auxv_pair_size)
+    {
+      if (target_read_memory (data_address - auxv_pair_size, ptr_buf,
+			      ptr_size) != 0)
+	return -1;
+
+      if (extract_typed_address (ptr_buf, ptr_type) == AT_NULL)
+	return 0;
+    }
+
+  retval = 0;
+  block = 0x400;
+  gdb_assert (block % auxv_pair_size == 0);
+
+  while (len > 0)
+    {
+      if (block > len)
+	block = len;
+
+      /* Reading sizes smaller than AUXV_PAIR_SIZE is not supported.  Tails
+	 unaligned to AUXV_PAIR_SIZE will not be read during a call (they
+	 should be completed during next read with new/extended buffer).  */
+
+      block &= -auxv_pair_size;
+      if (block == 0)
+	return retval;
+
+      if (target_read_memory (data_address, readbuf, block) != 0)
+	{
+	  if (block <= auxv_pair_size)
+	    return retval;
+
+	  block = auxv_pair_size;
+	  continue;
+	}
+
+      data_address += block;
+      len -= block;
+
+      /* Check terminal AT_NULL.  This function is being called indefinitely
+         being extended its READBUF until it returns EOF (0).  */
+
+      while (block >= auxv_pair_size)
+	{
+	  retval += auxv_pair_size;
+
+	  if (extract_typed_address (readbuf, ptr_type) == AT_NULL)
+	    return retval;
+
+	  readbuf += auxv_pair_size;
+	  block -= auxv_pair_size;
+	}
+    }
+
+  return retval;
+}
+
+/* This function is called like a to_xfer_partial hook, but must be
+   called with TARGET_OBJECT_AUXV.  It handles access to AUXV.  */
+
+LONGEST
+memory_xfer_auxv (struct target_ops *ops,
+		  enum target_object object,
+		  const char *annex,
+		  gdb_byte *readbuf,
+		  const gdb_byte *writebuf,
+		  ULONGEST offset,
+		  LONGEST len)
+{
+  /* Workaround gdb-7.0 bug where linux_nat_xfer_partial() does
+       inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid));
+     and current_inferior() assertion fails not finding the LWP->PID.
+     It got fixed post-gdb-7.0 by:
+       Add base multi-executable/process support to GDB.
+       40ff0a289e6165aa930af284df5c52162cb0cd5f
+     by introducing `current_inferior_'.  */
+  struct inferior *inf = find_inferior_pid (ptid_get_pid (inferior_ptid));
+
+  gdb_assert (object == TARGET_OBJECT_AUXV);
+  gdb_assert (readbuf || writebuf);
+
+   /* ld_so_xfer_auxv is the only function safe for virtual executables being
+      executed by valgrind's memcheck.  As using ld_so_xfer_auxv is problematic
+      during inferior startup GDB does call it only for attached processes.  */
+
+  if (inf == NULL || inf->attach_flag != 0)
+    {
+      LONGEST retval;
+
+      retval = ld_so_xfer_auxv (readbuf, writebuf, offset, len);
+      if (retval != -1)
+	return retval;
+    }
+
+  return procfs_xfer_auxv (readbuf, writebuf, offset, len);
+}
[...2248 lines suppressed...]
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/valgrind-db-attach.exp b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
new file mode 100644
index 0000000..ac06fd3
--- /dev/null
+++ b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
@@ -0,0 +1,74 @@
+# Copyright 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set test valgrind-db-attach
+set srcfile $test.c
+set executable $test
+set binfile ${objdir}/${subdir}/${executable}
+if {[build_executable $test.exp $executable $srcfile {debug}] == -1} {
+    return -1
+}
+
+gdb_exit
+
+# remote_spawn breaks the command on each whitespace despite possible quoting.
+# Use backslash-escaped whitespace there instead:
+
+set db_command "--db-command=$GDB $INTERNAL_GDBFLAGS $GDBFLAGS [host_info gdb_opts] %f %p"
+regsub -all " " $db_command "\\ " db_command
+
+set test "spawn valgrind"
+set cmd "valgrind --db-attach=yes $db_command $binfile"
+set res [remote_spawn host $cmd];
+if { $res < 0 || $res == "" } {
+    verbose -log "Spawning $cmd failed."
+    setup_xfail *-*-*
+    fail $test
+    return -1
+}
+pass $test
+# Declare GDB now as running.
+set gdb_spawn_id -1
+
+set test "valgrind started"
+# The trailing '.' differs for different memcheck versions.
+gdb_test_multiple "" $test {
+    -re "Memcheck, a memory error detector\\.?\r\n" {
+	pass $test
+    }
+    -re "valgrind: failed to start tool 'memcheck' for platform '.*': No such file or directory" {
+	setup_xfail *-*-*
+	fail $test
+	return -1
+    }
+}
+
+set double_free [gdb_get_line_number "double-free"]
+
+gdb_test_multiple "" $test {
+    -re "Invalid free\\(\\) / delete / delete\\\[\\\]\r\n.*: main \\(${srcfile}:$double_free\\)\r\n.*---- Attach to debugger \\? --- \[^\r\n\]* ---- " {
+	send_gdb "y\r"
+    }
+    -re "---- Attach to debugger \\? --- \[^\r\n\]* ---- " {
+	send_gdb "n\r"
+	exp_continue
+    }
+}
+
+# Initialization from default_gdb_start.
+gdb_test "set height 0"
+gdb_test "set width 0"
+
+gdb_test "bt" "in main \\(.*\\) at .*${srcfile}:$double_free"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp
index 61e1fe4..9109030 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp
@@ -55,6 +55,12 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
+# Test also objfile->psymtabs_addrmap relocations for -fPIE -pie builds below.
+# On some targets it may possibly fail but the program is being started only
+# for the PIE build so try it anyway.
+
+runto_main
+
 # Correct output:
 # 	Line 39 of "../.././gdb/testsuite/gdb.dwarf2/dw2-ranges.S" starts at address 0x4 and ends at 0x8.
 # Wrong output:
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index d0c3493..fbf9124 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -2778,6 +2778,11 @@ proc gdb_gnu_strip_debug { dest args } {
       return 1
     }
 
+    # Workaround PR binutils/10802:
+    # Preserve the 'x' bit also for PIEs (Position Independent Executables).
+    set perm [file attributes ${dest} -permissions]
+    file attributes ${stripped_file} -permissions $perm
+
     # Get rid of everything but the debug info, and store result in debug_file
     # This will be in the .debug subdirectory, see above.
     set result [catch "exec $strip_to_file_program --only-keep-debug ${dest} -o ${debug_file}" output]
@@ -2814,7 +2819,12 @@ proc gdb_gnu_strip_debug { dest args } {
       return 1
     }
 
-   return 0
+    # Workaround PR binutils/10802:
+    # Preserve the 'x' bit also for PIEs (Position Independent Executables).
+    set perm [file attributes ${stripped_file} -permissions]
+    file attributes ${dest} -permissions $perm
+
+    return 0
 }
 
 # Test the output of GDB_COMMAND matches the pattern obtained
@@ -3043,3 +3053,70 @@ if {[info exists TRANSCRIPT]} {
     return [uplevel real_send_gdb $args]
   }
 }
+
+proc core_find {binfile {deletefiles {}} {arg ""}} {
+    global objdir subdir
+
+    set destcore "$binfile.core"
+    file delete $destcore
+
+    # Create a core file named "$destcore" rather than just "core", to
+    # avoid problems with sys admin types that like to regularly prune all
+    # files named "core" from the system.
+    #
+    # Arbitrarily try setting the core size limit to "unlimited" since
+    # this does not hurt on systems where the command does not work and
+    # allows us to generate a core on systems where it does.
+    #
+    # Some systems append "core" to the name of the program; others append
+    # the name of the program to "core"; still others (like Linux, as of
+    # May 2003) create cores named "core.PID".  In the latter case, we
+    # could have many core files lying around, and it may be difficult to
+    # tell which one is ours, so let's run the program in a subdirectory.
+    set found 0
+    set coredir "${objdir}/${subdir}/coredir.[getpid]"
+    file mkdir $coredir
+    catch "system \"(cd ${coredir}; ulimit -c unlimited; ${binfile} ${arg}; true) >/dev/null 2>&1\""
+    #      remote_exec host "${binfile}"
+    foreach i "${coredir}/core ${coredir}/core.coremaker.c ${binfile}.core" {
+	if [remote_file build exists $i] {
+	    remote_exec build "mv $i $destcore"
+	    set found 1
+	}
+    }
+    # Check for "core.PID".
+    if { $found == 0 } {
+	set names [glob -nocomplain -directory $coredir core.*]
+	if {[llength $names] == 1} {
+	    set corefile [file join $coredir [lindex $names 0]]
+	    remote_exec build "mv $corefile $destcore"
+	    set found 1
+	}
+    }
+    if { $found == 0 } {
+	# The braindamaged HPUX shell quits after the ulimit -c above
+	# without executing ${binfile}.  So we try again without the
+	# ulimit here if we didn't find a core file above.
+	# Oh, I should mention that any "braindamaged" non-Unix system has
+	# the same problem. I like the cd bit too, it's really neat'n stuff.
+	catch "system \"(cd ${objdir}/${subdir}; ${binfile}; true) >/dev/null 2>&1\""
+	foreach i "${objdir}/${subdir}/core ${objdir}/${subdir}/core.coremaker.c ${binfile}.core" {
+	    if [remote_file build exists $i] {
+		remote_exec build "mv $i $destcore"
+		set found 1
+	    }
+	}
+    }
+
+    # Try to clean up after ourselves. 
+    foreach deletefile $deletefiles {
+	remote_file build delete [file join $coredir $deletefile]
+    }
+    remote_exec build "rmdir $coredir"
+	
+    if { $found == 0  } {
+	warning "can't generate a core file - core tests suppressed - check ulimit -c"
+	return ""
+    }
+    return $destcore
+}

gdb-readline-6.0-signal.patch:
 config.in                      |    3 +
 configure                      |   72 +++++++++++++++++++----------------------
 configure.ac                   |   12 +++++-
 event-loop.c                   |   14 +++++++
 testsuite/gdb.gdb/selftest.exp |   40 +++++++++++++---------
 5 files changed, 85 insertions(+), 56 deletions(-)

--- NEW FILE gdb-readline-6.0-signal.patch ---
http://sourceware.org/ml/gdb-patches/2009-11/msg00596.html
Subject: [gdb FYI-patch] callback-mode readline-6.0 regression

Hi Chet,

FSF GDB currently ships bundled with readline-5.2 which works fine.
But using --with-system-readline and readline-6.0-patchlevel4 has
a regression:

readline-5.2: Run `gdb -nx -q' and type CTRL-C:
(gdb) Quit
(gdb) _

readline-6.0: Run `gdb -nx -q' and type CTRL-C:
(gdb) _
 = nothing happens (it gets buffered and executed later)
	(It does also FAIL on gdb.gdb/selftest.exp.)

It is because GDB waits in its own poll() mainloop and readline uses via
rl_callback_handler_install and rl_callback_handler_remove.  This way the
readline internal variable _rl_interrupt_immediately remains 0 and CTRL-C gets
only stored to _rl_caught_signal but not executed.

Seen in rl_signal_handler even if _rl_interrupt_immediately is set and
_rl_handle_signal is called then the signal is still stored to
_rl_caught_signal.  In the _rl_interrupt_immediately case it should not be
stored when it was already processed.

rl_signal_handler does `_rl_interrupt_immediately = 0;' - while I am not aware
of its meaning it breaks the nest-counting of other routines which do
`_rl_interrupt_immediately++;' and `_rl_interrupt_immediately--;' possibly
creating problematic `_rl_interrupt_immediately == -1'.

`_rl_interrupt_immediately' is an internal variable, how it could be accessed
by a readline application? (OK, maybe it should not be used.)

Attaching a current GDB-side patch but it must access readline internal
variable _rl_caught_signal and it is generally just a workaround.  Could you
please include support for signals in this asynchronous mode in readline-6.1?
I find it would be enough to make RL_CHECK_SIGNALS public?


GDB: No regressions on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu.
But this is not a patch intended to be accepted.


Thanks,
Jan


gdb/
2009-11-29  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* config.in, configure: Regenerate.
	* configure.ac (for readline_echoing_p): Move inside $LIBS change.
	(for _rl_caught_signal): New.
	* event-loop.c: Include readline/readline.h.
	(gdb_do_one_event) [HAVE_READLINE_CAUGHT_SIGNAL]: New.

gdb/testsuite/
2009-11-29  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.gdb/selftest.exp (backtrace through signal handler): Move before
	SIGINT pass, drop the timeout case.
	(send SIGINT signal to child process): Use gdb_test.
	(backtrace through readline handler): New.

--- a/gdb/config.in
+++ b/gdb/config.in
@@ -351,6 +351,9 @@
 /* Define if Python interpreter is being linked in. */
 #undef HAVE_PYTHON
 
+/* readline-6.0 workaround of blocked signals. */
+#undef HAVE_READLINE_CAUGHT_SIGNAL
+
 /* Define to 1 if you have the `realpath' function. */
 #undef HAVE_REALPATH
 
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -539,17 +539,25 @@ if test "$with_system_readline" = yes; then
   # readline-6.0 started to use the name `_rl_echoing_p'.
   # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
 
-  AC_MSG_CHECKING([for readline_echoing_p])
   save_LIBS=$LIBS
   LIBS="$LIBS $READLINE"
+  AC_MSG_CHECKING([for readline_echoing_p])
   AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p;
 				    return readline_echoing_p;]]),
 		 [READLINE_ECHOING_P=yes],
 		 [READLINE_ECHOING_P=no
 		  AC_DEFINE([readline_echoing_p], [_rl_echoing_p],
 			    [readline-6.0 started to use different name.])])
-  LIBS="$save_LIBS"
   AC_MSG_RESULT([$READLINE_ECHOING_P])
+  AC_MSG_CHECKING([for _rl_caught_signal])
+  AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int volatile _rl_caught_signal;
+				    return _rl_caught_signal;]]),
+		 [READLINE_CAUGHT_SIGNAL=yes
+		  AC_DEFINE([HAVE_READLINE_CAUGHT_SIGNAL],,
+			    [readline-6.0 workaround of blocked signals.])],
+		 [READLINE_CAUGHT_SIGNAL=no])
+  AC_MSG_RESULT([$READLINE_CAUGHT_SIGNAL])
+  LIBS="$save_LIBS"
 else
   READLINE='$(READLINE_DIR)/libreadline.a'
   READLINE_DEPS='$(READLINE)'
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -37,6 +37,7 @@
 #include "exceptions.h"
 #include "gdb_assert.h"
 #include "gdb_select.h"
+#include "readline/readline.h"
 
 /* Data point to pass to the event handler.  */
 typedef union event_data
@@ -411,6 +412,9 @@ gdb_do_one_event (void *data)
   static int event_source_head = 0;
   const int number_of_sources = 3;
   int current = 0;
+#ifdef HAVE_READLINE_CAUGHT_SIGNAL
+  extern int volatile _rl_caught_signal;
+#endif
 
   /* Any events already waiting in the queue?  */
   if (process_event ())
@@ -455,6 +459,16 @@ gdb_do_one_event (void *data)
   if (gdb_wait_for_event (1) < 0)
     return -1;
 
+#ifdef HAVE_READLINE_CAUGHT_SIGNAL
+  if (async_command_editing_p && RL_ISSTATE (RL_STATE_CALLBACK)
+      && _rl_caught_signal)
+    {
+      /* Call RL_CHECK_SIGNALS this way.  */
+      rl_callback_handler_remove ();
+      rl_callback_handler_install (NULL, input_handler);
+    }
+#endif
+
   /* Handle any new events occurred while waiting.  */
   if (process_event ())
     return 1;
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -464,31 +464,42 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $"\
 	    fail "$description (timeout)"
 	}
     }
-    
-    set description "send SIGINT signal to child process"
-    send_gdb "signal SIGINT\n"
-    gdb_expect {
-	-re "Continuing with signal SIGINT.*$gdb_prompt $" {
+
+    # get a stack trace with the poll function
+    #
+    # This fails on some linux systems for unknown reasons.  On the
+    # systems where it fails, sometimes it works fine when run manually.
+    # The testsuite failures may not be limited to just aout systems.
+    setup_xfail "i*86-pc-linuxaout-gnu"
+    set description "backtrace through signal handler"
+    gdb_test_multiple "backtrace" $description {
+	-re "#0.*(read|poll).*in main \\(.*\\) at .*gdb\\.c.*$gdb_prompt $" {
 	    pass "$description"
 	}
 	-re ".*$gdb_prompt $" {
+	    # On the alpha, we hit the infamous problem about gdb
+	    # being unable to get the frame pointer (mentioned in
+	    # gdb/README).  As it is intermittent, there is no way to
+	    # XFAIL it which will give us an XPASS if the problem goes
+	    # away.
+	    setup_xfail "alpha*-*-osf*"
 	    fail "$description"
 	}
-	timeout {
-	    fail "$description (timeout)"
-	}
     }
     
-    # get a stack trace
+    gdb_test "signal SIGINT" "Continuing with signal SIGINT.*" \
+	     "send SIGINT signal to child process"
+    
+    # get a stack trace being redelivered by readline
     #
     # This fails on some linux systems for unknown reasons.  On the
     # systems where it fails, sometimes it works fine when run manually.
     # The testsuite failures may not be limited to just aout systems.
+    # Optional system readline may not have symbols to be shown.
     setup_xfail "i*86-pc-linuxaout-gnu"
-    set description "backtrace through signal handler"
-    send_gdb "backtrace\n"
-    gdb_expect {
-	-re "#0.*(read|poll).*in main \\(.*\\) at .*gdb\\.c.*$gdb_prompt $" {
+    set description "backtrace through readline handler"
+    gdb_test_multiple "backtrace" $description {
+	-re "#0.*gdb_do_one_event.*in main \\(.*\\) at .*gdb\\.c.*$gdb_prompt $" {
 	    pass "$description"
 	}
 	-re ".*$gdb_prompt $" {
@@ -500,9 +510,6 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $"\
 	    setup_xfail "alpha*-*-osf*"
 	    fail "$description"
 	}
-	timeout {
-	    fail "$description (timeout)"
-	}
     }
 
 
--- gdb-7.0/gdb/configure	2009-12-07 18:53:30.000000000 +0100
+++ gdb-7.0-x/gdb/configure	2009-12-07 18:53:14.000000000 +0100
@@ -9201,15 +9201,11 @@ if test "$with_system_readline" = yes; t
   # readline-6.0 started to use the name `_rl_echoing_p'.
   # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
 
-  echo "$as_me:$LINENO: checking for readline_echoing_p" >&5
-echo $ECHO_N "checking for readline_echoing_p... $ECHO_C" >&6
   save_LIBS=$LIBS
   LIBS="$LIBS $READLINE"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline_echoing_p" >&5
+$as_echo_n "checking for readline_echoing_p... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9221,45 +9217,45 @@ extern int readline_echoing_p;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   READLINE_ECHOING_P=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  READLINE_ECHOING_P=no
 
-READLINE_ECHOING_P=no
+$as_echo "#define readline_echoing_p _rl_echoing_p" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE_ECHOING_P" >&5
+$as_echo "$READLINE_ECHOING_P" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _rl_caught_signal" >&5
+$as_echo_n "checking for _rl_caught_signal... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-cat >>confdefs.h <<\_ACEOF
-#define readline_echoing_p _rl_echoing_p
+int
+main ()
+{
+extern int volatile _rl_caught_signal;
+				    return _rl_caught_signal;
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  READLINE_CAUGHT_SIGNAL=yes
+
+$as_echo "#define HAVE_READLINE_CAUGHT_SIGNAL /**/" >>confdefs.h
 
+else
+  READLINE_CAUGHT_SIGNAL=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE_CAUGHT_SIGNAL" >&5
+$as_echo "$READLINE_CAUGHT_SIGNAL" >&6; }
   LIBS="$save_LIBS"
-  echo "$as_me:$LINENO: result: $READLINE_ECHOING_P" >&5
-echo "${ECHO_T}$READLINE_ECHOING_P" >&6
 else
   READLINE='$(READLINE_DIR)/libreadline.a'
   READLINE_DEPS='$(READLINE)'

gdb-x86_64-i386-syscall-restart.patch:
 amd64-nat.c |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE gdb-x86_64-i386-syscall-restart.patch ---
http://sourceware.org/ml/gdb-patches/2009-11/msg00592.html
Subject: [patch] Fix syscall restarts for amd64->i386 biarch

Hi,

tested only on recent Linux kernels, it should apply also on vanilla ones.
There were various changes of the kernels behavior in the past.

FSF GDB HEAD state:
kernel debugger inferior state
x86_64 x86_64   x86_64   PASS
x86_64 x86_64   i386     FAIL without this patch, PASS with this patch
x86_64 i386     i386     PASS on recent kernels
                         (FAIL: kernel-2.6.31.5-127.fc12.x86_64 - Fedora 12)
                         (PASS: kernel-2.6.32-0.55.rc8.git1.fc13.x86_64)
i386   i386     i386     PASS


Currently gdb.base/interrupt.exp fails on amd64 host running under
--target_board unix/-m32 with:
	continue
	Continuing.
	Unknown error 512

<linux/errno.h>:
/*
 * These should never be seen by user programs.  To return one of ERESTART*
 * codes, signal_pending() MUST be set.  Note that ptrace can observe these
 * at syscall exit tracing, but they will never be left for the debugged user
 * process to see.
 */
#define ERESTARTSYS     512

"Unknown error 512" printed above is printed by the inferior itself, not by GDB.

It is because GDB reads it as 0xfffffffffffffe00 but writes it back as
0xfffffe00.
+      /* Sign-extend %eax as during return from a syscall it is being checked
+	 for -ERESTART* values -512 being above 0xfffffffffffffe00; tested by
+	 interrupt.exp.  */


Quote of Roland McGrath from IRC:

roland: in the user_regset model, there are 64-bit user_regset flavors and
32-bit user_regset flavors, so at the kabi level the (kernel) caller can say
what it means: calls on the 32-bit user_regset flavor will behave as if on
a 32-bit kernel/userland.  in ptrace, there is no way for x86_64 ptrace calls
to say "i think of the inferior as being 32 bits, so act accordingly" (tho ppc
and/or sparc have ptr
roland: ace requests that do that iirc)
roland: ergo 64-bit ptrace callers must either save/restore full 64-bits so
the kernel's sign-extension choices are preserved, or else grok magic ways to
expand stored 32-bit register contents to 64-bit values to stuff via 64-bit
ptrace
[...]
roland: there is a "32-bit-flavored task", but it's not really true that it
has 32-bit registers.  there is no 32-bit-only userland condition.  any task
can always ljmp to the 64-bit code segment and run 64-bit insns including
a 64-bit syscall
roland: so a 64-bit debugger should see and be able to fiddle the full
registers.  it can even change cs via ptrace to force the inferior into
running 32 or 64 bit code.


Saving whole 64bits for i386 targets on x86_64 hosts does not much match the
GDB architecture as `struct type' for these registers still should be 32bit
etc.   Therefore provided just this exception.

The problem is reproducible only if one does an inferior call during the
interruption to do full inferior save/restore from GDB regcache.

Regression tested on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu.


Thanks,
Jan


gdb/
2009-11-29  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* amd64-nat.c (amd64_collect_native_gregset): Do not pre-clear %eax.
	Sign extend it afterwards.

--- a/gdb/amd64-nat.c
+++ b/gdb/amd64-nat.c
@@ -131,9 +131,9 @@ amd64_collect_native_gregset (const struct regcache *regcache,
     {
       num_regs = amd64_native_gregset32_num_regs;
 
-      /* Make sure %eax, %ebx, %ecx, %edx, %esi, %edi, %ebp, %esp and
+      /* Make sure %ebx, %ecx, %edx, %esi, %edi, %ebp, %esp and
          %eip get zero-extended to 64 bits.  */
-      for (i = 0; i <= I386_EIP_REGNUM; i++)
+      for (i = I386_ECX_REGNUM; i <= I386_EIP_REGNUM; i++)
 	{
 	  if (regnum == -1 || regnum == i)
 	    memset (regs + amd64_native_gregset_reg_offset (gdbarch, i), 0, 8);
@@ -159,4 +159,20 @@ amd64_collect_native_gregset (const struct regcache *regcache,
 	    regcache_raw_collect (regcache, i, regs + offset);
 	}
     }
+
+  if (gdbarch_ptr_bit (gdbarch) == 32)
+    {
+      /* Sign-extend %eax as during return from a syscall it is being checked
+	 for -ERESTART* values -512 being above 0xfffffffffffffe00; tested by
+	 interrupt.exp.  */
+
+      int i = I386_EAX_REGNUM;
+
+      if (regnum == -1 || regnum == i)
+	{
+	  void *ptr = regs + amd64_native_gregset_reg_offset (gdbarch, i);
+
+	  *(int64_t *) ptr = *(int32_t *) ptr;
+	}
+    }
 }


gdb-6.3-test-pie-20050107.patch:
 configure            |    3 
 configure.ac         |    2 
 gdb.pie/Makefile.in  |   19 
 gdb.pie/attach.c     |   20 +
 gdb.pie/attach.exp   |  433 ++++++++++++++++++++++
 gdb.pie/attach2.c    |   24 +
 gdb.pie/break.c      |  146 +++++++
 gdb.pie/break.exp    |  977 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gdb.pie/break1.c     |   44 ++
 gdb.pie/corefile.exp |  243 ++++++++++++
 gdb.pie/coremaker.c  |  142 +++++++
 11 files changed, 2051 insertions(+), 2 deletions(-)

Index: gdb-6.3-test-pie-20050107.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.3-test-pie-20050107.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gdb-6.3-test-pie-20050107.patch	10 Sep 2009 21:37:39 -0000	1.11
+++ gdb-6.3-test-pie-20050107.patch	7 Dec 2009 18:39:26 -0000	1.12
@@ -436,7 +436,7 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ gdb-6.8.50.20090909/gdb/testsuite/gdb.pie/attach.exp	2009-09-09 19:06:01.000000000 +0200
-@@ -0,0 +1,432 @@
+@@ -0,0 +1,433 @@
 +#   Copyright 1997, 1999, 2002 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -817,7 +817,8 @@ Index: gdb-6.8.50.20090909/gdb/testsuite
 +      -re ".*warning: reading register.*I.*O error.*$gdb_prompt $" {
 +         fail "attach call, read register 3 error"
 +     }
-+     -re "Attaching to.*process $testpid.*libc.*$gdb_prompt $" {
++     -re "Attaching to.*process $testpid.*$gdb_prompt $" {
++         # libc is relocated, not relocated, therefore not printed.
 +         pass "attach call"
 +     }
 +      -re "$gdb_prompt $" {fail "attach call"}

gdb-7.0-upstream.patch:
 ./gdb/amd64fbsd-nat.c                |    3 +
 ./gdb/dwarf2-frame.c                 |    8 ++++
 ./gdb/elfread.c                      |    3 +
 ./gdb/objfiles.c                     |   16 ++++++++
 ./gdb/score-tdep.c                   |   52 ---------------------------
 ./gdb/score-tdep.h                   |   66 -----------------------------------
 gdb/dbxread.c                        |    5 +-
 gdb/testsuite/gdb.base/bigcore.exp   |    6 +--
 gdb/testsuite/gdb.base/foll-fork.c   |    3 +
 gdb/testsuite/gdb.base/foll-fork.exp |    3 +
 gdb/testsuite/gdb.base/structs.c     |    6 +++
 gdb/testsuite/gdb.base/structs.exp   |   65 ++++++++++++++++++++++------------
 12 files changed, 89 insertions(+), 147 deletions(-)

Index: gdb-7.0-upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-7.0-upstream.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-7.0-upstream.patch	30 Oct 2009 19:52:27 -0000	1.1
+++ gdb-7.0-upstream.patch	7 Dec 2009 18:39:26 -0000	1.2
@@ -262,3 +262,366 @@
 ## -1 +1 @@
 -7.0
 +7.0.0.20091030-cvs
+
+
+
+http://sourceware.org/ml/gdb-patches/2009-11/msg00594.html
+http://sourceware.org/ml/gdb-cvs/2009-11/msg00233.html
+Subject: [patch] testsuite: bigcore.exp fuzzy PASS message fix
+
+Hi,
+
+seen needlessly fuzzy results:
+	-PASS: gdb.base/bigcore.exp: extract next heap (stop at 50)
+	-PASS: gdb.base/bigcore.exp: extract prev heap (stop at 50)
+	+PASS: gdb.base/bigcore.exp: extract next heap
+	+PASS: gdb.base/bigcore.exp: extract prev heap
+
+but the .exp file just is not patient enough:
+	-Total of 4292375328 (0xffd87320) bytes bytes 53 chunks
+	+Total of 4292422432 (0xffd92b20) bytes bytes 41 chunks
+
+Increased to 200.  Tested on {x86_64,x86_64-m32}-fedora12-linux-gnu.
+
+
+Thanks,
+Jan
+
+
+gdb/testsuite/
+2009-11-29  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* gdb.base/bigcore.exp (extract_heap): Set $lim limit to 200.
+
+--- a/gdb/testsuite/gdb.base/bigcore.exp
++++ b/gdb/testsuite/gdb.base/bigcore.exp
+@@ -96,7 +96,7 @@ proc extract_heap { dir } {
+ 	}
+ 	-re " = \\(struct list \\*\\) (0x\[0-9a-f\]*).*$gdb_prompt $" {
+ 	    set heap [concat $heap $expect_out(1,string)]
+-	    if { $lim >= 50 } {
++	    if { $lim >= 200 } {
+ 		pass "$test (stop at $lim)"
+ 	    } else {
+ 		incr lim
+
+
+
+http://sourceware.org/ml/gdb-patches/2009-11/msg00593.html
+http://sourceware.org/ml/gdb-cvs/2009-12/msg00013.html
+Subject: [patch] testcase: Fix spurious structs.exp FAILs
+
+Hi,
+
+There were some rare unreproducible fuzzy FAILs seen on i386 (32-bit) inferiors:
+
+ return foo2
+ The location at which to store the function's return value is unknown.
+ If you continue, the return value that you specified will be ignored.
+ Make fun2 return now? (y or n) y
+ #0  main () at /rpmbuild/BUILD/gdb-7.0/gdb/testsuite/gdb.base/structs.c:435
+ 435          L2  = fun2();     
+ (gdb) next
+ 436          L3  = fun3();     
+ (gdb) PASS: gdb.base/structs.exp: return foo<n>; return 2 structs-tf-td
+ p/c L2
+-$4 = {a = -16 '\360', b = 0 '\000'}
+-(gdb) PASS: gdb.base/structs.exp: value foo<n> returned; return 2 structs-tf-td
++$4 = {a = 44 ',', b = 0 '\000'}
++(gdb) FAIL: gdb.base/structs.exp: value foo<n> returned; return 2 structs-tf-td
+
+Apparently
+	a = 44 ',',
+does not match
+	a = \[^,\}\]*,
+which is needed for cases where L2 (L*) remains uninitialized with random
+content.
+
+Alternative patch would just use regex `.*' and the whole new `chartest' and
+`anychar_re' parts can be dropped.
+
+Formerly 9s, now 11s, without the $first optimization it would cost 47s.
+
+Testcase has been run on {x86_64,x86_64-m32}-fedora12-linux-gnu.
+
+
+Thanks,
+Jan
+
+
+gdb/testsuite/
+2009-11-29  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	Fix spurious false FAILs.
+	* gdb.base/structs.c (chartest): New.
+	(main): Fill-in chartest.
+	* gdb.base/structs.exp (anychar_re, first): New.
+	(start_structs_test): Import global anychar_re and first.
+	New gdb_test call "set print elements 300; ${testfile}"
+	(start_structs_test <$first>): New block.
+	(any): Import global anychar_re.  New variable ac.  Use ${ac}.
+
+--- a/gdb/testsuite/gdb.base/structs.c
++++ b/gdb/testsuite/gdb.base/structs.c
+@@ -396,6 +396,8 @@ zed ()
+   L18.r = 'Z';
+ }
+ 
++static struct { char c; } chartest[256];
++
+ int main()
+ {
+ #ifdef usestubs
+@@ -404,6 +406,10 @@ int main()
+ #endif
+   int i;
+ 
++  for (i = 0; i < 256; i++)
++    chartest[i].c = i;
++  chartest[0].c = 0;  /* chartest-done */
++
+   Fun1(foo1);	
+   Fun2(foo2);	
+   Fun3(foo3);	
+--- a/gdb/testsuite/gdb.base/structs.exp
++++ b/gdb/testsuite/gdb.base/structs.exp
+@@ -36,6 +36,9 @@ set testfile "structs"
+ set srcfile ${testfile}.c
+ set binfile ${objdir}/${subdir}/${testfile}
+ 
++# Regex matching any value of `char' type like: a = 65 'A'
++set anychar_re {-?[0-9]{1,3} '(.|\\([0-7]{3}|[a-z]|\\|'))'}
++
+ # Create and source the file that provides information about the
+ # compiler used to compile the test case.
+ 
+@@ -48,6 +51,7 @@ if [get_compiler_info ${binfile}] {
+ # the last TYPES field).  Run the compmiled program up to "main".
+ # Also updates the global "testfile" to reflect the most recent build.
+ 
++set first 1
+ proc start_structs_test { types } {
+     global testfile
+     global srcfile
+@@ -56,6 +60,8 @@ proc start_structs_test { types } {
+     global subdir
+     global srcdir
+     global gdb_prompt
++    global anychar_re
++    global first
+ 
+     # Create the additional flags
+     set flags "debug"
+@@ -91,6 +97,8 @@ proc start_structs_test { types } {
+ 	    "set print address off; ${testfile}"
+     gdb_test "set width 0" "" \
+ 	    "set width 0; ${testfile}"
++    gdb_test "set print elements 300" "" \
++	    "set print elements 300; ${testfile}"
+ 
+     # Advance to main
+     if { ![runto_main] } then {
+@@ -100,6 +108,16 @@ proc start_structs_test { types } {
+     # Get the debug format
+     get_debug_format
+ 
++    # Limit the slow $anychar_re{256} matching for better performance.
++    if $first {
++	set first 0
++
++	# Verify $anychar_re can match all the values of `char' type.
++	gdb_breakpoint [gdb_get_line_number "chartest-done"]
++	gdb_continue_to_breakpoint "chartest-done" ".*chartest-done.*"
++	gdb_test "p chartest" "= {({c = ${anychar_re}}, ){255}{c = ${anychar_re}}}"
++    }
++
+     # check that at the struct containing all the relevant types is correct
+     set foo_t "type = struct struct[llength ${types}] \{"
+     for {set n 0} {$n<[llength ${types}]} {incr n} {
+@@ -161,26 +179,28 @@ proc zed { n } {
+ }
+ 
+ proc any { n } {
+-    return [lindex {
+-	"{}"
+-	"{a = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*, j = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*, j = \[^,\}\]*, k = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*, j = \[^,\}\]*, k = \[^,\}\]*, l = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*, j = \[^,\}\]*, k = \[^,\}\]*, l = \[^,\}\]*, m = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*, j = \[^,\}\]*, k = \[^,\}\]*, l = \[^,\}\]*, m = \[^,\}\]*, n = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*, j = \[^,\}\]*, k = \[^,\}\]*, l = \[^,\}\]*, m = \[^,\}\]*, n = \[^,\}\]*, o = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*, j = \[^,\}\]*, k = \[^,\}\]*, l = \[^,\}\]*, m = \[^,\}\]*, n = \[^,\}\]*, o = \[^,\}\]*, p = \[^,\}\]*}"
+-	"{a = \[^,\}\]*, b = \[^,\}\]*, c = \[^,\}\]*, d = \[^,\}\]*, e = \[^,\}\]*, f = \[^,\}\]*, g = \[^,\}\]*, h = \[^,\}\]*, i = \[^,\}\]*, j = \[^,\}\]*, k = \[^,\}\]*, l = \[^,\}\]*, m = \[^,\}\]*, n = \[^,\}\]*, o = \[^,\}\]*, p = \[^,\}\]*, q = \[^,\}\]*}"
+-    } $n]
++    global anychar_re
++    set ac $anychar_re
++    return [lindex [list \
++	"{}" \
++	"{a = ${ac}}" \
++	"{a = ${ac}, b = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}, j = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}, j = ${ac}, k = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}, j = ${ac}, k = ${ac}, l = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}, j = ${ac}, k = ${ac}, l = ${ac}, m = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}, j = ${ac}, k = ${ac}, l = ${ac}, m = ${ac}, n = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}, j = ${ac}, k = ${ac}, l = ${ac}, m = ${ac}, n = ${ac}, o = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}, j = ${ac}, k = ${ac}, l = ${ac}, m = ${ac}, n = ${ac}, o = ${ac}, p = ${ac}}" \
++	"{a = ${ac}, b = ${ac}, c = ${ac}, d = ${ac}, e = ${ac}, f = ${ac}, g = ${ac}, h = ${ac}, i = ${ac}, j = ${ac}, k = ${ac}, l = ${ac}, m = ${ac}, n = ${ac}, o = ${ac}, p = ${ac}, q = ${ac}}" \
++    ] $n]
+ }
+ 
+ # Given N (0..25), return the corresponding alphabetic letter in lower
+
+
+
+http://sourceware.org/ml/gdb-patches/2009-11/msg00573.html
+http://sourceware.org/ml/gdb-cvs/2009-11/msg00232.html
+Subject: [patch] testsuite fuzzy results fixup: foll-fork.exp
+
+Hi,
+
+one occasional timeout:
+
+ (gdb) PASS: gdb.base/foll-fork.exp: default show parent follow, no catchpoints
+ next 2
+-callee: 9949
+ 25       if (pid == 0) /* set breakpoint here */
+-(gdb) PASS: gdb.base/foll-fork.exp: default parent follow, no catchpoints
++(gdb) callee: 18747
++FAIL: gdb.base/foll-fork.exp: (timeout) default parent follow, no catchpoints
+
+Dropped the strings as there is no "callee" string expectation in
+foll-fork.exp.
+
+
+and with glibc-debuginfo installed one gets:
+
+(gdb) break 39
+Reading in symbols for ../nptl/sysdeps/unix/sysv/linux/fork.c...done.
+Breakpoint 12 at 0x3ad22a4876: file ../nptl/sysdeps/unix/sysv/linux/fork.c, line 39.
+(gdb) FAIL: gdb.base/foll-fork.exp: unpatch child, breakpoint at exit call
++
+Breakpoint 12, __libc_fork () at ../nptl/sysdeps/unix/sysv/linux/fork.c:158
+158           fresetlockfiles ();
+(gdb) FAIL: gdb.base/foll-fork.exp: unpatch child, unpatched parent breakpoints from child (unknown output)
+
+
+Thanks,
+Jan
+
+
+gdb/testsuite/
+2009-11-26  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* gdb.base/foll-fork.exp (unpatch child, breakpoint at exit call):
+	Force $srcfile file.
+	* gdb.base/foll-fork.c (callee): Comment out the printf call.
+
+--- a/gdb/testsuite/gdb.base/foll-fork.c
++++ b/gdb/testsuite/gdb.base/foll-fork.c
+@@ -9,7 +9,8 @@ void callee (i)
+   int  i;
+ #endif
+ {
+-  printf("callee: %d\n", i);
++  /* Any output corrupts GDB CLI expect strings.
++     printf("callee: %d\n", i);  */
+ }
+ 
+ #ifdef PROTOTYPES
+--- a/gdb/testsuite/gdb.base/foll-fork.exp
++++ b/gdb/testsuite/gdb.base/foll-fork.exp
+@@ -240,7 +240,8 @@ proc catch_fork_unpatch_child {} {
+    # Delete all breakpoints and catchpoints.
+    delete_breakpoints
+ 
+-   gdb_test "break $bp_exit" \
++   # Force $srcfile as the current GDB source can be in glibc sourcetree.
++   gdb_test "break $srcfile:$bp_exit" \
+        "Breakpoint .*file .*$srcfile, line .*" \
+        "unpatch child, breakpoint at exit call"
+ 
+
+
+
+http://sourceware.org/ml/gdb-patches/2009-11/msg00388.html
+http://sourceware.org/ml/gdb-cvs/2009-11/msg00156.html
+Subject: [patch] Fix crash on reading stabs
+
+Hi,
+
+there is a crash on reading stabs fpc binary:
+	https://bugzilla.redhat.com/show_bug.cgi?id=537837
+
+Program received signal SIGSEGV, Segmentation fault.
+0x000000000069db3d in read_dbx_symtab (objfile=0x1daf5f0) at dbxread.c:1369
+1369              if ((namestring[0] == '-' && namestring[1] == 'l')
+
+(gdb) p/x nlist.n_strx
+$7 = 0xfffffff8
+(gdb) p sizeof(nlist.n_strx)
+$10 = 8
+
+Below the patch context is:
+    namestring = (nlist->n_strx + file_string_table_offset
+                  + DBX_STRINGTAB (objfile));
+
+so IMO the `(unsigned)' cast is excessive as it does not match the expression
+below.  Such cast is there since the GDB "Initial revision" (1999).
+
+`n_strx' type:
+struct internal_nlist
+{
+  unsigned long n_strx;                 /* Index into string table of name.  */
+...
+};
+
+Regression tested on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu which does not
+mean anything with the default DWARF debug info.  It was hanging for stabs so
+tried just a large part of gdb.base/*.exp on x86_64-m32 - `unix/-gstabs+/-m32'.
+
+If it isn't obviously approved please feel free to drop it as one should not
+use STABS in the first place.
+
+
+Regards,
+Jan
+
+
+gdb/
+2009-11-17  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* dbxread.c (set_namestring): Remove cast to unsigned.  Check N_STRX
+	overflow.
+
+--- a/gdb/dbxread.c
++++ b/gdb/dbxread.c
+@@ -965,8 +965,9 @@ set_namestring (struct objfile *objfile, const struct internal_nlist *nlist)
+ {
+   char *namestring;
+ 
+-  if (((unsigned) nlist->n_strx + file_string_table_offset)
+-      >= DBX_STRINGTAB_SIZE (objfile))
++  if (nlist->n_strx + file_string_table_offset
++      >= DBX_STRINGTAB_SIZE (objfile)
++      || nlist->n_strx + file_string_table_offset < nlist->n_strx)
+     {
+       complaint (&symfile_complaints, _("bad string table offset in symbol %d"),
+ 		 symnum);
+

gdb-archer.patch:
 Makefile.in                                              |   92 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  773 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  294 +-
 cp-support.c                                             |  123 +
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  438 +++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |    9 
 dwarf2expr.c                                             |    7 
 dwarf2expr.h                                             |    2 
 dwarf2loc.c                                              |  227 +
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1761 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  599 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcall.c                                                |    8 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  190 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   73 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |    1 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   19 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   55 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   37 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   41 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |   10 
 testsuite/gdb.cp/cplusfuncs.exp                          |  225 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress-declarations.cc        |   93 
 testsuite/gdb.cp/namespace-stress-declarations.exp       |   50 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   77 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-prettyprint.exp                  |   22 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.exp                        |   31 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  105 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |   76 
 xcoffread.c                                              |    1 
 241 files changed, 18578 insertions(+), 2440 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-archer.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gdb-archer.patch	3 Dec 2009 16:26:36 -0000	1.37
+++ gdb-archer.patch	7 Dec 2009 18:39:26 -0000	1.38
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 6817a81cd411acc9579f04dcc105e9bce72859ff
+commit 16276c1aad1366b92e687c72cab30192280e1906
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -12245,10 +12245,22 @@ index a84003f..924c1c5 100644
    default_symfile_offsets,	/* sym_offsets: dummy FIXME til implem sym reloc */
    default_symfile_segments,	/* sym_segments: Get segment information from
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
-index 8dcca70..4b25a5a 100644
+index 8dcca70..e5442ca 100644
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
-@@ -731,6 +731,20 @@ have_partial_symbols (void)
+@@ -634,6 +634,11 @@ objfile_relocate (struct objfile *objfile, struct section_offsets *new_offsets)
+     }
+   }
+ 
++  /* Alread QUICK_ADDRMAP tiself assumes all sections have the same offset.  */
++  if (objfile->quick_addrmap)
++    addrmap_relocate (objfile->quick_addrmap,
++		      ANOFFSET (delta, SECT_OFF_TEXT (objfile)));
++
+   {
+     struct partial_symbol **psym;
+ 
+@@ -731,6 +736,20 @@ have_partial_symbols (void)
      if (objfile_has_partial_symbols (ofp))
        return 1;
    }


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- gdb.spec	3 Dec 2009 16:26:37 -0000	1.399
+++ gdb.spec	7 Dec 2009 18:39:26 -0000	1.400
@@ -14,7 +14,7 @@ Version: 7.0
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 8%{?_with_upstream:.upstream}%{?dist}
+Release: 9%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -92,14 +92,12 @@ Patch118: gdb-6.3-gstack-20050411.patch
 
 # VSYSCALL and PIE
 Patch122: gdb-6.3-test-pie-20050107.patch
-Patch124: gdb-6.3-pie-20050110.patch
+Patch124: gdb-archer-pie.patch
+Patch389: gdb-archer-pie-addons.patch
 
 # Get selftest working with sep-debug-info
 Patch125: gdb-6.3-test-self-20050110.patch
 
-# Fix for non-threaded watchpoints.
-Patch128: gdb-6.3-nonthreaded-wp-20050117.patch
-
 # Test support of multiple destructors just like multiple constructors
 Patch133: gdb-6.3-test-dtorfix-20050121.patch
 
@@ -377,6 +375,12 @@ Patch387: gdb-bz539590-gnu-ifunc.patch
 # Fix bp conditionals [bp_location-accel] regression (Phil Muldoon, BZ 538626).
 Patch388: gdb-bz538626-bp_location-accel-bp-cond.patch
 
+# Fix callback-mode readline-6.0 regression for CTRL-C.
+Patch390: gdb-readline-6.0-signal.patch
+
+# Fix syscall restarts for amd64->i386 biarch.
+Patch391: gdb-x86_64-i386-syscall-restart.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -475,6 +479,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch383 -p1
 %patch384 -p1
 %patch385 -p1
+%patch124 -p1
 %patch1 -p1
 %patch3 -p1
 
@@ -486,7 +491,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch118 -p1
 %patch122 -p1
 %patch125 -p1
-%patch128 -p1
 %patch133 -p1
 %patch136 -p1
 %patch140 -p1
@@ -579,7 +583,9 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch382 -p1
 %patch387 -p1
 %patch388 -p1
-%patch124 -p1
+%patch389 -p1
+%patch390 -p1
+%patch391 -p1
 
 find -name "*.orig" | xargs rm -f
 ! find -name "*.rej"	# Should not happen.
@@ -884,6 +890,16 @@ fi
 %endif
 
 %changelog
+* Mon Dec  7 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-9.fc12
+- Replace the PIE (Position Indepdent Executable) support patch by a new one.
+- Drop gdb-6.3-nonthreaded-wp-20050117.patch as fuzzy + redundant.
+- Fix callback-mode readline-6.0 regression for CTRL-C.
+- Fix syscall restarts for amd64->i386 biarch.
+- Various testsuite results stability fixes.
+- Fix crash on reading stabs on 64bit (BZ 537837).
+- archer-jankratochvil-fedora12 commit: 16276c1aad1366b92e687c72cab30192280e1906
+- archer-jankratochvil-pie-fedora12 ct: 2ae60b5156d43aabfe5757940eaf7b4370fb05d2
+
 * Thu Dec  3 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-8.fc12
 - Fix slowness/hang when printing some variables (Sami Wagiaalla, BZ 541093).
 - archer-jankratochvil-fedora12 commit: 6817a81cd411acc9579f04dcc105e9bce72859ff


--- gdb-6.3-nonthreaded-wp-20050117.patch DELETED ---


--- gdb-6.3-pie-20050110.patch DELETED ---



From terjeros at fedoraproject.org  Mon Dec  7 18:39:35 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 18:39:35 +0000 (UTC)
Subject: File e16-themes-1.0.0.tar.gz uploaded to lookaside cache by terjeros
Message-ID: <20091207183935.4097210F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for e16-themes:

0697ae00a32938f45d786b40a0b276fb  e16-themes-1.0.0.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 18:39:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:39:33 +0000 (UTC)
Subject: rpms/perl-Net-SSH/devel perl-Net-SSH.spec,1.17,1.18
Message-ID: <20091207183933.8BD5211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SSH/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28027

Modified Files:
	perl-Net-SSH.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SSH.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSH/devel/perl-Net-SSH.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Net-SSH.spec	26 Jul 2009 13:46:21 -0000	1.17
+++ perl-Net-SSH.spec	7 Dec 2009 18:39:33 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSH
 Version:        0.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension for secure shell
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From terjeros at fedoraproject.org  Mon Dec  7 18:40:35 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 18:40:35 +0000 (UTC)
Subject: rpms/e16-themes/devel .cvsignore, 1.2, 1.3 e16-themes.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20091207184035.C13B411C03FC@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28612

Modified Files:
	.cvsignore e16-themes.spec sources 
Log Message:
* Mon Dec 07 2009 Terje Rosten <terjeros at phys.ntnu.no> - 1.0.0-1
- 1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Apr 2008 15:58:12 -0000	1.2
+++ .cvsignore	7 Dec 2009 18:40:35 -0000	1.3
@@ -1 +1 @@
-e16-themes-0.16.8.0.2.tar.gz
+e16-themes-1.0.0.tar.gz


Index: e16-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/devel/e16-themes.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- e16-themes.spec	31 Jul 2009 14:09:39 -0000	1.5
+++ e16-themes.spec	7 Dec 2009 18:40:35 -0000	1.6
@@ -1,17 +1,17 @@
 Summary:   Themes for Enlightenment, DR16
 Name:      e16-themes
-Version:   0.16.8.0.2
-Release:   5%{?dist}
+Version:   1.0.0
+Release:   1%{?dist}
 License:   MIT with advertising
 Group:     User Interface/Desktops
 URL:       http://www.enlightenment.org/
 Source:    http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
 BuildArch: noarch
-Requires:  e16 >= 0.16.8
+Requires:  e16 >= 1.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The BlueSteel, BrushedMetal-Tigert, Ganymede, and ShinyMetal themes
+The BlueSteel, BrushedMetal-Tigert, Ganymede and ShinyMetal themes
 for Enlightenment, DR16.  
 
 This is part of the Enlightenment distribution.
@@ -37,6 +37,9 @@ This is part of the Enlightenment distri
 %{_datadir}/e16/themes
 
 %changelog
+* Mon Dec 07 2009 Terje Rosten <terjeros at phys.ntnu.no> - 1.0.0-1
+- 1.0.0
+
 * Fri Jul 31 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.0.2-5
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Apr 2008 15:58:12 -0000	1.2
+++ sources	7 Dec 2009 18:40:35 -0000	1.3
@@ -1 +1 @@
-20fbaff803c3decdf3ac7c363b37c42e  e16-themes-0.16.8.0.2.tar.gz
+0697ae00a32938f45d786b40a0b276fb  e16-themes-1.0.0.tar.gz



From mclasen at fedoraproject.org  Mon Dec  7 18:40:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  7 Dec 2009 18:40:50 +0000 (UTC)
Subject: rpms/control-center/F-12 override-redirect.patch, NONE,
	1.1 control-center.spec, 1.507, 1.508
Message-ID: <20091207184050.EEDC911C03FC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28579

Modified Files:
	control-center.spec 
Added Files:
	override-redirect.patch 
Log Message:
Improve typing  break handling of multiple monitors.


override-redirect.patch:
 drw-break-window.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE override-redirect.patch ---
--- gnome-control-center-2.28.1/typing-break/drw-break-window.c	2009-05-03 14:30:57.000000000 -0400
+++ hacked/typing-break/drw-break-window.c	2009-12-07 13:21:07.187559944 -0500
@@ -146,7 +146,7 @@
 					      NULL);
 	g_object_unref (client);
 
-
+        g_object_set (window, "type", GTK_WINDOW_POPUP, NULL);
 	gtk_window_set_keep_above (GTK_WINDOW (window), TRUE);
 	gtk_window_fullscreen (GTK_WINDOW (window));
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -p -r1.507 -r1.508
--- control-center.spec	24 Nov 2009 15:59:49 -0000	1.507
+++ control-center.spec	7 Dec 2009 18:40:50 -0000	1.508
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -80,6 +80,9 @@ Patch56: best-shapes.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=147808
 Patch57: monitor-aspect.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=492974
+Patch60: override-redirect.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -225,6 +228,7 @@ for the GNOME desktop.
 %patch55 -p1 -b .finger-icons
 %patch56 -p1 -b .best-shapes
 %patch57 -p1 -b .monitor-aspect
+%patch60 -p1 -b .override-redirect
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -416,6 +420,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-9
+- Improve typing break locking for multiple monitors
+
 * Tue Nov 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-8
 - Install PolicyKit .policy files in the right place (#540888)
 



From kasal at fedoraproject.org  Mon Dec  7 18:41:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:41:03 +0000 (UTC)
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel perl-Gtk2-Ex-Dialogs.spec,1.5,1.6
Message-ID: <20091207184103.CB26911C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28895

Modified Files:
	perl-Gtk2-Ex-Dialogs.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Ex-Dialogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-Dialogs/devel/perl-Gtk2-Ex-Dialogs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Gtk2-Ex-Dialogs.spec	26 Jul 2009 06:20:20 -0000	1.5
+++ perl-Gtk2-Ex-Dialogs.spec	7 Dec 2009 18:41:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-Dialogs
 Version:        0.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Useful tools for Gnome2/Gtk2 Perl GUI design
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From terjeros at fedoraproject.org  Mon Dec  7 18:42:33 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 18:42:33 +0000 (UTC)
Subject: rpms/e16-themes/F-11 .cvsignore, 1.2, 1.3 e16-themes.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091207184233.E239E11C00EE@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16-themes/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29420/F-11

Modified Files:
	.cvsignore e16-themes.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Apr 2008 15:58:12 -0000	1.2
+++ .cvsignore	7 Dec 2009 18:42:33 -0000	1.3
@@ -1 +1 @@
-e16-themes-0.16.8.0.2.tar.gz
+e16-themes-1.0.0.tar.gz


Index: e16-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/F-11/e16-themes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- e16-themes.spec	26 Feb 2009 20:39:10 -0000	1.3
+++ e16-themes.spec	7 Dec 2009 18:42:33 -0000	1.4
@@ -1,17 +1,17 @@
 Summary:   Themes for Enlightenment, DR16
 Name:      e16-themes
-Version:   0.16.8.0.2
-Release:   3%{?dist}
+Version:   1.0.0
+Release:   1%{?dist}
 License:   MIT with advertising
 Group:     User Interface/Desktops
 URL:       http://www.enlightenment.org/
 Source:    http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
 BuildArch: noarch
-Requires:  e16 >= 0.16.8
+Requires:  e16 >= 1.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The BlueSteel, BrushedMetal-Tigert, Ganymede, and ShinyMetal themes
+The BlueSteel, BrushedMetal-Tigert, Ganymede and ShinyMetal themes
 for Enlightenment, DR16.  
 
 This is part of the Enlightenment distribution.
@@ -37,6 +37,15 @@ This is part of the Enlightenment distri
 %{_datadir}/e16/themes
 
 %changelog
+* Mon Dec 07 2009 Terje Rosten <terjeros at phys.ntnu.no> - 1.0.0-1
+- 1.0.0
+
+* Fri Jul 31 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.0.2-5
+- Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.8.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.0.2-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Apr 2008 15:58:12 -0000	1.2
+++ sources	7 Dec 2009 18:42:33 -0000	1.3
@@ -1 +1 @@
-20fbaff803c3decdf3ac7c363b37c42e  e16-themes-0.16.8.0.2.tar.gz
+0697ae00a32938f45d786b40a0b276fb  e16-themes-1.0.0.tar.gz



From terjeros at fedoraproject.org  Mon Dec  7 18:42:34 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Mon,  7 Dec 2009 18:42:34 +0000 (UTC)
Subject: rpms/e16-themes/F-12 .cvsignore, 1.2, 1.3 e16-themes.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20091207184234.2284311C00EE@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16-themes/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29420/F-12

Modified Files:
	.cvsignore e16-themes.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Apr 2008 15:58:12 -0000	1.2
+++ .cvsignore	7 Dec 2009 18:42:33 -0000	1.3
@@ -1 +1 @@
-e16-themes-0.16.8.0.2.tar.gz
+e16-themes-1.0.0.tar.gz


Index: e16-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/F-12/e16-themes.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- e16-themes.spec	31 Jul 2009 14:09:39 -0000	1.5
+++ e16-themes.spec	7 Dec 2009 18:42:33 -0000	1.6
@@ -1,17 +1,17 @@
 Summary:   Themes for Enlightenment, DR16
 Name:      e16-themes
-Version:   0.16.8.0.2
-Release:   5%{?dist}
+Version:   1.0.0
+Release:   1%{?dist}
 License:   MIT with advertising
 Group:     User Interface/Desktops
 URL:       http://www.enlightenment.org/
 Source:    http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
 BuildArch: noarch
-Requires:  e16 >= 0.16.8
+Requires:  e16 >= 1.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The BlueSteel, BrushedMetal-Tigert, Ganymede, and ShinyMetal themes
+The BlueSteel, BrushedMetal-Tigert, Ganymede and ShinyMetal themes
 for Enlightenment, DR16.  
 
 This is part of the Enlightenment distribution.
@@ -37,6 +37,9 @@ This is part of the Enlightenment distri
 %{_datadir}/e16/themes
 
 %changelog
+* Mon Dec 07 2009 Terje Rosten <terjeros at phys.ntnu.no> - 1.0.0-1
+- 1.0.0
+
 * Fri Jul 31 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.0.2-5
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16-themes/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Apr 2008 15:58:12 -0000	1.2
+++ sources	7 Dec 2009 18:42:34 -0000	1.3
@@ -1 +1 @@
-20fbaff803c3decdf3ac7c363b37c42e  e16-themes-0.16.8.0.2.tar.gz
+0697ae00a32938f45d786b40a0b276fb  e16-themes-1.0.0.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 18:43:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:43:59 +0000 (UTC)
Subject: rpms/perl-Net-SNPP/devel perl-Net-SNPP.spec,1.7,1.8
Message-ID: <20091207184359.6A9B611C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SNPP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29998

Modified Files:
	perl-Net-SNPP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SNPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SNPP/devel/perl-Net-SNPP.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Net-SNPP.spec	26 Jul 2009 13:46:06 -0000	1.7
+++ perl-Net-SNPP.spec	7 Dec 2009 18:43:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Net-SNPP
 Version:        1.17
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl modules for the Simple Network Pager Protocol
 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.17-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:46:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:46:54 +0000 (UTC)
Subject: rpms/perl-Gtk2-Ex-Carp/devel perl-Gtk2-Ex-Carp.spec,1.5,1.6
Message-ID: <20091207184654.A8F4711C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-Carp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30925

Modified Files:
	perl-Gtk2-Ex-Carp.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Ex-Carp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-Carp/devel/perl-Gtk2-Ex-Carp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Gtk2-Ex-Carp.spec	26 Jul 2009 06:20:06 -0000	1.5
+++ perl-Gtk2-Ex-Carp.spec	7 Dec 2009 18:46:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-Carp
 Version:        0.01
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GTK+ friendly die() and warn() functions
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-7
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:50:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:50:03 +0000 (UTC)
Subject: rpms/perl-Net-SNMP/devel perl-Net-SNMP.spec,1.5,1.6
Message-ID: <20091207185003.E377011C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SNMP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31705

Modified Files:
	perl-Net-SNMP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SNMP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SNMP/devel/perl-Net-SNMP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Net-SNMP.spec	26 Jul 2009 13:45:52 -0000	1.5
+++ perl-Net-SNMP.spec	7 Dec 2009 18:50:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Net-SNMP
 Version:        5.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Object oriented interface to SNMP
 
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 5.2.0-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:51:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:51:30 +0000 (UTC)
Subject: rpms/perl-Gtk2-Ex-CalendarButton/devel
	perl-Gtk2-Ex-CalendarButton.spec, 1.5, 1.6
Message-ID: <20091207185130.C9A1011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-CalendarButton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32154

Modified Files:
	perl-Gtk2-Ex-CalendarButton.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2-Ex-CalendarButton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-CalendarButton/devel/perl-Gtk2-Ex-CalendarButton.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Gtk2-Ex-CalendarButton.spec	26 Jul 2009 06:19:52 -0000	1.5
+++ perl-Gtk2-Ex-CalendarButton.spec	7 Dec 2009 18:51:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-CalendarButton
 Version:        0.01
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Gtk2::Ex::CalendarButton Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-8
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:55:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:55:17 +0000 (UTC)
Subject: rpms/perl-Net-SMTP-SSL/devel perl-Net-SMTP-SSL.spec,1.3,1.4
Message-ID: <20091207185517.A179D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SMTP-SSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv432

Modified Files:
	perl-Net-SMTP-SSL.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SMTP-SSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SMTP-SSL/devel/perl-Net-SMTP-SSL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-SMTP-SSL.spec	26 Jul 2009 13:45:36 -0000	1.3
+++ perl-Net-SMTP-SSL.spec	7 Dec 2009 18:55:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name: perl-Net-SMTP-SSL
 Version: 1.01
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: SSL support for Net::SMTP
 Group: Development/Libraries
 License: GPL+ or Artistic
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Net::SMTP::SSL.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 18:56:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 18:56:41 +0000 (UTC)
Subject: rpms/perl-Gtk2/devel perl-Gtk2.spec,1.33,1.34
Message-ID: <20091207185641.AC58A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv738

Modified Files:
	perl-Gtk2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- perl-Gtk2.spec	30 Jul 2009 10:39:26 -0000	1.33
+++ perl-Gtk2.spec	7 Dec 2009 18:56:41 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           perl-Gtk2
 Version:        1.203
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.203-4
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.203-3
 - Fix mass rebuild breakdown: 
   Add BR: perl(ExtUtils::MakeMaker), perl(Glib::MakeHelper).



From kasal at fedoraproject.org  Mon Dec  7 19:00:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:00:03 +0000 (UTC)
Subject: rpms/perl-Net-SFTP/devel perl-Net-SFTP.spec,1.4,1.5
Message-ID: <20091207190003.B29F211C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SFTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1567

Modified Files:
	perl-Net-SFTP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SFTP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SFTP/devel/perl-Net-SFTP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Net-SFTP.spec	26 Jul 2009 13:45:18 -0000	1.4
+++ perl-Net-SFTP.spec	7 Dec 2009 19:00:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Net-SFTP
 Version:        0.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Secure File Transfer Protocol client
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:04:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:04:24 +0000 (UTC)
Subject: rpms/perl-GStreamer/devel perl-GStreamer.spec,1.11,1.12
Message-ID: <20091207190424.D16B811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GStreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2477

Modified Files:
	perl-GStreamer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GStreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GStreamer/devel/perl-GStreamer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-GStreamer.spec	29 Aug 2009 07:36:27 -0000	1.11
+++ perl-GStreamer.spec	7 Dec 2009 19:04:24 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-GStreamer
 Version:        0.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl bindings to the GStreamer framework
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.15-5
+- rebuild against perl 5.10.1
+
 * Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.15-4
 - Filter errant private provides
 



From kasal at fedoraproject.org  Mon Dec  7 19:06:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:06:12 +0000 (UTC)
Subject: rpms/perl-Net-Server/devel perl-Net-Server.spec,1.24,1.25
Message-ID: <20091207190612.B532A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2796

Modified Files:
	perl-Net-Server.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-Net-Server.spec	26 Jul 2009 13:47:22 -0000	1.24
+++ perl-Net-Server.spec	7 Dec 2009 19:06:12 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:    perl-%{cpanname}
 Version: 0.97
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
@@ -69,6 +69,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.97-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:10:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:10:40 +0000 (UTC)
Subject: rpms/perl-Net-SCP/devel perl-Net-SCP.spec,1.16,1.17
Message-ID: <20091207191040.F1E5311C03FC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-SCP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3988

Modified Files:
	perl-Net-SCP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-SCP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SCP/devel/perl-Net-SCP.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Net-SCP.spec	26 Jul 2009 13:45:02 -0000	1.16
+++ perl-Net-SCP.spec	7 Dec 2009 19:10:40 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Net-SCP
 Version:        0.08
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for secure copy protocol
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:12:18 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:12:18 +0000 (UTC)
Subject: rpms/perl-GSSAPI/devel perl-GSSAPI.spec,1.13,1.14
Message-ID: <20091207191218.3E19011C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GSSAPI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4389

Modified Files:
	perl-GSSAPI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GSSAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GSSAPI/devel/perl-GSSAPI.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-GSSAPI.spec	26 Jul 2009 06:11:05 -0000	1.13
+++ perl-GSSAPI.spec	7 Dec 2009 19:12:18 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:           perl-GSSAPI
 Version:        0.26
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension providing access to the GSSAPIv2 library
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.26-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:16:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:16:37 +0000 (UTC)
Subject: rpms/perl-Net-Ping-External/devel perl-Net-Ping-External.spec, 1.3, 
	1.4
Message-ID: <20091207191637.5D07111C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Ping-External/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5382

Modified Files:
	perl-Net-Ping-External.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Ping-External.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Ping-External/devel/perl-Net-Ping-External.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-Ping-External.spec	26 Jul 2009 13:44:34 -0000	1.3
+++ perl-Net-Ping-External.spec	7 Dec 2009 19:16:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-Ping-External
 Version:        0.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Cross-platform interface to ICMP "ping" utilities
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:17:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:17:13 +0000 (UTC)
Subject: rpms/perl-GraphViz/devel perl-GraphViz.spec,1.9,1.10
Message-ID: <20091207191713.620FD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GraphViz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5591

Modified Files:
	perl-GraphViz.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GraphViz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GraphViz/devel/perl-GraphViz.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-GraphViz.spec	26 Jul 2009 06:19:06 -0000	1.9
+++ perl-GraphViz.spec	7 Dec 2009 19:17:13 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-GraphViz
 Version:        2.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Interface to the GraphViz graphing tool
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.04-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:20:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:20:57 +0000 (UTC)
Subject: rpms/perl-Net-Pcap/devel perl-Net-Pcap.spec,1.6,1.7
Message-ID: <20091207192057.306B511C03E3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Pcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6523

Modified Files:
	perl-Net-Pcap.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Pcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/devel/perl-Net-Pcap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Net-Pcap.spec	26 Jul 2009 13:44:21 -0000	1.6
+++ perl-Net-Pcap.spec	7 Dec 2009 19:20:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Net-Pcap
 Version:        0.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Interface to pcap(3) LBL packet capture library
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:23:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:23:23 +0000 (UTC)
Subject: rpms/perl-Graphics-ColorNames/devel perl-Graphics-ColorNames.spec, 
	1.10, 1.11
Message-ID: <20091207192323.1E20D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Graphics-ColorNames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7120

Modified Files:
	perl-Graphics-ColorNames.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Graphics-ColorNames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Graphics-ColorNames/devel/perl-Graphics-ColorNames.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Graphics-ColorNames.spec	26 Jul 2009 06:19:22 -0000	1.10
+++ perl-Graphics-ColorNames.spec	7 Dec 2009 19:23:22 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Graphics-ColorNames
 Version:        2.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Defines RGB values for common color names
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.11-6
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:25:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:25:51 +0000 (UTC)
Subject: rpms/perl-Net-Patricia/devel perl-Net-Patricia.spec,1.11,1.12
Message-ID: <20091207192551.E883A11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Patricia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7778

Modified Files:
	perl-Net-Patricia.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Patricia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Patricia/devel/perl-Net-Patricia.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Net-Patricia.spec	26 Jul 2009 13:44:06 -0000	1.11
+++ perl-Net-Patricia.spec	7 Dec 2009 19:25:51 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Net-Patricia
 Version:        1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Patricia Trie perl module for fast IP address lookups
 License:        GPLv2+
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.15-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:30:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:30:56 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/devel perl-Net-OAuth.spec,1.4,1.5
Message-ID: <20091207193056.1968D11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9072

Modified Files:
	perl-Net-OAuth.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/devel/perl-Net-OAuth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Net-OAuth.spec	13 Oct 2009 13:36:59 -0000	1.4
+++ perl-Net-OAuth.spec	7 Dec 2009 19:30:55 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
 Version:        0.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OAuth protocol support library for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.19-2
+- rebuild against perl 5.10.1
+
 * Tue Oct 13 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.19-1
 - Update to 0.19, fixes security issue (2009.1)
 



From kasal at fedoraproject.org  Mon Dec  7 19:31:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:31:31 +0000 (UTC)
Subject: rpms/perl-Graph/devel perl-Graph.spec,1.13,1.14
Message-ID: <20091207193131.7C3F211C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Graph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9287

Modified Files:
	perl-Graph.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Graph/devel/perl-Graph.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Graph.spec	26 Jul 2009 06:18:50 -0000	1.13
+++ perl-Graph.spec	7 Dec 2009 19:31:31 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Graph
 Version:        0.91
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module for dealing with graphs, the abstract data structures
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.91-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:36:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:36:01 +0000 (UTC)
Subject: rpms/perl-Net-Netmask/devel perl-Net-Netmask.spec,1.16,1.17
Message-ID: <20091207193601.F0AAD11C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Netmask/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10177

Modified Files:
	perl-Net-Netmask.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Netmask.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/perl-Net-Netmask.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Net-Netmask.spec	26 Jul 2009 13:43:32 -0000	1.16
+++ perl-Net-Netmask.spec	7 Dec 2009 19:36:01 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Net-Netmask
 Version:        1.9015
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl module for manipulation and lookup of IP network blocks
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9015-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9015-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:37:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:37:31 +0000 (UTC)
Subject: rpms/perl-GPS-PRN/devel perl-GPS-PRN.spec,1.8,1.9
Message-ID: <20091207193731.78C3811C00EE@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GPS-PRN/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10765

Modified Files:
	perl-GPS-PRN.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GPS-PRN.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GPS-PRN/devel/perl-GPS-PRN.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-GPS-PRN.spec	26 Jul 2009 06:10:49 -0000	1.8
+++ perl-GPS-PRN.spec	7 Dec 2009 19:37:31 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-GPS-PRN
 Version:        0.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Package for PRN - Object ID conversions
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Mon Dec  7 19:37:47 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  7 Dec 2009 19:37:47 +0000 (UTC)
Subject: rpms/librra/devel librra.spec,1.16,1.17
Message-ID: <20091207193747.58BDF11C00EE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/librra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10920

Modified Files:
	librra.spec 
Log Message:
* Mon Dec  7 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.14-3
- Explicitly BR libmimedir-static in accordance with the Packaging
  Guidelines (libmimedir is still static-only).



Index: librra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librra/devel/librra.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- librra.spec	25 Jul 2009 08:33:14 -0000	1.16
+++ librra.spec	7 Dec 2009 19:37:47 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           librra
 Version:        0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Connection to Pocket PC devices, part of SynCE
 
 Group:          System Environment/Libraries
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  libsynce-devel >= 0.14
 BuildRequires:  librapi-devel >= 0.14
-BuildRequires:  libmimedir-devel
+BuildRequires:  libmimedir-devel libmimedir-static
 BuildRequires:  libtool, Pyrex
 
 # Provide an upgrade path from the monilithic synce package
@@ -88,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.14-3
+- Explicitly BR libmimedir-static in accordance with the Packaging
+  Guidelines (libmimedir is still static-only).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Mon Dec  7 19:39:39 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon,  7 Dec 2009 19:39:39 +0000 (UTC)
Subject: rpms/libopensync-plugin-synce/devel libopensync-plugin-synce.spec,
	1.8, 1.9
Message-ID: <20091207193939.9FF2411C00EE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/libopensync-plugin-synce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11398

Modified Files:
	libopensync-plugin-synce.spec 
Log Message:
* Mon Dec  7 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1:0.22.1-3
- Explicitly BR libmimedir-static in accordance with the Packaging
  Guidelines (libmimedir is still static-only).



Index: libopensync-plugin-synce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-synce/devel/libopensync-plugin-synce.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libopensync-plugin-synce.spec	25 Jul 2009 06:21:01 -0000	1.8
+++ libopensync-plugin-synce.spec	7 Dec 2009 19:39:39 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           libopensync-plugin-synce
 Epoch:          1
 Version:        0.22.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Synce plugin for libopensync to sync WM2003 devices
 
 Group:          System Environment/Libraries
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  libopensync-devel = 1:0.22
 BuildRequires:  librra-devel >= 0.14
 BuildRequires:  librapi-devel >= 0.14
-BuildRequires:  libmimedir-devel
+BuildRequires:  libmimedir-devel libmimedir-static
 BuildRequires:  libtool
 
 # see 244917
@@ -47,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/synce-plugin
 
 %changelog
+* Mon Dec  7 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1:0.22.1-3
+- Explicitly BR libmimedir-static in accordance with the Packaging
+  Guidelines (libmimedir is still static-only).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.22.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chitlesh at fedoraproject.org  Mon Dec  7 19:40:41 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Dec 2009 19:40:41 +0000 (UTC)
Subject: File pcb-reference-card.pdf uploaded to lookaside cache by chitlesh
Message-ID: <20091207194041.2AF0210F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pcb:

2992aa741c184f615f2571ed2c6b3295  pcb-reference-card.pdf



From kasal at fedoraproject.org  Mon Dec  7 19:41:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:41:36 +0000 (UTC)
Subject: rpms/perl-Net-NBName/devel perl-Net-NBName.spec,1.4,1.5
Message-ID: <20091207194136.C063911C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-NBName/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11994

Modified Files:
	perl-Net-NBName.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-NBName.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-NBName/devel/perl-Net-NBName.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Net-NBName.spec	26 Jul 2009 13:43:18 -0000	1.4
+++ perl-Net-NBName.spec	7 Dec 2009 19:41:36 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Net-NBName
 Version:        0.26
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        NetBIOS Name Service Requests
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.26-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chitlesh at fedoraproject.org  Mon Dec  7 19:42:32 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Dec 2009 19:42:32 +0000 (UTC)
Subject: rpms/pcb/F-11 .cvsignore, 1.8, 1.9 import.log, 1.2, 1.3 pcb.spec,
	1.26, 1.27 sources, 1.8, 1.9
Message-ID: <20091207194232.7DAA211C0265@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/pcb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12368/F-11

Modified Files:
	.cvsignore import.log pcb.spec sources 
Log Message:
fix refcard and enable dbus for geda-xgsch2pcb workflow


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Nov 2009 20:25:51 -0000	1.8
+++ .cvsignore	7 Dec 2009 19:42:32 -0000	1.9
@@ -1 +1,2 @@
 pcb-20091103.tar.gz
+pcb-reference-card.pdf


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Nov 2009 20:25:52 -0000	1.2
+++ import.log	7 Dec 2009 19:42:32 -0000	1.3
@@ -1,2 +1,3 @@
 pcb-0_20081128-1_fc10:HEAD:pcb-0.20081128-1.fc10.src.rpm:1227992246
 pcb-0_20091103-1_fc12:F-11:pcb-0.20091103-1.fc12.src.rpm:1257625424
+pcb-0_20091103-2_fc12:F-11:pcb-0.20091103-2.fc12.src.rpm:1260214794


Index: pcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-11/pcb.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pcb.spec	7 Nov 2009 20:25:52 -0000	1.26
+++ pcb.spec	7 Dec 2009 19:42:32 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -12,11 +12,13 @@ URL:            http://pcb.sourceforge.n
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel, fontconfig-devel
 BuildRequires:  cups, tetex-latex, libICE-devel, desktop-file-utils, intltool, gettext-devel
+BuildRequires:  dbus-devel
 
 Requires:       m4
 Requires:       electronics-menu
 
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
+Source1:        pcb-reference-card.pdf
 Patch0:         pcb-0.20091103-tools.patch
 Patch1:         pcb-0.20091103-example.patch
 # Upstream's patch
@@ -77,7 +79,9 @@ export CFLAGS=`echo %optflags | sed "s/-
 
 
 # Bug 472618 : disable-update-desktop-database
+# Bug 544657 : --enable-dbus
 %configure \
+    --enable-dbus \
     --disable-update-mime-database \
     --disable-update-desktop-database \
     --docdir=%{_docdir}/%{name}-%{version}
@@ -138,6 +142,9 @@ cp -p AUTHORS COPYING README NEWS Change
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
+%{__rm} -f  %{buildroot}%{_docdir}/%{name}-%{version}/refcard*
+cp -p %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}
+
 
 # locale's
 %find_lang %{name}
@@ -180,7 +187,7 @@ fi
 # Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
 %files doc
 %{_infodir}/%{name}*
-%doc %{_docdir}/%{name}-%{version}/refcard*
+%doc %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
 %doc %{_docdir}/%{name}-%{version}/pcb.ps
 %doc %{_docdir}/%{name}-%{version}/*.html
 %doc %{_docdir}/%{name}-%{version}/examples/thermal
@@ -190,7 +197,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%exclude %{_docdir}/%{name}-%{version}/refcard*
+%exclude %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
 %exclude %{_docdir}/%{name}-%{version}/pcb.ps
 %exclude %{_docdir}/%{name}-%{version}/*.html
 %exclude %{_docdir}/%{name}-%{version}/examples/thermal
@@ -208,6 +215,10 @@ fi
 
 
 %changelog
+* Sun Dec 6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-2
+- Enable build for dbus support
+- improved reference card
+
 * Sat Nov 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-1
 - New upstream release
 
@@ -283,3 +294,4 @@ fi
 
 * Wed Apr 19 2006 <pjones at redhat.com> - 0.20060414-1
 - Let there be pcb packaging.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Nov 2009 20:25:52 -0000	1.8
+++ sources	7 Dec 2009 19:42:32 -0000	1.9
@@ -1 +1,2 @@
 659a13bffd2269d3a0f86508a7c1531b  pcb-20091103.tar.gz
+2992aa741c184f615f2571ed2c6b3295  pcb-reference-card.pdf



From kasal at fedoraproject.org  Mon Dec  7 19:42:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:42:34 +0000 (UTC)
Subject: rpms/perl-GPS/devel perl-GPS.spec,1.6,1.7
Message-ID: <20091207194234.6BDA111C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GPS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12409

Modified Files:
	perl-GPS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GPS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GPS/devel/perl-GPS.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-GPS.spec	26 Jul 2009 06:10:32 -0000	1.6
+++ perl-GPS.spec	7 Dec 2009 19:42:34 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-GPS
 Version:        0.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl interface to a GPS receiver that implements the Garmin protocol
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chitlesh at fedoraproject.org  Mon Dec  7 19:43:30 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Dec 2009 19:43:30 +0000 (UTC)
Subject: rpms/pcb/F-12 .cvsignore, 1.8, 1.9 import.log, 1.3, 1.4 pcb.spec,
	1.28, 1.29 sources, 1.8, 1.9
Message-ID: <20091207194330.950CB11C0265@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/pcb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12984/F-12

Modified Files:
	.cvsignore import.log pcb.spec sources 
Log Message:
fix refcard and enable dbus for geda-xgsch2pcb workflow


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Nov 2009 20:31:06 -0000	1.8
+++ .cvsignore	7 Dec 2009 19:43:30 -0000	1.9
@@ -1 +1,2 @@
 pcb-20091103.tar.gz
+pcb-reference-card.pdf


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 Nov 2009 20:31:06 -0000	1.3
+++ import.log	7 Dec 2009 19:43:30 -0000	1.4
@@ -1,3 +1,4 @@
 pcb-0_20081128-1_fc10:HEAD:pcb-0.20081128-1.fc10.src.rpm:1227992246
 pcb-0_20081128-4_fc11:HEAD:pcb-0.20081128-4.fc11.src.rpm:1252486375
 pcb-0_20091103-1_fc12:F-12:pcb-0.20091103-1.fc12.src.rpm:1257625712
+pcb-0_20091103-2_fc12:F-12:pcb-0.20091103-2.fc12.src.rpm:1260214933


Index: pcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-12/pcb.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- pcb.spec	7 Nov 2009 20:31:06 -0000	1.28
+++ pcb.spec	7 Dec 2009 19:43:30 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -12,11 +12,13 @@ URL:            http://pcb.sourceforge.n
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel, fontconfig-devel
 BuildRequires:  cups, tetex-latex, libICE-devel, desktop-file-utils, intltool, gettext-devel
+BuildRequires:  dbus-devel
 
 Requires:       m4
 Requires:       electronics-menu
 
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
+Source1:        pcb-reference-card.pdf
 Patch0:         pcb-0.20091103-tools.patch
 Patch1:         pcb-0.20091103-example.patch
 # Upstream's patch
@@ -77,7 +79,9 @@ export CFLAGS=`echo %optflags | sed "s/-
 
 
 # Bug 472618 : disable-update-desktop-database
+# Bug 544657 : --enable-dbus
 %configure \
+    --enable-dbus \
     --disable-update-mime-database \
     --disable-update-desktop-database \
     --docdir=%{_docdir}/%{name}-%{version}
@@ -138,6 +142,9 @@ cp -p AUTHORS COPYING README NEWS Change
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
+%{__rm} -f  %{buildroot}%{_docdir}/%{name}-%{version}/refcard*
+cp -p %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}
+
 
 # locale's
 %find_lang %{name}
@@ -180,7 +187,7 @@ fi
 # Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
 %files doc
 %{_infodir}/%{name}*
-%doc %{_docdir}/%{name}-%{version}/refcard*
+%doc %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
 %doc %{_docdir}/%{name}-%{version}/pcb.ps
 %doc %{_docdir}/%{name}-%{version}/*.html
 %doc %{_docdir}/%{name}-%{version}/examples/thermal
@@ -190,7 +197,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%exclude %{_docdir}/%{name}-%{version}/refcard*
+%exclude %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
 %exclude %{_docdir}/%{name}-%{version}/pcb.ps
 %exclude %{_docdir}/%{name}-%{version}/*.html
 %exclude %{_docdir}/%{name}-%{version}/examples/thermal
@@ -208,6 +215,10 @@ fi
 
 
 %changelog
+* Sun Dec 6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-2
+- Enable build for dbus support
+- improved reference card
+
 * Sat Nov 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-1
 - New upstream release
 
@@ -283,3 +294,4 @@ fi
 
 * Wed Apr 19 2006 <pjones at redhat.com> - 0.20060414-1
 - Let there be pcb packaging.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Nov 2009 20:31:06 -0000	1.8
+++ sources	7 Dec 2009 19:43:30 -0000	1.9
@@ -1 +1,2 @@
 659a13bffd2269d3a0f86508a7c1531b  pcb-20091103.tar.gz
+2992aa741c184f615f2571ed2c6b3295  pcb-reference-card.pdf



From chitlesh at fedoraproject.org  Mon Dec  7 19:44:26 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Dec 2009 19:44:26 +0000 (UTC)
Subject: rpms/pcb/EL-5 .cvsignore, 1.7, 1.8 import.log, 1.3, 1.4 pcb.spec,
	1.22, 1.23 sources, 1.7, 1.8
Message-ID: <20091207194426.2170511C0265@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/pcb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13631/EL-5

Modified Files:
	.cvsignore import.log pcb.spec sources 
Log Message:
fix refcard and enable dbus for geda-xgsch2pcb workflow


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Nov 2009 20:34:39 -0000	1.7
+++ .cvsignore	7 Dec 2009 19:44:25 -0000	1.8
@@ -1 +1,2 @@
 pcb-20091103.tar.gz
+pcb-reference-card.pdf


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 Nov 2009 20:34:39 -0000	1.3
+++ import.log	7 Dec 2009 19:44:25 -0000	1.4
@@ -1,3 +1,4 @@
 pcb-0_20081128-1_fc10:EL-5:pcb-0.20081128-1.fc10.src.rpm:1228329445
 pcb-0_20081128-4_fc11:EL-5:pcb-0.20081128-4.fc11.src.rpm:1252486270
 pcb-0_20091103-1_fc12:EL-5:pcb-0.20091103-1.fc12.src.rpm:1257626001
+pcb-0_20091103-2_fc12:EL-5:pcb-0.20091103-2.fc12.src.rpm:1260214990


Index: pcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/EL-5/pcb.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- pcb.spec	7 Nov 2009 20:34:39 -0000	1.22
+++ pcb.spec	7 Dec 2009 19:44:25 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -12,11 +12,13 @@ URL:            http://pcb.sourceforge.n
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel, fontconfig-devel
 BuildRequires:  cups, tetex-latex, libICE-devel, desktop-file-utils, intltool, gettext-devel
+BuildRequires:  dbus-devel
 
 Requires:       m4
 Requires:       electronics-menu
 
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
+Source1:        pcb-reference-card.pdf
 Patch0:         pcb-0.20091103-tools.patch
 Patch1:         pcb-0.20091103-example.patch
 # Upstream's patch
@@ -77,7 +79,9 @@ export CFLAGS=`echo %optflags | sed "s/-
 
 
 # Bug 472618 : disable-update-desktop-database
+# Bug 544657 : --enable-dbus
 %configure \
+    --enable-dbus \
     --disable-update-mime-database \
     --disable-update-desktop-database \
     --docdir=%{_docdir}/%{name}-%{version}
@@ -138,6 +142,9 @@ cp -p AUTHORS COPYING README NEWS Change
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
+%{__rm} -f  %{buildroot}%{_docdir}/%{name}-%{version}/refcard*
+cp -p %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}
+
 
 # locale's
 %find_lang %{name}
@@ -180,7 +187,7 @@ fi
 # Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
 %files doc
 %{_infodir}/%{name}*
-%doc %{_docdir}/%{name}-%{version}/refcard*
+%doc %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
 %doc %{_docdir}/%{name}-%{version}/pcb.ps
 %doc %{_docdir}/%{name}-%{version}/*.html
 %doc %{_docdir}/%{name}-%{version}/examples/thermal
@@ -190,7 +197,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%exclude %{_docdir}/%{name}-%{version}/refcard*
+%exclude %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
 %exclude %{_docdir}/%{name}-%{version}/pcb.ps
 %exclude %{_docdir}/%{name}-%{version}/*.html
 %exclude %{_docdir}/%{name}-%{version}/examples/thermal
@@ -208,6 +215,10 @@ fi
 
 
 %changelog
+* Sun Dec 6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-2
+- Enable build for dbus support
+- improved reference card
+
 * Sat Nov 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-1
 - New upstream release
 
@@ -283,3 +294,4 @@ fi
 
 * Wed Apr 19 2006 <pjones at redhat.com> - 0.20060414-1
 - Let there be pcb packaging.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Nov 2009 20:34:39 -0000	1.7
+++ sources	7 Dec 2009 19:44:25 -0000	1.8
@@ -1 +1,2 @@
 659a13bffd2269d3a0f86508a7c1531b  pcb-20091103.tar.gz
+2992aa741c184f615f2571ed2c6b3295  pcb-reference-card.pdf



From chitlesh at fedoraproject.org  Mon Dec  7 19:45:49 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  7 Dec 2009 19:45:49 +0000 (UTC)
Subject: rpms/pcb/devel .cvsignore, 1.8, 1.9 import.log, 1.3, 1.4 pcb.spec, 
	1.28, 1.29 sources, 1.8, 1.9
Message-ID: <20091207194549.0A49811C0265@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/pcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14428/devel

Modified Files:
	.cvsignore import.log pcb.spec sources 
Log Message:
fix refcard and enable dbus for geda-xgsch2pcb workflow


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Nov 2009 20:36:15 -0000	1.8
+++ .cvsignore	7 Dec 2009 19:45:48 -0000	1.9
@@ -1 +1,2 @@
 pcb-20091103.tar.gz
+pcb-reference-card.pdf


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 Nov 2009 20:36:15 -0000	1.3
+++ import.log	7 Dec 2009 19:45:48 -0000	1.4
@@ -1,3 +1,4 @@
 pcb-0_20081128-1_fc10:HEAD:pcb-0.20081128-1.fc10.src.rpm:1227992246
 pcb-0_20081128-4_fc11:HEAD:pcb-0.20081128-4.fc11.src.rpm:1252486375
 pcb-0_20091103-1_fc12:HEAD:pcb-0.20091103-1.fc12.src.rpm:1257626120
+pcb-0_20091103-2_fc12:HEAD:pcb-0.20091103-2.fc12.src.rpm:1260215047


Index: pcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- pcb.spec	7 Nov 2009 20:36:15 -0000	1.28
+++ pcb.spec	7 Dec 2009 19:45:48 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           pcb
 Version:        0.%{pcbver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        An interactive printed circuit board editor
 License:        GPLv2
@@ -12,11 +12,13 @@ URL:            http://pcb.sourceforge.n
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel, fontconfig-devel
 BuildRequires:  cups, tetex-latex, libICE-devel, desktop-file-utils, intltool, gettext-devel
+BuildRequires:  dbus-devel
 
 Requires:       m4
 Requires:       electronics-menu
 
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{pcbver}.tar.gz
+Source1:        pcb-reference-card.pdf
 Patch0:         pcb-0.20091103-tools.patch
 Patch1:         pcb-0.20091103-example.patch
 # Upstream's patch
@@ -77,7 +79,9 @@ export CFLAGS=`echo %optflags | sed "s/-
 
 
 # Bug 472618 : disable-update-desktop-database
+# Bug 544657 : --enable-dbus
 %configure \
+    --enable-dbus \
     --disable-update-mime-database \
     --disable-update-desktop-database \
     --docdir=%{_docdir}/%{name}-%{version}
@@ -138,6 +142,9 @@ cp -p AUTHORS COPYING README NEWS Change
 
 %{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
+%{__rm} -f  %{buildroot}%{_docdir}/%{name}-%{version}/refcard*
+cp -p %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}
+
 
 # locale's
 %find_lang %{name}
@@ -180,7 +187,7 @@ fi
 # Ignored warning W: pcb devel-file-in-non-devel-package /usr/share/pcb/tools/gerbertotk.c
 %files doc
 %{_infodir}/%{name}*
-%doc %{_docdir}/%{name}-%{version}/refcard*
+%doc %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
 %doc %{_docdir}/%{name}-%{version}/pcb.ps
 %doc %{_docdir}/%{name}-%{version}/*.html
 %doc %{_docdir}/%{name}-%{version}/examples/thermal
@@ -190,7 +197,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%exclude %{_docdir}/%{name}-%{version}/refcard*
+%exclude %{_docdir}/%{name}-%{version}/pcb-reference-card.pdf
 %exclude %{_docdir}/%{name}-%{version}/pcb.ps
 %exclude %{_docdir}/%{name}-%{version}/*.html
 %exclude %{_docdir}/%{name}-%{version}/examples/thermal
@@ -208,6 +215,10 @@ fi
 
 
 %changelog
+* Sun Dec 6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-2
+- Enable build for dbus support
+- improved reference card
+
 * Sat Nov 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.20091103-1
 - New upstream release
 
@@ -283,3 +294,4 @@ fi
 
 * Wed Apr 19 2006 <pjones at redhat.com> - 0.20060414-1
 - Let there be pcb packaging.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcb/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Nov 2009 20:36:15 -0000	1.8
+++ sources	7 Dec 2009 19:45:48 -0000	1.9
@@ -1 +1,2 @@
 659a13bffd2269d3a0f86508a7c1531b  pcb-20091103.tar.gz
+2992aa741c184f615f2571ed2c6b3295  pcb-reference-card.pdf



From kasal at fedoraproject.org  Mon Dec  7 19:46:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:46:05 +0000 (UTC)
Subject: rpms/perl-Net-LibIDN/devel perl-Net-LibIDN.spec,1.12,1.13
Message-ID: <20091207194605.BE62F11C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-LibIDN/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14675

Modified Files:
	perl-Net-LibIDN.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-LibIDN.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-LibIDN/devel/perl-Net-LibIDN.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Net-LibIDN.spec	26 Jul 2009 13:42:49 -0000	1.12
+++ perl-Net-LibIDN.spec	7 Dec 2009 19:46:05 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: 	Perl bindings for GNU LibIDN
 Name: 		perl-Net-LibIDN
 Version: 	0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/%{pkgname}/
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Net
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.12-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:46:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:46:52 +0000 (UTC)
Subject: rpms/perl-GO-TermFinder/devel perl-GO-TermFinder.spec,1.3,1.4
Message-ID: <20091207194652.D311211C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GO-TermFinder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15112

Modified Files:
	perl-GO-TermFinder.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GO-TermFinder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GO-TermFinder/devel/perl-GO-TermFinder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-GO-TermFinder.spec	26 Jul 2009 06:10:14 -0000	1.3
+++ perl-GO-TermFinder.spec	7 Dec 2009 19:46:52 -0000	1.4
@@ -1,7 +1,7 @@
 
 Name:		perl-GO-TermFinder
 Version:	0.82
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Identify GO nodes that annotate a group of genes with a significant p-value
 License:	MIT
 Group:		Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_provides
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.82-5
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:51:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:51:04 +0000 (UTC)
Subject: rpms/perl-Net-Libdnet/devel perl-Net-Libdnet.spec,1.7,1.8
Message-ID: <20091207195104.AA95F11C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Libdnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16985

Modified Files:
	perl-Net-Libdnet.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Libdnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Libdnet/devel/perl-Net-Libdnet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Net-Libdnet.spec	26 Jul 2009 13:43:03 -0000	1.7
+++ perl-Net-Libdnet.spec	7 Dec 2009 19:51:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Net-Libdnet
 Version:        0.01
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl interface to libdnet
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 19:53:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:53:46 +0000 (UTC)
Subject: rpms/perl-Goo-Canvas/devel perl-Goo-Canvas.spec,1.7,1.8
Message-ID: <20091207195346.0E64B11C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Goo-Canvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18012

Modified Files:
	perl-Goo-Canvas.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Goo-Canvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Goo-Canvas/devel/perl-Goo-Canvas.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Goo-Canvas.spec	5 Nov 2009 13:23:54 -0000	1.7
+++ perl-Goo-Canvas.spec	7 Dec 2009 19:53:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Goo-Canvas
 Version:        0.06
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl interface to the GooCanvas
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.06-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 28 2009 Liang Suilong <liangsuilong at gmail.com> 0.06-6
 - Add BR: perl(Glib::MakeHelper)
 - Remove BR: perl-Glib-devel



From kasal at fedoraproject.org  Mon Dec  7 19:55:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:55:14 +0000 (UTC)
Subject: rpms/perl-Net-Jabber/devel perl-Net-Jabber.spec,1.8,1.9
Message-ID: <20091207195514.3ACCD11C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Jabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18635

Modified Files:
	perl-Net-Jabber.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Jabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Jabber/devel/perl-Net-Jabber.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Net-Jabber.spec	26 Jul 2009 13:42:35 -0000	1.8
+++ perl-Net-Jabber.spec	7 Dec 2009 19:55:14 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           perl-Net-Jabber
 Version:        2.0 
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Net::Jabber - Jabber Perl Library
 
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.0-12
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 19:56:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:56:18 +0000
Subject: [pkgdb] sugar: tuxbrewr has given up watchcommits
Message-ID: <20091207195618.BA1D810F891@bastion2.fedora.phx.redhat.com>

tuxbrewr has given up the watchcommits acl on sugar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:56:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:56:21 +0000
Subject: [pkgdb] sugar: tuxbrewr has requested commit
Message-ID: <20091207195622.0D8F110F8A6@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on sugar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:56:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:56:27 +0000
Subject: [pkgdb] sugar: tuxbrewr has requested approveacls
Message-ID: <20091207195627.1A9B810F8B2@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the approveacls acl on sugar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:56:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:56:31 +0000
Subject: [pkgdb] sugar: tuxbrewr has given up watchbugzilla
Message-ID: <20091207195631.1C5DE10F8B9@bastion2.fedora.phx.redhat.com>

tuxbrewr has given up the watchbugzilla acl on sugar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:58:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:58:19 +0000
Subject: [pkgdb] sugar: tuxbrewr has given up watchbugzilla
Message-ID: <20091207195819.5842110F8B5@bastion2.fedora.phx.redhat.com>

tuxbrewr has given up the watchbugzilla acl on sugar (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:58:22 +0000
Subject: [pkgdb] sugar: tuxbrewr has given up watchcommits
Message-ID: <20091207195822.4E8A210F89F@bastion2.fedora.phx.redhat.com>

tuxbrewr has given up the watchcommits acl on sugar (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:58:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:58:24 +0000
Subject: [pkgdb] sugar: tuxbrewr has requested commit
Message-ID: <20091207195824.15E3710F8C4@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on sugar (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:58:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:58:29 +0000
Subject: [pkgdb] sugar: tuxbrewr has requested approveacls
Message-ID: <20091207195829.3748410F8CD@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the approveacls acl on sugar (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:58:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:58:41 +0000
Subject: [pkgdb] sugar: tuxbrewr has given up watchbugzilla
Message-ID: <20091207195841.943FC10F8A2@bastion2.fedora.phx.redhat.com>

tuxbrewr has given up the watchbugzilla acl on sugar (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From kasal at fedoraproject.org  Mon Dec  7 19:58:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:58:43 +0000 (UTC)
Subject: rpms/perl-GnuPG-Interface/devel perl-GnuPG-Interface.spec, 1.14,
	1.15
Message-ID: <20091207195843.E8F4211C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-GnuPG-Interface/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19862

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-GnuPG-Interface.spec	4 Oct 2009 11:55:11 -0000	1.14
+++ perl-GnuPG-Interface.spec	7 Dec 2009 19:58:43 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
 Version:        0.42
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPLv2+ or Artistic
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.42-3
+- rebuild against perl 5.10.1
+
 * Sun Oct 04 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 0.42-2
 - Disable tests because they need /dev/tty to run
 



From pkgdb at fedoraproject.org  Mon Dec  7 19:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:58:44 +0000
Subject: [pkgdb] sugar: tuxbrewr has given up watchcommits
Message-ID: <20091207195844.3D99D10F8D8@bastion2.fedora.phx.redhat.com>

tuxbrewr has given up the watchcommits acl on sugar (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:58:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:58:45 +0000
Subject: [pkgdb] sugar: tuxbrewr has requested commit
Message-ID: <20091207195846.11E9310F8E1@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on sugar (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 19:58:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 19:58:49 +0000
Subject: [pkgdb] sugar: tuxbrewr has requested approveacls
Message-ID: <20091207195849.3DE9610F8EA@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the approveacls acl on sugar (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From kasal at fedoraproject.org  Mon Dec  7 19:59:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 19:59:51 +0000 (UTC)
Subject: rpms/perl-Net-IRC/devel perl-Net-IRC.spec,1.4,1.5
Message-ID: <20091207195951.C6B4D11C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-IRC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20362

Modified Files:
	perl-Net-IRC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-IRC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IRC/devel/perl-Net-IRC.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Net-IRC.spec	26 Jul 2009 13:42:20 -0000	1.4
+++ perl-Net-IRC.spec	7 Dec 2009 19:59:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Net-IRC
 Version:        0.75
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to the Internet Relay Chat protocol
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.75-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.75-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 20:03:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:03:05 +0000 (UTC)
Subject: rpms/perl-Gnome2-Wnck/devel perl-Gnome2-Wnck.spec,1.5,1.6
Message-ID: <20091207200305.0D77B11C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gnome2-Wnck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21574

Modified Files:
	perl-Gnome2-Wnck.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gnome2-Wnck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gnome2-Wnck/devel/perl-Gnome2-Wnck.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Gnome2-Wnck.spec	5 Nov 2009 13:33:14 -0000	1.5
+++ perl-Gnome2-Wnck.spec	7 Dec 2009 20:03:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-Wnck
 Version:        0.16
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl interface to the Window Navigator Construction Kit
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.16-9
+- rebuild against perl 5.10.1
+
 * Sun Jul 28 2009 Liang Suilong <liangsuilong at gmail.com> 0.16-8
 - Add BR: perl(Glib::MakeHelper)
 - Remove BR: perl-Glib-devel



From kasal at fedoraproject.org  Mon Dec  7 20:04:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:04:55 +0000 (UTC)
Subject: rpms/perl-Net-IPv4Addr/devel perl-Net-IPv4Addr.spec,1.5,1.6
Message-ID: <20091207200456.0AF1A11C0265@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-IPv4Addr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22175

Modified Files:
	perl-Net-IPv4Addr.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IPv4Addr/devel/perl-Net-IPv4Addr.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Net-IPv4Addr.spec	24 Aug 2009 20:11:31 -0000	1.5
+++ perl-Net-IPv4Addr.spec	7 Dec 2009 20:04:55 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Net-IPv4Addr
 Version:        0.10
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl extension for manipulating IPv4 addresses
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.10-7
+- rebuild against perl 5.10.1
+
 * Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.10-6
 - Obsoletes perl-Network-IPv4Addr
 - no provides as code needs changing to use the new version



From limb at fedoraproject.org  Mon Dec  7 20:06:51 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  7 Dec 2009 20:06:51 +0000 (UTC)
Subject: rpms/xmoto/devel xmoto-0.5.2-x86-64.patch, NONE, 1.1 xmoto.spec,
	1.54, 1.55
Message-ID: <20091207200651.984F911C0265@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22836

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-0.5.2-x86-64.patch 
Log Message:
x86_64 fix.


xmoto-0.5.2-x86-64.patch:
 DBuffer.cpp |   13 +++++++++++++
 DBuffer.h   |    2 ++
 2 files changed, 15 insertions(+)

--- NEW FILE xmoto-0.5.2-x86-64.patch ---
diff -rup ./src/DBuffer.cpp ../xmoto-0.5.2-patched/src/DBuffer.cpp
--- ./src/DBuffer.cpp	2009-08-10 12:56:39.000000000 -0400
+++ ../xmoto-0.5.2-patched/src/DBuffer.cpp	2009-12-05 12:12:38.122741232 -0500
@@ -209,6 +209,19 @@ Foundation, Inc., 59 Temple Place, Suite
     *this >> sn;
     n = (unsigned int) sn;
   }
+  void DBuffer::operator <<(unsigned long n) {
+      int sn;
+      sn = (int) (n);
+      *this << sn;
+  }
+
+  void DBuffer::operator >>(unsigned long &n) {
+      int sn;
+      *this >> sn;
+      n = (unsigned long) sn;
+  }
+
+
   
   void DBuffer::operator <<(float n) {
     writeBuf_LE((char *)&n, sizeof(float));
diff -rup ./src/DBuffer.h ../xmoto-0.5.2-patched/src/DBuffer.h
--- ./src/DBuffer.h	2009-08-10 12:56:39.000000000 -0400
+++ ../xmoto-0.5.2-patched/src/DBuffer.h	2009-12-05 12:11:51.417881628 -0500
@@ -69,6 +69,8 @@ Foundation, Inc., 59 Temple Place, Suite
       void operator >>(unsigned char &c);
       void operator <<(unsigned int n);
       void operator >>(unsigned int &n);
+      void operator <<(unsigned long n);
+      void operator >>(unsigned long &n);
       void operator <<(float n);
       void operator >>(float &n);
       void operator <<(std::string s);


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- xmoto.spec	8 Sep 2009 20:17:17 -0000	1.54
+++ xmoto.spec	7 Dec 2009 20:06:51 -0000	1.55
@@ -19,6 +19,7 @@ Patch3:		xmoto-0.4.0-Environment-string.
 Patch7:		xmoto-0.5.0-xmargs-include.patch
 Patch8:		xmoto-0.5.0-helpers-text-includes.patch
 Patch9:		xmoto-0.5.0-helpers-log-include.patch
+Patch10:	xmoto-0.5.2-x86-64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -62,6 +63,7 @@ yourself and others, racing against the 
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p0
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
@@ -123,8 +125,9 @@ fi
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
-* Tue Sep 08 2009 Jon Ciesla <limb at jcomserv.net> 0.5.2-1
+* Tue Dec 06 2009 Howard Liberty <liberty at live.com> 0.5.2-1
 - New upstream.
+- Add x86-64 patch so it can be compiled in x86-64 enviroment.
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kasal at fedoraproject.org  Mon Dec  7 20:08:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:08:10 +0000 (UTC)
Subject: rpms/perl-Gnome2-VFS/devel perl-Gnome2-VFS.spec,1.10,1.11
Message-ID: <20091207200810.317B811C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gnome2-VFS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23546

Modified Files:
	perl-Gnome2-VFS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gnome2-VFS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gnome2-VFS/devel/perl-Gnome2-VFS.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Gnome2-VFS.spec	30 Jul 2009 13:59:20 -0000	1.10
+++ perl-Gnome2-VFS.spec	7 Dec 2009 20:08:09 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-VFS
 Version:        1.081
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to the 2.x series of the GNOME VFS library
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.081-5
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.081-4
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From kasal at fedoraproject.org  Mon Dec  7 20:09:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:09:14 +0000 (UTC)
Subject: rpms/perl-Net-IP-CMatch/devel perl-Net-IP-CMatch.spec,1.10,1.11
Message-ID: <20091207200914.1797F11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-IP-CMatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23965

Modified Files:
	perl-Net-IP-CMatch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-IP-CMatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IP-CMatch/devel/perl-Net-IP-CMatch.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Net-IP-CMatch.spec	26 Jul 2009 13:41:37 -0000	1.10
+++ perl-Net-IP-CMatch.spec	7 Dec 2009 20:09:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Net-IP-CMatch
 Version:        0.02
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Efficiently match IP addresses against IP ranges with C
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 20:13:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:13:12 +0000 (UTC)
Subject: rpms/perl-Gnome2-Print/devel perl-Gnome2-Print.spec,1.9,1.10
Message-ID: <20091207201312.DC8C311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gnome2-Print/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25398

Modified Files:
	perl-Gnome2-Print.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gnome2-Print.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gnome2-Print/devel/perl-Gnome2-Print.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Gnome2-Print.spec	30 Jul 2009 13:47:40 -0000	1.9
+++ perl-Gnome2-Print.spec	7 Dec 2009 20:13:12 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-Print
 Version:        1.000
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl wrappers for the Gnome Print utilities
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.000-9
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.000-8
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From kasal at fedoraproject.org  Mon Dec  7 20:14:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:14:17 +0000 (UTC)
Subject: rpms/perl-Net-IP/devel perl-Net-IP.spec,1.14,1.15
Message-ID: <20091207201417.09FB411C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-IP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25885

Modified Files:
	perl-Net-IP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Net-IP.spec	26 Jul 2009 13:41:24 -0000	1.14
+++ perl-Net-IP.spec	7 Dec 2009 20:14:16 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Net-IP
 Version:        1.25
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.25-11
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thias at fedoraproject.org  Mon Dec  7 20:16:28 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  7 Dec 2009 20:16:28 +0000 (UTC)
Subject: File yasm-0.8.0.tar.gz uploaded to lookaside cache by thias
Message-ID: <20091207201628.C91A010F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for yasm:

84a72204c9b452a00b39b1b00495163f  yasm-0.8.0.tar.gz



From thias at fedoraproject.org  Mon Dec  7 20:17:03 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  7 Dec 2009 20:17:03 +0000 (UTC)
Subject: rpms/yasm/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 yasm.spec, 
	1.21, 1.22
Message-ID: <20091207201703.3E08C11C025D@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/yasm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26823

Modified Files:
	.cvsignore sources yasm.spec 
Log Message:
Update to 0.8.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Dec 2008 13:56:10 -0000	1.9
+++ .cvsignore	7 Dec 2009 20:17:02 -0000	1.10
@@ -1 +1 @@
-yasm-0.7.2.tar.gz
+yasm-0.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Dec 2008 13:56:10 -0000	1.9
+++ sources	7 Dec 2009 20:17:03 -0000	1.10
@@ -1 +1 @@
-cc9360593de5625dca286f0bfcb27dd5  yasm-0.7.2.tar.gz
+84a72204c9b452a00b39b1b00495163f  yasm-0.8.0.tar.gz


Index: yasm.spec
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/yasm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- yasm.spec	27 Jul 2009 08:53:11 -0000	1.21
+++ yasm.spec	7 Dec 2009 20:17:03 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Modular Assembler
 Name: yasm
-Version: 0.7.2
+Version: 0.8.0
 Release: 3%{?dist}
 # See COPYING for the detail, there is quite a lot!
 License: BSD and (GPLv2+ or Artistic or LGPLv2+) and LGPLv2
@@ -56,6 +56,7 @@ Install this package if you need to rebu
 %defattr(-,root,root,-)
 %doc Artistic.txt AUTHORS BSD.txt COPYING GNU*
 %{_bindir}/yasm
+%{_bindir}/ytasm
 %{_mandir}/man1/yasm.1*
 
 %files devel
@@ -68,6 +69,10 @@ Install this package if you need to rebu
 
 
 %changelog
+* Mon Dec  7 2009 Matthias Saou <http://freshrpms.net/> 0.8.0-1
+- Update to 0.8.0 (#523729).
+- Include new ytasm binary.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec  7 20:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 20:18:08 +0000
Subject: [pkgdb] sugar had acl change status
Message-ID: <20091207201809.1802C10F878@bastion2.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 20:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 20:18:09 +0000
Subject: [pkgdb] sugar had acl change status
Message-ID: <20091207201809.B5D5A10F89F@bastion2.fedora.phx.redhat.com>

sdz has set the commit acl on sugar (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 20:18:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 20:18:17 +0000
Subject: [pkgdb] sugar had acl change status
Message-ID: <20091207201818.46EE010F8AC@bastion2.fedora.phx.redhat.com>

sdz has set the commit acl on sugar (Fedora 11) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 20:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 20:18:19 +0000
Subject: [pkgdb] sugar had acl change status
Message-ID: <20091207201819.5975010F8B6@bastion2.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar (Fedora 11) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 20:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 20:18:21 +0000
Subject: [pkgdb] sugar had acl change status
Message-ID: <20091207201822.73E1D10F8BD@bastion2.fedora.phx.redhat.com>

sdz has set the commit acl on sugar (Fedora 12) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From pkgdb at fedoraproject.org  Mon Dec  7 20:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 07 Dec 2009 20:18:22 +0000
Subject: [pkgdb] sugar had acl change status
Message-ID: <20091207201822.A13AE10F8C1@bastion2.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar (Fedora 12) to Approved for tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar



From kasal at fedoraproject.org  Mon Dec  7 20:20:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:20:50 +0000 (UTC)
Subject: rpms/perl-Net-GPSD/devel perl-Net-GPSD.spec,1.11,1.12
Message-ID: <20091207202050.6B3D511C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-GPSD/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28118

Modified Files:
	perl-Net-GPSD.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-GPSD.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-GPSD/devel/perl-Net-GPSD.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Net-GPSD.spec	26 Jul 2009 13:41:11 -0000	1.11
+++ perl-Net-GPSD.spec	7 Dec 2009 20:20:49 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Net-GPSD
 Version:        0.37
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Provides an object client interface to the gpsd server daemon
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.37-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.37-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 20:21:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:21:48 +0000 (UTC)
Subject: rpms/perl-Gnome2-GConf/devel perl-Gnome2-GConf.spec,1.13,1.14
Message-ID: <20091207202148.4489311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gnome2-GConf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28608

Modified Files:
	perl-Gnome2-GConf.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gnome2-GConf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gnome2-GConf/devel/perl-Gnome2-GConf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Gnome2-GConf.spec	30 Jul 2009 13:40:02 -0000	1.13
+++ perl-Gnome2-GConf.spec	7 Dec 2009 20:21:47 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-GConf
 Version:        1.044
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl wrappers for the GConf configuration engine
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.044-8
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.044-7
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From pbrobinson at fedoraproject.org  Mon Dec  7 20:23:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 20:23:29 +0000 (UTC)
Subject: File libplist-1.0.tar.bz2 uploaded to lookaside cache by pbrobinson
Message-ID: <20091207202329.7897810F88C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libplist:

84f1dc5206a4b275f7d9ceb573613a63  libplist-1.0.tar.bz2



From limb at fedoraproject.org  Mon Dec  7 20:23:27 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  7 Dec 2009 20:23:27 +0000 (UTC)
Subject: rpms/xmoto/F-12 xmoto-0.5.2-x86-64.patch, NONE, 1.1 xmoto.spec, 1.54,
	1.55
Message-ID: <20091207202327.64C2611C025D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29234

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-0.5.2-x86-64.patch 
Log Message:
x86_64 fix.


xmoto-0.5.2-x86-64.patch:
 DBuffer.cpp |   13 +++++++++++++
 DBuffer.h   |    2 ++
 2 files changed, 15 insertions(+)

--- NEW FILE xmoto-0.5.2-x86-64.patch ---
diff -rup ./src/DBuffer.cpp ../xmoto-0.5.2-patched/src/DBuffer.cpp
--- ./src/DBuffer.cpp	2009-08-10 12:56:39.000000000 -0400
+++ ../xmoto-0.5.2-patched/src/DBuffer.cpp	2009-12-05 12:12:38.122741232 -0500
@@ -209,6 +209,19 @@ Foundation, Inc., 59 Temple Place, Suite
     *this >> sn;
     n = (unsigned int) sn;
   }
+  void DBuffer::operator <<(unsigned long n) {
+      int sn;
+      sn = (int) (n);
+      *this << sn;
+  }
+
+  void DBuffer::operator >>(unsigned long &n) {
+      int sn;
+      *this >> sn;
+      n = (unsigned long) sn;
+  }
+
+
   
   void DBuffer::operator <<(float n) {
     writeBuf_LE((char *)&n, sizeof(float));
diff -rup ./src/DBuffer.h ../xmoto-0.5.2-patched/src/DBuffer.h
--- ./src/DBuffer.h	2009-08-10 12:56:39.000000000 -0400
+++ ../xmoto-0.5.2-patched/src/DBuffer.h	2009-12-05 12:11:51.417881628 -0500
@@ -69,6 +69,8 @@ Foundation, Inc., 59 Temple Place, Suite
       void operator >>(unsigned char &c);
       void operator <<(unsigned int n);
       void operator >>(unsigned int &n);
+      void operator <<(unsigned long n);
+      void operator >>(unsigned long &n);
       void operator <<(float n);
       void operator >>(float &n);
       void operator <<(std::string s);


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-12/xmoto.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- xmoto.spec	8 Sep 2009 20:17:17 -0000	1.54
+++ xmoto.spec	7 Dec 2009 20:23:27 -0000	1.55
@@ -19,6 +19,7 @@ Patch3:		xmoto-0.4.0-Environment-string.
 Patch7:		xmoto-0.5.0-xmargs-include.patch
 Patch8:		xmoto-0.5.0-helpers-text-includes.patch
 Patch9:		xmoto-0.5.0-helpers-log-include.patch
+Patch10:	xmoto-0.5.2-x86-64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -62,6 +63,7 @@ yourself and others, racing against the 
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p0
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
@@ -123,8 +125,9 @@ fi
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
-* Tue Sep 08 2009 Jon Ciesla <limb at jcomserv.net> 0.5.2-1
+* Tue Dec 06 2009 Howard Liberty <liberty at live.com> 0.5.2-1
 - New upstream.
+- Add x86-64 patch so it can be compiled in x86-64 enviroment.
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pbrobinson at fedoraproject.org  Mon Dec  7 20:24:38 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 20:24:38 +0000 (UTC)
Subject: rpms/libplist/devel .cvsignore, 1.5, 1.6 libplist.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091207202438.9062311C025D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29865

Modified Files:
	.cvsignore libplist.spec sources 
Log Message:
- Upstream stable 1.0.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 08:34:05 -0000	1.5
+++ .cvsignore	7 Dec 2009 20:24:38 -0000	1.6
@@ -1 +1 @@
-libplist-0.16.tar.bz2
+libplist-1.0.tar.bz2


Index: libplist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/libplist.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libplist.spec	29 Oct 2009 10:48:35 -0000	1.7
+++ libplist.spec	7 Dec 2009 20:24:38 -0000	1.8
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libplist
-Version:        0.16
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Library for manipulating Apple Binary and XML Property Lists
 
 Group:          System Environment/Libraries
@@ -10,7 +10,6 @@ License:        LGPLv2+
 URL:            http://matt.colyer.name/projects/iphone-linux/
 
 Source0:        http://cloud.github.com/downloads/JonathanBeck/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		libplist-0.16-fix-python-lib-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -85,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libplist
 
 %changelog
+* Mon Dec  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-1
+- Upstream stable 1.0.0 release
+
 * Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.16-3
 - Actually add patch for python
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Oct 2009 08:34:06 -0000	1.5
+++ sources	7 Dec 2009 20:24:38 -0000	1.6
@@ -1 +1 @@
-c2fffd7723df3cbd76a05a1867f1fbf2  libplist-0.16.tar.bz2
+84f1dc5206a4b275f7d9ceb573613a63  libplist-1.0.tar.bz2



From kasal at fedoraproject.org  Mon Dec  7 20:26:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:26:01 +0000 (UTC)
Subject: rpms/perl-Net-GitHub/devel perl-Net-GitHub.spec,1.1,1.2
Message-ID: <20091207202601.6584411C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-GitHub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30395

Modified Files:
	perl-Net-GitHub.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-GitHub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-GitHub/devel/perl-Net-GitHub.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-GitHub.spec	4 Nov 2009 02:23:47 -0000	1.1
+++ perl-Net-GitHub.spec	7 Dec 2009 20:26:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-Net-GitHub 
 Version:    0.19 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # lib/Net/GitHub.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.19-3
+- rebuild against perl 5.10.1
+
 * Tue Oct 13 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-2
 - add br on CPAN (M::I)
 



From dsd at fedoraproject.org  Mon Dec  7 20:26:38 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon,  7 Dec 2009 20:26:38 +0000 (UTC)
Subject: File sugar-update-control-0.22.tar.gz uploaded to lookaside cache by
	dsd
Message-ID: <20091207202638.E0CBE10F89E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-update-control:

1f9abb47164535b035eb5eaaead07863  sugar-update-control-0.22.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 20:27:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:27:01 +0000 (UTC)
Subject: rpms/perl-Gnome2-Canvas/devel perl-Gnome2-Canvas.spec,1.9,1.10
Message-ID: <20091207202701.596D811C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gnome2-Canvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30782

Modified Files:
	perl-Gnome2-Canvas.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gnome2-Canvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gnome2-Canvas/devel/perl-Gnome2-Canvas.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Gnome2-Canvas.spec	30 Jul 2009 13:04:26 -0000	1.9
+++ perl-Gnome2-Canvas.spec	7 Dec 2009 20:27:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-Canvas
 Version:        1.002
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        An engine for structured graphics in Gnome2
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.002-13
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.002-12
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From kasal at fedoraproject.org  Mon Dec  7 20:30:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:30:10 +0000 (UTC)
Subject: rpms/perl-Net-FTPServer/devel perl-Net-FTPServer.spec,1.3,1.4
Message-ID: <20091207203011.035D511C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-FTPServer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31820

Modified Files:
	perl-Net-FTPServer.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-FTPServer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-FTPServer/devel/perl-Net-FTPServer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-FTPServer.spec	26 Jul 2009 13:40:57 -0000	1.3
+++ perl-Net-FTPServer.spec	7 Dec 2009 20:30:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-FTPServer
 Version:        1.122
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Secure, extensible and configurable Perl FTP server
 License:        GPLv2+
 Group:          Development/Libraries
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.122-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.122-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 20:35:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:35:10 +0000 (UTC)
Subject: rpms/perl-Net-eBay/devel perl-Net-eBay.spec,1.8,1.9
Message-ID: <20091207203510.E80A911C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-eBay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1087

Modified Files:
	perl-Net-eBay.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-eBay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-eBay/devel/perl-Net-eBay.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Net-eBay.spec	26 Jul 2009 13:48:35 -0000	1.8
+++ perl-Net-eBay.spec	7 Dec 2009 20:35:10 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Net-eBay
 Version:        0.52
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Perl Interface to XML based eBay API
 
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.52-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.52-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 20:36:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:36:07 +0000 (UTC)
Subject: rpms/perl-Gnome2/devel perl-Gnome2.spec,1.4,1.5
Message-ID: <20091207203607.9A69911C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1514

Modified Files:
	perl-Gnome2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gnome2/devel/perl-Gnome2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Gnome2.spec	30 Jul 2009 14:05:10 -0000	1.4
+++ perl-Gnome2.spec	7 Dec 2009 20:36:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2
 Version:        1.042
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to the 2.x series of the GNOME libraries
 License:        LGPLv2
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.042-5
+- rebuild against perl 5.10.1
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.042-4
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From pbrobinson at fedoraproject.org  Mon Dec  7 20:36:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 20:36:30 +0000 (UTC)
Subject: rpms/libplist/devel libplist.spec,1.8,1.9
Message-ID: <20091207203630.C98A311C025D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1730

Modified Files:
	libplist.spec 
Log Message:
- Drop upstreamed patch


Index: libplist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/libplist.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libplist.spec	7 Dec 2009 20:24:38 -0000	1.8
+++ libplist.spec	7 Dec 2009 20:36:30 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           libplist
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for manipulating Apple Binary and XML Property Lists
 
 Group:          System Environment/Libraries
@@ -41,7 +41,6 @@ Requires: python
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixpython
 
 %build
 export CMAKE_PREFIX_PATH=/usr
@@ -84,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libplist
 
 %changelog
+* Mon Dec  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-2
+- Drop upstreamed patch
+
 * Mon Dec  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-1
 - Upstream stable 1.0.0 release
 



From spot at fedoraproject.org  Mon Dec  7 20:37:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 20:37:10 +0000 (UTC)
Subject: rpms/blacs/F-12 blacs.spec,1.33,1.34
Message-ID: <20091207203710.C083011C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/blacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1938/F-12

Modified Files:
	blacs.spec 
Log Message:
spec cleanup, static fixes, include files


Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/F-12/blacs.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- blacs.spec	7 Aug 2009 02:41:37 -0000	1.33
+++ blacs.spec	7 Dec 2009 20:37:10 -0000	1.34
@@ -1,32 +1,7 @@
-# These macros will go away soon. Hopefully.
-%global _openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
-
-%global	_lam_load \
- . /etc/profile.d/modules.sh; \
- module load lam-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _lam_unload \
- . /etc/profile.d/modules.sh; \
- module unload lam-%{_arch};
-
-%global _mpich2_load \
- . /etc/profile.d/modules.sh; \
- module load mpich2-%{__isa_bits}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _mpich2_unload \
- . /etc/profile.d/modules.sh; \
- module unload mpich2-%{__isa_bits};
-
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -72,41 +47,15 @@ applications both easier to program and 
 
 This file contains common files which are not specific to any MPI implementation.
 
-%package lam
-Summary: BLACS libraries compiled against lam
-Group: Development/Libraries
-BuildRequires: lam-devel
-Requires: %{name}-common = %{version}-%{release}
-Requires: environment-modules
-
-%description lam
-The BLACS (Basic Linear Algebra Communication Subprograms) project is
-an ongoing investigation whose purpose is to create a linear algebra
-oriented message passing interface that may be implemented efficiently
-and uniformly across a large range of distributed memory platforms.
-
-The length of time required to implement efficient distributed memory
-algorithms makes it impractical to rewrite programs for every new
-parallel machine. The BLACS exist in order to make linear algebra
-applications both easier to program and more portable.
-
-This package contains BLACS libraries compiled with lam.
-
-%package lam-devel
-Summary: Development libraries for blacs (lam)
-Group: Development/Libraries
-Requires: %{name}-lam = %{version}-%{release}
-Provides: %{name}-lam-static = %{version}-%{release}
-
-%description lam-devel
-This package contains development libraries for blacs, compiled	against lam.
-
 %package mpich2
 Summary: BLACS libraries compiled against mpich2
 Group: Development/Libraries
 BuildRequires: mpich2-devel
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
+# This is a dirty lie, but something needs to reap these dead subpackages.
+Provides: blacs-lam = %{version}-%{release}
+Obsoletes: blacs-lam < 1.1-33
 
 %description mpich2
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -125,11 +74,21 @@ This package contains BLACS libraries co
 Summary: Development libraries for blacs (mpich2)
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
-Provides: %{name}-mpich2-static = %{version}-%{release}
+Provides: blacs-lam-devel = %{version}-%{release}
+Obsoletes: blacs-lam-devel < 1.1-33
 
 %description mpich2-devel
 This package contains development libraries for blacs, compiled against mpich2.
 
+%package mpich2-static
+Summary: Static libraries for blacs (mpich2)
+Group: Development/Libraries
+Provides: blacs-lam-static = %{version}-%{release}
+Obsoletes: blacs-lam-static < 1.1-33
+
+%description mpich2-static
+This package contains static libraries for blacs, compiled against mpich2.
+
 %package openmpi
 Summary: BLACS libraries compiled against openmpi
 Group: Development/Libraries
@@ -154,15 +113,21 @@ Summary: Development libraries for blacs
 Group: Development/Libraries
 BuildRequires: openmpi-devel
 Requires: %{name}-openmpi = %{version}-%{release}
-Provides: %{name}-openmpi-static = %{version}-%{release}
 
 %description openmpi-devel
 This package contains development libraries for blacs, compiled	against openmpi.
 
+%package openmpi-static
+Summary: Static libraries for blacs (openmpi)
+Group: Development/Libraries
+
+%description openmpi-static
+This package contains static libraries for blacs, compiled against openmpi.
+
 %prep
 %setup -q -c -n %{name}
 %patch0 -p1
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
 	cp -a BLACS BLACS-$i
 	cp -f %{SOURCE1} BLACS-$i/
 	sed -i "s|FOO|$i|g" BLACS-$i/Bmake.inc
@@ -182,26 +147,19 @@ cp %{SOURCE7} lawn94.ps
 
 # To avoid replicated code define a build macro
 %define dobuild() \
-cd BLACS-$MPI_COMPILER; \
+cd BLACS-$MPI_COMPILER_NAME; \
 make mpi ; \
 cd ..
 
-# Build LAM version
-export MPI_COMPILER=lam
-%{_lam_load}
-RPM_OPT_FLAGS=`echo $CFLAGS`
-%dobuild
-%{_lam_unload}
-
 # Build mpich2 version
-export MPI_COMPILER=mpich2
+export MPI_COMPILER_NAME=mpich2
 %{_mpich2_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
 %{_mpich2_unload}
 
 # Build OpenMPI version
-export MPI_COMPILER=openmpi
+export MPI_COMPILER_NAME=openmpi
 %{_openmpi_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
@@ -214,13 +172,15 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %install
 # mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-for i in lam mpich2 openmpi; do 
+for i in mpich2 openmpi; do 
   mkdir -p %{buildroot}%{_libdir}/blacs-$i/
+  mkdir -p %{buildroot}%{_includedir}/blacs-$i/
   pushd BLACS-$i/LIB
   for f in *.a *.so*; do
     cp -f $f %{buildroot}%{_libdir}/blacs-$i/$f
   done
   popd
+  install -p BLACS-$i/SRC/MPI/Bdef.h %{buildroot}%{_includedir}/blacs-$i/
   pushd %{buildroot}%{_libdir}/blacs-$i/
   for l in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do
     ln -fs $l.so.1.0.0 $l.so.1
@@ -250,17 +210,6 @@ rm -fr ${RPM_BUILD_ROOT}
 %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps
 # %{_bindir}/x*test_MPI-LINUX-0
 
-%files lam
-%defattr(-,root,root,0755)
-%dir %{_libdir}/blacs-lam/
-%{_datadir}/Modules/modulefiles/blacs-lam-%{_arch}
-%{_libdir}/blacs-lam/*.so.*
-
-%files lam-devel
-%defattr(-,root,root,0755)
-%{_libdir}/blacs-lam/*.a
-%{_libdir}/blacs-lam/*.so
-
 %files mpich2
 %defattr(-,root,root,0755)
 %dir %{_libdir}/blacs-mpich2/
@@ -269,9 +218,13 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files mpich2-devel
 %defattr(-,root,root,0755)
-%{_libdir}/blacs-mpich2/*.a
+%{_includedir}/blacs-mpich2/
 %{_libdir}/blacs-mpich2/*.so
 
+%files mpich2-static
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-mpich2/*.a
+
 %files openmpi
 %defattr(-,root,root,0755)
 %dir %{_libdir}/blacs-openmpi/
@@ -280,10 +233,20 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files openmpi-devel
 %defattr(-,root,root,0755)
-%{_libdir}/blacs-openmpi/*.a
+%{_includedir}/blacs-openmpi/
 %{_libdir}/blacs-openmpi/*.so
 
+%files openmpi-static
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-openmpi/*.a
+
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34
+- drop lam subpackages (fixes FTBFS, 539057)
+- blacs-mpich2-* now Provides/Obsoletes blacs-lam-*, this is a dirty lie, but we need something to do it
+- move static bits to -static subpackages (resolves 545142)
+- package up Bdef.h for other dependent packages to use (resolves 533929, thanks to Deji Akingunola)
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-33
 - rework package to handle all supported MPI environments in Fedora
 



From spot at fedoraproject.org  Mon Dec  7 20:37:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 20:37:10 +0000 (UTC)
Subject: rpms/blacs/devel blacs.spec,1.33,1.34
Message-ID: <20091207203710.F14CF11C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/blacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1938/devel

Modified Files:
	blacs.spec 
Log Message:
spec cleanup, static fixes, include files


Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- blacs.spec	7 Aug 2009 02:41:37 -0000	1.33
+++ blacs.spec	7 Dec 2009 20:37:10 -0000	1.34
@@ -1,32 +1,7 @@
-# These macros will go away soon. Hopefully.
-%global _openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
-
-%global	_lam_load \
- . /etc/profile.d/modules.sh; \
- module load lam-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _lam_unload \
- . /etc/profile.d/modules.sh; \
- module unload lam-%{_arch};
-
-%global _mpich2_load \
- . /etc/profile.d/modules.sh; \
- module load mpich2-%{__isa_bits}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _mpich2_unload \
- . /etc/profile.d/modules.sh; \
- module unload mpich2-%{__isa_bits};
-
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -72,41 +47,15 @@ applications both easier to program and 
 
 This file contains common files which are not specific to any MPI implementation.
 
-%package lam
-Summary: BLACS libraries compiled against lam
-Group: Development/Libraries
-BuildRequires: lam-devel
-Requires: %{name}-common = %{version}-%{release}
-Requires: environment-modules
-
-%description lam
-The BLACS (Basic Linear Algebra Communication Subprograms) project is
-an ongoing investigation whose purpose is to create a linear algebra
-oriented message passing interface that may be implemented efficiently
-and uniformly across a large range of distributed memory platforms.
-
-The length of time required to implement efficient distributed memory
-algorithms makes it impractical to rewrite programs for every new
-parallel machine. The BLACS exist in order to make linear algebra
-applications both easier to program and more portable.
-
-This package contains BLACS libraries compiled with lam.
-
-%package lam-devel
-Summary: Development libraries for blacs (lam)
-Group: Development/Libraries
-Requires: %{name}-lam = %{version}-%{release}
-Provides: %{name}-lam-static = %{version}-%{release}
-
-%description lam-devel
-This package contains development libraries for blacs, compiled	against lam.
-
 %package mpich2
 Summary: BLACS libraries compiled against mpich2
 Group: Development/Libraries
 BuildRequires: mpich2-devel
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
+# This is a dirty lie, but something needs to reap these dead subpackages.
+Provides: blacs-lam = %{version}-%{release}
+Obsoletes: blacs-lam < 1.1-33
 
 %description mpich2
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -125,11 +74,21 @@ This package contains BLACS libraries co
 Summary: Development libraries for blacs (mpich2)
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
-Provides: %{name}-mpich2-static = %{version}-%{release}
+Provides: blacs-lam-devel = %{version}-%{release}
+Obsoletes: blacs-lam-devel < 1.1-33
 
 %description mpich2-devel
 This package contains development libraries for blacs, compiled against mpich2.
 
+%package mpich2-static
+Summary: Static libraries for blacs (mpich2)
+Group: Development/Libraries
+Provides: blacs-lam-static = %{version}-%{release}
+Obsoletes: blacs-lam-static < 1.1-33
+
+%description mpich2-static
+This package contains static libraries for blacs, compiled against mpich2.
+
 %package openmpi
 Summary: BLACS libraries compiled against openmpi
 Group: Development/Libraries
@@ -154,15 +113,21 @@ Summary: Development libraries for blacs
 Group: Development/Libraries
 BuildRequires: openmpi-devel
 Requires: %{name}-openmpi = %{version}-%{release}
-Provides: %{name}-openmpi-static = %{version}-%{release}
 
 %description openmpi-devel
 This package contains development libraries for blacs, compiled	against openmpi.
 
+%package openmpi-static
+Summary: Static libraries for blacs (openmpi)
+Group: Development/Libraries
+
+%description openmpi-static
+This package contains static libraries for blacs, compiled against openmpi.
+
 %prep
 %setup -q -c -n %{name}
 %patch0 -p1
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
 	cp -a BLACS BLACS-$i
 	cp -f %{SOURCE1} BLACS-$i/
 	sed -i "s|FOO|$i|g" BLACS-$i/Bmake.inc
@@ -182,26 +147,19 @@ cp %{SOURCE7} lawn94.ps
 
 # To avoid replicated code define a build macro
 %define dobuild() \
-cd BLACS-$MPI_COMPILER; \
+cd BLACS-$MPI_COMPILER_NAME; \
 make mpi ; \
 cd ..
 
-# Build LAM version
-export MPI_COMPILER=lam
-%{_lam_load}
-RPM_OPT_FLAGS=`echo $CFLAGS`
-%dobuild
-%{_lam_unload}
-
 # Build mpich2 version
-export MPI_COMPILER=mpich2
+export MPI_COMPILER_NAME=mpich2
 %{_mpich2_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
 %{_mpich2_unload}
 
 # Build OpenMPI version
-export MPI_COMPILER=openmpi
+export MPI_COMPILER_NAME=openmpi
 %{_openmpi_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
@@ -214,13 +172,15 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %install
 # mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-for i in lam mpich2 openmpi; do 
+for i in mpich2 openmpi; do 
   mkdir -p %{buildroot}%{_libdir}/blacs-$i/
+  mkdir -p %{buildroot}%{_includedir}/blacs-$i/
   pushd BLACS-$i/LIB
   for f in *.a *.so*; do
     cp -f $f %{buildroot}%{_libdir}/blacs-$i/$f
   done
   popd
+  install -p BLACS-$i/SRC/MPI/Bdef.h %{buildroot}%{_includedir}/blacs-$i/
   pushd %{buildroot}%{_libdir}/blacs-$i/
   for l in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do
     ln -fs $l.so.1.0.0 $l.so.1
@@ -250,17 +210,6 @@ rm -fr ${RPM_BUILD_ROOT}
 %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps
 # %{_bindir}/x*test_MPI-LINUX-0
 
-%files lam
-%defattr(-,root,root,0755)
-%dir %{_libdir}/blacs-lam/
-%{_datadir}/Modules/modulefiles/blacs-lam-%{_arch}
-%{_libdir}/blacs-lam/*.so.*
-
-%files lam-devel
-%defattr(-,root,root,0755)
-%{_libdir}/blacs-lam/*.a
-%{_libdir}/blacs-lam/*.so
-
 %files mpich2
 %defattr(-,root,root,0755)
 %dir %{_libdir}/blacs-mpich2/
@@ -269,9 +218,13 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files mpich2-devel
 %defattr(-,root,root,0755)
-%{_libdir}/blacs-mpich2/*.a
+%{_includedir}/blacs-mpich2/
 %{_libdir}/blacs-mpich2/*.so
 
+%files mpich2-static
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-mpich2/*.a
+
 %files openmpi
 %defattr(-,root,root,0755)
 %dir %{_libdir}/blacs-openmpi/
@@ -280,10 +233,20 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files openmpi-devel
 %defattr(-,root,root,0755)
-%{_libdir}/blacs-openmpi/*.a
+%{_includedir}/blacs-openmpi/
 %{_libdir}/blacs-openmpi/*.so
 
+%files openmpi-static
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-openmpi/*.a
+
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34
+- drop lam subpackages (fixes FTBFS, 539057)
+- blacs-mpich2-* now Provides/Obsoletes blacs-lam-*, this is a dirty lie, but we need something to do it
+- move static bits to -static subpackages (resolves 545142)
+- package up Bdef.h for other dependent packages to use (resolves 533929, thanks to Deji Akingunola)
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-33
 - rework package to handle all supported MPI environments in Fedora
 



From davidz at fedoraproject.org  Mon Dec  7 20:39:29 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  7 Dec 2009 20:39:29 +0000 (UTC)
Subject: File udisks.spec uploaded to lookaside cache by davidz
Message-ID: <20091207203929.678A410F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for udisks:

14238204c3896e96bfe1c48d2d5432fb  udisks.spec



From kasal at fedoraproject.org  Mon Dec  7 20:40:15 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:40:15 +0000 (UTC)
Subject: rpms/perl-Net-Domain-TLD/devel perl-Net-Domain-TLD.spec,1.8,1.9
Message-ID: <20091207204015.8CB6611C03F6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Domain-TLD/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3465

Modified Files:
	perl-Net-Domain-TLD.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Domain-TLD.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Domain-TLD/devel/perl-Net-Domain-TLD.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Net-Domain-TLD.spec	26 Jul 2009 13:40:43 -0000	1.8
+++ perl-Net-Domain-TLD.spec	7 Dec 2009 20:40:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Net-Domain-TLD
 Version:        1.68
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Work with TLD names
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.68-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.68-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From davidz at fedoraproject.org  Mon Dec  7 20:41:12 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  7 Dec 2009 20:41:12 +0000 (UTC)
Subject: rpms/udisks/devel udisks.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207204112.3E3A511C025D@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/udisks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3866

Modified Files:
	.cvsignore sources 
Added Files:
	udisks.spec 
Log Message:
* Fri Dec 04 2009 David Zeuthen <davidz at redhat.com> - 1.0.0-0.git20091202.1%{?dist}
- Updated for package review (#543608)




--- NEW FILE udisks.spec ---
%define glib2_version           2.6.0
%define dbus_version            1.2
%define dbus_glib_version       0.82
%define polkit_version          0.92
%define parted_version          1.8.8
%define udev_version            145
%define mdadm_version           2.6.7
%define device_mapper_version   1.02
%define libatasmart_version     0.12
%define sg3_utils_version       1.27
%define smp_utils_version       0.94

Summary: Storage Management Service
Name: udisks
Version: 1.0.0
Release: 0.git20091202.1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.freedesktop.org/wiki/Software/udisks
# TODO: when fd.o #22578 is resolved, update URL to proper location
Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20091202.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: dbus-devel  >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: polkit-devel >= %{polkit_version}
BuildRequires: parted-devel >= %{parted_version}
BuildRequires: device-mapper-devel >= %{device_mapper_version}
BuildRequires: intltool
BuildRequires: libatasmart-devel >= %{libatasmart_version}
BuildRequires: libgudev1-devel >= %{udev_version}
BuildRequires: libudev-devel >= %{udev_version}
BuildRequires: sg3_utils-devel >= %{sg3_utils_version}
# needed to pull in the system bus daemon
Requires: dbus >= %{dbus_version}
# needed to pull in the udev daemon
Requires: udev >= %{udev_version}
# we need at least this version for bugfixes / features etc.
Requires: libatasmart >= %{libatasmart_version}
Requires: mdadm >= %{mdadm_version}
# for smp_rep_manufacturer
Requires: smp_utils >= %{smp_utils_version}
# for mount, umount, mkswap
Requires: util-linux-ng
# for mkfs.ext3, mkfs.ext3, e2label
Requires: e2fsprogs
# for mkfs.xfs, xfs_admin
Requires: xfsprogs
# for mkfs.vfat
Requires: dosfstools
# for mlabel
Requires: mtools
# for mkntfs - no ntfsprogs on ppc, though
%ifnarch ppc ppc64
Requires: ntfsprogs
%endif

# for /proc/self/mountinfo, only available in 2.6.26 or higher
Conflicts: kernel < 2.6.26

# Obsolete and Provide DeviceKit-disks - udisks provides exactly the same
# ABI just with a different name and versioning-scheme
#
Obsoletes: DeviceKit-disks <= 009
Provides: DeviceKit-disks = 010

%description
udisks provides a daemon, D-Bus API and command line tools
for managing disks and storage devices.

%package devel
Summary: D-Bus interface definitions for udisks
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc

# See comment above
#
Obsoletes: DeviceKit-disks-devel <= 009
Provides: DeviceKit-disks-devel = 010

%description devel
D-Bus interface definitions and documentation for udisks.

%prep
%setup -q

%build
%configure --enable-gtk-doc
make

%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

rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.a

# for now, include a compat symlink for the command-line tool
# and man page
ln -s udisks $RPM_BUILD_ROOT%{_bindir}/devkit-disks
ln -s udisks.1 $RPM_BUILD_ROOT%{_datadir}/man/man1/devkit-disks.1

# TODO: should be fixed upstream
chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)

%doc README AUTHORS NEWS COPYING HACKING doc/TODO

%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/profile.d/*.sh
/lib/udev/rules.d/*.rules

/lib/udev/udisks-part-id
/lib/udev/udisks-dm-export
/lib/udev/udisks-probe-ata-smart
/lib/udev/udisks-probe-sas-expander
/sbin/umount.udisks

%{_bindir}/*
%{_libexecdir}/*

%{_mandir}/man1/*
%{_mandir}/man7/*
%{_mandir}/man8/*

%{_datadir}/polkit-1/actions/*.policy

%{_libdir}/polkit-1/extensions/*.so

%{_datadir}/dbus-1/system-services/*.service

%attr(0700,root,root) %dir %{_localstatedir}/run/udisks
%attr(0700,root,root) %dir %{_localstatedir}/lib/udisks

%files devel
%defattr(-,root,root,-)

%{_datadir}/dbus-1/interfaces/*.xml
%{_datadir}/pkgconfig/udisks.pc

%dir %{_datadir}/gtk-doc/html/udisks
%{_datadir}/gtk-doc/html/udisks/*

# Note: please don't forget the %{?dist} in the changelog. Thanks
#
%changelog
* Fri Dec 04 2009 David Zeuthen <davidz at redhat.com> - 1.0.0-0.git20091202.1%{?dist}
- Updated for package review (#543608)

* Wed Dec 02 2009 David Zeuthen <davidz at redhat.com> - 1.0.0-0.git20091202%{?dist}
- Git snapshot for upcoming 1.0.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udisks/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Dec 2009 16:35:35 -0000	1.1
+++ .cvsignore	7 Dec 2009 20:41:12 -0000	1.2
@@ -0,0 +1 @@
+udisks.spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udisks/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Dec 2009 16:35:36 -0000	1.1
+++ sources	7 Dec 2009 20:41:12 -0000	1.2
@@ -0,0 +1 @@
+14238204c3896e96bfe1c48d2d5432fb  udisks.spec



From kasal at fedoraproject.org  Mon Dec  7 20:44:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:44:52 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/devel perl-Git-CPAN-Patch.spec,1.8,1.9
Message-ID: <20091207204452.0AF9511C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Git-CPAN-Patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5321

Modified Files:
	perl-Git-CPAN-Patch.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Git-CPAN-Patch/devel/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Git-CPAN-Patch.spec	27 Sep 2009 09:12:52 -0000	1.8
+++ perl-Git-CPAN-Patch.spec	7 Dec 2009 20:44:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.2.1-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.1-1
 - auto-update to 0.2.1 (by cpan-spec-update 0.01)
 - altered br on perl(CPANPLUS) (0 => 0.84)



From kasal at fedoraproject.org  Mon Dec  7 20:45:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:45:19 +0000 (UTC)
Subject: rpms/perl-Net-DNS-SEC/devel perl-Net-DNS-SEC.spec,1.4,1.5
Message-ID: <20091207204519.C521011C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-DNS-SEC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5565

Modified Files:
	perl-Net-DNS-SEC.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-DNS-SEC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-DNS-SEC/devel/perl-Net-DNS-SEC.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Net-DNS-SEC.spec	26 Jul 2009 13:40:11 -0000	1.4
+++ perl-Net-DNS-SEC.spec	7 Dec 2009 20:45:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Net-DNS-SEC
 Version:        0.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        DNSSEC modules for Perl
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.14-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From davidz at fedoraproject.org  Mon Dec  7 20:47:04 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  7 Dec 2009 20:47:04 +0000 (UTC)
Subject: File udisks-1.0.0.git20091202.tar.gz uploaded to lookaside cache by
	davidz
Message-ID: <20091207204704.7B1C210F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for udisks:

3eb49db53f2bfa7408f887f67fe54f01  udisks-1.0.0.git20091202.tar.gz



From davidz at fedoraproject.org  Mon Dec  7 20:47:36 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  7 Dec 2009 20:47:36 +0000 (UTC)
Subject: rpms/udisks/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091207204737.0177111C025D@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/udisks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6494

Modified Files:
	.cvsignore sources 
Log Message:
Try uploading the tarball instead of the spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udisks/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Dec 2009 20:41:12 -0000	1.2
+++ .cvsignore	7 Dec 2009 20:47:36 -0000	1.3
@@ -1 +1,2 @@
 udisks.spec
+udisks-1.0.0.git20091202.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udisks/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Dec 2009 20:41:12 -0000	1.2
+++ sources	7 Dec 2009 20:47:36 -0000	1.3
@@ -1 +1 @@
-14238204c3896e96bfe1c48d2d5432fb  udisks.spec
+3eb49db53f2bfa7408f887f67fe54f01  udisks-1.0.0.git20091202.tar.gz



From scop at fedoraproject.org  Mon Dec  7 20:48:47 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon,  7 Dec 2009 20:48:47 +0000 (UTC)
Subject: File rpmdevtools-7.6.tar.xz uploaded to lookaside cache by scop
Message-ID: <20091207204847.5F5A310F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rpmdevtools:

7784f1a70aef5d3c94eaa2803c3e1478  rpmdevtools-7.6.tar.xz



From davidz at fedoraproject.org  Mon Dec  7 20:48:37 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  7 Dec 2009 20:48:37 +0000 (UTC)
Subject: rpms/udisks/devel udisks.spec,1.1,1.2
Message-ID: <20091207204837.99AFD11C025D@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/udisks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6840

Modified Files:
	udisks.spec 
Log Message:
* Mon Dec 07 2009 David Zeuthen <davidz at redhat.com> - 1.0.0-0.git20091202.2%{?dist}
- Rebuild




Index: udisks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udisks/devel/udisks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- udisks.spec	7 Dec 2009 20:41:12 -0000	1.1
+++ udisks.spec	7 Dec 2009 20:48:37 -0000	1.2
@@ -13,7 +13,7 @@
 Summary: Storage Management Service
 Name: udisks
 Version: 1.0.0
-Release: 0.git20091202.1%{?dist}
+Release: 0.git20091202.2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 #
 %changelog
+* Mon Dec 07 2009 David Zeuthen <davidz at redhat.com> - 1.0.0-0.git20091202.2%{?dist}
+- Rebuild
+
 * Fri Dec 04 2009 David Zeuthen <davidz at redhat.com> - 1.0.0-0.git20091202.1%{?dist}
 - Updated for package review (#543608)
 



From kasal at fedoraproject.org  Mon Dec  7 20:49:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:49:45 +0000 (UTC)
Subject: rpms/perl-Net-DNS-Resolver-Programmable/devel
	perl-Net-DNS-Resolver-Programmable.spec, 1.5, 1.6
Message-ID: <20091207204945.186DF11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-DNS-Resolver-Programmable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7332

Modified Files:
	perl-Net-DNS-Resolver-Programmable.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-DNS-Resolver-Programmable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-DNS-Resolver-Programmable/devel/perl-Net-DNS-Resolver-Programmable.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Net-DNS-Resolver-Programmable.spec	26 Jul 2009 13:39:55 -0000	1.5
+++ perl-Net-DNS-Resolver-Programmable.spec	7 Dec 2009 20:49:44 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Net-DNS-Resolver-Programmable
 Version:        0.003
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Programmable DNS resolver class for offline emulation of DNS
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.003-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.003-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Mon Dec  7 20:50:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon,  7 Dec 2009 20:50:04 +0000 (UTC)
Subject: rpms/rpmdevtools/devel .cvsignore, 1.19, 1.20 rpmdevtools.spec, 1.22,
	1.23 sources, 1.20, 1.21
Message-ID: <20091207205004.8DC8B11C03DB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7490

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* Mon Dec  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.6-1
- Update to 7.6, fixes #528907.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	17 Sep 2009 21:09:36 -0000	1.19
+++ .cvsignore	7 Dec 2009 20:50:04 -0000	1.20
@@ -1,2 +1,2 @@
 spectool-1.0.10.tar.bz2
-rpmdevtools-7.5.tar.xz
+rpmdevtools-7.6.tar.xz


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- rpmdevtools.spec	17 Sep 2009 21:09:36 -0000	1.22
+++ rpmdevtools.spec	7 Dec 2009 20:50:04 -0000	1.23
@@ -3,7 +3,7 @@
 %global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        7.5
+Version:        7.6
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.6-1
+- Update to 7.6, fixes #528907.
+
 * Thu Sep 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.5-1
 - Update to 7.5, fixes #502403.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	17 Sep 2009 21:09:36 -0000	1.20
+++ sources	7 Dec 2009 20:50:04 -0000	1.21
@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-ec396743a9d350ac4a6d5a104807ccca  rpmdevtools-7.5.tar.xz
+7784f1a70aef5d3c94eaa2803c3e1478  rpmdevtools-7.6.tar.xz



From kasal at fedoraproject.org  Mon Dec  7 20:50:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:50:39 +0000 (UTC)
Subject: rpms/perl-gettext/devel perl-gettext.spec,1.14,1.15
Message-ID: <20091207205039.E9BEB11C03DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7768

Modified Files:
	perl-gettext.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-gettext/devel/perl-gettext.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-gettext.spec	27 Jul 2009 14:24:45 -0000	1.14
+++ perl-gettext.spec	7 Dec 2009 20:50:39 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-gettext
 Version:        1.05
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Interface to gettext family of functions
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.05-17
+- rebuild against perl 5.10.1
+
 * Mon Jul 27 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.05-16
 - Adopt Debian's compatibility-with-POSIX-module.diff (RH BZ#447859).
 



From kasal at fedoraproject.org  Mon Dec  7 20:54:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:54:57 +0000 (UTC)
Subject: rpms/perl-Net-DNS/devel perl-Net-DNS.spec,1.46,1.47
Message-ID: <20091207205457.0C26F11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-DNS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9224

Modified Files:
	perl-Net-DNS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- perl-Net-DNS.spec	17 Sep 2009 15:36:57 -0000	1.46
+++ perl-Net-DNS.spec	7 Dec 2009 20:54:56 -0000	1.47
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
 Version: 0.65
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: DNS resolver modules for Perl
 License: GPL+ or Artistic
 Group: Development/Libraries
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.65-2
+- rebuild against perl 5.10.1
+
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 0.65-1
 - 0.65
 



From spot at fedoraproject.org  Mon Dec  7 20:54:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 20:54:55 +0000 (UTC)
Subject: rpms/blacs/F-12 blacs.spec,1.34,1.35
Message-ID: <20091207205455.85B5111C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/blacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9126

Modified Files:
	blacs.spec 
Log Message:
readd macros


Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/F-12/blacs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- blacs.spec	7 Dec 2009 20:37:10 -0000	1.34
+++ blacs.spec	7 Dec 2009 20:54:55 -0000	1.35
@@ -1,7 +1,24 @@
+# These macros will go away soon. Hopefully.
+%global _openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload openmpi-%{_arch};
+
+%global _mpich2_load \
+ . /etc/profile.d/modules.sh; \
+ module load mpich2-%{__isa_bits}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _mpich2_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload mpich2-%{__isa_bits};
+
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 34%{?dist}
+Release: 34%{?dist}.1
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -241,6 +258,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/blacs-openmpi/*.a
 
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34.1
+- readd macros to spec for F-12, only exit sanely in rawhide
+
 * Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34
 - drop lam subpackages (fixes FTBFS, 539057)
 - blacs-mpich2-* now Provides/Obsoletes blacs-lam-*, this is a dirty lie, but we need something to do it



From kasal at fedoraproject.org  Mon Dec  7 20:59:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 20:59:19 +0000 (UTC)
Subject: rpms/perl-Getopt-Long-Descriptive/devel
	perl-Getopt-Long-Descriptive.spec, 1.5, 1.6
Message-ID: <20091207205919.201C311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Getopt-Long-Descriptive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10465

Modified Files:
	perl-Getopt-Long-Descriptive.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Getopt-Long-Descriptive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-Long-Descriptive/devel/perl-Getopt-Long-Descriptive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Getopt-Long-Descriptive.spec	23 Aug 2009 18:24:39 -0000	1.5
+++ perl-Getopt-Long-Descriptive.spec	7 Dec 2009 20:59:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Getopt-Long-Descriptive
 Version:        0.077
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Getopt::Long with usage text
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.077-2
+- rebuild against perl 5.10.1
+
 * Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.077-1
 - auto-update to 0.077 (by cpan-spec-update 0.01)
 - added a new br on perl(List::Util) (version 0)



From kasal at fedoraproject.org  Mon Dec  7 21:02:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:02:24 +0000 (UTC)
Subject: rpms/perl-Net-DBus-GLib/devel perl-Net-DBus-GLib.spec,1.3,1.4
Message-ID: <20091207210224.2FDA211C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-DBus-GLib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11254

Modified Files:
	perl-Net-DBus-GLib.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-DBus-GLib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-DBus-GLib/devel/perl-Net-DBus-GLib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-DBus-GLib.spec	26 Jul 2009 13:39:27 -0000	1.3
+++ perl-Net-DBus-GLib.spec	7 Dec 2009 21:02:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-DBus-GLib
 Version:        0.33.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension for the DBus GLib bindings
 License:        GPLv2+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.33.0-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 21:05:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:05:38 +0000 (UTC)
Subject: rpms/perl-Getopt-GUI-Long/devel perl-Getopt-GUI-Long.spec,1.5,1.6
Message-ID: <20091207210538.C609A11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Getopt-GUI-Long/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12172

Modified Files:
	perl-Getopt-GUI-Long.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Getopt-GUI-Long.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-GUI-Long/devel/perl-Getopt-GUI-Long.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Getopt-GUI-Long.spec	26 Jul 2009 06:15:36 -0000	1.5
+++ perl-Getopt-GUI-Long.spec	7 Dec 2009 21:05:38 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Getopt-GUI-Long
 Version:        0.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A wrapper around Getopt::Long to provide a GUI to applications
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.91-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ttorcz at fedoraproject.org  Mon Dec  7 21:07:39 2009
From: ttorcz at fedoraproject.org (Tomasz Torcz)
Date: Mon,  7 Dec 2009 21:07:39 +0000 (UTC)
Subject: rpms/hdapsd/devel hdapsd.event.upstart0.6, NONE, 1.1 hdapsd.spec,
	1.1, 1.2 99-hdapsd.rules, 1.1, NONE
Message-ID: <20091207210739.3B75D11C025D@cvs1.fedora.phx.redhat.com>

Author: ttorcz

Update of /cvs/pkgs/rpms/hdapsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12623

Modified Files:
	hdapsd.spec 
Added Files:
	hdapsd.event.upstart0.6 
Removed Files:
	99-hdapsd.rules 
Log Message:

- port initscript file to upstart 0.6, removing custom udev rule




--- NEW FILE hdapsd.event.upstart0.6 ---
# hdapsd starting script
# laptops seldom have >2 HDD, so we care only about first two

start on device-added SUBSYSTEM=block DEVNAME=sd[ab][!0-9]
instance $1
expect fork
nice -5

script
	. /etc/sysconfig/hdapsd

	/usr/sbin/hdapsd -b -l -d $1 $HDAPSD_OPTIONS
end script



Index: hdapsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdapsd/devel/hdapsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hdapsd.spec	4 Sep 2009 15:49:30 -0000	1.1
+++ hdapsd.spec	7 Dec 2009 21:07:38 -0000	1.2
@@ -1,15 +1,14 @@
 Name:		hdapsd	
 Version:	20090401
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Protects hard drives by parking head when fall is detected
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://hdaps.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/hdaps/hdapsd-%{version}.tar.gz
-Source1:	hdapsd.event
+Source1:	hdapsd.event.upstart0.6
 Source2:	hdapsd.sysconfig
-Source3:	99-hdapsd.rules
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -31,12 +30,10 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_sysconfdir}/event.d/
+mkdir -p %{buildroot}%{_sysconfdir}/init/
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/
-mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
-cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/event.d/hdapsd
+cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/init/hdapsd.conf
 cp -p %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/hdapsd
-cp -p %SOURCE3 %{buildroot}%{_sysconfdir}/udev/rules.d/
 # remove docs installed by "make install", will be installed in proper dir by %doc
 rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 
@@ -48,8 +45,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/*
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*
-%config(noreplace) %{_sysconfdir}/event.d/hdapsd
+%config(noreplace) %{_sysconfdir}/init/hdapsd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/hdapsd
 %{_mandir}/man8/hdapsd.8.gz
 %doc AUTHORS
@@ -59,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 07 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-5
+- port initscript file to upstart 0.6, removing custom udev rule
+
 * Fri Sep 04 2009 Tomasz Torcz <ttorcz at fedoraproject.org> 20090401-4
 - use version macro in in Source0, as per review suggestion (#505928 #9)
 


--- 99-hdapsd.rules DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 21:07:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:07:59 +0000 (UTC)
Subject: rpms/perl-Net-DBus/devel perl-Net-DBus.spec,1.9,1.10
Message-ID: <20091207210759.B186311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-DBus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12851

Modified Files:
	perl-Net-DBus.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-DBus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-DBus/devel/perl-Net-DBus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Net-DBus.spec	26 Jul 2009 13:39:13 -0000	1.9
+++ perl-Net-DBus.spec	7 Dec 2009 21:07:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Net-DBus
 Version:        0.33.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Use and provide DBus services
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.33.6-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 21:12:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:12:11 +0000 (UTC)
Subject: rpms/perl-Getopt-ArgvFile/devel perl-Getopt-ArgvFile.spec,1.3,1.4
Message-ID: <20091207211211.3CE9911C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14012

Modified Files:
	perl-Getopt-ArgvFile.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Getopt-ArgvFile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Getopt-ArgvFile/devel/perl-Getopt-ArgvFile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Getopt-ArgvFile.spec	26 Jul 2009 06:15:04 -0000	1.3
+++ perl-Getopt-ArgvFile.spec	7 Dec 2009 21:12:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Getopt-ArgvFile
 Version:        1.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Interpolates script options from files into @ARGV or another array
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.11-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From limb at fedoraproject.org  Mon Dec  7 21:15:37 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  7 Dec 2009 21:15:37 +0000 (UTC)
Subject: rpms/xmoto/F-12 xmoto.spec,1.55,1.56
Message-ID: <20091207211537.BAFE911C025D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14877

Modified Files:
	xmoto.spec 
Log Message:
EVR bump.



Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-12/xmoto.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- xmoto.spec	7 Dec 2009 20:23:27 -0000	1.55
+++ xmoto.spec	7 Dec 2009 21:15:37 -0000	1.56
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	1.1%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -125,6 +125,9 @@ fi
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Mon Dec 07 2009 Jon Ciesla <limb at jcomserv.net> 0.5.2-1.1
+- EVR bump for fix CVS tagging snafu.
+
 * Tue Dec 06 2009 Howard Liberty <liberty at live.com> 0.5.2-1
 - New upstream.
 - Add x86-64 patch so it can be compiled in x86-64 enviroment.



From kasal at fedoraproject.org  Mon Dec  7 21:18:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:18:54 +0000 (UTC)
Subject: rpms/perl-Net-Daemon/devel perl-Net-Daemon.spec,1.3,1.4
Message-ID: <20091207211854.DA19B11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15474

Modified Files:
	perl-Net-Daemon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Daemon/devel/perl-Net-Daemon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-Daemon.spec	26 Jul 2009 13:40:28 -0000	1.3
+++ perl-Net-Daemon.spec	7 Dec 2009 21:18:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-Daemon
 Version:        0.44
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl extension for portable daemons
 
 Group:          Development/Libraries
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.44-8
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 21:19:18 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 21:19:18 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.22,1.23
Message-ID: <20091207211918.75A4511C025D@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14888

Modified Files:
	gnome-shell.spec 
Log Message:
Trying to fix the build, I think the autogen.sh needs to be in prep




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnome-shell.spec	7 Dec 2009 06:13:05 -0000	1.22
+++ gnome-shell.spec	7 Dec 2009 21:19:18 -0000	1.23
@@ -71,10 +71,10 @@ easy to use experience.
 ## The git repository snapshot has a different directory name:
 #%setup -q
 %setup -q -n gnome-shell
+## Needed to build the git tree
+/bin/sh gnome-shell/autogen.sh
 
 %build
-## Needed to build the git tree
-/bin/sh $RPM_BUILD_ROOT/gnome-shell/autogen.sh
 %configure
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath



From kasal at fedoraproject.org  Mon Dec  7 21:24:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:24:19 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/devel perl-Net-CUPS.spec,1.16,1.17
Message-ID: <20091207212419.957FA11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-CUPS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16575

Modified Files:
	perl-Net-CUPS.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Net-CUPS.spec	29 Aug 2009 02:11:52 -0000	1.16
+++ perl-Net-CUPS.spec	7 Dec 2009 21:24:19 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Net-CUPS
 Version:        0.61
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.61-4
+- rebuild against perl 5.10.1
+
 * Fri Aug 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-3
 - bump
 



From kasal at fedoraproject.org  Mon Dec  7 21:29:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:29:27 +0000 (UTC)
Subject: rpms/perl-Net-CIDR-Lite/devel perl-Net-CIDR-Lite.spec,1.9,1.10
Message-ID: <20091207212927.D052B11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-CIDR-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17737

Modified Files:
	perl-Net-CIDR-Lite.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-CIDR-Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-CIDR-Lite/devel/perl-Net-CIDR-Lite.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Net-CIDR-Lite.spec	26 Jul 2009 13:38:44 -0000	1.9
+++ perl-Net-CIDR-Lite.spec	7 Dec 2009 21:29:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Net-CIDR-Lite
 Version:        0.20
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Net::CIDR::Lite Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.20-7
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Dec  7 21:32:48 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 21:32:48 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.23,1.24
Message-ID: <20091207213248.549C611C025D@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18575

Modified Files:
	gnome-shell.spec 
Log Message:
PATH failure on my part, this *should* work




Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gnome-shell.spec	7 Dec 2009 21:19:18 -0000	1.23
+++ gnome-shell.spec	7 Dec 2009 21:32:48 -0000	1.24
@@ -72,7 +72,7 @@ easy to use experience.
 #%setup -q
 %setup -q -n gnome-shell
 ## Needed to build the git tree
-/bin/sh gnome-shell/autogen.sh
+/bin/sh autogen.sh
 
 %build
 %configure



From kasal at fedoraproject.org  Mon Dec  7 21:36:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:36:08 +0000 (UTC)
Subject: rpms/perl-Net-CIDR/devel perl-Net-CIDR.spec,1.1,1.2
Message-ID: <20091207213608.C465911C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-CIDR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19586

Modified Files:
	perl-Net-CIDR.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-CIDR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-CIDR/devel/perl-Net-CIDR.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-CIDR.spec	11 Nov 2009 10:22:10 -0000	1.1
+++ perl-Net-CIDR.spec	7 Dec 2009 21:36:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-CIDR
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manipulate IPv4/IPv6 netblocks in CIDR notation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.13-3
+- rebuild against perl 5.10.1
+
 * Mon Nov  9 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.13-2
 - Fix License tag
 - Remove Net-CIDR.spec from %%doc



From kasal at fedoraproject.org  Mon Dec  7 21:39:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:39:28 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.244,1.245
Message-ID: <20091207213928.9442911C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20480

Modified Files:
	perl.spec 
Log Message:
- do not pack Bzip2 manpages either (#544582)


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- perl.spec	7 Dec 2009 09:40:52 -0000	1.244
+++ perl.spec	7 Dec 2009 21:39:28 -0000	1.245
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        103%{?dist}
+Release:        104%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1173,7 +1173,8 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/perl5
 ln -s ../../../CORE/libperl.so $RPM_BUILD_ROOT%{_libdir}/perl5/5.10.0/%{perl_archname}/CORE/libperl.so
 
 # for now, remove Bzip2:
-find $RPM_BUILD_ROOT -name 'B*zip2*'|grep -E '/B(un)?zip2(\.pm)?$'| xargs rm -r
+find $RPM_BUILD_ROOT -name Bzip2 | xargs rm -r
+find $RPM_BUILD_ROOT -name '*B*zip2*'| xargs rm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1793,6 +1794,9 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-104
+- do not pack Bzip2 manpages either (#544582)
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-103
 - do not pack Bzip2 modules (#544582)
 - hack: cheat about Compress::Raw::Zlib version (#544582)



From spot at fedoraproject.org  Mon Dec  7 21:41:08 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 21:41:08 +0000 (UTC)
Subject: File OLE-Storage_Lite-0.19.tar.gz uploaded to lookaside cache by
	spot
Message-ID: <20091207214108.4781E10F87D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-OLE-Storage_Lite:

1a713f5342c7d90e54ab0d9659650296  OLE-Storage_Lite-0.19.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 21:44:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:44:22 +0000 (UTC)
Subject: rpms/perl-Net-Amazon-EC2/devel perl-Net-Amazon-EC2.spec,1.5,1.6
Message-ID: <20091207214422.0987311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22551

Modified Files:
	perl-Net-Amazon-EC2.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Amazon-EC2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel/perl-Net-Amazon-EC2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Net-Amazon-EC2.spec	26 Jul 2009 13:38:12 -0000	1.5
+++ perl-Net-Amazon-EC2.spec	7 Dec 2009 21:44:21 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Perl interface to the Amazon Elastic Compute Cloud (EC2)
 Name: perl-Net-Amazon-EC2
 Version: 0.09
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/~jkim/Net-Amazon-EC2/
@@ -124,6 +124,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Net::Amazon::EC2::Volume.3pm*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Dec  7 21:48:27 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 21:48:27 +0000 (UTC)
Subject: rpms/perl-OLE-Storage_Lite/devel .cvsignore, 1.5,
	1.6 perl-OLE-Storage_Lite.spec, 1.15, 1.16 sources, 1.5, 1.6
Message-ID: <20091207214827.B7D4211C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-OLE-Storage_Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24139

Modified Files:
	.cvsignore perl-OLE-Storage_Lite.spec sources 
Log Message:
0.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-OLE-Storage_Lite/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Mar 2009 22:40:19 -0000	1.5
+++ .cvsignore	7 Dec 2009 21:48:27 -0000	1.6
@@ -1 +1 @@
-OLE-Storage_Lite-0.18.tar.gz
+OLE-Storage_Lite-0.19.tar.gz


Index: perl-OLE-Storage_Lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-OLE-Storage_Lite/devel/perl-OLE-Storage_Lite.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-OLE-Storage_Lite.spec	7 Dec 2009 16:48:19 -0000	1.15
+++ perl-OLE-Storage_Lite.spec	7 Dec 2009 21:48:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		perl-OLE-Storage_Lite
-Version:	0.18
-Release:	3%{?dist}
+Version:	0.19
+Release:	1%{?dist}
 Summary:	Simple Class for OLE document interface
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.19-1
+- Update to 0.19
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.18-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-OLE-Storage_Lite/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2009 22:40:19 -0000	1.5
+++ sources	7 Dec 2009 21:48:27 -0000	1.6
@@ -1 +1 @@
-dcde0c0feeffdef3727f81a2f8844eca  OLE-Storage_Lite-0.18.tar.gz
+1a713f5342c7d90e54ab0d9659650296  OLE-Storage_Lite-0.19.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 21:48:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:48:59 +0000 (UTC)
Subject: rpms/perl-Net-Amazon/devel perl-Net-Amazon.spec,1.8,1.9
Message-ID: <20091207214859.AA01411C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Net-Amazon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24491

Modified Files:
	perl-Net-Amazon.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Net-Amazon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon/devel/perl-Net-Amazon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Net-Amazon.spec	7 Nov 2009 09:57:57 -0000	1.8
+++ perl-Net-Amazon.spec	7 Dec 2009 21:48:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Net-Amazon
 Version:        0.59
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Framework for accessing amazon.com via REST
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.59-2
+- rebuild against perl 5.10.1
+
 * Sat Nov 07 2009 Iain Arnell <iarnell at gmail.com> 0.59-1
 - update to latest upstream version
 



From maxamillion at fedoraproject.org  Mon Dec  7 21:53:39 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 21:53:39 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.24,1.25
Message-ID: <20091207215339.2645611C025D@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25550

Modified Files:
	gnome-shell.spec 
Log Message:
Added gnome-common for autogen.sh dep



Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gnome-shell.spec	7 Dec 2009 21:32:48 -0000	1.24
+++ gnome-shell.spec	7 Dec 2009 21:53:38 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        2.28.0.%{alphatag}
-Release:        2
+Release:        4
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -23,6 +23,7 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 ## Needed by git tree
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  gnome-common
 
 BuildRequires:  clutter-devel >= %{clutter_version}
 BuildRequires:  dbus-glib-devel
@@ -133,6 +134,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Mon Dec 07 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-4
+- Added gnome-common needed by autogen.sh in git snapshot build
+
 * Sun Dec 06 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-3
 - Added the autotools needed to build the git snapshot to the build requires
 



From kasal at fedoraproject.org  Mon Dec  7 21:54:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:54:36 +0000 (UTC)
Subject: rpms/perl-NetAddr-IP/devel perl-NetAddr-IP.spec,1.10,1.11
Message-ID: <20091207215436.4613A11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-NetAddr-IP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26315

Modified Files:
	perl-NetAddr-IP.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-NetAddr-IP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/devel/perl-NetAddr-IP.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-NetAddr-IP.spec	17 Sep 2009 18:52:15 -0000	1.10
+++ perl-NetAddr-IP.spec	7 Dec 2009 21:54:35 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-NetAddr-IP
 Version:        4.027
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manages IPv4 and IPv6 addresses and subnets
 # Upstream explicitly gave permission for us to distribute under Artistic 2.0
 # Will be reflected in next release.
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.027-2
+- rebuild against perl 5.10.1
+
 * Wed Sep 16 2009 Warren Togami <wtogami at redhat.com> - 4.027-1
 - 4.027
 



From kasal at fedoraproject.org  Mon Dec  7 21:59:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 21:59:42 +0000 (UTC)
Subject: rpms/perl-namespace-clean/devel perl-namespace-clean.spec,1.6,1.7
Message-ID: <20091207215942.E0B2511C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-namespace-clean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28117

Modified Files:
	perl-namespace-clean.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-namespace-clean.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-namespace-clean/devel/perl-namespace-clean.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-namespace-clean.spec	26 Jul 2009 17:48:42 -0000	1.6
+++ perl-namespace-clean.spec	7 Dec 2009 21:59:42 -0000	1.7
@@ -1,7 +1,7 @@
 
 Name:       perl-namespace-clean 
 Version:        0.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Keep your namespace tidy 
@@ -77,6 +77,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From leigh123linux at fedoraproject.org  Mon Dec  7 22:00:13 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon,  7 Dec 2009 22:00:13 +0000 (UTC)
Subject: File qbittorrent-3058svn.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091207220013.898A710F87D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qbittorrent:

95dd14a5b47014d4a5b13ecbb5e08826  qbittorrent-3058svn.tar.gz



From leigh123linux at fedoraproject.org  Mon Dec  7 22:01:40 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon,  7 Dec 2009 22:01:40 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.30, 1.31 qbittorrent.spec, 1.54,
	1.55 sources, 1.30, 1.31
Message-ID: <20091207220140.2B95811C025D@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28890

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.13.svn3058
- update to svn 3058 (RC6)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	7 Dec 2009 17:14:08 -0000	1.30
+++ .cvsignore	7 Dec 2009 22:01:39 -0000	1.31
@@ -1 +1 @@
-qbittorrent-3054svn.tar.gz
+qbittorrent-3058svn.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- qbittorrent.spec	7 Dec 2009 17:36:27 -0000	1.54
+++ qbittorrent.spec	7 Dec 2009 22:01:39 -0000	1.55
@@ -1,9 +1,9 @@
-%define svn_rev 3054
+%define svn_rev 3058
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.0.0
-Release: 0.12.svn%{svn_rev}%{?dist}
+Release: 0.13.svn%{svn_rev}%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -76,6 +76,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.13.svn3058
+- update to svn 3058 (RC6)
+
 * Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.12.svn3054
 - change requires qt4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	7 Dec 2009 17:14:08 -0000	1.30
+++ sources	7 Dec 2009 22:01:39 -0000	1.31
@@ -1 +1 @@
-f71327536366695a160b46313b297990  qbittorrent-3054svn.tar.gz
+95dd14a5b47014d4a5b13ecbb5e08826  qbittorrent-3058svn.tar.gz



From spot at fedoraproject.org  Mon Dec  7 22:03:19 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 22:03:19 +0000 (UTC)
Subject: File Spreadsheet-WriteExcel-2.30.tar.gz uploaded to lookaside cache
	by spot
Message-ID: <20091207220319.2516310F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Spreadsheet-WriteExcel:

8b70c63019948e813769f1681356b953  Spreadsheet-WriteExcel-2.30.tar.gz



From spot at fedoraproject.org  Mon Dec  7 22:03:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 22:03:51 +0000 (UTC)
Subject: rpms/perl-Spreadsheet-WriteExcel/devel .cvsignore, 1.11,
	1.12 perl-Spreadsheet-WriteExcel.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20091207220351.E660811C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29731

Modified Files:
	.cvsignore perl-Spreadsheet-WriteExcel.spec sources 
Log Message:
2.30


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Mar 2009 22:57:08 -0000	1.11
+++ .cvsignore	7 Dec 2009 22:03:51 -0000	1.12
@@ -1 +1 @@
-Spreadsheet-WriteExcel-2.25.tar.gz
+Spreadsheet-WriteExcel-2.30.tar.gz


Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel/devel/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Spreadsheet-WriteExcel.spec	7 Dec 2009 03:16:29 -0000	1.20
+++ perl-Spreadsheet-WriteExcel.spec	7 Dec 2009 22:03:51 -0000	1.21
@@ -1,6 +1,6 @@
 Name:			perl-Spreadsheet-WriteExcel
-Version:		2.25
-Release:		3%{?dist}
+Version:		2.30
+Release:		1%{?dist}
 Summary:		Write formatted text and numbers to a cross-platform Excel binary file
 
 Group:			Development/Libraries
@@ -10,7 +10,7 @@ Source0:		http://cpan.org/authors/id/J/J
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:		noarch
-BuildRequires:		perl-Parse-RecDescent, perl(Test::More), perl(OLE::Storage_Lite)
+BuildRequires:		perl-Parse-RecDescent, perl(Test::More), perl(OLE::Storage_Lite) >= 0.19
 Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:		perl(Date::Calc), perl(Date::Manip), perl(Parse::RecDescent)
 
@@ -74,13 +74,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README doc/ charts/ examples/
+%doc Changes README docs/ charts/ examples/
 %{_bindir}/chartex
 %{perl_vendorlib}/Spreadsheet/
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.30-1
+- update to 2.30
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.25-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Mar 2009 22:57:09 -0000	1.11
+++ sources	7 Dec 2009 22:03:51 -0000	1.12
@@ -1 +1 @@
-ad70e5b031c0af60c50a72d8b09240c9  Spreadsheet-WriteExcel-2.25.tar.gz
+8b70c63019948e813769f1681356b953  Spreadsheet-WriteExcel-2.30.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 22:04:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:04:14 +0000 (UTC)
Subject: rpms/perl-namespace-autoclean/devel perl-namespace-autoclean.spec,
	1.5, 1.6
Message-ID: <20091207220414.00BC711C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-namespace-autoclean/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29919

Modified Files:
	perl-namespace-autoclean.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-namespace-autoclean.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-namespace-autoclean/devel/perl-namespace-autoclean.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-namespace-autoclean.spec	17 Sep 2009 09:27:43 -0000	1.5
+++ perl-namespace-autoclean.spec	7 Dec 2009 22:04:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-namespace-autoclean
 Version:    0.09
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Keep imports out of your namespace
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.09-3
+- rebuild against perl 5.10.1
+
 * Thu Sep 17 2009 Stepan Kasal <skasal at redhat.com> 0.09-2
 - fix the previous changelog entry
 



From pbrobinson at fedoraproject.org  Mon Dec  7 22:04:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 22:04:58 +0000 (UTC)
Subject: rpms/libplist/devel libplist.spec,1.9,1.10
Message-ID: <20091207220458.BC71411C025D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30238

Modified Files:
	libplist.spec 
Log Message:
- Further updated fixes for the spec file


Index: libplist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/libplist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libplist.spec	7 Dec 2009 20:36:30 -0000	1.9
+++ libplist.spec	7 Dec 2009 22:04:58 -0000	1.10
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libplist
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.0
+Release:        3%{?dist}
 Summary:        Library for manipulating Apple Binary and XML Property Lists
 
 Group:          System Environment/Libraries
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libplist
 
 %changelog
+* Mon Dec  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-3
+- Further updated fixes for the spec file
+
 * Mon Dec  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-2
 - Drop upstreamed patch
 



From spot at fedoraproject.org  Mon Dec  7 22:05:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 22:05:28 +0000 (UTC)
Subject: rpms/perl-Spreadsheet-WriteExcel/devel
	perl-Spreadsheet-WriteExcel.spec, 1.21, 1.22
Message-ID: <20091207220528.433F711C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30462

Modified Files:
	perl-Spreadsheet-WriteExcel.spec 
Log Message:
2.30


Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-WriteExcel/devel/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-Spreadsheet-WriteExcel.spec	7 Dec 2009 22:03:51 -0000	1.21
+++ perl-Spreadsheet-WriteExcel.spec	7 Dec 2009 22:05:27 -0000	1.22
@@ -13,6 +13,7 @@ BuildArch:		noarch
 BuildRequires:		perl-Parse-RecDescent, perl(Test::More), perl(OLE::Storage_Lite) >= 0.19
 Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:		perl(Date::Calc), perl(Date::Manip), perl(Parse::RecDescent)
+Requires:		perl(OLE::Storage_Lite) >= 0.19
 
 %description
 The Spreadsheet::WriteExcel module can be used to create a cross-



From kasal at fedoraproject.org  Mon Dec  7 22:08:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:08:30 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin-Beanstalk/devel
	perl-Nagios-Plugin-Beanstalk.spec, 1.2, 1.3
Message-ID: <20091207220830.A1C6411C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31541

Modified Files:
	perl-Nagios-Plugin-Beanstalk.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Nagios-Plugin-Beanstalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin-Beanstalk/devel/perl-Nagios-Plugin-Beanstalk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Nagios-Plugin-Beanstalk.spec	30 Sep 2009 15:13:06 -0000	1.2
+++ perl-Nagios-Plugin-Beanstalk.spec	7 Dec 2009 22:08:30 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           perl-Nagios-Plugin-Beanstalk
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Nagios plugin to observe Beanstalkd queue server
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/check_beanstalkd
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.04-4
+- rebuild against perl 5.10.1
+
 * Fri Sep 25 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.04-3
 - Install plugin in nagios plugin dir
 



From kasal at fedoraproject.org  Mon Dec  7 22:13:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:13:20 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin/devel perl-Nagios-Plugin.spec,1.1,1.2
Message-ID: <20091207221320.834CC11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv770

Modified Files:
	perl-Nagios-Plugin.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Nagios-Plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin/devel/perl-Nagios-Plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Nagios-Plugin.spec	28 Aug 2009 14:50:55 -0000	1.1
+++ perl-Nagios-Plugin.spec	7 Dec 2009 22:13:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Nagios-Plugin
 Version:        0.33
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Family of perl modules to streamline writing Nagios plugins
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.33-3
+- rebuild against perl 5.10.1
+
 * Thu Aug 27 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.33-2
 - Review fixes (#517497)
 



From kasal at fedoraproject.org  Mon Dec  7 22:17:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:17:53 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA/devel perl-Nagios-NSCA.spec,1.2,1.3
Message-ID: <20091207221753.87E1B11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2384

Modified Files:
	perl-Nagios-NSCA.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Nagios-NSCA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-NSCA/devel/perl-Nagios-NSCA.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Nagios-NSCA.spec	14 Nov 2009 18:28:36 -0000	1.2
+++ perl-Nagios-NSCA.spec	7 Dec 2009 22:17:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Nagios-NSCA
 Version:        0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Nagios::NSCA Perl module
 License:        GPL+ 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.1-5
+- rebuild against perl 5.10.1
+
 * Sat Nov 14 2009 steve.traylen at cern.ch - 0.1-4
 - rebuilt for F13
 



From lkundrak at fedoraproject.org  Mon Dec  7 22:18:28 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 22:18:28 +0000 (UTC)
Subject: rpms/synfig/devel synfig.spec,1.1,1.2
Message-ID: <20091207221828.ADF9511C025D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2676

Modified Files:
	synfig.spec 
Log Message:
Fix build


Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/devel/synfig.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synfig.spec	13 Nov 2009 23:55:36 -0000	1.1
+++ synfig.spec	7 Dec 2009 22:18:28 -0000	1.2
@@ -10,7 +10,7 @@ Source0:        http://downloads.sourcef
 Patch0:         synfig-0.61.09-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ETL-devel
+BuildRequires:  ETL-devel >= 0.04.13
 BuildRequires:  libxml++-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libpng-devel
@@ -59,7 +59,6 @@ developing applications that use %{name}
 
 
 %build
-autoconf
 %configure --disable-static --with-imagemagick --with-magickpp \
         --without-libavcodec
 %if 0%{?fedora} >= 10



From maxamillion at fedoraproject.org  Mon Dec  7 22:18:50 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon,  7 Dec 2009 22:18:50 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.25,1.26
Message-ID: <20091207221850.9261711C025D@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2785

Modified Files:
	gnome-shell.spec 
Log Message:
Added libtool for git snapshot dep



Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gnome-shell.spec	7 Dec 2009 21:53:38 -0000	1.25
+++ gnome-shell.spec	7 Dec 2009 22:18:50 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        2.28.0.%{alphatag}
-Release:        4
+Release:        5
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -21,9 +21,10 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 %define mutter_version 2.28.0
 
 ## Needed by git tree
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gnome-common
+BuildRequires:  autoconf >= 2.53
+BuildRequires:  automake >= 1.10
+BuildRequires:  gnome-common >= 2.2.0
+BuildRequires:  libtool >= 1.4.3
 
 BuildRequires:  clutter-devel >= %{clutter_version}
 BuildRequires:  dbus-glib-devel
@@ -134,6 +135,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Tue Dec 07 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-5
+- Added libtool, glib-gettext for the libtoolize dep of git snapshot
+
 * Mon Dec 07 2009 Adam Miller <maxamillion at fedoraproject.org> - 2.28.0.20091206git-4
 - Added gnome-common needed by autogen.sh in git snapshot build
 



From pbrobinson at fedoraproject.org  Mon Dec  7 22:20:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  7 Dec 2009 22:20:12 +0000 (UTC)
Subject: rpms/libplist/devel libplist.spec,1.10,1.11
Message-ID: <20091207222012.D744D11C03DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3432

Modified Files:
	libplist.spec 
Log Message:
- and once more with feeling


Index: libplist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/libplist.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libplist.spec	7 Dec 2009 22:04:58 -0000	1.10
+++ libplist.spec	7 Dec 2009 22:20:12 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           libplist
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for manipulating Apple Binary and XML Property Lists
 
 Group:          System Environment/Libraries
@@ -65,10 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING.LESSER README
 %{_bindir}/plutil
 %{_bindir}/plutil-%{version}
-%{_libdir}/libplist.so.0
-%{_libdir}/libplist.so.0.0.16
-%{_libdir}/libplist++.so.0
-%{_libdir}/libplist++.so.0.0.16
+%{_libdir}/libplist.so.1
+%{_libdir}/libplist.so.1.1.0
+%{_libdir}/libplist++.so.1
+%{_libdir}/libplist++.so.1.1.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,9 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files python
 %defattr(-,root,root,-)
-%{python_sitearch}/libplist
+%{python_sitearch}/plist
 
 %changelog
+* Mon Dec  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-4
+- and once more with feeling
+
 * Mon Dec  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-3
 - Further updated fixes for the spec file
 



From kasal at fedoraproject.org  Mon Dec  7 22:22:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:22:00 +0000 (UTC)
Subject: rpms/perl-MRO-Compat/devel perl-MRO-Compat.spec,1.9,1.10
Message-ID: <20091207222200.AD2F711C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MRO-Compat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4079

Modified Files:
	perl-MRO-Compat.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MRO-Compat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MRO-Compat/devel/perl-MRO-Compat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-MRO-Compat.spec	26 Jul 2009 09:05:57 -0000	1.9
+++ perl-MRO-Compat.spec	7 Dec 2009 22:22:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-MRO-Compat
 Version:        0.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mro::* interface compatibility for Perls < 5.9.5
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thias at fedoraproject.org  Mon Dec  7 22:24:02 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  7 Dec 2009 22:24:02 +0000 (UTC)
Subject: rpms/kannel/EL-5 gw-config,1.1,1.2 kannel.spec,1.14,1.15
Message-ID: <20091207222402.E796E11C025D@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4625/EL-5

Modified Files:
	gw-config kannel.spec 
Log Message:
Fix gw-config wrapper to actually have it work (#542605).



Index: gw-config
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/gw-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gw-config	12 Sep 2009 15:26:35 -0000	1.1
+++ gw-config	7 Dec 2009 22:24:02 -0000	1.2
@@ -5,16 +5,16 @@
 
 # Always prefer 64bit over 32bit, hardcode the multilib archs here
 for ARCH in x86_64 ia64 s390; do
-    [ -x /usr/bin/gw-config-${ARCH} ] && exec /usr/bin/gw-config-${ARCH}
+    [ -x /usr/bin/gw-config.${ARCH} ] && exec /usr/bin/gw-config.${ARCH} $*
 done
 
 # No multilib, execute the first one found (there should be only one anyway)
-CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config-* 2>/dev/null | head -n 1)
+CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config.* 2>/dev/null | head -n 1)
 
 if [ -x "${CONFIGSCRIPT}" ]; then
-    exec ${CONFIGSCRIPT}
+    exec ${CONFIGSCRIPT} $*
 else
-    echo "Not a single /usr/bin/gw-config-* script found. Please check why."
+    echo "Not a single /usr/bin/gw-config.* script found. Please check why."
     exit 1
 fi
 


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/EL-5/kannel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kannel.spec	12 Sep 2009 15:26:35 -0000	1.14
+++ kannel.spec	7 Dec 2009 22:24:02 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -164,6 +164,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Matthias Saou <http://freshrpms.net/> 1.4.3-4
+- Fix gw-config wrapper to actually have it work (#542605).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-3
 - rebuilt with new openssl
 



From thias at fedoraproject.org  Mon Dec  7 22:24:03 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  7 Dec 2009 22:24:03 +0000 (UTC)
Subject: rpms/kannel/F-11 gw-config,1.1,1.2 kannel.spec,1.21,1.22
Message-ID: <20091207222403.20D1111C025D@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4625/F-11

Modified Files:
	gw-config kannel.spec 
Log Message:
Fix gw-config wrapper to actually have it work (#542605).



Index: gw-config
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-11/gw-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gw-config	22 Dec 2008 15:22:44 -0000	1.1
+++ gw-config	7 Dec 2009 22:24:02 -0000	1.2
@@ -5,16 +5,16 @@
 
 # Always prefer 64bit over 32bit, hardcode the multilib archs here
 for ARCH in x86_64 ia64 s390; do
-    [ -x /usr/bin/gw-config-${ARCH} ] && exec /usr/bin/gw-config-${ARCH}
+    [ -x /usr/bin/gw-config.${ARCH} ] && exec /usr/bin/gw-config.${ARCH} $*
 done
 
 # No multilib, execute the first one found (there should be only one anyway)
-CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config-* 2>/dev/null | head -n 1)
+CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config.* 2>/dev/null | head -n 1)
 
 if [ -x "${CONFIGSCRIPT}" ]; then
-    exec ${CONFIGSCRIPT}
+    exec ${CONFIGSCRIPT} $*
 else
-    echo "Not a single /usr/bin/gw-config-* script found. Please check why."
+    echo "Not a single /usr/bin/gw-config.* script found. Please check why."
     exit 1
 fi
 


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-11/kannel.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kannel.spec	25 Feb 2009 10:10:37 -0000	1.21
+++ kannel.spec	7 Dec 2009 22:24:03 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.1
-Release: 11
+Version: 1.4.3
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -10,7 +10,8 @@ Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
 Source4: gw-config
-Patch0: gateway-1.4.1-ssl64bit.patch
+# TODO: a corresponding configure.in patch could be upstreamable?
+Patch0: gateway-1.4.3-ssldetect.patch
 Patch1: gateway-1.4.1-typesh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, byacc, flex, ghostscript
@@ -32,9 +33,10 @@ forms. Only the data call bearer (UDP) i
 
 
 %package devel
-Summary: Development files for the kannel WAP and SMS gateway
+Summary: Development files for the Kannel WAP and SMS gateway
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 
 %description devel
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -45,24 +47,42 @@ files via HTTP works, including compilat
 forms. Only the data call bearer (UDP) is supported, not SMS.
 
 Install this package if you need to develop or recompile applications that
-use the kannel WAP and SMS gateway.
+use the Kannel WAP and SMS gateway.
+
+
+%package docs
+Summary: Documentation for the Kannel WAP and SMS gateway
+Group: Documentation
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+
+%description docs
+The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
+implementing keyword based services via GSM text messages, and a WAP gateway,
+via UDP. The SMS part is fairly mature, the WAP part is early in its
+development. In this release, the GET request for WML pages and WMLScript
+files via HTTP works, including compilation for WML and WMLScript to binary
+forms. Only the data call bearer (UDP) is supported, not SMS.
+
+This package contains documentation for the Kannel WAP and SMS gateway.
 
 
 %prep
 %setup -q -n gateway-%{version}
-%patch0 -p1 -b .ssl64bit
+%patch0 -p1 -b .ssldetect
 %patch1 -p1 -b .typesh
+%{__chmod} -c -x gwlib/html-entities.def # for -debuginfo, as of 1.4.3
 
 
 %build
 %configure \
     --enable-pcre \
-    --enable-docs \
     --enable-start-stop-daemon \
     --with-sqlite3 \
     %{?_with_mysql} \
     %{?_with_pgsql}
-# Remove %{?_smp_mflags} since the docs fail to build with it
+# Remove %{?_smp_mflags} since the docs fail to build with it as of 1.4.3
 %{__make}
 
 
@@ -82,8 +102,8 @@ use the kannel WAP and SMS gateway.
 # Rename start-stop-daemon to start-stop-kannel
 %{__mv} %{buildroot}%{_sbindir}/start-stop-daemon \
         %{buildroot}%{_sbindir}/start-stop-kannel
-# Remove executable bit from man pages (as of 1.4.1)
-%{__chmod} -x %{buildroot}%{_mandir}/man?/*
+# Remove executable bit from man pages (as of 1.4.3)
+%{__chmod} -c -x %{buildroot}%{_mandir}/man?/*
 # Multilib fix : Replace the gw-config with our wrapper script
 %{__mv} %{buildroot}%{_bindir}/gw-config \
         %{buildroot}%{_bindir}/gw-config.%{_arch}
@@ -117,7 +137,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS
 %attr(0640,kannel,kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
 %{_sysconfdir}/rc.d/init.d/kannel
@@ -131,7 +151,6 @@ fi
 %{_mandir}/man?/*
 %attr(0750,kannel,kannel) %dir %{_var}/log/kannel/
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gw-config*
@@ -139,8 +158,27 @@ fi
 %dir %{_libdir}/kannel/
 %{_libdir}/kannel/*.a
 
+%files docs
+%defattr(-,root,root,-)
+%doc doc/*/*.pdf
+
 
 %changelog
+* Mon Dec  7 2009 Matthias Saou <http://freshrpms.net/> 1.4.3-4
+- Fix gw-config wrapper to actually have it work (#542605).
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.4.3-1
+- Update to 1.4.3 (#495891).
+- Provide -static in -devel.
+- Split PDFs into -docs, noarch where applicable.
+- Patch to use pkg-config at build time for SSL detection.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From thias at fedoraproject.org  Mon Dec  7 22:24:03 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  7 Dec 2009 22:24:03 +0000 (UTC)
Subject: rpms/kannel/F-12 gw-config,1.1,1.2 kannel.spec,1.24,1.25
Message-ID: <20091207222403.5423811C025D@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4625/F-12

Modified Files:
	gw-config kannel.spec 
Log Message:
Fix gw-config wrapper to actually have it work (#542605).



Index: gw-config
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-12/gw-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gw-config	22 Dec 2008 15:22:44 -0000	1.1
+++ gw-config	7 Dec 2009 22:24:03 -0000	1.2
@@ -5,16 +5,16 @@
 
 # Always prefer 64bit over 32bit, hardcode the multilib archs here
 for ARCH in x86_64 ia64 s390; do
-    [ -x /usr/bin/gw-config-${ARCH} ] && exec /usr/bin/gw-config-${ARCH}
+    [ -x /usr/bin/gw-config.${ARCH} ] && exec /usr/bin/gw-config.${ARCH} $*
 done
 
 # No multilib, execute the first one found (there should be only one anyway)
-CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config-* 2>/dev/null | head -n 1)
+CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config.* 2>/dev/null | head -n 1)
 
 if [ -x "${CONFIGSCRIPT}" ]; then
-    exec ${CONFIGSCRIPT}
+    exec ${CONFIGSCRIPT} $*
 else
-    echo "Not a single /usr/bin/gw-config-* script found. Please check why."
+    echo "Not a single /usr/bin/gw-config.* script found. Please check why."
     exit 1
 fi
 


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-12/kannel.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- kannel.spec	21 Aug 2009 14:05:42 -0000	1.24
+++ kannel.spec	7 Dec 2009 22:24:03 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -164,6 +164,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Matthias Saou <http://freshrpms.net/> 1.4.3-4
+- Fix gw-config wrapper to actually have it work (#542605).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-3
 - rebuilt with new openssl
 



From thias at fedoraproject.org  Mon Dec  7 22:24:03 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  7 Dec 2009 22:24:03 +0000 (UTC)
Subject: rpms/kannel/devel gw-config,1.1,1.2 kannel.spec,1.24,1.25
Message-ID: <20091207222403.A95B711C025D@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4625/devel

Modified Files:
	gw-config kannel.spec 
Log Message:
Fix gw-config wrapper to actually have it work (#542605).



Index: gw-config
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/gw-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gw-config	22 Dec 2008 15:22:44 -0000	1.1
+++ gw-config	7 Dec 2009 22:24:03 -0000	1.2
@@ -5,16 +5,16 @@
 
 # Always prefer 64bit over 32bit, hardcode the multilib archs here
 for ARCH in x86_64 ia64 s390; do
-    [ -x /usr/bin/gw-config-${ARCH} ] && exec /usr/bin/gw-config-${ARCH}
+    [ -x /usr/bin/gw-config.${ARCH} ] && exec /usr/bin/gw-config.${ARCH} $*
 done
 
 # No multilib, execute the first one found (there should be only one anyway)
-CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config-* 2>/dev/null | head -n 1)
+CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config.* 2>/dev/null | head -n 1)
 
 if [ -x "${CONFIGSCRIPT}" ]; then
-    exec ${CONFIGSCRIPT}
+    exec ${CONFIGSCRIPT} $*
 else
-    echo "Not a single /usr/bin/gw-config-* script found. Please check why."
+    echo "Not a single /usr/bin/gw-config.* script found. Please check why."
     exit 1
 fi
 


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- kannel.spec	21 Aug 2009 14:05:42 -0000	1.24
+++ kannel.spec	7 Dec 2009 22:24:03 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -164,6 +164,9 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009 Matthias Saou <http://freshrpms.net/> 1.4.3-4
+- Fix gw-config wrapper to actually have it work (#542605).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-3
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Mon Dec  7 22:26:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:26:11 +0000 (UTC)
Subject: rpms/perl-MP3-Info/devel perl-MP3-Info.spec,1.14,1.15
Message-ID: <20091207222611.BFF7D11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MP3-Info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5728

Modified Files:
	perl-MP3-Info.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-MP3-Info.spec	30 Aug 2009 17:22:00 -0000	1.14
+++ perl-MP3-Info.spec	7 Dec 2009 22:26:11 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.24-2
+- rebuild against perl 5.10.1
+
 * Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.24-1
 - Upstream sync
 



From thias at fedoraproject.org  Mon Dec  7 22:28:03 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon,  7 Dec 2009 22:28:03 +0000 (UTC)
Subject: rpms/kannel/F-11 gateway-1.4.3-ssldetect.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 sources, 1.4, 1.5 gateway-1.4.1-ssl64bit.patch, 1.1, NONE
Message-ID: <20091207222803.954F311C025D@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/kannel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6288

Modified Files:
	.cvsignore sources 
Added Files:
	gateway-1.4.3-ssldetect.patch 
Removed Files:
	gateway-1.4.1-ssl64bit.patch 
Log Message:
Backport files from devel for the 1.4.1 to 1.4.3 update.


gateway-1.4.3-ssldetect.patch:
 configure |   24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

--- NEW FILE gateway-1.4.3-ssldetect.patch ---
diff -up gateway-1.4.3/configure~ gateway-1.4.3/configure
--- gateway-1.4.3/configure~	2008-08-06 17:22:43.000000000 +0300
+++ gateway-1.4.3/configure	2009-06-25 21:10:01.000000000 +0300
@@ -10957,28 +10957,8 @@ fi
 
 
 if test "$ssl" = "yes" ; then
-    if test "x$ssllib" = "x" && test "x$sslinc" = "x"; then
-    for loc in /usr/lib /usr/lib64 /usr/local/ssl/lib /usr/local/openssl/lib; do
-      if test -f "$loc/libssl.a" -o -f "$loc/libssl.dylib" ; then
-        ssllib="$loc"
-      fi
-    done
-    for loc in /usr/include/ssl /usr/include/openssl /usr/local/ssl/include \
-               /usr/local/openssl/include; do
-      if test -d "$loc"; then
-        sslinc="$loc"
-      fi
-    done
-  fi
-  { $as_echo "$as_me:$LINENO: result: trying $ssllib $sslinc" >&5
-$as_echo "trying $ssllib $sslinc" >&6; }
-fi
-
-
-
-if test "x$ssllib" != "x" && test "x$sslinc" != "x"; then
-  CFLAGS="$CFLAGS -I$sslinc"
-  LIBS="$LIBS -L$ssllib"
+  CFLAGS="$CFLAGS ${sslinc:+-I$sslinc}${sslinc:-`pkg-config openssl --cflags`}"
+  LIBS="$LIBS ${ssllib:+-L$ssllib}${ssllib:-`pkg-config openssl --libs`}"
 
   # Extract the first word of "openssl", so it can be a program name with args.
 set dummy openssl; ac_word=$2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Oct 2006 15:25:40 -0000	1.4
+++ .cvsignore	7 Dec 2009 22:28:03 -0000	1.5
@@ -1 +1 @@
-gateway-1.4.1.tar.bz2
+gateway-1.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Oct 2006 15:25:40 -0000	1.4
+++ sources	7 Dec 2009 22:28:03 -0000	1.5
@@ -1 +1 @@
-ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2
+c52febb1a58884778bc5f2aa9f10b642  gateway-1.4.3.tar.bz2


--- gateway-1.4.1-ssl64bit.patch DELETED ---



From kasal at fedoraproject.org  Mon Dec  7 22:30:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:30:06 +0000 (UTC)
Subject: rpms/perl-MouseX-Types/devel perl-MouseX-Types.spec,1.3,1.4
Message-ID: <20091207223006.E8E9511C03B8@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MouseX-Types/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7330

Modified Files:
	perl-MouseX-Types.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MouseX-Types.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MouseX-Types/devel/perl-MouseX-Types.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MouseX-Types.spec	26 Jul 2009 11:34:13 -0000	1.3
+++ perl-MouseX-Types.spec	7 Dec 2009 22:30:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-MouseX-Types 
 Version:    0.01 
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/MouseX/Types.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.01-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lkundrak at fedoraproject.org  Mon Dec  7 22:33:40 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 22:33:40 +0000 (UTC)
Subject: rpms/synfig/EL-5 synfig.spec,1.1,1.2
Message-ID: <20091207223340.186B011C025D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8700/EL-5

Modified Files:
	synfig.spec 
Log Message:
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build with older ETL



Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/EL-5/synfig.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synfig.spec	13 Nov 2009 23:56:30 -0000	1.1
+++ synfig.spec	7 Dec 2009 22:33:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -59,7 +59,7 @@ developing applications that use %{name}
 
 
 %build
-autoconf
+sed 's/0.04.13/0.04.12/g' -i configure
 %configure --disable-static --with-imagemagick --with-magickpp \
         --without-libavcodec
 %if 0%{?fedora} >= 10
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
+- Build with older ETL
+
 * Sat Nov 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
 - New upstream release
 



From lkundrak at fedoraproject.org  Mon Dec  7 22:33:40 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 22:33:40 +0000 (UTC)
Subject: rpms/synfig/F-11 synfig.spec,1.1,1.2
Message-ID: <20091207223340.2D4DA11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8700/F-11

Modified Files:
	synfig.spec 
Log Message:
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build with older ETL



Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/F-11/synfig.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synfig.spec	13 Nov 2009 23:57:25 -0000	1.1
+++ synfig.spec	7 Dec 2009 22:33:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -59,7 +59,7 @@ developing applications that use %{name}
 
 
 %build
-autoconf
+sed 's/0.04.13/0.04.12/g' -i configure
 %configure --disable-static --with-imagemagick --with-magickpp \
         --without-libavcodec
 %if 0%{?fedora} >= 10
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
+- Build with older ETL
+
 * Sat Nov 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
 - New upstream release
 



From lkundrak at fedoraproject.org  Mon Dec  7 22:33:40 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 22:33:40 +0000 (UTC)
Subject: rpms/synfig/F-12 synfig.spec,1.1,1.2
Message-ID: <20091207223340.4C0ED11C025D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8700/F-12

Modified Files:
	synfig.spec 
Log Message:
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build with older ETL



Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/F-12/synfig.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synfig.spec	13 Nov 2009 23:58:20 -0000	1.1
+++ synfig.spec	7 Dec 2009 22:33:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -59,7 +59,7 @@ developing applications that use %{name}
 
 
 %build
-autoconf
+sed 's/0.04.13/0.04.12/g' -i configure
 %configure --disable-static --with-imagemagick --with-magickpp \
         --without-libavcodec
 %if 0%{?fedora} >= 10
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
+- Build with older ETL
+
 * Sat Nov 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
 - New upstream release
 



From kasal at fedoraproject.org  Mon Dec  7 22:34:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:34:24 +0000 (UTC)
Subject: rpms/perl-Mouse/devel perl-Mouse.spec,1.15,1.16
Message-ID: <20091207223424.D407F11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-Mouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9052

Modified Files:
	perl-Mouse.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-Mouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mouse/devel/perl-Mouse.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Mouse.spec	27 Sep 2009 06:06:17 -0000	1.15
+++ perl-Mouse.spec	7 Dec 2009 22:34:24 -0000	1.16
@@ -1,6 +1,6 @@
 Name:       perl-Mouse
 Version:    0.35
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    Moose minus the antlers
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.35-2
+- rebuild against perl 5.10.1
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
 - update filtering
 - drop our soft-requires (except 1).  Anything using Mouse by this point



From dwalsh at fedoraproject.org  Mon Dec  7 22:37:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  7 Dec 2009 22:37:55 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.43,
	1.44 modules-targeted.conf, 1.152, 1.153 policy-F12.patch, 1.150,
	1.151 selinux-policy.spec, 1.978, 1.979
Message-ID: <20091207223755.C0C0D11C025D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10266

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Mon Dec 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-56
- Dontaudit exec of fusermount from xguest
- Allow licrd to use mouse_device
- Allow sysadm_t to connect to zebra stream socket
- Dontaudit policykit_auth trying to config terminal
- Allow logrotate and asterisk to execute asterisk
- Allow logrotate to read var_lib files (zope) and connect to fail2ban stream
- Allow firewallgui to communicate with unconfined_t
- Allow podsleuth to ask the kernel to load modules
- Fix labeling on vhostmd scripts
- Remove transition from unconfined_t to windbind_helper_t
- Allow abrt_helper to look at inotify
- Fix labels for mythtv
- Allow apache to signal sendmail
- allow asterisk to send mail
- Allow rpcd to get and setcap
- Add tor_bind_all_unreserved_ports boolean
- Add policy for vhostmd
- MOre textrel_shlib_t files
- Add rw_herited_term_perms 



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- modules-minimum.conf	9 Nov 2009 22:21:23 -0000	1.43
+++ modules-minimum.conf	7 Dec 2009 22:37:54 -0000	1.44
@@ -1572,10 +1572,18 @@ unconfined = module
 # Layer: services
 # Module: ulogd
 #
-# 
+# netfilter/iptables ULOG daemon
 # 
 ulogd = module
 
+# Layer: services
+# Module: vhostmd
+#
+# vhostmd - A metrics gathering daemon
+# 
+vhostmd = module
+
+
 # Layer: apps
 # Module: wine
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- modules-targeted.conf	9 Nov 2009 22:21:23 -0000	1.152
+++ modules-targeted.conf	7 Dec 2009 22:37:54 -0000	1.153
@@ -1572,10 +1572,18 @@ unconfined = module
 # Layer: services
 # Module: ulogd
 #
-# 
+# netfilter/iptables ULOG daemon
 # 
 ulogd = module
 
+# Layer: services
+# Module: vhostmd
+#
+# vhostmd - A metrics gathering daemon
+# 
+vhostmd = module
+
+
 # Layer: apps
 # Module: wine
 #

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   13 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |   80 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   23 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    7 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   43 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   45 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |   13 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  417 +++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  126 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  444 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  110 +
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   52 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   20 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   50 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   28 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   21 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  117 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.te           |   14 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |    7 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    4 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   65 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   82 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  191 +++
 policy/modules/services/vhostmd.te        |   79 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  635 ++++++++++-
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   66 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  184 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   82 +
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1685 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  142 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 398 files changed, 20346 insertions(+), 2813 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.150 -r 1.151 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- policy-F12.patch	3 Dec 2009 19:56:22 -0000	1.150
+++ policy-F12.patch	7 Dec 2009 22:37:54 -0000	1.151
@@ -298,7 +298,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-07 16:23:11.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -308,7 +308,15 @@ diff -b -B --ignore-all-space --exclude-
  
  allow logrotate_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  
-@@ -116,8 +116,9 @@
+@@ -63,6 +63,7 @@
+ create_dirs_pattern(logrotate_t, logrotate_var_lib_t, logrotate_var_lib_t)
+ manage_files_pattern(logrotate_t, logrotate_var_lib_t, logrotate_var_lib_t)
+ files_var_lib_filetrans(logrotate_t, logrotate_var_lib_t, file)
++files_read_var_lib_files(logrotate_t)
+ 
+ kernel_read_system_state(logrotate_t)
+ kernel_read_kernel_sysctls(logrotate_t)
+@@ -116,8 +117,9 @@
  seutil_dontaudit_read_config(logrotate_t)
  
  userdom_use_user_terminals(logrotate_t)
@@ -319,7 +327,7 @@ diff -b -B --ignore-all-space --exclude-
  
  cron_system_entry(logrotate_t, logrotate_exec_t)
  cron_search_spool(logrotate_t)
-@@ -137,6 +138,10 @@
+@@ -137,6 +139,10 @@
  ')
  
  optional_policy(`
@@ -330,10 +338,11 @@ diff -b -B --ignore-all-space --exclude-
  	acct_domtrans(logrotate_t)
  	acct_manage_data(logrotate_t)
  	acct_exec_data(logrotate_t)
-@@ -149,6 +154,14 @@
+@@ -149,6 +155,15 @@
  ')
  
  optional_policy(`
++	asterisk_exec(logrotate_t)
 +	asterisk_stream_connect(logrotate_t)
 +')
 +
@@ -345,7 +354,18 @@ diff -b -B --ignore-all-space --exclude-
  	consoletype_exec(logrotate_t)
  ')
  
-@@ -183,6 +196,10 @@
+@@ -157,6 +172,10 @@
+ ')
+ 
+ optional_policy(`
++	fail2ban_stream_connect(logrotate_t)
++')
++
++optional_policy(`
+ 	hostname_exec(logrotate_t)
+ ')
+ 
+@@ -183,6 +202,10 @@
  ')
  
  optional_policy(`
@@ -2401,11 +2421,31 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.if serefpolicy-3.6.32/policy/modules/apps/firewallgui.if
 --- nsaserefpolicy/policy/modules/apps/firewallgui.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/firewallgui.if	2009-12-03 13:45:10.000000000 -0500
-@@ -0,0 +1,3 @@
++++ serefpolicy-3.6.32/policy/modules/apps/firewallgui.if	2009-12-06 10:19:32.000000000 -0500
+@@ -0,0 +1,23 @@
 +
 +## <summary>policy for firewallgui</summary>
 +
++########################################
++## <summary>
++##	Send and receive messages from
++##	firewallgui over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`firewallgui_dbus_chat',`
++	gen_require(`
++		type firewallgui_t;
++		class dbus send_msg;
++	')
++
++	allow $1 firewallgui_t:dbus send_msg;
++	allow firewallgui_t $1:dbus send_msg;
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.te serefpolicy-3.6.32/policy/modules/apps/firewallgui.te
 --- nsaserefpolicy/policy/modules/apps/firewallgui.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/apps/firewallgui.te	2009-12-03 13:45:10.000000000 -0500
@@ -4443,8 +4483,16 @@ diff -b -B --ignore-all-space --exclude-
 +application_domain(openoffice_t, openoffice_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.6.32/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/podsleuth.te	2009-12-03 13:45:10.000000000 -0500
-@@ -66,11 +66,14 @@
++++ serefpolicy-3.6.32/policy/modules/apps/podsleuth.te	2009-12-06 06:05:01.000000000 -0500
+@@ -50,6 +50,7 @@
+ fs_tmpfs_filetrans(podsleuth_t, podsleuth_tmpfs_t, { dir file lnk_file })
+ 
+ kernel_read_system_state(podsleuth_t)
++kernel_request_load_module(podsleuth_t)
+ 
+ corecmd_exec_bin(podsleuth_t)
+ 
+@@ -66,11 +67,14 @@
  fs_search_dos(podsleuth_t)
  fs_getattr_tmpfs(podsleuth_t)
  fs_list_tmpfs(podsleuth_t)
@@ -6017,7 +6065,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-12-06 11:18:47.000000000 -0500
 @@ -1,4 +1,4 @@
 -
 +c
@@ -6082,7 +6130,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/gnucash/finance-quote-check -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/gnucash/finance-quote-helper -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hal/device-manager/hal-device-manager -- gen_context(system_u:object_r:bin_t,s0)
-@@ -221,6 +229,9 @@
+@@ -221,12 +229,16 @@
  /usr/share/PackageKit/pk-upgrade-distro\.sh -- 	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/PackageKit/helpers(/.*)?	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
@@ -6092,7 +6140,15 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/shorewall/configpath	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/shorewall-perl(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/share/shorewall-shell(/.*)?	gen_context(system_u:object_r:bin_t,s0)
-@@ -263,6 +274,7 @@
+ /usr/share/shorewall-lite(/.*)? 	gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/shorewall6-lite(/.*)?	gen_context(system_u:object_r:bin_t,s0)
+-/usr/share/turboprint/lib(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
++/usr/share/turboprint/lib(/.*)?		gen_context(system_u:object_r:bin_t,s0)
++/usr/share/vhostmd/scripts(/.*)?	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /usr/X11R6/lib(64)?/X11/xkb/xkbcomp --	gen_context(system_u:object_r:bin_t,s0)
+ 
+@@ -263,6 +275,7 @@
  /usr/share/ssl/misc(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/share/switchdesk/switchdesk-gui\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-date/system-config-date\.py -- gen_context(system_u:object_r:bin_t,s0)
@@ -6100,7 +6156,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/system-config-selinux/system-config-selinux\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-display/system-config-display -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-httpd/system-config-httpd -- gen_context(system_u:object_r:bin_t,s0)
-@@ -315,3 +327,21 @@
+@@ -315,3 +328,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -7218,7 +7274,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-03 13:48:14.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-05 18:26:09.000000000 -0500
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -8556,7 +8612,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/tty		-c	gen_context(system_u:object_r:devtty_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.6.32/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-12-05 06:22:07.000000000 -0500
 @@ -196,7 +196,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -8628,7 +8684,35 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Read and write the controlling
-@@ -991,10 +1029,12 @@
+@@ -774,7 +812,26 @@
+ 		attribute ptynode;
+ 	')
+ 
[...2000 lines suppressed...]
  
@@ -34186,7 +34832,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1686,11 +1887,11 @@
+@@ -1686,11 +1888,11 @@
  #
  interface(`userdom_dontaudit_read_user_home_content_files',`
  	gen_require(`
@@ -34201,7 +34847,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1797,19 +1998,32 @@
+@@ -1797,19 +1999,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -34241,7 +34887,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2058,7 @@
+@@ -1844,6 +2059,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -34249,7 +34895,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2196,7 +2411,7 @@
+@@ -2196,7 +2412,7 @@
  
  ########################################
  ## <summary>
@@ -34258,7 +34904,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	temporary files.
  ## </summary>
  ## <param name="domain">
-@@ -2205,30 +2420,49 @@
+@@ -2205,30 +2421,49 @@
  ##	</summary>
  ## </param>
  #
@@ -34314,7 +34960,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 user_tmp_t:dir list_dir_perms;
  	files_search_tmp($1)
  ')
-@@ -2276,6 +2510,46 @@
+@@ -2276,6 +2511,46 @@
  ########################################
  ## <summary>
  ##	Create, read, write, and delete user
@@ -34361,7 +35007,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	temporary symbolic links.
  ## </summary>
  ## <param name="domain">
-@@ -2391,7 +2665,7 @@
+@@ -2391,7 +2666,7 @@
  
  ########################################
  ## <summary>
@@ -34370,7 +35016,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2399,19 +2673,20 @@
+@@ -2399,19 +2674,20 @@
  ##	</summary>
  ## </param>
  #
@@ -34395,7 +35041,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2419,15 +2694,14 @@
+@@ -2419,15 +2695,14 @@
  ##	</summary>
  ## </param>
  #
@@ -34415,7 +35061,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2749,7 +3023,7 @@
+@@ -2749,7 +3024,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -34424,7 +35070,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +3039,33 @@
+@@ -2765,11 +3040,33 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -34460,7 +35106,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3193,43 @@
+@@ -2897,7 +3194,43 @@
  		type user_tmp_t;
  	')
  
@@ -34505,7 +35151,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3266,7 @@
+@@ -2934,6 +3267,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -34513,7 +35159,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3397,656 @@
+@@ -3064,3 +3398,656 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -35346,7 +35992,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-06 11:17:52.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -35542,7 +36188,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # internal communication is often done using fifo and unix sockets.
  allow xm_t self:fifo_file rw_fifo_file_perms;
-@@ -312,24 +360,28 @@
+@@ -312,24 +360,29 @@
  
  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)
@@ -35554,6 +36200,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xm_t xen_image_t:blk_file read_blk_file_perms;
  
 -kernel_read_system_state(xm_t)
++kernel_read_network_state(xm_t)
  kernel_read_kernel_sysctls(xm_t)
 +kernel_read_sysctl(xm_t)
 +kernel_read_system_state(xm_t)
@@ -35572,7 +36219,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_runtime_files(xm_t)
  files_read_usr_files(xm_t)
-@@ -339,15 +391,70 @@
+@@ -339,15 +392,74 @@
  
  storage_raw_read_fixed_disk(xm_t)
  
@@ -35596,6 +36243,10 @@ diff -b -B --ignore-all-space --exclude-
  xen_stream_connect_xenstore(xm_t)
 +
 +optional_policy(`
++    vhostmd_rw_tmpfs_files(xm_t)
++')
++
++optional_policy(`
 +	virt_manage_images(xm_t)
 +	virt_stream_connect(xm_t)
 +')
@@ -35646,7 +36297,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-05 06:20:50.000000000 -0500
 @@ -181,7 +181,7 @@
  #
  define(`getattr_dir_perms',`{ getattr }')
@@ -35683,7 +36334,16 @@ diff -b -B --ignore-all-space --exclude-
  define(`relabelfrom_lnk_file_perms',`{ getattr relabelfrom }')
  define(`relabelto_lnk_file_perms',`{ getattr relabelto }')
  define(`relabel_lnk_file_perms',`{ getattr relabelfrom relabelto }')
-@@ -312,3 +314,19 @@
+@@ -305,10 +307,27 @@
+ #
+ # Use (read and write) terminals
+ #
+-define(`rw_term_perms', `{ getattr open read write ioctl }')
++define(`rw_inherited_term_perms', `{ getattr open read write ioctl append }')
++define(`rw_term_perms', `{ open rw_inherited_term_perms }')
+ 
+ #
+ # Sockets
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
  define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.978
retrieving revision 1.979
diff -u -p -r1.978 -r1.979
--- selinux-policy.spec	3 Dec 2009 19:56:22 -0000	1.978
+++ selinux-policy.spec	7 Dec 2009 22:37:55 -0000	1.979
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 55%{?dist}
+Release: 56%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,27 @@ exit 0
 %endif
 
 %changelog
+* Mon Dec 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-56
+- Dontaudit exec of fusermount from xguest
+- Allow licrd to use mouse_device
+- Allow sysadm_t to connect to zebra stream socket
+- Dontaudit policykit_auth trying to config terminal
+- Allow logrotate and asterisk to execute asterisk
+- Allow logrotate to read var_lib files (zope) and connect to fail2ban stream
+- Allow firewallgui to communicate with unconfined_t
+- Allow podsleuth to ask the kernel to load modules
+- Fix labeling on vhostmd scripts
+- Remove transition from unconfined_t to windbind_helper_t
+- Allow abrt_helper to look at inotify
+- Fix labels for mythtv
+- Allow apache to signal sendmail
+- allow asterisk to send mail
+- Allow rpcd to get and setcap
+- Add tor_bind_all_unreserved_ports boolean
+- Add policy for vhostmd
+- MOre textrel_shlib_t files
+- Add rw_herited_term_perms 
+
 * Thu Dec 3 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-55
 - Add fprintd_chat(unconfined_t) to fix su timeout problem
 - Make xguest follow allow_execstack boolean



From kasal at fedoraproject.org  Mon Dec  7 22:38:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:38:38 +0000 (UTC)
Subject: rpms/perl-MooseX-Workers/devel perl-MooseX-Workers.spec,1.5,1.6
Message-ID: <20091207223838.0422311C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Workers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10693

Modified Files:
	perl-MooseX-Workers.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Workers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Workers/devel/perl-MooseX-Workers.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-Workers.spec	26 Jul 2009 11:33:35 -0000	1.5
+++ perl-MooseX-Workers.spec	7 Dec 2009 22:38:37 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Workers
 Version:        0.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Provides a simple sub-process management for asynchronous tasks
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Dec  7 22:42:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:42:45 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-URI/devel perl-MooseX-Types-URI.spec, 1.4,
	1.5
Message-ID: <20091207224245.0734711C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Types-URI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12669

Modified Files:
	perl-MooseX-Types-URI.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Types-URI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Types-URI/devel/perl-MooseX-Types-URI.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Types-URI.spec	26 Jul 2009 11:33:18 -0000	1.4
+++ perl-MooseX-Types-URI.spec	7 Dec 2009 22:42:44 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:       perl-MooseX-Types-URI
 Version:    0.02
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see lib/MooseX/Types/URI.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-3
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From steved at fedoraproject.org  Mon Dec  7 22:45:32 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  7 Dec 2009 22:45:32 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.1-mount-eperm.patch, NONE,
	1.1 nfs-utils.spec, 1.254, 1.255
Message-ID: <20091207224532.8098311C025D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13733

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.1-mount-eperm.patch 
Log Message:
- Updated to the latest pseudo root release (rel9) (bz 538609).
- mount.nfs: Retry v4 mounts with v3 on ENOENT errors


nfs-utils-1.2.1-mount-eperm.patch:
 stropts.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE nfs-utils-1.2.1-mount-eperm.patch ---
commit 26a14b65991b79d317638f78dc6b4e5ac1ef712e
Author: Neil Brown <neilb at suse.de>
Date:   Mon Dec 7 17:23:48 2009 -0500

    mount.nfs: Retry v4 mounts with v3 on ENOENT errors
    
    Retry v4 mounts with a v3 mount when the version
    is not explicitly specified and the mount fails
    with ENOENT. The will help deal with Linux servers
    that do not automatically export a pseudo root
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index a0b9e7f..4007150 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -668,9 +668,10 @@ static int nfs_try_mount(struct nfsmount_info *mi)
 				/* 
 				 * To deal with legacy Linux servers that don't
 				 * automatically export a pseudo root, retry
-				 * ENOENT errors using version 3
+				 * ENOENT errors using version 3. And for
+				 * Linux servers prior to 2.6.25, retry EPERM
 				 */
-				if (errno != ENOENT)
+				if (errno != ENOENT && errno != EPERM)
 					break;
 			}
 		}


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -p -r1.254 -r1.255
--- nfs-utils.spec	7 Dec 2009 13:22:33 -0000	1.254
+++ nfs-utils.spec	7 Dec 2009 22:45:32 -0000	1.255
@@ -24,6 +24,7 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
 
 Patch200: nfs-utils-1.2.0-v4root-rel9.patch
 Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
+Patch202: nfs-utils-1.2.1-mount-eperm.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -77,6 +78,7 @@ This package also contains the mount.nfs
 
 %patch200 -p1
 %patch201 -p1
+%patch202 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -249,7 +251,8 @@ fi
 
 %changelog
 * Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 1.2.1-4
-- Updated to the latest pseudo root release (rel9).
+- Updated to the latest pseudo root release (rel9) (bz 538609).
+- mount.nfs: Retry v4 mounts with v3 on ENOENT errors
 
 * Thu Nov 12 2009 Steve Dickson <steved at redhat.com> 1.2.1-3
 - Stop rpc.nfsd from failing to startup when the network



From kasal at fedoraproject.org  Mon Dec  7 22:47:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:47:04 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-Set-Object/devel
	perl-MooseX-Types-Set-Object.spec, 1.3, 1.4
Message-ID: <20091207224704.23F3B11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Types-Set-Object/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392

Modified Files:
	perl-MooseX-Types-Set-Object.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Types-Set-Object.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Types-Set-Object/devel/perl-MooseX-Types-Set-Object.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-Types-Set-Object.spec	26 Jul 2009 11:33:01 -0000	1.3
+++ perl-MooseX-Types-Set-Object.spec	7 Dec 2009 22:47:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Types-Set-Object
 Version:        0.02
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Set::Object type with coercions and stuff
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.02-4
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jeckersb at fedoraproject.org  Mon Dec  7 22:50:22 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon,  7 Dec 2009 22:50:22 +0000 (UTC)
Subject: rpms/cobbler/F-12 cobbler.spec,1.88,1.89 sources,1.75,1.76
Message-ID: <20091207225022.DF0B611C03B8@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/cobbler/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15735

Modified Files:
	cobbler.spec sources 
Log Message:
2.0.2-1 release


Index: cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/F-12/cobbler.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- cobbler.spec	23 Nov 2009 21:28:57 -0000	1.88
+++ cobbler.spec	7 Dec 2009 22:50:22 -0000	1.89
@@ -6,8 +6,8 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.1
-Release: 1%{?dist}
+Version: 2.0.2
+Release: 2%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
@@ -214,6 +214,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{python_sitelib}/cobbler/*.py*
 #%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/cobbler/sub_process.py*
+%endif
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
@@ -291,7 +294,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %package -n koan
 
 Summary: Helper tool that performs cobbler orders on remote machines.
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -329,6 +332,11 @@ of an existing system.  For use with a b
 %{_bindir}/cobbler-register
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/koan/sub_process.py*
+%exclude %{python_sitelib}/koan/opt_parse.py*
+%exclude %{python_sitelib}/koan/text_wrap.py*
+%endif
 %{_mandir}/man1/koan.1.gz
 %{_mandir}/man1/cobbler-register.1.gz
 %dir /var/log/koan
@@ -338,7 +346,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,12 +376,14 @@ Web interface for Cobbler that allows vi
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
 %config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
-%dir /usr/share/cobbler/web/sessions
+%dir /var/lib/cobbler/webui_sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
+* Mon Nov 23 2009 John Eckersberg <jeckersb at redhat.com> - 2.0.2-1
+- Upstream changes (see CHANGELOG)
 
 * Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
 - First release with unified spec files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/F-12/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	23 Nov 2009 21:28:57 -0000	1.75
+++ sources	7 Dec 2009 22:50:22 -0000	1.76
@@ -1,5 +1 @@
-0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
-524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
-2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
-5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz
-c07c857b1f91764d0ea78c2a5a184259  cobbler-2.0.1.tar.gz
+2ca78c5e89ccfc593ead43eaf1f580b6  cobbler-2.0.2.tar.gz



From steved at fedoraproject.org  Mon Dec  7 22:50:35 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  7 Dec 2009 22:50:35 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.255,1.256
Message-ID: <20091207225035.3059911C03B8@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15810

Modified Files:
	nfs-utils.spec 
Log Message:
mount.nfs: Retry v4 mounts with v3 on ENOENT errors



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- nfs-utils.spec	7 Dec 2009 22:45:32 -0000	1.255
+++ nfs-utils.spec	7 Dec 2009 22:50:35 -0000	1.256
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -250,9 +250,11 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 1.2.1-5
+- mount.nfs: Retry v4 mounts with v3 on ENOENT errors
+
 * Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 1.2.1-4
 - Updated to the latest pseudo root release (rel9) (bz 538609).
-- mount.nfs: Retry v4 mounts with v3 on ENOENT errors
 
 * Thu Nov 12 2009 Steve Dickson <steved at redhat.com> 1.2.1-3
 - Stop rpc.nfsd from failing to startup when the network



From jeckersb at fedoraproject.org  Mon Dec  7 22:50:57 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon,  7 Dec 2009 22:50:57 +0000 (UTC)
Subject: rpms/cobbler/F-11 cobbler.spec,1.84,1.85 sources,1.73,1.74
Message-ID: <20091207225057.84DFC11C025D@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/cobbler/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16040

Modified Files:
	cobbler.spec sources 
Log Message:
2.0.2-1 release


Index: cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/F-11/cobbler.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- cobbler.spec	2 Oct 2009 20:59:49 -0000	1.84
+++ cobbler.spec	7 Dec 2009 22:50:57 -0000	1.85
@@ -6,8 +6,8 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.1
-Release: 1%{?dist}
+Version: 2.0.2
+Release: 2%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
@@ -214,6 +214,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{python_sitelib}/cobbler/*.py*
 #%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/cobbler/sub_process.py*
+%endif
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
@@ -291,7 +294,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %package -n koan
 
 Summary: Helper tool that performs cobbler orders on remote machines.
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -329,6 +332,11 @@ of an existing system.  For use with a b
 %{_bindir}/cobbler-register
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/koan/sub_process.py*
+%exclude %{python_sitelib}/koan/opt_parse.py*
+%exclude %{python_sitelib}/koan/text_wrap.py*
+%endif
 %{_mandir}/man1/koan.1.gz
 %{_mandir}/man1/cobbler-register.1.gz
 %dir /var/log/koan
@@ -338,7 +346,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,12 +376,14 @@ Web interface for Cobbler that allows vi
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
 %config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
-%dir /usr/share/cobbler/web/sessions
+%dir /var/lib/cobbler/webui_sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
+* Mon Nov 23 2009 John Eckersberg <jeckersb at redhat.com> - 2.0.2-1
+- Upstream changes (see CHANGELOG)
 
 * Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
 - First release with unified spec files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/F-11/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	2 Oct 2009 20:59:49 -0000	1.73
+++ sources	7 Dec 2009 22:50:57 -0000	1.74
@@ -1,5 +1 @@
-0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
-524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
-2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
-5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz
-c07c857b1f91764d0ea78c2a5a184259  cobbler-2.0.1.tar.gz
+2ca78c5e89ccfc593ead43eaf1f580b6  cobbler-2.0.2.tar.gz



From kasal at fedoraproject.org  Mon Dec  7 22:51:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  7 Dec 2009 22:51:50 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-Path-Class/devel
	perl-MooseX-Types-Path-Class.spec, 1.4, 1.5
Message-ID: <20091207225150.518DE11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/pkgs/rpms/perl-MooseX-Types-Path-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16417

Modified Files:
	perl-MooseX-Types-Path-Class.spec 
Log Message:
- rebuild against perl 5.10.1


Index: perl-MooseX-Types-Path-Class.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Types-Path-Class/devel/perl-MooseX-Types-Path-Class.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Types-Path-Class.spec	26 Jul 2009 11:32:47 -0000	1.4
+++ perl-MooseX-Types-Path-Class.spec	7 Dec 2009 22:51:50 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Types-Path-Class 
 Version:    0.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 # see Makefile.PL, README, lib/MooseX/Types/Path/Class.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -80,6 +80,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-6
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From steved at fedoraproject.org  Mon Dec  7 22:56:49 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  7 Dec 2009 22:56:49 +0000 (UTC)
Subject: rpms/nfs-utils/F-12 nfs-utils-1.2.0-v4root-rel9.patch, NONE,
	1.1 nfs-utils-1.2.1-mount-eperm.patch, NONE, 1.1 nfs-utils.spec,
	1.251, 1.252 nfs-utils-1.2.0-proots-rel5.patch, 1.2,
	NONE nfs-utils-1.2.0-v4root-bz538609.patch, 1.1,
	NONE nfs-utils-1.2.0-v4root-rel6.patch, 1.1,
	NONE nfs-utils-1.2.0-v4root-rel8.patch, 1.1, NONE
Message-ID: <20091207225649.D2A7A11C025D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18476

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-v4root-rel9.patch 
	nfs-utils-1.2.1-mount-eperm.patch 
Removed Files:
	nfs-utils-1.2.0-proots-rel5.patch 
	nfs-utils-1.2.0-v4root-bz538609.patch 
	nfs-utils-1.2.0-v4root-rel6.patch 
	nfs-utils-1.2.0-v4root-rel8.patch 
Log Message:
- Updated to the latest pseudo root release (rel8).
- mount.nfs: Retry v4 mounts with v3 on ENOENT error


nfs-utils-1.2.0-v4root-rel9.patch:
 support/export/xtab.c           |    6 +
 support/include/nfs/export.h    |    3 
 support/include/pseudoflavors.h |    1 
 support/include/v4root.h        |   15 ++
 support/nfs/exports.c           |   24 +++-
 utils/mountd/Makefile.am        |    2 
 utils/mountd/auth.c             |    3 
 utils/mountd/mountd.c           |    4 
 utils/mountd/v4root.c           |  228 ++++++++++++++++++++++++++++++++++++++++
 9 files changed, 280 insertions(+), 6 deletions(-)

--- NEW FILE nfs-utils-1.2.0-v4root-rel9.patch ---
diff --git a/support/export/xtab.c b/support/export/xtab.c
index 3b1dcce..2a43193 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -19,7 +19,9 @@
 #include "exportfs.h"
 #include "xio.h"
 #include "xlog.h"
+#include "v4root.h"
 
+int v4root_needed;
 static void cond_rename(char *newfile, char *oldfile);
 
 static int
@@ -36,6 +38,8 @@ xtab_read(char *xtab, char *lockfn, int is_export)
 	if ((lockid = xflock(lockfn, "r")) < 0)
 		return 0;
 	setexportent(xtab, "r");
+	if (is_export == 1)
+		v4root_needed = 1;
 	while ((xp = getexportent(is_export==0, 0)) != NULL) {
 		if (!(exp = export_lookup(xp->e_hostname, xp->e_path, is_export != 1)) &&
 		    !(exp = export_create(xp, is_export!=1))) {
@@ -48,6 +52,8 @@ xtab_read(char *xtab, char *lockfn, int is_export)
 		case 1:
 			exp->m_xtabent = 1;
 			exp->m_mayexport = 1;
+			if ((xp->e_flags & NFSEXP_FSID) && xp->e_fsid == 0)
+				v4root_needed = 0;
 			break;
 		case 2:
 			exp->m_exported = -1;/* may be exported */
diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h
index f7a99ba..76953ac 100644
--- a/support/include/nfs/export.h
+++ b/support/include/nfs/export.h
@@ -24,6 +24,7 @@
 #define NFSEXP_FSID		0x2000
 #define	NFSEXP_CROSSMOUNT	0x4000
 #define NFSEXP_NOACL		0x8000 /* reserved for possible ACL related use */
-#define NFSEXP_ALLFLAGS		0xFFFF
+#define NFSEXP_V4ROOT       0x10000
+#define NFSEXP_ALLFLAGS		0x1FFFF
 
 #endif /* _NSF_EXPORT_H */
diff --git a/support/include/pseudoflavors.h b/support/include/pseudoflavors.h
index c21087b..c7ba8a2 100644
--- a/support/include/pseudoflavors.h
+++ b/support/include/pseudoflavors.h
@@ -15,3 +15,4 @@ struct flav_info {
 
 extern struct flav_info flav_map[];
 extern const int flav_map_size;
+extern unsigned int flavors_setall(struct exportent *ep);
diff --git a/support/include/v4root.h b/support/include/v4root.h
new file mode 100644
index 0000000..706c15c
--- /dev/null
+++ b/support/include/v4root.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2009 Red Hat <nfs at redhat.com>
+ * support/include/v4root.h
+ *
+ * Support routines for dynamic pseudo roots.
+ *
+ */
+
+#ifndef V4ROOT_H
+#define V4ROOT_H
+
+extern int v4root_needed;
+extern void v4root_set(void);
+
+#endif /* V4ROOT_H */
diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 1aaebf4..fe9ed3a 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -39,16 +39,18 @@ struct flav_info flav_map[] = {
 	{ "krb5",	RPC_AUTH_GSS_KRB5	},
 	{ "krb5i",	RPC_AUTH_GSS_KRB5I	},
 	{ "krb5p",	RPC_AUTH_GSS_KRB5P	},
+	{ "unix",	AUTH_UNIX		},
+	{ "sys",	AUTH_SYS		},
+	{ "null",	AUTH_NULL		},
+	{ "none",	AUTH_NONE		},
+#ifdef NOLONGERSUPPORTED
 	{ "lipkey",	RPC_AUTH_GSS_LKEY	},
 	{ "lipkey-i",	RPC_AUTH_GSS_LKEYI	},
 	{ "lipkey-p",	RPC_AUTH_GSS_LKEYP	},
 	{ "spkm3",	RPC_AUTH_GSS_SPKM	},
 	{ "spkm3i",	RPC_AUTH_GSS_SPKMI	},
 	{ "spkm3p",	RPC_AUTH_GSS_SPKMP	},
-	{ "unix",	AUTH_UNIX		},
-	{ "sys",	AUTH_SYS		},
-	{ "null",	AUTH_NULL		},
-	{ "none",	AUTH_NONE		},
+#endif
 };
 
 const int flav_map_size = sizeof(flav_map)/sizeof(flav_map[0]);
@@ -436,6 +438,20 @@ static unsigned int parse_flavors(char *str, struct exportent *ep)
 	}
 	return out;
 }
+unsigned int flavors_setall(struct exportent *ep)
+{
+	struct flav_info *flav;
+	unsigned int out=0;
+	int bit;
+
+	for (flav = flav_map; flav < flav_map + flav_map_size; flav++) {
+		bit = secinfo_addflavor(flav, ep);
+		if (bit < 0)
+			return 0;
+		out |= 1<<bit;
+	}
+	return out;
+}
 
 /* Sets the bits in @mask for the appropriate security flavor flags. */
 static void setflags(int mask, unsigned int active, struct exportent *ep)
diff --git a/utils/mountd/Makefile.am b/utils/mountd/Makefile.am
index 1e76cf8..eba81fc 100644
--- a/utils/mountd/Makefile.am
+++ b/utils/mountd/Makefile.am
@@ -8,7 +8,7 @@ KPREFIX		= @kprefix@
 sbin_PROGRAMS	= mountd
 
 mountd_SOURCES = mountd.c mount_dispatch.c auth.c rmtab.c cache.c \
-		 svc_run.c fsloc.c mountd.h
+		 svc_run.c fsloc.c v4root.c mountd.h
 mountd_LDADD = ../../support/export/libexport.a \
 	       ../../support/nfs/libnfs.a \
 	       ../../support/misc/libmisc.a \
diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 5a7ff8c..2ed80bc 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -20,6 +20,7 @@
 #include "exportfs.h"
 #include "mountd.h"
 #include "xmalloc.h"
+#include "v4root.h"
 
 enum auth_error
 {
@@ -102,6 +103,8 @@ auth_reload()
 	memset(&my_client, 0, sizeof(my_client));
 	xtab_export_read();
 	check_useipaddr();
+	v4root_set();
+
 	++counter;
 
 	return counter;
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 888fd8c..179ef17 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -540,6 +540,10 @@ get_exportlist(void)
 
 	for (i = 0; i < MCL_MAXTYPES; i++) {
 		for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
+			 /* Don't show pseudo exports */
+			if (exp->m_export.e_flags & NFSEXP_V4ROOT)
+				continue;
+
 			for (e = elist; e != NULL; e = e->ex_next) {
 				if (!strcmp(exp->m_export.e_path, e->ex_dir))
 					break;
diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
new file mode 100644
index 0000000..817dfb4
--- /dev/null
+++ b/utils/mountd/v4root.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2009 Red Hat <nfs at redhat.com>
+ *
+ * support/export/v4root.c
+ *
+ * Routines used to support NFSv4 pseudo roots
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/queue.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <unistd.h>
+#include <errno.h>
+
+#include "xlog.h"
+#include "exportfs.h"
+#include "nfslib.h"
+#include "misc.h"
+#include "pseudoflavors.h"
+#include "v4root.h"
+
+#ifndef _PATH_PSEUDO_ROOT
+#define _PATH_PSEUDO_ROOT		"/"
+#endif
+
+#ifndef _PSEUDO_ROOT_FSID
+#define _PSEUDO_ROOT_FSID	0
+#endif
+
+void v4root_set(void);
+void v4root_unset(void);
+static int v4root_support(void);
+
+static struct exportent *v4root_create(char *, nfs_export *);
+
+int v4root_needed;
+static nfs_export pseudo_root = {
+	.m_next = NULL,
+	.m_client = NULL,
+	.m_export = {
+		.e_hostname = "*",
+		.e_path = _PATH_PSEUDO_ROOT,
+		.e_flags = NFSEXP_READONLY | NFSEXP_ROOTSQUASH
+				| NFSEXP_NOSUBTREECHECK | NFSEXP_FSID
+				| NFSEXP_CROSSMOUNT | NFSEXP_V4ROOT,
+		.e_anonuid = 65534,
+		.e_anongid = 65534,
+		.e_squids = NULL,
+		.e_nsquids = 0,
+		.e_sqgids = NULL,
+		.e_nsqgids = 0,
+		.e_fsid = 0,
+		.e_mountpoint = NULL,
+		.e_secinfo[0].flav = NULL,
+	},
+	.m_exported = 0,
+	.m_xtabent = 1,
+	.m_mayexport = 1,
+	.m_changed = 0,
+	.m_warned = 0,
+};
+
+/*
+ * Create a pseudo export
+ */
+static struct exportent *
+v4root_create(char *path, nfs_export *export)
+{
+	nfs_export *exp;
+	struct exportent eep;
+	struct exportent *curexp = &export->m_export;
+
+	dupexportent(&eep, curexp);
+	eep.e_hostname = strdup(curexp->e_hostname);
+	strncpy(eep.e_path, path, sizeof(eep.e_path));
+	exp = export_create(&eep, 0);
+	if (exp == NULL)
+		return NULL;
+
+	exp->m_export.e_flags |= NFSEXP_V4ROOT;
+	if (strcmp(path, _PATH_PSEUDO_ROOT) != 0)
+		exp->m_export.e_flags &= ~NFSEXP_FSID;
+
+	xlog(D_CALL, "v4root_create: path '%s'", exp->m_export.e_path);
+
+	return &exp->m_export;
+}
+
+/*
+ * Make sure the kernel has pseudo root support.
+ */
+static int
+v4root_support()
+{
+	static int kernel_support = -1;
+	char *ptr, version[64];
+	int major, minor;
+	FILE *fp;
+
+	if (kernel_support != -1)
+		return kernel_support;
+
+	kernel_support = 0;
+	fp = fopen("/proc/fs/nfsd/exports", "r");
+	if (fp == NULL)
+		goto out;
+
+	ptr = fgets(version, 64, fp);
+	fclose(fp);
+	if (ptr == NULL)
+		goto out;
+
+	while(*ptr && isdigit(*ptr) == 0)
+		ptr++;
+	if (*ptr == '\0')
+		goto out;
+
+	major = minor = 0;
+	sscanf(ptr, " %d.%d",&major, &minor);
+	if (major >= 1 && minor >= 2)
+		kernel_support = 1;
+out:
+	if (!kernel_support) {
+		xlog(L_WARNING, "Kernel does not have pseudo root support.");
+		xlog(L_WARNING, "NFS v4 mounts will be disabled unless fsid=0");
+		xlog(L_WARNING, "is specfied in /etc/exports file.");
+	}
+
+	return kernel_support;
+}
+
+/*
+ * Create pseudo exports by running through the real export 
+ * looking at the components of the path that make up the export. 
+ * Those path components, if not exported, will become pseudo 
+ * exports allowing them to be found when the kernel does an upcall 
+ * looking for components of the v4 mount.
+ */
+void
+v4root_set()
+{
+	nfs_export	*exp, *nxt;
+	struct exportent *proot;
+	int	i, insecure = 0, secflavors = 0;
+	char *path, *ptr;
+	char *hostname;
+
+	if (!v4root_needed)
+		return;
+
+	if (!v4root_support())
+		return;
+
+	proot = v4root_create(_PATH_PSEUDO_ROOT, &pseudo_root);
+	if (proot == NULL) {
+		xlog(L_WARNING, "v4root_set: Unable to create "
+			"pseudo export for '%s'", _PATH_PSEUDO_ROOT);
+		return;
+	}
+
+	for (i = 0; i < MCL_MAXTYPES; i++) {
+		for (exp = exportlist[i].p_head; exp; exp = nxt) {
+			nxt = exp->m_next;
+			hostname = exp->m_export.e_hostname;
+
+			path = strdup(exp->m_export.e_path);
+			ptr = path + 1;
+			while ((ptr = strchr(ptr, '/')) != NULL) {
+				*ptr = '\0';
+				if (export_lookup(hostname, path, 0) == NULL)
+					if (v4root_create(path, exp) == NULL) {
+						xlog(L_WARNING, "v4root_set: Unable to create "
+							"pseudo export for '%s'", path);
+						break;
+					}
+				*ptr = '/';
+				ptr++;
+			}
+			/* Make note of insecure exports */
+			if (!insecure)
+				insecure = (exp->m_export.e_flags & NFSEXP_INSECURE_PORT);
+
+			/* Make note of security flavors being set */
+			if (!secflavors)
+				secflavors = (exp->m_export.e_secinfo[0].flav != NULL);
+
+			free(path);
+		}
+	}
+
+	if (insecure && secflavors) {
+		xlog(L_WARNING, "WARNING: The 'sec=' and 'insecure' export options "
+			"are incompatible, causing the security flavors set by "
+			"'sec=' to be ignored on V4 exports");
+	}
+
+	/*
+	 * If there are any insecure exports, the pseudo root
+	 * also has to be insecure
+	 */
+	if (insecure) {
+		proot->e_flags |= NFSEXP_INSECURE_PORT;
+	}
+
+	/*
+	 * Make sure the pseudo root is accessible from all
+	 * security flavors unless the insecure port is set,
+	 * which cause the kernel to silently fail v4 mounts 
+	 * with security flavors set.
+	 */
+	if (secflavors && !insecure) {
+		if (!flavors_setall(proot)) {
+			xlog(L_WARNING, "v4root_set: Unable to set security "
+				"flavors on pseudo root");
+		}
+	}
+}
+
+

nfs-utils-1.2.1-mount-eperm.patch:
 stropts.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE nfs-utils-1.2.1-mount-eperm.patch ---
commit 26a14b65991b79d317638f78dc6b4e5ac1ef712e
Author: Neil Brown <neilb at suse.de>
Date:   Mon Dec 7 17:23:48 2009 -0500

    mount.nfs: Retry v4 mounts with v3 on ENOENT errors
    
    Retry v4 mounts with a v3 mount when the version
    is not explicitly specified and the mount fails
    with ENOENT. The will help deal with Linux servers
    that do not automatically export a pseudo root
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index a0b9e7f..4007150 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -668,9 +668,10 @@ static int nfs_try_mount(struct nfsmount_info *mi)
 				/* 
 				 * To deal with legacy Linux servers that don't
 				 * automatically export a pseudo root, retry
-				 * ENOENT errors using version 3
+				 * ENOENT errors using version 3. And for
+				 * Linux servers prior to 2.6.25, retry EPERM
 				 */
-				if (errno != ENOENT)
+				if (errno != ENOENT && errno != EPERM)
 					break;
 			}
 		}


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- nfs-utils.spec	20 Nov 2009 14:02:51 -0000	1.251
+++ nfs-utils.spec	7 Dec 2009 22:56:49 -0000	1.252
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -25,8 +25,8 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
 Patch200: nfs-utils-1.2.0-mount-default.patch
 Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
 
-Patch300: nfs-utils-1.2.0-v4root-rel8.patch
-Patch301: nfs-utils-1.2.0-v4root-bz538609.patch
+Patch300: nfs-utils-1.2.0-v4root-rel9.patch
+Patch301: nfs-utils-1.2.1-mount-eperm.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -82,7 +82,6 @@ This package also contains the mount.nfs
 %patch201 -p1
 
 %patch300 -p1
-%patch301 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -254,6 +253,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 1.2.1-3
+- Updated to the latest pseudo root release (rel8).
+- mount.nfs: Retry v4 mounts with v3 on ENOENT error
+
 * Fri Nov 20 2009 Steve Dickson <steved at redhat.com> 1.2.1-2
 - Fixed a bug in v4root code that was causing ESTALE mounts
   (bz 538609)


--- nfs-utils-1.2.0-proots-rel5.patch DELETED ---


--- nfs-utils-1.2.0-v4root-bz538609.patch DELETED ---


--- nfs-utils-1.2.0-v4root-rel6.patch DELETED ---


--- nfs-utils-1.2.0-v4root-rel8.patch DELETED ---



From lkundrak at fedoraproject.org  Mon Dec  7 22:58:25 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 22:58:25 +0000 (UTC)
Subject: File synfigstudio-0.62.00.tar.gz uploaded to lookaside cache by
	lkundrak
Message-ID: <20091207225825.0523310F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for synfigstudio:

a072c422ffff495b1005aadcd37de4a0  synfigstudio-0.62.00.tar.gz



From lkundrak at fedoraproject.org  Mon Dec  7 23:00:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 23:00:00 +0000 (UTC)
Subject: rpms/synfigstudio/devel synfigstudio.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207230000.128B211C025D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19991

Modified Files:
	.cvsignore sources 
Added Files:
	synfigstudio.spec 
Log Message:
Initial import of synfigstudio


--- NEW FILE synfigstudio.spec ---
Name:           synfigstudio
Version:        0.62.00
Release:        1%{?dist}
Summary:        Vector-based 2D animation studio

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://synfig.org/
Source0:        http://download.sourceforge.net/synfig/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  synfig-devel
BuildRequires:  ETL-devel >= 0.04.13
BuildRequires:  gtkmm24-devel

%description
Synfig Animation Studio is a powerful, industrial-strength vector-based
2D animation software, designed from the ground-up for producing
feature-film quality animation with fewer people and resources.
It is designed to be capable of producing feature-film quality
animation. It eliminates the need for tweening, preventing the
need to hand-draw each frame. Synfig features spatial and temporal
resolution independence (sharp and smoothat any resolution or framerate),
high dynamic range images, and a flexible plugin system.

This package contains the GUI-based animation studio.


%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


%build
%configure
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/synfigstudio.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 || :
update-desktop-database &> /dev/null || :


%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/mime-info/synfigstudio.*
%{_datadir}/pixmaps/*.png
%{_datadir}/pixmaps/synfigstudio
%doc AUTHORS COPYING README


%files devel
%defattr(-,root,root,-)
%{_includedir}/synfigapp-0.0
%{_libdir}/*.so
%exclude %{_libdir}/*.la
%doc COPYING TODO


%changelog
* Tue Nov 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
- Initial packaging attempt

* Fri Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.61.09-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Nov 2009 17:43:51 -0000	1.1
+++ .cvsignore	7 Dec 2009 22:59:59 -0000	1.2
@@ -0,0 +1 @@
+synfigstudio-0.62.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Nov 2009 17:43:51 -0000	1.1
+++ sources	7 Dec 2009 22:59:59 -0000	1.2
@@ -0,0 +1 @@
+a072c422ffff495b1005aadcd37de4a0  synfigstudio-0.62.00.tar.gz



From jeckersb at fedoraproject.org  Mon Dec  7 23:00:04 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon,  7 Dec 2009 23:00:04 +0000 (UTC)
Subject: rpms/cobbler/EL-5 cobbler.spec,1.76,1.77 sources,1.76,1.77
Message-ID: <20091207230004.9788811C03DB@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20056

Modified Files:
	cobbler.spec sources 
Log Message:
2.0.2-2 release


Index: cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- cobbler.spec	2 Oct 2009 20:59:48 -0000	1.76
+++ cobbler.spec	7 Dec 2009 23:00:04 -0000	1.77
@@ -6,8 +6,8 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.1
-Release: 1%{?dist}
+Version: 2.0.2
+Release: 2%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
@@ -214,6 +214,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{python_sitelib}/cobbler/*.py*
 #%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/cobbler/sub_process.py*
+%endif
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
@@ -291,7 +294,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %package -n koan
 
 Summary: Helper tool that performs cobbler orders on remote machines.
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -329,6 +332,11 @@ of an existing system.  For use with a b
 %{_bindir}/cobbler-register
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/koan/sub_process.py*
+%exclude %{python_sitelib}/koan/opt_parse.py*
+%exclude %{python_sitelib}/koan/text_wrap.py*
+%endif
 %{_mandir}/man1/koan.1.gz
 %{_mandir}/man1/cobbler-register.1.gz
 %dir /var/log/koan
@@ -338,7 +346,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,12 +376,14 @@ Web interface for Cobbler that allows vi
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
 %config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
-%dir /usr/share/cobbler/web/sessions
+%dir /var/lib/cobbler/webui_sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
+* Mon Nov 23 2009 John Eckersberg <jeckersb at redhat.com> - 2.0.2-2
+- Upstream changes (see CHANGELOG)
 
 * Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
 - First release with unified spec files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/EL-5/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	2 Oct 2009 20:59:48 -0000	1.76
+++ sources	7 Dec 2009 23:00:04 -0000	1.77
@@ -1,5 +1 @@
-0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
-524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
-2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
-5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz
-c07c857b1f91764d0ea78c2a5a184259  cobbler-2.0.1.tar.gz
+2ca78c5e89ccfc593ead43eaf1f580b6  cobbler-2.0.2.tar.gz



From jeckersb at fedoraproject.org  Mon Dec  7 23:01:13 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon,  7 Dec 2009 23:01:13 +0000 (UTC)
Subject: rpms/cobbler/EL-4 cobbler.spec,1.74,1.75 sources,1.73,1.74
Message-ID: <20091207230113.DE5F311C025D@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20657

Modified Files:
	cobbler.spec sources 
Log Message:
2.0.2-2 release


Index: cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- cobbler.spec	2 Oct 2009 20:59:48 -0000	1.74
+++ cobbler.spec	7 Dec 2009 23:01:13 -0000	1.75
@@ -6,8 +6,8 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.1
-Release: 1%{?dist}
+Version: 2.0.2
+Release: 2%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
@@ -214,6 +214,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{python_sitelib}/cobbler/*.py*
 #%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/cobbler/sub_process.py*
+%endif
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
@@ -291,7 +294,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %package -n koan
 
 Summary: Helper tool that performs cobbler orders on remote machines.
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -329,6 +332,11 @@ of an existing system.  For use with a b
 %{_bindir}/cobbler-register
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/koan/sub_process.py*
+%exclude %{python_sitelib}/koan/opt_parse.py*
+%exclude %{python_sitelib}/koan/text_wrap.py*
+%endif
 %{_mandir}/man1/koan.1.gz
 %{_mandir}/man1/cobbler-register.1.gz
 %dir /var/log/koan
@@ -338,7 +346,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,12 +376,14 @@ Web interface for Cobbler that allows vi
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
 %config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
-%dir /usr/share/cobbler/web/sessions
+%dir /var/lib/cobbler/webui_sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
+* Mon Nov 23 2009 John Eckersberg <jeckersb at redhat.com> - 2.0.2-2
+- Upstream changes (see CHANGELOG)
 
 * Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
 - First release with unified spec files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/EL-4/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	2 Oct 2009 20:59:48 -0000	1.73
+++ sources	7 Dec 2009 23:01:13 -0000	1.74
@@ -1,5 +1 @@
-0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
-524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
-2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
-5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz
-c07c857b1f91764d0ea78c2a5a184259  cobbler-2.0.1.tar.gz
+2ca78c5e89ccfc593ead43eaf1f580b6  cobbler-2.0.2.tar.gz



From lkundrak at fedoraproject.org  Mon Dec  7 23:02:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 23:02:41 +0000 (UTC)
Subject: rpms/synfigstudio/F-11 synfigstudio.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207230241.E5AB811C025D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21354/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	synfigstudio.spec 
Log Message:
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build against older ETL



--- NEW FILE synfigstudio.spec ---
Name:           synfigstudio
Version:        0.62.00
Release:        1%{?dist}.1
Summary:        Vector-based 2D animation studio

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://synfig.org/
Source0:        http://download.sourceforge.net/synfig/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  synfig-devel
BuildRequires:  ETL-devel
BuildRequires:  gtkmm24-devel

%description
Synfig Animation Studio is a powerful, industrial-strength vector-based
2D animation software, designed from the ground-up for producing
feature-film quality animation with fewer people and resources.
It is designed to be capable of producing feature-film quality
animation. It eliminates the need for tweening, preventing the
need to hand-draw each frame. Synfig features spatial and temporal
resolution independence (sharp and smoothat any resolution or framerate),
high dynamic range images, and a flexible plugin system.

This package contains the GUI-based animation studio.


%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


%build
sed 's/0.04.13/0.04.12/g' -i configure
%configure
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/synfigstudio.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 || :
update-desktop-database &> /dev/null || :


%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/mime-info/synfigstudio.*
%{_datadir}/pixmaps/*.png
%{_datadir}/pixmaps/synfigstudio
%doc AUTHORS COPYING README


%files devel
%defattr(-,root,root,-)
%{_includedir}/synfigapp-0.0
%{_libdir}/*.so
%exclude %{_libdir}/*.la
%doc COPYING TODO


%changelog
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build against older ETL

* Tue Nov 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
- Initial packaging attempt

* Fri Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.61.09-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Nov 2009 17:43:51 -0000	1.1
+++ .cvsignore	7 Dec 2009 23:02:41 -0000	1.2
@@ -0,0 +1 @@
+synfigstudio-0.62.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Nov 2009 17:43:51 -0000	1.1
+++ sources	7 Dec 2009 23:02:41 -0000	1.2
@@ -0,0 +1 @@
+a072c422ffff495b1005aadcd37de4a0  synfigstudio-0.62.00.tar.gz



From lkundrak at fedoraproject.org  Mon Dec  7 23:02:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 23:02:41 +0000 (UTC)
Subject: rpms/synfigstudio/EL-5 synfigstudio.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207230241.9CF3211C025D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21354/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	synfigstudio.spec 
Log Message:
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build against older ETL



--- NEW FILE synfigstudio.spec ---
Name:           synfigstudio
Version:        0.62.00
Release:        1%{?dist}.1
Summary:        Vector-based 2D animation studio

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://synfig.org/
Source0:        http://download.sourceforge.net/synfig/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  synfig-devel
BuildRequires:  ETL-devel
BuildRequires:  gtkmm24-devel

%description
Synfig Animation Studio is a powerful, industrial-strength vector-based
2D animation software, designed from the ground-up for producing
feature-film quality animation with fewer people and resources.
It is designed to be capable of producing feature-film quality
animation. It eliminates the need for tweening, preventing the
need to hand-draw each frame. Synfig features spatial and temporal
resolution independence (sharp and smoothat any resolution or framerate),
high dynamic range images, and a flexible plugin system.

This package contains the GUI-based animation studio.


%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


%build
sed 's/0.04.13/0.04.12/g' -i configure
%configure
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/synfigstudio.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 || :
update-desktop-database &> /dev/null || :


%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/mime-info/synfigstudio.*
%{_datadir}/pixmaps/*.png
%{_datadir}/pixmaps/synfigstudio
%doc AUTHORS COPYING README


%files devel
%defattr(-,root,root,-)
%{_includedir}/synfigapp-0.0
%{_libdir}/*.so
%exclude %{_libdir}/*.la
%doc COPYING TODO


%changelog
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build against older ETL

* Tue Nov 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
- Initial packaging attempt

* Fri Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.61.09-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Nov 2009 17:43:51 -0000	1.1
+++ .cvsignore	7 Dec 2009 23:02:41 -0000	1.2
@@ -0,0 +1 @@
+synfigstudio-0.62.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Nov 2009 17:43:51 -0000	1.1
+++ sources	7 Dec 2009 23:02:41 -0000	1.2
@@ -0,0 +1 @@
+a072c422ffff495b1005aadcd37de4a0  synfigstudio-0.62.00.tar.gz



From lkundrak at fedoraproject.org  Mon Dec  7 23:02:42 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  7 Dec 2009 23:02:42 +0000 (UTC)
Subject: rpms/synfigstudio/F-12 synfigstudio.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091207230242.3167811C025D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21354/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	synfigstudio.spec 
Log Message:
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build against older ETL



--- NEW FILE synfigstudio.spec ---
Name:           synfigstudio
Version:        0.62.00
Release:        1%{?dist}.1
Summary:        Vector-based 2D animation studio

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://synfig.org/
Source0:        http://download.sourceforge.net/synfig/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  synfig-devel
BuildRequires:  ETL-devel
BuildRequires:  gtkmm24-devel

%description
Synfig Animation Studio is a powerful, industrial-strength vector-based
2D animation software, designed from the ground-up for producing
feature-film quality animation with fewer people and resources.
It is designed to be capable of producing feature-film quality
animation. It eliminates the need for tweening, preventing the
need to hand-draw each frame. Synfig features spatial and temporal
resolution independence (sharp and smoothat any resolution or framerate),
high dynamic range images, and a flexible plugin system.

This package contains the GUI-based animation studio.


%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


%build
sed 's/0.04.13/0.04.12/g' -i configure
%configure
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/synfigstudio.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 || :
update-desktop-database &> /dev/null || :


%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/mime-info/synfigstudio.*
%{_datadir}/pixmaps/*.png
%{_datadir}/pixmaps/synfigstudio
%doc AUTHORS COPYING README


%files devel
%defattr(-,root,root,-)
%{_includedir}/synfigapp-0.0
%{_libdir}/*.so
%exclude %{_libdir}/*.la
%doc COPYING TODO


%changelog
* Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
- Build against older ETL

* Tue Nov 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
- Initial packaging attempt

* Fri Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.61.09-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Nov 2009 17:43:51 -0000	1.1
+++ .cvsignore	7 Dec 2009 23:02:41 -0000	1.2
@@ -0,0 +1 @@
+synfigstudio-0.62.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Nov 2009 17:43:51 -0000	1.1
+++ sources	7 Dec 2009 23:02:42 -0000	1.2
@@ -0,0 +1 @@
+a072c422ffff495b1005aadcd37de4a0  synfigstudio-0.62.00.tar.gz



From tmraz at fedoraproject.org  Mon Dec  7 23:07:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon,  7 Dec 2009 23:07:29 +0000 (UTC)
Subject: rpms/pam/F-11 pam.spec,1.198,1.199
Message-ID: <20091207230729.EB79811C025D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23438

Modified Files:
	pam.spec 
Log Message:
* Mon Dec  7 2009 Tomas Mraz <tmraz at redhat.com> 1.0.91-9
- apply the umask patch properly (#499816)



Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/F-11/pam.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- pam.spec	2 Nov 2009 12:17:27 -0000	1.198
+++ pam.spec	7 Dec 2009 23:07:29 -0000	1.199
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.0.91
-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+,
 License: BSD and GPLv2+
@@ -90,6 +90,7 @@ mv pam-redhat-%{pam_redhat_version}/* mo
 %patch2 -p1 -b .std-noclose
 %patch6 -p1 -b .xauth-context
 %patch7 -p1 -b .console-fixes
+%patch8 -p1 -b .umask
 
 libtoolize -f
 autoreconf
@@ -329,6 +330,9 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Mon Dec  7 2009 Tomas Mraz <tmraz at redhat.com> 1.0.91-9
+- apply the umask patch properly (#499816)
+
 * Mon Nov  2 2009 Tomas Mraz <tmraz at redhat.com> 1.0.91-8
 - pam_mkhomedir: fix umask parameter of the module (#499816)
 



From transif at fedoraproject.org  Mon Dec  7 23:08:45 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Dec 2009 23:08:45 +0000 (UTC)
Subject: comps/po ru.po,1.27,1.28
Message-ID: <20091207230845.70F6411C025D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23991/po

Modified Files:
	ru.po 
Log Message:
Sending translation for Russian


Index: ru.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ru.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ru.po	11 Sep 2009 02:32:39 -0000	1.27
+++ ru.po	7 Dec 2009 23:08:45 -0000	1.28
@@ -9,17 +9,15 @@
 # Leonid Kanter <leon at asplinux.ru>, 2004, 2006.
 # Dmitri Alenitchev <alenitchev at nm.ru>, 2005.
 # Andrew Martynov <andrewm at inventa.ru>, 2004, 2005, 2006.
-# Yulia Poyarkova <ypoyarko at redhat.com>, 2006.
-# Yulia Poyarkova <yulia.poyarkova at redhat.com>, 2008, 2009.
-# Anatoliy Guskov <anatoliy.guskov at gmail.com>, 2009.Yulia Poyarkova <yulia.poyarkova at redhat.com>, 2009.
-# Yulia Poyarkova <yulia.poyarkova at gmail.com>, 2009.
+# Yulia <ypoyarko at redhat.com>, 2006, 2008, 2009.
+# Anatoliy Guskov <anatoliy.guskov at gmail.com> 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-11 02:24+0000\n"
-"PO-Revision-Date: 2009-09-11 12:31+1000\n"
-"Last-Translator: Yulia Poyarkova <yulia.poyarkova at gmail.com>\n"
+"POT-Creation-Date: 2009-12-07 19:27+0000\n"
+"PO-Revision-Date: 2009-12-08 10:07+1100\n"
+"Last-Translator: Yulia <ypoyarko at redhat.com>\n"
 "Language-Team: Russian <fedora-trans-ru at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=KOI8-R\n"
@@ -165,163 +163,163 @@ msgid "Clustering Support"
 msgstr "????????? ?????????."
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "????????? ???????? ?????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "?????? DNS"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "????????? ???????? ?????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "??????????? ?????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "????????????????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "?????????? ??????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "???????? ??????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "????????? ?????? ? ????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "????????? ???????? ?????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "??????????? ?????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "??????????? ????????? ??? ????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "??????? ? ??????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "????????? ??????????? (UK) ?????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "????????? ????? ?????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "?????? FTP"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "????????? Fedora"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "????????? ????????????? ?????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "????????? ???????? ?????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "?????? ?? ???????? ??? ??????????? ?????? ?? ??????? ?????."
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -330,19 +328,19 @@ msgstr ""
 "????????? ???????? ?? ?????? ? ????? ? ???????."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "??????????? ????? GNOME"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "???????? ?????????? GNOME"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -351,172 +349,172 @@ msgstr ""
 "??????, ??????? ????, ????????? ??????????? ? ??????????? ???????? ??????."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "???? ? ???????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "????????? ????????? ?????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "??????????? ???????? ????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "???????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "????????? ????? ?????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "????????? ????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "????????? ?????????????? ?????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "?????????? ??? ?????? ??? ?????????? ??????????? ?????????? GTK+ ? GNOME."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "?????????? ??? ?????? ??? ?????????? ??????????? ?????????? GTK+ ? XFCE."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "?????????? ??? ?????? ??? ?????????? ?????????? QT ? KDE."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "?????????? ??? ??????, ????? ???????? ??????????? ???????? ????? ??? "
 "???????????? ??????? ??? ?????? ??????."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "?????????? ??? ?????? ???????, ????? ???????? ??????????? ????????? "
 "???????????? (X)"
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "??????????????? ????????? ?????????? ?? ?????? Eclipse."
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "????????? ????? ?????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "????????? ????????? ?????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "?????????? ?? Java"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "??????????? ????? KDE"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "???????? ?????????? KDE"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -525,142 +523,142 @@ msgstr ""
 "??????? ????, ????????? ?????? ? ??????????? ???????? ??????."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "????????? ????????? ?????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "?????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????? ????????? ?????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "?????????? ??????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "?????????? ??????? ???????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "???????? ?????????? ?????????? ??????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "????????? ?????????? ??????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "????????? ???????????????? ?????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "?????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "????????? ????? ?????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "????????? ????? ??????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "???? ?????? MySQL"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "??????? ???????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "?????? ????????"
 
@@ -670,37 +668,37 @@ msgstr "????????? ??????-?????????? ????
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "????????? ????????? ????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "??????? ??????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "????? ?????? ?????? ? ?????????? ? ?????????? ????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -708,55 +706,55 @@ msgstr "??????, ??????????????? ????????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "????????? ????????? ?????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "????????? ?????????????? ?????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "???? ?????? PostgreSQL"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "????????? ????? ????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "????????? ???????? ?????"
 
@@ -772,73 +770,73 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "????????? ????????? ?????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "???????? ????????? ???????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "???????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "??????? ??????? ?????????, ?? ?????????? ?????? ??????-???? ???????? ?????."
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "????????? ????? ???????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "?????????? ????????? ?????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "?????????, ???????????? ??? ??????? ??????? ????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "????????? ????? ??????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -848,91 +846,91 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "???? ? ?????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "????????? ?????? ???????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "????????? ?????? ????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "????????? ?????????? ???????? ?? ????? ???????????????? Java."
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "????????? ??????? ????????, ?????????? ?? ????? ???????????????? Java."
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "????????? ????????? ?????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "????????? ????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "????????? ????? ??????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "????????? ???????? ????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????? ???????? ?????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "??? ?????? ???????? ? ???? ??????? ??????????: ????????? ??????, ????????? "
@@ -940,37 +938,37 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??? ?????? ???????? ?????????? ??????????? ??? ?????????? ??????????."
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "??? ?????? ????????? ????????? ???????? ?????? IMAP ??? SMTP."
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??? ?????? ????????? ????????????? ?????????? ??? X Window System."
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ?????? ????????? ????????????? ??? ?????????? ??? ??? ????????."
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? ?????? ???????? ? ???? ????? ??????? ???????, ??? DHCP, Kerberos ? NIS."
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -978,19 +976,19 @@ msgstr "??? ?????? ???????? ??????? ????
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "??? ?????? ???????????? ????????? ?????????????."
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? ?????? ???????????? ????????????? ? ??????????? ?????????."
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -1000,7 +998,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1010,19 +1008,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ???????? ????????? ???????????? ??????? ??? ???-??????"
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ???????? ????????? ???????????? ??????? ??? ?????? FTP."
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1032,13 +1030,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "??? ?????? ????????? ???????????? ??????? ??? ?????? ????????."
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "??? ?????? ???????? ? ???? ??? ???????? ????????????????? ???????, "
@@ -1046,7 +1044,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1056,13 +1054,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ?????? ???????? ??????????? ??????? ??????????? ?????, ??? ? ????."
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1072,13 +1070,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??? ?????? ???????? ?????????? ??????????? ??? ?????? ? ???????? ? ?????????."
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1089,7 +1087,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1100,13 +1098,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ?????? ???????? ????? ?????? ? ???????? ??? ????????? ???????????."
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
 "??? ?????? ???????? ????? ???????????? ??? ????????? ?????? ?????? ? "
@@ -1114,7 +1112,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1124,13 +1122,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????? ? ???? ?????? ???????? ??? ?????????? ? ????????? DNS (BIND)."
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1140,163 +1138,163 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "??? ?????? ???????? ??????, ???????? ??? ????????????? ? MySQL."
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??? ?????? ???????? ??????, ???????? ??? ????????????? ? Postgresql."
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "??????????? ? ???????, ??????????? ?????????? Fedora"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "????????? ????? ??????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "????????? ????? ??????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "????????? ????????? ?????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "????????? ????? ????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "????????? ???????? ?????????? ???????"
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "????????? ??????? ???????????? ? ???????? ????????? ?????."
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "?????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "??? ????????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "???-??????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "??????? ?????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "???????? ?????? ??? Windows"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "?????????? ?? ??? X"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "??????? X Window"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "?????????? ?? ??? XFCE"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "????????? ????? ????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "????????? ????? ????"
 
@@ -1310,67 +1308,67 @@ msgid "Haskell Development"
 msgstr "?????????? Haskell"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "?????? ?????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "?????? ??? ????? ?????? ?? ????????? ??????."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "????????? ????? ???????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "????????? ????? ???????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "????????? ????? ????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "???????????????? Perl"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "????????? ????? ??????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "????????? ?????????? ???????? ?? ????? ???????????????? Haskell."
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "????????? ?????????? ???????? ?? ????? ???????????????? Perl."
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "????????? ?????????? ?????"
 
@@ -1386,115 +1384,117 @@ msgstr "????????? ???????????????? ?????
 msgid "Chichewa Support"
 msgstr "????????? ????? ??????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "????????? ???????? ?????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "??????????? ?????????? ? ????????? ??? ????????? ????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "??????????? ???????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "????????? ????? ?????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "?????? ??????? ? ?? ??????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "????????? ????????? ?????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "????????? ??????????? ?????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "????????? ????? ??????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "????????? ????? ???????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "????????? ????? ???????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "????????? ?????????? ?????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "????????? ??????????????? ?????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "????????? ?????????????? ?????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "????????? ???????? ?????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "?????-?????????? MinGW"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "??????-??????? ? ????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "????????? ????? ????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "????????? ??????????? ?????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "??????????? ????????? Sugar"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1503,7 +1503,7 @@ msgstr ""
 "???????????? ? ?????? ???????????? c ??????? Fedora."
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1512,17 +1512,17 @@ msgstr ""
 "CAML ? ?????????."
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "????????? ????? ???????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "????????? ????? ?????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1531,12 +1531,12 @@ msgstr ""
 "??????????? ? ???????? ???????."
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "????????? ???????????? ?????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "????????? ????????? ?????"
 
@@ -1564,23 +1564,23 @@ msgstr "????? ? ???????????"
 msgid "Books and Guides for Fedora users and developers"
 msgstr "????? ? ??????????? ??? ????????????? ? ????????????? Fedora"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "Critical Path (??????)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "Critical Path (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "?????? ?????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
@@ -1589,29 +1589,37 @@ msgstr ""
 "?????????? ???????? ??? ??????????? ? ?????? ????????????? ????????????: "
 "?????????, ????????? ????????? ? ?????? ???????????."
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "??????? ????????????? ??????????? ? ?????????????"
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "??????????? ????? Moblin"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr ""
 "Moblin ???????????? ????? ????????? ???????? ????? ??? ????????? NetBook/"
 "NetTop/MID."
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "??????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "????? ? ?????? ???????? ??????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "?????????? ??? ?????????? ????????? ?????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "????????? ?????? ? ????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1619,7 +1627,7 @@ msgstr ""
 "GNOME - ??? ?????? ??????????? ????????? ????????????, ??????? ???????? "
 "??????, ??????? ????, ????????? ??????????? ? ??????????? ???????? ??????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1627,7 +1635,7 @@ msgstr ""
 "KDE - ??? ?????? ??????????? ?????????, ?????????? ? ???? ?????? ??????????, "
 "??????? ????, ????????? ?????? ? ??????????? ???????? ??????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1635,11 +1643,11 @@ msgstr ""
 "??? ?????????, ?????? ?????????? ?????????? ???????????, ????????? "
 "????????????? ??????. ???????? Emacs ? Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "????????? ???????? XEmacs"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1647,29 +1655,29 @@ msgstr ""
 "??? ???????? ????????? ????????? ???????????? ? ??????? DocBook ? "
 "??????????????? ? HTML, PDF, Postscript ? ?????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "??? ?????? ???????? ????? ??????? ????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??? ?????? ???????? ????? ?????? ? ???????? ??? ???????? ???????????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "??? ?????? ???????? ????? ?????? ? ???????? ??? ?????????, ???????????? "
 "?????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "??? ?????? ???????? ????? ?????? ? ???????? ??? ???????? ???????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ?????? ???????? ????? ?????? ? ???????? ??? ??????? ???????????."
 



From jforbes at fedoraproject.org  Mon Dec  7 23:09:53 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Mon,  7 Dec 2009 23:09:53 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-userspace_kvmclock_offset.patch, 1.1,
	1.2
Message-ID: <20091207230953.C21AF11C025D@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24366

Modified Files:
	linux-2.6-userspace_kvmclock_offset.patch 
Log Message:
Fix userspace kvmclock offset patch

linux-2.6-userspace_kvmclock_offset.patch:
 Documentation/kvm/api.txt       |   34 ++++++++++++++++++++++++++++++++++
 arch/x86/include/asm/kvm_host.h |    1 +
 arch/x86/kvm/x86.c              |   36 +++++++++++++++++++++++++++++++++++-
 include/linux/kvm.h             |   10 +++++++++-
 4 files changed, 79 insertions(+), 2 deletions(-)

Index: linux-2.6-userspace_kvmclock_offset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-userspace_kvmclock_offset.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-userspace_kvmclock_offset.patch	7 Dec 2009 18:05:35 -0000	1.1
+++ linux-2.6-userspace_kvmclock_offset.patch	7 Dec 2009 23:09:53 -0000	1.2
@@ -150,10 +150,10 @@ index e0ed46c..0e8455b 100644
 --- a/include/linux/kvm.h
 +++ b/include/linux/kvm.h
 @@ -439,6 +439,7 @@ struct kvm_ioeventfd {
- #ifdef __KVM_HAVE_XEN_HVM
- #define KVM_CAP_XEN_HVM 38
  #endif
-+#define KVM_CAP_ADJUST_CLOCK 39
+ #define KVM_CAP_IOEVENTFD 36
+ #define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
++#define KVM_CAP_ADJUST_CLOCK 38
  
  #ifdef KVM_CAP_IRQ_ROUTING
  



From spot at fedoraproject.org  Mon Dec  7 23:13:42 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 23:13:42 +0000 (UTC)
Subject: File Image-ExifTool-8.00.tar.gz uploaded to lookaside cache by spot
Message-ID: <20091207231342.00F8B10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Image-ExifTool:

525f52712c2ab21c467ade83ceb567b8  Image-ExifTool-8.00.tar.gz



From spot at fedoraproject.org  Mon Dec  7 23:15:42 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 23:15:42 +0000 (UTC)
Subject: rpms/perl-Image-ExifTool/F-11 perl-Image-ExifTool.spec, 1.22,
	1.23 sources, 1.18, 1.19
Message-ID: <20091207231542.547CB11C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Image-ExifTool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26583/F-11

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:
update to 8.00


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-ExifTool/F-11/perl-Image-ExifTool.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Image-ExifTool.spec	26 Feb 2009 20:20:38 -0000	1.22
+++ perl-Image-ExifTool.spec	7 Dec 2009 23:15:41 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		perl-Image-ExifTool
-Version:	7.67
-Release:	3%{?dist}
+Version:	8.00
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Applications/Multimedia
 Summary:	Utility for reading and writing image meta info
@@ -56,6 +56,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.00-1
+- update to 8.00 (Production)
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 7.67-5
+- rebuild against perl 5.10.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.67-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.67-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-ExifTool/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	11 Feb 2009 22:53:21 -0000	1.18
+++ sources	7 Dec 2009 23:15:42 -0000	1.19
@@ -1 +1 @@
-4b60741cd725683eb11ae0866e5941e5  Image-ExifTool-7.67.tar.gz
+525f52712c2ab21c467ade83ceb567b8  Image-ExifTool-8.00.tar.gz



From spot at fedoraproject.org  Mon Dec  7 23:15:42 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 23:15:42 +0000 (UTC)
Subject: rpms/perl-Image-ExifTool/devel .cvsignore, 1.18,
	1.19 perl-Image-ExifTool.spec, 1.24, 1.25 sources, 1.18, 1.19
Message-ID: <20091207231542.9B7CF11C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Image-ExifTool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26583/devel

Modified Files:
	.cvsignore perl-Image-ExifTool.spec sources 
Log Message:
update to 8.00


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-ExifTool/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	11 Feb 2009 22:53:21 -0000	1.18
+++ .cvsignore	7 Dec 2009 23:15:42 -0000	1.19
@@ -1 +1 @@
-Image-ExifTool-7.67.tar.gz
+Image-ExifTool-8.00.tar.gz


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-Image-ExifTool.spec	7 Dec 2009 12:32:58 -0000	1.24
+++ perl-Image-ExifTool.spec	7 Dec 2009 23:15:42 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		perl-Image-ExifTool
-Version:	7.67
-Release:	5%{?dist}
+Version:	8.00
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Applications/Multimedia
 Summary:	Utility for reading and writing image meta info
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.00-1
+- update to 8.00 (Production)
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 7.67-5
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-ExifTool/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	11 Feb 2009 22:53:21 -0000	1.18
+++ sources	7 Dec 2009 23:15:42 -0000	1.19
@@ -1 +1 @@
-4b60741cd725683eb11ae0866e5941e5  Image-ExifTool-7.67.tar.gz
+525f52712c2ab21c467ade83ceb567b8  Image-ExifTool-8.00.tar.gz



From spot at fedoraproject.org  Mon Dec  7 23:15:42 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  7 Dec 2009 23:15:42 +0000 (UTC)
Subject: rpms/perl-Image-ExifTool/F-12 perl-Image-ExifTool.spec, 1.23,
	1.24 sources, 1.18, 1.19
Message-ID: <20091207231542.697BC11C025D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Image-ExifTool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26583/F-12

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:
update to 8.00


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-ExifTool/F-12/perl-Image-ExifTool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Image-ExifTool.spec	26 Jul 2009 08:47:41 -0000	1.23
+++ perl-Image-ExifTool.spec	7 Dec 2009 23:15:42 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		perl-Image-ExifTool
-Version:	7.67
-Release:	4%{?dist}
+Version:	8.00
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Applications/Multimedia
 Summary:	Utility for reading and writing image meta info
@@ -56,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.00-1
+- update to 8.00 (Production)
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 7.67-5
+- rebuild against perl 5.10.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.67-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-ExifTool/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	11 Feb 2009 22:53:21 -0000	1.18
+++ sources	7 Dec 2009 23:15:42 -0000	1.19
@@ -1 +1 @@
-4b60741cd725683eb11ae0866e5941e5  Image-ExifTool-7.67.tar.gz
+525f52712c2ab21c467ade83ceb567b8  Image-ExifTool-8.00.tar.gz



From sandeen at fedoraproject.org  Mon Dec  7 23:17:58 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon,  7 Dec 2009 23:17:58 +0000 (UTC)
Subject: rpms/xfsprogs/devel xfsprogs-3.0.3-libblkid.patch, 1.1,
	1.2 xfsprogs.spec, 1.68, 1.69
Message-ID: <20091207231758.1B46B11C025D@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27842

Modified Files:
	xfsprogs-3.0.3-libblkid.patch xfsprogs.spec 
Log Message:
* Mon Dec 07 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-4
- Actually patch & run configure script w/ blkid bits...
- Kill rpath in xfs_fsr


xfsprogs-3.0.3-libblkid.patch:
 configure                           |   13 ++
 xfsprogs-3.0.3/Makefile             |   12 ++
 xfsprogs-3.0.3/configure.in         |    6 +
 xfsprogs-3.0.3/include/builddefs.in |    2 
 xfsprogs-3.0.3/mkfs/Makefile        |   19 +++-
 xfsprogs-3.0.3/mkfs/xfs_mkfs.c      |  170 +++++++++++++++++++++++++++++++-----
 6 files changed, 196 insertions(+), 26 deletions(-)

Index: xfsprogs-3.0.3-libblkid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs-3.0.3-libblkid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xfsprogs-3.0.3-libblkid.patch	10 Nov 2009 23:45:50 -0000	1.1
+++ xfsprogs-3.0.3-libblkid.patch	7 Dec 2009 23:17:57 -0000	1.2
@@ -386,3 +386,46 @@ Index: xfsprogs-3.0.3/mkfs/xfs_mkfs.c
  			nodsflag = 1;
  		}
  	} /* else dsunit & dswidth can't be set if nodsflag is set */
+--- xfsprogs-3.0.3.orig/configure	2009-12-07 17:06:42.472972680 -0600
++++ xfsprogs-3.0.3/configure	2009-12-07 17:08:30.663973127 -0600
+@@ -839,6 +839,8 @@
+ LOCALIZED_FILES
+ enable_lib64
+ libtermcap
++enable_blkid
++libblkid
+ enable_editline
+ libeditline
+ enable_readline
+@@ -931,6 +933,7 @@
+ enable_readline
+ enable_editline
+ enable_termcap
++enable_blkid
+ enable_lib64
+ '
+       ac_precious_vars='build_alias
+@@ -1574,6 +1577,7 @@
+  --enable-gettext=yes/no Enable alternate language support default=yes
+  --enable-readline=yes/no Enable readline command editing default=no
+  --enable-editline=yes/no Enable editline command editing default=no
++ --enable-blkid=yes/no Enable block device id library default=no
+  --enable-termcap=yes/no Enable terminal capabilities library default=no
+  --enable-lib64=yes/no Enable lib64 support default=no
+ 
+@@ -10441,6 +10445,15 @@
+ 
+ 
+ 
++
++# Check whether --enable-blkid was given.
++if test "${enable_blkid+set}" = set; then
++  enableval=$enable_blkid; test $enable_blkid = yes && libblkid="-lblkid"
++fi
++
++
++
++
+ # Check whether --enable-lib64 was given.
+ if test "${enable_lib64+set}" = set; then
+   enableval=$enable_lib64;


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- xfsprogs.spec	20 Nov 2009 21:28:45 -0000	1.68
+++ xfsprogs.spec	7 Dec 2009 23:17:57 -0000	1.69
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	3.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -80,7 +80,12 @@ export tagname=CC DEBUG=-DNDEBUG
         --libdir=/%{_lib}       \
         --libexecdir=%{_libdir} \
         --bindir=%{_sbindir}	\
-        --enable-readline=yes
+        --enable-readline=yes	\
+	--enable-blkid=yes
+
+# Kill rpaths
+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}
 
@@ -197,6 +202,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xfs/xfs_types.h
 
 %changelog
+* Mon Dec 07 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-4
+- Actually patch & run configure script w/ blkid bits...
+- Kill rpath in xfs_fsr
+
 * Fri Nov 20 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-3
 - Fix up build issues w.r.t. off64_t
 



From rmeggins at fedoraproject.org  Mon Dec  7 23:27:41 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  7 Dec 2009 23:27:41 +0000 (UTC)
Subject: File 389-ds-base-1.2.5.rc2.tar.bz2 uploaded to lookaside cache by
	rmeggins
Message-ID: <20091207232741.0961A10F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for 389-ds-base:

aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2



From rmeggins at fedoraproject.org  Mon Dec  7 23:29:24 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  7 Dec 2009 23:29:24 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 .cvsignore, 1.6, 1.7 389-ds-base-git-local.sh,
	1.3, 1.4 389-ds-base-git.sh, 1.4, 1.5 389-ds-base.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <20091207232924.8741211C025D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986/F-11

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
+++ .cvsignore	7 Dec 2009 23:29:23 -0000	1.7
@@ -1 +1 @@
-389-ds-base-1.2.5.rc1.tar.bz2
+389-ds-base-1.2.5.rc2.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base-git-local.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
+++ 389-ds-base-git-local.sh	7 Dec 2009 23:29:24 -0000	1.4
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc1
+VERSION=1.2.5.rc2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base-git.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
+++ 389-ds-base-git.sh	7 Dec 2009 23:29:24 -0000	1.5
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc1
+VERSION=1.2.5.rc2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.8
+++ 389-ds-base.spec	7 Dec 2009 23:29:24 -0000	1.9
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc1
+%global prerel .rc2
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.5
-Release:          %{?relprefix}2%{?prerel}%{?dist}
+Release:          %{?relprefix}3%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -269,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec  7 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.3.rc2
+- 1.2.5.rc2 release
+
 * Wed Dec  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.2.rc1
 - 1.2.5.rc1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Dec 2009 18:17:03 -0000	1.8
+++ sources	7 Dec 2009 23:29:24 -0000	1.9
@@ -1 +1 @@
-96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2
+aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2



From rmeggins at fedoraproject.org  Mon Dec  7 23:29:24 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  7 Dec 2009 23:29:24 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 .cvsignore, 1.6, 1.7 389-ds-base-git-local.sh,
	1.3, 1.4 389-ds-base-git.sh, 1.4, 1.5 389-ds-base.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <20091207232924.8B87C11C02BB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986/F-10

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
+++ .cvsignore	7 Dec 2009 23:29:23 -0000	1.7
@@ -1 +1 @@
-389-ds-base-1.2.5.rc1.tar.bz2
+389-ds-base-1.2.5.rc2.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base-git-local.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
+++ 389-ds-base-git-local.sh	7 Dec 2009 23:29:23 -0000	1.4
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc1
+VERSION=1.2.5.rc2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base-git.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
+++ 389-ds-base-git.sh	7 Dec 2009 23:29:23 -0000	1.5
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc1
+VERSION=1.2.5.rc2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.8
+++ 389-ds-base.spec	7 Dec 2009 23:29:23 -0000	1.9
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc1
+%global prerel .rc2
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.5
-Release:          %{?relprefix}2%{?prerel}%{?dist}
+Release:          %{?relprefix}3%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -269,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec  7 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.3.rc2
+- 1.2.5.rc2 release
+
 * Wed Dec  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.2.rc1
 - 1.2.5.rc1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Dec 2009 18:17:03 -0000	1.8
+++ sources	7 Dec 2009 23:29:23 -0000	1.9
@@ -1 +1 @@
-96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2
+aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2



From rmeggins at fedoraproject.org  Mon Dec  7 23:29:24 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  7 Dec 2009 23:29:24 +0000 (UTC)
Subject: rpms/389-ds-base/F-12 .cvsignore, 1.6, 1.7 389-ds-base-git-local.sh,
	1.3, 1.4 389-ds-base-git.sh, 1.4, 1.5 389-ds-base.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20091207232924.A67DF11C02C4@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986/F-12

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
+++ .cvsignore	7 Dec 2009 23:29:24 -0000	1.7
@@ -1 +1 @@
-389-ds-base-1.2.5.rc1.tar.bz2
+389-ds-base-1.2.5.rc2.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base-git-local.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
+++ 389-ds-base-git-local.sh	7 Dec 2009 23:29:24 -0000	1.4
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc1
+VERSION=1.2.5.rc2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base-git.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
+++ 389-ds-base-git.sh	7 Dec 2009 23:29:24 -0000	1.5
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc1
+VERSION=1.2.5.rc2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.11
+++ 389-ds-base.spec	7 Dec 2009 23:29:24 -0000	1.12
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc1
+%global prerel .rc2
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.5
-Release:          %{?relprefix}2%{?prerel}%{?dist}
+Release:          %{?relprefix}3%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -269,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec  7 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.3.rc2
+- 1.2.5.rc2 release
+
 * Wed Dec  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.2.rc1
 - 1.2.5.rc1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Dec 2009 18:17:03 -0000	1.8
+++ sources	7 Dec 2009 23:29:24 -0000	1.9
@@ -1 +1 @@
-96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2
+aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2



From rmeggins at fedoraproject.org  Mon Dec  7 23:29:25 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon,  7 Dec 2009 23:29:25 +0000 (UTC)
Subject: rpms/389-ds-base/devel .cvsignore, 1.6, 1.7 389-ds-base-git-local.sh,
	1.3, 1.4 389-ds-base-git.sh, 1.4, 1.5 389-ds-base.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20091207232925.1A77B11C025D@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986/devel

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
+++ .cvsignore	7 Dec 2009 23:29:24 -0000	1.7
@@ -1 +1 @@
-389-ds-base-1.2.5.rc1.tar.bz2
+389-ds-base-1.2.5.rc2.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base-git-local.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
+++ 389-ds-base-git-local.sh	7 Dec 2009 23:29:24 -0000	1.4
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc1
+VERSION=1.2.5.rc2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base-git.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
+++ 389-ds-base-git.sh	7 Dec 2009 23:29:24 -0000	1.5
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc1
+VERSION=1.2.5.rc2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.11
+++ 389-ds-base.spec	7 Dec 2009 23:29:24 -0000	1.12
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc1
+%global prerel .rc2
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.5
-Release:          %{?relprefix}2%{?prerel}%{?dist}
+Release:          %{?relprefix}3%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -269,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec  7 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.3.rc2
+- 1.2.5.rc2 release
+
 * Wed Dec  2 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.2.rc1
 - 1.2.5.rc1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Dec 2009 18:17:04 -0000	1.8
+++ sources	7 Dec 2009 23:29:24 -0000	1.9
@@ -1 +1 @@
-96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2
+aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2



From transif at fedoraproject.org  Mon Dec  7 23:37:15 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  7 Dec 2009 23:37:15 +0000 (UTC)
Subject: comps/po it.po,1.34,1.35
Message-ID: <20091207233715.8822111C025D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2624/po

Modified Files:
	it.po 
Log Message:
Sending translation for Italian


Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- it.po	9 Sep 2009 05:41:04 -0000	1.34
+++ it.po	7 Dec 2009 23:37:15 -0000	1.35
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-09 02:30+0000\n"
-"PO-Revision-Date: 2009-09-09 15:38+1000\n"
+"POT-Creation-Date: 2009-12-07 19:27+0000\n"
+"PO-Revision-Date: 2009-12-08 09:33+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <it at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -161,163 +161,163 @@ msgid "Clustering Support"
 msgstr "Supporto a sistemi cluster"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "Nucleo"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "Supporto lingua croata"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "Supporto lingua ceca"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "Nome Server DNS"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "Supporto lingua danese"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "Ambienti desktop"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "Ambienti desktop"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "Programmazione"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "Librerie di sviluppo"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "Strumenti di sviluppo"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "Supporto connesioni remote dial-up"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "Supporto lingua olandese"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "Editor di testi"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "Programmi educativi"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "Applicativi didattici e ludici per l'apprendimento"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "Scientifici e tecnici"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "Supporto lingua inglese (gb)"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "Supporto lingua esperanto"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "Supporto lingua estone"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "Supporto lingua etiope"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "Server FTP"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "Supporto lingua faeroese"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Gestore di pacchetti Fedora"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "Supporto lingua filippina"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "Supporto lingua finlandese"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "Caratteri"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "Pacchetti di caratteri per la rappresentazione di testo sul desktop."
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "Supporto lingua francese"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -327,19 +327,19 @@ msgstr ""
 "file multimediali."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "Ambiente desktop GNOME"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "Sviluppo applicativi GNOME"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -348,87 +348,87 @@ msgstr ""
 "file grafico, di un pannello per gestire il desktop e delle icone di sistema."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "Supporto lingua gaelica"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "Supporto lingua galiziana"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "Giochi e svago"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "Supporto lingua georgiana"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "Supporto lingua tedesca"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "Applicazioni Internet grafiche"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "Grafica"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "Supporto lingua greca"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "Supporto lingua gujarati"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "Supporto hardware"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "Supporto lingua ebraica"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "Supporto lingua hindi"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "Supporto lingua ungherese"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "Supporto lingua islandese"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "Supporto lingua indonesiana"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
@@ -437,7 +437,7 @@ msgstr ""
 "GNOME."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
@@ -446,80 +446,80 @@ msgstr ""
 "XFCE."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
 "Installare questi pacchetti per sviluppare applicazioni grafiche per QT e "
 "KDE."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "Installare questi strumenti per abilitare il sistema alla stampa o per farlo "
 "operare come server di stampa."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "Installare questo gruppo di pacchetti per utilizzare l'interfaccia grafica "
 "di base (X)."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Ambiente integrato di sviluppo basato su Eclipse."
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "Supporto lingua inuktitut"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "Supporto lingua irlandese"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "Supporto lingua italiana"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "Supporto lingua giapponese"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Programmazione Java"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K Desktop Environment)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "Sviluppo applicazioni KDE"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -528,142 +528,142 @@ msgstr ""
 "file grafico, di un pannello desktop e delle icone di sistema."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "Supporto lingua kannada"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "Supporto lingua kashubian"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "Supporto lingua khmer"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "Supporto lingua coreana"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "Supporto lingua curda"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "Lingue"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "Supporto lingua laotiana"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "Supporto lingua latvia"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "Caratteri legacy"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "Server di rete legacy"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "Sviluppo software legacy"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "Supporto compatibilit? software"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "Supporto lingua lituana"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "Supporto lingua low saxon"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "Supporto lingua macedone"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "Server mail"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "Supporto lingua malese"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "Supporto lingua malayalam"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "Supporto lingua maori"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "Supporto lingua marathi"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "Supporto lingua mongolese"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "Database MySQL"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "Supporto lingua nepalese"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "Server di rete"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "Server news"
 
@@ -673,37 +673,37 @@ msgstr "Supporto lingua sami settentrion
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "Supporto lingua sotho settentrionale"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "Supporto lingua norvegese"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "Ufficio/Produttivit?"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "Pacchetti di caratteri bitmap e vettoriali meno recenti"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "Supporto lingua oriya"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -713,55 +713,55 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "Supporto lingua persiana"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "Supporto lingua polacca"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "Supporto lingua portoghese"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "Database PostgreSQL"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "Supporto stampa"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "Supporto lingua punjabi"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "Supporto lingua rumena"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "Supporto lingua russa"
 
@@ -775,31 +775,31 @@ msgstr "SUGAR ? l'ambiente desktop svil
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "Supporto lingua samoana"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "Supporto lingua serba"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "Strumenti di sistema"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "Server"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
 "Window manager specifici che non fanno parte di ambienti desktop pi? "
@@ -807,43 +807,43 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "Supporto lingua Sinhala"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "Supporto ligua slovacca"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "Supporto lingua slovena"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "Installazione minima"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "Applicazioni per l'esecuzione di server di rete"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "Supporto lingua somala"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -853,91 +853,91 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "Audio e video"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "Supporto lingua ndebele meridionale"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "Supporto lingua sotho meridionale"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "Supporto lingua spagnola"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Supporto per lo sviluppo di programmi in linguaggio Java."
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Supporto per l'esecuzione di programmi sviluppati in liguaggio Java."
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "Supporto lingua swati"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "Supporto lingua svedese"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "Strumenti di sistema"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "Supporto lingua tagalog"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "Supporto lingua tamil"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "Supporto lingua telugu"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "Applicazioni Internet in modalit? testo"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "Supporto lingua tailandese"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "In questo pacchetto sono contenute applicazioni per l'ufficio, "
@@ -945,7 +945,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "I pacchetti di questo gruppo sono librerie di base necessarie per lo "
@@ -953,13 +953,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "Questi pacchetti permettono di configurare server di mail IMAP o SMTP."
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "Questi pacchetti permettono di sviluppare applicazioni per il sistema X "
@@ -967,19 +967,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "Questi pacchetti sono di aiuto per lo sviluppo di applicazioni e pagine web."
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "Questi pacchetti includono server di rete come DHCP, Kerberos e NIS."
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -989,13 +989,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "Questi pacchetti rendono disponibile un ambiente di virtualizzazione."
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr ""
 "Questi pacchetti permettono di ottenere la compatibilit? con release meno "
@@ -1003,7 +1003,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -1013,7 +1013,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1023,19 +1023,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "Questi strumenti permettono di eseguire un server Web nel sistema."
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "Questi strumenti permettono di eseguire un server FTP nel sistema."
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1045,13 +1045,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "Questo gruppo permette di configurare il sistema come server di news."
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "Questo gruppo contiene tutti gli strumenti personalizzati da Red Hat per la "
@@ -1059,7 +1059,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1069,7 +1069,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr ""
 "Questo gruppo contiene programmi con interfaccia grafica per Internet, come "
@@ -1077,7 +1077,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1088,7 +1088,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
 "Questo gruppo contiene pacchetti per la scansione e l'elaborazione di "
@@ -1096,7 +1096,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1107,7 +1107,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1118,19 +1118,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "Questo gruppo contiene un insieme di strumenti e risorse per ambienti armeni."
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "Questo gruppo contiene strumenti specifici per vari componenti hardware."
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1141,7 +1141,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 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 DNS (BIND) nel "
@@ -1149,7 +1149,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1159,163 +1159,163 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "Questo gruppo contiene pacchetti utili per MySQL."
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "Questo gruppo contiene pacchetti utili per PostgreSQL."
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "Supporto lingua tibetana"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "Supporto lingua tonga"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Strumenti e accessori necessari per creare e gestire pacchetti Fedora"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "Supporto lingua tsonga"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "Supporto lingua tswana"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "Supporto lingua turca"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "Supporto lingua ucraina"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "Supporto lingua urdu"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "Vari componenti di base del sistema."
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "Vari modi per rilassarsi e intrattenersi nel tempo libero."
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "Supporto lingua venda"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "Supporto lingua vietnamita"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "Virtualizzazione"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "Supporto lingua walloon"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "Sviluppo Web"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "Server Web"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "Supporto lingua gallese"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "Window manager"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "File server Windows"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "Sviluppo applicazioni X"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X Window System"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "Sviluppo applicazioni XFCE"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "Supporto lingua Xhosa"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "Supporto lingua zulu"
 
@@ -1329,67 +1329,67 @@ msgid "Haskell Development"
 msgstr "Sviluppo haskell"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "Metodi di input"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "Pacchetti contenenti metodi per l'inserimento internazionalizzato di testi."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "Supporto lingua kashmiri"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "Supporto lingua konkani"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "Supprto lingua maithili"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "Supporto lingua burmese (Myanmar)"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Sviluppo Perl"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "Supporto lingua sindhi"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Supporto per lo sviluppo di programmi nel linguaggio Haskell."
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Supporto per lo sviluppo di programmi nel linguaggio di programmazione Perl."
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "Supporto lingua tajika"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "Supporto lingua uzbeca"
 
@@ -1405,115 +1405,117 @@ msgstr "Supporto lingua azerbaijani"
 msgid "Chichewa Support"
 msgstr "Supporto lingua chichewa"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "Supporto lingua copta"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "Strumenti di disegno e simulazione per ingegneri."
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "Laboratorio elettronico"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "Supporto lingua fiji"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "Sviluppo e gestione font"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "Supporto lingua frisia"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "Supporto lingua friulana"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "Supporto lingua hiligaynon "
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "Supporto interlinguistico"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "Supporto lingua kazaka"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "Supporto lingua kinyarwanda"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "Supporto lingua latina"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "Supporto lingua lussemburghese"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "Supporto lingua malagasy"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "Supporto lingua maltese"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "Supporto lingua manx"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW multi-compilatore"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "Supporto lingua occitana"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "Documentazione e Aiuto Online"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "Supporto lingua sanscrita"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "Supporto lingua sarda"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "Ambiente desktop Sugar"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1523,7 +1525,7 @@ msgstr ""
 "Fedora."
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1532,17 +1534,17 @@ msgstr ""
 "sue librerie."
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "Supporto lingua swahili"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "Supporto lingua tetum"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1551,12 +1553,12 @@ msgstr ""
 "modifica, la manipolazione e pacchettizzazione di font."
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "Supporto lingua turkmena"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "Supporto lingua upper sorbian"
 
@@ -1564,13 +1566,17 @@ msgstr "Supporto lingua upper sorbian"
 msgid ""
 "A set of packages that provide the Critical Path functionality for the GNOME "
 "desktop"
-msgstr "Un insieme di pacchetti che forniscono una funzionalit? Critical Path per il desktop di GNOME."
+msgstr ""
+"Un insieme di pacchetti che forniscono una funzionalit? Critical Path per il "
+"desktop di GNOME."
 
 #: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
 msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
-msgstr "Un insieme di pacchetti che forniscono una piattaforma condivisa per la funzionalit? Critical Path su tutte le varianti di Fedora"
+msgstr ""
+"Un insieme di pacchetti che forniscono una piattaforma condivisa per la "
+"funzionalit? Critical Path su tutte le varianti di Fedora"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1580,49 +1586,60 @@ msgstr "Libri e guide"
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Libri e guide per gli sviluppatori e gli utenti di Fedora"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "Critical Path (di base)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "Critical Path (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "Directory Server"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
-msgstr "LXDE ? un ambiente desktop X11 semplice?ideato per computer con poche specifiche hardware come ad esempio netbook, dispositivi mobili e computer pi? vecchi."
+msgstr ""
+"LXDE ? un ambiente desktop X11 semplice?ideato per computer con poche "
+"specifiche hardware come ad esempio netbook, dispositivi mobili e computer "
+"pi? vecchi."
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "Identity server utente e macchina"
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Ambiente desktop di Moblin"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "Moblin ? un ambiente desktop per i dispositivi NetBook/NetTop/MID."
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "Contenuto"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "Testo ed altro Contenuto gratuito."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Applicazioni generiche"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "Accesso remoto dialup"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1630,7 +1647,7 @@ msgstr ""
 "GNOME ? una potente interfaccia utente grafica, comprensiva di un gestore di "
 "file, di un pannello per gestire il desktop e delle icone di sistema."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1638,7 +1655,7 @@ msgstr ""
 "KDE ? una potente interfaccia utente grafica, comprensiva di un gestore di "
 "file, di un pannello desktop e delle icone di sistema."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1646,11 +1663,11 @@ msgstr ""
 "Spesso chiamati editor di testi, questi programmi permettono di creare e "
 "modificare file di testo. Sono compresi Emacs e Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "L'editor di testi XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1658,33 +1675,33 @@ msgstr ""
 "Questi strumenti permettono la creazione di documenti in formato DocBook, e "
 "di convertirli nei formati HTML, PDF, Postscript e testo."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Questo gruppo contiene un insieme di server di rete per specifici protocolli"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in "
 "lingua araba."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in "
 "lingua ebraica."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in "
 "lingua giapponese."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr ""
 "Questo gruppo contiene un insieme di strumenti e risorse per ambienti in "



From fabbione at fedoraproject.org  Tue Dec  8 00:11:31 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 00:11:31 +0000 (UTC)
Subject: File cluster-3.0.6.tar.gz uploaded to lookaside cache by fabbione
Message-ID: <20091208001131.E6FBC10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for cluster:

f2c1a4430495fadcb1f673da0e115f1e  cluster-3.0.6.tar.gz



From transif at fedoraproject.org  Tue Dec  8 00:11:33 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  8 Dec 2009 00:11:33 +0000 (UTC)
Subject: comps/po ko.po,1.26,1.27
Message-ID: <20091208001133.931E611C025D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14108/po

Modified Files:
	ko.po 
Log Message:
Sending translation for Korean


Index: ko.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ko.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ko.po	1 Sep 2009 05:17:50 -0000	1.26
+++ ko.po	8 Dec 2009 00:11:32 -0000	1.27
@@ -10,15 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-01 02:22+0000\n"
-"PO-Revision-Date: 2009-09-01 15:16+1000\n"
+"POT-Creation-Date: 2009-12-07 19:27+0000\n"
+"PO-Revision-Date: 2009-12-08 10:10+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms:  nplurals=1; plural=0;\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -167,163 +168,163 @@ msgid "Clustering Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ?????? ??????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "???????????? ???????????? ??????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "????????? ??????????????? "
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "????????? ?????? ????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "?????? (?????????) ??????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "?????????????????? ?????? "
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ??????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Fedora Packager"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "?????? "
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????? ????????? ????????? ????????? ??? ?????? ????????? "
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -332,19 +333,19 @@ msgstr ""
 "???????????? ????????? ???????????? ????????? ????????? ???????????? ??? ????????????."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????? ??????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "GNOME ??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -353,170 +354,170 @@ msgstr ""
 "????????? ?????? ????????? ????????? ????????? ????????????."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "????????? ?????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT??? KDE??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "??????????????? ?????? ????????? ????????? ????????? ?????? ???????????? ??? ????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "?????? ????????? (X) ????????? ?????????????????? ?????????????????? ??? ????????? ????????? ???????????????"
 "???."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ?????? ?????? ?????? ?????? "
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ????????? ??????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????? ??????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE ??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -525,142 +526,142 @@ msgstr ""
 "?????? ?????? ????????? ????????? ????????? ????????????."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "?????? ??????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "????????? ?????? "
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "????????? ???????????? ??????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "????????? ??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "?????? ????????? ?????? "
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "?????????????????? ??????     "
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "?????? ??????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "????????? ??????  "
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "????????? ??????  "
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "?????? ??????"
 
@@ -670,37 +671,37 @@ msgstr "?????? ????????? ??????  "
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "?????? ????????? ??????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "??????/?????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????? ????????? ??? ?????? ?????? ????????? "
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -708,55 +709,55 @@ msgstr "??? ???????????? ?????? ????????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "?????? ??????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "???????????? ??????"
 
@@ -770,73 +771,73 @@ msgstr "SUGAR??? OLPC XO??? ?????? ?????
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "?????? ?????? ??????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????? ???????????? ????????? ???????????? ?????? ????????? ????????? ??????????????????. "
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "????????? ?????? ??????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "???????????? ????????? ???????????? ?????? ???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -846,121 +847,121 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "???????????? ?????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "?????? ??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "?????? ????????? ??????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ??????????????? ????????? ????????? ????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ??????????????? ????????? ????????? ???????????? ?????? ??????."
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "?????????-?????? ?????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "??? ?????? ??????????????? ????????? ???????????? ??????, PDF ?????? ???????????? ?????? ???????????????."
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??? ????????? ????????? ?????? ??????????????? ??????????????? ????????? ?????? ????????????????????????."
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "??? ???????????? IMAP??? SMTP ?????? ?????? ????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??? ???????????? X ????????? ???????????? ?????? ???????????? ????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ???????????? ??? ?????? ?????????????????? ??? ????????? ????????? ???????????????. "
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "??? ??????????????? DHCP, Kerberos, NIS??? ?????? ????????????-?????? ????????? ???????????? ?????????"
@@ -968,7 +969,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -978,19 +979,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "??? ???????????? ????????? ????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? ???????????? ?????? ?????? ???????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -998,7 +999,7 @@ msgstr "??? ???????????? ????????? ?????
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1008,19 +1009,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ????????? ???????????? ????????? ????????? ???????????? ????????? ??? ????????????."
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ????????? ???????????? ????????? ????????? FTP ????????? ????????? ??? ????????????."
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1030,19 +1031,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "??? ????????? ???????????? ???????????? ?????? ????????? ???????????? ??? ????????????."
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??? ???????????? Red Hat??? ????????? ?????? ?????? ?????? ????????? ?????? ???????????? ????????????."
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1052,13 +1053,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ???????????? ????????? ?????????, ???, ?????? ?????????????????? ???????????? ????????????."
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1068,13 +1069,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??? ????????? ????????? ???????????? ???????????? ??????, ?????? ????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1084,7 +1085,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1094,19 +1095,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ????????? ?????????????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ????????? ?????? ???????????? ??????????????? ?????? ?????? ???????????????. "
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1116,7 +1117,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "??? ????????? ????????? ???????????? ????????? ????????? DNS ?????? ?????? (BIND)??? ???????????? ??? ???"
@@ -1124,7 +1125,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1134,163 +1135,163 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "??? ????????? ????????? ???????????? MySQL??? ????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "??? ????????? ????????? ???????????? Postgresql ????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora Packager??? ????????? ?????? ??? ???????????? "
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "?????????????????? ??????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "????????? ?????? ?????????"
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "????????? ???????????? ?????? ????????? ?????? ??? ?????? ????????? ??????."
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "????????? ??????   "
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "??? ?????? "
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "??? ??????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "????????? ????????? "
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "Windows ?????? ??????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ??????????????? ??????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X ????????? ?????????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ??????????????? ?????? "
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "????????? ??????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "????????? ??????"
 
@@ -1304,67 +1305,67 @@ msgid "Haskell Development"
 msgstr "Haskell ??????  "
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "?????? ?????? "
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "?????? ????????? ????????? ?????? ?????? ?????? ?????????  "
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "????????? ??????  "
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "????????? (?????????) ??????   "
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ??????  "
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "????????? ?????? "
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ??????????????? ????????? ????????? ????????? ???????????? ??????. "
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ??????????????? ????????? ????????? ????????? ???????????? ??????.  "
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "????????? ??????  "
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "??????????????? ??????  "
 
@@ -1380,115 +1381,117 @@ msgstr "????????????????????? ??????  "
 msgid "Chichewa Support"
 msgstr "???????????? ??????  "
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "????????? ??????  "
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "???????????? ??????????????? ?????? ????????? ??? ??????????????? ?????? "
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "?????? ?????? "
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "????????? ??????        "
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "?????? ????????? ??? ????????? "
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "??????????????? ??????   "
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "?????????????????? ??????   "
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "?????????????????? ??????   "
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "?????????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "???????????? ?????? "
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "?????????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "????????? ??????       "
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "?????????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "????????? ??????  "
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "???????????? ??????  "
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW ????????? ???????????? "
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "????????? ??????     "
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "????????? ????????? ??? ?????? "
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "?????????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "?????????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ???????????? ?????? "
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1497,7 +1500,7 @@ msgstr ""
 "??? ??????????????? ?????? ??????  "
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1506,29 +1509,29 @@ msgstr ""
 "???   "
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "????????? ??????  "
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "??? ????????? ?????? ?????????, ??????, ?????? ??? ???????????? ???????????? ?????? ???????????????.  "
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "??????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "??????????????? (??????) ?????? "
 
@@ -1542,7 +1545,9 @@ msgstr "GNOME ??????????????? Critical P
 msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
-msgstr "?????? Fedora ???????????? Critical Path ????????? ?????? ?????? ???????????? ???????????? ????????? ???????????????. "
+msgstr ""
+"?????? Fedora ???????????? Critical Path ????????? ?????? ?????? ???????????? ???????????? ????????? "
+"???????????????. "
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1552,49 +1557,59 @@ msgstr "?????? ?????? ??? ????????? "
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ????????? ??? ???????????? ?????? ?????? ?????? ??? ?????????  "
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "Critical Path (??????) "
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "Critical Path (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "???????????? ?????? "
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
-msgstr "LXDE??? ?????? ??? ????????? ????????? ?????? ???????????? ?????? ?????? ????????? ??????????????? ?????? ???????????? ?????? ????????? ?????? X11 ???????????? ???????????????. "
+msgstr ""
+"LXDE??? ?????? ??? ????????? ????????? ?????? ???????????? ?????? ?????? ????????? ??????????????? ?????? "
+"???????????? ?????? ????????? ?????? X11 ???????????? ???????????????. "
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "????????? ??? ????????? ID ?????? "
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Moblin ???????????? ?????? "
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "Moblin??? NetBook/NetTop/MID ????????? ?????? ???????????? ???????????????.  "
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "????????? "
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "????????? ??? ?????? ?????? ?????????  "
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "????????? ????????? ?????? ?????? ????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "???????????? ???????????? ??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1602,7 +1617,7 @@ msgstr ""
 "GNOME??? ????????? ????????? ????????? ????????????????????? ??????, ????????????, ????????? ???????????? "
 "????????? ?????? ????????? ????????? ????????? ????????????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1610,7 +1625,7 @@ msgstr ""
 "KDE??? ????????? ????????? ????????? ????????????????????? ??????, ????????????, ????????? ???????????? ???"
 "?????? ?????? ????????? ????????? ????????? ????????????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1618,11 +1633,11 @@ msgstr ""
 "????????? ????????? ?????????????????? ???????????? ??? ??????????????? ????????? ???????????? ??????????????? "
 "???????????????. ????????? ?????????????????? Emacs??? Vi??? ???????????????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "XEmacs ????????? ?????????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1630,27 +1645,27 @@ msgstr ""
 "??? ????????? ???????????? DocBook ????????? ????????? ????????? ??? ????????? ????????? ????????? "
 "HTML, PDF, Postscript??? ????????? ???????????? ????????? ??? ????????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "??? ????????? ?????? ????????? ?????? ???????????? ?????? ???????????????.  "
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??? ????????? ???????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 



From fabbione at fedoraproject.org  Tue Dec  8 00:21:43 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 00:21:43 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.32, 1.33 cluster.spec, 1.63,
	1.64 sources, 1.33, 1.34
Message-ID: <20091208002143.95E3311C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17816

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	20 Nov 2009 11:40:35 -0000	1.32
+++ .cvsignore	8 Dec 2009 00:21:43 -0000	1.33
@@ -1 +1 @@
-cluster-3.0.5.tar.gz
+cluster-3.0.6.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- cluster.spec	20 Nov 2009 11:40:35 -0000	1.63
+++ cluster.spec	8 Dec 2009 00:21:43 -0000	1.64
@@ -14,16 +14,16 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## Setup/build bits
 
@@ -39,7 +39,7 @@ BuildRequires: openldap-devel perl(ExtUt
 BuildRequires: cluster-glue-libs-devel pacemaker-libs-devel glib2-devel
 
 %prep
-%setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 %build
 ./configure \
@@ -99,7 +99,7 @@ Requires: corosync >= 1.0.1-1
 Requires: openais >= 1.0.2-1
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
-Requires: fence-agents >= 3.0.4-1
+Requires: fence-agents >= 3.0.6-1
 
 %description -n cman
 Red Hat Cluster Manager
@@ -136,6 +136,8 @@ fi
 %{_datadir}/cluster/cluster.rng
 %{perl_vendorarch}/*
 %dir /var/log/cluster
+%dir /var/lib/cluster
+%dir /var/run/cluster
 %{_mandir}/man5/*
 %{_mandir}/man8/ccs*
 %{_mandir}/man8/cman*
@@ -303,6 +305,15 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release
+- spec file update:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+  * bump Requires on fence-agents
+  * ship var/run/cluster and var/lib/cluster
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 - spec file update:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	20 Nov 2009 11:40:35 -0000	1.33
+++ sources	8 Dec 2009 00:21:43 -0000	1.34
@@ -1 +1 @@
-4f6215a3c26fab9106b1c6a4907b12fc  cluster-3.0.5.tar.gz
+f2c1a4430495fadcb1f673da0e115f1e  cluster-3.0.6.tar.gz



From chitlesh at fedoraproject.org  Tue Dec  8 00:22:40 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Dec 2009 00:22:40 +0000 (UTC)
Subject: rpms/ngspice/F-11 import.log, 1.4, 1.5 ngspice-xcircuit_bridge.patch,
	1.2, 1.3 ngspice.spec, 1.19, 1.20
Message-ID: <20091208002240.41D6D11C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18322/F-11

Modified Files:
	import.log ngspice-xcircuit_bridge.patch ngspice.spec 
Log Message:
improve tcl bridge for xcircuit


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	4 Dec 2009 07:04:20 -0000	1.4
+++ import.log	8 Dec 2009 00:22:39 -0000	1.5
@@ -2,3 +2,4 @@ ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
 ngspice-19-1_fc11:F-11:ngspice-19-1.fc11.src.rpm:1249833216
 ngspice-20-1_fc12:F-11:ngspice-20-1.fc12.src.rpm:1259910146
+ngspice-20-2_fc12:F-11:ngspice-20-2.fc12.src.rpm:1260231652

ngspice-xcircuit_bridge.patch:
 main.c |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

Index: ngspice-xcircuit_bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/ngspice-xcircuit_bridge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ngspice-xcircuit_bridge.patch	4 Dec 2009 07:04:20 -0000	1.2
+++ ngspice-xcircuit_bridge.patch	8 Dec 2009 00:22:40 -0000	1.3
@@ -1,14 +1,76 @@
 --- src/main.c	2009-10-24 08:28:09.000000000 +0200
-+++ main.c	2009-11-16 15:05:57.196403105 +0100
-@@ -553,6 +553,7 @@
++++ main.c	2009-12-07 22:42:09.000000000 +0100
+@@ -5,7 +5,7 @@
+    Author: 1985 Wayne A. Christopher
+ 
+    The main routine for ngspice
+-   $Id$
++   $Id$
+ */
+ 
+ #include "ngspice.h"
+@@ -53,6 +53,7 @@
+ #include "frontend/variable.h"
+ #include "frontend/display.h"  /* added by SDB to pick up Input() fcn */
+ #include "frontend/signal_handler.h"
++#include "compatmode.h"
+ 
+ /* saj xspice headers */
+ #ifdef XSPICE
+@@ -188,9 +189,14 @@
+ extern struct comm spcp_coms[ ];
+ struct comm *cp_coms = spcp_coms;
+ 
+-extern int OUTpBeginPlot(), OUTpData(), OUTwBeginPlot(), OUTwReference();
+-extern int OUTwData(), OUTwEnd(), OUTendPlot(), OUTbeginDomain();
+-extern int OUTendDomain(), OUTstopnow(), OUTerror(), OUTattributes();
++extern int OUTpBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTpData(void *,IFvalue *,IFvalue *); 
++extern int OUTwBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTwReference(void *,IFvalue *,void **);
++extern int OUTwData(void *,int,IFvalue *,void *), OUTwEnd(void *), OUTendPlot(void *); 
++extern int OUTbeginDomain(void *,IFuid,int,IFvalue *);
++extern int OUTendDomain(void *), OUTstopnow(void), OUTerror(int,char *,IFuid *); 
++extern int OUTattributes(void *,IFuid *,int,IFvalue *);
+ 
+ IFfrontEnd nutmeginfo = {
+     IFnewUid,
+@@ -347,6 +353,26 @@
+ int DEVmaxnum = 0;
+ 
+ /* -------------------------------------------------------------------------- */
++/* Set a compatibility flag.
++   Currently available are flags for:
++   ngspice (standard)
++   HSPICE
++   Spice3
++*/
++COMPATMODE_T ngspice_compat_mode(void)
++{
++   char behaviour[80] ;
++
++   if( cp_getvar("ngbehavior", VT_STRING, behaviour)){
++      if (strcasecmp(behaviour,"hspice")==0)
++         return( COMPATMODE_HSPICE ) ;
++      if (strcasecmp(behaviour,"spice3")==0)
++         return( COMPATMODE_SPICE3 ) ;         
++   }
++   return(COMPATMODE_NATIVE) ;
++} /* end ngspice_compat_mode() */
++
++/* -------------------------------------------------------------------------- */
+ int
+ SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator)
+ {
+@@ -553,6 +579,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"       
++       "  -p, --pipe		            run in I/O pipe mode\n"
         "  -q, --completion          activate command completion\n"
         "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -759,6 +760,7 @@
+@@ -759,6 +786,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +78,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -766,7 +768,7 @@
+@@ -766,7 +794,7 @@
              {0, 0, 0, 0}
          };
  
@@ -25,3 +87,15 @@
               long_options, &option_index);
          if (c == -1)
              break;
+@@ -826,6 +854,11 @@
+               }
+               break;
+ 
++            case 'p':       /* Run in pipe mode */
++              iflag = TRUE;
++              istty = TRUE;
++              break;
++
+             case 'q':       /* Command completion */
+               qflag = TRUE;
+               break;


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/ngspice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ngspice.spec	4 Dec 2009 07:04:20 -0000	1.19
+++ ngspice.spec	8 Dec 2009 00:22:40 -0000	1.20
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -223,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
+- Improved interoperobability with xcircuit
+
 * Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
 - new upstream release
 



From chitlesh at fedoraproject.org  Tue Dec  8 00:25:24 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Dec 2009 00:25:24 +0000 (UTC)
Subject: rpms/ngspice/F-12 import.log, 1.4, 1.5 ngspice-xcircuit_bridge.patch,
	1.2, 1.3 ngspice.spec, 1.20, 1.21
Message-ID: <20091208002524.6B1FA11C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19444/F-12

Modified Files:
	import.log ngspice-xcircuit_bridge.patch ngspice.spec 
Log Message:
improve tcl bridge for xcircuit


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	4 Dec 2009 07:05:52 -0000	1.4
+++ import.log	8 Dec 2009 00:25:24 -0000	1.5
@@ -2,3 +2,4 @@ ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
 ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11.src.rpm:1249833090
 ngspice-20-1_fc12:F-12:ngspice-20-1.fc12.src.rpm:1259910264
+ngspice-20-2_fc12:F-12:ngspice-20-2.fc12.src.rpm:1260231732

ngspice-xcircuit_bridge.patch:
 main.c |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

Index: ngspice-xcircuit_bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/ngspice-xcircuit_bridge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ngspice-xcircuit_bridge.patch	4 Dec 2009 07:05:52 -0000	1.2
+++ ngspice-xcircuit_bridge.patch	8 Dec 2009 00:25:24 -0000	1.3
@@ -1,14 +1,76 @@
 --- src/main.c	2009-10-24 08:28:09.000000000 +0200
-+++ main.c	2009-11-16 15:05:57.196403105 +0100
-@@ -553,6 +553,7 @@
++++ main.c	2009-12-07 22:42:09.000000000 +0100
+@@ -5,7 +5,7 @@
+    Author: 1985 Wayne A. Christopher
+ 
+    The main routine for ngspice
+-   $Id$
++   $Id$
+ */
+ 
+ #include "ngspice.h"
+@@ -53,6 +53,7 @@
+ #include "frontend/variable.h"
+ #include "frontend/display.h"  /* added by SDB to pick up Input() fcn */
+ #include "frontend/signal_handler.h"
++#include "compatmode.h"
+ 
+ /* saj xspice headers */
+ #ifdef XSPICE
+@@ -188,9 +189,14 @@
+ extern struct comm spcp_coms[ ];
+ struct comm *cp_coms = spcp_coms;
+ 
+-extern int OUTpBeginPlot(), OUTpData(), OUTwBeginPlot(), OUTwReference();
+-extern int OUTwData(), OUTwEnd(), OUTendPlot(), OUTbeginDomain();
+-extern int OUTendDomain(), OUTstopnow(), OUTerror(), OUTattributes();
++extern int OUTpBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTpData(void *,IFvalue *,IFvalue *); 
++extern int OUTwBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTwReference(void *,IFvalue *,void **);
++extern int OUTwData(void *,int,IFvalue *,void *), OUTwEnd(void *), OUTendPlot(void *); 
++extern int OUTbeginDomain(void *,IFuid,int,IFvalue *);
++extern int OUTendDomain(void *), OUTstopnow(void), OUTerror(int,char *,IFuid *); 
++extern int OUTattributes(void *,IFuid *,int,IFvalue *);
+ 
+ IFfrontEnd nutmeginfo = {
+     IFnewUid,
+@@ -347,6 +353,26 @@
+ int DEVmaxnum = 0;
+ 
+ /* -------------------------------------------------------------------------- */
++/* Set a compatibility flag.
++   Currently available are flags for:
++   ngspice (standard)
++   HSPICE
++   Spice3
++*/
++COMPATMODE_T ngspice_compat_mode(void)
++{
++   char behaviour[80] ;
++
++   if( cp_getvar("ngbehavior", VT_STRING, behaviour)){
++      if (strcasecmp(behaviour,"hspice")==0)
++         return( COMPATMODE_HSPICE ) ;
++      if (strcasecmp(behaviour,"spice3")==0)
++         return( COMPATMODE_SPICE3 ) ;         
++   }
++   return(COMPATMODE_NATIVE) ;
++} /* end ngspice_compat_mode() */
++
++/* -------------------------------------------------------------------------- */
+ int
+ SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator)
+ {
+@@ -553,6 +579,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"       
++       "  -p, --pipe		            run in I/O pipe mode\n"
         "  -q, --completion          activate command completion\n"
         "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -759,6 +760,7 @@
+@@ -759,6 +786,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +78,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -766,7 +768,7 @@
+@@ -766,7 +794,7 @@
              {0, 0, 0, 0}
          };
  
@@ -25,3 +87,15 @@
               long_options, &option_index);
          if (c == -1)
              break;
+@@ -826,6 +854,11 @@
+               }
+               break;
+ 
++            case 'p':       /* Run in pipe mode */
++              iflag = TRUE;
++              istty = TRUE;
++              break;
++
+             case 'q':       /* Command completion */
+               qflag = TRUE;
+               break;


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/ngspice.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ngspice.spec	4 Dec 2009 07:05:52 -0000	1.20
+++ ngspice.spec	8 Dec 2009 00:25:24 -0000	1.21
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -223,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
+- Improved interoperobability with xcircuit
+
 * Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
 - new upstream release
 



From chitlesh at fedoraproject.org  Tue Dec  8 00:27:29 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Dec 2009 00:27:29 +0000 (UTC)
Subject: rpms/ngspice/devel import.log, 1.4,
	1.5 ngspice-xcircuit_bridge.patch, 
	1.2, 1.3 ngspice.spec, 1.20, 1.21
Message-ID: <20091208002729.9B22211C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20372/devel

Modified Files:
	import.log ngspice-xcircuit_bridge.patch ngspice.spec 
Log Message:
improve tcl bridge for xcircuit


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	4 Dec 2009 07:07:39 -0000	1.4
+++ import.log	8 Dec 2009 00:27:29 -0000	1.5
@@ -2,3 +2,4 @@ ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
 ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11.src.rpm:1249833090
 ngspice-20-1_fc12:HEAD:ngspice-20-1.fc12.src.rpm:1259910372
+ngspice-20-2_fc12:HEAD:ngspice-20-2.fc12.src.rpm:1260231894

ngspice-xcircuit_bridge.patch:
 main.c |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

Index: ngspice-xcircuit_bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/ngspice-xcircuit_bridge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ngspice-xcircuit_bridge.patch	4 Dec 2009 07:07:39 -0000	1.2
+++ ngspice-xcircuit_bridge.patch	8 Dec 2009 00:27:29 -0000	1.3
@@ -1,14 +1,76 @@
 --- src/main.c	2009-10-24 08:28:09.000000000 +0200
-+++ main.c	2009-11-16 15:05:57.196403105 +0100
-@@ -553,6 +553,7 @@
++++ main.c	2009-12-07 22:42:09.000000000 +0100
+@@ -5,7 +5,7 @@
+    Author: 1985 Wayne A. Christopher
+ 
+    The main routine for ngspice
+-   $Id$
++   $Id$
+ */
+ 
+ #include "ngspice.h"
+@@ -53,6 +53,7 @@
+ #include "frontend/variable.h"
+ #include "frontend/display.h"  /* added by SDB to pick up Input() fcn */
+ #include "frontend/signal_handler.h"
++#include "compatmode.h"
+ 
+ /* saj xspice headers */
+ #ifdef XSPICE
+@@ -188,9 +189,14 @@
+ extern struct comm spcp_coms[ ];
+ struct comm *cp_coms = spcp_coms;
+ 
+-extern int OUTpBeginPlot(), OUTpData(), OUTwBeginPlot(), OUTwReference();
+-extern int OUTwData(), OUTwEnd(), OUTendPlot(), OUTbeginDomain();
+-extern int OUTendDomain(), OUTstopnow(), OUTerror(), OUTattributes();
++extern int OUTpBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTpData(void *,IFvalue *,IFvalue *); 
++extern int OUTwBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTwReference(void *,IFvalue *,void **);
++extern int OUTwData(void *,int,IFvalue *,void *), OUTwEnd(void *), OUTendPlot(void *); 
++extern int OUTbeginDomain(void *,IFuid,int,IFvalue *);
++extern int OUTendDomain(void *), OUTstopnow(void), OUTerror(int,char *,IFuid *); 
++extern int OUTattributes(void *,IFuid *,int,IFvalue *);
+ 
+ IFfrontEnd nutmeginfo = {
+     IFnewUid,
+@@ -347,6 +353,26 @@
+ int DEVmaxnum = 0;
+ 
+ /* -------------------------------------------------------------------------- */
++/* Set a compatibility flag.
++   Currently available are flags for:
++   ngspice (standard)
++   HSPICE
++   Spice3
++*/
++COMPATMODE_T ngspice_compat_mode(void)
++{
++   char behaviour[80] ;
++
++   if( cp_getvar("ngbehavior", VT_STRING, behaviour)){
++      if (strcasecmp(behaviour,"hspice")==0)
++         return( COMPATMODE_HSPICE ) ;
++      if (strcasecmp(behaviour,"spice3")==0)
++         return( COMPATMODE_SPICE3 ) ;         
++   }
++   return(COMPATMODE_NATIVE) ;
++} /* end ngspice_compat_mode() */
++
++/* -------------------------------------------------------------------------- */
+ int
+ SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator)
+ {
+@@ -553,6 +579,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"       
++       "  -p, --pipe		            run in I/O pipe mode\n"
         "  -q, --completion          activate command completion\n"
         "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -759,6 +760,7 @@
+@@ -759,6 +786,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +78,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -766,7 +768,7 @@
+@@ -766,7 +794,7 @@
              {0, 0, 0, 0}
          };
  
@@ -25,3 +87,15 @@
               long_options, &option_index);
          if (c == -1)
              break;
+@@ -826,6 +854,11 @@
+               }
+               break;
+ 
++            case 'p':       /* Run in pipe mode */
++              iflag = TRUE;
++              istty = TRUE;
++              break;
++
+             case 'q':       /* Command completion */
+               qflag = TRUE;
+               break;


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ngspice.spec	4 Dec 2009 07:07:39 -0000	1.20
+++ ngspice.spec	8 Dec 2009 00:27:29 -0000	1.21
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -223,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
+- Improved interoperobability with xcircuit
+
 * Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
 - new upstream release
 



From fabbione at fedoraproject.org  Tue Dec  8 00:31:39 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 00:31:39 +0000 (UTC)
Subject: rpms/cluster/F-12 .cvsignore, 1.32, 1.33 cluster.spec, 1.63,
	1.64 sources, 1.33, 1.34
Message-ID: <20091208003139.C4F9611C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22053

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release. Plenty of bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-12/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	23 Nov 2009 13:41:06 -0000	1.32
+++ .cvsignore	8 Dec 2009 00:31:39 -0000	1.33
@@ -1 +1 @@
-cluster-3.0.5.tar.gz
+cluster-3.0.6.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-12/cluster.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- cluster.spec	23 Nov 2009 13:41:06 -0000	1.63
+++ cluster.spec	8 Dec 2009 00:31:39 -0000	1.64
@@ -14,16 +14,16 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## Setup/build bits
 
@@ -39,7 +39,7 @@ BuildRequires: openldap-devel perl(ExtUt
 BuildRequires: cluster-glue-libs-devel pacemaker-libs-devel glib2-devel
 
 %prep
-%setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 %build
 ./configure \
@@ -99,7 +99,7 @@ Requires: corosync >= 1.0.1-1
 Requires: openais >= 1.0.2-1
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
-Requires: fence-agents >= 3.0.4-1
+Requires: fence-agents >= 3.0.6-1
 
 %description -n cman
 Red Hat Cluster Manager
@@ -136,6 +136,8 @@ fi
 %{_datadir}/cluster/cluster.rng
 %{perl_vendorarch}/*
 %dir /var/log/cluster
+%dir /var/lib/cluster
+%dir /var/run/cluster
 %{_mandir}/man5/*
 %{_mandir}/man8/ccs*
 %{_mandir}/man8/cman*
@@ -303,6 +305,15 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release
+- spec file update:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+  * bump Requires on fence-agents
+  * ship var/run/cluster and var/lib/cluster
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 - spec file update:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-12/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	23 Nov 2009 13:41:07 -0000	1.33
+++ sources	8 Dec 2009 00:31:39 -0000	1.34
@@ -1 +1 @@
-4f6215a3c26fab9106b1c6a4907b12fc  cluster-3.0.5.tar.gz
+f2c1a4430495fadcb1f673da0e115f1e  cluster-3.0.6.tar.gz



From chitlesh at fedoraproject.org  Tue Dec  8 00:33:43 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Dec 2009 00:33:43 +0000 (UTC)
Subject: rpms/ngspice/EL-5 import.log, 1.3, 1.4 ngspice-xcircuit_bridge.patch,
	1.2, 1.3 ngspice.spec, 1.10, 1.11
Message-ID: <20091208003343.3E12511C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23109/EL-5

Modified Files:
	import.log ngspice-xcircuit_bridge.patch ngspice.spec 
Log Message:
improve tcl bridge for xcircuit


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Dec 2009 07:09:57 -0000	1.3
+++ import.log	8 Dec 2009 00:33:42 -0000	1.4
@@ -1,3 +1,4 @@
 ngspice-18-1_fc10:EL-5:ngspice-18-1.fc10.src.rpm:1231713953
 ngspice-19-1_fc11:EL-5:ngspice-19-1.fc11.src.rpm:1249833383
 ngspice-20-1_fc12:EL-5:ngspice-20-1.fc12.src.rpm:1259910513
+ngspice-20-2_fc12:EL-5:ngspice-20-2.fc12.src.rpm:1260232344

ngspice-xcircuit_bridge.patch:
 main.c |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

Index: ngspice-xcircuit_bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/ngspice-xcircuit_bridge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ngspice-xcircuit_bridge.patch	4 Dec 2009 07:09:57 -0000	1.2
+++ ngspice-xcircuit_bridge.patch	8 Dec 2009 00:33:42 -0000	1.3
@@ -1,14 +1,76 @@
 --- src/main.c	2009-10-24 08:28:09.000000000 +0200
-+++ main.c	2009-11-16 15:05:57.196403105 +0100
-@@ -553,6 +553,7 @@
++++ main.c	2009-12-07 22:42:09.000000000 +0100
+@@ -5,7 +5,7 @@
+    Author: 1985 Wayne A. Christopher
+ 
+    The main routine for ngspice
+-   $Id$
++   $Id$
+ */
+ 
+ #include "ngspice.h"
+@@ -53,6 +53,7 @@
+ #include "frontend/variable.h"
+ #include "frontend/display.h"  /* added by SDB to pick up Input() fcn */
+ #include "frontend/signal_handler.h"
++#include "compatmode.h"
+ 
+ /* saj xspice headers */
+ #ifdef XSPICE
+@@ -188,9 +189,14 @@
+ extern struct comm spcp_coms[ ];
+ struct comm *cp_coms = spcp_coms;
+ 
+-extern int OUTpBeginPlot(), OUTpData(), OUTwBeginPlot(), OUTwReference();
+-extern int OUTwData(), OUTwEnd(), OUTendPlot(), OUTbeginDomain();
+-extern int OUTendDomain(), OUTstopnow(), OUTerror(), OUTattributes();
++extern int OUTpBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTpData(void *,IFvalue *,IFvalue *); 
++extern int OUTwBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTwReference(void *,IFvalue *,void **);
++extern int OUTwData(void *,int,IFvalue *,void *), OUTwEnd(void *), OUTendPlot(void *); 
++extern int OUTbeginDomain(void *,IFuid,int,IFvalue *);
++extern int OUTendDomain(void *), OUTstopnow(void), OUTerror(int,char *,IFuid *); 
++extern int OUTattributes(void *,IFuid *,int,IFvalue *);
+ 
+ IFfrontEnd nutmeginfo = {
+     IFnewUid,
+@@ -347,6 +353,26 @@
+ int DEVmaxnum = 0;
+ 
+ /* -------------------------------------------------------------------------- */
++/* Set a compatibility flag.
++   Currently available are flags for:
++   ngspice (standard)
++   HSPICE
++   Spice3
++*/
++COMPATMODE_T ngspice_compat_mode(void)
++{
++   char behaviour[80] ;
++
++   if( cp_getvar("ngbehavior", VT_STRING, behaviour)){
++      if (strcasecmp(behaviour,"hspice")==0)
++         return( COMPATMODE_HSPICE ) ;
++      if (strcasecmp(behaviour,"spice3")==0)
++         return( COMPATMODE_SPICE3 ) ;         
++   }
++   return(COMPATMODE_NATIVE) ;
++} /* end ngspice_compat_mode() */
++
++/* -------------------------------------------------------------------------- */
+ int
+ SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator)
+ {
+@@ -553,6 +579,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"       
++       "  -p, --pipe		            run in I/O pipe mode\n"
         "  -q, --completion          activate command completion\n"
         "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -759,6 +760,7 @@
+@@ -759,6 +786,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +78,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -766,7 +768,7 @@
+@@ -766,7 +794,7 @@
              {0, 0, 0, 0}
          };
  
@@ -25,3 +87,15 @@
               long_options, &option_index);
          if (c == -1)
              break;
+@@ -826,6 +854,11 @@
+               }
+               break;
+ 
++            case 'p':       /* Run in pipe mode */
++              iflag = TRUE;
++              istty = TRUE;
++              break;
++
+             case 'q':       /* Command completion */
+               qflag = TRUE;
+               break;


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/ngspice.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ngspice.spec	4 Dec 2009 07:09:57 -0000	1.10
+++ ngspice.spec	8 Dec 2009 00:33:42 -0000	1.11
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -223,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
+- Improved interoperobability with xcircuit
+
 * Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
 - new upstream release
 



From petersen at fedoraproject.org  Tue Dec  8 00:35:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  8 Dec 2009 00:35:23 +0000 (UTC)
Subject: rpms/xmonad/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xmonad-config-manpage.patch, 1.1, 1.2 xmonad.spec, 1.7, 1.8
Message-ID: <20091208003523.EDDA011C025D@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/xmonad/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23736

Modified Files:
	.cvsignore sources xmonad-config-manpage.patch xmonad.spec 
Log Message:
backport 0.9 from devel:
* Tue Nov 17 2009 Jens Petersen <petersen at redhat.com> - 0.9-3
- use %%ghc_pkg_ver for requires

* Sun Nov 15 2009 Jens Petersen <petersen at redhat.com> - 0.9-2
- also buildrequires and requires ghc-X11-doc

* Sun Nov 15 2009 Jens Petersen <petersen at redhat.com> - 0.9-1
- update to 0.9 (requires ghc-X11 >= 1.4.6.1)
- drop superfluous X11_version from ghc-X11 requires
- rename X11_version to X11_minver
- remove extra xmonad.hs under datadir



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmonad/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 May 2009 21:19:57 -0000	1.2
+++ .cvsignore	8 Dec 2009 00:35:23 -0000	1.3
@@ -1 +1 @@
-xmonad-0.8.1.tar.gz
+xmonad-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmonad/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 May 2009 21:19:57 -0000	1.2
+++ sources	8 Dec 2009 00:35:23 -0000	1.3
@@ -1 +1 @@
-03a8f0a420902d9eea3df1d8d62598c7  xmonad-0.8.1.tar.gz
+5ec4ec7b6ab1ec841ceca07184a28ba7  xmonad-0.9.tar.gz

xmonad-config-manpage.patch:
 xmonad.hs |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: xmonad-config-manpage.patch
===================================================================
RCS file: /cvs/extras/rpms/xmonad/F-12/xmonad-config-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmonad-config-manpage.patch	6 May 2009 21:48:56 -0000	1.1
+++ xmonad-config-manpage.patch	8 Dec 2009 00:35:23 -0000	1.2
@@ -10,4 +10,4 @@ diff -r -u -X /home/yankee/Projekten/fed
 +          xmonad defaults
  
  -- A structure containing your configuration settings, overriding
- -- fields in the default config. Any you don't override, will 
+ -- fields in the default config. Any you don't override, will


Index: xmonad.spec
===================================================================
RCS file: /cvs/extras/rpms/xmonad/F-12/xmonad.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xmonad.spec	30 Jul 2009 11:57:59 -0000	1.7
+++ xmonad.spec	8 Dec 2009 00:35:23 -0000	1.8
@@ -1,4 +1,4 @@
-%global X11_version 1.4.3
+%global X11_minver 1.4.6.1
 
 %bcond_without doc
 %bcond_without prof
@@ -7,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           xmonad
-Version:        0.8.1
-Release:        15%{?dist}
+Version:        0.9
+Release:        3%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -22,12 +22,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # fedora ghc archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-rpm-macros
-BuildRequires:  ghc-X11-devel >= %{X11_version}
+BuildRequires:  ghc-X11-devel >= %{X11_minver}
 %if %{with doc}
 BuildRequires:  ghc-doc
+BuildRequires:  ghc-X11-doc >= %{X11_minver}
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof, ghc-X11-prof >= %{X11_version}
+BuildRequires:  ghc-prof
+BuildRequires:  ghc-X11-prof >= %{X11_minver}
 %endif
 Requires:       ghc-%{name}-devel = %{version}-%{release}
 # required until there is a command to open some system default
@@ -51,10 +53,10 @@ on several screens.
 %package -n ghc-%{name}-devel
 Summary:        Haskell %{name} library
 Group:          Development/Libraries
-Requires:       ghc-X11-devel >= %{X11_version}
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       ghc-X11-devel = %ghc_pkg_ver X11
 
 %description -n ghc-%{name}-devel
 This package provides the Haskell %{name} library
@@ -68,6 +70,7 @@ Group:          Development/Libraries
 Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
+Requires:       ghc-X11-doc = %ghc_pkg_ver X11
 
 %description -n ghc-%{name}-doc
 This package contains development documentation files for the %{name} library.
@@ -79,8 +82,8 @@ This package contains development docume
 Summary:        Profiling libraries for %{name}
 Group:          Development/Libraries
 Requires:       ghc-%{name}-devel = %{version}-%{release}
-Requires:       ghc-X11-prof >= %{X11_version}
 Requires:       ghc-prof = %{ghc_version}
+Requires:       ghc-X11-prof = %ghc_pkg_ver X11
 
 %description -n ghc-%{name}-prof
 This package contains profiling libraries for %{name}.
@@ -117,6 +120,9 @@ install -p -m 0644 -D %SOURCE1 $RPM_BUIL
 install -p -m 0755 -D %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/%{name}-start
 install -p -m 0644 -D man/xmonad.hs $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/%{name}.hs
 
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/man/xmonad.hs
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -172,6 +178,18 @@ fi
 
 
 %changelog
+* Tue Nov 17 2009 Jens Petersen <petersen at redhat.com> - 0.9-3
+- use %%ghc_pkg_ver for requires
+
+* Sun Nov 15 2009 Jens Petersen <petersen at redhat.com> - 0.9-2
+- also buildrequires and requires ghc-X11-doc
+
+* Sun Nov 15 2009 Jens Petersen <petersen at redhat.com> - 0.9-1
+- update to 0.9 (requires ghc-X11 >= 1.4.6.1)
+- drop superfluous X11_version from ghc-X11 requires
+- rename X11_version to X11_minver
+- remove extra xmonad.hs under datadir
+
 * Thu Jul 30 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-15
 - rebuild against newer packages from the mass rebuild
 



From fabbione at fedoraproject.org  Tue Dec  8 00:35:29 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 00:35:29 +0000 (UTC)
Subject: rpms/fence-agents/devel fence-agents.spec, 1.22,
	1.23 fence_head.diff, 1.1, NONE
Message-ID: <20091208003529.B5FE111C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24038

Modified Files:
	fence-agents.spec 
Removed Files:
	fence_head.diff 
Log Message:
New upstream release



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- fence-agents.spec	4 Dec 2009 20:11:50 -0000	1.22
+++ fence-agents.spec	8 Dec 2009 00:35:29 -0000	1.23
@@ -11,20 +11,19 @@
 ###############################################################################
 
 # keep around ready for later user
-%global alphatag git0a6184070
+## global alphatag git0a6184070
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.5
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.6
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/fence-agents-%{version}.tar.gz
-Patch0: fence_head.diff
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## Runtime deps
-Requires: sg3_utils OpenIPMI telnet openssh-clients
+Requires: sg3_utils telnet openssh-clients
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 Requires: fence-virt >= 0.1.3-1
@@ -33,6 +32,10 @@ Requires: fence-virt >= 0.1.3-1
 # switching from package to file based require.
 Requires: /usr/bin/virsh
 
+# This is required by fence_ipmilan. it appears that the packages
+# have changed Requires around. Make sure to get the right one.
+Requires: /usr/bin/ipmitool
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -48,8 +51,7 @@ BuildRequires: corosynclib-devel >= 1.0.
 BuildRequires: openaislib-devel >= 1.0.0-1
 
 %prep
-%setup -q -n fence-agents-%{version}
-%patch0 -p1
+%setup -q -n %{name}-%{version}
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -89,6 +91,12 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release (drop fence_head.diff)
+- spec file updates:
+  * use new Source0 url
+  * use file based Requires for ipmitools (rhbz: 545237)
+
 * Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-2.git0a6184070
 - Drop fence_xvm from upstream (fence_head.diff)
 - spec file updates:


--- fence_head.diff DELETED ---



From pkgdb at fedoraproject.org  Tue Dec  8 00:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 00:41:12 +0000
Subject: [pkgdb] etoys had acl change status
Message-ID: <20091208004112.59BEB10F88C@bastion2.fedora.phx.redhat.com>

gavin has set the commit acl on etoys (Fedora devel) to Approved for dsd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Dec  8 00:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 00:41:31 +0000
Subject: [pkgdb] etoys had acl change status
Message-ID: <20091208004131.5819210F88C@bastion2.fedora.phx.redhat.com>

gavin has set the commit acl on etoys (Fedora 11) to Approved for dsd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From pkgdb at fedoraproject.org  Tue Dec  8 00:41:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 00:41:34 +0000
Subject: [pkgdb] etoys had acl change status
Message-ID: <20091208004134.DC10110F892@bastion2.fedora.phx.redhat.com>

gavin has set the commit acl on etoys (Fedora 12) to Approved for dsd

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/etoys



From fabbione at fedoraproject.org  Tue Dec  8 00:42:31 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 00:42:31 +0000 (UTC)
Subject: File fence-agents-3.0.6.tar.gz uploaded to lookaside cache by
	fabbione
Message-ID: <20091208004231.6304810F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fence-agents:

5fc06dc26a14106ee6e21977a75b1b7f  fence-agents-3.0.6.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 00:44:17 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 00:44:17 +0000 (UTC)
Subject: rpms/fence-agents/devel .cvsignore, 1.16, 1.17 fence-agents.spec,
	1.23, 1.24 sources, 1.16, 1.17
Message-ID: <20091208004417.3428811C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29044

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
Retag with correct tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	20 Nov 2009 11:55:30 -0000	1.16
+++ .cvsignore	8 Dec 2009 00:44:16 -0000	1.17
@@ -1 +1 @@
-fence-agents-3.0.5.tar.gz
+fence-agents-3.0.6.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- fence-agents.spec	8 Dec 2009 00:35:29 -0000	1.23
+++ fence-agents.spec	8 Dec 2009 00:44:16 -0000	1.24
@@ -16,7 +16,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.6
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -91,6 +91,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-2
+- Use the correct tarball from upstream
+
 * Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
 - New upstream release (drop fence_head.diff)
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	20 Nov 2009 11:55:31 -0000	1.16
+++ sources	8 Dec 2009 00:44:16 -0000	1.17
@@ -1 +1 @@
-30709b427b0271cb47d2eab800f79bcb  fence-agents-3.0.5.tar.gz
+5fc06dc26a14106ee6e21977a75b1b7f  fence-agents-3.0.6.tar.gz



From petersen at fedoraproject.org  Tue Dec  8 00:49:48 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  8 Dec 2009 00:49:48 +0000 (UTC)
Subject: rpms/ghc-rpm-macros/F-12 ghc-rpm-macros.ghc, 1.4,
	1.5 ghc-rpm-macros.spec, 1.6, 1.7
Message-ID: <20091208004948.71D5911C025D@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-rpm-macros/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31230

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
backport %ghc_pkg_ver for generating ghc pkg requires version deps


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-12/ghc-rpm-macros.ghc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ghc-rpm-macros.ghc	22 Sep 2009 10:08:17 -0000	1.4
+++ ghc-rpm-macros.ghc	8 Dec 2009 00:49:48 -0000	1.5
@@ -36,3 +36,5 @@ echo '%{ghcdocdir}' >> %1-doc.files \
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
 %ghc_version %(ghc --numeric-version)
+
+%ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-12/ghc-rpm-macros.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ghc-rpm-macros.spec	22 Sep 2009 10:08:17 -0000	1.6
+++ ghc-rpm-macros.spec	8 Dec 2009 00:49:48 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		ghc-rpm-macros
-Version:	0.2.1
-Release:	2%{?dist}
+Version:	0.2.5
+Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
 Group:		Development/Libraries
@@ -48,6 +48,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.5-1
+- make ghc_pkg_ver only return pkg version
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.4-1
+- change GHCRequires to ghc_pkg_ver
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.3-1
+- use the latest installed pkg version for %%GHCRequires
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.2-1
+- add %%GHCRequires for automatically versioned library deps
+
 * Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1-2
 - no, revert versioned ghcdocdir again!
 



From fabbione at fedoraproject.org  Tue Dec  8 00:51:00 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 00:51:00 +0000 (UTC)
Subject: rpms/fence-agents/F-12 .cvsignore, 1.16, 1.17 fence-agents.spec,
	1.21, 1.22 sources, 1.16, 1.17
Message-ID: <20091208005100.04B0D11C03DB@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31727

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release, many bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	23 Nov 2009 13:46:29 -0000	1.16
+++ .cvsignore	8 Dec 2009 00:50:59 -0000	1.17
@@ -1 +1 @@
-fence-agents-3.0.5.tar.gz
+fence-agents-3.0.6.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-12/fence-agents.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- fence-agents.spec	23 Nov 2009 13:46:30 -0000	1.21
+++ fence-agents.spec	8 Dec 2009 00:50:59 -0000	1.22
@@ -10,30 +10,32 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag git0a6184070
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.5
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.6
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/fence-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## Runtime deps
-Requires: sg3_utils OpenIPMI telnet openssh-clients
+Requires: sg3_utils telnet openssh-clients
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
+Requires: fence-virt >= 0.1.3-1
 
 # This is required by fence_virsh. Per discussion on fedora-devel
 # switching from package to file based require.
 Requires: /usr/bin/virsh
 
+# This is required by fence_ipmilan. it appears that the packages
+# have changed Requires around. Make sure to get the right one.
+Requires: /usr/bin/ipmitool
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -49,7 +51,7 @@ BuildRequires: corosynclib-devel >= 1.0.
 BuildRequires: openaislib-devel >= 1.0.0-1
 
 %prep
-%setup -q -n fence-agents-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -89,6 +91,22 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-2
+- Use the correct tarball from upstream
+
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release (drop fence_head.diff)
+- spec file updates:
+  * use new Source0 url
+  * use file based Requires for ipmitools (rhbz: 545237)
+
+* Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-2.git0a6184070
+- Drop fence_xvm from upstream (fence_head.diff)
+- spec file updates:
+  * Drop unrequired comments
+  * Readd alpha tag and clean it's usage around
+  * Requires: fence-virt in sufficient version to provide fence_xvm
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	23 Nov 2009 13:46:30 -0000	1.16
+++ sources	8 Dec 2009 00:50:59 -0000	1.17
@@ -1 +1 @@
-30709b427b0271cb47d2eab800f79bcb  fence-agents-3.0.5.tar.gz
+5fc06dc26a14106ee6e21977a75b1b7f  fence-agents-3.0.6.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 00:52:37 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 00:52:37 +0000 (UTC)
Subject: File rgmanager-3.0.6.tar.gz uploaded to lookaside cache by fabbione
Message-ID: <20091208005237.5F88210F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rgmanager:

a7e78b9f8e41c7d50c03e04dffcda7a2  rgmanager-3.0.6.tar.gz



From transif at fedoraproject.org  Tue Dec  8 00:53:13 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  8 Dec 2009 00:53:13 +0000 (UTC)
Subject: comps/po ja.po,1.25,1.26
Message-ID: <20091208005313.D688511C025D@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv328/po

Modified Files:
	ja.po 
Log Message:
Sending translation for Japanese


Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ja.po	30 Aug 2009 01:06:12 -0000	1.25
+++ ja.po	8 Dec 2009 00:53:13 -0000	1.26
@@ -1,4 +1,4 @@
-# translation of comps.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
@@ -10,16 +10,17 @@
 # Hyu_gabaru Ryu_ichi <hyu_gabaru at yahoo.co.jp>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps\n"
+"Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 19:06+0000\n"
-"PO-Revision-Date: 2009-08-30 10:03+0900\n"
+"POT-Creation-Date: 2009-12-07 19:27+0000\n"
+"PO-Revision-Date: 2009-12-08 09:52+0900\n"
 "Last-Translator: Kiyoto Hashida <khashida at redhat.com>\n"
 "Language-Team: Japanese <jp at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n"
 
 #: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 #: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
@@ -158,163 +159,163 @@ msgid "Clustering Support"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ?????????????????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "?????? (????????????) ???????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ????????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Fedora ??????????????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -323,19 +324,19 @@ msgstr ""
 "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "GNOME ????????????????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -344,87 +345,87 @@ msgstr ""
 "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
@@ -433,7 +434,7 @@ msgstr ""
 "???????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
@@ -442,80 +443,80 @@ msgstr ""
 "???????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
 "QT ?????? KDE ????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "?????????????????????????????? (X) ??????????????????????????????????????????????????????????????????????????????"
 "?????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ??????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE ( K ????????????????????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE ????????????????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -524,142 +525,142 @@ msgstr ""
 "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "????????????????????????"
 
@@ -669,37 +670,37 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "Office/?????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -707,55 +708,55 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "???????????????????????????"
 
@@ -769,31 +770,31 @@ msgstr "SUGAR ??? OLPC XO ??????????????
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
@@ -801,43 +802,43 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -847,91 +848,91 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 "????????????????????????????????????????????????????????????PDF ????????????????????????????????????????????????"
@@ -939,7 +940,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
@@ -947,25 +948,25 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????????IMAP ??? SMTP ?????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "????????????????????????????????????DHCP???Kerberos???NIS ????????? ????????????????????????????????????"
@@ -973,7 +974,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -983,19 +984,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -1005,7 +1006,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1015,19 +1016,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1037,7 +1038,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
@@ -1045,7 +1046,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
 "??????????????????????????????????????? Red Hat ????????????????????????????????????????????????????????????"
@@ -1053,7 +1054,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1063,7 +1064,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr ""
 "???????????????????????????????????????????????? Email???Web???????????????????????????????????????????????????"
@@ -1071,7 +1072,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1081,13 +1082,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1097,7 +1098,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1107,19 +1108,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1129,7 +1130,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "?????????????????????????????????????????????????????????????????? DNS ????????????????????? (BIND) ?????????"
@@ -1137,7 +1138,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1147,7 +1148,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr ""
 "??????????????????????????????????????????MySQL ???????????????????????????????????????????????????????????????"
@@ -1155,7 +1156,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr ""
 "?????????????????????????????????????????? Postgresql ??????????????????????????????????????????????????????"
@@ -1163,151 +1164,151 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "Web ????????????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "Windows ????????????????????????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ????????????????????????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X Window System"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????????????????"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "??????????????????????????????"
 
@@ -1321,67 +1322,67 @@ msgid "Haskell Development"
 msgstr "Haskell ??????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "??????????????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "??????????????? (?????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ??????"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "??????????????????????????????"
 
@@ -1397,115 +1398,117 @@ msgstr "????????????????????????????????
 msgid "Chichewa Support"
 msgstr "???????????????????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "???????????????????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "?????????????????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "????????????????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW ????????????????????????"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ????????????????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1514,7 +1517,7 @@ msgstr ""
 "??????????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1523,17 +1526,17 @@ msgstr ""
 "????????????"
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1542,12 +1545,12 @@ msgstr ""
 "???????????????????????????"
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "?????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "?????????????????????????????????"
 
@@ -1562,8 +1565,8 @@ msgid ""
 "A set of packages that provide the shared platform for Critical Path "
 "functionality on all Fedora spins"
 msgstr ""
-"????????? Fedora ????????????????????? Critical Path ????????????????????????????????????????????? "
-"?????????????????????????????????????????????"
+"????????? Fedora ????????????????????? Critical Path ????????????????????????????????????????????? ???"
+"??????????????????????????????????????????"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
@@ -1573,51 +1576,59 @@ msgstr "???????????????"
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ???????????????????????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "Critical Path (??????)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "Critical Path (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "??????????????????????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
 msgstr ""
-"LXDE ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? "
-"????????????????????????????????????????????????????????? X11 ?????????????????????????????????"
+"LXDE ????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+"??????????????? ????????????????????????????????????????????????????????? X11 ?????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "?????????????????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Moblin ????????????????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "Moblin ??? NetBook/NetTop/MID ????????????????????????????????????????????????????????????"
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "???????????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "??????????????????????????????????????????????????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "???????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1625,7 +1636,7 @@ msgstr ""
 "GNOME?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1633,7 +1644,7 @@ msgstr ""
 "KDE?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1641,11 +1652,11 @@ msgstr ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "????????????????????????????????????????????? Emacs ??? Vi ????????????????????????"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "XEmacs ?????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1653,27 +1664,27 @@ msgstr ""
 "??????????????????????????????????????????DocBook ??????????????????????????????????????? HTML???PDF???"
 "Postscript??????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???????????????????????????????????????????????????????????????????????????????????????"
 



From petersen at fedoraproject.org  Tue Dec  8 01:00:14 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  8 Dec 2009 01:00:14 +0000 (UTC)
Subject: rpms/ghc-rpm-macros/F-11 ghc-rpm-macros.ghc, 1.2,
	1.3 ghc-rpm-macros.spec, 1.2, 1.3
Message-ID: <20091208010014.1B8F511C03F6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-rpm-macros/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2691

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
backport %ghc_pkg_ver for generating ghc pkg requires version deps


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-11/ghc-rpm-macros.ghc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-rpm-macros.ghc	12 Jun 2009 00:19:49 -0000	1.2
+++ ghc-rpm-macros.ghc	8 Dec 2009 01:00:13 -0000	1.3
@@ -36,3 +36,5 @@ echo '%{ghcdocdir}' >> %1-doc.files \
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
 %ghc_version %(ghc --numeric-version)
+
+%ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-11/ghc-rpm-macros.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-rpm-macros.spec	12 Jun 2009 00:19:49 -0000	1.2
+++ ghc-rpm-macros.spec	8 Dec 2009 01:00:13 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.2
+Version:	0.2.5
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.5-1
+- make ghc_pkg_ver only return pkg version
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.4-1
+- change GHCRequires to ghc_pkg_ver
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.3-1
+- use the latest installed pkg version for %%GHCRequires
+
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.2-1
+- add %%GHCRequires for automatically versioned library deps
+
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1-2
+- no, revert versioned ghcdocdir again!
+
+* Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1-1
+- version ghcdocdir to allow multiple doc versions like ghcpkgdir
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun  9 2009 Jens Petersen <petersen at redhat.com> - 0.2-1
 - drop version from ghcdocdir since it breaks haddock indexing
 



From transif at fedoraproject.org  Tue Dec  8 01:00:54 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  8 Dec 2009 01:00:54 +0000 (UTC)
Subject: comps/po zh_TW.po,1.26,1.27
Message-ID: <20091208010054.ED48011C02CA@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3081/po

Modified Files:
	zh_TW.po 
Log Message:
Sending translation for Chinese (Traditional)


Index: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- zh_TW.po	31 Aug 2009 01:16:38 -0000	1.26
+++ zh_TW.po	8 Dec 2009 01:00:54 -0000	1.27
@@ -6,10 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 19:35+0000\n"
-"PO-Revision-Date: 2009-08-31 11:16+1000\n"
+"POT-Creation-Date: 2009-12-07 19:27+0000\n"
+"PO-Revision-Date: 2009-12-08 10:59+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
-"Language-Team: Traditional Chinese <en at li.org>\n"
+"Language-Team: Traditional Chinese <zh at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -153,163 +153,163 @@ msgid "Clustering Support"
 msgstr "?????????Clustering?????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ???????????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ?????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Fedora ???????????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -318,19 +318,19 @@ msgstr ""
 "??????????????????"
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "GNOME ????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -339,168 +339,168 @@ msgstr ""
 "???????????????"
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "??????????????????????????? GTK+ ??? GNOME ?????????????????????"
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "??????????????????????????? GTK+ ??? XFCE ?????????????????????"
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "??????????????????????????? QT ??? KDE ?????????????????????"
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "???????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "???????????????????????????????????????????????????X?????????????????????"
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "????????? Eclipse ????????????????????????"
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "Java"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "Java ????????????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE ????????????"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE ????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -509,142 +509,142 @@ msgstr ""
 "????????????"
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "??????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ?????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "???????????????"
 
@@ -654,37 +654,37 @@ msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "????????????/???????????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????? bitmap ?????????????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -692,55 +692,55 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ?????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "Ruby"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "????????????"
 
@@ -754,73 +754,73 @@ msgstr "SUGAR ????????? OLPC XO ????????
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -830,127 +830,127 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "Java ????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "?????????????????????????????????????????????PDF ??????????????????"
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????????????????????????????? IMAP ??? SMTP ??????????????????"
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??????????????????????????? X ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??????????????????????????????????????????????????? DHCP, Kerberos ??? NIS???"
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -958,19 +958,19 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "??????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -978,7 +978,7 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -988,19 +988,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????????????????????????????????????????? FTP ????????????"
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1008,19 +1008,19 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "???????????????????????? Red Hat ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1028,13 +1028,13 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1042,13 +1042,13 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1058,7 +1058,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1066,19 +1066,19 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1088,13 +1088,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "???????????????????????????????????????????????? DNS ??????????????????BIND??????"
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1102,163 +1102,163 @@ msgstr "????????????????????????????????
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????????????????????????????????????????? MySQL ????????????"
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????????????????????????????????????????? Postgresql ????????????"
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "?????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "Windows ???????????????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ????????????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X Window ??????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ????????????"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "???????????????"
 
@@ -1272,67 +1272,67 @@ msgid "Haskell Development"
 msgstr "Haskell ??????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "?????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "?????????????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "??????????????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ??????"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "???????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "Haskell ????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ????????????????????????????????????"
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "??????????????????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "?????????????????????"
 
@@ -1348,151 +1348,153 @@ msgstr "?????????????????????"
 msgid "Chichewa Support"
 msgstr "??????????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "??????????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "???????????????????????????????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "Electronic Lab?????????????????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "????????????????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "?????????????????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "??????????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "??????????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "????????????????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
-msgstr "????????????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW cross-compiler"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
 msgstr "????????? Feodra ?????? 32 ?????? Windows ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "???????????? Objective CAML ??????????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "?????????????????????"
 
@@ -1516,65 +1518,71 @@ msgstr "???????????????"
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ???????????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "?????????Critical Path??????Base???"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "?????????GNOME???"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "???????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "Haskell"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
-msgstr "LXDE ?????????????????????????????????????????????????????????????????????????????????????????????????????? X11 ???????????????"
+msgstr ""
+"LXDE ?????????????????????????????????????????????????????????????????????????????????????????????????????? "
+"X11 ???????????????"
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "???????????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "Moblin ????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
-msgstr "Moblin ?????????????????????/NetTop/MID ?????????????????????????????????"
+msgstr "Moblin ????????? NetBook/NetTop/MID ?????????????????????????????????"
+
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "??????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "?????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
-msgstr "??????????????????"
+msgstr "????????????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME ???????????????????????????????????????????????????????????????????????????????????? ?????????????????????"
-"???????????????????????????????????????"
+msgstr "GNOME ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
-msgstr ""
-"KDE ???????????????????????????????????????????????????????????????????????????????????? ????????????????????????"
-"??????"
+msgstr "KDE ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1582,39 +1590,37 @@ msgstr ""
 "?????????????????????????????????????????????????????????????????????????????????????????????????????? Emacs "
 "??? Vi???"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "XEmacs ??????????????????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"?????????????????????????????? DocBook ?????????????????????????????? ?????????????????? HTML, PDF, "
-"Postscript ????????????"
+msgstr "??????????????????????????? DocBook ????????????????????????????????????????????? HTML???PDF???Postscript ????????????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "????????????????????????????????????????????????????????????"
+msgstr "????????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
-msgstr "?????????????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
-msgstr "?????????????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
-msgstr "???????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
-msgstr "??????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????"
 



From fabbione at fedoraproject.org  Tue Dec  8 01:01:37 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:01:37 +0000 (UTC)
Subject: rpms/rgmanager/devel .cvsignore, 1.18, 1.19 rgmanager.spec, 1.48,
	1.49 sources, 1.27, 1.28
Message-ID: <20091208010137.B5F0911C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3294

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	20 Nov 2009 12:00:53 -0000	1.18
+++ .cvsignore	8 Dec 2009 01:01:37 -0000	1.19
@@ -1 +1 @@
-rgmanager-3.0.5.tar.gz
+rgmanager-3.0.6.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- rgmanager.spec	20 Nov 2009 12:00:53 -0000	1.48
+++ rgmanager.spec	8 Dec 2009 01:01:37 -0000	1.49
@@ -10,20 +10,17 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 Name: rgmanager
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/rgmanager-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## runtime
 
@@ -42,7 +39,7 @@ BuildRequires: clusterlib-devel >= 3.0.0
 BuildRequires: libxml2-devel ncurses-devel slang-devel
 
 %prep
-%setup -q -n rgmanager-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 %build
 ./configure \
@@ -87,6 +84,13 @@ fi
 %{_mandir}/man8/clu*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release
+- spec file cleanup:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	20 Nov 2009 12:00:53 -0000	1.27
+++ sources	8 Dec 2009 01:01:37 -0000	1.28
@@ -1 +1 @@
-f50bebab00f6b0aa6a63ec2ea7f236e5  rgmanager-3.0.5.tar.gz
+a7e78b9f8e41c7d50c03e04dffcda7a2  rgmanager-3.0.6.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 01:05:42 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:05:42 +0000 (UTC)
Subject: rpms/rgmanager/F-12 .cvsignore, 1.18, 1.19 rgmanager.spec, 1.48,
	1.49 sources, 1.27, 1.28
Message-ID: <20091208010542.10BFA11C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4800

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
New upstream release, many bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	23 Nov 2009 13:55:12 -0000	1.18
+++ .cvsignore	8 Dec 2009 01:05:41 -0000	1.19
@@ -1 +1 @@
-rgmanager-3.0.5.tar.gz
+rgmanager-3.0.6.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-12/rgmanager.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- rgmanager.spec	23 Nov 2009 13:55:12 -0000	1.48
+++ rgmanager.spec	8 Dec 2009 01:05:41 -0000	1.49
@@ -10,20 +10,17 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 Name: rgmanager
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/rgmanager-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## runtime
 
@@ -42,7 +39,7 @@ BuildRequires: clusterlib-devel >= 3.0.0
 BuildRequires: libxml2-devel ncurses-devel slang-devel
 
 %prep
-%setup -q -n rgmanager-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 %build
 ./configure \
@@ -87,6 +84,13 @@ fi
 %{_mandir}/man8/clu*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release
+- spec file cleanup:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	23 Nov 2009 13:55:12 -0000	1.27
+++ sources	8 Dec 2009 01:05:41 -0000	1.28
@@ -1 +1 @@
-f50bebab00f6b0aa6a63ec2ea7f236e5  rgmanager-3.0.5.tar.gz
+a7e78b9f8e41c7d50c03e04dffcda7a2  rgmanager-3.0.6.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 01:07:00 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:07:00 +0000 (UTC)
Subject: File resource-agents-3.0.6.tar.gz uploaded to lookaside cache by
	fabbione
Message-ID: <20091208010700.843F110F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for resource-agents:

12e059b8d7b1a05a161161bb9662b38b  resource-agents-3.0.6.tar.gz



From rlandmann at fedoraproject.org  Tue Dec  8 01:07:01 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Tue,  8 Dec 2009 01:07:01 +0000 (UTC)
Subject: File Publican-1.3.tar.gz uploaded to lookaside cache by rlandmann
Message-ID: <20091208010701.8B98210F87F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for publican:

3306dcc97650adf3eb0266145f8a679f  Publican-1.3.tar.gz



From rlandmann at fedoraproject.org  Tue Dec  8 01:08:31 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Tue,  8 Dec 2009 01:08:31 +0000 (UTC)
Subject: rpms/publican/devel .cvsignore, 1.14, 1.15 import.log, 1.3,
	1.4 publican.spec, 1.31, 1.32 sources, 1.15, 1.16
Message-ID: <20091208010831.C91A711C025D@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5805/devel

Modified Files:
	.cvsignore import.log publican.spec sources 
Log Message:
* Tue Dec 08 2009 Jeff Fearn <jfearn at redhat.com> 1.3-0
- Fixed --version BZ #533081
- Fixed empty params in new book cfg file. BZ #533322
- Fixed clean_ids taking too long.
- Added nowait option for brew.
- Improved epub support. BZ #536706
- Add missing rpm-build req. BZ #537970
- Changed ol ol style. BZ #537256
- Fix missing revision history field crash. BZ #539741
- Fix bug in condition logic in XmlClean. BZ #540685
- Add translation stats. BZ #540696
- Stopped processing xml files in extras dir. BZ #540383
- Fixed callout rendering. BZ #531686
- Fix wrong docs for condition usage. BZ #540691
- Remove list style from stepalternatives. BZ #511404
- Force step::para to keep-with-next if followed by a figure.
- Edited Conventions.xml.
- Exclude Legal_Notice.xml from pot creation.
- Fix nested XML breaking translations.
- Fix syntax highlighting adding whitespace. BZ #544141
- Better error message for Kate language mismatch.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	4 Nov 2009 05:09:11 -0000	1.14
+++ .cvsignore	8 Dec 2009 01:08:31 -0000	1.15
@@ -1 +1 @@
-Publican-1.2.tar.gz
+Publican-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Nov 2009 05:09:11 -0000	1.3
+++ import.log	8 Dec 2009 01:08:31 -0000	1.4
@@ -1,3 +1,4 @@
 publican-1_0-0_fc11:HEAD:publican-1.0-0.fc11.src.rpm:1257031816
 publican-1_1-0_fc11:HEAD:publican-1.1-0.fc11.src.rpm:1257134206
 publican-1_2-0_fc11:HEAD:publican-1.2-0.fc11.src.rpm:1257311243
+publican-1_3-0_fc12:HEAD:publican-1.3-0.fc12.src.rpm:1260234376


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- publican.spec	7 Dec 2009 02:33:52 -0000	1.31
+++ publican.spec	8 Dec 2009 01:08:31 -0000	1.32
@@ -1,9 +1,8 @@
 
 # Track font name changes
-%define RHEL5 %(test "%{?dist}" == ".el5"  && echo 1 || echo 0)
-%define FC10  %(test "%{?dist}" == ".fc10" && echo 1 || echo 0)
-# Assume not rhel and not FC10 means FC11+
-%define OTHER %(test "%{RHEL5}" == "0" -a "%{FC10}" == "0" && echo 1 || echo 0)
+%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0)
+# Assume not rhel means FC11+
+%define OTHER %(test "%{RHEL5}" == "0" && echo 1 || echo 0)
 
 # who doesn't have xdg-open?
 %define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0)
@@ -11,16 +10,15 @@
 # required for desktop file install
 %define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora")
 
-# TODO after beta revert to lower case name
 Name:           publican
-Version:        1.2
-Release:        1%{?dist}
+Version:        1.3
+Release:        0%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
 License:        (GPLv2+ or Artistic) and CC0
 Group:          Applications/Publishing
 URL:            https://publican.fedorahosted.org
-Source0:        https://fedorahosted.org/releases/publican/Publican-%{version}.tar.gz
+Source0:        https://fedorahosted.org/released/publican/Publican-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,6 +29,7 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::Perl::Critic)
 BuildRequires:  perl(Archive::Tar)
+BuildRequires:  perl(Archive::Zip)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Config::Simple)
 BuildRequires:  perl(Cwd)
@@ -68,7 +67,7 @@ BuildRequires:  desktop-file-utils
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Locale::Maketext::Gettext)
 Requires:       fop >= 0.90
-Requires:       batik
+Requires:       batik rpm-build
 Requires:       docbook-style-xsl >= 1.75.1
 Requires:       perl(XML::LibXML)  >=  1.67
 Requires:       perl(XML::LibXSLT) >=  1.67
@@ -84,17 +83,7 @@ BuildRequires:  fonts-bengali fonts-chin
 BuildRequires:  fonts-hindi fonts-japanese fonts-kannada fonts-korean
 BuildRequires:  fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
 BuildRequires:  fonts-tamil fonts-telugu liberation-fonts
-%endif
-%if %{FC10}
-Requires:       lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
-Requires:       lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
-Requires:       lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:       lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
-
-BuildRequires:  lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
-BuildRequires:  lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
-BuildRequires:  lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:  lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
+#BuildRequires:  java-1.5.0-sun java-1.5.0-sun-devel chkconfig
 %endif
 %if %{OTHER}
 Requires:       liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
@@ -118,7 +107,7 @@ BuildRequires:  lklug-fonts baekmuk-ttf-
 #BuildRequires:  lohit-fonts-tamil lohit-fonts-telugu
 %endif
 
-Obsoletes:        Publican < 1.0
+Obsoletes:      Publican < 1.0
 
 %description
 Publican is a DocBook publication system, not just a DocBook processing tool.
@@ -133,7 +122,7 @@ Requires:       htmlview
 %else
 Requires:       xdg-utils
 %endif
-Obsoletes:        Publican-doc < 1.0
+Obsoletes:      Publican-doc < 1.0
 
 %description doc
 Publican is a tool for publishing material authored in DocBook XML.
@@ -170,6 +159,8 @@ sed -i -e 's|xdg-open|htmlview|' %{name}
 desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 %check
+#alternatives --auto java
+#alternatives --auto javac
 #./Build test
 
 %clean
@@ -177,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README COPYING Artistic
+%doc CHANGES README COPYING Artistic
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 %{_mandir}/man1/*
@@ -191,15 +182,34 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
-* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.2-1
-- rebuild against perl 5.10.1
+* Tue Dec 08 2009 Jeff Fearn <jfearn at redhat.com> 1.3-0
+- Fixed --version BZ #533081
+- Fixed empty params in new book cfg file. BZ #533322
+- Fixed clean_ids taking too long.
+- Added nowait option for brew.
+- Improved epub support. BZ #536706
+- Add missing rpm-build req. BZ #537970
+- Changed ol ol style. BZ #537256
+- Fix missing revision history field crash. BZ #539741
+- Fix bug in condition logic in XmlClean. BZ #540685
+- Add translation stats. BZ #540696
+- Stopped processing xml files in extras dir. BZ #540383
+- Fixed callout rendering. BZ #531686
+- Fix wrong docs for condition usage. BZ #540691
+- Remove list style from stepalternatives. BZ #511404
+- Force step::para to keep-with-next if followed by a figure.
+- Edited Conventions.xml.
+- Exclude Legal_Notice.xml from pot creation.
+- Fix nested XML breaking translations.
+- Fix syntax highlighting adding whitespace. BZ #544141
+- Better error message for Kate language mismatch.
 
 * Wed Nov 4 2009 Jeff Fearn <jfearn at redhat.com> 1.2-0
 - Fix images missing from distributed set output. BZ #532837
 - Correct image path when running clean_ids.
 - Fix typo in format description. BZ #532379
 - Add comment to clean.
-- force package to run clean to avoid stale content.
+- force package to run clean to avoid stale content. BZ #538676
 
 * Mon Nov 2 2009 Jeff Fearn <jfearn at redhat.com> 1.1-0
 - Fix brew failure. BZ #532383


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	4 Nov 2009 05:09:11 -0000	1.15
+++ sources	8 Dec 2009 01:08:31 -0000	1.16
@@ -1 +1 @@
-8bc5739ff2d97af9d4a50968929983b3  Publican-1.2.tar.gz
+3306dcc97650adf3eb0266145f8a679f  Publican-1.3.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 01:11:59 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:11:59 +0000 (UTC)
Subject: rpms/resource-agents/devel .cvsignore, 1.19,
	1.20 resource-agents.spec, 1.21, 1.22 sources, 1.19, 1.20
Message-ID: <20091208011159.1FB1E11C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7040

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New upstream releases



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	20 Nov 2009 12:14:07 -0000	1.19
+++ .cvsignore	8 Dec 2009 01:11:58 -0000	1.20
@@ -1,2 +1,2 @@
-e2338892f59f.tar.bz2
-resource-agents-3.0.5.tar.gz
+bc00c0b065d9.tar.bz2
+resource-agents-3.0.6.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- resource-agents.spec	7 Dec 2009 08:32:54 -0000	1.21
+++ resource-agents.spec	8 Dec 2009 01:11:58 -0000	1.22
@@ -10,26 +10,23 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 # When downloading directly from Mercurial, it will automatically add this prefix
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
-%define altprefix Cluster-Resource-Agents-
-%define altversion bc00c0b065d9
+%global altprefix Cluster-Resource-Agents-
+%global altversion bc00c0b065d9
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.5
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.6
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/resource-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
@@ -37,13 +34,12 @@ Requires: bash grep sed gawk
 Requires: net-tools mount e2fsprogs
 
 ## Setup/build bits
-BuildRequires: libxslt docbook-style-xsl
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
+BuildRequires: libxslt docbook-style-xsl
 
 %description
 A set of scripts to interface with several services to operate in a
@@ -78,7 +74,7 @@ and works with the heartbeat code (http:
 # building from source directly without those parameters will NOT work.
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %prep
-%setup -q -n resource-agents-%{version}%{?alphatag:.%{alphatag}} -a 1
+%setup -q -n %{name}-%{version} -a 1
 
 # prepare rgmanager RAs
 %{_configure} \
@@ -165,6 +161,13 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Dec 7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New rgmanager resource agents upstream release
+- spec file update:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+
 * Mon Dec 7 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.5-2
 - Update Pacameker agents to upstream version: bc00c0b065d9
   + High: RA: introduce OCF_FUNCTIONS_DIR, allow it to be overridden (LF2239)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	20 Nov 2009 12:14:07 -0000	1.19
+++ sources	8 Dec 2009 01:11:58 -0000	1.20
@@ -1,2 +1,2 @@
-f93e29ce8b480de2f841ca6266bfd864  e2338892f59f.tar.bz2
-a7577975345b865dc73ec0b1c0bd24f7  resource-agents-3.0.5.tar.gz
+8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2
+12e059b8d7b1a05a161161bb9662b38b  resource-agents-3.0.6.tar.gz



From whot at fedoraproject.org  Tue Dec  8 01:16:10 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  8 Dec 2009 01:16:10 +0000 (UTC)
Subject: File xorg-server-1.7.3.tar.bz2 uploaded to lookaside cache by whot
Message-ID: <20091208011610.A30B810F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xorg-x11-server:

4c63b22cad9ed8ae8b86561f0f92c327  xorg-server-1.7.3.tar.bz2



From rlandmann at fedoraproject.org  Tue Dec  8 01:17:56 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Tue,  8 Dec 2009 01:17:56 +0000 (UTC)
Subject: rpms/publican/F-12 .cvsignore, 1.14, 1.15 import.log, 1.3,
	1.4 publican.spec, 1.30, 1.31 sources, 1.15, 1.16
Message-ID: <20091208011756.A5BCC11C025D@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/publican/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9386/F-12

Modified Files:
	.cvsignore import.log publican.spec sources 
Log Message:
* Tue Dec 08 2009 Jeff Fearn <jfearn at redhat.com> 1.3-0
- Fixed --version BZ #533081
- Fixed empty params in new book cfg file. BZ #533322
- Fixed clean_ids taking too long.
- Added nowait option for brew.
- Improved epub support. BZ #536706
- Add missing rpm-build req. BZ #537970
- Changed ol ol style. BZ #537256
- Fix missing revision history field crash. BZ #539741
- Fix bug in condition logic in XmlClean. BZ #540685
- Add translation stats. BZ #540696
- Stopped processing xml files in extras dir. BZ #540383
- Fixed callout rendering. BZ #531686
- Fix wrong docs for condition usage. BZ #540691
- Remove list style from stepalternatives. BZ #511404
- Force step::para to keep-with-next if followed by a figure.
- Edited Conventions.xml.
- Exclude Legal_Notice.xml from pot creation.
- Fix nested XML breaking translations.
- Fix syntax highlighting adding whitespace. BZ #544141
- Better error message for Kate language mismatch.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	4 Nov 2009 05:24:02 -0000	1.14
+++ .cvsignore	8 Dec 2009 01:17:56 -0000	1.15
@@ -1 +1 @@
-Publican-1.2.tar.gz
+Publican-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Nov 2009 05:24:02 -0000	1.3
+++ import.log	8 Dec 2009 01:17:56 -0000	1.4
@@ -1,3 +1,4 @@
 publican-1_0-0_fc11:F-12:publican-1.0-0.fc11.src.rpm:1257047363
 publican-1_1-0_fc11:F-12:publican-1.1-0.fc11.src.rpm:1257134462
 publican-1_2-0_fc11:F-12:publican-1.2-0.fc11.src.rpm:1257311998
+publican-1_3-0_fc12:F-12:publican-1.3-0.fc12.src.rpm:1260234966


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-12/publican.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- publican.spec	4 Nov 2009 05:24:02 -0000	1.30
+++ publican.spec	8 Dec 2009 01:17:56 -0000	1.31
@@ -1,9 +1,8 @@
 
 # Track font name changes
-%define RHEL5 %(test "%{?dist}" == ".el5"  && echo 1 || echo 0)
-%define FC10  %(test "%{?dist}" == ".fc10" && echo 1 || echo 0)
-# Assume not rhel and not FC10 means FC11+
-%define OTHER %(test "%{RHEL5}" == "0" -a "%{FC10}" == "0" && echo 1 || echo 0)
+%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0)
+# Assume not rhel means FC11+
+%define OTHER %(test "%{RHEL5}" == "0" && echo 1 || echo 0)
 
 # who doesn't have xdg-open?
 %define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0)
@@ -11,16 +10,15 @@
 # required for desktop file install
 %define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora")
 
-# TODO after beta revert to lower case name
 Name:           publican
-Version:        1.2
+Version:        1.3
 Release:        0%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
 License:        (GPLv2+ or Artistic) and CC0
 Group:          Applications/Publishing
 URL:            https://publican.fedorahosted.org
-Source0:        https://fedorahosted.org/releases/publican/Publican-%{version}.tar.gz
+Source0:        https://fedorahosted.org/released/publican/Publican-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,6 +29,7 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::Perl::Critic)
 BuildRequires:  perl(Archive::Tar)
+BuildRequires:  perl(Archive::Zip)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Config::Simple)
 BuildRequires:  perl(Cwd)
@@ -68,7 +67,7 @@ BuildRequires:  desktop-file-utils
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Locale::Maketext::Gettext)
 Requires:       fop >= 0.90
-Requires:       batik
+Requires:       batik rpm-build
 Requires:       docbook-style-xsl >= 1.75.1
 Requires:       perl(XML::LibXML)  >=  1.67
 Requires:       perl(XML::LibXSLT) >=  1.67
@@ -84,17 +83,7 @@ BuildRequires:  fonts-bengali fonts-chin
 BuildRequires:  fonts-hindi fonts-japanese fonts-kannada fonts-korean
 BuildRequires:  fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
 BuildRequires:  fonts-tamil fonts-telugu liberation-fonts
-%endif
-%if %{FC10}
-Requires:       lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
-Requires:       lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
-Requires:       lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:       lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
-
-BuildRequires:  lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
-BuildRequires:  lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
-BuildRequires:  lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:  lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
+#BuildRequires:  java-1.5.0-sun java-1.5.0-sun-devel chkconfig
 %endif
 %if %{OTHER}
 Requires:       liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
@@ -118,7 +107,7 @@ BuildRequires:  lklug-fonts baekmuk-ttf-
 #BuildRequires:  lohit-fonts-tamil lohit-fonts-telugu
 %endif
 
-Obsoletes:        Publican < 1.0
+Obsoletes:      Publican < 1.0
 
 %description
 Publican is a DocBook publication system, not just a DocBook processing tool.
@@ -133,7 +122,7 @@ Requires:       htmlview
 %else
 Requires:       xdg-utils
 %endif
-Obsoletes:        Publican-doc < 1.0
+Obsoletes:      Publican-doc < 1.0
 
 %description doc
 Publican is a tool for publishing material authored in DocBook XML.
@@ -170,6 +159,8 @@ sed -i -e 's|xdg-open|htmlview|' %{name}
 desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 %check
+#alternatives --auto java
+#alternatives --auto javac
 #./Build test
 
 %clean
@@ -177,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README COPYING Artistic
+%doc CHANGES README COPYING Artistic
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 %{_mandir}/man1/*
@@ -191,12 +182,34 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Tue Dec 08 2009 Jeff Fearn <jfearn at redhat.com> 1.3-0
+- Fixed --version BZ #533081
+- Fixed empty params in new book cfg file. BZ #533322
+- Fixed clean_ids taking too long.
+- Added nowait option for brew.
+- Improved epub support. BZ #536706
+- Add missing rpm-build req. BZ #537970
+- Changed ol ol style. BZ #537256
+- Fix missing revision history field crash. BZ #539741
+- Fix bug in condition logic in XmlClean. BZ #540685
+- Add translation stats. BZ #540696
+- Stopped processing xml files in extras dir. BZ #540383
+- Fixed callout rendering. BZ #531686
+- Fix wrong docs for condition usage. BZ #540691
+- Remove list style from stepalternatives. BZ #511404
+- Force step::para to keep-with-next if followed by a figure.
+- Edited Conventions.xml.
+- Exclude Legal_Notice.xml from pot creation.
+- Fix nested XML breaking translations.
+- Fix syntax highlighting adding whitespace. BZ #544141
+- Better error message for Kate language mismatch.
+
 * Wed Nov 4 2009 Jeff Fearn <jfearn at redhat.com> 1.2-0
 - Fix images missing from distributed set output. BZ #532837
 - Correct image path when running clean_ids.
 - Fix typo in format description. BZ #532379
 - Add comment to clean.
-- force package to run clean to avoid stale content.
+- force package to run clean to avoid stale content. BZ #538676
 
 * Mon Nov 2 2009 Jeff Fearn <jfearn at redhat.com> 1.1-0
 - Fix brew failure. BZ #532383


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	4 Nov 2009 05:24:02 -0000	1.15
+++ sources	8 Dec 2009 01:17:56 -0000	1.16
@@ -1 +1 @@
-8bc5739ff2d97af9d4a50968929983b3  Publican-1.2.tar.gz
+3306dcc97650adf3eb0266145f8a679f  Publican-1.3.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 01:18:55 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:18:55 +0000 (UTC)
Subject: rpms/resource-agents/F-12 .cvsignore, 1.20,
	1.21 resource-agents.spec, 1.22, 1.23 sources, 1.20, 1.21
Message-ID: <20091208011855.5CE8F11C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/resource-agents/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9769

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New upstream release, many bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	7 Dec 2009 08:29:30 -0000	1.20
+++ .cvsignore	8 Dec 2009 01:18:55 -0000	1.21
@@ -1,2 +1,2 @@
 bc00c0b065d9.tar.bz2
-resource-agents-3.0.5.tar.gz
+resource-agents-3.0.6.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/resource-agents.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- resource-agents.spec	7 Dec 2009 08:29:30 -0000	1.22
+++ resource-agents.spec	8 Dec 2009 01:18:55 -0000	1.23
@@ -10,26 +10,23 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 # When downloading directly from Mercurial, it will automatically add this prefix
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
-%define altprefix Cluster-Resource-Agents-
-%define altversion bc00c0b065d9
+%global altprefix Cluster-Resource-Agents-
+%global altversion bc00c0b065d9
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.5
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.6
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/resource-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
@@ -37,13 +34,12 @@ Requires: bash grep sed gawk
 Requires: net-tools mount e2fsprogs
 
 ## Setup/build bits
-BuildRequires: libxslt docbook-style-xsl
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
+BuildRequires: libxslt docbook-style-xsl
 
 %description
 A set of scripts to interface with several services to operate in a
@@ -78,7 +74,7 @@ and works with the heartbeat code (http:
 # building from source directly without those parameters will NOT work.
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %prep
-%setup -q -n resource-agents-%{version}%{?alphatag:.%{alphatag}} -a 1
+%setup -q -n %{name}-%{version} -a 1
 
 # prepare rgmanager RAs
 %{_configure} \
@@ -160,6 +156,13 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Dec 7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New rgmanager resource agents upstream release
+- spec file update:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+
 * Mon Dec 7 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.5-2
 - Update Pacameker agents to upstream version: bc00c0b065d9
   + High: RA: introduce OCF_FUNCTIONS_DIR, allow it to be overridden (LF2239)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	7 Dec 2009 08:29:30 -0000	1.20
+++ sources	8 Dec 2009 01:18:55 -0000	1.21
@@ -1,2 +1,2 @@
 8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2
-a7577975345b865dc73ec0b1c0bd24f7  resource-agents-3.0.5.tar.gz
+12e059b8d7b1a05a161161bb9662b38b  resource-agents-3.0.6.tar.gz



From rlandmann at fedoraproject.org  Tue Dec  8 01:21:30 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Tue,  8 Dec 2009 01:21:30 +0000 (UTC)
Subject: rpms/publican/F-11 .cvsignore, 1.13, 1.14 import.log, 1.2,
	1.3 publican.spec, 1.27, 1.28 sources, 1.14, 1.15
Message-ID: <20091208012130.ED8E511C025D@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/publican/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10705/F-11

Modified Files:
	.cvsignore import.log publican.spec sources 
Log Message:
* Tue Dec 08 2009 Jeff Fearn <jfearn at redhat.com> 1.3-0
- Fixed --version BZ #533081
- Fixed empty params in new book cfg file. BZ #533322
- Fixed clean_ids taking too long.
- Added nowait option for brew.
- Improved epub support. BZ #536706
- Add missing rpm-build req. BZ #537970
- Changed ol ol style. BZ #537256
- Fix missing revision history field crash. BZ #539741
- Fix bug in condition logic in XmlClean. BZ #540685
- Add translation stats. BZ #540696
- Stopped processing xml files in extras dir. BZ #540383
- Fixed callout rendering. BZ #531686
- Fix wrong docs for condition usage. BZ #540691
- Remove list style from stepalternatives. BZ #511404
- Force step::para to keep-with-next if followed by a figure.
- Edited Conventions.xml.
- Exclude Legal_Notice.xml from pot creation.
- Fix nested XML breaking translations.
- Fix syntax highlighting adding whitespace. BZ #544141
- Better error message for Kate language mismatch.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Nov 2009 05:24:12 -0000	1.13
+++ .cvsignore	8 Dec 2009 01:21:30 -0000	1.14
@@ -1 +1 @@
-Publican-1.2.tar.gz
+Publican-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Nov 2009 05:24:12 -0000	1.2
+++ import.log	8 Dec 2009 01:21:30 -0000	1.3
@@ -1,2 +1,3 @@
 publican-1_1-0_fc11:F-11:publican-1.1-0.fc11.src.rpm:1257190938
 publican-1_2-0_fc11:F-11:publican-1.2-0.fc11.src.rpm:1257312088
+publican-1_3-0_fc12:F-11:publican-1.3-0.fc12.src.rpm:1260235184


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-11/publican.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- publican.spec	4 Nov 2009 05:24:12 -0000	1.27
+++ publican.spec	8 Dec 2009 01:21:30 -0000	1.28
@@ -1,9 +1,8 @@
 
 # Track font name changes
-%define RHEL5 %(test "%{?dist}" == ".el5"  && echo 1 || echo 0)
-%define FC10  %(test "%{?dist}" == ".fc10" && echo 1 || echo 0)
-# Assume not rhel and not FC10 means FC11+
-%define OTHER %(test "%{RHEL5}" == "0" -a "%{FC10}" == "0" && echo 1 || echo 0)
+%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0)
+# Assume not rhel means FC11+
+%define OTHER %(test "%{RHEL5}" == "0" && echo 1 || echo 0)
 
 # who doesn't have xdg-open?
 %define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0)
@@ -11,16 +10,15 @@
 # required for desktop file install
 %define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora")
 
-# TODO after beta revert to lower case name
 Name:           publican
-Version:        1.2
+Version:        1.3
 Release:        0%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
 License:        (GPLv2+ or Artistic) and CC0
 Group:          Applications/Publishing
 URL:            https://publican.fedorahosted.org
-Source0:        https://fedorahosted.org/releases/publican/Publican-%{version}.tar.gz
+Source0:        https://fedorahosted.org/released/publican/Publican-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,6 +29,7 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::Perl::Critic)
 BuildRequires:  perl(Archive::Tar)
+BuildRequires:  perl(Archive::Zip)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Config::Simple)
 BuildRequires:  perl(Cwd)
@@ -68,7 +67,7 @@ BuildRequires:  desktop-file-utils
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Locale::Maketext::Gettext)
 Requires:       fop >= 0.90
-Requires:       batik
+Requires:       batik rpm-build
 Requires:       docbook-style-xsl >= 1.75.1
 Requires:       perl(XML::LibXML)  >=  1.67
 Requires:       perl(XML::LibXSLT) >=  1.67
@@ -84,17 +83,7 @@ BuildRequires:  fonts-bengali fonts-chin
 BuildRequires:  fonts-hindi fonts-japanese fonts-kannada fonts-korean
 BuildRequires:  fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
 BuildRequires:  fonts-tamil fonts-telugu liberation-fonts
-%endif
-%if %{FC10}
-Requires:       lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
-Requires:       lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
-Requires:       lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:       lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
-
-BuildRequires:  lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
-BuildRequires:  lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
-BuildRequires:  lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:  lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
+#BuildRequires:  java-1.5.0-sun java-1.5.0-sun-devel chkconfig
 %endif
 %if %{OTHER}
 Requires:       liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
@@ -118,7 +107,7 @@ BuildRequires:  lklug-fonts baekmuk-ttf-
 #BuildRequires:  lohit-fonts-tamil lohit-fonts-telugu
 %endif
 
-Obsoletes:        Publican < 1.0
+Obsoletes:      Publican < 1.0
 
 %description
 Publican is a DocBook publication system, not just a DocBook processing tool.
@@ -133,7 +122,7 @@ Requires:       htmlview
 %else
 Requires:       xdg-utils
 %endif
-Obsoletes:        Publican-doc < 1.0
+Obsoletes:      Publican-doc < 1.0
 
 %description doc
 Publican is a tool for publishing material authored in DocBook XML.
@@ -170,6 +159,8 @@ sed -i -e 's|xdg-open|htmlview|' %{name}
 desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 %check
+#alternatives --auto java
+#alternatives --auto javac
 #./Build test
 
 %clean
@@ -177,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README COPYING Artistic
+%doc CHANGES README COPYING Artistic
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 %{_mandir}/man1/*
@@ -191,12 +182,34 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Tue Dec 08 2009 Jeff Fearn <jfearn at redhat.com> 1.3-0
+- Fixed --version BZ #533081
+- Fixed empty params in new book cfg file. BZ #533322
+- Fixed clean_ids taking too long.
+- Added nowait option for brew.
+- Improved epub support. BZ #536706
+- Add missing rpm-build req. BZ #537970
+- Changed ol ol style. BZ #537256
+- Fix missing revision history field crash. BZ #539741
+- Fix bug in condition logic in XmlClean. BZ #540685
+- Add translation stats. BZ #540696
+- Stopped processing xml files in extras dir. BZ #540383
+- Fixed callout rendering. BZ #531686
+- Fix wrong docs for condition usage. BZ #540691
+- Remove list style from stepalternatives. BZ #511404
+- Force step::para to keep-with-next if followed by a figure.
+- Edited Conventions.xml.
+- Exclude Legal_Notice.xml from pot creation.
+- Fix nested XML breaking translations.
+- Fix syntax highlighting adding whitespace. BZ #544141
+- Better error message for Kate language mismatch.
+
 * Wed Nov 4 2009 Jeff Fearn <jfearn at redhat.com> 1.2-0
 - Fix images missing from distributed set output. BZ #532837
 - Correct image path when running clean_ids.
 - Fix typo in format description. BZ #532379
 - Add comment to clean.
-- force package to run clean to avoid stale content.
+- force package to run clean to avoid stale content. BZ #538676
 
 * Mon Nov 2 2009 Jeff Fearn <jfearn at redhat.com> 1.1-0
 - Fix brew failure. BZ #532383


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Nov 2009 05:24:12 -0000	1.14
+++ sources	8 Dec 2009 01:21:30 -0000	1.15
@@ -1 +1 @@
-8bc5739ff2d97af9d4a50968929983b3  Publican-1.2.tar.gz
+3306dcc97650adf3eb0266145f8a679f  Publican-1.3.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 01:38:53 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:38:53 +0000 (UTC)
Subject: rpms/corosync/devel corosync.spec,1.37,1.38
Message-ID: <20091208013853.279C711C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16288

Modified Files:
	corosync.spec 
Log Message:
New upstream release



Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- corosync.spec	23 Oct 2009 06:13:15 -0000	1.37
+++ corosync.spec	8 Dec 2009 01:38:52 -0000	1.38
@@ -1,13 +1,13 @@
-# define alphatag svn1211
+# global alphatag svn1211
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.2
+Version: 1.2.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
-Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
+Source0: http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -16,8 +16,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
+# Build bits
+
 %define buildtrunk 0
-%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -29,7 +30,7 @@ BuildRequires: libibverbs-devel librdmac
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n corosync-%{version}
+%setup -q -n %{name}-%{version}
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -41,7 +42,8 @@ export rdmacm_CFLAGS=-I/usr/include/rdma
 export rdmacm_LIBS=-lrdmacm \
 %{configure} \
 	--enable-nss \
-	--enable-rdma
+	--enable-rdma \
+	--with-initddir=%{_initddir}
 
 %build
 make %{_smp_mflags}
@@ -50,8 +52,6 @@ make %{_smp_mflags}
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
-install -d %{buildroot}%{_initddir}
-install -m 755 init/redhat %{buildroot}%{_initddir}/corosync
 
 ## tree fixup
 # drop static libs
@@ -62,7 +62,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 rm -rf %{buildroot}
 
-%description 
+%description
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
@@ -75,10 +75,7 @@ if [ $1 -eq 0 ]; then
 	/sbin/chkconfig --del corosync || :
 fi
 
-%postun
-[ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || :
-
-%files 
+%files
 %defattr(-,root,root,-)
 %doc LICENSE SECURITY
 %{_sbindir}/corosync
@@ -90,6 +87,7 @@ fi
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %dir %{_sysconfdir}/corosync
+%dir %{_sysconfdir}/corosync/service.d
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %{_initddir}/corosync
@@ -113,7 +111,7 @@ fi
 %package -n corosynclib
 Summary: The Corosync Cluster Engine Libraries
 Group: System Environment/Libraries
-Conflicts: corosync < 0.92-7
+Requires: %{name} = %{version}-%{release}
 
 %description -n corosynclib
 This package contains corosync libraries.
@@ -132,6 +130,7 @@ This package contains corosync libraries
 %{_libdir}/libquorum.so.*
 %{_libdir}/libvotequorum.so.*
 %{_libdir}/libpload.so.*
+%{_libdir}/libsam.so.*
 
 %post -n corosynclib -p /sbin/ldconfig
 
@@ -166,6 +165,7 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/hdb.h
 %{_includedir}/corosync/list.h
 %{_includedir}/corosync/mar_gen.h
+%{_includedir}/corosync/sam.h
 %{_includedir}/corosync/swab.h
 %{_includedir}/corosync/quorum.h
 %{_includedir}/corosync/votequorum.h
@@ -195,19 +195,34 @@ The Corosync Cluster Engine APIs.
 %{_libdir}/libquorum.so
 %{_libdir}/libvotequorum.so
 %{_libdir}/libpload.so
+%{_libdir}/libsam.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/evs_*3*
 %{_mandir}/man3/confdb_*3*
 %{_mandir}/man3/votequorum_*3*
+%{_mandir}/man3/sam_*3*
 %{_mandir}/man8/cpg_overview.8*
 %{_mandir}/man8/evs_overview.8*
 %{_mandir}/man8/confdb_overview.8*
 %{_mandir}/man8/logsys_overview.8*
 %{_mandir}/man8/votequorum_overview.8*
 %{_mandir}/man8/coroipc_overview.8*
+%{_mandir}/man8/sam_overview.8*
 
 %changelog
+* Tue Dec  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.2.0-1
+- New upstream release
+- Use global instead of define
+- Update Source0 url
+- Use more %name macro around
+- Cleanup install section. Init script is now installed by upstream
+- Cleanup whitespace
+- Don't deadlock between package upgrade and corosync condrestart
+- Ship service.d config directory
+- Fix Conflicts vs Requires
+- Ship new sam library and man pages
+
 * Fri Oct 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.2-1
 - New upstream release fixes major regression on specific loads
 



From fabbione at fedoraproject.org  Tue Dec  8 01:39:27 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:39:27 +0000 (UTC)
Subject: File corosync-1.2.0.tar.gz uploaded to lookaside cache by fabbione
Message-ID: <20091208013927.74B6A10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for corosync:

789bea831a97977e56900477c3022cc1  corosync-1.2.0.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 01:40:25 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:40:25 +0000 (UTC)
Subject: rpms/corosync/devel .cvsignore,1.13,1.14 sources,1.15,1.16
Message-ID: <20091208014025.2FCFF11C03FC@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16881

Modified Files:
	.cvsignore sources 
Log Message:
Really use the new tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	23 Oct 2009 06:13:15 -0000	1.13
+++ .cvsignore	8 Dec 2009 01:40:25 -0000	1.14
@@ -1 +1 @@
-corosync-1.1.2.tar.gz
+corosync-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	23 Oct 2009 06:13:15 -0000	1.15
+++ sources	8 Dec 2009 01:40:25 -0000	1.16
@@ -1 +1 @@
-03ea8d775b2855fd3c0a1ed5e7705a86  corosync-1.1.2.tar.gz
+789bea831a97977e56900477c3022cc1  corosync-1.2.0.tar.gz



From fabbione at fedoraproject.org  Tue Dec  8 01:46:34 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue,  8 Dec 2009 01:46:34 +0000 (UTC)
Subject: rpms/corosync/F-12 .cvsignore, 1.13, 1.14 corosync.spec, 1.37,
	1.38 sources, 1.15, 1.16
Message-ID: <20091208014634.1A14311C025D@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19002

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release, fixes a few gazzillion bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	23 Oct 2009 07:28:29 -0000	1.13
+++ .cvsignore	8 Dec 2009 01:46:33 -0000	1.14
@@ -1 +1 @@
-corosync-1.1.2.tar.gz
+corosync-1.2.0.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/corosync.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- corosync.spec	23 Oct 2009 07:28:29 -0000	1.37
+++ corosync.spec	8 Dec 2009 01:46:33 -0000	1.38
@@ -1,13 +1,13 @@
-# define alphatag svn1211
+# global alphatag svn1211
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.2
+Version: 1.2.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
-Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
+Source0: http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -16,8 +16,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
+# Build bits
+
 %define buildtrunk 0
-%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -29,7 +30,7 @@ BuildRequires: libibverbs-devel librdmac
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n corosync-%{version}
+%setup -q -n %{name}-%{version}
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -41,7 +42,8 @@ export rdmacm_CFLAGS=-I/usr/include/rdma
 export rdmacm_LIBS=-lrdmacm \
 %{configure} \
 	--enable-nss \
-	--enable-rdma
+	--enable-rdma \
+	--with-initddir=%{_initddir}
 
 %build
 make %{_smp_mflags}
@@ -50,8 +52,6 @@ make %{_smp_mflags}
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
-install -d %{buildroot}%{_initddir}
-install -m 755 init/redhat %{buildroot}%{_initddir}/corosync
 
 ## tree fixup
 # drop static libs
@@ -62,7 +62,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 rm -rf %{buildroot}
 
-%description 
+%description
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
@@ -75,10 +75,7 @@ if [ $1 -eq 0 ]; then
 	/sbin/chkconfig --del corosync || :
 fi
 
-%postun
-[ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || :
-
-%files 
+%files
 %defattr(-,root,root,-)
 %doc LICENSE SECURITY
 %{_sbindir}/corosync
@@ -90,6 +87,7 @@ fi
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %dir %{_sysconfdir}/corosync
+%dir %{_sysconfdir}/corosync/service.d
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %{_initddir}/corosync
@@ -113,7 +111,7 @@ fi
 %package -n corosynclib
 Summary: The Corosync Cluster Engine Libraries
 Group: System Environment/Libraries
-Conflicts: corosync < 0.92-7
+Requires: %{name} = %{version}-%{release}
 
 %description -n corosynclib
 This package contains corosync libraries.
@@ -132,6 +130,7 @@ This package contains corosync libraries
 %{_libdir}/libquorum.so.*
 %{_libdir}/libvotequorum.so.*
 %{_libdir}/libpload.so.*
+%{_libdir}/libsam.so.*
 
 %post -n corosynclib -p /sbin/ldconfig
 
@@ -166,6 +165,7 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/hdb.h
 %{_includedir}/corosync/list.h
 %{_includedir}/corosync/mar_gen.h
+%{_includedir}/corosync/sam.h
 %{_includedir}/corosync/swab.h
 %{_includedir}/corosync/quorum.h
 %{_includedir}/corosync/votequorum.h
@@ -195,19 +195,34 @@ The Corosync Cluster Engine APIs.
 %{_libdir}/libquorum.so
 %{_libdir}/libvotequorum.so
 %{_libdir}/libpload.so
+%{_libdir}/libsam.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/evs_*3*
 %{_mandir}/man3/confdb_*3*
 %{_mandir}/man3/votequorum_*3*
+%{_mandir}/man3/sam_*3*
 %{_mandir}/man8/cpg_overview.8*
 %{_mandir}/man8/evs_overview.8*
 %{_mandir}/man8/confdb_overview.8*
 %{_mandir}/man8/logsys_overview.8*
 %{_mandir}/man8/votequorum_overview.8*
 %{_mandir}/man8/coroipc_overview.8*
+%{_mandir}/man8/sam_overview.8*
 
 %changelog
+* Tue Dec  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.2.0-1
+- New upstream release
+- Use global instead of define
+- Update Source0 url
+- Use more %name macro around
+- Cleanup install section. Init script is now installed by upstream
+- Cleanup whitespace
+- Don't deadlock between package upgrade and corosync condrestart
+- Ship service.d config directory
+- Fix Conflicts vs Requires
+- Ship new sam library and man pages
+
 * Fri Oct 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.2-1
 - New upstream release fixes major regression on specific loads
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	23 Oct 2009 07:28:29 -0000	1.15
+++ sources	8 Dec 2009 01:46:33 -0000	1.16
@@ -1 +1 @@
-03ea8d775b2855fd3c0a1ed5e7705a86  corosync-1.1.2.tar.gz
+789bea831a97977e56900477c3022cc1  corosync-1.2.0.tar.gz



From bpepple at fedoraproject.org  Tue Dec  8 01:59:30 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  8 Dec 2009 01:59:30 +0000 (UTC)
Subject: File telepathy-gabble-0.8.9.tar.gz uploaded to lookaside cache by
	bpepple
Message-ID: <20091208015930.83FB810F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for telepathy-gabble:

ddf89b1eea2f418a68b1013427eb0cb1  telepathy-gabble-0.8.9.tar.gz



From bpepple at fedoraproject.org  Tue Dec  8 02:07:33 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  8 Dec 2009 02:07:33 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.58, 1.59 sources, 1.58,
	1.59 telepathy-gabble.spec, 1.71, 1.72
Message-ID: <20091208020733.6472011C025D@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26029

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Mon Dec  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-1
- Update to 0.8.9.
- Drop proxy patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	9 Nov 2009 19:25:01 -0000	1.58
+++ .cvsignore	8 Dec 2009 02:07:33 -0000	1.59
@@ -1 +1 @@
-telepathy-gabble-0.8.8.tar.gz
+telepathy-gabble-0.8.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	9 Nov 2009 19:25:02 -0000	1.58
+++ sources	8 Dec 2009 02:07:33 -0000	1.59
@@ -1 +1 @@
-1661fe3412552a30dc561e3094df545b  telepathy-gabble-0.8.8.tar.gz
+ddf89b1eea2f418a68b1013427eb0cb1  telepathy-gabble-0.8.9.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- telepathy-gabble.spec	26 Nov 2009 18:17:09 -0000	1.71
+++ telepathy-gabble.spec	8 Dec 2009 02:07:33 -0000	1.72
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
-Version:        0.8.8
-Release:        2%{?dist}
+Version:        0.8.9
+Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -8,7 +8,6 @@ Group:          Applications/Communicati
 License:        LGPLv2+ and (BSD)
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0:		proxy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -31,7 +30,6 @@ chats and voice calls.
 
 %prep
 %setup -q
-%patch0 -p1 -b .proxy
 
 
 %build
@@ -61,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-1
+- Update to 0.8.9.
+- Drop proxy patch.  Fixed upstream.
+
 * Thu Nov 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.8-2
 - Add patch to only query SOCK5 proxies when needed.
 



From salimma at fedoraproject.org  Tue Dec  8 02:16:54 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  8 Dec 2009 02:16:54 +0000 (UTC)
Subject: File vtg-0.6.1.tar.bz2 uploaded to lookaside cache by salimma
Message-ID: <20091208021654.1263B10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gedit-vala:

066cb84ebcb5ba5508286473d6a91e28  vtg-0.6.1.tar.bz2



From salimma at fedoraproject.org  Tue Dec  8 02:40:24 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  8 Dec 2009 02:40:24 +0000 (UTC)
Subject: rpms/gedit-vala/devel .cvsignore, 1.6, 1.7 gedit-vala.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20091208024024.5474011C03FC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gedit-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4099/devel

Modified Files:
	.cvsignore gedit-vala.spec sources 
Log Message:
* Tue Dec  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
- Update to 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Oct 2009 22:11:29 -0000	1.6
+++ .cvsignore	8 Dec 2009 02:40:24 -0000	1.7
@@ -1 +1 @@
-vtg-0.6.0.tar.bz2
+vtg-0.6.1.tar.bz2


Index: gedit-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/devel/gedit-vala.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gedit-vala.spec	3 Oct 2009 22:11:29 -0000	1.10
+++ gedit-vala.spec	8 Dec 2009 02:40:24 -0000	1.11
@@ -1,7 +1,7 @@
 %global upstream_name vtg
 
 Name:           gedit-vala
-Version:        0.6.0
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        Vala Toys for gEdit
 
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
 * Sat Oct  3 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.0-1
 - Update to 0.6.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Oct 2009 22:11:29 -0000	1.6
+++ sources	8 Dec 2009 02:40:24 -0000	1.7
@@ -1 +1 @@
-a5724d011f8dabc6eb795feb366f1f21  vtg-0.6.0.tar.bz2
+066cb84ebcb5ba5508286473d6a91e28  vtg-0.6.1.tar.bz2



From salimma at fedoraproject.org  Tue Dec  8 02:40:24 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  8 Dec 2009 02:40:24 +0000 (UTC)
Subject: rpms/gedit-vala/F-12 .cvsignore, 1.5, 1.6 gedit-vala.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20091208024024.33BA811C03FC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gedit-vala/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4099/F-12

Modified Files:
	.cvsignore gedit-vala.spec sources 
Log Message:
* Tue Dec  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
- Update to 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Sep 2009 08:48:00 -0000	1.5
+++ .cvsignore	8 Dec 2009 02:40:23 -0000	1.6
@@ -1 +1 @@
-vtg-0.5.0.tar.bz2
+vtg-0.6.1.tar.bz2


Index: gedit-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-12/gedit-vala.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gedit-vala.spec	21 Sep 2009 08:48:01 -0000	1.9
+++ gedit-vala.spec	8 Dec 2009 02:40:23 -0000	1.10
@@ -1,10 +1,8 @@
 %global upstream_name vtg
-#global svn_rev r
 
 Name:           gedit-vala
-Version:        0.5.0
+Version:        0.6.1
 Release:        1%{?dist}
-#Release:        0.1.%{svn_rev}svn%{?dist}
 Summary:        Vala Toys for gEdit
 
 Group:          Applications/Editors
@@ -13,9 +11,6 @@ URL:            http://code.google.com/p
 Source0:        http://vtg.googlecode.com/files/vtg-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# For SVN checkout only
-#BuildRequires:  gnome-common autoconf automake libtool
-# end SVN
 BuildRequires:  gedit-devel vala-devel GConf2-devel
 # GConf2-devel ought to depend on dbus-devel:
 # https://bugzilla.redhat.com/show_bug.cgi?id=485667
@@ -50,9 +45,7 @@ with four modules:
 
 
 %build
-#NOCONFIGURE=1 ./autogen.sh
-# http://code.google.com/p/vtg/issues/detail?id=67
-%configure --disable-vsc-shell
+%configure
 # this switch is ignored right now
 # --docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
@@ -79,6 +72,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
+* Sat Oct  3 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.0-1
+- Update to 0.6.0
+
 * Mon Sep 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
 - Update to final 0.5.0 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Sep 2009 08:48:01 -0000	1.5
+++ sources	8 Dec 2009 02:40:23 -0000	1.6
@@ -1 +1 @@
-53c65e9c11a1335adb0f7faf0b85151a  vtg-0.5.0.tar.bz2
+066cb84ebcb5ba5508286473d6a91e28  vtg-0.6.1.tar.bz2



From iankent at fedoraproject.org  Tue Dec  8 02:56:29 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Tue,  8 Dec 2009 02:56:29 +0000 (UTC)
Subject: rpms/autofs/F-12 autofs-5.0.5-fix-memory-leak-on-reload.patch, NONE,
	1.1 autofs.spec, 1.295, 1.296
Message-ID: <20091208025629.4DC7311C025D@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8840

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.5-fix-memory-leak-on-reload.patch 
Log Message:
* Tue Dec 8 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-17
- fix memory leak on reload (bz545137).


autofs-5.0.5-fix-memory-leak-on-reload.patch:
 CHANGELOG    |    1 +
 lib/master.c |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE autofs-5.0.5-fix-memory-leak-on-reload.patch ---
autofs-5.0.5 - fix memory leak on reload

From: Ian Kent <raven at themaw.net>

When sending a signal to the automount daemon to re-load the maps a map
entry cache is pre-allocated before checking if the entry already exists.
If the master map entry was found to exist the pre-allocated cache was
not being freed.

If there are a large number of entries in the master map and there are
frequent re-load requests sent to the daemon the memory leak will cause
the system to become unstable fairly quilkly.

Since the map entry cache (allocated for each map entry) is fairly large
these days (and is configurable) pre-allocating it is no longer a cheap
operation. This patch fixes the memory leak and only allocates a map
entry cache if the entry does not already exist.
---

 CHANGELOG    |    1 +
 lib/master.c |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 20566a6..df2ec09 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@
 - check for path mount location in generic module.
 - dont fail mount on access fail.
 - fix rpc fail on large export list.
+- fix memory leak on reload.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/lib/master.c b/lib/master.c
index 8455f40..83019aa 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -190,9 +190,15 @@ master_add_map_source(struct master_mapent *entry,
 
 	master_source_writelock(entry);
 
-	if (!entry->maps)
+	if (!entry->maps) {
+		source->mc = cache_init(entry->ap, source);
+		if (!source->mc) {
+			master_free_map_source(source, 0);
+			master_source_unlock(entry);
+			return NULL;
+		}
 		entry->maps = source;
-	else {
+	} else {
 		struct map_source *this, *last, *next;
 
 		/* Typically there only a few map sources */
@@ -205,6 +211,13 @@ master_add_map_source(struct master_mapent *entry,
 			return this;
 		}
 
+		source->mc = cache_init(entry->ap, source);
+		if (!source->mc) {
+			master_free_map_source(source, 0);
+			master_source_unlock(entry);
+			return NULL;
+		}
+
 		last = NULL;
 		next = entry->maps;
 		while (next) {


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-12/autofs.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- autofs.spec	3 Dec 2009 02:38:48 -0000	1.295
+++ autofs.spec	8 Dec 2009 02:56:29 -0000	1.296
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.5
-Release: 15%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@ Patch13: autofs-5.0.5-fix-pidof-init-scr
 Patch14: autofs-5.0.5-check-for-path-mount-location-in-generic-module.patch
 Patch15: autofs-5.0.5-dont-fail-mount-on-access-fail.patch
 Patch16: autofs-5.0.5-fix-rpc-large-export-list.patch
+Patch17: autofs-5.0.5-fix-memory-leak-on-reload.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -83,6 +84,7 @@ echo %{version}-%{release} > .version
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -135,6 +137,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Tue Dec 8 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-17
+- fix memory leak on reload (bz545137).
+
 * Thu Dec 3 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-15
 - fix rpc fail on large export list (bz543023).
 



From yaneti at fedoraproject.org  Tue Dec  8 03:02:19 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Tue,  8 Dec 2009 03:02:19 +0000 (UTC)
Subject: rpms/galeon/devel galeon-2.0.7-spinnericon.patch, NONE,
	1.1 galeon.spec, 1.69, 1.70
Message-ID: <20091208030219.42C0C11C025D@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10266

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-spinnericon.patch 
Log Message:
- Avoid warnings (#514289) and empty looking spinner button


galeon-2.0.7-spinnericon.patch:
 galeon-spinner.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE galeon-2.0.7-spinnericon.patch ---
 When gnome-spinner-rest theme icon can't be found don't complain
 and use the main galeon window icon which is slightly less inappropriate
 than an empty lookin space on the toolbar.

---
 src/galeon-spinner.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/galeon-spinner.c b/src/galeon-spinner.c
index 519caad..860641a 100644
--- a/src/galeon-spinner.c
+++ b/src/galeon-spinner.c
@@ -199,7 +199,8 @@ select_spinner_image (GaleonSpinner *spinner)
 	GList *element;
 
 	if (spinner->details->timer_task == 0) {
-		return g_object_ref (spinner->details->quiescent_pixbuf);
+		return (spinner->details->quiescent_pixbuf != NULL) ?
+		        g_object_ref (spinner->details->quiescent_pixbuf) : NULL;
 	}
 	
 	if (spinner->details->image_list == NULL) {
@@ -594,8 +595,7 @@ galeon_spinner_load_images (GaleonSpinner *spinner)
 					   wanted_size, 0, NULL);
 
 	if (pixbuf == NULL) {
-		g_warning ("Spinner rest icon not found");
-		return;
+        	pixbuf = gdk_pixbuf_new_from_file (DATADIR "/pixmaps/galeon.png", NULL);
 	}
 
 	spinner->details->quiescent_pixbuf = 
-- 
1.6.5.2



Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- galeon.spec	7 Dec 2009 08:34:44 -0000	1.69
+++ galeon.spec	8 Dec 2009 03:02:19 -0000	1.70
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	21%{?dist}
+Release:	22%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -20,6 +20,7 @@ Patch8:         galeon-1.3.2-home.patch
 Patch9:         galeon-2.0.7-dockcrash.patch
 Patch10:        galeon-2.0.7-moz192.patch
 Patch12:        galeon-2.0.7-nojavaconsole.patch
+Patch13:        galeon-2.0.7-spinnericon.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -63,6 +64,7 @@ makes sense. Galeon was written to do ju
 %patch9 -p1 -b .dock
 %patch10 -p1 -b .moz192
 %patch12 -p1 -b .nojavaconsole
+%patch13 -p1 -b .spinnericon
 
 
 %build
@@ -137,6 +139,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Mon Dec  8 2009 Yanko Kaneti <yaneti at declera.com> - 2.0.7-22
+- Avoid warnings (#514289) and empty looking spinner button
+
 * Mon Dec  7 2009 Yanko Kaneti <yaneti at declera.com> - 2.0.7-21
 - Add patches so that it actually builds against newer gecko
 



From iankent at fedoraproject.org  Tue Dec  8 03:13:51 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Tue,  8 Dec 2009 03:13:51 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.5-fix-memory-leak-on-reload.patch, NONE,
	1.1 autofs.spec, 1.298, 1.299
Message-ID: <20091208031351.83A3C11C025D@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13493

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.5-fix-memory-leak-on-reload.patch 
Log Message:
* Tue Dec 8 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-16
- fix memory leak on reload (bz545137).


autofs-5.0.5-fix-memory-leak-on-reload.patch:
 CHANGELOG    |    1 +
 lib/master.c |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE autofs-5.0.5-fix-memory-leak-on-reload.patch ---
autofs-5.0.5 - fix memory leak on reload

From: Ian Kent <raven at themaw.net>

When sending a signal to the automount daemon to re-load the maps a map
entry cache is pre-allocated before checking if the entry already exists.
If the master map entry was found to exist the pre-allocated cache was
not being freed.

If there are a large number of entries in the master map and there are
frequent re-load requests sent to the daemon the memory leak will cause
the system to become unstable fairly quilkly.

Since the map entry cache (allocated for each map entry) is fairly large
these days (and is configurable) pre-allocating it is no longer a cheap
operation. This patch fixes the memory leak and only allocates a map
entry cache if the entry does not already exist.
---

 CHANGELOG    |    1 +
 lib/master.c |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 20566a6..df2ec09 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@
 - check for path mount location in generic module.
 - dont fail mount on access fail.
 - fix rpc fail on large export list.
+- fix memory leak on reload.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/lib/master.c b/lib/master.c
index 8455f40..83019aa 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -190,9 +190,15 @@ master_add_map_source(struct master_mapent *entry,
 
 	master_source_writelock(entry);
 
-	if (!entry->maps)
+	if (!entry->maps) {
+		source->mc = cache_init(entry->ap, source);
+		if (!source->mc) {
+			master_free_map_source(source, 0);
+			master_source_unlock(entry);
+			return NULL;
+		}
 		entry->maps = source;
-	else {
+	} else {
 		struct map_source *this, *last, *next;
 
 		/* Typically there only a few map sources */
@@ -205,6 +211,13 @@ master_add_map_source(struct master_mapent *entry,
 			return this;
 		}
 
+		source->mc = cache_init(entry->ap, source);
+		if (!source->mc) {
+			master_free_map_source(source, 0);
+			master_source_unlock(entry);
+			return NULL;
+		}
+
 		last = NULL;
 		next = entry->maps;
 		while (next) {


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- autofs.spec	4 Dec 2009 14:09:29 -0000	1.298
+++ autofs.spec	8 Dec 2009 03:13:51 -0000	1.299
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.5
-Release: 14%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@ Patch13: autofs-5.0.5-fix-pidof-init-scr
 Patch14: autofs-5.0.5-check-for-path-mount-location-in-generic-module.patch
 Patch15: autofs-5.0.5-dont-fail-mount-on-access-fail.patch
 Patch16: autofs-5.0.5-fix-rpc-large-export-list.patch
+Patch17: autofs-5.0.5-fix-memory-leak-on-reload.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -83,6 +84,7 @@ echo %{version}-%{release} > .version
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -135,6 +137,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Tue Dec 8 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-16
+- fix memory leak on reload (bz545137).
+
 * Fri Dec 4 2009 Ian Kent <kpnt at redhat.com> - 1:5.0.5-14
 - fix rpc fail on large export list (bz543023).
 



From petersen at fedoraproject.org  Tue Dec  8 03:41:51 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  8 Dec 2009 03:41:51 +0000 (UTC)
Subject: rpms/xmonad/devel xmonad.spec,1.10,1.11
Message-ID: <20091208034151.BFC3211C025D@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/xmonad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20097

Modified Files:
	xmonad.spec 
Log Message:
drop the ppc cabal workaround


Index: xmonad.spec
===================================================================
RCS file: /cvs/extras/rpms/xmonad/devel/xmonad.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xmonad.spec	16 Nov 2009 14:04:07 -0000	1.10
+++ xmonad.spec	8 Dec 2009 03:41:51 -0000	1.11
@@ -8,7 +8,7 @@
 
 Name:           xmonad
 Version:        0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -95,12 +95,6 @@ This package contains profiling librarie
 %patch0 -p1 -b .orig
 
 %build
-%ifarch ppc
-# hack around mysterious runghc fail
-%global cabal ./cabal
-ghc --make Setup -o cabal
-%endif
-
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
@@ -178,6 +172,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Jens Petersen <petersen at redhat.com> - 0.9-4
+- drop the ppc cabal workaround
+
 * Tue Nov 17 2009 Jens Petersen <petersen at redhat.com> - 0.9-3
 - use %%ghc_pkg_ver for requires
 



From whot at fedoraproject.org  Tue Dec  8 03:51:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  8 Dec 2009 03:51:51 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 .cvsignore, 1.79, 1.80 sources, 1.74,
	1.75 xorg-x11-server.spec, 1.508,
	1.509 xserver-1.7.1-stat-sanity.patch, 1.1, NONE
Message-ID: <20091208035151.5CEAF11C025D@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22524

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xserver-1.7.1-stat-sanity.patch 
Log Message:
* Tue Dec 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.7.3-1
- xserver 1.7.3
- xserver-1.7.1-stat-sanity.patch: Drop, merged upstream.
- xserver-1.7.1-window-pictures.patch: Drop, code it bases on reverted
  upstream
- xserver-1.7.1-window-picture-performance-regression.patch: Drop, code it
  bases on reverted upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	26 Oct 2009 15:46:03 -0000	1.79
+++ .cvsignore	8 Dec 2009 03:51:50 -0000	1.80
@@ -1 +1 @@
-xorg-server-1.7.1.tar.bz2
+xorg-server-1.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	26 Oct 2009 15:46:03 -0000	1.74
+++ sources	8 Dec 2009 03:51:50 -0000	1.75
@@ -1 +1 @@
-dda7842467cda6018fdc87e6002e4db1  xorg-server-1.7.1.tar.bz2
+4c63b22cad9ed8ae8b86561f0f92c327  xorg-server-1.7.3.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -p -r1.508 -r1.509
--- xorg-x11-server.spec	24 Nov 2009 18:39:53 -0000	1.508
+++ xorg-x11-server.spec	8 Dec 2009 03:51:50 -0000	1.509
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.7.1
-Release:   12%{dist}
+Version:   1.7.3
+Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -77,12 +77,9 @@ Patch6045: xserver-1.7.0-randr-gamma-res
 Patch6047: xserver-1.7.0-glx-versioning.patch
 Patch6048: xserver-1.7.0-exa-fix-mixed.patch
 Patch6049: xserver-1.7.1-multilib.patch
-Patch6050: xserver-1.7.1-window-pictures.patch
 Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
 Patch6052: xserver-1.7.1-libcrypto.patch
 Patch6053: xserver-1.7.1-sigaction.patch
-Patch6054: xserver-1.7.1-stat-sanity.patch
-Patch6055: xserver-1.7.1-window-picture-performance-regression.patch
 Patch6066: xserver-1.7.1-glx14-swrast.patch
 
 %define moduledir	%{_libdir}/xorg/modules
@@ -511,6 +508,14 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Dec 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.7.3-1
+- xserver 1.7.3
+- xserver-1.7.1-stat-sanity.patch: Drop, merged upstream.
+- xserver-1.7.1-window-pictures.patch: Drop, code it bases on reverted
+  upstream
+- xserver-1.7.1-window-picture-performance-regression.patch: Drop, code it
+  bases on reverted upstream.
+
 * Tue Nov 24 2009 Adam Jackson <ajax at redhat.com> 1.7.1-12
 - xserver-1.7.1-glx14-swrast.patch: Enable GLX 1.4 for software GLX.
 


--- xserver-1.7.1-stat-sanity.patch DELETED ---



From roma at fedoraproject.org  Tue Dec  8 04:38:24 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Tue,  8 Dec 2009 04:38:24 +0000 (UTC)
Subject: rpms/gnomeradio/F-12 gnomeradio-v4l2.patch, NONE, 1.1 gnomeradio.sh,
	NONE, 1.1 import.log, NONE, 1.1 gnomeradio.spec, 1.11, 1.12
Message-ID: <20091208043824.DE9A311C00C5@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/gnomeradio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26177/F-12

Modified Files:
	gnomeradio.spec 
Added Files:
	gnomeradio-v4l2.patch gnomeradio.sh import.log 
Log Message:
using v4l2 by default

gnomeradio-v4l2.patch:
 prefs.c |    2 +-
 radio.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnomeradio-v4l2.patch ---
diff -up gnomeradio-1.8/src/prefs.c.v4l2 gnomeradio-1.8/src/prefs.c
--- gnomeradio-1.8/src/prefs.c.v4l2	2008-04-13 15:04:52.000000000 +0200
+++ gnomeradio-1.8/src/prefs.c	2009-12-06 12:43:45.000000000 +0100
@@ -112,7 +112,7 @@ gboolean load_settings(void)
 	/* Load general settings */
 	settings.device = gconf_client_get_string(client, "/apps/gnomeradio/device" , NULL);
 	if (!settings.device)
-		settings.device = g_strdup("/dev/radio");
+		settings.device = g_strdup("/dev/radio0");
 	settings.driver = gconf_client_get_string(client, "/apps/gnomeradio/driver" , NULL);
 	if (!settings.driver)
 		settings.driver = g_strdup("any");
diff -up gnomeradio-1.8/src/radio.c.v4l2 gnomeradio-1.8/src/radio.c
--- gnomeradio-1.8/src/radio.c.v4l2	2008-04-13 14:55:43.000000000 +0200
+++ gnomeradio-1.8/src/radio.c	2009-12-06 12:44:01.000000000 +0100
@@ -41,9 +41,9 @@ int radio_init(char *device, DriverType 
 	}
 
 	switch (driver) {
+		case DRIVER_ANY:
 		case DRIVER_V4L2:
 			goto try_v4l2;
-		case DRIVER_ANY:
 		case DRIVER_V4L1:
 		default:
 			goto try_v4l1;


--- NEW FILE gnomeradio.sh ---
#!/bin/sh
# Route the capture sources on the sound card back in as PCM audio

PROG=/usr/bin/gnomeradio

sox -c 2 -s -r 44100 -t ossdsp /dev/audio -t ossdsp -r 44100 /dev/dsp &
# a bit noisy for my taste
#sox -c 2 -s -r 44100 -t alsa hw:0,0 -t alsa -r 44100 &

# if someone wants to start always with the same volume
# amixer -c 0 sset Master 80%,80% unmute

$PROG
wait $PROG
t=`pidof sox`;
kill $t;


--- NEW FILE import.log ---
gnomeradio-1_8-4_fc13:F-12:gnomeradio-1.8-4.fc13.src.rpm:1260247084


Index: gnomeradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomeradio/F-12/gnomeradio.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gnomeradio.spec	25 Jul 2009 00:52:28 -0000	1.11
+++ gnomeradio.spec	8 Dec 2009 04:38:24 -0000	1.12
@@ -1,11 +1,13 @@
 Summary: Graphical FM-Tuner program for GNOME
 Name: gnomeradio
 Version: 1.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
-URL: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/
-Source: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/%{name}-%{version}.tar.gz
+URL: http://projects.gnome.org/gnomeradio/
+Source0: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/%{name}-%{version}.tar.gz
+Source1: gnomeradio.sh
+Patch0: %{name}-v4l2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -31,6 +33,8 @@ Ogg files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .v4l2
+%{__install} -m 755 %{SOURCE1} .
 
 %build
 %configure \
@@ -93,7 +97,7 @@ scrollkeeper-update -q || :
 
 %files -f %{name}.lang
 %defattr(644,root,root,0755)
-%doc AUTHORS ChangeLog COPYING README README.lirc README.recording
+%doc AUTHORS ChangeLog COPYING README README.lirc README.recording gnomeradio.sh
 %{_datadir}/gnome/help/%{name}/
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %attr(755,root,root) %{_bindir}/%{name}
@@ -103,6 +107,11 @@ scrollkeeper-update -q || :
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
+* Sat Dec 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.8-4
+- Changed defaults for using v4l2 (based on a patch by Paulo Roma)
+- Included script gnomeradio.sh (Paulo Roma)
+- fixed URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From iarnell at fedoraproject.org  Tue Dec  8 04:56:12 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue,  8 Dec 2009 04:56:12 +0000 (UTC)
Subject: rpms/perl-Cache-FastMmap/devel perl-Cache-FastMmap.spec,1.6,1.7
Message-ID: <20091208045612.643E111C00C5@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Cache-FastMmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30641

Modified Files:
	perl-Cache-FastMmap.spec 
Log Message:
* Tue Dec 08 2009 Iain Arnell <iarnell at gmail.com> 1.34-4
- drop failing leak test (rt #39342)



Index: perl-Cache-FastMmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-FastMmap/devel/perl-Cache-FastMmap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Cache-FastMmap.spec	7 Dec 2009 09:31:37 -0000	1.6
+++ perl-Cache-FastMmap.spec	8 Dec 2009 04:56:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Cache-FastMmap
 Version:        1.34
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Uses an mmap'ed file to act as a shared memory interprocess cache
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,7 +9,7 @@ Source0:        http://www.cpan.org/auth
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(GTop)
+#BuildRequires:  perl(GTop)
 BuildRequires:  perl(Compress::Zlib)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -22,6 +22,10 @@ situation better.
 %prep
 %setup -q -n Cache-FastMmap-%{version}
 
+# rt #39342 - fails leak test
+# remove failing test
+rm t/6.t
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
@@ -51,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 08 2009 Iain Arnell <iarnell at gmail.com> 1.34-4
+- drop failing leak test (rt #39342)
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.34-3
 - rebuild against perl 5.10.1
 



From kaigai at fedoraproject.org  Tue Dec  8 05:59:41 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue,  8 Dec 2009 05:59:41 +0000 (UTC)
Subject: rpms/sepostgresql/F-12 sepostgresql-8.4.patch, 1.2,
	1.3 sepostgresql.spec, 1.43, 1.44
Message-ID: <20091208055941.3971611C00C5@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11742

Modified Files:
	sepostgresql-8.4.patch sepostgresql.spec 
Log Message:
- rework: backport features from v8.5devel tree
- fixbug: selinux netlink receiver process didn't have correct ps display



sepostgresql-8.4.patch:
 configure                                                          |  113 
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   15 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |   12 
 src/backend/access/heap/tuptoaster.c                               |   12 
 src/backend/access/transam/xact.c                                  |   26 
 src/backend/bootstrap/bootparse.y                                  |   11 
 src/backend/bootstrap/bootstrap.c                                  |   20 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   25 
 src/backend/catalog/catalog.c                                      |    6 
 src/backend/catalog/dependency.c                                   |   35 
 src/backend/catalog/heap.c                                         |   89 
 src/backend/catalog/index.c                                        |    6 
 src/backend/catalog/namespace.c                                    |   33 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_conversion.c                                |    4 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_operator.c                                  |   17 
 src/backend/catalog/pg_proc.c                                      |   14 
 src/backend/catalog/pg_security.c                                  |  637 ++
 src/backend/catalog/pg_shdepend.c                                  |    6 
 src/backend/catalog/pg_type.c                                      |   20 
 src/backend/catalog/toasting.c                                     |   10 
 src/backend/commands/aggregatecmds.c                               |    4 
 src/backend/commands/alter.c                                       |   29 
 src/backend/commands/cluster.c                                     |   11 
 src/backend/commands/conversioncmds.c                              |   12 
 src/backend/commands/copy.c                                        |  268 
 src/backend/commands/dbcommands.c                                  |   95 
 src/backend/commands/foreigncmds.c                                 |   23 
 src/backend/commands/functioncmds.c                                |   92 
 src/backend/commands/indexcmds.c                                   |    4 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/opclasscmds.c                                 |   44 
 src/backend/commands/operatorcmds.c                                |    3 
 src/backend/commands/proclang.c                                    |   21 
 src/backend/commands/schemacmds.c                                  |   65 
 src/backend/commands/sequence.c                                    |   16 
 src/backend/commands/tablecmds.c                                   |  248 
 src/backend/commands/trigger.c                                     |    9 
 src/backend/commands/tsearchcmds.c                                 |   54 
 src/backend/commands/typecmds.c                                    |   13 
 src/backend/commands/view.c                                        |    4 
 src/backend/executor/execJunk.c                                    |    5 
 src/backend/executor/execMain.c                                    |  140 
 src/backend/executor/execQual.c                                    |    3 
 src/backend/executor/execScan.c                                    |   24 
 src/backend/executor/execTuples.c                                  |   14 
 src/backend/executor/execUtils.c                                   |    6 
 src/backend/executor/functions.c                                   |    6 
 src/backend/executor/nodeAgg.c                                     |    4 
 src/backend/executor/nodeMergejoin.c                               |    2 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/nodeWindowAgg.c                               |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   68 
 src/backend/nodes/copyfuncs.c                                      |   22 
 src/backend/nodes/equalfuncs.c                                     |   19 
 src/backend/nodes/outfuncs.c                                       |    4 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/util/clauses.c                               |    3 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   46 
 src/backend/parser/gram.y                                          |  106 
 src/backend/parser/parse_target.c                                  |   63 
 src/backend/parser/parse_utilcmd.c                                 |    3 
 src/backend/postmaster/autovacuum.c                                |    2 
 src/backend/postmaster/postmaster.c                                |   51 
 src/backend/rewrite/rewriteDefine.c                                |    4 
 src/backend/rewrite/rewriteRemove.c                                |    4 
 src/backend/security/Makefile                                      |   13 
 src/backend/security/rowlevel.c                                    |  121 
 src/backend/security/sepgsql/Makefile                              |   16 
 src/backend/security/sepgsql/avc.c                                 |  880 +++
 src/backend/security/sepgsql/bridge.c                              | 2876 ++++++++++
 src/backend/security/sepgsql/checker.c                             |  424 +
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               |  239 
 src/backend/security/sepgsql/label.c                               | 1140 +++
 src/backend/security/sepgsql/misc.c                                |  304 +
 src/backend/security/sepgsql/perms.c                               |  597 ++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  123 
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  118 
 src/backend/tcop/fastpath.c                                        |    3 
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    6 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/tid.c                                        |    4 
 src/backend/utils/adt/trigfuncs.c                                  |    4 
 src/backend/utils/cache/plancache.c                                |    9 
 src/backend/utils/cache/relcache.c                                 |   22 
 src/backend/utils/cache/syscache.c                                 |   26 
 src/backend/utils/fmgr/dfmgr.c                                     |    7 
 src/backend/utils/fmgr/fmgr.c                                      |    2 
 src/backend/utils/init/postinit.c                                  |    9 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    4 
 src/backend/utils/misc/superuser.c                                 |   10 
 src/bin/initdb/initdb.c                                            |   13 
 src/bin/pg_dump/pg_dump.c                                          |  150 
 src/bin/pg_dump/pg_dump.h                                          |    2 
 src/bin/pg_dump/pg_dumpall.c                                       |   72 
 src/include/access/htup.h                                          |   32 
 src/include/access/sysattr.h                                       |   14 
 src/include/access/tupdesc.h                                       |    1 
 src/include/bootstrap/bootstrap.h                                  |    3 
 src/include/catalog/dependency.h                                   |    3 
 src/include/catalog/heap.h                                         |   11 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_conversion_fn.h                             |    2 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   21 
 src/include/catalog/pg_proc_fn.h                                   |    3 
 src/include/catalog/pg_security.h                                  |  101 
 src/include/catalog/toasting.h                                     |    3 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   18 
 src/include/nodes/plannodes.h                                      |    7 
 src/include/nodes/relation.h                                       |    9 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   44 
 src/include/security/sepgsql.h                                     |  777 ++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/storage/proc.h                                         |    4 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |    2 
 src/test/regress/GNUmakefile                                       |    8 
 src/test/regress/expected/sanity_check.out                         |    3 
 src/test/regress/pg_regress.c                                      |    9 
 150 files changed, 10632 insertions(+), 3 deletions(-), 677 modifications(!)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 sepostgresql-8.4.patchIndex: sepostgresql-8.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-12/sepostgresql-8.4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sepostgresql-8.4.patch	11 Sep 2009 10:40:20 -0000	1.2
+++ sepostgresql-8.4.patch	8 Dec 2009 05:59:39 -0000	1.3
@@ -406,7 +406,7 @@ diff -Nrpc base/src/backend/access/commo
   	{
 diff -Nrpc base/src/backend/access/heap/heapam.c sepgsql/src/backend/access/heap/heapam.c
 *** base/src/backend/access/heap/heapam.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/access/heap/heapam.c	Tue Sep  8 23:55:48 2009
+--- sepgsql/src/backend/access/heap/heapam.c	Tue Dec  8 14:53:28 2009
 ***************
 *** 54,59 ****
 --- 54,60 ----
@@ -591,7 +591,7 @@ diff -Nrpc base/src/backend/access/trans
   
 diff -Nrpc base/src/backend/bootstrap/bootparse.y sepgsql/src/backend/bootstrap/bootparse.y
 *** base/src/backend/bootstrap/bootparse.y	Sat Jan  3 13:01:35 2009
---- sepgsql/src/backend/bootstrap/bootparse.y	Wed Jul 15 19:35:52 2009
+--- sepgsql/src/backend/bootstrap/bootparse.y	Thu Oct  8 09:29:32 2009
 ***************
 *** 42,47 ****
 --- 42,48 ----
@@ -604,15 +604,17 @@ diff -Nrpc base/src/backend/bootstrap/bo
   #include "storage/ipc.h"
 *************** Boot_CreateStmt:
 *** 211,216 ****
---- 212,222 ----
+--- 212,224 ----
   					else
   					{
   						Oid id;
 + 						Oid *secLabels =
-+ 							sepgsqlCreateTableColumns(NULL,
-+ 													  LexIDStr($5),
-+ 													  PG_CATALOG_NAMESPACE,
-+ 													  tupdesc, RELKIND_RELATION);
++ 							sepgsql_relation_create(LexIDStr($5),
++ 													RELKIND_RELATION,
++ 													tupdesc,
++ 													PG_CATALOG_NAMESPACE,
++ 													NULL, NIL,
++ 													false, false);
   
   						id = heap_create_with_catalog(LexIDStr($5),
   													  PG_CATALOG_NAMESPACE,
@@ -625,7 +627,7 @@ diff -Nrpc base/src/backend/bootstrap/bo
   						elog(DEBUG4, "relation created with oid %u", id);
   					}
   					do_end();
---- 231,238 ----
+--- 233,240 ----
   													  0,
   													  ONCOMMIT_NOOP,
   													  (Datum) 0,
@@ -636,10 +638,10 @@ diff -Nrpc base/src/backend/bootstrap/bo
   					do_end();
 diff -Nrpc base/src/backend/bootstrap/bootstrap.c sepgsql/src/backend/bootstrap/bootstrap.c
 *** base/src/backend/bootstrap/bootstrap.c	Fri Feb 20 22:15:36 2009
---- sepgsql/src/backend/bootstrap/bootstrap.c	Wed Sep  9 13:14:37 2009
+--- sepgsql/src/backend/bootstrap/bootstrap.c	Tue Dec  8 14:04:25 2009
 ***************
-*** 26,31 ****
---- 26,32 ----
+*** 26,37 ****
+--- 26,39 ----
   #include "access/xact.h"
   #include "bootstrap/bootstrap.h"
   #include "catalog/index.h"
@@ -647,9 +649,45 @@ diff -Nrpc base/src/backend/bootstrap/bo
   #include "catalog/pg_type.h"
   #include "libpq/pqsignal.h"
   #include "miscadmin.h"
+  #include "nodes/makefuncs.h"
+  #include "postmaster/bgwriter.h"
+  #include "postmaster/walwriter.h"
++ #include "security/sepgsql.h"
+  #include "storage/bufmgr.h"
+  #include "storage/ipc.h"
+  #include "storage/proc.h"
+*************** AuxiliaryProcessMain(int argc, char *arg
+*** 338,343 ****
+--- 340,350 ----
+  			case WalWriterProcess:
+  				statmsg = "wal writer process";
+  				break;
++ #ifdef HAVE_SELINUX
++ 			case SelinuxReceiverProcess:
++ 				statmsg = "selinux netlink receiver";
++ 				break;
++ #endif
+  			default:
+  				statmsg = "??? process";
+  				break;
+*************** AuxiliaryProcessMain(int argc, char *arg
+*** 430,435 ****
+--- 437,448 ----
+  			WalWriterMain();
+  			proc_exit(1);		/* should never return */
+  
++ #ifdef HAVE_SELINUX
++ 		case SelinuxReceiverProcess:
++ 			sepgsqlReceiverMain();
++ 			proc_exit(1);		/* should nener return */
++ #endif
++ 
+  		default:
+  			elog(PANIC, "unrecognized process type: %d", auxType);
+  			proc_exit(1);
 *************** BootstrapModeMain(void)
 *** 497,502 ****
---- 498,508 ----
+--- 510,520 ----
   	 */
   	boot_yyparse();
   
@@ -663,7 +701,7 @@ diff -Nrpc base/src/backend/bootstrap/bo
   	CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
 *************** InsertOneTuple(Oid objectid)
 *** 794,799 ****
---- 800,807 ----
+--- 812,819 ----
   	tupDesc = CreateTupleDesc(numattr,
   							  RelationGetForm(boot_reldesc)->relhasoids,
   							  attrtypes);
@@ -711,7 +749,7 @@ diff -Nrpc base/src/backend/catalog/Make
   	toasting.h indexing.h \
 diff -Nrpc base/src/backend/catalog/aclchk.c sepgsql/src/backend/catalog/aclchk.c
 *** base/src/backend/catalog/aclchk.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/catalog/aclchk.c	Wed Sep  9 21:29:33 2009
+--- sepgsql/src/backend/catalog/aclchk.c	Fri Sep 18 14:51:00 2009
 ***************
 *** 35,40 ****
 --- 35,41 ----
@@ -747,25 +785,91 @@ diff -Nrpc base/src/backend/catalog/aclc
   		/* Views don't have any system columns at all */
   		if (classForm->relkind == RELKIND_VIEW && curr_att < 0)
   			continue;
+*************** ExecGrant_Attribute(InternalGrant *istmt
+*** 774,779 ****
+--- 782,789 ----
+  								 relOid, grantorId, ACL_KIND_COLUMN,
+  								 relname, attnum,
+  								 NameStr(pg_attribute_tuple->attname));
++ 	/* SELinux checks */
++ 	sepgsql_attribute_grant(relOid, attnum);
+  
+  	/*
+  	 * Generate new ACL.
+*************** ExecGrant_Relation(InternalGrant *istmt)
+*** 1029,1034 ****
+--- 1039,1046 ----
+  										 ? ACL_KIND_SEQUENCE : ACL_KIND_CLASS,
+  										 NameStr(pg_class_tuple->relname),
+  										 0, NULL);
++ 			/* SELinux checks */
++ 			sepgsql_relation_grant(relOid);
+  
+  			/*
+  			 * Generate new ACL.
+*************** ExecGrant_Database(InternalGrant *istmt)
+*** 1217,1222 ****
+--- 1229,1236 ----
+  									 datId, grantorId, ACL_KIND_DATABASE,
+  									 NameStr(pg_database_tuple->datname),
+  									 0, NULL);
++ 		/* SELinux permission checks */
++ 		sepgsql_database_grant(datId);
+  
+  		/*
+  		 * Generate new ACL.
+*************** ExecGrant_Fdw(InternalGrant *istmt)
+*** 1335,1340 ****
+--- 1349,1356 ----
+  									 fdwid, grantorId, ACL_KIND_FDW,
+  									 NameStr(pg_fdw_tuple->fdwname),
+  									 0, NULL);
++ 		/* SELinux permission checks */
++ 		sepgsql_fdw_grant(fdwid);
+  
+  		/*
+  		 * Generate new ACL.
+*************** ExecGrant_ForeignServer(InternalGrant *i
+*** 1454,1459 ****
+--- 1470,1477 ----
+  								   srvid, grantorId, ACL_KIND_FOREIGN_SERVER,
+  									 NameStr(pg_server_tuple->srvname),
+  									 0, NULL);
++ 		/* SELinux checks */
++ 		sepgsql_foreign_server_grant(srvid);
+  
+  		/*
+  		 * Generate new ACL.
 *************** ExecGrant_Function(InternalGrant *istmt)
 *** 1572,1577 ****
---- 1580,1587 ----
+--- 1590,1597 ----
[...11234 lines suppressed...]
++ #define sepgsql_proc_alter(a,b,c)				do {} while(0)
++ #define sepgsql_proc_drop(a)					do {} while(0)
++ #define sepgsql_proc_relabel(a,b)				(InvalidOid)
++ #define sepgsql_proc_grant(a)					do {} while(0)
++ #define sepgsql_proc_execute(a)					do {} while(0)
++ #define sepgsql_proc_hint_inlined(a)			(true)
++ #define sepgsql_proc_entrypoint(a,b)			do {} while(0)
++ 
++ #define sepgsql_rule_create(a,b)				do {} while(0)
++ #define sepgsql_rule_drop(a,b)					do {} while(0)
++ 
++ #define sepgsql_trigger_create(a,b,c)			do {} while(0)
++ #define sepgsql_trigger_alter(a,b)				do {} while(0)
++ #define sepgsql_trigger_drop(a,b)				do {} while(0)
++ 
++ #define sepgsql_ts_config_create(a,b)			(InvalidOid)
++ #define sepgsql_ts_config_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_config_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_config_create(a,b)			(InvalidOid)
++ #define sepgsql_ts_config_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_config_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_dict_create(a,b)				(InvalidOid)
++ #define sepgsql_ts_dict_alter(a,b)				do {} while(0)
++ #define sepgsql_ts_dict_drop(a)					do {} while(0)
++ 
++ #define sepgsql_ts_parser_create(a,b,c,d,e,f,g)	(InvalidOid)
++ #define sepgsql_ts_parser_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_parser_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_template_create(a,b,c,d)		(InvalidOid)
++ #define sepgsql_ts_template_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_template_drop(a)				do {} while(0)
++ 
++ #define sepgsql_type_create(a,b,c,d,e,f,g,h,i,j)	(InvalidOid)
++ #define sepgsql_type_alter(a,b,c)				do {} while(0)
++ #define sepgsql_type_drop(a)					do {} while(0)
++ 
++ #define sepgsql_sysobj_drop(a)					do {} while(0)
++ 
++ #define sepgsql_file_stat(a)					do {} while(0)
++ #define sepgsql_file_read(a)					do {} while(0)
++ #define sepgsql_file_write(a)					do {} while(0)
 + 
 + /* label.c */
 + #define sepgsqlTupleDescHasSecLabel(a,b)		(false)
 + #define sepgsqlSetDefaultSecLabel(a,b)			do {} while(0)
-+ #define sepgsqlCreateTableColumns(a,b,c,d,e)	(NULL)
-+ #define sepgsqlCopyTableColumns(a)				(NULL)
-+ #define sepgsqlMetaSecurityLabel()				(NULL)
 + #define sepgsqlTransSecLabelIn(a)				(a)
 + #define sepgsqlTransSecLabelOut(a)				(a)
 + #define sepgsqlRawSecLabelIn(a)					(a)
@@ -15420,6 +18925,30 @@ diff -Nrpc base/src/include/storage/lwlo
   	/* Individual lock IDs end here */
   	FirstBufMappingLock,
   	FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS,
+diff -Nrpc base/src/include/storage/proc.h sepgsql/src/include/storage/proc.h
+*** base/src/include/storage/proc.h	Thu Feb 26 10:18:55 2009
+--- sepgsql/src/include/storage/proc.h	Tue Dec  8 14:04:25 2009
+*************** typedef struct PROC_HDR
+*** 143,150 ****
+   * normal operation. Startup process also consumes one slot, but WAL
+   * writer and autovacuum launcher are launched only after it has
+   * exited.
+   */
+! #define NUM_AUXILIARY_PROCS		3
+  
+  
+  /* configurable options */
+--- 143,152 ----
+   * normal operation. Startup process also consumes one slot, but WAL
+   * writer and autovacuum launcher are launched only after it has
+   * exited.
++  * In addition, a netlink receiver process may be launched, if SELinux
++  * support is enabled.
+   */
+! #define NUM_AUXILIARY_PROCS		4
+  
+  
+  /* configurable options */
 diff -Nrpc base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h
 *** base/src/include/utils/errcodes.h	Fri Mar  6 09:45:33 2009
 --- sepgsql/src/include/utils/errcodes.h	Wed Jul 15 19:35:52 2009
@@ -15451,6 +18980,41 @@ diff -Nrpc base/src/include/utils/syscac
   	STATRELATT,
   	TSCONFIGMAP,
   	TSCONFIGNAMENSP,
+diff -Nrpc base/src/test/regress/GNUmakefile sepgsql/src/test/regress/GNUmakefile
+*** base/src/test/regress/GNUmakefile	Sat Jan  3 13:01:35 2009
+--- sepgsql/src/test/regress/GNUmakefile	Tue Dec  1 17:11:40 2009
+*************** ifdef NO_LOCALE
+*** 38,43 ****
+--- 38,49 ----
+  NOLOCALE += --no-locale
+  endif
+  
++ # SELinux support
++ ENABLE_SELINUX =
++ ifdef SELINUX
++ ENABLE_SELINUX += --enable-selinux
++ endif
++ 
+  # stuff to pass into build of pg_regress
+  EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \
+  	'-DMAKEPROG="$(MAKE)"' \
+*************** tablespace-setup:
+*** 138,144 ****
+  ## Run tests
+  ##
+  
+! pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+  
+  check: all
+  	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
+--- 144,150 ----
+  ## Run tests
+  ##
+  
+! pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(ENABLE_SELINUX)
+  
+  check: all
+  	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
 diff -Nrpc base/src/test/regress/expected/sanity_check.out sepgsql/src/test/regress/expected/sanity_check.out
 *** base/src/test/regress/expected/sanity_check.out	Tue Feb 10 10:10:02 2009
 --- sepgsql/src/test/regress/expected/sanity_check.out	Thu Jul 16 23:18:11 2009
@@ -15481,3 +19045,72 @@ diff -Nrpc base/src/test/regress/expecte
   
   --
   -- another sanity check: every system catalog that has OIDs should have
+diff -Nrpc base/src/test/regress/pg_regress.c sepgsql/src/test/regress/pg_regress.c
+*** base/src/test/regress/pg_regress.c	Thu Jun 18 10:20:52 2009
+--- sepgsql/src/test/regress/pg_regress.c	Tue Dec  1 17:11:40 2009
+*************** static _stringlist *schedulelist = NULL;
+*** 82,87 ****
+--- 82,88 ----
+  static _stringlist *extra_tests = NULL;
+  static char *temp_install = NULL;
+  static char *temp_config = NULL;
++ static bool enable_selinux = false;
+  static char *top_builddir = NULL;
+  static bool nolocale = false;
+  static char *hostname = NULL;
+*************** help(void)
+*** 1863,1868 ****
+--- 1864,1870 ----
+  	printf(_("  --top-builddir=DIR        (relative) path to top level build directory\n"));
+  	printf(_("  --port=PORT               start postmaster on PORT\n"));
+  	printf(_("  --temp-config=PATH        append contents of PATH to temporary config\n"));
++ 	printf(_("  --enable-selinux          enables SELinux support, if available\n"));
+  	printf(_("\n"));
+  	printf(_("Options for using an existing installation:\n"));
+  	printf(_("  --host=HOST               use postmaster running on HOST\n"));
+*************** regression_main(int argc, char *argv[], 
+*** 1907,1912 ****
+--- 1909,1915 ----
+  		{"dlpath", required_argument, NULL, 17},
+  		{"create-role", required_argument, NULL, 18},
+  		{"temp-config", required_argument, NULL, 19},
++ 		{"enable-selinux", optional_argument, NULL, 20},
+  		{NULL, 0, NULL, 0}
+  	};
+  
+*************** regression_main(int argc, char *argv[], 
+*** 1997,2002 ****
+--- 2000,2008 ----
+  			case 19:
+  				temp_config = strdup(optarg);
+  				break;
++ 			case 20:
++ 				enable_selinux = true;
++ 				break;
+  			default:
+  				/* getopt_long already emitted a complaint */
+  				fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"),
+*************** regression_main(int argc, char *argv[], 
+*** 2086,2095 ****
+  		/* initdb */
+  		header(_("initializing database system"));
+  		snprintf(buf, sizeof(buf),
+! 				 SYSTEMQUOTE "\"%s/initdb\" -D \"%s/data\" -L \"%s\" --noclean%s%s > \"%s/log/initdb.log\" 2>&1" SYSTEMQUOTE,
+  				 bindir, temp_install, datadir,
+  				 debug ? " --debug" : "",
+  				 nolocale ? " --no-locale" : "",
+  				 outputdir);
+  		if (system(buf))
+  		{
+--- 2092,2102 ----
+  		/* initdb */
+  		header(_("initializing database system"));
+  		snprintf(buf, sizeof(buf),
+! 				 SYSTEMQUOTE "\"%s/initdb\" -D \"%s/data\" -L \"%s\" --noclean%s%s%s > \"%s/log/initdb.log\" 2>&1" SYSTEMQUOTE,
+  				 bindir, temp_install, datadir,
+  				 debug ? " --debug" : "",
+  				 nolocale ? " --no-locale" : "",
++ 				 enable_selinux ? " --enable-selinux" : "",
+  				 outputdir);
+  		if (system(buf))
+  		{


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-12/sepostgresql.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sepostgresql.spec	16 Nov 2009 13:47:57 -0000	1.43
+++ sepostgresql.spec	8 Dec 2009 05:59:39 -0000	1.44
@@ -12,7 +12,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.4.1
-Release: 2306%{?dist}
+Release: 2464%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -192,6 +192,10 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Fri Dec 8 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2464
+- rework: backport features from v8.5devel tree
+- fixbug: selinux netlink receiver process didn't have correct ps display
+
 * Mon Nov 16 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2306
 - rebild for ppc/ppc64 libraries
 



From kaigai at fedoraproject.org  Tue Dec  8 06:00:14 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue,  8 Dec 2009 06:00:14 +0000 (UTC)
Subject: rpms/sepostgresql/devel sepostgresql-8.4.patch, 1.2,
	1.3 sepostgresql.spec, 1.42, 1.43
Message-ID: <20091208060014.C9CF911C03DB@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11977

Modified Files:
	sepostgresql-8.4.patch sepostgresql.spec 
Log Message:
- rework: backport features from v8.5devel tree
- fixbug: selinux netlink receiver process didn't have correct ps display



sepostgresql-8.4.patch:
 configure                                                          |  113 
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   15 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |   12 
 src/backend/access/heap/tuptoaster.c                               |   12 
 src/backend/access/transam/xact.c                                  |   26 
 src/backend/bootstrap/bootparse.y                                  |   11 
 src/backend/bootstrap/bootstrap.c                                  |   20 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   25 
 src/backend/catalog/catalog.c                                      |    6 
 src/backend/catalog/dependency.c                                   |   35 
 src/backend/catalog/heap.c                                         |   89 
 src/backend/catalog/index.c                                        |    6 
 src/backend/catalog/namespace.c                                    |   33 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_conversion.c                                |    4 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_operator.c                                  |   17 
 src/backend/catalog/pg_proc.c                                      |   14 
 src/backend/catalog/pg_security.c                                  |  637 ++
 src/backend/catalog/pg_shdepend.c                                  |    6 
 src/backend/catalog/pg_type.c                                      |   20 
 src/backend/catalog/toasting.c                                     |   10 
 src/backend/commands/aggregatecmds.c                               |    4 
 src/backend/commands/alter.c                                       |   29 
 src/backend/commands/cluster.c                                     |   11 
 src/backend/commands/conversioncmds.c                              |   12 
 src/backend/commands/copy.c                                        |  268 
 src/backend/commands/dbcommands.c                                  |   95 
 src/backend/commands/foreigncmds.c                                 |   23 
 src/backend/commands/functioncmds.c                                |   92 
 src/backend/commands/indexcmds.c                                   |    4 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/opclasscmds.c                                 |   44 
 src/backend/commands/operatorcmds.c                                |    3 
 src/backend/commands/proclang.c                                    |   21 
 src/backend/commands/schemacmds.c                                  |   65 
 src/backend/commands/sequence.c                                    |   16 
 src/backend/commands/tablecmds.c                                   |  248 
 src/backend/commands/trigger.c                                     |    9 
 src/backend/commands/tsearchcmds.c                                 |   54 
 src/backend/commands/typecmds.c                                    |   13 
 src/backend/commands/view.c                                        |    4 
 src/backend/executor/execJunk.c                                    |    5 
 src/backend/executor/execMain.c                                    |  140 
 src/backend/executor/execQual.c                                    |    3 
 src/backend/executor/execScan.c                                    |   24 
 src/backend/executor/execTuples.c                                  |   14 
 src/backend/executor/execUtils.c                                   |    6 
 src/backend/executor/functions.c                                   |    6 
 src/backend/executor/nodeAgg.c                                     |    4 
 src/backend/executor/nodeMergejoin.c                               |    2 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/nodeWindowAgg.c                               |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   68 
 src/backend/nodes/copyfuncs.c                                      |   22 
 src/backend/nodes/equalfuncs.c                                     |   19 
 src/backend/nodes/outfuncs.c                                       |    4 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/util/clauses.c                               |    3 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   46 
 src/backend/parser/gram.y                                          |  106 
 src/backend/parser/parse_target.c                                  |   63 
 src/backend/parser/parse_utilcmd.c                                 |    3 
 src/backend/postmaster/autovacuum.c                                |    2 
 src/backend/postmaster/postmaster.c                                |   51 
 src/backend/rewrite/rewriteDefine.c                                |    4 
 src/backend/rewrite/rewriteRemove.c                                |    4 
 src/backend/security/Makefile                                      |   13 
 src/backend/security/rowlevel.c                                    |  121 
 src/backend/security/sepgsql/Makefile                              |   16 
 src/backend/security/sepgsql/avc.c                                 |  880 +++
 src/backend/security/sepgsql/bridge.c                              | 2876 ++++++++++
 src/backend/security/sepgsql/checker.c                             |  424 +
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               |  239 
 src/backend/security/sepgsql/label.c                               | 1140 +++
 src/backend/security/sepgsql/misc.c                                |  304 +
 src/backend/security/sepgsql/perms.c                               |  597 ++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  123 
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  118 
 src/backend/tcop/fastpath.c                                        |    3 
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    6 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/tid.c                                        |    4 
 src/backend/utils/adt/trigfuncs.c                                  |    4 
 src/backend/utils/cache/plancache.c                                |    9 
 src/backend/utils/cache/relcache.c                                 |   22 
 src/backend/utils/cache/syscache.c                                 |   26 
 src/backend/utils/fmgr/dfmgr.c                                     |    7 
 src/backend/utils/fmgr/fmgr.c                                      |    2 
 src/backend/utils/init/postinit.c                                  |    9 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    4 
 src/backend/utils/misc/superuser.c                                 |   10 
 src/bin/initdb/initdb.c                                            |   13 
 src/bin/pg_dump/pg_dump.c                                          |  150 
 src/bin/pg_dump/pg_dump.h                                          |    2 
 src/bin/pg_dump/pg_dumpall.c                                       |   72 
 src/include/access/htup.h                                          |   32 
 src/include/access/sysattr.h                                       |   14 
 src/include/access/tupdesc.h                                       |    1 
 src/include/bootstrap/bootstrap.h                                  |    3 
 src/include/catalog/dependency.h                                   |    3 
 src/include/catalog/heap.h                                         |   11 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_conversion_fn.h                             |    2 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   21 
 src/include/catalog/pg_proc_fn.h                                   |    3 
 src/include/catalog/pg_security.h                                  |  101 
 src/include/catalog/toasting.h                                     |    3 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   18 
 src/include/nodes/plannodes.h                                      |    7 
 src/include/nodes/relation.h                                       |    9 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   44 
 src/include/security/sepgsql.h                                     |  777 ++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/storage/proc.h                                         |    4 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |    2 
 src/test/regress/GNUmakefile                                       |    8 
 src/test/regress/expected/sanity_check.out                         |    3 
 src/test/regress/pg_regress.c                                      |    9 
 150 files changed, 10632 insertions(+), 3 deletions(-), 677 modifications(!)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 sepostgresql-8.4.patchIndex: sepostgresql-8.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-8.4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sepostgresql-8.4.patch	11 Sep 2009 10:40:20 -0000	1.2
+++ sepostgresql-8.4.patch	8 Dec 2009 06:00:14 -0000	1.3
@@ -406,7 +406,7 @@ diff -Nrpc base/src/backend/access/commo
   	{
 diff -Nrpc base/src/backend/access/heap/heapam.c sepgsql/src/backend/access/heap/heapam.c
 *** base/src/backend/access/heap/heapam.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/access/heap/heapam.c	Tue Sep  8 23:55:48 2009
+--- sepgsql/src/backend/access/heap/heapam.c	Tue Dec  8 14:53:28 2009
 ***************
 *** 54,59 ****
 --- 54,60 ----
@@ -591,7 +591,7 @@ diff -Nrpc base/src/backend/access/trans
   
 diff -Nrpc base/src/backend/bootstrap/bootparse.y sepgsql/src/backend/bootstrap/bootparse.y
 *** base/src/backend/bootstrap/bootparse.y	Sat Jan  3 13:01:35 2009
---- sepgsql/src/backend/bootstrap/bootparse.y	Wed Jul 15 19:35:52 2009
+--- sepgsql/src/backend/bootstrap/bootparse.y	Thu Oct  8 09:29:32 2009
 ***************
 *** 42,47 ****
 --- 42,48 ----
@@ -604,15 +604,17 @@ diff -Nrpc base/src/backend/bootstrap/bo
   #include "storage/ipc.h"
 *************** Boot_CreateStmt:
 *** 211,216 ****
---- 212,222 ----
+--- 212,224 ----
   					else
   					{
   						Oid id;
 + 						Oid *secLabels =
-+ 							sepgsqlCreateTableColumns(NULL,
-+ 													  LexIDStr($5),
-+ 													  PG_CATALOG_NAMESPACE,
-+ 													  tupdesc, RELKIND_RELATION);
++ 							sepgsql_relation_create(LexIDStr($5),
++ 													RELKIND_RELATION,
++ 													tupdesc,
++ 													PG_CATALOG_NAMESPACE,
++ 													NULL, NIL,
++ 													false, false);
   
   						id = heap_create_with_catalog(LexIDStr($5),
   													  PG_CATALOG_NAMESPACE,
@@ -625,7 +627,7 @@ diff -Nrpc base/src/backend/bootstrap/bo
   						elog(DEBUG4, "relation created with oid %u", id);
   					}
   					do_end();
---- 231,238 ----
+--- 233,240 ----
   													  0,
   													  ONCOMMIT_NOOP,
   													  (Datum) 0,
@@ -636,10 +638,10 @@ diff -Nrpc base/src/backend/bootstrap/bo
   					do_end();
 diff -Nrpc base/src/backend/bootstrap/bootstrap.c sepgsql/src/backend/bootstrap/bootstrap.c
 *** base/src/backend/bootstrap/bootstrap.c	Fri Feb 20 22:15:36 2009
---- sepgsql/src/backend/bootstrap/bootstrap.c	Wed Sep  9 13:14:37 2009
+--- sepgsql/src/backend/bootstrap/bootstrap.c	Tue Dec  8 14:04:25 2009
 ***************
-*** 26,31 ****
---- 26,32 ----
+*** 26,37 ****
+--- 26,39 ----
   #include "access/xact.h"
   #include "bootstrap/bootstrap.h"
   #include "catalog/index.h"
@@ -647,9 +649,45 @@ diff -Nrpc base/src/backend/bootstrap/bo
   #include "catalog/pg_type.h"
   #include "libpq/pqsignal.h"
   #include "miscadmin.h"
+  #include "nodes/makefuncs.h"
+  #include "postmaster/bgwriter.h"
+  #include "postmaster/walwriter.h"
++ #include "security/sepgsql.h"
+  #include "storage/bufmgr.h"
+  #include "storage/ipc.h"
+  #include "storage/proc.h"
+*************** AuxiliaryProcessMain(int argc, char *arg
+*** 338,343 ****
+--- 340,350 ----
+  			case WalWriterProcess:
+  				statmsg = "wal writer process";
+  				break;
++ #ifdef HAVE_SELINUX
++ 			case SelinuxReceiverProcess:
++ 				statmsg = "selinux netlink receiver";
++ 				break;
++ #endif
+  			default:
+  				statmsg = "??? process";
+  				break;
+*************** AuxiliaryProcessMain(int argc, char *arg
+*** 430,435 ****
+--- 437,448 ----
+  			WalWriterMain();
+  			proc_exit(1);		/* should never return */
+  
++ #ifdef HAVE_SELINUX
++ 		case SelinuxReceiverProcess:
++ 			sepgsqlReceiverMain();
++ 			proc_exit(1);		/* should nener return */
++ #endif
++ 
+  		default:
+  			elog(PANIC, "unrecognized process type: %d", auxType);
+  			proc_exit(1);
 *************** BootstrapModeMain(void)
 *** 497,502 ****
---- 498,508 ----
+--- 510,520 ----
   	 */
   	boot_yyparse();
   
@@ -663,7 +701,7 @@ diff -Nrpc base/src/backend/bootstrap/bo
   	CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
 *************** InsertOneTuple(Oid objectid)
 *** 794,799 ****
---- 800,807 ----
+--- 812,819 ----
   	tupDesc = CreateTupleDesc(numattr,
   							  RelationGetForm(boot_reldesc)->relhasoids,
   							  attrtypes);
@@ -711,7 +749,7 @@ diff -Nrpc base/src/backend/catalog/Make
   	toasting.h indexing.h \
 diff -Nrpc base/src/backend/catalog/aclchk.c sepgsql/src/backend/catalog/aclchk.c
 *** base/src/backend/catalog/aclchk.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/catalog/aclchk.c	Wed Sep  9 21:29:33 2009
+--- sepgsql/src/backend/catalog/aclchk.c	Fri Sep 18 14:51:00 2009
 ***************
 *** 35,40 ****
 --- 35,41 ----
@@ -747,25 +785,91 @@ diff -Nrpc base/src/backend/catalog/aclc
   		/* Views don't have any system columns at all */
   		if (classForm->relkind == RELKIND_VIEW && curr_att < 0)
   			continue;
+*************** ExecGrant_Attribute(InternalGrant *istmt
+*** 774,779 ****
+--- 782,789 ----
+  								 relOid, grantorId, ACL_KIND_COLUMN,
+  								 relname, attnum,
+  								 NameStr(pg_attribute_tuple->attname));
++ 	/* SELinux checks */
++ 	sepgsql_attribute_grant(relOid, attnum);
+  
+  	/*
+  	 * Generate new ACL.
+*************** ExecGrant_Relation(InternalGrant *istmt)
+*** 1029,1034 ****
+--- 1039,1046 ----
+  										 ? ACL_KIND_SEQUENCE : ACL_KIND_CLASS,
+  										 NameStr(pg_class_tuple->relname),
+  										 0, NULL);
++ 			/* SELinux checks */
++ 			sepgsql_relation_grant(relOid);
+  
+  			/*
+  			 * Generate new ACL.
+*************** ExecGrant_Database(InternalGrant *istmt)
+*** 1217,1222 ****
+--- 1229,1236 ----
+  									 datId, grantorId, ACL_KIND_DATABASE,
+  									 NameStr(pg_database_tuple->datname),
+  									 0, NULL);
++ 		/* SELinux permission checks */
++ 		sepgsql_database_grant(datId);
+  
+  		/*
+  		 * Generate new ACL.
+*************** ExecGrant_Fdw(InternalGrant *istmt)
+*** 1335,1340 ****
+--- 1349,1356 ----
+  									 fdwid, grantorId, ACL_KIND_FDW,
+  									 NameStr(pg_fdw_tuple->fdwname),
+  									 0, NULL);
++ 		/* SELinux permission checks */
++ 		sepgsql_fdw_grant(fdwid);
+  
+  		/*
+  		 * Generate new ACL.
+*************** ExecGrant_ForeignServer(InternalGrant *i
+*** 1454,1459 ****
+--- 1470,1477 ----
+  								   srvid, grantorId, ACL_KIND_FOREIGN_SERVER,
+  									 NameStr(pg_server_tuple->srvname),
+  									 0, NULL);
++ 		/* SELinux checks */
++ 		sepgsql_foreign_server_grant(srvid);
+  
+  		/*
+  		 * Generate new ACL.
 *************** ExecGrant_Function(InternalGrant *istmt)
 *** 1572,1577 ****
---- 1580,1587 ----
+--- 1590,1597 ----
[...11234 lines suppressed...]
++ #define sepgsql_proc_alter(a,b,c)				do {} while(0)
++ #define sepgsql_proc_drop(a)					do {} while(0)
++ #define sepgsql_proc_relabel(a,b)				(InvalidOid)
++ #define sepgsql_proc_grant(a)					do {} while(0)
++ #define sepgsql_proc_execute(a)					do {} while(0)
++ #define sepgsql_proc_hint_inlined(a)			(true)
++ #define sepgsql_proc_entrypoint(a,b)			do {} while(0)
++ 
++ #define sepgsql_rule_create(a,b)				do {} while(0)
++ #define sepgsql_rule_drop(a,b)					do {} while(0)
++ 
++ #define sepgsql_trigger_create(a,b,c)			do {} while(0)
++ #define sepgsql_trigger_alter(a,b)				do {} while(0)
++ #define sepgsql_trigger_drop(a,b)				do {} while(0)
++ 
++ #define sepgsql_ts_config_create(a,b)			(InvalidOid)
++ #define sepgsql_ts_config_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_config_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_config_create(a,b)			(InvalidOid)
++ #define sepgsql_ts_config_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_config_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_dict_create(a,b)				(InvalidOid)
++ #define sepgsql_ts_dict_alter(a,b)				do {} while(0)
++ #define sepgsql_ts_dict_drop(a)					do {} while(0)
++ 
++ #define sepgsql_ts_parser_create(a,b,c,d,e,f,g)	(InvalidOid)
++ #define sepgsql_ts_parser_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_parser_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_template_create(a,b,c,d)		(InvalidOid)
++ #define sepgsql_ts_template_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_template_drop(a)				do {} while(0)
++ 
++ #define sepgsql_type_create(a,b,c,d,e,f,g,h,i,j)	(InvalidOid)
++ #define sepgsql_type_alter(a,b,c)				do {} while(0)
++ #define sepgsql_type_drop(a)					do {} while(0)
++ 
++ #define sepgsql_sysobj_drop(a)					do {} while(0)
++ 
++ #define sepgsql_file_stat(a)					do {} while(0)
++ #define sepgsql_file_read(a)					do {} while(0)
++ #define sepgsql_file_write(a)					do {} while(0)
 + 
 + /* label.c */
 + #define sepgsqlTupleDescHasSecLabel(a,b)		(false)
 + #define sepgsqlSetDefaultSecLabel(a,b)			do {} while(0)
-+ #define sepgsqlCreateTableColumns(a,b,c,d,e)	(NULL)
-+ #define sepgsqlCopyTableColumns(a)				(NULL)
-+ #define sepgsqlMetaSecurityLabel()				(NULL)
 + #define sepgsqlTransSecLabelIn(a)				(a)
 + #define sepgsqlTransSecLabelOut(a)				(a)
 + #define sepgsqlRawSecLabelIn(a)					(a)
@@ -15420,6 +18925,30 @@ diff -Nrpc base/src/include/storage/lwlo
   	/* Individual lock IDs end here */
   	FirstBufMappingLock,
   	FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS,
+diff -Nrpc base/src/include/storage/proc.h sepgsql/src/include/storage/proc.h
+*** base/src/include/storage/proc.h	Thu Feb 26 10:18:55 2009
+--- sepgsql/src/include/storage/proc.h	Tue Dec  8 14:04:25 2009
+*************** typedef struct PROC_HDR
+*** 143,150 ****
+   * normal operation. Startup process also consumes one slot, but WAL
+   * writer and autovacuum launcher are launched only after it has
+   * exited.
+   */
+! #define NUM_AUXILIARY_PROCS		3
+  
+  
+  /* configurable options */
+--- 143,152 ----
+   * normal operation. Startup process also consumes one slot, but WAL
+   * writer and autovacuum launcher are launched only after it has
+   * exited.
++  * In addition, a netlink receiver process may be launched, if SELinux
++  * support is enabled.
+   */
+! #define NUM_AUXILIARY_PROCS		4
+  
+  
+  /* configurable options */
 diff -Nrpc base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h
 *** base/src/include/utils/errcodes.h	Fri Mar  6 09:45:33 2009
 --- sepgsql/src/include/utils/errcodes.h	Wed Jul 15 19:35:52 2009
@@ -15451,6 +18980,41 @@ diff -Nrpc base/src/include/utils/syscac
   	STATRELATT,
   	TSCONFIGMAP,
   	TSCONFIGNAMENSP,
+diff -Nrpc base/src/test/regress/GNUmakefile sepgsql/src/test/regress/GNUmakefile
+*** base/src/test/regress/GNUmakefile	Sat Jan  3 13:01:35 2009
+--- sepgsql/src/test/regress/GNUmakefile	Tue Dec  1 17:11:40 2009
+*************** ifdef NO_LOCALE
+*** 38,43 ****
+--- 38,49 ----
+  NOLOCALE += --no-locale
+  endif
+  
++ # SELinux support
++ ENABLE_SELINUX =
++ ifdef SELINUX
++ ENABLE_SELINUX += --enable-selinux
++ endif
++ 
+  # stuff to pass into build of pg_regress
+  EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \
+  	'-DMAKEPROG="$(MAKE)"' \
+*************** tablespace-setup:
+*** 138,144 ****
+  ## Run tests
+  ##
+  
+! pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+  
+  check: all
+  	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
+--- 144,150 ----
+  ## Run tests
+  ##
+  
+! pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(ENABLE_SELINUX)
+  
+  check: all
+  	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
 diff -Nrpc base/src/test/regress/expected/sanity_check.out sepgsql/src/test/regress/expected/sanity_check.out
 *** base/src/test/regress/expected/sanity_check.out	Tue Feb 10 10:10:02 2009
 --- sepgsql/src/test/regress/expected/sanity_check.out	Thu Jul 16 23:18:11 2009
@@ -15481,3 +19045,72 @@ diff -Nrpc base/src/test/regress/expecte
   
   --
   -- another sanity check: every system catalog that has OIDs should have
+diff -Nrpc base/src/test/regress/pg_regress.c sepgsql/src/test/regress/pg_regress.c
+*** base/src/test/regress/pg_regress.c	Thu Jun 18 10:20:52 2009
+--- sepgsql/src/test/regress/pg_regress.c	Tue Dec  1 17:11:40 2009
+*************** static _stringlist *schedulelist = NULL;
+*** 82,87 ****
+--- 82,88 ----
+  static _stringlist *extra_tests = NULL;
+  static char *temp_install = NULL;
+  static char *temp_config = NULL;
++ static bool enable_selinux = false;
+  static char *top_builddir = NULL;
+  static bool nolocale = false;
+  static char *hostname = NULL;
+*************** help(void)
+*** 1863,1868 ****
+--- 1864,1870 ----
+  	printf(_("  --top-builddir=DIR        (relative) path to top level build directory\n"));
+  	printf(_("  --port=PORT               start postmaster on PORT\n"));
+  	printf(_("  --temp-config=PATH        append contents of PATH to temporary config\n"));
++ 	printf(_("  --enable-selinux          enables SELinux support, if available\n"));
+  	printf(_("\n"));
+  	printf(_("Options for using an existing installation:\n"));
+  	printf(_("  --host=HOST               use postmaster running on HOST\n"));
+*************** regression_main(int argc, char *argv[], 
+*** 1907,1912 ****
+--- 1909,1915 ----
+  		{"dlpath", required_argument, NULL, 17},
+  		{"create-role", required_argument, NULL, 18},
+  		{"temp-config", required_argument, NULL, 19},
++ 		{"enable-selinux", optional_argument, NULL, 20},
+  		{NULL, 0, NULL, 0}
+  	};
+  
+*************** regression_main(int argc, char *argv[], 
+*** 1997,2002 ****
+--- 2000,2008 ----
+  			case 19:
+  				temp_config = strdup(optarg);
+  				break;
++ 			case 20:
++ 				enable_selinux = true;
++ 				break;
+  			default:
+  				/* getopt_long already emitted a complaint */
+  				fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"),
+*************** regression_main(int argc, char *argv[], 
+*** 2086,2095 ****
+  		/* initdb */
+  		header(_("initializing database system"));
+  		snprintf(buf, sizeof(buf),
+! 				 SYSTEMQUOTE "\"%s/initdb\" -D \"%s/data\" -L \"%s\" --noclean%s%s > \"%s/log/initdb.log\" 2>&1" SYSTEMQUOTE,
+  				 bindir, temp_install, datadir,
+  				 debug ? " --debug" : "",
+  				 nolocale ? " --no-locale" : "",
+  				 outputdir);
+  		if (system(buf))
+  		{
+--- 2092,2102 ----
+  		/* initdb */
+  		header(_("initializing database system"));
+  		snprintf(buf, sizeof(buf),
+! 				 SYSTEMQUOTE "\"%s/initdb\" -D \"%s/data\" -L \"%s\" --noclean%s%s%s > \"%s/log/initdb.log\" 2>&1" SYSTEMQUOTE,
+  				 bindir, temp_install, datadir,
+  				 debug ? " --debug" : "",
+  				 nolocale ? " --no-locale" : "",
++ 				 enable_selinux ? " --enable-selinux" : "",
+  				 outputdir);
+  		if (system(buf))
+  		{


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sepostgresql.spec	11 Sep 2009 10:40:20 -0000	1.42
+++ sepostgresql.spec	8 Dec 2009 06:00:14 -0000	1.43
@@ -12,7 +12,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.4.1
-Release: 2305%{?dist}
+Release: 2464%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -192,6 +192,10 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Fri Dec 8 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2464
+- rework: backport features from v8.5devel tree
+- fixbug: selinux netlink receiver process didn't have correct ps display
+
 * Fri Sep 11 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2305
 - Upgrade base SE-PostgreSQL v8.4.0->v8.4.1
 - rework: backport features from v8.5devel tree



From dcbw at fedoraproject.org  Tue Dec  8 06:16:26 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  8 Dec 2009 06:16:26 +0000 (UTC)
Subject: File ModemManager-0.2.997.tar.bz2 uploaded to lookaside cache by
	dcbw
Message-ID: <20091208061626.F235910F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ModemManager:

b2b550d36eaf98616b20b656bcb21800  ModemManager-0.2.997.tar.bz2



From dcbw at fedoraproject.org  Tue Dec  8 06:17:29 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  8 Dec 2009 06:17:29 +0000 (UTC)
Subject: rpms/ModemManager/devel .cvsignore, 1.4, 1.5 ModemManager.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091208061729.6E6C411C00C5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15059

Modified Files:
	.cvsignore ModemManager.spec sources 
Log Message:
* Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1
- core: fix reconnect after manual disconnect (rh #541314)
- core: fix various segfaults during registration
- core: fix probing of various modems on big-endian architectures (ie PPC)
- core: implement modem states to avoid duplicate operations
- hso: fix authentication for Icera-based devices like iCON 505
- zte: use correct port for new devices
- nozomi: fix detection




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Nov 2009 17:39:15 -0000	1.4
+++ .cvsignore	8 Dec 2009 06:17:28 -0000	1.5
@@ -1,3 +1,4 @@
 ModemManager-0.2-20090707.tar.bz2
 ModemManager-0.2-20090826.tar.bz2
 ModemManager-0.2-20091105.tar.bz2
+ModemManager-0.2.997.tar.bz2


Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/ModemManager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ModemManager.spec	5 Nov 2009 17:39:15 -0000	1.5
+++ ModemManager.spec	8 Dec 2009 06:17:28 -0000	1.6
@@ -1,16 +1,16 @@
-%define snapshot 20091105
+%define snapshot %{nil}
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
-Version: 0.2
-Release: 4.%{snapshot}%{?dist}
+Version: 0.2.997
+Release: 1%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
 #    ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 #    make distcheck
 #
-Source: %{name}-%{version}-%{snapshot}.tar.bz2
+Source: %{name}-%{version}%{snapshot}.tar.bz2
 License: GPLv2+
 Group: System Environment/Base
 
@@ -62,6 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1
+- core: fix reconnect after manual disconnect (rh #541314)
+- core: fix various segfaults during registration
+- core: fix probing of various modems on big-endian architectures (ie PPC)
+- core: implement modem states to avoid duplicate operations
+- hso: fix authentication for Icera-based devices like iCON 505
+- zte: use correct port for new devices
+- nozomi: fix detection
+
 * Thu Nov  5 2009 Dan Williams <dcbw at redhat.com> - 0.2-4.20091105
 - Update to latest git
 - core: fix pppd 2.4.5 errors about 'baudrate 0'


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Nov 2009 17:39:15 -0000	1.4
+++ sources	8 Dec 2009 06:17:28 -0000	1.5
@@ -1 +1 @@
-b53ac98ef5b41a39a77037fdc272f099  ModemManager-0.2-20091105.tar.bz2
+b2b550d36eaf98616b20b656bcb21800  ModemManager-0.2.997.tar.bz2



From dcbw at fedoraproject.org  Tue Dec  8 06:32:56 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  8 Dec 2009 06:32:56 +0000 (UTC)
Subject: rpms/ModemManager/F-12 .cvsignore, 1.3, 1.4 ModemManager.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20091208063256.B793611C00C5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18407

Modified Files:
	.cvsignore ModemManager.spec sources 
Log Message:
* Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1
- core: fix reconnect after manual disconnect (rh #541314)
- core: fix various segfaults during registration
- core: fix probing of various modems on big-endian architectures (ie PPC)
- core: implement modem states to avoid duplicate operations
- hso: fix authentication for Icera-based devices like iCON 505
- zte: use correct port for new devices
- nozomi: fix detection




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Aug 2009 19:14:41 -0000	1.3
+++ .cvsignore	8 Dec 2009 06:32:53 -0000	1.4
@@ -1,2 +1,4 @@
 ModemManager-0.2-20090707.tar.bz2
 ModemManager-0.2-20090826.tar.bz2
+ModemManager-0.2-20091105.tar.bz2
+ModemManager-0.2.997.tar.bz2


Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/ModemManager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ModemManager.spec	13 Nov 2009 20:09:34 -0000	1.5
+++ ModemManager.spec	8 Dec 2009 06:32:54 -0000	1.6
@@ -1,16 +1,16 @@
-%define snapshot 20091105
+%define snapshot %{nil}
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
-Version: 0.2
-Release: 4.%{snapshot}%{?dist}
+Version: 0.2.997
+Release: 1%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
 #    ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 #    make distcheck
 #
-Source: %{name}-%{version}-%{snapshot}.tar.bz2
+Source: %{name}-%{version}%{snapshot}.tar.bz2
 License: GPLv2+
 Group: System Environment/Base
 
@@ -62,6 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1
+- core: fix reconnect after manual disconnect (rh #541314)
+- core: fix various segfaults during registration
+- core: fix probing of various modems on big-endian architectures (ie PPC)
+- core: implement modem states to avoid duplicate operations
+- hso: fix authentication for Icera-based devices like iCON 505
+- zte: use correct port for new devices
+- nozomi: fix detection
+
 * Thu Nov  5 2009 Dan Williams <dcbw at redhat.com> - 0.2-4.20091105
 - Update to latest git
 - core: fix pppd 2.4.5 errors about 'baudrate 0'


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Nov 2009 20:09:34 -0000	1.4
+++ sources	8 Dec 2009 06:32:54 -0000	1.5
@@ -1 +1 @@
-b53ac98ef5b41a39a77037fdc272f099  ModemManager-0.2-20091105.tar.bz2
+b2b550d36eaf98616b20b656bcb21800  ModemManager-0.2.997.tar.bz2



From dcbw at fedoraproject.org  Tue Dec  8 07:08:20 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  8 Dec 2009 07:08:20 +0000 (UTC)
Subject: File NetworkManager-0.7.997.tar.bz2 uploaded to lookaside cache by
	dcbw
Message-ID: <20091208070820.8261F10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for NetworkManager:

c7d647ffcad0ae2f22e93f1aea8449b5  NetworkManager-0.7.997.tar.bz2



From dcbw at fedoraproject.org  Tue Dec  8 07:08:57 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  8 Dec 2009 07:08:57 +0000 (UTC)
Subject: File network-manager-applet-0.7.997.tar.bz2 uploaded to lookaside
	cache by dcbw
Message-ID: <20091208070857.B4CB410F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for NetworkManager:

4a07695989e4584b645fec39a14ab424  network-manager-applet-0.7.997.tar.bz2



From dcbw at fedoraproject.org  Tue Dec  8 07:11:07 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  8 Dec 2009 07:11:07 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.113,
	1.114 NetworkManager.spec, 
	1.294, 1.295 nm-applet-internal-buildfixes.patch, 1.14,
	1.15 nm-applet-no-notifications.patch, 1.1, 1.2 sources, 1.155, 1.156
Message-ID: <20091208071107.C1F1B11C03F6@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26191

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch 
	nm-applet-no-notifications.patch sources 
Log Message:
* Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-1
- core: remove haldaemon from initscript dependencies (rh #542078)
- core: handle PEM certificates without an ending newline (rh #507315)
- core: fix rfkill reporting for ipw2x00 devices
- core: increase PPPoE timeout to 30 seconds
- core: fix re-activating system connections with secrets
- core: fix crash when deleting automatically created wired connections
- core: ensure that a VPN's DNS servers are used when sharing the VPN connection
- ifcfg-rh: support routes files (rh #507307)
- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
- ifcfg-rh: interpret DEFROUTE as never-default (rh #528281)
- ifcfg-rh: handle MODE=Auto correctly
- rpm: fix rpmlint errors
- applet: don't crash on various D-Bus and other errors (rh #545011) (rh #542617)
- editor: fix various PolicyKit-related crashes (rh #462944)
- applet+editor: notify user that private keys must be protected




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- .cvsignore	13 Nov 2009 19:40:56 -0000	1.113
+++ .cvsignore	8 Dec 2009 07:11:05 -0000	1.114
@@ -171,3 +171,5 @@ NetworkManager-0.7.996.git20091021.tar.b
 network-manager-applet-0.7.996.git20091021.tar.bz2
 NetworkManager-0.7.996.git20091113.tar.bz2
 network-manager-applet-0.7.996.git20091113.tar.bz2
+NetworkManager-0.7.997.tar.bz2
+network-manager-applet-0.7.997.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- NetworkManager.spec	13 Nov 2009 19:40:57 -0000	1.294
+++ NetworkManager.spec	8 Dec 2009 07:11:05 -0000	1.295
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20091113
-%define applet_snapshot .git20091113
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.996
-Release: 7%{snapshot}%{?dist}
+Version: 0.7.997
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -29,7 +29,8 @@ Patch2: explain-dns1-dns2.patch
 Patch3: nm-applet-no-notifications.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-PreReq:   chkconfig
+Requires(post): chkconfig
+Requires(preun): chkconfig
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: glib2 >= %{glib2_version}
@@ -109,10 +110,10 @@ Requires: %{name}-glib = %{epoch}:%{vers
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: libnotify >= 0.4.3
-PreReq:  gtk2 >= %{gtk2_version}
 Requires: gnome-keyring
 Requires: nss >= 3.11.7
 Requires: gnome-icon-theme
+Requires(post): gtk2 >= %{gtk2_version}
 
 %description gnome
 This package contains GNOME utilities and applications for use with
@@ -201,6 +202,8 @@ popd
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 
+%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager
+
 %find_lang %{name}
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
@@ -239,8 +242,8 @@ fi
 /sbin/chkconfig --del NetworkManagerDispatcher
 exit 0
 
-%post   glib -p /sbin/ldconfig
-%postun glib -p /sbin/ldconfig
+%post	glib -p /sbin/ldconfig
+%postun	glib -p /sbin/ldconfig
 
 %pre gnome
 if [ "$1" -gt 1 ]; then
@@ -297,6 +300,7 @@ fi
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 %dir %{_localstatedir}/run/NetworkManager
+%dir %{_localstatedir}/lib/NetworkManager
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
@@ -356,7 +360,24 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
-* Fri Nov 13 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-.git20091113
+* Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-1
+- core: remove haldaemon from initscript dependencies (rh #542078)
+- core: handle PEM certificates without an ending newline (rh #507315)
+- core: fix rfkill reporting for ipw2x00 devices
+- core: increase PPPoE timeout to 30 seconds
+- core: fix re-activating system connections with secrets
+- core: fix crash when deleting automatically created wired connections
+- core: ensure that a VPN's DNS servers are used when sharing the VPN connection
+- ifcfg-rh: support routes files (rh #507307)
+- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
+- ifcfg-rh: interpret DEFROUTE as never-default (rh #528281)
+- ifcfg-rh: handle MODE=Auto correctly
+- rpm: fix rpmlint errors
+- applet: don't crash on various D-Bus and other errors (rh #545011) (rh #542617)
+- editor: fix various PolicyKit-related crashes (rh #462944)
+- applet+editor: notify user that private keys must be protected
+
+* Fri Nov 13 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-7.git20091113
 - nm: better pidfile handing (rh #517362)
 - nm: save WiFi and Networking enabled/disabled states across reboot
 - nm: fix crash with missing VPN secrets (rh #532084)
@@ -386,7 +407,7 @@ fi
 - applet: fix "could not find required resources" error (rh #529766)
 
 * Fri Oct  2 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-4.git20091002
-- install: fix -gnome package %pre script failures (rh #526519)
+- install: fix -gnome package pre script failures (rh #526519)
 - nm: fix failures validating private keys when using the NSS crypto backend
 - applet: fix crashes when clicking on menu but not associated (rh #526535)
 - editor: fix crash editing wired 802.1x settings
@@ -578,7 +599,7 @@ fi
 - nm: Handle DHCP Classless Static Routes (RFC 3442)
 - nm: Fix Mobile Broadband and PPPoE to always use 'noauth'
 - nm: Better compatibility with older dual-SSID AP configurations (rh #445369)
-- nm: Mark nm-system-settings.conf as %config (rh #465633)
+- nm: Mark nm-system-settings.conf as config (rh #465633)
 - nm-tool: Show VPN connection information
 - ifcfg-rh: Silence message about ignoring loopback config (rh #484060)
 - ifcfg-rh: Fix issue with wrong gateway for system connections (rh #476089)
@@ -1091,12 +1112,12 @@ fi
 - Update to 0.6.5 final
 - Don't lose scanned security information
 
-* Mon Apr  9 2007 Dan Williams  <dcbw at redhat.com> - 1:0.6.5-0.7.svn2547
+* Mon Apr  9 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.7.svn2547
 - Update from trunk
-    - Updated translations
-    - Cleaned-up VPN properties dialogs
-    - Fix 64-bit kernel leakage issues in WEXT
-    - Don't capture and redirect wpa_supplicant log output
+	* Updated translations
+	* Cleaned-up VPN properties dialogs
+	* Fix 64-bit kernel leakage issues in WEXT
+	* Don't capture and redirect wpa_supplicant log output
 
 * Wed Mar 28 2007 Matthew Barnes  <mbarnes at redhat.com> 1:0.6.5-0.6.svn2474
 - Close private D-Bus connections. (#232691)
@@ -1196,14 +1217,14 @@ fi
 
 * Thu Mar 30 2006 Dan Williams <dcbw at redhat.com> - 0.6.2-1
 - Update to 0.6.2:
-    * Fix various WPA-related bugs
-    * Clean up leaks
-    * Increased DHCP timeout to account for slow DHCP servers, or STP-enabled
-        switches
-    * Allow applet to reconnect on dbus restarts
-    * Add "Dynamic WEP" support
-    * Allow hiding of password/key entry text
-    * More responsive connection switching
+	* Fix various WPA-related bugs
+	* Clean up leaks
+	* Increased DHCP timeout to account for slow DHCP servers, or STP-enabled
+		switches
+	* Allow applet to reconnect on dbus restarts
+	* Add "Dynamic WEP" support
+	* Allow hiding of password/key entry text
+	* More responsive connection switching
 
 * Tue Mar 14 2006 Peter Jones <pjones at redhat.com> - 0.6.0-3
 - Fix device bringup on resume

nm-applet-internal-buildfixes.patch:
 configure.ac                      |    8 +-------
 src/Makefile.am                   |    8 +++++++-
 src/connection-editor/Makefile.am |    9 ++++++++-
 src/gconf-helpers/Makefile.am     |    8 +++++++-
 src/gnome-bluetooth/Makefile.am   |    9 ++++++++-
 src/utils/Makefile.am             |    9 ++++++++-
 src/utils/tests/Makefile.am       |    5 ++++-
 src/wireless-security/Makefile.am |    8 +++++++-
 8 files changed, 50 insertions(+), 14 deletions(-)

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nm-applet-internal-buildfixes.patch	26 Aug 2009 20:32:30 -0000	1.14
+++ nm-applet-internal-buildfixes.patch	8 Dec 2009 07:11:05 -0000	1.15
@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac	2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac	2009-07-28 13:11:39.261718877 -0400
 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.16
--		 NetworkManager >= 0.7.996
--		 libnm-glib >= 0.7.996
--		 libnm-util >= 0.7.996
--		 libnm-glib-vpn >= 0.7.996
+-		 NetworkManager >= 0.7.997
+-		 libnm-glib >= 0.7.997
+-		 libnm-util >= 0.7.997
+-		 libnm-glib-vpn >= 0.7.997
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
@@ -23,9 +23,9 @@ diff -up NetworkManager-0.7.996/network-
  		  have_gbt=yes, have_gbt=no)
  AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
  
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -48,9 +48,9 @@ diff -up NetworkManager-0.7.996/network-
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = \
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -68,9 +68,9 @@ diff -up NetworkManager-0.7.996/network-
 +	-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.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
 @@ -6,6 +6,9 @@ INCLUDES = \
  	-DLOCALEDIR="\"$(datadir)/locale\""	\
  	-I$(top_srcdir)/src/gconf-helpers/ \
@@ -94,9 +94,9 @@ diff -up NetworkManager-0.7.996/network-
  endif
  
  EXTRA_DIST = network-manager-applet.c
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
  
  bin_PROGRAMS = nm-applet
@@ -119,10 +119,12 @@ diff -up NetworkManager-0.7.996/network-
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
-@@ -1,3 +1,7 @@
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+@@ -1,5 +1,9 @@
+ SUBDIRS=. tests
+ 
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
 +           -I${top_srcdir}/../libnm-glib
@@ -139,9 +141,21 @@ diff -up NetworkManager-0.7.996/network-
 +	-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.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+@@ -1,4 +1,7 @@
+-INCLUDES = -I$(top_srcdir)/src/utils
++INCLUDES = -I$(top_srcdir)/src/utils \
++           -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
+ 
+ noinst_PROGRAMS = test-utils
+ 
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  

nm-applet-no-notifications.patch:
 nm-applet.schemas.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: nm-applet-no-notifications.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/nm-applet-no-notifications.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nm-applet-no-notifications.patch	22 Oct 2009 01:09:23 -0000	1.1
+++ nm-applet-no-notifications.patch	8 Dec 2009 07:11:05 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/nm-applet.schemas.in.foo NetworkManager-0.7.996/network-manager-applet-0.7.996/nm-applet.schemas.in
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in.foo NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
 @@ -6,7 +6,7 @@
        <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
        <owner>nm-applet</owner>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- sources	13 Nov 2009 19:58:53 -0000	1.155
+++ sources	8 Dec 2009 07:11:05 -0000	1.156
@@ -1,2 +1,2 @@
-c839dcd0a0616291165de5b1d12ae799  network-manager-applet-0.7.996.git20091113.tar.bz2
-b180d4feffbcaf099d6c148b2897abc1  NetworkManager-0.7.996.git20091113.tar.bz2
+c7d647ffcad0ae2f22e93f1aea8449b5  NetworkManager-0.7.997.tar.bz2
+4a07695989e4584b645fec39a14ab424  network-manager-applet-0.7.997.tar.bz2



From pmatilai at fedoraproject.org  Tue Dec  8 07:15:22 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  8 Dec 2009 07:15:22 +0000 (UTC)
Subject: File sqlite-3.6.21.tar.gz uploaded to lookaside cache by pmatilai
Message-ID: <20091208071522.F20CB10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sqlite:

03a8498828866b407c61c0aaf8ebe66c  sqlite-3.6.21.tar.gz



From pmatilai at fedoraproject.org  Tue Dec  8 07:15:52 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  8 Dec 2009 07:15:52 +0000 (UTC)
Subject: File sqlite_docs_3_6_21.zip uploaded to lookaside cache by pmatilai
Message-ID: <20091208071552.2803D10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sqlite:

ae89f8a873e2825079fae06c1e9a3421  sqlite_docs_3_6_21.zip



From pmatilai at fedoraproject.org  Tue Dec  8 07:16:40 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  8 Dec 2009 07:16:40 +0000 (UTC)
Subject: rpms/sqlite/devel .cvsignore, 1.33, 1.34 sources, 1.33,
	1.34 sqlite.spec, 1.67, 1.68
Message-ID: <20091208071640.BF66411C02A5@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27393

Modified Files:
	.cvsignore sources sqlite.spec 
Log Message:
- update to 3.6.21



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	19 Nov 2009 11:17:46 -0000	1.33
+++ .cvsignore	8 Dec 2009 07:16:40 -0000	1.34
@@ -1,2 +1,2 @@
-sqlite-3.6.20.tar.gz
-sqlite_docs_3_6_20.zip
+sqlite-3.6.21.tar.gz
+sqlite_docs_3_6_21.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	19 Nov 2009 11:17:46 -0000	1.33
+++ sources	8 Dec 2009 07:16:40 -0000	1.34
@@ -1,2 +1,2 @@
-0faf8fc8ccff5297513c6532b2b4ce23  sqlite-3.6.20.tar.gz
-64d1f3ad4a20f92594fd7263d408ad83  sqlite_docs_3_6_20.zip
+03a8498828866b407c61c0aaf8ebe66c  sqlite-3.6.21.tar.gz
+ae89f8a873e2825079fae06c1e9a3421  sqlite_docs_3_6_21.zip


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sqlite.spec	19 Nov 2009 11:17:46 -0000	1.67
+++ sqlite.spec	8 Dec 2009 07:16:40 -0000	1.68
@@ -4,7 +4,7 @@
 %bcond_without check
 
 # upstream doesn't provide separate -docs sources for all minor releases
-%define basever 3.6.20
+%define basever 3.6.21
 %define docver %(echo %{basever}|sed -e "s/\\./_/g")
 
 Summary: Library that implements an embeddable SQL database engine
@@ -172,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Dec 08 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.21-1
+- update to 3.6.21 (http://www.sqlite.org/releaselog/3_6_21.html)
+
 * Tue Nov 17 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.20-1
 - update to 3.6.20 (http://www.sqlite.org/releaselog/3_6_20.html)
 



From pkgdb at fedoraproject.org  Tue Dec  8 07:31:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 07:31:54 +0000
Subject: [pkgdb] evolution: lucilanga has given up watchcommits
Message-ID: <20091208073154.46B3710F891@bastion2.fedora.phx.redhat.com>

lucilanga has given up the watchcommits acl on evolution (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Dec  8 07:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 07:31:45 +0000
Subject: [pkgdb] evolution: lucilanga has given up watchcommits
Message-ID: <20091208073145.4596610F87E@bastion2.fedora.phx.redhat.com>

lucilanga has given up the watchcommits acl on evolution (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Dec  8 07:31:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 07:31:55 +0000
Subject: [pkgdb] evolution: lucilanga has given up watchcommits
Message-ID: <20091208073156.02AC310F89C@bastion2.fedora.phx.redhat.com>

lucilanga has given up the watchcommits acl on evolution (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Dec  8 07:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 07:32:08 +0000
Subject: [pkgdb] evolution: lucilanga has given up watchbugzilla
Message-ID: <20091208073208.84FA210F89D@bastion2.fedora.phx.redhat.com>

lucilanga has given up the watchbugzilla acl on evolution (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Dec  8 07:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 07:32:12 +0000
Subject: [pkgdb] evolution: lucilanga has given up watchcommits
Message-ID: <20091208073212.18FB010F890@bastion2.fedora.phx.redhat.com>

lucilanga has given up the watchcommits acl on evolution (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Dec  8 07:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 07:32:18 +0000
Subject: [pkgdb] evolution: lucilanga has given up watchbugzilla
Message-ID: <20091208073219.20C7310F89C@bastion2.fedora.phx.redhat.com>

lucilanga has given up the watchbugzilla acl on evolution (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Dec  8 07:32:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 07:32:21 +0000
Subject: [pkgdb] evolution: lucilanga has given up watchcommits
Message-ID: <20091208073221.20A8C10F89E@bastion2.fedora.phx.redhat.com>

lucilanga has given up the watchcommits acl on evolution (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Tue Dec  8 07:33:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 07:33:38 +0000
Subject: [pkgdb] evolution: lucilanga has given up watchbugzilla
Message-ID: <20091208073338.BE61410F87E@bastion2.fedora.phx.redhat.com>

lucilanga has given up the watchbugzilla acl on evolution (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From petersen at fedoraproject.org  Tue Dec  8 07:37:09 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  8 Dec 2009 07:37:09 +0000 (UTC)
Subject: rpms/gettext/devel gettext.spec,1.101,1.102
Message-ID: <20091208073709.B377011C0264@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31295

Modified Files:
	gettext.spec 
Log Message:
fix changelog header


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gettext.spec	27 Nov 2009 09:46:33 -0000	1.101
+++ gettext.spec	8 Dec 2009 07:37:07 -0000	1.102
@@ -274,7 +274,7 @@ fi
 
 
 %changelog
-* Fri Nov 27 2009 jens petersen <petersen at localhost.localdomain> - 0.17-16
+* Fri Nov 27 2009 Jens Petersen <petersen at redhat.com> - 0.17-16
 - fix FTBFS by removing openmp.m4 which conflicts with recent autoconf (#539211)
 - cleanup gettext-0.17-rpathFix.patch
   - separate gl_AC_TYPE_LONG_LONG replacement to another patch



From lucilanga at fedoraproject.org  Tue Dec  8 07:48:52 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  8 Dec 2009 07:48:52 +0000 (UTC)
Subject: rpms/evolution-rss/F-12 evolution-rss-0.1.4-opml-fix.patch, NONE,
	1.1 evolution-rss.spec, 1.42, 1.43
Message-ID: <20091208074852.9550711C0264@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv904

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-opml-fix.patch 
Log Message:
fix for bug #542206

evolution-rss-0.1.4-opml-fix.patch:
 rss-config-factory.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE evolution-rss-0.1.4-opml-fix.patch ---
diff -Naur evolution-rss-0.1.4/src/rss-config-factory.c evolution-rss-0.1.4-mod/src/rss-config-factory.c
--- evolution-rss-0.1.4/src/rss-config-factory.c	2009-08-26 11:24:36.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss-config-factory.c	2009-12-07 23:27:32.000000000 +0200
@@ -1300,8 +1300,9 @@
 	if (type == 0) {
 	gint size = 0;
 	gchar *base = NULL, *root = NULL, *last = NULL;
-	gchar *rssprefix = NULL, *rssurl = NULL, *rsstitle = NULL;
+	gchar *rssprefix = NULL;
 	while (src) {
+		gchar *rssurl = NULL, *rsstitle = NULL;
 		if (rf->cancel) {
 			if (src) xmlFree(src);
 			rf->cancel = 0;
@@ -1348,6 +1349,8 @@
 				} else if (strcmp(prop, "link")) {
 					rssprefix = root;
 					rssurl = (gchar *)xmlGetProp(src, (xmlChar *)"xmlUrl");
+					if (!rssurl)
+						goto fail;
 					rsstitle = (gchar *)xmlGetProp(src, (xmlChar *)"title");
 					gtk_label_set_text(GTK_LABEL(import_label), (gchar *)rsstitle);
 #if GTK_VERSION >= 2006000
@@ -1357,7 +1360,7 @@
 					import_one_feed(rssurl, rsstitle, rssprefix);
 					if (rssurl) xmlFree(rssurl);
 					if (rsstitle) xmlFree(rsstitle);
-                        		while (gtk_events_pending ())
+fail:					while (gtk_events_pending ())
                                 		gtk_main_iteration ();
 					current++;
 					float fr = ((current*100)/total);


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- evolution-rss.spec	26 Nov 2009 12:22:13 -0000	1.42
+++ evolution-rss.spec	8 Dec 2009 07:48:51 -0000	1.43
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	10%{?dist}
+Release:	11%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -23,6 +23,7 @@ Patch3:		evolution-rss-0.1.4-recv-feeds3
 Patch4:		evolution-rss-0.1.4-sanitize-icon.patch
 Patch5:		evolution-rss-0.1.4-empty-source.patch
 Patch6:		evolution-rss-0.1.4-reject-empty-url.patch
+Patch7:		evolution-rss-0.1.4-reject-empty-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -53,6 +54,7 @@ This is an evolution plugin which enable
 %patch4 -p1 -b .sanitize-icon
 %patch5 -p1 -b .empty-source
 %patch6 -p1 -b .reject-empty-url
+%patch7 -p1 -b .opml-fix
 
 %build
 %configure --with-primary-render=gecko
@@ -106,6 +108,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Tue Dec 08 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-11
+- fix for bug #542206
+
 * Thu Nov 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-10
 - add 2 upstream patches that fixes possible crashes
 



From transif at fedoraproject.org  Tue Dec  8 07:51:37 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  8 Dec 2009 07:51:37 +0000 (UTC)
Subject: comps/po hi.po,1.22,1.23
Message-ID: <20091208075137.11C6811C0264@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1524/po

Modified Files:
	hi.po 
Log Message:
Sending translation for Hindi


Index: hi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hi.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- hi.po	1 Sep 2009 06:46:55 -0000	1.22
+++ hi.po	8 Dec 2009 07:51:36 -0000	1.23
@@ -1,4 +1,4 @@
-# translation of hi.po to Hindi
+# translation of comps.HEAD.po to Hindi
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -7,10 +7,10 @@
 # Rajesh Ranjan <rajesh672 at gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: hi\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-01 02:22+0000\n"
-"PO-Revision-Date: 2009-09-01 12:17+0530\n"
+"POT-Creation-Date: 2009-12-08 02:23+0000\n"
+"PO-Revision-Date: 2009-12-08 13:21+0530\n"
 "Last-Translator: Rajesh Ranjan <rajesh672 at gmail.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\n"
 
 #: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 #: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
@@ -171,163 +172,163 @@ msgid "Clustering Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "???????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "?????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "?????????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "?????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "???????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "??????????????????????????? ?????? ???????????? ???????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "????????????????????????????????? ?????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "???????????????????????? (????????????) ??????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ???????????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "?????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "??????????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????? ?????? ????????? ??????????????? ???????????? ?????? ????????? ?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -336,19 +337,19 @@ msgstr ""
 "?????? ?????????????????? ?????? ????????? ????????? ???????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "GNOME ?????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -357,168 +358,168 @@ msgstr ""
 "?????????????????? ??????????????? ????????????????????? ??????."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "????????? ?????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+ ?????? GNOME ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ?????? XFCE ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ?????? KDE ??????????????? ????????????????????????????????? ?????? ??????????????? ???????????? ?????? ????????? ?????? ????????????????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "??????????????? ?????? ???????????? ?????? ?????????????????? ??????????????? ????????? ??????????????? ??????????????? ?????? ????????? ?????? ????????????????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "???????????? ??????????????? (X) ???????????????????????? ????????????????????? ?????? ?????????????????? ???????????? ?????? ????????? ?????? ??????????????? ???????????? ?????? ???????????????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "???????????????????????? ?????? ?????????????????? ?????????????????? ??????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K ???????????????????????? ?????????????????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE ?????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -527,142 +528,142 @@ msgstr ""
 "??????????????? ????????????????????? ??????."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "?????????????????? ??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "?????????????????? ?????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "?????????????????? ?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "??????????????? ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ?????????????????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "?????????????????? ???????????????"
 
@@ -672,37 +673,37 @@ msgstr "?????????????????? ???????????? 
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "????????????????????????/???????????????????????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????????? ?????????????????? ?????? ???????????? ?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -710,55 +711,55 @@ msgstr "??????????????? ?????? ?????????
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "PostgreSQL ??????????????? ????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "???????????? ??????????????????"
 
@@ -772,73 +773,73 @@ msgstr "SUGAR ?????? ???????????????????
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "??????????????? ????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????? ??????????????? ????????????????????? ?????? ?????? ???????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "??????????????? ????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "??????????????? ??????????????? ??????????????? ?????? ????????? ???????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -848,127 +849,127 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "??????????????? ?????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "????????????????????? ????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ???????????? ????????? ??????????????????????????? ??????????????? ?????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ???????????????????????????????????? ???????????? ????????? ???????????? ??????????????????????????? ?????? ??????????????? ?????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "????????????????????????-?????????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "??????????????????????????? ????????? ???????????????????????? ?????????????????????, PDF ???????????????, ?????? ?????? ?????? ??????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "?????? ???????????? ????????? ?????????????????? ??????????????? ?????? ?????????????????? ???????????????????????????-???????????? ????????? ?????? ??????????????????????????? ??????????????? ?????? ????????? ?????????????????? ??????."
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "?????? ??????????????? ???????????? IMAP ?????? SMTP ????????? ??????????????? ?????? ????????????????????? ???????????? ?????? ?????????????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr "?????? ????????????????????? ?????? ?????? X ?????????????????? ??????????????? ?????? ????????? ????????????????????????????????? ?????? ??????????????? ?????? ???????????? ?????????."
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "?????? ??????????????? ????????? ??????????????????????????? ?????? ????????? ????????????????????? ?????? ??????????????? ????????? ?????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "?????? ??????????????? ????????? DHCP, ?????????????????? ?????? NIS ???????????? ???????????????-?????????????????? ??????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -976,19 +977,19 @@ msgstr "?????? ????????????????????? ???
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "?????? ??????????????? ??????????????????????????????????????? ????????????????????? ?????????????????? ??????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "?????? ??????????????? ??????????????? ???????????????????????? ????????? ???????????????????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -996,7 +997,7 @@ msgstr "?????? ??????????????? ?????????
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1006,19 +1007,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "?????? ????????????????????? ?????? ??????????????? ?????? ?????? ????????? ??????????????? ????????? ???????????? ?????????."
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "?????? ????????????????????? ?????? ??????????????? ?????? ?????? FTP ??????????????? ????????? ???????????? ?????????."
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1026,19 +1027,19 @@ msgstr "?????? ????????????????????? ???
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????? ???????????? ???????????? ?????????????????? ??????????????? ??????????????? ??????????????????????????? ???????????? ?????? ?????????????????? ???????????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "?????? ???????????? ????????? Red Hat ?????? ????????? ??????????????? ??????????????? ??????????????? ????????????????????? ??????????????? ?????????????????? ??????."
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1048,13 +1049,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "?????? ???????????? ????????? ?????????????????? ????????????, ????????? ?????? ????????? ????????????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1062,13 +1063,13 @@ msgstr "?????? ???????????? ????????? ??
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "?????? ???????????? ????????? ????????? ?????? ????????????-???????????? ?????? ???????????????????????? ???????????? ?????? ????????? ??????????????? ??????????????? ?????????."
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1078,7 +1079,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1088,19 +1089,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????? ???????????? ??????????????????????????? ????????????????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????? ???????????? ??????????????? ??????????????????????????? ????????????????????? ???????????????????????? ?????? ???????????? ????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1110,13 +1111,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????? ??????????????? ???????????? ?????? ?????? ??????????????? ?????? DNS ????????? ??????????????? (BIND) ?????? ????????? ???????????? ?????????."
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1124,163 +1125,163 @@ msgstr "?????? ??????????????? ?????????
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "?????? ??????????????? ???????????? MySQL ??????????????? ?????? ????????? ?????????????????? ????????????????????? ?????? ???????????? ??????."
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "?????? ??????????????? ???????????? ????????? Postgresql ?????? ????????? ??????????????? ?????? ????????? ??????????????? ??????????????? ??????????????? ??????."
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "?????????????????? ??????????????? ?????? ?????????????????? ??????????????? ??????????????? ?????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "??????????????? ?????? ?????? ????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "???????????? ??????????????? ????????? ?????????????????? ?????? ???????????? ???????????? ?????? ??????????????? ???????????????."
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "??????????????? ?????????????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "????????????????????? ??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ?????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X ??????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ?????????????????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "???????????? ??????????????????"
 
@@ -1294,67 +1295,67 @@ msgid "Haskell Development"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "??????????????? ????????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "??????????????????????????????????????? ????????? ?????? ??????????????? ?????? ????????? ??????????????? ???????????? ???????????????."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (???????????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "????????????????????? ???????????????????????????????????? ???????????? ????????? ??????????????????????????? ??????????????? ?????? ???????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "???????????? ???????????????????????????????????? ???????????? ????????? ??????????????????????????? ?????? ??????????????? ?????? ????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "?????????????????? ??????????????????"
 
@@ -1370,115 +1371,117 @@ msgstr "??????????????????????????? ????
 msgid "Chichewa Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "??????????????????????????? ???????????????????????? ?????? ????????? ????????????????????? ??? ???????????????????????? ???????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "???????????????????????????????????? ??????????????????????????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "?????????????????? ????????????????????? ??? ??????????????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "???????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW ??????????????? ?????????????????????"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "?????????????????? ????????? ??? ???????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "???????????? ???????????????????????? ?????????????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1487,24 +1490,24 @@ msgstr ""
 "?????? ?????????????????????, ????????? ????????? ?????????????????? ?????? ????????????."
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "?????????????????????????????? CAML ???????????????????????????????????? ???????????? ??? ??????????????????????????? ?????? ?????????????????? ?????? ?????????????????????????????? ??????????????? ?????? ????????? ??????????????????."
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1513,12 +1516,12 @@ msgstr ""
 "???????????? ??????."
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "????????? ????????????????????? ??????????????????"
 
@@ -1542,49 +1545,59 @@ msgstr "?????????????????? ?????? ??????
 msgid "Books and Guides for Fedora users and developers"
 msgstr "?????????????????? ???????????????????????? ?????? ?????????????????????????????? ?????? ????????? ?????????????????? ?????? ????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "??????????????? ?????? (Base)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "??????????????? ?????? (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "?????????????????????????????? ???????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "?????????????????????"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
-msgstr "LXDE ?????? ??????????????? X11 ???????????????????????? ????????????????????? ?????? ?????? ?????? ???????????? ?????????????????????????????? ?????? ????????? ?????????????????? ???????????? ????????? ?????? ?????? ??????????????????, ?????????????????? ??????????????????????????? ?????? ?????????????????? ???????????????????????? ?????????."
+msgstr ""
+"LXDE ?????? ??????????????? X11 ???????????????????????? ????????????????????? ?????? ?????? ?????? ???????????? ?????????????????????????????? ?????? ????????? ?????????????????? ???????????? ????????? ?????? ?????? "
+"??????????????????, ?????????????????? ??????????????????????????? ?????? ?????????????????? ???????????????????????? ?????????."
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "???????????? ?????? ???????????????????????? ??????????????? ???????????????."
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "????????????????????? ???????????????????????? ?????????????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "????????????????????? ????????? ???????????????????????? ????????????????????? ?????? NetBook/NetTop/MID ?????????????????? ?????? ?????????."
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "??????????????????????????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "????????? ?????? ??????????????? ???????????????????????? ??????????????????????????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????????????? ????????????????????? ?????? ???????????? ???????????????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "????????????????????? ?????????????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1592,7 +1605,7 @@ msgstr ""
 "GNOME ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ??????????????? ??????????????????, ?????? "
 "?????????????????? ??????????????? ????????????????????? ??????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1600,7 +1613,7 @@ msgstr ""
 "KDE ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ?????? ?????????????????? ????????????, ????????????????????????, ??????????????? ??????????????????, ?????? "
 "?????????????????? ??????????????? ????????????????????? ??????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1608,11 +1621,11 @@ msgstr ""
 "????????? ???????????????????????? ?????????????????? ?????? ????????? ?????? ???????????? ???????????? ???????????? ?????? ??????????????????????????? ???????????? ??????????????? ??????????????? ?????? ????????????????????? ???????????? "
 "?????? ?????????????????? ???????????? ?????????. ??????????????? ?????????????????? ?????? ???????????? ??????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "X?????????????????? ???????????????????????? ??????????????????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1620,27 +1633,27 @@ msgstr ""
 "?????? ????????????????????? ?????? DocBook ????????????????????? ????????? ??????????????????????????????????????? ???????????? ?????? ?????????????????? HTML, PDF, ??????????????????????????????????????????, ?????? "
 "???????????????????????? ????????? ????????? ???????????? ?????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?????? ???????????? ????????????????????? ???????????????????????? ?????? ???????????? ??????????????? ??????????????? ?????? ???????????? ??????."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ????????????????????? ?????? ???????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "????????? ????????????????????? ?????? ???????????? ?????? ???????????? ????????????????????? ??? ???????????????????????? ?????? ???????????? ??????."
 



From lucilanga at fedoraproject.org  Tue Dec  8 07:57:08 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  8 Dec 2009 07:57:08 +0000 (UTC)
Subject: rpms/evolution-rss/F-12 evolution-rss.spec,1.43,1.44
Message-ID: <20091208075708.D85FD11C0264@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2643

Modified Files:
	evolution-rss.spec 
Log Message:
fix for bug #542206


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- evolution-rss.spec	8 Dec 2009 07:48:51 -0000	1.43
+++ evolution-rss.spec	8 Dec 2009 07:57:08 -0000	1.44
@@ -23,7 +23,7 @@ Patch3:		evolution-rss-0.1.4-recv-feeds3
 Patch4:		evolution-rss-0.1.4-sanitize-icon.patch
 Patch5:		evolution-rss-0.1.4-empty-source.patch
 Patch6:		evolution-rss-0.1.4-reject-empty-url.patch
-Patch7:		evolution-rss-0.1.4-reject-empty-url.patch
+Patch7:		evolution-rss-0.1.4-opml-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 



From dcbw at fedoraproject.org  Tue Dec  8 07:59:45 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  8 Dec 2009 07:59:45 +0000 (UTC)
Subject: rpms/NetworkManager/F-12 .cvsignore, 1.110,
	1.111 NetworkManager.spec, 
	1.295, 1.296 nm-applet-internal-buildfixes.patch, 1.14,
	1.15 nm-applet-no-notifications.patch, 1.1, 1.2 sources, 1.155, 1.156
Message-ID: <20091208075945.B091211C0264@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3176

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch 
	nm-applet-no-notifications.patch sources 
Log Message:
* Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-1
- core: remove haldaemon from initscript dependencies (rh #542078)
- core: handle PEM certificates without an ending newline (rh #507315)
- core: fix rfkill reporting for ipw2x00 devices
- core: increase PPPoE timeout to 30 seconds
- core: fix re-activating system connections with secrets
- core: fix crash when deleting automatically created wired connections
- core: ensure that a VPN's DNS servers are used when sharing the VPN connection
- ifcfg-rh: support routes files (rh #507307)
- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
- ifcfg-rh: interpret DEFROUTE as never-default (rh #528281)
- ifcfg-rh: handle MODE=Auto correctly
- rpm: fix rpmlint errors
- applet: don't crash on various D-Bus and other errors (rh #545011) (rh #542617)
- editor: fix various PolicyKit-related crashes (rh #462944)
- applet+editor: notify user that private keys must be protected




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- .cvsignore	29 Sep 2009 02:52:15 -0000	1.110
+++ .cvsignore	8 Dec 2009 07:59:45 -0000	1.111
@@ -165,3 +165,11 @@ NetworkManager-0.7.996.git20090921.tar.b
 network-manager-applet-0.7.996.git20090921.tar.bz2
 NetworkManager-0.7.996.git20090928.tar.bz2
 network-manager-applet-0.7.996.git20090928-menu-rework.tar.bz2
+NetworkManager-0.7.996.git20091002.tar.bz2
+network-manager-applet-0.7.996.git20091002.tar.bz2
+NetworkManager-0.7.996.git20091021.tar.bz2
+network-manager-applet-0.7.996.git20091021.tar.bz2
+NetworkManager-0.7.996.git20091113.tar.bz2
+network-manager-applet-0.7.996.git20091113.tar.bz2
+NetworkManager-0.7.997.tar.bz2
+network-manager-applet-0.7.997.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/NetworkManager.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- NetworkManager.spec	13 Nov 2009 19:42:31 -0000	1.295
+++ NetworkManager.spec	8 Dec 2009 07:59:45 -0000	1.296
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20091113
-%define applet_snapshot .git20091113
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.996
-Release: 7%{snapshot}%{?dist}
+Version: 0.7.997
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -29,7 +29,8 @@ Patch2: explain-dns1-dns2.patch
 Patch3: nm-applet-no-notifications.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-PreReq:   chkconfig
+Requires(post): chkconfig
+Requires(preun): chkconfig
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: glib2 >= %{glib2_version}
@@ -109,10 +110,10 @@ Requires: %{name}-glib = %{epoch}:%{vers
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: libnotify >= 0.4.3
-PreReq:  gtk2 >= %{gtk2_version}
 Requires: gnome-keyring
 Requires: nss >= 3.11.7
 Requires: gnome-icon-theme
+Requires(post): gtk2 >= %{gtk2_version}
 
 %description gnome
 This package contains GNOME utilities and applications for use with
@@ -201,6 +202,8 @@ popd
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 
+%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager
+
 %find_lang %{name}
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
@@ -239,8 +242,8 @@ fi
 /sbin/chkconfig --del NetworkManagerDispatcher
 exit 0
 
-%post   glib -p /sbin/ldconfig
-%postun glib -p /sbin/ldconfig
+%post	glib -p /sbin/ldconfig
+%postun	glib -p /sbin/ldconfig
 
 %pre gnome
 if [ "$1" -gt 1 ]; then
@@ -297,6 +300,7 @@ fi
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 %dir %{_localstatedir}/run/NetworkManager
+%dir %{_localstatedir}/lib/NetworkManager
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
@@ -356,7 +360,24 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
-* Fri Nov 13 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-.git20091113
+* Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-1
+- core: remove haldaemon from initscript dependencies (rh #542078)
+- core: handle PEM certificates without an ending newline (rh #507315)
+- core: fix rfkill reporting for ipw2x00 devices
+- core: increase PPPoE timeout to 30 seconds
+- core: fix re-activating system connections with secrets
+- core: fix crash when deleting automatically created wired connections
+- core: ensure that a VPN's DNS servers are used when sharing the VPN connection
+- ifcfg-rh: support routes files (rh #507307)
+- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
+- ifcfg-rh: interpret DEFROUTE as never-default (rh #528281)
+- ifcfg-rh: handle MODE=Auto correctly
+- rpm: fix rpmlint errors
+- applet: don't crash on various D-Bus and other errors (rh #545011) (rh #542617)
+- editor: fix various PolicyKit-related crashes (rh #462944)
+- applet+editor: notify user that private keys must be protected
+
+* Fri Nov 13 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-7.git20091113
 - nm: better pidfile handing (rh #517362)
 - nm: save WiFi and Networking enabled/disabled states across reboot
 - nm: fix crash with missing VPN secrets (rh #532084)
@@ -386,7 +407,7 @@ fi
 - applet: fix "could not find required resources" error (rh #529766)
 
 * Fri Oct  2 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-4.git20091002
-- install: fix -gnome package %pre script failures (rh #526519)
+- install: fix -gnome package pre script failures (rh #526519)
 - nm: fix failures validating private keys when using the NSS crypto backend
 - applet: fix crashes when clicking on menu but not associated (rh #526535)
 - editor: fix crash editing wired 802.1x settings
@@ -578,7 +599,7 @@ fi
 - nm: Handle DHCP Classless Static Routes (RFC 3442)
 - nm: Fix Mobile Broadband and PPPoE to always use 'noauth'
 - nm: Better compatibility with older dual-SSID AP configurations (rh #445369)
-- nm: Mark nm-system-settings.conf as %config (rh #465633)
+- nm: Mark nm-system-settings.conf as config (rh #465633)
 - nm-tool: Show VPN connection information
 - ifcfg-rh: Silence message about ignoring loopback config (rh #484060)
 - ifcfg-rh: Fix issue with wrong gateway for system connections (rh #476089)
@@ -1091,12 +1112,12 @@ fi
 - Update to 0.6.5 final
 - Don't lose scanned security information
 
-* Mon Apr  9 2007 Dan Williams  <dcbw at redhat.com> - 1:0.6.5-0.7.svn2547
+* Mon Apr  9 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.7.svn2547
 - Update from trunk
-    - Updated translations
-    - Cleaned-up VPN properties dialogs
-    - Fix 64-bit kernel leakage issues in WEXT
-    - Don't capture and redirect wpa_supplicant log output
+	* Updated translations
+	* Cleaned-up VPN properties dialogs
+	* Fix 64-bit kernel leakage issues in WEXT
+	* Don't capture and redirect wpa_supplicant log output
 
 * Wed Mar 28 2007 Matthew Barnes  <mbarnes at redhat.com> 1:0.6.5-0.6.svn2474
 - Close private D-Bus connections. (#232691)
@@ -1196,14 +1217,14 @@ fi
 
 * Thu Mar 30 2006 Dan Williams <dcbw at redhat.com> - 0.6.2-1
 - Update to 0.6.2:
-    * Fix various WPA-related bugs
-    * Clean up leaks
-    * Increased DHCP timeout to account for slow DHCP servers, or STP-enabled
-        switches
-    * Allow applet to reconnect on dbus restarts
-    * Add "Dynamic WEP" support
-    * Allow hiding of password/key entry text
-    * More responsive connection switching
+	* Fix various WPA-related bugs
+	* Clean up leaks
+	* Increased DHCP timeout to account for slow DHCP servers, or STP-enabled
+		switches
+	* Allow applet to reconnect on dbus restarts
+	* Add "Dynamic WEP" support
+	* Allow hiding of password/key entry text
+	* More responsive connection switching
 
 * Tue Mar 14 2006 Peter Jones <pjones at redhat.com> - 0.6.0-3
 - Fix device bringup on resume

nm-applet-internal-buildfixes.patch:
 configure.ac                      |    8 +-------
 src/Makefile.am                   |    8 +++++++-
 src/connection-editor/Makefile.am |    9 ++++++++-
 src/gconf-helpers/Makefile.am     |    8 +++++++-
 src/gnome-bluetooth/Makefile.am   |    9 ++++++++-
 src/utils/Makefile.am             |    9 ++++++++-
 src/utils/tests/Makefile.am       |    5 ++++-
 src/wireless-security/Makefile.am |    8 +++++++-
 8 files changed, 50 insertions(+), 14 deletions(-)

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nm-applet-internal-buildfixes.patch	26 Aug 2009 20:32:30 -0000	1.14
+++ nm-applet-internal-buildfixes.patch	8 Dec 2009 07:59:45 -0000	1.15
@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac	2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac	2009-07-28 13:11:39.261718877 -0400
 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.16
--		 NetworkManager >= 0.7.996
--		 libnm-glib >= 0.7.996
--		 libnm-util >= 0.7.996
--		 libnm-glib-vpn >= 0.7.996
+-		 NetworkManager >= 0.7.997
+-		 libnm-glib >= 0.7.997
+-		 libnm-util >= 0.7.997
+-		 libnm-glib-vpn >= 0.7.997
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
@@ -23,9 +23,9 @@ diff -up NetworkManager-0.7.996/network-
  		  have_gbt=yes, have_gbt=no)
  AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
  
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -48,9 +48,9 @@ diff -up NetworkManager-0.7.996/network-
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = \
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -68,9 +68,9 @@ diff -up NetworkManager-0.7.996/network-
 +	-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.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
 @@ -6,6 +6,9 @@ INCLUDES = \
  	-DLOCALEDIR="\"$(datadir)/locale\""	\
  	-I$(top_srcdir)/src/gconf-helpers/ \
@@ -94,9 +94,9 @@ diff -up NetworkManager-0.7.996/network-
  endif
  
  EXTRA_DIST = network-manager-applet.c
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
  
  bin_PROGRAMS = nm-applet
@@ -119,10 +119,12 @@ diff -up NetworkManager-0.7.996/network-
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
-@@ -1,3 +1,7 @@
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+@@ -1,5 +1,9 @@
+ SUBDIRS=. tests
+ 
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
 +           -I${top_srcdir}/../libnm-glib
@@ -139,9 +141,21 @@ diff -up NetworkManager-0.7.996/network-
 +	-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.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+@@ -1,4 +1,7 @@
+-INCLUDES = -I$(top_srcdir)/src/utils
++INCLUDES = -I$(top_srcdir)/src/utils \
++           -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
+ 
+ noinst_PROGRAMS = test-utils
+ 
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  

nm-applet-no-notifications.patch:
 nm-applet.schemas.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: nm-applet-no-notifications.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/nm-applet-no-notifications.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nm-applet-no-notifications.patch	22 Oct 2009 01:19:55 -0000	1.1
+++ nm-applet-no-notifications.patch	8 Dec 2009 07:59:45 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/nm-applet.schemas.in.foo NetworkManager-0.7.996/network-manager-applet-0.7.996/nm-applet.schemas.in
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in.foo NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in
+--- NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
 @@ -6,7 +6,7 @@
        <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
        <owner>nm-applet</owner>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/sources,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- sources	13 Nov 2009 19:59:14 -0000	1.155
+++ sources	8 Dec 2009 07:59:45 -0000	1.156
@@ -1,2 +1,2 @@
-c839dcd0a0616291165de5b1d12ae799  network-manager-applet-0.7.996.git20091113.tar.bz2
-b180d4feffbcaf099d6c148b2897abc1  NetworkManager-0.7.996.git20091113.tar.bz2
+c7d647ffcad0ae2f22e93f1aea8449b5  NetworkManager-0.7.997.tar.bz2
+4a07695989e4584b645fec39a14ab424  network-manager-applet-0.7.997.tar.bz2



From petersen at fedoraproject.org  Tue Dec  8 08:02:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue,  8 Dec 2009 08:02:23 +0000 (UTC)
Subject: rpms/gettext/F-12 gettext-0.17-long-long-int-m4.patch, NONE,
	1.1 gettext-0.17-rpathFix.patch, 1.2, 1.3 gettext.spec, 1.100, 1.101
Message-ID: <20091208080223.4B87211C0264@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gettext/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3836

Modified Files:
	gettext-0.17-rpathFix.patch gettext.spec 
Added Files:
	gettext-0.17-long-long-int-m4.patch 
Log Message:
backport FTBFS fixes from rawhide

gettext-0.17-long-long-int-m4.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gettext-0.17-long-long-int-m4.patch ---
diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix~ ./gettext-runtime/libasprintf/configure.ac
--- ./gettext-runtime/libasprintf/configure.ac.~	2007-10-08 05:37:36.000000000 +1000
+++ ./gettext-runtime/libasprintf/configure.ac	2008-08-28 16:43:18.000000000 +1000
@@ -54,7 +54,8 @@ dnl Checks for header files.
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_SIZE_T
-gl_AC_TYPE_LONG_LONG
+AC_TYPE_LONG_LONG_INT
+#gl_AC_TYPE_LONG_LONG
 gt_TYPE_LONGDOUBLE
 gt_TYPE_WCHAR_T
 gt_TYPE_WINT_T

gettext-0.17-rpathFix.patch:
 gettext-tools/gnulib-tests/Makefile.gnulib |    2 +-
 gettext-tools/tests/Makefile.am            |    1 +
 m4/libtool.m4                              |   25 ++++++++++++++++---------
 3 files changed, 18 insertions(+), 10 deletions(-)

Index: gettext-0.17-rpathFix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/F-12/gettext-0.17-rpathFix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gettext-0.17-rpathFix.patch	29 Aug 2008 00:19:30 -0000	1.2
+++ gettext-0.17-rpathFix.patch	8 Dec 2009 08:02:22 -0000	1.3
@@ -1,16 +1,3 @@
-diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix~ ./gettext-runtime/libasprintf/configure.ac
---- ./gettext-runtime/libasprintf/configure.ac.rpathFix~	2007-10-08 05:37:36.000000000 +1000
-+++ ./gettext-runtime/libasprintf/configure.ac	2008-08-28 16:43:18.000000000 +1000
-@@ -54,7 +54,8 @@ dnl Checks for header files.
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_INLINE
- AC_TYPE_SIZE_T
--gl_AC_TYPE_LONG_LONG
-+AC_TYPE_LONG_LONG_INT
-+#gl_AC_TYPE_LONG_LONG
- gt_TYPE_LONGDOUBLE
- gt_TYPE_WCHAR_T
- gt_TYPE_WINT_T
 diff -up ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~ ./gettext-tools/gnulib-tests/Makefile.gnulib
 --- ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~	2007-10-28 01:39:18.000000000 +1000
 +++ ./gettext-tools/gnulib-tests/Makefile.gnulib	2008-08-28 16:43:18.000000000 +1000
@@ -19,30 +6,10 @@ diff -up ./gettext-tools/gnulib-tests/Ma
  SUBDIRS =
  TESTS =
 -TESTS_ENVIRONMENT =
-+TESTS_ENVIRONMENT = LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:../../../../../lib:../../../../../lib64'
++TESTS_ENVIRONMENT = LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:'
  noinst_PROGRAMS =
  check_PROGRAMS =
  noinst_HEADERS =
-diff -up ./gettext-tools/src/Makefile.am.rpathFix~ ./gettext-tools/src/Makefile.am
---- ./gettext-tools/src/Makefile.am.rpathFix~	2007-10-08 05:37:38.000000000 +1000
-+++ ./gettext-tools/src/Makefile.am	2008-08-28 17:16:45.000000000 +1000
-@@ -62,6 +62,7 @@ projectsdir = $(pkgdatadir)/projects
- pkglibdir = $(libdir)/gettext
- 
- AM_CPPFLAGS = \
-+  -I../../../../../../usr/include \
-   -I. -I$(srcdir) \
-   -I.. -I$(top_srcdir) \
-   -I$(top_srcdir)/libgrep \
-@@ -82,7 +83,7 @@ LDADD = ../gnulib-lib/libgettextlib.la @
- 
- SED = sed
- YACC = @YACC@ -d
--GCJ = @GCJ@
-+GCJ = gcj
- GCJFLAGS = @GCJFLAGS@
- JAR = @JAR@
- JAVACOMP = $(SHELL) ../javacomp.sh
 diff -up ./gettext-tools/tests/Makefile.am.rpathFix~ ./gettext-tools/tests/Makefile.am
 --- ./gettext-tools/tests/Makefile.am.rpathFix~	2007-10-21 07:54:40.000000000 +1000
 +++ ./gettext-tools/tests/Makefile.am	2008-08-28 16:43:18.000000000 +1000
@@ -50,7 +17,7 @@ diff -up ./gettext-tools/tests/Makefile.
  		    LOCALE_JA='@LOCALE_JA@' \
  		    host_os='@host_os@' \
  		    CONFIG_SHELL='$(SHELL)' \
-+		    LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:../../../../../lib:../../../../../lib64' \
++		    LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:' \
  		    $(SHELL)
  
  xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/F-12/gettext.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gettext.spec	1 Sep 2009 07:38:51 -0000	1.100
+++ gettext.spec	8 Dec 2009 08:02:22 -0000	1.101
@@ -5,13 +5,14 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 Source2: msghack.py
-BuildRequires: autoconf >= 2.5
+# removal of openmp.m4
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake
 BuildRequires: libtool, bison, gcc-c++
 %if %{with java}
@@ -36,6 +37,7 @@ Patch5: gettext-0.17-open-args.patch
 Patch6: gettext-0.17-autopoint-CVS-441481.patch
 Patch7: gettext-0.17-rpathFix.patch
 Patch8: gettext-xgettext-python-unicode-surrogate-473946.patch
+Patch9: gettext-0.17-long-long-int-m4.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -82,8 +84,12 @@ This package contains libraries used int
 %patch6 -p0 -b .6-autopoint~
 %patch7 -p0 -b .rpathFix~
 %patch8 -p0 -b .unicode~
+%patch9 -p0 -b .longlong~
 
-./autogen.sh
+# necessary for autoconf >= 2.6.2:
+rm gettext-tools/gnulib-m4/openmp.m4
+
+./autogen.sh --quick --skip-gnulib
 
 
 %build
@@ -268,6 +274,13 @@ fi
 
 
 %changelog
+* Fri Nov 27 2009 Jens Petersen <petersen at redhat.com> - 0.17-16
+- fix FTBFS by removing openmp.m4 which conflicts with recent autoconf (#539211)
+- cleanup gettext-0.17-rpathFix.patch
+  - separate gl_AC_TYPE_LONG_LONG replacement to another patch
+  - use trailing ':' for tests LD_LIBRARY_PATH
+- run autogen.sh with --quick and --skip-gnulib
+
 * Tue Sep  1 2009 Jens Petersen <petersen at redhat.com> - 0.17-15
 - bring back autopoint requires cvs (#517361)
 - requires info rather than /sbin/install-info



From robert at fedoraproject.org  Tue Dec  8 08:18:07 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue,  8 Dec 2009 08:18:07 +0000 (UTC)
Subject: File unicornscan-0.4.7-2.tar.bz2 uploaded to lookaside cache by
	robert
Message-ID: <20091208081807.E098010F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for unicornscan:

4c5f272eb38c333c0094c32317edf758  unicornscan-0.4.7-2.tar.bz2



From robert at fedoraproject.org  Tue Dec  8 08:18:49 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue,  8 Dec 2009 08:18:49 +0000 (UTC)
Subject: rpms/unicornscan/devel unicornscan-0.4.7-geoip.patch, NONE,
	1.1 unicornscan-0.4.7-lib64.patch, NONE, 1.1 unicornscan.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091208081849.9231511C0264@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/unicornscan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7204

Modified Files:
	.cvsignore sources 
Added Files:
	unicornscan-0.4.7-geoip.patch unicornscan-0.4.7-lib64.patch 
	unicornscan.spec 
Log Message:
Initial import


unicornscan-0.4.7-geoip.patch:
 report.c |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE unicornscan-0.4.7-geoip.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which adds the
standard location of GeoIP data at Fedora in front of the original opening try. Unicornscan
upstream is expecting /etc/unicornscan/GeoIP.dat instead of /usr/share/GeoIP/GeoIP.dat by
default. This patch is looking for the existence of /usr/share/GeoIP/GeoIP.dat, otherwise
/etc/unicornscan/GeoIP.dat will be used to not break the standards from upstream, if patch
gets applied for a future unicornscan release.

--- unicornscan-0.4.7/src/scan_progs/report.c		2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/src/scan_progs/report.c.geoip	2009-11-17 13:16:04.000000000 +0100
@@ -68,9 +68,18 @@
 	report_t=rbinit(123);
 
 #ifdef HAVE_LIBGEOIP
-	gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
-	if (gi == NULL) {
-		ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+
+	if (access("/usr/share/GeoIP/GeoIP.dat", F_OK) == 0) {
+		gi=GeoIP_open("/usr/share/GeoIP/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip standard database `/usr/share/GeoIP/GeoIP.dat': %s", strerror(errno));
+		}
+	}
+	else {
+		gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+		}
 	}
 
 #endif

unicornscan-0.4.7-lib64.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE unicornscan-0.4.7-lib64.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which
adds support for x86_64, ppc64 or other 64 bit architectures using /usr/lib64 for
their libraries. Having lib64 in front of lib is mandatory, as 64 bit systems are
likely to run with multi-lib, that means 32 bit libraries are parallel in use. So
running autoconf is required after applying this patch.

--- unicornscan-0.4.7/configure.ac		2007-11-29 15:51:20.000000000 +0100
+++ unicornscan-0.4.7/configure.ac.lib64	2009-11-16 23:32:27.000000000 +0100
@@ -269,7 +269,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -331,7 +331,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then


--- NEW FILE unicornscan.spec ---
Summary:	Scalable, accurate, flexible and efficient network probing
Name:		unicornscan
Version:	0.4.7
Release:	1%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.unicornscan.org/
Source:		http://www.unicornscan.org/releases/%{name}-%{version}-2.tar.bz2
Patch0:		unicornscan-0.4.7-lib64.patch
Patch1:		unicornscan-0.4.7-geoip.patch
Requires(pre):	shadow-utils
BuildRequires:	flex, bison, %{_includedir}/pcap.h, %{_includedir}/ltdl.h
BuildRequires:	libdnet-devel, GeoIP-devel, postgresql-devel, autoconf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unicornscan is an attempt at a user-land distributed TCP/IP stack. It is
intended to provide a researcher a superior interface for introducing a
stimulus into and measuring a response from a TCP/IP enabled device or
network. Although it currently has hundreds of individual features, a main
set of abilities include: Asynchronous stateless TCP scanning with all
variations of TCP flags, asynchronous stateless TCP banner grabbing,
asynchronous protocol specific UDP scanning (sending enough of a signature
to elicit a response), active and passive remote OS, application and
component identification by analyzing responses, PCAP file logging and
filtering, relational database output, custom module support, customized
data-set views.

%prep
%setup -q
%patch0 -p1 -b .lib64
%patch1 -p1 -b .geoip
autoconf

%build
# - _GNU_SOURCE is required for "ucred" from <bits/socket.h> via <sys/socket.h>
# - Use classical non-SELinux permission schema once SELinux Reference Policy is
#   including unicornscan support directly, maybe with Fedora 13 and/or RHEL 6
# - MySQL support is only available in ./configure as inside broken and disabled
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
%configure --localstatedir=%{_localstatedir}/lib --with-pgsql --with-listen-user=%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Remove the static library files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.a

# Correct permissions from 755 to 644
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/*

%pre
getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Unicornscan User" %{name}
exit 0

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README README.database README.security THANKS
%doc TODO UDP_PAYLOADS_NEEDED docs/Unicornscan-Getting_Started.pdf
%doc src/output_modules/database/sql/pgsql_schema.sql src/parse/example_confs
%dir %{_sysconfdir}/%{name}
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/modules.conf
%config(noreplace) %{_sysconfdir}/%{name}/oui.txt
%config(noreplace) %{_sysconfdir}/%{name}/payloads.conf
%config(noreplace) %{_sysconfdir}/%{name}/ports.txt
%config(noreplace) %{_sysconfdir}/%{name}/unicorn.conf
%{_bindir}/fantaip
%{_bindir}/unibrow
%{_bindir}/unicfgtst
%{_bindir}/%{name}
%{_bindir}/us
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
# *.la files are referenced by the shared objects and required
%{_libdir}/%{name}/modules/httpexp.la
%{_libdir}/%{name}/modules/httpexp.so
%{_libdir}/%{name}/modules/http.la
%{_libdir}/%{name}/modules/http.so
%{_libdir}/%{name}/modules/ntalk.la
%{_libdir}/%{name}/modules/ntalk.so
%{_libdir}/%{name}/modules/osdetect.la
%{_libdir}/%{name}/modules/osdetect.so
%{_libdir}/%{name}/modules/pgsqldb.la
%{_libdir}/%{name}/modules/pgsqldb.so
%{_libdir}/%{name}/modules/rdns.la
%{_libdir}/%{name}/modules/rdns.so
%{_libdir}/%{name}/modules/sip.la
%{_libdir}/%{name}/modules/sip.so
%{_libdir}/%{name}/modules/upnp.la
%{_libdir}/%{name}/modules/upnp.so
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/unilisten
%{_libexecdir}/%{name}/unisend
%{_mandir}/man1/%{name}.1*
%dir %{_localstatedir}/lib/%{name}

%changelog
* Tue Nov 17 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-1
- Upgrade to 0.4.7
- Initial spec file for Fedora and Red Hat Enterprise Linux (spec
  file is based on a try by Robert E. Lee and Manuel Wolfshant)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:27:24 -0000	1.1
+++ .cvsignore	8 Dec 2009 08:18:48 -0000	1.2
@@ -0,0 +1 @@
+unicornscan-0.4.7-2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:27:25 -0000	1.1
+++ sources	8 Dec 2009 08:18:48 -0000	1.2
@@ -0,0 +1 @@
+4c5f272eb38c333c0094c32317edf758  unicornscan-0.4.7-2.tar.bz2



From jpopelka at fedoraproject.org  Tue Dec  8 08:19:02 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue,  8 Dec 2009 08:19:02 +0000 (UTC)
Subject: File hostname_3.01.tar.gz uploaded to lookaside cache by jpopelka
Message-ID: <20091208081902.DEA9510F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hostname:

866c4250583960bf730fb7a8815dbb03  hostname_3.01.tar.gz



From jpopelka at fedoraproject.org  Tue Dec  8 08:20:10 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue,  8 Dec 2009 08:20:10 +0000 (UTC)
Subject: rpms/hostname/devel hostname-initial.patch, NONE, 1.1 hostname.1.de,
	NONE, 1.1 hostname.1.pt, NONE, 1.1 hostname.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091208082010.1DB4911C03DB@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/hostname/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7562/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hostname-initial.patch hostname.1.de hostname.1.pt 
	hostname.spec import.log 
Log Message:
Initial import.


hostname-initial.patch:
 Makefile   |   24 +++++++++++++-----------
 hostname.1 |   39 ++++++++++++++++++++++++++++++++-------
 hostname.c |   17 +++++++++--------
 3 files changed, 54 insertions(+), 26 deletions(-)

--- NEW FILE hostname-initial.patch ---
diff -up hostname/hostname.1.initial hostname/hostname.1
--- hostname/hostname.1.initial	2009-09-22 14:21:50.000000000 +0200
+++ hostname/hostname.1	2009-11-06 16:30:20.000000000 +0100
@@ -91,6 +91,33 @@ will print the domain part of the FQDN (
 complete FQDN of the system is returned with
 .BR "hostname \-\-fqdn" .
 
+.LP
+The function 
+.BR gethostname(2)
+is used to get the hostname.  When the 
+.BR "hostname \-a, \-d, \-f or \-i" 
+is called will 
+.BR gethostbyname(3)
+be called.  The difference in 
+.BR gethostname(2)
+and
+.BR gethostbyname(3)
+is that
+.BR gethostbyname(3)
+is network aware, so it consults 
+.IR /etc/nsswitch.conf
+and
+.IR /etc/host.conf
+to decide whether to read information in
+.IR /etc/sysconfig/network
+or
+.IR /etc/hosts
+
+To add another dimension to this,
+the 
+.B hostname 
+is also set when the network interface is brought up.
+
 .SS "SET NAME"
 When called with one argument or with the
 .B \-\-file
@@ -106,7 +133,7 @@ and
 use the
 .BR setdomainname (2).
 Note that this is effective only until the next reboot.
-Edit /etc/hostname for permanent change.
+After reboot original names from \fI/etc/hosts\fR are used again. 
 .LP
 Note, that only the super-user can change the names.
 .LP
@@ -117,10 +144,10 @@ command (see
 below).
 .LP
 The host name is usually set once at system startup in
-.I /etc/init.d/hostname.sh
+.I /etc/rc.d/rc.sysinit
 (normally by reading the contents of a file which contains
 the host name, e.g.
-.IR /etc/hostname ).
+.IR /etc/sysconfig/network ).
 
 .SS THE FQDN
 You can't change the FQDN (as returned by
@@ -185,7 +212,7 @@ Display the short host name. This is the
 Print version information on standard output and exit successfully.
 .TP
 .I "\-v, \-\-verbose"
-Be verbose and tell what's going on.
+Verbose output was removed.
 .TP
 .I "\-y, \-\-yp, \-\-nis"
 Display the NIS domain name. If a parameter is given (or
@@ -203,9 +230,7 @@ option in
 .BR /etc/resolv.conf .
 .SH FILES
 .B /etc/hosts
-
-.B /etc/hostname
-This file should only contain the hostname and not the full FQDN.
+.B /etc/sysconfig/network
 .SH AUTHORS
 Peter Tobias, <tobias at et-inf.fho-emden.de>
 .br
diff -up hostname/hostname.c.initial hostname/hostname.c
--- hostname/hostname.c.initial	2009-10-27 13:19:28.000000000 +0100
+++ hostname/hostname.c	2009-11-06 16:14:23.000000000 +0100
@@ -43,7 +43,7 @@
 #include <err.h>
 #include <rpcsvc/ypclnt.h>
 
-#define VERSION "3.00"
+#define VERSION "3.01"
 
 enum type_t { DEFAULT, DNS, FQDN, SHORT, ALIAS, IP, NIS, NIS_DEF };
 
@@ -112,7 +112,7 @@ localdomain()
  * If something goes wrong, program exits.
  */
 char *
-localhost()
+localhost(enum type_t type)
 {
 	char *buf = 0;
 	size_t buf_len = 0;
@@ -134,10 +134,11 @@ localhost()
 	        || errno == ENAMETOOLONG);
 
 	/*
-	 * a hostname must not contain a dot, so if we find one,
+	 * short hostname must not contain a dot, so if we find one,
          * we also have a domain in here, which we better remove
 	 */
-	*(strchrnul(buf, '.')) = '\0';
+	if (type == SHORT)
+		*(strchrnul(buf, '.')) = '\0';
 
 	/* gethostname failed, abort. */
 	if (myerror)
@@ -257,7 +258,7 @@ show_name(enum type_t type)
 	{
 		case DEFAULT: 
 		case SHORT:
-			printf("%s\n", localhost());
+			printf("%s\n", localhost(type));
 			break;
 		case NIS:
 			printf("%s\n", localdomain());
@@ -270,7 +271,7 @@ show_name(enum type_t type)
 			hints.ai_socktype = SOCK_DGRAM;
 			hints.ai_flags = AI_CANONNAME;
 
-			if ((ret = getaddrinfo(localhost(), NULL, &hints, &res)) != 0)
+			if ((ret = getaddrinfo(localhost(type), NULL, &hints, &res)) != 0)
 				errx(1, "%s", gai_strerror(ret));
 
 			switch (type) {
@@ -278,7 +279,7 @@ show_name(enum type_t type)
 				struct hostent *hp;
 				int i;
 
-				if ((hp = gethostbyname(localhost())) == NULL)
+				if ((hp = gethostbyname(localhost(type))) == NULL)
 					errx(1, "%s", hstrerror(h_errno));
 
 				for (i = 0; hp->h_aliases[i]; i++) {
@@ -449,7 +450,7 @@ main(int argc, char **argv)
 		if (boot && (name == NULL || name[0] == '\0')) {
 			free(name);
 
-			name = localhost();
+			name = localhost(type);
 			if (name[0] == '\0' || !strcmp(name,"(none)"))
 				strcpy(name, "localhost");
 		}
diff -up hostname/Makefile.initial hostname/Makefile
--- hostname/Makefile.initial	2009-09-22 14:21:50.000000000 +0200
+++ hostname/Makefile	2009-11-06 16:14:23.000000000 +0100
@@ -7,26 +7,28 @@ OBJS=hostname.o
 
 hostname: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) -lnsl
-	ln -fs hostname dnsdomainname
-	ln -fs hostname domainname
-	ln -fs hostname ypdomainname
-	ln -fs hostname nisdomainname
 
 install: hostname
 	install -d ${BASEDIR}/usr/share/man/man1
-	install -o root -g root -m 0644 hostname.1 ${BASEDIR}/usr/share/man/man1
+	install -m 0644 hostname.1 ${BASEDIR}/usr/share/man/man1
 	ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/dnsdomainname.1
 	ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/domainname.1
 	ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/ypdomainname.1
 	ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/nisdomainname.1
-	install -o root -g root -m 0644 hostname.1.fr ${BASEDIR}/usr/share/man/fr/man1/hostname.1
+	install -d ${BASEDIR}/usr/share/man/fr/man1
+	install -m 0644 hostname.1.fr ${BASEDIR}/usr/share/man/fr/man1/hostname.1
+	ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/dnsdomainname.1
+	ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/domainname.1
+	ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/ypdomainname.1
+	ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/nisdomainname.1
+
 
 	install -d ${BASEDIR}/bin
-	install -o root -g root -m 0755 hostname ${BASEDIR}/bin
-	ln -f hostname ${BASEDIR}/bin/dnsdomainname
-	ln -f hostname ${BASEDIR}/bin/domainname
-	ln -f hostname ${BASEDIR}/bin/nisdomainname
-	ln -f hostname ${BASEDIR}/bin/ypdomainname
+	install -m 0755 hostname ${BASEDIR}/bin
+	ln -fs hostname ${BASEDIR}/bin/dnsdomainname
+	ln -fs hostname ${BASEDIR}/bin/domainname
+	ln -fs hostname ${BASEDIR}/bin/nisdomainname
+	ln -fs hostname ${BASEDIR}/bin/ypdomainname
 
 clean:
 	-rm -f $(OBJS) hostname dnsdomainname domainname nisdomainname ypdomainname


--- NEW FILE hostname.1.de ---
.\"
.\" Original by ??
.\"
.\" German translation by Ralf Baechle (ralf at gnu.org)
.\"
.TH HOSTNAME 1 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"

.SH NAME
hostname \- den Rechnernamen anzeigen oder setzen.
.br
domainname \- den NIS/YP Domainnamen anzeigen oder setzen
.br
dnsdomainname \- den DNS Domainnamen des Systems anzeigen
.br
nisdomainname \- den NIS/YP Domainnamen anzeigen oder setzen
.br
ypdomainname \- den NIS/YP Domainnamen anzeigen oder setzen

.SH SYNOPSIS
.B hostname
.RB [ \-v ]
.RB [ \-a ]
.RB [ \-\-alias ]
.RB [ \-d ]
.RB [ \-\-domain ]
.RB [ \-f ]
.RB [ \-\-fqdn ]
.RB [ \-i ]
.RB [ \-\-ip-address ]
.RB [ \-\-long ]
.RB [ \-s ]
.RB [ \-\-short ]
.RB [ \-y ]
.RB [ \-\-yp ]
.RB [ \-\-nis ]
.RB [ \-n ]
.RB [ \-\-node ]

.PP
.B hostname 
.RB [ \-v ]
.RB [ \-F\ Dateiname ]
.RB [ \-\-file\ Dateiname ]
.RB [ Rechnername ]

.PP
.B domainname
.RB [ \-v ]
.RB [ \-F\ Dateiname ]
.RB [ \-\-file\ Dateiname ]
.RB [ Name ]

.PP 
.B nodename
.RB [ \-v ]
.RB [ \-F\ Dateiname ]
.RB [ \-\-file\ Dateiname ]
.RB [ Name ]

.PP
.B hostname
.RB [ \-v ]
.RB [ \-h ]
.RB [ \-\-help ]
.RB [ \-V ]
.RB [ \-\-version ]

.PP
.B dnsdomainname
.RB [ \-v ]
.br
.B nisdomainname
.RB [ \-v ]
.br
.B ypdomainname
.RB [ \-v ]

.SH BESCHREIBUNG
.B Hostname
ist das Programm, das zum Anzeigen oder setzen des aktuellen Host-, Domain-,
oder Knotennamens des Systems verwendet wird.  Diese Namen werden von vielen
der Netzwerksprogrammen zur Identifikation der Maschine verwendet.
Au\(sserdem wird der Domainname von NIS/YP verwendet.

.SS "NAMEN AUSLESEN"
Wenn ohne Argumente augerufen, zeigen die Programme den aktuellen Namen an:

.LP
.B hostname
zeigt den aktuellen Rechnernamen des Systems, wie von der 
.BR gethostname (2)
Funktion ermittelt wird, an.

.LP
.B "domainname, nisdomainname, ypdomainname"
zeigen den Namen des Systems, wie er von der
.BR getdomainname (2)
Funktion ermittelt wird, an.  Dieser Name wird auch der YP/NIS Domainname
des Systems genannt.

.LP
.B dnsdomainname
druckt den Domainteil des FQDN (Fully Qualified Domain Name oder zu deutsch
vollst\(:andig spezifizierter Domainname) aus.  Der vollst\(:andige FQDN
des Systems wird von
.B "hostname \-\-fqdn"
ausgegeben.

.SS "NAME SETZEN"
Wenn mit nur einem Argument oder mit der
.B \-\-file
Option aufgerufen, dann setzen diese Kommandos den Rechnernamen oder den NIS/YP
Domainnamen.

.LP
Nur der Superuser darf den Namen \(:andern.

.LP
Es ist nicht m\(:ogich den FQDN oder den DNS Domainnamen mit dem
.B dnsdomainname 
Befehl (Siehe 
.B "Der FQDN"
unten) zu setzen.

.LP
Der Rechnername wird \(:ublicherweise einmal beim Systemstart in
.I /etc/rc.d/rc.inet1
or
.I /etc/init.d/boot
gesetzt.  Der Rechnername wird dabei \(:ublicherweise aus einer Datei
die den Rechnernamen, z.B.
.I /etc/HOSTNAME
gesetzt.

.SS DER FQDN
Der FQDN (wie er von
.B "hostname \-\-fqdn"
ausgegeben wird) 
oder der DNS-Domainname (wie er von
.B "dnsdomainname"
ausgegeben wird) 
kann nicht mit diesem Befehl ge\(:andert werden.  Der FQDN eines Systems ist
der Name, den der
.BR resolver (3)
als den Namen des Systems zur\(:uckgibt.

.LP
Technisch: Der FQDN ist der Name, den
.BR gethostbyname (2)
f\(:ur den Rechnernamen zur\(:uckgibt, den
.B gethostname (2)
zur\(:uckgibt.
Der DNS-Domainname ist der Teil nach dem ersten Punkt.
.LP
Deshalb h\(:angt es \(:ublicherweise von der Konfiguration in
.IR /etc/host.conf )
wie der Name ge\(:andert werden kann.  \(:Ublicherweise (wenn die Hosts Datei
gelesen wird, bevor auf DNS oder NIS/YP zugegriffen wird) kann er in
.I /etc/hosts
ge\(:andert werden.


.SH OPTIONEN
.TP
.I "\-a, \-\-alias"
Den Aliasnamen des Rechners ausgeben, falls benutzt.
.TP
.I "\-d, \-\-domain"
Den Namen der DNS-Domain ausgeben.  Der Befehl
.B domainname
kann nicht dazu verwendet werden um den Namen der DNS-Dom\(:ane auszugeben,
da er den NIS Domainname und nicht den DNS Domainnamen ausgibt.  Zu diesem
Zweck dient der Befehl
.BR dnsdomainname .
.TP
.I "\-F, \-\-file filename"
Den Rechnernamen aus der angegebenen Datei lesen.   Zeilen, die mit einem
#-Zeichen anfangen sind Kommentare und werden ignoriert.
.TP
.I "\-f, \-\-fqdn, \-\-long"
Den FQDN (Fully Qualified Domain Name) anzeigen.  Ein FQDN besteht aus einem
kurzen Rechnernamen ohne Punkt und dem DNS-Domainnamen.  Au\(sser wenn BIND
oder NIS zum Aufl\(:osen von Rechnernamen verwendet wird, kann der FQDN und
der DNS-Domainname, der Teil des FQDN ist, in der Datei \fI/etc/hosts\fR
ge\(:andert werden.
.TP
.I "\-h, \-\-help"
Kurzanleitung ausdrucken und beenden.
.TP
.I "\-i, \-\-ip-address"
Die IP-Adresse(n) des Rechners anzeigen und beenden.
.TP
.I "\-s, \-\-short"
Den Kurznamen anzeigen.  Dies ist der ab dem ersten Punkt abgeschnittene
Rechnername.
.TP
.I "\-V, \-\-version"
Versionsinformation auf der Standardausgabe ausgeben und erfolgreich beenden.
.TP
.I "\-v, \-\-verbose"
Ausf\(:uhrlichere Ausgaben.
.TP
.I "\-y, \-\-yp, \-\-nis"
Den NIS-Domainnamen anzeigen.  Wenn ein Argument oder die 
.B \-\-file name
Option gegeben wird, dann kann Root auch eine neue NIS-Domain setzen.
.SH DATEIEN
.B /etc/hosts
.SH AUTOREN
Peter Tobias, <tobias at et-inf.fho-emden.de>
.br
Bernd Eckenfels, <net-tools at lina.inka.de> (NIS and manpage).
.br
Steve Whitehouse, <SteveW at ACM.org> (DECnet support and manpage).
.SH \(:Ubersetzung
Ralf B\(:achle <ralf at gnu.org>


--- NEW FILE hostname.1.pt ---
.TH HOSTNAME 1 "28 de janeiro de 1996" "net-tools" "Manual do Programador Linux"

.SH NOME
hostname \- mostra ou configura o nome da m??quina 
.BR
domainname \- mostra ou configura o nome do dom??nio NIS/YP
.BR
dnsdomainname \- mostra o nome do dom??nio DNS
.BR
nisdomainname \- mostra ou configura o nome do dom??nio NIS/YP
.BR
ypdomainname \- mostra ou configura o nome do dom??nio NIS/YP

.SH SINOPSE
.B hostname
.RB [ \-v ]
.RB [ \-a ]
.RB [ \-\-alias ]
.RB [ \-d ]
.RB [ \-\-domain ]
.RB [ \-f ]
.RB [ \-\-fqdn ]
.RB [ \-i ]
.RB [ \-\-ip-address ]
.RB [ \-\-long ]
.RB [ \-s ]
.RB [ \-\-short ]
.RB [ \-y ]
.RB [ \-\-yp ]
.RB [ \-\-nis ]

.PP
.B hostname 
.RB [ \-v ]
.RB [ \-F\ arquivo ]
.RB [ \-\-file\ arquivo ]
.RB [ m??quina ]

.PP
.B domainname
.RB [ \-v ]
.RB [ \-F\ filename ]
.RB [ \-\-file\ nome_arquivo ]
.RB [ nome ]

.PP
.B hostname
.RB [ \-v ]
.RB [ \-h ]
.RB [ \-\-help ]
.RB [ \-V ]
.RB [ \-\-version ]

.PP
.B dnsdomainname
.RB [ \-v ]
.LP
.B nisdomainname
.RB [ \-v ]
.LP
.B ypdomainname
.RB [ \-v ]

.SH DESCRI????O
.B hostname
?? o programa usado para configurar ou mostrar o nome corrente da m??quina
ou o dom??nio do sistema. Este nome ?? usado por muitos dos programas de
rede para identificar a m??quina. O nome do dom??nio tamb??m ?? usado pelo
NIS/YP.

.SS "OBTER NOME"
Quando chamado sem argumentos o programa mostra os nomes correntes:

.LP
.B hostname
mostrar?? o nome do sistema conforme retornado pela fun????o
.BR gethostname (2).


.LP
.B "domainname, nisdomainname, ypdomainname"
mostrar?? o nome do sistema conforme retornado pela fun????o
.BR getdomainname (2).
Isto tamb??m ?? conhecido como o nome de dom??nio YP/NIS do sistema.

.LP
.B dnsdomainname
mostrara a parte do dom??nio do FQDN (Nome de dom??nio completamente qualificado).
O FQDN do sistema ?? retornado pelo comando
.BR "hostname \-\-fqdn" .

.SS "CONFIGURAR NOME"
Quando chamado com um argumento ou com a op????o
.B \-\-file
, o comando configura o nome da m??quina ou do dom??nio NIS/YP.

.LP
Note que somente o super usu??rio pode mudar os nomes.

.LP
Nao ?? poss??vel configurar o FQDN ou o nome do dom??nio DNS com o comando
.B dnsdomainname 
(veja 
.B "O FQDN"
abaixo).

.LP
O nome da m??quina ?? normalmente configurado durante a inicializa????o do sistema,
em
.I /etc/rc.d/rc.inet1
ou
.I /etc/init.d/boot
(normalmente lendo o conte??do de um arquivo que cont??m o nome da m??quina, ex.:
.IR /etc/hostname ).

.SS O FQDN
Voc?? n??o pode mudar o FQDN (conforme retornado por
.BR "hostname \-\-fqdn" ) 
ou o nome do dom??nio DNS (conforme retornado por
.BR "dnsdomainname" ) 
com este comando. O FQDN do sistema ?? o nome que o
.BR resolver (3)
retorna para o nome da m??quina.

.LP
Tecnicamente: O FQDN ?? o nome retornado pelo
.BR gethostbyname (2)
para o nome retornado pelo
.BR gethostname (2).
O nome do dom??nio DNS ?? a parte ap??s o primeiro ponto.
.LP
Portanto isto depende da configura????o (normalmente em
.IR /etc/host.conf )
para que voc?? possa mud??-lo. Normalmente (se o arquivo hosts for lido antes 
do DNS ou NIS) voc?? pode mud??-lo em
.IR /etc/hosts .


.SH OP????ES
.TP
.I "\-a, \-\-alias"
Mostra o alias da m??quina (se usado).
.TP
.I "\-d, \-\-domain"
Mostra o nome do dom??nio DNS. N??o use o comando
.B domainname
para obter o nome do dom??nio DNS porque ele mostrar?? o nome do dom??nio NIS e
n??o o nome do dom??nio DNS. Use 
.BR dnsdomainname .
.TP
.I "\-F, \-\-file arquivo"
Leia o nome da m??quina a partir do arquivo especificado. Coment??rios (linhas
come??ando com um `#') s??o ignorados.
.TP
.I "\-f, \-\-fqdn, \-\-long"
Mostra o FQDN (Nome de Dom??nio Completamente Qualificado). Um FQDN consiste de
um nome curto de m??quina e do nome do dom??nio DNS. A menos que voc?? esteja
usando bind ou NIS para resolu????o de nomes voc?? pode mudar o FQDN e o nome
do dom??nio DNS (que ?? parte do FQDN) no arquivo \fI/etc/hosts\fR.
.TP
.I "\-h, \-\-help"
Mostra uma mensagem sobre como utilizar o comando e termina.
.TP
.I "\-i, \-\-ip-address"
Mostra o(s) endere??o(s) IP da m??quina.
.TP
.I "\-s, \-\-short"
Mostra o nome curto da m??quina. ?? o nome da m??quina at?? o primeiro ponto.
.TP
.I "\-V, \-\-version"
Mostra informa????o de vers??o na sa??da padr??o e termina com sucesso.
.TP
.I "\-v, \-\-verbose"
Mostra uma sa??da detalhada do que est?? acontecendo.
.TP
.I "\-y, \-\-yp, \-\-nis"
Mostra o nome do dom??nio NIS. Se um par??metro for especificado (ou
.B \-\-file arquivo
) ent??o o root tamb??m pode configurar um novo dom??nio NIS.
.SH ARQUIVOS
.B /etc/hosts
.SH AUTOR
Peter Tobias, <tobias at et-inf.fho-emden.de>
.BR
Bernd Eckenfels, <net-tools at lina.inka.de> (NIS e p??gina man).
.BR
Arnaldo Carvalho de Melo, <acme at conectiva.com.br> Tradu????o para a l??ngua
portuguesa.
.BR
Jorge Luiz Godoy Filho, <jorge at bestway.com.br> Revis??o.
.BR


--- NEW FILE hostname.spec ---
Summary: Utility to set/show the host name or domain name
Name: hostname
Version: 3.01
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://packages.qa.debian.org/h/hostname.html
Source0: http://ftp.de.debian.org/debian/pool/main/h/hostname/hostname_%{version}.tar.gz
Source1: hostname.1.pt
Source2: hostname.1.de

# Initial changes
Patch1: hostname-initial.patch

#net-tools < 1.60-100 includes hostname
Conflicts: net-tools < 1.60-100

%description
This package provides commands which can be used to display the system's
DNS name, and to display or set its hostname or NIS domain name.

%prep
%setup -q -n hostname
%patch1 -p1 -b .initial

#man pages conversion
#french 
iconv -f iso-8859-1 -t utf-8 -o hostname.tmp hostname.1.fr && mv hostname.tmp hostname.1.fr

%build
export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
make

%install
make BASEDIR=%{buildroot} install

install -d %{buildroot}%{_mandir}/pt/man1
install -m 0644 %SOURCE1 %{buildroot}%{_mandir}/pt/man1/hostname.1
ln -fs hostname.1 %{buildroot}%{_mandir}/pt/man1/dnsdomainname.1
ln -fs hostname.1 %{buildroot}%{_mandir}/pt/man1/domainname.1
ln -fs hostname.1 %{buildroot}%{_mandir}/pt/man1/ypdomainname.1
ln -fs hostname.1 %{buildroot}%{_mandir}/pt/man1/nisdomainname.1

install -d %{buildroot}%{_mandir}/de/man1
install -m 0644 %SOURCE2 %{buildroot}%{_mandir}/de/man1/hostname.1
ln -fs hostname.1 %{buildroot}%{_mandir}/de/man1/dnsdomainname.1
ln -fs hostname.1 %{buildroot}%{_mandir}/de/man1/domainname.1
ln -fs hostname.1 %{buildroot}%{_mandir}/de/man1/ypdomainname.1
ln -fs hostname.1 %{buildroot}%{_mandir}/de/man1/nisdomainname.1


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc COPYRIGHT
/bin/*
%{_mandir}/man1/*
%{_mandir}/fr/man1/*
%{_mandir}/pt/man1/*
%{_mandir}/de/man1/*

%changelog

* Tue Nov 10 2009  Jiri Popelka <jpopelka at redhat.com> - 3.01-1
- Initial package. Up to now hostname has been part of net-tools package.
- This package is based on Debian's hostname because Debian has had hostname
  as separate package since 1997 and the code is much better then the old one
  contained in net-tools.


--- NEW FILE import.log ---
hostname-3_01-1_fc12:HEAD:hostname-3.01-1.src.rpm:1260260351


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hostname/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Dec 2009 16:34:48 -0000	1.1
+++ .cvsignore	8 Dec 2009 08:20:09 -0000	1.2
@@ -0,0 +1 @@
+hostname_3.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hostname/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Dec 2009 16:34:48 -0000	1.1
+++ sources	8 Dec 2009 08:20:09 -0000	1.2
@@ -0,0 +1 @@
+866c4250583960bf730fb7a8815dbb03  hostname_3.01.tar.gz



From robert at fedoraproject.org  Tue Dec  8 08:27:02 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue,  8 Dec 2009 08:27:02 +0000 (UTC)
Subject: rpms/unicornscan/F-11 unicornscan-0.4.7-config.patch, NONE,
	1.1 unicornscan-0.4.7-geoip.patch, NONE,
	1.1 unicornscan-0.4.7-lib64.patch, NONE,
	1.1 unicornscan-README.fedora, NONE,
	1.1 unicornscan-web-README.fedora, NONE, 1.1 unicornscan.conf,
	NONE, 1.1 unicornscan.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091208082702.3771811C0264@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/unicornscan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9375/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	unicornscan-0.4.7-config.patch unicornscan-0.4.7-geoip.patch 
	unicornscan-0.4.7-lib64.patch unicornscan-README.fedora 
	unicornscan-web-README.fedora unicornscan.conf 
	unicornscan.spec 
Log Message:
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)


unicornscan-0.4.7-config.patch:
 etc/modules.conf         |    9 +--------
 www-front-end/config.php |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE unicornscan-0.4.7-config.patch ---
--- unicornscan-0.4.7/etc/modules.conf			2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/etc/modules.conf.config		2009-12-05 20:34:31.000000000 +0100
@@ -1,16 +1,9 @@
 
 module "pgsqldb" {
-	dbconf:		"user=scan password=scanit! host=localhost dbname=scan";
+	dbconf:		"user=unicornscan password=scanit! host=localhost dbname=unicornscan";
 	logpacket:	"true";
 };
 
-module "mysqldb" {
-	username:	"scan";
-	password:	"scanit!";
-	hostname:	"localhost";
-	dbname:		"foo";
-};
-
 module "osdetect" {
 	/*	Stim	TCPFLG	TTL	DF	WS	TOS	Misc	*/
 	/* tcpopts		type	desc				*/
--- unicornscan-0.4.7/www-front-end/config.php		2007-11-27 11:23:35.000000000 +0100
+++ unicornscan-0.4.7/www-front-end/config.php.config	2009-12-05 20:35:13.000000000 +0100
@@ -4,16 +4,16 @@
 	define("config_master_include", 1);
 
 	// Web Server location stuff
-	$PHPLIB["uri_base"]="http://localhost/unicornscan/";		// http://vhost.domain.tld/something/
+	$PHPLIB["uri_base"]="/unicornscan/";				// http://vhost.domain.tld/something/
 
-	$PHPLIB["filesystem_base"]="/var/www/htdocs/unicornscan/";		// Base directory content is in
-	$PHPLIB["filesystem_phplib"]="/var/www/htdocs/unicornscan/lib/";	// Where phplib is
-	$PHPLIB["filesystem_temporary"]="/tmp/";			// Where can i write files to?
+	$PHPLIB["filesystem_base"]="/usr/share/unicornscan/";		// Base directory content is in
+	$PHPLIB["filesystem_phplib"]="/usr/share/unicornscan/lib/";	// Where phplib is
+	$PHPLIB["filesystem_temporary"]="/var/lib/unicornscan/web/";	// Where can i write files to?
 
 	// DataBase Variables
-	$PHPLIB["database_name"]="scan"; 		// change this for sure , its the database name
-	$PHPLIB["database_type"]="pgsql";		// pgsql, mysql, youll need the right class though
-	$PHPLIB["database_username"]="scan";
+	$PHPLIB["database_name"]="unicornscan";		// change this for sure , its the database name
+	$PHPLIB["database_type"]="pgsql";		// and something else isn't supported right now
+	$PHPLIB["database_username"]="unicornscan";
 	$PHPLIB["database_password"]="scanit!";
 	$PHPLIB["database_host"]="127.0.0.1";
 	$PHPLIB["database_db"]["default"]="";
@@ -24,6 +24,9 @@
 	// formclass2.php stuff
 	$PHPLIB["formclass_warnimage"]="exl.gif";			// warning image for invalid forms
 
+	// No PHP error reporting
+	error_reporting(0);
+
 } // Double Inclusion detection
 
 require("./lib/connect_todb.php");

unicornscan-0.4.7-geoip.patch:
 report.c |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE unicornscan-0.4.7-geoip.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which adds the
standard location of GeoIP data at Fedora in front of the original opening try. Unicornscan
upstream is expecting /etc/unicornscan/GeoIP.dat instead of /usr/share/GeoIP/GeoIP.dat by
default. This patch is looking for the existence of /usr/share/GeoIP/GeoIP.dat, otherwise
/etc/unicornscan/GeoIP.dat will be used to not break the standards from upstream, if patch
gets applied for a future unicornscan release.

--- unicornscan-0.4.7/src/scan_progs/report.c		2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/src/scan_progs/report.c.geoip	2009-11-17 13:16:04.000000000 +0100
@@ -68,9 +68,18 @@
 	report_t=rbinit(123);
 
 #ifdef HAVE_LIBGEOIP
-	gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
-	if (gi == NULL) {
-		ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+
+	if (access("/usr/share/GeoIP/GeoIP.dat", F_OK) == 0) {
+		gi=GeoIP_open("/usr/share/GeoIP/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip standard database `/usr/share/GeoIP/GeoIP.dat': %s", strerror(errno));
+		}
+	}
+	else {
+		gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+		}
 	}
 
 #endif

unicornscan-0.4.7-lib64.patch:
 configure    |    4 ++--
 configure.ac |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE unicornscan-0.4.7-lib64.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which
adds support for x86_64, ppc64 or other 64 bit architectures using /usr/lib64 for
their libraries. Having lib64 in front of lib is mandatory, as 64 bit systems are
likely to run with multi-lib, that means 32 bit libraries are parallel in use. If
you apply this patch, don't run autoconf > 2.6.3, as it will break, because whole
autotools stuff from upstream is unfortunately a bit broken.

--- unicornscan-0.4.7/configure.ac		2007-11-29 15:51:20.000000000 +0100
+++ unicornscan-0.4.7/configure.ac.lib64	2009-11-16 23:32:27.000000000 +0100
@@ -269,7 +269,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -331,7 +331,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then
--- unicornscan-0.4.7/configure			2007-12-18 16:26:12.000000000 +0100
+++ unicornscan-0.4.7/configure.lib64		2009-12-05 12:04:32.000000000 +0100
@@ -26275,7 +26275,7 @@
 echo "${ECHO_T}no" >&6; }
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -26438,7 +26438,7 @@
 echo "${ECHO_T}no" >&6; }
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then


--- NEW FILE unicornscan-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  The PostgreSQL service has to be up and running. Depending on the exact
    version of Fedora or Red Hat Enterprise Linux, on the first PostgreSQL
    startup, a "service postgresql initdb" is maybe required for initializing.

    [root at tux ~]# service postgresql start
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

2.  Switch to the PostgreSQL user.

    [root at tux ~]# su - postgres
    -bash-4.0$ 

3.  Create an own PostgreSQL database user for unicornscan. Don't forget to set
    a password, e.g. "scanit!" as it is used in all examples.

    -bash-4.0$ createuser --no-superuser --no-createrole --no-createdb --pwprompt unicornscan
    Enter password for new role:
    Enter it again:
    -bash-4.0$ 

4.  Create an own PostgreSQL database for unicornscan linked with the previous
    generated database user for unicornscan.

    -bash-4.0$ createdb --owner unicornscan unicornscan
    -bash-4.0$ 

5.  Switch back to the root user.

    -bash-4.0$ exit
    exit
    [root at tux ~]#

6.  Edit PostgreSQL client authentication file /var/lib/pgsql/data/pg_hba.conf
    file with a text editor, insert the following lines before the other already
    existing rules.

    # TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
    local   unicornscan unicornscan                       md5
    host    unicornscan unicornscan 127.0.0.1/32          md5
    host    unicornscan unicornscan ::1/128               md5

7.  Edit PostgreSQL server configuration in /var/lib/pgsql/data/postgresql.conf
    and set the configuration variable as follows:

    escape_string_warning = off

8.  Restart the PostgreSQL service to enable the previous performed changes.

    [root at tux ~]# service postgresql restart
    Stopping postgresql service:                               [  OK  ]
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

9.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-0.*/pgsql_schema.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]# 

10. Edit the unicornscan configuration file /etc/unicornscan/modules.conf and
    check or correct the PostgreSQL database connection settings.

    module "pgsqldb" {
            dbconf:         "user=unicornscan password=scanit! host=localhost dbname=unicornscan";
            logpacket:      "true";
    };

11. Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#


--- NEW FILE unicornscan-web-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  Follow the /usr/share/doc/unicornscan-0.*/README.fedora file, so that the
    PostgreSQL service is up and running already.

2.  Start (or restart) the Apache HTTP webserver, to ensure that configuration
    file for Apache gets active.

    [root at tux ~]# service httpd start
    Starting httpd:                                            [  OK  ]
    [root at tux ~]# 

3.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-web-0.*/session.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]#

4.  If you've got SELinux enabled, make sure, that SELinux allows Apache/PHP to
    connect to the PostgreSQL database. If you don't have SELinux enabled, just
    skip this step.

    setsebool -P httpd_can_network_connect_db=1

5.  Edit the unicornscan configuration file /etc/unicornscan/web.php and check
    or correct the PostgreSQL database connection settings.

    $PHPLIB["database_name"]="unicornscan";
    $PHPLIB["database_username"]="unicornscan";
    $PHPLIB["database_password"]="scanit!";
    $PHPLIB["database_host"]="127.0.0.1";

6.  Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#

7.  Open a webbrowser and switch to: http://localhost/unicornscan/


--- NEW FILE unicornscan.conf ---
#
# Scalable, accurate, flexible and efficient network probing
#

Alias /unicornscan /usr/share/unicornscan


--- NEW FILE unicornscan.spec ---
Summary:	Scalable, accurate, flexible and efficient network probing
Name:		unicornscan
Version:	0.4.7
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.unicornscan.org/
Source0:	http://www.unicornscan.org/releases/%{name}-%{version}-2.tar.bz2
Source1:	unicornscan.conf
Source2:	unicornscan-README.fedora
Source3:	unicornscan-web-README.fedora
Patch0:		unicornscan-0.4.7-lib64.patch
Patch1:		unicornscan-0.4.7-geoip.patch
Patch2:		unicornscan-0.4.7-config.patch
Requires(pre):	shadow-utils
BuildRequires:	flex, bison, %{_includedir}/pcap.h, %{_includedir}/ltdl.h
BuildRequires:	libdnet-devel, GeoIP-devel, postgresql-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unicornscan is an attempt at a user-land distributed TCP/IP stack. It is
intended to provide a researcher a superior interface for introducing a
stimulus into and measuring a response from a TCP/IP enabled device or
network. Although it currently has hundreds of individual features, a main
set of abilities include: Asynchronous stateless TCP scanning with all
variations of TCP flags, asynchronous stateless TCP banner grabbing,
asynchronous protocol specific UDP scanning (sending enough of a signature
to elicit a response), active and passive remote OS, application and
component identification by analyzing responses, PCAP file logging and
filtering, relational database output, custom module support, customized
data-set views.

%package web
Summary:	Web-based front-end for unicornscan database results
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}, php-pgsql, httpd
%if 0%{?fedora}%{?rhel} >= 6
BuildArch:	noarch
%endif

%description web
Unicornscan provides support to write results into a database. And with the
web-based front-end for unicornscan, which is written in PHP, these results
can be easily interpreted and visualized.

%prep
%setup -q
%patch0 -p1 -b .lib64
%patch1 -p1 -b .geoip
%patch2 -p1 -b .config

cp -pf %{SOURCE2} README.fedora
cp -pf %{SOURCE3} www-front-end/README.fedora

%build
# - _GNU_SOURCE is required for "ucred" from <bits/socket.h> via <sys/socket.h>
# - Use classical non-SELinux permission schema once SELinux Reference Policy is
#   including unicornscan support directly, maybe with Fedora 13 and/or RHEL 6
# - MySQL support is only available in ./configure as inside broken and disabled
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
%configure --localstatedir=%{_localstatedir}/lib --with-pgsql --with-listen-user=%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Remove the static library files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.a

# Correct permissions and timestamps
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/*
touch -c -r etc/modules.conf.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/modules.conf

# Install web files into destination
cp -af www-front-end $RPM_BUILD_ROOT%{_datadir}/%{name}/
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/attic
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{config.php.config,README.fedora,TODO}
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/{session.sql,.htaccess}

# Move configuration file to its place
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
touch -c -r www-front-end/config.php.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
ln -sf ../../..%{_sysconfdir}/%{name}/web.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php

# Install the apache configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

# Create temporary directory for packaging
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/web/

%pre
getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Unicornscan User" %{name}
exit 0

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README README.database README.fedora README.security
%doc THANKS TODO UDP_PAYLOADS_NEEDED docs/Unicornscan-Getting_Started.pdf
%doc src/output_modules/database/sql/pgsql_schema.sql src/parse/example_confs
%dir %{_sysconfdir}/%{name}
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/modules.conf
%config(noreplace) %{_sysconfdir}/%{name}/oui.txt
%config(noreplace) %{_sysconfdir}/%{name}/payloads.conf
%config(noreplace) %{_sysconfdir}/%{name}/ports.txt
%config(noreplace) %{_sysconfdir}/%{name}/unicorn.conf
%{_bindir}/fantaip
%{_bindir}/unibrow
%{_bindir}/unicfgtst
%{_bindir}/%{name}
%{_bindir}/us
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
# *.la files are referenced by the shared objects and required
%{_libdir}/%{name}/modules/httpexp.la
%{_libdir}/%{name}/modules/httpexp.so
%{_libdir}/%{name}/modules/http.la
%{_libdir}/%{name}/modules/http.so
%{_libdir}/%{name}/modules/ntalk.la
%{_libdir}/%{name}/modules/ntalk.so
%{_libdir}/%{name}/modules/osdetect.la
%{_libdir}/%{name}/modules/osdetect.so
%{_libdir}/%{name}/modules/pgsqldb.la
%{_libdir}/%{name}/modules/pgsqldb.so
%{_libdir}/%{name}/modules/rdns.la
%{_libdir}/%{name}/modules/rdns.so
%{_libdir}/%{name}/modules/sip.la
%{_libdir}/%{name}/modules/sip.so
%{_libdir}/%{name}/modules/upnp.la
%{_libdir}/%{name}/modules/upnp.so
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/unilisten
%{_libexecdir}/%{name}/unisend
%{_mandir}/man1/%{name}.1*
%dir %{_localstatedir}/lib/%{name}

%files web
%defattr(-,root,root,-)
%doc www-front-end/README.fedora www-front-end/lib/session.sql
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(640,apache,apache) %{_sysconfdir}/%{name}/web.php
%{_datadir}/%{name}
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/web

%changelog
* Sat Dec 05 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-2
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)

* Tue Nov 17 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-1
- Upgrade to 0.4.7
- Initial spec file for Fedora and Red Hat Enterprise Linux (spec
  file is based on a try by Robert E. Lee and Manuel Wolfshant)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:27:24 -0000	1.1
+++ .cvsignore	8 Dec 2009 08:27:01 -0000	1.2
@@ -0,0 +1 @@
+unicornscan-0.4.7-2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:27:25 -0000	1.1
+++ sources	8 Dec 2009 08:27:01 -0000	1.2
@@ -0,0 +1 @@
+4c5f272eb38c333c0094c32317edf758  unicornscan-0.4.7-2.tar.bz2



From robert at fedoraproject.org  Tue Dec  8 08:27:02 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue,  8 Dec 2009 08:27:02 +0000 (UTC)
Subject: rpms/unicornscan/F-12 unicornscan-0.4.7-config.patch, NONE,
	1.1 unicornscan-0.4.7-geoip.patch, NONE,
	1.1 unicornscan-0.4.7-lib64.patch, NONE,
	1.1 unicornscan-README.fedora, NONE,
	1.1 unicornscan-web-README.fedora, NONE, 1.1 unicornscan.conf,
	NONE, 1.1 unicornscan.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091208082702.6FE5211C0264@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/unicornscan/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9375/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	unicornscan-0.4.7-config.patch unicornscan-0.4.7-geoip.patch 
	unicornscan-0.4.7-lib64.patch unicornscan-README.fedora 
	unicornscan-web-README.fedora unicornscan.conf 
	unicornscan.spec 
Log Message:
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)


unicornscan-0.4.7-config.patch:
 etc/modules.conf         |    9 +--------
 www-front-end/config.php |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE unicornscan-0.4.7-config.patch ---
--- unicornscan-0.4.7/etc/modules.conf			2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/etc/modules.conf.config		2009-12-05 20:34:31.000000000 +0100
@@ -1,16 +1,9 @@
 
 module "pgsqldb" {
-	dbconf:		"user=scan password=scanit! host=localhost dbname=scan";
+	dbconf:		"user=unicornscan password=scanit! host=localhost dbname=unicornscan";
 	logpacket:	"true";
 };
 
-module "mysqldb" {
-	username:	"scan";
-	password:	"scanit!";
-	hostname:	"localhost";
-	dbname:		"foo";
-};
-
 module "osdetect" {
 	/*	Stim	TCPFLG	TTL	DF	WS	TOS	Misc	*/
 	/* tcpopts		type	desc				*/
--- unicornscan-0.4.7/www-front-end/config.php		2007-11-27 11:23:35.000000000 +0100
+++ unicornscan-0.4.7/www-front-end/config.php.config	2009-12-05 20:35:13.000000000 +0100
@@ -4,16 +4,16 @@
 	define("config_master_include", 1);
 
 	// Web Server location stuff
-	$PHPLIB["uri_base"]="http://localhost/unicornscan/";		// http://vhost.domain.tld/something/
+	$PHPLIB["uri_base"]="/unicornscan/";				// http://vhost.domain.tld/something/
 
-	$PHPLIB["filesystem_base"]="/var/www/htdocs/unicornscan/";		// Base directory content is in
-	$PHPLIB["filesystem_phplib"]="/var/www/htdocs/unicornscan/lib/";	// Where phplib is
-	$PHPLIB["filesystem_temporary"]="/tmp/";			// Where can i write files to?
+	$PHPLIB["filesystem_base"]="/usr/share/unicornscan/";		// Base directory content is in
+	$PHPLIB["filesystem_phplib"]="/usr/share/unicornscan/lib/";	// Where phplib is
+	$PHPLIB["filesystem_temporary"]="/var/lib/unicornscan/web/";	// Where can i write files to?
 
 	// DataBase Variables
-	$PHPLIB["database_name"]="scan"; 		// change this for sure , its the database name
-	$PHPLIB["database_type"]="pgsql";		// pgsql, mysql, youll need the right class though
-	$PHPLIB["database_username"]="scan";
+	$PHPLIB["database_name"]="unicornscan";		// change this for sure , its the database name
+	$PHPLIB["database_type"]="pgsql";		// and something else isn't supported right now
+	$PHPLIB["database_username"]="unicornscan";
 	$PHPLIB["database_password"]="scanit!";
 	$PHPLIB["database_host"]="127.0.0.1";
 	$PHPLIB["database_db"]["default"]="";
@@ -24,6 +24,9 @@
 	// formclass2.php stuff
 	$PHPLIB["formclass_warnimage"]="exl.gif";			// warning image for invalid forms
 
+	// No PHP error reporting
+	error_reporting(0);
+
 } // Double Inclusion detection
 
 require("./lib/connect_todb.php");

unicornscan-0.4.7-geoip.patch:
 report.c |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE unicornscan-0.4.7-geoip.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which adds the
standard location of GeoIP data at Fedora in front of the original opening try. Unicornscan
upstream is expecting /etc/unicornscan/GeoIP.dat instead of /usr/share/GeoIP/GeoIP.dat by
default. This patch is looking for the existence of /usr/share/GeoIP/GeoIP.dat, otherwise
/etc/unicornscan/GeoIP.dat will be used to not break the standards from upstream, if patch
gets applied for a future unicornscan release.

--- unicornscan-0.4.7/src/scan_progs/report.c		2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/src/scan_progs/report.c.geoip	2009-11-17 13:16:04.000000000 +0100
@@ -68,9 +68,18 @@
 	report_t=rbinit(123);
 
 #ifdef HAVE_LIBGEOIP
-	gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
-	if (gi == NULL) {
-		ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+
+	if (access("/usr/share/GeoIP/GeoIP.dat", F_OK) == 0) {
+		gi=GeoIP_open("/usr/share/GeoIP/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip standard database `/usr/share/GeoIP/GeoIP.dat': %s", strerror(errno));
+		}
+	}
+	else {
+		gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+		}
 	}
 
 #endif

unicornscan-0.4.7-lib64.patch:
 configure    |    4 ++--
 configure.ac |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE unicornscan-0.4.7-lib64.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which
adds support for x86_64, ppc64 or other 64 bit architectures using /usr/lib64 for
their libraries. Having lib64 in front of lib is mandatory, as 64 bit systems are
likely to run with multi-lib, that means 32 bit libraries are parallel in use. If
you apply this patch, don't run autoconf > 2.6.3, as it will break, because whole
autotools stuff from upstream is unfortunately a bit broken.

--- unicornscan-0.4.7/configure.ac		2007-11-29 15:51:20.000000000 +0100
+++ unicornscan-0.4.7/configure.ac.lib64	2009-11-16 23:32:27.000000000 +0100
@@ -269,7 +269,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -331,7 +331,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then
--- unicornscan-0.4.7/configure			2007-12-18 16:26:12.000000000 +0100
+++ unicornscan-0.4.7/configure.lib64		2009-12-05 12:04:32.000000000 +0100
@@ -26275,7 +26275,7 @@
 echo "${ECHO_T}no" >&6; }
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -26438,7 +26438,7 @@
 echo "${ECHO_T}no" >&6; }
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then


--- NEW FILE unicornscan-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  The PostgreSQL service has to be up and running. Depending on the exact
    version of Fedora or Red Hat Enterprise Linux, on the first PostgreSQL
    startup, a "service postgresql initdb" is maybe required for initializing.

    [root at tux ~]# service postgresql start
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

2.  Switch to the PostgreSQL user.

    [root at tux ~]# su - postgres
    -bash-4.0$ 

3.  Create an own PostgreSQL database user for unicornscan. Don't forget to set
    a password, e.g. "scanit!" as it is used in all examples.

    -bash-4.0$ createuser --no-superuser --no-createrole --no-createdb --pwprompt unicornscan
    Enter password for new role:
    Enter it again:
    -bash-4.0$ 

4.  Create an own PostgreSQL database for unicornscan linked with the previous
    generated database user for unicornscan.

    -bash-4.0$ createdb --owner unicornscan unicornscan
    -bash-4.0$ 

5.  Switch back to the root user.

    -bash-4.0$ exit
    exit
    [root at tux ~]#

6.  Edit PostgreSQL client authentication file /var/lib/pgsql/data/pg_hba.conf
    file with a text editor, insert the following lines before the other already
    existing rules.

    # TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
    local   unicornscan unicornscan                       md5
    host    unicornscan unicornscan 127.0.0.1/32          md5
    host    unicornscan unicornscan ::1/128               md5

7.  Edit PostgreSQL server configuration in /var/lib/pgsql/data/postgresql.conf
    and set the configuration variable as follows:

    escape_string_warning = off

8.  Restart the PostgreSQL service to enable the previous performed changes.

    [root at tux ~]# service postgresql restart
    Stopping postgresql service:                               [  OK  ]
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

9.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-0.*/pgsql_schema.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]# 

10. Edit the unicornscan configuration file /etc/unicornscan/modules.conf and
    check or correct the PostgreSQL database connection settings.

    module "pgsqldb" {
            dbconf:         "user=unicornscan password=scanit! host=localhost dbname=unicornscan";
            logpacket:      "true";
    };

11. Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#


--- NEW FILE unicornscan-web-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  Follow the /usr/share/doc/unicornscan-0.*/README.fedora file, so that the
    PostgreSQL service is up and running already.

2.  Start (or restart) the Apache HTTP webserver, to ensure that configuration
    file for Apache gets active.

    [root at tux ~]# service httpd start
    Starting httpd:                                            [  OK  ]
    [root at tux ~]# 

3.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-web-0.*/session.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]#

4.  If you've got SELinux enabled, make sure, that SELinux allows Apache/PHP to
    connect to the PostgreSQL database. If you don't have SELinux enabled, just
    skip this step.

    setsebool -P httpd_can_network_connect_db=1

5.  Edit the unicornscan configuration file /etc/unicornscan/web.php and check
    or correct the PostgreSQL database connection settings.

    $PHPLIB["database_name"]="unicornscan";
    $PHPLIB["database_username"]="unicornscan";
    $PHPLIB["database_password"]="scanit!";
    $PHPLIB["database_host"]="127.0.0.1";

6.  Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#

7.  Open a webbrowser and switch to: http://localhost/unicornscan/


--- NEW FILE unicornscan.conf ---
#
# Scalable, accurate, flexible and efficient network probing
#

Alias /unicornscan /usr/share/unicornscan


--- NEW FILE unicornscan.spec ---
Summary:	Scalable, accurate, flexible and efficient network probing
Name:		unicornscan
Version:	0.4.7
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.unicornscan.org/
Source0:	http://www.unicornscan.org/releases/%{name}-%{version}-2.tar.bz2
Source1:	unicornscan.conf
Source2:	unicornscan-README.fedora
Source3:	unicornscan-web-README.fedora
Patch0:		unicornscan-0.4.7-lib64.patch
Patch1:		unicornscan-0.4.7-geoip.patch
Patch2:		unicornscan-0.4.7-config.patch
Requires(pre):	shadow-utils
BuildRequires:	flex, bison, %{_includedir}/pcap.h, %{_includedir}/ltdl.h
BuildRequires:	libdnet-devel, GeoIP-devel, postgresql-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unicornscan is an attempt at a user-land distributed TCP/IP stack. It is
intended to provide a researcher a superior interface for introducing a
stimulus into and measuring a response from a TCP/IP enabled device or
network. Although it currently has hundreds of individual features, a main
set of abilities include: Asynchronous stateless TCP scanning with all
variations of TCP flags, asynchronous stateless TCP banner grabbing,
asynchronous protocol specific UDP scanning (sending enough of a signature
to elicit a response), active and passive remote OS, application and
component identification by analyzing responses, PCAP file logging and
filtering, relational database output, custom module support, customized
data-set views.

%package web
Summary:	Web-based front-end for unicornscan database results
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}, php-pgsql, httpd
%if 0%{?fedora}%{?rhel} >= 6
BuildArch:	noarch
%endif

%description web
Unicornscan provides support to write results into a database. And with the
web-based front-end for unicornscan, which is written in PHP, these results
can be easily interpreted and visualized.

%prep
%setup -q
%patch0 -p1 -b .lib64
%patch1 -p1 -b .geoip
%patch2 -p1 -b .config

cp -pf %{SOURCE2} README.fedora
cp -pf %{SOURCE3} www-front-end/README.fedora

%build
# - _GNU_SOURCE is required for "ucred" from <bits/socket.h> via <sys/socket.h>
# - Use classical non-SELinux permission schema once SELinux Reference Policy is
#   including unicornscan support directly, maybe with Fedora 13 and/or RHEL 6
# - MySQL support is only available in ./configure as inside broken and disabled
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
%configure --localstatedir=%{_localstatedir}/lib --with-pgsql --with-listen-user=%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Remove the static library files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.a

# Correct permissions and timestamps
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/*
touch -c -r etc/modules.conf.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/modules.conf

# Install web files into destination
cp -af www-front-end $RPM_BUILD_ROOT%{_datadir}/%{name}/
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/attic
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{config.php.config,README.fedora,TODO}
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/{session.sql,.htaccess}

# Move configuration file to its place
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
touch -c -r www-front-end/config.php.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
ln -sf ../../..%{_sysconfdir}/%{name}/web.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php

# Install the apache configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

# Create temporary directory for packaging
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/web/

%pre
getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Unicornscan User" %{name}
exit 0

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README README.database README.fedora README.security
%doc THANKS TODO UDP_PAYLOADS_NEEDED docs/Unicornscan-Getting_Started.pdf
%doc src/output_modules/database/sql/pgsql_schema.sql src/parse/example_confs
%dir %{_sysconfdir}/%{name}
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/modules.conf
%config(noreplace) %{_sysconfdir}/%{name}/oui.txt
%config(noreplace) %{_sysconfdir}/%{name}/payloads.conf
%config(noreplace) %{_sysconfdir}/%{name}/ports.txt
%config(noreplace) %{_sysconfdir}/%{name}/unicorn.conf
%{_bindir}/fantaip
%{_bindir}/unibrow
%{_bindir}/unicfgtst
%{_bindir}/%{name}
%{_bindir}/us
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
# *.la files are referenced by the shared objects and required
%{_libdir}/%{name}/modules/httpexp.la
%{_libdir}/%{name}/modules/httpexp.so
%{_libdir}/%{name}/modules/http.la
%{_libdir}/%{name}/modules/http.so
%{_libdir}/%{name}/modules/ntalk.la
%{_libdir}/%{name}/modules/ntalk.so
%{_libdir}/%{name}/modules/osdetect.la
%{_libdir}/%{name}/modules/osdetect.so
%{_libdir}/%{name}/modules/pgsqldb.la
%{_libdir}/%{name}/modules/pgsqldb.so
%{_libdir}/%{name}/modules/rdns.la
%{_libdir}/%{name}/modules/rdns.so
%{_libdir}/%{name}/modules/sip.la
%{_libdir}/%{name}/modules/sip.so
%{_libdir}/%{name}/modules/upnp.la
%{_libdir}/%{name}/modules/upnp.so
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/unilisten
%{_libexecdir}/%{name}/unisend
%{_mandir}/man1/%{name}.1*
%dir %{_localstatedir}/lib/%{name}

%files web
%defattr(-,root,root,-)
%doc www-front-end/README.fedora www-front-end/lib/session.sql
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(640,apache,apache) %{_sysconfdir}/%{name}/web.php
%{_datadir}/%{name}
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/web

%changelog
* Sat Dec 05 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-2
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)

* Tue Nov 17 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-1
- Upgrade to 0.4.7
- Initial spec file for Fedora and Red Hat Enterprise Linux (spec
  file is based on a try by Robert E. Lee and Manuel Wolfshant)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:27:24 -0000	1.1
+++ .cvsignore	8 Dec 2009 08:27:02 -0000	1.2
@@ -0,0 +1 @@
+unicornscan-0.4.7-2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:27:25 -0000	1.1
+++ sources	8 Dec 2009 08:27:02 -0000	1.2
@@ -0,0 +1 @@
+4c5f272eb38c333c0094c32317edf758  unicornscan-0.4.7-2.tar.bz2



From robert at fedoraproject.org  Tue Dec  8 08:27:02 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue,  8 Dec 2009 08:27:02 +0000 (UTC)
Subject: rpms/unicornscan/devel unicornscan-0.4.7-config.patch, NONE,
	1.1 unicornscan-README.fedora, NONE,
	1.1 unicornscan-web-README.fedora, NONE, 1.1 unicornscan.conf,
	NONE, 1.1 unicornscan-0.4.7-lib64.patch, 1.1,
	1.2 unicornscan.spec, 1.1, 1.2
Message-ID: <20091208082702.B6D3E11C0264@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/unicornscan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9375/devel

Modified Files:
	unicornscan-0.4.7-lib64.patch unicornscan.spec 
Added Files:
	unicornscan-0.4.7-config.patch unicornscan-README.fedora 
	unicornscan-web-README.fedora unicornscan.conf 
Log Message:
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)


unicornscan-0.4.7-config.patch:
 etc/modules.conf         |    9 +--------
 www-front-end/config.php |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE unicornscan-0.4.7-config.patch ---
--- unicornscan-0.4.7/etc/modules.conf			2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/etc/modules.conf.config		2009-12-05 20:34:31.000000000 +0100
@@ -1,16 +1,9 @@
 
 module "pgsqldb" {
-	dbconf:		"user=scan password=scanit! host=localhost dbname=scan";
+	dbconf:		"user=unicornscan password=scanit! host=localhost dbname=unicornscan";
 	logpacket:	"true";
 };
 
-module "mysqldb" {
-	username:	"scan";
-	password:	"scanit!";
-	hostname:	"localhost";
-	dbname:		"foo";
-};
-
 module "osdetect" {
 	/*	Stim	TCPFLG	TTL	DF	WS	TOS	Misc	*/
 	/* tcpopts		type	desc				*/
--- unicornscan-0.4.7/www-front-end/config.php		2007-11-27 11:23:35.000000000 +0100
+++ unicornscan-0.4.7/www-front-end/config.php.config	2009-12-05 20:35:13.000000000 +0100
@@ -4,16 +4,16 @@
 	define("config_master_include", 1);
 
 	// Web Server location stuff
-	$PHPLIB["uri_base"]="http://localhost/unicornscan/";		// http://vhost.domain.tld/something/
+	$PHPLIB["uri_base"]="/unicornscan/";				// http://vhost.domain.tld/something/
 
-	$PHPLIB["filesystem_base"]="/var/www/htdocs/unicornscan/";		// Base directory content is in
-	$PHPLIB["filesystem_phplib"]="/var/www/htdocs/unicornscan/lib/";	// Where phplib is
-	$PHPLIB["filesystem_temporary"]="/tmp/";			// Where can i write files to?
+	$PHPLIB["filesystem_base"]="/usr/share/unicornscan/";		// Base directory content is in
+	$PHPLIB["filesystem_phplib"]="/usr/share/unicornscan/lib/";	// Where phplib is
+	$PHPLIB["filesystem_temporary"]="/var/lib/unicornscan/web/";	// Where can i write files to?
 
 	// DataBase Variables
-	$PHPLIB["database_name"]="scan"; 		// change this for sure , its the database name
-	$PHPLIB["database_type"]="pgsql";		// pgsql, mysql, youll need the right class though
-	$PHPLIB["database_username"]="scan";
+	$PHPLIB["database_name"]="unicornscan";		// change this for sure , its the database name
+	$PHPLIB["database_type"]="pgsql";		// and something else isn't supported right now
+	$PHPLIB["database_username"]="unicornscan";
 	$PHPLIB["database_password"]="scanit!";
 	$PHPLIB["database_host"]="127.0.0.1";
 	$PHPLIB["database_db"]["default"]="";
@@ -24,6 +24,9 @@
 	// formclass2.php stuff
 	$PHPLIB["formclass_warnimage"]="exl.gif";			// warning image for invalid forms
 
+	// No PHP error reporting
+	error_reporting(0);
+
 } // Double Inclusion detection
 
 require("./lib/connect_todb.php");


--- NEW FILE unicornscan-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  The PostgreSQL service has to be up and running. Depending on the exact
    version of Fedora or Red Hat Enterprise Linux, on the first PostgreSQL
    startup, a "service postgresql initdb" is maybe required for initializing.

    [root at tux ~]# service postgresql start
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

2.  Switch to the PostgreSQL user.

    [root at tux ~]# su - postgres
    -bash-4.0$ 

3.  Create an own PostgreSQL database user for unicornscan. Don't forget to set
    a password, e.g. "scanit!" as it is used in all examples.

    -bash-4.0$ createuser --no-superuser --no-createrole --no-createdb --pwprompt unicornscan
    Enter password for new role:
    Enter it again:
    -bash-4.0$ 

4.  Create an own PostgreSQL database for unicornscan linked with the previous
    generated database user for unicornscan.

    -bash-4.0$ createdb --owner unicornscan unicornscan
    -bash-4.0$ 

5.  Switch back to the root user.

    -bash-4.0$ exit
    exit
    [root at tux ~]#

6.  Edit PostgreSQL client authentication file /var/lib/pgsql/data/pg_hba.conf
    file with a text editor, insert the following lines before the other already
    existing rules.

    # TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
    local   unicornscan unicornscan                       md5
    host    unicornscan unicornscan 127.0.0.1/32          md5
    host    unicornscan unicornscan ::1/128               md5

7.  Edit PostgreSQL server configuration in /var/lib/pgsql/data/postgresql.conf
    and set the configuration variable as follows:

    escape_string_warning = off

8.  Restart the PostgreSQL service to enable the previous performed changes.

    [root at tux ~]# service postgresql restart
    Stopping postgresql service:                               [  OK  ]
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

9.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-0.*/pgsql_schema.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]# 

10. Edit the unicornscan configuration file /etc/unicornscan/modules.conf and
    check or correct the PostgreSQL database connection settings.

    module "pgsqldb" {
            dbconf:         "user=unicornscan password=scanit! host=localhost dbname=unicornscan";
            logpacket:      "true";
    };

11. Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#


--- NEW FILE unicornscan-web-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  Follow the /usr/share/doc/unicornscan-0.*/README.fedora file, so that the
    PostgreSQL service is up and running already.

2.  Start (or restart) the Apache HTTP webserver, to ensure that configuration
    file for Apache gets active.

    [root at tux ~]# service httpd start
    Starting httpd:                                            [  OK  ]
    [root at tux ~]# 

3.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-web-0.*/session.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]#

4.  If you've got SELinux enabled, make sure, that SELinux allows Apache/PHP to
    connect to the PostgreSQL database. If you don't have SELinux enabled, just
    skip this step.

    setsebool -P httpd_can_network_connect_db=1

5.  Edit the unicornscan configuration file /etc/unicornscan/web.php and check
    or correct the PostgreSQL database connection settings.

    $PHPLIB["database_name"]="unicornscan";
    $PHPLIB["database_username"]="unicornscan";
    $PHPLIB["database_password"]="scanit!";
    $PHPLIB["database_host"]="127.0.0.1";

6.  Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#

7.  Open a webbrowser and switch to: http://localhost/unicornscan/


--- NEW FILE unicornscan.conf ---
#
# Scalable, accurate, flexible and efficient network probing
#

Alias /unicornscan /usr/share/unicornscan

unicornscan-0.4.7-lib64.patch:
 configure    |    4 ++--
 configure.ac |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: unicornscan-0.4.7-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/devel/unicornscan-0.4.7-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- unicornscan-0.4.7-lib64.patch	8 Dec 2009 08:18:48 -0000	1.1
+++ unicornscan-0.4.7-lib64.patch	8 Dec 2009 08:27:02 -0000	1.2
@@ -1,8 +1,9 @@
 Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which
 adds support for x86_64, ppc64 or other 64 bit architectures using /usr/lib64 for
 their libraries. Having lib64 in front of lib is mandatory, as 64 bit systems are
-likely to run with multi-lib, that means 32 bit libraries are parallel in use. So
-running autoconf is required after applying this patch.
+likely to run with multi-lib, that means 32 bit libraries are parallel in use. If
+you apply this patch, don't run autoconf > 2.6.3, as it will break, because whole
+autotools stuff from upstream is unfortunately a bit broken.
 
 --- unicornscan-0.4.7/configure.ac		2007-11-29 15:51:20.000000000 +0100
 +++ unicornscan-0.4.7/configure.ac.lib64	2009-11-16 23:32:27.000000000 +0100
@@ -24,3 +25,23 @@ running autoconf is required after apply
        str="$PGSQL_DIR/$i/libpq.*"
        for j in `echo $str`; do
          if test -r $j; then
+--- unicornscan-0.4.7/configure			2007-12-18 16:26:12.000000000 +0100
++++ unicornscan-0.4.7/configure.lib64		2009-12-05 12:04:32.000000000 +0100
+@@ -26275,7 +26275,7 @@
+ echo "${ECHO_T}no" >&6; }
+     fi
+   else
+-    for i in lib lib/mysql; do
++    for i in lib64 lib lib64/mysql lib/mysql; do
+       str="$MYSQL_DIR/$i/libmysqlclient.*"
+       for j in `echo $str`; do
+         if test -r $j; then
+@@ -26438,7 +26438,7 @@
+ echo "${ECHO_T}no" >&6; }
+     fi
+   else
+-    for i in lib lib/postgresql; do
++    for i in lib64 lib lib64/postgresql lib/postgresql; do
+       str="$PGSQL_DIR/$i/libpq.*"
+       for j in `echo $str`; do
+         if test -r $j; then


Index: unicornscan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/devel/unicornscan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- unicornscan.spec	8 Dec 2009 08:18:48 -0000	1.1
+++ unicornscan.spec	8 Dec 2009 08:27:02 -0000	1.2
@@ -1,16 +1,20 @@
 Summary:	Scalable, accurate, flexible and efficient network probing
 Name:		unicornscan
 Version:	0.4.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.unicornscan.org/
-Source:		http://www.unicornscan.org/releases/%{name}-%{version}-2.tar.bz2
+Source0:	http://www.unicornscan.org/releases/%{name}-%{version}-2.tar.bz2
+Source1:	unicornscan.conf
+Source2:	unicornscan-README.fedora
+Source3:	unicornscan-web-README.fedora
 Patch0:		unicornscan-0.4.7-lib64.patch
 Patch1:		unicornscan-0.4.7-geoip.patch
+Patch2:		unicornscan-0.4.7-config.patch
 Requires(pre):	shadow-utils
 BuildRequires:	flex, bison, %{_includedir}/pcap.h, %{_includedir}/ltdl.h
-BuildRequires:	libdnet-devel, GeoIP-devel, postgresql-devel, autoconf
+BuildRequires:	libdnet-devel, GeoIP-devel, postgresql-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,11 +30,27 @@ component identification by analyzing re
 filtering, relational database output, custom module support, customized
 data-set views.
 
+%package web
+Summary:	Web-based front-end for unicornscan database results
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}, php-pgsql, httpd
+%if 0%{?fedora}%{?rhel} >= 6
+BuildArch:	noarch
+%endif
+
+%description web
+Unicornscan provides support to write results into a database. And with the
+web-based front-end for unicornscan, which is written in PHP, these results
+can be easily interpreted and visualized.
+
 %prep
 %setup -q
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .geoip
-autoconf
+%patch2 -p1 -b .config
+
+cp -pf %{SOURCE2} README.fedora
+cp -pf %{SOURCE3} www-front-end/README.fedora
 
 %build
 # - _GNU_SOURCE is required for "ucred" from <bits/socket.h> via <sys/socket.h>
@@ -48,8 +68,27 @@ make DESTDIR=$RPM_BUILD_ROOT INSTALL="in
 # Remove the static library files
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.a
 
-# Correct permissions from 755 to 644
+# Correct permissions and timestamps
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/*
+touch -c -r etc/modules.conf.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/modules.conf
+
+# Install web files into destination
+cp -af www-front-end $RPM_BUILD_ROOT%{_datadir}/%{name}/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/attic
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{config.php.config,README.fedora,TODO}
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/{session.sql,.htaccess}
+
+# Move configuration file to its place
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
+touch -c -r www-front-end/config.php.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
+ln -sf ../../..%{_sysconfdir}/%{name}/web.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
+
+# Install the apache configuration file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+
+# Create temporary directory for packaging
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/web/
 
 %pre
 getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
@@ -61,8 +100,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE README README.database README.security THANKS
-%doc TODO UDP_PAYLOADS_NEEDED docs/Unicornscan-Getting_Started.pdf
+%doc AUTHORS LICENSE README README.database README.fedora README.security
+%doc THANKS TODO UDP_PAYLOADS_NEEDED docs/Unicornscan-Getting_Started.pdf
 %doc src/output_modules/database/sql/pgsql_schema.sql src/parse/example_confs
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/modules.conf
@@ -100,7 +139,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 %dir %{_localstatedir}/lib/%{name}
 
+%files web
+%defattr(-,root,root,-)
+%doc www-front-end/README.fedora www-front-end/lib/session.sql
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config(noreplace) %attr(640,apache,apache) %{_sysconfdir}/%{name}/web.php
+%{_datadir}/%{name}
+%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/web
+
 %changelog
+* Sat Dec 05 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-2
+- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
+- Updated the patch for 64 bit support in configure (#538190 #c6)
+
 * Tue Nov 17 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-1
 - Upgrade to 0.4.7
 - Initial spec file for Fedora and Red Hat Enterprise Linux (spec



From jnovy at fedoraproject.org  Tue Dec  8 09:18:42 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue,  8 Dec 2009 09:18:42 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-pnmsmooth-segfault.patch, NONE,
	1.1 netpbm.spec, 1.148, 1.149
Message-ID: <20091208091842.C6C9E11C0264@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19357

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-pnmsmooth-segfault.patch 
Log Message:
* Mon Dec  7 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-3
- fix segfault in pnmsmooth (#545089)


netpbm-pnmsmooth-segfault.patch:
 pnmsmooth.c |   37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

--- NEW FILE netpbm-pnmsmooth-segfault.patch ---
diff -up netpbm-10.47.04/editor/pnmsmooth.c.pnmsmooth-segfault netpbm-10.47.04/editor/pnmsmooth.c
--- netpbm-10.47.04/editor/pnmsmooth.c.pnmsmooth-segfault	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmsmooth.c	2009-03-23 07:55:01.000000000 +0100
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/wait.h>
 
 #include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "nstring.h"
-#include "pm_system.h"
 #include "pnm.h"
 
 
@@ -176,6 +176,38 @@ writeConvolutionImage(FILE *       const
 
 
 
+static void
+runPnmconvol(const char * const inputFilespec,
+             const char * const convolutionImageFilespec) {
+
+    /* fork a Pnmconvol process */
+    pid_t rc;
+
+    rc = fork();
+    if (rc < 0)
+        pm_error("fork() failed.  errno=%d (%s)", errno, strerror(errno));
+    else if (rc == 0) {
+        /* child process executes following code */
+
+        execlp("pnmconvol",
+               "pnmconvol", convolutionImageFilespec, inputFilespec,
+               NULL);
+
+        pm_error("error executing pnmconvol command.  errno=%d (%s)",
+                 errno, strerror(errno));
+    } else {
+        /* This is the parent */
+        pid_t const childPid = rc;
+
+        int status;
+
+        /* wait for child to finish */
+        while (wait(&status) != childPid);
+    }
+}
+
+
+
 int
 main(int argc, char ** argv) {
 
@@ -200,8 +232,7 @@ main(int argc, char ** argv) {
     if (cmdline.dump) {
         /* We're done.  Convolution image is in user's file */
     } else {
-        pm_system_lp("pnmconvol", NULL, NULL, NULL, NULL,
-                     tempfileName, cmdline.inputFilespec, NULL);
+        runPnmconvol(cmdline.inputFilespec, tempfileName);
 
         unlink(tempfileName);
         strfree(tempfileName);


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- netpbm.spec	27 Nov 2009 05:40:12 -0000	1.148
+++ netpbm.spec	8 Dec 2009 09:18:42 -0000	1.149
@@ -1,13 +1,13 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.47.04
-Release: 2%{?dist}
+Release: 3%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
 # Source0 is prepared by
-# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/super_stable netpbm-%{version}
+# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{version}
 # svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
 # and removing the .svn directories
 Source0: netpbm-%{version}.tar.xz
@@ -27,6 +27,7 @@ Patch13: netpbm-glibc.patch
 Patch14: netpbm-pnmtofiasco-stdin.patch
 Patch15: netpbm-svgtopam.patch
 Patch16: netpbm-ppmpat-segfault.patch
+Patch17: netpbm-pnmsmooth-segfault.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -84,6 +85,7 @@ netpbm-progs.  You'll also need to insta
 %patch14 -p1 -b .pnmtofiasco-stdin
 %patch15 -p1 -b .svgtopam
 %patch16 -p1 -b .ppmpat-segfault
+%patch17 -p1 -b .pnmsmooth-segfault
 
 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
@@ -111,11 +113,10 @@ sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' 
 EOF
 
 TOP=`pwd`
-#	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions" \
 make \
 	CC="%{__cc}" \
 	LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
-	CFLAGS="-g3 -fPIC -flax-vector-conversions" \
+	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions" \
 	LADD="-lm" \
 	JPEGINC_DIR=%{_includedir} \
 	PNGINC_DIR=%{_includedir} \
@@ -213,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Mon Dec  7 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-3
+- fix segfault in pnmsmooth (#545089)
+
 * Fri Nov 27 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-2
 - fix ppmpat segfault when using -camo option (#541568)
 



From jnovy at fedoraproject.org  Tue Dec  8 09:24:03 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue,  8 Dec 2009 09:24:03 +0000 (UTC)
Subject: rpms/netpbm/F-12 netpbm-pnmsmooth-segfault.patch, NONE,
	1.1 netpbm.spec, 1.147, 1.148
Message-ID: <20091208092403.AFDE411C0264@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20407

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-pnmsmooth-segfault.patch 
Log Message:
* Mon Dec  7 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-3
- fix segfault in pnmsmooth (#545089)


netpbm-pnmsmooth-segfault.patch:
 pnmsmooth.c |   37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

--- NEW FILE netpbm-pnmsmooth-segfault.patch ---
diff -up netpbm-10.47.04/editor/pnmsmooth.c.pnmsmooth-segfault netpbm-10.47.04/editor/pnmsmooth.c
--- netpbm-10.47.04/editor/pnmsmooth.c.pnmsmooth-segfault	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmsmooth.c	2009-03-23 07:55:01.000000000 +0100
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/wait.h>
 
 #include "pm_c_util.h"
 #include "mallocvar.h"
 #include "shhopt.h"
 #include "nstring.h"
-#include "pm_system.h"
 #include "pnm.h"
 
 
@@ -176,6 +176,38 @@ writeConvolutionImage(FILE *       const
 
 
 
+static void
+runPnmconvol(const char * const inputFilespec,
+             const char * const convolutionImageFilespec) {
+
+    /* fork a Pnmconvol process */
+    pid_t rc;
+
+    rc = fork();
+    if (rc < 0)
+        pm_error("fork() failed.  errno=%d (%s)", errno, strerror(errno));
+    else if (rc == 0) {
+        /* child process executes following code */
+
+        execlp("pnmconvol",
+               "pnmconvol", convolutionImageFilespec, inputFilespec,
+               NULL);
+
+        pm_error("error executing pnmconvol command.  errno=%d (%s)",
+                 errno, strerror(errno));
+    } else {
+        /* This is the parent */
+        pid_t const childPid = rc;
+
+        int status;
+
+        /* wait for child to finish */
+        while (wait(&status) != childPid);
+    }
+}
+
+
+
 int
 main(int argc, char ** argv) {
 
@@ -200,8 +232,7 @@ main(int argc, char ** argv) {
     if (cmdline.dump) {
         /* We're done.  Convolution image is in user's file */
     } else {
-        pm_system_lp("pnmconvol", NULL, NULL, NULL, NULL,
-                     tempfileName, cmdline.inputFilespec, NULL);
+        runPnmconvol(cmdline.inputFilespec, tempfileName);
 
         unlink(tempfileName);
         strfree(tempfileName);


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/netpbm.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- netpbm.spec	27 Nov 2009 06:03:19 -0000	1.147
+++ netpbm.spec	8 Dec 2009 09:24:03 -0000	1.148
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.47.04
-Release: 2%{?dist}
+Release: 3%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -27,6 +27,7 @@ Patch13: netpbm-glibc.patch
 Patch14: netpbm-pnmtofiasco-stdin.patch
 Patch15: netpbm-svgtopam.patch
 Patch16: netpbm-ppmpat-segfault.patch
+Patch17: netpbm-pnmsmooth-segfault.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -84,6 +85,7 @@ netpbm-progs.  You'll also need to insta
 %patch14 -p1 -b .pnmtofiasco-stdin
 %patch15 -p1 -b .svgtopam
 %patch16 -p1 -b .ppmpat-segfault
+%patch17 -p1 -b .pnmsmooth-segfault
 
 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
@@ -212,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Mon Dec  7 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-3
+- fix segfault in pnmsmooth (#545089)
+
 * Fri Nov 27 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-2
 - fix ppmpat segfault when using -camo option (#541568)
 



From twaugh at fedoraproject.org  Tue Dec  8 09:34:24 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 09:34:24 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.541,1.542
Message-ID: <20091208093424.0797111C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23376

Modified Files:
	cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
- Moved %{_datadir}/cups/ppdc/*.h to the main package (bug #545348).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -p -r1.541 -r1.542
--- cups.spec	4 Dec 2009 15:50:13 -0000	1.541
+++ cups.spec	8 Dec 2009 09:34:23 -0000	1.542
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -496,6 +496,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/cups/mime/mime.convs
 %dir %{_datadir}/cups/ppdc
 %{_datadir}/cups/ppdc/*.defs
+%{_datadir}/cups/ppdc/*.h
 
 %files libs
 %defattr(-,root,root)
@@ -506,9 +507,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cups-config
 %{_libdir}/*.so
 %{_includedir}/cups
-%dir %{_datadir}/cups
-%dir %{_datadir}/cups/ppdc
-%{_datadir}/cups/ppdc/*.h
 
 %files lpd
 %defattr(-,root,root)
@@ -523,6 +521,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
+- Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).
+
 * Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
 - The web interface prevented conflicting options from being adjusted
   (bug #533426, STR #3439).



From tagoh at fedoraproject.org  Tue Dec  8 09:35:59 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  8 Dec 2009 09:35:59 +0000 (UTC)
Subject: rpms/paps/devel paps.spec,1.39,1.40
Message-ID: <20091208093559.F21C311C0264@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/paps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23943

Modified Files:
	paps.spec 
Log Message:
* Tue Dec  8 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.8-12
- Add paps.convs to behaves the cups filter without the hardcoded thing
  in cups. (#545031)


Index: paps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paps/devel/paps.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- paps.spec	14 Oct 2009 10:42:42 -0000	1.39
+++ paps.spec	8 Dec 2009 09:35:59 -0000	1.40
@@ -1,10 +1,11 @@
 Name:		paps
 Version:	0.6.8
-Release:	11%{?dist}
+Release:	12%{?dist}
 
 License:	LGPLv2+
 URL:		http://paps.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
+Source1:	paps.convs
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel automake autoconf libtool doxygen cups-devel
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832897&group_id=153049&atid=786241
@@ -79,6 +80,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/libpaps.la
 %{__mkdir_p} $RPM_BUILD_ROOT/usr/lib/cups/filter # Not libdir
 ln -s %{_bindir}/paps $RPM_BUILD_ROOT/usr/lib/cups/filter/texttopaps
 
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/cups
+install -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,6 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/paps
 %{_mandir}/man1/paps.1*
 /usr/lib/cups/filter/texttopaps
+%dir %{_sysconfdir}/cups
+%{_sysconfdir}/cups/paps.convs
 
 %files libs
 %defattr(-, root, root, -)
@@ -101,7 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpaps.so
 
 %changelog
-* Wed Oct 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.9-11
+* Tue Dec  8 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.8-12
+- Add paps.convs to behaves the cups filter without the hardcoded thing
+  in cups. (#545031)
+
+* Wed Oct 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.8-11
 - Fix code that deal with CPI parameter to be accurate. (#524883)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.8-10



From jsafrane at fedoraproject.org  Tue Dec  8 09:36:22 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Tue,  8 Dec 2009 09:36:22 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.198,1.199
Message-ID: <20091208093622.55BED11C0264@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24110

Modified Files:
	net-snmp.spec 
Log Message:
fix compilation of the python module


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- net-snmp.spec	7 Dec 2009 17:07:42 -0000	1.198
+++ net-snmp.spec	8 Dec 2009 09:36:22 -0000	1.199
@@ -1,16 +1,17 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 # use netsnmp_tcp_wrappers 0 to disable tcp_wrappers support
 %{!?netsnmp_tcp_wrappers:%define netsnmp_tcp_wrappers 1}
 # use nestnmp_check 0 to speed up packaging by disabling 'make test'
 %{!?netsnmp_check: %define netsnmp_check 1}
+
 # Arches on which we need to prevent arch conflicts on net-snmp-config.h
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64
+# allow compilation on old Fedoras
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: 5.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -385,7 +386,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %files python
 %defattr(-,root,root,-)
 %doc README
-%{python_sitelib}/*
+%{python_sitearch}/*
 
 %files gui
 %defattr(-,root,root)
@@ -401,6 +402,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs/*
 
 %changelog
+* Tue Dec  8 2009 Jan Safranek <jsafrane at redhat.com> - 1:5.5-6
+- fix compilation of the python module
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:5.5-5
 - rebuild against perl 5.10.1
 



From tagoh at fedoraproject.org  Tue Dec  8 09:37:26 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  8 Dec 2009 09:37:26 +0000 (UTC)
Subject: rpms/paps/F-12 paps.convs,NONE,1.1 paps.spec,1.39,1.40
Message-ID: <20091208093726.7BD0211C0264@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/paps/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24597

Modified Files:
	paps.spec 
Added Files:
	paps.convs 
Log Message:
* Tue Dec  8 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.8-12
- Add paps.convs to behaves the cups filter without the hardcoded thing
  in cups. (#545031)


--- NEW FILE paps.convs ---
# Use the texttopaps filter (from the paps package) in preference to
# the texttops filter shipped as part of CUPS.  This is so that we
# have full UTF-8 support.
#
# To use the default CUPS texttops filter instead, remove this file
# (or the package it belongs to).

text/plain			application/postscript		30	texttopaps


Index: paps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paps/F-12/paps.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- paps.spec	20 Oct 2009 02:42:46 -0000	1.39
+++ paps.spec	8 Dec 2009 09:37:26 -0000	1.40
@@ -1,10 +1,11 @@
 Name:		paps
 Version:	0.6.8
-Release:	11%{?dist}
+Release:	12%{?dist}
 
 License:	LGPLv2+
 URL:		http://paps.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
+Source1:	paps.convs
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel automake autoconf libtool doxygen cups-devel
 ## https://sourceforge.net/tracker/index.php?func=detail&aid=1832897&group_id=153049&atid=786241
@@ -79,6 +80,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/libpaps.la
 %{__mkdir_p} $RPM_BUILD_ROOT/usr/lib/cups/filter # Not libdir
 ln -s %{_bindir}/paps $RPM_BUILD_ROOT/usr/lib/cups/filter/texttopaps
 
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/cups
+install -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,6 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/paps
 %{_mandir}/man1/paps.1*
 /usr/lib/cups/filter/texttopaps
+%dir %{_sysconfdir}/cups
+%{_sysconfdir}/cups/paps.convs
 
 %files libs
 %defattr(-, root, root, -)
@@ -101,7 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpaps.so
 
 %changelog
-* Wed Oct 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.9-11
+* Tue Dec  8 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.8-12
+- Add paps.convs to behaves the cups filter without the hardcoded thing
+  in cups. (#545031)
+
+* Wed Oct 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.8-11
 - Fix code that deal with CPI parameter to be accurate. (#524883)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.8-10



From tagoh at fedoraproject.org  Tue Dec  8 09:38:18 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  8 Dec 2009 09:38:18 +0000 (UTC)
Subject: rpms/paps/devel paps.convs,NONE,1.1
Message-ID: <20091208093818.DA76B11C0264@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/paps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24947

Added Files:
	paps.convs 
Log Message:
missing file


--- NEW FILE paps.convs ---
# Use the texttopaps filter (from the paps package) in preference to
# the texttops filter shipped as part of CUPS.  This is so that we
# have full UTF-8 support.
#
# To use the default CUPS texttops filter instead, remove this file
# (or the package it belongs to).

text/plain			application/postscript		30	texttopaps



From twaugh at fedoraproject.org  Tue Dec  8 09:38:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 09:38:20 +0000 (UTC)
Subject: rpms/cups/F-12 cups.spec,1.547,1.548
Message-ID: <20091208093820.DF17111C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24934

Modified Files:
	cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
- Moved %{_datadir}/cups/ppdc/*.h to the main package (bug #545348).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -p -r1.547 -r1.548
--- cups.spec	4 Dec 2009 16:06:43 -0000	1.547
+++ cups.spec	8 Dec 2009 09:38:20 -0000	1.548
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -507,6 +507,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/cups/mime/mime.convs
 %dir %{_datadir}/cups/ppdc
 %{_datadir}/cups/ppdc/*.defs
+%{_datadir}/cups/ppdc/*.h
 
 %files libs
 %defattr(-,root,root)
@@ -517,9 +518,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cups-config
 %{_libdir}/*.so
 %{_includedir}/cups
-%dir %{_datadir}/cups
-%dir %{_datadir}/cups/ppdc
-%{_datadir}/cups/ppdc/*.h
 
 %files lpd
 %defattr(-,root,root)
@@ -534,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
+- Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).
+
 * Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12
 - The web interface prevented conflicting options from being adjusted
   (bug #533426, STR #3439).



From kdudka at fedoraproject.org  Tue Dec  8 09:41:11 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  8 Dec 2009 09:41:11 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.131,1.132
Message-ID: <20091208094111.2C96611C0264@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25818

Modified Files:
	curl.spec 
Log Message:
- make it possible to run test241
- re-enable SCP/SFTP tests (#539444)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- curl.spec	5 Dec 2009 19:48:31 -0000	1.131
+++ curl.spec	8 Dec 2009 09:41:10 -0000	1.132
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -26,12 +26,8 @@ BuildRequires: libidn-devel
 BuildRequires: libssh2-devel >= 1.2
 BuildRequires: nss-devel
 BuildRequires: openldap-devel
-
-# SCP/SFTP test suite temporarily disabled (#539444)
-
-#BuildRequires: openssh-clients
-#BuildRequires: openssh-server
-
+BuildRequires: openssh-clients
+BuildRequires: openssh-server
 BuildRequires: pkgconfig
 BuildRequires: stunnel
 
@@ -185,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Dec 08 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-6
+- make it possible to run test241
+- re-enable SCP/SFTP tests (#539444)
+
 * Sat Dec 05 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-5
 - avoid use of uninitialized value in lib/nss.c
 - suppress failure of test513 on s390



From twaugh at fedoraproject.org  Tue Dec  8 09:41:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 09:41:20 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.549,1.550
Message-ID: <20091208094120.E3ADB11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25863

Modified Files:
	cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Moved %{_datadir}/cups/ppdc/*.h to the main package (bug #545348).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -p -r1.549 -r1.550
--- cups.spec	4 Dec 2009 15:51:35 -0000	1.549
+++ cups.spec	8 Dec 2009 09:41:20 -0000	1.550
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -497,6 +497,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/cups/mime/mime.convs
 %dir %{_datadir}/cups/ppdc
 %{_datadir}/cups/ppdc/*.defs
+%{_datadir}/cups/ppdc/*.h
 
 %files libs
 %defattr(-,root,root)
@@ -507,9 +508,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cups-config
 %{_libdir}/*.so
 %{_includedir}/cups
-%dir %{_datadir}/cups
-%dir %{_datadir}/cups/ppdc
-%{_datadir}/cups/ppdc/*.h
 
 %files lpd
 %defattr(-,root,root)
@@ -524,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).
+
 * Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
 - The web interface prevented conflicting options from being adjusted
   (bug #533426, STR #3439).



From kdudka at fedoraproject.org  Tue Dec  8 09:49:51 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  8 Dec 2009 09:49:51 +0000 (UTC)
Subject: rpms/curl/F-12 curl.spec,1.127,1.128
Message-ID: <20091208094951.D535011C0264@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27884

Modified Files:
	curl.spec 
Log Message:
- make it possible to run test241
- re-enable SCP/SFTP tests (#539444)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- curl.spec	5 Dec 2009 19:54:15 -0000	1.127
+++ curl.spec	8 Dec 2009 09:49:51 -0000	1.128
@@ -24,12 +24,8 @@ BuildRequires: libidn-devel
 BuildRequires: libssh2-devel >= 1.2
 BuildRequires: nss-devel
 BuildRequires: openldap-devel
-
-# SCP/SFTP test suite temporarily disabled (#539444)
-
-#BuildRequires: openssh-clients
-#BuildRequires: openssh-server
-
+BuildRequires: openssh-clients
+BuildRequires: openssh-server
 BuildRequires: pkgconfig
 BuildRequires: stunnel
 
@@ -182,9 +178,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
-* Sat Dec 05 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
+* Tue Dec 08 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
 - avoid use of uninitialized value in lib/nss.c
+- make it possible to run test241
 - suppress failure of test513 on s390
+- re-enable SCP/SFTP tests (#539444)
 
 * Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-3
 - do not require valgrind on s390 and s390x



From twaugh at fedoraproject.org  Tue Dec  8 09:56:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 09:56:49 +0000 (UTC)
Subject: rpms/cups/F-12 cups.spec,1.548,1.549 cups-paps.patch,1.4,NONE
Message-ID: <20091208095649.9A5D411C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29664

Modified Files:
	cups.spec 
Removed Files:
	cups-paps.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- No longer requires paps.  The texttopaps filter MIME conversion file
  is now provided by the paps package (bug #545036).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -p -r1.548 -r1.549
--- cups.spec	8 Dec 2009 09:38:20 -0000	1.548
+++ cups.spec	8 Dec 2009 09:56:49 -0000	1.549
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -32,7 +32,6 @@ Patch4: cups-serial.patch
 Patch5: cups-banners.patch
 Patch6: cups-serverbin-compat.patch
 Patch7: cups-no-export-ssllibs.patch
-Patch8: cups-paps.patch
 Patch9: cups-direct-usb.patch
 Patch10: cups-lpr-help.patch
 Patch11: cups-peercred.patch
@@ -114,9 +113,6 @@ BuildRequires: gcc >= 4.0.1
 BuildPrereq: dbus-devel >= 0.90
 Requires: dbus >= 0.90
 
-# The paps package uses pango to render UTF-8 text to PostScript.
-Requires: paps >= 0.6.6-9
-
 # Requires tmpwatch for the cron.daily script (bug #218901).
 Requires: tmpwatch
 
@@ -203,7 +199,6 @@ module. 
 %patch5 -p1 -b .banners
 %patch6 -p1 -b .serverbin-compat
 %patch7 -p1 -b .no-export-ssllibs
-%patch8 -p1 -b .paps
 %patch9 -p1 -b .direct-usb
 %patch10 -p1 -b .lpr-help
 %patch11 -p1 -b .peercred
@@ -532,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- No longer requires paps.  The texttopaps filter MIME conversion file
+  is now provided by the paps package (bug #545036).
+
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
 - Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).
 


--- cups-paps.patch DELETED ---



From twaugh at fedoraproject.org  Tue Dec  8 09:57:29 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 09:57:29 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.550,1.551 cups-paps.patch,1.4,NONE
Message-ID: <20091208095729.CE4E511C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30023

Modified Files:
	cups.spec 
Removed Files:
	cups-paps.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- No longer requires paps.  The texttopaps filter MIME conversion file
  is now provided by the paps package (bug #545036).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -p -r1.550 -r1.551
--- cups.spec	8 Dec 2009 09:41:20 -0000	1.550
+++ cups.spec	8 Dec 2009 09:57:29 -0000	1.551
@@ -30,7 +30,6 @@ Patch4: cups-serial.patch
 Patch5: cups-banners.patch
 Patch6: cups-serverbin-compat.patch
 Patch7: cups-no-export-ssllibs.patch
-Patch8: cups-paps.patch
 Patch9: cups-direct-usb.patch
 Patch10: cups-lpr-help.patch
 Patch11: cups-peercred.patch
@@ -112,9 +111,6 @@ BuildRequires: gcc >= 4.0.1
 BuildPrereq: dbus-devel >= 0.90
 Requires: dbus >= 0.90
 
-# The paps package uses pango to render UTF-8 text to PostScript.
-Requires: paps >= 0.6.6-9
-
 # Requires tmpwatch for the cron.daily script (bug #218901).
 Requires: tmpwatch
 
@@ -201,7 +197,6 @@ module. 
 %patch5 -p1 -b .banners
 %patch6 -p1 -b .serverbin-compat
 %patch7 -p1 -b .no-export-ssllibs
-%patch8 -p1 -b .paps
 %patch9 -p1 -b .direct-usb
 %patch10 -p1 -b .lpr-help
 %patch11 -p1 -b .peercred
@@ -523,6 +518,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- No longer requires paps.  The texttopaps filter MIME conversion file
+  is now provided by the paps package (bug #545036).
 - Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).
 
 * Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13


--- cups-paps.patch DELETED ---



From twaugh at fedoraproject.org  Tue Dec  8 10:05:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:05:39 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3439.patch,1.1,1.2 cups.spec,1.542,1.543
Message-ID: <20091208100539.C49ED11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32262

Modified Files:
	cups-str3439.patch cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
- Use upstream fix for adjustment of conflicting options
  (bug #533426, STR #3439).


cups-str3439.patch:
 cgi-bin/admin.c  |    5 +++++
 cups/conflicts.c |    4 ++++
 cups/mark.c      |   24 +++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

Index: cups-str3439.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-str3439.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3439.patch	4 Dec 2009 15:50:13 -0000	1.1
+++ cups-str3439.patch	8 Dec 2009 10:05:39 -0000	1.2
@@ -1,12 +1,126 @@
 diff -up cups-1.4.2/cgi-bin/admin.c.str3439 cups-1.4.2/cgi-bin/admin.c
---- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-04 15:48:21.181907084 +0000
-+++ cups-1.4.2/cgi-bin/admin.c	2009-12-04 15:48:21.199906005 +0000
-@@ -3327,7 +3327,7 @@ do_set_options(http_t *http,		/* I - HTT
+--- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-08 10:03:36.412157983 +0000
++++ cups-1.4.2/cgi-bin/admin.c	2009-12-08 10:03:41.659157246 +0000
+@@ -3320,11 +3320,16 @@ do_set_options(http_t *http,		/* I - HTT
+     for (option = ppdFirstOption(ppd);
+          option;
+ 	 option = ppdNextOption(ppd))
++    {
+       if ((var = cgiGetVariable(option->keyword)) != NULL)
+       {
+ 	have_options = 1;
+ 	ppdMarkOption(ppd, option->keyword, var);
++	fprintf(stderr, "DEBUG: Set %s to %s...\n", option->keyword, var);
        }
++      else
++        fprintf(stderr, "DEBUG: Didn't find %s...\n", option->keyword);
++    }
    }
  
--  if (!have_options || ppdConflicts(ppd))
-+  if (!have_options)
+   if (!have_options || ppdConflicts(ppd))
+diff -up cups-1.4.2/cups/conflicts.c.str3439 cups-1.4.2/cups/conflicts.c
+--- cups-1.4.2/cups/conflicts.c.str3439	2009-05-18 23:55:15.000000000 +0100
++++ cups-1.4.2/cups/conflicts.c	2009-12-08 10:03:41.657157719 +0000
+@@ -583,9 +583,13 @@ ppdConflicts(ppd_file_t *ppd)		/* I - PP
+   * Clear all conflicts...
+   */
+ 
++  cupsArraySave(ppd->options);
++
+   for (o = ppdFirstOption(ppd); o; o = ppdNextOption(ppd))
+     o->conflicted = 0;
+ 
++  cupsArrayRestore(ppd->options);
++
+  /*
+   * Test for conflicts...
+   */
+diff -up cups-1.4.2/cups/mark.c.str3439 cups-1.4.2/cups/mark.c
+--- cups-1.4.2/cups/mark.c.str3439	2009-04-20 22:37:14.000000000 +0100
++++ cups-1.4.2/cups/mark.c	2009-12-08 10:03:41.656157620 +0000
+@@ -842,6 +842,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+ 
+   if (!strcasecmp(option, "AP_D_InputSlot"))
    {
-    /*
-     * Show the options to the user...
++    cupsArraySave(ppd->options);
++
+     if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
+     {
+       key.option = o;
+@@ -851,13 +853,21 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+         cupsArrayRemove(ppd->marked, oldc);
+       }
+     }
++
++    cupsArrayRestore(ppd->options);
+   }
+ 
+  /*
+   * Check for custom options...
+   */
+ 
+-  if ((o = ppdFindOption(ppd, option)) == NULL)
++  cupsArraySave(ppd->options);
++
++  o = ppdFindOption(ppd, option);
++
++  cupsArrayRestore(ppd->options);
++
++  if (!o)
+     return;
+ 
+   loc = localeconv();
+@@ -1060,6 +1070,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * appropriate...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if (!strcasecmp(option, "PageSize"))
+       {
+ 	if ((o = ppdFindOption(ppd, "PageRegion")) != NULL)
+@@ -1084,6 +1096,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           }
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+     else if (!strcasecmp(option, "InputSlot"))
+     {
+@@ -1091,6 +1105,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * Unmark ManualFeed option...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if ((o = ppdFindOption(ppd, "ManualFeed")) != NULL)
+       {
+         key.option = o;
+@@ -1100,6 +1116,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           cupsArrayRemove(ppd->marked, oldc);
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+     else if (!strcasecmp(option, "ManualFeed") &&
+ 	     !strcasecmp(choice, "True"))
+@@ -1108,6 +1126,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * Unmark InputSlot option...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
+       {
+         key.option = o;
+@@ -1117,6 +1137,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           cupsArrayRemove(ppd->marked, oldc);
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+   }
+ 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -p -r1.542 -r1.543
--- cups.spec	8 Dec 2009 09:34:23 -0000	1.542
+++ cups.spec	8 Dec 2009 10:05:39 -0000	1.543
@@ -522,6 +522,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
+- Use upstream fix for adjustment of conflicting options
+  (bug #533426, STR #3439).
 - Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).
 
 * Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12



From twaugh at fedoraproject.org  Tue Dec  8 10:06:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:06:35 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3439.patch,1.1,1.2 cups.spec,1.549,1.550
Message-ID: <20091208100635.B971511C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32653

Modified Files:
	cups-str3439.patch cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream fix for adjustment of conflicting options
  (bug #533426, STR #3439).


cups-str3439.patch:
 cgi-bin/admin.c  |    5 +++++
 cups/conflicts.c |    4 ++++
 cups/mark.c      |   24 +++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

Index: cups-str3439.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3439.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3439.patch	4 Dec 2009 15:49:09 -0000	1.1
+++ cups-str3439.patch	8 Dec 2009 10:06:35 -0000	1.2
@@ -1,12 +1,126 @@
 diff -up cups-1.4.2/cgi-bin/admin.c.str3439 cups-1.4.2/cgi-bin/admin.c
---- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-04 15:48:21.181907084 +0000
-+++ cups-1.4.2/cgi-bin/admin.c	2009-12-04 15:48:21.199906005 +0000
-@@ -3327,7 +3327,7 @@ do_set_options(http_t *http,		/* I - HTT
+--- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-08 10:03:36.412157983 +0000
++++ cups-1.4.2/cgi-bin/admin.c	2009-12-08 10:03:41.659157246 +0000
+@@ -3320,11 +3320,16 @@ do_set_options(http_t *http,		/* I - HTT
+     for (option = ppdFirstOption(ppd);
+          option;
+ 	 option = ppdNextOption(ppd))
++    {
+       if ((var = cgiGetVariable(option->keyword)) != NULL)
+       {
+ 	have_options = 1;
+ 	ppdMarkOption(ppd, option->keyword, var);
++	fprintf(stderr, "DEBUG: Set %s to %s...\n", option->keyword, var);
        }
++      else
++        fprintf(stderr, "DEBUG: Didn't find %s...\n", option->keyword);
++    }
    }
  
--  if (!have_options || ppdConflicts(ppd))
-+  if (!have_options)
+   if (!have_options || ppdConflicts(ppd))
+diff -up cups-1.4.2/cups/conflicts.c.str3439 cups-1.4.2/cups/conflicts.c
+--- cups-1.4.2/cups/conflicts.c.str3439	2009-05-18 23:55:15.000000000 +0100
++++ cups-1.4.2/cups/conflicts.c	2009-12-08 10:03:41.657157719 +0000
+@@ -583,9 +583,13 @@ ppdConflicts(ppd_file_t *ppd)		/* I - PP
+   * Clear all conflicts...
+   */
+ 
++  cupsArraySave(ppd->options);
++
+   for (o = ppdFirstOption(ppd); o; o = ppdNextOption(ppd))
+     o->conflicted = 0;
+ 
++  cupsArrayRestore(ppd->options);
++
+  /*
+   * Test for conflicts...
+   */
+diff -up cups-1.4.2/cups/mark.c.str3439 cups-1.4.2/cups/mark.c
+--- cups-1.4.2/cups/mark.c.str3439	2009-04-20 22:37:14.000000000 +0100
++++ cups-1.4.2/cups/mark.c	2009-12-08 10:03:41.656157620 +0000
+@@ -842,6 +842,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+ 
+   if (!strcasecmp(option, "AP_D_InputSlot"))
    {
-    /*
-     * Show the options to the user...
++    cupsArraySave(ppd->options);
++
+     if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
+     {
+       key.option = o;
+@@ -851,13 +853,21 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+         cupsArrayRemove(ppd->marked, oldc);
+       }
+     }
++
++    cupsArrayRestore(ppd->options);
+   }
+ 
+  /*
+   * Check for custom options...
+   */
+ 
+-  if ((o = ppdFindOption(ppd, option)) == NULL)
++  cupsArraySave(ppd->options);
++
++  o = ppdFindOption(ppd, option);
++
++  cupsArrayRestore(ppd->options);
++
++  if (!o)
+     return;
+ 
+   loc = localeconv();
+@@ -1060,6 +1070,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * appropriate...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if (!strcasecmp(option, "PageSize"))
+       {
+ 	if ((o = ppdFindOption(ppd, "PageRegion")) != NULL)
+@@ -1084,6 +1096,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           }
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+     else if (!strcasecmp(option, "InputSlot"))
+     {
+@@ -1091,6 +1105,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * Unmark ManualFeed option...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if ((o = ppdFindOption(ppd, "ManualFeed")) != NULL)
+       {
+         key.option = o;
+@@ -1100,6 +1116,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           cupsArrayRemove(ppd->marked, oldc);
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+     else if (!strcasecmp(option, "ManualFeed") &&
+ 	     !strcasecmp(choice, "True"))
+@@ -1108,6 +1126,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * Unmark InputSlot option...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
+       {
+         key.option = o;
+@@ -1117,6 +1137,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           cupsArrayRemove(ppd->marked, oldc);
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+   }
+ 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -p -r1.549 -r1.550
--- cups.spec	8 Dec 2009 09:56:49 -0000	1.549
+++ cups.spec	8 Dec 2009 10:06:35 -0000	1.550
@@ -528,6 +528,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream fix for adjustment of conflicting options
+  (bug #533426, STR #3439).
 - No longer requires paps.  The texttopaps filter MIME conversion file
   is now provided by the paps package (bug #545036).
 



From twaugh at fedoraproject.org  Tue Dec  8 10:07:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:07:59 +0000 (UTC)
Subject: rpms/cups/devel cups-str3439.patch,1.1,1.2 cups.spec,1.551,1.552
Message-ID: <20091208100759.C605E11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv608

Modified Files:
	cups-str3439.patch cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream fix for adjustment of conflicting options
  (bug #533426, STR #3439).


cups-str3439.patch:
 cgi-bin/admin.c  |    5 +++++
 cups/conflicts.c |    4 ++++
 cups/mark.c      |   24 +++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

Index: cups-str3439.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3439.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3439.patch	4 Dec 2009 15:51:35 -0000	1.1
+++ cups-str3439.patch	8 Dec 2009 10:07:59 -0000	1.2
@@ -1,12 +1,126 @@
 diff -up cups-1.4.2/cgi-bin/admin.c.str3439 cups-1.4.2/cgi-bin/admin.c
---- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-04 15:48:21.181907084 +0000
-+++ cups-1.4.2/cgi-bin/admin.c	2009-12-04 15:48:21.199906005 +0000
-@@ -3327,7 +3327,7 @@ do_set_options(http_t *http,		/* I - HTT
+--- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-08 10:03:36.412157983 +0000
++++ cups-1.4.2/cgi-bin/admin.c	2009-12-08 10:03:41.659157246 +0000
+@@ -3320,11 +3320,16 @@ do_set_options(http_t *http,		/* I - HTT
+     for (option = ppdFirstOption(ppd);
+          option;
+ 	 option = ppdNextOption(ppd))
++    {
+       if ((var = cgiGetVariable(option->keyword)) != NULL)
+       {
+ 	have_options = 1;
+ 	ppdMarkOption(ppd, option->keyword, var);
++	fprintf(stderr, "DEBUG: Set %s to %s...\n", option->keyword, var);
        }
++      else
++        fprintf(stderr, "DEBUG: Didn't find %s...\n", option->keyword);
++    }
    }
  
--  if (!have_options || ppdConflicts(ppd))
-+  if (!have_options)
+   if (!have_options || ppdConflicts(ppd))
+diff -up cups-1.4.2/cups/conflicts.c.str3439 cups-1.4.2/cups/conflicts.c
+--- cups-1.4.2/cups/conflicts.c.str3439	2009-05-18 23:55:15.000000000 +0100
++++ cups-1.4.2/cups/conflicts.c	2009-12-08 10:03:41.657157719 +0000
+@@ -583,9 +583,13 @@ ppdConflicts(ppd_file_t *ppd)		/* I - PP
+   * Clear all conflicts...
+   */
+ 
++  cupsArraySave(ppd->options);
++
+   for (o = ppdFirstOption(ppd); o; o = ppdNextOption(ppd))
+     o->conflicted = 0;
+ 
++  cupsArrayRestore(ppd->options);
++
+  /*
+   * Test for conflicts...
+   */
+diff -up cups-1.4.2/cups/mark.c.str3439 cups-1.4.2/cups/mark.c
+--- cups-1.4.2/cups/mark.c.str3439	2009-04-20 22:37:14.000000000 +0100
++++ cups-1.4.2/cups/mark.c	2009-12-08 10:03:41.656157620 +0000
+@@ -842,6 +842,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+ 
+   if (!strcasecmp(option, "AP_D_InputSlot"))
    {
-    /*
-     * Show the options to the user...
++    cupsArraySave(ppd->options);
++
+     if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
+     {
+       key.option = o;
+@@ -851,13 +853,21 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+         cupsArrayRemove(ppd->marked, oldc);
+       }
+     }
++
++    cupsArrayRestore(ppd->options);
+   }
+ 
+  /*
+   * Check for custom options...
+   */
+ 
+-  if ((o = ppdFindOption(ppd, option)) == NULL)
++  cupsArraySave(ppd->options);
++
++  o = ppdFindOption(ppd, option);
++
++  cupsArrayRestore(ppd->options);
++
++  if (!o)
+     return;
+ 
+   loc = localeconv();
+@@ -1060,6 +1070,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * appropriate...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if (!strcasecmp(option, "PageSize"))
+       {
+ 	if ((o = ppdFindOption(ppd, "PageRegion")) != NULL)
+@@ -1084,6 +1096,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           }
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+     else if (!strcasecmp(option, "InputSlot"))
+     {
+@@ -1091,6 +1105,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * Unmark ManualFeed option...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if ((o = ppdFindOption(ppd, "ManualFeed")) != NULL)
+       {
+         key.option = o;
+@@ -1100,6 +1116,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           cupsArrayRemove(ppd->marked, oldc);
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+     else if (!strcasecmp(option, "ManualFeed") &&
+ 	     !strcasecmp(choice, "True"))
+@@ -1108,6 +1126,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+       * Unmark InputSlot option...
+       */
+ 
++      cupsArraySave(ppd->options);
++
+       if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
+       {
+         key.option = o;
+@@ -1117,6 +1137,8 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - 
+           cupsArrayRemove(ppd->marked, oldc);
+         }
+       }
++
++      cupsArrayRestore(ppd->options);
+     }
+   }
+ 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -p -r1.551 -r1.552
--- cups.spec	8 Dec 2009 09:57:29 -0000	1.551
+++ cups.spec	8 Dec 2009 10:07:59 -0000	1.552
@@ -518,6 +518,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream fix for adjustment of conflicting options
+  (bug #533426, STR #3439).
 - No longer requires paps.  The texttopaps filter MIME conversion file
   is now provided by the paps package (bug #545036).
 - Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).



From twaugh at fedoraproject.org  Tue Dec  8 10:13:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:13:35 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3440.patch,NONE,1.1 cups.spec,1.543,1.544
Message-ID: <20091208101335.CC6E311C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2257

Modified Files:
	cups.spec 
Added Files:
	cups-str3440.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Show conflicting option values in web UI (bug #544326, STR #3440).


cups-str3440.patch:
 cgi-bin/admin.c                   |   10 ++++++++++
 templates/de/option-conflict.tmpl |    2 +-
 templates/es/option-conflict.tmpl |    2 +-
 templates/eu/option-conflict.tmpl |    2 +-
 templates/ja/option-conflict.tmpl |    2 +-
 templates/option-conflict.tmpl    |    2 +-
 templates/pl/option-conflict.tmpl |    2 +-
 templates/ru/option-conflict.tmpl |    2 +-
 8 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE cups-str3440.patch ---
diff -up cups-1.4.2/cgi-bin/admin.c.str3440 cups-1.4.2/cgi-bin/admin.c
--- cups-1.4.2/cgi-bin/admin.c.str3440	2009-12-08 10:10:05.529157178 +0000
+++ cups-1.4.2/cgi-bin/admin.c	2009-12-08 10:10:12.571033051 +0000
@@ -3436,6 +3436,16 @@ do_set_options(http_t *http,		/* I - HTT
 	    {
 	      cgiSetArray("ckeyword", k, option->keyword);
 	      cgiSetArray("ckeytext", k, option->text);
+
+	      for (m = 0; m < option->num_choices; m ++)
+	      {
+	        if (option->choices[m].marked)
+	        {
+	          cgiSetArray("cchoice", k, option->choices[m].text);
+	          break;
+	        }
+              }
+
 	      k ++;
 	    }
 
diff -up cups-1.4.2/templates/de/option-conflict.tmpl.str3440 cups-1.4.2/templates/de/option-conflict.tmpl
--- cups-1.4.2/templates/de/option-conflict.tmpl.str3440	2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4.2/templates/de/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> The following options are conflicting:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Bitte &auml;ndern sie eine oder mehrere Einstellungen um die Konflikte zu l&ouml;sen.</P>
diff -up cups-1.4.2/templates/es/option-conflict.tmpl.str3440 cups-1.4.2/templates/es/option-conflict.tmpl
--- cups-1.4.2/templates/es/option-conflict.tmpl.str3440	2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4.2/templates/es/option-conflict.tmpl	2009-12-08 10:10:12.568157603 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> Las siguientes opciones est&aacute;n en conflicto:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Cambie una o m&aacute;s de las opciones para resolver el problema.</P>
diff -up cups-1.4.2/templates/eu/option-conflict.tmpl.str3440 cups-1.4.2/templates/eu/option-conflict.tmpl
--- cups-1.4.2/templates/eu/option-conflict.tmpl.str3440	2009-07-07 17:52:34.000000000 +0100
+++ cups-1.4.2/templates/eu/option-conflict.tmpl	2009-12-08 10:10:12.569157261 +0000
@@ -1,7 +1,7 @@
 <P><B>Errorea:</B> honako aukerak gatazkan daude:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Aldatu aukera bat edo gehiago gatazkak ebazteko.</P>
diff -up cups-1.4.2/templates/ja/option-conflict.tmpl.str3440 cups-1.4.2/templates/ja/option-conflict.tmpl
--- cups-1.4.2/templates/ja/option-conflict.tmpl.str3440	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4.2/templates/ja/option-conflict.tmpl	2009-12-08 10:10:12.566157419 +0000
@@ -1,7 +1,7 @@
 <P><B>???:</B> ??????????????:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>???????????1 ???????????????????</P>
diff -up cups-1.4.2/templates/option-conflict.tmpl.str3440 cups-1.4.2/templates/option-conflict.tmpl
--- cups-1.4.2/templates/option-conflict.tmpl.str3440	2005-08-24 20:25:49.000000000 +0100
+++ cups-1.4.2/templates/option-conflict.tmpl	2009-12-08 10:10:12.566157419 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> The following options are conflicting:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Please change one or more of the options to resolve the conflicts.</P>
diff -up cups-1.4.2/templates/pl/option-conflict.tmpl.str3440 cups-1.4.2/templates/pl/option-conflict.tmpl
--- cups-1.4.2/templates/pl/option-conflict.tmpl.str3440	2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4.2/templates/pl/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>B??d:</B> nast?puj?ce opcje s? w konflikcie ze sob?:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Prosz? zmieni? jedn? lub wi?cej opcji, aby rozwi?za? konflikt.</P>
diff -up cups-1.4.2/templates/ru/option-conflict.tmpl.str3440 cups-1.4.2/templates/ru/option-conflict.tmpl
--- cups-1.4.2/templates/ru/option-conflict.tmpl.str3440	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4.2/templates/ru/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>??????:</B> ????????? ????????? ???????????:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>???????? ???? ??? ????????? ?????????? ??? ????, ????? ???????? ?????????.</P>


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -p -r1.543 -r1.544
--- cups.spec	8 Dec 2009 10:05:39 -0000	1.543
+++ cups.spec	8 Dec 2009 10:13:35 -0000	1.544
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -63,6 +63,7 @@ Patch49: cups-CVE-2009-3553.patch
 Patch50: cups-str3422.patch
 Patch51: cups-str3413.patch
 Patch52: cups-str3439.patch
+Patch53: cups-str3440.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -230,6 +231,7 @@ module. 
 %patch50 -p1 -b .str3422
 %patch51 -p1 -b .str3413
 %patch52 -p1 -b .str3439
+%patch53 -p1 -b .str3440
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -521,9 +523,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options
   (bug #533426, STR #3439).
+
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-13
 - Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).
 
 * Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-12



From twaugh at fedoraproject.org  Tue Dec  8 10:14:46 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:14:46 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3440.patch,NONE,1.1 cups.spec,1.550,1.551
Message-ID: <20091208101446.31E5C11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2668

Modified Files:
	cups.spec 
Added Files:
	cups-str3440.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Show conflicting option values in web UI (bug #544326, STR #3440).


cups-str3440.patch:
 cgi-bin/admin.c                   |   10 ++++++++++
 templates/de/option-conflict.tmpl |    2 +-
 templates/es/option-conflict.tmpl |    2 +-
 templates/eu/option-conflict.tmpl |    2 +-
 templates/ja/option-conflict.tmpl |    2 +-
 templates/option-conflict.tmpl    |    2 +-
 templates/pl/option-conflict.tmpl |    2 +-
 templates/ru/option-conflict.tmpl |    2 +-
 8 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE cups-str3440.patch ---
diff -up cups-1.4.2/cgi-bin/admin.c.str3440 cups-1.4.2/cgi-bin/admin.c
--- cups-1.4.2/cgi-bin/admin.c.str3440	2009-12-08 10:10:05.529157178 +0000
+++ cups-1.4.2/cgi-bin/admin.c	2009-12-08 10:10:12.571033051 +0000
@@ -3436,6 +3436,16 @@ do_set_options(http_t *http,		/* I - HTT
 	    {
 	      cgiSetArray("ckeyword", k, option->keyword);
 	      cgiSetArray("ckeytext", k, option->text);
+
+	      for (m = 0; m < option->num_choices; m ++)
+	      {
+	        if (option->choices[m].marked)
+	        {
+	          cgiSetArray("cchoice", k, option->choices[m].text);
+	          break;
+	        }
+              }
+
 	      k ++;
 	    }
 
diff -up cups-1.4.2/templates/de/option-conflict.tmpl.str3440 cups-1.4.2/templates/de/option-conflict.tmpl
--- cups-1.4.2/templates/de/option-conflict.tmpl.str3440	2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4.2/templates/de/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> The following options are conflicting:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Bitte &auml;ndern sie eine oder mehrere Einstellungen um die Konflikte zu l&ouml;sen.</P>
diff -up cups-1.4.2/templates/es/option-conflict.tmpl.str3440 cups-1.4.2/templates/es/option-conflict.tmpl
--- cups-1.4.2/templates/es/option-conflict.tmpl.str3440	2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4.2/templates/es/option-conflict.tmpl	2009-12-08 10:10:12.568157603 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> Las siguientes opciones est&aacute;n en conflicto:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Cambie una o m&aacute;s de las opciones para resolver el problema.</P>
diff -up cups-1.4.2/templates/eu/option-conflict.tmpl.str3440 cups-1.4.2/templates/eu/option-conflict.tmpl
--- cups-1.4.2/templates/eu/option-conflict.tmpl.str3440	2009-07-07 17:52:34.000000000 +0100
+++ cups-1.4.2/templates/eu/option-conflict.tmpl	2009-12-08 10:10:12.569157261 +0000
@@ -1,7 +1,7 @@
 <P><B>Errorea:</B> honako aukerak gatazkan daude:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Aldatu aukera bat edo gehiago gatazkak ebazteko.</P>
diff -up cups-1.4.2/templates/ja/option-conflict.tmpl.str3440 cups-1.4.2/templates/ja/option-conflict.tmpl
--- cups-1.4.2/templates/ja/option-conflict.tmpl.str3440	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4.2/templates/ja/option-conflict.tmpl	2009-12-08 10:10:12.566157419 +0000
@@ -1,7 +1,7 @@
 <P><B>???:</B> ??????????????:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>???????????1 ???????????????????</P>
diff -up cups-1.4.2/templates/option-conflict.tmpl.str3440 cups-1.4.2/templates/option-conflict.tmpl
--- cups-1.4.2/templates/option-conflict.tmpl.str3440	2005-08-24 20:25:49.000000000 +0100
+++ cups-1.4.2/templates/option-conflict.tmpl	2009-12-08 10:10:12.566157419 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> The following options are conflicting:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Please change one or more of the options to resolve the conflicts.</P>
diff -up cups-1.4.2/templates/pl/option-conflict.tmpl.str3440 cups-1.4.2/templates/pl/option-conflict.tmpl
--- cups-1.4.2/templates/pl/option-conflict.tmpl.str3440	2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4.2/templates/pl/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>B??d:</B> nast?puj?ce opcje s? w konflikcie ze sob?:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Prosz? zmieni? jedn? lub wi?cej opcji, aby rozwi?za? konflikt.</P>
diff -up cups-1.4.2/templates/ru/option-conflict.tmpl.str3440 cups-1.4.2/templates/ru/option-conflict.tmpl
--- cups-1.4.2/templates/ru/option-conflict.tmpl.str3440	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4.2/templates/ru/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>??????:</B> ????????? ????????? ???????????:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>???????? ???? ??? ????????? ?????????? ??? ????, ????? ???????? ?????????.</P>


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -p -r1.550 -r1.551
--- cups.spec	8 Dec 2009 10:06:35 -0000	1.550
+++ cups.spec	8 Dec 2009 10:14:45 -0000	1.551
@@ -62,6 +62,7 @@ Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
 Patch38: cups-str3439.patch
+Patch39: cups-str3440.patch
 
 Patch100: cups-lspp.patch
 
@@ -229,6 +230,7 @@ module. 
 %patch36 -p1 -b .str3422
 %patch37 -p1 -b .str3413
 %patch38 -p1 -b .str3439
+%patch39 -p1 -b .str3440
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -528,6 +530,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options
   (bug #533426, STR #3439).
 - No longer requires paps.  The texttopaps filter MIME conversion file



From twaugh at fedoraproject.org  Tue Dec  8 10:15:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:15:32 +0000 (UTC)
Subject: rpms/cups/devel cups-str3440.patch,NONE,1.1 cups.spec,1.552,1.553
Message-ID: <20091208101532.133B411C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2950

Modified Files:
	cups.spec 
Added Files:
	cups-str3440.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Show conflicting option values in web UI (bug #544326, STR #3440).


cups-str3440.patch:
 cgi-bin/admin.c                   |   10 ++++++++++
 templates/de/option-conflict.tmpl |    2 +-
 templates/es/option-conflict.tmpl |    2 +-
 templates/eu/option-conflict.tmpl |    2 +-
 templates/ja/option-conflict.tmpl |    2 +-
 templates/option-conflict.tmpl    |    2 +-
 templates/pl/option-conflict.tmpl |    2 +-
 templates/ru/option-conflict.tmpl |    2 +-
 8 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE cups-str3440.patch ---
diff -up cups-1.4.2/cgi-bin/admin.c.str3440 cups-1.4.2/cgi-bin/admin.c
--- cups-1.4.2/cgi-bin/admin.c.str3440	2009-12-08 10:10:05.529157178 +0000
+++ cups-1.4.2/cgi-bin/admin.c	2009-12-08 10:10:12.571033051 +0000
@@ -3436,6 +3436,16 @@ do_set_options(http_t *http,		/* I - HTT
 	    {
 	      cgiSetArray("ckeyword", k, option->keyword);
 	      cgiSetArray("ckeytext", k, option->text);
+
+	      for (m = 0; m < option->num_choices; m ++)
+	      {
+	        if (option->choices[m].marked)
+	        {
+	          cgiSetArray("cchoice", k, option->choices[m].text);
+	          break;
+	        }
+              }
+
 	      k ++;
 	    }
 
diff -up cups-1.4.2/templates/de/option-conflict.tmpl.str3440 cups-1.4.2/templates/de/option-conflict.tmpl
--- cups-1.4.2/templates/de/option-conflict.tmpl.str3440	2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4.2/templates/de/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> The following options are conflicting:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Bitte &auml;ndern sie eine oder mehrere Einstellungen um die Konflikte zu l&ouml;sen.</P>
diff -up cups-1.4.2/templates/es/option-conflict.tmpl.str3440 cups-1.4.2/templates/es/option-conflict.tmpl
--- cups-1.4.2/templates/es/option-conflict.tmpl.str3440	2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4.2/templates/es/option-conflict.tmpl	2009-12-08 10:10:12.568157603 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> Las siguientes opciones est&aacute;n en conflicto:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Cambie una o m&aacute;s de las opciones para resolver el problema.</P>
diff -up cups-1.4.2/templates/eu/option-conflict.tmpl.str3440 cups-1.4.2/templates/eu/option-conflict.tmpl
--- cups-1.4.2/templates/eu/option-conflict.tmpl.str3440	2009-07-07 17:52:34.000000000 +0100
+++ cups-1.4.2/templates/eu/option-conflict.tmpl	2009-12-08 10:10:12.569157261 +0000
@@ -1,7 +1,7 @@
 <P><B>Errorea:</B> honako aukerak gatazkan daude:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Aldatu aukera bat edo gehiago gatazkak ebazteko.</P>
diff -up cups-1.4.2/templates/ja/option-conflict.tmpl.str3440 cups-1.4.2/templates/ja/option-conflict.tmpl
--- cups-1.4.2/templates/ja/option-conflict.tmpl.str3440	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4.2/templates/ja/option-conflict.tmpl	2009-12-08 10:10:12.566157419 +0000
@@ -1,7 +1,7 @@
 <P><B>???:</B> ??????????????:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>???????????1 ???????????????????</P>
diff -up cups-1.4.2/templates/option-conflict.tmpl.str3440 cups-1.4.2/templates/option-conflict.tmpl
--- cups-1.4.2/templates/option-conflict.tmpl.str3440	2005-08-24 20:25:49.000000000 +0100
+++ cups-1.4.2/templates/option-conflict.tmpl	2009-12-08 10:10:12.566157419 +0000
@@ -1,7 +1,7 @@
 <P><B>Error:</B> The following options are conflicting:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Please change one or more of the options to resolve the conflicts.</P>
diff -up cups-1.4.2/templates/pl/option-conflict.tmpl.str3440 cups-1.4.2/templates/pl/option-conflict.tmpl
--- cups-1.4.2/templates/pl/option-conflict.tmpl.str3440	2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4.2/templates/pl/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>B??d:</B> nast?puj?ce opcje s? w konflikcie ze sob?:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>Prosz? zmieni? jedn? lub wi?cej opcji, aby rozwi?za? konflikt.</P>
diff -up cups-1.4.2/templates/ru/option-conflict.tmpl.str3440 cups-1.4.2/templates/ru/option-conflict.tmpl
--- cups-1.4.2/templates/ru/option-conflict.tmpl.str3440	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4.2/templates/ru/option-conflict.tmpl	2009-12-08 10:10:12.567157789 +0000
@@ -1,7 +1,7 @@
 <P><B>??????:</B> ????????? ????????? ???????????:</P>
 
 <UL>
-{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
 }</UL>
 
 <P>???????? ???? ??? ????????? ?????????? ??? ????, ????? ???????? ?????????.</P>


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -p -r1.552 -r1.553
--- cups.spec	8 Dec 2009 10:07:59 -0000	1.552
+++ cups.spec	8 Dec 2009 10:15:31 -0000	1.553
@@ -60,6 +60,7 @@ Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
 Patch38: cups-str3439.patch
+Patch39: cups-str3440.patch
 
 Patch100: cups-lspp.patch
 
@@ -227,6 +228,7 @@ module. 
 %patch36 -p1 -b .str3422
 %patch37 -p1 -b .str3413
 %patch38 -p1 -b .str3439
+%patch39 -p1 -b .str3440
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -518,6 +520,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options
   (bug #533426, STR #3439).
 - No longer requires paps.  The texttopaps filter MIME conversion file



From twaugh at fedoraproject.org  Tue Dec  8 10:20:07 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:20:07 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3442.patch,NONE,1.1 cups.spec,1.544,1.545
Message-ID: <20091208102007.7816911C03DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4311

Modified Files:
	cups.spec 
Added Files:
	cups-str3442.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use the text filter for text/css files (bug #545026, STR #3442).


cups-str3442.patch:
 mime.convs.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE cups-str3442.patch ---
diff -up cups-1.4.2/conf/mime.convs.in.str3442 cups-1.4.2/conf/mime.convs.in
--- cups-1.4.2/conf/mime.convs.in.str3442	2009-12-08 10:16:53.852205726 +0000
+++ cups-1.4.2/conf/mime.convs.in	2009-12-08 10:18:04.209335783 +0000
@@ -47,6 +47,7 @@ application/x-perl		application/postscri
 application/x-shell		application/postscript		33	texttops
 text/plain			application/postscript		33	texttopaps
 text/html			application/postscript		33	texttops
+text/css			application/postscript		33	texttops
 image/gif			application/vnd.cups-postscript	66	imagetops
 image/png			application/vnd.cups-postscript	66	imagetops
 image/jpeg			application/vnd.cups-postscript	66	imagetops


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -p -r1.544 -r1.545
--- cups.spec	8 Dec 2009 10:13:35 -0000	1.544
+++ cups.spec	8 Dec 2009 10:20:07 -0000	1.545
@@ -64,6 +64,7 @@ Patch50: cups-str3422.patch
 Patch51: cups-str3413.patch
 Patch52: cups-str3439.patch
 Patch53: cups-str3440.patch
+Patch54: cups-str3442.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -232,6 +233,7 @@ module. 
 %patch51 -p1 -b .str3413
 %patch52 -p1 -b .str3439
 %patch53 -p1 -b .str3440
+%patch54 -p1 -b .str3442
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -524,6 +526,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options
   (bug #533426, STR #3439).



From twaugh at fedoraproject.org  Tue Dec  8 10:21:02 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:21:02 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3442.patch,NONE,1.1 cups.spec,1.551,1.552
Message-ID: <20091208102103.0026311C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4669

Modified Files:
	cups.spec 
Added Files:
	cups-str3442.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use the text filter for text/css files (bug #545026, STR #3442).


cups-str3442.patch:
 mime.convs.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE cups-str3442.patch ---
diff -up cups-1.4.2/conf/mime.convs.in.str3442 cups-1.4.2/conf/mime.convs.in
--- cups-1.4.2/conf/mime.convs.in.str3442	2009-05-22 20:30:39.000000000 +0100
+++ cups-1.4.2/conf/mime.convs.in	2009-12-08 10:19:40.044329553 +0000
@@ -47,6 +47,7 @@ application/x-perl		application/postscri
 application/x-shell		application/postscript		33	texttops
 text/plain			application/postscript		33	texttops
 text/html			application/postscript		33	texttops
+text/css			application/postscript		33	texttops
 image/gif			application/vnd.cups-postscript	66	imagetops
 image/png			application/vnd.cups-postscript	66	imagetops
 image/jpeg			application/vnd.cups-postscript	66	imagetops


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -p -r1.551 -r1.552
--- cups.spec	8 Dec 2009 10:14:45 -0000	1.551
+++ cups.spec	8 Dec 2009 10:21:02 -0000	1.552
@@ -63,6 +63,7 @@ Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
 Patch38: cups-str3439.patch
 Patch39: cups-str3440.patch
+Patch40: cups-str3442.patch
 
 Patch100: cups-lspp.patch
 
@@ -231,6 +232,7 @@ module. 
 %patch37 -p1 -b .str3413
 %patch38 -p1 -b .str3439
 %patch39 -p1 -b .str3440
+%patch40 -p1 -b .str3442
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -530,6 +532,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options
   (bug #533426, STR #3439).



From twaugh at fedoraproject.org  Tue Dec  8 10:22:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:22:08 +0000 (UTC)
Subject: rpms/cups/devel cups-str3442.patch,NONE,1.1 cups.spec,1.553,1.554
Message-ID: <20091208102208.C982611C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5126

Modified Files:
	cups.spec 
Added Files:
	cups-str3442.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use the text filter for text/css files (bug #545026, STR #3442).


cups-str3442.patch:
 mime.convs.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE cups-str3442.patch ---
diff -up cups-1.4.2/conf/mime.convs.in.str3442 cups-1.4.2/conf/mime.convs.in
--- cups-1.4.2/conf/mime.convs.in.str3442	2009-05-22 20:30:39.000000000 +0100
+++ cups-1.4.2/conf/mime.convs.in	2009-12-08 10:19:40.044329553 +0000
@@ -47,6 +47,7 @@ application/x-perl		application/postscri
 application/x-shell		application/postscript		33	texttops
 text/plain			application/postscript		33	texttops
 text/html			application/postscript		33	texttops
+text/css			application/postscript		33	texttops
 image/gif			application/vnd.cups-postscript	66	imagetops
 image/png			application/vnd.cups-postscript	66	imagetops
 image/jpeg			application/vnd.cups-postscript	66	imagetops


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -p -r1.553 -r1.554
--- cups.spec	8 Dec 2009 10:15:31 -0000	1.553
+++ cups.spec	8 Dec 2009 10:22:08 -0000	1.554
@@ -61,6 +61,7 @@ Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
 Patch38: cups-str3439.patch
 Patch39: cups-str3440.patch
+Patch40: cups-str3442.patch
 
 Patch100: cups-lspp.patch
 
@@ -229,6 +230,7 @@ module. 
 %patch37 -p1 -b .str3413
 %patch38 -p1 -b .str3439
 %patch39 -p1 -b .str3440
+%patch40 -p1 -b .str3442
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -520,6 +522,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options
   (bug #533426, STR #3439).



From dsd at fedoraproject.org  Tue Dec  8 10:28:59 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  8 Dec 2009 10:28:59 +0000 (UTC)
Subject: File sugar-update-control-0.23.tar.gz uploaded to lookaside cache by
	dsd
Message-ID: <20091208102859.8827610F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-update-control:

0ce75a4886021ce1c87e3ac330d415a0  sugar-update-control-0.23.tar.gz



From thomasj at fedoraproject.org  Tue Dec  8 10:30:13 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Tue,  8 Dec 2009 10:30:13 +0000 (UTC)
Subject: rpms/incollector/devel incollector.spec,1.6,1.7
Message-ID: <20091208103013.3300511C0264@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/incollector/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7694

Modified Files:
	incollector.spec 
Log Message:
* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
- Changed the license to GPLv2
- Added pixmaps-install.patch

* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-2
- Changed sed to patch
- Removed pushd command



Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/devel/incollector.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- incollector.spec	15 Nov 2009 07:18:21 -0000	1.6
+++ incollector.spec	8 Dec 2009 10:30:12 -0000	1.7
@@ -3,14 +3,16 @@
 
 Name:           incollector
 Version:        1.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Information collector
 Group:          Applications/Productivity
-License:        GPLv2+
+License:        GPLv2
 URL:            http://www.incollector.devnull.pl/
 Source0:        http://www.incollector.devnull.pl/download/sources/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Patch0:         %{name}-mono.patch
+Patch1:		%{name}-fixlib.patch
+Patch2:		%{name}-%{version}-pixmaps-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk-sharp2-devel gettext desktop-file-utils
 
@@ -25,9 +27,9 @@ search for entries by specified criteria
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 chmod a-x README AUTHORS
-pushd po
-popd
 
 %build
 %configure
@@ -35,7 +37,6 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-sed -i 's|/usr/lib|%{_libdir}|' %{name}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 %find_lang %{name}
 rm %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -54,10 +55,17 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.ico
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
+- Changed the license to GPLv2
+- Added pixmaps-install.patch
+
+* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-2
+- Changed sed to patch
+- Removed pushd command
+
 * Sun Nov 15 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-1
 - Updated to new upstream version 1.2
 



From thomasj at fedoraproject.org  Tue Dec  8 10:31:45 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Tue,  8 Dec 2009 10:31:45 +0000 (UTC)
Subject: rpms/incollector/F-12 incollector.spec,1.6,1.7
Message-ID: <20091208103145.2B5D011C0264@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/incollector/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8321

Modified Files:
	incollector.spec 
Log Message:
* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
- Changed the license to GPLv2
- Added pixmaps-install.patch

* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-2
- Changed sed to patch
- Removed pushd command



Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/F-12/incollector.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- incollector.spec	15 Nov 2009 07:29:21 -0000	1.6
+++ incollector.spec	8 Dec 2009 10:31:44 -0000	1.7
@@ -3,14 +3,16 @@
 
 Name:           incollector
 Version:        1.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Information collector
 Group:          Applications/Productivity
-License:        GPLv2+
+License:        GPLv2
 URL:            http://www.incollector.devnull.pl/
 Source0:        http://www.incollector.devnull.pl/download/sources/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Patch0:         %{name}-mono.patch
+Patch1:		%{name}-fixlib.patch
+Patch2:		%{name}-%{version}-pixmaps-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk-sharp2-devel gettext desktop-file-utils
 
@@ -25,9 +27,9 @@ search for entries by specified criteria
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 chmod a-x README AUTHORS
-pushd po
-popd
 
 %build
 %configure
@@ -35,7 +37,6 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-sed -i 's|/usr/lib|%{_libdir}|' %{name}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 %find_lang %{name}
 rm %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -54,10 +55,17 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.ico
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
+- Changed the license to GPLv2
+- Added pixmaps-install.patch
+
+* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-2
+- Changed sed to patch
+- Removed pushd command
+
 * Sun Nov 15 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-1
 - Updated to new upstream version 1.2
 



From thomasj at fedoraproject.org  Tue Dec  8 10:34:20 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Tue,  8 Dec 2009 10:34:20 +0000 (UTC)
Subject: rpms/incollector/F-11 incollector.spec,1.5,1.6
Message-ID: <20091208103420.B0B6511C0264@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/incollector/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9104

Modified Files:
	incollector.spec 
Log Message:
* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
- Changed the license to GPLv2
- Added pixmaps-install.patch

* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-2
- Changed sed to patch
- Removed pushd command



Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/F-11/incollector.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- incollector.spec	15 Nov 2009 07:40:50 -0000	1.5
+++ incollector.spec	8 Dec 2009 10:34:20 -0000	1.6
@@ -3,14 +3,16 @@
 
 Name:           incollector
 Version:        1.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Information collector
 Group:          Applications/Productivity
-License:        GPLv2+
+License:        GPLv2
 URL:            http://www.incollector.devnull.pl/
 Source0:        http://www.incollector.devnull.pl/download/sources/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Patch0:         %{name}-mono.patch
+Patch1:		%{name}-fixlib.patch
+Patch2:		%{name}-%{version}-pixmaps-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk-sharp2-devel gettext desktop-file-utils
 
@@ -25,9 +27,9 @@ search for entries by specified criteria
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 chmod a-x README AUTHORS
-pushd po
-popd
 
 %build
 %configure
@@ -35,7 +37,6 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-sed -i 's|/usr/lib|%{_libdir}|' %{name}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 %find_lang %{name}
 rm %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -54,10 +55,17 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.ico
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
+- Changed the license to GPLv2
+- Added pixmaps-install.patch
+
+* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-2
+- Changed sed to patch
+- Removed pushd command
+
 * Sun Nov 15 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-1
 - Updated to new upstream version 1.2
 



From dsd at fedoraproject.org  Tue Dec  8 10:38:58 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  8 Dec 2009 10:38:58 +0000 (UTC)
Subject: rpms/sugar-update-control/devel .cvsignore, 1.3, 1.4 sources, 1.3, 
	1.4 sugar-update-control.spec, 1.5, 1.6
Message-ID: <20091208103858.C7E7C11C0264@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/sugar-update-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10523

Modified Files:
	.cvsignore sources sugar-update-control.spec 
Log Message:
v0.23


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-update-control/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jul 2009 18:54:45 -0000	1.3
+++ .cvsignore	8 Dec 2009 10:38:58 -0000	1.4
@@ -1 +1 @@
-sugar-update-control-0.21.tar.gz
+sugar-update-control-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-update-control/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jul 2009 18:54:46 -0000	1.3
+++ sources	8 Dec 2009 10:38:58 -0000	1.4
@@ -1 +1 @@
-1da31678a4825e21b883b7680b166dc0  sugar-update-control-0.21.tar.gz
+0ce75a4886021ce1c87e3ac330d415a0  sugar-update-control-0.23.tar.gz


Index: sugar-update-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-update-control/devel/sugar-update-control.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sugar-update-control.spec	27 Jul 2009 05:05:56 -0000	1.5
+++ sugar-update-control.spec	8 Dec 2009 10:38:58 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary: Activity update control panel for Sugar
 Name:    sugar-update-control
-Version: 0.21
-Release: 2%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 URL:     http://git.sugarlabs.org/projects/sugar-update-control
@@ -41,12 +41,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc README COPYING
 %{python_sitelib}/*
 %{_datadir}/sugar/data/icons/*
-# currently nothing (on f-10 anyway) owns extentions, not sure
-# here is the best place, but...
-%dir %{_datadir}/sugar/extensions/
-%{_datadir}/sugar/extensions/cpsection/
+%{_datadir}/sugar/extensions/cpsection/*
 
 %changelog
+* Tue Dec  8 2009 Daniel Drake <dsd at laptop.org> 0.23-1
+- New release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dsd at fedoraproject.org  Tue Dec  8 10:39:23 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  8 Dec 2009 10:39:23 +0000 (UTC)
Subject: rpms/sugar-update-control/F-11 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sugar-update-control.spec, 1.5, 1.6
Message-ID: <20091208103923.0C8AE11C0264@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/sugar-update-control/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10795

Modified Files:
	.cvsignore sources sugar-update-control.spec 
Log Message:
v0.23


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-update-control/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jul 2009 19:49:00 -0000	1.3
+++ .cvsignore	8 Dec 2009 10:39:22 -0000	1.4
@@ -1 +1 @@
-sugar-update-control-0.21.tar.gz
+sugar-update-control-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-update-control/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jul 2009 19:49:00 -0000	1.3
+++ sources	8 Dec 2009 10:39:22 -0000	1.4
@@ -1 +1 @@
-1da31678a4825e21b883b7680b166dc0  sugar-update-control-0.21.tar.gz
+0ce75a4886021ce1c87e3ac330d415a0  sugar-update-control-0.23.tar.gz


Index: sugar-update-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-update-control/F-11/sugar-update-control.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sugar-update-control.spec	10 Jul 2009 19:55:29 -0000	1.5
+++ sugar-update-control.spec	8 Dec 2009 10:39:22 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary: Activity update control panel for Sugar
 Name:    sugar-update-control
-Version: 0.21
-Release: 2%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 URL:     http://git.sugarlabs.org/projects/sugar-update-control
@@ -41,12 +41,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc README COPYING
 %{python_sitelib}/*
 %{_datadir}/sugar/data/icons/*
-# currently nothing (on f-10 anyway) owns extentions, not sure
-# here is the best place, but...
-%dir %{_datadir}/sugar/extensions/
-%{_datadir}/sugar/extensions/cpsection/
+%{_datadir}/sugar/extensions/cpsection/*
 
 %changelog
+* Tue Dec  8 2009 Daniel Drake <dsd at laptop.org> 0.23-1
+- New release
+
 * Fri Jul 10 2009 Daniel Drake <dsd at laptop.org> 0.21-2
 - increment Release as I didn't commit the right sources file
 



From rhughes at fedoraproject.org  Tue Dec  8 10:52:47 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue,  8 Dec 2009 10:52:47 +0000 (UTC)
Subject: File gnome-power-manager-2.29.1.tar.gz uploaded to lookaside cache
	by rhughes
Message-ID: <20091208105247.203E110F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-power-manager:

9389bf6e598a19928e644b0ac4bceded  gnome-power-manager-2.29.1.tar.gz



From twaugh at fedoraproject.org  Tue Dec  8 10:56:18 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:56:18 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3413.patch,1.1,1.2 cups.spec,1.545,1.546
Message-ID: <20091208105618.133F211C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15654

Modified Files:
	cups-str3413.patch cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream fix for SNMP detection (bug #542857, STR #3413).


cups-str3413.patch:
 backend/snmp.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: cups-str3413.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-str3413.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3413.patch	3 Dec 2009 23:08:23 -0000	1.1
+++ cups-str3413.patch	8 Dec 2009 10:56:17 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c
 --- cups-1.4.2/backend/snmp.c.str3413	2009-01-14 22:40:58.000000000 +0000
-+++ cups-1.4.2/backend/snmp.c	2009-12-03 10:01:27.933335209 +0000
++++ cups-1.4.2/backend/snmp.c	2009-12-08 10:54:11.798515550 +0000
 @@ -999,7 +999,7 @@ read_snmp_response(int fd)		/* I - SNMP 
  		       DEVICE_PRODUCT, LexmarkProductOID2);
  	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
@@ -10,33 +10,24 @@ diff -up cups-1.4.2/backend/snmp.c.str34
  	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
  	               packet.community, CUPS_ASN1_GET_REQUEST,
  		       DEVICE_PRODUCT, XeroxProductOID);
-@@ -1064,7 +1064,19 @@ read_snmp_response(int fd)		/* I - SNMP 
+@@ -1054,7 +1054,9 @@ read_snmp_response(int fd)		/* I - SNMP 
+ 	break;
  
- 
- 	  if (device->id)
-+	  {
-+	    if (strlen (device->id) >
-+		strlen ((char *)packet.object_value.string.bytes))
-+	    {
-+	     /*
-+	      * The Device ID we already saw was more complete.
-+	      */
-+
-+	      break;
-+	    }
-+
- 	    free(device->id);
-+	  }
- 
- 	  device->id = strdup((char *)packet.object_value.string.bytes);
- 
-@@ -1107,7 +1119,8 @@ read_snmp_response(int fd)		/* I - SNMP 
+     case DEVICE_ID :
+-	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING)
++	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
++	    (!device->id ||
++	     strlen(device->id) < packet.object_value.string.num_bytes))
+ 	{
+ 	 /*
+ 	  * Update an existing cache entry...
+@@ -1107,7 +1109,7 @@ read_snmp_response(int fd)		/* I - SNMP 
  
      case DEVICE_URI :
  	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
 -	    !device->uri)
-+	    !device->uri &&
-+	    (char *)packet.object_value.string.bytes[0] != '\0')
++	    !device->uri && packet.object_value.string.num_bytes > 0)
  	{
  	 /*
  	  * Update an existing cache entry...
+diff -up cups-1.4.2/CHANGES-1.4.txt.str3413 cups-1.4.2/CHANGES-1.4.txt


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -p -r1.545 -r1.546
--- cups.spec	8 Dec 2009 10:20:07 -0000	1.545
+++ cups.spec	8 Dec 2009 10:56:17 -0000	1.546
@@ -526,6 +526,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options



From twaugh at fedoraproject.org  Tue Dec  8 10:57:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:57:19 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3413.patch,1.1,1.2 cups.spec,1.552,1.553
Message-ID: <20091208105719.E0A9611C03AD@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16061

Modified Files:
	cups-str3413.patch cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream fix for SNMP detection (bug #542857, STR #3413).


cups-str3413.patch:
 backend/snmp.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: cups-str3413.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3413.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3413.patch	3 Dec 2009 10:06:20 -0000	1.1
+++ cups-str3413.patch	8 Dec 2009 10:57:19 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c
 --- cups-1.4.2/backend/snmp.c.str3413	2009-01-14 22:40:58.000000000 +0000
-+++ cups-1.4.2/backend/snmp.c	2009-12-03 10:01:27.933335209 +0000
++++ cups-1.4.2/backend/snmp.c	2009-12-08 10:54:11.798515550 +0000
 @@ -999,7 +999,7 @@ read_snmp_response(int fd)		/* I - SNMP 
  		       DEVICE_PRODUCT, LexmarkProductOID2);
  	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
@@ -10,33 +10,24 @@ diff -up cups-1.4.2/backend/snmp.c.str34
  	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
  	               packet.community, CUPS_ASN1_GET_REQUEST,
  		       DEVICE_PRODUCT, XeroxProductOID);
-@@ -1064,7 +1064,19 @@ read_snmp_response(int fd)		/* I - SNMP 
+@@ -1054,7 +1054,9 @@ read_snmp_response(int fd)		/* I - SNMP 
+ 	break;
  
- 
- 	  if (device->id)
-+	  {
-+	    if (strlen (device->id) >
-+		strlen ((char *)packet.object_value.string.bytes))
-+	    {
-+	     /*
-+	      * The Device ID we already saw was more complete.
-+	      */
-+
-+	      break;
-+	    }
-+
- 	    free(device->id);
-+	  }
- 
- 	  device->id = strdup((char *)packet.object_value.string.bytes);
- 
-@@ -1107,7 +1119,8 @@ read_snmp_response(int fd)		/* I - SNMP 
+     case DEVICE_ID :
+-	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING)
++	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
++	    (!device->id ||
++	     strlen(device->id) < packet.object_value.string.num_bytes))
+ 	{
+ 	 /*
+ 	  * Update an existing cache entry...
+@@ -1107,7 +1109,7 @@ read_snmp_response(int fd)		/* I - SNMP 
  
      case DEVICE_URI :
  	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
 -	    !device->uri)
-+	    !device->uri &&
-+	    (char *)packet.object_value.string.bytes[0] != '\0')
++	    !device->uri && packet.object_value.string.num_bytes > 0)
  	{
  	 /*
  	  * Update an existing cache entry...
+diff -up cups-1.4.2/CHANGES-1.4.txt.str3413 cups-1.4.2/CHANGES-1.4.txt


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -p -r1.552 -r1.553
--- cups.spec	8 Dec 2009 10:21:02 -0000	1.552
+++ cups.spec	8 Dec 2009 10:57:19 -0000	1.553
@@ -532,6 +532,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options



From twaugh at fedoraproject.org  Tue Dec  8 10:59:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 10:59:20 +0000 (UTC)
Subject: rpms/cups/devel cups-str3413.patch,1.1,1.2 cups.spec,1.554,1.555
Message-ID: <20091208105920.87CEE11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16859

Modified Files:
	cups-str3413.patch cups.spec 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream fix for SNMP detection (bug #542857, STR #3413).


cups-str3413.patch:
 backend/snmp.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: cups-str3413.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3413.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3413.patch	3 Dec 2009 23:09:28 -0000	1.1
+++ cups-str3413.patch	8 Dec 2009 10:59:20 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/backend/snmp.c.str3413 cups-1.4.2/backend/snmp.c
 --- cups-1.4.2/backend/snmp.c.str3413	2009-01-14 22:40:58.000000000 +0000
-+++ cups-1.4.2/backend/snmp.c	2009-12-03 10:01:27.933335209 +0000
++++ cups-1.4.2/backend/snmp.c	2009-12-08 10:54:11.798515550 +0000
 @@ -999,7 +999,7 @@ read_snmp_response(int fd)		/* I - SNMP 
  		       DEVICE_PRODUCT, LexmarkProductOID2);
  	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
@@ -10,33 +10,24 @@ diff -up cups-1.4.2/backend/snmp.c.str34
  	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
  	               packet.community, CUPS_ASN1_GET_REQUEST,
  		       DEVICE_PRODUCT, XeroxProductOID);
-@@ -1064,7 +1064,19 @@ read_snmp_response(int fd)		/* I - SNMP 
+@@ -1054,7 +1054,9 @@ read_snmp_response(int fd)		/* I - SNMP 
+ 	break;
  
- 
- 	  if (device->id)
-+	  {
-+	    if (strlen (device->id) >
-+		strlen ((char *)packet.object_value.string.bytes))
-+	    {
-+	     /*
-+	      * The Device ID we already saw was more complete.
-+	      */
-+
-+	      break;
-+	    }
-+
- 	    free(device->id);
-+	  }
- 
- 	  device->id = strdup((char *)packet.object_value.string.bytes);
- 
-@@ -1107,7 +1119,8 @@ read_snmp_response(int fd)		/* I - SNMP 
+     case DEVICE_ID :
+-	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING)
++	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
++	    (!device->id ||
++	     strlen(device->id) < packet.object_value.string.num_bytes))
+ 	{
+ 	 /*
+ 	  * Update an existing cache entry...
+@@ -1107,7 +1109,7 @@ read_snmp_response(int fd)		/* I - SNMP 
  
      case DEVICE_URI :
  	if (device && packet.object_type == CUPS_ASN1_OCTET_STRING &&
 -	    !device->uri)
-+	    !device->uri &&
-+	    (char *)packet.object_value.string.bytes[0] != '\0')
++	    !device->uri && packet.object_value.string.num_bytes > 0)
  	{
  	 /*
  	  * Update an existing cache entry...
+diff -up cups-1.4.2/CHANGES-1.4.txt.str3413 cups-1.4.2/CHANGES-1.4.txt


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -p -r1.554 -r1.555
--- cups.spec	8 Dec 2009 10:22:08 -0000	1.554
+++ cups.spec	8 Dec 2009 10:59:20 -0000	1.555
@@ -522,6 +522,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).
 - Use upstream fix for adjustment of conflicting options



From pkgdb at fedoraproject.org  Tue Dec  8 11:04:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 11:04:14 +0000
Subject: [pkgdb] bacula: rvokal has given up watchcommits
Message-ID: <20091208110414.E4ABB10F865@bastion2.fedora.phx.redhat.com>

rvokal has given up the watchcommits acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec  8 11:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 11:04:15 +0000
Subject: [pkgdb] bacula: rvokal has requested commit
Message-ID: <20091208110415.70E1710F89C@bastion2.fedora.phx.redhat.com>

rvokal has requested the commit acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec  8 11:04:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 11:04:18 +0000
Subject: [pkgdb] bacula: rvokal has requested approveacls
Message-ID: <20091208110418.92C6E10F8A2@bastion2.fedora.phx.redhat.com>

rvokal has requested the approveacls acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec  8 11:04:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 11:04:21 +0000
Subject: [pkgdb] bacula: rvokal has given up approveacls
Message-ID: <20091208110421.E2D4010F8A9@bastion2.fedora.phx.redhat.com>

rvokal has given up the approveacls acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec  8 11:04:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 11:04:25 +0000
Subject: [pkgdb] bacula: rvokal has given up watchbugzilla
Message-ID: <20091208110425.301AE10F8B0@bastion2.fedora.phx.redhat.com>

rvokal has given up the watchbugzilla acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From twaugh at fedoraproject.org  Tue Dec  8 11:04:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:04:57 +0000 (UTC)
Subject: rpms/cups/F-11 cups-negative-snmp-string-length.patch, NONE,
	1.1 cups.spec, 1.546, 1.547
Message-ID: <20091208110457.D564211C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18688

Modified Files:
	cups.spec 
Added Files:
	cups-negative-snmp-string-length.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to handle negative SNMP string lengths (rev 8896).


cups-negative-snmp-string-length.patch:
 network.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE cups-negative-snmp-string-length.patch ---
diff -up cups-1.4.2/backend/network.c.negative-snmp-string-length cups-1.4.2/backend/network.c
--- cups-1.4.2/backend/network.c.negative-snmp-string-length	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/network.c	2009-12-08 11:03:05.728413423 +0000
@@ -170,9 +170,13 @@ backendNetworkSideCB(
 
 	        case CUPS_ASN1_BIT_STRING :
 	        case CUPS_ASN1_OCTET_STRING :
-		    i = (int)(sizeof(data) - (dataptr - data));
-		    if (packet.object_value.string.num_bytes < i)
+		    if (packet.object_value.string.num_bytes < 0)
+		      i = 0;
+		    else if (packet.object_value.string.num_bytes < 
+			     (sizeof(data) - (dataptr - data)))
 		      i = packet.object_value.string.num_bytes;
+		    else
+		      i = (int)(sizeof(data) - (dataptr - data));
 
 		    memcpy(dataptr, packet.object_value.string.bytes, i);
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -p -r1.546 -r1.547
--- cups.spec	8 Dec 2009 10:56:17 -0000	1.546
+++ cups.spec	8 Dec 2009 11:04:57 -0000	1.547
@@ -65,6 +65,7 @@ Patch51: cups-str3413.patch
 Patch52: cups-str3439.patch
 Patch53: cups-str3440.patch
 Patch54: cups-str3442.patch
+Patch55: cups-negative-snmp-string-length.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -234,6 +235,7 @@ module. 
 %patch52 -p1 -b .str3439
 %patch53 -p1 -b .str3440
 %patch54 -p1 -b .str3442
+%patch55 -p1 -b .negative-snmp-string-length
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -526,6 +528,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to handle negative SNMP string lengths (rev 8896).
 - Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).



From twaugh at fedoraproject.org  Tue Dec  8 11:05:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:05:54 +0000 (UTC)
Subject: rpms/cups/F-12 cups-negative-snmp-string-length.patch, NONE,
	1.1 cups.spec, 1.553, 1.554
Message-ID: <20091208110554.D417411C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19083

Modified Files:
	cups.spec 
Added Files:
	cups-negative-snmp-string-length.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to handle negative SNMP string lengths (rev 8896).


cups-negative-snmp-string-length.patch:
 network.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE cups-negative-snmp-string-length.patch ---
diff -up cups-1.4.2/backend/network.c.negative-snmp-string-length cups-1.4.2/backend/network.c
--- cups-1.4.2/backend/network.c.negative-snmp-string-length	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/network.c	2009-12-08 11:03:05.728413423 +0000
@@ -170,9 +170,13 @@ backendNetworkSideCB(
 
 	        case CUPS_ASN1_BIT_STRING :
 	        case CUPS_ASN1_OCTET_STRING :
-		    i = (int)(sizeof(data) - (dataptr - data));
-		    if (packet.object_value.string.num_bytes < i)
+		    if (packet.object_value.string.num_bytes < 0)
+		      i = 0;
+		    else if (packet.object_value.string.num_bytes < 
+			     (sizeof(data) - (dataptr - data)))
 		      i = packet.object_value.string.num_bytes;
+		    else
+		      i = (int)(sizeof(data) - (dataptr - data));
 
 		    memcpy(dataptr, packet.object_value.string.bytes, i);
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -p -r1.553 -r1.554
--- cups.spec	8 Dec 2009 10:57:19 -0000	1.553
+++ cups.spec	8 Dec 2009 11:05:54 -0000	1.554
@@ -64,6 +64,7 @@ Patch37: cups-str3413.patch
 Patch38: cups-str3439.patch
 Patch39: cups-str3440.patch
 Patch40: cups-str3442.patch
+Patch41: cups-negative-snmp-string-length.patch
 
 Patch100: cups-lspp.patch
 
@@ -233,6 +234,7 @@ module. 
 %patch38 -p1 -b .str3439
 %patch39 -p1 -b .str3440
 %patch40 -p1 -b .str3442
+%patch41 -p1 -b .negative-snmp-string-length
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -532,6 +534,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to handle negative SNMP string lengths (rev 8896).
 - Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).



From twaugh at fedoraproject.org  Tue Dec  8 11:06:55 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:06:55 +0000 (UTC)
Subject: rpms/cups/devel cups-negative-snmp-string-length.patch, NONE,
	1.1 cups.spec, 1.555, 1.556
Message-ID: <20091208110655.652BD11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19516

Modified Files:
	cups.spec 
Added Files:
	cups-negative-snmp-string-length.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to handle negative SNMP string lengths (rev 8896).


cups-negative-snmp-string-length.patch:
 network.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE cups-negative-snmp-string-length.patch ---
diff -up cups-1.4.2/backend/network.c.negative-snmp-string-length cups-1.4.2/backend/network.c
--- cups-1.4.2/backend/network.c.negative-snmp-string-length	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/network.c	2009-12-08 11:03:05.728413423 +0000
@@ -170,9 +170,13 @@ backendNetworkSideCB(
 
 	        case CUPS_ASN1_BIT_STRING :
 	        case CUPS_ASN1_OCTET_STRING :
-		    i = (int)(sizeof(data) - (dataptr - data));
-		    if (packet.object_value.string.num_bytes < i)
+		    if (packet.object_value.string.num_bytes < 0)
+		      i = 0;
+		    else if (packet.object_value.string.num_bytes < 
+			     (sizeof(data) - (dataptr - data)))
 		      i = packet.object_value.string.num_bytes;
+		    else
+		      i = (int)(sizeof(data) - (dataptr - data));
 
 		    memcpy(dataptr, packet.object_value.string.bytes, i);
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -p -r1.555 -r1.556
--- cups.spec	8 Dec 2009 10:59:20 -0000	1.555
+++ cups.spec	8 Dec 2009 11:06:55 -0000	1.556
@@ -62,6 +62,7 @@ Patch37: cups-str3413.patch
 Patch38: cups-str3439.patch
 Patch39: cups-str3440.patch
 Patch40: cups-str3442.patch
+Patch41: cups-negative-snmp-string-length.patch
 
 Patch100: cups-lspp.patch
 
@@ -231,6 +232,7 @@ module. 
 %patch38 -p1 -b .str3439
 %patch39 -p1 -b .str3440
 %patch40 -p1 -b .str3442
+%patch41 -p1 -b .negative-snmp-string-length
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -522,6 +524,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to handle negative SNMP string lengths (rev 8896).
 - Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).
 - Show conflicting option values in web UI (bug #544326, STR #3440).



From twaugh at fedoraproject.org  Tue Dec  8 11:10:45 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:10:45 +0000 (UTC)
Subject: rpms/cups/F-11 cups-sidechannel-intrs.patch, NONE, 1.1 cups.spec,
	1.547, 1.548
Message-ID: <20091208111045.AB2C011C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20683

Modified Files:
	cups.spec 
Added Files:
	cups-sidechannel-intrs.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to fix interrupt handling in the side-channel
  APIs (rev 8896).


cups-sidechannel-intrs.patch:
 sidechannel.c |   43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

--- NEW FILE cups-sidechannel-intrs.patch ---
diff -up cups-1.4.2/cups/sidechannel.c.sidechannel-intrs cups-1.4.2/cups/sidechannel.c
--- cups-1.4.2/cups/sidechannel.c.sidechannel-intrs	2009-09-23 00:20:35.000000000 +0100
+++ cups-1.4.2/cups/sidechannel.c	2009-12-08 11:08:15.297539377 +0000
@@ -116,6 +116,7 @@ cupsSideChannelRead(
   char		buffer[16388];		/* Message buffer */
   int		bytes;			/* Bytes read */
   int		templen;		/* Data length from message */
+  int		nfds;			/* Number of file descriptors */
 #ifdef HAVE_POLL
   struct pollfd	pfd;			/* Poll structure for poll() */
 #else /* select() */
@@ -143,39 +144,31 @@ cupsSideChannelRead(
   pfd.fd     = CUPS_SC_FD;
   pfd.events = POLLIN;
 
-  if (timeout < 0.0)
-  {
-    if (poll(&pfd, 1, -1) < 1)
-      return (-1);
-  }
-  else if (poll(&pfd, 1, (long)(timeout * 1000)) < 1)
-    return (-1);
+  while ((nfds = poll(&pfd, 1, 
+		      timeout < 0.0 ? -1 : (long)(timeout * 1000))) < 0 &&
+	 (errno == EINTR || errno == EAGAIN))
+    ;
 
 #else /* select() */
   FD_ZERO(&input_set);
   FD_SET(CUPS_SC_FD, &input_set);
 
-  if (timeout < 0.0)
-  {
-    if (select(CUPS_SC_FD + 1, &input_set, NULL, NULL, NULL) < 1)
-    {
-      DEBUG_printf(("1cupsSideChannelRead: Select error: %s", strerror(errno)));
-      return (-1);
-    }
-  }
-  else
-  {
-    stimeout.tv_sec  = (int)timeout;
-    stimeout.tv_usec = (int)(timeout * 1000000) % 1000000;
+  stimeout.tv_sec  = (int)timeout;
+  stimeout.tv_usec = (int)(timeout * 1000000) % 1000000;
+
+  while ((nfds = select(CUPS_SC_FD + 1, &input_set, NULL, NULL, 
+			timeout < 0.0 ? NULL : &stimeout)) < 0 &&
+	 (errno == EINTR || errno == EAGAIN))
+    ;
 
-    if (select(CUPS_SC_FD + 1, &input_set, NULL, NULL, &stimeout) < 1)
-    {
-      DEBUG_puts("1cupsSideChannelRead: Select timeout");
-      return (-1);
-    }
-  }
 #endif /* HAVE_POLL */
 
+  if  (nfds < 1)
+  {
+    *status = nfds==0 ? CUPS_SC_STATUS_TIMEOUT : CUPS_SC_STATUS_IO_ERROR;
+    return (-1);
+  }
+
  /*
   * Read a side-channel message for the format:
   *


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -p -r1.547 -r1.548
--- cups.spec	8 Dec 2009 11:04:57 -0000	1.547
+++ cups.spec	8 Dec 2009 11:10:45 -0000	1.548
@@ -66,6 +66,7 @@ Patch52: cups-str3439.patch
 Patch53: cups-str3440.patch
 Patch54: cups-str3442.patch
 Patch55: cups-negative-snmp-string-length.patch
+Patch56: cups-sidechannel-intrs.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -236,6 +237,7 @@ module. 
 %patch53 -p1 -b .str3440
 %patch54 -p1 -b .str3442
 %patch55 -p1 -b .negative-snmp-string-length
+%patch56 -p1 -b .sidechannel-intrs
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -528,6 +530,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to fix interrupt handling in the side-channel
+  APIs (rev 8896).
 - Use upstream patch to handle negative SNMP string lengths (rev 8896).
 - Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).



From twaugh at fedoraproject.org  Tue Dec  8 11:12:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:12:00 +0000 (UTC)
Subject: rpms/cups/F-12 cups-sidechannel-intrs.patch, NONE, 1.1 cups.spec,
	1.554, 1.555
Message-ID: <20091208111200.D5B9111C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21119

Modified Files:
	cups.spec 
Added Files:
	cups-sidechannel-intrs.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to fix interrupt handling in the side-channel
  APIs (rev 8896).


cups-sidechannel-intrs.patch:
 sidechannel.c |   43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

--- NEW FILE cups-sidechannel-intrs.patch ---
diff -up cups-1.4.2/cups/sidechannel.c.sidechannel-intrs cups-1.4.2/cups/sidechannel.c
--- cups-1.4.2/cups/sidechannel.c.sidechannel-intrs	2009-09-23 00:20:35.000000000 +0100
+++ cups-1.4.2/cups/sidechannel.c	2009-12-08 11:08:15.297539377 +0000
@@ -116,6 +116,7 @@ cupsSideChannelRead(
   char		buffer[16388];		/* Message buffer */
   int		bytes;			/* Bytes read */
   int		templen;		/* Data length from message */
+  int		nfds;			/* Number of file descriptors */
 #ifdef HAVE_POLL
   struct pollfd	pfd;			/* Poll structure for poll() */
 #else /* select() */
@@ -143,39 +144,31 @@ cupsSideChannelRead(
   pfd.fd     = CUPS_SC_FD;
   pfd.events = POLLIN;
 
-  if (timeout < 0.0)
-  {
-    if (poll(&pfd, 1, -1) < 1)
-      return (-1);
-  }
-  else if (poll(&pfd, 1, (long)(timeout * 1000)) < 1)
-    return (-1);
+  while ((nfds = poll(&pfd, 1, 
+		      timeout < 0.0 ? -1 : (long)(timeout * 1000))) < 0 &&
+	 (errno == EINTR || errno == EAGAIN))
+    ;
 
 #else /* select() */
   FD_ZERO(&input_set);
   FD_SET(CUPS_SC_FD, &input_set);
 
-  if (timeout < 0.0)
-  {
-    if (select(CUPS_SC_FD + 1, &input_set, NULL, NULL, NULL) < 1)
-    {
-      DEBUG_printf(("1cupsSideChannelRead: Select error: %s", strerror(errno)));
-      return (-1);
-    }
-  }
-  else
-  {
-    stimeout.tv_sec  = (int)timeout;
-    stimeout.tv_usec = (int)(timeout * 1000000) % 1000000;
+  stimeout.tv_sec  = (int)timeout;
+  stimeout.tv_usec = (int)(timeout * 1000000) % 1000000;
+
+  while ((nfds = select(CUPS_SC_FD + 1, &input_set, NULL, NULL, 
+			timeout < 0.0 ? NULL : &stimeout)) < 0 &&
+	 (errno == EINTR || errno == EAGAIN))
+    ;
 
-    if (select(CUPS_SC_FD + 1, &input_set, NULL, NULL, &stimeout) < 1)
-    {
-      DEBUG_puts("1cupsSideChannelRead: Select timeout");
-      return (-1);
-    }
-  }
 #endif /* HAVE_POLL */
 
+  if  (nfds < 1)
+  {
+    *status = nfds==0 ? CUPS_SC_STATUS_TIMEOUT : CUPS_SC_STATUS_IO_ERROR;
+    return (-1);
+  }
+
  /*
   * Read a side-channel message for the format:
   *


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -p -r1.554 -r1.555
--- cups.spec	8 Dec 2009 11:05:54 -0000	1.554
+++ cups.spec	8 Dec 2009 11:12:00 -0000	1.555
@@ -65,6 +65,7 @@ Patch38: cups-str3439.patch
 Patch39: cups-str3440.patch
 Patch40: cups-str3442.patch
 Patch41: cups-negative-snmp-string-length.patch
+Patch42: cups-sidechannel-intrs.patch
 
 Patch100: cups-lspp.patch
 
@@ -235,6 +236,7 @@ module. 
 %patch39 -p1 -b .str3440
 %patch40 -p1 -b .str3442
 %patch41 -p1 -b .negative-snmp-string-length
+%patch42 -p1 -b .sidechannel-intrs
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -534,6 +536,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to fix interrupt handling in the side-channel
+  APIs (rev 8896).
 - Use upstream patch to handle negative SNMP string lengths (rev 8896).
 - Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).



From twaugh at fedoraproject.org  Tue Dec  8 11:13:07 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:13:07 +0000 (UTC)
Subject: rpms/cups/devel cups-sidechannel-intrs.patch, NONE, 1.1 cups.spec, 
	1.556, 1.557
Message-ID: <20091208111307.6C82311C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21554

Modified Files:
	cups.spec 
Added Files:
	cups-sidechannel-intrs.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to fix interrupt handling in the side-channel
  APIs (rev 8896).


cups-sidechannel-intrs.patch:
 sidechannel.c |   43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

--- NEW FILE cups-sidechannel-intrs.patch ---
diff -up cups-1.4.2/cups/sidechannel.c.sidechannel-intrs cups-1.4.2/cups/sidechannel.c
--- cups-1.4.2/cups/sidechannel.c.sidechannel-intrs	2009-09-23 00:20:35.000000000 +0100
+++ cups-1.4.2/cups/sidechannel.c	2009-12-08 11:08:15.297539377 +0000
@@ -116,6 +116,7 @@ cupsSideChannelRead(
   char		buffer[16388];		/* Message buffer */
   int		bytes;			/* Bytes read */
   int		templen;		/* Data length from message */
+  int		nfds;			/* Number of file descriptors */
 #ifdef HAVE_POLL
   struct pollfd	pfd;			/* Poll structure for poll() */
 #else /* select() */
@@ -143,39 +144,31 @@ cupsSideChannelRead(
   pfd.fd     = CUPS_SC_FD;
   pfd.events = POLLIN;
 
-  if (timeout < 0.0)
-  {
-    if (poll(&pfd, 1, -1) < 1)
-      return (-1);
-  }
-  else if (poll(&pfd, 1, (long)(timeout * 1000)) < 1)
-    return (-1);
+  while ((nfds = poll(&pfd, 1, 
+		      timeout < 0.0 ? -1 : (long)(timeout * 1000))) < 0 &&
+	 (errno == EINTR || errno == EAGAIN))
+    ;
 
 #else /* select() */
   FD_ZERO(&input_set);
   FD_SET(CUPS_SC_FD, &input_set);
 
-  if (timeout < 0.0)
-  {
-    if (select(CUPS_SC_FD + 1, &input_set, NULL, NULL, NULL) < 1)
-    {
-      DEBUG_printf(("1cupsSideChannelRead: Select error: %s", strerror(errno)));
-      return (-1);
-    }
-  }
-  else
-  {
-    stimeout.tv_sec  = (int)timeout;
-    stimeout.tv_usec = (int)(timeout * 1000000) % 1000000;
+  stimeout.tv_sec  = (int)timeout;
+  stimeout.tv_usec = (int)(timeout * 1000000) % 1000000;
+
+  while ((nfds = select(CUPS_SC_FD + 1, &input_set, NULL, NULL, 
+			timeout < 0.0 ? NULL : &stimeout)) < 0 &&
+	 (errno == EINTR || errno == EAGAIN))
+    ;
 
-    if (select(CUPS_SC_FD + 1, &input_set, NULL, NULL, &stimeout) < 1)
-    {
-      DEBUG_puts("1cupsSideChannelRead: Select timeout");
-      return (-1);
-    }
-  }
 #endif /* HAVE_POLL */
 
+  if  (nfds < 1)
+  {
+    *status = nfds==0 ? CUPS_SC_STATUS_TIMEOUT : CUPS_SC_STATUS_IO_ERROR;
+    return (-1);
+  }
+
  /*
   * Read a side-channel message for the format:
   *


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -p -r1.556 -r1.557
--- cups.spec	8 Dec 2009 11:06:55 -0000	1.556
+++ cups.spec	8 Dec 2009 11:13:07 -0000	1.557
@@ -63,6 +63,7 @@ Patch38: cups-str3439.patch
 Patch39: cups-str3440.patch
 Patch40: cups-str3442.patch
 Patch41: cups-negative-snmp-string-length.patch
+Patch42: cups-sidechannel-intrs.patch
 
 Patch100: cups-lspp.patch
 
@@ -233,6 +234,7 @@ module. 
 %patch39 -p1 -b .str3440
 %patch40 -p1 -b .str3442
 %patch41 -p1 -b .negative-snmp-string-length
+%patch42 -p1 -b .sidechannel-intrs
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -524,6 +526,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to fix interrupt handling in the side-channel
+  APIs (rev 8896).
 - Use upstream patch to handle negative SNMP string lengths (rev 8896).
 - Use upstream fix for SNMP detection (bug #542857, STR #3413).
 - Use the text filter for text/css files (bug #545026, STR #3442).



From transif at fedoraproject.org  Tue Dec  8 11:14:10 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue,  8 Dec 2009 11:14:10 +0000 (UTC)
Subject: comps/po te.po,1.21,1.22
Message-ID: <20091208111410.901CE11C0264@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21956/po

Modified Files:
	te.po 
Log Message:
Sending translation for Telugu


Index: te.po
===================================================================
RCS file: /cvs/pkgs/comps/po/te.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- te.po	7 Sep 2009 14:50:48 -0000	1.21
+++ te.po	8 Dec 2009 11:14:10 -0000	1.22
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-01 02:22+0000\n"
-"PO-Revision-Date: 2009-09-07 16:49+0530\n"
+"POT-Creation-Date: 2009-12-08 08:16+0000\n"
+"PO-Revision-Date: 2009-12-08 16:40+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
 "Language-Team: Telugu <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,6 +28,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\n"
 
 #: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 #: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
@@ -166,163 +167,163 @@ msgid "Clustering Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:27 ../comps-f10.xml.in.h:28 ../comps-f11.xml.in.h:32
-#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:36
+#: ../comps-f12.xml.in.h:36 ../comps-f13.xml.in.h:37
 msgid "Core"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:28 ../comps-f10.xml.in.h:29 ../comps-f11.xml.in.h:33
-#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:39
+#: ../comps-f12.xml.in.h:39 ../comps-f13.xml.in.h:40
 msgid "Croatian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:29 ../comps-f10.xml.in.h:30 ../comps-f11.xml.in.h:34
-#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:40 ../comps-el5.xml.in.h:9
+#: ../comps-f12.xml.in.h:40 ../comps-f13.xml.in.h:41 ../comps-el5.xml.in.h:9
 msgid "Czech Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:30 ../comps-f10.xml.in.h:31 ../comps-f11.xml.in.h:35
-#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:41
+#: ../comps-f12.xml.in.h:41 ../comps-f13.xml.in.h:42
 msgid "DNS Name Server"
 msgstr "DNS ?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:31 ../comps-f10.xml.in.h:32 ../comps-f11.xml.in.h:36
-#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:42
+#: ../comps-f12.xml.in.h:42 ../comps-f13.xml.in.h:43
 msgid "Danish Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:32 ../comps-f10.xml.in.h:33 ../comps-f11.xml.in.h:38
-#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:44 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:10
+#: ../comps-f12.xml.in.h:44 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:11
 msgid "Desktop Environments"
 msgstr "???????????????????????????????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:33 ../comps-f10.xml.in.h:34 ../comps-f11.xml.in.h:39
-#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:45 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:11
+#: ../comps-f12.xml.in.h:45 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:12
 msgid "Desktop environments"
 msgstr "???????????????????????????????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:34 ../comps-f10.xml.in.h:35 ../comps-f11.xml.in.h:40
-#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:46 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:12
+#: ../comps-f12.xml.in.h:46 ../comps-f13.xml.in.h:47 ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:13
 msgid "Development"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:35 ../comps-f10.xml.in.h:36 ../comps-f11.xml.in.h:41
-#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:47
+#: ../comps-f12.xml.in.h:47 ../comps-f13.xml.in.h:48
 msgid "Development Libraries"
 msgstr "??????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:36 ../comps-f10.xml.in.h:37 ../comps-f11.xml.in.h:42
-#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:48 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:13
+#: ../comps-f12.xml.in.h:48 ../comps-f13.xml.in.h:49 ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:14
 msgid "Development Tools"
 msgstr "??????????????????????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:37 ../comps-f10.xml.in.h:38 ../comps-f11.xml.in.h:43
-#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:49
+#: ../comps-f12.xml.in.h:49 ../comps-f13.xml.in.h:50
 msgid "Dial-up Networking Support"
 msgstr "???????????????-????????? ???????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:38 ../comps-f10.xml.in.h:39 ../comps-f11.xml.in.h:44
-#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:51
+#: ../comps-f12.xml.in.h:51 ../comps-f13.xml.in.h:52
 msgid "Dutch Support"
 msgstr "????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:39 ../comps-f10.xml.in.h:40 ../comps-f11.xml.in.h:45
-#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:52 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:15
+#: ../comps-f12.xml.in.h:52 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:16
 msgid "Editors"
 msgstr "???????????????????????????"
 
 #: ../comps-f9.xml.in.h:40 ../comps-f10.xml.in.h:41 ../comps-f11.xml.in.h:46
-#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:53 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:16
+#: ../comps-f12.xml.in.h:53 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:17
 msgid "Educational Software"
 msgstr "?????????????????????????????????????????? ????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:41 ../comps-f10.xml.in.h:42 ../comps-f11.xml.in.h:47
-#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:54 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:17
+#: ../comps-f12.xml.in.h:54 ../comps-f13.xml.in.h:55 ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:18
 msgid "Educational software for learning"
 msgstr "??????????????????????????????????????? ?????????????????????????????????????????? ????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:42 ../comps-f10.xml.in.h:43 ../comps-f11.xml.in.h:49
-#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:56 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:18
+#: ../comps-f12.xml.in.h:56 ../comps-f13.xml.in.h:57 ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:20
 msgid "Engineering and Scientific"
 msgstr "??????????????????????????? ??????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:43 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:50
-#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:57
+#: ../comps-f12.xml.in.h:57 ../comps-f13.xml.in.h:58
 msgid "English (UK) Support"
 msgstr "???????????????????????? (UK) ??????????????????"
 
 #: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:45 ../comps-f11.xml.in.h:51
-#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:58
+#: ../comps-f12.xml.in.h:58 ../comps-f13.xml.in.h:59
 msgid "Esperanto Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:45 ../comps-f10.xml.in.h:46 ../comps-f11.xml.in.h:52
-#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:59
+#: ../comps-f12.xml.in.h:59 ../comps-f13.xml.in.h:60
 msgid "Estonian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:46 ../comps-f10.xml.in.h:47 ../comps-f11.xml.in.h:53
-#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:60
+#: ../comps-f12.xml.in.h:60 ../comps-f13.xml.in.h:61
 msgid "Ethiopic Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:47 ../comps-f10.xml.in.h:48 ../comps-f11.xml.in.h:54
-#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:61 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:19
+#: ../comps-f12.xml.in.h:61 ../comps-f13.xml.in.h:62 ../comps-el4.xml.in.h:17
+#: ../comps-el5.xml.in.h:21
 msgid "FTP Server"
 msgstr "FTP ??????????????????"
 
 #: ../comps-f9.xml.in.h:48 ../comps-f10.xml.in.h:49 ../comps-f11.xml.in.h:55
-#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:62
+#: ../comps-f12.xml.in.h:62 ../comps-f13.xml.in.h:63
 msgid "Faeroese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:50 ../comps-f11.xml.in.h:56
-#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:63
+#: ../comps-f12.xml.in.h:63 ../comps-f13.xml.in.h:64
 msgid "Fedora Eclipse"
 msgstr "Fedora Eclipse"
 
 #: ../comps-f9.xml.in.h:50 ../comps-f10.xml.in.h:51 ../comps-f11.xml.in.h:57
-#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:64 ../comps-el4.xml.in.h:18
-#: ../comps-el5.xml.in.h:20
+#: ../comps-f12.xml.in.h:64 ../comps-f13.xml.in.h:65 ../comps-el4.xml.in.h:18
+#: ../comps-el5.xml.in.h:22
 msgid "Fedora Packager"
 msgstr "Fedora ??????????????????"
 
 #: ../comps-f9.xml.in.h:51 ../comps-f10.xml.in.h:52 ../comps-f11.xml.in.h:59
-#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:66
+#: ../comps-f12.xml.in.h:66 ../comps-f13.xml.in.h:67
 msgid "Filipino Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:52 ../comps-f10.xml.in.h:53 ../comps-f11.xml.in.h:60
-#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:67
+#: ../comps-f12.xml.in.h:67 ../comps-f13.xml.in.h:68
 msgid "Finnish Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:53 ../comps-f10.xml.in.h:54 ../comps-f11.xml.in.h:62
-#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:69
+#: ../comps-f12.xml.in.h:69 ../comps-f13.xml.in.h:70
 msgid "Fonts"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:55 ../comps-f11.xml.in.h:63
-#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:70
+#: ../comps-f12.xml.in.h:70 ../comps-f13.xml.in.h:71
 msgid "Fonts packages for rendering text on the desktop."
 msgstr "???????????????????????????????????? ?????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ???????????????????????? ????????????????????????."
 
 #: ../comps-f9.xml.in.h:55 ../comps-f10.xml.in.h:56 ../comps-f11.xml.in.h:64
-#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:71
+#: ../comps-f12.xml.in.h:71 ../comps-f13.xml.in.h:72
 msgid "French Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:56 ../comps-f10.xml.in.h:57 ../comps-f11.xml.in.h:67
-#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:74 ../comps-el4.xml.in.h:19
-#: ../comps-el5.xml.in.h:21
+#: ../comps-f12.xml.in.h:74 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:19
+#: ../comps-el5.xml.in.h:23
 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."
@@ -331,19 +332,19 @@ msgstr ""
 "????????????????????????????????? ??????????????? ??????????????? ??????????????? ??????????????? ?????????????????? ???????????????????????????????????????????????? ???????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:57 ../comps-f10.xml.in.h:58 ../comps-f11.xml.in.h:68
-#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:75 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:22
+#: ../comps-f12.xml.in.h:75 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:20
+#: ../comps-el5.xml.in.h:24
 msgid "GNOME Desktop Environment"
 msgstr "GNOME ???????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:58 ../comps-f10.xml.in.h:59 ../comps-f11.xml.in.h:69
-#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:76 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:23
+#: ../comps-f12.xml.in.h:76 ../comps-f13.xml.in.h:77 ../comps-el4.xml.in.h:21
+#: ../comps-el5.xml.in.h:25
 msgid "GNOME Software Development"
 msgstr "GNOME ???????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:59 ../comps-f10.xml.in.h:60 ../comps-f11.xml.in.h:70
-#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:77
+#: ../comps-f12.xml.in.h:77 ../comps-f13.xml.in.h:78
 msgid ""
 "GNOME is a powerful graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -352,168 +353,168 @@ msgstr ""
 "??????????????? ??????????????????????????????."
 
 #: ../comps-f9.xml.in.h:60 ../comps-f10.xml.in.h:61 ../comps-f11.xml.in.h:71
-#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:78
+#: ../comps-f12.xml.in.h:78 ../comps-f13.xml.in.h:79
 msgid "Gaelic Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:61 ../comps-f10.xml.in.h:62 ../comps-f11.xml.in.h:72
-#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:79
+#: ../comps-f12.xml.in.h:79 ../comps-f13.xml.in.h:80
 msgid "Galician Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:62 ../comps-f10.xml.in.h:63 ../comps-f11.xml.in.h:73
-#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:80 ../comps-el5.xml.in.h:25
+#: ../comps-f12.xml.in.h:80 ../comps-f13.xml.in.h:81 ../comps-el5.xml.in.h:27
 msgid "Games and Entertainment"
 msgstr "???????????? ??????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:63 ../comps-f10.xml.in.h:64 ../comps-f11.xml.in.h:74
-#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:81
+#: ../comps-f12.xml.in.h:81 ../comps-f13.xml.in.h:82
 msgid "Georgian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:64 ../comps-f10.xml.in.h:65 ../comps-f11.xml.in.h:75
-#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:82
+#: ../comps-f12.xml.in.h:82 ../comps-f13.xml.in.h:83
 msgid "German Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:65 ../comps-f10.xml.in.h:66 ../comps-f11.xml.in.h:76
-#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:83 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:26
+#: ../comps-f12.xml.in.h:83 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:23
+#: ../comps-el5.xml.in.h:28
 msgid "Graphical Internet"
 msgstr "??????????????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:66 ../comps-f10.xml.in.h:67 ../comps-f11.xml.in.h:77
-#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:84 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:27
+#: ../comps-f12.xml.in.h:84 ../comps-f13.xml.in.h:85 ../comps-el4.xml.in.h:24
+#: ../comps-el5.xml.in.h:29
 msgid "Graphics"
 msgstr "????????????????????????"
 
 #: ../comps-f9.xml.in.h:67 ../comps-f10.xml.in.h:68 ../comps-f11.xml.in.h:78
-#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:85
+#: ../comps-f12.xml.in.h:85 ../comps-f13.xml.in.h:86
 msgid "Greek Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:68 ../comps-f10.xml.in.h:69 ../comps-f11.xml.in.h:79
-#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:86
+#: ../comps-f12.xml.in.h:86 ../comps-f13.xml.in.h:87
 msgid "Gujarati Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:69 ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:80
-#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:87 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:28
+#: ../comps-f12.xml.in.h:87 ../comps-f13.xml.in.h:88 ../comps-el4.xml.in.h:25
+#: ../comps-el5.xml.in.h:30
 msgid "Hardware Support"
 msgstr "???????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:70 ../comps-f10.xml.in.h:72 ../comps-f11.xml.in.h:82
-#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:89 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:29
+#: ../comps-f12.xml.in.h:89 ../comps-f13.xml.in.h:90 ../comps-el4.xml.in.h:26
+#: ../comps-el5.xml.in.h:31
 msgid "Hebrew Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:71 ../comps-f10.xml.in.h:73 ../comps-f11.xml.in.h:84
-#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:91
+#: ../comps-f12.xml.in.h:91 ../comps-f13.xml.in.h:92
 msgid "Hindi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:72 ../comps-f10.xml.in.h:74 ../comps-f11.xml.in.h:85
-#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:92
+#: ../comps-f12.xml.in.h:92 ../comps-f13.xml.in.h:93
 msgid "Hungarian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:73 ../comps-f10.xml.in.h:75 ../comps-f11.xml.in.h:86
-#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:93
+#: ../comps-f12.xml.in.h:93 ../comps-f13.xml.in.h:94
 msgid "Icelandic Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:74 ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:87
-#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:94
+#: ../comps-f12.xml.in.h:94 ../comps-f13.xml.in.h:95
 msgid "Indonesian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:75 ../comps-f10.xml.in.h:79 ../comps-f11.xml.in.h:90
-#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:97 ../comps-el4.xml.in.h:27
-#: ../comps-el5.xml.in.h:30
+#: ../comps-f12.xml.in.h:97 ../comps-f13.xml.in.h:98 ../comps-el4.xml.in.h:27
+#: ../comps-el5.xml.in.h:32
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr "GTK+ ??????????????? GNOME ??????????????? ?????????????????????????????? ????????????????????? ??? package?????? ?????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:76 ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
-#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:98
+#: ../comps-f12.xml.in.h:98 ../comps-f13.xml.in.h:99
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr "GTK+ ??????????????? XFCE ??????????????? ?????????????????????????????? ????????????????????? ??? ??????????????????????????? ????????????????????????????????? ."
 
 #: ../comps-f9.xml.in.h:77 ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92
-#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:99 ../comps-el4.xml.in.h:28
-#: ../comps-el5.xml.in.h:31
+#: ../comps-f12.xml.in.h:99 ../comps-f13.xml.in.h:100 ../comps-el4.xml.in.h:28
+#: ../comps-el5.xml.in.h:33
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr "QT ??????????????? KDE ??????????????? ?????????????????????????????? ????????????????????????????????? ??? package?????? ?????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:78 ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:100
+#: ../comps-f12.xml.in.h:100 ../comps-f13.xml.in.h:101
 msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "????????????????????? ?????????????????? ???????????? ?????????????????? ???????????????????????? ?????????????????????????????? ??? ??????????????????????????? ???????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:79 ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94
-#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:101
-#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:32
+#: ../comps-f12.xml.in.h:101 ../comps-f13.xml.in.h:102
+#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:34
 msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "??? package ??????????????????????????? ???????????????????????????????????????????????? ????????? graphical (X) ??????????????????????????????????????? interface?????? ?????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:84 ../comps-f11.xml.in.h:95
-#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:102
+#: ../comps-f12.xml.in.h:102 ../comps-f13.xml.in.h:103
 msgid "Integrated Development Environments based on Eclipse."
 msgstr "Eclipse ?????? ????????????????????? ??????????????? ??????????????????????????? ??????????????????????????????."
 
 #: ../comps-f9.xml.in.h:81 ../comps-f10.xml.in.h:85 ../comps-f11.xml.in.h:97
-#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:104
+#: ../comps-f12.xml.in.h:104 ../comps-f13.xml.in.h:105
 msgid "Inuktitut Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:82 ../comps-f10.xml.in.h:86 ../comps-f11.xml.in.h:98
-#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:105
+#: ../comps-f12.xml.in.h:105 ../comps-f13.xml.in.h:106
 msgid "Irish Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:83 ../comps-f10.xml.in.h:87 ../comps-f11.xml.in.h:99
-#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:106
+#: ../comps-f12.xml.in.h:106 ../comps-f13.xml.in.h:107
 msgid "Italian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:84 ../comps-f10.xml.in.h:88 ../comps-f11.xml.in.h:100
-#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:107
-#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:33
+#: ../comps-f12.xml.in.h:107 ../comps-f13.xml.in.h:108
+#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:35
 msgid "Japanese Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:85 ../comps-f10.xml.in.h:89 ../comps-f11.xml.in.h:101
-#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:108
+#: ../comps-f12.xml.in.h:108 ../comps-f13.xml.in.h:109
 #: ../comps-el4.xml.in.h:31
 msgid "Java"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:86 ../comps-f10.xml.in.h:90 ../comps-f11.xml.in.h:102
-#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:109
+#: ../comps-f12.xml.in.h:109 ../comps-f13.xml.in.h:110
 #: ../comps-el4.xml.in.h:32
 msgid "Java Development"
 msgstr "???????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:87 ../comps-f10.xml.in.h:91 ../comps-f11.xml.in.h:103
-#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:110
-#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:34
+#: ../comps-f12.xml.in.h:110 ../comps-f13.xml.in.h:111
+#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:36
 msgid "KDE (K Desktop Environment)"
 msgstr "KDE (K Desktop ???????????????????????????)"
 
 #: ../comps-f9.xml.in.h:88 ../comps-f10.xml.in.h:92 ../comps-f11.xml.in.h:104
-#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:111
-#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:35
+#: ../comps-f12.xml.in.h:111 ../comps-f13.xml.in.h:112
+#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:37
 msgid "KDE Software Development"
 msgstr "KDE Software ??????????????????"
 
 #: ../comps-f9.xml.in.h:89 ../comps-f10.xml.in.h:93 ../comps-f11.xml.in.h:105
-#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:112
+#: ../comps-f12.xml.in.h:112 ../comps-f13.xml.in.h:113
 msgid ""
 "KDE is a powerful graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -522,142 +523,142 @@ msgstr ""
 "user interface."
 
 #: ../comps-f9.xml.in.h:90 ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:106
-#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:113
+#: ../comps-f12.xml.in.h:113 ../comps-f13.xml.in.h:114
 msgid "Kannada Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
-#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:115
+#: ../comps-f12.xml.in.h:115 ../comps-f13.xml.in.h:116
 msgid "Kashubian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:92 ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:110
-#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:117
+#: ../comps-f12.xml.in.h:117 ../comps-f13.xml.in.h:118
 msgid "Khmer Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:93 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:113
-#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:120
+#: ../comps-f12.xml.in.h:120 ../comps-f13.xml.in.h:121
 msgid "Korean Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:121
+#: ../comps-f12.xml.in.h:121 ../comps-f13.xml.in.h:122
 msgid "Kurdish Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:95 ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:116
-#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:124
+#: ../comps-f12.xml.in.h:124 ../comps-f13.xml.in.h:125
 msgid "Languages"
 msgstr "???????????????"
 
 #: ../comps-f9.xml.in.h:96 ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:117
-#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:125
+#: ../comps-f12.xml.in.h:125 ../comps-f13.xml.in.h:126
 msgid "Lao Support"
 msgstr "Lao ??????????????????"
 
 #: ../comps-f9.xml.in.h:97 ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
-#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:127
+#: ../comps-f12.xml.in.h:127 ../comps-f13.xml.in.h:128
 msgid "Latvian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:120
-#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:128
+#: ../comps-f12.xml.in.h:128 ../comps-f13.xml.in.h:129
 msgid "Legacy Fonts"
 msgstr "??????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:99 ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:121
-#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:129
+#: ../comps-f12.xml.in.h:129 ../comps-f13.xml.in.h:130
 msgid "Legacy Network Server"
 msgstr "??????????????? ?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:100 ../comps-f10.xml.in.h:107
 #: ../comps-f11.xml.in.h:122 ../comps-f12.xml.in.h:130
-#: ../comps-f13.xml.in.h:130
+#: ../comps-f13.xml.in.h:131
 msgid "Legacy Software Development"
 msgstr "??????????????? ???????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:101 ../comps-f10.xml.in.h:108
 #: ../comps-f11.xml.in.h:123 ../comps-f12.xml.in.h:131
-#: ../comps-f13.xml.in.h:131
+#: ../comps-f13.xml.in.h:132
 msgid "Legacy Software Support"
 msgstr "??????????????? ???????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:102 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:124 ../comps-f12.xml.in.h:132
-#: ../comps-f13.xml.in.h:132
+#: ../comps-f13.xml.in.h:133
 msgid "Lithuanian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:125 ../comps-f12.xml.in.h:133
-#: ../comps-f13.xml.in.h:133
+#: ../comps-f13.xml.in.h:134
 msgid "Low Saxon Support"
 msgstr "?????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127 ../comps-f12.xml.in.h:135
-#: ../comps-f13.xml.in.h:135
+#: ../comps-f13.xml.in.h:136
 msgid "Macedonian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:105 ../comps-f10.xml.in.h:112
 #: ../comps-f11.xml.in.h:128 ../comps-f12.xml.in.h:137
-#: ../comps-f13.xml.in.h:137 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:37
+#: ../comps-f13.xml.in.h:138 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:39
 msgid "Mail Server"
 msgstr "?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:106 ../comps-f10.xml.in.h:114
 #: ../comps-f11.xml.in.h:131 ../comps-f12.xml.in.h:140
-#: ../comps-f13.xml.in.h:140
+#: ../comps-f13.xml.in.h:141
 msgid "Malay Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:107 ../comps-f10.xml.in.h:115
 #: ../comps-f11.xml.in.h:132 ../comps-f12.xml.in.h:141
-#: ../comps-f13.xml.in.h:141
+#: ../comps-f13.xml.in.h:142
 msgid "Malayalam Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:108 ../comps-f10.xml.in.h:116
 #: ../comps-f11.xml.in.h:135 ../comps-f12.xml.in.h:144
-#: ../comps-f13.xml.in.h:144
+#: ../comps-f13.xml.in.h:145
 msgid "Maori Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:109 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:136 ../comps-f12.xml.in.h:145
-#: ../comps-f13.xml.in.h:145
+#: ../comps-f13.xml.in.h:146
 msgid "Marathi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:118
 #: ../comps-f11.xml.in.h:138 ../comps-f12.xml.in.h:149
-#: ../comps-f13.xml.in.h:149
+#: ../comps-f13.xml.in.h:150
 msgid "Mongolian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:111 ../comps-f10.xml.in.h:119
 #: ../comps-f11.xml.in.h:139 ../comps-f12.xml.in.h:150
-#: ../comps-f13.xml.in.h:150
+#: ../comps-f13.xml.in.h:151
 msgid "MySQL Database"
 msgstr "MySQL ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:121
 #: ../comps-f11.xml.in.h:141 ../comps-f12.xml.in.h:152
-#: ../comps-f13.xml.in.h:152
+#: ../comps-f13.xml.in.h:153
 msgid "Nepali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:113 ../comps-f10.xml.in.h:122
 #: ../comps-f11.xml.in.h:142 ../comps-f12.xml.in.h:153
-#: ../comps-f13.xml.in.h:153 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:38
+#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:40
 msgid "Network Servers"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:114 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:143 ../comps-f12.xml.in.h:154
-#: ../comps-f13.xml.in.h:154 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:39
+#: ../comps-f13.xml.in.h:155 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:41
 msgid "News Server"
 msgstr "?????????????????? ???????????????"
 
@@ -667,37 +668,37 @@ msgstr "??????????????????????????? ????
 
 #: ../comps-f9.xml.in.h:116 ../comps-f10.xml.in.h:125
 #: ../comps-f11.xml.in.h:144 ../comps-f12.xml.in.h:155
-#: ../comps-f13.xml.in.h:155
+#: ../comps-f13.xml.in.h:156
 msgid "Northern Sotho Support"
 msgstr "??????????????????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:117 ../comps-f10.xml.in.h:126
 #: ../comps-f11.xml.in.h:145 ../comps-f12.xml.in.h:156
-#: ../comps-f13.xml.in.h:156
+#: ../comps-f13.xml.in.h:157
 msgid "Norwegian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:118 ../comps-f10.xml.in.h:127
 #: ../comps-f11.xml.in.h:148 ../comps-f12.xml.in.h:159
-#: ../comps-f13.xml.in.h:159 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:40
+#: ../comps-f13.xml.in.h:160 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:42
 msgid "Office/Productivity"
 msgstr "???????????????????????????/????????????????????????"
 
 #: ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:128
 #: ../comps-f11.xml.in.h:149 ../comps-f12.xml.in.h:160
-#: ../comps-f13.xml.in.h:160
+#: ../comps-f13.xml.in.h:161
 msgid "Older bitmap and vector fonts packages"
 msgstr "????????? ???????????????????????????????????? ??????????????? ???????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:120 ../comps-f10.xml.in.h:129
 #: ../comps-f11.xml.in.h:151 ../comps-f12.xml.in.h:162
-#: ../comps-f13.xml.in.h:162
+#: ../comps-f13.xml.in.h:163
 msgid "Oriya Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:121 ../comps-f10.xml.in.h:130
 #: ../comps-f11.xml.in.h:152 ../comps-f12.xml.in.h:163
-#: ../comps-f13.xml.in.h:163 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:41
+#: ../comps-f13.xml.in.h:164 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:43
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
@@ -705,55 +706,55 @@ msgstr "?????????????????????????????? ?
 
 #: ../comps-f9.xml.in.h:122 ../comps-f10.xml.in.h:132
 #: ../comps-f11.xml.in.h:154 ../comps-f12.xml.in.h:165
-#: ../comps-f13.xml.in.h:165
+#: ../comps-f13.xml.in.h:166
 msgid "Persian Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:123 ../comps-f10.xml.in.h:133
 #: ../comps-f11.xml.in.h:155 ../comps-f12.xml.in.h:166
-#: ../comps-f13.xml.in.h:166
+#: ../comps-f13.xml.in.h:167
 msgid "Polish Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:124 ../comps-f10.xml.in.h:134
 #: ../comps-f11.xml.in.h:156 ../comps-f12.xml.in.h:167
-#: ../comps-f13.xml.in.h:167
+#: ../comps-f13.xml.in.h:168
 msgid "Portuguese Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:125 ../comps-f10.xml.in.h:135
 #: ../comps-f11.xml.in.h:157 ../comps-f12.xml.in.h:168
-#: ../comps-f13.xml.in.h:168
+#: ../comps-f13.xml.in.h:169
 msgid "PostgreSQL Database"
 msgstr "?????????????????????????????? SQL ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:126 ../comps-f10.xml.in.h:136
 #: ../comps-f11.xml.in.h:158 ../comps-f12.xml.in.h:169
-#: ../comps-f13.xml.in.h:169
+#: ../comps-f13.xml.in.h:170
 msgid "Printing Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:127 ../comps-f10.xml.in.h:137
 #: ../comps-f11.xml.in.h:159 ../comps-f12.xml.in.h:170
-#: ../comps-f13.xml.in.h:170
+#: ../comps-f13.xml.in.h:171
 msgid "Punjabi Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:128 ../comps-f10.xml.in.h:138
 #: ../comps-f11.xml.in.h:160 ../comps-f12.xml.in.h:171
-#: ../comps-f13.xml.in.h:171
+#: ../comps-f13.xml.in.h:172
 msgid "Romanian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:129 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:161 ../comps-f12.xml.in.h:172
-#: ../comps-f13.xml.in.h:172
+#: ../comps-f13.xml.in.h:173
 msgid "Ruby"
 msgstr "????????????"
 
 #: ../comps-f9.xml.in.h:130 ../comps-f10.xml.in.h:140
 #: ../comps-f11.xml.in.h:162 ../comps-f12.xml.in.h:173
-#: ../comps-f13.xml.in.h:173
+#: ../comps-f13.xml.in.h:174
 msgid "Russian Support"
 msgstr "?????????????????? ??????????????????"
 
@@ -767,73 +768,73 @@ msgstr "SUGAR ?????????????????? OLPC XO
 
 #: ../comps-f9.xml.in.h:133 ../comps-f10.xml.in.h:142
 #: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:174
-#: ../comps-f13.xml.in.h:174
+#: ../comps-f13.xml.in.h:175
 msgid "Samoan Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:134 ../comps-f10.xml.in.h:143
 #: ../comps-f11.xml.in.h:166 ../comps-f12.xml.in.h:177
-#: ../comps-f13.xml.in.h:177
+#: ../comps-f13.xml.in.h:178
 msgid "Serbian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:135 ../comps-f10.xml.in.h:144
 #: ../comps-f11.xml.in.h:167 ../comps-f12.xml.in.h:178
-#: ../comps-f13.xml.in.h:178
+#: ../comps-f13.xml.in.h:179
 msgid "Server Configuration Tools"
 msgstr "??????????????? ???????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:136 ../comps-f10.xml.in.h:145
 #: ../comps-f11.xml.in.h:168 ../comps-f12.xml.in.h:179
-#: ../comps-f13.xml.in.h:179 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:42
+#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:44
 msgid "Servers"
 msgstr "?????????????????????"
 
 #: ../comps-f9.xml.in.h:137 ../comps-f10.xml.in.h:146
 #: ../comps-f11.xml.in.h:169 ../comps-f12.xml.in.h:180
-#: ../comps-f13.xml.in.h:180 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:43
+#: ../comps-f13.xml.in.h:181 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:45
 msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "??????????????? ?????????????????????????????? ?????????????????????????????? ???????????? ???????????? ?????????????????? ??????????????? ?????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:138 ../comps-f10.xml.in.h:148
 #: ../comps-f11.xml.in.h:171 ../comps-f12.xml.in.h:182
-#: ../comps-f13.xml.in.h:182
+#: ../comps-f13.xml.in.h:183
 msgid "Sinhala Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:139 ../comps-f10.xml.in.h:149
 #: ../comps-f11.xml.in.h:172 ../comps-f12.xml.in.h:183
-#: ../comps-f13.xml.in.h:183
+#: ../comps-f13.xml.in.h:184
 msgid "Slovak Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:140 ../comps-f10.xml.in.h:150
 #: ../comps-f11.xml.in.h:173 ../comps-f12.xml.in.h:184
-#: ../comps-f13.xml.in.h:184
+#: ../comps-f13.xml.in.h:185
 msgid "Slovenian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:141 ../comps-f10.xml.in.h:151
 #: ../comps-f11.xml.in.h:174 ../comps-f12.xml.in.h:185
-#: ../comps-f13.xml.in.h:185
+#: ../comps-f13.xml.in.h:186
 msgid "Smallest possible installation"
 msgstr "???????????????????????? ??????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:142 ../comps-f10.xml.in.h:152
 #: ../comps-f11.xml.in.h:175 ../comps-f12.xml.in.h:186
-#: ../comps-f13.xml.in.h:186 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:44
+#: ../comps-f13.xml.in.h:187 ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:46
 msgid "Software used for running network servers"
 msgstr "?????????????????????????????? ???????????????????????? ???????????????????????? ???????????????????????? ????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:143 ../comps-f10.xml.in.h:153
 #: ../comps-f11.xml.in.h:176 ../comps-f12.xml.in.h:187
-#: ../comps-f13.xml.in.h:187
+#: ../comps-f13.xml.in.h:188
 msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:144 ../comps-f10.xml.in.h:154
 #: ../comps-f11.xml.in.h:177 ../comps-f12.xml.in.h:188
-#: ../comps-f13.xml.in.h:188
+#: ../comps-f13.xml.in.h:189
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
@@ -843,127 +844,127 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:145 ../comps-f10.xml.in.h:155
 #: ../comps-f11.xml.in.h:178 ../comps-f12.xml.in.h:189
-#: ../comps-f13.xml.in.h:189 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:46
+#: ../comps-f13.xml.in.h:190 ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:48
 msgid "Sound and Video"
 msgstr "??????????????? ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:146 ../comps-f10.xml.in.h:156
 #: ../comps-f11.xml.in.h:179 ../comps-f12.xml.in.h:190
-#: ../comps-f13.xml.in.h:190
+#: ../comps-f13.xml.in.h:191
 msgid "Southern Ndebele Support"
 msgstr "??????????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:147 ../comps-f10.xml.in.h:157
 #: ../comps-f11.xml.in.h:180 ../comps-f12.xml.in.h:191
-#: ../comps-f13.xml.in.h:191
+#: ../comps-f13.xml.in.h:192
 msgid "Southern Sotho Support"
 msgstr "??????????????? ???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:148 ../comps-f10.xml.in.h:158
 #: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:192
-#: ../comps-f13.xml.in.h:192
+#: ../comps-f13.xml.in.h:193
 msgid "Spanish Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:149 ../comps-f10.xml.in.h:160
 #: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:196
-#: ../comps-f13.xml.in.h:196 ../comps-el4.xml.in.h:46
+#: ../comps-f13.xml.in.h:197 ../comps-el4.xml.in.h:46
 msgid "Support for developing programs in the Java programming language."
 msgstr "Java ????????????????????? ??????????????? ????????????????????? ????????????????????????????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:150 ../comps-f10.xml.in.h:162
 #: ../comps-f11.xml.in.h:188 ../comps-f12.xml.in.h:199
-#: ../comps-f13.xml.in.h:199 ../comps-el4.xml.in.h:47
+#: ../comps-f13.xml.in.h:200 ../comps-el4.xml.in.h:47
 msgid "Support for running programs written in the Java programming language."
 msgstr "???????????? ?????????????????????(programing) ??????????????? ??????????????? ????????????????????????????????? ?????????????????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:151 ../comps-f10.xml.in.h:163
 #: ../comps-f11.xml.in.h:190 ../comps-f12.xml.in.h:201
-#: ../comps-f13.xml.in.h:201
+#: ../comps-f13.xml.in.h:202
 msgid "Swati Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:152 ../comps-f10.xml.in.h:164
 #: ../comps-f11.xml.in.h:191 ../comps-f12.xml.in.h:202
-#: ../comps-f13.xml.in.h:202
+#: ../comps-f13.xml.in.h:203
 msgid "Swedish Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:153 ../comps-f10.xml.in.h:165
 #: ../comps-f11.xml.in.h:192 ../comps-f12.xml.in.h:203
-#: ../comps-f13.xml.in.h:203 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:47
+#: ../comps-f13.xml.in.h:204 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:49
 msgid "System Tools"
 msgstr "????????????????????? ????????????????????????"
 
 #: ../comps-f9.xml.in.h:154 ../comps-f10.xml.in.h:166
 #: ../comps-f11.xml.in.h:193 ../comps-f12.xml.in.h:204
-#: ../comps-f13.xml.in.h:204
+#: ../comps-f13.xml.in.h:205
 msgid "Tagalog Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:155 ../comps-f10.xml.in.h:168
 #: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:206
-#: ../comps-f13.xml.in.h:206
+#: ../comps-f13.xml.in.h:207
 msgid "Tamil Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:156 ../comps-f10.xml.in.h:169
 #: ../comps-f11.xml.in.h:196 ../comps-f12.xml.in.h:207
-#: ../comps-f13.xml.in.h:207
+#: ../comps-f13.xml.in.h:208
 msgid "Telugu Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:157 ../comps-f10.xml.in.h:170
 #: ../comps-f11.xml.in.h:198 ../comps-f12.xml.in.h:209
-#: ../comps-f13.xml.in.h:209 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:48
+#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:50
 msgid "Text-based Internet"
 msgstr "?????????????????????-?????????????????? ??????????????????????????????"
 
 #: ../comps-f9.xml.in.h:158 ../comps-f10.xml.in.h:171
 #: ../comps-f11.xml.in.h:199 ../comps-f12.xml.in.h:210
-#: ../comps-f13.xml.in.h:210
+#: ../comps-f13.xml.in.h:212
 msgid "Thai Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:159 ../comps-f10.xml.in.h:172
 #: ../comps-f11.xml.in.h:200 ../comps-f12.xml.in.h:211
-#: ../comps-f13.xml.in.h:211 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:50
+#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:52
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr "??? ????????????????????????????????? ???????????????????????? suites, PDF ???????????????????????? ??????????????? ??????????????? ??????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:160 ../comps-f10.xml.in.h:173
 #: ../comps-f11.xml.in.h:201 ../comps-f12.xml.in.h:212
-#: ../comps-f13.xml.in.h:212
+#: ../comps-f13.xml.in.h:214
 msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??? ????????????????????? ???????????? packages ?????????????????????????????? ????????????????????????????????? ????????????????????? ???????????? libraries."
 
 #: ../comps-f9.xml.in.h:161 ../comps-f10.xml.in.h:174
 #: ../comps-f11.xml.in.h:202 ../comps-f12.xml.in.h:213
-#: ../comps-f13.xml.in.h:213 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:51
+#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:53
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr "IMAP ????????? SMTP mail ?????????????????? ?????????????????????????????? ??? ????????????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:162 ../comps-f10.xml.in.h:175
 #: ../comps-f11.xml.in.h:203 ../comps-f12.xml.in.h:214
-#: ../comps-f13.xml.in.h:214
+#: ../comps-f13.xml.in.h:216
 msgid "These packages allow you to develop applications for the X Window System."
 msgstr " X Window ?????????????????????????????? ?????????????????????????????? ??????????????????????????? ??? package?????? ????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:163 ../comps-f10.xml.in.h:176
 #: ../comps-f11.xml.in.h:204 ../comps-f12.xml.in.h:215
-#: ../comps-f13.xml.in.h:215 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:52
+#: ../comps-f13.xml.in.h:217 ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:54
 msgid "These packages are helpful when developing web applications or web pages."
 msgstr "???????????? ???????????????????????????????????? ???????????? ???????????? ?????????????????? ??????????????????????????? ??????????????????????????? ??? ???????????????????????? ?????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:164 ../comps-f10.xml.in.h:177
 #: ../comps-f11.xml.in.h:205 ../comps-f12.xml.in.h:216
-#: ../comps-f13.xml.in.h:216
+#: ../comps-f13.xml.in.h:218
 msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? package?????? network ?????????????????? ???????????????????????? - DHCP, Kerberos ??????????????? NIS??????. ??????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:165 ../comps-f10.xml.in.h:178
 #: ../comps-f11.xml.in.h:206 ../comps-f12.xml.in.h:217
-#: ../comps-f13.xml.in.h:217
+#: ../comps-f13.xml.in.h:219
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
@@ -971,19 +972,19 @@ msgstr "??? package?????? ????????? netw
 
 #: ../comps-f9.xml.in.h:166 ../comps-f10.xml.in.h:179
 #: ../comps-f11.xml.in.h:207 ../comps-f12.xml.in.h:218
-#: ../comps-f13.xml.in.h:218
+#: ../comps-f13.xml.in.h:220
 msgid "These packages provide a virtualization environment."
 msgstr "??? ???????????????????????? ???????????????????????? ???????????????????????????????????? ???????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:167 ../comps-f10.xml.in.h:180
 #: ../comps-f11.xml.in.h:208 ../comps-f12.xml.in.h:219
-#: ../comps-f13.xml.in.h:219
+#: ../comps-f13.xml.in.h:221
 msgid "These packages provide compatibility with previous releases."
 msgstr "??? package?????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:168 ../comps-f10.xml.in.h:181
 #: ../comps-f11.xml.in.h:209 ../comps-f12.xml.in.h:220
-#: ../comps-f13.xml.in.h:220
+#: ../comps-f13.xml.in.h:222
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
@@ -991,7 +992,7 @@ msgstr "???????????????????????? ???????
 
 #: ../comps-f9.xml.in.h:169 ../comps-f10.xml.in.h:182
 #: ../comps-f11.xml.in.h:210 ../comps-f12.xml.in.h:221
-#: ../comps-f13.xml.in.h:221
+#: ../comps-f13.xml.in.h:223
 msgid ""
 "These tools allow you to create documents in the DocBook format and convert "
 "them into HTML, PDF, Postscript, and text."
@@ -1001,19 +1002,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:170 ../comps-f10.xml.in.h:183
 #: ../comps-f11.xml.in.h:211 ../comps-f12.xml.in.h:222
-#: ../comps-f13.xml.in.h:222 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:54
+#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:56
 msgid "These tools allow you to run a Web server on the system."
 msgstr "??? ???????????????????????? ????????????????????????????????? Web ???????????????????????? ??????????????????????????? ??????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:171 ../comps-f10.xml.in.h:184
 #: ../comps-f11.xml.in.h:212 ../comps-f12.xml.in.h:223
-#: ../comps-f13.xml.in.h:223 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:55
+#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:57
 msgid "These tools allow you to run an FTP server on the system."
 msgstr "??? ???????????????????????? ????????????????????????????????? FTP ???????????????????????? ??????????????????????????? ??????????????????????????? ????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:172 ../comps-f10.xml.in.h:185
 #: ../comps-f11.xml.in.h:213 ../comps-f12.xml.in.h:224
-#: ../comps-f13.xml.in.h:224 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:56
+#: ../comps-f13.xml.in.h:226 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:58
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
@@ -1023,19 +1024,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:173 ../comps-f10.xml.in.h:186
 #: ../comps-f11.xml.in.h:214 ../comps-f12.xml.in.h:225
-#: ../comps-f13.xml.in.h:225 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:57
+#: ../comps-f13.xml.in.h:227 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:59
 msgid "This group allows you to configure the system as a news server."
 msgstr "?????????????????? ???????????????????????? ?????? ????????????????????????????????? ???????????????????????????????????????????????? ??? ??????????????? ??????????????????????????? ???????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:174 ../comps-f10.xml.in.h:187
 #: ../comps-f11.xml.in.h:215 ../comps-f12.xml.in.h:226
-#: ../comps-f13.xml.in.h:226
+#: ../comps-f13.xml.in.h:228
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr "??? ??????????????? Red Hat ??????????????? ??????????????? ????????????????????? ????????????????????? ????????????????????????????????? ??????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:175 ../comps-f10.xml.in.h:188
 #: ../comps-f11.xml.in.h:216 ../comps-f12.xml.in.h:227
-#: ../comps-f13.xml.in.h:227
+#: ../comps-f13.xml.in.h:229
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
@@ -1045,13 +1046,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:176 ../comps-f10.xml.in.h:189
 #: ../comps-f11.xml.in.h:217 ../comps-f12.xml.in.h:228
-#: ../comps-f13.xml.in.h:228 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:58
+#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:60
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr "??? ??????????????? ??????????????? ???-?????????, Web, ??????????????? ????????????????????? ???????????????????????????????????? ???????????????????????????."
 
 #: ../comps-f9.xml.in.h:177 ../comps-f10.xml.in.h:190
 #: ../comps-f11.xml.in.h:218 ../comps-f12.xml.in.h:229
-#: ../comps-f13.xml.in.h:229 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:59
+#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:61
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
@@ -1061,13 +1062,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:178 ../comps-f10.xml.in.h:191
 #: ../comps-f11.xml.in.h:219 ../comps-f12.xml.in.h:230
-#: ../comps-f13.xml.in.h:230 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:60
+#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:62
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr "?????????????????????????????? ????????????????????? ??????????????? ?????????????????????????????????????????? ???????????? ????????????????????? ??????????????????????????? ??? ??????????????? ??????????????????????????????."
 
 #: ../comps-f9.xml.in.h:179 ../comps-f10.xml.in.h:192
 #: ../comps-f11.xml.in.h:220 ../comps-f12.xml.in.h:231
-#: ../comps-f13.xml.in.h:231 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:61
+#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:63
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
@@ -1077,7 +1078,7 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:180 ../comps-f10.xml.in.h:193
 #: ../comps-f11.xml.in.h:221 ../comps-f12.xml.in.h:232
-#: ../comps-f13.xml.in.h:232 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:62
+#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
@@ -1087,19 +1088,19 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:181 ../comps-f10.xml.in.h:194
 #: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:233
-#: ../comps-f13.xml.in.h:233 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:65
+#: ../comps-f13.xml.in.h:235 ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:182 ../comps-f10.xml.in.h:195
 #: ../comps-f11.xml.in.h:223 ../comps-f12.xml.in.h:234
-#: ../comps-f13.xml.in.h:234 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:69
+#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:71
 msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ??????????????? ?????????????????? ?????????????????????????????? ????????????????????????????????? ????????????????????? ??????????????????????????? ??????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:183 ../comps-f10.xml.in.h:196
 #: ../comps-f11.xml.in.h:225 ../comps-f12.xml.in.h:236
-#: ../comps-f13.xml.in.h:236 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:70
+#: ../comps-f13.xml.in.h:238 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:72
 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."
@@ -1109,13 +1110,13 @@ msgstr ""
 
 #: ../comps-f9.xml.in.h:184 ../comps-f10.xml.in.h:197
 #: ../comps-f11.xml.in.h:226 ../comps-f12.xml.in.h:237
-#: ../comps-f13.xml.in.h:237
+#: ../comps-f13.xml.in.h:239
 msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "DNS ?????????????????? ???????????????????????? (BIND) ?????? ????????????????????????????????? ?????????????????????????????????????????? ??? ?????????????????????????????? ??????????????? ???????????????????????????????????????."
 
 #: ../comps-f9.xml.in.h:185 ../comps-f10.xml.in.h:198
 #: ../comps-f11.xml.in.h:227 ../comps-f12.xml.in.h:238
-#: ../comps-f13.xml.in.h:238
+#: ../comps-f13.xml.in.h:240
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
@@ -1123,163 +1124,163 @@ msgstr "Linux and MS Windows (tm) ??????
 
 #: ../comps-f9.xml.in.h:186 ../comps-f10.xml.in.h:199
 #: ../comps-f11.xml.in.h:228 ../comps-f12.xml.in.h:239
-#: ../comps-f13.xml.in.h:239
+#: ../comps-f13.xml.in.h:241
 msgid "This package group contains packages useful for use with MySQL."
 msgstr "MySQL?????? ?????????????????????????????????????????? ???????????????????????? package????????? ??? package ??????????????? ??????????????? ????????????."
 
 #: ../comps-f9.xml.in.h:187 ../comps-f10.xml.in.h:200
 #: ../comps-f11.xml.in.h:229 ../comps-f12.xml.in.h:240
-#: ../comps-f13.xml.in.h:240
+#: ../comps-f13.xml.in.h:242
 msgid "This package group includes packages useful for use with Postgresql."
 msgstr "Postgresql?????? ??????????????????????????? ?????????????????????????????? ??????????????????????????? ??? ??????????????? ??????????????? ???????????????????????????."
 
 #: ../comps-f9.xml.in.h:188 ../comps-f10.xml.in.h:201
 #: ../comps-f11.xml.in.h:230 ../comps-f12.xml.in.h:241
-#: ../comps-f13.xml.in.h:241
+#: ../comps-f13.xml.in.h:243
 msgid "Tibetan Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:189 ../comps-f10.xml.in.h:202
 #: ../comps-f11.xml.in.h:231 ../comps-f12.xml.in.h:242
-#: ../comps-f13.xml.in.h:242
+#: ../comps-f13.xml.in.h:244
 msgid "Tonga Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:190 ../comps-f10.xml.in.h:203
 #: ../comps-f11.xml.in.h:232 ../comps-f12.xml.in.h:243
-#: ../comps-f13.xml.in.h:243 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
+#: ../comps-f13.xml.in.h:245 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:73
 msgid "Tools and Utilities needed by a Fedora Packager"
 msgstr "Fedora ?????????????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:191 ../comps-f10.xml.in.h:204
 #: ../comps-f11.xml.in.h:233 ../comps-f12.xml.in.h:244
-#: ../comps-f13.xml.in.h:244
+#: ../comps-f13.xml.in.h:246
 msgid "Tsonga Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:192 ../comps-f10.xml.in.h:205
 #: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:245
-#: ../comps-f13.xml.in.h:245
+#: ../comps-f13.xml.in.h:247
 msgid "Tswana Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:193 ../comps-f10.xml.in.h:206
 #: ../comps-f11.xml.in.h:235 ../comps-f12.xml.in.h:246
-#: ../comps-f13.xml.in.h:246
+#: ../comps-f13.xml.in.h:248
 msgid "Turkish Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:194 ../comps-f10.xml.in.h:207
 #: ../comps-f11.xml.in.h:237 ../comps-f12.xml.in.h:248
-#: ../comps-f13.xml.in.h:248
+#: ../comps-f13.xml.in.h:250
 msgid "Ukrainian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:195 ../comps-f10.xml.in.h:208
 #: ../comps-f11.xml.in.h:239 ../comps-f12.xml.in.h:250
-#: ../comps-f13.xml.in.h:250
+#: ../comps-f13.xml.in.h:252
 msgid "Urdu Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:196 ../comps-f10.xml.in.h:210
 #: ../comps-f11.xml.in.h:241 ../comps-f12.xml.in.h:252
-#: ../comps-f13.xml.in.h:252 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
+#: ../comps-f13.xml.in.h:254 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:74
 msgid "Various core pieces of the system."
 msgstr "??????????????????????????? ??????????????? ???????????? ???????????? ??????????????????."
 
 #: ../comps-f9.xml.in.h:197 ../comps-f10.xml.in.h:211
 #: ../comps-f11.xml.in.h:242 ../comps-f12.xml.in.h:253
-#: ../comps-f13.xml.in.h:253 ../comps-el5.xml.in.h:73
+#: ../comps-f13.xml.in.h:255 ../comps-el5.xml.in.h:75
 msgid "Various ways to relax and spend your free time."
 msgstr "????????????????????????????????? ??????????????? ?????? ???????????? ???????????????????????? ??????????????????????????? ????????????????????? ????????????????????????."
 
 #: ../comps-f9.xml.in.h:198 ../comps-f10.xml.in.h:212
 #: ../comps-f11.xml.in.h:243 ../comps-f12.xml.in.h:254
-#: ../comps-f13.xml.in.h:254
+#: ../comps-f13.xml.in.h:256
 msgid "Venda Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:199 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:244 ../comps-f12.xml.in.h:255
-#: ../comps-f13.xml.in.h:255
+#: ../comps-f13.xml.in.h:257
 msgid "Vietnamese Support"
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:200 ../comps-f10.xml.in.h:214
 #: ../comps-f11.xml.in.h:245 ../comps-f12.xml.in.h:256
-#: ../comps-f13.xml.in.h:256
+#: ../comps-f13.xml.in.h:258
 msgid "Virtualization"
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:215
 #: ../comps-f11.xml.in.h:246 ../comps-f12.xml.in.h:257
-#: ../comps-f13.xml.in.h:257
+#: ../comps-f13.xml.in.h:259
 msgid "Walloon Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:202 ../comps-f10.xml.in.h:216
 #: ../comps-f11.xml.in.h:247 ../comps-f12.xml.in.h:258
-#: ../comps-f13.xml.in.h:258 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:74
+#: ../comps-f13.xml.in.h:260 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:76
 msgid "Web Development"
 msgstr "???????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:203 ../comps-f10.xml.in.h:217
 #: ../comps-f11.xml.in.h:248 ../comps-f12.xml.in.h:259
-#: ../comps-f13.xml.in.h:259 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:75
+#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:77
 msgid "Web Server"
 msgstr "???????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:204 ../comps-f10.xml.in.h:218
 #: ../comps-f11.xml.in.h:249 ../comps-f12.xml.in.h:260
-#: ../comps-f13.xml.in.h:260
+#: ../comps-f13.xml.in.h:262
 msgid "Welsh Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:205 ../comps-f10.xml.in.h:219
 #: ../comps-f11.xml.in.h:250 ../comps-f12.xml.in.h:261
-#: ../comps-f13.xml.in.h:261 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:76
+#: ../comps-f13.xml.in.h:263 ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:78
 msgid "Window Managers"
 msgstr "??????????????? ?????????????????????????????????"
 
 #: ../comps-f9.xml.in.h:206 ../comps-f10.xml.in.h:220
 #: ../comps-f11.xml.in.h:251 ../comps-f12.xml.in.h:262
-#: ../comps-f13.xml.in.h:262
+#: ../comps-f13.xml.in.h:264
 msgid "Windows File Server"
 msgstr "????????????????????? ?????????????????? ???????????????"
 
 #: ../comps-f9.xml.in.h:207 ../comps-f10.xml.in.h:221
 #: ../comps-f11.xml.in.h:252 ../comps-f12.xml.in.h:263
-#: ../comps-f13.xml.in.h:263
+#: ../comps-f13.xml.in.h:265
 msgid "X Software Development"
 msgstr "X ???????????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:208 ../comps-f10.xml.in.h:222
 #: ../comps-f11.xml.in.h:253 ../comps-f12.xml.in.h:264
-#: ../comps-f13.xml.in.h:264 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:77
+#: ../comps-f13.xml.in.h:266 ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:79
 msgid "X Window System"
 msgstr "X ??????????????? ??????????????????"
 
 #: ../comps-f9.xml.in.h:209 ../comps-f10.xml.in.h:223
 #: ../comps-f11.xml.in.h:254 ../comps-f12.xml.in.h:265
-#: ../comps-f13.xml.in.h:265
+#: ../comps-f13.xml.in.h:267
 msgid "XFCE"
 msgstr "XFCE"
 
 #: ../comps-f9.xml.in.h:210 ../comps-f10.xml.in.h:224
 #: ../comps-f11.xml.in.h:255 ../comps-f12.xml.in.h:266
-#: ../comps-f13.xml.in.h:266
+#: ../comps-f13.xml.in.h:268
 msgid "XFCE Software Development"
 msgstr "XFCE ?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f9.xml.in.h:211 ../comps-f10.xml.in.h:225
 #: ../comps-f11.xml.in.h:256 ../comps-f12.xml.in.h:267
-#: ../comps-f13.xml.in.h:267
+#: ../comps-f13.xml.in.h:269
 msgid "Xhosa Support"
 msgstr "Xhosa ??????????????????"
 
 #: ../comps-f9.xml.in.h:212 ../comps-f10.xml.in.h:226
 #: ../comps-f11.xml.in.h:257 ../comps-f12.xml.in.h:268
-#: ../comps-f13.xml.in.h:268
+#: ../comps-f13.xml.in.h:270
 msgid "Zulu Support"
 msgstr "???????????? ??????????????????"
 
@@ -1293,67 +1294,67 @@ msgid "Haskell Development"
 msgstr "??????????????????????????? ???????????????????????????"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88 ../comps-f12.xml.in.h:95
-#: ../comps-f13.xml.in.h:95
+#: ../comps-f13.xml.in.h:96
 msgid "Input Methods"
 msgstr "???????????????????????? ????????????????????????"
 
 #: ../comps-f10.xml.in.h:78 ../comps-f11.xml.in.h:89 ../comps-f12.xml.in.h:96
-#: ../comps-f13.xml.in.h:96
+#: ../comps-f13.xml.in.h:97
 msgid "Input method packages for the input of international text."
 msgstr "?????????????????????????????? ????????????????????? ???????????????????????? ????????????????????? ???????????????????????? ?????????????????? ????????????????????????."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:114
+#: ../comps-f12.xml.in.h:114 ../comps-f13.xml.in.h:115
 msgid "Kashmiri Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:119
+#: ../comps-f12.xml.in.h:119 ../comps-f13.xml.in.h:120
 msgid "Konkani Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
-#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:122
+#: ../comps-f12.xml.in.h:122 ../comps-f13.xml.in.h:123
 msgid "LXDE"
 msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:138
+#: ../comps-f12.xml.in.h:138 ../comps-f13.xml.in.h:139
 msgid "Maithili Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:151
+#: ../comps-f12.xml.in.h:151 ../comps-f13.xml.in.h:152
 msgid "Myanmar (Burmese) Support"
 msgstr "???????????????????????? (?????????????????????) ??????????????????"
 
 #: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:153
-#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:164
+#: ../comps-f12.xml.in.h:164 ../comps-f13.xml.in.h:165
 msgid "Perl Development"
 msgstr "Perl ???????????????????????????"
 
 #: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:170
-#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:181
+#: ../comps-f12.xml.in.h:181 ../comps-f13.xml.in.h:182
 msgid "Sindhi Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:184
-#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:195
+#: ../comps-f12.xml.in.h:195 ../comps-f13.xml.in.h:196
 msgid "Support for developing programs in the Haskell programming language."
 msgstr "??????????????????????????? ??????????????????????????????????????? ??????????????? ??????????????????????????????????????? ???????????????????????????????????????????????? ??????????????????."
 
 #: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:186
-#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:197
+#: ../comps-f12.xml.in.h:197 ../comps-f13.xml.in.h:198
 msgid "Support for developing programs in the Perl programming language."
 msgstr "Perl ??????????????????????????????????????? ??????????????? ??????????????????????????????????????? ?????????????????????????????????????????? ??????????????? ??????????????????."
 
 #: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:194
-#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:205
+#: ../comps-f12.xml.in.h:205 ../comps-f13.xml.in.h:206
 msgid "Tajik Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:240
-#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:251
+#: ../comps-f12.xml.in.h:251 ../comps-f13.xml.in.h:253
 msgid "Uzbek Support"
 msgstr "????????????????????? ??????????????????"
 
@@ -1369,115 +1370,117 @@ msgstr "?????????????????????????????? ?
 msgid "Chichewa Support"
 msgstr "?????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:35
+#: ../comps-f11.xml.in.h:31 ../comps-f12.xml.in.h:35 ../comps-f13.xml.in.h:36
 msgid "Coptic Support"
 msgstr "???????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
+#: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:44
+#: ../comps-el5.xml.in.h:10
 msgid "Design and Simulation tools for hardware engineers"
 msgstr "?????????????????????????????? ??????????????????????????? ??????????????? ?????????????????? ??????????????? ????????????????????????????????? ????????????????????????"
 
-#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
+#: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:56
+#: ../comps-el5.xml.in.h:19
 msgid "Electronic Lab"
 msgstr "???????????????????????????????????? ???????????????????????????"
 
-#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:65
+#: ../comps-f11.xml.in.h:58 ../comps-f12.xml.in.h:65 ../comps-f13.xml.in.h:66
 msgid "Fijian Support"
 msgstr "????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:68
+#: ../comps-f11.xml.in.h:61 ../comps-f12.xml.in.h:68 ../comps-f13.xml.in.h:69
 msgid "Font design and packaging"
 msgstr "??????????????? ????????????????????? ??????????????? ???????????????????????????"
 
-#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:72
+#: ../comps-f11.xml.in.h:65 ../comps-f12.xml.in.h:72 ../comps-f13.xml.in.h:73
 msgid "Frisian Support"
 msgstr "??????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:73
+#: ../comps-f11.xml.in.h:66 ../comps-f12.xml.in.h:73 ../comps-f13.xml.in.h:74
 msgid "Friulian Support"
 msgstr "?????????????????????????????? ??????????????????"
 
-#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:90
+#: ../comps-f11.xml.in.h:83 ../comps-f12.xml.in.h:90 ../comps-f13.xml.in.h:91
 msgid "Hiligaynon Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:96 ../comps-f12.xml.in.h:103
-#: ../comps-f13.xml.in.h:103
+#: ../comps-f13.xml.in.h:104
 msgid "Interlingua Support"
 msgstr "???????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
-#: ../comps-f13.xml.in.h:116
+#: ../comps-f13.xml.in.h:117
 msgid "Kazakh Support"
 msgstr "???????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
-#: ../comps-f13.xml.in.h:118
+#: ../comps-f13.xml.in.h:119
 msgid "Kinyarwanda Support"
 msgstr "???????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:126
-#: ../comps-f13.xml.in.h:126
+#: ../comps-f13.xml.in.h:127
 msgid "Latin Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
-#: ../comps-f13.xml.in.h:134
+#: ../comps-f13.xml.in.h:135
 msgid "Luxembourgish Support"
 msgstr "??????????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
-#: ../comps-f13.xml.in.h:139
+#: ../comps-f13.xml.in.h:140
 msgid "Malagasy Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:142
-#: ../comps-f13.xml.in.h:142
+#: ../comps-f13.xml.in.h:143
 msgid "Maltese Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:143
-#: ../comps-f13.xml.in.h:143
+#: ../comps-f13.xml.in.h:144
 msgid "Manx Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:146
-#: ../comps-f13.xml.in.h:146
+#: ../comps-f13.xml.in.h:147
 msgid "MinGW cross-compiler"
 msgstr "MinGW ??????????????????-?????????????????????"
 
 #: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:157
-#: ../comps-f13.xml.in.h:157
+#: ../comps-f13.xml.in.h:158
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:158
-#: ../comps-f13.xml.in.h:158
+#: ../comps-f13.xml.in.h:159
 msgid "Occitan Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:161
-#: ../comps-f13.xml.in.h:161
+#: ../comps-f13.xml.in.h:162
 msgid "Online Help and Documentation"
 msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????????????????"
 
 #: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
-#: ../comps-f13.xml.in.h:175
+#: ../comps-f13.xml.in.h:176
 msgid "Sanskrit Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
-#: ../comps-f13.xml.in.h:176
+#: ../comps-f13.xml.in.h:177
 msgid "Sardinian Support"
 msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
-#: ../comps-f13.xml.in.h:193
+#: ../comps-f13.xml.in.h:194
 msgid "Sugar Desktop Environment"
 msgstr "??????????????? ?????????????????????????????? ???????????????????????????"
 
 #: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
-#: ../comps-f13.xml.in.h:194
+#: ../comps-f13.xml.in.h:195
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1486,24 +1489,24 @@ msgstr ""
 "???????????????????????????????????? ??????????????????????????????, ??????????????? Fedora ????????????."
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
-#: ../comps-f13.xml.in.h:198
+#: ../comps-f13.xml.in.h:199
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "?????????????????????????????? CAML ??????????????????????????????????????? ??????????????? ??????????????? ?????????????????????????????? ?????????????????????????????? ??????????????????????????? ????????????????????????????????? ?????????????????????????????????."
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
-#: ../comps-f13.xml.in.h:200
+#: ../comps-f13.xml.in.h:201
 msgid "Swahili Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
-#: ../comps-f13.xml.in.h:208
+#: ../comps-f13.xml.in.h:209
 msgid "Tetum Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
-#: ../comps-f13.xml.in.h:235
+#: ../comps-f13.xml.in.h:237
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1512,12 +1515,12 @@ msgstr ""
 "????????????????????????????????? ????????????????????? ?????????????????????."
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
-#: ../comps-f13.xml.in.h:247
+#: ../comps-f13.xml.in.h:249
 msgid "Turkmen Support"
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
-#: ../comps-f13.xml.in.h:249
+#: ../comps-f13.xml.in.h:251
 msgid "Upper Sorbian Support"
 msgstr "?????????????????? ??????????????????????????? ??????????????????"
 
@@ -1541,23 +1544,23 @@ msgstr "?????????????????????????????? ?
 msgid "Books and Guides for Fedora users and developers"
 msgstr "Fedora ?????????????????????????????????????????? ??????????????? ???????????????????????????????????????????????? ?????????????????????????????? ??????????????? ??????????????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:38
 msgid "Critical Path (Base)"
 msgstr "??????????????????????????? ???????????? (????????????)"
 
-#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:39
 msgid "Critical Path (GNOME)"
 msgstr "??????????????????????????? ???????????? (GNOME)"
 
-#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:51
 msgid "Directory Server"
 msgstr "??????????????????????????? ??????????????????"
 
-#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:89
 msgid "Haskell"
 msgstr "????????????????????????"
 
-#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:124
 msgid ""
 "LXDE is a lightweight X11 desktop environment designed for computers with "
 "low hardware specifications like netbooks, mobile devices or older computers."
@@ -1565,27 +1568,35 @@ msgstr ""
 "?????????????????????????????????, ?????????????????? ??????????????????????????? ???????????? ????????? ?????????????????????????????????????????? ?????????????????? ?????????????????????????????? ??????????????????????????? ?????????????????????????????? ??????????????? "
 "????????????????????????????????????????????? ????????????????????????????????? X11 ?????????????????????????????? ?????????????????????????????????????????? LXDE."
 
-#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:137
 msgid "Machine and user identity servers."
 msgstr "??????????????? ??????????????? ????????????????????????????????? ??????????????????????????? ?????????????????????."
 
-#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:148
 msgid "Moblin Desktop Environment"
 msgstr "???????????????????????? ?????????????????????????????? ??????????????????????????????????????????"
 
-#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:149
 msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
 msgstr "???????????????????????? ?????????????????? NetBook/NetTop/MID ????????????????????? ??????????????? ?????????????????????????????? ??????????????????????????????????????????."
 
+#: ../comps-f13.xml.in.h:35
+msgid "Content"
+msgstr "???????????????"
+
+#: ../comps-f13.xml.in.h:210
+msgid "Text and other Free content."
+msgstr "????????????????????? ??????????????? ???????????? ??????????????? ???????????????."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "???????????????????????? ?????????????????????????????? ??????????????? ????????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:15
 msgid "Dialup Networking Support"
 msgstr "??????????????? ???????????????????????????????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:26
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1593,7 +1604,7 @@ msgstr ""
 "GNOME ????????????????????????????????? graphical user interface. ????????? ????????????????????????, ???????????????, ??????????????????????????? ?????????????????? ??????????????? "
 "????????????????????? ??????????????????????????????????????? ???????????????????????????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:38
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1602,7 +1613,7 @@ msgstr ""
 "???????????? ??????????????????????????? ???????????????????????????.KDE ????????????????????????????????? ?????????????????????????????? ????????????????????? ????????????????????????????????? ????????????. ????????? ????????????, "
 "??????????????????????????? ????????????, ??????????????? "
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:47
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1610,11 +1621,11 @@ msgstr ""
 "???????????????????????????????????? ??????????????????????????????????????? ?????????????????? ?????????????????? ????????????????????? ?????????????????????????????? ??????????????? ????????????????????? ????????????????????????????????? "
 "????????????????????????????????????????????????. ????????? Emacs ??????????????? vi?????? ?????????????????????????????????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:51
 msgid "The XEmacs text editor."
 msgstr "XEmacs ????????? ?????????????????????."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:55
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1622,27 +1633,27 @@ msgstr ""
 "??? ???????????????????????? DocBook ??????????????????????????? ??????????????? ?????????????????? HTML, PDF, Postscript, ??????????????? ??????????????????.????????????????????????????????? "
 "??????????????????????????? ????????????????????????????????????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:65
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "??? ??????????????? ????????????????????? ??????????????????????????? ??????????????? ?????????????????????????????? ?????????????????? ??????????????? ??????????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:69
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:70
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:80
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "???????????? ????????????????????????????????? ??? ??????????????? ??????????????????????????? ??????????????? ????????????????????? ??????????????? ????????????."
 



From twaugh at fedoraproject.org  Tue Dec  8 11:16:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:16:16 +0000 (UTC)
Subject: rpms/cups/F-11 cups-negative-snmp-string-length.patch,1.1,1.2
Message-ID: <20091208111616.4FAD911C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22734

Modified Files:
	cups-negative-snmp-string-length.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to handle negative SNMP string lengths (rev 8896).


cups-negative-snmp-string-length.patch:
 network.c       |    8 ++++++--
 snmp-supplies.c |    2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: cups-negative-snmp-string-length.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-negative-snmp-string-length.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-negative-snmp-string-length.patch	8 Dec 2009 11:04:57 -0000	1.1
+++ cups-negative-snmp-string-length.patch	8 Dec 2009 11:16:15 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/backend/network.c.negative-snmp-string-length cups-1.4.2/backend/network.c
 --- cups-1.4.2/backend/network.c.negative-snmp-string-length	2009-08-31 19:45:43.000000000 +0100
-+++ cups-1.4.2/backend/network.c	2009-12-08 11:03:05.728413423 +0000
++++ cups-1.4.2/backend/network.c	2009-12-08 11:14:45.010363459 +0000
 @@ -170,9 +170,13 @@ backendNetworkSideCB(
  
  	        case CUPS_ASN1_BIT_STRING :
@@ -17,3 +17,15 @@ diff -up cups-1.4.2/backend/network.c.ne
  
  		    memcpy(dataptr, packet.object_value.string.bytes, i);
  
+diff -up cups-1.4.2/backend/snmp-supplies.c.negative-snmp-string-length cups-1.4.2/backend/snmp-supplies.c
+--- cups-1.4.2/backend/snmp-supplies.c.negative-snmp-string-length	2009-08-31 17:34:06.000000000 +0100
++++ cups-1.4.2/backend/snmp-supplies.c	2009-12-08 11:15:05.505362685 +0000
+@@ -232,6 +232,8 @@ backendSNMPSupplies(
+     if (packet.object_value.string.num_bytes == 2)
+       new_state = (packet.object_value.string.bytes[0] << 8) |
+ 		  packet.object_value.string.bytes[1];
++    else if (packet.object_value.string.num_bytes == 1)
++      new_state = (packet.object_value.string.bytes[0] << 8);
+     else
+       new_state = 0;
+ 



From twaugh at fedoraproject.org  Tue Dec  8 11:16:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:16:32 +0000 (UTC)
Subject: rpms/cups/F-12 cups-negative-snmp-string-length.patch,1.1,1.2
Message-ID: <20091208111632.5E87F11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22872

Modified Files:
	cups-negative-snmp-string-length.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to handle negative SNMP string lengths (rev 8896).


cups-negative-snmp-string-length.patch:
 network.c       |    8 ++++++--
 snmp-supplies.c |    2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: cups-negative-snmp-string-length.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-negative-snmp-string-length.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-negative-snmp-string-length.patch	8 Dec 2009 11:05:54 -0000	1.1
+++ cups-negative-snmp-string-length.patch	8 Dec 2009 11:16:32 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/backend/network.c.negative-snmp-string-length cups-1.4.2/backend/network.c
 --- cups-1.4.2/backend/network.c.negative-snmp-string-length	2009-08-31 19:45:43.000000000 +0100
-+++ cups-1.4.2/backend/network.c	2009-12-08 11:03:05.728413423 +0000
++++ cups-1.4.2/backend/network.c	2009-12-08 11:14:45.010363459 +0000
 @@ -170,9 +170,13 @@ backendNetworkSideCB(
  
  	        case CUPS_ASN1_BIT_STRING :
@@ -17,3 +17,15 @@ diff -up cups-1.4.2/backend/network.c.ne
  
  		    memcpy(dataptr, packet.object_value.string.bytes, i);
  
+diff -up cups-1.4.2/backend/snmp-supplies.c.negative-snmp-string-length cups-1.4.2/backend/snmp-supplies.c
+--- cups-1.4.2/backend/snmp-supplies.c.negative-snmp-string-length	2009-08-31 17:34:06.000000000 +0100
++++ cups-1.4.2/backend/snmp-supplies.c	2009-12-08 11:15:05.505362685 +0000
+@@ -232,6 +232,8 @@ backendSNMPSupplies(
+     if (packet.object_value.string.num_bytes == 2)
+       new_state = (packet.object_value.string.bytes[0] << 8) |
+ 		  packet.object_value.string.bytes[1];
++    else if (packet.object_value.string.num_bytes == 1)
++      new_state = (packet.object_value.string.bytes[0] << 8);
+     else
+       new_state = 0;
+ 



From twaugh at fedoraproject.org  Tue Dec  8 11:16:47 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:16:47 +0000 (UTC)
Subject: rpms/cups/devel cups-negative-snmp-string-length.patch,1.1,1.2
Message-ID: <20091208111647.9503711C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22950

Modified Files:
	cups-negative-snmp-string-length.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to handle negative SNMP string lengths (rev 8896).


cups-negative-snmp-string-length.patch:
 network.c       |    8 ++++++--
 snmp-supplies.c |    2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: cups-negative-snmp-string-length.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-negative-snmp-string-length.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-negative-snmp-string-length.patch	8 Dec 2009 11:06:55 -0000	1.1
+++ cups-negative-snmp-string-length.patch	8 Dec 2009 11:16:47 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/backend/network.c.negative-snmp-string-length cups-1.4.2/backend/network.c
 --- cups-1.4.2/backend/network.c.negative-snmp-string-length	2009-08-31 19:45:43.000000000 +0100
-+++ cups-1.4.2/backend/network.c	2009-12-08 11:03:05.728413423 +0000
++++ cups-1.4.2/backend/network.c	2009-12-08 11:14:45.010363459 +0000
 @@ -170,9 +170,13 @@ backendNetworkSideCB(
  
  	        case CUPS_ASN1_BIT_STRING :
@@ -17,3 +17,15 @@ diff -up cups-1.4.2/backend/network.c.ne
  
  		    memcpy(dataptr, packet.object_value.string.bytes, i);
  
+diff -up cups-1.4.2/backend/snmp-supplies.c.negative-snmp-string-length cups-1.4.2/backend/snmp-supplies.c
+--- cups-1.4.2/backend/snmp-supplies.c.negative-snmp-string-length	2009-08-31 17:34:06.000000000 +0100
++++ cups-1.4.2/backend/snmp-supplies.c	2009-12-08 11:15:05.505362685 +0000
+@@ -232,6 +232,8 @@ backendSNMPSupplies(
+     if (packet.object_value.string.num_bytes == 2)
+       new_state = (packet.object_value.string.bytes[0] << 8) |
+ 		  packet.object_value.string.bytes[1];
++    else if (packet.object_value.string.num_bytes == 1)
++      new_state = (packet.object_value.string.bytes[0] << 8);
+     else
+       new_state = 0;
+ 



From rhughes at fedoraproject.org  Tue Dec  8 11:16:59 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue,  8 Dec 2009 11:16:59 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.69,
	1.70 gnome-power-manager.spec, 1.177, 1.178 sources, 1.71,
	1.72 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch, 
	1.1, NONE 0001-Use-gnome-settings-daemon-popup-code.patch, 1.1,
	NONE 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch, 
	1.1, NONE hibernate-button.patch, 1.1, NONE
Message-ID: <20091208111659.E840B11C0264@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23041

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Removed Files:
	0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch 
	0001-Use-gnome-settings-daemon-popup-code.patch 
	0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch 
	hibernate-button.patch 
Log Message:
* Tue Dec 08 2009 Richard Hughes  <rhughes at redhat.com> - 2.29.1-1
- Update to 2.29.1
- Remove upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	21 Sep 2009 12:43:33 -0000	1.69
+++ .cvsignore	8 Dec 2009 11:16:59 -0000	1.70
@@ -1 +1 @@
-gnome-power-manager-2.28.0.tar.bz2
+gnome-power-manager-2.29.1.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- gnome-power-manager.spec	7 Dec 2009 14:09:18 -0000	1.177
+++ gnome-power-manager.spec	8 Dec 2009 11:16:59 -0000	1.178
@@ -3,28 +3,17 @@
 
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.28.1
-Release: 5%{?dist}
+Version: 2.29.1
+Release: 1%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.bz2
-#Source:   http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-power-manager/2.29/gnome-power-manager-%{version}.tar.gz
+#Source:   http://download.gnome.org/sources/gnome-power-manager/2.29/%{name}-%{version}-%{?alphatag}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
-# Fedora-specific backport, already same UI in git master
-Patch1: 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch
-
-# Fedora-specific backport, already same UI in git master
-Patch2: 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=594664
-%define		_default_patch_fuzz 2
-BuildRequires: autoconf automake libtool
-Patch3: 0001-Use-gnome-settings-daemon-popup-code.patch
-
 BuildRequires: libwnck-devel
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: libnotify-devel
@@ -70,10 +59,6 @@ Extra GNOME power management application
 %prep
 %setup -q
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
-%patch1 -p1 -b .remove-help
-%patch2 -p1 -b .uni-menu
-%patch3 -p1 -b .osd
-autoreconf -i
 
 %build
 %configure \
@@ -193,6 +178,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Tue Dec 08 2009 Richard Hughes  <rhughes at redhat.com> - 2.29.1-1
+- Update to 2.29.1
+- Remove upstreamed patches
+
 * Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
 - Remove HAL dependency
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	2 Nov 2009 05:09:33 -0000	1.71
+++ sources	8 Dec 2009 11:16:59 -0000	1.72
@@ -1 +1 @@
-552945dd50671cdf9cd11ba4bd544bfa  gnome-power-manager-2.28.1.tar.bz2
+9389bf6e598a19928e644b0ac4bceded  gnome-power-manager-2.29.1.tar.gz


--- 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch DELETED ---


--- 0001-Use-gnome-settings-daemon-popup-code.patch DELETED ---


--- 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch DELETED ---


--- hibernate-button.patch DELETED ---



From twaugh at fedoraproject.org  Tue Dec  8 11:24:12 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:24:12 +0000 (UTC)
Subject: rpms/cups/F-11 cups-media-empty-warning.patch, NONE, 1.1 cups.spec, 
	1.548, 1.549
Message-ID: <20091208112412.3683211C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25285

Modified Files:
	cups.spec 
Added Files:
	cups-media-empty-warning.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to stop the network backends incorrectly clearing
  the media-empty-warning state (rev 8896).


cups-media-empty-warning.patch:
 backend-private.h |    3 ++-
 ipp.c             |    2 +-
 lpd.c             |    3 ++-
 parallel.c        |    2 +-
 runloop.c         |   11 ++++++-----
 socket.c          |    2 +-
 usb-unix.c        |    4 ++--
 7 files changed, 15 insertions(+), 12 deletions(-)

--- NEW FILE cups-media-empty-warning.patch ---
diff -up cups-1.4.2/backend/backend-private.h.media-empty-warning cups-1.4.2/backend/backend-private.h
--- cups-1.4.2/backend/backend-private.h.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/backend-private.h	2009-12-08 11:22:27.859488572 +0000
@@ -280,7 +280,8 @@ extern int		backendNetworkSideCB(int pri
 			                     int snmp_fd, http_addr_t *addr,
 					     int use_bc);
 extern ssize_t		backendRunLoop(int print_fd, int device_fd, int snmp_fd,
-			               http_addr_t *addr, int use_bc,
+			               http_addr_t *addr, int use_bc, 
+			               int update_state, 
 				       int (*side_cb)(int print_fd,
 				                      int device_fd,
 						      int snmp_fd,
diff -up cups-1.4.2/backend/ipp.c.media-empty-warning cups-1.4.2/backend/ipp.c
--- cups-1.4.2/backend/ipp.c.media-empty-warning	2009-12-08 11:22:12.388488617 +0000
+++ cups-1.4.2/backend/ipp.c	2009-12-08 11:22:27.860488582 +0000
@@ -498,7 +498,7 @@ main(int  argc,				/* I - Number of comm
 
     _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
 
-    tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0,
+    tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
                             backendNetworkSideCB);
 
     if (snmp_fd >= 0)
diff -up cups-1.4.2/backend/lpd.c.media-empty-warning cups-1.4.2/backend/lpd.c
--- cups-1.4.2/backend/lpd.c.media-empty-warning	2009-06-26 19:26:36.000000000 +0100
+++ cups-1.4.2/backend/lpd.c	2009-12-08 11:22:27.861488697 +0000
@@ -447,7 +447,8 @@ main(int  argc,				/* I - Number of comm
 
     _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
 
-    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, backendNetworkSideCB);
+    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, 
+		   backendNetworkSideCB);
 
     if (snmp_fd >= 0)
       _cupsSNMPClose(snmp_fd);
diff -up cups-1.4.2/backend/parallel.c.media-empty-warning cups-1.4.2/backend/parallel.c
--- cups-1.4.2/backend/parallel.c.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/parallel.c	2009-12-08 11:22:27.862488185 +0000
@@ -284,7 +284,7 @@ main(int  argc,				/* I - Number of comm
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
 
     if (print_fd != 0 && tbytes >= 0)
       _cupsLangPrintf(stderr,
diff -up cups-1.4.2/backend/runloop.c.media-empty-warning cups-1.4.2/backend/runloop.c
--- cups-1.4.2/backend/runloop.c.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/runloop.c	2009-12-08 11:22:27.862488185 +0000
@@ -147,6 +147,7 @@ backendRunLoop(
     int         snmp_fd,		/* I - SNMP socket or -1 if none */
     http_addr_t *addr,			/* I - Address of device */
     int         use_bc,			/* I - Use back-channel? */
+    int         update_state,		/* I - Update printer-state-reasons? */
     int         (*side_cb)(int, int, int, http_addr_t *, int))
 					/* I - Side-channel callback */
 {
@@ -245,7 +246,7 @@ backendRunLoop(
 	* Pause printing to clear any pending errors...
 	*/
 
-	if (errno == ENXIO && offline != 1)
+	if (errno == ENXIO && offline != 1 && update_state)
 	{
 	  fputs("STATE: +offline-report\n", stderr);
 	  _cupsLangPuts(stderr, _("INFO: Printer is currently offline.\n"));
@@ -351,7 +352,7 @@ backendRunLoop(
 
         if (errno == ENOSPC)
 	{
-	  if (paperout != 1)
+	  if (paperout != 1 && update_state)
 	  {
 	    fputs("STATE: +media-empty-warning\n", stderr);
 	    _cupsLangPuts(stderr, _("ERROR: Out of paper!\n"));
@@ -360,7 +361,7 @@ backendRunLoop(
         }
 	else if (errno == ENXIO)
 	{
-	  if (offline != 1)
+	  if (offline != 1 && update_state)
 	  {
 	    fputs("STATE: +offline-report\n", stderr);
 	    _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
@@ -376,13 +377,13 @@ backendRunLoop(
       }
       else
       {
-        if (paperout)
+        if (paperout && update_state)
 	{
 	  fputs("STATE: -media-empty-warning\n", stderr);
 	  paperout = 0;
 	}
 
-	if (offline)
+	if (offline && update_state)
 	{
 	  fputs("STATE: -offline-report\n", stderr);
 	  _cupsLangPuts(stderr, _("INFO: Printer is now online.\n"));
diff -up cups-1.4.2/backend/socket.c.media-empty-warning cups-1.4.2/backend/socket.c
--- cups-1.4.2/backend/socket.c.media-empty-warning	2009-06-12 05:02:45.000000000 +0100
+++ cups-1.4.2/backend/socket.c	2009-12-08 11:22:27.863488075 +0000
@@ -393,7 +393,7 @@ main(int  argc,				/* I - Number of comm
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1,
+    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1, 0, 
                             backendNetworkSideCB);
 
     if (print_fd != 0 && tbytes >= 0)
diff -up cups-1.4.2/backend/usb-unix.c.media-empty-warning cups-1.4.2/backend/usb-unix.c
--- cups-1.4.2/backend/usb-unix.c.media-empty-warning	2009-12-08 11:22:12.445487428 +0000
+++ cups-1.4.2/backend/usb-unix.c	2009-12-08 11:22:27.864488180 +0000
@@ -218,10 +218,10 @@ print_device(const char *uri,		/* I - De
     * select() or poll(), so we can't support the sidechannel either...
     */
 
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, NULL);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL);
 
 #else
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
 #endif /* __sun */
 
     if (print_fd != 0 && tbytes >= 0)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -p -r1.548 -r1.549
--- cups.spec	8 Dec 2009 11:10:45 -0000	1.548
+++ cups.spec	8 Dec 2009 11:24:11 -0000	1.549
@@ -67,6 +67,7 @@ Patch53: cups-str3440.patch
 Patch54: cups-str3442.patch
 Patch55: cups-negative-snmp-string-length.patch
 Patch56: cups-sidechannel-intrs.patch
+Patch57: cups-media-empty-warning.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -238,6 +239,7 @@ module. 
 %patch54 -p1 -b .str3442
 %patch55 -p1 -b .negative-snmp-string-length
 %patch56 -p1 -b .sidechannel-intrs
+%patch57 -p1 -b .media-empty-warning
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -530,6 +532,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to stop the network backends incorrectly clearing
+  the media-empty-warning state (rev 8896).
 - Use upstream patch to fix interrupt handling in the side-channel
   APIs (rev 8896).
 - Use upstream patch to handle negative SNMP string lengths (rev 8896).



From twaugh at fedoraproject.org  Tue Dec  8 11:25:18 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:25:18 +0000 (UTC)
Subject: rpms/cups/F-12 cups-media-empty-warning.patch, NONE, 1.1 cups.spec, 
	1.555, 1.556
Message-ID: <20091208112518.6DE0D11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25708

Modified Files:
	cups.spec 
Added Files:
	cups-media-empty-warning.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to stop the network backends incorrectly clearing
  the media-empty-warning state (rev 8896).


cups-media-empty-warning.patch:
 backend-private.h |    3 ++-
 ipp.c             |    2 +-
 lpd.c             |    3 ++-
 parallel.c        |    2 +-
 runloop.c         |   11 ++++++-----
 socket.c          |    2 +-
 usb-unix.c        |    4 ++--
 7 files changed, 15 insertions(+), 12 deletions(-)

--- NEW FILE cups-media-empty-warning.patch ---
diff -up cups-1.4.2/backend/backend-private.h.media-empty-warning cups-1.4.2/backend/backend-private.h
--- cups-1.4.2/backend/backend-private.h.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/backend-private.h	2009-12-08 11:22:27.859488572 +0000
@@ -280,7 +280,8 @@ extern int		backendNetworkSideCB(int pri
 			                     int snmp_fd, http_addr_t *addr,
 					     int use_bc);
 extern ssize_t		backendRunLoop(int print_fd, int device_fd, int snmp_fd,
-			               http_addr_t *addr, int use_bc,
+			               http_addr_t *addr, int use_bc, 
+			               int update_state, 
 				       int (*side_cb)(int print_fd,
 				                      int device_fd,
 						      int snmp_fd,
diff -up cups-1.4.2/backend/ipp.c.media-empty-warning cups-1.4.2/backend/ipp.c
--- cups-1.4.2/backend/ipp.c.media-empty-warning	2009-12-08 11:22:12.388488617 +0000
+++ cups-1.4.2/backend/ipp.c	2009-12-08 11:22:27.860488582 +0000
@@ -498,7 +498,7 @@ main(int  argc,				/* I - Number of comm
 
     _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
 
-    tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0,
+    tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
                             backendNetworkSideCB);
 
     if (snmp_fd >= 0)
diff -up cups-1.4.2/backend/lpd.c.media-empty-warning cups-1.4.2/backend/lpd.c
--- cups-1.4.2/backend/lpd.c.media-empty-warning	2009-06-26 19:26:36.000000000 +0100
+++ cups-1.4.2/backend/lpd.c	2009-12-08 11:22:27.861488697 +0000
@@ -447,7 +447,8 @@ main(int  argc,				/* I - Number of comm
 
     _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
 
-    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, backendNetworkSideCB);
+    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, 
+		   backendNetworkSideCB);
 
     if (snmp_fd >= 0)
       _cupsSNMPClose(snmp_fd);
diff -up cups-1.4.2/backend/parallel.c.media-empty-warning cups-1.4.2/backend/parallel.c
--- cups-1.4.2/backend/parallel.c.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/parallel.c	2009-12-08 11:22:27.862488185 +0000
@@ -284,7 +284,7 @@ main(int  argc,				/* I - Number of comm
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
 
     if (print_fd != 0 && tbytes >= 0)
       _cupsLangPrintf(stderr,
diff -up cups-1.4.2/backend/runloop.c.media-empty-warning cups-1.4.2/backend/runloop.c
--- cups-1.4.2/backend/runloop.c.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/runloop.c	2009-12-08 11:22:27.862488185 +0000
@@ -147,6 +147,7 @@ backendRunLoop(
     int         snmp_fd,		/* I - SNMP socket or -1 if none */
     http_addr_t *addr,			/* I - Address of device */
     int         use_bc,			/* I - Use back-channel? */
+    int         update_state,		/* I - Update printer-state-reasons? */
     int         (*side_cb)(int, int, int, http_addr_t *, int))
 					/* I - Side-channel callback */
 {
@@ -245,7 +246,7 @@ backendRunLoop(
 	* Pause printing to clear any pending errors...
 	*/
 
-	if (errno == ENXIO && offline != 1)
+	if (errno == ENXIO && offline != 1 && update_state)
 	{
 	  fputs("STATE: +offline-report\n", stderr);
 	  _cupsLangPuts(stderr, _("INFO: Printer is currently offline.\n"));
@@ -351,7 +352,7 @@ backendRunLoop(
 
         if (errno == ENOSPC)
 	{
-	  if (paperout != 1)
+	  if (paperout != 1 && update_state)
 	  {
 	    fputs("STATE: +media-empty-warning\n", stderr);
 	    _cupsLangPuts(stderr, _("ERROR: Out of paper!\n"));
@@ -360,7 +361,7 @@ backendRunLoop(
         }
 	else if (errno == ENXIO)
 	{
-	  if (offline != 1)
+	  if (offline != 1 && update_state)
 	  {
 	    fputs("STATE: +offline-report\n", stderr);
 	    _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
@@ -376,13 +377,13 @@ backendRunLoop(
       }
       else
       {
-        if (paperout)
+        if (paperout && update_state)
 	{
 	  fputs("STATE: -media-empty-warning\n", stderr);
 	  paperout = 0;
 	}
 
-	if (offline)
+	if (offline && update_state)
 	{
 	  fputs("STATE: -offline-report\n", stderr);
 	  _cupsLangPuts(stderr, _("INFO: Printer is now online.\n"));
diff -up cups-1.4.2/backend/socket.c.media-empty-warning cups-1.4.2/backend/socket.c
--- cups-1.4.2/backend/socket.c.media-empty-warning	2009-06-12 05:02:45.000000000 +0100
+++ cups-1.4.2/backend/socket.c	2009-12-08 11:22:27.863488075 +0000
@@ -393,7 +393,7 @@ main(int  argc,				/* I - Number of comm
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1,
+    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1, 0, 
                             backendNetworkSideCB);
 
     if (print_fd != 0 && tbytes >= 0)
diff -up cups-1.4.2/backend/usb-unix.c.media-empty-warning cups-1.4.2/backend/usb-unix.c
--- cups-1.4.2/backend/usb-unix.c.media-empty-warning	2009-12-08 11:22:12.445487428 +0000
+++ cups-1.4.2/backend/usb-unix.c	2009-12-08 11:22:27.864488180 +0000
@@ -218,10 +218,10 @@ print_device(const char *uri,		/* I - De
     * select() or poll(), so we can't support the sidechannel either...
     */
 
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, NULL);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL);
 
 #else
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
 #endif /* __sun */
 
     if (print_fd != 0 && tbytes >= 0)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -p -r1.555 -r1.556
--- cups.spec	8 Dec 2009 11:12:00 -0000	1.555
+++ cups.spec	8 Dec 2009 11:25:18 -0000	1.556
@@ -66,6 +66,7 @@ Patch39: cups-str3440.patch
 Patch40: cups-str3442.patch
 Patch41: cups-negative-snmp-string-length.patch
 Patch42: cups-sidechannel-intrs.patch
+Patch43: cups-media-empty-warning.patch
 
 Patch100: cups-lspp.patch
 
@@ -237,6 +238,7 @@ module. 
 %patch40 -p1 -b .str3442
 %patch41 -p1 -b .negative-snmp-string-length
 %patch42 -p1 -b .sidechannel-intrs
+%patch43 -p1 -b .media-empty-warning
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -536,6 +538,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to stop the network backends incorrectly clearing
+  the media-empty-warning state (rev 8896).
 - Use upstream patch to fix interrupt handling in the side-channel
   APIs (rev 8896).
 - Use upstream patch to handle negative SNMP string lengths (rev 8896).



From twaugh at fedoraproject.org  Tue Dec  8 11:25:50 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 11:25:50 +0000 (UTC)
Subject: rpms/cups/devel cups-media-empty-warning.patch, NONE, 1.1 cups.spec,
	1.557, 1.558
Message-ID: <20091208112550.7CB8411C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25931

Modified Files:
	cups.spec 
Added Files:
	cups-media-empty-warning.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Use upstream patch to stop the network backends incorrectly clearing
  the media-empty-warning state (rev 8896).


cups-media-empty-warning.patch:
 backend-private.h |    3 ++-
 ipp.c             |    2 +-
 lpd.c             |    3 ++-
 parallel.c        |    2 +-
 runloop.c         |   11 ++++++-----
 socket.c          |    2 +-
 usb-unix.c        |    4 ++--
 7 files changed, 15 insertions(+), 12 deletions(-)

--- NEW FILE cups-media-empty-warning.patch ---
diff -up cups-1.4.2/backend/backend-private.h.media-empty-warning cups-1.4.2/backend/backend-private.h
--- cups-1.4.2/backend/backend-private.h.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/backend-private.h	2009-12-08 11:22:27.859488572 +0000
@@ -280,7 +280,8 @@ extern int		backendNetworkSideCB(int pri
 			                     int snmp_fd, http_addr_t *addr,
 					     int use_bc);
 extern ssize_t		backendRunLoop(int print_fd, int device_fd, int snmp_fd,
-			               http_addr_t *addr, int use_bc,
+			               http_addr_t *addr, int use_bc, 
+			               int update_state, 
 				       int (*side_cb)(int print_fd,
 				                      int device_fd,
 						      int snmp_fd,
diff -up cups-1.4.2/backend/ipp.c.media-empty-warning cups-1.4.2/backend/ipp.c
--- cups-1.4.2/backend/ipp.c.media-empty-warning	2009-12-08 11:22:12.388488617 +0000
+++ cups-1.4.2/backend/ipp.c	2009-12-08 11:22:27.860488582 +0000
@@ -498,7 +498,7 @@ main(int  argc,				/* I - Number of comm
 
     _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
 
-    tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0,
+    tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
                             backendNetworkSideCB);
 
     if (snmp_fd >= 0)
diff -up cups-1.4.2/backend/lpd.c.media-empty-warning cups-1.4.2/backend/lpd.c
--- cups-1.4.2/backend/lpd.c.media-empty-warning	2009-06-26 19:26:36.000000000 +0100
+++ cups-1.4.2/backend/lpd.c	2009-12-08 11:22:27.861488697 +0000
@@ -447,7 +447,8 @@ main(int  argc,				/* I - Number of comm
 
     _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
 
-    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, backendNetworkSideCB);
+    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, 
+		   backendNetworkSideCB);
 
     if (snmp_fd >= 0)
       _cupsSNMPClose(snmp_fd);
diff -up cups-1.4.2/backend/parallel.c.media-empty-warning cups-1.4.2/backend/parallel.c
--- cups-1.4.2/backend/parallel.c.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/parallel.c	2009-12-08 11:22:27.862488185 +0000
@@ -284,7 +284,7 @@ main(int  argc,				/* I - Number of comm
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
 
     if (print_fd != 0 && tbytes >= 0)
       _cupsLangPrintf(stderr,
diff -up cups-1.4.2/backend/runloop.c.media-empty-warning cups-1.4.2/backend/runloop.c
--- cups-1.4.2/backend/runloop.c.media-empty-warning	2009-08-31 19:45:43.000000000 +0100
+++ cups-1.4.2/backend/runloop.c	2009-12-08 11:22:27.862488185 +0000
@@ -147,6 +147,7 @@ backendRunLoop(
     int         snmp_fd,		/* I - SNMP socket or -1 if none */
     http_addr_t *addr,			/* I - Address of device */
     int         use_bc,			/* I - Use back-channel? */
+    int         update_state,		/* I - Update printer-state-reasons? */
     int         (*side_cb)(int, int, int, http_addr_t *, int))
 					/* I - Side-channel callback */
 {
@@ -245,7 +246,7 @@ backendRunLoop(
 	* Pause printing to clear any pending errors...
 	*/
 
-	if (errno == ENXIO && offline != 1)
+	if (errno == ENXIO && offline != 1 && update_state)
 	{
 	  fputs("STATE: +offline-report\n", stderr);
 	  _cupsLangPuts(stderr, _("INFO: Printer is currently offline.\n"));
@@ -351,7 +352,7 @@ backendRunLoop(
 
         if (errno == ENOSPC)
 	{
-	  if (paperout != 1)
+	  if (paperout != 1 && update_state)
 	  {
 	    fputs("STATE: +media-empty-warning\n", stderr);
 	    _cupsLangPuts(stderr, _("ERROR: Out of paper!\n"));
@@ -360,7 +361,7 @@ backendRunLoop(
         }
 	else if (errno == ENXIO)
 	{
-	  if (offline != 1)
+	  if (offline != 1 && update_state)
 	  {
 	    fputs("STATE: +offline-report\n", stderr);
 	    _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
@@ -376,13 +377,13 @@ backendRunLoop(
       }
       else
       {
-        if (paperout)
+        if (paperout && update_state)
 	{
 	  fputs("STATE: -media-empty-warning\n", stderr);
 	  paperout = 0;
 	}
 
-	if (offline)
+	if (offline && update_state)
 	{
 	  fputs("STATE: -offline-report\n", stderr);
 	  _cupsLangPuts(stderr, _("INFO: Printer is now online.\n"));
diff -up cups-1.4.2/backend/socket.c.media-empty-warning cups-1.4.2/backend/socket.c
--- cups-1.4.2/backend/socket.c.media-empty-warning	2009-06-12 05:02:45.000000000 +0100
+++ cups-1.4.2/backend/socket.c	2009-12-08 11:22:27.863488075 +0000
@@ -393,7 +393,7 @@ main(int  argc,				/* I - Number of comm
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1,
+    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1, 0, 
                             backendNetworkSideCB);
 
     if (print_fd != 0 && tbytes >= 0)
diff -up cups-1.4.2/backend/usb-unix.c.media-empty-warning cups-1.4.2/backend/usb-unix.c
--- cups-1.4.2/backend/usb-unix.c.media-empty-warning	2009-12-08 11:22:12.445487428 +0000
+++ cups-1.4.2/backend/usb-unix.c	2009-12-08 11:22:27.864488180 +0000
@@ -218,10 +218,10 @@ print_device(const char *uri,		/* I - De
     * select() or poll(), so we can't support the sidechannel either...
     */
 
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, NULL);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL);
 
 #else
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
 #endif /* __sun */
 
     if (print_fd != 0 && tbytes >= 0)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -p -r1.557 -r1.558
--- cups.spec	8 Dec 2009 11:13:07 -0000	1.557
+++ cups.spec	8 Dec 2009 11:25:50 -0000	1.558
@@ -64,6 +64,7 @@ Patch39: cups-str3440.patch
 Patch40: cups-str3442.patch
 Patch41: cups-negative-snmp-string-length.patch
 Patch42: cups-sidechannel-intrs.patch
+Patch43: cups-media-empty-warning.patch
 
 Patch100: cups-lspp.patch
 
@@ -235,6 +236,7 @@ module. 
 %patch40 -p1 -b .str3442
 %patch41 -p1 -b .negative-snmp-string-length
 %patch42 -p1 -b .sidechannel-intrs
+%patch43 -p1 -b .media-empty-warning
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -526,6 +528,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Use upstream patch to stop the network backends incorrectly clearing
+  the media-empty-warning state (rev 8896).
 - Use upstream patch to fix interrupt handling in the side-channel
   APIs (rev 8896).
 - Use upstream patch to handle negative SNMP string lengths (rev 8896).



From musuruan at fedoraproject.org  Tue Dec  8 11:46:03 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Tue,  8 Dec 2009 11:46:03 +0000 (UTC)
Subject: File genesis-0.4.2.1.tar.gz uploaded to lookaside cache by musuruan
Message-ID: <20091208114603.114CD10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for genesis:

bd4024504b0fe3903004e8b8cae7c0df  genesis-0.4.2.1.tar.gz



From musuruan at fedoraproject.org  Tue Dec  8 11:51:25 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Tue,  8 Dec 2009 11:51:25 +0000 (UTC)
Subject: rpms/genesis/devel genesis.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091208115125.5FE0111C0264@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/genesis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32179/devel

Modified Files:
	.cvsignore sources 
Added Files:
	genesis.spec import.log 
Log Message:
First import



--- NEW FILE genesis.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           genesis
Version:        0.4.2.1
Release:        3%{?dist}
Summary:        Graphical frontend to SyncEvolution
Summary(de):    Grafisches Frontend f?r SyncEvolution
Summary(it):    Frontend grafico per SyncEvolution

Group:          Applications/Productivity
# The icon used by Genesis Sync is taken from the Tango Project
# It is authored by Jakub Steiner and released under the CC-BY-SA Licence
License:        GPLv3 and CC-BY-SA
URL:            https://launchpad.net/genesis-sync/
Source0:        http://launchpad.net/genesis-sync/trunk/0.4.2/+download/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme
Requires:       python
Requires:       pygtk2
Requires:       notify-python
Requires:       dbus-python
Requires:       pyxdg
Requires:       gnome-python2-evolution
Requires:       python-configobj
Requires:       syncevolution


%description
Genesis is a graphical frontend for SyncEvolution written in PyGTK. It makes 
SyncEvolution accessible without having to use a command line and provides 
graphical feedback of transaction results.


%description -l de
Genesis ist ein grafisches Frontend f?r SyncEvolution welches in PyGTK
geschrieben ist.
Es macht einen Zugriff auf SyncEvolution m?glich, ohne die Kommandozeile nutzen
zu m?ssen und gibt grafisch R?ckmeldung ?ber Transaktionen.


%description -l it
Genesis ? un frontend grafico per SyncEvolution scritto in PyGTK. Rende
accessibile SyncEvolution senza dover usare la riga di comando e fornisce
un'indicazione grafica dei risultati delle transazioni.


%prep
%setup -q

# remove shebang
sed -i -e '/^#!\//, 1d' Genesis/*.py


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

desktop-file-install \
  --remove-category Application \
  --remove-category Utility \
  --add-category Network \
  --add-category GTK \
  --remove-key Encoding \
  --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{python_sitelib}/%{name}*.egg-info
%{python_sitelib}/Genesis/
%exclude %{_datadir}/icons/Humanity-Dark/status/*/*
%exclude %{_datadir}/icons/Humanity/status/*/*
%{_datadir}/icons/hicolor/*/status/*
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop
%doc README


%changelog
* Sun Dec 05 2009 Andrea Musuruane <musuruan at gmail.com> 0.4.2.1-3
- Added German summary and description

* Sat Dec 05 2009 Andrea Musuruane <musuruan at gmail.com> 0.4.2.1-2
- More consistent macro usage
- Added Italian summary and description

* Sat Dec 05 2009 Andrea Musuruane <musuruan at gmail.com> 0.4.2.1-1
- First release



--- NEW FILE import.log ---
genesis-0_4_2_1-3_fc12:HEAD:genesis-0.4.2.1-3.fc12.src.rpm:1260272777


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/genesis/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:20:07 -0000	1.1
+++ .cvsignore	8 Dec 2009 11:51:25 -0000	1.2
@@ -0,0 +1 @@
+genesis-0.4.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/genesis/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:20:07 -0000	1.1
+++ sources	8 Dec 2009 11:51:25 -0000	1.2
@@ -0,0 +1 @@
+bd4024504b0fe3903004e8b8cae7c0df  genesis-0.4.2.1.tar.gz



From pmatilai at fedoraproject.org  Tue Dec  8 11:53:40 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  8 Dec 2009 11:53:40 +0000 (UTC)
Subject: rpms/rpm/F-12 rpm-4.7.1-chmod-test.patch, NONE,
	1.1 rpm-4.7.1-pgp-subkeys.patch, NONE,
	1.1 rpm-4.7.1-python-types.patch, NONE,
	1.1 rpm-4.7.1-rpmfc-data.patch, NONE,
	1.1 rpm-4.7.1-sign-passcheck.patch, NONE, 1.1 rpm.spec, 1.361,
	1.362 rpm-4.7.1-abs-filelist.patch, 1.1,
	NONE rpm-4.7.1-chroot-env-paths.patch, 1.1,
	NONE rpm-4.7.1-chroot-remove-env.patch, 1.1,
	NONE rpm-4.7.1-debug-perms.patch, 1.1,
	NONE rpm-4.7.1-duplicate-deps.patch, 1.1,
	NONE rpm-4.7.1-filedep-dnevr.patch, 1.1,
	NONE rpm-4.7.1-rpm2cpio-init.patch, 1.1, NONE
Message-ID: <20091208115340.B47CA11C0264@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv435

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.1-chmod-test.patch rpm-4.7.1-pgp-subkeys.patch 
	rpm-4.7.1-python-types.patch rpm-4.7.1-rpmfc-data.patch 
	rpm-4.7.1-sign-passcheck.patch 
Removed Files:
	rpm-4.7.1-abs-filelist.patch rpm-4.7.1-chroot-env-paths.patch 
	rpm-4.7.1-chroot-remove-env.patch rpm-4.7.1-debug-perms.patch 
	rpm-4.7.1-duplicate-deps.patch rpm-4.7.1-filedep-dnevr.patch 
	rpm-4.7.1-rpm2cpio-init.patch 
Log Message:
- update to 4.7.2 (http://rpm.org/wiki/Releases/4.7.2)
- fix posix chmod test to unbreak %%fixperms macro (#543035)
- avoid looking into OpenPGP subkeys (#436812)
- dont fail build on unrecognized non-executable files (#532489)
- fix password check result when gpg is missing (#496754)
- permit python to handle 64bit integer types from headers
- all header integer types are unsigned, match this in python too
- return python long objects where ints are not sufficient (#531243)


rpm-4.7.1-chmod-test.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-chmod-test.patch ---
commit 545304577f0ac82b2e4c1caa97f02d87f41324f7
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Dec 2 15:30:27 2009 +0200

    Fix the posix chown test for selinux enabled systems (RhBug:543035)
    - on selinux enabled systems, 'ls -l' mode string is longer than
      expected here, just trim the ls output to our expected length
    (cherry picked from commit 46d1ba04483af09590ed070186a1be10b57c5977)

diff --git a/configure.ac b/configure.ac
index 967566c..2274080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_MSG_CHECKING(POSIX chmod)
 touch foo.chmodtest
 chmod 744 foo.chmodtest
 chmod +X foo.chmodtest 2>/dev/null
-a=`ls -l foo.chmodtest | awk '{print $1}'`
+a=`ls -l foo.chmodtest | awk '{print substr($1,1,10)}'`
 rm -f foo.chmodtest
 if test "$a" = "-rwxr-xr-x"; then
     AC_MSG_RESULT(yes)

rpm-4.7.1-pgp-subkeys.patch:
 rpmpgp.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE rpm-4.7.1-pgp-subkeys.patch ---
commit 6eeb0bb06466d9eb75eb55efd514d3ecfe089042
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Nov 25 15:07:17 2009 +0200

    We can't handle OpenPGP subkeys or secret keys, so dont even try
    - parsing subkeys ends up overwriting data in the main key, causing
      bogus signature checking failures
    - this is the final missing piece of RhBug:436812, short of adding
      proper support for subkeys (maybe someday...)
    (cherry picked from commit 98213fc4192c7af07037a0f3e9cce9e3b8509c02)

diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index d7bbb5e..f76fc2b 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -1190,11 +1190,6 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft,
 	    else
 		memset(_digp->signid, 0, sizeof(_digp->signid));
 	}
-    case PGPTAG_PUBLIC_SUBKEY:
-	rc = pgpPrtKey(tag, h, hlen, _dig, _digp);
-	break;
-    case PGPTAG_SECRET_KEY:
-    case PGPTAG_SECRET_SUBKEY:
 	rc = pgpPrtKey(tag, h, hlen, _dig, _digp);
 	break;
     case PGPTAG_USER_ID:
@@ -1205,6 +1200,9 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft,
 	rc = pgpPrtComment(tag, h, hlen);
 	break;
 
+    case PGPTAG_PUBLIC_SUBKEY:
+    case PGPTAG_SECRET_KEY:
+    case PGPTAG_SECRET_SUBKEY:
     case PGPTAG_RESERVED:
     case PGPTAG_PUBLIC_SESSION_KEY:
     case PGPTAG_SYMMETRIC_SESSION_KEY:

rpm-4.7.1-python-types.patch:
 header-py.c |   26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

--- NEW FILE rpm-4.7.1-python-types.patch ---
diff --git a/python/header-py.c b/python/header-py.c
index 8ec2cb4..9c9b1e2 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -152,6 +152,7 @@ static PyObject * hdrKeyList(hdrObject * s)
 
 	switch (rpmtdType(td)) {
 	case RPM_BIN_TYPE:
+	case RPM_INT64_TYPE:
 	case RPM_INT32_TYPE:
 	case RPM_CHAR_TYPE:
 	case RPM_INT8_TYPE:
@@ -386,17 +387,30 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
 	o = PyString_FromStringAndSize(data, count);
 	break;
 
+    case RPM_INT64_TYPE:
+	if (count != 1 || forceArray) {
+	    metao = PyList_New(0);
+	    for (i = 0; i < count; i++) {
+		o = PyLong_FromUnsignedLongLong(((uint64_t *) data)[i]);
+		PyList_Append(metao, o);
+		Py_DECREF(o);
+	    }
+	    o = metao;
+	} else {
+	    o = PyLong_FromUnsignedLongLong(*((uint64_t *) data));
+	}
+	break;
     case RPM_INT32_TYPE:
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
-		o = PyInt_FromLong(((int *) data)[i]);
+		o = PyLong_FromLong(((uint32_t *) data)[i]);
 		PyList_Append(metao, o);
 		Py_DECREF(o);
 	    }
 	    o = metao;
 	} else {
-	    o = PyInt_FromLong(*((int *) data));
+	    o = PyLong_FromLong(*((uint32_t *) data));
 	}
 	break;
 
@@ -405,13 +419,13 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
-		o = PyInt_FromLong(((char *) data)[i]);
+		o = PyInt_FromLong(((uint8_t *) data)[i]);
 		PyList_Append(metao, o);
 		Py_DECREF(o);
 	    }
 	    o = metao;
 	} else {
-	    o = PyInt_FromLong(*((char *) data));
+	    o = PyInt_FromLong(*((uint8_t *) data));
 	}
 	break;
 
@@ -419,13 +433,13 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
-		o = PyInt_FromLong(((short *) data)[i]);
+		o = PyInt_FromLong(((uint16_t *) data)[i]);
 		PyList_Append(metao, o);
 		Py_DECREF(o);
 	    }
 	    o = metao;
 	} else {
-	    o = PyInt_FromLong(*((short *) data));
+	    o = PyInt_FromLong(*((uint16_t *) data));
 	}
 	break;
 

rpm-4.7.1-rpmfc-data.patch:
 rpmfc.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.7.1-rpmfc-data.patch ---
commit fa9fcc89146f08bce3b51d96d0ec9d4175db6978
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Thu Nov 26 10:22:41 2009 +0200

    Dont fail build on unrecognized non-executable files (ticket #105)
    - Generally only executable files are critical for dependency extraction,
      whereas oddball application data files can cause unnecessary build
      failure due to libmagic misdetections etc, so just let non-executables
      pass with a warning and mark them as unknown data
    (cherry picked from commit cfcd1f9bd98d5d0fc46a84931984efec3b9d47e2)

diff --git a/build/rpmfc.c b/build/rpmfc.c
index bcb5383..e4ba6b2 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1245,6 +1245,7 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
     for (fc->ix = 0; fc->ix < fc->nfiles; fc->ix++) {
 	const char * ftype;
 	rpm_mode_t mode = (fmode ? fmode[fc->ix] : 0);
+	int is_executable = (mode & (S_IXUSR|S_IXGRP|S_IXOTH));
 
 	s = argv[fc->ix];
 	slen = strlen(s);
@@ -1277,11 +1278,16 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
 		ftype = magic_file(ms, s);
 
 	    if (ftype == NULL) {
-		rpmlog(RPMLOG_ERR, 
+		rpmlog(is_executable ? RPMLOG_ERR : RPMLOG_WARNING, 
 		       _("Recognition of file \"%s\" failed: mode %06o %s\n"),
 		       s, mode, magic_error(ms));
-		magic_close(ms);
-		return RPMRC_FAIL;
+		/* only executable files are critical to dep extraction */
+		if (is_executable) {
+		    magic_close(ms);
+		    return RPMRC_FAIL;
+		}
+		/* unrecognized non-executables get treated as "data" */
+		ftype = "data";
 	    }
 	}
 

rpm-4.7.1-sign-passcheck.patch:
 signature.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-sign-passcheck.patch ---
commit 31c5e0f9b7b09661611b50d84d26ba47ce97fffe
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Nov 25 16:42:43 2009 +0200

    Fix signature password checking result on abnormal conditions (RhBug:496754)
    - Execve() failure wasn't returning an error code, causing rpm to
      think the password was ok when we couldn't even try verifying
    - Stricter return code checking from the password checking child:
      the password can only be ok if the child exits with WIFEXITED() *and*
      WIFEXITCODE() of 0. Also WIFEXITCODE() should only be called if
      WIFEXITED() returns true.
    (cherry picked from commit 2b41860984f0c4ebba5ebce93a18c9c0ca5e1065)

diff --git a/lib/signature.c b/lib/signature.c
index a501f3e..a2eaf9b 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -883,6 +883,7 @@ static int checkPassPhrase(const char * passPhrase, const rpmSigTag sigTag)
 
 	    rpmlog(RPMLOG_ERR, _("Could not exec %s: %s\n"), "gpg",
 			strerror(errno));
+	    _exit(EXIT_FAILURE);
 	}   break;
 	case RPMSIGTAG_RSA:
 	case RPMSIGTAG_PGP5:	/* XXX legacy */
@@ -932,7 +933,7 @@ static int checkPassPhrase(const char * passPhrase, const rpmSigTag sigTag)
 
     (void) waitpid(pid, &status, 0);
 
-    return ((!WIFEXITED(status) || WEXITSTATUS(status)) ? 1 : 0);
+    return ((WIFEXITED(status) && WEXITSTATUS(status) == 0)) ? 0 : 1;
 }
 
 char * rpmGetPassPhrase(const char * prompt, const rpmSigTag sigTag)


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-12/rpm.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -p -r1.361 -r1.362
--- rpm.spec	21 Sep 2009 13:25:25 -0000	1.361
+++ rpm.spec	8 Dec 2009 11:53:40 -0000	1.362
@@ -11,7 +11,7 @@
 
 %define rpmhome /usr/lib/rpm
 
-%define rpmver 4.7.1
+%define rpmver 4.7.2
 %define snapver {nil}
 %define srcver %{rpmver}
 
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 6%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -40,16 +40,14 @@ Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
 Patch200: rpm-4.7.1-bugurl.patch
-Patch201: rpm-4.7.1-abs-filelist.patch
-Patch202: rpm-4.7.1-debug-perms.patch
-Patch203: rpm-4.7.1-duplicate-deps.patch
-Patch204: rpm-4.7.1-chroot-env-paths.patch
-Patch205: rpm-4.7.1-rpm2cpio-init.patch
-Patch206: rpm-4.7.1-filedep-dnevr.patch
-Patch207: rpm-4.7.1-chroot-remove-env.patch
+Patch201: rpm-4.7.0-extra-provides.patch
+Patch202: rpm-4.7.1-pgp-subkeys.patch
+Patch203: rpm-4.7.1-sign-passcheck.patch
+Patch204: rpm-4.7.1-rpmfc-data.patch
+Patch205: rpm-4.7.1-chmod-test.patch
+Patch206: rpm-4.7.1-python-types.patch
 
 # These are not yet upstream
-Patch300: rpm-4.7.0-extra-provides.patch
 Patch301: rpm-4.6.0-niagara.patch
 Patch302: rpm-4.7.1-geode-i686.patch
 
@@ -98,6 +96,8 @@ BuildRequires: xz-devel >= 4.999.8
 %if %{with sqlite}
 BuildRequires: sqlite-devel
 %endif
+# XXX temporarily for chmod-test patch
+BuildRequires: autoconf automake
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -201,15 +201,13 @@ packages on a system.
 %patch3 -p1 -b .fedora-specspo
 
 %patch200 -p1 -b .bugurl
-%patch201 -p1 -b .abs-filelist
-%patch202 -p1 -b .debug-perms
-%patch203 -p1 -b .duplicate-deps
-%patch204 -p1 -b .chroot-env-paths
-%patch205 -p1 -b .rpm2cpio.init
-%patch206 -p1 -b .filedep-dnevr
-%patch207 -p1 -b .chroot-remove-env
+%patch201 -p1 -b .extra-prov
+%patch202 -p1 -b .pgp-subkey
+%patch203 -p1 -b .sign-passcheck
+%patch204 -p1 -b .rpmfc-data
+%patch205 -p1 -b .chmod-test
+%patch206 -p1 -b .python-types
 
-%patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 
@@ -423,6 +421,16 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Dec 08 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.2-1
+- update to 4.7.2 (http://rpm.org/wiki/Releases/4.7.2)
+- fix posix chmod test to unbreak %%fixperms macro (#543035)
+- avoid looking into OpenPGP subkeys (#436812)
+- dont fail build on unrecognized non-executable files (#532489)
+- fix password check result when gpg is missing (#496754)
+- permit python to handle 64bit integer types from headers
+- all header integer types are unsigned, match this in python too
+- return python long objects where ints are not sufficient (#531243)
+
 * Mon Sep 21 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-6
 - use relative paths within db environment (related to #507309, #507309...)
 - remove db environment on close in chrooted operation (related to above)


--- rpm-4.7.1-abs-filelist.patch DELETED ---


--- rpm-4.7.1-chroot-env-paths.patch DELETED ---


--- rpm-4.7.1-chroot-remove-env.patch DELETED ---


--- rpm-4.7.1-debug-perms.patch DELETED ---


--- rpm-4.7.1-duplicate-deps.patch DELETED ---


--- rpm-4.7.1-filedep-dnevr.patch DELETED ---


--- rpm-4.7.1-rpm2cpio-init.patch DELETED ---



From musuruan at fedoraproject.org  Tue Dec  8 11:57:04 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Tue,  8 Dec 2009 11:57:04 +0000 (UTC)
Subject: rpms/genesis/F-12 genesis.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091208115704.AF7C711C0264@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/genesis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv486/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	genesis.spec import.log 
Log Message:
First import



--- NEW FILE genesis.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           genesis
Version:        0.4.2.1
Release:        3%{?dist}
Summary:        Graphical frontend to SyncEvolution
Summary(de):    Grafisches Frontend f?r SyncEvolution
Summary(it):    Frontend grafico per SyncEvolution

Group:          Applications/Productivity
# The icon used by Genesis Sync is taken from the Tango Project
# It is authored by Jakub Steiner and released under the CC-BY-SA Licence
License:        GPLv3 and CC-BY-SA
URL:            https://launchpad.net/genesis-sync/
Source0:        http://launchpad.net/genesis-sync/trunk/0.4.2/+download/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme
Requires:       python
Requires:       pygtk2
Requires:       notify-python
Requires:       dbus-python
Requires:       pyxdg
Requires:       gnome-python2-evolution
Requires:       python-configobj
Requires:       syncevolution


%description
Genesis is a graphical frontend for SyncEvolution written in PyGTK. It makes 
SyncEvolution accessible without having to use a command line and provides 
graphical feedback of transaction results.


%description -l de
Genesis ist ein grafisches Frontend f?r SyncEvolution welches in PyGTK
geschrieben ist.
Es macht einen Zugriff auf SyncEvolution m?glich, ohne die Kommandozeile nutzen
zu m?ssen und gibt grafisch R?ckmeldung ?ber Transaktionen.


%description -l it
Genesis ? un frontend grafico per SyncEvolution scritto in PyGTK. Rende
accessibile SyncEvolution senza dover usare la riga di comando e fornisce
un'indicazione grafica dei risultati delle transazioni.


%prep
%setup -q

# remove shebang
sed -i -e '/^#!\//, 1d' Genesis/*.py


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

desktop-file-install \
  --remove-category Application \
  --remove-category Utility \
  --add-category Network \
  --add-category GTK \
  --remove-key Encoding \
  --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{python_sitelib}/%{name}*.egg-info
%{python_sitelib}/Genesis/
%exclude %{_datadir}/icons/Humanity-Dark/status/*/*
%exclude %{_datadir}/icons/Humanity/status/*/*
%{_datadir}/icons/hicolor/*/status/*
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop
%doc README


%changelog
* Sun Dec 05 2009 Andrea Musuruane <musuruan at gmail.com> 0.4.2.1-3
- Added German summary and description

* Sat Dec 05 2009 Andrea Musuruane <musuruan at gmail.com> 0.4.2.1-2
- More consistent macro usage
- Added Italian summary and description

* Sat Dec 05 2009 Andrea Musuruane <musuruan at gmail.com> 0.4.2.1-1
- First release



--- NEW FILE import.log ---
genesis-0_4_2_1-3_fc12:F-12:genesis-0.4.2.1-3.fc12.src.rpm:1260273176


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/genesis/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:20:07 -0000	1.1
+++ .cvsignore	8 Dec 2009 11:57:04 -0000	1.2
@@ -0,0 +1 @@
+genesis-0.4.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/genesis/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:20:07 -0000	1.1
+++ sources	8 Dec 2009 11:57:04 -0000	1.2
@@ -0,0 +1 @@
+bd4024504b0fe3903004e8b8cae7c0df  genesis-0.4.2.1.tar.gz



From pmatilai at fedoraproject.org  Tue Dec  8 11:58:56 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  8 Dec 2009 11:58:56 +0000 (UTC)
Subject: rpms/rpm/F-12 .cvsignore,1.37,1.38 sources,1.143,1.144
Message-ID: <20091208115856.DCD7811C0264@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1829

Modified Files:
	.cvsignore sources 
Log Message:
- remember to update sources too..



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-12/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	21 Jul 2009 10:15:32 -0000	1.37
+++ .cvsignore	8 Dec 2009 11:58:56 -0000	1.38
@@ -1 +1 @@
-rpm-4.7.1.tar.bz2
+rpm-4.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-12/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- sources	21 Jul 2009 10:15:33 -0000	1.143
+++ sources	8 Dec 2009 11:58:56 -0000	1.144
@@ -1 +1 @@
-e1abe3bcf6514a319a3803d2cf3bf83b  rpm-4.7.1.tar.bz2
+224715646325df4cd3904e3ac9e16186  rpm-4.7.2.tar.bz2



From thias at fedoraproject.org  Tue Dec  8 12:07:48 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 12:07:48 +0000 (UTC)
Subject: File ncftp-3.2.3-src.tar.bz2 uploaded to lookaside cache by thias
Message-ID: <20091208120748.31BEA10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ncftp:

fac4aa169e1734e8d9617afd4a9b51e5  ncftp-3.2.3-src.tar.bz2



From twaugh at fedoraproject.org  Tue Dec  8 12:13:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:13:28 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3435.patch,NONE,1.1 cups.spec,1.549,1.550
Message-ID: <20091208121328.5BC5511C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6668

Modified Files:
	cups.spec 
Added Files:
	cups-str3435.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Authenticated printing did not always work when printing directly to
  a remote server (STR #3435).


cups-str3435.patch:
 util.c |   34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

--- NEW FILE cups-str3435.patch ---
diff -up cups-1.4.2/cups/util.c.str3435 cups-1.4.2/cups/util.c
--- cups-1.4.2/cups/util.c.str3435	2009-06-22 21:44:34.000000000 +0100
+++ cups-1.4.2/cups/util.c	2009-12-08 12:11:38.647375446 +0000
@@ -1511,12 +1511,36 @@ cupsPrintFiles2(
       return (0);
     }
 
-    status = cupsStartDocument(http, name, job_id, docname, format,
-                               i == (num_files - 1));
+    do
+    {
+      cupsFileRewind(fp);
+
+      status = cupsStartDocument(http, name, job_id, docname, format,
+			         i == (num_files - 1));
+
+      while (status == HTTP_CONTINUE &&
+	     (bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
+        status = cupsWriteRequestData(http, buffer, bytes);
+
+      if (status == HTTP_UNAUTHORIZED)
+      {
+        char	resource[1024];		/* Printer resource */
 
-    while (status == HTTP_CONTINUE &&
-           (bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
-      status = cupsWriteRequestData(http, buffer, bytes);
+        snprintf(resource, sizeof(resource), "/printers/%s", name);
+
+        if (!cupsDoAuthentication(http, "POST", resource))
+        {
+	  if (httpReconnect(http))
+	  {
+	    _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+	    return (0);
+	  }
+        }
+	else
+	  status = HTTP_AUTHORIZATION_CANCELED;
+      }
+    }
+    while (status == HTTP_UNAUTHORIZED);
 
     cupsFileClose(fp);
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -p -r1.549 -r1.550
--- cups.spec	8 Dec 2009 11:24:11 -0000	1.549
+++ cups.spec	8 Dec 2009 12:13:28 -0000	1.550
@@ -68,6 +68,7 @@ Patch54: cups-str3442.patch
 Patch55: cups-negative-snmp-string-length.patch
 Patch56: cups-sidechannel-intrs.patch
 Patch57: cups-media-empty-warning.patch
+Patch58: cups-str3435.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -240,6 +241,7 @@ module. 
 %patch55 -p1 -b .negative-snmp-string-length
 %patch56 -p1 -b .sidechannel-intrs
 %patch57 -p1 -b .media-empty-warning
+%patch58 -p1 -b .str3435
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -532,6 +534,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Authenticated printing did not always work when printing directly to
+  a remote server (STR #3435).
 - Use upstream patch to stop the network backends incorrectly clearing
   the media-empty-warning state (rev 8896).
 - Use upstream patch to fix interrupt handling in the side-channel



From twaugh at fedoraproject.org  Tue Dec  8 12:14:52 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:14:52 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3435.patch,NONE,1.1 cups.spec,1.556,1.557
Message-ID: <20091208121452.0D6CE11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7200

Modified Files:
	cups.spec 
Added Files:
	cups-str3435.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Authenticated printing did not always work when printing directly to
  a remote server (STR #3435).


cups-str3435.patch:
 util.c |   34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

--- NEW FILE cups-str3435.patch ---
diff -up cups-1.4.2/cups/util.c.str3435 cups-1.4.2/cups/util.c
--- cups-1.4.2/cups/util.c.str3435	2009-06-22 21:44:34.000000000 +0100
+++ cups-1.4.2/cups/util.c	2009-12-08 12:11:38.647375446 +0000
@@ -1511,12 +1511,36 @@ cupsPrintFiles2(
       return (0);
     }
 
-    status = cupsStartDocument(http, name, job_id, docname, format,
-                               i == (num_files - 1));
+    do
+    {
+      cupsFileRewind(fp);
+
+      status = cupsStartDocument(http, name, job_id, docname, format,
+			         i == (num_files - 1));
+
+      while (status == HTTP_CONTINUE &&
+	     (bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
+        status = cupsWriteRequestData(http, buffer, bytes);
+
+      if (status == HTTP_UNAUTHORIZED)
+      {
+        char	resource[1024];		/* Printer resource */
 
-    while (status == HTTP_CONTINUE &&
-           (bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
-      status = cupsWriteRequestData(http, buffer, bytes);
+        snprintf(resource, sizeof(resource), "/printers/%s", name);
+
+        if (!cupsDoAuthentication(http, "POST", resource))
+        {
+	  if (httpReconnect(http))
+	  {
+	    _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+	    return (0);
+	  }
+        }
+	else
+	  status = HTTP_AUTHORIZATION_CANCELED;
+      }
+    }
+    while (status == HTTP_UNAUTHORIZED);
 
     cupsFileClose(fp);
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -p -r1.556 -r1.557
--- cups.spec	8 Dec 2009 11:25:18 -0000	1.556
+++ cups.spec	8 Dec 2009 12:14:51 -0000	1.557
@@ -67,6 +67,7 @@ Patch40: cups-str3442.patch
 Patch41: cups-negative-snmp-string-length.patch
 Patch42: cups-sidechannel-intrs.patch
 Patch43: cups-media-empty-warning.patch
+Patch44: cups-str3435.patch
 
 Patch100: cups-lspp.patch
 
@@ -239,6 +240,7 @@ module. 
 %patch41 -p1 -b .negative-snmp-string-length
 %patch42 -p1 -b .sidechannel-intrs
 %patch43 -p1 -b .media-empty-warning
+%patch44 -p1 -b .str3435
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -538,6 +540,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Authenticated printing did not always work when printing directly to
+  a remote server (STR #3435).
 - Use upstream patch to stop the network backends incorrectly clearing
   the media-empty-warning state (rev 8896).
 - Use upstream patch to fix interrupt handling in the side-channel



From twaugh at fedoraproject.org  Tue Dec  8 12:16:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:16:14 +0000 (UTC)
Subject: rpms/cups/devel cups-str3435.patch,NONE,1.1 cups.spec,1.558,1.559
Message-ID: <20091208121614.5A8C011C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7707

Modified Files:
	cups.spec 
Added Files:
	cups-str3435.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- Authenticated printing did not always work when printing directly to
  a remote server (STR #3435).


cups-str3435.patch:
 util.c |   34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

--- NEW FILE cups-str3435.patch ---
diff -up cups-1.4.2/cups/util.c.str3435 cups-1.4.2/cups/util.c
--- cups-1.4.2/cups/util.c.str3435	2009-06-22 21:44:34.000000000 +0100
+++ cups-1.4.2/cups/util.c	2009-12-08 12:11:38.647375446 +0000
@@ -1511,12 +1511,36 @@ cupsPrintFiles2(
       return (0);
     }
 
-    status = cupsStartDocument(http, name, job_id, docname, format,
-                               i == (num_files - 1));
+    do
+    {
+      cupsFileRewind(fp);
+
+      status = cupsStartDocument(http, name, job_id, docname, format,
+			         i == (num_files - 1));
+
+      while (status == HTTP_CONTINUE &&
+	     (bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
+        status = cupsWriteRequestData(http, buffer, bytes);
+
+      if (status == HTTP_UNAUTHORIZED)
+      {
+        char	resource[1024];		/* Printer resource */
 
-    while (status == HTTP_CONTINUE &&
-           (bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
-      status = cupsWriteRequestData(http, buffer, bytes);
+        snprintf(resource, sizeof(resource), "/printers/%s", name);
+
+        if (!cupsDoAuthentication(http, "POST", resource))
+        {
+	  if (httpReconnect(http))
+	  {
+	    _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+	    return (0);
+	  }
+        }
+	else
+	  status = HTTP_AUTHORIZATION_CANCELED;
+      }
+    }
+    while (status == HTTP_UNAUTHORIZED);
 
     cupsFileClose(fp);
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -p -r1.558 -r1.559
--- cups.spec	8 Dec 2009 11:25:50 -0000	1.558
+++ cups.spec	8 Dec 2009 12:16:14 -0000	1.559
@@ -65,6 +65,7 @@ Patch40: cups-str3442.patch
 Patch41: cups-negative-snmp-string-length.patch
 Patch42: cups-sidechannel-intrs.patch
 Patch43: cups-media-empty-warning.patch
+Patch44: cups-str3435.patch
 
 Patch100: cups-lspp.patch
 
@@ -237,6 +238,7 @@ module. 
 %patch41 -p1 -b .negative-snmp-string-length
 %patch42 -p1 -b .sidechannel-intrs
 %patch43 -p1 -b .media-empty-warning
+%patch44 -p1 -b .str3435
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -528,6 +530,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- Authenticated printing did not always work when printing directly to
+  a remote server (STR #3435).
 - Use upstream patch to stop the network backends incorrectly clearing
   the media-empty-warning state (rev 8896).
 - Use upstream patch to fix interrupt handling in the side-channel



From twaugh at fedoraproject.org  Tue Dec  8 12:20:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:20:57 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3436.patch,NONE,1.1 cups.spec,1.550,1.551
Message-ID: <20091208122057.1715A11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9177

Modified Files:
	cups.spec 
Added Files:
	cups-str3436.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The web interface did not show completed jobs (STR #3436).


cups-str3436.patch:
 ipp-var.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3436.patch ---
diff -up cups-1.4.2/cgi-bin/ipp-var.c.str3436 cups-1.4.2/cgi-bin/ipp-var.c
--- cups-1.4.2/cgi-bin/ipp-var.c.str3436	2009-11-09 23:01:17.000000000 +0000
+++ cups-1.4.2/cgi-bin/ipp-var.c	2009-12-08 12:19:01.988500453 +0000
@@ -333,7 +333,7 @@ cgiMoveJobs(http_t     *http,		/* I - Co
                    NULL, job_uri);
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                    "requested-attributes", NULL, "job-printer-uri");
-      
+
       if ((response = cupsDoRequest(http, request, "/")) != NULL)
       {
         if ((attr = ippFindAttribute(response, "job-printer-uri",
@@ -926,7 +926,7 @@ cgiRewriteURL(const char *uri,		/* I - C
 		 ishttps ? "https" : "http",
 		 userpass, hostname, port, resource);
       else
-	snprintf(url, urlsize, "%s://%s:%d%s", 
+	snprintf(url, urlsize, "%s://%s:%d%s",
 		 ishttps ? "https" : "http",
 		 hostname, port, resource);
     }
@@ -1518,7 +1518,11 @@ cgiShowJobs(http_t     *http,		/* I - Co
     */
 
     if (dest)
+    {
       snprintf(val, sizeof(val), "/%s/%s", section, dest);
+      cgiSetVariable("PRINTER_NAME", dest);
+      cgiSetVariable("PRINTER_URI_SUPPORTED", val);
+    }
     else
       strlcpy(val, "/jobs/", sizeof(val));
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -p -r1.550 -r1.551
--- cups.spec	8 Dec 2009 12:13:28 -0000	1.550
+++ cups.spec	8 Dec 2009 12:20:56 -0000	1.551
@@ -69,6 +69,7 @@ Patch55: cups-negative-snmp-string-lengt
 Patch56: cups-sidechannel-intrs.patch
 Patch57: cups-media-empty-warning.patch
 Patch58: cups-str3435.patch
+Patch59: cups-str3436.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -242,6 +243,7 @@ module. 
 %patch56 -p1 -b .sidechannel-intrs
 %patch57 -p1 -b .media-empty-warning
 %patch58 -p1 -b .str3435
+%patch59 -p1 -b .str3436
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -534,6 +536,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The web interface did not show completed jobs (STR #3436).
 - Authenticated printing did not always work when printing directly to
   a remote server (STR #3435).
 - Use upstream patch to stop the network backends incorrectly clearing



From pbrady at fedoraproject.org  Tue Dec  8 12:21:35 2009
From: pbrady at fedoraproject.org (=?utf-8?q?P=C3=A1draig_Brady?=)
Date: Tue,  8 Dec 2009 12:21:35 +0000 (UTC)
Subject: rpms/libunistring/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091208122135.1846111C0264@cvs1.fedora.phx.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/libunistring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9448

Modified Files:
	.cvsignore sources 
Log Message:
initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libunistring/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Nov 2009 22:37:45 -0000	1.1
+++ .cvsignore	8 Dec 2009 12:21:34 -0000	1.2
@@ -0,0 +1 @@
+libunistring-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libunistring/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Nov 2009 22:37:46 -0000	1.1
+++ sources	8 Dec 2009 12:21:34 -0000	1.2
@@ -0,0 +1 @@
+310ca03a47d2ee4decf9377d91bb3721  libunistring-0.9.1.tar.gz



From twaugh at fedoraproject.org  Tue Dec  8 12:21:52 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:21:52 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3436.patch,NONE,1.1 cups.spec,1.557,1.558
Message-ID: <20091208122152.6364111C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9553

Modified Files:
	cups.spec 
Added Files:
	cups-str3436.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The web interface did not show completed jobs (STR #3436).


cups-str3436.patch:
 ipp-var.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3436.patch ---
diff -up cups-1.4.2/cgi-bin/ipp-var.c.str3436 cups-1.4.2/cgi-bin/ipp-var.c
--- cups-1.4.2/cgi-bin/ipp-var.c.str3436	2009-11-09 23:01:17.000000000 +0000
+++ cups-1.4.2/cgi-bin/ipp-var.c	2009-12-08 12:19:01.988500453 +0000
@@ -333,7 +333,7 @@ cgiMoveJobs(http_t     *http,		/* I - Co
                    NULL, job_uri);
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                    "requested-attributes", NULL, "job-printer-uri");
-      
+
       if ((response = cupsDoRequest(http, request, "/")) != NULL)
       {
         if ((attr = ippFindAttribute(response, "job-printer-uri",
@@ -926,7 +926,7 @@ cgiRewriteURL(const char *uri,		/* I - C
 		 ishttps ? "https" : "http",
 		 userpass, hostname, port, resource);
       else
-	snprintf(url, urlsize, "%s://%s:%d%s", 
+	snprintf(url, urlsize, "%s://%s:%d%s",
 		 ishttps ? "https" : "http",
 		 hostname, port, resource);
     }
@@ -1518,7 +1518,11 @@ cgiShowJobs(http_t     *http,		/* I - Co
     */
 
     if (dest)
+    {
       snprintf(val, sizeof(val), "/%s/%s", section, dest);
+      cgiSetVariable("PRINTER_NAME", dest);
+      cgiSetVariable("PRINTER_URI_SUPPORTED", val);
+    }
     else
       strlcpy(val, "/jobs/", sizeof(val));
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -p -r1.557 -r1.558
--- cups.spec	8 Dec 2009 12:14:51 -0000	1.557
+++ cups.spec	8 Dec 2009 12:21:52 -0000	1.558
@@ -68,6 +68,7 @@ Patch41: cups-negative-snmp-string-lengt
 Patch42: cups-sidechannel-intrs.patch
 Patch43: cups-media-empty-warning.patch
 Patch44: cups-str3435.patch
+Patch45: cups-str3436.patch
 
 Patch100: cups-lspp.patch
 
@@ -241,6 +242,7 @@ module. 
 %patch42 -p1 -b .sidechannel-intrs
 %patch43 -p1 -b .media-empty-warning
 %patch44 -p1 -b .str3435
+%patch45 -p1 -b .str3436
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -540,6 +542,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The web interface did not show completed jobs (STR #3436).
 - Authenticated printing did not always work when printing directly to
   a remote server (STR #3435).
 - Use upstream patch to stop the network backends incorrectly clearing



From twaugh at fedoraproject.org  Tue Dec  8 12:22:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:22:49 +0000 (UTC)
Subject: rpms/cups/devel cups-str3436.patch,NONE,1.1 cups.spec,1.559,1.560
Message-ID: <20091208122249.EA45011C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9998

Modified Files:
	cups.spec 
Added Files:
	cups-str3436.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The web interface did not show completed jobs (STR #3436).


cups-str3436.patch:
 ipp-var.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3436.patch ---
diff -up cups-1.4.2/cgi-bin/ipp-var.c.str3436 cups-1.4.2/cgi-bin/ipp-var.c
--- cups-1.4.2/cgi-bin/ipp-var.c.str3436	2009-11-09 23:01:17.000000000 +0000
+++ cups-1.4.2/cgi-bin/ipp-var.c	2009-12-08 12:19:01.988500453 +0000
@@ -333,7 +333,7 @@ cgiMoveJobs(http_t     *http,		/* I - Co
                    NULL, job_uri);
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                    "requested-attributes", NULL, "job-printer-uri");
-      
+
       if ((response = cupsDoRequest(http, request, "/")) != NULL)
       {
         if ((attr = ippFindAttribute(response, "job-printer-uri",
@@ -926,7 +926,7 @@ cgiRewriteURL(const char *uri,		/* I - C
 		 ishttps ? "https" : "http",
 		 userpass, hostname, port, resource);
       else
-	snprintf(url, urlsize, "%s://%s:%d%s", 
+	snprintf(url, urlsize, "%s://%s:%d%s",
 		 ishttps ? "https" : "http",
 		 hostname, port, resource);
     }
@@ -1518,7 +1518,11 @@ cgiShowJobs(http_t     *http,		/* I - Co
     */
 
     if (dest)
+    {
       snprintf(val, sizeof(val), "/%s/%s", section, dest);
+      cgiSetVariable("PRINTER_NAME", dest);
+      cgiSetVariable("PRINTER_URI_SUPPORTED", val);
+    }
     else
       strlcpy(val, "/jobs/", sizeof(val));
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -p -r1.559 -r1.560
--- cups.spec	8 Dec 2009 12:16:14 -0000	1.559
+++ cups.spec	8 Dec 2009 12:22:49 -0000	1.560
@@ -66,6 +66,7 @@ Patch41: cups-negative-snmp-string-lengt
 Patch42: cups-sidechannel-intrs.patch
 Patch43: cups-media-empty-warning.patch
 Patch44: cups-str3435.patch
+Patch45: cups-str3436.patch
 
 Patch100: cups-lspp.patch
 
@@ -239,6 +240,7 @@ module. 
 %patch42 -p1 -b .sidechannel-intrs
 %patch43 -p1 -b .media-empty-warning
 %patch44 -p1 -b .str3435
+%patch45 -p1 -b .str3436
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -530,6 +532,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The web interface did not show completed jobs (STR #3436).
 - Authenticated printing did not always work when printing directly to
   a remote server (STR #3435).
 - Use upstream patch to stop the network backends incorrectly clearing



From twaugh at fedoraproject.org  Tue Dec  8 12:25:07 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:25:07 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3425.patch,NONE,1.1 cups.spec,1.551,1.552
Message-ID: <20091208122507.D9D1F11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10831

Modified Files:
	cups.spec 
Added Files:
	cups-str3425.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler did not clean out completed jobs when
  PreserveJobHistory was turned off (STR #3425).


cups-str3425.patch:
 job.c  |    6 ++----
 main.c |   21 +++++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

--- NEW FILE cups-str3425.patch ---
diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
--- cups-1.4.2/scheduler/job.c.str3425	2009-12-08 12:23:15.694500898 +0000
+++ cups-1.4.2/scheduler/job.c	2009-12-08 12:23:35.005500733 +0000
@@ -444,11 +444,11 @@ cupsdCleanJobs(void)
   cupsd_job_t	*job;			/* Current job */
 
 
-  if (MaxJobs <= 0)
+  if (MaxJobs <= 0 && JobHistory)
     return;
 
   for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
-       job && cupsArrayCount(Jobs) >= MaxJobs;
+       job && (cupsArrayCount(Jobs) >= MaxJobs || !JobHistory);
        job = (cupsd_job_t *)cupsArrayNext(Jobs))
     if (job->state_value >= IPP_JOB_CANCELED && !job->printer)
       cupsdDeleteJob(job, CUPSD_JOB_PURGE);
@@ -2670,8 +2670,6 @@ cupsdSetJobState(
 	  job->dirty = 1;
 	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
 	}
-	else if (!job->printer)
-	  cupsdDeleteJob(job, CUPSD_JOB_PURGE);
 	break;
   }
 
diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
--- cups-1.4.2/scheduler/main.c.str3425	2009-12-08 12:23:15.695501397 +0000
+++ cups-1.4.2/scheduler/main.c	2009-12-08 12:23:35.007501250 +0000
@@ -397,7 +397,7 @@ main(int  argc,				/* I - Number of comm
     * parent's file descriptors to be blocking.  This is a workaround for a
     * limitation of userland libpthread on OpenBSD.
     */
-   
+
     _thread_sys_closefrom(0);
 #endif /* __OpenBSD__ */
 
@@ -844,8 +844,8 @@ main(int  argc,				/* I - Number of comm
 
     if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
         !cupsArrayCount(ActiveJobs) &&
-	(!Browsing || 
-	 (!BrowseRemoteProtocols && 
+	(!Browsing ||
+	 (!BrowseRemoteProtocols &&
 	  (!NumBrowsers || !BrowseLocalProtocols ||
 	   cupsArrayCount(Printers) == 0))))
     {
@@ -1073,6 +1073,7 @@ main(int  argc,				/* I - Number of comm
     if ((current_time - senddoc_time) >= 10)
     {
       cupsdCheckJobs();
+      cupsdCleanJobs();
       senddoc_time = current_time;
     }
 
@@ -1231,8 +1232,8 @@ main(int  argc,				/* I - Number of comm
 #endif /* HAVE_GSSAPI */
 
 #if defined(__APPLE__) && defined(HAVE_DLFCN_H)
- /* 
-  * Unload Print Service quota enforcement library (X Server only) 
+ /*
+  * Unload Print Service quota enforcement library (X Server only)
   */
 
   PSQUpdateQuotaProc = NULL;
@@ -1594,13 +1595,13 @@ launchd_checkin(void)
 
 	if (lis)
 	{
-	  cupsdLogMessage(CUPSD_LOG_DEBUG, 
+	  cupsdLogMessage(CUPSD_LOG_DEBUG,
 		  "launchd_checkin: Matched existing listener %s with fd %d...",
 		  httpAddrString(&(lis->address), s, sizeof(s)), fd);
 	}
 	else
 	{
-	  cupsdLogMessage(CUPSD_LOG_DEBUG, 
+	  cupsdLogMessage(CUPSD_LOG_DEBUG,
 		  "launchd_checkin: Adding new listener %s with fd %d...",
 		  httpAddrString(&addr, s, sizeof(s)), fd);
 
@@ -1654,12 +1655,12 @@ launchd_checkout(void)
 
  /*
   * Create or remove the launchd KeepAlive file based on whether
-  * there are active jobs, polling, browsing for remote printers or 
+  * there are active jobs, polling, browsing for remote printers or
   * shared printers to advertise...
   */
 
-  if ((cupsArrayCount(ActiveJobs) || NumPolled || 
-       (Browsing && 
+  if ((cupsArrayCount(ActiveJobs) || NumPolled ||
+       (Browsing &&
 	(BrowseRemoteProtocols ||
         (BrowseLocalProtocols && NumBrowsers && cupsArrayCount(Printers))))))
   {


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -p -r1.551 -r1.552
--- cups.spec	8 Dec 2009 12:20:56 -0000	1.551
+++ cups.spec	8 Dec 2009 12:25:07 -0000	1.552
@@ -70,6 +70,7 @@ Patch56: cups-sidechannel-intrs.patch
 Patch57: cups-media-empty-warning.patch
 Patch58: cups-str3435.patch
 Patch59: cups-str3436.patch
+Patch60: cups-str3425.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -244,6 +245,7 @@ module. 
 %patch57 -p1 -b .media-empty-warning
 %patch58 -p1 -b .str3435
 %patch59 -p1 -b .str3436
+%patch60 -p1 -b .str3425
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -536,6 +538,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler did not clean out completed jobs when
+  PreserveJobHistory was turned off (STR #3425).
 - The web interface did not show completed jobs (STR #3436).
 - Authenticated printing did not always work when printing directly to
   a remote server (STR #3435).



From pbrady at fedoraproject.org  Tue Dec  8 12:25:43 2009
From: pbrady at fedoraproject.org (=?utf-8?q?P=C3=A1draig_Brady?=)
Date: Tue,  8 Dec 2009 12:25:43 +0000 (UTC)
Subject: rpms/libunistring/F-11 libunistring.spec,NONE,1.1
Message-ID: <20091208122543.901A211C0264@cvs1.fedora.phx.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/libunistring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11102

Added Files:
	libunistring.spec 
Log Message:
add spec file


--- NEW FILE libunistring.spec ---
Name: libunistring
Version: 0.9.1
Release: 3%{?dist}
Group: System Environment/Libraries
Summary: GNU Unicode string library
License: LGPLv3+
Url: http://www.gnu.org/software/libunistring/
Source0: http://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): info
Requires(preun): info

%description
This portable C library implements Unicode string types in three flavours:
(UTF-8, UTF-16, UTF-32), together with functions for character processing
(names, classifications, properties) and functions for string processing
(iteration, formatted output, width, word breaks, line breaks, normalization,
case folding and regular expressions).

%package devel
Group: Development/Libraries
Summary: GNU Unicode string library - development files
Requires: %{name} = %{version}-%{release}

%description devel
Development files for programs using libunistring.

%prep
%setup -q

%build
%configure --disable-static --disable-rpath
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS README
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%doc HACKING DEPENDENCIES THANKS ChangeLog
%doc %{_datadir}/doc/%{name}/*.html
%{_infodir}/%{name}.info*
%{_libdir}/%{name}.so
%{_includedir}/unistring
%{_includedir}/*.h

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun devel
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/{%{name}.info %{_infodir}/dir || :
fi

%changelog
* Thu Nov 19 2009 P?draig Brady <P at draigBrady.com> 0.9.1-3
- Remove glibc-devel and texinfo build deps
* Thu Nov 19 2009 P?draig Brady <P at draigBrady.com> 0.9.1-2
- Changes as per initial review by panemade at gmail.com
* Tue Nov 17 2009 P?draig Brady <P at draigBrady.com> 0.9.1-1
- Initial version




From twaugh at fedoraproject.org  Tue Dec  8 12:26:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:26:22 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3425.patch,NONE,1.1 cups.spec,1.558,1.559
Message-ID: <20091208122622.2812011C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11399

Modified Files:
	cups.spec 
Added Files:
	cups-str3425.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler did not clean out completed jobs when
  PreserveJobHistory was turned off (STR #3425).


cups-str3425.patch:
 job.c  |    6 ++----
 main.c |   21 +++++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

--- NEW FILE cups-str3425.patch ---
diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
--- cups-1.4.2/scheduler/job.c.str3425	2009-12-08 12:23:15.694500898 +0000
+++ cups-1.4.2/scheduler/job.c	2009-12-08 12:23:35.005500733 +0000
@@ -444,11 +444,11 @@ cupsdCleanJobs(void)
   cupsd_job_t	*job;			/* Current job */
 
 
-  if (MaxJobs <= 0)
+  if (MaxJobs <= 0 && JobHistory)
     return;
 
   for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
-       job && cupsArrayCount(Jobs) >= MaxJobs;
+       job && (cupsArrayCount(Jobs) >= MaxJobs || !JobHistory);
        job = (cupsd_job_t *)cupsArrayNext(Jobs))
     if (job->state_value >= IPP_JOB_CANCELED && !job->printer)
       cupsdDeleteJob(job, CUPSD_JOB_PURGE);
@@ -2670,8 +2670,6 @@ cupsdSetJobState(
 	  job->dirty = 1;
 	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
 	}
-	else if (!job->printer)
-	  cupsdDeleteJob(job, CUPSD_JOB_PURGE);
 	break;
   }
 
diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
--- cups-1.4.2/scheduler/main.c.str3425	2009-12-08 12:23:15.695501397 +0000
+++ cups-1.4.2/scheduler/main.c	2009-12-08 12:23:35.007501250 +0000
@@ -397,7 +397,7 @@ main(int  argc,				/* I - Number of comm
     * parent's file descriptors to be blocking.  This is a workaround for a
     * limitation of userland libpthread on OpenBSD.
     */
-   
+
     _thread_sys_closefrom(0);
 #endif /* __OpenBSD__ */
 
@@ -844,8 +844,8 @@ main(int  argc,				/* I - Number of comm
 
     if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
         !cupsArrayCount(ActiveJobs) &&
-	(!Browsing || 
-	 (!BrowseRemoteProtocols && 
+	(!Browsing ||
+	 (!BrowseRemoteProtocols &&
 	  (!NumBrowsers || !BrowseLocalProtocols ||
 	   cupsArrayCount(Printers) == 0))))
     {
@@ -1073,6 +1073,7 @@ main(int  argc,				/* I - Number of comm
     if ((current_time - senddoc_time) >= 10)
     {
       cupsdCheckJobs();
+      cupsdCleanJobs();
       senddoc_time = current_time;
     }
 
@@ -1231,8 +1232,8 @@ main(int  argc,				/* I - Number of comm
 #endif /* HAVE_GSSAPI */
 
 #if defined(__APPLE__) && defined(HAVE_DLFCN_H)
- /* 
-  * Unload Print Service quota enforcement library (X Server only) 
+ /*
+  * Unload Print Service quota enforcement library (X Server only)
   */
 
   PSQUpdateQuotaProc = NULL;
@@ -1594,13 +1595,13 @@ launchd_checkin(void)
 
 	if (lis)
 	{
-	  cupsdLogMessage(CUPSD_LOG_DEBUG, 
+	  cupsdLogMessage(CUPSD_LOG_DEBUG,
 		  "launchd_checkin: Matched existing listener %s with fd %d...",
 		  httpAddrString(&(lis->address), s, sizeof(s)), fd);
 	}
 	else
 	{
-	  cupsdLogMessage(CUPSD_LOG_DEBUG, 
+	  cupsdLogMessage(CUPSD_LOG_DEBUG,
 		  "launchd_checkin: Adding new listener %s with fd %d...",
 		  httpAddrString(&addr, s, sizeof(s)), fd);
 
@@ -1654,12 +1655,12 @@ launchd_checkout(void)
 
  /*
   * Create or remove the launchd KeepAlive file based on whether
-  * there are active jobs, polling, browsing for remote printers or 
+  * there are active jobs, polling, browsing for remote printers or
   * shared printers to advertise...
   */
 
-  if ((cupsArrayCount(ActiveJobs) || NumPolled || 
-       (Browsing && 
+  if ((cupsArrayCount(ActiveJobs) || NumPolled ||
+       (Browsing &&
 	(BrowseRemoteProtocols ||
         (BrowseLocalProtocols && NumBrowsers && cupsArrayCount(Printers))))))
   {


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -p -r1.558 -r1.559
--- cups.spec	8 Dec 2009 12:21:52 -0000	1.558
+++ cups.spec	8 Dec 2009 12:26:22 -0000	1.559
@@ -69,6 +69,7 @@ Patch42: cups-sidechannel-intrs.patch
 Patch43: cups-media-empty-warning.patch
 Patch44: cups-str3435.patch
 Patch45: cups-str3436.patch
+Patch46: cups-str3425.patch
 
 Patch100: cups-lspp.patch
 
@@ -243,6 +244,7 @@ module. 
 %patch43 -p1 -b .media-empty-warning
 %patch44 -p1 -b .str3435
 %patch45 -p1 -b .str3436
+%patch46 -p1 -b .str3425
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -542,6 +544,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler did not clean out completed jobs when
+  PreserveJobHistory was turned off (STR #3425).
 - The web interface did not show completed jobs (STR #3436).
 - Authenticated printing did not always work when printing directly to
   a remote server (STR #3435).



From twaugh at fedoraproject.org  Tue Dec  8 12:26:48 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:26:48 +0000 (UTC)
Subject: rpms/cups/devel cups-str3425.patch,NONE,1.1 cups.spec,1.560,1.561
Message-ID: <20091208122648.EBE7811C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11572

Modified Files:
	cups.spec 
Added Files:
	cups-str3425.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler did not clean out completed jobs when
  PreserveJobHistory was turned off (STR #3425).


cups-str3425.patch:
 job.c  |    6 ++----
 main.c |   21 +++++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

--- NEW FILE cups-str3425.patch ---
diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
--- cups-1.4.2/scheduler/job.c.str3425	2009-12-08 12:23:15.694500898 +0000
+++ cups-1.4.2/scheduler/job.c	2009-12-08 12:23:35.005500733 +0000
@@ -444,11 +444,11 @@ cupsdCleanJobs(void)
   cupsd_job_t	*job;			/* Current job */
 
 
-  if (MaxJobs <= 0)
+  if (MaxJobs <= 0 && JobHistory)
     return;
 
   for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
-       job && cupsArrayCount(Jobs) >= MaxJobs;
+       job && (cupsArrayCount(Jobs) >= MaxJobs || !JobHistory);
        job = (cupsd_job_t *)cupsArrayNext(Jobs))
     if (job->state_value >= IPP_JOB_CANCELED && !job->printer)
       cupsdDeleteJob(job, CUPSD_JOB_PURGE);
@@ -2670,8 +2670,6 @@ cupsdSetJobState(
 	  job->dirty = 1;
 	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
 	}
-	else if (!job->printer)
-	  cupsdDeleteJob(job, CUPSD_JOB_PURGE);
 	break;
   }
 
diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
--- cups-1.4.2/scheduler/main.c.str3425	2009-12-08 12:23:15.695501397 +0000
+++ cups-1.4.2/scheduler/main.c	2009-12-08 12:23:35.007501250 +0000
@@ -397,7 +397,7 @@ main(int  argc,				/* I - Number of comm
     * parent's file descriptors to be blocking.  This is a workaround for a
     * limitation of userland libpthread on OpenBSD.
     */
-   
+
     _thread_sys_closefrom(0);
 #endif /* __OpenBSD__ */
 
@@ -844,8 +844,8 @@ main(int  argc,				/* I - Number of comm
 
     if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
         !cupsArrayCount(ActiveJobs) &&
-	(!Browsing || 
-	 (!BrowseRemoteProtocols && 
+	(!Browsing ||
+	 (!BrowseRemoteProtocols &&
 	  (!NumBrowsers || !BrowseLocalProtocols ||
 	   cupsArrayCount(Printers) == 0))))
     {
@@ -1073,6 +1073,7 @@ main(int  argc,				/* I - Number of comm
     if ((current_time - senddoc_time) >= 10)
     {
       cupsdCheckJobs();
+      cupsdCleanJobs();
       senddoc_time = current_time;
     }
 
@@ -1231,8 +1232,8 @@ main(int  argc,				/* I - Number of comm
 #endif /* HAVE_GSSAPI */
 
 #if defined(__APPLE__) && defined(HAVE_DLFCN_H)
- /* 
-  * Unload Print Service quota enforcement library (X Server only) 
+ /*
+  * Unload Print Service quota enforcement library (X Server only)
   */
 
   PSQUpdateQuotaProc = NULL;
@@ -1594,13 +1595,13 @@ launchd_checkin(void)
 
 	if (lis)
 	{
-	  cupsdLogMessage(CUPSD_LOG_DEBUG, 
+	  cupsdLogMessage(CUPSD_LOG_DEBUG,
 		  "launchd_checkin: Matched existing listener %s with fd %d...",
 		  httpAddrString(&(lis->address), s, sizeof(s)), fd);
 	}
 	else
 	{
-	  cupsdLogMessage(CUPSD_LOG_DEBUG, 
+	  cupsdLogMessage(CUPSD_LOG_DEBUG,
 		  "launchd_checkin: Adding new listener %s with fd %d...",
 		  httpAddrString(&addr, s, sizeof(s)), fd);
 
@@ -1654,12 +1655,12 @@ launchd_checkout(void)
 
  /*
   * Create or remove the launchd KeepAlive file based on whether
-  * there are active jobs, polling, browsing for remote printers or 
+  * there are active jobs, polling, browsing for remote printers or
   * shared printers to advertise...
   */
 
-  if ((cupsArrayCount(ActiveJobs) || NumPolled || 
-       (Browsing && 
+  if ((cupsArrayCount(ActiveJobs) || NumPolled ||
+       (Browsing &&
 	(BrowseRemoteProtocols ||
         (BrowseLocalProtocols && NumBrowsers && cupsArrayCount(Printers))))))
   {


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -p -r1.560 -r1.561
--- cups.spec	8 Dec 2009 12:22:49 -0000	1.560
+++ cups.spec	8 Dec 2009 12:26:48 -0000	1.561
@@ -67,6 +67,7 @@ Patch42: cups-sidechannel-intrs.patch
 Patch43: cups-media-empty-warning.patch
 Patch44: cups-str3435.patch
 Patch45: cups-str3436.patch
+Patch46: cups-str3425.patch
 
 Patch100: cups-lspp.patch
 
@@ -241,6 +242,7 @@ module. 
 %patch43 -p1 -b .media-empty-warning
 %patch44 -p1 -b .str3435
 %patch45 -p1 -b .str3436
+%patch46 -p1 -b .str3425
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -532,6 +534,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler did not clean out completed jobs when
+  PreserveJobHistory was turned off (STR #3425).
 - The web interface did not show completed jobs (STR #3436).
 - Authenticated printing did not always work when printing directly to
   a remote server (STR #3435).



From thias at fedoraproject.org  Tue Dec  8 12:27:08 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 12:27:08 +0000 (UTC)
Subject: File p7zip_9.04_src_all-norar.tar.bz2 uploaded to lookaside cache by
	thias
Message-ID: <20091208122708.5AAA010F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for p7zip:

8bc7e82ae226a77cd4c9bd8c30be1661  p7zip_9.04_src_all-norar.tar.bz2



From thias at fedoraproject.org  Tue Dec  8 12:28:00 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 12:28:00 +0000 (UTC)
Subject: rpms/p7zip/devel p7zip_9.04-norar.patch, NONE, 1.1 .cvsignore, 1.13,
	1.14 p7zip.spec, 1.25, 1.26 sources, 1.13,
	1.14 p7zip_4.65-norar.patch, 1.1, NONE
Message-ID: <20091208122800.CB12A11C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/p7zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11855

Modified Files:
	.cvsignore p7zip.spec sources 
Added Files:
	p7zip_9.04-norar.patch 
Removed Files:
	p7zip_4.65-norar.patch 
Log Message:
Update to 9.04.


p7zip_9.04-norar.patch:
 CPP/7zip/Bundles/Format7zFree/makefile      |   18 ------------------
 CPP/7zip/Bundles/Format7zFree/makefile.list |    9 ---------
 makefile                                    |    3 ---
 3 files changed, 30 deletions(-)

--- NEW FILE p7zip_9.04-norar.patch ---
diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile
--- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile	2009-06-04 21:06:49.000000000 +0200
+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile	2009-12-08 13:21:22.713559220 +0100
@@ -150,14 +150,6 @@ NSIS_OBJS = \
   NsisIn.o \
   NsisRegister.o \
 
-RAR_OBJS = \
-  RarHandler.o \
-  RarHeader.o \
-  RarIn.o \
-  RarItem.o \
-  RarVolumeInStream.o \
-  RarRegister.o \
-
 TAR_OBJS = \
   TarHandler.o \
   TarHandlerOut.o \
@@ -233,13 +225,6 @@ COMPRESS_OBJS = \
   ZlibDecoder.o \
   ZDecoder.o \
 
-COMPRESS_OBJS_NON_FREE = \
-  Rar1Decoder.o \
-  Rar2Decoder.o \
-  Rar3Decoder.o \
-  Rar3Vm.o \
-  RarCodecsRegister.o \
-
 CRYPTO_OBJS = \
   7zAes.o \
   7zAesRegister.o \
@@ -247,8 +232,6 @@ CRYPTO_OBJS = \
   MyAes.o \
   Pbkdf2HmacSha1.o \
   RandGen.o \
-  Rar20Crypto.o \
-  RarAes.o \
   Sha1.o \
   WzAes.o \
   ZipCrypto.o \
@@ -298,7 +281,6 @@ OBJS = \
   $(HFS_OBJS) \
   $(ISO_OBJS) \
   $(NSIS_OBJS) \
-  $(RAR_OBJS) \
   $(TAR_OBJS) \
   $(UDF_OBJS) \
   $(WIM_OBJS) \
diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list
--- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list	2009-06-04 21:01:21.000000000 +0200
+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list	2009-12-08 13:21:52.858319619 +0100
@@ -124,13 +124,6 @@ SRCS=\
  ../../Archive/Nsis/NsisIn.cpp \
  ../../Archive/Nsis/NsisRegister.cpp \
  \
- ../../Archive/Rar/RarHandler.cpp \
- ../../Archive/Rar/RarHeader.cpp \
- ../../Archive/Rar/RarIn.cpp \
- ../../Archive/Rar/RarItem.cpp \
- ../../Archive/Rar/RarVolumeInStream.cpp \
- ../../Archive/Rar/RarRegister.cpp \
- \
  ../../Archive/Tar/TarHandler.cpp \
  ../../Archive/Tar/TarHandlerOut.cpp \
  ../../Archive/Tar/TarHeader.cpp \
@@ -212,8 +205,6 @@ SRCS=\
  ../../Crypto/RandGen.cpp \
  ../../Crypto/Sha1.cpp \
  ../../Crypto/WzAes.cpp \
- ../../Crypto/Rar20Crypto.cpp \
- ../../Crypto/RarAes.cpp \
  ../../Crypto/ZipCrypto.cpp \
  ../../Crypto/ZipStrong.cpp
 
diff -Naupr p7zip_9.04.orig/makefile p7zip_9.04/makefile
--- p7zip_9.04.orig/makefile	2009-06-04 20:28:50.000000000 +0200
+++ p7zip_9.04/makefile	2009-12-08 13:22:30.120194667 +0100
@@ -41,7 +41,6 @@ depend:
 	cd CPP/7zip/UI/Client7z       ; $(MAKE) depend
 	cd CPP/7zip/UI/Console        ; $(MAKE) depend
 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
-	cd CPP/7zip/Compress/Rar      ; $(MAKE) depend
 	cd CPP/7zip/UI/GUI            ; $(MAKE) depend
 
 sfx: common
@@ -51,7 +50,6 @@ sfx: common
 common7z:common
 	$(MKDIR) bin/Codecs
 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
-	cd CPP/7zip/Compress/Rar         ; $(MAKE) all
 
 7z: common7z
 	cd CPP/7zip/UI/Console           ; $(MAKE) all
@@ -71,7 +69,6 @@ clean:
 	cd CPP/7zip/UI/FileManager       ; $(MAKE) clean
 	cd CPP/7zip/UI/GUI               ; $(MAKE) clean
 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
-	cd CPP/7zip/Compress/Rar         ; $(MAKE) clean
 	cd CPP/7zip/Compress/LZMA_Alone  ; $(MAKE) clean
 	cd CPP/7zip/Compress/PPMD_Alone  ; $(MAKE) clean
 	cd CPP/7zip/Bundles/AloneGCOV    ; $(MAKE) clean


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Apr 2009 18:58:38 -0000	1.13
+++ .cvsignore	8 Dec 2009 12:28:00 -0000	1.14
@@ -1 +1 @@
-p7zip_4.65_src_all-norar.tar.bz2
+p7zip_9.04_src_all-norar.tar.bz2


Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- p7zip.spec	25 Jul 2009 21:04:04 -0000	1.25
+++ p7zip.spec	8 Dec 2009 12:28:00 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
-Version: 4.65
-Release: 2%{?dist}
+Version: 9.04
+Release: 1%{?dist}
 # Files under C/Compress/Lzma/ are dual LGPL or CPL
 License: LGPLv2 and (LGPLv2+ or CPL)
 Group: Applications/Archiving
@@ -15,7 +15,7 @@ URL: http://p7zip.sourceforge.net/
 # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt
 # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION}
 Source: p7zip_%{version}_src_all-norar.tar.bz2
-Patch0: p7zip_4.65-norar.patch
+Patch0: p7zip_9.04-norar.patch
 Patch1: p7zip_4.58-install.patch
 Patch2: p7zip_4.51-nostrip.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -111,6 +111,10 @@ find contrib -type f -exec chmod -x {} \
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 9.04-1
+- Update to 9.04.
+- Update norar patch.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.65-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Apr 2009 18:58:38 -0000	1.13
+++ sources	8 Dec 2009 12:28:00 -0000	1.14
@@ -1 +1 @@
-41e748eccdf42d1cc7f84d22c6fb815b  p7zip_4.65_src_all-norar.tar.bz2
+8bc7e82ae226a77cd4c9bd8c30be1661  p7zip_9.04_src_all-norar.tar.bz2


--- p7zip_4.65-norar.patch DELETED ---



From twaugh at fedoraproject.org  Tue Dec  8 12:30:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:30:16 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3428.patch,NONE,1.1 cups.spec,1.552,1.553
Message-ID: <20091208123016.E09CD11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12778

Modified Files:
	cups.spec 
Added Files:
	cups-str3428.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler added two job-name attributes to each job object
  (STR #3428).


cups-str3428.patch:
 ipp.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE cups-str3428.patch ---
diff -up cups-1.4.2/scheduler/ipp.c.str3428 cups-1.4.2/scheduler/ipp.c
--- cups-1.4.2/scheduler/ipp.c.str3428	2009-12-08 12:24:31.177373309 +0000
+++ cups-1.4.2/scheduler/ipp.c	2009-12-08 12:27:33.910498083 +0000
@@ -1860,8 +1860,6 @@ add_job(cupsd_client_t  *con,		/* I - Cl
                               "job-media-sheets-completed", 0);
   ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-printer-uri", NULL,
                printer->uri);
-  ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
-               title);
 
   if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
                                IPP_TAG_INTEGER)) != NULL)
@@ -3438,7 +3436,7 @@ apple_register_profiles(
       num_profiles ++;
     }
 
-  
+
  /*
   * If we have profiles, add them...
   */
@@ -3484,7 +3482,7 @@ apple_register_profiles(
 	snprintf(q_keyword, sizeof(q_keyword), "Default%s", attr->value);
 	q2_attr = ppdFindAttr(ppd, q_keyword, NULL);
       }
-      else 
+      else
 	q2_attr = ppdFindAttr(ppd, "DefaultMediaType", NULL);
 
       if (q2_attr && q2_attr->value && q2_attr->value[0])
@@ -3498,7 +3496,7 @@ apple_register_profiles(
 	snprintf(q_keyword, sizeof(q_keyword), "Default%s", attr->value);
 	q3_attr = ppdFindAttr(ppd, q_keyword, NULL);
       }
-      else 
+      else
 	q3_attr = ppdFindAttr(ppd, "DefaultResolution", NULL);
 
       if (q3_attr && q3_attr->value && q3_attr->value[0])
@@ -3667,7 +3665,7 @@ apple_register_profiles(
     attr = ppdFindAttr(ppd, "DefaultColorSpace", NULL);
 
     num_profiles = (attr && ppd->colorspace == PPD_CS_GRAY) ? 1 : 2;
-      
+
     if ((profiles = calloc(num_profiles, sizeof(CMDeviceProfileArray))) == NULL)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
@@ -4762,7 +4760,7 @@ check_quotas(cupsd_client_t  *con,	/* I 
     if (q->page_count == -4) /* special case: unlimited user */
     {
       cupsdLogMessage(CUPSD_LOG_INFO,
-                      "User \"%s\" request approved for printer %s (%s): " 
+                      "User \"%s\" request approved for printer %s (%s): "
 		      "unlimited quota.",
 		      username, p->name, p->info);
       q->page_count = 0; /* allow user to print */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -p -r1.552 -r1.553
--- cups.spec	8 Dec 2009 12:25:07 -0000	1.552
+++ cups.spec	8 Dec 2009 12:30:16 -0000	1.553
@@ -71,6 +71,7 @@ Patch57: cups-media-empty-warning.patch
 Patch58: cups-str3435.patch
 Patch59: cups-str3436.patch
 Patch60: cups-str3425.patch
+Patch61: cups-str3428.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -246,6 +247,7 @@ module. 
 %patch58 -p1 -b .str3435
 %patch59 -p1 -b .str3436
 %patch60 -p1 -b .str3425
+%patch61 -p1 -b .str3428
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -538,6 +540,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler added two job-name attributes to each job object
+  (STR #3428).
 - The scheduler did not clean out completed jobs when
   PreserveJobHistory was turned off (STR #3425).
 - The web interface did not show completed jobs (STR #3436).



From twaugh at fedoraproject.org  Tue Dec  8 12:31:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:31:05 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3428.patch,NONE,1.1 cups.spec,1.559,1.560
Message-ID: <20091208123105.B349011C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13076

Modified Files:
	cups.spec 
Added Files:
	cups-str3428.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler added two job-name attributes to each job object
  (STR #3428).


cups-str3428.patch:
 ipp.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE cups-str3428.patch ---
diff -up cups-1.4.2/scheduler/ipp.c.str3428 cups-1.4.2/scheduler/ipp.c
--- cups-1.4.2/scheduler/ipp.c.str3428	2009-12-08 12:24:31.177373309 +0000
+++ cups-1.4.2/scheduler/ipp.c	2009-12-08 12:27:33.910498083 +0000
@@ -1860,8 +1860,6 @@ add_job(cupsd_client_t  *con,		/* I - Cl
                               "job-media-sheets-completed", 0);
   ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-printer-uri", NULL,
                printer->uri);
-  ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
-               title);
 
   if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
                                IPP_TAG_INTEGER)) != NULL)
@@ -3438,7 +3436,7 @@ apple_register_profiles(
       num_profiles ++;
     }
 
-  
+
  /*
   * If we have profiles, add them...
   */
@@ -3484,7 +3482,7 @@ apple_register_profiles(
 	snprintf(q_keyword, sizeof(q_keyword), "Default%s", attr->value);
 	q2_attr = ppdFindAttr(ppd, q_keyword, NULL);
       }
-      else 
+      else
 	q2_attr = ppdFindAttr(ppd, "DefaultMediaType", NULL);
 
       if (q2_attr && q2_attr->value && q2_attr->value[0])
@@ -3498,7 +3496,7 @@ apple_register_profiles(
 	snprintf(q_keyword, sizeof(q_keyword), "Default%s", attr->value);
 	q3_attr = ppdFindAttr(ppd, q_keyword, NULL);
       }
-      else 
+      else
 	q3_attr = ppdFindAttr(ppd, "DefaultResolution", NULL);
 
       if (q3_attr && q3_attr->value && q3_attr->value[0])
@@ -3667,7 +3665,7 @@ apple_register_profiles(
     attr = ppdFindAttr(ppd, "DefaultColorSpace", NULL);
 
     num_profiles = (attr && ppd->colorspace == PPD_CS_GRAY) ? 1 : 2;
-      
+
     if ((profiles = calloc(num_profiles, sizeof(CMDeviceProfileArray))) == NULL)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
@@ -4762,7 +4760,7 @@ check_quotas(cupsd_client_t  *con,	/* I 
     if (q->page_count == -4) /* special case: unlimited user */
     {
       cupsdLogMessage(CUPSD_LOG_INFO,
-                      "User \"%s\" request approved for printer %s (%s): " 
+                      "User \"%s\" request approved for printer %s (%s): "
 		      "unlimited quota.",
 		      username, p->name, p->info);
       q->page_count = 0; /* allow user to print */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -p -r1.559 -r1.560
--- cups.spec	8 Dec 2009 12:26:22 -0000	1.559
+++ cups.spec	8 Dec 2009 12:31:05 -0000	1.560
@@ -70,6 +70,7 @@ Patch43: cups-media-empty-warning.patch
 Patch44: cups-str3435.patch
 Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
+Patch47: cups-str3428.patch
 
 Patch100: cups-lspp.patch
 
@@ -245,6 +246,7 @@ module. 
 %patch44 -p1 -b .str3435
 %patch45 -p1 -b .str3436
 %patch46 -p1 -b .str3425
+%patch47 -p1 -b .str3428
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -544,6 +546,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler added two job-name attributes to each job object
+  (STR #3428).
 - The scheduler did not clean out completed jobs when
   PreserveJobHistory was turned off (STR #3425).
 - The web interface did not show completed jobs (STR #3436).



From twaugh at fedoraproject.org  Tue Dec  8 12:31:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:31:35 +0000 (UTC)
Subject: rpms/cups/devel cups-str3428.patch,NONE,1.1 cups.spec,1.561,1.562
Message-ID: <20091208123135.F184711C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13266

Modified Files:
	cups.spec 
Added Files:
	cups-str3428.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler added two job-name attributes to each job object
  (STR #3428).


cups-str3428.patch:
 ipp.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE cups-str3428.patch ---
diff -up cups-1.4.2/scheduler/ipp.c.str3428 cups-1.4.2/scheduler/ipp.c
--- cups-1.4.2/scheduler/ipp.c.str3428	2009-12-08 12:24:31.177373309 +0000
+++ cups-1.4.2/scheduler/ipp.c	2009-12-08 12:27:33.910498083 +0000
@@ -1860,8 +1860,6 @@ add_job(cupsd_client_t  *con,		/* I - Cl
                               "job-media-sheets-completed", 0);
   ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-printer-uri", NULL,
                printer->uri);
-  ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
-               title);
 
   if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
                                IPP_TAG_INTEGER)) != NULL)
@@ -3438,7 +3436,7 @@ apple_register_profiles(
       num_profiles ++;
     }
 
-  
+
  /*
   * If we have profiles, add them...
   */
@@ -3484,7 +3482,7 @@ apple_register_profiles(
 	snprintf(q_keyword, sizeof(q_keyword), "Default%s", attr->value);
 	q2_attr = ppdFindAttr(ppd, q_keyword, NULL);
       }
-      else 
+      else
 	q2_attr = ppdFindAttr(ppd, "DefaultMediaType", NULL);
 
       if (q2_attr && q2_attr->value && q2_attr->value[0])
@@ -3498,7 +3496,7 @@ apple_register_profiles(
 	snprintf(q_keyword, sizeof(q_keyword), "Default%s", attr->value);
 	q3_attr = ppdFindAttr(ppd, q_keyword, NULL);
       }
-      else 
+      else
 	q3_attr = ppdFindAttr(ppd, "DefaultResolution", NULL);
 
       if (q3_attr && q3_attr->value && q3_attr->value[0])
@@ -3667,7 +3665,7 @@ apple_register_profiles(
     attr = ppdFindAttr(ppd, "DefaultColorSpace", NULL);
 
     num_profiles = (attr && ppd->colorspace == PPD_CS_GRAY) ? 1 : 2;
-      
+
     if ((profiles = calloc(num_profiles, sizeof(CMDeviceProfileArray))) == NULL)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
@@ -4762,7 +4760,7 @@ check_quotas(cupsd_client_t  *con,	/* I 
     if (q->page_count == -4) /* special case: unlimited user */
     {
       cupsdLogMessage(CUPSD_LOG_INFO,
-                      "User \"%s\" request approved for printer %s (%s): " 
+                      "User \"%s\" request approved for printer %s (%s): "
 		      "unlimited quota.",
 		      username, p->name, p->info);
       q->page_count = 0; /* allow user to print */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -p -r1.561 -r1.562
--- cups.spec	8 Dec 2009 12:26:48 -0000	1.561
+++ cups.spec	8 Dec 2009 12:31:35 -0000	1.562
@@ -68,6 +68,7 @@ Patch43: cups-media-empty-warning.patch
 Patch44: cups-str3435.patch
 Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
+Patch47: cups-str3428.patch
 
 Patch100: cups-lspp.patch
 
@@ -243,6 +244,7 @@ module. 
 %patch44 -p1 -b .str3435
 %patch45 -p1 -b .str3436
 %patch46 -p1 -b .str3425
+%patch47 -p1 -b .str3428
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -534,6 +536,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler added two job-name attributes to each job object
+  (STR #3428).
 - The scheduler did not clean out completed jobs when
   PreserveJobHistory was turned off (STR #3425).
 - The web interface did not show completed jobs (STR #3436).



From thias at fedoraproject.org  Tue Dec  8 12:32:05 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 12:32:05 +0000 (UTC)
Subject: File osslsigncode-1.3.1.tar.gz uploaded to lookaside cache by thias
Message-ID: <20091208123205.4709210F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for osslsigncode:

1f2b818012a3e73ec6dac22ec09c8cf3  osslsigncode-1.3.1.tar.gz



From thias at fedoraproject.org  Tue Dec  8 12:32:32 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 12:32:32 +0000 (UTC)
Subject: rpms/osslsigncode/devel .cvsignore, 1.3, 1.4 osslsigncode.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20091208123232.A7E6111C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/osslsigncode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13505

Modified Files:
	.cvsignore osslsigncode.spec sources 
Log Message:
Update to 1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osslsigncode/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Feb 2009 21:51:47 -0000	1.3
+++ .cvsignore	8 Dec 2009 12:32:32 -0000	1.4
@@ -1 +1 @@
-osslsigncode-1.3.tar.gz
+osslsigncode-1.3.1.tar.gz


Index: osslsigncode.spec
===================================================================
RCS file: /cvs/extras/rpms/osslsigncode/devel/osslsigncode.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- osslsigncode.spec	21 Aug 2009 15:10:39 -0000	1.7
+++ osslsigncode.spec	8 Dec 2009 12:32:32 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Tool for Authenticode signing of EXE/CAB files
 Name: osslsigncode
-Version: 1.3
-Release: 3%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://sourceforge.net/projects/osslsigncode/
@@ -40,6 +40,9 @@ Tool for Authenticode signing of EXE/CAB
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-1
+- Update to 1.3.1.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osslsigncode/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Feb 2009 21:51:47 -0000	1.3
+++ sources	8 Dec 2009 12:32:32 -0000	1.4
@@ -1 +1 @@
-f269f427ae31c9c926c0e7d88768e9b4  osslsigncode-1.3.tar.gz
+1f2b818012a3e73ec6dac22ec09c8cf3  osslsigncode-1.3.1.tar.gz



From twaugh at fedoraproject.org  Tue Dec  8 12:33:34 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:33:34 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3431.patch,NONE,1.1 cups.spec,1.553,1.554
Message-ID: <20091208123334.DFE9111C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14029

Modified Files:
	cups.spec 
Added Files:
	cups-str3431.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler did not use the Get-Job-Attributes policy for a
  printer (STR #3431).


cups-str3431.patch:
 ipp.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3431.patch ---
diff -up cups-1.4.2/scheduler/ipp.c.str3431 cups-1.4.2/scheduler/ipp.c
--- cups-1.4.2/scheduler/ipp.c.str3431	2009-12-08 12:28:21.095374048 +0000
+++ cups-1.4.2/scheduler/ipp.c	2009-12-08 12:32:03.829498891 +0000
@@ -7183,6 +7183,7 @@ get_job_attrs(cupsd_client_t  *con,	/* I
   ipp_attribute_t *attr;		/* Current attribute */
   int		jobid;			/* Job ID */
   cupsd_job_t	*job;			/* Current job */
+  cupsd_printer_t *printer;		/* Current printer */
   char		scheme[HTTP_MAX_URI],	/* Method portion of URI */
 		username[HTTP_MAX_URI],	/* Username portion of URI */
 		host[HTTP_MAX_URI],	/* Host portion of URI */
@@ -7257,7 +7258,19 @@ get_job_attrs(cupsd_client_t  *con,	/* I
   * Check policy...
   */
 
-  if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+  if ((printer = job->printer) == NULL)
+    printer = cupsdFindDest(job->dest);
+
+  if (printer)
+  {
+    if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con,
+                                   NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, printer);
+      return;
+    }
+  }
+  else if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
   {
     send_http_error(con, status, NULL);
     return;


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -p -r1.553 -r1.554
--- cups.spec	8 Dec 2009 12:30:16 -0000	1.553
+++ cups.spec	8 Dec 2009 12:33:34 -0000	1.554
@@ -72,6 +72,7 @@ Patch58: cups-str3435.patch
 Patch59: cups-str3436.patch
 Patch60: cups-str3425.patch
 Patch61: cups-str3428.patch
+Patch62: cups-str3431.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -248,6 +249,7 @@ module. 
 %patch59 -p1 -b .str3436
 %patch60 -p1 -b .str3425
 %patch61 -p1 -b .str3428
+%patch62 -p1 -b .str3431
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -540,6 +542,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler did not use the Get-Job-Attributes policy for a
+  printer (STR #3431).
 - The scheduler added two job-name attributes to each job object
   (STR #3428).
 - The scheduler did not clean out completed jobs when



From twaugh at fedoraproject.org  Tue Dec  8 12:34:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:34:19 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3431.patch,NONE,1.1 cups.spec,1.560,1.561
Message-ID: <20091208123419.0AE6F11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14349

Modified Files:
	cups.spec 
Added Files:
	cups-str3431.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler did not use the Get-Job-Attributes policy for a
  printer (STR #3431).


cups-str3431.patch:
 ipp.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3431.patch ---
diff -up cups-1.4.2/scheduler/ipp.c.str3431 cups-1.4.2/scheduler/ipp.c
--- cups-1.4.2/scheduler/ipp.c.str3431	2009-12-08 12:28:21.095374048 +0000
+++ cups-1.4.2/scheduler/ipp.c	2009-12-08 12:32:03.829498891 +0000
@@ -7183,6 +7183,7 @@ get_job_attrs(cupsd_client_t  *con,	/* I
   ipp_attribute_t *attr;		/* Current attribute */
   int		jobid;			/* Job ID */
   cupsd_job_t	*job;			/* Current job */
+  cupsd_printer_t *printer;		/* Current printer */
   char		scheme[HTTP_MAX_URI],	/* Method portion of URI */
 		username[HTTP_MAX_URI],	/* Username portion of URI */
 		host[HTTP_MAX_URI],	/* Host portion of URI */
@@ -7257,7 +7258,19 @@ get_job_attrs(cupsd_client_t  *con,	/* I
   * Check policy...
   */
 
-  if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+  if ((printer = job->printer) == NULL)
+    printer = cupsdFindDest(job->dest);
+
+  if (printer)
+  {
+    if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con,
+                                   NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, printer);
+      return;
+    }
+  }
+  else if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
   {
     send_http_error(con, status, NULL);
     return;


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -p -r1.560 -r1.561
--- cups.spec	8 Dec 2009 12:31:05 -0000	1.560
+++ cups.spec	8 Dec 2009 12:34:18 -0000	1.561
@@ -71,6 +71,7 @@ Patch44: cups-str3435.patch
 Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
+Patch48: cups-str3431.patch
 
 Patch100: cups-lspp.patch
 
@@ -247,6 +248,7 @@ module. 
 %patch45 -p1 -b .str3436
 %patch46 -p1 -b .str3425
 %patch47 -p1 -b .str3428
+%patch48 -p1 -b .str3431
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -546,6 +548,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler did not use the Get-Job-Attributes policy for a
+  printer (STR #3431).
 - The scheduler added two job-name attributes to each job object
   (STR #3428).
 - The scheduler did not clean out completed jobs when



From twaugh at fedoraproject.org  Tue Dec  8 12:34:48 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 12:34:48 +0000 (UTC)
Subject: rpms/cups/devel cups-str3431.patch,NONE,1.1 cups.spec,1.562,1.563
Message-ID: <20091208123448.BDA5311C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14549

Modified Files:
	cups.spec 
Added Files:
	cups-str3431.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- The scheduler did not use the Get-Job-Attributes policy for a
  printer (STR #3431).


cups-str3431.patch:
 ipp.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3431.patch ---
diff -up cups-1.4.2/scheduler/ipp.c.str3431 cups-1.4.2/scheduler/ipp.c
--- cups-1.4.2/scheduler/ipp.c.str3431	2009-12-08 12:28:21.095374048 +0000
+++ cups-1.4.2/scheduler/ipp.c	2009-12-08 12:32:03.829498891 +0000
@@ -7183,6 +7183,7 @@ get_job_attrs(cupsd_client_t  *con,	/* I
   ipp_attribute_t *attr;		/* Current attribute */
   int		jobid;			/* Job ID */
   cupsd_job_t	*job;			/* Current job */
+  cupsd_printer_t *printer;		/* Current printer */
   char		scheme[HTTP_MAX_URI],	/* Method portion of URI */
 		username[HTTP_MAX_URI],	/* Username portion of URI */
 		host[HTTP_MAX_URI],	/* Host portion of URI */
@@ -7257,7 +7258,19 @@ get_job_attrs(cupsd_client_t  *con,	/* I
   * Check policy...
   */
 
-  if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+  if ((printer = job->printer) == NULL)
+    printer = cupsdFindDest(job->dest);
+
+  if (printer)
+  {
+    if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con,
+                                   NULL)) != HTTP_OK)
+    {
+      send_http_error(con, status, printer);
+      return;
+    }
+  }
+  else if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
   {
     send_http_error(con, status, NULL);
     return;


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -p -r1.562 -r1.563
--- cups.spec	8 Dec 2009 12:31:35 -0000	1.562
+++ cups.spec	8 Dec 2009 12:34:48 -0000	1.563
@@ -69,6 +69,7 @@ Patch44: cups-str3435.patch
 Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
+Patch48: cups-str3431.patch
 
 Patch100: cups-lspp.patch
 
@@ -245,6 +246,7 @@ module. 
 %patch45 -p1 -b .str3436
 %patch46 -p1 -b .str3425
 %patch47 -p1 -b .str3428
+%patch48 -p1 -b .str3431
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -536,6 +538,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
+- The scheduler did not use the Get-Job-Attributes policy for a
+  printer (STR #3431).
 - The scheduler added two job-name attributes to each job object
   (STR #3428).
 - The scheduler did not clean out completed jobs when



From th0br0 at fedoraproject.org  Tue Dec  8 12:43:31 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 12:43:31 +0000 (UTC)
Subject: File almanah-0.6.1.tar.gz uploaded to lookaside cache by th0br0
Message-ID: <20091208124331.8C88D10F87F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for almanah:

cca92b59002fa9e0515287f3df38cb1c  almanah-0.6.1.tar.gz



From pbrady at fedoraproject.org  Tue Dec  8 12:44:39 2009
From: pbrady at fedoraproject.org (=?utf-8?q?P=C3=A1draig_Brady?=)
Date: Tue,  8 Dec 2009 12:44:39 +0000 (UTC)
Subject: rpms/libunistring/F-12 libunistring.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091208124439.81D3B11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/libunistring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17336

Modified Files:
	.cvsignore sources 
Added Files:
	libunistring.spec 
Log Message:
initial version


--- NEW FILE libunistring.spec ---
Name: libunistring
Version: 0.9.1
Release: 3%{?dist}
Group: System Environment/Libraries
Summary: GNU Unicode string library
License: LGPLv3+
Url: http://www.gnu.org/software/libunistring/
Source0: http://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): info
Requires(preun): info

%description
This portable C library implements Unicode string types in three flavours:
(UTF-8, UTF-16, UTF-32), together with functions for character processing
(names, classifications, properties) and functions for string processing
(iteration, formatted output, width, word breaks, line breaks, normalization,
case folding and regular expressions).

%package devel
Group: Development/Libraries
Summary: GNU Unicode string library - development files
Requires: %{name} = %{version}-%{release}

%description devel
Development files for programs using libunistring.

%prep
%setup -q

%build
%configure --disable-static --disable-rpath
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS README
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root,-)
%doc HACKING DEPENDENCIES THANKS ChangeLog
%doc %{_datadir}/doc/%{name}/*.html
%{_infodir}/%{name}.info*
%{_libdir}/%{name}.so
%{_includedir}/unistring
%{_includedir}/*.h

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun devel
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/{%{name}.info %{_infodir}/dir || :
fi

%changelog
* Thu Nov 19 2009 P?draig Brady <P at draigBrady.com> 0.9.1-3
- Remove glibc-devel and texinfo build deps
* Thu Nov 19 2009 P?draig Brady <P at draigBrady.com> 0.9.1-2
- Changes as per initial review by panemade at gmail.com
* Tue Nov 17 2009 P?draig Brady <P at draigBrady.com> 0.9.1-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libunistring/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Nov 2009 22:37:45 -0000	1.1
+++ .cvsignore	8 Dec 2009 12:44:39 -0000	1.2
@@ -0,0 +1 @@
+libunistring-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libunistring/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Nov 2009 22:37:46 -0000	1.1
+++ sources	8 Dec 2009 12:44:39 -0000	1.2
@@ -0,0 +1 @@
+310ca03a47d2ee4decf9377d91bb3721  libunistring-0.9.1.tar.gz



From pkgdb at fedoraproject.org  Tue Dec  8 12:47:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 12:47:02 +0000
Subject: [pkgdb] synergy ownership updated
Message-ID: <20091208124702.1566910F801@bastion2.fedora.phx.redhat.com>

Package synergy in Fedora devel was orphaned by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synergy



From pkgdb at fedoraproject.org  Tue Dec  8 12:47:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 12:47:02 +0000
Subject: [pkgdb] synergy (un)retirement
Message-ID: <20091208124702.2F5E910F87F@bastion2.fedora.phx.redhat.com>

Package synergy in Fedora devel has been retired by thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synergy



From thias at fedoraproject.org  Tue Dec  8 12:49:56 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 12:49:56 +0000 (UTC)
Subject: rpms/synergy/devel dead.package, NONE, 1.1 .cvsignore, 1.9,
	NONE sources, 1.9, NONE synergy-1.3.1-X11-DPMS.patch, 1.2,
	NONE synergy-1.3.1-X11-selection.patch, 1.1,
	NONE synergy-1.3.1-copynpaste-crash.patch, 1.1,
	NONE synergy-1.3.1-gcc43.patch, 1.1,
	NONE synergy-1.3.1-stuttered-delay-fix-fix.patch, 1.1,
	NONE synergy-1.3.1-stuttered-delay-fix.patch, 1.1,
	NONE synergy-1.3.1-warnings.patch, 1.1, NONE synergy.spec, 1.29,
	NONE synergyc.1, 1.1, NONE synergys.1, 1.1, NONE
Message-ID: <20091208124956.807BE11C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18774

Added Files:
	dead.package 
Removed Files:
	.cvsignore sources synergy-1.3.1-X11-DPMS.patch 
	synergy-1.3.1-X11-selection.patch 
	synergy-1.3.1-copynpaste-crash.patch synergy-1.3.1-gcc43.patch 
	synergy-1.3.1-stuttered-delay-fix-fix.patch 
	synergy-1.3.1-stuttered-delay-fix.patch 
	synergy-1.3.1-warnings.patch synergy.spec synergyc.1 
	synergys.1 
Log Message:
Retire synergy, obsoleted by synergy-plus.



--- NEW FILE dead.package ---
Obsoleted by the synergy-plus fork, which is a drop-in replacement.


--- .cvsignore DELETED ---


--- sources DELETED ---


--- synergy-1.3.1-X11-DPMS.patch DELETED ---


--- synergy-1.3.1-X11-selection.patch DELETED ---


--- synergy-1.3.1-copynpaste-crash.patch DELETED ---


--- synergy-1.3.1-gcc43.patch DELETED ---


--- synergy-1.3.1-stuttered-delay-fix-fix.patch DELETED ---


--- synergy-1.3.1-stuttered-delay-fix.patch DELETED ---


--- synergy-1.3.1-warnings.patch DELETED ---


--- synergy.spec DELETED ---


--- synergyc.1 DELETED ---


--- synergys.1 DELETED ---



From thias at fedoraproject.org  Tue Dec  8 12:53:00 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 12:53:00 +0000 (UTC)
Subject: rpms/synergy/devel Makefile,1.3,NONE
Message-ID: <20091208125300.B0F0A11C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19700

Removed Files:
	Makefile 
Log Message:
Even remove Makefile.



--- Makefile DELETED ---



From thias at fedoraproject.org  Tue Dec  8 12:53:47 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 12:53:47 +0000 (UTC)
Subject: rpms/synergy-plus/devel synergy-plus.spec,1.3,1.4
Message-ID: <20091208125347.84D8C11C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy-plus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19930

Modified Files:
	synergy-plus.spec 
Log Message:
Obsolete synergy.



Index: synergy-plus.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/devel/synergy-plus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- synergy-plus.spec	24 Nov 2009 19:30:09 -0000	1.3
+++ synergy-plus.spec	8 Dec 2009 12:53:47 -0000	1.4
@@ -1,13 +1,17 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy-plus
 Version: 1.3.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://code.google.com/p/synergy-plus/
 Source: http://synergy-plus.googlecode.com/files/synergy-plus-%{version}.tar.gz
 Patch0: synergy-plus-1.3.4-xinitthreads.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# Useful for frontends such as quicksynergy (#524910)
+Provides: synergy = %{version}-%{release}
+# Last built version of the old synergy was 1.3.1-14.fc12
+Obsoletes: synergy < 1.3.1-15
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXtst-devel
@@ -57,6 +61,10 @@ find . -type f -name '*.cpp' -exec chmod
 
 
 %changelog
+* Mon Dec  7 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-5
+- Obsolete synergy (last upstream released version is from 2006) since synergy+
+  is a drop-in replacement (#538179).
+
 * Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-4
 - Disable XInitThreads() on RHEL to fix hang (upstream #194).
 



From steved at fedoraproject.org  Tue Dec  8 12:57:08 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue,  8 Dec 2009 12:57:08 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6.31-nfsd-proot.patch, NONE,
	1.1 kernel.spec, 
	1.1950, 1.1951 linux-2.6-nfsd4-proots.patch, 1.4, NONE
Message-ID: <20091208125708.AE44411C0264@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20923

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.31-nfsd-proot.patch 
Removed Files:
	linux-2.6-nfsd4-proots.patch 
Log Message:
nfsd: Updated to latest pseudo root code fixing rhbz# 538609


linux-2.6.31-nfsd-proot.patch:
 fs/nfsd/export.c            |    9 ++++++---
 fs/nfsd/nfs4xdr.c           |   10 +++++++---
 fs/nfsd/nfsfh.c             |   37 +++++++++++++++++++++++++++++++++++++
 fs/nfsd/vfs.c               |   30 ++++++++++++++++++++++++++----
 include/linux/nfsd/export.h |   12 +++++++++++-
 include/linux/nfsd/nfsd.h   |    5 +++++
 6 files changed, 92 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6.31-nfsd-proot.patch ---
diff -up linux-2.6.31.i686/fs/nfsd/export.c.save linux-2.6.31.i686/fs/nfsd/export.c
--- linux-2.6.31.i686/fs/nfsd/export.c.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/fs/nfsd/export.c	2009-12-07 12:15:32.000000000 -0500
@@ -362,10 +362,12 @@ static struct svc_export *svc_export_loo
 static int check_export(struct inode *inode, int flags, unsigned char *uuid)
 {
 
-	/* We currently export only dirs and regular files.
-	 * This is what umountd does.
+	/*
+	 * We currently export only dirs, regular files, and (for v4
+	 * pseudoroot) symlinks.
 	 */
 	if (!S_ISDIR(inode->i_mode) &&
+	    !S_ISLNK(inode->i_mode) &&
 	    !S_ISREG(inode->i_mode))
 		return -ENOTDIR;
 
@@ -1413,6 +1415,7 @@ static struct flags {
 	{ NFSEXP_CROSSMOUNT, {"crossmnt", ""}},
 	{ NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
 	{ NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
+	{ NFSEXP_V4ROOT, {"v4root", ""}},
 #ifdef MSNFS
 	{ NFSEXP_MSNFS, {"msnfs", ""}},
 #endif
@@ -1493,7 +1496,7 @@ static int e_show(struct seq_file *m, vo
 	struct svc_export *exp = container_of(cp, struct svc_export, h);
 
 	if (p == SEQ_START_TOKEN) {
-		seq_puts(m, "# Version 1.1\n");
+		seq_puts(m, "# Version 1.2\n");
 		seq_puts(m, "# Path Client(Flags) # IPs\n");
 		return 0;
 	}
diff -up linux-2.6.31.i686/fs/nfsd/nfs4xdr.c.save linux-2.6.31.i686/fs/nfsd/nfs4xdr.c
--- linux-2.6.31.i686/fs/nfsd/nfs4xdr.c.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/fs/nfsd/nfs4xdr.c	2009-12-07 12:15:32.000000000 -0500
@@ -2206,11 +2206,14 @@ nfsd4_encode_dirent_fattr(struct nfsd4_r
 	 * we will not follow the cross mount and will fill the attribtutes
 	 * directly from the mountpoint dentry.
 	 */
-	if (d_mountpoint(dentry) && !attributes_need_mount(cd->rd_bmval))
-		ignore_crossmnt = 1;
-	else if (d_mountpoint(dentry)) {
+	if (nfsd_mountpoint(dentry, exp)) {
 		int err;
 
+		if (!(exp->ex_flags & NFSEXP_V4ROOT)
+				&& !attributes_need_mount(cd->rd_bmval)) {
+			ignore_crossmnt = 1;
+			goto out_encode;
+		}
 		/*
 		 * Why the heck aren't we just using nfsd_lookup??
 		 * Different "."/".." handling?  Something else?
@@ -2226,6 +2229,7 @@ nfsd4_encode_dirent_fattr(struct nfsd4_r
 			goto out_put;
 
 	}
+out_encode:
 	nfserr = nfsd4_encode_fattr(NULL, exp, dentry, p, buflen, cd->rd_bmval,
 					cd->rd_rqstp, ignore_crossmnt);
 out_put:
diff -up linux-2.6.31.i686/fs/nfsd/nfsfh.c.save linux-2.6.31.i686/fs/nfsd/nfsfh.c
--- linux-2.6.31.i686/fs/nfsd/nfsfh.c.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/fs/nfsd/nfsfh.c	2009-12-07 12:15:32.000000000 -0500
@@ -109,6 +109,36 @@ static __be32 nfsd_setuser_and_check_por
 	return nfserrno(nfsd_setuser(rqstp, exp));
 }
 
+static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,
+	struct dentry *dentry, struct svc_export *exp)
+{
+	if (!(exp->ex_flags & NFSEXP_V4ROOT))
+		return nfs_ok;
+	/*
+	 * v2/v3 clients have no need for the V4ROOT export--they use
+	 * the mount protocl instead; also, further V4ROOT checks may be
+	 * in v4-specific code, in which case v2/v3 clients could bypass
+	 * them.
+	 */
+	if (!nfsd_v4client(rqstp))
+		return nfserr_stale;
+	/*
+	 * We're exposing only the directories and symlinks that have to be
+	 * traversed on the way to real exports:
+	 */
+	if (unlikely(!S_ISDIR(dentry->d_inode->i_mode) &&
+		     !S_ISLNK(dentry->d_inode->i_mode)))
+		return nfserr_stale;
+	/*
+	 * A pseudoroot export gives permission to access only one
+	 * single directory; the kernel has to make another upcall
+	 * before granting access to anything else under it:
+	 */
+	if (unlikely(dentry != exp->ex_path.dentry))
+		return nfserr_stale;
+	return nfs_ok;
+}
+
 /*
  * Use the given filehandle to look up the corresponding export and
  * dentry.  On success, the results are used to set fh_export and
@@ -317,6 +347,13 @@ fh_verify(struct svc_rqst *rqstp, struct
 			goto out;
 	}
 
+	/*
+	 * Do some spoof checking if we are on the pseudo root
+	 */
+	error = check_pseudo_root(rqstp, dentry, exp);
+	if (error)
+		goto out;
+
 	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
 	if (error)
 		goto out;
diff -up linux-2.6.31.i686/fs/nfsd/vfs.c.save linux-2.6.31.i686/fs/nfsd/vfs.c
--- linux-2.6.31.i686/fs/nfsd/vfs.c.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/fs/nfsd/vfs.c	2009-12-07 12:22:32.000000000 -0500
@@ -110,12 +110,21 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, s
 
 	exp2 = rqst_exp_get_by_name(rqstp, &path);
 	if (IS_ERR(exp2)) {
-		if (PTR_ERR(exp2) != -ENOENT)
-			err = PTR_ERR(exp2);
+		err = PTR_ERR(exp2);
+		/*
+		 * We normally allow NFS clients to continue
+		 * "underneath" a mountpoint that is not exported.
+		 * The exception is V4ROOT, where no traversal is ever
+		 * allowed without an explicit export of the new
+		 * directory.
+		 */
+		if (err == -ENOENT && !(exp->ex_flags & NFSEXP_V4ROOT))
+			err = 0;
 		path_put(&path);
 		goto out;
 	}
-	if ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) {
+	if (nfsd_v4client(rqstp) ||
+		(exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) {
 		/* successfully crossed mount point */
 		/*
 		 * This is subtle: path.dentry is *not* on path.mnt
@@ -134,6 +143,19 @@ out:
 	return err;
 }
 
+/*
+ * For nfsd purposes, we treat V4ROOT exports as though there was an
+ * export at *every* directory.
+ */
+int nfsd_mountpoint(struct dentry *dentry, struct svc_export *exp)
+{
+	if (d_mountpoint(dentry))
+		return 1;
+	if (!(exp->ex_flags & NFSEXP_V4ROOT))
+		return 0;
+	return dentry->d_inode != NULL;
+}
+
 __be32
 nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
 		   const char *name, unsigned int len,
@@ -201,7 +223,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
 		/*
 		 * check if we have crossed a mount point ...
 		 */
-		if (d_mountpoint(dentry)) {
+		if (nfsd_mountpoint(dentry, exp)) {
 			if ((host_err = nfsd_cross_mnt(rqstp, &dentry, &exp))) {
 				dput(dentry);
 				goto out_nfserr;
diff -up linux-2.6.31.i686/include/linux/nfsd/export.h.save linux-2.6.31.i686/include/linux/nfsd/export.h
--- linux-2.6.31.i686/include/linux/nfsd/export.h.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/include/linux/nfsd/export.h	2009-12-07 12:15:39.000000000 -0500
@@ -39,7 +39,17 @@
 #define NFSEXP_FSID		0x2000
 #define	NFSEXP_CROSSMOUNT	0x4000
 #define	NFSEXP_NOACL		0x8000	/* reserved for possible ACL related use */
-#define NFSEXP_ALLFLAGS		0xFE3F
+/*
+ * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
+ * clients, and only to the single directory that is the root of the
+ * export; further lookup and readdir operations are treated as if every
+ * subdirectory was a mountpoint, and ignored if they are not themselves
+ * exported.  This is used by nfsd and mountd to construct the NFSv4
+ * pseudofilesystem, which provides access only to paths leading to each
+ * exported filesystem.
+ */
+#define	NFSEXP_V4ROOT		0x10000
+#define NFSEXP_ALLFLAGS		0x1FE3F
 
 /* The flags that may vary depending on security flavor: */
 #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
diff -up linux-2.6.31.i686/include/linux/nfsd/nfsd.h.save linux-2.6.31.i686/include/linux/nfsd/nfsd.h
--- linux-2.6.31.i686/include/linux/nfsd/nfsd.h.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/include/linux/nfsd/nfsd.h	2009-12-07 12:15:39.000000000 -0500
@@ -83,6 +83,7 @@ __be32		 nfsd_lookup_dentry(struct svc_r
 				struct svc_export **, struct dentry **);
 __be32		nfsd_setattr(struct svc_rqst *, struct svc_fh *,
 				struct iattr *, int, time_t);
+int nfsd_mountpoint(struct dentry *, struct svc_export *);
 #ifdef CONFIG_NFSD_V4
 __be32          nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
                     struct nfs4_acl *);
@@ -391,6 +392,10 @@ static inline u32 nfsd_suppattrs2(u32 mi
 	return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD2
 			    : NFSD4_SUPPORTED_ATTRS_WORD2;
 }
+static inline int nfsd_v4client(struct svc_rqst *rq)
+{
+	return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;
+}
 
 /* These will return ERR_INVAL if specified in GETATTR or READDIR. */
 #define NFSD_WRITEONLY_ATTRS_WORD1							    \


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1950
retrieving revision 1.1951
diff -u -p -r1.1950 -r1.1951
--- kernel.spec	7 Dec 2009 06:11:39 -0000	1.1950
+++ kernel.spec	8 Dec 2009 12:57:07 -0000	1.1951
@@ -758,7 +758,7 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 Patch3000: linux-2.6-btrfs-upstream.patch
 
 # NFSv4
-Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3050: linux-2.6.31-nfsd-proot.patch
 Patch3060: linux-2.6-nfs4-ver4opt.patch
 Patch3061: linux-2.6-nfs4-callback-hidden.patch
 
@@ -1295,7 +1295,7 @@ ApplyPatch linux-2.6-btrfs-upstream.patc
 # eCryptfs
 
 # NFSv4
-ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch linux-2.6.31-nfsd-proot.patch
 ApplyPatch linux-2.6-nfs4-ver4opt.patch
 ApplyPatch linux-2.6-nfs4-callback-hidden.patch
 
@@ -2167,6 +2167,9 @@ fi
 # and build.
 
 %changelog
+* Tue Dec  8 2009 Steve Dickson <steved at redhat.com> 2.6.31.6-165
+- nfsd: Updated to latest pseudo root code fixing rhbz# 538609
+
 * Mon Dec 07 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-164
 - nouveau: fix NV17 breakage caused by NVA8 fixes
 - nouveau: use ratelimit for GPU error message


--- linux-2.6-nfsd4-proots.patch DELETED ---



From th0br0 at fedoraproject.org  Tue Dec  8 12:57:27 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 12:57:27 +0000 (UTC)
Subject: rpms/almanah/devel .cvsignore, 1.3, 1.4 almanah.spec, 1.4,
	1.5 import.log, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <20091208125727.B867911C0264@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/almanah/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21165/devel

Modified Files:
	.cvsignore almanah.spec import.log sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Dec 2008 02:45:58 -0000	1.3
+++ .cvsignore	8 Dec 2009 12:57:27 -0000	1.4
@@ -1 +1 @@
-almanah-0.5.0.tar.gz
+almanah-0.6.1.tar.gz


Index: almanah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/devel/almanah.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- almanah.spec	24 Jul 2009 16:46:17 -0000	1.4
+++ almanah.spec	8 Dec 2009 12:57:27 -0000	1.5
@@ -1,48 +1,57 @@
-Name:           almanah
-Version:        0.5.0
-Release:        3%{?dist}
-Summary:        A application to allow you to keep a diary of your life
-
-Group:          Applications/Productivity
-License:        GPLv3+
-URL:            http://tecnocode.co.uk/projects/almanah/
-Source0:        http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gettext gpgme-devel sqlite-devel gtkspell-devel GConf2-devel
-BuildRequires:  glib2-devel gtk2-devel intltool desktop-file-utils seahorse-devel
-
-Requires(pre):   GConf2
-Requires(post):  GConf2
-Requires(preun): GConf2
+Name:		almanah
+Version:	0.6.1
+Release:	2%{?dist}
+Summary:	Application for keeping an encrypted diary
+
+Group:		Applications/Productivity
+License:	GPLv3+
+URL:		http://tecnocode.co.uk/projects/almanah/
+Source0:	http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	gettext
+BuildRequires:	gpgme-devel
+BuildRequires:	sqlite-devel
+BuildRequires:	gtkspell-devel
+BuildRequires:	GConf2-devel
+BuildRequires:	intltool
+BuildRequires:	desktop-file-utils 
+BuildRequires:	evolution-devel
+BuildRequires:	seahorse-devel
+
+Requires(pre):	GConf2
+Requires(post):	GConf2
+Requires(preun):GConf2
 
 %description
-Almanah is a small GTK+ application to allow you to keep a diary of your life.
+Almanah Diary is a small application to ease the management of an encrypted
+personal diary. It's got good editing abilities, including text formatting 
+and printing. Evolution tasks and appointments will be listed to ease the 
+creation of diary entries related to them. At the same time, you can create
+diary entries using multiple events.
 
 %prep
 %setup -q
 chmod -x README AUTHORS NEWS ChangeLog src/{main,interface}.{c,h}
-sed -i 's/Icon=diary/Icon=almanah/' data/%{name}.desktop.in
-
+sed -e 's/_//' \
+    -e 's/=Diary/=Almanah/' \
+    -i data/%{name}.desktop.in
 
 %build
 %configure --enable-encryption --enable-spell-checking
-make %{?_smp_mflags}
+make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --vendor="fedora"                     \
-  --delete-original                                        \
-  --dir=%{buildroot}%{_datadir}/applications               \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+make install DESTDIR=%{buildroot}
+
 %find_lang %{name}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %pre
@@ -55,18 +64,21 @@ fi
 
 %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
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
-%preun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ "$1" -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+
+
+%preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
@@ -78,18 +90,19 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_bindir}/%{name}
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_datadir}/applications/%{name}.desktop
+%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Dec  8 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-2
+- Cosmetic changes
 
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Nov 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-1
+- Update to new release
+- Fixed BuildRequires for new release
 
 * Wed Dec  3 2008 Jean-Fran?ois Martin <lokthare at gmail.com> - 0.5.0-1
 - Update to the new release


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jul 2008 16:25:03 -0000	1.1
+++ import.log	8 Dec 2009 12:57:27 -0000	1.2
@@ -1 +1,2 @@
 almanah-0_4_0-2_fc9:HEAD:almanah-0.4.0-2.fc9.src.rpm:1216052644
+almanah-0_6_1-2_fc12:HEAD:almanah-0.6.1-2.fc12.src.rpm:1260277020


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Dec 2008 02:45:58 -0000	1.3
+++ sources	8 Dec 2009 12:57:27 -0000	1.4
@@ -1 +1 @@
-b6469a0a60b760798d3253ee77d6b9f4  almanah-0.5.0.tar.gz
+cca92b59002fa9e0515287f3df38cb1c  almanah-0.6.1.tar.gz



From ozamosi at fedoraproject.org  Tue Dec  8 13:03:05 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Tue,  8 Dec 2009 13:03:05 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.345, 1.346 comps-f12.xml.in, 1.212,
	1.213 comps-f13.xml.in, 1.113, 1.114
Message-ID: <20091208130305.1A84611C0264@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22731

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
Add gdouros-akkadian-fonts, gdouros-alexander-fonts, gdouros-analecta-fonts, gdouros-musica-fonts to F11, F12 and F13. Also add gdouros-aegean-fonts, gdouros-aegyptus-fonts and msimonson-anonymouspro-fonts to F12



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -p -r1.345 -r1.346
--- comps-f11.xml.in	6 Dec 2009 10:20:09 -0000	1.345
+++ comps-f11.xml.in	8 Dec 2009 13:03:04 -0000	1.346
@@ -1742,6 +1742,10 @@
       <packagereq type="optional">gargi-fonts</packagereq>
       <packagereq type="optional">gdouros-aegean-fonts</packagereq>
       <packagereq type="optional">gdouros-aegyptus-fonts</packagereq>
+      <packagereq type="optional">gdouros-akkadian-fonts</packagereq>
+      <packagereq type="optional">gdouros-alexander-fonts</packagereq>
+      <packagereq type="optional">gdouros-analecta-fonts</packagereq>
+      <packagereq type="optional">gdouros-musica-fonts</packagereq>
       <packagereq type="optional">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- comps-f12.xml.in	5 Dec 2009 15:24:58 -0000	1.212
+++ comps-f12.xml.in	8 Dec 2009 13:03:04 -0000	1.213
@@ -1928,6 +1928,12 @@
       <packagereq type="optional">freecol-imperator-fonts</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
       <packagereq type="optional">gargi-fonts</packagereq>
+      <packagereq type="optional">gdouros-aegean-fonts</packagereq>
+      <packagereq type="optional">gdouros-aegyptus-fonts</packagereq>
+      <packagereq type="optional">gdouros-akkadian-fonts</packagereq>
+      <packagereq type="optional">gdouros-alexander-fonts</packagereq>
+      <packagereq type="optional">gdouros-analecta-fonts</packagereq>
+      <packagereq type="optional">gdouros-musica-fonts</packagereq>
       <packagereq type="optional">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>
@@ -1994,6 +2000,7 @@
       <packagereq type="optional">mgopen-modata-fonts</packagereq>
       <packagereq type="optional">mgopen-moderna-fonts</packagereq>
       <packagereq type="optional">mscore-fonts</packagereq>
+      <packagereq type="optional">msimonson-anonymouspro-fonts</packagereq>
       <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">ns-bola-fonts</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- comps-f13.xml.in	7 Dec 2009 07:48:15 -0000	1.113
+++ comps-f13.xml.in	8 Dec 2009 13:03:04 -0000	1.114
@@ -1930,6 +1930,10 @@
       <packagereq type="optional">gargi-fonts</packagereq>
       <packagereq type="optional">gdouros-aegean-fonts</packagereq>
       <packagereq type="optional">gdouros-aegyptus-fonts</packagereq>
+      <packagereq type="optional">gdouros-akkadian-fonts</packagereq>
+      <packagereq type="optional">gdouros-alexander-fonts</packagereq>
+      <packagereq type="optional">gdouros-analecta-fonts</packagereq>
+      <packagereq type="optional">gdouros-musica-fonts</packagereq>
       <packagereq type="optional">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>



From sbose at fedoraproject.org  Tue Dec  8 13:12:15 2009
From: sbose at fedoraproject.org (sbose)
Date: Tue,  8 Dec 2009 13:12:15 +0000 (UTC)
Subject: File ctdb-1.0.108.tar.bz2 uploaded to lookaside cache by sbose
Message-ID: <20091208131215.9869810F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ctdb:

a91d1dc747bb7f0216c9ddd7a0d25739  ctdb-1.0.108.tar.bz2



From pkgdb at fedoraproject.org  Tue Dec  8 13:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 13:14:49 +0000
Subject: [pkgdb] almanah ownership updated
Message-ID: <20091208131449.0CEC510F881@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 11 is now owned by th0br0

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Tue Dec  8 13:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 13:14:51 +0000
Subject: [pkgdb] almanah ownership updated
Message-ID: <20091208131451.89C1310F890@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 12 is now owned by th0br0

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/almanah



From sbose at fedoraproject.org  Tue Dec  8 13:15:22 2009
From: sbose at fedoraproject.org (sbose)
Date: Tue,  8 Dec 2009 13:15:22 +0000 (UTC)
Subject: rpms/ctdb/devel 0001-Fixes-for-init-script-to-meet-guidelines.patch,
	NONE, 1.1 .cvsignore, 1.12, 1.13 ctdb.spec, 1.15, 1.16 sources,
	1.12, 1.13
Message-ID: <20091208131522.A49F211C0264@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26592

Modified Files:
	.cvsignore ctdb.spec sources 
Added Files:
	0001-Fixes-for-init-script-to-meet-guidelines.patch 
Log Message:
Update to ctdb version 1.0.108
- added fix for bz537223
- added tdb-tools to Requires, fixes bz526479



0001-Fixes-for-init-script-to-meet-guidelines.patch:
 ctdb.init |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

--- NEW FILE 0001-Fixes-for-init-script-to-meet-guidelines.patch ---
>From f3aafa1329088531fdff480d37cec8c43125168a Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Tue, 24 Nov 2009 23:11:28 +0100
Subject: [PATCH] Fixes for init script to meet guidelines

---
 config/ctdb.init |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config/ctdb.init b/config/ctdb.init
index 67747fd..ca2f0fc 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -137,7 +137,7 @@ start() {
 
     ctdb ping >/dev/null 2>&1 && {
 	echo $"CTDB is already running"
-	return 1
+	return 0
     }
 
     build_ctdb_options
@@ -153,7 +153,7 @@ start() {
     case $init_style in
 	valgrind)
 	    valgrind -q --log-file=/var/log/ctdb_valgrind \
-		$ctdbd --nosetsched $CTDB_OPTIONS 
+		$ctdbd --nosetsched $CTDB_OPTIONS
 	    RETVAL=$?
 	    echo
 	    ;;
@@ -180,7 +180,7 @@ start() {
     set_ctdb_variables
 
     return $RETVAL
-}	
+}
 
 stop() {
     echo -n $"Shutting down ctdbd service: "
@@ -227,20 +227,26 @@ stop() {
 restart() {
     stop
     start
-}	
+}
 
 status() {
     echo -n $"Checking for ctdbd service: "
     ctdb ping >/dev/null 2>&1 || {
 	RETVAL=$?
-	echo -n "  ctdbd not running. "
 	case $init_style in
 	    suse)
+		echo -n "  ctdbd not running. "
 		set_retval $RETVAL
 		rc_status -v
 		;;
 	    redhat)
-		echo ""
+		if [ -f /var/lock/subsys/ctdb ]; then
+			echo $"ctdb dead but subsys locked"
+			RETVAL=2
+		else
+			echo $"ctdb is stopped"
+			RETVAL=3
+		fi
 		;;
 	esac
 	return $RETVAL
@@ -257,13 +263,13 @@ case "$1" in
     stop)
   	stop
 	;;
-    restart|reload)
+    restart|reload|force-reload)
   	restart
 	;;
     status)
   	status
 	;;
-    condrestart)
+    condrestart|try-restart)
   	ctdb status > /dev/null && restart || :
 	;;
     cron)
@@ -271,7 +277,7 @@ case "$1" in
   	ctdb status > /dev/null || restart
 	;;
     *)
-	echo $"Usage: $0 {start|stop|restart|status|cron|condrestart}"
+	echo $"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|try-restart}"
 	exit 1
 esac
 
-- 
1.6.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 Oct 2009 07:30:19 -0000	1.12
+++ .cvsignore	8 Dec 2009 13:15:21 -0000	1.13
@@ -1 +1 @@
-ctdb-1.0.96.tar.bz2
+ctdb-1.0.108.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/ctdb.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ctdb.spec	14 Oct 2009 07:30:19 -0000	1.15
+++ ctdb.spec	8 Dec 2009 13:15:22 -0000	1.16
@@ -2,7 +2,7 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 1.0.96
+Version: 1.0.108
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -17,8 +17,12 @@ Source0: %{name}-%{version}.tar.bz2
 # Fedora specific patch, ctdb should not be enabled by default in the runlevels
 Patch1: ctdb-no_default_runlevel.patch
 
+# Fix for bz537223, submitted to upstream for review http://lists.samba.org/archive/samba-technical/2009-November/068016.html
+Patch2: 0001-Fixes-for-init-script-to-meet-guidelines.patch
+
 Requires: chkconfig coreutils psmisc
 Requires: fileutils sed
+Requires: tdb-tools
 Requires(preun): chkconfig initscripts
 Requires(post): chkconfig
 Requires(postun): initscripts
@@ -51,6 +55,7 @@ and use CTDB instead.
 # setup the init script and sysconfig file
 %setup -T -D -n ctdb-%{version} -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -77,6 +82,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -m644 config/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
 install -m755 config/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
 
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/ctdb/tests/bin
+install -m755 tests/bin/ctdb_transaction $RPM_BUILD_ROOT%{_docdir}/ctdb/tests/bin
+
+
 # Remove "*.old" files
 find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
 
@@ -132,6 +141,138 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Tue Dec 8 2009 Sumit Bose <sbose at redhat.com> - 1.0.108-1
+ - Update to ctdb version 1.0.108
+ - added fix for bz537223
+ - added tdb-tools to Requires, fixes bz526479
+
+* Wed Dec 2 2009 Sumit Bose <sbose at redhat.com> - 1.0.107-1
+ - Update to ctdb version 1.0.107
+
+* Wed Dec 2 2009 : Version 1.0.107
+ - fix for rusty to solve a double-free that can happen when there are
+   multiple packets queued and the connection is destroyed before
+   all packets are processed.
+
+* Tue Dec 1 2009 : Version 1.0.106
+ - Buildscript changes from Michael Adam
+ - Dont do a full recovery when there is a mismatch detected for ip addresses,
+   just do a less disruptive ip-reallocation
+ - When starting ctdbd, wait until all initial recoveries have finished
+   before we issue the "startup" event.
+   So dont start services or monitoring until the cluster has
+   stabilized.
+ - Major eventscript overhaul by Ronnie, Rusty and Martins and fixes of a few
+   bugs found.
+
+* Thu Nov 19 2009 : Version 1.0.105
+ - Fix a bug where we could SEGV if multiple concurrent "ctdb eventscript ..."
+   are used and some of them block.
+ - Monitor the daemon from the syslog child process so we shutdown cleanly when
+   the main daemon terminates.
+ - Add a 500k line ringbuffer in memory where all log messages are stored.
+ - Add a "ctdb getlog <level>" command to pull log messages from the in memory
+   ringbuffer.
+ - From martin : fixes to cifs and nfs autotests
+ - from michael a : fix a bashism in 11.natgw
+
+* Fri Nov 6 2009 : Version 1.0.104
+ - Suggestion from Metze, we can now use killtcp to kill local connections
+   for nfs so change the killtcp script to kill both directions of an NFS
+   connection.
+   We used to deliberately only kill one direction in these cases due to
+   limitations.
+ - Suggestion from christian Ambach, when using natgw, try to avoid using a
+   UNHEALTHY node as the natgw master.
+ - From Michael Adam: Fix a SEGV bug in the recent change to the eventscripts
+   to allow the timeout to apply to each individual script.
+ - fix a talloc bug in teh vacuuming code that produced nasty valgrind
+   warnings.
+ - From Rusty: Set up ulimit to create core files for ctdb, and spawned
+   processes by default. This is useful for debugging and testing but can be
+   disabled by setting CTDB_SUPRESS_COREFILE=yes in the sysconfig file.
+ - Remove the wbinfo -t check from the startup check that winbindd is happy.
+ - Enhance the test for bond devices so we also check if the sysadmin have
+   disabled all slave devices using "ifdown".
+
+* Tue Nov 3 2009 : Version 1.0.103
+ - Dont use vacuuming on persistent databases
+ - Michael A : transaction updates to persistent databases
+ - Dont activate service automatically when installing the RPM. Leave this to
+   the admin.
+ - Create a child process to send all log messages to, to prevent a hung/slow
+   syslogd from blocking the main daemon. In this case, discard log messages
+   instead and let the child process block.
+ - Michael A: updates to log messages
+
+* Thu Oct 29 2009 : Version 1.0.102
+ - Wolfgang: fix for the vacuuming code
+ - Wolfgang: stronger tests for persistent database filename tests
+ - Improve the log message when we refuse to startup since wbinfo -t fails
+   to make it easier to spot in the log.
+ - Update the uptime command output and the man page to indicate that
+   "time since last ..." if from either the last recovery OR the last failover
+ - Michael A: transaction updates
+
+* Wed Oct 28 2009 : Version 1.0.101
+ - create a separate context for non-monitoring events so they dont interfere
+   with the monitor event
+ - make sure to return status 0 in teh callback when we abort an event
+
+* Wed Oct 28 2009 : Version 1.0.100
+ - Change eventscript handling to allow EventScriptTimeout for each individual
+   script instead of for all scripts as a whole.
+ - Enhanced logging from the eventscripts, log the name and the duration for
+   each script as it finishes.
+ - Add a check to use wbinfo -t for the startup event of samba
+ - TEMP: allow clients to attach to databases even when teh node is in recovery
+   mode
+ - dont run the monitor event as frequently after an event has failed
+ - DEBUG: in the eventloops, check the local time and warn if the time changes
+   backward or rapidly forward
+ - From Metze, fix a bug where recovery master becoming unhealthy did not
+   trigger an ip failover.
+ - Disable the multipath script by default
+ - Automatically re-activate the reclock checking if the reclock file is
+   specified at runtime. Update manpage to reflect this.
+ - Add a mechanism where samba can register a SRVID and if samba unexpectedly
+   disconnects, a message will be broadcasted to all other samba daemons.
+ - Log the pstree on hung scripts to a file in /tmp isntead of
+   /var/log/messages
+ - change ban count before unhealthy/banned to 10
+
+* Thu Oct 22 2009 : Version 1.0.99
+ - Fix a SEGV in the new db priority code.
+ - From Wolfgang : eliminate a ctdb_fatal() if there is a dmaster violation
+   detected.
+ - During testing we often add/delete eventscripts at runtime. This could cause
+   an eventscript to fail and mark the node unhealthy if an eventscript was
+   deleted while we were listing the names. Handle the errorcode and make sure
+   the node does not becomne unhealthy in this case.
+ - Lower the debuglevel for the messages when ctdb creates a filedescruiptor so
+   we dont spam the logs with these messages.
+ - Dont have the RPM automatically restart ctdb
+ - Volker : add a missing transaction_cancel() in the handling of persistent
+   databases
+ - Treat interfaces with the anme ethX* as bond devices in 10.interfaces so we
+   do the correct test for if they are up or not.
+
+* Tue Oct 20 2009 : Version 1.0.98
+ - Fix for the vacuuming database from Wolfgang M
+ - Create a directory where the test framework can put temporary overrides
+   to variables and functions.
+ - Wait a lot longer before shutting down the node when the reclock file
+   is incorrectly configured, and log where it is configured.
+ - Try to avoid running the "monitor" event when databases are frozen.
+ - Add logging for every time we create a filedescriptor so we can trap
+   fd leaks.
+
+* Thu Oct 14 2009 : Version 1.0.97
+ - From martins : update onnode.
+   Update onnode to allow specifying an alternative nodes file from
+   the command line and also to be able to specify hostnames on the
+   list of targets :
+   onnode host1,host2,...
 * Wed Oct 14 2009 Sumit Bose <sbose at redhat.com> - 1.0.96-1
  - Update to ctdb version 1.0.96
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	14 Oct 2009 07:30:19 -0000	1.12
+++ sources	8 Dec 2009 13:15:22 -0000	1.13
@@ -1 +1 @@
-c8cfa1a29780ae820b77f857464f877a  ctdb-1.0.96.tar.bz2
+a91d1dc747bb7f0216c9ddd7a0d25739  ctdb-1.0.108.tar.bz2



From pkgdb at fedoraproject.org  Tue Dec  8 13:17:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 13:17:17 +0000
Subject: [pkgdb] almanah: th0br0 has requested commit
Message-ID: <20091208131717.F2F8B10F89D@bastion2.fedora.phx.redhat.com>

th0br0 has requested the commit acl on almanah (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/almanah



From th0br0 at fedoraproject.org  Tue Dec  8 13:19:01 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 13:19:01 +0000 (UTC)
Subject: File javacsv2.0.zip uploaded to lookaside cache by th0br0
Message-ID: <20091208131901.3E8A210F87E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for javacsv:

c40cd808e71e4837f53ae68767d79eef  javacsv2.0.zip



From th0br0 at fedoraproject.org  Tue Dec  8 13:19:36 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 13:19:36 +0000 (UTC)
Subject: rpms/javacsv/devel import.log, NONE, 1.1 javacsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091208131936.67B1811C0264@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/javacsv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28474/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log javacsv.spec 
Log Message:
initial import


--- NEW FILE import.log ---
javacsv-2_0-3_fc12:HEAD:javacsv-2.0-3.fc12.src.rpm:1260278352


--- NEW FILE javacsv.spec ---
%global srcname JavaCsv

Name:		javacsv
Version:	2.0
Release:	3%{?dist}
Summary:	Stream-based Java library for reading and writing CSV and other delimited data

Group:		Development/Libraries
License:	LGPLv2+
URL:		http://www.csvreader.com/
Source0:	http://downloads.sourceforge.net/project/%{name}/%{srcname}/%{srcname}%20{version}/%{name}%{version}.zip
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.5
BuildRequires:	ant

Requires:	jpackage-utils

Requires:	java >= 1:1.5


%description
Java CSV is a small fast open source Java 
library for reading and writing CSV and plain
delimited text files. All kinds of CSV files
can be handled, text qualified, Excel formatted, etc.

%package javadoc
Summary:	Javadocs for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}
Requires:	jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -c

find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

rm src/AllTests.java


%build
ant
ant -buildfile javadoc.xml

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p %{name}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm doc/javadocs.zip
cp -rp doc/*  \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}*
%doc

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}*

%changelog
* Sun Nov 29 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-3
- Cosmetic Changes

* Sun Nov 29 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-2
- Added symlinks

* Sat Nov 21 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javacsv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:11:06 -0000	1.1
+++ .cvsignore	8 Dec 2009 13:19:35 -0000	1.2
@@ -0,0 +1 @@
+javacsv2.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javacsv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:11:06 -0000	1.1
+++ sources	8 Dec 2009 13:19:36 -0000	1.2
@@ -0,0 +1 @@
+c40cd808e71e4837f53ae68767d79eef  javacsv2.0.zip



From ovasik at fedoraproject.org  Tue Dec  8 13:20:35 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  8 Dec 2009 13:20:35 +0000 (UTC)
Subject: rpms/tar/devel tar-1.22-nsfraction.patch, NONE, 1.1 tar.spec, 1.90,
	1.91
Message-ID: <20091208132035.A82D611C03DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28902

Modified Files:
	tar.spec 
Added Files:
	tar-1.22-nsfraction.patch 
Log Message:
fix segfault with corrupted metadata in code_ns_fraction(#531441), commented patches and sources

tar-1.22-nsfraction.patch:
 misc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tar-1.22-nsfraction.patch ---
diff -urNp tar-1.22-orig/src/misc.c tar-1.22/src/misc.c
--- tar-1.22-orig/src/misc.c	2007-06-27 15:30:32.000000000 +0200
+++ tar-1.22/src/misc.c	2009-12-08 13:41:46.000000000 +0100
@@ -228,7 +228,7 @@ code_ns_fraction (int ns, char *p)
     *p = '\0';
   else
     {
-      int i = 9;
+      int i = 10;
       *p++ = '.';
 
       while (ns % 10 == 0)


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- tar.spec	27 Nov 2009 14:09:58 -0000	1.90
+++ tar.spec	8 Dec 2009 13:20:35 -0000	1.91
@@ -2,21 +2,36 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.22
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
 Source0: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.bz2
 Source1: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.bz2.sig
+#Manpage for tar and gtar, a bit modified help2man generated manpage
 Source2: tar.1
+#Stop issuing lone zero block warnings
 Patch1: tar-1.14-loneZeroWarning.patch
+#Fix extracting sparse files to a filesystem like vfat,
+#when ftruncate may fail to grow the size of a file.(#179507)
 Patch2: tar-1.15.1-vfatTruncate.patch
+#Add support for selinux, acl and extended attributes
 Patch3: tar-1.19-xattrs.patch
+#change inclusion defaults of tar to "--wildcards --anchored
+#--wildcards-match-slash" for compatibility reasons (#206841)
 Patch4: tar-1.17-wildcards.patch
+#ignore errors from setting utime() for source file
+#on read-only filesystem (#500742)
 Patch5: tar-1.22-atime-rofs.patch
+#Report record size only if the archive refers to a device(#487760)
 Patch6: tar-1.22-shortreadbuffer.patch
+#Do not sigabrt with new gcc/glibc because of writing to
+#struct members of gnutar header at once via strcpy
 Patch7: tar-1.22-fortifysourcessigabrt.patch
+#fix memory leak in xheader (#518079)
 Patch8: tar-1.22-xheaderleak.patch
+#fix segfault in code_ns_fraction() with corrupted metadata (#531441)
+Patch9: tar-1.22-nsfraction.patch
 Prereq: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk rsh
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +60,7 @@ the rmt package.
 %patch6 -p1 -b .shortread
 %patch7 -p1 -b .headerblackmagic
 %patch8 -p1 -b .xheaderleak
+%patch9 -p1 -b .nsfraction
 
 %build
 autoreconf
@@ -102,6 +118,11 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Tue Dec 08 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.22-11
+- fix segfault with corrupted metadata in code_ns_fraction
+  (#531441)
+- commented patches and sources
+
 * Fri Nov 27 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.22-10
 - store xattrs for symlinks (#525992) - by Kamil Dudka
 - update tar(1) manpage (#539787)



From th0br0 at fedoraproject.org  Tue Dec  8 13:28:07 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 13:28:07 +0000 (UTC)
Subject: rpms/javacsv/F-12 import.log, NONE, 1.1 javacsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091208132807.183DB11C0264@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/javacsv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31003/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log javacsv.spec 
Log Message:
initial import


--- NEW FILE import.log ---
javacsv-2_0-3_fc12:F-12:javacsv-2.0-3.fc12.src.rpm:1260278845


--- NEW FILE javacsv.spec ---
%global srcname JavaCsv

Name:		javacsv
Version:	2.0
Release:	3%{?dist}
Summary:	Stream-based Java library for reading and writing CSV and other delimited data

Group:		Development/Libraries
License:	LGPLv2+
URL:		http://www.csvreader.com/
Source0:	http://downloads.sourceforge.net/project/%{name}/%{srcname}/%{srcname}%20{version}/%{name}%{version}.zip
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.5
BuildRequires:	ant

Requires:	jpackage-utils

Requires:	java >= 1:1.5


%description
Java CSV is a small fast open source Java 
library for reading and writing CSV and plain
delimited text files. All kinds of CSV files
can be handled, text qualified, Excel formatted, etc.

%package javadoc
Summary:	Javadocs for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}
Requires:	jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -c

find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

rm src/AllTests.java


%build
ant
ant -buildfile javadoc.xml

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p %{name}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm doc/javadocs.zip
cp -rp doc/*  \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}*
%doc

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}*

%changelog
* Sun Nov 29 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-3
- Cosmetic Changes

* Sun Nov 29 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-2
- Added symlinks

* Sat Nov 21 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javacsv/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:11:06 -0000	1.1
+++ .cvsignore	8 Dec 2009 13:28:06 -0000	1.2
@@ -0,0 +1 @@
+javacsv2.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javacsv/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:11:06 -0000	1.1
+++ sources	8 Dec 2009 13:28:06 -0000	1.2
@@ -0,0 +1 @@
+c40cd808e71e4837f53ae68767d79eef  javacsv2.0.zip



From th0br0 at fedoraproject.org  Tue Dec  8 13:28:42 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 13:28:42 +0000 (UTC)
Subject: rpms/almanah/F-12 .cvsignore, 1.3, 1.4 almanah.spec, 1.4,
	1.5 import.log, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <20091208132842.67B0411C0264@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/almanah/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31343/F-12

Modified Files:
	.cvsignore almanah.spec import.log sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Dec 2008 02:45:58 -0000	1.3
+++ .cvsignore	8 Dec 2009 13:28:42 -0000	1.4
@@ -1 +1 @@
-almanah-0.5.0.tar.gz
+almanah-0.6.1.tar.gz


Index: almanah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-12/almanah.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- almanah.spec	24 Jul 2009 16:46:17 -0000	1.4
+++ almanah.spec	8 Dec 2009 13:28:42 -0000	1.5
@@ -1,48 +1,57 @@
-Name:           almanah
-Version:        0.5.0
-Release:        3%{?dist}
-Summary:        A application to allow you to keep a diary of your life
-
-Group:          Applications/Productivity
-License:        GPLv3+
-URL:            http://tecnocode.co.uk/projects/almanah/
-Source0:        http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gettext gpgme-devel sqlite-devel gtkspell-devel GConf2-devel
-BuildRequires:  glib2-devel gtk2-devel intltool desktop-file-utils seahorse-devel
-
-Requires(pre):   GConf2
-Requires(post):  GConf2
-Requires(preun): GConf2
+Name:		almanah
+Version:	0.6.1
+Release:	2%{?dist}
+Summary:	Application for keeping an encrypted diary
+
+Group:		Applications/Productivity
+License:	GPLv3+
+URL:		http://tecnocode.co.uk/projects/almanah/
+Source0:	http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	gettext
+BuildRequires:	gpgme-devel
+BuildRequires:	sqlite-devel
+BuildRequires:	gtkspell-devel
+BuildRequires:	GConf2-devel
+BuildRequires:	intltool
+BuildRequires:	desktop-file-utils 
+BuildRequires:	evolution-devel
+BuildRequires:	seahorse-devel
+
+Requires(pre):	GConf2
+Requires(post):	GConf2
+Requires(preun):GConf2
 
 %description
-Almanah is a small GTK+ application to allow you to keep a diary of your life.
+Almanah Diary is a small application to ease the management of an encrypted
+personal diary. It's got good editing abilities, including text formatting 
+and printing. Evolution tasks and appointments will be listed to ease the 
+creation of diary entries related to them. At the same time, you can create
+diary entries using multiple events.
 
 %prep
 %setup -q
 chmod -x README AUTHORS NEWS ChangeLog src/{main,interface}.{c,h}
-sed -i 's/Icon=diary/Icon=almanah/' data/%{name}.desktop.in
-
+sed -e 's/_//' \
+    -e 's/=Diary/=Almanah/' \
+    -i data/%{name}.desktop.in
 
 %build
 %configure --enable-encryption --enable-spell-checking
-make %{?_smp_mflags}
+make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --vendor="fedora"                     \
-  --delete-original                                        \
-  --dir=%{buildroot}%{_datadir}/applications               \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+make install DESTDIR=%{buildroot}
+
 %find_lang %{name}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %pre
@@ -55,18 +64,21 @@ fi
 
 %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
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
-%preun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ "$1" -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+
+
+%preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
@@ -78,18 +90,19 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_bindir}/%{name}
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_datadir}/applications/%{name}.desktop
+%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Dec  8 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-2
+- Cosmetic changes
 
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Nov 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-1
+- Update to new release
+- Fixed BuildRequires for new release
 
 * Wed Dec  3 2008 Jean-Fran?ois Martin <lokthare at gmail.com> - 0.5.0-1
 - Update to the new release


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jul 2008 16:25:03 -0000	1.1
+++ import.log	8 Dec 2009 13:28:42 -0000	1.2
@@ -1 +1,2 @@
 almanah-0_4_0-2_fc9:HEAD:almanah-0.4.0-2.fc9.src.rpm:1216052644
+almanah-0_6_1-2_fc12:F-12:almanah-0.6.1-2.fc12.src.rpm:1260278899


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Dec 2008 02:45:58 -0000	1.3
+++ sources	8 Dec 2009 13:28:42 -0000	1.4
@@ -1 +1 @@
-b6469a0a60b760798d3253ee77d6b9f4  almanah-0.5.0.tar.gz
+cca92b59002fa9e0515287f3df38cb1c  almanah-0.6.1.tar.gz



From th0br0 at fedoraproject.org  Tue Dec  8 13:29:29 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 13:29:29 +0000 (UTC)
Subject: rpms/javacsv/F-11 import.log, NONE, 1.1 javacsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091208132929.E3A6D11C0264@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/javacsv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31804/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log javacsv.spec 
Log Message:
initial import


--- NEW FILE import.log ---
javacsv-2_0-3_fc12:F-11:javacsv-2.0-3.fc12.src.rpm:1260278941


--- NEW FILE javacsv.spec ---
%global srcname JavaCsv

Name:		javacsv
Version:	2.0
Release:	3%{?dist}
Summary:	Stream-based Java library for reading and writing CSV and other delimited data

Group:		Development/Libraries
License:	LGPLv2+
URL:		http://www.csvreader.com/
Source0:	http://downloads.sourceforge.net/project/%{name}/%{srcname}/%{srcname}%20{version}/%{name}%{version}.zip
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.5
BuildRequires:	ant

Requires:	jpackage-utils

Requires:	java >= 1:1.5


%description
Java CSV is a small fast open source Java 
library for reading and writing CSV and plain
delimited text files. All kinds of CSV files
can be handled, text qualified, Excel formatted, etc.

%package javadoc
Summary:	Javadocs for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}
Requires:	jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -c

find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

rm src/AllTests.java


%build
ant
ant -buildfile javadoc.xml

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p %{name}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm doc/javadocs.zip
cp -rp doc/*  \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}*
%doc

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}*

%changelog
* Sun Nov 29 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-3
- Cosmetic Changes

* Sun Nov 29 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-2
- Added symlinks

* Sat Nov 21 2009 Andreas Osowski <th0br0 at mkdir.name> - 2.0-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javacsv/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Dec 2009 19:11:06 -0000	1.1
+++ .cvsignore	8 Dec 2009 13:29:29 -0000	1.2
@@ -0,0 +1 @@
+javacsv2.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javacsv/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Dec 2009 19:11:06 -0000	1.1
+++ sources	8 Dec 2009 13:29:29 -0000	1.2
@@ -0,0 +1 @@
+c40cd808e71e4837f53ae68767d79eef  javacsv2.0.zip



From th0br0 at fedoraproject.org  Tue Dec  8 13:30:39 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 13:30:39 +0000 (UTC)
Subject: rpms/almanah/F-11 .cvsignore, 1.3, 1.4 almanah.spec, 1.3,
	1.4 import.log, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <20091208133039.F25ED11C03DB@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/almanah/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32367/F-11

Modified Files:
	.cvsignore almanah.spec import.log sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Dec 2008 02:45:58 -0000	1.3
+++ .cvsignore	8 Dec 2009 13:30:39 -0000	1.4
@@ -1 +1 @@
-almanah-0.5.0.tar.gz
+almanah-0.6.1.tar.gz


Index: almanah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-11/almanah.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- almanah.spec	24 Feb 2009 00:41:27 -0000	1.3
+++ almanah.spec	8 Dec 2009 13:30:39 -0000	1.4
@@ -1,48 +1,57 @@
-Name:           almanah
-Version:        0.5.0
-Release:        2%{?dist}
-Summary:        A application to allow you to keep a diary of your life
-
-Group:          Applications/Productivity
-License:        GPLv3+
-URL:            http://tecnocode.co.uk/projects/almanah/
-Source0:        http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gettext gpgme-devel sqlite-devel gtkspell-devel GConf2-devel
-BuildRequires:  glib2-devel gtk2-devel intltool desktop-file-utils seahorse-devel
-
-Requires(pre):   GConf2
-Requires(post):  GConf2
-Requires(preun): GConf2
+Name:		almanah
+Version:	0.6.1
+Release:	2%{?dist}
+Summary:	Application for keeping an encrypted diary
+
+Group:		Applications/Productivity
+License:	GPLv3+
+URL:		http://tecnocode.co.uk/projects/almanah/
+Source0:	http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	gettext
+BuildRequires:	gpgme-devel
+BuildRequires:	sqlite-devel
+BuildRequires:	gtkspell-devel
+BuildRequires:	GConf2-devel
+BuildRequires:	intltool
+BuildRequires:	desktop-file-utils 
+BuildRequires:	evolution-devel
+BuildRequires:	seahorse-devel
+
+Requires(pre):	GConf2
+Requires(post):	GConf2
+Requires(preun):GConf2
 
 %description
-Almanah is a small GTK+ application to allow you to keep a diary of your life.
+Almanah Diary is a small application to ease the management of an encrypted
+personal diary. It's got good editing abilities, including text formatting 
+and printing. Evolution tasks and appointments will be listed to ease the 
+creation of diary entries related to them. At the same time, you can create
+diary entries using multiple events.
 
 %prep
 %setup -q
 chmod -x README AUTHORS NEWS ChangeLog src/{main,interface}.{c,h}
-sed -i 's/Icon=diary/Icon=almanah/' data/%{name}.desktop.in
-
+sed -e 's/_//' \
+    -e 's/=Diary/=Almanah/' \
+    -i data/%{name}.desktop.in
 
 %build
 %configure --enable-encryption --enable-spell-checking
-make %{?_smp_mflags}
+make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --vendor="fedora"                     \
-  --delete-original                                        \
-  --dir=%{buildroot}%{_datadir}/applications               \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+make install DESTDIR=%{buildroot}
+
 %find_lang %{name}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %pre
@@ -55,18 +64,21 @@ fi
 
 %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
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
-%preun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ "$1" -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+
+
+%preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
@@ -78,15 +90,19 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_bindir}/%{name}
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_datadir}/applications/%{name}.desktop
+%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Dec  8 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-2
+- Cosmetic changes
+
+* Fri Nov 27 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-1
+- Update to new release
+- Fixed BuildRequires for new release
 
 * Wed Dec  3 2008 Jean-Fran?ois Martin <lokthare at gmail.com> - 0.5.0-1
 - Update to the new release


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jul 2008 16:25:03 -0000	1.1
+++ import.log	8 Dec 2009 13:30:39 -0000	1.2
@@ -1 +1,2 @@
 almanah-0_4_0-2_fc9:HEAD:almanah-0.4.0-2.fc9.src.rpm:1216052644
+almanah-0_6_1-2_fc12:F-11:almanah-0.6.1-2.fc12.src.rpm:1260278965


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Dec 2008 02:45:58 -0000	1.3
+++ sources	8 Dec 2009 13:30:39 -0000	1.4
@@ -1 +1 @@
-b6469a0a60b760798d3253ee77d6b9f4  almanah-0.5.0.tar.gz
+cca92b59002fa9e0515287f3df38cb1c  almanah-0.6.1.tar.gz



From rhughes at fedoraproject.org  Tue Dec  8 13:33:09 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue,  8 Dec 2009 13:33:09 +0000 (UTC)
Subject: File gnome-packagekit-2.29.1.tar.gz uploaded to lookaside cache by
	rhughes
Message-ID: <20091208133309.5DDF210F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-packagekit:

8af164a455eb8a68b4d3e59d3c2d4e4d  gnome-packagekit-2.29.1.tar.gz



From rhughes at fedoraproject.org  Tue Dec  8 13:35:25 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue,  8 Dec 2009 13:35:25 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.57,
	1.58 gnome-packagekit.spec, 1.101, 1.102 sources, 1.58, 1.59
Message-ID: <20091208133525.B9C5F11C0264@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1827

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Tue Dec 08 2009 Richard Hughes  <rhughes at redhat.com> - 2.29.1-1
- New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	28 Sep 2009 15:32:14 -0000	1.57
+++ .cvsignore	8 Dec 2009 13:35:25 -0000	1.58
@@ -1 +1 @@
-gnome-packagekit-2.28.1-20090928.tar.gz
+gnome-packagekit-2.29.1.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gnome-packagekit.spec	28 Sep 2009 15:32:14 -0000	1.101
+++ gnome-packagekit.spec	8 Dec 2009 13:35:25 -0000	1.102
@@ -5,7 +5,6 @@
 %define gtk2_version			2.16.0
 %define libnotify_version		0.4.3
 %define unique_version			1.0.0
-%define devicekit_version		003
 %define devicekit_power_version		007
 %define libcanberra_version		0.10
 %define alphatag			20090928
@@ -14,14 +13,14 @@
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
-Version:   2.28.1
-Release:   0.1.%{?alphatag}git%{?dist}
-#Release:   1%{?dist}
+Version:   2.29.1
+#Release:   0.1.%{?alphatag}git%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}.tar.bz2
-Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}-%{?alphatag}.tar.gz
+Source0:   http://download.gnome.org/sources/gnome-packagekit/2.29/%{name}-%{version}.tar.gz
+#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.29/%{name}-%{version}-%{?alphatag}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  glib2 >= %{glib2_version}
@@ -71,7 +70,6 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: fontconfig-devel
 BuildRequires: libcanberra-devel >= %{libcanberra_version}
 BuildRequires: libgudev1-devel
-BuildRequires: DeviceKit-devel >= %{devicekit_version}
 BuildRequires: DeviceKit-power-devel >= %{devicekit_power_version}
 
 %description
@@ -88,8 +86,8 @@ Requires: %{name} = %{version}-%{release
 Extra GNOME applications for using PackageKit that are not normally needed.
 
 %prep
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
-#%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -223,6 +221,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Tue Dec 08 2009 Richard Hughes  <rhughes at redhat.com> - 2.29.1-1
+- New upstream version.
+
 * Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-0.1.20090928git
 - New snapshot from the gnome-2-28 branch
 - Many updated translations.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	28 Sep 2009 15:32:14 -0000	1.58
+++ sources	8 Dec 2009 13:35:25 -0000	1.59
@@ -1 +1 @@
-5ee4201b8d4aad9b0617e4426eb726bf  gnome-packagekit-2.28.1-20090928.tar.gz
+8af164a455eb8a68b4d3e59d3c2d4e4d  gnome-packagekit-2.29.1.tar.gz



From limb at fedoraproject.org  Tue Dec  8 13:37:30 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 13:37:30 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.36,1.37
Message-ID: <20091208133730.19CAE11C0264@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2524

Modified Files:
	bacula.spec 
Log Message:
Drop broken postun scriptlet, BZ 545226.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- bacula.spec	4 Dec 2009 15:00:35 -0000	1.36
+++ bacula.spec	8 Dec 2009 13:37:29 -0000	1.37
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 3.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -697,12 +697,6 @@ fi
 	-c 'Bacula Backup System' -g bacula bacula &>/dev/null || :
 
 
-%postun common
-Dropped due to Guidelines
-#test "$1" != 0 || /usr/sbin/fedora-userdel  bacula &>/dev/null || :
-#test "$1" != 0 || /usr/sbin/fedora-groupdel bacula &>/dev/null || :
-
-
 %post storage-mysql
 /usr/sbin/alternatives --install /usr/sbin/bcopy bacula-sd /usr/sbin/bcopy.mysql 50 \
 	--slave /usr/sbin/dbcheck bacula-bscan /usr/sbin/bscan.mysql 
@@ -1009,6 +1003,9 @@ fi
 
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-5
+- Drop broken postun scriptlet, BZ 545226.
+
 * Thu Dec 03 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-4
 - Fix applybaculadate location.
 



From limb at fedoraproject.org  Tue Dec  8 13:39:11 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 13:39:11 +0000 (UTC)
Subject: rpms/xmoto/devel xmoto.spec,1.55,1.56
Message-ID: <20091208133911.71A5111C0264@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3209

Modified Files:
	xmoto.spec 
Log Message:
EVR adjustment.



Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- xmoto.spec	7 Dec 2009 20:06:51 -0000	1.55
+++ xmoto.spec	8 Dec 2009 13:39:11 -0000	1.56
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	1.1%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -125,6 +125,9 @@ fi
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Mon Dec 07 2009 Jon Ciesla <limb at jcomserv.net> 0.5.2-1.1
+- EVR bump for fix CVS tagging snafu.
+
 * Tue Dec 06 2009 Howard Liberty <liberty at live.com> 0.5.2-1
 - New upstream.
 - Add x86-64 patch so it can be compiled in x86-64 enviroment.



From mlichvar at fedoraproject.org  Tue Dec  8 13:39:28 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  8 Dec 2009 13:39:28 +0000 (UTC)
Subject: File xterm-252.tgz uploaded to lookaside cache by mlichvar
Message-ID: <20091208133928.85F6D10F87E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xterm:

b92777f7adbb2aa4c9029752ab24fee1  xterm-252.tgz



From mlichvar at fedoraproject.org  Tue Dec  8 13:40:51 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  8 Dec 2009 13:40:51 +0000 (UTC)
Subject: rpms/xterm/devel .cvsignore, 1.40, 1.41 sources, 1.40,
	1.41 xterm.spec, 1.82, 1.83
Message-ID: <20091208134051.B1E2611C03AD@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3882

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
- update to 252



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	19 Nov 2009 15:21:46 -0000	1.40
+++ .cvsignore	8 Dec 2009 13:40:51 -0000	1.41
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-251.tgz
+xterm-252.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	19 Nov 2009 15:21:46 -0000	1.40
+++ sources	8 Dec 2009 13:40:51 -0000	1.41
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-343a4ce213f70c53cf65979f163bebc3  xterm-251.tgz
+b92777f7adbb2aa4c9029752ab24fee1  xterm-252.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- xterm.spec	19 Nov 2009 15:21:46 -0000	1.82
+++ xterm.spec	8 Dec 2009 13:40:51 -0000	1.83
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 251
+Version: 252
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Thu Dec 08 2009 Miroslav Lichvar <mlichvar at redhat.com> 252-1
+- update to 252
+
 * Thu Nov 19 2009 Miroslav Lichvar <mlichvar at redhat.com> 251-1
 - update to 251
 



From ovasik at fedoraproject.org  Tue Dec  8 13:46:17 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  8 Dec 2009 13:46:17 +0000 (UTC)
Subject: rpms/tar/F-12 tar-1.22-nsfraction.patch, NONE, 1.1 tar.spec, 1.90,
	1.91
Message-ID: <20091208134617.C441E11C0264@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/tar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5760

Modified Files:
	tar.spec 
Added Files:
	tar-1.22-nsfraction.patch 
Log Message:
fix segfault with corrupted metadata in code_ns_fraction(#531441), commented patches and sources

tar-1.22-nsfraction.patch:
 misc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tar-1.22-nsfraction.patch ---
diff -urNp tar-1.22-orig/src/misc.c tar-1.22/src/misc.c
--- tar-1.22-orig/src/misc.c	2007-06-27 15:30:32.000000000 +0200
+++ tar-1.22/src/misc.c	2009-12-08 13:41:46.000000000 +0100
@@ -228,7 +228,7 @@ code_ns_fraction (int ns, char *p)
     *p = '\0';
   else
     {
-      int i = 9;
+      int i = 10;
       *p++ = '.';
 
       while (ns % 10 == 0)


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/F-12/tar.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- tar.spec	27 Nov 2009 15:16:30 -0000	1.90
+++ tar.spec	8 Dec 2009 13:46:17 -0000	1.91
@@ -2,21 +2,36 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.22
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
 Source0: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.bz2
 Source1: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.bz2.sig
+#Manpage for tar and gtar, a bit modified help2man generated manpage
 Source2: tar.1
+#Stop issuing lone zero block warnings
 Patch1: tar-1.14-loneZeroWarning.patch
+#Fix extracting sparse files to a filesystem like vfat,
+#when ftruncate may fail to grow the size of a file.(#179507)
 Patch2: tar-1.15.1-vfatTruncate.patch
+#Add support for selinux, acl and extended attributes
 Patch3: tar-1.19-xattrs.patch
+#change inclusion defaults of tar to "--wildcards --anchored
+#--wildcards-match-slash" for compatibility reasons (#206841)
 Patch4: tar-1.17-wildcards.patch
+#ignore errors from setting utime() for source file
+#on read-only filesystem (#500742)
 Patch5: tar-1.22-atime-rofs.patch
+#Report record size only if the archive refers to a device(#487760)
 Patch6: tar-1.22-shortreadbuffer.patch
+#Do not sigabrt with new gcc/glibc because of writing to
+#struct members of gnutar header at once via strcpy
 Patch7: tar-1.22-fortifysourcessigabrt.patch
+#fix memory leak in xheader (#518079)
 Patch8: tar-1.22-xheaderleak.patch
+#fix segfault in code_ns_fraction() with corrupted metadata (#531441)
+Patch9: tar-1.22-nsfraction.patch
 Prereq: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk rsh
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +60,7 @@ the rmt package.
 %patch6 -p1 -b .shortread
 %patch7 -p1 -b .headerblackmagic
 %patch8 -p1 -b .xheaderleak
+%patch9 -p1 -b .nsfraction
 
 %build
 autoreconf
@@ -102,11 +118,19 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Tue Dec 08 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.22-11
+- fix segfault with corrupted metadata in code_ns_fraction
+  (#531441)
+- commented patches and sources
+
 * Fri Nov 27 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.22-10
 - store xattrs for symlinks (#525992) - by Kamil Dudka
 - update tar(1) manpage (#539787)
 - fix memory leak in xheader (#518079)
 
+* Wed Nov 18 2009 Kamil Dudka <kdudka at redhat.com> 2:1.22-9
+- store SELinux context for symlinks (#525992)
+
 * Thu Aug 27 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.22-8
 - provide symlink manpage for gtar
 



From limb at fedoraproject.org  Tue Dec  8 13:50:57 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 13:50:57 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.37,1.38
Message-ID: <20091208135057.34A7F11C0264@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7346

Modified Files:
	bacula.spec 
Log Message:
Oops.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- bacula.spec	8 Dec 2009 13:37:29 -0000	1.37
+++ bacula.spec	8 Dec 2009 13:50:56 -0000	1.38
@@ -229,7 +229,6 @@ Summary: Common Bacula utilities
 Group: System Environment/Daemons
 Requires: bacula-sysconfdir = %{version}-%{release}
 Requires(pre): fedora-usermgmt
-Requires(postun): fedora-usermgmt
 
 %description common
 Bacula is a set of programs that allow you to manage the backup,
@@ -1004,7 +1003,7 @@ fi
 
 %changelog
 * Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-5
-- Drop broken postun scriptlet, BZ 545226.
+- Drop broken postun scriptlet and dep, BZ 545226.
 
 * Thu Dec 03 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-4
 - Fix applybaculadate location.



From dsd at fedoraproject.org  Tue Dec  8 13:58:54 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  8 Dec 2009 13:58:54 +0000 (UTC)
Subject: rpms/vte/F-11 python-env-passing.patch, NONE, 1.1 vte.spec, 1.150,
	1.151
Message-ID: <20091208135854.29E0211C0264@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/vte/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9899

Modified Files:
	vte.spec 
Added Files:
	python-env-passing.patch 
Log Message:
fix environment passing bug in python bindings

python-env-passing.patch:
 vte.override |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE python-env-passing.patch ---
>From 3c22f5997c7e11f371c606520daff279d9b613e4 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad at behdad.org>
Date: Tue, 29 Sep 2009 18:54:30 +0000
Subject: Bug 587894 - the environment passing with python does no longer work

---
diff --git a/python/vte.override b/python/vte.override
index 29c3316..196b935 100644
--- a/python/vte.override
+++ b/python/vte.override
@@ -112,7 +112,7 @@ _build_envv(PyObject *py_envv, char ***envv)
 	int i, pos, n_envs;
 	PyObject *py_dict_k, *py_dict_v;
 
-	if (py_envv == NULL || py_envv != Py_None) {
+	if (py_envv == NULL || py_envv == Py_None) {
 		return 0;
 	}
 
@@ -122,20 +122,20 @@ _build_envv(PyObject *py_envv, char ***envv)
 		pos = 0;
 		i = 0;
 		while (PyDict_Next(py_envv, &pos, &py_dict_k, &py_dict_v)) {
-			*envv[i++] = g_strdup_printf("%s=%s",
+			(*envv)[i++] = g_strdup_printf("%s=%s",
 				PyString_AsString(py_dict_k),
 				PyString_AsString(py_dict_v));
 		}
-		*envv[n_envs] = NULL;
+		(*envv)[n_envs] = NULL;
 	} else if (PySequence_Check(py_envv)) {
 		n_envs = PySequence_Length(py_envv);
 		*envv = g_new(gchar *, n_envs + 1);
 		for (i = 0; i < n_envs; i++) {
 			PyObject *item = PySequence_GetItem(py_envv, i);
 			Py_DECREF(item);  /* PySequence_GetItem INCREF's */
-			*envv[i] = PyString_AsString(item);
+			(*envv)[i] = PyString_AsString(item);
 		}
-		*envv[n_envs] = NULL;
+		(*envv)[n_envs] = NULL;
 	} else {
 		PyErr_SetString(PyExc_TypeError,
 				"envv must be a sequence or a dictionary");
--
cgit v0.8.2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-11/vte.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- vte.spec	10 Jun 2009 02:36:13 -0000	1.150
+++ vte.spec	8 Dec 2009 13:58:53 -0000	1.151
@@ -4,7 +4,7 @@
 
 Name: vte
 Version: 0.20.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -22,6 +22,8 @@ BuildRequires: intltool
 # initscripts creates the utmp group
 Prereq: initscripts
 
+Patch1: python-env-passing.patch
+
 %description
 VTE is a terminal emulator widget for use with GTK+ 2.0.
 
@@ -43,6 +45,7 @@ vte.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -108,6 +111,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Dec  8 2009 Daniel Drake <dsd at laptop.org> 0.20.5-2
+- Add upstream patch to fix environment bug with Python bindings (#537391)
+
 * Tue Jun  9 2009 Matthias Clasen <mclasen at redhat.com> 0.20.5-1
 - Update to 0.20.5
 



From twaugh at fedoraproject.org  Tue Dec  8 14:02:02 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 14:02:02 +0000 (UTC)
Subject: rpms/system-config-printer/F-11 system-config-printer-lpd-uri.patch,
	NONE, 1.1 system-config-printer.spec, 1.313, 1.314
Message-ID: <20091208140202.81A2911C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11317

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-lpd-uri.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
- Fixed traceback with short lpd device URIs (bug #545397).


system-config-printer-lpd-uri.patch:
 system-config-printer.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-lpd-uri.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.lpd-uri system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.lpd-uri	2009-12-08 14:00:31.646480878 +0000
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-08 14:00:35.027606138 +0000
@@ -5767,10 +5767,10 @@ class NewPrinterGUI(GtkGUI):
                 (scheme, rest) = urllib.splittype (device.uri)
                 (hostport, rest) = urllib.splithost (rest)
                 (queue, rest) = urllib.splitquery (rest)
-                if queue[0] == '/':
-                    queue = queue[1:]
-
                 if queue != '':
+                    if queue[0] == '/':
+                        queue = queue[1:]
+
                     device.menuentry = _("LPD/LPR queue '%s'") % queue
                 else:
                     device.menuentry = _("LPD/LPR queue")


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- system-config-printer.spec	7 Dec 2009 17:37:49 -0000	1.313
+++ system-config-printer.spec	8 Dec 2009 14:02:02 -0000	1.314
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch1: system-config-printer-localize-s
 Patch2: system-config-printer-browsepoll.patch
 Patch3: system-config-printer-cupsd.conf-parser.patch
 Patch4: system-config-printer-troubleshooter-traceback.patch
+Patch5: system-config-printer-lpd-uri.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -71,6 +72,7 @@ the configuration tool.
 %patch2 -p1 -b .browsepoll
 %patch3 -p1 -b .cupsd.conf-parser
 %patch4 -p1 -b .troubleshooter-traceback
+%patch5 -p1 -b .lpd-uri
 
 %build
 %configure
@@ -173,6 +175,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
+- Fixed traceback with short lpd device URIs (bug #545397).
+
 * Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
 - Fixed traceback when troubleshooter operation is cancelled (bug #544356).
 



From twaugh at fedoraproject.org  Tue Dec  8 14:03:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 14:03:59 +0000 (UTC)
Subject: rpms/system-config-printer/F-12 system-config-printer-lpd-uri.patch,
	NONE, 1.1 system-config-printer.spec, 1.323, 1.324
Message-ID: <20091208140359.982F511C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12242

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-lpd-uri.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
- Fixed traceback with short lpd device URIs (bug #545397).


system-config-printer-lpd-uri.patch:
 system-config-printer.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-lpd-uri.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.lpd-uri system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.lpd-uri	2009-12-08 14:00:31.646480878 +0000
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-08 14:00:35.027606138 +0000
@@ -5767,10 +5767,10 @@ class NewPrinterGUI(GtkGUI):
                 (scheme, rest) = urllib.splittype (device.uri)
                 (hostport, rest) = urllib.splithost (rest)
                 (queue, rest) = urllib.splitquery (rest)
-                if queue[0] == '/':
-                    queue = queue[1:]
-
                 if queue != '':
+                    if queue[0] == '/':
+                        queue = queue[1:]
+
                     device.menuentry = _("LPD/LPR queue '%s'") % queue
                 else:
                     device.menuentry = _("LPD/LPR queue")


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- system-config-printer.spec	7 Dec 2009 17:37:52 -0000	1.323
+++ system-config-printer.spec	8 Dec 2009 14:03:59 -0000	1.324
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -20,6 +20,7 @@ Patch2: system-config-printer-localize-s
 Patch3: system-config-printer-browsepoll.patch
 Patch4: system-config-printer-cupsd.conf-parser.patch
 Patch5: system-config-printer-troubleshooter-traceback.patch
+Patch6: system-config-printer-lpd-uri.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -84,6 +85,7 @@ printers.
 %patch3 -p1 -b .browsepoll
 %patch4 -p1 -b .cupsd.conf-parser
 %patch5 -p1 -b .troubleshooter-traceback
+%patch6 -p1 -b .lpd-uri
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -196,6 +198,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
+- Fixed traceback with short lpd device URIs (bug #545397).
+
 * Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
 - Fixed traceback when troubleshooter operation is cancelled (bug #544356).
 



From twaugh at fedoraproject.org  Tue Dec  8 14:04:31 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 14:04:31 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-lpd-uri.patch, 
	NONE, 1.1 system-config-printer.spec, 1.319, 1.320
Message-ID: <20091208140431.8333E11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12546

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-lpd-uri.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
- Fixed traceback with short lpd device URIs (bug #545397).


system-config-printer-lpd-uri.patch:
 system-config-printer.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-lpd-uri.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.lpd-uri system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.lpd-uri	2009-12-08 14:00:31.646480878 +0000
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-08 14:00:35.027606138 +0000
@@ -5767,10 +5767,10 @@ class NewPrinterGUI(GtkGUI):
                 (scheme, rest) = urllib.splittype (device.uri)
                 (hostport, rest) = urllib.splithost (rest)
                 (queue, rest) = urllib.splitquery (rest)
-                if queue[0] == '/':
-                    queue = queue[1:]
-
                 if queue != '':
+                    if queue[0] == '/':
+                        queue = queue[1:]
+
                     device.menuentry = _("LPD/LPR queue '%s'") % queue
                 else:
                     device.menuentry = _("LPD/LPR queue")


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- system-config-printer.spec	7 Dec 2009 17:38:43 -0000	1.319
+++ system-config-printer.spec	8 Dec 2009 14:04:31 -0000	1.320
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -20,6 +20,7 @@ Patch2: system-config-printer-localize-s
 Patch3: system-config-printer-browsepoll.patch
 Patch4: system-config-printer-cupsd.conf-parser.patch
 Patch5: system-config-printer-troubleshooter-traceback.patch
+Patch6: system-config-printer-lpd-uri.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -84,6 +85,7 @@ printers.
 %patch3 -p1 -b .browsepoll
 %patch4 -p1 -b .cupsd.conf-parser
 %patch5 -p1 -b .troubleshooter-traceback
+%patch6 -p1 -b .lpd-uri
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -196,6 +198,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
+- Fixed traceback with short lpd device URIs (bug #545397).
+
 * Mon Dec  7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
 - Fixed traceback when troubleshooter operation is cancelled (bug #544356).
 



From pknirsch at fedoraproject.org  Tue Dec  8 14:05:12 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Tue,  8 Dec 2009 14:05:12 +0000 (UTC)
Subject: File tuned-0.2.6.tar.bz2 uploaded to lookaside cache by pknirsch
Message-ID: <20091208140512.EC10110F87E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tuned:

e6242748a202e91deb6384a158ce24ee  tuned-0.2.6.tar.bz2



From pknirsch at fedoraproject.org  Tue Dec  8 14:06:04 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Tue,  8 Dec 2009 14:06:04 +0000 (UTC)
Subject: rpms/tuned/F-12 .cvsignore, 1.9, 1.10 sources, 1.11, 1.12 tuned.spec,
	1.12, 1.13
Message-ID: <20091208140604.3AC7511C0264@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/tuned/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13293

Modified Files:
	.cvsignore sources tuned.spec 
Log Message:
- Included Jan Vcelak's patch for pyo and pyc files
- Updated ktune.sh script for laptop-battery-powersave profile with latest
  ALPM mechanism
- Fixed ktune.sh script for laptop-battery-powersave profile to stop printing
  errors when files in /sys are missing



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 Oct 2009 15:12:19 -0000	1.9
+++ .cvsignore	8 Dec 2009 14:06:03 -0000	1.10
@@ -1 +1 @@
-tuned-0.2.5.tar.bz2
+tuned-0.2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Nov 2009 13:26:21 -0000	1.11
+++ sources	8 Dec 2009 14:06:03 -0000	1.12
@@ -1 +1 @@
-2a60c3c0c6429c61660f7cffe726a255  tuned-0.2.5.tar.bz2
+e6242748a202e91deb6384a158ce24ee  tuned-0.2.6.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/tuned.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tuned.spec	26 Nov 2009 12:10:16 -0000	1.12
+++ tuned.spec	8 Dec 2009 14:06:03 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.5
-Release: 2%{?dist}
+Version: 0.2.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -102,8 +102,15 @@ fi
 
 
 %changelog
+* Tue Dec 08 2009 Phil Knirsch <pknirsch at redhat.com> 0.2.6-1
+- Included Jan Vcelak's patch for pyo and pyc files
+- Updated ktune.sh script for laptop-battery-powersave profile with latest
+  ALPM mechanism
+- Fixed ktune.sh script for laptop-battery-powersave profile to stop printing
+  errors when files in /sys are missing
+
 * Thu Nov 26 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.5-2
-- Added python into build requires 
+- Added python into build requires
 - Resolves: #539949
 
 * Tue Nov 03 2009 Phil Knirsch <pknirsch at redhat.com> 0.2.5-1



From caolanm at fedoraproject.org  Tue Dec  8 14:08:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  8 Dec 2009 14:08:53 +0000 (UTC)
Subject: rpms/hunspell/F-12 hunspell-1.2.8-2910695.nohome.patch, NONE,
	1.1 hunspell.spec, 1.73, 1.74
Message-ID: <20091208140853.A01F911C0264@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14429/F-12

Modified Files:
	hunspell.spec 
Added Files:
	hunspell-1.2.8-2910695.nohome.patch 
Log Message:
Resolves: rhbz#544372 survive having no HOME

hunspell-1.2.8-2910695.nohome.patch:
 hunspell.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE hunspell-1.2.8-2910695.nohome.patch ---
diff -ru hunspell-1.2.8.orig/src/tools/hunspell.cxx hunspell-1.2.8/src/tools/hunspell.cxx
--- hunspell-1.2.8.orig/src/tools/hunspell.cxx	2009-12-08 13:54:20.000000000 +0000
+++ hunspell-1.2.8/src/tools/hunspell.cxx	2009-12-08 14:00:09.000000000 +0000
@@ -1016,7 +1016,6 @@
 		i->next = dicwords;
 		dicwords = i;
 		// save
-		strcpy(buf,HOME);
 		if (HOME) strcpy(buf,HOME); else {
 		    fprintf(stderr, gettext("error - missing HOME variable\n"));
 		    break;
@@ -1147,7 +1146,6 @@
 		    }
 		    // save
 		    		    
-		    strcpy(buf,HOME);
 		    if (HOME) strcpy(buf,HOME); else {
 			fprintf(stderr, gettext("error - missing HOME variable\n"));
 			continue;
@@ -1541,7 +1539,7 @@
 	path = add(path, PATHSEP);          // <- check path in root directory
 	if (getenv("DICPATH")) path = add(add(path, getenv("DICPATH")), PATHSEP);
 	path = add(add(path, LIBDIR), PATHSEP);
-	path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP);
+	if (HOME) path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP);
 	path = add(path, OOODIR);
 
 	if (showpath) {


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-12/hunspell.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- hunspell.spec	30 Jul 2009 07:30:30 -0000	1.73
+++ hunspell.spec	8 Dec 2009 14:08:53 -0000	1.74
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   A spell checker and morphological analyzer library
 Version:   1.2.8
-Release:   12%{?dist}
+Release:   13%{?dist}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
 Source2:   http://people.redhat.com/caolanm/hunspell/wordlist2hunspell
@@ -14,6 +14,7 @@ Patch1:    hunspell-1.2.7-2314461.ispell
 Patch2:    hunspell-1.2.8-2784983.defaultlanguage.patch
 Patch3:    hunspell-1.2.8-2812045.warnings.fortify.patch
 Patch4:    hunspell-1.2.8-2826164.fixtests.patch
+Patch5:    hunspell-1.2.8-2910695.nohome.patch
 
 %description
 Hunspell is a spell checker and morphological analyzer library and program 
@@ -35,6 +36,7 @@ Includes and definitions for developing 
 %patch2 -p1 -b .defaultlanguage.patch
 %patch3 -p1 -b .warnings.fortify.patch
 %patch4 -p1 -b .fixtests.patch
+%patch5 -p1 -b .nohome.patch
 # Filter unwanted Requires for the "use explicitely" string in ispellaff2myspell
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -125,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Tue Dec 08 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-13
+- Resolves: rhbz#544372 survive having no HOME
+
 * Thu Jul 30 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-12
 - handle some other interesting edge-cases
 



From caolanm at fedoraproject.org  Tue Dec  8 14:08:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  8 Dec 2009 14:08:53 +0000 (UTC)
Subject: rpms/hunspell/devel hunspell-1.2.8-2910695.nohome.patch, NONE,
	1.1 hunspell.spec, 1.73, 1.74
Message-ID: <20091208140853.C19B811C02BA@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14429/devel

Modified Files:
	hunspell.spec 
Added Files:
	hunspell-1.2.8-2910695.nohome.patch 
Log Message:
Resolves: rhbz#544372 survive having no HOME

hunspell-1.2.8-2910695.nohome.patch:
 hunspell.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE hunspell-1.2.8-2910695.nohome.patch ---
diff -ru hunspell-1.2.8.orig/src/tools/hunspell.cxx hunspell-1.2.8/src/tools/hunspell.cxx
--- hunspell-1.2.8.orig/src/tools/hunspell.cxx	2009-12-08 13:54:20.000000000 +0000
+++ hunspell-1.2.8/src/tools/hunspell.cxx	2009-12-08 14:00:09.000000000 +0000
@@ -1016,7 +1016,6 @@
 		i->next = dicwords;
 		dicwords = i;
 		// save
-		strcpy(buf,HOME);
 		if (HOME) strcpy(buf,HOME); else {
 		    fprintf(stderr, gettext("error - missing HOME variable\n"));
 		    break;
@@ -1147,7 +1146,6 @@
 		    }
 		    // save
 		    		    
-		    strcpy(buf,HOME);
 		    if (HOME) strcpy(buf,HOME); else {
 			fprintf(stderr, gettext("error - missing HOME variable\n"));
 			continue;
@@ -1541,7 +1539,7 @@
 	path = add(path, PATHSEP);          // <- check path in root directory
 	if (getenv("DICPATH")) path = add(add(path, getenv("DICPATH")), PATHSEP);
 	path = add(add(path, LIBDIR), PATHSEP);
-	path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP);
+	if (HOME) path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP);
 	path = add(path, OOODIR);
 
 	if (showpath) {


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- hunspell.spec	30 Jul 2009 07:30:30 -0000	1.73
+++ hunspell.spec	8 Dec 2009 14:08:53 -0000	1.74
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   A spell checker and morphological analyzer library
 Version:   1.2.8
-Release:   12%{?dist}
+Release:   13%{?dist}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
 Source2:   http://people.redhat.com/caolanm/hunspell/wordlist2hunspell
@@ -14,6 +14,7 @@ Patch1:    hunspell-1.2.7-2314461.ispell
 Patch2:    hunspell-1.2.8-2784983.defaultlanguage.patch
 Patch3:    hunspell-1.2.8-2812045.warnings.fortify.patch
 Patch4:    hunspell-1.2.8-2826164.fixtests.patch
+Patch5:    hunspell-1.2.8-2910695.nohome.patch
 
 %description
 Hunspell is a spell checker and morphological analyzer library and program 
@@ -35,6 +36,7 @@ Includes and definitions for developing 
 %patch2 -p1 -b .defaultlanguage.patch
 %patch3 -p1 -b .warnings.fortify.patch
 %patch4 -p1 -b .fixtests.patch
+%patch5 -p1 -b .nohome.patch
 # Filter unwanted Requires for the "use explicitely" string in ispellaff2myspell
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -125,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Tue Dec 08 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-13
+- Resolves: rhbz#544372 survive having no HOME
+
 * Thu Jul 30 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-12
 - handle some other interesting edge-cases
 



From pknirsch at fedoraproject.org  Tue Dec  8 14:10:44 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Tue,  8 Dec 2009 14:10:44 +0000 (UTC)
Subject: rpms/tuned/devel sources,1.11,1.12 tuned.spec,1.13,1.14
Message-ID: <20091208141044.6674511C03E3@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15099

Modified Files:
	sources tuned.spec 
Log Message:
- Included Jan Vcelak's patch for pyo and pyc files
- Updated ktune.sh script for laptop-battery-powersave profile with latest
  ALPM mechanism
- Fixed ktune.sh script for laptop-battery-powersave profile to stop printing
  errors when files in /sys are missing



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Nov 2009 13:24:51 -0000	1.11
+++ sources	8 Dec 2009 14:10:44 -0000	1.12
@@ -1 +1 @@
-2a60c3c0c6429c61660f7cffe726a255  tuned-0.2.5.tar.bz2
+e6242748a202e91deb6384a158ce24ee  tuned-0.2.6.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tuned.spec	26 Nov 2009 11:39:10 -0000	1.13
+++ tuned.spec	8 Dec 2009 14:10:44 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.5
-Release: 2%{?dist}
+Version: 0.2.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -102,8 +102,15 @@ fi
 
 
 %changelog
+* Tue Dec 08 2009 Phil Knirsch <pknirsch at redhat.com> 0.2.6-1
+- Included Jan Vcelak's patch for pyo and pyc files
+- Updated ktune.sh script for laptop-battery-powersave profile with latest
+  ALPM mechanism
+- Fixed ktune.sh script for laptop-battery-powersave profile to stop printing
+  errors when files in /sys are missing
+
 * Thu Nov 26 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.5-2
-- Added python into build requires 
+- Added python into build requires
 - Resolves: #539949
 
 * Tue Nov 03 2009 Phil Knirsch <pknirsch at redhat.com> 0.2.5-1



From pmatilai at fedoraproject.org  Tue Dec  8 14:13:13 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  8 Dec 2009 14:13:13 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.90-python-bytecompile.patch, NONE,
	1.1 rpm.spec, 1.370, 1.371
Message-ID: <20091208141313.10E5611C0264@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16058

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.90-python-bytecompile.patch 
Log Message:
- fix noise from python bytecompile on non-python packages (#539635)


rpm-4.7.90-python-bytecompile.patch:
 brp-python-bytecompile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE rpm-4.7.90-python-bytecompile.patch ---
commit 3ffc0373c4db9824a72a6356d04d862e51f42be0
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Dec 8 15:58:51 2009 +0200

    Avoid noise from python bytecompile on non-python pkgs (RhBug:539635)
    - If a pattern doesn't match, we'd prefer an empty list instead of
      unexpanded garbage thank you... nullglob shell option is just what the
      doctor ordered but unfortunately its a bash-specific thing. Otoh there
      are number of other bash-specific scripts in rpm so probably not
      much of an issue...
    (cherry picked from commit d6bda5a1665d8d04526aea299781570ee7486b2e)

diff --git a/scripts/brp-python-bytecompile b/scripts/brp-python-bytecompile
index 1faa6db..9fac5a7 100644
--- a/scripts/brp-python-bytecompile
+++ b/scripts/brp-python-bytecompile
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # If using normal root, avoid changing anything.
 if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
@@ -32,6 +32,7 @@ fi
 # For example, below /usr/lib/python2.6/, we're targetting /usr/bin/python2.6
 # and below /usr/lib/python3.1/, we're targetting /usr/bin/python3.1
 
+shopt -s nullglob
 for python_libdir in $RPM_BUILD_ROOT/usr/lib*/python*/ ;
 do
 	python_binary=/usr/bin/$(basename $python_libdir)


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -p -r1.370 -r1.371
--- rpm.spec	7 Dec 2009 13:35:11 -0000	1.370
+++ rpm.spec	8 Dec 2009 14:13:12 -0000	1.371
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.1
+Release: 0.%{snapver}.2
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -37,6 +37,7 @@ Patch2: rpm-4.5.90-gstreamer-provides.pa
 Patch3: rpm-4.7.90-fedora-specspo.patch
 
 # Patches already in upstream
+Patch200: rpm-4.7.90-python-bytecompile.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -190,6 +191,8 @@ packages on a system.
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
+%patch200 -p1 -b .python-bytecompile
+
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 
@@ -403,6 +406,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Dec 07 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.2
+- fix noise from python bytecompile on non-python packages (#539635)
+
 * Mon Dec 07 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.1
 - update to 4.8.0-beta1 (http://rpm.org/wiki/Releases/4.8.0)
 - rpm-build conflicts with current ocaml-runtime



From th0br0 at fedoraproject.org  Tue Dec  8 14:19:25 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Tue,  8 Dec 2009 14:19:25 +0000 (UTC)
Subject: rpms/almanah/F-11 almanah-0.6.1-dbus_glib.patch, NONE,
	1.1 almanah.spec, 1.4, 1.5 import.log, 1.2, 1.3
Message-ID: <20091208141925.55C5011C0264@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/almanah/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18404/F-11

Modified Files:
	almanah.spec import.log 
Added Files:
	almanah-0.6.1-dbus_glib.patch 
Log Message:
patch for f11

almanah-0.6.1-dbus_glib.patch:
 configure.ac |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE almanah-0.6.1-dbus_glib.patch ---
diff -Naur almanah-0.6.1.orig/configure.ac almanah-0.6.1/configure.ac
--- almanah-0.6.1.orig/configure.ac	2009-06-01 11:17:41.000000000 +0200
+++ almanah-0.6.1/configure.ac	2009-12-08 15:11:20.000000000 +0100
@@ -65,11 +65,12 @@
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
-AM_PROG_LIBTOOL
+LT_INIT
+
 AM_GCONF_SOURCE_2
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
-PKG_CHECK_MODULES(STANDARD, glib-2.0 gtk+-2.0 >= 2.14 gmodule-2.0 gio-2.0 sqlite3 cairo gconf-2.0 atk libecal-1.2 libedataserver-1.2 libedataserverui-1.2)
+PKG_CHECK_MODULES(STANDARD, glib-2.0 gtk+-2.0 >= 2.14 gmodule-2.0 gio-2.0 sqlite3 cairo gconf-2.0 atk libecal-1.2 libedataserver-1.2 libedataserverui-1.2 dbus-glib-1)
 AC_SUBST(STANDARD_CFLAGS)
 AC_SUBST(STANDARD_LIBS)
 


Index: almanah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-11/almanah.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- almanah.spec	8 Dec 2009 13:30:39 -0000	1.4
+++ almanah.spec	8 Dec 2009 14:19:25 -0000	1.5
@@ -1,12 +1,13 @@
 Name:		almanah
 Version:	0.6.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Application for keeping an encrypted diary
 
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://tecnocode.co.uk/projects/almanah/
 Source0:	http://tecnocode.co.uk/downloads/%{name}-%{version}.tar.gz
+Patch0:		%{name}-%{version}-dbus_glib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext
@@ -36,6 +37,8 @@ chmod -x README AUTHORS NEWS ChangeLog s
 sed -e 's/_//' \
     -e 's/=Diary/=Almanah/' \
     -i data/%{name}.desktop.in
+%patch0 -p1 
+autoreconf -f 
 
 %build
 %configure --enable-encryption --enable-spell-checking
@@ -97,6 +100,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-3
+- Added patch required for F-11 (link against dbus-glib)
+
 * Tue Dec  8 2009 Andreas Osowski <th0br0 at mkdir.name> - 0.6.1-2
 - Cosmetic changes
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/almanah/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Dec 2009 13:30:39 -0000	1.2
+++ import.log	8 Dec 2009 14:19:25 -0000	1.3
@@ -1,2 +1,3 @@
 almanah-0_4_0-2_fc9:HEAD:almanah-0.4.0-2.fc9.src.rpm:1216052644
 almanah-0_6_1-2_fc12:F-11:almanah-0.6.1-2.fc12.src.rpm:1260278965
+almanah-0_6_1-3_fc12:F-11:almanah-0.6.1-3.fc12.src.rpm:1260281932



From karsten at fedoraproject.org  Tue Dec  8 14:22:26 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  8 Dec 2009 14:22:26 +0000 (UTC)
Subject: File suite3270-3.3.10ga4-src.tgz uploaded to lookaside cache by
	karsten
Message-ID: <20091208142226.BF0E410F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for x3270:

13d904e46cf7cea1dd9b0cdb5d1a3ebd  suite3270-3.3.10ga4-src.tgz



From cwickert at fedoraproject.org  Tue Dec  8 14:26:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  8 Dec 2009 14:26:31 +0000 (UTC)
Subject: File lxsession-0.4.0.tar.gz uploaded to lookaside cache by cwickert
Message-ID: <20091208142631.4E10C10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lxsession:

d1d63d674df3957556d4e44771c25b55  lxsession-0.4.0.tar.gz



From karsten at fedoraproject.org  Tue Dec  8 14:26:28 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue,  8 Dec 2009 14:26:28 +0000 (UTC)
Subject: rpms/x3270/devel x3270-3.3.10-ibmhostpath.patch, NONE,
	1.1 x3270-3.3.10-paths.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 x3270.spec, 1.35,
	1.36 c3270-332-ncursesw.patch, 1.1,
	NONE x3270-3.3-encoding.patch, 1.1,
	NONE x3270-3.3-modularX.patch, 1.1, NONE x3270-3.3-syntax.patch,
	1.1, NONE x3270-3.3.4-path.patch, 1.1,
	NONE x3270-3.3.6-redhat.patch, 1.1,
	NONE x3270-3.3.6-resize.patch, 1.1, NONE
Message-ID: <20091208142628.A8A5411C0264@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/x3270/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20870

Modified Files:
	.cvsignore sources x3270.spec 
Added Files:
	x3270-3.3.10-ibmhostpath.patch x3270-3.3.10-paths.patch 
Removed Files:
	c3270-332-ncursesw.patch x3270-3.3-encoding.patch 
	x3270-3.3-modularX.patch x3270-3.3-syntax.patch 
	x3270-3.3.4-path.patch x3270-3.3.6-redhat.patch 
	x3270-3.3.6-resize.patch 
Log Message:
- update to 3.3.10ga4-1


x3270-3.3.10-ibmhostpath.patch:
 c3270-3.3/Makefile      |    8 ++++----
 c3270-3.3/c3270.man     |    2 +-
 c3270-3.3/host.c        |    2 +-
 s3270-3.3/X3270.xad     |    2 +-
 s3270-3.3/host.c        |    2 +-
 s3270-3.3/s3270.man     |    2 +-
 x3270-3.3/Imakefile.in  |    8 ++++----
 x3270-3.3/Makefile.in   |    8 ++++----
 x3270-3.3/X3270.xad     |    2 +-
 x3270-3.3/ibm_hosts.man |    4 ++--
 x3270-3.3/x3270.man     |    2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

--- NEW FILE x3270-3.3.10-ibmhostpath.patch ---
diff -up x3270-3.3.10ga4/c3270-3.3/c3270.man.ibmhostspath x3270-3.3.10ga4/c3270-3.3/c3270.man
--- x3270-3.3.10ga4/c3270-3.3/c3270.man.ibmhostspath	2009-12-07 13:06:22.000000000 +0100
+++ x3270-3.3.10ga4/c3270-3.3/c3270.man	2009-12-07 13:09:17.000000000 +0100
@@ -3204,7 +3204,7 @@ backslash character.
 If more than one \fB\-xrm\fP option is given for the same resource,
 the last one on the command line is used.
 .SH "FILES"
-/usr/local/lib/x3270/ibm_hosts
+/etc/ibm_hosts
 .br
 $HOME/.c3270pro
 
diff -up x3270-3.3.10ga4/c3270-3.3/glue.c.ibmhostspath x3270-3.3.10ga4/c3270-3.3/glue.c
diff -up x3270-3.3.10ga4/c3270-3.3/host.c.ibmhostspath x3270-3.3.10ga4/c3270-3.3/host.c
--- x3270-3.3.10ga4/c3270-3.3/host.c.ibmhostspath	2009-12-07 13:13:03.000000000 +0100
+++ x3270-3.3.10ga4/c3270-3.3/host.c	2009-12-07 13:14:35.000000000 +0100
@@ -126,7 +126,7 @@ hostfile_init(void)
 	hostfile_initted = True;
 	hostfile_name = appres.hostsfile;
 	if (hostfile_name == CN)
-		hostfile_name = xs_buffer("%s/ibm_hosts", appres.conf_dir);
+		hostfile_name = xs_buffer("%s/ibm_hosts", "/etc");
 	else
 		hostfile_name = do_subst(appres.hostsfile, True, True);
 	hf = fopen(hostfile_name, "r");
diff -up x3270-3.3.10ga4/c3270-3.3/html/c3270-man.html.ibmhostspath x3270-3.3.10ga4/c3270-3.3/html/c3270-man.html
diff -up x3270-3.3.10ga4/c3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/c3270-3.3/html/Resources.html
diff -up x3270-3.3.10ga4/c3270-3.3/Makefile.ibmhostspath x3270-3.3.10ga4/c3270-3.3/Makefile
diff -up x3270-3.3.10ga4/c3270-3.3/Makefile.in.ibmhostspath x3270-3.3.10ga4/c3270-3.3/Makefile.in
--- x3270-3.3.10ga4/c3270-3.3/Makefile.in.ibmhostspath	2009-12-07 13:06:43.000000000 +0100
+++ x3270-3.3.10ga4/c3270-3.3/Makefile.in	2009-12-07 13:12:43.000000000 +0100
@@ -84,10 +84,10 @@ install:: c3270 x3270if
 	$(INSTALL_PROGRAM) c3270 $(DESTDIR)$(BINDIR)/c3270
 	$(INSTALL_PROGRAM) x3270if $(DESTDIR)$(BINDIR)/x3270if
 install::
-	[ -d $(DESTDIR)$(LIBX3270DIR) ] || \
-		mkdir -p $(DESTDIR)$(LIBX3270DIR)
-	[ -r $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ] || \
-		$(INSTALL_DATA) ibm_hosts $(DESTDIR)$(LIBX3270DIR)/ibm_hosts
+	[ -d $(DESTDIR)/etc ] || \
+		mkdir -p $(DESTDIR)/etc
+	[ -r $(DESTDIR)/etc/ibm_hosts ] || \
+		$(INSTALL_DATA) ibm_hosts $(DESTDIR)/etc/ibm_hosts
 @PR at install::
 
 install.man:
diff -up x3270-3.3.10ga4/s3270-3.3/host.c.ibmhostspath x3270-3.3.10ga4/s3270-3.3/host.c
--- x3270-3.3.10ga4/s3270-3.3/host.c.ibmhostspath	2009-12-07 13:17:07.000000000 +0100
+++ x3270-3.3.10ga4/s3270-3.3/host.c	2009-12-07 13:18:19.000000000 +0100
@@ -126,7 +126,7 @@ hostfile_init(void)
 	hostfile_initted = True;
 	hostfile_name = appres.hostsfile;
 	if (hostfile_name == CN)
-		hostfile_name = xs_buffer("%s/ibm_hosts", appres.conf_dir);
+		hostfile_name = xs_buffer("%s/ibm_hosts", "/etc");
 	else
 		hostfile_name = do_subst(appres.hostsfile, True, True);
 	hf = fopen(hostfile_name, "r");
diff -up x3270-3.3.10ga4/s3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/s3270-3.3/html/Resources.html
diff -up x3270-3.3.10ga4/s3270-3.3/html/s3270-man.html.ibmhostspath x3270-3.3.10ga4/s3270-3.3/html/s3270-man.html
diff -up x3270-3.3.10ga4/s3270-3.3/s3270.man.ibmhostspath x3270-3.3.10ga4/s3270-3.3/s3270.man
--- x3270-3.3.10ga4/s3270-3.3/s3270.man.ibmhostspath	2009-12-07 13:16:49.000000000 +0100
+++ x3270-3.3.10ga4/s3270-3.3/s3270.man	2009-12-07 13:18:34.000000000 +0100
@@ -2015,7 +2015,7 @@ the \fBtraceDir\fP resource.
 If more than one \fB\-xrm\fP option is given for the same resource,
 the last one on the command line is used.
 .SH "FILES"
-/usr/local/lib/x3270/ibm_hosts
+/etc/ibm_hosts
 .br
 
 .SH "SEE ALSO"
diff -up x3270-3.3.10ga4/s3270-3.3/X3270.xad.ibmhostspath x3270-3.3.10ga4/s3270-3.3/X3270.xad
--- x3270-3.3.10ga4/s3270-3.3/X3270.xad.ibmhostspath	2009-12-07 13:17:00.000000000 +0100
+++ x3270-3.3.10ga4/s3270-3.3/X3270.xad	2009-12-07 13:18:45.000000000 +0100
@@ -221,7 +221,7 @@ x3270.charsetList:			U.S. English (CP 03
 ! x3270.doConfirms:			true
 ! x3270.debugTracing:			true
 ! x3270.disconnectClear:		false
-! x3270.hostsFile:			/usr/lib/X11/x3270/ibm_hosts
+! x3270.hostsFile:			/etc/ibm_hosts
 ! x3270.highlightSelect:		true
 ! x3270.idleCommand:
 ! x3270.idleTimeout:			~7m
diff -up x3270-3.3.10ga4/x3270-3.3/html/ibm_hosts.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/ibm_hosts.html
diff -up x3270-3.3.10ga4/x3270-3.3/html/Resources.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/Resources.html
diff -up x3270-3.3.10ga4/x3270-3.3/html/x3270-man.html.ibmhostspath x3270-3.3.10ga4/x3270-3.3/html/x3270-man.html
diff -up x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man.ibmhostspath x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man
--- x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man.ibmhostspath	2009-12-07 12:59:42.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/ibm_hosts.man	2009-12-07 13:01:03.000000000 +0100
@@ -3,7 +3,7 @@
 .SH "NAME"
 ibm_hosts \- host database for x3270 and c3270
 .SH "SYNOPSIS"
-/usr/lib/X11/x3270/ibm_hosts
+/etc/ibm_hosts
 .SH "DESCRIPTION"
 The \fBibm_hosts\fP
 file contains information regarding IBM hosts on the network.
@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 em
 enter the string `3' on the second data-entry field on the screen, and
 send the Enter \s-1AID\s+1 sequence.
 .SH "FILES"
-/usr/lib/X11/x3270/ibm_hosts
+/etc/ibm_hosts
 .SH "SEE ALSO"
 x3270(1),
 c3270(1)
diff -up x3270-3.3.10ga4/x3270-3.3/Imakefile.in.ibmhostspath x3270-3.3.10ga4/x3270-3.3/Imakefile.in
--- x3270-3.3.10ga4/x3270-3.3/Imakefile.in.ibmhostspath	2009-12-07 12:57:19.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/Imakefile.in	2009-12-07 13:03:46.000000000 +0100
@@ -190,8 +190,8 @@ $(DESTDIR)$(FONTINSTDIR)/fonts.dir::
 /* Extra install rule for the sample ibm_hosts file (runs only if there is
    no ibm_hosts file installed yet). */
 install:: $(HOSTSFILE)
-	@[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \
-		$(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE)
+	@[ -r $(DESTDIR)/etc/$(HOSTSFILE) ] || \
+		$(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)/etc/$(HOSTSFILE)
 
 /*
  * Install rules for x3270if, x3270-script and ibm_hosts man pages.
@@ -220,8 +220,8 @@ install.byprefix::
 	$(MKFONTDIR) $(DESTDIR)$(autoconf_fontinstdir)
 	chmod u=rwx,go=rx $(DESTDIR)$(autoconf_fontinstdir)
 	chmod a=r $(DESTDIR)$(autoconf_fontinstdir)/fonts.dir
-	@[ -r $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE) ] || \
-		(set -x; $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)$(LIBX3270DIR)/$(HOSTSFILE))
+	@[ -r $(DESTDIR)/etc/$(HOSTSFILE) ] || \
+		(set -x; $(INSTALL) -c $(INSTDATFLAGS) $(HOSTSFILE) $(DESTDIR)/etc/$(HOSTSFILE))
 
 /******************************************************************************
  * Clean rules.                                                               *
diff -up x3270-3.3.10ga4/x3270-3.3/Makefile.in.ibmhostspath x3270-3.3.10ga4/x3270-3.3/Makefile.in
--- x3270-3.3.10ga4/x3270-3.3/Makefile.in.ibmhostspath	2009-12-07 12:59:22.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/Makefile.in	2009-12-07 13:16:01.000000000 +0100
@@ -127,10 +127,10 @@ install:: x3270 x3270if
 	$(INSTALL_PROGRAM) x3270 $(DESTDIR)$(BINDIR)/x3270
 	$(INSTALL_PROGRAM) x3270if $(DESTDIR)$(BINDIR)/x3270if
 install::
-	[ -d $(DESTDIR)$(LIBX3270DIR) ] || \
-		mkdir -p $(DESTDIR)$(LIBX3270DIR)
-	[ -r $(DESTDIR)$(LIBX3270DIR)/ibm_hosts ] || \
-		$(INSTALL_DATA) ibm_hosts $(DESTDIR)$(LIBX3270DIR)/ibm_hosts
+	[ -d $(DESTDIR)/etc ] || \
+		mkdir -p $(DESTDIR)/etc
+	[ -r $(DESTDIR)/etc/ibm_hosts ] || \
+		$(INSTALL_DATA) ibm_hosts $(DESTDIR)/etc/ibm_hosts
 install::
 	[ -d $(DESTDIR)$(CIFONTDIR) ] || \
 		mkdir -p $(DESTDIR)$(CIFONTDIR)
diff -up x3270-3.3.10ga4/x3270-3.3/X3270.ad.ibmhostspath x3270-3.3.10ga4/x3270-3.3/X3270.ad
--- x3270-3.3.10ga4/x3270-3.3/X3270.xad.ibmhostspath	2009-12-07 12:59:53.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/X3270.xad	2009-12-07 13:05:28.000000000 +0100
@@ -214,7 +214,7 @@ x3270.charsetList:			U.S. English (CP 03
 ! x3270.doConfirms:			true
 ! x3270.debugTracing:			true
 ! x3270.disconnectClear:		false
-! x3270.hostsFile:			/usr/lib/X11/x3270/ibm_hosts
+! x3270.hostsFile:			/etc/ibm_hosts
 ! x3270.highlightSelect:		true
 ! x3270.idleCommand:
 ! x3270.idleTimeout:			~7m
diff -up x3270-3.3.10ga4/x3270-3.3/x3270.man.ibmhostspath x3270-3.3.10ga4/x3270-3.3/x3270.man
--- x3270-3.3.10ga4/x3270-3.3/x3270.man.ibmhostspath	2009-12-07 12:59:05.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/x3270.man	2009-12-07 13:05:42.000000000 +0100
@@ -5008,7 +5008,7 @@ T}
 The special types \fBsocks4a\fP and \fBsocks5d\fP can also be used to force
 the proxy server to do the hostname resolution for the SOCKS protocol.
 .SH "FILES"
-/usr/lib/X11/x3270/ibm_hosts
+/etc/ibm_hosts
 .br
 $HOME/.x3270pro
 

x3270-3.3.10-paths.patch:
 cms_logon.bash     |    2 +-
 peer_script.expect |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE x3270-3.3.10-paths.patch ---
diff -up x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect.expectpath x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect
--- x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect.expectpath	2009-12-04 13:56:39.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/Examples/peer_script.expect	2009-12-04 13:56:44.000000000 +0100
@@ -1,4 +1,4 @@
-#! /usr/local/bin/expect
+#! /usr/bin/expect
 # TSO login script, which runs as a peer of x3270.
 # expect version
 
diff -up x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash.bashpath x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash
--- x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash.bashpath	2009-12-04 13:58:21.000000000 +0100
+++ x3270-3.3.10ga4/x3270-3.3/Examples/cms_logon.bash	2009-12-04 13:59:25.000000000 +0100
@@ -1,4 +1,4 @@
-#! /usr/local/bin/bash
+#! /bin/bash
 
 # Copyright (c) 1995-2009, Paul Mattes.
 # All rights reserved.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Aug 2007 15:18:49 -0000	1.5
+++ .cvsignore	8 Dec 2009 14:26:27 -0000	1.6
@@ -1,2 +1 @@
-c3270-3.3.6.tgz
-x3270-3.3.6.tgz
+suite3270-3.3.10ga4-src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Aug 2007 15:18:49 -0000	1.5
+++ sources	8 Dec 2009 14:26:27 -0000	1.6
@@ -1,2 +1 @@
-d3eb409c406e0ff5ed9a3f0ae4b5452e  c3270-3.3.6.tgz
-3017011d1c33bb18a609b06379bf6ba6  x3270-3.3.6.tgz
+13d904e46cf7cea1dd9b0cdb5d1a3ebd  suite3270-3.3.10ga4-src.tgz


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/x3270.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- x3270.spec	21 Aug 2009 16:29:04 -0000	1.35
+++ x3270.spec	8 Dec 2009 14:26:28 -0000	1.36
@@ -5,22 +5,22 @@
 %define desktop_file_utils_version 0.2.93
 %endif
 
+%define majorver 3.3
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
-Version: 3.3.6
-Release: 10%{?dist}
+Version: 3.3.10ga4
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
-URL: http://www.geocities.com/SiliconValley/Peaks/7814
-Source0: http://x3270.bgp.nu/download/x3270-%{version}.tgz
-Source1: http://x3270.bgp.nu/download/c3270-%{version}.tgz
-Source2: x3270.png
-Source3: x3270.desktop
-Patch0: x3270-3.3.6-redhat.patch
-Patch1: c3270-332-ncursesw.patch
-Patch2: x3270-3.3-syntax.patch
-Patch3: x3270-3.3-encoding.patch
-Patch4: x3270-3.3.6-resize.patch
+URL: http://x3270.sourceforge.net/
+Source0: http://downloads.sourceforge.net/project/x3270/x3270/3.3.10ga4/suite3270-%{version}-src.tgz
+# c3270-3.3  pr3287-3.3  s3270-3.3  tcl3270-3.3  wc3270-3.3  wpr3287-3.3  ws3270-3.3  x3270-3.3
+#
+Source1: x3270.png
+Source2: x3270.desktop
+Patch0: x3270-3.3.10-paths.patch
+Patch1: x3270-3.3.10-ibmhostpath.patch
+
 Prereq: xorg-x11-font-utils
 BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,64 +72,75 @@ Install the %{name}-text package if you 
 3278/3279 terminal emulator without running X.
 
 %prep
-%setup -q -n x3270-3.3 -a 1
+rm -rf x3270-%{version}
+mkdir x3270-%{version}
+tar -xz -C x3270-%{version} -f %{SOURCE0}
+cd x3270-%{version}
+# delete windows and tcl sources:
+rm -rf wpr3287* wc3270* ws3270* tcl3270*
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-#patch3 -p1
-%patch4 -p1
 
 %build
+cd x3270-%{version}
+# Fix end of line encodings
+perl -pi -e "s/
//" */html/Keymap.html */html/Build.html
 # Set LIBX3270DIR to something we can share with x3270-text
-perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" Imakefile.in
+perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" x3270-%{majorver}/Imakefile.in
 # use rpmoptflags for x3270if
-perl -pi -e 's/ -o x3270if x3270if.c/ \$(CCOPTIONS) -o x3270if x3270if.c/g' Imakefile.in
-# Fix end of line encodings
-perl -pi -e "s/
//" html/Keymap.html html/Build.html
-libtoolize --copy --force
-%configure --prefix=%{_prefix}/ --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
-xmkmf
-make Makefiles
-make includes
-make depend
+perl -pi -e 's/ -o x3270if x3270if.c/ \$(CCOPTIONS) -o x3270if x3270if.c/g' x3270-%{majorver}/Imakefile.in
 
+for i in x3270-%{majorver} c3270-%{majorver} pr3287-%{majorver} s3270-%{majorver}; do
+( cd $i
+%configure --prefix=%{_prefix}/ --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
 make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS"
-cd c3270-3.3
-autoconf
-libtoolize --copy --force
-%configure --prefix=%{_prefix}
-make %{?_smp_mflags}
+)
+done
 
 %install
+cd x3270-%{version}
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/x3270
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/x3270
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 mkdir -p ${RPM_BUILD_ROOT}%{fontdir}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
 mkdir -p ${RPM_BUILD_ROOT}%{catalogue}
 
-# XXX Hack around mkfontdir madness on install.
-install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/bin
-install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
-install -m644 *pcf.gz $RPM_BUILD_ROOT%{fontdir}
-install -m644 ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/
-install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
-install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
-cd c3270-3.3
-install -m755 c3270 $RPM_BUILD_ROOT%{_prefix}/bin
-for i in c3270 x3270if x3270-script ibm_hosts; do
-    install -m644 $i.man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
-done
-cd ..
+install -m755 x3270-%{majorver}/x3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m755 x3270-%{majorver}/x3270if $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 x3270-%{majorver}/*pcf.gz $RPM_BUILD_ROOT%{fontdir}
+install -m644 x3270-%{majorver}/ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/
+install -m644 x3270-%{majorver}/X3270.xad ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/X3270
+install -m644 x3270-%{majorver}/x3270.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270.1
+install -m644 x3270-%{majorver}/x3270if.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270if.1
+install -m644 x3270-%{majorver}/x3270-script.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270-script.1
+install -m644 x3270-%{majorver}/ibm_hosts.man $RPM_BUILD_ROOT%{_mandir}/man5/ibm_hosts.5
+
+install -m755 pr3287-%{majorver}/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 pr3287-%{majorver}/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
+
+install -m755 c3270-%{majorver}/c3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 c3270-%{majorver}/c3270.man $RPM_BUILD_ROOT%{_mandir}/man1/c3270.1
 
-install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
+install -m755 s3270-%{majorver}/s3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 s3270-%{majorver}/s3270.man $RPM_BUILD_ROOT%{_mandir}/man1/s3270.1
+
+install -m644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities
-install -m644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities
-install -m644 X3270.xad ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/X3270
+install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities
 ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/x3270
+mv x3270-%{majorver}/README* x3270-%{majorver}/LICENSE x3270-%{majorver}/Examples x3270-%{majorver}/html .
+#mv c3270-%{majorver}/Examples/* Examples
+mv c3270-%{majorver}/README README.c3270
+mv c3270-%{majorver}/html html_c3270
+mv pr3287-%{majorver}/README README.pr3287
+mv pr3287-%{majorver}/html html_pr3287
+mv s3270-%{majorver}/README README.s3270
+mv s3270-%{majorver}/html html_s3270
 
 %if %{desktop_file}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
@@ -143,8 +154,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
 %endif
 
 
-rm -f Examples/*.rh Examples/*.orig
-chmod -x Examples/* html/*
+rm -f */Examples/*.rh */Examples/*.orig
+chmod -x Examples/* html*/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -167,11 +178,13 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc README LICENSE Examples html
+%doc %{name}-%{version}/{README*,LICENSE,Examples,html*}
+%{_prefix}/bin/s3270
 %{_prefix}/bin/pr3287
 %{_prefix}/bin/x3270if
 %exclude %{_mandir}/man1/c3270*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %dir %{_datadir}/x3270
 %config(noreplace) %{_sysconfdir}/ibm_hosts
 
@@ -195,6 +208,9 @@ fi
 %{_mandir}/man1/c3270*
 
 %changelog
+* Tue Dec 08 2009 Karsten Hopp <karsten at redhat.com> 3.3.10ga4-1
+- update to 3.3.10ga4-1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.6-10
 - rebuilt with new openssl
 


--- c3270-332-ncursesw.patch DELETED ---


--- x3270-3.3-encoding.patch DELETED ---


--- x3270-3.3-modularX.patch DELETED ---


--- x3270-3.3-syntax.patch DELETED ---


--- x3270-3.3.4-path.patch DELETED ---


--- x3270-3.3.6-redhat.patch DELETED ---


--- x3270-3.3.6-resize.patch DELETED ---



From limb at fedoraproject.org  Tue Dec  8 14:28:59 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 14:28:59 +0000 (UTC)
Subject: rpms/bacula/F-12 bacula.spec,1.34,1.35
Message-ID: <20091208142859.ADC8111C0264@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21763

Modified Files:
	bacula.spec 
Log Message:
Drop broken postun scriptlet and dep, BZ 545226.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-12/bacula.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- bacula.spec	4 Dec 2009 15:27:18 -0000	1.34
+++ bacula.spec	8 Dec 2009 14:28:59 -0000	1.35
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 3.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -229,7 +229,6 @@ Summary: Common Bacula utilities
 Group: System Environment/Daemons
 Requires: bacula-sysconfdir = %{version}-%{release}
 Requires(pre): fedora-usermgmt
-Requires(postun): fedora-usermgmt
 
 %description common
 Bacula is a set of programs that allow you to manage the backup,
@@ -697,12 +696,6 @@ fi
 	-c 'Bacula Backup System' -g bacula bacula &>/dev/null || :
 
 
-%postun common
-Dropped due to Guidelines
-#test "$1" != 0 || /usr/sbin/fedora-userdel  bacula &>/dev/null || :
-#test "$1" != 0 || /usr/sbin/fedora-groupdel bacula &>/dev/null || :
-
-
 %post storage-mysql
 /usr/sbin/alternatives --install /usr/sbin/bcopy bacula-sd /usr/sbin/bcopy.mysql 50 \
 	--slave /usr/sbin/dbcheck bacula-bscan /usr/sbin/bscan.mysql 
@@ -1009,6 +1002,9 @@ fi
 
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-5
+- Drop broken postun scriptlet and dep, BZ 545226.
+
 * Thu Dec 03 2009 Jon Ciesla <limb at jcomserv.net - 3.0.3-4
 - Fix applybaculadate location.
 



From pmatilai at fedoraproject.org  Tue Dec  8 14:30:08 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  8 Dec 2009 14:30:08 +0000 (UTC)
Subject: rpms/rpm/devel rpm.spec,1.371,1.372
Message-ID: <20091208143008.1697711C03E3@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22195

Modified Files:
	rpm.spec 
Log Message:
- make all our -devel [build]requires isa-specific
- trim out superfluous -devel dependencies from rpm-devel



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- rpm.spec	8 Dec 2009 14:13:12 -0000	1.371
+++ rpm.spec	8 Dec 2009 14:30:07 -0000	1.372
@@ -56,7 +56,7 @@ Requires: popt >= 1.10.2.1
 Requires: curl
 
 %if %{without int_bdb}
-BuildRequires: db4-devel
+BuildRequires: db4-devel%{_isa}
 %endif
 
 %if %{with check}
@@ -67,26 +67,26 @@ BuildRequires: fakechroot
 # is a bit special...
 BuildRequires: redhat-rpm-config
 BuildRequires: gawk
-BuildRequires: elfutils-devel >= 0.112
-BuildRequires: elfutils-libelf-devel
-BuildRequires: readline-devel zlib-devel
-BuildRequires: nss-devel
+BuildRequires: elfutils-devel%{_isa} >= 0.112
+BuildRequires: elfutils-libelf-devel%{_isa}
+BuildRequires: readline-devel%{_isa} zlib-devel%{_isa}
+BuildRequires: nss-devel%{_isa}
 # The popt version here just documents an older known-good version
-BuildRequires: popt-devel >= 1.10.2
-BuildRequires: file-devel
-BuildRequires: gettext-devel
-BuildRequires: libselinux-devel
-BuildRequires: ncurses-devel
-BuildRequires: bzip2-devel >= 0.9.0c-2
-BuildRequires: python-devel >= 2.2
-BuildRequires: lua-devel >= 5.1
-BuildRequires: libcap-devel
-BuildRequires: libacl-devel
+BuildRequires: popt-devel%{_isa} >= 1.10.2
+BuildRequires: file-devel%{_isa}
+BuildRequires: gettext-devel%{_isa}
+BuildRequires: libselinux-devel%{_isa}
+BuildRequires: ncurses-devel%{_isa}
+BuildRequires: bzip2-devel%{_isa} >= 0.9.0c-2
+BuildRequires: python-devel%{_isa} >= 2.6
+BuildRequires: lua-devel%{_isa} >= 5.1
+BuildRequires: libcap-devel%{_isa}
+BuildRequires: libacl-devel%{_isa}
 %if ! %{without xz}
-BuildRequires: xz-devel >= 4.999.8
+BuildRequires: xz-devel%{_isa} >= 4.999.8
 %endif
 %if %{with sqlite}
-BuildRequires: sqlite-devel
+BuildRequires: sqlite-devel%{_isa}
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -105,7 +105,7 @@ License: GPLv2+ and LGPLv2+ with excepti
 Requires: rpm = %{version}-%{release}
 # librpm uses cap_compare, introduced sometimes between libcap 2.10 and 2.16.
 # A manual require is needed, see #505596
-Requires: libcap >= 2.16
+Requires: libcap%{_isa} >= 2.16
 
 %description libs
 This package contains the RPM shared libraries.
@@ -115,17 +115,8 @@ Summary:  Development files for manipula
 Group: Development/Libraries
 License: GPLv2+ and LGPLv2+ with exceptions
 Requires: rpm = %{version}-%{release}
-Requires: pkgconfig
-Requires: nss-devel 
-Requires: libselinux-devel
-Requires: elfutils-libelf-devel
-Requires: popt-devel
-%if ! %{without xz}
-Requires: xz-devel >= 4.999.8
-%endif
-%if %{with sqlite}
-Requires: sqlite-devel
-%endif
+Requires: popt-devel%{_isa}
+Requires: file-devel%{_isa}
 
 %description devel
 This package contains the RPM C library and header files. These
@@ -408,6 +399,8 @@ exit 0
 %changelog
 * Mon Dec 07 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.2
 - fix noise from python bytecompile on non-python packages (#539635)
+- make all our -devel [build]requires isa-specific
+- trim out superfluous -devel dependencies from rpm-devel
 
 * Mon Dec 07 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.1
 - update to 4.8.0-beta1 (http://rpm.org/wiki/Releases/4.8.0)



From twaugh at fedoraproject.org  Tue Dec  8 14:30:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 14:30:39 +0000 (UTC)
Subject: rpms/portreserve/F-12 portreserve-0.0.4.tar.bz2.sig, NONE,
	1.1 portreserve-0.0.3.tar.bz2.sig, 1.1, NONE
Message-ID: <20091208143039.306CA11C02BC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/portreserve/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22517

Added Files:
	portreserve-0.0.4.tar.bz2.sig 
Removed Files:
	portreserve-0.0.3.tar.bz2.sig 
Log Message:
Include correct package signature.


--- NEW FILE portreserve-0.0.4.tar.bz2.sig ---
??

--- portreserve-0.0.3.tar.bz2.sig DELETED ---



From twaugh at fedoraproject.org  Tue Dec  8 14:31:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  8 Dec 2009 14:31:08 +0000 (UTC)
Subject: rpms/portreserve/devel portreserve-0.0.4.tar.bz2.sig, NONE,
	1.1 portreserve-0.0.3.tar.bz2.sig, 1.1, NONE
Message-ID: <20091208143108.D204B11C0264@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/portreserve/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22809

Added Files:
	portreserve-0.0.4.tar.bz2.sig 
Removed Files:
	portreserve-0.0.3.tar.bz2.sig 
Log Message:
Include correct package signature.


--- NEW FILE portreserve-0.0.4.tar.bz2.sig ---
??

--- portreserve-0.0.3.tar.bz2.sig DELETED ---



From pvrabec at fedoraproject.org  Tue Dec  8 15:01:59 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Tue,  8 Dec 2009 15:01:59 +0000 (UTC)
Subject: rpms/openscap/F-12 .cvsignore, 1.7, 1.8 openscap.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <20091208150159.4643311C0264@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/openscap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31852

Modified Files:
	.cvsignore openscap.spec sources 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Sep 2009 12:31:50 -0000	1.7
+++ .cvsignore	8 Dec 2009 15:01:58 -0000	1.8
@@ -1 +1 @@
-openscap-0.5.3.tar.gz
+openscap-0.5.5.tar.gz


Index: openscap.spec
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-12/openscap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- openscap.spec	29 Sep 2009 12:31:50 -0000	1.8
+++ openscap.spec	8 Dec 2009 15:01:58 -0000	1.9
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.5.3
+Version:        0.5.5
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@ Source0:        http://open-scap.org/dow
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  swig pcre-devel libxml2-devel
 BuildRequires:	rpm-devel
+BuildRequires:	libnl-devel
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -86,12 +87,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/{html,latex}
+%doc docs/{html,latex,examples}/
 %{_includedir}/*
 %{_libdir}/*.so
 
 
 %changelog
+* Thu Nov 12 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.5-1
+- upgrade
+
 * Tue Sep 29 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.3-1
 - upgrade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Sep 2009 12:31:50 -0000	1.7
+++ sources	8 Dec 2009 15:01:58 -0000	1.8
@@ -1 +1 @@
-39a2b8bf0a2aa4311a73c1dff54a557e  openscap-0.5.3.tar.gz
+15b573ccd16c6da457c8602adacb381e  openscap-0.5.5.tar.gz



From varekova at fedoraproject.org  Tue Dec  8 15:16:05 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue,  8 Dec 2009 15:16:05 +0000 (UTC)
Subject: rpms/psacct/F-12 psacct.init,1.7,1.8 psacct.spec,1.42,1.43
Message-ID: <20091208151605.940B711C0264@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/psacct/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3932

Modified Files:
	psacct.init psacct.spec 
Log Message:
- fix the initscript (service restart does not work)



Index: psacct.init
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/F-12/psacct.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- psacct.init	16 Sep 2009 07:20:44 -0000	1.7
+++ psacct.init	8 Dec 2009 15:16:03 -0000	1.8
@@ -41,7 +41,6 @@ stop() {
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 	    rm -f $LOCKFILE
-	    exit 0
 	else
 	    exit 1
 	fi


Index: psacct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/F-12/psacct.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- psacct.spec	2 Dec 2009 13:26:55 -0000	1.42
+++ psacct.spec	8 Dec 2009 15:16:03 -0000	1.43
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.3.2
-Release: 58%{?dist}
+Release: 59%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -184,6 +184,9 @@ fi
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Tue Dec  8 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 6.2.3-59
+- fix the initscript (service restart does not work)
+
 * Wed Dec  2 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 6.2.3-58
 - add dump-utmp.8 and dump-acct.8 man-pages
 



From than at fedoraproject.org  Tue Dec  8 15:20:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:20:43 +0000 (UTC)
Subject: rpms/arts/F-12 libltdl-CVE-2009-3736.patch,1.1,1.2
Message-ID: <20091208152043.1630211C03E3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5366

Modified Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: libltdl-CVE-2009-3736.patch
===================================================================
RCS file: /cvs/extras/rpms/arts/F-12/libltdl-CVE-2009-3736.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libltdl-CVE-2009-3736.patch	7 Dec 2009 14:50:13 -0000	1.1
+++ libltdl-CVE-2009-3736.patch	8 Dec 2009 15:20:42 -0000	1.2
@@ -1,22 +1,90 @@
-diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
---- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
-+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
-@@ -1544,7 +1544,8 @@
+diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
+--- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736	2008-08-19 22:18:38.000000000 +0200
++++ arts-1.5.10/libltdl/ltdl.c	2009-12-08 16:02:38.000000000 +0100
+@@ -1454,9 +1454,10 @@ lt_dlexit ()
+ }
+ 
+ static int
+-tryall_dlopen (handle, filename)
++tryall_dlopen (handle, filename, useloader)
+      lt_dlhandle *handle;
+      const char *filename;
++     const char *useloader;
+ {
+   lt_dlhandle	 cur;
+   lt_dlloader   *loader;
+@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
+ 
+   while (loader)
+     {
++      if (useloader && strcmp(loader->loader_name, useloader))
++	{
++	  loader = loader->next;
++	  continue;
++	}
+       lt_user_data data = loader->dlloader_data;
+ 
+       cur->module = loader->module_open (data, filename);
+@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
    /* try to open the old library first; if it was dlpreopened,
       we want the preopened version of it, even if a dlopenable
       module is available */
 -  if (old_name && tryall_dlopen(handle, old_name) == 0)
-+  if (old_name && tryall_dlopen(handle, old_name,
-+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
++  if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
      {
        return 0;
      }
-@@ -2158,7 +2159,7 @@
+@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
+ 	    }
+ 
+ 	  sprintf (filename, "%s/%s", libdir, dlname);
+-	  error = (tryall_dlopen (handle, filename) != 0);
++	  error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	  LT_DLFREE (filename);
+ 
+ 	  if (!error)
+@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
+ 	  strcat(filename, objdir);
+ 	  strcat(filename, dlname);
+ 
+-	  error = tryall_dlopen (handle, filename) != 0;
++	  error = tryall_dlopen (handle, filename, NULL) != 0;
+ 	  LT_DLFREE (filename);
+ 	  if (!error)
+ 	    {
+@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
  	  }
+ 	strcat(filename, dlname);
+ 
+-	error = (tryall_dlopen (handle, filename) != 0);
++	error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	LT_DLFREE (filename);
+ 	if (!error)
+ 	  {
+@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir, 
+       strcpy(filename+lendir, basename);
+       if (handle)
+ 	{
+-	  if (tryall_dlopen (handle, filename) == 0)
++	  if (tryall_dlopen (handle, filename, NULL) == 0)
+ 	    {
+ 	      result = (lt_ptr) handle;
+ 	      goto cleanup;
+@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
+       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
+       LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
+ 
+-      if (tryall_dlopen (&newhandle, 0) != 0)
++      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  return 0;
+@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
+ #ifdef LTDL_SYSSEARCHPATH
+ 		      && !find_file (basename, sys_search_path, 0, &newhandle)
  #endif
-       }
--    if (!file)
-+    else
-       {
- 	file = fopen (filename, LT_READTEXT_MODE);
-       }
+-		   )) && tryall_dlopen (&newhandle, filename))
++		   )) && tryall_dlopen (&newhandle, filename, NULL))
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  goto cleanup;



From than at fedoraproject.org  Tue Dec  8 15:21:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:21:30 +0000 (UTC)
Subject: rpms/arts/F-12 libltdl-CVE-2009-3736.patch,1.2,1.3
Message-ID: <20091208152130.58DB911C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5740

Modified Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: libltdl-CVE-2009-3736.patch
===================================================================
RCS file: /cvs/extras/rpms/arts/F-12/libltdl-CVE-2009-3736.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libltdl-CVE-2009-3736.patch	8 Dec 2009 15:20:42 -0000	1.2
+++ libltdl-CVE-2009-3736.patch	8 Dec 2009 15:21:30 -0000	1.3
@@ -1,90 +1,22 @@
-diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
---- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736	2008-08-19 22:18:38.000000000 +0200
-+++ arts-1.5.10/libltdl/ltdl.c	2009-12-08 16:02:38.000000000 +0100
-@@ -1454,9 +1454,10 @@ lt_dlexit ()
- }
- 
- static int
--tryall_dlopen (handle, filename)
-+tryall_dlopen (handle, filename, useloader)
-      lt_dlhandle *handle;
-      const char *filename;
-+     const char *useloader;
- {
-   lt_dlhandle	 cur;
-   lt_dlloader   *loader;
-@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
- 
-   while (loader)
-     {
-+      if (useloader && strcmp(loader->loader_name, useloader))
-+	{
-+	  loader = loader->next;
-+	  continue;
-+	}
-       lt_user_data data = loader->dlloader_data;
- 
-       cur->module = loader->module_open (data, filename);
-@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
+diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
+--- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
++++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
+@@ -1544,7 +1544,8 @@
    /* try to open the old library first; if it was dlpreopened,
       we want the preopened version of it, even if a dlopenable
       module is available */
 -  if (old_name && tryall_dlopen(handle, old_name) == 0)
-+  if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
++  if (old_name && tryall_dlopen(handle, old_name,
++                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
      {
        return 0;
      }
-@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
- 	    }
- 
- 	  sprintf (filename, "%s/%s", libdir, dlname);
--	  error = (tryall_dlopen (handle, filename) != 0);
-+	  error = (tryall_dlopen (handle, filename, NULL) != 0);
- 	  LT_DLFREE (filename);
- 
- 	  if (!error)
-@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
- 	  strcat(filename, objdir);
- 	  strcat(filename, dlname);
- 
--	  error = tryall_dlopen (handle, filename) != 0;
-+	  error = tryall_dlopen (handle, filename, NULL) != 0;
- 	  LT_DLFREE (filename);
- 	  if (!error)
- 	    {
-@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
+@@ -2158,7 +2159,7 @@
  	  }
- 	strcat(filename, dlname);
- 
--	error = (tryall_dlopen (handle, filename) != 0);
-+	error = (tryall_dlopen (handle, filename, NULL) != 0);
- 	LT_DLFREE (filename);
- 	if (!error)
- 	  {
-@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir, 
-       strcpy(filename+lendir, basename);
-       if (handle)
- 	{
--	  if (tryall_dlopen (handle, filename) == 0)
-+	  if (tryall_dlopen (handle, filename, NULL) == 0)
- 	    {
- 	      result = (lt_ptr) handle;
- 	      goto cleanup;
-@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
-       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
-       LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
- 
--      if (tryall_dlopen (&newhandle, 0) != 0)
-+      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
- 	{
- 	  LT_DLFREE (handle);
- 	  return 0;
-@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
- #ifdef LTDL_SYSSEARCHPATH
- 		      && !find_file (basename, sys_search_path, 0, &newhandle)
  #endif
--		   )) && tryall_dlopen (&newhandle, filename))
-+		   )) && tryall_dlopen (&newhandle, filename, NULL))
- 	{
- 	  LT_DLFREE (handle);
- 	  goto cleanup;
+       }
+-    if (!file)
++    else
+       {
+ 	file = fopen (filename, LT_READTEXT_MODE);
+       }



From than at fedoraproject.org  Tue Dec  8 15:22:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:22:50 +0000 (UTC)
Subject: rpms/arts/F-12 libltdl-CVE-2009-3736.patch,1.3,1.4
Message-ID: <20091208152250.56F0411C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6311

Modified Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: libltdl-CVE-2009-3736.patch
===================================================================
RCS file: /cvs/extras/rpms/arts/F-12/libltdl-CVE-2009-3736.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libltdl-CVE-2009-3736.patch	8 Dec 2009 15:21:30 -0000	1.3
+++ libltdl-CVE-2009-3736.patch	8 Dec 2009 15:22:50 -0000	1.4
@@ -1,22 +1,90 @@
-diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
---- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
-+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
-@@ -1544,7 +1544,8 @@
+diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
+--- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736	2008-08-19 22:18:38.000000000 +0200
++++ arts-1.5.10/libltdl/ltdl.c	2009-12-08 16:02:38.000000000 +0100
+@@ -1454,9 +1454,10 @@ lt_dlexit ()
+ }
+ 
+ static int
+-tryall_dlopen (handle, filename)
++tryall_dlopen (handle, filename, useloader)
+      lt_dlhandle *handle;
+      const char *filename;
++     const char *useloader;
+ {
+   lt_dlhandle	 cur;
+   lt_dlloader   *loader;
+@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
+ 
+   while (loader)
+     {
++      if (useloader && strcmp(loader->loader_name, useloader))
++	{
++	  loader = loader->next;
++	  continue;
++	}
+       lt_user_data data = loader->dlloader_data;
+ 
+       cur->module = loader->module_open (data, filename);
+@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
    /* try to open the old library first; if it was dlpreopened,
       we want the preopened version of it, even if a dlopenable
       module is available */
 -  if (old_name && tryall_dlopen(handle, old_name) == 0)
-+  if (old_name && tryall_dlopen(handle, old_name,
-+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
++  if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
      {
        return 0;
      }
-@@ -2158,7 +2159,7 @@
+@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
+ 	    }
+ 
+ 	  sprintf (filename, "%s/%s", libdir, dlname);
+-	  error = (tryall_dlopen (handle, filename) != 0);
++	  error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	  LT_DLFREE (filename);
+ 
+ 	  if (!error)
+@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
+ 	  strcat(filename, objdir);
+ 	  strcat(filename, dlname);
+ 
+-	  error = tryall_dlopen (handle, filename) != 0;
++	  error = tryall_dlopen (handle, filename, NULL) != 0;
+ 	  LT_DLFREE (filename);
+ 	  if (!error)
+ 	    {
+@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
  	  }
+ 	strcat(filename, dlname);
+ 
+-	error = (tryall_dlopen (handle, filename) != 0);
++	error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	LT_DLFREE (filename);
+ 	if (!error)
+ 	  {
+@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir, 
+       strcpy(filename+lendir, basename);
+       if (handle)
+ 	{
+-	  if (tryall_dlopen (handle, filename) == 0)
++	  if (tryall_dlopen (handle, filename, NULL) == 0)
+ 	    {
+ 	      result = (lt_ptr) handle;
+ 	      goto cleanup;
+@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
+       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
+       LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
+ 
+-      if (tryall_dlopen (&newhandle, 0) != 0)
++      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  return 0;
+@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
+ #ifdef LTDL_SYSSEARCHPATH
+ 		      && !find_file (basename, sys_search_path, 0, &newhandle)
  #endif
-       }
--    if (!file)
-+    else
-       {
- 	file = fopen (filename, LT_READTEXT_MODE);
-       }
+-		   )) && tryall_dlopen (&newhandle, filename))
++		   )) && tryall_dlopen (&newhandle, filename, NULL))
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  goto cleanup;



From than at fedoraproject.org  Tue Dec  8 15:23:46 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:23:46 +0000 (UTC)
Subject: rpms/arts/F-11 libltdl-CVE-2009-3736.patch,1.1,1.2
Message-ID: <20091208152346.DE64D11C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6733

Modified Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: libltdl-CVE-2009-3736.patch
===================================================================
RCS file: /cvs/extras/rpms/arts/F-11/libltdl-CVE-2009-3736.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libltdl-CVE-2009-3736.patch	7 Dec 2009 14:54:20 -0000	1.1
+++ libltdl-CVE-2009-3736.patch	8 Dec 2009 15:23:46 -0000	1.2
@@ -1,22 +1,90 @@
-diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
---- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
-+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
-@@ -1544,7 +1544,8 @@
+diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
+--- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736	2008-08-19 22:18:38.000000000 +0200
++++ arts-1.5.10/libltdl/ltdl.c	2009-12-08 16:02:38.000000000 +0100
+@@ -1454,9 +1454,10 @@ lt_dlexit ()
+ }
+ 
+ static int
+-tryall_dlopen (handle, filename)
++tryall_dlopen (handle, filename, useloader)
+      lt_dlhandle *handle;
+      const char *filename;
++     const char *useloader;
+ {
+   lt_dlhandle	 cur;
+   lt_dlloader   *loader;
+@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
+ 
+   while (loader)
+     {
++      if (useloader && strcmp(loader->loader_name, useloader))
++	{
++	  loader = loader->next;
++	  continue;
++	}
+       lt_user_data data = loader->dlloader_data;
+ 
+       cur->module = loader->module_open (data, filename);
+@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
    /* try to open the old library first; if it was dlpreopened,
       we want the preopened version of it, even if a dlopenable
       module is available */
 -  if (old_name && tryall_dlopen(handle, old_name) == 0)
-+  if (old_name && tryall_dlopen(handle, old_name,
-+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
++  if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
      {
        return 0;
      }
-@@ -2158,7 +2159,7 @@
+@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
+ 	    }
+ 
+ 	  sprintf (filename, "%s/%s", libdir, dlname);
+-	  error = (tryall_dlopen (handle, filename) != 0);
++	  error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	  LT_DLFREE (filename);
+ 
+ 	  if (!error)
+@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
+ 	  strcat(filename, objdir);
+ 	  strcat(filename, dlname);
+ 
+-	  error = tryall_dlopen (handle, filename) != 0;
++	  error = tryall_dlopen (handle, filename, NULL) != 0;
+ 	  LT_DLFREE (filename);
+ 	  if (!error)
+ 	    {
+@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
  	  }
+ 	strcat(filename, dlname);
+ 
+-	error = (tryall_dlopen (handle, filename) != 0);
++	error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	LT_DLFREE (filename);
+ 	if (!error)
+ 	  {
+@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir, 
+       strcpy(filename+lendir, basename);
+       if (handle)
+ 	{
+-	  if (tryall_dlopen (handle, filename) == 0)
++	  if (tryall_dlopen (handle, filename, NULL) == 0)
+ 	    {
+ 	      result = (lt_ptr) handle;
+ 	      goto cleanup;
+@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
+       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
+       LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
+ 
+-      if (tryall_dlopen (&newhandle, 0) != 0)
++      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  return 0;
+@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
+ #ifdef LTDL_SYSSEARCHPATH
+ 		      && !find_file (basename, sys_search_path, 0, &newhandle)
  #endif
-       }
--    if (!file)
-+    else
-       {
- 	file = fopen (filename, LT_READTEXT_MODE);
-       }
+-		   )) && tryall_dlopen (&newhandle, filename))
++		   )) && tryall_dlopen (&newhandle, filename, NULL))
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  goto cleanup;



From than at fedoraproject.org  Tue Dec  8 15:27:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:27:31 +0000 (UTC)
Subject: rpms/arts/devel libltdl-CVE-2009-3736.patch,1.1,1.2
Message-ID: <20091208152731.DC65B11C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/arts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7941

Modified Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: libltdl-CVE-2009-3736.patch
===================================================================
RCS file: /cvs/extras/rpms/arts/devel/libltdl-CVE-2009-3736.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libltdl-CVE-2009-3736.patch	7 Dec 2009 14:52:14 -0000	1.1
+++ libltdl-CVE-2009-3736.patch	8 Dec 2009 15:27:31 -0000	1.2
@@ -1,22 +1,90 @@
-diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
---- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
-+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
-@@ -1544,7 +1544,8 @@
+diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
+--- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736	2008-08-19 22:18:38.000000000 +0200
++++ arts-1.5.10/libltdl/ltdl.c	2009-12-08 16:02:38.000000000 +0100
+@@ -1454,9 +1454,10 @@ lt_dlexit ()
+ }
+ 
+ static int
+-tryall_dlopen (handle, filename)
++tryall_dlopen (handle, filename, useloader)
+      lt_dlhandle *handle;
+      const char *filename;
++     const char *useloader;
+ {
+   lt_dlhandle	 cur;
+   lt_dlloader   *loader;
+@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
+ 
+   while (loader)
+     {
++      if (useloader && strcmp(loader->loader_name, useloader))
++	{
++	  loader = loader->next;
++	  continue;
++	}
+       lt_user_data data = loader->dlloader_data;
+ 
+       cur->module = loader->module_open (data, filename);
+@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
    /* try to open the old library first; if it was dlpreopened,
       we want the preopened version of it, even if a dlopenable
       module is available */
 -  if (old_name && tryall_dlopen(handle, old_name) == 0)
-+  if (old_name && tryall_dlopen(handle, old_name,
-+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
++  if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
      {
        return 0;
      }
-@@ -2158,7 +2159,7 @@
+@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
+ 	    }
+ 
+ 	  sprintf (filename, "%s/%s", libdir, dlname);
+-	  error = (tryall_dlopen (handle, filename) != 0);
++	  error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	  LT_DLFREE (filename);
+ 
+ 	  if (!error)
+@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
+ 	  strcat(filename, objdir);
+ 	  strcat(filename, dlname);
+ 
+-	  error = tryall_dlopen (handle, filename) != 0;
++	  error = tryall_dlopen (handle, filename, NULL) != 0;
+ 	  LT_DLFREE (filename);
+ 	  if (!error)
+ 	    {
+@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
  	  }
+ 	strcat(filename, dlname);
+ 
+-	error = (tryall_dlopen (handle, filename) != 0);
++	error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	LT_DLFREE (filename);
+ 	if (!error)
+ 	  {
+@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir, 
+       strcpy(filename+lendir, basename);
+       if (handle)
+ 	{
+-	  if (tryall_dlopen (handle, filename) == 0)
++	  if (tryall_dlopen (handle, filename, NULL) == 0)
+ 	    {
+ 	      result = (lt_ptr) handle;
+ 	      goto cleanup;
+@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
+       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
+       LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
+ 
+-      if (tryall_dlopen (&newhandle, 0) != 0)
++      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  return 0;
+@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
+ #ifdef LTDL_SYSSEARCHPATH
+ 		      && !find_file (basename, sys_search_path, 0, &newhandle)
  #endif
-       }
--    if (!file)
-+    else
-       {
- 	file = fopen (filename, LT_READTEXT_MODE);
-       }
+-		   )) && tryall_dlopen (&newhandle, filename))
++		   )) && tryall_dlopen (&newhandle, filename, NULL))
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  goto cleanup;



From msivak at fedoraproject.org  Tue Dec  8 15:27:54 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Tue,  8 Dec 2009 15:27:54 +0000 (UTC)
Subject: File python-cryptsetup-0.0.10.tar.gz uploaded to lookaside cache by
	msivak
Message-ID: <20091208152754.C1D3410F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-cryptsetup:

c00263cc00f5ee14011edd6ecf6a8d46  python-cryptsetup-0.0.10.tar.gz



From than at fedoraproject.org  Tue Dec  8 15:28:27 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:28:27 +0000 (UTC)
Subject: rpms/kdelibs3/devel libltdl-CVE-2009-3736.patch,1.1,1.2
Message-ID: <20091208152827.1794811C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8374

Modified Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: libltdl-CVE-2009-3736.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/libltdl-CVE-2009-3736.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libltdl-CVE-2009-3736.patch	7 Dec 2009 15:16:22 -0000	1.1
+++ libltdl-CVE-2009-3736.patch	8 Dec 2009 15:28:26 -0000	1.2
@@ -1,22 +1,90 @@
-diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
---- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
-+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
-@@ -1544,7 +1544,8 @@
+diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
+--- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736	2008-08-19 22:18:38.000000000 +0200
++++ arts-1.5.10/libltdl/ltdl.c	2009-12-08 16:02:38.000000000 +0100
+@@ -1454,9 +1454,10 @@ lt_dlexit ()
+ }
+ 
+ static int
+-tryall_dlopen (handle, filename)
++tryall_dlopen (handle, filename, useloader)
+      lt_dlhandle *handle;
+      const char *filename;
++     const char *useloader;
+ {
+   lt_dlhandle	 cur;
+   lt_dlloader   *loader;
+@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
+ 
+   while (loader)
+     {
++      if (useloader && strcmp(loader->loader_name, useloader))
++	{
++	  loader = loader->next;
++	  continue;
++	}
+       lt_user_data data = loader->dlloader_data;
+ 
+       cur->module = loader->module_open (data, filename);
+@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
    /* try to open the old library first; if it was dlpreopened,
       we want the preopened version of it, even if a dlopenable
       module is available */
 -  if (old_name && tryall_dlopen(handle, old_name) == 0)
-+  if (old_name && tryall_dlopen(handle, old_name,
-+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
++  if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
      {
        return 0;
      }
-@@ -2158,7 +2159,7 @@
+@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
+ 	    }
+ 
+ 	  sprintf (filename, "%s/%s", libdir, dlname);
+-	  error = (tryall_dlopen (handle, filename) != 0);
++	  error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	  LT_DLFREE (filename);
+ 
+ 	  if (!error)
+@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
+ 	  strcat(filename, objdir);
+ 	  strcat(filename, dlname);
+ 
+-	  error = tryall_dlopen (handle, filename) != 0;
++	  error = tryall_dlopen (handle, filename, NULL) != 0;
+ 	  LT_DLFREE (filename);
+ 	  if (!error)
+ 	    {
+@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
  	  }
+ 	strcat(filename, dlname);
+ 
+-	error = (tryall_dlopen (handle, filename) != 0);
++	error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	LT_DLFREE (filename);
+ 	if (!error)
+ 	  {
+@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir, 
+       strcpy(filename+lendir, basename);
+       if (handle)
+ 	{
+-	  if (tryall_dlopen (handle, filename) == 0)
++	  if (tryall_dlopen (handle, filename, NULL) == 0)
+ 	    {
+ 	      result = (lt_ptr) handle;
+ 	      goto cleanup;
+@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
+       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
+       LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
+ 
+-      if (tryall_dlopen (&newhandle, 0) != 0)
++      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  return 0;
+@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
+ #ifdef LTDL_SYSSEARCHPATH
+ 		      && !find_file (basename, sys_search_path, 0, &newhandle)
  #endif
-       }
--    if (!file)
-+    else
-       {
- 	file = fopen (filename, LT_READTEXT_MODE);
-       }
+-		   )) && tryall_dlopen (&newhandle, filename))
++		   )) && tryall_dlopen (&newhandle, filename, NULL))
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  goto cleanup;



From than at fedoraproject.org  Tue Dec  8 15:29:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:29:20 +0000 (UTC)
Subject: rpms/kdelibs3/F-12 libltdl-CVE-2009-3736.patch,1.1,1.2
Message-ID: <20091208152920.7F9AE11C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8789

Modified Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: libltdl-CVE-2009-3736.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-12/libltdl-CVE-2009-3736.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libltdl-CVE-2009-3736.patch	7 Dec 2009 15:15:28 -0000	1.1
+++ libltdl-CVE-2009-3736.patch	8 Dec 2009 15:29:20 -0000	1.2
@@ -1,22 +1,90 @@
-diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
---- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
-+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
-@@ -1544,7 +1544,8 @@
+diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
+--- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736	2008-08-19 22:18:38.000000000 +0200
++++ arts-1.5.10/libltdl/ltdl.c	2009-12-08 16:02:38.000000000 +0100
+@@ -1454,9 +1454,10 @@ lt_dlexit ()
+ }
+ 
+ static int
+-tryall_dlopen (handle, filename)
++tryall_dlopen (handle, filename, useloader)
+      lt_dlhandle *handle;
+      const char *filename;
++     const char *useloader;
+ {
+   lt_dlhandle	 cur;
+   lt_dlloader   *loader;
+@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
+ 
+   while (loader)
+     {
++      if (useloader && strcmp(loader->loader_name, useloader))
++	{
++	  loader = loader->next;
++	  continue;
++	}
+       lt_user_data data = loader->dlloader_data;
+ 
+       cur->module = loader->module_open (data, filename);
+@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
    /* try to open the old library first; if it was dlpreopened,
       we want the preopened version of it, even if a dlopenable
       module is available */
 -  if (old_name && tryall_dlopen(handle, old_name) == 0)
-+  if (old_name && tryall_dlopen(handle, old_name,
-+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
++  if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
      {
        return 0;
      }
-@@ -2158,7 +2159,7 @@
+@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
+ 	    }
+ 
+ 	  sprintf (filename, "%s/%s", libdir, dlname);
+-	  error = (tryall_dlopen (handle, filename) != 0);
++	  error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	  LT_DLFREE (filename);
+ 
+ 	  if (!error)
+@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
+ 	  strcat(filename, objdir);
+ 	  strcat(filename, dlname);
+ 
+-	  error = tryall_dlopen (handle, filename) != 0;
++	  error = tryall_dlopen (handle, filename, NULL) != 0;
+ 	  LT_DLFREE (filename);
+ 	  if (!error)
+ 	    {
+@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
  	  }
+ 	strcat(filename, dlname);
+ 
+-	error = (tryall_dlopen (handle, filename) != 0);
++	error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	LT_DLFREE (filename);
+ 	if (!error)
+ 	  {
+@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir, 
+       strcpy(filename+lendir, basename);
+       if (handle)
+ 	{
+-	  if (tryall_dlopen (handle, filename) == 0)
++	  if (tryall_dlopen (handle, filename, NULL) == 0)
+ 	    {
+ 	      result = (lt_ptr) handle;
+ 	      goto cleanup;
+@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
+       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
+       LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
+ 
+-      if (tryall_dlopen (&newhandle, 0) != 0)
++      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  return 0;
+@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
+ #ifdef LTDL_SYSSEARCHPATH
+ 		      && !find_file (basename, sys_search_path, 0, &newhandle)
  #endif
-       }
--    if (!file)
-+    else
-       {
- 	file = fopen (filename, LT_READTEXT_MODE);
-       }
+-		   )) && tryall_dlopen (&newhandle, filename))
++		   )) && tryall_dlopen (&newhandle, filename, NULL))
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  goto cleanup;



From msivak at fedoraproject.org  Tue Dec  8 15:29:55 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Tue,  8 Dec 2009 15:29:55 +0000 (UTC)
Subject: rpms/python-cryptsetup/devel .cvsignore, 1.11,
	1.12 python-cryptsetup.spec, 1.15, 1.16 sources, 1.11, 1.12
Message-ID: <20091208152955.8BE9711C0264@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/python-cryptsetup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9014

Modified Files:
	.cvsignore python-cryptsetup.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	26 Aug 2009 10:41:54 -0000	1.11
+++ .cvsignore	8 Dec 2009 15:29:54 -0000	1.12
@@ -1 +1 @@
-python-cryptsetup-0.0.10.tar.bz2
+python-cryptsetup-0.0.10.tar.gz


Index: python-cryptsetup.spec
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-cryptsetup.spec	26 Aug 2009 10:41:54 -0000	1.15
+++ python-cryptsetup.spec	8 Dec 2009 15:29:55 -0000	1.16
@@ -2,22 +2,23 @@
 
 Name:           python-cryptsetup
 Version:        0.0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for cryptsetup
 
 Group:          Development/Libraries
 License:        GPLv2+
-Url:            http://git.fedorahosted.org/git/?p=python-cryptsetup.git
+Url:            http://git.fedorahosted.org/git/?p=python-cryptsetup.git;a=snapshot;h=%{name}-%{version};sf=tgz
 
 # To generate source do
 # git clone git://git.fedorahosted.org/python-cryptsetup.git
 # make archive
 
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cryptsetup-luks-devel
 BuildRequires:  python
+BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 
 %description
@@ -47,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc selftest.py
 
 %changelog
+* Tue Dec 08 2009 Martin Sivak <msivak at redhat dot com> - 0.0.10-2
+- add python-devel into build requires
+- change the Url so it uses git repo
+
 * Wed Aug 26 2009 Martin Sivak <msivak at redhat dot com> - 0.0.10-1
 - fix the crash in dealloc routine
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	26 Aug 2009 10:41:54 -0000	1.11
+++ sources	8 Dec 2009 15:29:55 -0000	1.12
@@ -1 +1 @@
-118d209f1397da703abe46cd51a9069c  python-cryptsetup-0.0.10.tar.bz2
+c00263cc00f5ee14011edd6ecf6a8d46  python-cryptsetup-0.0.10.tar.gz



From than at fedoraproject.org  Tue Dec  8 15:30:05 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:30:05 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 libltdl-CVE-2009-3736.patch,1.1,1.2
Message-ID: <20091208153005.89B5111C03FC@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9140

Modified Files:
	libltdl-CVE-2009-3736.patch 
Log Message:
fix security issues in libltdl (CVE-2009-3736)


libltdl-CVE-2009-3736.patch:
 ltdl.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: libltdl-CVE-2009-3736.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-11/libltdl-CVE-2009-3736.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libltdl-CVE-2009-3736.patch	7 Dec 2009 15:19:30 -0000	1.1
+++ libltdl-CVE-2009-3736.patch	8 Dec 2009 15:30:05 -0000	1.2
@@ -1,22 +1,90 @@
-diff -ur arts-orig/libltdl/ltdl.c arts-1.1.3/libltdl/ltdl.c
---- arts-orig/libltdl/ltdl.c	2003-07-13 21:33:39.000000000 +0200
-+++ arts-1.1.3/libltdl/ltdl.c	2009-11-19 16:09:29.000000000 +0100
-@@ -1544,7 +1544,8 @@
+diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
+--- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736	2008-08-19 22:18:38.000000000 +0200
++++ arts-1.5.10/libltdl/ltdl.c	2009-12-08 16:02:38.000000000 +0100
+@@ -1454,9 +1454,10 @@ lt_dlexit ()
+ }
+ 
+ static int
+-tryall_dlopen (handle, filename)
++tryall_dlopen (handle, filename, useloader)
+      lt_dlhandle *handle;
+      const char *filename;
++     const char *useloader;
+ {
+   lt_dlhandle	 cur;
+   lt_dlloader   *loader;
+@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
+ 
+   while (loader)
+     {
++      if (useloader && strcmp(loader->loader_name, useloader))
++	{
++	  loader = loader->next;
++	  continue;
++	}
+       lt_user_data data = loader->dlloader_data;
+ 
+       cur->module = loader->module_open (data, filename);
+@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
    /* try to open the old library first; if it was dlpreopened,
       we want the preopened version of it, even if a dlopenable
       module is available */
 -  if (old_name && tryall_dlopen(handle, old_name) == 0)
-+  if (old_name && tryall_dlopen(handle, old_name,
-+                                advise, lt_dlloader_find ("lt_preopen") ) == 0)
++  if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
      {
        return 0;
      }
-@@ -2158,7 +2159,7 @@
+@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
+ 	    }
+ 
+ 	  sprintf (filename, "%s/%s", libdir, dlname);
+-	  error = (tryall_dlopen (handle, filename) != 0);
++	  error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	  LT_DLFREE (filename);
+ 
+ 	  if (!error)
+@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
+ 	  strcat(filename, objdir);
+ 	  strcat(filename, dlname);
+ 
+-	  error = tryall_dlopen (handle, filename) != 0;
++	  error = tryall_dlopen (handle, filename, NULL) != 0;
+ 	  LT_DLFREE (filename);
+ 	  if (!error)
+ 	    {
+@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
  	  }
+ 	strcat(filename, dlname);
+ 
+-	error = (tryall_dlopen (handle, filename) != 0);
++	error = (tryall_dlopen (handle, filename, NULL) != 0);
+ 	LT_DLFREE (filename);
+ 	if (!error)
+ 	  {
+@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir, 
+       strcpy(filename+lendir, basename);
+       if (handle)
+ 	{
+-	  if (tryall_dlopen (handle, filename) == 0)
++	  if (tryall_dlopen (handle, filename, NULL) == 0)
+ 	    {
+ 	      result = (lt_ptr) handle;
+ 	      goto cleanup;
+@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
+       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
+       LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
+ 
+-      if (tryall_dlopen (&newhandle, 0) != 0)
++      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  return 0;
+@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
+ #ifdef LTDL_SYSSEARCHPATH
+ 		      && !find_file (basename, sys_search_path, 0, &newhandle)
  #endif
-       }
--    if (!file)
-+    else
-       {
- 	file = fopen (filename, LT_READTEXT_MODE);
-       }
+-		   )) && tryall_dlopen (&newhandle, filename))
++		   )) && tryall_dlopen (&newhandle, filename, NULL))
+ 	{
+ 	  LT_DLFREE (handle);
+ 	  goto cleanup;



From thias at fedoraproject.org  Tue Dec  8 15:41:46 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 15:41:46 +0000 (UTC)
Subject: rpms/keepalived/EL-5 keepalived-1.1.14-installmodes.patch, NONE,
	1.1 keepalived-1.1.19-fix-ipvs-loading.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 keepalived.init, 1.1,
	1.2 keepalived.spec, 1.1, 1.2 sources, 1.2,
	1.3 keepalived-1.1.13-iflabel.patch, 1.1,
	NONE keepalived-1.1.13-makefile.patch, 1.1,
	NONE keepalived-1.1.13-types.patch, 1.1,
	NONE keepalived.sysconfig, 1.1, NONE
Message-ID: <20091208154146.2181D11C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13076

Modified Files:
	.cvsignore keepalived.init keepalived.spec sources 
Added Files:
	keepalived-1.1.14-installmodes.patch 
	keepalived-1.1.19-fix-ipvs-loading.patch 
Removed Files:
	keepalived-1.1.13-iflabel.patch 
	keepalived-1.1.13-makefile.patch keepalived-1.1.13-types.patch 
	keepalived.sysconfig 
Log Message:
Backport 1.1.19 update from devel.


keepalived-1.1.14-installmodes.patch:
 Makefile.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- 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

keepalived-1.1.19-fix-ipvs-loading.patch:
 ipvswrapper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE keepalived-1.1.19-fix-ipvs-loading.patch ---
diff -Naupr keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c keepalived-1.1.19/keepalived/check/ipvswrapper.c
--- keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c	2009-09-28 13:03:40.000000000 +0200
+++ keepalived-1.1.19/keepalived/check/ipvswrapper.c	2009-11-24 22:41:56.220195007 +0100
@@ -789,7 +789,7 @@ string_to_number(const char *s, int min,
 static int
 modprobe_ipvs(void)
 {
-	char *argv[] = { "/sbin/modprobe", "-s", "-k", "--", "ip_vs", NULL };
+	char *argv[] = { "/sbin/modprobe", "-s", "--", "ip_vs", NULL };
 	int child;
 	int status;
 	int rc;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Mar 2007 17:47:42 -0000	1.2
+++ .cvsignore	8 Dec 2009 15:41:44 -0000	1.3
@@ -1 +1 @@
-keepalived-1.1.13.tar.gz
+keepalived-1.1.19.tar.gz


Index: keepalived.init
===================================================================
RCS file: /cvs/extras/rpms/keepalived/EL-5/keepalived.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keepalived.init	26 Mar 2007 17:47:42 -0000	1.1
+++ keepalived.init	8 Dec 2009 15:41:45 -0000	1.2
@@ -1,73 +1,110 @@
 #!/bin/sh
 #
-# Startup script for the Keepalived daemon
+# keepalived   High Availability monitor built upon LVS and VRRP
 #
-# processname: keepalived
-# pidfile: /var/run/keepalived.pid
-# config: /etc/keepalived/keepalived.conf
-# chkconfig: - 21 79
-# description: Start and stop Keepalived
+# chkconfig:   - 86 14
+# description: Robust keepalive facility to the Linux Virtual Server project \
+#              with multilayer TCP/IP stack checks.
+
+### BEGIN INIT INFO
+# Provides: keepalived
+# Required-Start: $local_fs $network $named $syslog
+# Required-Stop: $local_fs $network $named $syslog
+# Should-Start: smtpdaemon httpd
+# Should-Stop: smtpdaemon httpd
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: High Availability monitor built upon LVS and VRRP
+# Description:       Robust keepalive facility to the Linux Virtual Server
+#                    project with multilayer TCP/IP stack checks.
+### END INIT INFO
 
-# Source function library
+# Source function library.
 . /etc/rc.d/init.d/functions
 
-# Source configuration file (we set KEEPALIVED_OPTIONS there)
-. /etc/sysconfig/keepalived
+exec="/usr/sbin/keepalived"
+prog="keepalived"
+config="/etc/keepalived/keepalived.conf"
 
-RETVAL=0
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-prog="keepalived"
+lockfile=/var/lock/subsys/$prog
 
 start() {
+    [ -x $exec ] || exit 5
+    [ -e $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon keepalived ${KEEPALIVED_OPTIONS}
-    RETVAL=$?
+    daemon $exec $KEEPALIVED_OPTIONS
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
 }
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc keepalived
-    RETVAL=$?
+    killproc $prog
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
 }
 
 reload() {
     echo -n $"Reloading $prog: "
-    killproc keepalived -1
-    RETVAL=$?
+    killproc $prog -1
+    retval=$?
     echo
+    return $retval
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status $prog
 }
 
-# See how we were called.
+rh_status_q() {
+    rh_status &>/dev/null
+}
+
+
 case "$1" in
     start)
-        start
+        rh_status_q && exit 0
+        $1
         ;;
     stop)
-        stop
-        ;;
-    reload)
-        reload
+        rh_status_q || exit 0
+        $1
         ;;
     restart)
-        stop
-        start
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
         ;;
-    condrestart)
-        if [ -f /var/lock/subsys/$prog ]; then
-            stop
-            start
-        fi
+    force-reload)
+        force_reload
         ;;
     status)
-        status keepalived
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
         ;;
     *)
-        echo "Usage: $0 {start|stop|reload|restart|condrestart|status}"
-        exit 1
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
+exit $?
 
-exit $RETVAL


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/EL-5/keepalived.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keepalived.spec	26 Mar 2007 17:47:42 -0000	1.1
+++ keepalived.spec	8 Dec 2009 15:41:45 -0000	1.2
@@ -1,23 +1,25 @@
-# Ugly, but we need headers from a kernel to rebuild against
-%define kernel %(rpm -q kernel-devel --qf '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}\\n' 2>/dev/null | head -1)
-
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.13
-Release: 6%{?dist}
-License: GPL
+Version: 1.1.19
+Release: 3%{?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
+Patch0: keepalived-1.1.14-installmodes.patch
+Patch1: keepalived-1.1.19-fix-ipvs-loading.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
+# 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
@@ -34,15 +36,18 @@ healthchecks and LVS directors failover.
 
 %prep
 %setup -q
-%patch0 -p1 -b .makefile
-%patch1 -p0 -b .iflabel
-%patch2 -p1 -b .types
-# Fix file mode (600 as of 1.1.13)
+%patch0 -p1 -b .installmodes
+%patch1 -p1 -b .fix-ipvs-loading
+# Fix file mode (600 as of 1.1.13, still as of 1.1.17)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
+# Included as doc, so disable its dependencies
+%{__chmod} -x goodies/arpreset.pl
 
 
 %build
-%configure --with-kernel-dir="/lib/modules/%{kernel}/build"
+# Get the most recent available kernel build dir, allows to expand arch too
+KERNELDIR=$(ls -1d --sort t /lib/modules/*/build | head -1)
+%configure --with-kernel-dir="${KERNELDIR}"
 %{__make} %{?_smp_mflags} STRIP=/bin/true
 
 
@@ -51,12 +56,9 @@ healthchecks and LVS directors failover.
 %{__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} \
+# Overwrite the init script with our LSB compliant one
+%{__install} -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 +92,10 @@ fi
 %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 +105,69 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-3
+- Update init script to have keepalived start after the local MTA (#526512).
+- Simplify the kernel source detection, to avoid running rpm from rpmbuild.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-2
+- Include patch to remove obsolete -k option to modprobe (#528465).
+
+* Wed Oct 21 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-1
+- Update to 1.1.19.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.17-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.1.17-1
+- Update to 1.1.17.
+- Update init script all the way.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.1.15-7
+- rebuild with new openssl
+
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.1.15-6
+- Fork the init script to be (mostly for now) LSB compliant (#246966).
+
+* Thu Apr 24 2008 Matthias Saou <http://freshrpms.net/> 1.1.15-5
+- Add glob to the kerneldir location, since it contains the arch for F9+.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org>
+- Rebuild for deps
+
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.1.15-2
+- Update to latest upstream sources, identical except for the included spec.
+
+* 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.
+
+* 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.
+
+* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 1.1.13-7
+- Update License field.
+
 * Mon Mar 26 2007 Matthias Saou <http://freshrpms.net/> 1.1.13-6
 - Fix doc/samples/sample.misccheck.smbcheck.sh mode (600 -> 644).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Mar 2007 17:47:42 -0000	1.2
+++ sources	8 Dec 2009 15:41:45 -0000	1.3
@@ -1 +1 @@
-578bdb8e3ff4cca50fc877893bad658c  keepalived-1.1.13.tar.gz
+a35b8d9d462810f7650d292bd7457523  keepalived-1.1.19.tar.gz


--- keepalived-1.1.13-iflabel.patch DELETED ---


--- keepalived-1.1.13-makefile.patch DELETED ---


--- keepalived-1.1.13-types.patch DELETED ---


--- keepalived.sysconfig DELETED ---



From sgrubb at fedoraproject.org  Tue Dec  8 15:43:21 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue,  8 Dec 2009 15:43:21 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.223,1.224
Message-ID: <20091208154321.799C711C0264@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13676

Modified Files:
	audit.spec 
Log Message:
* Tue Dec 08 2009 Steve Grubb <sgrubb at redhat.com> 2.0.4-1
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- audit.spec	17 Oct 2009 19:29:28 -0000	1.223
+++ audit.spec	8 Dec 2009 15:43:21 -0000	1.224
@@ -2,7 +2,7 @@
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 2.0.3
+Version: 2.0.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -34,7 +34,7 @@ applications to use the audit framework.
 Summary: Header files and static library for libaudit
 License: LGPLv2+
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}
 Requires: kernel-headers >= 2.6.29
 
 %description libs-devel
@@ -219,6 +219,9 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
+* Tue Dec 08 2009 Steve Grubb <sgrubb at redhat.com> 2.0.4-1
+- New upstream release
+
 * Sat Oct 17 2009 Steve Grubb <sgrubb at redhat.com> 2.0.3-1
 - New upstream release
 



From sgrubb at fedoraproject.org  Tue Dec  8 15:43:52 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue,  8 Dec 2009 15:43:52 +0000 (UTC)
Subject: File audit-2.0.4.tar.gz uploaded to lookaside cache by sgrubb
Message-ID: <20091208154352.96DC110F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for audit:

90d2c70e74041fca5ac4b999cb915d68  audit-2.0.4.tar.gz



From sgrubb at fedoraproject.org  Tue Dec  8 15:44:08 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue,  8 Dec 2009 15:44:08 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore,1.106,1.107 sources,1.132,1.133
Message-ID: <20091208154408.CA5E211C0264@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13969

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Dec 08 2009 Steve Grubb <sgrubb at redhat.com> 2.0.4-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	17 Oct 2009 19:29:28 -0000	1.106
+++ .cvsignore	8 Dec 2009 15:44:08 -0000	1.107
@@ -103,3 +103,4 @@ audit-2.0.tar.gz
 audit-1.8.tar.gz
 audit-2.0.1.tar.gz
 audit-2.0.3.tar.gz
+audit-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- sources	17 Oct 2009 19:29:28 -0000	1.132
+++ sources	8 Dec 2009 15:44:08 -0000	1.133
@@ -1 +1 @@
-35fb55c5a299acfc3e2ab84d5a31ea5c  audit-2.0.3.tar.gz
+90d2c70e74041fca5ac4b999cb915d68  audit-2.0.4.tar.gz



From thias at fedoraproject.org  Tue Dec  8 15:46:55 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 15:46:55 +0000 (UTC)
Subject: rpms/keepalived/F-11 keepalived-1.1.19-fix-ipvs-loading.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 keepalived.init, 1.4,
	1.5 keepalived.spec, 1.15, 1.16 sources, 1.6, 1.7
Message-ID: <20091208154655.228E111C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14527/F-11

Modified Files:
	.cvsignore keepalived.init keepalived.spec sources 
Added Files:
	keepalived-1.1.19-fix-ipvs-loading.patch 
Log Message:
Fix init script priority and update to 1.1.19 with the modprobe fix on F-12 and F-11.


keepalived-1.1.19-fix-ipvs-loading.patch:
 ipvswrapper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE keepalived-1.1.19-fix-ipvs-loading.patch ---
diff -Naupr keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c keepalived-1.1.19/keepalived/check/ipvswrapper.c
--- keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c	2009-09-28 13:03:40.000000000 +0200
+++ keepalived-1.1.19/keepalived/check/ipvswrapper.c	2009-11-24 22:41:56.220195007 +0100
@@ -789,7 +789,7 @@ string_to_number(const char *s, int min,
 static int
 modprobe_ipvs(void)
 {
-	char *argv[] = { "/sbin/modprobe", "-s", "-k", "--", "ip_vs", NULL };
+	char *argv[] = { "/sbin/modprobe", "-s", "--", "ip_vs", NULL };
 	int child;
 	int status;
 	int rc;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Apr 2009 17:07:57 -0000	1.5
+++ .cvsignore	8 Dec 2009 15:46:54 -0000	1.6
@@ -1 +1 @@
-keepalived-1.1.17.tar.gz
+keepalived-1.1.19.tar.gz


Index: keepalived.init
===================================================================
RCS file: /cvs/extras/rpms/keepalived/F-11/keepalived.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- keepalived.init	12 Apr 2009 17:07:57 -0000	1.4
+++ keepalived.init	8 Dec 2009 15:46:54 -0000	1.5
@@ -2,7 +2,7 @@
 #
 # keepalived   High Availability monitor built upon LVS and VRRP
 #
-# chkconfig:   - 21 79
+# chkconfig:   - 86 14
 # description: Robust keepalive facility to the Linux Virtual Server project \
 #              with multilayer TCP/IP stack checks.
 
@@ -10,8 +10,8 @@
 # Provides: keepalived
 # Required-Start: $local_fs $network $named $syslog
 # Required-Stop: $local_fs $network $named $syslog
-# Should-Start: httpd
-# Should-Stop:  httpd
+# Should-Start: smtpdaemon httpd
+# Should-Stop: smtpdaemon httpd
 # Default-Start: 
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: High Availability monitor built upon LVS and VRRP


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/F-11/keepalived.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- keepalived.spec	12 Apr 2009 17:07:57 -0000	1.15
+++ keepalived.spec	8 Dec 2009 15:46:54 -0000	1.16
@@ -1,16 +1,14 @@
-# Ugly, but we need headers from a kernel to rebuild against
-%define kernel %(rpm -q kernel-devel --qf '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}\\n' 2>/dev/null | head -1)
-
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.17
-Release: 1%{?dist}
+Version: 1.1.19
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.init
 Patch0: keepalived-1.1.14-installmodes.patch
+Patch1: keepalived-1.1.19-fix-ipvs-loading.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -39,6 +37,7 @@ healthchecks and LVS directors failover.
 %prep
 %setup -q
 %patch0 -p1 -b .installmodes
+%patch1 -p1 -b .fix-ipvs-loading
 # Fix file mode (600 as of 1.1.13, still as of 1.1.17)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -46,8 +45,8 @@ healthchecks and LVS directors failover.
 
 
 %build
-# Get the first available kernel build dir for our version, expanding arch
-KERNELDIR=$(ls -1d /lib/modules/%{kernel}*/build | head -1)
+# Get the most recent available kernel build dir, allows to expand arch too
+KERNELDIR=$(ls -1d --sort t /lib/modules/*/build | head -1)
 %configure --with-kernel-dir="${KERNELDIR}"
 %{__make} %{?_smp_mflags} STRIP=/bin/true
 
@@ -106,6 +105,22 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-3
+- Update init script to have keepalived start after the local MTA (#526512).
+- Simplify the kernel source detection, to avoid running rpm from rpmbuild.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-2
+- Include patch to remove obsolete -k option to modprobe (#528465).
+
+* Wed Oct 21 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-1
+- Update to 1.1.19.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.17-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.1.17-1
 - Update to 1.1.17.
 - Update init script all the way.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Apr 2009 17:07:57 -0000	1.6
+++ sources	8 Dec 2009 15:46:54 -0000	1.7
@@ -1 +1 @@
-324ef61a9eed389679f0a05edd1d1323  keepalived-1.1.17.tar.gz
+a35b8d9d462810f7650d292bd7457523  keepalived-1.1.19.tar.gz



From thias at fedoraproject.org  Tue Dec  8 15:46:55 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 15:46:55 +0000 (UTC)
Subject: rpms/keepalived/F-12 keepalived-1.1.19-fix-ipvs-loading.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 keepalived.init, 1.4,
	1.5 keepalived.spec, 1.17, 1.18 sources, 1.6, 1.7
Message-ID: <20091208154655.6F64511C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14527/F-12

Modified Files:
	.cvsignore keepalived.init keepalived.spec sources 
Added Files:
	keepalived-1.1.19-fix-ipvs-loading.patch 
Log Message:
Fix init script priority and update to 1.1.19 with the modprobe fix on F-12 and F-11.


keepalived-1.1.19-fix-ipvs-loading.patch:
 ipvswrapper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE keepalived-1.1.19-fix-ipvs-loading.patch ---
diff -Naupr keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c keepalived-1.1.19/keepalived/check/ipvswrapper.c
--- keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c	2009-09-28 13:03:40.000000000 +0200
+++ keepalived-1.1.19/keepalived/check/ipvswrapper.c	2009-11-24 22:41:56.220195007 +0100
@@ -789,7 +789,7 @@ string_to_number(const char *s, int min,
 static int
 modprobe_ipvs(void)
 {
-	char *argv[] = { "/sbin/modprobe", "-s", "-k", "--", "ip_vs", NULL };
+	char *argv[] = { "/sbin/modprobe", "-s", "--", "ip_vs", NULL };
 	int child;
 	int status;
 	int rc;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Apr 2009 17:07:57 -0000	1.5
+++ .cvsignore	8 Dec 2009 15:46:55 -0000	1.6
@@ -1 +1 @@
-keepalived-1.1.17.tar.gz
+keepalived-1.1.19.tar.gz


Index: keepalived.init
===================================================================
RCS file: /cvs/extras/rpms/keepalived/F-12/keepalived.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- keepalived.init	12 Apr 2009 17:07:57 -0000	1.4
+++ keepalived.init	8 Dec 2009 15:46:55 -0000	1.5
@@ -2,7 +2,7 @@
 #
 # keepalived   High Availability monitor built upon LVS and VRRP
 #
-# chkconfig:   - 21 79
+# chkconfig:   - 86 14
 # description: Robust keepalive facility to the Linux Virtual Server project \
 #              with multilayer TCP/IP stack checks.
 
@@ -10,8 +10,8 @@
 # Provides: keepalived
 # Required-Start: $local_fs $network $named $syslog
 # Required-Stop: $local_fs $network $named $syslog
-# Should-Start: httpd
-# Should-Stop:  httpd
+# Should-Start: smtpdaemon httpd
+# Should-Stop: smtpdaemon httpd
 # Default-Start: 
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: High Availability monitor built upon LVS and VRRP


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/F-12/keepalived.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- keepalived.spec	21 Aug 2009 14:08:23 -0000	1.17
+++ keepalived.spec	8 Dec 2009 15:46:55 -0000	1.18
@@ -1,9 +1,6 @@
-# Ugly, but we need headers from a kernel to rebuild against
-%define kernel %(rpm -q kernel-devel --qf '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}\\n' 2>/dev/null | head -1)
-
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.17
+Version: 1.1.19
 Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -11,6 +8,7 @@ URL: http://www.keepalived.org/
 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.init
 Patch0: keepalived-1.1.14-installmodes.patch
+Patch1: keepalived-1.1.19-fix-ipvs-loading.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -39,6 +37,7 @@ healthchecks and LVS directors failover.
 %prep
 %setup -q
 %patch0 -p1 -b .installmodes
+%patch1 -p1 -b .fix-ipvs-loading
 # Fix file mode (600 as of 1.1.13, still as of 1.1.17)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -46,8 +45,8 @@ healthchecks and LVS directors failover.
 
 
 %build
-# Get the first available kernel build dir for our version, expanding arch
-KERNELDIR=$(ls -1d /lib/modules/%{kernel}*/build | head -1)
+# Get the most recent available kernel build dir, allows to expand arch too
+KERNELDIR=$(ls -1d --sort t /lib/modules/*/build | head -1)
 %configure --with-kernel-dir="${KERNELDIR}"
 %{__make} %{?_smp_mflags} STRIP=/bin/true
 
@@ -106,6 +105,16 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-3
+- Update init script to have keepalived start after the local MTA (#526512).
+- Simplify the kernel source detection, to avoid running rpm from rpmbuild.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-2
+- Include patch to remove obsolete -k option to modprobe (#528465).
+
+* Wed Oct 21 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-1
+- Update to 1.1.19.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.17-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Apr 2009 17:07:57 -0000	1.6
+++ sources	8 Dec 2009 15:46:55 -0000	1.7
@@ -1 +1 @@
-324ef61a9eed389679f0a05edd1d1323  keepalived-1.1.17.tar.gz
+a35b8d9d462810f7650d292bd7457523  keepalived-1.1.19.tar.gz



From thias at fedoraproject.org  Tue Dec  8 15:46:55 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 15:46:55 +0000 (UTC)
Subject: rpms/keepalived/devel keepalived.init, 1.4, 1.5 keepalived.spec,
	1.18, 1.19
Message-ID: <20091208154655.B32EB11C0264@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14527/devel

Modified Files:
	keepalived.init keepalived.spec 
Log Message:
Fix init script priority and update to 1.1.19 with the modprobe fix on F-12 and F-11.



Index: keepalived.init
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- keepalived.init	12 Apr 2009 17:07:57 -0000	1.4
+++ keepalived.init	8 Dec 2009 15:46:55 -0000	1.5
@@ -2,7 +2,7 @@
 #
 # keepalived   High Availability monitor built upon LVS and VRRP
 #
-# chkconfig:   - 21 79
+# chkconfig:   - 86 14
 # description: Robust keepalive facility to the Linux Virtual Server project \
 #              with multilayer TCP/IP stack checks.
 
@@ -10,8 +10,8 @@
 # Provides: keepalived
 # Required-Start: $local_fs $network $named $syslog
 # Required-Stop: $local_fs $network $named $syslog
-# Should-Start: httpd
-# Should-Stop:  httpd
+# Should-Start: smtpdaemon httpd
+# Should-Stop: smtpdaemon httpd
 # Default-Start: 
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: High Availability monitor built upon LVS and VRRP


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- keepalived.spec	24 Nov 2009 21:53:05 -0000	1.18
+++ keepalived.spec	8 Dec 2009 15:46:55 -0000	1.19
@@ -1,10 +1,7 @@
-# Ugly, but we need headers from a kernel to rebuild against
-%define kernel %(rpm -q kernel-devel --qf '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}\\n' 2>/dev/null | head -1)
-
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
 Version: 1.1.19
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
@@ -48,8 +45,8 @@ healthchecks and LVS directors failover.
 
 
 %build
-# Get the first available kernel build dir for our version, expanding arch
-KERNELDIR=$(ls -1d /lib/modules/%{kernel}*/build | head -1)
+# Get the most recent available kernel build dir, allows to expand arch too
+KERNELDIR=$(ls -1d --sort t /lib/modules/*/build | head -1)
 %configure --with-kernel-dir="${KERNELDIR}"
 %{__make} %{?_smp_mflags} STRIP=/bin/true
 
@@ -108,6 +105,10 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-3
+- Update init script to have keepalived start after the local MTA (#526512).
+- Simplify the kernel source detection, to avoid running rpm from rpmbuild.
+
 * Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-2
 - Include patch to remove obsolete -k option to modprobe (#528465).
 



From sgrubb at fedoraproject.org  Tue Dec  8 15:51:41 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue,  8 Dec 2009 15:51:41 +0000 (UTC)
Subject: rpms/audit/F-12 audit.spec,1.224,1.225 sources,1.132,1.133
Message-ID: <20091208155141.78D7C11C0264@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16850

Modified Files:
	audit.spec sources 
Log Message:
* Tue Dec 08 2009 Steve Grubb <sgrubb at redhat.com> 2.0.4-1
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-12/audit.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- audit.spec	3 Nov 2009 19:36:33 -0000	1.224
+++ audit.spec	8 Dec 2009 15:51:41 -0000	1.225
@@ -2,7 +2,7 @@
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 2.0.3
+Version: 2.0.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -34,7 +34,7 @@ applications to use the audit framework.
 Summary: Header files and static library for libaudit
 License: LGPLv2+
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}
 Requires: kernel-headers >= 2.6.29
 
 %description libs-devel
@@ -219,7 +219,13 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
-* Tue Nov 03 2009 Steve Grubb <sgrubb at redhat.com> 2.0.3-1
+* Tue Dec 08 2009 Steve Grubb <sgrubb at redhat.com> 2.0.4-1
+- New upstream release
+
+* Sat Oct 17 2009 Steve Grubb <sgrubb at redhat.com> 2.0.3-1
+- New upstream release
+
+* Fri Oct 16 2009 Steve Grubb <sgrubb at redhat.com> 2.0.2-1
 - New upstream release
 
 * Mon Sep 28 2009 Steve Grubb <sgrubb at redhat.com> 2.0.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-12/sources,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- sources	20 Oct 2009 13:39:21 -0000	1.132
+++ sources	8 Dec 2009 15:51:41 -0000	1.133
@@ -1 +1 @@
-35fb55c5a299acfc3e2ab84d5a31ea5c  audit-2.0.3.tar.gz
+90d2c70e74041fca5ac4b999cb915d68  audit-2.0.4.tar.gz



From than at fedoraproject.org  Tue Dec  8 15:57:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 15:57:51 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel kdepim-runtime.spec,1.14,1.15
Message-ID: <20091208155751.26D0111C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18851

Modified Files:
	kdepim-runtime.spec 
Log Message:
drop BR kdelibs-experimental-devel




Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kdepim-runtime.spec	4 Dec 2009 15:36:33 -0000	1.14
+++ kdepim-runtime.spec	8 Dec 2009 15:57:50 -0000	1.15
@@ -3,7 +3,7 @@
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -17,7 +17,6 @@ Requires: %{name}-libs = %{version}-%{re
 BuildRequires: akonadi-devel >= %{akonadi_version}
 BuildRequires: desktop-file-utils
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: zlib-devel
 BuildRequires: soprano-devel
 BuildRequires: libxslt-devel
@@ -131,6 +130,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 08 2009 Than Ngo <than at redhat.com> - 4.3.80-3
+- drop BR kdelibs-experimental-devel
+
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - respin
 



From mclasen at fedoraproject.org  Tue Dec  8 16:03:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Dec 2009 16:03:10 +0000 (UTC)
Subject: rpms/libcroco/F-12 libcroco.spec,1.25,1.26
Message-ID: <20091208160310.6B84411C0264@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libcroco/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20226

Modified Files:
	libcroco.spec 
Log Message:
add source url



Index: libcroco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcroco/F-12/libcroco.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libcroco.spec	25 Jul 2009 05:28:32 -0000	1.25
+++ libcroco.spec	8 Dec 2009 16:03:10 -0000	1.26
@@ -1,10 +1,10 @@
 Name:             libcroco
-Summary:          A CSS2 parsing library 
+Summary:          A CSS2 parsing library
 Version:          0.6.2
-Release: 	  3%{?dist}
+Release: 	  4%{?dist}
 License:          LGPLv2
 Group:            System Environment/Libraries
-Source:           %{name}-%{version}.tar.bz2
+Source:           http://download/gnome.org/sources/libcroco/0.6/%{name}-%{version}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 Patch0:		  libcroco-0.6.1-multilib.patch
 
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcroco-0.6.pc
 
 %changelog
+* Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> - 0.6.2-4
+- Add source url
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Dec  8 16:04:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Dec 2009 16:04:05 +0000 (UTC)
Subject: rpms/libcroco/devel libcroco.spec,1.25,1.26
Message-ID: <20091208160405.F112011C0264@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libcroco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21101

Modified Files:
	libcroco.spec 
Log Message:
Copy F12 changes



Index: libcroco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcroco/devel/libcroco.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libcroco.spec	25 Jul 2009 05:28:32 -0000	1.25
+++ libcroco.spec	8 Dec 2009 16:04:05 -0000	1.26
@@ -1,10 +1,10 @@
 Name:             libcroco
-Summary:          A CSS2 parsing library 
+Summary:          A CSS2 parsing library
 Version:          0.6.2
-Release: 	  3%{?dist}
+Release: 	  4%{?dist}
 License:          LGPLv2
 Group:            System Environment/Libraries
-Source:           %{name}-%{version}.tar.bz2
+Source:           http://download/gnome.org/sources/libcroco/0.6/%{name}-%{version}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 Patch0:		  libcroco-0.6.1-multilib.patch
 
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcroco-0.6.pc
 
 %changelog
+* Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> - 0.6.2-4
+- Add source url
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpepple at fedoraproject.org  Tue Dec  8 16:11:19 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  8 Dec 2009 16:11:19 +0000 (UTC)
Subject: rpms/telepathy-butterfly/F-12 telepathy-butterfly-disable-av.patch, 
	NONE, 1.1 telepathy-butterfly.spec, 1.19, 1.20
Message-ID: <20091208161119.D54A611C0264@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-butterfly/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23790

Modified Files:
	telepathy-butterfly.spec 
Added Files:
	telepathy-butterfly-disable-av.patch 
Log Message:
* Sat Nov 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-2
- Add patch to disable audio-visual capabilities.


telepathy-butterfly-disable-av.patch:
 capabilities.py |   30 +++++++++++++++---------------
 connection.py   |   28 ++++++++++++++--------------
 2 files changed, 29 insertions(+), 29 deletions(-)

--- NEW FILE telepathy-butterfly-disable-av.patch ---
diff -urp telepathy-butterfly-0.5.3.orig/butterfly/capabilities.py telepathy-butterfly-0.5.3/butterfly/capabilities.py
--- telepathy-butterfly-0.5.3.orig/butterfly/capabilities.py	2009-10-21 08:59:00.000000000 -0400
+++ telepathy-butterfly-0.5.3/butterfly/capabilities.py	2009-11-18 20:30:42.141898565 -0500
@@ -39,14 +39,14 @@ class ButterflyCapabilities(
         dbus_interface = telepathy.CONNECTION_INTERFACE_CAPABILITIES
 
     def AdvertiseCapabilities(self, add, remove):
-        for caps, specs in add:
-            if caps == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
-                if specs & telepathy.CHANNEL_MEDIA_CAPABILITY_VIDEO:
-                    self._self_handle.profile.client_id.has_webcam = True
-                    self._self_handle.profile.client_id.supports_rtc_video = True
-        for caps in remove:
-            if caps == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
-                self._self_handle.profile.client_id.has_webcam = False
+        #for caps, specs in add:
+            #if caps == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
+                #if specs & telepathy.CHANNEL_MEDIA_CAPABILITY_VIDEO:
+                    #self._self_handle.profile.client_id.has_webcam = True
+                    #self._self_handle.profile.client_id.supports_rtc_video = True
+        #for caps in remove:
+            #if caps == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
+                #self._self_handle.profile.client_id.has_webcam = False
 
         return telepathy.server.ConnectionInterfaceCapabilities.\
             AdvertiseCapabilities(self, add, remove)
@@ -78,13 +78,13 @@ class ButterflyCapabilities(
         spec_caps = 0
 
         caps = contact.client_capabilities
-        if caps.supports_sip_invite:
-            gen_caps |= telepathy.CONNECTION_CAPABILITY_FLAG_CREATE
-            gen_caps |= telepathy.CONNECTION_CAPABILITY_FLAG_INVITE
-            spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_AUDIO
-            spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN
+        #if caps.supports_sip_invite:
+            #gen_caps |= telepathy.CONNECTION_CAPABILITY_FLAG_CREATE
+            #gen_caps |= telepathy.CONNECTION_CAPABILITY_FLAG_INVITE
+            #spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_AUDIO
+            #spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN
 
-            if caps.has_webcam:
-                spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_VIDEO
+            #if caps.has_webcam:
+                #spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_VIDEO
 
         return gen_caps, spec_caps
diff -urp telepathy-butterfly-0.5.3.orig/butterfly/connection.py telepathy-butterfly-0.5.3/butterfly/connection.py
--- telepathy-butterfly-0.5.3.orig/butterfly/connection.py	2009-10-25 03:35:38.000000000 -0400
+++ telepathy-butterfly-0.5.3/butterfly/connection.py	2009-11-21 14:17:27.799915606 -0500
@@ -296,27 +296,27 @@ class ButterflyConnection(telepathy.serv
 
     # papyon.event.InviteEventInterface
     def on_invite_conference(self, call):
-        logger.debug("Call invite")
-        handle = ButterflyHandleFactory(self, 'contact', call.peer.account,
-                call.peer.network_id)
+        logger.debug("Call invite, ignoring it")
+        #handle = ButterflyHandleFactory(self, 'contact', call.peer.account,
+        #        call.peer.network_id)
 
-        props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
-                handle, False, initiator_handle=handle)
+        #props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
+        #        handle, False, initiator_handle=handle)
 
-        channel = self._channel_manager.channel_for_props(props,
-                signal=True, call=call)
+        #channel = self._channel_manager.channel_for_props(props,
+        #        signal=True, call=call)
 
     # papyon.event.InviteEventInterface
     def on_invite_webcam(self, session, producer):
         direction = (producer and "send") or "receive"
-        logger.debug("Invitation to %s webcam" % direction)
+	logger.debug("Invitation to %s webcam, ignoring it" % direction)
 
-        handle = ButterflyHandleFactory(self, 'contact', session.peer.account,
-                session.peer.network_id)
-        props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
-                handle, False, initiator_handle=handle)
-        channel = self._channel_manager.channel_for_props(props, signal=True,
-                call=session)
+        #handle = ButterflyHandleFactory(self, 'contact', session.peer.account,
+        #        session.peer.network_id)
+        #props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
+        #        handle, False, initiator_handle=handle)
+        #channel = self._channel_manager.channel_for_props(props, signal=True,
+        #        call=session)
 
     # papyon.event.OfflineMessagesEventInterface
     def on_oim_messages_received(self, messages):


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/F-12/telepathy-butterfly.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- telepathy-butterfly.spec	11 Nov 2009 21:55:04 -0000	1.19
+++ telepathy-butterfly.spec	8 Dec 2009 16:11:18 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           telepathy-butterfly
 Version:        0.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MSN connection manager for Telepathy
 
 Group:          Applications/Communications
@@ -10,6 +10,7 @@ License:        GPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-build.patch
+Patch1:		%{name}-disable-av.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,6 +33,7 @@ and conversations
 %prep
 %setup -q
 %patch0 -p1 -b .destdir
+%patch1 -p1 -b .av
 
 
 %build
@@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-2
+- Add patch to disable audio-visual capabilities.
+
 * Sun Oct 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3.
 



From limb at fedoraproject.org  Tue Dec  8 16:18:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 16:18:55 +0000 (UTC)
Subject: rpms/bochs/devel bochs.spec,1.44,1.45
Message-ID: <20091208161855.3A9C911C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bochs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26361

Modified Files:
	bochs.spec 
Log Message:
Include symlinks to VGABIOS in vgabios rpm, BZ 544310.
Enable cpu level 6.



Index: bochs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- bochs.spec	31 Jul 2009 14:23:51 -0000	1.44
+++ bochs.spec	8 Dec 2009 16:18:53 -0000	1.45
@@ -1,7 +1,7 @@
 %define githead 04387139e3b
 Name:           bochs
 Version:        2.3.8
-Release:        0.8.git%{githead}%{?dist}
+Release:        0.9.git%{githead}%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
@@ -144,6 +144,7 @@ CONFIGURE_FLAGS=" \
   --with-rfb \
   --with-sdl \
   --without-wx \
+  --enable-cpu-level=6 \
   $ARCH_CONFIGURE_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
 
@@ -172,6 +173,10 @@ cp BIOS-bochs-latest ../../bios/BIOS-boc
 rm -rf $RPM_BUILD_ROOT _installed-docs
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS*
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.cirrus.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.cirrus
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.cirrus.debug
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.debug.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.debug
 %ifnarch %{ix86} x86_64
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/*BIOS*
 %endif
@@ -203,6 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 %files bios
 %defattr(-,root,root,-)
 %{_datadir}/bochs/BIOS*
+%{_datadir}/bochs/VGABIOS*
 %endif
 
 
@@ -216,6 +222,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 04 2009 Jon Ciesla <limb at jcomserv.net> 2.3.8-0.9.git04387139e3b
+- Include symlinks to VGABIOS in vgabios rpm, BZ 544310.
+- Enable cpu level 6.
+
 * Fri Jul 31 2009 Glauber Costa <glommer at redhat.com> - 2:0.10.50-14.kvm88
 - replace kvm-bios with a more modern version, and refresh instructions on how to get it.
 



From thias at fedoraproject.org  Tue Dec  8 16:20:10 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 16:20:10 +0000 (UTC)
Subject: rpms/ncftp/devel ncftp-3.2.3-ncursesw.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 ncftp.spec, 1.17, 1.18 sources, 1.7,
	1.8 ncftp-3.1.5-ncursesw.patch, 1.1,
	NONE ncftp-3.2.2-no_lfs64_source.patch, 1.1, NONE
Message-ID: <20091208162010.66DAA11C03E3@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ncftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27037

Modified Files:
	.cvsignore ncftp.spec sources 
Added Files:
	ncftp-3.2.3-ncursesw.patch 
Removed Files:
	ncftp-3.1.5-ncursesw.patch ncftp-3.2.2-no_lfs64_source.patch 
Log Message:
Update to 3.2.3.


ncftp-3.2.3-ncursesw.patch:
 autoconf_local/aclocal.m4 |    4 ++--
 configure                 |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE ncftp-3.2.3-ncursesw.patch ---
diff -Naupr ncftp-3.2.3.orig/autoconf_local/aclocal.m4 ncftp-3.2.3/autoconf_local/aclocal.m4
--- ncftp-3.2.3.orig/autoconf_local/aclocal.m4	2009-07-28 16:45:58.000000000 +0200
+++ ncftp-3.2.3/autoconf_local/aclocal.m4	2009-12-08 17:06:12.854319959 +0100
@@ -4632,7 +4632,7 @@ AC_MSG_CHECKING([for curses library])
 wi_cv_lib_curses=no
 wi_cv_lib_curses_result=no
 ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
 do
 	if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
 		# This should never work
@@ -4705,7 +4705,7 @@ LIBS="$ac_save_LIBS"
 
 if test "$wi_cv_lib_curses_result" != "no" ; then
 	case "$LIBCURSES" in
-		"-lncurses")
+		"-lncurses*")
 			AC_DEFINE(HAVE_LIBNCURSES)
 			;;
 		"-lcurses")
diff -Naupr ncftp-3.2.3.orig/configure ncftp-3.2.3/configure
--- ncftp-3.2.3.orig/configure	2009-07-28 17:01:30.000000000 +0200
+++ ncftp-3.2.3/configure	2009-12-08 17:06:34.850195005 +0100
@@ -5105,7 +5105,7 @@ echo "configure:5104: checking for curse
 wi_cv_lib_curses=no
 wi_cv_lib_curses_result=no
 ac_save_LIBS="$LIBS"
-for LIBCURSES in "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
+for LIBCURSES in "-lncursesw" "-lncurses" "-lcurses" "-lcurses -ltermcap" "-ltermcap -lcurses"
 do
 	if test "x$LIBCURSES-$wi_cv_ncurses" = "x-lncurses-no" ; then
 		# This should never work


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Aug 2008 19:11:09 -0000	1.7
+++ .cvsignore	8 Dec 2009 16:20:09 -0000	1.8
@@ -1 +1 @@
-ncftp-3.2.2-src.tar.bz2
+ncftp-3.2.3-src.tar.bz2


Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ncftp.spec	25 Jul 2009 15:51:00 -0000	1.17
+++ ncftp.spec	8 Dec 2009 16:20:10 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Improved console FTP client
 Name: ncftp
-Version: 3.2.2
-Release: 3%{?dist}
+Version: 3.2.3
+Release: 1%{?dist}
 Epoch: 2
 License: Artistic clarified
 Group: Applications/Internet
@@ -11,8 +11,7 @@ Source: ftp://ftp.ncftp.com/ncftp/ncftp-
 Patch1: ncftp-3.2.2-pref.patch
 Patch2: ncftp-3.0.3-resume.patch
 Patch3: ncftp-3.1.5-pmeter.patch
-Patch4: ncftp-3.1.5-ncursesw.patch
-Patch5: ncftp-3.2.2-no_lfs64_source.patch
+Patch4: ncftp-3.2.3-ncursesw.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 
@@ -29,7 +28,6 @@ anonymous logins, and more.
 %patch2 -p1 -b .res
 %patch3 -p1 -b .pmeter
 %patch4 -p1 -b .ncursesw
-%patch5 -p0 -b .no_lfs64_source
 
 
 %build
@@ -68,6 +66,11 @@ anonymous logins, and more.
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 2:3.2.3-1
+- Update to 3.2.3.
+- Rebase the ncursesw patch.
+- Remove no longer required no_lfs64_source patch.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:3.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Aug 2008 19:11:09 -0000	1.7
+++ sources	8 Dec 2009 16:20:10 -0000	1.8
@@ -1 +1 @@
-c33da134e5e53b5a3b340e0de5456137  ncftp-3.2.2-src.tar.bz2
+fac4aa169e1734e8d9617afd4a9b51e5  ncftp-3.2.3-src.tar.bz2


--- ncftp-3.1.5-ncursesw.patch DELETED ---


--- ncftp-3.2.2-no_lfs64_source.patch DELETED ---



From tbzatek at fedoraproject.org  Tue Dec  8 16:21:40 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  8 Dec 2009 16:21:40 +0000 (UTC)
Subject: rpms/nautilus/F-12 nautilus-2.29.xx-nautilus-directory-leak.patch, 
	NONE, 1.1 nautilus.spec, 1.295, 1.296
Message-ID: <20091208162140.13D1411C00C5@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27828

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.29.xx-nautilus-directory-leak.patch 
Log Message:
* Tue Dec  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-2
- Fix some memory leaks


nautilus-2.29.xx-nautilus-directory-leak.patch:
 libnautilus-private/nautilus-file.c |    3 ++-
 src/nautilus-navigation-window.c    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE nautilus-2.29.xx-nautilus-directory-leak.patch ---
>From ac9f08eb1f74b32c432b0a4904fb57e982202a4c Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Tue, 08 Dec 2009 15:28:13 +0000
Subject: Don't leak NautilusDirectory

---
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 5175118..cd48f7e 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -1580,6 +1580,7 @@ real_sync_search_widgets (NautilusWindow *window)
 		navigation_window->details->temporary_search_bar = TRUE;
 		hide_temporary_bars (navigation_window);
 	}
+	nautilus_directory_unref (directory);
 }
 
 
--
cgit v0.8.2
>From 2d61fcdf4987802441b7d9dab5364a28fb2dbd7c Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Tue, 08 Dec 2009 15:28:30 +0000
Subject: Don't leak NautilusDirectory

---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index df16e1f..fdb1bdc 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -6635,6 +6635,8 @@ nautilus_file_get_volume_free_space (NautilusFile *file)
 						    get_fs_free_cb,
 						    directory); /* Inherits ref */
 		g_object_unref (location);
+	} else {
+		nautilus_directory_unref (directory);
 	}
 
 
--
cgit v0.8.2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/nautilus.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- nautilus.spec	30 Nov 2009 13:32:55 -0000	1.295
+++ nautilus.spec	8 Dec 2009 16:21:39 -0000	1.296
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -81,6 +81,9 @@ Patch6:		nautilus-2.28.1-dynamic-search.
 Patch7:		rtl-fix.patch
 #Patch8:	nautilus-2.22.1-hide-white-screen.patch
 
+# from upstream
+Patch9:		nautilus-2.29.xx-nautilus-directory-leak.patch
+
 Patch10:        nautilus-gvfs-desktop-key-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
@@ -126,6 +129,7 @@ for developing nautilus extensions.
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
+%patch9 -p1 -b .memleaks
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .revert-bg-fade-break
@@ -265,6 +269,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-2
+- Fix some memory leaks
+
 * Mon Nov 30 2009 Alexander Larsson <alexl at redhat.com> - 2.28.2-1
 - Update to 2.28.2
 



From limb at fedoraproject.org  Tue Dec  8 16:24:10 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 16:24:10 +0000 (UTC)
Subject: File moodle-1.9.7.tgz uploaded to lookaside cache by limb
Message-ID: <20091208162410.9DBD210F87F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for moodle:

6f0888279c5f86ccb7c578800cc3243a  moodle-1.9.7.tgz



From tbzatek at fedoraproject.org  Tue Dec  8 16:27:13 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  8 Dec 2009 16:27:13 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-2.29.xx-nautilus-directory-leak.patch, 
	NONE, 1.1 nautilus.spec, 1.294, 1.295
Message-ID: <20091208162713.4AE0111C00C5@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29689

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.29.xx-nautilus-directory-leak.patch 
Log Message:
* Tue Dec  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-2
- Fix some memory leaks


nautilus-2.29.xx-nautilus-directory-leak.patch:
 libnautilus-private/nautilus-file.c |    3 ++-
 src/nautilus-navigation-window.c    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE nautilus-2.29.xx-nautilus-directory-leak.patch ---
>From ac9f08eb1f74b32c432b0a4904fb57e982202a4c Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Tue, 08 Dec 2009 15:28:13 +0000
Subject: Don't leak NautilusDirectory

---
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 5175118..cd48f7e 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -1580,6 +1580,7 @@ real_sync_search_widgets (NautilusWindow *window)
 		navigation_window->details->temporary_search_bar = TRUE;
 		hide_temporary_bars (navigation_window);
 	}
+	nautilus_directory_unref (directory);
 }
 
 
--
cgit v0.8.2
>From 2d61fcdf4987802441b7d9dab5364a28fb2dbd7c Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Tue, 08 Dec 2009 15:28:30 +0000
Subject: Don't leak NautilusDirectory

---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index df16e1f..fdb1bdc 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -6635,6 +6635,8 @@ nautilus_file_get_volume_free_space (NautilusFile *file)
 						    get_fs_free_cb,
 						    directory); /* Inherits ref */
 		g_object_unref (location);
+	} else {
+		nautilus_directory_unref (directory);
 	}
 
 
--
cgit v0.8.2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- nautilus.spec	1 Dec 2009 11:10:02 -0000	1.294
+++ nautilus.spec	8 Dec 2009 16:27:12 -0000	1.295
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -81,6 +81,9 @@ Patch6:		nautilus-2.28.1-dynamic-search.
 Patch7:		rtl-fix.patch
 #Patch8:	nautilus-2.22.1-hide-white-screen.patch
 
+# from upstream
+Patch9:		nautilus-2.29.xx-nautilus-directory-leak.patch
+
 Patch10:        nautilus-gvfs-desktop-key-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
@@ -126,6 +129,7 @@ for developing nautilus extensions.
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
+%patch9 -p1 -b .memleaks
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .revert-bg-fade-break
@@ -265,6 +269,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-2
+- Fix some memory leaks
+
 * Mon Nov 30 2009 Alexander Larsson <alexl at redhat.com> - 2.28.2-1
 - Update to 2.28.2
 



From limb at fedoraproject.org  Tue Dec  8 16:29:43 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 16:29:43 +0000 (UTC)
Subject: rpms/moodle/devel .cvsignore, 1.19, 1.20 moodle.spec, 1.48,
	1.49 sources, 1.23, 1.24
Message-ID: <20091208162943.839F111C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30681

Modified Files:
	.cvsignore moodle.spec sources 
Log Message:
Update to 1.9.7, BZ 544766.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	5 Nov 2009 14:52:23 -0000	1.19
+++ .cvsignore	8 Dec 2009 16:29:43 -0000	1.20
@@ -1,4 +1,3 @@
-moodle-1.9.6.tgz
 af_utf8.zip
 ar_utf8.zip
 be_utf8.zip
@@ -78,3 +77,4 @@ uz_utf8.zip
 vi_utf8.zip
 zh_cn_utf8.zip
 zh_tw_utf8.zip
+moodle-1.9.7.tgz


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- moodle.spec	5 Nov 2009 16:42:36 -0000	1.48
+++ moodle.spec	8 Dec 2009 16:29:43 -0000	1.49
@@ -7,8 +7,8 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.9.6
-Release:        2%{?dist}
+Version:        1.9.7
+Release:       	1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -398,6 +398,18 @@ This package contains the files needed t
 %{moodlewebdir}/lang/de_du_utf8
 %{moodlewebdir}/install/lang/de_du_utf8
 
+%package        dv
+Summary:        Moodle language pack for Dhivehi
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    dv
+This package contains the files needed to display Moodle in Dhivehi.
+
+%files          dv
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/dv_utf8
+
 %package        el
 Summary:        Moodle language pack for Greek
 Group:          Applications/Publishing
@@ -1722,6 +1734,9 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.7-1
+- Update to 1.9.7, BZ 544766.
+
 * Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-2
 - Reverted erroneous cron fix.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	5 Nov 2009 14:52:24 -0000	1.23
+++ sources	8 Dec 2009 16:29:43 -0000	1.24
@@ -1,4 +1,3 @@
-40175ce7fbfc720b22110b6a369dec18  moodle-1.9.6.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip
@@ -78,3 +77,4 @@ ba2222207b4fcae3ecd911508e915568  ur_utf
 31089008a31db97c283b0911ef9eae91  vi_utf8.zip
 c1c79d9af8ad9ff5feda7775d8178e23  zh_cn_utf8.zip
 8b2ba851407deb066d87bb4ac3204e25  zh_tw_utf8.zip
+6f0888279c5f86ccb7c578800cc3243a  moodle-1.9.7.tgz



From limb at fedoraproject.org  Tue Dec  8 16:31:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 16:31:55 +0000 (UTC)
Subject: rpms/bochs/F-12 bochs.spec,1.44,1.45
Message-ID: <20091208163155.E0BA711C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bochs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31395

Modified Files:
	bochs.spec 
Log Message:
BZ 544310.



Index: bochs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/F-12/bochs.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- bochs.spec	31 Jul 2009 14:23:51 -0000	1.44
+++ bochs.spec	8 Dec 2009 16:31:55 -0000	1.45
@@ -1,7 +1,7 @@
 %define githead 04387139e3b
 Name:           bochs
 Version:        2.3.8
-Release:        0.8.git%{githead}%{?dist}
+Release:        0.9.git%{githead}%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
@@ -144,6 +144,7 @@ CONFIGURE_FLAGS=" \
   --with-rfb \
   --with-sdl \
   --without-wx \
+  --enable-cpu-level=6 \
   $ARCH_CONFIGURE_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
 
@@ -172,6 +173,10 @@ cp BIOS-bochs-latest ../../bios/BIOS-boc
 rm -rf $RPM_BUILD_ROOT _installed-docs
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS*
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.cirrus.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.cirrus
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.cirrus.debug
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.debug.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.debug
 %ifnarch %{ix86} x86_64
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/*BIOS*
 %endif
@@ -203,6 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 %files bios
 %defattr(-,root,root,-)
 %{_datadir}/bochs/BIOS*
+%{_datadir}/bochs/VGABIOS*
 %endif
 
 
@@ -216,6 +222,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 04 2009 Jon Ciesla <limb at jcomserv.net> 2.3.8-0.9.git04387139e3b
+- Include symlinks to VGABIOS in vgabios rpm, BZ 544310.
+- Enable cpu level 6.
+
 * Fri Jul 31 2009 Glauber Costa <glommer at redhat.com> - 2:0.10.50-14.kvm88
 - replace kvm-bios with a more modern version, and refresh instructions on how to get it.
 



From limb at fedoraproject.org  Tue Dec  8 16:34:13 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 16:34:13 +0000 (UTC)
Subject: rpms/bochs/F-11 bochs.spec,1.42,1.43 sources,1.15,1.16
Message-ID: <20091208163414.0AC0311C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bochs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32374

Modified Files:
	bochs.spec sources 
Log Message:
BZ 544310.



Index: bochs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/F-11/bochs.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- bochs.spec	11 Mar 2009 17:13:22 -0000	1.42
+++ bochs.spec	8 Dec 2009 16:34:13 -0000	1.43
@@ -1,7 +1,7 @@
 %define githead 04387139e3b
 Name:           bochs
 Version:        2.3.8
-Release:        0.6.git%{githead}%{?dist}
+Release:        0.9.git%{githead}%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
@@ -14,8 +14,9 @@ Source0:        %{name}-%{version}.tar.g
 
 # This should not live here, but letting it in the kvm package would produce another noarch package we would
 # then have to get rid of in the future. So let it be.
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
-# git archive --format=tar --prefix=kvm-bios.tar.gz HEAD bios | gzip > ../kvm-bios.tar.gz
+# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/qemu-kvm.git
+# cd kvm
+# git archive --format=tar --prefix=kvm-bios/ HEAD bios | gzip > ../../kvm-bios.tar.gz
 Source1:	kvm-bios.tar.gz
 
 Patch0:	%{name}-0001_bx-qemu.patch
@@ -143,6 +144,7 @@ CONFIGURE_FLAGS=" \
   --with-rfb \
   --with-sdl \
   --without-wx \
+  --enable-cpu-level=6 \
   $ARCH_CONFIGURE_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
 
@@ -171,6 +173,10 @@ cp BIOS-bochs-latest ../../bios/BIOS-boc
 rm -rf $RPM_BUILD_ROOT _installed-docs
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS*
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.cirrus.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.cirrus
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.cirrus.debug
+ln -s %{_prefix}/share/vgabios/VGABIOS-lgpl-latest.debug.bin $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS-lgpl-latest.debug
 %ifnarch %{ix86} x86_64
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/*BIOS*
 %endif
@@ -202,6 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 %files bios
 %defattr(-,root,root,-)
 %{_datadir}/bochs/BIOS*
+%{_datadir}/bochs/VGABIOS*
 %endif
 
 
@@ -215,6 +222,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 04 2009 Jon Ciesla <limb at jcomserv.net> 2.3.8-0.9.git04387139e3b
+- Include symlinks to VGABIOS in vgabios rpm, BZ 544310.
+- Enable cpu level 6.
+
+* Fri Jul 31 2009 Glauber Costa <glommer at redhat.com> - 2:0.10.50-14.kvm88
+- replace kvm-bios with a more modern version, and refresh instructions on how to get it.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.8-0.7.git04387139e3b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Mar 11 2009 Glauber Costa <glommer at redhat.com> 2.3.8-0.6.git04387139e3b
 - Fix Obsoletes/Provides pair.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Mar 2009 16:48:03 -0000	1.15
+++ sources	8 Dec 2009 16:34:13 -0000	1.16
@@ -1,2 +1,2 @@
+6a9ea13ca552ab7369206196b0dc1afa  kvm-bios.tar.gz
 a360358375ad00487f0f26dcc667a4a4  bochs-2.3.8.tar.gz
-9fb228d2176430963c4d2d8afcf2faff  kvm-bios.tar.gz



From mclasen at fedoraproject.org  Tue Dec  8 16:40:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Dec 2009 16:40:11 +0000 (UTC)
Subject: File gtk+-2.18.5.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091208164011.1386910F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gtk2:

3047875309f7f6030e03b0a95cf99c8c  gtk+-2.18.5.tar.bz2



From pkgdb at fedoraproject.org  Tue Dec  8 16:46:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 16:46:19 +0000
Subject: [pkgdb] eclipse-jgit F-12 cloned from devel
Message-ID: <20091208164620.0541710F881@bastion2.fedora.phx.redhat.com>

ausil cloned eclipse-jgit F-12 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-jgit



From limb at fedoraproject.org  Tue Dec  8 16:48:38 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 16:48:38 +0000 (UTC)
Subject: rpms/moodle/F-12 moodle.spec,1.46,1.47 sources,1.22,1.23
Message-ID: <20091208164838.BD96911C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4813

Modified Files:
	moodle.spec sources 
Log Message:
Update to 1.9.7, BZ 544766.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-12/moodle.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- moodle.spec	23 Sep 2009 16:47:39 -0000	1.46
+++ moodle.spec	8 Dec 2009 16:48:38 -0000	1.47
@@ -7,16 +7,16 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.9.5
-Release:        3%{?dist}
+Version:        1.9.7
+Release:       	1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://moodle.org/
-#Source0:        http://download.moodle.org/stable19/%{name}-%{version}.tgz
+Source0:        http://download.moodle.org/stable19/%{name}-%{version}.tgz
 #Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
-Source0:        http://download.moodle.org/stable19/moodle-weekly-19.tgz
+#Source0:        http://download.moodle.org/stable19/moodle-weekly-19.tgz
 Source1:        moodle.conf
 Source2:        moodle-config.php
 Source3:        moodle.cron
@@ -398,6 +398,18 @@ This package contains the files needed t
 %{moodlewebdir}/lang/de_du_utf8
 %{moodlewebdir}/install/lang/de_du_utf8
 
+%package        dv
+Summary:        Moodle language pack for Dhivehi
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    dv
+This package contains the files needed to display Moodle in Dhivehi.
+
+%files          dv
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/dv_utf8
+
 %package        el
 Summary:        Moodle language pack for Greek
 Group:          Applications/Publishing
@@ -1722,6 +1734,16 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.7-1
+- Update to 1.9.7, BZ 544766.
+
+* Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-2
+- Reverted erroneous cron fix.
+
+* Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-1
+- Update to 1.9.6.
+- Make moodle-cron honor lock, BZ 533171.
+
 * Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-3
 - Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
 - Added Urdu installer.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	23 Sep 2009 16:47:39 -0000	1.22
+++ sources	8 Dec 2009 16:48:38 -0000	1.23
@@ -1,4 +1,3 @@
-37910e55ed9ada16f0d2d2d06f78647e  moodle-weekly-19.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip
@@ -78,3 +77,4 @@ ba2222207b4fcae3ecd911508e915568  ur_utf
 31089008a31db97c283b0911ef9eae91  vi_utf8.zip
 c1c79d9af8ad9ff5feda7775d8178e23  zh_cn_utf8.zip
 8b2ba851407deb066d87bb4ac3204e25  zh_tw_utf8.zip
+6f0888279c5f86ccb7c578800cc3243a  moodle-1.9.7.tgz



From mclasen at fedoraproject.org  Tue Dec  8 16:49:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  8 Dec 2009 16:49:31 +0000 (UTC)
Subject: rpms/gtk2/F-12 .cvsignore, 1.121, 1.122 gtk2.spec, 1.442,
	1.443 sources, 1.130, 1.131
Message-ID: <20091208164931.6C6B211C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5240

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.18.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/.cvsignore,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- .cvsignore	1 Dec 2009 14:27:13 -0000	1.121
+++ .cvsignore	8 Dec 2009 16:49:30 -0000	1.122
@@ -1 +1 @@
-gtk+-2.18.4.tar.bz2
+gtk+-2.18.5.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -p -r1.442 -r1.443
--- gtk2.spec	1 Dec 2009 22:15:22 -0000	1.442
+++ gtk2.spec	8 Dec 2009 16:49:31 -0000	1.443
@@ -11,7 +11,7 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.18.4
+%define base_version 2.18.5
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -398,8 +398,11 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.5-1
+- Update to 2.18.5
+
 * Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-3
-- Fix a misttranslated format string in no_NO (#500067)
+- Fix a mistranslated format string in no_NO (#500067)
 
 * Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-2
 - Make compose sequences for ?? consistent (#510741)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- sources	1 Dec 2009 14:27:13 -0000	1.130
+++ sources	8 Dec 2009 16:49:31 -0000	1.131
@@ -1 +1 @@
-311ec49d7cae0c0b431ab6235579f5a4  gtk+-2.18.4.tar.bz2
+3047875309f7f6030e03b0a95cf99c8c  gtk+-2.18.5.tar.bz2



From pkgdb at fedoraproject.org  Tue Dec  8 16:52:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 16:52:11 +0000
Subject: [pkgdb] bochs: limb has given up watchcommits
Message-ID: <20091208165211.DC1E510F87F@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Tue Dec  8 16:52:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 16:52:12 +0000
Subject: [pkgdb] bochs: limb has given up watchbugzilla
Message-ID: <20091208165212.70E2010F891@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Tue Dec  8 16:52:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 16:52:12 +0000
Subject: [pkgdb] bochs: limb has requested commit
Message-ID: <20091208165212.A990D10F89C@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Tue Dec  8 16:52:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 08 Dec 2009 16:52:14 +0000
Subject: [pkgdb] bochs: limb has requested approveacls
Message-ID: <20091208165214.C382E10F89F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on bochs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From than at fedoraproject.org  Tue Dec  8 16:55:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  8 Dec 2009 16:55:06 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.248,1.249
Message-ID: <20091208165506.6485211C00C5@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7168

Modified Files:
	kdepim.spec 
Log Message:
drop BR kdelibs-experimental




Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- kdepim.spec	2 Dec 2009 13:45:36 -0000	1.248
+++ kdepim.spec	8 Dec 2009 16:55:05 -0000	1.249
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -41,7 +41,6 @@ BuildRequires: desktop-file-utils
 BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel
 BuildRequires: libassuan-devel
 BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -228,6 +227,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 08 2009 Than Ngo <than at redhat.com> - 4.3.80-2
+- drop BR kdelibs-experimental
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From thias at fedoraproject.org  Tue Dec  8 16:58:55 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 16:58:55 +0000 (UTC)
Subject: rpms/powermanga/devel powermanga.desktop, 1.1, 1.2 powermanga.spec, 
	1.24, 1.25
Message-ID: <20091208165855.4BBB211C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8573

Modified Files:
	powermanga.desktop powermanga.spec 
Log Message:
Minor cleanups here and there.



Index: powermanga.desktop
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- powermanga.desktop	19 Jun 2007 17:02:37 -0000	1.1
+++ powermanga.desktop	8 Dec 2009 16:58:55 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Powermanga
-Comment=Arcade 2D shoot-them-up game
-Icon=powermanga
+GenericName=Arcade 2D shoot-them-up game
+Comment=Play an arcade style vertical scrolling 2D shoot-them-up game
 Exec=powermanga
+Icon=powermanga
 Terminal=false
 Type=Application
 Categories=Game;ArcadeGame;
-Encoding=UTF-8


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- powermanga.spec	26 Jul 2009 19:19:14 -0000	1.24
+++ powermanga.spec	8 Dec 2009 16:58:55 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.90
-Release: 6
+Release: 7
 License: GPLv3+
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -17,12 +17,10 @@ BuildRequires: SDL_mixer-devel
 BuildRequires: zlib-devel
 BuildRequires: libpng-devel
 BuildRequires: desktop-file-utils
-Requires(post): coreutils
-Requires(postun): coreutils
 
 %description
-Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
-200 sprites.
+Powermanga is a vertical scrolling arcade style 2D shoot-them-up game with
+41 levels and more than 200 sprites.
 
 
 %prep
@@ -50,8 +48,6 @@ Powermanga is an arcade 2D shoot-them-up
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
-    --vendor "" \
-    --mode 0644 \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE2}
 
@@ -83,7 +79,14 @@ fi
 %attr(2755,root,games) %{_bindir}/powermanga
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/powermanga.png
-%{_datadir}/powermanga/
+# No _datadir/powermanga/ single line to avoid including config.ini twice
+%dir %{_datadir}/powermanga/
+%{_datadir}/powermanga/data/
+%{_datadir}/powermanga/graphics/
+%{_datadir}/powermanga/sound/
+%{_datadir}/powermanga/sounds/
+%dir %{_datadir}/powermanga/texts/
+%{_datadir}/powermanga/texts/*.txt
 %config(noreplace) %{_datadir}/powermanga/texts/config.ini
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664,root,games) %{_var}/games/powermanga.hi
@@ -92,6 +95,12 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 0.90-7
+- Remove coreutils scriplet requirements : Current guidelines don't require it,
+  as we have "|| :" anyway.
+- Clean up desktop file.
+- Fix the build warning about config.ini being listed twice.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.90-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sandeen at fedoraproject.org  Tue Dec  8 17:01:04 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  8 Dec 2009 17:01:04 +0000 (UTC)
Subject: rpms/xfsprogs/devel xfsprogs.spec,1.69,1.70
Message-ID: <20091208170104.AB94C11C00C5@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9646

Modified Files:
	xfsprogs.spec 
Log Message:
* Tue Dec 08 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-5
- And finally, BuildRequire libblkid-devel



Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- xfsprogs.spec	7 Dec 2009 23:17:57 -0000	1.69
+++ xfsprogs.spec	8 Dec 2009 17:01:04 -0000	1.70
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	3.0.3
-Release:	4%{?dist}
+Release:	5%{?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
@@ -12,7 +12,8 @@ URL:		http://oss.sgi.com/projects/xfs/
 Source0:	ftp://oss.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
 Source1:	xfsprogs-wrapper.h
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libtool, gettext, libuuid-devel, readline-devel
+BuildRequires:	libtool, gettext, libuuid-devel
+BuildRequires:	readline-devel, libblkid-devel >= 2.17-0.1.git5e51568
 Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
 Conflicts:	xfsdump < 3.0.1
@@ -202,6 +203,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xfs/xfs_types.h
 
 %changelog
+* Tue Dec 08 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-5
+- And finally, BuildRequire libblkid-devel
+
 * Mon Dec 07 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-4
 - Actually patch & run configure script w/ blkid bits...
 - Kill rpath in xfs_fsr



From kklic at fedoraproject.org  Tue Dec  8 17:02:32 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Tue,  8 Dec 2009 17:02:32 +0000 (UTC)
Subject: rpms/emacs/devel emacs-23.1-memmove.patch, NONE, 1.1 emacs.spec,
	1.146, 1.147
Message-ID: <20091208170232.AA0E611C00C5@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10196

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-memmove.patch 
Log Message:
Fixed etags on x86_64. Resolves rhbz#545398.

emacs-23.1-memmove.patch:
 etags.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE emacs-23.1-memmove.patch ---
diff -up emacs-23.1/lib-src/etags.c.memmove emacs-23.1/lib-src/etags.c
--- emacs-23.1/lib-src/etags.c.memmove	2009-06-21 06:37:34.000000000 +0200
+++ emacs-23.1/lib-src/etags.c	2009-12-08 17:55:41.442792036 +0100
@@ -6695,13 +6695,13 @@ absolute_filename (file, dir)
 	      else if (cp[0] != '/')
 		cp = slashp;
 #endif
-	      strcpy (cp, slashp + 3);
+	      memmove (cp, slashp + 3, strlen(slashp + 2));
 	      slashp = cp;
 	      continue;
 	    }
 	  else if (slashp[2] == '/' || slashp[2] == '\0')
 	    {
-	      strcpy (slashp, slashp + 2);
+	      memmove (slashp, slashp + 2, strlen(slashp + 1));
 	      continue;
 	    }
 	}


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- emacs.spec	3 Dec 2009 12:20:22 -0000	1.146
+++ emacs.spec	8 Dec 2009 17:02:32 -0000	1.147
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -28,9 +28,12 @@ Patch2: po-mode-auto-replace-date-71264.
 Patch3: rpm-spec-mode-utc.patch
 Patch4: emacs-gtk.patch
 Patch5: emacs-23.1-xdg.patch
+# Fixed in upstream CVS.
 Patch6: emacs-23.1-cpp.patch
 Patch7: emacs-23.1-scroll.patch
 Patch8: emacs-23.1-indian.patch
+# Fixed in upstream CVS
+Patch9: emacs-23.1-memmove.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -129,6 +132,7 @@ Emacs packages or see some elisp example
 %patch6 -p1
 %patch7 -p1 -b .scroll
 %patch8 -p1
+%patch9 -p1 -b .memmove
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -400,6 +404,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Dec  8 2009 Karel Klic <kklic at redhat.com> 1:23.1-17
+- Fixed rhbz#545398 - ETags messes up filenames
+
 * Thu Dec 03 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-16
 - fix #542657 -  emacs does not display indic text
 



From limb at fedoraproject.org  Tue Dec  8 17:05:22 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 17:05:22 +0000 (UTC)
Subject: rpms/moodle/F-11 moodle.spec,1.43,1.44 sources,1.20,1.21
Message-ID: <20091208170522.EFBE011C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11280

Modified Files:
	moodle.spec sources 
Log Message:
Update to 1.9.7, BZ 544766.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-11/moodle.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- moodle.spec	6 Apr 2009 16:53:52 -0000	1.43
+++ moodle.spec	8 Dec 2009 17:05:22 -0000	1.44
@@ -7,15 +7,15 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.9.4
-Release:        7%{?dist}
+Version:        1.9.7
+Release:       	1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://moodle.org/
 Source0:        http://download.moodle.org/stable19/%{name}-%{version}.tgz
-#Using weekly snapshot downloaded 11/7/08 to fix snoopy CVE-2008-4796
+#Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
 #Source0:        http://download.moodle.org/stable19/moodle-weekly-19.tgz
 Source1:        moodle.conf
 Source2:        moodle-config.php
@@ -102,11 +102,12 @@ Source80:       http://download.moodle.o
 Source81:       http://download.moodle.org/lang16/ta_lk_utf8.zip
 Source82:       http://download.moodle.org/lang16/cy_utf8.zip
 Source83:       http://download.moodle.org/lang16/uz_utf8.zip
+Source84:	http://download.moodle.org/lang16/ur_utf8.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Patch0:		moodle-1.9.3-rce-texed.patch
 Patch1:		moodle-1.9.4-CVE-2009-1171-1.patch
-Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
+#Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
 
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
@@ -397,6 +398,18 @@ This package contains the files needed t
 %{moodlewebdir}/lang/de_du_utf8
 %{moodlewebdir}/install/lang/de_du_utf8
 
+%package        dv
+Summary:        Moodle language pack for Dhivehi
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    dv
+This package contains the files needed to display Moodle in Dhivehi.
+
+%files          dv
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/dv_utf8
+
 %package        el
 Summary:        Moodle language pack for Greek
 Group:          Applications/Publishing
@@ -1316,6 +1329,18 @@ This package contains the files needed t
 %{moodlewebdir}/install/lang/uk_utf8
 #%{moodlewebdir}/lib/adodb/lang/adodb-uk1251.inc.php
 
+%package        ur
+Summary:        Moodle language pack for Urdu
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    ur
+This package contains the files needed to display Moodle in Urdu.
+
+%files          ur
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/ur_utf8
+
 %package        uz
 Summary:        Moodle language pack for Uzbek
 Group:          Applications/Publishing
@@ -1482,7 +1507,7 @@ sed -i 's/\r//' mod/wiki/ewiki/README.de
 
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
+#%patch2 -p0
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -1542,26 +1567,38 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add %{name}
 
+if [ -d /var/www/moodle/web/lib/smarty -a ! -L /var/www/moodle/web/lib/smarty ]; then
+  mv /var/www/moodle/web/lib/smarty /var/www/moodle/web/lib/smarty.rpmbak && \
+  ln -s /usr/share/php/Smarty/ /var/www/moodle/web/lib/smarty
+  rm -rf /var/www/moodle/web/lib/smarty.rpmbak
+fi
+if [ ! -L /var/www/moodle/web/lib/smarty ]; then
+  ln -s /usr/share/php/Smarty/ /var/www/moodle/web/lib/smarty
+fi
+
+if [ -d /var/www/moodle/web/lib/adodb -a ! -L /var/www/moodle/web/lib/adodb ]; then
+  mv /var/www/moodle/web/lib/adodb /var/www/moodle/web/lib/adodb.rpmbak && \
+  ln -s /usr/share/php/adodb/ /var/www/moodle/web/lib/adodb
+  rm -rf /var/www/moodle/web/lib/adodb.rpmbak
+fi
+if [ ! -L /var/www/moodle/web/lib/adodb ]; then
+  ln -s /usr/share/php/adodb/ /var/www/moodle/web/lib/adodb
+fi
+
 %preun
 if [ $1 = 0 ]; then
   /sbin/service %{name} stop >/dev/null 2>&1
   /sbin/chkconfig --del %{name}
 fi
 
-%pretrans
-if [ -d /var/www/moodle/web/lib/smarty ]; then
-  rm -rf /var/www/moodle/web/lib/smarty
-fi
-if [ -d /var/www/moodle/web/lib/adodb ]; then
-  rm -rf /var/www/moodle/web/lib/adodb
-fi
+%pre
 if [ -h /var/www/moodle/web/lib/magpie ]; then
   rm -f /var/www/moodle/web/lib/magpie
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc README*
+%doc README* COPYING.txt
 %dir %{_var}/www/moodle
 %dir %{moodlewebdir}
 %config(noreplace) %{moodlewebdir}/config.php
@@ -1692,8 +1729,32 @@ fi
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}-cron
+%ghost /var/www/moodle/web/lib/smarty 
+%ghost /var/www/moodle/web/lib/adodb
+%exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.7-1
+- Update to 1.9.7, BZ 544766.
+
+* Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-2
+- Reverted erroneous cron fix.
+
+* Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-1
+- Update to 1.9.6.
+- Make moodle-cron honor lock, BZ 533171.
+
+* Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-3
+- Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
+- Added Urdu installer.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 14 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-1
+- Move symlink scripts from pretrans to post, pre.
+- 1.9.5.
+
 * Fri Apr 03 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-7
 - Move symlink scripts from pre to pretrans.
 - Corrented moodle-cron BZ 494090.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	11 Feb 2009 20:26:54 -0000	1.20
+++ sources	8 Dec 2009 17:05:22 -0000	1.21
@@ -1,4 +1,3 @@
-feed7be7f40292d2fe294150f2ab0afa  moodle-1.9.4.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip
@@ -73,7 +72,9 @@ c700dd1a55a3b8991430ac3f45a46f86  ta_lk_
 6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
+ba2222207b4fcae3ecd911508e915568  ur_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip
 31089008a31db97c283b0911ef9eae91  vi_utf8.zip
 c1c79d9af8ad9ff5feda7775d8178e23  zh_cn_utf8.zip
 8b2ba851407deb066d87bb4ac3204e25  zh_tw_utf8.zip
+6f0888279c5f86ccb7c578800cc3243a  moodle-1.9.7.tgz



From jorton at fedoraproject.org  Tue Dec  8 17:08:18 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue,  8 Dec 2009 17:08:18 +0000 (UTC)
Subject: rpms/mod_perl/devel mod_perl-2.0.4-CVE-2009-0796.patch, NONE,
	1.1 mod_perl.spec, 1.69, 1.70
Message-ID: <20091208170818.8B7AD11C00C5@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12615

Modified Files:
	mod_perl.spec 
Added Files:
	mod_perl-2.0.4-CVE-2009-0796.patch 
Log Message:
* Tue Dec  8 2009 Joe Orton <jorton at redhat.com> - 2.0.4-10
- add security fix for CVE-2009-0796 (#544455)


mod_perl-2.0.4-CVE-2009-0796.patch:
 Status.pm |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE mod_perl-2.0.4-CVE-2009-0796.patch ---
--- mod_perl-2.0.4/lib/Apache2/Status.pm.cve0796
+++ mod_perl-2.0.4/lib/Apache2/Status.pm
@@ -29,7 +29,7 @@ use File::Spec ();
 
 use Apache2::Const -compile => qw(OK);
 
-$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0
+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0
 
 use constant IS_WIN32 => ($^O eq "MSWin32");
 
@@ -126,7 +126,7 @@ sub handler {
         $r->print(symdump($r, $qs));
     }
     else {
-        my $uri = $r->uri;
+        my $uri = $r->location;
         $r->print('<p>');
         $r->print(
             map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status
@@ -198,7 +198,7 @@ sub status_section_config {
 sub status_inc {
     my ($r) = @_;
 
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my @retval = (
         '<table border="1">',
         "<tr>",
@@ -289,7 +289,7 @@ sub status_rgysubs {
     my ($r) = @_;
 
     local $_;
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my $cache = __PACKAGE__->registry_cache;
 
     my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>";
@@ -765,7 +765,7 @@ sub as_HTML {
     my ($self, $package, $r) = @_;
 
     my @m = qw(<table>);
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my $is_main = $package eq "main";
 
     my $do_dump = has($r, "dumper");


Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- mod_perl.spec	25 Jul 2009 14:47:25 -0000	1.69
+++ mod_perl.spec	8 Dec 2009 17:08:18 -0000	1.70
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.4
-Release:        9
+Release:        10%{?dist}
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -14,6 +14,7 @@ Source2:        filter-requires.sh
 Source3:        filter-provides.sh
 Patch0:         mod_perl-2.0.4-multilib.patch
 Patch1:         mod_perl-2.0.4-inline.patch
+Patch2:         mod_perl-2.0.4-CVE-2009-0796.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-devel, perl(ExtUtils::Embed)
@@ -51,6 +52,7 @@ modules that use mod_perl.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1 -b .inline
+%patch2 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fpic" %{__perl} Makefile.PL </dev/null \
@@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/httpd/*
 
 %changelog
+* Tue Dec  8 2009 Joe Orton <jorton at redhat.com> - 2.0.4-10
+- add security fix for CVE-2009-0796 (#544455)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kklic at fedoraproject.org  Tue Dec  8 17:13:54 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Tue,  8 Dec 2009 17:13:54 +0000 (UTC)
Subject: rpms/emacs/F-12 emacs-23.1-memmove.patch, NONE, 1.1 emacs.spec,
	1.144, 1.145
Message-ID: <20091208171354.78C4511C00C5@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/emacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14651

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-memmove.patch 
Log Message:
Fixed etags on x86_64. Resolves rhbz#545398.

emacs-23.1-memmove.patch:
 etags.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE emacs-23.1-memmove.patch ---
diff -up emacs-23.1/lib-src/etags.c.memmove emacs-23.1/lib-src/etags.c
--- emacs-23.1/lib-src/etags.c.memmove	2009-06-21 06:37:34.000000000 +0200
+++ emacs-23.1/lib-src/etags.c	2009-12-08 17:55:41.442792036 +0100
@@ -6695,13 +6695,13 @@ absolute_filename (file, dir)
 	      else if (cp[0] != '/')
 		cp = slashp;
 #endif
-	      strcpy (cp, slashp + 3);
+	      memmove (cp, slashp + 3, strlen(slashp + 2));
 	      slashp = cp;
 	      continue;
 	    }
 	  else if (slashp[2] == '/' || slashp[2] == '\0')
 	    {
-	      strcpy (slashp, slashp + 2);
+	      memmove (slashp, slashp + 2, strlen(slashp + 1));
 	      continue;
 	    }
 	}


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-12/emacs.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- emacs.spec	3 Dec 2009 12:35:27 -0000	1.144
+++ emacs.spec	8 Dec 2009 17:13:54 -0000	1.145
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -31,6 +31,7 @@ Patch5: emacs-23.1-xdg.patch
 Patch6: emacs-23.1-cpp.patch
 Patch7: emacs-23.1-scroll.patch
 Patch8: emacs-23.1-indian.patch
+Patch9: emacs-23.1-memmove.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -126,6 +127,7 @@ Emacs packages or see some elisp example
 %patch6 -p1
 %patch7 -p1 -b .scroll
 %patch8 -p1
+%patch9 -p1 -b .memmove
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -388,6 +390,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Dec  8 2009 Karel Klic <kklic at redhat.com> 1:23.1-15
+- Fixed rhbz#545398 - ETags messes up filenames
+
 * Thu Dec 03 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-14
 - fix #542657 -  emacs does not display indic text
 



From jorton at fedoraproject.org  Tue Dec  8 17:15:55 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue,  8 Dec 2009 17:15:55 +0000 (UTC)
Subject: rpms/mod_perl/F-12 mod_perl-2.0.4-CVE-2009-0796.patch, NONE,
	1.1 mod_perl.spec, 1.69, 1.70
Message-ID: <20091208171555.A9B8811C00C5@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_perl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15412

Modified Files:
	mod_perl.spec 
Added Files:
	mod_perl-2.0.4-CVE-2009-0796.patch 
Log Message:
* Tue Dec  8 2009 Joe Orton <jorton at redhat.com> - 2.0.4-10
- add security fix for CVE-2009-0796 (#544455)


mod_perl-2.0.4-CVE-2009-0796.patch:
 Status.pm |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE mod_perl-2.0.4-CVE-2009-0796.patch ---
--- mod_perl-2.0.4/lib/Apache2/Status.pm.cve0796
+++ mod_perl-2.0.4/lib/Apache2/Status.pm
@@ -29,7 +29,7 @@ use File::Spec ();
 
 use Apache2::Const -compile => qw(OK);
 
-$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0
+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0
 
 use constant IS_WIN32 => ($^O eq "MSWin32");
 
@@ -126,7 +126,7 @@ sub handler {
         $r->print(symdump($r, $qs));
     }
     else {
-        my $uri = $r->uri;
+        my $uri = $r->location;
         $r->print('<p>');
         $r->print(
             map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status
@@ -198,7 +198,7 @@ sub status_section_config {
 sub status_inc {
     my ($r) = @_;
 
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my @retval = (
         '<table border="1">',
         "<tr>",
@@ -289,7 +289,7 @@ sub status_rgysubs {
     my ($r) = @_;
 
     local $_;
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my $cache = __PACKAGE__->registry_cache;
 
     my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>";
@@ -765,7 +765,7 @@ sub as_HTML {
     my ($self, $package, $r) = @_;
 
     my @m = qw(<table>);
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my $is_main = $package eq "main";
 
     my $do_dump = has($r, "dumper");


Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/F-12/mod_perl.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- mod_perl.spec	25 Jul 2009 14:47:25 -0000	1.69
+++ mod_perl.spec	8 Dec 2009 17:15:55 -0000	1.70
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.4
-Release:        9
+Release:        10%{?dist}
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -14,6 +14,7 @@ Source2:        filter-requires.sh
 Source3:        filter-provides.sh
 Patch0:         mod_perl-2.0.4-multilib.patch
 Patch1:         mod_perl-2.0.4-inline.patch
+Patch2:         mod_perl-2.0.4-CVE-2009-0796.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-devel, perl(ExtUtils::Embed)
@@ -51,6 +52,7 @@ modules that use mod_perl.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1 -b .inline
+%patch2 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fpic" %{__perl} Makefile.PL </dev/null \
@@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/httpd/*
 
 %changelog
+* Tue Dec  8 2009 Joe Orton <jorton at redhat.com> - 2.0.4-10
+- add security fix for CVE-2009-0796 (#544455)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjames at fedoraproject.org  Tue Dec  8 17:17:37 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  8 Dec 2009 17:17:37 +0000 (UTC)
Subject: rpms/xemacs/F-11 xemacs-21.5.29-etags-memmove-545399.patch, NONE,
	1.1 xemacs.spec, 1.55, 1.56
Message-ID: <20091208171737.D117811C00C5@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15905/F-11

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.29-etags-memmove-545399.patch 
Log Message:
* Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
- Add patch to use memmove in etags (bz 545399).


xemacs-21.5.29-etags-memmove-545399.patch:
 ChangeLog |    5 +++++
 etags.c   |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-21.5.29-etags-memmove-545399.patch ---
diff -dur xemacs-21.5.29.ORIG/lib-src/ChangeLog xemacs-21.5.29/lib-src/ChangeLog
--- xemacs-21.5.29.ORIG/lib-src/ChangeLog	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lib-src/ChangeLog	2009-12-08 10:09:57.753594714 -0700
@@ -1,3 +1,8 @@
+2009-12-08  Sjoerd Mullender  <sjoerd at acm.org>
+
+	* etags.c (absolute_filename): Use memmove instead of strcpy to move
+	characters within a string.
+
 2009-05-18  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* XEmacs 21.5.29 "garbanzo" is released.
diff -dur xemacs-21.5.29.ORIG/lib-src/etags.c xemacs-21.5.29/lib-src/etags.c
--- xemacs-21.5.29.ORIG/lib-src/etags.c	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lib-src/etags.c	2009-12-08 10:09:09.100592092 -0700
@@ -6829,13 +6829,13 @@
 	      else if (cp[0] != '/')
 		cp = slashp;
 #endif
-	      strcpy (cp, slashp + 3);
+	      memmove (cp, slashp + 3, strlen (slashp + 3) + 1);
 	      slashp = cp;
 	      continue;
 	    }
 	  else if (slashp[2] == '/' || slashp[2] == '\0')
 	    {
-	      strcpy (slashp, slashp + 2);
+	      memmove (slashp, slashp + 2, strlen (slashp + 2) + 1);
 	      continue;
 	    }
 	}


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- xemacs.spec	9 Nov 2009 16:50:45 -0000	1.55
+++ xemacs.spec	8 Dec 2009 17:17:37 -0000	1.56
@@ -22,7 +22,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        7%{?snap:.%{snap}}%{?dist}
+Release:        8%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -54,6 +54,8 @@ Patch8:         %{name}-21.5.28-courier-
 Patch9:         %{name}-21.5.29-destdir.patch
 # Sent upstream 2009-10-28
 Patch10:        %{name}-21.5.29-tty-font-512623.patch
+# Sent upstream 2009-12-08
+Patch11:        %{name}-21.5.29-etags-memmove-545399.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -226,6 +228,7 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -589,6 +592,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-8
+- Add patch to use memmove in etags (bz 545399).
+
 * Mon Nov  9 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-7
 - Move macros.xemacs to the -common subpackage (bz 533611).
 - Updated TTY font patch from upstream.



From jjames at fedoraproject.org  Tue Dec  8 17:17:38 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  8 Dec 2009 17:17:38 +0000 (UTC)
Subject: rpms/xemacs/F-12 xemacs-21.5.29-etags-memmove-545399.patch, NONE,
	1.1 xemacs.spec, 1.57, 1.58
Message-ID: <20091208171738.0D7DA11C00C5@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15905/F-12

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.29-etags-memmove-545399.patch 
Log Message:
* Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
- Add patch to use memmove in etags (bz 545399).


xemacs-21.5.29-etags-memmove-545399.patch:
 ChangeLog |    5 +++++
 etags.c   |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-21.5.29-etags-memmove-545399.patch ---
diff -dur xemacs-21.5.29.ORIG/lib-src/ChangeLog xemacs-21.5.29/lib-src/ChangeLog
--- xemacs-21.5.29.ORIG/lib-src/ChangeLog	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lib-src/ChangeLog	2009-12-08 10:09:57.753594714 -0700
@@ -1,3 +1,8 @@
+2009-12-08  Sjoerd Mullender  <sjoerd at acm.org>
+
+	* etags.c (absolute_filename): Use memmove instead of strcpy to move
+	characters within a string.
+
 2009-05-18  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* XEmacs 21.5.29 "garbanzo" is released.
diff -dur xemacs-21.5.29.ORIG/lib-src/etags.c xemacs-21.5.29/lib-src/etags.c
--- xemacs-21.5.29.ORIG/lib-src/etags.c	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lib-src/etags.c	2009-12-08 10:09:09.100592092 -0700
@@ -6829,13 +6829,13 @@
 	      else if (cp[0] != '/')
 		cp = slashp;
 #endif
-	      strcpy (cp, slashp + 3);
+	      memmove (cp, slashp + 3, strlen (slashp + 3) + 1);
 	      slashp = cp;
 	      continue;
 	    }
 	  else if (slashp[2] == '/' || slashp[2] == '\0')
 	    {
-	      strcpy (slashp, slashp + 2);
+	      memmove (slashp, slashp + 2, strlen (slashp + 2) + 1);
 	      continue;
 	    }
 	}


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- xemacs.spec	9 Nov 2009 16:50:46 -0000	1.57
+++ xemacs.spec	8 Dec 2009 17:17:37 -0000	1.58
@@ -22,7 +22,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        8%{?snap:.%{snap}}%{?dist}
+Release:        9%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -54,6 +54,8 @@ Patch8:         %{name}-21.5.28-courier-
 Patch9:         %{name}-21.5.29-destdir.patch
 # Sent upstream 2009-10-28
 Patch10:        %{name}-21.5.29-tty-font-512623.patch
+# Sent upstream 2009-12-08
+Patch11:        %{name}-21.5.29-etags-memmove-545399.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -226,6 +228,7 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -589,6 +592,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
+- Add patch to use memmove in etags (bz 545399).
+
 * Mon Nov  9 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-8
 - Move macros.xemacs to the -common subpackage (bz 533611).
 - Updated TTY font patch from upstream.



From jjames at fedoraproject.org  Tue Dec  8 17:17:38 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  8 Dec 2009 17:17:38 +0000 (UTC)
Subject: rpms/xemacs/devel xemacs-21.5.29-etags-memmove-545399.patch, NONE, 
	1.1 xemacs.spec, 1.57, 1.58
Message-ID: <20091208171738.516B811C00C5@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15905/devel

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.29-etags-memmove-545399.patch 
Log Message:
* Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
- Add patch to use memmove in etags (bz 545399).


xemacs-21.5.29-etags-memmove-545399.patch:
 ChangeLog |    5 +++++
 etags.c   |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-21.5.29-etags-memmove-545399.patch ---
diff -dur xemacs-21.5.29.ORIG/lib-src/ChangeLog xemacs-21.5.29/lib-src/ChangeLog
--- xemacs-21.5.29.ORIG/lib-src/ChangeLog	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lib-src/ChangeLog	2009-12-08 10:09:57.753594714 -0700
@@ -1,3 +1,8 @@
+2009-12-08  Sjoerd Mullender  <sjoerd at acm.org>
+
+	* etags.c (absolute_filename): Use memmove instead of strcpy to move
+	characters within a string.
+
 2009-05-18  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* XEmacs 21.5.29 "garbanzo" is released.
diff -dur xemacs-21.5.29.ORIG/lib-src/etags.c xemacs-21.5.29/lib-src/etags.c
--- xemacs-21.5.29.ORIG/lib-src/etags.c	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lib-src/etags.c	2009-12-08 10:09:09.100592092 -0700
@@ -6829,13 +6829,13 @@
 	      else if (cp[0] != '/')
 		cp = slashp;
 #endif
-	      strcpy (cp, slashp + 3);
+	      memmove (cp, slashp + 3, strlen (slashp + 3) + 1);
 	      slashp = cp;
 	      continue;
 	    }
 	  else if (slashp[2] == '/' || slashp[2] == '\0')
 	    {
-	      strcpy (slashp, slashp + 2);
+	      memmove (slashp, slashp + 2, strlen (slashp + 2) + 1);
 	      continue;
 	    }
 	}


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- xemacs.spec	9 Nov 2009 16:50:46 -0000	1.57
+++ xemacs.spec	8 Dec 2009 17:17:38 -0000	1.58
@@ -22,7 +22,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        8%{?snap:.%{snap}}%{?dist}
+Release:        9%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -54,6 +54,8 @@ Patch8:         %{name}-21.5.28-courier-
 Patch9:         %{name}-21.5.29-destdir.patch
 # Sent upstream 2009-10-28
 Patch10:        %{name}-21.5.29-tty-font-512623.patch
+# Sent upstream 2009-12-08
+Patch11:        %{name}-21.5.29-etags-memmove-545399.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -226,6 +228,7 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -589,6 +592,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
+- Add patch to use memmove in etags (bz 545399).
+
 * Mon Nov  9 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-8
 - Move macros.xemacs to the -common subpackage (bz 533611).
 - Updated TTY font patch from upstream.



From thias at fedoraproject.org  Tue Dec  8 17:25:41 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 17:25:41 +0000 (UTC)
Subject: rpms/cdparanoia/devel cdparanoia.spec,1.40,1.41
Message-ID: <20091208172541.7ECDB11C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/cdparanoia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18888

Modified Files:
	cdparanoia.spec 
Log Message:
Include remaining obvious and unavoidable cleanups from #225638.



Index: cdparanoia.spec
===================================================================
RCS file: /cvs/extras/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- cdparanoia.spec	24 Jul 2009 18:45:07 -0000	1.40
+++ cdparanoia.spec	8 Dec 2009 17:25:41 -0000	1.41
@@ -1,7 +1,7 @@
-Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
+Summary: Compact Disc Digital Audio (CDDA) extraction tool (or ripper)
 Name: cdparanoia
 Version: 10.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 # the app is GPLv2, everything else is LGPLv2
 License: GPLv2 and LGPLv2
 Group: Applications/Multimedia
@@ -15,7 +15,7 @@ Patch0: cdparanoia-10.2-#463009.patch
 Patch1: cdparanoia-10.2-endian.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: cdparanoia-libs = %{version}-%{release}
-Obsoletes: cdparanoia-III
+Obsoletes: cdparanoia-III <= alpha9.8
 
 %description 
 Cdparanoia (Paranoia III) reads digital audio directly from a CD, then
@@ -28,9 +28,10 @@ atomic reads.  Cdparanoia is also good a
 damaged CDs.
 
 %package devel
-Summary: Development tools for libcdda_paranoia (Paranoia III).
+Summary: Development tools for libcdda_paranoia (Paranoia III)
 Group: Development/Libraries
 Requires: cdparanoia-libs = %{version}-%{release}
+Provides: cdparanoia-static = %{version}-%{release}
 License: LGPLv2
 
 %description devel
@@ -38,7 +39,7 @@ The cdparanoia-devel package contains th
 files needed for developing applications to read CD Digital Audio disks.
 
 %package libs
-Summary: Libraries for libcdda_paranoia (Paranoia III).
+Summary: Libraries for libcdda_paranoia (Paranoia III)
 Group: Development/Libraries
 License: LGPLv2
 
@@ -52,7 +53,6 @@ applications which read CD Digital Audio
 %patch1 -p1 -b .endian
 
 %build
-rm -rf $RPM_BUILD_ROOT
 export OPT="${CFLAGS:-%optflags} -O0 -Wno-pointer-sign -Wno-unused -Werror-implicit-function-declaration"
 %configure --includedir=%{_includedir}/cdda
 make OPT="$OPT"
@@ -81,33 +81,43 @@ ln -s libcdda_paranoia.so.0.10.? libcdda
 ln -s libcdda_interface.so.0.10.? libcdda_interface.so
 popd
 
-%post -n cdparanoia-libs
-/sbin/ldconfig
+%post -n cdparanoia-libs -p /sbin/ldconfig
 
-%postun -n cdparanoia-libs
-if [ "$1" -ge "1" ]; then
-  /sbin/ldconfig
-fi
+%postun -n cdparanoia-libs -p /sbin/ldconfig
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" ] && rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README
+%doc COPYING* README
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %files libs
 %defattr(-,root,root)
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/cdda
 %{_libdir}/*.a
+%{_libdir}/*.so
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 10.2-6
+- Fix all of the problems detected during the review which aren't acceptable
+  according to the current policies and guidelines (part of #225638).
+- Don't prefix summaries with "A" nor suffix them with a dot.
+- Move .so symlink to the devel sub-package (#203620).
+- Add highest known version to the cdparanoia-III obsoletes.
+- Remove incorrect buildroot removal from %%build.
+- Use acceptable %%clean section.
+- Provide cdparanoia-static in the devel sub-package since the *.a is there.
+- Use single-command scriplet syntax for /sbin/ldconfig calls.
+- Escape all macros in changelog.
+- Include license file since it is present with the sources.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -199,7 +209,7 @@ fi
 - rebuilt
 
 * Tue Feb 17 2004 Peter Jones <pjones at redhat.com> alpha9.8-20
-- take ownership of %{_includedir}/cdda
+- take ownership of %%{_includedir}/cdda
 
 * Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
@@ -240,7 +250,7 @@ fi
 - fix broken Obsoletes of cdparanoia-devel
 
 * Thu Dec  6 2001 Peter Jones <pjones at redhat.com> alpha9.8-6
-- move includes to %{_includedir}/cdda/
+- move includes to %%{_includedir}/cdda/
 - add utils.h to %%install
 - clean up %%install some.
 
@@ -253,7 +263,7 @@ fi
 - reverse devel dependency
 
 * Wed Aug  1 2001 Peter Jones <pjones at redhat.com>
-- fix %post and %postun to only run ldconfig for devel packages
+- fix %%post and %%postun to only run ldconfig for devel packages
 
 * Wed Jul 18 2001 Crutcher Dunnavant <crutcher at redhat.com>
 - devel now depends on package



From wtogami at fedoraproject.org  Tue Dec  8 17:29:39 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue,  8 Dec 2009 17:29:39 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.104,1.105
Message-ID: <20091208172939.34A2711C00C5@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20695

Modified Files:
	pidgin.spec 
Log Message:
temporarily disable evolution integration in F13 until it is fixed



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- pidgin.spec	7 Dec 2009 03:06:47 -0000	1.104
+++ pidgin.spec	8 Dec 2009 17:29:38 -0000	1.105
@@ -37,6 +37,7 @@
 %define vv_support		0
 %define libidn_support		0
 %define disable_silc		0
+%define disable_evolution       0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -89,10 +90,15 @@
 %if 0%{?rhel} == 6
 %define disable_silc	1
 %endif
+# F13+: Temporarily disable evolution integration until it becomes fixed
+# http://developer.pidgin.im/ticket/10852
+%if 0%{?fedora} >= 13
+%define disable_evolution 1
+%endif
 
 Name:		pidgin
 Version:	2.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -170,7 +176,9 @@ BuildRequires:	krb5-devel
 # gtkspell integration (FC1+)
 BuildRequires:	gtkspell-devel
 # Evolution integration (FC3+)
+%if ! %{disable_evolution}
 BuildRequires:	evolution-data-server-devel
+%endif
 # SILC integration (FC3+)
 %if ! %{disable_silc}
 BuildRequires:	libsilc-devel
@@ -403,7 +411,11 @@ SWITCHES="--with-extraversion=%{release}
 	SWITCHES="$SWITCHES --with-krb4"
 %endif
 	SWITCHES="$SWITCHES --enable-perl"
+%if ! %{disable_evolution}
 	SWITCHES="$SWITCHES --enable-gevolution"
+%else
+	SWITCHES="$SWITCHES --disable-gevolution"
+%endif
 %if %{dbus_integration}
 	SWITCHES="$SWITCHES --enable-dbus"
 %else
@@ -631,6 +643,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Dec  8 2009 Warren Togami <wtogami at redhat.com> - 2.6.4-4
+- temporarily disable evolution integration in F13 until it is fixed
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.6.4-3
 - rebuild against perl 5.10.1
 



From bpepple at fedoraproject.org  Tue Dec  8 17:39:34 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  8 Dec 2009 17:39:34 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-12 telepathy-gabble.spec, 1.71,
	1.72 proxy.patch, 1.1, NONE
Message-ID: <20091208173934.AA41D11C00C5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24615

Modified Files:
	telepathy-gabble.spec 
Removed Files:
	proxy.patch 
Log Message:
* Mon Dec  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-1
- Update to 0.8.9.
- Drop proxy patch.  Fixed upstream.



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/telepathy-gabble.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- telepathy-gabble.spec	26 Nov 2009 18:23:45 -0000	1.71
+++ telepathy-gabble.spec	8 Dec 2009 17:39:34 -0000	1.72
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
-Version:        0.8.8
-Release:        2%{?dist}
+Version:        0.8.9
+Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -8,7 +8,6 @@ Group:          Applications/Communicati
 License:        LGPLv2+ and (BSD)
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0:		proxy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -31,7 +30,6 @@ chats and voice calls.
 
 %prep
 %setup -q
-%patch0 -p1 -b .proxy
 
 
 %build
@@ -61,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-1
+- Update to 0.8.9.
+- Drop proxy patch.  Fixed upstream.
+
 * Thu Nov 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.8-2
 - Add patch to only query SOCK5 proxies when needed.
 


--- proxy.patch DELETED ---



From sailer at fedoraproject.org  Tue Dec  8 17:43:26 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue,  8 Dec 2009 17:43:26 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/F-12 mingw32-glibmm24.spec,1.10,1.11
Message-ID: <20091208174326.6A64711C00C5@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25863

Modified Files:
	mingw32-glibmm24.spec 
Log Message:
fix for rhbz #527494



Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/F-12/mingw32-glibmm24.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-glibmm24.spec	27 Sep 2009 16:31:24 -0000	1.10
+++ mingw32-glibmm24.spec	8 Dec 2009 17:43:26 -0000	1.11
@@ -7,13 +7,13 @@
 
 Name:           mingw32-glibmm24
 Version:        2.22.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.20/glibmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.22/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -56,6 +56,11 @@ rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/
 rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp
 rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/glibmm-2.4/doctool/
 
+# hack: desktopappinfo is not available on win32
+sed -i -e "s,#include <giomm/desktopappinfo.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/giomm-2.4/giomm.h
+sed -i -e "s,#include <giomm/unixinputstream.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/giomm-2.4/giomm.h
+sed -i -e "s,#include <giomm/unixoutputstream.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/giomm-2.4/giomm.h
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -82,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.22.1-2
+- remove nonexisting (on windows) files from giomm.h header
+
 * Sun Sep 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.22.1-1
 - update to 2.22.1 to match native package
 



From sailer at fedoraproject.org  Tue Dec  8 17:47:13 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue,  8 Dec 2009 17:47:13 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/F-12 mingw32-glibmm24.spec,1.11,1.12
Message-ID: <20091208174713.B2A3811C00C5@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27431

Modified Files:
	mingw32-glibmm24.spec 
Log Message:
bump release



Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/F-12/mingw32-glibmm24.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-glibmm24.spec	8 Dec 2009 17:43:26 -0000	1.11
+++ mingw32-glibmm24.spec	8 Dec 2009 17:47:13 -0000	1.12
@@ -7,7 +7,7 @@
 
 Name:           mingw32-glibmm24
 Version:        2.22.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
@@ -87,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Dec  8 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.22.1-2
+* Tue Dec  8 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.22.1-3
 - remove nonexisting (on windows) files from giomm.h header
 
 * Sun Sep 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.22.1-1



From limb at fedoraproject.org  Tue Dec  8 17:50:54 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 17:50:54 +0000 (UTC)
Subject: rpms/moodle/F-10 .cvsignore, 1.14, 1.15 moodle.spec, 1.43,
	1.44 sources, 1.20, 1.21
Message-ID: <20091208175054.5943F11C03DB@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28894

Modified Files:
	.cvsignore moodle.spec sources 
Log Message:
BZ 544766



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 Oct 2008 13:39:14 -0000	1.14
+++ .cvsignore	8 Dec 2009 17:50:54 -0000	1.15
@@ -72,8 +72,9 @@ tl_utf8.zip
 to_utf8.zip
 tr_utf8.zip
 uk_utf8.zip
+ur_utf8.zip
 uz_utf8.zip
 vi_utf8.zip
 zh_cn_utf8.zip
 zh_tw_utf8.zip
-moodle-1.9.3.tgz
+moodle-1.9.7.tgz


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- moodle.spec	21 Apr 2009 14:11:42 -0000	1.43
+++ moodle.spec	8 Dec 2009 17:50:54 -0000	1.44
@@ -7,8 +7,8 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.9.4
-Release:        7%{?dist}
+Version:        1.9.7
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -397,6 +397,18 @@ This package contains the files needed t
 %{moodlewebdir}/lang/de_du_utf8
 %{moodlewebdir}/install/lang/de_du_utf8
 
+%package        dv
+Summary:        Moodle language pack for Dhivehi
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    dv
+This package contains the files needed to display Moodle in Dhivehi.
+
+%files          dv
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/dv_utf8
+
 %package        el
 Summary:        Moodle language pack for Greek
 Group:          Applications/Publishing
@@ -1316,6 +1328,19 @@ This package contains the files needed t
 %{moodlewebdir}/install/lang/uk_utf8
 #%{moodlewebdir}/lib/adodb/lang/adodb-uk1251.inc.php
 
+%package        ur
+Summary:        Moodle language pack for Urdu
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    ur
+This package contains the files needed to display Moodle in Urdu.
+
+%files          ur
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/ur_utf8
+
+
 %package        uz
 Summary:        Moodle language pack for Uzbek
 Group:          Applications/Publishing
@@ -1694,6 +1719,10 @@ fi
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.7-1
+- Update to 1.9.7, BZ 544766.
+
+
 * Fri Apr 03 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-7
 - Move symlink scripts from pre to pretrans.
 - Corrented moodle-cron BZ 494090.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	11 Feb 2009 20:49:20 -0000	1.20
+++ sources	8 Dec 2009 17:50:54 -0000	1.21
@@ -1,4 +1,3 @@
-feed7be7f40292d2fe294150f2ab0afa  moodle-1.9.4.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip
@@ -73,7 +72,9 @@ c700dd1a55a3b8991430ac3f45a46f86  ta_lk_
 6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
+ba2222207b4fcae3ecd911508e915568  ur_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip
 31089008a31db97c283b0911ef9eae91  vi_utf8.zip
 c1c79d9af8ad9ff5feda7775d8178e23  zh_cn_utf8.zip
 8b2ba851407deb066d87bb4ac3204e25  zh_tw_utf8.zip
+6f0888279c5f86ccb7c578800cc3243a  moodle-1.9.7.tgz



From sgrubb at fedoraproject.org  Tue Dec  8 17:52:01 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue,  8 Dec 2009 17:52:01 +0000 (UTC)
Subject: File audit-1.7.17.tar.gz uploaded to lookaside cache by sgrubb
Message-ID: <20091208175201.3BF0010F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for audit:

c1bd6f08f3ba71e8d9673e725e2414fe  audit-1.7.17.tar.gz



From sgrubb at fedoraproject.org  Tue Dec  8 17:54:46 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue,  8 Dec 2009 17:54:46 +0000 (UTC)
Subject: rpms/audit/F-11 .cvsignore, 1.103, 1.104 audit.spec, 1.214,
	1.215 sources, 1.128, 1.129
Message-ID: <20091208175446.73F1811C00C5@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30162

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Tue Dec 08 2009 Steve Grubb <sgrubb at redhat.com> 1.7.17-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	17 Oct 2009 17:02:12 -0000	1.103
+++ .cvsignore	8 Dec 2009 17:54:46 -0000	1.104
@@ -100,3 +100,4 @@ audit-1.7.11.tar.gz
 audit-1.7.12.tar.gz
 audit-1.7.14.tar.gz
 audit-1.7.16.tar.gz
+audit-1.7.17.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/audit.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- audit.spec	17 Oct 2009 17:02:12 -0000	1.214
+++ audit.spec	8 Dec 2009 17:54:46 -0000	1.215
@@ -1,7 +1,7 @@
-%define audit_version 1.7.16
+%define audit_version 1.7.17
 %define audit_release 1%{?dist}
 %define sca_version 0.4.10
-%define sca_release 2
+%define sca_release 3
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: User space tools for 2.6 kernel auditing
@@ -259,6 +259,9 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Tue Dec 08 2009 Steve Grubb <sgrubb at redhat.com> 1.7.17-1
+- New upstream release
+
 * Sat Oct 17 2009 Steve Grubb <sgrubb at redhat.com> 1.7.16-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- sources	17 Oct 2009 17:02:13 -0000	1.128
+++ sources	8 Dec 2009 17:54:46 -0000	1.129
@@ -1 +1 @@
-e61c64df97baca30f437e06a5abbccf8  audit-1.7.16.tar.gz
+c1bd6f08f3ba71e8d9673e725e2414fe  audit-1.7.17.tar.gz



From limb at fedoraproject.org  Tue Dec  8 18:02:42 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 18:02:42 +0000 (UTC)
Subject: rpms/moodle/F-10 moodle.spec,1.44,1.45
Message-ID: <20091208180242.AE3CB11C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32717

Modified Files:
	moodle.spec 
Log Message:
Oops.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- moodle.spec	8 Dec 2009 17:50:54 -0000	1.44
+++ moodle.spec	8 Dec 2009 18:02:42 -0000	1.45
@@ -105,8 +105,8 @@ Source83:       http://download.moodle.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Patch0:		moodle-1.9.3-rce-texed.patch
-Patch1:		moodle-1.9.4-CVE-2009-1171-1.patch
-Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
+#Patch1:		moodle-1.9.4-CVE-2009-1171-1.patch
+#Patch2:		moodle-1.9.4-CVE-2009-1171-2.patch
 
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
@@ -1506,8 +1506,8 @@ sed -i 's/\r//' mod/wiki/ewiki/README
 sed -i 's/\r//' mod/wiki/ewiki/README.de
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
+#%patch1 -p0
+#%patch2 -p0
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex



From thias at fedoraproject.org  Tue Dec  8 18:07:21 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 18:07:21 +0000 (UTC)
Subject: File sshmenu-3.18.tar.gz uploaded to lookaside cache by thias
Message-ID: <20091208180721.DF46310F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sshmenu:

7e7f43135fd112be3c173ec8585d6b98  sshmenu-3.18.tar.gz



From olea at fedoraproject.org  Tue Dec  8 18:10:53 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  8 Dec 2009 18:10:53 +0000 (UTC)
Subject: File pidgin-facebookchat-source-1.64.tar.bz2 uploaded to lookaside
	cache by olea
Message-ID: <20091208181053.354A310F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for purple-facebookchat:

e757a02899dce56b45a4b253303bea4d  pidgin-facebookchat-source-1.64.tar.bz2



From olea at fedoraproject.org  Tue Dec  8 18:11:58 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  8 Dec 2009 18:11:58 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel .cvsignore, 1.13, 1.14 import.log,
	1.7, 1.8 purple-facebookchat.spec, 1.23, 1.24 sources, 1.15, 1.16
Message-ID: <20091208181158.C906111C00C5@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3431/devel

Modified Files:
	.cvsignore import.log purple-facebookchat.spec sources 
Log Message:
updating to 1.64




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	16 Nov 2009 16:50:02 -0000	1.13
+++ .cvsignore	8 Dec 2009 18:11:58 -0000	1.14
@@ -1 +1 @@
-pidgin-facebookchat-source-1.63.tar.bz2
+pidgin-facebookchat-source-1.64.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	16 Nov 2009 16:50:02 -0000	1.7
+++ import.log	8 Dec 2009 18:11:58 -0000	1.8
@@ -5,3 +5,4 @@ purple-facebookchat-1_60-1olea:HEAD:purp
 purple-facebookchat-1_61-1_olea:HEAD:purple-facebookchat-1.61-1.olea.src.rpm:1252754436
 purple-facebookchat-1_62-1_olea:HEAD:purple-facebookchat-1.62-1.olea.src.rpm:1257791140
 purple-facebookchat-1_63-1_olea:HEAD:purple-facebookchat-1.63-1.olea.src.rpm:1258390148
+purple-facebookchat-1_64-1_olea:HEAD:purple-facebookchat-1.64-1.olea.src.rpm:1260295858


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/purple-facebookchat.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- purple-facebookchat.spec	16 Nov 2009 16:50:02 -0000	1.23
+++ purple-facebookchat.spec	8 Dec 2009 18:11:58 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           purple-facebookchat
-Version:        1.63
+Version:        1.64
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Tue Dec 8 2009 Ismael Olea <ismael at olea.org> 1.64-1
+- updating to 1.64
+
 * Mon Nov 16 2009 Ismael Olea <ismael at olea.org> 1.63-1
 - updating to 1.63
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	16 Nov 2009 16:50:02 -0000	1.15
+++ sources	8 Dec 2009 18:11:58 -0000	1.16
@@ -1 +1 @@
-13a5f46cabb5e486d9730e8711d3942f  pidgin-facebookchat-source-1.63.tar.bz2
+e757a02899dce56b45a4b253303bea4d  pidgin-facebookchat-source-1.64.tar.bz2



From limb at fedoraproject.org  Tue Dec  8 18:12:00 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 18:12:00 +0000 (UTC)
Subject: rpms/moodle/F-10 moodle.spec,1.45,1.46
Message-ID: <20091208181200.BF6EA11C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3490

Modified Files:
	moodle.spec 
Log Message:
Dangit.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- moodle.spec	8 Dec 2009 18:02:42 -0000	1.45
+++ moodle.spec	8 Dec 2009 18:12:00 -0000	1.46
@@ -1586,7 +1586,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README*
+%doc README* COPYING.txt
 %dir %{_var}/www/moodle
 %dir %{moodlewebdir}
 %config(noreplace) %{moodlewebdir}/config.php
@@ -1711,6 +1711,7 @@ fi
 %exclude %{moodlewebdir}/lib/phpmailer/language/phpmailer.lang-r*
 %exclude %{moodlewebdir}/lib/phpmailer/language/phpmailer.lang-s*
 %exclude %{moodlewebdir}/lib/phpmailer/language/phpmailer.lang-t*
+%exclude %{moodlewebdir}/COPYING.txt
 %{moodlewebdir}/login
 %attr(-,apache,apache) %{moodledatadir}
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}



From olea at fedoraproject.org  Tue Dec  8 18:13:01 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  8 Dec 2009 18:13:01 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-12 .cvsignore, 1.13, 1.14 import.log, 1.7,
	1.8 purple-facebookchat.spec, 1.21, 1.22 sources, 1.15, 1.16
Message-ID: <20091208181301.B049E11C00C5@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4054/F-12

Modified Files:
	.cvsignore import.log purple-facebookchat.spec sources 
Log Message:
updating to 1.64


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	16 Nov 2009 16:52:58 -0000	1.13
+++ .cvsignore	8 Dec 2009 18:13:01 -0000	1.14
@@ -1 +1 @@
-pidgin-facebookchat-source-1.63.tar.bz2
+pidgin-facebookchat-source-1.64.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-12/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	16 Nov 2009 16:52:58 -0000	1.7
+++ import.log	8 Dec 2009 18:13:01 -0000	1.8
@@ -5,3 +5,4 @@ purple-facebookchat-1_60-1olea:HEAD:purp
 purple-facebookchat-1_61-1_olea:HEAD:purple-facebookchat-1.61-1.olea.src.rpm:1252754436
 purple-facebookchat-1_62-1_olea:F-12:purple-facebookchat-1.62-1.olea.src.rpm:1257791217
 purple-facebookchat-1_63-1_olea:F-12:purple-facebookchat-1.63-1.olea.src.rpm:1258390354
+purple-facebookchat-1_64-1_olea:F-12:purple-facebookchat-1.64-1.olea.src.rpm:1260295960


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-12/purple-facebookchat.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- purple-facebookchat.spec	16 Nov 2009 16:52:58 -0000	1.21
+++ purple-facebookchat.spec	8 Dec 2009 18:13:01 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           purple-facebookchat
-Version:        1.63
+Version:        1.64
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Tue Dec 8 2009 Ismael Olea <ismael at olea.org> 1.64-1
+- updating to 1.64
+
 * Mon Nov 16 2009 Ismael Olea <ismael at olea.org> 1.63-1
 - updating to 1.63
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	16 Nov 2009 16:52:58 -0000	1.15
+++ sources	8 Dec 2009 18:13:01 -0000	1.16
@@ -1 +1 @@
-13a5f46cabb5e486d9730e8711d3942f  pidgin-facebookchat-source-1.63.tar.bz2
+e757a02899dce56b45a4b253303bea4d  pidgin-facebookchat-source-1.64.tar.bz2



From lucilanga at fedoraproject.org  Tue Dec  8 18:14:25 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue,  8 Dec 2009 18:14:25 +0000 (UTC)
Subject: rpms/evolution-rss/F-12 evolution-rss-0.1.4-status-icon.patch, NONE,
	1.1 evolution-rss.spec, 1.44, 1.45
Message-ID: <20091208181425.DE93411C00C5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4616

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-status-icon.patch 
Log Message:
upstream patch to fix status icon crash

evolution-rss-0.1.4-status-icon.patch:
 parser.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE evolution-rss-0.1.4-status-icon.patch ---
diff -Naur evolution-rss-0.1.4/src/parser.c evolution-rss-0.1.4-mod/src/parser.c
--- evolution-rss-0.1.4/src/parser.c	2009-08-13 12:20:42.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/parser.c	2009-10-27 23:17:26.000000000 +0200
@@ -1065,7 +1065,7 @@
 		else
 			CF->full_path 	= g_strdup(chn_name);
 
-		subj = CF->subj;
+		subj = g_strdup(CF->subj);
 
 		while (gtk_events_pending())
                   gtk_main_iteration ();
@@ -1090,6 +1090,7 @@
 			farticle++;
 			d(g_print("put success()\n"));
 			update_status_icon(chn_name, subj);
+			g_free(subj);
 		} else
 			free_cf(CF);
         }


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- evolution-rss.spec	8 Dec 2009 07:57:08 -0000	1.44
+++ evolution-rss.spec	8 Dec 2009 18:14:25 -0000	1.45
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	11%{?dist}
+Release:	12%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -24,6 +24,7 @@ Patch4:		evolution-rss-0.1.4-sanitize-ic
 Patch5:		evolution-rss-0.1.4-empty-source.patch
 Patch6:		evolution-rss-0.1.4-reject-empty-url.patch
 Patch7:		evolution-rss-0.1.4-opml-fix.patch
+Patch8:		evolution-rss-0.1.4-status-icon.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -55,6 +56,7 @@ This is an evolution plugin which enable
 %patch5 -p1 -b .empty-source
 %patch6 -p1 -b .reject-empty-url
 %patch7 -p1 -b .opml-fix
+%patch8 -p1 -b .status-icon
 
 %build
 %configure --with-primary-render=gecko
@@ -108,6 +110,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Tue Dec 08 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-12
+- upstream patch to fix status icon crash
+
 * Tue Dec 08 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-11
 - fix for bug #542206
 



From olea at fedoraproject.org  Tue Dec  8 18:15:18 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  8 Dec 2009 18:15:18 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-11 .cvsignore, 1.12, 1.13 import.log, 1.6,
	1.7 purple-facebookchat.spec, 1.23, 1.24 sources, 1.14, 1.15
Message-ID: <20091208181518.077A711C00C5@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5034/F-11

Modified Files:
	.cvsignore import.log purple-facebookchat.spec sources 
Log Message:
updating to 1.64


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Nov 2009 18:33:11 -0000	1.12
+++ .cvsignore	8 Dec 2009 18:15:17 -0000	1.13
@@ -1 +1 @@
-pidgin-facebookchat-source-1.62.tar.bz2
+pidgin-facebookchat-source-1.64.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	9 Nov 2009 18:33:11 -0000	1.6
+++ import.log	8 Dec 2009 18:15:17 -0000	1.7
@@ -4,3 +4,4 @@ purple-facebookchat-1_52-1olea:F-11:purp
 purple-facebookchat-1_60-1olea:F-11:purple-facebookchat-1.60-1olea.src.rpm:1248395849
 purple-facebookchat-1_61-1_olea:F-11:purple-facebookchat-1.61-1.olea.src.rpm:1252754707
 purple-facebookchat-1_62-1_olea:F-11:purple-facebookchat-1.62-1.olea.src.rpm:1257791533
+purple-facebookchat-1_64-1_olea:F-11:purple-facebookchat-1.64-1.olea.src.rpm:1260296096


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/purple-facebookchat.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- purple-facebookchat.spec	9 Nov 2009 18:33:11 -0000	1.23
+++ purple-facebookchat.spec	8 Dec 2009 18:15:17 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           purple-facebookchat
-Version:        1.62
+Version:        1.64
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
@@ -11,6 +11,7 @@ Provides:       pidgin-facebookchat = %{
 Obsoletes:      pidgin-facebookchat < 1.35-3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libpurple-devel >= 2.5.8
+
 BuildRequires:  json-glib-devel
 #BuildRequires:  zlib-devel
 ExcludeArch:    s390x
@@ -51,6 +52,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Tue Dec 8 2009 Ismael Olea <ismael at olea.org> 1.64-1
+- updating to 1.64
+
+* Mon Nov 16 2009 Ismael Olea <ismael at olea.org> 1.63-1
+- updating to 1.63
+
 * Fri Nov 6 2009 Ismael Olea <ismael at olea.org> 1.62-1
 - updating to 1.62
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Nov 2009 18:33:11 -0000	1.14
+++ sources	8 Dec 2009 18:15:17 -0000	1.15
@@ -1 +1 @@
-ec22b1260cb64de657b74861c53dca65  pidgin-facebookchat-source-1.62.tar.bz2
+e757a02899dce56b45a4b253303bea4d  pidgin-facebookchat-source-1.64.tar.bz2



From bpepple at fedoraproject.org  Tue Dec  8 18:18:46 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  8 Dec 2009 18:18:46 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-12 .cvsignore,1.58,1.59 sources,1.58,1.59
Message-ID: <20091208181846.A757211C00C5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6572

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Dec  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-1
- Update to 0.8.9.
- Drop proxy patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	9 Nov 2009 19:34:13 -0000	1.58
+++ .cvsignore	8 Dec 2009 18:18:45 -0000	1.59
@@ -1 +1 @@
-telepathy-gabble-0.8.8.tar.gz
+telepathy-gabble-0.8.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	9 Nov 2009 19:34:13 -0000	1.58
+++ sources	8 Dec 2009 18:18:45 -0000	1.59
@@ -1 +1 @@
-1661fe3412552a30dc561e3094df545b  telepathy-gabble-0.8.8.tar.gz
+ddf89b1eea2f418a68b1013427eb0cb1  telepathy-gabble-0.8.9.tar.gz



From jmoskovc at fedoraproject.org  Tue Dec  8 18:20:08 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue,  8 Dec 2009 18:20:08 +0000 (UTC)
Subject: File abrt-1.0.1.tar.gz uploaded to lookaside cache by jmoskovc
Message-ID: <20091208182008.E64AD10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for abrt:

85b4fb411f8d969afd02cb998d527235  abrt-1.0.1.tar.gz



From jmoskovc at fedoraproject.org  Tue Dec  8 18:20:42 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue,  8 Dec 2009 18:20:42 +0000 (UTC)
Subject: rpms/abrt/F-12 .cvsignore, 1.14, 1.15 abrt.spec, 1.20, 1.21 sources,
	1.15, 1.16
Message-ID: <20091208182042.175D811C03DB@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7307

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	22 Nov 2009 20:28:21 -0000	1.14
+++ .cvsignore	8 Dec 2009 18:20:41 -0000	1.15
@@ -1 +1 @@
-abrt-1.0.0.tar.gz
+abrt-1.0.1.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/abrt.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- abrt.spec	22 Nov 2009 20:28:21 -0000	1.20
+++ abrt.spec	8 Dec 2009 18:20:41 -0000	1.21
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 1.0.0
+Version: 1.0.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -26,9 +26,11 @@ BuildRequires: nss-devel
 BuildRequires: polkit-devel
 BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel
 BuildRequires: intltool
+BuildRequires: bison
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{name}-libs = %{version}-%{release}
-Requires(pre): /usr/sbin/groupadd 
+Requires(pre): shadow-utils
+Obsoletes: abrt-plugin-sqlite3
 
 %description
 %{name} is a tool to help users to detect defects in applications and
@@ -56,15 +58,12 @@ Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-python, pygtk2, pygtk2-libglade,
 Requires: gnome-python2-gnomevfs, gnome-python2-gnomekeyring
-# only if gtk2 version < 2.17
+# only if gtk2 version < 2.17:
 #Requires: python-sexy
+# we used to have abrt-applet, now abrt-gui includes it:
 Provides: abrt-applet = %{version}-%{release}
 Obsoletes: abrt-applet < 0.0.5
 Conflicts: abrt-applet < 0.0.5
-Obsoletes: bug-buddy
-Provides: bug-buddy
-#FIXME: upgrade workaround
-Requires: abrt-desktop
 
 %description gui
 GTK+ wizard for convenient bug reporting.
@@ -95,32 +94,16 @@ analyzer plugin.
 %package addon-kerneloops
 Summary: %{name}'s kerneloops addon
 Group: System Environment/Libraries
-Requires: %{name}-plugin-kerneloopsreporter = %{version}-%{release}
+Requires: curl
 Requires: %{name} = %{version}-%{release}
 Obsoletes: kerneloops
 Obsoletes: abrt-plugin-kerneloops
+Obsoletes: abrt-plugin-kerneloopsreporter
 
 %description addon-kerneloops
-This package contains plugins for kernel crashes information collecting.
-
-%package plugin-kerneloopsreporter
-Summary: %{name}'s kerneloops reporter plugin
-Group: System Environment/Libraries
-Requires: curl
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-kerneloopsreporter
-This package contains reporter plugin, that sends, collected by %{name}'s kerneloops
-addon, information about kernel crashes to specified server, e.g. kerneloops.org.
-
-%package plugin-sqlite3
-Summary: %{name}'s SQLite3 database plugin
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-sqlite3
-This package contains SQLite3 database plugin. It is used for storing the data
-required for creating a bug report.
+This package contains plugin for collecting kernel crash information
+and reporter plugin which sends this information to specified server,
+usually to kerneloops.org.
 
 %package plugin-logger
 Summary: %{name}'s logger reporter plugin
@@ -128,7 +111,7 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description plugin-logger
-The simple reporter plugin, which writes a report to a specified file.
+The simple reporter plugin which writes a report to a specified file.
 
 %package plugin-mailx
 Summary: %{name}'s mailx reporter plugin
@@ -137,8 +120,8 @@ Requires: %{name} = %{version}-%{release
 Requires: mailx
 
 %description plugin-mailx
-The simple reporter plugin, which sends a report via mailx to a specified
-email.
+The simple reporter plugin which sends a report via mailx to a specified
+email address.
 
 %package plugin-runapp
 Summary: %{name}'s runapp plugin
@@ -210,13 +193,19 @@ the sockets.
 %package desktop
 Summary: Virtual package to install all necessary packages for usage from desktop environment
 Group: User Interface/Desktops
+# This package gets installed when anything requests bug-buddy -
+# happens when users upgrade Fn to Fn+1;
+# or if user just wants "typical desktop installation".
+# Installing abrt-desktop should result in the abrt which works without
+# any tweaking in abrt.conf (IOW: all plugins mentioned there must be installed)
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla, %{name}-plugin-logger
-#workaround for broken upgrade, remove!
-#Requires: %{name}-gui
 Requires: %{name}-addon-kerneloops
 Requires: %{name}-addon-ccpp, %{name}-addon-python
+Requires: %{name}-gui
+Requires: %{name}-plugin-bugzilla, %{name}-plugin-logger, %{name}-plugin-runapp
 #Requires: %{name}-plugin-firefox
+Obsoletes: bug-buddy
+Provides: bug-buddy
 
 %description desktop
 Virtual package to make easy default instalation on desktop environments.
@@ -259,7 +248,8 @@ desktop-file-install \
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -f --system abrt
+getent group abrt >/dev/null || groupadd -f --system abrt
+exit 0
 
 %post
 /sbin/chkconfig --add %{name}d
@@ -284,21 +274,24 @@ fi
 %doc README COPYING
 %{_sbindir}/%{name}d
 %{_bindir}/%{name}-debuginfo-install
+%{_bindir}/%{name}-backtrace
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf
 %{_initrddir}/%{name}d
-%dir %attr(0775, root, abrt) /var/cache/%{name}
-%dir /var/cache/%{name}-di
+%dir %attr(0775, root, abrt) %{_localstatedir}/cache/%{name}
 %dir /var/run/%{name}
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
 %dir %{_libdir}/%{name}
 %{_mandir}/man8/abrtd.8.gz
 %{_mandir}/man5/%{name}.conf.5.gz
-%{_mandir}/man5/pyhook.conf.5.gz
+#%{_mandir}/man5/pyhook.conf.5.gz
 %{_mandir}/man7/%{name}-plugins.7.gz
 %{_datadir}/polkit-1/actions/org.fedoraproject.abrt.policy
 %{_datadir}/dbus-1/system-services/com.redhat.abrt.service
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/SQLite3.conf
+%{_libdir}/%{name}/libSQLite3.so*
+%{_mandir}/man7/%{name}-SQLite3.7.gz
 
 %files libs
 %defattr(-,root,root,-)
@@ -321,8 +314,9 @@ fi
 %files addon-ccpp
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf
+%dir %{_localstatedir}/cache/%{name}-di
 %{_libdir}/%{name}/libCCpp.so*
-%{_libexecdir}/hookCCpp
+%{_libexecdir}/abrt-hook-ccpp
 
 #%files plugin-firefox
 #%{_libdir}/%{name}/libFirefox.so*
@@ -330,25 +324,14 @@ fi
 %files addon-kerneloops
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsScanner.conf
 %{_bindir}/dumpoops
 %{_libdir}/%{name}/libKerneloops.so*
 %{_libdir}/%{name}/libKerneloopsScanner.so*
 %{_mandir}/man7/%{name}-KerneloopsScanner.7.gz
-
-%files plugin-kerneloopsreporter
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsReporter.conf
 %{_libdir}/%{name}/libKerneloopsReporter.so*
 %{_libdir}/%{name}/KerneloopsReporter.GTKBuilder
 %{_mandir}/man7/%{name}-KerneloopsReporter.7.gz
 
-%files plugin-sqlite3
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/SQLite3.conf
-%{_libdir}/%{name}/libSQLite3.so*
-%{_mandir}/man7/%{name}-SQLite3.7.gz
-
 %files plugin-logger
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf
@@ -402,8 +385,6 @@ fi
 %files addon-python
 %defattr(-,root,root,-)
 %attr(2755, root, abrt) %{_bindir}/%{name}-pyhook-helper
-%config(noreplace) %{_sysconfdir}/%{name}/pyhook.conf
-#%{python_sitearch}/ABRTUtils.so
 %{_libdir}/%{name}/libPython.so*
 %{python_site}/*.py*
 
@@ -417,6 +398,31 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Dec  8 2009  Jiri Moskovcak <jmoskovc at redhat.com> 1.0.1-1
+- PyHook: better logic for checking if abrtd is running rhbz#539987 (jmoskovc at redhat.com)
+- re-enabled gpg sign checking (jmoskovc at redhat.com)
+- PyHook: use repr() for displaying variables rhbz#545070 (jmoskovc at redhat.com)
+- kerneloops: fix the linux kernel version identification (aarapov at redhat.com)
+- gui review (rrakus at redhat.com)
+- when we trim the dir, we must delete it from DB too rhbz#541854 (vda.linux at googlemail.com)
+- improved dupe checking (kklic at redhat.com)
+- GUI: handle cases when gui fails to start daemon on demand rhbz#543725 (jmoskovc at redhat.com)
+- Add abrt group only if it is missing; fixes rhbz#543250 (kklic at redhat.com)
+- GUI: more string fixes rhbz#543266 (jmoskovc at redhat.com)
+- abrt.spec: straighten out relations between abrt-desktop and abrt-gui (vda.linux at googlemail.com)
+- refuse to start if some required plugins are missing rhbz#518422 (vda.linux at googlemail.com)
+- GUI: survive gnome-keyring access denial rhbz#543200 (jmoskovc at redhat.com)
+- typo fixes rhbz#543266 (jmoskovc at redhat.com)
+- abrt-debuginfo-install: better fix for incorrect passing double quotes (vda.linux at googlemail.com)
+- APPLET: stop animation when it's not needed rhbz#542157 (jmoskovc at redhat.com)
+- ccpp hook: reanme it, and add "crash storm protection" (see rhbz#542003) (vda.linux at googlemail.com)
+- Hooks/CCpp.cpp: add MakeCompatCore = yes/no directive. Fixes rhbz#541707 (vda.linux at googlemail.com)
+- SPEC: removed sqlite3 package, fixed some update problems (jmoskovc at redhat.com)
+- Kerneloops are reported automaticky now when AutoReportUIDs = root is in Kerneloops.conf (npajkovs at redhat.com)
+- remove word 'detected' from description rhbz#541459 (vda.linux at googlemail.com)
+- src/Hooks/CCpp.cpp: do save abrtd's own coredumps, but carefully... (vda.linux at googlemail.com)
+- CCpp.cpp: quote parameters if needed rhbz#540164 (vda.linux at googlemail.com)
+
 * Fri Nov 20 2009  Jiri Moskovcak <jmoskovc at redhat.com> 1.0.0-1
 - new version
 - comment input wraps words rhbz#531276


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Nov 2009 20:28:21 -0000	1.15
+++ sources	8 Dec 2009 18:20:41 -0000	1.16
@@ -1 +1 @@
-62a8a6a1d7712472133b97b38469683e  abrt-1.0.0.tar.gz
+85b4fb411f8d969afd02cb998d527235  abrt-1.0.1.tar.gz



From bpepple at fedoraproject.org  Tue Dec  8 18:21:11 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  8 Dec 2009 18:21:11 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-12 telepathy-gabble.spec,1.72,1.73
Message-ID: <20091208182111.909FE11C00C5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7553

Modified Files:
	telepathy-gabble.spec 
Log Message:
* Tue Dec  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-2
- Rebuild.



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/telepathy-gabble.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- telepathy-gabble.spec	8 Dec 2009 17:39:34 -0000	1.72
+++ telepathy-gabble.spec	8 Dec 2009 18:21:11 -0000	1.73
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.8.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-2
+- Rebuild.
+
 * Mon Dec  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-1
 - Update to 0.8.9.
 - Drop proxy patch.  Fixed upstream.



From thias at fedoraproject.org  Tue Dec  8 18:23:05 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 18:23:05 +0000 (UTC)
Subject: rpms/sshmenu/devel sshmenu-3.18-libexec.patch, NONE,
	1.1 sshmenu-3.18-sitelib.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 sshmenu.spec, 1.4,
	1.5 sshmenu-3.15-libexec.patch, 1.1,
	NONE sshmenu-3.15-sitelib.patch, 1.1, NONE
Message-ID: <20091208182305.52FA511C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sshmenu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8226

Modified Files:
	.cvsignore sources sshmenu.spec 
Added Files:
	sshmenu-3.18-libexec.patch sshmenu-3.18-sitelib.patch 
Removed Files:
	sshmenu-3.15-libexec.patch sshmenu-3.15-sitelib.patch 
Log Message:
Update to 3.18.


sshmenu-3.18-libexec.patch:
 Makefile              |    5 +++--
 sshmenu-applet.server |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE sshmenu-3.18-libexec.patch ---
diff -Naupr sshmenu-3.18.orig/Makefile sshmenu-3.18/Makefile
--- sshmenu-3.18.orig/Makefile	2009-08-24 10:25:06.000000000 +0200
+++ sshmenu-3.18/Makefile	2009-12-08 19:09:46.431319694 +0100
@@ -1,5 +1,6 @@
 BIN   = $(DESTDIR)/usr/bin
 LIB   = $(DESTDIR)/usr/lib
+LIBEXEC = $(DESTDIR)/usr/libexec
 MAN   = $(DESTDIR)/usr/share/man
 SHARE = $(DESTDIR)/usr/share
 CFG   = $(DESTDIR)/etc
@@ -13,13 +14,13 @@ TEST:
 
 install:
 	install -d $(BIN) $(LIB)/ruby/1.8 $(LIB)/bonobo/servers
-	install -d $(LIB)/gnome-panel $(SHARE)/icons/hicolor/48x48/apps
+	install -d $(LIBEXEC) $(SHARE)/icons/hicolor/48x48/apps
 	install -d $(MAN)/man1
 	install -d $(CFG)/bash_completion.d
 	install -m644 lib/sshmenu.rb $(LIB)/ruby/1.8/sshmenu.rb
 	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/1.8/gnome-sshmenu.rb
 	install -m644 sshmenu-applet.server $(LIB)/bonobo/servers/sshmenu-applet.server
-	install -m755 sshmenu-applet $(LIB)/gnome-panel/sshmenu-applet
+	install -m755 sshmenu-applet $(LIBEXEC)/sshmenu-applet
 	install -m644 sshmenu.1 $(MAN)/man1/sshmenu.1
 	install -m644 gnome-sshmenu-applet.png $(SHARE)/icons/hicolor/48x48/apps/gnome-sshmenu-applet.png
 	install -m755 bin/sshmenu $(BIN)/sshmenu
diff -Naupr sshmenu-3.18.orig/sshmenu-applet.server sshmenu-3.18/sshmenu-applet.server
--- sshmenu-3.18.orig/sshmenu-applet.server	2009-08-24 10:25:06.000000000 +0200
+++ sshmenu-3.18/sshmenu-applet.server	2009-12-08 19:08:54.797319571 +0100
@@ -1,6 +1,6 @@
 <oaf_info>
 <oaf_server iid="OAFIID:GNOME_SSHMenuApplet_Factory" type="exe"
-            location="/usr/lib/gnome-panel/sshmenu-applet">
+            location="/usr/libexec/sshmenu-applet">
 
         <oaf_attribute name="repo_ids" type="stringv">
                 <item value="IDL:Bonobo/GenericFactory:1.0"/>

sshmenu-3.18-sitelib.patch:
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sshmenu-3.18-sitelib.patch ---
diff -Naupr sshmenu-3.18.libexec/Makefile sshmenu-3.18/Makefile
--- sshmenu-3.18.libexec/Makefile	2009-12-08 19:09:46.431319694 +0100
+++ sshmenu-3.18/Makefile	2009-12-08 19:15:33.952319721 +0100
@@ -13,12 +13,12 @@ TEST:
 	RUBYLIB=lib ruby test/ts_all.rb test/tc*.rb
 
 install:
-	install -d $(BIN) $(LIB)/ruby/1.8 $(LIB)/bonobo/servers
+	install -d $(BIN) $(LIB)/ruby/site_ruby/1.8 $(LIB)/bonobo/servers
 	install -d $(LIBEXEC) $(SHARE)/icons/hicolor/48x48/apps
 	install -d $(MAN)/man1
 	install -d $(CFG)/bash_completion.d
-	install -m644 lib/sshmenu.rb $(LIB)/ruby/1.8/sshmenu.rb
-	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/1.8/gnome-sshmenu.rb
+	install -m644 lib/sshmenu.rb $(LIB)/ruby/site_ruby/1.8/sshmenu.rb
+	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/site_ruby/1.8/gnome-sshmenu.rb
 	install -m644 sshmenu-applet.server $(LIB)/bonobo/servers/sshmenu-applet.server
 	install -m755 sshmenu-applet $(LIBEXEC)/sshmenu-applet
 	install -m644 sshmenu.1 $(MAN)/man1/sshmenu.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 May 2009 15:11:03 -0000	1.3
+++ .cvsignore	8 Dec 2009 18:23:04 -0000	1.4
@@ -1 +1 @@
-sshmenu-3.16.tar.gz
+sshmenu-3.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 May 2009 15:11:03 -0000	1.3
+++ sources	8 Dec 2009 18:23:04 -0000	1.4
@@ -1 +1 @@
-34b9aebaf4dbf2eea7ab52bacac83c21  sshmenu-3.16.tar.gz
+7e7f43135fd112be3c173ec8585d6b98  sshmenu-3.18.tar.gz


Index: sshmenu.spec
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/devel/sshmenu.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sshmenu.spec	27 Jul 2009 04:47:25 -0000	1.4
+++ sshmenu.spec	8 Dec 2009 18:23:05 -0000	1.5
@@ -2,14 +2,14 @@
 
 Summary: Application to organize SSH connection information in a menu
 Name: sshmenu
-Version: 3.16
-Release: 2%{?dist}
+Version: 3.18
+Release: 1%{?dist}
 License: BSD
 Group: User Interface/Desktops
 URL: http://sshmenu.sourceforge.net/
 Source0: http://dl.sf.net/sshmenu/sshmenu-%{version}.tar.gz
-Patch0: sshmenu-3.15-libexec.patch
-Patch1: sshmenu-3.15-sitelib.patch
+Patch0: sshmenu-3.18-libexec.patch
+Patch1: sshmenu-3.18-sitelib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ruby
 Requires: openssh-askpass
@@ -56,13 +56,13 @@ keeps all your regular SSH connections w
 
 
 %post -n gnome-applet-sshmenu
-touch --no-create %{_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 -n gnome-applet-sshmenu
-touch --no-create %{_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
@@ -71,6 +71,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc Changes License.txt README
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/sshmenu
 %{ruby_sitelib}/sshmenu.rb
 %{_mandir}/man1/sshmenu.1*
@@ -84,6 +85,12 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.18-1
+- Update to 3.18.
+- Rebased both patches for the Makefile changes.
+- Fix scriplets by adding "|| :" for touch.
+- Include new bash_completion.d as-is since all packages seem to do it.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- sshmenu-3.15-libexec.patch DELETED ---


--- sshmenu-3.15-sitelib.patch DELETED ---



From mitr at fedoraproject.org  Tue Dec  8 18:25:30 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue,  8 Dec 2009 18:25:30 +0000 (UTC)
Subject: rpms/m2crypto/devel m2crypto.spec,1.60,1.61
Message-ID: <20091208182530.1EF6111C00C5@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9240

Modified Files:
	m2crypto.spec 
Log Message:
* Mon Dec  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-3
- Don't use '!# /usr/bin/env python'
  Resolves: #521887



Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- m2crypto.spec	15 Oct 2009 19:01:42 -0000	1.60
+++ m2crypto.spec	8 Dec 2009 18:25:29 -0000	1.61
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.20.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=2341
 Patch0: m2crypto-0.18-timeouts.patch
@@ -18,7 +18,7 @@ License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
 BuildRequires: openssl-devel, python-devel
-BuildRequires: perl, pkgconfig, swig
+BuildRequires: perl, pkgconfig, swig, which
 Requires: python
 
 %description
@@ -78,6 +78,9 @@ done
 rm demo/Zope/starts.bat
 # Fix up documentation permssions
 find demo tests -type f -perm -111 -print0 | xargs -0 chmod a-x
+python_path=$(which python)
+grep -rl '/usr/bin/env python' demo tests \
+	| xargs sed -i "s,/usr/bin/env python,${python_path},"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Mon Dec  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-3
+- Don't use '!# /usr/bin/env python'
+  Resolves: #521887
+
 * Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-2
 - Add a dist tag.
 



From mitr at fedoraproject.org  Tue Dec  8 18:32:19 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue,  8 Dec 2009 18:32:19 +0000 (UTC)
Subject: rpms/m2crypto/F-12 m2crypto.spec,1.59,1.60
Message-ID: <20091208183219.35D1411C00C5@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11541

Modified Files:
	m2crypto.spec 
Log Message:
* Mon Dec  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-3
- Don't use '!# /usr/bin/env python'
  Resolves: #521887



Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/F-12/m2crypto.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- m2crypto.spec	15 Oct 2009 19:07:43 -0000	1.59
+++ m2crypto.spec	8 Dec 2009 18:32:18 -0000	1.60
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.20.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=2341
 Patch0: m2crypto-0.18-timeouts.patch
@@ -18,7 +18,7 @@ License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
 BuildRequires: openssl-devel, python-devel
-BuildRequires: perl, pkgconfig, swig
+BuildRequires: perl, pkgconfig, swig, which
 Requires: python
 
 %description
@@ -78,6 +78,9 @@ done
 rm demo/Zope/starts.bat
 # Fix up documentation permssions
 find demo tests -type f -perm -111 -print0 | xargs -0 chmod a-x
+python_path=$(which python)
+grep -rl '/usr/bin/env python' demo tests \
+	| xargs sed -i "s,/usr/bin/env python,${python_path},"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Mon Dec  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-3
+- Don't use '!# /usr/bin/env python'
+  Resolves: #521887
+
 * Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-2
 - Add a dist tag.
 



From emaldonado at fedoraproject.org  Tue Dec  8 18:47:47 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  8 Dec 2009 18:47:47 +0000 (UTC)
Subject: rpms/nss/F-11 533125-ammend.patch, NONE, 1.1 .cvsignore, 1.26,
	1.27 sources, 1.27, 1.28 nss.spec, 1.77, 1.78
Message-ID: <20091208184747.86D0211C00C5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16583

Modified Files:
	.cvsignore sources nss.spec 
Added Files:
	533125-ammend.patch 
Log Message:
CVE-2009-3555 TLS: MITM attacks via session renegotiation

533125-ammend.patch:
 ssl3con.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE 533125-ammend.patch ---
Index: mozilla/security/nss/lib/ssl/ssl3con.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ssl/ssl3con.c,v
retrieving revision 1.121
diff -u -p -r1.121 ssl3con.c
--- mozilla/security/nss/lib/ssl/ssl3con.c	12 Nov 2009 05:08:27 -0000	1.121
+++ mozilla/security/nss/lib/ssl/ssl3con.c	20 Nov 2009 19:36:30 -0000
@@ -4004,6 +4004,7 @@ ssl3_HandleHelloRequest(sslSocket *ss)
 	PORT_SetError(SSL_ERROR_RX_UNEXPECTED_HELLO_REQUEST);
 	return SECFailure;
     }
+    /*
     if (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER) {
 	ssl_GetXmitBufLock(ss);
 	rv = SSL3_SendAlert(ss, alert_warning, no_renegotiation);
@@ -4011,6 +4012,7 @@ ssl3_HandleHelloRequest(sslSocket *ss)
 	PORT_SetError(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED);
 	return SECFailure;
     }
+    */
 
     if (sid) {
 	ss->sec.uncache(sid);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	7 Sep 2009 21:34:58 -0000	1.26
+++ .cvsignore	8 Dec 2009 18:47:47 -0000	1.27
@@ -1,2 +1,2 @@
-nss-3.12.4-stripped.tar.bz2
+nss-3.12.5-stripped.tar.bz2
 nss-pem-20090907.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	7 Sep 2009 21:34:58 -0000	1.27
+++ sources	8 Dec 2009 18:47:47 -0000	1.28
@@ -1,2 +1,2 @@
-954834f7b173bdab366a19880c671c39  nss-3.12.4-stripped.tar.bz2
+51c5958153b6c01fada2e74cedc66835  nss-3.12.5-stripped.tar.bz2
 895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/nss.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- nss.spec	17 Sep 2009 21:11:30 -0000	1.77
+++ nss.spec	8 Dec 2009 18:47:47 -0000	1.78
@@ -13,8 +13,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.12.4
-Release:          3%{?dist}
+Version:          3.12.5
+Release:          1%{?dist}.3
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -42,6 +42,7 @@ Source12:         %{name}-pem-20090907.t
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
+Patch7:           533125-ammend.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -110,7 +111,7 @@ low level services.
 
 %patch2 -p0
 %patch6 -p0 -b .libpem
-
+%patch7 -p0 -b .533125
 
 %build
 
@@ -471,6 +472,9 @@ done
 
 
 %changelog
+* Fri Dec 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1
+- Update to 3.12.5
+
 * Thu Sep 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
 - Add nssdbm3.so to nss-prelink.conf, rhbz#524075
 



From thias at fedoraproject.org  Tue Dec  8 18:50:30 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 18:50:30 +0000 (UTC)
Subject: rpms/sshmenu/devel sshmenu.spec,1.5,1.6
Message-ID: <20091208185030.AC29B11C03DB@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sshmenu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17517

Modified Files:
	sshmenu.spec 
Log Message:
Disable the gnome-applet-sshmenu sub-package on RHEL (#463022).



Index: sshmenu.spec
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/devel/sshmenu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sshmenu.spec	8 Dec 2009 18:23:05 -0000	1.5
+++ sshmenu.spec	8 Dec 2009 18:50:30 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: Application to organize SSH connection information in a menu
 Name: sshmenu
 Version: 3.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: User Interface/Desktops
 URL: http://sshmenu.sourceforge.net/
@@ -50,6 +50,15 @@ keeps all your regular SSH connections w
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+# On RHEL we are missing libs to get the gnome applet working (#463022)
+%if 0%{?rhel}
+%{__rm} -rf %{buildroot}%{_bindir}/sshmenu-gnome
+%{__rm} -rf %{buildroot}%{_prefix}/lib/bonobo/
+%{__rm} -rf %{buildroot}%{ruby_sitelib}/gnome-sshmenu.rb
+%{__rm} -rf %{buildroot}%{_libexecdir}/sshmenu-applet
+%{__rm} -rf %{buildroot}%{_datadir}/icons/
+%endif
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -76,15 +85,22 @@ fi
 %{ruby_sitelib}/sshmenu.rb
 %{_mandir}/man1/sshmenu.1*
 
+
+# On RHEL we are missing libs to get the gnome applet working (#463022)
+%if 0%{!?rhel:1}
 %files -n gnome-applet-sshmenu
 %{_bindir}/sshmenu-gnome
 %{_prefix}/lib/bonobo/servers/sshmenu-applet.server
 %{ruby_sitelib}/gnome-sshmenu.rb
 %{_libexecdir}/sshmenu-applet
 %{_datadir}/icons/hicolor/48x48/apps/gnome-sshmenu-applet.png
+%endif
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.18-2
+- Disable the gnome-applet-sshmenu sub-package on RHEL (#463022).
+
 * Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.18-1
 - Update to 3.18.
 - Rebased both patches for the Makefile changes.



From thias at fedoraproject.org  Tue Dec  8 18:53:15 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 18:53:15 +0000 (UTC)
Subject: rpms/sshmenu/EL-5 sshmenu-3.18-libexec.patch, NONE,
	1.1 sshmenu-3.18-sitelib.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 sshmenu.spec, 1.1,
	1.2 sshmenu-3.15-libexec.patch, 1.1,
	NONE sshmenu-3.15-sitelib.patch, 1.1, NONE
Message-ID: <20091208185315.5CE5311C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/sshmenu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18274

Modified Files:
	.cvsignore sources sshmenu.spec 
Added Files:
	sshmenu-3.18-libexec.patch sshmenu-3.18-sitelib.patch 
Removed Files:
	sshmenu-3.15-libexec.patch sshmenu-3.15-sitelib.patch 
Log Message:
Update to 3.18 and disable the gnome-applet-sshmenu sub-package.


sshmenu-3.18-libexec.patch:
 Makefile              |    5 +++--
 sshmenu-applet.server |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE sshmenu-3.18-libexec.patch ---
diff -Naupr sshmenu-3.18.orig/Makefile sshmenu-3.18/Makefile
--- sshmenu-3.18.orig/Makefile	2009-08-24 10:25:06.000000000 +0200
+++ sshmenu-3.18/Makefile	2009-12-08 19:09:46.431319694 +0100
@@ -1,5 +1,6 @@
 BIN   = $(DESTDIR)/usr/bin
 LIB   = $(DESTDIR)/usr/lib
+LIBEXEC = $(DESTDIR)/usr/libexec
 MAN   = $(DESTDIR)/usr/share/man
 SHARE = $(DESTDIR)/usr/share
 CFG   = $(DESTDIR)/etc
@@ -13,13 +14,13 @@ TEST:
 
 install:
 	install -d $(BIN) $(LIB)/ruby/1.8 $(LIB)/bonobo/servers
-	install -d $(LIB)/gnome-panel $(SHARE)/icons/hicolor/48x48/apps
+	install -d $(LIBEXEC) $(SHARE)/icons/hicolor/48x48/apps
 	install -d $(MAN)/man1
 	install -d $(CFG)/bash_completion.d
 	install -m644 lib/sshmenu.rb $(LIB)/ruby/1.8/sshmenu.rb
 	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/1.8/gnome-sshmenu.rb
 	install -m644 sshmenu-applet.server $(LIB)/bonobo/servers/sshmenu-applet.server
-	install -m755 sshmenu-applet $(LIB)/gnome-panel/sshmenu-applet
+	install -m755 sshmenu-applet $(LIBEXEC)/sshmenu-applet
 	install -m644 sshmenu.1 $(MAN)/man1/sshmenu.1
 	install -m644 gnome-sshmenu-applet.png $(SHARE)/icons/hicolor/48x48/apps/gnome-sshmenu-applet.png
 	install -m755 bin/sshmenu $(BIN)/sshmenu
diff -Naupr sshmenu-3.18.orig/sshmenu-applet.server sshmenu-3.18/sshmenu-applet.server
--- sshmenu-3.18.orig/sshmenu-applet.server	2009-08-24 10:25:06.000000000 +0200
+++ sshmenu-3.18/sshmenu-applet.server	2009-12-08 19:08:54.797319571 +0100
@@ -1,6 +1,6 @@
 <oaf_info>
 <oaf_server iid="OAFIID:GNOME_SSHMenuApplet_Factory" type="exe"
-            location="/usr/lib/gnome-panel/sshmenu-applet">
+            location="/usr/libexec/sshmenu-applet">
 
         <oaf_attribute name="repo_ids" type="stringv">
                 <item value="IDL:Bonobo/GenericFactory:1.0"/>

sshmenu-3.18-sitelib.patch:
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sshmenu-3.18-sitelib.patch ---
diff -Naupr sshmenu-3.18.libexec/Makefile sshmenu-3.18/Makefile
--- sshmenu-3.18.libexec/Makefile	2009-12-08 19:09:46.431319694 +0100
+++ sshmenu-3.18/Makefile	2009-12-08 19:15:33.952319721 +0100
@@ -13,12 +13,12 @@ TEST:
 	RUBYLIB=lib ruby test/ts_all.rb test/tc*.rb
 
 install:
-	install -d $(BIN) $(LIB)/ruby/1.8 $(LIB)/bonobo/servers
+	install -d $(BIN) $(LIB)/ruby/site_ruby/1.8 $(LIB)/bonobo/servers
 	install -d $(LIBEXEC) $(SHARE)/icons/hicolor/48x48/apps
 	install -d $(MAN)/man1
 	install -d $(CFG)/bash_completion.d
-	install -m644 lib/sshmenu.rb $(LIB)/ruby/1.8/sshmenu.rb
-	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/1.8/gnome-sshmenu.rb
+	install -m644 lib/sshmenu.rb $(LIB)/ruby/site_ruby/1.8/sshmenu.rb
+	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/site_ruby/1.8/gnome-sshmenu.rb
 	install -m644 sshmenu-applet.server $(LIB)/bonobo/servers/sshmenu-applet.server
 	install -m755 sshmenu-applet $(LIBEXEC)/sshmenu-applet
 	install -m644 sshmenu.1 $(MAN)/man1/sshmenu.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Feb 2008 22:53:23 -0000	1.2
+++ .cvsignore	8 Dec 2009 18:53:15 -0000	1.3
@@ -1 +1 @@
-sshmenu-3.15.tar.gz
+sshmenu-3.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Feb 2008 22:53:23 -0000	1.2
+++ sources	8 Dec 2009 18:53:15 -0000	1.3
@@ -1 +1 @@
-baab4a14015ed80deede648cada1f215  sshmenu-3.15.tar.gz
+7e7f43135fd112be3c173ec8585d6b98  sshmenu-3.18.tar.gz


Index: sshmenu.spec
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/EL-5/sshmenu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sshmenu.spec	3 Feb 2008 22:53:23 -0000	1.1
+++ sshmenu.spec	8 Dec 2009 18:53:15 -0000	1.2
@@ -2,14 +2,14 @@
 
 Summary: Application to organize SSH connection information in a menu
 Name: sshmenu
-Version: 3.15
-Release: 5%{?dist}
+Version: 3.18
+Release: 2%{?dist}
 License: BSD
 Group: User Interface/Desktops
 URL: http://sshmenu.sourceforge.net/
 Source0: http://dl.sf.net/sshmenu/sshmenu-%{version}.tar.gz
-Patch0: sshmenu-3.15-libexec.patch
-Patch1: sshmenu-3.15-sitelib.patch
+Patch0: sshmenu-3.18-libexec.patch
+Patch1: sshmenu-3.18-sitelib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ruby
 Requires: openssh-askpass
@@ -50,19 +50,28 @@ keeps all your regular SSH connections w
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+# On RHEL we are missing libs to get the gnome applet working (#463022)
+%if 0%{?rhel}
+%{__rm} -rf %{buildroot}%{_bindir}/sshmenu-gnome
+%{__rm} -rf %{buildroot}%{_prefix}/lib/bonobo/
+%{__rm} -rf %{buildroot}%{ruby_sitelib}/gnome-sshmenu.rb
+%{__rm} -rf %{buildroot}%{_libexecdir}/sshmenu-applet
+%{__rm} -rf %{buildroot}%{_datadir}/icons/
+%endif
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
 %post -n gnome-applet-sshmenu
-touch --no-create %{_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 -n gnome-applet-sshmenu
-touch --no-create %{_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
@@ -71,19 +80,42 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc Changes License.txt README
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/sshmenu
 %{ruby_sitelib}/sshmenu.rb
 %{_mandir}/man1/sshmenu.1*
 
+
+# On RHEL we are missing libs to get the gnome applet working (#463022)
+%if 0%{!?rhel:1}
 %files -n gnome-applet-sshmenu
 %{_bindir}/sshmenu-gnome
 %{_prefix}/lib/bonobo/servers/sshmenu-applet.server
 %{ruby_sitelib}/gnome-sshmenu.rb
 %{_libexecdir}/sshmenu-applet
 %{_datadir}/icons/hicolor/48x48/apps/gnome-sshmenu-applet.png
+%endif
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.18-2
+- Disable the gnome-applet-sshmenu sub-package on RHEL (#463022).
+
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.18-1
+- Update to 3.18.
+- Rebased both patches for the Makefile changes.
+- Fix scriplets by adding "|| :" for touch.
+- Include new bash_completion.d as-is since all packages seem to do it.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat May  9 2009 Matthias Saou <http://freshrpms.net/> 3.16-1
+- Update to 3.16.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jan 17 2008 Matthias Saou <http://freshrpms.net/> 3.15-5
 - Move gnome-sshmenu.rb to gnome-applet-sshmenu too.
 


--- sshmenu-3.15-libexec.patch DELETED ---


--- sshmenu-3.15-sitelib.patch DELETED ---



From cdamian at fedoraproject.org  Tue Dec  8 18:58:55 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Tue,  8 Dec 2009 18:58:55 +0000 (UTC)
Subject: File channel.xml uploaded to lookaside cache by cdamian
Message-ID: <20091208185855.DB78410F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-channel-symfony:

32ed74f4f81bc90c96577a8555c86b11  channel.xml



From dsd at fedoraproject.org  Tue Dec  8 19:00:04 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  8 Dec 2009 19:00:04 +0000 (UTC)
Subject: File PolicyKit-olpc-1.3.tar.gz uploaded to lookaside cache by dsd
Message-ID: <20091208190004.5A79210F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for PolicyKit-olpc:

71b37df0730014755fec2e0e8cf671a5  PolicyKit-olpc-1.3.tar.gz



From dsd at fedoraproject.org  Tue Dec  8 19:00:58 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue,  8 Dec 2009 19:00:58 +0000 (UTC)
Subject: rpms/PolicyKit-olpc/F-11 .cvsignore, 1.2, 1.3 PolicyKit-olpc.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091208190058.1785C11C02CA@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/PolicyKit-olpc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20640

Modified Files:
	.cvsignore PolicyKit-olpc.spec sources 
Log Message:
v1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-olpc/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Aug 2008 15:43:56 -0000	1.2
+++ .cvsignore	8 Dec 2009 19:00:57 -0000	1.3
@@ -1 +1 @@
-PolicyKit-olpc-1.2.tar.gz
+PolicyKit-olpc-1.3.tar.gz


Index: PolicyKit-olpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-olpc/F-11/PolicyKit-olpc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- PolicyKit-olpc.spec	23 Feb 2009 22:25:38 -0000	1.2
+++ PolicyKit-olpc.spec	8 Dec 2009 19:00:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           PolicyKit-olpc
-Version:        1.2
-Release:        2%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        OLPC-specific PolicyKit overrides
 
 Group:          System Environment/Base
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %{_var}/lib/PolicyKit-public/*
 
 %changelog
+* Tue Dec  8 2009 Daniel Drake <dsd at laptop.org> 1.3-1
+- Update for DeviceKit
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-olpc/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Aug 2008 15:43:56 -0000	1.2
+++ sources	8 Dec 2009 19:00:57 -0000	1.3
@@ -1 +1 @@
-d3f0b20192cdb40bc66e577fb394abeb  PolicyKit-olpc-1.2.tar.gz
+71b37df0730014755fec2e0e8cf671a5  PolicyKit-olpc-1.3.tar.gz



From cjb at fedoraproject.org  Tue Dec  8 19:19:27 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Tue,  8 Dec 2009 19:19:27 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091208git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091208191927.7F69310F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

d92d22fb55b7ed5b50624ebd4b42cd43  ohm-0.1.1-1.20091208git.tar.gz



From cjb at fedoraproject.org  Tue Dec  8 19:20:09 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Tue,  8 Dec 2009 19:20:09 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore, 1.8, 1.9 ohm.spec, 1.15, 1.16 sources,
	1.10, 1.11
Message-ID: <20091208192009.9881A11C03DB@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26006

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
- Trac #9805: Preserve user-set brightness on XO-1.5
- Trac #9847: Add RTC support; turn off the screen after five minutes idle.
- Trac #9842: Set initial wake-on-lan conditions using ethtool
- Prefer /sys/power/wakeup_events/ to /proc/acpi/wakeup on XO1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Dec 2009 04:01:25 -0000	1.8
+++ .cvsignore	8 Dec 2009 19:20:09 -0000	1.9
@@ -1 +1 @@
-ohm-0.1.1-1.20091205git.tar.gz
+ohm-0.1.1-1.20091208git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ohm.spec	5 Dec 2009 04:01:25 -0000	1.15
+++ ohm.spec	8 Dec 2009 19:20:09 -0000	1.16
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091205git
+%define alphatag                20091208git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.32.%{alphatag}%{?dist}
+Release: 9.33.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,6 +139,12 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Dec 8 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.33.20091208git.olpc
+- Trac #9805: Preserve user-set brightness on XO-1.5
+- Trac #9847: Add RTC support; turn off the screen after five minutes idle.
+- Trac #9842: Set initial wake-on-lan conditions using ethtool
+- Prefer /sys/power/wakeup_events/ to /proc/acpi/wakeup on XO1.5
+
 * Fri Dec 4 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.32.20091205git.olpc
 - Trac #9802: Use su to drop privileges for gconf, sudo requires being on a tty
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Dec 2009 04:01:26 -0000	1.10
+++ sources	8 Dec 2009 19:20:09 -0000	1.11
@@ -1 +1 @@
-67772674b7ac831596ea4c8f6c13b739  ohm-0.1.1-1.20091205git.tar.gz
+d92d22fb55b7ed5b50624ebd4b42cd43  ohm-0.1.1-1.20091208git.tar.gz



From cdamian at fedoraproject.org  Tue Dec  8 19:21:33 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Tue,  8 Dec 2009 19:21:33 +0000 (UTC)
Subject: File Doctrine-1.2.1.tgz uploaded to lookaside cache by cdamian
Message-ID: <20091208192133.2A8E110F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-doctrine-Doctrine:

54c64f1e8abfc10c7c054979cf54f3e6  Doctrine-1.2.1.tgz



From thias at fedoraproject.org  Tue Dec  8 19:33:39 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 19:33:39 +0000 (UTC)
Subject: File flac-1.2.1.tar.gz uploaded to lookaside cache by thias
Message-ID: <20091208193339.4625310F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xmms-flac:

153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz



From thias at fedoraproject.org  Tue Dec  8 19:34:25 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 19:34:25 +0000 (UTC)
Subject: rpms/xmms-flac/devel flac-1.2.1-gcc43.patch, NONE,
	1.1 xmms-flac.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 sources,
	1.3, 1.4 xmms-flac.spec, 1.11, 1.12
Message-ID: <20091208193425.6556811C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-flac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30468

Modified Files:
	.cvsignore sources xmms-flac.spec 
Added Files:
	flac-1.2.1-gcc43.patch xmms-flac.desktop 
Log Message:
Update to 1.2.1 and add menu entry.


flac-1.2.1-gcc43.patch:
 main.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE flac-1.2.1-gcc43.patch ---
diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp
--- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43	2007-09-13 17:58:03.000000000 +0200
+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2008-01-08 10:27:39.000000000 +0100
@@ -29,6 +29,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include "FLAC++/metadata.h"
 #include "FLAC++/encoder.h"


--- NEW FILE xmms-flac.desktop ---
[Desktop Entry]
Name=XMMS
Exec=xmms -p -e %F
Icon=xmms
MimeType=audio/x-flac;audio/flac;
Categories=AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Feb 2007 15:55:13 -0000	1.3
+++ .cvsignore	8 Dec 2009 19:34:25 -0000	1.4
@@ -1 +1 @@
-flac-1.1.4.tar.gz
+flac-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Feb 2007 15:55:13 -0000	1.3
+++ sources	8 Dec 2009 19:34:25 -0000	1.4
@@ -1 +1 @@
-3958cbd5b6ed8c14966792538e44223b  flac-1.1.4.tar.gz
+153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz


Index: xmms-flac.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/devel/xmms-flac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xmms-flac.spec	27 Jul 2009 08:16:34 -0000	1.11
+++ xmms-flac.spec	8 Dec 2009 19:34:25 -0000	1.12
@@ -2,18 +2,23 @@
 
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
-Version: 1.1.4
-Release: 6%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 # The entire FLAC sources are covered by multiple licenses, but the xmms plugin
 # is only GPLv2+
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
-Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source0: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source1: xmms-flac.desktop
 Patch0: xmms-flac-1.1.4-rpath.patch
+Patch1: flac-1.2.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: xmms-devel, libogg-devel, gettext-devel
 BuildRequires: flac-devel
+BuildRequires: desktop-file-utils
 
 %description
 FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming,
@@ -24,6 +29,7 @@ This is the input plugin for XMMS to be 
 %prep
 %setup -q -n flac-%{version}
 %patch0 -p1 -b .rpath
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -35,19 +41,34 @@ This is the input plugin for XMMS to be 
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 src/plugin_xmms/.libs/libxmms-flac.so \
     %{buildroot}%{xmms_inputdir}/libxmms-flac.so
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post
+update-desktop-database &> /dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING.GPL
+%{_datadir}/applications/xmms-flac.desktop
 %{xmms_inputdir}/libxmms-flac.so
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.2.1-1
+- Update to 1.2.1.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.4-7
+- Include hidden desktop entry for the mimetype (#508203).
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cdamian at fedoraproject.org  Tue Dec  8 19:34:45 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Tue,  8 Dec 2009 19:34:45 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine/devel .cvsignore, 1.5,
	1.6 php-doctrine-Doctrine.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20091208193445.0727D11C00C5@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30692

Modified Files:
	.cvsignore php-doctrine-Doctrine.spec sources 
Log Message:
upstream 1.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Nov 2009 21:58:19 -0000	1.5
+++ .cvsignore	8 Dec 2009 19:34:44 -0000	1.6
@@ -1 +1 @@
-Doctrine-1.2.0.tgz
+Doctrine-1.2.1.tgz


Index: php-doctrine-Doctrine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/devel/php-doctrine-Doctrine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-doctrine-Doctrine.spec	30 Nov 2009 21:58:19 -0000	1.4
+++ php-doctrine-Doctrine.spec	8 Dec 2009 19:34:44 -0000	1.5
@@ -2,7 +2,7 @@
 %global pear_name Doctrine
 
 Name:           php-doctrine-Doctrine
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        PHP Object Relational Mapper
 
@@ -86,6 +86,9 @@ fi
 %{pear_phpdir}/%{pear_name}
 
 %changelog
+* Tue Dec  8 2009 Christof Damian <christof at damian.net> - 1.2.1-1
+- upstream 1.2.1
+
 * Thu Nov 5 2009 Christof Damian <christof at damian.net> 1.2.0-1
 - upstream 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Nov 2009 21:58:19 -0000	1.5
+++ sources	8 Dec 2009 19:34:44 -0000	1.6
@@ -1 +1 @@
-ff91a3afe4fc3af80868c51a5b888f47  Doctrine-1.2.0.tgz
+54c64f1e8abfc10c7c054979cf54f3e6  Doctrine-1.2.1.tgz



From eponyme at fedoraproject.org  Tue Dec  8 19:45:03 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Tue,  8 Dec 2009 19:45:03 +0000 (UTC)
Subject: File Fotowall-0.9.tar.bz2 uploaded to lookaside cache by eponyme
Message-ID: <20091208194503.CB37A10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fotowall:

142ef697332e0777c6d22c5bc96cc438  Fotowall-0.9.tar.bz2



From eponyme at fedoraproject.org  Tue Dec  8 19:46:06 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Tue,  8 Dec 2009 19:46:06 +0000 (UTC)
Subject: rpms/fotowall/devel .cvsignore, 1.8, 1.9 fotowall.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20091208194606.4578411C00C5@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2300

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 10:13:39 -0000	1.8
+++ .cvsignore	8 Dec 2009 19:46:05 -0000	1.9
@@ -1 +1 @@
-Fotowall-0.8.1.tar.bz2
+Fotowall-0.9.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/fotowall.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fotowall.spec	20 Sep 2009 10:13:39 -0000	1.10
+++ fotowall.spec	8 Dec 2009 19:46:05 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.8.1
+Version:        0.9
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -19,7 +19,7 @@ in a personal way. You can add pictures,
 change colors, text, shadows, etc.. 
 
 %prep
-%setup -q -n fotowall-%{version}
+%setup -q -n Fotowall-%{version}
 # for hidden-file-or-dir warning 
 sed -i -e "s/\.build/build/" %{name}.pro
 # Unused file
@@ -52,6 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man?/%{name}.?.gz
 
 %changelog
+* Thu Dec  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.9-1
+- Update to 0.9
 * Sun Sep 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.8.1-1
 - Update to 0.8.1
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 10:13:39 -0000	1.8
+++ sources	8 Dec 2009 19:46:05 -0000	1.9
@@ -1 +1 @@
-b3e3ff78170a3fd15f08a58f60d0e3b8  Fotowall-0.8.1.tar.bz2
+142ef697332e0777c6d22c5bc96cc438  Fotowall-0.9.tar.bz2



From eponyme at fedoraproject.org  Tue Dec  8 19:47:27 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Tue,  8 Dec 2009 19:47:27 +0000 (UTC)
Subject: rpms/fotowall/F-12 .cvsignore, 1.8, 1.9 fotowall.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20091208194727.F081011C00C5@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2903

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 10:13:39 -0000	1.8
+++ .cvsignore	8 Dec 2009 19:47:27 -0000	1.9
@@ -1 +1 @@
-Fotowall-0.8.1.tar.bz2
+Fotowall-0.9.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-12/fotowall.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fotowall.spec	20 Sep 2009 10:13:39 -0000	1.10
+++ fotowall.spec	8 Dec 2009 19:47:27 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.8.1
+Version:        0.9
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -19,7 +19,7 @@ in a personal way. You can add pictures,
 change colors, text, shadows, etc.. 
 
 %prep
-%setup -q -n fotowall-%{version}
+%setup -q -n Fotowall-%{version}
 # for hidden-file-or-dir warning 
 sed -i -e "s/\.build/build/" %{name}.pro
 # Unused file
@@ -52,6 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man?/%{name}.?.gz
 
 %changelog
+* Thu Dec  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.9-1
+- Update to 0.9
 * Sun Sep 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.8.1-1
 - Update to 0.8.1
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 10:13:39 -0000	1.8
+++ sources	8 Dec 2009 19:47:27 -0000	1.9
@@ -1 +1 @@
-b3e3ff78170a3fd15f08a58f60d0e3b8  Fotowall-0.8.1.tar.bz2
+142ef697332e0777c6d22c5bc96cc438  Fotowall-0.9.tar.bz2



From eponyme at fedoraproject.org  Tue Dec  8 19:48:46 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Tue,  8 Dec 2009 19:48:46 +0000 (UTC)
Subject: rpms/fotowall/F-11 .cvsignore, 1.8, 1.9 fotowall.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20091208194846.B9E1E11C00C5@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3461

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 10:14:51 -0000	1.8
+++ .cvsignore	8 Dec 2009 19:48:46 -0000	1.9
@@ -1 +1 @@
-Fotowall-0.8.1.tar.bz2
+Fotowall-0.9.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/fotowall.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fotowall.spec	20 Sep 2009 10:14:51 -0000	1.9
+++ fotowall.spec	8 Dec 2009 19:48:46 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.8.1
+Version:        0.9
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -19,7 +19,7 @@ in a personal way. You can add pictures,
 change colors, text, shadows, etc.. 
 
 %prep
-%setup -q -n fotowall-%{version}
+%setup -q -n Fotowall-%{version}
 # for hidden-file-or-dir warning 
 sed -i -e "s/\.build/build/" %{name}.pro
 # Unused file
@@ -52,6 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man?/%{name}.?.gz
 
 %changelog
+* Thu Dec  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.9-1
+- Update to 0.9
 * Sun Sep 20 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.8.1-1
 - Update to 0.8.1
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 10:14:51 -0000	1.8
+++ sources	8 Dec 2009 19:48:46 -0000	1.9
@@ -1 +1 @@
-b3e3ff78170a3fd15f08a58f60d0e3b8  Fotowall-0.8.1.tar.bz2
+142ef697332e0777c6d22c5bc96cc438  Fotowall-0.9.tar.bz2



From davidz at fedoraproject.org  Tue Dec  8 19:51:28 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Tue,  8 Dec 2009 19:51:28 +0000 (UTC)
Subject: rpms/gvfs/F-12
	0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch, NONE,
	1.1 0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch, 
	NONE,
	1.1 0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch, 
	NONE, 1.1 gvfs.spec, 1.174, 1.175
Message-ID: <20091208195128.DADE411C00C5@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4540

Modified Files:
	gvfs.spec 
Added Files:
	0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch 
	0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch 
	0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch 
Log Message:
* Tue Dec  8 2009 David Zeuthen <davidz at redhat.com> - 1.4.2-3
- Backport fixes from git
- Correct wrong assumptions about how libgdu.so works
- Make LUKS volumes work with new mount(8) behavior
- Be more careful deciding what volumes to automatically mount



0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch:
 ggduvolume.c        |   16 +++++++++-
 ggduvolumemonitor.c |   79 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 66 insertions(+), 29 deletions(-)

--- NEW FILE 0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch ---
>From 2714a72902d35cd55668484eb5bfdfc23eb16f09 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Tue, 8 Dec 2009 13:15:52 -0500
Subject: [PATCH 1/3] [gdu] Stop assuming that drives have no enclosing presentable

This makes the gdu volume monitor works with recent gnome-disk-utility
versions with things like GduHub presentables that represents HBAs and
Expanders. This will not affect previous gnome-disk-utility versions.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
 monitor/gdu/ggduvolume.c        |   16 +++++++-
 monitor/gdu/ggduvolumemonitor.c |   78 +++++++++++++++++++++++++-------------
 2 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index 28839fd..be324c9 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -988,7 +988,21 @@ mount_with_mount_operation (MountOpData *data)
 
   device = gdu_presentable_get_device (GDU_PRESENTABLE (data->volume->gdu_volume));
 
-  toplevel = gdu_presentable_get_toplevel (GDU_PRESENTABLE (data->volume->gdu_volume));
+  toplevel = gdu_presentable_get_enclosing_presentable (GDU_PRESENTABLE (data->volume->gdu_volume));
+  /* handle logical partitions enclosed by an extented partition */
+  if (GDU_IS_VOLUME (toplevel))
+    {
+      GduPresentable *temp;
+      temp = toplevel;
+      toplevel = gdu_presentable_get_enclosing_presentable (toplevel);
+      g_object_unref (temp);
+      if (!GDU_IS_DRIVE (toplevel))
+        {
+          g_object_unref (toplevel);
+          toplevel = NULL;
+        }
+    }
+
   if (toplevel != NULL)
     drive_name = gdu_presentable_get_name (toplevel);
 
diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 398fed4..c5b58a0 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -1298,24 +1298,36 @@ update_volumes (GGduVolumeMonitor *monitor,
 
       if (volume == NULL)
         {
-          GduPresentable *toplevel_presentable;
+          GduPresentable *toplevel_drive;
 
-          toplevel_presentable = gdu_presentable_get_toplevel (p);
-          if (toplevel_presentable != NULL)
+          toplevel_drive = gdu_presentable_get_enclosing_presentable (p);
+          /* handle logical partitions enclosed by an extented partition */
+          if (GDU_IS_VOLUME (toplevel_drive))
             {
-              GduDevice *toplevel_device;
+              GduPresentable *temp;
+              temp = toplevel_drive;
+              toplevel_drive = gdu_presentable_get_enclosing_presentable (toplevel_drive);
+              g_object_unref (temp);
+            }
 
-              drive = NULL;
-              toplevel_device = gdu_presentable_get_device (toplevel_presentable);
-              if (toplevel_device != NULL)
+          if (toplevel_drive != NULL)
+            {
+              if (GDU_IS_DRIVE (toplevel_drive))
                 {
-                  drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device));
-                  /*g_debug ("adding volume %s (drive %s)",
-                           gdu_device_get_device_file (d),
-                           gdu_device_get_device_file (toplevel_device));*/
-                  g_object_unref (toplevel_device);
+                  GduDevice *toplevel_drive_device;
+
+                  drive = NULL;
+                  toplevel_drive_device = gdu_presentable_get_device (toplevel_drive);
+                  if (toplevel_drive_device != NULL)
+                    {
+                      drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_drive_device));
+                      /*g_debug ("adding volume %s (drive %s)",
+                        gdu_device_get_device_file (d),
+                        gdu_device_get_device_file (toplevel_device));*/
+                      g_object_unref (toplevel_drive_device);
+                    }
                 }
-              g_object_unref (toplevel_presentable);
+              g_object_unref (toplevel_drive);
             }
           else
             {
@@ -1512,7 +1524,7 @@ update_mounts (GGduVolumeMonitor *monitor,
       if (volume == NULL)
         volume = find_volume_for_mount_path (monitor, mount_path);
 
-      /*g_debug ("adding mount %s (vol %p)", g_unix_mount_get_device_path (mount_entry), volume);*/
+      /*g_debug ("adding mount %s (vol %p) (device %s, mount_path %s)", g_unix_mount_get_device_path (mount_entry), volume, device_file, mount_path);*/
       mount = g_gdu_mount_new (G_VOLUME_MONITOR (monitor), mount_entry, volume);
       if (mount)
         {
@@ -1640,24 +1652,36 @@ update_discs (GGduVolumeMonitor *monitor,
 
       if (volume == NULL)
         {
-          GduPresentable *toplevel_presentable;
+          GduPresentable *toplevel_drive;
 
-          toplevel_presentable = gdu_presentable_get_toplevel (p);
-          if (toplevel_presentable != NULL)
+          toplevel_drive = gdu_presentable_get_enclosing_presentable (p);
+          /* handle logical partitions enclosed by an extented partition */
+          if (GDU_IS_VOLUME (toplevel_drive))
             {
-              GduDevice *toplevel_device;
+              GduPresentable *temp;
+              temp = toplevel_drive;
+              toplevel_drive = gdu_presentable_get_enclosing_presentable (toplevel_drive);
+              g_object_unref (temp);
+            }
 
-              drive = NULL;
-              toplevel_device = gdu_presentable_get_device (toplevel_presentable);
-              if (toplevel_device != NULL)
+          if (toplevel_drive != NULL)
+            {
+              if (GDU_IS_DRIVE (toplevel_drive))
                 {
-                  drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device));
-                  /*g_debug ("adding volume %s (drive %s)",
-                           gdu_device_get_device_file (d),
-                           gdu_device_get_device_file (toplevel_device));*/
-                  g_object_unref (toplevel_device);
+                  GduDevice *toplevel_drive_device;
+
+                  drive = NULL;
+                  toplevel_drive_device = gdu_presentable_get_device (toplevel_drive);
+                  if (toplevel_drive_device != NULL)
+                    {
+                      drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_drive_device));
+                      /*g_debug ("adding volume %s (drive %s)",
+                        gdu_device_get_device_file (d),
+                        gdu_device_get_device_file (toplevel_device));*/
+                      g_object_unref (toplevel_drive_device);
+                    }
                 }
-              g_object_unref (toplevel_presentable);
+              g_object_unref (toplevel_drive);
             }
           else
             {
-- 
1.6.5.5


0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch:
 ggdudrive.c         |   12 +++++++++---
 ggdudrive.h         |    4 ++--
 ggduvolume.c        |   49 +++++++++++++++++++++++++++++++++++++++++++++----
 ggduvolume.h        |    2 ++
 ggduvolumemonitor.c |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 ggduvolumemonitor.h |    6 +++++-
 6 files changed, 109 insertions(+), 13 deletions(-)

--- NEW FILE 0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch ---
>From f909a095df0189569c28a786d01a0abda9f7e76a Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Tue, 8 Dec 2009 13:54:27 -0500
Subject: [PATCH 2/3] [gdu] Prefer using dev_t to device file when comparing devices

This works around new behavior in mount(8) where it decides to put
/dev/mapper/<blah> in /etc/mtab instead of the /dev/dm-0 device that
the user actually requested.

Of course /dev/mapper/<blah> currently does not exist in the udev
database because of device-mapper brokenness so without this fix
things can never work if using a sufficiently new mount(8) command.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
 monitor/gdu/ggdudrive.c         |   12 +++++++--
 monitor/gdu/ggdudrive.h         |    4 +-
 monitor/gdu/ggduvolume.c        |   49 +++++++++++++++++++++++++++++++++++---
 monitor/gdu/ggduvolume.h        |    2 +
 monitor/gdu/ggduvolumemonitor.c |   49 ++++++++++++++++++++++++++++++++++++--
 monitor/gdu/ggduvolumemonitor.h |    5 ++++
 6 files changed, 109 insertions(+), 12 deletions(-)

diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 309e18c..72126a0 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -46,6 +46,7 @@ struct _GGduDrive {
   GIcon *icon;
   gchar *name;
   gchar *device_file;
+  dev_t dev;
   gboolean is_media_removable;
   gboolean has_media;
   gboolean can_eject;
@@ -128,6 +129,7 @@ update_drive (GGduDrive *drive)
   GIcon *old_icon;
   gchar *old_name;
   gchar *old_device_file;
+  dev_t old_dev;
   gboolean old_is_media_removable;
   gboolean old_has_media;
   gboolean old_can_eject;
@@ -151,6 +153,7 @@ update_drive (GGduDrive *drive)
 
   old_name = g_strdup (drive->name);
   old_device_file = g_strdup (drive->device_file);
+  old_dev = drive->dev;
   old_icon = drive->icon != NULL ? g_object_ref (drive->icon) : NULL;
 
   /* in with the new */
@@ -170,6 +173,7 @@ update_drive (GGduDrive *drive)
   if (device == NULL)
     {
       g_free (drive->device_file);
+      drive->dev = 0;
       drive->device_file = NULL;
       drive->is_media_removable = TRUE;
       drive->has_media = TRUE;
@@ -179,6 +183,7 @@ update_drive (GGduDrive *drive)
   else
     {
       g_free (drive->device_file);
+      drive->dev = gdu_device_get_dev (device);
       drive->device_file = g_strdup (gdu_device_get_device_file (device));
       drive->is_media_removable = gdu_device_is_removable (device);
       drive->has_media = gdu_device_is_media_available (device);
@@ -265,6 +270,7 @@ update_drive (GGduDrive *drive)
               (old_can_poll_for_media == drive->can_poll_for_media) &&
               (g_strcmp0 (old_name, drive->name) == 0) &&
               (g_strcmp0 (old_device_file, drive->device_file) == 0) &&
+              (old_dev == drive->dev) &&
               g_icon_equal (old_icon, drive->icon)
               );
 
@@ -1200,10 +1206,10 @@ g_gdu_drive_drive_iface_init (GDriveIface *iface)
 }
 
 gboolean
-g_gdu_drive_has_device_file (GGduDrive      *drive,
-                             const gchar    *device_file)
+g_gdu_drive_has_dev (GGduDrive      *drive,
+                     dev_t           dev)
 {
-  return g_strcmp0 (drive->device_file, device_file) == 0;
+  return drive->dev == dev;
 }
 
 gboolean
diff --git a/monitor/gdu/ggdudrive.h b/monitor/gdu/ggdudrive.h
index e182c29..e1aab7d 100644
--- a/monitor/gdu/ggdudrive.h
+++ b/monitor/gdu/ggdudrive.h
@@ -52,8 +52,8 @@ void       g_gdu_drive_set_volume      (GGduDrive      *drive,
 void       g_gdu_drive_unset_volume    (GGduDrive      *drive,
                                         GGduVolume     *volume);
 void       g_gdu_drive_disconnected    (GGduDrive      *drive);
-gboolean   g_gdu_drive_has_device_file (GGduDrive      *drive,
-                                        const gchar    *device_file);
+gboolean   g_gdu_drive_has_dev         (GGduDrive      *drive,
+                                        dev_t           dev);
 time_t     g_gdu_drive_get_time_of_last_media_insertion (GGduDrive      *drive);
 
 gboolean   g_gdu_drive_has_presentable (GGduDrive       *drive,
diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index be324c9..6e2fcd3 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -77,6 +77,7 @@ struct _GGduVolume
   GFile *activation_root;
   gchar *name;
   gchar *device_file;
+  dev_t dev;
   gchar *uuid;
   gboolean can_mount;
   gboolean should_automount;
@@ -179,6 +180,7 @@ update_volume (GGduVolume *volume)
   gboolean old_should_automount;
   gchar *old_name;
   gchar *old_device_file;
+  dev_t old_dev;
   GIcon *old_icon;
   gboolean keep_cleartext_volume;
 
@@ -187,6 +189,7 @@ update_volume (GGduVolume *volume)
   old_should_automount = volume->should_automount;
   old_name = g_strdup (volume->name);
   old_device_file = g_strdup (volume->device_file);
+  old_dev = volume->dev;
   old_icon = volume->icon != NULL ? g_object_ref (volume->icon) : NULL;
 
   /* ---------------------------------------------------------------------------------------------------- */
@@ -194,11 +197,14 @@ update_volume (GGduVolume *volume)
   /* if the volume is a fstab mount point, get the data from there */
   if (volume->unix_mount_point != NULL)
     {
+      struct stat_buf;
+
       volume->can_mount = TRUE;
       volume->should_automount = FALSE;
 
       g_free (volume->device_file);
       volume->device_file = g_strdup (g_unix_mount_point_get_device_path (volume->unix_mount_point));
+      volume->dev = 0;
 
       if (volume->icon != NULL)
         g_object_unref (volume->icon);
@@ -289,9 +295,15 @@ update_volume (GGduVolume *volume)
 
       g_free (volume->device_file);
       if (luks_cleartext_volume_device != NULL)
-        volume->device_file = g_strdup (gdu_device_get_device_file (luks_cleartext_volume_device));
+        {
+          volume->device_file = g_strdup (gdu_device_get_device_file (luks_cleartext_volume_device));
+          volume->dev = gdu_device_get_dev (luks_cleartext_volume_device);
+        }
       else
-        volume->device_file = NULL;
+        {
+          volume->device_file = NULL;
+          volume->dev = 0;
+        }
 
       volume->can_mount = TRUE;
 
@@ -327,9 +339,15 @@ update_volume (GGduVolume *volume)
 
       g_free (volume->device_file);
       if (device != NULL)
-        volume->device_file = g_strdup (gdu_device_get_device_file (device));
+        {
+          volume->device_file = g_strdup (gdu_device_get_device_file (device));
+          volume->dev = gdu_device_get_dev (device);
+        }
       else
-        volume->device_file = NULL;
+        {
+          volume->device_file = NULL;
+          volume->dev = 0;
+        }
 
       volume->can_mount = TRUE;
 
@@ -369,6 +387,7 @@ update_volume (GGduVolume *volume)
               (old_should_automount == volume->should_automount) &&
               (g_strcmp0 (old_name, volume->name) == 0) &&
               (g_strcmp0 (old_device_file, volume->device_file) == 0) &&
+              (old_dev == volume->dev) &&
               g_icon_equal (old_icon, volume->icon)
               );
 
@@ -1676,6 +1695,28 @@ g_gdu_volume_volume_iface_init (GVolumeIface *iface)
 }
 
 gboolean
+g_gdu_volume_has_dev (GGduVolume   *volume,
+                      dev_t         dev)
+{
+  dev_t _dev;
+
+  _dev = volume->dev;
+
+  if (volume->cleartext_gdu_volume != NULL)
+    {
+      GduDevice *luks_cleartext_volume_device;
+      luks_cleartext_volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->cleartext_gdu_volume));
+      if (luks_cleartext_volume_device != NULL)
+        {
+          _dev = gdu_device_get_dev (luks_cleartext_volume_device);
+          g_object_unref (luks_cleartext_volume_device);
+        }
+    }
+
+  return _dev == dev;
+}
+
+gboolean
 g_gdu_volume_has_device_file (GGduVolume   *volume,
                               const gchar  *device_file)
 {
diff --git a/monitor/gdu/ggduvolume.h b/monitor/gdu/ggduvolume.h
index a230d28..007484a 100644
--- a/monitor/gdu/ggduvolume.h
+++ b/monitor/gdu/ggduvolume.h
@@ -71,6 +71,8 @@ gboolean    g_gdu_volume_has_uuid       (GGduVolume       *volume,
                                          const char       *uuid);
 gboolean   g_gdu_volume_has_device_file (GGduVolume      *volume,
                                          const gchar     *device_file);
+gboolean   g_gdu_volume_has_dev         (GGduVolume       *volume,
+                                         dev_t             dev);
 
 GduPresentable *g_gdu_volume_get_presentable (GGduVolume *volume);
 
diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index c5b58a0..bcf23f1 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -1061,16 +1061,37 @@ find_disc_volume_for_device_file (GGduVolumeMonitor *monitor,
                                   const gchar       *device_file)
 {
   GList *l;
+  GGduVolume *ret;
+  struct stat stat_buf;
+
+  ret = NULL;
+
+  if (stat (device_file, &stat_buf) == 0)
+    {
+      for (l = monitor->disc_volumes; l != NULL; l = l->next)
+        {
+          GGduVolume *volume = G_GDU_VOLUME (l->data);
+          if (g_gdu_volume_has_dev (volume, stat_buf.st_rdev))
+            {
+              ret = volume;
+              goto out;
+            }
+        }
+    }
 
   for (l = monitor->disc_volumes; l != NULL; l = l->next)
     {
       GGduVolume *volume = G_GDU_VOLUME (l->data);
 
       if (g_gdu_volume_has_device_file (volume, device_file))
-        return volume;
+        {
+          ret = volume;
+          goto out;
+        }
     }
 
-  return NULL;
+ out:
+  return ret;
 }
 
 static GGduVolume *
@@ -1079,8 +1100,23 @@ find_volume_for_device_file (GGduVolumeMonitor *monitor,
 {
   GList *l;
   GGduVolume *ret;
+  struct stat stat_buf;
 
   ret = NULL;
+
+  if (stat (device_file, &stat_buf) == 0)
+    {
+      for (l = monitor->volumes; l != NULL; l = l->next)
+        {
+          GGduVolume *volume = G_GDU_VOLUME (l->data);
+          if (g_gdu_volume_has_dev (volume, stat_buf.st_rdev))
+            {
+              ret = volume;
+              goto out;
+            }
+        }
+    }
+
   for (l = monitor->volumes; l != NULL; l = l->next)
     {
       GGduVolume *volume = G_GDU_VOLUME (l->data);
@@ -1113,12 +1149,19 @@ find_drive_by_device_file (GGduVolumeMonitor *monitor,
                            const gchar       *device_file)
 {
   GList *l;
+  struct stat stat_buf;
+
+  if (stat (device_file, &stat_buf) != 0)
+    {
+      g_warning ("%s:%s: Error statting %s: %m", G_STRLOC, G_STRFUNC, device_file);
+      return NULL;
+    }
 
   for (l = monitor->drives; l != NULL; l = l->next)
     {
       GGduDrive *drive = G_GDU_DRIVE (l->data);
 
-      if (g_gdu_drive_has_device_file (drive, device_file))
+      if (g_gdu_drive_has_dev (drive, stat_buf.st_rdev))
         return drive;
     }
 
diff --git a/monitor/gdu/ggduvolumemonitor.h b/monitor/gdu/ggduvolumemonitor.h
index b91ceb9..2b6383a 100644
--- a/monitor/gdu/ggduvolumemonitor.h
+++ b/monitor/gdu/ggduvolumemonitor.h
@@ -28,6 +28,11 @@
 #include <gio/gio.h>
 #include <gio/gunixmounts.h>
 
+/* for dev_t */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include <gdu/gdu.h>
 
 G_BEGIN_DECLS
-- 
1.6.5.5


0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch:
 ggduvolume.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

--- NEW FILE 0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch ---
>From e286c9b3f032c84298b715eaf821bc8a7df59bc3 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Tue, 8 Dec 2009 14:33:43 -0500
Subject: [PATCH 3/3] [gdu] Be more careful with automounting - use a whitelist

The current behavior is that we try to automount all filesystems. This
has unintended consequences for big iron boxes connected to a SAN when
the user is logging in as root (thus having all polkit authorizations
at hand) - literally hundreds or thousands of devices may get mounted.

As such, only automount filesystems from the current whitelist

 - anything connected via USB or Firewire or SDIO buses
 - optical discs

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
 monitor/gdu/ggduvolume.c |   51 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index 6e2fcd3..23f5060 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -351,13 +351,56 @@ update_volume (GGduVolume *volume)
 
       volume->can_mount = TRUE;
 
-      /* If a volume (partition) appear _much later_ than when media was insertion it
-       * can only be because the media was repartitioned. We don't want to automount
-       * such volumes.
+      /* Only automount filesystems from drives of known types/interconnects:
+       *
+       *  - USB
+       *  - Firewire
+       *  - sdio
+       *  - optical discs
+       *
+       * The mantra here is "be careful" - we really don't want to
+       * automount fs'es from all devices in a SAN etc - We REALLY
+       * need to be CAREFUL here.
+       *
+       * Sidebar: Actually, a surprisingly large number of admins like
+       *          to log into GNOME as root (thus having all polkit
+       *          authorizations) and if weren't careful we'd
+       *          automount all mountable devices from the box. See
+       *          the enterprise distro bug trackers for details.
        */
-      volume->should_automount = TRUE;
+      volume->should_automount = FALSE;
       if (volume->drive != NULL)
         {
+          GduPresentable *drive_presentable;
+          drive_presentable = g_gdu_drive_get_presentable (volume->drive);
+          if (drive_presentable != NULL)
+            {
+              GduDevice *drive_device;
+              drive_device = gdu_presentable_get_device (drive_presentable);
+              if (drive_device != NULL)
+                {
+                  if (gdu_device_is_drive (drive_device))
+                    {
+                      const gchar *connection_interface;
+
+                      connection_interface = gdu_device_drive_get_connection_interface (drive_device);
+
+                      if (g_strcmp0 (connection_interface, "usb") == 0 ||
+                          g_strcmp0 (connection_interface, "firewire") == 0 ||
+                          g_strcmp0 (connection_interface, "sdio") == 0 ||
+                          gdu_device_is_optical_disc (drive_device))
+                        {
+                          volume->should_automount = TRUE;
+                        }
+                    }
+                  g_object_unref (drive_device);
+                }
+            }
+
+          /* If a volume (partition) appear _much later_ than when media was inserted it
+           * can only be because the media was repartitioned. We don't want to automount
+           * such volumes.
+           */
           now = time (NULL);
           if (now - g_gdu_drive_get_time_of_last_media_insertion (volume->drive) > 5)
             volume->should_automount = FALSE;
-- 
1.6.5.5



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- gvfs.spec	1 Dec 2009 11:04:17 -0000	1.174
+++ gvfs.spec	8 Dec 2009 19:51:28 -0000	1.175
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -47,6 +47,12 @@ Patch4: gvfs-1.4.3-ftp-fixes.patch 
 Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch
 Patch13: gvfs-1.4.1-http-soup-header-parsing.patch
 
+# from upstream (in master and gnome-2-28 branch already)
+Patch20: 0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch
+Patch21: 0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch
+Patch22: 0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch
+
+
 Obsoletes: gnome-mount <= 0.8
 Obsoletes: gnome-mount-nautilus-properties <= 0.8
 
@@ -148,6 +154,9 @@ and iPod Touches to applications using g
 %patch4 -p1 -b .ftp-fix
 %patch12 -p1 -b .http-query-info
 %patch13 -p1 -b .http-headers
+%patch20 -p1 -b .udisks-fixes
+%patch21 -p1 -b .handle-new-umount-behavior
+%patch22 -p1 -b .careful-automounting
 
 %build
 
@@ -313,6 +322,12 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Dec  8 2009 David Zeuthen <davidz at redhat.com> - 1.4.2-3
+- Backport fixes from git
+- Correct wrong assumptions about how libgdu.so works
+- Make LUKS volumes work with new mount(8) behavior
+- Be more careful deciding what volumes to automatically mount
+
 * Tue Dec  1 2009 Alexander Larsson <alexl at redhat.com> - 1.4.2-2
 - Backport fixes from git:
 - Don't leak metadata strings



From thias at fedoraproject.org  Tue Dec  8 19:52:26 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 19:52:26 +0000 (UTC)
Subject: rpms/epydoc/devel epydoc.spec,1.16,1.17
Message-ID: <20091208195226.7198811C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/epydoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4994

Modified Files:
	epydoc.spec 
Log Message:
Add texlive-dvips and texlive-latex requirements (#522249).



Index: epydoc.spec
===================================================================
RCS file: /cvs/extras/rpms/epydoc/devel/epydoc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- epydoc.spec	24 Jul 2009 22:14:08 -0000	1.16
+++ epydoc.spec	8 Dec 2009 19:52:26 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: Automatic API documentation generation tool for Python
 Name: epydoc
 Version: 3.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Development/Tools
 License: MIT
 URL: http://epydoc.sourceforge.net/
@@ -13,6 +13,9 @@ Patch0: epydoc-3.0.1-nohashbang.patch
 Patch1: epydoc-3.0.1-giftopng.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: tkinter
+# Needed for some outputs, like --pdf (#522249)
+Requires: texlive-dvips
+Requires: texlive-latex
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 BuildArch: noarch
@@ -72,6 +75,9 @@ desktop-file-install \
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.0.1-6
+- Add texlive-dvips and texlive-latex requirements (#522249).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thias at fedoraproject.org  Tue Dec  8 19:59:00 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 19:59:00 +0000 (UTC)
Subject: rpms/easytag/F-11 easytag-2.1.6-cddb_manual_search_fix.patch, NONE, 
	1.1 easytag-2.1.6-id3lib.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 easytag.spec, 1.25, 1.26 sources, 1.9,
	1.10 easytag-2.0.1-id3lib.patch, 1.1,
	NONE easytag-2.1-ru-hint.asp.patch, 1.1, NONE
Message-ID: <20091208195900.284D411C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7277

Modified Files:
	.cvsignore easytag.spec sources 
Added Files:
	easytag-2.1.6-cddb_manual_search_fix.patch 
	easytag-2.1.6-id3lib.patch 
Removed Files:
	easytag-2.0.1-id3lib.patch easytag-2.1-ru-hint.asp.patch 
Log Message:
Backport 2.1.6 update.


easytag-2.1.6-cddb_manual_search_fix.patch:
 cddb.c |  117 ++++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 80 insertions(+), 37 deletions(-)

--- NEW FILE easytag-2.1.6-cddb_manual_search_fix.patch ---
diff -ruN easytag-2.1.6.orig/src/cddb.c easytag-2.1.6/src/cddb.c
--- easytag-2.1.6.orig/src/cddb.c	2008-03-22 22:57:29.000000000 +0100
+++ easytag-2.1.6/src/cddb.c	2009-08-25 23:16:35.000000000 +0200
@@ -2158,10 +2158,12 @@
  */
 gboolean Cddb_Search_Album_List_From_String (void)
 {
-    if ( strstr(CDDB_SERVER_NAME_MANUAL_SEARCH,"freedb") != NULL )
-        return Cddb_Search_Album_List_From_String_Freedb();
-    else
+    if ( strstr(CDDB_SERVER_NAME_MANUAL_SEARCH,"gnudb") != NULL )
+		// Use of gnudb
         return Cddb_Search_Album_List_From_String_Gnudb();
+    else
+		// Use of freedb
+        return Cddb_Search_Album_List_From_String_Freedb();
 }
 
 
@@ -2255,7 +2257,7 @@
     g_free(string);
     g_free(tmp);
     g_free(proxy_auth);
-    //g_print("Request : '%s'\n", cddb_in);
+    //g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 
     // Send the request
     gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -2574,7 +2576,7 @@
                                   );
         next_page_found = FALSE;
         g_free(proxy_auth);
-        //g_print("Request : '%s'\n", cddb_in);
+        //g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 
         // Send the request
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -3130,7 +3132,7 @@
                                       (proxy_auth=Cddb_Format_Proxy_Authentification())
                                       );
             g_free(proxy_auth);
-            //g_print("Request : '%s'\n", cddb_in);
+            //g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
 
             msg = g_strdup_printf(_("Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."),
                                 cddb_discid,num_tracks,disc_length);
@@ -3394,24 +3396,47 @@
                                              CDDB_USE_PROXY?CDDB_PROXY_PORT:cddb_server_port)) <= 0 )
             return FALSE;
 
-        // CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
-        // Without proxy : "GET /~cddb/cddb.cgi?..." but doesn't work with a proxy.
-        // With proxy    : "GET http://freedb.freedb.org/~cddb/cddb.cgi?..."
-        cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
-                                  "%s+%s"
-                                  "&hello=noname+localhost+%s+%s"
-                                  "&proto=6 HTTP/1.1\r\n"
-                                  "Host: %s:%d\r\n"
-                                  "%s"
-                                  "Connection: close\r\n\r\n",
-                                  CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
-                                  cddbalbum->category,cddbalbum->id,
-                                  APPNAME,VERSION,
-                                  cddb_server_name,cddb_server_port,
-                                  (proxy_auth=Cddb_Format_Proxy_Authentification())
-                                  );
-        g_free(proxy_auth);
-        //g_print("Request : '%s'\n", cddb_in);
+		if ( strstr(cddb_server_name,"gnudb") != NULL )
+		{
+			// For gnudb
+			// New version of gnudb doesn't use a cddb request, but a http request
+		    cddb_in = g_strdup_printf("GET %s%s/gnudb/"
+		                              "%s/%s"
+		                              " HTTP/1.1\r\n"
+		                              "Host: %s:%d\r\n"
+		                              "User-Agent: %s %s\r\n"
+		                              "%s"
+		                              "Connection: close\r\n"
+		                              "\r\n",
+		                              CDDB_USE_PROXY?"http://":"", CDDB_USE_PROXY?cddb_server_name:"",  // Needed when using proxy
+		                              cddbalbum->category,cddbalbum->id,
+		                              cddb_server_name,cddb_server_port,
+		                              APPNAME,VERSION,
+		                              (proxy_auth=Cddb_Format_Proxy_Authentification())
+		                              );
+		}else
+		{
+		    // CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
+		    // Without proxy : "GET /~cddb/cddb.cgi?..." but doesn't work with a proxy.
+		    // With proxy    : "GET http://freedb.freedb.org/~cddb/cddb.cgi?..."
+		    cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
+		                              "%s+%s"
+		                              "&hello=noname+localhost+%s+%s"
+		                              "&proto=6 HTTP/1.1\r\n"
+		                              "Host: %s:%d\r\n"
+		                              "%s"
+		                              "Connection: close\r\n\r\n",
+		                              CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
+		                              cddbalbum->category,cddbalbum->id,
+		                              APPNAME,VERSION,
+		                              cddb_server_name,cddb_server_port,
+		                              (proxy_auth=Cddb_Format_Proxy_Authentification())
+		                              );
+		}
+
+		
+		g_free(proxy_auth);
+        //g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 
         // Send the request
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -3444,20 +3469,38 @@
         }
 
 
-        // Parse server answer : Check HTTP Header and CDDB Header
+        // Parse server answer : Check HTTP Header (freedb or gnudb) and CDDB Header (freedb only)
         file = NULL;
-        if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
-          || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
-        {
-            gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
-            gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-            Log_Print(LOG_ERROR,"%s",msg);
-            g_free(msg);
-            g_free(cddb_out);
-            if (file)
-                fclose(file);
-            return FALSE;
-        }
+		if ( strstr(cddb_server_name,"gnudb") != NULL )
+		{
+			// For gnudb (don't check CDDB header)
+			if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0 )
+		    {
+		        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
+		        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
+		        Log_Print(LOG_ERROR,"%s",msg);
+		        g_free(msg);
+		        g_free(cddb_out);
+		        if (file)
+		            fclose(file);
+		        return FALSE;
+		    }
+		}else
+		{
+			// For freedb
+			if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
+		      || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
+		    {
+		        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
+		        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
+		        Log_Print(LOG_ERROR,"%s",msg);
+		        g_free(msg);
+		        g_free(cddb_out);
+		        if (file)
+		            fclose(file);
+		        return FALSE;
+		    }
+		}
         g_free(cddb_out);
 
     }

easytag-2.1.6-id3lib.patch:
 configure         |    3 +--
 configure.in      |    1 -
 src/Makefile.in   |    6 +++---
 src/mpeg_header.c |    2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE easytag-2.1.6-id3lib.patch ---
diff -Naupr easytag-2.1.6.orig/configure easytag-2.1.6/configure
--- easytag-2.1.6.orig/configure	2008-07-12 16:57:44.000000000 +0200
+++ easytag-2.1.6/configure	2009-09-12 16:47:34.117176630 +0200
@@ -26034,7 +26034,7 @@ ac_config_headers="$ac_config_headers co
 
 
 
-ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile src/libmpg123/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile po/Makefile.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -26637,7 +26637,6 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/id3lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/id3lib/Makefile" ;;
     "src/libapetag/Makefile") CONFIG_FILES="$CONFIG_FILES src/libapetag/Makefile" ;;
-    "src/libmpg123/Makefile") CONFIG_FILES="$CONFIG_FILES src/libmpg123/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff -Naupr easytag-2.1.6.orig/configure.in easytag-2.1.6/configure.in
--- easytag-2.1.6.orig/configure.in	2008-05-07 22:45:32.000000000 +0200
+++ easytag-2.1.6/configure.in	2009-09-12 16:47:42.421053700 +0200
@@ -473,7 +473,6 @@ AC_OUTPUT([ Makefile
             src/Makefile
             src/id3lib/Makefile
             src/libapetag/Makefile
-            src/libmpg123/Makefile
             po/Makefile.in
          ])
 
diff -Naupr easytag-2.1.6.orig/src/Makefile.in easytag-2.1.6/src/Makefile.in
--- easytag-2.1.6.orig/src/Makefile.in	2008-07-12 16:57:43.000000000 +0200
+++ easytag-2.1.6/src/Makefile.in	2009-09-12 16:48:30.102176910 +0200
@@ -59,7 +59,7 @@ am_easytag_OBJECTS = about.$(OBJEXT) ape
 	wavpack_tag.$(OBJEXT)
 easytag_OBJECTS = $(am_easytag_OBJECTS)
 am__DEPENDENCIES_1 =
-easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) libmpg123/libmpg123.a \
+easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	libapetag/libapetag.a id3lib/libid3bugfix.a
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -226,7 +226,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = libmpg123 libapetag id3lib
+SUBDIRS = libapetag id3lib
 easytag_SOURCES = \
  about.c \
  about.h \
@@ -308,7 +308,7 @@ EXTRA_DIST = \
  win32/nsis/easytag-install.ico \
  win32/nsis/easytag-uninstall.bmp 
 
-easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
+easytag_LDADD = $(GTK_LIBS) libapetag/libapetag.a  id3lib/libid3bugfix.a
 PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
 INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
            -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
diff -Naupr easytag-2.1.6.orig/src/mpeg_header.c easytag-2.1.6/src/mpeg_header.c
--- easytag-2.1.6.orig/src/mpeg_header.c	2007-11-28 09:54:27.000000000 +0100
+++ easytag-2.1.6/src/mpeg_header.c	2009-09-12 16:48:50.266129581 +0200
@@ -36,7 +36,7 @@
 // Set to :
 // - 1 to use ID3lib for reading headers
 // - 0 to use mpeg123 for reading headers
-#define USE_ID3LIB_4_HEADER 0
+#define USE_ID3LIB_4_HEADER 1
 
 #if USE_ID3LIB_4_HEADER
 #   include <id3.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Jun 2007 16:37:24 -0000	1.9
+++ .cvsignore	8 Dec 2009 19:58:58 -0000	1.10
@@ -1 +1 @@
-easytag-2.1-patched.tar.bz2
+easytag-2.1.6-patched.tar.bz2


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/F-11/easytag.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- easytag.spec	24 Feb 2009 13:23:29 -0000	1.25
+++ easytag.spec	8 Dec 2009 19:58:59 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Tag editor for mp3, ogg, flac and other music files
 Name: easytag
-Version: 2.1
-Release: 6%{?dist}
+Version: 2.1.6
+Release: 2%{?dist}
 # Program is GPL only the included libapetag is LGPL
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
@@ -12,11 +12,17 @@ URL: http://easytag.sourceforge.net/
 # rm -rf easytag-$VERSION/src/libmpg123/
 # tar --numeric-owner -cjvf easytag-$VERSION-patched.tar.bz2 easytag-$VERSION
 Source: easytag-%{version}-patched.tar.bz2
-Patch0: easytag-2.0.1-id3lib.patch
-Patch1: easytag-2.1-ru-hint.asp.patch
+Patch0: easytag-2.1.6-id3lib.patch
+Patch1: easytag-2.1.6-cddb_manual_search_fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel >= 2.4.0, id3lib-devel >= 3.7.12
-BuildRequires: libvorbis-devel >= 1.0, flac-devel, libmp4v2-devel, wavpack-devel
+BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: id3lib-devel >= 3.7.12
+BuildRequires: libid3tag-devel
+BuildRequires: libvorbis-devel >= 1.0
+BuildRequires: flac-devel
+BuildRequires: speex-devel
+BuildRequires: libmp4v2-devel
+BuildRequires: wavpack-devel
 BuildRequires: gettext
 
 %description
@@ -27,6 +33,7 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monk
 %prep
 %setup -q
 %patch0 -p1 -b .id3lib
+%patch1 -p1 -b .cddb_manual_search_fix
 # With 2.0, the upstream tarball set *LOTS* of files +x :-(
 find . -type f -exec %{__chmod} -x {} \;
 %{__chmod} +x *.sh configure depcomp install-sh missing mkinstalldirs
@@ -58,6 +65,17 @@ find . -type f -exec %{__chmod} -x {} \;
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Saou <http://freshrpms.net/> 2.1.6-2
+- Add libid3tag-devel BR to fix id3 tag support (#525519).
+- Add speex-devel BR to support speex files.
+
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.1.6-1
+- Update to 2.1.6 : Development, but the latest for over a year now.
+- Include upstream cddb_manual_search_fix patch.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Jun 2007 16:37:24 -0000	1.9
+++ sources	8 Dec 2009 19:58:59 -0000	1.10
@@ -1 +1 @@
-2fe02aacaf58537d0a9ac7288b21edea  easytag-2.1-patched.tar.bz2
+7a79e256449a0641a0a3a4f1b61ed3e0  easytag-2.1.6-patched.tar.bz2


--- easytag-2.0.1-id3lib.patch DELETED ---


--- easytag-2.1-ru-hint.asp.patch DELETED ---



From rstrode at fedoraproject.org  Tue Dec  8 20:00:25 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue,  8 Dec 2009 20:00:25 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 fix-clock-crash.patch, NONE,
	1.1 gnome-panel.spec, 1.386, 1.387
Message-ID: <20091208200025.AD99C11C02CA@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7907

Modified Files:
	gnome-panel.spec 
Added Files:
	fix-clock-crash.patch 
Log Message:
- Fix clock crash (bug 537798)


fix-clock-crash.patch:
 clock.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE fix-clock-crash.patch ---
>From 58d7ba0359ab128f30b39ea0518a69ed83a4e329 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 8 Dec 2009 14:48:58 -0500
Subject: [PATCH] Only call e_passwords_shutdown once

It doesn't appear to support being called multiple times
in a row.

It appears there was already an attempt to do this with a
reference counter called clock_numbers:

/* Used to count the number of clock instances. It's there to know when
 * we should free resources that are shared. */
static int clock_numbers = 0;

But the logic was wrong.
---
 applets/clock/clock.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index ddbbc16..c06530a 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -803,8 +803,11 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
 
 #ifdef HAVE_LIBECAL
 	if (clock_numbers > 0) {
-		e_passwords_shutdown ();
 		clock_numbers--;
+
+		if (clock_numbers == 0) {
+			e_passwords_shutdown ();
+		}
 	}
 #endif
 }
@@ -1385,8 +1388,10 @@ static void
 create_clock_widget (ClockData *cd)
 {
 #ifdef HAVE_LIBECAL
+	if (clock_numbers == 0) {
+		e_passwords_init ();
+	}
 	clock_numbers++;
-	e_passwords_init ();
 #endif
 
         /* Main toggle button */
-- 
1.6.5.2



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- gnome-panel.spec	10 Nov 2009 03:55:51 -0000	1.386
+++ gnome-panel.spec	8 Dec 2009 20:00:24 -0000	1.387
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -130,6 +130,9 @@ Patch45: icon-padding.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=341441
 Patch46: resolution-change.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=537798
+Patch47: fix-clock-crash.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -182,6 +185,7 @@ Panel Applets using the libpanel-applet 
 %patch44 -p1 -b .icon-order
 %patch45 -p1 -b .icon-padding
 %patch46 -p1 -b .resolution-change
+%patch47 -p1 -b .fix-clock-crash
 
 . %{SOURCE6}
 
@@ -389,6 +393,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Dec 08 2009 Ray Strode <rstrode at redhat.com> 2.28.0-16
+- Fix clock crash (bug 537798)
+
 * Mon Nov  9 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-15
 - Improve the behaviour of the panel when screen resolution
   changes (gnome #341441)



From cebbert at fedoraproject.org  Tue Dec  8 20:03:17 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  8 Dec 2009 20:03:17 +0000 (UTC)
Subject: File patch-2.6.27.40.bz2 uploaded to lookaside cache by cebbert
Message-ID: <20091208200317.BFF6510F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kernel:

f9048ef4c9a7bf3cda7b50d4fef94143  patch-2.6.27.40.bz2



From nalin at fedoraproject.org  Tue Dec  8 20:05:41 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  8 Dec 2009 20:05:41 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-spnego-deleg.patch, NONE, 1.1 krb5.spec,
	1.217, 1.218
Message-ID: <20091208200541.EC73011C00C5@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10026

Modified Files:
	krb5.spec 
Added Files:
	krb5-1.7-spnego-deleg.patch 
Log Message:
- try to make gss_krb5_copy_ccache() work correctly for spnego (#542868)


krb5-1.7-spnego-deleg.patch:
 gssapiP_spnego.h |    9 +++++++++
 spnego_mech.c    |   17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE krb5-1.7-spnego-deleg.patch ---
Punt a set_cred_option() call down to the mechanism for the first
credential that we have whose mechanism implements a set_cred_option()
method.  Not completely sure this is the correct fix, as we may need to
change gssspi_set_cred_option() to keep going if it gets GSS_S_UNAVAILABLE
back from the mechanism-specific function (which is what the Kerberos
mechanism, previously the only provider of a set_cred_option(), returns
if it doesn't understand the request).

diff -up krb5/src/lib/gssapi/spnego/gssapiP_spnego.h krb5/src/lib/gssapi/spnego/gssapiP_spnego.h
--- krb5/src/lib/gssapi/spnego/gssapiP_spnego.h	2009-12-08 14:46:57.000000000 -0500
+++ krb5/src/lib/gssapi/spnego/gssapiP_spnego.h	2009-12-08 14:46:20.000000000 -0500
@@ -333,6 +333,15 @@ spnego_gss_inquire_sec_context_by_oid
 );
 
 OM_uint32
+spnego_gss_set_cred_option
+(
+	OM_uint32 *minor_status,
+	gss_cred_id_t cred_handle,
+	const gss_OID desired_object,
+	const gss_buffer_t value
+);
+
+OM_uint32
 spnego_gss_set_sec_context_option
 (
 	OM_uint32 *minor_status,
diff -up krb5/src/lib/gssapi/spnego/spnego_mech.c krb5/src/lib/gssapi/spnego/spnego_mech.c
--- krb5/src/lib/gssapi/spnego/spnego_mech.c	2009-12-08 14:47:01.000000000 -0500
+++ krb5/src/lib/gssapi/spnego/spnego_mech.c	2009-12-08 14:46:20.000000000 -0500
@@ -250,7 +250,7 @@ static struct gss_config spnego_mechanis
  	spnego_gss_inquire_sec_context_by_oid, /* gss_inquire_sec_context_by_oid */
  	NULL,				/* gss_inquire_cred_by_oid */
  	spnego_gss_set_sec_context_option, /* gss_set_sec_context_option */
- 	NULL,				/* gssspi_set_cred_option */
+ 	spnego_gss_set_cred_option,	/* gssspi_set_cred_option */
  	NULL,				/* gssspi_mech_invoke */
 	spnego_gss_wrap_aead,
 	spnego_gss_unwrap_aead,
@@ -2081,6 +2081,21 @@ spnego_gss_inquire_sec_context_by_oid(
 }
 
 OM_uint32
+spnego_gss_set_cred_option(
+		OM_uint32 *minor_status,
+		gss_cred_id_t cred_handle,
+		const gss_OID desired_object,
+		const gss_buffer_t value)
+{
+	OM_uint32 ret;
+	ret = gssspi_set_cred_option(minor_status,
+				     cred_handle,
+				     desired_object,
+				     value);
+	return (ret);
+}
+
+OM_uint32
 spnego_gss_set_sec_context_option(
 		OM_uint32 *minor_status,
 		gss_ctx_id_t *context_handle,


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- krb5.spec	4 Dec 2009 22:16:38 -0000	1.217
+++ krb5.spec	8 Dec 2009 20:05:41 -0000	1.218
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -79,6 +79,7 @@ Patch87: krb5-1.7-errs.patch
 Patch88: krb5-1.7-sizeof.patch
 Patch89: krb5-1.7-largefile.patch
 Patch90: krb5-1.7-openssl-1.0.patch
+Patch91: krb5-1.7-spnego-deleg.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -215,7 +216,10 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
-* Fri Dec  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-12
+* Tue Dec  8 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-13
+- try to make gss_krb5_copy_ccache() work correctly for spnego (#542868)
+
+* Fri Dec  4 2009 Nalin Dahyabhai <nalin at redhat.com>
 - make krb5-config suppress CFLAGS output when called with --libs (#544391)
 
 * Thu Dec  3 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-11
@@ -1501,6 +1505,7 @@ popd
 %patch88 -p1 -b .sizeof
 %patch89 -p1 -b .largefile
 %patch90 -p0 -b .openssl-1.0
+%patch91 -p1 -b .spnego-deleg
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex



From limb at fedoraproject.org  Tue Dec  8 20:14:07 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 20:14:07 +0000 (UTC)
Subject: File moodle-1.8.11.tgz uploaded to lookaside cache by limb
Message-ID: <20091208201407.8D27D10F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for moodle:

51a339cfd72129fe41f093b14e2546ce  moodle-1.8.11.tgz



From limb at fedoraproject.org  Tue Dec  8 20:14:47 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 20:14:47 +0000 (UTC)
Subject: rpms/moodle/EL-5 .cvsignore, 1.8, 1.9 moodle.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <20091208201447.8683F11C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13718

Modified Files:
	.cvsignore moodle.spec sources 
Log Message:
BZ 544766.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 Feb 2009 14:22:26 -0000	1.8
+++ .cvsignore	8 Dec 2009 20:14:47 -0000	1.9
@@ -1,4 +1,3 @@
-moodle-1.8.8.tgz
 af_utf8.zip
 ar_utf8.zip
 be_utf8.zip
@@ -73,7 +72,9 @@ tl_utf8.zip
 to_utf8.zip
 tr_utf8.zip
 uk_utf8.zip
+ur_utf8.zip
 uz_utf8.zip
 vi_utf8.zip
 zh_cn_utf8.zip
 zh_tw_utf8.zip
+moodle-1.8.11.tgz


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/EL-5/moodle.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- moodle.spec	5 Nov 2009 17:14:24 -0000	1.21
+++ moodle.spec	8 Dec 2009 20:14:47 -0000	1.22
@@ -7,8 +7,8 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.8.8
-Release:        4%{?dist}
+Version:        1.8.11
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -103,8 +103,8 @@ Source83:	http://download.moodle.org/lan
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Patch0:		moodle-1.8.8-CVE-2009-1171-1.patch
-Patch1:		moodle-1.8.8-CVE-2009-1171-2.patch
+#Patch0:		moodle-1.8.8-CVE-2009-1171-1.patch
+#Patch1:		moodle-1.8.8-CVE-2009-1171-2.patch
 
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
@@ -391,6 +391,18 @@ This package contains the files needed t
 %{moodlewebdir}/lang/de_du_utf8
 %{moodlewebdir}/install/lang/de_du_utf8
 
+%package        dv
+Summary:        Moodle language pack for Dhivehi
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    dv
+This package contains the files needed to display Moodle in Dhivehi.
+
+%files          dv
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/dv_utf8
+
 %package        el
 Summary:        Moodle language pack for Greek
 Group:          Applications/Publishing
@@ -1310,6 +1322,18 @@ This package contains the files needed t
 %{moodlewebdir}/install/lang/uk_utf8
 %{moodlewebdir}/lib/adodb/lang/adodb-uk1251.inc.php
 
+%package        ur
+Summary:        Moodle language pack for Urdu
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    ur
+This package contains the files needed to display Moodle in Urdu.
+
+%files          ur
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/ur_utf8
+
 %package        uz
 Summary:        Moodle language pack for Uzbek
 Group:          Applications/Publishing
@@ -1474,8 +1498,8 @@ sed -i 's/\r//' lib/pclzip/readme.txt
 sed -i 's/\r//' mod/wiki/ewiki/README
 sed -i 's/\r//' mod/wiki/ewiki/README.de
 
-%patch0 -p0
-%patch1 -p0
+#%patch0 -p0
+#%patch1 -p0
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -1528,7 +1552,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README*
+%doc README* COPYING.txt
 %dir %{_var}/www/moodle
 %dir %{moodlewebdir}
 %config(noreplace) %{moodlewebdir}/config.php
@@ -1657,8 +1681,12 @@ fi
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}-cron
+%exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.11-1
+- 1.8.11, BZ 544766.
+
 * Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-4
 - moodle-cron fix, BZ 533171.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 Feb 2009 14:22:26 -0000	1.12
+++ sources	8 Dec 2009 20:14:47 -0000	1.13
@@ -1,4 +1,3 @@
-8265d333bff1ac0bca0eaeaa53c84c6a  moodle-1.8.8.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip
@@ -73,7 +72,9 @@ c700dd1a55a3b8991430ac3f45a46f86  ta_lk_
 6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
+ba2222207b4fcae3ecd911508e915568  ur_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip
 31089008a31db97c283b0911ef9eae91  vi_utf8.zip
 c1c79d9af8ad9ff5feda7775d8178e23  zh_cn_utf8.zip
 8b2ba851407deb066d87bb4ac3204e25  zh_tw_utf8.zip
+51a339cfd72129fe41f093b14e2546ce  moodle-1.8.11.tgz



From mschwendt at fedoraproject.org  Tue Dec  8 20:23:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 20:23:24 +0000 (UTC)
Subject: rpms/gfan/devel gfan.spec,1.4,1.5
Message-ID: <20091208202324.B8D0911C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gfan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16568

Modified Files:
	gfan.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3-7
- Explicitly BR cddlib-static in accordance with the Packaging
  Guidelines (cddlib-devel is still static-only).



Index: gfan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gfan/devel/gfan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfan.spec	24 Jul 2009 23:55:13 -0000	1.4
+++ gfan.spec	8 Dec 2009 20:23:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gfan
 Version:        0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Software for Computing Gr?bner Fans and Tropical Varieties
 Group:          Applications/Engineering
 License:        GPL+
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # Respect DESTDIR
 Patch0:         gfan-0.3-respect-destdir.diff
 
-BuildRequires:  cddlib-devel
+BuildRequires:  cddlib-static cddlib-devel
 BuildRequires:  gmp-devel
 BuildRequires:  texlive-latex
 
@@ -72,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3-7
+- Explicitly BR cddlib-static in accordance with the Packaging
+  Guidelines (cddlib-devel is still static-only).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Tue Dec  8 20:25:05 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 20:25:05 +0000 (UTC)
Subject: rpms/qosmic/devel qosmic.spec,1.13,1.14
Message-ID: <20091208202505.A817311C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/qosmic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17216

Modified Files:
	qosmic.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.4.2-4
- Explicitly BR flam3-static in accordance with the Packaging
  Guidelines (flam3-devel is still static-only).



Index: qosmic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- qosmic.spec	27 Jul 2009 02:30:42 -0000	1.13
+++ qosmic.spec	8 Dec 2009 20:25:05 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           qosmic
 Version:        1.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A cosmic recursive fractal flame editor written in Qt4
 
 Group:          Applications/Multimedia
@@ -11,6 +11,7 @@ Source1:        http://%{name}.googlecod
 Source2:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  flam3-static
 BuildRequires:  flam3-devel >= 2.7.16
 BuildRequires:  qt4-devel >= 4.3.1
 BuildRequires:  ImageMagick
@@ -59,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.4.2-4
+- Explicitly BR flam3-static in accordance with the Packaging
+  Guidelines (flam3-devel is still static-only).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From limb at fedoraproject.org  Tue Dec  8 20:27:39 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  8 Dec 2009 20:27:39 +0000 (UTC)
Subject: rpms/moodle/EL-4 moodle-cron, 1.4, 1.5 moodle.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <20091208202739.D64B111C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18078

Modified Files:
	moodle-cron moodle.spec sources 
Log Message:
BZ 544766.



Index: moodle-cron
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/EL-4/moodle-cron,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moodle-cron	23 Feb 2009 19:04:04 -0000	1.4
+++ moodle-cron	8 Dec 2009 20:27:39 -0000	1.5
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-[ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php
+[ -f /var/lock/subsys/moodle ] && [ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/EL-4/moodle.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- moodle.spec	2 Apr 2009 20:31:25 -0000	1.21
+++ moodle.spec	8 Dec 2009 20:27:39 -0000	1.22
@@ -7,8 +7,8 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.8.8
-Release:        3%{?dist}
+Version:        1.8.11
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -103,8 +103,8 @@ Source83:	http://download.moodle.org/lan
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Patch0:		moodle-1.8.8-CVE-2009-1171-1.patch
-Patch1:		moodle-1.8.8-CVE-2009-1171-2.patch
+#Patch0:		moodle-1.8.8-CVE-2009-1171-1.patch
+#Patch1:		moodle-1.8.8-CVE-2009-1171-2.patch
 
 BuildRequires:  unzip
 Requires:       php-gd vixie-cron mimetex perl(lib) php-mysql php-xmlrpc
@@ -391,6 +391,18 @@ This package contains the files needed t
 %{moodlewebdir}/lang/de_du_utf8
 %{moodlewebdir}/install/lang/de_du_utf8
 
+%package        dv
+Summary:        Moodle language pack for Dhivehi
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    dv
+This package contains the files needed to display Moodle in Dhivehi.
+
+%files          dv
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/dv_utf8
+
 %package        el
 Summary:        Moodle language pack for Greek
 Group:          Applications/Publishing
@@ -1310,6 +1322,18 @@ This package contains the files needed t
 %{moodlewebdir}/install/lang/uk_utf8
 %{moodlewebdir}/lib/adodb/lang/adodb-uk1251.inc.php
 
+%package        ur
+Summary:        Moodle language pack for Urdu
+Group:          Applications/Publishing
+Requires:       moodle = %{version}-%{release}
+
+%description    ur
+This package contains the files needed to display Moodle in Urdu.
+
+%files          ur
+%defattr (-,root,root,-)
+%{moodlewebdir}/install/lang/ur_utf8
+
 %package        uz
 Summary:        Moodle language pack for Uzbek
 Group:          Applications/Publishing
@@ -1474,8 +1498,8 @@ sed -i 's/\r//' lib/pclzip/readme.txt
 sed -i 's/\r//' mod/wiki/ewiki/README
 sed -i 's/\r//' mod/wiki/ewiki/README.de
 
-%patch0 -p0
-%patch1 -p0
+#%patch0 -p0
+#%patch1 -p0
 
 %build
 rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex
@@ -1528,7 +1552,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README*
+%doc README* COPYING.txt
 %dir %{_var}/www/moodle
 %dir %{moodlewebdir}
 %config(noreplace) %{moodlewebdir}/config.php
@@ -1657,8 +1681,15 @@ fi
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}-cron
+%exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Tue Dec 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.11-1
+- 1.8.11, BZ 544766.
+
+* Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-4
+- moodle-cron fix, BZ 533171.
+
 * Thu Apr 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.8.8-3
 - Patch for CVE-2009-1171, BZ 493109.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	13 Feb 2009 14:41:29 -0000	1.13
+++ sources	8 Dec 2009 20:27:39 -0000	1.14
@@ -1,4 +1,3 @@
-8265d333bff1ac0bca0eaeaa53c84c6a  moodle-1.8.8.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip
@@ -73,7 +72,9 @@ c700dd1a55a3b8991430ac3f45a46f86  ta_lk_
 6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
+ba2222207b4fcae3ecd911508e915568  ur_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip
 31089008a31db97c283b0911ef9eae91  vi_utf8.zip
 c1c79d9af8ad9ff5feda7775d8178e23  zh_cn_utf8.zip
 8b2ba851407deb066d87bb4ac3204e25  zh_tw_utf8.zip
+51a339cfd72129fe41f093b14e2546ce  moodle-1.8.11.tgz



From mschwendt at fedoraproject.org  Tue Dec  8 20:28:30 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 20:28:30 +0000 (UTC)
Subject: rpms/grads/devel grads.spec,1.29,1.30
Message-ID: <20091208202830.6A97811C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/grads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18601

Modified Files:
	grads.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.a7.1-0.2
- Explicitly BR g2clib-static in accordance with the Packaging
  Guidelines (g2clib-devel is still static-only).



Index: grads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grads/devel/grads.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- grads.spec	27 Nov 2009 15:30:43 -0000	1.29
+++ grads.spec	8 Dec 2009 20:28:30 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        2.0.a7.1
-Release:        0.1%{?dist}
+Release:        0.2%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -21,7 +21,7 @@ Patch0:		grads-find-geotiff.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  hdf-devel g2clib-devel
+BuildRequires:  hdf-devel g2clib-static g2clib-devel
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libnc-dap-devel
@@ -94,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.a7.1-0.2
+- Explicitly BR g2clib-static in accordance with the Packaging
+  Guidelines (g2clib-devel is still static-only).
+
 * Fri Nov 27 2009 Deji Akingunola <dakingun at gmail.com> - 2.0.a7.1-0.1
 - Update to 2.0.a7 (See http://grads.iges.org/grads/changelog-2.0.txt for 
   detailed list of changes in 2.0.x release)



From mschwendt at fedoraproject.org  Tue Dec  8 20:29:39 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 20:29:39 +0000 (UTC)
Subject: rpms/ncl/devel ncl.spec,1.22,1.23
Message-ID: <20091208202939.DDA7211C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19151

Modified Files:
	ncl.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 5.1.1-4
- Explicitly BR g2clib-static in accordance with the Packaging
  Guidelines (g2clib-devel is still static-only).



Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ncl.spec	22 Sep 2009 17:42:33 -0000	1.22
+++ ncl.spec	8 Dec 2009 20:29:39 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           ncl
 Version:        5.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
@@ -43,7 +43,7 @@ Patch15:        ncl-5.0.0-udunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel
-BuildRequires:  g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel
+BuildRequires:  g2clib-static, g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel
 # imake needed for makedepend
 BuildRequires:  imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
 BuildRequires:  byacc, flex
@@ -303,6 +303,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 5.1.1-4
+- Explicitly BR g2clib-static in accordance with the Packaging
+  Guidelines (g2clib-devel is still static-only).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Tue Dec  8 20:30:55 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 20:30:55 +0000 (UTC)
Subject: rpms/wgrib2/devel wgrib2.spec,1.12,1.13
Message-ID: <20091208203055.4587B11C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/wgrib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19755

Modified Files:
	wgrib2.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.8.2-3
- Explicitly BR g2clib-static in accordance with the Packaging
  Guidelines (g2clib-devel is still static-only).



Index: wgrib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/wgrib2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- wgrib2.spec	12 Nov 2009 16:48:04 -0000	1.12
+++ wgrib2.spec	8 Dec 2009 20:30:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           wgrib2
 Version:        1.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manipulate, inventory and decode GRIB2 files
 
 Group:          Applications/Engineering
@@ -17,7 +17,7 @@ Source0:        wgrib2-%{version}.tar.gz
 Source1:        config.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  g2clib-devel, zlib-devel, netcdf-devel
+BuildRequires:  g2clib-static, g2clib-devel, zlib-devel, netcdf-devel
 BuildRequires:  mysql-devel
 
 %description
@@ -55,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.8.2-3
+- Explicitly BR g2clib-static in accordance with the Packaging
+  Guidelines (g2clib-devel is still static-only).
+
 * Thu Nov 12 2009 Orion Poplawski <orion at cora.nwra.com> -1.8.2-2
 - Rebuild for netcdf 4.1.0
 



From mschwendt at fedoraproject.org  Tue Dec  8 20:33:27 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 20:33:27 +0000 (UTC)
Subject: rpms/klibido/devel klibido.spec,1.7,1.8
Message-ID: <20091208203327.775F011C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/klibido/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20713

Modified Files:
	klibido.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.2.5-13
- Explicitly BR uulib-static in accordance with the Packaging
  Guidelines (uulib-devel is still static-only).



Index: klibido.spec
===================================================================
RCS file: /cvs/pkgs/rpms/klibido/devel/klibido.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- klibido.spec	25 Jul 2009 04:39:47 -0000	1.7
+++ klibido.spec	8 Dec 2009 20:33:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           klibido
 Version:        0.2.5
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        NNTP (Usenet) file grabber for KDE
 
 Group:          Applications/Internet
@@ -14,7 +14,7 @@ Patch3:         klibido-0.2.5-desktop_fi
 Patch4:         klibido-0.2.5-gcc4.3_compile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  uulib-devel kdelibs3-devel db4-devel desktop-file-utils ImageMagick
+BuildRequires:  uulib-static uulib-devel kdelibs3-devel db4-devel desktop-file-utils ImageMagick
 
 
 %description
@@ -72,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.2.5-13
+- Explicitly BR uulib-static in accordance with the Packaging
+  Guidelines (uulib-devel is still static-only).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.5-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kyle at fedoraproject.org  Tue Dec  8 20:38:47 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  8 Dec 2009 20:38:47 +0000 (UTC)
Subject: rpms/kernel/devel config-debug, 1.35, 1.36 config-nodebug, 1.47,
	1.48 kernel.spec, 1.1866, 1.1867
Message-ID: <20091208203847.70A0311C00C5@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22588

Modified Files:
	config-debug config-nodebug kernel.spec 
Log Message:
* Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-4
- Disable CONFIG_DEBUG_PERF_USE_VMALLOC for now, causes issues
  on x86_64. (rhbz#542791)



Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- config-debug	19 Nov 2009 05:50:20 -0000	1.35
+++ config-debug	8 Dec 2009 20:38:46 -0000	1.36
@@ -55,7 +55,7 @@ CONFIG_DEBUG_CREDENTIALS=y
 
 CONFIG_EXT4_DEBUG=y
 
-CONFIG_DEBUG_PERF_USE_VMALLOC=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- config-nodebug	19 Nov 2009 05:51:07 -0000	1.47
+++ config-nodebug	8 Dec 2009 20:38:46 -0000	1.48
@@ -59,7 +59,7 @@ CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
 CONFIG_EXT4_DEBUG=y
 
-CONFIG_DEBUG_PERF_USE_VMALLOC=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 
 CONFIG_JBD2_DEBUG=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1866
retrieving revision 1.1867
diff -u -p -r1.1866 -r1.1867
--- kernel.spec	7 Dec 2009 18:05:35 -0000	1.1866
+++ kernel.spec	8 Dec 2009 20:38:46 -0000	1.1867
@@ -1997,6 +1997,10 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-4
+- Disable CONFIG_DEBUG_PERF_USE_VMALLOC for now, causes issues
+  on x86_64. (rhbz#542791)
+
 * Mon Dec  7 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.32-3
 - Allow userspace to adjust kvmclock offset (#530389)
 



From olea at fedoraproject.org  Tue Dec  8 20:45:22 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  8 Dec 2009 20:45:22 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-10 .cvsignore, 1.12, 1.13 import.log, 1.5,
	1.6 purple-facebookchat.spec, 1.17, 1.18 sources, 1.13, 1.14
Message-ID: <20091208204522.C39D311C00C5@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25143/F-10

Modified Files:
	.cvsignore import.log purple-facebookchat.spec sources 
Log Message:
updating to 1.64


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Sep 2009 11:27:35 -0000	1.12
+++ .cvsignore	8 Dec 2009 20:45:22 -0000	1.13
@@ -1 +1 @@
-pidgin-facebookchat-source-1.61.tar.bz2
+pidgin-facebookchat-source-1.64.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	12 Sep 2009 11:27:35 -0000	1.5
+++ import.log	8 Dec 2009 20:45:22 -0000	1.6
@@ -3,3 +3,4 @@ purple-facebookchat-1_51-1olea:F-10:purp
 purple-facebookchat-1_52-1olea:F-10:purple-facebookchat-1.52-1olea.src.rpm:1246115999
 purple-facebookchat-1_60-1olea:F-10:purple-facebookchat-1.60-1olea.src.rpm:1248395949
 purple-facebookchat-1_61-1_olea:F-10:purple-facebookchat-1.61-1.olea.src.rpm:1252754831
+purple-facebookchat-1_64-1_olea:F-10:purple-facebookchat-1.64-1.olea.src.rpm:1260305081


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/purple-facebookchat.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- purple-facebookchat.spec	12 Sep 2009 11:27:35 -0000	1.17
+++ purple-facebookchat.spec	8 Dec 2009 20:45:22 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           purple-facebookchat
-Version:        1.61
+Version:        1.64
 Release:        1%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
@@ -11,6 +11,7 @@ Provides:       pidgin-facebookchat = %{
 Obsoletes:      pidgin-facebookchat < 1.35-3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libpurple-devel >= 2.5.8
+
 BuildRequires:  json-glib-devel
 #BuildRequires:  zlib-devel
 ExcludeArch:    s390x
@@ -51,9 +52,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Tue Dec 8 2009 Ismael Olea <ismael at olea.org> 1.64-1
+- updating to 1.64
+
+* Mon Nov 16 2009 Ismael Olea <ismael at olea.org> 1.63-1
+- updating to 1.63
+
+* Fri Nov 6 2009 Ismael Olea <ismael at olea.org> 1.62-1
+- updating to 1.62
+
 * Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-1
 - updating to 1.61
-%changelog
+
 * Tue Jul 23 2009 Ismael Olea <ismael at olea.org> 1.60-1
 - updating to 1.60
 - adding new sourcecode files to makefile


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Sep 2009 11:27:35 -0000	1.13
+++ sources	8 Dec 2009 20:45:22 -0000	1.14
@@ -1 +1 @@
-9e78f200710d2dc8134d4e9e5f237618  pidgin-facebookchat-source-1.61.tar.bz2
+e757a02899dce56b45a4b253303bea4d  pidgin-facebookchat-source-1.64.tar.bz2



From mschwendt at fedoraproject.org  Tue Dec  8 20:47:57 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 20:47:57 +0000 (UTC)
Subject: rpms/dvisvgm/devel dvisvgm.spec,1.5,1.6
Message-ID: <20091208204757.2B99811C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/dvisvgm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26116

Modified Files:
	dvisvgm.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.7-2
- Explicitly BR potrace-static in accordance with the Packaging
  Guidelines (potrace-devel is still static-only).



Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/dvisvgm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dvisvgm.spec	10 Nov 2009 07:18:30 -0000	1.5
+++ dvisvgm.spec	8 Dec 2009 20:47:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           dvisvgm
 Version:        0.8.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A DVI to SVG converter
 
 Group:          Applications/Publishing
@@ -10,7 +10,8 @@ Source0:        http://downloads.sourcef
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake freetype-devel ghostscript-devel potrace-devel zlib-devel 
+BuildRequires:  automake freetype-devel ghostscript-devel zlib-devel 
+BuildRequires:  potrace-static potrace-devel
 
 %if 0%{?rhel} == 4 || 0%{?rhel} == 5
 BuildRequires:  tetex-fonts
@@ -65,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.7-2
+- Explicitly BR potrace-static in accordance with the Packaging
+  Guidelines (potrace-devel is still static-only).
+
 * Tue Nov 10 2009  Martin Gieseking <martin.gieseking at uos.de> - 0.8.7-1
 - updated to latest upstream release 0.8.7
 



From rstrode at fedoraproject.org  Tue Dec  8 20:49:59 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue,  8 Dec 2009 20:49:59 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.494,1.495
Message-ID: <20091208204959.ED60711C00C5@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26845

Modified Files:
	gdm.spec 
Log Message:
Add xdmcp build req



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- gdm.spec	3 Dec 2009 05:05:23 -0000	1.494
+++ gdm.spec	8 Dec 2009 20:49:59 -0000	1.495
@@ -88,6 +88,7 @@ BuildRequires: iso-codes-devel
 BuildRequires: gnome-panel-devel
 BuildRequires: libxklavier-devel >= 4.0
 BuildRequires: DeviceKit-power-devel >= 008
+BuildRequires: libXdmcp-devel
 
 Provides: service(graphical-login)
 



From nalin at fedoraproject.org  Tue Dec  8 20:51:25 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue,  8 Dec 2009 20:51:25 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.218,1.219
Message-ID: <20091208205125.DE36711C00C5@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27461

Modified Files:
	krb5.spec 
Log Message:
back that last change out


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- krb5.spec	8 Dec 2009 20:05:41 -0000	1.218
+++ krb5.spec	8 Dec 2009 20:51:25 -0000	1.219
@@ -216,6 +216,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Tue Dec  8 2009 Nalin Dahyabhai <nalin at redhat.com>
+- back that last change out
+
 * Tue Dec  8 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-13
 - try to make gss_krb5_copy_ccache() work correctly for spnego (#542868)
 
@@ -1505,7 +1508,7 @@ popd
 %patch88 -p1 -b .sizeof
 %patch89 -p1 -b .largefile
 %patch90 -p0 -b .openssl-1.0
-%patch91 -p1 -b .spnego-deleg
+#%patch91 -p1 -b .spnego-deleg
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex



From mschwendt at fedoraproject.org  Tue Dec  8 20:54:41 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 20:54:41 +0000 (UTC)
Subject: rpms/pure/devel pure.spec,1.3,1.4
Message-ID: <20091208205441.81A6711C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/pure/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28568

Modified Files:
	pure.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.36-2
- Explicitly BR llvm-static in accordance with the Packaging
  Guidelines (llvm-devel is still static-only).



Index: pure.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure/devel/pure.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pure.spec	24 Oct 2009 03:06:58 -0000	1.3
+++ pure.spec	8 Dec 2009 20:54:41 -0000	1.4
@@ -11,7 +11,7 @@
 
 Name:           pure
 Version:        0.36
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A term-rewriting functional programming language
 
 Group:          Development/Languages
@@ -23,7 +23,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  gmp-devel readline-devel gsl-devel
 # Not checked by configure
-BuildRequires:  llvm-devel >= 2.4 flex bison
+BuildRequires:  llvm-static llvm-devel >= 2.4 flex bison
 # For compiling emacs mode
 BuildRequires:  emacs emacs-el
 
@@ -145,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.36-2
+- Explicitly BR llvm-static in accordance with the Packaging
+  Guidelines (llvm-devel is still static-only).
+
 * Fri Oct 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.36-1
 - Update to 0.36
 



From kyle at fedoraproject.org  Tue Dec  8 20:55:07 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  8 Dec 2009 20:55:07 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1867,1.1868
Message-ID: <20091208205507.1090C11C00C5@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28798

Modified Files:
	kernel.spec 
Log Message:
* Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-5
- new rpm changes:
 - %{PACKAGE_VERSION} -> %{version}
 - %{PACKAGE_RELEASE} -> %{release}



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1867
retrieving revision 1.1868
diff -u -p -r1.1867 -r1.1868
--- kernel.spec	8 Dec 2009 20:38:46 -0000	1.1867
+++ kernel.spec	8 Dec 2009 20:55:06 -0000	1.1868
@@ -167,7 +167,7 @@ Summary: The Linux kernel
 
 %define make_target bzImage
 
-%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}.%{_target_cpu}
+%define KVERREL %{version}-%{release}.%{_target_cpu}
 %define hdrarch %_target_cpu
 %define asmarch %_target_cpu
 
@@ -1997,6 +1997,11 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-5
+- new rpm changes:
+ - %{PACKAGE_VERSION} -> %{version}
+ - %{PACKAGE_RELEASE} -> %{release}
+
 * Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-4
 - Disable CONFIG_DEBUG_PERF_USE_VMALLOC for now, causes issues
   on x86_64. (rhbz#542791)



From mschwendt at fedoraproject.org  Tue Dec  8 21:04:01 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:04:01 +0000 (UTC)
Subject: rpms/garmintools/devel garmintools.spec,1.1,1.2
Message-ID: <20091208210401.2715911C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/garmintools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31807

Modified Files:
	garmintools.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.10-3
- Explicitly BR libgarmin-static in accordance with the Packaging
  Guidelines (libgarmin-devel is still static-only).



Index: garmintools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/garmintools/devel/garmintools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- garmintools.spec	4 Oct 2009 18:05:47 -0000	1.1
+++ garmintools.spec	8 Dec 2009 21:04:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           garmintools
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Communication tools for Garmin devices
 
 License:        GPLv2+
@@ -12,7 +12,7 @@ Source2:        garmintools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel
-BuildRequires:  libgarmin-devel
+BuildRequires:  libgarmin-static libgarmin-devel
 
 Requires:       udev
 
@@ -85,6 +85,10 @@ rmmod garmin_gps &>/dev/null || true
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.10-3
+- Explicitly BR libgarmin-static in accordance with the Packaging
+  Guidelines (libgarmin-devel is still static-only).
+
 * Tue Sep 22 2009 Fabian Affolter <fabian at bernewireless.net> - 0.10-2
 - Fixed ldconfig stuff
 - Fixed ownership of files



From mschwendt at fedoraproject.org  Tue Dec  8 21:09:34 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:09:34 +0000 (UTC)
Subject: rpms/libfac/devel libfac.spec,1.24,1.25
Message-ID: <20091208210934.67CEE11C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/libfac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1378

Modified Files:
	libfac.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 3.1.0-3
- Explicitly BR factory-static in accordance with the Packaging
  Guidelines (factory-devel is still static-only).



Index: libfac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfac/devel/libfac.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libfac.spec	25 Jul 2009 05:36:18 -0000	1.24
+++ libfac.spec	8 Dec 2009 21:09:34 -0000	1.25
@@ -2,7 +2,7 @@
 Summary: An extension to Singular-factory
 Name:    libfac
 Version: 3.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
@@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # -debuginfo useless for (only) static libs
 %define debug_package   %{nil}
 
+BuildRequires: factory-static
 BuildRequires: factory-devel >= %{version}
 
 %description
@@ -67,6 +68,10 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 3.1.0-3
+- Explicitly BR factory-static in accordance with the Packaging
+  Guidelines (factory-devel is still static-only).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:10:54 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:10:54 +0000 (UTC)
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.54,1.55
Message-ID: <20091208211054.9488B11C03DB@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/Macaulay2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1999

Modified Files:
	Macaulay2.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2-7
- Explicitly BR factory-static and libfac-static in accordance with the
  Packaging Guidelines (factory-devel/libfac-devel are still static-only).



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- Macaulay2.spec	23 Sep 2009 01:02:40 -0000	1.54
+++ Macaulay2.spec	8 Dec 2009 21:10:54 -0000	1.55
@@ -7,7 +7,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 Group:   Applications/Engineering
@@ -42,7 +42,9 @@ BuildRequires: gc-devel 
 BuildRequires: gcc-gfortran
 BuildRequires: gdbm-devel
 BuildRequires: info
+BuildRequires: factory-static
 BuildRequires: factory-devel >= 3.1
+BuildRequires: libfac-static
 BuildRequires: libfac-devel >= 3.1
 BuildRequires: lapack-devel
 BuildRequires: mpfr-devel
@@ -211,6 +213,10 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2-7
+- Explicitly BR factory-static and libfac-static in accordance with the
+  Packaging Guidelines (factory-devel/libfac-devel are still static-only).
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-6
 - fixup/optimize scriplets
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:13:44 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:13:44 +0000 (UTC)
Subject: rpms/gc/devel gc.spec,1.41,1.42
Message-ID: <20091208211344.764EA11C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3351

Modified Files:
	gc.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 7.1-10
- Explicitly BR libatomic_ops-static in accordance with the Packaging
  Guidelines (libatomic_ops-devel is still static-only).



Index: gc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gc/devel/gc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gc.spec	24 Jul 2009 23:33:58 -0000	1.41
+++ gc.spec	8 Dec 2009 21:13:44 -0000	1.42
@@ -3,7 +3,7 @@ Summary: A garbage collector for C and C
 Name:    gc	
 Version: 7.1
 
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -22,7 +22,7 @@ Patch50: gc-7.1-dup_cpp_headers.patch
 Patch100: gc-7.1-dont_add_byte.patch
 
 BuildRequires: automake libtool 
-BuildRequires: libatomic_ops-devel
+BuildRequires: libatomic_ops-static libatomic_ops-devel
 BuildRequires: pkgconfig
 
 # rpmforge compatibility
@@ -121,6 +121,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 7.1-10
+- Explicitly BR libatomic_ops-static in accordance with the Packaging
+  Guidelines (libatomic_ops-devel is still static-only).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:17:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:17:24 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.106,1.107
Message-ID: <20091208211724.629B411C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4701

Modified Files:
	pulseaudio.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9.21-3
- Explicitly BR libatomic_ops-static in accordance with the Packaging
  Guidelines (libatomic_ops-devel is still static-only).



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- pulseaudio.spec	2 Dec 2009 21:15:28 -0000	1.106
+++ pulseaudio.spec	8 Dec 2009 21:17:24 -0000	1.107
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -27,7 +27,7 @@ BuildRequires:  GConf2-devel
 BuildRequires:  avahi-devel
 BuildRequires:  lirc-devel
 BuildRequires:  jack-audio-connection-kit-devel
-BuildRequires:  libatomic_ops-devel
+BuildRequires:  libatomic_ops-static, libatomic_ops-devel
 BuildRequires:  bluez-libs-devel
 BuildRequires:  libXt-devel
 BuildRequires:  xorg-x11-proto-devel
@@ -439,6 +439,10 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9.21-3
+- Explicitly BR libatomic_ops-static in accordance with the Packaging
+  Guidelines (libatomic_ops-devel is still static-only).
+
 * Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.21-2
 - module-device-manager, kde autostart bits missing (#541419)
 



From mbooth at fedoraproject.org  Tue Dec  8 21:27:54 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Tue,  8 Dec 2009 21:27:54 +0000 (UTC)
Subject: rpms/jakarta-commons-modeler/F-12 pom.xml, NONE,
	1.1 jakarta-commons-modeler.spec, 1.41, 1.42 sources, 1.3,
	1.4 .cvsignore, 1.5, 1.6 jakarta-commons-modeler.build.xml.patch,
	1.2, NONE jakarta-commons-modeler.build.properties.default.patch,
	1.2, NONE
Message-ID: <20091208212754.37FCD11C00C5@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/jakarta-commons-modeler/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8313/jakarta-commons-modeler/F-12

Modified Files:
	jakarta-commons-modeler.spec sources .cvsignore 
Added Files:
	pom.xml 
Removed Files:
	jakarta-commons-modeler.build.xml.patch 
	jakarta-commons-modeler.build.properties.default.patch 
Log Message:
* Wed Dec 2 2009 Mat Booth <fedora at matbooth.co.uk> - 2.0.1-1
- Update to 2.0.1
- Rewrite spec file to build using upstream-preferred maven instead of ant
- Drop patches to build script
- Now with OSGi manifest (comes free with the maven build)
- Now installs pom and fettles the maven dep-map, see RHBZ #542730
- Fix javadoc package requires



--- NEW FILE pom.xml ---
<?xml version="1.0"?>
<!--
   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

       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.
-->
<project
    xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <parent>
    <groupId>org.apache.commons</groupId>
    <artifactId>commons-parent</artifactId>
    <version>11</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-modeler</groupId>
  <artifactId>commons-modeler</artifactId>
  <version>2.0.1</version>
  <name>Commons Modeler</name>
  <inceptionYear>2002</inceptionYear>
  <description>
      Commons Modeler makes the process of setting up JMX (Java
      Management Extensions) MBeans easier by configuring the required meta
      data using an XML descriptor. In addition, Modeler provides a factory
      mechanism to create the actual Model MBean instances. 
  </description>
  <url>http://commons.apache.org/modeler/</url>

  <issueManagement>
    <system>jira</system>
    <url>http://issues.apache.org/jira/browse/MODELER</url>
  </issueManagement>

  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/modeler/trunk</connection>
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/modeler/trunk</developerConnection>
    <url>http://svn.apache.org/viewvc/commons/proper/modeler/trunk</url>
  </scm>

  <developers>
    <developer>
      <name>Craig McClanahan</name>
      <id>craigmcc</id>
      <email>craigmcc at apache.org</email>
      <organization>Apache</organization>
    </developer>

    <developer>
      <name>Yoav Shapira</name>
      <id>yoavs</id>
      <email>yoavs at apache.org</email>
      <organization>Apache</organization>
    </developer>

    <developer>
      <name>Bill Barker</name>
      <id>billbarker</id>
      <email>billbarker at apache.org</email>
      <organization>Apache</organization>
    </developer>

    <developer>
      <name>Davanum Srinivas</name>
      <id>dims</id>
      <email>dims at apache.org</email>
      <organization>Apache</organization>
    </developer>
  </developers>

  <dependencies>
    <dependency>
      <groupId>commons-digester</groupId>
      <artifactId>commons-digester</artifactId>
      <version>1.4.1</version>
    </dependency>

    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging-api</artifactId>
      <version>1.0.4</version>
    </dependency>

    <dependency>
      <groupId>mx4j</groupId>
      <artifactId>mx4j-jmx</artifactId>
      <version>2.1.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>2.0.2</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.5</version>
      <optional>true</optional>
    </dependency>
  </dependencies>

  <properties>
    <commons.componentid>modeler</commons.componentid>
    <commons.release.version>2.0.1</commons.release.version>
    <commons.binary.suffix></commons.binary.suffix>
    <commons.jira.id>MODELER</commons.jira.id>
    <commons.jira.pid>12310486</commons.jira.pid>
  </properties> 

  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <directory>.</directory>
        <targetPath>META-INF</targetPath>
        <includes>
          <include>NOTICE.txt</include>
          <include>LICENSE.txt</include>
        </includes>
      </resource>
      <resource>
        <directory>src/java/org/apache/commons/modeler/ant</directory>
        <targetPath>META-INF</targetPath>
        <includes>
          <include>ant.properties</include>
        </includes>
      </resource>
      <resource>
        <directory>src/java</directory>
        <targetPath>META-INF</targetPath>
        <includes>
          <include>**/ant.properties</include>
          <include>**/mbeans-descriptors.dtd</include>
        </includes>
      </resource>
    </resources>

    <testResources>
      <testResource>
        <directory>src/test</directory>
        <filtering>false</filtering>
        <includes>
          <include>**/*.xml</include>
        </includes>
      </testResource>
    </testResources>

    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>**/*TestCase.java</include>
          </includes>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-assembly-plugin</artifactId>
        <configuration>
          <descriptors>
            <descriptor>src/assembly/bin.xml</descriptor>
            <descriptor>src/assembly/src.xml</descriptor>
          </descriptors>
          <tarLongFileMode>gnu</tarLongFileMode>
        </configuration>
      </plugin>
    </plugins>
  </build>

  <reporting>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-changes-plugin</artifactId>
        <version>2.0</version>
        <configuration>
          <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
          <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
        </configuration>
        <reportSets>
          <reportSet>
            <reports>
               <report>changes-report</report>
            </reports>
          </reportSet>
        </reportSets>
      </plugin>
    </plugins>
  </reporting>

</project>


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/F-12/jakarta-commons-modeler.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- jakarta-commons-modeler.spec	25 Jul 2009 03:51:27 -0000	1.41
+++ jakarta-commons-modeler.spec	8 Dec 2009 21:27:53 -0000	1.42
@@ -1,183 +1,145 @@
-# Copyright (c) 2000-2007, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%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 base_name       modeler
-%define short_name      commons-%{base_name}
-
-Name:       jakarta-%{short_name}
-Epoch:      0
-Version:    2.0
-Release:    6.3%{?dist}
-Summary:    Model MBeans utilty classes
-Group:      Development/Libraries/Java
-License:    ASL 2.0
-Url:        http://jakarta.apache.org/commons/%{base_name}
-Source0:    http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/modeler/source/commons-modeler-2.0-src.tar.gz
-Patch0:     %{name}.build.properties.default.patch
-Patch1:     %{name}.build.xml.patch
-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
-%endif
-BuildRequires:  ant
-BuildRequires:  findutils
-BuildRequires:  jakarta-commons-beanutils >= 0:1.3
-BuildRequires:  jakarta-commons-collections >= 0:2.0
-BuildRequires:  jakarta-commons-digester >= 0:1.2
-BuildRequires:  jakarta-commons-logging >= 0:1.0
-BuildRequires:  jaxp_parser_impl
-BuildRequires:  jaxp_transform_impl
-BuildRequires:  jmxri
-BuildRequires:  junit >= 0:3.7
-BuildRequires:  xml-commons-apis >= 1.3
-Requires:       jakarta-commons-beanutils >= 0:1.3
-Requires:       jakarta-commons-collections >= 0:2.0
-Requires:       jakarta-commons-digester >= 0:1.2
-Requires:       jakarta-commons-logging >= 0:1.0
-Requires:       jaxp_parser_impl
-Requires:       jaxp_transform_impl
-Requires:       jmxri
-Requires:       xml-commons-apis
-%if ! %{gcj_support}
-BuildArch:      noarch
-%endif
-Provides: %{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
+%global short_name commons-modeler
+
+# TODO - Drop "jakarta-" from the package name
+Name:          jakarta-%{short_name}
+Version:       2.0.1
+Release:       1%{?dist}
+Summary:       Model MBeans utility classes
+Group:         Development/Libraries/Java
+License:       ASL 2.0
+URL:           http://commons.apache.org/modeler/
+
+Source0:       http://archive.apache.org/dist/commons/modeler/source/%{short_name}-%{version}-src.tar.gz
+
+# a maven2 pom is not supplied, so supply one based on the one from source control:
+#  $ svn export -r 678495 http://svn.apache.org/repos/asf/commons/proper/modeler/trunk/pom.xml
+Source1:       pom.xml
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:     noarch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: jakarta-commons-beanutils >= 1.6
+BuildRequires: jakarta-commons-collections >= 2.1
+BuildRequires: jakarta-commons-digester >= 1.4.1
+BuildRequires: jakarta-commons-logging >= 1.0.4
+BuildRequires: mx4j >= 2.1.1
+BuildRequires: xml-commons-apis
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-idea
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+Requires:      java
+Requires:      jpackage-utils
+Requires:      jakarta-commons-beanutils >= 1.6
+Requires:      jakarta-commons-collections >= 2.1
+Requires:      jakarta-commons-digester >= 1.4.1
+Requires:      jakarta-commons-logging >= 1.0.4
+Requires:      mx4j >= 2.1.1
+Requires:      xml-commons-apis
+
+Provides:      %{short_name} = %{version}-%{release}
+Obsoletes:     %{short_name} < %{version}-%{release}
 
 %description
-The Modeler project shall create and maintain a set of Java
-classes to provide support for configuring and instantiating Model
-MBeans, plus unit tests and small examples of using these facilities
-to instrument Java classes with Model MBean support.
+Commons Modeler makes the process of setting up JMX (Java Management
+Extensions) MBeans easier by configuring the required meta data using an
+XML descriptor. In addition, Modeler provides a factory mechanism to
+create the actual Model MBean instances.
 
 %package javadoc
-Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Summary:       Javadocs for %{name}
+Group:         Development/Documentation
+Requires:      %{name} = %{version}-%{release}
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-%patch0
-%patch1  
-# remove all binary files
-find . \( -name "*.jar" -o -name "*.class" -o -name "*.zip" \) \
-    | xargs %{__rm} -f
-
-
-# fix eol encodings
-%{__sed} -i 's/\r//' xdocs/downloads.xml
-%{__sed} -i 's/\r//' xdocs/cvs-usage.xml
-%{__sed} -i 's/\r//' xdocs/issue-tracking.xml
-%{__sed} -i 's/\r//' LICENSE.txt
-%{__sed} -i 's/\r//' xdocs/navigation.xml
-%{__sed} -i 's/\r//' xdocs/style/project.css
-%{__sed} -i 's/\r//' xdocs/index.xml
-%{__sed} -i 's/\r//' xdocs/building.xml
-%{__sed} -i 's/\r//' NOTICE.txt
-%{__sed} -i 's/\r//' RELEASE-NOTES.txt
+
+cp -p %{SOURCE1} pom.xml
 
 %build
-export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl jmxri junit commons-beanutils commons-collections commons-digester commons-logging)
-%{ant} dist
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+# TODO: remove the hack below when 543686 is fixed
+mkdir -p $MAVEN_REPO_LOCAL/mx4j/mx4j-jmx/2.1.1
+pushd $MAVEN_REPO_LOCAL/mx4j/mx4j-jmx/2.1.1
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar mx4j-jmx-2.1.1.jar
+cat <<HEREDOC > mx4j-jmx-2.1.1.pom
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>mx4j</groupId>
+  <artifactId>mx4j-jmx</artifactId>
+  <version>2.1.1</version>
+</project>
+HEREDOC
+popd
+# TODO: remove the hack above when 543686 is fixed
+
+# TODO: disable tests for now because they need internet access -- they run fine locally
+mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven.test.skip=true install javadoc:javadoc
 
 %install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
+
 # jars
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -a dist/%{short_name}.jar \
-    %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(
-    cd %{buildroot}%{_javadir}
-    for jar in *-%{version}*; do
-        %{__ln_s} ${jar} `echo $jar | %{__sed} "s|jakarta-||g"`
-    done
-)
-(
-    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}
-%{__cp} -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(
-    cd %{buildroot}%{_javadocdir}
-    %{__ln_s} %{name}-%{version} %{name}
-)
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+install -pD -T target/%{short_name}-%{version}.jar \
+  %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# javadocs
+mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+
+# pom
+install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
-%defattr(0644,root,root,0755)
-%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES*
+%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 2 2009 Mat Booth <fedora at matbooth.co.uk> - 2.0.1-1
+- Update to 2.0.1
+- Rewrite spec file to build using upstream-preferred maven instead of ant
+- Drop patches to build script
+- Now with OSGi manifest (comes free with the maven build)
+- Now installs pom and fettles the maven dep-map, see RHBZ #542730
+- Fix javadoc package requires
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0-6.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Apr 2007 00:25:06 -0000	1.3
+++ sources	8 Dec 2009 21:27:53 -0000	1.4
@@ -1 +1 @@
-43983c66113ddaa9880e4a7ea7d38db4  commons-modeler-2.0-src.tar.gz
+9ad2dc25be91c38b93346653736856dd  commons-modeler-2.0.1-src.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Apr 2007 00:25:06 -0000	1.5
+++ .cvsignore	8 Dec 2009 21:27:53 -0000	1.6
@@ -1 +1 @@
-commons-modeler-2.0-src.tar.gz
+commons-modeler-2.0.1-src.tar.gz


--- jakarta-commons-modeler.build.xml.patch DELETED ---


--- jakarta-commons-modeler.build.properties.default.patch DELETED ---



From mschwendt at fedoraproject.org  Tue Dec  8 21:29:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:29:24 +0000 (UTC)
Subject: devel/gnupg2 gnupg2.spec,1.96,1.97
Message-ID: <20091208212924.8264211C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/devel/gnupg2
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8820/gnupg2

Modified Files:
	gnupg2.spec 
Log Message:
- Explicitly BR libassuan-static in accordance with the Packaging
  Guidelines (libassuan-devel is still static-only).



Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/devel/gnupg2/gnupg2.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- gnupg2.spec	23 Oct 2009 17:19:57 -0000	1.96
+++ gnupg2.spec	8 Dec 2009 21:29:24 -0000	1.97
@@ -2,7 +2,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -20,7 +20,7 @@ BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
-BuildRequires: libassuan-devel >= 1.0.4
+BuildRequires: libassuan-static, libassuan-devel >= 1.0.4
 # libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320
 BuildRequires:  libgcrypt-devel >= 1.4
 #Requires(hint): libgcrypt >= 1.4
@@ -185,6 +185,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.13-4
+- Explicitly BR libassuan-static in accordance with the Packaging
+  Guidelines (libassuan-devel is still static-only).
+
 * Fri Oct 23 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.13-3
 - drop s390 specific ifnarchs as all the previously missing dependencies
   are now there



From mschwendt at fedoraproject.org  Tue Dec  8 21:29:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:29:24 +0000 (UTC)
Subject: devel/dirmngr dirmngr.spec,1.19,1.20
Message-ID: <20091208212924.4918511C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/devel/dirmngr
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8820/dirmngr

Modified Files:
	dirmngr.spec 
Log Message:
- Explicitly BR libassuan-static in accordance with the Packaging
  Guidelines (libassuan-devel is still static-only).



Index: dirmngr.spec
===================================================================
RCS file: /cvs/pkgs/devel/dirmngr/dirmngr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- dirmngr.spec	24 Jul 2009 20:18:43 -0000	1.19
+++ dirmngr.spec	8 Dec 2009 21:29:24 -0000	1.20
@@ -4,7 +4,7 @@
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
 Version: 1.0.3
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 
 License: GPLv2+
 Group:	 System Environment/Libraries
@@ -21,7 +21,7 @@ Source12: dirmngr.logrotate
 
 BuildRequires: gawk
 BuildRequires: gettext
-BuildRequires: libassuan-devel
+BuildRequires: libassuan-static, libassuan-devel
 BuildRequires: libgcrypt-devel >= 1.2.0
 BuildRequires: libksba-devel >= 1.0.0 
 BuildRequires: openldap-devel
@@ -120,6 +120,10 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0.3-4
+- Explicitly BR libassuan-static in accordance with the Packaging
+  Guidelines (libassuan-devel is still static-only).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:29:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:29:24 +0000 (UTC)
Subject: devel/gpa gpa.spec,1.22,1.23
Message-ID: <20091208212924.B29F911C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/devel/gpa
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8820/gpa

Modified Files:
	gpa.spec 
Log Message:
- Explicitly BR libassuan-static in accordance with the Packaging
  Guidelines (libassuan-devel is still static-only).



Index: gpa.spec
===================================================================
RCS file: /cvs/pkgs/devel/gpa/gpa.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gpa.spec	25 Jul 2009 01:05:12 -0000	1.22
+++ gpa.spec	8 Dec 2009 21:29:24 -0000	1.23
@@ -2,7 +2,7 @@
 Name:	 gpa
 Summary: Graphical user interface for GnuPG
 Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Group:   Applications/System
@@ -19,7 +19,7 @@ BuildRequires: gettext
 BuildRequires: gnupg
 BuildRequires: gpgme-devel
 BuildRequires: gtk2-devel
-BuildRequires: libassuan-devel
+BuildRequires: libassuan-static, libassuan-devel
 BuildRequires: zlib-devel
 
 %description
@@ -84,6 +84,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.0-3
+- Explicitly BR libassuan-static in accordance with the Packaging
+  Guidelines (libassuan-devel is still static-only).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:29:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:29:24 +0000 (UTC)
Subject: devel/kdepim kdepim.spec,1.249,1.250
Message-ID: <20091208212924.E678811C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/devel/kdepim
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8820/kdepim

Modified Files:
	kdepim.spec 
Log Message:
- Explicitly BR libassuan-static in accordance with the Packaging
  Guidelines (libassuan-devel is still static-only).



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/devel/kdepim/kdepim.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- kdepim.spec	8 Dec 2009 16:55:05 -0000	1.249
+++ kdepim.spec	8 Dec 2009 21:29:24 -0000	1.250
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -41,7 +41,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: libassuan-devel
+BuildRequires: libassuan-static, libassuan-devel
 BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
 # TODO: libmapi from http://www.openchange.org/
@@ -227,6 +227,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 4.3.80-3
+- Explicitly BR libassuan-static in accordance with the Packaging
+  Guidelines (libassuan-devel is still static-only).
+
 * Tue Dec 08 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - drop BR kdelibs-experimental
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:29:25 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:29:25 +0000 (UTC)
Subject: devel/opensc opensc.spec,1.51,1.52
Message-ID: <20091208212925.2E8BF11C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/devel/opensc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8820/opensc

Modified Files:
	opensc.spec 
Log Message:
- Explicitly BR libassuan-static in accordance with the Packaging
  Guidelines (libassuan-devel is still static-only).



Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/devel/opensc/opensc.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- opensc.spec	19 Nov 2009 17:06:59 -0000	1.51
+++ opensc.spec	8 Dec 2009 21:29:24 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -35,7 +35,7 @@ eID cards have also been confirmed to wo
 Summary:        Digital signature plugin for web browsers
 Group:          Applications/Internet
 BuildRequires:  libXt-devel
-BuildRequires:  libassuan-devel
+BuildRequires:  libassuan-static, libassuan-devel
 Requires:       %{plugindir}
 Requires:       pinentry-gui
 
@@ -157,6 +157,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.11.11-2
+- Explicitly BR libassuan-static in accordance with the Packaging
+  Guidelines (libassuan-devel is still static-only).
+
 * Thu Nov 19 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.11-1
 - new upstream version
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:39:38 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:39:38 +0000 (UTC)
Subject: rpms/ncl/devel ncl.spec,1.23,1.24
Message-ID: <20091208213938.2D93A11C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12211

Modified Files:
	ncl.spec 
Log Message:
* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 5.1.1-5
- Same as below with hdf-static
- Explicitly BR g2clib-static in accordance with the Packaging
  Guidelines (g2clib-devel is still static-only).



Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ncl.spec	8 Dec 2009 20:29:39 -0000	1.23
+++ ncl.spec	8 Dec 2009 21:39:37 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           ncl
 Version:        5.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
@@ -42,7 +42,8 @@ Patch13:        ncl-5.1.0-includes.patch
 Patch15:        ncl-5.0.0-udunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel
+BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel
+BuildRequires:  hdf-static, hdf-devel >= 4.2r2, libjpeg-devel
 BuildRequires:  g2clib-static, g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel
 # imake needed for makedepend
 BuildRequires:  imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
@@ -303,7 +304,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 5.1.1-4
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 5.1.1-5
+- Same as below with hdf-static
 - Explicitly BR g2clib-static in accordance with the Packaging
   Guidelines (g2clib-devel is still static-only).
 



From cebbert at fedoraproject.org  Tue Dec  8 21:49:53 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  8 Dec 2009 21:49:53 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.40.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.29, 1.960.2.30 kernel.spec, 1.1206.2.114,
	1.1206.2.115 linux-2.6-compile-fixes.patch, 1.178.12.2,
	1.178.12.3 sources, 1.922.2.29, 1.922.2.30 upstream, 1.834.2.29,
	1.834.2.30 patch-2.6.27.39.bz2.sign, 1.1.2.1, NONE
Message-ID: <20091208214953.5724011C00C5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14864

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.40.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.39.bz2.sign 
Log Message:
Linux 2.6.27.40


--- NEW FILE patch-2.6.27.40.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLHqjEyGugalF9Dw4RAufvAJ9/NZ1CBYbRB4sFiF/rOEqwk4tA8wCfSHrO
lp9DntkNLh+fLzUNrTrbpm4=
=CMEc
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.29
retrieving revision 1.960.2.30
diff -u -p -r1.960.2.29 -r1.960.2.30
--- .cvsignore	12 Nov 2009 01:00:03 -0000	1.960.2.29
+++ .cvsignore	8 Dec 2009 21:49:52 -0000	1.960.2.30
@@ -4,4 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.39.bz2
+patch-2.6.27.40.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.114
retrieving revision 1.1206.2.115
diff -u -p -r1.1206.2.114 -r1.1206.2.115
--- kernel.spec	12 Nov 2009 01:00:04 -0000	1.1206.2.114
+++ kernel.spec	8 Dec 2009 21:49:52 -0000	1.1206.2.115
@@ -39,7 +39,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 39
+%define stable_update 40
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -2018,6 +2018,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.40-170.2.115
+- Linux 2.6.27.40
+
 * Mon Nov 09 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.39-170.2.114
 - Linux 2.6.27.39
 - Drop merged patches:

linux-2.6-compile-fixes.patch:
 arch/powerpc/sysdev/fsl_lbc.c             |    1 +
 drivers/media/video/em28xx/em28xx-audio.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.178.12.2
retrieving revision 1.178.12.3
diff -u -p -r1.178.12.2 -r1.178.12.3
--- linux-2.6-compile-fixes.patch	15 Sep 2009 19:42:14 -0000	1.178.12.2
+++ linux-2.6-compile-fixes.patch	8 Dec 2009 21:49:52 -0000	1.178.12.3
@@ -22,3 +22,21 @@ index 422c8fa..1c6c522 100644
  
  struct fsl_lbc_regs __iomem *fsl_lbc_regs;
  EXPORT_SYMBOL(fsl_lbc_regs);
+
+drivers/media/video/em28xx/em28xx-audio.c: In function 'snd_em28xx_prepare':
+drivers/media/video/em28xx/em28xx-audio.c:370: error: request for member 'hwptr_done_capture' in something not a structure or union
+drivers/media/video/em28xx/em28xx-audio.c:371: error: request for member 'capture_transfer_done' in something not a structure or union
+diff -u a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
+--- a/drivers/media/video/em28xx/em28xx-audio.c
++++ b/drivers/media/video/em28xx/em28xx-audio.c
+@@ -365,8 +365,8 @@
+ {
+ 	struct em28xx *dev = snd_pcm_substream_chip(substream);
+ 
+-	dev->adev.hwptr_done_capture = 0;
+-	dev->adev.capture_transfer_done = 0;
++	dev->adev->hwptr_done_capture = 0;
++	dev->adev->capture_transfer_done = 0;
+ 
+ 	return 0;
+ } 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.29
retrieving revision 1.922.2.30
diff -u -p -r1.922.2.29 -r1.922.2.30
--- sources	12 Nov 2009 01:00:05 -0000	1.922.2.29
+++ sources	8 Dec 2009 21:49:52 -0000	1.922.2.30
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-9ce07344e2d9e5fe77ca474e8f5bd83a  patch-2.6.27.39.bz2
+f9048ef4c9a7bf3cda7b50d4fef94143  patch-2.6.27.40.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.29
retrieving revision 1.834.2.30
diff -u -p -r1.834.2.29 -r1.834.2.30
--- upstream	12 Nov 2009 01:00:05 -0000	1.834.2.29
+++ upstream	8 Dec 2009 21:49:52 -0000	1.834.2.30
@@ -1,2 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.39.bz2
+patch-2.6.27.40.bz2


--- patch-2.6.27.39.bz2.sign DELETED ---



From mschwendt at fedoraproject.org  Tue Dec  8 21:53:05 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:53:05 +0000 (UTC)
Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler.spec,1.25,1.26
Message-ID: <20091208215305.7429511C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/dap-hdf4_handler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15543/dap-hdf4_handler/devel

Modified Files:
	dap-hdf4_handler.spec 
Log Message:
- Explicitly BR hdf-static in accordance with the Packaging
  Guidelines (hdf-devel is still static-only).



Index: dap-hdf4_handler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- dap-hdf4_handler.spec	24 Jul 2009 19:56:38 -0000	1.25
+++ dap-hdf4_handler.spec	8 Dec 2009 21:53:05 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:         HDF4 data handler for the OPeNDAP Data server
 Name:            dap-hdf4_handler
 Version:         3.7.14
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         LGPLv2+
 Group:           System Environment/Daemons 
 Source0:         http://www.opendap.org/pub/source/hdf4_handler-%{version}.tar.gz
@@ -10,7 +10,7 @@ URL:             http://www.opendap.org/
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   libdap-devel >= 3.9.3
 BuildRequires:   bes-devel >= 3.7.2
-BuildRequires:   hdf-devel
+BuildRequires:   hdf-static, hdf-devel
 
 %description
 This is the hdf4 data handler for our data server. It reads HDF4 and HDF-EOS
@@ -42,6 +42,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING COPYRIGHT_URI NEWS README
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 3.7.14-3
+- Explicitly BR hdf-static in accordance with the Packaging
+  Guidelines (hdf-devel is still static-only).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:53:05 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:53:05 +0000 (UTC)
Subject: rpms/dx/devel dx.spec,1.18,1.19
Message-ID: <20091208215305.93F2A11C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15543/dx/devel

Modified Files:
	dx.spec 
Log Message:
- Explicitly BR hdf-static in accordance with the Packaging
  Guidelines (hdf-devel is still static-only).



Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- dx.spec	8 Nov 2009 14:48:49 -0000	1.18
+++ dx.spec	8 Dec 2009 21:53:05 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.informatics.jax.org/source/dx-%{version}.tar.gz
@@ -19,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: bison
 BuildRequires: desktop-file-utils
 BuildRequires: flex
-BuildRequires: hdf-devel
+BuildRequires: hdf-static, hdf-devel
 BuildRequires: ImageMagick-devel
 #FIXME doesn't build currently
 #BuildRequires: java-devel
@@ -128,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 4.4.4-13
+- Explicitly BR hdf-static in accordance with the Packaging
+  Guidelines (hdf-devel is still static-only).
+
 * Sun Nov 08 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-12
 - bump release to clear up cvs tag mixup
 
@@ -209,4 +213,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri Aug 18 2006 Dominik Mierzejewski <rpm at greysector.net>
 - initial build
-- fix lib paths
\ No newline at end of file
+- fix lib paths



From mschwendt at fedoraproject.org  Tue Dec  8 21:53:06 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:53:06 +0000 (UTC)
Subject: rpms/gdl/devel gdl.spec,1.51,1.52
Message-ID: <20091208215306.1A07A11C0297@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15543/gdl/devel

Modified Files:
	gdl.spec 
Log Message:
- Explicitly BR hdf-static in accordance with the Packaging
  Guidelines (hdf-devel is still static-only).



Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- gdl.spec	11 Nov 2009 18:33:38 -0000	1.51
+++ gdl.spec	8 Dec 2009 21:53:05 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:           gdl
 Version:        0.9
-Release:        0.8.rc3%{?dist}
+Release:        0.9.rc3%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -31,7 +31,7 @@ BuildRequires:  readline-devel, ncurses-
 BuildRequires:  gsl-devel, plplot-devel, ImageMagick-c++-devel
 BuildRequires:  netcdf-devel, hdf5-devel, libjpeg-devel
 BuildRequires:  python-devel, python-numarray, python-matplotlib
-BuildRequires:  fftw-devel, hdf-devel, proj-devel
+BuildRequires:  fftw-devel, hdf-static, hdf-devel, proj-devel
 BuildRequires:  autoconf, automake, libtool
 # Needed to pull in drivers
 Requires:       plplot
@@ -115,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9-0.9.rc3
+- Explicitly BR hdf-static in accordance with the Packaging
+  Guidelines (hdf-devel is still static-only).
+
 * Wed Nov 11 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.8.rc3
 - Rebuild for netcdf-4.1.0
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:53:06 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:53:06 +0000 (UTC)
Subject: rpms/grads/devel grads.spec,1.30,1.31
Message-ID: <20091208215306.460BE11C0345@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/grads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15543/grads/devel

Modified Files:
	grads.spec 
Log Message:
- Explicitly BR hdf-static in accordance with the Packaging
  Guidelines (hdf-devel is still static-only).



Index: grads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grads/devel/grads.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- grads.spec	8 Dec 2009 20:28:30 -0000	1.30
+++ grads.spec	8 Dec 2009 21:53:06 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        2.0.a7.1
-Release:        0.2%{?dist}
+Release:        0.3%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -21,7 +21,8 @@ Patch0:		grads-find-geotiff.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  hdf-devel g2clib-static g2clib-devel
+BuildRequires:  hdf-static hdf-devel
+BuildRequires:  g2clib-static g2clib-devel
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libnc-dap-devel
@@ -94,7 +95,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.a7.1-0.2
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.a7.1-0.3
+- Same as below with hdf-static.
 - Explicitly BR g2clib-static in accordance with the Packaging
   Guidelines (g2clib-devel is still static-only).
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:53:05 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:53:05 +0000 (UTC)
Subject: rpms/gdal/devel gdal.spec,1.70,1.71
Message-ID: <20091208215305.E0CDB11C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15543/gdal/devel

Modified Files:
	gdal.spec 
Log Message:
- Explicitly BR hdf-static in accordance with the Packaging
  Guidelines (hdf-devel is still static-only).



Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- gdal.spec	19 Nov 2009 17:51:11 -0000	1.70
+++ gdal.spec	8 Dec 2009 21:53:05 -0000	1.71
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.6.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -18,7 +18,8 @@ BuildRequires: libtool pkgconfig
 BuildRequires: python-devel numpy xerces-c-devel
 BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
 BuildRequires: doxygen tetex-latex ghostscript ruby-devel jpackage-utils
-BuildRequires: jasper-devel cfitsio-devel hdf-devel libdap-devel librx-devel
+BuildRequires: jasper-devel cfitsio-devel libdap-devel librx-devel
+BuildRequires: hdf-static hdf-devel
 BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-devel
 BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel libgeotiff-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
@@ -538,6 +539,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.2-3
+- Explicitly BR hdf-static in accordance with the Packaging
+  Guidelines (hdf-devel is still static-only).
+
 * Thu Nov 19 2009 Orion Poplawski <orion at cora.nwra.com> - 1.6.2-2
 - re-enable grass support
 



From mschwendt at fedoraproject.org  Tue Dec  8 21:53:06 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  8 Dec 2009 21:53:06 +0000 (UTC)
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.56,1.57
Message-ID: <20091208215306.6DE6F11C00C5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15543/perl-PDL/devel

Modified Files:
	perl-PDL.spec 
Log Message:
- Explicitly BR hdf-static in accordance with the Packaging
  Guidelines (hdf-devel is still static-only).



Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- perl-PDL.spec	7 Dec 2009 14:04:26 -0000	1.56
+++ perl-PDL.spec	8 Dec 2009 21:53:06 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.4_05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -25,7 +25,7 @@ BuildRequires:  fftw2-devel
 BuildRequires:  gcc-gfortran
 BuildRequires:  gd-devel
 BuildRequires:  gsl-devel
-BuildRequires:  hdf-devel
+BuildRequires:  hdf-static hdf-devel
 BuildRequires:  libGLU-devel
 BuildRequires:  proj-devel
 BuildRequires:  proj-nad
@@ -142,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4_05-7
+- Explicitly BR hdf-static in accordance with the Packaging
+  Guidelines (hdf-devel is still static-only).
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.4.4_05-6
 - rebuild against perl 5.10.1
 



From mbooth at fedoraproject.org  Tue Dec  8 22:05:35 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Tue,  8 Dec 2009 22:05:35 +0000 (UTC)
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.42, 1.43
Message-ID: <20091208220535.87A1811C00C5@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/jakarta-commons-modeler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18497/jakarta-commons-modeler/devel

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
* Tue Dec 8 2009 Mat Booth <fedora at matbooth.co.uk>
- Enable OSGi automatic depsolving (from Alphonse Van Assche).


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- jakarta-commons-modeler.spec	2 Dec 2009 23:20:50 -0000	1.42
+++ jakarta-commons-modeler.spec	8 Dec 2009 22:05:35 -0000	1.43
@@ -1,9 +1,14 @@
 %global short_name commons-modeler
 
+# enable OSGi automatic dep solving
+%define _use_internal_dependency_generator 0
+%define __find_provides /usr/lib/rpm/osgideps.pl -p
+%define __find_requires /usr/lib/rpm/osgideps.pl -r
+
 # TODO - Drop "jakarta-" from the package name
 Name:          jakarta-%{short_name}
 Version:       2.0.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Model MBeans utility classes
 Group:         Development/Libraries/Java
 License:       ASL 2.0
@@ -132,6 +137,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Dec 8 2009 Mat Booth <fedora at matbooth.co.uk> - 2.0.1-2
+- Enable OSGi automatic depsolving (from Alphonse Van Assche).
+
 * Wed Dec 2 2009 Mat Booth <fedora at matbooth.co.uk> - 2.0.1-1
 - Update to 2.0.1
 - Rewrite spec file to build using upstream-preferred maven instead of ant



From mbooth at fedoraproject.org  Tue Dec  8 22:05:35 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Tue,  8 Dec 2009 22:05:35 +0000 (UTC)
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 
	1.44, 1.45
Message-ID: <20091208220535.973C511C0297@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/jakarta-commons-digester/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18497/jakarta-commons-digester/devel

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
* Tue Dec 8 2009 Mat Booth <fedora at matbooth.co.uk>
- Enable OSGi automatic depsolving (from Alphonse Van Assche).


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- jakarta-commons-digester.spec	8 Nov 2009 17:25:03 -0000	1.44
+++ jakarta-commons-digester.spec	8 Dec 2009 22:05:35 -0000	1.45
@@ -1,9 +1,14 @@
 %global short_name commons-digester
 
+# enable OSGi automatic dep solving
+%define _use_internal_dependency_generator 0
+%define __find_provides /usr/lib/rpm/osgideps.pl -p
+%define __find_requires /usr/lib/rpm/osgideps.pl -r
+
 # TODO - Drop "jakarta-" from the package name
 Name:          jakarta-%{short_name}
 Version:       1.8.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       XML to Java object mapping module
 Group:         Development/Libraries/Java
 License:       ASL 2.0
@@ -104,6 +109,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Dec 8 2009 Mat Booth <fedora at matbooth.co.uk> - 1.8.1-3
+- Enable OSGi automatic depsolving (from Alphonse Van Assche).
+
 * Sun Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> - 1.8.1-2
 - Fix build failure due to targeting too old a JRE
 - Add missing doxia build req



From mbooth at fedoraproject.org  Tue Dec  8 22:05:35 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Tue,  8 Dec 2009 22:05:35 +0000 (UTC)
Subject: rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.27, 
	1.28
Message-ID: <20091208220535.C710811C00C5@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/jakarta-commons-codec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18497/jakarta-commons-codec/devel

Modified Files:
	jakarta-commons-codec.spec 
Log Message:
* Tue Dec 8 2009 Mat Booth <fedora at matbooth.co.uk>
- Enable OSGi automatic depsolving (from Alphonse Van Assche).


Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- jakarta-commons-codec.spec	8 Nov 2009 14:10:13 -0000	1.27
+++ jakarta-commons-codec.spec	8 Dec 2009 22:05:35 -0000	1.28
@@ -1,9 +1,14 @@
 %global short_name commons-codec
 
+# enable OSGi automatic dep solving
+%define _use_internal_dependency_generator 0
+%define __find_provides /usr/lib/rpm/osgideps.pl -p
+%define __find_requires /usr/lib/rpm/osgideps.pl -r
+
 # TODO - Drop "jakarta-" from the package name
 Name:          jakarta-%{short_name}
 Version:       1.4
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Implementations of common encoders and decoders
 Group:         Development/Libraries/Java
 License:       ASL 2.0
@@ -11,10 +16,6 @@ URL:           http://commons.apache.org
 
 Source0:       http://archive.apache.org/dist/commons/codec/source/%{short_name}-%{version}-src.tar.gz
 
-# Fix a regression in Base64 chunking behaviour, see upstream bug:
-# https://issues.apache.org/jira/browse/CODEC-89
-#Patch0:        %{short_name}-base64-chunking-regression.patch
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
@@ -101,6 +102,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Dec 8 2009 Mat Booth <fedora at matbooth.co.uk> - 1.4-5
+- Enable OSGi automatic depsolving (from Alphonse Van Assche).
+
 * Sun Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> - 1.4-4
 - Fix javadoc package requires
 



From kwizart at fedoraproject.org  Tue Dec  8 22:37:53 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue,  8 Dec 2009 22:37:53 +0000 (UTC)
Subject: rpms/perl-BDB/devel BDB-1.86-db_48.patch, NONE, 1.1 import.log, 1.1,
	1.2 perl-BDB.spec, 1.11, 1.12
Message-ID: <20091208223753.7A04C11C00C5@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25777/devel

Modified Files:
	import.log perl-BDB.spec 
Added Files:
	BDB-1.86-db_48.patch 
Log Message:
- Patch to force db 4.8.


BDB-1.86-db_48.patch:
 BDB.xs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE BDB-1.86-db_48.patch ---
diff -up BDB-1.86/BDB.xs.db_48 BDB-1.86/BDB.xs
--- BDB-1.86/BDB.xs.db_48	2009-12-08 23:32:05.590607040 +0100
+++ BDB-1.86/BDB.xs	2009-12-08 23:32:51.771603238 +0100
@@ -1228,7 +1228,7 @@ BOOT:
           const_iv (WRITECURSOR)
           const_iv (YIELDCPU)
           const_iv (ENCRYPT_AES)
-          const_iv (XA_CREATE)
+          //const_iv (XA_CREATE)
           const_iv (BTREE)
           const_iv (HASH)
           const_iv (QUEUE)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	31 Aug 2009 15:21:53 -0000	1.1
+++ import.log	8 Dec 2009 22:37:51 -0000	1.2
@@ -1 +1,2 @@
 perl-BDB-1_84-1_fc11:HEAD:perl-BDB-1.84-1.fc11.src.rpm:1251732031
+perl-BDB-1_86-2_fc11:HEAD:perl-BDB-1.86-2.fc11.src.rpm:1260311813


Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-BDB.spec	7 Dec 2009 17:49:04 -0000	1.11
+++ perl-BDB.spec	8 Dec 2009 22:37:51 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-BDB
 Version:        1.86
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Asynchronous Berkeley DB access
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@ License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/BDB/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/BDB-%{version}.tar.gz
 Patch0:         BDB-1.84-nocommon.patch
+Patch1:         BDB-1.86-db_48.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -21,6 +22,7 @@ Asynchronous Berkeley DB access.
 %prep
 %setup -q -n BDB-%{version}
 %patch0 -p1 -b .nocommon
+%patch1 -p1 -b .db48
 
 
 %build
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 8 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.86-2
+- Patch to force db 4.8.
+
 * Mon Dec 7 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.86-1
 - Update to 1.86
 



From chitlesh at fedoraproject.org  Tue Dec  8 23:13:04 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Dec 2009 23:13:04 +0000 (UTC)
Subject: rpms/ngspice/F-11 ngspice-rework-20-compatmode.h, NONE,
	1.1 import.log, 1.5, 1.6 ngspice.spec, 1.20, 1.21
Message-ID: <20091208231304.D700E11C00C5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3236/F-11

Modified Files:
	import.log ngspice.spec 
Added Files:
	ngspice-rework-20-compatmode.h 
Log Message:
fixed built with compatmode.h


--- NEW FILE ngspice-rework-20-compatmode.h ---
#ifndef _COMPATMODE_H
#define _COMPATMODE_H

#include <config.h>

typedef enum {
  COMPATMODE_NATIVE = 0,
  COMPATMODE_HSPICE = 1,
  COMPATMODE_SPICE3 = 2  
} COMPATMODE_T ;

#endif


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Dec 2009 00:22:39 -0000	1.5
+++ import.log	8 Dec 2009 23:13:03 -0000	1.6
@@ -3,3 +3,4 @@ ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10
 ngspice-19-1_fc11:F-11:ngspice-19-1.fc11.src.rpm:1249833216
 ngspice-20-1_fc12:F-11:ngspice-20-1.fc12.src.rpm:1259910146
 ngspice-20-2_fc12:F-11:ngspice-20-2.fc12.src.rpm:1260231652
+ngspice-20-3_fc12:F-11:ngspice-20-3.fc12.src.rpm:1260313898


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/ngspice.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ngspice.spec	8 Dec 2009 00:22:40 -0000	1.20
+++ ngspice.spec	8 Dec 2009 23:13:03 -0000	1.21
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -8,6 +8,7 @@ Group:             Applications/Engineer
 URL:               http://%{name}.sourceforge.net/
 
 Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source1:           ngspice-rework-20-compatmode.h
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ensuring interoperability with xcircuit via Tcl
@@ -70,6 +71,8 @@ code base with many improvements.
 
 %patch0 -p0 -b .xcircuit
 
+cp -p %{SOURCE1} src/include/compatmode.h
+
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
                examples/tclspice/tcl-testbench1/testCapa.cir \
@@ -99,10 +102,10 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%{__libtoolize} --force --copy
-%{__aclocal}
-%{__automake} --add-missing
-%{__autoconf}
+#{__libtoolize} --force --copy
+#{__aclocal}
+#{__automake} --add-missing
+#{__autoconf}
 
 %build
 
@@ -132,7 +135,11 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-dot-global \
     --enable-shared \
     --enable-ndev \
+%if 0%{?fedora}
     --with-tcl=%{_libdir}/tcl8.5/ \
+%else
+    --with-tcl=%{_libdir}/ \
+%endif
     --libdir=%{_libdir}/tclspice
 
 %{__make}
@@ -223,6 +230,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-3
+- Fixed build on CentOS-5
+
 * Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
 - Improved interoperobability with xcircuit
 



From chitlesh at fedoraproject.org  Tue Dec  8 23:16:44 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Dec 2009 23:16:44 +0000 (UTC)
Subject: rpms/ngspice/F-12 ngspice-rework-20-compatmode.h, NONE,
	1.1 import.log, 1.5, 1.6 ngspice.spec, 1.21, 1.22
Message-ID: <20091208231644.CC62911C00C5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4419/F-12

Modified Files:
	import.log ngspice.spec 
Added Files:
	ngspice-rework-20-compatmode.h 
Log Message:
fixed built with compatmode.h


--- NEW FILE ngspice-rework-20-compatmode.h ---
#ifndef _COMPATMODE_H
#define _COMPATMODE_H

#include <config.h>

typedef enum {
  COMPATMODE_NATIVE = 0,
  COMPATMODE_HSPICE = 1,
  COMPATMODE_SPICE3 = 2  
} COMPATMODE_T ;

#endif


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Dec 2009 00:25:24 -0000	1.5
+++ import.log	8 Dec 2009 23:16:44 -0000	1.6
@@ -3,3 +3,4 @@ ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10
 ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11.src.rpm:1249833090
 ngspice-20-1_fc12:F-12:ngspice-20-1.fc12.src.rpm:1259910264
 ngspice-20-2_fc12:F-12:ngspice-20-2.fc12.src.rpm:1260231732
+ngspice-20-3_fc12:F-12:ngspice-20-3.fc12.src.rpm:1260314128


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-12/ngspice.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ngspice.spec	8 Dec 2009 00:25:24 -0000	1.21
+++ ngspice.spec	8 Dec 2009 23:16:44 -0000	1.22
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -8,6 +8,7 @@ Group:             Applications/Engineer
 URL:               http://%{name}.sourceforge.net/
 
 Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source1:           ngspice-rework-20-compatmode.h
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ensuring interoperability with xcircuit via Tcl
@@ -70,6 +71,8 @@ code base with many improvements.
 
 %patch0 -p0 -b .xcircuit
 
+cp -p %{SOURCE1} src/include/compatmode.h
+
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
                examples/tclspice/tcl-testbench1/testCapa.cir \
@@ -99,10 +102,10 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%{__libtoolize} --force --copy
-%{__aclocal}
-%{__automake} --add-missing
-%{__autoconf}
+#{__libtoolize} --force --copy
+#{__aclocal}
+#{__automake} --add-missing
+#{__autoconf}
 
 %build
 
@@ -132,7 +135,11 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-dot-global \
     --enable-shared \
     --enable-ndev \
+%if 0%{?fedora}
     --with-tcl=%{_libdir}/tcl8.5/ \
+%else
+    --with-tcl=%{_libdir}/ \
+%endif
     --libdir=%{_libdir}/tclspice
 
 %{__make}
@@ -223,6 +230,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-3
+- Fixed build on CentOS-5
+
 * Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
 - Improved interoperobability with xcircuit
 



From chitlesh at fedoraproject.org  Tue Dec  8 23:17:38 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Dec 2009 23:17:38 +0000 (UTC)
Subject: rpms/ngspice/devel ngspice-rework-20-compatmode.h, NONE,
	1.1 import.log, 1.5, 1.6 ngspice.spec, 1.21, 1.22
Message-ID: <20091208231738.E29B211C00C5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4761/devel

Modified Files:
	import.log ngspice.spec 
Added Files:
	ngspice-rework-20-compatmode.h 
Log Message:
fixed built with compatmode.h


--- NEW FILE ngspice-rework-20-compatmode.h ---
#ifndef _COMPATMODE_H
#define _COMPATMODE_H

#include <config.h>

typedef enum {
  COMPATMODE_NATIVE = 0,
  COMPATMODE_HSPICE = 1,
  COMPATMODE_SPICE3 = 2  
} COMPATMODE_T ;

#endif


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Dec 2009 00:27:29 -0000	1.5
+++ import.log	8 Dec 2009 23:17:38 -0000	1.6
@@ -3,3 +3,4 @@ ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10
 ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11.src.rpm:1249833090
 ngspice-20-1_fc12:HEAD:ngspice-20-1.fc12.src.rpm:1259910372
 ngspice-20-2_fc12:HEAD:ngspice-20-2.fc12.src.rpm:1260231894
+ngspice-20-3_fc12:HEAD:ngspice-20-3.fc12.src.rpm:1260314184


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ngspice.spec	8 Dec 2009 00:27:29 -0000	1.21
+++ ngspice.spec	8 Dec 2009 23:17:38 -0000	1.22
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -8,6 +8,7 @@ Group:             Applications/Engineer
 URL:               http://%{name}.sourceforge.net/
 
 Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source1:           ngspice-rework-20-compatmode.h
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ensuring interoperability with xcircuit via Tcl
@@ -70,6 +71,8 @@ code base with many improvements.
 
 %patch0 -p0 -b .xcircuit
 
+cp -p %{SOURCE1} src/include/compatmode.h
+
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
                examples/tclspice/tcl-testbench1/testCapa.cir \
@@ -99,10 +102,10 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%{__libtoolize} --force --copy
-%{__aclocal}
-%{__automake} --add-missing
-%{__autoconf}
+#{__libtoolize} --force --copy
+#{__aclocal}
+#{__automake} --add-missing
+#{__autoconf}
 
 %build
 
@@ -132,7 +135,11 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-dot-global \
     --enable-shared \
     --enable-ndev \
+%if 0%{?fedora}
     --with-tcl=%{_libdir}/tcl8.5/ \
+%else
+    --with-tcl=%{_libdir}/ \
+%endif
     --libdir=%{_libdir}/tclspice
 
 %{__make}
@@ -223,6 +230,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-3
+- Fixed build on CentOS-5
+
 * Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
 - Improved interoperobability with xcircuit
 



From chitlesh at fedoraproject.org  Tue Dec  8 23:20:59 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  8 Dec 2009 23:20:59 +0000 (UTC)
Subject: rpms/ngspice/EL-5 ngspice-rework-20-compatmode.h, NONE,
	1.1 import.log, 1.4, 1.5 ngspice.spec, 1.11, 1.12
Message-ID: <20091208232059.4FCEE11C00C5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5709/EL-5

Modified Files:
	import.log ngspice.spec 
Added Files:
	ngspice-rework-20-compatmode.h 
Log Message:
fixed built with compatmode.h


--- NEW FILE ngspice-rework-20-compatmode.h ---
#ifndef _COMPATMODE_H
#define _COMPATMODE_H

#include <config.h>

typedef enum {
  COMPATMODE_NATIVE = 0,
  COMPATMODE_HSPICE = 1,
  COMPATMODE_SPICE3 = 2  
} COMPATMODE_T ;

#endif


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	8 Dec 2009 00:33:42 -0000	1.4
+++ import.log	8 Dec 2009 23:20:58 -0000	1.5
@@ -2,3 +2,4 @@ ngspice-18-1_fc10:EL-5:ngspice-18-1.fc10
 ngspice-19-1_fc11:EL-5:ngspice-19-1.fc11.src.rpm:1249833383
 ngspice-20-1_fc12:EL-5:ngspice-20-1.fc12.src.rpm:1259910513
 ngspice-20-2_fc12:EL-5:ngspice-20-2.fc12.src.rpm:1260232344
+ngspice-20-3_fc12:EL-5:ngspice-20-3.fc12.src.rpm:1260314383


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/ngspice.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ngspice.spec	8 Dec 2009 00:33:42 -0000	1.11
+++ ngspice.spec	8 Dec 2009 23:20:59 -0000	1.12
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -8,6 +8,7 @@ Group:             Applications/Engineer
 URL:               http://%{name}.sourceforge.net/
 
 Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source1:           ngspice-rework-20-compatmode.h
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ensuring interoperability with xcircuit via Tcl
@@ -70,6 +71,8 @@ code base with many improvements.
 
 %patch0 -p0 -b .xcircuit
 
+cp -p %{SOURCE1} src/include/compatmode.h
+
 # make sure the examples are UTF-8...
 for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
                examples/tclspice/tcl-testbench1/testCapa.cir \
@@ -99,10 +102,10 @@ sed -i \
 "s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
 examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%{__libtoolize} --force --copy
-%{__aclocal}
-%{__automake} --add-missing
-%{__autoconf}
+#{__libtoolize} --force --copy
+#{__aclocal}
+#{__automake} --add-missing
+#{__autoconf}
 
 %build
 
@@ -132,7 +135,11 @@ sed -i "s|\#define NGSPICEDATADIR \"\`ec
     --enable-dot-global \
     --enable-shared \
     --enable-ndev \
+%if 0%{?fedora}
     --with-tcl=%{_libdir}/tcl8.5/ \
+%else
+    --with-tcl=%{_libdir}/ \
+%endif
     --libdir=%{_libdir}/tclspice
 
 %{__make}
@@ -223,6 +230,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-3
+- Fixed build on CentOS-5
+
 * Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
 - Improved interoperobability with xcircuit
 



From kwright at fedoraproject.org  Tue Dec  8 23:23:44 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue,  8 Dec 2009 23:23:44 +0000 (UTC)
Subject: rpms/tomcatjss/F-12 import.log, NONE, 1.1 tomcatjss.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091208232344.36D5111C00C5@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/tomcatjss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6850/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tomcatjss.spec 
Log Message:
Bugzilla Bug #521979 -  New Package for Dogtag PKI: tomcatjss



--- NEW FILE import.log ---
tomcatjss-1_2_0-2_fc12:F-12:tomcatjss-1.2.0-2.fc12.src.rpm:1260314602


--- NEW FILE tomcatjss.spec ---
Name:     tomcatjss
Version:  1.2.0
Release:  2%{?dist}
Summary:  JSSE implementation using JSS for Tomcat
URL:      http://pki.fedoraproject.org/
License:  LGPLv2+
Group:    System Environment/Libraries

BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Source0:  http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

BuildRequires:    ant
BuildRequires:    java-devel >= 1:1.6.0
BuildRequires:    jpackage-utils
BuildRequires:    tomcat5
BuildRequires:    jss >= 4.2.6
Requires:         java >= 1:1.6.0
Requires:         jpackage-utils
Requires:         tomcat5
Requires:         jss >= 4.2.6

%description
A Java Secure Socket Extension (JSSE) implementation
using Java Security Services (JSS) for Tomcat 5.5.

%prep

%setup -q

%build

ant -f build.xml
ant -f build.xml dist

%install
rm -rf %{buildroot}

# Unpack the files we just built
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

# Install our files
cd %{buildroot}%{_javadir}
mv %{name}.jar %{name}-%{version}.jar
ln -s %{name}-%{version}.jar %{name}.jar
mkdir -p %{buildroot}%{_sharedstatedir}/tomcat5/server/lib
cd %{buildroot}%{_sharedstatedir}/tomcat5/server/lib
ln -s ../../../../../usr/share/java/%{name}.jar %{name}.jar
mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc %attr(644,root,root) README LICENSE
%attr(00755,root,root) %{_datadir}/doc/%{name}-%{version}
%{_javadir}/*
%{_sharedstatedir}/tomcat5/server/lib/%{name}.jar

%changelog
* Fri Sep 11 2009 Kevin Wright <kwright at redhat.com> 1.2.0-2
- Bugzilla Bug #521979 - Removed references to jre, fedora 8, etc

* Fri Aug 28 2009 Matthew Harmsen <mharmsen at redhat.com> 1.2.0-1
- Bugzilla Bug #521979 -  New Package for Dogtag PKI: tomcatjss

* Thu Jul 16 2009 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-15
- Release Candidate 4 build

* Wed Jun 3 2009 Christina Fu <cfu at redhat.com> 1.1.0-14
- Bugzilla Bug #455305 - CA ECC signing Key Failure
  Bugzilla Bug #223279 - ECC: Ca: unable to perform agent auth on a machine with nCipher ECC HSM
- This log entry does not apply to tomcatjss.  Ignore.
* Fri May 1 2009 Christina Fu <cfu at redhat.com> - 1.1.0-13
- Bugzilla #498652 - SSL handshake Failure on RHCS java subsystems with nethsm2000
 
* Thu Feb  26 2009 Kevin Wright <kwright at redhat.com> - 1.1.0-12
- Updated to release 1.1.0-12 to build with idm extension

* Sat Nov 22 2008 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-11
- Updated to require "java" and "java-devel" >= 1.6.0

* Thu Aug 02 2007 Thomas kwan <nkwan at redhat.com> 1.1.0-10
- Required JSS 4.2.5

* Fri Apr 26 2007 Kevin McCarthy <kmccarth at redhat.com> 1.1.0-9
- Change specfile to RHEL5 dependencies

* Fri Apr 20 2007 Thomas Kwan <nkwan at redhat.com> 1.1.0-8
- Re-integrated Solaris logic into the spec file

* Wed Apr 4 2007 Thomas Kwan <nkwan at redhat.com> 1.1.0-7
- Called new JSS api for client authentication

* Fri Mar 09 2007 Rob Crittenden <rcritten at redhat.com> 1.1.0-6
- Add Solaris directives for building with pkgbuild

* Mon Mar  3 2007 Rob Crittenden <rcritten at redhat.com> 1.1.0-5
- More spec file cleanup

* Fri Jan 26 2007 Rob Crittenden <rcritten at redhat.com> 1.1.0-4
- General spec file cleanup
- Added LGPL license

* Wed Feb 22 2006 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-3
- Renamed "rpm.template" to "pki.template". Filled in Solaris section.

* Mon Feb 20 2006 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-2
- Separated template into Linux, Solaris, and Changelog sections.

* Mon Dec 5 2005 Matthew Harmsen <mharmsen at redhat.com> 1.1.0-1
- Initial RPM template.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcatjss/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Sep 2009 01:25:20 -0000	1.1
+++ .cvsignore	8 Dec 2009 23:23:43 -0000	1.2
@@ -0,0 +1 @@
+tomcatjss-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcatjss/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Sep 2009 01:25:21 -0000	1.1
+++ sources	8 Dec 2009 23:23:43 -0000	1.2
@@ -0,0 +1 @@
+0b0b41f84d8424b811f743fce82fd0b9  tomcatjss-1.2.0.tar.gz



From cebbert at fedoraproject.org  Tue Dec  8 23:32:10 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  8 Dec 2009 23:32:10 +0000 (UTC)
Subject: File patch-2.6.27.41.bz2 uploaded to lookaside cache by cebbert
Message-ID: <20091208233210.1459C10F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kernel:

a431f1f68badcfa5a6cecc6b4d52d319  patch-2.6.27.41.bz2



From cebbert at fedoraproject.org  Tue Dec  8 23:38:20 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  8 Dec 2009 23:38:20 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.41.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.30, 1.960.2.31 kernel.spec, 1.1206.2.115,
	1.1206.2.116 linux-2.6-compile-fixes.patch, 1.178.12.3,
	1.178.12.4 sources, 1.922.2.30, 1.922.2.31 upstream, 1.834.2.30,
	1.834.2.31 patch-2.6.27.40.bz2.sign, 1.1.2.1, NONE
Message-ID: <20091208233820.389EC11C00C5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11543

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.41.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.40.bz2.sign 
Log Message:
Linux 2.6.27.41


--- NEW FILE patch-2.6.27.41.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLHuBByGugalF9Dw4RAukgAJ9ZK2V92JvB1Um23X/5XedFC9lpagCaAhNt
PRy1QtAc5+E8VvS8qND0ADM=
=rD0d
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.30
retrieving revision 1.960.2.31
diff -u -p -r1.960.2.30 -r1.960.2.31
--- .cvsignore	8 Dec 2009 21:49:52 -0000	1.960.2.30
+++ .cvsignore	8 Dec 2009 23:38:10 -0000	1.960.2.31
@@ -4,4 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.40.bz2
+patch-2.6.27.41.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.115
retrieving revision 1.1206.2.116
diff -u -p -r1.1206.2.115 -r1.1206.2.116
--- kernel.spec	8 Dec 2009 21:49:52 -0000	1.1206.2.115
+++ kernel.spec	8 Dec 2009 23:38:14 -0000	1.1206.2.116
@@ -39,7 +39,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 40
+%define stable_update 41
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -2018,6 +2018,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.41-170.2.116
+- Linux 2.6.27.41
+
 * Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.40-170.2.115
 - Linux 2.6.27.40
 

linux-2.6-compile-fixes.patch:
 fsl_lbc.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.178.12.3
retrieving revision 1.178.12.4
diff -u -p -r1.178.12.3 -r1.178.12.4
--- linux-2.6-compile-fixes.patch	8 Dec 2009 21:49:52 -0000	1.178.12.3
+++ linux-2.6-compile-fixes.patch	8 Dec 2009 23:38:16 -0000	1.178.12.4
@@ -22,21 +22,3 @@ index 422c8fa..1c6c522 100644
  
  struct fsl_lbc_regs __iomem *fsl_lbc_regs;
  EXPORT_SYMBOL(fsl_lbc_regs);
-
-drivers/media/video/em28xx/em28xx-audio.c: In function 'snd_em28xx_prepare':
-drivers/media/video/em28xx/em28xx-audio.c:370: error: request for member 'hwptr_done_capture' in something not a structure or union
-drivers/media/video/em28xx/em28xx-audio.c:371: error: request for member 'capture_transfer_done' in something not a structure or union
-diff -u a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
---- a/drivers/media/video/em28xx/em28xx-audio.c
-+++ b/drivers/media/video/em28xx/em28xx-audio.c
-@@ -365,8 +365,8 @@
- {
- 	struct em28xx *dev = snd_pcm_substream_chip(substream);
- 
--	dev->adev.hwptr_done_capture = 0;
--	dev->adev.capture_transfer_done = 0;
-+	dev->adev->hwptr_done_capture = 0;
-+	dev->adev->capture_transfer_done = 0;
- 
- 	return 0;
- } 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.30
retrieving revision 1.922.2.31
diff -u -p -r1.922.2.30 -r1.922.2.31
--- sources	8 Dec 2009 21:49:52 -0000	1.922.2.30
+++ sources	8 Dec 2009 23:38:17 -0000	1.922.2.31
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-f9048ef4c9a7bf3cda7b50d4fef94143  patch-2.6.27.40.bz2
+a431f1f68badcfa5a6cecc6b4d52d319  patch-2.6.27.41.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.30
retrieving revision 1.834.2.31
diff -u -p -r1.834.2.30 -r1.834.2.31
--- upstream	8 Dec 2009 21:49:52 -0000	1.834.2.30
+++ upstream	8 Dec 2009 23:38:18 -0000	1.834.2.31
@@ -1,2 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.40.bz2
+patch-2.6.27.41.bz2


--- patch-2.6.27.40.bz2.sign DELETED ---



From thias at fedoraproject.org  Tue Dec  8 23:53:22 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 23:53:22 +0000 (UTC)
Subject: rpms/xmms/devel xmms.spec,1.44,1.45
Message-ID: <20091208235322.776D011C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16764

Modified Files:
	xmms.spec 
Log Message:
Include xmms.desktop, taken from redhat-audio-player.desktop.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- xmms.spec	23 Sep 2009 18:23:01 -0000	1.44
+++ xmms.spec	8 Dec 2009 23:53:22 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.11
-Release:        9.20071117cvs%{?dist}
+Release:        10.20071117cvs%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -15,6 +15,7 @@ Source0:        %{name}-%{version}-20071
 Source1:        xmms.sh
 Source2:        xmms.xpm
 Source3:        rh_mp3.c
+Source4:        xmms.desktop
 # http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9
 Patch1:         %{name}-1.2.6-audio.patch
 Patch2:         %{name}-1.2.6-lazy.patch
@@ -46,11 +47,11 @@ BuildRequires:  libGL-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libXxf86vm-devel
+BuildRequires:  desktop-file-utils
 
 Requires:       unzip libcanberra-gtk2 gtk2 at-spi
-Requires:       %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop
-Requires(post): desktop-file-utils >= 0.9
-Requires(postun): desktop-file-utils >= 0.9
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 # Skin packages can require this from xmms and all GUI compatible players
 Provides:       xmms-gui
@@ -152,10 +153,9 @@ for bin in xmms wmxmms ; do
     chmod 755 %{buildroot}%{_bindir}/$bin
 done
 
-# Link to the desktop menu entry included in redhat-menus
-install -dm 755 %{buildroot}%{_datadir}/applications
-ln -s ../desktop-menu-patches/redhat-audio-player.desktop \
-    %{buildroot}%{_datadir}/applications
+# Desktop menu entry
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
+# Desktop menu icon
 install -Dpm 644 %{SOURCE2} \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm
 
@@ -169,21 +169,22 @@ rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %post libs -p /sbin/ldconfig
 
 %postun
 if [ $1 -eq 0 ]; then
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database -q || :
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    update-desktop-database &>/dev/null || :
 fi
 
 %postun libs -p /sbin/ldconfig
 
 %posttrans
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database -q || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &>/dev/null || :
 
 
 %files -f %{name}.lang
@@ -193,7 +194,7 @@ update-desktop-database -q || :
 %{_bindir}/wmxmms
 %{_libexecdir}/xmms
 %{_libexecdir}/wmxmms
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/xmms.desktop
 %{_datadir}/icons/hicolor/*x*/apps/xmms.xpm
 %{_datadir}/xmms/
 %{_mandir}/man1/*xmms.1*
@@ -226,6 +227,11 @@ update-desktop-database -q || :
 
 
 %changelog
+* Wed Dec  9 2009 Matthias Saou <http://freshrpms.net/> 1:1.2.11-10.20071117cvs
+- Include xmms.desktop, taken from redhat-audio-player.desktop which is no
+  longer provided by any package (it was about time).
+- Update scriplets to what I understand is best from ScriptletSnippets page.
+  
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.11-9.20071117cvs
 - optimize desktop/icon scriptlets
 



From thias at fedoraproject.org  Tue Dec  8 23:53:58 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  8 Dec 2009 23:53:58 +0000 (UTC)
Subject: rpms/xmms/devel xmms.desktop,NONE,1.1
Message-ID: <20091208235358.93CD911C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16924

Added Files:
	xmms.desktop 
Log Message:
Add xmms.desktop, required by the previous commit.



--- NEW FILE xmms.desktop ---
[Desktop Entry]
Name=XMMS
Comment=Play Ogg Vorbis and other audio files
Comment[af]=Speel Ogg Vorbis en ander klankl?ers
Comment[am]=Ogg Vorbis? ?? ??? ???? ????? ????
Comment[ar]=????? Ogg ????? ? ????? ????
Comment[as]=Ogg Vorbis ??? ???????? ????? ???-???? ?????
Comment[be]=???????? Ogg Vorbis ? ????? ????? ?????
Comment[bg]=??????????? ?? Ogg Vorbis ? ????? ????????? ???????
Comment[bn]=Ogg Vorvis ??? ???????? ???? ???????? ?????
Comment[bn_IN]=Ogg Vorvis ??? ???????? ???? ???? ?????
Comment[ca]=Reprodu?u fitxers Ogg Vorbis i d'altres formats de so
Comment[cs]=P?ehr?t zvukov? soubory Ogg Vorbis a dal??
Comment[cy]=Gwrando ar Ogg Vorbis a ffeiliau sain eraill
Comment[da]=Afspil Ogg Vorbis og andre lydfiler
Comment[de]=Ogg Vorbis und andere Audio-Dateien wiedergeben
Comment[el]=??????????? Ogg Vorbis ??? ????? ??????? ????
Comment[en_GB]=Play Ogg Vorbis and other audio files
Comment[es]=Reproducir Ogg Vorbis y otros ficheros de audio
Comment[et]=Erinevate helifailide esitamine
Comment[fa]=??? ?????????? ? ?????????? ???? ????
Comment[fi]=Soita mm. Ogg Vorbis -??nitiedostoja
Comment[fr]=Lire les Ogg Vorbis et autres fichiers audio
Comment[gl]=Reproduza Ogg Vorbis e outros ficheiros de audio
Comment[gu]=?? ?????? ??? ???? ????? ????? ?????
Comment[he]=??? ???? Ogg Vorbis ????? ??? ??????
Comment[hi]=Ogg Vorbis ?? ???? ?????? ???? ?????
Comment[hr]=Pokretanje Ogg Vorbis i ostalih datoteka zvuka
Comment[hu]=Ogg Vorbis ?s m?s hangf?jlok lej?tsz?sa
Comment[hy]=?????? Ogg Vorbis ? ??? ???? ???????? ??????
Comment[id]=Mainkan Ogg Vorbis dan berkas audio lainnya
Comment[ilo]=Patugtogen ti Ogg Vorbis ken sabsabali pay nga intar ti paguni
Comment[is]=Spila Ogg Vorbis og fleiri t?nlistaskr?r
Comment[it]=Riproduce Ogg Vorbis e altri file audio
Comment[ja]=Ogg Vorbis????????????????
Comment[ka]=Ogg Vorbis ?? ???? ????????????? ??????
Comment[kn]=Ogg Vorbis ??????? ?????????????? ??????
Comment[ko]=Ogg Vorbis? ?? ??? ?? ??
Comment[lt]=Groja Ogg Vorbis ir kitas audio bylas
Comment[lv]=Sp?l?t Ogg Vorbis un citas audio datnes
Comment[mk]=????? Ogg Vorbis ? ????? ????? ????????
Comment[ml]=Ogg Vorbis?? ????? ????? ???????? ????????????????????
Comment[mr]=Ogg Vorbis ??? ??? ????? ?????? ?????
Comment[ms]=Main fail audio Ogg Vorbis dan lain-lain
Comment[nb]=Spill av Ogg Vorbis og andre lydfiler
Comment[nl]=Ogg Vorbis en andere audiobestanden afspelen
Comment[no]=Spill av Ogg Vorbis og andre lydfiler
Comment[nso]=Bapala Ogg Vorbis le difaele t?e dingwe t?eo di nago le modumo
Comment[or]=??? ????? ?????? ???????? ???? ???? ??????? ???????
Comment[pa]=Ogg Vorbis ??? ??? ????? ?????? ????
Comment[pl]=Odtwarzanie Ogg Vorbis i innych plik?w d?wi?kowych
Comment[pt]=Toque ficheiros Ogg Vorbis e outros formatos de ?udio
Comment[pt_BR]=Toque Ogg Vorbis e outros arquivos de ?udio
Comment[ro]=Red? fi?iere audio precum Ogg Vorbis
Comment[ru]=????????????? ????? Ogg Vorbis ? ?????? ???????? ?????
Comment[si]=Ogg Vorbis ?? ??????? ????? ???? ????? ?????
Comment[sk]=Hra? Ogg Vorbis a ostatn? zvukov? s?bory
Comment[sl]=Predvaja Ogg Vorbis in druge zvo?ne datoteke
Comment[sr]=??????? Ogg Vorbis ? ??????? ????? ????????
Comment[sr at latin]=Pu?tanje Ogg Vorbis i ostalih audio datoteka
Comment[sv]=Spela Ogg Vorbis-filer och andra ljudfiler
Comment[ta]=Ogg Vorbis ??????? ???? ???????? ????????? ?????????
Comment[te]=Ogg Vorbis ????? ??? ????? ??????? ????
Comment[th]=???????? Ogg Vorbis ?????????????????
Comment[tr]=Ogg Vorbis ve di?er i?itsel dosyalar? ?alar
Comment[uk]=??????????? ?????? Ogg Vorbis ?? ????? ???????? ??????
Comment[ur]=??? ?? ??? ? ? ?? ?? ???? ??? ?? Ogg Vorbis 
Comment[vi]=Ch?i t?p tin nh?c Ogg Vorbis v? c?c t?p tin kh?c
Comment[zh_CN]=?? Ogg Vorbis ???????
Comment[zh_TW]=?? Ogg Vorbis ????????
Comment[zu]=Dlala i- Ogg Vorbis kanye namafayela okuzwa
Exec=xmms -e %F
Icon=xmms
MimeType=audio/x-mp3;audio/x-mod;audio/x-wav;audio/x-mpegurl;audio/mpegurl;audio/x-scpls;application/x-ogg;application/ogg
GenericName=Audio Player
GenericName[af]=Klankspeler
GenericName[am]=???? ????
GenericName[ar]=??????? ??????????
GenericName[as]=????? ??????
GenericName[be]=????? ??????????
GenericName[bg]=????????? ??????
GenericName[bn]=???? ???????
GenericName[bn_IN]=???? ???????
GenericName[ca]=Reproductor de so
GenericName[cs]=P?ehr?va? zvuku
GenericName[cy]=Chwaraewr Sain
GenericName[da]=Lydafspiller
GenericName[de]=Audio-Player
GenericName[el]=????????????? Audio
GenericName[en_GB]=Audio Player
GenericName[es]=Reproductor de audio
GenericName[et]=Audio m?ngijad
GenericName[fa]=?????????? ???
GenericName[fi]=??nisoitin
GenericName[fr]=Lecteur audio 
GenericName[gl]=Reproductor de audio
GenericName[gu]=????? ???????
GenericName[he]=??? ??????
GenericName[hi]=?????? ????
GenericName[hr]=Svira? zvuka
GenericName[hu]=Hanglej?tsz?
GenericName[hy]=?????????
GenericName[id]=Audio Player
GenericName[ilo]=Pagpatokar iti Uni
GenericName[is]=Hlj??spilari
GenericName[it]=Lettore audio
GenericName[ja]=??????????
GenericName[ka]=??????????????
GenericName[kn]=????? ??????
GenericName[ko]=??? ???
GenericName[lt]=Audio Grotuvas
GenericName[lv]=Audio atska?ot?js
GenericName[mk]=????? ??????
GenericName[ml]=????? ????????
GenericName[mr]=?????????
GenericName[ms]=Pemain Audio
GenericName[nb]=Lydavspiller
GenericName[nl]=Geluidsspeler
GenericName[no]=Lydavspiller
GenericName[nso]=Sebapadi se nago le Modumo
GenericName[or]=???? ????
GenericName[pa]=???? ?????
GenericName[pl]=Odtwarzacz d?wi?ku
GenericName[pt]=Reprodutor ?udio
GenericName[pt_BR]=Reprodutor de ?udio
GenericName[ro]=Player audio
GenericName[ru]=???????? ?????????????
GenericName[si]=???????? ?????
GenericName[sk]=Prehr?va? zvuku
GenericName[sl]=Predvajalnik zvoka
GenericName[sr]=????? ???????
GenericName[sr at latin]=Audio program
GenericName[sv]=Ljudspelare
GenericName[ta]=???????? ??????
GenericName[te]=Audio Player
GenericName[th]=????????????????
GenericName[tr]=Ses?alar
GenericName[uk]=????????? ?????
GenericName[ur]=Player ? ? ?? 
GenericName[vi]=B? ch?i nh?c
GenericName[zh_CN]=?????
GenericName[zh_TW]=?????
GenericName[zu]=Umdlali Ozwakalayo
Terminal=0
Type=Application
MapNotify=false
Categories=AudioVideo;



From rdieter at fedoraproject.org  Wed Dec  9 00:04:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 00:04:11 +0000 (UTC)
Subject: rpms/fltk/devel fltk.spec,1.43,1.44
Message-ID: <20091209000411.CC1DE11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/fltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20272

Modified Files:
	fltk.spec 
Log Message:
* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-7
- real -static subpkg (#545145)



Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- fltk.spec	24 Jul 2009 22:56:29 -0000	1.43
+++ fltk.spec	9 Dec 2009 00:04:11 -0000	1.44
@@ -4,7 +4,7 @@
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.1.9
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:	LGPLv2+ with exceptions	
@@ -63,11 +63,16 @@ Requires:       libX11-devel libSM-devel
 %else
 Requires:       xorg-x11-devel
 %endif
-# includes static libs
-Provides:       %{name}-static = %{version}-%{release}
 %description devel
 %{summary}.
 
+%package static
+Summary:  Static libraries for %{name}
+Group:    Development/Libraries	
+Requires: %{name}-devel = %{version}-%{release}
+%description static
+%{summary}.
+
 %package fluid
 Summary:	Fast Light User Interface Designer
 Group:		Development/Tools
@@ -197,12 +202,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/libfltk_forms.so
 %{_libdir}/libfltk_gl.so
 %{_libdir}/libfltk_images.so
+%{_mandir}/man1/fltk-config.1*
+%{_mandir}/man3/fltk.3*
+
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/libfltk.a
 %{_libdir}/libfltk_forms.a
 %{_libdir}/libfltk_gl.a
 %{_libdir}/libfltk_images.a
-%{_mandir}/man1/fltk-config.1*
-%{_mandir}/man3/fltk.3*
 
 %files fluid
 %defattr(-,root,root,-)
@@ -215,6 +224,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-7
+- real -static subpkg (#545145)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nalin at fedoraproject.org  Wed Dec  9 00:18:59 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed,  9 Dec 2009 00:18:59 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-selinux-label.patch,1.7,1.8
Message-ID: <20091209001859.22BAC11C00C5@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25710

Modified Files:
	krb5-1.7-selinux-label.patch 
Log Message:
- if the result of our attempt to look up the context is NULL, either
  because the right function returned NULL or we failed to initialize
  the library, just skip it, as that's all we can do


krb5-1.7-selinux-label.patch:
 aclocal.m4                                      |   51 +++
 appl/bsd/configure.in                           |    1 
 appl/gssftp/configure.in                        |    1 
 appl/telnet/configure.in                        |    1 
 config/pre.in                                   |    3 
 configure.in                                    |    2 
 include/autoconf.h.in                           |   13 
 include/k5-int.h                                |    1 
 include/k5-label.h                              |   27 +
 include/krb5/krb5.hin                           |    6 
 kadmin/dbutil/dump.c                            |    2 
 krb5-config.in                                  |    3 
 lib/kadm5/logger.c                              |    4 
 lib/krb5/keytab/kt_file.c                       |    4 
 plugins/kdb/db2/adb_openclose.c                 |    2 
 plugins/kdb/db2/kdb_db2.c                       |    4 
 plugins/kdb/db2/libdb2/btree/bt_open.c          |    3 
 plugins/kdb/db2/libdb2/hash/hash.c              |    3 
 plugins/kdb/db2/libdb2/recno/rec_open.c         |    3 
 plugins/kdb/db2/libdb2/test/Makefile.in         |    3 
 plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c |   12 
 slave/kpropd.c                                  |    2 
 util/profile/prof_file.c                        |    3 
 util/support/Makefile.in                        |    3 
 util/support/selinux.c                          |  346 ++++++++++++++++++++++++
 25 files changed, 480 insertions(+), 23 deletions(-)

Index: krb5-1.7-selinux-label.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-selinux-label.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- krb5-1.7-selinux-label.patch	3 Dec 2009 23:17:28 -0000	1.7
+++ krb5-1.7-selinux-label.patch	9 Dec 2009 00:18:58 -0000	1.8
@@ -541,7 +541,7 @@ diff -up krb5-1.7/src/util/support/Makef
 diff -up /dev/null krb5-1.7/src/util/support/selinux.c
 --- /dev/null	2009-06-04 10:34:55.169007373 -0400
 +++ krb5-1.7/src/util/support/selinux.c	2009-06-04 13:47:20.000000000 -0400
-@@ -0,0 +1,340 @@
+@@ -0,0 +1,346 @@
 +/*
 + * Copyright 2007,2008,2009 Red Hat, Inc.  All Rights Reserved.
 + *
@@ -683,6 +683,12 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +			}
 +#endif
 +			free(genpath);
++			if (configuredsc == NULL) {
++				if (previous != NULL) {
++					freecon(previous);
++				}
++				return NULL;
++			}
 +			currentsc = NULL;
 +			getcon(&currentsc);
 +			if (currentsc != NULL) {



From rdieter at fedoraproject.org  Wed Dec  9 00:23:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 00:23:12 +0000 (UTC)
Subject: rpms/fltk/F-12 fltk.spec,1.43,1.44
Message-ID: <20091209002312.D663A11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/fltk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27567

Modified Files:
	fltk.spec 
Log Message:
* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-7
- real -static subpkg (#545145)



Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/F-12/fltk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- fltk.spec	24 Jul 2009 22:56:29 -0000	1.43
+++ fltk.spec	9 Dec 2009 00:23:12 -0000	1.44
@@ -4,7 +4,7 @@
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.1.9
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:	LGPLv2+ with exceptions	
@@ -63,11 +63,16 @@ Requires:       libX11-devel libSM-devel
 %else
 Requires:       xorg-x11-devel
 %endif
-# includes static libs
-Provides:       %{name}-static = %{version}-%{release}
 %description devel
 %{summary}.
 
+%package static
+Summary:  Static libraries for %{name}
+Group:    Development/Libraries	
+Requires: %{name}-devel = %{version}-%{release}
+%description static
+%{summary}.
+
 %package fluid
 Summary:	Fast Light User Interface Designer
 Group:		Development/Tools
@@ -197,12 +202,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/libfltk_forms.so
 %{_libdir}/libfltk_gl.so
 %{_libdir}/libfltk_images.so
+%{_mandir}/man1/fltk-config.1*
+%{_mandir}/man3/fltk.3*
+
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/libfltk.a
 %{_libdir}/libfltk_forms.a
 %{_libdir}/libfltk_gl.a
 %{_libdir}/libfltk_images.a
-%{_mandir}/man1/fltk-config.1*
-%{_mandir}/man3/fltk.3*
 
 %files fluid
 %defattr(-,root,root,-)
@@ -215,6 +224,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-7
+- real -static subpkg (#545145)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Dec  9 00:30:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 00:30:31 +0000 (UTC)
Subject: File fltk-1.1.10rc3-source.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091209003031.5030010F801@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for fltk:

9e90a57291e2edb1a82d1083a765c8e4  fltk-1.1.10rc3-source.tar.bz2



From rdieter at fedoraproject.org  Wed Dec  9 00:32:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 00:32:59 +0000 (UTC)
Subject: rpms/fltk/devel fltk-1.1.9-scandir.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 fltk-1.1.9-rpath.patch, 1.1, 1.2 fltk.spec, 1.44,
	1.45 sources, 1.10, 1.11 fltk-1.1.9-consts.patch, 1.1,
	NONE fltk-1.1.9-gcc44.patch, 1.1, NONE
Message-ID: <20091209003259.7999B11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/fltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30821

Modified Files:
	.cvsignore fltk-1.1.9-rpath.patch fltk.spec sources 
Added Files:
	fltk-1.1.9-scandir.patch 
Removed Files:
	fltk-1.1.9-consts.patch fltk-1.1.9-gcc44.patch 
Log Message:
* Tue Dec 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10-0.1.rc3
- fltk-1.1.10rc3


fltk-1.1.9-scandir.patch:
 filename_list.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fltk-1.1.9-scandir.patch ---
diff -up fltk-1.1.9/src/filename_list.cxx.gcc44 fltk-1.1.9/src/filename_list.cxx
--- fltk-1.1.9/src/filename_list.cxx.gcc44	2006-06-09 11:16:34.000000000 -0500
+++ fltk-1.1.9/src/filename_list.cxx	2009-05-13 09:46:42.372917879 -0500
@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire
   // The vast majority of UNIX systems want the sort function to have this
   // prototype, most likely so that it can be passed to qsort without any
   // changes:
-  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
+  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
 #else
   // This version is when we define our own scandir (WIN32 and perhaps
   // some Unix systems) and apparently on IRIX:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2008 17:22:37 -0000	1.10
+++ .cvsignore	9 Dec 2009 00:32:59 -0000	1.11
@@ -1 +1 @@
-fltk-1.1.9-source.tar.bz2
+fltk-1.1.10rc3-source.tar.bz2

fltk-1.1.9-rpath.patch:
 configure    |    4 ++--
 configure.in |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: fltk-1.1.9-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/fltk-1.1.9-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fltk-1.1.9-rpath.patch	13 May 2009 15:37:43 -0000	1.1
+++ fltk-1.1.9-rpath.patch	9 Dec 2009 00:32:59 -0000	1.2
@@ -8,9 +8,9 @@ diff -up fltk-1.1.9/configure.in.rpath f
 -	    if test "x$libdir" != "x/usr/lib"; then
 -		    DSOLINK="-Wl,-rpath,$libdir"
 -            fi
-+#	    if test "x$libdir" != "x/usr/lib"; then
-+#		    DSOLINK="-Wl,-rpath,$libdir"
-+#	    fi
++	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then
++		    DSOLINK="-Wl,-rpath,$libdir"
++	    fi
  	    ;;
  	AIX*)
              DSONAME="libfltk_s.a"


Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- fltk.spec	9 Dec 2009 00:04:11 -0000	1.44
+++ fltk.spec	9 Dec 2009 00:32:59 -0000	1.45
@@ -1,10 +1,12 @@
 
 %global arch %(arch 2>/dev/null || echo undefined)
 
+%define pre rc3
+
 Summary:	C++ user interface toolkit
 Name:		fltk
-Version:	1.1.9
-Release:	7%{?dist}
+Version:	1.1.10
+Release:	0.1.%{pre}%{?dist}
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:	LGPLv2+ with exceptions	
@@ -13,7 +15,8 @@ URL:		http://www.fltk.org/
 %if "%{?snap:1}" == "1"
 Source0:        http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.1.x-%{snap}.tar.bz2
 %else
-Source0:        http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
+Source0:        http://ftp.easysw.com/pub/fltk/%{version}%{?pre}/%{name}-%{version}%{?pre}-source.tar.bz2
+#Source0:         http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10rc3/fltk-1.1.10rc3-source.tar.bz2
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +30,7 @@ Patch3: 	fltk-1.1.x-r5750-undefined.patc
 # nuke --rpath (#238284)
 Patch4: 	fltk-1.1.9-rpath.patch
 Patch5: 	fltk-1.1.8-fluid_desktop.patch
-Patch6: 	fltk-1.1.9-consts.patch
-Patch7:         fltk-1.1.9-gcc44.patch
+Patch7:         fltk-1.1.9-scandir.patch
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 BuildRequires:  libICE-devel libSM-devel
@@ -85,7 +87,7 @@ Requires:	%{name}-devel = %{version}-%{r
 %if "%{?snap:1}" == "1"
 %setup -q -n fltk-1.1.x-%{snap}
 %else
-%setup -q 
+%setup -q  -n fltk-%{version}%{?pre}
 %endif
 
 %patch1 -p1 -b .fltk_config
@@ -93,7 +95,6 @@ Requires:	%{name}-devel = %{version}-%{r
 %patch3 -p1 -b .undefined
 %patch4 -p1 -b .rpath
 %patch5 -p1 -b .fluid_desktop
-%patch6 -p1 -b .consts
 # FIXME, why only needed for F-11+/gcc44 ?
 %if 0%{?fedora} > 10
 %patch7 -p1 -b .gcc44
@@ -156,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
 
 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
-make test 
+make -C test 
 
 
 %clean
@@ -224,6 +225,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10-0.1.rc3
+- fltk-1.1.10rc3
+
 * Mon Dec 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.9-7
 - real -static subpkg (#545145)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 Oct 2008 17:22:37 -0000	1.10
+++ sources	9 Dec 2009 00:32:59 -0000	1.11
@@ -1 +1 @@
-e146fd264e1001b1313acfd41ef75552  fltk-1.1.9-source.tar.bz2
+9e90a57291e2edb1a82d1083a765c8e4  fltk-1.1.10rc3-source.tar.bz2


--- fltk-1.1.9-consts.patch DELETED ---


--- fltk-1.1.9-gcc44.patch DELETED ---



From cebbert at fedoraproject.org  Wed Dec  9 01:28:19 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  9 Dec 2009 01:28:19 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1782,
	1.1783 linux-2.6-execshield.patch, 1.106, 1.107
Message-ID: <20091209012819.5A69C11C00C5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16484

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
Copy fix for #540580 from F-12.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1782
retrieving revision 1.1783
diff -u -p -r1.1782 -r1.1783
--- kernel.spec	4 Dec 2009 06:44:03 -0000	1.1782
+++ kernel.spec	9 Dec 2009 01:28:18 -0000	1.1783
@@ -2168,6 +2168,9 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.10-104
+- Copy fix for #540580 from F-12.
+
 * Fri Dec 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-103
 - 2.6.30.10
 - nuke ipv4-fix-null-ptr-deref-in-ip_fragment.patch, it's in the latest

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h      |   25 +++++++
 arch/x86/include/asm/mmu.h       |    7 ++
 arch/x86/include/asm/paravirt.h  |    9 ++
 arch/x86/include/asm/processor.h |    3 
 arch/x86/kernel/cpu/common.c     |   14 ++++
 arch/x86/kernel/paravirt.c       |    3 
 arch/x86/kernel/process_32.c     |   49 ++++++++++++++
 arch/x86/kernel/traps.c          |  129 ++++++++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c               |    4 +
 arch/x86/mm/init_32.c            |   16 ++--
 arch/x86/mm/mmap.c               |    5 +
 arch/x86/mm/tlb.c                |    7 ++
 arch/x86/vdso/vdso32-setup.c     |    2 
 arch/x86/xen/enlighten.c         |   21 ++++++
 fs/binfmt_elf.c                  |   21 +++++-
 include/linux/mm.h               |    8 ++
 include/linux/mm_types.h         |    3 
 include/linux/resource.h         |    5 +
 include/linux/sched.h            |    7 ++
 kernel/sysctl.c                  |   28 ++++++++
 mm/mmap.c                        |  121 ++++++++++++++++++++++++++++++++++--
 mm/mprotect.c                    |   10 ++-
 mm/mremap.c                      |    4 -
 23 files changed, 464 insertions(+), 37 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-execshield.patch,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- linux-2.6-execshield.patch	25 Jul 2009 04:09:24 -0000	1.106
+++ linux-2.6-execshield.patch	9 Dec 2009 01:28:18 -0000	1.107
@@ -384,7 +384,7 @@ index a1d2883..453b616 100644
 +			info.si_errno = 0;
 +			info.si_code = ILL_BADSTK;
 +			info.si_addr = 0;
-+			do_trap(32, SIGSEGV, "iret exception", 0, error_code, &info);
++			do_trap(32, SIGSEGV, "iret exception", regs, error_code, &info);
 +	}
  }
  #endif



From cebbert at fedoraproject.org  Wed Dec  9 01:32:10 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  9 Dec 2009 01:32:10 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1868,
	1.1869 linux-2.6-execshield.patch, 1.111, 1.112
Message-ID: <20091209013210.1313411C00C5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17899

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
Copy fix for #540580 from F-12.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1868
retrieving revision 1.1869
diff -u -p -r1.1868 -r1.1869
--- kernel.spec	8 Dec 2009 20:55:06 -0000	1.1868
+++ kernel.spec	9 Dec 2009 01:32:09 -0000	1.1869
@@ -1997,6 +1997,9 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-6
+- Copy fix for #540580 from F-12.
+
 * Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-5
 - new rpm changes:
  - %{PACKAGE_VERSION} -> %{version}

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h           |   25 ++++++
 arch/x86/include/asm/mmu.h            |    7 +
 arch/x86/include/asm/paravirt.h       |    6 +
 arch/x86/include/asm/paravirt_types.h |    3 
 arch/x86/include/asm/processor.h      |    3 
 arch/x86/kernel/cpu/common.c          |   14 +++
 arch/x86/kernel/paravirt.c            |    3 
 arch/x86/kernel/process_32.c          |   48 ++++++++++++
 arch/x86/kernel/traps.c               |  129 +++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c                    |    6 +
 arch/x86/mm/mmap.c                    |    5 +
 arch/x86/mm/setup_nx.c                |    4 +
 arch/x86/mm/tlb.c                     |    7 +
 arch/x86/vdso/vdso32-setup.c          |    2 
 arch/x86/xen/enlighten.c              |   21 +++++
 fs/binfmt_elf.c                       |   21 ++++-
 include/linux/mm.h                    |    8 +-
 include/linux/mm_types.h              |    3 
 include/linux/resource.h              |    5 +
 include/linux/sched.h                 |    7 +
 kernel/sysctl.c                       |   28 +++++++
 mm/mmap.c                             |  121 +++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++
 mm/mremap.c                           |    4 -
 24 files changed, 463 insertions(+), 27 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- linux-2.6-execshield.patch	28 Sep 2009 22:57:23 -0000	1.111
+++ linux-2.6-execshield.patch	9 Dec 2009 01:32:09 -0000	1.112
@@ -385,7 +385,7 @@ index 7e37dce..92ae538 100644
 +			info.si_errno = 0;
 +			info.si_code = ILL_BADSTK;
 +			info.si_addr = 0;
-+			do_trap(32, SIGSEGV, "iret exception", 0, error_code, &info);
++			do_trap(32, SIGSEGV, "iret exception", regs, error_code, &info);
 +	}
  }
  #endif



From cwickert at fedoraproject.org  Wed Dec  9 01:32:30 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed,  9 Dec 2009 01:32:30 +0000 (UTC)
Subject: File lxappearance-0.3.0.tar.gz uploaded to lookaside cache by
	cwickert
Message-ID: <20091209013230.64C7510F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lxappearance:

916f4f49d47a7ba47eb297c11c81ba9d  lxappearance-0.3.0.tar.gz



From pkgdb at fedoraproject.org  Wed Dec  9 01:45:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 01:45:24 +0000
Subject: [pkgdb] squashfs-tools: bruno has given up watchbugzilla
Message-ID: <20091209014524.8ED8E10F87D@bastion2.fedora.phx.redhat.com>

bruno has given up the watchbugzilla acl on squashfs-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From pkgdb at fedoraproject.org  Wed Dec  9 01:45:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 01:45:24 +0000
Subject: [pkgdb] squashfs-tools: bruno has given up watchcommits
Message-ID: <20091209014524.D93DD10F891@bastion2.fedora.phx.redhat.com>

bruno has given up the watchcommits acl on squashfs-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From pkgdb at fedoraproject.org  Wed Dec  9 01:45:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 01:45:28 +0000
Subject: [pkgdb] squashfs-tools: bruno has requested commit
Message-ID: <20091209014528.75CC110F89C@bastion2.fedora.phx.redhat.com>

bruno has requested the commit acl on squashfs-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From mclasen at fedoraproject.org  Wed Dec  9 02:42:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Dec 2009 02:42:21 +0000 (UTC)
Subject: rpms/control-center/F-12 no-duplicate-keybindings-dammit.patch, NONE,
	1.1 control-center.spec, 1.508, 1.509
Message-ID: <20091209024221.594CE11C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9998

Modified Files:
	control-center.spec 
Added Files:
	no-duplicate-keybindings-dammit.patch 
Log Message:
fix duplicate keybindings


no-duplicate-keybindings-dammit.patch:
 wm-common.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE no-duplicate-keybindings-dammit.patch ---
--- gnome-control-center-2.28.1/capplets/common/wm-common.c	2009-09-21 06:44:55.000000000 -0400
+++ hacked/capplets/common/wm-common.c	2009-12-08 21:31:52.318541572 -0500
@@ -27,7 +27,7 @@
   guchar *val;
 
   if (wm_window == None)
-    return g_strdup (WM_COMMON_UNKNOWN);
+    return NULL;
 
   utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
 
@@ -46,7 +46,7 @@
       type != utf8_string || format != 8 || nitems == 0 ||
       !g_utf8_validate (val, nitems, NULL))
     {
-      retval = g_strdup (WM_COMMON_UNKNOWN);
+      retval = NULL;
     }
   else
     {
@@ -93,7 +93,7 @@
       char *wm_name = wm_common_get_window_manager_property (wm_atom);
       char *to_copy[] = { NULL, NULL };
 
-      to_copy[0] = wm_name;
+      to_copy[0] = wm_name ? wm_name : WM_COMMON_UNKNOWN;
 
       results = g_strdupv (to_copy);
       g_free (wm_name);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -p -r1.508 -r1.509
--- control-center.spec	7 Dec 2009 18:40:50 -0000	1.508
+++ control-center.spec	9 Dec 2009 02:42:21 -0000	1.509
@@ -83,6 +83,9 @@ Patch57: monitor-aspect.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=492974
 Patch60: override-redirect.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604130
+Patch62: no-duplicate-keybindings-dammit.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -229,6 +232,7 @@ for the GNOME desktop.
 %patch56 -p1 -b .best-shapes
 %patch57 -p1 -b .monitor-aspect
 %patch60 -p1 -b .override-redirect
+%patch62 -p1 -b .no-duplicate-keybindings
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -420,6 +424,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-10
+- Avoid duplicate entries in the keybinding preferences (#542401)
+
 * Mon Dec  7 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-9
 - Improve typing break locking for multiple monitors
 



From mclasen at fedoraproject.org  Wed Dec  9 02:45:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Dec 2009 02:45:31 +0000 (UTC)
Subject: rpms/control-center/F-12 control-center.spec,1.509,1.510
Message-ID: <20091209024531.E5E4D11C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10686

Modified Files:
	control-center.spec 
Log Message:
bump rev



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -p -r1.509 -r1.510
--- control-center.spec	9 Dec 2009 02:42:21 -0000	1.509
+++ control-center.spec	9 Dec 2009 02:45:31 -0000	1.510
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops



From mclasen at fedoraproject.org  Wed Dec  9 02:45:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  9 Dec 2009 02:45:40 +0000 (UTC)
Subject: rpms/control-center/devel no-duplicate-keybindings-dammit.patch,
	NONE, 1.1 control-center.spec, 1.496, 1.497
Message-ID: <20091209024540.5263511C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11083

Modified Files:
	control-center.spec 
Added Files:
	no-duplicate-keybindings-dammit.patch 
Log Message:
copy f12 fixes


no-duplicate-keybindings-dammit.patch:
 wm-common.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE no-duplicate-keybindings-dammit.patch ---
--- gnome-control-center-2.28.1/capplets/common/wm-common.c	2009-09-21 06:44:55.000000000 -0400
+++ hacked/capplets/common/wm-common.c	2009-12-08 21:31:52.318541572 -0500
@@ -27,7 +27,7 @@
   guchar *val;
 
   if (wm_window == None)
-    return g_strdup (WM_COMMON_UNKNOWN);
+    return NULL;
 
   utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
 
@@ -46,7 +46,7 @@
       type != utf8_string || format != 8 || nitems == 0 ||
       !g_utf8_validate (val, nitems, NULL))
     {
-      retval = g_strdup (WM_COMMON_UNKNOWN);
+      retval = NULL;
     }
   else
     {
@@ -93,7 +93,7 @@
       char *wm_name = wm_common_get_window_manager_property (wm_atom);
       char *to_copy[] = { NULL, NULL };
 
-      to_copy[0] = wm_name;
+      to_copy[0] = wm_name ? wm_name : WM_COMMON_UNKNOWN;
 
       results = g_strdupv (to_copy);
       g_free (wm_name);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- control-center.spec	7 Dec 2009 18:36:53 -0000	1.496
+++ control-center.spec	9 Dec 2009 02:45:40 -0000	1.497
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 6%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -83,6 +83,9 @@ Patch57: monitor-aspect.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=492974
 Patch60: override-redirect.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604130
+Patch62: no-duplicate-keybindings-dammit.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -225,6 +228,7 @@ for the GNOME desktop.
 %patch56 -p1 -b .best-shapes
 %patch57 -p1 -b .monitor-aspect
 %patch60 -p1 -b .override-redirect
+%patch62 -p1 -b .no-duplicate-keybindings
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -415,6 +419,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-10
+- Avoid duplicate entries in the keybinding preferences (#542401)
+
 * Mon Dec  7 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-6
 - Improve typing break locking for multiple monitors
 



From jkeating at fedoraproject.org  Wed Dec  9 03:46:40 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  9 Dec 2009 03:46:40 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm.spec,1.34,1.35
Message-ID: <20091209034640.27CF211C00C5@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31244

Modified Files:
	deltarpm.spec 
Log Message:
* Tue Dec 08 2009 Jesse Keating <jkeating at redhat.com> - 3.5-0.5.20090913git
- Rebuild for new rpm



Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- deltarpm.spec	1 Oct 2009 04:57:27 -0000	1.34
+++ deltarpm.spec	9 Dec 2009 03:46:39 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.4.20090913git%{?dist}
+Release: 0.5.20090913git%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -104,6 +104,9 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Tue Dec 08 2009 Jesse Keating <jkeating at redhat.com> - 3.5-0.5.20090913git
+- Rebuild for new rpm
+
 * Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.4.20090913git
 - Update patch to properly detect when an rpm is built with an rsync-friendly
   zlib and bail out.



From iarnell at fedoraproject.org  Wed Dec  9 04:13:35 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  9 Dec 2009 04:13:35 +0000 (UTC)
Subject: File HTML-FormFu-0.05004.tar.gz uploaded to lookaside cache by
	iarnell
Message-ID: <20091209041335.DF08510F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-HTML-FormFu:

19d514aefafe08a735db0f0bf8d8647d  HTML-FormFu-0.05004.tar.gz



From iarnell at fedoraproject.org  Wed Dec  9 04:13:59 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  9 Dec 2009 04:13:59 +0000 (UTC)
Subject: rpms/perl-HTML-FormFu/devel .cvsignore, 1.7,
	1.8 perl-HTML-FormFu.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20091209041359.A731611C00E0@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32243

Modified Files:
	.cvsignore perl-HTML-FormFu.spec sources 
Log Message:
* Tue Dec 08 2009 Iain Arnell <iarnell at gmail.com> 0.05004-1
- update to latest upstream version
- use perl_default_filter



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Jul 2009 07:13:36 -0000	1.7
+++ .cvsignore	9 Dec 2009 04:13:58 -0000	1.8
@@ -1 +1 @@
-HTML-FormFu-0.05001.tar.gz
+HTML-FormFu-0.05004.tar.gz


Index: perl-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu/devel/perl-HTML-FormFu.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-HTML-FormFu.spec	7 Dec 2009 16:02:52 -0000	1.11
+++ perl-HTML-FormFu.spec	9 Dec 2009 04:13:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-HTML-FormFu
-Version:        0.05001
-Release:        3%{?dist}
+Version:        0.05004
+Release:        1%{?dist}
 Summary:        HTML Form Creation, Rendering and Validation Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,12 @@ Requires:       perl(Template)
 Requires:       perl(YAML::Syck) >= 1.05
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter:
+%filter_from_provides /perl(unicode/d
+%filter_from_requires /perl(Catalyst/d; /perl(default/d; perl(model_config)/d;
+%perl_default_filter
+}
+
 %description
 HTML::FormFu is a HTML form framework which aims to be as easy as possible
 to use for basic web forms, but with the power and flexibility to do
@@ -68,24 +74,6 @@ anything else you might want to do (as l
 find examples -type f | xargs chmod 644
 find examples -type f | xargs sed -i -e 's/\r//'
 
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-sed -e '/perl(unicode/d'
-EOF
-
-%define __perl_provides %{_builddir}/HTML-FormFu-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-sed -e '/perl(Catalyst/d' -e '/perl(default/d' -e '/perl(model_config)/d'
-EOF
-
-%define __perl_requires %{_builddir}/HTML-FormFu-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -99,6 +87,8 @@ make pure_install PERL_INSTALL_ROOT=$RPM
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
+rm -rf $RPM_BUILD_ROOT/blib
+
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
@@ -116,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 08 2009 Iain Arnell <iarnell at gmail.com> 0.05004-1
+- update to latest upstream version
+- use perl_default_filter
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05001-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Jul 2009 07:13:36 -0000	1.7
+++ sources	9 Dec 2009 04:13:59 -0000	1.8
@@ -1 +1 @@
-018ade1d4e0885fec27fe79552e8b24d  HTML-FormFu-0.05001.tar.gz
+19d514aefafe08a735db0f0bf8d8647d  HTML-FormFu-0.05004.tar.gz



From cjb at fedoraproject.org  Wed Dec  9 04:15:02 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Wed,  9 Dec 2009 04:15:02 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091209git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091209041502.52A6210F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

ef757e8fa396254a8899d2654462ba74  ohm-0.1.1-1.20091209git.tar.gz



From iarnell at fedoraproject.org  Wed Dec  9 04:23:32 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  9 Dec 2009 04:23:32 +0000 (UTC)
Subject: File Catalyst-Controller-HTML-FormFu-0.06000.tar.gz uploaded to
	lookaside cache by iarnell
Message-ID: <20091209042332.A3FE210F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-Controller-HTML-FormFu:

bc8453285e9710101e3108c47d2d3ee5  Catalyst-Controller-HTML-FormFu-0.06000.tar.gz



From iarnell at fedoraproject.org  Wed Dec  9 04:23:50 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  9 Dec 2009 04:23:50 +0000 (UTC)
Subject: rpms/perl-Catalyst-Controller-HTML-FormFu/devel .cvsignore, 1.5,
	1.6 perl-Catalyst-Controller-HTML-FormFu.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <20091209042350.AA53611C00E0@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3569

Modified Files:
	.cvsignore perl-Catalyst-Controller-HTML-FormFu.spec sources 
Log Message:
* Wed Dec 09 2009 Iain Arnell <iarnell at gmail.com> 0.06000-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Jul 2009 06:06:40 -0000	1.5
+++ .cvsignore	9 Dec 2009 04:23:49 -0000	1.6
@@ -1 +1 @@
-Catalyst-Controller-HTML-FormFu-0.05000.tar.gz
+Catalyst-Controller-HTML-FormFu-0.06000.tar.gz


Index: perl-Catalyst-Controller-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/perl-Catalyst-Controller-HTML-FormFu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Catalyst-Controller-HTML-FormFu.spec	7 Dec 2009 08:03:53 -0000	1.7
+++ perl-Catalyst-Controller-HTML-FormFu.spec	9 Dec 2009 04:23:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Controller-HTML-FormFu
-Version:        0.05000
-Release:        3%{?dist}
+Version:        0.06000
+Release:        1%{?dist}
 Summary:        HTML::FormFu controller for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec 09 2009 Iain Arnell <iarnell at gmail.com> 0.06000-1
+- update to latest upstream version
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05000-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Jul 2009 06:06:41 -0000	1.5
+++ sources	9 Dec 2009 04:23:49 -0000	1.6
@@ -1 +1 @@
-ca0debf2fcd396fb4e0085c231033271  Catalyst-Controller-HTML-FormFu-0.05000.tar.gz
+bc8453285e9710101e3108c47d2d3ee5  Catalyst-Controller-HTML-FormFu-0.06000.tar.gz



From cjb at fedoraproject.org  Wed Dec  9 04:24:07 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Wed,  9 Dec 2009 04:24:07 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore, 1.9, 1.10 ohm.spec, 1.16, 1.17 sources,
	1.11, 1.12
Message-ID: <20091209042407.C787D11C00E0@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3433

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
- Trac #9848: Don't undim the screen when woken by wlan or battery. 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	8 Dec 2009 19:20:09 -0000	1.9
+++ .cvsignore	9 Dec 2009 04:24:07 -0000	1.10
@@ -1 +1 @@
-ohm-0.1.1-1.20091208git.tar.gz
+ohm-0.1.1-1.20091209git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ohm.spec	8 Dec 2009 19:20:09 -0000	1.16
+++ ohm.spec	9 Dec 2009 04:24:07 -0000	1.17
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091208git
+%define alphatag                20091209git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.33.%{alphatag}%{?dist}
+Release: 9.34.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,6 +139,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.34.20091209git.olpc
+- Trac #9848: Don't undim the screen when woken by wlan or battery. 
+
 * Tue Dec 8 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.33.20091208git.olpc
 - Trac #9805: Preserve user-set brightness on XO-1.5
 - Trac #9847: Add RTC support; turn off the screen after five minutes idle.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	8 Dec 2009 19:20:09 -0000	1.11
+++ sources	9 Dec 2009 04:24:07 -0000	1.12
@@ -1 +1 @@
-d92d22fb55b7ed5b50624ebd4b42cd43  ohm-0.1.1-1.20091208git.tar.gz
+ef757e8fa396254a8899d2654462ba74  ohm-0.1.1-1.20091209git.tar.gz



From iarnell at fedoraproject.org  Wed Dec  9 04:27:04 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  9 Dec 2009 04:27:04 +0000 (UTC)
Subject: File DateTime-Format-Natural-0.81.tar.gz uploaded to lookaside cache
	by iarnell
Message-ID: <20091209042704.E867310F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-DateTime-Format-Natural:

2bc46e8c84ed5d44c53682f92b199ad9  DateTime-Format-Natural-0.81.tar.gz



From iarnell at fedoraproject.org  Wed Dec  9 04:27:50 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  9 Dec 2009 04:27:50 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Natural/devel .cvsignore, 1.9,
	1.10 perl-DateTime-Format-Natural.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20091209042750.5FAE111C00E0@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5075

Modified Files:
	.cvsignore perl-DateTime-Format-Natural.spec sources 
Log Message:
* Wed Dec 09 2009 Iain Arnell <iarnell at gmail.com> 0.81-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Oct 2009 18:34:15 -0000	1.9
+++ .cvsignore	9 Dec 2009 04:27:50 -0000	1.10
@@ -1 +1 @@
-DateTime-Format-Natural-0.80.tar.gz
+DateTime-Format-Natural-0.81.tar.gz


Index: perl-DateTime-Format-Natural.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/perl-DateTime-Format-Natural.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-DateTime-Format-Natural.spec	7 Dec 2009 11:48:11 -0000	1.11
+++ perl-DateTime-Format-Natural.spec	9 Dec 2009 04:27:50 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Natural
-Version:        0.80
-Release:        2%{?dist}
+Version:        0.81
+Release:        1%{?dist}
 Summary:        Create machine readable date/time with natural parsing logic
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 09 2009 Iain Arnell <iarnell at gmail.com> 0.81-1
+- update to latest upstream version
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.80-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Oct 2009 18:34:16 -0000	1.9
+++ sources	9 Dec 2009 04:27:50 -0000	1.10
@@ -1 +1 @@
-27769ae3973bc0c8e0322bc9830d733f  DateTime-Format-Natural-0.80.tar.gz
+2bc46e8c84ed5d44c53682f92b199ad9  DateTime-Format-Natural-0.81.tar.gz



From iarnell at fedoraproject.org  Wed Dec  9 04:35:15 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  9 Dec 2009 04:35:15 +0000 (UTC)
Subject: File Perl-Tags-0.28.tar.gz uploaded to lookaside cache by iarnell
Message-ID: <20091209043515.7D65E10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Perl-Tags:

c7db57564db56d3b77488dc0fc0ce7bd  Perl-Tags-0.28.tar.gz



From airlied at fedoraproject.org  Wed Dec  9 04:39:21 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  9 Dec 2009 04:39:21 +0000 (UTC)
Subject: rpms/libdrm/F-12 libdrm-radeon-eagain.patch, NONE, 1.1 libdrm.spec, 
	1.94, 1.95
Message-ID: <20091209043921.7171611C00E0@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10167

Modified Files:
	libdrm.spec 
Added Files:
	libdrm-radeon-eagain.patch 
Log Message:
* Wed Dec 09 2009 Dave Airlie <airlied at redhat.com> 2.4.15-7
- radeon API from kernel change


libdrm-radeon-eagain.patch:
 radeon_bo_gem.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE libdrm-radeon-eagain.patch ---
commit b84314a86ea4ad30e0f57a71b4ef0fa138fb24c6
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Mon Dec 7 18:30:52 2009 +0100

    radeon: Use drmIoctl so we restart ioctl on EINTR or EAGAIN
    
    This is needed as change in kernel will lead to ioctl returning
    EINTR if they are interrupted.
    
    Signed-off-by: Jerome Glisse <jglisse at redhat.com>

diff --git a/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c
index d34f24c..6ededcd 100644
--- a/libdrm/radeon/radeon_bo_gem.c
+++ b/libdrm/radeon/radeon_bo_gem.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
-#include <sys/ioctl.h>
 #include <errno.h>
 #include "xf86drm.h"
 #include "drm.h"
@@ -86,7 +85,7 @@ static struct radeon_bo *bo_open(struct radeon_bo_manager *bom,
 
         memset(&open_arg, 0, sizeof(open_arg));
         open_arg.name = handle;
-        r = ioctl(bom->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
+        r = drmIoctl(bom->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
         if (r != 0) {
             free(bo);
             return NULL;
@@ -142,7 +141,7 @@ static struct radeon_bo *bo_unref(struct radeon_bo *bo)
 
     /* close object */
     args.handle = bo->handle;
-    ioctl(bo->bom->fd, DRM_IOCTL_GEM_CLOSE, &args);
+    drmIoctl(bo->bom->fd, DRM_IOCTL_GEM_CLOSE, &args);
     memset(bo_gem, 0, sizeof(struct radeon_bo_gem));
     free(bo_gem);
     return NULL;
@@ -318,7 +317,7 @@ int radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name)
     int r;
 
     flink.handle = bo->handle;
-    r = ioctl(bo->bom->fd, DRM_IOCTL_GEM_FLINK, &flink);
+    r = drmIoctl(bo->bom->fd, DRM_IOCTL_GEM_FLINK, &flink);
     if (r) {
 	return r;
     }


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-12/libdrm.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- libdrm.spec	28 Nov 2009 06:40:37 -0000	1.94
+++ libdrm.spec	9 Dec 2009 04:39:21 -0000	1.95
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -42,6 +42,7 @@ Patch9: libdrm-radeon-fix-alloc.patch
 Patch10: libdrm-radeon-add-referenced-by-cs.patch
 # add api for intel/radeon dri2 drivers.
 Patch11: libdrm-add-drm-gdnff.patch
+Patch12: libdrm-radeon-eagain.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -68,6 +69,7 @@ Direct Rendering Manager development pac
 %patch9 -p1 -b .radeon-alloc
 %patch10 -p1 -b .radeon-ref-by-cs
 %patch11 -p1 -b .drmapi
+%patch12 -p1 -b .rad-eagain
 
 %build
 autoreconf -v --install || exit 1
@@ -127,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Wed Dec 09 2009 Dave Airlie <airlied at redhat.com> 2.4.15-7
+- radeon API from kernel change
+
 * Sat Nov 28 2009 Dave Airlie <airlied at redhat.com> 2.4.15-6
 - add new upstream API for drivers.
 



From lmacken at fedoraproject.org  Wed Dec  9 04:40:05 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  9 Dec 2009 04:40:05 +0000 (UTC)
Subject: File liveusb-creator-3.9.1.tar.bz2 uploaded to lookaside cache by
	lmacken
Message-ID: <20091209044005.2837B10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for liveusb-creator:

ddd44134e7e726f9892850cde87cf677  liveusb-creator-3.9.1.tar.bz2



From lmacken at fedoraproject.org  Wed Dec  9 04:40:13 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  9 Dec 2009 04:40:13 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.23,
	1.24 liveusb-creator.spec, 1.32, 1.33 sources, 1.27, 1.28
Message-ID: <20091209044013.7685F11C03F6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10844

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	1 Dec 2009 20:10:52 -0000	1.23
+++ .cvsignore	9 Dec 2009 04:40:13 -0000	1.24
@@ -1 +1 @@
-liveusb-creator-3.9.tar.bz2
+liveusb-creator-3.9.1.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- liveusb-creator.spec	1 Dec 2009 20:10:52 -0000	1.32
+++ liveusb-creator.spec	9 Dec 2009 04:40:13 -0000	1.33
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.9
+Version:        3.9.1
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Dec 08 2009 Luke Macken <lmacken at redhat.com> - 3.9.1-1
+- 3.9.1 bugfix release
+
 * Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.9-1
 - 3.9 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	1 Dec 2009 20:10:52 -0000	1.27
+++ sources	9 Dec 2009 04:40:13 -0000	1.28
@@ -1 +1 @@
-ec6f0162528aaf51481815f6a909174c  liveusb-creator-3.9.tar.bz2
+ddd44134e7e726f9892850cde87cf677  liveusb-creator-3.9.1.tar.bz2



From iarnell at fedoraproject.org  Wed Dec  9 04:52:57 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  9 Dec 2009 04:52:57 +0000 (UTC)
Subject: rpms/perl-Perl-Tags/devel .cvsignore, 1.2, 1.3 perl-Perl-Tags.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091209045257.11AF411C00E0@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Perl-Tags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15856

Modified Files:
	.cvsignore perl-Perl-Tags.spec sources 
Log Message:
* Wed Dec 09 2009 Iain Arnell <iarnell at gmail.com> 0.28-1
- update to latest upstream version (now comes with a super-simple command line
  interface)
- update BRs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Apr 2009 07:14:15 -0000	1.2
+++ .cvsignore	9 Dec 2009 04:52:56 -0000	1.3
@@ -1 +1 @@
-Perl-Tags-0.26.tar.gz
+Perl-Tags-0.28.tar.gz


Index: perl-Perl-Tags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/devel/perl-Perl-Tags.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Perl-Tags.spec	7 Dec 2009 13:00:08 -0000	1.3
+++ perl-Perl-Tags.spec	9 Dec 2009 04:52:56 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Perl-Tags
-Version:        0.26
-Release:        3%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Generate Ctags style tags for Perl sourcecode
 License:        (GPL+ or Artistic) or Vim
 Group:          Development/Libraries
@@ -8,7 +8,11 @@ URL:            http://search.cpan.org/d
 Source0:        http://www.cpan.org/authors/id/O/OS/OSFAMERON/Perl-Tags-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(File::Find)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(Module::Locate)
 BuildRequires:  perl(PPI)
 BuildRequires:  perl(Test::More) >= 0.42
@@ -16,6 +20,8 @@ BuildRequires:  perl(Test::Pod)
 BuildRequires:  vim-enhanced
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 Generate (possibly exuberant) Ctags style tags for Perl sourcecode.
 
@@ -30,7 +36,7 @@ aware that this is alpha software and th
 %setup -q -n Perl-Tags-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+PERL5_CPANPLUS_IS_RUNNING=1 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
@@ -53,9 +59,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc Changes README TODO
 %{perl_vendorlib}/*
+%{_bindir}/perl-tags
+%{_mandir}/man1/*
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec 09 2009 Iain Arnell <iarnell at gmail.com> 0.28-1
+- update to latest upstream version (now comes with a super-simple command line
+  interface)
+- update BRs
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.26-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Tags/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Apr 2009 07:14:15 -0000	1.2
+++ sources	9 Dec 2009 04:52:56 -0000	1.3
@@ -1 +1 @@
-7ce83250ffa83ca25c40c9aaa9adc9b2  Perl-Tags-0.26.tar.gz
+c7db57564db56d3b77488dc0fc0ce7bd  Perl-Tags-0.28.tar.gz



From kkofler at fedoraproject.org  Wed Dec  9 06:25:53 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  9 Dec 2009 06:25:53 +0000 (UTC)
Subject: rpms/erlang/F-12 erlang.spec,1.43,1.44
Message-ID: <20091209062554.0680211C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/erlang/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12345/F-12

Modified Files:
	erlang.spec 
Log Message:
* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - R13B-01.3
- rebuild with fixed GCC, fixes couchdb crash (#527370)


Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/F-12/erlang.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- erlang.spec	25 Aug 2009 12:22:08 -0000	1.43
+++ erlang.spec	9 Dec 2009 06:25:52 -0000	1.44
@@ -3,7 +3,7 @@
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.2%{?dist}
+Release:        %{rel}.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - R13B-01.3
+- rebuild with fixed GCC, fixes couchdb crash (#527370)
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - R13B-01.2
 - rebuilt with new openssl
 



From pravins at fedoraproject.org  Wed Dec  9 06:30:10 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed,  9 Dec 2009 06:30:10 +0000 (UTC)
Subject: rpms/smc-fonts/devel 66-smc-meera.conf, NONE, 1.1 bug-545683.patch, 
	NONE, 1.1 smc-fonts.spec, 1.10, 1.11
Message-ID: <20091209063010.4647911C03F6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13694

Modified Files:
	smc-fonts.spec 
Added Files:
	66-smc-meera.conf bug-545683.patch 
Log Message:
 Wed Dec 09 2009 Pravin Satpute <psatpute at redhat.com> 04.2-3
- bugfix 545683



--- NEW FILE 66-smc-meera.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ml</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend_first" binding="same">
    <string>Meera</string>
  </edit>
</match>
<alias>
  <family>Meera</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>


bug-545683.patch:
 malayalam-fonts.conf |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE bug-545683.patch ---
diff -rup malayalam-fonts-04/malayalam-fonts.conf malayalam-fonts-04_mod/malayalam-fonts.conf
--- malayalam-fonts-04/malayalam-fonts.conf	2008-06-30 00:46:25.000000000 +0530
+++ malayalam-fonts-04_mod/malayalam-fonts.conf	2009-12-09 10:45:20.000000000 +0530
@@ -7,18 +7,6 @@
                 <string>ml</string>
         </test>
         <alias>
-                <family>sans-serif</family>
-                <prefer>
-                        <family>Meera</family> 
-                </prefer>
-	</alias>
-</match>
-
-<match target="font">
-        <test name="lang" compare="contains">
-                <string>ml</string>
-        </test>
-        <alias>
                 <family>serif</family>
                 <prefer>
                         <family>Rachana</family>


Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- smc-fonts.spec	14 Oct 2009 05:43:10 -0000	1.10
+++ smc-fonts.spec	9 Dec 2009 06:30:09 -0000	1.11
@@ -8,16 +8,18 @@ traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
 Version:	04.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
 URL:		http://savannah.nongnu.org/projects/smc
 Source:		http://download.savannah.nongnu.org/releases/smc/fonts/malayalam-fonts-%{version}.zip
+Source1: 66-smc-meera.conf
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel > 1.13
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: bug-523454.patch
+Patch2: bug-545683.patch
 
 %description
 %common_desc
@@ -54,7 +56,7 @@ Obsoletes: %{name}-meera < 04.2-1
 The Meera font package contains fonts for the display of
 traditional Malayalam Scripts.
 
-%_font_pkg -n meera -f 90-%{fontname}-fonts.conf Meera*.ttf 
+%_font_pkg -n meera -f *smc*.conf Meera*.ttf 
 
 
 %package -n %{fontname}-rachana-fonts
@@ -128,6 +130,7 @@ traditional Malayalam Scripts.
 %prep
 %setup -q -n malayalam-fonts-04
 %patch1 -p1 -b .1-conffile
+%patch2 -p1 -b .2-fontconf_priority
 
 %build
 echo "Nothing to do in Build."
@@ -139,11 +142,17 @@ install -m 0644 -p *.ttf  %{buildroot}%{
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 		%{buildroot}%{_fontconfig_confdir}
 install -m 0644 -p $RPM_BUILD_DIR/malayalam-fonts-04/malayalam-fonts.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-fonts.conf
-for fconf in %{fontconf}-fonts.conf ; do
+
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/66-smc-meera.conf
+
+for fconf in %{fontconf}-fonts.conf \
+             66-smc-meera.conf ; do
   ln -s %{_fontconfig_templatedir}/$fconf \
-	%{buildroot}%{_fontconfig_confdir}/$fconf
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
+
 %clean
 rm -fr %{buildroot}
 
@@ -154,6 +163,9 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Wed Dec 09 2009 Pravin Satpute <psatpute at redhat.com> 04.2-3
+- bugfix 545683
+
 * Wed Oct 14 2009 Pravin Satpute <psatpute at redhat.com> 04.2-2
 - bugfix 523454
 



From pjp at fedoraproject.org  Wed Dec  9 06:49:43 2009
From: pjp at fedoraproject.org (pjp)
Date: Wed,  9 Dec 2009 06:49:43 +0000 (UTC)
Subject: rpms/pem/F-12 .cvsignore, 1.8, 1.9 pem.spec, 1.11, 1.12 sources, 1.8,
	1.9
Message-ID: <20091209064943.6AB3E11C00E0@cvs1.fedora.phx.redhat.com>

Author: pjp

Update of /cvs/pkgs/rpms/pem/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19311

Modified Files:
	.cvsignore pem.spec sources 
Log Message:
Update to 0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 Jul 2009 10:45:24 -0000	1.8
+++ .cvsignore	9 Dec 2009 06:49:42 -0000	1.9
@@ -1 +1 @@
-pem-0.7.7.tar.gz
+pem-0.7.8.tar.gz


Index: pem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-12/pem.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- pem.spec	25 Jul 2009 23:28:25 -0000	1.11
+++ pem.spec	9 Dec 2009 06:49:42 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           pem
-Version:        0.7.7
-Release:        2%{?dist}
-Summary:        Personal Expenses Manager
+Version:        0.7.8
+Release:        1%{?dist}
+Summary:        GNU personal expenses manager
 
 Group:          Applications/Productivity
-License:        GPLv2 
-URL:            http://pjp.dgplug.org/tools/ 
-Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz 
+License:        GPLv3+
+URL:            http://pjp.dgplug.org/tools/
+Source0:        http://pjp.dgplug.org/tools/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -16,9 +16,9 @@ Requires(preun): info
 
 
 %description
-Pem, is a personal expenses manager. Pem lets keep track of 
-personal income and expense in an extremely elegant manner.
-On Linux like systems, Pem works by storing the details in
+GNU Pem is a personal expenses manager. Pem helps you to keep track
+of personal income and expenses in an extremely elegant style.
+On GNU/Linux like systems, Pem works by storing the details in
 a CSV file, placed in the  ~/.pem directory under your $HOME
 directory; On Windows, the same file is placed in pem directory,
 under the USERPROFILE directory. Each such file is named after
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING NEWS ChangeLog
 %{_bindir}/pem
 %{_mandir}/man1/pem.*
 %{_infodir}/pem.*
@@ -65,8 +65,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep 15 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.8-1
+- Pem became an official GNU package, GNU Pem.
 
 * Mon Jul 13 2009 P J P <pj.pandit at yahoo.co.in> - 0.7.7-1
 - Fixed a minor bug and did few changes recommended by PBP.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pem/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	13 Jul 2009 10:45:24 -0000	1.8
+++ sources	9 Dec 2009 06:49:42 -0000	1.9
@@ -1 +1 @@
-57e2ae21bdb52e7e7b03cc017f0dc0cd  pem-0.7.7.tar.gz
+289c62718f863c7a21422c778aa3153e  pem-0.7.8.tar.gz



From pravins at fedoraproject.org  Wed Dec  9 06:52:45 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed,  9 Dec 2009 06:52:45 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts/devel lohit-malayalam-fonts.spec, 1.3,
	1.4
Message-ID: <20091209065245.A34D311C00E0@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20211

Modified Files:
	lohit-malayalam-fonts.spec 
Log Message:
* Wed Dec 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-3
 - bugfix 520041



Index: lohit-malayalam-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-malayalam-fonts/devel/lohit-malayalam-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lohit-malayalam-fonts.spec	25 Sep 2009 12:03:45 -0000	1.3
+++ lohit-malayalam-fonts.spec	9 Dec 2009 06:52:45 -0000	1.4
@@ -1,9 +1,9 @@
 %global fontname lohit-malayalam
-#%global fontconf 67-%{fontname}.conf
+%global fontconf 67-%{fontname}.conf
 
 Name:           %{fontname}-fonts
 Version:        2.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Malayalam font
 
 Group:          User Interface/X
@@ -34,25 +34,26 @@ rm -fr %{buildroot}
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
-#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-#                   %{buildroot}%{_fontconfig_confdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-#install -m 0644 -p %{fontconf} \
-#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-#ln -s %{_fontconfig_templatedir}/%{fontconf} \
-#      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+install -m 0644 -p %{fontconf} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 
 %clean
 rm -fr %{buildroot}
 
-
-%_font_pkg *.ttf
+%_font_pkg -f %{fontconf} *.ttf
 
 %doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old
 
-
 %changelog
+* Wed Dec 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-3
+- bugfix 520041
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
 - updated specs
 



From cebbert at fedoraproject.org  Wed Dec  9 07:07:06 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  9 Dec 2009 07:07:06 +0000 (UTC)
Subject: rpms/kernel/F-10 kvm-x86-emulator-limit-insns-to-15-bytes.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.116, 1.1206.2.117
Message-ID: <20091209070706.B0EBB11C00E0@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24439

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	kvm-x86-emulator-limit-insns-to-15-bytes.patch 
Log Message:
Limit x86 instructions to 15 bytes in KVM (CVE-2009-4031)

kvm-x86-emulator-limit-insns-to-15-bytes.patch:
 arch/x86/kvm/x86_emulate.c        |    5 ++++-
 include/asm-x86/kvm_x86_emulate.h |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE kvm-x86-emulator-limit-insns-to-15-bytes.patch ---
From: Avi Kivity <avi at redhat.com>
Date: Tue, 24 Nov 2009 13:20:15 +0000 (+0200)
Subject: KVM: x86 emulator: limit instructions to 15 bytes
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=eb3c79e64a70fb8f7473e30fa07e89c1ecc2c9bb

KVM: x86 emulator: limit instructions to 15 bytes

[ <cebbert at redhat.com>: backport to 2.6.27 ]

While we are never normally passed an instruction that exceeds 15 bytes,
smp games can cause us to attempt to interpret one, which will cause
large latencies in non-preempt hosts.

Cc: stable at kernel.org
Signed-off-by: Avi Kivity <avi at redhat.com>
---

diff -u a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
--- a/include/asm-x86/kvm_x86_emulate.h
+++ b/include/asm-x86/kvm_x86_emulate.h
@@ -128,7 +128,7 @@ struct decode_cache {
 	u8 seg_override;
 	unsigned int d;
 	unsigned long regs[NR_VCPU_REGS];
-	unsigned long eip;
+	unsigned long eip, eip_orig;
 	/* modrm */
 	u8 modrm;
 	u8 modrm_mod;
diff -u a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -581,6 +581,9 @@ static int do_insn_fetch(struct x86_emulate_ctxt *ctxt,
 {
 	int rc = 0;
 
+	/* x86 instructions are limited to 15 bytes. */
+	if (eip + size - ctxt->decode.eip_orig > 15)
+		return X86EMUL_UNHANDLEABLE;
 	eip += ctxt->cs_base;
 	while (size--) {
 		rc = do_fetch_insn_byte(ctxt, ops, eip++, dest++);
@@ -839,7 +842,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 	/* Shadow copy of register state. Committed on successful emulation. */
 
 	memset(c, 0, sizeof(struct decode_cache));
-	c->eip = ctxt->vcpu->arch.rip;
+	c->eip = c->eip_orig = ctxt->vcpu->arch.rip;
 	ctxt->cs_base = seg_base(ctxt, VCPU_SREG_CS);
 	memcpy(c->regs, ctxt->vcpu->arch.regs, sizeof c->regs);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.116
retrieving revision 1.1206.2.117
diff -u -p -r1.1206.2.116 -r1.1206.2.117
--- kernel.spec	8 Dec 2009 23:38:14 -0000	1.1206.2.116
+++ kernel.spec	9 Dec 2009 07:07:04 -0000	1.1206.2.117
@@ -794,6 +794,9 @@ Patch15250: x86-fix-csum_ipv6_magic-asm-
 # Fix ext3 file corruption in some cases
 Patch15400: jbd-fix-return-value-of-journal-start-commit.patch
 
+# CVE-2009-4031
+Patch15500: kvm-x86-emulator-limit-insns-to-15-bytes.patch
+
 # fix null deref in r128
 Patch16200: drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
 
@@ -1437,6 +1440,9 @@ ApplyPatch sky2-set-sky2_hw_ram_buffer-i
 ApplyPatch tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
 ApplyPatch x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
 
+# CVE-2009-4031
+ApplyPatch kvm-x86-emulator-limit-insns-to-15-bytes.patch
+
 # Fix ext3 file corruption in some cases
 ApplyPatch jbd-fix-return-value-of-journal-start-commit.patch
 
@@ -2018,6 +2024,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Dec 09 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.41-170.2.117
+- Limit x86 instructions to 15 bytes in KVM (CVE-2009-4031)
+
 * Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.41-170.2.116
 - Linux 2.6.27.41
 



From varekova at fedoraproject.org  Wed Dec  9 07:13:20 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed,  9 Dec 2009 07:13:20 +0000 (UTC)
Subject: rpms/psacct/devel psacct.init,1.7,1.8 psacct.spec,1.40,1.41
Message-ID: <20091209071320.E866F11C0265@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/psacct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26139

Modified Files:
	psacct.init psacct.spec 
Log Message:
- fix the initscript (service restart does not work)



Index: psacct.init
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/psacct.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- psacct.init	16 Sep 2009 07:20:44 -0000	1.7
+++ psacct.init	9 Dec 2009 07:13:20 -0000	1.8
@@ -41,7 +41,6 @@ stop() {
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 	    rm -f $LOCKFILE
-	    exit 0
 	else
 	    exit 1
 	fi


Index: psacct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- psacct.spec	2 Dec 2009 13:37:42 -0000	1.40
+++ psacct.spec	9 Dec 2009 07:13:20 -0000	1.41
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.3.2
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -179,6 +179,9 @@ fi
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Fri Dec  9 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 6.2.3-57
+- fix the initscript (service restart does not work)
+
 * Wed Dec  2 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 6.2.3-56
 - add dump-utmp.8 and dump-acct.8 man-pages
 



From pkgdb at fedoraproject.org  Wed Dec  9 08:10:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 08:10:23 +0000
Subject: [pkgdb] bochs had acl change status
Message-ID: <20091209081023.5135010F874@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on bochs (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Wed Dec  9 08:10:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 08:10:24 +0000
Subject: [pkgdb] bochs had acl change status
Message-ID: <20091209081024.7896210F890@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on bochs (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Wed Dec  9 08:10:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 08:10:34 +0000
Subject: [pkgdb] bochs had acl change status
Message-ID: <20091209081034.73D6210F89A@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on bochs (Fedora 10) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From pkgdb at fedoraproject.org  Wed Dec  9 08:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 08:10:35 +0000
Subject: [pkgdb] bochs had acl change status
Message-ID: <20091209081035.B20A710F874@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on bochs (Fedora 10) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bochs



From ondrejj at fedoraproject.org  Wed Dec  9 08:15:22 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Wed,  9 Dec 2009 08:15:22 +0000 (UTC)
Subject: rpms/bandwidthd/F-12 bandwidthd.spec,1.5,1.6
Message-ID: <20091209081522.6879A11C0264@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/bandwidthd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10742

Modified Files:
	bandwidthd.spec 
Log Message:
Fix crash if no devices found.


Index: bandwidthd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bandwidthd/F-12/bandwidthd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bandwidthd.spec	24 Jul 2009 17:49:44 -0000	1.5
+++ bandwidthd.spec	9 Dec 2009 08:15:20 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           bandwidthd
 Version:        2.0.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Tracks network usage and builds html and graphs
 
 Group:          System Environment/Daemons
@@ -13,6 +13,7 @@ Source0:        http://downloads.sourcef
 Source1:        %{name}
 Patch0:         bandwidthd-destdir.patch
 Patch1:         bandwidthd-pgsql.patch
+Patch2:		http://v3.sk/~lkundrak/0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf, gd-devel, libpng-devel
 %{?!_without_pgsql:BuildRequires: postgresql-devel}
@@ -46,6 +47,7 @@ is graphed on a Celeron 450 every 10 min
 %setup -q
 %patch0 -p1 -b .dest
 %patch1 -p0 -b .pgsql
+%patch2 -p1 -b .nodevs
 
 
 %build
@@ -100,6 +102,9 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 J?n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-14
+- Applied patch from lkundrak to do not hang when no devices found. bz#537073
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ondrejj at fedoraproject.org  Wed Dec  9 08:18:41 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Wed,  9 Dec 2009 08:18:41 +0000 (UTC)
Subject: rpms/bandwidthd/F-12
	0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch, NONE, 1.1
Message-ID: <20091209081841.5AEA611C0264@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/bandwidthd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11940

Added Files:
	0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch 
Log Message:
Added patch

0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch:
 bandwidthd.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch ---
>From 0abd4986f9d0b41cea18453e60fe2947e6eae047 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 9 Dec 2009 08:54:41 +0100
Subject: [PATCH] Gracefuly exit upon pcap_findalldevs() error

---
 bandwidthd.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/bandwidthd.c b/bandwidthd.c
index a0d18d0..d69737f 100644
--- a/bandwidthd.c
+++ b/bandwidthd.c
@@ -320,6 +320,11 @@ int main(int argc, char **argv)
 
 #ifdef HAVE_PCAP_FINDALLDEVS
 	pcap_findalldevs(&Devices, Error);
+	if (Devices == NULL)
+		{
+		printf("Can't find network devices: %s", Error);
+		exit(1);
+		}
 	if (config.dev == NULL && Devices->name)
 		config.dev = strdup(Devices->name);
 	if (ListDevices)
-- 
1.6.5.3




From ondrejj at fedoraproject.org  Wed Dec  9 08:19:47 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Wed,  9 Dec 2009 08:19:47 +0000 (UTC)
Subject: rpms/bandwidthd/F-12 bandwidthd.spec,1.6,1.7
Message-ID: <20091209081947.16BEF11C0264@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/bandwidthd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12387

Modified Files:
	bandwidthd.spec 
Log Message:
Bump


Index: bandwidthd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bandwidthd/F-12/bandwidthd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bandwidthd.spec	9 Dec 2009 08:15:20 -0000	1.6
+++ bandwidthd.spec	9 Dec 2009 08:19:46 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           bandwidthd
 Version:        2.0.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Tracks network usage and builds html and graphs
 
 Group:          System Environment/Daemons
@@ -102,7 +102,7 @@ fi
 
 
 %changelog
-* Wed Dec 09 2009 J?n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-14
+* Wed Dec 09 2009 J?n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-15
 - Applied patch from lkundrak to do not hang when no devices found. bz#537073
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-13



From kkofler at fedoraproject.org  Wed Dec  9 08:24:49 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  9 Dec 2009 08:24:49 +0000 (UTC)
Subject: rpms/fluidsynth/devel fluidsynth.spec,1.14,1.15
Message-ID: <20091209082449.A869A11C0264@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/fluidsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14017/devel

Modified Files:
	fluidsynth.spec 
Log Message:
* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.9-5
- Enable PulseAudio support (#538224, FESCo#265, also works around #500087)


Index: fluidsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluidsynth/devel/fluidsynth.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fluidsynth.spec	28 Oct 2009 06:27:41 -0000	1.14
+++ fluidsynth.spec	9 Dec 2009 08:24:49 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
 Version:      1.0.9
-Release:      4%{?dist}
+Release:      5%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz
 License:      LGPLv2+
@@ -19,6 +19,7 @@ BuildRequires: pkgconfig
 # Disabled for now:
 # http://fluidsynth.resonance.org/trac/ticket/51
 # BuildRequires: portaudio-devel
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: readline-devel
 
 # For documentation:
@@ -65,7 +66,7 @@ done
 
 
 %build
-%configure --enable-jack-support --enable-ladspa --disable-static --disable-portaudio-support
+%configure --enable-jack-support --enable-ladspa --enable-pulse-support --disable-static --disable-portaudio-support
 
 # remove rpath from libtool
 %{__sed} -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -117,6 +118,9 @@ find $RPM_BUILD_ROOT -name \*.la | xargs
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.9-5
+- Enable PulseAudio support (#538224, FESCo#265, also works around #500087)
+
 * Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
 - Fix doxygen doc multilib conflict (RHBZ#528240)
 



From ondrejj at fedoraproject.org  Wed Dec  9 08:48:19 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Wed,  9 Dec 2009 08:48:19 +0000 (UTC)
Subject: rpms/bandwidthd/devel
	0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch, NONE,
	1.1 bandwidthd.spec, 1.5, 1.6 import.log, 1.3, 1.4
Message-ID: <20091209084819.6F4B011C0264@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/bandwidthd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21161/devel

Modified Files:
	bandwidthd.spec import.log 
Added Files:
	0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch 
Log Message:
Fix crash when no interfaces found.

0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch:
 bandwidthd.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch ---
>From 0abd4986f9d0b41cea18453e60fe2947e6eae047 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 9 Dec 2009 08:54:41 +0100
Subject: [PATCH] Gracefuly exit upon pcap_findalldevs() error

---
 bandwidthd.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/bandwidthd.c b/bandwidthd.c
index a0d18d0..d69737f 100644
--- a/bandwidthd.c
+++ b/bandwidthd.c
@@ -320,6 +320,11 @@ int main(int argc, char **argv)
 
 #ifdef HAVE_PCAP_FINDALLDEVS
 	pcap_findalldevs(&Devices, Error);
+	if (Devices == NULL)
+		{
+		printf("Can't find network devices: %s", Error);
+		exit(1);
+		}
 	if (config.dev == NULL && Devices->name)
 		config.dev = strdup(Devices->name);
 	if (ListDevices)
-- 
1.6.5.3



Index: bandwidthd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bandwidthd/devel/bandwidthd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bandwidthd.spec	24 Jul 2009 17:49:44 -0000	1.5
+++ bandwidthd.spec	9 Dec 2009 08:48:19 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           bandwidthd
 Version:        2.0.1
-Release:        13%{?dist}
+Release:        15%{?dist}
 Summary:        Tracks network usage and builds html and graphs
 
 Group:          System Environment/Daemons
@@ -13,6 +13,7 @@ Source0:        http://downloads.sourcef
 Source1:        %{name}
 Patch0:         bandwidthd-destdir.patch
 Patch1:         bandwidthd-pgsql.patch
+Patch2:		http://v3.sk/~lkundrak/0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf, gd-devel, libpng-devel
 %{?!_without_pgsql:BuildRequires: postgresql-devel}
@@ -46,6 +47,7 @@ is graphed on a Celeron 450 every 10 min
 %setup -q
 %patch0 -p1 -b .dest
 %patch1 -p0 -b .pgsql
+%patch2 -p1 -b .nodevs
 
 
 %build
@@ -100,6 +102,9 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 J?n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-15
+- Applied patch from lkundrak to do not hang when no devices found. bz#537073
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bandwidthd/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	14 Dec 2008 12:17:20 -0000	1.3
+++ import.log	9 Dec 2009 08:48:19 -0000	1.4
@@ -1,3 +1,4 @@
 bandwidthd-2_0_1-8_fc10:HEAD:bandwidthd-2.0.1-8.fc10.src.rpm:1229249844
 bandwidthd-2_0_1-9_fc10:HEAD:bandwidthd-2.0.1-9.fc10.src.rpm:1229252545
 bandwidthd-2_0_1-11_fc10:HEAD:bandwidthd-2.0.1-11.fc10.src.rpm:1229257014
+bandwidthd-2_0_1-15_fc12:HEAD:bandwidthd-2.0.1-15.fc12.src.rpm:1260348483



From xhorak at fedoraproject.org  Wed Dec  9 09:03:34 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 09:03:34 +0000 (UTC)
Subject: File thunderbird-3.0.source.tar.bz2 uploaded to lookaside cache by
	xhorak
Message-ID: <20091209090334.14CDC10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for thunderbird:

9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2



From xhorak at fedoraproject.org  Wed Dec  9 09:05:52 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 09:05:52 +0000 (UTC)
Subject: File thunderbird-langpacks-3.0-20091209.tar.bz2 uploaded to
	lookaside cache by xhorak
Message-ID: <20091209090552.2662110F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for thunderbird:

1263a513f4d5e7663f3fdfc23fbf8eaf  thunderbird-langpacks-3.0-20091209.tar.bz2



From xhorak at fedoraproject.org  Wed Dec  9 09:13:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 09:13:11 +0000 (UTC)
Subject: rpms/thunderbird/F-12 .cvsignore, 1.31, 1.32 sources, 1.39,
	1.40 thunderbird.spec, 1.155, 1.156
Message-ID: <20091209091311.2D59B11C0264@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27961

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to version 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	3 Dec 2009 12:27:02 -0000	1.31
+++ .cvsignore	9 Dec 2009 09:13:10 -0000	1.32
@@ -9,3 +9,5 @@ thunderbird-langpacks-3.0rc1-20091118.ta
 thunderbird-langpacks-3.0rc1-20091125.tar.bz2
 thunderbird-3.0rc2.source.tar.bz2
 thunderbird-langpacks-3.0rc2-20091203.tar.bz2
+thunderbird-3.0.source.tar.bz2
+thunderbird-langpacks-3.0-20091209.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	3 Dec 2009 12:27:02 -0000	1.39
+++ sources	9 Dec 2009 09:13:10 -0000	1.40
@@ -1,2 +1,2 @@
-35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
-c8e226a813a1fe9049d018e59d63e3ac  thunderbird-langpacks-3.0rc2-20091203.tar.bz2
+9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2
+1263a513f4d5e7663f3fdfc23fbf8eaf  thunderbird-langpacks-3.0-20091209.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-12/thunderbird.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- thunderbird.spec	3 Dec 2009 12:27:02 -0000	1.155
+++ thunderbird.spec	9 Dec 2009 09:13:10 -0000	1.156
@@ -3,7 +3,6 @@
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
-%define version_internal 3.0rc2
 %define build_langpacks 1
 %define moz_objdir objdir-tb
 
@@ -22,18 +21,18 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.13.rc2%{?dist}
+Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version_internal}.source.tar.bz2
+%define tarball thunderbird-%{version}.source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version_internal}-20091203.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20091209.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -275,9 +274,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/compon
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{include_debuginfo}
-cp mozilla/dist/thunderbird-%{version_internal}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
+cp mozilla/dist/thunderbird-%{version}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
-cp %{moz_objdir}/mozilla/dist/thunderbird-%{version_internal}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
+cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
 %endif
 
 %clean
@@ -354,6 +353,9 @@ fi
 #===============================================================================
 
 %changelog
+* Wed Dec  9 2009 Jan Horak <jhorak at redhat.com> - 3.0-4
+- Update to 3.0
+
 * Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.13.rc2
 - Update to 3.0 RC2
 



From mtasaka at fedoraproject.org  Wed Dec  9 09:57:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Dec 2009 09:57:10 +0000 (UTC)
Subject: rpms/ruby/devel ruby-1.8.6-p383-mkmf-use-shared.patch, NONE,
	1.1 ruby.spec, 1.144, 1.145
Message-ID: <20091209095710.D7F6A11C03C6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5936

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.6-p383-mkmf-use-shared.patch 
Log Message:
* Wed Dec  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-5
- Change mkmf.rb to use LIBRUBYARG_SHARED so that have_library() works
  without libruby-static.a (bug 428384)
- And move libruby-static.a to -static subpackage


ruby-1.8.6-p383-mkmf-use-shared.patch:
 mkmf.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ruby-1.8.6-p383-mkmf-use-shared.patch ---
--- ruby-1.8.6-p383/lib/mkmf.rb.static	2009-03-31 18:19:39.000000000 +0900
+++ ruby-1.8.6-p383/lib/mkmf.rb	2009-12-09 15:03:19.000000000 +0900
@@ -275,7 +275,7 @@
                               'LDFLAGS' => "#$LDFLAGS #{ldflags}",
                               'LIBPATH' => libpathflag(libpath),
                               'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
-                              'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
+                              'LIBS' => "#$LIBRUBYARG_SHARED #{opt} #$LIBS")
   Config::expand(TRY_LINK.dup, conf)
 end
 


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- ruby.spec	29 Oct 2009 16:39:34 -0000	1.144
+++ ruby.spec	9 Dec 2009 09:57:10 -0000	1.145
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,8 +53,9 @@ Patch28:        ruby-1.8.6-p287-remove-s
 Patch29:	ruby-always-use-i386.patch
 Patch30:	ruby-openssl-1.0.patch
 Patch31:	ruby-1.8.6-p369-ri-gem_multipath.patch
-# Patch from ruby_1_8 branch
+# Patch32 from ruby_1_8 branch
 Patch32:	ruby-1.8head-irb-save-history.patch
+Patch33:	ruby-1.8.6-p383-mkmf-use-shared.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -85,12 +86,20 @@ This package includes the libruby, neces
 Summary:	A Ruby development environment
 Group:		Development/Languages
 Requires:	%{name}-libs = %{version}-%{release}
-Provides:	%{name}-libs-static = %{version}-%{release}
+#Provides:	%{name}-libs-static = %{version}-%{release}
 
 %description devel
 Header files and libraries for building a extension library for the
 Ruby or an application embedded Ruby.
 
+%package static
+Summary:	Static libraries for Ruby development environment
+Group:		Development/Languages
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static libraries for for building a extension library for the
+Ruby or an application embedded Ruby.
 
 %package tcltk
 Summary:	Tcl/Tk interface for scripting language Ruby
@@ -187,6 +196,7 @@ pushd %{name}-%{arcver}
 %patch30 -p2
 %patch31 -p1
 %patch32 -p0
+%patch33 -p1
 popd
 
 %build
@@ -217,6 +227,11 @@ export CFLAGS
 %endif
   --with-ruby-prefix=%{_prefix}/lib
 
+# For example ext/socket/extconf.rb uses try_run (for getaddrinfo test),
+# which executes conftest and setting LD_LIBRARY_PATH for libruby.so is
+# needed.
+export LD_LIBRARY_PATH=$(pwd)
+
 make RUBY_INSTALL_NAME=ruby %{?_smp_mflags} COPY="cp -p" %{?_smp_mflags}
 %ifarch ia64
 # Miscompilation? Buggy code?
@@ -408,9 +423,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{name}-%{arcver}/README.EXT
 %lang(ja) %doc %{name}-%{arcver}/README.EXT.ja
 %{_libdir}/libruby.so
-%{_libdir}/libruby-static.a
+#%%{_libdir}/libruby-static.a
 %{_libdir}/ruby/%{rubyxver}/*/*.h
 
+%files static
+%defattr(-, root, root, -)
+%{_libdir}/libruby-static.a
+
 %files libs
 %defattr(-, root, root, -)
 %doc %{name}-%{arcver}/README
@@ -553,6 +572,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Dec  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-5
+- Change mkmf.rb to use LIBRUBYARG_SHARED so that have_library() works
+  without libruby-static.a (bug 428384)
+- And move libruby-static.a to -static subpackage
+
 * Thu Oct 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-4
 - Use bison to regenerate parse.c to keep the original format of error
   messages (bug 530275 comment 4)



From tbzatek at fedoraproject.org  Wed Dec  9 10:08:50 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed,  9 Dec 2009 10:08:50 +0000 (UTC)
Subject: File sabayon-2.29.2.tar.bz2 uploaded to lookaside cache by tbzatek
Message-ID: <20091209100850.A314910F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sabayon:

961b7d2fcc196256e82a0fd80acbdee4  sabayon-2.29.2.tar.bz2



From xhorak at fedoraproject.org  Wed Dec  9 10:10:23 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 10:10:23 +0000 (UTC)
Subject: rpms/thunderbird/F-11 .cvsignore, 1.27, 1.28 sources, 1.35,
	1.36 thunderbird.spec, 1.145, 1.146
Message-ID: <20091209101023.8B5B511C0264@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8863

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	3 Dec 2009 12:27:56 -0000	1.27
+++ .cvsignore	9 Dec 2009 10:10:23 -0000	1.28
@@ -8,3 +8,5 @@ thunderbird-3.0rc1.source.tar.bz2
 thunderbird-langpacks-3.0rc1-20091125.tar.bz2
 thunderbird-3.0rc2.source.tar.bz2
 thunderbird-langpacks-3.0rc2-20091203.tar.bz2
+thunderbird-3.0.source.tar.bz2
+thunderbird-langpacks-3.0-20091209.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	3 Dec 2009 12:27:57 -0000	1.35
+++ sources	9 Dec 2009 10:10:23 -0000	1.36
@@ -1,2 +1,2 @@
-35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
-c8e226a813a1fe9049d018e59d63e3ac  thunderbird-langpacks-3.0rc2-20091203.tar.bz2
+9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2
+1263a513f4d5e7663f3fdfc23fbf8eaf  thunderbird-langpacks-3.0-20091209.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- thunderbird.spec	3 Dec 2009 12:27:57 -0000	1.145
+++ thunderbird.spec	9 Dec 2009 10:10:23 -0000	1.146
@@ -3,7 +3,6 @@
 %define nss_version 3.12.3
 %define cairo_version 1.0
 %define dbus_glib_version 0.6
-%define version_internal 3.0rc2
 %define build_langpacks 1
 %define moz_objdir objdir-tb
 
@@ -22,18 +21,18 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.10.rc2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version_internal}.source.tar.bz2
+%define tarball thunderbird-%{version}.source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version_internal}-20091203.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20091209.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -221,7 +220,6 @@ install -Dm755 %{SOURCE30} $RPM_BUILD_RO
 # Install langpacks
 %{__rm} -f %{name}.lang # Delete for --short-circuit option
 touch %{name}.lang
-
 %if %{build_langpacks}
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
 %{__tar} xjf %{SOURCE1}
@@ -269,9 +267,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/compon
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{include_debuginfo}
-cp mozilla/dist/thunderbird-%{version_internal}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
+cp mozilla/dist/thunderbird-%{version}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
-cp %{moz_objdir}/mozilla/dist/thunderbird-%{version_internal}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
+cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
 %endif
 
 %clean
@@ -348,6 +346,9 @@ fi
 #===============================================================================
 
 %changelog
+* Wed Dec  9 2009 Jan Horak <jhorak at redhat.com> - 3.0-3
+- Update to 3.0
+
 * Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 3.0.2.10.rc2
 - Update to 3.0 RC2
 



From karsten at fedoraproject.org  Wed Dec  9 10:12:26 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  9 Dec 2009 10:12:26 +0000 (UTC)
Subject: File automake-1.11.1.tar.bz2 uploaded to lookaside cache by karsten
Message-ID: <20091209101226.4C02D10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for automake:

c2972c4d9b3e29c03d5f2af86249876f  automake-1.11.1.tar.bz2



From caolanm at fedoraproject.org  Wed Dec  9 10:26:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 10:26:20 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 openoffice.org.spec,1.2041,1.2042
Message-ID: <20091209102620.0BC1F11C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12064/F-12

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2041
retrieving revision 1.2042
diff -u -p -r1.2041 -r1.2042
--- openoffice.org.spec	4 Dec 2009 09:37:55 -0000	1.2041
+++ openoffice.org.spec	9 Dec 2009 10:26:19 -0000	1.2042
@@ -177,6 +177,7 @@ Patch100: openoffice.org-3.2.0.ooo107151
 Patch101: openoffice.org-3.3.0.ooo102645.fix.es.patch
 Patch102: openoffice.org-3.2.0.ooo107260.dtrans.clipboard.shutdown.patch
 Patch103: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch104: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1740,6 +1741,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch101 -p0 -b .ooo102645.fix.es.patch
 %patch102 -p0 -b .ooo107260.dtrans.clipboard.shutdown.patch
 %patch103 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch104 -p0 -b .ooo107552.vcl.sft.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4273,9 +4275,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Dec 04 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.21.UNBUILT
-- Resolves: rhbz#544124 add 
-  openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+* Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.21
+- Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+- Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 
 * Fri Nov 27 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.20
 - Resolves: rhbz#541222 add



From caolanm at fedoraproject.org  Wed Dec  9 10:26:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 10:26:20 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo107552.vcl.sft.patch, NONE,
	1.1 openoffice.org.spec, 1.2096, 1.2097
Message-ID: <20091209102620.77DC611C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12064/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo107552.vcl.sft.patch 
Log Message:
Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch

openoffice.org-3.2.0.ooo107552.vcl.sft.patch:
 sft.cxx |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo107552.vcl.sft.patch ---
--- vcl/source/fontsubset/sft.cxx	2009-12-09 10:16:54.000000000 +0000
+++ vcl/source/fontsubset/sft.cxx	2009-12-09 10:17:54.000000000 +0000
@@ -1094,6 +1094,14 @@
 	const sal_uInt8* table = getTable( t, O_name );
     int nTableSize = getTableSize(t, O_name);
 
+    if (nTableSize < 4)
+    {
+#if OSL_DEBUG_LEVEL > 1
+        fprintf(stderr, "O_name table too small\n");
+#endif
+        return;
+    }
+
     sal_uInt16 n = GetUInt16(table, 2, 1);
     int i, r;
     sal_Bool bPSNameOK = sal_True;
@@ -1681,7 +1689,6 @@
         goto cleanup;
     }
 
-
     if (((*ttf)->ptr = (sal_uInt8 *) mmap(0, (*ttf)->fsize, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
         ret = SF_MEMORY;
         goto cleanup;
@@ -2702,7 +2709,7 @@
     }
 
     table = getTable(ttf, O_post);
-    if (table) {
+    if (table && getTableSize(ttf, O_post) >= 12+sizeof(sal_uInt32)) {
         info->pitch  = GetUInt32(table, 12, 1);
         info->italicAngle = GetInt32(table, 4, 1);
     }
@@ -2808,6 +2815,15 @@
 {
     const sal_uInt8* table = getTable(ttf, O_name);
     int nTableSize = getTableSize(ttf, O_name );
+
+    if (nTableSize < 6)
+    {
+#if OSL_DEBUG_LEVEL > 1
+        fprintf(stderr, "O_name table too small\n");
+#endif
+        return 0;
+    }
+
     sal_uInt16 n = GetUInt16(table, 2, 1);
     int nStrBase = GetUInt16(table, 4, 1);
     int i;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2096
retrieving revision 1.2097
diff -u -p -r1.2096 -r1.2097
--- openoffice.org.spec	4 Dec 2009 09:37:22 -0000	1.2096
+++ openoffice.org.spec	9 Dec 2009 10:26:20 -0000	1.2097
@@ -133,6 +133,7 @@ Patch55: openoffice.org-3.3.0.ooo102645.
 Patch56: workspace.vcl108.patch
 Patch57: workspace.pythonssldedux.patch
 Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch59: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1660,6 +1661,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch56 -p0 -b .workspace.vcl108.patch
 %patch57 -p1 -b .workspace.pythonssldedux.patch
 %patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch59 -p0 -b .ooo107552.vcl.sft.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4162,8 +4164,9 @@ fi
 %endif
 
 %changelog
-* Fri Dec 04 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.2
+* Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.2
 - Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+- Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 
 * Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.1
 - latest milestone



From tmraz at fedoraproject.org  Wed Dec  9 10:26:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  9 Dec 2009 10:26:31 +0000 (UTC)
Subject: File workrave-1.9.1.tar.gz uploaded to lookaside cache by tmraz
Message-ID: <20091209102631.43F7410F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for workrave:

065775ee4fdb3e21e12cbf0907d31b88  workrave-1.9.1.tar.gz



From caolanm at fedoraproject.org  Wed Dec  9 10:36:36 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 10:36:36 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo107552.vcl.sft.patch, NONE, 1.1
Message-ID: <20091209103636.8A93511C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14444

Added Files:
	openoffice.org-3.2.0.ooo107552.vcl.sft.patch 
Log Message:
Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patc

openoffice.org-3.2.0.ooo107552.vcl.sft.patch:
 sft.c |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo107552.vcl.sft.patch ---
--- psprint/source/fontsubset/sft.c	2009-12-09 09:40:40.000000000 +0000
+++ psprint/source/fontsubset/sft.c	2009-12-09 10:14:32.000000000 +0000
@@ -1101,6 +1101,14 @@
     sal_uInt8 *table = getTable(t, O_name);
     int nTableSize = getTableSize(t, O_name);
 
+    if (nTableSize < 4)
+    {
+#if OSL_DEBUG_LEVEL > 1
+        fprintf(stderr, "O_name table too small\n");
+#endif
+        return;
+    }
+
     sal_uInt16 n = GetUInt16(table, 2, 1);
     int i, r;
     sal_Bool bPSNameOK = sal_True;
@@ -1693,7 +1701,6 @@
         goto cleanup;
     }
 
-
     if (((*ttf)->ptr = (sal_uInt8 *) mmap(0, (*ttf)->fsize, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
         ret = SF_MEMORY;
         goto cleanup;
@@ -2700,7 +2707,7 @@
     }
 
     table = getTable(ttf, O_post);
-    if (table) {
+    if (table && getTableSize(ttf, O_post) >= 12+sizeof(sal_uInt32)) {
         info->pitch  = GetUInt32(table, 12, 1);
         info->italicAngle = GetInt32(table, 4, 1);
     }
@@ -2808,6 +2815,15 @@
 {
     sal_uInt8 *table = getTable(ttf, O_name);
     int nTableSize = getTableSize(ttf, O_name );
+
+    if (nTableSize < 6)
+    {
+#if OSL_DEBUG_LEVEL > 1
+        fprintf(stderr, "O_name table too small\n");
+#endif
+        return 0;
+    }
+
     sal_uInt16 n = GetUInt16(table, 2, 1);
     sal_uInt8* rec_string = NULL;
     int nStrBase = GetUInt16(table, 4, 1);



From xhorak at fedoraproject.org  Wed Dec  9 10:44:03 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 10:44:03 +0000 (UTC)
Subject: rpms/thunderbird/devel .cvsignore, 1.30, 1.31 sources, 1.37,
	1.38 thunderbird.spec, 1.156, 1.157
Message-ID: <20091209104403.66DF711C00E0@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15862

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	3 Dec 2009 12:28:43 -0000	1.30
+++ .cvsignore	9 Dec 2009 10:44:03 -0000	1.31
@@ -8,3 +8,5 @@ thunderbird-langpacks-3.0rc1-20091118.ta
 thunderbird-langpacks-3.0rc1-20091125.tar.bz2
 thunderbird-3.0rc2.source.tar.bz2
 thunderbird-langpacks-3.0rc2-20091203.tar.bz2
+thunderbird-3.0.source.tar.bz2
+thunderbird-langpacks-3.0-20091209.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	3 Dec 2009 12:28:43 -0000	1.37
+++ sources	9 Dec 2009 10:44:03 -0000	1.38
@@ -1,2 +1,2 @@
-35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
-c8e226a813a1fe9049d018e59d63e3ac  thunderbird-langpacks-3.0rc2-20091203.tar.bz2
+9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2
+1263a513f4d5e7663f3fdfc23fbf8eaf  thunderbird-langpacks-3.0-20091209.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- thunderbird.spec	3 Dec 2009 12:28:43 -0000	1.156
+++ thunderbird.spec	9 Dec 2009 10:44:03 -0000	1.157
@@ -3,7 +3,6 @@
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
-%define version_internal 3.0rc2
 %define build_langpacks 1
 %define moz_objdir objdir-tb
 
@@ -22,18 +21,18 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.13.rc2%{?dist}
+Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version_internal}.source.tar.bz2
+%define tarball thunderbird-%{version}.source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version_internal}-20091203.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20091209.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -316,9 +315,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/compon
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{include_debuginfo}
-cp mozilla/dist/thunderbird-%{version_internal}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
+cp mozilla/dist/thunderbird-%{version}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
-cp %{moz_objdir}/mozilla/dist/thunderbird-%{version_internal}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
+cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
 %endif
 
 %clean
@@ -404,7 +403,10 @@ fi
 #===============================================================================
 
 %changelog
-* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.13.rc1
+* Wed Dec  9 2009 Jan Horak <jhorak at redhat.com> - 3.0-4
+- Update to 3.0
+
+* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.13.rc2
 - Update to RC2
 
 * Wed Nov 25 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.12.rc1



From twaugh at fedoraproject.org  Wed Dec  9 10:54:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  9 Dec 2009 10:54:56 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-short-lived-states.patch, NONE,
	1.1 system-config-printer.spec, 1.314, 1.315
Message-ID: <20091209105456.6ABFF11C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18313

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-short-lived-states.patch 
Log Message:
* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
- Fixed jobviewer traceback with short-lived state reasons (bug #545733).


system-config-printer-short-lived-states.patch:
 jobviewer.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-short-lived-states.patch ---
diff -up system-config-printer-1.1.15/jobviewer.py.short-lived-states system-config-printer-1.1.15/jobviewer.py
--- system-config-printer-1.1.15/jobviewer.py.short-lived-states	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/jobviewer.py	2009-12-09 10:53:20.936016882 +0000
@@ -1430,7 +1430,13 @@ class JobViewer (GtkGUI, monitor.Watcher
         try:
             notification = self.state_reason_notifications[tuple]
             if notification.get_data ('closed') != True:
-                notification.close ()
+                try:
+                    notification.close ()
+                except glib.GError:
+                    # Can fail if the notification wasn't even shown
+                    # yet (as in bug #545733).
+                    pass
+
             del self.state_reason_notifications[tuple]
             self.set_statusicon_visibility ()
         except KeyError:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- system-config-printer.spec	8 Dec 2009 14:02:02 -0000	1.314
+++ system-config-printer.spec	9 Dec 2009 10:54:56 -0000	1.315
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -20,6 +20,7 @@ Patch2: system-config-printer-browsepoll
 Patch3: system-config-printer-cupsd.conf-parser.patch
 Patch4: system-config-printer-troubleshooter-traceback.patch
 Patch5: system-config-printer-lpd-uri.patch
+Patch6: system-config-printer-short-lived-states.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -73,6 +74,7 @@ the configuration tool.
 %patch3 -p1 -b .cupsd.conf-parser
 %patch4 -p1 -b .troubleshooter-traceback
 %patch5 -p1 -b .lpd-uri
+%patch6 -p1 -b .short-lived-states
 
 %build
 %configure
@@ -175,6 +177,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
+- Fixed jobviewer traceback with short-lived state reasons (bug #545733).
+
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
 - Fixed traceback with short lpd device URIs (bug #545397).
 



From twaugh at fedoraproject.org  Wed Dec  9 10:56:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  9 Dec 2009 10:56:16 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-short-lived-states.patch, NONE,
	1.1 system-config-printer.spec, 1.324, 1.325
Message-ID: <20091209105616.3976511C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18803

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-short-lived-states.patch 
Log Message:
* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
- Fixed jobviewer traceback with short-lived state reasons (bug #545733).


system-config-printer-short-lived-states.patch:
 jobviewer.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-short-lived-states.patch ---
diff -up system-config-printer-1.1.15/jobviewer.py.short-lived-states system-config-printer-1.1.15/jobviewer.py
--- system-config-printer-1.1.15/jobviewer.py.short-lived-states	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/jobviewer.py	2009-12-09 10:53:20.936016882 +0000
@@ -1430,7 +1430,13 @@ class JobViewer (GtkGUI, monitor.Watcher
         try:
             notification = self.state_reason_notifications[tuple]
             if notification.get_data ('closed') != True:
-                notification.close ()
+                try:
+                    notification.close ()
+                except glib.GError:
+                    # Can fail if the notification wasn't even shown
+                    # yet (as in bug #545733).
+                    pass
+
             del self.state_reason_notifications[tuple]
             self.set_statusicon_visibility ()
         except KeyError:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- system-config-printer.spec	8 Dec 2009 14:03:59 -0000	1.324
+++ system-config-printer.spec	9 Dec 2009 10:56:15 -0000	1.325
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -21,6 +21,7 @@ Patch3: system-config-printer-browsepoll
 Patch4: system-config-printer-cupsd.conf-parser.patch
 Patch5: system-config-printer-troubleshooter-traceback.patch
 Patch6: system-config-printer-lpd-uri.patch
+Patch7: system-config-printer-short-lived-states.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -86,6 +87,7 @@ printers.
 %patch4 -p1 -b .cupsd.conf-parser
 %patch5 -p1 -b .troubleshooter-traceback
 %patch6 -p1 -b .lpd-uri
+%patch7 -p1 -b .short-lived-states
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -198,6 +200,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
+- Fixed jobviewer traceback with short-lived state reasons (bug #545733).
+
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
 - Fixed traceback with short lpd device URIs (bug #545397).
 



From twaugh at fedoraproject.org  Wed Dec  9 10:57:04 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  9 Dec 2009 10:57:04 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-short-lived-states.patch, NONE,
	1.1 system-config-printer.spec, 1.320, 1.321
Message-ID: <20091209105704.E446711C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19131

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-short-lived-states.patch 
Log Message:
* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
- Fixed jobviewer traceback with short-lived state reasons (bug #545733).


system-config-printer-short-lived-states.patch:
 jobviewer.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-short-lived-states.patch ---
diff -up system-config-printer-1.1.15/jobviewer.py.short-lived-states system-config-printer-1.1.15/jobviewer.py
--- system-config-printer-1.1.15/jobviewer.py.short-lived-states	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/jobviewer.py	2009-12-09 10:53:20.936016882 +0000
@@ -1430,7 +1430,13 @@ class JobViewer (GtkGUI, monitor.Watcher
         try:
             notification = self.state_reason_notifications[tuple]
             if notification.get_data ('closed') != True:
-                notification.close ()
+                try:
+                    notification.close ()
+                except glib.GError:
+                    # Can fail if the notification wasn't even shown
+                    # yet (as in bug #545733).
+                    pass
+
             del self.state_reason_notifications[tuple]
             self.set_statusicon_visibility ()
         except KeyError:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- system-config-printer.spec	8 Dec 2009 14:04:31 -0000	1.320
+++ system-config-printer.spec	9 Dec 2009 10:57:04 -0000	1.321
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -21,6 +21,7 @@ Patch3: system-config-printer-browsepoll
 Patch4: system-config-printer-cupsd.conf-parser.patch
 Patch5: system-config-printer-troubleshooter-traceback.patch
 Patch6: system-config-printer-lpd-uri.patch
+Patch7: system-config-printer-short-lived-states.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -86,6 +87,7 @@ printers.
 %patch4 -p1 -b .cupsd.conf-parser
 %patch5 -p1 -b .troubleshooter-traceback
 %patch6 -p1 -b .lpd-uri
+%patch7 -p1 -b .short-lived-states
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -198,6 +200,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
+- Fixed jobviewer traceback with short-lived state reasons (bug #545733).
+
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
 - Fixed traceback with short lpd device URIs (bug #545397).
 



From twaugh at fedoraproject.org  Wed Dec  9 11:32:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  9 Dec 2009 11:32:19 +0000 (UTC)
Subject: rpms/cups/F-11 cups-delete-active-printer.patch, NONE, 1.1 cups.spec,
	1.554, 1.555
Message-ID: <20091209113219.36F8A11C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26131

Modified Files:
	cups.spec 
Added Files:
	cups-delete-active-printer.patch 
Log Message:
* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
- Use upstream patch to fix scheduler crash when an active printer was
  deleted (rev 8914).


cups-delete-active-printer.patch:
 job.c |   44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

--- NEW FILE cups-delete-active-printer.patch ---
diff -up cups-1.4.2/CHANGES.txt.delete-active-printer cups-1.4.2/CHANGES.txt
diff -up cups-1.4.2/scheduler/job.c.delete-active-printer cups-1.4.2/scheduler/job.c
--- cups-1.4.2/scheduler/job.c.delete-active-printer	2009-12-09 11:24:50.946891977 +0000
+++ cups-1.4.2/scheduler/job.c	2009-12-09 11:25:32.145892252 +0000
@@ -168,7 +168,7 @@ static mime_filter_t	gziptoany_filter =
 static int	compare_active_jobs(void *first, void *second, void *data);
 static int	compare_jobs(void *first, void *second, void *data);
 static void	dump_job_history(cupsd_job_t *job);
-static void	finalize_job(cupsd_job_t *job);
+static void	finalize_job(cupsd_job_t *job, int set_job_state);
 static void	free_job_history(cupsd_job_t *job);
 static char	*get_options(cupsd_job_t *job, int banner_page, char *copies,
 		             size_t copies_size, char *title,
@@ -1297,7 +1297,7 @@ cupsdDeleteJob(cupsd_job_t       *job,	/
                cupsd_jobaction_t action)/* I - Action */
 {
   if (job->printer)
-    finalize_job(job);
+    finalize_job(job, 1);
 
   if (action == CUPSD_JOB_PURGE)
   {
@@ -2298,7 +2298,7 @@ cupsdSetJobState(
   */
 
   if (oldstate == IPP_JOB_PROCESSING)
-    stop_job(job, action != CUPSD_JOB_DEFAULT);
+    stop_job(job, action);
 
  /*
   * Set the new job state...
@@ -2505,8 +2505,8 @@ cupsdSetJobState(
   * Finalize the job immediately if we forced things...
   */
 
-  if (action == CUPSD_JOB_FORCE)
-    finalize_job(job);
+  if (action >= CUPSD_JOB_FORCE)
+    finalize_job(job, 0);
 
  /*
   * Update the server "busy" state...
@@ -2741,7 +2741,8 @@ free_job_history(cupsd_job_t *job)	/* I 
  */
 
 static void
-finalize_job(cupsd_job_t *job)		/* I - Job */
+finalize_job(cupsd_job_t *job,		/* I - Job */
+             int         set_job_state)	/* I - 1 = set the job state */
 {
   ipp_pstate_t		printer_state;	/* New printer state value */
   ipp_jstate_t		job_state;	/* New job state value */
@@ -3027,7 +3028,9 @@ finalize_job(cupsd_job_t *job)		/* I - J
   * Update the printer and job state.
   */
 
-  cupsdSetJobState(job, job_state, CUPSD_JOB_DEFAULT, "%s", message);
+  if (job_state != job->state_value)
+    cupsdSetJobState(job, job_state, CUPSD_JOB_DEFAULT, "%s", message);
+
   cupsdSetPrinterState(job->printer, printer_state,
                        printer_state == IPP_PRINTER_STOPPED);
   update_job_attrs(job, 0);
@@ -3995,15 +3998,34 @@ stop_job(cupsd_job_t       *job,	/* I - 
 
   if (action == CUPSD_JOB_DEFAULT && !job->kill_time)
     job->kill_time = time(NULL) + JobKillDelay;
-  else if (action == CUPSD_JOB_FORCE)
+  else if (action >= CUPSD_JOB_FORCE)
     job->kill_time = 0;
 
   for (i = 0; job->filters[i]; i ++)
     if (job->filters[i] > 0)
-      cupsdEndProcess(job->filters[i], action == CUPSD_JOB_FORCE);
+    {
+      cupsdEndProcess(job->filters[i], action >= CUPSD_JOB_FORCE);
+
+      if (action >= CUPSD_JOB_FORCE)
+        job->filters[i] = -job->filters[i];
+    }
 
   if (job->backend > 0)
-    cupsdEndProcess(job->backend, action == CUPSD_JOB_FORCE);
+  {
+    cupsdEndProcess(job->backend, action >= CUPSD_JOB_FORCE);
+
+    if (action >= CUPSD_JOB_FORCE)
+      job->backend = -job->backend;
+  }
+
+  if (action >= CUPSD_JOB_FORCE)
+  {
+   /*
+    * Clear job status...
+    */
+
+    job->status = 0;
+  }
 }
 
 
@@ -4393,7 +4415,7 @@ update_job(cupsd_job_t *job)		/* I - Job
     * Handle the end of job stuff...
     */
 
-    finalize_job(job);
+    finalize_job(job, 1);
 
    /*
     * Check for new jobs...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -p -r1.554 -r1.555
--- cups.spec	8 Dec 2009 12:33:34 -0000	1.554
+++ cups.spec	9 Dec 2009 11:32:18 -0000	1.555
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -73,6 +73,7 @@ Patch59: cups-str3436.patch
 Patch60: cups-str3425.patch
 Patch61: cups-str3428.patch
 Patch62: cups-str3431.patch
+Patch63: cups-delete-active-printer.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -250,6 +251,7 @@ module. 
 %patch60 -p1 -b .str3425
 %patch61 -p1 -b .str3428
 %patch62 -p1 -b .str3431
+%patch63 -p1 -b .delete-active-printer
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -541,6 +543,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
+- Use upstream patch to fix scheduler crash when an active printer was
+  deleted (rev 8914).
+
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
 - The scheduler did not use the Get-Job-Attributes policy for a
   printer (STR #3431).



From mlichvar at fedoraproject.org  Wed Dec  9 11:32:56 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  9 Dec 2009 11:32:56 +0000 (UTC)
Subject: File ntp-4.2.4p8.tar.gz uploaded to lookaside cache by mlichvar
Message-ID: <20091209113256.2686B10F87E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ntp:

fe137056e7e611798a46971a783567ce  ntp-4.2.4p8.tar.gz



From twaugh at fedoraproject.org  Wed Dec  9 11:32:55 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  9 Dec 2009 11:32:55 +0000 (UTC)
Subject: rpms/cups/F-12 cups-delete-active-printer.patch, NONE, 1.1 cups.spec,
	1.561, 1.562
Message-ID: <20091209113255.47F7E11C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26353

Modified Files:
	cups.spec 
Added Files:
	cups-delete-active-printer.patch 
Log Message:
* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
- Use upstream patch to fix scheduler crash when an active printer was
  deleted (rev 8914).


cups-delete-active-printer.patch:
 job.c |   44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

--- NEW FILE cups-delete-active-printer.patch ---
diff -up cups-1.4.2/CHANGES.txt.delete-active-printer cups-1.4.2/CHANGES.txt
diff -up cups-1.4.2/scheduler/job.c.delete-active-printer cups-1.4.2/scheduler/job.c
--- cups-1.4.2/scheduler/job.c.delete-active-printer	2009-12-09 11:24:50.946891977 +0000
+++ cups-1.4.2/scheduler/job.c	2009-12-09 11:25:32.145892252 +0000
@@ -168,7 +168,7 @@ static mime_filter_t	gziptoany_filter =
 static int	compare_active_jobs(void *first, void *second, void *data);
 static int	compare_jobs(void *first, void *second, void *data);
 static void	dump_job_history(cupsd_job_t *job);
-static void	finalize_job(cupsd_job_t *job);
+static void	finalize_job(cupsd_job_t *job, int set_job_state);
 static void	free_job_history(cupsd_job_t *job);
 static char	*get_options(cupsd_job_t *job, int banner_page, char *copies,
 		             size_t copies_size, char *title,
@@ -1297,7 +1297,7 @@ cupsdDeleteJob(cupsd_job_t       *job,	/
                cupsd_jobaction_t action)/* I - Action */
 {
   if (job->printer)
-    finalize_job(job);
+    finalize_job(job, 1);
 
   if (action == CUPSD_JOB_PURGE)
   {
@@ -2298,7 +2298,7 @@ cupsdSetJobState(
   */
 
   if (oldstate == IPP_JOB_PROCESSING)
-    stop_job(job, action != CUPSD_JOB_DEFAULT);
+    stop_job(job, action);
 
  /*
   * Set the new job state...
@@ -2505,8 +2505,8 @@ cupsdSetJobState(
   * Finalize the job immediately if we forced things...
   */
 
-  if (action == CUPSD_JOB_FORCE)
-    finalize_job(job);
+  if (action >= CUPSD_JOB_FORCE)
+    finalize_job(job, 0);
 
  /*
   * Update the server "busy" state...
@@ -2741,7 +2741,8 @@ free_job_history(cupsd_job_t *job)	/* I 
  */
 
 static void
-finalize_job(cupsd_job_t *job)		/* I - Job */
+finalize_job(cupsd_job_t *job,		/* I - Job */
+             int         set_job_state)	/* I - 1 = set the job state */
 {
   ipp_pstate_t		printer_state;	/* New printer state value */
   ipp_jstate_t		job_state;	/* New job state value */
@@ -3027,7 +3028,9 @@ finalize_job(cupsd_job_t *job)		/* I - J
   * Update the printer and job state.
   */
 
-  cupsdSetJobState(job, job_state, CUPSD_JOB_DEFAULT, "%s", message);
+  if (job_state != job->state_value)
+    cupsdSetJobState(job, job_state, CUPSD_JOB_DEFAULT, "%s", message);
+
   cupsdSetPrinterState(job->printer, printer_state,
                        printer_state == IPP_PRINTER_STOPPED);
   update_job_attrs(job, 0);
@@ -3995,15 +3998,34 @@ stop_job(cupsd_job_t       *job,	/* I - 
 
   if (action == CUPSD_JOB_DEFAULT && !job->kill_time)
     job->kill_time = time(NULL) + JobKillDelay;
-  else if (action == CUPSD_JOB_FORCE)
+  else if (action >= CUPSD_JOB_FORCE)
     job->kill_time = 0;
 
   for (i = 0; job->filters[i]; i ++)
     if (job->filters[i] > 0)
-      cupsdEndProcess(job->filters[i], action == CUPSD_JOB_FORCE);
+    {
+      cupsdEndProcess(job->filters[i], action >= CUPSD_JOB_FORCE);
+
+      if (action >= CUPSD_JOB_FORCE)
+        job->filters[i] = -job->filters[i];
+    }
 
   if (job->backend > 0)
-    cupsdEndProcess(job->backend, action == CUPSD_JOB_FORCE);
+  {
+    cupsdEndProcess(job->backend, action >= CUPSD_JOB_FORCE);
+
+    if (action >= CUPSD_JOB_FORCE)
+      job->backend = -job->backend;
+  }
+
+  if (action >= CUPSD_JOB_FORCE)
+  {
+   /*
+    * Clear job status...
+    */
+
+    job->status = 0;
+  }
 }
 
 
@@ -4393,7 +4415,7 @@ update_job(cupsd_job_t *job)		/* I - Job
     * Handle the end of job stuff...
     */
 
-    finalize_job(job);
+    finalize_job(job, 1);
 
    /*
     * Check for new jobs...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -p -r1.561 -r1.562
--- cups.spec	8 Dec 2009 12:34:18 -0000	1.561
+++ cups.spec	9 Dec 2009 11:32:55 -0000	1.562
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -72,6 +72,7 @@ Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
+Patch49: cups-delete-active-printer.patch
 
 Patch100: cups-lspp.patch
 
@@ -249,6 +250,7 @@ module. 
 %patch46 -p1 -b .str3425
 %patch47 -p1 -b .str3428
 %patch48 -p1 -b .str3431
+%patch49 -p1 -b .delete-active-printer
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -547,6 +549,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
+- Use upstream patch to fix scheduler crash when an active printer was
+  deleted (rev 8914).
+
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
 - The scheduler did not use the Get-Job-Attributes policy for a
   printer (STR #3431).



From dsd at fedoraproject.org  Wed Dec  9 11:36:01 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 11:36:01 +0000 (UTC)
Subject: File olpc-switch-desktop-0.7.tar.bz2 uploaded to lookaside cache by
	dsd
Message-ID: <20091209113601.4B3DD10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for olpc-switch-desktop:

2f48e1f919785b68de006452a526a075  olpc-switch-desktop-0.7.tar.bz2



From dsd at fedoraproject.org  Wed Dec  9 11:36:52 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 11:36:52 +0000 (UTC)
Subject: rpms/olpc-switch-desktop/devel .cvsignore, 1.2,
	1.3 olpc-switch-desktop.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091209113652.38BB711C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-switch-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27152

Modified Files:
	.cvsignore olpc-switch-desktop.spec sources 
Log Message:
v0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Jul 2009 09:23:49 -0000	1.2
+++ .cvsignore	9 Dec 2009 11:36:51 -0000	1.3
@@ -1 +1 @@
-olpc-switch-desktop-0.6.tar.bz2
+olpc-switch-desktop-0.7.tar.bz2


Index: olpc-switch-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/devel/olpc-switch-desktop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- olpc-switch-desktop.spec	25 Jul 2009 20:39:57 -0000	1.2
+++ olpc-switch-desktop.spec	9 Dec 2009 11:36:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		olpc-switch-desktop
-Version:	0.6
-Release:	2%{?dist}
+Version:	0.7
+Release:	1%{?dist}
 Summary:	OLPC desktop switching utilities
 
 License:	GPLv2+
@@ -59,6 +59,9 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Daniel Drake <dsd at laptop.org> - 0.7-1
+- Updated translations
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 09:23:50 -0000	1.2
+++ sources	9 Dec 2009 11:36:52 -0000	1.3
@@ -1 +1 @@
-bdbaebbb51274be96506156f94c07d76  olpc-switch-desktop-0.6.tar.bz2
+2f48e1f919785b68de006452a526a075  olpc-switch-desktop-0.7.tar.bz2



From twaugh at fedoraproject.org  Wed Dec  9 11:39:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  9 Dec 2009 11:39:16 +0000 (UTC)
Subject: rpms/cups/devel cups-delete-active-printer.patch, NONE,
	1.1 cups.spec, 1.563, 1.564
Message-ID: <20091209113916.CA4A211C00E0@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27754

Modified Files:
	cups.spec 
Added Files:
	cups-delete-active-printer.patch 
Log Message:
* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
- Use upstream patch to fix scheduler crash when an active printer was
  deleted (rev 8914).


cups-delete-active-printer.patch:
 job.c |   44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

--- NEW FILE cups-delete-active-printer.patch ---
diff -up cups-1.4.2/CHANGES.txt.delete-active-printer cups-1.4.2/CHANGES.txt
diff -up cups-1.4.2/scheduler/job.c.delete-active-printer cups-1.4.2/scheduler/job.c
--- cups-1.4.2/scheduler/job.c.delete-active-printer	2009-12-09 11:24:50.946891977 +0000
+++ cups-1.4.2/scheduler/job.c	2009-12-09 11:25:32.145892252 +0000
@@ -168,7 +168,7 @@ static mime_filter_t	gziptoany_filter =
 static int	compare_active_jobs(void *first, void *second, void *data);
 static int	compare_jobs(void *first, void *second, void *data);
 static void	dump_job_history(cupsd_job_t *job);
-static void	finalize_job(cupsd_job_t *job);
+static void	finalize_job(cupsd_job_t *job, int set_job_state);
 static void	free_job_history(cupsd_job_t *job);
 static char	*get_options(cupsd_job_t *job, int banner_page, char *copies,
 		             size_t copies_size, char *title,
@@ -1297,7 +1297,7 @@ cupsdDeleteJob(cupsd_job_t       *job,	/
                cupsd_jobaction_t action)/* I - Action */
 {
   if (job->printer)
-    finalize_job(job);
+    finalize_job(job, 1);
 
   if (action == CUPSD_JOB_PURGE)
   {
@@ -2298,7 +2298,7 @@ cupsdSetJobState(
   */
 
   if (oldstate == IPP_JOB_PROCESSING)
-    stop_job(job, action != CUPSD_JOB_DEFAULT);
+    stop_job(job, action);
 
  /*
   * Set the new job state...
@@ -2505,8 +2505,8 @@ cupsdSetJobState(
   * Finalize the job immediately if we forced things...
   */
 
-  if (action == CUPSD_JOB_FORCE)
-    finalize_job(job);
+  if (action >= CUPSD_JOB_FORCE)
+    finalize_job(job, 0);
 
  /*
   * Update the server "busy" state...
@@ -2741,7 +2741,8 @@ free_job_history(cupsd_job_t *job)	/* I 
  */
 
 static void
-finalize_job(cupsd_job_t *job)		/* I - Job */
+finalize_job(cupsd_job_t *job,		/* I - Job */
+             int         set_job_state)	/* I - 1 = set the job state */
 {
   ipp_pstate_t		printer_state;	/* New printer state value */
   ipp_jstate_t		job_state;	/* New job state value */
@@ -3027,7 +3028,9 @@ finalize_job(cupsd_job_t *job)		/* I - J
   * Update the printer and job state.
   */
 
-  cupsdSetJobState(job, job_state, CUPSD_JOB_DEFAULT, "%s", message);
+  if (job_state != job->state_value)
+    cupsdSetJobState(job, job_state, CUPSD_JOB_DEFAULT, "%s", message);
+
   cupsdSetPrinterState(job->printer, printer_state,
                        printer_state == IPP_PRINTER_STOPPED);
   update_job_attrs(job, 0);
@@ -3995,15 +3998,34 @@ stop_job(cupsd_job_t       *job,	/* I - 
 
   if (action == CUPSD_JOB_DEFAULT && !job->kill_time)
     job->kill_time = time(NULL) + JobKillDelay;
-  else if (action == CUPSD_JOB_FORCE)
+  else if (action >= CUPSD_JOB_FORCE)
     job->kill_time = 0;
 
   for (i = 0; job->filters[i]; i ++)
     if (job->filters[i] > 0)
-      cupsdEndProcess(job->filters[i], action == CUPSD_JOB_FORCE);
+    {
+      cupsdEndProcess(job->filters[i], action >= CUPSD_JOB_FORCE);
+
+      if (action >= CUPSD_JOB_FORCE)
+        job->filters[i] = -job->filters[i];
+    }
 
   if (job->backend > 0)
-    cupsdEndProcess(job->backend, action == CUPSD_JOB_FORCE);
+  {
+    cupsdEndProcess(job->backend, action >= CUPSD_JOB_FORCE);
+
+    if (action >= CUPSD_JOB_FORCE)
+      job->backend = -job->backend;
+  }
+
+  if (action >= CUPSD_JOB_FORCE)
+  {
+   /*
+    * Clear job status...
+    */
+
+    job->status = 0;
+  }
 }
 
 
@@ -4393,7 +4415,7 @@ update_job(cupsd_job_t *job)		/* I - Job
     * Handle the end of job stuff...
     */
 
-    finalize_job(job);
+    finalize_job(job, 1);
 
    /*
     * Check for new jobs...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -p -r1.563 -r1.564
--- cups.spec	8 Dec 2009 12:34:48 -0000	1.563
+++ cups.spec	9 Dec 2009 11:39:16 -0000	1.564
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -70,6 +70,7 @@ Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
+Patch49: cups-delete-active-printer.patch
 
 Patch100: cups-lspp.patch
 
@@ -247,6 +248,7 @@ module. 
 %patch46 -p1 -b .str3425
 %patch47 -p1 -b .str3428
 %patch48 -p1 -b .str3431
+%patch49 -p1 -b .delete-active-printer
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -537,6 +539,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
+- Use upstream patch to fix scheduler crash when an active printer was
+  deleted (rev 8914).
+
 * Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
 - The scheduler did not use the Get-Job-Attributes policy for a
   printer (STR #3431).



From mlichvar at fedoraproject.org  Wed Dec  9 11:41:18 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  9 Dec 2009 11:41:18 +0000 (UTC)
Subject: rpms/ntp/devel ntp-4.2.4p8-editline.patch, NONE,
	1.1 ntp-4.2.4p8-gettime.patch, NONE, 1.1 ntp-4.2.4p8-mlock.patch,
	NONE, 1.1 ntp-4.2.4p8-nosntp.patch, NONE, 1.1 .cvsignore, 1.29,
	1.30 ntp.spec, 1.96, 1.97 sources, 1.30,
	1.31 ntp-4.2.4p7-editline.patch, 1.1,
	NONE ntp-4.2.4p7-gettime.patch, 1.1, NONE ntp-4.2.4p7-ipv6.patch,
	1.1, NONE ntp-4.2.4p7-mlock.patch, 1.1,
	NONE ntp-4.2.4p7-nosntp.patch, 1.1, NONE
Message-ID: <20091209114118.DF88211C00E0@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28247

Modified Files:
	.cvsignore ntp.spec sources 
Added Files:
	ntp-4.2.4p8-editline.patch ntp-4.2.4p8-gettime.patch 
	ntp-4.2.4p8-mlock.patch ntp-4.2.4p8-nosntp.patch 
Removed Files:
	ntp-4.2.4p7-editline.patch ntp-4.2.4p7-gettime.patch 
	ntp-4.2.4p7-ipv6.patch ntp-4.2.4p7-mlock.patch 
	ntp-4.2.4p7-nosntp.patch 
Log Message:
- update to 4.2.4p8 (#545557, CVE-2009-3563)


ntp-4.2.4p8-editline.patch:
 configure     |    8 +++++++-
 ntpdc/ntpdc.c |    5 ++---
 ntpq/ntpq.c   |    5 ++---
 3 files changed, 11 insertions(+), 7 deletions(-)

--- NEW FILE ntp-4.2.4p8-editline.patch ---
diff -up ntp-4.2.4p8/configure.editline ntp-4.2.4p8/configure
--- ntp-4.2.4p8/configure.editline	2009-12-08 14:07:43.000000000 +0100
+++ ntp-4.2.4p8/configure	2009-12-08 17:51:52.000000000 +0100
@@ -17216,9 +17216,15 @@ fi
 done
 
 
+READLINE_LIBS="-ledit"
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEDIT
+_ACEOF
+
 # following block becomes on 4.2.5: NTP_LINEEDITLIBS
 for ac_header in readline/history.h readline/readline.h
 do :
+  break
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 eval as_val=\$$as_ac_Header
@@ -17232,7 +17238,7 @@ fi
 done
 
 case "$ac_cv_header_readline_history_h$ac_cv_header_readline_readline_h" in
- *no*) ;;
+ *) ;;
  *) save_LIBS=$LIBS
     LIBS=
     # Ralf Wildenhues: either unset ... or cache READLINE_LIBS
diff -up ntp-4.2.4p8/ntpdc/ntpdc.c.editline ntp-4.2.4p8/ntpdc/ntpdc.c
--- ntp-4.2.4p8/ntpdc/ntpdc.c.editline	2009-12-08 12:55:59.000000000 +0100
+++ ntp-4.2.4p8/ntpdc/ntpdc.c	2009-12-08 17:50:14.000000000 +0100
@@ -26,9 +26,8 @@
 # define closesocket close
 #endif /* SYS_WINNT */
 
-#if defined(HAVE_LIBREADLINE) || defined (HAVE_LIBEDIT)
-# include <readline/readline.h>
-# include <readline/history.h>
+#if defined (HAVE_LIBEDIT)
+# include <editline/readline.h>
 #endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
diff -up ntp-4.2.4p8/ntpq/ntpq.c.editline ntp-4.2.4p8/ntpq/ntpq.c
--- ntp-4.2.4p8/ntpq/ntpq.c.editline	2009-12-08 12:55:59.000000000 +0100
+++ ntp-4.2.4p8/ntpq/ntpq.c	2009-12-08 17:50:14.000000000 +0100
@@ -30,9 +30,8 @@
 # define closesocket close
 #endif /* SYS_WINNT */
 
-#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
-# include <readline/readline.h>
-# include <readline/history.h>
+#if defined(HAVE_LIBEDIT)
+# include <editline/readline.h>
 #endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS

ntp-4.2.4p8-gettime.patch:
 configure |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE ntp-4.2.4p8-gettime.patch ---
diff -up ntp-4.2.4p8/configure.gettime ntp-4.2.4p8/configure
--- ntp-4.2.4p8/configure.gettime	2009-12-08 18:04:54.000000000 +0100
+++ ntp-4.2.4p8/configure	2009-12-08 18:06:07.000000000 +0100
@@ -20221,6 +20221,10 @@ case "$host" in
     ;;
  *) for ac_func in clock_gettime clock_settime
 do :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+  continue
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 eval as_val=\$$as_ac_var

ntp-4.2.4p8-mlock.patch:
 html/ntpd.html   |    4 +++-
 ntpd/ntpd-opts.c |   23 ++++++++++++++++++++++-
 ntpd/ntpd-opts.h |   15 +++++++++++----
 ntpd/ntpd.c      |    6 ++++--
 4 files changed, 40 insertions(+), 8 deletions(-)

--- NEW FILE ntp-4.2.4p8-mlock.patch ---
diff -up ntp-4.2.4p8/html/ntpd.html.mlock ntp-4.2.4p8/html/ntpd.html
--- ntp-4.2.4p8/html/ntpd.html.mlock	2009-12-08 17:56:35.000000000 +0100
+++ ntp-4.2.4p8/html/ntpd.html	2009-12-08 17:56:35.000000000 +0100
@@ -34,7 +34,7 @@
 		</ul>
 		<hr>
 		<h4 id="synop">Synopsis</h4>
-		<tt>ntpd [ -46aAbdDgLnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
+		<tt>ntpd [ -46aAbdDgLmnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
 		<h4 id="descr">Description</h4>
 		<p>The <tt>ntpd</tt> program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. <tt>ntpd</tt> does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.</p>
 		<h4 id="op">How NTP Operates</h4>
@@ -96,6 +96,8 @@
 			<dd>Specify the name and path of the log file. The default is the system log file. This is the same operation as the <tt>logfile <i>logfile</i></tt> configuration command.
 			<dt><tt>-L</tt>
 			<dd>Do not listen to virtual IPs. The default is to listen.
+			<dt><tt>-m</tt>
+			<dd>Lock memory.
 			<dt><tt>-n</tt>
 			<dd>Don't fork.
 			<dt><tt>-N</tt>
diff -up ntp-4.2.4p8/ntpd/ntpd-opts.c.mlock ntp-4.2.4p8/ntpd/ntpd-opts.c
--- ntp-4.2.4p8/ntpd/ntpd-opts.c.mlock	2009-12-08 14:13:09.000000000 +0100
+++ ntp-4.2.4p8/ntpd/ntpd-opts.c	2009-12-08 17:56:35.000000000 +0100
@@ -264,6 +264,15 @@ tSCC    zNice_Name[]               = "ni
 #define NICE_FLAGS       (OPTST_DISABLED)
 
 /*
+ *  Mlock option description:
+ */
+tSCC    zMlockText[] =
+        "Lock memory";
+tSCC    zMlock_NAME[]               = "MLOCK";
+tSCC    zMlock_Name[]               = "mlock";
+#define MLOCK_FLAGS       (OPTST_DISABLED)
+
+/*
  *  Pidfile option description:
  */
 tSCC    zPidfileText[] =
@@ -789,6 +798,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
                                 OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
 #endif
 
+  {  /* entry idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equiv idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ MLOCK_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name,
+     /* disablement strs */ NULL, NULL },
+
   {  /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
      /* equiv idx value  */ NO_EQUIVALENT, 0,
      /* equivalenced to  */ NO_EQUIVALENT,
@@ -881,7 +902,7 @@ tOptions ntpdOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    32 /* full option count */, 29 /* user option count */
+    33 /* full option count */, 30 /* user option count */
 };
 
 /*
diff -up ntp-4.2.4p8/ntpd/ntpd-opts.h.mlock ntp-4.2.4p8/ntpd/ntpd-opts.h
--- ntp-4.2.4p8/ntpd/ntpd-opts.h.mlock	2009-12-08 14:13:09.000000000 +0100
+++ ntp-4.2.4p8/ntpd/ntpd-opts.h	2009-12-08 17:56:35.000000000 +0100
@@ -81,12 +81,13 @@ typedef enum {
         INDEX_OPT_VAR              = 26,
         INDEX_OPT_DVAR             = 27,
         INDEX_OPT_SLEW             = 28,
-        INDEX_OPT_VERSION          = 29,
-        INDEX_OPT_HELP             = 30,
-        INDEX_OPT_MORE_HELP        = 31
+        INDEX_OPT_MLOCK            = 29,
+        INDEX_OPT_VERSION          = 30,
+        INDEX_OPT_HELP             = 31,
+        INDEX_OPT_MORE_HELP        = 32
 } teOptIndex;
 
-#define OPTION_CT    32
+#define OPTION_CT    33
 #define NTPD_VERSION       "4.2.4p8"
 #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p8"
 
@@ -179,6 +180,10 @@ typedef enum {
 #  warning undefining MODIFYMMTIMER due to option name conflict
 #  undef   MODIFYMMTIMER
 # endif
+# ifdef    MLOCK
+#  warning undefining MLOCK due to option name conflict
+#  undef   MLOCK
+# endif
 # ifdef    NOFORK
 #  warning undefining NOFORK due to option name conflict
 #  undef   NOFORK
@@ -248,6 +253,7 @@ typedef enum {
 # undef LOGFILE
 # undef NOVIRTUALIPS
 # undef MODIFYMMTIMER
+# undef MLOCK
 # undef NOFORK
 # undef NICE
 # undef PIDFILE
@@ -290,6 +296,7 @@ typedef enum {
 #ifdef SYS_WINNT
 #define VALUE_OPT_MODIFYMMTIMER  'M'
 #endif /* SYS_WINNT */
+#define VALUE_OPT_MLOCK          'm'
 #define VALUE_OPT_NOFORK         'n'
 #define VALUE_OPT_NICE           'N'
 #define VALUE_OPT_PIDFILE        'p'
diff -up ntp-4.2.4p8/ntpd/ntpd.c.mlock ntp-4.2.4p8/ntpd/ntpd.c
--- ntp-4.2.4p8/ntpd/ntpd.c.mlock	2009-12-08 17:56:35.000000000 +0100
+++ ntp-4.2.4p8/ntpd/ntpd.c	2009-12-08 17:56:35.000000000 +0100
@@ -691,7 +691,8 @@ ntpdmain(
 	}
 #endif
 
-#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE)
+#if defined(MCL_CURRENT) && defined(MCL_FUTURE)
+    if (HAVE_OPT( MLOCK )) {
 # ifdef HAVE_SETRLIMIT
 	/*
 	 * Set the stack limit to something smaller, so that we don't lock a lot
@@ -717,7 +718,7 @@ ntpdmain(
 	     * fail if we drop root privlege.  To be useful the value
 	     * has to be larger than the largest ntpd resident set size.
 	     */
-	    rl.rlim_cur = rl.rlim_max = 32*1024*1024;
+	    rl.rlim_cur = rl.rlim_max = 64*1024*1024;
 	    if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) {
 	    	msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m");
 	    }
@@ -729,6 +730,7 @@ ntpdmain(
 	 */
 	if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
 		msyslog(LOG_ERR, "mlockall(): %m");
+    }
 #else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */
 # ifdef HAVE_PLOCK
 #  ifdef PROCLOCK

ntp-4.2.4p8-nosntp.patch:
 Makefile.in |    3 +--
 configure   |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE ntp-4.2.4p8-nosntp.patch ---
diff -up ntp-4.2.4p8/Makefile.in.nosntp ntp-4.2.4p8/Makefile.in
--- ntp-4.2.4p8/Makefile.in.nosntp	2009-12-08 14:07:31.000000000 +0100
+++ ntp-4.2.4p8/Makefile.in	2009-12-08 17:59:39.000000000 +0100
@@ -246,7 +246,7 @@ ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
 NULL = 
 SUBDIRS = $(am__append_1) scripts include ElectricFence @ARLIB_DIR@ \
 	libntp libparse ntpd ntpdate ntpdc ntpq parseutil adjtimed \
-	clockstuff kernel sntp util $(NULL)
+	clockstuff kernel util $(NULL)
 DIST_SUBDIRS = \
 	scripts		\
 	include		\
@@ -263,7 +263,6 @@ DIST_SUBDIRS = \
 	adjtimed	\
 	clockstuff	\
 	kernel		\
-	sntp		\
 	util		\
 	$(NULL)
 
diff -up ntp-4.2.4p8/configure.nosntp ntp-4.2.4p8/configure
--- ntp-4.2.4p8/configure.nosntp	2009-12-08 17:59:39.000000000 +0100
+++ ntp-4.2.4p8/configure	2009-12-08 18:01:09.000000000 +0100
@@ -25770,7 +25770,7 @@ ac_config_files="$ac_config_files script
 ac_config_files="$ac_config_files util/Makefile"
 
 
-subdirs="$subdirs sntp"
+subdirs="$subdirs"
 
 
 cat >confcache <<\_ACEOF


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	19 May 2009 14:45:44 -0000	1.29
+++ .cvsignore	9 Dec 2009 11:41:17 -0000	1.30
@@ -1,2 +1,2 @@
 ntpstat-0.2.tgz
-ntp-4.2.4p7.tar.gz
+ntp-4.2.4p8.tar.gz


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ntp.spec	21 Oct 2009 14:12:11 -0000	1.96
+++ ntp.spec	9 Dec 2009 11:41:18 -0000	1.97
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
-Version: 4.2.4p7
-Release: 7%{?dist}
+Version: 4.2.4p8
+Release: 1%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -65,13 +65,13 @@ Patch11: ntp-4.2.4p2-filegen.patch
 # ntpbz #738
 Patch12: ntp-4.2.4-sprintf.patch
 # use editline instead of readline
-Patch13: ntp-4.2.4p7-editline.patch
+Patch13: ntp-4.2.4p8-editline.patch
 # add option -m to lock memory
-Patch14: ntp-4.2.4p7-mlock.patch
+Patch14: ntp-4.2.4p8-mlock.patch
 # fixed in 4.2.5
 Patch15: ntp-4.2.4p2-clockselect.patch
 # don't build sntp
-Patch16: ntp-4.2.4p7-nosntp.patch
+Patch16: ntp-4.2.4p8-nosntp.patch
 # ntpbz #802
 Patch17: ntp-4.2.4p7-sleep.patch
 # ntpbz #779, #823
@@ -80,12 +80,10 @@ Patch18: ntp-4.2.4p7-bcast.patch
 Patch19: ntp-4.2.4p0-retcode.patch
 # ntpbz #397
 Patch20: ntp-4.2.4p2-noif.patch
-# force IPv6 support
-Patch21: ntp-4.2.4p7-ipv6.patch
 # align buffer for control messages
 Patch22: ntp-4.2.4p4-cmsgalign.patch
 # force use of clock_gettime
-Patch23: ntp-4.2.4p7-gettime.patch
+Patch23: ntp-4.2.4p8-gettime.patch
 # reload resolv.conf after failure in name resolution
 Patch24: ntp-4.2.4p4-resinit.patch
 # ntpbz #992
@@ -183,7 +181,6 @@ This package contains NTP documentation 
 %patch18 -p1 -b .bcast
 %patch19 -p1 -b .retcode
 %patch20 -p1 -b .noif
-%patch21 -p1 -b .ipv6
 %patch22 -p1 -b .cmsgalign
 %patch24 -p1 -b .resinit
 %patch25 -p1 -b .rtnetlink
@@ -370,6 +367,9 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Wed Dec 09 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p8-1
+- update to 4.2.4p8 (#545557, CVE-2009-3563)
+
 * Wed Oct 21 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-7
 - add ntp-wait man page (#526161)
 - fix init scripts (#527987)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	19 May 2009 14:45:47 -0000	1.30
+++ sources	9 Dec 2009 11:41:18 -0000	1.31
@@ -1,2 +1,2 @@
 6b2bedefe2e7c63ea52609b222022121  ntpstat-0.2.tgz
-8c19ff62ed4f7d64f8e2aa59cb11f364  ntp-4.2.4p7.tar.gz
+fe137056e7e611798a46971a783567ce  ntp-4.2.4p8.tar.gz


--- ntp-4.2.4p7-editline.patch DELETED ---


--- ntp-4.2.4p7-gettime.patch DELETED ---


--- ntp-4.2.4p7-ipv6.patch DELETED ---


--- ntp-4.2.4p7-mlock.patch DELETED ---


--- ntp-4.2.4p7-nosntp.patch DELETED ---



From mlichvar at fedoraproject.org  Wed Dec  9 11:44:37 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  9 Dec 2009 11:44:37 +0000 (UTC)
Subject: rpms/ntp/F-12 ntp-4.2.4p8-editline.patch, NONE,
	1.1 ntp-4.2.4p8-gettime.patch, NONE, 1.1 ntp-4.2.4p8-mlock.patch,
	NONE, 1.1 ntp-4.2.4p8-nosntp.patch, NONE, 1.1 .cvsignore, 1.29,
	1.30 ntp.spec, 1.95, 1.96 sources, 1.30,
	1.31 ntp-4.2.4p7-editline.patch, 1.1,
	NONE ntp-4.2.4p7-gettime.patch, 1.1, NONE ntp-4.2.4p7-ipv6.patch,
	1.1, NONE ntp-4.2.4p7-mlock.patch, 1.1,
	NONE ntp-4.2.4p7-nosntp.patch, 1.1, NONE
Message-ID: <20091209114437.DB03F11C00E0@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29090

Modified Files:
	.cvsignore ntp.spec sources 
Added Files:
	ntp-4.2.4p8-editline.patch ntp-4.2.4p8-gettime.patch 
	ntp-4.2.4p8-mlock.patch ntp-4.2.4p8-nosntp.patch 
Removed Files:
	ntp-4.2.4p7-editline.patch ntp-4.2.4p7-gettime.patch 
	ntp-4.2.4p7-ipv6.patch ntp-4.2.4p7-mlock.patch 
	ntp-4.2.4p7-nosntp.patch 
Log Message:
- update to 4.2.4p8 (#545557, CVE-2009-3563)


ntp-4.2.4p8-editline.patch:
 configure     |    8 +++++++-
 ntpdc/ntpdc.c |    5 ++---
 ntpq/ntpq.c   |    5 ++---
 3 files changed, 11 insertions(+), 7 deletions(-)

--- NEW FILE ntp-4.2.4p8-editline.patch ---
diff -up ntp-4.2.4p8/configure.editline ntp-4.2.4p8/configure
--- ntp-4.2.4p8/configure.editline	2009-12-08 14:07:43.000000000 +0100
+++ ntp-4.2.4p8/configure	2009-12-08 17:51:52.000000000 +0100
@@ -17216,9 +17216,15 @@ fi
 done
 
 
+READLINE_LIBS="-ledit"
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEDIT
+_ACEOF
+
 # following block becomes on 4.2.5: NTP_LINEEDITLIBS
 for ac_header in readline/history.h readline/readline.h
 do :
+  break
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 eval as_val=\$$as_ac_Header
@@ -17232,7 +17238,7 @@ fi
 done
 
 case "$ac_cv_header_readline_history_h$ac_cv_header_readline_readline_h" in
- *no*) ;;
+ *) ;;
  *) save_LIBS=$LIBS
     LIBS=
     # Ralf Wildenhues: either unset ... or cache READLINE_LIBS
diff -up ntp-4.2.4p8/ntpdc/ntpdc.c.editline ntp-4.2.4p8/ntpdc/ntpdc.c
--- ntp-4.2.4p8/ntpdc/ntpdc.c.editline	2009-12-08 12:55:59.000000000 +0100
+++ ntp-4.2.4p8/ntpdc/ntpdc.c	2009-12-08 17:50:14.000000000 +0100
@@ -26,9 +26,8 @@
 # define closesocket close
 #endif /* SYS_WINNT */
 
-#if defined(HAVE_LIBREADLINE) || defined (HAVE_LIBEDIT)
-# include <readline/readline.h>
-# include <readline/history.h>
+#if defined (HAVE_LIBEDIT)
+# include <editline/readline.h>
 #endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
diff -up ntp-4.2.4p8/ntpq/ntpq.c.editline ntp-4.2.4p8/ntpq/ntpq.c
--- ntp-4.2.4p8/ntpq/ntpq.c.editline	2009-12-08 12:55:59.000000000 +0100
+++ ntp-4.2.4p8/ntpq/ntpq.c	2009-12-08 17:50:14.000000000 +0100
@@ -30,9 +30,8 @@
 # define closesocket close
 #endif /* SYS_WINNT */
 
-#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
-# include <readline/readline.h>
-# include <readline/history.h>
+#if defined(HAVE_LIBEDIT)
+# include <editline/readline.h>
 #endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS

ntp-4.2.4p8-gettime.patch:
 configure |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE ntp-4.2.4p8-gettime.patch ---
diff -up ntp-4.2.4p8/configure.gettime ntp-4.2.4p8/configure
--- ntp-4.2.4p8/configure.gettime	2009-12-08 18:04:54.000000000 +0100
+++ ntp-4.2.4p8/configure	2009-12-08 18:06:07.000000000 +0100
@@ -20221,6 +20221,10 @@ case "$host" in
     ;;
  *) for ac_func in clock_gettime clock_settime
 do :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+  continue
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 eval as_val=\$$as_ac_var

ntp-4.2.4p8-mlock.patch:
 html/ntpd.html   |    4 +++-
 ntpd/ntpd-opts.c |   23 ++++++++++++++++++++++-
 ntpd/ntpd-opts.h |   15 +++++++++++----
 ntpd/ntpd.c      |    6 ++++--
 4 files changed, 40 insertions(+), 8 deletions(-)

--- NEW FILE ntp-4.2.4p8-mlock.patch ---
diff -up ntp-4.2.4p8/html/ntpd.html.mlock ntp-4.2.4p8/html/ntpd.html
--- ntp-4.2.4p8/html/ntpd.html.mlock	2009-12-08 17:56:35.000000000 +0100
+++ ntp-4.2.4p8/html/ntpd.html	2009-12-08 17:56:35.000000000 +0100
@@ -34,7 +34,7 @@
 		</ul>
 		<hr>
 		<h4 id="synop">Synopsis</h4>
-		<tt>ntpd [ -46aAbdDgLnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
+		<tt>ntpd [ -46aAbdDgLmnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
 		<h4 id="descr">Description</h4>
 		<p>The <tt>ntpd</tt> program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. <tt>ntpd</tt> does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.</p>
 		<h4 id="op">How NTP Operates</h4>
@@ -96,6 +96,8 @@
 			<dd>Specify the name and path of the log file. The default is the system log file. This is the same operation as the <tt>logfile <i>logfile</i></tt> configuration command.
 			<dt><tt>-L</tt>
 			<dd>Do not listen to virtual IPs. The default is to listen.
+			<dt><tt>-m</tt>
+			<dd>Lock memory.
 			<dt><tt>-n</tt>
 			<dd>Don't fork.
 			<dt><tt>-N</tt>
diff -up ntp-4.2.4p8/ntpd/ntpd-opts.c.mlock ntp-4.2.4p8/ntpd/ntpd-opts.c
--- ntp-4.2.4p8/ntpd/ntpd-opts.c.mlock	2009-12-08 14:13:09.000000000 +0100
+++ ntp-4.2.4p8/ntpd/ntpd-opts.c	2009-12-08 17:56:35.000000000 +0100
@@ -264,6 +264,15 @@ tSCC    zNice_Name[]               = "ni
 #define NICE_FLAGS       (OPTST_DISABLED)
 
 /*
+ *  Mlock option description:
+ */
+tSCC    zMlockText[] =
+        "Lock memory";
+tSCC    zMlock_NAME[]               = "MLOCK";
+tSCC    zMlock_Name[]               = "mlock";
+#define MLOCK_FLAGS       (OPTST_DISABLED)
+
+/*
  *  Pidfile option description:
  */
 tSCC    zPidfileText[] =
@@ -789,6 +798,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
                                 OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
 #endif
 
+  {  /* entry idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equiv idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ MLOCK_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name,
+     /* disablement strs */ NULL, NULL },
+
   {  /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
      /* equiv idx value  */ NO_EQUIVALENT, 0,
      /* equivalenced to  */ NO_EQUIVALENT,
@@ -881,7 +902,7 @@ tOptions ntpdOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    32 /* full option count */, 29 /* user option count */
+    33 /* full option count */, 30 /* user option count */
 };
 
 /*
diff -up ntp-4.2.4p8/ntpd/ntpd-opts.h.mlock ntp-4.2.4p8/ntpd/ntpd-opts.h
--- ntp-4.2.4p8/ntpd/ntpd-opts.h.mlock	2009-12-08 14:13:09.000000000 +0100
+++ ntp-4.2.4p8/ntpd/ntpd-opts.h	2009-12-08 17:56:35.000000000 +0100
@@ -81,12 +81,13 @@ typedef enum {
         INDEX_OPT_VAR              = 26,
         INDEX_OPT_DVAR             = 27,
         INDEX_OPT_SLEW             = 28,
-        INDEX_OPT_VERSION          = 29,
-        INDEX_OPT_HELP             = 30,
-        INDEX_OPT_MORE_HELP        = 31
+        INDEX_OPT_MLOCK            = 29,
+        INDEX_OPT_VERSION          = 30,
+        INDEX_OPT_HELP             = 31,
+        INDEX_OPT_MORE_HELP        = 32
 } teOptIndex;
 
-#define OPTION_CT    32
+#define OPTION_CT    33
 #define NTPD_VERSION       "4.2.4p8"
 #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p8"
 
@@ -179,6 +180,10 @@ typedef enum {
 #  warning undefining MODIFYMMTIMER due to option name conflict
 #  undef   MODIFYMMTIMER
 # endif
+# ifdef    MLOCK
+#  warning undefining MLOCK due to option name conflict
+#  undef   MLOCK
+# endif
 # ifdef    NOFORK
 #  warning undefining NOFORK due to option name conflict
 #  undef   NOFORK
@@ -248,6 +253,7 @@ typedef enum {
 # undef LOGFILE
 # undef NOVIRTUALIPS
 # undef MODIFYMMTIMER
+# undef MLOCK
 # undef NOFORK
 # undef NICE
 # undef PIDFILE
@@ -290,6 +296,7 @@ typedef enum {
 #ifdef SYS_WINNT
 #define VALUE_OPT_MODIFYMMTIMER  'M'
 #endif /* SYS_WINNT */
+#define VALUE_OPT_MLOCK          'm'
 #define VALUE_OPT_NOFORK         'n'
 #define VALUE_OPT_NICE           'N'
 #define VALUE_OPT_PIDFILE        'p'
diff -up ntp-4.2.4p8/ntpd/ntpd.c.mlock ntp-4.2.4p8/ntpd/ntpd.c
--- ntp-4.2.4p8/ntpd/ntpd.c.mlock	2009-12-08 17:56:35.000000000 +0100
+++ ntp-4.2.4p8/ntpd/ntpd.c	2009-12-08 17:56:35.000000000 +0100
@@ -691,7 +691,8 @@ ntpdmain(
 	}
 #endif
 
-#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE)
+#if defined(MCL_CURRENT) && defined(MCL_FUTURE)
+    if (HAVE_OPT( MLOCK )) {
 # ifdef HAVE_SETRLIMIT
 	/*
 	 * Set the stack limit to something smaller, so that we don't lock a lot
@@ -717,7 +718,7 @@ ntpdmain(
 	     * fail if we drop root privlege.  To be useful the value
 	     * has to be larger than the largest ntpd resident set size.
 	     */
-	    rl.rlim_cur = rl.rlim_max = 32*1024*1024;
+	    rl.rlim_cur = rl.rlim_max = 64*1024*1024;
 	    if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) {
 	    	msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m");
 	    }
@@ -729,6 +730,7 @@ ntpdmain(
 	 */
 	if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
 		msyslog(LOG_ERR, "mlockall(): %m");
+    }
 #else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */
 # ifdef HAVE_PLOCK
 #  ifdef PROCLOCK

ntp-4.2.4p8-nosntp.patch:
 Makefile.in |    3 +--
 configure   |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE ntp-4.2.4p8-nosntp.patch ---
diff -up ntp-4.2.4p8/Makefile.in.nosntp ntp-4.2.4p8/Makefile.in
--- ntp-4.2.4p8/Makefile.in.nosntp	2009-12-08 14:07:31.000000000 +0100
+++ ntp-4.2.4p8/Makefile.in	2009-12-08 17:59:39.000000000 +0100
@@ -246,7 +246,7 @@ ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
 NULL = 
 SUBDIRS = $(am__append_1) scripts include ElectricFence @ARLIB_DIR@ \
 	libntp libparse ntpd ntpdate ntpdc ntpq parseutil adjtimed \
-	clockstuff kernel sntp util $(NULL)
+	clockstuff kernel util $(NULL)
 DIST_SUBDIRS = \
 	scripts		\
 	include		\
@@ -263,7 +263,6 @@ DIST_SUBDIRS = \
 	adjtimed	\
 	clockstuff	\
 	kernel		\
-	sntp		\
 	util		\
 	$(NULL)
 
diff -up ntp-4.2.4p8/configure.nosntp ntp-4.2.4p8/configure
--- ntp-4.2.4p8/configure.nosntp	2009-12-08 17:59:39.000000000 +0100
+++ ntp-4.2.4p8/configure	2009-12-08 18:01:09.000000000 +0100
@@ -25770,7 +25770,7 @@ ac_config_files="$ac_config_files script
 ac_config_files="$ac_config_files util/Makefile"
 
 
-subdirs="$subdirs sntp"
+subdirs="$subdirs"
 
 
 cat >confcache <<\_ACEOF


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	19 May 2009 14:45:44 -0000	1.29
+++ .cvsignore	9 Dec 2009 11:44:36 -0000	1.30
@@ -1,2 +1,2 @@
 ntpstat-0.2.tgz
-ntp-4.2.4p7.tar.gz
+ntp-4.2.4p8.tar.gz


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/ntp.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ntp.spec	21 Oct 2009 14:24:55 -0000	1.95
+++ ntp.spec	9 Dec 2009 11:44:37 -0000	1.96
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
-Version: 4.2.4p7
-Release: 7%{?dist}
+Version: 4.2.4p8
+Release: 1%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -65,13 +65,13 @@ Patch11: ntp-4.2.4p2-filegen.patch
 # ntpbz #738
 Patch12: ntp-4.2.4-sprintf.patch
 # use editline instead of readline
-Patch13: ntp-4.2.4p7-editline.patch
+Patch13: ntp-4.2.4p8-editline.patch
 # add option -m to lock memory
-Patch14: ntp-4.2.4p7-mlock.patch
+Patch14: ntp-4.2.4p8-mlock.patch
 # fixed in 4.2.5
 Patch15: ntp-4.2.4p2-clockselect.patch
 # don't build sntp
-Patch16: ntp-4.2.4p7-nosntp.patch
+Patch16: ntp-4.2.4p8-nosntp.patch
 # ntpbz #802
 Patch17: ntp-4.2.4p7-sleep.patch
 # ntpbz #779, #823
@@ -80,12 +80,10 @@ Patch18: ntp-4.2.4p7-bcast.patch
 Patch19: ntp-4.2.4p0-retcode.patch
 # ntpbz #397
 Patch20: ntp-4.2.4p2-noif.patch
-# force IPv6 support
-Patch21: ntp-4.2.4p7-ipv6.patch
 # align buffer for control messages
 Patch22: ntp-4.2.4p4-cmsgalign.patch
 # force use of clock_gettime
-Patch23: ntp-4.2.4p7-gettime.patch
+Patch23: ntp-4.2.4p8-gettime.patch
 # reload resolv.conf after failure in name resolution
 Patch24: ntp-4.2.4p4-resinit.patch
 # ntpbz #992
@@ -183,7 +181,6 @@ This package contains NTP documentation 
 %patch18 -p1 -b .bcast
 %patch19 -p1 -b .retcode
 %patch20 -p1 -b .noif
-%patch21 -p1 -b .ipv6
 %patch22 -p1 -b .cmsgalign
 %patch24 -p1 -b .resinit
 %patch25 -p1 -b .rtnetlink
@@ -370,6 +367,9 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Wed Dec 09 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p8-1
+- update to 4.2.4p8 (#545557, CVE-2009-3563)
+
 * Wed Oct 21 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-7
 - add ntp-wait man page (#526161)
 - fix init scripts (#527987)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	19 May 2009 14:45:47 -0000	1.30
+++ sources	9 Dec 2009 11:44:37 -0000	1.31
@@ -1,2 +1,2 @@
 6b2bedefe2e7c63ea52609b222022121  ntpstat-0.2.tgz
-8c19ff62ed4f7d64f8e2aa59cb11f364  ntp-4.2.4p7.tar.gz
+fe137056e7e611798a46971a783567ce  ntp-4.2.4p8.tar.gz


--- ntp-4.2.4p7-editline.patch DELETED ---


--- ntp-4.2.4p7-gettime.patch DELETED ---


--- ntp-4.2.4p7-ipv6.patch DELETED ---


--- ntp-4.2.4p7-mlock.patch DELETED ---


--- ntp-4.2.4p7-nosntp.patch DELETED ---



From caolanm at fedoraproject.org  Wed Dec  9 11:44:39 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 11:44:39 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.vcl105.patch, NONE,
	1.1 openoffice.org.spec, 1.2042, 1.2043
Message-ID: <20091209114439.7DAF911C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29115/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl105.patch 
Log Message:
Resolves: rhbz#545783 add workspace.vcl105.patch

workspace.vcl105.patch:
 gtkframe.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE workspace.vcl105.patch ---
>From bd0d9d4ac9148211e14eb1548ad54829af465aed Mon Sep 17 00:00:00 2001
From: Chris Halls <halls at debian.org>
Date: Mon, 24 Aug 2009 16:44:15 +0100
Subject: [PATCH] Prevent multiple window resize calls when maximised

See http://bugs.debian.org/542387.

Problem introduced as part of fix to IZ#44325.

If KDE Window manager receives a window move after a window has already been
maximised, it assumes the window should be restored to original size. Under
Gnome it will stay maximised.

This fix disables further window resize calls once the window state has been
set to maximised.
---
 unx/gtk/window/gtkframe.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git vcl/unx/gtk/window/gtkframe.cxx b/unx/gtk/window/gtkframe.cxx
index c1fbbc5..d5e514a 100644
--- vcl.old/unx/gtk/window/gtkframe.cxx
+++ vcl/unx/gtk/window/gtkframe.cxx
@@ -1501,7 +1501,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
 
         if( isChild( false, true ) )
             gtk_widget_set_size_request( m_pWindow, nWidth, nHeight );
-        else
+        else if( ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) )
             gtk_window_resize( GTK_WINDOW(m_pWindow), nWidth, nHeight );
         setMinMaxSize();
 	}
@@ -1603,6 +1603,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
         SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
     
     if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&
+        ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) &&
         (pState->mnState & SAL_FRAMESTATE_MAXIMIZED) &&
         (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask )
     {
-- 
1.6.3.3



Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2042
retrieving revision 1.2043
diff -u -p -r1.2042 -r1.2043
--- openoffice.org.spec	9 Dec 2009 10:26:19 -0000	1.2042
+++ openoffice.org.spec	9 Dec 2009 11:44:39 -0000	1.2043
@@ -178,6 +178,7 @@ Patch101: openoffice.org-3.3.0.ooo102645
 Patch102: openoffice.org-3.2.0.ooo107260.dtrans.clipboard.shutdown.patch
 Patch103: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 Patch104: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
+Patch105: workspace.vcl105.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1742,6 +1743,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch102 -p0 -b .ooo107260.dtrans.clipboard.shutdown.patch
 %patch103 -p1 -b .ooo106502.svx.fixspelltimer.patch
 %patch104 -p0 -b .ooo107552.vcl.sft.patch
+%patch105 -p0 -b .workspace.vcl105.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4278,6 +4280,7 @@ fi
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.21
 - Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 - Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch
+- Resolves: rhbz#545783 add workspace.vcl105.patch
 
 * Fri Nov 27 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.20
 - Resolves: rhbz#541222 add



From caolanm at fedoraproject.org  Wed Dec  9 11:44:39 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 11:44:39 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.vcl105.patch, NONE,
	1.1 openoffice.org.spec, 1.1945, 1.1946
Message-ID: <20091209114439.14D6411C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29115/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl105.patch 
Log Message:
Resolves: rhbz#545783 add workspace.vcl105.patch

workspace.vcl105.patch:
 gtkframe.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE workspace.vcl105.patch ---
>From bd0d9d4ac9148211e14eb1548ad54829af465aed Mon Sep 17 00:00:00 2001
From: Chris Halls <halls at debian.org>
Date: Mon, 24 Aug 2009 16:44:15 +0100
Subject: [PATCH] Prevent multiple window resize calls when maximised

See http://bugs.debian.org/542387.

Problem introduced as part of fix to IZ#44325.

If KDE Window manager receives a window move after a window has already been
maximised, it assumes the window should be restored to original size. Under
Gnome it will stay maximised.

This fix disables further window resize calls once the window state has been
set to maximised.
---
 unx/gtk/window/gtkframe.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git vcl/unx/gtk/window/gtkframe.cxx b/unx/gtk/window/gtkframe.cxx
index c1fbbc5..d5e514a 100644
--- vcl.old/unx/gtk/window/gtkframe.cxx
+++ vcl/unx/gtk/window/gtkframe.cxx
@@ -1501,7 +1501,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
 
         if( isChild( false, true ) )
             gtk_widget_set_size_request( m_pWindow, nWidth, nHeight );
-        else
+        else if( ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) )
             gtk_window_resize( GTK_WINDOW(m_pWindow), nWidth, nHeight );
         setMinMaxSize();
 	}
@@ -1603,6 +1603,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
         SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
     
     if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&
+        ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) &&
         (pState->mnState & SAL_FRAMESTATE_MAXIMIZED) &&
         (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask )
     {
-- 
1.6.3.3



Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1945
retrieving revision 1.1946
diff -u -p -r1.1945 -r1.1946
--- openoffice.org.spec	28 Nov 2009 17:58:12 -0000	1.1945
+++ openoffice.org.spec	9 Dec 2009 11:44:38 -0000	1.1946
@@ -163,6 +163,7 @@ Patch87: openoffice.org-3.2.0.ooo106523.
 Patch88: workspace.impress183.patch
 Patch89: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 Patch90: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch91: workspace.vcl105.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1684,6 +1685,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch88 -p0 -b .workspace.impress183.patch
 %patch89 -p1 -b .ooo107151.sc.pop-empty-cell.patch
 %patch90 -p0 -b .ooo102645.fix.es.patch
+%patch91 -p0 -b .workspace.vcl105.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4187,10 +4189,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sat Nov 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
+* Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
 - add openoffice.org-4.2.0.ooo107151.sc.pop-empty-cell.patch (dtardon)
 - Resolves: rhbz#533538 OpenOffice keyboard shortcuts mis-map in the
   Spanish localized version of OOo (caolanm)
+- Resolves: rhbz#545783 add workspace.vcl105.patch (caolanm)
 
 * Tue Nov 10 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
 - Resolves: rhbz#533841 ooo#105710 svx loadstorenumbering (caolanm)



From dsd at fedoraproject.org  Wed Dec  9 11:46:01 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 11:46:01 +0000 (UTC)
Subject: rpms/olpc-switch-desktop/devel olpc-switch-desktop.spec,1.3,1.4
Message-ID: <20091209114601.B0FEE11C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-switch-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29715

Modified Files:
	olpc-switch-desktop.spec 
Log Message:
build requires intltool


Index: olpc-switch-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/devel/olpc-switch-desktop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- olpc-switch-desktop.spec	9 Dec 2009 11:36:52 -0000	1.3
+++ olpc-switch-desktop.spec	9 Dec 2009 11:46:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		olpc-switch-desktop
 Version:	0.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	OLPC desktop switching utilities
 
 License:	GPLv2+
@@ -10,7 +10,7 @@ Source0:	http://dev.laptop.org/~dsd/olpc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-BuildRequires:	gettext, desktop-file-utils
+BuildRequires:	gettext, desktop-file-utils, intltool
 Requires:		python, sugar, gtk2, desktop-file-utils, dbus
 
 
@@ -59,6 +59,9 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Daniel Drake <dsd at laptop.org> - 0.7-2
+- build requires intltool
+
 * Wed Dec  9 2009 Daniel Drake <dsd at laptop.org> - 0.7-1
 - Updated translations
 



From dsd at fedoraproject.org  Wed Dec  9 11:46:21 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 11:46:21 +0000 (UTC)
Subject: rpms/olpc-switch-desktop/F-12 .cvsignore, 1.2,
	1.3 olpc-switch-desktop.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091209114621.775BA11C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-switch-desktop/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29957

Modified Files:
	.cvsignore olpc-switch-desktop.spec sources 
Log Message:
v0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Jul 2009 09:23:49 -0000	1.2
+++ .cvsignore	9 Dec 2009 11:46:21 -0000	1.3
@@ -1 +1 @@
-olpc-switch-desktop-0.6.tar.bz2
+olpc-switch-desktop-0.7.tar.bz2


Index: olpc-switch-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/F-12/olpc-switch-desktop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- olpc-switch-desktop.spec	25 Jul 2009 20:39:57 -0000	1.2
+++ olpc-switch-desktop.spec	9 Dec 2009 11:46:21 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		olpc-switch-desktop
-Version:	0.6
-Release:	2%{?dist}
+Version:	0.7
+Release:	1%{?dist}
 Summary:	OLPC desktop switching utilities
 
 License:	GPLv2+
@@ -10,7 +10,7 @@ Source0:	http://dev.laptop.org/~dsd/olpc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-BuildRequires:	gettext, desktop-file-utils
+BuildRequires:	gettext, desktop-file-utils, intltool
 Requires:		python, sugar, gtk2, desktop-file-utils, dbus
 
 
@@ -59,6 +59,9 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Daniel Drake <dsd at laptop.org> - 0.7-1
+- Updated translations
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 09:23:50 -0000	1.2
+++ sources	9 Dec 2009 11:46:21 -0000	1.3
@@ -1 +1 @@
-bdbaebbb51274be96506156f94c07d76  olpc-switch-desktop-0.6.tar.bz2
+2f48e1f919785b68de006452a526a075  olpc-switch-desktop-0.7.tar.bz2



From tbzatek at fedoraproject.org  Wed Dec  9 11:49:29 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed,  9 Dec 2009 11:49:29 +0000 (UTC)
Subject: rpms/sabayon/devel .cvsignore, 1.25, 1.26 sabayon.spec, 1.66,
	1.67 sources, 1.25, 1.26
Message-ID: <20091209114929.B245C11C00E0@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30831

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
* Wed Dec  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.2-1
- Update to 2.29.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	27 Oct 2009 13:25:04 -0000	1.25
+++ .cvsignore	9 Dec 2009 11:49:29 -0000	1.26
@@ -1 +1 @@
-sabayon-2.29.0.tar.bz2
+sabayon-2.29.2.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sabayon.spec	27 Oct 2009 13:25:04 -0000	1.66
+++ sabayon.spec	9 Dec 2009 11:49:29 -0000	1.67
@@ -7,7 +7,7 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.29.0
+Version: 2.29.2
 Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
@@ -204,8 +204,8 @@ fi
 %ghost %{python_sitearch}/%{name}/sources/*.pyo
 
 %files
-%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
-%doc doc/sabayon.css doc/*.jpg doc/*.gif
+%doc %{_datadir}/gnome/help/sabayon/*
+%doc %{_datadir}/omf/sabayon/*
 
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
@@ -272,6 +272,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Wed Dec  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.2-1
+- Update to 2.29.2
+
 * Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.0-1
 - Update to 2.29.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	27 Oct 2009 13:25:04 -0000	1.25
+++ sources	9 Dec 2009 11:49:29 -0000	1.26
@@ -1 +1 @@
-2ced41d5025651b07911c72931358663  sabayon-2.29.0.tar.bz2
+961b7d2fcc196256e82a0fd80acbdee4  sabayon-2.29.2.tar.bz2



From mlichvar at fedoraproject.org  Wed Dec  9 11:49:29 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  9 Dec 2009 11:49:29 +0000 (UTC)
Subject: rpms/ntp/F-11 ntp-4.2.4p7-mode7dos.patch, NONE, 1.1 ntp.spec, 1.90,
	1.91
Message-ID: <20091209114929.84E8411C00E0@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30809

Modified Files:
	ntp.spec 
Added Files:
	ntp-4.2.4p7-mode7dos.patch 
Log Message:
- fix DoS with mode 7 packets (#545557, CVE-2009-3563)


ntp-4.2.4p7-mode7dos.patch:
 ntp_request.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE ntp-4.2.4p7-mode7dos.patch ---
# This is a BitKeeper generated diff -Nru style patch.
#
# ntpd/ntp_request.c
#   2009/10/07 01:33:21+00:00 davehart at shiny.ad.hartbrothers.com +9 -2
#   [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.
#
diff -Nrpu a/ntpd/ntp_request.c b/ntpd/ntp_request.c
--- a/ntpd/ntp_request.c	2009-10-14 19:52:16 +00:00
+++ b/ntpd/ntp_request.c	2009-10-14 19:52:16 +00:00
@@ -409,6 +409,7 @@ process_private(
 	int mod_okay
 	)
 {
+	static u_long quiet_until;
 	struct req_pkt *inpkt;
 	struct req_pkt_tail *tailinpkt;
 	struct sockaddr_storage *srcadr;
@@ -444,8 +445,14 @@ process_private(
 	    || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
 	    || (++ec, rbufp->recv_length < REQ_LEN_HDR)
 		) {
-		msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
-		req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
+		NLOG(NLOG_SYSEVENT)
+			if (current_time >= quiet_until) {
+				msyslog(LOG_ERR,
+					"process_private: drop test %d"
+					" failed, pkt from %s",
+					ec, stoa(srcadr));
+				quiet_until = current_time + 60;
+			}
 		return;
 	}



Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-11/ntp.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- ntp.spec	28 May 2009 18:51:50 -0000	1.90
+++ ntp.spec	9 Dec 2009 11:49:29 -0000	1.91
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p7
-Release: 2%{?dist}
+Release: 3%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -100,6 +100,8 @@ Patch28: ntp-4.2.4p7-nano.patch
 Patch29: ntp-4.2.4p7-minpoll.patch
 # fix frequency mode, backported from 4.2.5
 Patch30: ntp-4.2.4p7-freqmode.patch
+# fix DoS with mode 7 packets 
+Patch31: ntp-4.2.4p7-mode7dos.patch
 
 URL: http://www.ntp.org
 Requires(post): /sbin/chkconfig
@@ -181,6 +183,7 @@ This package contains NTP documentation 
 %patch28 -p1 -b .nano
 %patch29 -p1 -b .minpoll
 %patch30 -p1 -b .freqmode
+%patch31 -p1 -b .mode7dos
 
 # clock_gettime needs -lrt
 sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in
@@ -360,6 +363,9 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Wed Dec 09 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-3
+- fix DoS with mode 7 packets (#545557, CVE-2009-3563)
+
 * Thu May 28 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-2
 - fix frequency calculation when starting with no drift file
 - reduce phase adjustments beyond Allan intercept in daemon PLL



From dsd at fedoraproject.org  Wed Dec  9 11:51:08 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 11:51:08 +0000 (UTC)
Subject: rpms/olpc-switch-desktop/F-11 .cvsignore, 1.2,
	1.3 olpc-switch-desktop.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091209115108.74EA211C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-switch-desktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31378

Modified Files:
	.cvsignore olpc-switch-desktop.spec sources 
Log Message:
v0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Jul 2009 09:31:59 -0000	1.2
+++ .cvsignore	9 Dec 2009 11:51:08 -0000	1.3
@@ -1 +1 @@
-olpc-switch-desktop-0.6.tar.bz2
+olpc-switch-desktop-0.7.tar.bz2


Index: olpc-switch-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/F-11/olpc-switch-desktop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- olpc-switch-desktop.spec	16 Jul 2009 09:31:59 -0000	1.1
+++ olpc-switch-desktop.spec	9 Dec 2009 11:51:08 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		olpc-switch-desktop
-Version:	0.6
+Version:	0.7
 Release:	1%{?dist}
 Summary:	OLPC desktop switching utilities
 
@@ -10,7 +10,7 @@ Source0:	http://dev.laptop.org/~dsd/olpc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-BuildRequires:	gettext, desktop-file-utils
+BuildRequires:	gettext, desktop-file-utils, intltool
 Requires:		python, sugar, gtk2, desktop-file-utils, dbus
 
 
@@ -59,6 +59,9 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Daniel Drake <dsd at laptop.org> - 0.7-1
+- Updated translations
+
 * Wed Jul 15 2009 Daniel Drake <dsd at laptop.org> - 0.6-1
 - Initial import
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-switch-desktop/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 09:31:59 -0000	1.2
+++ sources	9 Dec 2009 11:51:08 -0000	1.3
@@ -1 +1 @@
-bdbaebbb51274be96506156f94c07d76  olpc-switch-desktop-0.6.tar.bz2
+2f48e1f919785b68de006452a526a075  olpc-switch-desktop-0.7.tar.bz2



From mlichvar at fedoraproject.org  Wed Dec  9 11:55:19 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  9 Dec 2009 11:55:19 +0000 (UTC)
Subject: rpms/ntp/F-10 ntp-4.2.4p7-mode7dos.patch, NONE, 1.1 ntp.spec, 1.85,
	1.86
Message-ID: <20091209115519.A455411C00E0@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32428

Modified Files:
	ntp.spec 
Added Files:
	ntp-4.2.4p7-mode7dos.patch 
Log Message:
- fix DoS with mode 7 packets (#545557, CVE-2009-3563)


ntp-4.2.4p7-mode7dos.patch:
 ntp_request.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE ntp-4.2.4p7-mode7dos.patch ---
# This is a BitKeeper generated diff -Nru style patch.
#
# ntpd/ntp_request.c
#   2009/10/07 01:33:21+00:00 davehart at shiny.ad.hartbrothers.com +9 -2
#   [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.
#
diff -Nrpu a/ntpd/ntp_request.c b/ntpd/ntp_request.c
--- a/ntpd/ntp_request.c	2009-10-14 19:52:16 +00:00
+++ b/ntpd/ntp_request.c	2009-10-14 19:52:16 +00:00
@@ -409,6 +409,7 @@ process_private(
 	int mod_okay
 	)
 {
+	static u_long quiet_until;
 	struct req_pkt *inpkt;
 	struct req_pkt_tail *tailinpkt;
 	struct sockaddr_storage *srcadr;
@@ -444,8 +445,14 @@ process_private(
 	    || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
 	    || (++ec, rbufp->recv_length < REQ_LEN_HDR)
 		) {
-		msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
-		req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
+		NLOG(NLOG_SYSEVENT)
+			if (current_time >= quiet_until) {
+				msyslog(LOG_ERR,
+					"process_private: drop test %d"
+					" failed, pkt from %s",
+					ec, stoa(srcadr));
+				quiet_until = current_time + 60;
+			}
 		return;
 	}



Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-10/ntp.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ntp.spec	19 May 2009 15:43:28 -0000	1.85
+++ ntp.spec	9 Dec 2009 11:55:19 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p7
-Release: 1%{?dist}
+Release: 2%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -91,6 +91,8 @@ Patch25: ntp-4.2.4p5-rtnetlink.patch
 Patch26: ntp-4.2.4p7-stamode.patch
 # ntpbz #808
 Patch27: ntp-4.2.4p5-driftonexit.patch
+# fix DoS with mode 7 packets 
+Patch31: ntp-4.2.4p7-mode7dos.patch
 
 URL: http://www.ntp.org
 Requires(post): /sbin/chkconfig
@@ -157,6 +159,7 @@ NTP servers.
 %patch25 -p1 -b .rtnetlink
 %patch26 -p1 -b .stamode
 %patch27 -p1 -b .driftonexit
+%patch31 -p1 -b .mode7dos
 
 # clock_gettime needs -lrt
 sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in
@@ -323,6 +326,9 @@ fi
 %{_mandir}/man8/ntpdate.8*
 
 %changelog
+* Wed Dec 09 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-2
+- fix DoS with mode 7 packets (#545557, CVE-2009-3563)
+
 * Tue May 19 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-1
 - update to 4.2.4p7 (CVE-2009-1252, CVE-2009-0159)
 - don't log STA_MODE changes



From dsd at fedoraproject.org  Wed Dec  9 11:55:39 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 11:55:39 +0000 (UTC)
Subject: File sugar-toolkit-0.84.7.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091209115539.C39B710F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar-toolkit:

c0a4d413add78de90e99360f38a4534b  sugar-toolkit-0.84.7.tar.bz2



From beekhof at fedoraproject.org  Wed Dec  9 11:57:47 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed,  9 Dec 2009 11:57:47 +0000 (UTC)
Subject: File 66b7bfd467f3.patch uploaded to lookaside cache by beekhof
Message-ID: <20091209115747.999A410F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pacemaker:

de83e10d71d85f06882fe60998d91207  66b7bfd467f3.patch



From dsd at fedoraproject.org  Wed Dec  9 11:58:12 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 11:58:12 +0000 (UTC)
Subject: rpms/sugar-toolkit/F-11 .cvsignore, 1.35, 1.36 sources, 1.39,
	1.40 sugar-toolkit.spec, 1.49, 1.50
Message-ID: <20091209115812.7667911C00E0@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/sugar-toolkit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv905

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
v0.84.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	2 Dec 2009 12:39:30 -0000	1.35
+++ .cvsignore	9 Dec 2009 11:58:12 -0000	1.36
@@ -1 +1 @@
-sugar-toolkit-0.84.6.tar.bz2
+sugar-toolkit-0.84.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	2 Dec 2009 12:39:30 -0000	1.39
+++ sources	9 Dec 2009 11:58:12 -0000	1.40
@@ -1 +1 @@
-e81f9fd3828672034cbdb5b11077427c  sugar-toolkit-0.84.6.tar.bz2
+c0a4d413add78de90e99360f38a4534b  sugar-toolkit-0.84.7.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/sugar-toolkit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sugar-toolkit.spec	2 Dec 2009 12:39:31 -0000	1.49
+++ sugar-toolkit.spec	9 Dec 2009 11:58:12 -0000	1.50
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.84.6
+Version: 0.84.7
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Dec  9 2009 Daniel Drake <dsd at laptop.org> - 0.84.7-1
+- Fix bold font style
+
 * Wed Dec  2 2009 Daniel Drake <dsd at laptop.org> - 0.84.6-1
 * New bugfix release
 



From tbzatek at fedoraproject.org  Wed Dec  9 12:02:39 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed,  9 Dec 2009 12:02:39 +0000 (UTC)
Subject: rpms/sabayon/F-12 sabayon-2.29.2-paneldelegate-race.patch, NONE,
	1.1 sabayon.spec, 1.66, 1.67
Message-ID: <20091209120239.2729411C00E0@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2320

Modified Files:
	sabayon.spec 
Added Files:
	sabayon-2.29.2-paneldelegate-race.patch 
Log Message:
* Wed Dec  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-2
- Fixed race conditions while catching panel events


sabayon-2.29.2-paneldelegate-race.patch:
 paneldelegate.py |  142 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 75 insertions(+), 67 deletions(-)

--- NEW FILE sabayon-2.29.2-paneldelegate-race.patch ---
>From a6c991fae5dbf5b110b2aec47245e74a700f2347 Mon Sep 17 00:00:00 2001
From: Scott Balneaves <sbalneav at ltsp.org>
Date: Mon, 07 Dec 2009 19:17:08 +0000
Subject: Fixed race conditions in paneldelegate.py at the expense of some nicer log printing

---
diff --git a/lib/sources/paneldelegate.py b/lib/sources/paneldelegate.py
index 8386823..6087f5c 100755
--- a/lib/sources/paneldelegate.py
+++ b/lib/sources/paneldelegate.py
@@ -74,63 +74,69 @@ class PanelAppletAddedChange (PanelChange):
     def __init__ (self, source, delegate, id):
         PanelChange.__init__ (self, source, delegate, id)
     def get_short_description (self):
+        return _("Applet '%s' added" % self.id)
         # FIXME: This only works if panel object type is bonobo-applet. Are all applets bonobo-applets ?
-        panel_applet = self.delegate.PanelApplet(self.delegate, self.id)
-        toplevel_id = panel_applet.toplevel_id
-        name = panel_applet.name
-
-        panel_toplevel = self.delegate.PanelToplevel(self.delegate, toplevel_id)
-        panel_orientation = panel_toplevel.orientation
-
-        if panel_orientation == "top":
-            return _("Applet %s added to top panel") % name
-        elif panel_orientation == "bottom":
-            return _("Applet %s added to bottom panel") % name
-        elif panel_orientation == "left":
-            return _("Applet %s added to left panel") % name
-        else:
-            return _("Applet %s added to right panel") % name
+        # FIXME: Race condition with the code below.
+        # panel_applet = self.delegate.PanelApplet(self.delegate, self.id)
+        # toplevel_id = panel_applet.toplevel_id
+        # name = panel_applet.name
+
+        # panel_toplevel = self.delegate.PanelToplevel(self.delegate, toplevel_id)
+        # panel_orientation = panel_toplevel.orientation
+
+        # if panel_orientation == "top":
+        #     return _("Applet %s added to top panel") % name
+        # elif panel_orientation == "bottom":
+        #     return _("Applet %s added to bottom panel") % name
+        # elif panel_orientation == "left":
+        #     return _("Applet %s added to left panel") % name
+        # else:
+        #     return _("Applet %s added to right panel") % name
 
 class PanelAppletRemovedChange (PanelChange):
     def __init__ (self, source, delegate, id):
         PanelChange.__init__ (self, source, delegate, id)
     def get_short_description (self):
+        return _("Applet '%s' removed" % self.id)
         # FIXME: This only works if panel object type is bonobo-applet. Are all applets bonobo-applets ?
-        panel_applet = self.delegate.PanelApplet(self.delegate, self.id)
-        toplevel_id = panel_applet.toplevel_id
-        name = panel_applet.name
-
-        panel_toplevel = self.delegate.PanelToplevel(self.delegate, toplevel_id)
-        panel_orientation = panel_toplevel.orientation
-
-        if panel_orientation == "top":
-            return _("Applet %s removed from top panel") % name
-        elif panel_orientation == "bottom":
-            return _("Applet %s removed from bottom panel") % name
-        elif panel_orientation == "left":
-            return _("Applet %s removed from left panel") % name
-        else:
-            return _("Applet %s removed from right panel") % name
+        # FIXME: Race condition with the code below.
+        # panel_applet = self.delegate.PanelApplet(self.delegate, self.id)
+        # toplevel_id = panel_applet.toplevel_id
+        # name = panel_applet.name
+
+        # panel_toplevel = self.delegate.PanelToplevel(self.delegate, toplevel_id)
+        # panel_orientation = panel_toplevel.orientation
+
+        # if panel_orientation == "top":
+        #     return _("Applet %s removed from top panel") % name
+        # elif panel_orientation == "bottom":
+        #     return _("Applet %s removed from bottom panel") % name
+        # elif panel_orientation == "left":
+        #     return _("Applet %s removed from left panel") % name
+        # else:
+        #     return _("Applet %s removed from right panel") % name
 
 class PanelObjectAddedChange (PanelChange):
     def __init__ (self, source, delegate, id):
         PanelChange.__init__ (self, source, delegate, id)
     def get_short_description (self):
-        panel_object = self.delegate.PanelObject(self.delegate, self.id)
-        toplevel_id = panel_object.toplevel_id
-        name = panel_object.name
-
-        panel_toplevel = self.delegate.PanelToplevel(self.delegate, toplevel_id)
-        panel_orientation = panel_toplevel.orientation
-
-        if panel_orientation == "top":
-            return _("%s added to top panel") % name
-        elif panel_orientation == "bottom":
-            return _("%s added to bottom panel") % name
-        elif panel_orientation == "left":
-            return _("%s added to left panel") % name
-        else:
-            return _("%s added to right panel") % name
+        return _("Object '%s' added" % self.id)
+        # FIXME: Race condition with code below.
+        # panel_object = self.delegate.PanelObject(self.delegate, self.id)
+        # toplevel_id = panel_object.toplevel_id
+        # name = panel_object.name
+
+        # panel_toplevel = self.delegate.PanelToplevel(self.delegate, toplevel_id)
+        # panel_orientation = panel_toplevel.orientation
+
+        # if panel_orientation == "top":
+        #     return _("%s added to top panel") % name
+        # elif panel_orientation == "bottom":
+        #     return _("%s added to bottom panel") % name
+        # elif panel_orientation == "left":
+        #     return _("%s added to left panel") % name
+        # else:
+        #     return _("%s added to right panel") % name
 
     def commit_change (self, mandatory):
         # Might have to commit a launcher file
@@ -143,21 +149,23 @@ class PanelObjectRemovedChange (PanelChange):
     def __init__ (self, source, delegate, id):
         PanelChange.__init__ (self, source, delegate, id)
     def get_short_description (self):
-        panel_object = self.delegate.PanelObject(self.delegate, self.id)
-        toplevel_id = panel_object.toplevel_id
-        name = panel_object.name
-
-        panel_toplevel = self.delegate.PanelToplevel(self.delegate, toplevel_id)
-        panel_orientation = panel_toplevel.orientation
-
-        if panel_orientation == "top":
-            return _("%s removed from top panel") % name
-        elif panel_orientation == "bottom":
-            return _("%s removed from bottom panel") % name
-        elif panel_orientation == "left":
-            return _("%s removed from left panel") % name
-        else:
-            return _("%s removed from right panel") % name
+        return _("Object '%s' removed" % self.id)
+        # FIXME: Race condition with code below.
+        # panel_object = self.delegate.PanelObject(self.delegate, self.id)
+        # toplevel_id = panel_object.toplevel_id
+        # name = panel_object.name
+
+        # panel_toplevel = self.delegate.PanelToplevel(self.delegate, toplevel_id)
+        # panel_orientation = panel_toplevel.orientation
+
+        # if panel_orientation == "top":
+        #     return _("%s removed from top panel") % name
+        # elif panel_orientation == "bottom":
+        #     return _("%s removed from bottom panel") % name
+        # elif panel_orientation == "left":
+        #     return _("%s removed from left panel") % name
+        # else:
+        #     return _("%s removed from right panel") % name
 
     def commit_change (self, mandatory):
         launcher = self.delegate.get_gconf_client ().get_string (PANEL_KEY_BASE + "/objects/" + self.id + "/launcher_location")
@@ -208,12 +216,13 @@ class PanelDelegate (userprofile.SourceDelegate):
                     id,
                     toplevel_key_name, self.toplevel_id,
                     bonobo_iid_key_name, self.bonobo_iid)
-
-            applet = bonobo.activation.query("iid == '" + self.bonobo_iid + "'" )
-            for i in applet:
-                for prop in i.props:
-                    if prop.name == "name":
-                        self.name = prop.v.value_string #FIXME: This probably won't return localised names
+            
+            if self.bonobo_iid:
+                applet = bonobo.activation.query("iid == '" + self.bonobo_iid + "'" )
+                for i in applet:
+                    for prop in i.props:
+                        if prop.name == "name":
+                            self.name = prop.v.value_string #FIXME: This probably won't return localised names
 
 
 
--
cgit v0.8.2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-12/sabayon.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sabayon.spec	27 Oct 2009 10:46:16 -0000	1.66
+++ sabayon.spec	9 Dec 2009 12:02:38 -0000	1.67
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -18,6 +18,9 @@ Source:  http://ftp.gnome.org/pub/GNOME/
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
+# from upstream
+Patch1:  sabayon-2.29.2-paneldelegate-race.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=486218 
 Patch3:  selinux.patch
 
@@ -88,6 +91,7 @@ that need to be installed on the client 
 %prep
 %setup -q
 
+%patch1 -p1 -b .race
 %patch3 -p1 -b .selinux
 
 
@@ -269,6 +273,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Wed Dec  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-2
+- Fixed race conditions while catching panel events
+
 * Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 



From beekhof at fedoraproject.org  Wed Dec  9 12:02:45 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed,  9 Dec 2009 12:02:45 +0000 (UTC)
Subject: rpms/pacemaker/F-12 .cvsignore, 1.6, 1.7 pacemaker.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20091209120245.568AB11C00E0@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/pacemaker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2376

Modified Files:
	.cvsignore pacemaker.spec sources 
Log Message:
Minor patch to allow a cluster name to be specified in corosync.conf


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	29 Oct 2009 12:57:05 -0000	1.6
+++ .cvsignore	9 Dec 2009 12:02:45 -0000	1.7
@@ -1 +1,2 @@
 ee19d8e83c2a.tar.bz2
+66b7bfd467f3.patch


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/pacemaker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pacemaker.spec	29 Oct 2009 12:57:05 -0000	1.8
+++ pacemaker.spec	9 Dec 2009 12:02:45 -0000	1.9
@@ -4,7 +4,7 @@
 %global with_heartbeat_support	1
 %global pcmk_docdir %{_docdir}/%{name}
 
-%global specversion 4
+%global specversion 5
 %global upstream_version ee19d8e83c2a
 %global upstream_prefix Pacemaker-1-0-
 
@@ -25,6 +25,8 @@ License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
 Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstream_version}.tar.bz2
+Patch1:		66b7bfd467f3.patch
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:	on
 Requires(pre):	cluster-glue
@@ -105,6 +107,7 @@ resource health.
 
 %prep
 %setup -q -n %{upstream_prefix}%{upstream_version}
+%patch1 -p1
 
 %build
 ./autogen.sh
@@ -220,6 +223,10 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Wed Dec 9 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-5
+- Include patch of changeset 66b7bfd467f3:
+  Some clients such as gfs_controld want a cluster name, allow one to be specified in corosync.conf
+
 * Thu Oct 29 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-4
 - Include the fixes from CoroSync integration testing
 - Move the resource templates - they're not documentation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Oct 2009 12:57:05 -0000	1.6
+++ sources	9 Dec 2009 12:02:45 -0000	1.7
@@ -1 +1,2 @@
 277e12a5417ff294b166225f4d7c4648  ee19d8e83c2a.tar.bz2
+de83e10d71d85f06882fe60998d91207  66b7bfd467f3.patch



From beekhof at fedoraproject.org  Wed Dec  9 12:05:08 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed,  9 Dec 2009 12:05:08 +0000 (UTC)
Subject: rpms/pacemaker/devel .cvsignore, 1.5, 1.6 pacemaker.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20091209120508.F353C11C00E0@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3150

Modified Files:
	.cvsignore pacemaker.spec sources 
Log Message:
Minor patch to allow a cluster name to be specified in corosync.conf


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 12:57:06 -0000	1.5
+++ .cvsignore	9 Dec 2009 12:05:08 -0000	1.6
@@ -1 +1,2 @@
 ee19d8e83c2a.tar.bz2
+66b7bfd467f3.patch


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pacemaker.spec	29 Oct 2009 12:57:06 -0000	1.8
+++ pacemaker.spec	9 Dec 2009 12:05:08 -0000	1.9
@@ -4,7 +4,7 @@
 %global with_heartbeat_support	1
 %global pcmk_docdir %{_docdir}/%{name}
 
-%global specversion 4
+%global specversion 5
 %global upstream_version ee19d8e83c2a
 %global upstream_prefix Pacemaker-1-0-
 
@@ -25,6 +25,8 @@ License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
 Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstream_version}.tar.bz2
+Patch1:		66b7bfd467f3.patch
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:	on
 Requires(pre):	cluster-glue
@@ -105,6 +107,7 @@ resource health.
 
 %prep
 %setup -q -n %{upstream_prefix}%{upstream_version}
+%patch1 -p1
 
 %build
 ./autogen.sh
@@ -220,6 +223,10 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Wed Dec 9 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-5
+- Include patch of changeset 66b7bfd467f3:
+  Some clients such as gfs_controld want a cluster name, allow one to be specified in corosync.conf
+
 * Thu Oct 29 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-4
 - Include the fixes from CoroSync integration testing
 - Move the resource templates - they're not documentation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Oct 2009 12:57:06 -0000	1.5
+++ sources	9 Dec 2009 12:05:08 -0000	1.6
@@ -1 +1,2 @@
 277e12a5417ff294b166225f4d7c4648  ee19d8e83c2a.tar.bz2
+de83e10d71d85f06882fe60998d91207  66b7bfd467f3.patch



From nickc at fedoraproject.org  Wed Dec  9 12:07:11 2009
From: nickc at fedoraproject.org (Nicholas Clifton)
Date: Wed,  9 Dec 2009 12:07:11 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.20.51.0.2-gas-expr.patch, NONE,
	1.1 binutils.spec, 1.184, 1.185
Message-ID: <20091209120711.F03E811C00E0@cvs1.fedora.phx.redhat.com>

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3691

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.20.51.0.2-gas-expr.patch 
Log Message:
Apply patch for PR 10856.  (BZ 544358)


binutils-2.20.51.0.2-gas-expr.patch:
 ../binutils-2.20.51.0.2.original/gas/#expr.c# |only
 ../binutils-2.20.51.0.2.original/gas/.#expr.c |only
 gas/ChangeLog                                 |    7 +++++++
 gas/expr.c                                    |   21 +++++++++++++--------
 gas/testsuite/ChangeLog                       |    4 ++++
 gas/testsuite/gas/i386/intelpic.d             |    2 +-
 6 files changed, 25 insertions(+), 9 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-gas-expr.patch ---
diff -rup ../binutils-2.20.51.0.2.original/gas/ChangeLog gas/ChangeLog
--- ../binutils-2.20.51.0.2.original/gas/ChangeLog	2009-12-09 11:46:00.000000000 +0000
+++ gas/ChangeLog	2009-12-09 11:48:31.000000000 +0000
@@ -1,3 +1,10 @@
+2009-10-28  Alan Modra  <amodra at bigpond.net.au>
+
+	PR gas/10856
+	* expr.c (resolve_expression): Only add "left" value to O_symbol
+	expression when the symbol is undefined and different from the
+	original symbol.  Simplify negative logic.
+
 2009-10-07  Nathan Sidwell  <nathan at codesourcery.com>
 
 	* config/tc-arm.c (mapping_state, mapping_state_2): Make dummy
Only in ../binutils-2.20.51.0.2.original/gas: .#expr.c
Only in ../binutils-2.20.51.0.2.original/gas: #expr.c#
diff -rup ../binutils-2.20.51.0.2.original/gas/expr.c gas/expr.c
--- ../binutils-2.20.51.0.2.original/gas/expr.c	2009-12-09 11:45:56.000000000 +0000
+++ gas/expr.c	2009-12-09 11:48:10.000000000 +0000
@@ -1997,6 +1997,7 @@ resolve_expression (expressionS *express
   /* Help out with CSE.  */
   valueT final_val = expressionP->X_add_number;
   symbolS *add_symbol = expressionP->X_add_symbol;
+  symbolS *orig_add_symbol = add_symbol;
   symbolS *op_symbol = expressionP->X_op_symbol;
   operatorT op = expressionP->X_op;
   valueT left, right;
@@ -2078,6 +2079,7 @@ resolve_expression (expressionS *express
 	      left = right;
 	      seg_left = seg_right;
 	      add_symbol = op_symbol;
+	      orig_add_symbol = expressionP->X_op_symbol;
 	      op = O_symbol;
 	      break;
 	    }
@@ -2122,18 +2124,19 @@ resolve_expression (expressionS *express
 	    {
 	      if (op == O_bit_exclusive_or || op == O_bit_inclusive_or)
 		{
-		  if (seg_right != absolute_section || right != 0)
+		  if (!(seg_right == absolute_section && right == 0))
 		    {
 		      seg_left = seg_right;
 		      left = right;
 		      add_symbol = op_symbol;
+		      orig_add_symbol = expressionP->X_op_symbol;
 		    }
 		  op = O_symbol;
 		  break;
 		}
 	      else if (op == O_left_shift || op == O_right_shift)
 		{
-		  if (seg_left != absolute_section || left != 0)
+		  if (!(seg_left == absolute_section && left == 0))
 		    {
 		      op = O_symbol;
 		      break;
@@ -2150,6 +2153,7 @@ resolve_expression (expressionS *express
 	      left = right;
 	      add_symbol = op_symbol;
 	      op = O_symbol;
+	      orig_add_symbol = expressionP->X_op_symbol;
 	      break;
 	    }
 	  else if ((op == O_multiply || op == O_divide)
@@ -2158,11 +2162,11 @@ resolve_expression (expressionS *express
 	      op = O_symbol;
 	      break;
 	    }
-	  else if (left != right
-		   || ((seg_left != reg_section || seg_right != reg_section)
-		       && (seg_left != undefined_section
-			   || seg_right != undefined_section
-			   || add_symbol != op_symbol)))
+	  else if (!(left == right
+		     && ((seg_left == reg_section && seg_right == reg_section)
+			 || (seg_left == undefined_section
+			     && seg_right == undefined_section
+			     && add_symbol == op_symbol))))
 	    return 0;
 	  else if (op == O_bit_and || op == O_bit_inclusive_or)
 	    {
@@ -2233,7 +2237,8 @@ resolve_expression (expressionS *express
 	op = O_constant;
       else if (seg_left == reg_section && final_val == 0)
 	op = O_register;
-      else if (add_symbol != expressionP->X_add_symbol)
+      else if (seg_left == undefined_section
+	       && add_symbol != orig_add_symbol)
 	final_val += left;
       expressionP->X_add_symbol = add_symbol;
     }
diff -rup ../binutils-2.20.51.0.2.original/gas/testsuite/ChangeLog gas/testsuite/ChangeLog
--- ../binutils-2.20.51.0.2.original/gas/testsuite/ChangeLog	2009-12-09 11:45:56.000000000 +0000
+++ gas/testsuite/ChangeLog	2009-12-09 11:50:11.000000000 +0000
@@ -1,3 +1,7 @@
+2009-10-28  Alan Modra  <amodra at bigpond.net.au>
+
+	* gas/i386/intelpic.d: Correct.
+
 2009-10-08  H.J. Lu  <hongjiu.lu at intel.com>
 
 	PR gas/10704
diff -rup ../binutils-2.20.51.0.2.original/gas/testsuite/gas/i386/intelpic.d gas/testsuite/gas/i386/intelpic.d
--- ../binutils-2.20.51.0.2.original/gas/testsuite/gas/i386/intelpic.d	2009-12-09 11:45:59.000000000 +0000
+++ gas/testsuite/gas/i386/intelpic.d	2009-12-09 11:49:17.000000000 +0000
@@ -12,6 +12,6 @@ Disassembly of section .text:
 0+1 <bar>:
 [ 	]*[a-f0-9]+:	8d 83 14 00 00 00    	lea    0x14\(%ebx\),%eax
 [ 	]*[a-f0-9]+:	8b 83 00 00 00 00    	mov    0x0\(%ebx\),%eax
-[ 	]*[a-f0-9]+:	ff 24 85 1a 00 00 00 	jmp    \*0x1a\(,%eax,4\)
+[ 	]*[a-f0-9]+:	ff 24 85 0d 00 00 00 	jmp    \*0xd\(,%eax,4\)
 [ 	]*[a-f0-9]+:	8d 83 14 00 00 00    	lea    0x14\(%ebx\),%eax
 #pass



Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- binutils.spec	1 Dec 2009 22:08:40 -0000	1.184
+++ binutils.spec	9 Dec 2009 12:07:11 -0000	1.185
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.20.51.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -34,6 +34,7 @@ Patch08: binutils-2.20.51.0.2-add-needed
 Patch09: binutils-2.20.51.0.2-ifunc-ld-s.patch
 Patch10: binutils-2.20.51.0.2-lwp.patch
 Patch11: binutils-2.20.51.0.2-enable-gold.patch
+Patch12: binutils-2.20.51.0.2-gas-expr.patch
 
 %define gold_arches %ix86 x86_64
 
@@ -126,6 +127,7 @@ to consider using libelf instead of BFD.
 %patch09 -p0 -b .ifunc-ld-s~
 %patch10 -p0 -b .lwp~
 %patch11 -p0 -b .enable-gold~
+%patch12 -p0 -b .gas-expr~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -423,6 +425,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Wed Dec  9 2009 Nick Clifton <nickc at redhat.com> - 2.20.51.0.2-9
+- Apply patch for PR 10856.  (BZ 544358)
+
 * Tue Dec  1 2009 Roland McGrath <roland at redhat.com> - 2.20.51.0.2-8
 - Build gold only for x86 flavors until others are tested.
 



From topdog at fedoraproject.org  Wed Dec  9 12:15:51 2009
From: topdog at fedoraproject.org (topdog)
Date: Wed,  9 Dec 2009 12:15:51 +0000 (UTC)
Subject: File dokuwiki-rc2009-12-02.tgz uploaded to lookaside cache by topdog
Message-ID: <20091209121551.B1EBF10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for dokuwiki:

65e0a7a496e1fd49fb12477211053b55  dokuwiki-rc2009-12-02.tgz



From hadess at fedoraproject.org  Wed Dec  9 12:19:19 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 12:19:19 +0000 (UTC)
Subject: rpms/gir-repository/F-12 gir-repo-install-dbus-glib.patch, NONE,
	1.1 gir-repository.spec, 1.11, 1.12
Message-ID: <20091209121919.E810C11C00E0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gir-repository/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6416

Modified Files:
	gir-repository.spec 
Added Files:
	gir-repo-install-dbus-glib.patch 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.6.5-3
- Install the DBusGlib bindings


gir-repo-install-dbus-glib.patch:
 b/gir/Makefile.am |    5 +++--
 gir/Makefile.am   |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE gir-repo-install-dbus-glib.patch ---
commit 3a2480afdf768c46ac87500f9912c0a111851b86
Author: Vincent Untz <vuntz at gnome.org>
Date:   Thu Dec 3 13:41:37 2009 +0100

    Install DBusGLib-1.0.gir if dbus build is enabled
    
    We do this instead of installing it only when mission-control build is
    enabled (which is off by default).

diff --git a/gir/Makefile.am b/gir/Makefile.am
index b7ce585..5a362b8 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -12,8 +12,7 @@ CUSTOM_GIRSOURCES += $(AVAHI_GIRSOURCES)
 endif
 EXTRA_DIST += $(AVAHI_GIRSOURCES)
 
-MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \
-			    TelepathyGLib.gir \
+MISSIONCONTROL_GIRSOURCES = TelepathyGLib.gir \
 			    LibTelepathy.gir
 if BUILD_MISSIONCONTROL
 CUSTOM_GIRSOURCES += $(MISSIONCONTROL_GIRSOURCES)
@@ -29,6 +28,8 @@ libgirepo_DBus_custom_la_SOURCES = 	\
 EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h
 
 if BUILD_DBUS
+BUILT_GIRSOURCES += DBusGLib-1.0.gir
+
 DBus-1.0.gir: libgirepo-DBus-custom.la
 	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
commit fdf6cf0d5cab34f4a69deb0e9c86a853cc50e647
Author: Dan Winship <danw at gnome.org>
Date:   Mon Dec 7 15:51:15 2009 -0500

    Move DBusGLib-1.0.gir from BUILT_GIRSOURCES to CUSTOM_GIRSOURCES
    
    fixes "make clean; make"

diff --git a/gir/Makefile.am b/gir/Makefile.am
index 5a362b8..40bb44b 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -28,7 +28,7 @@ libgirepo_DBus_custom_la_SOURCES = 	\
 EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h
 
 if BUILD_DBUS
-BUILT_GIRSOURCES += DBusGLib-1.0.gir
+CUSTOM_GIRSOURCES += DBusGLib-1.0.gir
 
 DBus-1.0.gir: libgirepo-DBus-custom.la
 	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \


Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/F-12/gir-repository.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gir-repository.spec	9 Sep 2009 20:16:27 -0000	1.11
+++ gir-repository.spec	9 Dec 2009 12:19:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gir-repository
 Version:        0.6.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Introspection for GNOME libraries
 
 Group:          Development/Libraries
@@ -30,12 +30,9 @@ BuildRequires:  unique-devel
 BuildRequires:  vte-devel
 BuildRequires:  WebKit-gtk-devel
 
-# Add these for autoreconf due to gst patch
-BuildRequires: intltool
-BuildRequires: gettext
-BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
+# https://bugzilla.gnome.org/show_bug.cgi?id=604167
+Patch0:        gir-repo-install-dbus-glib.patch
+BuildRequires: autoconf automake libtool gettext intltool
 
 %description
 Introspection system for GNOME libraries; see the gobject-introspection package.
@@ -51,6 +48,7 @@ Libraries and headers for gir-repository
 
 %prep
 %setup -q
+%patch0 -p1 -b .dbus-glib
 
 %build
 autoreconf
@@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.6.5-3
+- Install the DBusGlib bindings
+
 * Wed Sep 09 2009 Colin Walters <walters at verbum.org> - 0.6.5-2
 - rebuilt
 



From tmraz at fedoraproject.org  Wed Dec  9 12:34:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  9 Dec 2009 12:34:38 +0000 (UTC)
Subject: rpms/workrave/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 workrave.spec, 1.22, 1.23 workrave-1.9.0-gcc44.patch, 1.1, NONE
Message-ID: <20091209123438.7559111C00E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10035

Modified Files:
	.cvsignore sources workrave.spec 
Removed Files:
	workrave-1.9.0-gcc44.patch 
Log Message:
* Tue Dec  9 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.1-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Sep 2008 13:14:06 -0000	1.7
+++ .cvsignore	9 Dec 2009 12:34:37 -0000	1.8
@@ -1 +1 @@
-workrave-1.9.0-3.tar.gz
+workrave-1.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Sep 2008 13:14:06 -0000	1.7
+++ sources	9 Dec 2009 12:34:38 -0000	1.8
@@ -1 +1 @@
-aaf7371db1200d65b255d95abd5d1fd1  workrave-1.9.0-3.tar.gz
+065775ee4fdb3e21e12cbf0907d31b88  workrave-1.9.1.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- workrave.spec	27 Jul 2009 07:25:38 -0000	1.22
+++ workrave.spec	9 Dec 2009 12:34:38 -0000	1.23
@@ -1,14 +1,12 @@
 Name: workrave
-Version: 1.9.0
-Release: 4%{?dist}
+Version: 1.9.1
+Release: 1%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag at wieers.com> and Steve Ratcliffe
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
-# For some reason the upstream tarball contains the -3 added to the version.
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-3.tar.gz
-Patch1: workrave-1.9.0-gcc44.patch
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -32,7 +30,6 @@ take micro-pauses, rest breaks and restr
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .gcc44
 
 %build
 if [ ! -x configure ]; then
@@ -76,6 +73,9 @@ desktop-file-install --vendor fedora    
 %{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
+* Tue Dec  9 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.1-1
+- new upstream version
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- workrave-1.9.0-gcc44.patch DELETED ---



From caolanm at fedoraproject.org  Wed Dec  9 12:34:58 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 12:34:58 +0000 (UTC)
Subject: rpms/planner/F-12 planner-gnome604169-comboboxentry.patch, NONE,
	1.1 planner.spec, 1.70, 1.71
Message-ID: <20091209123458.5601F11C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10195

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604169-comboboxentry.patch 
Log Message:
Resolves: rhbz#545711 use GtkComboBoxEntry instead of GtkCombo

planner-gnome604169-comboboxentry.patch:
 data/glade/add-predecessor.glade |   58 +++++++++----------------------
 src/planner-task-dialog.c        |   72 ++++++++++++++++-----------------------
 2 files changed, 49 insertions(+), 81 deletions(-)

--- NEW FILE planner-gnome604169-comboboxentry.patch ---
diff -ru planner-0.14.4.orig/data/glade/add-predecessor.glade planner-0.14.4/data/glade/add-predecessor.glade
--- planner-0.14.4.orig/data/glade/add-predecessor.glade	2009-12-09 11:28:46.000000000 +0000
+++ planner-0.14.4/data/glade/add-predecessor.glade	2009-12-09 11:34:54.000000000 +0000
@@ -88,7 +88,6 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">combo-entry1</property>
 	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 	      <property name="width_chars">-1</property>
 	      <property name="single_line_mode">False</property>
@@ -162,6 +161,7 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="mnemonic_widget">lag_entry</property>
 	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 	      <property name="width_chars">-1</property>
 	      <property name="single_line_mode">False</property>
@@ -178,45 +178,6 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkCombo" id="predecessor_combo">
-	      <property name="visible">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="combo-entry1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <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>
-		</widget>
-	      </child>
-
-	      <child internal-child="list">
-		<widget class="GtkList" id="combo-list1">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
 	    <widget class="GtkEntry" id="lag_entry">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
@@ -236,6 +197,23 @@
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkComboBoxEntry" id="predecessor_combo">
+	      <property name="visible">True</property>
+	      <property name="add_tearoffs">False</property>
+	      <property name="has_frame">True</property>
+	      <property name="focus_on_click">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
--- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-09 11:28:46.000000000 +0000
+++ planner-0.14.4/src/planner-task-dialog.c	2009-12-09 12:12:55.000000000 +0000
@@ -350,58 +350,43 @@
 #endif
 
 static void
-task_dialog_task_combo_select_child_cb (GtkList   *list,
-					GtkWidget *item,
-					GtkCombo  *combo)
-{
-	MrpTask *task;
-
-	task = g_object_get_data (G_OBJECT (item), "task");
-	fprintf(stderr, "task_dialog_setup_task_combo child %p, had task %p\n", item, task);
-	g_object_set_data (G_OBJECT (combo), "selected_task", task);
-}
-
-static void
-task_dialog_setup_task_combo (GtkCombo *combo,
+task_dialog_setup_task_combo (GtkComboBoxEntry *combo,
 			      GList    *tasks)
 {
-	GList       *strings;
-	GList       *children;
-	GList       *l;
-	const gchar *name;
+	GtkListStore *store;
+	GtkTreeIter iter;
+	GtkCellRenderer *renderer;
+	GList        *l;
+	const gchar  *name;
 	
 	if (tasks == NULL) {
 		return;
 	}
+
+	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
 	
-	strings = NULL;
 	for (l = tasks; l; l = l->next) {
+		gtk_list_store_append (store, &iter);
 		name = mrp_task_get_name (l->data);
 		if (name == NULL || name[0] == 0) {
-			strings = g_list_prepend (strings,
-						  _("(No name)"));
+			gtk_list_store_set (store, &iter,
+					    0, _("(No name)"),
+					    1, l->data,
+					    -1);
 		} else {
-			strings = g_list_prepend (strings, (gchar*) name);
+			gtk_list_store_set (store, &iter,
+					    0, name,
+					    1, l->data,
+					    -1);
 		}
 	}
 
-	strings = g_list_reverse (strings);
-	gtk_combo_set_popdown_strings (combo, strings);
-	g_list_free (strings);
-	
-	g_object_set_data (G_OBJECT (combo), "selected_task", tasks->data);
-	
-	children = GTK_LIST (combo->list)->children;
-	for (l = children; l; l = l->next) {
-		g_object_set_data (G_OBJECT (l->data), "task", tasks->data);
-		fprintf(stderr, "child %p, given task %p\n", l, tasks->data);
-		tasks = tasks->next;
-	}
-	
-	g_signal_connect (combo->list,
-			  "select-child",
-			  G_CALLBACK (task_dialog_task_combo_select_child_cb),
-			  combo);
+	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), 
+				 GTK_TREE_MODEL (store));
+
+	gtk_combo_box_entry_set_text_column (combo, 0);
+
+	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 }
 
 static gboolean
@@ -1908,7 +1893,7 @@
 	
 	tasks = mrp_project_get_all_tasks (project);
 	tasks = g_list_remove (tasks, task);
-	task_dialog_setup_task_combo (GTK_COMBO (w), tasks);
+	task_dialog_setup_task_combo (GTK_COMBO_BOX_ENTRY (w), tasks);
 	
 	w = glade_xml_get_widget (glade, "type_optionmenu");
 	g_object_set_data (G_OBJECT (dialog), "type_optionmenu", w);
@@ -1949,10 +1934,11 @@
 	GtkWidget     *w;
 	GError        *error = NULL;
 	MrpTask       *task_main;
-	MrpTask       *new_task_pred; 
+	MrpTask       *new_task_pred=NULL; 
 	MrpProject    *project; 
 	gint           lag;
 	gint           pred_type; 
+	GtkTreeIter    iter;
 	const gchar   *str;
 	
 	main_window = g_object_get_data (G_OBJECT (dialog), "main_window");
@@ -1972,7 +1958,11 @@
 	/* Predecessor task. */
 	w = g_object_get_data (G_OBJECT (dialog), "predecessor_combo");
 
-	new_task_pred = g_object_get_data (G_OBJECT (w), "selected_task");
+	if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &iter)) {
+		gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (w)),
+				    &iter, 1, &new_task_pred, -1);
+	}
+
 	if (new_task_pred == NULL) {
 		g_warning (_("Can't add new predecessor. No task selected!"));
                 return;


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- planner.spec	3 Dec 2009 12:46:15 -0000	1.70
+++ planner.spec	9 Dec 2009 12:34:58 -0000	1.71
@@ -24,6 +24,7 @@ Patch2: planner-gnome596966-editoninsert
 Patch3: planner-gnome550559-fitzoom.patch
 Patch4: planner-buildfix.patch
 Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
+Patch6: planner-gnome604169-comboboxentry.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -59,6 +60,7 @@ This package provides a plugin to integr
 %patch3 -p1 -b .fitzoom
 %patch4 -p1 -b .buildfix
 %patch5 -p1 -b .edittask
+%patch6 -p1 -b .combobox
 
 %build
 rm -rf libegg
@@ -159,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-7
+- Resolves: rhbz#545711 use GtkComboBoxEntry instead of GtkCombo
+
 * Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-6
 - Resolves: rhbz#543741 use PlannerCalander in edit->task
 



From caolanm at fedoraproject.org  Wed Dec  9 12:35:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 12:35:30 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1946,1.1947
Message-ID: <20091209123530.0755A11C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10323

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#545783 add workspace.vcl105.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1946
retrieving revision 1.1947
diff -u -p -r1.1946 -r1.1947
--- openoffice.org.spec	9 Dec 2009 11:44:38 -0000	1.1946
+++ openoffice.org.spec	9 Dec 2009 12:35:29 -0000	1.1947
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4189,11 +4189,13 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
+- Resolves: rhbz#545783 add workspace.vcl105.patch (caolanm)
+
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
 - add openoffice.org-4.2.0.ooo107151.sc.pop-empty-cell.patch (dtardon)
 - Resolves: rhbz#533538 OpenOffice keyboard shortcuts mis-map in the
   Spanish localized version of OOo (caolanm)
-- Resolves: rhbz#545783 add workspace.vcl105.patch (caolanm)
 
 * Tue Nov 10 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
 - Resolves: rhbz#533841 ooo#105710 svx loadstorenumbering (caolanm)



From caolanm at fedoraproject.org  Wed Dec  9 12:36:21 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 12:36:21 +0000 (UTC)
Subject: rpms/planner/devel planner-gnome604169-comboboxentry.patch, NONE,
	1.1 planner.spec, 1.71, 1.72
Message-ID: <20091209123621.95B4711C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10706

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604169-comboboxentry.patch 
Log Message:
Resolves: rhbz#545711 use GtkComboBoxEntry instead of GtkCombo

planner-gnome604169-comboboxentry.patch:
 data/glade/add-predecessor.glade |   58 +++++++++----------------------
 src/planner-task-dialog.c        |   72 ++++++++++++++++-----------------------
 2 files changed, 49 insertions(+), 81 deletions(-)

--- NEW FILE planner-gnome604169-comboboxentry.patch ---
diff -ru planner-0.14.4.orig/data/glade/add-predecessor.glade planner-0.14.4/data/glade/add-predecessor.glade
--- planner-0.14.4.orig/data/glade/add-predecessor.glade	2009-12-09 11:28:46.000000000 +0000
+++ planner-0.14.4/data/glade/add-predecessor.glade	2009-12-09 11:34:54.000000000 +0000
@@ -88,7 +88,6 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">combo-entry1</property>
 	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 	      <property name="width_chars">-1</property>
 	      <property name="single_line_mode">False</property>
@@ -162,6 +161,7 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="mnemonic_widget">lag_entry</property>
 	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 	      <property name="width_chars">-1</property>
 	      <property name="single_line_mode">False</property>
@@ -178,45 +178,6 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkCombo" id="predecessor_combo">
-	      <property name="visible">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
-
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="combo-entry1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <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>
-		</widget>
-	      </child>
-
-	      <child internal-child="list">
-		<widget class="GtkList" id="combo-list1">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
 	    <widget class="GtkEntry" id="lag_entry">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
@@ -236,6 +197,23 @@
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkComboBoxEntry" id="predecessor_combo">
+	      <property name="visible">True</property>
+	      <property name="add_tearoffs">False</property>
+	      <property name="has_frame">True</property>
+	      <property name="focus_on_click">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
--- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-09 11:28:46.000000000 +0000
+++ planner-0.14.4/src/planner-task-dialog.c	2009-12-09 12:12:55.000000000 +0000
@@ -350,58 +350,43 @@
 #endif
 
 static void
-task_dialog_task_combo_select_child_cb (GtkList   *list,
-					GtkWidget *item,
-					GtkCombo  *combo)
-{
-	MrpTask *task;
-
-	task = g_object_get_data (G_OBJECT (item), "task");
-	fprintf(stderr, "task_dialog_setup_task_combo child %p, had task %p\n", item, task);
-	g_object_set_data (G_OBJECT (combo), "selected_task", task);
-}
-
-static void
-task_dialog_setup_task_combo (GtkCombo *combo,
+task_dialog_setup_task_combo (GtkComboBoxEntry *combo,
 			      GList    *tasks)
 {
-	GList       *strings;
-	GList       *children;
-	GList       *l;
-	const gchar *name;
+	GtkListStore *store;
+	GtkTreeIter iter;
+	GtkCellRenderer *renderer;
+	GList        *l;
+	const gchar  *name;
 	
 	if (tasks == NULL) {
 		return;
 	}
+
+	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
 	
-	strings = NULL;
 	for (l = tasks; l; l = l->next) {
+		gtk_list_store_append (store, &iter);
 		name = mrp_task_get_name (l->data);
 		if (name == NULL || name[0] == 0) {
-			strings = g_list_prepend (strings,
-						  _("(No name)"));
+			gtk_list_store_set (store, &iter,
+					    0, _("(No name)"),
+					    1, l->data,
+					    -1);
 		} else {
-			strings = g_list_prepend (strings, (gchar*) name);
+			gtk_list_store_set (store, &iter,
+					    0, name,
+					    1, l->data,
+					    -1);
 		}
 	}
 
-	strings = g_list_reverse (strings);
-	gtk_combo_set_popdown_strings (combo, strings);
-	g_list_free (strings);
-	
-	g_object_set_data (G_OBJECT (combo), "selected_task", tasks->data);
-	
-	children = GTK_LIST (combo->list)->children;
-	for (l = children; l; l = l->next) {
-		g_object_set_data (G_OBJECT (l->data), "task", tasks->data);
-		fprintf(stderr, "child %p, given task %p\n", l, tasks->data);
-		tasks = tasks->next;
-	}
-	
-	g_signal_connect (combo->list,
-			  "select-child",
-			  G_CALLBACK (task_dialog_task_combo_select_child_cb),
-			  combo);
+	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), 
+				 GTK_TREE_MODEL (store));
+
+	gtk_combo_box_entry_set_text_column (combo, 0);
+
+	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 }
 
 static gboolean
@@ -1908,7 +1893,7 @@
 	
 	tasks = mrp_project_get_all_tasks (project);
 	tasks = g_list_remove (tasks, task);
-	task_dialog_setup_task_combo (GTK_COMBO (w), tasks);
+	task_dialog_setup_task_combo (GTK_COMBO_BOX_ENTRY (w), tasks);
 	
 	w = glade_xml_get_widget (glade, "type_optionmenu");
 	g_object_set_data (G_OBJECT (dialog), "type_optionmenu", w);
@@ -1949,10 +1934,11 @@
 	GtkWidget     *w;
 	GError        *error = NULL;
 	MrpTask       *task_main;
-	MrpTask       *new_task_pred; 
+	MrpTask       *new_task_pred=NULL; 
 	MrpProject    *project; 
 	gint           lag;
 	gint           pred_type; 
+	GtkTreeIter    iter;
 	const gchar   *str;
 	
 	main_window = g_object_get_data (G_OBJECT (dialog), "main_window");
@@ -1972,7 +1958,11 @@
 	/* Predecessor task. */
 	w = g_object_get_data (G_OBJECT (dialog), "predecessor_combo");
 
-	new_task_pred = g_object_get_data (G_OBJECT (w), "selected_task");
+	if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &iter)) {
+		gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (w)),
+				    &iter, 1, &new_task_pred, -1);
+	}
+
 	if (new_task_pred == NULL) {
 		g_warning (_("Can't add new predecessor. No task selected!"));
                 return;


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- planner.spec	3 Dec 2009 13:09:50 -0000	1.71
+++ planner.spec	9 Dec 2009 12:36:21 -0000	1.72
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -24,6 +24,7 @@ Patch2: planner-gnome596966-editoninsert
 Patch3: planner-gnome550559-fitzoom.patch
 Patch4: planner-buildfix.patch
 Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
+Patch6: planner-gnome604169-comboboxentry.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -59,6 +60,7 @@ This package provides a plugin to integr
 %patch3 -p1 -b .fitzoom
 %patch4 -p1 -b .buildfix
 %patch5 -p1 -b .edittask
+%patch6 -p1 -b .combobox
 
 %build
 rm -rf libegg
@@ -157,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-7
+- Resolves: rhbz#545711 use GtkComboBoxEntry instead of GtkCombo
+
 * Thu Dec 03 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-6
 - Resolves: rhbz#543741 use PlannerCalander in edit->task
 



From caolanm at fedoraproject.org  Wed Dec  9 12:37:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 12:37:25 +0000 (UTC)
Subject: rpms/planner/F-12 planner.spec,1.71,1.72
Message-ID: <20091209123725.E142811C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11152

Modified Files:
	planner.spec 
Log Message:
bump nvr


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- planner.spec	9 Dec 2009 12:34:58 -0000	1.71
+++ planner.spec	9 Dec 2009 12:37:25 -0000	1.72
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner



From kzak at fedoraproject.org  Wed Dec  9 12:37:32 2009
From: kzak at fedoraproject.org (kzak)
Date: Wed,  9 Dec 2009 12:37:32 +0000 (UTC)
Subject: File util-linux-ng-2.17-rc2.tar.bz2 uploaded to lookaside cache by
	kzak
Message-ID: <20091209123732.3206E10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for util-linux-ng:

e8410e61fced33c6978c86c5b409f8c8  util-linux-ng-2.17-rc2.tar.bz2



From caolanm at fedoraproject.org  Wed Dec  9 12:40:34 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 12:40:34 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2097,
	1.2098 workspace.vcl108.patch, 1.2,
	1.3 openoffice.org-3.2.0.ooo107552.vcl.sft.patch, 1.1, NONE
Message-ID: <20091209124034.E09DA11C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11984

Modified Files:
	openoffice.org.spec workspace.vcl108.patch 
Removed Files:
	openoffice.org-3.2.0.ooo107552.vcl.sft.patch 
Log Message:
openoffice.org-3.2.0.ooo107552.vcl.sft.patch merged into workspace.vcl108.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2097
retrieving revision 1.2098
diff -u -p -r1.2097 -r1.2098
--- openoffice.org.spec	9 Dec 2009 10:26:20 -0000	1.2097
+++ openoffice.org.spec	9 Dec 2009 12:40:34 -0000	1.2098
@@ -133,7 +133,6 @@ Patch55: openoffice.org-3.3.0.ooo102645.
 Patch56: workspace.vcl108.patch
 Patch57: workspace.pythonssldedux.patch
 Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch59: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1661,7 +1660,6 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch56 -p0 -b .workspace.vcl108.patch
 %patch57 -p1 -b .workspace.pythonssldedux.patch
 %patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch59 -p0 -b .ooo107552.vcl.sft.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl108.patch:
 source/fontsubset/sft.cxx           |   20 +++++++
 source/gdi/pdfwriter_impl.hxx       |    3 +
 unx/source/dtrans/X11_selection.cxx |   92 ++++++++++++++++++++++++++++++++----
 unx/source/dtrans/X11_selection.hxx |   18 ++++++-
 util/makefile.mk                    |    1 
 5 files changed, 120 insertions(+), 14 deletions(-)

Index: workspace.vcl108.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl108.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.vcl108.patch	1 Dec 2009 20:19:22 -0000	1.2
+++ workspace.vcl108.patch	9 Dec 2009 12:40:34 -0000	1.3
@@ -239,3 +239,53 @@ diff -ru vcl/source/gdi/pdfwriter_impl.h
              m_nTransparentPercent	= rState.m_nTransparentPercent;
              m_nFlags				= rState.m_nFlags;
              m_nUpdateFlags          = rState.m_nUpdateFlags;
+--- vcl/source/fontsubset/sft.cxx	2009-12-09 10:16:54.000000000 +0000
++++ vcl/source/fontsubset/sft.cxx	2009-12-09 10:17:54.000000000 +0000
+@@ -1094,6 +1094,14 @@
+ 	const sal_uInt8* table = getTable( t, O_name );
+     int nTableSize = getTableSize(t, O_name);
+ 
++    if (nTableSize < 4)
++    {
++#if OSL_DEBUG_LEVEL > 1
++        fprintf(stderr, "O_name table too small\n");
++#endif
++        return;
++    }
++
+     sal_uInt16 n = GetUInt16(table, 2, 1);
+     int i, r;
+     sal_Bool bPSNameOK = sal_True;
+@@ -1681,7 +1689,6 @@
+         goto cleanup;
+     }
+ 
+-
+     if (((*ttf)->ptr = (sal_uInt8 *) mmap(0, (*ttf)->fsize, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
+         ret = SF_MEMORY;
+         goto cleanup;
+@@ -2702,7 +2709,7 @@
+     }
+ 
+     table = getTable(ttf, O_post);
+-    if (table) {
++    if (table && getTableSize(ttf, O_post) >= 12+sizeof(sal_uInt32)) {
+         info->pitch  = GetUInt32(table, 12, 1);
+         info->italicAngle = GetInt32(table, 4, 1);
+     }
+@@ -2808,6 +2815,15 @@
+ {
+     const sal_uInt8* table = getTable(ttf, O_name);
+     int nTableSize = getTableSize(ttf, O_name );
++
++    if (nTableSize < 6)
++    {
++#if OSL_DEBUG_LEVEL > 1
++        fprintf(stderr, "O_name table too small\n");
++#endif
++        return 0;
++    }
++
+     sal_uInt16 n = GetUInt16(table, 2, 1);
+     int nStrBase = GetUInt16(table, 4, 1);
+     int i;


--- openoffice.org-3.2.0.ooo107552.vcl.sft.patch DELETED ---



From tmraz at fedoraproject.org  Wed Dec  9 12:48:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  9 Dec 2009 12:48:09 +0000 (UTC)
Subject: rpms/workrave/devel workrave.spec,1.23,1.24
Message-ID: <20091209124809.779D611C00E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13591

Modified Files:
	workrave.spec 
Log Message:
- add missing buildrequires



Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- workrave.spec	9 Dec 2009 12:34:38 -0000	1.23
+++ workrave.spec	9 Dec 2009 12:48:09 -0000	1.24
@@ -16,6 +16,7 @@ BuildRequires:  gnome-panel-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXmu-devel
 BuildRequires:  libXt-devel
+BuildRequires:  libXtst-devel
 BuildRequires:  gdome2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  gstreamer-devel



From topdog at fedoraproject.org  Wed Dec  9 12:49:46 2009
From: topdog at fedoraproject.org (topdog)
Date: Wed,  9 Dec 2009 12:49:46 +0000 (UTC)
Subject: rpms/dokuwiki/devel .cvsignore, 1.2,
	1.3 dokuwiki-use-fedora-email-valid.patch, 1.1,
	1.2 dokuwiki-use-fedora-geshi.patch, 1.1, 1.2 dokuwiki.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091209124946.E3FC711C00E0@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13947

Modified Files:
	.cvsignore dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2009 20:45:10 -0000	1.2
+++ .cvsignore	9 Dec 2009 12:49:46 -0000	1.3
@@ -1 +1 @@
-dokuwiki-2009-02-14b.tgz
+dokuwiki-rc2009-12-02.tgz

dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: dokuwiki-use-fedora-email-valid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/dokuwiki-use-fedora-email-valid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-email-valid.patch	29 Sep 2009 20:45:11 -0000	1.1
+++ dokuwiki-use-fedora-email-valid.patch	9 Dec 2009 12:49:46 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
---- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/mail.php dokuwiki-rc2009-12-02/inc/mail.php
+--- dokuwiki-rc2009-12-02.orig/inc/mail.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/mail.php	2009-12-09 12:55:04.412961968 +0200
 @@ -8,7 +8,7 @@
  
  if(!defined('DOKU_INC')) die('meh.');

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: dokuwiki-use-fedora-geshi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/dokuwiki-use-fedora-geshi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-geshi.patch	29 Sep 2009 20:45:11 -0000	1.1
+++ dokuwiki-use-fedora-geshi.patch	9 Dec 2009 12:49:46 -0000	1.2
@@ -1,24 +1,25 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
---- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
-@@ -640,16 +640,16 @@
-   $cache = getCacheName($language.$code,".code");
-   $ctime = @filemtime($cache);
-   if($ctime && !$_REQUEST['purge'] &&
--     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
--     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
-+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
-+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
-      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
-     $highlighted_code = io_readFile($cache, false);
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/parserutils.php dokuwiki-rc2009-12-02/inc/parserutils.php
+--- dokuwiki-rc2009-12-02.orig/inc/parserutils.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/parserutils.php	2009-12-09 12:53:27.151961271 +0200
+@@ -641,16 +641,16 @@
+     $cache = getCacheName($language.$code,".code");
+     $ctime = @filemtime($cache);
+     if($ctime && !$_REQUEST['purge'] &&
+-            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
+-            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
++            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
++            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
+             $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
+         $highlighted_code = io_readFile($cache, false);
  
-   } else {
+     } else {
  
--    require_once(DOKU_INC . 'inc/geshi.php');
-+    require_once('/usr/share/php/geshi.php');
+-        require_once(DOKU_INC . 'inc/geshi.php');
++        require_once('/usr/share/php/geshi.php');
  
--    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
-     $geshi->set_encoding('utf-8');
-     $geshi->enable_classes();
-     $geshi->set_header_type(GESHI_HEADER_PRE);
+-        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
++        $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
+         $geshi->set_encoding('utf-8');
+         $geshi->enable_classes();
+         $geshi->set_header_type(GESHI_HEADER_PRE);
+


Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/dokuwiki.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki.spec	29 Sep 2009 20:45:11 -0000	1.1
+++ dokuwiki.spec	9 Dec 2009 12:49:46 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.2.20090214.b%{?dist}
+Release:	0.1.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://www.dokuwiki.org/dokuwiki
-Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
+Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-rc2009-12-02.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-use-fedora-geshi.patch
 #Patch2:		dokuwiki-use-fedora-simplepie.patch
@@ -27,7 +27,7 @@ structured texts. 
 All data is stored in plain text files no database is required. 
 
 %prep
-%setup -q -n %{name}-2009-02-14
+%setup -q -n %{name}-rc2009-12-02
 %patch1 -p1 
 #%patch2 -p1
 %patch3 -p1
@@ -48,7 +48,7 @@ Alias /%{name} %{_datadir}/%{name}
 <Directory %{_datadir}/%{name}>
 	Options +FollowSymLinks
 	Order Allow,Deny
-	Allow from 127.0.0.1
+	Allow from 127.0.0.1 ::1
 </Directory>
 
 <Directory %{_datadir}/%{name}/inc>
@@ -61,6 +61,12 @@ Alias /%{name} %{_datadir}/%{name}
 	Deny from all
 </Directory>
 
+<Directory %{_datadir}/%{name}/lib/_fla>
+	## no access to the fla directory
+	Order allow,deny
+	Deny from all
+</Directory>
+
 <Directory %{_sysconfdir}/%{name}>
 	Order Deny,Allow
 	Deny from all
@@ -84,7 +90,7 @@ rm -rf inc/geshi*
 rm -f inc/EmailAddressValidator.php
 rm -f inc/.htaccess
 rm -f inc/lang/.htaccess
-#rm -f inc/SimplePie.php
+rm -f lib/_fla/{.htaccess,README}
 rm -f lib/plugins/revert/lang/sk/intro.txt
 cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
 cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -127,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/lib/scripts
 %{_datadir}/%{name}/lib/styles
 %{_datadir}/%{name}/lib/tpl
+%{_datadir}/%{name}/lib/_fla
 %attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
 %{_datadir}/%{name}/lib/plugins/*
 %{_datadir}/%{name}/inc
@@ -145,6 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
+- Upgrade to new upstream
+- Fix bugzilla bugs #544257, #544268
+
 * Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
 - Fixes requested by reviewer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2009 20:45:11 -0000	1.2
+++ sources	9 Dec 2009 12:49:46 -0000	1.3
@@ -1 +1 @@
-c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz
+65e0a7a496e1fd49fb12477211053b55  dokuwiki-rc2009-12-02.tgz



From jakub at fedoraproject.org  Wed Dec  9 12:52:25 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  9 Dec 2009 12:52:25 +0000 (UTC)
Subject: File gcc-4.4.2-20091209.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091209125225.C5FC210F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gcc:

8a1470b14967beec07c26aba5f286b0d  gcc-4.4.2-20091209.tar.bz2



From caolanm at fedoraproject.org  Wed Dec  9 12:52:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 12:52:38 +0000 (UTC)
Subject: rpms/planner/F-12 planner-gnome604169-comboboxentry.patch,1.1,1.2
Message-ID: <20091209125238.7CB3711C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14689/F-12

Modified Files:
	planner-gnome604169-comboboxentry.patch 
Log Message:
Resolves: rhbz#545711 defuzz patch

planner-gnome604169-comboboxentry.patch:
 data/glade/add-predecessor.glade |   58 ++++++++++-----------------------
 src/planner-task-dialog.c        |   68 ++++++++++++++++-----------------------
 2 files changed, 47 insertions(+), 79 deletions(-)

Index: planner-gnome604169-comboboxentry.patch
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner-gnome604169-comboboxentry.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- planner-gnome604169-comboboxentry.patch	9 Dec 2009 12:34:58 -0000	1.1
+++ planner-gnome604169-comboboxentry.patch	9 Dec 2009 12:52:38 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ru planner-0.14.4.orig/data/glade/add-predecessor.glade planner-0.14.4/data/glade/add-predecessor.glade
---- planner-0.14.4.orig/data/glade/add-predecessor.glade	2009-12-09 11:28:46.000000000 +0000
-+++ planner-0.14.4/data/glade/add-predecessor.glade	2009-12-09 11:34:54.000000000 +0000
+--- planner-0.14.4.orig/data/glade/add-predecessor.glade	2009-12-09 12:48:03.000000000 +0000
++++ planner-0.14.4/data/glade/add-predecessor.glade	2009-12-09 12:48:16.000000000 +0000
 @@ -88,7 +88,6 @@
  	      <property name="yalign">0.5</property>
  	      <property name="xpad">0</property>
@@ -88,9 +88,9 @@ diff -ru planner-0.14.4.orig/data/glade/
  	<packing>
  	  <property name="padding">0</property>
 diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
---- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-09 11:28:46.000000000 +0000
-+++ planner-0.14.4/src/planner-task-dialog.c	2009-12-09 12:12:55.000000000 +0000
-@@ -350,58 +350,43 @@
+--- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-09 12:48:03.000000000 +0000
++++ planner-0.14.4/src/planner-task-dialog.c	2009-12-09 12:50:21.000000000 +0000
+@@ -350,56 +350,41 @@
  #endif
  
  static void
@@ -101,7 +101,6 @@ diff -ru planner-0.14.4.orig/src/planner
 -	MrpTask *task;
 -
 -	task = g_object_get_data (G_OBJECT (item), "task");
--	fprintf(stderr, "task_dialog_setup_task_combo child %p, had task %p\n", item, task);
 -	g_object_set_data (G_OBJECT (combo), "selected_task", task);
 -}
 -
@@ -123,26 +122,24 @@ diff -ru planner-0.14.4.orig/src/planner
  	if (tasks == NULL) {
  		return;
  	}
-+
-+	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
  	
 -	strings = NULL;
++	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
  	for (l = tasks; l; l = l->next) {
-+		gtk_list_store_append (store, &iter);
  		name = mrp_task_get_name (l->data);
  		if (name == NULL || name[0] == 0) {
 -			strings = g_list_prepend (strings,
 -						  _("(No name)"));
 +			gtk_list_store_set (store, &iter,
-+					    0, _("(No name)"),
-+					    1, l->data,
-+					    -1);
++			                    0, _("(No name)"),
++			                    1, l->data,
++			                    -1);
  		} else {
 -			strings = g_list_prepend (strings, (gchar*) name);
 +			gtk_list_store_set (store, &iter,
-+					    0, name,
-+					    1, l->data,
-+					    -1);
++			                    0, name,
++			                    1, l->data,
++			                    -1);
  		}
  	}
  
@@ -155,7 +152,6 @@ diff -ru planner-0.14.4.orig/src/planner
 -	children = GTK_LIST (combo->list)->children;
 -	for (l = children; l; l = l->next) {
 -		g_object_set_data (G_OBJECT (l->data), "task", tasks->data);
--		fprintf(stderr, "child %p, given task %p\n", l, tasks->data);
 -		tasks = tasks->next;
 -	}
 -	
@@ -164,7 +160,7 @@ diff -ru planner-0.14.4.orig/src/planner
 -			  G_CALLBACK (task_dialog_task_combo_select_child_cb),
 -			  combo);
 +	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), 
-+				 GTK_TREE_MODEL (store));
++	                         GTK_TREE_MODEL (store));
 +
 +	gtk_combo_box_entry_set_text_column (combo, 0);
 +
@@ -172,7 +168,7 @@ diff -ru planner-0.14.4.orig/src/planner
  }
  
  static gboolean
-@@ -1908,7 +1893,7 @@
+@@ -1906,7 +1891,7 @@
  	
  	tasks = mrp_project_get_all_tasks (project);
  	tasks = g_list_remove (tasks, task);
@@ -181,7 +177,7 @@ diff -ru planner-0.14.4.orig/src/planner
  	
  	w = glade_xml_get_widget (glade, "type_optionmenu");
  	g_object_set_data (G_OBJECT (dialog), "type_optionmenu", w);
-@@ -1949,10 +1934,11 @@
+@@ -1947,10 +1932,11 @@
  	GtkWidget     *w;
  	GError        *error = NULL;
  	MrpTask       *task_main;
@@ -194,7 +190,7 @@ diff -ru planner-0.14.4.orig/src/planner
  	const gchar   *str;
  	
  	main_window = g_object_get_data (G_OBJECT (dialog), "main_window");
-@@ -1972,7 +1958,11 @@
+@@ -1970,7 +1956,11 @@
  	/* Predecessor task. */
  	w = g_object_get_data (G_OBJECT (dialog), "predecessor_combo");
  



From caolanm at fedoraproject.org  Wed Dec  9 12:52:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  9 Dec 2009 12:52:38 +0000 (UTC)
Subject: rpms/planner/devel planner-gnome604169-comboboxentry.patch,1.1,1.2
Message-ID: <20091209125238.9398711C00E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14689/devel

Modified Files:
	planner-gnome604169-comboboxentry.patch 
Log Message:
Resolves: rhbz#545711 defuzz patch

planner-gnome604169-comboboxentry.patch:
 data/glade/add-predecessor.glade |   58 ++++++++++-----------------------
 src/planner-task-dialog.c        |   68 ++++++++++++++++-----------------------
 2 files changed, 47 insertions(+), 79 deletions(-)

Index: planner-gnome604169-comboboxentry.patch
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner-gnome604169-comboboxentry.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- planner-gnome604169-comboboxentry.patch	9 Dec 2009 12:36:21 -0000	1.1
+++ planner-gnome604169-comboboxentry.patch	9 Dec 2009 12:52:38 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ru planner-0.14.4.orig/data/glade/add-predecessor.glade planner-0.14.4/data/glade/add-predecessor.glade
---- planner-0.14.4.orig/data/glade/add-predecessor.glade	2009-12-09 11:28:46.000000000 +0000
-+++ planner-0.14.4/data/glade/add-predecessor.glade	2009-12-09 11:34:54.000000000 +0000
+--- planner-0.14.4.orig/data/glade/add-predecessor.glade	2009-12-09 12:48:03.000000000 +0000
++++ planner-0.14.4/data/glade/add-predecessor.glade	2009-12-09 12:48:16.000000000 +0000
 @@ -88,7 +88,6 @@
  	      <property name="yalign">0.5</property>
  	      <property name="xpad">0</property>
@@ -88,9 +88,9 @@ diff -ru planner-0.14.4.orig/data/glade/
  	<packing>
  	  <property name="padding">0</property>
 diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
---- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-09 11:28:46.000000000 +0000
-+++ planner-0.14.4/src/planner-task-dialog.c	2009-12-09 12:12:55.000000000 +0000
-@@ -350,58 +350,43 @@
+--- planner-0.14.4.orig/src/planner-task-dialog.c	2009-12-09 12:48:03.000000000 +0000
++++ planner-0.14.4/src/planner-task-dialog.c	2009-12-09 12:50:21.000000000 +0000
+@@ -350,56 +350,41 @@
  #endif
  
  static void
@@ -101,7 +101,6 @@ diff -ru planner-0.14.4.orig/src/planner
 -	MrpTask *task;
 -
 -	task = g_object_get_data (G_OBJECT (item), "task");
--	fprintf(stderr, "task_dialog_setup_task_combo child %p, had task %p\n", item, task);
 -	g_object_set_data (G_OBJECT (combo), "selected_task", task);
 -}
 -
@@ -123,26 +122,24 @@ diff -ru planner-0.14.4.orig/src/planner
  	if (tasks == NULL) {
  		return;
  	}
-+
-+	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
  	
 -	strings = NULL;
++	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
  	for (l = tasks; l; l = l->next) {
-+		gtk_list_store_append (store, &iter);
  		name = mrp_task_get_name (l->data);
  		if (name == NULL || name[0] == 0) {
 -			strings = g_list_prepend (strings,
 -						  _("(No name)"));
 +			gtk_list_store_set (store, &iter,
-+					    0, _("(No name)"),
-+					    1, l->data,
-+					    -1);
++			                    0, _("(No name)"),
++			                    1, l->data,
++			                    -1);
  		} else {
 -			strings = g_list_prepend (strings, (gchar*) name);
 +			gtk_list_store_set (store, &iter,
-+					    0, name,
-+					    1, l->data,
-+					    -1);
++			                    0, name,
++			                    1, l->data,
++			                    -1);
  		}
  	}
  
@@ -155,7 +152,6 @@ diff -ru planner-0.14.4.orig/src/planner
 -	children = GTK_LIST (combo->list)->children;
 -	for (l = children; l; l = l->next) {
 -		g_object_set_data (G_OBJECT (l->data), "task", tasks->data);
--		fprintf(stderr, "child %p, given task %p\n", l, tasks->data);
 -		tasks = tasks->next;
 -	}
 -	
@@ -164,7 +160,7 @@ diff -ru planner-0.14.4.orig/src/planner
 -			  G_CALLBACK (task_dialog_task_combo_select_child_cb),
 -			  combo);
 +	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), 
-+				 GTK_TREE_MODEL (store));
++	                         GTK_TREE_MODEL (store));
 +
 +	gtk_combo_box_entry_set_text_column (combo, 0);
 +
@@ -172,7 +168,7 @@ diff -ru planner-0.14.4.orig/src/planner
  }
  
  static gboolean
-@@ -1908,7 +1893,7 @@
+@@ -1906,7 +1891,7 @@
  	
  	tasks = mrp_project_get_all_tasks (project);
  	tasks = g_list_remove (tasks, task);
@@ -181,7 +177,7 @@ diff -ru planner-0.14.4.orig/src/planner
  	
  	w = glade_xml_get_widget (glade, "type_optionmenu");
  	g_object_set_data (G_OBJECT (dialog), "type_optionmenu", w);
-@@ -1949,10 +1934,11 @@
+@@ -1947,10 +1932,11 @@
  	GtkWidget     *w;
  	GError        *error = NULL;
  	MrpTask       *task_main;
@@ -194,7 +190,7 @@ diff -ru planner-0.14.4.orig/src/planner
  	const gchar   *str;
  	
  	main_window = g_object_get_data (G_OBJECT (dialog), "main_window");
-@@ -1972,7 +1958,11 @@
+@@ -1970,7 +1956,11 @@
  	/* Predecessor task. */
  	w = g_object_get_data (G_OBJECT (dialog), "predecessor_combo");
  



From kzak at fedoraproject.org  Wed Dec  9 12:52:55 2009
From: kzak at fedoraproject.org (kzak)
Date: Wed,  9 Dec 2009 12:52:55 +0000 (UTC)
Subject: rpms/util-linux-ng/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 util-linux-ng.spec, 1.67, 1.68
Message-ID: <20091209125255.A6C1511C00E0@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14804

Modified Files:
	.cvsignore sources util-linux-ng.spec 
Log Message:
* Wed Dec  9 2009 Karel Zak <kzak at redhat.com> 2.17-0.5
- upgrade to 2.17-rc2
  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc2-ChangeLog



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	23 Nov 2009 12:34:10 -0000	1.22
+++ .cvsignore	9 Dec 2009 12:52:55 -0000	1.23
@@ -1,2 +1,2 @@
-util-linux-ng-2.17-rc1.tar.bz2
+util-linux-ng-2.17-rc2.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	23 Nov 2009 12:34:10 -0000	1.22
+++ sources	9 Dec 2009 12:52:55 -0000	1.23
@@ -1,2 +1,2 @@
-320a6bab5cc8f70f6b9ad0c05a6fe67f  util-linux-ng-2.17-rc1.tar.bz2
+e8410e61fced33c6978c86c5b409f8c8  util-linux-ng-2.17-rc2.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- util-linux-ng.spec	7 Dec 2009 11:17:37 -0000	1.67
+++ util-linux-ng.spec	9 Dec 2009 12:52:55 -0000	1.68
@@ -1,10 +1,10 @@
-%define upstream_version %{version}-rc1
+%define upstream_version %{version}-rc2
 
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.17
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -711,11 +711,15 @@ fi
 
 
 %changelog
-* Mon Dec  7 2009  Karel Zak <kzak at redhat.com> 2.17-0.4
+* Wed Dec  9 2009 Karel Zak <kzak at redhat.com> 2.17-0.5
+- upgrade to 2.17-rc2
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc2-ChangeLog
+
+* Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.17-0.4
 - add clock.8 man page (manlink to hwclock)
 - add --help to mount.tmpfs
 
-* Mon Nov 23 2009  Karel Zak <kzak at redhat.com> 2.17-0.3
+* Mon Nov 23 2009 Karel Zak <kzak at redhat.com> 2.17-0.3
 - upgrade to 2.17-rc1
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc1-ChangeLog
 



From peter at fedoraproject.org  Wed Dec  9 12:55:57 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  9 Dec 2009 12:55:57 +0000 (UTC)
Subject: rpms/sems/EL-5 sems--openssl10.diff, NONE,
	1.1 sems--spandsp_0_0_6_fix.diff, NONE, 1.1 import.log, 1.2,
	1.3 sems.spec, 1.3, 1.4
Message-ID: <20091209125558.04A7611C00E0@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15661/EL-5

Modified Files:
	import.log sems.spec 
Added Files:
	sems--openssl10.diff sems--spandsp_0_0_6_fix.diff 
Log Message:
Rebuilt with new spandsp

sems--openssl10.diff:
 XmlRpcSource.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE sems--openssl10.diff ---
--- apps/xmlrpc2di/xmlrpc++/src/XmlRpcSource.h~	2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/src/XmlRpcSource.h	2009-08-28 23:36:28.702111338 +0400
@@ -48,7 +48,11 @@
     bool _ssl;
     SSL_CTX* _ssl_ctx;
     SSL* _ssl_ssl;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_METHOD* _ssl_meth;
+#else
     SSL_METHOD* _ssl_meth;
+#endif
   private:
 
     // Socket. This should really be a SOCKET (an alias for unsigned int*) on windows...

sems--spandsp_0_0_6_fix.diff:
 g722.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sems--spandsp_0_0_6_fix.diff ---
--- core/plug-in/g722/g722.c.spandsp_new	2008-07-15 22:48:07.000000000 +0400
+++ core/plug-in/g722/g722.c	2009-08-28 20:51:44.911218471 +0400
@@ -28,7 +28,7 @@
 typedef unsigned char uint8_t;
 typedef signed short int16_t;
 
-#include "spandsp/g722.h"
+#include <spandsp.h>
 #include "../../log.h"
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Jul 2009 14:48:21 -0000	1.2
+++ import.log	9 Dec 2009 12:55:57 -0000	1.3
@@ -1,2 +1,3 @@
 sems-1_1_0-5_fc10:EL-5:sems-1.1.0-5.fc10.src.rpm:1239420777
 sems-1_1_1-1_fc10:EL-5:sems-1.1.1-1.fc10.src.rpm:1247323443
+sems-1_1_1-6_fc12:EL-5:sems-1.1.1-6.fc12.src.rpm:1260363240


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sems.spec	11 Jul 2009 14:55:07 -0000	1.3
+++ sems.spec	9 Dec 2009 12:55:57 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.1.1
-Release:	1%{?dist}.1
+Release:	6%{?dist}
 URL:		http://www.iptel.org/sems
 # wget http://ftp.iptel.org/pub/sems/sems-1.1.1.tar.gz
 # tar zx --exclude iLBC_rfc3951 -f sems-1.1.1.tar.gz
@@ -22,6 +22,10 @@ Patch5:		sems--xmlrpc++-use_fedora_cxxfl
 Patch6:		sems--makefile_defs_removal.diff
 # GCC 4.4 fixes
 Patch7:		sems--gcc44.diff
+# spandsp 0.0.6pre fixes
+Patch8:		sems--spandsp_0_0_6_fix.diff
+# openssl 1.0 patch
+Patch9:		sems--openssl10.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
 #BuildRequires:	python >= 2.3
@@ -161,16 +165,18 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
 %patch5 -p0 -b .cxxflags
 %patch6 -p0 -b .makefile_defs_removal
 %patch7 -p0 -b .gcc44
+%patch8 -p0 -b .spandsp_new
+%patch9 -p0 -b .openssl10
 
 iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
 iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
 mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt
 
 %build
-export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"'  -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
+export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"' -DSPANDSP_EXPOSE_INTERNAL_STRUCTURES -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
 export CXXFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
 export CFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
-make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all \
+make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -204,10 +210,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{n
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/etc/conf_auth.conf
 
 # fix permissions
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.pyc
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.pyc
+chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/log.py*
+chmod 644 $RPM_BUILD_ROOT%{_libdir}/%{name}/plug-in/py_sems_log.py*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -546,6 +550,23 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Fri Aug 28 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.1-6
+- g722 enabled back
+- py_sems enabled back (for EPEL only)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-5
+- rebuilt with new openssl
+
+* Mon Aug 17 2009 J?n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-4
+- g722 is a conditional build, until it will work with latest spandsp
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 15 2009 J?n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-2
+- disabled py_sems (python) subpackage until upstream fixes sip-4.8
+  compatibility
+
 * Sat Jul 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.1-1
 - Ver. 1.1.1
 



From tbzatek at fedoraproject.org  Wed Dec  9 12:56:22 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed,  9 Dec 2009 12:56:22 +0000 (UTC)
Subject: rpms/sabayon/devel sabayon.spec,1.67,1.68
Message-ID: <20091209125622.4BE5E11C00E0@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15810

Modified Files:
	sabayon.spec 
Log Message:
Fix BuildRequires



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sabayon.spec	9 Dec 2009 11:49:29 -0000	1.67
+++ sabayon.spec	9 Dec 2009 12:56:22 -0000	1.68
@@ -55,6 +55,10 @@ BuildRequires: autoconf
 BuildRequires: perl(XML::Parser)
 BuildRequires: pyxdg
 
+BuildRequires: gnome-doc-utils
+# scrollkeeper replacement
+BuildRequires: rarian-compat
+
 Requires(post):  shadow-utils
 Requires(preun): shadow-utils
 



From jakub at fedoraproject.org  Wed Dec  9 13:02:17 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  9 Dec 2009 13:02:17 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-c++-comdat-vdtors.patch, NONE, 1.1 .cvsignore, 
	1.313, 1.314 gcc.spec, 1.96, 1.97 sources, 1.320, 1.321
Message-ID: <20091209130217.D152411C00E0@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17603

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-c++-comdat-vdtors.patch 
Log Message:
4.4.2-15

gcc44-c++-comdat-vdtors.patch:
 gcc/cgraph.c                          |   14 +++++++++
 gcc/cgraph.h                          |    2 +
 gcc/cgraphunit.c                      |   51 ++++++++++++++++++++++++++++++++--
 gcc/cp/decl2.c                        |   19 ++++++++++++
 gcc/cp/optimize.c                     |   26 ++++++++++++-----
 gcc/ipa-cp.c                          |   11 +++++--
 gcc/ipa-inline.c                      |    1 
 gcc/ipa.c                             |   17 ++++++++++-
 gcc/testsuite/g++.dg/opt/dtor2-aux.cc |   16 ++++++++++
 gcc/testsuite/g++.dg/opt/dtor2.C      |   13 ++++++++
 gcc/testsuite/g++.dg/opt/dtor2.h      |   29 +++++++++++++++++++
 libstdc++-v3/config/abi/pre/gnu.ver   |   41 +++++++++++++++++++++------
 12 files changed, 217 insertions(+), 23 deletions(-)

--- NEW FILE gcc44-c++-comdat-vdtors.patch ---
2009-12-09  Jakub Jelinek  <jakub at redhat.com>

	PR c++/42317
	* cgraph.h (struct cgraph_node): Add same_comdat_group field.
	* cgraph.c (cgraph_remove_node): Unchain node from same_comdat_group
	cirtuclar list.
	* ipa.c (cgraph_remove_unreachable_nodes): For any reachable node
	mark all its same_comdat_group nodes as also reachable.
	* ipa-cp.c (ipcp_initialize_node_lattices, ipcp_estimate_growth,
	ipcp_insert_stage): Handle same_comdat_group nodes that are only
	reachable through a different reachable node in the same comdat
	group.
	* cgraphunit.c (cgraph_analyze_functions): Mark all other
	same_comdat_group nodes as reachable.
	(cgraph_mark_functions_to_output): For each node->process process
	also other same_comdat_group nodes.
	* ipa-inline.c (cgraph_clone_inlined_nodes): Don't reuse nodes
	with same_comdat_group non-NULL.

	* decl2.c (cp_write_global_declarations): Clear DECL_EXTERNAL
	also on all other functions in the same comdat group.
	* optimize.c (maybe_clone_body): Also optimize virtual implicit
	dtors.  For virtual comdat dtors tell cgraph that base and deleting
	dtor are in the same comdat group.

	* config/abi/pre/gnu.ver: Don't export certain base dtors that
	weren't previously exported.

	* g++.dg/opt/dtor2.C: New test.
	* g++.dg/opt/dtor2.h: New file.
	* g++.dg/opt/dtor2-aux.cc: New file.

--- gcc/cgraph.c.jj	2009-11-23 14:31:26.000000000 +0100
+++ gcc/cgraph.c	2009-12-09 09:48:54.000000000 +0100
@@ -1152,6 +1152,20 @@ cgraph_remove_node (struct cgraph_node *
   while (node->same_body)
     cgraph_remove_same_body_alias (node->same_body);
 
+  if (node->same_comdat_group)
+    {
+      struct cgraph_node *prev;
+      for (prev = node->same_comdat_group;
+	   prev->same_comdat_group != node;
+	   prev = prev->same_comdat_group)
+	;
+      if (node->same_comdat_group == prev)
+	prev->same_comdat_group = NULL;
+      else
+	prev->same_comdat_group = node->same_comdat_group;
+      node->same_comdat_group = NULL;
+    }
+
   /* While all the clones are removed after being proceeded, the function
      itself is kept in the cgraph even after it is compiled.  Check whether
      we are done with this body and reclaim it proactively if this is the case.
--- gcc/ipa-cp.c.jj	2009-07-21 18:27:05.000000000 +0200
+++ gcc/ipa-cp.c	2009-12-09 12:30:43.000000000 +0100
@@ -487,7 +487,11 @@ ipcp_initialize_node_lattices (struct cg
   if (ipa_is_called_with_var_arguments (info))
     type = IPA_BOTTOM;
   else if (!node->needed)
-    type = IPA_TOP;
+    {
+      type = IPA_TOP;
+      if (node->same_comdat_group && !node->callers)
+	type = IPA_BOTTOM;
+    }
   /* When cloning is allowed, we can assume that externally visible functions
      are not called.  We will compensate this by cloning later.  */
   else if (ipcp_cloning_candidate_p (node))
@@ -1046,7 +1050,8 @@ ipcp_estimate_growth (struct cgraph_node
   struct cgraph_edge *cs;
   int redirectable_node_callers = 0;
   int removable_args = 0;
-  bool need_original = node->needed;
+  bool need_original = node->needed
+		       || (node->same_comdat_group && !node->callers);
   struct ipa_node_params *info;
   int i, count;
   int growth;
@@ -1235,7 +1240,7 @@ ipcp_insert_stage (void)
       for (cs = node->callers; cs != NULL; cs = cs->next_caller)
 	if (cs->caller == node || ipcp_need_redirect_p (cs))
 	  break;
-      if (!cs && !node->needed)
+      if (!cs && !node->needed && !(node->same_comdat_group && !node->callers))
 	bitmap_set_bit (dead_nodes, node->uid);
 
       info = IPA_NODE_REF (node);
--- gcc/ipa-inline.c.jj	2009-03-04 12:10:20.000000000 +0100
+++ gcc/ipa-inline.c	2009-12-09 10:03:01.000000000 +0100
@@ -209,6 +209,7 @@ cgraph_clone_inlined_nodes (struct cgrap
 	 In that case just go ahead and re-use it.  */
       if (!e->callee->callers->next_caller
 	  && !e->callee->needed
+	  && !e->callee->same_comdat_group
 	  && !cgraph_new_nodes)
 	{
 	  gcc_assert (!e->callee->global.inlined_to);
--- gcc/ipa.c.jj	2009-01-14 12:06:29.000000000 +0100
+++ gcc/ipa.c	2009-12-09 09:59:32.000000000 +0100
@@ -1,5 +1,5 @@
 /* Basic IPA optimizations and utilities.
-   Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation,
+   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
    Inc.
 
 This file is part of GCC.
@@ -142,6 +142,21 @@ cgraph_remove_unreachable_nodes (bool be
 	    e->callee->aux = first;
 	    first = e->callee;
 	  }
+      /* If any function in a comdat group is reachable, force
+	 all other functions in the same comdat group to be
+	 also reachable.  */
+      if (node->same_comdat_group
+	  && !node->global.inlined_to)
+	{
+	  for (next = node->same_comdat_group;
+	       next != node;
+	       next = next->same_comdat_group)
+	    if (!next->aux)
+	      {
+		next->aux = first;
+		first = next;
+	      }
+	}
     }
 
   /* Remove unreachable nodes.  Extern inline functions need special care;
--- gcc/cp/decl2.c.jj	2009-12-02 15:24:40.000000000 +0100
+++ gcc/cp/decl2.c	2009-12-09 10:04:32.000000000 +0100
@@ -3557,7 +3557,7 @@ cp_write_global_declarations (void)
 	      && DECL_INITIAL (decl)
 	      && decl_needed_p (decl))
 	    {
-	      struct cgraph_node *alias;
+	      struct cgraph_node *alias, *next;
 
 	      node = cgraph_get_node (decl);
 	      DECL_EXTERNAL (decl) = 0;
@@ -3569,6 +3569,23 @@ cp_write_global_declarations (void)
 		  for (alias = node->same_body; alias; alias = alias->next)
 		    DECL_EXTERNAL (alias->decl) = 0;
 		}
+	      /* If we mark !DECL_EXTERNAL one of the symbols in some comdat
+		 group, we need to mark all symbols in the same comdat group
+		 that way.  */
+	      if (node->same_comdat_group)
+		for (next = node->same_comdat_group;
+		     next != node;
+		     next = next->same_comdat_group)
+		  {
+		    DECL_EXTERNAL (next->decl) = 0;
+		    if (next->same_body)
+		      {
+			for (alias = next->same_body;
+			     alias;
+			     alias = alias->next)
+			  DECL_EXTERNAL (alias->decl) = 0;
+		      }
+		  }
 	    }
 
 	  /* If we're going to need to write this function out, and
--- gcc/cp/optimize.c.jj	2009-12-02 10:32:32.000000000 +0100
+++ gcc/cp/optimize.c	2009-12-09 12:55:44.000000000 +0100
@@ -155,6 +155,7 @@ maybe_clone_body (tree fn)
   tree fns[3];
   bool first = true;
   bool in_charge_parm_used;
+  bool same_comdat_group = false;
   int idx;
 
   /* We only clone constructors and destructors.  */
@@ -246,14 +247,13 @@ maybe_clone_body (tree fn)
 	  && (SUPPORTS_ONE_ONLY || !DECL_WEAK (fns[0]))
 	  && (!DECL_ONE_ONLY (fns[0])
 	      || (HAVE_COMDAT_GROUP
-		  && DECL_WEAK (fns[0])
-		  /* Don't optimize synthetized virtual dtors, because then
-		     the deleting and other dtors are emitted when needed
-		     and so it is not certain we would emit both
-		     deleting and complete/base dtors in the comdat group.  */
-		  && (fns[2] == NULL || !DECL_ARTIFICIAL (fn))))
+		  && DECL_WEAK (fns[0])))
 	  && cgraph_same_body_alias (clone, fns[0]))
-	alias = true;
+	{
+	  alias = true;
+	  if (DECL_ONE_ONLY (fns[0]) && fns[2])
+	    same_comdat_group = true;
+	}
 
       /* Build the delete destructor by calling complete destructor
          and delete function.  */
@@ -335,6 +335,18 @@ maybe_clone_body (tree fn)
     }
   pop_from_top_level ();
 
+  if (same_comdat_group)
+    {
+      /* If *[CD][12]* dtors go into the *[CD]5* comdat group and dtor is
+	 virtual, it goes into the same comdat group as well.  */
+      struct cgraph_node *base_dtor_node = cgraph_node (fns[0]);
+      struct cgraph_node *deleting_dtor_node = cgraph_node (fns[2]);
+      gcc_assert (base_dtor_node->same_comdat_group == NULL);
+      gcc_assert (deleting_dtor_node->same_comdat_group == NULL);
+      base_dtor_node->same_comdat_group = deleting_dtor_node;
+      deleting_dtor_node->same_comdat_group = base_dtor_node;
+    }
+ 
   /* We don't need to process the original function any further.  */
   return 1;
 }
--- gcc/cgraph.h.jj	2009-11-23 14:27:47.000000000 +0100
+++ gcc/cgraph.h	2009-12-09 09:48:54.000000000 +0100
@@ -149,6 +149,8 @@ struct cgraph_node GTY((chain_next ("%h.
   /* For normal nodes pointer to the list of alias nodes, in alias
      nodes pointer to the normal node.  */
   struct cgraph_node *same_body;
+  /* Circular list of nodes in the same comdat group if non-NULL.  */
+  struct cgraph_node *same_comdat_group;
   /* For functions with many calls sites it holds map from call expression
      to the edge to speed up cgraph_edge function.  */
   htab_t GTY((param_is (struct cgraph_edge))) call_site_hash;
--- gcc/cgraphunit.c.jj	2009-11-23 15:17:26.000000000 +0100
+++ gcc/cgraphunit.c	2009-12-09 09:52:50.000000000 +0100
@@ -896,6 +896,14 @@ cgraph_analyze_functions (void)
 	if (!edge->callee->reachable)
 	  cgraph_mark_reachable_node (edge->callee);
 
+      if (node->same_comdat_group)
+	{
+	  for (next = node->same_comdat_group;
+	       next != node;
+	       next = next->same_comdat_group)
+	    cgraph_mark_reachable_node (next);
+	}
+
       /* If decl is a clone of an abstract function, mark that abstract
 	 function so that we don't release its body. The DECL_INITIAL() of that
          abstract function declaration will be later needed to output debug info.  */
@@ -984,13 +992,21 @@ static void
 cgraph_mark_functions_to_output (void)
 {
   struct cgraph_node *node;
+#ifdef ENABLE_CHECKING
+  bool check_same_comdat_groups = false;
+
+  for (node = cgraph_nodes; node; node = node->next)
+    gcc_assert (!node->output);
+#endif
 
   for (node = cgraph_nodes; node; node = node->next)
     {
       tree decl = node->decl;
       struct cgraph_edge *e;
 
-      gcc_assert (!node->output);
+      gcc_assert (!node->output || node->same_comdat_group);
+      if (node->output)
+	continue;
 
       for (e = node->callers; e; e = e->next_caller)
 	if (e->inline_failed)
@@ -1005,7 +1021,23 @@ cgraph_mark_functions_to_output (void)
 	      || (e && node->reachable))
 	  && !TREE_ASM_WRITTEN (decl)
 	  && !DECL_EXTERNAL (decl))
-	node->output = 1;
+	{
+	  node->output = 1;
+	  if (node->same_comdat_group)
+	    {
+	      struct cgraph_node *next;
+	      for (next = node->same_comdat_group;
+		   next != node;
+		   next = next->same_comdat_group)
+		next->output = 1;
+	    }
+	}
+      else if (node->same_comdat_group)
+	{
+#ifdef ENABLE_CHECKING
+	  check_same_comdat_groups = true;
+#endif
+	}
       else
 	{
 	  /* We should've reclaimed all functions that are not needed.  */
@@ -1025,6 +1057,21 @@ cgraph_mark_functions_to_output (void)
 	}
 
     }
+#ifdef ENABLE_CHECKING
+  if (check_same_comdat_groups)
+    for (node = cgraph_nodes; node; node = node->next)
+      if (node->same_comdat_group && !node->output)
+	{
+	  tree decl = node->decl;
+	  if (!node->global.inlined_to
+	      && gimple_has_body_p (decl)
+	      && !DECL_EXTERNAL (decl))
+	    {
+	      dump_cgraph_node (stderr, node);
+	      internal_error ("failed to reclaim unneeded function");
+	    }
+	}
+#endif
 }
 
 /* Expand function specified by NODE.  */
--- gcc/testsuite/g++.dg/opt/dtor2.C.jj	2009-12-09 09:48:54.000000000 +0100
+++ gcc/testsuite/g++.dg/opt/dtor2.C	2009-12-09 09:48:54.000000000 +0100
@@ -0,0 +1,13 @@
+// PR c++/42317
+// { dg-do link }
+// { dg-options "-O0" }
+// { dg-additional-sources "dtor2-aux.cc" }
+
+#include "dtor2.h"
+
+D::D (int x) : C (x) {}
+
+int
+main ()
+{
+}
--- gcc/testsuite/g++.dg/opt/dtor2.h.jj	2009-12-09 09:48:54.000000000 +0100
+++ gcc/testsuite/g++.dg/opt/dtor2.h	2009-12-09 09:48:54.000000000 +0100
@@ -0,0 +1,29 @@
+struct A
+{
+  A ();
+  ~A ();
+};
+
+struct B
+{
+  A b;
+  virtual void mb ();
+  B (int);
+  virtual ~B ();
+};
+
+struct C : public B
+{
+  virtual void mc ();
+  C (int);
+  ~C ();
+};
+
+inline C::~C () {}
+
+struct D : public C
+{
+  A d;
+  D (int);
+  ~D ();
+};
--- gcc/testsuite/g++.dg/opt/dtor2-aux.cc.jj	2009-12-09 09:48:54.000000000 +0100
+++ gcc/testsuite/g++.dg/opt/dtor2-aux.cc	2009-12-09 09:48:54.000000000 +0100
@@ -0,0 +1,16 @@
+// { dg-do compile }
+// { dg-options "" }
+
+#include "dtor2.h"
+
+A::A () {}
+A::~A () {}
+
+void B::mb () {}
+B::B (int) {}
+B::~B () {}
+
+void C::mc () {}
+C::C (int x) : B (x) {}
+
+D::~D () {}
--- libstdc++-v3/config/abi/pre/gnu.ver.jj	2009-09-16 21:35:18.000000000 +0200
+++ libstdc++-v3/config/abi/pre/gnu.ver	2009-12-09 10:27:43.000000000 +0100
@@ -72,13 +72,18 @@ GLIBCXX_3.4 {
       std::c[v-z]*;
 #     std::[d-g]*;
       std::d[a-d]*;
-      std::d[f-z]*;
+      std::d[f-n]*;
+      std::domain_error::d*;
+#     std::domain_error::~d*;
+      std::d[p-z]*;
       std::e[a-q]*;
       std::error[^_]*;
       std::e[s-z]*;
       std::gslice*;
       std::h[^a]*;
-      std::i[a-n]*;
+      std::i[a-m]*;
+      std::invalid_argument::i*;
+#     std::invalid_argument::~i*;
       std::ios_base::[A-Ha-z]*;
       std::ios_base::_M_grow_words*;
       std::ios_base::_M_init*;
@@ -91,7 +96,8 @@ GLIBCXX_3.4 {
       std::istrstream*;
       std::i[t-z]*;
       std::[A-Zj-k]*;
-      std::length_error*;
+      std::length_error::l*;
+#     std::length_error::~l*;
       std::logic_error*;
       std::locale::[A-Za-e]*;
       std::locale::facet::[A-Za-z]*;
@@ -116,10 +122,14 @@ GLIBCXX_3.4 {
       std::nu[^m]*;
       std::num[^e]*;
       std::ostrstream*;
-      std::out_of_range*;
-      std::overflow_error*;
+      std::out_of_range::o*;
+#     std::out_of_range::~o*;
+      std::overflow_error::o*;
+#     std::overflow_error::~o*;
       std::[p-q]*;
-      std::r[^e]*;
+      std::r[^ae]*;
+      std::range_error::r*;
+#     std::range_error::~r*;
       std::re[^t]*;
 #     std::rethrow_exception
       std::set_new_handler*;
@@ -137,7 +147,8 @@ GLIBCXX_3.4 {
       std::tr1::h[^a]*;
       std::t[s-z]*;
 #     std::[A-Zu-z]*;
-      std::underflow_error*;
+      std::underflow_error::u*;
+#     std::underflow_error::~u*;
       std::uncaught_exception*;
       std::unexpected*;
       std::[A-Zv-z]*;
@@ -258,7 +269,8 @@ GLIBCXX_3.4 {
     _ZNSt15basic_streambufI[cw]St11char_traitsI[cw]EEaSERKS2_;
 
     # std::basic_stringbuf
-    _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[CD]*;
+    _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EEC*;
+    _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EED[^2]*;
     _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[0-9][a-r]*;
     _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[0-9]seek*;
     _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE[0-9]set*;
@@ -614,6 +626,16 @@ GLIBCXX_3.4 {
     _ZGVNSt[^1]*;
     _ZGVNSt1[^7]*;
 
+    # complete and deleting destructors where base destructors should not
+    # be exported.
+    _ZNSt11range_errorD[01]Ev;
+    _ZNSt12domain_errorD[01]Ev;
+    _ZNSt12length_errorD[01]Ev;
+    _ZNSt12out_of_rangeD[01]Ev;
+    _ZNSt14overflow_errorD[01]Ev;
+    _ZNSt15underflow_errorD[01]Ev;
+    _ZNSt16invalid_argumentD[01]Ev;
+
     # virtual function thunks
     _ZThn8_NS*;
     _ZThn16_NS*;
@@ -866,7 +888,8 @@ GLIBCXX_3.4.10 {
     _ZNSt15basic_streambufI[cw]St11char_traitsI[cw]EE6stosscEv;
 
     _ZN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EE4syncEv;
-    _ZN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EE[5-9CD]*;
+    _ZN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EE[5-9C]*;
+    _ZN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EED[^2]*;
 
 } GLIBCXX_3.4.9;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- .cvsignore	4 Dec 2009 11:13:08 -0000	1.313
+++ .cvsignore	9 Dec 2009 13:02:17 -0000	1.314
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091204.tar.bz2
+gcc-4.4.2-20091209.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- gcc.spec	4 Dec 2009 11:13:08 -0000	1.96
+++ gcc.spec	9 Dec 2009 13:02:17 -0000	1.97
@@ -1,9 +1,9 @@
-%global DATE 20091204
-%global SVNREV 154977
+%global DATE 20091209
+%global SVNREV 155104
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 14
+%global gcc_release 15
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,6 +161,7 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
+Patch20: gcc44-c++-comdat-vdtors.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -466,6 +467,7 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
+%patch20 -p0 -b .c++-comdat-vdtors~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1383,6 +1385,8 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/fma4intrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xopintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/lwpintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/abmintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/popcntintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm_malloc.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm3dnow.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cpuid.h
@@ -1849,6 +1853,13 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Dec  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-15
+- VTA backports
+  - PRs debug/42166, debug/42234, debug/42244, debug/42299
+- fix handling of C++ COMDAT virtual destructors
+- some x86/x86_64 FMA4, XOP, ABM and LWP fixes
+- fix a decltype handling bug in templates (PR c++/42277)
+
 * Fri Dec  4 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-14
 - update from gcc-4_4-branch
   - PRs libstdc++/42261, middle-end/42049


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- sources	4 Dec 2009 11:13:08 -0000	1.320
+++ sources	9 Dec 2009 13:02:17 -0000	1.321
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-dcff137d5ba8e70cd5cf8fcd0b34ede6  gcc-4.4.2-20091204.tar.bz2
+8a1470b14967beec07c26aba5f286b0d  gcc-4.4.2-20091209.tar.bz2



From hadess at fedoraproject.org  Wed Dec  9 13:04:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 13:04:09 +0000 (UTC)
Subject: rpms/gir-repository/F-12 gir-repo-install-dbus-glib.patch,1.1,1.2
Message-ID: <20091209130409.82BED11C00E0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gir-repository/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18059

Modified Files:
	gir-repo-install-dbus-glib.patch 
Log Message:
fix dbus-glib gir file

gir-repo-install-dbus-glib.patch:
 b/gir/DBusGLib-1.0.gir |    3 ++-
 b/gir/Makefile.am      |    5 +++--
 gir/Makefile.am        |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

Index: gir-repo-install-dbus-glib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/F-12/gir-repo-install-dbus-glib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gir-repo-install-dbus-glib.patch	9 Dec 2009 12:19:19 -0000	1.1
+++ gir-repo-install-dbus-glib.patch	9 Dec 2009 13:04:09 -0000	1.2
@@ -1,12 +1,3 @@
-commit 3a2480afdf768c46ac87500f9912c0a111851b86
-Author: Vincent Untz <vuntz at gnome.org>
-Date:   Thu Dec 3 13:41:37 2009 +0100
-
-    Install DBusGLib-1.0.gir if dbus build is enabled
-    
-    We do this instead of installing it only when mission-control build is
-    enabled (which is off by default).
-
 diff --git a/gir/Makefile.am b/gir/Makefile.am
 index b7ce585..5a362b8 100644
 --- a/gir/Makefile.am
@@ -30,14 +21,6 @@ index b7ce585..5a362b8 100644
  DBus-1.0.gir: libgirepo-DBus-custom.la
  	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
  	    --add-include-path=$(srcdir) --add-include-path=. \
-commit fdf6cf0d5cab34f4a69deb0e9c86a853cc50e647
-Author: Dan Winship <danw at gnome.org>
-Date:   Mon Dec 7 15:51:15 2009 -0500
-
-    Move DBusGLib-1.0.gir from BUILT_GIRSOURCES to CUSTOM_GIRSOURCES
-    
-    fixes "make clean; make"
-
 diff --git a/gir/Makefile.am b/gir/Makefile.am
 index 5a362b8..40bb44b 100644
 --- a/gir/Makefile.am
@@ -51,3 +34,17 @@ index 5a362b8..40bb44b 100644
  
  DBus-1.0.gir: libgirepo-DBus-custom.la
  	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
+diff --git a/gir/DBusGLib-1.0.gir b/gir/DBusGLib-1.0.gir
+index d79a018..41d273a 100644
+--- a/gir/DBusGLib-1.0.gir
++++ b/gir/DBusGLib-1.0.gir
+@@ -3,7 +3,8 @@
+             xmlns="http://www.gtk.org/introspection/core/1.0"
+             xmlns:c="http://www.gtk.org/introspection/c/1.0"
+ 	    xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+-  <include name="GObject"/>
++  <include name="GObject" version="2.0"/>
++  <package name="dbus-glib-1"/>
+   <namespace name="DBusGLib" version="1.0" shared-library="dbus-glib-1">
+     <record name="Connection" c:type="DBusGConnection"/>
+     <record name="MethodInvocation" c:type="DBusGMethodInvocation"/>



From topdog at fedoraproject.org  Wed Dec  9 13:07:03 2009
From: topdog at fedoraproject.org (topdog)
Date: Wed,  9 Dec 2009 13:07:03 +0000 (UTC)
Subject: rpms/dokuwiki/F-12 .cvsignore, 1.2,
	1.3 dokuwiki-use-fedora-email-valid.patch, 1.1,
	1.2 dokuwiki-use-fedora-geshi.patch, 1.1, 1.2 dokuwiki.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091209130703.6AD0111C00E0@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18631

Modified Files:
	.cvsignore dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec sources 
Log Message:
* Wed Dec 09 2009 Andrew Colin Kissa <andrew at topdog.za.net>
- Update to latest upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2009 20:50:34 -0000	1.2
+++ .cvsignore	9 Dec 2009 13:07:02 -0000	1.3
@@ -1 +1 @@
-dokuwiki-2009-02-14b.tgz
+dokuwiki-rc2009-12-02.tgz

dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: dokuwiki-use-fedora-email-valid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-12/dokuwiki-use-fedora-email-valid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-email-valid.patch	29 Sep 2009 20:50:34 -0000	1.1
+++ dokuwiki-use-fedora-email-valid.patch	9 Dec 2009 13:07:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
---- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/mail.php dokuwiki-rc2009-12-02/inc/mail.php
+--- dokuwiki-rc2009-12-02.orig/inc/mail.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/mail.php	2009-12-09 12:55:04.412961968 +0200
 @@ -8,7 +8,7 @@
  
  if(!defined('DOKU_INC')) die('meh.');

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: dokuwiki-use-fedora-geshi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-12/dokuwiki-use-fedora-geshi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-geshi.patch	29 Sep 2009 20:50:34 -0000	1.1
+++ dokuwiki-use-fedora-geshi.patch	9 Dec 2009 13:07:02 -0000	1.2
@@ -1,24 +1,25 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
---- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
-@@ -640,16 +640,16 @@
-   $cache = getCacheName($language.$code,".code");
-   $ctime = @filemtime($cache);
-   if($ctime && !$_REQUEST['purge'] &&
--     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
--     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
-+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
-+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
-      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
-     $highlighted_code = io_readFile($cache, false);
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/parserutils.php dokuwiki-rc2009-12-02/inc/parserutils.php
+--- dokuwiki-rc2009-12-02.orig/inc/parserutils.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/parserutils.php	2009-12-09 12:53:27.151961271 +0200
+@@ -641,16 +641,16 @@
+     $cache = getCacheName($language.$code,".code");
+     $ctime = @filemtime($cache);
+     if($ctime && !$_REQUEST['purge'] &&
+-            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
+-            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
++            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
++            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
+             $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
+         $highlighted_code = io_readFile($cache, false);
  
-   } else {
+     } else {
  
--    require_once(DOKU_INC . 'inc/geshi.php');
-+    require_once('/usr/share/php/geshi.php');
+-        require_once(DOKU_INC . 'inc/geshi.php');
++        require_once('/usr/share/php/geshi.php');
  
--    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
-     $geshi->set_encoding('utf-8');
-     $geshi->enable_classes();
-     $geshi->set_header_type(GESHI_HEADER_PRE);
+-        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
++        $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
+         $geshi->set_encoding('utf-8');
+         $geshi->enable_classes();
+         $geshi->set_header_type(GESHI_HEADER_PRE);
+


Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-12/dokuwiki.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki.spec	29 Sep 2009 20:50:34 -0000	1.1
+++ dokuwiki.spec	9 Dec 2009 13:07:02 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.2.20090214.b%{?dist}
+Release:	0.1.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://www.dokuwiki.org/dokuwiki
-Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
+Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-rc2009-12-02.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-use-fedora-geshi.patch
 #Patch2:		dokuwiki-use-fedora-simplepie.patch
@@ -27,7 +27,7 @@ structured texts. 
 All data is stored in plain text files no database is required. 
 
 %prep
-%setup -q -n %{name}-2009-02-14
+%setup -q -n %{name}-rc2009-12-02
 %patch1 -p1 
 #%patch2 -p1
 %patch3 -p1
@@ -48,7 +48,7 @@ Alias /%{name} %{_datadir}/%{name}
 <Directory %{_datadir}/%{name}>
 	Options +FollowSymLinks
 	Order Allow,Deny
-	Allow from 127.0.0.1
+	Allow from 127.0.0.1 ::1
 </Directory>
 
 <Directory %{_datadir}/%{name}/inc>
@@ -61,6 +61,12 @@ Alias /%{name} %{_datadir}/%{name}
 	Deny from all
 </Directory>
 
+<Directory %{_datadir}/%{name}/lib/_fla>
+	## no access to the fla directory
+	Order allow,deny
+	Deny from all
+</Directory>
+
 <Directory %{_sysconfdir}/%{name}>
 	Order Deny,Allow
 	Deny from all
@@ -84,7 +90,7 @@ rm -rf inc/geshi*
 rm -f inc/EmailAddressValidator.php
 rm -f inc/.htaccess
 rm -f inc/lang/.htaccess
-#rm -f inc/SimplePie.php
+rm -f lib/_fla/{.htaccess,README}
 rm -f lib/plugins/revert/lang/sk/intro.txt
 cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
 cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -127,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/lib/scripts
 %{_datadir}/%{name}/lib/styles
 %{_datadir}/%{name}/lib/tpl
+%{_datadir}/%{name}/lib/_fla
 %attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
 %{_datadir}/%{name}/lib/plugins/*
 %{_datadir}/%{name}/inc
@@ -145,6 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
+- Upgrade to new upstream
+- Fix bugzilla bug #544257
+
 * Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
 - Fixes requested by reviewer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2009 20:50:35 -0000	1.2
+++ sources	9 Dec 2009 13:07:02 -0000	1.3
@@ -1 +1 @@
-c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz
+65e0a7a496e1fd49fb12477211053b55  dokuwiki-rc2009-12-02.tgz



From topdog at fedoraproject.org  Wed Dec  9 13:09:55 2009
From: topdog at fedoraproject.org (topdog)
Date: Wed,  9 Dec 2009 13:09:55 +0000 (UTC)
Subject: rpms/dokuwiki/F-11 .cvsignore, 1.2,
	1.3 dokuwiki-use-fedora-email-valid.patch, 1.1,
	1.2 dokuwiki-use-fedora-geshi.patch, 1.1, 1.2 dokuwiki.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091209130955.7545111C00E0@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19249

Modified Files:
	.cvsignore dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec sources 
Log Message:
* Wed Dec 09 2009 Andrew Colin Kissa <andrew at topdog.za.net>
- Update to latest upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2009 20:54:10 -0000	1.2
+++ .cvsignore	9 Dec 2009 13:09:55 -0000	1.3
@@ -1 +1 @@
-dokuwiki-2009-02-14b.tgz
+dokuwiki-rc2009-12-02.tgz

dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: dokuwiki-use-fedora-email-valid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/dokuwiki-use-fedora-email-valid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-email-valid.patch	29 Sep 2009 20:54:10 -0000	1.1
+++ dokuwiki-use-fedora-email-valid.patch	9 Dec 2009 13:09:55 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
---- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/mail.php dokuwiki-rc2009-12-02/inc/mail.php
+--- dokuwiki-rc2009-12-02.orig/inc/mail.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/mail.php	2009-12-09 12:55:04.412961968 +0200
 @@ -8,7 +8,7 @@
  
  if(!defined('DOKU_INC')) die('meh.');

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: dokuwiki-use-fedora-geshi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/dokuwiki-use-fedora-geshi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-geshi.patch	29 Sep 2009 20:54:10 -0000	1.1
+++ dokuwiki-use-fedora-geshi.patch	9 Dec 2009 13:09:55 -0000	1.2
@@ -1,24 +1,25 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
---- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
-@@ -640,16 +640,16 @@
-   $cache = getCacheName($language.$code,".code");
-   $ctime = @filemtime($cache);
-   if($ctime && !$_REQUEST['purge'] &&
--     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
--     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
-+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
-+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
-      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
-     $highlighted_code = io_readFile($cache, false);
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/parserutils.php dokuwiki-rc2009-12-02/inc/parserutils.php
+--- dokuwiki-rc2009-12-02.orig/inc/parserutils.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/parserutils.php	2009-12-09 12:53:27.151961271 +0200
+@@ -641,16 +641,16 @@
+     $cache = getCacheName($language.$code,".code");
+     $ctime = @filemtime($cache);
+     if($ctime && !$_REQUEST['purge'] &&
+-            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
+-            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
++            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
++            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
+             $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
+         $highlighted_code = io_readFile($cache, false);
  
-   } else {
+     } else {
  
--    require_once(DOKU_INC . 'inc/geshi.php');
-+    require_once('/usr/share/php/geshi.php');
+-        require_once(DOKU_INC . 'inc/geshi.php');
++        require_once('/usr/share/php/geshi.php');
  
--    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
-     $geshi->set_encoding('utf-8');
-     $geshi->enable_classes();
-     $geshi->set_header_type(GESHI_HEADER_PRE);
+-        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
++        $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
+         $geshi->set_encoding('utf-8');
+         $geshi->enable_classes();
+         $geshi->set_header_type(GESHI_HEADER_PRE);
+


Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/dokuwiki.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki.spec	29 Sep 2009 20:54:10 -0000	1.1
+++ dokuwiki.spec	9 Dec 2009 13:09:55 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.2.20090214.b%{?dist}
+Release:	0.1.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://www.dokuwiki.org/dokuwiki
-Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
+Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-rc2009-12-02.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-use-fedora-geshi.patch
 #Patch2:		dokuwiki-use-fedora-simplepie.patch
@@ -27,7 +27,7 @@ structured texts. 
 All data is stored in plain text files no database is required. 
 
 %prep
-%setup -q -n %{name}-2009-02-14
+%setup -q -n %{name}-rc2009-12-02
 %patch1 -p1 
 #%patch2 -p1
 %patch3 -p1
@@ -48,7 +48,7 @@ Alias /%{name} %{_datadir}/%{name}
 <Directory %{_datadir}/%{name}>
 	Options +FollowSymLinks
 	Order Allow,Deny
-	Allow from 127.0.0.1
+	Allow from 127.0.0.1 ::1
 </Directory>
 
 <Directory %{_datadir}/%{name}/inc>
@@ -61,6 +61,12 @@ Alias /%{name} %{_datadir}/%{name}
 	Deny from all
 </Directory>
 
+<Directory %{_datadir}/%{name}/lib/_fla>
+	## no access to the fla directory
+	Order allow,deny
+	Deny from all
+</Directory>
+
 <Directory %{_sysconfdir}/%{name}>
 	Order Deny,Allow
 	Deny from all
@@ -84,7 +90,7 @@ rm -rf inc/geshi*
 rm -f inc/EmailAddressValidator.php
 rm -f inc/.htaccess
 rm -f inc/lang/.htaccess
-#rm -f inc/SimplePie.php
+rm -f lib/_fla/{.htaccess,README}
 rm -f lib/plugins/revert/lang/sk/intro.txt
 cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
 cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -127,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/lib/scripts
 %{_datadir}/%{name}/lib/styles
 %{_datadir}/%{name}/lib/tpl
+%{_datadir}/%{name}/lib/_fla
 %attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
 %{_datadir}/%{name}/lib/plugins/*
 %{_datadir}/%{name}/inc
@@ -145,6 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
+- Upgrade to new upstream
+- Fix bugzilla bug #544257
+
 * Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
 - Fixes requested by reviewer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2009 20:54:10 -0000	1.2
+++ sources	9 Dec 2009 13:09:55 -0000	1.3
@@ -1 +1 @@
-c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz
+65e0a7a496e1fd49fb12477211053b55  dokuwiki-rc2009-12-02.tgz



From topdog at fedoraproject.org  Wed Dec  9 13:12:52 2009
From: topdog at fedoraproject.org (topdog)
Date: Wed,  9 Dec 2009 13:12:52 +0000 (UTC)
Subject: rpms/dokuwiki/F-10 .cvsignore, 1.2,
	1.3 dokuwiki-use-fedora-email-valid.patch, 1.1,
	1.2 dokuwiki-use-fedora-geshi.patch, 1.1, 1.2 dokuwiki.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091209131252.65D9611C00E0@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19845

Modified Files:
	.cvsignore dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec sources 
Log Message:
* Wed Dec 09 2009 Andrew Colin Kissa <andrew at topdog.za.net>
- Update to latest upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2009 20:57:31 -0000	1.2
+++ .cvsignore	9 Dec 2009 13:12:51 -0000	1.3
@@ -1 +1 @@
-dokuwiki-2009-02-14b.tgz
+dokuwiki-rc2009-12-02.tgz

dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: dokuwiki-use-fedora-email-valid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-10/dokuwiki-use-fedora-email-valid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-email-valid.patch	29 Sep 2009 20:57:31 -0000	1.1
+++ dokuwiki-use-fedora-email-valid.patch	9 Dec 2009 13:12:51 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
---- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/mail.php dokuwiki-rc2009-12-02/inc/mail.php
+--- dokuwiki-rc2009-12-02.orig/inc/mail.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/mail.php	2009-12-09 12:55:04.412961968 +0200
 @@ -8,7 +8,7 @@
  
  if(!defined('DOKU_INC')) die('meh.');

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: dokuwiki-use-fedora-geshi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-10/dokuwiki-use-fedora-geshi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-geshi.patch	29 Sep 2009 20:57:31 -0000	1.1
+++ dokuwiki-use-fedora-geshi.patch	9 Dec 2009 13:12:51 -0000	1.2
@@ -1,24 +1,25 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
---- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
-@@ -640,16 +640,16 @@
-   $cache = getCacheName($language.$code,".code");
-   $ctime = @filemtime($cache);
-   if($ctime && !$_REQUEST['purge'] &&
--     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
--     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
-+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
-+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
-      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
-     $highlighted_code = io_readFile($cache, false);
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/parserutils.php dokuwiki-rc2009-12-02/inc/parserutils.php
+--- dokuwiki-rc2009-12-02.orig/inc/parserutils.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/parserutils.php	2009-12-09 12:53:27.151961271 +0200
+@@ -641,16 +641,16 @@
+     $cache = getCacheName($language.$code,".code");
+     $ctime = @filemtime($cache);
+     if($ctime && !$_REQUEST['purge'] &&
+-            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
+-            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
++            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
++            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
+             $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
+         $highlighted_code = io_readFile($cache, false);
  
-   } else {
+     } else {
  
--    require_once(DOKU_INC . 'inc/geshi.php');
-+    require_once('/usr/share/php/geshi.php');
+-        require_once(DOKU_INC . 'inc/geshi.php');
++        require_once('/usr/share/php/geshi.php');
  
--    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
-     $geshi->set_encoding('utf-8');
-     $geshi->enable_classes();
-     $geshi->set_header_type(GESHI_HEADER_PRE);
+-        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
++        $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
+         $geshi->set_encoding('utf-8');
+         $geshi->enable_classes();
+         $geshi->set_header_type(GESHI_HEADER_PRE);
+


Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-10/dokuwiki.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki.spec	29 Sep 2009 20:57:31 -0000	1.1
+++ dokuwiki.spec	9 Dec 2009 13:12:52 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.2.20090214.b%{?dist}
+Release:	0.1.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://www.dokuwiki.org/dokuwiki
-Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
+Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-rc2009-12-02.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-use-fedora-geshi.patch
 #Patch2:		dokuwiki-use-fedora-simplepie.patch
@@ -27,7 +27,7 @@ structured texts. 
 All data is stored in plain text files no database is required. 
 
 %prep
-%setup -q -n %{name}-2009-02-14
+%setup -q -n %{name}-rc2009-12-02
 %patch1 -p1 
 #%patch2 -p1
 %patch3 -p1
@@ -48,7 +48,7 @@ Alias /%{name} %{_datadir}/%{name}
 <Directory %{_datadir}/%{name}>
 	Options +FollowSymLinks
 	Order Allow,Deny
-	Allow from 127.0.0.1
+	Allow from 127.0.0.1 ::1
 </Directory>
 
 <Directory %{_datadir}/%{name}/inc>
@@ -61,6 +61,12 @@ Alias /%{name} %{_datadir}/%{name}
 	Deny from all
 </Directory>
 
+<Directory %{_datadir}/%{name}/lib/_fla>
+	## no access to the fla directory
+	Order allow,deny
+	Deny from all
+</Directory>
+
 <Directory %{_sysconfdir}/%{name}>
 	Order Deny,Allow
 	Deny from all
@@ -84,7 +90,7 @@ rm -rf inc/geshi*
 rm -f inc/EmailAddressValidator.php
 rm -f inc/.htaccess
 rm -f inc/lang/.htaccess
-#rm -f inc/SimplePie.php
+rm -f lib/_fla/{.htaccess,README}
 rm -f lib/plugins/revert/lang/sk/intro.txt
 cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
 cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -127,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/lib/scripts
 %{_datadir}/%{name}/lib/styles
 %{_datadir}/%{name}/lib/tpl
+%{_datadir}/%{name}/lib/_fla
 %attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
 %{_datadir}/%{name}/lib/plugins/*
 %{_datadir}/%{name}/inc
@@ -145,6 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
+- Upgrade to new upstream
+- Fix bugzilla bug #544257
+
 * Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
 - Fixes requested by reviewer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2009 20:57:31 -0000	1.2
+++ sources	9 Dec 2009 13:12:52 -0000	1.3
@@ -1 +1 @@
-c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz
+65e0a7a496e1fd49fb12477211053b55  dokuwiki-rc2009-12-02.tgz



From krnowak at fedoraproject.org  Wed Dec  9 13:16:03 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Wed,  9 Dec 2009 13:16:03 +0000 (UTC)
Subject: File libvtemm-0.22.2.tar.bz2 uploaded to lookaside cache by krnowak
Message-ID: <20091209131603.0E1CA10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libvtemm:

bebeb6627abe1efe55f5941382ba1cac  libvtemm-0.22.2.tar.bz2



From pmatilai at fedoraproject.org  Wed Dec  9 13:16:52 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Wed,  9 Dec 2009 13:16:52 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.90-python-refcounts.patch, NONE, 1.1 rpm.spec,
	1.372, 1.373
Message-ID: <20091209131652.A286911C00E0@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20968

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.90-python-refcounts.patch 
Log Message:
- fix a bunch of python refcount-errors causing major memory leaks


rpm-4.7.90-python-refcounts.patch:
 header-py.c |    4 +++-
 rpmtd-py.c  |    4 +++-
 rpmts-py.c  |    2 ++
 spec-py.c   |    2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE rpm-4.7.90-python-refcounts.patch ---
diff --git a/python/header-py.c b/python/header-py.c
index 0416058..539db0d 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -139,7 +139,9 @@ static PyObject * hdrKeyList(hdrObject * s)
     rpmTag tag;
 
     while ((tag = headerNextTag(hi)) != RPMTAG_NOT_FOUND) {
-	PyList_Append(keys, PyInt_FromLong(tag));
+	PyObject *to = PyInt_FromLong(tag);
+	PyList_Append(keys, to);
+	Py_DECREF(to);
     }
     headerFreeIterator(hi);
 
diff --git a/python/rpmtd-py.c b/python/rpmtd-py.c
index eef35fe..1ba3a3d 100644
--- a/python/rpmtd-py.c
+++ b/python/rpmtd-py.c
@@ -46,7 +46,9 @@ PyObject *rpmtd_AsPyobj(rpmtd td)
     if (array) {
 	res = PyList_New(0);
 	while (rpmtdNext(td) >= 0) {
-	    PyList_Append(res, rpmtd_ItemAsPyobj(td, class));
+	    PyObject *item = rpmtd_ItemAsPyobj(td, class);
+	    PyList_Append(res, item);
+	    Py_DECREF(item);
 	}
     } else {
 	res = rpmtd_ItemAsPyobj(td, class);
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index f774818..745b526 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -351,6 +351,7 @@ rpmts_HdrFromFdno(rpmtsObject * s, PyObject *arg)
 
     if (rpmrc == RPMRC_OK) {
 	ho = hdr_Wrap(&hdr_Type, h);
+	h = headerFree(h); /* ref held by python object */
     } else {
 	Py_INCREF(Py_None);
 	ho = Py_None;
@@ -518,6 +519,7 @@ rpmts_Problems(rpmtsObject * s)
     while (rpmpsNextIterator(psi) >= 0) {
 	PyObject *prob = rpmprob_Wrap(&rpmProblem_Type, rpmpsGetProblem(psi));
 	PyList_Append(problems, prob);
+	Py_DECREF(prob);
     }
     rpmpsFreeIterator(psi);
     rpmpsFree(ps);
diff --git a/python/spec-py.c b/python/spec-py.c
index e162bb3..f5a4b33 100644
--- a/python/spec-py.c
+++ b/python/spec-py.c
@@ -177,6 +177,7 @@ static PyObject * spec_get_sources(specObject *s, void *closure)
 	PyObject *srcUrl = Py_BuildValue("(sii)", source->fullSource, 
 					 source->num, source->flags);
 	PyList_Append(sourceList, srcUrl);
+	Py_DECREF(srcUrl);
     } 
 
     return sourceList;
@@ -192,6 +193,7 @@ static PyObject * spec_get_packages(specObject *s, void *closure)
     for (pkg = spec->packages; pkg; pkg = pkg->next) {
 	PyObject *po = specPkg_Wrap(&specPkg_Type, pkg);
 	PyList_Append(pkgList, po);
+	Py_DECREF(po);
     }
     return pkgList;
 }


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -p -r1.372 -r1.373
--- rpm.spec	8 Dec 2009 14:30:07 -0000	1.372
+++ rpm.spec	9 Dec 2009 13:16:52 -0000	1.373
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.2
+Release: 0.%{snapver}.3
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -38,6 +38,7 @@ Patch3: rpm-4.7.90-fedora-specspo.patch
 
 # Patches already in upstream
 Patch200: rpm-4.7.90-python-bytecompile.patch
+Patch201: rpm-4.7.90-python-refcounts.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -183,6 +184,7 @@ packages on a system.
 %patch3 -p1 -b .fedora-specspo
 
 %patch200 -p1 -b .python-bytecompile
+%patch201 -p1 -b .python-refcounts
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -397,6 +399,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Wed Dec 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.3
+- fix a bunch of python refcount-errors causing major memory leaks
+
 * Mon Dec 07 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.2
 - fix noise from python bytecompile on non-python packages (#539635)
 - make all our -devel [build]requires isa-specific



From topdog at fedoraproject.org  Wed Dec  9 13:17:29 2009
From: topdog at fedoraproject.org (topdog)
Date: Wed,  9 Dec 2009 13:17:29 +0000 (UTC)
Subject: rpms/dokuwiki/EL-5 .cvsignore, 1.2,
	1.3 dokuwiki-use-fedora-email-valid.patch, 1.1,
	1.2 dokuwiki-use-fedora-geshi.patch, 1.1, 1.2 dokuwiki.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091209131729.8C2DB11C00E0@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20956

Modified Files:
	.cvsignore dokuwiki-use-fedora-email-valid.patch 
	dokuwiki-use-fedora-geshi.patch dokuwiki.spec sources 
Log Message:
* Wed Dec 09 2009 Andrew Colin Kissa <andrew at topdog.za.net>
- Upgrade to latest upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2009 21:01:38 -0000	1.2
+++ .cvsignore	9 Dec 2009 13:17:29 -0000	1.3
@@ -1 +1 @@
-dokuwiki-2009-02-14b.tgz
+dokuwiki-rc2009-12-02.tgz

dokuwiki-use-fedora-email-valid.patch:
 mail.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: dokuwiki-use-fedora-email-valid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/EL-5/dokuwiki-use-fedora-email-valid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-email-valid.patch	29 Sep 2009 21:01:38 -0000	1.1
+++ dokuwiki-use-fedora-email-valid.patch	9 Dec 2009 13:17:29 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/mail.php dokuwiki-2009-02-14/inc/mail.php
---- dokuwiki-2009-02-14.orig/inc/mail.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/mail.php	2009-08-06 11:22:21.158226092 +0200
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/mail.php dokuwiki-rc2009-12-02/inc/mail.php
+--- dokuwiki-rc2009-12-02.orig/inc/mail.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/mail.php	2009-12-09 12:55:04.412961968 +0200
 @@ -8,7 +8,7 @@
  
  if(!defined('DOKU_INC')) die('meh.');

dokuwiki-use-fedora-geshi.patch:
 parserutils.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: dokuwiki-use-fedora-geshi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/EL-5/dokuwiki-use-fedora-geshi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki-use-fedora-geshi.patch	29 Sep 2009 21:01:38 -0000	1.1
+++ dokuwiki-use-fedora-geshi.patch	9 Dec 2009 13:17:29 -0000	1.2
@@ -1,24 +1,25 @@
-diff -ruN dokuwiki-2009-02-14.orig/inc/parserutils.php dokuwiki-2009-02-14/inc/parserutils.php
---- dokuwiki-2009-02-14.orig/inc/parserutils.php	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/parserutils.php	2009-08-06 11:07:47.476226013 +0200
-@@ -640,16 +640,16 @@
-   $cache = getCacheName($language.$code,".code");
-   $ctime = @filemtime($cache);
-   if($ctime && !$_REQUEST['purge'] &&
--     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
--     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
-+     $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
-+     $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
-      $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
-     $highlighted_code = io_readFile($cache, false);
+diff -ruN dokuwiki-rc2009-12-02.orig/inc/parserutils.php dokuwiki-rc2009-12-02/inc/parserutils.php
+--- dokuwiki-rc2009-12-02.orig/inc/parserutils.php	2009-12-02 20:50:12.000000000 +0200
++++ dokuwiki-rc2009-12-02/inc/parserutils.php	2009-12-09 12:53:27.151961271 +0200
+@@ -641,16 +641,16 @@
+     $cache = getCacheName($language.$code,".code");
+     $ctime = @filemtime($cache);
+     if($ctime && !$_REQUEST['purge'] &&
+-            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
+-            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
++            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
++            $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') &&  // language syntax definition changed
+             $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
+         $highlighted_code = io_readFile($cache, false);
  
-   } else {
+     } else {
  
--    require_once(DOKU_INC . 'inc/geshi.php');
-+    require_once('/usr/share/php/geshi.php');
+-        require_once(DOKU_INC . 'inc/geshi.php');
++        require_once('/usr/share/php/geshi.php');
  
--    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-+    $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
-     $geshi->set_encoding('utf-8');
-     $geshi->enable_classes();
-     $geshi->set_header_type(GESHI_HEADER_PRE);
+-        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
++        $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
+         $geshi->set_encoding('utf-8');
+         $geshi->enable_classes();
+         $geshi->set_header_type(GESHI_HEADER_PRE);
+


Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/EL-5/dokuwiki.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dokuwiki.spec	29 Sep 2009 21:01:38 -0000	1.1
+++ dokuwiki.spec	9 Dec 2009 13:17:29 -0000	1.2
@@ -1,11 +1,11 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.2.20090214.b%{?dist}
+Release:	0.1.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://www.dokuwiki.org/dokuwiki
-Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2009-02-14b.tgz
+Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-rc2009-12-02.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-use-fedora-geshi.patch
 #Patch2:		dokuwiki-use-fedora-simplepie.patch
@@ -27,7 +27,7 @@ structured texts. 
 All data is stored in plain text files no database is required. 
 
 %prep
-%setup -q -n %{name}-2009-02-14
+%setup -q -n %{name}-rc2009-12-02
 %patch1 -p1 
 #%patch2 -p1
 %patch3 -p1
@@ -48,7 +48,7 @@ Alias /%{name} %{_datadir}/%{name}
 <Directory %{_datadir}/%{name}>
 	Options +FollowSymLinks
 	Order Allow,Deny
-	Allow from 127.0.0.1
+	Allow from 127.0.0.1 ::1
 </Directory>
 
 <Directory %{_datadir}/%{name}/inc>
@@ -61,6 +61,12 @@ Alias /%{name} %{_datadir}/%{name}
 	Deny from all
 </Directory>
 
+<Directory %{_datadir}/%{name}/lib/_fla>
+	## no access to the fla directory
+	Order allow,deny
+	Deny from all
+</Directory>
+
 <Directory %{_sysconfdir}/%{name}>
 	Order Deny,Allow
 	Deny from all
@@ -84,7 +90,7 @@ rm -rf inc/geshi*
 rm -f inc/EmailAddressValidator.php
 rm -f inc/.htaccess
 rm -f inc/lang/.htaccess
-#rm -f inc/SimplePie.php
+rm -f lib/_fla/{.htaccess,README}
 rm -f lib/plugins/revert/lang/sk/intro.txt
 cp -rp data/pages/* $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data/pages/
 cp -rp conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -127,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/lib/scripts
 %{_datadir}/%{name}/lib/styles
 %{_datadir}/%{name}/lib/tpl
+%{_datadir}/%{name}/lib/_fla
 %attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
 %{_datadir}/%{name}/lib/plugins/*
 %{_datadir}/%{name}/inc
@@ -145,6 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
+- Upgrade to new upstream
+- Fix bugzilla bug #544257
+
 * Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
 - Fixes requested by reviewer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2009 21:01:38 -0000	1.2
+++ sources	9 Dec 2009 13:17:29 -0000	1.3
@@ -1 +1 @@
-c75c4781b8698041c3c9b6b0fec2ac2e  dokuwiki-2009-02-14b.tgz
+65e0a7a496e1fd49fb12477211053b55  dokuwiki-rc2009-12-02.tgz



From hadess at fedoraproject.org  Wed Dec  9 13:21:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 13:21:54 +0000 (UTC)
Subject: rpms/fprintd/F-12 0001-Remove-all-use-of-g_error.patch, NONE,
	1.1 fprintd.spec, 1.17, 1.18
Message-ID: <20091209132154.1387211C00E0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/fprintd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22149

Modified Files:
	fprintd.spec 
Added Files:
	0001-Remove-all-use-of-g_error.patch 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.1-16.git04fd09cfa
- Remove use of g_error(), or people think that it crashes when we actually
  abort() (#543194)


0001-Remove-all-use-of-g_error.patch:
 delete.c |   26 +++++++++++++++++---------
 enroll.c |   36 ++++++++++++++++++++++++------------
 list.c   |   26 +++++++++++++++++---------
 verify.c |   43 ++++++++++++++++++++++++++++---------------
 4 files changed, 86 insertions(+), 45 deletions(-)

--- NEW FILE 0001-Remove-all-use-of-g_error.patch ---
>From d4eef9303d28565dcfdcde63becf6d610594bce8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 9 Dec 2009 13:15:57 +0000
Subject: [PATCH] Remove all use of g_error()

Otherwise we get bug reports about crashers that aren't crashers.
---
 tests/delete.c |   26 +++++++++++++++++---------
 tests/enroll.c |   36 ++++++++++++++++++++++++------------
 tests/list.c   |   26 +++++++++++++++++---------
 tests/verify.c |   42 ++++++++++++++++++++++++++++--------------
 4 files changed, 86 insertions(+), 44 deletions(-)

diff --git a/tests/delete.c b/tests/delete.c
index b6e58de..38dccfb 100644
--- a/tests/delete.c
+++ b/tests/delete.c
@@ -31,8 +31,10 @@ static void create_manager(void)
 	GError *error = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-		g_error("Failed to connect to session bus: %s", error->message);
+	if (connection == NULL) {
+		g_print("Failed to connect to session bus: %s\n", error->message);
+		exit (1);
+	}
 
 	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
@@ -47,14 +49,18 @@ static void delete_fingerprints(DBusGProxy *dev, const char *username)
 
 	p = dbus_g_proxy_new_from_proxy(dev, "org.freedesktop.DBus.Properties", NULL);
 	if (!dbus_g_proxy_call (p, "GetAll", &error, G_TYPE_STRING, "net.reactivated.Fprint.Device", G_TYPE_INVALID,
-			   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID))
-		g_error("GetAll on the Properties interface failed: %s", error->message);
+			   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID)) {
+		g_print("GetAll on the Properties interface failed: %s\n", error->message);
+		exit (1);
+	}
 
 	if (!net_reactivated_Fprint_Device_delete_enrolled_fingers(dev, username, &error)) {
-		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE)
-			g_error("ListEnrolledFingers failed: %s", error->message);
-		else
+		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE) {
+			g_print("ListEnrolledFingers failed: %s\n", error->message);
+			exit (1);
+		} else {
 			g_print ("No fingerprints to delete on %s\n", g_value_get_string (g_hash_table_lookup (props, "name")));
+		}
 	} else {
 			g_print ("Fingerprints deleted on %s\n", g_value_get_string (g_hash_table_lookup (props, "name")));
 	}
@@ -69,8 +75,10 @@ static void process_devices(char **argv)
 	char *path;
 	guint i;
 
-	if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error))
-		g_error("list_devices failed: %s", error->message);
+	if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error)) {
+		g_print("list_devices failed: %s\n", error->message);
+		exit (1);
+	}
 	
 	if (devices->len == 0) {
 		g_print("No devices found\n");
diff --git a/tests/enroll.c b/tests/enroll.c
index e7da3b3..260fb17 100644
--- a/tests/enroll.c
+++ b/tests/enroll.c
@@ -31,8 +31,10 @@ static void create_manager(void)
 	GError *error = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-		g_error("Failed to connect to session bus: %s", error->message);
+	if (connection == NULL) {
+		g_print("Failed to connect to session bus: %s\n", error->message);
+		exit (1);
+	}
 
 	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
@@ -45,8 +47,10 @@ static DBusGProxy *open_device(const char *username)
 	gchar *path;
 	DBusGProxy *dev;
 
-	if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error))
-		g_error("list_devices failed: %s", error->message);
+	if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error)) {
+		g_print("list_devices failed: %s\n", error->message);
+		exit (1);
+	}
 	
 	if (path == NULL) {
 		g_print("No devices found\n");
@@ -61,8 +65,10 @@ static DBusGProxy *open_device(const char *username)
 
 	g_free (path);
 
-	if (!net_reactivated_Fprint_Device_claim(dev, username, &error))
-		g_error("failed to claim device: %s", error->message);
+	if (!net_reactivated_Fprint_Device_claim(dev, username, &error)) {
+		g_print("failed to claim device: %s\n", error->message);
+		exit (1);
+	}
 	return dev;
 }
 
@@ -84,8 +90,10 @@ static void do_enroll(DBusGProxy *dev)
 				    &enroll_completed, NULL);
 
 	g_print("Enrolling right index finger.\n");
-	if (!net_reactivated_Fprint_Device_enroll_start(dev, "right-index-finger", &error))
-		g_error("EnrollStart failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_enroll_start(dev, "right-index-finger", &error)) {
+		g_print("EnrollStart failed: %s\n", error->message);
+		exit (1);
+	}
 
 	while (!enroll_completed)
 		g_main_context_iteration(NULL, TRUE);
@@ -93,15 +101,19 @@ static void do_enroll(DBusGProxy *dev)
 	dbus_g_proxy_disconnect_signal(dev, "EnrollStatus",
 		G_CALLBACK(enroll_result), &enroll_completed);
 
-	if (!net_reactivated_Fprint_Device_enroll_stop(dev, &error))
-		g_error("VerifyStop failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_enroll_stop(dev, &error)) {
+		g_print("VerifyStop failed: %s\n", error->message);
+		exit(1);
+	}
 }
 
 static void release_device(DBusGProxy *dev)
 {
 	GError *error = NULL;
-	if (!net_reactivated_Fprint_Device_release(dev, &error))
-		g_error("ReleaseDevice failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_release(dev, &error)) {
+		g_print("ReleaseDevice failed: %s\n", error->message);
+		exit (1);
+	}
 }
 
 int main(int argc, char **argv)
diff --git a/tests/list.c b/tests/list.c
index 561b05a..074457e 100644
--- a/tests/list.c
+++ b/tests/list.c
@@ -31,8 +31,10 @@ static void create_manager(void)
 	GError *error = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-		g_error("Failed to connect to session bus: %s", error->message);
+	if (connection == NULL) {
+		g_print("Failed to connect to session bus: %s\n", error->message);
+		exit (1);
+	}
 
 	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
@@ -48,16 +50,20 @@ static void list_fingerprints(DBusGProxy *dev, const char *username)
 	guint i;
 
 	if (!net_reactivated_Fprint_Device_list_enrolled_fingers(dev, username, &fingers, &error)) {
-		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE)
-			g_error("ListEnrolledFingers failed: %s", error->message);
-		else
+		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE) {
+			g_print("ListEnrolledFingers failed: %s\n", error->message);
+			exit (1);
+		} else {
 			fingers = NULL;
+		}
 	}
 
 	p = dbus_g_proxy_new_from_proxy(dev, "org.freedesktop.DBus.Properties", NULL);
 	if (!dbus_g_proxy_call (p, "GetAll", &error, G_TYPE_STRING, "net.reactivated.Fprint.Device", G_TYPE_INVALID,
-			   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID))
-		g_error("GetAll on the Properties interface failed: %s", error->message);
+			   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID)) {
+		g_print("GetAll on the Properties interface failed: %s\n", error->message);
+		exit (1);
+	}
 
 	if (fingers == NULL || g_strv_length (fingers) == 0) {
 		g_print("User %s has no fingers enrolled for %s.\n", username, g_value_get_string (g_hash_table_lookup (props, "name")));
@@ -85,8 +91,10 @@ static void process_devices(char **argv)
 	char *path;
 	guint i;
 
-	if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error))
-		g_error("list_devices failed: %s", error->message);
+	if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error)) {
+		g_print("list_devices failed: %s\n", error->message);
+		exit (1);
+	}
 	
 	if (devices->len == 0) {
 		g_print("No devices found\n");
diff --git a/tests/verify.c b/tests/verify.c
index eb739cb..69be220 100644
--- a/tests/verify.c
+++ b/tests/verify.c
@@ -36,8 +36,10 @@ static void create_manager(void)
 	GError *error = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-		g_error("Failed to connect to session bus: %s", error->message);
+	if (connection == NULL) {
+		g_print("Failed to connect to session bus: %s\n", error->message);
+		exit (1);
+	}
 
 	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
@@ -50,8 +52,10 @@ static DBusGProxy *open_device(const char *username)
 	gchar *path;
 	DBusGProxy *dev;
 
-	if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error))
-		g_error("list_devices failed: %s", error->message);
+	if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error)) {
+		g_print("list_devices failed: %s\n", error->message);
+		exit (1);
+	}
 	
 	if (path == NULL) {
 		g_print("No devices found\n");
@@ -66,8 +70,10 @@ static DBusGProxy *open_device(const char *username)
 	
 	g_free (path);
 
-	if (!net_reactivated_Fprint_Device_claim(dev, username, &error))
-		g_error("failed to claim device: %s", error->message);
+	if (!net_reactivated_Fprint_Device_claim(dev, username, &error)) {
+		g_print("failed to claim device: %s\n", error->message);
+		exit (1);
+	}
 
 	return dev;
 }
@@ -78,8 +84,10 @@ static void find_finger(DBusGProxy *dev, const char *username)
 	char **fingers;
 	guint i;
 
-	if (!net_reactivated_Fprint_Device_list_enrolled_fingers(dev, username, &fingers, &error))
-		g_error("ListEnrolledFingers failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_list_enrolled_fingers(dev, username, &fingers, &error)) {
+		g_print("ListEnrolledFingers failed: %s\n", error->message);
+		exit (1);
+	}
 
 	if (fingers == NULL || g_strv_length (fingers) == 0) {
 		g_print("No fingers enrolled for this device.\n");
@@ -122,8 +130,10 @@ static void do_verify(DBusGProxy *dev)
 	dbus_g_proxy_connect_signal(dev, "VerifyFingerSelected", G_CALLBACK(verify_finger_selected),
 		NULL, NULL);
 
-	if (!net_reactivated_Fprint_Device_verify_start(dev, finger_name, &error))
-		g_error("VerifyStart failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_verify_start(dev, finger_name, &error)) {
+		g_print("VerifyStart failed: %s\n", error->message);
+		exit (1);
+	}
 
 	while (!verify_completed)
 		g_main_context_iteration(NULL, TRUE);
@@ -131,15 +141,19 @@ static void do_verify(DBusGProxy *dev)
 	dbus_g_proxy_disconnect_signal(dev, "VerifyStatus", G_CALLBACK(verify_result), &verify_completed);
 	dbus_g_proxy_disconnect_signal(dev, "VerifyFingerSelected", G_CALLBACK(verify_finger_selected), NULL);
 
-	if (!net_reactivated_Fprint_Device_verify_stop(dev, &error))
-		g_error("VerifyStop failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_verify_stop(dev, &error)) {
+		g_print("VerifyStop failed: %s\n", error->message);
+		exit (1);
+	}
 }
 
 static void release_device(DBusGProxy *dev)
 {
 	GError *error = NULL;
-	if (!net_reactivated_Fprint_Device_release(dev, &error))
-		g_error("ReleaseDevice failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_release(dev, &error)) {
+		g_print("ReleaseDevice failed: %s\n", error->message);
+		exit (1);
+	}
 }
 
 static const GOptionEntry entries[] = {
-- 
1.6.5.2



Index: fprintd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/F-12/fprintd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fprintd.spec	24 Jul 2009 23:05:15 -0000	1.17
+++ fprintd.spec	9 Dec 2009 13:21:53 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:		fprintd
 Version:	0.1
-Release:	15.git%{short_hash}%{?dist}
+Release:	16.git%{short_hash}%{?dist}
 Summary:	D-Bus service for Fingerprint reader access
 
 Group:		System Environment/Daemons
@@ -17,6 +17,8 @@ Source0:	fprintd-0.1-%{short_hash}.tar.b
 Patch1:		0001-Detect-when-a-device-is-disconnected.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=498368
 Patch2:		polkit1.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=543194
+Patch3:		0001-Remove-all-use-of-g_error.patch
 Url:		http://www.reactivated.net/fprint/wiki/Fprintd
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    s390 s390x
@@ -63,6 +65,7 @@ fingerprint readers access.
 %setup -q -n %{name}-%{version}
 %patch1 -p1
 %patch2 -p1 -b .polkit1
+%patch3 -p1 -b .g_error
 
 autoreconf -i -f
 
@@ -105,6 +108,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 %changelog
+* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.1-16.git04fd09cfa
+- Remove use of g_error(), or people think that it crashes when we actually
+  abort() (#543194)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-15.git04fd09cfa
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From krnowak at fedoraproject.org  Wed Dec  9 13:31:08 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Wed,  9 Dec 2009 13:31:08 +0000 (UTC)
Subject: rpms/libvtemm/devel .cvsignore, 1.2, 1.3 libvtemm.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091209133108.D035611C00E0@cvs1.fedora.phx.redhat.com>

Author: krnowak

Update of /cvs/pkgs/rpms/libvtemm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23619

Modified Files:
	.cvsignore libvtemm.spec sources 
Log Message:
Wed Dec 9 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.22.2-1
- Update to 0.22.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvtemm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2009 12:31:05 -0000	1.2
+++ .cvsignore	9 Dec 2009 13:31:08 -0000	1.3
@@ -1 +1 @@
-libvtemm-0.22.1.tar.bz2
+libvtemm-0.22.2.tar.bz2


Index: libvtemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvtemm/devel/libvtemm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvtemm.spec	16 Nov 2009 12:56:07 -0000	1.2
+++ libvtemm.spec	9 Dec 2009 13:31:08 -0000	1.3
@@ -1,8 +1,8 @@
 %global api 1.2
 
 Name:           libvtemm
-Version:        0.22.1
-Release:        5%{?dist}
+Version:        0.22.2
+Release:        1%{?dist}
 
 Summary:        C++ interface for VTE (a GTK2 terminal emulator widget)
 
@@ -70,7 +70,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS ChangeLog COPYING COPYING.examples NEWS README
+%doc AUTHORS ChangeLog COPYING COPYING.lesser NEWS README
 %doc old_news_and_changelogs/ChangeLog* old_news_and_changelogs/NEWS*
 %{_libdir}/*.so.*
 
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 %doc %{_docdir}/%{name}-%{api}
 
 %changelog
+* Wed Dec 9 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.22.2-1
+- New upstream release.
+
 * Mon Nov 16 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.22.1-5
 - Fix wrong pkgconfig dependency.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvtemm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2009 12:31:06 -0000	1.2
+++ sources	9 Dec 2009 13:31:08 -0000	1.3
@@ -1 +1 @@
-2607e589f20f2a7638f6a6a55bfd3506  libvtemm-0.22.1.tar.bz2
+bebeb6627abe1efe55f5941382ba1cac  libvtemm-0.22.2.tar.bz2



From hadess at fedoraproject.org  Wed Dec  9 13:31:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 13:31:12 +0000 (UTC)
Subject: rpms/gir-repository/F-12 gir-repo-install-dbus-glib.patch,1.2,1.3
Message-ID: <20091209133112.0378611C00E0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gir-repository/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24169

Modified Files:
	gir-repo-install-dbus-glib.patch 
Log Message:
more gir file fixing

gir-repo-install-dbus-glib.patch:
 b/gir/DBusGLib-1.0.gir |    3 ++-
 b/gir/Makefile.am      |    5 +++--
 gir/DBusGLib-1.0.gir   |   10 ++++------
 gir/Makefile.am        |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

Index: gir-repo-install-dbus-glib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/F-12/gir-repo-install-dbus-glib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gir-repo-install-dbus-glib.patch	9 Dec 2009 13:04:09 -0000	1.2
+++ gir-repo-install-dbus-glib.patch	9 Dec 2009 13:31:11 -0000	1.3
@@ -48,3 +48,34 @@ index d79a018..41d273a 100644
    <namespace name="DBusGLib" version="1.0" shared-library="dbus-glib-1">
      <record name="Connection" c:type="DBusGConnection"/>
      <record name="MethodInvocation" c:type="DBusGMethodInvocation"/>
+commit 955452107bd87eecd5c5af3f6552c650fc49bdf2
+Author: Colin Walters <walters at verbum.org>
+Date:   Thu Oct 22 23:01:07 2009 -0400
+
+    [DBusGLib] Add transfer-ownership
+
+diff --git a/gir/DBusGLib-1.0.gir b/gir/DBusGLib-1.0.gir
+index 41d273a..c50bfbb 100644
+--- a/gir/DBusGLib-1.0.gir
++++ b/gir/DBusGLib-1.0.gir
+@@ -12,16 +12,14 @@
+       glib:type-name="DBusGProxy" glib:get-type="dbus_g_proxy_get_type">
+     </class>
+     <record name="ProxyClass" c:type="DBusGProxyClass"/>
+-
+-    <function name="connection_open" c:identifier="dbus_g_connection_open"
+-     throws="1">
++    <function name="connection_open" c:identifier="dbus_g_connection_open" throws="1">
+       <return-value transfer-ownership="full">
+         <type name="Connection" c:type="DBusGConnection*"/>
+       </return-value>
+       <parameters>
+-        <parameter name="address">
+-	  <type name="utf8" c:type="char*"/>
+-	</parameter>
++        <parameter name="address" transfer-ownership="none">
++	      <type name="utf8" c:type="char*"/>
++        </parameter>
+       </parameters>
+     </function>
+   </namespace>



From ingvar at fedoraproject.org  Wed Dec  9 13:36:18 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed,  9 Dec 2009 13:36:18 +0000 (UTC)
Subject: rpms/munin/devel munin.spec,1.29,1.30
Message-ID: <20091209133618.4FD0211C00E0@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25659

Modified Files:
	munin.spec 
Log Message:
- Remove jmx plugins when not supported (like on el4 and older fedora)
- Correct font path on older distros like el5, el4 and fedora<11




Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- munin.spec	4 Dec 2009 20:24:07 -0000	1.29
+++ munin.spec	9 Dec 2009 13:36:18 -0000	1.30
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.4.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -24,9 +24,11 @@ BuildRequires: perl-Module-Build
 # needed for hostname for the defaut config
 BuildRequires: net-tools
 # java buildrequires on fedora
+%if 0%{?rhel} > 4 || 0%{?fedora} > 6
 BuildRequires: java-devel >= 1.6
 BuildRequires: mx4j
 BuildRequires: jpackage-utils
+%endif
 BuildRequires: perl-Net-SNMP
 
 Requires: %{name}-common = %{version}
@@ -100,6 +102,7 @@ maintaining a rattling ease of installat
 This package contains common files that are used by both the server (munin)
 and node (munin-node) packages. 
 
+%if 0%{?rhel} > 4 || 0%{?fedora} > 6
 %package java-plugins
 Group: System Environment/Daemons
 Summary: java-plugins for munin
@@ -108,20 +111,25 @@ BuildArchitectures: noarch
 
 %description java-plugins
 java-plugins for munin-node. 
+%endif
 
 %prep
 %setup -q
 %patch1 -p1
 
 %build
+%if 0%{?rhel} > 4 || 0%{?fedora} > 6
 export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
+%endif
 make 	CONFIG=dists/redhat/Makefile.config
 
 %install
 
 ## Node
 make	CONFIG=dists/redhat/Makefile.config \
+%if 0%{?rhel} > 4 || 0%{?fedora} > 6
 	JAVALIBDIR=%{buildroot}%{_datadir}/java \
+%endif
 	PREFIX=%{buildroot}%{_prefix} \
  	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
 	MANDIR=%{buildroot}%{_mandir} \
@@ -172,8 +180,11 @@ install -m 0644 %{SOURCE6} %{buildroot}/
 
 # Use font from bitstream-vera-fonts-sans-mono
 rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
+%if 0%{?rhel} > 0 || 0%{?fedora} > 10
 ln -s /usr/share/fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-
+%else
+ln -s /usr/share/fonts/bitstream-vera/VeraMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
+%endif 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -265,11 +276,17 @@ exit 0
 %dir %{perl_vendorlib}/Munin
 %{perl_vendorlib}/Munin/Common
 
+%if 0%{?rhel} > 4 || 0%{?fedora} > 6
 %files java-plugins
 %defattr(-, root, root)
 %{_datadir}/java/%{name}-jmx-plugins.jar
+%endif
 
 %changelog
+* Wed Dec 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 1.4.1-2
+- Remove jmx plugins when not supported (like on el4 and older fedora)
+- Correct font path on older distros like el5, el4 and fedora<11
+
 * Fri Dec 04 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.1-1
 - Update to 1.4.1
 



From fabbione at fedoraproject.org  Wed Dec  9 13:36:28 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed,  9 Dec 2009 13:36:28 +0000 (UTC)
Subject: rpms/corosync/F-11 .cvsignore, 1.8, 1.9 corosync.spec, 1.28,
	1.29 sources, 1.9, 1.10
Message-ID: <20091209133628.CAD4711C00E0@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25704

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Oct 2009 07:29:38 -0000	1.8
+++ .cvsignore	9 Dec 2009 13:36:28 -0000	1.9
@@ -1 +1 @@
-corosync-1.1.2.tar.gz
+corosync-1.2.0.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/corosync.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- corosync.spec	23 Oct 2009 07:29:39 -0000	1.28
+++ corosync.spec	9 Dec 2009 13:36:28 -0000	1.29
@@ -1,13 +1,13 @@
-# define alphatag svn1211
+# global alphatag svn1211
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.2
+Version: 1.2.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
-Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
+Source0: http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -16,8 +16,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
+# Build bits
+
 %define buildtrunk 0
-%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -29,7 +30,7 @@ BuildRequires: libibverbs-devel librdmac
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n corosync-%{version}
+%setup -q -n %{name}-%{version}
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -41,7 +42,8 @@ export rdmacm_CFLAGS=-I/usr/include/rdma
 export rdmacm_LIBS=-lrdmacm \
 %{configure} \
 	--enable-nss \
-	--enable-rdma
+	--enable-rdma \
+	--with-initddir=%{_initddir}
 
 %build
 make %{_smp_mflags}
@@ -50,8 +52,6 @@ make %{_smp_mflags}
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
-install -d %{buildroot}%{_initddir}
-install -m 755 init/redhat %{buildroot}%{_initddir}/corosync
 
 ## tree fixup
 # drop static libs
@@ -62,7 +62,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 rm -rf %{buildroot}
 
-%description 
+%description
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
@@ -75,10 +75,7 @@ if [ $1 -eq 0 ]; then
 	/sbin/chkconfig --del corosync || :
 fi
 
-%postun
-[ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || :
-
-%files 
+%files
 %defattr(-,root,root,-)
 %doc LICENSE SECURITY
 %{_sbindir}/corosync
@@ -90,6 +87,7 @@ fi
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %dir %{_sysconfdir}/corosync
+%dir %{_sysconfdir}/corosync/service.d
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %{_initddir}/corosync
@@ -113,7 +111,7 @@ fi
 %package -n corosynclib
 Summary: The Corosync Cluster Engine Libraries
 Group: System Environment/Libraries
-Conflicts: corosync < 0.92-7
+Requires: %{name} = %{version}-%{release}
 
 %description -n corosynclib
 This package contains corosync libraries.
@@ -132,6 +130,7 @@ This package contains corosync libraries
 %{_libdir}/libquorum.so.*
 %{_libdir}/libvotequorum.so.*
 %{_libdir}/libpload.so.*
+%{_libdir}/libsam.so.*
 
 %post -n corosynclib -p /sbin/ldconfig
 
@@ -166,6 +165,7 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/hdb.h
 %{_includedir}/corosync/list.h
 %{_includedir}/corosync/mar_gen.h
+%{_includedir}/corosync/sam.h
 %{_includedir}/corosync/swab.h
 %{_includedir}/corosync/quorum.h
 %{_includedir}/corosync/votequorum.h
@@ -195,19 +195,34 @@ The Corosync Cluster Engine APIs.
 %{_libdir}/libquorum.so
 %{_libdir}/libvotequorum.so
 %{_libdir}/libpload.so
+%{_libdir}/libsam.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/evs_*3*
 %{_mandir}/man3/confdb_*3*
 %{_mandir}/man3/votequorum_*3*
+%{_mandir}/man3/sam_*3*
 %{_mandir}/man8/cpg_overview.8*
 %{_mandir}/man8/evs_overview.8*
 %{_mandir}/man8/confdb_overview.8*
 %{_mandir}/man8/logsys_overview.8*
 %{_mandir}/man8/votequorum_overview.8*
 %{_mandir}/man8/coroipc_overview.8*
+%{_mandir}/man8/sam_overview.8*
 
 %changelog
+* Tue Dec  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.2.0-1
+- New upstream release
+- Use global instead of define
+- Update Source0 url
+- Use more %name macro around
+- Cleanup install section. Init script is now installed by upstream
+- Cleanup whitespace
+- Don't deadlock between package upgrade and corosync condrestart
+- Ship service.d config directory
+- Fix Conflicts vs Requires
+- Ship new sam library and man pages
+
 * Fri Oct 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.2-1
 - New upstream release fixes major regression on specific loads
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Oct 2009 07:29:39 -0000	1.9
+++ sources	9 Dec 2009 13:36:28 -0000	1.10
@@ -1 +1 @@
-03ea8d775b2855fd3c0a1ed5e7705a86  corosync-1.1.2.tar.gz
+789bea831a97977e56900477c3022cc1  corosync-1.2.0.tar.gz



From krnowak at fedoraproject.org  Wed Dec  9 13:43:25 2009
From: krnowak at fedoraproject.org (Krzesimir Nowak)
Date: Wed,  9 Dec 2009 13:43:25 +0000 (UTC)
Subject: rpms/libvtemm/F-12 .cvsignore, 1.2, 1.3 libvtemm.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091209134325.6D15011C00E0@cvs1.fedora.phx.redhat.com>

Author: krnowak

Update of /cvs/pkgs/rpms/libvtemm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27013

Modified Files:
	.cvsignore libvtemm.spec sources 
Log Message:
Wed Dec 9 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.22.2-1
- Updated to 0.22.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvtemm/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2009 12:23:52 -0000	1.2
+++ .cvsignore	9 Dec 2009 13:43:25 -0000	1.3
@@ -1 +1 @@
-libvtemm-0.22.1.tar.bz2
+libvtemm-0.22.2.tar.bz2


Index: libvtemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvtemm/F-12/libvtemm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvtemm.spec	16 Nov 2009 13:07:13 -0000	1.2
+++ libvtemm.spec	9 Dec 2009 13:43:25 -0000	1.3
@@ -1,8 +1,8 @@
 %global api 1.2
 
 Name:           libvtemm
-Version:        0.22.1
-Release:        5%{?dist}
+Version:        0.22.2
+Release:        1%{?dist}
 
 Summary:        C++ interface for VTE (a GTK2 terminal emulator widget)
 
@@ -70,7 +70,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS ChangeLog COPYING COPYING.examples NEWS README
+%doc AUTHORS ChangeLog COPYING COPYING.lesser NEWS README
 %doc old_news_and_changelogs/ChangeLog* old_news_and_changelogs/NEWS*
 %{_libdir}/*.so.*
 
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 %doc %{_docdir}/%{name}-%{api}
 
 %changelog
+* Wed Dec 9 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.22.2-1
+- New upstream release.
+
 * Mon Nov 16 2009 Krzesimir Nowak <qdlacz at gmail.com> - 0.22.1-5
 - Fix wrong pkgconfig dependency.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvtemm/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2009 12:23:53 -0000	1.2
+++ sources	9 Dec 2009 13:43:25 -0000	1.3
@@ -1 +1 @@
-2607e589f20f2a7638f6a6a55bfd3506  libvtemm-0.22.1.tar.bz2
+bebeb6627abe1efe55f5941382ba1cac  libvtemm-0.22.2.tar.bz2



From akurtakov at fedoraproject.org  Wed Dec  9 13:47:36 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  9 Dec 2009 13:47:36 +0000 (UTC)
Subject: File org.python.pydev.feature-1.5.2.1260362205-sources.zip uploaded
	to lookaside cache by akurtakov
Message-ID: <20091209134736.2692E10F87D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-pydev:

b1ceb7a0ac4ab492e30e56e3fd6ef13b  org.python.pydev.feature-1.5.2.1260362205-sources.zip



From akurtakov at fedoraproject.org  Wed Dec  9 13:50:35 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  9 Dec 2009 13:50:35 +0000 (UTC)
Subject: rpms/eclipse-pydev/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 eclipse-pydev.spec, 1.34, 1.35
Message-ID: <20091209135035.6173411C03DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28920/devel

Modified Files:
	.cvsignore sources eclipse-pydev.spec 
Log Message:
Update to 1.5.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	17 Nov 2009 23:50:43 -0000	1.22
+++ .cvsignore	9 Dec 2009 13:50:35 -0000	1.23
@@ -4,3 +4,4 @@ org.python.pydev.feature-1.4.6.2788-sour
 org.python.pydev.feature-1.4.7.2843-sources.zip
 org.python.pydev.feature-1.5.0.1251989166-sources.zip
 org.python.pydev.feature-1.5.1.1258496115-sources.zip
+org.python.pydev.feature-1.5.2.1260362205-sources.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	17 Nov 2009 23:50:43 -0000	1.22
+++ sources	9 Dec 2009 13:50:35 -0000	1.23
@@ -1 +1 @@
-acb3f46bc06a427bbbd0ef7652204ed5  org.python.pydev.feature-1.5.1.1258496115-sources.zip
+b1ceb7a0ac4ab492e30e56e3fd6ef13b  org.python.pydev.feature-1.5.2.1260362205-sources.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- eclipse-pydev.spec	17 Nov 2009 23:50:43 -0000	1.34
+++ eclipse-pydev.spec	9 Dec 2009 13:50:35 -0000	1.35
@@ -1,6 +1,6 @@
 # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
 %global debug_package %{nil}
-%global qualifier 1258496115
+%global qualifier 1260362205
 
 Epoch: 1
 
@@ -9,7 +9,7 @@ Epoch: 1
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          1.5.1
+Version:          1.5.2
 Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.org
@@ -127,6 +127,7 @@ popd
 
 %build
 %{eclipse_base}/buildscripts/pdebuild \
+  -d mylyn \
   -f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o `pwd`/orbitDeps
 
 %{eclipse_base}/buildscripts/pdebuild \
@@ -204,6 +205,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Wed Dec 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.2-1
+- Update to 1.5.2.
+
 * Wed Nov 18 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.1-1
 - Update to 1.5.1.
 



From hadess at fedoraproject.org  Wed Dec  9 13:50:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 13:50:37 +0000 (UTC)
Subject: rpms/fprintd/devel 0001-Remove-all-use-of-g_error.patch, NONE,
	1.1 fprintd.spec, 1.17, 1.18
Message-ID: <20091209135037.18E4011C03DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/fprintd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28941

Modified Files:
	fprintd.spec 
Added Files:
	0001-Remove-all-use-of-g_error.patch 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.1-16.git04fd09cfa
- Remove use of g_error(), or people think that it crashes when we actually
  abort() (#543194)


0001-Remove-all-use-of-g_error.patch:
 delete.c |   26 +++++++++++++++++---------
 enroll.c |   36 ++++++++++++++++++++++++------------
 list.c   |   26 +++++++++++++++++---------
 verify.c |   43 ++++++++++++++++++++++++++++---------------
 4 files changed, 86 insertions(+), 45 deletions(-)

--- NEW FILE 0001-Remove-all-use-of-g_error.patch ---
>From d4eef9303d28565dcfdcde63becf6d610594bce8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 9 Dec 2009 13:15:57 +0000
Subject: [PATCH] Remove all use of g_error()

Otherwise we get bug reports about crashers that aren't crashers.
---
 tests/delete.c |   26 +++++++++++++++++---------
 tests/enroll.c |   36 ++++++++++++++++++++++++------------
 tests/list.c   |   26 +++++++++++++++++---------
 tests/verify.c |   42 ++++++++++++++++++++++++++++--------------
 4 files changed, 86 insertions(+), 44 deletions(-)

diff --git a/tests/delete.c b/tests/delete.c
index b6e58de..38dccfb 100644
--- a/tests/delete.c
+++ b/tests/delete.c
@@ -31,8 +31,10 @@ static void create_manager(void)
 	GError *error = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-		g_error("Failed to connect to session bus: %s", error->message);
+	if (connection == NULL) {
+		g_print("Failed to connect to session bus: %s\n", error->message);
+		exit (1);
+	}
 
 	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
@@ -47,14 +49,18 @@ static void delete_fingerprints(DBusGProxy *dev, const char *username)
 
 	p = dbus_g_proxy_new_from_proxy(dev, "org.freedesktop.DBus.Properties", NULL);
 	if (!dbus_g_proxy_call (p, "GetAll", &error, G_TYPE_STRING, "net.reactivated.Fprint.Device", G_TYPE_INVALID,
-			   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID))
-		g_error("GetAll on the Properties interface failed: %s", error->message);
+			   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID)) {
+		g_print("GetAll on the Properties interface failed: %s\n", error->message);
+		exit (1);
+	}
 
 	if (!net_reactivated_Fprint_Device_delete_enrolled_fingers(dev, username, &error)) {
-		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE)
-			g_error("ListEnrolledFingers failed: %s", error->message);
-		else
+		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE) {
+			g_print("ListEnrolledFingers failed: %s\n", error->message);
+			exit (1);
+		} else {
 			g_print ("No fingerprints to delete on %s\n", g_value_get_string (g_hash_table_lookup (props, "name")));
+		}
 	} else {
 			g_print ("Fingerprints deleted on %s\n", g_value_get_string (g_hash_table_lookup (props, "name")));
 	}
@@ -69,8 +75,10 @@ static void process_devices(char **argv)
 	char *path;
 	guint i;
 
-	if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error))
-		g_error("list_devices failed: %s", error->message);
+	if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error)) {
+		g_print("list_devices failed: %s\n", error->message);
+		exit (1);
+	}
 	
 	if (devices->len == 0) {
 		g_print("No devices found\n");
diff --git a/tests/enroll.c b/tests/enroll.c
index e7da3b3..260fb17 100644
--- a/tests/enroll.c
+++ b/tests/enroll.c
@@ -31,8 +31,10 @@ static void create_manager(void)
 	GError *error = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-		g_error("Failed to connect to session bus: %s", error->message);
+	if (connection == NULL) {
+		g_print("Failed to connect to session bus: %s\n", error->message);
+		exit (1);
+	}
 
 	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
@@ -45,8 +47,10 @@ static DBusGProxy *open_device(const char *username)
 	gchar *path;
 	DBusGProxy *dev;
 
-	if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error))
-		g_error("list_devices failed: %s", error->message);
+	if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error)) {
+		g_print("list_devices failed: %s\n", error->message);
+		exit (1);
+	}
 	
 	if (path == NULL) {
 		g_print("No devices found\n");
@@ -61,8 +65,10 @@ static DBusGProxy *open_device(const char *username)
 
 	g_free (path);
 
-	if (!net_reactivated_Fprint_Device_claim(dev, username, &error))
-		g_error("failed to claim device: %s", error->message);
+	if (!net_reactivated_Fprint_Device_claim(dev, username, &error)) {
+		g_print("failed to claim device: %s\n", error->message);
+		exit (1);
+	}
 	return dev;
 }
 
@@ -84,8 +90,10 @@ static void do_enroll(DBusGProxy *dev)
 				    &enroll_completed, NULL);
 
 	g_print("Enrolling right index finger.\n");
-	if (!net_reactivated_Fprint_Device_enroll_start(dev, "right-index-finger", &error))
-		g_error("EnrollStart failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_enroll_start(dev, "right-index-finger", &error)) {
+		g_print("EnrollStart failed: %s\n", error->message);
+		exit (1);
+	}
 
 	while (!enroll_completed)
 		g_main_context_iteration(NULL, TRUE);
@@ -93,15 +101,19 @@ static void do_enroll(DBusGProxy *dev)
 	dbus_g_proxy_disconnect_signal(dev, "EnrollStatus",
 		G_CALLBACK(enroll_result), &enroll_completed);
 
-	if (!net_reactivated_Fprint_Device_enroll_stop(dev, &error))
-		g_error("VerifyStop failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_enroll_stop(dev, &error)) {
+		g_print("VerifyStop failed: %s\n", error->message);
+		exit(1);
+	}
 }
 
 static void release_device(DBusGProxy *dev)
 {
 	GError *error = NULL;
-	if (!net_reactivated_Fprint_Device_release(dev, &error))
-		g_error("ReleaseDevice failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_release(dev, &error)) {
+		g_print("ReleaseDevice failed: %s\n", error->message);
+		exit (1);
+	}
 }
 
 int main(int argc, char **argv)
diff --git a/tests/list.c b/tests/list.c
index 561b05a..074457e 100644
--- a/tests/list.c
+++ b/tests/list.c
@@ -31,8 +31,10 @@ static void create_manager(void)
 	GError *error = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-		g_error("Failed to connect to session bus: %s", error->message);
+	if (connection == NULL) {
+		g_print("Failed to connect to session bus: %s\n", error->message);
+		exit (1);
+	}
 
 	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
@@ -48,16 +50,20 @@ static void list_fingerprints(DBusGProxy *dev, const char *username)
 	guint i;
 
 	if (!net_reactivated_Fprint_Device_list_enrolled_fingers(dev, username, &fingers, &error)) {
-		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE)
-			g_error("ListEnrolledFingers failed: %s", error->message);
-		else
+		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE) {
+			g_print("ListEnrolledFingers failed: %s\n", error->message);
+			exit (1);
+		} else {
 			fingers = NULL;
+		}
 	}
 
 	p = dbus_g_proxy_new_from_proxy(dev, "org.freedesktop.DBus.Properties", NULL);
 	if (!dbus_g_proxy_call (p, "GetAll", &error, G_TYPE_STRING, "net.reactivated.Fprint.Device", G_TYPE_INVALID,
-			   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID))
-		g_error("GetAll on the Properties interface failed: %s", error->message);
+			   dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID)) {
+		g_print("GetAll on the Properties interface failed: %s\n", error->message);
+		exit (1);
+	}
 
 	if (fingers == NULL || g_strv_length (fingers) == 0) {
 		g_print("User %s has no fingers enrolled for %s.\n", username, g_value_get_string (g_hash_table_lookup (props, "name")));
@@ -85,8 +91,10 @@ static void process_devices(char **argv)
 	char *path;
 	guint i;
 
-	if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error))
-		g_error("list_devices failed: %s", error->message);
+	if (!net_reactivated_Fprint_Manager_get_devices(manager, &devices, &error)) {
+		g_print("list_devices failed: %s\n", error->message);
+		exit (1);
+	}
 	
 	if (devices->len == 0) {
 		g_print("No devices found\n");
diff --git a/tests/verify.c b/tests/verify.c
index eb739cb..69be220 100644
--- a/tests/verify.c
+++ b/tests/verify.c
@@ -36,8 +36,10 @@ static void create_manager(void)
 	GError *error = NULL;
 
 	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-	if (connection == NULL)
-		g_error("Failed to connect to session bus: %s", error->message);
+	if (connection == NULL) {
+		g_print("Failed to connect to session bus: %s\n", error->message);
+		exit (1);
+	}
 
 	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
@@ -50,8 +52,10 @@ static DBusGProxy *open_device(const char *username)
 	gchar *path;
 	DBusGProxy *dev;
 
-	if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error))
-		g_error("list_devices failed: %s", error->message);
+	if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error)) {
+		g_print("list_devices failed: %s\n", error->message);
+		exit (1);
+	}
 	
 	if (path == NULL) {
 		g_print("No devices found\n");
@@ -66,8 +70,10 @@ static DBusGProxy *open_device(const char *username)
 	
 	g_free (path);
 
-	if (!net_reactivated_Fprint_Device_claim(dev, username, &error))
-		g_error("failed to claim device: %s", error->message);
+	if (!net_reactivated_Fprint_Device_claim(dev, username, &error)) {
+		g_print("failed to claim device: %s\n", error->message);
+		exit (1);
+	}
 
 	return dev;
 }
@@ -78,8 +84,10 @@ static void find_finger(DBusGProxy *dev, const char *username)
 	char **fingers;
 	guint i;
 
-	if (!net_reactivated_Fprint_Device_list_enrolled_fingers(dev, username, &fingers, &error))
-		g_error("ListEnrolledFingers failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_list_enrolled_fingers(dev, username, &fingers, &error)) {
+		g_print("ListEnrolledFingers failed: %s\n", error->message);
+		exit (1);
+	}
 
 	if (fingers == NULL || g_strv_length (fingers) == 0) {
 		g_print("No fingers enrolled for this device.\n");
@@ -122,8 +130,10 @@ static void do_verify(DBusGProxy *dev)
 	dbus_g_proxy_connect_signal(dev, "VerifyFingerSelected", G_CALLBACK(verify_finger_selected),
 		NULL, NULL);
 
-	if (!net_reactivated_Fprint_Device_verify_start(dev, finger_name, &error))
-		g_error("VerifyStart failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_verify_start(dev, finger_name, &error)) {
+		g_print("VerifyStart failed: %s\n", error->message);
+		exit (1);
+	}
 
 	while (!verify_completed)
 		g_main_context_iteration(NULL, TRUE);
@@ -131,15 +141,19 @@ static void do_verify(DBusGProxy *dev)
 	dbus_g_proxy_disconnect_signal(dev, "VerifyStatus", G_CALLBACK(verify_result), &verify_completed);
 	dbus_g_proxy_disconnect_signal(dev, "VerifyFingerSelected", G_CALLBACK(verify_finger_selected), NULL);
 
-	if (!net_reactivated_Fprint_Device_verify_stop(dev, &error))
-		g_error("VerifyStop failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_verify_stop(dev, &error)) {
+		g_print("VerifyStop failed: %s\n", error->message);
+		exit (1);
+	}
 }
 
 static void release_device(DBusGProxy *dev)
 {
 	GError *error = NULL;
-	if (!net_reactivated_Fprint_Device_release(dev, &error))
-		g_error("ReleaseDevice failed: %s", error->message);
+	if (!net_reactivated_Fprint_Device_release(dev, &error)) {
+		g_print("ReleaseDevice failed: %s\n", error->message);
+		exit (1);
+	}
 }
 
 static const GOptionEntry entries[] = {
-- 
1.6.5.2



Index: fprintd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/fprintd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fprintd.spec	24 Jul 2009 23:05:15 -0000	1.17
+++ fprintd.spec	9 Dec 2009 13:50:36 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:		fprintd
 Version:	0.1
-Release:	15.git%{short_hash}%{?dist}
+Release:	16.git%{short_hash}%{?dist}
 Summary:	D-Bus service for Fingerprint reader access
 
 Group:		System Environment/Daemons
@@ -17,6 +17,8 @@ Source0:	fprintd-0.1-%{short_hash}.tar.b
 Patch1:		0001-Detect-when-a-device-is-disconnected.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=498368
 Patch2:		polkit1.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=543194
+Patch3:		0001-Remove-all-use-of-g_error.patch
 Url:		http://www.reactivated.net/fprint/wiki/Fprintd
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    s390 s390x
@@ -63,6 +65,7 @@ fingerprint readers access.
 %setup -q -n %{name}-%{version}
 %patch1 -p1
 %patch2 -p1 -b .polkit1
+%patch3 -p1 -b .g_error
 
 autoreconf -i -f
 
@@ -105,6 +108,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 %changelog
+* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.1-16.git04fd09cfa
+- Remove use of g_error(), or people think that it crashes when we actually
+  abort() (#543194)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-15.git04fd09cfa
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Wed Dec  9 13:51:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 13:51:52 +0000 (UTC)
Subject: rpms/gir-repository/devel gir-repo-install-dbus-glib.patch, NONE,
	1.1 gir-repository.spec, 1.11, 1.12
Message-ID: <20091209135152.3D34811C00E0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29586

Modified Files:
	gir-repository.spec 
Added Files:
	gir-repo-install-dbus-glib.patch 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.6.5-3
- Install the DBusGlib bindings


gir-repo-install-dbus-glib.patch:
 b/gir/DBusGLib-1.0.gir |    3 ++-
 b/gir/Makefile.am      |    5 +++--
 gir/DBusGLib-1.0.gir   |   10 ++++------
 gir/Makefile.am        |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE gir-repo-install-dbus-glib.patch ---
diff --git a/gir/Makefile.am b/gir/Makefile.am
index b7ce585..5a362b8 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -12,8 +12,7 @@ CUSTOM_GIRSOURCES += $(AVAHI_GIRSOURCES)
 endif
 EXTRA_DIST += $(AVAHI_GIRSOURCES)
 
-MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \
-			    TelepathyGLib.gir \
+MISSIONCONTROL_GIRSOURCES = TelepathyGLib.gir \
 			    LibTelepathy.gir
 if BUILD_MISSIONCONTROL
 CUSTOM_GIRSOURCES += $(MISSIONCONTROL_GIRSOURCES)
@@ -29,6 +28,8 @@ libgirepo_DBus_custom_la_SOURCES = 	\
 EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h
 
 if BUILD_DBUS
+BUILT_GIRSOURCES += DBusGLib-1.0.gir
+
 DBus-1.0.gir: libgirepo-DBus-custom.la
 	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 5a362b8..40bb44b 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -28,7 +28,7 @@ libgirepo_DBus_custom_la_SOURCES = 	\
 EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h
 
 if BUILD_DBUS
-BUILT_GIRSOURCES += DBusGLib-1.0.gir
+CUSTOM_GIRSOURCES += DBusGLib-1.0.gir
 
 DBus-1.0.gir: libgirepo-DBus-custom.la
 	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
diff --git a/gir/DBusGLib-1.0.gir b/gir/DBusGLib-1.0.gir
index d79a018..41d273a 100644
--- a/gir/DBusGLib-1.0.gir
+++ b/gir/DBusGLib-1.0.gir
@@ -3,7 +3,8 @@
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0"
 	    xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <include name="GObject"/>
+  <include name="GObject" version="2.0"/>
+  <package name="dbus-glib-1"/>
   <namespace name="DBusGLib" version="1.0" shared-library="dbus-glib-1">
     <record name="Connection" c:type="DBusGConnection"/>
     <record name="MethodInvocation" c:type="DBusGMethodInvocation"/>
commit 955452107bd87eecd5c5af3f6552c650fc49bdf2
Author: Colin Walters <walters at verbum.org>
Date:   Thu Oct 22 23:01:07 2009 -0400

    [DBusGLib] Add transfer-ownership

diff --git a/gir/DBusGLib-1.0.gir b/gir/DBusGLib-1.0.gir
index 41d273a..c50bfbb 100644
--- a/gir/DBusGLib-1.0.gir
+++ b/gir/DBusGLib-1.0.gir
@@ -12,16 +12,14 @@
       glib:type-name="DBusGProxy" glib:get-type="dbus_g_proxy_get_type">
     </class>
     <record name="ProxyClass" c:type="DBusGProxyClass"/>
-
-    <function name="connection_open" c:identifier="dbus_g_connection_open"
-     throws="1">
+    <function name="connection_open" c:identifier="dbus_g_connection_open" throws="1">
       <return-value transfer-ownership="full">
         <type name="Connection" c:type="DBusGConnection*"/>
       </return-value>
       <parameters>
-        <parameter name="address">
-	  <type name="utf8" c:type="char*"/>
-	</parameter>
+        <parameter name="address" transfer-ownership="none">
+	      <type name="utf8" c:type="char*"/>
+        </parameter>
       </parameters>
     </function>
   </namespace>


Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gir-repository.spec	9 Sep 2009 20:16:27 -0000	1.11
+++ gir-repository.spec	9 Dec 2009 13:51:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gir-repository
 Version:        0.6.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Introspection for GNOME libraries
 
 Group:          Development/Libraries
@@ -30,12 +30,9 @@ BuildRequires:  unique-devel
 BuildRequires:  vte-devel
 BuildRequires:  WebKit-gtk-devel
 
-# Add these for autoreconf due to gst patch
-BuildRequires: intltool
-BuildRequires: gettext
-BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
+# https://bugzilla.gnome.org/show_bug.cgi?id=604167
+Patch0:        gir-repo-install-dbus-glib.patch
+BuildRequires: autoconf automake libtool gettext intltool
 
 %description
 Introspection system for GNOME libraries; see the gobject-introspection package.
@@ -51,6 +48,7 @@ Libraries and headers for gir-repository
 
 %prep
 %setup -q
+%patch0 -p1 -b .dbus-glib
 
 %build
 autoreconf
@@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.6.5-3
+- Install the DBusGlib bindings
+
 * Wed Sep 09 2009 Colin Walters <walters at verbum.org> - 0.6.5-2
 - rebuilt
 



From tmraz at fedoraproject.org  Wed Dec  9 14:12:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  9 Dec 2009 14:12:45 +0000 (UTC)
Subject: rpms/workrave/F-11 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 workrave.spec, 1.21, 1.22 workrave-1.9.0-gcc44.patch, 1.1, NONE
Message-ID: <20091209141245.7A0A411C00E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1849

Modified Files:
	.cvsignore sources workrave.spec 
Removed Files:
	workrave-1.9.0-gcc44.patch 
Log Message:
* Tue Dec  9 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.1-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Sep 2008 13:14:06 -0000	1.7
+++ .cvsignore	9 Dec 2009 14:12:44 -0000	1.8
@@ -1 +1 @@
-workrave-1.9.0-3.tar.gz
+workrave-1.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Sep 2008 13:14:06 -0000	1.7
+++ sources	9 Dec 2009 14:12:44 -0000	1.8
@@ -1 +1 @@
-aaf7371db1200d65b255d95abd5d1fd1  workrave-1.9.0-3.tar.gz
+065775ee4fdb3e21e12cbf0907d31b88  workrave-1.9.1.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-11/workrave.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- workrave.spec	27 Feb 2009 09:38:00 -0000	1.21
+++ workrave.spec	9 Dec 2009 14:12:44 -0000	1.22
@@ -1,14 +1,12 @@
 Name: workrave
-Version: 1.9.0
-Release: 3%{?dist}
+Version: 1.9.1
+Release: 1%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag at wieers.com> and Steve Ratcliffe
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
-# For some reason the upstream tarball contains the -3 added to the version.
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-3.tar.gz
-Patch1: workrave-1.9.0-gcc44.patch
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -18,6 +16,7 @@ BuildRequires:  gnome-panel-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXmu-devel
 BuildRequires:  libXt-devel
+BuildRequires:  libXtst-devel
 BuildRequires:  gdome2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  gstreamer-devel
@@ -32,7 +31,6 @@ take micro-pauses, rest breaks and restr
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .gcc44
 
 %build
 if [ ! -x configure ]; then
@@ -76,6 +74,12 @@ desktop-file-install --vendor fedora    
 %{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
+* Tue Dec  9 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.1-1
+- new upstream version
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Feb 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.0-3
 - fix build with new gcc 4.4 and glibc
 


--- workrave-1.9.0-gcc44.patch DELETED ---



From tmraz at fedoraproject.org  Wed Dec  9 14:14:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  9 Dec 2009 14:14:01 +0000 (UTC)
Subject: rpms/workrave/F-12 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 workrave.spec, 1.22, 1.23 workrave-1.9.0-gcc44.patch, 1.1, NONE
Message-ID: <20091209141401.A81AC11C00E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/workrave/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2274

Modified Files:
	.cvsignore sources workrave.spec 
Removed Files:
	workrave-1.9.0-gcc44.patch 
Log Message:
* Tue Dec  9 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.1-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Sep 2008 13:14:06 -0000	1.7
+++ .cvsignore	9 Dec 2009 14:14:01 -0000	1.8
@@ -1 +1 @@
-workrave-1.9.0-3.tar.gz
+workrave-1.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Sep 2008 13:14:06 -0000	1.7
+++ sources	9 Dec 2009 14:14:01 -0000	1.8
@@ -1 +1 @@
-aaf7371db1200d65b255d95abd5d1fd1  workrave-1.9.0-3.tar.gz
+065775ee4fdb3e21e12cbf0907d31b88  workrave-1.9.1.tar.gz


Index: workrave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/workrave/F-12/workrave.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- workrave.spec	27 Jul 2009 07:25:38 -0000	1.22
+++ workrave.spec	9 Dec 2009 14:14:01 -0000	1.23
@@ -1,14 +1,12 @@
 Name: workrave
-Version: 1.9.0
-Release: 4%{?dist}
+Version: 1.9.1
+Release: 1%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag at wieers.com> and Steve Ratcliffe
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
-# For some reason the upstream tarball contains the -3 added to the version.
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-3.tar.gz
-Patch1: workrave-1.9.0-gcc44.patch
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -18,6 +16,7 @@ BuildRequires:  gnome-panel-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXmu-devel
 BuildRequires:  libXt-devel
+BuildRequires:  libXtst-devel
 BuildRequires:  gdome2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  gstreamer-devel
@@ -32,7 +31,6 @@ take micro-pauses, rest breaks and restr
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .gcc44
 
 %build
 if [ ! -x configure ]; then
@@ -76,6 +74,9 @@ desktop-file-install --vendor fedora    
 %{_datadir}/dbus-1/services/org.workrave.Workrave.service
 
 %changelog
+* Tue Dec  9 2009 Tomas Mraz <tmraz at redhat.com> - 1.9.1-1
+- new upstream version
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- workrave-1.9.0-gcc44.patch DELETED ---



From hadess at fedoraproject.org  Wed Dec  9 14:20:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 14:20:24 +0000 (UTC)
Subject: File obexd-0.20.tar.gz uploaded to lookaside cache by hadess
Message-ID: <20091209142024.14B3010F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for obexd:

338277019f2beb0ceb4561f68585a5e4  obexd-0.20.tar.gz



From hadess at fedoraproject.org  Wed Dec  9 14:20:36 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 14:20:36 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore, 1.18, 1.19 obexd.spec, 1.19,
	1.20 sources, 1.18, 1.19
Message-ID: <20091209142036.6A6AD11C03DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3619

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.20-1
- Update to 0.20



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	19 Nov 2009 18:09:05 -0000	1.18
+++ .cvsignore	9 Dec 2009 14:20:35 -0000	1.19
@@ -1 +1 @@
-obexd-0.19.tar.gz
+obexd-0.20.tar.gz


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- obexd.spec	19 Nov 2009 18:41:44 -0000	1.19
+++ obexd.spec	9 Dec 2009 14:20:36 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		obexd
-Version:	0.19
+Version:	0.20
 Release:	1%{?dist}
 Summary:	D-Bus service for Obex Client access
 
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.20-1
+- Update to 0.20
+
 * Thu Nov 19 2009 Bastien Nocera <bnocera at redhat.com> 0.19-1
 - Update to 0.19
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	19 Nov 2009 18:09:05 -0000	1.18
+++ sources	9 Dec 2009 14:20:36 -0000	1.19
@@ -1 +1 @@
-2f03b81411a1f7c359ada35459d946a5  obexd-0.19.tar.gz
+338277019f2beb0ceb4561f68585a5e4  obexd-0.20.tar.gz



From karsten at fedoraproject.org  Wed Dec  9 14:25:05 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed,  9 Dec 2009 14:25:05 +0000 (UTC)
Subject: rpms/automake/F-12 .cvsignore, 1.22, 1.23 automake.spec, 1.44,
	1.45 sources, 1.22, 1.23
Message-ID: <20091209142505.75B6A11C00E0@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/automake/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4661

Modified Files:
	.cvsignore automake.spec sources 
Log Message:
- update to version 1.11.1 to fix CVE-2009-4029
- preserve time stamps of man pages (#225302)
- drop MIT from list of licenses



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/automake/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	25 May 2009 11:40:04 -0000	1.22
+++ .cvsignore	9 Dec 2009 14:25:05 -0000	1.23
@@ -1 +1 @@
-automake-1.11.tar.bz2
+automake-1.11.1.tar.bz2


Index: automake.spec
===================================================================
RCS file: /cvs/extras/rpms/automake/F-12/automake.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- automake.spec	24 Jul 2009 17:37:45 -0000	1.44
+++ automake.spec	9 Dec 2009 14:25:05 -0000	1.45
@@ -2,9 +2,9 @@
 
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
-Version:    %{api_version}
-Release:    3%{?dist}
-License:    GPLv2+ and GFDL and MIT 
+Version:    %{api_version}.1
+Release:    1%{?dist}
+License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
 Source1:    filter-provides-automake.sh
@@ -19,6 +19,11 @@ Requires(preun): /sbin/install-info
 BuildArch:  noarch
 Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# for better tests coverage:
+BuildRequires: libtool gettext-devel flex bison texinfo-tex texlive-dvips
+BuildRequires: gcc-java java-devel-openjdk gcc-gfortran /usr/bin/g77
+BuildRequires: dejagnu expect emacs imake python-docutils vala
+
 %define _use_internal_dependency_generator 0
 %define __find_provides %{SOURCE1}
 %define __find_requires %{SOURCE2}
@@ -48,8 +53,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_mandir}/man1/automake.1
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man1/aclocal.1
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_mandir}/man1/automake.1
+install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man1/aclocal.1
 
 # create this dir empty so we can own it
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
@@ -80,6 +85,19 @@ fi
 %dir %{_datadir}/aclocal
 
 %changelog
+* Wed Dec 09 2009 Karsten Hopp <karsten at redhat.com> 1.11.1-1
+- update to version 1.11.1 to fix CVE-2009-4029
+
+* Tue Dec 01 2009 Karsten Hopp <karsten at redhat.com> 1.11-6
+- preserve time stamps of man pages (#225302)
+- drop MIT from list of licenses
+
+* Wed Nov  4 2009 Stepan Kasal <skasal at redhat.com> - 1.11-5
+- add even more testsuite build requires
+
+* Wed Nov  4 2009 Stepan Kasal <skasal at redhat.com> - 1.11-4
+- add build requires for testsuite
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/automake/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	25 May 2009 11:40:04 -0000	1.22
+++ sources	9 Dec 2009 14:25:05 -0000	1.23
@@ -1 +1 @@
-4db4efe027e26b33930a7e151de19d0f  automake-1.11.tar.bz2
+c2972c4d9b3e29c03d5f2af86249876f  automake-1.11.1.tar.bz2



From kyle at fedoraproject.org  Wed Dec  9 14:28:46 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed,  9 Dec 2009 14:28:46 +0000 (UTC)
Subject: rpms/kernel/devel
	ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch, NONE,
	1.1 kernel.spec, 1.1869, 1.1870
Message-ID: <20091209142846.2192911C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5541

Modified Files:
	kernel.spec 
Added Files:
	ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch 
Log Message:
* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-7
- ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch: CVE-2009-4131
  fix insufficient permission checking which could result in arbitrary
  data corruption by a local unprivileged user.


ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch:
 ioctl.c       |   28 ++++++++++++++++++----------
 move_extent.c |    8 +++++++-
 2 files changed, 25 insertions(+), 11 deletions(-)

--- NEW FILE ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch ---
>From 910123ba363623f15ffb5d05dd87bdf06d08c609 Mon Sep 17 00:00:00 2001
From: Akira Fujita <a-fujita at rs.jp.nec.com>
Date: Sun, 6 Dec 2009 23:38:31 -0500
Subject: [PATCH] ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT

This patch fixes three problems in the handling of the
EXT4_IOC_MOVE_EXT ioctl:

1. In current EXT4_IOC_MOVE_EXT, there are read access mode checks for
original and donor files, but they allow the illegal write access to
donor file, since donor file is overwritten by original file data.  To
fix this problem, change access mode checks of original (r->r/w) and
donor (r->w) files.

2.  Disallow the use of donor files that have a setuid or setgid bits.

3.  Call mnt_want_write() and mnt_drop_write() before and after
ext4_move_extents() calling to get write access to a mount.

Signed-off-by: Akira Fujita <a-fujita at rs.jp.nec.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

 fs/ext4/ioctl.c       |   28 ++++++++++++++++++----------
 fs/ext4/move_extent.c |    7 +++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index c1cdf61..6cc8a09 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -221,31 +221,39 @@ setversion_out:
 		struct file *donor_filp;
 		int err;
 
+		if (!(filp->f_mode & FMODE_READ) ||
+		    !(filp->f_mode & FMODE_WRITE))
+			return -EBADF;
+
 		if (copy_from_user(&me,
 			(struct move_extent __user *)arg, sizeof(me)))
 			return -EFAULT;
+		me.moved_len = 0;
 
 		donor_filp = fget(me.donor_fd);
 		if (!donor_filp)
 			return -EBADF;
 
-		if (!capable(CAP_DAC_OVERRIDE)) {
-			if ((current->real_cred->fsuid != inode->i_uid) ||
-				!(inode->i_mode & S_IRUSR) ||
-				!(donor_filp->f_dentry->d_inode->i_mode &
-				S_IRUSR)) {
-				fput(donor_filp);
-				return -EACCES;
-			}
+		if (!(donor_filp->f_mode & FMODE_WRITE)) {
+			err = -EBADF;
+			goto mext_out;
 		}
 
+		err = mnt_want_write(filp->f_path.mnt);
+		if (err)
+			goto mext_out;
+
 		err = ext4_move_extents(filp, donor_filp, me.orig_start,
 					me.donor_start, me.len, &me.moved_len);
-		fput(donor_filp);
+		mnt_drop_write(filp->f_path.mnt);
+		if (me.moved_len > 0)
+			file_remove_suid(donor_filp);
 
 		if (copy_to_user((struct move_extent *)arg, &me, sizeof(me)))
-			return -EFAULT;
+			err = -EFAULT;
 
+mext_out:
+		fput(donor_filp);
 		return err;
 	}
 
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 25b6b14..0100ff9 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -985,6 +985,13 @@ mext_check_arguments(struct inode *orig_inode,
 		return -EINVAL;
 	}
 
+	if (donor_inode->i_mode & (S_ISUID|S_ISGID)) {
+		ext4_debug("ext4 move extent: suid or sgid is set"
+			   " to donor file [ino:orig %lu, donor %lu]\n",
+			   orig_inode->i_ino, donor_inode->i_ino);
+		return -EINVAL;
+	}
+
 	/* Ext4 move extent does not support swapfile */
 	if (IS_SWAPFILE(orig_inode) || IS_SWAPFILE(donor_inode)) {
 		ext4_debug("ext4 move extent: The argument files should "
-- 
1.6.5.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1869
retrieving revision 1.1870
diff -u -p -r1.1869 -r1.1870
--- kernel.spec	9 Dec 2009 01:32:09 -0000	1.1869
+++ kernel.spec	9 Dec 2009 14:28:45 -0000	1.1870
@@ -727,6 +727,9 @@ Patch12010: linux-2.6-dell-laptop-rfkill
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
+# rhbz#544471
+Patch12014: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1342,6 +1345,9 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 # Patches headed upstream
 ApplyPatch linux-2.6-rfkill-all.patch
 
+# rhbz#544471
+ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1997,6 +2003,11 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-7
+- ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch: CVE-2009-4131
+  fix insufficient permission checking which could result in arbitrary
+  data corruption by a local unprivileged user.
+
 * Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-6
 - Copy fix for #540580 from F-12.
 



From kyle at fedoraproject.org  Wed Dec  9 14:29:02 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed,  9 Dec 2009 14:29:02 +0000 (UTC)
Subject: rpms/kernel/F-12
	ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch, NONE,
	1.1 kernel.spec, 1.1951, 1.1952
Message-ID: <20091209142902.EED2C11C00E0@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5652

Modified Files:
	kernel.spec 
Added Files:
	ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch 
Log Message:
* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.6-166
- ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch: CVE-2009-4131
  fix insufficient permission checking which could result in arbitrary
  data corruption by a local unprivileged user.


ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch:
 ioctl.c       |   33 ++++++++++++++++++++-------------
 move_extent.c |    7 +++++++
 2 files changed, 27 insertions(+), 13 deletions(-)

--- NEW FILE ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch ---
>From 910123ba363623f15ffb5d05dd87bdf06d08c609 Mon Sep 17 00:00:00 2001
From: Akira Fujita <a-fujita at rs.jp.nec.com>
Date: Sun, 6 Dec 2009 23:38:31 -0500
Subject: [PATCH] ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT

This patch fixes three problems in the handling of the
EXT4_IOC_MOVE_EXT ioctl:

1. In current EXT4_IOC_MOVE_EXT, there are read access mode checks for
original and donor files, but they allow the illegal write access to
donor file, since donor file is overwritten by original file data.  To
fix this problem, change access mode checks of original (r->r/w) and
donor (r->w) files.

2.  Disallow the use of donor files that have a setuid or setgid bits.

3.  Call mnt_want_write() and mnt_drop_write() before and after
ext4_move_extents() calling to get write access to a mount.

Signed-off-by: Akira Fujita <a-fujita at rs.jp.nec.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

 fs/ext4/ioctl.c       |   28 ++++++++++++++++++----------
 fs/ext4/move_extent.c |    7 +++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 7050a9c..f5b1d3c 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -221,32 +221,39 @@ setversion_out:
 		struct file *donor_filp;
 		int err;
 
+		if (!(filp->f_mode & FMODE_READ) ||
+		    !(filp->f_mode & FMODE_WRITE))
+			return -EBADF;
+
 		if (copy_from_user(&me,
 			(struct move_extent __user *)arg, sizeof(me)))
 			return -EFAULT;
+		me.moved_len = 0;
 
 		donor_filp = fget(me.donor_fd);
 		if (!donor_filp)
 			return -EBADF;
 
-		if (!capable(CAP_DAC_OVERRIDE)) {
-			if ((current->real_cred->fsuid != inode->i_uid) ||
-				!(inode->i_mode & S_IRUSR) ||
-				!(donor_filp->f_dentry->d_inode->i_mode &
-				S_IRUSR)) {
-				fput(donor_filp);
-				return -EACCES;
-			}
+		if (!(donor_filp->f_mode & FMODE_WRITE)) {
+			err = -EBADF;
+			goto mext_out;
 		}
 
+		err = mnt_want_write(filp->f_path.mnt);
+		if (err)
+			goto mext_out;
+
 		err = ext4_move_extents(filp, donor_filp, me.orig_start,
 					me.donor_start, me.len, &me.moved_len);
-		fput(donor_filp);
+		mnt_drop_write(filp->f_path.mnt);
+		if (me.moved_len > 0)
+			file_remove_suid(donor_filp);
 
-		if (!err)
-			if (copy_to_user((struct move_extent *)arg,
-				&me, sizeof(me)))
-				return -EFAULT;
+		if (copy_to_user((struct move_extent *)arg, &me, sizeof(me)))
+			err = -EFAULT;
+
+mext_out:
+		fput(donor_filp);
 		return err;
 	}
 
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index bbf2dd9..c5250b5 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -905,6 +905,13 @@ mext_check_arguments(struct inode *orig_inode,
 		return -EINVAL;
 	}
 
+	if (donor_inode->i_mode & (S_ISUID|S_ISGID)) {
+		ext4_debug("ext4 move extent: suid or sgid is set"
+			   " to donor file [ino:orig %lu, donor %lu]\n",
+			   orig_inode->i_ino, donor_inode->i_ino);
+		return -EINVAL;
+	}
+
 	/* Ext4 move extent does not support swapfile */
 	if (IS_SWAPFILE(orig_inode) || IS_SWAPFILE(donor_inode)) {
 		ext4_debug("ext4 move extent: The argument files should "


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1951
retrieving revision 1.1952
diff -u -p -r1.1951 -r1.1952
--- kernel.spec	8 Dec 2009 12:57:07 -0000	1.1951
+++ kernel.spec	9 Dec 2009 14:29:02 -0000	1.1952
@@ -812,6 +812,9 @@ Patch14463: dlm-fix-connection-close-han
 # rhbz#544144 [bbf31bf18d34caa87dd01f08bf713635593697f2]
 Patch14464: ipv4-fix-null-ptr-deref-in-ip_fragment.patch
 
+# rhbz#544471
+Patch14465: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1518,6 +1521,9 @@ ApplyPatch dlm-fix-connection-close-hand
 # rhbz#544144
 ApplyPatch ipv4-fix-null-ptr-deref-in-ip_fragment.patch
 
+# rhbz#544471
+ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2167,6 +2173,11 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.6-166
+- ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch: CVE-2009-4131
+  fix insufficient permission checking which could result in arbitrary
+  data corruption by a local unprivileged user.
+
 * Tue Dec  8 2009 Steve Dickson <steved at redhat.com> 2.6.31.6-165
 - nfsd: Updated to latest pseudo root code fixing rhbz# 538609
 



From dwalsh at fedoraproject.org  Wed Dec  9 14:37:27 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  9 Dec 2009 14:37:27 +0000 (UTC)
Subject: File serefpolicy-3.7.4.tgz uploaded to lookaside cache by dwalsh
Message-ID: <20091209143727.3553910F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for selinux-policy:

c9aaca580877d56fe5d13dd814f58efa  serefpolicy-3.7.4.tgz



From rdieter at fedoraproject.org  Wed Dec  9 14:43:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 14:43:12 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs.spec,1.505,1.506
Message-ID: <20091209144312.9DD2C11C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9604/F-11

Modified Files:
	kdelibs.spec 
Log Message:
use no_var_tracking patch on f12+ only



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -p -r1.505 -r1.506
--- kdelibs.spec	6 Dec 2009 20:28:05 -0000	1.505
+++ kdelibs.spec	9 Dec 2009 14:43:12 -0000	1.506
@@ -203,7 +203,9 @@ format for easy browsing.
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
+%if 0%{?fedora} > 11
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
+%endif
 
 # upstream patches
 %patch50 -p1 -b .kaction_qt_keys



From rdieter at fedoraproject.org  Wed Dec  9 14:43:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 14:43:12 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs.spec,1.533,1.534
Message-ID: <20091209144312.D9C9F11C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9604/F-12

Modified Files:
	kdelibs.spec 
Log Message:
use no_var_tracking patch on f12+ only



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -p -r1.533 -r1.534
--- kdelibs.spec	6 Dec 2009 20:28:06 -0000	1.533
+++ kdelibs.spec	9 Dec 2009 14:43:12 -0000	1.534
@@ -203,7 +203,9 @@ format for easy browsing.
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
+%if 0%{?fedora} > 11
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
+%endif
 
 # upstream patches
 %patch50 -p1 -b .kaction_qt_keys



From rdieter at fedoraproject.org  Wed Dec  9 14:43:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 14:43:13 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.547,1.548
Message-ID: <20091209144313.230FE11C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9604/devel

Modified Files:
	kdelibs.spec 
Log Message:
use no_var_tracking patch on f12+ only



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -p -r1.547 -r1.548
--- kdelibs.spec	4 Dec 2009 16:00:58 -0000	1.547
+++ kdelibs.spec	9 Dec 2009 14:43:12 -0000	1.548
@@ -213,7 +213,9 @@ format for easy browsing.
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
+%if 0%{?fedora} > 11
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
+%endif
 
 # Kubuntu patch
 %patch50 -p1 -b .kaction_qt_keys



From rdieter at fedoraproject.org  Wed Dec  9 14:44:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 14:44:09 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs.spec,1.506,1.507
Message-ID: <20091209144409.BFAE211C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9906

Modified Files:
	kdelibs.spec 
Log Message:
revert to 4.3.4-1 here (to avoid an extra/needless build on f12+)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -p -r1.506 -r1.507
--- kdelibs.spec	9 Dec 2009 14:43:12 -0000	1.506
+++ kdelibs.spec	9 Dec 2009 14:44:09 -0000	1.507
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.4
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -403,9 +403,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
-- add workaound for low-mem systems
-
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:44 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144744.80FA110F874@bastion2.fedora.phx.redhat.com>

rmyers has set the watchbugzilla acl on bonnie++ (Fedora devel) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:45 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144745.ABEFC10F892@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on bonnie++ (Fedora devel) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:46 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144746.E610A10F89F@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on bonnie++ (Fedora devel) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:47 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144747.9DF7010F8A3@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on bonnie++ (Fedora devel) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:50 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144750.8ACC410F8AC@bastion2.fedora.phx.redhat.com>

rmyers has set the watchbugzilla acl on bonnie++ (Fedora EPEL 4) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:51 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144751.608EF10F8AD@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on bonnie++ (Fedora EPEL 4) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:52 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144752.45AB810F8B1@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on bonnie++ (Fedora EPEL 4) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:53 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144753.C56C910F8B4@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on bonnie++ (Fedora EPEL 4) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:56 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144756.F033710F874@bastion2.fedora.phx.redhat.com>

rmyers has set the watchbugzilla acl on bonnie++ (Fedora EPEL 5) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:56 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144757.05D4410F8B9@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on bonnie++ (Fedora EPEL 5) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:58 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144758.500AD10F8BC@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on bonnie++ (Fedora EPEL 5) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:47:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:47:59 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144759.9601A10F8BE@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on bonnie++ (Fedora EPEL 5) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:12 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144812.6086810F89D@bastion2.fedora.phx.redhat.com>

rmyers has set the watchbugzilla acl on bonnie++ (Fedora 10) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:13 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144813.7046F10F89E@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on bonnie++ (Fedora 10) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:13 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144813.BCDF510F8C3@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on bonnie++ (Fedora 10) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:15 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144815.440DE10F8C7@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on bonnie++ (Fedora 10) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:17 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144817.9006310F8CB@bastion2.fedora.phx.redhat.com>

rmyers has set the watchbugzilla acl on bonnie++ (Fedora 11) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:17 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144817.BDD5910F8CE@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on bonnie++ (Fedora 11) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:19 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144819.7F53B10F8D1@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on bonnie++ (Fedora 11) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:20 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144820.7F11910F8D3@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on bonnie++ (Fedora 11) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:23 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144823.AB8BA10F8D5@bastion2.fedora.phx.redhat.com>

rmyers has set the watchbugzilla acl on bonnie++ (Fedora 12) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:24 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144824.0C85B10F8A3@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on bonnie++ (Fedora 12) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:25 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144825.5F46010F8D7@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on bonnie++ (Fedora 12) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 14:48:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 14:48:26 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209144826.269B810F8DC@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on bonnie++ (Fedora 12) to Approved for steve

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From fabbione at fedoraproject.org  Wed Dec  9 14:50:51 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed,  9 Dec 2009 14:50:51 +0000 (UTC)
Subject: rpms/cluster/F-11 .cvsignore, 1.27, 1.28 cluster.spec, 1.53,
	1.54 sources, 1.28, 1.29
Message-ID: <20091209145051.A7E9A11C03DB@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12052

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	23 Nov 2009 15:10:55 -0000	1.27
+++ .cvsignore	9 Dec 2009 14:50:51 -0000	1.28
@@ -1 +1 @@
-cluster-3.0.5.tar.gz
+cluster-3.0.6.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/cluster.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- cluster.spec	23 Nov 2009 15:10:56 -0000	1.53
+++ cluster.spec	9 Dec 2009 14:50:51 -0000	1.54
@@ -14,16 +14,16 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## Setup/build bits
 
@@ -38,7 +38,7 @@ BuildRequires: openaislib-devel >= 1.0.0
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
 
 %prep
-%setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 %build
 ./configure \
@@ -97,7 +97,7 @@ Requires: corosync >= 1.0.1-1
 Requires: openais >= 1.0.2-1
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
-Requires: fence-agents >= 3.0.4-1
+Requires: fence-agents >= 3.0.6-1
 
 %description -n cman
 Red Hat Cluster Manager
@@ -134,6 +134,8 @@ fi
 %{_datadir}/cluster/cluster.rng
 %{perl_vendorarch}/*
 %dir /var/log/cluster
+%dir /var/lib/cluster
+%dir /var/run/cluster
 %{_mandir}/man5/*
 %{_mandir}/man8/ccs*
 %{_mandir}/man8/cman*
@@ -272,6 +274,15 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release
+- spec file update:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+  * bump Requires on fence-agents
+  * ship var/run/cluster and var/lib/cluster
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 - spec file update:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	23 Nov 2009 15:10:56 -0000	1.28
+++ sources	9 Dec 2009 14:50:51 -0000	1.29
@@ -1 +1 @@
-4f6215a3c26fab9106b1c6a4907b12fc  cluster-3.0.5.tar.gz
+f2c1a4430495fadcb1f673da0e115f1e  cluster-3.0.6.tar.gz



From xhorak at fedoraproject.org  Wed Dec  9 14:59:29 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 14:59:29 +0000 (UTC)
Subject: File thunderbird-3.0.source.tar.bz2 uploaded to lookaside cache by
	xhorak
Message-ID: <20091209145929.9B0DC10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sunbird:

9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2



From xhorak at fedoraproject.org  Wed Dec  9 15:04:10 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 15:04:10 +0000 (UTC)
Subject: rpms/sunbird/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 sunbird.spec, 1.42, 1.43
Message-ID: <20091209150410.1C7F711C02CA@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16170

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	3 Dec 2009 16:00:04 -0000	1.18
+++ .cvsignore	9 Dec 2009 15:04:09 -0000	1.19
@@ -2,3 +2,4 @@ sunbird-l10n.tar
 thunderbird-3.0b4-source.tar.bz2
 thunderbird-3.0rc1.source.tar.bz2
 thunderbird-3.0rc2.source.tar.bz2
+thunderbird-3.0.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Dec 2009 16:00:04 -0000	1.18
+++ sources	9 Dec 2009 15:04:09 -0000	1.19
@@ -1,2 +1,2 @@
 1d7d4eb4aaea7e7fae9eba3dcc995161  sunbird-l10n.tar
-35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
+9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sunbird.spec	3 Dec 2009 16:00:04 -0000	1.42
+++ sunbird.spec	9 Dec 2009 15:04:09 -0000	1.43
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.15.20090916hg%{?dist}
+Release:        0.16.20090916hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0rc2.source.tar.bz2
+Source0:        thunderbird-3.0.source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -69,11 +69,7 @@ calendar, without tying you to a particu
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
-Requires:       thunderbird >= 3
-# Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-3.13.rc2
-#Requires:       thunderbird < 3.0-3.9.b5
-
+Requires:       thunderbird >= 3.0-4
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
 AutoProv: 0
@@ -295,6 +291,9 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.16.20090916hg
+- Rebuild against new Thunderbird
+
 * Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.15.20090916hg
 - Rebuild against new Thunderbird
 



From pbrobinson at fedoraproject.org  Wed Dec  9 15:06:44 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  9 Dec 2009 15:06:44 +0000 (UTC)
Subject: rpms/rygel/F-12 .cvsignore, 1.5, 1.6 rygel.spec, 1.16, 1.17 sources,
	1.5, 1.6
Message-ID: <20091209150644.8B3F511C0265@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17244

Modified Files:
	.cvsignore rygel.spec sources 
Log Message:
- Update to 0.4.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Oct 2009 15:13:21 -0000	1.5
+++ .cvsignore	9 Dec 2009 15:06:44 -0000	1.6
@@ -1 +1 @@
-rygel-0.4.2.tar.bz2
+rygel-0.4.6.tar.bz2


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/rygel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- rygel.spec	5 Nov 2009 15:36:06 -0000	1.16
+++ rygel.spec	9 Dec 2009 15:06:44 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           rygel
-Version:        0.4.2
+Version:        0.4.6
 Release:        1%{?dist}
 Summary:        A UPnP v2 Media Server
 
@@ -9,9 +9,6 @@ URL:            http://live.gnome.org/Ry
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=596211
-Patch0:        0001-core-data-Forgotten-update-to-Rygel-D-Bus-paths.patch
-
 BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gstreamer-devel
@@ -53,7 +50,7 @@ A plugin for rygel to use tracker to loc
 %setup -q
 
 %build
-%configure --enable-tracker-plugin --enable-media-export-plugin --enable-external-plugin --enable-mediathek-plugin --enable-gstlaunch-plugin --disable-silent-rules
+%configure --enable-tracker-plugin --enable-media-export-plugin --enable-external-plugin --enable-mediathek-plugin --enable-gst-launch-plugin --disable-silent-rules
 make %{?_smp_mflags} V=1
 
 %install
@@ -78,7 +75,8 @@ rm -rf %{buildroot}
 %{_bindir}/rygel-preferences
 %{_libdir}/rygel-1.0/librygel-external.so
 %{_libdir}/rygel-1.0/librygel-media-export.so
-%{_libdir}/rygel-1.0/librygel-gstlaunch.so
+%{_libdir}/rygel-1.0/librygel-gst-launch.so
+%{_libdir}/rygel-1.0/librygel-gst-renderer.so
 %{_libdir}/rygel-1.0/librygel-mediathek.so
 %{_datadir}/rygel/
 %{_datadir}/applications/rygel*
@@ -96,6 +94,15 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Sat Nov 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.6-1
+- Update to 0.4.6
+
+* Tue Oct 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.4-2
+- Add and change new files.
+
+* Tue Oct 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.4-1
+- Update to 0.4.4
+
 * Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.2-1
 - Update to 0.4.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Oct 2009 15:13:22 -0000	1.5
+++ sources	9 Dec 2009 15:06:44 -0000	1.6
@@ -1 +1 @@
-79a33b9875eacdcb22d9d195aaf24028  rygel-0.4.2.tar.bz2
+f28c48e2caf79b8e9056636259056de7  rygel-0.4.6.tar.bz2



From rjones at fedoraproject.org  Wed Dec  9 15:13:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed,  9 Dec 2009 15:13:47 +0000 (UTC)
Subject: File auto-buildrequires-1.1.tar.gz uploaded to lookaside cache by
	rjones
Message-ID: <20091209151347.21A0210F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for auto-buildrequires:

01f3baf2efebfbd306947616d0b28c01  auto-buildrequires-1.1.tar.gz



From xhorak at fedoraproject.org  Wed Dec  9 15:14:32 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 15:14:32 +0000 (UTC)
Subject: rpms/sunbird/F-11 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 sunbird.spec, 1.37, 1.38
Message-ID: <20091209151432.DDC2411C0265@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19474

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	3 Dec 2009 15:59:33 -0000	1.17
+++ .cvsignore	9 Dec 2009 15:14:32 -0000	1.18
@@ -3,3 +3,4 @@ sunbird-l10n.tar
 thunderbird-3.0b4-source.tar.bz2
 thunderbird-3.0rc1.source.tar.bz2
 thunderbird-3.0rc2.source.tar.bz2
+thunderbird-3.0.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	3 Dec 2009 15:59:33 -0000	1.17
+++ sources	9 Dec 2009 15:14:32 -0000	1.18
@@ -1,2 +1,2 @@
 70d060b6f6331c8cf123a39628ee859e  sunbird-l10n.tar
-35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
+9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sunbird.spec	3 Dec 2009 15:59:33 -0000	1.37
+++ sunbird.spec	9 Dec 2009 15:14:32 -0000	1.38
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.10.20090715hg%{?dist}
+Release:        0.11.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0rc2.source.tar.bz2
+Source0:        thunderbird-3.0.source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -69,12 +69,7 @@ calendar, without tying you to a particu
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
-Requires:       thunderbird >= 3
-# Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-2.10.rc2
-# Do we really need this?
-#Requires:       thunderbird < 3.0-2.7.b5
-
+Requires:       thunderbird >= 3.0-3
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
 AutoProv: 0
@@ -296,7 +291,10 @@ fi
 
 
 %changelog
-* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.10.2000715hg
+* Wed Dec  9 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.11.20090715hg
+- Rebuild against new Thunderbird
+
+* Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.10.20090715hg
 - Rebuild against new Thunderbird
 
 * Wed Nov 25 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.9.20090715hg



From xhorak at fedoraproject.org  Wed Dec  9 15:17:09 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  9 Dec 2009 15:17:09 +0000 (UTC)
Subject: rpms/sunbird/F-12 .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 sunbird.spec, 1.43, 1.44
Message-ID: <20091209151709.11C9211C0265@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20244

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	3 Dec 2009 15:59:48 -0000	1.18
+++ .cvsignore	9 Dec 2009 15:17:08 -0000	1.19
@@ -2,3 +2,4 @@ sunbird-l10n.tar
 thunderbird-3.0b4-source.tar.bz2
 thunderbird-3.0rc1.source.tar.bz2
 thunderbird-3.0rc2.source.tar.bz2
+thunderbird-3.0.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Dec 2009 15:59:48 -0000	1.18
+++ sources	9 Dec 2009 15:17:08 -0000	1.19
@@ -1,2 +1,2 @@
 1d7d4eb4aaea7e7fae9eba3dcc995161  sunbird-l10n.tar
-35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
+9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-12/sunbird.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sunbird.spec	3 Dec 2009 15:59:49 -0000	1.43
+++ sunbird.spec	9 Dec 2009 15:17:08 -0000	1.44
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.15.20090916hg%{?dist}
+Release:        0.16.20090916hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        thunderbird-3.0rc2.source.tar.bz2
+Source0:        thunderbird-3.0.source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -69,10 +69,7 @@ calendar, without tying you to a particu
 %package -n thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Group:          Applications/Productivity
-Requires:       thunderbird >= 3
-# Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-3.13.rc2
-#Requires:       thunderbird < 3.0-3.9.b5
+Requires:       thunderbird >= 3.0-4
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -295,6 +292,9 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.16.20090916hg
+- Rebuild against new Thunderbird
+
 * Thu Dec  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.15.20090916hg
 - Rebuild against new Thunderbird
 



From pkgdb at fedoraproject.org  Wed Dec  9 15:17:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:17:37 +0000
Subject: [pkgdb] blacs: deji has given up watchcommits
Message-ID: <20091209151737.1682110F892@bastion2.fedora.phx.redhat.com>

deji has given up the watchcommits acl on blacs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:17:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:17:29 +0000
Subject: [pkgdb] blacs: deji has given up watchbugzilla
Message-ID: <20091209151729.DE4B310F88C@bastion2.fedora.phx.redhat.com>

deji has given up the watchbugzilla acl on blacs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:17:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:17:38 +0000
Subject: [pkgdb] blacs: deji has requested commit
Message-ID: <20091209151739.019D910F89D@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on blacs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:17:50 +0000
Subject: [pkgdb] blacs: deji has given up watchbugzilla
Message-ID: <20091209151750.922FB10F881@bastion2.fedora.phx.redhat.com>

deji has given up the watchbugzilla acl on blacs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:17:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:17:51 +0000
Subject: [pkgdb] blacs: deji has given up watchcommits
Message-ID: <20091209151751.EE85F10F891@bastion2.fedora.phx.redhat.com>

deji has given up the watchcommits acl on blacs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:17:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:17:53 +0000
Subject: [pkgdb] blacs: deji has requested commit
Message-ID: <20091209151753.1007810F89F@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on blacs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:00 +0000
Subject: [pkgdb] blacs: deji has given up watchbugzilla
Message-ID: <20091209151801.0C98110F8A3@bastion2.fedora.phx.redhat.com>

deji has given up the watchbugzilla acl on blacs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:02 +0000
Subject: [pkgdb] blacs: deji has given up watchcommits
Message-ID: <20091209151802.6C97810F865@bastion2.fedora.phx.redhat.com>

deji has given up the watchcommits acl on blacs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:03 +0000
Subject: [pkgdb] blacs: deji has requested commit
Message-ID: <20091209151803.CDB7310F8A9@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on blacs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From rjones at fedoraproject.org  Wed Dec  9 15:18:13 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed,  9 Dec 2009 15:18:13 +0000 (UTC)
Subject: rpms/auto-buildrequires/devel .cvsignore, 1.3,
	1.4 auto-buildrequires.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091209151813.8B31911C0265@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/auto-buildrequires/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20590

Modified Files:
	.cvsignore auto-buildrequires.spec sources 
Log Message:
* Wed Dec  9 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-1
- New upstream version 1.1.
- Fixes bug when LANG != C (RHBZ#545867).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/auto-buildrequires/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Mar 2009 16:28:12 -0000	1.3
+++ .cvsignore	9 Dec 2009 15:18:13 -0000	1.4
@@ -1 +1 @@
-auto-buildrequires-1.0.tar.gz
+auto-buildrequires-1.1.tar.gz


Index: auto-buildrequires.spec
===================================================================
RCS file: /cvs/pkgs/rpms/auto-buildrequires/devel/auto-buildrequires.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- auto-buildrequires.spec	24 Jul 2009 17:35:31 -0000	1.3
+++ auto-buildrequires.spec	9 Dec 2009 15:18:13 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:     Work out BuildRequires for rpmbuild automatically
 Name:        auto-buildrequires
-Version:     1.0
-Release:     4%{?dist}
+Version:     1.1
+Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/auto-buildrequires/
@@ -44,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  9 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-1
+- New upstream version 1.1.
+- Fixes bug when LANG != C (RHBZ#545867).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/auto-buildrequires/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Mar 2009 16:28:12 -0000	1.3
+++ sources	9 Dec 2009 15:18:13 -0000	1.4
@@ -1 +1 @@
-dc9b0e1ad93658fc0e0174bf7318dee5  auto-buildrequires-1.0.tar.gz
+01f3baf2efebfbd306947616d0b28c01  auto-buildrequires-1.1.tar.gz



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:20 +0000
Subject: [pkgdb] scalapack: deji has given up watchbugzilla
Message-ID: <20091209151820.EA7CC10F89F@bastion2.fedora.phx.redhat.com>

deji has given up the watchbugzilla acl on scalapack (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:22 +0000
Subject: [pkgdb] scalapack: deji has given up watchcommits
Message-ID: <20091209151822.326E110F8AB@bastion2.fedora.phx.redhat.com>

deji has given up the watchcommits acl on scalapack (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:23 +0000
Subject: [pkgdb] scalapack: deji has requested commit
Message-ID: <20091209151823.B29B710F8AF@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on scalapack (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From rjones at fedoraproject.org  Wed Dec  9 15:18:30 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed,  9 Dec 2009 15:18:30 +0000 (UTC)
Subject: rpms/auto-buildrequires/F-12 .cvsignore, 1.3,
	1.4 auto-buildrequires.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091209151830.1CC5611C0265@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/auto-buildrequires/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20688

Modified Files:
	.cvsignore auto-buildrequires.spec sources 
Log Message:
* Wed Dec  9 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-1
- New upstream version 1.1.
- Fixes bug when LANG != C (RHBZ#545867).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/auto-buildrequires/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Mar 2009 16:28:12 -0000	1.3
+++ .cvsignore	9 Dec 2009 15:18:29 -0000	1.4
@@ -1 +1 @@
-auto-buildrequires-1.0.tar.gz
+auto-buildrequires-1.1.tar.gz


Index: auto-buildrequires.spec
===================================================================
RCS file: /cvs/pkgs/rpms/auto-buildrequires/F-12/auto-buildrequires.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- auto-buildrequires.spec	24 Jul 2009 17:35:31 -0000	1.3
+++ auto-buildrequires.spec	9 Dec 2009 15:18:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:     Work out BuildRequires for rpmbuild automatically
 Name:        auto-buildrequires
-Version:     1.0
-Release:     4%{?dist}
+Version:     1.1
+Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/auto-buildrequires/
@@ -44,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  9 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-1
+- New upstream version 1.1.
+- Fixes bug when LANG != C (RHBZ#545867).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/auto-buildrequires/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Mar 2009 16:28:12 -0000	1.3
+++ sources	9 Dec 2009 15:18:29 -0000	1.4
@@ -1 +1 @@
-dc9b0e1ad93658fc0e0174bf7318dee5  auto-buildrequires-1.0.tar.gz
+01f3baf2efebfbd306947616d0b28c01  auto-buildrequires-1.1.tar.gz



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:34 +0000
Subject: [pkgdb] scalapack: deji has given up watchbugzilla
Message-ID: <20091209151834.85E1110F8A6@bastion2.fedora.phx.redhat.com>

deji has given up the watchbugzilla acl on scalapack (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:35 +0000
Subject: [pkgdb] scalapack: deji has given up watchcommits
Message-ID: <20091209151835.A8C8110F8B3@bastion2.fedora.phx.redhat.com>

deji has given up the watchcommits acl on scalapack (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:37 +0000
Subject: [pkgdb] scalapack: deji has requested commit
Message-ID: <20091209151837.7584A10F8B6@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on scalapack (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:41 +0000
Subject: [pkgdb] scalapack: deji has given up watchbugzilla
Message-ID: <20091209151841.E143610F8B8@bastion2.fedora.phx.redhat.com>

deji has given up the watchbugzilla acl on scalapack (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:43 +0000
Subject: [pkgdb] scalapack: deji has given up watchcommits
Message-ID: <20091209151843.3DD9210F8B9@bastion2.fedora.phx.redhat.com>

deji has given up the watchcommits acl on scalapack (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:18:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:18:44 +0000
Subject: [pkgdb] scalapack: deji has requested commit
Message-ID: <20091209151844.996E110F8BC@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on scalapack (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From than at fedoraproject.org  Wed Dec  9 15:19:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Dec 2009 15:19:59 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.80-qt-4.6-crash.patch, NONE,
	1.1 kdepim.spec, 1.250, 1.251 kdepim-4.3.75-build-kalarm.patch,
	1.1, NONE
Message-ID: <20091209151959.0CCF411C0265@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21248

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.80-qt-4.6-crash.patch 
Removed Files:
	kdepim-4.3.75-build-kalarm.patch 
Log Message:
apply upstream patch to fix crash in Kontact+KOrganizer with Qt4.6



kdepim-4.3.80-qt-4.6-crash.patch:
 monthscene.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdepim-4.3.80-qt-4.6-crash.patch ---
diff -up kdepim-4.3.80/korganizer/views/monthview/monthscene.cpp.orig kdepim-4.3.80/korganizer/views/monthview/monthscene.cpp
--- kdepim-4.3.80/korganizer/views/monthview/monthscene.cpp.orig	2009-12-09 16:26:08.000000000 +0100
+++ kdepim-4.3.80/korganizer/views/monthview/monthscene.cpp	2009-12-09 16:26:52.000000000 +0100
@@ -64,6 +64,8 @@ MonthScene::MonthScene( MonthView *paren
   mReadonlyPixmap  = KOGlobals::self()->smallIcon( "object-locked" );
   mReplyPixmap     = KOGlobals::self()->smallIcon( "mail-reply-sender" );
   mHolidayPixmap   = KOGlobals::self()->smallIcon( "view-calendar-holiday" );
+
+  setSceneRect( 0, 0, parent->width(), parent->height() );
 }
 
 MonthScene::~MonthScene()


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- kdepim.spec	8 Dec 2009 21:29:24 -0000	1.250
+++ kdepim.spec	9 Dec 2009 15:19:58 -0000	1.251
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.80
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -20,9 +20,11 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # add -fno-var-tracking-assignments for kmail/globalsettings_base.cpp (#538233)
 Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch 
 Patch3:  kdepim-4.3.75-desktop-fixes.patch
-Patch4:  kdepim-4.3.75-build-kalarm.patch
 
-# upstream patches (4.3 branch):
+# upstream patches (4.4 branch):
+
+# upstream patches (trunk)
+Patch200: kdepim-4.3.80-qt-4.6-crash.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -102,8 +104,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch1 -p0 -b .kmail-saveAttachments
 %patch2 -p1 -b .kmail_globalsettings_no_var_tracking
 %patch3 -p1 -b .desktop-fixes
-%patch4 -p0 -b .build-kalarm
 
+%patch200 -p1 -b .qt4.6-crash
 
 %build
 mkdir -p %{_target_platform}
@@ -227,6 +229,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 09 2009 Than Ngo <than at redhat.com> - 4.3.80-4
+- apply upstream patch to fix crash in Kontact+KOrganizer with Qt4.6
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 4.3.80-3
 - Explicitly BR libassuan-static in accordance with the Packaging
   Guidelines (libassuan-devel is still static-only).


--- kdepim-4.3.75-build-kalarm.patch DELETED ---



From mgrepl at fedoraproject.org  Wed Dec  9 15:26:43 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed,  9 Dec 2009 15:26:43 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.63,
	1.64 selinux-policy.spec, 1.913, 1.914
Message-ID: <20091209152643.6875911C0265@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23135

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Add labeling for /var/lib/NetworkManager directory



policy-20090521.patch:
 man/man8/nfs_selinux.8                    |    6 
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/dmesg.te             |    3 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/prelink.te           |    9 
 policy/modules/admin/readahead.te         |    2 
 policy/modules/admin/rpm.fc               |    1 
 policy/modules/admin/rpm.if               |   46 +++++
 policy/modules/admin/rpm.te               |    4 
 policy/modules/admin/shorewall.fc         |   13 +
 policy/modules/admin/shorewall.if         |  166 ++++++++++++++++++
 policy/modules/admin/shorewall.te         |  103 +++++++++++
 policy/modules/admin/sudo.if              |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    3 
 policy/modules/admin/usermanage.te        |    3 
 policy/modules/apps/awstats.te            |    2 
 policy/modules/apps/calamaris.te          |    4 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++++++++++
 policy/modules/apps/gitosis.te            |   43 ++++
 policy/modules/apps/gnome.te              |   10 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 policy/modules/apps/java.te               |    2 
 policy/modules/apps/mozilla.if            |   16 +
 policy/modules/apps/mozilla.te            |   14 -
 policy/modules/apps/nsplugin.if           |    2 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 ++
 policy/modules/apps/ptchown.te            |   40 ++++
 policy/modules/apps/qemu.fc               |    1 
 policy/modules/apps/qemu.te               |    5 
 policy/modules/apps/sandbox.if            |  134 +++++++++++---
 policy/modules/apps/sandbox.te            |  274 +++++++++++++++++++++++++++---
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    6 
 policy/modules/kernel/corecommands.fc     |   10 -
 policy/modules/kernel/corenetwork.te.in   |    5 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   31 +++
 policy/modules/kernel/files.if            |    4 
 policy/modules/kernel/kernel.if           |    2 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |   19 ++
 policy/modules/roles/staff.te             |   12 +
 policy/modules/roles/sysadm.if            |   35 +++
 policy/modules/roles/sysadm.te            |    4 
 policy/modules/roles/unconfineduser.te    |   10 -
 policy/modules/roles/unprivuser.te        |    4 
 policy/modules/roles/xguest.te            |    6 
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/apache.fc         |    5 
 policy/modules/services/apache.te         |    1 
 policy/modules/services/apm.te            |    4 
 policy/modules/services/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    6 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   21 ++
 policy/modules/services/cobbler.te        |   10 +
 policy/modules/services/consolekit.te     |    5 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   29 ++-
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   28 +++
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   22 +-
 policy/modules/services/exim.te           |    7 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |   10 -
 policy/modules/services/ftp.te            |   15 +
 policy/modules/services/gnomeclock.te     |    1 
 policy/modules/services/gpsd.fc           |    3 
 policy/modules/services/gpsd.te           |   19 +-
 policy/modules/services/hal.te            |   15 +
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 ++++
 policy/modules/services/hddtemp.te        |   40 ++++
 policy/modules/services/kerberos.if       |    2 
 policy/modules/services/kerberos.te       |   12 +
 policy/modules/services/lircd.te          |    7 
 policy/modules/services/mailman.if        |    1 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/networkmanager.fc |    1 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  144 +++++++++++++++
 policy/modules/services/nslcd.te          |   50 +++++
 policy/modules/services/nx.fc             |    3 
 policy/modules/services/nx.if             |   20 ++
 policy/modules/services/openvpn.te        |   14 +
 policy/modules/services/pcscd.if          |    3 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/polkit.fc         |    2 
 policy/modules/services/polkit.if         |    2 
 policy/modules/services/polkit.te         |    3 
 policy/modules/services/postfix.if        |   26 ++
 policy/modules/services/postfix.te        |   26 --
 policy/modules/services/postgresql.te     |    2 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |    2 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/pyzor.fc          |    2 
 policy/modules/services/pyzor.te          |    2 
 policy/modules/services/radvd.te          |    2 
 policy/modules/services/rpc.te            |   15 +
 policy/modules/services/rpcbind.if        |   20 ++
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/samba.te          |    6 
 policy/modules/services/sasl.te           |    6 
 policy/modules/services/sendmail.if       |   39 ++++
 policy/modules/services/sendmail.te       |    7 
 policy/modules/services/setroubleshoot.te |    5 
 policy/modules/services/shorewall.fc      |   12 -
 policy/modules/services/shorewall.if      |  166 ------------------
 policy/modules/services/shorewall.te      |  102 -----------
 policy/modules/services/smartmon.te       |    4 
 policy/modules/services/snmp.if           |   37 ++++
 policy/modules/services/snmp.te           |    2 
 policy/modules/services/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    2 
 policy/modules/services/squid.te          |    2 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |   14 +
 policy/modules/services/sssd.fc           |    7 
 policy/modules/services/sssd.if           |   16 -
 policy/modules/services/sssd.te           |   41 ++--
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.fc           |    1 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    3 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   18 +
 policy/modules/system/authlogin.fc        |    3 
 policy/modules/system/authlogin.if        |  270 ++++++++++++++++++-----------
 policy/modules/system/authlogin.te        |   27 +-
 policy/modules/system/init.fc             |    2 
 policy/modules/system/init.te             |    6 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   17 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/logging.fc          |    1 
 policy/modules/system/logging.te          |    4 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   18 +
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |    1 
 policy/modules/system/sysnetwork.if       |    1 
 policy/modules/system/sysnetwork.te       |   17 +
 policy/modules/system/udev.fc             |    1 
 policy/modules/system/udev.te             |   10 +
 policy/modules/system/userdomain.if       |   35 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 180 files changed, 2660 insertions(+), 692 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- policy-20090521.patch	20 Nov 2009 15:07:17 -0000	1.63
+++ policy-20090521.patch	9 Dec 2009 15:26:42 -0000	1.64
@@ -2469,7 +2469,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.6.12/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/clamav.te	2009-07-13 11:33:25.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/clamav.te	2009-12-09 15:28:27.000000000 +0100
 @@ -106,6 +106,8 @@
  corenet_tcp_bind_generic_port(clamd_t)
  corenet_tcp_connect_generic_port(clamd_t)
@@ -2488,6 +2488,15 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_rand(freshclam_t)
  dev_read_urand(freshclam_t)
  
+@@ -187,6 +191,8 @@
+ files_read_etc_files(freshclam_t)
+ files_read_etc_runtime_files(freshclam_t)
+ 
++logging_send_syslog_msg(freshclam_t)
++
+ miscfiles_read_localization(freshclam_t)
+ 
+ sysnet_dns_name_resolve(freshclam_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.fc serefpolicy-3.6.12/policy/modules/services/cobbler.fc
 --- nsaserefpolicy/policy/modules/services/cobbler.fc	1970-01-01 01:00:00.000000000 +0100
 +++ serefpolicy-3.6.12/policy/modules/services/cobbler.fc	2009-09-30 09:41:34.000000000 +0200
@@ -3570,6 +3579,30 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_list_sysfs(mysqld_safe_t)
       
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.6.12/policy/modules/services/networkmanager.fc
+--- nsaserefpolicy/policy/modules/services/networkmanager.fc	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/networkmanager.fc	2009-12-09 16:25:03.000000000 +0100
+@@ -12,6 +12,7 @@
+ /usr/sbin/nm-system-settings	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
+ 
+ /var/lib/wicd(/.*)? 			gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
++/var/lib/NetworkManager(/.*)?           gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
+ /etc/NetworkManager/system-connections(/.*)? 	gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
+ 
+ /var/log/wicd(/.*)? 			gen_context(system_u:object_r:NetworkManager_log_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.12/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/networkmanager.te	2009-12-09 16:22:09.000000000 +0100
+@@ -57,7 +57,9 @@
+ manage_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
+ files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, sock_file)
+ 
++manage_dirs_pattern(NetworkManager_t, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
+ manage_files_pattern(NetworkManager_t, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
++files_var_lib_filetrans(NetworkManager_t, NetworkManager_var_lib_t, dir)
+ 
+ manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
+ manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.6.12/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/nis.te	2009-06-26 15:48:39.000000000 +0200


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -p -r1.913 -r1.914
--- selinux-policy.spec	20 Nov 2009 15:07:17 -0000	1.913
+++ selinux-policy.spec	9 Dec 2009 15:26:43 -0000	1.914
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 91%{?dist}
+Release: 92%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -442,6 +442,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Dec 9 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-92
+- Add labeling for /var/lib/NetworkManager directory
+
 * Fri Nov 20 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-91
 - Allow apmd to transition to vbetool domain
 



From pkgdb at fedoraproject.org  Wed Dec  9 15:29:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:29:36 +0000
Subject: [pkgdb] blacs had acl change status
Message-ID: <20091209152936.29BCC10F881@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on blacs (Fedora 11) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:29:39 +0000
Subject: [pkgdb] blacs had acl change status
Message-ID: <20091209152939.354E610F892@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on blacs (Fedora 12) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From pkgdb at fedoraproject.org  Wed Dec  9 15:29:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:29:46 +0000
Subject: [pkgdb] blacs had acl change status
Message-ID: <20091209152946.36DAF10F89E@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on blacs (Fedora devel) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blacs



From rjones at fedoraproject.org  Wed Dec  9 15:30:09 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed,  9 Dec 2009 15:30:09 +0000 (UTC)
Subject: File vhostmd-0.4.tar.bz2 uploaded to lookaside cache by rjones
Message-ID: <20091209153009.805A310F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for vhostmd:

83ae93a53002b09c21654566790261a6  vhostmd-0.4.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec  9 15:30:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:30:31 +0000
Subject: [pkgdb] scalapack had acl change status
Message-ID: <20091209153031.9570810F890@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on scalapack (Fedora devel) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:30:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:30:53 +0000
Subject: [pkgdb] scalapack had acl change status
Message-ID: <20091209153053.C772A10F890@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on scalapack (Fedora 12) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From pkgdb at fedoraproject.org  Wed Dec  9 15:31:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:31:00 +0000
Subject: [pkgdb] scalapack had acl change status
Message-ID: <20091209153100.222B010F891@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on scalapack (Fedora 11) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scalapack



From rjones at fedoraproject.org  Wed Dec  9 15:33:09 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed,  9 Dec 2009 15:33:09 +0000 (UTC)
Subject: rpms/vhostmd/devel sources,1.4,1.5 vhostmd.spec,1.7,1.8
Message-ID: <20091209153309.E61AA11C0265@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25030

Modified Files:
	sources vhostmd.spec 
Log Message:
vhostmd didn't chdir (/) when daemonizing.  Fixed in this 0.4 release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Oct 2009 16:10:40 -0000	1.4
+++ sources	9 Dec 2009 15:33:09 -0000	1.5
@@ -1 +1 @@
-139650528c154da52a65adedfb8e83cf  vhostmd-0.4.tar.bz2
+83ae93a53002b09c21654566790261a6  vhostmd-0.4.tar.bz2


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- vhostmd.spec	17 Nov 2009 11:16:24 -0000	1.7
+++ vhostmd.spec	9 Dec 2009 15:33:09 -0000	1.8
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.9.gite9db007b%{?dist}
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -16,8 +16,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 URL:           http://gitorious.org/vhostmd
 
 # Upstream tarball hosting is screwed at the moment.  This release is
-# a pre-release of 0.4, based on the git commit names in the Release
-# tag above, with 'make dist' done by the packager.
+# of the 0.4 branch, with 'make dist' done by the packager.
 Source0:       vhostmd-%{version}.tar.bz2
 Source1:       vhostmd.init
 Source2:       vhostmd.sysconfig
@@ -184,6 +183,9 @@ exit 0
 
 
 %changelog
+* Wed Dec  9 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-1
+- vhostmd didn't chdir ("/") when daemonizing.  Fixed in this 0.4 release.
+
 * Tue Nov 17 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.9.gite9db007b
 - Add a timestamp to the metrics.
 - Fix a typo in MemoryAllocatedToVirtualServers metric



From joshkayse at fedoraproject.org  Wed Dec  9 15:37:05 2009
From: joshkayse at fedoraproject.org (joshkayse)
Date: Wed,  9 Dec 2009 15:37:05 +0000 (UTC)
Subject: File bonnie++-1.96.tgz uploaded to lookaside cache by joshkayse
Message-ID: <20091209153705.170B210F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for bonnie++:

7b8594559f00887d2865de1838328b35  bonnie++-1.96.tgz



From spot at fedoraproject.org  Wed Dec  9 15:37:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Dec 2009 15:37:49 +0000 (UTC)
Subject: rpms/lapack/devel lapack.spec,1.25,1.26
Message-ID: <20091209153749.0C10F11C00E0@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/lapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26675

Modified Files:
	lapack.spec 
Log Message:
static subpackages


Index: lapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- lapack.spec	4 Sep 2009 21:22:32 -0000	1.25
+++ lapack.spec	9 Dec 2009 15:37:48 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Numerical linear algebra package libraries
 Name: lapack
 Version: 3.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -33,10 +33,16 @@ Summary: LAPACK development libraries
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: blas-devel = %{version}-%{release}
-Provides: lapack-static = %{version}-%{release}
 
 %description devel
-LAPACK development libraries for applications that link statically.
+LAPACK development libraries (shared).
+
+%package static
+Summary: LAPACK static libraries
+Group: Development/Libraries
+
+%description static
+LAPACK static libraries.
 
 %package -n blas
 Summary: The Basic Linear Algebra Subprograms library
@@ -51,10 +57,16 @@ Summary: BLAS development libraries
 Group: Development/Libraries
 Requires: blas = %{version}-%{release}
 Requires: gcc-gfortran
-Provides: blas-static = %{version}-%{release}
 
 %description -n blas-devel
-BLAS development libraries for applications that link statically.
+BLAS development libraries (shared).
+
+%package -n blas-static
+Summary: BLAS static libraries
+Group: Development/Libraries
+
+%description -n blas-static
+BLAS static libraries.
 
 %prep
 %setup -q 
@@ -173,6 +185,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/liblapack.so
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/liblapack*.a
 
 %files -n blas -f blasmans
@@ -183,9 +198,15 @@ rm -fr ${RPM_BUILD_ROOT}
 %files -n blas-devel
 %defattr(-,root,root,-)
 %{_libdir}/libblas.so
+
+%files -n blas-static
+%defattr(-,root,root,-)
 %{_libdir}/libblas*.a
 
 %changelog
+* Wed Dec  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-4
+- Move static libs to static subpackages (resolves bz 545143)
+
 * Fri Sep  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-3
 - use RPM_OPT_O_FLAGS (-O0) everywhere necessary, drop RPM_OPT_SIZE_FLAGS (-Os) (bz 520518)
 



From pkgdb at fedoraproject.org  Wed Dec  9 15:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:38:53 +0000
Subject: [pkgdb] db4: sreemadhavam has given up watchcommits
Message-ID: <20091209153853.927E310F890@bastion2.fedora.phx.redhat.com>

sreemadhavam has given up the watchcommits acl on db4 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/db4



From pkgdb at fedoraproject.org  Wed Dec  9 15:39:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:39:23 +0000
Subject: [pkgdb] db4: sreemadhavam has given up watchcommits
Message-ID: <20091209153923.AFC6610F890@bastion2.fedora.phx.redhat.com>

sreemadhavam has given up the watchcommits acl on db4 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/db4



From pkgdb at fedoraproject.org  Wed Dec  9 15:47:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:47:20 +0000
Subject: [pkgdb] bonnie++: joshkayse has given up watchbugzilla
Message-ID: <20091209154721.040EB10F89A@bastion2.fedora.phx.redhat.com>

joshkayse has given up the watchbugzilla acl on bonnie++ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 15:48:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:48:09 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209154809.B523710F881@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on bonnie++ (Fedora devel) to Approved for joshkayse

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 15:48:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:48:10 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209154810.94C5910F892@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on bonnie++ (Fedora devel) to Approved for joshkayse

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Wed Dec  9 15:48:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 15:48:11 +0000
Subject: [pkgdb] bonnie++ had acl change status
Message-ID: <20091209154811.B04B310F89E@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on bonnie++ (Fedora devel) to Approved for joshkayse

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bonnie++



From joshkayse at fedoraproject.org  Wed Dec  9 15:51:28 2009
From: joshkayse at fedoraproject.org (joshkayse)
Date: Wed,  9 Dec 2009 15:51:28 +0000 (UTC)
Subject: rpms/bonnie++/devel bonnie++-1.96-makefile.patch, NONE,
	1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 bonnie++.spec, 1.22, 1.23 sources,
	1.4, 1.5 bonnie++-1.03e-makefile.patch, 1.1, NONE
Message-ID: <20091209155128.C9BA711C00E0@cvs1.fedora.phx.redhat.com>

Author: joshkayse

Update of /cvs/pkgs/rpms/bonnie++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30701/devel

Modified Files:
	.cvsignore bonnie++.spec sources 
Added Files:
	bonnie++-1.96-makefile.patch import.log 
Removed Files:
	bonnie++-1.03e-makefile.patch 
Log Message:
update to bonnie++ 1.96

bonnie++-1.96-makefile.patch:
 Makefile.in |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE bonnie++-1.96-makefile.patch ---
--- bonnie++-1.96.orig/Makefile.in	2009-12-09 10:01:09.000000000 -0500
+++ bonnie++-1.96/Makefile.in	2009-12-09 10:02:33.000000000 -0500
@@ -17,6 +17,8 @@ THREAD_LFLAGS=@thread_ldflags@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 
+DESTDIR=
+
 BONSRC=bonnie++.cpp bon_io.cpp bon_file.cpp bon_time.cpp semaphore.cpp \
  sync.cpp thread.cpp bon_suid.cpp duration.cpp rand.o util.o
 BONOBJS=$(BONSRC:.cpp=.o)
@@ -52,15 +54,15 @@ generate_randfile: generate_randfile.o
 	$(LINK) generate_randfile.o -o generate_randfile
 
 install-bin: $(EXE) $(EXES)
-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
-	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
-	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin
-	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
+	mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
+	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
+	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin
+	@INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin
 
 install: install-bin
-	mkdir -p @mandir@/man1 @mandir@/man8
-	@INSTALL_DATA@ $(MAN1) @mandir@/man1
-	@INSTALL_DATA@ $(MAN8) @mandir@/man8
+	mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8
+	@INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1
+	@INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8
 
 %.o: %.cpp
 	$(CXX) -c $<


--- NEW FILE import.log ---
bonnie++-1_96-1_fc13:HEAD:bonnie++-1.96-1.fc13.src.rpm:1260373813


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 May 2009 17:19:43 -0000	1.4
+++ .cvsignore	9 Dec 2009 15:51:28 -0000	1.5
@@ -1 +1 @@
-bonnie++-1.03e.tgz
+bonnie++-1.96.tgz


Index: bonnie++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/bonnie++.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- bonnie++.spec	24 Jul 2009 18:19:24 -0000	1.22
+++ bonnie++.spec	9 Dec 2009 15:51:28 -0000	1.23
@@ -1,14 +1,14 @@
 Name:           bonnie++
-Version:        1.03e
-Release:        3%{?dist}
+Version:        1.96
+Release:        1%{?dist}
 
 Summary:        Filesystem and disk benchmark & burn-in suite
 
 Group:          Applications/System
 License:        GPLv2
 URL:            http://www.coker.com.au/bonnie++/
-Source0:        http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz
-Patch0:         bonnie++-1.03e-makefile.patch
+Source0:        http://www.coker.com.au/bonnie++/experimental/bonnie++-%{version}.tgz
+Patch0:         %{name}-%{version}-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 %description
@@ -22,7 +22,7 @@ Do not leave bonnie++ installed on a pro
 test servers.
 
 %prep
-%setup -q -n bonnie++-1.03e
+%setup -q -n bonnie++-%{version}
 %patch0 -p1
 
 
@@ -45,15 +45,24 @@ rm -rf $RPM_BUILD_ROOT
 %doc readme.html copyright.txt credits.txt debian/changelog
 %{_mandir}/man1/bon_csv2html.1*
 %{_mandir}/man1/bon_csv2txt.1*
+%{_mandir}/man1/generate_randfile.1*
 %{_mandir}/man8/bonnie++.8*
+%{_mandir}/man8/getc_putc.8.*
 %{_mandir}/man8/zcav.8*
 %{_sbindir}/bonnie++
+%{_sbindir}/getc_putc
+%{_sbindir}/getc_putc_helper
 %{_sbindir}/zcav
 %{_bindir}/bon_csv2html
 %{_bindir}/bon_csv2txt
+%{_bindir}/generate_randfile
 
 
 %changelog
+* Wed Dec  9 2009 Rob Myers <rmyers at fedoraproject.org> - 1.96
+- Update to experimental version (#490895)
+- Merge patch from David Fetter
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03e-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 May 2009 17:19:43 -0000	1.4
+++ sources	9 Dec 2009 15:51:28 -0000	1.5
@@ -1 +1 @@
-750aa5b5051263a99c6c195888c74968  bonnie++-1.03e.tgz
+7b8594559f00887d2865de1838328b35  bonnie++-1.96.tgz


--- bonnie++-1.03e-makefile.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Dec  9 15:54:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  9 Dec 2009 15:54:20 +0000 (UTC)
Subject: rpms/gupnp/F-12 .cvsignore, 1.11, 1.12 gupnp.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20091209155420.2BE4F11C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31584

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
- Update to 0.13.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Oct 2009 21:44:53 -0000	1.11
+++ .cvsignore	9 Dec 2009 15:54:19 -0000	1.12
@@ -1 +1 @@
-gupnp-0.13.1.tar.gz
+gupnp-0.13.2.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-12/gupnp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gupnp.spec	7 Oct 2009 21:44:54 -0000	1.27
+++ gupnp.spec	9 Dec 2009 15:54:19 -0000	1.28
@@ -1,5 +1,5 @@
 Name:           gupnp
-Version:        0.13.1
+Version:        0.13.2
 Release:        1%{?dist}
 Summary:        A framework for creating UPnP devices & control points
 
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Dec  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.2-1
+- Update to 0.13.2
+
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.1-1
 - Update to 0.13.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Oct 2009 21:44:54 -0000	1.11
+++ sources	9 Dec 2009 15:54:19 -0000	1.12
@@ -1 +1 @@
-9b5fcf8146ba9a2bd84382f61717aa0e  gupnp-0.13.1.tar.gz
+eca3f79b32deb43f5de752d6cf2c160d  gupnp-0.13.2.tar.gz



From lmacken at fedoraproject.org  Wed Dec  9 16:02:44 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  9 Dec 2009 16:02:44 +0000 (UTC)
Subject: rpms/liveusb-creator/F-12 .cvsignore, 1.20,
	1.21 liveusb-creator.spec, 1.30, 1.31 sources, 1.25, 1.26
Message-ID: <20091209160244.84AA611C00E0@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1550

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.9.1 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	1 Dec 2009 20:17:51 -0000	1.20
+++ .cvsignore	9 Dec 2009 16:02:44 -0000	1.21
@@ -1 +1 @@
-liveusb-creator-3.9.tar.bz2
+liveusb-creator-3.9.1.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-12/liveusb-creator.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- liveusb-creator.spec	1 Dec 2009 20:17:51 -0000	1.30
+++ liveusb-creator.spec	9 Dec 2009 16:02:44 -0000	1.31
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.9
+Version:        3.9.1
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Dec 08 2009 Luke Macken <lmacken at redhat.com> - 3.9.1-1
+- 3.9.1 bugfix release
+
 * Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.9-1
 - 3.9 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	1 Dec 2009 20:17:51 -0000	1.25
+++ sources	9 Dec 2009 16:02:44 -0000	1.26
@@ -1 +1 @@
-ec6f0162528aaf51481815f6a909174c  liveusb-creator-3.9.tar.bz2
+ddd44134e7e726f9892850cde87cf677  liveusb-creator-3.9.1.tar.bz2



From hadess at fedoraproject.org  Wed Dec  9 16:18:58 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 16:18:58 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.247,1.248
Message-ID: <20091209161858.B84B911C0264@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5973

Modified Files:
	epiphany.spec 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-2
- Remove gnome-vfs2-devel dependency for the devel package



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- epiphany.spec	1 Dec 2009 14:47:39 -0000	1.247
+++ epiphany.spec	9 Dec 2009 16:18:56 -0000	1.248
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -72,7 +72,7 @@ Requires: webkitgtk-devel >= %{webkitgtk
 Requires: scrollkeeper >= %{scrollkeeper_ver}
 Requires: libxml2-devel, libxslt-devel
 Requires: libgnomeui-devel, libglade2-devel
-Requires: gnome-vfs2-devel, GConf2-devel
+Requires: GConf2-devel
 Requires: iso-codes-devel
 Requires: gnome-doc-utils >= %{gnome_doc_utils_ver}
 Requires: gnome-desktop-devel
@@ -245,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-2
+- Remove gnome-vfs2-devel dependency for the devel package
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From danw at fedoraproject.org  Wed Dec  9 16:23:13 2009
From: danw at fedoraproject.org (Dan Winship)
Date: Wed,  9 Dec 2009 16:23:13 +0000 (UTC)
Subject: rpms/libsoup/devel libsoup-2.29.3-introspectability.patch, NONE,
	1.1 libsoup.spec, 1.103, 1.104
Message-ID: <20091209162313.1CF1911C0264@cvs1.fedora.phx.redhat.com>

Author: danw

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7400

Modified Files:
	libsoup.spec 
Added Files:
	libsoup-2.29.3-introspectability.patch 
Log Message:
* Wed Dec  9 2009 Dan Winship <danw at redhat.com> - 2.29.3-2
- Add patch from git to fix gir-repository build


libsoup-2.29.3-introspectability.patch:
 soup-session.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE libsoup-2.29.3-introspectability.patch ---
>From b304a99ddebbb14b231c4b288e303b3088d7041e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz at gnome.org>
Date: Thu, 3 Dec 2009 15:35:58 +0100
Subject: [PATCH] Make connection-created and tunneling of SoupSession use a GObject

The connection-created and tunneling signals added to SoupSession in commit
6ff7ecdd were using SoupConnection, and this made SoupConnection
semi-public (gir-repository failed to build because it didn't know about
it, for example).

Since SoupConnection is intended to be private, use a GObject for the
signal parameter.

https://bugzilla.gnome.org/show_bug.cgi?id=603696
---
 libsoup/soup-session.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index c4d3044..547db9f 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -390,7 +390,9 @@ soup_session_class_init (SoupSessionClass *session_class)
 			      NULL, NULL,
 			      soup_marshal_NONE__OBJECT,
 			      G_TYPE_NONE, 1,
-			      SOUP_TYPE_CONNECTION);
+			      /* SoupConnection is public, so we can't use
+			       * SOUP_TYPE_CONNECTION here */
+			      G_TYPE_OBJECT);
 
 	signals[TUNNELING] =
 		g_signal_new ("tunneling",
@@ -400,7 +402,9 @@ soup_session_class_init (SoupSessionClass *session_class)
 			      NULL, NULL,
 			      soup_marshal_NONE__OBJECT,
 			      G_TYPE_NONE, 1,
-			      SOUP_TYPE_CONNECTION);
+			      /* SoupConnection is public, so we can't use
+			       * SOUP_TYPE_CONNECTION here */
+			      G_TYPE_OBJECT);
 
 
 	/* properties */
-- 
1.6.5.2



Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- libsoup.spec	1 Dec 2009 14:56:53 -0000	1.103
+++ libsoup.spec	9 Dec 2009 16:23:12 -0000	1.104
@@ -4,7 +4,7 @@
 
 Name: libsoup
 Version: 2.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
@@ -12,6 +12,8 @@ URL: http://live.gnome.org/LibSoup
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Source: http://download.gnome.org/sources/libsoup/2.28/libsoup-%{version}.tar.bz2
 
+Patch0: libsoup-2.29.3-introspectability.patch
+
 ### Build Dependencies ###
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -48,6 +50,7 @@ you to develop applications that use the
 
 %prep
 %setup -q
+%patch0 -p1 -b .introspectability
 
 %build
 %configure
@@ -85,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Wed Dec  9 2009 Dan Winship <danw at redhat.com> - 2.29.3-2
+- Add patch from git to fix gir-repository build
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From mtasaka at fedoraproject.org  Wed Dec  9 16:33:19 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Dec 2009 16:33:19 +0000 (UTC)
Subject: File rake-compiler-0.7.0.gem uploaded to lookaside cache by mtasaka
Message-ID: <20091209163319.F0EA310F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rubygem-rake-compiler:

bc8dbdadac79b6a30cf3aa702a3a1ead  rake-compiler-0.7.0.gem



From mtasaka at fedoraproject.org  Wed Dec  9 16:34:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Dec 2009 16:34:17 +0000 (UTC)
Subject: rpms/rubygem-rake-compiler/F-12 .cvsignore, 1.3,
	1.4 rubygem-rake-compiler.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091209163417.ED91511C0264@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-rake-compiler/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10326/F-12

Modified Files:
	.cvsignore rubygem-rake-compiler.spec sources 
Log Message:
* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-1
- 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rake-compiler/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Jul 2009 18:13:49 -0000	1.3
+++ .cvsignore	9 Dec 2009 16:34:17 -0000	1.4
@@ -1 +1 @@
-rake-compiler-0.6.0.gem
+rake-compiler-0.7.0.gem


Index: rubygem-rake-compiler.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rake-compiler/F-12/rubygem-rake-compiler.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rubygem-rake-compiler.spec	28 Jul 2009 18:13:49 -0000	1.3
+++ rubygem-rake-compiler.spec	9 Dec 2009 16:34:17 -0000	1.4
@@ -6,7 +6,7 @@
 
 Summary:	Rake-based Ruby C Extension task generator
 Name:		rubygem-%{gemname}
-Version:	0.6.0
+Version:	0.7.0
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
@@ -15,9 +15,9 @@ Source0:	http://gems.rubyforge.org/gems/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
-BuildRequires:	ruby(rubygems)
+BuildRequires:	ruby(rubygems) >= 1.3.5
 Requires:	ruby(abi) = %{rubyabi}
-Requires:	ruby(rubygems)
+Requires:	ruby(rubygems) >= 1.3.5
 Requires:	rubygem(rake) >= 0.8.3
 BuildArch:	noarch
 Provides:	rubygem(%{gemname}) = %{version}-%{release}
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-1
+- 0.7.0
+
 * Wed Jul 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.0-1
 - 0.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rake-compiler/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Jul 2009 18:13:49 -0000	1.3
+++ sources	9 Dec 2009 16:34:17 -0000	1.4
@@ -1 +1 @@
-9a8edefde6ca9df9222f6cfe3973c130  rake-compiler-0.6.0.gem
+bc8dbdadac79b6a30cf3aa702a3a1ead  rake-compiler-0.7.0.gem



From mtasaka at fedoraproject.org  Wed Dec  9 16:34:18 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  9 Dec 2009 16:34:18 +0000 (UTC)
Subject: rpms/rubygem-rake-compiler/devel .cvsignore, 1.3,
	1.4 rubygem-rake-compiler.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091209163418.180EC11C0266@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-rake-compiler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10326/devel

Modified Files:
	.cvsignore rubygem-rake-compiler.spec sources 
Log Message:
* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-1
- 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rake-compiler/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Jul 2009 18:13:49 -0000	1.3
+++ .cvsignore	9 Dec 2009 16:34:17 -0000	1.4
@@ -1 +1 @@
-rake-compiler-0.6.0.gem
+rake-compiler-0.7.0.gem


Index: rubygem-rake-compiler.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rake-compiler/devel/rubygem-rake-compiler.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rubygem-rake-compiler.spec	28 Jul 2009 18:13:49 -0000	1.3
+++ rubygem-rake-compiler.spec	9 Dec 2009 16:34:17 -0000	1.4
@@ -6,7 +6,7 @@
 
 Summary:	Rake-based Ruby C Extension task generator
 Name:		rubygem-%{gemname}
-Version:	0.6.0
+Version:	0.7.0
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
@@ -15,9 +15,9 @@ Source0:	http://gems.rubyforge.org/gems/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
-BuildRequires:	ruby(rubygems)
+BuildRequires:	ruby(rubygems) >= 1.3.5
 Requires:	ruby(abi) = %{rubyabi}
-Requires:	ruby(rubygems)
+Requires:	ruby(rubygems) >= 1.3.5
 Requires:	rubygem(rake) >= 0.8.3
 BuildArch:	noarch
 Provides:	rubygem(%{gemname}) = %{version}-%{release}
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-1
+- 0.7.0
+
 * Wed Jul 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.0-1
 - 0.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rake-compiler/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Jul 2009 18:13:49 -0000	1.3
+++ sources	9 Dec 2009 16:34:17 -0000	1.4
@@ -1 +1 @@
-9a8edefde6ca9df9222f6cfe3973c130  rake-compiler-0.6.0.gem
+bc8dbdadac79b6a30cf3aa702a3a1ead  rake-compiler-0.7.0.gem



From lmacken at fedoraproject.org  Wed Dec  9 16:39:45 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  9 Dec 2009 16:39:45 +0000 (UTC)
Subject: rpms/liveusb-creator/F-11 .cvsignore, 1.19,
	1.20 liveusb-creator.spec, 1.27, 1.28 sources, 1.24, 1.25
Message-ID: <20091209163945.E785E11C0264@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12329

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.9.1 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Dec 2009 20:18:54 -0000	1.19
+++ .cvsignore	9 Dec 2009 16:39:45 -0000	1.20
@@ -1 +1 @@
-liveusb-creator-3.9.tar.bz2
+liveusb-creator-3.9.1.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/liveusb-creator.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- liveusb-creator.spec	1 Dec 2009 20:18:54 -0000	1.27
+++ liveusb-creator.spec	9 Dec 2009 16:39:45 -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:           liveusb-creator
-Version:        3.9
+Version:        3.9.1
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Tue Dec 08 2009 Luke Macken <lmacken at redhat.com> - 3.9.1-1
+- 3.9.1 bugfix release
+
 * Tue Dec 01 2009 Luke Macken <lmacken at redhat.com> - 3.9-1
 - 3.9 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	1 Dec 2009 20:18:54 -0000	1.24
+++ sources	9 Dec 2009 16:39:45 -0000	1.25
@@ -1 +1 @@
-ec6f0162528aaf51481815f6a909174c  liveusb-creator-3.9.tar.bz2
+ddd44134e7e726f9892850cde87cf677  liveusb-creator-3.9.1.tar.bz2



From hadess at fedoraproject.org  Wed Dec  9 16:52:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 16:52:18 +0000 (UTC)
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.281, 
	1.282
Message-ID: <20091209165218.41A2B11C0264@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15806

Modified Files:
	evolution-data-server.spec 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-3
- Remove libgnome and libgnomeui requirements



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- evolution-data-server.spec	2 Dec 2009 18:37:38 -0000	1.281
+++ evolution-data-server.spec	9 Dec 2009 16:52:17 -0000	1.282
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 2.29.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -59,8 +59,9 @@ BuildRequires: gtk-doc >= %{gtk_doc_vers
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libglade2-devel
-BuildRequires: libgnome-devel
-BuildRequires: libgnomeui-devel
+%if %{use_gnome_keyring}
+BuildRequires  gnome-keyring-devel
+%endif
 BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: libical-devel >= %{libical_version}
 BuildRequires: libsoup-devel >= %{soup_version}
@@ -97,7 +98,9 @@ Summary: Development files for building 
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-glib-devel
-Requires: libgnome-devel
+%if %{use_gnome_keyring}
+Requires: gnome-keyring-devel
+%endif
 Requires: libgweather-devel
 Requires: libical-devel
 Requires: libsoup-devel
@@ -335,6 +338,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-3
+- Remove libgnome and libgnomeui requirements
+
 * Wed Dec 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.3-2.fc13
 - Devel subpackage does not need to require doc subpackage.
 



From hadess at fedoraproject.org  Wed Dec  9 16:53:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  9 Dec 2009 16:53:31 +0000 (UTC)
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.282, 
	1.283
Message-ID: <20091209165331.29DF511C0264@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16354

Modified Files:
	evolution-data-server.spec 
Log Message:
* Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-3
- Remove libgnome and libgnomeui requirements



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- evolution-data-server.spec	9 Dec 2009 16:52:17 -0000	1.282
+++ evolution-data-server.spec	9 Dec 2009 16:53:31 -0000	1.283
@@ -60,7 +60,7 @@ BuildRequires: gtk2-devel >= %{gtk2_vers
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libglade2-devel
 %if %{use_gnome_keyring}
-BuildRequires  gnome-keyring-devel
+BuildRequires: gnome-keyring-devel
 %endif
 BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: libical-devel >= %{libical_version}



From npajkovs at fedoraproject.org  Wed Dec  9 16:56:44 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Wed,  9 Dec 2009 16:56:44 +0000 (UTC)
Subject: rpms/less/F-12 less-436-manpage.patch,NONE,1.1 less.spec,1.58,1.59
Message-ID: <20091209165644.C704E11C0264@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/less/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17606

Modified Files:
	less.spec 
Added Files:
	less-436-manpage.patch 
Log Message:
Resolves: #537746 - Two different descriptions about the default value of LESSBINFMT

less-436-manpage.patch:
 less.man |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE less-436-manpage.patch ---
diff -up less-436/less.man.manpage less-436/less.man
--- less-436/less.man.manpage	2009-07-08 00:27:22.000000000 +0200
+++ less-436/less.man	2009-12-09 17:48:54.571351651 +0100
@@ -1164,10 +1164,10 @@ LESS(1)                                 
        attribute  is  assumed.   The remainder of LESSBINFMT is a string which
        may include one printf-style escape sequence (a % followed by x, X,  o,
        d,  etc.).   For  example, if LESSBINFMT is "*u[%x]", binary characters
-       are displayed in underlined hexadecimal surrounded  by  brackets.   The
-       default  if  no LESSBINFMT is specified is "*s<%X>".  The default if no
-       LESSBINFMT is specified is "*s<%02X>".  Warning: the result of  expand-
-       ing the character via LESSBINFMT must be less than 31 characters.
+       are displayed in underlined hexadecimal surrounded  by  brackets.   The 
+       default if no LESSBINFMT  is  specified  is  "*s<%02X>".  Warning:  the 
+       result of  expanding the character via LESSBINFMT must be less  than 31
+       characters.
 
        When the character set is utf-8, the LESSUTFBINFMT environment variable
        acts similarly to LESSBINFMT but it applies to Unicode code points that


Index: less.spec
===================================================================
RCS file: /cvs/extras/rpms/less/F-12/less.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- less.spec	25 Jul 2009 05:05:09 -0000	1.58
+++ less.spec	9 Dec 2009 16:56:44 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better
 Name: less
 Version: 436
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@ Source3: less.csh
 Patch1:	less-406-Foption.patch
 Patch4: less-394-time.patch
 Patch5: less-418-fsync.patch
+Patch6: less-436-manpage.patch
 URL: http://www.greenwoodsoftware.com/less/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: ncurses-devel
@@ -32,6 +33,7 @@ files, and you'll use it frequently.
 %patch1 -p1 -b .Foption
 %patch4 -p1 -b .time
 %patch5 -p1 -b .fsync
+%patch6 -p1 -b .manpage
 
 autoreconf
 
@@ -63,6 +65,9 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Dec 9 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 436-3
+- Resolves: #537746 - Two different descriptions about the default value of LESSBINFMT
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 436-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From s4504kr at fedoraproject.org  Wed Dec  9 16:59:29 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  9 Dec 2009 16:59:29 +0000 (UTC)
Subject: rpms/clojure/F-12 clojure-1.0.0-no_classpath.patch, NONE,
	1.1 clojure.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20091209165929.164A811C0264@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/clojure/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18661

Modified Files:
	clojure.spec sources 
Added Files:
	clojure-1.0.0-no_classpath.patch 
Log Message:
First stable upstream release of clojure

clojure-1.0.0-no_classpath.patch:
 build.xml |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE clojure-1.0.0-no_classpath.patch ---
--- richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml.no_classpath	2009-05-04 19:23:20.000000000 -0400
+++ richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml	2009-09-29 06:39:34.151649990 -0400
@@ -104,7 +104,6 @@
       </fileset>
       <manifest>
         <attribute name="Main-Class" value="clojure.main"/>
-        <attribute name="Class-Path" value="."/>
       </manifest>
     </jar>
     <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
@@ -122,7 +121,6 @@
       </fileset>
       <manifest>
         <attribute name="Main-Class" value="clojure.main"/>
-        <attribute name="Class-Path" value="."/>
       </manifest>
     </jar>
     <copy file="${slim_jar}" tofile="${slim_noversion_jar}" />


Index: clojure.spec
===================================================================
RCS file: /cvs/extras/rpms/clojure/F-12/clojure.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- clojure.spec	24 Jul 2009 19:06:45 -0000	1.9
+++ clojure.spec	9 Dec 2009 16:59:28 -0000	1.10
@@ -1,13 +1,18 @@
+
 Name:           clojure
-Version:     	20090320
-Release:        2%{?dist}
+Epoch:		1
+Version:     	1.0.0
+Release:        5%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
-License:        CPL
+License:        EPL
 URL:            http://clojure.org/
-Source0:        http://downloads.sourceforge.net/clojure/clojure_%{version}.zip
+Source0:        http://clojure.googlecode.com/files/clojure_%{version}.zip
 Source1:        clojure.sh
+
+Patch1:		clojure-1.0.0-no_classpath.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -32,16 +37,14 @@ optional type hints and type inference, 
 can avoid reflection.
 
 %prep
-%setup -q -c -n clojure-%{version}
-cd clojure
+%setup -q -c -n clojure
 rm -f *.jar
+%patch1 -p1
 
 %build
-cd clojure
 ant jar
 
 %install
-cd clojure
 rm -rf %{buildroot}
 
 # prefix install
@@ -57,20 +60,44 @@ cp clojure.jar %{buildroot}%{_javadir}/%
 install -d -m 755 %{buildroot}%{_bindir}
 cp %{SOURCE1} %{buildroot}%{_bindir}/clojure
 
+install -d %{buildroot}%{_datadir}/maven2/poms
+%add_to_maven_depmap clojure clojur-lang %{version} JPP/%{name} clojure-lang
+install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-clojure-lang.pom
+
 %clean
 rm -rf %{buildroot}
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
 
 %files
 %defattr(-,root,root,-)
-%doc clojure/readme.txt
+%doc readme.txt epl-v10.html
 
 %attr(0755,root,root) %{_bindir}/clojure
 %{_javadir}/%{name}.jar
 %{_datadir}/%{name}
 %{_bindir}/clojure
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}/*
 
 %changelog
+* Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-5
+- Installing maven pom file
+
+* Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-3
+- Add Epoch to get proper EVR path
+
+* Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-2
+- Forgot uploading soruces
+
+* Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-1
+- New upstream release
+- change license tag to EPL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090320-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clojure/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Mar 2009 16:52:35 -0000	1.4
+++ sources	9 Dec 2009 16:59:28 -0000	1.5
@@ -1 +1 @@
-0bbd1f6f889dded06ce0fe18381f150c  clojure_20090320.zip
+e7a50129040df7fe52287006988ecbb2  clojure_1.0.0.zip



From emaldonado at fedoraproject.org  Wed Dec  9 17:04:26 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed,  9 Dec 2009 17:04:26 +0000 (UTC)
Subject: rpms/nss/devel nss-sysinit.patch,1.1,1.2 nss.spec,1.127,1.128
Message-ID: <20091209170426.6381E11C0264@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20428

Modified Files:
	nss-sysinit.patch nss.spec 
Log Message:
Remove unneeded patch

nss-sysinit.patch:
 manifest.mn |    1 +
 1 file changed, 1 insertion(+)

Index: nss-sysinit.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-sysinit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-sysinit.patch	4 Dec 2009 04:22:50 -0000	1.1
+++ nss-sysinit.patch	9 Dec 2009 17:04:25 -0000	1.2
@@ -13,26 +13,3 @@ diff -u -p -r1.20 manifest.mn
  	$(NULL)
  
  #  fortcrypt  is no longer built
-Index: mozilla/security/nss/lib/nss/nssinit.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/nss/nssinit.c,v
-retrieving revision 1.103
-diff -u -p -r1.103 nssinit.c
---- mozilla/security/nss/lib/nss/nssinit.c	29 Oct 2009 21:33:10 -0000	1.103
-+++ mozilla/security/nss/lib/nss/nssinit.c	4 Dec 2009 01:25:06 -0000
-@@ -52,6 +52,7 @@
- #include "secoid.h"
- #include "nss.h"
- #include "pk11func.h"
-+#include "pk11priv.h"
- #include "secerr.h"
- #include "nssbase.h"
- #include "pkixt.h"
-@@ -64,6 +65,7 @@
- #include "ocspti.h"
- #include "ocspi.h"
- 
-+
- /*
-  * On Windows nss3.dll needs to export the symbol 'mktemp' to be
-  * fully backward compatible with the nss3.dll in NSS 3.2.x and


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- nss.spec	4 Dec 2009 05:07:04 -0000	1.127
+++ nss.spec	9 Dec 2009 17:04:26 -0000	1.128
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.1
+Release:          1%{?dist}.4
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -471,6 +471,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Wed Dec 09 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-2.1
+- Remove unneeded patch
+
 * Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.1
 - Retagging to include missing patch
 



From s4504kr at fedoraproject.org  Wed Dec  9 17:06:27 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  9 Dec 2009 17:06:27 +0000 (UTC)
Subject: rpms/clojure/F-11 clojure-1.0.0-no_classpath.patch, NONE,
	1.1 clojure.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091209170627.1256811C0264@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/clojure/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21238

Modified Files:
	clojure.spec sources 
Added Files:
	clojure-1.0.0-no_classpath.patch 
Log Message:
first stable upstream release

clojure-1.0.0-no_classpath.patch:
 build.xml |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE clojure-1.0.0-no_classpath.patch ---
--- richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml.no_classpath	2009-05-04 19:23:20.000000000 -0400
+++ richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml	2009-09-29 06:39:34.151649990 -0400
@@ -104,7 +104,6 @@
       </fileset>
       <manifest>
         <attribute name="Main-Class" value="clojure.main"/>
-        <attribute name="Class-Path" value="."/>
       </manifest>
     </jar>
     <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
@@ -122,7 +121,6 @@
       </fileset>
       <manifest>
         <attribute name="Main-Class" value="clojure.main"/>
-        <attribute name="Class-Path" value="."/>
       </manifest>
     </jar>
     <copy file="${slim_jar}" tofile="${slim_noversion_jar}" />


Index: clojure.spec
===================================================================
RCS file: /cvs/extras/rpms/clojure/F-11/clojure.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- clojure.spec	20 Mar 2009 16:52:35 -0000	1.8
+++ clojure.spec	9 Dec 2009 17:06:26 -0000	1.9
@@ -1,13 +1,18 @@
+
 Name:           clojure
-Version:     	20090320
-Release:        1%{?dist}
+Epoch:		1
+Version:     	1.0.0
+Release:        5%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
-License:        CPL
+License:        EPL
 URL:            http://clojure.org/
-Source0:        http://downloads.sourceforge.net/clojure/clojure_%{version}.zip
+Source0:        http://clojure.googlecode.com/files/clojure_%{version}.zip
 Source1:        clojure.sh
+
+Patch1:		clojure-1.0.0-no_classpath.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -32,16 +37,14 @@ optional type hints and type inference, 
 can avoid reflection.
 
 %prep
-%setup -q -c -n clojure-%{version}
-cd clojure
+%setup -q -c -n clojure
 rm -f *.jar
+%patch1 -p1
 
 %build
-cd clojure
 ant jar
 
 %install
-cd clojure
 rm -rf %{buildroot}
 
 # prefix install
@@ -57,20 +60,47 @@ cp clojure.jar %{buildroot}%{_javadir}/%
 install -d -m 755 %{buildroot}%{_bindir}
 cp %{SOURCE1} %{buildroot}%{_bindir}/clojure
 
+install -d %{buildroot}%{_datadir}/maven2/poms
+%add_to_maven_depmap clojure clojur-lang %{version} JPP/%{name} clojure-lang
+install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-clojure-lang.pom
+
 %clean
 rm -rf %{buildroot}
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
 
 %files
 %defattr(-,root,root,-)
-%doc clojure/readme.txt
+%doc readme.txt epl-v10.html
 
 %attr(0755,root,root) %{_bindir}/clojure
 %{_javadir}/%{name}.jar
 %{_datadir}/%{name}
 %{_bindir}/clojure
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}/*
 
 %changelog
+* Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-5
+- Installing maven pom file
+
+* Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-3
+- Add Epoch to get proper EVR path
+
+* Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-2
+- Forgot uploading soruces
+
+* Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-1
+- New upstream release
+- change license tag to EPL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090320-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 20 2009 Colin Walters <walters at verbum.org> - 20090320
 - New upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clojure/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Mar 2009 16:52:35 -0000	1.4
+++ sources	9 Dec 2009 17:06:26 -0000	1.5
@@ -1 +1 @@
-0bbd1f6f889dded06ce0fe18381f150c  clojure_20090320.zip
+e7a50129040df7fe52287006988ecbb2  clojure_1.0.0.zip



From wcohen at fedoraproject.org  Wed Dec  9 17:20:41 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed,  9 Dec 2009 17:20:41 +0000 (UTC)
Subject: File papi-3.7.2.tar.gz uploaded to lookaside cache by wcohen
Message-ID: <20091209172041.24EE810F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for papi:

2138a961b184046a863a5350937b89c8  papi-3.7.2.tar.gz



From wcohen at fedoraproject.org  Wed Dec  9 17:21:45 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed,  9 Dec 2009 17:21:45 +0000 (UTC)
Subject: rpms/papi/devel papi.spec, 1.6, 1.7 .cvsignore, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20091209172145.CD75D11C0264@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/papi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26952

Modified Files:
	papi.spec .cvsignore sources 
Log Message:
* Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-1
- Import papi-3.7.2.




Index: papi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papi/devel/papi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- papi.spec	19 Nov 2009 16:32:53 -0000	1.6
+++ papi.spec	9 Dec 2009 17:21:45 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Performance Application Programming Interface
 Name: papi
-Version: 3.7.1
-Release: 4%{?dist}
+Version: 3.7.2
+Release: 1%{?dist}
 License: BSD
 Group: Development/System
 URL: http://icl.cs.utk.edu/papi/
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-1
+- Import papi-3.7.2.
+
 * Thu Nov 19 2009 William Cohen <wcohen at redhat.com> - 3.7.1-4
 - Exclude s390 and s390x.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Nov 2009 14:34:13 -0000	1.3
+++ .cvsignore	9 Dec 2009 17:21:45 -0000	1.4
@@ -1 +1 @@
-papi-3.7.1.tar.gz
+papi-3.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Nov 2009 14:34:13 -0000	1.3
+++ sources	9 Dec 2009 17:21:45 -0000	1.4
@@ -1 +1 @@
-c9d9b073e62bc36dc13d5aa1ee65ec4e  papi-3.7.1.tar.gz
+2138a961b184046a863a5350937b89c8  papi-3.7.2.tar.gz



From dsd at fedoraproject.org  Wed Dec  9 17:32:43 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 17:32:43 +0000 (UTC)
Subject: rpms/bitfrost/F-12 .cvsignore, 1.3, 1.4 bitfrost.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20091209173243.A65B011C0264@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/bitfrost/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30891

Modified Files:
	.cvsignore bitfrost.spec sources 
Log Message:
v1.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bitfrost/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Nov 2009 07:51:25 -0000	1.3
+++ .cvsignore	9 Dec 2009 17:32:43 -0000	1.4
@@ -1 +1 @@
-bitfrost-1.0.2.tar.bz2
+bitfrost-1.0.4.tar.bz2


Index: bitfrost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bitfrost/F-12/bitfrost.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bitfrost.spec	9 Nov 2009 07:52:27 -0000	1.4
+++ bitfrost.spec	9 Dec 2009 17:32:43 -0000	1.5
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		bitfrost
-Version:	1.0.2
-Release:	2%{?dist}
+Version:	1.0.4
+Release:	1%{?dist}
 Summary:	OLPC bitfrost security modules
 
 Group:		System Environment/Base
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  9 2009 Daniel Drake <dsd at laptop.org> 1.0.4-1
+- Version bump
+
 * Mon Nov  9 2009 Daniel Drake <dsd at laptop.org> 1.0.2-2
 - retag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bitfrost/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Nov 2009 07:51:25 -0000	1.3
+++ sources	9 Dec 2009 17:32:43 -0000	1.4
@@ -1 +1 @@
-b1fc21bb54060b82f31a96fac3492dbf  bitfrost-1.0.2.tar.bz2
+332c75ca3772ef4db7433eeec4aafb93  bitfrost-1.0.4.tar.bz2



From ajax at fedoraproject.org  Wed Dec  9 17:32:56 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Dec 2009 17:32:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-11 synaptics-1.1.3-timer-fix.patch,
	NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.35, 1.36
Message-ID: <20091209173256.CA22C11C0264@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31015

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.1.3-timer-fix.patch 
Log Message:
* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.1.3-2
- synaptics-1.1.3-timer-fix.patch: Don't free the timer in DeviceOff, since
  that happens on VT switch. (#540248)


synaptics-1.1.3-timer-fix.patch:
 synaptics.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE synaptics-1.1.3-timer-fix.patch ---
diff -up xf86-input-synaptics-1.1.3/src/synaptics.c.jx xf86-input-synaptics-1.1.3/src/synaptics.c
--- xf86-input-synaptics-1.1.3/src/synaptics.c.jx	2009-08-02 21:05:26.000000000 -0400
+++ xf86-input-synaptics-1.1.3/src/synaptics.c	2009-12-09 12:30:09.000000000 -0500
@@ -750,8 +750,7 @@ DeviceOff(DeviceIntPtr dev)
     DBG(3, ErrorF("Synaptics DeviceOff called\n"));
 
     if (local->fd != -1) {
-	TimerFree(priv->timer);
-	priv->timer = NULL;
+	TimerCancel(priv->timer);
 	xf86RemoveEnabledDevice(local);
 	priv->proto_ops->DeviceOffHook(local);
 	if (priv->comm.buffer) {
@@ -772,6 +771,7 @@ DeviceClose(DeviceIntPtr dev)
     SynapticsPrivate *priv = (SynapticsPrivate *) local->private;
 
     RetValue = DeviceOff(dev);
+    TimerFree(priv->timer);
     free_param_data(priv);
     return RetValue;
 }


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xorg-x11-drv-synaptics.spec	3 Aug 2009 01:51:36 -0000	1.35
+++ xorg-x11-drv-synaptics.spec	9 Dec 2009 17:32:56 -0000	1.36
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,6 +18,8 @@ Source0:        ftp://ftp.x.org/pub/indi
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
+Patch0:		synaptics-1.1.3-timer-fix.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -73,6 +75,7 @@ Features:
 %prep
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
+%patch0 -p1 -b .timer
 
 %build
 autoreconf -v --install --force || exit 1
@@ -121,6 +124,10 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.1.3-2
+- synaptics-1.1.3-timer-fix.patch: Don't free the timer in DeviceOff, since
+  that happens on VT switch. (#540248)
+
 * Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.3-1
 - synaptics 1.1.3
 - synaptics-1.1.2-auto-adjust-edges.patch: Drop.



From pkgdb at fedoraproject.org  Wed Dec  9 17:38:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:38:50 +0000
Subject: [pkgdb] php-pear-OLE was added for ke4qqq
Message-ID: <20091209173851.4335E10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package php-pear-OLE with summary Package for reading and writing OLE containers
kevin has approved Package php-pear-OLE
kevin has added a Fedora devel branch for php-pear-OLE with an owner of ke4qqq
kevin has approved php-pear-OLE in Fedora devel
kevin has approved Package php-pear-OLE
kevin has set commit to Approved for 107427 on php-pear-OLE (Fedora devel)
kevin has set checkout to Approved for 107427 on php-pear-OLE (Fedora devel)
kevin has set build to Approved for 107427 on php-pear-OLE (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-OLE



From pkgdb at fedoraproject.org  Wed Dec  9 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:38:56 +0000
Subject: [pkgdb] php-pear-OLE (Fedora, 11) updated by kevin
Message-ID: <20091209173856.F07CB10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-pear-OLE
kevin has set commit to Approved for 107427 on php-pear-OLE (Fedora 11)
kevin has set checkout to Approved for 107427 on php-pear-OLE (Fedora 11)
kevin has set build to Approved for 107427 on php-pear-OLE (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-OLE



From pkgdb at fedoraproject.org  Wed Dec  9 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:38:56 +0000
Subject: [pkgdb] php-pear-OLE summary updated by kevin
Message-ID: <20091209173856.E9C4010F892@bastion2.fedora.phx.redhat.com>

kevin set package php-pear-OLE summary to Package for reading and writing OLE containers

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-OLE



From pkgdb at fedoraproject.org  Wed Dec  9 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:38:56 +0000
Subject: [pkgdb] php-pear-OLE (Fedora, 12) updated by kevin
Message-ID: <20091209173857.08EAD10F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-pear-OLE
kevin has set commit to Approved for 107427 on php-pear-OLE (Fedora 12)
kevin has set checkout to Approved for 107427 on php-pear-OLE (Fedora 12)
kevin has set build to Approved for 107427 on php-pear-OLE (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-OLE



From pkgdb at fedoraproject.org  Wed Dec  9 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:38:56 +0000
Subject: [pkgdb] php-pear-OLE (Fedora EPEL, 5) updated by kevin
Message-ID: <20091209173857.167BA10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-pear-OLE
kevin has set commit to Approved for 107427 on php-pear-OLE (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-pear-OLE (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-pear-OLE (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-OLE



From kevin at fedoraproject.org  Wed Dec  9 17:39:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:39:12 +0000 (UTC)
Subject: rpms/php-pear-OLE/devel - New directory
Message-ID: <20091209173912.6D1BC11C02BA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-OLE/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspL1207/rpms/php-pear-OLE/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pear-OLE/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:39:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:39:12 +0000 (UTC)
Subject: rpms/php-pear-OLE - New directory
Message-ID: <20091209173912.1FE3511C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-OLE
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspL1207/rpms/php-pear-OLE

Log Message:
Directory /cvs/pkgs/rpms/php-pear-OLE added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:39:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:39:24 +0000 (UTC)
Subject: rpms/php-pear-OLE Makefile,NONE,1.1
Message-ID: <20091209173924.E766B11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-OLE
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspL1207/rpms/php-pear-OLE

Added Files:
	Makefile 
Log Message:
Setup of module php-pear-OLE


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-OLE
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:39:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:39:25 +0000 (UTC)
Subject: rpms/php-pear-OLE/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091209173925.3F13711C02BA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-OLE/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspL1207/rpms/php-pear-OLE/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-OLE


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-OLE
# $Id: Makefile,v 1.1 2009/12/09 17:39:25 kevin Exp $
NAME := php-pear-OLE
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:40:11 +0000
Subject: [pkgdb] php-nusoap was added for ke4qqq
Message-ID: <20091209174011.1E3A810F891@bastion2.fedora.phx.redhat.com>

kevin has added Package php-nusoap with summary SOAP toolkit for PHP
kevin has approved Package php-nusoap
kevin has added a Fedora devel branch for php-nusoap with an owner of ke4qqq
kevin has approved php-nusoap in Fedora devel
kevin has approved Package php-nusoap
kevin has set commit to Approved for 107427 on php-nusoap (Fedora devel)
kevin has set checkout to Approved for 107427 on php-nusoap (Fedora devel)
kevin has set build to Approved for 107427 on php-nusoap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-nusoap



From pkgdb at fedoraproject.org  Wed Dec  9 17:40:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:40:12 +0000
Subject: [pkgdb] php-nusoap summary updated by kevin
Message-ID: <20091209174012.726A510F89C@bastion2.fedora.phx.redhat.com>

kevin set package php-nusoap summary to SOAP toolkit for PHP

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-nusoap



From pkgdb at fedoraproject.org  Wed Dec  9 17:40:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:40:12 +0000
Subject: [pkgdb] php-nusoap (Fedora, 11) updated by kevin
Message-ID: <20091209174012.880C610F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-nusoap
kevin has set commit to Approved for 107427 on php-nusoap (Fedora 11)
kevin has set checkout to Approved for 107427 on php-nusoap (Fedora 11)
kevin has set build to Approved for 107427 on php-nusoap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-nusoap



From pkgdb at fedoraproject.org  Wed Dec  9 17:40:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:40:12 +0000
Subject: [pkgdb] php-nusoap (Fedora EPEL, 5) updated by kevin
Message-ID: <20091209174012.9EBBD10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-nusoap
kevin has set commit to Approved for 107427 on php-nusoap (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-nusoap (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-nusoap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-nusoap



From pkgdb at fedoraproject.org  Wed Dec  9 17:40:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:40:12 +0000
Subject: [pkgdb] php-nusoap (Fedora, 12) updated by kevin
Message-ID: <20091209174012.ABEAF10F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for php-nusoap
kevin has set commit to Approved for 107427 on php-nusoap (Fedora 12)
kevin has set checkout to Approved for 107427 on php-nusoap (Fedora 12)
kevin has set build to Approved for 107427 on php-nusoap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-nusoap



From kevin at fedoraproject.org  Wed Dec  9 17:40:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:40:22 +0000 (UTC)
Subject: rpms/php-nusoap - New directory
Message-ID: <20091209174022.172E411C03FC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-nusoap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdK1974/rpms/php-nusoap

Log Message:
Directory /cvs/pkgs/rpms/php-nusoap added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:40:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:40:22 +0000 (UTC)
Subject: rpms/php-nusoap/devel - New directory
Message-ID: <20091209174022.3C69C11C04B6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-nusoap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdK1974/rpms/php-nusoap/devel

Log Message:
Directory /cvs/pkgs/rpms/php-nusoap/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:40:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:40:31 +0000 (UTC)
Subject: rpms/php-nusoap Makefile,NONE,1.1
Message-ID: <20091209174031.499FE11C03FC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-nusoap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdK1974/rpms/php-nusoap

Added Files:
	Makefile 
Log Message:
Setup of module php-nusoap


--- NEW FILE Makefile ---
# Top level Makefile for module php-nusoap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:40:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:40:31 +0000 (UTC)
Subject: rpms/php-nusoap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091209174031.B2FAB11C03FC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-nusoap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdK1974/rpms/php-nusoap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-nusoap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-nusoap
# $Id: Makefile,v 1.1 2009/12/09 17:40:31 kevin Exp $
NAME := php-nusoap
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ajax at fedoraproject.org  Wed Dec  9 17:43:10 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Dec 2009 17:43:10 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel synaptics-1.2.0-timer-fix.patch, 
	NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.37, 1.38
Message-ID: <20091209174310.477AE11C0264@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3351

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.2.0-timer-fix.patch 
Log Message:
* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.2.0-3
- synaptics-1.2.0-timer-fix.patch: Don't free the timer in DeviceClose, since
  that gets called on VT switch. (#540248)


synaptics-1.2.0-timer-fix.patch:
 synaptics.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE synaptics-1.2.0-timer-fix.patch ---
diff -up xf86-input-synaptics-1.2.0/src/synaptics.c.jx xf86-input-synaptics-1.2.0/src/synaptics.c
--- xf86-input-synaptics-1.2.0/src/synaptics.c.jx	2009-12-09 12:41:30.000000000 -0500
+++ xf86-input-synaptics-1.2.0/src/synaptics.c	2009-12-09 12:42:08.000000000 -0500
@@ -791,8 +791,7 @@ DeviceOff(DeviceIntPtr dev)
     DBG(3, ErrorF("Synaptics DeviceOff called\n"));
 
     if (local->fd != -1) {
-	TimerFree(priv->timer);
-	priv->timer = NULL;
+	TimerCancel(priv->timer);
 	xf86RemoveEnabledDevice(local);
         if (priv->proto_ops->DeviceOffHook)
             priv->proto_ops->DeviceOffHook(local);


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xorg-x11-drv-synaptics.spec	20 Nov 2009 00:09:36 -0000	1.37
+++ xorg-x11-drv-synaptics.spec	9 Dec 2009 17:43:10 -0000	1.38
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,6 +18,8 @@ Source0:        ftp://ftp.x.org/pub/indi
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
+Patch0:		synaptics-1.2.0-timer-fix.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -74,6 +76,7 @@ Features:
 %prep
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
+%patch0 -p1 -b .timer-fix
 
 %build
 autoreconf -v --install --force || exit 1
@@ -122,6 +125,10 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.2.0-3
+- synaptics-1.2.0-timer-fix.patch: Don't free the timer in DeviceClose, since
+  that gets called on VT switch. (#540248)
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-2
 - BuildRequires xorg-x11-util-macros 1.3.0
 



From pkgdb at fedoraproject.org  Wed Dec  9 17:43:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:43:17 +0000
Subject: [pkgdb] attica was added for arbiter
Message-ID: <20091209174317.2765110F87E@bastion2.fedora.phx.redhat.com>

kevin has added Package attica with summary Implementation of the Open Collaboration Services API
kevin has approved Package attica
kevin has added a Fedora devel branch for attica with an owner of arbiter
kevin has approved attica in Fedora devel
kevin has approved Package attica
kevin has set commit to Approved for 107427 on attica (Fedora devel)
kevin has set checkout to Approved for 107427 on attica (Fedora devel)
kevin has set build to Approved for 107427 on attica (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/attica



From pkgdb at fedoraproject.org  Wed Dec  9 17:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:43:20 +0000
Subject: [pkgdb] attica summary updated by kevin
Message-ID: <20091209174320.3A0A610F892@bastion2.fedora.phx.redhat.com>

kevin set package attica summary to Implementation of the Open Collaboration Services API

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/attica



From pkgdb at fedoraproject.org  Wed Dec  9 17:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:43:20 +0000
Subject: [pkgdb] attica (Fedora, 11) updated by kevin
Message-ID: <20091209174320.4513E10F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for attica
kevin has set commit to Approved for 107427 on attica (Fedora 11)
kevin has set checkout to Approved for 107427 on attica (Fedora 11)
kevin has set build to Approved for 107427 on attica (Fedora 11)
kevin approved watchbugzilla on attica (Fedora 11) for rdieter
kevin approved watchcommits on attica (Fedora 11) for rdieter
kevin approved commit on attica (Fedora 11) for rdieter
kevin approved build on attica (Fedora 11) for rdieter
kevin approved approveacls on attica (Fedora 11) for rdieter
kevin approved watchbugzilla on attica (Fedora 11) for kkofler
kevin approved watchcommits on attica (Fedora 11) for kkofler
kevin approved commit on attica (Fedora 11) for kkofler
kevin approved build on attica (Fedora 11) for kkofler
kevin approved approveacls on attica (Fedora 11) for kkofler
kevin approved watchbugzilla on attica (Fedora 11) for jreznik
kevin approved watchcommits on attica (Fedora 11) for jreznik
kevin approved commit on attica (Fedora 11) for jreznik
kevin approved build on attica (Fedora 11) for jreznik
kevin approved approveacls on attica (Fedora 11) for jreznik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/attica



From pkgdb at fedoraproject.org  Wed Dec  9 17:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:43:20 +0000
Subject: [pkgdb] attica (Fedora, devel) updated by kevin
Message-ID: <20091209174320.56A2F10F8A6@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on attica (Fedora devel) for rdieter
kevin approved watchcommits on attica (Fedora devel) for rdieter
kevin approved commit on attica (Fedora devel) for rdieter
kevin approved build on attica (Fedora devel) for rdieter
kevin approved approveacls on attica (Fedora devel) for rdieter
kevin approved watchbugzilla on attica (Fedora devel) for kkofler
kevin approved watchcommits on attica (Fedora devel) for kkofler
kevin approved commit on attica (Fedora devel) for kkofler
kevin approved build on attica (Fedora devel) for kkofler
kevin approved approveacls on attica (Fedora devel) for kkofler
kevin approved watchbugzilla on attica (Fedora devel) for jreznik
kevin approved watchcommits on attica (Fedora devel) for jreznik
kevin approved commit on attica (Fedora devel) for jreznik
kevin approved build on attica (Fedora devel) for jreznik
kevin approved approveacls on attica (Fedora devel) for jreznik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/attica



From pkgdb at fedoraproject.org  Wed Dec  9 17:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:43:20 +0000
Subject: [pkgdb] attica (Fedora, 12) updated by kevin
Message-ID: <20091209174320.672A310F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for attica
kevin has set commit to Approved for 107427 on attica (Fedora 12)
kevin has set checkout to Approved for 107427 on attica (Fedora 12)
kevin has set build to Approved for 107427 on attica (Fedora 12)
kevin approved watchbugzilla on attica (Fedora 12) for rdieter
kevin approved watchcommits on attica (Fedora 12) for rdieter
kevin approved commit on attica (Fedora 12) for rdieter
kevin approved build on attica (Fedora 12) for rdieter
kevin approved approveacls on attica (Fedora 12) for rdieter
kevin approved watchbugzilla on attica (Fedora 12) for kkofler
kevin approved watchcommits on attica (Fedora 12) for kkofler
kevin approved commit on attica (Fedora 12) for kkofler
kevin approved build on attica (Fedora 12) for kkofler
kevin approved approveacls on attica (Fedora 12) for kkofler
kevin approved watchbugzilla on attica (Fedora 12) for jreznik
kevin approved watchcommits on attica (Fedora 12) for jreznik
kevin approved commit on attica (Fedora 12) for jreznik
kevin approved build on attica (Fedora 12) for jreznik
kevin approved approveacls on attica (Fedora 12) for jreznik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/attica



From kevin at fedoraproject.org  Wed Dec  9 17:43:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:43:34 +0000 (UTC)
Subject: rpms/attica - New directory
Message-ID: <20091209174334.20CFE11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/attica
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslq3602/rpms/attica

Log Message:
Directory /cvs/pkgs/rpms/attica added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:43:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:43:34 +0000 (UTC)
Subject: rpms/attica/devel - New directory
Message-ID: <20091209174334.4599711C02BA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/attica/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslq3602/rpms/attica/devel

Log Message:
Directory /cvs/pkgs/rpms/attica/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:43:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:43:42 +0000 (UTC)
Subject: rpms/attica Makefile,NONE,1.1
Message-ID: <20091209174342.191BD11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/attica
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslq3602/rpms/attica

Added Files:
	Makefile 
Log Message:
Setup of module attica


--- NEW FILE Makefile ---
# Top level Makefile for module attica
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:43:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:43:42 +0000 (UTC)
Subject: rpms/attica/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091209174342.5D13011C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/attica/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslq3602/rpms/attica/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module attica


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: attica
# $Id: Makefile,v 1.1 2009/12/09 17:43:42 kevin Exp $
NAME := attica
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ajax at fedoraproject.org  Wed Dec  9 17:43:40 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Dec 2009 17:43:40 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-12 synaptics-1.2.0-timer-fix.patch,
	NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.37, 1.38
Message-ID: <20091209174340.0AA7911C0264@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3703

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.2.0-timer-fix.patch 
Log Message:
* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.2.0-3
- synaptics-1.2.0-timer-fix.patch: Don't free the timer in DeviceClose, since
  that gets called on VT switch. (#540248)


synaptics-1.2.0-timer-fix.patch:
 synaptics.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE synaptics-1.2.0-timer-fix.patch ---
diff -up xf86-input-synaptics-1.2.0/src/synaptics.c.jx xf86-input-synaptics-1.2.0/src/synaptics.c
--- xf86-input-synaptics-1.2.0/src/synaptics.c.jx	2009-12-09 12:41:30.000000000 -0500
+++ xf86-input-synaptics-1.2.0/src/synaptics.c	2009-12-09 12:42:08.000000000 -0500
@@ -791,8 +791,7 @@ DeviceOff(DeviceIntPtr dev)
     DBG(3, ErrorF("Synaptics DeviceOff called\n"));
 
     if (local->fd != -1) {
-	TimerFree(priv->timer);
-	priv->timer = NULL;
+	TimerCancel(priv->timer);
 	xf86RemoveEnabledDevice(local);
         if (priv->proto_ops->DeviceOffHook)
             priv->proto_ops->DeviceOffHook(local);


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xorg-x11-drv-synaptics.spec	20 Nov 2009 00:17:46 -0000	1.37
+++ xorg-x11-drv-synaptics.spec	9 Dec 2009 17:43:39 -0000	1.38
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,6 +18,8 @@ Source0:        ftp://ftp.x.org/pub/indi
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
+Patch0:		synaptics-1.2.0-timer-fix.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -74,6 +76,7 @@ Features:
 %prep
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
+%patch0 -p1 -b .timer-fix
 
 %build
 autoreconf -v --install --force || exit 1
@@ -122,6 +125,10 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.2.0-3
+- synaptics-1.2.0-timer-fix.patch: Don't free the timer in DeviceClose, since
+  that gets called on VT switch. (#540248)
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-2
 - BuildRequires xorg-x11-util-macros 1.3.0
 



From pkgdb at fedoraproject.org  Wed Dec  9 17:44:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:44:27 +0000
Subject: [pkgdb] woff was added for sandeeps
Message-ID: <20091209174427.87BC110F8A5@bastion2.fedora.phx.redhat.com>

kevin has added Package woff with summary Encoding and Decoding for WOFF file format
kevin has approved Package woff
kevin has added a Fedora devel branch for woff with an owner of sandeeps
kevin has approved woff in Fedora devel
kevin has approved Package woff
kevin has set commit to Approved for 107427 on woff (Fedora devel)
kevin has set checkout to Approved for 107427 on woff (Fedora devel)
kevin has set build to Approved for 107427 on woff (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woff



From pkgdb at fedoraproject.org  Wed Dec  9 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:44:29 +0000
Subject: [pkgdb] woff summary updated by kevin
Message-ID: <20091209174429.9324710F8A9@bastion2.fedora.phx.redhat.com>

kevin set package woff summary to Encoding and Decoding for WOFF file format

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woff



From pkgdb at fedoraproject.org  Wed Dec  9 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:44:29 +0000
Subject: [pkgdb] woff (Fedora, devel) updated by kevin
Message-ID: <20091209174429.99C8610F8AF@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on woff (Fedora devel) for fonts-sig
kevin approved watchcommits on woff (Fedora devel) for fonts-sig
kevin approved watchbugzilla on woff (Fedora devel) for i18n-team
kevin approved watchcommits on woff (Fedora devel) for i18n-team
kevin approved watchbugzilla on woff (Fedora devel) for pnemade
kevin approved watchcommits on woff (Fedora devel) for pnemade
kevin approved commit on woff (Fedora devel) for pnemade
kevin approved build on woff (Fedora devel) for pnemade
kevin approved approveacls on woff (Fedora devel) for pnemade

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woff



From pkgdb at fedoraproject.org  Wed Dec  9 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:44:29 +0000
Subject: [pkgdb] woff (Fedora, 11) updated by kevin
Message-ID: <20091209174429.A6F5810F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for woff
kevin has set commit to Approved for 107427 on woff (Fedora 11)
kevin has set checkout to Approved for 107427 on woff (Fedora 11)
kevin has set build to Approved for 107427 on woff (Fedora 11)
kevin approved watchbugzilla on woff (Fedora 11) for fonts-sig
kevin approved watchcommits on woff (Fedora 11) for fonts-sig
kevin approved watchbugzilla on woff (Fedora 11) for i18n-team
kevin approved watchcommits on woff (Fedora 11) for i18n-team
kevin approved watchbugzilla on woff (Fedora 11) for pnemade
kevin approved watchcommits on woff (Fedora 11) for pnemade
kevin approved commit on woff (Fedora 11) for pnemade
kevin approved build on woff (Fedora 11) for pnemade
kevin approved approveacls on woff (Fedora 11) for pnemade

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woff



From kevin at fedoraproject.org  Wed Dec  9 17:44:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:44:37 +0000 (UTC)
Subject: rpms/woff/devel - New directory
Message-ID: <20091209174437.4284D11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/woff/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqm4341/rpms/woff/devel

Log Message:
Directory /cvs/pkgs/rpms/woff/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:44:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:44:37 +0000 (UTC)
Subject: rpms/woff - New directory
Message-ID: <20091209174437.1E56F11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/woff
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqm4341/rpms/woff

Log Message:
Directory /cvs/pkgs/rpms/woff added to the repository




From pkgdb at fedoraproject.org  Wed Dec  9 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:44:29 +0000
Subject: [pkgdb] woff (Fedora, 12) updated by kevin
Message-ID: <20091209174429.B4CB210F8BF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for woff
kevin has set commit to Approved for 107427 on woff (Fedora 12)
kevin has set checkout to Approved for 107427 on woff (Fedora 12)
kevin has set build to Approved for 107427 on woff (Fedora 12)
kevin approved watchbugzilla on woff (Fedora 12) for fonts-sig
kevin approved watchcommits on woff (Fedora 12) for fonts-sig
kevin approved watchbugzilla on woff (Fedora 12) for i18n-team
kevin approved watchcommits on woff (Fedora 12) for i18n-team
kevin approved watchbugzilla on woff (Fedora 12) for pnemade
kevin approved watchcommits on woff (Fedora 12) for pnemade
kevin approved commit on woff (Fedora 12) for pnemade
kevin approved build on woff (Fedora 12) for pnemade
kevin approved approveacls on woff (Fedora 12) for pnemade

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woff



From kevin at fedoraproject.org  Wed Dec  9 17:44:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:44:44 +0000 (UTC)
Subject: rpms/woff Makefile,NONE,1.1
Message-ID: <20091209174444.DD33F11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/woff
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqm4341/rpms/woff

Added Files:
	Makefile 
Log Message:
Setup of module woff


--- NEW FILE Makefile ---
# Top level Makefile for module woff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:44:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:44:45 +0000 (UTC)
Subject: rpms/woff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091209174445.3980111C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/woff/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqm4341/rpms/woff/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module woff


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: woff
# $Id: Makefile,v 1.1 2009/12/09 17:44:45 kevin Exp $
NAME := woff
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:45:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:45:08 +0000
Subject: [pkgdb] woffTools was added for sandeeps
Message-ID: <20091209174509.6D99F10F89F@bastion2.fedora.phx.redhat.com>

kevin has added Package woffTools with summary Tool for manipulating and examining WOFF files
kevin has approved Package woffTools
kevin has added a Fedora devel branch for woffTools with an owner of sandeeps
kevin has approved woffTools in Fedora devel
kevin has approved Package woffTools
kevin has set commit to Approved for 107427 on woffTools (Fedora devel)
kevin has set checkout to Approved for 107427 on woffTools (Fedora devel)
kevin has set build to Approved for 107427 on woffTools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woffTools



From pkgdb at fedoraproject.org  Wed Dec  9 17:45:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:45:12 +0000
Subject: [pkgdb] woffTools summary updated by kevin
Message-ID: <20091209174512.DCF2B10F8C1@bastion2.fedora.phx.redhat.com>

kevin set package woffTools summary to Tool for manipulating and examining WOFF files

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woffTools



From pkgdb at fedoraproject.org  Wed Dec  9 17:45:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:45:12 +0000
Subject: [pkgdb] woffTools (Fedora, 11) updated by kevin
Message-ID: <20091209174512.E78CE10F8C4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for woffTools
kevin has set commit to Approved for 107427 on woffTools (Fedora 11)
kevin has set checkout to Approved for 107427 on woffTools (Fedora 11)
kevin has set build to Approved for 107427 on woffTools (Fedora 11)
kevin approved watchbugzilla on woffTools (Fedora 11) for fonts-sig
kevin approved watchcommits on woffTools (Fedora 11) for fonts-sig
kevin approved watchbugzilla on woffTools (Fedora 11) for i18n-team
kevin approved watchcommits on woffTools (Fedora 11) for i18n-team
kevin approved watchbugzilla on woffTools (Fedora 11) for pnemade
kevin approved watchcommits on woffTools (Fedora 11) for pnemade
kevin approved commit on woffTools (Fedora 11) for pnemade
kevin approved build on woffTools (Fedora 11) for pnemade
kevin approved approveacls on woffTools (Fedora 11) for pnemade

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woffTools



From pkgdb at fedoraproject.org  Wed Dec  9 17:45:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:45:12 +0000
Subject: [pkgdb] woffTools (Fedora, 12) updated by kevin
Message-ID: <20091209174513.4723F10F8C8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for woffTools
kevin has set commit to Approved for 107427 on woffTools (Fedora 12)
kevin has set checkout to Approved for 107427 on woffTools (Fedora 12)
kevin has set build to Approved for 107427 on woffTools (Fedora 12)
kevin approved watchbugzilla on woffTools (Fedora 12) for fonts-sig
kevin approved watchcommits on woffTools (Fedora 12) for fonts-sig
kevin approved watchbugzilla on woffTools (Fedora 12) for i18n-team
kevin approved watchcommits on woffTools (Fedora 12) for i18n-team
kevin approved watchbugzilla on woffTools (Fedora 12) for pnemade
kevin approved watchcommits on woffTools (Fedora 12) for pnemade
kevin approved commit on woffTools (Fedora 12) for pnemade
kevin approved build on woffTools (Fedora 12) for pnemade
kevin approved approveacls on woffTools (Fedora 12) for pnemade

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woffTools



From pkgdb at fedoraproject.org  Wed Dec  9 17:45:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:45:12 +0000
Subject: [pkgdb] woffTools (Fedora, devel) updated by kevin
Message-ID: <20091209174513.549B110F8CC@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on woffTools (Fedora devel) for fonts-sig
kevin approved watchcommits on woffTools (Fedora devel) for fonts-sig
kevin approved watchbugzilla on woffTools (Fedora devel) for i18n-team
kevin approved watchcommits on woffTools (Fedora devel) for i18n-team
kevin approved watchbugzilla on woffTools (Fedora devel) for pnemade
kevin approved watchcommits on woffTools (Fedora devel) for pnemade
kevin approved commit on woffTools (Fedora devel) for pnemade
kevin approved build on woffTools (Fedora devel) for pnemade
kevin approved approveacls on woffTools (Fedora devel) for pnemade

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/woffTools



From kevin at fedoraproject.org  Wed Dec  9 17:45:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:45:21 +0000 (UTC)
Subject: rpms/woffTools - New directory
Message-ID: <20091209174521.18EEF11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/woffTools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqP4773/rpms/woffTools

Log Message:
Directory /cvs/pkgs/rpms/woffTools added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:45:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:45:21 +0000 (UTC)
Subject: rpms/woffTools/devel - New directory
Message-ID: <20091209174521.38CD611C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/woffTools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqP4773/rpms/woffTools/devel

Log Message:
Directory /cvs/pkgs/rpms/woffTools/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:45:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:45:29 +0000 (UTC)
Subject: rpms/woffTools Makefile,NONE,1.1
Message-ID: <20091209174529.3080411C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/woffTools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqP4773/rpms/woffTools

Added Files:
	Makefile 
Log Message:
Setup of module woffTools


--- NEW FILE Makefile ---
# Top level Makefile for module woffTools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:45:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:45:29 +0000 (UTC)
Subject: rpms/woffTools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091209174529.94EFB11C03AD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/woffTools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqP4773/rpms/woffTools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module woffTools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: woffTools
# $Id: Makefile,v 1.1 2009/12/09 17:45:29 kevin Exp $
NAME := woffTools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:46:20 +0000
Subject: [pkgdb] perl-PDF-Create was added for lucilanga
Message-ID: <20091209174620.2B60310F89F@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-PDF-Create with summary Create PDF files
kevin has approved Package perl-PDF-Create
kevin has added a Fedora devel branch for perl-PDF-Create with an owner of lucilanga
kevin has approved perl-PDF-Create in Fedora devel
kevin has approved Package perl-PDF-Create
kevin has set commit to Approved for 107427 on perl-PDF-Create (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-PDF-Create (Fedora devel)
kevin has set build to Approved for 107427 on perl-PDF-Create (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDF-Create



From pkgdb at fedoraproject.org  Wed Dec  9 17:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:46:21 +0000
Subject: [pkgdb] perl-PDF-Create summary updated by kevin
Message-ID: <20091209174622.1714210F8B2@bastion2.fedora.phx.redhat.com>

kevin set package perl-PDF-Create summary to Create PDF files

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDF-Create



From pkgdb at fedoraproject.org  Wed Dec  9 17:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:46:21 +0000
Subject: [pkgdb] perl-PDF-Create (Fedora EPEL, 5) updated by kevin
Message-ID: <20091209174622.230D710F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-PDF-Create
kevin has set commit to Approved for 107427 on perl-PDF-Create (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-PDF-Create (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-PDF-Create (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDF-Create



From pkgdb at fedoraproject.org  Wed Dec  9 17:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:46:22 +0000
Subject: [pkgdb] perl-PDF-Create (Fedora, 11) updated by kevin
Message-ID: <20091209174622.2A0A510F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-PDF-Create
kevin has set commit to Approved for 107427 on perl-PDF-Create (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-PDF-Create (Fedora 11)
kevin has set build to Approved for 107427 on perl-PDF-Create (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDF-Create



From kevin at fedoraproject.org  Wed Dec  9 17:46:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:46:30 +0000 (UTC)
Subject: rpms/perl-PDF-Create - New directory
Message-ID: <20091209174630.1C09311C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PDF-Create
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdM5403/rpms/perl-PDF-Create

Log Message:
Directory /cvs/pkgs/rpms/perl-PDF-Create added to the repository




From pkgdb at fedoraproject.org  Wed Dec  9 17:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:46:22 +0000
Subject: [pkgdb] perl-PDF-Create (Fedora, 12) updated by kevin
Message-ID: <20091209174622.3DAB910F8BB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-PDF-Create
kevin has set commit to Approved for 107427 on perl-PDF-Create (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-PDF-Create (Fedora 12)
kevin has set build to Approved for 107427 on perl-PDF-Create (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDF-Create



From pkgdb at fedoraproject.org  Wed Dec  9 17:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:46:22 +0000
Subject: [pkgdb] perl-PDF-Create (Fedora EPEL, 4) updated by kevin
Message-ID: <20091209174622.4862610F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-PDF-Create
kevin has set commit to Approved for 107427 on perl-PDF-Create (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on perl-PDF-Create (Fedora EPEL 4)
kevin has set build to Approved for 107427 on perl-PDF-Create (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-PDF-Create



From kevin at fedoraproject.org  Wed Dec  9 17:46:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:46:30 +0000 (UTC)
Subject: rpms/perl-PDF-Create/devel - New directory
Message-ID: <20091209174630.43CF811C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PDF-Create/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdM5403/rpms/perl-PDF-Create/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-PDF-Create/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:46:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:46:38 +0000 (UTC)
Subject: rpms/perl-PDF-Create Makefile,NONE,1.1
Message-ID: <20091209174638.3D53B11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PDF-Create
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdM5403/rpms/perl-PDF-Create

Added Files:
	Makefile 
Log Message:
Setup of module perl-PDF-Create


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PDF-Create
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:46:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:46:38 +0000 (UTC)
Subject: rpms/perl-PDF-Create/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091209174638.8D4B111C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PDF-Create/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdM5403/rpms/perl-PDF-Create/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PDF-Create


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-PDF-Create
# $Id: Makefile,v 1.1 2009/12/09 17:46:38 kevin Exp $
NAME := perl-PDF-Create
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:47:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:47:35 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-ActionDispatch was added for
	eseyman
Message-ID: <20091209174735.6E04D10F89D@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-CGI-Application-Plugin-ActionDispatch with summary Adds attribute based support for parsing the PATH_INFO of an HTTP request
kevin has approved Package perl-CGI-Application-Plugin-ActionDispatch
kevin has added a Fedora devel branch for perl-CGI-Application-Plugin-ActionDispatch with an owner of eseyman
kevin has approved perl-CGI-Application-Plugin-ActionDispatch in Fedora devel
kevin has approved Package perl-CGI-Application-Plugin-ActionDispatch
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora devel)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-ActionDispatch



From pkgdb at fedoraproject.org  Wed Dec  9 17:47:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:47:37 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-ActionDispatch summary updated
	by kevin
Message-ID: <20091209174737.226B710F8A2@bastion2.fedora.phx.redhat.com>

kevin set package perl-CGI-Application-Plugin-ActionDispatch summary to Adds attribute based support for parsing the PATH_INFO of an HTTP request

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-ActionDispatch



From pkgdb at fedoraproject.org  Wed Dec  9 17:47:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:47:37 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-ActionDispatch (Fedora,
	devel) updated by kevin
Message-ID: <20091209174737.265E710F8B0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-CGI-Application-Plugin-ActionDispatch (Fedora devel) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-ActionDispatch (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-ActionDispatch



From pkgdb at fedoraproject.org  Wed Dec  9 17:47:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:47:37 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-ActionDispatch (Fedora,
	11) updated by kevin
Message-ID: <20091209174737.29C5D10F8C7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-CGI-Application-Plugin-ActionDispatch
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora 11)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora 11)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-ActionDispatch (Fedora 11) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-ActionDispatch (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-ActionDispatch



From pkgdb at fedoraproject.org  Wed Dec  9 17:47:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:47:37 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-ActionDispatch (Fedora,
	12) updated by kevin
Message-ID: <20091209174737.35B2D10F8CA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-CGI-Application-Plugin-ActionDispatch
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora 12)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-ActionDispatch (Fedora 12)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-ActionDispatch (Fedora 12) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-ActionDispatch (Fedora 12) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-ActionDispatch



From kevin at fedoraproject.org  Wed Dec  9 17:47:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:47:46 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ActionDispatch - New directory
Message-ID: <20091209174746.4457A11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxG6124/rpms/perl-CGI-Application-Plugin-ActionDispatch

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:47:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:47:46 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ActionDispatch/devel - New
	directory
Message-ID: <20091209174746.72B6A11C03AD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxG6124/rpms/perl-CGI-Application-Plugin-ActionDispatch/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:47:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:47:54 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ActionDispatch Makefile,NONE,1.1
Message-ID: <20091209174754.182D811C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxG6124/rpms/perl-CGI-Application-Plugin-ActionDispatch

Added Files:
	Makefile 
Log Message:
Setup of module perl-CGI-Application-Plugin-ActionDispatch


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CGI-Application-Plugin-ActionDispatch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:47:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:47:54 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ActionDispatch/devel .cvsignore,
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091209174754.683EA11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsxG6124/rpms/perl-CGI-Application-Plugin-ActionDispatch/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CGI-Application-Plugin-ActionDispatch


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-CGI-Application-Plugin-ActionDispatch
# $Id: Makefile,v 1.1 2009/12/09 17:47:54 kevin Exp $
NAME := perl-CGI-Application-Plugin-ActionDispatch
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kdudka at fedoraproject.org  Wed Dec  9 17:48:00 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  9 Dec 2009 17:48:00 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.7-nss-i686.patch, NONE, 1.1 curl.spec,
	1.132, 1.133
Message-ID: <20091209174800.6903211C0264@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6267

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-nss-i686.patch 
Log Message:
- use different port numbers for 32bit and 64bit builds
- temporary workaround for #545779

curl-7.19.7-nss-i686.patch:
 nss.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE curl-7.19.7-nss-i686.patch ---
diff --git a/lib/nss.c b/lib/nss.c
index 637663e..f439735 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1047,7 +1047,7 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
       }
       else {
         char *certpath = PR_smprintf("%s%s",
-                         NSS_VersionCheck("3.12.0") ? "sql:" : "",
+                         /*NSS_VersionCheck("3.12.0") ? "sql:" :*/ "",
                          certDir);
         rv = NSS_Initialize(certpath, "", "", "", NSS_INIT_READONLY);
         PR_smprintf_free(certpath);


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- curl.spec	8 Dec 2009 09:41:10 -0000	1.132
+++ curl.spec	9 Dec 2009 17:48:00 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -10,6 +10,7 @@ Patch1: curl-7.19.7-nss-nonblock.patch
 Patch2: curl-7.19.7-ssl-retry.patch
 Patch3: curl-7.19.7-modelfree.patch
 Patch4: curl-7.19.7-nss-warning.patch
+Patch5: curl-7.19.7-nss-i686.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -86,6 +87,7 @@ use cURL's capabilities internally.
 %patch4 -p1
 
 # Fedora patches
+%patch5 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -122,7 +124,10 @@ make %{?_smp_mflags}
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 cd tests
 make %{?_smp_mflags}
-./runtests.pl -a -p -v
+
+# use different port range for 32bit and 64bit build, thus make it possible
+# to run both in parallel on the same machine
+./runtests.pl -a -b89%{?__isa_bits} -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -181,6 +186,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 09 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-7
+- use different port numbers for 32bit and 64bit builds
+- temporary workaround for #545779
+
 * Tue Dec 08 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-6
 - make it possible to run test241
 - re-enable SCP/SFTP tests (#539444)



From pkgdb at fedoraproject.org  Wed Dec  9 17:48:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:48:39 +0000
Subject: [pkgdb] shared-desktop-ontologies was added for arbiter
Message-ID: <20091209174839.4F2AC10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package shared-desktop-ontologies with summary Shared ontologies needed for semantic environments
kevin has approved Package shared-desktop-ontologies
kevin has added a Fedora devel branch for shared-desktop-ontologies with an owner of arbiter
kevin has approved shared-desktop-ontologies in Fedora devel
kevin has approved Package shared-desktop-ontologies
kevin has set commit to Approved for 107427 on shared-desktop-ontologies (Fedora devel)
kevin has set checkout to Approved for 107427 on shared-desktop-ontologies (Fedora devel)
kevin has set build to Approved for 107427 on shared-desktop-ontologies (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-desktop-ontologies



From pkgdb at fedoraproject.org  Wed Dec  9 17:48:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:48:42 +0000
Subject: [pkgdb] shared-desktop-ontologies summary updated by kevin
Message-ID: <20091209174842.8AE6E10F8A6@bastion2.fedora.phx.redhat.com>

kevin set package shared-desktop-ontologies summary to Shared ontologies needed for semantic environments

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-desktop-ontologies



From pkgdb at fedoraproject.org  Wed Dec  9 17:48:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:48:42 +0000
Subject: [pkgdb] shared-desktop-ontologies (Fedora, 11) updated by kevin
Message-ID: <20091209174842.91A5F10F8BD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for shared-desktop-ontologies
kevin has set commit to Approved for 107427 on shared-desktop-ontologies (Fedora 11)
kevin has set checkout to Approved for 107427 on shared-desktop-ontologies (Fedora 11)
kevin has set build to Approved for 107427 on shared-desktop-ontologies (Fedora 11)
kevin approved watchbugzilla on shared-desktop-ontologies (Fedora 11) for rdieter
kevin approved watchcommits on shared-desktop-ontologies (Fedora 11) for rdieter
kevin approved commit on shared-desktop-ontologies (Fedora 11) for rdieter
kevin approved build on shared-desktop-ontologies (Fedora 11) for rdieter
kevin approved approveacls on shared-desktop-ontologies (Fedora 11) for rdieter
kevin approved watchbugzilla on shared-desktop-ontologies (Fedora 11) for kkofler
kevin approved watchcommits on shared-desktop-ontologies (Fedora 11) for kkofler
kevin approved commit on shared-desktop-ontologies (Fedora 11) for kkofler
kevin approved build on shared-desktop-ontologies (Fedora 11) for kkofler
kevin approved approveacls on shared-desktop-ontologies (Fedora 11) for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-desktop-ontologies



From pkgdb at fedoraproject.org  Wed Dec  9 17:48:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:48:42 +0000
Subject: [pkgdb] shared-desktop-ontologies (Fedora, 12) updated by kevin
Message-ID: <20091209174842.A835A10F8C5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for shared-desktop-ontologies
kevin has set commit to Approved for 107427 on shared-desktop-ontologies (Fedora 12)
kevin has set checkout to Approved for 107427 on shared-desktop-ontologies (Fedora 12)
kevin has set build to Approved for 107427 on shared-desktop-ontologies (Fedora 12)
kevin approved watchbugzilla on shared-desktop-ontologies (Fedora 12) for rdieter
kevin approved watchcommits on shared-desktop-ontologies (Fedora 12) for rdieter
kevin approved commit on shared-desktop-ontologies (Fedora 12) for rdieter
kevin approved build on shared-desktop-ontologies (Fedora 12) for rdieter
kevin approved approveacls on shared-desktop-ontologies (Fedora 12) for rdieter
kevin approved watchbugzilla on shared-desktop-ontologies (Fedora 12) for kkofler
kevin approved watchcommits on shared-desktop-ontologies (Fedora 12) for kkofler
kevin approved commit on shared-desktop-ontologies (Fedora 12) for kkofler
kevin approved build on shared-desktop-ontologies (Fedora 12) for kkofler
kevin approved approveacls on shared-desktop-ontologies (Fedora 12) for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-desktop-ontologies



From kevin at fedoraproject.org  Wed Dec  9 17:48:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:48:51 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies - New directory
Message-ID: <20091209174851.1882111C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-desktop-ontologies
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsik6777/rpms/shared-desktop-ontologies

Log Message:
Directory /cvs/pkgs/rpms/shared-desktop-ontologies added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:48:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:48:51 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies/devel - New directory
Message-ID: <20091209174851.3A12811C03B8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsik6777/rpms/shared-desktop-ontologies/devel

Log Message:
Directory /cvs/pkgs/rpms/shared-desktop-ontologies/devel added to the repository




From pkgdb at fedoraproject.org  Wed Dec  9 17:48:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:48:42 +0000
Subject: [pkgdb] shared-desktop-ontologies (Fedora, devel) updated by kevin
Message-ID: <20091209174842.B85C010F8D8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on shared-desktop-ontologies (Fedora devel) for rdieter
kevin approved watchcommits on shared-desktop-ontologies (Fedora devel) for rdieter
kevin approved commit on shared-desktop-ontologies (Fedora devel) for rdieter
kevin approved build on shared-desktop-ontologies (Fedora devel) for rdieter
kevin approved approveacls on shared-desktop-ontologies (Fedora devel) for rdieter
kevin approved watchbugzilla on shared-desktop-ontologies (Fedora devel) for kkofler
kevin approved watchcommits on shared-desktop-ontologies (Fedora devel) for kkofler
kevin approved commit on shared-desktop-ontologies (Fedora devel) for kkofler
kevin approved build on shared-desktop-ontologies (Fedora devel) for kkofler
kevin approved approveacls on shared-desktop-ontologies (Fedora devel) for kkofler

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-desktop-ontologies



From kevin at fedoraproject.org  Wed Dec  9 17:48:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:48:59 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies Makefile,NONE,1.1
Message-ID: <20091209174859.2572611C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-desktop-ontologies
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsik6777/rpms/shared-desktop-ontologies

Added Files:
	Makefile 
Log Message:
Setup of module shared-desktop-ontologies


--- NEW FILE Makefile ---
# Top level Makefile for module shared-desktop-ontologies
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:48:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:48:59 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091209174859.6A12611C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsik6777/rpms/shared-desktop-ontologies/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shared-desktop-ontologies


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shared-desktop-ontologies
# $Id: Makefile,v 1.1 2009/12/09 17:48:59 kevin Exp $
NAME := shared-desktop-ontologies
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:49:58 +0000
Subject: [pkgdb] yajl was added for berrange
Message-ID: <20091209174958.C3D9D10F8A4@bastion2.fedora.phx.redhat.com>

kevin has added Package yajl with summary Yet Another JSON Library
kevin has approved Package yajl
kevin has added a Fedora devel branch for yajl with an owner of berrange
kevin has approved yajl in Fedora devel
kevin has approved Package yajl
kevin has set commit to Approved for 107427 on yajl (Fedora devel)
kevin has set checkout to Approved for 107427 on yajl (Fedora devel)
kevin has set build to Approved for 107427 on yajl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yajl



From pkgdb at fedoraproject.org  Wed Dec  9 17:50:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:50:01 +0000
Subject: [pkgdb] yajl summary updated by kevin
Message-ID: <20091209175001.0FF8410F8B6@bastion2.fedora.phx.redhat.com>

kevin set package yajl summary to Yet Another JSON Library

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yajl



From pkgdb at fedoraproject.org  Wed Dec  9 17:50:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:50:01 +0000
Subject: [pkgdb] yajl (Fedora, devel) updated by kevin
Message-ID: <20091209175001.1892C10F8B8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on yajl (Fedora devel) for virtmaint
kevin approved watchcommits on yajl (Fedora devel) for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yajl



From pkgdb at fedoraproject.org  Wed Dec  9 17:50:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:50:01 +0000
Subject: [pkgdb] yajl (Fedora, 12) updated by kevin
Message-ID: <20091209175001.28EDA10F8BB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for yajl
kevin has set commit to Approved for 107427 on yajl (Fedora 12)
kevin has set checkout to Approved for 107427 on yajl (Fedora 12)
kevin has set build to Approved for 107427 on yajl (Fedora 12)
kevin approved watchbugzilla on yajl (Fedora 12) for virtmaint
kevin approved watchcommits on yajl (Fedora 12) for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yajl



From kevin at fedoraproject.org  Wed Dec  9 17:50:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:50:09 +0000 (UTC)
Subject: rpms/yajl - New directory
Message-ID: <20091209175009.1E62D11C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yajl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ7513/rpms/yajl

Log Message:
Directory /cvs/pkgs/rpms/yajl added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:50:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:50:09 +0000 (UTC)
Subject: rpms/yajl/devel - New directory
Message-ID: <20091209175009.38E2811C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yajl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ7513/rpms/yajl/devel

Log Message:
Directory /cvs/pkgs/rpms/yajl/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:50:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:50:17 +0000 (UTC)
Subject: rpms/yajl Makefile,NONE,1.1
Message-ID: <20091209175017.6E9F611C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yajl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ7513/rpms/yajl

Added Files:
	Makefile 
Log Message:
Setup of module yajl


--- NEW FILE Makefile ---
# Top level Makefile for module yajl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:50:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:50:18 +0000 (UTC)
Subject: rpms/yajl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091209175018.0FEEC11C03E3@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yajl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ7513/rpms/yajl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module yajl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: yajl
# $Id: Makefile,v 1.1 2009/12/09 17:50:17 kevin Exp $
NAME := yajl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:51:21 +0000
Subject: [pkgdb] shared-color-profiles was added for rhughes
Message-ID: <20091209175121.8B19C10F8C4@bastion2.fedora.phx.redhat.com>

kevin has added Package shared-color-profiles with summary Shared color profiles for color management aware applications
kevin has approved Package shared-color-profiles
kevin has added a Fedora devel branch for shared-color-profiles with an owner of rhughes
kevin has approved shared-color-profiles in Fedora devel
kevin has approved Package shared-color-profiles
kevin has set commit to Approved for 107427 on shared-color-profiles (Fedora devel)
kevin has set checkout to Approved for 107427 on shared-color-profiles (Fedora devel)
kevin has set build to Approved for 107427 on shared-color-profiles (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-color-profiles



From pkgdb at fedoraproject.org  Wed Dec  9 17:51:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:51:22 +0000
Subject: [pkgdb] shared-color-profiles summary updated by kevin
Message-ID: <20091209175122.975CC10F8C9@bastion2.fedora.phx.redhat.com>

kevin set package shared-color-profiles summary to Shared color profiles for color management aware applications

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-color-profiles



From kevin at fedoraproject.org  Wed Dec  9 17:51:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:51:32 +0000 (UTC)
Subject: rpms/shared-color-profiles - New directory
Message-ID: <20091209175132.18E1111C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-color-profiles
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJW8276/rpms/shared-color-profiles

Log Message:
Directory /cvs/pkgs/rpms/shared-color-profiles added to the repository




From pkgdb at fedoraproject.org  Wed Dec  9 17:51:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:51:22 +0000
Subject: [pkgdb] shared-color-profiles (Fedora, 12) updated by kevin
Message-ID: <20091209175122.A76A210F8CC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for shared-color-profiles
kevin has set commit to Approved for 107427 on shared-color-profiles (Fedora 12)
kevin has set checkout to Approved for 107427 on shared-color-profiles (Fedora 12)
kevin has set build to Approved for 107427 on shared-color-profiles (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-color-profiles



From kevin at fedoraproject.org  Wed Dec  9 17:51:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:51:32 +0000 (UTC)
Subject: rpms/shared-color-profiles/devel - New directory
Message-ID: <20091209175132.42E6F11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-color-profiles/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJW8276/rpms/shared-color-profiles/devel

Log Message:
Directory /cvs/pkgs/rpms/shared-color-profiles/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:51:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:51:40 +0000 (UTC)
Subject: rpms/shared-color-profiles Makefile,NONE,1.1
Message-ID: <20091209175140.F09BA11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-color-profiles
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJW8276/rpms/shared-color-profiles

Added Files:
	Makefile 
Log Message:
Setup of module shared-color-profiles


--- NEW FILE Makefile ---
# Top level Makefile for module shared-color-profiles
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:51:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:51:41 +0000 (UTC)
Subject: rpms/shared-color-profiles/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091209175141.5B96711C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-color-profiles/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJW8276/rpms/shared-color-profiles/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shared-color-profiles


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shared-color-profiles
# $Id: Makefile,v 1.1 2009/12/09 17:51:41 kevin Exp $
NAME := shared-color-profiles
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:52:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:52:17 +0000
Subject: [pkgdb] emacs-irsim-mode was added for sagarun
Message-ID: <20091209175217.3695A10F8AB@bastion2.fedora.phx.redhat.com>

kevin has added Package emacs-irsim-mode with summary Irsim mode for emacs
kevin has approved Package emacs-irsim-mode
kevin has added a Fedora devel branch for emacs-irsim-mode with an owner of sagarun
kevin has approved emacs-irsim-mode in Fedora devel
kevin has approved Package emacs-irsim-mode
kevin has set commit to Approved for 107427 on emacs-irsim-mode (Fedora devel)
kevin has set checkout to Approved for 107427 on emacs-irsim-mode (Fedora devel)
kevin has set build to Approved for 107427 on emacs-irsim-mode (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-irsim-mode



From pkgdb at fedoraproject.org  Wed Dec  9 17:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:52:20 +0000
Subject: [pkgdb] emacs-irsim-mode summary updated by kevin
Message-ID: <20091209175220.CC25310F8BB@bastion2.fedora.phx.redhat.com>

kevin set package emacs-irsim-mode summary to Irsim mode for emacs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-irsim-mode



From pkgdb at fedoraproject.org  Wed Dec  9 17:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:52:20 +0000
Subject: [pkgdb] emacs-irsim-mode (Fedora, devel) updated by kevin
Message-ID: <20091209175221.157EF10F8C0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on emacs-irsim-mode (Fedora devel) for chitlesh
kevin approved watchcommits on emacs-irsim-mode (Fedora devel) for chitlesh
kevin approved commit on emacs-irsim-mode (Fedora devel) for chitlesh
kevin approved build on emacs-irsim-mode (Fedora devel) for chitlesh
kevin approved approveacls on emacs-irsim-mode (Fedora devel) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-irsim-mode



From pkgdb at fedoraproject.org  Wed Dec  9 17:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:52:20 +0000
Subject: [pkgdb] emacs-irsim-mode (Fedora, 11) updated by kevin
Message-ID: <20091209175221.2319F10F8D0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for emacs-irsim-mode
kevin has set commit to Approved for 107427 on emacs-irsim-mode (Fedora 11)
kevin has set checkout to Approved for 107427 on emacs-irsim-mode (Fedora 11)
kevin has set build to Approved for 107427 on emacs-irsim-mode (Fedora 11)
kevin approved watchbugzilla on emacs-irsim-mode (Fedora 11) for chitlesh
kevin approved watchcommits on emacs-irsim-mode (Fedora 11) for chitlesh
kevin approved commit on emacs-irsim-mode (Fedora 11) for chitlesh
kevin approved build on emacs-irsim-mode (Fedora 11) for chitlesh
kevin approved approveacls on emacs-irsim-mode (Fedora 11) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-irsim-mode



From pkgdb at fedoraproject.org  Wed Dec  9 17:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:52:20 +0000
Subject: [pkgdb] emacs-irsim-mode (Fedora, 12) updated by kevin
Message-ID: <20091209175221.3BD9610F8D6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for emacs-irsim-mode
kevin has set commit to Approved for 107427 on emacs-irsim-mode (Fedora 12)
kevin has set checkout to Approved for 107427 on emacs-irsim-mode (Fedora 12)
kevin has set build to Approved for 107427 on emacs-irsim-mode (Fedora 12)
kevin approved watchbugzilla on emacs-irsim-mode (Fedora 12) for chitlesh
kevin approved watchcommits on emacs-irsim-mode (Fedora 12) for chitlesh
kevin approved commit on emacs-irsim-mode (Fedora 12) for chitlesh
kevin approved build on emacs-irsim-mode (Fedora 12) for chitlesh
kevin approved approveacls on emacs-irsim-mode (Fedora 12) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-irsim-mode



From kevin at fedoraproject.org  Wed Dec  9 17:52:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:52:30 +0000 (UTC)
Subject: rpms/emacs-irsim-mode - New directory
Message-ID: <20091209175230.2003311C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-irsim-mode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslA8698/rpms/emacs-irsim-mode

Log Message:
Directory /cvs/pkgs/rpms/emacs-irsim-mode added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:52:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:52:30 +0000 (UTC)
Subject: rpms/emacs-irsim-mode/devel - New directory
Message-ID: <20091209175230.486B511C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-irsim-mode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslA8698/rpms/emacs-irsim-mode/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-irsim-mode/devel added to the repository




From pkgdb at fedoraproject.org  Wed Dec  9 17:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:52:20 +0000
Subject: [pkgdb] emacs-irsim-mode (Fedora EPEL, 5) updated by kevin
Message-ID: <20091209175221.5A44310F8DA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for emacs-irsim-mode
kevin has set commit to Approved for 107427 on emacs-irsim-mode (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on emacs-irsim-mode (Fedora EPEL 5)
kevin has set build to Approved for 107427 on emacs-irsim-mode (Fedora EPEL 5)
kevin approved watchbugzilla on emacs-irsim-mode (Fedora EPEL 5) for chitlesh
kevin approved watchcommits on emacs-irsim-mode (Fedora EPEL 5) for chitlesh
kevin approved commit on emacs-irsim-mode (Fedora EPEL 5) for chitlesh
kevin approved build on emacs-irsim-mode (Fedora EPEL 5) for chitlesh
kevin approved approveacls on emacs-irsim-mode (Fedora EPEL 5) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-irsim-mode



From kevin at fedoraproject.org  Wed Dec  9 17:52:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:52:38 +0000 (UTC)
Subject: rpms/emacs-irsim-mode Makefile,NONE,1.1
Message-ID: <20091209175238.253FD11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-irsim-mode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslA8698/rpms/emacs-irsim-mode

Added Files:
	Makefile 
Log Message:
Setup of module emacs-irsim-mode


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-irsim-mode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:52:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:52:38 +0000 (UTC)
Subject: rpms/emacs-irsim-mode/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091209175238.6E2E511C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-irsim-mode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslA8698/rpms/emacs-irsim-mode/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-irsim-mode


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-irsim-mode
# $Id: Makefile,v 1.1 2009/12/09 17:52:38 kevin Exp $
NAME := emacs-irsim-mode
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:14 +0000
Subject: [pkgdb] xmlbeans was added for lkundrak
Message-ID: <20091209175314.C92AF10F85C@bastion2.fedora.phx.redhat.com>

kevin has added Package xmlbeans with summary XML-Java binding tool
kevin has approved Package xmlbeans
kevin has added a Fedora devel branch for xmlbeans with an owner of lkundrak
kevin has approved xmlbeans in Fedora devel
kevin has approved Package xmlbeans
kevin has set commit to Approved for 107427 on xmlbeans (Fedora devel)
kevin has set checkout to Approved for 107427 on xmlbeans (Fedora devel)
kevin has set build to Approved for 107427 on xmlbeans (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmlbeans



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:16 +0000
Subject: [pkgdb] xmlbeans summary updated by kevin
Message-ID: <20091209175316.1B8DB10F8B2@bastion2.fedora.phx.redhat.com>

kevin set package xmlbeans summary to XML-Java binding tool

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmlbeans



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:16 +0000
Subject: [pkgdb] xmlbeans (Fedora, 11) updated by kevin
Message-ID: <20091209175316.20F8E10F8C4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for xmlbeans
kevin has set commit to Approved for 107427 on xmlbeans (Fedora 11)
kevin has set checkout to Approved for 107427 on xmlbeans (Fedora 11)
kevin has set build to Approved for 107427 on xmlbeans (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmlbeans



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:16 +0000
Subject: [pkgdb] xmlbeans (Fedora EPEL, 5) updated by kevin
Message-ID: <20091209175316.299EC10F8C8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for xmlbeans
kevin has set commit to Approved for 107427 on xmlbeans (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on xmlbeans (Fedora EPEL 5)
kevin has set build to Approved for 107427 on xmlbeans (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmlbeans



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:16 +0000
Subject: [pkgdb] xmlbeans (Fedora, 12) updated by kevin
Message-ID: <20091209175316.336B910F8CA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for xmlbeans
kevin has set commit to Approved for 107427 on xmlbeans (Fedora 12)
kevin has set checkout to Approved for 107427 on xmlbeans (Fedora 12)
kevin has set build to Approved for 107427 on xmlbeans (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmlbeans



From kevin at fedoraproject.org  Wed Dec  9 17:53:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:53:26 +0000 (UTC)
Subject: rpms/xmlbeans - New directory
Message-ID: <20091209175326.A44BB11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmlbeans
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVm9266/rpms/xmlbeans

Log Message:
Directory /cvs/pkgs/rpms/xmlbeans added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:53:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:53:26 +0000 (UTC)
Subject: rpms/xmlbeans/devel - New directory
Message-ID: <20091209175326.AB5D511C02BA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmlbeans/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVm9266/rpms/xmlbeans/devel

Log Message:
Directory /cvs/pkgs/rpms/xmlbeans/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:53:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:53:34 +0000 (UTC)
Subject: rpms/xmlbeans Makefile,NONE,1.1
Message-ID: <20091209175334.E79B711C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmlbeans
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVm9266/rpms/xmlbeans

Added Files:
	Makefile 
Log Message:
Setup of module xmlbeans


--- NEW FILE Makefile ---
# Top level Makefile for module xmlbeans
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:53:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:53:35 +0000 (UTC)
Subject: rpms/xmlbeans/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091209175335.39CD911C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmlbeans/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVm9266/rpms/xmlbeans/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmlbeans


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xmlbeans
# $Id: Makefile,v 1.1 2009/12/09 17:53:35 kevin Exp $
NAME := xmlbeans
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:49 +0000
Subject: [pkgdb] gant was added for lkundrak
Message-ID: <20091209175349.69F0B10F892@bastion2.fedora.phx.redhat.com>

kevin has added Package gant with summary Groovy-based build system that uses Ant tasks
kevin has approved Package gant
kevin has added a Fedora devel branch for gant with an owner of lkundrak
kevin has approved gant in Fedora devel
kevin has approved Package gant
kevin has set commit to Approved for 107427 on gant (Fedora devel)
kevin has set checkout to Approved for 107427 on gant (Fedora devel)
kevin has set build to Approved for 107427 on gant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gant



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:51 +0000
Subject: [pkgdb] gant summary updated by kevin
Message-ID: <20091209175351.ACECA10F8AB@bastion2.fedora.phx.redhat.com>

kevin set package gant summary to Groovy-based build system that uses Ant tasks

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gant



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:51 +0000
Subject: [pkgdb] gant (Fedora, 11) updated by kevin
Message-ID: <20091209175351.B2FF410F8D3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gant
kevin has set commit to Approved for 107427 on gant (Fedora 11)
kevin has set checkout to Approved for 107427 on gant (Fedora 11)
kevin has set build to Approved for 107427 on gant (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gant



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:51 +0000
Subject: [pkgdb] gant (Fedora, 12) updated by kevin
Message-ID: <20091209175351.B904110F8EA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gant
kevin has set commit to Approved for 107427 on gant (Fedora 12)
kevin has set checkout to Approved for 107427 on gant (Fedora 12)
kevin has set build to Approved for 107427 on gant (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gant



From pkgdb at fedoraproject.org  Wed Dec  9 17:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:53:51 +0000
Subject: [pkgdb] gant (Fedora EPEL, 5) updated by kevin
Message-ID: <20091209175351.BEAD910F8ED@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for gant
kevin has set commit to Approved for 107427 on gant (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on gant (Fedora EPEL 5)
kevin has set build to Approved for 107427 on gant (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gant



From kevin at fedoraproject.org  Wed Dec  9 17:53:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:53:59 +0000 (UTC)
Subject: rpms/gant - New directory
Message-ID: <20091209175359.18CA111C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gant
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshd9677/rpms/gant

Log Message:
Directory /cvs/pkgs/rpms/gant added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:53:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:53:59 +0000 (UTC)
Subject: rpms/gant/devel - New directory
Message-ID: <20091209175359.4B82311C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshd9677/rpms/gant/devel

Log Message:
Directory /cvs/pkgs/rpms/gant/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:54:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:54:07 +0000 (UTC)
Subject: rpms/gant Makefile,NONE,1.1
Message-ID: <20091209175407.4E7DD11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gant
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshd9677/rpms/gant

Added Files:
	Makefile 
Log Message:
Setup of module gant


--- NEW FILE Makefile ---
# Top level Makefile for module gant
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:54:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:54:07 +0000 (UTC)
Subject: rpms/gant/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091209175407.E25F711C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshd9677/rpms/gant/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gant


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gant
# $Id: Makefile,v 1.1 2009/12/09 17:54:07 kevin Exp $
NAME := gant
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:54:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:54:24 +0000
Subject: [pkgdb] groovy was added for lkundrak
Message-ID: <20091209175424.7FD6710F8CE@bastion2.fedora.phx.redhat.com>

kevin has added Package groovy with summary Agile dynamic language for the Java Platform
kevin has approved Package groovy
kevin has added a Fedora devel branch for groovy with an owner of lkundrak
kevin has approved groovy in Fedora devel
kevin has approved Package groovy
kevin has set commit to Approved for 107427 on groovy (Fedora devel)
kevin has set checkout to Approved for 107427 on groovy (Fedora devel)
kevin has set build to Approved for 107427 on groovy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/groovy



From pbrobinson at fedoraproject.org  Wed Dec  9 17:54:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  9 Dec 2009 17:54:25 +0000 (UTC)
Subject: rpms/gupnp-igd/F-12 .cvsignore, 1.4, 1.5 gupnp-igd.spec, 1.6,
	1.7 sources, 1.4, 1.5 import.log, 1.1, NONE
Message-ID: <20091209175425.E679F11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-igd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10070

Modified Files:
	.cvsignore gupnp-igd.spec sources 
Removed Files:
	import.log 
Log Message:
- Update to 0.1.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jun 2009 22:32:13 -0000	1.4
+++ .cvsignore	9 Dec 2009 17:54:25 -0000	1.5
@@ -1 +1 @@
-gupnp-igd-0.1.3.tar.gz
+gupnp-igd-0.1.5.tar.gz


Index: gupnp-igd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/F-12/gupnp-igd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gupnp-igd.spec	17 Sep 2009 18:28:16 -0000	1.6
+++ gupnp-igd.spec	9 Dec 2009 17:54:25 -0000	1.7
@@ -1,9 +1,9 @@
-%define gupnp_ver 0.12.3
+%define gupnp_ver 0.13
 %define glib2_ver 2.16
 
 Name:           gupnp-igd
-Version:        0.1.3
-Release:        3%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:	Library to handle UPnP IGD port mapping        
 
 Group:          System Environment/Libraries
@@ -74,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec  6 2009 Peter Robinson <pbrobinson at gmail.com> - 0.1.5-1
+- Update to 0.1.5.
+
+* Mon Nov 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.4-1
+- Update to 0.1.4.
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.1.3-3
 - Rebuild for new gupnp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jun 2009 22:32:13 -0000	1.4
+++ sources	9 Dec 2009 17:54:25 -0000	1.5
@@ -1 +1 @@
-ea0afa85c19fda67ef0ae54fa4faeb9f  gupnp-igd-0.1.3.tar.gz
+991156298967b586bb888cacce202dea  gupnp-igd-0.1.5.tar.gz


--- import.log DELETED ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:54:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:54:26 +0000
Subject: [pkgdb] groovy summary updated by kevin
Message-ID: <20091209175426.D0B5910F8D1@bastion2.fedora.phx.redhat.com>

kevin set package groovy summary to Agile dynamic language for the Java Platform

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/groovy



From pkgdb at fedoraproject.org  Wed Dec  9 17:54:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:54:26 +0000
Subject: [pkgdb] groovy (Fedora, 11) updated by kevin
Message-ID: <20091209175426.D8EDF10F8D6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for groovy
kevin has set commit to Approved for 107427 on groovy (Fedora 11)
kevin has set checkout to Approved for 107427 on groovy (Fedora 11)
kevin has set build to Approved for 107427 on groovy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/groovy



From pkgdb at fedoraproject.org  Wed Dec  9 17:54:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:54:26 +0000
Subject: [pkgdb] groovy (Fedora, 12) updated by kevin
Message-ID: <20091209175426.E007910F8FF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for groovy
kevin has set commit to Approved for 107427 on groovy (Fedora 12)
kevin has set checkout to Approved for 107427 on groovy (Fedora 12)
kevin has set build to Approved for 107427 on groovy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/groovy



From kevin at fedoraproject.org  Wed Dec  9 17:54:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:54:36 +0000 (UTC)
Subject: rpms/groovy - New directory
Message-ID: <20091209175436.21CFA11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/groovy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10151/rpms/groovy

Log Message:
Directory /cvs/pkgs/rpms/groovy added to the repository




From pkgdb at fedoraproject.org  Wed Dec  9 17:54:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:54:26 +0000
Subject: [pkgdb] groovy (Fedora EPEL, 5) updated by kevin
Message-ID: <20091209175426.E761F10F901@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for groovy
kevin has set commit to Approved for 107427 on groovy (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on groovy (Fedora EPEL 5)
kevin has set build to Approved for 107427 on groovy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/groovy



From kevin at fedoraproject.org  Wed Dec  9 17:54:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:54:36 +0000 (UTC)
Subject: rpms/groovy/devel - New directory
Message-ID: <20091209175436.4584E11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/groovy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10151/rpms/groovy/devel

Log Message:
Directory /cvs/pkgs/rpms/groovy/devel added to the repository




From kevin at fedoraproject.org  Wed Dec  9 17:54:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:54:44 +0000 (UTC)
Subject: rpms/groovy Makefile,NONE,1.1
Message-ID: <20091209175444.53F0E11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/groovy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10151/rpms/groovy

Added Files:
	Makefile 
Log Message:
Setup of module groovy


--- NEW FILE Makefile ---
# Top level Makefile for module groovy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec  9 17:54:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  9 Dec 2009 17:54:44 +0000 (UTC)
Subject: rpms/groovy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091209175444.CC20811C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/groovy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10151/rpms/groovy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module groovy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: groovy
# $Id: Makefile,v 1.1 2009/12/09 17:54:44 kevin Exp $
NAME := groovy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec  9 17:54:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 17:54:56 +0000
Subject: [pkgdb] python-twill (Fedora EPEL, 5) updated by kevin
Message-ID: <20091209175456.934FA10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-twill
kevin has set commit to Approved for 107427 on python-twill (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-twill (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-twill (Fedora EPEL 5)
kevin changed owner of python-twill in Fedora EPEL 5 to thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-twill



From fabbione at fedoraproject.org  Wed Dec  9 17:56:42 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed,  9 Dec 2009 17:56:42 +0000 (UTC)
Subject: rpms/fence-agents/F-11 .cvsignore, 1.10, 1.11 fence-agents.spec,
	1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20091209175642.7EE5311C0264@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11323

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Nov 2009 15:11:43 -0000	1.10
+++ .cvsignore	9 Dec 2009 17:56:42 -0000	1.11
@@ -1 +1 @@
-fence-agents-3.0.5.tar.gz
+fence-agents-3.0.6.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/fence-agents.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fence-agents.spec	23 Nov 2009 15:11:43 -0000	1.16
+++ fence-agents.spec	9 Dec 2009 17:56:42 -0000	1.17
@@ -10,30 +10,32 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag git0a6184070
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.5
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.6
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/fence-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## Runtime deps
-Requires: sg3_utils OpenIPMI telnet openssh-clients
+Requires: sg3_utils telnet openssh-clients
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
+Requires: fence-virt >= 0.1.3-1
 
 # This is required by fence_virsh. Per discussion on fedora-devel
 # switching from package to file based require.
 Requires: /usr/bin/virsh
 
+# This is required by fence_ipmilan. it appears that the packages
+# have changed Requires around. Make sure to get the right one.
+Requires: /usr/bin/ipmitool
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -49,7 +51,7 @@ BuildRequires: corosynclib-devel >= 1.0.
 BuildRequires: openaislib-devel >= 1.0.0-1
 
 %prep
-%setup -q -n fence-agents-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -89,6 +91,22 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-2
+- Use the correct tarball from upstream
+
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release (drop fence_head.diff)
+- spec file updates:
+  * use new Source0 url
+  * use file based Requires for ipmitools (rhbz: 545237)
+
+* Fri Dec  4 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-2.git0a6184070
+- Drop fence_xvm from upstream (fence_head.diff)
+- spec file updates:
+  * Drop unrequired comments
+  * Readd alpha tag and clean it's usage around
+  * Requires: fence-virt in sufficient version to provide fence_xvm
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	23 Nov 2009 15:11:43 -0000	1.11
+++ sources	9 Dec 2009 17:56:42 -0000	1.12
@@ -1 +1 @@
-30709b427b0271cb47d2eab800f79bcb  fence-agents-3.0.5.tar.gz
+5fc06dc26a14106ee6e21977a75b1b7f  fence-agents-3.0.6.tar.gz



From than at fedoraproject.org  Wed Dec  9 18:00:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Dec 2009 18:00:14 +0000 (UTC)
Subject: rpms/kdelibs3/F-12 kdelibs-3.5.0-kio.patch, NONE,
	1.1 kdelibs-3.5.10-assert.patch, NONE,
	1.1 kdelibs-3.5.10-dtoa.patch, NONE,
	1.1 kdelibs-3.5.10-kabc.patch, NONE, 1.1 kdelibs3.spec, 1.77, 1.78
Message-ID: <20091209180014.66CFB11C0345@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12885

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.0-kio.patch kdelibs-3.5.10-assert.patch 
	kdelibs-3.5.10-dtoa.patch kdelibs-3.5.10-kabc.patch 
Log Message:
- backport upstream patches



kdelibs-3.5.0-kio.patch:
 kzip.cpp |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.0-kio.patch ---
--- kdelibs-3.5.10/kio/kio/kzip.cpp.orig	2009-12-09 18:42:47.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.cpp	2009-12-09 18:45:43.000000000 +0100
@@ -1051,6 +1051,20 @@
     return true;
 }
 
+bool KZip::writeDir(const QString& name, const QString& user, const QString& group)
+{
+    // Zip files have no explicit directories, they are implicitly created during extraction time
+    // when file entries have paths in them.
+    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
+    QString dirName = name;
+    if (!name.endsWith("/"))
+        dirName = dirName.append('/');
+
+    mode_t perm = 040755;
+    time_t the_time = time(0);
+    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
+}
+
 // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
 bool KZip::writeFile( const QString& name, const QString& user, const QString& group, uint size, const char* data )
 {
@@ -1114,7 +1128,7 @@
     }
 
     // delete entries in the filelist with the same filename as the one we want
-    // to save, so that we don?t have duplicate file entries when viewing the zip
+    // to save, so that we don???t have duplicate file entries when viewing the zip
     // with konqi...
     // CAUTION: the old file itself is still in the zip and won't be removed !!!
     QPtrListIterator<KZipFileEntry> it( d->m_fileList );

kdelibs-3.5.10-assert.patch:
 karchive.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.10-assert.patch ---
--- kdelibs-3.5.10/kio/kio/karchive.cpp.orig	2009-12-09 18:40:26.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/karchive.cpp	2009-12-09 18:41:14.000000000 +0100
@@ -588,7 +588,9 @@
 
 void KArchiveDirectory::addEntry( KArchiveEntry* entry )
 {
-  Q_ASSERT( !entry->name().isEmpty() );
+  if( entry->name().isEmpty() )
+    return;
+
   if( m_entries[ entry->name() ] ) {
       kdWarning() << "KArchiveDirectory::addEntry: directory " << name()
                   << " has entry " << entry->name() << " already" << endl;

kdelibs-3.5.10-dtoa.patch:
 dtoa.cpp |  232 ++++++++++++++++-----------------------------------------------
 1 file changed, 61 insertions(+), 171 deletions(-)

--- NEW FILE kdelibs-3.5.10-dtoa.patch ---
diff -up kdelibs-3.5.10/kjs/dtoa.cpp.orig kdelibs-3.5.10/kjs/dtoa.cpp
--- kdelibs-3.5.10/kjs/dtoa.cpp.orig	2009-12-09 18:32:22.000000000 +0100
+++ kdelibs-3.5.10/kjs/dtoa.cpp	2009-12-09 18:32:36.000000000 +0100
@@ -174,9 +174,10 @@
 #undef CONST
 #endif
 
+#include "dtoa.h"
 #include <config.h>
 
-#include "stdlib.h"
+#include "global.h"
 
 #ifdef WORDS_BIGENDIAN
 #define IEEE_MC68k
@@ -184,7 +185,6 @@
 #define IEEE_8087
 #endif
 #define INFNAN_CHECK
-#include "dtoa.h"
 
 
 
@@ -196,22 +196,19 @@ typedef unsigned Long ULong;
 #endif
 
 #ifdef DEBUG
-#include "stdio.h"
+#include <stdio.h>
 #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
 #endif
 
-#include "string.h"
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef USE_LOCALE
-#include "locale.h"
+#include <locale.h>
 #endif
 
 #ifdef MALLOC
-#ifdef KR_headers
-extern char *MALLOC();
-#else
 extern void *MALLOC(size_t);
-#endif
 #else
 #define MALLOC malloc
 #endif
@@ -233,7 +230,7 @@ static double private_mem[PRIVATE_mem], 
 #define IEEE_Arith
 #endif
 
-#include "errno.h"
+#include <errno.h>
 
 #ifdef Bad_float_h
 
@@ -260,25 +257,29 @@ static double private_mem[PRIVATE_mem], 
 #define DBL_MAX 1.7014118346046923e+38
 #endif
 
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647
+#endif
+
 #else /* ifndef Bad_float_h */
-#include "float.h"
+#include <float.h>
 #endif /* Bad_float_h */
 
 #ifndef __MATH_H__
-#include "math.h"
+#include <math.h>
 #endif
 
+#define strtod kjs_strtod
+#define dtoa kjs_dtoa
+#define freedtoa kjs_freedtoa
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifndef CONST
-#ifdef KR_headers
-#define CONST /* blank */
-#else
 #define CONST const
 #endif
-#endif
 
 #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
 Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
@@ -286,37 +287,19 @@ Exactly one of IEEE_8087, IEEE_MC68k, VA
 
 typedef union { double d; ULong L[2]; } U;
 
-#ifdef YES_ALIAS
-#define dval(x) x
+#define dval(x) (x).d
 #ifdef IEEE_8087
-#define word0(x) ((ULong *)&x)[1]
-#define word1(x) ((ULong *)&x)[0]
+#define word0(x) (x).L[1]
+#define word1(x) (x).L[0]
 #else
-#define word0(x) ((ULong *)&x)[0]
-#define word1(x) ((ULong *)&x)[1]
-#endif
-#else
-#ifdef IEEE_8087
-#define word0(x) ((U*)&x)->L[1]
-#define word1(x) ((U*)&x)->L[0]
-#else
-#define word0(x) ((U*)&x)->L[0]
-#define word1(x) ((U*)&x)->L[1]
-#endif
-#define dval(x) ((U*)&x)->d
+#define word0(x) (x).L[0]
+#define word1(x) (x).L[1]
 #endif
 
 /* The following definition of Storeinc is appropriate for MIPS processors.
  * An alternative that might be better on some machines is
- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
  */
-#if defined(IEEE_8087) + defined(VAX)
-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
-((unsigned short *)a)[0] = (unsigned short)c, a++)
-#else
-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
-((unsigned short *)a)[1] = (unsigned short)c, a++)
-#endif
+#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
 
 /* #define P DBL_MANT_DIG */
 /* Ten_pmax = floor(P*log(2)/log(5)) */
@@ -440,11 +423,7 @@ typedef union { double d; ULong L[2]; } 
 #ifdef RND_PRODQUOT
 #define rounded_product(a,b) a = rnd_prod(a, b)
 #define rounded_quotient(a,b) a = rnd_quot(a, b)
-#ifdef KR_headers
-extern double rnd_prod(), rnd_quot();
-#else
 extern double rnd_prod(double, double), rnd_quot(double, double);
-#endif
 #else
 #define rounded_product(a,b) a *= b
 #define rounded_quotient(a,b) a /= b
@@ -457,11 +436,7 @@ extern double rnd_prod(double, double), 
 #define Pack_32
 #endif
 
-#ifdef KR_headers
-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
-#else
 #define FFFFFFFF 0xffffffffUL
-#endif
 
 #ifdef NO_LONG_LONG
 #undef ULLong
@@ -487,7 +462,7 @@ extern double rnd_prod(double, double), 
 #define FREE_DTOA_LOCK(n)	/*nothing*/
 #endif
 
-#define Kmax 15
+#define Kmax (sizeof(size_t) << 3)
 
  struct
 Bigint {
@@ -502,11 +477,7 @@ Bigint {
 
  static Bigint *
 Balloc
-#ifdef KR_headers
-	(k) int k;
-#else
 	(int k)
-#endif
 {
 	int x;
 	Bigint *rv;
@@ -525,7 +496,7 @@ Balloc
 #else
 		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
 			/sizeof(double);
-		if (pmem_next - private_mem + len <= PRIVATE_mem) {
+		if (pmem_next - private_mem + len <= (unsigned)PRIVATE_mem) {
 			rv = (Bigint*)pmem_next;
 			pmem_next += len;
 			}
@@ -542,11 +513,7 @@ Balloc
 
  static void
 Bfree
-#ifdef KR_headers
-	(v) Bigint *v;
-#else
 	(Bigint *v)
-#endif
 {
 	if (v) {
 		ACQUIRE_DTOA_LOCK(0);
@@ -561,11 +528,7 @@ y->wds*sizeof(Long) + 2*sizeof(int))
 
  static Bigint *
 multadd
-#ifdef KR_headers
-	(b, m, a) Bigint *b; int m, a;
-#else
 	(Bigint *b, int m, int a)	/* multiply by m and add a */
-#endif
 {
 	int i, wds;
 #ifdef ULLong
@@ -587,7 +550,7 @@ multadd
 #ifdef ULLong
 		y = *x * (ULLong)m + carry;
 		carry = y >> 32;
-		*x++ = y & FFFFFFFF;
+		*x++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 		xi = *x;
@@ -610,7 +573,7 @@ multadd
 			Bfree(b);
 			b = b1;
 			}
-		b->x[wds++] = carry;
+		b->x[wds++] = (ULong)carry;
 		b->wds = wds;
 		}
 	return b;
@@ -618,11 +581,7 @@ multadd
 
  static Bigint *
 s2b
-#ifdef KR_headers
-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
-#else
 	(CONST char *s, int nd0, int nd, ULong y9)
-#endif
 {
 	Bigint *b;
 	int i, k;
@@ -656,11 +615,7 @@ s2b
 
  static int
 hi0bits
-#ifdef KR_headers
-	(x) register ULong x;
-#else
 	(register ULong x)
-#endif
 {
 	register int k = 0;
 
@@ -690,11 +645,7 @@ hi0bits
 
  static int
 lo0bits
-#ifdef KR_headers
-	(y) ULong *y;
-#else
 	(ULong *y)
-#endif
 {
 	register int k;
 	register ULong x = *y;
@@ -738,11 +689,7 @@ lo0bits
 
  static Bigint *
 i2b
-#ifdef KR_headers
-	(i) int i;
-#else
 	(int i)
-#endif
 {
 	Bigint *b;
 
@@ -754,11 +701,7 @@ i2b
 
  static Bigint *
 mult
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	Bigint *c;
 	int k, wa, wb, wc;
@@ -801,10 +744,10 @@ mult
 			do {
 				z = *x++ * (ULLong)y + *xc + carry;
 				carry = z >> 32;
-				*xc++ = z & FFFFFFFF;
+				*xc++ = (ULong)z & FFFFFFFF;
 				}
 				while(x < xae);
-			*xc = carry;
+			*xc = (ULong)carry;
 			}
 		}
 #else
@@ -866,11 +809,7 @@ mult
 
  static Bigint *
 pow5mult
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
 	(Bigint *b, int k)
-#endif
 {
 	Bigint *b1, *p5, *p51;
 	int i;
@@ -923,11 +862,7 @@ pow5mult
 
  static Bigint *
 lshift
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
 	(Bigint *b, int k)
-#endif
 {
 	int i, k1, n, n1;
 	Bigint *b1;
@@ -983,11 +918,7 @@ lshift
 
  static int
 cmp
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	ULong *xa, *xa0, *xb, *xb0;
 	int i, j;
@@ -1017,11 +948,7 @@ cmp
 
  static Bigint *
 diff
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	Bigint *c;
 	int i, wa, wb;
@@ -1064,13 +991,13 @@ diff
 	do {
 		y = (ULLong)*xa++ - *xb++ - borrow;
 		borrow = y >> 32 & (ULong)1;
-		*xc++ = y & FFFFFFFF;
+		*xc++ = (ULong)y & FFFFFFFF;
 		}
 		while(xb < xbe);
 	while(xa < xae) {
 		y = *xa++ - borrow;
 		borrow = y >> 32 & (ULong)1;
-		*xc++ = y & FFFFFFFF;
+		*xc++ = (ULong)y & FFFFFFFF;
 		}
 #else
 #ifdef Pack_32
@@ -1111,15 +1038,12 @@ diff
 
  static double
 ulp
-#ifdef KR_headers
-	(x) double x;
-#else
-	(double x)
-#endif
+	(double dx)
 {
 	register Long L;
-	double a;
+	U x, a;
 
+	dval(x) = dx;
 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
 #ifndef Avoid_Underflow
 #ifndef Sudden_Underflow
@@ -1153,15 +1077,11 @@ ulp
 
  static double
 b2d
-#ifdef KR_headers
-	(a, e) Bigint *a; int *e;
-#else
 	(Bigint *a, int *e)
-#endif
 {
 	ULong *xa, *xa0, w, y, z;
 	int k;
-	double d;
+	U d;
 #ifdef VAX
 	ULong d0, d1;
 #else
@@ -1223,12 +1143,9 @@ b2d
 
  static Bigint *
 d2b
-#ifdef KR_headers
-	(d, e, bits) double d; int *e, *bits;
-#else
-	(double d, int *e, int *bits)
-#endif
+	(double dd, int *e, int *bits)
 {
+	U d;
 	Bigint *b;
 	int de, k;
 	ULong *x, y, z;
@@ -1237,6 +1154,9 @@ d2b
 #endif
 #ifdef VAX
 	ULong d0, d1;
+#endif
+	dval(d) = dd;
+#ifdef VAX
 	d0 = word0(d) >> 16 | word0(d) << 16;
 	d1 = word1(d) >> 16 | word1(d) << 16;
 #else
@@ -1361,13 +1281,9 @@ d2b
 
  static double
 ratio
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
-	double da, db;
+	U da, db;
 	int k, ka, kb;
 
 	dval(da) = b2d(a, &ka);
@@ -1453,11 +1369,7 @@ static CONST double tinytens[] = { 1e-16
 
  static int
 match
-#ifdef KR_headers
-	(sp, t) char **sp, *t;
-#else
 	(CONST char **sp, CONST char *t)
-#endif
 {
 	int c, d;
 	CONST char *s = *sp;
@@ -1475,11 +1387,7 @@ match
 #ifndef No_Hex_NaN
  static void
 hexnan
-#ifdef KR_headers
-	(rvp, sp) double *rvp; CONST char **sp;
-#else
-	(double *rvp, CONST char **sp)
-#endif
+	(U *rvp, CONST char **sp)
 {
 	ULong c, x[2];
 	CONST char *s;
@@ -1528,12 +1436,8 @@ hexnan
 #endif /* INFNAN_CHECK */
 
  double
-kjs_strtod
-#ifdef KR_headers
-	(s00, se) CONST char *s00; char **se;
-#else
+strtod
 	(CONST char *s00, char **se)
-#endif
 {
 #ifdef Avoid_Underflow
 	int scale;
@@ -1541,7 +1445,8 @@ kjs_strtod
 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
 	CONST char *s, *s0, *s1;
-	double aadj, aadj1, adj, rv, rv0;
+	double aadj, aadj1, adj;
+	U aadj2, rv, rv0;
 	Long L;
 	ULong y, z;
 	Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
@@ -2302,7 +2207,9 @@ kjs_strtod
 					aadj = z;
 					aadj1 = dsign ? aadj : -aadj;
 					}
-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
+				dval(aadj2) = aadj1;
+				word0(aadj2) += (2*P+1)*Exp_msk1 - y;
+				aadj1 = dval(aadj2);
 				}
 			adj = aadj1 * ulp(dval(rv));
 			dval(rv) += adj;
@@ -2419,11 +2326,7 @@ kjs_strtod
 
  static int
 quorem
-#ifdef KR_headers
-	(b, S) Bigint *b, *S;
-#else
 	(Bigint *b, Bigint *S)
-#endif
 {
 	int n;
 	ULong *bx, *bxe, q, *sx, *sxe;
@@ -2461,7 +2364,7 @@ quorem
 			carry = ys >> 32;
 			y = *bx - (ys & FFFFFFFF) - borrow;
 			borrow = y >> 32 & (ULong)1;
-			*bx++ = y & FFFFFFFF;
+			*bx++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 			si = *sx++;
@@ -2502,7 +2405,7 @@ quorem
 			carry = ys >> 32;
 			y = *bx - (ys & FFFFFFFF) - borrow;
 			borrow = y >> 32 & (ULong)1;
-			*bx++ = y & FFFFFFFF;
+			*bx++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 			si = *sx++;
@@ -2540,11 +2443,7 @@ quorem
 #endif
 
  static char *
-#ifdef KR_headers
-rv_alloc(i) int i;
-#else
 rv_alloc(int i)
-#endif
 {
 	int j, k, *r;
 
@@ -2563,11 +2462,7 @@ rv_alloc(int i)
 	}
 
  static char *
-#ifdef KR_headers
-nrv_alloc(s, rve, n) char *s, **rve; int n;
-#else
 nrv_alloc(CONST char *s, char **rve, int n)
-#endif
 {
 	char *rv, *t;
 
@@ -2585,11 +2480,7 @@ nrv_alloc(CONST char *s, char **rve, int
  */
 
  void
-#ifdef KR_headers
-kjs_freedtoa(s) char *s;
-#else
-kjs_freedtoa(char *s)
-#endif
+freedtoa(char *s)
 {
 	Bigint *b = (Bigint *)((int *)s - 1);
 	b->maxwds = 1 << (b->k = *(int*)b);
@@ -2635,13 +2526,8 @@ kjs_freedtoa(char *s)
  */
 
  char *
-kjs_dtoa
-#ifdef KR_headers
-	(d, mode, ndigits, decpt, sign, rve)
-	double d; int mode, ndigits, *decpt, *sign; char **rve;
-#else
-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#endif
+dtoa
+	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
 {
  /*	Arguments ndigits, decpt, sign are similar to those
 	of ecvt and fcvt; trailing zeros are suppressed from
@@ -2686,7 +2572,8 @@ kjs_dtoa
 	ULong x;
 #endif
 	Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
-	double d2, ds, eps;
+	U d, d2, eps;
+	double ds;
 	char *s, *s0;
 #ifdef Honor_FLT_ROUNDS
 	int rounding;
@@ -2697,11 +2584,12 @@ kjs_dtoa
 
 #ifndef MULTIPLE_THREADS
 	if (dtoa_result) {
-		kjs_freedtoa(dtoa_result);
+		freedtoa(dtoa_result);
 		dtoa_result = 0;
 		}
 #endif
 
+	dval(d) = dd;
 	if (word0(d) & Sign_bit) {
 		/* set sign for everything, including 0's and NaNs */
 		*sign = 1;
@@ -2966,7 +2854,8 @@ kjs_dtoa
 					if (dval(d) > 0.5 + dval(eps))
 						goto bump_up;
 					else if (dval(d) < 0.5 - dval(eps)) {
-						while(*--s == '0');
+						while(*--s == '0')
+							;
 						s++;
 						goto ret1;
 						}
@@ -3285,7 +3174,8 @@ kjs_dtoa
 #ifdef Honor_FLT_ROUNDS
 trimzeros:
 #endif
-		while(*--s == '0');
+		while(*--s == '0')
+			;
 		s++;
 		}
  ret:

kdelibs-3.5.10-kabc.patch:
 entrylist     |    2 ++
 field.src.cpp |   34 ++++++++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)

--- NEW FILE kdelibs-3.5.10-kabc.patch ---
--- kdelibs-3.5.10/kabc/scripts/field.src.cpp.orig	2009-12-09 18:51:15.000000000 +0100
+++ kdelibs-3.5.10/kabc/scripts/field.src.cpp	2009-12-09 18:51:54.000000000 +0100
@@ -36,7 +36,7 @@
                const QString &app = QString::null )
       : mFieldId( fieldId ), mCategory( category ), mLabel( label ),
         mKey( key ), mApp( app ) {}
-  
+
     enum FieldId
     {
       CustomField,
@@ -45,11 +45,11 @@
 
     int fieldId() { return mFieldId; }
     int category() { return mCategory; }
-    
+
     QString label() { return mLabel; }
     QString key() { return mKey; }
     QString app() { return mApp; }
-    
+
   private:
     int mFieldId;
     int mCategory;
@@ -184,6 +184,8 @@
       return a.phoneNumber( PhoneNumber::Pager ).number();
     case FieldImpl::HomeAddressStreet:
       return a.address( Address::Home ).street();
+    case FieldImpl::HomeAddressPostOfficeBox:
+      return a.address( Address::Home ).postOfficeBox();
     case FieldImpl::HomeAddressLocality:
       return a.address( Address::Home ).locality();
     case FieldImpl::HomeAddressRegion:
@@ -196,6 +198,8 @@
       return a.address( Address::Home ).label();
     case FieldImpl::BusinessAddressStreet:
       return a.address( Address::Work ).street();
+    case FieldImpl::BusinessAddressPostOfficeBox:
+      return a.address( Address::Work ).postOfficeBox();
     case FieldImpl::BusinessAddressLocality:
       return a.address( Address::Work ).locality();
     case FieldImpl::BusinessAddressRegion:
@@ -266,6 +270,13 @@
         a.insertAddress( address );
         return true;
       }
+    case FieldImpl::HomeAddressPostOfficeBox:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setPostOfficeBox( value );
+        a.insertAddress( address );
+        return true;
+      }
     case FieldImpl::HomeAddressLocality:
       {
         KABC::Address address = a.address( Address::Home );
@@ -308,6 +319,13 @@
         a.insertAddress( address );
         return true;
       }
+    case FieldImpl::BusinessAddressPostOfficeBox:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setPostOfficeBox( value );
+        a.insertAddress( address );
+        return true;
+      }
     case FieldImpl::BusinessAddressLocality:
       {
         KABC::Address address = a.address( Address::Work );
@@ -438,7 +456,7 @@
                         const Field::List &fields )
 {
   QValueList<int> fieldIds;
-  
+
   int custom = 0;
   Field::List::ConstIterator it;
   for( it = fields.begin(); it != fields.end(); ++it ) {
@@ -452,7 +470,7 @@
                        QString::number( custom++ ), customEntry );
     }
   }
-  
+
   cfg->writeEntry( identifier, fieldIds );
 }
 
@@ -460,7 +478,7 @@
 {
   KConfig *cfg = KGlobal::config();
   KConfigGroupSaver( cfg, "KABCFields" );
- 
+
   return restoreFields( cfg, identifier );
 }
 
@@ -485,7 +503,7 @@
     }
     fields.append( new Field( f ) );
   }
-  
+
   return fields;
 }
 
@@ -496,7 +514,7 @@
   if ( !sameId ) return false;
 
   if ( mImpl->fieldId() != FieldImpl::CustomField ) return true;
-  
+
   return mImpl->key() == field->mImpl->key();
 }
 
--- kdelibs-3.5.10/kabc/scripts/entrylist.orig	2009-12-09 18:48:40.000000000 +0100
+++ kdelibs-3.5.10/kabc/scripts/entrylist	2009-12-09 18:50:42.000000000 +0100
@@ -29,6 +29,7 @@
 
 #Address address
 LF,home address street,,QString,homeAddressStreet,Address|Personal
+LF,home address post office box,,QString,homeAddressPostOfficeBox,Address|Personal
 LF,home address city,,QString,homeAddressLocality,Address|Personal
 LF,home address state,,QString,homeAddressRegion,Address|Personal
 LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
@@ -36,6 +37,7 @@
 LF,home address label,,QString,homeAddressLabel,Address|Personal
 
 LF,business address street,,QString,businessAddressStreet,Address|Organization
+LF,business address post office box,,QString,businessAddressPostOfficeBox,Address|Organization
 LF,business address city,,QString,businessAddressLocality,Address|Organization
 LF,business address state,,QString,businessAddressRegion,Address|Organization
 LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-12/kdelibs3.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- kdelibs3.spec	7 Dec 2009 15:15:28 -0000	1.77
+++ kdelibs3.spec	9 Dec 2009 18:00:14 -0000	1.78
@@ -81,6 +81,11 @@ Patch101: kde-3.5-libtool-shlibext.patch
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
 Patch105: kdelibs-3.5.10-ossl-1.x.patch
+Patch106: kdelibs-3.5.0-kio.patch
+Patch107: kdelibs-3.5.10-assert.patch
+Patch108: kdelibs-3.5.10-dtoa.patch
+Patch109: kdelibs-3.5.10-kabc.patch
+
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -242,6 +247,10 @@ format for easy browsing
 %patch101 -p1 -b .libtool-shlibext
 %patch104 -p1 -b .gcc44
 %patch105 -p1 -b .ossl-1.x
+%patch106 -p1 -b .kio
+%patch107 -p1 -b .assert
+%patch108 -p1 -b .alias
+%patch109 -p1 -b .kabc
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -577,6 +586,7 @@ touch --no-create %{_datadir}/icons/crys
 %changelog
 * Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
 - fix security issues in libltdl bundle within kdelibs CVE-2009-3736
+- backport upstream patches
 
 * Mon Nov  2 2009 Luk???? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428



From than at fedoraproject.org  Wed Dec  9 18:02:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Dec 2009 18:02:04 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs-3.5.0-kio.patch, NONE,
	1.1 kdelibs-3.5.10-assert.patch, NONE,
	1.1 kdelibs-3.5.10-dtoa.patch, NONE,
	1.1 kdelibs-3.5.10-kabc.patch, NONE, 1.1 kdelibs3.spec, 1.77, 1.78
Message-ID: <20091209180204.3C7B611C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13920

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.0-kio.patch kdelibs-3.5.10-assert.patch 
	kdelibs-3.5.10-dtoa.patch kdelibs-3.5.10-kabc.patch 
Log Message:
 backport upstream patches



kdelibs-3.5.0-kio.patch:
 kzip.cpp |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.0-kio.patch ---
--- kdelibs-3.5.10/kio/kio/kzip.cpp.orig	2009-12-09 18:42:47.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.cpp	2009-12-09 18:45:43.000000000 +0100
@@ -1051,6 +1051,20 @@
     return true;
 }
 
+bool KZip::writeDir(const QString& name, const QString& user, const QString& group)
+{
+    // Zip files have no explicit directories, they are implicitly created during extraction time
+    // when file entries have paths in them.
+    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
+    QString dirName = name;
+    if (!name.endsWith("/"))
+        dirName = dirName.append('/');
+
+    mode_t perm = 040755;
+    time_t the_time = time(0);
+    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
+}
+
 // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
 bool KZip::writeFile( const QString& name, const QString& user, const QString& group, uint size, const char* data )
 {
@@ -1114,7 +1128,7 @@
     }
 
     // delete entries in the filelist with the same filename as the one we want
-    // to save, so that we don?t have duplicate file entries when viewing the zip
+    // to save, so that we don???t have duplicate file entries when viewing the zip
     // with konqi...
     // CAUTION: the old file itself is still in the zip and won't be removed !!!
     QPtrListIterator<KZipFileEntry> it( d->m_fileList );

kdelibs-3.5.10-assert.patch:
 karchive.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.10-assert.patch ---
--- kdelibs-3.5.10/kio/kio/karchive.cpp.orig	2009-12-09 18:40:26.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/karchive.cpp	2009-12-09 18:41:14.000000000 +0100
@@ -588,7 +588,9 @@
 
 void KArchiveDirectory::addEntry( KArchiveEntry* entry )
 {
-  Q_ASSERT( !entry->name().isEmpty() );
+  if( entry->name().isEmpty() )
+    return;
+
   if( m_entries[ entry->name() ] ) {
       kdWarning() << "KArchiveDirectory::addEntry: directory " << name()
                   << " has entry " << entry->name() << " already" << endl;

kdelibs-3.5.10-dtoa.patch:
 dtoa.cpp |  232 ++++++++++++++++-----------------------------------------------
 1 file changed, 61 insertions(+), 171 deletions(-)

--- NEW FILE kdelibs-3.5.10-dtoa.patch ---
diff -up kdelibs-3.5.10/kjs/dtoa.cpp.orig kdelibs-3.5.10/kjs/dtoa.cpp
--- kdelibs-3.5.10/kjs/dtoa.cpp.orig	2009-12-09 18:32:22.000000000 +0100
+++ kdelibs-3.5.10/kjs/dtoa.cpp	2009-12-09 18:32:36.000000000 +0100
@@ -174,9 +174,10 @@
 #undef CONST
 #endif
 
+#include "dtoa.h"
 #include <config.h>
 
-#include "stdlib.h"
+#include "global.h"
 
 #ifdef WORDS_BIGENDIAN
 #define IEEE_MC68k
@@ -184,7 +185,6 @@
 #define IEEE_8087
 #endif
 #define INFNAN_CHECK
-#include "dtoa.h"
 
 
 
@@ -196,22 +196,19 @@ typedef unsigned Long ULong;
 #endif
 
 #ifdef DEBUG
-#include "stdio.h"
+#include <stdio.h>
 #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
 #endif
 
-#include "string.h"
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef USE_LOCALE
-#include "locale.h"
+#include <locale.h>
 #endif
 
 #ifdef MALLOC
-#ifdef KR_headers
-extern char *MALLOC();
-#else
 extern void *MALLOC(size_t);
-#endif
 #else
 #define MALLOC malloc
 #endif
@@ -233,7 +230,7 @@ static double private_mem[PRIVATE_mem], 
 #define IEEE_Arith
 #endif
 
-#include "errno.h"
+#include <errno.h>
 
 #ifdef Bad_float_h
 
@@ -260,25 +257,29 @@ static double private_mem[PRIVATE_mem], 
 #define DBL_MAX 1.7014118346046923e+38
 #endif
 
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647
+#endif
+
 #else /* ifndef Bad_float_h */
-#include "float.h"
+#include <float.h>
 #endif /* Bad_float_h */
 
 #ifndef __MATH_H__
-#include "math.h"
+#include <math.h>
 #endif
 
+#define strtod kjs_strtod
+#define dtoa kjs_dtoa
+#define freedtoa kjs_freedtoa
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifndef CONST
-#ifdef KR_headers
-#define CONST /* blank */
-#else
 #define CONST const
 #endif
-#endif
 
 #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
 Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
@@ -286,37 +287,19 @@ Exactly one of IEEE_8087, IEEE_MC68k, VA
 
 typedef union { double d; ULong L[2]; } U;
 
-#ifdef YES_ALIAS
-#define dval(x) x
+#define dval(x) (x).d
 #ifdef IEEE_8087
-#define word0(x) ((ULong *)&x)[1]
-#define word1(x) ((ULong *)&x)[0]
+#define word0(x) (x).L[1]
+#define word1(x) (x).L[0]
 #else
-#define word0(x) ((ULong *)&x)[0]
-#define word1(x) ((ULong *)&x)[1]
-#endif
-#else
-#ifdef IEEE_8087
-#define word0(x) ((U*)&x)->L[1]
-#define word1(x) ((U*)&x)->L[0]
-#else
-#define word0(x) ((U*)&x)->L[0]
-#define word1(x) ((U*)&x)->L[1]
-#endif
-#define dval(x) ((U*)&x)->d
+#define word0(x) (x).L[0]
+#define word1(x) (x).L[1]
 #endif
 
 /* The following definition of Storeinc is appropriate for MIPS processors.
  * An alternative that might be better on some machines is
- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
  */
-#if defined(IEEE_8087) + defined(VAX)
-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
-((unsigned short *)a)[0] = (unsigned short)c, a++)
-#else
-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
-((unsigned short *)a)[1] = (unsigned short)c, a++)
-#endif
+#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
 
 /* #define P DBL_MANT_DIG */
 /* Ten_pmax = floor(P*log(2)/log(5)) */
@@ -440,11 +423,7 @@ typedef union { double d; ULong L[2]; } 
 #ifdef RND_PRODQUOT
 #define rounded_product(a,b) a = rnd_prod(a, b)
 #define rounded_quotient(a,b) a = rnd_quot(a, b)
-#ifdef KR_headers
-extern double rnd_prod(), rnd_quot();
-#else
 extern double rnd_prod(double, double), rnd_quot(double, double);
-#endif
 #else
 #define rounded_product(a,b) a *= b
 #define rounded_quotient(a,b) a /= b
@@ -457,11 +436,7 @@ extern double rnd_prod(double, double), 
 #define Pack_32
 #endif
 
-#ifdef KR_headers
-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
-#else
 #define FFFFFFFF 0xffffffffUL
-#endif
 
 #ifdef NO_LONG_LONG
 #undef ULLong
@@ -487,7 +462,7 @@ extern double rnd_prod(double, double), 
 #define FREE_DTOA_LOCK(n)	/*nothing*/
 #endif
 
-#define Kmax 15
+#define Kmax (sizeof(size_t) << 3)
 
  struct
 Bigint {
@@ -502,11 +477,7 @@ Bigint {
 
  static Bigint *
 Balloc
-#ifdef KR_headers
-	(k) int k;
-#else
 	(int k)
-#endif
 {
 	int x;
 	Bigint *rv;
@@ -525,7 +496,7 @@ Balloc
 #else
 		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
 			/sizeof(double);
-		if (pmem_next - private_mem + len <= PRIVATE_mem) {
+		if (pmem_next - private_mem + len <= (unsigned)PRIVATE_mem) {
 			rv = (Bigint*)pmem_next;
 			pmem_next += len;
 			}
@@ -542,11 +513,7 @@ Balloc
 
  static void
 Bfree
-#ifdef KR_headers
-	(v) Bigint *v;
-#else
 	(Bigint *v)
-#endif
 {
 	if (v) {
 		ACQUIRE_DTOA_LOCK(0);
@@ -561,11 +528,7 @@ y->wds*sizeof(Long) + 2*sizeof(int))
 
  static Bigint *
 multadd
-#ifdef KR_headers
-	(b, m, a) Bigint *b; int m, a;
-#else
 	(Bigint *b, int m, int a)	/* multiply by m and add a */
-#endif
 {
 	int i, wds;
 #ifdef ULLong
@@ -587,7 +550,7 @@ multadd
 #ifdef ULLong
 		y = *x * (ULLong)m + carry;
 		carry = y >> 32;
-		*x++ = y & FFFFFFFF;
+		*x++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 		xi = *x;
@@ -610,7 +573,7 @@ multadd
 			Bfree(b);
 			b = b1;
 			}
-		b->x[wds++] = carry;
+		b->x[wds++] = (ULong)carry;
 		b->wds = wds;
 		}
 	return b;
@@ -618,11 +581,7 @@ multadd
 
  static Bigint *
 s2b
-#ifdef KR_headers
-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
-#else
 	(CONST char *s, int nd0, int nd, ULong y9)
-#endif
 {
 	Bigint *b;
 	int i, k;
@@ -656,11 +615,7 @@ s2b
 
  static int
 hi0bits
-#ifdef KR_headers
-	(x) register ULong x;
-#else
 	(register ULong x)
-#endif
 {
 	register int k = 0;
 
@@ -690,11 +645,7 @@ hi0bits
 
  static int
 lo0bits
-#ifdef KR_headers
-	(y) ULong *y;
-#else
 	(ULong *y)
-#endif
 {
 	register int k;
 	register ULong x = *y;
@@ -738,11 +689,7 @@ lo0bits
 
  static Bigint *
 i2b
-#ifdef KR_headers
-	(i) int i;
-#else
 	(int i)
-#endif
 {
 	Bigint *b;
 
@@ -754,11 +701,7 @@ i2b
 
  static Bigint *
 mult
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	Bigint *c;
 	int k, wa, wb, wc;
@@ -801,10 +744,10 @@ mult
 			do {
 				z = *x++ * (ULLong)y + *xc + carry;
 				carry = z >> 32;
-				*xc++ = z & FFFFFFFF;
+				*xc++ = (ULong)z & FFFFFFFF;
 				}
 				while(x < xae);
-			*xc = carry;
+			*xc = (ULong)carry;
 			}
 		}
 #else
@@ -866,11 +809,7 @@ mult
 
  static Bigint *
 pow5mult
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
 	(Bigint *b, int k)
-#endif
 {
 	Bigint *b1, *p5, *p51;
 	int i;
@@ -923,11 +862,7 @@ pow5mult
 
  static Bigint *
 lshift
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
 	(Bigint *b, int k)
-#endif
 {
 	int i, k1, n, n1;
 	Bigint *b1;
@@ -983,11 +918,7 @@ lshift
 
  static int
 cmp
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	ULong *xa, *xa0, *xb, *xb0;
 	int i, j;
@@ -1017,11 +948,7 @@ cmp
 
  static Bigint *
 diff
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	Bigint *c;
 	int i, wa, wb;
@@ -1064,13 +991,13 @@ diff
 	do {
 		y = (ULLong)*xa++ - *xb++ - borrow;
 		borrow = y >> 32 & (ULong)1;
-		*xc++ = y & FFFFFFFF;
+		*xc++ = (ULong)y & FFFFFFFF;
 		}
 		while(xb < xbe);
 	while(xa < xae) {
 		y = *xa++ - borrow;
 		borrow = y >> 32 & (ULong)1;
-		*xc++ = y & FFFFFFFF;
+		*xc++ = (ULong)y & FFFFFFFF;
 		}
 #else
 #ifdef Pack_32
@@ -1111,15 +1038,12 @@ diff
 
  static double
 ulp
-#ifdef KR_headers
-	(x) double x;
-#else
-	(double x)
-#endif
+	(double dx)
 {
 	register Long L;
-	double a;
+	U x, a;
 
+	dval(x) = dx;
 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
 #ifndef Avoid_Underflow
 #ifndef Sudden_Underflow
@@ -1153,15 +1077,11 @@ ulp
 
  static double
 b2d
-#ifdef KR_headers
-	(a, e) Bigint *a; int *e;
-#else
 	(Bigint *a, int *e)
-#endif
 {
 	ULong *xa, *xa0, w, y, z;
 	int k;
-	double d;
+	U d;
 #ifdef VAX
 	ULong d0, d1;
 #else
@@ -1223,12 +1143,9 @@ b2d
 
  static Bigint *
 d2b
-#ifdef KR_headers
-	(d, e, bits) double d; int *e, *bits;
-#else
-	(double d, int *e, int *bits)
-#endif
+	(double dd, int *e, int *bits)
 {
+	U d;
 	Bigint *b;
 	int de, k;
 	ULong *x, y, z;
@@ -1237,6 +1154,9 @@ d2b
 #endif
 #ifdef VAX
 	ULong d0, d1;
+#endif
+	dval(d) = dd;
+#ifdef VAX
 	d0 = word0(d) >> 16 | word0(d) << 16;
 	d1 = word1(d) >> 16 | word1(d) << 16;
 #else
@@ -1361,13 +1281,9 @@ d2b
 
  static double
 ratio
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
-	double da, db;
+	U da, db;
 	int k, ka, kb;
 
 	dval(da) = b2d(a, &ka);
@@ -1453,11 +1369,7 @@ static CONST double tinytens[] = { 1e-16
 
  static int
 match
-#ifdef KR_headers
-	(sp, t) char **sp, *t;
-#else
 	(CONST char **sp, CONST char *t)
-#endif
 {
 	int c, d;
 	CONST char *s = *sp;
@@ -1475,11 +1387,7 @@ match
 #ifndef No_Hex_NaN
  static void
 hexnan
-#ifdef KR_headers
-	(rvp, sp) double *rvp; CONST char **sp;
-#else
-	(double *rvp, CONST char **sp)
-#endif
+	(U *rvp, CONST char **sp)
 {
 	ULong c, x[2];
 	CONST char *s;
@@ -1528,12 +1436,8 @@ hexnan
 #endif /* INFNAN_CHECK */
 
  double
-kjs_strtod
-#ifdef KR_headers
-	(s00, se) CONST char *s00; char **se;
-#else
+strtod
 	(CONST char *s00, char **se)
-#endif
 {
 #ifdef Avoid_Underflow
 	int scale;
@@ -1541,7 +1445,8 @@ kjs_strtod
 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
 	CONST char *s, *s0, *s1;
-	double aadj, aadj1, adj, rv, rv0;
+	double aadj, aadj1, adj;
+	U aadj2, rv, rv0;
 	Long L;
 	ULong y, z;
 	Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
@@ -2302,7 +2207,9 @@ kjs_strtod
 					aadj = z;
 					aadj1 = dsign ? aadj : -aadj;
 					}
-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
+				dval(aadj2) = aadj1;
+				word0(aadj2) += (2*P+1)*Exp_msk1 - y;
+				aadj1 = dval(aadj2);
 				}
 			adj = aadj1 * ulp(dval(rv));
 			dval(rv) += adj;
@@ -2419,11 +2326,7 @@ kjs_strtod
 
  static int
 quorem
-#ifdef KR_headers
-	(b, S) Bigint *b, *S;
-#else
 	(Bigint *b, Bigint *S)
-#endif
 {
 	int n;
 	ULong *bx, *bxe, q, *sx, *sxe;
@@ -2461,7 +2364,7 @@ quorem
 			carry = ys >> 32;
 			y = *bx - (ys & FFFFFFFF) - borrow;
 			borrow = y >> 32 & (ULong)1;
-			*bx++ = y & FFFFFFFF;
+			*bx++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 			si = *sx++;
@@ -2502,7 +2405,7 @@ quorem
 			carry = ys >> 32;
 			y = *bx - (ys & FFFFFFFF) - borrow;
 			borrow = y >> 32 & (ULong)1;
-			*bx++ = y & FFFFFFFF;
+			*bx++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 			si = *sx++;
@@ -2540,11 +2443,7 @@ quorem
 #endif
 
  static char *
-#ifdef KR_headers
-rv_alloc(i) int i;
-#else
 rv_alloc(int i)
-#endif
 {
 	int j, k, *r;
 
@@ -2563,11 +2462,7 @@ rv_alloc(int i)
 	}
 
  static char *
-#ifdef KR_headers
-nrv_alloc(s, rve, n) char *s, **rve; int n;
-#else
 nrv_alloc(CONST char *s, char **rve, int n)
-#endif
 {
 	char *rv, *t;
 
@@ -2585,11 +2480,7 @@ nrv_alloc(CONST char *s, char **rve, int
  */
 
  void
-#ifdef KR_headers
-kjs_freedtoa(s) char *s;
-#else
-kjs_freedtoa(char *s)
-#endif
+freedtoa(char *s)
 {
 	Bigint *b = (Bigint *)((int *)s - 1);
 	b->maxwds = 1 << (b->k = *(int*)b);
@@ -2635,13 +2526,8 @@ kjs_freedtoa(char *s)
  */
 
  char *
-kjs_dtoa
-#ifdef KR_headers
-	(d, mode, ndigits, decpt, sign, rve)
-	double d; int mode, ndigits, *decpt, *sign; char **rve;
-#else
-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#endif
+dtoa
+	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
 {
  /*	Arguments ndigits, decpt, sign are similar to those
 	of ecvt and fcvt; trailing zeros are suppressed from
@@ -2686,7 +2572,8 @@ kjs_dtoa
 	ULong x;
 #endif
 	Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
-	double d2, ds, eps;
+	U d, d2, eps;
+	double ds;
 	char *s, *s0;
 #ifdef Honor_FLT_ROUNDS
 	int rounding;
@@ -2697,11 +2584,12 @@ kjs_dtoa
 
 #ifndef MULTIPLE_THREADS
 	if (dtoa_result) {
-		kjs_freedtoa(dtoa_result);
+		freedtoa(dtoa_result);
 		dtoa_result = 0;
 		}
 #endif
 
+	dval(d) = dd;
 	if (word0(d) & Sign_bit) {
 		/* set sign for everything, including 0's and NaNs */
 		*sign = 1;
@@ -2966,7 +2854,8 @@ kjs_dtoa
 					if (dval(d) > 0.5 + dval(eps))
 						goto bump_up;
 					else if (dval(d) < 0.5 - dval(eps)) {
-						while(*--s == '0');
+						while(*--s == '0')
+							;
 						s++;
 						goto ret1;
 						}
@@ -3285,7 +3174,8 @@ kjs_dtoa
 #ifdef Honor_FLT_ROUNDS
 trimzeros:
 #endif
-		while(*--s == '0');
+		while(*--s == '0')
+			;
 		s++;
 		}
  ret:

kdelibs-3.5.10-kabc.patch:
 entrylist     |    2 ++
 field.src.cpp |   34 ++++++++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)

--- NEW FILE kdelibs-3.5.10-kabc.patch ---
--- kdelibs-3.5.10/kabc/scripts/field.src.cpp.orig	2009-12-09 18:51:15.000000000 +0100
+++ kdelibs-3.5.10/kabc/scripts/field.src.cpp	2009-12-09 18:51:54.000000000 +0100
@@ -36,7 +36,7 @@
                const QString &app = QString::null )
       : mFieldId( fieldId ), mCategory( category ), mLabel( label ),
         mKey( key ), mApp( app ) {}
-  
+
     enum FieldId
     {
       CustomField,
@@ -45,11 +45,11 @@
 
     int fieldId() { return mFieldId; }
     int category() { return mCategory; }
-    
+
     QString label() { return mLabel; }
     QString key() { return mKey; }
     QString app() { return mApp; }
-    
+
   private:
     int mFieldId;
     int mCategory;
@@ -184,6 +184,8 @@
       return a.phoneNumber( PhoneNumber::Pager ).number();
     case FieldImpl::HomeAddressStreet:
       return a.address( Address::Home ).street();
+    case FieldImpl::HomeAddressPostOfficeBox:
+      return a.address( Address::Home ).postOfficeBox();
     case FieldImpl::HomeAddressLocality:
       return a.address( Address::Home ).locality();
     case FieldImpl::HomeAddressRegion:
@@ -196,6 +198,8 @@
       return a.address( Address::Home ).label();
     case FieldImpl::BusinessAddressStreet:
       return a.address( Address::Work ).street();
+    case FieldImpl::BusinessAddressPostOfficeBox:
+      return a.address( Address::Work ).postOfficeBox();
     case FieldImpl::BusinessAddressLocality:
       return a.address( Address::Work ).locality();
     case FieldImpl::BusinessAddressRegion:
@@ -266,6 +270,13 @@
         a.insertAddress( address );
         return true;
       }
+    case FieldImpl::HomeAddressPostOfficeBox:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setPostOfficeBox( value );
+        a.insertAddress( address );
+        return true;
+      }
     case FieldImpl::HomeAddressLocality:
       {
         KABC::Address address = a.address( Address::Home );
@@ -308,6 +319,13 @@
         a.insertAddress( address );
         return true;
       }
+    case FieldImpl::BusinessAddressPostOfficeBox:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setPostOfficeBox( value );
+        a.insertAddress( address );
+        return true;
+      }
     case FieldImpl::BusinessAddressLocality:
       {
         KABC::Address address = a.address( Address::Work );
@@ -438,7 +456,7 @@
                         const Field::List &fields )
 {
   QValueList<int> fieldIds;
-  
+
   int custom = 0;
   Field::List::ConstIterator it;
   for( it = fields.begin(); it != fields.end(); ++it ) {
@@ -452,7 +470,7 @@
                        QString::number( custom++ ), customEntry );
     }
   }
-  
+
   cfg->writeEntry( identifier, fieldIds );
 }
 
@@ -460,7 +478,7 @@
 {
   KConfig *cfg = KGlobal::config();
   KConfigGroupSaver( cfg, "KABCFields" );
- 
+
   return restoreFields( cfg, identifier );
 }
 
@@ -485,7 +503,7 @@
     }
     fields.append( new Field( f ) );
   }
-  
+
   return fields;
 }
 
@@ -496,7 +514,7 @@
   if ( !sameId ) return false;
 
   if ( mImpl->fieldId() != FieldImpl::CustomField ) return true;
-  
+
   return mImpl->key() == field->mImpl->key();
 }
 
--- kdelibs-3.5.10/kabc/scripts/entrylist.orig	2009-12-09 18:48:40.000000000 +0100
+++ kdelibs-3.5.10/kabc/scripts/entrylist	2009-12-09 18:50:42.000000000 +0100
@@ -29,6 +29,7 @@
 
 #Address address
 LF,home address street,,QString,homeAddressStreet,Address|Personal
+LF,home address post office box,,QString,homeAddressPostOfficeBox,Address|Personal
 LF,home address city,,QString,homeAddressLocality,Address|Personal
 LF,home address state,,QString,homeAddressRegion,Address|Personal
 LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
@@ -36,6 +37,7 @@
 LF,home address label,,QString,homeAddressLabel,Address|Personal
 
 LF,business address street,,QString,businessAddressStreet,Address|Organization
+LF,business address post office box,,QString,businessAddressPostOfficeBox,Address|Organization
 LF,business address city,,QString,businessAddressLocality,Address|Organization
 LF,business address state,,QString,businessAddressRegion,Address|Organization
 LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- kdelibs3.spec	7 Dec 2009 15:16:22 -0000	1.77
+++ kdelibs3.spec	9 Dec 2009 18:02:04 -0000	1.78
@@ -81,6 +81,11 @@ Patch101: kde-3.5-libtool-shlibext.patch
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
 Patch105: kdelibs-3.5.10-ossl-1.x.patch
+Patch106: kdelibs-3.5.0-kio.patch
+Patch107: kdelibs-3.5.10-assert.patch
+Patch108: kdelibs-3.5.10-dtoa.patch
+Patch109: kdelibs-3.5.10-kabc.patch
+
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -242,6 +247,10 @@ format for easy browsing
 %patch101 -p1 -b .libtool-shlibext
 %patch104 -p1 -b .gcc44
 %patch105 -p1 -b .ossl-1.x
+%patch106 -p1 -b .kio
+%patch107 -p1 -b .assert
+%patch108 -p1 -b .alias
+%patch109 -p1 -b .kabc
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -577,6 +586,7 @@ touch --no-create %{_datadir}/icons/crys
 %changelog
 * Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
 - fix security issues in libltdl bundle within kdelibs CVE-2009-3736
+- backport upstream patches
 
 * Mon Nov  2 2009 Luk???? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428



From than at fedoraproject.org  Wed Dec  9 18:05:01 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Dec 2009 18:05:01 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 kdelibs-3.5.0-kio.patch, NONE,
	1.1 kdelibs-3.5.10-assert.patch, NONE,
	1.1 kdelibs-3.5.10-dtoa.patch, NONE,
	1.1 kdelibs-3.5.10-kabc.patch, NONE, 1.1 kdelibs3.spec, 1.65, 1.66
Message-ID: <20091209180501.5461311C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14881

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.0-kio.patch kdelibs-3.5.10-assert.patch 
	kdelibs-3.5.10-dtoa.patch kdelibs-3.5.10-kabc.patch 
Log Message:
backport upstream patches


kdelibs-3.5.0-kio.patch:
 kzip.cpp |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.0-kio.patch ---
--- kdelibs-3.5.10/kio/kio/kzip.cpp.orig	2009-12-09 18:42:47.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.cpp	2009-12-09 18:45:43.000000000 +0100
@@ -1051,6 +1051,20 @@
     return true;
 }
 
+bool KZip::writeDir(const QString& name, const QString& user, const QString& group)
+{
+    // Zip files have no explicit directories, they are implicitly created during extraction time
+    // when file entries have paths in them.
+    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
+    QString dirName = name;
+    if (!name.endsWith("/"))
+        dirName = dirName.append('/');
+
+    mode_t perm = 040755;
+    time_t the_time = time(0);
+    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
+}
+
 // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
 bool KZip::writeFile( const QString& name, const QString& user, const QString& group, uint size, const char* data )
 {
@@ -1114,7 +1128,7 @@
     }
 
     // delete entries in the filelist with the same filename as the one we want
-    // to save, so that we don?t have duplicate file entries when viewing the zip
+    // to save, so that we don???t have duplicate file entries when viewing the zip
     // with konqi...
     // CAUTION: the old file itself is still in the zip and won't be removed !!!
     QPtrListIterator<KZipFileEntry> it( d->m_fileList );

kdelibs-3.5.10-assert.patch:
 karchive.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.10-assert.patch ---
--- kdelibs-3.5.10/kio/kio/karchive.cpp.orig	2009-12-09 18:40:26.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/karchive.cpp	2009-12-09 18:41:14.000000000 +0100
@@ -588,7 +588,9 @@
 
 void KArchiveDirectory::addEntry( KArchiveEntry* entry )
 {
-  Q_ASSERT( !entry->name().isEmpty() );
+  if( entry->name().isEmpty() )
+    return;
+
   if( m_entries[ entry->name() ] ) {
       kdWarning() << "KArchiveDirectory::addEntry: directory " << name()
                   << " has entry " << entry->name() << " already" << endl;

kdelibs-3.5.10-dtoa.patch:
 dtoa.cpp |  232 ++++++++++++++++-----------------------------------------------
 1 file changed, 61 insertions(+), 171 deletions(-)

--- NEW FILE kdelibs-3.5.10-dtoa.patch ---
diff -up kdelibs-3.5.10/kjs/dtoa.cpp.orig kdelibs-3.5.10/kjs/dtoa.cpp
--- kdelibs-3.5.10/kjs/dtoa.cpp.orig	2009-12-09 18:32:22.000000000 +0100
+++ kdelibs-3.5.10/kjs/dtoa.cpp	2009-12-09 18:32:36.000000000 +0100
@@ -174,9 +174,10 @@
 #undef CONST
 #endif
 
+#include "dtoa.h"
 #include <config.h>
 
-#include "stdlib.h"
+#include "global.h"
 
 #ifdef WORDS_BIGENDIAN
 #define IEEE_MC68k
@@ -184,7 +185,6 @@
 #define IEEE_8087
 #endif
 #define INFNAN_CHECK
-#include "dtoa.h"
 
 
 
@@ -196,22 +196,19 @@ typedef unsigned Long ULong;
 #endif
 
 #ifdef DEBUG
-#include "stdio.h"
+#include <stdio.h>
 #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
 #endif
 
-#include "string.h"
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef USE_LOCALE
-#include "locale.h"
+#include <locale.h>
 #endif
 
 #ifdef MALLOC
-#ifdef KR_headers
-extern char *MALLOC();
-#else
 extern void *MALLOC(size_t);
-#endif
 #else
 #define MALLOC malloc
 #endif
@@ -233,7 +230,7 @@ static double private_mem[PRIVATE_mem], 
 #define IEEE_Arith
 #endif
 
-#include "errno.h"
+#include <errno.h>
 
 #ifdef Bad_float_h
 
@@ -260,25 +257,29 @@ static double private_mem[PRIVATE_mem], 
 #define DBL_MAX 1.7014118346046923e+38
 #endif
 
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647
+#endif
+
 #else /* ifndef Bad_float_h */
-#include "float.h"
+#include <float.h>
 #endif /* Bad_float_h */
 
 #ifndef __MATH_H__
-#include "math.h"
+#include <math.h>
 #endif
 
+#define strtod kjs_strtod
+#define dtoa kjs_dtoa
+#define freedtoa kjs_freedtoa
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifndef CONST
-#ifdef KR_headers
-#define CONST /* blank */
-#else
 #define CONST const
 #endif
-#endif
 
 #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
 Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
@@ -286,37 +287,19 @@ Exactly one of IEEE_8087, IEEE_MC68k, VA
 
 typedef union { double d; ULong L[2]; } U;
 
-#ifdef YES_ALIAS
-#define dval(x) x
+#define dval(x) (x).d
 #ifdef IEEE_8087
-#define word0(x) ((ULong *)&x)[1]
-#define word1(x) ((ULong *)&x)[0]
+#define word0(x) (x).L[1]
+#define word1(x) (x).L[0]
 #else
-#define word0(x) ((ULong *)&x)[0]
-#define word1(x) ((ULong *)&x)[1]
-#endif
-#else
-#ifdef IEEE_8087
-#define word0(x) ((U*)&x)->L[1]
-#define word1(x) ((U*)&x)->L[0]
-#else
-#define word0(x) ((U*)&x)->L[0]
-#define word1(x) ((U*)&x)->L[1]
-#endif
-#define dval(x) ((U*)&x)->d
+#define word0(x) (x).L[0]
+#define word1(x) (x).L[1]
 #endif
 
 /* The following definition of Storeinc is appropriate for MIPS processors.
  * An alternative that might be better on some machines is
- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
  */
-#if defined(IEEE_8087) + defined(VAX)
-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
-((unsigned short *)a)[0] = (unsigned short)c, a++)
-#else
-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
-((unsigned short *)a)[1] = (unsigned short)c, a++)
-#endif
+#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
 
 /* #define P DBL_MANT_DIG */
 /* Ten_pmax = floor(P*log(2)/log(5)) */
@@ -440,11 +423,7 @@ typedef union { double d; ULong L[2]; } 
 #ifdef RND_PRODQUOT
 #define rounded_product(a,b) a = rnd_prod(a, b)
 #define rounded_quotient(a,b) a = rnd_quot(a, b)
-#ifdef KR_headers
-extern double rnd_prod(), rnd_quot();
-#else
 extern double rnd_prod(double, double), rnd_quot(double, double);
-#endif
 #else
 #define rounded_product(a,b) a *= b
 #define rounded_quotient(a,b) a /= b
@@ -457,11 +436,7 @@ extern double rnd_prod(double, double), 
 #define Pack_32
 #endif
 
-#ifdef KR_headers
-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
-#else
 #define FFFFFFFF 0xffffffffUL
-#endif
 
 #ifdef NO_LONG_LONG
 #undef ULLong
@@ -487,7 +462,7 @@ extern double rnd_prod(double, double), 
 #define FREE_DTOA_LOCK(n)	/*nothing*/
 #endif
 
-#define Kmax 15
+#define Kmax (sizeof(size_t) << 3)
 
  struct
 Bigint {
@@ -502,11 +477,7 @@ Bigint {
 
  static Bigint *
 Balloc
-#ifdef KR_headers
-	(k) int k;
-#else
 	(int k)
-#endif
 {
 	int x;
 	Bigint *rv;
@@ -525,7 +496,7 @@ Balloc
 #else
 		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
 			/sizeof(double);
-		if (pmem_next - private_mem + len <= PRIVATE_mem) {
+		if (pmem_next - private_mem + len <= (unsigned)PRIVATE_mem) {
 			rv = (Bigint*)pmem_next;
 			pmem_next += len;
 			}
@@ -542,11 +513,7 @@ Balloc
 
  static void
 Bfree
-#ifdef KR_headers
-	(v) Bigint *v;
-#else
 	(Bigint *v)
-#endif
 {
 	if (v) {
 		ACQUIRE_DTOA_LOCK(0);
@@ -561,11 +528,7 @@ y->wds*sizeof(Long) + 2*sizeof(int))
 
  static Bigint *
 multadd
-#ifdef KR_headers
-	(b, m, a) Bigint *b; int m, a;
-#else
 	(Bigint *b, int m, int a)	/* multiply by m and add a */
-#endif
 {
 	int i, wds;
 #ifdef ULLong
@@ -587,7 +550,7 @@ multadd
 #ifdef ULLong
 		y = *x * (ULLong)m + carry;
 		carry = y >> 32;
-		*x++ = y & FFFFFFFF;
+		*x++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 		xi = *x;
@@ -610,7 +573,7 @@ multadd
 			Bfree(b);
 			b = b1;
 			}
-		b->x[wds++] = carry;
+		b->x[wds++] = (ULong)carry;
 		b->wds = wds;
 		}
 	return b;
@@ -618,11 +581,7 @@ multadd
 
  static Bigint *
 s2b
-#ifdef KR_headers
-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
-#else
 	(CONST char *s, int nd0, int nd, ULong y9)
-#endif
 {
 	Bigint *b;
 	int i, k;
@@ -656,11 +615,7 @@ s2b
 
  static int
 hi0bits
-#ifdef KR_headers
-	(x) register ULong x;
-#else
 	(register ULong x)
-#endif
 {
 	register int k = 0;
 
@@ -690,11 +645,7 @@ hi0bits
 
  static int
 lo0bits
-#ifdef KR_headers
-	(y) ULong *y;
-#else
 	(ULong *y)
-#endif
 {
 	register int k;
 	register ULong x = *y;
@@ -738,11 +689,7 @@ lo0bits
 
  static Bigint *
 i2b
-#ifdef KR_headers
-	(i) int i;
-#else
 	(int i)
-#endif
 {
 	Bigint *b;
 
@@ -754,11 +701,7 @@ i2b
 
  static Bigint *
 mult
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	Bigint *c;
 	int k, wa, wb, wc;
@@ -801,10 +744,10 @@ mult
 			do {
 				z = *x++ * (ULLong)y + *xc + carry;
 				carry = z >> 32;
-				*xc++ = z & FFFFFFFF;
+				*xc++ = (ULong)z & FFFFFFFF;
 				}
 				while(x < xae);
-			*xc = carry;
+			*xc = (ULong)carry;
 			}
 		}
 #else
@@ -866,11 +809,7 @@ mult
 
  static Bigint *
 pow5mult
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
 	(Bigint *b, int k)
-#endif
 {
 	Bigint *b1, *p5, *p51;
 	int i;
@@ -923,11 +862,7 @@ pow5mult
 
  static Bigint *
 lshift
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
 	(Bigint *b, int k)
-#endif
 {
 	int i, k1, n, n1;
 	Bigint *b1;
@@ -983,11 +918,7 @@ lshift
 
  static int
 cmp
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	ULong *xa, *xa0, *xb, *xb0;
 	int i, j;
@@ -1017,11 +948,7 @@ cmp
 
  static Bigint *
 diff
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
 	Bigint *c;
 	int i, wa, wb;
@@ -1064,13 +991,13 @@ diff
 	do {
 		y = (ULLong)*xa++ - *xb++ - borrow;
 		borrow = y >> 32 & (ULong)1;
-		*xc++ = y & FFFFFFFF;
+		*xc++ = (ULong)y & FFFFFFFF;
 		}
 		while(xb < xbe);
 	while(xa < xae) {
 		y = *xa++ - borrow;
 		borrow = y >> 32 & (ULong)1;
-		*xc++ = y & FFFFFFFF;
+		*xc++ = (ULong)y & FFFFFFFF;
 		}
 #else
 #ifdef Pack_32
@@ -1111,15 +1038,12 @@ diff
 
  static double
 ulp
-#ifdef KR_headers
-	(x) double x;
-#else
-	(double x)
-#endif
+	(double dx)
 {
 	register Long L;
-	double a;
+	U x, a;
 
+	dval(x) = dx;
 	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
 #ifndef Avoid_Underflow
 #ifndef Sudden_Underflow
@@ -1153,15 +1077,11 @@ ulp
 
  static double
 b2d
-#ifdef KR_headers
-	(a, e) Bigint *a; int *e;
-#else
 	(Bigint *a, int *e)
-#endif
 {
 	ULong *xa, *xa0, w, y, z;
 	int k;
-	double d;
+	U d;
 #ifdef VAX
 	ULong d0, d1;
 #else
@@ -1223,12 +1143,9 @@ b2d
 
  static Bigint *
 d2b
-#ifdef KR_headers
-	(d, e, bits) double d; int *e, *bits;
-#else
-	(double d, int *e, int *bits)
-#endif
+	(double dd, int *e, int *bits)
 {
+	U d;
 	Bigint *b;
 	int de, k;
 	ULong *x, y, z;
@@ -1237,6 +1154,9 @@ d2b
 #endif
 #ifdef VAX
 	ULong d0, d1;
+#endif
+	dval(d) = dd;
+#ifdef VAX
 	d0 = word0(d) >> 16 | word0(d) << 16;
 	d1 = word1(d) >> 16 | word1(d) << 16;
 #else
@@ -1361,13 +1281,9 @@ d2b
 
  static double
 ratio
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
 	(Bigint *a, Bigint *b)
-#endif
 {
-	double da, db;
+	U da, db;
 	int k, ka, kb;
 
 	dval(da) = b2d(a, &ka);
@@ -1453,11 +1369,7 @@ static CONST double tinytens[] = { 1e-16
 
  static int
 match
-#ifdef KR_headers
-	(sp, t) char **sp, *t;
-#else
 	(CONST char **sp, CONST char *t)
-#endif
 {
 	int c, d;
 	CONST char *s = *sp;
@@ -1475,11 +1387,7 @@ match
 #ifndef No_Hex_NaN
  static void
 hexnan
-#ifdef KR_headers
-	(rvp, sp) double *rvp; CONST char **sp;
-#else
-	(double *rvp, CONST char **sp)
-#endif
+	(U *rvp, CONST char **sp)
 {
 	ULong c, x[2];
 	CONST char *s;
@@ -1528,12 +1436,8 @@ hexnan
 #endif /* INFNAN_CHECK */
 
  double
-kjs_strtod
-#ifdef KR_headers
-	(s00, se) CONST char *s00; char **se;
-#else
+strtod
 	(CONST char *s00, char **se)
-#endif
 {
 #ifdef Avoid_Underflow
 	int scale;
@@ -1541,7 +1445,8 @@ kjs_strtod
 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
 		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
 	CONST char *s, *s0, *s1;
-	double aadj, aadj1, adj, rv, rv0;
+	double aadj, aadj1, adj;
+	U aadj2, rv, rv0;
 	Long L;
 	ULong y, z;
 	Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
@@ -2302,7 +2207,9 @@ kjs_strtod
 					aadj = z;
 					aadj1 = dsign ? aadj : -aadj;
 					}
-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
+				dval(aadj2) = aadj1;
+				word0(aadj2) += (2*P+1)*Exp_msk1 - y;
+				aadj1 = dval(aadj2);
 				}
 			adj = aadj1 * ulp(dval(rv));
 			dval(rv) += adj;
@@ -2419,11 +2326,7 @@ kjs_strtod
 
  static int
 quorem
-#ifdef KR_headers
-	(b, S) Bigint *b, *S;
-#else
 	(Bigint *b, Bigint *S)
-#endif
 {
 	int n;
 	ULong *bx, *bxe, q, *sx, *sxe;
@@ -2461,7 +2364,7 @@ quorem
 			carry = ys >> 32;
 			y = *bx - (ys & FFFFFFFF) - borrow;
 			borrow = y >> 32 & (ULong)1;
-			*bx++ = y & FFFFFFFF;
+			*bx++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 			si = *sx++;
@@ -2502,7 +2405,7 @@ quorem
 			carry = ys >> 32;
 			y = *bx - (ys & FFFFFFFF) - borrow;
 			borrow = y >> 32 & (ULong)1;
-			*bx++ = y & FFFFFFFF;
+			*bx++ = (ULong)y & FFFFFFFF;
 #else
 #ifdef Pack_32
 			si = *sx++;
@@ -2540,11 +2443,7 @@ quorem
 #endif
 
  static char *
-#ifdef KR_headers
-rv_alloc(i) int i;
-#else
 rv_alloc(int i)
-#endif
 {
 	int j, k, *r;
 
@@ -2563,11 +2462,7 @@ rv_alloc(int i)
 	}
 
  static char *
-#ifdef KR_headers
-nrv_alloc(s, rve, n) char *s, **rve; int n;
-#else
 nrv_alloc(CONST char *s, char **rve, int n)
-#endif
 {
 	char *rv, *t;
 
@@ -2585,11 +2480,7 @@ nrv_alloc(CONST char *s, char **rve, int
  */
 
  void
-#ifdef KR_headers
-kjs_freedtoa(s) char *s;
-#else
-kjs_freedtoa(char *s)
-#endif
+freedtoa(char *s)
 {
 	Bigint *b = (Bigint *)((int *)s - 1);
 	b->maxwds = 1 << (b->k = *(int*)b);
@@ -2635,13 +2526,8 @@ kjs_freedtoa(char *s)
  */
 
  char *
-kjs_dtoa
-#ifdef KR_headers
-	(d, mode, ndigits, decpt, sign, rve)
-	double d; int mode, ndigits, *decpt, *sign; char **rve;
-#else
-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#endif
+dtoa
+	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
 {
  /*	Arguments ndigits, decpt, sign are similar to those
 	of ecvt and fcvt; trailing zeros are suppressed from
@@ -2686,7 +2572,8 @@ kjs_dtoa
 	ULong x;
 #endif
 	Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
-	double d2, ds, eps;
+	U d, d2, eps;
+	double ds;
 	char *s, *s0;
 #ifdef Honor_FLT_ROUNDS
 	int rounding;
@@ -2697,11 +2584,12 @@ kjs_dtoa
 
 #ifndef MULTIPLE_THREADS
 	if (dtoa_result) {
-		kjs_freedtoa(dtoa_result);
+		freedtoa(dtoa_result);
 		dtoa_result = 0;
 		}
 #endif
 
+	dval(d) = dd;
 	if (word0(d) & Sign_bit) {
 		/* set sign for everything, including 0's and NaNs */
 		*sign = 1;
@@ -2966,7 +2854,8 @@ kjs_dtoa
 					if (dval(d) > 0.5 + dval(eps))
 						goto bump_up;
 					else if (dval(d) < 0.5 - dval(eps)) {
-						while(*--s == '0');
+						while(*--s == '0')
+							;
 						s++;
 						goto ret1;
 						}
@@ -3285,7 +3174,8 @@ kjs_dtoa
 #ifdef Honor_FLT_ROUNDS
 trimzeros:
 #endif
-		while(*--s == '0');
+		while(*--s == '0')
+			;
 		s++;
 		}
  ret:

kdelibs-3.5.10-kabc.patch:
 entrylist     |    2 ++
 field.src.cpp |   34 ++++++++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)

--- NEW FILE kdelibs-3.5.10-kabc.patch ---
--- kdelibs-3.5.10/kabc/scripts/field.src.cpp.orig	2009-12-09 18:51:15.000000000 +0100
+++ kdelibs-3.5.10/kabc/scripts/field.src.cpp	2009-12-09 18:51:54.000000000 +0100
@@ -36,7 +36,7 @@
                const QString &app = QString::null )
       : mFieldId( fieldId ), mCategory( category ), mLabel( label ),
         mKey( key ), mApp( app ) {}
-  
+
     enum FieldId
     {
       CustomField,
@@ -45,11 +45,11 @@
 
     int fieldId() { return mFieldId; }
     int category() { return mCategory; }
-    
+
     QString label() { return mLabel; }
     QString key() { return mKey; }
     QString app() { return mApp; }
-    
+
   private:
     int mFieldId;
     int mCategory;
@@ -184,6 +184,8 @@
       return a.phoneNumber( PhoneNumber::Pager ).number();
     case FieldImpl::HomeAddressStreet:
       return a.address( Address::Home ).street();
+    case FieldImpl::HomeAddressPostOfficeBox:
+      return a.address( Address::Home ).postOfficeBox();
     case FieldImpl::HomeAddressLocality:
       return a.address( Address::Home ).locality();
     case FieldImpl::HomeAddressRegion:
@@ -196,6 +198,8 @@
       return a.address( Address::Home ).label();
     case FieldImpl::BusinessAddressStreet:
       return a.address( Address::Work ).street();
+    case FieldImpl::BusinessAddressPostOfficeBox:
+      return a.address( Address::Work ).postOfficeBox();
     case FieldImpl::BusinessAddressLocality:
       return a.address( Address::Work ).locality();
     case FieldImpl::BusinessAddressRegion:
@@ -266,6 +270,13 @@
         a.insertAddress( address );
         return true;
       }
+    case FieldImpl::HomeAddressPostOfficeBox:
+      {
+        KABC::Address address = a.address( Address::Home );
+        address.setPostOfficeBox( value );
+        a.insertAddress( address );
+        return true;
+      }
     case FieldImpl::HomeAddressLocality:
       {
         KABC::Address address = a.address( Address::Home );
@@ -308,6 +319,13 @@
         a.insertAddress( address );
         return true;
       }
+    case FieldImpl::BusinessAddressPostOfficeBox:
+      {
+        KABC::Address address = a.address( Address::Work );
+        address.setPostOfficeBox( value );
+        a.insertAddress( address );
+        return true;
+      }
     case FieldImpl::BusinessAddressLocality:
       {
         KABC::Address address = a.address( Address::Work );
@@ -438,7 +456,7 @@
                         const Field::List &fields )
 {
   QValueList<int> fieldIds;
-  
+
   int custom = 0;
   Field::List::ConstIterator it;
   for( it = fields.begin(); it != fields.end(); ++it ) {
@@ -452,7 +470,7 @@
                        QString::number( custom++ ), customEntry );
     }
   }
-  
+
   cfg->writeEntry( identifier, fieldIds );
 }
 
@@ -460,7 +478,7 @@
 {
   KConfig *cfg = KGlobal::config();
   KConfigGroupSaver( cfg, "KABCFields" );
- 
+
   return restoreFields( cfg, identifier );
 }
 
@@ -485,7 +503,7 @@
     }
     fields.append( new Field( f ) );
   }
-  
+
   return fields;
 }
 
@@ -496,7 +514,7 @@
   if ( !sameId ) return false;
 
   if ( mImpl->fieldId() != FieldImpl::CustomField ) return true;
-  
+
   return mImpl->key() == field->mImpl->key();
 }
 
--- kdelibs-3.5.10/kabc/scripts/entrylist.orig	2009-12-09 18:48:40.000000000 +0100
+++ kdelibs-3.5.10/kabc/scripts/entrylist	2009-12-09 18:50:42.000000000 +0100
@@ -29,6 +29,7 @@
 
 #Address address
 LF,home address street,,QString,homeAddressStreet,Address|Personal
+LF,home address post office box,,QString,homeAddressPostOfficeBox,Address|Personal
 LF,home address city,,QString,homeAddressLocality,Address|Personal
 LF,home address state,,QString,homeAddressRegion,Address|Personal
 LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
@@ -36,6 +37,7 @@
 LF,home address label,,QString,homeAddressLabel,Address|Personal
 
 LF,business address street,,QString,businessAddressStreet,Address|Organization
+LF,business address post office box,,QString,businessAddressPostOfficeBox,Address|Organization
 LF,business address city,,QString,businessAddressLocality,Address|Organization
 LF,business address state,,QString,businessAddressRegion,Address|Organization
 LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- kdelibs3.spec	7 Dec 2009 15:19:30 -0000	1.65
+++ kdelibs3.spec	9 Dec 2009 18:05:01 -0000	1.66
@@ -81,6 +81,11 @@ Patch101: kde-3.5-libtool-shlibext.patch
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
 Patch105: kdelibs-3.5.10-ossl-1.x.patch
+Patch106: kdelibs-3.5.0-kio.patch
+Patch107: kdelibs-3.5.10-assert.patch
+Patch108: kdelibs-3.5.10-dtoa.patch
+Patch109: kdelibs-3.5.10-kabc.patch
+
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -242,6 +247,10 @@ format for easy browsing
 %patch101 -p1 -b .libtool-shlibext
 %patch104 -p1 -b .gcc44
 %patch105 -p1 -b .ossl-1.x
+%patch106 -p1 -b .kio
+%patch107 -p1 -b .assert
+%patch108 -p1 -b .alias
+%patch109 -p1 -b .kabc
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -577,6 +586,7 @@ touch --no-create %{_datadir}/icons/crys
 %changelog
 * Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
 - fix security issues in libltdl bundle within kdelibs CVE-2009-3736
+- backport upstream patches
 
 * Mon Nov  2 2009 Luk???? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428



From fabbione at fedoraproject.org  Wed Dec  9 18:06:28 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed,  9 Dec 2009 18:06:28 +0000 (UTC)
Subject: rpms/rgmanager/F-11 .cvsignore, 1.18, 1.19 rgmanager.spec, 1.48,
	1.49 sources, 1.27, 1.28
Message-ID: <20091209180628.73CB111C0264@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16020

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	23 Nov 2009 15:13:34 -0000	1.18
+++ .cvsignore	9 Dec 2009 18:06:28 -0000	1.19
@@ -1 +1 @@
-rgmanager-3.0.5.tar.gz
+rgmanager-3.0.6.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-11/rgmanager.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- rgmanager.spec	23 Nov 2009 15:13:34 -0000	1.48
+++ rgmanager.spec	9 Dec 2009 18:06:28 -0000	1.49
@@ -10,20 +10,17 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 Name: rgmanager
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/rgmanager-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## runtime
 
@@ -42,7 +39,7 @@ BuildRequires: clusterlib-devel >= 3.0.0
 BuildRequires: libxml2-devel ncurses-devel slang-devel
 
 %prep
-%setup -q -n rgmanager-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 %build
 ./configure \
@@ -87,6 +84,13 @@ fi
 %{_mandir}/man8/clu*
 
 %changelog
+* Mon Dec  7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release
+- spec file cleanup:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	23 Nov 2009 15:13:34 -0000	1.27
+++ sources	9 Dec 2009 18:06:28 -0000	1.28
@@ -1 +1 @@
-f50bebab00f6b0aa6a63ec2ea7f236e5  rgmanager-3.0.5.tar.gz
+a7e78b9f8e41c7d50c03e04dffcda7a2  rgmanager-3.0.6.tar.gz



From kdudka at fedoraproject.org  Wed Dec  9 18:06:57 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  9 Dec 2009 18:06:57 +0000 (UTC)
Subject: rpms/curl/F-12 curl.spec,1.128,1.129
Message-ID: <20091209180657.A60E011C0264@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16436

Modified Files:
	curl.spec 
Log Message:
- use different port numbers for 32bit and 64bit builds


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- curl.spec	8 Dec 2009 09:49:51 -0000	1.128
+++ curl.spec	9 Dec 2009 18:06:57 -0000	1.129
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -119,7 +119,9 @@ make %{?_smp_mflags}
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 cd tests
 make %{?_smp_mflags}
-./runtests.pl -a -p -v
+# use different port range for 32bit and 64bit build, thus make it possible
+# to run both in parallel on the same machine
+./runtests.pl -a -b89%{?__isa_bits} -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -178,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 09 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-5
+- use different port numbers for 32bit and 64bit builds
+
 * Tue Dec 08 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
 - avoid use of uninitialized value in lib/nss.c
 - make it possible to run test241



From dsd at fedoraproject.org  Wed Dec  9 18:08:44 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Wed,  9 Dec 2009 18:08:44 +0000 (UTC)
Subject: rpms/olpc-update/F-12 .cvsignore, 1.3, 1.4 olpc-update.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091209180844.C7C8911C0264@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-update/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17512

Modified Files:
	.cvsignore olpc-update.spec sources 
Log Message:
v2.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Aug 2009 13:57:12 -0000	1.3
+++ .cvsignore	9 Dec 2009 18:08:44 -0000	1.4
@@ -1 +1 @@
-olpc-update-2.20.tar.bz2
+olpc-update-2.21.tar.bz2


Index: olpc-update.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/F-12/olpc-update.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- olpc-update.spec	1 Aug 2009 13:57:12 -0000	1.3
+++ olpc-update.spec	9 Dec 2009 18:08:44 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		olpc-update
-Version:	2.20
+Version:	2.21
 Release:	1%{?dist}
 Summary:	OLPC system update tools
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 9 2009 Daniel Drake <dsd at laptop.org> - 2.21-1
+- version bump
+
 * Sat Aug  1 2009 Daniel Drake <dsd at laptop.org> - 2.20-1
 - version bump
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Aug 2009 13:57:12 -0000	1.3
+++ sources	9 Dec 2009 18:08:44 -0000	1.4
@@ -1 +1 @@
-07983705af32075332021ed325b50720  olpc-update-2.20.tar.bz2
+9b8cc2fd464e1d9e123bfab46f332e54  olpc-update-2.21.tar.bz2



From mschwendt at fedoraproject.org  Wed Dec  9 18:08:57 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  9 Dec 2009 18:08:57 +0000 (UTC)
Subject: rpms/audacity/F-12 .cvsignore, 1.12, 1.13 audacity.spec, 1.87,
	1.88 sources, 1.14, 1.15 audacity-1.3.8-gsocket-conflict.patch,
	1.2, NONE audacity-1.3.9-labelpopup.patch, 1.1,
	NONE audacity-1.3.9-labeltrack-crash.patch, 1.1, NONE
Message-ID: <20091209180857.5A51911C0264@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17649/F-12

Modified Files:
	.cvsignore audacity.spec sources 
Removed Files:
	audacity-1.3.8-gsocket-conflict.patch 
	audacity-1.3.9-labelpopup.patch 
	audacity-1.3.9-labeltrack-crash.patch 
Log Message:
* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
- Upgrade to 1.3.10-beta.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	5 Sep 2009 08:56:54 -0000	1.12
+++ .cvsignore	9 Dec 2009 18:08:56 -0000	1.13
@@ -1 +1 @@
-audacity-minsrc-1.3.9.tar.bz2
+audacity-minsrc-1.3.10.tar.bz2


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-12/audacity.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- audacity.spec	4 Dec 2009 13:47:37 -0000	1.87
+++ audacity.spec	9 Dec 2009 18:08:57 -0000	1.88
@@ -1,11 +1,11 @@
 # Compile options:
 # --with mp3          : enable mp3 support
 
-%define tartopdir audacity-src-1.3.9
+%define tartopdir audacity-src-1.3.10
 
 Name: audacity
-Version: 1.3.9
-Release: 0.5.beta%{?dist}
+Version: 1.3.10
+Release: 0.1.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -17,9 +17,6 @@ Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
-Patch3: audacity-1.3.8-gsocket-conflict.patch
-Patch4: audacity-1.3.9-labeltrack-crash.patch
-Patch5: audacity-1.3.9-labelpopup.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 Patch7: audacity-1.3.9-getmaxpeak.patch
 
@@ -70,9 +67,6 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%patch3 -p1 -b .gsocket-conflict
-%patch4 -p1 -b .labeltrack-crash
-%patch5 -p1 -b .labelpopup
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
@@ -152,6 +146,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
+- Upgrade to 1.3.10-beta.
+
 * Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.5.beta
 - Prevent race-condition segfault with Sound Activated Recording (#544125).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	5 Sep 2009 08:56:55 -0000	1.14
+++ sources	9 Dec 2009 18:08:57 -0000	1.15
@@ -1 +1 @@
-0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2
+ffa698188e2e8f48c499268a478c579c  audacity-minsrc-1.3.10.tar.bz2


--- audacity-1.3.8-gsocket-conflict.patch DELETED ---


--- audacity-1.3.9-labelpopup.patch DELETED ---


--- audacity-1.3.9-labeltrack-crash.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Dec  9 18:08:58 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  9 Dec 2009 18:08:58 +0000 (UTC)
Subject: rpms/audacity/F-11 .cvsignore, 1.11, 1.12 audacity.desktop, 1.4,
	1.5 audacity.spec, 1.79, 1.80 sources, 1.13,
	1.14 audacity-1.3.8-gsocket-conflict.patch, 1.1,
	NONE audacity-1.3.9-labelpopup.patch, 1.1,
	NONE audacity-1.3.9-labeltrack-crash.patch, 1.1, NONE
Message-ID: <20091209180858.128CA11C0264@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17649/F-11

Modified Files:
	.cvsignore audacity.desktop audacity.spec sources 
Removed Files:
	audacity-1.3.8-gsocket-conflict.patch 
	audacity-1.3.9-labelpopup.patch 
	audacity-1.3.9-labeltrack-crash.patch 
Log Message:
* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
- Upgrade to 1.3.10-beta.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	5 Sep 2009 13:25:04 -0000	1.11
+++ .cvsignore	9 Dec 2009 18:08:57 -0000	1.12
@@ -1 +1 @@
-audacity-minsrc-1.3.9.tar.bz2
+audacity-minsrc-1.3.10.tar.bz2


Index: audacity.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/audacity.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- audacity.desktop	15 May 2008 20:44:14 -0000	1.4
+++ audacity.desktop	9 Dec 2009 18:08:57 -0000	1.5
@@ -7,5 +7,5 @@ Icon=audacity
 Terminal=false
 Comment=A multitrack audio editor
 MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
-Categories=AudioVideo;GNOME;
+Categories=AudioVideo;GNOME;Sequencer;X-Jack;AudioVideoEditing;
 StartupWMClass=Audacity


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/audacity.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- audacity.spec	23 Sep 2009 20:35:40 -0000	1.79
+++ audacity.spec	9 Dec 2009 18:08:57 -0000	1.80
@@ -1,11 +1,11 @@
 # Compile options:
 # --with mp3          : enable mp3 support
 
-%define tartopdir audacity-src-1.3.9
+%define tartopdir audacity-src-1.3.10
 
 Name: audacity
-Version: 1.3.9
-Release: 0.3.beta%{?dist}
+Version: 1.3.10
+Release: 0.1.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -17,10 +17,8 @@ Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
-Patch3: audacity-1.3.8-gsocket-conflict.patch
-Patch4: audacity-1.3.9-labeltrack-crash.patch
-Patch5: audacity-1.3.9-labelpopup.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
+Patch7: audacity-1.3.9-getmaxpeak.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -69,12 +67,10 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%patch3 -p1 -b .gsocket-conflict
-%patch4 -p1 -b .labeltrack-crash
-%patch5 -p1 -b .labelpopup
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
+%patch7 -p1 -b .getmaxpeak
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -150,6 +146,15 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
+- Upgrade to 1.3.10-beta.
+
+* Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.5.beta
+- Prevent race-condition segfault with Sound Activated Recording (#544125).
+
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.3.9-0.4.beta
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.3.beta
 - add patch to fix LabelTrack popup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	5 Sep 2009 13:25:06 -0000	1.13
+++ sources	9 Dec 2009 18:08:57 -0000	1.14
@@ -1 +1 @@
-0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2
+ffa698188e2e8f48c499268a478c579c  audacity-minsrc-1.3.10.tar.bz2


--- audacity-1.3.8-gsocket-conflict.patch DELETED ---


--- audacity-1.3.9-labelpopup.patch DELETED ---


--- audacity-1.3.9-labeltrack-crash.patch DELETED ---



From sgrubb at fedoraproject.org  Wed Dec  9 18:10:05 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed,  9 Dec 2009 18:10:05 +0000 (UTC)
Subject: rpms/aide/devel aide-0.13.1-libgrypt-init.patch, 1.1, 1.2 aide.spec,
	1.35, 1.36
Message-ID: <20091209181005.17EDB11C03F6@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/aide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18448

Modified Files:
	aide-0.13.1-libgrypt-init.patch aide.spec 
Log Message:
* Wed Dec 09 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-14
- Revise patch for Initialize libgcrypt correctly (#530485)


aide-0.13.1-libgrypt-init.patch:
 doc/aide.1.in    |    1 +
 include/report.h |    1 +
 src/md.c         |    9 +++++++++
 3 files changed, 11 insertions(+)

Index: aide-0.13.1-libgrypt-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide-0.13.1-libgrypt-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- aide-0.13.1-libgrypt-init.patch	7 Nov 2009 14:22:40 -0000	1.1
+++ aide-0.13.1-libgrypt-init.patch	9 Dec 2009 18:10:04 -0000	1.2
@@ -1,6 +1,28 @@
-diff -up aide-0.13.1/src/md.c.gcryptinit aide-0.13.1/src/md.c
---- aide-0.13.1/src/md.c.gcryptinit	2009-10-23 04:48:19.000000000 +0200
-+++ aide-0.13.1/src/md.c	2009-10-23 04:53:09.000000000 +0200
+diff -urp aide-0.13.1.orig/doc/aide.1.in aide-0.13.1/doc/aide.1.in
+--- aide-0.13.1.orig/doc/aide.1.in	2009-12-01 12:23:10.000000000 -0500
++++ aide-0.13.1/doc/aide.1.in	2009-12-01 12:28:14.000000000 -0500
+@@ -67,6 +67,7 @@ conditions:
+ .IP "16 Unimplemented function error"
+ .IP "17 Invalid configureline error"
+ .IP "18 IO error"
++.IP "19 Version mismatch error"
+ .PP
+ .SH NOTES
+ Please note that due to mmap issues, aide cannot be terminated with
+diff -urp aide-0.13.1.orig/include/report.h aide-0.13.1/include/report.h
+--- aide-0.13.1.orig/include/report.h	2009-12-01 12:23:10.000000000 -0500
++++ aide-0.13.1/include/report.h	2009-12-01 12:27:43.000000000 -0500
+@@ -31,6 +31,7 @@
+ #define UNIMPLEMENTED_FUNCTION_ERROR 16
+ #define INVALID_CONFIGURELINE_ERROR 17
+ #define IO_ERROR 18
++#define VERSION_MISMATCH_ERROR 19
+ 
+ /* Errorcodes */
+ #define HASH_ALGO_ERROR 30
+diff -urp aide-0.13.1.orig/src/md.c aide-0.13.1/src/md.c
+--- aide-0.13.1.orig/src/md.c	2009-12-01 12:23:10.000000000 -0500
++++ aide-0.13.1/src/md.c	2009-12-01 12:27:04.000000000 -0500
 @@ -201,6 +201,15 @@ int init_md(struct md_container* md) {
  #endif 
  #ifdef WITH_GCRYPT
@@ -11,7 +33,7 @@ diff -up aide-0.13.1/src/md.c.gcryptinit
 +  	 */
 +  	if(!gcry_check_version(GCRYPT_VERSION)) {
 +		error(0,"libgcrypt version mismatch\n");
-+		exit(1);
++		exit(VERSION_MISMATCH_ERROR);
 +	}
 +	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
  	if(gcry_md_open(&md->mdh,0,0)!=GPG_ERR_NO_ERROR){


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- aide.spec	9 Nov 2009 18:07:06 -0000	1.35
+++ aide.spec	9 Dec 2009 18:10:04 -0000	1.36
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.13.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 09 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-14
+- Revise patch for Initialize libgcrypt correctly (#530485)
+
 * Sat Nov 07 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-13
 - Initialize libgcrypt correctly (#530485)
 



From mschwendt at fedoraproject.org  Wed Dec  9 18:10:20 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  9 Dec 2009 18:10:20 +0000 (UTC)
Subject: rpms/audacity/F-12 README,1.27,NONE
Message-ID: <20091209181020.22CFA11C03F6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18612

Removed Files:
	README 
Log Message:



--- README DELETED ---



From lkundrak at fedoraproject.org  Wed Dec  9 18:15:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:15:19 +0000 (UTC)
Subject: File xmlbeans-2.4.0-src.tgz uploaded to lookaside cache by lkundrak
Message-ID: <20091209181519.6099810F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xmlbeans:

64412ab1f19d90112335062bfa90f7c8  xmlbeans-2.4.0-src.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:15:29 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:15:29 +0000 (UTC)
Subject: File groovy-src-1.6.7.zip uploaded to lookaside cache by lkundrak
Message-ID: <20091209181529.D61BE10F87D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for groovy:

f63532d75560f101bf1f40b7a3760228  groovy-src-1.6.7.zip



From lkundrak at fedoraproject.org  Wed Dec  9 18:18:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:18:09 +0000 (UTC)
Subject: rpms/groovy/F-11 groovy-1.6.5-build.patch, NONE, 1.1 groovy-script, 
	NONE, 1.1 groovy-starter.conf, NONE, 1.1 groovy.desktop, NONE,
	1.1 groovy.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091209181809.C404D11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/groovy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22316/F-11

Modified Files:
	sources 
Added Files:
	groovy-1.6.5-build.patch groovy-script groovy-starter.conf 
	groovy.desktop groovy.spec 
Log Message:
Import groovy

groovy-1.6.5-build.patch:
 build.xml |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE groovy-1.6.5-build.patch ---
This fixes build on openSUSE 11.2

ant seems to produce incorrect parameter list to javac.

  [groovyc] org.codehaus.groovy.control.MultipleCompilationErrorsException:
startup failed, deprecation: deprecation (No such file or directory)

diff -up groovy-1.6.5/build.xml.japierdole groovy-1.6.5/build.xml
--- groovy-1.6.5/build.xml.japierdole	2009-11-16 10:14:52.336014552 +0100
+++ groovy-1.6.5/build.xml	2009-11-16 10:17:19.785011792 +0100
@@ -190,7 +190,8 @@ $Date: 2009-09-12 02:39:39 +0200 (Sa, 12
                 <pathelement path="${mainClassesDirectory}"/>
                 <path refid="compilePath"/>
             </classpath>
-            <javac deprecation="on" debug="yes" source="1.5" target="1.5"/>
+            <!-- javac deprecation="on" debug="yes" source="1.5" target="1.5"/-->
+            <javac debug="yes"/>
         </groovyc>
     </target>
 


--- NEW FILE groovy-script ---
#!/bin/sh
# 
# Groovy script
# Lubomir Rintel <lkundrak at v3.sk>

# Packagers: When updating the package be sure to check
# all this against against the upstream binary package

# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then 
  . /usr/share/java-utils/java-functions
else
  echo "Can't find functions library, aborting"
  exit 1
fi

# Configuration
SCRIPT_PATH=$0
PROGNAME=$(basename $SCRIPT_PATH)
GROOVY_CONF=/etc/groovy-starter.conf
TOOLS_JAR=$(build-classpath ../jvm/java/lib/tools)
STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter
MAIN_CLASS=$STARTER_MAIN_CLASS

# Wrappers
[ $PROGNAME = grape ]		&& CLASS=org.codehaus.groovy.tools.GrapeMain
[ $PROGNAME = groovy ]		&& CLASS=groovy.ui.GroovyMain
[ $PROGNAME = groovyc ]		&& CLASS=org.codehaus.groovy.tools.FileSystemCompiler
[ $PROGNAME = groovyConsole ]	&& CLASS=groovy.ui.Console
[ $PROGNAME = java2groovy ]	&& CLASS=org.codehaus.groovy.antlr.java.Java2GroovyMain
[ $PROGNAME = groovysh ]	&& CLASS=org.codehaus.groovy.tools.shell.Main
[ $PROGNAME = groovysh ]	&& [ "$OLDSHELL" ] && CLASS=groovy.ui.InteractiveShell

# Load system-wide configuration
if [ -f /etc/groovy.conf ]; then
  . /etc/groovy.conf
fi

# Load user configuration
[ -f "$HOME/.groovyrc" ] && . "$HOME/.groovyrc"
[ -f "$HOME/.groovy/startup" ] && . "$HOME/.groovy/startup"

# Bail out if there's nothing to run
if [ -z "$CLASS" ]
then
	echo "Can not determine main class for '$PROGNAME'" >&2
	exit 1
fi

# JVM options
GROOVY_OPTS="$GROOVY_OPTS -Dscript.name=$SCRIPT_PATH"
GROOVY_OPTS="$GROOVY_OPTS -Dprogram.name=$PROGNAME"
GROOVY_OPTS="$GROOVY_OPTS -Dgroovy.starter.conf=$GROOVY_CONF"
GROOVY_OPTS="$GROOVY_OPTS -Dgroovy.home=$GROOVY_HOME"
GROOVY_OPTS="$GROOVY_OPTS -Dtools.jar=$TOOLS_JAR"

# Do not forget about RPM dependencies!
BASE_JARS="$BASE_JARS ant"
BASE_JARS="$BASE_JARS ant/ant-junit"
BASE_JARS="$BASE_JARS ant-launcher"
BASE_JARS="$BASE_JARS antlr"
BASE_JARS="$BASE_JARS asm2/asm2"
BASE_JARS="$BASE_JARS asm2/asm2-analysis"
BASE_JARS="$BASE_JARS asm2/asm2-tree"
BASE_JARS="$BASE_JARS asm2/asm2-util"
BASE_JARS="$BASE_JARS bsf"
BASE_JARS="$BASE_JARS commons-cli"
BASE_JARS="$BASE_JARS commons-logging"
BASE_JARS="$BASE_JARS groovy"
BASE_JARS="$BASE_JARS ivy"
BASE_JARS="$BASE_JARS jline"
BASE_JARS="$BASE_JARS jsp_2_0_api"
BASE_JARS="$BASE_JARS junit"
BASE_JARS="$BASE_JARS servlet_2_4_api"
BASE_JARS="$BASE_JARS xstream"

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS $GROOVY_OPTS

# Let's start
run --conf "$GROOVY_CONF" --main "$CLASS" "$@"


***** Error reading new file: [Errno 2] No such file or directory: 'groovy-starter.conf'

--- NEW FILE groovy.desktop ---
[Desktop Entry]
Version=1.0
Name=Groovy Console
GenericName=Groovy Console
Comment=Evaluate scripts in Groovy language
Type=Application
Categories=Development;IDE;Java;
Exec=groovyConsole %F
TryExec=groovyConsole
StartupNotify=true
Icon=groovy


--- NEW FILE groovy.spec ---
# Note to packagers: When rebasing this to a later version, do not
# forget to ensure that sources 1 and 2 are up to date as well as
# the Requires list.

Name:           groovy
Version:        1.6.7
Release:        1%{?dist}
Summary:        Agile dynamic language for the Java Platform

Group:          Development/Languages
License:        ASL 2.0
URL:            http://groovy.codehaus.org/
Source0:        http://dist.groovy.codehaus.org/distributions/%{name}-src-%{version}.zip
Source1:        groovy-script
Source2:        groovy-starter.conf
Source3:        groovy.desktop
Patch0:         groovy-1.6.5-build.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch

BuildRequires:  ant
BuildRequires:  antlr
BuildRequires:  ant-antlr
BuildRequires:  asm2
BuildRequires:  bsf
BuildRequires:  apache-ivy
BuildRequires:  jline
BuildRequires:  jsp_2_0_api
BuildRequires:  junit
BuildRequires:  servlet_2_4_api
BuildRequires:  xstream
BuildRequires:  java-devel >= 1.6
BuildRequires:  desktop-file-utils
BuildRequires:  jpackage-utils
BuildRequires:  jakarta-commons-cli
BuildRequires:  unzip
Requires:       jpackage-utils

# The are all runtime dependencies of the script
# TODO: Think of splitting them into a separate subpackage
Requires:       ant
Requires:       ant-junit
Requires:       antlr
Requires:       asm2
Requires:       bsf
Requires:       jakarta-commons-cli
Requires:       jakarta-commons-logging
Requires:       ivy
Requires:       jline
Requires:       jsp_2_0_api
Requires:       junit
Requires:       servlet_2_4_api
Requires:       xstream


%description
Groovy is an agile and dynamic language for the Java Virtual Machine,
built upon Java with features inspired by languages like Python, Ruby and
Smalltalk.  It seamlessly integrates with all existing Java objects and
libraries and compiles straight to Java bytecode so you can use it anywhere
you can use Java.


%package javadoc
Summary:        API Documentation for %{name}
Group:          Development/Tools
Requires:       %{name} = %{version}-%{release}

%description javadoc
JavaDoc documentation for %{name}


%prep
%setup -q
%patch0 -p1 -b .japierdole


%build
mkdir -p target/lib/{compile,tools}

# Construct classpath
build-jar-repository target/lib/compile servlet_2_4_api jsp_2_0_api \
        asm2/asm2-tree asm2/asm2 asm2/asm2-util \
        asm2/asm2-analysis antlr ant/ant-antlr antlr \
        bsf jline xstream ant junit ivy commons-cli

# Build
# TODO: Build at least tests, maybe examples
ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
        createJars javadoc


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -p -m644 target/dist/groovy.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Startup scripts
install -d $RPM_BUILD_ROOT%{_bindir}
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/groovy
for TOOL in grape groovyc groovyConsole java2groovy groovysh
do
        ln $RPM_BUILD_ROOT%{_bindir}/groovy \
                $RPM_BUILD_ROOT%{_bindir}/$TOOL
done

# Configuration
install -d $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m644 %{SOURCE2} \
        $RPM_BUILD_ROOT%{_sysconfdir}/groovy-starter.conf

# Desktop icon
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -p -m644 src/main/groovy/ui/ConsoleIcon.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps/groovy.png
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        %{SOURCE3}

# API Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
find target -type d |xargs chmod 755
cp -rp target/html/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_javadir}/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%config(noreplace) %{_sysconfdir}/*
%doc LICENSE.txt NOTICE.txt README.txt 


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*


%changelog
* Wed Dec 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.7-1
- New upstream version
- Make Jochen happy

* Thu Dec 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.6-2
- Build with OpenJDK

* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.6-1
- Bump to 1.6.6
- Don't mistakenly require itself (Jochen Schmitt, #534168#c3)

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.5-2
- Hopefully fix mockbuild

* Mon Nov 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.5-1
- Initial Fedora packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/groovy/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:54:44 -0000	1.1
+++ sources	9 Dec 2009 18:18:09 -0000	1.2
@@ -0,0 +1 @@
+f63532d75560f101bf1f40b7a3760228  groovy-src-1.6.7.zip



From lkundrak at fedoraproject.org  Wed Dec  9 18:18:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:18:09 +0000 (UTC)
Subject: rpms/groovy/EL-5 groovy-1.6.5-build.patch, NONE, 1.1 groovy-script, 
	NONE, 1.1 groovy-starter.conf, NONE, 1.1 groovy.desktop, NONE,
	1.1 groovy.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091209181809.871C511C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/groovy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22316/EL-5

Modified Files:
	sources 
Added Files:
	groovy-1.6.5-build.patch groovy-script groovy-starter.conf 
	groovy.desktop groovy.spec 
Log Message:
Import groovy

groovy-1.6.5-build.patch:
 build.xml |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE groovy-1.6.5-build.patch ---
This fixes build on openSUSE 11.2

ant seems to produce incorrect parameter list to javac.

  [groovyc] org.codehaus.groovy.control.MultipleCompilationErrorsException:
startup failed, deprecation: deprecation (No such file or directory)

diff -up groovy-1.6.5/build.xml.japierdole groovy-1.6.5/build.xml
--- groovy-1.6.5/build.xml.japierdole	2009-11-16 10:14:52.336014552 +0100
+++ groovy-1.6.5/build.xml	2009-11-16 10:17:19.785011792 +0100
@@ -190,7 +190,8 @@ $Date: 2009-09-12 02:39:39 +0200 (Sa, 12
                 <pathelement path="${mainClassesDirectory}"/>
                 <path refid="compilePath"/>
             </classpath>
-            <javac deprecation="on" debug="yes" source="1.5" target="1.5"/>
+            <!-- javac deprecation="on" debug="yes" source="1.5" target="1.5"/-->
+            <javac debug="yes"/>
         </groovyc>
     </target>
 


--- NEW FILE groovy-script ---
#!/bin/sh
# 
# Groovy script
# Lubomir Rintel <lkundrak at v3.sk>

# Packagers: When updating the package be sure to check
# all this against against the upstream binary package

# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then 
  . /usr/share/java-utils/java-functions
else
  echo "Can't find functions library, aborting"
  exit 1
fi

# Configuration
SCRIPT_PATH=$0
PROGNAME=$(basename $SCRIPT_PATH)
GROOVY_CONF=/etc/groovy-starter.conf
TOOLS_JAR=$(build-classpath ../jvm/java/lib/tools)
STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter
MAIN_CLASS=$STARTER_MAIN_CLASS

# Wrappers
[ $PROGNAME = grape ]		&& CLASS=org.codehaus.groovy.tools.GrapeMain
[ $PROGNAME = groovy ]		&& CLASS=groovy.ui.GroovyMain
[ $PROGNAME = groovyc ]		&& CLASS=org.codehaus.groovy.tools.FileSystemCompiler
[ $PROGNAME = groovyConsole ]	&& CLASS=groovy.ui.Console
[ $PROGNAME = java2groovy ]	&& CLASS=org.codehaus.groovy.antlr.java.Java2GroovyMain
[ $PROGNAME = groovysh ]	&& CLASS=org.codehaus.groovy.tools.shell.Main
[ $PROGNAME = groovysh ]	&& [ "$OLDSHELL" ] && CLASS=groovy.ui.InteractiveShell

# Load system-wide configuration
if [ -f /etc/groovy.conf ]; then
  . /etc/groovy.conf
fi

# Load user configuration
[ -f "$HOME/.groovyrc" ] && . "$HOME/.groovyrc"
[ -f "$HOME/.groovy/startup" ] && . "$HOME/.groovy/startup"

# Bail out if there's nothing to run
if [ -z "$CLASS" ]
then
	echo "Can not determine main class for '$PROGNAME'" >&2
	exit 1
fi

# JVM options
GROOVY_OPTS="$GROOVY_OPTS -Dscript.name=$SCRIPT_PATH"
GROOVY_OPTS="$GROOVY_OPTS -Dprogram.name=$PROGNAME"
GROOVY_OPTS="$GROOVY_OPTS -Dgroovy.starter.conf=$GROOVY_CONF"
GROOVY_OPTS="$GROOVY_OPTS -Dgroovy.home=$GROOVY_HOME"
GROOVY_OPTS="$GROOVY_OPTS -Dtools.jar=$TOOLS_JAR"

# Do not forget about RPM dependencies!
BASE_JARS="$BASE_JARS ant"
BASE_JARS="$BASE_JARS ant/ant-junit"
BASE_JARS="$BASE_JARS ant-launcher"
BASE_JARS="$BASE_JARS antlr"
BASE_JARS="$BASE_JARS asm2/asm2"
BASE_JARS="$BASE_JARS asm2/asm2-analysis"
BASE_JARS="$BASE_JARS asm2/asm2-tree"
BASE_JARS="$BASE_JARS asm2/asm2-util"
BASE_JARS="$BASE_JARS bsf"
BASE_JARS="$BASE_JARS commons-cli"
BASE_JARS="$BASE_JARS commons-logging"
BASE_JARS="$BASE_JARS groovy"
BASE_JARS="$BASE_JARS ivy"
BASE_JARS="$BASE_JARS jline"
BASE_JARS="$BASE_JARS jsp_2_0_api"
BASE_JARS="$BASE_JARS junit"
BASE_JARS="$BASE_JARS servlet_2_4_api"
BASE_JARS="$BASE_JARS xstream"

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS $GROOVY_OPTS

# Let's start
run --conf "$GROOVY_CONF" --main "$CLASS" "$@"


***** Error reading new file: [Errno 2] No such file or directory: 'groovy-starter.conf'

--- NEW FILE groovy.desktop ---
[Desktop Entry]
Version=1.0
Name=Groovy Console
GenericName=Groovy Console
Comment=Evaluate scripts in Groovy language
Type=Application
Categories=Development;IDE;Java;
Exec=groovyConsole %F
TryExec=groovyConsole
StartupNotify=true
Icon=groovy


--- NEW FILE groovy.spec ---
# Note to packagers: When rebasing this to a later version, do not
# forget to ensure that sources 1 and 2 are up to date as well as
# the Requires list.

Name:           groovy
Version:        1.6.7
Release:        1%{?dist}
Summary:        Agile dynamic language for the Java Platform

Group:          Development/Languages
License:        ASL 2.0
URL:            http://groovy.codehaus.org/
Source0:        http://dist.groovy.codehaus.org/distributions/%{name}-src-%{version}.zip
Source1:        groovy-script
Source2:        groovy-starter.conf
Source3:        groovy.desktop
Patch0:         groovy-1.6.5-build.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch

BuildRequires:  ant
BuildRequires:  antlr
BuildRequires:  ant-antlr
BuildRequires:  asm2
BuildRequires:  bsf
BuildRequires:  apache-ivy
BuildRequires:  jline
BuildRequires:  jsp_2_0_api
BuildRequires:  junit
BuildRequires:  servlet_2_4_api
BuildRequires:  xstream
BuildRequires:  java-devel >= 1.6
BuildRequires:  desktop-file-utils
BuildRequires:  jpackage-utils
BuildRequires:  jakarta-commons-cli
BuildRequires:  unzip
Requires:       jpackage-utils

# The are all runtime dependencies of the script
# TODO: Think of splitting them into a separate subpackage
Requires:       ant
Requires:       ant-junit
Requires:       antlr
Requires:       asm2
Requires:       bsf
Requires:       jakarta-commons-cli
Requires:       jakarta-commons-logging
Requires:       ivy
Requires:       jline
Requires:       jsp_2_0_api
Requires:       junit
Requires:       servlet_2_4_api
Requires:       xstream


%description
Groovy is an agile and dynamic language for the Java Virtual Machine,
built upon Java with features inspired by languages like Python, Ruby and
Smalltalk.  It seamlessly integrates with all existing Java objects and
libraries and compiles straight to Java bytecode so you can use it anywhere
you can use Java.


%package javadoc
Summary:        API Documentation for %{name}
Group:          Development/Tools
Requires:       %{name} = %{version}-%{release}

%description javadoc
JavaDoc documentation for %{name}


%prep
%setup -q
%patch0 -p1 -b .japierdole


%build
mkdir -p target/lib/{compile,tools}

# Construct classpath
build-jar-repository target/lib/compile servlet_2_4_api jsp_2_0_api \
        asm2/asm2-tree asm2/asm2 asm2/asm2-util \
        asm2/asm2-analysis antlr ant/ant-antlr antlr \
        bsf jline xstream ant junit ivy commons-cli

# Build
# TODO: Build at least tests, maybe examples
ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
        createJars javadoc


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -p -m644 target/dist/groovy.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Startup scripts
install -d $RPM_BUILD_ROOT%{_bindir}
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/groovy
for TOOL in grape groovyc groovyConsole java2groovy groovysh
do
        ln $RPM_BUILD_ROOT%{_bindir}/groovy \
                $RPM_BUILD_ROOT%{_bindir}/$TOOL
done

# Configuration
install -d $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m644 %{SOURCE2} \
        $RPM_BUILD_ROOT%{_sysconfdir}/groovy-starter.conf

# Desktop icon
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -p -m644 src/main/groovy/ui/ConsoleIcon.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps/groovy.png
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        %{SOURCE3}

# API Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
find target -type d |xargs chmod 755
cp -rp target/html/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_javadir}/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%config(noreplace) %{_sysconfdir}/*
%doc LICENSE.txt NOTICE.txt README.txt 


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*


%changelog
* Wed Dec 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.7-1
- New upstream version
- Make Jochen happy

* Thu Dec 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.6-2
- Build with OpenJDK

* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.6-1
- Bump to 1.6.6
- Don't mistakenly require itself (Jochen Schmitt, #534168#c3)

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.5-2
- Hopefully fix mockbuild

* Mon Nov 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.5-1
- Initial Fedora packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/groovy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:54:44 -0000	1.1
+++ sources	9 Dec 2009 18:18:09 -0000	1.2
@@ -0,0 +1 @@
+f63532d75560f101bf1f40b7a3760228  groovy-src-1.6.7.zip



From lkundrak at fedoraproject.org  Wed Dec  9 18:18:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:18:13 +0000 (UTC)
Subject: rpms/xmlbeans/EL-5 xmlbeans-2.4.0-nodownload.patch, NONE,
	1.1 xmlbeans.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091209181813.D273811C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22380/EL-5

Modified Files:
	sources 
Added Files:
	xmlbeans-2.4.0-nodownload.patch xmlbeans.spec 
Log Message:
Import xmlbeans

xmlbeans-2.4.0-nodownload.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE xmlbeans-2.4.0-nodownload.patch ---
Do not foolishly attempt to download jars from the internets.

diff -up xmlbeans-2.4.0/build.xml.nodownload xmlbeans-2.4.0/build.xml
--- xmlbeans-2.4.0/build.xml.nodownload	2008-06-10 15:42:37.000000000 +0200
+++ xmlbeans-2.4.0/build.xml	2009-11-03 15:53:11.000000000 +0100
@@ -112,7 +112,7 @@
             http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-7-3j.zip
             http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip
         -->
-        <get dest="external/lib/saxonb9-0-0-4j.zip"
+        <!-- get dest="external/lib/saxonb9-0-0-4j.zip"
             src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-4j.zip"
             verbose="true" usetimestamp="true" ignoreerrors="true"/>
         <unzip src="external/lib/saxonb9-0-0-4j.zip" dest="external/lib/">
@@ -120,7 +120,7 @@
                 <include name="saxon9.jar"/>
                 <include name="saxon9-dom.jar"/>
             </patternset>
-        </unzip>
+        </unzip-->
 
         <copy file="external/lib/saxon9.jar" tofile="build/lib/saxon9.jar"/>
         <!-- saxon9-dom.jar is used to register DOMObjectModel -->
@@ -147,14 +147,14 @@
         </condition>
     </target>
 
-    <target name="jsr173_1.0.jars"
+    <target name="jsr173_1.0.jars"><!--
             depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted"
             unless="jsr173_1.0.jars.exist">
         <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" >
             <patternset>
                 <include name="jsr173_1.0_api.jar"/>
             </patternset>
-        </unjar>
+        </unjar!-->
 
         <!-- copy jsr173 API jar and license files to build/lib -->
         <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/>


--- NEW FILE xmlbeans.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%bcond_without bootstrap

Name:           xmlbeans
Version:        2.4.0
Release:        5%{?dist}%{?bootstrap:.boot}
Summary:        XML-Java binding tool
Group:          Development/Libraries
URL:            http://xmlbeans.apache.org/
Source0:        http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz
Patch0:         xmlbeans-2.4.0-nodownload.patch
License:        ASL 2.0
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %without bootstrap
BuildRequires:  xmlbeans
%endif
BuildRequires:  jpackage-utils >= 0:1.5
BuildRequires:  ant >= 0:1.6, ant-junit, ant-contrib, junit
BuildRequires:  ant >= 0:1.6, ant-junit, junit
BuildRequires:  xml-commons-resolver >= 0:1.1
BuildRequires:  bea-stax-api
BuildRequires:  saxon >= 8
BuildRequires:  java-devel-openjdk
Requires:       jpackage-utils >= 0:1.6

BuildArch:      noarch

%description
XMLBeans is a tool that allows you to access the full power 
of XML in a Java friendly way. It is an XML-Java binding tool. 
The idea is that you can take advantage the richness and 
features of XML and XML Schema and have these features mapped 
as naturally as possible to the equivalent Java language and 
typing constructs. XMLBeans uses XML Schema to compile Java 
interfaces and classes that you can then use to access and 
modify XML instance data. Using XMLBeans is similar to using 
any other Java interface/class, you will see things like 
getFoo or setFoo just as you would expect when working with 
Java. While a major use of XMLBeans is to access your XML 
instance data with strongly typed Java classes there are also 
API's that allow you access to the full XML infoset (XMLBeans 
keeps full XML Infoset fidelity) as well as to allow you to 
reflect into the XML schema itself through an XML Schema 
Object model.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description javadoc
%{summary}.


%package manual
Summary:        Documents for %{name}
Group:          Documentation

%description manual
%{summary}.


%package scripts
Summary:        Scripts for %{name}
Group:          Development/Tools
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description scripts
%{summary}.


%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .nodownload


%build
# Piccolo and jam are rebuilt from source and bundled with xbean
# ant clean.jars leaves some dangling jars around, do not use it
find . \( -name '*.jar' -o -name '*.zip' \) \
        -not -name 'piccolo*.jar' -not -name 'jam*.jar' \
        %{?with_bootstrap:-not -name 'oldxbean.jar' } \
        -print -delete

# Replace bundled libraries
mkdir -p build/lib
ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar
ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar
ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar
ln -sf $(build-classpath saxon) external/lib/saxon9.jar
ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar

# Fix CRLF
sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css

# Build
ant default docs


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic-%{version}.jar
install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar
install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar
ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar
ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar
ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar

# bin
install -d -m 0755 $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/dumpxsb   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/inst2xsd  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/scomp     $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/sdownload $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/sfactor   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/svalidate $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/validate  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xpretty   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xsd2inst  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xsdtree   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xstc      $RPM_BUILD_ROOT%{_bindir}


# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf build/docs/reference

# manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# fix line endings
cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r > tmp
mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%doc LICENSE.txt NOTICE.txt  README.txt


%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}


%files manual
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}


%files scripts
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/*


%changelog
* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-5
- Fix up saxon dependency
- Drop epoch
- Drop gcj

* Tue Nov 03 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-4
- Update to 2.4.0
- Tidy up a bit for Fedora

* Wed Sep 06 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-3jpp
- BuildRequire saxon8 instead of saxonb8
- (B)Require bea-stax-api instead of bea-stax
- Patch maven-plugin's project.xml for bea-stax-api instead of stax-bea-api
- Patch XbeanXQuery to saxon 8.7
- Add gcj_support option
- Add post/postun Requires for javadoc

* Wed Feb 01 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-2jpp
- Install plugin to /usr/share/maven/repository/JPP/plugins

* Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-1jpp
- Upgrade to 2.1.0
- Add -maven-plugin subpackage

* Fri Jun 03 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0.4-2jpp
- Add missing build requires for jaxen

* Fri Jun 03 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0.4-1jpp
- Upgrade to 1.0.4

* Thu Sep 30 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0.3-1jpp
- First JPackage build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:53:35 -0000	1.1
+++ sources	9 Dec 2009 18:18:13 -0000	1.2
@@ -0,0 +1 @@
+64412ab1f19d90112335062bfa90f7c8  xmlbeans-2.4.0-src.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:18:10 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:18:10 +0000 (UTC)
Subject: rpms/groovy/devel groovy-1.6.5-build.patch, NONE, 1.1 groovy-script,
	NONE, 1.1 groovy-starter.conf, NONE, 1.1 groovy.desktop, NONE,
	1.1 groovy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091209181810.B233811C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/groovy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22316/devel

Modified Files:
	.cvsignore sources 
Added Files:
	groovy-1.6.5-build.patch groovy-script groovy-starter.conf 
	groovy.desktop groovy.spec 
Log Message:
Import groovy

groovy-1.6.5-build.patch:
 build.xml |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE groovy-1.6.5-build.patch ---
This fixes build on openSUSE 11.2

ant seems to produce incorrect parameter list to javac.

  [groovyc] org.codehaus.groovy.control.MultipleCompilationErrorsException:
startup failed, deprecation: deprecation (No such file or directory)

diff -up groovy-1.6.5/build.xml.japierdole groovy-1.6.5/build.xml
--- groovy-1.6.5/build.xml.japierdole	2009-11-16 10:14:52.336014552 +0100
+++ groovy-1.6.5/build.xml	2009-11-16 10:17:19.785011792 +0100
@@ -190,7 +190,8 @@ $Date: 2009-09-12 02:39:39 +0200 (Sa, 12
                 <pathelement path="${mainClassesDirectory}"/>
                 <path refid="compilePath"/>
             </classpath>
-            <javac deprecation="on" debug="yes" source="1.5" target="1.5"/>
+            <!-- javac deprecation="on" debug="yes" source="1.5" target="1.5"/-->
+            <javac debug="yes"/>
         </groovyc>
     </target>
 


--- NEW FILE groovy-script ---
#!/bin/sh
# 
# Groovy script
# Lubomir Rintel <lkundrak at v3.sk>

# Packagers: When updating the package be sure to check
# all this against against the upstream binary package

# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then 
  . /usr/share/java-utils/java-functions
else
  echo "Can't find functions library, aborting"
  exit 1
fi

# Configuration
SCRIPT_PATH=$0
PROGNAME=$(basename $SCRIPT_PATH)
GROOVY_CONF=/etc/groovy-starter.conf
TOOLS_JAR=$(build-classpath ../jvm/java/lib/tools)
STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter
MAIN_CLASS=$STARTER_MAIN_CLASS

# Wrappers
[ $PROGNAME = grape ]		&& CLASS=org.codehaus.groovy.tools.GrapeMain
[ $PROGNAME = groovy ]		&& CLASS=groovy.ui.GroovyMain
[ $PROGNAME = groovyc ]		&& CLASS=org.codehaus.groovy.tools.FileSystemCompiler
[ $PROGNAME = groovyConsole ]	&& CLASS=groovy.ui.Console
[ $PROGNAME = java2groovy ]	&& CLASS=org.codehaus.groovy.antlr.java.Java2GroovyMain
[ $PROGNAME = groovysh ]	&& CLASS=org.codehaus.groovy.tools.shell.Main
[ $PROGNAME = groovysh ]	&& [ "$OLDSHELL" ] && CLASS=groovy.ui.InteractiveShell

# Load system-wide configuration
if [ -f /etc/groovy.conf ]; then
  . /etc/groovy.conf
fi

# Load user configuration
[ -f "$HOME/.groovyrc" ] && . "$HOME/.groovyrc"
[ -f "$HOME/.groovy/startup" ] && . "$HOME/.groovy/startup"

# Bail out if there's nothing to run
if [ -z "$CLASS" ]
then
	echo "Can not determine main class for '$PROGNAME'" >&2
	exit 1
fi

# JVM options
GROOVY_OPTS="$GROOVY_OPTS -Dscript.name=$SCRIPT_PATH"
GROOVY_OPTS="$GROOVY_OPTS -Dprogram.name=$PROGNAME"
GROOVY_OPTS="$GROOVY_OPTS -Dgroovy.starter.conf=$GROOVY_CONF"
GROOVY_OPTS="$GROOVY_OPTS -Dgroovy.home=$GROOVY_HOME"
GROOVY_OPTS="$GROOVY_OPTS -Dtools.jar=$TOOLS_JAR"

# Do not forget about RPM dependencies!
BASE_JARS="$BASE_JARS ant"
BASE_JARS="$BASE_JARS ant/ant-junit"
BASE_JARS="$BASE_JARS ant-launcher"
BASE_JARS="$BASE_JARS antlr"
BASE_JARS="$BASE_JARS asm2/asm2"
BASE_JARS="$BASE_JARS asm2/asm2-analysis"
BASE_JARS="$BASE_JARS asm2/asm2-tree"
BASE_JARS="$BASE_JARS asm2/asm2-util"
BASE_JARS="$BASE_JARS bsf"
BASE_JARS="$BASE_JARS commons-cli"
BASE_JARS="$BASE_JARS commons-logging"
BASE_JARS="$BASE_JARS groovy"
BASE_JARS="$BASE_JARS ivy"
BASE_JARS="$BASE_JARS jline"
BASE_JARS="$BASE_JARS jsp_2_0_api"
BASE_JARS="$BASE_JARS junit"
BASE_JARS="$BASE_JARS servlet_2_4_api"
BASE_JARS="$BASE_JARS xstream"

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS $GROOVY_OPTS

# Let's start
run --conf "$GROOVY_CONF" --main "$CLASS" "$@"


***** Error reading new file: [Errno 2] No such file or directory: 'groovy-starter.conf'

--- NEW FILE groovy.desktop ---
[Desktop Entry]
Version=1.0
Name=Groovy Console
GenericName=Groovy Console
Comment=Evaluate scripts in Groovy language
Type=Application
Categories=Development;IDE;Java;
Exec=groovyConsole %F
TryExec=groovyConsole
StartupNotify=true
Icon=groovy


--- NEW FILE groovy.spec ---
# Note to packagers: When rebasing this to a later version, do not
# forget to ensure that sources 1 and 2 are up to date as well as
# the Requires list.

Name:           groovy
Version:        1.6.7
Release:        1%{?dist}
Summary:        Agile dynamic language for the Java Platform

Group:          Development/Languages
License:        ASL 2.0
URL:            http://groovy.codehaus.org/
Source0:        http://dist.groovy.codehaus.org/distributions/%{name}-src-%{version}.zip
Source1:        groovy-script
Source2:        groovy-starter.conf
Source3:        groovy.desktop
Patch0:         groovy-1.6.5-build.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch

BuildRequires:  ant
BuildRequires:  antlr
BuildRequires:  ant-antlr
BuildRequires:  asm2
BuildRequires:  bsf
BuildRequires:  apache-ivy
BuildRequires:  jline
BuildRequires:  jsp_2_0_api
BuildRequires:  junit
BuildRequires:  servlet_2_4_api
BuildRequires:  xstream
BuildRequires:  java-devel >= 1.6
BuildRequires:  desktop-file-utils
BuildRequires:  jpackage-utils
BuildRequires:  jakarta-commons-cli
BuildRequires:  unzip
Requires:       jpackage-utils

# The are all runtime dependencies of the script
# TODO: Think of splitting them into a separate subpackage
Requires:       ant
Requires:       ant-junit
Requires:       antlr
Requires:       asm2
Requires:       bsf
Requires:       jakarta-commons-cli
Requires:       jakarta-commons-logging
Requires:       ivy
Requires:       jline
Requires:       jsp_2_0_api
Requires:       junit
Requires:       servlet_2_4_api
Requires:       xstream


%description
Groovy is an agile and dynamic language for the Java Virtual Machine,
built upon Java with features inspired by languages like Python, Ruby and
Smalltalk.  It seamlessly integrates with all existing Java objects and
libraries and compiles straight to Java bytecode so you can use it anywhere
you can use Java.


%package javadoc
Summary:        API Documentation for %{name}
Group:          Development/Tools
Requires:       %{name} = %{version}-%{release}

%description javadoc
JavaDoc documentation for %{name}


%prep
%setup -q
%patch0 -p1 -b .japierdole


%build
mkdir -p target/lib/{compile,tools}

# Construct classpath
build-jar-repository target/lib/compile servlet_2_4_api jsp_2_0_api \
        asm2/asm2-tree asm2/asm2 asm2/asm2-util \
        asm2/asm2-analysis antlr ant/ant-antlr antlr \
        bsf jline xstream ant junit ivy commons-cli

# Build
# TODO: Build at least tests, maybe examples
ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
        createJars javadoc


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -p -m644 target/dist/groovy.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Startup scripts
install -d $RPM_BUILD_ROOT%{_bindir}
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/groovy
for TOOL in grape groovyc groovyConsole java2groovy groovysh
do
        ln $RPM_BUILD_ROOT%{_bindir}/groovy \
                $RPM_BUILD_ROOT%{_bindir}/$TOOL
done

# Configuration
install -d $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m644 %{SOURCE2} \
        $RPM_BUILD_ROOT%{_sysconfdir}/groovy-starter.conf

# Desktop icon
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -p -m644 src/main/groovy/ui/ConsoleIcon.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps/groovy.png
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        %{SOURCE3}

# API Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
find target -type d |xargs chmod 755
cp -rp target/html/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_javadir}/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%config(noreplace) %{_sysconfdir}/*
%doc LICENSE.txt NOTICE.txt README.txt 


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*


%changelog
* Wed Dec 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.7-1
- New upstream version
- Make Jochen happy

* Thu Dec 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.6-2
- Build with OpenJDK

* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.6-1
- Bump to 1.6.6
- Don't mistakenly require itself (Jochen Schmitt, #534168#c3)

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.5-2
- Hopefully fix mockbuild

* Mon Nov 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.5-1
- Initial Fedora packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/groovy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:54:44 -0000	1.1
+++ .cvsignore	9 Dec 2009 18:18:10 -0000	1.2
@@ -0,0 +1 @@
+groovy-src-1.6.7.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/groovy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:54:44 -0000	1.1
+++ sources	9 Dec 2009 18:18:10 -0000	1.2
@@ -0,0 +1 @@
+f63532d75560f101bf1f40b7a3760228  groovy-src-1.6.7.zip



From lkundrak at fedoraproject.org  Wed Dec  9 18:18:10 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:18:10 +0000 (UTC)
Subject: rpms/groovy/F-12 groovy-1.6.5-build.patch, NONE, 1.1 groovy-script, 
	NONE, 1.1 groovy-starter.conf, NONE, 1.1 groovy.desktop, NONE,
	1.1 groovy.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091209181810.34B5A11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/groovy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22316/F-12

Modified Files:
	sources 
Added Files:
	groovy-1.6.5-build.patch groovy-script groovy-starter.conf 
	groovy.desktop groovy.spec 
Log Message:
Import groovy

groovy-1.6.5-build.patch:
 build.xml |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE groovy-1.6.5-build.patch ---
This fixes build on openSUSE 11.2

ant seems to produce incorrect parameter list to javac.

  [groovyc] org.codehaus.groovy.control.MultipleCompilationErrorsException:
startup failed, deprecation: deprecation (No such file or directory)

diff -up groovy-1.6.5/build.xml.japierdole groovy-1.6.5/build.xml
--- groovy-1.6.5/build.xml.japierdole	2009-11-16 10:14:52.336014552 +0100
+++ groovy-1.6.5/build.xml	2009-11-16 10:17:19.785011792 +0100
@@ -190,7 +190,8 @@ $Date: 2009-09-12 02:39:39 +0200 (Sa, 12
                 <pathelement path="${mainClassesDirectory}"/>
                 <path refid="compilePath"/>
             </classpath>
-            <javac deprecation="on" debug="yes" source="1.5" target="1.5"/>
+            <!-- javac deprecation="on" debug="yes" source="1.5" target="1.5"/-->
+            <javac debug="yes"/>
         </groovyc>
     </target>
 


--- NEW FILE groovy-script ---
#!/bin/sh
# 
# Groovy script
# Lubomir Rintel <lkundrak at v3.sk>

# Packagers: When updating the package be sure to check
# all this against against the upstream binary package

# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then 
  . /usr/share/java-utils/java-functions
else
  echo "Can't find functions library, aborting"
  exit 1
fi

# Configuration
SCRIPT_PATH=$0
PROGNAME=$(basename $SCRIPT_PATH)
GROOVY_CONF=/etc/groovy-starter.conf
TOOLS_JAR=$(build-classpath ../jvm/java/lib/tools)
STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter
MAIN_CLASS=$STARTER_MAIN_CLASS

# Wrappers
[ $PROGNAME = grape ]		&& CLASS=org.codehaus.groovy.tools.GrapeMain
[ $PROGNAME = groovy ]		&& CLASS=groovy.ui.GroovyMain
[ $PROGNAME = groovyc ]		&& CLASS=org.codehaus.groovy.tools.FileSystemCompiler
[ $PROGNAME = groovyConsole ]	&& CLASS=groovy.ui.Console
[ $PROGNAME = java2groovy ]	&& CLASS=org.codehaus.groovy.antlr.java.Java2GroovyMain
[ $PROGNAME = groovysh ]	&& CLASS=org.codehaus.groovy.tools.shell.Main
[ $PROGNAME = groovysh ]	&& [ "$OLDSHELL" ] && CLASS=groovy.ui.InteractiveShell

# Load system-wide configuration
if [ -f /etc/groovy.conf ]; then
  . /etc/groovy.conf
fi

# Load user configuration
[ -f "$HOME/.groovyrc" ] && . "$HOME/.groovyrc"
[ -f "$HOME/.groovy/startup" ] && . "$HOME/.groovy/startup"

# Bail out if there's nothing to run
if [ -z "$CLASS" ]
then
	echo "Can not determine main class for '$PROGNAME'" >&2
	exit 1
fi

# JVM options
GROOVY_OPTS="$GROOVY_OPTS -Dscript.name=$SCRIPT_PATH"
GROOVY_OPTS="$GROOVY_OPTS -Dprogram.name=$PROGNAME"
GROOVY_OPTS="$GROOVY_OPTS -Dgroovy.starter.conf=$GROOVY_CONF"
GROOVY_OPTS="$GROOVY_OPTS -Dgroovy.home=$GROOVY_HOME"
GROOVY_OPTS="$GROOVY_OPTS -Dtools.jar=$TOOLS_JAR"

# Do not forget about RPM dependencies!
BASE_JARS="$BASE_JARS ant"
BASE_JARS="$BASE_JARS ant/ant-junit"
BASE_JARS="$BASE_JARS ant-launcher"
BASE_JARS="$BASE_JARS antlr"
BASE_JARS="$BASE_JARS asm2/asm2"
BASE_JARS="$BASE_JARS asm2/asm2-analysis"
BASE_JARS="$BASE_JARS asm2/asm2-tree"
BASE_JARS="$BASE_JARS asm2/asm2-util"
BASE_JARS="$BASE_JARS bsf"
BASE_JARS="$BASE_JARS commons-cli"
BASE_JARS="$BASE_JARS commons-logging"
BASE_JARS="$BASE_JARS groovy"
BASE_JARS="$BASE_JARS ivy"
BASE_JARS="$BASE_JARS jline"
BASE_JARS="$BASE_JARS jsp_2_0_api"
BASE_JARS="$BASE_JARS junit"
BASE_JARS="$BASE_JARS servlet_2_4_api"
BASE_JARS="$BASE_JARS xstream"

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS $GROOVY_OPTS

# Let's start
run --conf "$GROOVY_CONF" --main "$CLASS" "$@"


***** Error reading new file: [Errno 2] No such file or directory: 'groovy-starter.conf'

--- NEW FILE groovy.desktop ---
[Desktop Entry]
Version=1.0
Name=Groovy Console
GenericName=Groovy Console
Comment=Evaluate scripts in Groovy language
Type=Application
Categories=Development;IDE;Java;
Exec=groovyConsole %F
TryExec=groovyConsole
StartupNotify=true
Icon=groovy


--- NEW FILE groovy.spec ---
# Note to packagers: When rebasing this to a later version, do not
# forget to ensure that sources 1 and 2 are up to date as well as
# the Requires list.

Name:           groovy
Version:        1.6.7
Release:        1%{?dist}
Summary:        Agile dynamic language for the Java Platform

Group:          Development/Languages
License:        ASL 2.0
URL:            http://groovy.codehaus.org/
Source0:        http://dist.groovy.codehaus.org/distributions/%{name}-src-%{version}.zip
Source1:        groovy-script
Source2:        groovy-starter.conf
Source3:        groovy.desktop
Patch0:         groovy-1.6.5-build.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch

BuildRequires:  ant
BuildRequires:  antlr
BuildRequires:  ant-antlr
BuildRequires:  asm2
BuildRequires:  bsf
BuildRequires:  apache-ivy
BuildRequires:  jline
BuildRequires:  jsp_2_0_api
BuildRequires:  junit
BuildRequires:  servlet_2_4_api
BuildRequires:  xstream
BuildRequires:  java-devel >= 1.6
BuildRequires:  desktop-file-utils
BuildRequires:  jpackage-utils
BuildRequires:  jakarta-commons-cli
BuildRequires:  unzip
Requires:       jpackage-utils

# The are all runtime dependencies of the script
# TODO: Think of splitting them into a separate subpackage
Requires:       ant
Requires:       ant-junit
Requires:       antlr
Requires:       asm2
Requires:       bsf
Requires:       jakarta-commons-cli
Requires:       jakarta-commons-logging
Requires:       ivy
Requires:       jline
Requires:       jsp_2_0_api
Requires:       junit
Requires:       servlet_2_4_api
Requires:       xstream


%description
Groovy is an agile and dynamic language for the Java Virtual Machine,
built upon Java with features inspired by languages like Python, Ruby and
Smalltalk.  It seamlessly integrates with all existing Java objects and
libraries and compiles straight to Java bytecode so you can use it anywhere
you can use Java.


%package javadoc
Summary:        API Documentation for %{name}
Group:          Development/Tools
Requires:       %{name} = %{version}-%{release}

%description javadoc
JavaDoc documentation for %{name}


%prep
%setup -q
%patch0 -p1 -b .japierdole


%build
mkdir -p target/lib/{compile,tools}

# Construct classpath
build-jar-repository target/lib/compile servlet_2_4_api jsp_2_0_api \
        asm2/asm2-tree asm2/asm2 asm2/asm2-util \
        asm2/asm2-analysis antlr ant/ant-antlr antlr \
        bsf jline xstream ant junit ivy commons-cli

# Build
# TODO: Build at least tests, maybe examples
ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
        createJars javadoc


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -p -m644 target/dist/groovy.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# Startup scripts
install -d $RPM_BUILD_ROOT%{_bindir}
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/groovy
for TOOL in grape groovyc groovyConsole java2groovy groovysh
do
        ln $RPM_BUILD_ROOT%{_bindir}/groovy \
                $RPM_BUILD_ROOT%{_bindir}/$TOOL
done

# Configuration
install -d $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m644 %{SOURCE2} \
        $RPM_BUILD_ROOT%{_sysconfdir}/groovy-starter.conf

# Desktop icon
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -p -m644 src/main/groovy/ui/ConsoleIcon.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps/groovy.png
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        %{SOURCE3}

# API Documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
find target -type d |xargs chmod 755
cp -rp target/html/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_javadir}/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%config(noreplace) %{_sysconfdir}/*
%doc LICENSE.txt NOTICE.txt README.txt 


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*


%changelog
* Wed Dec 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.7-1
- New upstream version
- Make Jochen happy

* Thu Dec 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.6-2
- Build with OpenJDK

* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.6-1
- Bump to 1.6.6
- Don't mistakenly require itself (Jochen Schmitt, #534168#c3)

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.5-2
- Hopefully fix mockbuild

* Mon Nov 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.5-1
- Initial Fedora packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/groovy/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:54:44 -0000	1.1
+++ sources	9 Dec 2009 18:18:10 -0000	1.2
@@ -0,0 +1 @@
+f63532d75560f101bf1f40b7a3760228  groovy-src-1.6.7.zip



From lkundrak at fedoraproject.org  Wed Dec  9 18:18:14 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:18:14 +0000 (UTC)
Subject: rpms/xmlbeans/F-11 xmlbeans-2.4.0-nodownload.patch, NONE,
	1.1 xmlbeans.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091209181814.37E7611C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22380/F-11

Modified Files:
	sources 
Added Files:
	xmlbeans-2.4.0-nodownload.patch xmlbeans.spec 
Log Message:
Import xmlbeans

xmlbeans-2.4.0-nodownload.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE xmlbeans-2.4.0-nodownload.patch ---
Do not foolishly attempt to download jars from the internets.

diff -up xmlbeans-2.4.0/build.xml.nodownload xmlbeans-2.4.0/build.xml
--- xmlbeans-2.4.0/build.xml.nodownload	2008-06-10 15:42:37.000000000 +0200
+++ xmlbeans-2.4.0/build.xml	2009-11-03 15:53:11.000000000 +0100
@@ -112,7 +112,7 @@
             http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-7-3j.zip
             http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip
         -->
-        <get dest="external/lib/saxonb9-0-0-4j.zip"
+        <!-- get dest="external/lib/saxonb9-0-0-4j.zip"
             src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-4j.zip"
             verbose="true" usetimestamp="true" ignoreerrors="true"/>
         <unzip src="external/lib/saxonb9-0-0-4j.zip" dest="external/lib/">
@@ -120,7 +120,7 @@
                 <include name="saxon9.jar"/>
                 <include name="saxon9-dom.jar"/>
             </patternset>
-        </unzip>
+        </unzip-->
 
         <copy file="external/lib/saxon9.jar" tofile="build/lib/saxon9.jar"/>
         <!-- saxon9-dom.jar is used to register DOMObjectModel -->
@@ -147,14 +147,14 @@
         </condition>
     </target>
 
-    <target name="jsr173_1.0.jars"
+    <target name="jsr173_1.0.jars"><!--
             depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted"
             unless="jsr173_1.0.jars.exist">
         <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" >
             <patternset>
                 <include name="jsr173_1.0_api.jar"/>
             </patternset>
-        </unjar>
+        </unjar!-->
 
         <!-- copy jsr173 API jar and license files to build/lib -->
         <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/>


--- NEW FILE xmlbeans.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%bcond_without bootstrap

Name:           xmlbeans
Version:        2.4.0
Release:        5%{?dist}%{?bootstrap:.boot}
Summary:        XML-Java binding tool
Group:          Development/Libraries
URL:            http://xmlbeans.apache.org/
Source0:        http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz
Patch0:         xmlbeans-2.4.0-nodownload.patch
License:        ASL 2.0
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %without bootstrap
BuildRequires:  xmlbeans
%endif
BuildRequires:  jpackage-utils >= 0:1.5
BuildRequires:  ant >= 0:1.6, ant-junit, ant-contrib, junit
BuildRequires:  ant >= 0:1.6, ant-junit, junit
BuildRequires:  xml-commons-resolver >= 0:1.1
BuildRequires:  bea-stax-api
BuildRequires:  saxon >= 8
BuildRequires:  java-devel-openjdk
Requires:       jpackage-utils >= 0:1.6

BuildArch:      noarch

%description
XMLBeans is a tool that allows you to access the full power 
of XML in a Java friendly way. It is an XML-Java binding tool. 
The idea is that you can take advantage the richness and 
features of XML and XML Schema and have these features mapped 
as naturally as possible to the equivalent Java language and 
typing constructs. XMLBeans uses XML Schema to compile Java 
interfaces and classes that you can then use to access and 
modify XML instance data. Using XMLBeans is similar to using 
any other Java interface/class, you will see things like 
getFoo or setFoo just as you would expect when working with 
Java. While a major use of XMLBeans is to access your XML 
instance data with strongly typed Java classes there are also 
API's that allow you access to the full XML infoset (XMLBeans 
keeps full XML Infoset fidelity) as well as to allow you to 
reflect into the XML schema itself through an XML Schema 
Object model.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description javadoc
%{summary}.


%package manual
Summary:        Documents for %{name}
Group:          Documentation

%description manual
%{summary}.


%package scripts
Summary:        Scripts for %{name}
Group:          Development/Tools
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description scripts
%{summary}.


%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .nodownload


%build
# Piccolo and jam are rebuilt from source and bundled with xbean
# ant clean.jars leaves some dangling jars around, do not use it
find . \( -name '*.jar' -o -name '*.zip' \) \
        -not -name 'piccolo*.jar' -not -name 'jam*.jar' \
        %{?with_bootstrap:-not -name 'oldxbean.jar' } \
        -print -delete

# Replace bundled libraries
mkdir -p build/lib
ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar
ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar
ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar
ln -sf $(build-classpath saxon) external/lib/saxon9.jar
ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar

# Fix CRLF
sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css

# Build
ant default docs


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic-%{version}.jar
install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar
install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar
ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar
ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar
ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar

# bin
install -d -m 0755 $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/dumpxsb   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/inst2xsd  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/scomp     $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/sdownload $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/sfactor   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/svalidate $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/validate  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xpretty   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xsd2inst  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xsdtree   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xstc      $RPM_BUILD_ROOT%{_bindir}


# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf build/docs/reference

# manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# fix line endings
cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r > tmp
mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%doc LICENSE.txt NOTICE.txt  README.txt


%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}


%files manual
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}


%files scripts
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/*


%changelog
* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-5
- Fix up saxon dependency
- Drop epoch
- Drop gcj

* Tue Nov 03 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-4
- Update to 2.4.0
- Tidy up a bit for Fedora

* Wed Sep 06 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-3jpp
- BuildRequire saxon8 instead of saxonb8
- (B)Require bea-stax-api instead of bea-stax
- Patch maven-plugin's project.xml for bea-stax-api instead of stax-bea-api
- Patch XbeanXQuery to saxon 8.7
- Add gcj_support option
- Add post/postun Requires for javadoc

* Wed Feb 01 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-2jpp
- Install plugin to /usr/share/maven/repository/JPP/plugins

* Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-1jpp
- Upgrade to 2.1.0
- Add -maven-plugin subpackage

* Fri Jun 03 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0.4-2jpp
- Add missing build requires for jaxen

* Fri Jun 03 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0.4-1jpp
- Upgrade to 1.0.4

* Thu Sep 30 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0.3-1jpp
- First JPackage build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:53:35 -0000	1.1
+++ sources	9 Dec 2009 18:18:13 -0000	1.2
@@ -0,0 +1 @@
+64412ab1f19d90112335062bfa90f7c8  xmlbeans-2.4.0-src.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:18:14 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:18:14 +0000 (UTC)
Subject: rpms/xmlbeans/F-12 xmlbeans-2.4.0-nodownload.patch, NONE,
	1.1 xmlbeans.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091209181814.7DF8611C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22380/F-12

Modified Files:
	sources 
Added Files:
	xmlbeans-2.4.0-nodownload.patch xmlbeans.spec 
Log Message:
Import xmlbeans

xmlbeans-2.4.0-nodownload.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE xmlbeans-2.4.0-nodownload.patch ---
Do not foolishly attempt to download jars from the internets.

diff -up xmlbeans-2.4.0/build.xml.nodownload xmlbeans-2.4.0/build.xml
--- xmlbeans-2.4.0/build.xml.nodownload	2008-06-10 15:42:37.000000000 +0200
+++ xmlbeans-2.4.0/build.xml	2009-11-03 15:53:11.000000000 +0100
@@ -112,7 +112,7 @@
             http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-7-3j.zip
             http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip
         -->
-        <get dest="external/lib/saxonb9-0-0-4j.zip"
+        <!-- get dest="external/lib/saxonb9-0-0-4j.zip"
             src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-4j.zip"
             verbose="true" usetimestamp="true" ignoreerrors="true"/>
         <unzip src="external/lib/saxonb9-0-0-4j.zip" dest="external/lib/">
@@ -120,7 +120,7 @@
                 <include name="saxon9.jar"/>
                 <include name="saxon9-dom.jar"/>
             </patternset>
-        </unzip>
+        </unzip-->
 
         <copy file="external/lib/saxon9.jar" tofile="build/lib/saxon9.jar"/>
         <!-- saxon9-dom.jar is used to register DOMObjectModel -->
@@ -147,14 +147,14 @@
         </condition>
     </target>
 
-    <target name="jsr173_1.0.jars"
+    <target name="jsr173_1.0.jars"><!--
             depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted"
             unless="jsr173_1.0.jars.exist">
         <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" >
             <patternset>
                 <include name="jsr173_1.0_api.jar"/>
             </patternset>
-        </unjar>
+        </unjar!-->
 
         <!-- copy jsr173 API jar and license files to build/lib -->
         <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/>


--- NEW FILE xmlbeans.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%bcond_without bootstrap

Name:           xmlbeans
Version:        2.4.0
Release:        5%{?dist}%{?bootstrap:.boot}
Summary:        XML-Java binding tool
Group:          Development/Libraries
URL:            http://xmlbeans.apache.org/
Source0:        http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz
Patch0:         xmlbeans-2.4.0-nodownload.patch
License:        ASL 2.0
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %without bootstrap
BuildRequires:  xmlbeans
%endif
BuildRequires:  jpackage-utils >= 0:1.5
BuildRequires:  ant >= 0:1.6, ant-junit, ant-contrib, junit
BuildRequires:  ant >= 0:1.6, ant-junit, junit
BuildRequires:  xml-commons-resolver >= 0:1.1
BuildRequires:  bea-stax-api
BuildRequires:  saxon >= 8
BuildRequires:  java-devel-openjdk
Requires:       jpackage-utils >= 0:1.6

BuildArch:      noarch

%description
XMLBeans is a tool that allows you to access the full power 
of XML in a Java friendly way. It is an XML-Java binding tool. 
The idea is that you can take advantage the richness and 
features of XML and XML Schema and have these features mapped 
as naturally as possible to the equivalent Java language and 
typing constructs. XMLBeans uses XML Schema to compile Java 
interfaces and classes that you can then use to access and 
modify XML instance data. Using XMLBeans is similar to using 
any other Java interface/class, you will see things like 
getFoo or setFoo just as you would expect when working with 
Java. While a major use of XMLBeans is to access your XML 
instance data with strongly typed Java classes there are also 
API's that allow you access to the full XML infoset (XMLBeans 
keeps full XML Infoset fidelity) as well as to allow you to 
reflect into the XML schema itself through an XML Schema 
Object model.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description javadoc
%{summary}.


%package manual
Summary:        Documents for %{name}
Group:          Documentation

%description manual
%{summary}.


%package scripts
Summary:        Scripts for %{name}
Group:          Development/Tools
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description scripts
%{summary}.


%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .nodownload


%build
# Piccolo and jam are rebuilt from source and bundled with xbean
# ant clean.jars leaves some dangling jars around, do not use it
find . \( -name '*.jar' -o -name '*.zip' \) \
        -not -name 'piccolo*.jar' -not -name 'jam*.jar' \
        %{?with_bootstrap:-not -name 'oldxbean.jar' } \
        -print -delete

# Replace bundled libraries
mkdir -p build/lib
ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar
ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar
ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar
ln -sf $(build-classpath saxon) external/lib/saxon9.jar
ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar

# Fix CRLF
sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css

# Build
ant default docs


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic-%{version}.jar
install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar
install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar
ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar
ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar
ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar

# bin
install -d -m 0755 $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/dumpxsb   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/inst2xsd  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/scomp     $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/sdownload $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/sfactor   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/svalidate $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/validate  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xpretty   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xsd2inst  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xsdtree   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xstc      $RPM_BUILD_ROOT%{_bindir}


# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf build/docs/reference

# manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# fix line endings
cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r > tmp
mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%doc LICENSE.txt NOTICE.txt  README.txt


%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}


%files manual
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}


%files scripts
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/*


%changelog
* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-5
- Fix up saxon dependency
- Drop epoch
- Drop gcj

* Tue Nov 03 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-4
- Update to 2.4.0
- Tidy up a bit for Fedora

* Wed Sep 06 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-3jpp
- BuildRequire saxon8 instead of saxonb8
- (B)Require bea-stax-api instead of bea-stax
- Patch maven-plugin's project.xml for bea-stax-api instead of stax-bea-api
- Patch XbeanXQuery to saxon 8.7
- Add gcj_support option
- Add post/postun Requires for javadoc

* Wed Feb 01 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-2jpp
- Install plugin to /usr/share/maven/repository/JPP/plugins

* Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-1jpp
- Upgrade to 2.1.0
- Add -maven-plugin subpackage

* Fri Jun 03 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0.4-2jpp
- Add missing build requires for jaxen

* Fri Jun 03 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0.4-1jpp
- Upgrade to 1.0.4

* Thu Sep 30 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0.3-1jpp
- First JPackage build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:53:35 -0000	1.1
+++ sources	9 Dec 2009 18:18:14 -0000	1.2
@@ -0,0 +1 @@
+64412ab1f19d90112335062bfa90f7c8  xmlbeans-2.4.0-src.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:18:14 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:18:14 +0000 (UTC)
Subject: rpms/xmlbeans/devel xmlbeans-2.4.0-nodownload.patch, NONE,
	1.1 xmlbeans.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091209181814.D0D7E11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22380/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xmlbeans-2.4.0-nodownload.patch xmlbeans.spec 
Log Message:
Import xmlbeans

xmlbeans-2.4.0-nodownload.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE xmlbeans-2.4.0-nodownload.patch ---
Do not foolishly attempt to download jars from the internets.

diff -up xmlbeans-2.4.0/build.xml.nodownload xmlbeans-2.4.0/build.xml
--- xmlbeans-2.4.0/build.xml.nodownload	2008-06-10 15:42:37.000000000 +0200
+++ xmlbeans-2.4.0/build.xml	2009-11-03 15:53:11.000000000 +0100
@@ -112,7 +112,7 @@
             http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-7-3j.zip
             http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip
         -->
-        <get dest="external/lib/saxonb9-0-0-4j.zip"
+        <!-- get dest="external/lib/saxonb9-0-0-4j.zip"
             src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-4j.zip"
             verbose="true" usetimestamp="true" ignoreerrors="true"/>
         <unzip src="external/lib/saxonb9-0-0-4j.zip" dest="external/lib/">
@@ -120,7 +120,7 @@
                 <include name="saxon9.jar"/>
                 <include name="saxon9-dom.jar"/>
             </patternset>
-        </unzip>
+        </unzip-->
 
         <copy file="external/lib/saxon9.jar" tofile="build/lib/saxon9.jar"/>
         <!-- saxon9-dom.jar is used to register DOMObjectModel -->
@@ -147,14 +147,14 @@
         </condition>
     </target>
 
-    <target name="jsr173_1.0.jars"
+    <target name="jsr173_1.0.jars"><!--
             depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted"
             unless="jsr173_1.0.jars.exist">
         <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" >
             <patternset>
                 <include name="jsr173_1.0_api.jar"/>
             </patternset>
-        </unjar>
+        </unjar!-->
 
         <!-- copy jsr173 API jar and license files to build/lib -->
         <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/>


--- NEW FILE xmlbeans.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%bcond_without bootstrap

Name:           xmlbeans
Version:        2.4.0
Release:        5%{?dist}%{?bootstrap:.boot}
Summary:        XML-Java binding tool
Group:          Development/Libraries
URL:            http://xmlbeans.apache.org/
Source0:        http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz
Patch0:         xmlbeans-2.4.0-nodownload.patch
License:        ASL 2.0
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %without bootstrap
BuildRequires:  xmlbeans
%endif
BuildRequires:  jpackage-utils >= 0:1.5
BuildRequires:  ant >= 0:1.6, ant-junit, ant-contrib, junit
BuildRequires:  ant >= 0:1.6, ant-junit, junit
BuildRequires:  xml-commons-resolver >= 0:1.1
BuildRequires:  bea-stax-api
BuildRequires:  saxon >= 8
BuildRequires:  java-devel-openjdk
Requires:       jpackage-utils >= 0:1.6

BuildArch:      noarch

%description
XMLBeans is a tool that allows you to access the full power 
of XML in a Java friendly way. It is an XML-Java binding tool. 
The idea is that you can take advantage the richness and 
features of XML and XML Schema and have these features mapped 
as naturally as possible to the equivalent Java language and 
typing constructs. XMLBeans uses XML Schema to compile Java 
interfaces and classes that you can then use to access and 
modify XML instance data. Using XMLBeans is similar to using 
any other Java interface/class, you will see things like 
getFoo or setFoo just as you would expect when working with 
Java. While a major use of XMLBeans is to access your XML 
instance data with strongly typed Java classes there are also 
API's that allow you access to the full XML infoset (XMLBeans 
keeps full XML Infoset fidelity) as well as to allow you to 
reflect into the XML schema itself through an XML Schema 
Object model.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description javadoc
%{summary}.


%package manual
Summary:        Documents for %{name}
Group:          Documentation

%description manual
%{summary}.


%package scripts
Summary:        Scripts for %{name}
Group:          Development/Tools
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description scripts
%{summary}.


%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .nodownload


%build
# Piccolo and jam are rebuilt from source and bundled with xbean
# ant clean.jars leaves some dangling jars around, do not use it
find . \( -name '*.jar' -o -name '*.zip' \) \
        -not -name 'piccolo*.jar' -not -name 'jam*.jar' \
        %{?with_bootstrap:-not -name 'oldxbean.jar' } \
        -print -delete

# Replace bundled libraries
mkdir -p build/lib
ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar
ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar
ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar
ln -sf $(build-classpath saxon) external/lib/saxon9.jar
ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar

# Fix CRLF
sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css

# Build
ant default docs


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic-%{version}.jar
install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar
install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar
ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar
ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar
ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar

# bin
install -d -m 0755 $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/dumpxsb   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/inst2xsd  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/scomp     $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/sdownload $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/sfactor   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/svalidate $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/validate  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xpretty   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xsd2inst  $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xsdtree   $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 bin/xstc      $RPM_BUILD_ROOT%{_bindir}


# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf build/docs/reference

# manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# fix line endings
cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r > tmp
mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%doc LICENSE.txt NOTICE.txt  README.txt


%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}


%files manual
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}


%files scripts
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/*


%changelog
* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-5
- Fix up saxon dependency
- Drop epoch
- Drop gcj

* Tue Nov 03 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-4
- Update to 2.4.0
- Tidy up a bit for Fedora

* Wed Sep 06 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-3jpp
- BuildRequire saxon8 instead of saxonb8
- (B)Require bea-stax-api instead of bea-stax
- Patch maven-plugin's project.xml for bea-stax-api instead of stax-bea-api
- Patch XbeanXQuery to saxon 8.7
- Add gcj_support option
- Add post/postun Requires for javadoc

* Wed Feb 01 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-2jpp
- Install plugin to /usr/share/maven/repository/JPP/plugins

* Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1.0-1jpp
- Upgrade to 2.1.0
- Add -maven-plugin subpackage

* Fri Jun 03 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0.4-2jpp
- Add missing build requires for jaxen

* Fri Jun 03 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0.4-1jpp
- Upgrade to 1.0.4

* Thu Sep 30 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0.3-1jpp
- First JPackage build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:53:34 -0000	1.1
+++ .cvsignore	9 Dec 2009 18:18:14 -0000	1.2
@@ -0,0 +1 @@
+xmlbeans-2.4.0-src.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:53:35 -0000	1.1
+++ sources	9 Dec 2009 18:18:14 -0000	1.2
@@ -0,0 +1 @@
+64412ab1f19d90112335062bfa90f7c8  xmlbeans-2.4.0-src.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:20:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:20:04 +0000 (UTC)
Subject: rpms/gant/EL-5 0001-Fix-tests.patch, NONE,
	1.1 0001-Make-it-build-against-our-jars.patch, NONE,
	1.1 gant.spec, NONE, 1.1
Message-ID: <20091209182004.4CCBB11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23840/EL-5

Added Files:
	0001-Fix-tests.patch 0001-Make-it-build-against-our-jars.patch 
	gant.spec 
Log Message:
Import gant

0001-Fix-tests.patch:
 Assorted_Test.groovy |    2 ++
 GANT_33_Test.groovy  |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-tests.patch ---
>From 256fc691f79ac3086d72b95504c39993fe10b87c Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Tue, 24 Nov 2009 00:46:35 +0100
Subject: [PATCH] Fix tests

Disable a test that needs internet connection, make other test not need
a home directory.
---
 .../codehaus/gant/tests/bugs/Assorted_Test.groovy  |    2 ++
 .../codehaus/gant/tests/bugs/GANT_33_Test.groovy   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
index 0e9ab9b..f79b831 100644
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
@@ -74,6 +74,7 @@ def foo { badvariable }
 ''' ) )
   }
 
+/*
   void test_GANT_34_originalIvycachePathProblemFixed ( ) {
     script = '''
 includeTool << gant.tools.Ivy
@@ -90,6 +91,7 @@ target ( 'default' : '' ) {
     //  same on all platforms: it contains the Ivy jar version number and some timings.
     assertEquals ( '' , error )
   }
+*/
 
   void test_GANT_49_builderBug ( ) {
     //
diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
index 9cc4e69..4a3d317 100644
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
@@ -77,7 +77,7 @@ private fileNameSuffix = '_GANT_33_Test'
     buildScriptFile.delete ( )
     //  Need to ensure that this cache directory actually is the real cache directory as listed in gant.Gant.
     ( new AntBuilder ( ) ).delete {
-      fileset ( dir : [ System.properties.'user.home' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
+      fileset ( dir : [ System.properties.'user.dir' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
     }
   }
   //////////////////////////////////////////////////////////////////////////////////////////////
-- 
1.6.5.2


0001-Make-it-build-against-our-jars.patch:
 build.xml |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Make-it-build-against-our-jars.patch ---
>From 3e388bc9d05e19029b673e5b9f8a91034cc830c9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 23 Nov 2009 06:11:11 +0100
Subject: [PATCH] Make it build against our jars

---
 build.xml |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff -up gant-1.8.1/build.xml.build gant-1.8.1/build.xml
--- gant-1.8.1/build.xml.build	2009-10-02 13:19:13.000000000 +0200
+++ gant-1.8.1/build.xml	2009-11-23 23:41:25.896457653 +0100
@@ -105,6 +105,27 @@ Author : Russel Winder <russel.winder at co
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
   </target>
 
+  <target name="-initializeFedora">
+    <echo message="Building with Fedora Groovy installation."/>
+    <path id="compileJarSetPathId">
+      <pathelement location="${groovyJar}"/>
+      <pathelement location="${commons-cliJar}"/>
+      <pathelement location="${asm2Jar}"/>
+      <pathelement location="${antlrJar}"/>
+      <pathelement location="${antJar}"/>
+    </path>
+    <path id="testJarSetPathId">
+      <path refid="compileJarSetPathId"/>
+      <pathelement location="${junitJar}"/>
+      <pathelement location="${ant-junitJar}"/>
+      <pathelement location="${ant-launcherJar}"/>
+    </path>
+    <path id="ivyJarPathId">
+      <pathelement location="${ivyJar}"/>
+    </path>
+    <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="compileJarSetPathId" />
+  </target>
+
   <target name="-initializeWithGroovyHome" if="groovyHomeIsSet">
     <echo message="Building with the Groovy installation at $GROOVY_HOME (${environment.GROOVY_HOME})."/>
     <path id="groovyJarPathId">
@@ -190,9 +211,9 @@ Author : Russel Winder <russel.winder at co
     <mkdir dir="${buildTestReportsDirectory}"/>
     <!--  Only need this file if GROOVY_HOME is not set but write it anyway to save the hassle of decision making. -->
     <echo file="groovyAntTaskTestVersion.properties" message="groovyAntTaskTestVersion = ${groovyVersion}"/>
-    <artifact:dependencies pathId="ivyJarPathId">
+    <!--artifact:dependencies pathId="ivyJarPathId">
       <dependency groupId="org.apache.ivy" artifactId="ivy" version="${ivyVersion}"/>
-    </artifact:dependencies>
+    </artifact:dependencies-->
     <path id="testClasspathPathId">
       <pathelement location="${buildTestClassesDirectory}"/>
       <path refid="mavenAntTaskJarPathId"/>
@@ -275,7 +296,7 @@ Author : Russel Winder <russel.winder at co
     <echo message="Property installDirectory is not set, so cannot uninstall.  Set installDirectory in file local.build.properties."/>
   </target>
 
-  <target name="-commandLineDependencies" depends="-checkGroovyHome,-initializeWithGroovyHome,-initializeNoGroovyHome"/>
+  <target name="-commandLineDependencies" depends="-initializeFedora"/>
   
   <!--
       The targets usable from the command line.


--- NEW FILE gant.spec ---
%global build_jars                                                \\\
        -DgroovyJar=%(          build-classpath groovy          ) \\\
        -Dcommons-cliJar=%(     build-classpath commons-cli     ) \\\
        -Dasm2Jar=%(            build-classpath asm2/asm2       ) \\\
        -DantlrJar=%(           build-classpath antlr           ) \\\
        -DantJar=%(             build-classpath ant             ) \\\
        -DjunitJar=%(           build-classpath junit           ) \\\
        -Dant-junitJar=%(       build-classpath ant/ant-junit   ) \\\
        -Dant-launcherJar=%(    build-classpath ant-launcher    ) \\\
        -DivyJar=%(             build-classpath ivy             )

Name:           gant
Version:        1.8.1
Release:        1%{?dist}
Summary:        Groovy-based build system that uses Ant tasks

Group:          Development/Tools
License:        ASL 2.0
URL:            http://gant.codehaus.org/
Source0:        http://dist.codehaus.org/gant/distributions/gant_src-%{version}.tgz
Patch0:         0001-Make-it-build-against-our-jars.patch
Patch1:         0001-Fix-tests.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  groovy
BuildRequires:  jakarta-commons-cli
BuildRequires:  asm2
BuildRequires:  antlr
BuildRequires:  ant
BuildRequires:  junit
BuildRequires:  ant-junit
BuildRequires:  ivy
BuildRequires:  jpackage-utils
Requires:       jpackage-utils

BuildArch:      noarch

%description
Gant is a tool for scripting Ant tasks using Groovy instead of XML to
specify the logic. A Gant specification is a Groovy script and so can bring
all the power of Groovy to bear directly, something not possible with Ant
scripts. Whilst it might be seen as a competitor to Ant, Gant uses Ant tasks
for many of the actions, so Gant is really an alternative way of doing
things using Ant, but using a programming language rather than XML to
specify the rules.


%prep
%setup -q
%patch0 -p1 -b .build
%patch1 -p1 -b .tests


%build
find . -name '*.jar' -delete
ant %{build_jars} package


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
install -p -m0644 target_gant/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar


%check

# Gant_Test "failed to create task or type urn:maven-artifact-ant:dependencies"
rm -f src/test/groovy/org/codehaus/gant/ant/tests/Gant_Test.java
rm -f target_gant/test-classes/org/codehaus/gant/ant/tests/Gant_Test.class

# For GANT_33_Test
mkdir -p .gant/cache

# Run the test suite
ant %{build_jars} test

# Ant always returns success, let us look at the test reports ourselves
if FAILED=$(egrep -l 'errors="[^0]"|failures="[^0]"' \
        target_gant/test-reports/*.xml)
then
        echo $FAILED |sed 's/\.xml/.txt/' |xargs cat
        exit 1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc README_Install.txt LICENCE.txt releaseNotes.txt


%changelog
* Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-1
- Initial packaging



From lkundrak at fedoraproject.org  Wed Dec  9 18:20:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:20:04 +0000 (UTC)
Subject: rpms/gant/F-11 0001-Fix-tests.patch, NONE,
	1.1 0001-Make-it-build-against-our-jars.patch, NONE,
	1.1 gant.spec, NONE, 1.1
Message-ID: <20091209182004.9D0EC11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23840/F-11

Added Files:
	0001-Fix-tests.patch 0001-Make-it-build-against-our-jars.patch 
	gant.spec 
Log Message:
Import gant

0001-Fix-tests.patch:
 Assorted_Test.groovy |    2 ++
 GANT_33_Test.groovy  |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-tests.patch ---
>From 256fc691f79ac3086d72b95504c39993fe10b87c Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Tue, 24 Nov 2009 00:46:35 +0100
Subject: [PATCH] Fix tests

Disable a test that needs internet connection, make other test not need
a home directory.
---
 .../codehaus/gant/tests/bugs/Assorted_Test.groovy  |    2 ++
 .../codehaus/gant/tests/bugs/GANT_33_Test.groovy   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
index 0e9ab9b..f79b831 100644
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
@@ -74,6 +74,7 @@ def foo { badvariable }
 ''' ) )
   }
 
+/*
   void test_GANT_34_originalIvycachePathProblemFixed ( ) {
     script = '''
 includeTool << gant.tools.Ivy
@@ -90,6 +91,7 @@ target ( 'default' : '' ) {
     //  same on all platforms: it contains the Ivy jar version number and some timings.
     assertEquals ( '' , error )
   }
+*/
 
   void test_GANT_49_builderBug ( ) {
     //
diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
index 9cc4e69..4a3d317 100644
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
@@ -77,7 +77,7 @@ private fileNameSuffix = '_GANT_33_Test'
     buildScriptFile.delete ( )
     //  Need to ensure that this cache directory actually is the real cache directory as listed in gant.Gant.
     ( new AntBuilder ( ) ).delete {
-      fileset ( dir : [ System.properties.'user.home' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
+      fileset ( dir : [ System.properties.'user.dir' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
     }
   }
   //////////////////////////////////////////////////////////////////////////////////////////////
-- 
1.6.5.2


0001-Make-it-build-against-our-jars.patch:
 build.xml |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Make-it-build-against-our-jars.patch ---
>From 3e388bc9d05e19029b673e5b9f8a91034cc830c9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 23 Nov 2009 06:11:11 +0100
Subject: [PATCH] Make it build against our jars

---
 build.xml |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff -up gant-1.8.1/build.xml.build gant-1.8.1/build.xml
--- gant-1.8.1/build.xml.build	2009-10-02 13:19:13.000000000 +0200
+++ gant-1.8.1/build.xml	2009-11-23 23:41:25.896457653 +0100
@@ -105,6 +105,27 @@ Author : Russel Winder <russel.winder at co
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
   </target>
 
+  <target name="-initializeFedora">
+    <echo message="Building with Fedora Groovy installation."/>
+    <path id="compileJarSetPathId">
+      <pathelement location="${groovyJar}"/>
+      <pathelement location="${commons-cliJar}"/>
+      <pathelement location="${asm2Jar}"/>
+      <pathelement location="${antlrJar}"/>
+      <pathelement location="${antJar}"/>
+    </path>
+    <path id="testJarSetPathId">
+      <path refid="compileJarSetPathId"/>
+      <pathelement location="${junitJar}"/>
+      <pathelement location="${ant-junitJar}"/>
+      <pathelement location="${ant-launcherJar}"/>
+    </path>
+    <path id="ivyJarPathId">
+      <pathelement location="${ivyJar}"/>
+    </path>
+    <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="compileJarSetPathId" />
+  </target>
+
   <target name="-initializeWithGroovyHome" if="groovyHomeIsSet">
     <echo message="Building with the Groovy installation at $GROOVY_HOME (${environment.GROOVY_HOME})."/>
     <path id="groovyJarPathId">
@@ -190,9 +211,9 @@ Author : Russel Winder <russel.winder at co
     <mkdir dir="${buildTestReportsDirectory}"/>
     <!--  Only need this file if GROOVY_HOME is not set but write it anyway to save the hassle of decision making. -->
     <echo file="groovyAntTaskTestVersion.properties" message="groovyAntTaskTestVersion = ${groovyVersion}"/>
-    <artifact:dependencies pathId="ivyJarPathId">
+    <!--artifact:dependencies pathId="ivyJarPathId">
       <dependency groupId="org.apache.ivy" artifactId="ivy" version="${ivyVersion}"/>
-    </artifact:dependencies>
+    </artifact:dependencies-->
     <path id="testClasspathPathId">
       <pathelement location="${buildTestClassesDirectory}"/>
       <path refid="mavenAntTaskJarPathId"/>
@@ -275,7 +296,7 @@ Author : Russel Winder <russel.winder at co
     <echo message="Property installDirectory is not set, so cannot uninstall.  Set installDirectory in file local.build.properties."/>
   </target>
 
-  <target name="-commandLineDependencies" depends="-checkGroovyHome,-initializeWithGroovyHome,-initializeNoGroovyHome"/>
+  <target name="-commandLineDependencies" depends="-initializeFedora"/>
   
   <!--
       The targets usable from the command line.


--- NEW FILE gant.spec ---
%global build_jars                                                \\\
        -DgroovyJar=%(          build-classpath groovy          ) \\\
        -Dcommons-cliJar=%(     build-classpath commons-cli     ) \\\
        -Dasm2Jar=%(            build-classpath asm2/asm2       ) \\\
        -DantlrJar=%(           build-classpath antlr           ) \\\
        -DantJar=%(             build-classpath ant             ) \\\
        -DjunitJar=%(           build-classpath junit           ) \\\
        -Dant-junitJar=%(       build-classpath ant/ant-junit   ) \\\
        -Dant-launcherJar=%(    build-classpath ant-launcher    ) \\\
        -DivyJar=%(             build-classpath ivy             )

Name:           gant
Version:        1.8.1
Release:        1%{?dist}
Summary:        Groovy-based build system that uses Ant tasks

Group:          Development/Tools
License:        ASL 2.0
URL:            http://gant.codehaus.org/
Source0:        http://dist.codehaus.org/gant/distributions/gant_src-%{version}.tgz
Patch0:         0001-Make-it-build-against-our-jars.patch
Patch1:         0001-Fix-tests.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  groovy
BuildRequires:  jakarta-commons-cli
BuildRequires:  asm2
BuildRequires:  antlr
BuildRequires:  ant
BuildRequires:  junit
BuildRequires:  ant-junit
BuildRequires:  ivy
BuildRequires:  jpackage-utils
Requires:       jpackage-utils

BuildArch:      noarch

%description
Gant is a tool for scripting Ant tasks using Groovy instead of XML to
specify the logic. A Gant specification is a Groovy script and so can bring
all the power of Groovy to bear directly, something not possible with Ant
scripts. Whilst it might be seen as a competitor to Ant, Gant uses Ant tasks
for many of the actions, so Gant is really an alternative way of doing
things using Ant, but using a programming language rather than XML to
specify the rules.


%prep
%setup -q
%patch0 -p1 -b .build
%patch1 -p1 -b .tests


%build
find . -name '*.jar' -delete
ant %{build_jars} package


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
install -p -m0644 target_gant/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar


%check

# Gant_Test "failed to create task or type urn:maven-artifact-ant:dependencies"
rm -f src/test/groovy/org/codehaus/gant/ant/tests/Gant_Test.java
rm -f target_gant/test-classes/org/codehaus/gant/ant/tests/Gant_Test.class

# For GANT_33_Test
mkdir -p .gant/cache

# Run the test suite
ant %{build_jars} test

# Ant always returns success, let us look at the test reports ourselves
if FAILED=$(egrep -l 'errors="[^0]"|failures="[^0]"' \
        target_gant/test-reports/*.xml)
then
        echo $FAILED |sed 's/\.xml/.txt/' |xargs cat
        exit 1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc README_Install.txt LICENCE.txt releaseNotes.txt


%changelog
* Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-1
- Initial packaging



From lkundrak at fedoraproject.org  Wed Dec  9 18:20:05 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:20:05 +0000 (UTC)
Subject: rpms/gant/devel 0001-Fix-tests.patch, NONE,
	1.1 0001-Make-it-build-against-our-jars.patch, NONE,
	1.1 gant.spec, NONE, 1.1
Message-ID: <20091209182005.4098611C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23840/devel

Added Files:
	0001-Fix-tests.patch 0001-Make-it-build-against-our-jars.patch 
	gant.spec 
Log Message:
Import gant

0001-Fix-tests.patch:
 Assorted_Test.groovy |    2 ++
 GANT_33_Test.groovy  |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-tests.patch ---
>From 256fc691f79ac3086d72b95504c39993fe10b87c Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Tue, 24 Nov 2009 00:46:35 +0100
Subject: [PATCH] Fix tests

Disable a test that needs internet connection, make other test not need
a home directory.
---
 .../codehaus/gant/tests/bugs/Assorted_Test.groovy  |    2 ++
 .../codehaus/gant/tests/bugs/GANT_33_Test.groovy   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
index 0e9ab9b..f79b831 100644
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
@@ -74,6 +74,7 @@ def foo { badvariable }
 ''' ) )
   }
 
+/*
   void test_GANT_34_originalIvycachePathProblemFixed ( ) {
     script = '''
 includeTool << gant.tools.Ivy
@@ -90,6 +91,7 @@ target ( 'default' : '' ) {
     //  same on all platforms: it contains the Ivy jar version number and some timings.
     assertEquals ( '' , error )
   }
+*/
 
   void test_GANT_49_builderBug ( ) {
     //
diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
index 9cc4e69..4a3d317 100644
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
@@ -77,7 +77,7 @@ private fileNameSuffix = '_GANT_33_Test'
     buildScriptFile.delete ( )
     //  Need to ensure that this cache directory actually is the real cache directory as listed in gant.Gant.
     ( new AntBuilder ( ) ).delete {
-      fileset ( dir : [ System.properties.'user.home' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
+      fileset ( dir : [ System.properties.'user.dir' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
     }
   }
   //////////////////////////////////////////////////////////////////////////////////////////////
-- 
1.6.5.2


0001-Make-it-build-against-our-jars.patch:
 build.xml |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Make-it-build-against-our-jars.patch ---
>From 3e388bc9d05e19029b673e5b9f8a91034cc830c9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 23 Nov 2009 06:11:11 +0100
Subject: [PATCH] Make it build against our jars

---
 build.xml |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff -up gant-1.8.1/build.xml.build gant-1.8.1/build.xml
--- gant-1.8.1/build.xml.build	2009-10-02 13:19:13.000000000 +0200
+++ gant-1.8.1/build.xml	2009-11-23 23:41:25.896457653 +0100
@@ -105,6 +105,27 @@ Author : Russel Winder <russel.winder at co
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
   </target>
 
+  <target name="-initializeFedora">
+    <echo message="Building with Fedora Groovy installation."/>
+    <path id="compileJarSetPathId">
+      <pathelement location="${groovyJar}"/>
+      <pathelement location="${commons-cliJar}"/>
+      <pathelement location="${asm2Jar}"/>
+      <pathelement location="${antlrJar}"/>
+      <pathelement location="${antJar}"/>
+    </path>
+    <path id="testJarSetPathId">
+      <path refid="compileJarSetPathId"/>
+      <pathelement location="${junitJar}"/>
+      <pathelement location="${ant-junitJar}"/>
+      <pathelement location="${ant-launcherJar}"/>
+    </path>
+    <path id="ivyJarPathId">
+      <pathelement location="${ivyJar}"/>
+    </path>
+    <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="compileJarSetPathId" />
+  </target>
+
   <target name="-initializeWithGroovyHome" if="groovyHomeIsSet">
     <echo message="Building with the Groovy installation at $GROOVY_HOME (${environment.GROOVY_HOME})."/>
     <path id="groovyJarPathId">
@@ -190,9 +211,9 @@ Author : Russel Winder <russel.winder at co
     <mkdir dir="${buildTestReportsDirectory}"/>
     <!--  Only need this file if GROOVY_HOME is not set but write it anyway to save the hassle of decision making. -->
     <echo file="groovyAntTaskTestVersion.properties" message="groovyAntTaskTestVersion = ${groovyVersion}"/>
-    <artifact:dependencies pathId="ivyJarPathId">
+    <!--artifact:dependencies pathId="ivyJarPathId">
       <dependency groupId="org.apache.ivy" artifactId="ivy" version="${ivyVersion}"/>
-    </artifact:dependencies>
+    </artifact:dependencies-->
     <path id="testClasspathPathId">
       <pathelement location="${buildTestClassesDirectory}"/>
       <path refid="mavenAntTaskJarPathId"/>
@@ -275,7 +296,7 @@ Author : Russel Winder <russel.winder at co
     <echo message="Property installDirectory is not set, so cannot uninstall.  Set installDirectory in file local.build.properties."/>
   </target>
 
-  <target name="-commandLineDependencies" depends="-checkGroovyHome,-initializeWithGroovyHome,-initializeNoGroovyHome"/>
+  <target name="-commandLineDependencies" depends="-initializeFedora"/>
   
   <!--
       The targets usable from the command line.


--- NEW FILE gant.spec ---
%global build_jars                                                \\\
        -DgroovyJar=%(          build-classpath groovy          ) \\\
        -Dcommons-cliJar=%(     build-classpath commons-cli     ) \\\
        -Dasm2Jar=%(            build-classpath asm2/asm2       ) \\\
        -DantlrJar=%(           build-classpath antlr           ) \\\
        -DantJar=%(             build-classpath ant             ) \\\
        -DjunitJar=%(           build-classpath junit           ) \\\
        -Dant-junitJar=%(       build-classpath ant/ant-junit   ) \\\
        -Dant-launcherJar=%(    build-classpath ant-launcher    ) \\\
        -DivyJar=%(             build-classpath ivy             )

Name:           gant
Version:        1.8.1
Release:        1%{?dist}
Summary:        Groovy-based build system that uses Ant tasks

Group:          Development/Tools
License:        ASL 2.0
URL:            http://gant.codehaus.org/
Source0:        http://dist.codehaus.org/gant/distributions/gant_src-%{version}.tgz
Patch0:         0001-Make-it-build-against-our-jars.patch
Patch1:         0001-Fix-tests.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  groovy
BuildRequires:  jakarta-commons-cli
BuildRequires:  asm2
BuildRequires:  antlr
BuildRequires:  ant
BuildRequires:  junit
BuildRequires:  ant-junit
BuildRequires:  ivy
BuildRequires:  jpackage-utils
Requires:       jpackage-utils

BuildArch:      noarch

%description
Gant is a tool for scripting Ant tasks using Groovy instead of XML to
specify the logic. A Gant specification is a Groovy script and so can bring
all the power of Groovy to bear directly, something not possible with Ant
scripts. Whilst it might be seen as a competitor to Ant, Gant uses Ant tasks
for many of the actions, so Gant is really an alternative way of doing
things using Ant, but using a programming language rather than XML to
specify the rules.


%prep
%setup -q
%patch0 -p1 -b .build
%patch1 -p1 -b .tests


%build
find . -name '*.jar' -delete
ant %{build_jars} package


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
install -p -m0644 target_gant/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar


%check

# Gant_Test "failed to create task or type urn:maven-artifact-ant:dependencies"
rm -f src/test/groovy/org/codehaus/gant/ant/tests/Gant_Test.java
rm -f target_gant/test-classes/org/codehaus/gant/ant/tests/Gant_Test.class

# For GANT_33_Test
mkdir -p .gant/cache

# Run the test suite
ant %{build_jars} test

# Ant always returns success, let us look at the test reports ourselves
if FAILED=$(egrep -l 'errors="[^0]"|failures="[^0]"' \
        target_gant/test-reports/*.xml)
then
        echo $FAILED |sed 's/\.xml/.txt/' |xargs cat
        exit 1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc README_Install.txt LICENCE.txt releaseNotes.txt


%changelog
* Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-1
- Initial packaging



From lkundrak at fedoraproject.org  Wed Dec  9 18:20:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:20:04 +0000 (UTC)
Subject: rpms/gant/F-12 0001-Fix-tests.patch, NONE,
	1.1 0001-Make-it-build-against-our-jars.patch, NONE,
	1.1 gant.spec, NONE, 1.1
Message-ID: <20091209182004.EB8EC11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23840/F-12

Added Files:
	0001-Fix-tests.patch 0001-Make-it-build-against-our-jars.patch 
	gant.spec 
Log Message:
Import gant

0001-Fix-tests.patch:
 Assorted_Test.groovy |    2 ++
 GANT_33_Test.groovy  |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-tests.patch ---
>From 256fc691f79ac3086d72b95504c39993fe10b87c Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Tue, 24 Nov 2009 00:46:35 +0100
Subject: [PATCH] Fix tests

Disable a test that needs internet connection, make other test not need
a home directory.
---
 .../codehaus/gant/tests/bugs/Assorted_Test.groovy  |    2 ++
 .../codehaus/gant/tests/bugs/GANT_33_Test.groovy   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
index 0e9ab9b..f79b831 100644
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/Assorted_Test.groovy
@@ -74,6 +74,7 @@ def foo { badvariable }
 ''' ) )
   }
 
+/*
   void test_GANT_34_originalIvycachePathProblemFixed ( ) {
     script = '''
 includeTool << gant.tools.Ivy
@@ -90,6 +91,7 @@ target ( 'default' : '' ) {
     //  same on all platforms: it contains the Ivy jar version number and some timings.
     assertEquals ( '' , error )
   }
+*/
 
   void test_GANT_49_builderBug ( ) {
     //
diff --git a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
index 9cc4e69..4a3d317 100644
--- a/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
+++ b/src/test/groovy/org/codehaus/gant/tests/bugs/GANT_33_Test.groovy
@@ -77,7 +77,7 @@ private fileNameSuffix = '_GANT_33_Test'
     buildScriptFile.delete ( )
     //  Need to ensure that this cache directory actually is the real cache directory as listed in gant.Gant.
     ( new AntBuilder ( ) ).delete {
-      fileset ( dir : [ System.properties.'user.home' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
+      fileset ( dir : [ System.properties.'user.dir' , '.gant' , 'cache' ].join ( System.properties.'file.separator' ) , includes : fileNamePrefix + '*' + fileNameSuffix + '*' )
     }
   }
   //////////////////////////////////////////////////////////////////////////////////////////////
-- 
1.6.5.2


0001-Make-it-build-against-our-jars.patch:
 build.xml |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Make-it-build-against-our-jars.patch ---
>From 3e388bc9d05e19029b673e5b9f8a91034cc830c9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 23 Nov 2009 06:11:11 +0100
Subject: [PATCH] Make it build against our jars

---
 build.xml |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff -up gant-1.8.1/build.xml.build gant-1.8.1/build.xml
--- gant-1.8.1/build.xml.build	2009-10-02 13:19:13.000000000 +0200
+++ gant-1.8.1/build.xml	2009-11-23 23:41:25.896457653 +0100
@@ -105,6 +105,27 @@ Author : Russel Winder <russel.winder at co
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
   </target>
 
+  <target name="-initializeFedora">
+    <echo message="Building with Fedora Groovy installation."/>
+    <path id="compileJarSetPathId">
+      <pathelement location="${groovyJar}"/>
+      <pathelement location="${commons-cliJar}"/>
+      <pathelement location="${asm2Jar}"/>
+      <pathelement location="${antlrJar}"/>
+      <pathelement location="${antJar}"/>
+    </path>
+    <path id="testJarSetPathId">
+      <path refid="compileJarSetPathId"/>
+      <pathelement location="${junitJar}"/>
+      <pathelement location="${ant-junitJar}"/>
+      <pathelement location="${ant-launcherJar}"/>
+    </path>
+    <path id="ivyJarPathId">
+      <pathelement location="${ivyJar}"/>
+    </path>
+    <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="compileJarSetPathId" />
+  </target>
+
   <target name="-initializeWithGroovyHome" if="groovyHomeIsSet">
     <echo message="Building with the Groovy installation at $GROOVY_HOME (${environment.GROOVY_HOME})."/>
     <path id="groovyJarPathId">
@@ -190,9 +211,9 @@ Author : Russel Winder <russel.winder at co
     <mkdir dir="${buildTestReportsDirectory}"/>
     <!--  Only need this file if GROOVY_HOME is not set but write it anyway to save the hassle of decision making. -->
     <echo file="groovyAntTaskTestVersion.properties" message="groovyAntTaskTestVersion = ${groovyVersion}"/>
-    <artifact:dependencies pathId="ivyJarPathId">
+    <!--artifact:dependencies pathId="ivyJarPathId">
       <dependency groupId="org.apache.ivy" artifactId="ivy" version="${ivyVersion}"/>
-    </artifact:dependencies>
+    </artifact:dependencies-->
     <path id="testClasspathPathId">
       <pathelement location="${buildTestClassesDirectory}"/>
       <path refid="mavenAntTaskJarPathId"/>
@@ -275,7 +296,7 @@ Author : Russel Winder <russel.winder at co
     <echo message="Property installDirectory is not set, so cannot uninstall.  Set installDirectory in file local.build.properties."/>
   </target>
 
-  <target name="-commandLineDependencies" depends="-checkGroovyHome,-initializeWithGroovyHome,-initializeNoGroovyHome"/>
+  <target name="-commandLineDependencies" depends="-initializeFedora"/>
   
   <!--
       The targets usable from the command line.


--- NEW FILE gant.spec ---
%global build_jars                                                \\\
        -DgroovyJar=%(          build-classpath groovy          ) \\\
        -Dcommons-cliJar=%(     build-classpath commons-cli     ) \\\
        -Dasm2Jar=%(            build-classpath asm2/asm2       ) \\\
        -DantlrJar=%(           build-classpath antlr           ) \\\
        -DantJar=%(             build-classpath ant             ) \\\
        -DjunitJar=%(           build-classpath junit           ) \\\
        -Dant-junitJar=%(       build-classpath ant/ant-junit   ) \\\
        -Dant-launcherJar=%(    build-classpath ant-launcher    ) \\\
        -DivyJar=%(             build-classpath ivy             )

Name:           gant
Version:        1.8.1
Release:        1%{?dist}
Summary:        Groovy-based build system that uses Ant tasks

Group:          Development/Tools
License:        ASL 2.0
URL:            http://gant.codehaus.org/
Source0:        http://dist.codehaus.org/gant/distributions/gant_src-%{version}.tgz
Patch0:         0001-Make-it-build-against-our-jars.patch
Patch1:         0001-Fix-tests.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  groovy
BuildRequires:  jakarta-commons-cli
BuildRequires:  asm2
BuildRequires:  antlr
BuildRequires:  ant
BuildRequires:  junit
BuildRequires:  ant-junit
BuildRequires:  ivy
BuildRequires:  jpackage-utils
Requires:       jpackage-utils

BuildArch:      noarch

%description
Gant is a tool for scripting Ant tasks using Groovy instead of XML to
specify the logic. A Gant specification is a Groovy script and so can bring
all the power of Groovy to bear directly, something not possible with Ant
scripts. Whilst it might be seen as a competitor to Ant, Gant uses Ant tasks
for many of the actions, so Gant is really an alternative way of doing
things using Ant, but using a programming language rather than XML to
specify the rules.


%prep
%setup -q
%patch0 -p1 -b .build
%patch1 -p1 -b .tests


%build
find . -name '*.jar' -delete
ant %{build_jars} package


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
install -p -m0644 target_gant/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar


%check

# Gant_Test "failed to create task or type urn:maven-artifact-ant:dependencies"
rm -f src/test/groovy/org/codehaus/gant/ant/tests/Gant_Test.java
rm -f target_gant/test-classes/org/codehaus/gant/ant/tests/Gant_Test.class

# For GANT_33_Test
mkdir -p .gant/cache

# Run the test suite
ant %{build_jars} test

# Ant always returns success, let us look at the test reports ourselves
if FAILED=$(egrep -l 'errors="[^0]"|failures="[^0]"' \
        target_gant/test-reports/*.xml)
then
        echo $FAILED |sed 's/\.xml/.txt/' |xargs cat
        exit 1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc README_Install.txt LICENCE.txt releaseNotes.txt


%changelog
* Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-1
- Initial packaging



From sagarun at fedoraproject.org  Wed Dec  9 18:27:00 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed,  9 Dec 2009 18:27:00 +0000 (UTC)
Subject: rpms/emacs-irsim-mode/devel emacs-irsim-mode.spec, NONE,
	1.1 import.log, NONE, 1.1 irsim-mode-init.el, NONE,
	1.1 irsim-mode.el, NONE, 1.1
Message-ID: <20091209182700.5940111C0264@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-irsim-mode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25864/devel

Added Files:
	emacs-irsim-mode.spec import.log irsim-mode-init.el 
	irsim-mode.el 
Log Message:
First package - emacs-irsim-mode



--- NEW FILE emacs-irsim-mode.spec ---
%global pkg irsim-mode
%global pkgname Emacs-irsim-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif


Name:		emacs-%{pkg}
Version:	0.1
Release:	6%{?dist}
Summary:	Irsim mode for emacs

Group:		Applications/Editors
License:	MIT
URL:		http://code.google.com/p/irsim-mode/
Source0:	http://irsim-mode.googlecode.com/files/irsim-mode.el
Source1:	%{pkg}-init.el
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version}
		
%description
IRSIM is a switch-level simulator for digital logic circuits.
This is an Emacs mode for editing IRSIM netlists. It provides
syntax highlighting and an extremely pleasant method if indentation.


%package el
Summary:	Source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%{__rm} -rf %{_builddir}/%{name}-%{version}
%{__mkdir} -p %{_builddir}/%{name}-%{version}
cp -p %{SOURCE0} %{_builddir}/%{name}-%{version}
cp -p %{SOURCE1} %{_builddir}/%{name}-%{version}


%build
cd %{name}-%{version}
emacs -batch -f batch-byte-compile %{pkg}.el

%install
%{__rm} -rf %{buildroot}
cd %{name}-%{version}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/irsim-mode/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}	
%{__install} -pm 644 %{pkg}.* %{buildroot}%{emacs_lispdir}/%{pkg}
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{emacs_startdir}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Tue Dec 08 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-6
- Fixed Requires for centos

* Mon Dec 07 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-5
- Fixed installtion failure in EL-5
- irsim-mode handles .out files

* Thu Dec 03 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-4
- Timestamps are preserved
- Autoloads for more file types added

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-3
- Description updated
- source1 updated

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-2
- Reduntant globals removed
- Description updated

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-1
- Initial release 0.1-1


--- NEW FILE import.log ---
emacs-irsim-mode-0_1-6_fc12:HEAD:emacs-irsim-mode-0.1-6.fc12.src.rpm:1260382863


--- NEW FILE irsim-mode-init.el ---
;; Init file for irsim mode
(autoload 'irsim-mode "irsim-mode" nil t)
(setq auto-mode-alist
      (cons '("\\.sim$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.cmd$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.out$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.flt$" . irsim-mode) auto-mode-alist))

--- NEW FILE irsim-mode.el ---
;;; A major mode for editing IRSIM netlists. Public domain. Created by
;;; Peter Scott <pjscott at iastate.edu> in 2008. To install, put
;;; irsim-mode.el somewhere that emacs will see it like you site-lisp/
;;; sirectory and stick something like this in your .emacs file:
;;;
;;; (autoload 'irsim-mode "irsim-mode" nil t)
;;; (setq auto-mode-alist
;;;       (cons '("\\.sim$" . irsim-mode) auto-mode-alist))
;;;
;;; Note that this will override the default behavior for opening .sim
;;; files, which is to go into simula-mode. This might be a problem if
;;; you use both.
;;;
;;; Note also that this mode is opinionated. It has a very specific
;;; idea of how IRSIM code ought to be indented, and if you don't like
;;; it then just set irsim-use-fancy-indent to nil. I think that the
;;; default indentation method leads to very pretty files and easy
;;; typing, but YMMV.

(require 'font-lock)
(require 'cl)

;; Customizable variables:
;;;;;;;;;;;;;;;;;;;;;;;;;;

(defvar irsim-use-fancy-indent t
  "Specifies whether irsim-mode should use fancy indentation or
  plain. Default is fancy, but set it to nil for plan.")

(defvar irsim-tab-stops '(0 3 16 32 48 51)
  "The starting column positions for each entry in a transistor
  line using the fancy indent function. Change if you like.")


;; Some global variables

(defvar irsim-mode-version "0.1"
  "The current version number of irsim-mode.")

(defvar irsim-mode-hook nil)

(defconst irsim-font-lock-keywords
  (list
   '("^[\t ]*[np]" . font-lock-builtin-face)
   '("[a-zA-Z_][_-a-zA-Z0-9.]*" . font-lock-variable-name-face))
  "Minimal highlighting expressions for IRSIM mode")

;; Define comment behavior and make underscores act as normal
;; characters for forward-word and backward-word behavior. This makes
;; a lot more sense than the default.
(defvar irsim-mode-syntax-table
  (let ((irsim-mode-syntax-table (make-syntax-table)))
    (modify-syntax-entry ?| "<   " irsim-mode-syntax-table)
    (modify-syntax-entry ?\n ">   " irsim-mode-syntax-table)
    (modify-syntax-entry ?\^m ">   " irsim-mode-syntax-table)
    (modify-syntax-entry ?_ "w" irsim-mode-syntax-table)
    irsim-mode-syntax-table))


;; Indentation
;;;;;;;;;;;;;;

(defun irsim-line-type ()
  "Returns the type of line in IRSIM code that the point is
  on. Valid return values are 'transistor-line, 'comment-line, or
  nil"
  (save-excursion
    (move-beginning-of-line nil)
    (if (looking-at "^[\t ]*[np]")
	'transistor-line
	(if (looking-at "^[\t ]*\\|")
	    'comment-line))))

;; To indent a transistor line, just move the columns into place and
;; put the cursor at the last empty column. Or don't move it if there
;; are no more empty columns. Comment lines should not be indented.
(defun irsim-indent-line ()
  "Indent the current line of IRSIM code properly"
  (interactive)
  (let ((at-end nil))
    (if (looking-at "[\t ]*$")
	(setq at-end t))
    (if (eql (irsim-line-type) 'transistor-line)
	(progn
	  (save-excursion
	    (save-restriction
	      ;; Narrow to just this line
	      (narrow-to-region (line-beginning-position) (line-end-position))
	      (beginning-of-line)
	      (indent-line-to 0)
	      (let ((tab-stops (copy-seq irsim-tab-stops)))
		(while (and tab-stops (not (looking-at "[\t ]*$")))
		  (while (looking-at "[\t ]")
		    (delete-char 1))
		  (indent-to-column (car tab-stops))
		  (setq tab-stops (cdr tab-stops))
		  (forward-word))
		(when (and at-end tab-stops)
		  (message "yarr")
		  (end-of-line)
		  (indent-to-column (car tab-stops))))))
	  (if at-end (end-of-line)))
	(if (eql (irsim-line-type) 'comment-line)
	    (save-excursion
	      (beginning-of-line)
	      (indent-line-to 0))))))



(defun irsim-mode ()
  "Major mode for editing IRSIM netlists."
  (interactive)
  (kill-all-local-variables)
  (make-local-variable 'font-lock-defaults)
  (setq font-lock-defaults '(irsim-font-lock-keywords))
  (set-syntax-table irsim-mode-syntax-table)
  (set (make-local-variable 'comment-start) "| ")

  (when irsim-use-fancy-indent
    (set (make-local-variable 'indent-line-function) 'irsim-indent-line))

  (setq mode-name "IRSIM"
	major-mode 'irsim-mode)
  (run-hooks 'irsim-mode-hook))

(provide 'irsim-mode)



From fabbione at fedoraproject.org  Wed Dec  9 18:27:24 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed,  9 Dec 2009 18:27:24 +0000 (UTC)
Subject: rpms/resource-agents/F-11 .cvsignore, 1.9, 1.10 resource-agents.spec,
	1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20091209182724.639CC11C0264@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/resource-agents/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27184

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Nov 2009 15:13:19 -0000	1.9
+++ .cvsignore	9 Dec 2009 18:27:24 -0000	1.10
@@ -1 +1 @@
-resource-agents-3.0.5.tar.gz
+resource-agents-3.0.6.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/resource-agents.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- resource-agents.spec	23 Nov 2009 15:13:19 -0000	1.10
+++ resource-agents.spec	9 Dec 2009 18:27:24 -0000	1.11
@@ -10,20 +10,17 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/resource-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 
 ## Runtime deps
 Requires: bash grep sed gawk
@@ -38,13 +35,13 @@ BuildArch: noarch
 # BuildRequires:
 
 %prep
-%setup -q -n resource-agents-%{version}%{?alphatag:.%{alphatag}}
+%setup -q -n %{name}-%{version}
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %build
-./configure \
+%{_configure} \
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
@@ -72,6 +69,13 @@ services to operate in a High Availabili
 %{_datadir}/cluster
 
 %changelog
+* Mon Dec 7 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.6-1
+- New upstream release.
+- spec file update:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+
 * Mon Nov 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.5-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 Nov 2009 15:13:19 -0000	1.10
+++ sources	9 Dec 2009 18:27:24 -0000	1.11
@@ -1 +1 @@
-a7577975345b865dc73ec0b1c0bd24f7  resource-agents-3.0.5.tar.gz
+12e059b8d7b1a05a161161bb9662b38b  resource-agents-3.0.6.tar.gz



From sgrubb at fedoraproject.org  Wed Dec  9 18:29:29 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed,  9 Dec 2009 18:29:29 +0000 (UTC)
Subject: rpms/aide/F-12 aide-0.13.1-libgrypt-init.patch, 1.1, 1.2 aide.spec, 
	1.34, 1.35
Message-ID: <20091209182929.4B54711C0264@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/aide/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28446

Modified Files:
	aide-0.13.1-libgrypt-init.patch aide.spec 
Log Message:
* Wed Dec 09 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-14
- Revise patch for Initialize libgcrypt correctly (#530485)


aide-0.13.1-libgrypt-init.patch:
 doc/aide.1.in    |    1 +
 include/report.h |    1 +
 src/md.c         |    9 +++++++++
 3 files changed, 11 insertions(+)

Index: aide-0.13.1-libgrypt-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aide/F-12/aide-0.13.1-libgrypt-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- aide-0.13.1-libgrypt-init.patch	9 Nov 2009 18:12:58 -0000	1.1
+++ aide-0.13.1-libgrypt-init.patch	9 Dec 2009 18:29:28 -0000	1.2
@@ -1,6 +1,28 @@
-diff -up aide-0.13.1/src/md.c.gcryptinit aide-0.13.1/src/md.c
---- aide-0.13.1/src/md.c.gcryptinit	2009-10-23 04:48:19.000000000 +0200
-+++ aide-0.13.1/src/md.c	2009-10-23 04:53:09.000000000 +0200
+diff -urp aide-0.13.1.orig/doc/aide.1.in aide-0.13.1/doc/aide.1.in
+--- aide-0.13.1.orig/doc/aide.1.in	2009-12-01 12:23:10.000000000 -0500
++++ aide-0.13.1/doc/aide.1.in	2009-12-01 12:28:14.000000000 -0500
+@@ -67,6 +67,7 @@ conditions:
+ .IP "16 Unimplemented function error"
+ .IP "17 Invalid configureline error"
+ .IP "18 IO error"
++.IP "19 Version mismatch error"
+ .PP
+ .SH NOTES
+ Please note that due to mmap issues, aide cannot be terminated with
+diff -urp aide-0.13.1.orig/include/report.h aide-0.13.1/include/report.h
+--- aide-0.13.1.orig/include/report.h	2009-12-01 12:23:10.000000000 -0500
++++ aide-0.13.1/include/report.h	2009-12-01 12:27:43.000000000 -0500
+@@ -31,6 +31,7 @@
+ #define UNIMPLEMENTED_FUNCTION_ERROR 16
+ #define INVALID_CONFIGURELINE_ERROR 17
+ #define IO_ERROR 18
++#define VERSION_MISMATCH_ERROR 19
+ 
+ /* Errorcodes */
+ #define HASH_ALGO_ERROR 30
+diff -urp aide-0.13.1.orig/src/md.c aide-0.13.1/src/md.c
+--- aide-0.13.1.orig/src/md.c	2009-12-01 12:23:10.000000000 -0500
++++ aide-0.13.1/src/md.c	2009-12-01 12:27:04.000000000 -0500
 @@ -201,6 +201,15 @@ int init_md(struct md_container* md) {
  #endif 
  #ifdef WITH_GCRYPT
@@ -11,7 +33,7 @@ diff -up aide-0.13.1/src/md.c.gcryptinit
 +  	 */
 +  	if(!gcry_check_version(GCRYPT_VERSION)) {
 +		error(0,"libgcrypt version mismatch\n");
-+		exit(1);
++		exit(VERSION_MISMATCH_ERROR);
 +	}
 +	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
  	if(gcry_md_open(&md->mdh,0,0)!=GPG_ERR_NO_ERROR){


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/F-12/aide.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- aide.spec	9 Nov 2009 18:12:58 -0000	1.34
+++ aide.spec	9 Dec 2009 18:29:28 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.13.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 09 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-14
+- Revise patch for Initialize libgcrypt correctly (#530485)
+
 * Sat Nov 07 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-13
 - Initialize libgcrypt correctly (#530485)
 



From than at fedoraproject.org  Wed Dec  9 18:30:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Dec 2009 18:30:08 +0000 (UTC)
Subject: rpms/kdelibs3/F-12 kdelibs-3.5.10-kio.patch, NONE, 1.1 kdelibs3.spec,
	1.78, 1.79 kdelibs-3.5.0-kio.patch, 1.1, NONE
Message-ID: <20091209183008.285FA11C03E3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28769

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-kio.patch 
Removed Files:
	kdelibs-3.5.0-kio.patch 
Log Message:
backport upstream patches



kdelibs-3.5.10-kio.patch:
 kzip.cpp |   16 +++++++++++++++-
 kzip.h   |    5 +----
 2 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.10-kio.patch ---
--- kdelibs-3.5.10/kio/kio/kzip.cpp.orig	2009-12-09 18:42:47.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.cpp	2009-12-09 18:45:43.000000000 +0100
@@ -1051,6 +1051,20 @@
     return true;
 }
 
+bool KZip::writeDir(const QString& name, const QString& user, const QString& group)
+{
+    // Zip files have no explicit directories, they are implicitly created during extraction time
+    // when file entries have paths in them.
+    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
+    QString dirName = name;
+    if (!name.endsWith("/"))
+        dirName = dirName.append('/');
+
+    mode_t perm = 040755;
+    time_t the_time = time(0);
+    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
+}
+
 // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
 bool KZip::writeFile( const QString& name, const QString& user, const QString& group, uint size, const char* data )
 {
@@ -1114,7 +1128,7 @@
     }
 
     // delete entries in the filelist with the same filename as the one we want
-    // to save, so that we don?t have duplicate file entries when viewing the zip
+    // to save, so that we don???t have duplicate file entries when viewing the zip
     // with konqi...
     // CAUTION: the old file itself is still in the zip and won't be removed !!!
     QPtrListIterator<KZipFileEntry> it( d->m_fileList );
diff -up kdelibs-3.5.10/kio/kio/kzip.h.orig kdelibs-3.5.10/kio/kio/kzip.h
--- kdelibs-3.5.10/kio/kio/kzip.h.orig	2009-12-09 19:35:42.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.h	2009-12-09 19:35:48.000000000 +0100
@@ -191,10 +191,7 @@ protected:
     /// Closes the archive
     virtual bool closeArchive();
 
-    /**
-     * @internal Not needed for zip
-     */
-    virtual bool writeDir( const QString& name, const QString& user, const QString& group) { Q_UNUSED(name); Q_UNUSED(user); Q_UNUSED(group); return true; }
+    virtual bool writeDir(const QString& name, const QString& user, const QString& group);
     // TODO(BIC) uncomment and make virtual for KDE 4.
 //    bool writeDir( const QString& name, const QString& user, const QString& group,
 //                        mode_t perm, time_t atime, time_t mtime, time_t ctime );


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-12/kdelibs3.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- kdelibs3.spec	9 Dec 2009 18:00:14 -0000	1.78
+++ kdelibs3.spec	9 Dec 2009 18:30:07 -0000	1.79
@@ -81,7 +81,7 @@ Patch101: kde-3.5-libtool-shlibext.patch
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
 Patch105: kdelibs-3.5.10-ossl-1.x.patch
-Patch106: kdelibs-3.5.0-kio.patch
+Patch106: kdelibs-3.5.10-kio.patch
 Patch107: kdelibs-3.5.10-assert.patch
 Patch108: kdelibs-3.5.10-dtoa.patch
 Patch109: kdelibs-3.5.10-kabc.patch


--- kdelibs-3.5.0-kio.patch DELETED ---



From sagarun at fedoraproject.org  Wed Dec  9 18:30:53 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed,  9 Dec 2009 18:30:53 +0000 (UTC)
Subject: rpms/emacs-irsim-mode/F-11 emacs-irsim-mode.spec, NONE,
	1.1 import.log, 
	NONE, 1.1 irsim-mode-init.el, NONE, 1.1 irsim-mode.el, NONE, 1.1
Message-ID: <20091209183053.CD49D11C03AD@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-irsim-mode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29024/F-11

Added Files:
	emacs-irsim-mode.spec import.log irsim-mode-init.el 
	irsim-mode.el 
Log Message:
emacs-irsim-mode for Fedora-11 -First package



--- NEW FILE emacs-irsim-mode.spec ---
%global pkg irsim-mode
%global pkgname Emacs-irsim-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif


Name:		emacs-%{pkg}
Version:	0.1
Release:	6%{?dist}
Summary:	Irsim mode for emacs

Group:		Applications/Editors
License:	MIT
URL:		http://code.google.com/p/irsim-mode/
Source0:	http://irsim-mode.googlecode.com/files/irsim-mode.el
Source1:	%{pkg}-init.el
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version}
		
%description
IRSIM is a switch-level simulator for digital logic circuits.
This is an Emacs mode for editing IRSIM netlists. It provides
syntax highlighting and an extremely pleasant method if indentation.


%package el
Summary:	Source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%{__rm} -rf %{_builddir}/%{name}-%{version}
%{__mkdir} -p %{_builddir}/%{name}-%{version}
cp -p %{SOURCE0} %{_builddir}/%{name}-%{version}
cp -p %{SOURCE1} %{_builddir}/%{name}-%{version}


%build
cd %{name}-%{version}
emacs -batch -f batch-byte-compile %{pkg}.el

%install
%{__rm} -rf %{buildroot}
cd %{name}-%{version}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/irsim-mode/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}	
%{__install} -pm 644 %{pkg}.* %{buildroot}%{emacs_lispdir}/%{pkg}
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{emacs_startdir}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Tue Dec 08 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-6
- Fixed Requires for centos

* Mon Dec 07 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-5
- Fixed installtion failure in EL-5
- irsim-mode handles .out files

* Thu Dec 03 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-4
- Timestamps are preserved
- Autoloads for more file types added

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-3
- Description updated
- source1 updated

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-2
- Reduntant globals removed
- Description updated

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-1
- Initial release 0.1-1


--- NEW FILE import.log ---
emacs-irsim-mode-0_1-6_fc12:F-11:emacs-irsim-mode-0.1-6.fc12.src.rpm:1260383200


--- NEW FILE irsim-mode-init.el ---
;; Init file for irsim mode
(autoload 'irsim-mode "irsim-mode" nil t)
(setq auto-mode-alist
      (cons '("\\.sim$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.cmd$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.out$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.flt$" . irsim-mode) auto-mode-alist))

--- NEW FILE irsim-mode.el ---
;;; A major mode for editing IRSIM netlists. Public domain. Created by
;;; Peter Scott <pjscott at iastate.edu> in 2008. To install, put
;;; irsim-mode.el somewhere that emacs will see it like you site-lisp/
;;; sirectory and stick something like this in your .emacs file:
;;;
;;; (autoload 'irsim-mode "irsim-mode" nil t)
;;; (setq auto-mode-alist
;;;       (cons '("\\.sim$" . irsim-mode) auto-mode-alist))
;;;
;;; Note that this will override the default behavior for opening .sim
;;; files, which is to go into simula-mode. This might be a problem if
;;; you use both.
;;;
;;; Note also that this mode is opinionated. It has a very specific
;;; idea of how IRSIM code ought to be indented, and if you don't like
;;; it then just set irsim-use-fancy-indent to nil. I think that the
;;; default indentation method leads to very pretty files and easy
;;; typing, but YMMV.

(require 'font-lock)
(require 'cl)

;; Customizable variables:
;;;;;;;;;;;;;;;;;;;;;;;;;;

(defvar irsim-use-fancy-indent t
  "Specifies whether irsim-mode should use fancy indentation or
  plain. Default is fancy, but set it to nil for plan.")

(defvar irsim-tab-stops '(0 3 16 32 48 51)
  "The starting column positions for each entry in a transistor
  line using the fancy indent function. Change if you like.")


;; Some global variables

(defvar irsim-mode-version "0.1"
  "The current version number of irsim-mode.")

(defvar irsim-mode-hook nil)

(defconst irsim-font-lock-keywords
  (list
   '("^[\t ]*[np]" . font-lock-builtin-face)
   '("[a-zA-Z_][_-a-zA-Z0-9.]*" . font-lock-variable-name-face))
  "Minimal highlighting expressions for IRSIM mode")

;; Define comment behavior and make underscores act as normal
;; characters for forward-word and backward-word behavior. This makes
;; a lot more sense than the default.
(defvar irsim-mode-syntax-table
  (let ((irsim-mode-syntax-table (make-syntax-table)))
    (modify-syntax-entry ?| "<   " irsim-mode-syntax-table)
    (modify-syntax-entry ?\n ">   " irsim-mode-syntax-table)
    (modify-syntax-entry ?\^m ">   " irsim-mode-syntax-table)
    (modify-syntax-entry ?_ "w" irsim-mode-syntax-table)
    irsim-mode-syntax-table))


;; Indentation
;;;;;;;;;;;;;;

(defun irsim-line-type ()
  "Returns the type of line in IRSIM code that the point is
  on. Valid return values are 'transistor-line, 'comment-line, or
  nil"
  (save-excursion
    (move-beginning-of-line nil)
    (if (looking-at "^[\t ]*[np]")
	'transistor-line
	(if (looking-at "^[\t ]*\\|")
	    'comment-line))))

;; To indent a transistor line, just move the columns into place and
;; put the cursor at the last empty column. Or don't move it if there
;; are no more empty columns. Comment lines should not be indented.
(defun irsim-indent-line ()
  "Indent the current line of IRSIM code properly"
  (interactive)
  (let ((at-end nil))
    (if (looking-at "[\t ]*$")
	(setq at-end t))
    (if (eql (irsim-line-type) 'transistor-line)
	(progn
	  (save-excursion
	    (save-restriction
	      ;; Narrow to just this line
	      (narrow-to-region (line-beginning-position) (line-end-position))
	      (beginning-of-line)
	      (indent-line-to 0)
	      (let ((tab-stops (copy-seq irsim-tab-stops)))
		(while (and tab-stops (not (looking-at "[\t ]*$")))
		  (while (looking-at "[\t ]")
		    (delete-char 1))
		  (indent-to-column (car tab-stops))
		  (setq tab-stops (cdr tab-stops))
		  (forward-word))
		(when (and at-end tab-stops)
		  (message "yarr")
		  (end-of-line)
		  (indent-to-column (car tab-stops))))))
	  (if at-end (end-of-line)))
	(if (eql (irsim-line-type) 'comment-line)
	    (save-excursion
	      (beginning-of-line)
	      (indent-line-to 0))))))



(defun irsim-mode ()
  "Major mode for editing IRSIM netlists."
  (interactive)
  (kill-all-local-variables)
  (make-local-variable 'font-lock-defaults)
  (setq font-lock-defaults '(irsim-font-lock-keywords))
  (set-syntax-table irsim-mode-syntax-table)
  (set (make-local-variable 'comment-start) "| ")

  (when irsim-use-fancy-indent
    (set (make-local-variable 'indent-line-function) 'irsim-indent-line))

  (setq mode-name "IRSIM"
	major-mode 'irsim-mode)
  (run-hooks 'irsim-mode-hook))

(provide 'irsim-mode)



From than at fedoraproject.org  Wed Dec  9 18:31:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Dec 2009 18:31:39 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 kdelibs-3.5.10-kio.patch, NONE, 1.1 kdelibs3.spec,
	1.66, 1.67 kdelibs-3.5.0-kio.patch, 1.1, NONE
Message-ID: <20091209183139.8531D11C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29695

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-kio.patch 
Removed Files:
	kdelibs-3.5.0-kio.patch 
Log Message:
backport upstream patches


kdelibs-3.5.10-kio.patch:
 kzip.cpp |   16 +++++++++++++++-
 kzip.h   |    5 +----
 2 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.10-kio.patch ---
--- kdelibs-3.5.10/kio/kio/kzip.cpp.orig	2009-12-09 18:42:47.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.cpp	2009-12-09 18:45:43.000000000 +0100
@@ -1051,6 +1051,20 @@
     return true;
 }
 
+bool KZip::writeDir(const QString& name, const QString& user, const QString& group)
+{
+    // Zip files have no explicit directories, they are implicitly created during extraction time
+    // when file entries have paths in them.
+    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
+    QString dirName = name;
+    if (!name.endsWith("/"))
+        dirName = dirName.append('/');
+
+    mode_t perm = 040755;
+    time_t the_time = time(0);
+    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
+}
+
 // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
 bool KZip::writeFile( const QString& name, const QString& user, const QString& group, uint size, const char* data )
 {
@@ -1114,7 +1128,7 @@
     }
 
     // delete entries in the filelist with the same filename as the one we want
-    // to save, so that we don?t have duplicate file entries when viewing the zip
+    // to save, so that we don???t have duplicate file entries when viewing the zip
     // with konqi...
     // CAUTION: the old file itself is still in the zip and won't be removed !!!
     QPtrListIterator<KZipFileEntry> it( d->m_fileList );
diff -up kdelibs-3.5.10/kio/kio/kzip.h.orig kdelibs-3.5.10/kio/kio/kzip.h
--- kdelibs-3.5.10/kio/kio/kzip.h.orig	2009-12-09 19:35:42.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.h	2009-12-09 19:35:48.000000000 +0100
@@ -191,10 +191,7 @@ protected:
     /// Closes the archive
     virtual bool closeArchive();
 
-    /**
-     * @internal Not needed for zip
-     */
-    virtual bool writeDir( const QString& name, const QString& user, const QString& group) { Q_UNUSED(name); Q_UNUSED(user); Q_UNUSED(group); return true; }
+    virtual bool writeDir(const QString& name, const QString& user, const QString& group);
     // TODO(BIC) uncomment and make virtual for KDE 4.
 //    bool writeDir( const QString& name, const QString& user, const QString& group,
 //                        mode_t perm, time_t atime, time_t mtime, time_t ctime );


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- kdelibs3.spec	9 Dec 2009 18:05:01 -0000	1.66
+++ kdelibs3.spec	9 Dec 2009 18:31:39 -0000	1.67
@@ -81,7 +81,7 @@ Patch101: kde-3.5-libtool-shlibext.patch
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
 Patch105: kdelibs-3.5.10-ossl-1.x.patch
-Patch106: kdelibs-3.5.0-kio.patch
+Patch106: kdelibs-3.5.10-kio.patch
 Patch107: kdelibs-3.5.10-assert.patch
 Patch108: kdelibs-3.5.10-dtoa.patch
 Patch109: kdelibs-3.5.10-kabc.patch


--- kdelibs-3.5.0-kio.patch DELETED ---



From lkundrak at fedoraproject.org  Wed Dec  9 18:32:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:32:13 +0000 (UTC)
Subject: rpms/xmlbeans/EL-5 xmlbeans.spec,1.1,1.2
Message-ID: <20091209183213.257B711C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29999/EL-5

Modified Files:
	xmlbeans.spec 
Log Message:
Really drop epoch


Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/EL-5/xmlbeans.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmlbeans.spec	9 Dec 2009 18:18:13 -0000	1.1
+++ xmlbeans.spec	9 Dec 2009 18:32:13 -0000	1.2
@@ -77,7 +77,7 @@ Object model.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description javadoc
 %{summary}.
@@ -94,7 +94,7 @@ Group:          Documentation
 %package scripts
 Summary:        Scripts for %{name}
 Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %%{version}-%{release}
 
 %description scripts
 %{summary}.
@@ -194,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-5
+* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.4.0-5
 - Fix up saxon dependency
 - Drop epoch
 - Drop gcj



From lkundrak at fedoraproject.org  Wed Dec  9 18:32:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:32:13 +0000 (UTC)
Subject: rpms/xmlbeans/F-12 xmlbeans.spec,1.1,1.2
Message-ID: <20091209183213.7F58011C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29999/F-12

Modified Files:
	xmlbeans.spec 
Log Message:
Really drop epoch


Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/F-12/xmlbeans.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmlbeans.spec	9 Dec 2009 18:18:14 -0000	1.1
+++ xmlbeans.spec	9 Dec 2009 18:32:13 -0000	1.2
@@ -77,7 +77,7 @@ Object model.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description javadoc
 %{summary}.
@@ -94,7 +94,7 @@ Group:          Documentation
 %package scripts
 Summary:        Scripts for %{name}
 Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %%{version}-%{release}
 
 %description scripts
 %{summary}.
@@ -194,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-5
+* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.4.0-5
 - Fix up saxon dependency
 - Drop epoch
 - Drop gcj



From lkundrak at fedoraproject.org  Wed Dec  9 18:32:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:32:13 +0000 (UTC)
Subject: rpms/xmlbeans/devel xmlbeans.spec,1.1,1.2
Message-ID: <20091209183213.BC72011C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29999/devel

Modified Files:
	xmlbeans.spec 
Log Message:
Really drop epoch


Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/devel/xmlbeans.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmlbeans.spec	9 Dec 2009 18:18:14 -0000	1.1
+++ xmlbeans.spec	9 Dec 2009 18:32:13 -0000	1.2
@@ -77,7 +77,7 @@ Object model.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description javadoc
 %{summary}.
@@ -94,7 +94,7 @@ Group:          Documentation
 %package scripts
 Summary:        Scripts for %{name}
 Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %%{version}-%{release}
 
 %description scripts
 %{summary}.
@@ -194,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-5
+* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.4.0-5
 - Fix up saxon dependency
 - Drop epoch
 - Drop gcj



From lkundrak at fedoraproject.org  Wed Dec  9 18:32:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:32:13 +0000 (UTC)
Subject: rpms/xmlbeans/F-11 xmlbeans.spec,1.1,1.2
Message-ID: <20091209183213.5272911C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29999/F-11

Modified Files:
	xmlbeans.spec 
Log Message:
Really drop epoch


Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/F-11/xmlbeans.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmlbeans.spec	9 Dec 2009 18:18:14 -0000	1.1
+++ xmlbeans.spec	9 Dec 2009 18:32:13 -0000	1.2
@@ -77,7 +77,7 @@ Object model.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description javadoc
 %{summary}.
@@ -94,7 +94,7 @@ Group:          Documentation
 %package scripts
 Summary:        Scripts for %{name}
 Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %%{version}-%{release}
 
 %description scripts
 %{summary}.
@@ -194,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> 0:2.4.0-5
+* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.4.0-5
 - Fix up saxon dependency
 - Drop epoch
 - Drop gcj



From than at fedoraproject.org  Wed Dec  9 18:32:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  9 Dec 2009 18:32:39 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs-3.5.10-kio.patch, NONE,
	1.1 kdelibs3.spec, 1.78, 1.79 kdelibs-3.5.0-kio.patch, 1.1, NONE
Message-ID: <20091209183239.E348011C0264@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30420

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-kio.patch 
Removed Files:
	kdelibs-3.5.0-kio.patch 
Log Message:
 backport upstream patches



kdelibs-3.5.10-kio.patch:
 kzip.cpp |   16 +++++++++++++++-
 kzip.h   |    5 +----
 2 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.10-kio.patch ---
--- kdelibs-3.5.10/kio/kio/kzip.cpp.orig	2009-12-09 18:42:47.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.cpp	2009-12-09 18:45:43.000000000 +0100
@@ -1051,6 +1051,20 @@
     return true;
 }
 
+bool KZip::writeDir(const QString& name, const QString& user, const QString& group)
+{
+    // Zip files have no explicit directories, they are implicitly created during extraction time
+    // when file entries have paths in them.
+    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
+    QString dirName = name;
+    if (!name.endsWith("/"))
+        dirName = dirName.append('/');
+
+    mode_t perm = 040755;
+    time_t the_time = time(0);
+    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
+}
+
 // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
 bool KZip::writeFile( const QString& name, const QString& user, const QString& group, uint size, const char* data )
 {
@@ -1114,7 +1128,7 @@
     }
 
     // delete entries in the filelist with the same filename as the one we want
-    // to save, so that we don?t have duplicate file entries when viewing the zip
+    // to save, so that we don???t have duplicate file entries when viewing the zip
     // with konqi...
     // CAUTION: the old file itself is still in the zip and won't be removed !!!
     QPtrListIterator<KZipFileEntry> it( d->m_fileList );
diff -up kdelibs-3.5.10/kio/kio/kzip.h.orig kdelibs-3.5.10/kio/kio/kzip.h
--- kdelibs-3.5.10/kio/kio/kzip.h.orig	2009-12-09 19:35:42.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.h	2009-12-09 19:35:48.000000000 +0100
@@ -191,10 +191,7 @@ protected:
     /// Closes the archive
     virtual bool closeArchive();
 
-    /**
-     * @internal Not needed for zip
-     */
-    virtual bool writeDir( const QString& name, const QString& user, const QString& group) { Q_UNUSED(name); Q_UNUSED(user); Q_UNUSED(group); return true; }
+    virtual bool writeDir(const QString& name, const QString& user, const QString& group);
     // TODO(BIC) uncomment and make virtual for KDE 4.
 //    bool writeDir( const QString& name, const QString& user, const QString& group,
 //                        mode_t perm, time_t atime, time_t mtime, time_t ctime );


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- kdelibs3.spec	9 Dec 2009 18:02:04 -0000	1.78
+++ kdelibs3.spec	9 Dec 2009 18:32:39 -0000	1.79
@@ -81,7 +81,7 @@ Patch101: kde-3.5-libtool-shlibext.patch
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
 Patch105: kdelibs-3.5.10-ossl-1.x.patch
-Patch106: kdelibs-3.5.0-kio.patch
+Patch106: kdelibs-3.5.10-kio.patch
 Patch107: kdelibs-3.5.10-assert.patch
 Patch108: kdelibs-3.5.10-dtoa.patch
 Patch109: kdelibs-3.5.10-kabc.patch


--- kdelibs-3.5.0-kio.patch DELETED ---



From lkundrak at fedoraproject.org  Wed Dec  9 18:33:11 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:33:11 +0000 (UTC)
Subject: File gant-1.8.1-1.src.rpm uploaded to lookaside cache by lkundrak
Message-ID: <20091209183311.55B4E10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gant:

58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm



From sagarun at fedoraproject.org  Wed Dec  9 18:33:38 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed,  9 Dec 2009 18:33:38 +0000 (UTC)
Subject: rpms/emacs-irsim-mode/F-12 emacs-irsim-mode.spec, NONE,
	1.1 import.log, 
	NONE, 1.1 irsim-mode-init.el, NONE, 1.1 irsim-mode.el, NONE, 1.1
Message-ID: <20091209183338.1059311C0264@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-irsim-mode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31146/F-12

Added Files:
	emacs-irsim-mode.spec import.log irsim-mode-init.el 
	irsim-mode.el 
Log Message:
emacs-irsim-mode for Fedora12 -First package



--- NEW FILE emacs-irsim-mode.spec ---
%global pkg irsim-mode
%global pkgname Emacs-irsim-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif


Name:		emacs-%{pkg}
Version:	0.1
Release:	6%{?dist}
Summary:	Irsim mode for emacs

Group:		Applications/Editors
License:	MIT
URL:		http://code.google.com/p/irsim-mode/
Source0:	http://irsim-mode.googlecode.com/files/irsim-mode.el
Source1:	%{pkg}-init.el
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version}
		
%description
IRSIM is a switch-level simulator for digital logic circuits.
This is an Emacs mode for editing IRSIM netlists. It provides
syntax highlighting and an extremely pleasant method if indentation.


%package el
Summary:	Source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%{__rm} -rf %{_builddir}/%{name}-%{version}
%{__mkdir} -p %{_builddir}/%{name}-%{version}
cp -p %{SOURCE0} %{_builddir}/%{name}-%{version}
cp -p %{SOURCE1} %{_builddir}/%{name}-%{version}


%build
cd %{name}-%{version}
emacs -batch -f batch-byte-compile %{pkg}.el

%install
%{__rm} -rf %{buildroot}
cd %{name}-%{version}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/irsim-mode/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}	
%{__install} -pm 644 %{pkg}.* %{buildroot}%{emacs_lispdir}/%{pkg}
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{emacs_startdir}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Tue Dec 08 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-6
- Fixed Requires for centos

* Mon Dec 07 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-5
- Fixed installtion failure in EL-5
- irsim-mode handles .out files

* Thu Dec 03 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-4
- Timestamps are preserved
- Autoloads for more file types added

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-3
- Description updated
- source1 updated

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-2
- Reduntant globals removed
- Description updated

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-1
- Initial release 0.1-1


--- NEW FILE import.log ---
emacs-irsim-mode-0_1-6_fc12:F-12:emacs-irsim-mode-0.1-6.fc12.src.rpm:1260383425


--- NEW FILE irsim-mode-init.el ---
;; Init file for irsim mode
(autoload 'irsim-mode "irsim-mode" nil t)
(setq auto-mode-alist
      (cons '("\\.sim$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.cmd$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.out$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.flt$" . irsim-mode) auto-mode-alist))

--- NEW FILE irsim-mode.el ---
;;; A major mode for editing IRSIM netlists. Public domain. Created by
;;; Peter Scott <pjscott at iastate.edu> in 2008. To install, put
;;; irsim-mode.el somewhere that emacs will see it like you site-lisp/
;;; sirectory and stick something like this in your .emacs file:
;;;
;;; (autoload 'irsim-mode "irsim-mode" nil t)
;;; (setq auto-mode-alist
;;;       (cons '("\\.sim$" . irsim-mode) auto-mode-alist))
;;;
;;; Note that this will override the default behavior for opening .sim
;;; files, which is to go into simula-mode. This might be a problem if
;;; you use both.
;;;
;;; Note also that this mode is opinionated. It has a very specific
;;; idea of how IRSIM code ought to be indented, and if you don't like
;;; it then just set irsim-use-fancy-indent to nil. I think that the
;;; default indentation method leads to very pretty files and easy
;;; typing, but YMMV.

(require 'font-lock)
(require 'cl)

;; Customizable variables:
;;;;;;;;;;;;;;;;;;;;;;;;;;

(defvar irsim-use-fancy-indent t
  "Specifies whether irsim-mode should use fancy indentation or
  plain. Default is fancy, but set it to nil for plan.")

(defvar irsim-tab-stops '(0 3 16 32 48 51)
  "The starting column positions for each entry in a transistor
  line using the fancy indent function. Change if you like.")


;; Some global variables

(defvar irsim-mode-version "0.1"
  "The current version number of irsim-mode.")

(defvar irsim-mode-hook nil)

(defconst irsim-font-lock-keywords
  (list
   '("^[\t ]*[np]" . font-lock-builtin-face)
   '("[a-zA-Z_][_-a-zA-Z0-9.]*" . font-lock-variable-name-face))
  "Minimal highlighting expressions for IRSIM mode")

;; Define comment behavior and make underscores act as normal
;; characters for forward-word and backward-word behavior. This makes
;; a lot more sense than the default.
(defvar irsim-mode-syntax-table
  (let ((irsim-mode-syntax-table (make-syntax-table)))
    (modify-syntax-entry ?| "<   " irsim-mode-syntax-table)
    (modify-syntax-entry ?\n ">   " irsim-mode-syntax-table)
    (modify-syntax-entry ?\^m ">   " irsim-mode-syntax-table)
    (modify-syntax-entry ?_ "w" irsim-mode-syntax-table)
    irsim-mode-syntax-table))


;; Indentation
;;;;;;;;;;;;;;

(defun irsim-line-type ()
  "Returns the type of line in IRSIM code that the point is
  on. Valid return values are 'transistor-line, 'comment-line, or
  nil"
  (save-excursion
    (move-beginning-of-line nil)
    (if (looking-at "^[\t ]*[np]")
	'transistor-line
	(if (looking-at "^[\t ]*\\|")
	    'comment-line))))

;; To indent a transistor line, just move the columns into place and
;; put the cursor at the last empty column. Or don't move it if there
;; are no more empty columns. Comment lines should not be indented.
(defun irsim-indent-line ()
  "Indent the current line of IRSIM code properly"
  (interactive)
  (let ((at-end nil))
    (if (looking-at "[\t ]*$")
	(setq at-end t))
    (if (eql (irsim-line-type) 'transistor-line)
	(progn
	  (save-excursion
	    (save-restriction
	      ;; Narrow to just this line
	      (narrow-to-region (line-beginning-position) (line-end-position))
	      (beginning-of-line)
	      (indent-line-to 0)
	      (let ((tab-stops (copy-seq irsim-tab-stops)))
		(while (and tab-stops (not (looking-at "[\t ]*$")))
		  (while (looking-at "[\t ]")
		    (delete-char 1))
		  (indent-to-column (car tab-stops))
		  (setq tab-stops (cdr tab-stops))
		  (forward-word))
		(when (and at-end tab-stops)
		  (message "yarr")
		  (end-of-line)
		  (indent-to-column (car tab-stops))))))
	  (if at-end (end-of-line)))
	(if (eql (irsim-line-type) 'comment-line)
	    (save-excursion
	      (beginning-of-line)
	      (indent-line-to 0))))))



(defun irsim-mode ()
  "Major mode for editing IRSIM netlists."
  (interactive)
  (kill-all-local-variables)
  (make-local-variable 'font-lock-defaults)
  (setq font-lock-defaults '(irsim-font-lock-keywords))
  (set-syntax-table irsim-mode-syntax-table)
  (set (make-local-variable 'comment-start) "| ")

  (when irsim-use-fancy-indent
    (set (make-local-variable 'indent-line-function) 'irsim-indent-line))

  (setq mode-name "IRSIM"
	major-mode 'irsim-mode)
  (run-hooks 'irsim-mode-hook))

(provide 'irsim-mode)



From lkundrak at fedoraproject.org  Wed Dec  9 18:33:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:33:59 +0000 (UTC)
Subject: rpms/gant/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091209183359.B16DE11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656/EL-5

Modified Files:
	.cvsignore sources 
Log Message:
Upload gant source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gant/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:54:07 -0000	1.1
+++ .cvsignore	9 Dec 2009 18:33:59 -0000	1.2
@@ -0,0 +1 @@
+gant-1.8.1-1.src.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gant/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:54:07 -0000	1.1
+++ sources	9 Dec 2009 18:33:59 -0000	1.2
@@ -0,0 +1 @@
+58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm



From lkundrak at fedoraproject.org  Wed Dec  9 18:33:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:33:59 +0000 (UTC)
Subject: rpms/gant/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091209183359.DC6C211C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656/F-11

Modified Files:
	.cvsignore sources 
Log Message:
Upload gant source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gant/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:54:07 -0000	1.1
+++ .cvsignore	9 Dec 2009 18:33:59 -0000	1.2
@@ -0,0 +1 @@
+gant-1.8.1-1.src.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gant/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:54:07 -0000	1.1
+++ sources	9 Dec 2009 18:33:59 -0000	1.2
@@ -0,0 +1 @@
+58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm



From lkundrak at fedoraproject.org  Wed Dec  9 18:34:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:34:00 +0000 (UTC)
Subject: rpms/gant/F-12 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091209183400.21E2D11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656/F-12

Modified Files:
	.cvsignore sources 
Log Message:
Upload gant source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gant/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:54:07 -0000	1.1
+++ .cvsignore	9 Dec 2009 18:33:59 -0000	1.2
@@ -0,0 +1 @@
+gant-1.8.1-1.src.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gant/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:54:07 -0000	1.1
+++ sources	9 Dec 2009 18:33:59 -0000	1.2
@@ -0,0 +1 @@
+58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm



From lkundrak at fedoraproject.org  Wed Dec  9 18:34:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:34:00 +0000 (UTC)
Subject: rpms/gant/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091209183400.610A111C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656/devel

Modified Files:
	.cvsignore sources 
Log Message:
Upload gant source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gant/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:54:07 -0000	1.1
+++ .cvsignore	9 Dec 2009 18:34:00 -0000	1.2
@@ -0,0 +1 @@
+gant-1.8.1-1.src.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gant/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:54:07 -0000	1.1
+++ sources	9 Dec 2009 18:34:00 -0000	1.2
@@ -0,0 +1 @@
+58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm



From npajkovs at fedoraproject.org  Wed Dec  9 18:36:28 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Wed,  9 Dec 2009 18:36:28 +0000 (UTC)
Subject: rpms/tk/F-12 tk-8.5.7-color.patch,NONE,1.1 tk.spec,1.64,1.65
Message-ID: <20091209183628.9C5E411C0264@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/tk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv715

Modified Files:
	tk.spec 
Added Files:
	tk-8.5.7-color.patch 
Log Message:
Resolves: #545807 - Color hash problem on x86_64

tk-8.5.7-color.patch:
 tkColor.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE tk-8.5.7-color.patch ---
--- tk8.5.7/generic/tkColor.c.color	2007-12-13 16:24:13.000000000 +0100
+++ tk8.5.7/generic/tkColor.c	2009-12-09 19:22:12.207246662 +0100
@@ -302,6 +302,7 @@
      * First, check to see if there's already a mapping for this color name.
      */
 
+    memset(&valueKey, 0, sizeof(valueKey));
     valueKey.red = colorPtr->red;
     valueKey.green = colorPtr->green;
     valueKey.blue = colorPtr->blue;


Index: tk.spec
===================================================================
RCS file: /cvs/extras/rpms/tk/F-12/tk.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- tk.spec	11 Aug 2009 08:02:52 -0000	1.64
+++ tk.spec	9 Dec 2009 18:36:28 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -25,6 +25,8 @@ Patch1: tk8.5-make.patch
 Patch2: tk8.5-conf.patch
 # this patch isn't needed since tk8.6b1
 Patch3: tk-seg_input.patch
+# this patch is tracked in tk tracker
+Patch4: tk-8.5.7-color.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -49,6 +51,7 @@ The package contains the development fil
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .seg
+%patch4 -p1 -b .color
 
 %build
 cd unix
@@ -116,6 +119,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec 9 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 1:8.5.7-3
+- Resolves: #545807 - Color hash problem on x86_64
+
 * Tue Aug 11 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 1:8.5.7-2
 - Fix Source0 url
 



From sagarun at fedoraproject.org  Wed Dec  9 18:37:13 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed,  9 Dec 2009 18:37:13 +0000 (UTC)
Subject: rpms/emacs-irsim-mode/EL-5 emacs-irsim-mode.spec, NONE,
	1.1 import.log, 
	NONE, 1.1 irsim-mode-init.el, NONE, 1.1 irsim-mode.el, NONE, 1.1
Message-ID: <20091209183713.E9FE211C0264@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-irsim-mode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1017/EL-5

Added Files:
	emacs-irsim-mode.spec import.log irsim-mode-init.el 
	irsim-mode.el 
Log Message:
emacs-irsim-mode for EL-5



--- NEW FILE emacs-irsim-mode.spec ---
%global pkg irsim-mode
%global pkgname Emacs-irsim-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif


Name:		emacs-%{pkg}
Version:	0.1
Release:	6%{?dist}
Summary:	Irsim mode for emacs

Group:		Applications/Editors
License:	MIT
URL:		http://code.google.com/p/irsim-mode/
Source0:	http://irsim-mode.googlecode.com/files/irsim-mode.el
Source1:	%{pkg}-init.el
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version}
		
%description
IRSIM is a switch-level simulator for digital logic circuits.
This is an Emacs mode for editing IRSIM netlists. It provides
syntax highlighting and an extremely pleasant method if indentation.


%package el
Summary:	Source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%{__rm} -rf %{_builddir}/%{name}-%{version}
%{__mkdir} -p %{_builddir}/%{name}-%{version}
cp -p %{SOURCE0} %{_builddir}/%{name}-%{version}
cp -p %{SOURCE1} %{_builddir}/%{name}-%{version}


%build
cd %{name}-%{version}
emacs -batch -f batch-byte-compile %{pkg}.el

%install
%{__rm} -rf %{buildroot}
cd %{name}-%{version}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/irsim-mode/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}	
%{__install} -pm 644 %{pkg}.* %{buildroot}%{emacs_lispdir}/%{pkg}
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{emacs_startdir}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Tue Dec 08 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-6
- Fixed Requires for centos

* Mon Dec 07 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-5
- Fixed installtion failure in EL-5
- irsim-mode handles .out files

* Thu Dec 03 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-4
- Timestamps are preserved
- Autoloads for more file types added

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-3
- Description updated
- source1 updated

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-2
- Reduntant globals removed
- Description updated

* Wed Dec 02 2009 Arun SAG <sagarun [AT] gmail dot com> - 0.1-1
- Initial release 0.1-1


--- NEW FILE import.log ---
emacs-irsim-mode-0_1-6_fc12:EL-5:emacs-irsim-mode-0.1-6.fc12.src.rpm:1260383639


--- NEW FILE irsim-mode-init.el ---
;; Init file for irsim mode
(autoload 'irsim-mode "irsim-mode" nil t)
(setq auto-mode-alist
      (cons '("\\.sim$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.cmd$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.out$" . irsim-mode) auto-mode-alist))
(setq auto-mode-alist
      (cons '("\\.flt$" . irsim-mode) auto-mode-alist))

--- NEW FILE irsim-mode.el ---
;;; A major mode for editing IRSIM netlists. Public domain. Created by
;;; Peter Scott <pjscott at iastate.edu> in 2008. To install, put
;;; irsim-mode.el somewhere that emacs will see it like you site-lisp/
;;; sirectory and stick something like this in your .emacs file:
;;;
;;; (autoload 'irsim-mode "irsim-mode" nil t)
;;; (setq auto-mode-alist
;;;       (cons '("\\.sim$" . irsim-mode) auto-mode-alist))
;;;
;;; Note that this will override the default behavior for opening .sim
;;; files, which is to go into simula-mode. This might be a problem if
;;; you use both.
;;;
;;; Note also that this mode is opinionated. It has a very specific
;;; idea of how IRSIM code ought to be indented, and if you don't like
;;; it then just set irsim-use-fancy-indent to nil. I think that the
;;; default indentation method leads to very pretty files and easy
;;; typing, but YMMV.

(require 'font-lock)
(require 'cl)

;; Customizable variables:
;;;;;;;;;;;;;;;;;;;;;;;;;;

(defvar irsim-use-fancy-indent t
  "Specifies whether irsim-mode should use fancy indentation or
  plain. Default is fancy, but set it to nil for plan.")

(defvar irsim-tab-stops '(0 3 16 32 48 51)
  "The starting column positions for each entry in a transistor
  line using the fancy indent function. Change if you like.")


;; Some global variables

(defvar irsim-mode-version "0.1"
  "The current version number of irsim-mode.")

(defvar irsim-mode-hook nil)

(defconst irsim-font-lock-keywords
  (list
   '("^[\t ]*[np]" . font-lock-builtin-face)
   '("[a-zA-Z_][_-a-zA-Z0-9.]*" . font-lock-variable-name-face))
  "Minimal highlighting expressions for IRSIM mode")

;; Define comment behavior and make underscores act as normal
;; characters for forward-word and backward-word behavior. This makes
;; a lot more sense than the default.
(defvar irsim-mode-syntax-table
  (let ((irsim-mode-syntax-table (make-syntax-table)))
    (modify-syntax-entry ?| "<   " irsim-mode-syntax-table)
    (modify-syntax-entry ?\n ">   " irsim-mode-syntax-table)
    (modify-syntax-entry ?\^m ">   " irsim-mode-syntax-table)
    (modify-syntax-entry ?_ "w" irsim-mode-syntax-table)
    irsim-mode-syntax-table))


;; Indentation
;;;;;;;;;;;;;;

(defun irsim-line-type ()
  "Returns the type of line in IRSIM code that the point is
  on. Valid return values are 'transistor-line, 'comment-line, or
  nil"
  (save-excursion
    (move-beginning-of-line nil)
    (if (looking-at "^[\t ]*[np]")
	'transistor-line
	(if (looking-at "^[\t ]*\\|")
	    'comment-line))))

;; To indent a transistor line, just move the columns into place and
;; put the cursor at the last empty column. Or don't move it if there
;; are no more empty columns. Comment lines should not be indented.
(defun irsim-indent-line ()
  "Indent the current line of IRSIM code properly"
  (interactive)
  (let ((at-end nil))
    (if (looking-at "[\t ]*$")
	(setq at-end t))
    (if (eql (irsim-line-type) 'transistor-line)
	(progn
	  (save-excursion
	    (save-restriction
	      ;; Narrow to just this line
	      (narrow-to-region (line-beginning-position) (line-end-position))
	      (beginning-of-line)
	      (indent-line-to 0)
	      (let ((tab-stops (copy-seq irsim-tab-stops)))
		(while (and tab-stops (not (looking-at "[\t ]*$")))
		  (while (looking-at "[\t ]")
		    (delete-char 1))
		  (indent-to-column (car tab-stops))
		  (setq tab-stops (cdr tab-stops))
		  (forward-word))
		(when (and at-end tab-stops)
		  (message "yarr")
		  (end-of-line)
		  (indent-to-column (car tab-stops))))))
	  (if at-end (end-of-line)))
	(if (eql (irsim-line-type) 'comment-line)
	    (save-excursion
	      (beginning-of-line)
	      (indent-line-to 0))))))



(defun irsim-mode ()
  "Major mode for editing IRSIM netlists."
  (interactive)
  (kill-all-local-variables)
  (make-local-variable 'font-lock-defaults)
  (setq font-lock-defaults '(irsim-font-lock-keywords))
  (set-syntax-table irsim-mode-syntax-table)
  (set (make-local-variable 'comment-start) "| ")

  (when irsim-use-fancy-indent
    (set (make-local-variable 'indent-line-function) 'irsim-indent-line))

  (setq mode-name "IRSIM"
	major-mode 'irsim-mode)
  (run-hooks 'irsim-mode-hook))

(provide 'irsim-mode)



From lkundrak at fedoraproject.org  Wed Dec  9 18:38:15 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:38:15 +0000 (UTC)
Subject: File gant_src-1.8.1.tgz uploaded to lookaside cache by lkundrak
Message-ID: <20091209183815.B0F7410F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gant:

1067d000816883c072819a802fb00d81  gant_src-1.8.1.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:38:57 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:38:57 +0000 (UTC)
Subject: rpms/gant/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091209183857.56A3011C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1952/F-11

Modified Files:
	.cvsignore sources 
Log Message:
Upload gant source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gant/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Dec 2009 18:33:59 -0000	1.2
+++ .cvsignore	9 Dec 2009 18:38:57 -0000	1.3
@@ -1 +1 @@
-gant-1.8.1-1.src.rpm
+gant_src-1.8.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gant/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Dec 2009 18:33:59 -0000	1.2
+++ sources	9 Dec 2009 18:38:57 -0000	1.3
@@ -1 +1 @@
-58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm
+1067d000816883c072819a802fb00d81  gant_src-1.8.1.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:38:57 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:38:57 +0000 (UTC)
Subject: rpms/gant/EL-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091209183857.31F5811C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1952/EL-5

Modified Files:
	.cvsignore sources 
Log Message:
Upload gant source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gant/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Dec 2009 18:33:59 -0000	1.2
+++ .cvsignore	9 Dec 2009 18:38:56 -0000	1.3
@@ -1 +1 @@
-gant-1.8.1-1.src.rpm
+gant_src-1.8.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gant/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Dec 2009 18:33:59 -0000	1.2
+++ sources	9 Dec 2009 18:38:57 -0000	1.3
@@ -1 +1 @@
-58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm
+1067d000816883c072819a802fb00d81  gant_src-1.8.1.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:38:57 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:38:57 +0000 (UTC)
Subject: rpms/gant/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091209183857.C55FE11C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1952/devel

Modified Files:
	.cvsignore sources 
Log Message:
Upload gant source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gant/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Dec 2009 18:34:00 -0000	1.2
+++ .cvsignore	9 Dec 2009 18:38:57 -0000	1.3
@@ -1 +1 @@
-gant-1.8.1-1.src.rpm
+gant_src-1.8.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gant/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Dec 2009 18:34:00 -0000	1.2
+++ sources	9 Dec 2009 18:38:57 -0000	1.3
@@ -1 +1 @@
-58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm
+1067d000816883c072819a802fb00d81  gant_src-1.8.1.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:38:57 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:38:57 +0000 (UTC)
Subject: rpms/gant/F-12 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091209183857.87C1011C0264@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1952/F-12

Modified Files:
	.cvsignore sources 
Log Message:
Upload gant source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gant/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Dec 2009 18:33:59 -0000	1.2
+++ .cvsignore	9 Dec 2009 18:38:57 -0000	1.3
@@ -1 +1 @@
-gant-1.8.1-1.src.rpm
+gant_src-1.8.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gant/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Dec 2009 18:33:59 -0000	1.2
+++ sources	9 Dec 2009 18:38:57 -0000	1.3
@@ -1 +1 @@
-58b8acd334f49e31747baf41c1472534  gant-1.8.1-1.src.rpm
+1067d000816883c072819a802fb00d81  gant_src-1.8.1.tgz



From lkundrak at fedoraproject.org  Wed Dec  9 18:40:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:40:12 +0000 (UTC)
Subject: rpms/xmlbeans/EL-5 xmlbeans.spec,1.2,1.3
Message-ID: <20091209184012.B77B611C03DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2706/EL-5

Modified Files:
	xmlbeans.spec 
Log Message:
Really drop epoch


Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/EL-5/xmlbeans.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlbeans.spec	9 Dec 2009 18:32:13 -0000	1.2
+++ xmlbeans.spec	9 Dec 2009 18:40:12 -0000	1.3
@@ -94,7 +94,7 @@ Group:          Documentation
 %package scripts
 Summary:        Scripts for %{name}
 Group:          Development/Tools
-Requires:       %{name} = %%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description scripts
 %{summary}.



From lkundrak at fedoraproject.org  Wed Dec  9 18:40:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:40:12 +0000 (UTC)
Subject: rpms/xmlbeans/F-11 xmlbeans.spec,1.2,1.3
Message-ID: <20091209184012.E1E0411C03DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2706/F-11

Modified Files:
	xmlbeans.spec 
Log Message:
Really drop epoch


Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/F-11/xmlbeans.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlbeans.spec	9 Dec 2009 18:32:13 -0000	1.2
+++ xmlbeans.spec	9 Dec 2009 18:40:12 -0000	1.3
@@ -94,7 +94,7 @@ Group:          Documentation
 %package scripts
 Summary:        Scripts for %{name}
 Group:          Development/Tools
-Requires:       %{name} = %%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description scripts
 %{summary}.



From lkundrak at fedoraproject.org  Wed Dec  9 18:40:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:40:13 +0000 (UTC)
Subject: rpms/xmlbeans/F-12 xmlbeans.spec,1.2,1.3
Message-ID: <20091209184013.1A18111C03DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2706/F-12

Modified Files:
	xmlbeans.spec 
Log Message:
Really drop epoch


Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/F-12/xmlbeans.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlbeans.spec	9 Dec 2009 18:32:13 -0000	1.2
+++ xmlbeans.spec	9 Dec 2009 18:40:12 -0000	1.3
@@ -94,7 +94,7 @@ Group:          Documentation
 %package scripts
 Summary:        Scripts for %{name}
 Group:          Development/Tools
-Requires:       %{name} = %%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description scripts
 %{summary}.



From lkundrak at fedoraproject.org  Wed Dec  9 18:40:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 18:40:13 +0000 (UTC)
Subject: rpms/xmlbeans/devel xmlbeans.spec,1.2,1.3
Message-ID: <20091209184013.51C0811C03DB@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2706/devel

Modified Files:
	xmlbeans.spec 
Log Message:
Really drop epoch


Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/devel/xmlbeans.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlbeans.spec	9 Dec 2009 18:32:13 -0000	1.2
+++ xmlbeans.spec	9 Dec 2009 18:40:13 -0000	1.3
@@ -94,7 +94,7 @@ Group:          Documentation
 %package scripts
 Summary:        Scripts for %{name}
 Group:          Development/Tools
-Requires:       %{name} = %%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description scripts
 %{summary}.



From pkgdb at fedoraproject.org  Wed Dec  9 18:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:54:53 +0000
Subject: [pkgdb] resource-agents: lon has requested commit
Message-ID: <20091209185455.279C110F861@bastion2.fedora.phx.redhat.com>

lon has requested the commit acl on resource-agents (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:04 +0000
Subject: [pkgdb] resource-agents: lon has requested commit
Message-ID: <20091209185504.7503110F85C@bastion2.fedora.phx.redhat.com>

lon has requested the commit acl on resource-agents (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:11 +0000
Subject: [pkgdb] resource-agents: lon has requested commit
Message-ID: <20091209185511.7BB0810F861@bastion2.fedora.phx.redhat.com>

lon has requested the commit acl on resource-agents (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:14 +0000
Subject: [pkgdb] resource-agents: lon has given up watchbugzilla
Message-ID: <20091209185514.5F96710F89A@bastion2.fedora.phx.redhat.com>

lon has given up the watchbugzilla acl on resource-agents (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:16 +0000
Subject: [pkgdb] resource-agents: lon has given up watchbugzilla
Message-ID: <20091209185516.3822B10F80A@bastion2.fedora.phx.redhat.com>

lon has given up the watchbugzilla acl on resource-agents (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:19 +0000
Subject: [pkgdb] resource-agents: lon has given up watchbugzilla
Message-ID: <20091209185519.C440910F8A2@bastion2.fedora.phx.redhat.com>

lon has given up the watchbugzilla acl on resource-agents (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:22 +0000
Subject: [pkgdb] resource-agents: lon has given up watchbugzilla
Message-ID: <20091209185522.CCD2C10F85F@bastion2.fedora.phx.redhat.com>

lon has given up the watchbugzilla acl on resource-agents (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:24 +0000
Subject: [pkgdb] resource-agents: lon has given up watchbugzilla
Message-ID: <20091209185524.84FF210F892@bastion2.fedora.phx.redhat.com>

lon has given up the watchbugzilla acl on resource-agents (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:28 +0000
Subject: [pkgdb] resource-agents: lon has given up watchcommits
Message-ID: <20091209185528.E859410F8A9@bastion2.fedora.phx.redhat.com>

lon has given up the watchcommits acl on resource-agents (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:30 +0000
Subject: [pkgdb] resource-agents: lon has given up watchcommits
Message-ID: <20091209185530.31BF010F8AD@bastion2.fedora.phx.redhat.com>

lon has given up the watchcommits acl on resource-agents (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 18:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 18:55:32 +0000
Subject: [pkgdb] resource-agents: lon has given up watchcommits
Message-ID: <20091209185532.6957E10F8B1@bastion2.fedora.phx.redhat.com>

lon has given up the watchcommits acl on resource-agents (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 19:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:06:30 +0000
Subject: [pkgdb] resource-agents had acl change status
Message-ID: <20091209190630.AB69710F85F@bastion2.fedora.phx.redhat.com>

fabbione has set the commit acl on resource-agents (Fedora devel) to Approved for lon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 19:06:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:06:42 +0000
Subject: [pkgdb] resource-agents had acl change status
Message-ID: <20091209190642.7C4E910F87D@bastion2.fedora.phx.redhat.com>

fabbione has set the commit acl on resource-agents (Fedora 11) to Approved for lon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From pkgdb at fedoraproject.org  Wed Dec  9 19:06:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:06:46 +0000
Subject: [pkgdb] resource-agents had acl change status
Message-ID: <20091209190646.B7FE910F892@bastion2.fedora.phx.redhat.com>

fabbione has set the commit acl on resource-agents (Fedora 12) to Approved for lon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/resource-agents



From kdudka at fedoraproject.org  Wed Dec  9 19:12:22 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  9 Dec 2009 19:12:22 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.133,1.134
Message-ID: <20091209191222.9D9AB11C00E0@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16382

Modified Files:
	curl.spec 
Log Message:
- replace hard wired port numbers in the test suite


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- curl.spec	9 Dec 2009 17:48:00 -0000	1.133
+++ curl.spec	9 Dec 2009 19:12:22 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -100,6 +100,9 @@ use cURL's capabilities internally.
 
 autoconf
 
+# replace hard wired port numbers in the test suite
+sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ tests/data/test*
+
 # Convert docs to UTF-8
 for f in CHANGES README; do
 	iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
@@ -127,7 +130,7 @@ make %{?_smp_mflags}
 
 # use different port range for 32bit and 64bit build, thus make it possible
 # to run both in parallel on the same machine
-./runtests.pl -a -b89%{?__isa_bits} -p -v
+./runtests.pl -a -b%{?__isa_bits}90 -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -186,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 09 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-8
+- replace hard wired port numbers in the test suite
+
 * Wed Dec 09 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-7
 - use different port numbers for 32bit and 64bit builds
 - temporary workaround for #545779



From kdudka at fedoraproject.org  Wed Dec  9 19:15:29 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  9 Dec 2009 19:15:29 +0000 (UTC)
Subject: rpms/curl/F-12 curl.spec,1.129,1.130
Message-ID: <20091209191529.9510F11C00E0@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17457

Modified Files:
	curl.spec 
Log Message:
- replace hard wired port numbers in the test suite


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- curl.spec	9 Dec 2009 18:06:57 -0000	1.129
+++ curl.spec	9 Dec 2009 19:15:29 -0000	1.130
@@ -95,6 +95,9 @@ use cURL's capabilities internally.
 
 autoconf
 
+# replace hard wired port numbers in the test suite
+sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ tests/data/test*
+
 # Convert docs to UTF-8
 for f in CHANGES README; do
 	iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
@@ -121,7 +124,7 @@ cd tests
 make %{?_smp_mflags}
 # use different port range for 32bit and 64bit build, thus make it possible
 # to run both in parallel on the same machine
-./runtests.pl -a -b89%{?__isa_bits} -p -v
+./runtests.pl -a -b%{?__isa_bits}90 -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -182,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Dec 09 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-5
 - use different port numbers for 32bit and 64bit builds
+- replace hard wired port numbers in the test suite
 
 * Tue Dec 08 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
 - avoid use of uninitialized value in lib/nss.c



From overholt at fedoraproject.org  Wed Dec  9 19:17:22 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  9 Dec 2009 19:17:22 +0000 (UTC)
Subject: File xmlrpc3-buildfiles.tar.bz2 uploaded to lookaside cache by
	overholt
Message-ID: <20091209191722.D9CFA10F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xmlrpc3:

5c389301aa9319e46b74bb7ab0897f33  xmlrpc3-buildfiles.tar.bz2



From overholt at fedoraproject.org  Wed Dec  9 19:17:33 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  9 Dec 2009 19:17:33 +0000 (UTC)
Subject: File xmlrpc3-ant-osgimanifests.tar.bz2 uploaded to lookaside cache
	by overholt
Message-ID: <20091209191733.5A34B10F80A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xmlrpc3:

107ca9a1e78fcdacc9d5663a9ad3b464  xmlrpc3-ant-osgimanifests.tar.bz2



From overholt at fedoraproject.org  Wed Dec  9 19:18:14 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  9 Dec 2009 19:18:14 +0000 (UTC)
Subject: rpms/xmlrpc3/devel xmlrpc3-ant-osgimanifests.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xmlrpc3.spec, 1.15, 1.16
Message-ID: <20091209191814.B9C8F11C00E0@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18714

Modified Files:
	.cvsignore sources xmlrpc3.spec 
Added Files:
	xmlrpc3-ant-osgimanifests.patch 
Log Message:
* Wed Dec 09 2009 Andrew Overholt <overholt at redhat.com> 3.0-4.11
- Disable building with maven due to missing -release plugin.
- Provide ability to build with ant.
- Drop maven2-plugin-release BR as it's folded into maven2.

xmlrpc3-ant-osgimanifests.patch:
 client/maven-build.xml |    1 +
 common/maven-build.xml |    1 +
 server/maven-build.xml |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE xmlrpc3-ant-osgimanifests.patch ---
diff -up ./client/maven-build.xml.manifest ./client/maven-build.xml
--- ./client/maven-build.xml.manifest	2009-12-09 13:41:23.000000000 -0500
+++ ./client/maven-build.xml	2009-12-09 13:42:14.000000000 -0500
@@ -187,6 +187,7 @@
          compress="true" 
          index="false" 
          basedir="${maven.build.outputDir}" 
+         manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
          excludes="**/package.html"/>
   </target>
 
diff -up ./common/maven-build.xml.manifest ./common/maven-build.xml
--- ./common/maven-build.xml.manifest	2009-12-09 13:41:59.000000000 -0500
+++ ./common/maven-build.xml	2009-12-09 13:41:03.000000000 -0500
@@ -173,6 +173,7 @@
          compress="true" 
          index="false" 
          basedir="${maven.build.outputDir}" 
+         manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
          excludes="**/package.html"/>
   </target>
 
diff -up ./server/maven-build.xml.manifest ./server/maven-build.xml
--- ./server/maven-build.xml.manifest	2009-12-09 13:41:32.000000000 -0500
+++ ./server/maven-build.xml	2009-12-09 13:42:07.000000000 -0500
@@ -183,6 +183,7 @@
          compress="true" 
          index="false" 
          basedir="${maven.build.outputDir}" 
+         manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
          excludes="**/package.html"/>
   </target>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Oct 2008 17:53:11 -0000	1.2
+++ .cvsignore	9 Dec 2009 19:18:14 -0000	1.3
@@ -1 +1,3 @@
 xmlrpc-3.0-src.tar.gz
+xmlrpc3-buildfiles.tar.bz2
+xmlrpc3-ant-osgimanifests.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2007 16:32:40 -0000	1.2
+++ sources	9 Dec 2009 19:18:14 -0000	1.3
@@ -1 +1,3 @@
 99500a5d04f2eb558716ba3d5a613d14  xmlrpc-3.0-src.tar.gz
+5c389301aa9319e46b74bb7ab0897f33  xmlrpc3-buildfiles.tar.bz2
+107ca9a1e78fcdacc9d5663a9ad3b464  xmlrpc3-ant-osgimanifests.tar.bz2


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xmlrpc3.spec	17 Aug 2009 19:18:43 -0000	1.15
+++ xmlrpc3.spec	9 Dec 2009 19:18:14 -0000	1.16
@@ -28,7 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define mainname xmlrpc
+%global mainname xmlrpc
+%global     with_maven 0
 
 Name:       xmlrpc3
 Version:    3.0
@@ -39,15 +40,25 @@ Group:      Development/Libraries
 Url:        http://ws.apache.org/xmlrpc/
 Source0:    http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-%{version}-src.tar.gz
 Source1:    %{name}-jpp-depmap.xml
+%if ! %{with_maven}
+# These build files were generated with mvn ant:ant
+Source2:    %{name}-buildfiles.tar.bz2
+Source3:    %{name}-ant-osgimanifests.tar.bz2
+%endif
 # FIXME:  file this upstream
 # The tests pom.xml doesn't include necessary dependencies on junit and
 # servletapi
 Patch0:     %{name}-addjunitandservletapitotestpom.patch
+%if %{with_maven}
 # Add OSGi MANIFEST information
 Patch1:     %{name}-client-addosgimanifest.patch
 Patch2:     %{name}-common-addosgimanifest.patch
+%else
+Patch3:     %{name}-ant-osgimanifests.patch
+%endif
 
 BuildRequires:  dos2unix
+%if %{with_maven}
 BuildRequires:  maven2 >= 2.0.4
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-compiler
@@ -59,6 +70,7 @@ BuildRequires:  maven2-plugin-eclipse
 BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-release
 BuildRequires:  maven2-plugin-source
+%endif
 BuildRequires:  ws-jaxme
 BuildRequires:  ws-commons-util
 BuildRequires:  jpackage-utils >= 0:1.6
@@ -144,6 +156,7 @@ Requires:   %{name}-server
 %prep
 %setup -q -n %{mainname}-%{version}
 %patch0
+%if %{with_maven}
 cp %{SOURCE1} .
 pushd client
 %patch1
@@ -151,11 +164,80 @@ popd
 pushd common
 %patch2
 popd
+%else
+tar jxf %{SOURCE2}
+tar jxf %{SOURCE3}
+%patch3
+%endif
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+rm -rf $MAVEN_REPO_LOCAL
+mkdir -p $MAVEN_REPO_LOCAL
+
+%if ! %{with_maven}
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/ws/commons/ws-commons-util/1.0.1
+ln -s %{_javadir}/ws-commons-util-1.0.1.jar \
+  $MAVEN_REPO_LOCAL/org/apache/ws/commons/ws-commons-util/1.0.1
+
+mkdir -p $MAVEN_REPO_LOCAL/junit/junit/3.8.1
+ln -s %{_javadir}/junit-3.8.2.jar \
+  $MAVEN_REPO_LOCAL/junit/junit/3.8.1/junit-3.8.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
+ln -s %{_javadir}/xml-commons-apis-1.3.04.jar \
+  $MAVEN_REPO_LOCAL/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/jaxme/jaxmeapi/0.5.1/jaxmeapi-0.5.1.jar
+ln -s %{_javadir}/jaxme/ws-jaxmeapi-0.5.1.jar \
+  $MAVEN_REPO_LOCAL/jaxme/jaxmeapi/0.5.1
+
+mkdir -p $MAVEN_REPO_LOCAL/commons-httpclient/commons-httpclient/3.0.1
+ln -s %{_javadir}/commons-httpclient.jar \
+  $MAVEN_REPO_LOCAL/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/commons-logging/commons-logging/1.1
+ln -s %{_javadir}/commons-logging.jar \
+  $MAVEN_REPO_LOCAL/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/log4j/log4j/1.2.12
+ln -s %{_javadir}/log4j.jar \
+  $MAVEN_REPO_LOCAL/log4j/log4j/1.2.12/log4j-1.2.12.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/logkit/logkit/1.0.1
+ln -s %{_javadir}/avalon-logkit.jar \
+  $MAVEN_REPO_LOCAL/logkit/logkit/1.0.1/logkit-1.0.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/avalon-framework/avalon-framework/4.1.3
+ln -s %{_javadir}/avalon-framework.jar \
+  $MAVEN_REPO_LOCAL/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/javax/servlet/servlet-api/2.4
+ln -s %{_javadir}/servlet_2_4_api.jar \
+  $MAVEN_REPO_LOCAL/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/commons-codec/commons-codec/1.2
+ln -s %{_javadir}/commons-codec.jar \
+  $MAVEN_REPO_LOCAL/commons-codec/commons-codec/1.2/commons-codec-1.2.jar
+
+# These next three will appear broken but become un-broken during the build
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-common/3.0
+ln -s ../../../../../../../common/target/xmlrpc-common-3.0.jar \
+  $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-common/3.0/xmlrpc-common-3.0.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-client/3.0
+ln -s ../../../../../../../client/target/xmlrpc-client-3.0.jar \
+  $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-client/3.0/xmlrpc-client-3.0.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-server/3.0
+ln -s ../../../../../../../server/target/xmlrpc-server-3.0.jar \
+  $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-server/3.0/xmlrpc-server-3.0.jar
+%endif
 
 %build
 dos2unix LICENSE.txt
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
+%if %{with_maven}
 # The java.home is due to java-gcj and libgcj weirdness on 64-bit
 # systems
 mvn-jpp \
@@ -165,6 +247,20 @@ mvn-jpp \
   -Dmaven2.jpp.depmap.file=%{SOURCE1} \
   -Dmaven.test.failure.ignore=true \
   install javadoc:javadoc
+%else
+ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+  -Djunit.skipped=true -Dmaven.test.skip=true javadoc package
+find -name \.svn | xargs rm -rf
+jar cf common/target/%{mainname}-common-%{version}-sources.jar \
+  common/src/main/java/META-INF/MANIFEST.MF \
+  -C common/src/main/java .
+jar cf client/target/%{mainname}-client-%{version}-sources.jar \
+  client/src/main/java/META-INF/MANIFEST.MF \
+  -C client/src/main/java .
+jar cf server/target/%{mainname}-server-%{version}-sources.jar \
+  server/src/main/java/META-INF/MANIFEST.MF \
+  -C server/src/main/java .
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -190,7 +286,13 @@ install -m 644 common/target/%{mainname}
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{with_maven}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%else
+cp -pr common/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr client/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr server/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -228,6 +330,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/%{name}-server-%{version}-sources.jar
 
 %changelog
+* Wed Dec 09 2009 Andrew Overholt <overholt at redhat.com> 3.0-4.11
+- Disable building with maven due to missing -release plugin.
+- Provide ability to build with ant.
+- Drop maven2-plugin-release BR as it's folded into maven2.
+
 * Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 3.0-4.10
 - Fixed URL (bug #354031)
 



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:27 +0000
Subject: [pkgdb] scipy: limb has given up watchcommits
Message-ID: <20091209192927.6703D10F865@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on scipy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:28 +0000
Subject: [pkgdb] scipy: limb has given up watchbugzilla
Message-ID: <20091209192928.147AC10F890@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on scipy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:28 +0000
Subject: [pkgdb] scipy: limb has requested commit
Message-ID: <20091209192928.4BC5D10F89C@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on scipy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:30 +0000
Subject: [pkgdb] scipy: limb has requested approveacls
Message-ID: <20091209192931.D9E3C10F80A@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on scipy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:40 +0000
Subject: [pkgdb] scipy: limb has given up watchcommits
Message-ID: <20091209192940.4D97F10F8AB@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on scipy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:40 +0000
Subject: [pkgdb] scipy: limb has requested commit
Message-ID: <20091209192940.9F78310F8AF@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on scipy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:40 +0000
Subject: [pkgdb] scipy: limb has given up watchbugzilla
Message-ID: <20091209192940.C5F0A10F8B2@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on scipy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:42 +0000
Subject: [pkgdb] scipy: limb has requested approveacls
Message-ID: <20091209192942.A746C10F8B4@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on scipy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:45 +0000
Subject: [pkgdb] scipy: limb has given up watchcommits
Message-ID: <20091209192945.842B210F892@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on scipy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:46 +0000
Subject: [pkgdb] scipy: limb has given up watchbugzilla
Message-ID: <20091209192946.45D9810F8BB@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on scipy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:46 +0000
Subject: [pkgdb] scipy: limb has requested commit
Message-ID: <20091209192946.0C4FE10F8B8@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on scipy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:47 +0000
Subject: [pkgdb] scipy: limb has requested approveacls
Message-ID: <20091209192947.96BED10F8BE@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on scipy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:50 +0000
Subject: [pkgdb] scipy: limb has given up watchcommits
Message-ID: <20091209192951.02BBF10F8C2@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on scipy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:51 +0000
Subject: [pkgdb] scipy: limb has requested commit
Message-ID: <20091209192951.BBE7010F890@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on scipy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:51 +0000
Subject: [pkgdb] scipy: limb has given up watchbugzilla
Message-ID: <20091209192951.DE95C10F8C6@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on scipy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Wed Dec  9 19:29:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:29:52 +0000
Subject: [pkgdb] scipy: limb has requested approveacls
Message-ID: <20091209192952.F0A0E10F89D@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on scipy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From rstrode at fedoraproject.org  Wed Dec  9 19:30:29 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  9 Dec 2009 19:30:29 +0000 (UTC)
Subject: File plymouth-0.8.0.tar.bz2 uploaded to lookaside cache by rstrode
Message-ID: <20091209193029.A852110F8A2@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for plymouth:

6b324b6efa58c54c8c9504bb1ab441b0  plymouth-0.8.0.tar.bz2



From rstrode at fedoraproject.org  Wed Dec  9 19:30:46 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  9 Dec 2009 19:30:46 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec, 1.150, 1.151 sources, 1.62,
	1.63 0001-populate-initrd-Get-plugin-path-from-plymouth.patch, 1.1,
	NONE 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch,
	1.2, NONE
Message-ID: <20091209193046.E1B1711C00E0@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22920

Modified Files:
	plymouth.spec sources 
Removed Files:
	0001-populate-initrd-Get-plugin-path-from-plymouth.patch 
	0001-populate-initrd-Try-to-find-inst-more-aggressively.patch 
Log Message:
- Update to latest snapshot



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- plymouth.spec	23 Nov 2009 19:21:13 -0000	1.150
+++ plymouth.spec	9 Dec 2009 19:30:46 -0000	1.151
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.1.2009.11.23%{?dist}
+Release: 0.2009129%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -237,7 +237,7 @@ plugin.
 %setup -q
 
 %build
-%configure --enable-tracing --disable-tests --without-boot-entry \
+%configure --enable-tracing --disable-tests                      \
            --without-default-plugin                              \
            --with-logo=%{_datadir}/pixmaps/system-logo-white.png \
            --with-background-start-color-stop=0x0073B3           \
@@ -454,7 +454,7 @@ fi
 %defattr(-, root, root)
 
 %changelog
-* Mon Nov 23 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.1.2009.11.23
+* Wed Dec 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009129
 - Update to latest snapshot
 
 * Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.10.05


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	23 Nov 2009 18:39:40 -0000	1.62
+++ sources	9 Dec 2009 19:30:46 -0000	1.63
@@ -1 +1 @@
-ca18866a7f8974b4ef7e66a37113d78e  plymouth-0.8.0.tar.bz2
+6b324b6efa58c54c8c9504bb1ab441b0  plymouth-0.8.0.tar.bz2


--- 0001-populate-initrd-Get-plugin-path-from-plymouth.patch DELETED ---


--- 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Dec  9 19:34:33 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  9 Dec 2009 19:34:33 +0000 (UTC)
Subject: rpms/audacity/F-11 audacity-1.3.9-getmaxpeak.patch,NONE,1.1
Message-ID: <20091209193433.B4EE711C00E0@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24600

Added Files:
	audacity-1.3.9-getmaxpeak.patch 
Log Message:
messed up the manual sync/commit

audacity-1.3.9-getmaxpeak.patch:
 AudioIO.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-getmaxpeak.patch ---
diff -Nur audacity-src-1.3.9-orig/src/AudioIO.cpp audacity-src-1.3.9/src/AudioIO.cpp
--- audacity-src-1.3.9-orig/src/AudioIO.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/AudioIO.cpp	2009-12-04 14:40:41.559205870 +0100
@@ -2750,7 +2750,7 @@
 
    // Stop recording if 'silence' is detected
    if(gAudioIO->mPauseRec && inputBuffer) {
-      if(gAudioIO->mInputMeter->GetMaxPeak() < gAudioIO->mSilenceLevel ) {
+      if(gAudioIO->mInputMeter && (gAudioIO->mInputMeter->GetMaxPeak() < gAudioIO->mSilenceLevel) ) {
          if(!gAudioIO->IsPaused()) {
             AudacityProject *p = GetActiveProject();
             wxCommandEvent dummyEvt;



From spot at fedoraproject.org  Wed Dec  9 19:40:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Dec 2009 19:40:51 +0000 (UTC)
Subject: File coverage-3.2.tar.gz uploaded to lookaside cache by spot
Message-ID: <20091209194051.522B610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-coverage:

e35935f346eaf5afe5741992cda3a881  coverage-3.2.tar.gz



From spot at fedoraproject.org  Wed Dec  9 19:44:16 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Dec 2009 19:44:16 +0000 (UTC)
Subject: rpms/python-coverage/devel .cvsignore, 1.4, 1.5 python-coverage.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091209194416.201C311C00E0@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-coverage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27997

Modified Files:
	.cvsignore python-coverage.spec sources 
Log Message:
3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Oct 2009 03:14:08 -0000	1.4
+++ .cvsignore	9 Dec 2009 19:44:15 -0000	1.5
@@ -1 +1 @@
-coverage-3.1.tar.gz
+coverage-3.2.tar.gz


Index: python-coverage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/python-coverage.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-coverage.spec	17 Oct 2009 03:14:08 -0000	1.5
+++ python-coverage.spec	9 Dec 2009 19:44:15 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:			python-coverage
 Summary:		Code coverage testing module for Python
-Version:		3.1
+Version:		3.2
 Release:		1%{?dist}
 License:		BSD
 Group:			System Environment/Libraries
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/coverage*.egg-info/
 
 %changelog
+* Wed Dec  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-1
+- update to 3.2
+
 * Fri Oct 16 2009 Luke Macken <lmacken at redhat.com> - 3.1-1
 - Update to 3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Oct 2009 03:14:08 -0000	1.4
+++ sources	9 Dec 2009 19:44:15 -0000	1.5
@@ -1 +1 @@
-113234cb050a179a3c6e2f11edab46a1  coverage-3.1.tar.gz
+e35935f346eaf5afe5741992cda3a881  coverage-3.2.tar.gz



From pkgdb at fedoraproject.org  Wed Dec  9 19:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:50:20 +0000
Subject: [pkgdb] plymouth had acl change status
Message-ID: <20091209195020.5C36210F89D@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on plymouth (Fedora devel) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/plymouth



From pkgdb at fedoraproject.org  Wed Dec  9 19:50:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:50:30 +0000
Subject: [pkgdb] plymouth had acl change status
Message-ID: <20091209195030.4E7B610F89E@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on plymouth (Fedora 10) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/plymouth



From spot at fedoraproject.org  Wed Dec  9 19:50:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Dec 2009 19:50:49 +0000 (UTC)
Subject: rpms/scalapack/F-12 scalapack.spec,1.26,1.27
Message-ID: <20091209195049.E46BB11C03DB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scalapack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30315/F-12

Modified Files:
	scalapack.spec 
Log Message:
fix ftbfs, static libs, remove lam


Index: scalapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scalapack/F-12/scalapack.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- scalapack.spec	7 Aug 2009 02:42:10 -0000	1.26
+++ scalapack.spec	9 Dec 2009 19:50:49 -0000	1.27
@@ -7,14 +7,6 @@
  . /etc/profile.d/modules.sh; \
  module unload openmpi-%{_arch};
 
-%global _lam_load \
- . /etc/profile.d/modules.sh; \
- module load lam-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _lam_unload \
- . /etc/profile.d/modules.sh; \
- module unload lam-%{_arch};
-
 %global _mpich2_load \
  . /etc/profile.d/modules.sh; \
  module load mpich2-%{__isa_bits}; \
@@ -32,14 +24,6 @@
  . /etc/profile.d/modules.sh; \
  module unload blacs-openmpi-%{_arch};
 
-%global _blacs_lam_load \
- . /etc/profile.d/modules.sh; \
- module load blacs-lam-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _blacs_lam_unload \
- . /etc/profile.d/modules.sh; \
- module unload blacs-lam-%{_arch};
-
 %global _blacs_mpich2_load \
  . /etc/profile.d/modules.sh; \
  module load blacs-mpich2-%{_arch}; \
@@ -51,7 +35,7 @@
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
@@ -120,56 +104,15 @@ routines resemble their LAPACK equivalen
 
 This package contains common files which are not specific to any MPI implementation.
 
-%package lam
-Summary: ScaLAPACK libraries compiled against lam
-Group: Development/Libraries
-BuildRequires: blacs-lam-devel, lam-devel
-Requires: %{name}-common = %{version}-%{release}
-Requires: environment-modules
-
-%description lam
-The ScaLAPACK (or Scalable LAPACK) library includes a subset
-of LAPACK routines redesigned for distributed memory MIMD
-parallel computers. It is currently written in a
-Single-Program-Multiple-Data style using explicit message
-passing for interprocessor communication. It assumes
-matrices are laid out in a two-dimensional block cyclic
-decomposition.
-
-ScaLAPACK is designed for heterogeneous computing and is
-portable on any computer that supports MPI or PVM.
-
-Like LAPACK, the ScaLAPACK routines are based on
-block-partitioned algorithms in order to minimize the frequency
-of data movement between different levels of the memory hierarchy.
-(For such machines, the memory hierarchy includes the off-processor
-memory of other processors, in addition to the hierarchy of registers,
-cache, and local memory on each processor.) The fundamental building
-blocks of the ScaLAPACK library are distributed memory versions (PBLAS)
-of the Level 1, 2 and 3 BLAS, and a set of Basic Linear Algebra
-Communication Subprograms (BLACS) for communication tasks that arise
-frequently in parallel linear algebra computations. In the ScaLAPACK
-routines, all interprocessor communication occurs within the PBLAS and the
-BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK
-routines resemble their LAPACK equivalents as much as possible.
-
-This package contains ScaLAPACK libraries compiled with lam.
-
-%package lam-devel
-Summary: Development libraries for ScaLAPACK (lam)
-Group: Development/Libraries
-Requires: %{name}-lam = %{version}-%{release}
-Provides: %{name}-lam-static = %{version}-%{release}
-
-%description lam-devel
-This package contains development libraries for ScaLAPACK, compiled against lam.
-
 %package mpich2
 Summary: ScaLAPACK libraries compiled against mpich2
 Group: Development/Libraries
 BuildRequires: blacs-mpich2-devel, mpich2-devel
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
+# This is a lie, but something needs to obsolete it.
+Provides: %{name}-lam = %{version}-%{release}
+Obsoletes: %{name}-lam <= 1.7.5-7
 
 %description mpich2
 The ScaLAPACK (or Scalable LAPACK) library includes a subset
@@ -203,11 +146,21 @@ This package contains ScaLAPACK	librarie
 Summary: Development libraries for ScaLAPACK (mpich2)
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
-Provides: %{name}-mpich2-static = %{version}-%{release}
+Provides: %{name}-lam-devel = %{version}-%{release}
+Obsoletes: %{name}-lam-devel <= 1.7.5-7
 
 %description mpich2-devel
 This package contains development libraries for ScaLAPACK, compiled against mpich2.
 
+%package mpich2-static
+Summary: Static libraries for ScaLAPACK (mpich2)
+Group: Development/Libraries
+Provides: %{name}-lam-static = %{version}-%{release}
+Obsoletes: %{name}-lam-static <= 1.7.5-7
+
+%description mpich2-static
+This package contains static libraries for ScaLAPACK, compiled against mpich2.
+
 %package openmpi
 Summary: ScaLAPACK libraries compiled against openmpi
 Group: Development/Libraries
@@ -247,11 +200,17 @@ This package contains ScaLAPACK	librarie
 Summary: Development libraries for ScaLAPACK (openmpi)
 Group: Development/Libraries
 Requires: %{name}-openmpi = %{version}-%{release}
-Provides: %{name}-openmpi-static = %{version}-%{release}
 
 %description openmpi-devel
 This package contains development libraries for ScaLAPACK, compiled against openmpi.
 
+%package openmpi-static
+Summary: Static libraries for ScaLAPACK (openmpi)
+Group: Development/Libraries
+
+%description openmpi-static
+This package contains static libraries for ScaLAPACK, compiled against openmpi.
+
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
@@ -265,21 +224,12 @@ done
 
 %build
 %define dobuild() \
-cd %{name}-%{version}-$MPI_COMPILER ; \
+cd %{name}-%{version}-$MPI_COMPILER_NAME ; \
 make lib ; \
 cd ..
 
-# Build LAM version
-export MPI_COMPILER=lam
-%{_lam_load}
-%{_blacs_lam_load}
-RPM_OPT_FLAGS=`echo $CFLAGS`
-%dobuild
-%{_blacs_lam_unload}
-%{_lam_unload}
-
 # Build mpich2 version
-export MPI_COMPILER=mpich2
+export MPI_COMPILER_NAME=mpich2
 %{_mpich2_load}
 %{_blacs_mpich2_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
@@ -288,7 +238,7 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %{_mpich2_unload}
 
 # Build OpenMPI version
-export MPI_COMPILER=openmpi
+export MPI_COMPILER_NAME=openmpi
 %{_openmpi_load}
 %{_blacs_openmpi_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
@@ -301,7 +251,7 @@ rm -fr ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
   mkdir -p %{buildroot}%{_libdir}/scalapack-$i/
   pushd %{name}-%{version}-$i
   for f in *.a *.so*; do
@@ -339,17 +289,6 @@ rm -fr ${RPM_BUILD_ROOT}
 %doc scalapack_install.ps README
 # %{_bindir}/x*
 
-%files lam
-%defattr(-,root,root,-)
-%dir %{_libdir}/scalapack-lam/
-%{_datadir}/Modules/modulefiles/scalapack-lam-%{_arch}
-%{_libdir}/scalapack-lam/libscalapack.so.*
-
-%files lam-devel
-%defattr(-,root,root,-)
-%{_libdir}/scalapack-lam/libscalapack.a
-%{_libdir}/scalapack-lam/libscalapack.so
-
 %files mpich2
 %defattr(-,root,root,-)
 %dir %{_libdir}/scalapack-mpich2/
@@ -358,9 +297,12 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files mpich2-devel
 %defattr(-,root,root,-)
-%{_libdir}/scalapack-mpich2/libscalapack.a
 %{_libdir}/scalapack-mpich2/libscalapack.so
 
+%files mpich2-static
+%defattr(-,root,root,-)
+%{_libdir}/scalapack-mpich2/libscalapack.a
+
 %files openmpi
 %defattr(-,root,root,-)
 %dir %{_libdir}/scalapack-openmpi/
@@ -369,10 +311,17 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files openmpi-devel
 %defattr(-,root,root,-)
-%{_libdir}/scalapack-openmpi/libscalapack.a
 %{_libdir}/scalapack-openmpi/libscalapack.so
 
+%files openmpi-static
+%defattr(-,root,root,-)
+%{_libdir}/scalapack-openmpi/libscalapack.a
+
 %changelog
+* Wed Dec  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-8
+- drop lam support (Provides/Obsoletes by mpich2, which is a hack, but something's gotta do it)
+- move static libs to static subpackages (resolves bz 545150)
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-7
 - rework package to handle all supported MPI environments in Fedora
 



From spot at fedoraproject.org  Wed Dec  9 19:50:50 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  9 Dec 2009 19:50:50 +0000 (UTC)
Subject: rpms/scalapack/devel scalapack.spec,1.26,1.27
Message-ID: <20091209195050.16D1311C03DB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scalapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30315/devel

Modified Files:
	scalapack.spec 
Log Message:
fix ftbfs, static libs, remove lam


Index: scalapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- scalapack.spec	7 Aug 2009 02:42:10 -0000	1.26
+++ scalapack.spec	9 Dec 2009 19:50:49 -0000	1.27
@@ -1,28 +1,3 @@
-# These macros will go away soon. Hopefully.
-%global _openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
-
-%global _lam_load \
- . /etc/profile.d/modules.sh; \
- module load lam-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _lam_unload \
- . /etc/profile.d/modules.sh; \
- module unload lam-%{_arch};
-
-%global _mpich2_load \
- . /etc/profile.d/modules.sh; \
- module load mpich2-%{__isa_bits}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _mpich2_unload \
- . /etc/profile.d/modules.sh; \
- module unload mpich2-%{__isa_bits};
-
 # The blacs packages should probably provide these.
 %global _blacs_openmpi_load \
  . /etc/profile.d/modules.sh; \
@@ -32,14 +7,6 @@
  . /etc/profile.d/modules.sh; \
  module unload blacs-openmpi-%{_arch};
 
-%global _blacs_lam_load \
- . /etc/profile.d/modules.sh; \
- module load blacs-lam-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _blacs_lam_unload \
- . /etc/profile.d/modules.sh; \
- module unload blacs-lam-%{_arch};
-
 %global _blacs_mpich2_load \
  . /etc/profile.d/modules.sh; \
  module load blacs-mpich2-%{_arch}; \
@@ -51,7 +18,7 @@
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
@@ -120,56 +87,15 @@ routines resemble their LAPACK equivalen
 
 This package contains common files which are not specific to any MPI implementation.
 
-%package lam
-Summary: ScaLAPACK libraries compiled against lam
-Group: Development/Libraries
-BuildRequires: blacs-lam-devel, lam-devel
-Requires: %{name}-common = %{version}-%{release}
-Requires: environment-modules
-
-%description lam
-The ScaLAPACK (or Scalable LAPACK) library includes a subset
-of LAPACK routines redesigned for distributed memory MIMD
-parallel computers. It is currently written in a
-Single-Program-Multiple-Data style using explicit message
-passing for interprocessor communication. It assumes
-matrices are laid out in a two-dimensional block cyclic
-decomposition.
-
-ScaLAPACK is designed for heterogeneous computing and is
-portable on any computer that supports MPI or PVM.
-
-Like LAPACK, the ScaLAPACK routines are based on
-block-partitioned algorithms in order to minimize the frequency
-of data movement between different levels of the memory hierarchy.
-(For such machines, the memory hierarchy includes the off-processor
-memory of other processors, in addition to the hierarchy of registers,
-cache, and local memory on each processor.) The fundamental building
-blocks of the ScaLAPACK library are distributed memory versions (PBLAS)
-of the Level 1, 2 and 3 BLAS, and a set of Basic Linear Algebra
-Communication Subprograms (BLACS) for communication tasks that arise
-frequently in parallel linear algebra computations. In the ScaLAPACK
-routines, all interprocessor communication occurs within the PBLAS and the
-BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK
-routines resemble their LAPACK equivalents as much as possible.
-
-This package contains ScaLAPACK libraries compiled with lam.
-
-%package lam-devel
-Summary: Development libraries for ScaLAPACK (lam)
-Group: Development/Libraries
-Requires: %{name}-lam = %{version}-%{release}
-Provides: %{name}-lam-static = %{version}-%{release}
-
-%description lam-devel
-This package contains development libraries for ScaLAPACK, compiled against lam.
-
 %package mpich2
 Summary: ScaLAPACK libraries compiled against mpich2
 Group: Development/Libraries
 BuildRequires: blacs-mpich2-devel, mpich2-devel
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
+# This is a lie, but something needs to obsolete it.
+Provides: %{name}-lam = %{version}-%{release}
+Obsoletes: %{name}-lam <= 1.7.5-7
 
 %description mpich2
 The ScaLAPACK (or Scalable LAPACK) library includes a subset
@@ -203,11 +129,21 @@ This package contains ScaLAPACK	librarie
 Summary: Development libraries for ScaLAPACK (mpich2)
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
-Provides: %{name}-mpich2-static = %{version}-%{release}
+Provides: %{name}-lam-devel = %{version}-%{release}
+Obsoletes: %{name}-lam-devel <= 1.7.5-7
 
 %description mpich2-devel
 This package contains development libraries for ScaLAPACK, compiled against mpich2.
 
+%package mpich2-static
+Summary: Static libraries for ScaLAPACK (mpich2)
+Group: Development/Libraries
+Provides: %{name}-lam-static = %{version}-%{release}
+Obsoletes: %{name}-lam-static <= 1.7.5-7
+
+%description mpich2-static
+This package contains static libraries for ScaLAPACK, compiled against mpich2.
+
 %package openmpi
 Summary: ScaLAPACK libraries compiled against openmpi
 Group: Development/Libraries
@@ -247,11 +183,17 @@ This package contains ScaLAPACK	librarie
 Summary: Development libraries for ScaLAPACK (openmpi)
 Group: Development/Libraries
 Requires: %{name}-openmpi = %{version}-%{release}
-Provides: %{name}-openmpi-static = %{version}-%{release}
 
 %description openmpi-devel
 This package contains development libraries for ScaLAPACK, compiled against openmpi.
 
+%package openmpi-static
+Summary: Static libraries for ScaLAPACK (openmpi)
+Group: Development/Libraries
+
+%description openmpi-static
+This package contains static libraries for ScaLAPACK, compiled against openmpi.
+
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
@@ -265,21 +207,12 @@ done
 
 %build
 %define dobuild() \
-cd %{name}-%{version}-$MPI_COMPILER ; \
+cd %{name}-%{version}-$MPI_COMPILER_NAME ; \
 make lib ; \
 cd ..
 
-# Build LAM version
-export MPI_COMPILER=lam
-%{_lam_load}
-%{_blacs_lam_load}
-RPM_OPT_FLAGS=`echo $CFLAGS`
-%dobuild
-%{_blacs_lam_unload}
-%{_lam_unload}
-
 # Build mpich2 version
-export MPI_COMPILER=mpich2
+export MPI_COMPILER_NAME=mpich2
 %{_mpich2_load}
 %{_blacs_mpich2_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
@@ -288,7 +221,7 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %{_mpich2_unload}
 
 # Build OpenMPI version
-export MPI_COMPILER=openmpi
+export MPI_COMPILER_NAME=openmpi
 %{_openmpi_load}
 %{_blacs_openmpi_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
@@ -301,7 +234,7 @@ rm -fr ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
   mkdir -p %{buildroot}%{_libdir}/scalapack-$i/
   pushd %{name}-%{version}-$i
   for f in *.a *.so*; do
@@ -339,17 +272,6 @@ rm -fr ${RPM_BUILD_ROOT}
 %doc scalapack_install.ps README
 # %{_bindir}/x*
 
-%files lam
-%defattr(-,root,root,-)
-%dir %{_libdir}/scalapack-lam/
-%{_datadir}/Modules/modulefiles/scalapack-lam-%{_arch}
-%{_libdir}/scalapack-lam/libscalapack.so.*
-
-%files lam-devel
-%defattr(-,root,root,-)
-%{_libdir}/scalapack-lam/libscalapack.a
-%{_libdir}/scalapack-lam/libscalapack.so
-
 %files mpich2
 %defattr(-,root,root,-)
 %dir %{_libdir}/scalapack-mpich2/
@@ -358,9 +280,12 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files mpich2-devel
 %defattr(-,root,root,-)
-%{_libdir}/scalapack-mpich2/libscalapack.a
 %{_libdir}/scalapack-mpich2/libscalapack.so
 
+%files mpich2-static
+%defattr(-,root,root,-)
+%{_libdir}/scalapack-mpich2/libscalapack.a
+
 %files openmpi
 %defattr(-,root,root,-)
 %dir %{_libdir}/scalapack-openmpi/
@@ -369,10 +294,17 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files openmpi-devel
 %defattr(-,root,root,-)
-%{_libdir}/scalapack-openmpi/libscalapack.a
 %{_libdir}/scalapack-openmpi/libscalapack.so
 
+%files openmpi-static
+%defattr(-,root,root,-)
+%{_libdir}/scalapack-openmpi/libscalapack.a
+
 %changelog
+* Wed Dec  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-8
+- drop lam support (Provides/Obsoletes by mpich2, which is a hack, but something's gotta do it)
+- move static libs to static subpackages (resolves bz 545150)
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-7
 - rework package to handle all supported MPI environments in Fedora
 



From pkgdb at fedoraproject.org  Wed Dec  9 19:50:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:50:33 +0000
Subject: [pkgdb] plymouth had acl change status
Message-ID: <20091209195033.8CA1210F8A3@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on plymouth (Fedora 11) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/plymouth



From pkgdb at fedoraproject.org  Wed Dec  9 19:50:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 19:50:41 +0000
Subject: [pkgdb] plymouth had acl change status
Message-ID: <20091209195041.DD72810F890@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on plymouth (Fedora 12) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/plymouth



From lkundrak at fedoraproject.org  Wed Dec  9 19:52:39 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 19:52:39 +0000 (UTC)
Subject: rpms/xmlbeans/devel xmlbeans.spec,1.3,1.4
Message-ID: <20091209195240.03CFB11C00E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/xmlbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31209

Modified Files:
	xmlbeans.spec 
Log Message:
* Wed Dec 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.4.0-6
- Rebuild without bootstrapping



Index: xmlbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlbeans/devel/xmlbeans.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmlbeans.spec	9 Dec 2009 18:40:13 -0000	1.3
+++ xmlbeans.spec	9 Dec 2009 19:52:39 -0000	1.4
@@ -28,11 +28,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 Name:           xmlbeans
 Version:        2.4.0
-Release:        5%{?dist}%{?bootstrap:.boot}
+Release:        6%{?dist}%{?with_bootstrap:.boot}
 Summary:        XML-Java binding tool
 Group:          Development/Libraries
 URL:            http://xmlbeans.apache.org/
@@ -194,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.4.0-6
+- Rebuild without bootstrapping
+
 * Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.4.0-5
 - Fix up saxon dependency
 - Drop epoch



From dwalsh at fedoraproject.org  Wed Dec  9 19:53:39 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  9 Dec 2009 19:53:39 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 booleans-minimum.conf, 1.8,
	1.9 modules-minimum.conf, 1.44, 1.45 modules-mls.conf, 1.62,
	1.63 modules-targeted.conf, 1.153, 1.154 policy-F12.patch, 1.151,
	1.152 selinux-policy.spec, 1.979, 1.980
Message-ID: <20091209195339.72EFB11C00E0@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31690

Modified Files:
	booleans-minimum.conf modules-minimum.conf modules-mls.conf 
	modules-targeted.conf policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Dec 9 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-57
- Allow unconfined_t to send dbus messages to setroubleshoot



Index: booleans-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/booleans-minimum.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- booleans-minimum.conf	15 Oct 2009 20:42:08 -0000	1.8
+++ booleans-minimum.conf	9 Dec 2009 19:53:38 -0000	1.9
@@ -1,4 +1,4 @@
-# Allow making anonymous memory executable, e.g.for runtime-code generation or executable stack.
+	# Allow making anonymous memory executable, e.g.for runtime-code generation or executable stack.
 # 
 allow_execmem = false
 


Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- modules-minimum.conf	7 Dec 2009 22:37:54 -0000	1.44
+++ modules-minimum.conf	9 Dec 2009 19:53:38 -0000	1.45
@@ -757,6 +757,13 @@ kdump = module
 kdumpgui = module
 
 # Layer: services
+# Module: ksmtuned
+#
+#  Kernel Samepage Merging (KSM) Tuning Daemon
+# 
+ksmtuned = module
+
+# Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
@@ -1548,6 +1555,13 @@ sysstat = module
 # 
 tcpd = module
 
+# Layer: services
+# Module: tgtd
+#
+# Linux Target Framework Daemon.
+# 
+tgtd = module
+
 # Layer: system
 # Module: udev
 #
@@ -1583,7 +1597,6 @@ ulogd = module
 # 
 vhostmd = module
 
-
 # Layer: apps
 # Module: wine
 #


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-mls.conf,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- modules-mls.conf	27 Oct 2009 21:53:28 -0000	1.62
+++ modules-mls.conf	9 Dec 2009 19:53:38 -0000	1.63
@@ -1372,6 +1372,13 @@ sysstat = module
 # 
 tcpd = module
 
+# Layer: services
+# Module: tgtd
+#
+# Linux Target Framework Daemon.
+# 
+tgtd = module
+
 # Layer: system
 # Module: udev
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- modules-targeted.conf	7 Dec 2009 22:37:54 -0000	1.153
+++ modules-targeted.conf	9 Dec 2009 19:53:38 -0000	1.154
@@ -757,6 +757,13 @@ kdump = module
 kdumpgui = module
 
 # Layer: services
+# Module: ksmtuned
+#
+#  Kernel Samepage Merging (KSM) Tuning Daemon
+# 
+ksmtuned = module
+
+# Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
@@ -1548,6 +1555,13 @@ sysstat = module
 # 
 tcpd = module
 
+# Layer: services
+# Module: tgtd
+#
+# Linux Target Framework Daemon.
+# 
+tgtd = module
+
 # Layer: system
 # Module: udev
 #
@@ -1583,7 +1597,6 @@ ulogd = module
 # 
 vhostmd = module
 
-
 # Layer: apps
 # Module: wine
 #

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   13 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |   80 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   23 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   43 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   45 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |   13 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  417 +++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  127 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  449 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  110 +
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   25 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   28 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   21 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  117 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.te           |   14 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |    7 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   65 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  635 ++++++++++-
 policy/modules/services/xserver.te        |  367 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   66 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  184 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   82 +
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1685 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 405 files changed, 20690 insertions(+), 2813 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- policy-F12.patch	7 Dec 2009 22:37:54 -0000	1.151
+++ policy-F12.patch	9 Dec 2009 19:53:38 -0000	1.152
@@ -5539,7 +5539,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.6.32/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/screen.if	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/screen.if	2009-12-07 17:38:21.000000000 -0500
 @@ -45,6 +45,7 @@
  
  	allow $1_screen_t self:capability { setuid setgid fsetid };
@@ -5568,6 +5568,14 @@ diff -b -B --ignore-all-space --exclude-
  	auth_use_nsswitch($1_screen_t)
  	auth_dontaudit_read_shadow($1_screen_t)
  	auth_dontaudit_exec_utempter($1_screen_t)
+@@ -134,6 +141,7 @@
+ 	userdom_create_user_pty($1_screen_t)
+ 	userdom_user_home_domtrans($1_screen_t, $3)
+ 	userdom_setattr_user_ptys($1_screen_t)
++	userdom_setattr_user_ttys($1_screen_t)
+ 
+ 	tunable_policy(`use_samba_home_dirs',`
+ 		fs_cifs_domtrans($1_screen_t, $3)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.fc serefpolicy-3.6.32/policy/modules/apps/sectoolm.fc
 --- nsaserefpolicy/policy/modules/apps/sectoolm.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/apps/sectoolm.fc	2009-12-03 13:45:10.000000000 -0500
@@ -6011,7 +6019,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.6.32/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/wine.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/wine.te	2009-12-09 14:46:30.000000000 -0500
 @@ -9,20 +9,46 @@
  type wine_t;
  type wine_exec_t;
@@ -6054,7 +6062,7 @@ diff -b -B --ignore-all-space --exclude-
   	')
 +
 +optional_policy(`
-+	unconfined_domain_noaudit(wine_t)
++	unconfined_domain(wine_t)
 +')
 +
 +optional_policy(`
@@ -6225,7 +6233,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-12-09 09:43:30.000000000 -0500
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -6253,7 +6261,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(dccm, tcp,5679,s0, udp,5679,s0)
 -network_port(dhcpc, udp,68,s0)
 -network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0, tcp,7911,s0)
-+network_port(dhcpc, udp,68,s0, tcp,68,s0, udp,547,s0, tcp, 547,s0)
++network_port(dhcpc, udp,68,s0, tcp,68,s0, udp,546,s0, tcp, 546,s0, udp,547,s0, tcp, 547,s0)
 +network_port(dhcpd, udp,67,s0, udp,548,s0, tcp, 548,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0, tcp,7911,s0)
  network_port(dict, tcp,2628,s0)
  network_port(distccd, tcp,3632,s0)
@@ -8973,7 +8981,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.32/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/sysadm.te	2009-12-06 09:58:03.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/roles/sysadm.te	2009-12-09 08:30:14.000000000 -0500
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -9089,16 +9097,17 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_run(sysadm_t, sysadm_r)
  ')
  
-@@ -205,6 +171,8 @@
+@@ -205,6 +171,9 @@
  	ipsec_stream_connect(sysadm_t)
  	# for lsof
  	ipsec_getattr_key_sockets(sysadm_t)
 +	ipsec_run_setkey(sysadm_t, sysadm_r)
 +	ipsec_run_racoon(sysadm_t, sysadm_r)
++	ipsec_stream_connect_racoon(sysadm_t)
  ')
  
  optional_policy(`
-@@ -212,11 +180,7 @@
+@@ -212,11 +181,7 @@
  ')
  
  optional_policy(`
@@ -9111,7 +9120,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -228,10 +192,6 @@
+@@ -228,10 +193,6 @@
  ')
  
  optional_policy(`
@@ -9122,7 +9131,7 @@ diff -b -B --ignore-all-space --exclude-
  	logrotate_run(sysadm_t, sysadm_r)
  ')
  
-@@ -255,14 +215,6 @@
+@@ -255,14 +216,6 @@
  ')
  
  optional_policy(`
@@ -9137,7 +9146,7 @@ diff -b -B --ignore-all-space --exclude-
  	mta_role(sysadm_r, sysadm_t)
  ')
  
-@@ -290,11 +242,6 @@
+@@ -290,11 +243,6 @@
  ')
  
  optional_policy(`
@@ -9149,7 +9158,7 @@ diff -b -B --ignore-all-space --exclude-
  	pcmcia_run_cardctl(sysadm_t, sysadm_r)
  ')
  
-@@ -308,7 +255,7 @@
+@@ -308,7 +256,7 @@
  ')
  
  optional_policy(`
@@ -9158,7 +9167,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -320,10 +267,6 @@
+@@ -320,10 +268,6 @@
  ')
  
  optional_policy(`
@@ -9169,7 +9178,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpc_domtrans_nfsd(sysadm_t)
  ')
  
-@@ -332,10 +275,6 @@
+@@ -332,10 +276,6 @@
  ')
  
  optional_policy(`
@@ -9180,7 +9189,7 @@ diff -b -B --ignore-all-space --exclude-
  	rsync_exec(sysadm_t)
  ')
  
-@@ -345,10 +284,6 @@
+@@ -345,10 +285,6 @@
  ')
  
  optional_policy(`
@@ -9191,7 +9200,7 @@ diff -b -B --ignore-all-space --exclude-
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +293,15 @@
+@@ -358,35 +294,15 @@
  ')
  
  optional_policy(`
@@ -9227,7 +9236,7 @@ diff -b -B --ignore-all-space --exclude-
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +309,10 @@
+@@ -394,18 +310,10 @@
  ')
  
  optional_policy(`
@@ -9246,7 +9255,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,17 +325,13 @@
+@@ -418,17 +326,13 @@
  ')
  
  optional_policy(`
@@ -9265,7 +9274,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -440,13 +343,16 @@
+@@ -440,13 +344,16 @@
  ')
  
  optional_policy(`
@@ -9299,7 +9308,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.6.32/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.if	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.if	2009-12-08 16:42:21.000000000 -0500
 @@ -0,0 +1,667 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -9970,8 +9979,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-06 10:20:50.000000000 -0500
-@@ -0,0 +1,444 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-09 10:12:44.000000000 -0500
+@@ -0,0 +1,449 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -10136,11 +10145,17 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	optional_policy(`
 +		setroubleshoot_dbus_chat(unconfined_usertype)
++		setroubleshoot_dbus_chat_fixit(unconfined_t)
 +	')
 +
 +	optional_policy(`
 +		sandbox_transition(unconfined_usertype, unconfined_r)
 +	')
++
++	optional_policy(`
++		xserver_rw_shm(unconfined_usertype)
++		xserver_run_xauth(unconfined_usertype, unconfined_r)
++	')
 +')
 +
 +ifdef(`distro_gentoo',`
@@ -10340,8 +10355,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	xserver_run(unconfined_t, unconfined_r)
-+	xserver_rw_shm(unconfined_t)
-+	xserver_run_xauth(unconfined_t, unconfined_r)
 +')
 +
 +########################################
@@ -10399,6 +10412,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +allow unconfined_notrans_t self:process { execstack execmem };
 +unconfined_domain_noaudit(unconfined_notrans_t)
++userdom_unpriv_usertype(unconfined, unconfined_notrans_t)
 +domtrans_pattern(unconfined_t, unconfined_notrans_exec_t, unconfined_notrans_t)
 +# Allow SELinux aware applications to request rpm_script execution
 +rpm_transition_script(unconfined_notrans_t)
@@ -11288,7 +11302,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.32/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.fc	2009-12-04 08:24:12.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/apache.fc	2009-12-09 09:34:01.000000000 -0500
 @@ -1,12 +1,16 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
 +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
@@ -11323,12 +11337,13 @@ diff -b -B --ignore-all-space --exclude-
  /usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
  /usr/sbin/suexec		--	gen_context(system_u:object_r:httpd_suexec_exec_t,s0)
  
-@@ -32,12 +39,22 @@
+@@ -32,21 +39,36 @@
  /usr/sbin/httpd2-.*		--	gen_context(system_u:object_r:httpd_exec_t,s0)
  ')
  
 +/usr/share/drupal(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /usr/share/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
++/usr/share/mythweb(/.*)?		gen_context(system_u:object_r:httpd_sys_content_t,s0)
 +/usr/share/mythweb/mythweb\.pl		gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 +/usr/share/mythtv/mythweather/scripts(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 +/usr/share/mythtv/data(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
@@ -11342,11 +11357,15 @@ diff -b -B --ignore-all-space --exclude-
  /var/cache/httpd(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
 +/var/cache/lighttpd(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/mason(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
+-/var/cache/mod_proxy(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
 +/var/cache/mediawiki(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
- /var/cache/mod_proxy(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
++/var/cache/mod_.*			gen_context(system_u:object_r:httpd_cache_t,s0)
++/var/cache/mod_gnutls(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/mod_ssl(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
++/var/cache/php-.*			gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/php-eaccelerator(/.*)?	gen_context(system_u:object_r:httpd_cache_t,s0)
-@@ -46,7 +63,9 @@
+ /var/cache/php-mmcache(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
+ /var/cache/rt3(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/ssl.*\.sem		--	gen_context(system_u:object_r:httpd_cache_t,s0)
  
  /var/lib/cacti/rra(/.*)?		gen_context(system_u:object_r:httpd_sys_content_t,s0)
@@ -11356,7 +11375,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/php/session(/.*)?		gen_context(system_u:object_r:httpd_var_run_t,s0)
-@@ -50,13 +69,17 @@
+@@ -50,13 +72,17 @@
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/php/session(/.*)?		gen_context(system_u:object_r:httpd_var_run_t,s0)
@@ -11374,7 +11393,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_debian', `
  /var/log/horde2(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
  ')
-@@ -64,11 +87,32 @@
+@@ -64,11 +90,32 @@
  /var/run/apache.*			gen_context(system_u:object_r:httpd_var_run_t,s0)
  /var/run/gcache_port		-s	gen_context(system_u:object_r:httpd_var_run_t,s0)
  /var/run/httpd.*			gen_context(system_u:object_r:httpd_var_run_t,s0)
@@ -12016,7 +12035,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.32/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-12-07 16:00:19.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-12-09 08:13:29.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -12926,7 +12945,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.6.32/policy/modules/services/asterisk.te
 --- nsaserefpolicy/policy/modules/services/asterisk.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/asterisk.te	2009-12-07 15:03:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/asterisk.te	2009-12-09 08:14:01.000000000 -0500
 @@ -34,6 +34,8 @@
  type asterisk_var_run_t;
  files_pid_file(asterisk_var_run_t)
@@ -12941,7 +12960,7 @@ diff -b -B --ignore-all-space --exclude-
  allow asterisk_t self:capability { dac_override setgid setuid sys_nice };
  dontaudit asterisk_t self:capability sys_tty_config;
 -allow asterisk_t self:process { setsched signal_perms };
-+allow asterisk_t self:process { setsched signal_perms getcap setcap };
++allow asterisk_t self:process { getsched setsched signal_perms getcap setcap };
  allow asterisk_t self:fifo_file rw_fifo_file_perms;
  allow asterisk_t self:sem create_sem_perms;
  allow asterisk_t self:shm create_shm_perms;
@@ -12964,7 +12983,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(asterisk_t)
  corenet_all_recvfrom_netlabel(asterisk_t)
-@@ -97,6 +103,7 @@
+@@ -97,16 +103,19 @@
  corenet_udp_bind_generic_node(asterisk_t)
  corenet_tcp_bind_asterisk_port(asterisk_t)
  corenet_udp_bind_asterisk_port(asterisk_t)
@@ -12972,7 +12991,11 @@ diff -b -B --ignore-all-space --exclude-
  corenet_sendrecv_asterisk_server_packets(asterisk_t)
  # for VOIP voice channels.
  corenet_tcp_bind_generic_port(asterisk_t)
-@@ -107,6 +114,7 @@
+ corenet_udp_bind_generic_port(asterisk_t)
+ corenet_dontaudit_udp_bind_all_ports(asterisk_t)
+ corenet_sendrecv_generic_server_packets(asterisk_t)
++corenet_tcp_connect_postgresql_port(asterisk_t)
+ 
  dev_read_sysfs(asterisk_t)
  dev_read_sound(asterisk_t)
  dev_write_sound(asterisk_t)
@@ -12980,7 +13003,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(asterisk_t)
  
-@@ -119,17 +127,17 @@
+@@ -119,17 +128,17 @@
  fs_getattr_all_fs(asterisk_t)
  fs_search_auto_mountpoints(asterisk_t)
  
@@ -13001,14 +13024,21 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -140,7 +148,3 @@
- 	udev_read_db(asterisk_t)
+@@ -137,10 +146,10 @@
+ ')
+ 
+ optional_policy(`
+-	udev_read_db(asterisk_t)
++	postgresql_stream_connect(asterisk_t)
  ')
  
 -ifdef(`TODO',`
 -allow initrc_t asterisk_var_run_t:fifo_file unlink;
 -allow sysadm_t asterisk_t:unix_stream_socket { connectto rw_stream_socket_perms };
--')
++optional_policy(`
++	udev_read_db(asterisk_t)
+ ')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.32/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/automount.te	2009-12-03 13:45:11.000000000 -0500
@@ -13327,6 +13357,18 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`hide_broken_symptoms', `
  	corecmd_dontaudit_write_bin_dirs(ccs_t)
  	files_manage_isid_type_files(ccs_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.fc serefpolicy-3.6.32/policy/modules/services/certmaster.fc
+--- nsaserefpolicy/policy/modules/services/certmaster.fc	2009-09-16 10:01:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/certmaster.fc	2009-12-09 09:13:51.000000000 -0500
+@@ -3,5 +3,8 @@
+ 
+ /usr/bin/certmaster		--	gen_context(system_u:object_r:certmaster_exec_t,s0)
+ 
++/var/lib/certmaster(/.*)?		gen_context(system_u:object_r:certmaster_var_lib_t,s0)
++
+ /var/log/certmaster(/.*)?		gen_context(system_u:object_r:certmaster_var_log_t,s0)
++
+ /var/run/certmaster.*			gen_context(system_u:object_r:certmaster_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.te serefpolicy-3.6.32/policy/modules/services/certmaster.te
 --- nsaserefpolicy/policy/modules/services/certmaster.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/certmaster.te	2009-12-03 13:45:11.000000000 -0500
@@ -14926,7 +14968,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.32/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dbus.if	2009-12-03 14:49:31.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/dbus.if	2009-12-09 09:03:35.000000000 -0500
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -15009,18 +15051,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	read_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
  	files_search_var_lib($1)
-@@ -190,6 +201,10 @@
- 	files_search_pids($1)
- 	stream_connect_pattern($1, system_dbusd_var_run_t, system_dbusd_var_run_t, system_dbusd_t)
- 	dbus_read_config($1)
-+
-+	optional_policy(`
-+		rpm_script_dbus_chat($1)
-+	')
- ')
- 
- #######################################
-@@ -256,7 +271,7 @@
+@@ -256,7 +267,7 @@
  
  ########################################
  ## <summary>
@@ -15029,16 +15060,24 @@ diff -b -B --ignore-all-space --exclude-
  ##	for service (acquire_svc).
  ## </summary>
  ## <param name="domain">
-@@ -364,6 +379,8 @@
+@@ -364,6 +375,16 @@
  	dbus_system_bus_client($1)
  	dbus_connect_system_bus($1)
  
 +	userdom_dontaudit_search_admin_dir($1)
 +
++	optional_policy(`
++		rpm_script_dbus_chat($1)
++	')
++
++	optional_policy(`
++		unconfined_dbus_send($1)
++	')
++
  	ifdef(`hide_broken_symptoms', `
  		dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
  	')
-@@ -405,3 +422,24 @@
+@@ -405,3 +426,24 @@
  
  	typeattribute $1 dbusd_unconfined;
  ')
@@ -16684,6 +16723,145 @@ diff -b -B --ignore-all-space --exclude-
  allow kerneloops_t self:fifo_file rw_file_perms;
  
  manage_files_pattern(kerneloops_t, kerneloops_tmp_t, kerneloops_tmp_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.fc serefpolicy-3.6.32/policy/modules/services/ksmtuned.fc
+--- nsaserefpolicy/policy/modules/services/ksmtuned.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/ksmtuned.fc	2009-12-09 12:13:54.000000000 -0500
+@@ -0,0 +1,5 @@
++/etc/rc\.d/init\.d/ksmtuned	--	gen_context(system_u:object_r:ksmtuned_initrc_exec_t,s0)
++
++/usr/sbin/ksmtuned	--	gen_context(system_u:object_r:ksmtuned_exec_t,s0)
++
++/var/run/ksmtune\.pid		--	gen_context(system_u:object_r:ntpd_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.if serefpolicy-3.6.32/policy/modules/services/ksmtuned.if
+--- nsaserefpolicy/policy/modules/services/ksmtuned.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/ksmtuned.if	2009-12-09 12:16:41.000000000 -0500
+@@ -0,0 +1,76 @@
++
++## <summary>policy for Kernel Samepage Merging (KSM) Tuning Daemon</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run ksmtuned.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ksmtuned_domtrans',`
++	gen_require(`
++		type ksmtuned_t, ksmtuned_exec_t;
++	')
++
++	domtrans_pattern($1, ksmtuned_exec_t, ksmtuned_t)
++')
++
++
++########################################
++## <summary>
++##	Execute ksmtuned server in the ksmtuned domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`ksmtuned_initrc_domtrans',`
++	gen_require(`
++		type ksmtuned_initrc_exec_t;
++	')
++
++	init_labeled_script_domtrans($1, ksmtuned_initrc_exec_t)
++')
++
++########################################
++## <summary>
++##	All of the rules required to administrate 
++##	an ksmtuned environment
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	Role allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`ksmtuned_admin',`
++	gen_require(`
++		type ksmtuned_t, ksmtuned_var_run_t;
++		type ksmtuned_initrc_exec_t;
++	')
++
++	allow $1 ksmtuned_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, ksmtuned_t, ksmtuned_t)
++	        
++	files_list_pids($1)
++	admin_pattern($1, ksmtuned_var_run_t)
++
++	# Allow ksmtuned_t to restart the apache service
++	ksmtuned_initrc_domtrans($1)
++	domain_system_change_exemption($1)
++	role_transition $2 ksmtuned_initrc_exec_t system_r;
++	allow $2 system_r;
++
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.te serefpolicy-3.6.32/policy/modules/services/ksmtuned.te
+--- nsaserefpolicy/policy/modules/services/ksmtuned.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/ksmtuned.te	2009-12-09 12:17:04.000000000 -0500
+@@ -0,0 +1,46 @@
++policy_module(ksmtuned,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type ksmtuned_t;
++type ksmtuned_exec_t;
++init_daemon_domain(ksmtuned_t, ksmtuned_exec_t)
++
++permissive ksmtuned_t;
++
++type ksmtuned_initrc_exec_t;
++init_script_file(ksmtuned_initrc_exec_t)
++
++type ksmtuned_var_run_t;
++files_pid_file(ksmtuned_var_run_t)
++
++########################################
++#
++# ksmtuned local policy
++#
++allow ksmtuned_t self:capability sys_ptrace;
++
++# Init script handling
++domain_use_interactive_fds(ksmtuned_t)
++
++# internal communication is often done using fifo and unix sockets.
++allow ksmtuned_t self:fifo_file rw_file_perms;
++allow ksmtuned_t self:unix_stream_socket create_stream_socket_perms;
++
++manage_files_pattern(ksmtuned_t, ksmtuned_var_run_t, ksmtuned_var_run_t)
++files_pid_filetrans(ksmtuned_t, ksmtuned_var_run_t, file)
++
++kernel_read_system_state(ksmtuned_t)
++
++dev_rw_sysfs(ksmtuned_t)
++
++domain_read_all_domains_state(ksmtuned_t)
++
++corecmd_exec_bin(ksmtuned_t)
++
++files_read_etc_files(ksmtuned_t)
++
++miscfiles_read_localization(ksmtuned_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-3.6.32/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/ktalk.te	2009-12-03 13:45:11.000000000 -0500
@@ -18704,9 +18882,12 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.6.32/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/oddjob.te	2009-12-03 13:45:11.000000000 -0500
-@@ -101,7 +101,5 @@
++++ serefpolicy-3.6.32/policy/modules/services/oddjob.te	2009-12-09 09:46:22.000000000 -0500
+@@ -99,9 +99,8 @@
+ seutil_read_default_contexts(oddjob_mkhomedir_t)
+ 
  # Add/remove user home directories
++userdom_manage_user_home_dirs(oddjob_mkhomedir_t)
  userdom_home_filetrans_user_home_dir(oddjob_mkhomedir_t)
  userdom_manage_user_home_content_dirs(oddjob_mkhomedir_t)
 -userdom_manage_user_home_content_files(oddjob_mkhomedir_t)
@@ -19377,7 +19558,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.6.32/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-12-06 09:57:32.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-12-09 09:05:31.000000000 -0500
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
@@ -22893,7 +23074,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/share/setroubleshoot/SetroubleshootFixit\.py* 	--	gen_context(system_u:object_r:setroubleshoot_fixit_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.6.32/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.if	2009-12-03 13:52:03.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.if	2009-12-08 16:40:01.000000000 -0500
 @@ -16,8 +16,8 @@
  	')
  
@@ -23033,7 +23214,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-12-09 09:06:40.000000000 -0500
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -23095,7 +23276,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +113,76 @@
+@@ -94,23 +113,77 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -23173,6 +23354,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +        policykit_dbus_chat(setroubleshoot_fixit_t)
++	userdom_read_all_users_state(setroubleshoot_fixit_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.32/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2009-09-16 10:01:19.000000000 -0400
@@ -24642,6 +24824,118 @@ diff -b -B --ignore-all-space --exclude-
  
 -/var/lib/tftpboot(/.*)?		gen_context(system_u:object_r:tftpdir_t,s0)
 +/var/lib/tftpboot(/.*)?		gen_context(system_u:object_r:tftpdir_rw_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tgtd.fc serefpolicy-3.6.32/policy/modules/services/tgtd.fc
+--- nsaserefpolicy/policy/modules/services/tgtd.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/tgtd.fc	2009-12-09 11:49:22.000000000 -0500
+@@ -0,0 +1,3 @@
++/etc/rc\.d/init\.d/tgtd		--	gen_context(system_u:object_r:tgtd_initrc_exec_t,s0)
++/usr/sbin/tgtd			--	gen_context(system_u:object_r:tgtd_exec_t,s0)
++/var/lib/tgtd(/.*)?			gen_context(system_u:object_r:tgtd_var_lib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tgtd.if serefpolicy-3.6.32/policy/modules/services/tgtd.if
+--- nsaserefpolicy/policy/modules/services/tgtd.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/tgtd.if	2009-12-09 11:49:22.000000000 -0500
+@@ -0,0 +1,28 @@
++## <summary>Linux Target Framework Daemon.</summary>
++## <desc>
++##	<p>
++##	Linux target framework (tgt) aims to simplify various
++##	SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation
++##	and maintenance. Our key goals are the clean integration into
++##	the scsi-mid layer and implementing a great portion of tgt
++##	in user space.
++##	</p>
++## </desc>
++
++#####################################
++## <summary>
++##      Allow read and write access to tgtd semaphores.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`tgtd_rw_semaphores',`
++        gen_require(`
++                type tgtd_t;
++        ')
++
++        allow $1 tgtd_t:sem { rw_sem_perms };
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tgtd.te serefpolicy-3.6.32/policy/modules/services/tgtd.te
+--- nsaserefpolicy/policy/modules/services/tgtd.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/tgtd.te	2009-12-09 11:50:43.000000000 -0500
+@@ -0,0 +1,69 @@
++
++policy_module(tgtd, 1.0.0)
++
++########################################
++#
++# TGTD personal declarations.
++#
++
++type tgtd_t;
++type tgtd_exec_t;
++init_daemon_domain(tgtd_t, tgtd_exec_t)
++
++permissive tgtd_t;
++
++type tgtd_initrc_exec_t;
++init_script_file(tgtd_initrc_exec_t)
++
++type tgtd_tmp_t;
++files_tmp_file(tgtd_tmp_t)
++
++type tgtd_tmpfs_t;
++files_tmpfs_file(tgtd_tmpfs_t)
++
++type tgtd_var_lib_t;
++files_type(tgtd_var_lib_t)
++
++########################################
++#
++# TGTD personal policy.
++#
++
++allow tgtd_t self:capability sys_resource;
++allow tgtd_t self:process { setrlimit signal };
++allow tgtd_t self:fifo_file rw_fifo_file_perms;
++allow tgtd_t self:netlink_route_socket { create_socket_perms nlmsg_read };
++allow tgtd_t self:shm create_shm_perms;
++allow tgtd_t self:sem create_sem_perms;
++allow tgtd_t self:tcp_socket create_stream_socket_perms;
++allow tgtd_t self:udp_socket create_socket_perms;
++allow tgtd_t self:unix_dgram_socket create_socket_perms;
++
++manage_sock_files_pattern(tgtd_t, tgtd_tmp_t, tgtd_tmp_t)
++files_tmp_filetrans(tgtd_t, tgtd_tmp_t, { sock_file })
++
++manage_files_pattern(tgtd_t, tgtd_tmpfs_t, tgtd_tmpfs_t)
++fs_tmpfs_filetrans(tgtd_t, tgtd_tmpfs_t, file)
++
++manage_dirs_pattern(tgtd_t, tgtd_var_lib_t, tgtd_var_lib_t)
++manage_files_pattern(tgtd_t, tgtd_var_lib_t, tgtd_var_lib_t)
++files_var_lib_filetrans(tgtd_t, tgtd_var_lib_t, { dir file })
++
++kernel_read_fs_sysctls(tgtd_t)
++
++corenet_all_recvfrom_netlabel(tgtd_t)
++corenet_all_recvfrom_unlabeled(tgtd_t)
++corenet_tcp_sendrecv_generic_if(tgtd_t)
++corenet_tcp_sendrecv_generic_node(tgtd_t)
++corenet_tcp_sendrecv_iscsi_port(tgtd_t)
++corenet_tcp_bind_generic_node(tgtd_t)
++corenet_tcp_bind_iscsi_port(tgtd_t)
++corenet_sendrecv_iscsi_server_packets(tgtd_t)
++
++files_read_etc_files(tgtd_t)
++
++storage_getattr_fixed_disk_dev(tgtd_t)
++
++logging_send_syslog_msg(tgtd_t)
++
++miscfiles_read_localization(tgtd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.te serefpolicy-3.6.32/policy/modules/services/tor.te
 --- nsaserefpolicy/policy/modules/services/tor.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/tor.te	2009-12-06 11:07:48.000000000 -0500
@@ -24942,8 +25236,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/vhostmd.if serefpolicy-3.6.32/policy/modules/services/vhostmd.if
 --- nsaserefpolicy/policy/modules/services/vhostmd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/vhostmd.if	2009-12-06 11:17:52.000000000 -0500
-@@ -0,0 +1,191 @@
++++ serefpolicy-3.6.32/policy/modules/services/vhostmd.if	2009-12-09 12:30:31.000000000 -0500
+@@ -0,0 +1,228 @@
 +
 +## <summary>policy for vhostmd</summary>
 +
@@ -25099,6 +25393,43 @@ diff -b -B --ignore-all-space --exclude-
 +         manage_lnk_files_pattern($1, vhostmd_var_run_t, vhostmd_var_run_t)
 +')
 +
++########################################
++## <summary>
++##      Connect to vhostmd over an unix domain stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`vhostmd_stream_connect',`
++        gen_require(`
++                type vhostmd_t, vhostmd_var_run_t;
++        ')
++
++        files_search_pids($1)
++	stream_connect_pattern($1, vhostmd_var_run_t, vhostmd_var_run_t, vhostmd_t)
++')
++
++#######################################
++## <summary>
++##      Dontaudit read and write to vhostmd 
++##	over an unix domain stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`vhostmd_dontaudit_rw_stream_connect',`
++	gen_require(`
++                type vhostmd_t;
++        ')
++
++	dontaudit $1 vhostmd_t:unix_stream_socket { read write };
++')
 +
 +########################################
 +## <summary>
@@ -25137,8 +25468,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/vhostmd.te serefpolicy-3.6.32/policy/modules/services/vhostmd.te
 --- nsaserefpolicy/policy/modules/services/vhostmd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/vhostmd.te	2009-12-06 11:17:52.000000000 -0500
-@@ -0,0 +1,79 @@
++++ serefpolicy-3.6.32/policy/modules/services/vhostmd.te	2009-12-09 13:28:25.000000000 -0500
+@@ -0,0 +1,87 @@
 +
 +policy_module(vhostmd,1.0.0)
 +
@@ -25167,12 +25498,12 @@ diff -b -B --ignore-all-space --exclude-
 +# vhostmd local policy
 +#
 +
-+allow vhostmd_t self:capability { setuid setgid };
++allow vhostmd_t self:capability { dac_override ipc_lock  setuid setgid };
 +allow vhostmd_t self:process { setsched getsched };
 +
 +# internal communication is often done using fifo and unix sockets.
 +allow vhostmd_t self:fifo_file rw_file_perms;
-+allow vhostmd_t self:unix_stream_socket create_stream_socket_perms;
++allow vhostmd_t self:unix_stream_socket { create_stream_socket_perms connectto};
 +
 +manage_dirs_pattern(vhostmd_t, vhostmd_tmpfs_t, vhostmd_tmpfs_t)
 +manage_files_pattern(vhostmd_t, vhostmd_tmpfs_t, vhostmd_tmpfs_t)
@@ -25187,6 +25518,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +kernel_read_system_state(vhostmd_t)
 +kernel_read_network_state(vhostmd_t)
++kernel_write_xen_state(vhostmd_t)
++
++corenet_tcp_connect_soundd_port(vhostmd_t)
 +
 +files_read_etc_files(vhostmd_t)
 +files_read_usr_files(vhostmd_t)
@@ -25198,6 +25532,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +logging_send_syslog_msg(vhostmd_t)
 +
++libs_use_ld_so(vhostmd_t)
++libs_use_shared_libs(vhostmd_t)
++
 +miscfiles_read_localization(vhostmd_t)
 +
 +optional_policy(`
@@ -25216,6 +25553,8 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +    xen_domtrans_xm(vhostmd_t)
 +    xen_stream_connect(vhostmd_t)
++    xen_stream_connect_xenstore(vhostmd_t)
++    xen_stream_connect_xm(vhostmd_t)
 +')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.6.32/policy/modules/services/virt.fc
@@ -26901,7 +27240,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-03 13:53:23.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-09 11:40:19.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -27040,7 +27379,15 @@ diff -b -B --ignore-all-space --exclude-
  files_tmpfs_file(xserver_tmpfs_t)
  ubac_constrained(xserver_tmpfs_t)
  
-@@ -250,25 +269,33 @@
+@@ -236,6 +255,7 @@
+ fs_search_auto_mountpoints(iceauth_t)
+ 
+ userdom_use_user_terminals(iceauth_t)
++userdom_read_user_tmp_files(iceauth_t)
+ 
+ tunable_policy(`use_nfs_home_dirs',`
+ 	fs_manage_nfs_files(iceauth_t)
+@@ -250,25 +270,33 @@
  # Xauth local policy
  #
  
@@ -27078,7 +27425,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_search_auto_mountpoints(xauth_t)
  
  # cjp: why?
-@@ -278,6 +305,12 @@
+@@ -278,6 +306,12 @@
  
  userdom_use_user_terminals(xauth_t)
  userdom_read_user_tmp_files(xauth_t)
@@ -27091,7 +27438,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_xdm_tmp_files(xauth_t)
  
-@@ -289,6 +322,16 @@
+@@ -289,6 +323,16 @@
  	fs_manage_cifs_files(xauth_t)
  ')
  
@@ -27108,7 +27455,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	ssh_sigchld(xauth_t)
  	ssh_read_pipes(xauth_t)
-@@ -300,20 +343,31 @@
+@@ -300,20 +344,31 @@
  # XDM Local policy
  #
  
@@ -27143,7 +27490,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow gdm to run gdm-binary
  can_exec(xdm_t, xdm_exec_t)
-@@ -325,26 +379,43 @@
+@@ -325,26 +380,43 @@
  # this is ugly, daemons should not create files under /etc!
  manage_files_pattern(xdm_t, xdm_rw_etc_t, xdm_rw_etc_t)
  
@@ -27194,7 +27541,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xdm_t xserver_t:process signal;
  allow xdm_t xserver_t:unix_stream_socket connectto;
-@@ -358,6 +429,7 @@
+@@ -358,6 +430,7 @@
  allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
  
  allow xdm_t xserver_t:shm rw_shm_perms;
@@ -27202,7 +27549,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # connect to xdm xserver over stream socket
  stream_connect_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t, xserver_t)
-@@ -366,10 +438,14 @@
+@@ -366,10 +439,14 @@
  delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
@@ -27218,7 +27565,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
-@@ -389,11 +465,13 @@
+@@ -389,11 +466,13 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_generic_node(xdm_t)
  corenet_udp_bind_generic_node(xdm_t)
@@ -27232,7 +27579,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_rand(xdm_t)
  dev_read_sysfs(xdm_t)
  dev_getattr_framebuffer_dev(xdm_t)
-@@ -401,6 +479,7 @@
+@@ -401,6 +480,7 @@
  dev_getattr_mouse_dev(xdm_t)
  dev_setattr_mouse_dev(xdm_t)
  dev_rw_apm_bios(xdm_t)
@@ -27240,7 +27587,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_setattr_apm_bios_dev(xdm_t)
  dev_rw_dri(xdm_t)
  dev_rw_agp(xdm_t)
-@@ -413,14 +492,17 @@
+@@ -413,14 +493,17 @@
  dev_setattr_video_dev(xdm_t)
  dev_getattr_scanner_dev(xdm_t)
  dev_setattr_scanner_dev(xdm_t)
@@ -27260,12 +27607,14 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xdm_t)
  files_read_var_files(xdm_t)
-@@ -431,9 +513,13 @@
+@@ -431,9 +514,15 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
  files_create_boot_flag(xdm_t)
 +files_dontaudit_getattr_boot_dirs(xdm_t)
 +files_dontaudit_write_usr_files(xdm_t)
++files_dontaudit_getattr_all_dirs(xdm_t)
++files_dontaudit_getattr_all_symlinks(xdm_t)
  
  fs_getattr_all_fs(xdm_t)
  fs_search_auto_mountpoints(xdm_t)
@@ -27274,7 +27623,7 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_dontaudit_read_fixed_disk(xdm_t)
  storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -442,6 +528,7 @@
+@@ -442,6 +531,7 @@
  storage_dontaudit_raw_write_removable_device(xdm_t)
  storage_dontaudit_setattr_removable_dev(xdm_t)
  storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -27282,7 +27631,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_setattr_console(xdm_t)
  term_use_unallocated_ttys(xdm_t)
-@@ -450,6 +537,7 @@
+@@ -450,6 +540,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -27290,7 +27639,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -460,10 +548,12 @@
+@@ -460,10 +551,12 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -27305,7 +27654,7 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_dontaudit_use_unpriv_user_fds(xdm_t)
  userdom_create_all_users_keys(xdm_t)
-@@ -472,6 +562,10 @@
+@@ -472,6 +565,10 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -27316,7 +27665,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -504,10 +598,12 @@
+@@ -504,10 +601,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -27329,7 +27678,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -515,12 +611,47 @@
+@@ -515,12 +614,47 @@
  ')
  
  optional_policy(`
@@ -27377,7 +27726,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -535,6 +666,7 @@
+@@ -535,6 +669,7 @@
  optional_policy(`
  	# Do not audit attempts to check whether user root has email
  	mta_dontaudit_getattr_spool_files(xdm_t)
@@ -27385,7 +27734,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -542,6 +674,38 @@
+@@ -542,6 +677,38 @@
  ')
  
  optional_policy(`
@@ -27424,7 +27773,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +714,9 @@
+@@ -550,8 +717,9 @@
  ')
  
  optional_policy(`
@@ -27436,7 +27785,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +725,6 @@
+@@ -560,7 +728,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -27444,7 +27793,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +735,10 @@
+@@ -571,6 +738,10 @@
  ')
  
  optional_policy(`
@@ -27455,7 +27804,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +755,9 @@
+@@ -587,10 +758,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -27467,7 +27816,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -602,9 +769,12 @@
+@@ -602,9 +772,12 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -27480,7 +27829,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +786,14 @@
+@@ -616,13 +789,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -27496,7 +27845,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,9 +806,19 @@
+@@ -635,9 +809,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -27516,7 +27865,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +852,6 @@
+@@ -671,7 +855,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -27524,7 +27873,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -681,9 +861,12 @@
+@@ -681,9 +864,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -27538,7 +27887,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +881,12 @@
+@@ -698,8 +884,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -27551,7 +27900,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +908,7 @@
+@@ -721,6 +911,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -27559,7 +27908,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +931,7 @@
+@@ -743,7 +934,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -27568,7 +27917,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +963,20 @@
+@@ -775,12 +966,20 @@
  ')
  
  optional_policy(`
@@ -27590,7 +27939,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,12 +1003,12 @@
+@@ -807,12 +1006,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -27607,7 +27956,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Run xkbcomp.
  allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -828,9 +1024,14 @@
+@@ -828,9 +1027,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -27622,7 +27971,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -845,11 +1046,14 @@
+@@ -845,11 +1049,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -27638,7 +27987,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1086,8 @@
+@@ -882,6 +1089,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -27647,7 +27996,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1112,8 @@
+@@ -906,6 +1115,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -27656,7 +28005,7 @@ diff -b -B --ignore-all-space --exclude-
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -973,17 +1181,49 @@
+@@ -973,17 +1184,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -29129,8 +29478,35 @@ diff -b -B --ignore-all-space --exclude-
 -/var/run/racoon.pid		--	gen_context(system_u:object_r:ipsec_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-3.6.32/policy/modules/system/ipsec.if
 --- nsaserefpolicy/policy/modules/system/ipsec.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/ipsec.if	2009-12-03 13:45:11.000000000 -0500
-@@ -229,3 +229,28 @@
++++ serefpolicy-3.6.32/policy/modules/system/ipsec.if	2009-12-09 08:32:17.000000000 -0500
+@@ -39,6 +39,26 @@
+ 
+ ########################################
+ ## <summary>
++##	Connect to racoon using a unix domain stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`ipsec_stream_connect_racoon',`
++	gen_require(`
++		type racoon_t, ipsec_var_run_t;
++	')
++
++	files_search_pids($1)
++	stream_connect_pattern($1, ipsec_var_run_t, ipsec_var_run_t, racoon_t)
++')
++
++
++########################################
++## <summary>
+ ##	Get the attributes of an IPSEC key socket.
+ ## </summary>
+ ## <param name="domain">
+@@ -229,3 +249,28 @@
  	ipsec_domtrans_setkey($1)
  	role $2 types setkey_t;
  ')
@@ -29614,7 +29990,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.6.32/policy/modules/system/iscsi.te
 --- nsaserefpolicy/policy/modules/system/iscsi.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/iscsi.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/iscsi.te	2009-12-09 11:50:12.000000000 -0500
 @@ -55,6 +55,7 @@
  files_pid_filetrans(iscsid_t, iscsi_var_run_t, file)
  
@@ -29623,7 +29999,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(iscsid_t)
  corenet_all_recvfrom_netlabel(iscsid_t)
-@@ -68,11 +69,12 @@
+@@ -68,11 +69,16 @@
  dev_rw_sysfs(iscsid_t)
  
  domain_use_interactive_fds(iscsid_t)
@@ -29633,11 +30009,14 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(iscsid_t)
  
--miscfiles_read_localization(iscsid_t)
 +auth_use_nsswitch(iscsid_t)
++
+ miscfiles_read_localization(iscsid_t)
  
 -sysnet_dns_name_resolve(iscsid_t)
-+miscfiles_read_localization(iscsid_t)
++optional_policy(`
++	tgtd_rw_semaphores(iscsid_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/kdump.te serefpolicy-3.6.32/policy/modules/system/kdump.te
 --- nsaserefpolicy/policy/modules/system/kdump.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/kdump.te	2009-12-03 13:45:11.000000000 -0500
@@ -33459,7 +33838,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-03 17:55:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-09 09:27:20.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -35939,7 +36318,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.32/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-12-09 13:27:42.000000000 -0500
 @@ -71,6 +71,8 @@
  	')
  
@@ -35949,7 +36328,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1,{ xend_var_lib_t xen_image_t },xen_image_t)
  ')
  
-@@ -167,11 +169,14 @@
+@@ -167,11 +169,33 @@
  #
  interface(`xen_stream_connect',`
  	gen_require(`
@@ -35962,10 +36341,29 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	files_search_var_lib($1)
 +	stream_connect_pattern($1, xend_var_lib_t, xend_var_lib_t, xend_t)
++')
++
++########################################
++## <summary>
++##	Connect to xm over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`xen_stream_connect_xm',`
++	gen_require(`
++		type xm_t;
++	')
++
++	files_search_pids($1)
++	stream_connect_pattern($1, xenstored_var_run_t, xenstored_var_run_t, xm_t)
  ')
  
  ########################################
-@@ -191,3 +196,24 @@
+@@ -191,3 +215,24 @@
  
  	domtrans_pattern($1, xm_exec_t, xm_t)
  ')
@@ -35992,7 +36390,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-06 11:17:52.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-09 12:33:06.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36219,7 +36617,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_runtime_files(xm_t)
  files_read_usr_files(xm_t)
-@@ -339,15 +392,74 @@
+@@ -339,15 +392,76 @@
  
  storage_raw_read_fixed_disk(xm_t)
  
@@ -36243,7 +36641,9 @@ diff -b -B --ignore-all-space --exclude-
  xen_stream_connect_xenstore(xm_t)
 +
 +optional_policy(`
-+    vhostmd_rw_tmpfs_files(xm_t)
++	vhostmd_rw_tmpfs_files(xm_t)
++    	vhostmd_stream_connect(xm_t)
++	vhostmd_dontaudit_rw_stream_connect(xm_t)
 +')
 +
 +optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.979
retrieving revision 1.980
diff -u -p -r1.979 -r1.980
--- selinux-policy.spec	7 Dec 2009 22:37:55 -0000	1.979
+++ selinux-policy.spec	9 Dec 2009 19:53:39 -0000	1.980
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Dec 9 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-57
+- Allow unconfined_t to send dbus messages to setroubleshoot
+
 * Mon Dec 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-56
 - Dontaudit exec of fusermount from xguest
 - Allow licrd to use mouse_device



From rhughes at fedoraproject.org  Wed Dec  9 19:56:15 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed,  9 Dec 2009 19:56:15 +0000 (UTC)
Subject: File shared-color-profiles-0.1.0.tar.gz uploaded to lookaside cache
	by rhughes
Message-ID: <20091209195615.4438B10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for shared-color-profiles:

ccdfe0d69cb44e2df4cf717769b2e18b  shared-color-profiles-0.1.0.tar.gz



From ausil at fedoraproject.org  Wed Dec  9 19:56:46 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed,  9 Dec 2009 19:56:46 +0000 (UTC)
Subject: rpms/koji/EL-5 koji.spec,1.10,1.11
Message-ID: <20091209195646.3B59A11C00E0@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/koji/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv429

Modified Files:
	koji.spec 
Log Message:
actually apply livcd softdep patch



Index: koji.spec
===================================================================
RCS file: /cvs/extras/rpms/koji/EL-5/koji.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- koji.spec	6 Dec 2009 16:28:33 -0000	1.10
+++ koji.spec	9 Dec 2009 19:56:45 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name: koji
 Version: 1.3.2
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 License: LGPLv2
 Summary: Build system tools
 Group: Applications/System
@@ -101,6 +101,7 @@ koji-web is a web UI to the Koji system.
 %prep
 %setup -q
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .softdep
 
 %build
 
@@ -183,6 +184,9 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Wed Dec 09 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.2-1.2
+- actually apply the patch to make pykickstart optional
+
 * Sun Dec 06 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.2-1.1
 - add patch to make livecd support optional. the pykickstart in RHEL 5 is too old
 



From rhughes at fedoraproject.org  Wed Dec  9 19:56:39 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed,  9 Dec 2009 19:56:39 +0000 (UTC)
Subject: rpms/shared-color-profiles/devel import.log, NONE,
	1.1 shared-color-profiles.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091209195639.B6AAB11C00E0@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/shared-color-profiles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv499/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shared-color-profiles.spec 
Log Message:



--- NEW FILE import.log ---
shared-color-profiles-0_1_0-1_fc12:HEAD:shared-color-profiles-0.1.0-1.fc12.src.rpm:1260388551


--- NEW FILE shared-color-profiles.spec ---
Summary: Shared color profiles to be used in color management aware applications
Name: shared-color-profiles
Version: 0.1.0
Release: 1%{?dist}
URL: http://github.com/hughsie/shared-color-profiles
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz
License: GPLv2+ and Public Domain
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: color-filesystem

%description 
The shared-color-profiles package contains various profiles which are useful for
programs that are color management aware.
This package only contains the free profiles that can be safely distributed
with Fedora.

%prep
%setup -q

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_datadir}/color/icc/*.ic?
%dir %{_datadir}/shared-color-profiles

# Argyll
%dir %{_datadir}/color/icc/Argyll
%{_datadir}/color/icc/Argyll/*.ic?
%dir %{_datadir}/shared-color-profiles/Argyll
%{_datadir}/shared-color-profiles/Argyll/*

%changelog
* Mon Dec 07 2009 Richard Hughes <richard at hughsie.com> 0.1.0-1
- Initial import of 0.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-color-profiles/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:51:41 -0000	1.1
+++ .cvsignore	9 Dec 2009 19:56:39 -0000	1.2
@@ -0,0 +1 @@
+shared-color-profiles-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-color-profiles/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:51:41 -0000	1.1
+++ sources	9 Dec 2009 19:56:39 -0000	1.2
@@ -0,0 +1 @@
+ccdfe0d69cb44e2df4cf717769b2e18b  shared-color-profiles-0.1.0.tar.gz



From rhughes at fedoraproject.org  Wed Dec  9 19:57:08 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed,  9 Dec 2009 19:57:08 +0000 (UTC)
Subject: rpms/shared-color-profiles/F-12 import.log, NONE,
	1.1 shared-color-profiles.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091209195708.7A09D11C00E0@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/shared-color-profiles/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv763/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shared-color-profiles.spec 
Log Message:



--- NEW FILE import.log ---
shared-color-profiles-0_1_0-1_fc12:F-12:shared-color-profiles-0.1.0-1.fc12.src.rpm:1260388566


--- NEW FILE shared-color-profiles.spec ---
Summary: Shared color profiles to be used in color management aware applications
Name: shared-color-profiles
Version: 0.1.0
Release: 1%{?dist}
URL: http://github.com/hughsie/shared-color-profiles
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz
License: GPLv2+ and Public Domain
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: color-filesystem

%description 
The shared-color-profiles package contains various profiles which are useful for
programs that are color management aware.
This package only contains the free profiles that can be safely distributed
with Fedora.

%prep
%setup -q

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_datadir}/color/icc/*.ic?
%dir %{_datadir}/shared-color-profiles

# Argyll
%dir %{_datadir}/color/icc/Argyll
%{_datadir}/color/icc/Argyll/*.ic?
%dir %{_datadir}/shared-color-profiles/Argyll
%{_datadir}/shared-color-profiles/Argyll/*

%changelog
* Mon Dec 07 2009 Richard Hughes <richard at hughsie.com> 0.1.0-1
- Initial import of 0.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-color-profiles/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:51:41 -0000	1.1
+++ .cvsignore	9 Dec 2009 19:57:08 -0000	1.2
@@ -0,0 +1 @@
+shared-color-profiles-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-color-profiles/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:51:41 -0000	1.1
+++ sources	9 Dec 2009 19:57:08 -0000	1.2
@@ -0,0 +1 @@
+ccdfe0d69cb44e2df4cf717769b2e18b  shared-color-profiles-0.1.0.tar.gz



From rstrode at fedoraproject.org  Wed Dec  9 20:03:08 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  9 Dec 2009 20:03:08 +0000 (UTC)
Subject: rpms/gdm/devel plymouth.patch,NONE,1.1 gdm.spec,1.495,1.496
Message-ID: <20091209200308.4F42D11C00E0@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3155

Modified Files:
	gdm.spec 
Added Files:
	plymouth.patch 
Log Message:
- Update to work better with latest plymouth


plymouth.patch:
 b/daemon/gdm-server.c       |   56 ++++++++++++++++++++++++++
 b/daemon/gdm-server.h       |    1 
 b/daemon/gdm-simple-slave.c |    9 ++++
 b/daemon/gdm-slave.c        |   72 ++++++++++++++++++++++++++++++++++
 b/daemon/gdm-slave.h        |    2 
 daemon/gdm-simple-slave.c   |   92 +++++++++++++++++++++++++++++++++++++++++++-
 6 files changed, 229 insertions(+), 3 deletions(-)

--- NEW FILE plymouth.patch ---
>From 9768d9e2783de7e836421d9645070bb1917800dd Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 27 Nov 2009 18:27:53 -0500
Subject: [PATCH 1/2] Save root window to pixmap at _XROOTPMAP_ID

This combined with starting the X server with -nr
will give us a nice fade transition when g-s-d starts
---
 daemon/gdm-simple-slave.c |    9 +++++
 daemon/gdm-slave.c        |   72 +++++++++++++++++++++++++++++++++++++++++++++
 daemon/gdm-slave.h        |    1 +
 3 files changed, 82 insertions(+), 0 deletions(-)

diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 2cbb568..66d1c77 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -863,6 +863,15 @@ setup_server (GdmSimpleSlave *slave)
 {
         /* Set the busy cursor */
         gdm_slave_set_busy_cursor (GDM_SLAVE (slave));
+
+        /* The root window has a background that may be useful
+         * to cross fade or transition from when setting the
+         * login screen background.  We read it here, and stuff
+         * it into the standard _XROOTPMAP_ID root window property,
+         * so gnome-settings-daemon can get at it.
+         */
+        gdm_slave_save_root_windows (GDM_SLAVE (slave));
+
 }
 
 static void
diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
index e11e16c..da86f77 100644
--- a/daemon/gdm-slave.c
+++ b/daemon/gdm-slave.c
@@ -42,6 +42,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include <X11/Xlib.h> /* for Display */
+#include <X11/Xatom.h> /* for XA_PIXMAP */
 #include <X11/cursorfont.h> /* for watch cursor */
 
 #include "gdm-common.h"
@@ -351,6 +352,77 @@ gdm_slave_run_script (GdmSlave   *slave,
         return ret;
 }
 
+static void
+gdm_slave_save_root_window_of_screen (GdmSlave *slave,
+                                      Atom      id_atom,
+                                      int       screen_number)
+{
+        Window root_window;
+        GC gc;
+        XGCValues values;
+        Pixmap pixmap;
+        int width, height, depth;
+
+        root_window = RootWindow (slave->priv->server_display,
+                                  screen_number);
+
+        width = DisplayWidth (slave->priv->server_display, screen_number);
+        height = DisplayHeight (slave->priv->server_display, screen_number);
+        depth = DefaultDepth (slave->priv->server_display, screen_number);
+        pixmap = XCreatePixmap (slave->priv->server_display,
+                                root_window,
+                                width, height, depth);
+
+        values.function = GXcopy;
+        values.plane_mask = AllPlanes;
+        values.fill_style = FillSolid;
+        values.subwindow_mode = IncludeInferiors;
+
+        gc = XCreateGC (slave->priv->server_display,
+                        root_window,
+                        GCFunction | GCPlaneMask | GCFillStyle | GCSubwindowMode,
+                        &values);
+
+        if (XCopyArea (slave->priv->server_display,
+                       root_window, pixmap, gc, 0, 0,
+                       width, height, 0, 0)) {
+
+                long pixmap_as_long;
+
+                pixmap_as_long = (long) pixmap;
+
+                XChangeProperty (slave->priv->server_display,
+                                 root_window, id_atom, XA_PIXMAP,
+                                 32, PropModeReplace, (guchar *) &pixmap_as_long,
+                                 1);
+
+        }
+
+        XFreeGC (slave->priv->server_display, gc);
+}
+
+void
+gdm_slave_save_root_windows (GdmSlave *slave)
+{
+        int i, number_of_screens;
+        Atom atom;
+
+        number_of_screens = ScreenCount (slave->priv->server_display);
+
+        atom = XInternAtom (slave->priv->server_display,
+                            "_XROOTPMAP_ID", False);
+
+        if (atom == 0) {
+                return;
+        }
+
+        for (i = 0; i < number_of_screens; i++) {
+                gdm_slave_save_root_window_of_screen (slave, atom, i);
+        }
+
+        XSync (slave->priv->server_display, False);
+}
+
 void
 gdm_slave_set_busy_cursor (GdmSlave *slave)
 {
diff --git a/daemon/gdm-slave.h b/daemon/gdm-slave.h
index af28b00..1652457 100644
--- a/daemon/gdm-slave.h
+++ b/daemon/gdm-slave.h
@@ -74,6 +74,7 @@ gboolean            gdm_slave_switch_to_user_session (GdmSlave   *slave,
 
 gboolean            gdm_slave_connect_to_x11_display (GdmSlave   *slave);
 void                gdm_slave_set_busy_cursor        (GdmSlave   *slave);
+void                gdm_slave_save_root_windows      (GdmSlave   *slave);
 gboolean            gdm_slave_run_script             (GdmSlave   *slave,
                                                       const char *dir,
                                                       const char *username);
-- 
1.6.5.2


>From 2343620d464b93cfa46abddf8af14c7268f17df2 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 27 Nov 2009 18:52:54 -0500
Subject: [PATCH 2/2] Enable smooth transition between plymouth and X

This commit checks if plymouth is running, and if so,
turns on the smooth transition between plymouth and X.
---
 daemon/gdm-server.c       |   56 +++++++++++++++++++++++++++
 daemon/gdm-server.h       |    1 +
 daemon/gdm-simple-slave.c |   91 ++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 147 insertions(+), 1 deletions(-)

diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index ba10386..3ec21e9 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -32,8 +32,11 @@
 #include <pwd.h>
 #include <grp.h>
 #include <signal.h>
+#include <sys/ioctl.h>
 #include <sys/resource.h>
 
+#include <linux/vt.h>
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -663,6 +666,44 @@ gdm_server_spawn (GdmServer  *server,
         return ret;
 }
 
+static int
+get_active_vt (void)
+{
+        int console_fd;
+        struct vt_stat console_state = { 0 };
+
+        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
+
+        if (console_fd < 0) {
+                goto out;
+        }
+
+        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
+                goto out;
+        }
+
+out:
+        if (console_fd >= 0) {
+                close (console_fd);
+        }
+
+        return console_state.v_active;
+}
+
+static char *
+get_active_vt_as_string (void)
+{
+        int vt;
+
+        vt = get_active_vt ();
+
+        if (vt <= 0) {
+                return NULL;
+        }
+
+        return g_strdup_printf ("vt%d", vt);
+}
+
 /**
  * gdm_server_start:
  * @disp: Pointer to a GdmDisplay structure
@@ -681,6 +722,21 @@ gdm_server_start (GdmServer *server)
         return res;
 }
 
+gboolean
+gdm_server_start_on_active_vt (GdmServer *server)
+{
+        gboolean res;
+        char *vt;
+
+        g_free (server->priv->command);
+        server->priv->command = g_strdup (X_SERVER " -nr -verbose");
+        vt = get_active_vt_as_string ();
+        res = gdm_server_spawn (server, vt);
+        g_free (vt);
+
+        return res;
+}
+
 static void
 server_died (GdmServer *server)
 {
diff --git a/daemon/gdm-server.h b/daemon/gdm-server.h
index 535a69a..bd6c60a 100644
--- a/daemon/gdm-server.h
+++ b/daemon/gdm-server.h
@@ -56,6 +56,7 @@ GType               gdm_server_get_type  (void);
 GdmServer *         gdm_server_new       (const char *display_id,
                                           const char *auth_file);
 gboolean            gdm_server_start     (GdmServer   *server);
+gboolean            gdm_server_start_on_active_vt (GdmServer   *server);
 gboolean            gdm_server_stop      (GdmServer   *server);
 char *              gdm_server_get_display_device (GdmServer *server);
 
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 66d1c77..4703537 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -84,6 +84,7 @@ struct GdmSimpleSlavePrivate
 
         guint              start_session_when_ready : 1;
         guint              waiting_to_start_session : 1;
+        guint              plymouth_is_running : 1;
 };
 
 enum {
@@ -858,6 +859,72 @@ on_start_session_later (GdmGreeterServer *session,
         slave->priv->start_session_when_ready = FALSE;
 }
 
+static gboolean
+plymouth_is_running (void)
+{
+        int      status;
+        gboolean res;
+        GError  *error;
+
+        error = NULL;
+        res = g_spawn_command_line_sync ("/bin/plymouth --ping",
+                                         NULL, NULL, &status, &error);
+        if (! res) {
+                g_debug ("Could not ping plymouth: %s", error->message);
+                g_error_free (error);
+                return FALSE;
+        }
+
+        return WIFEXITED (status) && WEXITSTATUS (status) == 0;
+}
+
+static void
+plymouth_prepare_for_transition (GdmSimpleSlave *slave)
+{
+        gboolean res;
+        GError  *error;
+
+        error = NULL;
+        res = g_spawn_command_line_sync ("/bin/plymouth deactivate",
+                                         NULL, NULL, NULL, &error);
+        if (! res) {
+                g_warning ("Could not deactivate plymouth: %s", error->message);
+                g_error_free (error);
+        }
+}
+
+static void
+plymouth_quit_with_transition (GdmSimpleSlave *slave)
+{
+        gboolean res;
+        GError  *error;
+
+        error = NULL;
+        res = g_spawn_command_line_sync ("/bin/plymouth quit --retain-splash",
+                                         NULL, NULL, NULL, &error);
+        if (! res) {
+                g_warning ("Could not quit plymouth: %s", error->message);
+                g_error_free (error);
+        }
+        slave->priv->plymouth_is_running = FALSE;
+}
+
+static void
+plymouth_quit_without_transition (GdmSimpleSlave *slave)
+{
+        gboolean res;
+        GError  *error;
+
+        error = NULL;
+        res = g_spawn_command_line_sync ("/bin/plymouth quit",
+                                         NULL, NULL, NULL, &error);
+        if (! res) {
+                g_warning ("Could not quit plymouth: %s", error->message);
+                g_error_free (error);
+        }
+        slave->priv->plymouth_is_running = FALSE;
+}
+
 static void
 setup_server (GdmSimpleSlave *slave)
 {
@@ -872,6 +939,10 @@ setup_server (GdmSimpleSlave *slave)
          */
         gdm_slave_save_root_windows (GDM_SLAVE (slave));
 
+        /* Plymouth is waiting for the go-ahead to exit */
+        if (slave->priv->plymouth_is_running) {
+                plymouth_quit_with_transition (slave);
+        }
 }
 
 static void
@@ -1063,6 +1134,10 @@ on_server_exited (GdmServer      *server,
         g_debug ("GdmSimpleSlave: server exited with code %d\n", exit_code);
 
         gdm_slave_stopped (GDM_SLAVE (slave));
+
+        if (slave->priv->plymouth_is_running) {
+                plymouth_quit_without_transition (slave);
+        }
 }
 
 static void
@@ -1075,6 +1150,10 @@ on_server_died (GdmServer      *server,
                  g_strsignal (signal_number));
 
         gdm_slave_stopped (GDM_SLAVE (slave));
+
+        if (slave->priv->plymouth_is_running) {
+                plymouth_quit_without_transition (slave);
+        }
 }
 
 static gboolean
@@ -1119,7 +1198,14 @@ gdm_simple_slave_run (GdmSimpleSlave *slave)
                                   G_CALLBACK (on_server_ready),
                                   slave);
 
-                res = gdm_server_start (slave->priv->server);
+                slave->priv->plymouth_is_running = plymouth_is_running ();
+
+                if (slave->priv->plymouth_is_running) {
+                        plymouth_prepare_for_transition (slave);
+                        res = gdm_server_start_on_active_vt (slave->priv->server);
+                } else {
+                        res = gdm_server_start (slave->priv->server);
+                }
                 if (! res) {
                         g_warning (_("Could not start the X "
                                      "server (your graphical environment) "
@@ -1129,6 +1215,9 @@ gdm_simple_slave_run (GdmSimpleSlave *slave)
                                      "In the meantime this display will be "
                                      "disabled.  Please restart GDM when "
                                      "the problem is corrected."));
+                        if (slave->priv->plymouth_is_running) {
+                                plymouth_quit_without_transition (slave);
+                        }
                         exit (1);
                 }
 
-- 
1.6.5.2



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- gdm.spec	8 Dec 2009 20:49:59 -0000	1.495
+++ gdm.spec	9 Dec 2009 20:03:07 -0000	1.496
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.29.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -93,8 +93,7 @@ BuildRequires: libXdmcp-devel
 Provides: service(graphical-login)
 
 Requires: audit-libs >= %{libauditver}
-Patch2: gdm-2.29.1-force-active-vt.patch
-Patch3: gdm-2.23.92-save-root-window.patch
+Patch2: plymouth.patch
 
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
@@ -142,8 +141,7 @@ The GDM fingerprint plugin provides func
 
 %prep
 %setup -q
-%patch2 -p1 -b .force-active-vt
-%patch3 -p1 -b .save-root-window
+%patch2 -p1 -b .plymouth
 %patch13 -p1 -b .system-keyboard
 %patch96 -p1 -b .multistack
 %patch97 -p1 -b .bubble-location
@@ -370,7 +368,6 @@ fi
 %dir %{_datadir}/gdm/autostart/LoginWindow
 %config %{_datadir}/gdm/autostart/LoginWindow/*
 %dir %{_localstatedir}/log/gdm
-%dir %{_localstatedir}/spool/gdm
 %dir %{_localstatedir}/run/gdm/greeter
 %attr(1770, gdm, gdm) %dir %{_localstatedir}/lib/gdm
 %attr(1750, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
@@ -401,6 +398,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Dec 09 2009 Ray Strode <rstrode at redhat.com> 2.29.1-3
+- Update to work better with latest plymouth
+
 * Thu Dec 03 2009 Ray Strode <rstrode at redhat.com> 2.29.1-2
 - Drop upstreamed patches
 - rebase multi-stack patch



From lkundrak at fedoraproject.org  Wed Dec  9 20:10:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 20:10:12 +0000 (UTC)
Subject: rpms/gant/devel gant.spec,1.1,1.2
Message-ID: <20091209201012.915B111C00E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5622

Modified Files:
	gant.spec 
Log Message:
Build with OpenJDK


Index: gant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gant/devel/gant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gant.spec	9 Dec 2009 18:20:05 -0000	1.1
+++ gant.spec	9 Dec 2009 20:10:12 -0000	1.2
@@ -30,6 +30,7 @@ BuildRequires:  ant
 BuildRequires:  junit
 BuildRequires:  ant-junit
 BuildRequires:  ivy
+BuildRequires:  java-1.6.0-openjdk
 BuildRequires:  jpackage-utils
 Requires:       jpackage-utils
 



From jamatos at fedoraproject.org  Wed Dec  9 20:16:02 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Wed,  9 Dec 2009 20:16:02 +0000 (UTC)
Subject: File lyx-1.6.5.tar.bz2 uploaded to lookaside cache by jamatos
Message-ID: <20091209201602.7591A10F88C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lyx:

35a10d8cb8e4bdd296092d9d981330c9  lyx-1.6.5.tar.bz2



From overholt at fedoraproject.org  Wed Dec  9 20:18:16 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  9 Dec 2009 20:18:16 +0000 (UTC)
Subject: File xmlrpc3-buildfiles.tar.bz2 uploaded to lookaside cache by
	overholt
Message-ID: <20091209201816.B295B10F88C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xmlrpc3:

b37aad1969dc66057d556bc18ba2ae61  xmlrpc3-buildfiles.tar.bz2



From overholt at fedoraproject.org  Wed Dec  9 20:19:19 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  9 Dec 2009 20:19:19 +0000 (UTC)
Subject: rpms/xmlrpc3/devel sources,1.3,1.4 xmlrpc3.spec,1.16,1.17
Message-ID: <20091209201919.BB39011C00E0@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9201

Modified Files:
	sources xmlrpc3.spec 
Log Message:
Enable tests but don't fail if some fail.  Fix release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Dec 2009 19:18:14 -0000	1.3
+++ sources	9 Dec 2009 20:19:19 -0000	1.4
@@ -1,3 +1,3 @@
 99500a5d04f2eb558716ba3d5a613d14  xmlrpc-3.0-src.tar.gz
-5c389301aa9319e46b74bb7ab0897f33  xmlrpc3-buildfiles.tar.bz2
 107ca9a1e78fcdacc9d5663a9ad3b464  xmlrpc3-ant-osgimanifests.tar.bz2
+b37aad1969dc66057d556bc18ba2ae61  xmlrpc3-buildfiles.tar.bz2


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xmlrpc3.spec	9 Dec 2009 19:18:14 -0000	1.16
+++ xmlrpc3.spec	9 Dec 2009 20:19:19 -0000	1.17
@@ -33,7 +33,7 @@
 
 Name:       xmlrpc3
 Version:    3.0
-Release:    4.10%{?dist}
+Release:    4.11%{?dist}
 Summary:    Java XML-RPC implementation
 License:    ASL 2.0
 Group:      Development/Libraries
@@ -249,7 +249,7 @@ mvn-jpp \
   install javadoc:javadoc
 %else
 ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-  -Djunit.skipped=true -Dmaven.test.skip=true javadoc package
+  javadoc package
 find -name \.svn | xargs rm -rf
 jar cf common/target/%{mainname}-common-%{version}-sources.jar \
   common/src/main/java/META-INF/MANIFEST.MF \



From lkundrak at fedoraproject.org  Wed Dec  9 20:24:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  9 Dec 2009 20:24:13 +0000 (UTC)
Subject: rpms/gant/devel gant.spec,1.2,1.3
Message-ID: <20091209202413.B17D311C00E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10699

Modified Files:
	gant.spec 
Log Message:
Build with OpenJDK


Index: gant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gant/devel/gant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gant.spec	9 Dec 2009 20:10:12 -0000	1.2
+++ gant.spec	9 Dec 2009 20:24:13 -0000	1.3
@@ -30,7 +30,7 @@ BuildRequires:  ant
 BuildRequires:  junit
 BuildRequires:  ant-junit
 BuildRequires:  ivy
-BuildRequires:  java-1.6.0-openjdk
+BuildRequires:  java-devel-openjdk
 BuildRequires:  jpackage-utils
 Requires:       jpackage-utils
 



From nhorman at fedoraproject.org  Wed Dec  9 20:38:08 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Wed,  9 Dec 2009 20:38:08 +0000 (UTC)
Subject: rpms/cscope/F-12 cscope-15.6-invalid-opt.patch, NONE,
	1.1 cscope.spec, 1.39, 1.40
Message-ID: <20091209203808.DDF8911C00E0@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/cscope/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15450

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.6-invalid-opt.patch 
Log Message:
Resolves: bz545816

cscope-15.6-invalid-opt.patch:
 main.c |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 136 insertions(+), 1 deletion(-)

--- NEW FILE cscope-15.6-invalid-opt.patch ---
diff -up cscope-15.6/src/main.c.orig cscope-15.6/src/main.c
--- cscope-15.6/src/main.c.orig	2009-12-09 15:31:10.000000000 -0500
+++ cscope-15.6/src/main.c	2009-12-09 15:31:19.000000000 -0500
@@ -53,6 +53,9 @@
 #include <sys/types.h>	/* needed by stat.h */
 #include <sys/stat.h>	/* stat */
 #include <signal.h>
+#ifdef _GNU_SOURCE
+#include <getopt.h>
+#endif
 
 /* defaults for unset environment variables */
 #define	EDITOR	"vi"
@@ -132,6 +135,124 @@ sigwinch_handler(int sig, siginfo_t *inf
 }
 #endif
 
+#ifdef _GNU_SOURCE
+struct option lopts[] = {
+	{"help", 0, NULL, 'h'},
+	{"version", 0, NULL, 'V'},
+	{0, 0, 0, 0}
+};
+
+char ** parse_options(int *argc, char **argv)
+{
+	int opt;
+	int optind;
+	char path[PATHLEN + 1];     /* file path */
+	char *s;
+	int args_handled = 1;
+	int argcc = *argc;
+	
+
+	while ((opt = getopt_long(argcc, argv,
+	       "hVbcCdeF:f:I:i:kLl0:1:2:3:4:5:6:7:8:9:P:p:qRs:TUuv",
+	       lopts, &optind)) != -1) {
+		args_handled++;
+		switch(opt) {
+
+		case '?':
+			usage();
+			myexit(1);
+			break;
+		case 'b':	/* only build the cross-reference */
+			buildonly = YES;
+			linemode  = YES;
+			break;
+		case 'c':	/* ASCII characters only in crossref */
+			compress = NO;
+			break;
+		case 'C':	/* turn on caseless mode for symbol searches */
+			caseless = YES;
+			egrepcaseless(caseless); /* simulate egrep -i flag */
+			break;
+		case 'd':	/* consider crossref up-to-date */
+			isuptodate = YES;
+			break;
+		case 'e':	/* suppress ^E prompt between files */
+			editallprompt = NO;
+			break;
+		case 'k':	/* ignore DFLT_INCDIR */
+			kernelmode = YES;
+			break;
+		case 'L':
+			onesearch = YES;
+			/* FALLTHROUGH */
+		case 'l':
+			linemode = YES;
+			break;
+		case 'v':
+			verbosemode = YES;
+			break;
+		case 'q':	/* quick search */
+			invertedindex = YES;
+			break;
+		case 'T':	/* truncate symbols to 8 characters */
+			trun_syms = YES;
+			break;
+		case 'u':	/* unconditionally build the cross-reference */
+			unconditional = YES;
+			break;
+		case 'U':	/* assume some files have changed */
+			fileschanged = YES;
+			break;
+		case 'R':
+			recurse_dir = YES;
+			break;
+		case 'f':	/* alternate cross-reference file */
+			reffile = optarg;
+			if (strlen(reffile) > sizeof(path) - 3) {
+				postfatal("\
+					cscope: reffile too long, cannot \
+					be > %d characters\n", sizeof(path) - 3);
+				/* NOTREACHED */
+			}
+			strcpy(path, reffile);
+
+			s = path + strlen(path);
+			strcpy(s, ".in");
+			invname = my_strdup(path);
+			strcpy(s, ".po");
+			invpost = my_strdup(path);
+			break;
+
+		case 'F':	/* symbol reference lines file */
+			reflines = optarg;
+			break;
+		case 'i':	/* file containing file names */
+			namefile = optarg;
+			break;
+		case 'I':	/* #include file directory */
+			includedir(optarg);
+			break;
+		case 'p':	/* file path components to display */
+			dispcomponents = atoi(optarg);
+			break;
+		case 'P':	/* prepend path to file names */
+			prependpath = optarg;
+			break;
+		case 's':	/* additional source file directory */
+			sourcedir(optarg);
+			break;
+		}
+	}
+	/*
+ 	 * This adjusts argv so that we only see the remaining 
+ 	 * args.  Its ugly, but we need to do it so that the rest
+ 	 * of the main routine doesn't get all confused
+ 	 */
+	*argc = *argc - args_handled;
+	return &argv[*argc];
+}
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -155,6 +276,9 @@ main(int argc, char **argv)
     argv0 = argv[0];
 
     /* set the options */
+#ifdef _GNU_SOURCE
+	argv = parse_options(&argc, argv);
+#else
     while (--argc > 0 && (*++argv)[0] == '-') {
 	/* HBB 20030814: add GNU-style --help and --version options */
 	if (strequal(argv[0], "--help")
@@ -174,7 +298,17 @@ main(int argc, char **argv)
 	}
 
 	for (s = argv[0] + 1; *s != '\0'; s++) {
-			
+
+	    if ((*s != 'f') && (*s != 'F') &&
+		(*s != 'i') && (*s != 'I') &&
+		(*s != 'p') && (*s != 'P') &&
+		(*s != 's') && (*s != 'S')) {
+			if (*(s+1) != '\0') {
+				usage();
+				myexit(1);
+			}
+		}
+
 	    /* look for an input field number */
 	    if (isdigit((unsigned char) *s)) {
 		field = *s - '0';
@@ -324,6 +458,7 @@ cscope: reffile too long, cannot be > %d
     } /* while(argv) */
 
  lastarg:
+#endif
     /* read the environment */
     editor = mygetenv("EDITOR", EDITOR);
     editor = mygetenv("VIEWER", editor); /* use viewer if set */


Index: cscope.spec
===================================================================
RCS file: /cvs/extras/rpms/cscope/F-12/cscope.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- cscope.spec	24 Jul 2009 19:43:42 -0000	1.39
+++ cscope.spec	9 Dec 2009 20:38:08 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.6.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -19,6 +19,7 @@ Patch2:cscope-15.6-xcscope-man.patch
 Patch3:cscope-15.6-sigwinch-linemode.patch
 Patch4:cscope-15.6-qrebuild.patch
 Patch5:cscope-15.6-incdir-overflow.patch
+Patch6:cscope-15.6-invalid-opt.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -35,8 +36,10 @@ matches for use in file editing.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
+export CFLAGS="-g -O2 -D_GNU_SOURCE"
 %configure
 make
 
@@ -83,6 +86,9 @@ rm -f %{xemacs_lisp_path}/xcscope.el
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Wed Dec 09 2009 Neil Horman <nhorman at redhat.com>
+- Fixed broken parsing of invalid options (bz 545816)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Wed Dec  9 20:39:18 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Dec 2009 20:39:18 +0000 (UTC)
Subject: File libpciaccess-20091209.tar.bz2 uploaded to lookaside cache by
	ajax
Message-ID: <20091209203918.390E410F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libpciaccess:

945bdd5989282773e0439d0d02f6ef0b  libpciaccess-20091209.tar.bz2



From ajax at fedoraproject.org  Wed Dec  9 20:39:37 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  9 Dec 2009 20:39:37 +0000 (UTC)
Subject: rpms/libpciaccess/devel .cvsignore, 1.9, 1.10 libpciaccess.spec,
	1.27, 
	1.28 make-libpciaccess-snapshot.sh, 1.6, 1.7 sources, 1.11, 1.12
Message-ID: <20091209203937.7A1CE11C00E0@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15966

Modified Files:
	.cvsignore libpciaccess.spec make-libpciaccess-snapshot.sh 
	sources 
Log Message:
* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 0.10.9-2.20091209
- New git snapshot
- Drop the fd cache patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	25 Sep 2009 01:55:53 -0000	1.9
+++ .cvsignore	9 Dec 2009 20:39:37 -0000	1.10
@@ -1 +1 @@
-libpciaccess-0.10.9.tar.bz2
+libpciaccess-20091209.tar.bz2


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libpciaccess.spec	25 Sep 2009 01:55:53 -0000	1.27
+++ libpciaccess.spec	9 Dec 2009 20:39:37 -0000	1.28
@@ -1,9 +1,9 @@
-%define gitdate 20071031
-%define gitrev e392082abb5696c8837224da86cc0af4f21d7010
+%define gitdate 20091209
+%define gitrev 5e8d4c19b4f618e22b6e8e1ad3294d8708067474
 
 Name:           libpciaccess
 Version:        0.10.9
-Release:        1%{?dist}
+Release:        2.%{gitdate}%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -12,12 +12,11 @@ URL:            http://gitweb.freedeskto
 
 # git snapshot.  To recreate, run
 # % ./make-libpciaccess-snapshot.sh %{gitrev}
-#Source0:        libpciaccess-20071031.tar.bz2
-Source0:	http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.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)
 
-Patch0:		libpciaccess-fd-cache.patch
 Patch2:		libpciaccess-rom-size.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig xorg-x11-util-macros
@@ -37,8 +36,7 @@ Requires:       pkgconfig
 Development package for libpciaccess.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .cache
+%setup -q -n %{name}-%{gitdate}
 %patch2 -p1 -b .rom-size
 
 %build
@@ -59,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog
+%doc COPYING AUTHORS
 %{_libdir}/libpciaccess.so.0
 %{_libdir}/libpciaccess.so.0.10.*
 
@@ -70,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 0.10.9-2.20091209
+- New git snapshot
+- Drop the fd cache patch
+
 * Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 0.10.9-1
 - rebase to latest upstream release - drop patches
 
@@ -100,7 +102,6 @@ rm -rf $RPM_BUILD_ROOT
 - rebase to latest release (will do release with VGA bits later)
 - libpciaccess-boot-vga.patch: add boot vga patch from upstream
 
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: make-libpciaccess-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/make-libpciaccess-snapshot.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- make-libpciaccess-snapshot.sh	27 Jul 2009 05:11:39 -0000	1.6
+++ make-libpciaccess-snapshot.sh	9 Dec 2009 20:39:37 -0000	1.7
@@ -12,7 +12,13 @@ else
 	bzip2 -c > $DIRNAME-$DATE.tar.bz2
 fi
 
-HASH=$(GIT_DIR=gah.git git-show-ref -s $REV)
+HASH=$(GIT_DIR=$DIRNAME.git git show-ref -s $REV)
+
+echo $HASH
+
+exit 
+
+# the rest of this is supposed to work?  i guess.
 
 version=$(sed -n -e "s/^Version: *\(.*\)/\1/p" < libpciaccess.spec)
 release=$(sed -n -e "s/^Release: *\([^.]*\).*/\1/p" < libpciaccess.spec)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	25 Sep 2009 01:55:53 -0000	1.11
+++ sources	9 Dec 2009 20:39:37 -0000	1.12
@@ -1 +1 @@
-685cb20e7a6165bc010972f1183addbd  libpciaccess-0.10.9.tar.bz2
+945bdd5989282773e0439d0d02f6ef0b  libpciaccess-20091209.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec  9 20:53:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 20:53:11 +0000
Subject: [pkgdb] gpodder: vpv has requested commit
Message-ID: <20091209205311.9607A10F892@bastion2.fedora.phx.redhat.com>

vpv has requested the commit acl on gpodder (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpodder



From pkgdb at fedoraproject.org  Wed Dec  9 20:53:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 20:53:22 +0000
Subject: [pkgdb] gpodder: vpv has given up watchcommits
Message-ID: <20091209205322.5F8D210F89D@bastion2.fedora.phx.redhat.com>

vpv has given up the watchcommits acl on gpodder (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpodder



From pkgdb at fedoraproject.org  Wed Dec  9 20:53:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 20:53:29 +0000
Subject: [pkgdb] gpodder: vpv has requested commit
Message-ID: <20091209205330.0BD6410F89E@bastion2.fedora.phx.redhat.com>

vpv has requested the commit acl on gpodder (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpodder



From pkgdb at fedoraproject.org  Wed Dec  9 20:53:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 09 Dec 2009 20:53:35 +0000
Subject: [pkgdb] gpodder: vpv has requested commit
Message-ID: <20091209205335.0D06F10F89F@bastion2.fedora.phx.redhat.com>

vpv has requested the commit acl on gpodder (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpodder



From kzak at fedoraproject.org  Wed Dec  9 20:58:54 2009
From: kzak at fedoraproject.org (kzak)
Date: Wed,  9 Dec 2009 20:58:54 +0000 (UTC)
Subject: rpms/util-linux-ng/F-12 util-linux-ng-2.16-blkid-crypto.patch, NONE,
	1.1 util-linux-ng-2.16-blkid-ntfs.patch, NONE,
	1.1 util-linux-ng.spec, 1.65,
	1.66 util-linux-ng-2.16-blkid-crypto.path, 1.1,
	NONE util-linux-ng-2.16-blkid-ntfs.path, 1.1, NONE
Message-ID: <20091209205854.9347A11C00E0@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22319

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-blkid-crypto.patch 
	util-linux-ng-2.16-blkid-ntfs.patch 
Removed Files:
	util-linux-ng-2.16-blkid-crypto.path 
	util-linux-ng-2.16-blkid-ntfs.path 
Log Message:
* Wed Dec  9 2009 Karel Zak <kzak at redhat.com> 2.16.2-3
- fix typo in spec file


util-linux-ng-2.16-blkid-crypto.patch:
 probe.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE util-linux-ng-2.16-blkid-crypto.patch ---
From: Scott James Remnant <scott at ubuntu.com>
Subject: [PATCH] libblkid: return first detected crypto device

Crypto devices may sometimes have multiple additional prober matches,
however just like RAID, there's no danger of activating the wrong one
since special help is needed to activate the block device before it
can be used.

Thus modify blkid_do_safeprobe() to break out of the loop when a
crypto device is detected, as it does already for RAID.

[kzak at redhar.com: - backport to 2.16.2 for Fedora-12]

Signed-off-by: Scott James Remnant <scott at ubuntu.com>
Signed-off-by: Karel Zak <kzak at redhat.com>

diff -up util-linux-ng-2.16.2/shlibs/blkid/src/probe.c.kzak util-linux-ng-2.16.2/shlibs/blkid/src/probe.c
--- util-linux-ng-2.16.2/shlibs/blkid/src/probe.c.kzak	2009-12-07 09:44:46.000000000 +0100
+++ util-linux-ng-2.16.2/shlibs/blkid/src/probe.c	2009-12-07 09:47:12.000000000 +0100
@@ -538,9 +538,9 @@ int blkid_do_probe(blkid_probe pr)
  * (cannot be used in while()) and checks for ambivalen results (more
  * filesystems on the device) -- in such case returns -2.
  *
- * The function does not check for filesystems when a RAID signature is
- * detected.  The function also does not check for collision between RAIDs. The
- * first detected RAID is returned.
+ * The function does not check for filesystems when a RAID or crypto signature
+ * is detected.  The function also does not check for collision between RAIDs
+ * and crypto devices. The first detected RAID or crypto device is returned.
  */
 int blkid_do_safeprobe(blkid_probe pr)
 {
@@ -558,7 +558,7 @@ int blkid_do_safeprobe(blkid_probe pr)
 		}
 		count++;
 
-		if (idinfos[pr->idx]->usage & BLKID_USAGE_RAID)
+		if (idinfos[pr->idx]->usage & (BLKID_USAGE_RAID | BLKID_USAGE_CRYPTO))
 			break;
 		if (!(idinfos[pr->idx]->flags & BLKID_IDINFO_TOLERANT))
 			intol++;

util-linux-ng-2.16-blkid-ntfs.patch:
 ntfs.c |   18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

--- NEW FILE util-linux-ng-2.16-blkid-ntfs.patch ---

  Backport from upstream to Fedora-12, original patch:

  commit 832b3f2eb6a6c5f2e7d8db422767404320e45ced
  Author: Karel Zak <kzak at redhat.com>
  Date:   Fri Nov 13 00:10:48 2009 +0100

    libblkid: fix NTFS non-ASCII labels

    Addresses-Red-Hat-Bug: #536797
    Signed-off-by: Karel Zak <kzak at redhat.com>



diff -up util-linux-ng-2.16.2/shlibs/blkid/src/probers/ntfs.c.kzak util-linux-ng-2.16.2/shlibs/blkid/src/probers/ntfs.c
--- util-linux-ng-2.16.2/shlibs/blkid/src/probers/ntfs.c.kzak	2009-11-30 12:43:13.000000000 +0100
+++ util-linux-ng-2.16.2/shlibs/blkid/src/probers/ntfs.c	2009-12-07 10:34:10.000000000 +0100
@@ -65,10 +65,9 @@ static int probe_ntfs(blkid_probe pr, co
 	struct ntfs_super_block *ns;
 	struct master_file_table_record *mft;
 	struct file_attribute *attr;
-	unsigned char	label_str[129], *cp;
 	int		bytes_per_sector, sectors_per_cluster;
 	int		mft_record_size, attr_off, attr_len;
-	unsigned int	i, attr_type, val_len;
+	unsigned int	attr_type, val_len;
 	int		val_off;
 	uint64_t		nr_clusters;
 	blkid_loff_t off;
@@ -128,7 +127,6 @@ static int probe_ntfs(blkid_probe pr, co
 	mft = (struct master_file_table_record *) buf_mft;
 
 	attr_off = le16_to_cpu(mft->attrs_offset);
-	label_str[0] = 0;
 
 	while (1) {
 		attr = (struct file_attribute *) (buf_mft + attr_off);
@@ -147,16 +145,8 @@ static int probe_ntfs(blkid_probe pr, co
 			break;
 
 		if (attr_type == MFT_RECORD_ATTR_VOLUME_NAME) {
-			if (val_len > sizeof(label_str))
-				val_len = sizeof(label_str)-1;
-
-			for (i=0, cp=label_str; i < val_len; i+=2,cp++) {
-				val = ((uint8_t *) attr) + val_off + i;
-				*cp = val[0];
-				if (val[1])
-					*cp = '?';
-			}
-			*cp = 0;
+			val = ((uint8_t *) attr) + val_off;
+			blkid_probe_set_utf8label(pr, val, val_len, BLKID_ENC_UTF16LE);
 		}
 	}
 
@@ -164,8 +154,6 @@ static int probe_ntfs(blkid_probe pr, co
 			(unsigned char *) &ns->volume_serial,
 			sizeof(ns->volume_serial),
 			"%016" PRIX64, le64_to_cpu(ns->volume_serial));
-	if (label_str[0])
-		blkid_probe_set_label(pr, label_str, strlen((char *)label_str));
 	return 0;
 }
 


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- util-linux-ng.spec	7 Dec 2009 09:43:23 -0000	1.65
+++ util-linux-ng.spec	9 Dec 2009 20:58:54 -0000	1.66
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -106,9 +106,9 @@ Patch8: util-linux-ng-2.15-ipcs-32bit.pa
 
 ### Upstream patches
 # 531992 -  not prompted for passphrase
-Patch9: util-linux-ng-2.16-blkid-crypto.path
+Patch9: util-linux-ng-2.16-blkid-crypto.patch
 # 536797 -  ntfs volume labels are not correct in hal
-Patch10: util-linux-ng-2.16-blkid-ntfs.path
+Patch10: util-linux-ng-2.16-blkid-ntfs.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -715,6 +715,9 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Karel Zak <kzak at redhat.com> 2.16.2-3
+- fix typo in spec file
+
 * Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-2
 - fix #536797 - ntfs volume labels are not correct in hal
 


--- util-linux-ng-2.16-blkid-crypto.path DELETED ---


--- util-linux-ng-2.16-blkid-ntfs.path DELETED ---



From wcohen at fedoraproject.org  Wed Dec  9 21:03:28 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed,  9 Dec 2009 21:03:28 +0000 (UTC)
Subject: rpms/papi/devel papi.spec,1.7,1.8
Message-ID: <20091209210328.6D7C111C00E0@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/papi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23716

Modified Files:
	papi.spec 
Log Message:
* Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-2
- Remove dependency on kernel-devel.




Index: papi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papi/devel/papi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- papi.spec	9 Dec 2009 17:21:45 -0000	1.7
+++ papi.spec	9 Dec 2009 21:03:28 -0000	1.8
@@ -1,15 +1,15 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 3.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/System
 URL: http://icl.cs.utk.edu/papi/
 Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
+BuildRequires: kernel-headers >= 2.6.31
 BuildRequires: gcc-gfortran
-BuildRequires: kernel-devel >= 2.6.31
 BuildRequires: chrpath
 #Right now libpfm does not know anything about s390 and will fail
 ExcludeArch: s390, s390x
@@ -32,9 +32,7 @@ that uses PAPI.
 
 %build
 cd src
-PERF_HEAD=`ls /usr/src/kernels/*/include/linux/perf_counter.h|sort |tail -n 1` || exit 1
-PERF_HEADER=`dirname $PERF_HEAD`
-%configure --with-pcl=yes --with-pcl-incdir=$PERF_HEADER --disable-static
+%configure --with-pcl=yes --disable-static --with-pcl-incdir=/usr/include/linux
 make %{?_smp_mflags}
 
 #%check
@@ -72,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-2
+- Remove dependency on kernel-devel.
+
 * Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-1
 - Import papi-3.7.2.
 



From pghmcfc at fedoraproject.org  Wed Dec  9 21:05:10 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  9 Dec 2009 21:05:10 +0000 (UTC)
Subject: rpms/proftpd/F-11 proftpd-1.3.2a-mlsd.patch, 1.1, 1.2 proftpd.spec, 
	1.52, 1.53
Message-ID: <20091209210510.BCF7811C00E0@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24612/F-11

Modified Files:
	proftpd-1.3.2a-mlsd.patch proftpd.spec 
Log Message:
Reduce the mod_facts patch to the single commit addressing the issue with directory names with glob characters (#521634), avoiding introducing a further problem with <Limit> (#544002)

proftpd-1.3.2a-mlsd.patch:
 mod_facts.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Index: proftpd-1.3.2a-mlsd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd-1.3.2a-mlsd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- proftpd-1.3.2a-mlsd.patch	7 Sep 2009 13:40:46 -0000	1.1
+++ proftpd-1.3.2a-mlsd.patch	9 Dec 2009 21:05:10 -0000	1.2
@@ -1,166 +1,6 @@
 --- proftpd-1.3.2a/modules/mod_facts.c.mlsd	2009-04-28 22:17:45.000000000 +0100
 +++ proftpd-1.3.2a/modules/mod_facts.c	2009-09-07 14:17:39.000000000 +0100
-@@ -22,7 +22,7 @@
-  * resulting executable, without including the source code for OpenSSL in the
-  * source distribution.
-  *
-- * $Id$
-+ * $Id$
-  */
- 
- #include "conf.h"
-@@ -227,7 +227,17 @@
-     ptr = buf + buflen;
-   }
- 
--  snprintf(ptr, bufsz - buflen, " %s\n", info->path);
-+  /* MLST entries are not sent via pr_data_xfer(), and thus we do not need
-+   * to include an LF at the end; it is appended by pr_response_send_raw().
-+   * But MLSD entries DO need the trailing LF, so that it can be converted
-+   * into a CRLF sequence by pr_data_xfer().
-+   */
-+  if (strcmp(session.curr_cmd, C_MLSD) == 0) {
-+    snprintf(ptr, bufsz - buflen, " %s\n", info->path);
-+
-+  } else {
-+    snprintf(ptr, bufsz - buflen, " %s", info->path);
-+  }
- 
-   buf[bufsz-1] = '\0';
-   buflen = strlen(buf);
-@@ -244,11 +254,17 @@
-  * channel, wherease MLSD's output is sent via a data transfer, much like
-  * LIST or NLST.
-  */
--static char mlinfo_buf[PR_TUNABLE_BUFFER_SIZE];
-+static char *mlinfo_buf = NULL;
-+static size_t mlinfo_bufsz = 0;
- static size_t mlinfo_buflen = 0;
- 
- static void facts_mlinfobuf_init(void) {
--  memset(mlinfo_buf, '\0', sizeof(mlinfo_buf));
-+  if (mlinfo_buf == NULL) {
-+    mlinfo_bufsz = pr_config_get_xfer_bufsz();
-+    mlinfo_buf = palloc(session.pool, mlinfo_bufsz);
-+  }
-+
-+  memset(mlinfo_buf, '\0', mlinfo_bufsz);
-   mlinfo_buflen = 0;
- }
- 
-@@ -261,11 +277,11 @@
-   /* If this buffer will exceed the capacity of mlinfo_buf, then flush
-    * mlinfo_buf.
-    */
--  if (buflen >= (sizeof(mlinfo_buf) - mlinfo_buflen)) {
-+  if (buflen >= (mlinfo_bufsz - mlinfo_buflen)) {
-     (void) facts_mlinfobuf_flush();
-   }
- 
--  sstrcat(mlinfo_buf, buf, sizeof(mlinfo_buf));
-+  sstrcat(mlinfo_buf, buf, mlinfo_bufsz);
-   mlinfo_buflen += buflen;
- }
- 
-@@ -358,6 +374,8 @@
-   char buf[PR_TUNABLE_BUFFER_SIZE];
- 
-   (void) facts_mlinfo_fmt(info, buf, sizeof(buf));
-+
-+  /* The trailing CRLF will be added by pr_response_send_raw(). */
-   pr_response_send_raw("%s", buf);
- }
- 
-@@ -595,7 +613,6 @@
-  */
- 
- MODRET facts_mff(cmd_rec *cmd) {
--  register unsigned int i;
-   const char *path, *decoded_path;
-   char *facts, *ptr;
- 
-@@ -606,18 +623,16 @@
- 
-   facts = cmd->argv[1];
- 
--  /* The path can contain spaces; it is thus the concatenation of all of the
--   * arguments after the timestamp.
-+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
-+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
-+   * find the FIRST space in cmd->arg; the path is everything past that space.
-    */
--  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
--  for (i = 3; i < cmd->argc; i++) {
--    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
--  }
-+  ptr = strchr(cmd->arg, ' ');
-+  path = pstrdup(cmd->tmp_pool, ptr + 1);
- 
-   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
-@@ -739,7 +754,6 @@
- }
- 
- MODRET facts_mfmt(cmd_rec *cmd) {
--  register unsigned int i;
-   const char *path, *decoded_path;
-   char *timestamp, *ptr;
-   int res;
-@@ -751,18 +765,16 @@
- 
-   timestamp = cmd->argv[1];
- 
--  /* The path can contain spaces; it is thus the concatenation of all of the
--   * arguments after the timestamp.
-+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
-+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
-+   * find the FIRST space in cmd->arg; the path is everything past that space.
-    */
--  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
--  for (i = 3; i < cmd->argc; i++) {
--    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
--  }
-+  ptr = strchr(cmd->arg, ' ');
-+  path = pstrdup(cmd->tmp_pool, ptr + 1);
- 
-   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
-@@ -820,33 +832,28 @@
-   DIR *dirh;
-   struct dirent *dent;
- 
--  if (cmd->argc > 2) {
--    pr_response_add_err(R_501, _("Invalid number of arguments"));
--    return PR_ERROR(cmd);
--  }
--
-   if (cmd->argc != 1) {
--    path = cmd->argv[1];
-+    path = pstrdup(cmd->tmp_pool, cmd->arg);
-     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
-   } else {
-     decoded_path = path = pr_fs_getcwd();
-   }
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
+@@ -841,12 +841,13 @@
      return PR_ERROR(cmd);
    }
  
@@ -179,67 +19,3 @@
    }
  
    /* Make sure that the given path is actually a directory. */
-@@ -870,11 +877,11 @@
-     int xerrno = errno;
- 
-     pr_trace_msg("fileperms", 1, "MLSD, user '%s' (UID %lu, GID %lu): "
--      "error reading directory '%s': %s", session.user,
-+      "error opening directory '%s': %s", session.user,
-       (unsigned long) session.uid, (unsigned long) session.gid,
-       decoded_path, strerror(xerrno));
- 
--    pr_response_add_err(R_550, _("'%s' cannot be listed"), path);
-+    pr_response_add_err(R_550, "%s: %s", path, strerror(xerrno));
-     return PR_ERROR(cmd);
-   }
- 
-@@ -899,16 +906,14 @@
-     /* Check that the file can be listed. */
-     abs_path = dir_realpath(cmd->tmp_pool, rel_path);
-     if (abs_path) {
--      res = dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
--        &hidden);
-+      res = dir_check(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
-       
-     } else {
-       abs_path = dir_canonical_path(cmd->tmp_pool, rel_path);
-       if (abs_path == NULL)
-         abs_path = rel_path;
- 
--      res = dir_check_canon(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
--        &hidden);
-+      res = dir_check_canon(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
-     }
- 
-     if (!res || hidden) {
-@@ -955,20 +960,15 @@
-   const char *path, *decoded_path;
-   struct mlinfo info;
- 
--  if (cmd->argc > 2) {
--    pr_response_add_err(R_501, _("Invalid number of arguments"));
--    return PR_ERROR(cmd);
--  }
--
-   if (cmd->argc != 1) {
--    path = cmd->argv[1];
-+    path = pstrdup(cmd->tmp_pool, cmd->arg);
-     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
-   } else {
-     decoded_path = path = pr_fs_getcwd();
-   }
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path,
-       &hidden)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-@@ -1155,6 +1155,7 @@
- 
-   pr_feat_add("MFF modify;UNIX.group;UNIX.mode;");
-   pr_feat_add("MFMT");
-+  pr_feat_add("TVFS");
- 
-   facts_mlst_feat_add(session.pool);
- 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- proftpd.spec	16 Nov 2009 20:05:30 -0000	1.52
+++ proftpd.spec	9 Dec 2009 21:05:10 -0000	1.53
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 1
+%global rpmrel 2
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -291,6 +291,11 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-2
+- Reduce the mod_facts patch to the single commit addressing the issue with
+  directory names with glob characters (#521634), avoiding introducing a
+  further problem with <Limit> (#544002)
+
 * Wed Oct 21 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-1
 - Update to 1.3.2b
   - Fixed regression causing command-line define options not to work (bug 3221)



From pghmcfc at fedoraproject.org  Wed Dec  9 21:05:10 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  9 Dec 2009 21:05:10 +0000 (UTC)
Subject: rpms/proftpd/F-12 proftpd-1.3.2a-mlsd.patch, 1.1, 1.2 proftpd.spec, 
	1.58, 1.59
Message-ID: <20091209210510.EF58011C00E0@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24612/F-12

Modified Files:
	proftpd-1.3.2a-mlsd.patch proftpd.spec 
Log Message:
Reduce the mod_facts patch to the single commit addressing the issue with directory names with glob characters (#521634), avoiding introducing a further problem with <Limit> (#544002)

proftpd-1.3.2a-mlsd.patch:
 mod_facts.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Index: proftpd-1.3.2a-mlsd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-12/proftpd-1.3.2a-mlsd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- proftpd-1.3.2a-mlsd.patch	7 Sep 2009 13:40:46 -0000	1.1
+++ proftpd-1.3.2a-mlsd.patch	9 Dec 2009 21:05:10 -0000	1.2
@@ -1,166 +1,6 @@
 --- proftpd-1.3.2a/modules/mod_facts.c.mlsd	2009-04-28 22:17:45.000000000 +0100
 +++ proftpd-1.3.2a/modules/mod_facts.c	2009-09-07 14:17:39.000000000 +0100
-@@ -22,7 +22,7 @@
-  * resulting executable, without including the source code for OpenSSL in the
-  * source distribution.
-  *
-- * $Id$
-+ * $Id$
-  */
- 
- #include "conf.h"
-@@ -227,7 +227,17 @@
-     ptr = buf + buflen;
-   }
- 
--  snprintf(ptr, bufsz - buflen, " %s\n", info->path);
-+  /* MLST entries are not sent via pr_data_xfer(), and thus we do not need
-+   * to include an LF at the end; it is appended by pr_response_send_raw().
-+   * But MLSD entries DO need the trailing LF, so that it can be converted
-+   * into a CRLF sequence by pr_data_xfer().
-+   */
-+  if (strcmp(session.curr_cmd, C_MLSD) == 0) {
-+    snprintf(ptr, bufsz - buflen, " %s\n", info->path);
-+
-+  } else {
-+    snprintf(ptr, bufsz - buflen, " %s", info->path);
-+  }
- 
-   buf[bufsz-1] = '\0';
-   buflen = strlen(buf);
-@@ -244,11 +254,17 @@
-  * channel, wherease MLSD's output is sent via a data transfer, much like
-  * LIST or NLST.
-  */
--static char mlinfo_buf[PR_TUNABLE_BUFFER_SIZE];
-+static char *mlinfo_buf = NULL;
-+static size_t mlinfo_bufsz = 0;
- static size_t mlinfo_buflen = 0;
- 
- static void facts_mlinfobuf_init(void) {
--  memset(mlinfo_buf, '\0', sizeof(mlinfo_buf));
-+  if (mlinfo_buf == NULL) {
-+    mlinfo_bufsz = pr_config_get_xfer_bufsz();
-+    mlinfo_buf = palloc(session.pool, mlinfo_bufsz);
-+  }
-+
-+  memset(mlinfo_buf, '\0', mlinfo_bufsz);
-   mlinfo_buflen = 0;
- }
- 
-@@ -261,11 +277,11 @@
-   /* If this buffer will exceed the capacity of mlinfo_buf, then flush
-    * mlinfo_buf.
-    */
--  if (buflen >= (sizeof(mlinfo_buf) - mlinfo_buflen)) {
-+  if (buflen >= (mlinfo_bufsz - mlinfo_buflen)) {
-     (void) facts_mlinfobuf_flush();
-   }
- 
--  sstrcat(mlinfo_buf, buf, sizeof(mlinfo_buf));
-+  sstrcat(mlinfo_buf, buf, mlinfo_bufsz);
-   mlinfo_buflen += buflen;
- }
- 
-@@ -358,6 +374,8 @@
-   char buf[PR_TUNABLE_BUFFER_SIZE];
- 
-   (void) facts_mlinfo_fmt(info, buf, sizeof(buf));
-+
-+  /* The trailing CRLF will be added by pr_response_send_raw(). */
-   pr_response_send_raw("%s", buf);
- }
- 
-@@ -595,7 +613,6 @@
-  */
- 
- MODRET facts_mff(cmd_rec *cmd) {
--  register unsigned int i;
-   const char *path, *decoded_path;
-   char *facts, *ptr;
- 
-@@ -606,18 +623,16 @@
- 
-   facts = cmd->argv[1];
- 
--  /* The path can contain spaces; it is thus the concatenation of all of the
--   * arguments after the timestamp.
-+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
-+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
-+   * find the FIRST space in cmd->arg; the path is everything past that space.
-    */
--  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
--  for (i = 3; i < cmd->argc; i++) {
--    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
--  }
-+  ptr = strchr(cmd->arg, ' ');
-+  path = pstrdup(cmd->tmp_pool, ptr + 1);
- 
-   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
-@@ -739,7 +754,6 @@
- }
- 
- MODRET facts_mfmt(cmd_rec *cmd) {
--  register unsigned int i;
-   const char *path, *decoded_path;
-   char *timestamp, *ptr;
-   int res;
-@@ -751,18 +765,16 @@
- 
-   timestamp = cmd->argv[1];
- 
--  /* The path can contain spaces; it is thus the concatenation of all of the
--   * arguments after the timestamp.
-+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
-+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
-+   * find the FIRST space in cmd->arg; the path is everything past that space.
-    */
--  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
--  for (i = 3; i < cmd->argc; i++) {
--    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
--  }
-+  ptr = strchr(cmd->arg, ' ');
-+  path = pstrdup(cmd->tmp_pool, ptr + 1);
- 
-   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
-@@ -820,33 +832,28 @@
-   DIR *dirh;
-   struct dirent *dent;
- 
--  if (cmd->argc > 2) {
--    pr_response_add_err(R_501, _("Invalid number of arguments"));
--    return PR_ERROR(cmd);
--  }
--
-   if (cmd->argc != 1) {
--    path = cmd->argv[1];
-+    path = pstrdup(cmd->tmp_pool, cmd->arg);
-     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
-   } else {
-     decoded_path = path = pr_fs_getcwd();
-   }
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
+@@ -841,12 +841,13 @@
      return PR_ERROR(cmd);
    }
  
@@ -179,67 +19,3 @@
    }
  
    /* Make sure that the given path is actually a directory. */
-@@ -870,11 +877,11 @@
-     int xerrno = errno;
- 
-     pr_trace_msg("fileperms", 1, "MLSD, user '%s' (UID %lu, GID %lu): "
--      "error reading directory '%s': %s", session.user,
-+      "error opening directory '%s': %s", session.user,
-       (unsigned long) session.uid, (unsigned long) session.gid,
-       decoded_path, strerror(xerrno));
- 
--    pr_response_add_err(R_550, _("'%s' cannot be listed"), path);
-+    pr_response_add_err(R_550, "%s: %s", path, strerror(xerrno));
-     return PR_ERROR(cmd);
-   }
- 
-@@ -899,16 +906,14 @@
-     /* Check that the file can be listed. */
-     abs_path = dir_realpath(cmd->tmp_pool, rel_path);
-     if (abs_path) {
--      res = dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
--        &hidden);
-+      res = dir_check(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
-       
-     } else {
-       abs_path = dir_canonical_path(cmd->tmp_pool, rel_path);
-       if (abs_path == NULL)
-         abs_path = rel_path;
- 
--      res = dir_check_canon(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
--        &hidden);
-+      res = dir_check_canon(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
-     }
- 
-     if (!res || hidden) {
-@@ -955,20 +960,15 @@
-   const char *path, *decoded_path;
-   struct mlinfo info;
- 
--  if (cmd->argc > 2) {
--    pr_response_add_err(R_501, _("Invalid number of arguments"));
--    return PR_ERROR(cmd);
--  }
--
-   if (cmd->argc != 1) {
--    path = cmd->argv[1];
-+    path = pstrdup(cmd->tmp_pool, cmd->arg);
-     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
-   } else {
-     decoded_path = path = pr_fs_getcwd();
-   }
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path,
-       &hidden)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-@@ -1155,6 +1155,7 @@
- 
-   pr_feat_add("MFF modify;UNIX.group;UNIX.mode;");
-   pr_feat_add("MFMT");
-+  pr_feat_add("TVFS");
- 
-   facts_mlst_feat_add(session.pool);
- 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-12/proftpd.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- proftpd.spec	21 Oct 2009 11:34:58 -0000	1.58
+++ proftpd.spec	9 Dec 2009 21:05:10 -0000	1.59
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 1
+%global rpmrel 2
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -291,10 +291,15 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-2
+- Reduce the mod_facts patch to the single commit addressing the issue with
+  directory names with glob characters (#521634), avoiding introducing a
+  further problem with <Limit> (#544002)
+
 * Wed Oct 21 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-1
 - Update to 1.3.2b
   - Fixed regression causing command-line define options not to work (bug 3221)
-  - Fixed improper SSL/TLS certificate subjectAltName verification (bug 3275)
+  - Fixed SSL/TLS cert subjectAltName verification (bug 3275, CVE-2009-3639)
   - Use correct cached user values with "SQLNegativeCache on" (bug 3282)
   - Fix slower transfers of multiple small files (bug 3284)
   - Support MaxTransfersPerHost, MaxTransfersPerUser properly (bug 3287)



From pghmcfc at fedoraproject.org  Wed Dec  9 21:05:11 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  9 Dec 2009 21:05:11 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd-1.3.2a-mlsd.patch, 1.1, 1.2 proftpd.spec,
	1.59, 1.60
Message-ID: <20091209210511.7E82011C00E0@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24612/devel

Modified Files:
	proftpd-1.3.2a-mlsd.patch proftpd.spec 
Log Message:
Reduce the mod_facts patch to the single commit addressing the issue with directory names with glob characters (#521634), avoiding introducing a further problem with <Limit> (#544002)

proftpd-1.3.2a-mlsd.patch:
 mod_facts.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Index: proftpd-1.3.2a-mlsd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd-1.3.2a-mlsd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- proftpd-1.3.2a-mlsd.patch	7 Sep 2009 13:40:46 -0000	1.1
+++ proftpd-1.3.2a-mlsd.patch	9 Dec 2009 21:05:10 -0000	1.2
@@ -1,166 +1,6 @@
 --- proftpd-1.3.2a/modules/mod_facts.c.mlsd	2009-04-28 22:17:45.000000000 +0100
 +++ proftpd-1.3.2a/modules/mod_facts.c	2009-09-07 14:17:39.000000000 +0100
-@@ -22,7 +22,7 @@
-  * resulting executable, without including the source code for OpenSSL in the
-  * source distribution.
-  *
-- * $Id$
-+ * $Id$
-  */
- 
- #include "conf.h"
-@@ -227,7 +227,17 @@
-     ptr = buf + buflen;
-   }
- 
--  snprintf(ptr, bufsz - buflen, " %s\n", info->path);
-+  /* MLST entries are not sent via pr_data_xfer(), and thus we do not need
-+   * to include an LF at the end; it is appended by pr_response_send_raw().
-+   * But MLSD entries DO need the trailing LF, so that it can be converted
-+   * into a CRLF sequence by pr_data_xfer().
-+   */
-+  if (strcmp(session.curr_cmd, C_MLSD) == 0) {
-+    snprintf(ptr, bufsz - buflen, " %s\n", info->path);
-+
-+  } else {
-+    snprintf(ptr, bufsz - buflen, " %s", info->path);
-+  }
- 
-   buf[bufsz-1] = '\0';
-   buflen = strlen(buf);
-@@ -244,11 +254,17 @@
-  * channel, wherease MLSD's output is sent via a data transfer, much like
-  * LIST or NLST.
-  */
--static char mlinfo_buf[PR_TUNABLE_BUFFER_SIZE];
-+static char *mlinfo_buf = NULL;
-+static size_t mlinfo_bufsz = 0;
- static size_t mlinfo_buflen = 0;
- 
- static void facts_mlinfobuf_init(void) {
--  memset(mlinfo_buf, '\0', sizeof(mlinfo_buf));
-+  if (mlinfo_buf == NULL) {
-+    mlinfo_bufsz = pr_config_get_xfer_bufsz();
-+    mlinfo_buf = palloc(session.pool, mlinfo_bufsz);
-+  }
-+
-+  memset(mlinfo_buf, '\0', mlinfo_bufsz);
-   mlinfo_buflen = 0;
- }
- 
-@@ -261,11 +277,11 @@
-   /* If this buffer will exceed the capacity of mlinfo_buf, then flush
-    * mlinfo_buf.
-    */
--  if (buflen >= (sizeof(mlinfo_buf) - mlinfo_buflen)) {
-+  if (buflen >= (mlinfo_bufsz - mlinfo_buflen)) {
-     (void) facts_mlinfobuf_flush();
-   }
- 
--  sstrcat(mlinfo_buf, buf, sizeof(mlinfo_buf));
-+  sstrcat(mlinfo_buf, buf, mlinfo_bufsz);
-   mlinfo_buflen += buflen;
- }
- 
-@@ -358,6 +374,8 @@
-   char buf[PR_TUNABLE_BUFFER_SIZE];
- 
-   (void) facts_mlinfo_fmt(info, buf, sizeof(buf));
-+
-+  /* The trailing CRLF will be added by pr_response_send_raw(). */
-   pr_response_send_raw("%s", buf);
- }
- 
-@@ -595,7 +613,6 @@
-  */
- 
- MODRET facts_mff(cmd_rec *cmd) {
--  register unsigned int i;
-   const char *path, *decoded_path;
-   char *facts, *ptr;
- 
-@@ -606,18 +623,16 @@
- 
-   facts = cmd->argv[1];
- 
--  /* The path can contain spaces; it is thus the concatenation of all of the
--   * arguments after the timestamp.
-+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
-+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
-+   * find the FIRST space in cmd->arg; the path is everything past that space.
-    */
--  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
--  for (i = 3; i < cmd->argc; i++) {
--    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
--  }
-+  ptr = strchr(cmd->arg, ' ');
-+  path = pstrdup(cmd->tmp_pool, ptr + 1);
- 
-   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
-@@ -739,7 +754,6 @@
- }
- 
- MODRET facts_mfmt(cmd_rec *cmd) {
--  register unsigned int i;
-   const char *path, *decoded_path;
-   char *timestamp, *ptr;
-   int res;
-@@ -751,18 +765,16 @@
- 
-   timestamp = cmd->argv[1];
- 
--  /* The path can contain spaces; it is thus the concatenation of all of the
--   * arguments after the timestamp.
-+  /* The path can contain spaces.  Thus we need to use cmd->arg, not cmd->argv,
-+   * to find the path.  But cmd->arg contains the facts as well.  Thus we
-+   * find the FIRST space in cmd->arg; the path is everything past that space.
-    */
--  path = pstrdup(cmd->tmp_pool, cmd->argv[2]);
--  for (i = 3; i < cmd->argc; i++) {
--    path = pstrcat(cmd->tmp_pool, path, " ", cmd->argv[i], NULL);
--  }
-+  ptr = strchr(cmd->arg, ' ');
-+  path = pstrdup(cmd->tmp_pool, ptr + 1);
- 
-   decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
-@@ -820,33 +832,28 @@
-   DIR *dirh;
-   struct dirent *dent;
- 
--  if (cmd->argc > 2) {
--    pr_response_add_err(R_501, _("Invalid number of arguments"));
--    return PR_ERROR(cmd);
--  }
--
-   if (cmd->argc != 1) {
--    path = cmd->argv[1];
-+    path = pstrdup(cmd->tmp_pool, cmd->arg);
-     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
-   } else {
-     decoded_path = path = pr_fs_getcwd();
-   }
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
--      NULL)) {
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path, NULL)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-     pr_response_add_err(R_550, _("Unable to handle command"));
+@@ -841,12 +841,13 @@
      return PR_ERROR(cmd);
    }
  
@@ -179,67 +19,3 @@
    }
  
    /* Make sure that the given path is actually a directory. */
-@@ -870,11 +877,11 @@
-     int xerrno = errno;
- 
-     pr_trace_msg("fileperms", 1, "MLSD, user '%s' (UID %lu, GID %lu): "
--      "error reading directory '%s': %s", session.user,
-+      "error opening directory '%s': %s", session.user,
-       (unsigned long) session.uid, (unsigned long) session.gid,
-       decoded_path, strerror(xerrno));
- 
--    pr_response_add_err(R_550, _("'%s' cannot be listed"), path);
-+    pr_response_add_err(R_550, "%s: %s", path, strerror(xerrno));
-     return PR_ERROR(cmd);
-   }
- 
-@@ -899,16 +906,14 @@
-     /* Check that the file can be listed. */
-     abs_path = dir_realpath(cmd->tmp_pool, rel_path);
-     if (abs_path) {
--      res = dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
--        &hidden);
-+      res = dir_check(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
-       
-     } else {
-       abs_path = dir_canonical_path(cmd->tmp_pool, rel_path);
-       if (abs_path == NULL)
-         abs_path = rel_path;
- 
--      res = dir_check_canon(cmd->tmp_pool, cmd->argv[0], cmd->group, abs_path,
--        &hidden);
-+      res = dir_check_canon(cmd->tmp_pool, cmd, cmd->group, abs_path, &hidden);
-     }
- 
-     if (!res || hidden) {
-@@ -955,20 +960,15 @@
-   const char *path, *decoded_path;
-   struct mlinfo info;
- 
--  if (cmd->argc > 2) {
--    pr_response_add_err(R_501, _("Invalid number of arguments"));
--    return PR_ERROR(cmd);
--  }
--
-   if (cmd->argc != 1) {
--    path = cmd->argv[1];
-+    path = pstrdup(cmd->tmp_pool, cmd->arg);
-     decoded_path = pr_fs_decode_path(cmd->tmp_pool, path);
- 
-   } else {
-     decoded_path = path = pr_fs_getcwd();
-   }
- 
--  if (!dir_check(cmd->tmp_pool, cmd->argv[0], cmd->group, (char *) decoded_path,
-+  if (!dir_check(cmd->tmp_pool, cmd, cmd->group, (char *) decoded_path,
-       &hidden)) {
-     pr_log_debug(DEBUG4, MOD_FACTS_VERSION ": %s command denied by <Limit>",
-       cmd->argv[0]);
-@@ -1155,6 +1155,7 @@
- 
-   pr_feat_add("MFF modify;UNIX.group;UNIX.mode;");
-   pr_feat_add("MFMT");
-+  pr_feat_add("TVFS");
- 
-   facts_mlst_feat_add(session.pool);
- 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- proftpd.spec	16 Nov 2009 20:05:31 -0000	1.59
+++ proftpd.spec	9 Dec 2009 21:05:11 -0000	1.60
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 1
+%global rpmrel 2
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -291,6 +291,11 @@ fi
 
 
 %changelog
+* Wed Dec  9 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-2
+- Reduce the mod_facts patch to the single commit addressing the issue with
+  directory names with glob characters (#521634), avoiding introducing a
+  further problem with <Limit> (#544002)
+
 * Wed Oct 21 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-1
 - Update to 1.3.2b
   - Fixed regression causing command-line define options not to work (bug 3221)



From rdieter at fedoraproject.org  Wed Dec  9 21:10:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 21:10:14 +0000 (UTC)
Subject: File attica-0.1.0.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091209211014.00F4C10F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for attica:

acaac9eece214f5dc82c98510dbb0ade  attica-0.1.0.tar.bz2



From allisson at fedoraproject.org  Wed Dec  9 21:10:27 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed,  9 Dec 2009 21:10:27 +0000 (UTC)
Subject: File MooseX-Daemonize-0.09.tar.gz uploaded to lookaside cache by
	allisson
Message-ID: <20091209211027.A8F3710F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-MooseX-Daemonize:

3eee76a067374c84965b3d93eb25380a  MooseX-Daemonize-0.09.tar.gz



From jcollie at fedoraproject.org  Wed Dec  9 21:10:40 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  9 Dec 2009 21:10:40 +0000 (UTC)
Subject: File gramps-3.1.3.tar.gz uploaded to lookaside cache by jcollie
Message-ID: <20091209211040.B2F6110F88C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gramps:

e2af82f39aa1b7691e0930c1b0d662e0  gramps-3.1.3.tar.gz



From rdieter at fedoraproject.org  Wed Dec  9 21:11:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 21:11:14 +0000 (UTC)
Subject: rpms/attica/devel attica.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091209211114.F04C311C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/attica/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27028/devel

Modified Files:
	.cvsignore sources 
Added Files:
	attica.spec import.log 
Log Message:
import



--- NEW FILE attica.spec ---
Name:           attica
Version:        0.1.0
Release:        2%{?dist}
Summary:        Implementation of the Open Collaboration Services API

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.kde.org
#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/tags/attica/%{version} attica-%{version}
#Source0:CMD tar cjf %{_sourcedir}/attica-%{version}.tar.bz2 attica-%{version}
#Source0:CMD rm -rf attica-%{version}
Source0:        attica-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  qt-devel
BuildRequires:  openssl-devel

%description
Attica is a Qt library that implements the Open Collaboration Services
API version 1.4.


%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


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
find %{buildroot} -name '*.la' -exec rm -f {} ';'


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libattica.pc


%changelog
* Mon Dec  7 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.1.0-2
- Out of sourcetree build
- Use make install/fast

* Sat Dec 5 2009 lvillani <lvillani at enterprise.binaryhelix.net> 0.1.0-1
- Initial release



--- NEW FILE import.log ---
attica-0_1_0-2_fc12:HEAD:attica-0.1.0-2.fc12.src.rpm:1260393022


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/attica/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:43:42 -0000	1.1
+++ .cvsignore	9 Dec 2009 21:11:14 -0000	1.2
@@ -0,0 +1 @@
+attica-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/attica/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:43:42 -0000	1.1
+++ sources	9 Dec 2009 21:11:14 -0000	1.2
@@ -0,0 +1 @@
+acaac9eece214f5dc82c98510dbb0ade  attica-0.1.0.tar.bz2



From allisson at fedoraproject.org  Wed Dec  9 21:11:22 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed,  9 Dec 2009 21:11:22 +0000 (UTC)
Subject: rpms/perl-MooseX-Daemonize/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 perl-MooseX-Daemonize.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091209211122.208C211C00E0@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27099/F-11

Modified Files:
	.cvsignore import.log perl-MooseX-Daemonize.spec sources 
Log Message:

- Update to 0.09.
- Update BuildRequires.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Feb 2009 02:06:08 -0000	1.2
+++ .cvsignore	9 Dec 2009 21:11:21 -0000	1.3
@@ -1 +1 @@
-MooseX-Daemonize-0.08.tar.gz
+MooseX-Daemonize-0.09.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Feb 2009 02:06:08 -0000	1.1
+++ import.log	9 Dec 2009 21:11:21 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-Daemonize-0_08-2_fc10:HEAD:perl-MooseX-Daemonize-0.08-2.fc10.src.rpm:1233540198
+perl-MooseX-Daemonize-0_09-1_fc12:F-11:perl-MooseX-Daemonize-0.09-1.fc12.src.rpm:1260393022


Index: perl-MooseX-Daemonize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-11/perl-MooseX-Daemonize.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-MooseX-Daemonize.spec	26 Feb 2009 22:21:19 -0000	1.2
+++ perl-MooseX-Daemonize.spec	9 Dec 2009 21:11:21 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Daemonize
-Version:        0.08
-Release:        3%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        Role for daemonizing your Moose based application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -14,6 +14,7 @@ BuildRequires:  perl(MooseX::Getopt) >= 
 BuildRequires:  perl(MooseX::Types::Path::Class)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::Moose)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -51,6 +52,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec  9 2009 Allisson Azevedo <allisson at gmail.com> 0.09-1
+- Update to 0.09.
+- Update BuildRequires.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Feb 2009 02:06:08 -0000	1.2
+++ sources	9 Dec 2009 21:11:21 -0000	1.3
@@ -1 +1 @@
-24ff349f0e2e09ca89e8ecbc73b0dc65  MooseX-Daemonize-0.08.tar.gz
+3eee76a067374c84965b3d93eb25380a  MooseX-Daemonize-0.09.tar.gz



From crobinso at fedoraproject.org  Wed Dec  9 21:11:49 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Wed,  9 Dec 2009 21:11:49 +0000 (UTC)
Subject: rpms/python-virtinst/devel
	virtinst-0.500.1-fix-interface-detect.patch, NONE,
	1.1 python-virtinst.spec, 1.75, 1.76
Message-ID: <20091209211149.7631811C00E0@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27483

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.1-fix-interface-detect.patch 
Log Message:
Fix interface API detection for libvirt < 0.7.4


virtinst-0.500.1-fix-interface-detect.patch:
 support.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.500.1-fix-interface-detect.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1260392543 18000
# Node ID 15c118a449a7e2c861b6630da31fcb25526af617
# Parent  989eb68a9c1889c783152705e6ed7c0580dfa814
support: Generic exceptions mean libvirt support is busted.

Fixes testing for interface APIs on libvirt < 0.7.4

diff -r 989eb68a9c18 -r 15c118a449a7 virtinst/support.py
--- a/virtinst/support.py	Mon Dec 07 20:41:58 2009 +0000
+++ b/virtinst/support.py	Wed Dec 09 16:02:23 2009 -0500
@@ -173,7 +173,8 @@
             return False
 
     except Exception:
-        return True
+        # Other python exceptions likely mean the bindings are horked
+        return False
 
     return True
 


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- python-virtinst.spec	3 Dec 2009 22:39:16 -0000	1.75
+++ python-virtinst.spec	9 Dec 2009 21:11:49 -0000	1.76
@@ -17,8 +17,10 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.1
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+# Fix interface API detection for libvirt < 0.7.4
+Patch1: %{appname}-%{version}-fix-interface-detect.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -46,6 +48,7 @@ and install new VMs) and virt-clone (clo
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
 
 %build
 python setup.py build
@@ -81,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Wed Dec 09 2009 Cole Robinson <crobinso at redhat.com> - 0.500.1-2.fc13
+- Fix interface API detection for libvirt < 0.7.4
+
 * Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.500.1-1.fc13
 - Update to version 0.500.1
 - virt-install now attempts --os-variant detection by default.



From alexlan at fedoraproject.org  Wed Dec  9 21:12:29 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed,  9 Dec 2009 21:12:29 +0000 (UTC)
Subject: File bibus-1.5.1.tar.gz uploaded to lookaside cache by alexlan
Message-ID: <20091209211229.591E610F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for bibus:

9d1808f98556b58b3f709bebfba11a80  bibus-1.5.1.tar.gz



From allisson at fedoraproject.org  Wed Dec  9 21:14:12 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed,  9 Dec 2009 21:14:12 +0000 (UTC)
Subject: rpms/perl-MooseX-Daemonize/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 perl-MooseX-Daemonize.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091209211412.CCFF311C00E0@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28675/F-12

Modified Files:
	.cvsignore import.log perl-MooseX-Daemonize.spec sources 
Log Message:

- Update to 0.09.
- Update BuildRequires.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Feb 2009 02:06:08 -0000	1.2
+++ .cvsignore	9 Dec 2009 21:14:12 -0000	1.3
@@ -1 +1 @@
-MooseX-Daemonize-0.08.tar.gz
+MooseX-Daemonize-0.09.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Feb 2009 02:06:08 -0000	1.1
+++ import.log	9 Dec 2009 21:14:12 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-Daemonize-0_08-2_fc10:HEAD:perl-MooseX-Daemonize-0.08-2.fc10.src.rpm:1233540198
+perl-MooseX-Daemonize-0_09-1_fc12:F-12:perl-MooseX-Daemonize-0.09-1.fc12.src.rpm:1260393147


Index: perl-MooseX-Daemonize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-12/perl-MooseX-Daemonize.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-Daemonize.spec	26 Jul 2009 11:25:39 -0000	1.3
+++ perl-MooseX-Daemonize.spec	9 Dec 2009 21:14:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Daemonize
-Version:        0.08
-Release:        4%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        Role for daemonizing your Moose based application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -14,6 +14,7 @@ BuildRequires:  perl(MooseX::Getopt) >= 
 BuildRequires:  perl(MooseX::Types::Path::Class)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::Moose)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -51,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec  9 2009 Allisson Azevedo <allisson at gmail.com> 0.09-1
+- Update to 0.09.
+- Update BuildRequires.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Feb 2009 02:06:08 -0000	1.2
+++ sources	9 Dec 2009 21:14:12 -0000	1.3
@@ -1 +1 @@
-24ff349f0e2e09ca89e8ecbc73b0dc65  MooseX-Daemonize-0.08.tar.gz
+3eee76a067374c84965b3d93eb25380a  MooseX-Daemonize-0.09.tar.gz



From pbrobinson at fedoraproject.org  Wed Dec  9 21:14:24 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  9 Dec 2009 21:14:24 +0000 (UTC)
Subject: rpms/shotwell/F-12 shotwell.spec,1.4,1.5
Message-ID: <20091209211424.6898611C00E0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/shotwell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29008

Modified Files:
	shotwell.spec 
Log Message:
- Drop x86 specific CFLAGS optimisations


Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/F-12/shotwell.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- shotwell.spec	4 Dec 2009 01:40:59 -0000	1.4
+++ shotwell.spec	9 Dec 2009 21:14:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           shotwell
 Version:        0.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -40,6 +40,7 @@ them, and share them with others.
 ./configure --prefix=/usr
 sed -i -e 's/\\n/\n/g' configure.mk
 sed -i -e 's/^CFLAGS=.*$/CFLAGS=%{optflags}/' Makefile
+sed -i -e 's/-mfpmath=sse -march=nocona//' Makefile
 make %{?_smp_mflags}
 
 
@@ -97,6 +98,9 @@ gtk-update-icon-cache --quiet %{_datadir
 
 
 %changelog
+* Wed Dec  9 2009 Peter Robinson <pbrobinson at gmail.com> - 0.3.2-2
+- Drop x86 specific CFLAGS optimisations
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.2-1
 - Update to 0.3.2
 



From allisson at fedoraproject.org  Wed Dec  9 21:16:34 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed,  9 Dec 2009 21:16:34 +0000 (UTC)
Subject: rpms/perl-MooseX-Daemonize/devel .cvsignore, 1.2, 1.3 import.log,
	1.1, 1.2 perl-MooseX-Daemonize.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20091209211634.8943111C00E0@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-Daemonize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29924/devel

Modified Files:
	.cvsignore import.log perl-MooseX-Daemonize.spec sources 
Log Message:

- Update to 0.09.
- Update BuildRequires.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Feb 2009 02:06:08 -0000	1.2
+++ .cvsignore	9 Dec 2009 21:16:34 -0000	1.3
@@ -1 +1 @@
-MooseX-Daemonize-0.08.tar.gz
+MooseX-Daemonize-0.09.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Feb 2009 02:06:08 -0000	1.1
+++ import.log	9 Dec 2009 21:16:34 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-Daemonize-0_08-2_fc10:HEAD:perl-MooseX-Daemonize-0.08-2.fc10.src.rpm:1233540198
+perl-MooseX-Daemonize-0_09-1_fc12:HEAD:perl-MooseX-Daemonize-0.09-1.fc12.src.rpm:1260393339


Index: perl-MooseX-Daemonize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/devel/perl-MooseX-Daemonize.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Daemonize.spec	4 Dec 2009 02:02:19 -0000	1.4
+++ perl-MooseX-Daemonize.spec	9 Dec 2009 21:16:34 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Daemonize
-Version:        0.08
-Release:        5%{?dist}
+Version:        0.09
+Release:        1%{?dist}
 Summary:        Role for daemonizing your Moose based application
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -14,6 +14,7 @@ BuildRequires:  perl(MooseX::Getopt) >= 
 BuildRequires:  perl(MooseX::Types::Path::Class)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::Moose)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -51,8 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.08-5
-- rebuild against perl 5.10.1
+* Wed Dec  9 2009 Allisson Azevedo <allisson at gmail.com> 0.09-1
+- Update to 0.09.
+- Update BuildRequires.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Daemonize/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Feb 2009 02:06:08 -0000	1.2
+++ sources	9 Dec 2009 21:16:34 -0000	1.3
@@ -1 +1 @@
-24ff349f0e2e09ca89e8ecbc73b0dc65  MooseX-Daemonize-0.08.tar.gz
+3eee76a067374c84965b3d93eb25380a  MooseX-Daemonize-0.09.tar.gz



From rdieter at fedoraproject.org  Wed Dec  9 21:18:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 21:18:07 +0000 (UTC)
Subject: File attica-0.1.0.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091209211807.600A210F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for attica:

ff8d6ba041125b1ace0048741855b89d  attica-0.1.0.tar.bz2



From rdieter at fedoraproject.org  Wed Dec  9 21:18:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 21:18:24 +0000 (UTC)
Subject: rpms/attica/devel attica.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091209211824.1046511C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/attica/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30888

Modified Files:
	attica.spec sources 
Log Message:
* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
- upstream tarball
- %files: tighten up a bit, track sonames



Index: attica.spec
===================================================================
RCS file: /cvs/pkgs/rpms/attica/devel/attica.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- attica.spec	9 Dec 2009 21:11:14 -0000	1.1
+++ attica.spec	9 Dec 2009 21:18:23 -0000	1.2
@@ -1,19 +1,16 @@
 Name:           attica
 Version:        0.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Implementation of the Open Collaboration Services API
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.kde.org
-#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/tags/attica/%{version} attica-%{version}
-#Source0:CMD tar cjf %{_sourcedir}/attica-%{version}.tar.bz2 attica-%{version}
-#Source0:CMD rm -rf attica-%{version}
-Source0:        attica-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/attica/attica-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
-BuildRequires:  qt-devel
+BuildRequires:  qt4-devel
 BuildRequires:  openssl-devel
 
 %description
@@ -46,8 +43,8 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
+
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 %clean
@@ -61,17 +58,20 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_libdir}/*.so.*
-
+%{_libdir}/libattica.so.0*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/*.so
+%{_includedir}/attica/
+%{_libdir}/libattica.so
 %{_libdir}/pkgconfig/libattica.pc
 
 
 %changelog
+* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
+- upstream tarball
+- %files: tighten up a bit, track sonames
+
 * Mon Dec  7 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.1.0-2
 - Out of sourcetree build
 - Use make install/fast


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/attica/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Dec 2009 21:11:14 -0000	1.2
+++ sources	9 Dec 2009 21:18:23 -0000	1.3
@@ -1 +1 @@
-acaac9eece214f5dc82c98510dbb0ade  attica-0.1.0.tar.bz2
+ff8d6ba041125b1ace0048741855b89d  attica-0.1.0.tar.bz2



From crobinso at fedoraproject.org  Wed Dec  9 21:19:27 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Wed,  9 Dec 2009 21:19:27 +0000 (UTC)
Subject: rpms/python-virtinst/F-12
	virtinst-0.500.1-fix-interface-detect.patch, 
	NONE, 1.1 python-virtinst.spec, 1.75, 1.76
Message-ID: <20091209211927.EE2C911C00E0@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31335

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.1-fix-interface-detect.patch 
Log Message:
Fix interface API detection for libvirt < 0.7.4


virtinst-0.500.1-fix-interface-detect.patch:
 support.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.500.1-fix-interface-detect.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1260392543 18000
# Node ID 15c118a449a7e2c861b6630da31fcb25526af617
# Parent  989eb68a9c1889c783152705e6ed7c0580dfa814
support: Generic exceptions mean libvirt support is busted.

Fixes testing for interface APIs on libvirt < 0.7.4

diff -r 989eb68a9c18 -r 15c118a449a7 virtinst/support.py
--- a/virtinst/support.py	Mon Dec 07 20:41:58 2009 +0000
+++ b/virtinst/support.py	Wed Dec 09 16:02:23 2009 -0500
@@ -173,7 +173,8 @@
             return False
 
     except Exception:
-        return True
+        # Other python exceptions likely mean the bindings are horked
+        return False
 
     return True
 


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-12/python-virtinst.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- python-virtinst.spec	3 Dec 2009 22:39:04 -0000	1.75
+++ python-virtinst.spec	9 Dec 2009 21:19:27 -0000	1.76
@@ -17,8 +17,10 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.1
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+# Fix interface API detection for libvirt < 0.7.4
+Patch1: %{appname}-%{version}-fix-interface-detect.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -46,6 +48,7 @@ and install new VMs) and virt-clone (clo
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
 
 %build
 python setup.py build
@@ -81,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Wed Dec 09 2009 Cole Robinson <crobinso at redhat.com> - 0.500.1-2.fc12
+- Fix interface API detection for libvirt < 0.7.4
+
 * Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.500.1-1.fc12
 - Update to version 0.500.1
 - virt-install now attempts --os-variant detection by default.



From rdieter at fedoraproject.org  Wed Dec  9 21:21:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 21:21:41 +0000 (UTC)
Subject: File shared-desktop-ontologies-0.2.tar.bz2 uploaded to lookaside
	cache by rdieter
Message-ID: <20091209212141.9E13710F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for shared-desktop-ontologies:

6c004e1c377f768cae5b321bc111876b  shared-desktop-ontologies-0.2.tar.bz2



From jcollie at fedoraproject.org  Wed Dec  9 21:21:42 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  9 Dec 2009 21:21:42 +0000 (UTC)
Subject: rpms/gramps/devel .cvsignore, 1.28, 1.29 gramps.spec, 1.48,
	1.49 sources, 1.28, 1.29
Message-ID: <20091209212142.9F3ED11C00E0@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gramps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32422

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Wed Dec  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 3.1.3-1
- Update to 3.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	22 Aug 2009 03:44:02 -0000	1.28
+++ .cvsignore	9 Dec 2009 21:21:42 -0000	1.29
@@ -1 +1 @@
-gramps-3.1.2.tar.gz
+gramps-3.1.3.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gramps.spec	22 Aug 2009 03:44:02 -0000	1.48
+++ gramps.spec	9 Dec 2009 21:21:42 -0000	1.49
@@ -1,5 +1,5 @@
 Name:           gramps
-Version:        3.1.2
+Version:        3.1.3
 Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
@@ -122,6 +122,9 @@ fi
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Wed Dec  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 3.1.3-1
+- Update to 3.1.3
+
 * Fri Aug 21 2009 Warren Togami <wtogami at redhat.com> - 3.1.2-1
 - 3.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	22 Aug 2009 03:44:02 -0000	1.28
+++ sources	9 Dec 2009 21:21:42 -0000	1.29
@@ -1 +1 @@
-c2e825a212524e78cae9ddbbcb96a302  gramps-3.1.2.tar.gz
+e2af82f39aa1b7691e0930c1b0d662e0  gramps-3.1.3.tar.gz



From rdieter at fedoraproject.org  Wed Dec  9 21:22:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 21:22:00 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies/devel import.log, NONE,
	1.1 shared-desktop-ontologies.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091209212200.4E8AE11C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32674/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shared-desktop-ontologies.spec 
Log Message:
import



--- NEW FILE import.log ---
shared-desktop-ontologies-0_2-3_fc12:HEAD:shared-desktop-ontologies-0.2-3.fc12.src.rpm:1260393709


--- NEW FILE shared-desktop-ontologies.spec ---
Name:           shared-desktop-ontologies
Version:        0.2
Release:        3%{?dist}
Summary:        Shared ontologies needed for semantic environments

Group:          User Interface/Desktops
License:        BSD or CC-BY
URL:            http://oscaf.sourceforge.net/
Source0:        http://downloads.sourceforge.net/project/oscaf/shared-desktop-ontologies/%{version}/shared-desktop-ontologies-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  cmake >= 2.6.0


%description
The vision of the Social Semantic Desktop defines a user?s personal
information environment as a source and end-point of the Semantic Web:
Knowledge workers comprehensively express their information and data
with respect to their own conceptualizations.

Semantic Web languages and protocols are used to formalize these
conceptualizations and for coordinating local and global information
access. The Resource Description Framework serves as a common data
representation format. With a particular focus on addressing certain
limitations of RDF, a novel representational language akin to RDF and
the Web Ontology Language, plus a number of other high-level
ontologies were created.

Together, they provide a means to build the semantic bridges necessary
for data exchange and application integration on distributed social
semantic desktops. Although initially designed to fulfill requirements
for the Nepomuk project, these ontologies are useful for the semantic
web community in general.



%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


%build
%cmake .


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE.BSD LICENSE.CC-BY README
%{_datadir}/ontology

%files devel
%defattr(-,root,root,-)
%{_datadir}/cmake/SharedDesktopOntologies
%{_datadir}/pkgconfig/shared-desktop-ontologies.pc


%changelog
* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-3
- Add -devel package and move CMake and pkgconfig files there

* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-2
- Fix license tag

* Sat Dec  5 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:48:59 -0000	1.1
+++ .cvsignore	9 Dec 2009 21:21:59 -0000	1.2
@@ -0,0 +1 @@
+shared-desktop-ontologies-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:48:59 -0000	1.1
+++ sources	9 Dec 2009 21:22:00 -0000	1.2
@@ -0,0 +1 @@
+6c004e1c377f768cae5b321bc111876b  shared-desktop-ontologies-0.2.tar.bz2



From crobinso at fedoraproject.org  Wed Dec  9 21:24:10 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Wed,  9 Dec 2009 21:24:10 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.8.1-select-right-click.patch,
	NONE, 1.1 virt-manager.spec, 1.65, 1.66
Message-ID: <20091209212410.9348611C00E0@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1112

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.1-select-right-click.patch 
Log Message:
Select manager row on right click, regressed with 0.8.1


virt-manager-0.8.1-select-right-click.patch:
 manager.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE virt-manager-0.8.1-select-right-click.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1260376118 18000
# Node ID b69f023023414ab3ca7d7f818beb710a04aa409b
# Parent  79c021ce411081dbb06b90952a5cf0003b170043
manager: Change the selection to the row we right click on

diff -r 79c021ce4110 -r b69f02302341 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Wed Dec 09 10:58:47 2009 -0500
+++ b/src/virtManager/manager.py	Wed Dec 09 11:28:38 2009 -0500
@@ -1049,7 +1049,7 @@
         _iter = model.get_iter(path)
 
         self.popup_vm_menu(model, _iter, event)
-        return True
+        return False
 
     def popup_vm_menu(self, model, _iter, event):
         if model.iter_parent(_iter) != None:
@@ -1090,8 +1090,6 @@
 
             self.connmenu.popup(None, None, None, 0, event.time)
 
-        return False
-
 
     #################
     # Stats methods #


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- virt-manager.spec	5 Dec 2009 22:10:53 -0000	1.65
+++ virt-manager.spec	9 Dec 2009 21:24:10 -0000	1.66
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.1
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -19,6 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 # Check QEMU permissions against the qemu user
 Patch1: %{name}-%{version}-perms-qemu-user.patch
+# Select manager row on right click, regressed with 0.8.1
+Patch2: %{name}-%{version}-select-right-click.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -38,7 +40,7 @@ Requires: gnome-python2-gnomekeyring >= 
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
-Requires: python-virtinst >= 0.500.1
+Requires: python-virtinst >= 0.500.1-2
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -78,6 +80,7 @@ management API.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -151,6 +154,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Wed Dec 09 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-3.fc13
+- Select manager row on right click, regressed with 0.8.1
+
 * Sat Dec  5 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-2.fc13
 - Set proper version Requires: for python-virtinst
 



From notting at fedoraproject.org  Wed Dec  9 21:26:20 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Dec 2009 21:26:20 +0000 (UTC)
Subject: File initscripts-9.03.tar.bz2 uploaded to lookaside cache by notting
Message-ID: <20091209212620.8AA3010F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for initscripts:

668fa2762b57ef75436303857847bba3  initscripts-9.03.tar.bz2



From crobinso at fedoraproject.org  Wed Dec  9 21:26:58 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Wed,  9 Dec 2009 21:26:58 +0000 (UTC)
Subject: rpms/virt-manager/F-12 virt-manager-0.8.1-select-right-click.patch, 
	NONE, 1.1 virt-manager.spec, 1.64, 1.65
Message-ID: <20091209212658.30B7111C00E0@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2240

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.1-select-right-click.patch 
Log Message:
Select manager row on right click, regressed with 0.8.1


virt-manager-0.8.1-select-right-click.patch:
 manager.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE virt-manager-0.8.1-select-right-click.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1260376118 18000
# Node ID b69f023023414ab3ca7d7f818beb710a04aa409b
# Parent  79c021ce411081dbb06b90952a5cf0003b170043
manager: Change the selection to the row we right click on

diff -r 79c021ce4110 -r b69f02302341 src/virtManager/manager.py
--- a/src/virtManager/manager.py	Wed Dec 09 10:58:47 2009 -0500
+++ b/src/virtManager/manager.py	Wed Dec 09 11:28:38 2009 -0500
@@ -1049,7 +1049,7 @@
         _iter = model.get_iter(path)
 
         self.popup_vm_menu(model, _iter, event)
-        return True
+        return False
 
     def popup_vm_menu(self, model, _iter, event):
         if model.iter_parent(_iter) != None:
@@ -1090,8 +1090,6 @@
 
             self.connmenu.popup(None, None, None, 0, event.time)
 
-        return False
-
 
     #################
     # Stats methods #


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/virt-manager.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- virt-manager.spec	5 Dec 2009 22:35:41 -0000	1.64
+++ virt-manager.spec	9 Dec 2009 21:26:57 -0000	1.65
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.1
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -21,6 +21,8 @@ BuildArch: noarch
 Patch1: %{name}-%{version}-perms-qemu-user.patch
 # Prefer HAL for device enumeration, to avoid possible regressions
 Patch2: %{name}-%{version}-prefer-hal.patch
+# Select manager row on right click, regressed with 0.8.1
+Patch3: %{name}-%{version}-select-right-click.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -40,7 +42,7 @@ Requires: gnome-python2-gnomekeyring >= 
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
-Requires: python-virtinst >= 0.500.1
+Requires: python-virtinst >= 0.500.1-2
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -81,6 +83,7 @@ management API.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -154,6 +157,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Wed Dec 09 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-3.fc12
+- Select manager row on right click, regressed with 0.8.1
+
 * Sat Dec  5 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-2.fc13
 - Set proper version Requires: for python-virtinst
 



From notting at fedoraproject.org  Wed Dec  9 21:27:27 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Dec 2009 21:27:27 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.169, 1.170 initscripts.spec,
	1.200, 1.201 sources, 1.188, 1.189
Message-ID: <20091209212727.7340C11C00E0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2486

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
9.03-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- .cvsignore	14 Sep 2009 16:41:34 -0000	1.169
+++ .cvsignore	9 Dec 2009 21:27:26 -0000	1.170
@@ -1 +1 @@
-initscripts-8.99.tar.bz2
+initscripts-9.03.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- initscripts.spec	14 Sep 2009 16:41:34 -0000	1.200
+++ initscripts.spec	9 Dec 2009 21:27:27 -0000	1.201
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.99
+Version: 9.03
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -17,8 +17,9 @@ Requires: /sbin/pidof, /sbin/blkid
 Requires: module-init-tools
 Requires: util-linux-ng >= 2.16, mount >= 2.11l
 Requires: bash >= 3.0
+Requires: sysvinit-tools >= 2.87
 %if with_upstart
-Requires: upstart
+Requires: upstart >= 0.6.0
 %else
 Requires: SysVinit >= 2.85-38
 %endif
@@ -74,26 +75,21 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id 
 
 %if with_upstart
  mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab
- rm -f $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S99single
- rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single
 %else
  mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab
- rm -rf $RPM_BUILD_ROOT/etc/event.d
+ rm -rf $RPM_BUILD_ROOT/etc/init
 %endif
 rm -f $RPM_BUILD_ROOT/etc/inittab.*
 
 %ifnarch s390 s390x
 rm -f \
  $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \
- $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-iucv \
  $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \
- $RPM_BUILD_ROOT/lib/udev/ccw_init \
- $RPM_BUILD_ROOT/etc/event.d/console
+ $RPM_BUILD_ROOT/lib/udev/ccw_init
 %else
 rm -f \
  $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \
- $RPM_BUILD_ROOT/etc/sysconfig/init.s390 \
- $RPM_BUILD_ROOT/etc/event.d/tty[1-6]
+ $RPM_BUILD_ROOT/etc/sysconfig/init.s390
 %endif
 
 %pre
@@ -175,7 +171,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sysconfig/network-scripts/net.hotplug
 %ifarch s390 s390x
 /etc/sysconfig/network-scripts/ifup-ctc
-/etc/sysconfig/network-scripts/ifup-iucv
 %endif
 %config(noreplace) /etc/networks
 /etc/rwtab
@@ -183,7 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/statetab
 %dir /etc/statetab.d
 %if with_upstart
-%config(noreplace) /etc/event.d/*
+/etc/init/*
 %endif
 %config /etc/X11/prefdm
 %config(noreplace) /etc/inittab
@@ -204,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/*
 /usr/sbin/sys-unconfig
 /sbin/setsysfont
-/bin/doexec
 /bin/ipcalc
 /bin/usleep
 %attr(4755,root,root) /usr/sbin/usernetctl
@@ -214,7 +208,6 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/getkey
 /sbin/securetty
 %attr(2755,root,root) /sbin/netreport
-/sbin/initlog
 /lib/udev/rules.d/*
 /lib/udev/rename_device
 /lib/udev/console_init
@@ -234,12 +227,11 @@ rm -rf $RPM_BUILD_ROOT
 /etc/ppp/ip-down.ipv6to4
 /etc/ppp/ipv6-up
 /etc/ppp/ipv6-down
-%config(noreplace) /etc/initlog.conf
 %dir /etc/NetworkManager
 %dir /etc/NetworkManager/dispatcher.d
 /etc/NetworkManager/dispatcher.d/00-netreport
 /etc/NetworkManager/dispatcher.d/05-netfs
-%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d
+%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init
 /var/lib/stateless
 %ghost %attr(0600,root,utmp) /var/log/btmp
 %ghost %attr(0664,root,utmp) /var/log/wtmp
@@ -251,6 +243,40 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> - 9.03-1
+- migrate to upstart 0.6.x (<notting at redhat.com>, <plautrba at redhat.com>)
+-- jobs move to /etc/init
+-- collapse rcX and ttyX jobs into single job definitions
+-- jobs are no longer %%config
+- remove obsolete doexec command
+- rc.sysinit: handle yet another random return string from dmraid
+- remove never-used 'sulogin' upstart event
+- fix time-setting udev rules for old-style RTC devices (#537595)
+- init.d/network: keep error codes limited to '1'. (#537841)
+- add initial ifup/ifdown man pages. (#529328, <plautrba at redhat.com>)
+
+* Tue Oct 27 2009 Bill Nottingham <notting at redhat.com> - 9.02-1
+- remove long-since deprecated initlog
+- remove IUCV support (#507217)
+- halt: put a wrapper around killall5 to account for retval 2 not being an error (#526539, <hdegoede at redhat.com>)
+- ifup-eth: honor DEFROUTE=yes|no for 'all' connection types. (#528822)
+- network-functions: load bonding driver if BONDING_OPTS is defined. (#516569)
+- rc.sysinit: put /dev/shm in mtab too, as dracut now mounts it. (#528667)
+
+* Fri Oct  9 2009 Bill Nottingham <notting at redhat.com> - 9.01-1
+- rc.sysinit: fix handling of dmraid output to avoid error messages (#527726, <mschmidt at redhat.com>)
+- rwtab: add /var/lib/xend (#526046)
+- translation updates: fi, nb, pl
+
+* Fri Oct  2 2009 Bill Nottingham <notting at redhat.com> - 9.00-1
+- halt: wrap /sbin/killall5 to catch some return codes (#526539)
+- netfs, netconsle, network: fix return codes to match LSB spec (#524489, #524480, #524486)
+- handle kernels compiled both with and without CONFIG_RTC_HCTOSYS
+- halt: use killall5's return code to avoid unncesssary sleeping (#524359, <hdegoede at redhat.com>)
+- halt: don't kill mdmon on shutdown. (#524357, <hdegoede at redhat.com>)
+- rc.sysinit: do not try and activate ISW raidsets, unless noiswmd is passed. (#524355, <hdegoede at redhat.com>)
+- translation updates: ca, cs, da, mai, po, sv, uk
+
 * Mon Sep 14 2009 Bill Nottingham <notting at redhat.com> - 8.99-1
 - init.d/functions: add a '-l' option to status to pass lock file name (#521772)
 - tweak kernel conflict


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- sources	14 Sep 2009 16:41:34 -0000	1.188
+++ sources	9 Dec 2009 21:27:27 -0000	1.189
@@ -1 +1 @@
-ec294a0d68f6a14c1b6f3cf507a48aad  initscripts-8.99.tar.bz2
+668fa2762b57ef75436303857847bba3  initscripts-9.03.tar.bz2



From dwalsh at fedoraproject.org  Wed Dec  9 21:33:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  9 Dec 2009 21:33:52 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.458,
	1.459 policycoreutils-sepolgen.patch, 1.29,
	1.30 policycoreutils.spec, 1.662, 1.663
Message-ID: <20091209213352.5B29611C00E0@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5144

Modified Files:
	policycoreutils-rhat.patch policycoreutils-sepolgen.patch 
	policycoreutils.spec 
Log Message:
* Tue Dec 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-3
- Fix audit2allow to report constraints, dontaudits, types, booleans


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   59 +--
 restorecond/Makefile                        |   24 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.8                   |   15 
 restorecond/restorecond.c                   |  428 +++++-----------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 +
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 +++++++++++++++
 restorecond/watch.c                         |  254 ++++++++++++++++
 sandbox/Makefile                            |   31 ++
 sandbox/deliverables/README                 |   32 ++
 sandbox/deliverables/basicwrapper           |    4 
 sandbox/deliverables/run-in-sandbox.py      |   49 +++
 sandbox/deliverables/sandbox                |  216 ++++++++++++++
 sandbox/sandbox                             |  253 ++++++++++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 +
 sandbox/seunshare.c                         |  265 +++++++++++++++++
 semanage/semanage                           |  122 ++++++-
 semanage/seobject.py                        |  397 ++++++++++++++++++++-----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 +++
 setfiles/restore.c                          |    7 
 setfiles/restore.h                          |    1 
 setfiles/restore.o                          |binary
 setfiles/restorecon.8                       |    7 
 setfiles/setfiles.8                         |    3 
 setfiles/setfiles.c                         |    9 
 32 files changed, 2042 insertions(+), 514 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -p -r1.458 -r1.459
--- policycoreutils-rhat.patch	1 Dec 2009 21:17:45 -0000	1.458
+++ policycoreutils-rhat.patch	9 Dec 2009 21:33:50 -0000	1.459
@@ -1,7 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.77/audit2allow/audit2allow
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.78/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.77/audit2allow/audit2allow	2009-11-24 10:27:27.000000000 -0500
-@@ -42,6 +42,8 @@
++++ policycoreutils-2.0.78/audit2allow/audit2allow	2009-12-08 17:05:49.000000000 -0500
+@@ -28,6 +28,7 @@
+ import sepolgen.defaults as defaults
+ import sepolgen.module as module
+ from sepolgen.sepolgeni18n import _
++import selinux.audit2why as audit2why
+ 
+ class AuditToPolicy:
+     VERSION = "%prog .1"
+@@ -42,6 +43,8 @@
          from optparse import OptionParser
  
          parser = OptionParser(version=self.VERSION)
@@ -10,7 +18,7 @@ diff --exclude-from=exclude --exclude=se
          parser.add_option("-a", "--all", action="store_true", dest="audit", default=False,
                            help="read input from audit log - conflicts with -i")
          parser.add_option("-d", "--dmesg", action="store_true", dest="dmesg", default=False,
-@@ -80,11 +82,11 @@
+@@ -80,11 +83,11 @@
          options, args = parser.parse_args()
  
          # Make -d, -a, and -i conflict
@@ -25,7 +33,7 @@ diff --exclude-from=exclude --exclude=se
          if options.input is not None and options.dmesg is True:
              sys.stderr.write("error: --input conflicts with --dmesg\n")
  
-@@ -129,6 +131,12 @@
+@@ -129,6 +132,12 @@
              except OSError, e:
                  sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
                  sys.exit(1)
@@ -38,18 +46,101 @@ diff --exclude-from=exclude --exclude=se
          else:
              # This is the default if no input is specified
              f = sys.stdin
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.77/Makefile
+@@ -220,63 +229,44 @@
+ 
+     def __output_audit2why(self):
+             import selinux
+-            import selinux.audit2why as audit2why
+             import seobject
+-            audit2why.init()
+             for i in self.__parser.avc_msgs:
+-                rc, bools = audit2why.analyze(i.scontext.to_string(), i.tcontext.to_string(), i.tclass, i.accesses)
+-                if rc >= 0:
++                if i.type >= 0:
+                     print "%s\n\tWas caused by:" % i.message
+-                if rc == audit2why.NOPOLICY:
+-                    raise RuntimeError("Must call policy_init first")
+-                if rc == audit2why.BADTCON:
+-                    print "Invalid Target Context %s\n" % i.tcontext
+-                    continue
+-                if rc == audit2why.BADSCON:
+-                    print "Invalid Source Context %s\n" % i.scontext
+-                    continue
+-                if rc == audit2why.BADSCON:
+-                    print "Invalid Type Class %s\n" % i.tclass
+-                    continue
+-                if rc == audit2why.BADPERM:
+-                    print "Invalid permission %s\n" % i.accesses
+-                    continue
+-                if rc == audit2why. BADCOMPUTE:
+-                    raise RuntimeError("Error during access vector computation")
+-                if rc == audit2why.ALLOW:
++                if i.type == audit2why.ALLOW:
+                     print "\t\tUnknown - would be allowed by active policy\n",
+                     print "\t\tPossible mismatch between this policy and the one under which the audit message was generated.\n"
+                     print "\t\tPossible mismatch between current in-memory boolean settings vs. permanent ones.\n"
+                     continue
+-                if rc == audit2why.DONTAUDIT:
++                if i.type == audit2why.DONTAUDIT:
+                     print "\t\tUnknown - should be dontaudit'd by active policy\n",
+                     print "\t\tPossible mismatch between this policy and the one under which the audit message was generated.\n"
+                     print "\t\tPossible mismatch between current in-memory boolean settings vs. permanent ones.\n"
+                     continue
+-                if rc == audit2why.BOOLEAN:
+-                    if len(bools) > 1:
++                if i.type == audit2why.BOOLEAN:
++                    if len(i.bools) > 1:
+                         print "\tOne of the following booleans was set incorrectly."
+-                        for b in bools:
++                        for b in i.bools:
+                             print "\tDescription:\n\t%s\n"  % seobject.boolean_desc(b[0])
+                             print "\tAllow access by executing:\n\t# setsebool -P %s %d"  % (b[0], b[1])
+                     else:
+-                        print "\tThe boolean %s was set incorrectly. " % (bools[0][0])
+-                        print "\tDescription:\n\t%s\n"  % seobject.boolean_desc(bools[0][0])
+-                        print "\tAllow access by executing:\n\t# setsebool -P %s %d"  % (bools[0][0], bools[0][1])
++                        print "\tThe boolean %s was set incorrectly. " % (i.bools[0][0])
++                        print "\tDescription:\n\t%s\n"  % seobject.boolean_desc(i.bools[0][0])
++                        print "\tAllow access by executing:\n\t# setsebool -P %s %d"  % (i.bools[0][0], i.bools[0][1])
+                     continue
+ 
+-                if rc == audit2why.TERULE:
++                if i.type == audit2why.TERULE:
+                     print "\t\tMissing type enforcement (TE) allow rule.\n"
+                     print "\t\tYou can use audit2allow to generate a loadable module to allow this access.\n"
+                     continue
+ 
+-                if rc == audit2why.CONSTRAINT:
++                if i.type == audit2why.CONSTRAINT:
+                     print "\t\tPolicy constraint violation.\n"
+                     print "\t\tMay require adding a type attribute to the domain or type to satisfy the constraint.\n"
+                     print "\t\tConstraints are defined in the policy sources in policy/constraints (general), policy/mcs (MCS), and policy/mls (MLS).\n"
+                     continue
+ 
+-                if rc == audit2why.RBAC:
++                if i.type == audit2why.RBAC:
+                     print "\t\tMissing role allow rule.\n"
+                     print "\t\tAdd an allow rule for the role pair.\n"
+                     continue
+@@ -344,5 +334,6 @@
+             sys.exit(0)
+ 
+ if __name__ == "__main__":
++    audit2why.init()
+     app = AuditToPolicy()
+     app.main()
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.78/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.77/Makefile	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/Makefile	2009-12-08 17:05:49.000000000 -0500
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.77/restorecond/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.78/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.77/restorecond/Makefile	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/Makefile	2009-12-08 17:05:49.000000000 -0500
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -96,16 +187,16 @@ diff --exclude-from=exclude --exclude=se
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.77/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/restorecond/org.selinux.Restorecond.service	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.77/restorecond/restorecond.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.78/restorecond/restorecond.8
 --- nsapolicycoreutils/restorecond/restorecond.8	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.77/restorecond/restorecond.8	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.8	2009-12-08 17:05:49.000000000 -0500
 @@ -3,7 +3,7 @@
  restorecond \- daemon that watches for file creation and then sets the default SELinux file context
  
@@ -140,9 +231,9 @@ diff --exclude-from=exclude --exclude=se
  
  .SH "SEE ALSO"
  .BR restorecon (8),
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.77/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.78/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.77/restorecond/restorecond.c	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.c	2009-12-09 16:29:18.000000000 -0500
 @@ -30,9 +30,11 @@
   * and makes sure that there security context matches the systems defaults
   *
@@ -480,7 +571,7 @@ diff --exclude-from=exclude --exclude=se
  	exit(0);
  }
  
-@@ -390,74 +136,34 @@
+@@ -390,74 +136,35 @@
     to see if it is one that we are watching.
  */
  
@@ -571,14 +662,15 @@ diff --exclude-from=exclude --exclude=se
 +	r_opts.fts_flags = FTS_PHYSICAL;
 +	r_opts.selabel_opt_validate = NULL;
 +	r_opts.selabel_opt_path = NULL;
-+	
++	r_opts.ignore_enoent = 1;
++
 +	restore_init(&r_opts);
 +	/* If we are not running SELinux then just exit */
 +	if (is_selinux_enabled() != 1) return 0;
  
  	/* Register sighandlers */
  	sa.sa_flags = 0;
-@@ -467,38 +173,59 @@
+@@ -467,38 +174,59 @@
  
  	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
  
@@ -647,9 +739,9 @@ diff --exclude-from=exclude --exclude=se
  }
 +
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.77/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.78/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.77/restorecond/restorecond.conf	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.conf	2009-12-08 17:05:49.000000000 -0500
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -660,9 +752,9 @@ diff --exclude-from=exclude --exclude=se
  /root/.ssh/*
 -
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.77/restorecond/restorecond.desktop
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.78/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/restorecond/restorecond.desktop	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.desktop	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -671,9 +763,9 @@ diff --exclude-from=exclude --exclude=se
 +Encoding=UTF-8
 +Type=Application
 +StartupNotify=false
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.77/restorecond/restorecond.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.78/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.77/restorecond/restorecond.h	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.h	2009-12-08 17:05:49.000000000 -0500
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -698,9 +790,9 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_free(int fd);
  
  #endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.77/restorecond/restorecond.init
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.78/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.77/restorecond/restorecond.init	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.init	2009-12-08 17:05:49.000000000 -0500
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -720,15 +812,15 @@ diff --exclude-from=exclude --exclude=se
  
  exit $RETVAL
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.77/restorecond/restorecond_user.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.78/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/restorecond/restorecond_user.conf	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond_user.conf	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.77/restorecond/user.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.78/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/restorecond/user.c	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/user.c	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -967,10 +1059,10 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.77/restorecond/watch.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.78/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/restorecond/watch.c	2009-11-24 10:27:27.000000000 -0500
-@@ -0,0 +1,253 @@
++++ policycoreutils-2.0.78/restorecond/watch.c	2009-12-09 16:31:48.000000000 -0500
+@@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
 +#include <errno.h>
@@ -1052,8 +1144,9 @@ diff --exclude-from=exclude --exclude=se
 +	if (ptr->wd == -1) {
 +		free(ptr);
 +		free(x);
-+		syslog(LOG_ERR, "Unable to watch (%s) %s\n",
-+		       path, strerror(errno));
++		if (! run_as_user) 
++			syslog(LOG_ERR, "Unable to watch (%s) %s\n",
++			       path, strerror(errno));
 +		return;
 +	}
 +
@@ -1224,17 +1317,17 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.77/sandbox/deliverables/basicwrapper
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.78/sandbox/deliverables/basicwrapper
 --- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/deliverables/basicwrapper	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/deliverables/basicwrapper	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,4 @@
 +import os, sys
 +SANDBOX_ARGS = ['-f%s' % os.environ['_CONDOR_SCRATCH_DIR']]
 +SANDBOX_ARGS.extend(sys.argv[1::])
 +os.execv('/usr/bin/sandbox',SANDBOX_ARGS)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/README policycoreutils-2.0.77/sandbox/deliverables/README
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/README policycoreutils-2.0.78/sandbox/deliverables/README
 --- nsapolicycoreutils/sandbox/deliverables/README	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/deliverables/README	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/deliverables/README	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,32 @@
 +Files:
 +run-in-sandbox.py:
@@ -1268,9 +1361,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +Thanks for a great summer.
 +Chris Pardy
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py policycoreutils-2.0.77/sandbox/deliverables/run-in-sandbox.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py policycoreutils-2.0.78/sandbox/deliverables/run-in-sandbox.py
 --- nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/deliverables/run-in-sandbox.py	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/deliverables/run-in-sandbox.py	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,49 @@
 +import os
 +import os.path
@@ -1321,9 +1414,9 @@ diff --exclude-from=exclude --exclude=se
 +    def get_background_items(self, window, file):
 +        return
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/sandbox policycoreutils-2.0.77/sandbox/deliverables/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/sandbox policycoreutils-2.0.78/sandbox/deliverables/sandbox
 --- nsapolicycoreutils/sandbox/deliverables/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/deliverables/sandbox	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/deliverables/sandbox	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,216 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1541,9 +1634,9 @@ diff --exclude-from=exclude --exclude=se
 +        
 +    sys.exit(rc)
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.77/sandbox/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.78/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/Makefile	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/Makefile	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1576,10 +1669,10 @@ diff --exclude-from=exclude --exclude=se
 +	../../scripts/Lindent $(wildcard *.[ch])
 +
 +relabel:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.77/sandbox/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.78/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/sandbox	2009-11-24 10:27:27.000000000 -0500
-@@ -0,0 +1,242 @@
++++ policycoreutils-2.0.78/sandbox/sandbox	2009-12-08 17:05:49.000000000 -0500
+@@ -0,0 +1,253 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
@@ -1623,36 +1716,42 @@ diff --exclude-from=exclude --exclude=se
 +    sys.stderr.flush()
 +    sys.exit(1)
 +
-+def reserve(mcs):
++def reserve(level):
 +    sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-+    sock.bind("\0%s" % mcs)
++    sock.bind("\0%s" % level)
 +    fcntl.fcntl(sock.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
 +
-+def gen_context(setype):
-+    while True:
-+        i1 = random.randrange(0, 1024)
-+        i2 = random.randrange(0, 1024)
-+        if i1 == i2:
-+            continue
-+        if i1 > i2:
-+            tmp = i1
-+            i1 = i2
-+            i2 = tmp
-+        mcs = "s0:c%d,c%d" % (i1, i2)
-+        reserve(mcs)
-+        try:
-+            reserve(mcs)
-+        except:
-+            continue
-+        break
++def gen_mcs():
++       while True:
++              i1 = random.randrange(0, 1024)
++              i2 = random.randrange(0, 1024)
++              if i1 == i2:
++                     continue
++              if i1 > i2:
++                     tmp = i1
++                     i1 = i2
++                     i2 = tmp
++                     level = "s0:c%d,c%d" % (i1, i2)
++              level = "s0:c%d,c%d" % (i1, i2)
++              try:
++                     reserve(level)
++              except socket.error:
++                     continue
++              break
++       return level
++
++def gen_context(setype, level=None):
++    if not level:
++           level = gen_mcs()
++
 +    con = selinux.getcon()[1].split(":")
 +
-+    execcon = "%s:%s:%s:%s" % (con[0], con[1], setype, mcs)
++    execcon = "%s:%s:%s:%s" % (con[0], con[1], setype, level)
 +    
 +    filecon = "%s:%s:%s:%s" % (con[0], 
 +                               "object_r", 
 +                               "%s_file_t" % setype[:-2], 
-+                               mcs)
++                               level)
 +    return execcon, filecon
 +
 +def copyfile(file, dir, dest):
@@ -1708,16 +1807,21 @@ diff --exclude-from=exclude --exclude=se
 +
 +    setype = DEFAULT_TYPE
 +    X_ind = False
++    level=None
 +    try:
-+           gopts, cmds = getopt.getopt(sys.argv[1:], "i:ht:XI:", 
++           gopts, cmds = getopt.getopt(sys.argv[1:], "l:i:ht:XI:", 
 +                                       ["help",
 +                                        "include=", 
 +                                        "includefile=", 
-+                                        "type="
++                                        "type=",
++                                        "level="
 +                                        ])
 +           for o, a in gopts:
 +                  if o == "-t" or o == "--type":
 +                         setype = a
++
++                  if o == "-l" or o == "--level":
++                         level = a
 +                         
 +                  if o == "-i" or o == "--include":
 +                         rp = os.path.realpath(a)
@@ -1745,7 +1849,7 @@ diff --exclude-from=exclude --exclude=se
 +           if len(cmds) == 0:
 +                  usage(_("Command required"))
 +
-+           execcon, filecon = gen_context(setype)
++           execcon, filecon = gen_context(setype, level)
 +           rc = -1
 +
 +           if cmds[0][0] != "/" and cmds[0][:2] != "./" and cmds[0][:3] != "../":
@@ -1822,9 +1926,9 @@ diff --exclude-from=exclude --exclude=se
 +           
 +    sys.exit(rc)
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.77/sandbox/sandbox.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.78/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/sandbox.8	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/sandbox.8	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1852,9 +1956,9 @@ diff --exclude-from=exclude --exclude=se
 +.TP
 +runcon(1)
 +.PP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.77/sandbox/sandboxX.sh
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.78/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/sandboxX.sh	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/sandboxX.sh	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,16 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1872,9 +1976,9 @@ diff --exclude-from=exclude --exclude=se
 +    kill -HUP 0
 +    break
 +done
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.77/sandbox/seunshare.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.78/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.77/sandbox/seunshare.c	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/seunshare.c	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,265 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -2141,9 +2245,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +	return status;
 +}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.77/semanage/semanage
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.78/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-11-18 17:06:03.000000000 -0500
-+++ policycoreutils-2.0.77/semanage/semanage	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/semanage/semanage	2009-12-08 17:05:49.000000000 -0500
 @@ -32,23 +32,32 @@
  try:
         gettext.install(PROGNAME,
@@ -2472,9 +2576,9 @@ diff --exclude-from=exclude --exclude=se
                               process_args(mkargv(l))
                        trans.finish()
                 else:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.77/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.78/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-11-20 10:51:25.000000000 -0500
-+++ policycoreutils-2.0.77/semanage/seobject.py	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/semanage/seobject.py	2009-12-08 17:05:49.000000000 -0500
 @@ -37,40 +37,6 @@
  
  import syslog
@@ -3118,9 +3222,9 @@ diff --exclude-from=exclude --exclude=se
  	def list(self, heading = True, locallist = False, use_file = False):
                  on_off = (_("off"), _("on")) 
  		if use_file:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.77/semodule/semodule.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.78/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.77/semodule/semodule.8	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/semodule/semodule.8	2009-12-08 17:05:49.000000000 -0500
 @@ -35,6 +35,12 @@
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
@@ -3134,9 +3238,9 @@ diff --exclude-from=exclude --exclude=se
  .B  \-r,\-\-remove=MODULE_NAME
  remove existing module
  .TP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.77/semodule/semodule.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.78/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.77/semodule/semodule.c	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/semodule/semodule.c	2009-12-08 17:05:49.000000000 -0500
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -3254,9 +3358,9 @@ diff --exclude-from=exclude --exclude=se
  						semanage_module_info_datum_destroy
  						    (m);
  					}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.77/setfiles/restore.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.78/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.77/setfiles/restore.c	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/restore.c	2009-12-08 17:05:49.000000000 -0500
 @@ -303,6 +303,12 @@
  	FTS *fts_handle;
  	FTSENT *ftsent;
@@ -3270,9 +3374,17 @@ diff --exclude-from=exclude --exclude=se
  	fts_handle = fts_open((char **)namelist, r_opts->fts_flags, NULL);
  	if (fts_handle  == NULL) {
  		fprintf(stderr,
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.77/setfiles/restorecon.8
+@@ -374,6 +380,7 @@
+ 	} else {
+ 		rc = lstat(name, &sb);
+ 		if (rc < 0) {
++			if (r_opts->ignore_enoent && errno == ENOENT) return 0;
+ 			fprintf(stderr, "%s:  lstat(%s) failed:  %s\n",
+ 				r_opts->progname, name,	strerror(errno));
+ 			return -1;
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.78/setfiles/restorecon.8
 --- nsapolicycoreutils/setfiles/restorecon.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.77/setfiles/restorecon.8	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/restorecon.8	2009-12-08 17:05:49.000000000 -0500
 @@ -4,10 +4,10 @@
  
  .SH "SYNOPSIS"
@@ -3296,9 +3408,21 @@ diff --exclude-from=exclude --exclude=se
  .TP 
  .B \-v
  show changes in file labels.
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.77/setfiles/setfiles.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.78/setfiles/restore.h
+--- nsapolicycoreutils/setfiles/restore.h	2009-11-03 09:21:40.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/restore.h	2009-12-08 17:05:49.000000000 -0500
+@@ -27,6 +27,7 @@
+ 	int hard_links;
+ 	int verbose;
+ 	int logging;
++	int ignore_enoent;
+ 	char *rootpath;
+ 	int rootpathlen;
+ 	char *progname;
+Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.78/setfiles/restore.o differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.78/setfiles/setfiles.8
 --- nsapolicycoreutils/setfiles/setfiles.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.77/setfiles/setfiles.8	2009-11-24 10:27:27.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/setfiles.8	2009-12-08 17:05:49.000000000 -0500
 @@ -31,6 +31,9 @@
  .TP
  .B \-n
@@ -3309,10 +3433,18 @@ diff --exclude-from=exclude --exclude=se
  .TP 
  .B \-q
  suppress non-error output.
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.77/setfiles/setfiles.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.78/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.77/setfiles/setfiles.c	2009-11-24 10:27:27.000000000 -0500
-@@ -44,13 +44,13 @@
++++ policycoreutils-2.0.78/setfiles/setfiles.c	2009-12-09 16:28:55.000000000 -0500
+@@ -25,7 +25,6 @@
+ static int warn_no_match = 0;
+ static int null_terminated = 0;
+ static int errors;
+-static int ignore_enoent;
+ static struct restore_opts r_opts;
+ 
+ #define STAT_BLOCK_SIZE 1
+@@ -44,13 +43,13 @@
  {
  	if (iamrestorecon) {
  		fprintf(stderr,
@@ -3328,7 +3460,16 @@ diff --exclude-from=exclude --exclude=se
  			name);
  	}
  	exit(1);
-@@ -371,7 +371,7 @@
+@@ -335,7 +334,7 @@
+ 			r_opts.debug = 1;
+ 			break;
+ 		case 'i':
+-			ignore_enoent = 1;
++			r_opts.ignore_enoent = 1;
+ 			break;
+ 		case 'l':
+ 			r_opts.logging = 1;
+@@ -371,7 +370,7 @@
  				break;
  			}
  			if (optind + 1 >= argc) {
@@ -3337,9 +3478,3 @@ diff --exclude-from=exclude --exclude=se
  					argv[0]);
  				exit(1);
  			}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/VERSION policycoreutils-2.0.77/VERSION
---- nsapolicycoreutils/VERSION	2009-12-01 15:46:50.000000000 -0500
-+++ policycoreutils-2.0.77/VERSION	2009-11-20 10:51:25.000000000 -0500
-@@ -1 +1 @@
--2.0.78
-+2.0.77

policycoreutils-sepolgen.patch:
 access.py    |   15 ++++++++-----
 audit.py     |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 policygen.py |   28 +++++++++++++++++++++++-
 refparser.py |    2 -
 refpolicy.py |    9 +++++--
 5 files changed, 105 insertions(+), 16 deletions(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- policycoreutils-sepolgen.patch	1 Dec 2009 21:17:46 -0000	1.29
+++ policycoreutils-sepolgen.patch	9 Dec 2009 21:33:51 -0000	1.30
@@ -1,6 +1,62 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.77/sepolgen-1.0.19/src/sepolgen/audit.py
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py
+--- nsasepolgen/src/sepolgen/access.py	2009-05-18 13:53:14.000000000 -0400
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py	2009-12-08 17:02:52.000000000 -0500
+@@ -32,6 +32,7 @@
+ """
+ 
+ import refpolicy
++from selinux import audit2why
+ 
+ def is_idparam(id):
+     """Determine if an id is a paramater in the form $N, where N is
+@@ -85,6 +86,8 @@
+             self.obj_class = None
+             self.perms = refpolicy.IdSet()
+             self.audit_msgs = []
++            self.type = audit2why.TERULE
++            self.bools = []
+ 
+         # The direction of the information flow represented by this
+         # access vector - used for matching
+@@ -127,7 +130,7 @@
+         return self.to_string()
+ 
+     def to_string(self):
+-        return "allow %s %s : %s %s;" % (self.src_type, self.tgt_type,
++        return "allow %s %s:%s %s;" % (self.src_type, self.tgt_type,
+                                         self.obj_class, self.perms.to_space_str())
+ 
+     def __cmp__(self, other):
+@@ -253,20 +256,22 @@
+         for av in l:
+             self.add_av(AccessVector(av))
+ 
+-    def add(self, src_type, tgt_type, obj_class, perms, audit_msg=None):
++    def add(self, src_type, tgt_type, obj_class, perms, audit_msg=None, avc_type=audit2why.TERULE, bools=[]):
+         """Add an access vector to the set.
+         """
+         tgt = self.src.setdefault(src_type, { })
+         cls = tgt.setdefault(tgt_type, { })
+         
+-        if cls.has_key(obj_class):
+-            access = cls[obj_class]
++        if cls.has_key((obj_class, avc_type)):
++            access = cls[obj_class, avc_type]
+         else:
+             access = AccessVector()
+             access.src_type = src_type
+             access.tgt_type = tgt_type
+             access.obj_class = obj_class
+-            cls[obj_class] = access
++            access.bools = bools
++            access.type = avc_type
++            cls[obj_class, avc_type] = access
+ 
+         access.perms.update(perms)
+         if audit_msg:
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py
 --- nsasepolgen/src/sepolgen/audit.py	2009-12-01 15:46:50.000000000 -0500
-+++ policycoreutils-2.0.77/sepolgen-1.0.19/src/sepolgen/audit.py	2009-11-24 10:27:28.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py	2009-12-08 17:02:17.000000000 -0500
 @@ -23,6 +23,27 @@
  
  # Convenience functions
@@ -47,10 +103,153 @@ diff --exclude-from=exclude -N -u -r nsa
  # Classes representing audit messages
  
  class AuditMessage:
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.77/sepolgen-1.0.19/src/sepolgen/refparser.py
+@@ -106,6 +138,7 @@
+             if fields[0] == "path":
+                 self.path = fields[1][1:-1]
+                 return
++import selinux.audit2why as audit2why
+ 
+ class AVCMessage(AuditMessage):
+     """AVC message representing an access denial or granted message.
+@@ -146,6 +179,8 @@
+         self.path = ""
+         self.accesses = []
+         self.denial = True
++        self.type = audit2why.TERULE
++        self.bools = []
+ 
+     def __parse_access(self, recs, start):
+         # This is kind of sucky - the access that is in a space separated
+@@ -205,7 +240,25 @@
+ 
+         if not found_src or not found_tgt or not found_class or not found_access:
+             raise ValueError("AVC message in invalid format [%s]\n" % self.message)
+-                
++        self.analyze()
++
++    def analyze(self):
++        tcontext = self.tcontext.to_string()
++        scontext = self.scontext.to_string()
++        self.type, self.bools = audit2why.analyze(scontext, tcontext, self.tclass, self.accesses);
++        if self.type == audit2why.NOPOLICY:
++            raise ValueError("Must call policy_init first")
++        if self.type == audit2why.BADTCON:
++            raise ValueError("Invalid Target Context %s\n" % tcontext)
++        if self.type == audit2why.BADSCON:
++            raise ValueError("Invalid Source Context %s\n" % scontext)
++        if self.type == audit2why.BADSCON:
++            raise ValueError("Invalid Type Class %s\n" % self.tclass)
++        if self.type == audit2why.BADPERM:
++            raise ValueError("Invalid permission %s\n" % " ".join(self.accesses))
++        if self.type == audit2why.BADCOMPUTE:
++            raise ValueError("Error during access vector computation")
++
+ class PolicyLoadMessage(AuditMessage):
+     """Audit message indicating that the policy was reloaded."""
+     def __init__(self, message):
+@@ -285,6 +338,9 @@
+ 
+     def __initialize(self):
+         self.avc_msgs = []
++        self.constraint_msgs = []
++        self.dontaudit_msgs = []
++        self.rbac_msgs = []
+         self.compute_sid_msgs = []
+         self.invalid_msgs = []
+         self.policy_load_msgs = []
+@@ -314,7 +370,7 @@
+             elif i == "security_compute_sid:":
+                 msg = ComputeSidMessage(line)
+                 found = True
+-            elif i == "type=MAC_POLICY_LOAD" or i == "type=1403":
++            elif i == "type=MAC_POLICY_LOAD":
+                 msg = PolicyLoadMessage(line)
+                 found = True
+             elif i == "type=AVC_PATH":
+@@ -442,16 +498,17 @@
+            audit logs parsed by this object.
+         """
+         av_set = access.AccessVectorSet()
++
+         for avc in self.avc_msgs:
+             if avc.denial != True and only_denials:
+                 continue
+             if avc_filter:
+                 if avc_filter.filter(avc):
+                     av_set.add(avc.scontext.type, avc.tcontext.type, avc.tclass,
+-                               avc.accesses, avc)
++                               avc.accesses, avc, avc_type=avc.type, bools=avc.bools)
+             else:
+                 av_set.add(avc.scontext.type, avc.tcontext.type, avc.tclass,
+-                           avc.accesses, avc)
++                           avc.accesses, avc, avc_type=avc.type, bools=avc.bools)
+         return av_set
+ 
+ class AVCTypeFilter:
+@@ -477,5 +534,3 @@
+         if self.regex.match(avc.tcontext.type):
+             return True
+         return False
+-
+-
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py
+--- nsasepolgen/src/sepolgen/policygen.py	2008-09-12 11:48:15.000000000 -0400
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py	2009-12-08 17:03:16.000000000 -0500
+@@ -29,6 +29,8 @@
+ import access
+ import interfaces
+ import matching
++import selinux.audit2why as audit2why
++from setools import *
+ 
+ # Constants for the level of explanation from the generation
+ # routines
+@@ -74,7 +76,7 @@
+             self.moduel = module
+         else:
+             self.module = refpolicy.Module()
+-
++        self.domains = None
+     def set_gen_refpol(self, if_set=None, perm_maps=None):
+         """Set whether reference policy interfaces are generated.
+ 
+@@ -144,8 +146,32 @@
+     def __add_allow_rules(self, avs):
+         for av in avs:
+             rule = refpolicy.AVRule(av)
++            rule.comment = ""
+             if self.explain:
+                 rule.comment = refpolicy.Comment(explain_access(av, verbosity=self.explain))
++            if av.type == audit2why.DONTAUDIT:
++                rule.comment += "#!!!! This avc has a dontaudit rule in the current policy\n" 
++            if av.type == audit2why.BOOLEAN:
++                if len(av.bools) > 1:
++                    rule.comment += "#!!!! This avc can be allowed using one of the these booleans:\n#     %s\n" % ", ".join(map(lambda x: av.bools[0][0], av.bools))
++                else:
++                    rule.comment += "#!!!! This avc can be allowed using the boolean '%s'\n" % av.bools[0][0]
++
++            if av.type == audit2why.CONSTRAINT:
++                rule.comment += "#!!!! This avc is a constraint violation.  You will need to add an attribute to either the source or target type to make it work.\n" 
++            if av.type == audit2why.TERULE:
++                if "open" in av.perms and "write" in av.perms:
++                    if not self.domains:
++                        self.domains = seinfo(ATTRIBUTE, name="domain")[0]["types"]
++                    types=[]
++                    for i in map(lambda x: x[TCONTEXT], sesearch([ALLOW], {SCONTEXT: av.src_type, CLASS: av.obj_class, PERMS: av.perms})):
++                        if i not in self.domains:
++                            types.append(i)
++                    if len(types) == 1:
++                        rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following type:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
++                    elif len(types) >= 1:
++                        rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following types:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
++                            
+             self.module.children.append(rule)
+ 
+ 
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2009-10-29 15:21:39.000000000 -0400
-+++ policycoreutils-2.0.77/sepolgen-1.0.19/src/sepolgen/refparser.py	2009-11-24 10:27:28.000000000 -0500
-@@ -973,7 +919,7 @@
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py	2009-12-08 17:01:22.000000000 -0500
+@@ -973,7 +973,7 @@
  def list_headers(root):
      modules = []
      support_macros = None
@@ -59,3 +258,35 @@ diff --exclude-from=exclude -N -u -r nsa
  
      for dirpath, dirnames, filenames in os.walk(root):
          for name in filenames:
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refpolicy.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py
+--- nsasepolgen/src/sepolgen/refpolicy.py	2009-10-29 15:21:39.000000000 -0400
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py	2009-12-08 17:02:00.000000000 -0500
+@@ -398,6 +398,7 @@
+         return "attribute %s;" % self.name
+ 
+ # Classes representing rules
++import selinux.audit2why as audit2why
+ 
+ class AVRule(Leaf):
+     """SELinux access vector (AV) rule.
+@@ -426,15 +427,17 @@
+         self.tgt_types = IdSet()
+         self.obj_classes = IdSet()
+         self.perms = IdSet()
+-        self.rule_type = self.ALLOW
++        self.rule_type = audit2why.TERULE
+         if av:
+             self.from_av(av)
+ 
+     def __rule_type_str(self):
+-        if self.rule_type == self.ALLOW:
++        if self.rule_type == audit2why.TERULE:
+             return "allow"
+-        elif self.rule_type == self.DONTAUDIT:
++        elif self.rule_type == audit2why.DONTAUDIT:
+             return "dontaudit"
++        elif self.rule_type == audit2why.CONSTRAINT:
++            return "#constraint allow"
+         else:
+             return "auditallow"
+ 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -p -r1.662 -r1.663
--- policycoreutils.spec	1 Dec 2009 21:17:46 -0000	1.662
+++ policycoreutils.spec	9 Dec 2009 21:33:51 -0000	1.663
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,12 @@ fi
 exit 0
 
 %changelog
+* Tue Dec 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-3
+- Fix audit2allow to report constraints, dontaudits, types, booleans
+
+* Fri Dec 4 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-2
+- Fix restorecon -i to ignore enoent
+
 * Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-1
 - Update to upstream
 	* Remove non-working OUTFILE from fixfiles from Dan Walsh.



From dwalsh at fedoraproject.org  Wed Dec  9 21:34:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  9 Dec 2009 21:34:46 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 .cvsignore, 1.203,
	1.204 policycoreutils-rhat.patch, 1.454,
	1.455 policycoreutils-sepolgen.patch, 1.28,
	1.29 policycoreutils.spec, 1.657, 1.658 sources, 1.212, 1.213
Message-ID: <20091209213446.E764911C00E0@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5548

Modified Files:
	.cvsignore policycoreutils-rhat.patch 
	policycoreutils-sepolgen.patch policycoreutils.spec sources 
Log Message:
* Tue Dec 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-3
- Fix audit2allow to report constraints, dontaudits, types, booleans



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/.cvsignore,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- .cvsignore	17 Sep 2009 13:07:45 -0000	1.203
+++ .cvsignore	9 Dec 2009 21:34:45 -0000	1.204
@@ -208,3 +208,8 @@ policycoreutils-2.0.71.tgz
 sepolgen-1.0.17.tgz
 policycoreutils-2.0.73.tgz
 policycoreutils-2.0.74.tgz
+policycoreutils-2.0.75.tgz
+policycoreutils-2.0.76.tgz
+policycoreutils-2.0.77.tgz
+policycoreutils-2.0.78.tgz
+sepolgen-1.0.19.tgz

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   59 +--
 restorecond/Makefile                        |   24 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.8                   |   15 
 restorecond/restorecond.c                   |  428 +++++-----------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 +
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 +++++++++++++++
 restorecond/watch.c                         |  254 ++++++++++++++++
 sandbox/Makefile                            |   31 ++
 sandbox/deliverables/README                 |   32 ++
 sandbox/deliverables/basicwrapper           |    4 
 sandbox/deliverables/run-in-sandbox.py      |   49 +++
 sandbox/deliverables/sandbox                |  216 ++++++++++++++
 sandbox/sandbox                             |  253 ++++++++++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 +
 sandbox/seunshare.c                         |  265 +++++++++++++++++
 semanage/semanage                           |  122 ++++++-
 semanage/seobject.py                        |  397 ++++++++++++++++++++-----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 +++
 setfiles/restore.c                          |    7 
 setfiles/restore.h                          |    1 
 setfiles/restore.o                          |binary
 setfiles/restorecon.8                       |    7 
 setfiles/setfiles.8                         |    3 
 setfiles/setfiles.c                         |    9 
 32 files changed, 2042 insertions(+), 514 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.454 -r 1.455 policycoreutils-rhat.patchIndex: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -p -r1.454 -r1.455
--- policycoreutils-rhat.patch	16 Nov 2009 21:55:53 -0000	1.454
+++ policycoreutils-rhat.patch	9 Dec 2009 21:34:45 -0000	1.455
@@ -1,7 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.74/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2009-09-17 08:59:51.000000000 -0400
-+++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-11-09 16:05:58.000000000 -0500
-@@ -42,6 +42,8 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.78/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.78/audit2allow/audit2allow	2009-12-08 17:05:49.000000000 -0500
+@@ -28,6 +28,7 @@
+ import sepolgen.defaults as defaults
+ import sepolgen.module as module
+ from sepolgen.sepolgeni18n import _
++import selinux.audit2why as audit2why
+ 
+ class AuditToPolicy:
+     VERSION = "%prog .1"
+@@ -42,6 +43,8 @@
          from optparse import OptionParser
  
          parser = OptionParser(version=self.VERSION)
@@ -10,7 +18,7 @@ diff --exclude-from=exclude --exclude=se
          parser.add_option("-a", "--all", action="store_true", dest="audit", default=False,
                            help="read input from audit log - conflicts with -i")
          parser.add_option("-d", "--dmesg", action="store_true", dest="dmesg", default=False,
-@@ -80,11 +82,11 @@
+@@ -80,11 +83,11 @@
          options, args = parser.parse_args()
  
          # Make -d, -a, and -i conflict
@@ -25,7 +33,7 @@ diff --exclude-from=exclude --exclude=se
          if options.input is not None and options.dmesg is True:
              sys.stderr.write("error: --input conflicts with --dmesg\n")
  
-@@ -129,6 +131,12 @@
+@@ -129,6 +132,12 @@
              except OSError, e:
                  sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
                  sys.exit(1)
@@ -38,39 +46,101 @@ diff --exclude-from=exclude --exclude=se
          else:
              # This is the default if no input is specified
              f = sys.stdin
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.74/load_policy/Makefile
---- nsapolicycoreutils/load_policy/Makefile	2009-09-17 08:59:51.000000000 -0400
-+++ policycoreutils-2.0.74/load_policy/Makefile	2009-11-09 16:05:58.000000000 -0500
-@@ -1,6 +1,7 @@
- # Installation directories.
- PREFIX ?= ${DESTDIR}/usr
--SBINDIR ?= $(PREFIX)/sbin
-+SBINDIR ?= $(DESTDIR)/sbin
-+USRSBINDIR ?= $(PREFIX)/sbin
- MANDIR ?= $(PREFIX)/share/man
- LOCALEDIR ?= /usr/share/locale
- 
-@@ -17,6 +18,8 @@
- 	install -m 755 $(TARGETS) $(SBINDIR)
- 	test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
- 	install -m 644 load_policy.8 $(MANDIR)/man8/
-+	-mkdir -p $(USRSBINDIR)
-+	ln -s /sbin/load_policy $(USRSBINDIR)/load_policy
- 
- clean:
- 	-rm -f $(TARGETS) *.o 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.74/Makefile
---- nsapolicycoreutils/Makefile	2009-09-17 08:59:51.000000000 -0400
-+++ policycoreutils-2.0.74/Makefile	2009-11-09 16:05:58.000000000 -0500
+@@ -220,63 +229,44 @@
+ 
+     def __output_audit2why(self):
+             import selinux
+-            import selinux.audit2why as audit2why
+             import seobject
+-            audit2why.init()
+             for i in self.__parser.avc_msgs:
+-                rc, bools = audit2why.analyze(i.scontext.to_string(), i.tcontext.to_string(), i.tclass, i.accesses)
+-                if rc >= 0:
++                if i.type >= 0:
+                     print "%s\n\tWas caused by:" % i.message
+-                if rc == audit2why.NOPOLICY:
+-                    raise RuntimeError("Must call policy_init first")
+-                if rc == audit2why.BADTCON:
+-                    print "Invalid Target Context %s\n" % i.tcontext
+-                    continue
+-                if rc == audit2why.BADSCON:
+-                    print "Invalid Source Context %s\n" % i.scontext
+-                    continue
+-                if rc == audit2why.BADSCON:
+-                    print "Invalid Type Class %s\n" % i.tclass
+-                    continue
+-                if rc == audit2why.BADPERM:
+-                    print "Invalid permission %s\n" % i.accesses
+-                    continue
+-                if rc == audit2why. BADCOMPUTE:
+-                    raise RuntimeError("Error during access vector computation")
+-                if rc == audit2why.ALLOW:
++                if i.type == audit2why.ALLOW:
+                     print "\t\tUnknown - would be allowed by active policy\n",
+                     print "\t\tPossible mismatch between this policy and the one under which the audit message was generated.\n"
+                     print "\t\tPossible mismatch between current in-memory boolean settings vs. permanent ones.\n"
+                     continue
+-                if rc == audit2why.DONTAUDIT:
++                if i.type == audit2why.DONTAUDIT:
+                     print "\t\tUnknown - should be dontaudit'd by active policy\n",
+                     print "\t\tPossible mismatch between this policy and the one under which the audit message was generated.\n"
+                     print "\t\tPossible mismatch between current in-memory boolean settings vs. permanent ones.\n"
+                     continue
+-                if rc == audit2why.BOOLEAN:
+-                    if len(bools) > 1:
++                if i.type == audit2why.BOOLEAN:
++                    if len(i.bools) > 1:
+                         print "\tOne of the following booleans was set incorrectly."
+-                        for b in bools:
++                        for b in i.bools:
+                             print "\tDescription:\n\t%s\n"  % seobject.boolean_desc(b[0])
+                             print "\tAllow access by executing:\n\t# setsebool -P %s %d"  % (b[0], b[1])
+                     else:
+-                        print "\tThe boolean %s was set incorrectly. " % (bools[0][0])
+-                        print "\tDescription:\n\t%s\n"  % seobject.boolean_desc(bools[0][0])
+-                        print "\tAllow access by executing:\n\t# setsebool -P %s %d"  % (bools[0][0], bools[0][1])
++                        print "\tThe boolean %s was set incorrectly. " % (i.bools[0][0])
++                        print "\tDescription:\n\t%s\n"  % seobject.boolean_desc(i.bools[0][0])
++                        print "\tAllow access by executing:\n\t# setsebool -P %s %d"  % (i.bools[0][0], i.bools[0][1])
+                     continue
+ 
+-                if rc == audit2why.TERULE:
++                if i.type == audit2why.TERULE:
+                     print "\t\tMissing type enforcement (TE) allow rule.\n"
+                     print "\t\tYou can use audit2allow to generate a loadable module to allow this access.\n"
+                     continue
+ 
+-                if rc == audit2why.CONSTRAINT:
++                if i.type == audit2why.CONSTRAINT:
+                     print "\t\tPolicy constraint violation.\n"
+                     print "\t\tMay require adding a type attribute to the domain or type to satisfy the constraint.\n"
+                     print "\t\tConstraints are defined in the policy sources in policy/constraints (general), policy/mcs (MCS), and policy/mls (MLS).\n"
+                     continue
+ 
+-                if rc == audit2why.RBAC:
++                if i.type == audit2why.RBAC:
+                     print "\t\tMissing role allow rule.\n"
+                     print "\t\tAdd an allow rule for the role pair.\n"
+                     continue
+@@ -344,5 +334,6 @@
+             sys.exit(0)
+ 
+ if __name__ == "__main__":
++    audit2why.init()
+     app = AuditToPolicy()
+     app.main()
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.78/Makefile
+--- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.78/Makefile	2009-12-08 17:05:49.000000000 -0500
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.74/restorecond/Makefile
---- nsapolicycoreutils/restorecond/Makefile	2009-09-17 08:59:51.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/Makefile	2009-11-09 16:05:58.000000000 -0500
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.78/restorecond/Makefile
+--- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.78/restorecond/Makefile	2009-12-08 17:05:49.000000000 -0500
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -117,16 +187,16 @@ diff --exclude-from=exclude --exclude=se
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-11-09 16:05:58.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service	2009-12-08 17:05:49.000000000 -0500
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.74/restorecond/restorecond.8
---- nsapolicycoreutils/restorecond/restorecond.8	2009-09-17 08:59:51.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.8	2009-11-09 16:05:58.000000000 -0500
+diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.78/restorecond/restorecond.8
+--- nsapolicycoreutils/restorecond/restorecond.8	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.78/restorecond/restorecond.8	2009-12-08 17:05:49.000000000 -0500
 @@ -3,7 +3,7 @@
  restorecond \- daemon that watches for file creation and then sets the default SELinux file context
  
@@ -161,9 +231,9 @@ diff --exclude-from=exclude --exclude=se
  
  .SH "SEE ALSO"
[...2557 lines suppressed...]
--	base = basename(progname);
-+	base = basename(r_opts.progname);
- 	
- 	if (!strcmp(base, SETFILES)) {
- 		/* 
-@@ -832,28 +338,28 @@
- 		iamrestorecon = 0;
- 		recurse = 1;
- 		expand_realpath = 0;
--		abort_on_error = 1;
--		add_assoc = 1;
--		fts_flags = FTS_PHYSICAL | FTS_XDEV;
-+		r_opts.abort_on_error = 1;
-+		r_opts.add_assoc = 1;
-+		r_opts.fts_flags = FTS_PHYSICAL | FTS_XDEV;
- 		ctx_validate = 1;
- 	} else {
- 		/*
- 		 * restorecon:  
- 		 * No recursive descent unless -r/-R,
--		 * Expands paths via realpath, 
- 		 * Do not abort on errors during the file tree walk,
-+		 * Expands paths via realpath, 
- 		 * Do not try to track inode associations for conflict detection,
- 		 * Follows mounts,
- 		 * Does lazy validation of contexts upon use. 
- 		 */
--		if (strcmp(base, RESTORECON) && !quiet) 
-+		if (strcmp(base, RESTORECON) && !r_opts.quiet) 
- 			printf("Executed with an unrecognized name (%s), defaulting to %s behavior.\n", base, RESTORECON);
- 		iamrestorecon = 1;
- 		recurse = 0;
- 		expand_realpath = 1;
--		abort_on_error = 0;
--		add_assoc = 0;
--		fts_flags = FTS_PHYSICAL;
-+		r_opts.abort_on_error = 0;
-+		r_opts.add_assoc = 0;
-+		r_opts.fts_flags = FTS_PHYSICAL;
- 		ctx_validate = 0;
- 
- 		/* restorecon only:  silent exit if no SELinux.
-@@ -915,37 +421,37 @@
- 			input_filename = optarg;
- 			break;			
- 		case 'd':
--			debug = 1;
-+			r_opts.debug = 1;
+@@ -335,7 +334,7 @@
+ 			r_opts.debug = 1;
  			break;
  		case 'i':
- 			ignore_enoent = 1;
+-			ignore_enoent = 1;
++			r_opts.ignore_enoent = 1;
  			break;
  		case 'l':
--			logging = 1;
-+			r_opts.logging = 1;
- 			break;
- 		case 'F':
--			force = 1;
-+			r_opts.force = 1;
- 			break;
- 		case 'n':
--			change = 0;
-+			r_opts.change = 0;
- 			break;
- 		case 'o':
- 			if (strcmp(optarg, "-") == 0) {
--				outfile = stdout;
-+				r_opts.outfile = stdout;
+ 			r_opts.logging = 1;
+@@ -371,7 +370,7 @@
  				break;
  			}
- 
--			outfile = fopen(optarg, "w");
--			if (!outfile) {
-+			r_opts.outfile = fopen(optarg, "w");
-+			if (!r_opts.outfile) {
- 				fprintf(stderr, "Error opening %s: %s\n",
- 					optarg, strerror(errno));
- 
- 				usage(argv[0]);
- 			}
--			__fsetlocking(outfile, FSETLOCKING_BYCALLER);
-+			__fsetlocking(r_opts.outfile, FSETLOCKING_BYCALLER);
- 			break;
- 		case 'q':
--			quiet = 1;
-+			r_opts.quiet = 1;
- 			break;
- 		case 'R':
- 		case 'r':
-@@ -958,7 +464,7 @@
- 					argv[0]);
- 				exit(1);
- 			}
--			if (NULL != rootpath) {
-+			if (NULL != r_opts.rootpath) {
- 				fprintf(stderr,
- 					"%s: only one -r can be specified\n",
+ 			if (optind + 1 >= argc) {
+-				fprintf(stderr, "usage:  %s -r r_opts.rootpath\n",
++				fprintf(stderr, "usage:  %s -r rootpath\n",
  					argv[0]);
-@@ -969,23 +475,23 @@
- 		case 's':
- 			use_input_file = 1;
- 			input_filename = "-";
--			add_assoc = 0;
-+			r_opts.add_assoc = 0;
- 			break;
- 		case 'v':
--			if (progress) {
-+			if (r_opts.progress) {
- 				fprintf(stderr,
- 					"Progress and Verbose mutually exclusive\n");
  				exit(1);
  			}
--			verbose++;
-+			r_opts.verbose++;
- 			break;
- 		case 'p':
--			if (verbose) {
-+			if (r_opts.verbose) {
- 				fprintf(stderr,
- 					"Progress and Verbose mutually exclusive\n");
- 				usage(argv[0]);
- 			}
--			progress = 1;
-+			r_opts.progress = 1;
- 			break;
- 		case 'W':
- 			warn_no_match = 1;
-@@ -1033,18 +539,13 @@
- 	}
- 
- 	/* Load the file contexts configuration and check it. */
--	opts[0].value = (ctx_validate ? (char*)1 : NULL);
--	opts[1].value = altpath;
--
--	hnd = selabel_open(SELABEL_CTX_FILE, opts, 2);
--	if (!hnd) {
--		perror(altpath);
--		exit(1);
--	}
-+	r_opts.selabel_opt_validate = (ctx_validate ? (char *)1 : NULL);
-+	r_opts.selabel_opt_path = altpath;
- 
- 	if (nerr)
- 		exit(1);
- 
-+	restore_init(&r_opts);
- 	if (use_input_file) {
- 		FILE *f = stdin;
- 		ssize_t len;
-@@ -1061,6 +562,9 @@
- 		delim = (null_terminated != 0) ? '\0' : '\n';
- 		while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
- 			buf[len - 1] = 0;
-+			if (!strcmp(buf, "/"))
-+				mass_relabel = 1;
-+	
- 			errors |= process_one_realpath(buf);
- 		}
- 		if (strcmp(input_filename, "-") != 0)
-@@ -1070,22 +574,21 @@
- 			errors |= process_one_realpath(argv[i]);
- 		}
- 	}
--
-+	
-+	if (mass_relabel)
-+		mass_relabel_errs = errors;
- 	maybe_audit_mass_relabel();
- 
- 	if (warn_no_match)
--		selabel_stats(hnd);
-+		selabel_stats(r_opts.hnd);
- 
--	selabel_close(hnd);
-+	selabel_close(r_opts.hnd);
-+	restore_finish();
- 
--	if (outfile)
--		fclose(outfile);
--
--	for (i = 0; i < excludeCtr; i++) {
--		free(excludeArray[i].directory);
--	}
-+	if (r_opts.outfile)
-+		fclose(r_opts.outfile);
- 
--       if (progress && count >= STAR_COUNT)
-+       if (r_opts.progress && r_opts.count >= STAR_COUNT)
-                printf("\n");
- 	exit(errors);
- }

policycoreutils-sepolgen.patch:
 access.py    |   15 ++++++++-----
 audit.py     |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 policygen.py |   28 +++++++++++++++++++++++-
 refparser.py |    2 -
 refpolicy.py |    9 +++++--
 5 files changed, 105 insertions(+), 16 deletions(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-sepolgen.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- policycoreutils-sepolgen.patch	19 Aug 2009 19:02:29 -0000	1.28
+++ policycoreutils-sepolgen.patch	9 Dec 2009 21:34:46 -0000	1.29
@@ -1,6 +1,62 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/audit.py
---- nsasepolgen/src/sepolgen/audit.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/audit.py	2009-08-18 15:21:13.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py
+--- nsasepolgen/src/sepolgen/access.py	2009-05-18 13:53:14.000000000 -0400
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py	2009-12-08 17:02:52.000000000 -0500
+@@ -32,6 +32,7 @@
+ """
+ 
+ import refpolicy
++from selinux import audit2why
+ 
+ def is_idparam(id):
+     """Determine if an id is a paramater in the form $N, where N is
+@@ -85,6 +86,8 @@
+             self.obj_class = None
+             self.perms = refpolicy.IdSet()
+             self.audit_msgs = []
++            self.type = audit2why.TERULE
++            self.bools = []
+ 
+         # The direction of the information flow represented by this
+         # access vector - used for matching
+@@ -127,7 +130,7 @@
+         return self.to_string()
+ 
+     def to_string(self):
+-        return "allow %s %s : %s %s;" % (self.src_type, self.tgt_type,
++        return "allow %s %s:%s %s;" % (self.src_type, self.tgt_type,
+                                         self.obj_class, self.perms.to_space_str())
+ 
+     def __cmp__(self, other):
+@@ -253,20 +256,22 @@
+         for av in l:
+             self.add_av(AccessVector(av))
+ 
+-    def add(self, src_type, tgt_type, obj_class, perms, audit_msg=None):
++    def add(self, src_type, tgt_type, obj_class, perms, audit_msg=None, avc_type=audit2why.TERULE, bools=[]):
+         """Add an access vector to the set.
+         """
+         tgt = self.src.setdefault(src_type, { })
+         cls = tgt.setdefault(tgt_type, { })
+         
+-        if cls.has_key(obj_class):
+-            access = cls[obj_class]
++        if cls.has_key((obj_class, avc_type)):
++            access = cls[obj_class, avc_type]
+         else:
+             access = AccessVector()
+             access.src_type = src_type
+             access.tgt_type = tgt_type
+             access.obj_class = obj_class
+-            cls[obj_class] = access
++            access.bools = bools
++            access.type = avc_type
++            cls[obj_class, avc_type] = access
+ 
+         access.perms.update(perms)
+         if audit_msg:
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py
+--- nsasepolgen/src/sepolgen/audit.py	2009-12-01 15:46:50.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py	2009-12-08 17:02:17.000000000 -0500
 @@ -23,6 +23,27 @@
  
  # Convenience functions
@@ -47,10 +103,153 @@ diff --exclude-from=exclude -N -u -r nsa
  # Classes representing audit messages
  
  class AuditMessage:
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/refparser.py
---- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/refparser.py	2009-08-13 17:57:55.000000000 -0400
-@@ -919,7 +919,7 @@
+@@ -106,6 +138,7 @@
+             if fields[0] == "path":
+                 self.path = fields[1][1:-1]
+                 return
++import selinux.audit2why as audit2why
+ 
+ class AVCMessage(AuditMessage):
+     """AVC message representing an access denial or granted message.
+@@ -146,6 +179,8 @@
+         self.path = ""
+         self.accesses = []
+         self.denial = True
++        self.type = audit2why.TERULE
++        self.bools = []
+ 
+     def __parse_access(self, recs, start):
+         # This is kind of sucky - the access that is in a space separated
+@@ -205,7 +240,25 @@
+ 
+         if not found_src or not found_tgt or not found_class or not found_access:
+             raise ValueError("AVC message in invalid format [%s]\n" % self.message)
+-                
++        self.analyze()
++
++    def analyze(self):
++        tcontext = self.tcontext.to_string()
++        scontext = self.scontext.to_string()
++        self.type, self.bools = audit2why.analyze(scontext, tcontext, self.tclass, self.accesses);
++        if self.type == audit2why.NOPOLICY:
++            raise ValueError("Must call policy_init first")
++        if self.type == audit2why.BADTCON:
++            raise ValueError("Invalid Target Context %s\n" % tcontext)
++        if self.type == audit2why.BADSCON:
++            raise ValueError("Invalid Source Context %s\n" % scontext)
++        if self.type == audit2why.BADSCON:
++            raise ValueError("Invalid Type Class %s\n" % self.tclass)
++        if self.type == audit2why.BADPERM:
++            raise ValueError("Invalid permission %s\n" % " ".join(self.accesses))
++        if self.type == audit2why.BADCOMPUTE:
++            raise ValueError("Error during access vector computation")
++
+ class PolicyLoadMessage(AuditMessage):
+     """Audit message indicating that the policy was reloaded."""
+     def __init__(self, message):
+@@ -285,6 +338,9 @@
+ 
+     def __initialize(self):
+         self.avc_msgs = []
++        self.constraint_msgs = []
++        self.dontaudit_msgs = []
++        self.rbac_msgs = []
+         self.compute_sid_msgs = []
+         self.invalid_msgs = []
+         self.policy_load_msgs = []
+@@ -314,7 +370,7 @@
+             elif i == "security_compute_sid:":
+                 msg = ComputeSidMessage(line)
+                 found = True
+-            elif i == "type=MAC_POLICY_LOAD" or i == "type=1403":
++            elif i == "type=MAC_POLICY_LOAD":
+                 msg = PolicyLoadMessage(line)
+                 found = True
+             elif i == "type=AVC_PATH":
+@@ -442,16 +498,17 @@
+            audit logs parsed by this object.
+         """
+         av_set = access.AccessVectorSet()
++
+         for avc in self.avc_msgs:
+             if avc.denial != True and only_denials:
+                 continue
+             if avc_filter:
+                 if avc_filter.filter(avc):
+                     av_set.add(avc.scontext.type, avc.tcontext.type, avc.tclass,
+-                               avc.accesses, avc)
++                               avc.accesses, avc, avc_type=avc.type, bools=avc.bools)
+             else:
+                 av_set.add(avc.scontext.type, avc.tcontext.type, avc.tclass,
+-                           avc.accesses, avc)
++                           avc.accesses, avc, avc_type=avc.type, bools=avc.bools)
+         return av_set
+ 
+ class AVCTypeFilter:
+@@ -477,5 +534,3 @@
+         if self.regex.match(avc.tcontext.type):
+             return True
+         return False
+-
+-
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py
+--- nsasepolgen/src/sepolgen/policygen.py	2008-09-12 11:48:15.000000000 -0400
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py	2009-12-08 17:03:16.000000000 -0500
+@@ -29,6 +29,8 @@
+ import access
+ import interfaces
+ import matching
++import selinux.audit2why as audit2why
++from setools import *
+ 
+ # Constants for the level of explanation from the generation
+ # routines
+@@ -74,7 +76,7 @@
+             self.moduel = module
+         else:
+             self.module = refpolicy.Module()
+-
++        self.domains = None
+     def set_gen_refpol(self, if_set=None, perm_maps=None):
+         """Set whether reference policy interfaces are generated.
+ 
+@@ -144,8 +146,32 @@
+     def __add_allow_rules(self, avs):
+         for av in avs:
+             rule = refpolicy.AVRule(av)
++            rule.comment = ""
+             if self.explain:
+                 rule.comment = refpolicy.Comment(explain_access(av, verbosity=self.explain))
++            if av.type == audit2why.DONTAUDIT:
++                rule.comment += "#!!!! This avc has a dontaudit rule in the current policy\n" 
++            if av.type == audit2why.BOOLEAN:
++                if len(av.bools) > 1:
++                    rule.comment += "#!!!! This avc can be allowed using one of the these booleans:\n#     %s\n" % ", ".join(map(lambda x: av.bools[0][0], av.bools))
++                else:
++                    rule.comment += "#!!!! This avc can be allowed using the boolean '%s'\n" % av.bools[0][0]
++
++            if av.type == audit2why.CONSTRAINT:
++                rule.comment += "#!!!! This avc is a constraint violation.  You will need to add an attribute to either the source or target type to make it work.\n" 
++            if av.type == audit2why.TERULE:
++                if "open" in av.perms and "write" in av.perms:
++                    if not self.domains:
++                        self.domains = seinfo(ATTRIBUTE, name="domain")[0]["types"]
++                    types=[]
++                    for i in map(lambda x: x[TCONTEXT], sesearch([ALLOW], {SCONTEXT: av.src_type, CLASS: av.obj_class, PERMS: av.perms})):
++                        if i not in self.domains:
++                            types.append(i)
++                    if len(types) == 1:
++                        rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following type:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
++                    elif len(types) >= 1:
++                        rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following types:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
++                            
+             self.module.children.append(rule)
+ 
+ 
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py
+--- nsasepolgen/src/sepolgen/refparser.py	2009-10-29 15:21:39.000000000 -0400
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py	2009-12-08 17:01:22.000000000 -0500
+@@ -973,7 +973,7 @@
  def list_headers(root):
      modules = []
      support_macros = None
@@ -59,3 +258,35 @@ diff --exclude-from=exclude -N -u -r nsa
  
      for dirpath, dirnames, filenames in os.walk(root):
          for name in filenames:
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refpolicy.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py
+--- nsasepolgen/src/sepolgen/refpolicy.py	2009-10-29 15:21:39.000000000 -0400
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py	2009-12-08 17:02:00.000000000 -0500
+@@ -398,6 +398,7 @@
+         return "attribute %s;" % self.name
+ 
+ # Classes representing rules
++import selinux.audit2why as audit2why
+ 
+ class AVRule(Leaf):
+     """SELinux access vector (AV) rule.
+@@ -426,15 +427,17 @@
+         self.tgt_types = IdSet()
+         self.obj_classes = IdSet()
+         self.perms = IdSet()
+-        self.rule_type = self.ALLOW
++        self.rule_type = audit2why.TERULE
+         if av:
+             self.from_av(av)
+ 
+     def __rule_type_str(self):
+-        if self.rule_type == self.ALLOW:
++        if self.rule_type == audit2why.TERULE:
+             return "allow"
+-        elif self.rule_type == self.DONTAUDIT:
++        elif self.rule_type == audit2why.DONTAUDIT:
+             return "dontaudit"
++        elif self.rule_type == audit2why.CONSTRAINT:
++            return "#constraint allow"
+         else:
+             return "auditallow"
+ 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -p -r1.657 -r1.658
--- policycoreutils.spec	16 Nov 2009 21:55:54 -0000	1.657
+++ policycoreutils.spec	9 Dec 2009 21:34:46 -0000	1.658
@@ -2,11 +2,11 @@
 %define	libsepolver	2.0.19-1
 %define	libsemanagever	2.0.36-2
 %define	libselinuxver	2.0.46-5
-%define	sepolgenver	1.0.17
+%define	sepolgenver	1.0.19
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.74
-Release: 18%{?dist}
+Version: 2.0.78
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,15 +296,44 @@ fi
 exit 0
 
 %changelog
-* Mon Nov 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-18
+* Tue Dec 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-3
+- Fix audit2allow to report constraints, dontaudits, types, booleans
+
+* Fri Dec 4 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-2
+- Fix restorecon -i to ignore enoent
+
+* Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-1
+- Update to upstream
+	* Remove non-working OUTFILE from fixfiles from Dan Walsh.
+	* Additional exception handling in chcat from Dan Walsh.
+
+	* fix sepolgen to read a "type 1403" msg as a policy load by Stephen
+	  Smalley <sds at tycho.nsa.gov>
+	* Add support for Xen ocontexts from Paul Nuzzi.
+
+* Tue Nov 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.77-1
+- Update to upstream
+	* Fixed bug preventing semanage node -a from working
+	  from Chad Sellers
+	* Fixed bug preventing semanage fcontext -l from working
+	  from Chad Sellers
+- Change semanage to use unicode
+
+* Wed Nov 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.76-1
+- Update to upstream
+	* Remove setrans management from semanage, as it does not work
+	  from Dan Walsh.
+	* Move load_policy from /usr/sbin to /sbin from Dan Walsh.
+
+* Mon Nov 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.75-3
 - Raise exception if user tries to add file context with an embedded space
 
-* Wed Nov 11 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-17
+* Wed Nov 11 2009 Dan Walsh <dwalsh at redhat.com> 2.0.75-2
 - Fix sandbox to setsid so it can run under mozilla without crashing the session
 
-* Mon Nov 9 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-16
-- Fix sandbox to use chcon
-- Fix semanage to report duplicate ports
+* Tue Nov 2 2009 Dan Walsh <dwalsh at redhat.com> 2.0.75-1
+- Update to upstream
+	* Factor out restoring logic from setfiles.c into restore.c
 
 * Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-15
 - Fix typo in seobject.py


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/sources,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- sources	17 Sep 2009 13:07:47 -0000	1.212
+++ sources	9 Dec 2009 21:34:46 -0000	1.213
@@ -1,3 +1,3 @@
-480cc64a050735fa1163a87dc89c4f49  sepolgen-1.0.17.tgz
-60aa41df668a557892296ff02c7411aa  policycoreutils-2.0.74.tgz
+96b2e73550b7e36daee0f5d347c8a95b  policycoreutils-2.0.78.tgz
+2ae1a9f7242e33413aae036d2edeb1d8  sepolgen-1.0.19.tgz
 59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2



From nalin at fedoraproject.org  Wed Dec  9 21:40:48 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed,  9 Dec 2009 21:40:48 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.219,1.220
Message-ID: <20091209214048.A33BF11C00E0@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7619

Modified Files:
	krb5.spec 
Log Message:
- re-enable this change:
  - try to make gss_krb5_copy_ccache() work correctly for spnego (#542868)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- krb5.spec	8 Dec 2009 20:51:25 -0000	1.219
+++ krb5.spec	9 Dec 2009 21:40:48 -0000	1.220
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 12%{?dist}
+Release: 13%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -216,10 +216,13 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Wed Dec  9 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-13
+- and put it back in
+
 * Tue Dec  8 2009 Nalin Dahyabhai <nalin at redhat.com>
 - back that last change out
 
-* Tue Dec  8 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-13
+* Tue Dec  8 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-12
 - try to make gss_krb5_copy_ccache() work correctly for spnego (#542868)
 
 * Fri Dec  4 2009 Nalin Dahyabhai <nalin at redhat.com>
@@ -1508,7 +1511,7 @@ popd
 %patch88 -p1 -b .sizeof
 %patch89 -p1 -b .largefile
 %patch90 -p0 -b .openssl-1.0
-#%patch91 -p1 -b .spnego-deleg
+%patch91 -p1 -b .spnego-deleg
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex



From myoung at fedoraproject.org  Wed Dec  9 21:44:25 2009
From: myoung at fedoraproject.org (myoung)
Date: Wed,  9 Dec 2009 21:44:25 +0000 (UTC)
Subject: rpms/kernel/devel acpi-ec-merge-irq-and-poll-modes.patch, NONE,
	1.1.2.1 acpi-ec-restart-command-even-if-no-interrupts-from-ec.patch, 
	NONE, 1.1.2.1 acpi-ec-use-burst-mode-only-for-msi-notebooks.patch,
	NONE, 1.1.2.1 dlm-fix-connection-close-handling.patch, NONE,
	1.1.2.1 drm-default-mode.patch, NONE,
	1.1.2.1 drm-i915-fix-sync-to-vbl-when-vga-is-off.patch, NONE,
	1.1.2.2 drm-i915-fix-tvmode-oops.patch, NONE,
	1.1.2.1 drm-next-b390f944.patch, NONE,
	1.1.2.1 drm-radeon-misc-fixes.patch, NONE,
	1.1.2.1 drm-radeon-rv410-test-fix.patch, NONE,
	1.1.2.1 ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch,
	NONE, 1.1.2.2 fbcon-lower-debug.patch, NONE,
	1.1.2.1 highmem-fix-arm-powerpc-kmap_types.patch, NONE,
	1.1.2.1 ipv4-fix-null-ptr-deref-in-ip_fragment.patch, NONE,
	1.1.2.1 linux-2.6-ath9k-fixes.patch, NONE,
	1.1.2.2 linux-2.6-iommu-another-hp-screwup.patch, NONE,
	1.1.2.1 linux-2.6-iommu-dmar-all-1s.patch, NONE,
	1.1.2.1 linux-2.6-iommu-hp-cantiga-resume.patch, NONE,
	1.1.2.1 linux-2.6-iommu-sanity-checks-for-intr-remap-too.patch,
	NONE, 1.1.2.1 linux-2.6.31-nfsd-proot.patch, NONE,
	1.1.2.1 sched-deal-with-low-load-in-wake-affine.patch, NONE, 1.1.2.1
	sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch,
	NONE, 1.1.2.1 sched-remove-shortcut-from-select-task-rq-fair.patch,
	NONE, 1.1.2.1 sched-retune-scheduler-latency-defaults.patch, NONE,
	1.1.2.1
	sched-update-the-clock-of-runqueue-select-task-rq-selected.patch,
	NONE, 1.1.2.1 Makefile, 1.97.6.10, 1.97.6.11 config-generic,
	1.238.6.46, 1.238.6.47 drm-nouveau.patch, 1.8.6.24,
	1.8.6.25 kernel.spec, 1.1294.2.80,
	1.1294.2.81 linux-2.6-execshield.patch, 1.102.6.3,
	1.102.6.4 linux-2.6-iommu-at-zero.patch, 1.1.2.1,
	1.1.2.2 lirc-2.6.31.patch, 1.2.2.4, 1.2.2.5
	sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch,
	1.2.2.2, 1.2.2.3 xen.pvops.patch, 1.1.2.50,
	1.1.2.51 xen.pvops.post.patch, 1.1.2.33,
	1.1.2.34 xen.pvops.pre.patch, 1.1.2.19,
	1.1.2.20 drm-disable-r600-aspm.patch, 1.1.2.1,
	NONE drm-next-ea1495a6.patch, 1.1.2.1,
	NONE drm-r600-lenovo-w500-fix.patch, 1.1.2.1,
	NONE drm-radeon-agp-font-fix.patch, 1.1.2.1,
	NONE drm-radeon-fix-agp-resume.patch, 1.1.2.1,
	NONE drm-radeon-fix-ring-rmw-issue.patch, 1.1.2.1,
	NONE linux-2.6-nfsd4-proots.patch, 1.1.2.4,
	NONE linux-2.6-sysrq-c.patch, 1.4, NONE
Message-ID: <20091209214425.A924611C00E0@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7863

Modified Files:
      Tag: private-myoung-dom0-branch
	Makefile config-generic drm-nouveau.patch kernel.spec 
	linux-2.6-execshield.patch linux-2.6-iommu-at-zero.patch 
	lirc-2.6.31.patch 
	sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch 
	xen.pvops.patch xen.pvops.post.patch xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	acpi-ec-merge-irq-and-poll-modes.patch 
	acpi-ec-restart-command-even-if-no-interrupts-from-ec.patch 
	acpi-ec-use-burst-mode-only-for-msi-notebooks.patch 
	dlm-fix-connection-close-handling.patch drm-default-mode.patch 
	drm-i915-fix-sync-to-vbl-when-vga-is-off.patch 
	drm-i915-fix-tvmode-oops.patch drm-next-b390f944.patch 
	drm-radeon-misc-fixes.patch drm-radeon-rv410-test-fix.patch 
	ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch 
	fbcon-lower-debug.patch 
	highmem-fix-arm-powerpc-kmap_types.patch 
	ipv4-fix-null-ptr-deref-in-ip_fragment.patch 
	linux-2.6-ath9k-fixes.patch 
	linux-2.6-iommu-another-hp-screwup.patch 
	linux-2.6-iommu-dmar-all-1s.patch 
	linux-2.6-iommu-hp-cantiga-resume.patch 
	linux-2.6-iommu-sanity-checks-for-intr-remap-too.patch 
	linux-2.6.31-nfsd-proot.patch 
	sched-deal-with-low-load-in-wake-affine.patch 
	sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch 
	sched-remove-shortcut-from-select-task-rq-fair.patch 
	sched-retune-scheduler-latency-defaults.patch 
	sched-update-the-clock-of-runqueue-select-task-rq-selected.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	drm-disable-r600-aspm.patch drm-next-ea1495a6.patch 
	drm-r600-lenovo-w500-fix.patch drm-radeon-agp-font-fix.patch 
	drm-radeon-fix-agp-resume.patch 
	drm-radeon-fix-ring-rmw-issue.patch 
	linux-2.6-nfsd4-proots.patch linux-2.6-sysrq-c.patch 
Log Message:
update to latest pvops patch


acpi-ec-merge-irq-and-poll-modes.patch:
 ec.c |  140 ++++++++++++++++++++++---------------------------------------------
 1 file changed, 46 insertions(+), 94 deletions(-)

--- NEW FILE acpi-ec-merge-irq-and-poll-modes.patch ---
From: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Sat, 29 Aug 2009 23:06:14 +0000 (+0400)
Subject: ACPI: EC: Merge IRQ and POLL modes
X-Git-Tag: v2.6.32-rc1~171^2~11^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2a84cb9852f52c0cd1c48bca41a8792d44ad06cc

ACPI: EC: Merge IRQ and POLL modes

In general, EC transaction should complete in less than 1ms, thus it is possible to merge wait for
1ms in poll mode and 1ms of interrupt transaction timeout.
Still, driver will wait 500ms for EC to complete transaction.

This significantly simplifies driver and makes it immune to problematic EC interrupt
implementations.

It also may lessen kernel start-up time by 500ms.

References: http://bugzilla.kernel.org/show_bug.cgi?id=12949

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 391f331..839b542 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -68,15 +68,13 @@ enum ec_command {
 #define ACPI_EC_DELAY		500	/* Wait 500ms max. during EC ops */
 #define ACPI_EC_UDELAY_GLK	1000	/* Wait 1ms max. to get global lock */
 #define ACPI_EC_CDELAY		10	/* Wait 10us before polling EC */
+#define ACPI_EC_MSI_UDELAY	550	/* Wait 550us for MSI EC */
 
 #define ACPI_EC_STORM_THRESHOLD 8	/* number of false interrupts
 					   per one transaction */
 
 enum {
 	EC_FLAGS_QUERY_PENDING,		/* Query is pending */
-	EC_FLAGS_GPE_MODE,		/* Expect GPE to be sent
-					 * for status change */
-	EC_FLAGS_NO_GPE,		/* Don't use GPE mode */
 	EC_FLAGS_GPE_STORM,		/* GPE storm detected */
 	EC_FLAGS_HANDLERS_INSTALLED	/* Handlers for GPE and
 					 * OpReg are installed */
@@ -170,7 +168,7 @@ static void start_transaction(struct acpi_ec *ec)
 	acpi_ec_write_cmd(ec, ec->curr->command);
 }
 
-static void gpe_transaction(struct acpi_ec *ec, u8 status)
+static void advance_transaction(struct acpi_ec *ec, u8 status)
 {
 	unsigned long flags;
 	spin_lock_irqsave(&ec->curr_lock, flags);
@@ -201,29 +199,6 @@ unlock:
 	spin_unlock_irqrestore(&ec->curr_lock, flags);
 }
 
-static int acpi_ec_wait(struct acpi_ec *ec)
-{
-	if (wait_event_timeout(ec->wait, ec_transaction_done(ec),
-			       msecs_to_jiffies(ACPI_EC_DELAY)))
-		return 0;
-	/* try restart command if we get any false interrupts */
-	if (ec->curr->irq_count &&
-	    (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF) == 0) {
-		pr_debug(PREFIX "controller reset, restart transaction\n");
-		start_transaction(ec);
-		if (wait_event_timeout(ec->wait, ec_transaction_done(ec),
-					msecs_to_jiffies(ACPI_EC_DELAY)))
-			return 0;
-	}
-	/* missing GPEs, switch back to poll mode */
-	if (printk_ratelimit())
-		pr_info(PREFIX "missing confirmations, "
-				"switch off interrupt mode.\n");
-	set_bit(EC_FLAGS_NO_GPE, &ec->flags);
-	clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
-	return 1;
-}
-
 static void acpi_ec_gpe_query(void *ec_cxt);
 
 static int ec_check_sci(struct acpi_ec *ec, u8 state)
@@ -236,43 +211,51 @@ static int ec_check_sci(struct acpi_ec *ec, u8 state)
 	return 0;
 }
 
-static void ec_delay(void)
-{
-	/* EC in MSI notebooks don't tolerate delays other than 550 usec */
-	if (EC_FLAGS_MSI)
-		udelay(ACPI_EC_DELAY);
-	else
-		/* Use shortest sleep available */
-		msleep(1);
-}
-
 static int ec_poll(struct acpi_ec *ec)
 {
-	unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
-	udelay(ACPI_EC_CDELAY);
-	while (time_before(jiffies, delay)) {
-		gpe_transaction(ec, acpi_ec_read_status(ec));
-		ec_delay();
-		if (ec_transaction_done(ec))
-			return 0;
+	unsigned long flags;
+	int repeat = 2; /* number of command restarts */
+	while (repeat--) {
+		unsigned long delay = jiffies +
+			msecs_to_jiffies(ACPI_EC_DELAY);
+		do {
+			/* don't sleep with disabled interrupts */
+			if (EC_FLAGS_MSI || irqs_disabled()) {
+				udelay(ACPI_EC_MSI_UDELAY);
+				if (ec_transaction_done(ec))
+					return 0;
+			} else {
+				if (wait_event_timeout(ec->wait,
+						ec_transaction_done(ec),
+						msecs_to_jiffies(1)))
+					return 0;
+			}
+			advance_transaction(ec, acpi_ec_read_status(ec));
+		} while (time_before(jiffies, delay));
+		if (!ec->curr->irq_count ||
+		    (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF))
+			break;
+		/* try restart command if we get any false interrupts */
+		pr_debug(PREFIX "controller reset, restart transaction\n");
+		spin_lock_irqsave(&ec->curr_lock, flags);
+		start_transaction(ec);
+		spin_unlock_irqrestore(&ec->curr_lock, flags);
 	}
 	return -ETIME;
 }
 
 static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
-					struct transaction *t,
-					int force_poll)
+					struct transaction *t)
 {
 	unsigned long tmp;
 	int ret = 0;
 	pr_debug(PREFIX "transaction start\n");
 	/* disable GPE during transaction if storm is detected */
 	if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
-		clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
 		acpi_disable_gpe(NULL, ec->gpe);
 	}
 	if (EC_FLAGS_MSI)
-		udelay(ACPI_EC_DELAY);
+		udelay(ACPI_EC_MSI_UDELAY);
 	/* start transaction */
 	spin_lock_irqsave(&ec->curr_lock, tmp);
 	/* following two actions should be kept atomic */
@@ -281,11 +264,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
 	if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
 		clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
 	spin_unlock_irqrestore(&ec->curr_lock, tmp);
-	/* if we selected poll mode or failed in GPE-mode do a poll loop */
-	if (force_poll ||
-	    !test_bit(EC_FLAGS_GPE_MODE, &ec->flags) ||
-	    acpi_ec_wait(ec))
-		ret = ec_poll(ec);
+	ret = ec_poll(ec);
 	pr_debug(PREFIX "transaction end\n");
 	spin_lock_irqsave(&ec->curr_lock, tmp);
 	ec->curr = NULL;
@@ -295,8 +274,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
 		ec_check_sci(ec, acpi_ec_read_status(ec));
 		/* it is safe to enable GPE outside of transaction */
 		acpi_enable_gpe(NULL, ec->gpe);
-	} else if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags) &&
-		   t->irq_count > ACPI_EC_STORM_THRESHOLD) {
+	} else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
 		pr_info(PREFIX "GPE storm detected, "
 			"transactions will use polling mode\n");
 		set_bit(EC_FLAGS_GPE_STORM, &ec->flags);
@@ -314,16 +292,14 @@ static int ec_wait_ibf0(struct acpi_ec *ec)
 {
 	unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
 	/* interrupt wait manually if GPE mode is not active */
-	unsigned long timeout = test_bit(EC_FLAGS_GPE_MODE, &ec->flags) ?
-		msecs_to_jiffies(ACPI_EC_DELAY) : msecs_to_jiffies(1);
 	while (time_before(jiffies, delay))
-		if (wait_event_timeout(ec->wait, ec_check_ibf0(ec), timeout))
+		if (wait_event_timeout(ec->wait, ec_check_ibf0(ec),
+					msecs_to_jiffies(1)))
 			return 0;
 	return -ETIME;
 }
 
-static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t,
-			       int force_poll)
+static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
 {
 	int status;
 	u32 glk;
@@ -345,7 +321,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t,
 		status = -ETIME;
 		goto end;
 	}
-	status = acpi_ec_transaction_unlocked(ec, t, force_poll);
+	status = acpi_ec_transaction_unlocked(ec, t);
 end:
 	if (ec->global_lock)
 		acpi_release_global_lock(glk);
@@ -365,7 +341,7 @@ static int acpi_ec_burst_enable(struct acpi_ec *ec)
 				.wdata = NULL, .rdata = &d,
 				.wlen = 0, .rlen = 1};
 
-	return acpi_ec_transaction(ec, &t, 0);
+	return acpi_ec_transaction(ec, &t);
 }
 
 static int acpi_ec_burst_disable(struct acpi_ec *ec)
@@ -375,7 +351,7 @@ static int acpi_ec_burst_disable(struct acpi_ec *ec)
 				.wlen = 0, .rlen = 0};
 
 	return (acpi_ec_read_status(ec) & ACPI_EC_FLAG_BURST) ?
-				acpi_ec_transaction(ec, &t, 0) : 0;
+				acpi_ec_transaction(ec, &t) : 0;
 }
 
 static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
@@ -386,7 +362,7 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
 				.wdata = &address, .rdata = &d,
 				.wlen = 1, .rlen = 1};
 
-	result = acpi_ec_transaction(ec, &t, 0);
+	result = acpi_ec_transaction(ec, &t);
 	*data = d;
 	return result;
 }
@@ -398,7 +374,7 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
 				.wdata = wdata, .rdata = NULL,
 				.wlen = 2, .rlen = 0};
 
-	return acpi_ec_transaction(ec, &t, 0);
+	return acpi_ec_transaction(ec, &t);
 }
 
 /*
@@ -466,7 +442,7 @@ int ec_transaction(u8 command,
 	if (!first_ec)
 		return -ENODEV;
 
-	return acpi_ec_transaction(first_ec, &t, force_poll);
+	return acpi_ec_transaction(first_ec, &t);
 }
 
 EXPORT_SYMBOL(ec_transaction);
@@ -487,7 +463,7 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
 	 * bit to be cleared (and thus clearing the interrupt source).
 	 */
 
-	result = acpi_ec_transaction(ec, &t, 0);
+	result = acpi_ec_transaction(ec, &t);
 	if (result)
 		return result;
 
@@ -570,28 +546,10 @@ static u32 acpi_ec_gpe_handler(void *data)
 	pr_debug(PREFIX "~~~> interrupt\n");
 	status = acpi_ec_read_status(ec);
 
-	if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags)) {
-		gpe_transaction(ec, status);
-		if (ec_transaction_done(ec) &&
-		    (status & ACPI_EC_FLAG_IBF) == 0)
-			wake_up(&ec->wait);
-	}
-
+	advance_transaction(ec, status);
+	if (ec_transaction_done(ec) && (status & ACPI_EC_FLAG_IBF) == 0)
+		wake_up(&ec->wait);
 	ec_check_sci(ec, status);
-	if (!test_bit(EC_FLAGS_GPE_MODE, &ec->flags) &&
-	    !test_bit(EC_FLAGS_NO_GPE, &ec->flags)) {
-		/* this is non-query, must be confirmation */
-		if (!test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
-			if (printk_ratelimit())
-				pr_info(PREFIX "non-query interrupt received,"
-					" switching to interrupt mode\n");
-		} else {
-			/* hush, STORM switches the mode every transaction */
-			pr_debug(PREFIX "non-query interrupt received,"
-				" switching to interrupt mode\n");
-		}
-		set_bit(EC_FLAGS_GPE_MODE, &ec->flags);
-	}
 	return ACPI_INTERRUPT_HANDLED;
 }
 
@@ -837,8 +795,6 @@ static int acpi_ec_add(struct acpi_device *device)
 	acpi_ec_add_fs(device);
 	pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
 			  ec->gpe, ec->command_addr, ec->data_addr);
-	pr_info(PREFIX "driver started in %s mode\n",
-		(test_bit(EC_FLAGS_GPE_MODE, &ec->flags))?"interrupt":"poll");
 	return 0;
 }
 
@@ -1054,8 +1010,6 @@ static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
 {
 	struct acpi_ec *ec = acpi_driver_data(device);
 	/* Stop using GPE */
-	set_bit(EC_FLAGS_NO_GPE, &ec->flags);
-	clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
 	acpi_disable_gpe(NULL, ec->gpe);
 	return 0;
 }
@@ -1064,8 +1018,6 @@ static int acpi_ec_resume(struct acpi_device *device)
 {
 	struct acpi_ec *ec = acpi_driver_data(device);
 	/* Enable use of GPE back */
-	clear_bit(EC_FLAGS_NO_GPE, &ec->flags);
-	set_bit(EC_FLAGS_GPE_MODE, &ec->flags);
 	acpi_enable_gpe(NULL, ec->gpe);
 	return 0;
 }

acpi-ec-restart-command-even-if-no-interrupts-from-ec.patch:
 ec.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE acpi-ec-restart-command-even-if-no-interrupts-from-ec.patch ---
From: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Thu, 1 Oct 2009 22:53:15 +0000 (+0400)
Subject: ACPI: EC: Restart command even if no interrupts from EC
X-Git-Tag: v2.6.32-rc3~4^2~2^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e12ac3d018dd8f20a075f552020

ACPI: EC: Restart command even if no interrupts from EC

EC may forget a command without sending any "reset" interrupt,
thus we need to lessen the requirement for transaction restart.

Reference: http://bugzilla.kernel.org/show_bug.cgi?id=14247
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 f707960..8a4897d 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -232,10 +232,8 @@ static int ec_poll(struct acpi_ec *ec)
 			}
 			advance_transaction(ec, acpi_ec_read_status(ec));
 		} while (time_before(jiffies, delay));
-		if (!ec->curr->irq_count ||
-		    (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF))
+		if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF)
 			break;
-		/* try restart command if we get any false interrupts */
 		pr_debug(PREFIX "controller reset, restart transaction\n");
 		spin_lock_irqsave(&ec->curr_lock, flags);
 		start_transaction(ec);

acpi-ec-use-burst-mode-only-for-msi-notebooks.patch:
 ec.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE acpi-ec-use-burst-mode-only-for-msi-notebooks.patch ---
From: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri, 28 Aug 2009 19:29:44 +0000 (+0400)
Subject: ACPI: EC: use BURST mode only for MSI notebooks
X-Git-Tag: v2.6.32-rc1~171^2~11^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6a63b06f3c494cc87eade97f081300bda60acec7

ACPI: EC: use BURST mode only for MSI notebooks

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 839b542..788db78 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -575,7 +575,8 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
 	if (bits != 8 && acpi_strict)
 		return AE_BAD_PARAMETER;
 
-	acpi_ec_burst_enable(ec);
+	if (EC_FLAGS_MSI)
+		acpi_ec_burst_enable(ec);
 
 	if (function == ACPI_READ) {
 		result = acpi_ec_read(ec, address, &temp);
@@ -596,7 +597,8 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
 		}
 	}
 
-	acpi_ec_burst_disable(ec);
+	if (EC_FLAGS_MSI)
+		acpi_ec_burst_disable(ec);
 
 	switch (result) {
 	case -EINVAL:

dlm-fix-connection-close-handling.patch:
 lowcomms.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE dlm-fix-connection-close-handling.patch ---
From: Lars Marowsky-Bree <lmb at suse.de>
Date: Tue, 11 Aug 2009 21:18:23 +0000 (-0500)
Subject: dlm: fix connection close handling
X-Git-Tag: v2.6.32-rc1~646^2~1
X-Git-Url: http://git.kernel.org/gitweb.cgi?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=063c4c99630c0b06afad080d2a18bda64172c1a2

dlm: fix connection close handling

Closing a connection to a node can create problems if there are
outstanding messages for that node.  The problems include dlm_send
spinning attempting to reconnect, or BUG from tcp_connect_to_sock()
attempting to use a partially closed connection.

To cleanly close a connection, we now first attempt to send any pending
messages, cancel any remaining workqueue work, and flag the connection
as closed to avoid reconnect attempts.

Signed-off-by: Lars Marowsky-Bree <lmb at suse.de>
Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>
Signed-off-by: David Teigland <teigland at redhat.com>
---

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 210d52c..bda690c 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -106,6 +106,7 @@ struct connection {
 #define CF_CONNECT_PENDING 3
 #define CF_INIT_PENDING 4
 #define CF_IS_OTHERCON 5
+#define CF_CLOSE 6
 	struct list_head writequeue;  /* List of outgoing writequeue_entries */
 	spinlock_t writequeue_lock;
 	int (*rx_action) (struct connection *);	/* What to do when active */
@@ -299,6 +300,8 @@ static void lowcomms_write_space(struct sock *sk)
 
 static inline void lowcomms_connect_sock(struct connection *con)
 {
+	if (test_bit(CF_CLOSE, &con->flags))
+		return;
 	if (!test_and_set_bit(CF_CONNECT_PENDING, &con->flags))
 		queue_work(send_workqueue, &con->swork);
 }
@@ -1368,6 +1371,13 @@ int dlm_lowcomms_close(int nodeid)
 	log_print("closing connection to node %d", nodeid);
 	con = nodeid2con(nodeid, 0);
 	if (con) {
+		clear_bit(CF_CONNECT_PENDING, &con->flags);
+		clear_bit(CF_WRITE_PENDING, &con->flags);
+		set_bit(CF_CLOSE, &con->flags);
+		if (cancel_work_sync(&con->swork))
+			log_print("canceled swork for node %d", nodeid);
+		if (cancel_work_sync(&con->rwork))
+			log_print("canceled rwork for node %d", nodeid);
 		clean_one_writequeue(con);
 		close_connection(con, true);
 	}
@@ -1393,9 +1403,10 @@ static void process_send_sockets(struct work_struct *work)
 
 	if (test_and_clear_bit(CF_CONNECT_PENDING, &con->flags)) {
 		con->connect_action(con);
+		set_bit(CF_WRITE_PENDING, &con->flags);
 	}
-	clear_bit(CF_WRITE_PENDING, &con->flags);
-	send_to_sock(con);
+	if (test_and_clear_bit(CF_WRITE_PENDING, &con->flags))
+		send_to_sock(con);
 }
 
 

drm-default-mode.patch:
 drm_crtc_helper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE drm-default-mode.patch ---
diff -up linux-2.6.31.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx linux-2.6.31.noarch/drivers/gpu/drm/drm_crtc_helper.c
--- linux-2.6.31.noarch/drivers/gpu/drm/drm_crtc_helper.c.jx	2009-11-23 13:33:35.000000000 -0500
+++ linux-2.6.31.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-11-23 13:34:38.000000000 -0500
@@ -109,7 +109,7 @@ int drm_helper_probe_single_connector_mo
 
 	count = (*connector_funcs->get_modes)(connector);
 	if (!count) {
-		count = drm_add_modes_noedid(connector, 800, 600);
+		count = drm_add_modes_noedid(connector, 1024, 768);
 		if (!count)
 			return 0;
 	}

drm-i915-fix-sync-to-vbl-when-vga-is-off.patch:
 drivers/gpu/drm/drm_irq.c            |   34 ++++++++++++++++++++++++++--------
 drivers/gpu/drm/i915/intel_display.c |    1 +
 include/drm/drmP.h                   |    1 +
 3 files changed, 28 insertions(+), 8 deletions(-)

--- NEW FILE drm-i915-fix-sync-to-vbl-when-vga-is-off.patch ---
>From patchwork Mon Nov  9 04:51:22 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: drm/i915: Fix sync to vblank when VGA output is turned off
Date: Mon, 09 Nov 2009 04:51:22 -0000
From: Li Peng <peng.li at linux.intel.com>
X-Patchwork-Id: 58658

In current vblank-wait implementation, if we turn off VGA output,
drm_wait_vblank will still wait on the disabled pipe until timeout,
because vblank on the pipe is assumed be enabled. This would cause
slow system response on some system such as moblin.

This patch resolve the issue by adding a drm helper function
drm_vblank_off which explicitly clear vblank_enabled[crtc], wake up
any waiting queue and save last vblank counter before turning off
crtc. It also slightly change drm_vblank_get to ensure that we will
will return immediately if trying to wait on a disabled pipe.

Signed-off-by: Li Peng <peng.li at intel.com>
Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

---
drivers/gpu/drm/drm_irq.c            |   34 ++++++++++++++++++++++++++--------
 drivers/gpu/drm/i915/intel_display.c |    1 +
 include/drm/drmP.h                   |    1 +
 3 files changed, 28 insertions(+), 8 deletions(-)

diff -Nur linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c linux-2.6.31.noarch~/drivers/gpu/drm/drm_irq.c
--- linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c	2009-11-30 14:08:56.000000000 -0500
+++ linux-2.6.31.noarch~/drivers/gpu/drm/drm_irq.c	2009-11-30 14:08:23.000000000 -0500
@@ -429,15 +429,21 @@
 
 	spin_lock_irqsave(&dev->vbl_lock, irqflags);
 	/* Going from 0->1 means we have to enable interrupts again */
-	if (atomic_add_return(1, &dev->vblank_refcount[crtc]) == 1 &&
-	    !dev->vblank_enabled[crtc]) {
-		ret = dev->driver->enable_vblank(dev, crtc);
-		DRM_DEBUG("enabling vblank on crtc %d, ret: %d\n", crtc, ret);
-		if (ret)
+	if (atomic_add_return(1, &dev->vblank_refcount[crtc]) == 1) {
+		if (!dev->vblank_enabled[crtc]) {
+			ret = dev->driver->enable_vblank(dev, crtc);
+			DRM_DEBUG("enabling vblank on crtc %d, ret: %d\n", crtc, ret);
+			if (ret)
+				atomic_dec(&dev->vblank_refcount[crtc]);
+			else {
+				dev->vblank_enabled[crtc] = 1;
+				drm_update_vblank_count(dev, crtc);
+			}
+		}
+	} else {
+		if (!dev->vblank_enabled[crtc]) {
 			atomic_dec(&dev->vblank_refcount[crtc]);
-		else {
-			dev->vblank_enabled[crtc] = 1;
-			drm_update_vblank_count(dev, crtc);
+			ret = -EINVAL;
 		}
 	}
 	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
@@ -464,6 +470,18 @@
 }
 EXPORT_SYMBOL(drm_vblank_put);
 
+void drm_vblank_off(struct drm_device *dev, int crtc)
+{
+	unsigned long irqflags;
+
+	spin_lock_irqsave(&dev->vbl_lock, irqflags);
+	DRM_WAKEUP(&dev->vbl_queue[crtc]);
+	dev->vblank_enabled[crtc] = 0;
+	dev->last_vblank[crtc] = dev->driver->get_vblank_counter(dev, crtc);
+	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+}
+EXPORT_SYMBOL(drm_vblank_off);
+
 /**
  * drm_vblank_pre_modeset - account for vblanks across mode sets
  * @dev: DRM device
diff -Nur linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c linux-2.6.31.noarch~/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c	2009-11-30 14:08:56.000000000 -0500
+++ linux-2.6.31.noarch~/drivers/gpu/drm/i915/intel_display.c	2009-11-30 14:08:23.000000000 -0500
@@ -1599,6 +1599,7 @@
 		intel_update_watermarks(dev);
 		/* Give the overlay scaler a chance to disable if it's on this pipe */
 		//intel_crtc_dpms_video(crtc, FALSE); TODO
+		drm_vblank_off(dev, pipe);
 
 		/* Disable the VGA plane that we never use */
 		i915_disable_vga(dev);
diff -Nur linux-2.6.31.noarch/include/drm/drmP.h linux-2.6.31.noarch~/include/drm/drmP.h
--- linux-2.6.31.noarch/include/drm/drmP.h	2009-11-30 14:08:56.000000000 -0500
+++ linux-2.6.31.noarch~/include/drm/drmP.h	2009-11-30 14:08:23.000000000 -0500
@@ -1295,6 +1295,7 @@
 extern void drm_handle_vblank(struct drm_device *dev, int crtc);
 extern int drm_vblank_get(struct drm_device *dev, int crtc);
 extern void drm_vblank_put(struct drm_device *dev, int crtc);
+extern void drm_vblank_off(struct drm_device *dev, int crtc);
 extern void drm_vblank_cleanup(struct drm_device *dev);
 /* Modesetting support */
 extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);

drm-i915-fix-tvmode-oops.patch:
 intel_tv.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

--- NEW FILE drm-i915-fix-tvmode-oops.patch ---
From: Chris Wilson <chris at chris-wilson.co.uk>
To: stable at kernel.org
Cc: Chris Wilson <chris at chris-wilson.co.uk>, David Woodhouse <dwmw2 at infradead.org>, Zhenyu Wang <zhenyu.z.wang at intel.com>
Subject: [PATCH] drm/i915: Avoid NULL dereference with component_only tv_modes
Date: Fri, 27 Nov 2009 14:22:04 +0000
Message-Id: <1259331724-6646-1-git-send-email-chris at chris-wilson.co.uk>

In commit d2d9f2324, the guard for a valid video mode was removed. This
caused the regression:

  kernel crash during kms graphic boot on Intel GM4500 platform
  https://bugzilla.redhat.com/show_bug.cgi?id=540218

This patches changes the logic slightly not to rely on a coupled
variable, but to just check whether the video_modes is valid before
dereferencing.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: David Woodhouse <dwmw2 at infradead.org>
Cc: Zhenyu Wang <zhenyu.z.wang at intel.com>
[ickle: Actually reference the correct bug report]
---
 drivers/gpu/drm/i915/intel_tv.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index a0e4bc4..d7465ca 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1213,20 +1213,17 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
 		tv_ctl |= TV_TRILEVEL_SYNC;
 	if (tv_mode->pal_burst)
 		tv_ctl |= TV_PAL_BURST;
+
 	scctl1 = 0;
-	/* dda1 implies valid video levels */
-	if (tv_mode->dda1_inc) {
+	if (tv_mode->dda1_inc)
 		scctl1 |= TV_SC_DDA1_EN;
-	}
-
 	if (tv_mode->dda2_inc)
 		scctl1 |= TV_SC_DDA2_EN;
-
 	if (tv_mode->dda3_inc)
 		scctl1 |= TV_SC_DDA3_EN;
-
 	scctl1 |= tv_mode->sc_reset;
-	scctl1 |= video_levels->burst << TV_BURST_LEVEL_SHIFT;
+	if (video_levels)
+		scctl1 |= video_levels->burst << TV_BURST_LEVEL_SHIFT;
 	scctl1 |= tv_mode->dda1_inc << TV_SCDDA1_INC_SHIFT;
 
 	scctl2 = tv_mode->dda2_size << TV_SCDDA2_SIZE_SHIFT |
-- 
1.6.5.3



drm-next-b390f944.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  308 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  557 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 | 1030 
 b/drivers/gpu/drm/drm_gem.c                       |   13 
 b/drivers/gpu/drm/drm_mm.c                        |   30 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   65 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  139 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  608 
 b/drivers/gpu/drm/i915/intel_drv.h                |    9 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  748 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  239 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atom.c                   |    1 
 b/drivers/gpu/drm/radeon/atombios.h               |   13 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  366 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1768 +
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  714 
 b/drivers/gpu/drm/radeon/r200.c                   |  454 
 b/drivers/gpu/drm/radeon/r300.c                   |  985 
 b/drivers/gpu/drm/radeon/r300d.h                  |  306 
 b/drivers/gpu/drm/radeon/r420.c                   |  305 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r500_reg.h               |   12 
 b/drivers/gpu/drm/radeon/r520.c                   |  286 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1847 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  858 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  783 
 b/drivers/gpu/drm/radeon/r600d.h                  |  667 
 b/drivers/gpu/drm/radeon/radeon.h                 |  454 
 b/drivers/gpu/drm/radeon/radeon_agp.c             |   12 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  386 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  434 
 b/drivers/gpu/drm/radeon/radeon_benchmark.c       |    4 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   46 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   28 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |  717 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  751 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  104 
 b/drivers/gpu/drm/radeon/radeon_cursor.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  352 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  193 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  309 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  701 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |   29 
 b/drivers/gpu/drm/radeon/radeon_gem.c             |   10 
 b/drivers/gpu/drm/radeon/radeon_i2c.c             |  109 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |   16 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |  152 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  505 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |  170 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   28 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_pm.c              |   65 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |  126 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_test.c            |    6 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |  101 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs100d.h                 |   40 
 b/drivers/gpu/drm/radeon/rs400.c                  |  331 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  610 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  359 
 b/drivers/gpu/drm/radeon/rs690d.h                 |  307 
 b/drivers/gpu/drm/radeon/rv200d.h                 |   36 
 b/drivers/gpu/drm/radeon/rv250d.h                 |  123 
 b/drivers/gpu/drm/radeon/rv350d.h                 |   52 
 b/drivers/gpu/drm/radeon/rv515.c                  |  882 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1063 -
 b/drivers/gpu/drm/radeon/rv770d.h                 |  346 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    6 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  105 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |   10 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  111 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_pciids.h                        |    4 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs690r.h                   |   99 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 189 files changed, 42507 insertions(+), 44062 deletions(-)

--- NEW FILE drm-next-b390f944.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d..e4d971c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
 	  details.  You should also select and configure AGP
 	  (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+	tristate
+	depends on DRM
+	select FB
+	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	help
+	  FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
 	tristate
 	depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
 	tristate "ATI Rage 128"
 	depends on DRM && PCI
+	select FW_LOADER
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
 	  is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
+	select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
 	help
 	  Choose this option if you have an ATI Radeon graphics card.  There
 	  are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
-	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	# i915 depends on ACPI_VIDEO when ACPI is enabled
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 	select VIDEO_OUTPUT_CONTROL if ACPI
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
+	select FW_LOADER
 	help
 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
 	  card.  If M is selected, the module will be called mga.  AGP
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index fe23f29..3c8827a 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -10,11 +10,15 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
 		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-		drm_info.o drm_debugfs.o
+		drm_crtc.o drm_modes.o drm_edid.o \
+		drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)	+= drm.o
 obj-$(CONFIG_DRM_TTM)	+= ttm/
 obj-$(CONFIG_DRM_TDFX)	+= tdfx/
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 6246e3f..3d09e30 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -310,10 +310,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 			  (unsigned long long)map->offset, map->size);
 
 		break;
+	}
 	case _DRM_GEM:
-		DRM_ERROR("tried to rmmap GEM object\n");
+		DRM_ERROR("tried to addmap GEM object\n");
 		break;
-	}
 	case _DRM_SCATTER_GATHER:
 		if (!dev->sg) {
 			kfree(map);
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 0e994a0..0e3bd5b 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -45,6 +45,23 @@ drm_clflush_page(struct page *page)
 		clflush(page_virtual + i);
 	kunmap_atomic(page_virtual, KM_USER0);
 }
+
+static void drm_cache_flush_clflush(struct page *pages[],
+				    unsigned long num_pages)
+{
+	unsigned long i;
+
+	mb();
+	for (i = 0; i < num_pages; i++)
+		drm_clflush_page(*pages++);
+	mb();
+}
+
+static void
+drm_clflush_ipi_handler(void *null)
+{
+	wbinvd();
+}
 #endif
 
 void
@@ -53,17 +70,30 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 #if defined(CONFIG_X86)
 	if (cpu_has_clflush) {
-		unsigned long i;
-
-		mb();
-		for (i = 0; i < num_pages; ++i)
-			drm_clflush_page(*pages++);
-		mb();
-
+		drm_cache_flush_clflush(pages, num_pages);
 		return;
 	}
 
-	wbinvd();
+	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
+		printk(KERN_ERR "Timed out waiting for cache flush.\n");
+
+#elif defined(__powerpc__)
+	unsigned long i;
+	for (i = 0; i < num_pages; i++) {
+		struct page *page = pages[i];
+		void *page_virtual;
+
+		if (unlikely(page == NULL))
+			continue;
+
+		page_virtual = kmap_atomic(page, KM_USER0);
+		flush_dcache_range((unsigned long)page_virtual,
+				   (unsigned long)page_virtual + PAGE_SIZE);
+		kunmap_atomic(page_virtual, KM_USER0);
+	}
+#else
+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+	WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2f631c7..5cae0b3 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-	{ DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-	{ DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-	{ DRM_MODE_SCALE_NO_SCALE, "No scale" },
-	{ DRM_MODE_SCALE_ASPECT, "Aspect" },
+	{ DRM_MODE_SCALE_NONE, "None" },
+	{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
+	{ DRM_MODE_SCALE_CENTER, "Center" },
+	{ DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
 
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
+	{ DRM_MODE_SUBCONNECTOR_SCART,     "SCART"     }, /* TV-out */
 };
[...95922 lines suppressed...]
+ */
+
+struct ttm_bo_global {
+
+	/**
+	 * Constant after init.
+	 */
+
+	struct kobject kobj;
+	struct ttm_mem_global *mem_glob;
+	struct page *dummy_read_page;
+	struct ttm_mem_shrink shrink;
+	size_t ttm_bo_extra_size;
+	size_t ttm_bo_size;
+	struct mutex device_list_mutex;
+	spinlock_t lru_lock;
+
+	/**
+	 * Protected by device_list_mutex.
+	 */
+	struct list_head device_list;
+
+	/**
+	 * Protected by the lru_lock.
+	 */
+	struct list_head swap_lru;
+
+	/**
+	 * Internal protection.
+	 */
+	atomic_t bo_count;
+};
+
+
+#define TTM_NUM_MEM_TYPES 8
+
+#define TTM_BO_PRIV_FLAG_MOVING  0	/* Buffer object is moving and needs
+					   idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
  * @man: An array of mem_type_managers.
  * @addr_space_mm: Range manager for the device address space.
  * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
 	/*
 	 * Constant after bo device init / atomic.
 	 */
-
-	struct ttm_mem_global *mem_glob;
+	struct list_head device_list;
+	struct ttm_bo_global *glob;
 	struct ttm_bo_driver *driver;
-	struct page *dummy_read_page;
-	struct ttm_mem_shrink shrink;
-
-	size_t ttm_bo_extra_size;
-	size_t ttm_bo_size;
-
 	rwlock_t vm_lock;
+	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by the vm lock.
 	 */
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
 	struct rb_root addr_space_rb;
 	struct drm_mm addr_space_mm;
 
 	/*
-	 * Might want to change this to one lock per manager.
-	 */
-	spinlock_t lru_lock;
-	/*
-	 * Protected by the lru lock.
+	 * Protected by the global:lru lock.
 	 */
 	struct list_head ddestroy;
-	struct list_head swap_lru;
 
 	/*
 	 * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
 			     unsigned long *bus_offset,
 			     unsigned long *bus_size);
 
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
+
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
  * !0: Failure.
  */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-			      struct ttm_mem_global *mem_glob,
+			      struct ttm_bo_global *glob,
 			      struct ttm_bo_driver *driver,
 			      uint64_t file_page_offset, bool need_dma32);
 
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index d8b8f04..6983a7c 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 
 /**
  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
  * @queue: Wait queue for processes suspended waiting for memory.
  * @lock: Lock to protect the @shrink - and the memory accounting members,
  * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
- * @max_memory: Lowmem memory limit available for non-root.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
- * @used_memory: Currently used lowmem memory.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
+ * @zones: Array of pointers to accounting zones.
+ * @num_zones: Number of populated entries in the @zones array.
+ * @zone_kernel: Pointer to the kernel zone.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
  *
  * Note that this structure is not per device. It should be global for all
  * graphics devices.
  */
 
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+	struct kobject kobj;
 	struct ttm_mem_shrink *shrink;
 	struct workqueue_struct *swap_queue;
 	struct work_struct work;
 	wait_queue_head_t queue;
 	spinlock_t lock;
-	uint64_t emer_memory;
-	uint64_t max_memory;
-	uint64_t swap_limit;
-	uint64_t used_memory;
-	uint64_t used_total_memory;
-	uint64_t total_memory_swap_limit;
-	uint64_t max_total_memory;
-	uint64_t emer_total_memory;
+	struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
+	unsigned int num_zones;
+	struct ttm_mem_zone *zone_kernel;
+#ifdef CONFIG_HIGHMEM
+	struct ttm_mem_zone *zone_highmem;
+#else
+	struct ttm_mem_zone *zone_dma32;
+#endif
 };
 
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-				bool no_wait, bool interruptible, bool himem);
+				bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-				uint64_t amount, bool himem);
+				uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+				     struct page *page,
+				     bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+				     struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h
index d1d4338..cf416ae 100644
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
+struct kobject;
 
 #define TTM_PFX "[TTM] "
 
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 
 #endif /* _TTM_MODULE_H_ */

drm-radeon-misc-fixes.patch:
 b/drivers/gpu/drm/radeon/radeon_connectors.c  |    6 ++++++
 b/drivers/gpu/drm/radeon/radeon_encoders.c    |    4 ++--
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c |   11 ++++-------
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c   |   23 ++++++++++++-----------
 4 files changed, 24 insertions(+), 20 deletions(-)

--- NEW FILE drm-radeon-misc-fixes.patch ---
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index ec2f3ff..7ab3c50 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1053,6 +1053,9 @@ radeon_add_atom_connector(struct drm_device *dev,
 			drm_connector_attach_property(&radeon_connector->base,
 						      rdev->mode_info.load_detect_property,
 						      1);
+			drm_connector_attach_property(&radeon_connector->base,
+						      rdev->mode_info.tv_std_property,
+						      1);
 		}
 		break;
 	case DRM_MODE_CONNECTOR_LVDS:
@@ -1193,6 +1196,9 @@ radeon_add_legacy_connector(struct drm_device *dev,
 			drm_connector_attach_property(&radeon_connector->base,
 						      rdev->mode_info.load_detect_property,
 						      1);
+			drm_connector_attach_property(&radeon_connector->base,
+						      rdev->mode_info.tv_std_property,
+						      1);
 		}
 		break;
 	case DRM_MODE_CONNECTOR_LVDS:
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index c27f6bd..291f6dd 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -950,12 +950,12 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
 	if (is_dig) {
 		switch (mode) {
 		case DRM_MODE_DPMS_ON:
-			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE);
+			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT);
 			break;
 		case DRM_MODE_DPMS_STANDBY:
 		case DRM_MODE_DPMS_SUSPEND:
 		case DRM_MODE_DPMS_OFF:
-			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE);
+			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT);
 			break;
 		}
 	} else {
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 6634769..c5c5c02 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -647,12 +647,8 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
 		uint32_t crtc2_gen_cntl;
 		uint32_t disp2_merge_cntl;
 
-		/* check to see if TV DAC is enabled for another crtc and keep it enabled */
-		if (RREG32(RADEON_CRTC2_GEN_CNTL) & RADEON_CRTC2_CRT2_ON)
-			crtc2_gen_cntl = RADEON_CRTC2_CRT2_ON;
-		else
-			crtc2_gen_cntl = 0;
-
+		/* if TV DAC is enabled for another crtc and keep it enabled */
+		crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL) & 0x00718080;
 		crtc2_gen_cntl |= ((format << 8)
 				   | RADEON_CRTC2_VSYNC_DIS
 				   | RADEON_CRTC2_HSYNC_DIS
@@ -681,7 +677,8 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
 		uint32_t crtc_ext_cntl;
 		uint32_t disp_merge_cntl;
 
-		crtc_gen_cntl = (RADEON_CRTC_EXT_DISP_EN
+		crtc_gen_cntl = RREG32(RADEON_CRTC_GEN_CNTL) & 0x00718000;
+		crtc_gen_cntl |= (RADEON_CRTC_EXT_DISP_EN
 				 | (format << 8)
 				 | RADEON_CRTC_DISP_REQ_EN_B
 				 | ((mode->flags & DRM_MODE_FLAG_DBLSCAN)
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index c1e1706..6f3ff8b 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -796,18 +796,20 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
 				pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
 			if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) {
-				struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-				struct radeon_encoder_lvds *lvds = (struct radeon_encoder_lvds *)radeon_encoder->enc_priv;
-				if (lvds) {
-					if (lvds->use_bios_dividers) {
-						pll_ref_div = lvds->panel_ref_divider;
-						pll_fb_post_div   = (lvds->panel_fb_divider |
-								     (lvds->panel_post_divider << 16));
-						htotal_cntl  = 0;
-						use_bios_divs = true;
+				if (!rdev->is_atom_bios) {
+					struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+					struct radeon_encoder_lvds *lvds = (struct radeon_encoder_lvds *)radeon_encoder->enc_priv;
+					if (lvds) {
+						if (lvds->use_bios_dividers) {
+							pll_ref_div = lvds->panel_ref_divider;
+							pll_fb_post_div   = (lvds->panel_fb_divider |
+									     (lvds->panel_post_divider << 16));
+							htotal_cntl  = 0;
+							use_bios_divs = true;
+						}
 					}
+					pll_flags |= RADEON_PLL_USE_REF_DIV;
 				}
-				pll_flags |= RADEON_PLL_USE_REF_DIV;
 			}
 		}
 	}
-- 
1.5.6.3


drm-radeon-rv410-test-fix.patch:
 atombios_crtc.c          |    4 ----
 radeon_legacy_encoders.c |    4 ----
 2 files changed, 8 deletions(-)

--- NEW FILE drm-radeon-rv410-test-fix.patch ---
>From 5eecd2f0071edd335977b1ce15fd73b804f17e3c Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher at gmail.com>
Date: Wed, 2 Dec 2009 17:56:41 -0500
Subject: [PATCH] drm/radeon/kms: further r4xx lvds fixes

- Let the driver calculate the ref div
- Use the driver programmed pll dividers

Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
---
 drivers/gpu/drm/radeon/atombios_crtc.c          |    4 ----
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c |    3 ---
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 89ac438..7a8cd93 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -457,10 +457,6 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 				if (encoder->encoder_type !=
 				    DRM_MODE_ENCODER_DAC)
 					pll_flags |= RADEON_PLL_NO_ODD_POST_DIV;
-				if (!ASIC_IS_AVIVO(rdev)
-				    && (encoder->encoder_type ==
-					DRM_MODE_ENCODER_LVDS))
-					pll_flags |= RADEON_PLL_USE_REF_DIV;
 			}
 			radeon_encoder = to_radeon_encoder(encoder);
 			break;
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index df00515..7c7c009 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -181,9 +181,6 @@ static void radeon_legacy_lvds_mode_set(struct drm_encoder *encoder,
 	WREG32(RADEON_LVDS_PLL_CNTL, lvds_pll_cntl);
 	WREG32(RADEON_LVDS_SS_GEN_CNTL, lvds_ss_gen_cntl);
 
-	if (rdev->family == CHIP_RV410)
-		WREG32(RADEON_CLOCK_CNTL_INDEX, 0);
-
 	if (rdev->is_atom_bios)
 		radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id);
 	else
-- 
1.5.6.3


ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch:
 ioctl.c       |   33 ++++++++++++++++++++-------------
 move_extent.c |    7 +++++++
 2 files changed, 27 insertions(+), 13 deletions(-)

--- NEW FILE ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch ---
>From 910123ba363623f15ffb5d05dd87bdf06d08c609 Mon Sep 17 00:00:00 2001
From: Akira Fujita <a-fujita at rs.jp.nec.com>
Date: Sun, 6 Dec 2009 23:38:31 -0500
Subject: [PATCH] ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT

This patch fixes three problems in the handling of the
EXT4_IOC_MOVE_EXT ioctl:

1. In current EXT4_IOC_MOVE_EXT, there are read access mode checks for
original and donor files, but they allow the illegal write access to
donor file, since donor file is overwritten by original file data.  To
fix this problem, change access mode checks of original (r->r/w) and
donor (r->w) files.

2.  Disallow the use of donor files that have a setuid or setgid bits.

3.  Call mnt_want_write() and mnt_drop_write() before and after
ext4_move_extents() calling to get write access to a mount.

Signed-off-by: Akira Fujita <a-fujita at rs.jp.nec.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---

 fs/ext4/ioctl.c       |   28 ++++++++++++++++++----------
 fs/ext4/move_extent.c |    7 +++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 7050a9c..f5b1d3c 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -221,32 +221,39 @@ setversion_out:
 		struct file *donor_filp;
 		int err;
 
+		if (!(filp->f_mode & FMODE_READ) ||
+		    !(filp->f_mode & FMODE_WRITE))
+			return -EBADF;
+
 		if (copy_from_user(&me,
 			(struct move_extent __user *)arg, sizeof(me)))
 			return -EFAULT;
+		me.moved_len = 0;
 
 		donor_filp = fget(me.donor_fd);
 		if (!donor_filp)
 			return -EBADF;
 
-		if (!capable(CAP_DAC_OVERRIDE)) {
-			if ((current->real_cred->fsuid != inode->i_uid) ||
-				!(inode->i_mode & S_IRUSR) ||
-				!(donor_filp->f_dentry->d_inode->i_mode &
-				S_IRUSR)) {
-				fput(donor_filp);
-				return -EACCES;
-			}
+		if (!(donor_filp->f_mode & FMODE_WRITE)) {
+			err = -EBADF;
+			goto mext_out;
 		}
 
+		err = mnt_want_write(filp->f_path.mnt);
+		if (err)
+			goto mext_out;
+
 		err = ext4_move_extents(filp, donor_filp, me.orig_start,
 					me.donor_start, me.len, &me.moved_len);
-		fput(donor_filp);
+		mnt_drop_write(filp->f_path.mnt);
+		if (me.moved_len > 0)
+			file_remove_suid(donor_filp);
 
-		if (!err)
-			if (copy_to_user((struct move_extent *)arg,
-				&me, sizeof(me)))
-				return -EFAULT;
+		if (copy_to_user((struct move_extent *)arg, &me, sizeof(me)))
+			err = -EFAULT;
+
+mext_out:
+		fput(donor_filp);
 		return err;
 	}
 
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index bbf2dd9..c5250b5 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -905,6 +905,13 @@ mext_check_arguments(struct inode *orig_inode,
 		return -EINVAL;
 	}
 
+	if (donor_inode->i_mode & (S_ISUID|S_ISGID)) {
+		ext4_debug("ext4 move extent: suid or sgid is set"
+			   " to donor file [ino:orig %lu, donor %lu]\n",
+			   orig_inode->i_ino, donor_inode->i_ino);
+		return -EINVAL;
+	}
+
 	/* Ext4 move extent does not support swapfile */
 	if (IS_SWAPFILE(orig_inode) || IS_SWAPFILE(donor_inode)) {
 		ext4_debug("ext4 move extent: The argument files should "

fbcon-lower-debug.patch:
 fbmem.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE fbcon-lower-debug.patch ---
>From 8a5ab3097defb36df5fc485e38faf288de7e9e1f Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Thu, 19 Nov 2009 10:48:12 +1000
Subject: [PATCH] fbcon: lower debug level of message when kicking generic driver off the hw

---
 drivers/video/fbmem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 750c71f..aa11abf 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1497,7 +1497,7 @@ register_framebuffer(struct fb_info *fb_info)
 
 		if (registered_fb[i]->flags & FBINFO_MISC_FIRMWARE) {
 			if (fb_do_apertures_overlap(registered_fb[i], fb_info)) {
-				printk(KERN_ERR "fb: conflicting fb hw usage "
+				printk(KERN_INFO "fb: conflicting fb hw usage "
 				       "%s vs %s - removing generic driver\n",
 				       fb_info->fix.id,
 				       registered_fb[i]->fix.id);
-- 
1.6.5.2


highmem-fix-arm-powerpc-kmap_types.patch:
 arm/include/asm/kmap_types.h     |    6 ++++++
 powerpc/include/asm/kmap_types.h |    7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE highmem-fix-arm-powerpc-kmap_types.patch ---
>From 37197359d55c867af776d4eb941ee143a1667889 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
Date: Thu, 19 Nov 2009 09:58:45 -0500
Subject: [PATCH] fixes for arm & powerpc kmap types

cribbed from rmk
---
 arch/arm/include/asm/kmap_types.h     |    6 ++++++
 arch/powerpc/include/asm/kmap_types.h |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
index d16ec97..fc085ba 100644
--- a/arch/arm/include/asm/kmap_types.h
+++ b/arch/arm/include/asm/kmap_types.h
@@ -22,4 +22,10 @@ enum km_type {
 	KM_TYPE_NR
 };
 
+#ifdef CONFIG_DEBUG_HIGHMEM
+#define KM_NMI	(-1)
+#define KM_NMI_PTE	(-1)
+#define KM_IRQ_PTE	(-1)
+#endif
+
 #endif
diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
index b6bac6f..5e041a8 100644
--- a/arch/powerpc/include/asm/kmap_types.h
+++ b/arch/powerpc/include/asm/kmap_types.h
@@ -29,5 +29,11 @@ enum km_type {
 	KM_TYPE_NR
 };
 
+#ifdef CONFIG_DEBUG_HIGHMEM
+#define KM_NMI	(-1)
+#define KM_NMI_PTE	(-1)
+#define KM_IRQ_PTE	(-1)
+#endif
+
 #endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_KMAP_TYPES_H */
-- 
1.6.5.2


ipv4-fix-null-ptr-deref-in-ip_fragment.patch:
 ip_fragment.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ipv4-fix-null-ptr-deref-in-ip_fragment.patch ---
From: David Ford <david at blue-labs.org>
Date: Mon, 30 Nov 2009 07:02:22 +0000 (-0800)
Subject: ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr... 
X-Git-Tag: v2.6.32~40^2~6
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=bbf31bf18d34caa87dd01f08bf713635593697f2

ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr OOPS

ipv4 ip_frag_reasm(), fully replace 'dev_net(dev)' with 'net', defined
previously patched into 2.6.29.

Between 2.6.28.10 and 2.6.29, net/ipv4/ip_fragment.c was patched,
changing from dev_net(dev) to container_of(...).  Unfortunately the goto
section (out_fail) on oversized packets inside ip_frag_reasm() didn't
get touched up as well.  Oversized IP packets cause a NULL pointer
dereference and immediate hang.

I discovered this running openvasd and my previous email on this is
titled:  NULL pointer dereference at 2.6.32-rc8:net/ipv4/ip_fragment.c:566

Signed-off-by: David Ford <david at blue-labs.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 575f9bd..d3fe10b 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -563,7 +563,7 @@ out_oversize:
 		printk(KERN_INFO "Oversized IP packet from %pI4.\n",
 			&qp->saddr);
 out_fail:
-	IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_REASMFAILS);
+	IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
 	return err;
 }
 

linux-2.6-ath9k-fixes.patch:
 ath9k.h |    3 +++
 hw.c    |   11 ++++++++++-
 hw.h    |    1 +
 mac.c   |   38 ++++++++++++++++++++++++++++++++++++--
 mac.h   |   14 +++++++++++++-
 main.c  |   18 +++++++++++++++++-
 rc.c    |   12 ++++++++----
 reg.h   |   15 ++++++++++++---
 xmit.c  |   26 +++++++++++++++++++++++++-
 9 files changed, 125 insertions(+), 13 deletions(-)

--- NEW FILE linux-2.6-ath9k-fixes.patch ---
Backports of the following commits pending for 2.6.33...

commit f4709fdf683e1ed37b321c258b614ebe39752bf3
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date:   Tue Nov 24 21:37:57 2009 -0500

    ath9k: Fix maximum tx fifo settings for single stream devices
    
    Atheros single stream AR9285 and AR9271 have half the PCU TX FIFO
    buffer size of that of dual stream devices. Dual stream devices
    have a max PCU TX FIFO size of 8 KB while single stream devices
    have 4 KB. Single stream devices have an issue though and require
    hardware only to use half of the amount of its capable PCU TX FIFO
    size, 2 KB and this requires a change in software.
    
    Technically a change would not have been required (except for frame
    burst considerations of 128 bytes) if these devices would have been
    able to use the full 4 KB of the PCU TX FIFO size but our systems
    engineers recommend 2 KB to be used only. We enforce this through
    software by reducing the max frame triggger level to 2 KB.
    
    Fixing the max frame trigger level should then have a few benefits:
    
      * The PER will now be adjusted as designed for underruns when the
        max trigger level is reached. This should help alleviate the
        bus as the rate control algorithm chooses a slower rate which
        should ensure frames are transmitted properly under high system
        bus load.
    
      * The poll we use on our TX queues should now trigger and work
        as designed for single stream devices. The hardware passes
        data from each TX queue on the PCU TX FIFO queue respecting each
        queue's priority. The new trigger level ensures this seeding of
        the PCU TX FIFO queue occurs as designed which could mean avoiding
        false resets and actually reseting hw correctly when a TX queue
        is indeed stuck.
    
      * Some undocumented / unsupported behaviour could have been triggered
        when the max trigger level level was being set to 4 KB on single
        stream devices. Its not clear what this issue was to me yet.
    
    Cc: Kyungwan Nam <kyungwan.nam at atheros.com>
    Cc: Bennyam Malavazi <bennyam.malavazi at atheros.com>
    Cc: Stephen Chen <stephen.chen at atheros.com>
    Cc: Shan Palanisamy <shan.palanisamy at atheros.com>
    Cc: Paul Shaw <paul.shaw at atheros.com>
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth at atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit e7824a50662f7f79b1a739f705b4d906c31cf221
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date:   Tue Nov 24 02:53:25 2009 -0500

    ath9k: fix processing of TX PS null data frames
    
    When mac80211 was telling us to go into Powersave we listened
    and immediately turned RX off. This meant hardware would not
    see the ACKs from the AP we're associated with and hardware
    we'd end up retransmiting the null data frame in a loop
    helplessly.
    
    Fix this by keeping track of the transmitted nullfunc frames
    and only when we are sure the AP has sent back an ACK do we
    go ahead and shut RX off.
    
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth at atheros.com>
    Signed-off-by: Vivek Natarajan <Vivek.Natarajan at atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 332c556633b8c5fb4e890b1783122f2315526590
Author: Sujith <Sujith.Manoharan at atheros.com>
Date:   Fri Oct 9 09:51:28 2009 +0530

    ath9k: Fix TX hang poll routine
    
    When TX is hung, the chip is reset. Ensure that
    the chip is awake by using the PS wrappers.
    
    Signed-off-by: Sujith <Sujith.Manoharan at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/ath9k.h	2009-12-02 15:24:37.000000000 -0500
@@ -137,6 +137,7 @@ struct ath_buf {
 	dma_addr_t bf_daddr;		/* physical addr of desc */
 	dma_addr_t bf_buf_addr;		/* physical addr of data buffer */
 	bool bf_stale;
+	bool bf_isnullfunc;
 	u16 bf_flags;
 	struct ath_buf_state bf_state;
 	dma_addr_t bf_dmacontext;
@@ -506,6 +507,8 @@ struct ath_led {
 #define SC_OP_WAIT_FOR_PSPOLL_DATA BIT(17)
 #define SC_OP_WAIT_FOR_TX_ACK   BIT(18)
 #define SC_OP_BEACON_SYNC       BIT(19)
+#define SC_OP_NULLFUNC_COMPLETED BIT(22)
+#define SC_OP_PS_ENABLED	BIT(23)
 
 struct ath_bus_ops {
 	void		(*read_cachesize)(struct ath_softc *sc, int *csz);
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.c	2009-12-02 15:13:27.000000000 -0500
@@ -657,6 +657,11 @@ static struct ath_hw *ath9k_hw_do_attach
 	DPRINTF(sc, ATH_DBG_RESET, "serialize_regmode is %d\n",
 		ah->config.serialize_regmode);
 
+	if (AR_SREV_9285(ah))
+		ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD >> 1;
+	else
+		ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD;
+
 	if ((ah->hw_version.macVersion != AR_SREV_VERSION_5416_PCI) &&
 	    (ah->hw_version.macVersion != AR_SREV_VERSION_5416_PCIE) &&
 	    (ah->hw_version.macVersion != AR_SREV_VERSION_9160) &&
@@ -3367,7 +3372,11 @@ void ath9k_hw_fill_cap_info(struct ath_h
 		pCap->keycache_size = AR_KEYTABLE_SIZE;
 
 	pCap->hw_caps |= ATH9K_HW_CAP_FASTCC;
-	pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
+
+	if (AR_SREV_9285(ah))
+		pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD >> 1;
+	else
+		pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
 
 	if (AR_SREV_9285_10_OR_LATER(ah))
 		pCap->num_gpio_pins = AR9285_NUM_GPIO;
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/hw.h	2009-12-02 15:08:03.000000000 -0500
@@ -205,6 +205,7 @@ struct ath9k_ops_config {
 #define AR_SPUR_FEEQ_BOUND_HT20 10
 	int spurmode;
 	u16 spurchans[AR_EEPROM_MODAL_SPURS][2];
+	u8 max_txtrig_level;
 };
 
 enum ath9k_int {
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.c	2009-12-02 15:13:56.000000000 -0500
@@ -70,12 +70,37 @@ u32 ath9k_hw_numtxpending(struct ath_hw 
 	return npend;
 }
 
+/**
+ * ath9k_hw_updatetxtriglevel - adjusts the frame trigger level
+ *
+ * @ah: atheros hardware struct
+ * @bIncTrigLevel: whether or not the frame trigger level should be updated
+ *
+ * The frame trigger level specifies the minimum number of bytes,
+ * in units of 64 bytes, that must be DMA'ed into the PCU TX FIFO
+ * before the PCU will initiate sending the frame on the air. This can
+ * mean we initiate transmit before a full frame is on the PCU TX FIFO.
+ * Resets to 0x1 (meaning 64 bytes or a full frame, whichever occurs
+ * first)
+ *
+ * Caution must be taken to ensure to set the frame trigger level based
+ * on the DMA request size. For example if the DMA request size is set to
+ * 128 bytes the trigger level cannot exceed 6 * 64 = 384. This is because
+ * there need to be enough space in the tx FIFO for the requested transfer
+ * size. Hence the tx FIFO will stop with 512 - 128 = 384 bytes. If we set
+ * the threshold to a value beyond 6, then the transmit will hang.
+ *
+ * Current dual   stream devices have a PCU TX FIFO size of 8 KB.
+ * Current single stream devices have a PCU TX FIFO size of 4 KB, however,
+ * there is a hardware issue which forces us to use 2 KB instead so the
+ * frame trigger level must not exceed 2 KB for these chipsets.
+ */
 bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel)
 {
 	u32 txcfg, curLevel, newLevel;
 	enum ath9k_int omask;
 
-	if (ah->tx_trig_level >= MAX_TX_FIFO_THRESHOLD)
+	if (ah->tx_trig_level >= ah->config.max_txtrig_level)
 		return false;
 
 	omask = ath9k_hw_set_interrupts(ah, ah->mask_reg & ~ATH9K_INT_GLOBAL);
@@ -84,7 +109,7 @@ bool ath9k_hw_updatetxtriglevel(struct a
 	curLevel = MS(txcfg, AR_FTRIG);
 	newLevel = curLevel;
 	if (bIncTrigLevel) {
-		if (curLevel < MAX_TX_FIFO_THRESHOLD)
+		if (curLevel < ah->config.max_txtrig_level)
 			newLevel++;
 	} else if (curLevel > MIN_TX_FIFO_THRESHOLD)
 		newLevel--;
@@ -229,6 +254,8 @@ int ath9k_hw_txprocdesc(struct ath_hw *a
 	ds->ds_txstat.ts_status = 0;
 	ds->ds_txstat.ts_flags = 0;
 
+	if (ads->ds_txstatus1 & AR_FrmXmitOK)
+		ds->ds_txstat.ts_status |= ATH9K_TX_ACKED;
 	if (ads->ds_txstatus1 & AR_ExcessiveRetries)
 		ds->ds_txstat.ts_status |= ATH9K_TXERR_XRETRY;
 	if (ads->ds_txstatus1 & AR_Filtered)
@@ -889,6 +916,13 @@ bool ath9k_hw_setuprxdesc(struct ath_hw 
 	return true;
 }
 
+/*
+ * This can stop or re-enables RX.
+ *
+ * If bool is set this will kill any frame which is currently being
+ * transferred between the MAC and baseband and also prevent any new
+ * frames from getting started.
+ */
 bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set)
 {
 	u32 reg;
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/mac.h	2009-12-02 15:13:56.000000000 -0500
@@ -76,6 +76,7 @@
 #define ATH9K_TXERR_FIFO           0x04
 #define ATH9K_TXERR_XTXOP          0x08
 #define ATH9K_TXERR_TIMER_EXPIRED  0x10
+#define ATH9K_TX_ACKED		   0x20
 
 #define ATH9K_TX_BA                0x01
 #define ATH9K_TX_PWRMGMT           0x02
@@ -85,9 +86,15 @@
 #define ATH9K_TX_SW_ABORTED        0x40
 #define ATH9K_TX_SW_FILTERED       0x80
 
+/* 64 bytes */
 #define MIN_TX_FIFO_THRESHOLD   0x1
+
+/*
+ * Single stream device AR9285 and AR9271 require 2 KB
+ * to work around a hardware issue, all other devices
+ * have can use the max 4 KB limit.
+ */
 #define MAX_TX_FIFO_THRESHOLD   ((4096 / 64) - 1)
-#define INIT_TX_FIFO_THRESHOLD  MIN_TX_FIFO_THRESHOLD
 
 struct ath_tx_status {
 	u32 ts_tstamp;
@@ -380,6 +387,11 @@ struct ar5416_desc {
 #define AR_TxBaStatus       0x40000000
 #define AR_TxStatusRsvd01   0x80000000
 
+/*
+ * AR_FrmXmitOK - Frame transmission success flag. If set, the frame was
+ * transmitted successfully. If clear, no ACK or BA was received to indicate
+ * successful transmission when we were expecting an ACK or BA.
+ */
 #define AR_FrmXmitOK            0x00000001
 #define AR_ExcessiveRetries     0x00000002
 #define AR_FIFOUnderrun         0x00000004
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/main.c	2009-12-02 15:23:02.000000000 -0500
@@ -2252,8 +2252,15 @@ static int ath9k_config(struct ieee80211
 
 	mutex_lock(&sc->mutex);
 
+	/*
+	 * We just prepare to enable PS. We have to wait until our AP has
+	 * ACK'd our null data frame to disable RX otherwise we'll ignore
+	 * those ACKs and end up retransmitting the same null data frames.
+	 * IEEE80211_CONF_CHANGE_PS is only passed by mac80211 for STA mode.
+	 */
 	if (changed & IEEE80211_CONF_CHANGE_PS) {
 		if (conf->flags & IEEE80211_CONF_PS) {
+			sc->sc_flags |= SC_OP_PS_ENABLED;
 			if (!(ah->caps.hw_caps &
 			      ATH9K_HW_CAP_AUTOSLEEP)) {
 				if ((sc->imask & ATH9K_INT_TIM_TIMER) == 0) {
@@ -2261,11 +2268,20 @@ static int ath9k_config(struct ieee80211
 					ath9k_hw_set_interrupts(sc->sc_ah,
 							sc->imask);
 				}
+			}
+			/*
+			 * At this point we know hardware has received an ACK
+			 * of a previously sent null data frame.
+			 */
+			if ((sc->sc_flags & SC_OP_NULLFUNC_COMPLETED)) {
+				sc->sc_flags &= ~SC_OP_NULLFUNC_COMPLETED;
+				ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);
 				ath9k_hw_setrxabort(sc->sc_ah, 1);
 			}
-			ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);
 		} else {
 			ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
+			sc->sc_flags &= ~(SC_OP_PS_ENABLED |
+					  SC_OP_NULLFUNC_COMPLETED);
 			if (!(ah->caps.hw_caps &
 			      ATH9K_HW_CAP_AUTOSLEEP)) {
 				ath9k_hw_setrxabort(sc->sc_ah, 0);
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/rc.c	2009-12-02 15:11:15.000000000 -0500
@@ -1519,10 +1519,14 @@ static void ath_tx_status(void *priv, st
 		goto exit;
 
 	/*
-	 * If underrun error is seen assume it as an excessive retry only
-	 * if prefetch trigger level have reached the max (0x3f for 5416)
-	 * Adjust the long retry as if the frame was tried ATH_11N_TXMAXTRY
-	 * times. This affects how ratectrl updates PER for the failed rate.
+	 * If an underrun error is seen assume it as an excessive retry only
+	 * if max frame trigger level has been reached (2 KB for singel stream,
+	 * and 4 KB for dual stream). Adjust the long retry as if the frame was
+	 * tried hw->max_rate_tries times to affect how ratectrl updates PER for
+	 * the failed rate. In case of congestion on the bus penalizing these
+	 * type of underruns should help hardware actually transmit new frames
+	 * successfully by eventually preferring slower rates. This itself
+	 * should also alleviate congestion on the bus.
 	 */
 	if (tx_info_priv->tx.ts_flags &
 	    (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN) &&
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/reg.h	2009-12-02 15:13:56.000000000 -0500
@@ -1216,13 +1216,22 @@ enum {
 #define AR_MCAST_FIL0       0x8040
 #define AR_MCAST_FIL1       0x8044
 
+/*
+ * AR_DIAG_SW - Register which can be used for diagnostics and testing purposes.
+ *
+ * The force RX abort (AR_DIAG_RX_ABORT, bit 25) can be used in conjunction with
+ * RX block (AR_DIAG_RX_DIS, bit 5) to help fast channel change to shut down
+ * receive. The force RX abort bit will kill any frame which is currently being
+ * transferred between the MAC and baseband. The RX block bit (AR_DIAG_RX_DIS)
+ * will prevent any new frames from getting started.
+ */
 #define AR_DIAG_SW                  0x8048
 #define AR_DIAG_CACHE_ACK           0x00000001
 #define AR_DIAG_ACK_DIS             0x00000002
 #define AR_DIAG_CTS_DIS             0x00000004
 #define AR_DIAG_ENCRYPT_DIS         0x00000008
 #define AR_DIAG_DECRYPT_DIS         0x00000010
-#define AR_DIAG_RX_DIS              0x00000020
+#define AR_DIAG_RX_DIS              0x00000020 /* RX block */
 #define AR_DIAG_LOOP_BACK           0x00000040
 #define AR_DIAG_CORR_FCS            0x00000080
 #define AR_DIAG_CHAN_INFO           0x00000100
@@ -1231,12 +1240,12 @@ enum {
 #define AR_DIAG_FRAME_NV0           0x00020000
 #define AR_DIAG_OBS_PT_SEL1         0x000C0000
 #define AR_DIAG_OBS_PT_SEL1_S       18
-#define AR_DIAG_FORCE_RX_CLEAR      0x00100000
+#define AR_DIAG_FORCE_RX_CLEAR      0x00100000 /* force rx_clear high */
 #define AR_DIAG_IGNORE_VIRT_CS      0x00200000
 #define AR_DIAG_FORCE_CH_IDLE_HIGH  0x00400000
 #define AR_DIAG_EIFS_CTRL_ENA       0x00800000
 #define AR_DIAG_DUAL_CHAIN_INFO     0x01000000
-#define AR_DIAG_RX_ABORT            0x02000000
+#define AR_DIAG_RX_ABORT            0x02000000 /* Force RX abort */
 #define AR_DIAG_SATURATE_CYCLE_CNT  0x04000000
 #define AR_DIAG_OBS_PT_SEL2         0x08000000
 #define AR_DIAG_RX_CLEAR_CTL_LOW    0x10000000
diff -up linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c.orig linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c
--- linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/ath/ath9k/xmit.c	2009-12-02 15:29:20.000000000 -0500
@@ -434,8 +434,11 @@ static void ath_tx_complete_aggr(struct 
 
 	rcu_read_unlock();
 
-	if (needreset)
+	if (needreset) {
+		ath9k_ps_wakeup(sc);
 		ath_reset(sc, false);
+		ath9k_ps_restore(sc);
+	}
 }
 
 static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
@@ -1587,6 +1590,14 @@ static int ath_tx_setup_buffer(struct ie
 	}
 
 	bf->bf_buf_addr = bf->bf_dmacontext;
+
+	/* tag if this is a nullfunc frame to enable PS when AP acks it */
+	if (ieee80211_is_nullfunc(fc) && ieee80211_has_pm(fc)) {
+		bf->bf_isnullfunc = true;
+		sc->sc_flags &= ~SC_OP_NULLFUNC_COMPLETED;
+	} else
+		bf->bf_isnullfunc = false;
+
 	return 0;
 }
 
@@ -1996,6 +2007,19 @@ static void ath_tx_processq(struct ath_s
 			txq->axq_gatingds = NULL;
 
 		/*
+		 * We now know the nullfunc frame has been ACKed so we
+		 * can disable RX.
+		 */
+		if (bf->bf_isnullfunc &&
+		    (ds->ds_txstat.ts_status & ATH9K_TX_ACKED)) {
+			if ((sc->sc_flags & SC_OP_PS_ENABLED)) {
+				ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);
+				ath9k_hw_setrxabort(sc->sc_ah, 1);
+			} else
+				sc->sc_flags |= SC_OP_NULLFUNC_COMPLETED;
+		}
+
+		/*
 		 * Remove ath_buf's of the same transmit unit from txq,
 		 * however leave the last descriptor back as the holding
 		 * descriptor for hw.

linux-2.6-iommu-another-hp-screwup.patch:
 intel-iommu.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE linux-2.6-iommu-another-hp-screwup.patch ---
--- linux-2.6.31.x86_64/drivers/pci/intel-iommu.c.orig	2009-11-25 09:49:19.000000000 +0000
+++ linux-2.6.31.x86_64/drivers/pci/intel-iommu.c	2009-11-25 10:15:45.000000000 +0000
@@ -1990,6 +1990,16 @@ static int iommu_prepare_identity_map(st
 	       "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
 	       pci_name(pdev), start, end);
 	
+	if (end < start) {
+		WARN(1, "Your BIOS is broken; RMRR ends before it starts!\n"
+			"BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+			dmi_get_system_info(DMI_BIOS_VENDOR),
+			dmi_get_system_info(DMI_BIOS_VERSION),
+		     dmi_get_system_info(DMI_PRODUCT_VERSION));
+		ret = -EIO;
+		goto error;
+	}
+
 	if (end >> agaw_to_width(domain->agaw)) {
 		WARN(1, "Your BIOS is broken; RMRR exceeds permitted address width (%d bits)\n"
 		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",

linux-2.6-iommu-dmar-all-1s.patch:
 dmar.c |   32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-iommu-dmar-all-1s.patch ---
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index e5f8fc1..87417e2 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -583,6 +583,9 @@ int __init check_zero_address(void)
 		}
 
 		if (entry_header->type == ACPI_DMAR_TYPE_HARDWARE_UNIT) {
+			void __iomem *addr;
+			u64 cap, ecap;
+
 			drhd = (void *)entry_header;
 			if (!drhd->address) {
 				/* Promote an attitude of violence to a BIOS engineer today */
@@ -591,10 +594,27 @@ int __init check_zero_address(void)
 				     dmi_get_system_info(DMI_BIOS_VENDOR),
 				     dmi_get_system_info(DMI_BIOS_VERSION),
 				     dmi_get_system_info(DMI_PRODUCT_VERSION));
-				dmar_disabled = 1;
-				return 0;
+				goto failed;
+			}
+
+			addr = early_ioremap(drhd->address, VTD_PAGE_SIZE);
+			if (!addr ) {
+				printk("IOMMU: can't validate: %llx\n", drhd->address);
+				goto failed;
+			}
+			cap = dmar_readq(addr + DMAR_CAP_REG);
+			ecap = dmar_readq(addr + DMAR_ECAP_REG);
+			early_iounmap(addr, VTD_PAGE_SIZE);
+			if (cap == (uint64_t)-1 && ecap == (uint64_t)-1) {
+				/* Promote an attitude of violence to a BIOS engineer today */
+				WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+				     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+				      drhd->address,
+				      dmi_get_system_info(DMI_BIOS_VENDOR),
+				      dmi_get_system_info(DMI_BIOS_VERSION),
+				      dmi_get_system_info(DMI_PRODUCT_VERSION));
+				goto failed;
 			}
-			break;
 		}
 
 		entry_header = ((void *)entry_header + entry_header->length);
@@ -600,6 +622,12 @@ int __init check_zero_address(void)
 		entry_header = ((void *)entry_header + entry_header->length);
 	}
 	return 1;
+
+failed:
+#ifdef CONFIG_DMAR
+	dmar_disabled = 1;
+#endif
+	return 0;
 }
 
 void __init detect_intel_iommu(void)

linux-2.6-iommu-hp-cantiga-resume.patch:
 intel-iommu.c |   33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

--- NEW FILE linux-2.6-iommu-hp-cantiga-resume.patch ---
--- linux-2.6.31.x86_64/drivers/pci/intel-iommu.c.orig	2009-11-25 10:37:05.000000000 +0000
+++ linux-2.6.31.x86_64/drivers/pci/intel-iommu.c	2009-11-26 07:20:04.000000000 +0000
@@ -3073,6 +3073,36 @@ static void __init init_no_remapping_dev
 }
 
 #ifdef CONFIG_SUSPEND
+
+/*
+ * On Cantiga, the dedicated IOMMU for the integrated graphics won't
+ * come back unless the MMIO BAR for the gfx device (00:02.0) is enabled.
+ * And some HP BIOSes don't restore it on resume. Linux will restore it
+ * later, but that's too late -- we need to reinitialise the IOMMU first.
+ */
+void cantiga_gfx_bar_enable(struct dmar_drhd_unit *drhd)
+{
+	int i;
+	uint32_t mmiobar;
+
+	for (i = 0; i < drhd->devices_cnt; i++) {
+		if (!drhd->devices[i] ||
+		    drhd->devices[i]->vendor != 0x8086 ||
+		    drhd->devices[i]->device != 0x2a42)
+			continue;
+
+		pci_read_config_dword(drhd->devices[i], PCI_BASE_ADDRESS_0,
+				      &mmiobar);
+		if (!(mmiobar & PCI_BASE_ADDRESS_MEM_MASK) &&
+		    pci_resource_start(drhd->devices[i], 0)) {
+			WARN(1, "BIOS failed to restore BARs for integrated graphics device; fixing...\n");
+			pci_write_config_dword(drhd->devices[i],
+					       PCI_BASE_ADDRESS_0,
+					       pci_resource_start(drhd->devices[i], 0) | mmiobar);
+		}
+	}
+}
+
 static int init_iommu_hw(void)
 {
 	struct dmar_drhd_unit *drhd;
@@ -3091,6 +3121,9 @@ static int init_iommu_hw(void)
 					   DMA_CCMD_GLOBAL_INVL);
 		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
 					 DMA_TLB_GLOBAL_FLUSH);
+
+		cantiga_gfx_bar_enable(drhd);
+
 		iommu_enable_translation(iommu);
 		iommu_disable_protect_mem_regions(iommu);
 	}

linux-2.6-iommu-sanity-checks-for-intr-remap-too.patch:
 dmar.c |   33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-iommu-sanity-checks-for-intr-remap-too.patch ---
--- linux-2.6.31.x86_64/drivers/pci/dmar.c.orig	2009-11-25 09:49:15.000000000 +0000
+++ linux-2.6.31.x86_64/drivers/pci/dmar.c	2009-11-25 10:17:44.000000000 +0000
@@ -564,6 +564,8 @@ int __init dmar_table_init(void)
 	return 0;
 }
 
+static int bios_warned;
+
 int __init check_zero_address(void)
 {
 	struct acpi_table_dmar *dmar;
@@ -594,6 +596,7 @@ int __init check_zero_address(void)
 				     dmi_get_system_info(DMI_BIOS_VENDOR),
 				     dmi_get_system_info(DMI_BIOS_VERSION),
 				     dmi_get_system_info(DMI_PRODUCT_VERSION));
+				bios_warned = 1;
 				goto failed;
 			}
 
@@ -613,6 +616,7 @@ int __init check_zero_address(void)
 				      dmi_get_system_info(DMI_BIOS_VENDOR),
 				      dmi_get_system_info(DMI_BIOS_VERSION),
 				      dmi_get_system_info(DMI_PRODUCT_VERSION));
+				bios_warned = 1;
 				goto failed;
 			}
 		}
@@ -670,6 +674,18 @@ int alloc_iommu(struct dmar_drhd_unit *d
 	int agaw = 0;
 	int msagaw = 0;
 
+	if (!drhd->reg_base_addr) {
+		if (!bios_warned) {
+			WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
+			     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+			     dmi_get_system_info(DMI_BIOS_VENDOR),
+			     dmi_get_system_info(DMI_BIOS_VERSION),
+			     dmi_get_system_info(DMI_PRODUCT_VERSION));
+			bios_warned = 1;
+		}
+		return -EINVAL;
+	}
+
 	iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
 	if (!iommu)
 		return -ENOMEM;
@@ -686,13 +702,16 @@ int alloc_iommu(struct dmar_drhd_unit *d
 	iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);
 
 	if (iommu->cap == (uint64_t)-1 && iommu->ecap == (uint64_t)-1) {
-		/* Promote an attitude of violence to a BIOS engineer today */
-		WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
-		     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
-		     drhd->reg_base_addr,
-		     dmi_get_system_info(DMI_BIOS_VENDOR),
-		     dmi_get_system_info(DMI_BIOS_VERSION),
-		     dmi_get_system_info(DMI_PRODUCT_VERSION));
+		if (!bios_warned) {
+			/* Promote an attitude of violence to a BIOS engineer today */
+			WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+			     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+			     drhd->reg_base_addr,
+			     dmi_get_system_info(DMI_BIOS_VENDOR),
+			     dmi_get_system_info(DMI_BIOS_VERSION),
+			     dmi_get_system_info(DMI_PRODUCT_VERSION));
+			bios_warned = 1;
+		}
 		goto err_unmap;
 	}
 

linux-2.6.31-nfsd-proot.patch:
 fs/nfsd/export.c            |    9 ++++++---
 fs/nfsd/nfs4xdr.c           |   10 +++++++---
 fs/nfsd/nfsfh.c             |   37 +++++++++++++++++++++++++++++++++++++
 fs/nfsd/vfs.c               |   30 ++++++++++++++++++++++++++----
 include/linux/nfsd/export.h |   12 +++++++++++-
 include/linux/nfsd/nfsd.h   |    5 +++++
 6 files changed, 92 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6.31-nfsd-proot.patch ---
diff -up linux-2.6.31.i686/fs/nfsd/export.c.save linux-2.6.31.i686/fs/nfsd/export.c
--- linux-2.6.31.i686/fs/nfsd/export.c.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/fs/nfsd/export.c	2009-12-07 12:15:32.000000000 -0500
@@ -362,10 +362,12 @@ static struct svc_export *svc_export_loo
 static int check_export(struct inode *inode, int flags, unsigned char *uuid)
 {
 
-	/* We currently export only dirs and regular files.
-	 * This is what umountd does.
+	/*
+	 * We currently export only dirs, regular files, and (for v4
+	 * pseudoroot) symlinks.
 	 */
 	if (!S_ISDIR(inode->i_mode) &&
+	    !S_ISLNK(inode->i_mode) &&
 	    !S_ISREG(inode->i_mode))
 		return -ENOTDIR;
 
@@ -1413,6 +1415,7 @@ static struct flags {
 	{ NFSEXP_CROSSMOUNT, {"crossmnt", ""}},
 	{ NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
 	{ NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
+	{ NFSEXP_V4ROOT, {"v4root", ""}},
 #ifdef MSNFS
 	{ NFSEXP_MSNFS, {"msnfs", ""}},
 #endif
@@ -1493,7 +1496,7 @@ static int e_show(struct seq_file *m, vo
 	struct svc_export *exp = container_of(cp, struct svc_export, h);
 
 	if (p == SEQ_START_TOKEN) {
-		seq_puts(m, "# Version 1.1\n");
+		seq_puts(m, "# Version 1.2\n");
 		seq_puts(m, "# Path Client(Flags) # IPs\n");
 		return 0;
 	}
diff -up linux-2.6.31.i686/fs/nfsd/nfs4xdr.c.save linux-2.6.31.i686/fs/nfsd/nfs4xdr.c
--- linux-2.6.31.i686/fs/nfsd/nfs4xdr.c.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/fs/nfsd/nfs4xdr.c	2009-12-07 12:15:32.000000000 -0500
@@ -2206,11 +2206,14 @@ nfsd4_encode_dirent_fattr(struct nfsd4_r
 	 * we will not follow the cross mount and will fill the attribtutes
 	 * directly from the mountpoint dentry.
 	 */
-	if (d_mountpoint(dentry) && !attributes_need_mount(cd->rd_bmval))
-		ignore_crossmnt = 1;
-	else if (d_mountpoint(dentry)) {
+	if (nfsd_mountpoint(dentry, exp)) {
 		int err;
 
+		if (!(exp->ex_flags & NFSEXP_V4ROOT)
+				&& !attributes_need_mount(cd->rd_bmval)) {
+			ignore_crossmnt = 1;
+			goto out_encode;
+		}
 		/*
 		 * Why the heck aren't we just using nfsd_lookup??
 		 * Different "."/".." handling?  Something else?
@@ -2226,6 +2229,7 @@ nfsd4_encode_dirent_fattr(struct nfsd4_r
 			goto out_put;
 
 	}
+out_encode:
 	nfserr = nfsd4_encode_fattr(NULL, exp, dentry, p, buflen, cd->rd_bmval,
 					cd->rd_rqstp, ignore_crossmnt);
 out_put:
diff -up linux-2.6.31.i686/fs/nfsd/nfsfh.c.save linux-2.6.31.i686/fs/nfsd/nfsfh.c
--- linux-2.6.31.i686/fs/nfsd/nfsfh.c.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/fs/nfsd/nfsfh.c	2009-12-07 12:15:32.000000000 -0500
@@ -109,6 +109,36 @@ static __be32 nfsd_setuser_and_check_por
 	return nfserrno(nfsd_setuser(rqstp, exp));
 }
 
+static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,
+	struct dentry *dentry, struct svc_export *exp)
+{
+	if (!(exp->ex_flags & NFSEXP_V4ROOT))
+		return nfs_ok;
+	/*
+	 * v2/v3 clients have no need for the V4ROOT export--they use
+	 * the mount protocl instead; also, further V4ROOT checks may be
+	 * in v4-specific code, in which case v2/v3 clients could bypass
+	 * them.
+	 */
+	if (!nfsd_v4client(rqstp))
+		return nfserr_stale;
+	/*
+	 * We're exposing only the directories and symlinks that have to be
+	 * traversed on the way to real exports:
+	 */
+	if (unlikely(!S_ISDIR(dentry->d_inode->i_mode) &&
+		     !S_ISLNK(dentry->d_inode->i_mode)))
+		return nfserr_stale;
+	/*
+	 * A pseudoroot export gives permission to access only one
+	 * single directory; the kernel has to make another upcall
+	 * before granting access to anything else under it:
+	 */
+	if (unlikely(dentry != exp->ex_path.dentry))
+		return nfserr_stale;
+	return nfs_ok;
+}
+
 /*
  * Use the given filehandle to look up the corresponding export and
  * dentry.  On success, the results are used to set fh_export and
@@ -317,6 +347,13 @@ fh_verify(struct svc_rqst *rqstp, struct
 			goto out;
 	}
 
+	/*
+	 * Do some spoof checking if we are on the pseudo root
+	 */
+	error = check_pseudo_root(rqstp, dentry, exp);
+	if (error)
+		goto out;
+
 	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
 	if (error)
 		goto out;
diff -up linux-2.6.31.i686/fs/nfsd/vfs.c.save linux-2.6.31.i686/fs/nfsd/vfs.c
--- linux-2.6.31.i686/fs/nfsd/vfs.c.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/fs/nfsd/vfs.c	2009-12-07 12:22:32.000000000 -0500
@@ -110,12 +110,21 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, s
 
 	exp2 = rqst_exp_get_by_name(rqstp, &path);
 	if (IS_ERR(exp2)) {
-		if (PTR_ERR(exp2) != -ENOENT)
-			err = PTR_ERR(exp2);
+		err = PTR_ERR(exp2);
+		/*
+		 * We normally allow NFS clients to continue
+		 * "underneath" a mountpoint that is not exported.
+		 * The exception is V4ROOT, where no traversal is ever
+		 * allowed without an explicit export of the new
+		 * directory.
+		 */
+		if (err == -ENOENT && !(exp->ex_flags & NFSEXP_V4ROOT))
+			err = 0;
 		path_put(&path);
 		goto out;
 	}
-	if ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) {
+	if (nfsd_v4client(rqstp) ||
+		(exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) {
 		/* successfully crossed mount point */
 		/*
 		 * This is subtle: path.dentry is *not* on path.mnt
@@ -134,6 +143,19 @@ out:
 	return err;
 }
 
+/*
+ * For nfsd purposes, we treat V4ROOT exports as though there was an
+ * export at *every* directory.
+ */
+int nfsd_mountpoint(struct dentry *dentry, struct svc_export *exp)
+{
+	if (d_mountpoint(dentry))
+		return 1;
+	if (!(exp->ex_flags & NFSEXP_V4ROOT))
+		return 0;
+	return dentry->d_inode != NULL;
+}
+
 __be32
 nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
 		   const char *name, unsigned int len,
@@ -201,7 +223,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
 		/*
 		 * check if we have crossed a mount point ...
 		 */
-		if (d_mountpoint(dentry)) {
+		if (nfsd_mountpoint(dentry, exp)) {
 			if ((host_err = nfsd_cross_mnt(rqstp, &dentry, &exp))) {
 				dput(dentry);
 				goto out_nfserr;
diff -up linux-2.6.31.i686/include/linux/nfsd/export.h.save linux-2.6.31.i686/include/linux/nfsd/export.h
--- linux-2.6.31.i686/include/linux/nfsd/export.h.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/include/linux/nfsd/export.h	2009-12-07 12:15:39.000000000 -0500
@@ -39,7 +39,17 @@
 #define NFSEXP_FSID		0x2000
 #define	NFSEXP_CROSSMOUNT	0x4000
 #define	NFSEXP_NOACL		0x8000	/* reserved for possible ACL related use */
-#define NFSEXP_ALLFLAGS		0xFE3F
+/*
+ * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
+ * clients, and only to the single directory that is the root of the
+ * export; further lookup and readdir operations are treated as if every
+ * subdirectory was a mountpoint, and ignored if they are not themselves
+ * exported.  This is used by nfsd and mountd to construct the NFSv4
+ * pseudofilesystem, which provides access only to paths leading to each
+ * exported filesystem.
+ */
+#define	NFSEXP_V4ROOT		0x10000
+#define NFSEXP_ALLFLAGS		0x1FE3F
 
 /* The flags that may vary depending on security flavor: */
 #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
diff -up linux-2.6.31.i686/include/linux/nfsd/nfsd.h.save linux-2.6.31.i686/include/linux/nfsd/nfsd.h
--- linux-2.6.31.i686/include/linux/nfsd/nfsd.h.save	2009-12-07 12:13:28.000000000 -0500
+++ linux-2.6.31.i686/include/linux/nfsd/nfsd.h	2009-12-07 12:15:39.000000000 -0500
@@ -83,6 +83,7 @@ __be32		 nfsd_lookup_dentry(struct svc_r
 				struct svc_export **, struct dentry **);
 __be32		nfsd_setattr(struct svc_rqst *, struct svc_fh *,
 				struct iattr *, int, time_t);
+int nfsd_mountpoint(struct dentry *, struct svc_export *);
 #ifdef CONFIG_NFSD_V4
 __be32          nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
                     struct nfs4_acl *);
@@ -391,6 +392,10 @@ static inline u32 nfsd_suppattrs2(u32 mi
 	return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD2
 			    : NFSD4_SUPPORTED_ATTRS_WORD2;
 }
+static inline int nfsd_v4client(struct svc_rqst *rq)
+{
+	return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;
+}
 
 /* These will return ERR_INVAL if specified in GETATTR or READDIR. */
 #define NFSD_WRITEONLY_ATTRS_WORD1							    \

sched-deal-with-low-load-in-wake-affine.patch:
 sched_fair.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE sched-deal-with-low-load-in-wake-affine.patch ---
From: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon, 7 Sep 2009 16:28:05 +0000 (+0200)
Subject: sched: Deal with low-load in wake_affine()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=71a29aa7b600595d0ef373ea605ac656876d1f2f

sched: Deal with low-load in wake_affine()

wake_affine() would always fail under low-load situations where
both prev and this were idle, because adding a single task will
always be a significant imbalance, even if there's nothing
around that could balance it.

Deal with this by allowing imbalance when there's nothing you
can do about it.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index d7fda41..cc97ea4 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1262,7 +1262,17 @@ wake_affine(struct sched_domain *this_sd, struct rq *this_rq,
 	tg = task_group(p);
 	weight = p->se.load.weight;
 
-	balanced = 100*(tl + effective_load(tg, this_cpu, weight, weight)) <=
+	/*
+	 * In low-load situations, where prev_cpu is idle and this_cpu is idle
+	 * due to the sync cause above having dropped tl to 0, we'll always have
+	 * an imbalance, but there's really nothing you can do about that, so
+	 * that's good too.
+	 *
+	 * Otherwise check if either cpus are near enough in load to allow this
+	 * task to be woken on this_cpu.
+	 */
+	balanced = !tl ||
+		100*(tl + effective_load(tg, this_cpu, weight, weight)) <=
 		imbalance*(load + effective_load(tg, prev_cpu, 0, weight));
 
 	/*

sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch:
 sched_fair.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch ---
From: Mike Galbraith <efault at gmx.de>
Date: Tue, 8 Sep 2009 09:12:28 +0000 (+0200)
Subject: sched: Ensure that a child can't gain time over it's parent after fork()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b5d9d734a53e0204aab0089079cbde2a1285a38f

sched: Ensure that a child can't gain time over it's parent after fork()

A fork/exec load is usually "pass the baton", so the child
should never be placed behind the parent.  With START_DEBIT we
make room for the new task, but with child_runs_first, that
room comes out of the _parent's_ hide. There's nothing to say
that the parent wasn't ahead of min_vruntime at fork() time,
which means that the "baton carrier", who is essentially the
parent in drag, can gain time and increase scheduling latencies
for waiters.

With NEW_FAIR_SLEEPERS + START_DEBIT + child_runs_first
enabled, we essentially pass the sleeper fairness off to the
child, which is fine, but if we don't base placement on the
parent's updated vruntime, we can end up compounding latency
woes if the child itself then does fork/exec.  The debit
incurred at fork doesn't hurt the parent who is then going to
sleep and maybe exit, but the child who acquires the error
harms all comers.

This improves latencies of make -j<n> kernel build workloads.

Reported-by: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Mike Galbraith <efault at gmx.de>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index cc97ea4..e386e5d 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -728,11 +728,11 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 
 			vruntime -= thresh;
 		}
-
-		/* ensure we never gain time by being placed backwards. */
-		vruntime = max_vruntime(se->vruntime, vruntime);
 	}
 
+	/* ensure we never gain time by being placed backwards. */
+	vruntime = max_vruntime(se->vruntime, vruntime);
+
 	se->vruntime = vruntime;
 }
 
@@ -1756,6 +1756,8 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
 	sched_info_queued(p);
 
 	update_curr(cfs_rq);
+	if (curr)
+		se->vruntime = curr->vruntime;
 	place_entity(cfs_rq, se, 1);
 
 	/* 'curr' will be NULL if the child belongs to a different group */

sched-remove-shortcut-from-select-task-rq-fair.patch:
 sched_fair.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE sched-remove-shortcut-from-select-task-rq-fair.patch ---
From: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon, 7 Sep 2009 16:12:06 +0000 (+0200)
Subject: sched: Remove short cut from select_task_rq_fair()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=cdd2ab3de4301728b20efd6225681d3ff591a938

sched: Remove short cut from select_task_rq_fair()

select_task_rq_fair() incorrectly skips the wake_affine()
logic, remove this.

When prev_cpu == this_cpu, the code jumps straight to the
wake_idle() logic, this doesn't give the wake_affine() logic
the chance to pin the task to this cpu.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 2ff850f..d7fda41 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1305,8 +1305,6 @@ static int select_task_rq_fair(struct task_struct *p, int sync)
 	this_rq		= cpu_rq(this_cpu);
 	new_cpu		= prev_cpu;
 
-	if (prev_cpu == this_cpu)
-		goto out;
 	/*
 	 * 'this_sd' is the first domain that both
 	 * this_cpu and prev_cpu are present in:

sched-retune-scheduler-latency-defaults.patch:
 sched_fair.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE sched-retune-scheduler-latency-defaults.patch ---
From: Mike Galbraith <efault at gmx.de>
Date: Wed, 9 Sep 2009 13:41:37 +0000 (+0200)
Subject: sched: Re-tune the scheduler latency defaults to decrease worst-case latencies
X-Git-Tag: v2.6.32-rc1~719^2~3
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=172e082a9111ea504ee34cbba26284a5ebdc53a7

sched: Re-tune the scheduler latency defaults to decrease worst-case latencies

Reduce the latency target from 20 msecs to 5 msecs.

Why? Larger latencies increase spread, which is good for scaling,
but bad for worst case latency.

We still have the ilog(nr_cpus) rule to scale up on bigger
server boxes.

Signed-off-by: Mike Galbraith <efault at gmx.de>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <1252486344.28645.18.camel at marge.simson.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index af325a3..26fadb4 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -24,7 +24,7 @@
 
 /*
  * Targeted preemption latency for CPU-bound tasks:
- * (default: 20ms * (1 + ilog(ncpus)), units: nanoseconds)
+ * (default: 5ms * (1 + ilog(ncpus)), units: nanoseconds)
  *
  * NOTE: this latency value is not the same as the concept of
  * 'timeslice length' - timeslices in CFS are of variable length
@@ -34,13 +34,13 @@
  * (to see the precise effective timeslice length of your workload,
  *  run vmstat and monitor the context-switches (cs) field)
  */
-unsigned int sysctl_sched_latency = 20000000ULL;
+unsigned int sysctl_sched_latency = 5000000ULL;
 
 /*
  * Minimal preemption granularity for CPU-bound tasks:
- * (default: 4 msec * (1 + ilog(ncpus)), units: nanoseconds)
+ * (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
  */
-unsigned int sysctl_sched_min_granularity = 4000000ULL;
+unsigned int sysctl_sched_min_granularity = 1000000ULL;
 
 /*
  * is kept at sysctl_sched_latency / sysctl_sched_min_granularity
@@ -63,13 +63,13 @@ unsigned int __read_mostly sysctl_sched_compat_yield;
 
 /*
  * SCHED_OTHER wake-up granularity.
- * (default: 5 msec * (1 + ilog(ncpus)), units: nanoseconds)
+ * (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
  *
  * This option delays the preemption effects of decoupled workloads
  * and reduces their over-scheduling. Synchronous workloads will still
  * have immediate wakeup/sleep latencies.
  */
-unsigned int sysctl_sched_wakeup_granularity = 5000000UL;
+unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
 
 const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
 

sched-update-the-clock-of-runqueue-select-task-rq-selected.patch:
 sched.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE sched-update-the-clock-of-runqueue-select-task-rq-selected.patch ---
From: Mike Galbraith <efault at gmx.de>
Date: Fri, 9 Oct 2009 06:35:03 +0000 (+0200)
Subject: sched: Update the clock of runqueue select_task_rq() selected
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f5dc375

sched: Update the clock of runqueue select_task_rq() selected

[ backport to 2.6.3[01] : <cebbert at redhat.com> ]

In try_to_wake_up(), we update the runqueue clock, but
select_task_rq() may select a different runqueue than the one we
updated, leaving the new runqueue's clock stale for a bit.

This patch cures occasional huge latencies reported by latencytop
when coming out of idle on a mostly idle NO_HZ box.

Signed-off-by: Mike Galbraith <efault at gmx.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
LKML-Reference: <1255070103.7639.30.camel at marge.simson.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff a/kernel/sched.c b/kernel/sched.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2344,7 +2344,7 @@ static int try_to_wake_up(struct task_st
 	int cpu, orig_cpu, this_cpu, success = 0;
 	unsigned long flags;
 	long old_state;
-	struct rq *rq;
+	struct rq *rq, *orig_rq;
 
 	if (!sched_feat(SYNC_WAKEUPS))
 		sync = 0;
@@ -2366,7 +2366,7 @@ static int try_to_wake_up(struct task_st
 #endif
 
 	smp_wmb();
-	rq = task_rq_lock(p, &flags);
+	rq = orig_rq = task_rq_lock(p, &flags);
 	update_rq_clock(rq);
 	old_state = p->state;
 	if (!(old_state & state))
@@ -2389,6 +2389,8 @@ static int try_to_wake_up(struct task_st
 		task_rq_unlock(rq, &flags);
 		/* might preempt at this point */
 		rq = task_rq_lock(p, &flags);
+		if (rq != orig_rq)
+			update_rq_clock(rq);
 		old_state = p->state;
 		if (!(old_state & state))
 			goto out;


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.97.6.10
retrieving revision 1.97.6.11
diff -u -p -r1.97.6.10 -r1.97.6.11
--- Makefile	8 Nov 2009 22:36:35 -0000	1.97.6.10
+++ Makefile	9 Dec 2009 21:44:00 -0000	1.97.6.11
@@ -15,7 +15,7 @@ UPSTREAM_CHECKS = sign
 TARGETS		= download
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.46
retrieving revision 1.238.6.47
diff -u -p -r1.238.6.46 -r1.238.6.47
--- config-generic	12 Nov 2009 23:01:04 -0000	1.238.6.46
+++ config-generic	9 Dec 2009 21:44:00 -0000	1.238.6.47
@@ -3786,8 +3786,7 @@ CONFIG_MARKERS=y
 CONFIG_DEFAULT_RELATIME=y
 
 # LIRC
-CONFIG_INPUT_LIRC=y
-CONFIG_LIRC_DEV=m
+CONFIG_INPUT_LIRC=m
 CONFIG_LIRC_BT829=m
 CONFIG_LIRC_ENE0100=m
 CONFIG_LIRC_I2C=m
@@ -4079,3 +4078,7 @@ CONFIG_XEN_NETDEV2_FRONTEND=y
 CONFIG_XEN_NETDEV2_BYPASSABLE=y
 CONFIG_XEN_NETDEV2_BYPASS_ENDPOINT=y
 CONFIG_XEN_NETDEV2_AUTOMATIC_BYPASS=y
+CONFIG_NETFILTER_XT_TARGET_IMQ=m
+CONFIG_IMQ=m
+CONFIG_XEN_BLKDEV_TAP=m
+CONFIG_IMQ_NUM_DEVS=16

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   56 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   30 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 6050 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  289 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  663 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  478 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  468 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  812 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   54 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  155 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  157 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1270 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  380 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   47 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  976 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1080 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  455 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  257 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  702 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  583 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  196 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  321 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  865 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1002 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  528 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  316 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  271 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  208 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  260 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  892 
 drivers/gpu/drm/nouveau/nv17_gpio.c         |   92 
 drivers/gpu/drm/nouveau/nv17_tv.c           |  681 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  780 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  314 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2240 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  769 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  156 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  304 
 drivers/gpu/drm/nouveau/nv50_display.c      |  998 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  273 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  494 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  470 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |26832 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  509 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  269 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  220 
 85 files changed, 64038 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.8.6.24 -r 1.8.6.25 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.24
retrieving revision 1.8.6.25
diff -u -p -r1.8.6.24 -r1.8.6.25
--- drm-nouveau.patch	8 Nov 2009 22:36:37 -0000	1.8.6.24
+++ drm-nouveau.patch	9 Dec 2009 21:44:01 -0000	1.8.6.25
@@ -1450,10 +1450,10 @@ index 0000000..b06d3d9
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..e12b4ff
+index 0000000..fd75226
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,30 @@
 +#
 +# Makefile for the drm device driver.  This driver provides support for the
 +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
@@ -1475,7 +1475,8 @@ index 0000000..e12b4ff
 +             nv50_crtc.o nv50_dac.o nv50_sor.o \
 +             nv50_cursor.o nv50_display.o nv50_fbcon.o \
 +             nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \
-+             nv04_crtc.o nv04_display.o nv04_cursor.o nv04_fbcon.o
++             nv04_crtc.o nv04_display.o nv04_cursor.o nv04_fbcon.o \
++             nv17_gpio.o
 +
 +nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
@@ -1485,7 +1486,7 @@ index 0000000..e12b4ff
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
 new file mode 100644
-index 0000000..ec0f2f3
+index 0000000..1cf4882
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
 @@ -0,0 +1,125 @@
@@ -1553,7 +1554,7 @@ index 0000000..ec0f2f3
 +
 +	err = acpi_evaluate_object(handle, "_DSM", &input, &output);
 +	if (err) {
-+		NV_ERROR(dev, "failed to evaluate _DSM: %d\n", err);
++		NV_INFO(dev, "failed to evaluate _DSM: %d\n", err);
 +		return err;
 +	}
 +
@@ -1777,10 +1778,10 @@ index 0000000..20564f8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..34d193e
+index 0000000..0b5dc12
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5716 @@
+@@ -0,0 +1,6050 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -1869,11 +1870,12 @@ index 0000000..34d193e
 +
 +static void load_vbios_prom(struct drm_device *dev, uint8_t *data)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	uint32_t pci_nv_20, save_pci_nv_20;
 +	int pcir_ptr;
 +	int i;
 +
-+	if (nv_arch(dev) >= NV_50)
++	if (dev_priv->card_type >= NV_50)
 +		pci_nv_20 = 0x88050;
 +	else
 +		pci_nv_20 = NV_PBUS_PCI_NV_20;
@@ -1912,10 +1914,11 @@ index 0000000..34d193e
 +
 +static void load_vbios_pramin(struct drm_device *dev, uint8_t *data)
 +{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	uint32_t old_bar0_pramin = 0;
 +	int i;
 +
-+	if (nv_arch(dev) >= NV_50) {
++	if (dev_priv->card_type >= NV_50) {
 +		uint32_t vbios_vram = (nv_rd32(dev, 0x619f04) & ~0xff) << 8;
 +
 +		if (!vbios_vram)
@@ -1934,7 +1937,7 @@ index 0000000..34d193e
 +		data[i] = nv_rd08(dev, NV_PRAMIN_OFFSET + i);
 +
 +out:
-+	if (nv_arch(dev) >= NV_50)
++	if (dev_priv->card_type >= NV_50)
 +		nv_wr32(dev, 0x1700, old_bar0_pramin);
 +}
 +
@@ -2074,18 +2077,21 @@ index 0000000..34d193e
 +static uint32_t
 +munge_reg(struct nvbios *bios, uint32_t reg)
 +{
-+	if (nv_arch(bios->dev) < NV_50)
-+		return reg;
++	struct drm_nouveau_private *dev_priv = bios->dev->dev_private;
++	struct dcb_entry *dcbent = bios->display.output;
 +
-+	if (!(reg & 0x40000000))
++	if (dev_priv->card_type < NV_50)
 +		return reg;
 +
-+	BUG_ON(!bios->display.output);
++	if (reg & 0x40000000) {
++		BUG_ON(!dcbent);
 +
-+	if (reg & 0x40000000)
-+		reg += (ffs(bios->display.output->or) - 1) * 0x800;
++		reg += (ffs(dcbent->or) - 1) * 0x800;
++		if ((reg & 0x20000000) && !(dcbent->sorconf.link & 1))
++			reg += 0x00000080;
++	}
 +
-+	reg &= ~0x40000000;
++	reg &= ~0x60000000;
 +	return reg;
 +}
 +
@@ -4255,103 +4261,146 @@ index 0000000..34d193e
 +}
 +
 +static bool
-+init_87(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++init_ram_restrict_pll(struct nvbios *bios, uint16_t offset,
++		      struct init_exec *iexec)
 +{
 +	/*
-+	 * INIT_87   opcode: 0x87 ('')
++	 * INIT_RAM_RESTRICT_PLL   opcode: 0x87 ('')
 +	 *
 +	 * offset      (8 bit): opcode
-+	 * offset + 1  (8 bit): unknown
-+	 * offset + 4 (32 bit): unknown entry 0
++	 * offset + 1  (8 bit): PLL type
++	 * offset + 2 (32 bit): frequency 0
 +	 *
-+	 * Unknown function.  Stubbed here as one of my cards can resume
-+	 * fine without it, but we'd still want to run the remainder
-+	 * of the script instead of aborting.
++	 * Uses the RAMCFG strap of PEXTDEV_BOOT as an index into the table at
++	 * ram_restrict_table_ptr.  The value read from there is used to select
++	 * a frequency from the table starting at 'frequency 0' to be
++	 * programmed into the PLL corresponding to 'type'.
 +	 *
-+	 * Starting from offset+4 there are BIT_M+2 32-bit entries.
++	 * The PLL limits table on cards using this opcode has a mapping of
++	 * 'type' to the relevant registers.
 +	 */
 +
-+	NV_WARN(bios->dev, "INIT_87 stubbed!\n");
++	struct drm_device *dev = bios->dev;
++	uint32_t strap = (bios_rd32(bios, NV_PEXTDEV_BOOT_0) & 0x0000003c) >> 2;
++	uint8_t index = bios->data[bios->ram_restrict_tbl_ptr + strap];
++	uint8_t type = bios->data[offset + 1];
++	uint32_t freq = ROM32(bios->data[offset + 2 + (index * 4)]);
++	uint8_t *pll_limits = &bios->data[bios->pll_limit_tbl_ptr], *entry;
++	int i;
++
++	if (!iexec->execute)
++		return true;
++
++	if (!bios->pll_limit_tbl_ptr || (pll_limits[0] & 0xf0) != 0x30) {
++		NV_ERROR(dev, "PLL limits table not version 3.x\n");
++		return true; /* deliberate, allow default clocks to remain */
++	}
++
++	entry = pll_limits + pll_limits[1];
++	for (i = 0; i < pll_limits[3]; i++, entry += pll_limits[2]) {
++		if (entry[0] == type) {
++			uint32_t reg = ROM32(entry[3]);
++
++			BIOSLOG(bios, "0x%04X: "
++				      "Type %02x Reg 0x%08x Freq %dKHz\n",
++				offset, type, reg, freq);
++
++			setPLL(bios, reg, freq);
++			return true;
++		}
++	}
++
++	NV_ERROR(dev, "PLL type 0x%02x not found in PLL limits table", type);
 +	return true;
 +}
 +
 +static bool
-+init_8e(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++init_8c(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
 +{
 +	/*
-+	 * INIT_8E   opcode: 0x8E ('')
++	 * INIT_8C   opcode: 0x8C ('')
[...6785 lines suppressed...]
++	0x0001, 0x00001e00,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0127, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000080,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x03020100,
++	0x0007, 0x00000000,
++	0x0001, 0x00000003,
++	0x0007, 0x00000000,
++	0x0001, 0x00001e00,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0027, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000003,
++	0x001f, 0x00000000,
++	0x0001, 0x00000004,
++	0x0101, 0x00000000,
++	0x0001, 0x00000021,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000100,
 +	0x0007, 0x00000000,
 +	0x0001, 0x00000100,
 +	0x0007, 0x00000000,
@@ -54981,8 +58146,10 @@ index 0000000..62914d8
 +	0x0001, 0x00000000,
 +	0x0001, 0x00000800,
 +	0x0005, 0x00000000,
++	0x0002, 0x00000001,
++	0x0001, 0x000e0080,
 +	0x0001, 0x00000004,
-+	0x0009, 0x00000000,
++	0x0006, 0x00000000,
 +	0x0001, 0x00000002,
 +	0x0001, 0x00000001,
 +	0x0003, 0x00000000,
@@ -54998,10 +58165,14 @@ index 0000000..62914d8
 +	0x0001, 0x00000000,
 +	0x0002, 0x00000001,
 +	0x0001, 0x00000000,
++	0x0003, 0x00000001,
++	0x0001, 0x00000004,
++	0x0003, 0x00000001,
 +	0x0001, 0x00000007,
-+	0x0007, 0x00000000,
 +	0x0001, 0x00000001,
-+	0x0008, 0x00000000,
++	0x0001, 0x00000007,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
 +	0x0001, 0x00000001,
 +	0x0001, 0x00000100,
 +	0x0001, 0x00000000,
@@ -55024,16 +58195,34 @@ index 0000000..62914d8
 +	0x0001, 0x00000008,
 +	0x0001, 0x00000014,
 +	0x0001, 0x00000000,
++	0x0001, 0x00000029,
 +	0x0001, 0x00000027,
-+	0x0007, 0x00000000,
++	0x0001, 0x00000026,
++	0x0001, 0x00000008,
++	0x0001, 0x00000004,
++	0x0001, 0x00000027,
++	0x0002, 0x00000000,
 +	0x0001, 0x00000001,
-+	0x0017, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000003,
++	0x0001, 0x00000004,
++	0x0001, 0x00000005,
++	0x0001, 0x00000006,
++	0x0001, 0x00000007,
++	0x0001, 0x00000001,
++	0x0010, 0x00000000,
 +	0x0001, 0x000000cf,
 +	0x000b, 0x00000000,
++	0x0001, 0x00000080,
++	0x0002, 0x00000004,
++	0x0001, 0x00000003,
 +	0x0001, 0x00000001,
-+	0x0006, 0x00000000,
++	0x0002, 0x00000000,
++	0x0001, 0x00000012,
++	0x0001, 0x00000010,
++	0x0001, 0x0000000c,
 +	0x0001, 0x00000001,
-+	0x0006, 0x00000000,
++	0x0003, 0x00000000,
 +	0x0001, 0x00000004,
 +	0x0001, 0x00000002,
 +	0x0001, 0x00000004,
@@ -55052,10 +58241,14 @@ index 0000000..62914d8
 +	0x0004, 0x00000000,
 +	0x0001, 0x00000001,
 +	0x0001, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00001000,
++	0x0001, 0x00000e00,
++	0x0001, 0x00001000,
 +	0x0001, 0x00001e00,
-+	0x0005, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0007, 0x00000000,
++	0x0001, 0x00000000,
++	0x0005, 0x00000001,
++	0x0003, 0x00000000,
 +	0x0001, 0x00000200,
 +	0x0001, 0x00000000,
 +	0x0001, 0x00000001,
@@ -55181,12 +58374,28 @@ index 0000000..62914d8
 +	0x0003, 0x00000000,
 +	0x0001, 0x07ffffff,
 +	0x0006, 0x00000000,
++	0x0001, 0x00120407,
++	0x0001, 0x05091507,
++	0x0001, 0x05010202,
 +	0x0001, 0x00030201,
-+	0x0009, 0x00000000,
++	0x0006, 0x00000000,
++	0x0001, 0x00000040,
++	0x0001, 0x0d0c0b0a,
++	0x0001, 0x00141210,
++	0x0001, 0x000001f0,
++	0x0001, 0x00000001,
++	0x0001, 0x00000003,
 +	0x0001, 0x00008000,
-+	0x0007, 0x00000000,
++	0x0001, 0x00000000,
++	0x0001, 0x00039e00,
++	0x0001, 0x00000100,
++	0x0001, 0x00003800,
++	0x0001, 0x003fe006,
++	0x0001, 0x003fe000,
++	0x0001, 0x00404040,
++	0x0001, 0x0cf7f007,
 +	0x0001, 0x02bf7fff,
-+	0x0010, 0x00000000,
++	0x0009, 0x00000000,
 +	0x0001, 0x00000004,
 +	0x0004, 0x00000000,
 +	0x0001, 0x0000003f,
@@ -56236,7 +59445,7 @@ index 0000000..62914d8
 +	0x005000cb, 0x0048004d, ~0
 +};
 +
-+static unsigned nvac_ctxvals[] = {
++static uint32_t nvac_ctxvals[] = {
 +	0x0043, 0x00000000,
 +	0x0001, 0x00000030,
 +	0x0007, 0x00000000,
@@ -57585,7 +60794,7 @@ index 0000000..62914d8
 +	0x0070000e, 0x0070001c, 0x0060000c, ~0
 +};
 +
-+static unsigned nv94_ctxvals[] = {
++static uint32_t nv94_ctxvals[] = {
 +	0x0043, 0x00000000,
 +	0x0001, 0x00000030,
 +	0x0008, 0x00000000,
@@ -60192,10 +63401,10 @@ index 0000000..e0a9c3f
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
 new file mode 100644
-index 0000000..d7fab7d
+index 0000000..ef9dc02
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,265 @@
+@@ -0,0 +1,269 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -60353,9 +63562,13 @@ index 0000000..d7fab7d
 +
 +	switch (nv_encoder->dcb->type) {
 +	case OUTPUT_TMDS:
-+		mode_ctl |= NV50_EVO_SOR_MODE_CTRL_TMDS;
-+		if (adjusted_mode->clock > 165000)
-+			mode_ctl |= NV50_EVO_SOR_MODE_CTRL_TMDS_DUAL_LINK;
++		if (nv_encoder->dcb->sorconf.link & 1) {
++			if (adjusted_mode->clock < 165000)
++				mode_ctl = 0x0100;
++			else
++				mode_ctl = 0x0500;
++		} else
++			mode_ctl = 0x0200;
 +		break;
 +	default:
 +		break;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.80
retrieving revision 1.1294.2.81
diff -u -p -r1.1294.2.80 -r1.1294.2.81
--- kernel.spec	13 Nov 2009 18:34:49 -0000	1.1294.2.80
+++ kernel.spec	9 Dec 2009 21:44:04 -0000	1.1294.2.81
@@ -624,12 +624,14 @@ Patch30: sched-introduce-SCHED_RESET_ON_
 
 Patch31: disable-stackprotector-all.patch
 
-Patch41: linux-2.6-sysrq-c.patch
-
 # Intel IOMMU fixes/workarounds
 Patch100: linux-2.6-die-closed-source-bios-muppets-die.patch
 Patch101: linux-2.6-intel-iommu-updates.patch
 Patch102: linux-2.6-iommu-at-zero.patch
+Patch103: linux-2.6-iommu-dmar-all-1s.patch
+Patch104: linux-2.6-iommu-another-hp-screwup.patch
+Patch105: linux-2.6-iommu-sanity-checks-for-intr-remap-too.patch
+Patch106: linux-2.6-iommu-hp-cantiga-resume.patch
 
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
@@ -681,12 +683,18 @@ Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-ahci-export-capabilities.patch
 
 Patch680: prism54-remove-pci-dev-table.patch
+Patch681: linux-2.6-ath9k-fixes.patch
 
 Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
+# ACPI
 Patch1100: linux-2.6.31-cpuidle-faster-io.patch
+# EC fixes from 2.6.32 (#492699, #525681)
+Patch1110: acpi-ec-merge-irq-and-poll-modes.patch
+Patch1120: acpi-ec-use-burst-mode-only-for-msi-notebooks.patch
+Patch1130: acpi-ec-restart-command-even-if-no-interrupts-from-ec.patch
 
 Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
@@ -706,7 +714,7 @@ Patch1586: linux-2.6-virtio_blk-add-supp
 
 # nouveau + drm fixes
 Patch1810: kms-offb-handoff.patch
-Patch1812: drm-next-ea1495a6.patch
+Patch1812: drm-next-b390f944.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -714,20 +722,23 @@ Patch1818: drm-i915-resume-force-mode.pa
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
-Patch1827: drm-disable-r600-aspm.patch
-Patch1828: drm-radeon-agp-font-fix.patch
-Patch1829: drm-radeon-fix-ring-rmw-issue.patch
-Patch1830: drm-r600-lenovo-w500-fix.patch
+Patch1827: drm-i915-fix-tvmode-oops.patch
 Patch1831: drm-conservative-fallback-modes.patch
 Patch1832: drm-edid-retry.patch
-Patch1833: drm-radeon-fix-agp-resume.patch
 Patch1834: drm-edid-header-fixup.patch
+Patch1835: drm-default-mode.patch
+Patch1837: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
+Patch1839: drm-radeon-misc-fixes.patch
+Patch1840: drm-radeon-rv410-test-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
 Patch1901: drm-vga-arb.patch
 Patch1902: drm-radeon-kms-arbiter-return-ignore.patch
 
+# make harmless fbcon debug less loud
+Patch1903: fbcon-lower-debug.patch
+
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
@@ -750,7 +761,7 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 Patch3000: linux-2.6-btrfs-upstream.patch
 
 # NFSv4
-Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3050: linux-2.6.31-nfsd-proot.patch
 Patch3060: linux-2.6-nfs4-ver4opt.patch
 Patch3061: linux-2.6-nfs4-callback-hidden.patch
 
@@ -764,6 +775,15 @@ Patch12012: linux-2.6-rtc-show-hctosys.p
 Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
+# sched fixes cherry-picked from 2.6.32
+Patch13100: sched-deal-with-low-load-in-wake-affine.patch
+Patch13101: sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch
+Patch13102: sched-remove-shortcut-from-select-task-rq-fair.patch
+# latency defaults from 2.6.32
+Patch13110: sched-retune-scheduler-latency-defaults.patch
+# Fix huge wakeup latencies
+Patch13120: sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
+
 # patches headed for -stable
 
 # make perf counter API available to userspace (#527264)
@@ -788,6 +808,15 @@ Patch14456: tg3-06-fix-5906-transmit-han
 
 Patch14460: highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
 Patch14461: highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
+Patch14462: highmem-fix-arm-powerpc-kmap_types.patch
+
+Patch14463: dlm-fix-connection-close-handling.patch
+
+# rhbz#544144 [bbf31bf18d34caa87dd01f08bf713635593697f2]
+Patch14464: ipv4-fix-null-ptr-deref-in-ip_fragment.patch
+
+# rhbz#544471
+Patch14465: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
 
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
@@ -1212,8 +1241,6 @@ ApplyPatch linux-2.6-utrace.patch
 ApplyPatch sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch
 
 ApplyPatch disable-stackprotector-all.patch
-# enable sysrq-c on all kernels, not only kexec
-#ApplyPatch linux-2.6-sysrq-c.patch
 
 # Architecture patches
 # x86(-64)
@@ -1230,6 +1257,13 @@ ApplyPatch linux-2.6-die-closed-source-b
 # all 0xFF, and claims that there's an IOMMU there.
 ApplyPatch linux-2.6-intel-iommu-updates.patch
 ApplyPatch linux-2.6-iommu-at-zero.patch
+ApplyPatch linux-2.6-iommu-dmar-all-1s.patch
+# Check for RMRRs which end before they start
+ApplyPatch linux-2.6-iommu-another-hp-screwup.patch
+# Apply the 'at zero' and 'all 0xFF' sanity checks for intr_remap too
+ApplyPatch linux-2.6-iommu-sanity-checks-for-intr-remap-too.patch
+# Fix up MMIO BAR for integrated graphics on HP laptops on resume (#536675)
+ApplyPatch linux-2.6-iommu-hp-cantiga-resume.patch
 
 #
 # PowerPC
@@ -1270,7 +1304,7 @@ ApplyPatch linux-2.6-btrfs-upstream.patc
 # eCryptfs
 
 # NFSv4
-ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch linux-2.6.31-nfsd-proot.patch
 ApplyPatch linux-2.6-nfs4-ver4opt.patch
 ApplyPatch linux-2.6-nfs4-callback-hidden.patch
 
@@ -1283,6 +1317,12 @@ ApplyPatch linux-2.6-usb-uvc-autosuspend
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
+# cpuidle: Fix the menu governor to boost IO performance
+ApplyPatch linux-2.6.31-cpuidle-faster-io.patch
+# EC fixes from 2.6.32 (#492699, #525681)
+ApplyPatch acpi-ec-merge-irq-and-poll-modes.patch
+ApplyPatch acpi-ec-use-burst-mode-only-for-msi-notebooks.patch
+ApplyPatch acpi-ec-restart-command-even-if-no-interrupts-from-ec.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1360,15 +1400,15 @@ ApplyPatch linux-2.6-ahci-export-capabil
 # prism54: remove pci modinfo device table
 ApplyPatch prism54-remove-pci-dev-table.patch
 
+# ath9k: add fixes suggested by upstream maintainer
+ApplyPatch linux-2.6-ath9k-fixes.patch
+
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
 # Determine cacheline sizes in a generic manner.
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
-# cpuidle: Fix the menu governor to boost IO performance
-ApplyPatch linux-2.6.31-cpuidle-faster-io.patch
-
 # http://www.lirc.org/
 ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
@@ -1398,14 +1438,13 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch kms-offb-handoff.patch
-ApplyPatch drm-next-ea1495a6.patch
-ApplyPatch drm-radeon-agp-font-fix.patch
-ApplyPatch drm-radeon-fix-ring-rmw-issue.patch
-ApplyPatch drm-r600-lenovo-w500-fix.patch
+ApplyPatch drm-next-b390f944.patch
+ApplyPatch drm-radeon-misc-fixes.patch
+ApplyPatch drm-radeon-rv410-test-fix.patch
 ApplyPatch drm-conservative-fallback-modes.patch
-ApplyPatch drm-radeon-fix-agp-resume.patch
 ApplyPatch drm-edid-retry.patch
 ApplyPatch drm-edid-header-fixup.patch
+ApplyPatch drm-default-mode.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1415,6 +1454,8 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 ApplyPatch drm-intel-no-tv-hotplug.patch
+ApplyPatch drm-i915-fix-tvmode-oops.patch
+ApplyPatch drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 #ApplyPatch drm-disable-r600-aspm.patch
 
 # VGA arb + drm
@@ -1422,6 +1463,9 @@ ApplyPatch linux-2.6-vga-arb.patch
 ApplyPatch drm-vga-arb.patch
 ApplyPatch drm-radeon-kms-arbiter-return-ignore.patch
 
+# Lower debug level of fbcon handover messages (rh#538526)
+ApplyPatch fbcon-lower-debug.patch
+
 # linux1394 git patches
 # apply if non-empty
 ApplyOptionalPatch linux-2.6-firewire-git-update.patch
@@ -1465,8 +1509,26 @@ ApplyPatch tg3-04-prevent-tx-bd-corrupti
 ApplyPatch tg3-05-assign-flags-to-fixes-in-start_xmit_dma_bug.patch
 ApplyPatch tg3-06-fix-5906-transmit-hangs.patch
 
-#ApplyPatch highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
-#ApplyPatch highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
+# sched fixes cherry-picked from 2.6.32
+ApplyPatch sched-deal-with-low-load-in-wake-affine.patch
+ApplyPatch sched-ensure-child-cant-gain-time-over-its-parent-after-fork.patch
+ApplyPatch sched-remove-shortcut-from-select-task-rq-fair.patch
+# latency defaults from 2.6.32
+ApplyPatch sched-retune-scheduler-latency-defaults.patch
+# fix wakeup latency
+ApplyPatch sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
+
+ApplyPatch highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
+ApplyPatch highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
+ApplyPatch highmem-fix-arm-powerpc-kmap_types.patch
+
+ApplyPatch dlm-fix-connection-close-handling.patch
+
+# rhbz#544144
+ApplyPatch ipv4-fix-null-ptr-deref-in-ip_fragment.patch
+
+# rhbz#544471
+ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
 
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
@@ -2120,6 +2182,126 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 09 2009 Michael Young <m.a.young at durham.ac.uk>
+- update to latest pvops patch
+
+* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.6-166
+- ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch: CVE-2009-4131
+  fix insufficient permission checking which could result in arbitrary
+  data corruption by a local unprivileged user.
+
+* Tue Dec  8 2009 Steve Dickson <steved at redhat.com> 2.6.31.6-165
+- nfsd: Updated to latest pseudo root code fixing rhbz# 538609
+
+* Mon Dec 07 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-164
+- nouveau: fix NV17 breakage caused by NVA8 fixes
+- nouveau: use ratelimit for GPU error message
+
+* Fri Dec 04 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-163
+- nouveau: reduce debug level of some warning messages (rh#543883)
+- nouveau: modesetting fixes on nva5/nva8
+- nouveau: suspend/resume fixes on nva5/nva8 (bios opcode 0x8d)
+- nouveau: cleanup chipset/arch handling, fail init on unknown chipsets
+- nouveau: fix failure to detect some outputs when dcb table is odd
+- nouveau: eliminate unnecessary cursor state changes on nv50
+
+* Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.6-162
+- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: null ptr deref
+  bug fix.
+
+* Thu Dec 03 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-161
+- rv410 LVDS on resume test fix from AMD (#541562)
+
+* Wed Dec 02 2009 John W. Linville <linville at redhat.com> 2.6.31.6-160
+- ath9k: add fixes suggested by upstream maintainer
+
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-159
+- drm-radeon-misc-fixes.patch: r400 LVDS, r600 digital dpms, cursor fix, tv property
+
+* Wed Dec 02 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-158
+- nouveau: more complete lvds script selection on >=G80 (rh#522690, rh#529859)
+- nouveau: more complete tmds script selection on >=G80 (rh#537853)
+- nouveau: TV detection fixes
+
+* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-157
+- div/0 fix harder (#540593) - also ignore unposted GPUs with no BIOS
+
+* Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-156
+- drm-next: fixes LVDS resume on r4xx, div/0 on no bios (#540593)
+  lockup on tv-out only startup.
+
+* Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com>
+- drm-i915-fix-sync-to-vbl-when-vga-is-off.patch: add (rhbz#541670)
+
+* Sun Nov 29 2009 Kyle McMartin <kyle at redhat.com>
+- Drop linux-2.6-sysrq-c.patch, made consistent upstream.
+
+* Fri Nov 27 2009 Jarod Wilson <jarod at redhat.com> 2.6.31.6-153
+- add device name to lirc_zilog, fixes issues w/multiple target devices
+- add lirc_imon pure input mode support for onboard decode devices
+
+* Wed Nov 26 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31.6-152
+- Fix intel_tv_mode_set oops (#540218)
+
+* Wed Nov 26 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31.6-151
+- VT-d: Work around yet more HP BIOS brokenness (#536675)
+
+* Wed Nov 25 2009 Kyle McMartin <kyle at redhat.com>
+- dlm: fix connection close handling.
+  Fix by lmb, requested by fabio.
+
+* Wed Nov 25 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31.6-149
+- VT-d: Work around more HP BIOS brokenness.
+
+* Tue Nov 24 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-148
+- radeon: flush HDP cache on rendering wait - fixes r600 rendercheck failure
+
+* Mon Nov 23 2009 Adam Jackson <ajax at redhat.com>
+- drm-default-mode.patch: Default to 1024x768 to match UMS. (#538761)
+
+* Mon Nov 23 2009 Roland McGrath <roland at redhat.com> 2.6.31.6-146
+- Fix oops in x86-32 kernel's iret handling for bogus user %cs. (#540580)
+
+* Fri Nov 21 2009 Kyle McMartin <kyle at redhat.com>
+- Fix up ssp' highmem fixes with fixes for arm & ppc.
+
+* Thu Nov 20 2009 Chris Wright <chrisw at redhat.com> 2.6.31.6-144
+- VT-d: another fallback for another BIOS bug (#524808)
+
+* Thu Nov 19 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-142
+- Oops, add new patch to spec file
+
+* Thu Nov 19 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-141
+- Lower debug level of fbcon handover messages (rh#538526)
+
+* Thu Nov 19 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-140
+- drm-next-44c83571.patch: oops pulled the wrong tree into my f12 tree
+
+* Thu Nov 19 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.6-139
+- nouveau: s/r fixes on chipsets using bios opcode 0x87
+- nouveau: fixes to bios opcode 0x8e
+- nouveau: hopefully fix nv1x context switching issues (rh#526577)
+- nouveau: support for NVA5 (GeForce G220)
+- nouveau: fixes for NVAA support
+
+* Thu Nov 19 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-138
+- drm-next-d56672a9.patch: fix some rn50 cloning issues
+
+* Wed Nov 18 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31.6-137
+- Actually force the IOMMU not to be used when we detect the HP/Acer bug.
+
+* Tue Nov 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.6-136
+- ACPI embedded controller fixes from Fedora 11.
+
+* Tue Nov 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.6-135
+- Scheduler fixes and latency tuning patches from F-11.
+
+* Tue Nov 17 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-134
+- glad to see edid retry patch was compiled.
+
+* Tue Nov 17 2009 Dave Airlie <airlied at redhat.com> 2.6.31.6-133
+- drm-next-984d1f3c.patch: rebase with upstream fixes - drop all merged
+
 * Fri Nov 13 2009 Michael Young <m.a.young at durham.ac.uk>
 - fix typo in drm-edid-retry.patch
 

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h      |   25 +++++++
 arch/x86/include/asm/mmu.h       |    7 ++
 arch/x86/include/asm/paravirt.h  |    9 ++
 arch/x86/include/asm/processor.h |    3 
 arch/x86/kernel/cpu/common.c     |   14 ++++
 arch/x86/kernel/paravirt.c       |    3 
 arch/x86/kernel/process_32.c     |   48 ++++++++++++++
 arch/x86/kernel/traps.c          |  129 ++++++++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c               |    6 +
 arch/x86/mm/init_32.c            |   48 ++++++++++++++
 arch/x86/mm/mmap.c               |    5 +
 arch/x86/mm/tlb.c                |    7 ++
 arch/x86/vdso/vdso32-setup.c     |    2 
 arch/x86/xen/enlighten.c         |   21 ++++++
 fs/binfmt_elf.c                  |   21 +++++-
 include/linux/mm.h               |    8 ++
 include/linux/mm_types.h         |    3 
 include/linux/resource.h         |    5 +
 include/linux/sched.h            |    7 ++
 kernel/sysctl.c                  |   28 ++++++++
 mm/mmap.c                        |  121 ++++++++++++++++++++++++++++++++++--
 mm/mprotect.c                    |   10 ++-
 mm/mremap.c                      |    4 -
 23 files changed, 506 insertions(+), 28 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.102.6.3
retrieving revision 1.102.6.4
diff -u -p -r1.102.6.3 -r1.102.6.4
--- linux-2.6-execshield.patch	27 Jun 2009 11:05:15 -0000	1.102.6.3
+++ linux-2.6-execshield.patch	9 Dec 2009 21:44:04 -0000	1.102.6.4
@@ -381,7 +381,7 @@ index 07d60c8..41e9129 100644
 +			info.si_errno = 0;
 +			info.si_code = ILL_BADSTK;
 +			info.si_addr = 0;
-+			do_trap(32, SIGSEGV, "iret exception", 0, error_code, &info);
++			do_trap(32, SIGSEGV, "iret exception", regs, error_code, &info);
 +	}
  }
  #endif

linux-2.6-iommu-at-zero.patch:
 dmar.c |   50 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 10 deletions(-)

Index: linux-2.6-iommu-at-zero.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/linux-2.6-iommu-at-zero.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- linux-2.6-iommu-at-zero.patch	8 Nov 2009 22:36:41 -0000	1.1.2.1
+++ linux-2.6-iommu-at-zero.patch	9 Dec 2009 21:44:04 -0000	1.1.2.2
@@ -18,7 +18,7 @@ index 22b02c6..e5f8fc1 100644
  	dmaru = kzalloc(sizeof(*dmaru), GFP_KERNEL);
  	if (!dmaru)
  		return -ENOMEM;
-@@ -591,12 +582,50 @@ int __init dmar_table_init(void)
+@@ -591,12 +582,51 @@ int __init dmar_table_init(void)
  	return 0;
  }
  
@@ -49,6 +49,7 @@ index 22b02c6..e5f8fc1 100644
 +				     dmi_get_system_info(DMI_BIOS_VENDOR),
 +				     dmi_get_system_info(DMI_BIOS_VERSION),
 +				     dmi_get_system_info(DMI_PRODUCT_VERSION));
++				dmar_disabled = 1;
 +				return 0;
 +			}
 +			break;

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  114 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  837 +++++++++++
 drivers/input/lirc/lirc_dev.h         |  194 ++
 drivers/input/lirc/lirc_ene0100.c     |  645 ++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  538 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++
 drivers/input/lirc/lirc_imon.c        | 2467 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_imon.h        |  209 ++
 drivers/input/lirc/lirc_it87.c        |  986 +++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  540 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1232 ++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 +++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 ++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 ++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 +++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1396 +++++++++++++++++++
 27 files changed, 15972 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2.2.4 -r 1.2.2.5 lirc-2.6.31.patchIndex: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/lirc-2.6.31.patch,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -p -r1.2.2.4 -r1.2.2.5
--- lirc-2.6.31.patch	16 Oct 2009 16:09:25 -0000	1.2.2.4
+++ lirc-2.6.31.patch	9 Dec 2009 21:44:04 -0000	1.2.2.5
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Thursday, September 03, 2009
+Last updated: Friday, November 27, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -10,36 +10,37 @@ Signed-off-by: Jarod Wilson <jarod at redha
  MAINTAINERS                           |    9 +
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  119 ++
+ drivers/input/lirc/Kconfig            |  114 ++
  drivers/input/lirc/Makefile           |   21 +
  drivers/input/lirc/lirc.h             |  100 ++
- drivers/input/lirc/lirc_bt829.c       |  383 ++++++
- drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
- drivers/input/lirc/lirc_dev.h         |  184 +++
- drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
+ drivers/input/lirc/lirc_bt829.c       |  383 +++++
+ drivers/input/lirc/lirc_dev.c         |  837 +++++++++++
+ drivers/input/lirc/lirc_dev.h         |  194 +++
+ drivers/input/lirc/lirc_ene0100.c     |  645 +++++++++
  drivers/input/lirc/lirc_ene0100.h     |  169 +++
- drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
+ drivers/input/lirc/lirc_i2c.c         |  538 +++++++
  drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
- drivers/input/lirc/lirc_imon.c        | 2301 +++++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 2467 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.h        |  209 +++
+ drivers/input/lirc/lirc_it87.c        |  986 +++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
- drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
- drivers/input/lirc/lirc_mceusb.c      | 1242 ++++++++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  540 +++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1232 ++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
  drivers/input/lirc/lirc_parallel.h    |   26 +
  drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
- drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
- drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++++
+ drivers/input/lirc/lirc_serial.c      | 1316 ++++++++++++++++++
+ drivers/input/lirc/lirc_sir.c         | 1283 +++++++++++++++++
+ drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
- drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
- 26 files changed, 15600 insertions(+), 0 deletions(-)
+ drivers/input/lirc/lirc_zilog.c       | 1396 +++++++++++++++++++
+ 27 files changed, 15972 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 8dca9d8..f25dc26 100644
+index 81d68d5..f6af1bd 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3129,6 +3129,15 @@ W:	http://www.pasemi.com/
+@@ -3219,6 +3219,15 @@ W:	http://www.pasemi.com/
  L:	linuxppc-dev at ozlabs.org
  S:	Supported
  
@@ -80,15 +81,15 @@ index 4c9c745..99e2b5e 100644
 +obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..ab13cfe
+index 0000000..8678018
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,114 @@
 +#
 +# LIRC driver(s) configuration
 +#
 +menuconfig INPUT_LIRC
-+	bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
++	tristate "Linux Infrared Remote Control IR receiver/transmitter drivers"
 +	help
 +	  Say Y here, and all supported Linux Infrared Remote Control IR and
 +	  RF receiver and transmitter drivers will be displayed. When paired
@@ -97,20 +98,15 @@ index 0000000..ab13cfe
 +
 +if INPUT_LIRC
 +
-+config LIRC_DEV
-+	tristate "LIRC device loadable module support"
-+	help
-+	  LIRC device loadable module support, required for most LIRC drivers
-+
 +config LIRC_BT829
 +        tristate "BT829 based hardware"
-+	depends on LIRC_DEV
++	depends on INPUT_LIRC
 +	help
 +	  Driver for the IR interface on BT829-based hardware
 +
 +config LIRC_ENE0100
 +	tristate "ENE KB3924/ENE0100 CIR Port Reciever"
-+	depends on LIRC_DEV
++	depends on INPUT_LIRC
 +	help
 +	  This is a driver for CIR port handled by ENE KB3924 embedded
 +	  controller found on some notebooks.
@@ -118,56 +114,56 @@ index 0000000..ab13cfe
 +
 +config LIRC_I2C
 +	tristate "I2C Based IR Receivers"
-+	depends on LIRC_DEV
++	depends on INPUT_LIRC
 +	help
 +	  Driver for I2C-based IR receivers, such as those commonly
 +	  found onboard Hauppauge PVR-150/250/350 video capture cards
 +
 +config LIRC_IGORPLUGUSB
 +	tristate "Igor Cesko's USB IR Receiver"
-+	depends on LIRC_DEV && USB
++	depends on INPUT_LIRC && USB
 +	help
 +	  Driver for Igor Cesko's USB IR Receiver
 +
 +config LIRC_IMON
-+	tristate "Soundgraph IMON Receiver"
-+	depends on LIRC_DEV
++	tristate "SoundGraph iMON Receiver and Display"
++	depends on INPUT_LIRC
 +	help
-+	  Driver for the Soundgraph IMON IR Receiver
++	  Driver for the SoundGraph iMON IR Receiver and Display
 +
 +config LIRC_IT87
 +	tristate "ITE IT87XX CIR Port Receiver"
-+	depends on LIRC_DEV
++	depends on INPUT_LIRC
 +	help
 +	  Driver for the ITE IT87xx IR Receiver
 +
 +config LIRC_ITE8709
 +	tristate "ITE8709 CIR Port Receiver"
-+	depends on LIRC_DEV && PNP
++	depends on INPUT_LIRC && PNP
 +	help
 +	  Driver for the ITE8709 IR Receiver
 +
 +config LIRC_MCEUSB
 +	tristate "Windows Media Center Ed. USB IR Transceiver"
-+	depends on LIRC_DEV && USB
++	depends on INPUT_LIRC && USB
 +	help
 +	  Driver for Windows Media Center Ed. USB IR Transceivers
 +
 +config LIRC_PARALLEL
 +	tristate "Homebrew Parallel Port Receiver"
-+	depends on LIRC_DEV && !SMP
++	depends on INPUT_LIRC && !SMP
 +	help
 +	  Driver for Homebrew Parallel Port Receivers
 +
 +config LIRC_SASEM
 +	tristate "Sasem USB IR Remote"
-+	depends on LIRC_DEV
++	depends on INPUT_LIRC
 +	help
 +	  Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
 +
 +config LIRC_SERIAL
 +	tristate "Homebrew Serial Port Receiver"
-+	depends on LIRC_DEV
++	depends on INPUT_LIRC
 +	help
 +	  Driver for Homebrew Serial Port Receivers
 +
@@ -180,32 +176,32 @@ index 0000000..ab13cfe
 +
 +config LIRC_SIR
 +	tristate "Built-in SIR IrDA port"
-+	depends on LIRC_DEV
++	depends on INPUT_LIRC
 +	help
 +	  Driver for the SIR IrDA port
 +
 +config LIRC_STREAMZAP
 +	tristate "Streamzap PC Receiver"
-+	depends on LIRC_DEV
++	depends on INPUT_LIRC
 +	help
 +	  Driver for the Streamzap PC Receiver
 +
 +config LIRC_TTUSBIR
 +	tristate "Technotrend USB IR Receiver"
-+	depends on LIRC_DEV && USB
[...1952 lines suppressed...]
-+	dprintk("%s - ret = %d status = 0x%x 0x%x\n", __func__,
++	dev_dbg(ir->d->dev, "%s - ret = %d status = 0x%x 0x%x\n", __func__,
 +		ret, data[0], data[1]);
 +
 +	/*
@@ -8526,29 +8903,29 @@ index 0000000..8b48a56
 +	ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0),
 +			      USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0,
 +			      data, 2, HZ * 3);
-+	dprintk("%s - ret = %d, devnum = %d\n",
++	dev_dbg(ir->d->dev, "%s - ret = %d, devnum = %d\n",
 +		__func__, ret, ir->usbdev->devnum);
-+	dprintk("%s - data[0] = %d, data[1] = %d\n",
++	dev_dbg(ir->d->dev, "%s - data[0] = %d, data[1] = %d\n",
 +		__func__, data[0], data[1]);
 +
-+	/* set feature */
++	/* set feature: bit rate 38400 bps */
 +	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
 +			      USB_REQ_SET_FEATURE, USB_TYPE_VENDOR,
 +			      0xc04e, 0x0000, NULL, 0, HZ * 3);
 +
-+	dprintk("%s - ret = %d\n", __func__, ret);
++	dev_dbg(ir->d->dev, "%s - ret = %d\n", __func__, ret);
 +
-+	/* strange: bRequest == 4 */
++	/* bRequest 4: set char length to 8 bits */
 +	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
 +			      4, USB_TYPE_VENDOR,
 +			      0x0808, 0x0000, NULL, 0, HZ * 3);
-+	dprintk("%s - retB = %d\n", __func__, ret);
++	dev_dbg(ir->d->dev, "%s - retB = %d\n", __func__, ret);
 +
-+	/* strange: bRequest == 2 */
++	/* bRequest 2: set handshaking to use DTR/DSR */
 +	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
 +			      2, USB_TYPE_VENDOR,
 +			      0x0000, 0x0100, NULL, 0, HZ * 3);
-+	dprintk("%s - retC = %d\n", __func__, ret);
++	dev_dbg(ir->d->dev, "%s - retC = %d\n", __func__, ret);
 +
 +	return ret;
 +
@@ -8574,7 +8951,7 @@ index 0000000..8b48a56
 +	int is_pinnacle;
 +	int is_microsoft_gen1;
 +
-+	dprintk(DRIVER_NAME ": %s called\n", __func__);
++	dev_dbg(&intf->dev, ": %s called\n", __func__);
 +
 +	usb_reset_device(dev);
 +
@@ -8598,7 +8975,7 @@ index 0000000..8b48a56
 +			|| ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
 +			    == USB_ENDPOINT_XFER_INT))) {
 +
-+			dprintk(DRIVER_NAME ": acceptable inbound endpoint "
++			dev_dbg(&intf->dev, ": acceptable inbound endpoint "
 +				"found\n");
 +			ep_in = ep;
 +			ep_in->bmAttributes = USB_ENDPOINT_XFER_INT;
@@ -8620,7 +8997,7 @@ index 0000000..8b48a56
 +			|| ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
 +			    == USB_ENDPOINT_XFER_INT))) {
 +
-+			dprintk(DRIVER_NAME ": acceptable outbound endpoint "
++			dev_dbg(&intf->dev, ": acceptable outbound endpoint "
 +				"found\n");
 +			ep_out = ep;
 +			ep_out->bmAttributes = USB_ENDPOINT_XFER_INT;
@@ -8635,7 +9012,7 @@ index 0000000..8b48a56
 +		}
 +	}
 +	if (ep_in == NULL) {
-+		dprintk(DRIVER_NAME ": inbound and/or endpoint not found\n");
++		dev_dbg(&intf->dev, ": inbound and/or endpoint not found\n");
 +		return -ENODEV;
 +	}
 +
@@ -8679,7 +9056,7 @@ index 0000000..8b48a56
 +		goto mem_failure_switch;
 +	}
 +
-+	strcpy(driver->name, DRIVER_NAME " ");
++	strcpy(driver->name, DRIVER_NAME);
 +	driver->minor = -1;
 +	driver->features = LIRC_CAN_SEND_PULSE |
 +		LIRC_CAN_SET_TRANSMITTER_MASK |
@@ -8717,8 +9094,7 @@ index 0000000..8b48a56
 +	case 2:
 +		kfree(ir);
 +	case 1:
-+		printk(DRIVER_NAME "[%d]: out of memory (code=%d)\n",
-+			devnum, mem_failure);
++		dev_info(&intf->dev, "out of memory (code=%d)\n", mem_failure);
 +		return -ENOMEM;
 +	}
 +
@@ -8752,8 +9128,6 @@ index 0000000..8b48a56
 +			  buf, sizeof(buf)) > 0)
 +		snprintf(name + strlen(name), sizeof(name) - strlen(name),
 +			 " %s", buf);
-+	printk(DRIVER_NAME "[%d]: %s on usb%d:%d\n", devnum, name,
-+	       dev->bus->busnum, devnum);
 +
 +	/* inbound data */
 +	usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in,
@@ -8775,8 +9149,7 @@ index 0000000..8b48a56
 +		 */
 +
 +		usbret = usb_reset_configuration(dev);
-+		printk(DRIVER_NAME "[%d]: usb reset config ret %x\n",
-+		       devnum, usbret);
++		dev_info(ir->d->dev, "usb reset config ret %x\n", usbret);
 +
 +		/*
 +		 * its possible we really should wait for a return
@@ -8817,6 +9190,9 @@ index 0000000..8b48a56
 +
 +	usb_set_intfdata(intf, ir);
 +
++	dev_info(ir->d->dev, "Registered %s on usb%d:%d\n", name,
++		 dev->bus->busnum, devnum);
++
 +	return 0;
 +}
 +
@@ -8846,7 +9222,7 @@ index 0000000..8b48a56
 +static int mceusb_dev_suspend(struct usb_interface *intf, pm_message_t message)
 +{
 +	struct mceusb_dev *ir = usb_get_intfdata(intf);
-+	printk(DRIVER_NAME "[%d]: suspend\n", ir->devnum);
++	dev_info(ir->d->dev, "suspend\n");
 +	usb_kill_urb(ir->urb_in);
 +	return 0;
 +}
@@ -8854,7 +9230,7 @@ index 0000000..8b48a56
 +static int mceusb_dev_resume(struct usb_interface *intf)
 +{
 +	struct mceusb_dev *ir = usb_get_intfdata(intf);
-+	printk(DRIVER_NAME "[%d]: resume\n", ir->devnum);
++	dev_info(ir->d->dev, "resume\n");
 +	if (usb_submit_urb(ir->urb_in, GFP_ATOMIC))
 +		return -EIO;
 +	return 0;
@@ -8876,11 +9252,13 @@ index 0000000..8b48a56
 +
 +	printk(KERN_INFO DRIVER_NAME ": " DRIVER_DESC " " DRIVER_VERSION "\n");
 +	printk(KERN_INFO DRIVER_NAME ": " DRIVER_AUTHOR "\n");
-+	dprintk(DRIVER_NAME ": debug mode enabled\n");
++	if (debug)
++		printk(KERN_DEBUG DRIVER_NAME ": debug mode enabled\n");
 +
 +	i = usb_register(&mceusb_dev_driver);
 +	if (i < 0) {
-+		printk(DRIVER_NAME ": usb register failed, result = %d\n", i);
++		printk(KERN_ERR DRIVER_NAME
++		       ": usb register failed, result = %d\n", i);
 +		return -ENODEV;
 +	}
 +
@@ -11912,7 +12290,7 @@ index 0000000..d602e90
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
 new file mode 100644
-index 0000000..b497642
+index 0000000..d28d006
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sir.c
 @@ -0,0 +1,1283 @@
@@ -12292,7 +12670,7 @@ index 0000000..b497642
 +	case LIRC_SET_SEND_DUTY_CYCLE:
 +		retval = get_user(ivalue, (unsigned int *) arg);
 +		if (retval)
-+			return reetval;
++			return retval;
 +		if (ivalue <= 0 || ivalue > 100)
 +			return -EINVAL;
 +		/* (ivalue/100)*(1000000/freq) */
@@ -14404,10 +14782,10 @@ index 0000000..2955bad
 +module_exit(ttusbir_exit_module);
 diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
 new file mode 100644
-index 0000000..c4080f5
+index 0000000..b19c447
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1395 @@
+@@ -0,0 +1,1396 @@
 +/*
 + * i2c IR lirc driver for devices with zilog IR processors
 + *
@@ -15703,6 +16081,7 @@ index 0000000..c4080f5
 +	ir->l.fops	  = &lirc_fops;
 +	ir->l.data	  = ir;
 +	ir->l.minor       = minor;
++	ir->l.dev         = &adap->dev;
 +	ir->l.sample_rate = 0;
 +
 +	/* register with lirc */

sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch:
 include/linux/sched.h |    6 +++++
 kernel/sched.c        |   54 ++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 52 insertions(+), 8 deletions(-)

Index: sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.2 -r1.2.2.3
--- sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch	27 Jun 2009 11:05:16 -0000	1.2.2.2
+++ sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch	9 Dec 2009 21:44:05 -0000	1.2.2.3
@@ -1,3 +1,33 @@
+Rollup of:
+
+
+From: Lennart Poettering <lennart at poettering.net>
+Date: Mon, 15 Jun 2009 15:17:47 +0000 (+0200)
+Subject: sched: Introduce SCHED_RESET_ON_FORK scheduling policy flag
+X-Git-Tag: v2.6.32-rc1~719^2~55
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ca94c442535a44d508c99a77e54f21a59f4fc462
+
+sched: Introduce SCHED_RESET_ON_FORK scheduling policy flag
+
+
+From: Mike Galbraith <efault at gmx.de>
+Date: Wed, 17 Jun 2009 08:46:01 +0000 (+0200)
+Subject: sched: Clean up SCHED_RESET_ON_FORK
+X-Git-Tag: v2.6.32-rc1~719^2~54
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b9dc29e72fd3dc2a739ce8eafd958220d0745734
+
+sched: Clean up SCHED_RESET_ON_FORK
+
+
+From: Mike Galbraith <efault at gmx.de>
+Date: Wed, 17 Jun 2009 08:48:02 +0000 (+0200)
+Subject: sched: Add SCHED_RESET_ON_FORK functionality for nice < 0 tasks
+X-Git-Tag: v2.6.32-rc1~719^2~53
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6c697bdf08a09ce461e305a22362973036e95db3
+
+sched: Add SCHED_RESET_ON_FORK functionality for nice < 0 tasks
+
+
 diff --git a/include/linux/sched.h b/include/linux/sched.h
 index 4d07542..5ba2c37 100644
 --- a/include/linux/sched.h

xen.pvops.patch:
 arch/x86/Kconfig                                     |   14 
 arch/x86/Makefile                                    |    2 
 arch/x86/include/asm/agp.h                           |   17 
 arch/x86/include/asm/e820.h                          |    2 
 arch/x86/include/asm/fixmap.h                        |   25 
 arch/x86/include/asm/hpet.h                          |    2 
 arch/x86/include/asm/i387.h                          |    1 
 arch/x86/include/asm/io.h                            |   15 
 arch/x86/include/asm/io_apic.h                       |    7 
 arch/x86/include/asm/microcode.h                     |    9 
 arch/x86/include/asm/mmu.h                           |    3 
 arch/x86/include/asm/paravirt.h                      |  720 --------
 arch/x86/include/asm/paravirt_types.h                |  724 ++++++++
 arch/x86/include/asm/pci.h                           |    9 
 arch/x86/include/asm/pci_x86.h                       |    2 
 arch/x86/include/asm/pgtable.h                       |    6 
 arch/x86/include/asm/processor.h                     |    4 
 arch/x86/include/asm/pvclock.h                       |    6 
 arch/x86/include/asm/syscalls.h                      |    8 
 arch/x86/include/asm/tlbflush.h                      |    6 
 arch/x86/include/asm/vgtod.h                         |   64 
 arch/x86/include/asm/vsyscall.h                      |   32 
 arch/x86/include/asm/xen/hypercall.h                 |   44 
 arch/x86/include/asm/xen/interface.h                 |    8 
 arch/x86/include/asm/xen/interface_32.h              |    5 
 arch/x86/include/asm/xen/interface_64.h              |   13 
 arch/x86/include/asm/xen/iommu.h                     |   12 
 arch/x86/include/asm/xen/page.h                      |   16 
 arch/x86/include/asm/xen/pci.h                       |   58 
 arch/x86/include/asm/xen/swiotlb.h                   |   10 
 arch/x86/kernel/Makefile                             |    6 
 arch/x86/kernel/acpi/boot.c                          |   18 
 arch/x86/kernel/acpi/processor.c                     |   14 
 arch/x86/kernel/acpi/sleep.c                         |    2 
 arch/x86/kernel/apic/io_apic.c                       |   68 
 arch/x86/kernel/cpu/mtrr/Makefile                    |    1 
 arch/x86/kernel/cpu/mtrr/amd.c                       |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c                   |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c                     |    6 
 arch/x86/kernel/cpu/mtrr/generic.c                   |   10 
 arch/x86/kernel/cpu/mtrr/main.c                      |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h                      |   11 
 arch/x86/kernel/cpu/mtrr/xen.c                       |  104 +
 arch/x86/kernel/e820.c                               |   30 
 arch/x86/kernel/hpet.c                               |    8 
 arch/x86/kernel/ioport.c                             |   40 
 arch/x86/kernel/kvmclock.c                           |    7 
 arch/x86/kernel/ldt.c                                |    3 
 arch/x86/kernel/microcode_core.c                     |    5 
 arch/x86/kernel/microcode_xen.c                      |  200 ++
 arch/x86/kernel/paravirt.c                           |    1 
 arch/x86/kernel/pci-dma.c                            |    6 
 arch/x86/kernel/pci-swiotlb.c                        |   25 
 arch/x86/kernel/process.c                            |   27 
 arch/x86/kernel/process_32.c                         |   27 
 arch/x86/kernel/process_64.c                         |   33 
 arch/x86/kernel/pvclock.c                            |  190 +-
 arch/x86/kernel/setup.c                              |    4 
 arch/x86/kernel/traps.c                              |   33 
 arch/x86/kernel/tsc.c                                |    4 
 arch/x86/kernel/vsyscall_64.c                        |   91 -
 arch/x86/mm/Makefile                                 |    7 
 arch/x86/mm/gup.c                                    |    5 
 arch/x86/mm/init_32.c                                |   42 
 arch/x86/mm/ioremap.c                                |   72 
 arch/x86/mm/pat.c                                    |    2 
 arch/x86/mm/pgtable.c                                |   18 
 arch/x86/mm/physaddr.c                               |   70 
 arch/x86/mm/physaddr.h                               |   10 
 arch/x86/mm/tlb.c                                    |   35 
 arch/x86/pci/Makefile                                |    1 
 arch/x86/pci/common.c                                |   18 
 arch/x86/pci/i386.c                                  |    3 
 arch/x86/pci/init.c                                  |    6 
 arch/x86/pci/xen.c                                   |   66 
 arch/x86/vdso/vclock_gettime.c                       |   46 
 arch/x86/vdso/vgetcpu.c                              |   17 
 arch/x86/xen/Kconfig                                 |   38 
 arch/x86/xen/Makefile                                |    5 
 arch/x86/xen/apic.c                                  |   57 
 arch/x86/xen/enlighten.c                             |  120 +
 arch/x86/xen/grant-table.c                           |   38 
 arch/x86/xen/mmu.c                                   |  491 +++++
 arch/x86/xen/pci-swiotlb.c                           |  997 +++++++++++
 arch/x86/xen/pci.c                                   |  153 +
 arch/x86/xen/setup.c                                 |  115 +
 arch/x86/xen/smp.c                                   |    5 
 arch/x86/xen/suspend.c                               |   17 
 arch/x86/xen/time.c                                  |   68 
 arch/x86/xen/vga.c                                   |   67 
 arch/x86/xen/xen-asm_64.S                            |    4 
 arch/x86/xen/xen-ops.h                               |   29 
 block/blk-core.c                                     |    2 
 drivers/acpi/acpica/hwsleep.c                        |   17 
 drivers/acpi/processor_core.c                        |  347 +++
 drivers/acpi/processor_idle.c                        |  103 +
 drivers/acpi/processor_perflib.c                     |  123 +
 drivers/acpi/sleep.c                                 |   19 
 drivers/block/Kconfig                                |    1 
 drivers/block/xen-blkfront.c                         |   14 
 drivers/char/agp/intel-agp.c                         |   17 
 drivers/char/hvc_xen.c                               |  120 +
 drivers/gpu/drm/drm_drv.c                            |    2 
 drivers/gpu/drm/drm_gem.c                            |    2 
 drivers/gpu/drm/drm_scatter.c                        |   67 
 drivers/gpu/drm/ttm/ttm_bo_vm.c                      |    2 
 drivers/input/Kconfig                                |    1 
 drivers/input/xen-kbdfront.c                         |    2 
 drivers/net/Kconfig                                  |  174 ++
 drivers/net/Makefile                                 |    2 
 drivers/net/imq.c                                    |  594 ++++++
 drivers/net/xen-netchannel2/Makefile                 |   25 
 drivers/net/xen-netchannel2/autobypass.c             |  316 +++
 drivers/net/xen-netchannel2/bypass.c                 |  823 +++++++++
 drivers/net/xen-netchannel2/bypassee.c               |  803 +++++++++
 drivers/net/xen-netchannel2/chan.c                   |  843 +++++++++
 drivers/net/xen-netchannel2/netback2.c               |  482 +++++
 drivers/net/xen-netchannel2/netchan2.c               |   32 
 drivers/net/xen-netchannel2/netchannel2_core.h       |  796 +++++++++
 drivers/net/xen-netchannel2/netchannel2_endpoint.h   |   63 
 drivers/net/xen-netchannel2/netchannel2_uspace.h     |   17 
 drivers/net/xen-netchannel2/netfront2.c              |  514 +++++
 drivers/net/xen-netchannel2/offload.c                |  181 ++
 drivers/net/xen-netchannel2/poll.c                   |   59 
 drivers/net/xen-netchannel2/receiver_map.c           |  787 +++++++++
 drivers/net/xen-netchannel2/recv_packet.c            |  333 +++
 drivers/net/xen-netchannel2/rscb.c                   |  435 +++++
 drivers/net/xen-netchannel2/tools/destroy_bypass.c   |   25 
 drivers/net/xen-netchannel2/tools/establish_bypass.c |   31 
 drivers/net/xen-netchannel2/util.c                   |  241 ++
 drivers/net/xen-netchannel2/xmit_packet.c            |  374 ++++
 drivers/net/xen-netfront.c                           |   10 
 drivers/pci/Kconfig                                  |    9 
 drivers/pci/Makefile                                 |    4 
 drivers/pci/msi.c                                    |    5 
 drivers/pci/xen-iommu.c                              |  274 +++
 drivers/pci/xen-pcifront.c                           | 1134 +++++++++++++
 drivers/video/Kconfig                                |    1 
 drivers/video/broadsheetfb.c                         |    2 
 drivers/video/fb_defio.c                             |    4 
 drivers/video/hecubafb.c                             |    2 
 drivers/video/metronomefb.c                          |    2 
 drivers/video/xen-fbfront.c                          |    4 
 drivers/xen/Kconfig                                  |  125 +
 drivers/xen/Makefile                                 |   28 
 drivers/xen/acpi.c                                   |   23 
 drivers/xen/acpi_processor.c                         |  336 +++
 drivers/xen/balloon.c                                |  314 ++-
 drivers/xen/biomerge.c                               |   14 
 drivers/xen/blkback/Makefile                         |    3 
 drivers/xen/blkback/blkback-pagemap.c                |  104 +
 drivers/xen/blkback/blkback-pagemap.h                |   20 
 drivers/xen/blkback/blkback.c                        |  673 +++++++
 drivers/xen/blkback/common.h                         |  143 +
 drivers/xen/blkback/interface.c                      |  186 ++
 drivers/xen/blkback/vbd.c                            |  118 +
 drivers/xen/blkback/xenbus.c                         |  541 ++++++
 drivers/xen/blktap/Makefile                          |    3 
 drivers/xen/blktap/blktap.h                          |  243 ++
 drivers/xen/blktap/control.c                         |  280 +++
 drivers/xen/blktap/device.c                          | 1140 +++++++++++++
 drivers/xen/blktap/request.c                         |  298 +++
 drivers/xen/blktap/ring.c                            |  615 +++++++
 drivers/xen/blktap/sysfs.c                           |  452 +++++
 drivers/xen/blktap/wait_queue.c                      |   40 
 drivers/xen/events.c                                 |  527 +++++-
 drivers/xen/evtchn.c                                 |   82 
 drivers/xen/features.c                               |    2 
 drivers/xen/gntdev.c                                 |  625 +++++++
 drivers/xen/grant-table.c                            |  491 +++++
 drivers/xen/live_maps.c                              |   61 
 drivers/xen/manage.c                                 |   37 
 drivers/xen/mce.c                                    |  213 ++
 drivers/xen/netback/Makefile                         |    3 
 drivers/xen/netback/common.h                         |  223 ++
 drivers/xen/netback/interface.c                      |  401 ++++
 drivers/xen/netback/netback.c                        | 1650 +++++++++++++++++++
 drivers/xen/netback/xenbus.c                         |  470 +++++
 drivers/xen/pci.c                                    |  124 +
 drivers/xen/pciback/Makefile                         |   17 
 drivers/xen/pciback/conf_space.c                     |  435 +++++
 drivers/xen/pciback/conf_space.h                     |  126 +
 drivers/xen/pciback/conf_space_capability.c          |   66 
 drivers/xen/pciback/conf_space_capability.h          |   26 
 drivers/xen/pciback/conf_space_capability_msi.c      |   84 
 drivers/xen/pciback/conf_space_capability_pm.c       |  113 +
 drivers/xen/pciback/conf_space_capability_vpd.c      |   40 
 drivers/xen/pciback/conf_space_header.c              |  318 +++
 drivers/xen/pciback/conf_space_quirks.c              |  140 +
 drivers/xen/pciback/conf_space_quirks.h              |   35 
 drivers/xen/pciback/controller.c                     |  442 +++++
 drivers/xen/pciback/passthrough.c                    |  178 ++
 drivers/xen/pciback/pci_stub.c                       | 1307 +++++++++++++++
 drivers/xen/pciback/pciback.h                        |  133 +
 drivers/xen/pciback/pciback_ops.c                    |  130 +
 drivers/xen/pciback/slot.c                           |  191 ++
 drivers/xen/pciback/vpci.c                           |  244 ++
 drivers/xen/pciback/xenbus.c                         |  709 ++++++++
 drivers/xen/pcpu.c                                   |  420 ++++
 drivers/xen/xenbus/Makefile                          |    5 
 drivers/xen/xenbus/xenbus_client.c                   |   15 
 drivers/xen/xenbus/xenbus_comms.c                    |    1 
 drivers/xen/xenbus/xenbus_probe.c                    |  384 +---
 drivers/xen/xenbus/xenbus_probe.h                    |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c            |  298 +++
 drivers/xen/xenbus/xenbus_probe_frontend.c           |  292 +++
 drivers/xen/xenbus/xenbus_xs.c                       |  187 ++
 drivers/xen/xenfs/Makefile                           |    3 
 drivers/xen/xenfs/privcmd.c                          |  403 ++++
 drivers/xen/xenfs/super.c                            |   98 +
 drivers/xen/xenfs/xenfs.h                            |    3 
 drivers/xen/xenfs/xenstored.c                        |   67 
 include/acpi/processor.h                             |   17 
 include/asm-generic/pci.h                            |    2 
 include/drm/drmP.h                                   |    2 
 include/linux/fb.h                                   |    1 
 include/linux/imq.h                                  |   13 
 include/linux/interrupt.h                            |    1 
 include/linux/mm.h                                   |   15 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter/xt_IMQ.h                     |    9 
 include/linux/netfilter_ipv4/ipt_IMQ.h               |   10 
 include/linux/netfilter_ipv6/ip6t_IMQ.h              |   10 
 include/linux/page-flags.h                           |   18 
 include/linux/sched.h                                |   15 
 include/linux/skbuff.h                               |   22 
 include/linux/swiotlb.h                              |    1 
 include/net/netfilter/nf_queue.h                     |   12 
 include/xen/Kbuild                                   |    1 
 include/xen/acpi.h                                   |   79 
 include/xen/balloon.h                                |    8 
 include/xen/blkif.h                                  |  123 +
 include/xen/events.h                                 |   32 
 include/xen/gntdev.h                                 |  119 +
 include/xen/grant_table.h                            |   80 
 include/xen/interface/grant_table.h                  |  195 ++
 include/xen/interface/io/netchannel2.h               |  342 +++
 include/xen/interface/io/pciif.h                     |  124 +
 include/xen/interface/io/ring.h                      |    3 
 include/xen/interface/io/uring.h                     |  426 ++++
 include/xen/interface/io/xenbus.h                    |    8 
 include/xen/interface/memory.h                       |   92 +
 include/xen/interface/physdev.h                      |   51 
 include/xen/interface/platform.h                     |  363 ++++
 include/xen/interface/vcpu.h                         |   41 
 include/xen/interface/xen-mca.h                      |  429 ++++
 include/xen/interface/xen.h                          |   45 
 include/xen/live_maps.h                              |  165 +
 include/xen/pcpu.h                                   |   30 
 include/xen/privcmd.h                                |   80 
 include/xen/swiotlb.h                                |  102 +
 include/xen/xen-ops.h                                |   11 
 include/xen/xenbus.h                                 |    4 
 kernel/irq/manage.c                                  |    3 
 kernel/sched.c                                       |   14 
 lib/swiotlb.c                                        |    5 
 mm/memory.c                                          |   42 
 mm/mmap.c                                            |   12 
 mm/page_alloc.c                                      |   14 
 net/core/dev.c                                       |   13 
 net/core/skbuff.c                                    |   96 +
 net/netfilter/Kconfig                                |   12 
 net/netfilter/Makefile                               |    1 
 net/netfilter/nf_queue.c                             |   52 
 net/netfilter/xt_IMQ.c                               |   73 
 265 files changed, 34863 insertions(+), 1834 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1.2.50 -r 1.1.2.51 xen.pvops.patchIndex: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.50
retrieving revision 1.1.2.51
diff -u -p -r1.1.2.50 -r1.1.2.51
--- xen.pvops.patch	12 Nov 2009 23:01:10 -0000	1.1.2.50
+++ xen.pvops.patch	9 Dec 2009 21:44:05 -0000	1.1.2.51
@@ -158,7 +158,7 @@ index 7b2d71d..026ee10 100644
   * 'index to address' translation. If anyone tries to use the idx
   * directly without translation, we catch the bug with a NULL-deference
 diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h
-index 1c22cb0..be24e01 100644
+index 1c22cb0..ed15247 100644
 --- a/arch/x86/include/asm/hpet.h
 +++ b/arch/x86/include/asm/hpet.h
 @@ -67,6 +67,7 @@ extern unsigned long hpet_address;
@@ -173,7 +173,7 @@ index 1c22cb0..be24e01 100644
  #else /* CONFIG_HPET_TIMER */
  
  static inline int hpet_enable(void) { return 0; }
-+static inline int disable_hpet(char *) { return 0; }
++static inline int disable_hpet(char *s) { return 0; }
  static inline int is_hpet_enabled(void) { return 0; }
  #define hpet_readl(a) 0
  
@@ -263,6 +263,20 @@ index ef51b50..e15fca1 100644
 +#endif
 +
  #endif /* _ASM_X86_MICROCODE_H */
+diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
+index 80a1dee..67eaa91 100644
+--- a/arch/x86/include/asm/mmu.h
++++ b/arch/x86/include/asm/mmu.h
+@@ -13,6 +13,9 @@ typedef struct {
+ 	int size;
+ 	struct mutex lock;
+ 	void *vdso;
++#ifdef CONFIG_XEN
++	int has_foreign_mappings;
++#endif
+ } mm_context_t;
+ 
+ #ifdef CONFIG_SMP
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
 index 43b8adb..e8420a2 100644
 --- a/arch/x86/include/asm/paravirt.h
@@ -1823,7 +1837,7 @@ index b399988..30cbf49 100644
  extern void __init dmi_check_skip_isa_align(void);
  
 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 1674807..3658a86 100644
+index 1674807..c751eeb 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
 @@ -402,6 +402,9 @@ static inline unsigned long pages_to_mb(unsigned long npg)
@@ -1836,6 +1850,16 @@ index 1674807..3658a86 100644
  #if PAGETABLE_LEVELS > 2
  static inline int pud_none(pud_t pud)
  {
+@@ -626,6 +629,9 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
+        memcpy(dst, src, count * sizeof(pgd_t));
+ }
+ 
++int create_lookup_pte_addr(struct mm_struct *mm,
++                           unsigned long address,
++                           uint64_t *ptep);
+ 
+ #include <asm-generic/pgtable.h>
+ #endif	/* __ASSEMBLY__ */
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
 index e597ecc..f7d2c8f 100644
 --- a/arch/x86/include/asm/processor.h
@@ -2459,7 +2483,7 @@ index 6b8ca3a..d47c54f 100644
  
  	set_fixmap_nocache(FIX_APIC_BASE, address);
 diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
-index d296f4a..721272b 100644
+index d296f4a..05ef6a6 100644
 --- a/arch/x86/kernel/acpi/processor.c
 +++ b/arch/x86/kernel/acpi/processor.c
 @@ -11,6 +11,7 @@
@@ -2470,16 +2494,26 @@ index d296f4a..721272b 100644
  
  static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
  {
-@@ -78,6 +79,9 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
- {
- 	struct cpuinfo_x86 *c = &cpu_data(pr->id);
+@@ -87,6 +88,19 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
  
-+	if (xen_pv_domain())
-+		c = &cpu_data(0);
+ EXPORT_SYMBOL(arch_acpi_processor_init_pdc);
+ 
++/* Initialize _PDC data based on the CPU vendor */
++void xen_arch_acpi_processor_init_pdc(struct acpi_processor *pr)
++{
++	struct cpuinfo_x86 *c = &cpu_data(0);
++
++	pr->pdc = NULL;
++	if (c->x86_vendor == X86_VENDOR_INTEL)
++		init_intel_pdc(pr, c);
 +
- 	pr->pdc = NULL;
- 	if (c->x86_vendor == X86_VENDOR_INTEL)
- 		init_intel_pdc(pr, c);
++	return;
++}
++EXPORT_SYMBOL(xen_arch_acpi_processor_init_pdc);
++
+ void arch_acpi_processor_cleanup_pdc(struct acpi_processor *pr)
+ {
+ 	if (pr->pdc) {
 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
 index ca93638..9eff23c 100644
 --- a/arch/x86/kernel/acpi/sleep.c
@@ -3110,6 +3144,20 @@ index e5efcdc..f1310e3 100644
  }
  
  /*
+diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
+index 71f1d99..d9ea853 100644
+--- a/arch/x86/kernel/ldt.c
++++ b/arch/x86/kernel/ldt.c
+@@ -109,6 +109,9 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
+ 
+ 	mutex_init(&mm->context.lock);
+ 	mm->context.size = 0;
++#ifdef CONFIG_XEN
++	mm->context.has_foreign_mappings = 0;
++#endif
+ 	old_mm = current->mm;
+ 	if (old_mm && old_mm->context.size > 0) {
+ 		mutex_lock(&old_mm->context.lock);
 diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
 index 9371448..4cb6bbd 100644
 --- a/arch/x86/kernel/microcode_core.c
@@ -3593,10 +3641,10 @@ index ebefb54..a28279d 100644
  }
  
 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
-index 03801f2..f47f91e 100644
+index 03801f2..1b5d3e8 100644
 --- a/arch/x86/kernel/pvclock.c
 +++ b/arch/x86/kernel/pvclock.c
-@@ -17,21 +17,12 @@
+@@ -17,27 +17,19 @@
  
  #include <linux/kernel.h>
  #include <linux/percpu.h>
@@ -3623,7 +3671,15 @@ index 03801f2..f47f91e 100644
  
  /*
   * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction,
-@@ -71,30 +62,11 @@ static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
+  * yielding a 64-bit result.
+  */
+-static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
++static __always_inline
++u64 scale_delta(u64 delta, u32 mul_frac, int shift)
+ {
+ 	u64 product;
+ #ifdef __i386__
+@@ -71,30 +63,11 @@ static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
  	return product;
  }
  
@@ -3658,7 +3714,7 @@ index 03801f2..f47f91e 100644
  }
  
  unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
-@@ -109,18 +81,30 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
+@@ -109,18 +82,30 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
  	return pv_tsc_khz;
  }
  
@@ -3696,7 +3752,7 @@ index 03801f2..f47f91e 100644
  	} while (version != src->version);
  
  	return ret;
-@@ -151,3 +135,118 @@ void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock,
+@@ -151,3 +136,118 @@ void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock,
  
  	set_normalized_timespec(ts, now.tv_sec, now.tv_nsec);
  }
@@ -4045,6 +4101,22 @@ index 0088329..dbd1f6a 100644
  
  # Make sure __phys_addr has no stackprotector
  nostackp := $(call cc-option, -fno-stack-protector)
+diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
+index 71da1bc..892b8eb 100644
+--- a/arch/x86/mm/gup.c
++++ b/arch/x86/mm/gup.c
+@@ -313,6 +313,11 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
+ 		goto slow_irqon;
+ #endif
+ 
++#ifdef CONFIG_XEN
++	if (unlikely(mm->context.has_foreign_mappings))
[...7859 lines suppressed...]
+ config NETFILTER_XT_TARGET_MARK
+ 	tristate '"MARK" target support'
+ 	default m if NETFILTER_ADVANCED=n
+diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
+index 49f62ee..43f0664 100644
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -46,6 +46,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
++obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
+diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
+index 3a6fd77..bba774c 100644
+--- a/net/netfilter/nf_queue.c
++++ b/net/netfilter/nf_queue.c
+@@ -20,6 +20,26 @@ static const struct nf_queue_handler *queue_handler[NFPROTO_NUMPROTO] __read_mos
+ 
+ static DEFINE_MUTEX(queue_handler_mutex);
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++static const struct nf_queue_handler *queue_imq_handler;
++
++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
++{
++	mutex_lock(&queue_handler_mutex);
++	rcu_assign_pointer(queue_imq_handler, qh);
++	mutex_unlock(&queue_handler_mutex);
++}
++EXPORT_SYMBOL(nf_register_queue_imq_handler);
++
++void nf_unregister_queue_imq_handler(void)
++{
++	mutex_lock(&queue_handler_mutex);
++	rcu_assign_pointer(queue_imq_handler, NULL);
++	mutex_unlock(&queue_handler_mutex);
++}
++EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
++#endif
++
+ /* return EBUSY when somebody else is registered, return EEXIST if the
+  * same handler is registered, return 0 in case of success. */
+ int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
+@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const struct nf_queue_handler *qh)
+ }
+ EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
+ 
+-static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
++void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
+ {
+ 	/* Release those devices we held, or Alexey will kill me. */
+ 	if (entry->indev)
+@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
+ 	/* Drop reference to owner of hook which queued us. */
+ 	module_put(entry->elem->owner);
+ }
++EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
+ 
+ /*
+  * Any packet that leaves via this function must come back
+@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *skb,
+ #endif
+ 	const struct nf_afinfo *afinfo;
+ 	const struct nf_queue_handler *qh;
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++	const struct nf_queue_handler *qih = NULL;
++#endif
+ 
+ 	/* QUEUE == DROP if noone is waiting, to be safe. */
+ 	rcu_read_lock();
+ 
+ 	qh = rcu_dereference(queue_handler[pf]);
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++	if (pf == PF_INET || pf == PF_INET6)
++#else
++	if (pf == PF_INET)
++#endif
++		qih = rcu_dereference(queue_imq_handler);
++
++	if (!qh && !qih)
++#else /* !IMQ */
+ 	if (!qh)
++#endif
+ 		goto err_unlock;
+ 
+ 	afinfo = nf_get_afinfo(pf);
+@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *skb,
+ 		.indev	= indev,
+ 		.outdev	= outdev,
+ 		.okfn	= okfn,
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++		.next_outfn = qh ? qh->outfn : NULL,
++		.next_queuenum = queuenum,
++#endif
+ 	};
+ 
+ 	/* If it's going away, ignore hook. */
+@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *skb,
+ 	}
+ #endif
+ 	afinfo->saveroute(skb, entry);
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++	if (qih) {
++		status = qih->outfn(entry, queuenum);
++		goto imq_skip_queue;
++	}
++#endif
++
+ 	status = qh->outfn(entry, queuenum);
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++imq_skip_queue:
++#endif
+ 	rcu_read_unlock();
+ 
+ 	if (status < 0) {
+diff --git a/net/netfilter/xt_IMQ.c b/net/netfilter/xt_IMQ.c
+new file mode 100644
+index 0000000..4d58d83
+--- /dev/null
++++ b/net/netfilter/xt_IMQ.c
+@@ -0,0 +1,73 @@
++/*
++ * This target marks packets to be enqueued to an imq device
++ */
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_IMQ.h>
++#include <linux/imq.h>
++
++static unsigned int imq_target(struct sk_buff *pskb,
++				const struct xt_target_param *par)
++{
++	const struct xt_imq_info *mr = par->targinfo;
++
++	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
++
++	return XT_CONTINUE;
++}
++
++static bool imq_checkentry(const struct xt_tgchk_param *par)
++{
++	struct xt_imq_info *mr = par->targinfo;
++
++	if (mr->todev > IMQ_MAX_DEVS - 1) {
++		printk(KERN_WARNING
++		       "IMQ: invalid device specified, highest is %u\n",
++		       IMQ_MAX_DEVS - 1);
++		return 0;
++	}
++
++	return 1;
++}
++
++static struct xt_target xt_imq_reg[] __read_mostly = {
++	{
++		.name           = "IMQ",
++		.family		= AF_INET,
++		.checkentry     = imq_checkentry,
++		.target         = imq_target,
++		.targetsize	= sizeof(struct xt_imq_info),
++		.table		= "mangle",
++		.me             = THIS_MODULE
++	},
++	{
++		.name           = "IMQ",
++		.family		= AF_INET6,
++		.checkentry     = imq_checkentry,
++		.target         = imq_target,
++		.targetsize	= sizeof(struct xt_imq_info),
++		.table		= "mangle",
++		.me             = THIS_MODULE
++	},
++};
++
++static int __init imq_init(void)
++{
++	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
++}
++
++static void __exit imq_fini(void)
++{
++	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
++}
++
++module_init(imq_init);
++module_exit(imq_fini);
++
++MODULE_AUTHOR("http://www.linuximq.net");
++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_IMQ");
++MODULE_ALIAS("ip6t_IMQ");
++

xen.pvops.post.patch:
 arch/x86/include/asm/mmu.h              |    4 ++++
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 drivers/gpu/drm/drm_gem.c               |    1 -
 drivers/pci/pci.h                       |    2 ++
 include/linux/mm.h                      |    1 +
 linux-2.6.31.noarch/arch/x86/Makefile   |    1 -
 linux-2.6.31.x86_64/drivers/net/Kconfig |    1 +
 9 files changed, 29 insertions(+), 2 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -p -r1.1.2.33 -r1.1.2.34
--- xen.pvops.post.patch	12 Nov 2009 23:01:13 -0000	1.1.2.33
+++ xen.pvops.post.patch	9 Dec 2009 21:44:09 -0000	1.1.2.34
@@ -68,18 +68,6 @@ index 2202b62..f371fe8 100644
  }
  
  int __init pcibios_init(void)
-diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index ffe8f43..230c9ff 100644
---- a/drivers/gpu/drm/drm_gem.c
-+++ b/drivers/gpu/drm/drm_gem.c
-@@ -539,7 +539,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
- 	vma->vm_flags |= VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND;
- 	vma->vm_ops = obj->dev->driver->gem_vm_ops;
- 	vma->vm_private_data = map->handle;
--	/* FIXME: use pgprot_writecombine when available */
- 	vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
- 
- 	/* Take a ref for this mapping of the object, so that the fault
 diff -up linux-2.6.31.noarch/arch/x86/Makefile.dave linux-2.6.31.noarch/arch/x86/Makefile
 --- linux-2.6.31.noarch/arch/x86/Makefile.dave	2009-09-09 18:13:59.000000000 -0400
 +++ linux-2.6.31.noarch/arch/x86/Makefile	2009-10-23 17:04:30.000000000 -0400
@@ -101,13 +89,36 @@ diff -up linux-2.6.31.noarch/arch/x86/Ma
  	help
  	  Xen netchannel2 driver support.  This allows a domain to act as
  	  either the backend or frontend part of a netchannel2 connection.
---- linux-2.6.31.x86_64/drivers/xen/events.c.orig	2009-11-12 20:01:11.000000000 +0000
-+++ linux-2.6.31.x86_64/drivers/xen/events.c	2009-11-12 20:50:12.000000000 +0000
-@@ -749,6 +749,7 @@
- {
- 	return gsi_from_irq(irq);
- }
-+EXPORT_SYMBOL_GPL(xen_gsi_from_irq);
+--- a/drivers/gpu/drm/drm_gem.c
++++ b/drivers/gpu/drm/drm_gem.c
+@@ -539,7 +539,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
+ 	vma->vm_flags |= VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND;
+ 	vma->vm_ops = obj->dev->driver->gem_vm_ops;
+ 	vma->vm_private_data = map->handle;
+-	/* FIXME: use pgprot_writecombine when available */
+ 	vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
  
- int bind_evtchn_to_irq(unsigned int evtchn)
- {
+ 	/* Take a ref for this mapping of the object, so that the fault
+--- a/arch/x86/include/asm/mmu.h
++++ b/arch/x86/include/asm/mmu.h
+@@ -13,6 +13,10 @@
+ 	int size;
+ 	struct mutex lock;
+ 	void *vdso;
++#ifdef CONFIG_X86_32
++	struct desc_struct user_cs;
++	unsigned long exec_limit;
++#endif
+ #ifdef CONFIG_XEN
+ 	int has_foreign_mappings;
+ #endif
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -105,6 +105,7 @@ extern unsigned int kobjsize(const void *objp);
+ #define VM_MIXEDMAP	0x10000000	/* Can contain "struct page" and pure PFN pages */
+ #define VM_SAO		0x20000000	/* Strong Access Ordering (powerpc) */
+ #define VM_PFN_AT_MMAP	0x40000000	/* PFNMAP vma that is fully mapped at mmap time */
++#define VM_MERGEABLE	0x80000000	/* KSM may merge identical pages */
+ #ifdef CONFIG_XEN
+ #define VM_FOREIGN	0x80000000      /* Has pages belonging to another VM */
+ struct vm_foreign_map {

xen.pvops.pre.patch:
 arch/x86/include/asm/mmu.h            |    4 ----
 b/arch/x86/include/asm/paravirt.h     |    3 ---
 b/arch/x86/kernel/process_32.c        |    3 +--
 b/arch/x86/pci/common.c               |   16 ----------------
 drivers/gpu/drm/drm_gem.c             |    3 ++-
 drivers/pci/pci.h                     |    2 --
 include/linux/mm.h                    |    1 -
 linux-2.6.31.noarch/arch/x86/Makefile |    1 +
 8 files changed, 4 insertions(+), 29 deletions(-)

Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -p -r1.1.2.19 -r1.1.2.20
--- xen.pvops.pre.patch	8 Nov 2009 22:36:45 -0000	1.1.2.19
+++ xen.pvops.pre.patch	9 Dec 2009 21:44:09 -0000	1.1.2.20
@@ -1,10 +1,11 @@
 temporarily revert various Fedora changes so that the pvops patch applies cleanly
 Affected patches;
 linux-2.6-defaults-pci_no_msi.patch - drivers/pci/pci.h
-linux-2.6-execshield.patch - arch/x86/include/asm/paravirt.h arch/x86/kernel/process_32.c
+linux-2.6-execshield.patch - arch/x86/include/asm/paravirt.h arch/x86/kernel/process_32.c arch/x86/include/asm/mmu.h
 linux-2.6-pci-cacheline-sizing.patch - arch/x86/pci/common.c
-drm-next-4c57edba4.patch - drivers/gpu/drm/drm_gem.c
 disable-stackprotector-all.patch - arch/x86/Makefile
+drm-next-b390f944.patch - drivers/gpu/drm/drm_gem.c
+linux-2.6-ksm.patch - include/linux/mm.h
 
 --- a/drivers/pci/pci.h	2009-04-24 20:46:50.000000000 +0100
 +++ b/drivers/pci/pci.h	2009-04-23 20:13:43.000000000 +0100
@@ -75,18 +76,6 @@ index 2202b62..f371fe8 100644
  	pcibios_resource_survey();
  
  	if (pci_bf_sort >= pci_force_bf)
-diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index ffe8f43..230c9ff 100644
---- a/drivers/gpu/drm/drm_gem.c
-+++ b/drivers/gpu/drm/drm_gem.c
-@@ -539,6 +539,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
- 	vma->vm_flags |= VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND;
- 	vma->vm_ops = obj->dev->driver->gem_vm_ops;
- 	vma->vm_private_data = map->handle;
-+	/* FIXME: use pgprot_writecombine when available */
- 	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
- 
- 	/* Take a ref for this mapping of the object, so that the fault
 diff -up linux-2.6.31.noarch/arch/x86/Makefile.dave linux-2.6.31.noarch/arch/x86/Makefile
 --- linux-2.6.31.noarch/arch/x86/Makefile.dave	2009-09-09 18:13:59.000000000 -0400
 +++ linux-2.6.31.noarch/arch/x86/Makefile	2009-10-23 17:04:30.000000000 -0400
@@ -98,3 +87,38 @@ diff -up linux-2.6.31.noarch/arch/x86/Ma
                  KBUILD_CFLAGS += $(stackp-y)
          else
                  $(warning stack protector enabled but no compiler support)
+--- a/drivers/gpu/drm/drm_gem.c
++++ b/drivers/gpu/drm/drm_gem.c
+@@ -539,7 +539,8 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
+ 	vma->vm_flags |= VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND;
+ 	vma->vm_ops = obj->dev->driver->gem_vm_ops;
+ 	vma->vm_private_data = map->handle;
+-	vma->vm_page_prot =  pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
++	/* FIXME: use pgprot_writecombine when available */
++	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+ 
+ 	/* Take a ref for this mapping of the object, so that the fault
+ 	 * handler can dereference the mmap offset's pointer to the object.
+--- a/arch/x86/include/asm/mmu.h
++++ b/arch/x86/include/asm/mmu.h
+@@ -13,10 +13,6 @@
+ 	int size;
+ 	struct mutex lock;
+ 	void *vdso;
+-#ifdef CONFIG_X86_32
+-	struct desc_struct user_cs;
+-	unsigned long exec_limit;
+-#endif
+ } mm_context_t;
+ 
+ #ifdef CONFIG_SMP
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -105,7 +105,6 @@ extern unsigned int kobjsize(const void *objp);
+ #define VM_MIXEDMAP	0x10000000	/* Can contain "struct page" and pure PFN pages */
+ #define VM_SAO		0x20000000	/* Strong Access Ordering (powerpc) */
+ #define VM_PFN_AT_MMAP	0x40000000	/* PFNMAP vma that is fully mapped at mmap time */
+-#define VM_MERGEABLE	0x80000000	/* KSM may merge identical pages */
+ 
+ #ifndef VM_STACK_DEFAULT_FLAGS		/* arch can override this */
+ #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS


--- drm-disable-r600-aspm.patch DELETED ---


--- drm-next-ea1495a6.patch DELETED ---


--- drm-r600-lenovo-w500-fix.patch DELETED ---


--- drm-radeon-agp-font-fix.patch DELETED ---


--- drm-radeon-fix-agp-resume.patch DELETED ---


--- drm-radeon-fix-ring-rmw-issue.patch DELETED ---


--- linux-2.6-nfsd4-proots.patch DELETED ---


--- linux-2.6-sysrq-c.patch DELETED ---



From clumens at fedoraproject.org  Wed Dec  9 21:47:02 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed,  9 Dec 2009 21:47:02 +0000 (UTC)
Subject: File anaconda-13.10.tar.bz2 uploaded to lookaside cache by clumens
Message-ID: <20091209214702.8099E10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for anaconda:

6816f57f0f8a3222fa65363c9b23b1fd  anaconda-13.10.tar.bz2



From rdieter at fedoraproject.org  Wed Dec  9 21:47:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 21:47:18 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.548,1.549
Message-ID: <20091209214719.01B4A11C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10363

Modified Files:
	kdelibs.spec 
Log Message:
* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-4
- BR: libattica-devel shared-desktop-ontologies-devel
- phonon_ver 4.3.80
- soprano_ver 2.3.70



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -p -r1.548 -r1.549
--- kdelibs.spec	9 Dec 2009 14:43:12 -0000	1.548
+++ kdelibs.spec	9 Dec 2009 21:47:18 -0000	1.549
@@ -1,14 +1,10 @@
-%define phonon_ver 4.3.1
-%define soprano_ver 2.3.0
+%define phonon_ver 4.3.80
+%define soprano_ver 2.3.70
 %define strigi_ver 0.7
 
-%if 0%{?fedora} > 11
-%define soprano_ver 2.3.1
-%endif
-
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.80
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -44,6 +40,7 @@ Requires: shared-mime-info
 Requires: kdelibs-common
 Requires: hunspell
 Requires: phonon%{?_isa} >= %{phonon_ver} 
+Requires: shared-desktop-ontologies
 Requires: soprano%{?_isa} >= %{soprano_ver} 
 Requires: strigi-libs%{?_isa} >= %{strigi_ver} 
 
@@ -111,6 +108,7 @@ BuildRequires: giflib-devel
 BuildRequires: jasper-devel
 BuildRequires: krb5-devel
 BuildRequires: libacl-devel libattr-devel
+BuildRequires: libattica-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
@@ -122,6 +120,7 @@ BuildRequires: pcre-devel
 BuildRequires: phonon-devel >= %{phonon_ver} 
 BuildRequires: polkit-qt-devel
 BuildRequires: qca2-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver} 
 BuildRequires: strigi-devel >= %{strigi_ver} 
@@ -416,6 +415,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-4
+- BR: libattica-devel shared-desktop-ontologies-devel
+- phonon_ver 4.3.80
+- soprano_ver 2.3.70
+
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-3
 - respin
 



From clumens at fedoraproject.org  Wed Dec  9 21:47:27 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed,  9 Dec 2009 21:47:27 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.684, 1.685 anaconda.spec, 1.834, 
	1.835 sources, 1.818, 1.819
Message-ID: <20091209214727.0F81811C00E0@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10412

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -p -r1.684 -r1.685
--- .cvsignore	1 Dec 2009 21:42:12 -0000	1.684
+++ .cvsignore	9 Dec 2009 21:47:26 -0000	1.685
@@ -1,2 +1,3 @@
 anaconda-13.8.tar.bz2
 anaconda-13.9.tar.bz2
+anaconda-13.10.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -p -r1.834 -r1.835
--- anaconda.spec	1 Dec 2009 21:42:12 -0000	1.834
+++ anaconda.spec	9 Dec 2009 21:47:26 -0000	1.835
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.9
+Version: 13.10
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -217,6 +217,47 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Dec 09 2009 Chris Lumens <clumens at redhat.com> - 13.10-1
+- Kickstart support for unpartitioned disks. (dlehman)
+- Skip disklabel handling for biosraid and multipath members. (dlehman)
+- Improve disklabel's name attr so we don't have to hide them anymore.
+  (dlehman)
+- Hide devices with certain formatting in the main partitioning UI. (dlehman)
+- Automatic partitioning support for whole-disk formatting. (dlehman)
+- Add support for whole-disk formatting. (dlehman)
+- Add per-row control over sensitive property for CheckList and
+  WideCheckList. (dlehman)
+- Use a function to add a device to the partition gui. (dlehman)
+- Don't crash if there's no intf passed to getLUKSPassphrase. (dlehman)
+- Remove unused selinux file context functions from isys. (dlehman)
+- Use selinux python module for file context operations. (dlehman)
+- Obtain device alignment information from parted. (#529051) (dlehman)
+- Handle roots with or without trailing "/" in FileDevice.path. (#541473)
+  (dlehman)
+- sundries.h is no longer used. (clumens)
+- Kill yet another unused lodaer flag. (clumens)
+- stage1 (init): Make /tmp tmpfs large enough to hold install.img (#540146)
+  (hdegoede)
+- With flags.setupFilesystems gone, justConfig can be removed from booty.
+  (clumens)
+- Nothing sets flags.setupFilesystems anymore, so it can go too. (clumens)
+- Remove test mode from the loader, too. (clumens)
+- Complain if we're started in test or rootPath mode instead of aborting.
+  (clumens)
+- Remove test mode. (clumens)
+- Remove rootPath mode. (clumens)
+- Enable method/repo nfs options in stage2. (rvykydal)
+- Accept "nfs:" prefix in ks repo --baseurl setting beside "nfs://".
+  (rvykydal)
+- Display url having invalid prefix in repo editing dialog. (rvykydal)
+- Do not traceback on invalid ks repo --baseurl values (#543003) (rvykydal)
+- Remove /etc/localtime before trying to copy into it (#533240). (akozumpl)
+- Whenever storage code tries to log a method call, do so into the
+  'tmp/storage.log' file. (a part of #524980) (akozumpl)
+- Make loader log time with milliseconds (part of #524980). (akozumpl)
+- Log storage in the same format as the main anaconda log (a part of
+  #524980) (akozumpl)
+
 * Tue Dec 01 2009 Chris Lumens <clumens at redhat.com> - 13.9-1
 - Improve text mode fcoe interface (hdegoede)
 - Fix udev rule to test whether we're in anaconda. (dlehman)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.818
retrieving revision 1.819
diff -u -p -r1.818 -r1.819
--- sources	1 Dec 2009 21:42:12 -0000	1.818
+++ sources	9 Dec 2009 21:47:26 -0000	1.819
@@ -1 +1 @@
-e7ebc2d8bf6f3ffd8f5fae0545fd6d25  anaconda-13.9.tar.bz2
+6816f57f0f8a3222fa65363c9b23b1fd  anaconda-13.10.tar.bz2



From notting at fedoraproject.org  Wed Dec  9 21:49:08 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Dec 2009 21:49:08 +0000 (UTC)
Subject: rpms/vpnc/devel vpnc-cleanup,1.2,1.3 vpnc.spec,1.37,1.38
Message-ID: <20091209214908.2E6EA11C00E0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11182

Modified Files:
	vpnc-cleanup vpnc.spec 
Log Message:
Adjust for upstart 0.6.

Job files go in /etc/init, and end in .conf.

Since 'service' is the default job type, mark this as 'task' (i.e.,
do not respawn.)



Index: vpnc-cleanup
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc-cleanup,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vpnc-cleanup	20 Nov 2008 09:56:12 -0000	1.2
+++ vpnc-cleanup	9 Dec 2009 21:49:07 -0000	1.3
@@ -3,6 +3,7 @@
 
 start on stopped rcS
 
+task
 script
 	rm -f /var/run/vpnc/pid
 	RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- vpnc.spec	17 Nov 2009 17:17:21 -0000	1.37
+++ vpnc.spec	9 Dec 2009 21:49:07 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.5.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -21,7 +21,7 @@ Patch3:		vpnc-0.5.1-dpd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
-Requires:       upstart iproute vpnc-script
+Requires:       upstart >= 0.6.0, iproute vpnc-script
 
 %description
 A VPN client compatible with Cisco's EasyVPN equipment.
@@ -85,7 +85,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc-disconnect
 install -Dp -m 0644 %{SOURCE6} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/event.d/vpnc-cleanup
+    $RPM_BUILD_ROOT%{_sysconfdir}/init/vpnc-cleanup.conf
 rm -f $RPM_BUILD_ROOT%{_datadir}/doc/vpnc/COPYING
 
 %clean
@@ -97,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_sysconfdir}/vpnc
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
-%config(noreplace) %{_sysconfdir}/event.d/vpnc-cleanup
+%config(noreplace) %{_sysconfdir}/init/vpnc-cleanup
 %{_sbindir}/vpnc
 %{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 
 %changelog
+* Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> - 0.5.3-7
+- Adjust for upstart 0.6
+
 * Tue Nov 17 2009 David Woodhouse <David.Woodhouse at intel.com> - 0.5.3-6
 - Update vpnc-script to support IPv6 properly
 



From notting at fedoraproject.org  Wed Dec  9 21:49:41 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Dec 2009 21:49:41 +0000 (UTC)
Subject: rpms/vpnc/devel vpnc.spec,1.38,1.39
Message-ID: <20091209214941.78C2A11C00E0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11582

Modified Files:
	vpnc.spec 
Log Message:
Fix upstart 0.6 adjustment.



Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- vpnc.spec	9 Dec 2009 21:49:07 -0000	1.38
+++ vpnc.spec	9 Dec 2009 21:49:41 -0000	1.39
@@ -97,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_sysconfdir}/vpnc
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
-%config(noreplace) %{_sysconfdir}/init/vpnc-cleanup
+%config(noreplace) %{_sysconfdir}/init/vpnc-cleanup.conf
 %{_sbindir}/vpnc
 %{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect



From alexlan at fedoraproject.org  Wed Dec  9 21:52:34 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed,  9 Dec 2009 21:52:34 +0000 (UTC)
Subject: rpms/bibus/devel bibus-build-1.5.1.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 bibus.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20091209215234.77C2211C00E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/bibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12492

Modified Files:
	.cvsignore bibus.spec sources 
Added Files:
	bibus-build-1.5.1.patch 
Log Message:
- Update to latest upstream (1.5.1)
- Should fix connection problem with newer OpenOffice.org (#545809)


bibus-build-1.5.1.patch:
 bibus.desktop |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bibus-build-1.5.1.patch ---
--- Setup/bibus.desktop.orig	2008-12-01 22:39:16.000000000 -0700
+++ Setup/bibus.desktop	2008-12-01 22:40:05.000000000 -0700
@@ -6,6 +6,7 @@
 Name[de]=Bibus
 Name[fr]=Bibus
 Name[hu]=Bibus
+GenericName=Bibus bibliographic database
 GenericName[en]=Bibus bibliographic database
 GenericName[de]=Bibliographische Datenbank Bibus
 GenericName[fr]=Base de donn?e bibliographique Bibus
@@ -19,6 +20,5 @@
 Type=Application
 Terminal=false
 Exec=bibus
-Icon=bibus.png
+Icon=bibus
 StartupNotify=true
-


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bibus/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Dec 2008 05:57:14 -0000	1.4
+++ .cvsignore	9 Dec 2009 21:52:34 -0000	1.5
@@ -1 +1 @@
-bibus-1.4.3.1.tar.gz
+bibus-1.5.1.tar.gz


Index: bibus.spec
===================================================================
RCS file: /cvs/extras/rpms/bibus/devel/bibus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bibus.spec	24 Jul 2009 18:00:46 -0000	1.7
+++ bibus.spec	9 Dec 2009 21:52:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           bibus
-Version:        1.4.3.1
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Bibliographic and reference management software
 
 Group:          Applications/Publishing
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://bibus-biblio.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/bibus-biblio/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-build-1.4.3.1.patch
+Patch0:		%{name}-build-1.5.1.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## temporarily removing noarch to workaround this bug:
@@ -110,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.1-1
+- Update to latest upstream (1.5.1)
+- Should fix connection problem with newer OpenOffice.org (#545809)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bibus/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Dec 2008 05:57:14 -0000	1.4
+++ sources	9 Dec 2009 21:52:34 -0000	1.5
@@ -1 +1 @@
-1924aaca754e55464635647a5b6d8063  bibus-1.4.3.1.tar.gz
+9d1808f98556b58b3f709bebfba11a80  bibus-1.5.1.tar.gz



From alexlan at fedoraproject.org  Wed Dec  9 21:54:53 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed,  9 Dec 2009 21:54:53 +0000 (UTC)
Subject: rpms/bibus/F-11 .cvsignore, 1.4, 1.5 bibus.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <20091209215453.A5DC911C00E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/bibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13358/F-11

Modified Files:
	.cvsignore bibus.spec sources 
Log Message:
- Update to latest upstream (1.5.1)
- Should fix connection problem with newer OpenOffice.org (#545809)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Dec 2008 05:57:14 -0000	1.4
+++ .cvsignore	9 Dec 2009 21:54:53 -0000	1.5
@@ -1 +1 @@
-bibus-1.4.3.1.tar.gz
+bibus-1.5.1.tar.gz


Index: bibus.spec
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-11/bibus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bibus.spec	24 Feb 2009 04:34:49 -0000	1.6
+++ bibus.spec	9 Dec 2009 21:54:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           bibus
-Version:        1.4.3.1
-Release:        3%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Bibliographic and reference management software
 
 Group:          Applications/Publishing
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://bibus-biblio.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/bibus-biblio/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-build-1.4.3.1.patch
+Patch0:		%{name}-build-1.5.1.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## temporarily removing noarch to workaround this bug:
@@ -110,6 +110,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.1-1
+- Update to latest upstream (1.5.1)
+- Should fix connection problem with newer OpenOffice.org (#545809)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Dec 2008 05:57:14 -0000	1.4
+++ sources	9 Dec 2009 21:54:53 -0000	1.5
@@ -1 +1 @@
-1924aaca754e55464635647a5b6d8063  bibus-1.4.3.1.tar.gz
+9d1808f98556b58b3f709bebfba11a80  bibus-1.5.1.tar.gz



From alexlan at fedoraproject.org  Wed Dec  9 21:54:53 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed,  9 Dec 2009 21:54:53 +0000 (UTC)
Subject: rpms/bibus/F-12 .cvsignore, 1.4, 1.5 bibus.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20091209215453.CEC4C11C00E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/bibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13358/F-12

Modified Files:
	.cvsignore bibus.spec sources 
Log Message:
- Update to latest upstream (1.5.1)
- Should fix connection problem with newer OpenOffice.org (#545809)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Dec 2008 05:57:14 -0000	1.4
+++ .cvsignore	9 Dec 2009 21:54:53 -0000	1.5
@@ -1 +1 @@
-bibus-1.4.3.1.tar.gz
+bibus-1.5.1.tar.gz


Index: bibus.spec
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-12/bibus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bibus.spec	24 Jul 2009 18:00:46 -0000	1.7
+++ bibus.spec	9 Dec 2009 21:54:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           bibus
-Version:        1.4.3.1
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Bibliographic and reference management software
 
 Group:          Applications/Publishing
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://bibus-biblio.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/bibus-biblio/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-build-1.4.3.1.patch
+Patch0:		%{name}-build-1.5.1.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## temporarily removing noarch to workaround this bug:
@@ -110,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.1-1
+- Update to latest upstream (1.5.1)
+- Should fix connection problem with newer OpenOffice.org (#545809)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Dec 2008 05:57:14 -0000	1.4
+++ sources	9 Dec 2009 21:54:53 -0000	1.5
@@ -1 +1 @@
-1924aaca754e55464635647a5b6d8063  bibus-1.4.3.1.tar.gz
+9d1808f98556b58b3f709bebfba11a80  bibus-1.5.1.tar.gz



From robert at fedoraproject.org  Wed Dec  9 21:54:55 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed,  9 Dec 2009 21:54:55 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog-4.4.2-unlimited-select.patch, NONE,
	1.1 .cvsignore, 1.33, 1.34 rsyslog.spec, 1.64, 1.65 sources,
	1.35, 1.36
Message-ID: <20091209215455.6D57811C00E0@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13440

Modified Files:
	.cvsignore rsyslog.spec sources 
Added Files:
	rsyslog-4.4.2-unlimited-select.patch 
Log Message:
- run libtoolize to avoid errors due mismatching libtool version
- upgrade to new upstream stable version 4.4.2
- add support for arbitrary number of open file descriptors


rsyslog-4.4.2-unlimited-select.patch:
 configure.ac                |   16 +++++++++++++
 gss-misc.c                  |   25 +++++++++++++++++----
 plugins/imgssapi/imgssapi.c |   16 ++++++++++---
 plugins/imudp/imudp.c       |   20 ++++++++++++-----
 plugins/imuxsock/imuxsock.c |   20 ++++++++++++-----
 runtime/Makefile.am         |    1 
 runtime/glbl.c              |   12 ++++++++++
 runtime/glbl.h              |    3 +-
 runtime/nsdsel_ptcp.c       |   51 +++++++++++++++++++++++++++++++++++---------
 runtime/nsdsel_ptcp.h       |    5 ++++
 runtime/unlimited_select.h  |   45 ++++++++++++++++++++++++++++++++++++++
 tools/syslogd.c             |    3 ++
 12 files changed, 185 insertions(+), 32 deletions(-)

--- NEW FILE rsyslog-4.4.2-unlimited-select.patch ---
diff -up rsyslog-4.4.2.unlimited-select/configure.ac.orig rsyslog-4.4.2.unlimited-select/configure.ac
--- rsyslog-4.4.2.unlimited-select/configure.ac.orig	2009-12-02 17:56:40.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/configure.ac	2009-12-02 14:14:22.000000000 +0100
@@ -341,6 +341,21 @@ AC_ARG_ENABLE([fsstnd],
   ])
 
 
+# support for unlimited select() syscall
+AC_ARG_ENABLE(unlimited_select,
+        [AS_HELP_STRING([--enable-unlimited-select],[Enable unlimited select() syscall @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_unlimited_select="yes" ;;
+          no) enable_unlimited_select="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-unlimited-select) ;;
+         esac],
+        [enable_unlimited_select="no"]
+)
+if test "$enable_unlimited_select" = "yes"; then
+        AC_DEFINE(USE_UNLIMITED_SELECT, 1, [If defined, the select() syscall won't be limited to a particular number of file descriptors.])
+fi
+
+
 # debug
 AC_ARG_ENABLE(debug,
         [AS_HELP_STRING([--enable-debug],[Enable debug mode @<:@default=no@:>@])],
@@ -843,6 +858,7 @@ echo "    Zlib compression support enabl
 echo "    rsyslog runtime will be built:            $enable_rsyslogrt"
 echo "    rsyslogd will be built:                   $enable_rsyslogd"
 echo "    custom module 1 will be built:            $enable_cust1"
+echo "    Unlimited select() support enabled:       $enable_unlimited_select"
 echo
 echo "---{ input plugins }---"
 echo "    Klog functionality enabled:               $enable_klog ($os_type)"
diff -up rsyslog-4.4.2.unlimited-select/gss-misc.c.orig rsyslog-4.4.2.unlimited-select/gss-misc.c
--- rsyslog-4.4.2.unlimited-select/gss-misc.c.orig	2009-12-02 17:56:02.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/gss-misc.c	2009-12-02 18:05:23.000000000 +0100
@@ -51,11 +51,14 @@
 #include "obj.h"
 #include "errmsg.h"
 #include "gss-misc.h"
+#include "glbl.h"
+#include "unlimited_select.h"
 
 MODULE_TYPE_LIB
 
 /* static data */
 DEFobjStaticHelpers
+DEFobjCurrIf(glbl)
 DEFobjCurrIf(errmsg)
 
 static void display_status_(char *m, OM_uint32 code, int type)
@@ -108,28 +111,38 @@ static int read_all(int fd, char *buf, u
 {
     int     ret;
     char   *ptr;
-    fd_set  rfds;
     struct timeval tv;
+#ifdef USE_UNLIMITED_SELECT
+    fd_set  *pRfds = malloc(glbl.GetFdSetSize());
+#else
+    fd_set  rfds;
+    fd_set *pRfds = &rfds;
+#endif
 
     for (ptr = buf; nbyte; ptr += ret, nbyte -= ret) {
-	    FD_ZERO(&rfds);
-	    FD_SET(fd, &rfds);
+	    FD_ZERO(pRfds);
+	    FD_SET(fd, pRfds);
 	    tv.tv_sec = 1;
 	    tv.tv_usec = 0;
 
-	    if ((ret = select(FD_SETSIZE, &rfds, NULL, NULL, &tv)) <= 0
-		|| !FD_ISSET(fd, &rfds))
+	    if ((ret = select(FD_SETSIZE, pRfds, NULL, NULL, &tv)) <= 0
+		|| !FD_ISSET(fd, pRfds)) {
+                    freeFdSet(pRfds);
 		    return ret;
+	    }
 	    ret = recv(fd, ptr, nbyte, 0);
 	    if (ret < 0) {
 		    if (errno == EINTR)
 			    continue;
+                    freeFdSet(pRfds);
 		    return (ret);
 	    } else if (ret == 0) {
+                    freeFdSet(pRfds);
 		    return (ptr - buf);
 	    }
     }
 
+    freeFdSet(pRfds);
     return (ptr - buf);
 }
 
@@ -264,6 +277,7 @@ BEGINObjClassExit(gssutil, OBJ_IS_LOADAB
 CODESTARTObjClassExit(gssutil)
 	/* release objects we no longer need */
 	objRelease(errmsg, CORE_COMPONENT);
+	objRelease(glbl, CORE_COMPONENT);
 ENDObjClassExit(gssutil)
 
 
@@ -274,6 +288,7 @@ ENDObjClassExit(gssutil)
 BEGINAbstractObjClassInit(gssutil, 1, OBJ_IS_LOADABLE_MODULE) /* class, version - CHANGE class also in END MACRO! */
 	/* request objects we use */
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
+	CHKiRet(objUse(glbl, CORE_COMPONENT));
 ENDObjClassInit(gssutil)
 
 
diff -up rsyslog-4.4.2.unlimited-select/plugins/imgssapi/imgssapi.c.orig rsyslog-4.4.2.unlimited-select/plugins/imgssapi/imgssapi.c
--- rsyslog-4.4.2.unlimited-select/plugins/imgssapi/imgssapi.c.orig	2009-12-02 17:58:12.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/plugins/imgssapi/imgssapi.c	2009-12-02 14:22:42.000000000 +0100
@@ -56,6 +56,7 @@
 #include "errmsg.h"
 #include "netstrm.h"
 #include "glbl.h"
+#include "unlimited_select.h"
 
 
 MODULE_TYPE_INPUT
@@ -414,15 +415,20 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_se
 		CHKiRet(netstrm.GetSock(pSess->pStrm, &fdSess)); // TODO: method access!
 		if (allowedMethods & ALLOWEDMETHOD_TCP) {
 			int len;
-			fd_set  fds;
 			struct timeval tv;
+#ifdef USE_UNLIMITED_SELECT
+                        fd_set *pFds = malloc(glbl.GetFdSetSize());
+#else
+                        fd_set fds;
+                        fd_set *pFds = &fds;
+#endif
 		
 			do {
-				FD_ZERO(&fds);
-				FD_SET(fdSess, &fds);
+				FD_ZERO(pFds);
+				FD_SET(fdSess, pFds);
 				tv.tv_sec = 1;
 				tv.tv_usec = 0;
-				ret = select(fdSess + 1, &fds, NULL, NULL, &tv);
+				ret = select(fdSess + 1, pFds, NULL, NULL, &tv);
 			} while (ret < 0 && errno == EINTR);
 			if (ret < 0) {
 				errmsg.LogError(0, RS_RET_ERR, "TCP session %p will be closed, error ignored\n", pSess);
@@ -475,6 +481,8 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_se
 				pGSess->allowedMethods = ALLOWEDMETHOD_TCP;
 				ABORT_FINALIZE(RS_RET_OK); // TODO: define good error codes
 			}
+
+                        freeFdSet(pFds);
 		}
 
 		context = &pGSess->gss_context;
diff -up rsyslog-4.4.2.unlimited-select/plugins/imudp/imudp.c.orig rsyslog-4.4.2.unlimited-select/plugins/imudp/imudp.c
--- rsyslog-4.4.2.unlimited-select/plugins/imudp/imudp.c.orig	2009-12-02 17:58:36.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/plugins/imudp/imudp.c	2009-12-02 14:31:25.000000000 +0100
@@ -44,6 +44,7 @@
 #include "parser.h"
 #include "datetime.h"
 #include "unicode-helper.h"
+#include "unlimited_select.h"
 
 MODULE_TYPE_INPUT
 
@@ -256,12 +257,18 @@ BEGINrunInput
 	int maxfds;
 	int nfds;
 	int i;
-	fd_set readfds;
 	struct sockaddr_storage frominetPrev;
 	int bIsPermitted;
 	uchar fromHost[NI_MAXHOST];
 	uchar fromHostIP[NI_MAXHOST];
 	uchar fromHostFQDN[NI_MAXHOST];
+#ifdef USE_UNLIMITED_SELECT
+        fd_set  *pReadfds = malloc(glbl.GetFdSetSize());
+#else
+        fd_set  readfds;
+        fd_set *pReadfds = &readfds;
+#endif
+
 CODESTARTrunInput
 	/* start "name caching" algo by making sure the previous system indicator
 	 * is invalidated.
@@ -280,30 +287,30 @@ CODESTARTrunInput
 		 * is given without -a, we do not need to listen at all..
 		 */
 	        maxfds = 0;
-	        FD_ZERO (&readfds);
+	        FD_ZERO (pReadfds);
 
 		/* Add the UDP listen sockets to the list of read descriptors. */
 		for (i = 0; i < *udpLstnSocks; i++) {
 			if (udpLstnSocks[i+1] != -1) {
 				if(Debug)
 					net.debugListenInfo(udpLstnSocks[i+1], "UDP");
-				FD_SET(udpLstnSocks[i+1], &readfds);
+				FD_SET(udpLstnSocks[i+1], pReadfds);
 				if(udpLstnSocks[i+1]>maxfds) maxfds=udpLstnSocks[i+1];
 			}
 		}
 		if(Debug) {
 			dbgprintf("--------imUDP calling select, active file descriptors (max %d): ", maxfds);
 			for (nfds = 0; nfds <= maxfds; ++nfds)
-				if ( FD_ISSET(nfds, &readfds) )
+				if ( FD_ISSET(nfds, pReadfds) )
 					dbgprintf("%d ", nfds);
 			dbgprintf("\n");
 		}
 
 		/* wait for io to become ready */
-		nfds = select(maxfds+1, (fd_set *) &readfds, NULL, NULL, NULL);
+		nfds = select(maxfds+1, (fd_set *) pReadfds, NULL, NULL, NULL);
 
 	       for(i = 0; nfds && i < *udpLstnSocks; i++) {
-			if(FD_ISSET(udpLstnSocks[i+1], &readfds)) {
+		       if (FD_ISSET(udpLstnSocks[i+1], pReadfds)) {
 		       		processSocket(udpLstnSocks[i+1], &frominetPrev, &bIsPermitted,
 					      fromHost, fromHostFQDN, fromHostIP);
 			--nfds; /* indicate we have processed one descriptor */
@@ -312,6 +319,7 @@ CODESTARTrunInput
 	       /* end of a run, back to loop for next recv() */
 	}
 
+	freeFdSet(pReadfds);
 	return iRet;
 ENDrunInput
 
diff -up rsyslog-4.4.2.unlimited-select/plugins/imuxsock/imuxsock.c.orig rsyslog-4.4.2.unlimited-select/plugins/imuxsock/imuxsock.c
--- rsyslog-4.4.2.unlimited-select/plugins/imuxsock/imuxsock.c.orig	2009-12-02 17:58:23.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/plugins/imuxsock/imuxsock.c	2009-12-02 14:35:58.000000000 +0100
@@ -43,6 +43,7 @@
 #include "net.h"
 #include "glbl.h"
 #include "msg.h"
+#include "unlimited_select.h"
 
 MODULE_TYPE_INPUT
 
@@ -245,7 +246,13 @@ BEGINrunInput
 	int nfds;
 	int i;
 	int fd;
-	fd_set readfds;
+#ifdef USE_UNLIMITED_SELECT
+        fd_set  *pReadfds = malloc(glbl.GetFdSetSize());
+#else
+        fd_set  readfds;
+        fd_set *pReadfds = &readfds;
+#endif
+
 CODESTARTrunInput
 	/* this is an endless loop - it is terminated when the thread is
 	 * signalled to do so. This, however, is handled by the framework,
@@ -259,11 +266,11 @@ CODESTARTrunInput
 		 * is given without -a, we do not need to listen at all..
 		 */
 	        maxfds = 0;
-	        FD_ZERO (&readfds);
+	        FD_ZERO (pReadfds);
 		/* Copy master connections */
 		for (i = startIndexUxLocalSockets; i < nfunix; i++) {
 			if (funix[i] != -1) {
-				FD_SET(funix[i], &readfds);
+				FD_SET(funix[i], pReadfds);
 				if (funix[i]>maxfds) maxfds=funix[i];
 			}
 		}
@@ -271,22 +278,23 @@ CODESTARTrunInput
 		if(Debug) {
 			dbgprintf("--------imuxsock calling select, active file descriptors (max %d): ", maxfds);
 			for (nfds= 0; nfds <= maxfds; ++nfds)
-				if ( FD_ISSET(nfds, &readfds) )
+				if ( FD_ISSET(nfds, pReadfds) )
 					dbgprintf("%d ", nfds);
 			dbgprintf("\n");
 		}
 
 		/* wait for io to become ready */
-		nfds = select(maxfds+1, (fd_set *) &readfds, NULL, NULL, NULL);
+		nfds = select(maxfds+1, (fd_set *) pReadfds, NULL, NULL, NULL);
 
 		for (i = 0; i < nfunix && nfds > 0; i++) {
-			if ((fd = funix[i]) != -1 && FD_ISSET(fd, &readfds)) {
+			if ((fd = funix[i]) != -1 && FD_ISSET(fd, pReadfds)) {
 				readSocket(fd, i);
 				--nfds; /* indicate we have processed one */
 			}
 		}
 	}
 
+	freeFdSet(pReadfds);
 	RETiRet;
 ENDrunInput
 
diff -up rsyslog-4.4.2.unlimited-select/runtime/Makefile.am.orig rsyslog-4.4.2.unlimited-select/runtime/Makefile.am
--- rsyslog-4.4.2.unlimited-select/runtime/Makefile.am.orig	2009-12-02 17:57:25.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/Makefile.am	2009-12-02 14:36:29.000000000 +0100
@@ -15,6 +15,7 @@ librsyslog_la_SOURCES = \
 	nsd.h \
 	glbl.h \
 	glbl.c \
+	unlimited_select.h \
 	conf.c \
 	conf.h \
 	parser.h \
diff -up rsyslog-4.4.2.unlimited-select/runtime/glbl.c.orig rsyslog-4.4.2.unlimited-select/runtime/glbl.c
--- rsyslog-4.4.2.unlimited-select/runtime/glbl.c.orig	2009-12-02 17:57:35.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/glbl.c	2009-12-02 14:40:07.000000000 +0100
@@ -68,6 +68,9 @@ static uchar *pszDfltNetstrmDrvr = NULL;
 static uchar *pszDfltNetstrmDrvrCAF = NULL; /* default CA file for the netstrm driver */
 static uchar *pszDfltNetstrmDrvrKeyFile = NULL; /* default key file for the netstrm driver (server) */
 static uchar *pszDfltNetstrmDrvrCertFile = NULL; /* default cert file for the netstrm driver (server) */
+#ifdef USE_UNLIMITED_SELECT
+static int iFdSetSize = howmany(FD_SETSIZE, __NFDBITS) * sizeof (fd_mask); /* size of select() bitmask in bytes */
+#endif
 
 
 /* define a macro for the simple properties' set and get functions
@@ -100,6 +103,9 @@ SIMP_PROP(DisableDNS, bDisableDNS, int)
 SIMP_PROP(LocalDomain, LocalDomain, uchar*)
 SIMP_PROP(StripDomains, StripDomains, char**)
 SIMP_PROP(LocalHosts, LocalHosts, char**)
+#ifdef USE_UNLIMITED_SELECT
+SIMP_PROP(FdSetSize, iFdSetSize, int)
+#endif
 
 SIMP_PROP_SET(LocalFQDNName, LocalFQDNName, uchar*)
 SIMP_PROP_SET(LocalHostName, LocalHostName, uchar*)
@@ -217,6 +223,9 @@ CODESTARTobjQueryInterface(glbl)
 	SIMP_PROP(DfltNetstrmDrvrCAF)
 	SIMP_PROP(DfltNetstrmDrvrKeyFile)
 	SIMP_PROP(DfltNetstrmDrvrCertFile)
+#ifdef USE_UNLIMITED_SELECT
+	SIMP_PROP(FdSetSize)
+#endif
 #undef	SIMP_PROP
 finalize_it:
 ENDobjQueryInterface(glbl)
@@ -251,6 +260,9 @@ static rsRetVal resetConfigVariables(uch
 	bOptimizeUniProc = 1;
 	bHUPisRestart = 1;
 	bPreserveFQDN = 0;
+#ifdef USE_UNLIMITED_SELECT
+	iFdSetSize = howmany(FD_SETSIZE, __NFDBITS) * sizeof (fd_mask);
+#endif
 	return RS_RET_OK;
 }
 
diff -up rsyslog-4.4.2.unlimited-select/runtime/glbl.h.orig rsyslog-4.4.2.unlimited-select/runtime/glbl.h
--- rsyslog-4.4.2.unlimited-select/runtime/glbl.h.orig	2009-12-02 17:57:41.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/glbl.h	2009-12-02 17:42:35.000000000 +0100
@@ -57,9 +57,10 @@ BEGINinterface(glbl) /* name must also b
 	SIMP_PROP(DfltNetstrmDrvrCAF, uchar*)
 	SIMP_PROP(DfltNetstrmDrvrKeyFile, uchar*)
 	SIMP_PROP(DfltNetstrmDrvrCertFile, uchar*)
+	SIMP_PROP(FdSetSize, int)
 #undef	SIMP_PROP
 ENDinterface(glbl)
-#define glblCURR_IF_VERSION 2 /* increment whenever you change the interface structure! */
+#define glblCURR_IF_VERSION 101 /* increment whenever you change the interface structure! */
 /* version 2 had PreserveFQDN added - rgerhards, 2008-12-08 */
 
 /* the remaining prototypes */
diff -up rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.c.orig rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.c
--- rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.c.orig	2009-12-02 17:56:56.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.c	2009-12-02 18:17:31.000000000 +0100
@@ -36,6 +36,7 @@
 #include "errmsg.h"
 #include "nsd_ptcp.h"
 #include "nsdsel_ptcp.h"
+#include "unlimited_select.h"
 
 /* static data */
 DEFobjStaticHelpers
@@ -47,14 +48,23 @@ DEFobjCurrIf(glbl)
  */
 BEGINobjConstruct(nsdsel_ptcp) /* be sure to specify the object type also in END macro! */
 	pThis->maxfds = 0;
+#ifdef USE_UNLIMITED_SELECT
+        pThis->pReadfds = calloc(1, glbl.GetFdSetSize());
+        pThis->pWritefds = calloc(1, glbl.GetFdSetSize());
+#else
 	FD_ZERO(&pThis->readfds);
 	FD_ZERO(&pThis->writefds);
+#endif
 ENDobjConstruct(nsdsel_ptcp)
 
 
 /* destructor for the nsdsel_ptcp object */
 BEGINobjDestruct(nsdsel_ptcp) /* be sure to specify the object type also in END and CODESTART macros! */
 CODESTARTobjDestruct(nsdsel_ptcp)
+#ifdef USE_UNLIMITED_SELECT
+	freeFdSet(pThis->pReadfds);
+	freeFdSet(pThis->pWritefds);
+#endif
 ENDobjDestruct(nsdsel_ptcp)
 
 
@@ -65,20 +75,27 @@ Add(nsdsel_t *pNsdsel, nsd_t *pNsd, nsds
 	DEFiRet;
 	nsdsel_ptcp_t *pThis = (nsdsel_ptcp_t*) pNsdsel;
 	nsd_ptcp_t *pSock = (nsd_ptcp_t*) pNsd;
+#ifdef USE_UNLIMITED_SELECT
+        fd_set *pReadfds = pThis->pReadfds;
+        fd_set *pWritefds = pThis->pWritefds;
+#else
+        fd_set *pReadfds = &pThis->readfds;
+        fd_set *pWritefds = &pThis->writefds;
+#endif
 
 	ISOBJ_TYPE_assert(pSock, nsd_ptcp);
 	ISOBJ_TYPE_assert(pThis, nsdsel_ptcp);
 
 	switch(waitOp) {
 		case NSDSEL_RD:
-			FD_SET(pSock->sock, &pThis->readfds);
+			FD_SET(pSock->sock, pReadfds);
 			break;
 		case NSDSEL_WR:
-			FD_SET(pSock->sock, &pThis->writefds);
+			FD_SET(pSock->sock, pWritefds);
 			break;
 		case NSDSEL_RDWR:
-			FD_SET(pSock->sock, &pThis->readfds);
-			FD_SET(pSock->sock, &pThis->writefds);
+			FD_SET(pSock->sock, pReadfds);
+			FD_SET(pSock->sock, pWritefds);
 			break;
 	}
 
@@ -98,6 +115,13 @@ Select(nsdsel_t *pNsdsel, int *piNumRead
 	DEFiRet;
 	int i;
 	nsdsel_ptcp_t *pThis = (nsdsel_ptcp_t*) pNsdsel;
+#ifdef USE_UNLIMITED_SELECT
+        fd_set *pReadfds = pThis->pReadfds;
+        fd_set *pWritefds = pThis->pWritefds;
+#else
+        fd_set *pReadfds = &pThis->readfds;
+        fd_set *pWritefds = &pThis->writefds;
+#endif
 
 	ISOBJ_TYPE_assert(pThis, nsdsel_ptcp);
 	assert(piNumReady != NULL);
@@ -106,13 +130,13 @@ Select(nsdsel_t *pNsdsel, int *piNumRead
 		// TODO: name in dbgprintf!
 		dbgprintf("--------<NSDSEL_PTCP> calling select, active fds (max %d): ", pThis->maxfds);
 		for(i = 0; i <= pThis->maxfds; ++i)
-			if(FD_ISSET(i, &pThis->readfds) || FD_ISSET(i, &pThis->writefds))
+			if(FD_ISSET(i, pReadfds) || FD_ISSET(i, pWritefds))
 				dbgprintf("%d ", i);
 		dbgprintf("\n");
 	}
 
 	/* now do the select */
-	*piNumReady = select(pThis->maxfds+1, &pThis->readfds, &pThis->writefds, NULL, NULL);
+	*piNumReady = select(pThis->maxfds+1, pReadfds, pWritefds, NULL, NULL);
 
 	RETiRet;
 }
@@ -125,6 +149,13 @@ IsReady(nsdsel_t *pNsdsel, nsd_t *pNsd, 
 	DEFiRet;
 	nsdsel_ptcp_t *pThis = (nsdsel_ptcp_t*) pNsdsel;
 	nsd_ptcp_t *pSock = (nsd_ptcp_t*) pNsd;
+#ifdef USE_UNLIMITED_SELECT
+        fd_set *pReadfds = pThis->pReadfds;
+        fd_set *pWritefds = pThis->pWritefds;
+#else
+        fd_set *pReadfds = &pThis->readfds;
+        fd_set *pWritefds = &pThis->writefds;
+#endif
 
 	ISOBJ_TYPE_assert(pThis, nsdsel_ptcp);
 	ISOBJ_TYPE_assert(pSock, nsd_ptcp);
@@ -132,14 +163,14 @@ IsReady(nsdsel_t *pNsdsel, nsd_t *pNsd, 
 
 	switch(waitOp) {
 		case NSDSEL_RD:
-			*pbIsReady = FD_ISSET(pSock->sock, &pThis->readfds);
+			*pbIsReady = FD_ISSET(pSock->sock, pReadfds);
 			break;
 		case NSDSEL_WR:
-			*pbIsReady = FD_ISSET(pSock->sock, &pThis->writefds);
+			*pbIsReady = FD_ISSET(pSock->sock, pWritefds);
 			break;
 		case NSDSEL_RDWR:
-			*pbIsReady =   FD_ISSET(pSock->sock, &pThis->readfds)
-				     | FD_ISSET(pSock->sock, &pThis->writefds);
+			*pbIsReady =   FD_ISSET(pSock->sock, pReadfds)
+				     | FD_ISSET(pSock->sock, pWritefds);
 			break;
 	}
 
diff -up rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.h.orig rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.h
--- rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.h.orig	2009-12-02 17:57:15.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/nsdsel_ptcp.h	2009-12-02 17:48:41.000000000 +0100
@@ -31,8 +31,13 @@ typedef nsdsel_if_t nsdsel_ptcp_if_t; /*
 struct nsdsel_ptcp_s {
 	BEGINobjInstance;	/* Data to implement generic object - MUST be the first data element! */
 	int maxfds;
+#ifdef USE_UNLIMITED_SELECT
+	fd_set *pReadfds;
+	fd_set *pWritefds;
+#else
 	fd_set readfds;
 	fd_set writefds;
+#endif
 };
 
 /* interface is defined in nsd.h, we just implement it! */
diff -up rsyslog-4.4.2.unlimited-select/runtime/unlimited_select.h.orig rsyslog-4.4.2.unlimited-select/runtime/unlimited_select.h
--- rsyslog-4.4.2.unlimited-select/runtime/unlimited_select.h.orig	2009-12-02 18:21:15.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/runtime/unlimited_select.h	2009-12-02 17:51:35.000000000 +0100
@@ -0,0 +1,45 @@
+/* unlimited_select.h
+ * Tweak the macros for accessing fd_set so that the select() syscall
+ * won't be limited to a particular number of file descriptors.
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+
+#ifndef	UNLIMITED_SELECT_H_INCLUDED
+
+#include <string.h>
+#include <stdlib.h>
+#include <sys/select.h>
+#include "glbl.h"
+
+#ifdef USE_UNLIMITED_SELECT
+# undef FD_ZERO
+# define FD_ZERO(set) memset((set), 0, glbl.GetFdSetSize());
+#endif
+
+#ifdef USE_UNLIMITED_SELECT
+void freeFdSet(fd_set *p) {
+        free(p);
+}
+#else
+# define freeFdSet(x)
+#endif
+
+#endif /* #ifndef UNLIMITED_SELECT_H_INCLUDED */
diff -up rsyslog-4.4.2.unlimited-select/tools/syslogd.c.orig rsyslog-4.4.2.unlimited-select/tools/syslogd.c
--- rsyslog-4.4.2.unlimited-select/tools/syslogd.c.orig	2009-12-02 17:57:55.000000000 +0100
+++ rsyslog-4.4.2.unlimited-select/tools/syslogd.c	2009-12-02 17:52:56.000000000 +0100
@@ -2150,6 +2150,9 @@ static rsRetVal setMaxFiles(void __attri
 				iFiles, errStr, (long) maxFiles.rlim_max);
 		ABORT_FINALIZE(RS_RET_ERR_RLIM_NOFILE);
 	}
+#ifdef USE_UNLIMITED_SELECT
+	glbl.SetFdSetSize(howmany(iFiles, __NFDBITS) * sizeof (fd_mask));
+#endif
 	DBGPRINTF("Max number of files set to %d [kernel max %ld].\n", iFiles, (long) maxFiles.rlim_max);
 
 finalize_it:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	3 Sep 2009 12:23:12 -0000	1.33
+++ .cvsignore	9 Dec 2009 21:54:55 -0000	1.34
@@ -1 +1 @@
-rsyslog-4.4.1.tar.gz
+rsyslog-4.4.2.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- rsyslog.spec	14 Sep 2009 16:54:26 -0000	1.64
+++ rsyslog.spec	9 Dec 2009 21:54:55 -0000	1.65
@@ -2,7 +2,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 4.4.1
+Version: 4.4.2
 Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -12,8 +12,9 @@ Source1: rsyslog.init
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
+Patch0: rsyslog-4.4.2-unlimited-select.patch
 BuildRequires: zlib-devel
-BuildRequires: autoconf automake
+BuildRequires: autoconf automake libtool
 Requires: logrotate >= 3.5.2
 Requires: bash >= 2.0
 Requires(post): /sbin/chkconfig coreutils
@@ -87,6 +88,8 @@ IETF standard protocol.
 
 %prep
 %setup -q
+%patch0 -p1 -b .unlimited-select
+libtoolize && aclocal && autoconf && automake
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
@@ -98,7 +101,8 @@ export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_
 		--enable-gssapi-krb5 \
 		--enable-imfile \
 		--enable-relp \
-		--enable-gnutls
+		--enable-gnutls \
+		--enable-unlimited-select
 make %{?_smp_mflags}
 
 %install
@@ -194,6 +198,13 @@ fi	
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Wed Dec 09 2009 Robert Scheck <robert at fedoraproject.org> 4.4.2-2
+- run libtoolize to avoid errors due mismatching libtool version
+
+* Thu Dec 03 2009 Tomas Heinrich <theinric at redhat.com> 4.4.2-1
+- upgrade to new upstream stable version 4.4.2
+- add support for arbitrary number of open file descriptors
+
 * Mon Sep 14 2009 Tomas Heinrich <theinric at redhat.com> 4.4.1-2
 - adjust init script according to guidelines (#522071)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsyslog/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	3 Sep 2009 12:23:12 -0000	1.35
+++ sources	9 Dec 2009 21:54:55 -0000	1.36
@@ -1 +1 @@
-2f298222850a098834bbf8c651a9963c  rsyslog-4.4.1.tar.gz
+a8ada67b6cd5c00fbeb3a4b687b17359  rsyslog-4.4.2.tar.gz



From rdieter at fedoraproject.org  Wed Dec  9 21:58:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 21:58:01 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.166,1.167
Message-ID: <20091209215801.A911911C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14655

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
- BR: libattica-devel shared-desktop-ontologies-devel



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- kdebase-runtime.spec	5 Dec 2009 00:31:33 -0000	1.166
+++ kdebase-runtime.spec	9 Dec 2009 21:58:01 -0000	1.167
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.80
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -54,10 +54,12 @@ BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
+BuildRequires: desktop-shared-ontologies-devel
 BuildRequires: exiv2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: libattica-devel
 BuildRequires: libsmbclient-devel
 BuildRequires: libssh-devel >= 0.3.92
 BuildRequires: libXScrnSaver-devel
@@ -227,6 +229,9 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
+- BR: libattica-devel shared-desktop-ontologies-devel
+
 * Sat Dec 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
 - BR exiv2-devel
 



From alexlan at fedoraproject.org  Wed Dec  9 22:02:15 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed,  9 Dec 2009 22:02:15 +0000 (UTC)
Subject: rpms/bibus/F-11 bibus-build-1.5.1.patch,NONE,1.1
Message-ID: <20091209220215.6948E11C00E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/bibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15956/F-11

Added Files:
	bibus-build-1.5.1.patch 
Log Message:
Forgot to add patch file.


bibus-build-1.5.1.patch:
 bibus.desktop |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bibus-build-1.5.1.patch ---
--- Setup/bibus.desktop.orig	2008-12-01 22:39:16.000000000 -0700
+++ Setup/bibus.desktop	2008-12-01 22:40:05.000000000 -0700
@@ -6,6 +6,7 @@
 Name[de]=Bibus
 Name[fr]=Bibus
 Name[hu]=Bibus
+GenericName=Bibus bibliographic database
 GenericName[en]=Bibus bibliographic database
 GenericName[de]=Bibliographische Datenbank Bibus
 GenericName[fr]=Base de donn?e bibliographique Bibus
@@ -19,6 +20,5 @@
 Type=Application
 Terminal=false
 Exec=bibus
-Icon=bibus.png
+Icon=bibus
 StartupNotify=true
-



From alexlan at fedoraproject.org  Wed Dec  9 22:02:15 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed,  9 Dec 2009 22:02:15 +0000 (UTC)
Subject: rpms/bibus/F-12 bibus-build-1.5.1.patch,NONE,1.1
Message-ID: <20091209220215.97F7511C00E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/bibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15956/F-12

Added Files:
	bibus-build-1.5.1.patch 
Log Message:
Forgot to add patch file.


bibus-build-1.5.1.patch:
 bibus.desktop |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bibus-build-1.5.1.patch ---
--- Setup/bibus.desktop.orig	2008-12-01 22:39:16.000000000 -0700
+++ Setup/bibus.desktop	2008-12-01 22:40:05.000000000 -0700
@@ -6,6 +6,7 @@
 Name[de]=Bibus
 Name[fr]=Bibus
 Name[hu]=Bibus
+GenericName=Bibus bibliographic database
 GenericName[en]=Bibus bibliographic database
 GenericName[de]=Bibliographische Datenbank Bibus
 GenericName[fr]=Base de donn?e bibliographique Bibus
@@ -19,6 +20,5 @@
 Type=Application
 Terminal=false
 Exec=bibus
-Icon=bibus.png
+Icon=bibus
 StartupNotify=true
-



From avesh at fedoraproject.org  Wed Dec  9 22:04:38 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Wed,  9 Dec 2009 22:04:38 +0000 (UTC)
Subject: File stunnel-4.29.tar.gz uploaded to lookaside cache by avesh
Message-ID: <20091209220438.416C310F87E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for stunnel:

14dc3f8412947f0548975cbce74d6863  stunnel-4.29.tar.gz



From avesh at fedoraproject.org  Wed Dec  9 22:04:52 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Wed,  9 Dec 2009 22:04:52 +0000 (UTC)
Subject: File stunnel-4.29.tar.gz.asc uploaded to lookaside cache by avesh
Message-ID: <20091209220452.4B97110F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for stunnel:

655172db10aa297e2085009af22797fb  stunnel-4.29.tar.gz.asc



From notting at fedoraproject.org  Wed Dec  9 22:05:57 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Dec 2009 22:05:57 +0000 (UTC)
Subject: rpms/olpc-utils/devel olpc-utils-1.0.13-upstart06.patch, NONE,
	1.1 olpc-utils.spec, 1.22, 1.23
Message-ID: <20091209220557.5A14011C00E0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/olpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17222

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-1.0.13-upstart06.patch 
Log Message:
Adjust for upstart 0.6.

Job files moved to /etc/init, and must end in .conf.
We rearranged how we do runlevels slightly, and jobs can only have
one 'start on' or 'stop on' line.


olpc-utils-1.0.13-upstart06.patch:
 ttyS0 |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

--- NEW FILE olpc-utils-1.0.13-upstart06.patch ---
diff -up olpc-utils-1.0.13/etc/event.d/ttyS0.new olpc-utils-1.0.13/etc/event.d/ttyS0
--- olpc-utils-1.0.13/etc/event.d/ttyS0.new	2009-12-09 16:59:32.000000000 -0500
+++ olpc-utils-1.0.13/etc/event.d/ttyS0	2009-12-09 16:59:38.000000000 -0500
@@ -1,14 +1,9 @@
 # ttyS0
 
-start on stopped rc2
-start on stopped rc3
-start on stopped rc4
-start on started prefdm
+start on stopped rc RUNLEVEL=[2345]
 
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 6
+stop on runlevel [016]
 
 respawn
-exec agetty -L -l /bin/bash -w -n ttyS0 115200 vt100
+exec /sbin/agetty -L -l /bin/bash -w -n ttyS0 115200 vt100
 


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- olpc-utils.spec	4 Dec 2009 11:35:33 -0000	1.22
+++ olpc-utils.spec	9 Dec 2009 22:05:57 -0000	1.23
@@ -1,11 +1,12 @@
 Name:       olpc-utils
 Version:    1.0.13
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
 License:    GPLv2+
 Source0:    %{name}-%{version}.tar.bz2
+Patch:      olpc-utils-1.0.13-upstart06.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # for olpc-dm
@@ -19,6 +20,9 @@ Requires:   /usr/bin/find
 #comment out for the moment as olpcupdate isn't in Fedora mainline
 #Requires:   olpcupdate >= 2.10
 
+# for new event location
+Conflicts: upstart < 0.6.0
+
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -26,7 +30,7 @@ becoming root, and cleaning the datastor
 
 %prep
 %setup -q
-
+%patch -p1
 
 %build
 make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -36,6 +40,9 @@ make -f Makefile.build %{?_smp_mflags} C
 rm -rf %{buildroot}
 make -f Makefile.build install DESTDIR=%{buildroot}
 
+mkdir -p %{buildroot}/%{_sysconfdir}/init
+mv %{buildroot}/%{_sysconfdir}/event.d/ttyS0 %{buildroot}/%{_sysconfdir}/init/ttyS0.conf
+
 %post
 /sbin/chkconfig --add olpc-configure
 /sbin/chkconfig --add diskspacecheck
@@ -68,7 +75,7 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rc.d/init.d/diskspacerecover
 %config(noreplace) %{_sysconfdir}/hal/fdi/information/30-keymap-olpc.fdi
 %config(noreplace) %{_sysconfdir}/motd.olpc
-%config(noreplace) %{_sysconfdir}/event.d/ttyS0
+%config(noreplace) %{_sysconfdir}/init/ttyS0.conf
 %config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-sd.rules
 %config(noreplace) %{_sysconfdir}/X11/xorg-dcon.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg-xo1.5-dcon.conf
@@ -78,6 +85,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> -  1.0.13-2
+- adjust for upstart 0.6
+
 * Fri Dec  4 2009 Daniel Drake <dsd at laptop.org> - 1.0.13-1
 - Bump to v1.0.13
 



From rdieter at fedoraproject.org  Wed Dec  9 22:06:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 22:06:32 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.323,1.324
Message-ID: <20091209220632.C8A3E11C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17711

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
- BR: shared-desktop-ontologies-devel



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- kdebase-workspace.spec	5 Dec 2009 04:26:44 -0000	1.323
+++ kdebase-workspace.spec	9 Dec 2009 22:06:32 -0000	1.324
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -98,6 +98,7 @@ BuildRequires: pam-devel
 BuildRequires: polkit-qt-devel
 %endif
 BuildRequires: qimageblitz-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
@@ -617,6 +618,9 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
+- BR: shared-desktop-ontologies-devel
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 - kdm_plymouth patch (#475890)



From rdieter at fedoraproject.org  Wed Dec  9 22:07:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 22:07:28 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.406,1.407
Message-ID: <20091209220728.0E1EC11C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18144

Modified Files:
	kdebase.spec 
Log Message:
* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
- BR: shared-desktop-ontologies-devel



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- kdebase.spec	1 Dec 2009 14:26:36 -0000	1.406
+++ kdebase.spec	9 Dec 2009 22:07:27 -0000	1.407
@@ -2,7 +2,7 @@ Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Epoch: 6
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -58,6 +58,7 @@ BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
 BuildRequires: libsmbclient-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel 
 BuildRequires: strigi-devel 
 %if 0%{?fedora}
@@ -228,6 +229,9 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
+- BR: shared-desktop-ontologies-devel
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From avesh at fedoraproject.org  Wed Dec  9 22:08:00 2009
From: avesh at fedoraproject.org (avesh agarwal)
Date: Wed,  9 Dec 2009 22:08:00 +0000 (UTC)
Subject: rpms/stunnel/devel stunnel-4.29-authpriv.patch, NONE,
	1.1 stunnel-4.29-sample.patch, NONE, 1.1 .cvsignore, 1.27,
	1.28 sources, 1.27, 1.28 stunnel.spec, 1.61,
	1.62 stunnel-4.27-aliasing.patch, 1.2,
	NONE stunnel-4.27-authpriv.patch, 1.1,
	NONE stunnel-4.27-sample.patch, 1.1, NONE
Message-ID: <20091209220800.4410911C00E0@cvs1.fedora.phx.redhat.com>

Author: avesh

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18413

Modified Files:
	.cvsignore sources stunnel.spec 
Added Files:
	stunnel-4.29-authpriv.patch stunnel-4.29-sample.patch 
Removed Files:
	stunnel-4.27-aliasing.patch stunnel-4.27-authpriv.patch 
	stunnel-4.27-sample.patch 
Log Message:
* Tue Dec 09 2009 Avesh Agrwal <avagarwa at redhat.com> - 4.29-1
- New upstream realease 4.29
- Updated authpriv and sample patches for the new release
- Modified spec file to include dist tag


stunnel-4.29-authpriv.patch:
 doc/stunnel.8    |    2 +-
 doc/stunnel.html |    2 +-
 doc/stunnel.pod  |    2 +-
 src/options.c    |    4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE stunnel-4.29-authpriv.patch ---
diff -urNp stunnel-4.29-orig/doc/stunnel.8 stunnel-4.29/doc/stunnel.8
--- stunnel-4.29-orig/doc/stunnel.8	2009-11-20 15:50:52.000000000 -0500
+++ stunnel-4.29/doc/stunnel.8	2009-12-09 16:44:25.000000000 -0500
@@ -169,7 +169,7 @@ info (6), or debug (7).  All logs for th
 all levels numerically less than it will be shown.  Use \fBdebug = debug\fR or
 \&\fBdebug = 7\fR for greatest debugging output.  The default is notice (5).
 .Sp
-The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)
 .Sp
 Case is ignored for both facilities and levels.
diff -urNp stunnel-4.29-orig/doc/stunnel.html stunnel-4.29/doc/stunnel.html
--- stunnel-4.29-orig/doc/stunnel.html	2009-11-20 15:50:52.000000000 -0500
+++ stunnel-4.29/doc/stunnel.html	2009-12-09 16:43:09.000000000 -0500
@@ -192,7 +192,7 @@ emerg (0), alert (1), crit (2), err (3),
 info (6), or debug (7).  All logs for the specified level and
 all levels numerically less than it will be shown.  Use <strong>debug = debug</strong> or
 <strong>debug = 7</strong> for greatest debugging output.  The default is notice (5).</p>
-<p>The syslog facility 'daemon' will be used unless a facility name is supplied.
+<p>The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)</p>
 <p>Case is ignored for both facilities and levels.</p>
 </dd>
diff -urNp stunnel-4.29-orig/doc/stunnel.pod stunnel-4.29/doc/stunnel.pod
--- stunnel-4.29-orig/doc/stunnel.pod	2009-11-20 15:48:33.000000000 -0500
+++ stunnel-4.29/doc/stunnel.pod	2009-12-09 16:43:52.000000000 -0500
@@ -144,7 +144,7 @@ info (6), or debug (7).  All logs for th
 all levels numerically less than it will be shown.  Use B<debug = debug> or
 B<debug = 7> for greatest debugging output.  The default is notice (5).
 
-The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
 (Facilities are not supported on Win32.)
 
 Case is ignored for both facilities and levels.
diff -urNp stunnel-4.29-orig/src/options.c stunnel-4.29/src/options.c
--- stunnel-4.29-orig/src/options.c	2009-11-20 15:55:12.000000000 -0500
+++ stunnel-4.29/src/options.c	2009-12-09 16:45:57.000000000 -0500
@@ -136,8 +136,12 @@ static char *global_options(CMD cmd, cha
     case CMD_INIT:
         options.debug_level=5;
 #if !defined (USE_WIN32) && !defined (__vms)
+#if defined(LOG_AUTHPRIV)
+        options.facility=LOG_AUTHPRIV;
+#else
         options.facility=LOG_DAEMON;
 #endif
+#endif
         break;
     case CMD_EXEC:
         if(strcasecmp(opt, "debug"))

stunnel-4.29-sample.patch:
 stunnel.conf-sample.in |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE stunnel-4.29-sample.patch ---
diff -urNp stunnel-4.29-orig/tools/stunnel.conf-sample.in stunnel-4.29/tools/stunnel.conf-sample.in
--- stunnel-4.29-orig/tools/stunnel.conf-sample.in	2009-11-08 14:40:24.000000000 -0500
+++ stunnel-4.29/tools/stunnel.conf-sample.in	2009-12-09 16:51:38.000000000 -0500
@@ -3,14 +3,14 @@
 ; Please make sure you understand them (especially the effect of the chroot jail)
 
 ; Certificate/key is needed in server mode and optional in client mode
-cert = @prefix@/etc/stunnel/mail.pem
-;key = @prefix@/etc/stunnel/mail.pem
+cert = @sysconfdir@/etc/stunnel/mail.pem
+;key = @sysconfdir@/etc/stunnel/mail.pem
 
 ; Protocol version (all, SSLv2, SSLv3, TLSv1)
 sslVersion = SSLv3
 
 ; Some security enhancements for UNIX systems - comment them out on Win32
-chroot = @prefix@/var/lib/stunnel/
+chroot = @localstatedir@/var/lib/stunnel/
 setuid = nobody
 setgid = @DEFAULT_GROUP@
 ; PID is created inside the chroot jail
@@ -30,12 +30,13 @@ socket = r:TCP_NODELAY=1
 ; CApath is located inside chroot jail
 ;CApath = /certs
 ; It's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
 ; Don't forget to c_rehash CRLpath
 ; CRLpath is located inside chroot jail
 ;CRLpath = /crls
 ; Alternatively you can use CRLfile
-;CRLfile = @prefix@/etc/stunnel/crls.pem
+;CRLfile = @sysconfdir@/etc/stunnel/crls.pem
 
 ; Some debugging stuff useful for troubleshooting
 ;debug = 7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	16 Apr 2009 17:54:30 -0000	1.27
+++ .cvsignore	9 Dec 2009 22:07:59 -0000	1.28
@@ -1,2 +1,4 @@
 stunnel-4.27.tar.gz
 stunnel-4.27.tar.gz.asc
+stunnel-4.29.tar.gz
+stunnel-4.29.tar.gz.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	16 Apr 2009 17:54:30 -0000	1.27
+++ sources	9 Dec 2009 22:07:59 -0000	1.28
@@ -1,2 +1,2 @@
-3c655d815576f50046a1c28744b88681  stunnel-4.27.tar.gz
-1219d667d1a1306f392d180587c6b50e  stunnel-4.27.tar.gz.asc
+14dc3f8412947f0548975cbce74d6863  stunnel-4.29.tar.gz
+655172db10aa297e2085009af22797fb  stunnel-4.29.tar.gz.asc


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- stunnel.spec	21 Aug 2009 16:01:09 -0000	1.61
+++ stunnel.spec	9 Dec 2009 22:08:00 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.27
-Release: 5
+Version: 4.29
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -12,9 +12,9 @@ Source3: sfinger.xinetd
 Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
-Patch0: stunnel-4.27-authpriv.patch
-Patch1: stunnel-4.27-sample.patch
-Patch2: stunnel-4.27-aliasing.patch
+Patch0: stunnel-4.29-authpriv.patch
+Patch1: stunnel-4.29-sample.patch
+#Patch2: stunnel-4.27-aliasing.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -28,7 +28,7 @@ in conjunction with imapd to create an S
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
-%patch2 -p1 -b .aliasing
+#%patch2 -p1 -b .aliasing
 
 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
@@ -81,6 +81,11 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Tue Dec 09 2009 Avesh Agrwal <avagarwa at redhat.com> - 4.29-1
+- New upstream realease 4.29
+- Updated authpriv and sample patches for the new release
+- Modified spec file to include dist tag
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.27-5
 - rebuilt with new openssl
 


--- stunnel-4.27-aliasing.patch DELETED ---


--- stunnel-4.27-authpriv.patch DELETED ---


--- stunnel-4.27-sample.patch DELETED ---



From rdieter at fedoraproject.org  Wed Dec  9 22:09:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 22:09:43 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.549,1.550
Message-ID: <20091209220943.13A1411C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18986

Modified Files:
	kdelibs.spec 
Log Message:
fix build with new rpm



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -p -r1.549 -r1.550
--- kdelibs.spec	9 Dec 2009 21:47:18 -0000	1.549
+++ kdelibs.spec	9 Dec 2009 22:09:42 -0000	1.550
@@ -89,7 +89,7 @@ Patch101: kdelibs-4.3.80-fix-kauth-polki
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
 BuildRequires: qt4-devel >= 4.5.0
-Requires: qt4%{?_isa} >= %{_qt4_version}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig



From rdieter at fedoraproject.org  Wed Dec  9 22:11:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 22:11:08 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.167,1.168
Message-ID: <20091209221108.5FD9311C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19474

Modified Files:
	kdebase-runtime.spec 
Log Message:
fix BR: ontologies stuff



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- kdebase-runtime.spec	9 Dec 2009 21:58:01 -0000	1.167
+++ kdebase-runtime.spec	9 Dec 2009 22:11:08 -0000	1.168
@@ -54,7 +54,6 @@ BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
-BuildRequires: desktop-shared-ontologies-devel
 BuildRequires: exiv2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -68,6 +67,7 @@ BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel >= 2.3.0
 %if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel



From devrim at fedoraproject.org  Wed Dec  9 22:17:06 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed,  9 Dec 2009 22:17:06 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-4 pgpool.init,1.3,1.4
Message-ID: <20091209221706.D5EA411C0267@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21426/EL-4

Modified Files:
	pgpool.init 
Log Message:
Adjust order of startup and kill, per RH bugzilla #545739.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/pgpool.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pgpool.init	22 Oct 2009 11:59:34 -0000	1.3
+++ pgpool.init	9 Dec 2009 22:17:06 -0000	1.4
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pgpool    This is the init script for starting up pgpool-II
 #
-# chkconfig: - 64 36
+# chkconfig: - 235 74 33
 # description: Starts and stops the pgpool daemon
 # processname: pgpool
 # pidfile:	/var/run/pgpool.pid
@@ -14,6 +14,9 @@
 #
 # v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - Fix logging.
+#
+# v2.3 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Adjust order of startup and kill, per RH bugzilla #545739.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool



From devrim at fedoraproject.org  Wed Dec  9 22:17:06 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed,  9 Dec 2009 22:17:06 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/devel pgpool.init,1.5,1.6
Message-ID: <20091209221706.B430E11C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21426/devel

Modified Files:
	pgpool.init 
Log Message:
Adjust order of startup and kill, per RH bugzilla #545739.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/pgpool.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pgpool.init	22 Oct 2009 11:59:35 -0000	1.5
+++ pgpool.init	9 Dec 2009 22:17:06 -0000	1.6
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pgpool    This is the init script for starting up pgpool-II
 #
-# chkconfig: - 64 36
+# chkconfig: - 235 74 33
 # description: Starts and stops the pgpool daemon
 # processname: pgpool
 # pidfile:	/var/run/pgpool.pid
@@ -14,6 +14,9 @@
 #
 # v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - Fix logging.
+#
+# v2.3 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Adjust order of startup and kill, per RH bugzilla #545739.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool



From devrim at fedoraproject.org  Wed Dec  9 22:17:07 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed,  9 Dec 2009 22:17:07 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-10 pgpool.init,1.4,1.5
Message-ID: <20091209221707.3E9F911C0267@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21426/F-10

Modified Files:
	pgpool.init 
Log Message:
Adjust order of startup and kill, per RH bugzilla #545739.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/pgpool.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pgpool.init	22 Oct 2009 11:59:34 -0000	1.4
+++ pgpool.init	9 Dec 2009 22:17:07 -0000	1.5
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pgpool    This is the init script for starting up pgpool-II
 #
-# chkconfig: - 64 36
+# chkconfig: - 235 74 33
 # description: Starts and stops the pgpool daemon
 # processname: pgpool
 # pidfile:	/var/run/pgpool.pid
@@ -14,6 +14,9 @@
 #
 # v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - Fix logging.
+#
+# v2.3 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Adjust order of startup and kill, per RH bugzilla #545739.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool



From devrim at fedoraproject.org  Wed Dec  9 22:17:07 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed,  9 Dec 2009 22:17:07 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-5 pgpool.init,1.3,1.4
Message-ID: <20091209221707.0E13B11C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21426/EL-5

Modified Files:
	pgpool.init 
Log Message:
Adjust order of startup and kill, per RH bugzilla #545739.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/pgpool.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pgpool.init	22 Oct 2009 11:59:34 -0000	1.3
+++ pgpool.init	9 Dec 2009 22:17:06 -0000	1.4
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pgpool    This is the init script for starting up pgpool-II
 #
-# chkconfig: - 64 36
+# chkconfig: - 235 74 33
 # description: Starts and stops the pgpool daemon
 # processname: pgpool
 # pidfile:	/var/run/pgpool.pid
@@ -14,6 +14,9 @@
 #
 # v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - Fix logging.
+#
+# v2.3 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Adjust order of startup and kill, per RH bugzilla #545739.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool



From devrim at fedoraproject.org  Wed Dec  9 22:17:07 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed,  9 Dec 2009 22:17:07 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-11 pgpool.init,1.5,1.6
Message-ID: <20091209221707.7184311C03AD@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21426/F-11

Modified Files:
	pgpool.init 
Log Message:
Adjust order of startup and kill, per RH bugzilla #545739.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/pgpool.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pgpool.init	22 Oct 2009 11:59:35 -0000	1.5
+++ pgpool.init	9 Dec 2009 22:17:07 -0000	1.6
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pgpool    This is the init script for starting up pgpool-II
 #
-# chkconfig: - 64 36
+# chkconfig: - 235 74 33
 # description: Starts and stops the pgpool daemon
 # processname: pgpool
 # pidfile:	/var/run/pgpool.pid
@@ -14,6 +14,9 @@
 #
 # v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - Fix logging.
+#
+# v2.3 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Adjust order of startup and kill, per RH bugzilla #545739.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool



From devrim at fedoraproject.org  Wed Dec  9 22:17:07 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed,  9 Dec 2009 22:17:07 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-12 pgpool.init,1.5,1.6
Message-ID: <20091209221707.BD29811C00E0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21426/F-12

Modified Files:
	pgpool.init 
Log Message:
Adjust order of startup and kill, per RH bugzilla #545739.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/pgpool.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pgpool.init	22 Oct 2009 11:59:35 -0000	1.5
+++ pgpool.init	9 Dec 2009 22:17:07 -0000	1.6
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pgpool    This is the init script for starting up pgpool-II
 #
-# chkconfig: - 64 36
+# chkconfig: - 235 74 33
 # description: Starts and stops the pgpool daemon
 # processname: pgpool
 # pidfile:	/var/run/pgpool.pid
@@ -14,6 +14,9 @@
 #
 # v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - Fix logging.
+#
+# v2.3 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Adjust order of startup and kill, per RH bugzilla #545739.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool



From stahnma at fedoraproject.org  Wed Dec  9 22:18:40 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed,  9 Dec 2009 22:18:40 +0000 (UTC)
Subject: rpms/rubygem-rspec/devel rubygem-rspec.spec,1.5,1.6
Message-ID: <20091209221840.78C0611C00E0@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/rubygem-rspec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22060

Modified Files:
	rubygem-rspec.spec 
Log Message:
New spec for updated version.


Index: rubygem-rspec.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/devel/rubygem-rspec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-rspec.spec	27 Jul 2009 03:35:58 -0000	1.5
+++ rubygem-rspec.spec	9 Dec 2009 22:18:40 -0000	1.6
@@ -1,4 +1,3 @@
-# Generated from rspec-1.1.3.gem by gem2rpm -*- rpm-spec -*-
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %define gemname rspec
@@ -6,8 +5,8 @@
 
 Summary: Behaviour driven development (BDD) framework for Ruby
 Name: rubygem-%{gemname}
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
 URL: http://rspec.rubyforge.org
@@ -53,6 +52,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 09 2009 Michael Stahnke <stahnma at fedoraproject.org> - 1.2.9-1
+- New Version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stahnma at fedoraproject.org  Wed Dec  9 22:20:04 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed,  9 Dec 2009 22:20:04 +0000 (UTC)
Subject: File rspec-1.2.9.gem uploaded to lookaside cache by stahnma
Message-ID: <20091209222004.02D7E10F892@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for rubygem-rspec:

9c47f7f286441a24dfc5f9ad6edd3245  rspec-1.2.9.gem



From rdieter at fedoraproject.org  Wed Dec  9 22:20:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 22:20:24 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.168,1.169
Message-ID: <20091209222024.9521011C03DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22655

Modified Files:
	kdebase-runtime.spec 
Log Message:
s/libattica/attica/



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- kdebase-runtime.spec	9 Dec 2009 22:11:08 -0000	1.168
+++ kdebase-runtime.spec	9 Dec 2009 22:20:24 -0000	1.169
@@ -52,13 +52,13 @@ Requires: oxygen-icon-theme >= %{version
 
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
+BuildRequires: attica-devel
 BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
 BuildRequires: exiv2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: libattica-devel
 BuildRequires: libsmbclient-devel
 BuildRequires: libssh-devel >= 0.3.92
 BuildRequires: libXScrnSaver-devel
@@ -230,7 +230,7 @@ fi
 
 %changelog
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
-- BR: libattica-devel shared-desktop-ontologies-devel
+- BR: attica-devel shared-desktop-ontologies-devel
 
 * Sat Dec 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
 - BR exiv2-devel



From stahnma at fedoraproject.org  Wed Dec  9 22:20:53 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed,  9 Dec 2009 22:20:53 +0000 (UTC)
Subject: rpms/rubygem-rspec/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20091209222053.F306111C00E0@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/rubygem-rspec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22929

Modified Files:
	.cvsignore sources 
Log Message:
new source


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Jun 2009 04:10:33 -0000	1.4
+++ .cvsignore	9 Dec 2009 22:20:53 -0000	1.5
@@ -1 +1 @@
-rspec-1.2.7.gem
+rspec-1.2.9.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jun 2009 04:10:33 -0000	1.4
+++ sources	9 Dec 2009 22:20:53 -0000	1.5
@@ -1 +1 @@
-df7d2bdc3f50d7e8ff75f5345e360d1a  rspec-1.2.7.gem
+9c47f7f286441a24dfc5f9ad6edd3245  rspec-1.2.9.gem



From rdieter at fedoraproject.org  Wed Dec  9 22:21:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 22:21:01 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.550,1.551
Message-ID: <20091209222101.1C10011C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22952

Modified Files:
	kdelibs.spec 
Log Message:
s/libattica/attica/



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -p -r1.550 -r1.551
--- kdelibs.spec	9 Dec 2009 22:09:42 -0000	1.550
+++ kdelibs.spec	9 Dec 2009 22:21:00 -0000	1.551
@@ -95,6 +95,7 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
+BuildRequires: attica-devel
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bison flex
@@ -108,7 +109,6 @@ BuildRequires: giflib-devel
 BuildRequires: jasper-devel
 BuildRequires: krb5-devel
 BuildRequires: libacl-devel libattr-devel
-BuildRequires: libattica-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
@@ -416,7 +416,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-4
-- BR: libattica-devel shared-desktop-ontologies-devel
+- BR: attica-devel shared-desktop-ontologies-devel
 - phonon_ver 4.3.80
 - soprano_ver 2.3.70
 



From notting at fedoraproject.org  Wed Dec  9 22:25:37 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed,  9 Dec 2009 22:25:37 +0000 (UTC)
Subject: rpms/ConsoleKit/devel ConsoleKit-0.4.1-upstart06.patch, NONE,
	1.1 ConsoleKit.spec, 1.49, 1.50
Message-ID: <20091209222537.8D81811C00E0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24361

Modified Files:
	ConsoleKit.spec 
Added Files:
	ConsoleKit-0.4.1-upstart06.patch 
Log Message:
Adjust for upstart 0.6.x.

Job files go in /etc/init, and must end in .conf.

Since service jobs (i.e., jobs that respawn) are now the default, mark
these jobs with 'task'.


ConsoleKit-0.4.1-upstart06.patch:
 ck-log-system-restart      |    8 --------
 ck-log-system-restart.conf |    8 ++++++++
 ck-log-system-start        |    8 --------
 ck-log-system-start.conf   |    8 ++++++++
 ck-log-system-stop         |    8 --------
 ck-log-system-stop.conf    |    8 ++++++++
 6 files changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE ConsoleKit-0.4.1-upstart06.patch ---
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-restart ConsoleKit-0.4.1-new/data/ck-log-system-restart
--- ConsoleKit-0.4.1/data/ck-log-system-restart	2009-04-29 15:07:29.000000000 -0400
+++ ConsoleKit-0.4.1-new/data/ck-log-system-restart	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-# Upstart event
-# ck-log-system-restart - write system restart to log
-#
-
-start on runlevel 6
-
-console output
-exec /usr/sbin/ck-log-system-restart
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-restart.conf ConsoleKit-0.4.1-new/data/ck-log-system-restart.conf
--- ConsoleKit-0.4.1/data/ck-log-system-restart.conf	1969-12-31 18:00:00.000000000 -0600
+++ ConsoleKit-0.4.1-new/data/ck-log-system-restart.conf	2009-12-09 17:20:45.000000000 -0500
@@ -0,0 +1,8 @@
+# Upstart event
+# ck-log-system-restart - write system restart to log
+#
+
+start on runlevel 6
+
+task
+exec /usr/sbin/ck-log-system-restart
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-start ConsoleKit-0.4.1-new/data/ck-log-system-start
--- ConsoleKit-0.4.1/data/ck-log-system-start	2009-07-29 20:29:51.000000000 -0400
+++ ConsoleKit-0.4.1-new/data/ck-log-system-start	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-# Upstart event
-# ck-log-system-start - write system start to log
-#
-
-start on stopped rcS
-
-console output
-exec /usr/sbin/ck-log-system-start
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-start.conf ConsoleKit-0.4.1-new/data/ck-log-system-start.conf
--- ConsoleKit-0.4.1/data/ck-log-system-start.conf	1969-12-31 18:00:00.000000000 -0600
+++ ConsoleKit-0.4.1-new/data/ck-log-system-start.conf	2009-12-09 17:20:45.000000000 -0500
@@ -0,0 +1,8 @@
+# Upstart event
+# ck-log-system-start - write system start to log
+#
+
+start on stopped rcS
+
+task
+exec /usr/sbin/ck-log-system-start
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-stop ConsoleKit-0.4.1-new/data/ck-log-system-stop
--- ConsoleKit-0.4.1/data/ck-log-system-stop	2009-04-29 15:07:29.000000000 -0400
+++ ConsoleKit-0.4.1-new/data/ck-log-system-stop	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-# Upstart event
-# ck-log-system-stop - write system stop to log
-#
-
-start on runlevel 0
-
-console output
-exec /usr/sbin/ck-log-system-stop
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-stop.conf ConsoleKit-0.4.1-new/data/ck-log-system-stop.conf
--- ConsoleKit-0.4.1/data/ck-log-system-stop.conf	1969-12-31 18:00:00.000000000 -0600
+++ ConsoleKit-0.4.1-new/data/ck-log-system-stop.conf	2009-12-09 17:20:45.000000000 -0500
@@ -0,0 +1,8 @@
+# Upstart event
+# ck-log-system-stop - write system stop to log
+#
+
+start on runlevel 0
+
+task
+exec /usr/sbin/ck-log-system-stop


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ConsoleKit.spec	29 Sep 2009 15:46:00 -0000	1.49
+++ ConsoleKit.spec	9 Dec 2009 22:25:37 -0000	1.50
@@ -6,14 +6,16 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
 Source0: http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-%{version}.tar.bz2
+Patch0: ConsoleKit-0.4.1-upstart06.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
+Conflicts: upstart < 0.6.0
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -79,6 +81,7 @@ This package contains developer document
 
 %prep
 %setup -q
+%patch0 -p1 
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -98,8 +101,8 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/security/*
 rm -f $RPM_BUILD_ROOT/%{_var}/log/ConsoleKit/history
 
 # The sample upstart files are good enough for us.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/event.d
-cp data/ck-log-system-{start,stop,restart} $RPM_BUILD_ROOT%{_sysconfdir}/event.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init
+cp data/ck-log-system-{start,stop,restart}.conf $RPM_BUILD_ROOT%{_sysconfdir}/init
 
 cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
@@ -119,7 +122,7 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/NEWS
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
 %{_sysconfdir}/dbus-1/system.d/*
-%config(noreplace) %{_sysconfdir}/event.d/*
+%config(noreplace) %{_sysconfdir}/init/*
 %{_datadir}/dbus-1/system-services/*.service
 %{_datadir}/polkit-1/actions/*.policy
 %dir %{_sysconfdir}/ConsoleKit
@@ -166,6 +169,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> 0.4.1-2
+- Adjust for upstart 0.6
+
 * Tue Sep 29 2009 Jon McCann <jmccann at redhat.com> 0.4.1-1
 - Update to 0.4.1
 



From stahnma at fedoraproject.org  Wed Dec  9 22:50:12 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed,  9 Dec 2009 22:50:12 +0000 (UTC)
Subject: rpms/rubygem-rspec/F-12 .cvsignore, 1.4, 1.5 rubygem-rspec.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091209225012.AA15511C03DB@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/rubygem-rspec/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32516

Modified Files:
	.cvsignore rubygem-rspec.spec sources 
Log Message:
New version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Jun 2009 04:10:33 -0000	1.4
+++ .cvsignore	9 Dec 2009 22:50:11 -0000	1.5
@@ -1 +1 @@
-rspec-1.2.7.gem
+rspec-1.2.9.gem


Index: rubygem-rspec.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/F-12/rubygem-rspec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-rspec.spec	27 Jul 2009 03:35:58 -0000	1.5
+++ rubygem-rspec.spec	9 Dec 2009 22:50:11 -0000	1.6
@@ -1,4 +1,3 @@
-# Generated from rspec-1.1.3.gem by gem2rpm -*- rpm-spec -*-
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %define gemname rspec
@@ -6,8 +5,8 @@
 
 Summary: Behaviour driven development (BDD) framework for Ruby
 Name: rubygem-%{gemname}
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
 URL: http://rspec.rubyforge.org
@@ -53,6 +52,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 09 2009 Michael Stahnke <stahnma at fedoraproject.org> - 1.2.9-1
+- New Version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jun 2009 04:10:33 -0000	1.4
+++ sources	9 Dec 2009 22:50:11 -0000	1.5
@@ -1 +1 @@
-df7d2bdc3f50d7e8ff75f5345e360d1a  rspec-1.2.7.gem
+9c47f7f286441a24dfc5f9ad6edd3245  rspec-1.2.9.gem



From stahnma at fedoraproject.org  Wed Dec  9 22:59:19 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed,  9 Dec 2009 22:59:19 +0000 (UTC)
Subject: rpms/rubygem-rspec/F-11 .cvsignore, 1.3, 1.4 rubygem-rspec.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20091209225919.8C79511C00E0@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/rubygem-rspec/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2926

Modified Files:
	.cvsignore rubygem-rspec.spec sources 
Log Message:
New version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Mar 2009 01:58:52 -0000	1.3
+++ .cvsignore	9 Dec 2009 22:59:19 -0000	1.4
@@ -1 +1 @@
-rspec-1.2.2.gem
+rspec-1.2.9.gem


Index: rubygem-rspec.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/F-11/rubygem-rspec.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rubygem-rspec.spec	23 Jun 2009 04:19:05 -0000	1.4
+++ rubygem-rspec.spec	9 Dec 2009 22:59:19 -0000	1.5
@@ -1,4 +1,3 @@
-# Generated from rspec-1.1.3.gem by gem2rpm -*- rpm-spec -*-
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %define gemname rspec
@@ -6,7 +5,7 @@
 
 Summary: Behaviour driven development (BDD) framework for Ruby
 Name: rubygem-%{gemname}
-Version: 1.2.7
+Version: 1.2.9
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -53,6 +52,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 09 2009 Michael Stahnke <stahnma at fedoraproject.org> - 1.2.9-1
+- New Version
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 22 2009 Michael Stahnke <stahnma at fedoraproject.org> - 1.2.7-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-rspec/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jun 2009 04:19:05 -0000	1.4
+++ sources	9 Dec 2009 22:59:19 -0000	1.5
@@ -1 +1 @@
-df7d2bdc3f50d7e8ff75f5345e360d1a  rspec-1.2.7.gem
+9c47f7f286441a24dfc5f9ad6edd3245  rspec-1.2.9.gem



From rvinyard at fedoraproject.org  Wed Dec  9 23:03:01 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  9 Dec 2009 23:03:01 +0000 (UTC)
Subject: File papyrus-0.13.1.tar.bz2 uploaded to lookaside cache by rvinyard
Message-ID: <20091209230301.A88FC10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for papyrus:

9b05b10b1e1d70374fed419c2be686bc  papyrus-0.13.1.tar.bz2



From rvinyard at fedoraproject.org  Wed Dec  9 23:03:20 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  9 Dec 2009 23:03:20 +0000 (UTC)
Subject: File papyrus-0.13.1-doc.tar.bz2 uploaded to lookaside cache by
	rvinyard
Message-ID: <20091209230320.6C9BB10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for papyrus:

3dd4985e203d21a0593d60ddbde59962  papyrus-0.13.1-doc.tar.bz2



From berrange at fedoraproject.org  Wed Dec  9 23:03:47 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Wed,  9 Dec 2009 23:03:47 +0000 (UTC)
Subject: File lloyd-yajl-45a1bdb.tar.gz uploaded to lookaside cache by
	berrange
Message-ID: <20091209230347.71F3610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for yajl:

3b6551d07d493817f87624fa73dc7d5e  lloyd-yajl-45a1bdb.tar.gz



From emaldonado at fedoraproject.org  Wed Dec  9 23:03:42 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed,  9 Dec 2009 23:03:42 +0000 (UTC)
Subject: rpms/nss/F-12 nss-sysinit.patch,1.1,1.2 nss.spec,1.124,1.125
Message-ID: <20091209230342.2621111C00E0@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4480

Modified Files:
	nss-sysinit.patch nss.spec 
Log Message:
Remove unneeded patching

nss-sysinit.patch:
 manifest.mn |    1 +
 1 file changed, 1 insertion(+)

Index: nss-sysinit.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/nss-sysinit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-sysinit.patch	4 Dec 2009 16:23:46 -0000	1.1
+++ nss-sysinit.patch	9 Dec 2009 23:03:41 -0000	1.2
@@ -4,35 +4,12 @@ RCS file: /cvsroot/mozilla/security/nss/
 retrieving revision 1.20
 diff -u -p -r1.20 manifest.mn
 --- mozilla/security/nss/lib/manifest.mn	7 Nov 2009 05:57:41 -0000	1.20
-+++ mozilla/security/nss/lib/manifest.mn	4 Dec 2009 02:27:20 -0000
++++ mozilla/security/nss/lib/manifest.mn	9 Dec 2009 21:37:15 -0000
 @@ -56,6 +56,7 @@ DIRS =  util freebl softoken \
  	pkcs12 pkcs7 smime \
  	crmf jar \
  	ckfw      \
-+	sysinit \
++	sysinit      \
  	$(NULL)
  
  #  fortcrypt  is no longer built
-Index: mozilla/security/nss/lib/nss/nssinit.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/nss/nssinit.c,v
-retrieving revision 1.103
-diff -u -p -r1.103 nssinit.c
---- mozilla/security/nss/lib/nss/nssinit.c	29 Oct 2009 21:33:10 -0000	1.103
-+++ mozilla/security/nss/lib/nss/nssinit.c	4 Dec 2009 01:25:06 -0000
-@@ -52,6 +52,7 @@
- #include "secoid.h"
- #include "nss.h"
- #include "pk11func.h"
-+#include "pk11priv.h"
- #include "secerr.h"
- #include "nssbase.h"
- #include "pkixt.h"
-@@ -64,6 +65,7 @@
- #include "ocspti.h"
- #include "ocspi.h"
- 
-+
- /*
-  * On Windows nss3.dll needs to export the symbol 'mktemp' to be
-  * fully backward compatible with the nss3.dll in NSS 3.2.x and


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/nss.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- nss.spec	4 Dec 2009 16:23:46 -0000	1.124
+++ nss.spec	9 Dec 2009 23:03:41 -0000	1.125
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.2
+Release:          1%{?dist}.5
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -471,6 +471,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Wed Dec 09 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-2.1
+- Remove unneeded patch
+
 * Thu Dec 04 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.2
 - Update to 3.12.5
 - CVE-2009-3555 TLS: MITM attacks via session renegotiation



From rvinyard at fedoraproject.org  Wed Dec  9 23:03:53 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  9 Dec 2009 23:03:53 +0000 (UTC)
Subject: rpms/papyrus/devel .cvsignore, 1.21, 1.22 papyrus.spec, 1.30,
	1.31 sources, 1.21, 1.22
Message-ID: <20091209230353.29C9711C00E0@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4569

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	19 Nov 2009 18:07:53 -0000	1.21
+++ .cvsignore	9 Dec 2009 23:03:52 -0000	1.22
@@ -1,2 +1,2 @@
-papyrus-0.13.0.tar.bz2
-papyrus-0.13.0-doc.tar.bz2
+papyrus-0.13.1.tar.bz2
+papyrus-0.13.1-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- papyrus.spec	19 Nov 2009 18:05:24 -0000	1.30
+++ papyrus.spec	9 Dec 2009 23:03:53 -0000	1.31
@@ -1,6 +1,6 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.13.0
+Version:          0.13.1
 Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
@@ -136,7 +136,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.13/papyrus/
 %dir %{_includedir}/papyrus-0.13/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.13.0/
+%{_datadir}/papyrus-0.13.1/
 %doc ChangeLog
 
 %files doc
@@ -169,11 +169,14 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.13/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.13/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.13.0/
+%{_datadir}/papyrus-gtkmm-0.13.1/
 %doc AUTHORS COPYING
 
 
 %changelog
+* Wed Dec 09 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.13.1-1
+- New release
+
 * Tue Nov 17 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.13.0-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	19 Nov 2009 18:07:54 -0000	1.21
+++ sources	9 Dec 2009 23:03:53 -0000	1.22
@@ -1,2 +1,2 @@
-c5266f15107a75d749bec7cb7f3a15ab  papyrus-0.13.0.tar.bz2
-f83b3f3ab4b3c5889d0fff15dc2a8fbe  papyrus-0.13.0-doc.tar.bz2
+9b05b10b1e1d70374fed419c2be686bc  papyrus-0.13.1.tar.bz2
+3dd4985e203d21a0593d60ddbde59962  papyrus-0.13.1-doc.tar.bz2



From rvinyard at fedoraproject.org  Wed Dec  9 23:04:00 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  9 Dec 2009 23:04:00 +0000 (UTC)
Subject: rpms/papyrus/F-12 .cvsignore, 1.21, 1.22 papyrus.spec, 1.30,
	1.31 sources, 1.21, 1.22
Message-ID: <20091209230400.4DBDF11C00E0@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4636

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	19 Nov 2009 18:09:56 -0000	1.21
+++ .cvsignore	9 Dec 2009 23:04:00 -0000	1.22
@@ -1,2 +1,2 @@
-papyrus-0.13.0.tar.bz2
-papyrus-0.13.0-doc.tar.bz2
+papyrus-0.13.1.tar.bz2
+papyrus-0.13.1-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-12/papyrus.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- papyrus.spec	19 Nov 2009 18:09:56 -0000	1.30
+++ papyrus.spec	9 Dec 2009 23:04:00 -0000	1.31
@@ -1,6 +1,6 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.13.0
+Version:          0.13.1
 Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
@@ -136,7 +136,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.13/papyrus/
 %dir %{_includedir}/papyrus-0.13/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.13.0/
+%{_datadir}/papyrus-0.13.1/
 %doc ChangeLog
 
 %files doc
@@ -169,11 +169,14 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.13/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.13/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.13.0/
+%{_datadir}/papyrus-gtkmm-0.13.1/
 %doc AUTHORS COPYING
 
 
 %changelog
+* Wed Dec 09 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.13.1-1
+- New release
+
 * Tue Nov 17 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.13.0-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	19 Nov 2009 18:09:56 -0000	1.21
+++ sources	9 Dec 2009 23:04:00 -0000	1.22
@@ -1,2 +1,2 @@
-c5266f15107a75d749bec7cb7f3a15ab  papyrus-0.13.0.tar.bz2
-f83b3f3ab4b3c5889d0fff15dc2a8fbe  papyrus-0.13.0-doc.tar.bz2
+9b05b10b1e1d70374fed419c2be686bc  papyrus-0.13.1.tar.bz2
+3dd4985e203d21a0593d60ddbde59962  papyrus-0.13.1-doc.tar.bz2



From rvinyard at fedoraproject.org  Wed Dec  9 23:04:09 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  9 Dec 2009 23:04:09 +0000 (UTC)
Subject: rpms/papyrus/F-11 .cvsignore, 1.21, 1.22 papyrus.spec, 1.29,
	1.30 sources, 1.21, 1.22
Message-ID: <20091209230409.099AB11C00E0@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4725

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	19 Nov 2009 18:10:04 -0000	1.21
+++ .cvsignore	9 Dec 2009 23:04:08 -0000	1.22
@@ -1,2 +1,2 @@
-papyrus-0.13.0.tar.bz2
-papyrus-0.13.0-doc.tar.bz2
+papyrus-0.13.1.tar.bz2
+papyrus-0.13.1-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/papyrus.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- papyrus.spec	19 Nov 2009 18:10:04 -0000	1.29
+++ papyrus.spec	9 Dec 2009 23:04:08 -0000	1.30
@@ -1,6 +1,6 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.13.0
+Version:          0.13.1
 Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
@@ -136,7 +136,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.13/papyrus/
 %dir %{_includedir}/papyrus-0.13/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.13.0/
+%{_datadir}/papyrus-0.13.1/
 %doc ChangeLog
 
 %files doc
@@ -169,11 +169,14 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.13/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.13/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.13.0/
+%{_datadir}/papyrus-gtkmm-0.13.1/
 %doc AUTHORS COPYING
 
 
 %changelog
+* Wed Dec 09 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.13.1-1
+- New release
+
 * Tue Nov 17 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.13.0-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	19 Nov 2009 18:10:04 -0000	1.21
+++ sources	9 Dec 2009 23:04:08 -0000	1.22
@@ -1,2 +1,2 @@
-c5266f15107a75d749bec7cb7f3a15ab  papyrus-0.13.0.tar.bz2
-f83b3f3ab4b3c5889d0fff15dc2a8fbe  papyrus-0.13.0-doc.tar.bz2
+9b05b10b1e1d70374fed419c2be686bc  papyrus-0.13.1.tar.bz2
+3dd4985e203d21a0593d60ddbde59962  papyrus-0.13.1-doc.tar.bz2



From rvinyard at fedoraproject.org  Wed Dec  9 23:04:15 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  9 Dec 2009 23:04:15 +0000 (UTC)
Subject: rpms/papyrus/F-10 .cvsignore, 1.21, 1.22 papyrus.spec, 1.32,
	1.33 sources, 1.21, 1.22
Message-ID: <20091209230415.3EB8911C00E0@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4803

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	19 Nov 2009 18:10:12 -0000	1.21
+++ .cvsignore	9 Dec 2009 23:04:15 -0000	1.22
@@ -1,2 +1,2 @@
-papyrus-0.13.0.tar.bz2
-papyrus-0.13.0-doc.tar.bz2
+papyrus-0.13.1.tar.bz2
+papyrus-0.13.1-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- papyrus.spec	19 Nov 2009 18:10:12 -0000	1.32
+++ papyrus.spec	9 Dec 2009 23:04:15 -0000	1.33
@@ -1,6 +1,6 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.13.0
+Version:          0.13.1
 Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
@@ -136,7 +136,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.13/papyrus/
 %dir %{_includedir}/papyrus-0.13/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.13.0/
+%{_datadir}/papyrus-0.13.1/
 %doc ChangeLog
 
 %files doc
@@ -169,11 +169,14 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/papyrus-0.13/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.13/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.13.0/
+%{_datadir}/papyrus-gtkmm-0.13.1/
 %doc AUTHORS COPYING
 
 
 %changelog
+* Wed Dec 09 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.13.1-1
+- New release
+
 * Tue Nov 17 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.13.0-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	19 Nov 2009 18:10:12 -0000	1.21
+++ sources	9 Dec 2009 23:04:15 -0000	1.22
@@ -1,2 +1,2 @@
-c5266f15107a75d749bec7cb7f3a15ab  papyrus-0.13.0.tar.bz2
-f83b3f3ab4b3c5889d0fff15dc2a8fbe  papyrus-0.13.0-doc.tar.bz2
+9b05b10b1e1d70374fed419c2be686bc  papyrus-0.13.1.tar.bz2
+3dd4985e203d21a0593d60ddbde59962  papyrus-0.13.1-doc.tar.bz2



From berrange at fedoraproject.org  Wed Dec  9 23:05:44 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Wed,  9 Dec 2009 23:05:44 +0000 (UTC)
Subject: rpms/yajl/devel lloyd-yajl-lib64.patch, NONE, 1.1 yajl.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091209230544.CDBD511C00E0@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/yajl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304

Modified Files:
	.cvsignore sources 
Added Files:
	lloyd-yajl-lib64.patch yajl.spec 
Log Message:
Initial import after review (rhbz #545132)

lloyd-yajl-lib64.patch:
 CMakeLists.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE lloyd-yajl-lib64.patch ---
diff -rup lloyd-yajl-45a1bdb.orig/src/CMakeLists.txt lloyd-yajl-45a1bdb.new/src/CMakeLists.txt
--- lloyd-yajl-45a1bdb.orig/src/CMakeLists.txt	2009-10-29 23:35:39.000000000 +0000
+++ lloyd-yajl-45a1bdb.new/src/CMakeLists.txt	2009-12-07 17:20:20.000000000 +0000
@@ -37,7 +37,7 @@ SET (PUB_HDRS api/yajl_parse.h api/yajl_
 #ADD_DEFINITIONS(-DYAJL_LEXER_DEBUG)
 
 # set up some paths
-SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
+SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/${LIB_INSTALL_DIR})
 SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl)
 
 # set the output path for libraries
@@ -71,8 +71,8 @@ ENDFOREACH (header ${PUB_HDRS})
 INCLUDE_DIRECTORIES(${incDir}/..)
 
 IF(NOT WIN32)
-  INSTALL(TARGETS yajl LIBRARY DESTINATION lib)
-  INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib)
+  INSTALL(TARGETS yajl LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+  INSTALL(TARGETS yajl_s ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
   INSTALL(DIRECTORY api/ DESTINATION include/yajl
           FILES_MATCHING PATTERN "*.h")
 ENDIF()


--- NEW FILE yajl.spec ---
Name: yajl
Version: 1.0.7
Release: 2%{?dist}
Summary: Yet Another JSON Library (YAJL)

Group: Development/Libraries
License: BSD
URL: http://lloyd.github.com/yajl/

#
# NB, upstream does not provide pre-built tar.gz downloads. Instead
# they make you use the 'on the fly' generated tar.gz from GITHub's
# web interface
#
# The Source0 for any version is obtained by a URL
#
#   http://github.com/lloyd/yajl/tarball/1.0.7
#
# Which causes a download of a archive named after
# the GIT hash corresponding to the version tag
#
#   eg lloyd-yajl-45a1bdb.tar.gz
#
# NB even though the tar.gz is generated on the fly by GITHub it
# will always have identical md5sum
#
# So for new versions, update 'githash' to match the hash of the
# GIT tag associated with updated 'Version:' field just above
%global githash 45a1bdb
Source0: lloyd-%{name}-%{githash}.tar.gz
Patch1: lloyd-%{name}-lib64.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake

%package devel
Summary: Libraries, includes, etc to develop with YAJL
Requires: %{name} = %{version}-%{release}

%description
Yet Another JSON Library. YAJL is a small event-driven
(SAX-style) JSON parser written in ANSI C, and a small
validating JSON generator.

%description devel
Yet Another JSON Library. YAJL is a small event-driven
(SAX-style) JSON parser written in ANSI C, and a small
validating JSON generator.

This sub-package provides the libraries and includes
necessary for developing against the YAJL library

%prep
%setup -q -n lloyd-%{name}-%{githash}
# Fix lib vs lib64 problems
%patch1 -p1

%build
# NB, we are not using upstream's 'configure'/'make'
# wrapper, instead we use cmake directly to better
# align with Fedora standards
mkdir build
cd build
%cmake ..
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
cd build
make install DESTDIR=$RPM_BUILD_ROOT

# No static libraries
rm -f $RPM_BUILD_ROOT%{_libdir}/libyajl_s.a


%check
cd test
./run_tests.sh

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README TODO
%{_bindir}/json_reformat
%{_bindir}/json_verify
%{_libdir}/libyajl.so.1
%{_libdir}/libyajl.so.1.0.7

%files devel
%defattr(-,root,root,-)
%doc COPYING
%dir %{_includedir}/yajl
%{_includedir}/yajl/yajl_common.h
%{_includedir}/yajl/yajl_gen.h
%{_includedir}/yajl/yajl_parse.h
%{_libdir}/libyajl.so


%changelog
* Tue Dec  8 2009 Daniel P. Berrange <berrange at redhat.com> - 1.0.7-2
- Change use of 'define' to 'global'

* Mon Dec  7 2009 Daniel P. Berrange <berrange at redhat.com> - 1.0.7-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yajl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:50:17 -0000	1.1
+++ .cvsignore	9 Dec 2009 23:05:44 -0000	1.2
@@ -0,0 +1,5 @@
+.build*.log
+*.rpm
+i386
+x86_64
+lloyd-yajl-45a1bdb.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yajl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:50:17 -0000	1.1
+++ sources	9 Dec 2009 23:05:44 -0000	1.2
@@ -0,0 +1 @@
+3b6551d07d493817f87624fa73dc7d5e  lloyd-yajl-45a1bdb.tar.gz



From jamatos at fedoraproject.org  Wed Dec  9 23:08:29 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Wed,  9 Dec 2009 23:08:29 +0000 (UTC)
Subject: rpms/lyx/devel lyx-1.6.5-enchant.patch, NONE,
	1.1 lyx-1.6.5-xdg_open.patch, NONE, 1.1 .cvsignore, 1.40,
	1.41 lyx.spec, 1.102, 1.103 sources, 1.38,
	1.39 lyx-1.6.4-autoconf_2.64.patch, 1.1,
	NONE lyx-1.6.4-enchant.patch, 1.1, NONE lyx-1.6.4-xdg_open.patch,
	1.1, NONE
Message-ID: <20091209230829.87B5E11C00E0@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6707

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.5-enchant.patch lyx-1.6.5-xdg_open.patch 
Removed Files:
	lyx-1.6.4-autoconf_2.64.patch lyx-1.6.4-enchant.patch 
	lyx-1.6.4-xdg_open.patch 
Log Message:
* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-1
- lyx-1.6.5


lyx-1.6.5-enchant.patch:
 config.h.in                           |    3 
 config/spell.m4                       |   33 ++++++++-
 src/Enchant.cpp                       |  122 ++++++++++++++++++++++++++++++++++
 src/Enchant.h                         |   78 +++++++++++++++++++++
 src/Makefile.am                       |    9 +-
 src/frontends/qt4/GuiPrefs.cpp        |    6 +
 src/frontends/qt4/GuiSpellchecker.cpp |    9 +-
 src/frontends/qt4/GuiView.cpp         |    2 
 8 files changed, 251 insertions(+), 11 deletions(-)

--- NEW FILE lyx-1.6.5-enchant.patch ---
diff -ru --new-file lyx-1.6.5.orig/config/spell.m4 lyx-1.6.5/config/spell.m4
--- lyx-1.6.5.orig/config/spell.m4	2007-04-26 22:50:16.000000000 +0100
+++ lyx-1.6.5/config/spell.m4	2009-12-09 20:40:11.443642911 +0000
@@ -1,3 +1,23 @@
+# Macro to add for using enchant spellchecker libraries!     -*- sh -*-
+AC_DEFUN([CHECK_WITH_ENCHANT],
+[
+    lyx_use_enchant=true
+    AC_ARG_WITH(enchant,	AC_HELP_STRING([--with-enchant],[use Enchant libraries]))
+    test "$with_enchant" = "no" && lyx_use_enchant=false
+
+    if $lyx_use_enchant; then
+        PKG_CHECK_MODULES([ENCHANT], [enchant], [], [lyx_use_aspell=false])
+	AC_MSG_CHECKING([whether to use enchant])
+	if $lyx_use_enchant ; then
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(USE_ENCHANT, 1, [Define as 1 to use the enchant library])
+	    lyx_flags="$lyx_flags use-enchant"
+	else
+	    AC_MSG_RESULT(no)
+	fi
+    fi
+    ])
+
 # Macro to add for using aspell spellchecker libraries!     -*- sh -*-
 # Only checks for "new" aspell, > 0.50
 AC_DEFUN([CHECK_WITH_ASPELL],
@@ -50,14 +70,18 @@
 ### Check if we want spell libraries, prefer new aspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
+    lyx_use_enchant=false
     lyx_use_aspell=false
     lyx_use_pspell=false
     lyx_use_ispell=false
 
-    dnl Prefer use of the aspell library over pspell.
-    CHECK_WITH_ASPELL
-    if $lyx_use_aspell ; then : ; else
-        CHECK_WITH_PSPELL
+    dnl Prefer in order of enchant, aspell, pspell
+    CHECK_WITH_ENCHANT
+    if $lyx_use_enchant ; then : ; else
+        CHECK_WITH_ASPELL
+        if $lyx_use_aspell ; then : ; else
+            CHECK_WITH_PSPELL
+        fi
     fi
 
     dnl check for the ability to communicate through unix pipes
@@ -76,6 +100,7 @@
       AC_MSG_RESULT(no)
     fi
 
+    AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
     AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
     AM_CONDITIONAL(USE_PSPELL, $lyx_use_pspell)
     AM_CONDITIONAL(USE_ISPELL, $lyx_use_ispell)
diff -ru --new-file lyx-1.6.5.orig/config.h.in lyx-1.6.5/config.h.in
--- lyx-1.6.5.orig/config.h.in	2009-12-05 13:42:56.000000000 +0000
+++ lyx-1.6.5/config.h.in	2009-12-09 20:40:11.443642911 +0000
@@ -503,6 +503,9 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
+/* Define as 1 to use the enchant library */
+#undef USE_ENCHANT
+
 /* Define as 1 to use the aspell library */
 #undef USE_ASPELL
 
diff -ru --new-file lyx-1.6.5.orig/src/Enchant.cpp lyx-1.6.5/src/Enchant.cpp
--- lyx-1.6.5.orig/src/Enchant.cpp	1970-01-01 01:00:00.000000000 +0100
+++ lyx-1.6.5/src/Enchant.cpp	2009-12-09 20:40:11.472766701 +0000
@@ -0,0 +1,122 @@
+/**
+ * \file Enchant.cpp
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Caol?n McNamara
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
+#include "support/debug.h"
+
+#include <enchant++.h>
+
+#include "Enchant.h"
+#include "LyXRC.h"
+#include "WordLangTuple.h"
+
+#include "support/lassert.h"
+
+using namespace std;
+
+namespace lyx {
+
+Enchant::Enchant(BufferParams const &, string const & lang)
+{
+	addSpeller(lang);
+}
+
+
+Enchant::~Enchant()
+{
+	Spellers::iterator it = spellers_.begin();
+	Spellers::iterator end = spellers_.end();
+
+	for (; it != end; ++it) {
+		delete it->second.speller;
+	}
+}
+
+
+void Enchant::addSpeller(string const & lang)
+{
+	enchant::Broker * instance = enchant::Broker::instance();
+	enchant::Dict * dict = instance->request_dict(lang);
+
+	if (dict) {
+		Speller m;
+		m.speller = dict;
+		spellers_[lang] = m;
+	}
+}
+
+
+Enchant::Result Enchant::check(WordLangTuple const & word)
+{
+	Result res = UNKNOWN_WORD;
+
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it == spellers_.end()) {
+		addSpeller(word.lang_code());
+		it = spellers_.find(word.lang_code());
+		// FIXME
+		if (it == spellers_.end())
+			return res;
+	}
+
+	enchant::Dict * m = it->second.speller;
+
+	std::string utf8word(to_utf8(word.word()));
+
+	if (m->check(utf8word))
+		return OK;
+
+	m->suggest(utf8word, els);
+	if (els.empty())
+		res = UNKNOWN_WORD;
+	else
+		res = SUGGESTED_WORDS;
+
+	return res;
+}
+
+
+void Enchant::insert(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it != spellers_.end())
+		it->second.speller->add(to_utf8(word.word()));
+}
+
+
+void Enchant::accept(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it != spellers_.end())
+		it->second.speller->add_to_session(to_utf8(word.word()));
+}
+
+
+docstring const Enchant::nextMiss()
+{
+	docstring str;
+
+	if (!els.empty()) {
+		str = from_utf8(els.front());
+		els.erase(els.begin());
+	}
+
+	return str;
+}
+
+
+docstring const Enchant::error()
+{
+	return docstring();
+}
+
+
+} // namespace lyx
diff -ru --new-file lyx-1.6.5.orig/src/Enchant.h lyx-1.6.5/src/Enchant.h
--- lyx-1.6.5.orig/src/Enchant.h	1970-01-01 01:00:00.000000000 +0100
+++ lyx-1.6.5/src/Enchant.h	2009-12-09 20:40:11.472766701 +0000
@@ -0,0 +1,78 @@
+// -*- C++ -*-
+/**
+ * \file Enchant.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Caol?n McNamara
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef LYX_ENCHANT_H
+#define LYX_ENCHANT_H
+
+#include "SpellBase.h"
+
+#include <map>
+#include <string>
+
+namespace enchant {
+    class Dict;
+}
+
+namespace lyx {
+
+class BufferParams;
+
+
+class Enchant : public SpellBase {
+public:
+	/**
+	 * Initialise the spellchecker with the given buffer params and language.
+	 */
+	Enchant(BufferParams const & params, std::string const & lang);
+
+	virtual ~Enchant();
+
+	/**
+	 * return true if the spellchecker instance still exists
+	 * Always true for enchant, since there is no separate process
+	 */
+	virtual bool alive() { return true; }
+
+	/// check the given word and return the result
+	virtual enum Result check(WordLangTuple const &);
+
+	/// insert the given word into the personal dictionary
+	virtual void insert(WordLangTuple const &);
+
+	/// accept the given word temporarily
+	virtual void accept(WordLangTuple const &);
+
+	/// return the next near miss after a SUGGESTED_WORDS result
+	virtual docstring const nextMiss();
+
+	/// give an error message on messy exit
+	virtual docstring const error();
+
+private:
+	/// add a speller of the given language
+	void addSpeller(std::string const & lang);
+
+	struct Speller {
+		enchant::Dict* speller;
+	};
+
+	typedef std::map<std::string, Speller> Spellers;
+
+	/// the spellers
+	Spellers spellers_;
+
+        std::vector<std::string> els;
+};
+
+
+} // namespace lyx
+
+#endif // LYX_ENCHANT_H
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiPrefs.cpp lyx-1.6.5/src/frontends/qt4/GuiPrefs.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiPrefs.cpp	2009-10-24 18:10:48.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiPrefs.cpp	2009-12-09 20:40:11.467788824 +0000
@@ -1148,6 +1148,9 @@
 	spellCommandCO->addItem(qt_("ispell"));
 	spellCommandCO->addItem(qt_("aspell"));
 	spellCommandCO->addItem(qt_("hspell"));
+#ifdef USE_ENCHANT
+	spellCommandCO->addItem(qt_("enchant (library)"));
+#else
 #ifdef USE_PSPELL
 	spellCommandCO->addItem(qt_("pspell (library)"));
 #else
@@ -1155,6 +1158,7 @@
 	spellCommandCO->addItem(qt_("aspell (library)"));
 #endif
 #endif
+#endif
 }
 
 
@@ -1199,7 +1203,7 @@
 	}
 
 	if (rc.use_spell_lib) {
-#if defined(USE_ASPELL) || defined(USE_PSPELL)
+#if defined(USE_ENCHANT) || defined(USE_ASPELL) || defined(USE_PSPELL)
 		spellCommandCO->setCurrentIndex(3);
 #endif
 	}
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiSpellchecker.cpp lyx-1.6.5/src/frontends/qt4/GuiSpellchecker.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiSpellchecker.cpp	2009-07-08 12:03:41.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiSpellchecker.cpp	2009-12-09 20:40:11.469773116 +0000
@@ -32,7 +32,9 @@
 
 #include <QListWidgetItem>
 
-#if defined(USE_ASPELL)
+#if defined(USE_ENCHANT)
+# include "Enchant.h"
+#elif defined(USE_ASPELL)
 # include "ASpell_local.h"
 #elif defined(USE_PSPELL)
 # include "PSpell.h"
@@ -205,7 +207,10 @@
 		      ? lyxrc.isp_alt_lang
 		      : bp.language->code();
 
-#if defined(USE_ASPELL)
+#if defined(USE_ENCHANT)
+	if (lyxrc.use_spell_lib)
+		return new Enchant(bp, lang);
+#elif defined(USE_ASPELL)
 	if (lyxrc.use_spell_lib)
 		return new ASpell(bp, lang);
 #elif defined(USE_PSPELL)
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiView.cpp lyx-1.6.5/src/frontends/qt4/GuiView.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiView.cpp	2009-08-31 08:37:56.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiView.cpp	2009-12-09 20:40:11.470768301 +0000
@@ -1232,7 +1232,7 @@
 		else if (name == "latexlog")
 			enable = FileName(buf->logName()).isReadableFile();
 		else if (name == "spellchecker")
-#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
+#if defined (USE_ENCHANT) || defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
 			enable = !buf->isReadonly();
 #else
 			enable = false;
diff -ru --new-file lyx-1.6.5.orig/src/Makefile.am lyx-1.6.5/src/Makefile.am
--- lyx-1.6.5.orig/src/Makefile.am	2009-09-13 21:49:30.000000000 +0100
+++ lyx-1.6.5/src/Makefile.am	2009-12-09 20:42:57.038771937 +0000
@@ -4,7 +4,7 @@
 
 DISTCLEANFILES += config.h libintl.h
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -20,7 +20,7 @@
 	paper.h \
 	pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBPSAPI)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBPSAPI)
 
 noinst_LTLIBRARIES = liblyxcore.la
 bin_PROGRAMS = lyx
@@ -46,6 +46,9 @@
 
 BUILT_SOURCES = $(PCH_FILE)
 
+if USE_ENCHANT
+ENCHANT = Enchant.cpp Enchant.h
+endif
 if USE_ASPELL
 ASPELL = ASpell.cpp ASpell_local.h
 endif
@@ -62,7 +65,7 @@
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
 	main.cpp \
-	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+	$(ENCHANT) $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
 	BiblioInfo.h \
 	BiblioInfo.cpp \
 	Box.cpp \

lyx-1.6.5-xdg_open.patch:
 configure.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lyx-1.6.5-xdg_open.patch ---
diff -up lyx-1.6.4/lib/configure.py.xdg_open lyx-1.6.4/lib/configure.py
--- lyx-1.6.4/lib/configure.py.xdg_open	2009-08-13 07:16:07.000000000 -0500
+++ lyx-1.6.4/lib/configure.py	2009-08-22 08:56:01.332263836 -0500
@@ -264,7 +264,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -307,23 +307,23 @@ def checkFormatEntries(dtl_tools):  
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'okular', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'okular', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 		    'gv', 'ghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	22 Aug 2009 18:07:28 -0000	1.40
+++ .cvsignore	9 Dec 2009 23:08:28 -0000	1.41
@@ -1 +1,2 @@
 lyx-1.6.4.tar.bz2
+lyx-1.6.5.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- lyx.spec	19 Nov 2009 21:12:42 -0000	1.102
+++ lyx.spec	9 Dec 2009 23:08:29 -0000	1.103
@@ -23,8 +23,8 @@ BuildRequires: fontpackages-devel
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.4
-Release: 3%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -33,11 +33,10 @@ Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.6.4-xdg_open.patch
-Patch2: lyx-1.6.4-autoconf_2.64.patch
+Patch1: lyx-1.6.5-xdg_open.patch
 ## upstreamed patches
 # http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
-Patch50: lyx-1.6.4-enchant.patch
+Patch50: lyx-1.6.5-enchant.patch
 
 Source1: lyxrc.dist
 
@@ -246,7 +245,6 @@ Requires: %{fontname}-fonts-common = %{v
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
-%patch2 -p1 -b .autoconf_2.64
 
 %patch50 -p1 -b .enchant
 
@@ -448,6 +446,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-1
+- lyx-1.6.5
+
 * Thu Nov 19 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.4-3
 - LyX supports autoconf 2.64 (should be upstream for 1.6.5)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	22 Aug 2009 18:07:28 -0000	1.38
+++ sources	9 Dec 2009 23:08:29 -0000	1.39
@@ -1 +1,2 @@
 3dd759f91acd7765c304336c51aa3a2a  lyx-1.6.4.tar.bz2
+35a10d8cb8e4bdd296092d9d981330c9  lyx-1.6.5.tar.bz2


--- lyx-1.6.4-autoconf_2.64.patch DELETED ---


--- lyx-1.6.4-enchant.patch DELETED ---


--- lyx-1.6.4-xdg_open.patch DELETED ---



From rdieter at fedoraproject.org  Wed Dec  9 23:09:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  9 Dec 2009 23:09:51 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.324,1.325
Message-ID: <20091209230951.DACEF11C00E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7253

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
- BR: polkit-qt-devel (f13)
- Obsoletes: polkit-qt (f12 only)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- kdebase-workspace.spec	9 Dec 2009 22:06:32 -0000	1.324
+++ kdebase-workspace.spec	9 Dec 2009 23:09:51 -0000	1.325
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -55,11 +55,11 @@ Requires: PolicyKit-authentication-agent
 
 %if ! 0%{?with_polkit_09}
 Obsoletes: PolicyKit-kde < %{version}-%{release}
-# if/when we actually create this one:
-#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
+%if 0%{?fedora} == 12
 Obsoletes: polkit-qt < 0.10
 Obsoletes: polkit-qt-examples < 0.10
 %endif
+%endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -94,9 +94,7 @@ BuildRequires: lm_sensors-devel
 %endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
-%if 0%{?with_polkit_09}
 BuildRequires: polkit-qt-devel
-%endif
 BuildRequires: qimageblitz-devel
 BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel
@@ -618,6 +616,10 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
+- BR: polkit-qt-devel (f13)
+- Obsoletes: polkit-qt (f12 only)
+
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
 - BR: shared-desktop-ontologies-devel
 



From kkofler at fedoraproject.org  Wed Dec  9 23:13:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  9 Dec 2009 23:13:41 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.325,1.326
Message-ID: <20091209231341.8E4D011C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8468/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
Revert incorrect changes, polkit-kde for PK1 is not in kdebase-workspace 4.4 (it's a separate package under review).


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- kdebase-workspace.spec	9 Dec 2009 23:09:51 -0000	1.325
+++ kdebase-workspace.spec	9 Dec 2009 23:13:41 -0000	1.326
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.80
-Release: 3%{?dist}
+Release: 2%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -55,11 +55,11 @@ Requires: PolicyKit-authentication-agent
 
 %if ! 0%{?with_polkit_09}
 Obsoletes: PolicyKit-kde < %{version}-%{release}
-%if 0%{?fedora} == 12
+# if/when we actually create this one:
+#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
 Obsoletes: polkit-qt < 0.10
 Obsoletes: polkit-qt-examples < 0.10
 %endif
-%endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -94,7 +94,9 @@ BuildRequires: lm_sensors-devel
 %endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
+%if 0%{?with_polkit_09}
 BuildRequires: polkit-qt-devel
+%endif
 BuildRequires: qimageblitz-devel
 BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel
@@ -616,10 +618,6 @@ fi
 
 
 %changelog
-* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
-- BR: polkit-qt-devel (f13)
-- Obsoletes: polkit-qt (f12 only)
-
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
 - BR: shared-desktop-ontologies-devel
 



From kkofler at fedoraproject.org  Wed Dec  9 23:24:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  9 Dec 2009 23:24:44 +0000 (UTC)
Subject: rpms/polkit-qt/devel polkit-qt.spec,1.3,1.4
Message-ID: <20091209232444.35FD811C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/polkit-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11997/devel

Modified Files:
	polkit-qt.spec 
Log Message:
* Wed Dev 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  - 0.95-0.2.20091119svn
- Obsoletes: polkit-qt-examples < 0.10 for upgrade path


Index: polkit-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-qt/devel/polkit-qt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- polkit-qt.spec	23 Nov 2009 12:20:05 -0000	1.3
+++ polkit-qt.spec	9 Dec 2009 23:24:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:            polkit-qt
 Version:         0.95
-Release:         0.1.20091119svn%{?dist}
+Release:         0.2.20091119svn%{?dist}
 Summary:         Qt bindings for PolicyKit
 
 Group:           System Environment/Libraries
@@ -19,6 +19,8 @@ BuildRequires:   polkit-devel >= 0.95
 BuildRequires:   qt4-devel
 BuildRequires:   doxygen
 
+Obsoletes:       polkit-qt-examples < 0.10
+
 %description
 Polkit-qt is a library that lets developers use the PolicyKit API
 through a nice Qt-styled API.
@@ -93,6 +95,9 @@ rm -rf %{buildroot}
 %doc html/*
 
 %changelog
+* Wed Dev 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  - 0.95-0.2.20091119svn
+- Obsoletes: polkit-qt-examples < 0.10 for upgrade path
+
 * Mon Nov 23 2009 Radek Novacek <rnovacek at redhat.com> - 0.95-0.1.20091119svn
 - Added -doc subpackage
 - Added command to obtaining the source code



From kkofler at fedoraproject.org  Wed Dec  9 23:25:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  9 Dec 2009 23:25:31 +0000 (UTC)
Subject: rpms/polkit-qt/devel polkit-qt.spec,1.4,1.5
Message-ID: <20091209232531.4123211C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/polkit-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12357/devel

Modified Files:
	polkit-qt.spec 
Log Message:
Fix changelog typo.


Index: polkit-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-qt/devel/polkit-qt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- polkit-qt.spec	9 Dec 2009 23:24:42 -0000	1.4
+++ polkit-qt.spec	9 Dec 2009 23:25:30 -0000	1.5
@@ -95,7 +95,7 @@ rm -rf %{buildroot}
 %doc html/*
 
 %changelog
-* Wed Dev 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  - 0.95-0.2.20091119svn
+* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  - 0.95-0.2.20091119svn
 - Obsoletes: polkit-qt-examples < 0.10 for upgrade path
 
 * Mon Nov 23 2009 Radek Novacek <rnovacek at redhat.com> - 0.95-0.1.20091119svn



From kkofler at fedoraproject.org  Wed Dec  9 23:31:51 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  9 Dec 2009 23:31:51 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.326,1.327
Message-ID: <20091209233151.69A0911C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14513/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
- drop polkit-qt* Obsoletes, we have a new polkit-qt now


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- kdebase-workspace.spec	9 Dec 2009 23:13:41 -0000	1.326
+++ kdebase-workspace.spec	9 Dec 2009 23:31:51 -0000	1.327
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -57,8 +57,6 @@ Requires: PolicyKit-authentication-agent
 Obsoletes: PolicyKit-kde < %{version}-%{release}
 # if/when we actually create this one:
 #Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
-Obsoletes: polkit-qt < 0.10
-Obsoletes: polkit-qt-examples < 0.10
 %endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
@@ -161,9 +159,6 @@ This package contains:
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Obsoletes: PolicyKit-kde-devel < 4.3.0
-%if ! 0%{?with_polkit_09}
-Obsoletes: polkit-qt-devel < 0.10
-%endif
 Provides: solid-bluetooth-devel = 4.3-0.1
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -618,10 +613,13 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
+- drop polkit-qt* Obsoletes, we have a new polkit-qt now
+
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
 - BR: shared-desktop-ontologies-devel
 
-* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+* Tue Dec 01 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 - kdm_plymouth patch (#475890)
 



From jamatos at fedoraproject.org  Wed Dec  9 23:45:02 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Wed,  9 Dec 2009 23:45:02 +0000 (UTC)
Subject: rpms/lyx/devel lyx-1.6.5-autoconf_2.65.patch, NONE, 1.1 lyx.spec,
	1.103, 1.104
Message-ID: <20091209234502.C64AB11C00E0@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18822

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.6.5-autoconf_2.65.patch 
Log Message:
* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-2
- Add patch for autoconf 2.65 (F13+)


lyx-1.6.5-autoconf_2.65.patch:
 autogen.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lyx-1.6.5-autoconf_2.65.patch ---
diff -ur lyx-1.6.5.orig/autogen.sh lyx-1.6.5/autogen.sh
--- lyx-1.6.5.orig/autogen.sh	2009-11-27 13:43:40.000000000 +0000
+++ lyx-1.6.5/autogen.sh	2009-12-09 23:33:36.133301389 +0000
@@ -38,11 +38,11 @@
 
 
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-4])
+    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-5])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.64."
+	echo "LyX only supports autoconf 2.59c-2.65."
 	exit 1
 	;;
 esac


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- lyx.spec	9 Dec 2009 23:08:29 -0000	1.103
+++ lyx.spec	9 Dec 2009 23:45:01 -0000	1.104
@@ -24,7 +24,7 @@ BuildRequires: fontpackages-devel
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -34,6 +34,9 @@ Source0: ftp://ftp.devel.lyx.org/pub/lyx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: lyx-1.6.5-xdg_open.patch
+# This patch should be upstream for lyx-1.6.6
+# (we only need this because of patch #50)
+Patch2: lyx-1.6.5-autoconf_2.65.patch
 ## upstreamed patches
 # http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
 Patch50: lyx-1.6.5-enchant.patch
@@ -245,6 +248,7 @@ Requires: %{fontname}-fonts-common = %{v
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
+%patch2 -p1 -b .autoconf_2.65
 
 %patch50 -p1 -b .enchant
 
@@ -446,6 +450,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-2
+- Add patch for autoconf 2.65 (F13+)
+
 * Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-1
 - lyx-1.6.5
 



From petersen at fedoraproject.org  Wed Dec  9 23:45:39 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed,  9 Dec 2009 23:45:39 +0000 (UTC)
Subject: rpms/xmonad/F-12 xmonad.spec,1.8,1.9
Message-ID: <20091209234539.D617811C00E0@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/xmonad/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19121

Modified Files:
	xmonad.spec 
Log Message:
drop the ppc build cabal workaround


Index: xmonad.spec
===================================================================
RCS file: /cvs/extras/rpms/xmonad/F-12/xmonad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xmonad.spec	8 Dec 2009 00:35:23 -0000	1.8
+++ xmonad.spec	9 Dec 2009 23:45:39 -0000	1.9
@@ -8,7 +8,7 @@
 
 Name:           xmonad
 Version:        0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -95,12 +95,6 @@ This package contains profiling librarie
 %patch0 -p1 -b .orig
 
 %build
-%ifarch ppc
-# hack around mysterious runghc fail
-%global cabal ./cabal
-ghc --make Setup -o cabal
-%endif
-
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
@@ -178,6 +172,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Jens Petersen <petersen at redhat.com> - 0.9-4
+- drop the ppc build cabal workaround
+
 * Tue Nov 17 2009 Jens Petersen <petersen at redhat.com> - 0.9-3
 - use %%ghc_pkg_ver for requires
 



From kkofler at fedoraproject.org  Wed Dec  9 23:51:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  9 Dec 2009 23:51:58 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.407,1.408
Message-ID: <20091209235158.3460511C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21411/devel

Modified Files:
	kdebase.spec 
Log Message:
* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
- rebuild against Nepomuk-enabled kdelibs


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -p -r1.407 -r1.408
--- kdebase.spec	9 Dec 2009 22:07:27 -0000	1.407
+++ kdebase.spec	9 Dec 2009 23:51:57 -0000	1.408
@@ -2,7 +2,7 @@ Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Epoch: 6
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -229,10 +229,13 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
+- rebuild against Nepomuk-enabled kdelibs
+
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
 - BR: shared-desktop-ontologies-devel
 
-* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+* Tue Dec 01 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 
 * Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.2.svn1048496



From kkofler at fedoraproject.org  Wed Dec  9 23:53:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  9 Dec 2009 23:53:54 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.169,1.170
Message-ID: <20091209235354.1ED7611C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22104/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
readd the Nepomuk stuff to the file list


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- kdebase-runtime.spec	9 Dec 2009 22:20:24 -0000	1.169
+++ kdebase-runtime.spec	9 Dec 2009 23:53:53 -0000	1.170
@@ -179,8 +179,7 @@ fi
 # FIXME(?), currently contains cmake/modules -- Rex
 %{_kde4_appsdir}/*
 %{_kde4_configdir}/*.knsrc
-# FIXME: Missing stuff from kdelibs -- lvillani
-# %{_kde4_datadir}/autostart/nepomukserver.desktop
+%{_kde4_datadir}/autostart/nepomukserver.desktop
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
@@ -194,8 +193,7 @@ fi
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libexecdir}/*
-# FIXME: Missing stuff from kdelibs -- lvillani
-# %{_libdir}/strigi/*
+%{_libdir}/strigi/*
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 %{_kde4_iconsdir}/hicolor/*/*/*



From jamatos at fedoraproject.org  Thu Dec 10 00:08:55 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Thu, 10 Dec 2009 00:08:55 +0000 (UTC)
Subject: rpms/lyx/F-12 lyx-1.6.5-autoconf_2.65.patch, NONE,
	1.1 lyx-1.6.5-enchant.patch, NONE, 1.1 lyx-1.6.5-xdg_open.patch,
	NONE, 1.1 .cvsignore, 1.40, 1.41 lyx.spec, 1.100, 1.101 sources,
	1.38, 1.39 lyx-1.6.4-enchant.patch, 1.1,
	NONE lyx-1.6.4-xdg_open.patch, 1.1, NONE
Message-ID: <20091210000855.6DEBF11C00E0@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/lyx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27455

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.5-autoconf_2.65.patch lyx-1.6.5-enchant.patch 
	lyx-1.6.5-xdg_open.patch 
Removed Files:
	lyx-1.6.4-enchant.patch lyx-1.6.4-xdg_open.patch 
Log Message:
* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-2
- Add patch for autoconf 2.65 (F13+)


lyx-1.6.5-autoconf_2.65.patch:
 autogen.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lyx-1.6.5-autoconf_2.65.patch ---
diff -ur lyx-1.6.5.orig/autogen.sh lyx-1.6.5/autogen.sh
--- lyx-1.6.5.orig/autogen.sh	2009-11-27 13:43:40.000000000 +0000
+++ lyx-1.6.5/autogen.sh	2009-12-09 23:33:36.133301389 +0000
@@ -38,11 +38,11 @@
 
 
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-4])
+    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-5])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.64."
+	echo "LyX only supports autoconf 2.59c-2.65."
 	exit 1
 	;;
 esac

lyx-1.6.5-enchant.patch:
 config.h.in                           |    3 
 config/spell.m4                       |   33 ++++++++-
 src/Enchant.cpp                       |  122 ++++++++++++++++++++++++++++++++++
 src/Enchant.h                         |   78 +++++++++++++++++++++
 src/Makefile.am                       |    9 +-
 src/frontends/qt4/GuiPrefs.cpp        |    6 +
 src/frontends/qt4/GuiSpellchecker.cpp |    9 +-
 src/frontends/qt4/GuiView.cpp         |    2 
 8 files changed, 251 insertions(+), 11 deletions(-)

--- NEW FILE lyx-1.6.5-enchant.patch ---
diff -ru --new-file lyx-1.6.5.orig/config/spell.m4 lyx-1.6.5/config/spell.m4
--- lyx-1.6.5.orig/config/spell.m4	2007-04-26 22:50:16.000000000 +0100
+++ lyx-1.6.5/config/spell.m4	2009-12-09 20:40:11.443642911 +0000
@@ -1,3 +1,23 @@
+# Macro to add for using enchant spellchecker libraries!     -*- sh -*-
+AC_DEFUN([CHECK_WITH_ENCHANT],
+[
+    lyx_use_enchant=true
+    AC_ARG_WITH(enchant,	AC_HELP_STRING([--with-enchant],[use Enchant libraries]))
+    test "$with_enchant" = "no" && lyx_use_enchant=false
+
+    if $lyx_use_enchant; then
+        PKG_CHECK_MODULES([ENCHANT], [enchant], [], [lyx_use_aspell=false])
+	AC_MSG_CHECKING([whether to use enchant])
+	if $lyx_use_enchant ; then
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(USE_ENCHANT, 1, [Define as 1 to use the enchant library])
+	    lyx_flags="$lyx_flags use-enchant"
+	else
+	    AC_MSG_RESULT(no)
+	fi
+    fi
+    ])
+
 # Macro to add for using aspell spellchecker libraries!     -*- sh -*-
 # Only checks for "new" aspell, > 0.50
 AC_DEFUN([CHECK_WITH_ASPELL],
@@ -50,14 +70,18 @@
 ### Check if we want spell libraries, prefer new aspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
+    lyx_use_enchant=false
     lyx_use_aspell=false
     lyx_use_pspell=false
     lyx_use_ispell=false
 
-    dnl Prefer use of the aspell library over pspell.
-    CHECK_WITH_ASPELL
-    if $lyx_use_aspell ; then : ; else
-        CHECK_WITH_PSPELL
+    dnl Prefer in order of enchant, aspell, pspell
+    CHECK_WITH_ENCHANT
+    if $lyx_use_enchant ; then : ; else
+        CHECK_WITH_ASPELL
+        if $lyx_use_aspell ; then : ; else
+            CHECK_WITH_PSPELL
+        fi
     fi
 
     dnl check for the ability to communicate through unix pipes
@@ -76,6 +100,7 @@
       AC_MSG_RESULT(no)
     fi
 
+    AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
     AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
     AM_CONDITIONAL(USE_PSPELL, $lyx_use_pspell)
     AM_CONDITIONAL(USE_ISPELL, $lyx_use_ispell)
diff -ru --new-file lyx-1.6.5.orig/config.h.in lyx-1.6.5/config.h.in
--- lyx-1.6.5.orig/config.h.in	2009-12-05 13:42:56.000000000 +0000
+++ lyx-1.6.5/config.h.in	2009-12-09 20:40:11.443642911 +0000
@@ -503,6 +503,9 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
+/* Define as 1 to use the enchant library */
+#undef USE_ENCHANT
+
 /* Define as 1 to use the aspell library */
 #undef USE_ASPELL
 
diff -ru --new-file lyx-1.6.5.orig/src/Enchant.cpp lyx-1.6.5/src/Enchant.cpp
--- lyx-1.6.5.orig/src/Enchant.cpp	1970-01-01 01:00:00.000000000 +0100
+++ lyx-1.6.5/src/Enchant.cpp	2009-12-09 20:40:11.472766701 +0000
@@ -0,0 +1,122 @@
+/**
+ * \file Enchant.cpp
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Caol?n McNamara
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
+#include "support/debug.h"
+
+#include <enchant++.h>
+
+#include "Enchant.h"
+#include "LyXRC.h"
+#include "WordLangTuple.h"
+
+#include "support/lassert.h"
+
+using namespace std;
+
+namespace lyx {
+
+Enchant::Enchant(BufferParams const &, string const & lang)
+{
+	addSpeller(lang);
+}
+
+
+Enchant::~Enchant()
+{
+	Spellers::iterator it = spellers_.begin();
+	Spellers::iterator end = spellers_.end();
+
+	for (; it != end; ++it) {
+		delete it->second.speller;
+	}
+}
+
+
+void Enchant::addSpeller(string const & lang)
+{
+	enchant::Broker * instance = enchant::Broker::instance();
+	enchant::Dict * dict = instance->request_dict(lang);
+
+	if (dict) {
+		Speller m;
+		m.speller = dict;
+		spellers_[lang] = m;
+	}
+}
+
+
+Enchant::Result Enchant::check(WordLangTuple const & word)
+{
+	Result res = UNKNOWN_WORD;
+
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it == spellers_.end()) {
+		addSpeller(word.lang_code());
+		it = spellers_.find(word.lang_code());
+		// FIXME
+		if (it == spellers_.end())
+			return res;
+	}
+
+	enchant::Dict * m = it->second.speller;
+
+	std::string utf8word(to_utf8(word.word()));
+
+	if (m->check(utf8word))
+		return OK;
+
+	m->suggest(utf8word, els);
+	if (els.empty())
+		res = UNKNOWN_WORD;
+	else
+		res = SUGGESTED_WORDS;
+
+	return res;
+}
+
+
+void Enchant::insert(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it != spellers_.end())
+		it->second.speller->add(to_utf8(word.word()));
+}
+
+
+void Enchant::accept(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it != spellers_.end())
+		it->second.speller->add_to_session(to_utf8(word.word()));
+}
+
+
+docstring const Enchant::nextMiss()
+{
+	docstring str;
+
+	if (!els.empty()) {
+		str = from_utf8(els.front());
+		els.erase(els.begin());
+	}
+
+	return str;
+}
+
+
+docstring const Enchant::error()
+{
+	return docstring();
+}
+
+
+} // namespace lyx
diff -ru --new-file lyx-1.6.5.orig/src/Enchant.h lyx-1.6.5/src/Enchant.h
--- lyx-1.6.5.orig/src/Enchant.h	1970-01-01 01:00:00.000000000 +0100
+++ lyx-1.6.5/src/Enchant.h	2009-12-09 20:40:11.472766701 +0000
@@ -0,0 +1,78 @@
+// -*- C++ -*-
+/**
+ * \file Enchant.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Caol?n McNamara
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef LYX_ENCHANT_H
+#define LYX_ENCHANT_H
+
+#include "SpellBase.h"
+
+#include <map>
+#include <string>
+
+namespace enchant {
+    class Dict;
+}
+
+namespace lyx {
+
+class BufferParams;
+
+
+class Enchant : public SpellBase {
+public:
+	/**
+	 * Initialise the spellchecker with the given buffer params and language.
+	 */
+	Enchant(BufferParams const & params, std::string const & lang);
+
+	virtual ~Enchant();
+
+	/**
+	 * return true if the spellchecker instance still exists
+	 * Always true for enchant, since there is no separate process
+	 */
+	virtual bool alive() { return true; }
+
+	/// check the given word and return the result
+	virtual enum Result check(WordLangTuple const &);
+
+	/// insert the given word into the personal dictionary
+	virtual void insert(WordLangTuple const &);
+
+	/// accept the given word temporarily
+	virtual void accept(WordLangTuple const &);
+
+	/// return the next near miss after a SUGGESTED_WORDS result
+	virtual docstring const nextMiss();
+
+	/// give an error message on messy exit
+	virtual docstring const error();
+
+private:
+	/// add a speller of the given language
+	void addSpeller(std::string const & lang);
+
+	struct Speller {
+		enchant::Dict* speller;
+	};
+
+	typedef std::map<std::string, Speller> Spellers;
+
+	/// the spellers
+	Spellers spellers_;
+
+        std::vector<std::string> els;
+};
+
+
+} // namespace lyx
+
+#endif // LYX_ENCHANT_H
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiPrefs.cpp lyx-1.6.5/src/frontends/qt4/GuiPrefs.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiPrefs.cpp	2009-10-24 18:10:48.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiPrefs.cpp	2009-12-09 20:40:11.467788824 +0000
@@ -1148,6 +1148,9 @@
 	spellCommandCO->addItem(qt_("ispell"));
 	spellCommandCO->addItem(qt_("aspell"));
 	spellCommandCO->addItem(qt_("hspell"));
+#ifdef USE_ENCHANT
+	spellCommandCO->addItem(qt_("enchant (library)"));
+#else
 #ifdef USE_PSPELL
 	spellCommandCO->addItem(qt_("pspell (library)"));
 #else
@@ -1155,6 +1158,7 @@
 	spellCommandCO->addItem(qt_("aspell (library)"));
 #endif
 #endif
+#endif
 }
 
 
@@ -1199,7 +1203,7 @@
 	}
 
 	if (rc.use_spell_lib) {
-#if defined(USE_ASPELL) || defined(USE_PSPELL)
+#if defined(USE_ENCHANT) || defined(USE_ASPELL) || defined(USE_PSPELL)
 		spellCommandCO->setCurrentIndex(3);
 #endif
 	}
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiSpellchecker.cpp lyx-1.6.5/src/frontends/qt4/GuiSpellchecker.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiSpellchecker.cpp	2009-07-08 12:03:41.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiSpellchecker.cpp	2009-12-09 20:40:11.469773116 +0000
@@ -32,7 +32,9 @@
 
 #include <QListWidgetItem>
 
-#if defined(USE_ASPELL)
+#if defined(USE_ENCHANT)
+# include "Enchant.h"
+#elif defined(USE_ASPELL)
 # include "ASpell_local.h"
 #elif defined(USE_PSPELL)
 # include "PSpell.h"
@@ -205,7 +207,10 @@
 		      ? lyxrc.isp_alt_lang
 		      : bp.language->code();
 
-#if defined(USE_ASPELL)
+#if defined(USE_ENCHANT)
+	if (lyxrc.use_spell_lib)
+		return new Enchant(bp, lang);
+#elif defined(USE_ASPELL)
 	if (lyxrc.use_spell_lib)
 		return new ASpell(bp, lang);
 #elif defined(USE_PSPELL)
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiView.cpp lyx-1.6.5/src/frontends/qt4/GuiView.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiView.cpp	2009-08-31 08:37:56.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiView.cpp	2009-12-09 20:40:11.470768301 +0000
@@ -1232,7 +1232,7 @@
 		else if (name == "latexlog")
 			enable = FileName(buf->logName()).isReadableFile();
 		else if (name == "spellchecker")
-#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
+#if defined (USE_ENCHANT) || defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
 			enable = !buf->isReadonly();
 #else
 			enable = false;
diff -ru --new-file lyx-1.6.5.orig/src/Makefile.am lyx-1.6.5/src/Makefile.am
--- lyx-1.6.5.orig/src/Makefile.am	2009-09-13 21:49:30.000000000 +0100
+++ lyx-1.6.5/src/Makefile.am	2009-12-09 20:42:57.038771937 +0000
@@ -4,7 +4,7 @@
 
 DISTCLEANFILES += config.h libintl.h
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -20,7 +20,7 @@
 	paper.h \
 	pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBPSAPI)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBPSAPI)
 
 noinst_LTLIBRARIES = liblyxcore.la
 bin_PROGRAMS = lyx
@@ -46,6 +46,9 @@
 
 BUILT_SOURCES = $(PCH_FILE)
 
+if USE_ENCHANT
+ENCHANT = Enchant.cpp Enchant.h
+endif
 if USE_ASPELL
 ASPELL = ASpell.cpp ASpell_local.h
 endif
@@ -62,7 +65,7 @@
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
 	main.cpp \
-	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+	$(ENCHANT) $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
 	BiblioInfo.h \
 	BiblioInfo.cpp \
 	Box.cpp \

lyx-1.6.5-xdg_open.patch:
 configure.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lyx-1.6.5-xdg_open.patch ---
diff -up lyx-1.6.4/lib/configure.py.xdg_open lyx-1.6.4/lib/configure.py
--- lyx-1.6.4/lib/configure.py.xdg_open	2009-08-13 07:16:07.000000000 -0500
+++ lyx-1.6.4/lib/configure.py	2009-08-22 08:56:01.332263836 -0500
@@ -264,7 +264,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -307,23 +307,23 @@ def checkFormatEntries(dtl_tools):  
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'okular', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'okular', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 		    'gv', 'ghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	22 Aug 2009 18:07:28 -0000	1.40
+++ .cvsignore	10 Dec 2009 00:08:54 -0000	1.41
@@ -1 +1,2 @@
 lyx-1.6.4.tar.bz2
+lyx-1.6.5.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-12/lyx.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- lyx.spec	17 Sep 2009 18:14:26 -0000	1.100
+++ lyx.spec	10 Dec 2009 00:08:55 -0000	1.101
@@ -11,7 +11,7 @@
 %global fontname lyx
 %global common_desc \
 A collection of Math symbol fonts.
-#if 0%{?fedora} > 8 
+#if 0%{?fedora} > 8
 %if 0
 %define fontpackages 1
 BuildRequires: fontpackages-devel
@@ -23,7 +23,7 @@ BuildRequires: fontpackages-devel
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.4
+Version: 1.6.5
 Release: 2%{?dist}
 
 License: GPLv2+
@@ -33,11 +33,13 @@ Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.6.4-xdg_open.patch
-
+Patch1: lyx-1.6.5-xdg_open.patch
+# This patch should be upstream for lyx-1.6.6
+# (we only need this because of patch #50)
+Patch2: lyx-1.6.5-autoconf_2.65.patch
 ## upstreamed patches
 # http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
-Patch50: lyx-1.6.4-enchant.patch
+Patch50: lyx-1.6.5-enchant.patch
 
 Source1: lyxrc.dist
 
@@ -60,9 +62,9 @@ BuildRequires: zlib-devel
 # optional minimal qt4 dep
 %{?_qt_version:Requires: qt4 >= %{_qt4_version}}
 
-Obsoletes: %{name}-qt < 1.5.0 
+Obsoletes: %{name}-qt < 1.5.0
 Provides:  %{name}-qt = %{version}-%{release}
-Obsoletes: %{name}-xforms < 1.5.0 
+Obsoletes: %{name}-xforms < 1.5.0
 
 Requires: %{name}-common = %{version}-%{release}
 
@@ -119,11 +121,11 @@ With LyX, the author can concentrate on 
 and let the computer take care of the rest.
 
 %package common
-Summary:  Common files of %{name} 
+Summary:  Common files of %{name}
 Group:    Applications/Publishing
 Requires: %{name} = %{version}-%{release}
 %{?build_noarch}
-%description common 
+%description common
 {summary}.
 
 %package -n %{fontname}-fonts-compat
@@ -157,7 +159,7 @@ Group:   Applications/Publishing
 License: Copyright only and GPL+
 %{?fontpackages:Requires: fontpackages-filesystem}
 %{?build_noarch}
-%description -n %{name}-fonts-common
+%description -n %{fontname}-fonts-common
 This package consists of files used by other %{fontname}-fonts packages.
 
 %package -n %{fontname}-cmex10-fonts
@@ -246,6 +248,8 @@ Requires: %{fontname}-fonts-common = %{v
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
+%patch2 -p1 -b .autoconf_2.65
+
 %patch50 -p1 -b .enchant
 
 # needed by patch50
@@ -312,7 +316,7 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun common
 if [ $1 -eq 0 ] ; then
-  texhash >& /dev/null 
+  texhash >& /dev/null
   update-desktop-database -q &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -341,7 +345,7 @@ fi
 rm -rf %{buildroot}
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc ANNOUNCE COPYING lib/CREDITS NEWS README
 %{_bindir}/*
@@ -446,6 +450,15 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-2
+- Add patch for autoconf 2.65 (F13+)
+
+* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-1
+- lyx-1.6.5
+
+* Thu Nov 19 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.4-3
+- LyX supports autoconf 2.64 (should be upstream for 1.6.5)
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-2
 - use enchant instead of aspell (#524046)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-12/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	22 Aug 2009 18:07:28 -0000	1.38
+++ sources	10 Dec 2009 00:08:55 -0000	1.39
@@ -1 +1,2 @@
 3dd759f91acd7765c304336c51aa3a2a  lyx-1.6.4.tar.bz2
+35a10d8cb8e4bdd296092d9d981330c9  lyx-1.6.5.tar.bz2


--- lyx-1.6.4-enchant.patch DELETED ---


--- lyx-1.6.4-xdg_open.patch DELETED ---



From kkofler at fedoraproject.org  Thu Dec 10 00:16:19 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 10 Dec 2009 00:16:19 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.170,1.171
Message-ID: <20091210001619.BD2F211C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29707/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
Fix file list: add missing attica_kde.so, fix KCMs and kded modules being packaged twice (both in main and -libs).


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- kdebase-runtime.spec	9 Dec 2009 23:53:53 -0000	1.170
+++ kdebase-runtime.spec	10 Dec 2009 00:16:19 -0000	1.171
@@ -189,6 +189,8 @@ fi
 %{_kde4_datadir}/sounds/*
 %{_kde4_iconsdir}/default.kde4
 %{_kde4_libdir}/kconf_update_bin/*
+# unversioned plugin:
+%{_kde4_libdir}/attica_kde.so
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
@@ -214,8 +216,9 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libkwalletbackend.so.*
 %{_kde4_libdir}/libmolletnetwork.so.*
-# FIXME: move some of these to main pkg, e.g. kcm*.so, kded_*.so
 %{_kde4_libdir}/kde4/*.so
+%exclude %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_libdir}/kde4/plugins/styles/
 



From kkofler at fedoraproject.org  Thu Dec 10 00:23:13 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 10 Dec 2009 00:23:13 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.171,1.172
Message-ID: <20091210002313.D40AD11C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31818/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
Actually, put attica_kde.so into -libs so it gets multilibbed.


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- kdebase-runtime.spec	10 Dec 2009 00:16:19 -0000	1.171
+++ kdebase-runtime.spec	10 Dec 2009 00:23:13 -0000	1.172
@@ -189,8 +189,6 @@ fi
 %{_kde4_datadir}/sounds/*
 %{_kde4_iconsdir}/default.kde4
 %{_kde4_libdir}/kconf_update_bin/*
-# unversioned plugin:
-%{_kde4_libdir}/attica_kde.so
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
@@ -214,6 +212,8 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
+# unversioned plugin:
+%{_kde4_libdir}/attica_kde.so
 %{_kde4_libdir}/libkwalletbackend.so.*
 %{_kde4_libdir}/libmolletnetwork.so.*
 %{_kde4_libdir}/kde4/*.so



From berrange at fedoraproject.org  Thu Dec 10 00:24:25 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 10 Dec 2009 00:24:25 +0000 (UTC)
Subject: rpms/yajl/F-12 lloyd-yajl-lib64.patch, NONE, 1.1 yajl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210002425.9188211C00E0@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/yajl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32244

Modified Files:
	.cvsignore sources 
Added Files:
	lloyd-yajl-lib64.patch yajl.spec 
Log Message:
Initial import after review (rhbz #545132)

lloyd-yajl-lib64.patch:
 CMakeLists.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE lloyd-yajl-lib64.patch ---
diff -rup lloyd-yajl-45a1bdb.orig/src/CMakeLists.txt lloyd-yajl-45a1bdb.new/src/CMakeLists.txt
--- lloyd-yajl-45a1bdb.orig/src/CMakeLists.txt	2009-10-29 23:35:39.000000000 +0000
+++ lloyd-yajl-45a1bdb.new/src/CMakeLists.txt	2009-12-07 17:20:20.000000000 +0000
@@ -37,7 +37,7 @@ SET (PUB_HDRS api/yajl_parse.h api/yajl_
 #ADD_DEFINITIONS(-DYAJL_LEXER_DEBUG)
 
 # set up some paths
-SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
+SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/${LIB_INSTALL_DIR})
 SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl)
 
 # set the output path for libraries
@@ -71,8 +71,8 @@ ENDFOREACH (header ${PUB_HDRS})
 INCLUDE_DIRECTORIES(${incDir}/..)
 
 IF(NOT WIN32)
-  INSTALL(TARGETS yajl LIBRARY DESTINATION lib)
-  INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib)
+  INSTALL(TARGETS yajl LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+  INSTALL(TARGETS yajl_s ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
   INSTALL(DIRECTORY api/ DESTINATION include/yajl
           FILES_MATCHING PATTERN "*.h")
 ENDIF()


--- NEW FILE yajl.spec ---
Name: yajl
Version: 1.0.7
Release: 2%{?dist}
Summary: Yet Another JSON Library (YAJL)

Group: Development/Libraries
License: BSD
URL: http://lloyd.github.com/yajl/

#
# NB, upstream does not provide pre-built tar.gz downloads. Instead
# they make you use the 'on the fly' generated tar.gz from GITHub's
# web interface
#
# The Source0 for any version is obtained by a URL
#
#   http://github.com/lloyd/yajl/tarball/1.0.7
#
# Which causes a download of a archive named after
# the GIT hash corresponding to the version tag
#
#   eg lloyd-yajl-45a1bdb.tar.gz
#
# NB even though the tar.gz is generated on the fly by GITHub it
# will always have identical md5sum
#
# So for new versions, update 'githash' to match the hash of the
# GIT tag associated with updated 'Version:' field just above
%global githash 45a1bdb
Source0: lloyd-%{name}-%{githash}.tar.gz
Patch1: lloyd-%{name}-lib64.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake

%package devel
Summary: Libraries, includes, etc to develop with YAJL
Requires: %{name} = %{version}-%{release}

%description
Yet Another JSON Library. YAJL is a small event-driven
(SAX-style) JSON parser written in ANSI C, and a small
validating JSON generator.

%description devel
Yet Another JSON Library. YAJL is a small event-driven
(SAX-style) JSON parser written in ANSI C, and a small
validating JSON generator.

This sub-package provides the libraries and includes
necessary for developing against the YAJL library

%prep
%setup -q -n lloyd-%{name}-%{githash}
# Fix lib vs lib64 problems
%patch1 -p1

%build
# NB, we are not using upstream's 'configure'/'make'
# wrapper, instead we use cmake directly to better
# align with Fedora standards
mkdir build
cd build
%cmake ..
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
cd build
make install DESTDIR=$RPM_BUILD_ROOT

# No static libraries
rm -f $RPM_BUILD_ROOT%{_libdir}/libyajl_s.a


%check
cd test
./run_tests.sh

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README TODO
%{_bindir}/json_reformat
%{_bindir}/json_verify
%{_libdir}/libyajl.so.1
%{_libdir}/libyajl.so.1.0.7

%files devel
%defattr(-,root,root,-)
%doc COPYING
%dir %{_includedir}/yajl
%{_includedir}/yajl/yajl_common.h
%{_includedir}/yajl/yajl_gen.h
%{_includedir}/yajl/yajl_parse.h
%{_libdir}/libyajl.so


%changelog
* Tue Dec  8 2009 Daniel P. Berrange <berrange at redhat.com> - 1.0.7-2
- Change use of 'define' to 'global'

* Mon Dec  7 2009 Daniel P. Berrange <berrange at redhat.com> - 1.0.7-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yajl/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:50:17 -0000	1.1
+++ .cvsignore	10 Dec 2009 00:24:24 -0000	1.2
@@ -0,0 +1,5 @@
+.build*.log
+*.rpm
+i386
+x86_64
+lloyd-yajl-45a1bdb.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yajl/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:50:17 -0000	1.1
+++ sources	10 Dec 2009 00:24:25 -0000	1.2
@@ -0,0 +1 @@
+3b6551d07d493817f87624fa73dc7d5e  lloyd-yajl-45a1bdb.tar.gz



From kkofler at fedoraproject.org  Thu Dec 10 00:25:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 10 Dec 2009 00:25:17 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.172,1.173
Message-ID: <20091210002517.8E6BF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32588/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
Add comment about the questionable decision to put KCMs into the main package (the issue was masked by the fact that they were being accidentally shipped in both the main package and -libs).


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- kdebase-runtime.spec	10 Dec 2009 00:23:13 -0000	1.172
+++ kdebase-runtime.spec	10 Dec 2009 00:25:17 -0000	1.173
@@ -217,6 +217,7 @@ fi
 %{_kde4_libdir}/libkwalletbackend.so.*
 %{_kde4_libdir}/libmolletnetwork.so.*
 %{_kde4_libdir}/kde4/*.so
+# FIXME: Is this a good idea? Won't multilib apps need KCMs, too?
 %exclude %{_kde4_libdir}/kde4/kcm_*.so
 %exclude %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/plugins/phonon_platform/



From mclasen at fedoraproject.org  Thu Dec 10 00:43:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 00:43:57 +0000 (UTC)
Subject: rpms/libatasmart/devel libatasmart-uninitialized-var.patch, NONE,
	1.1 libatasmart.spec, 1.21, 1.22
Message-ID: <20091210004357.3952411C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5778

Modified Files:
	libatasmart.spec 
Added Files:
	libatasmart-uninitialized-var.patch 
Log Message:
Fix an uninitialized variable


libatasmart-uninitialized-var.patch:
 atasmart.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libatasmart-uninitialized-var.patch ---
>From 26f0cc57fcf346753f17e75fb1378f053dcba92c Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Wed, 9 Dec 2009 17:14:36 -0500
Subject: [PATCH] fix return of uninitialized variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 atasmart.c: In function ?init_smart?:
 atasmart.c:2556: warning: ?ret? may be used uninitialized in this function

We apparently don't initialize the ret variable in init_smart() -
unfortunately

 o  this warning is never reported with using -O0 (thanks gcc -
    see http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings though)

 o  we never run into this bug with just skdump(1)

The bug does show up in the udisks (aka DeviceKit-disks) use of
libatasmart and this patch fixes it.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
 atasmart.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/atasmart.c b/atasmart.c
index 3ff0334..cf93819 100644
--- a/atasmart.c
+++ b/atasmart.c
@@ -2564,6 +2564,8 @@ static int init_smart(SkDisk *d) {
         if (!disk_smart_is_available(d))
                 return 0;
 
+        ret = -1;
+
         if (!disk_smart_is_enabled(d)) {
                 if ((ret = disk_smart_enable(d, TRUE)) < 0)
                         goto fail;
@@ -2580,6 +2582,8 @@ static int init_smart(SkDisk *d) {
 
         disk_smart_read_thresholds(d);
 
+        ret = 0;
+
 fail:
         return ret;
 }
-- 
1.6.5.5



Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libatasmart.spec	27 Oct 2009 02:35:03 -0000	1.21
+++ libatasmart.spec	10 Dec 2009 00:43:56 -0000	1.22
@@ -1,6 +1,6 @@
 Name: libatasmart
 Version: 0.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/public/libatasmart-%{version}.tar.gz
@@ -9,8 +9,11 @@ Url: http://git.0pointer.de/?p=libatasma
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libudev-devel
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=25543
+Patch0: libatasmart-uninitialized-var.patch
+
 %description
-A small and lightweight parser library for ATA S.M.A.R.T. hard disk
+A scmall and lightweight parser library for ATA S.M.A.R.T. hard disk
 health monitoring.
 
 %package devel
@@ -28,6 +31,7 @@ Development Files for libatasmart Client
 
 %prep
 %setup -q
+%patch0 -p1 -b .uninitialized-var.patch
 
 %build
 %configure --disable-static
@@ -58,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU* blob-examples/INTEL* blob-examples/TOSHIBA* blob-examples/MCC*
 
 %changelog
+* Wed Dec  9 2009 Matthias Clasen <mclasen at redhat.com> - 0.17-2
+- Fix an unitialized variable that causes problems in udisks
+
 * Tue Oct 27 2009 Lennart Poettering <lpoetter at redhat.com> 0.17-1
 - New upstream release
 - Fixes bug 491552



From mclasen at fedoraproject.org  Thu Dec 10 00:47:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 00:47:09 +0000 (UTC)
Subject: rpms/libatasmart/F-12 libatasmart-uninitialized-var.patch, NONE,
	1.1 libatasmart.spec, 1.21, 1.22
Message-ID: <20091210004709.8382A11C00E0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libatasmart/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6822

Modified Files:
	libatasmart.spec 
Added Files:
	libatasmart-uninitialized-var.patch 
Log Message:
fix an uninitialized variable.


libatasmart-uninitialized-var.patch:
 atasmart.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libatasmart-uninitialized-var.patch ---
>From 26f0cc57fcf346753f17e75fb1378f053dcba92c Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Wed, 9 Dec 2009 17:14:36 -0500
Subject: [PATCH] fix return of uninitialized variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 atasmart.c: In function ?init_smart?:
 atasmart.c:2556: warning: ?ret? may be used uninitialized in this function

We apparently don't initialize the ret variable in init_smart() -
unfortunately

 o  this warning is never reported with using -O0 (thanks gcc -
    see http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings though)

 o  we never run into this bug with just skdump(1)

The bug does show up in the udisks (aka DeviceKit-disks) use of
libatasmart and this patch fixes it.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
 atasmart.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/atasmart.c b/atasmart.c
index 3ff0334..cf93819 100644
--- a/atasmart.c
+++ b/atasmart.c
@@ -2564,6 +2564,8 @@ static int init_smart(SkDisk *d) {
         if (!disk_smart_is_available(d))
                 return 0;
 
+        ret = -1;
+
         if (!disk_smart_is_enabled(d)) {
                 if ((ret = disk_smart_enable(d, TRUE)) < 0)
                         goto fail;
@@ -2580,6 +2582,8 @@ static int init_smart(SkDisk *d) {
 
         disk_smart_read_thresholds(d);
 
+        ret = 0;
+
 fail:
         return ret;
 }
-- 
1.6.5.5



Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/F-12/libatasmart.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libatasmart.spec	27 Oct 2009 02:43:42 -0000	1.21
+++ libatasmart.spec	10 Dec 2009 00:47:09 -0000	1.22
@@ -1,6 +1,6 @@
 Name: libatasmart
 Version: 0.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/public/libatasmart-%{version}.tar.gz
@@ -9,8 +9,11 @@ Url: http://git.0pointer.de/?p=libatasma
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libudev-devel
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=25543
+Patch0: libatasmart-uninitialized-var.patch
+
 %description
-A small and lightweight parser library for ATA S.M.A.R.T. hard disk
+A scmall and lightweight parser library for ATA S.M.A.R.T. hard disk
 health monitoring.
 
 %package devel
@@ -28,6 +31,7 @@ Development Files for libatasmart Client
 
 %prep
 %setup -q
+%patch0 -p1 -b .uninitialized-var.patch
 
 %build
 %configure --disable-static
@@ -58,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU* blob-examples/INTEL* blob-examples/TOSHIBA* blob-examples/MCC*
 
 %changelog
+* Wed Dec  9 2009 Matthias Clasen <mclasen at redhat.com> - 0.17-2
+- Fix an unitialized variable that causes problems in udisks
+
 * Tue Oct 27 2009 Lennart Poettering <lpoetter at redhat.com> 0.17-1
 - New upstream release
 - Fixes bug 491552



From kkofler at fedoraproject.org  Thu Dec 10 00:59:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 10 Dec 2009 00:59:10 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins-4.3.3-kde4380-webkitkde.patch, 
	NONE, 1.1 konq-plugins.spec, 1.37, 1.38
Message-ID: <20091210005910.C93FF11C00E0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10866/devel

Modified Files:
	konq-plugins.spec 
Added Files:
	konq-plugins-4.3.3-kde4380-webkitkde.patch 
Log Message:
* Thu Dec 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-4
- fix build with KDE 4.3.80's version of webkitkde (upstream patch)

konq-plugins-4.3.3-kde4380-webkitkde.patch:
 CMakeLists.txt           |   54 ++++++++++++++++++++++++++---------------------
 config-babelfish.h.cmake |    3 --
 plugin_babelfish.cpp     |    4 +--
 3 files changed, 33 insertions(+), 28 deletions(-)

--- NEW FILE konq-plugins-4.3.3-kde4380-webkitkde.patch ---
Index: babelfish/config-babelfish.h.cmake
===================================================================
--- babelfish/config-babelfish.h.cmake	(revision 1056180)
+++ babelfish/config-babelfish.h.cmake	(revision 1056181)
@@ -1,2 +1 @@
-#cmakedefine HAVE_WEBKITKDE 1
-#cmakedefine HAVE_WEBVIEW 1
+#cmakedefine HAVE_WEBKITPART 1
Index: babelfish/CMakeLists.txt
===================================================================
--- babelfish/CMakeLists.txt	(revision 1056180)
+++ babelfish/CMakeLists.txt	(revision 1056181)
@@ -1,15 +1,7 @@
+project(babelfish)
 
-
-
 include(MacroOptionalDependPackage)
 
-MACRO_OPTIONAL_DEPEND_PACKAGE(KdeWebKit "kdewebkit")
-if(DEPEND_PACKAGE_KdeWebKit)
-        macro_optional_find_package(KdeWebKit QUIET)
-else(DEPEND_PACKAGE_KdeWebKit)
-        set(KDEWEBKIT_FOUND FALSE)
-endif(DEPEND_PACKAGE_KdeWebKit)
-
 MACRO_OPTIONAL_DEPEND_PACKAGE(WebKitPart "webkitpart")
 if(DEPEND_PACKAGE_WebKitPart)
         macro_optional_find_package(WebKitPart QUIET)
@@ -17,20 +9,29 @@
         set(WEBKITPART_FOUND FALSE)
 endif(DEPEND_PACKAGE_WebKitPart)
 
-if( WEBKITPART_FOUND AND KDEWEBKIT_FOUND)
-    set(WEBKITKDE_FOUND true)
-endif( WEBKITPART_FOUND AND KDEWEBKIT_FOUND)
 
+if(${KDE_VERSION} VERSION_LESS 4.3.74) # newer kdelibs versions include webkitkde
+    MACRO_OPTIONAL_DEPEND_PACKAGE(KdeWebKit "kdewebkit")
+    if(DEPEND_PACKAGE_KdeWebKit)
+            macro_optional_find_package(KdeWebKit QUIET)
+    else(DEPEND_PACKAGE_KdeWebKit)
+            set(WEBKITPART_FOUND FALSE)
+    endif(DEPEND_PACKAGE_KdeWebKit)
+endif(${KDE_VERSION} VERSION_LESS 4.3.74)
 
-macro_log_feature(WEBKITKDE_FOUND "WebKitKde" "Webkitkde libraries and header files" "" FALSE "" "Webkitkde is necessary to compile support for WebKitKde.")
 
-macro_bool_to_01(WEBKITKDE_FOUND HAVE_WEBKITKDE)
+macro_log_feature(WEBKITPART_FOUND "WebKitKde" "Webkitkde libraries and header files" "https://svn.kde.org/home/kde/trunk/playground/libs/webkitkde" FALSE "" "Webkitkde is necessary to compile Babelfish support for WebKitKde.")
 
+macro_bool_to_01(WEBKITPART_FOUND HAVE_WEBKITPART)
 
-if( WEBKITKDE_FOUND )
-    include_directories(${KDEWEBKIT_INCLUDE_DIR})
+
+if( WEBKITPART_FOUND )
+    if(${KDE_VERSION} VERSION_LESS 4.3.74)
+        include_directories(kwebkit ${KDEWEBKIT_INCLUDE_DIR})
+    endif(${KDE_VERSION} VERSION_LESS 4.3.74)
+
     include_directories(${WEBKITPART_INCLUDE_DIR})
-endif(WEBKITKDE_FOUND)
+endif(WEBKITPART_FOUND)
 
 
 
@@ -46,11 +47,17 @@
 
 
 target_link_libraries(babelfishplugin  ${KDE4_KHTML_LIBS} )
-if( WEBKITKDE_FOUND)
-    target_link_libraries(babelfishplugin ${WEBKITPART_LIBRARIES} ${KDEWEBKIT_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} )
-endif(WEBKITKDE_FOUND)
+if( WEBKITPART_FOUND)
+    if(${KDE_VERSION} VERSION_LESS 4.3.74)
+        target_link_libraries(babelfishplugin ${KDEWEBKIT_LIBRARIES})
+    else(${KDE_VERSION} VERSION_LESS 4.3.74)
+        target_link_libraries(babelfishplugin ${KDE4_KDEWEBKIT_LIBS})
+    endif(${KDE_VERSION} VERSION_LESS 4.3.74)
 
+    target_link_libraries(babelfishplugin ${WEBKITPART_LIBRARIES} ${QT_QTWEBKIT_LIBRARY})
+endif(WEBKITPART_FOUND)
 
+
 install(TARGETS babelfishplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
@@ -58,8 +65,7 @@
 
 install( FILES plugin_babelfish.rc plugin_babelfish.desktop  DESTINATION  ${DATA_INSTALL_DIR}/khtml/kpartplugins )
 install( FILES translaterc  DESTINATION  ${CONFIG_INSTALL_DIR} )
-if(WEBKITKDE_FOUND)
+if(WEBKITPART_FOUND)
    install( FILES plugin_babelfish.rc plugin_babelfish.desktop  DESTINATION  ${DATA_INSTALL_DIR}/webkitpart/kpartplugins )
-endif(WEBKITKDE_FOUND)
-kde4_install_icons( ${ICON_INSTALL_DIR}   )
-
+endif(WEBKITPART_FOUND)
+kde4_install_icons(${ICON_INSTALL_DIR})
Index: babelfish/plugin_babelfish.cpp
===================================================================
--- babelfish/plugin_babelfish.cpp	(revision 1056180)
+++ babelfish/plugin_babelfish.cpp	(revision 1056181)
@@ -41,7 +41,7 @@
 #include <KConfigGroup>
 #include <KHTMLPart>
 
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
 #include <webkitpart.h>
 #include <QWebView>
 #endif
@@ -246,7 +246,7 @@
   }
   else
   {
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
       WebKitPart *part = dynamic_cast<WebKitPart *>(parent());
       hasSelection = !part->view()->selectedText().isEmpty();
       selection = part->view()->selectedText();


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- konq-plugins.spec	25 Nov 2009 01:39:59 -0000	1.37
+++ konq-plugins.spec	10 Dec 2009 00:59:10 -0000	1.38
@@ -2,13 +2,15 @@
 
 Name:           konq-plugins
 Version:        4.3.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
+# fix build with KDE 4.3.80's version of webkitkde (upstream patch)
+Patch100:       konq-plugins-4.3.3-kde4380-webkitkde.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -48,6 +50,7 @@ Some additional plugins that interact wi
 
 %prep
 %setup -q
+%patch100 -p0 -b .webkitkde
 
 
 %build
@@ -138,6 +141,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-4
+- fix build with KDE 4.3.80's version of webkitkde (upstream patch)
+
 * Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-3
 - rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
 



From jamatos at fedoraproject.org  Thu Dec 10 01:05:25 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Thu, 10 Dec 2009 01:05:25 +0000 (UTC)
Subject: rpms/lyx/F-11 lyx-1.6.5-autoconf_2.65.patch, NONE,
	1.1 lyx-1.6.5-enchant.patch, NONE, 1.1 lyx-1.6.5-xdg_open.patch,
	NONE, 1.1 .cvsignore, 1.40, 1.41 lyx.spec, 1.94, 1.95 sources,
	1.38, 1.39 lyx-1.6.4-xdg_open.patch, 1.1, NONE
Message-ID: <20091210010525.7116B11C00E0@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/lyx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12992

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.5-autoconf_2.65.patch lyx-1.6.5-enchant.patch 
	lyx-1.6.5-xdg_open.patch 
Removed Files:
	lyx-1.6.4-xdg_open.patch 
Log Message:
* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-2
- Add patch for autoconf 2.65 (F13+)


lyx-1.6.5-autoconf_2.65.patch:
 autogen.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lyx-1.6.5-autoconf_2.65.patch ---
diff -ur lyx-1.6.5.orig/autogen.sh lyx-1.6.5/autogen.sh
--- lyx-1.6.5.orig/autogen.sh	2009-11-27 13:43:40.000000000 +0000
+++ lyx-1.6.5/autogen.sh	2009-12-09 23:33:36.133301389 +0000
@@ -38,11 +38,11 @@
 
 
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-4])
+    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-5])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.64."
+	echo "LyX only supports autoconf 2.59c-2.65."
 	exit 1
 	;;
 esac

lyx-1.6.5-enchant.patch:
 config.h.in                           |    3 
 config/spell.m4                       |   33 ++++++++-
 src/Enchant.cpp                       |  122 ++++++++++++++++++++++++++++++++++
 src/Enchant.h                         |   78 +++++++++++++++++++++
 src/Makefile.am                       |    9 +-
 src/frontends/qt4/GuiPrefs.cpp        |    6 +
 src/frontends/qt4/GuiSpellchecker.cpp |    9 +-
 src/frontends/qt4/GuiView.cpp         |    2 
 8 files changed, 251 insertions(+), 11 deletions(-)

--- NEW FILE lyx-1.6.5-enchant.patch ---
diff -ru --new-file lyx-1.6.5.orig/config/spell.m4 lyx-1.6.5/config/spell.m4
--- lyx-1.6.5.orig/config/spell.m4	2007-04-26 22:50:16.000000000 +0100
+++ lyx-1.6.5/config/spell.m4	2009-12-09 20:40:11.443642911 +0000
@@ -1,3 +1,23 @@
+# Macro to add for using enchant spellchecker libraries!     -*- sh -*-
+AC_DEFUN([CHECK_WITH_ENCHANT],
+[
+    lyx_use_enchant=true
+    AC_ARG_WITH(enchant,	AC_HELP_STRING([--with-enchant],[use Enchant libraries]))
+    test "$with_enchant" = "no" && lyx_use_enchant=false
+
+    if $lyx_use_enchant; then
+        PKG_CHECK_MODULES([ENCHANT], [enchant], [], [lyx_use_aspell=false])
+	AC_MSG_CHECKING([whether to use enchant])
+	if $lyx_use_enchant ; then
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(USE_ENCHANT, 1, [Define as 1 to use the enchant library])
+	    lyx_flags="$lyx_flags use-enchant"
+	else
+	    AC_MSG_RESULT(no)
+	fi
+    fi
+    ])
+
 # Macro to add for using aspell spellchecker libraries!     -*- sh -*-
 # Only checks for "new" aspell, > 0.50
 AC_DEFUN([CHECK_WITH_ASPELL],
@@ -50,14 +70,18 @@
 ### Check if we want spell libraries, prefer new aspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
+    lyx_use_enchant=false
     lyx_use_aspell=false
     lyx_use_pspell=false
     lyx_use_ispell=false
 
-    dnl Prefer use of the aspell library over pspell.
-    CHECK_WITH_ASPELL
-    if $lyx_use_aspell ; then : ; else
-        CHECK_WITH_PSPELL
+    dnl Prefer in order of enchant, aspell, pspell
+    CHECK_WITH_ENCHANT
+    if $lyx_use_enchant ; then : ; else
+        CHECK_WITH_ASPELL
+        if $lyx_use_aspell ; then : ; else
+            CHECK_WITH_PSPELL
+        fi
     fi
 
     dnl check for the ability to communicate through unix pipes
@@ -76,6 +100,7 @@
       AC_MSG_RESULT(no)
     fi
 
+    AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
     AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
     AM_CONDITIONAL(USE_PSPELL, $lyx_use_pspell)
     AM_CONDITIONAL(USE_ISPELL, $lyx_use_ispell)
diff -ru --new-file lyx-1.6.5.orig/config.h.in lyx-1.6.5/config.h.in
--- lyx-1.6.5.orig/config.h.in	2009-12-05 13:42:56.000000000 +0000
+++ lyx-1.6.5/config.h.in	2009-12-09 20:40:11.443642911 +0000
@@ -503,6 +503,9 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
+/* Define as 1 to use the enchant library */
+#undef USE_ENCHANT
+
 /* Define as 1 to use the aspell library */
 #undef USE_ASPELL
 
diff -ru --new-file lyx-1.6.5.orig/src/Enchant.cpp lyx-1.6.5/src/Enchant.cpp
--- lyx-1.6.5.orig/src/Enchant.cpp	1970-01-01 01:00:00.000000000 +0100
+++ lyx-1.6.5/src/Enchant.cpp	2009-12-09 20:40:11.472766701 +0000
@@ -0,0 +1,122 @@
+/**
+ * \file Enchant.cpp
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Caol?n McNamara
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
+#include "support/debug.h"
+
+#include <enchant++.h>
+
+#include "Enchant.h"
+#include "LyXRC.h"
+#include "WordLangTuple.h"
+
+#include "support/lassert.h"
+
+using namespace std;
+
+namespace lyx {
+
+Enchant::Enchant(BufferParams const &, string const & lang)
+{
+	addSpeller(lang);
+}
+
+
+Enchant::~Enchant()
+{
+	Spellers::iterator it = spellers_.begin();
+	Spellers::iterator end = spellers_.end();
+
+	for (; it != end; ++it) {
+		delete it->second.speller;
+	}
+}
+
+
+void Enchant::addSpeller(string const & lang)
+{
+	enchant::Broker * instance = enchant::Broker::instance();
+	enchant::Dict * dict = instance->request_dict(lang);
+
+	if (dict) {
+		Speller m;
+		m.speller = dict;
+		spellers_[lang] = m;
+	}
+}
+
+
+Enchant::Result Enchant::check(WordLangTuple const & word)
+{
+	Result res = UNKNOWN_WORD;
+
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it == spellers_.end()) {
+		addSpeller(word.lang_code());
+		it = spellers_.find(word.lang_code());
+		// FIXME
+		if (it == spellers_.end())
+			return res;
+	}
+
+	enchant::Dict * m = it->second.speller;
+
+	std::string utf8word(to_utf8(word.word()));
+
+	if (m->check(utf8word))
+		return OK;
+
+	m->suggest(utf8word, els);
+	if (els.empty())
+		res = UNKNOWN_WORD;
+	else
+		res = SUGGESTED_WORDS;
+
+	return res;
+}
+
+
+void Enchant::insert(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it != spellers_.end())
+		it->second.speller->add(to_utf8(word.word()));
+}
+
+
+void Enchant::accept(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang_code());
+	if (it != spellers_.end())
+		it->second.speller->add_to_session(to_utf8(word.word()));
+}
+
+
+docstring const Enchant::nextMiss()
+{
+	docstring str;
+
+	if (!els.empty()) {
+		str = from_utf8(els.front());
+		els.erase(els.begin());
+	}
+
+	return str;
+}
+
+
+docstring const Enchant::error()
+{
+	return docstring();
+}
+
+
+} // namespace lyx
diff -ru --new-file lyx-1.6.5.orig/src/Enchant.h lyx-1.6.5/src/Enchant.h
--- lyx-1.6.5.orig/src/Enchant.h	1970-01-01 01:00:00.000000000 +0100
+++ lyx-1.6.5/src/Enchant.h	2009-12-09 20:40:11.472766701 +0000
@@ -0,0 +1,78 @@
+// -*- C++ -*-
+/**
+ * \file Enchant.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Caol?n McNamara
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef LYX_ENCHANT_H
+#define LYX_ENCHANT_H
+
+#include "SpellBase.h"
+
+#include <map>
+#include <string>
+
+namespace enchant {
+    class Dict;
+}
+
+namespace lyx {
+
+class BufferParams;
+
+
+class Enchant : public SpellBase {
+public:
+	/**
+	 * Initialise the spellchecker with the given buffer params and language.
+	 */
+	Enchant(BufferParams const & params, std::string const & lang);
+
+	virtual ~Enchant();
+
+	/**
+	 * return true if the spellchecker instance still exists
+	 * Always true for enchant, since there is no separate process
+	 */
+	virtual bool alive() { return true; }
+
+	/// check the given word and return the result
+	virtual enum Result check(WordLangTuple const &);
+
+	/// insert the given word into the personal dictionary
+	virtual void insert(WordLangTuple const &);
+
+	/// accept the given word temporarily
+	virtual void accept(WordLangTuple const &);
+
+	/// return the next near miss after a SUGGESTED_WORDS result
+	virtual docstring const nextMiss();
+
+	/// give an error message on messy exit
+	virtual docstring const error();
+
+private:
+	/// add a speller of the given language
+	void addSpeller(std::string const & lang);
+
+	struct Speller {
+		enchant::Dict* speller;
+	};
+
+	typedef std::map<std::string, Speller> Spellers;
+
+	/// the spellers
+	Spellers spellers_;
+
+        std::vector<std::string> els;
+};
+
+
+} // namespace lyx
+
+#endif // LYX_ENCHANT_H
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiPrefs.cpp lyx-1.6.5/src/frontends/qt4/GuiPrefs.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiPrefs.cpp	2009-10-24 18:10:48.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiPrefs.cpp	2009-12-09 20:40:11.467788824 +0000
@@ -1148,6 +1148,9 @@
 	spellCommandCO->addItem(qt_("ispell"));
 	spellCommandCO->addItem(qt_("aspell"));
 	spellCommandCO->addItem(qt_("hspell"));
+#ifdef USE_ENCHANT
+	spellCommandCO->addItem(qt_("enchant (library)"));
+#else
 #ifdef USE_PSPELL
 	spellCommandCO->addItem(qt_("pspell (library)"));
 #else
@@ -1155,6 +1158,7 @@
 	spellCommandCO->addItem(qt_("aspell (library)"));
 #endif
 #endif
+#endif
 }
 
 
@@ -1199,7 +1203,7 @@
 	}
 
 	if (rc.use_spell_lib) {
-#if defined(USE_ASPELL) || defined(USE_PSPELL)
+#if defined(USE_ENCHANT) || defined(USE_ASPELL) || defined(USE_PSPELL)
 		spellCommandCO->setCurrentIndex(3);
 #endif
 	}
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiSpellchecker.cpp lyx-1.6.5/src/frontends/qt4/GuiSpellchecker.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiSpellchecker.cpp	2009-07-08 12:03:41.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiSpellchecker.cpp	2009-12-09 20:40:11.469773116 +0000
@@ -32,7 +32,9 @@
 
 #include <QListWidgetItem>
 
-#if defined(USE_ASPELL)
+#if defined(USE_ENCHANT)
+# include "Enchant.h"
+#elif defined(USE_ASPELL)
 # include "ASpell_local.h"
 #elif defined(USE_PSPELL)
 # include "PSpell.h"
@@ -205,7 +207,10 @@
 		      ? lyxrc.isp_alt_lang
 		      : bp.language->code();
 
-#if defined(USE_ASPELL)
+#if defined(USE_ENCHANT)
+	if (lyxrc.use_spell_lib)
+		return new Enchant(bp, lang);
+#elif defined(USE_ASPELL)
 	if (lyxrc.use_spell_lib)
 		return new ASpell(bp, lang);
 #elif defined(USE_PSPELL)
diff -ru --new-file lyx-1.6.5.orig/src/frontends/qt4/GuiView.cpp lyx-1.6.5/src/frontends/qt4/GuiView.cpp
--- lyx-1.6.5.orig/src/frontends/qt4/GuiView.cpp	2009-08-31 08:37:56.000000000 +0100
+++ lyx-1.6.5/src/frontends/qt4/GuiView.cpp	2009-12-09 20:40:11.470768301 +0000
@@ -1232,7 +1232,7 @@
 		else if (name == "latexlog")
 			enable = FileName(buf->logName()).isReadableFile();
 		else if (name == "spellchecker")
-#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
+#if defined (USE_ENCHANT) || defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
 			enable = !buf->isReadonly();
 #else
 			enable = false;
diff -ru --new-file lyx-1.6.5.orig/src/Makefile.am lyx-1.6.5/src/Makefile.am
--- lyx-1.6.5.orig/src/Makefile.am	2009-09-13 21:49:30.000000000 +0100
+++ lyx-1.6.5/src/Makefile.am	2009-12-09 20:42:57.038771937 +0000
@@ -4,7 +4,7 @@
 
 DISTCLEANFILES += config.h libintl.h
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -20,7 +20,7 @@
 	paper.h \
 	pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBPSAPI)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBPSAPI)
 
 noinst_LTLIBRARIES = liblyxcore.la
 bin_PROGRAMS = lyx
@@ -46,6 +46,9 @@
 
 BUILT_SOURCES = $(PCH_FILE)
 
+if USE_ENCHANT
+ENCHANT = Enchant.cpp Enchant.h
+endif
 if USE_ASPELL
 ASPELL = ASpell.cpp ASpell_local.h
 endif
@@ -62,7 +65,7 @@
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
 	main.cpp \
-	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+	$(ENCHANT) $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
 	BiblioInfo.h \
 	BiblioInfo.cpp \
 	Box.cpp \

lyx-1.6.5-xdg_open.patch:
 configure.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lyx-1.6.5-xdg_open.patch ---
diff -up lyx-1.6.4/lib/configure.py.xdg_open lyx-1.6.4/lib/configure.py
--- lyx-1.6.4/lib/configure.py.xdg_open	2009-08-13 07:16:07.000000000 -0500
+++ lyx-1.6.4/lib/configure.py	2009-08-22 08:56:01.332263836 -0500
@@ -264,7 +264,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -307,23 +307,23 @@ def checkFormatEntries(dtl_tools):  
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'okular', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'okular', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 		    'gv', 'ghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	25 Aug 2009 18:06:59 -0000	1.40
+++ .cvsignore	10 Dec 2009 01:05:24 -0000	1.41
@@ -1 +1,2 @@
 lyx-1.6.4.tar.bz2
+lyx-1.6.5.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-11/lyx.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- lyx.spec	25 Aug 2009 18:06:59 -0000	1.94
+++ lyx.spec	10 Dec 2009 01:05:25 -0000	1.95
@@ -11,7 +11,7 @@
 %global fontname lyx
 %global common_desc \
 A collection of Math symbol fonts.
-#if 0%{?fedora} > 8 
+#if 0%{?fedora} > 8
 %if 0
 %define fontpackages 1
 BuildRequires: fontpackages-devel
@@ -23,8 +23,8 @@ BuildRequires: fontpackages-devel
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.4
-Release: 1%{?dist}
+Version: 1.6.5
+Release: 2%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -33,7 +33,13 @@ Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.6.4-xdg_open.patch
+Patch1: lyx-1.6.5-xdg_open.patch
+# This patch should be upstream for lyx-1.6.6
+# (we only need this because of patch #50)
+Patch2: lyx-1.6.5-autoconf_2.65.patch
+## upstreamed patches
+# http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
+Patch50: lyx-1.6.5-enchant.patch
 
 Source1: lyxrc.dist
 
@@ -42,7 +48,8 @@ Source10: lyx.desktop
 %if 0%{?_with_aiksaurus:1}
 BuildRequires: aiksaurus-devel
 %endif
-BuildRequires: aspell-devel
+# enchant support, via patch50, needs reauto*foo'ing
+BuildRequires: enchant-devel automake libtool
 %if 0%{?_without_included_boost:1}
 BuildRequires: boost-devel
 %endif
@@ -55,9 +62,9 @@ BuildRequires: zlib-devel
 # optional minimal qt4 dep
 %{?_qt_version:Requires: qt4 >= %{_qt4_version}}
 
-Obsoletes: %{name}-qt < 1.5.0 
+Obsoletes: %{name}-qt < 1.5.0
 Provides:  %{name}-qt = %{version}-%{release}
-Obsoletes: %{name}-xforms < 1.5.0 
+Obsoletes: %{name}-xforms < 1.5.0
 
 Requires: %{name}-common = %{version}-%{release}
 
@@ -114,15 +121,17 @@ With LyX, the author can concentrate on 
 and let the computer take care of the rest.
 
 %package common
-Summary:  Common files of %{name} 
+Summary:  Common files of %{name}
+Group:    Applications/Publishing
 Requires: %{name} = %{version}-%{release}
 %{?build_noarch}
-%description common 
+%description common
 {summary}.
 
 %package -n %{fontname}-fonts-compat
 Summary: Lyx/MathML fonts compatibility package
 License: Copyright only and GPL+
+Group:   Applications/Publishing
 Obsoletes: mathml-fonts < 1.0-50
 Provides:  mathml-fonts = 1.0-50
 Provides: %{fontname}-fonts = %{version}-%{release}
@@ -143,17 +152,19 @@ do not reference it or depend on it in a
 
 %package -n %{fontname}-fonts-common
 Summary: Common files of %{fontname}-fonts
+Group:   Applications/Publishing
 # The actual license says "The author of these fonts, Basil K. Malyshev, has
 # kindly granted permission to use and modify these fonts."
 # One of the font files (wasy10) is separately licensed GPL+.
 License: Copyright only and GPL+
 %{?fontpackages:Requires: fontpackages-filesystem}
 %{?build_noarch}
-%description -n %{name}-fonts-common
+%description -n %{fontname}-fonts-common
 This package consists of files used by other %{fontname}-fonts packages.
 
 %package -n %{fontname}-cmex10-fonts
 Summary: Cmex10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -162,6 +173,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmmi10-fonts
 Summary: Cmmi10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -170,6 +182,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmr10-fonts
 Summary: Cmr10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -178,6 +191,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmsy10-fonts
 Summary: Cmsy10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -186,6 +200,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-esint10-fonts
 Summary: Esint10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -194,6 +209,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-eufm10-fonts
 Summary: Eufm10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -202,6 +218,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-msam10-fonts
 Summary: Msam10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -210,6 +227,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-msbm10-fonts
 Summary: Msbm10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -218,6 +236,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-wasy10-fonts
 Summary: Wasy10 fonts
+Group:   Applications/Publishing
 License: GPL+
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -229,6 +248,12 @@ Requires: %{fontname}-fonts-common = %{v
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
+%patch2 -p1 -b .autoconf_2.65
+
+%patch50 -p1 -b .enchant
+
+# needed by patch50
+./autogen.sh
 
 
 %build
@@ -238,7 +263,7 @@ Requires: %{fontname}-fonts-common = %{v
   --disable-rpath \
   --enable-build-type=release \
   --enable-optimization="%{optflags}" \
-  --with-aspell \
+  --with-enchant \
   --with-qt4-dir=`pkg-config --variable=prefix QtCore` \
   %{?_with_aiksaurus} \
   %{?_without_included_boost}
@@ -291,7 +316,7 @@ touch --no-create %{_datadir}/icons/hico
 
 %postun common
 if [ $1 -eq 0 ] ; then
-  texhash >& /dev/null 
+  texhash >& /dev/null
   update-desktop-database -q &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -320,7 +345,7 @@ fi
 rm -rf %{buildroot}
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc ANNOUNCE COPYING lib/CREDITS NEWS README
 %{_bindir}/*
@@ -425,6 +450,18 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-2
+- Add patch for autoconf 2.65 (F13+)
+
+* Wed Dec  9 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.5-1
+- lyx-1.6.5
+
+* Thu Nov 19 2009 Jos? Matos <jamatos at fc.up.pt> - 1.6.4-3
+- LyX supports autoconf 2.64 (should be upstream for 1.6.5)
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-2
+- use enchant instead of aspell (#524046)
+
 * Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
 - lyx-1.6.4
 - handle fonts manually (now EPEL-5 compatible)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-11/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	25 Aug 2009 18:06:59 -0000	1.38
+++ sources	10 Dec 2009 01:05:25 -0000	1.39
@@ -1 +1,2 @@
 3dd759f91acd7765c304336c51aa3a2a  lyx-1.6.4.tar.bz2
+35a10d8cb8e4bdd296092d9d981330c9  lyx-1.6.5.tar.bz2


--- lyx-1.6.4-xdg_open.patch DELETED ---



From kkofler at fedoraproject.org  Thu Dec 10 01:18:51 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 10 Dec 2009 01:18:51 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins.spec,1.38,1.39
Message-ID: <20091210011851.56FCA11C02CA@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17516/devel

Modified Files:
	konq-plugins.spec 
Log Message:
* Thu Dec 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-5
- BR libtidy-devel (Fedora only)


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- konq-plugins.spec	10 Dec 2009 00:59:10 -0000	1.38
+++ konq-plugins.spec	10 Dec 2009 01:18:50 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           konq-plugins
 Version:        4.3.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -18,6 +18,7 @@ BuildRequires: gettext
 BuildRequires: kdebase4-devel >= %{version}
 %if 0%{?fedora}
 BuildRequires: webkitpart-devel >= 0.0.2
+BuildRequires: libtidy-devel
 %endif
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -141,6 +142,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-5
+- BR libtidy-devel (Fedora only)
+
 * Thu Dec 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-4
 - fix build with KDE 4.3.80's version of webkitkde (upstream patch)
 



From kyle at fedoraproject.org  Thu Dec 10 01:41:25 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 10 Dec 2009 01:41:25 +0000 (UTC)
Subject: rpms/kernel/devel
	perf-dont-free-perf_mmap_data-until-work-has-been-done.patch,
	NONE, 1.1 config-debug, 1.36, 1.37 config-nodebug, 1.48,
	1.49 kernel.spec, 1.1870, 1.1871
Message-ID: <20091210014126.26DED11C02CA@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24272

Modified Files:
	config-debug config-nodebug kernel.spec 
Added Files:
	perf-dont-free-perf_mmap_data-until-work-has-been-done.patch 
Log Message:
* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-8
- Add a patch off lkml from krh to fix perf when DEBUG_PERF_USE_VMALLOC
  (rhbz#542791)
- Re-enable CONFIG_DEBUG_PERF_USE_VMALLOC on debug kernels.


perf-dont-free-perf_mmap_data-until-work-has-been-done.patch:
 perf_event.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE perf-dont-free-perf_mmap_data-until-work-has-been-done.patch ---
>From linux-kernel-owner+kyle=40mcmartin.ca-S1751352AbZLAUFg at vger.kernel.org Tue Dec  1 15:06:00 2009
From:	=?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at bitplanet.net>
Subject: [PATCH] perf: Don't free perf_mmap_data until work has been done.
Date:	Tue,  1 Dec 2009 15:05:01 -0500

In the CONFIG_PERF_USE_VMALLOC case, perf_mmap_data_free() only
schedules the cleanup of the perf_mmap_data struct.  In that case
we have to wait until the work has been done before we free data.

Signed-off-by: Kristian H?gsberg <krh at bitplanet.net>
---
 kernel/perf_event.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 7f29643..f1854b9 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2174,6 +2174,7 @@ static void perf_mmap_data_free(struct perf_mmap_data *data)
 	perf_mmap_free_page((unsigned long)data->user_page);
 	for (i = 0; i < data->nr_pages; i++)
 		perf_mmap_free_page((unsigned long)data->data_pages[i]);
+	kfree(data);
 }
 
 #else
@@ -2214,6 +2215,7 @@ static void perf_mmap_data_free_work(struct work_struct *work)
 		perf_mmap_unmark_page(base + (i * PAGE_SIZE));
 
 	vfree(base);
+	kfree(data);
 }
 
 static void perf_mmap_data_free(struct perf_mmap_data *data)
@@ -2319,7 +2321,6 @@ static void perf_mmap_data_free_rcu(struct rcu_head *rcu_head)
 
 	data = container_of(rcu_head, struct perf_mmap_data, rcu_head);
 	perf_mmap_data_free(data);
-	kfree(data);
 }
 
 static void perf_mmap_data_release(struct perf_event *event)
-- 
1.6.5.rc2

--
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: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- config-debug	8 Dec 2009 20:38:46 -0000	1.36
+++ config-debug	10 Dec 2009 01:41:24 -0000	1.37
@@ -55,7 +55,7 @@ CONFIG_DEBUG_CREDENTIALS=y
 
 CONFIG_EXT4_DEBUG=y
 
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- config-nodebug	8 Dec 2009 20:38:46 -0000	1.48
+++ config-nodebug	10 Dec 2009 01:41:24 -0000	1.49
@@ -59,7 +59,7 @@ CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
 CONFIG_EXT4_DEBUG=y
 
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
 CONFIG_JBD2_DEBUG=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1870
retrieving revision 1.1871
diff -u -p -r1.1870 -r1.1871
--- kernel.spec	9 Dec 2009 14:28:45 -0000	1.1870
+++ kernel.spec	10 Dec 2009 01:41:24 -0000	1.1871
@@ -730,6 +730,8 @@ Patch12013: linux-2.6-rfkill-all.patch
 # rhbz#544471
 Patch12014: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
 
+Patch12015: perf-dont-free-perf_mmap_data-until-work-has-been-done.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1348,6 +1350,8 @@ ApplyPatch linux-2.6-rfkill-all.patch
 # rhbz#544471
 ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
 
+ApplyPatch perf-dont-free-perf_mmap_data-until-work-has-been-done.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2003,6 +2007,11 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-8
+- Add a patch off lkml from krh to fix perf when DEBUG_PERF_USE_VMALLOC
+  (rhbz#542791)
+- Re-enable CONFIG_DEBUG_PERF_USE_VMALLOC on debug kernels.
+
 * Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-7
 - ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch: CVE-2009-4131
   fix insufficient permission checking which could result in arbitrary



From cjb at fedoraproject.org  Thu Dec 10 02:32:28 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Thu, 10 Dec 2009 02:32:28 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091210git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091210023228.CBB4D10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

b3772c71fe0d33a4dc7ce0eb178b3203  ohm-0.1.1-1.20091210git.tar.gz



From cjb at fedoraproject.org  Thu Dec 10 02:34:14 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Thu, 10 Dec 2009 02:34:14 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore, 1.10, 1.11 ohm.spec, 1.17, 1.18 sources, 
	1.12, 1.13
Message-ID: <20091210023414.75E9811C0265@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7976

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
Power down wlan on sleep, using ethtool "wol d" command.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Dec 2009 04:24:07 -0000	1.10
+++ .cvsignore	10 Dec 2009 02:34:14 -0000	1.11
@@ -1 +1 @@
-ohm-0.1.1-1.20091209git.tar.gz
+ohm-0.1.1-1.20091210git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ohm.spec	9 Dec 2009 04:24:07 -0000	1.17
+++ ohm.spec	10 Dec 2009 02:34:14 -0000	1.18
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091209git
+%define alphatag                20091210git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.34.%{alphatag}%{?dist}
+Release: 9.35.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,6 +139,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.35.20091210git.olpc
+- Power down wlan on power button/lid close, using ethtool "wol d" command.
+
 * Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.34.20091209git.olpc
 - Trac #9848: Don't undim the screen when woken by wlan or battery. 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Dec 2009 04:24:07 -0000	1.12
+++ sources	10 Dec 2009 02:34:14 -0000	1.13
@@ -1 +1 @@
-ef757e8fa396254a8899d2654462ba74  ohm-0.1.1-1.20091209git.tar.gz
+b3772c71fe0d33a4dc7ce0eb178b3203  ohm-0.1.1-1.20091210git.tar.gz



From cjb at fedoraproject.org  Thu Dec 10 02:43:08 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Thu, 10 Dec 2009 02:43:08 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091210git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091210024308.C7BBE10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

123b4ad006e64dd51781a4954b97f54c  ohm-0.1.1-1.20091210git.tar.gz



From cjb at fedoraproject.org  Thu Dec 10 02:43:57 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Thu, 10 Dec 2009 02:43:57 +0000 (UTC)
Subject: rpms/ohm/F-11 ohm.spec,1.18,1.19 sources,1.13,1.14
Message-ID: <20091210024357.16F7711C0265@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11296

Modified Files:
	ohm.spec sources 
Log Message:
fix build error



Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ohm.spec	10 Dec 2009 02:34:14 -0000	1.18
+++ ohm.spec	10 Dec 2009 02:43:56 -0000	1.19
@@ -7,7 +7,7 @@
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.35.%{alphatag}%{?dist}
+Release: 9.36.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,7 +139,7 @@ fi
 %{_includedir}/*
 
 %changelog
-* Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.35.20091210git.olpc
+* Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.36.20091210git.olpc
 - Power down wlan on power button/lid close, using ethtool "wol d" command.
 
 * Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.34.20091209git.olpc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Dec 2009 02:34:14 -0000	1.13
+++ sources	10 Dec 2009 02:43:56 -0000	1.14
@@ -1 +1 @@
-b3772c71fe0d33a4dc7ce0eb178b3203  ohm-0.1.1-1.20091210git.tar.gz
+123b4ad006e64dd51781a4954b97f54c  ohm-0.1.1-1.20091210git.tar.gz



From chitlesh at fedoraproject.org  Thu Dec 10 04:26:48 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 04:26:48 +0000 (UTC)
Subject: rpms/gnusim8085/devel .cvsignore, 1.3, 1.4 gnusim8085.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091210042648.3A63311C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gnusim8085/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1759/devel

Modified Files:
	.cvsignore gnusim8085.spec import.log sources 
Log Message:
fixed RHBZ 542945


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Dec 2009 12:39:16 -0000	1.3
+++ .cvsignore	10 Dec 2009 04:26:47 -0000	1.4
@@ -1 +1 @@
-gnusim8085-svn.141.tar.gz
+gnusim8085-1.3.5.tar.gz


Index: gnusim8085.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/gnusim8085.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnusim8085.spec	3 Dec 2009 12:39:16 -0000	1.3
+++ gnusim8085.spec	10 Dec 2009 04:26:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		gnusim8085
-Version:	svn.141
-Release:	5%{?dist}
+Version:	1.3.5
+Release:	6%{?dist}
 Summary:	A 8085 Simulator
 
 Group:		Applications/Engineering
@@ -11,6 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	gtksourceview2-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:  automake libtool
 
 Requires:	electronics-menu
 
@@ -26,14 +27,25 @@ can be used for debugging the programs.
 %prep
 %setup -q
 
+# RHBZ = 542945
+sed -i \
+    "s|share/doc/\${PACKAGE}|share/doc/%{name}-%{version}|" \
+    configure.in
+sed -i "s|/usr/local/doc/GNUSim8085|%{_docdir}/%{name}-%{version}|" src/callbacks.c
+
+%{__libtoolize} --force --copy
+%{__aclocal}
+%{__automake} --add-missing
+%{__autoconf}
 
 %build
-%configure 
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGSldroot}" 
+%configure
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make INSTALL="install -p" DESTDIR=%{buildroot} install
+
 desktop-file-install --vendor "" \
 --add-category "Electronics" \
 --delete-original \
@@ -42,8 +54,7 @@ desktop-file-install --vendor "" \
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p doc/gnusim8085.1 %{buildroot}%{_mandir}/man1/%{name}.1
 rm -rf %{buildroot}%{_docdir}
-mkdir -p %{buildroot}%{_datadir}/doc/gnusim8085
-cp -p AUTHORS %{buildroot}%{_datadir}/doc/gnusim8085/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,9 +68,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/GNUSim8085.desktop
 %{_datadir}/gnusim8085/
 %{_datadir}/pixmaps/gnusim8085/
-%{_datadir}/doc/gnusim8085/
+
 
 %changelog
+* Thu Dec 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.3.5-6
+- Fixed broken package version naming
+- Change docdir in configure.in fix RHBZ 542945
+- Reverted sources to stable 1.3.5 : thankfully release 5 was not pushed to repos
+
 * Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-5
 - Fixed Bug-542945
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Dec 2009 12:39:16 -0000	1.2
+++ import.log	10 Dec 2009 04:26:47 -0000	1.3
@@ -1,2 +1,3 @@
 gnusim8085-1_3_5-4_fc10:HEAD:gnusim8085-1.3.5-4.fc10.src.rpm:1244523313
 gnusim8085-svn_141-5_fc12:HEAD:gnusim8085-svn.141-5.fc12.src.rpm:1259843844
+gnusim8085-1_3_5-6_fc12:HEAD:gnusim8085-1.3.5-6.fc12.src.rpm:1260419113


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Dec 2009 12:39:16 -0000	1.3
+++ sources	10 Dec 2009 04:26:47 -0000	1.4
@@ -1 +1 @@
-8eca68b31f3abb0d9bdfcd3b78e5a748  gnusim8085-svn.141.tar.gz
+7a474d5aafb72e912c02d15e5329a714  gnusim8085-1.3.5.tar.gz



From petersen at fedoraproject.org  Thu Dec 10 04:31:04 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 10 Dec 2009 04:31:04 +0000 (UTC)
Subject: rpms/ghc-X11-xft/F-12 ghc-X11-xft.spec,1.1,1.2
Message-ID: <20091210043104.0E1FC11C025D@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-X11-xft/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3075

Modified Files:
	ghc-X11-xft.spec 
Log Message:
backport
- rebuild for ghc-X11-1.4.6.1
- use %%ghc_pkg_ver for lib dep requires



Index: ghc-X11-xft.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-X11-xft/F-12/ghc-X11-xft.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-X11-xft.spec	8 Sep 2009 17:39:13 -0000	1.1
+++ ghc-X11-xft.spec	10 Dec 2009 04:31:03 -0000	1.2
@@ -8,8 +8,8 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.3
-Release:        3%{?dist}
-Summary:        Haskell bindings to the Xft
+Release:        4%{?dist}
+Summary:        Haskell bindings to the Xft library
 
 Group:          Development/Libraries
 License:        LGPLv2
@@ -46,8 +46,8 @@ Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
 Requires:       libXft-devel
-Requires:       ghc-X11-devel
-Requires:       ghc-utf8-string-devel
+Requires:       ghc-X11-devel = %ghc_pkg_ver X11
+Requires:       ghc-utf8-string-devel = %ghc_pkg_ver utf8-string
 
 %description devel
 This package contains the development files for %{name}
@@ -61,8 +61,8 @@ Group:          Development/Libraries
 Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
-Requires:       ghc-X11-doc
-Requires:       ghc-utf8-string-doc
+Requires:       ghc-X11-doc = %ghc_pkg_ver X11
+Requires:       ghc-utf8-string-doc = %ghc_pkg_ver utf8-string
 
 %description doc
 This package contains development documentation files for 
@@ -76,8 +76,8 @@ Summary:        Profiling libraries for 
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       ghc-prof = %{ghc_version}
-Requires:       ghc-X11-prof
-Requires:       ghc-utf8-string-prof
+Requires:       ghc-X11-prof = %ghc_pkg_ver X11
+Requires:       ghc-utf8-string-prof = %ghc_pkg_ver utf8-string
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -151,6 +151,10 @@ fi
 
 
 %changelog
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.3-4
+- rebuild for ghc-X11-1.4.6.1
+- use %%ghc_pkg_ver for lib dep requires
+
 * Wed Aug 26 2009 Jens Petersen <petersen at redhat.com> - 0.3-3
 - fix up devel, doc and prof deps
 
@@ -159,10 +163,10 @@ fi
 
 * Tue Aug 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.3-1
 - Updated to version 0.3
-- Added ghc-utf8-string-prof as build reqirment
-- Added ghc-utf8-string-doc as build reqirment
-- Added ghc-X11-prof as build reqirment
-- Added ghc-X11-doc as build reqirment
+- Added ghc-utf8-string-prof as build requirement
+- Added ghc-utf8-string-doc as build requirement
+- Added ghc-X11-prof as build requirement
+- Added ghc-X11-doc as build requirement
 
 * Mon Jul 14 2009 Zachary Oglesby <zoglesby at fedoraproject.org> - 0.2-4
 - Added ghc-utf8-string-devel as build requirment



From chitlesh at fedoraproject.org  Thu Dec 10 04:40:39 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 04:40:39 +0000 (UTC)
Subject: rpms/gnusim8085/devel gnusim8085.spec,1.4,1.5
Message-ID: <20091210044039.2972211C0401@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gnusim8085/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6112

Modified Files:
	gnusim8085.spec 
Log Message:
added gettext-devel to BR


Index: gnusim8085.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/devel/gnusim8085.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnusim8085.spec	10 Dec 2009 04:26:47 -0000	1.4
+++ gnusim8085.spec	10 Dec 2009 04:40:38 -0000	1.5
@@ -11,7 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	gtksourceview2-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:  automake libtool
+BuildRequires:  automake libtool gettext-devel
 
 Requires:	electronics-menu
 



From chitlesh at fedoraproject.org  Thu Dec 10 05:01:00 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 05:01:00 +0000 (UTC)
Subject: rpms/gnusim8085/F-11 .cvsignore, 1.3, 1.4 gnusim8085.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091210050100.C1FB011C03AD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gnusim8085/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12765/F-11

Modified Files:
	.cvsignore gnusim8085.spec import.log sources 
Log Message:
fixed RHBZ 542945


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Dec 2009 12:45:43 -0000	1.3
+++ .cvsignore	10 Dec 2009 05:01:00 -0000	1.4
@@ -1 +1 @@
-gnusim8085-svn.141.tar.gz
+gnusim8085-1.3.5.tar.gz


Index: gnusim8085.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-11/gnusim8085.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnusim8085.spec	3 Dec 2009 12:45:43 -0000	1.2
+++ gnusim8085.spec	10 Dec 2009 05:01:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		gnusim8085
-Version:	svn.141
-Release:	5%{?dist}
+Version:	1.3.5
+Release:	6%{?dist}
 Summary:	A 8085 Simulator
 
 Group:		Applications/Engineering
@@ -11,6 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	gtksourceview2-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:  automake libtool gettext-devel
 
 Requires:	electronics-menu
 
@@ -26,14 +27,25 @@ can be used for debugging the programs.
 %prep
 %setup -q
 
+# RHBZ = 542945
+sed -i \
+    "s|share/doc/\${PACKAGE}|share/doc/%{name}-%{version}|" \
+    configure.in
+sed -i "s|/usr/local/doc/GNUSim8085|%{_docdir}/%{name}-%{version}|" src/callbacks.c
+
+%{__libtoolize} --force --copy
+%{__aclocal}
+%{__automake} --add-missing
+%{__autoconf}
 
 %build
-%configure 
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGSldroot}" 
+%configure
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make INSTALL="install -p" DESTDIR=%{buildroot} install
+
 desktop-file-install --vendor "" \
 --add-category "Electronics" \
 --delete-original \
@@ -42,8 +54,7 @@ desktop-file-install --vendor "" \
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p doc/gnusim8085.1 %{buildroot}%{_mandir}/man1/%{name}.1
 rm -rf %{buildroot}%{_docdir}
-mkdir -p %{buildroot}%{_datadir}/doc/gnusim8085
-cp -p AUTHORS %{buildroot}%{_datadir}/doc/gnusim8085/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,9 +68,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/GNUSim8085.desktop
 %{_datadir}/gnusim8085/
 %{_datadir}/pixmaps/gnusim8085/
-%{_datadir}/doc/gnusim8085/
+
 
 %changelog
+* Thu Dec 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.3.5-6
+- Fixed broken package version naming
+- Change docdir in configure.in fix RHBZ 542945
+- Reverted sources to stable 1.3.5 : thankfully release 5 was not pushed to repos
+
 * Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-5
 - Fixed Bug-542945
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Dec 2009 12:45:43 -0000	1.2
+++ import.log	10 Dec 2009 05:01:00 -0000	1.3
@@ -1,2 +1,3 @@
 gnusim8085-1_3_5-4_fc10:F-11:gnusim8085-1.3.5-4.fc10.src.rpm:1244523670
 gnusim8085-svn_141-5_fc12:F-11:gnusim8085-svn.141-5.fc12.src.rpm:1259844297
+gnusim8085-1_3_5-6_fc12:F-11:gnusim8085-1.3.5-6.fc12.src.rpm:1260421166


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Dec 2009 12:45:43 -0000	1.3
+++ sources	10 Dec 2009 05:01:00 -0000	1.4
@@ -1 +1 @@
-8eca68b31f3abb0d9bdfcd3b78e5a748  gnusim8085-svn.141.tar.gz
+7a474d5aafb72e912c02d15e5329a714  gnusim8085-1.3.5.tar.gz



From chitlesh at fedoraproject.org  Thu Dec 10 05:03:32 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 05:03:32 +0000 (UTC)
Subject: rpms/gnusim8085/F-12 .cvsignore, 1.3, 1.4 gnusim8085.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091210050332.DDEAD11C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gnusim8085/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13697/F-12

Modified Files:
	.cvsignore gnusim8085.spec import.log sources 
Log Message:
fixed RHBZ 542945


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Dec 2009 12:42:17 -0000	1.3
+++ .cvsignore	10 Dec 2009 05:03:32 -0000	1.4
@@ -1 +1 @@
-gnusim8085-svn.141.tar.gz
+gnusim8085-1.3.5.tar.gz


Index: gnusim8085.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-12/gnusim8085.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnusim8085.spec	3 Dec 2009 12:42:17 -0000	1.3
+++ gnusim8085.spec	10 Dec 2009 05:03:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		gnusim8085
-Version:	svn.141
-Release:	5%{?dist}
+Version:	1.3.5
+Release:	6%{?dist}
 Summary:	A 8085 Simulator
 
 Group:		Applications/Engineering
@@ -11,6 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	gtksourceview2-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:  automake libtool gettext-devel
 
 Requires:	electronics-menu
 
@@ -26,14 +27,25 @@ can be used for debugging the programs.
 %prep
 %setup -q
 
+# RHBZ = 542945
+sed -i \
+    "s|share/doc/\${PACKAGE}|share/doc/%{name}-%{version}|" \
+    configure.in
+sed -i "s|/usr/local/doc/GNUSim8085|%{_docdir}/%{name}-%{version}|" src/callbacks.c
+
+%{__libtoolize} --force --copy
+%{__aclocal}
+%{__automake} --add-missing
+%{__autoconf}
 
 %build
-%configure 
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGSldroot}" 
+%configure
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make INSTALL="install -p" DESTDIR=%{buildroot} install
+
 desktop-file-install --vendor "" \
 --add-category "Electronics" \
 --delete-original \
@@ -42,8 +54,7 @@ desktop-file-install --vendor "" \
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p doc/gnusim8085.1 %{buildroot}%{_mandir}/man1/%{name}.1
 rm -rf %{buildroot}%{_docdir}
-mkdir -p %{buildroot}%{_datadir}/doc/gnusim8085
-cp -p AUTHORS %{buildroot}%{_datadir}/doc/gnusim8085/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,9 +68,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/GNUSim8085.desktop
 %{_datadir}/gnusim8085/
 %{_datadir}/pixmaps/gnusim8085/
-%{_datadir}/doc/gnusim8085/
+
 
 %changelog
+* Thu Dec 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.3.5-6
+- Fixed broken package version naming
+- Change docdir in configure.in fix RHBZ 542945
+- Reverted sources to stable 1.3.5 : thankfully release 5 was not pushed to repos
+
 * Thu Dec 3 2009 Rangeen Basu Roy Chowdhury <sherry151 AT fedoraproject DOT org> - svn.141-5
 - Fixed Bug-542945
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Dec 2009 12:42:18 -0000	1.2
+++ import.log	10 Dec 2009 05:03:32 -0000	1.3
@@ -1,2 +1,3 @@
 gnusim8085-1_3_5-4_fc10:HEAD:gnusim8085-1.3.5-4.fc10.src.rpm:1244523313
 gnusim8085-svn_141-5_fc12:F-12:gnusim8085-svn.141-5.fc12.src.rpm:1259844016
+gnusim8085-1_3_5-6_fc12:F-12:gnusim8085-1.3.5-6.fc12.src.rpm:1260421274


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnusim8085/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Dec 2009 12:42:18 -0000	1.3
+++ sources	10 Dec 2009 05:03:32 -0000	1.4
@@ -1 +1 @@
-8eca68b31f3abb0d9bdfcd3b78e5a748  gnusim8085-svn.141.tar.gz
+7a474d5aafb72e912c02d15e5329a714  gnusim8085-1.3.5.tar.gz



From oget at fedoraproject.org  Thu Dec 10 05:05:04 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 10 Dec 2009 05:05:04 +0000 (UTC)
Subject: rpms/tuxguitar/devel tuxguitar-build-fedora.xml, NONE,
	1.1 tuxguitar-plugin-properties.patch, NONE, 1.1 tuxguitar.spec,
	1.7, 1.8 tuxguitar-Makefile, 1.1, NONE tuxguitar.desktop, 1.3, NONE
Message-ID: <20091210050504.17BCA11C025D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tuxguitar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14304

Modified Files:
	tuxguitar.spec 
Added Files:
	tuxguitar-build-fedora.xml tuxguitar-plugin-properties.patch 
Removed Files:
	tuxguitar-Makefile tuxguitar.desktop 
Log Message:
* Sat Nov 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-2
- Change build system (we'll use our build-fedora.xml rather than patching Debian's
  Makefile). 
- Disable system tray and oss plugins by default.
- Make fluidsynth/alsa/fluid soundfont combination the default output so that the
  software works out of the box.



--- NEW FILE tuxguitar-build-fedora.xml ---
<?xml version="1.0" encoding="iso-8859-1"?>

<project name="Tux Guitar" basedir="." >
	<description>
		Tux-Guitar
	</description>
	<taskdef resource="net/sf/antcontrib/antlib.xml"/>

	<property name="file.properties" value="${build.path}${file.separator}config.dist" />
	<property name="file.desktop" value="tuxguitar.desktop" />
	<property name="file.mime" value="tuxguitar.xml" />
	<property name="file.script" value="tuxguitar" />
	<property name="file.plugin.properties" value="${build.path}${file.separator}plugin.properties" />
	<property name="file.fluidsynth.config" value="${build.path}${file.separator}tuxguitar-fluidsynth.cfg" />
	<property name="file.song" value="../misc/tuxguitar.tg" />
	<target name="clean" >
		<delete quiet="true" dir="tuxguitar-${dist.version}" />
	</target>

	<target name="package" />
	
	<target name="install" >
		<mkdir dir="${dist.dst.path}${os.data.dir}/applications" />
		<copy todir="${dist.dst.path}${os.data.dir}/applications/">
			<fileset file="${file.desktop}"/>
		</copy>
		<mkdir dir="${dist.dst.path}${os.data.dir}/mime/packages" />
		<copy todir="${dist.dst.path}${os.data.dir}/mime/packages">
			<fileset file="${file.mime}"/>
		</copy>
		<mkdir dir="${dist.dst.path}${os.bin.dir}" />
		<exec executable="cp" >
			<arg value="-a"/>
			<arg value="${file.script}"/>
			<arg value="${dist.dst.path}${os.bin.dir}/"/>
		</exec>
		<copy tofile="${dist.dst.path}${dist.default.song}/" >
			<fileset file="${file.song}"/>
		</copy>
		
		<for list="16,24,32,48,64,96" param="dim" >
			<sequential>
				<mkdir dir="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/apps/" />
				<mkdir dir="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/apps/tuxguitar.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-tuxguitar.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-gtp.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-ptb.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
			</sequential>
		</for>
	</target>

	<target name="build" >
		<echo file="${file.properties}" append="false">font.default=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.note=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.text=Sans,8,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.lyric=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.time-signature=Sans,13,1${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.default=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.note=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.text=Sans,8,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.lyric=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.time-signature=Sans,10,1${line.separator}</echo>
		<echo file="${file.properties}" append="true">midi.sequencer=tuxguitar.sequencer${line.separator}</echo>
		<echo file="${file.properties}" append="true">midi.port=tuxguitar-fluidsynth_${os.data.dir}/soundfonts/default.sf2${line.separator}</echo>
		<echo file="${file.properties}" append="true">skin=${dist.default.style}${line.separator}</echo>

		<echo file="${file.desktop}" append="false">[Desktop Entry]${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Version=1.0${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Name=TuxGuitar${line.separator}</echo>
		<echo file="${file.desktop}" append="true">GenericName=Tablature Editor/Playback${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment=Edit, playback guitar tablatures${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment[fr]=Edite, joue des tablatures de guitare${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment[es]=Edita, reproduce tablaturas de guitarra${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Type=Application${line.separator}</echo>
		<echo file="${file.desktop}" append="true">MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb;audio/midi;${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Categories=AudioVideo;Audio;X-Notation;${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Exec=tuxguitar %f${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Icon=tuxguitar${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Terminal=false${line.separator}</echo>

		<echo file="${file.mime}" append="false">&#60;?xml version="1.0" encoding="UTF-8"?&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">&#60;mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-tuxguitar"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;TuxGuitar file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.tg"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-gtp"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;GuitarPro file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gtp"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp3"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp4"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp5"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-ptb"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;PowerTab file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.ptb"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">&#60;/mime-info&#62;${line.separator}</echo>

		<echo file="${file.script}" append="false">#!/bin/sh${line.separator}</echo>
		<echo file="${file.script}" append="true">##SCRIPT DIR${line.separator}</echo>
		<echo file="${file.script}" append="true">DIR_NAME=`dirname "$0"`${line.separator}</echo>
		<echo file="${file.script}" append="true">DIR_NAME=`cd "$DIR_NAME"; pwd`${line.separator}</echo>
		<echo file="${file.script}" append="true">cd "${DIR_NAME}"${line.separator}</echo>
		<echo file="${file.script}" append="true">##JAVA${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ -z $JAVA ]; then${line.separator}</echo>
		<echo file="${file.script}" append="true">	JAVA=${JAVA_HOME}/bin/java${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -f ${JAVA} ] &amp;&amp; JAVA=/usr/bin/java${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -f ${JAVA} ] &amp;&amp; JAVA=java${line.separator}</echo>
		<echo file="${file.script}" append="true">fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##MOZILLA_FIVE_HOME${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ -z $MOZILLA_FIVE_HOME ]; then${line.separator}</echo>
		<echo file="${file.script}" append="true">	MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/firefox${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -d ${MOZILLA_FIVE_HOME} ] &amp;&amp; MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/mozilla${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -d ${MOZILLA_FIVE_HOME} ] &amp;&amp; MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/iceweasel${line.separator}</echo>
		<echo file="${file.script}" append="true">fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##LIBRARY_PATH${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${dist.lib.path}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib${os.lib.suffix}/jni${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MOZILLA_FIVE_HOME}${line.separator}</echo>
		<echo file="${file.script}" append="true">##CLASSPATH${line.separator}</echo>
		<echo file="${file.script}" append="true">CLASSPATH=$CLASSPATH:${dist.jar.path}${build.jar}:${lib.swt.jar}:${path.itext}:${dist.share.path}${line.separator}</echo>
		<echo file="${file.script}" append="true">##MAINCLASS${line.separator}</echo>
		<echo file="${file.script}" append="true">MAINCLASS=org.herac.tuxguitar.gui.TGMain${line.separator}</echo>
		<echo file="${file.script}" append="true">##JVM ARGUMENTS${line.separator}</echo>
		<echo file="${file.script}" append="true">VM_ARGS="-Xmx512m"${line.separator}</echo>
		<echo file="${file.script}" append="true">##EXPORT VARS${line.separator}</echo>
		<echo file="${file.script}" append="true">export CLASSPATH${line.separator}</echo>
		<echo file="${file.script}" append="true">export LD_LIBRARY_PATH${line.separator}</echo>
		<echo file="${file.script}" append="true">export MOZILLA_FIVE_HOME${line.separator}</echo>
		<echo file="${file.script}" append="true">arg=""${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ ! "$1" ] ; then arg="${dist.default.song}"; fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##LAUNCH${line.separator}</echo>
		<echo file="${file.script}" append="true">${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Dtuxguitar.share.path="${dist.share.path}" -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$1" "$2" "$arg"${line.separator}</echo>
		<chmod file="${file.script}" perm="755"/>

		<echo file="${file.plugin.properties}" append="false">org.herac.tuxguitar.player.impl.midiport.oss.MidiOutputPortProviderPlugin.enabled=false${line.separator}</echo>
		<echo file="${file.plugin.properties}" append="true">org.herac.tuxguitar.tray.TGTrayPlugin.enabled=false${line.separator}</echo>

		<echo file="${file.fluidsynth.config}" append="false">soundfont.count=1${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">soundfont.path0=${os.data.dir}/soundfonts/default.sf2${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">audio.driver=alsa${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">audio.period-size=1024${line.separator}</echo>
	</target>
	
</project>

tuxguitar-plugin-properties.patch:
 TGPluginProperties.java |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE tuxguitar-plugin-properties.patch ---
--- trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java	2008/04/24 13:53:06	99
+++ trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java	2009/11/26 13:34:24	770
@@ -7,6 +7,7 @@
 package org.herac.tuxguitar.gui.system.plugins;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.Properties;
 
 import org.herac.tuxguitar.gui.system.config.TGConfigManager;
@@ -19,6 +20,8 @@
  */
 public class TGPluginProperties  extends TGConfigManager{
 	
+	private static final String FILE_NAME = "plugin.properties";
+	
 	private static TGPluginProperties instance;
 	
 	public static TGPluginProperties instance(){
@@ -38,11 +41,19 @@
 	}
 	
 	public String getFileName(){
-		return TGFileUtils.PATH_USER_CONFIG + File.separator + "plugin.properties";
+		return TGFileUtils.PATH_USER_CONFIG + File.separator + FILE_NAME;
 	}
 	
 	public Properties getDefaults() {
-		return new Properties();
+		Properties properties = new Properties();
+		try {
+			InputStream is = TGFileUtils.getResourceAsStream(FILE_NAME);
+			if(is != null){
+				properties.load(is);
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+		return properties;
 	}
-	
 }
\ No newline at end of file


Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/devel/tuxguitar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tuxguitar.spec	14 Nov 2009 06:48:26 -0000	1.7
+++ tuxguitar.spec	10 Dec 2009 05:05:03 -0000	1.8
@@ -1,14 +1,18 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Summary:          A multitrack tablature editor and player written in Java-SWT
 Name:             tuxguitar
 Version:          1.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 URL:              http://www.tuxguitar.com.ar
 Source0:          http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-# For some reason this is missing from the tarball. Downloaded from upstream trunk:
-Source1:          %{name}-Makefile
-Source9:          %{name}.desktop
+# Fedora specific build script. Accepted by upstream:
+# http://tuxguitar.svn.sourceforge.net/viewvc/tuxguitar/trunk/TuxGuitar/xml/build-fedora.xml
+Source1:          %{name}-build-fedora.xml
+# From upstream trunk, to disable certain plugins by default
+# http://tuxguitar.svn.sourceforge.net/viewvc/tuxguitar/trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java?r1=99&r2=770
+Patch0:           %{name}-plugin-properties.patch
+
 License:          LGPLv2+
 Group:            Applications/Multimedia
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,14 +21,18 @@ Requires:         itext
 Requires:         java >= 1.7
 Requires:         jpackage-utils
 Requires:         libswt3-gtk2
+Requires:         soundfont2-default
 BuildRequires:    alsa-lib-devel
 BuildRequires:    ant
+BuildRequires:    ant-contrib
+BuildRequires:    ant-nodeps
 BuildRequires:    itext
 BuildRequires:    desktop-file-utils
 BuildRequires:    fluidsynth-devel
 BuildRequires:    jack-audio-connection-kit-devel
 BuildRequires:    java-devel >= 1.7
 BuildRequires:    jpackage-utils
+
 BuildRequires:    libswt3-gtk2
 %if %{with_gcj}
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -42,110 +50,96 @@ tempo management, gp3/gp4/gp5 import and
 
 %prep
 %setup -q -n %{name}-src-%{version}
+%patch0 -p1
 
-# Place the Makefile
-cp %{SOURCE1} Makefile
-
-# The following issues were discussed in:
-# http://www.tuxguitar.com.ar/forum/4/817/need-help-with-packaging-for-fedora/
-# Declare the library path and classpath during runtime instead
-sed -i 's|env_$|env_\nexport CLASSPATH=%{_libdir}/java/swt.jar\n|' misc/tuxguitar.sh
-sed -i 's|PACKAGE_LIB:=/usr/lib/jni|PACKAGE_LIB:=%{_libdir}/%{name}|' misc/tuxguitar.sh
-# Add exec to replace the called shell
-sed -i 's|${JAVA} ${JAVA_FLAGS}|exec ${JAVA} ${JAVA_FLAGS}|' misc/tuxguitar.sh
-
-# Change /lib to %%{_lib}, just in case
-sed -i 's|/lib/|/%{_lib}/|g' Makefile
-sed -i 's|/lib/|/%{_lib}/|g' misc/tuxguitar.sh
-sed -i 's|/lib|/%{_lib}|g' TuxGuitar/xml/build-linux.xml
-# Don't strip the binaries during %%install
-sed -i 's/install -s/install -m 755/g' Makefile
-
-# Enable extra plugins:
-sed -i 's|TuxGuitar-pdf \\|\\\
- TuxGuitar-pdf \\\
- TuxGuitar-browser-ftp \\\
- TuxGuitar-gervill \\|' \
- Makefile
-sed -i 's|\./TuxGuitar-pdf/tuxguitar-pdf\.jar|\\\
- \./TuxGuitar-pdf/tuxguitar-pdf\.jar \\\
- \./TuxGuitar-browser-ftp/tuxguitar-browser-ftp\.jar \\\
- \./TuxGuitar-gervill/tuxguitar-gervill\.jar|' \
- Makefile
-sed -i 's|\./TuxGuitar-oss/tuxguitar-oss\.jar|\\\
- \./TuxGuitar-jack/tuxguitar-jack\.jar \\\
- \./TuxGuitar-jack/jni/libtuxguitar-jack-jni\.so \\\
- \./TuxGuitar-oss/tuxguitar-oss\.jar|' \
- Makefile
+cp %{SOURCE1} TuxGuitar/xml/build-fedora.xml
 
 # Set debug="true" on javac part of the build scripts.
 for file in $(find . -name build.xml); do
- sed -i 's|debug="false"|debug="true"|' $file
+   sed -i 's|debug="false"|debug="true"|' $file
 done
 
 
 %build
-# Does not compile with %%{?_smp_mflags}. Build using openjdk. 
-# SWT_JAR=$(build-classpath swt) does not work here ???
-make SWT_JAR=%{_libdir}/java/swt.jar \
-     CFLAGS="${RPM_OPT_FLAGS} \
-             -I%{_jvmdir}/java-openjdk/include \
-             -I%{_jvmdir}/java-openjdk/include/linux \
-             -fPIC"
+# Plugins to build:
+PLUGINS="alsa ascii browser-ftp community compat converter fluidsynth gervill\
+         gtp jack jsa lilypond midi musicxml oss pdf ptb tef tray"
+
+# JNI's to build
+JNIS="alsa fluidsynth jack oss"
+
+LIBSUFFIX=$(echo %{_lib}|sed 's|lib||')
+
+# to pass to ant:
+ANT_FLAGS=" \
+   -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
+   -Dpath.itext=%{_javadir}/itext.jar \
+   -Dpath.swt=%{_libdir}/java/swt.jar \
+   -Dlib.swt.jar=%{_libdir}/java/swt.jar \
+   -Ddist.lib.path=%{_libdir}/%{name}/ \
+   -Ddist.file=xml/build-fedora.xml \
+   -Ddist.jar.path=%{_datadir}/%{name}/ \
+   -Ddist.share.path=%{_datadir}/%{name}/ \
+   -Dos.lib.suffix=$LIBSUFFIX \
+   -Dos.data.dir=%{_datadir}/ \
+   -Ddist.default.style=Lavender \
+   -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg"
+
+# build jars
+ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS all
+for jarname in $PLUGINS; do
+   ant -f TuxGuitar-$jarname/build.xml -v -d $ANT_FLAGS \
+      -Dbuild.jar=../TuxGuitar/share/plugins/tuxguitar-$jarname.jar all
+done
+
+# build jnis
+for jni in $JNIS; do
+   make -C TuxGuitar-$jni/jni %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS} \
+              -I%{_jvmdir}/java-openjdk/include \
+              -I%{_jvmdir}/java-openjdk/include/linux \
+              -fPIC"
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_LIB_DIR=$RPM_BUILD_ROOT/%_libdir/%name install
-install -dm 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_LIB_DIR=$RPM_BUILD_ROOT/%_libdir/%name install-linux
-
-# Makefile does not install the plugins by default so install them manually
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins
-
-for jardir in TuxGuitar-*; do
- if [ -e $jardir/*jar ]
- then 
-  install -m 644 $jardir/*jar  $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins/
- fi
-done
 
-# icons
-for dim in 16x16 24x24 32x32 48x48 64x64 96x96; do
- install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/
- install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-%{name}.png
- ln -sf audio-x-%{name}.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-gtp.png
- ln -sf audio-x-%{name}.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-ptb.png
-done
+# to pass to ant:
+ANT_FLAGS=" \
+   -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
+   -Ddist.file=xml/build-fedora.xml \
+   -Dos.bin.dir=%{_bindir} \
+   -Ddist.jar.path=%{_datadir}/%{name}/ \
+   -Ddist.share.path=%{_datadir}/%{name}/ \
+   -Dos.lib.suffix=$LIBSUFFIX \
+   -Dos.data.dir=%{_datadir}/ \
+   -Ddist.default.style=Lavender \
+   -Ddist.doc.path=%{_docdir}/%{name}-%{version}/ \
+   -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg \
+   -Ddist.dst.path=$RPM_BUILD_ROOT"
+
+ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS install
+
+# install jnis we built
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -a TuxGuitar-*/jni/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
 
-# desktop files
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE9}
-
-# mime-type file
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
-install -pm 644 misc/%{name}.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
 
 %if %{with_gcj}
- %{_bindir}/aot-compile-rpm
+   %{_bindir}/aot-compile-rpm
 %endif
 
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-  %{_bindir}/rebuild-gcj-db
- fi
+   if [ -x %{_bindir}/rebuild-gcj-db ] 
+      then
+      %{_bindir}/rebuild-gcj-db
+   fi
 %endif
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null
 update-desktop-database &> /dev/null
@@ -153,14 +147,14 @@ update-mime-database %{_datadir}/mime  >
 
 %postun
 %if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
-  then
-  %{_bindir}/rebuild-gcj-db
- fi
+   if [ -x %{_bindir}/rebuild-gcj-db ]
+      then
+      %{_bindir}/rebuild-gcj-db
+   fi
 %endif
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
+   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
 fi
 update-desktop-database &> /dev/null
 update-mime-database %{_datadir}/mime  >& /dev/null ||:
@@ -171,8 +165,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE README COPYING
-
+%{_docdir}/%{name}-%{version}/
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/*/*
@@ -186,6 +179,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_bindir}/%{name}
 
 %changelog
+* Sat Nov 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-2
+- Change build system (we'll use our build-fedora.xml rather than patching Debian's
+  Makefile). 
+- Disable system tray and oss plugins by default.
+- Make fluidsynth/alsa/fluid soundfont combination the default output so that the
+  software works out of the box.
+
 * Sat Nov 14 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-1
 - New upstream version
 


--- tuxguitar-Makefile DELETED ---


--- tuxguitar.desktop DELETED ---



From oget at fedoraproject.org  Thu Dec 10 05:21:14 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 10 Dec 2009 05:21:14 +0000 (UTC)
Subject: rpms/tuxguitar/F-12 tuxguitar-build-fedora.xml, NONE,
	1.1 tuxguitar-plugin-properties.patch, NONE, 1.1 tuxguitar.spec,
	1.7, 1.8 tuxguitar-Makefile, 1.1, NONE tuxguitar.desktop, 1.3, NONE
Message-ID: <20091210052114.1D9A411C025D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tuxguitar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19172

Modified Files:
	tuxguitar.spec 
Added Files:
	tuxguitar-build-fedora.xml tuxguitar-plugin-properties.patch 
Removed Files:
	tuxguitar-Makefile tuxguitar.desktop 
Log Message:
* Sat Nov 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-2
- Change build system (we'll use our build-fedora.xml rather than patching Debian's
  Makefile). 
- Disable system tray and oss plugins by default.
- Make fluidsynth/alsa/fluid soundfont combination the default output so that the
  software works out of the box.



--- NEW FILE tuxguitar-build-fedora.xml ---
<?xml version="1.0" encoding="iso-8859-1"?>

<project name="Tux Guitar" basedir="." >
	<description>
		Tux-Guitar
	</description>
	<taskdef resource="net/sf/antcontrib/antlib.xml"/>

	<property name="file.properties" value="${build.path}${file.separator}config.dist" />
	<property name="file.desktop" value="tuxguitar.desktop" />
	<property name="file.mime" value="tuxguitar.xml" />
	<property name="file.script" value="tuxguitar" />
	<property name="file.plugin.properties" value="${build.path}${file.separator}plugin.properties" />
	<property name="file.fluidsynth.config" value="${build.path}${file.separator}tuxguitar-fluidsynth.cfg" />
	<property name="file.song" value="../misc/tuxguitar.tg" />
	<target name="clean" >
		<delete quiet="true" dir="tuxguitar-${dist.version}" />
	</target>

	<target name="package" />
	
	<target name="install" >
		<mkdir dir="${dist.dst.path}${os.data.dir}/applications" />
		<copy todir="${dist.dst.path}${os.data.dir}/applications/">
			<fileset file="${file.desktop}"/>
		</copy>
		<mkdir dir="${dist.dst.path}${os.data.dir}/mime/packages" />
		<copy todir="${dist.dst.path}${os.data.dir}/mime/packages">
			<fileset file="${file.mime}"/>
		</copy>
		<mkdir dir="${dist.dst.path}${os.bin.dir}" />
		<exec executable="cp" >
			<arg value="-a"/>
			<arg value="${file.script}"/>
			<arg value="${dist.dst.path}${os.bin.dir}/"/>
		</exec>
		<copy tofile="${dist.dst.path}${dist.default.song}/" >
			<fileset file="${file.song}"/>
		</copy>
		
		<for list="16,24,32,48,64,96" param="dim" >
			<sequential>
				<mkdir dir="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/apps/" />
				<mkdir dir="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/apps/tuxguitar.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-tuxguitar.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-gtp.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-ptb.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
			</sequential>
		</for>
	</target>

	<target name="build" >
		<echo file="${file.properties}" append="false">font.default=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.note=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.text=Sans,8,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.lyric=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.time-signature=Sans,13,1${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.default=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.note=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.text=Sans,8,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.lyric=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.time-signature=Sans,10,1${line.separator}</echo>
		<echo file="${file.properties}" append="true">midi.sequencer=tuxguitar.sequencer${line.separator}</echo>
		<echo file="${file.properties}" append="true">midi.port=tuxguitar-fluidsynth_${os.data.dir}/soundfonts/default.sf2${line.separator}</echo>
		<echo file="${file.properties}" append="true">skin=${dist.default.style}${line.separator}</echo>

		<echo file="${file.desktop}" append="false">[Desktop Entry]${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Version=1.0${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Name=TuxGuitar${line.separator}</echo>
		<echo file="${file.desktop}" append="true">GenericName=Tablature Editor/Playback${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment=Edit, playback guitar tablatures${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment[fr]=Edite, joue des tablatures de guitare${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment[es]=Edita, reproduce tablaturas de guitarra${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Type=Application${line.separator}</echo>
		<echo file="${file.desktop}" append="true">MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb;audio/midi;${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Categories=AudioVideo;Audio;X-Notation;${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Exec=tuxguitar %f${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Icon=tuxguitar${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Terminal=false${line.separator}</echo>

		<echo file="${file.mime}" append="false">&#60;?xml version="1.0" encoding="UTF-8"?&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">&#60;mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-tuxguitar"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;TuxGuitar file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.tg"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-gtp"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;GuitarPro file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gtp"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp3"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp4"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp5"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-ptb"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;PowerTab file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.ptb"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">&#60;/mime-info&#62;${line.separator}</echo>

		<echo file="${file.script}" append="false">#!/bin/sh${line.separator}</echo>
		<echo file="${file.script}" append="true">##SCRIPT DIR${line.separator}</echo>
		<echo file="${file.script}" append="true">DIR_NAME=`dirname "$0"`${line.separator}</echo>
		<echo file="${file.script}" append="true">DIR_NAME=`cd "$DIR_NAME"; pwd`${line.separator}</echo>
		<echo file="${file.script}" append="true">cd "${DIR_NAME}"${line.separator}</echo>
		<echo file="${file.script}" append="true">##JAVA${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ -z $JAVA ]; then${line.separator}</echo>
		<echo file="${file.script}" append="true">	JAVA=${JAVA_HOME}/bin/java${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -f ${JAVA} ] &amp;&amp; JAVA=/usr/bin/java${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -f ${JAVA} ] &amp;&amp; JAVA=java${line.separator}</echo>
		<echo file="${file.script}" append="true">fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##MOZILLA_FIVE_HOME${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ -z $MOZILLA_FIVE_HOME ]; then${line.separator}</echo>
		<echo file="${file.script}" append="true">	MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/firefox${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -d ${MOZILLA_FIVE_HOME} ] &amp;&amp; MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/mozilla${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -d ${MOZILLA_FIVE_HOME} ] &amp;&amp; MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/iceweasel${line.separator}</echo>
		<echo file="${file.script}" append="true">fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##LIBRARY_PATH${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${dist.lib.path}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib${os.lib.suffix}/jni${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MOZILLA_FIVE_HOME}${line.separator}</echo>
		<echo file="${file.script}" append="true">##CLASSPATH${line.separator}</echo>
		<echo file="${file.script}" append="true">CLASSPATH=$CLASSPATH:${dist.jar.path}${build.jar}:${lib.swt.jar}:${path.itext}:${dist.share.path}${line.separator}</echo>
		<echo file="${file.script}" append="true">##MAINCLASS${line.separator}</echo>
		<echo file="${file.script}" append="true">MAINCLASS=org.herac.tuxguitar.gui.TGMain${line.separator}</echo>
		<echo file="${file.script}" append="true">##JVM ARGUMENTS${line.separator}</echo>
		<echo file="${file.script}" append="true">VM_ARGS="-Xmx512m"${line.separator}</echo>
		<echo file="${file.script}" append="true">##EXPORT VARS${line.separator}</echo>
		<echo file="${file.script}" append="true">export CLASSPATH${line.separator}</echo>
		<echo file="${file.script}" append="true">export LD_LIBRARY_PATH${line.separator}</echo>
		<echo file="${file.script}" append="true">export MOZILLA_FIVE_HOME${line.separator}</echo>
		<echo file="${file.script}" append="true">arg=""${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ ! "$1" ] ; then arg="${dist.default.song}"; fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##LAUNCH${line.separator}</echo>
		<echo file="${file.script}" append="true">${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Dtuxguitar.share.path="${dist.share.path}" -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$1" "$2" "$arg"${line.separator}</echo>
		<chmod file="${file.script}" perm="755"/>

		<echo file="${file.plugin.properties}" append="false">org.herac.tuxguitar.player.impl.midiport.oss.MidiOutputPortProviderPlugin.enabled=false${line.separator}</echo>
		<echo file="${file.plugin.properties}" append="true">org.herac.tuxguitar.tray.TGTrayPlugin.enabled=false${line.separator}</echo>

		<echo file="${file.fluidsynth.config}" append="false">soundfont.count=1${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">soundfont.path0=${os.data.dir}/soundfonts/default.sf2${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">audio.driver=alsa${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">audio.period-size=1024${line.separator}</echo>
	</target>
	
</project>

tuxguitar-plugin-properties.patch:
 TGPluginProperties.java |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE tuxguitar-plugin-properties.patch ---
--- trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java	2008/04/24 13:53:06	99
+++ trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java	2009/11/26 13:34:24	770
@@ -7,6 +7,7 @@
 package org.herac.tuxguitar.gui.system.plugins;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.Properties;
 
 import org.herac.tuxguitar.gui.system.config.TGConfigManager;
@@ -19,6 +20,8 @@
  */
 public class TGPluginProperties  extends TGConfigManager{
 	
+	private static final String FILE_NAME = "plugin.properties";
+	
 	private static TGPluginProperties instance;
 	
 	public static TGPluginProperties instance(){
@@ -38,11 +41,19 @@
 	}
 	
 	public String getFileName(){
-		return TGFileUtils.PATH_USER_CONFIG + File.separator + "plugin.properties";
+		return TGFileUtils.PATH_USER_CONFIG + File.separator + FILE_NAME;
 	}
 	
 	public Properties getDefaults() {
-		return new Properties();
+		Properties properties = new Properties();
+		try {
+			InputStream is = TGFileUtils.getResourceAsStream(FILE_NAME);
+			if(is != null){
+				properties.load(is);
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+		return properties;
 	}
-	
 }
\ No newline at end of file


Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-12/tuxguitar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tuxguitar.spec	14 Nov 2009 06:49:59 -0000	1.7
+++ tuxguitar.spec	10 Dec 2009 05:21:13 -0000	1.8
@@ -1,14 +1,18 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Summary:          A multitrack tablature editor and player written in Java-SWT
 Name:             tuxguitar
 Version:          1.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 URL:              http://www.tuxguitar.com.ar
 Source0:          http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-# For some reason this is missing from the tarball. Downloaded from upstream trunk:
-Source1:          %{name}-Makefile
-Source9:          %{name}.desktop
+# Fedora specific build script. Accepted by upstream:
+# http://tuxguitar.svn.sourceforge.net/viewvc/tuxguitar/trunk/TuxGuitar/xml/build-fedora.xml
+Source1:          %{name}-build-fedora.xml
+# From upstream trunk, to disable certain plugins by default
+# http://tuxguitar.svn.sourceforge.net/viewvc/tuxguitar/trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java?r1=99&r2=770
+Patch0:           %{name}-plugin-properties.patch
+
 License:          LGPLv2+
 Group:            Applications/Multimedia
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,14 +21,18 @@ Requires:         itext
 Requires:         java >= 1.7
 Requires:         jpackage-utils
 Requires:         libswt3-gtk2
+Requires:         soundfont2-default
 BuildRequires:    alsa-lib-devel
 BuildRequires:    ant
+BuildRequires:    ant-contrib
+BuildRequires:    ant-nodeps
 BuildRequires:    itext
 BuildRequires:    desktop-file-utils
 BuildRequires:    fluidsynth-devel
 BuildRequires:    jack-audio-connection-kit-devel
 BuildRequires:    java-devel >= 1.7
 BuildRequires:    jpackage-utils
+
 BuildRequires:    libswt3-gtk2
 %if %{with_gcj}
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -42,110 +50,96 @@ tempo management, gp3/gp4/gp5 import and
 
 %prep
 %setup -q -n %{name}-src-%{version}
+%patch0 -p1
 
-# Place the Makefile
-cp %{SOURCE1} Makefile
-
-# The following issues were discussed in:
-# http://www.tuxguitar.com.ar/forum/4/817/need-help-with-packaging-for-fedora/
-# Declare the library path and classpath during runtime instead
-sed -i 's|env_$|env_\nexport CLASSPATH=%{_libdir}/java/swt.jar\n|' misc/tuxguitar.sh
-sed -i 's|PACKAGE_LIB:=/usr/lib/jni|PACKAGE_LIB:=%{_libdir}/%{name}|' misc/tuxguitar.sh
-# Add exec to replace the called shell
-sed -i 's|${JAVA} ${JAVA_FLAGS}|exec ${JAVA} ${JAVA_FLAGS}|' misc/tuxguitar.sh
-
-# Change /lib to %%{_lib}, just in case
-sed -i 's|/lib/|/%{_lib}/|g' Makefile
-sed -i 's|/lib/|/%{_lib}/|g' misc/tuxguitar.sh
-sed -i 's|/lib|/%{_lib}|g' TuxGuitar/xml/build-linux.xml
-# Don't strip the binaries during %%install
-sed -i 's/install -s/install -m 755/g' Makefile
-
-# Enable extra plugins:
-sed -i 's|TuxGuitar-pdf \\|\\\
- TuxGuitar-pdf \\\
- TuxGuitar-browser-ftp \\\
- TuxGuitar-gervill \\|' \
- Makefile
-sed -i 's|\./TuxGuitar-pdf/tuxguitar-pdf\.jar|\\\
- \./TuxGuitar-pdf/tuxguitar-pdf\.jar \\\
- \./TuxGuitar-browser-ftp/tuxguitar-browser-ftp\.jar \\\
- \./TuxGuitar-gervill/tuxguitar-gervill\.jar|' \
- Makefile
-sed -i 's|\./TuxGuitar-oss/tuxguitar-oss\.jar|\\\
- \./TuxGuitar-jack/tuxguitar-jack\.jar \\\
- \./TuxGuitar-jack/jni/libtuxguitar-jack-jni\.so \\\
- \./TuxGuitar-oss/tuxguitar-oss\.jar|' \
- Makefile
+cp %{SOURCE1} TuxGuitar/xml/build-fedora.xml
 
 # Set debug="true" on javac part of the build scripts.
 for file in $(find . -name build.xml); do
- sed -i 's|debug="false"|debug="true"|' $file
+   sed -i 's|debug="false"|debug="true"|' $file
 done
 
 
 %build
-# Does not compile with %%{?_smp_mflags}. Build using openjdk. 
-# SWT_JAR=$(build-classpath swt) does not work here ???
-make SWT_JAR=%{_libdir}/java/swt.jar \
-     CFLAGS="${RPM_OPT_FLAGS} \
-             -I%{_jvmdir}/java-openjdk/include \
-             -I%{_jvmdir}/java-openjdk/include/linux \
-             -fPIC"
+# Plugins to build:
+PLUGINS="alsa ascii browser-ftp community compat converter fluidsynth gervill\
+         gtp jack jsa lilypond midi musicxml oss pdf ptb tef tray"
+
+# JNI's to build
+JNIS="alsa fluidsynth jack oss"
+
+LIBSUFFIX=$(echo %{_lib}|sed 's|lib||')
+
+# to pass to ant:
+ANT_FLAGS=" \
+   -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
+   -Dpath.itext=%{_javadir}/itext.jar \
+   -Dpath.swt=%{_libdir}/java/swt.jar \
+   -Dlib.swt.jar=%{_libdir}/java/swt.jar \
+   -Ddist.lib.path=%{_libdir}/%{name}/ \
+   -Ddist.file=xml/build-fedora.xml \
+   -Ddist.jar.path=%{_datadir}/%{name}/ \
+   -Ddist.share.path=%{_datadir}/%{name}/ \
+   -Dos.lib.suffix=$LIBSUFFIX \
+   -Dos.data.dir=%{_datadir}/ \
+   -Ddist.default.style=Lavender \
+   -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg"
+
+# build jars
+ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS all
+for jarname in $PLUGINS; do
+   ant -f TuxGuitar-$jarname/build.xml -v -d $ANT_FLAGS \
+      -Dbuild.jar=../TuxGuitar/share/plugins/tuxguitar-$jarname.jar all
+done
+
+# build jnis
+for jni in $JNIS; do
+   make -C TuxGuitar-$jni/jni %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS} \
+              -I%{_jvmdir}/java-openjdk/include \
+              -I%{_jvmdir}/java-openjdk/include/linux \
+              -fPIC"
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_LIB_DIR=$RPM_BUILD_ROOT/%_libdir/%name install
-install -dm 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_LIB_DIR=$RPM_BUILD_ROOT/%_libdir/%name install-linux
-
-# Makefile does not install the plugins by default so install them manually
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins
-
-for jardir in TuxGuitar-*; do
- if [ -e $jardir/*jar ]
- then 
-  install -m 644 $jardir/*jar  $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins/
- fi
-done
 
-# icons
-for dim in 16x16 24x24 32x32 48x48 64x64 96x96; do
- install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/
- install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-%{name}.png
- ln -sf audio-x-%{name}.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-gtp.png
- ln -sf audio-x-%{name}.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-ptb.png
-done
+# to pass to ant:
+ANT_FLAGS=" \
+   -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
+   -Ddist.file=xml/build-fedora.xml \
+   -Dos.bin.dir=%{_bindir} \
+   -Ddist.jar.path=%{_datadir}/%{name}/ \
+   -Ddist.share.path=%{_datadir}/%{name}/ \
+   -Dos.lib.suffix=$LIBSUFFIX \
+   -Dos.data.dir=%{_datadir}/ \
+   -Ddist.default.style=Lavender \
+   -Ddist.doc.path=%{_docdir}/%{name}-%{version}/ \
+   -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg \
+   -Ddist.dst.path=$RPM_BUILD_ROOT"
+
+ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS install
+
+# install jnis we built
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -a TuxGuitar-*/jni/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
 
-# desktop files
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE9}
-
-# mime-type file
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
-install -pm 644 misc/%{name}.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
 
 %if %{with_gcj}
- %{_bindir}/aot-compile-rpm
+   %{_bindir}/aot-compile-rpm
 %endif
 
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-  %{_bindir}/rebuild-gcj-db
- fi
+   if [ -x %{_bindir}/rebuild-gcj-db ] 
+      then
+      %{_bindir}/rebuild-gcj-db
+   fi
 %endif
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null
 update-desktop-database &> /dev/null
@@ -153,14 +147,14 @@ update-mime-database %{_datadir}/mime  >
 
 %postun
 %if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
-  then
-  %{_bindir}/rebuild-gcj-db
- fi
+   if [ -x %{_bindir}/rebuild-gcj-db ]
+      then
+      %{_bindir}/rebuild-gcj-db
+   fi
 %endif
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
+   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
 fi
 update-desktop-database &> /dev/null
 update-mime-database %{_datadir}/mime  >& /dev/null ||:
@@ -171,8 +165,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE README COPYING
-
+%{_docdir}/%{name}-%{version}/
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/*/*
@@ -186,6 +179,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_bindir}/%{name}
 
 %changelog
+* Sat Nov 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-2
+- Change build system (we'll use our build-fedora.xml rather than patching Debian's
+  Makefile). 
+- Disable system tray and oss plugins by default.
+- Make fluidsynth/alsa/fluid soundfont combination the default output so that the
+  software works out of the box.
+
 * Sat Nov 14 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-1
 - New upstream version
 


--- tuxguitar-Makefile DELETED ---


--- tuxguitar.desktop DELETED ---



From oget at fedoraproject.org  Thu Dec 10 05:22:53 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 10 Dec 2009 05:22:53 +0000 (UTC)
Subject: rpms/tuxguitar/F-11 tuxguitar-build-fedora.xml, NONE,
	1.1 tuxguitar-plugin-properties.patch, NONE, 1.1 tuxguitar.spec,
	1.5, 1.6 tuxguitar-Makefile, 1.1, NONE tuxguitar.desktop, 1.2, NONE
Message-ID: <20091210052253.7200F11C025D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tuxguitar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19753

Modified Files:
	tuxguitar.spec 
Added Files:
	tuxguitar-build-fedora.xml tuxguitar-plugin-properties.patch 
Removed Files:
	tuxguitar-Makefile tuxguitar.desktop 
Log Message:
* Sat Nov 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-2
- Change build system (we'll use our build-fedora.xml rather than patching Debian's
  Makefile). 
- Disable system tray and oss plugins by default.
- Make fluidsynth/alsa/fluid soundfont combination the default output so that the
  software works out of the box.



--- NEW FILE tuxguitar-build-fedora.xml ---
<?xml version="1.0" encoding="iso-8859-1"?>

<project name="Tux Guitar" basedir="." >
	<description>
		Tux-Guitar
	</description>
	<taskdef resource="net/sf/antcontrib/antlib.xml"/>

	<property name="file.properties" value="${build.path}${file.separator}config.dist" />
	<property name="file.desktop" value="tuxguitar.desktop" />
	<property name="file.mime" value="tuxguitar.xml" />
	<property name="file.script" value="tuxguitar" />
	<property name="file.plugin.properties" value="${build.path}${file.separator}plugin.properties" />
	<property name="file.fluidsynth.config" value="${build.path}${file.separator}tuxguitar-fluidsynth.cfg" />
	<property name="file.song" value="../misc/tuxguitar.tg" />
	<target name="clean" >
		<delete quiet="true" dir="tuxguitar-${dist.version}" />
	</target>

	<target name="package" />
	
	<target name="install" >
		<mkdir dir="${dist.dst.path}${os.data.dir}/applications" />
		<copy todir="${dist.dst.path}${os.data.dir}/applications/">
			<fileset file="${file.desktop}"/>
		</copy>
		<mkdir dir="${dist.dst.path}${os.data.dir}/mime/packages" />
		<copy todir="${dist.dst.path}${os.data.dir}/mime/packages">
			<fileset file="${file.mime}"/>
		</copy>
		<mkdir dir="${dist.dst.path}${os.bin.dir}" />
		<exec executable="cp" >
			<arg value="-a"/>
			<arg value="${file.script}"/>
			<arg value="${dist.dst.path}${os.bin.dir}/"/>
		</exec>
		<copy tofile="${dist.dst.path}${dist.default.song}/" >
			<fileset file="${file.song}"/>
		</copy>
		
		<for list="16,24,32,48,64,96" param="dim" >
			<sequential>
				<mkdir dir="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/apps/" />
				<mkdir dir="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/apps/tuxguitar.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-tuxguitar.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-gtp.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
				<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-ptb.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
			</sequential>
		</for>
	</target>

	<target name="build" >
		<echo file="${file.properties}" append="false">font.default=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.note=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.text=Sans,8,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.lyric=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.time-signature=Sans,13,1${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.default=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.note=Sans,6,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.text=Sans,8,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.lyric=Sans,7,0${line.separator}</echo>
		<echo file="${file.properties}" append="true">font.printer.time-signature=Sans,10,1${line.separator}</echo>
		<echo file="${file.properties}" append="true">midi.sequencer=tuxguitar.sequencer${line.separator}</echo>
		<echo file="${file.properties}" append="true">midi.port=tuxguitar-fluidsynth_${os.data.dir}/soundfonts/default.sf2${line.separator}</echo>
		<echo file="${file.properties}" append="true">skin=${dist.default.style}${line.separator}</echo>

		<echo file="${file.desktop}" append="false">[Desktop Entry]${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Version=1.0${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Name=TuxGuitar${line.separator}</echo>
		<echo file="${file.desktop}" append="true">GenericName=Tablature Editor/Playback${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment=Edit, playback guitar tablatures${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment[fr]=Edite, joue des tablatures de guitare${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Comment[es]=Edita, reproduce tablaturas de guitarra${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Type=Application${line.separator}</echo>
		<echo file="${file.desktop}" append="true">MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb;audio/midi;${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Categories=AudioVideo;Audio;X-Notation;${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Exec=tuxguitar %f${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Icon=tuxguitar${line.separator}</echo>
		<echo file="${file.desktop}" append="true">Terminal=false${line.separator}</echo>

		<echo file="${file.mime}" append="false">&#60;?xml version="1.0" encoding="UTF-8"?&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">&#60;mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-tuxguitar"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;TuxGuitar file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.tg"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-gtp"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;GuitarPro file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gtp"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp3"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp4"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.gp5"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;mime-type type="audio/x-ptb"&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;comment&#62;PowerTab file&#60;/comment&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">		&#60;glob pattern="*.ptb"/&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">	&#60;/mime-type&#62;${line.separator}</echo>
		<echo file="${file.mime}" append="true">&#60;/mime-info&#62;${line.separator}</echo>

		<echo file="${file.script}" append="false">#!/bin/sh${line.separator}</echo>
		<echo file="${file.script}" append="true">##SCRIPT DIR${line.separator}</echo>
		<echo file="${file.script}" append="true">DIR_NAME=`dirname "$0"`${line.separator}</echo>
		<echo file="${file.script}" append="true">DIR_NAME=`cd "$DIR_NAME"; pwd`${line.separator}</echo>
		<echo file="${file.script}" append="true">cd "${DIR_NAME}"${line.separator}</echo>
		<echo file="${file.script}" append="true">##JAVA${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ -z $JAVA ]; then${line.separator}</echo>
		<echo file="${file.script}" append="true">	JAVA=${JAVA_HOME}/bin/java${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -f ${JAVA} ] &amp;&amp; JAVA=/usr/bin/java${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -f ${JAVA} ] &amp;&amp; JAVA=java${line.separator}</echo>
		<echo file="${file.script}" append="true">fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##MOZILLA_FIVE_HOME${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ -z $MOZILLA_FIVE_HOME ]; then${line.separator}</echo>
		<echo file="${file.script}" append="true">	MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/firefox${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -d ${MOZILLA_FIVE_HOME} ] &amp;&amp; MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/mozilla${line.separator}</echo>
		<echo file="${file.script}" append="true">	[ ! -d ${MOZILLA_FIVE_HOME} ] &amp;&amp; MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/iceweasel${line.separator}</echo>
		<echo file="${file.script}" append="true">fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##LIBRARY_PATH${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${dist.lib.path}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib${os.lib.suffix}/jni${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib${os.lib.suffix}${line.separator}</echo>
		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MOZILLA_FIVE_HOME}${line.separator}</echo>
		<echo file="${file.script}" append="true">##CLASSPATH${line.separator}</echo>
		<echo file="${file.script}" append="true">CLASSPATH=$CLASSPATH:${dist.jar.path}${build.jar}:${lib.swt.jar}:${path.itext}:${dist.share.path}${line.separator}</echo>
		<echo file="${file.script}" append="true">##MAINCLASS${line.separator}</echo>
		<echo file="${file.script}" append="true">MAINCLASS=org.herac.tuxguitar.gui.TGMain${line.separator}</echo>
		<echo file="${file.script}" append="true">##JVM ARGUMENTS${line.separator}</echo>
		<echo file="${file.script}" append="true">VM_ARGS="-Xmx512m"${line.separator}</echo>
		<echo file="${file.script}" append="true">##EXPORT VARS${line.separator}</echo>
		<echo file="${file.script}" append="true">export CLASSPATH${line.separator}</echo>
		<echo file="${file.script}" append="true">export LD_LIBRARY_PATH${line.separator}</echo>
		<echo file="${file.script}" append="true">export MOZILLA_FIVE_HOME${line.separator}</echo>
		<echo file="${file.script}" append="true">arg=""${line.separator}</echo>
		<echo file="${file.script}" append="true">if [ ! "$1" ] ; then arg="${dist.default.song}"; fi${line.separator}</echo>
		<echo file="${file.script}" append="true">##LAUNCH${line.separator}</echo>
		<echo file="${file.script}" append="true">${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Dtuxguitar.share.path="${dist.share.path}" -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$1" "$2" "$arg"${line.separator}</echo>
		<chmod file="${file.script}" perm="755"/>

		<echo file="${file.plugin.properties}" append="false">org.herac.tuxguitar.player.impl.midiport.oss.MidiOutputPortProviderPlugin.enabled=false${line.separator}</echo>
		<echo file="${file.plugin.properties}" append="true">org.herac.tuxguitar.tray.TGTrayPlugin.enabled=false${line.separator}</echo>

		<echo file="${file.fluidsynth.config}" append="false">soundfont.count=1${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">soundfont.path0=${os.data.dir}/soundfonts/default.sf2${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">audio.driver=alsa${line.separator}</echo>
		<echo file="${file.fluidsynth.config}" append="true">audio.period-size=1024${line.separator}</echo>
	</target>
	
</project>

tuxguitar-plugin-properties.patch:
 TGPluginProperties.java |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE tuxguitar-plugin-properties.patch ---
--- trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java	2008/04/24 13:53:06	99
+++ trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java	2009/11/26 13:34:24	770
@@ -7,6 +7,7 @@
 package org.herac.tuxguitar.gui.system.plugins;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.Properties;
 
 import org.herac.tuxguitar.gui.system.config.TGConfigManager;
@@ -19,6 +20,8 @@
  */
 public class TGPluginProperties  extends TGConfigManager{
 	
+	private static final String FILE_NAME = "plugin.properties";
+	
 	private static TGPluginProperties instance;
 	
 	public static TGPluginProperties instance(){
@@ -38,11 +41,19 @@
 	}
 	
 	public String getFileName(){
-		return TGFileUtils.PATH_USER_CONFIG + File.separator + "plugin.properties";
+		return TGFileUtils.PATH_USER_CONFIG + File.separator + FILE_NAME;
 	}
 	
 	public Properties getDefaults() {
-		return new Properties();
+		Properties properties = new Properties();
+		try {
+			InputStream is = TGFileUtils.getResourceAsStream(FILE_NAME);
+			if(is != null){
+				properties.load(is);
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+		return properties;
 	}
-	
 }
\ No newline at end of file


Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-11/tuxguitar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tuxguitar.spec	14 Nov 2009 06:57:44 -0000	1.5
+++ tuxguitar.spec	10 Dec 2009 05:22:53 -0000	1.6
@@ -1,14 +1,18 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Summary:          A multitrack tablature editor and player written in Java-SWT
 Name:             tuxguitar
 Version:          1.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 URL:              http://www.tuxguitar.com.ar
 Source0:          http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-# For some reason this is missing from the tarball. Downloaded from upstream trunk:
-Source1:          %{name}-Makefile
-Source9:          %{name}.desktop
+# Fedora specific build script. Accepted by upstream:
+# http://tuxguitar.svn.sourceforge.net/viewvc/tuxguitar/trunk/TuxGuitar/xml/build-fedora.xml
+Source1:          %{name}-build-fedora.xml
+# From upstream trunk, to disable certain plugins by default
+# http://tuxguitar.svn.sourceforge.net/viewvc/tuxguitar/trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java?r1=99&r2=770
+Patch0:           %{name}-plugin-properties.patch
+
 License:          LGPLv2+
 Group:            Applications/Multimedia
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,14 +21,18 @@ Requires:         itext
 Requires:         java >= 1.7
 Requires:         jpackage-utils
 Requires:         libswt3-gtk2
+Requires:         soundfont2-default
 BuildRequires:    alsa-lib-devel
 BuildRequires:    ant
+BuildRequires:    ant-contrib
+BuildRequires:    ant-nodeps
 BuildRequires:    itext
 BuildRequires:    desktop-file-utils
 BuildRequires:    fluidsynth-devel
 BuildRequires:    jack-audio-connection-kit-devel
 BuildRequires:    java-devel >= 1.7
 BuildRequires:    jpackage-utils
+
 BuildRequires:    libswt3-gtk2
 %if %{with_gcj}
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -42,110 +50,96 @@ tempo management, gp3/gp4/gp5 import and
 
 %prep
 %setup -q -n %{name}-src-%{version}
+%patch0 -p1
 
-# Place the Makefile
-cp %{SOURCE1} Makefile
-
-# The following issues were discussed in:
-# http://www.tuxguitar.com.ar/forum/4/817/need-help-with-packaging-for-fedora/
-# Declare the library path and classpath during runtime instead
-sed -i 's|env_$|env_\nexport CLASSPATH=%{_libdir}/java/swt.jar\n|' misc/tuxguitar.sh
-sed -i 's|PACKAGE_LIB:=/usr/lib/jni|PACKAGE_LIB:=%{_libdir}/%{name}|' misc/tuxguitar.sh
-# Add exec to replace the called shell
-sed -i 's|${JAVA} ${JAVA_FLAGS}|exec ${JAVA} ${JAVA_FLAGS}|' misc/tuxguitar.sh
-
-# Change /lib to %%{_lib}, just in case
-sed -i 's|/lib/|/%{_lib}/|g' Makefile
-sed -i 's|/lib/|/%{_lib}/|g' misc/tuxguitar.sh
-sed -i 's|/lib|/%{_lib}|g' TuxGuitar/xml/build-linux.xml
-# Don't strip the binaries during %%install
-sed -i 's/install -s/install -m 755/g' Makefile
-
-# Enable extra plugins:
-sed -i 's|TuxGuitar-pdf \\|\\\
- TuxGuitar-pdf \\\
- TuxGuitar-browser-ftp \\\
- TuxGuitar-gervill \\|' \
- Makefile
-sed -i 's|\./TuxGuitar-pdf/tuxguitar-pdf\.jar|\\\
- \./TuxGuitar-pdf/tuxguitar-pdf\.jar \\\
- \./TuxGuitar-browser-ftp/tuxguitar-browser-ftp\.jar \\\
- \./TuxGuitar-gervill/tuxguitar-gervill\.jar|' \
- Makefile
-sed -i 's|\./TuxGuitar-oss/tuxguitar-oss\.jar|\\\
- \./TuxGuitar-jack/tuxguitar-jack\.jar \\\
- \./TuxGuitar-jack/jni/libtuxguitar-jack-jni\.so \\\
- \./TuxGuitar-oss/tuxguitar-oss\.jar|' \
- Makefile
+cp %{SOURCE1} TuxGuitar/xml/build-fedora.xml
 
 # Set debug="true" on javac part of the build scripts.
 for file in $(find . -name build.xml); do
- sed -i 's|debug="false"|debug="true"|' $file
+   sed -i 's|debug="false"|debug="true"|' $file
 done
 
 
 %build
-# Does not compile with %%{?_smp_mflags}. Build using openjdk. 
-# SWT_JAR=$(build-classpath swt) does not work here ???
-make SWT_JAR=%{_libdir}/java/swt.jar \
-     CFLAGS="${RPM_OPT_FLAGS} \
-             -I%{_jvmdir}/java-openjdk/include \
-             -I%{_jvmdir}/java-openjdk/include/linux \
-             -fPIC"
+# Plugins to build:
+PLUGINS="alsa ascii browser-ftp community compat converter fluidsynth gervill\
+         gtp jack jsa lilypond midi musicxml oss pdf ptb tef tray"
+
+# JNI's to build
+JNIS="alsa fluidsynth jack oss"
+
+LIBSUFFIX=$(echo %{_lib}|sed 's|lib||')
+
+# to pass to ant:
+ANT_FLAGS=" \
+   -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
+   -Dpath.itext=%{_javadir}/itext.jar \
+   -Dpath.swt=%{_libdir}/java/swt.jar \
+   -Dlib.swt.jar=%{_libdir}/java/swt.jar \
+   -Ddist.lib.path=%{_libdir}/%{name}/ \
+   -Ddist.file=xml/build-fedora.xml \
+   -Ddist.jar.path=%{_datadir}/%{name}/ \
+   -Ddist.share.path=%{_datadir}/%{name}/ \
+   -Dos.lib.suffix=$LIBSUFFIX \
+   -Dos.data.dir=%{_datadir}/ \
+   -Ddist.default.style=Lavender \
+   -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg"
+
+# build jars
+ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS all
+for jarname in $PLUGINS; do
+   ant -f TuxGuitar-$jarname/build.xml -v -d $ANT_FLAGS \
+      -Dbuild.jar=../TuxGuitar/share/plugins/tuxguitar-$jarname.jar all
+done
+
+# build jnis
+for jni in $JNIS; do
+   make -C TuxGuitar-$jni/jni %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS} \
+              -I%{_jvmdir}/java-openjdk/include \
+              -I%{_jvmdir}/java-openjdk/include/linux \
+              -fPIC"
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_LIB_DIR=$RPM_BUILD_ROOT/%_libdir/%name install
-install -dm 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_LIB_DIR=$RPM_BUILD_ROOT/%_libdir/%name install-linux
-
-# Makefile does not install the plugins by default so install them manually
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins
-
-for jardir in TuxGuitar-*; do
- if [ -e $jardir/*jar ]
- then 
-  install -m 644 $jardir/*jar  $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins/
- fi
-done
 
-# icons
-for dim in 16x16 24x24 32x32 48x48 64x64 96x96; do
- install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/
- install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-%{name}.png
- ln -sf audio-x-%{name}.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-gtp.png
- ln -sf audio-x-%{name}.png \
-  $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-ptb.png
-done
+# to pass to ant:
+ANT_FLAGS=" \
+   -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
+   -Ddist.file=xml/build-fedora.xml \
+   -Dos.bin.dir=%{_bindir} \
+   -Ddist.jar.path=%{_datadir}/%{name}/ \
+   -Ddist.share.path=%{_datadir}/%{name}/ \
+   -Dos.lib.suffix=$LIBSUFFIX \
+   -Dos.data.dir=%{_datadir}/ \
+   -Ddist.default.style=Lavender \
+   -Ddist.doc.path=%{_docdir}/%{name}-%{version}/ \
+   -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg \
+   -Ddist.dst.path=$RPM_BUILD_ROOT"
+
+ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS install
+
+# install jnis we built
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -a TuxGuitar-*/jni/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
 
-# desktop files
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE9}
-
-# mime-type file
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
-install -pm 644 misc/%{name}.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
 
 %if %{with_gcj}
- %{_bindir}/aot-compile-rpm
+   %{_bindir}/aot-compile-rpm
 %endif
 
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-  %{_bindir}/rebuild-gcj-db
- fi
+   if [ -x %{_bindir}/rebuild-gcj-db ] 
+      then
+      %{_bindir}/rebuild-gcj-db
+   fi
 %endif
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null
 update-desktop-database &> /dev/null
@@ -153,14 +147,14 @@ update-mime-database %{_datadir}/mime  >
 
 %postun
 %if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
-  then
-  %{_bindir}/rebuild-gcj-db
- fi
+   if [ -x %{_bindir}/rebuild-gcj-db ]
+      then
+      %{_bindir}/rebuild-gcj-db
+   fi
 %endif
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
+   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
 fi
 update-desktop-database &> /dev/null
 update-mime-database %{_datadir}/mime  >& /dev/null ||:
@@ -171,8 +165,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE README COPYING
-
+%{_docdir}/%{name}-%{version}/
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/*/*
@@ -186,6 +179,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_bindir}/%{name}
 
 %changelog
+* Sat Nov 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-2
+- Change build system (we'll use our build-fedora.xml rather than patching Debian's
+  Makefile). 
+- Disable system tray and oss plugins by default.
+- Make fluidsynth/alsa/fluid soundfont combination the default output so that the
+  software works out of the box.
+
 * Sat Nov 14 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-1
 - New upstream version
 


--- tuxguitar-Makefile DELETED ---


--- tuxguitar.desktop DELETED ---



From phuang at fedoraproject.org  Thu Dec 10 05:33:29 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 10 Dec 2009 05:33:29 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.96,1.97
Message-ID: <20091210053329.7705711C025D@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23174

Modified Files:
	ibus.spec 
Log Message:
Fix rpmlint warnings and errors


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ibus.spec	4 Dec 2009 08:53:33 -0000	1.96
+++ ibus.spec	10 Dec 2009 05:33:29 -0000	1.97
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.2.0.20091204
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -59,9 +59,7 @@ Obsoletes:  ibus-qt < 1.1.0
 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
 
 %description
-IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
-full featured and user friendly input method user interface. It also may help
-developers to develop input method easily.
+IBus means Intelligent Input Bus. It is an input framework for Linux OS.
 
 %package libs
 Summary:    IBus libraries
@@ -109,7 +107,7 @@ The ibus-devel-docs package contains dev
 
 %build
 %configure --disable-static \
-	   --disable-iso-codes-check \
+           --disable-iso-codes-check \
            --enable-gtk-doc \
            --disable-qt4-immodule
 # make -C po update-gmo
@@ -151,14 +149,14 @@ gconftool-2 --makefile-install-rule %{_s
 
 %pre
 if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
 fi
 
 %preun
 if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
 fi
 
 %postun
@@ -220,9 +218,13 @@ fi
 %{_libdir}/pkgconfig/*
 
 %files devel-docs
+%defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Dec 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-2
+- Fix rpmlint warnings and errors.
+
 * Fri Dec 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
 - Update to 1.2.0.20091204
 - Fix Bug 529920 - language panel pops up on the wrong monitor
@@ -423,7 +425,7 @@ fi
 
 * Tue Feb 25 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090225-1
 - Update to ibus-1.1.0.20090225.
-- Fix problems in %post and %postun scripts.
+- Fix problems in %%post and %%postun scripts.
 - Hide ibus & ibus preferences menu items.
 
 * Tue Feb 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-10



From jcollie at fedoraproject.org  Thu Dec 10 05:37:13 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 10 Dec 2009 05:37:13 +0000 (UTC)
Subject: File asterisk-1.6.2.0-rc8.tar.gz uploaded to lookaside cache by
	jcollie
Message-ID: <20091210053713.3C29610F87F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for asterisk:

05d30e55bfe79d1022f30f3a93453c42  asterisk-1.6.2.0-rc8.tar.gz



From jcollie at fedoraproject.org  Thu Dec 10 05:37:15 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 10 Dec 2009 05:37:15 +0000 (UTC)
Subject: File asterisk-1.6.2.0-rc8.tar.gz.asc uploaded to lookaside cache by
	jcollie
Message-ID: <20091210053715.7127D10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for asterisk:

d52dc03dd959a55c501185fb19457121  asterisk-1.6.2.0-rc8.tar.gz.asc



From phuang at fedoraproject.org  Thu Dec 10 05:50:02 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 10 Dec 2009 05:50:02 +0000 (UTC)
Subject: rpms/ibus/F-12 ibus.spec,1.98,1.99
Message-ID: <20091210055002.62C4911C03F6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28190

Modified Files:
	ibus.spec 
Log Message:
Fix rpmlint warnings and errors


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- ibus.spec	4 Dec 2009 08:53:05 -0000	1.98
+++ ibus.spec	10 Dec 2009 05:50:01 -0000	1.99
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.2.0.20091204
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -59,9 +59,7 @@ Obsoletes:  ibus-qt < 1.1.0
 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
 
 %description
-IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
-full featured and user friendly input method user interface. It also may help
-developers to develop input method easily.
+IBus means Intelligent Input Bus. It is an input framework for Linux OS.
 
 %package libs
 Summary:    IBus libraries
@@ -109,7 +107,7 @@ The ibus-devel-docs package contains dev
 
 %build
 %configure --disable-static \
-	   --disable-iso-codes-check \
+           --disable-iso-codes-check \
            --enable-gtk-doc \
            --disable-qt4-immodule
 # make -C po update-gmo
@@ -151,14 +149,14 @@ gconftool-2 --makefile-install-rule %{_s
 
 %pre
 if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
 fi
 
 %preun
 if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
 fi
 
 %postun
@@ -220,9 +218,13 @@ fi
 %{_libdir}/pkgconfig/*
 
 %files devel-docs
+%defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Dec 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-2
+- Fix rpmlint warnings and errors.
+
 * Fri Dec 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-1
 - Update to 1.2.0.20091204
 - Fix Bug 529920 - language panel pops up on the wrong monitor
@@ -423,7 +425,7 @@ fi
 
 * Tue Feb 25 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090225-1
 - Update to ibus-1.1.0.20090225.
-- Fix problems in %post and %postun scripts.
+- Fix problems in %%post and %%postun scripts.
 - Hide ibus & ibus preferences menu items.
 
 * Tue Feb 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20090211-10



From jcollie at fedoraproject.org  Thu Dec 10 05:55:07 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 10 Dec 2009 05:55:07 +0000 (UTC)
Subject: rpms/asterisk/devel .cvsignore, 1.29, 1.30 asterisk.spec, 1.67,
	1.68 sources, 1.29, 1.30
Message-ID: <20091210055507.CEC5311C025D@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30125

Modified Files:
	.cvsignore asterisk.spec sources 
Log Message:
* Wed Dec  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.16.rc8
- Update to 1.6.2.0-rc8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	2 Dec 2009 19:44:42 -0000	1.29
+++ .cvsignore	10 Dec 2009 05:55:06 -0000	1.30
@@ -1,2 +1,2 @@
-asterisk-1.6.2.0-rc7.tar.gz
-asterisk-1.6.2.0-rc7.tar.gz.asc
+asterisk-1.6.2.0-rc8.tar.gz
+asterisk-1.6.2.0-rc8.tar.gz.asc


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- asterisk.spec	2 Dec 2009 19:44:42 -0000	1.67
+++ asterisk.spec	10 Dec 2009 05:55:07 -0000	1.68
@@ -1,8 +1,8 @@
-%define _rc 7
+%define _rc 8
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.15%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.16%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -1039,6 +1039,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Wed Dec  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.16.rc8
+- Update to 1.6.2.0-rc8
+
 * Wed Dec  2 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.15.rc7
 - Update to 1.6.2.0-rc7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	2 Dec 2009 19:44:42 -0000	1.29
+++ sources	10 Dec 2009 05:55:07 -0000	1.30
@@ -1,2 +1,2 @@
-67d90f1a7af5a3dcf5de9b342e7f21a9  asterisk-1.6.2.0-rc7.tar.gz
-07f681e122e18ff201a0662cb6a02198  asterisk-1.6.2.0-rc7.tar.gz.asc
+05d30e55bfe79d1022f30f3a93453c42  asterisk-1.6.2.0-rc8.tar.gz
+d52dc03dd959a55c501185fb19457121  asterisk-1.6.2.0-rc8.tar.gz.asc



From mclasen at fedoraproject.org  Thu Dec 10 05:55:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 05:55:17 +0000 (UTC)
Subject: rpms/libxklavier/devel catch-more-xerrors.patch, NONE,
	1.1 libxklavier.spec, 1.53, 1.54
Message-ID: <20091210055517.A7FCA11C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libxklavier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29742

Modified Files:
	libxklavier.spec 
Added Files:
	catch-more-xerrors.patch 
Log Message:
Catch more X errors


catch-more-xerrors.patch:
 xklavier_evt.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE catch-more-xerrors.patch ---
diff -up libxklavier-4.0/libxklavier/xklavier_evt.c.xerrors libxklavier-4.0/libxklavier/xklavier_evt.c
--- libxklavier-4.0/libxklavier/xklavier_evt.c.xerrors	2009-12-10 00:50:24.786868859 -0500
+++ libxklavier-4.0/libxklavier/xklavier_evt.c	2009-12-10 00:51:23.563118385 -0500
@@ -508,6 +508,7 @@ xkl_process_error(Display * dpy, XErrorE
 	case BadAccess:
 	case BadDrawable:
 	case BadWindow:
+	case BadMatch:
 		{
 			XGetErrorText(evt->display, evt->error_code, buf,
 				      sizeof(buf));


Index: libxklavier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- libxklavier.spec	2 Nov 2009 05:33:13 -0000	1.53
+++ libxklavier.spec	10 Dec 2009 05:55:17 -0000	1.54
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	4.0
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-7
+- Catch more X errors
+
 * Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-6
 - Incorporate upstream fixes for XInput error handling
 



From chitlesh at fedoraproject.org  Thu Dec 10 05:59:10 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 05:59:10 +0000 (UTC)
Subject: File toped-0.9.51-r1331.tar.bz2 uploaded to lookaside cache by
	chitlesh
Message-ID: <20091210055910.6923910F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for toped:

7e31fbe0bc79d291471cdd975152c0b9  toped-0.9.51-r1331.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 10 05:59:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 05:59:28 +0000 (UTC)
Subject: rpms/libxklavier/devel libxklavier.spec,1.54,1.55
Message-ID: <20091210055928.0DB5F11C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libxklavier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31577

Modified Files:
	libxklavier.spec 
Log Message:
applying the patch



Index: libxklavier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- libxklavier.spec	10 Dec 2009 05:55:17 -0000	1.54
+++ libxklavier.spec	10 Dec 2009 05:59:27 -0000	1.55
@@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
 Patch1: xinput-fixes.patch
+Patch2: catch-more-xerrors.patch
 
 %description
 libxklavier is a library providing a high-level API for the X Keyboard
@@ -40,6 +41,7 @@ needed to develop libxklavier applicatio
 %setup -q
 %patch0 -p1 -b .flags
 %patch1 -p0 -b .xinput
+%patch2 -p1 -b .catch-more-xerrors
 
 %build
 



From chitlesh at fedoraproject.org  Thu Dec 10 05:59:40 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 05:59:40 +0000 (UTC)
Subject: rpms/toped/F-11 .cvsignore, 1.9, 1.10 import.log, 1.6, 1.7 sources, 
	1.9, 1.10 toped.spec, 1.18, 1.19
Message-ID: <20091210055940.7027211C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/toped/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31817/F-11

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
fixed crash with Mesa DRI on Intel(R) 945GM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Oct 2009 11:39:26 -0000	1.9
+++ .cvsignore	10 Dec 2009 05:59:40 -0000	1.10
@@ -1 +1 @@
-toped-0.9.5.tar.bz2
+toped-0.9.51-r1331.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	4 Oct 2009 11:39:26 -0000	1.6
+++ import.log	10 Dec 2009 05:59:40 -0000	1.7
@@ -4,3 +4,4 @@ toped-0_9_2-2_fc9:HEAD:toped-0.9.2-2.fc9
 toped-0_9_2-4_fc11:HEAD:toped-0.9.2-4.fc11.src.rpm:1238345726
 toped-0_9_4-1_fc11:F-11:toped-0.9.4-1.fc11.src.rpm:1249374408
 toped-0_9_5-1_fc11:F-11:toped-0.9.5-1.fc11.src.rpm:1254655837
+toped-0_9_51-1_fc12:F-11:toped-0.9.51-1.fc12.src.rpm:1260424699


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Oct 2009 11:39:26 -0000	1.9
+++ sources	10 Dec 2009 05:59:40 -0000	1.10
@@ -1 +1 @@
-8c0e045d88bd4fc55b2cc068b2835dec  toped-0.9.5.tar.bz2
+7e31fbe0bc79d291471cdd975152c0b9  toped-0.9.51-r1331.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/toped.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- toped.spec	4 Oct 2009 11:39:26 -0000	1.18
+++ toped.spec	10 Dec 2009 05:59:40 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           toped
-Version:        0.9.5
+Version:        0.9.51
 Release:        1%{?dist} 
 #RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
@@ -10,7 +10,7 @@ URL:            http://www.toped.org.uk
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://toped.googlecode.com/files/toped-%{version}-r1331.tar.bz2
 
 
 BuildRequires:  desktop-file-utils
@@ -20,7 +20,6 @@ BuildRequires:  byacc
 BuildRequires:  libtool
 BuildRequires:  bison
 BuildRequires:  flex
-BuildRequires:  plt-scheme
 
 Requires:       electronics-menu
 
@@ -106,6 +105,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Dec 10 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.51-1
+- 0.9.51 release to fix start-up crash with Mesa DRI on Intel(R) 945GM - RHBZ 541879
+
 * Sun Oct 03 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.5-1
 - 0.9.5 stable release
 



From chitlesh at fedoraproject.org  Thu Dec 10 06:00:31 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 06:00:31 +0000 (UTC)
Subject: rpms/toped/F-12 .cvsignore, 1.9, 1.10 import.log, 1.7, 1.8 sources, 
	1.9, 1.10 toped.spec, 1.19, 1.20
Message-ID: <20091210060031.780C411C04D1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/toped/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32377/F-12

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
fixed crash with Mesa DRI on Intel(R) 945GM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Oct 2009 11:47:26 -0000	1.9
+++ .cvsignore	10 Dec 2009 06:00:31 -0000	1.10
@@ -1 +1 @@
-toped-0.9.5.tar.bz2
+toped-0.9.51-r1331.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-12/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	4 Oct 2009 11:47:26 -0000	1.7
+++ import.log	10 Dec 2009 06:00:31 -0000	1.8
@@ -5,3 +5,4 @@ toped-0_9_2-4_fc11:HEAD:toped-0.9.2-4.fc
 toped-0_9_4-1_fc11:HEAD:toped-0.9.4-1.fc11.src.rpm:1249374653
 toped-0_9_4-1_fc11:HEAD:toped-0.9.4-1.fc11.src.rpm:1249378277
 toped-0_9_5-1_fc11:F-12:toped-0.9.5-1.fc11.src.rpm:1254656568
+toped-0_9_51-1_fc12:F-12:toped-0.9.51-1.fc12.src.rpm:1260424755


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Oct 2009 11:47:26 -0000	1.9
+++ sources	10 Dec 2009 06:00:31 -0000	1.10
@@ -1 +1 @@
-8c0e045d88bd4fc55b2cc068b2835dec  toped-0.9.5.tar.bz2
+7e31fbe0bc79d291471cdd975152c0b9  toped-0.9.51-r1331.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-12/toped.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- toped.spec	4 Oct 2009 11:47:26 -0000	1.19
+++ toped.spec	10 Dec 2009 06:00:31 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           toped
-Version:        0.9.5
+Version:        0.9.51
 Release:        1%{?dist} 
 #RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
@@ -10,7 +10,7 @@ URL:            http://www.toped.org.uk
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://toped.googlecode.com/files/toped-%{version}-r1331.tar.bz2
 
 
 BuildRequires:  desktop-file-utils
@@ -20,7 +20,6 @@ BuildRequires:  byacc
 BuildRequires:  libtool
 BuildRequires:  bison
 BuildRequires:  flex
-BuildRequires:  plt-scheme
 
 Requires:       electronics-menu
 
@@ -106,6 +105,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Dec 10 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.51-1
+- 0.9.51 release to fix start-up crash with Mesa DRI on Intel(R) 945GM - RHBZ 541879
+
 * Sun Oct 03 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.5-1
 - 0.9.5 stable release
 



From mclasen at fedoraproject.org  Thu Dec 10 06:00:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 06:00:40 +0000 (UTC)
Subject: rpms/libxklavier/F-12 catch-more-xerrors.patch, NONE,
	1.1 libxklavier.spec, 1.54, 1.55
Message-ID: <20091210060040.7BF8911C0345@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libxklavier/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32262

Modified Files:
	libxklavier.spec 
Added Files:
	catch-more-xerrors.patch 
Log Message:
Catch more X errors


catch-more-xerrors.patch:
 xklavier_evt.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE catch-more-xerrors.patch ---
diff -up libxklavier-4.0/libxklavier/xklavier_evt.c.xerrors libxklavier-4.0/libxklavier/xklavier_evt.c
--- libxklavier-4.0/libxklavier/xklavier_evt.c.xerrors	2009-12-10 00:50:24.786868859 -0500
+++ libxklavier-4.0/libxklavier/xklavier_evt.c	2009-12-10 00:51:23.563118385 -0500
@@ -508,6 +508,7 @@ xkl_process_error(Display * dpy, XErrorE
 	case BadAccess:
 	case BadDrawable:
 	case BadWindow:
+	case BadMatch:
 		{
 			XGetErrorText(evt->display, evt->error_code, buf,
 				      sizeof(buf));


Index: libxklavier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/F-12/libxklavier.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- libxklavier.spec	15 Oct 2009 14:11:04 -0000	1.54
+++ libxklavier.spec	10 Dec 2009 06:00:40 -0000	1.55
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	4.0
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
 Patch1: xinput-fixes.patch
+Patch2: catch-more-xerrors.patch
 
 %description
 libxklavier is a library providing a high-level API for the X Keyboard
@@ -40,6 +41,7 @@ needed to develop libxklavier applicatio
 %setup -q
 %patch0 -p1 -b .flags
 %patch1 -p0 -b .xinput
+%patch2 -p1 -b .catch-more-xerrors
 
 %build
 
@@ -80,6 +82,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-7
+- Catch more X errors
+
 * Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-6
 - Incorporate upstream fixes for XInput error handling
 



From chitlesh at fedoraproject.org  Thu Dec 10 06:04:37 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 06:04:37 +0000 (UTC)
Subject: rpms/toped/EL-5 .cvsignore, 1.6, 1.7 import.log, 1.2, 1.3 sources,
	1.6, 1.7 toped.spec, 1.10, 1.11
Message-ID: <20091210060437.CB5B311C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/toped/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1437/EL-5

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
fixed crash with Mesa DRI on Intel(R) 945GM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Aug 2009 08:34:05 -0000	1.6
+++ .cvsignore	10 Dec 2009 06:04:37 -0000	1.7
@@ -1 +1 @@
-toped-0.9.4.tar.bz2
+toped-0.9.51-r1331.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Aug 2009 08:34:05 -0000	1.2
+++ import.log	10 Dec 2009 06:04:37 -0000	1.3
@@ -1,2 +1,3 @@
 toped-0_9_2-2_fc9:EL-5:toped-0.9.2-2.fc9.src.rpm:1226339147
 toped-0_9_4-1_fc11:EL-5:toped-0.9.4-1.fc11.src.rpm:1249374734
+toped-0_9_51-1_fc12:EL-5:toped-0.9.51-1.fc12.src.rpm:1260424973


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Aug 2009 08:34:05 -0000	1.6
+++ sources	10 Dec 2009 06:04:37 -0000	1.7
@@ -1 +1 @@
-58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2
+7e31fbe0bc79d291471cdd975152c0b9  toped-0.9.51-r1331.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/toped.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- toped.spec	4 Aug 2009 10:04:40 -0000	1.10
+++ toped.spec	10 Dec 2009 06:04:37 -0000	1.11
@@ -1,7 +1,7 @@
 Name:           toped
-Version:        0.9.4
+Version:        0.9.51
 Release:        1%{?dist} 
-#RELEASE_0.94_CAND
+#RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -10,7 +10,7 @@ URL:            http://www.toped.org.uk
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://toped.googlecode.com/files/toped-%{version}-r1331.tar.bz2
 
 
 BuildRequires:  desktop-file-utils
@@ -20,7 +20,6 @@ BuildRequires:  byacc
 BuildRequires:  libtool
 BuildRequires:  bison
 BuildRequires:  flex
-BuildRequires:  plt-scheme
 
 Requires:       electronics-menu
 
@@ -105,7 +104,16 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
-%Changelog
+%changelog
+* Thu Dec 10 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.51-1
+- 0.9.51 release to fix start-up crash with Mesa DRI on Intel(R) 945GM - RHBZ 541879
+
+* Sun Oct 03 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.5-1
+- 0.9.5 stable release
+
+* Sat Oct 03 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.5-0.1
+- 0.9.5 test release
+
 * Tue Aug 04 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-1
 - 0.9.4 final release
 



From jcollie at fedoraproject.org  Thu Dec 10 06:13:03 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 10 Dec 2009 06:13:03 +0000 (UTC)
Subject: File gnonlin-0.10.13.2.tar.bz2 uploaded to lookaside cache by
	jcollie
Message-ID: <20091210061303.17E0B10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnonlin:

6d7920ef73c7cfeb65dcf73cb6b5878a  gnonlin-0.10.13.2.tar.bz2



From jcollie at fedoraproject.org  Thu Dec 10 06:17:00 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 10 Dec 2009 06:17:00 +0000 (UTC)
Subject: rpms/gnonlin/devel .cvsignore, 1.20, 1.21 gnonlin.spec, 1.32,
	1.33 sources, 1.20, 1.21
Message-ID: <20091210061700.51A4D11C025D@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5554

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Thu Dec 10 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.13.2-1
- Update to prerelease version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	7 Sep 2009 12:13:47 -0000	1.20
+++ .cvsignore	10 Dec 2009 06:16:59 -0000	1.21
@@ -1 +1 @@
-gnonlin-0.10.13.tar.bz2
+gnonlin-0.10.13.2.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gnonlin.spec	7 Sep 2009 12:12:57 -0000	1.32
+++ gnonlin.spec	10 Dec 2009 06:16:59 -0000	1.33
@@ -2,14 +2,14 @@
 %define         gst_plugins_base_req    0.10.24
 
 Name:           gnonlin
-Version:        0.10.13
+Version:        0.10.13.2
 Release:        1%{?dist}
 Summary:        GStreamer extension library for non-linear editing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gnonlin.sourceforge.net/
-Source:         http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-%{version}.tar.bz2
+Source:         http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gstreamer-devel >= %{gst_req}
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Thu Dec 10 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.13.2-1
+- Update to prerelease version.
+
 * Mon Sep  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.13-1
 - Update to 0.10.13 "Service of Quality"
 -


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	7 Sep 2009 12:13:47 -0000	1.20
+++ sources	10 Dec 2009 06:16:59 -0000	1.21
@@ -1 +1 @@
-424647c776e641b318f5d4ec67dc37a4  gnonlin-0.10.13.tar.bz2
+6d7920ef73c7cfeb65dcf73cb6b5878a  gnonlin-0.10.13.2.tar.bz2



From chitlesh at fedoraproject.org  Thu Dec 10 06:19:48 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu, 10 Dec 2009 06:19:48 +0000 (UTC)
Subject: rpms/toped/devel .cvsignore, 1.9, 1.10 import.log, 1.8, 1.9 sources,
	1.9, 1.10 toped.spec, 1.20, 1.21
Message-ID: <20091210061948.DB07111C025D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/toped/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6608/devel

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
fixed crash with Mesa DRI on Intel(R) 945GM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Oct 2009 21:48:46 -0000	1.9
+++ .cvsignore	10 Dec 2009 06:19:47 -0000	1.10
@@ -1 +1 @@
-toped-0.9.5.tar.bz2
+toped-0.9.51-r1331.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	4 Oct 2009 11:12:38 -0000	1.8
+++ import.log	10 Dec 2009 06:19:48 -0000	1.9
@@ -6,3 +6,4 @@ toped-0_9_4-1_fc11:HEAD:toped-0.9.4-1.fc
 toped-0_9_4-1_fc11:HEAD:toped-0.9.4-1.fc11.src.rpm:1249378277
 toped-0_9_5-0_1_fc11:HEAD:toped-0.9.5-0.1.fc11.src.rpm:1254606402
 toped-0_9_5-1_fc11:HEAD:toped-0.9.5-1.fc11.src.rpm:1254654727
+toped-0_9_51-1_fc12:HEAD:toped-0.9.51-1.fc12.src.rpm:1260425911


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Oct 2009 21:48:46 -0000	1.9
+++ sources	10 Dec 2009 06:19:48 -0000	1.10
@@ -1 +1 @@
-8c0e045d88bd4fc55b2cc068b2835dec  toped-0.9.5.tar.bz2
+7e31fbe0bc79d291471cdd975152c0b9  toped-0.9.51-r1331.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/toped.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- toped.spec	4 Oct 2009 11:12:38 -0000	1.20
+++ toped.spec	10 Dec 2009 06:19:48 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           toped
-Version:        0.9.5
+Version:        0.9.51
 Release:        1%{?dist} 
 #RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
@@ -10,7 +10,7 @@ URL:            http://www.toped.org.uk
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://toped.googlecode.com/files/toped-%{version}-r1331.tar.bz2
 
 
 BuildRequires:  desktop-file-utils
@@ -20,7 +20,6 @@ BuildRequires:  byacc
 BuildRequires:  libtool
 BuildRequires:  bison
 BuildRequires:  flex
-BuildRequires:  plt-scheme
 
 Requires:       electronics-menu
 
@@ -106,6 +105,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Dec 10 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.51-1
+- 0.9.51 release to fix start-up crash with Mesa DRI on Intel(R) 945GM - RHBZ 541879
+
 * Sun Oct 03 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.5-1
 - 0.9.5 stable release
 



From mclasen at fedoraproject.org  Thu Dec 10 06:24:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 06:24:23 +0000 (UTC)
Subject: rpms/glib2/F-12
	0001-Remove-default-implementation-of-async-filter-steam-.patch, NONE,
	1.1 0002-Initialise-variable-in-g_time_val_from_iso8601.patch,
	NONE, 1.1 glib2.spec, 1.230, 1.231
Message-ID: <20091210062423.5728011C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7962

Modified Files:
	glib2.spec 
Added Files:
	0001-Remove-default-implementation-of-async-filter-steam-.patch 
	0002-Initialise-variable-in-g_time_val_from_iso8601.patch 
Log Message:
Incorporate some upstream fixes


0001-Remove-default-implementation-of-async-filter-steam-.patch:
 gfilterinputstream.c  |  185 --------------------------------------------------
 gfilteroutputstream.c |  174 -----------------------------------------------
 2 files changed, 2 insertions(+), 357 deletions(-)

--- NEW FILE 0001-Remove-default-implementation-of-async-filter-steam-.patch ---
>From 31f928a2c32f5b219da9c30b8c5bbfcea2343426 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Mon, 7 Dec 2009 22:00:51 +0100
Subject: [PATCH 1/2] Remove default implementation of async filter steam ops

Not only is the default implementation broken (it causes infinite recursion
as seen in bug #603982), but its also worthless. If we just fall back on the
default stream operations we automatically get async version based on
the sync filter stream operations, which is what we want.
(cherry picked from commit 4fbbe190b7cbfd271bbb18428bc103ebffa41112)
---
 gio/gfilterinputstream.c  |  185 +--------------------------------------------
 gio/gfilteroutputstream.c |  173 ------------------------------------------
 2 files changed, 2 insertions(+), 356 deletions(-)

diff --git a/gio/gfilterinputstream.c b/gio/gfilterinputstream.c
index aa27465..53e305a 100644
--- a/gio/gfilterinputstream.c
+++ b/gio/gfilterinputstream.c
@@ -65,33 +65,6 @@ static gssize   g_filter_input_stream_skip         (GInputStream         *stream
 static gboolean g_filter_input_stream_close        (GInputStream         *stream,
                                                     GCancellable         *cancellable,
                                                     GError              **error);
-static void     g_filter_input_stream_read_async   (GInputStream         *stream,
-                                                    void                 *buffer,
-                                                    gsize                 count,
-                                                    int                   io_priority,
-                                                    GCancellable         *cancellable,
-                                                    GAsyncReadyCallback   callback,
-                                                    gpointer              user_data);
-static gssize   g_filter_input_stream_read_finish  (GInputStream         *stream,
-                                                    GAsyncResult         *result,
-                                                    GError              **error);
-static void     g_filter_input_stream_skip_async   (GInputStream         *stream,
-                                                    gsize                 count,
-                                                    int                   io_priority,
-                                                    GCancellable         *cancellabl,
-                                                    GAsyncReadyCallback   callback,
-                                                    gpointer              datae);
-static gssize   g_filter_input_stream_skip_finish  (GInputStream         *stream,
-                                                    GAsyncResult         *result,
-                                                    GError              **error);
-static void     g_filter_input_stream_close_async  (GInputStream         *stream,
-                                                    int                   io_priority,
-                                                    GCancellable         *cancellabl,
-                                                    GAsyncReadyCallback   callback,
-                                                    gpointer              data);
-static gboolean g_filter_input_stream_close_finish (GInputStream         *stream,
-                                                    GAsyncResult         *result,
-                                                    GError              **error);
 
 G_DEFINE_TYPE (GFilterInputStream, g_filter_input_stream, G_TYPE_INPUT_STREAM)
 
@@ -101,6 +74,8 @@ G_DEFINE_TYPE (GFilterInputStream, g_filter_input_stream, G_TYPE_INPUT_STREAM)
 typedef struct
 {
   gboolean close_base;
+  GAsyncReadyCallback outstanding_callback;
+  gpointer outstanding_user_data;
 } GFilterInputStreamPrivate;
 
 static void
@@ -119,13 +94,6 @@ g_filter_input_stream_class_init (GFilterInputStreamClass *klass)
   istream_class->skip  = g_filter_input_stream_skip;
   istream_class->close_fn = g_filter_input_stream_close;
 
-  istream_class->read_async   = g_filter_input_stream_read_async;
-  istream_class->read_finish  = g_filter_input_stream_read_finish;
-  istream_class->skip_async   = g_filter_input_stream_skip_async;
-  istream_class->skip_finish  = g_filter_input_stream_skip_finish;
-  istream_class->close_async  = g_filter_input_stream_close_async;
-  istream_class->close_finish = g_filter_input_stream_close_finish;
-
   g_type_class_add_private (klass, sizeof (GFilterInputStreamPrivate));
 
   g_object_class_install_property (object_class,
@@ -346,154 +314,5 @@ g_filter_input_stream_close (GInputStream  *stream,
   return res;
 }
 
-static void
-g_filter_input_stream_read_async (GInputStream        *stream,
-                                  void                *buffer,
-                                  gsize                count,
-                                  int                  io_priority,
-                                  GCancellable        *cancellable,
-                                  GAsyncReadyCallback  callback,
-                                  gpointer             user_data)
-{
-  GFilterInputStream *filter_stream;
-  GInputStream       *base_stream;
-
-  filter_stream = G_FILTER_INPUT_STREAM (stream);
-  base_stream = filter_stream->base_stream;
-
-  g_input_stream_read_async (base_stream,
-                             buffer,
-                             count,
-                             io_priority,
-                             cancellable,
-                             callback,
-                             user_data);
-}
-
-static gssize
-g_filter_input_stream_read_finish (GInputStream  *stream,
-                                   GAsyncResult  *result,
-                                   GError       **error)
-{
-  GFilterInputStream *filter_stream;
-  GInputStream       *base_stream;
-  gssize nread;
-
-  filter_stream = G_FILTER_INPUT_STREAM (stream);
-  base_stream = filter_stream->base_stream;
-
-  nread = g_input_stream_read_finish (base_stream,
-                                      result,
-                                      error);
-  
-  return nread;
-}
-
-static void
-g_filter_input_stream_skip_async (GInputStream        *stream,
-                                  gsize                count,
-                                  int                  io_priority,
-                                  GCancellable        *cancellable,
-                                  GAsyncReadyCallback  callback,
-                                  gpointer             user_data)
-{
-  GFilterInputStream *filter_stream;
-  GInputStream       *base_stream;
-
-  filter_stream = G_FILTER_INPUT_STREAM (stream);
-  base_stream = filter_stream->base_stream;
-
-  g_input_stream_skip_async (base_stream,
-                             count,
-                             io_priority,
-                             cancellable,
-                             callback,
-                             user_data);
-
-}
-
-static gssize
-g_filter_input_stream_skip_finish (GInputStream  *stream,
-                                   GAsyncResult  *result,
-                                   GError       **error)
-{
-  GFilterInputStream *filter_stream;
-  GInputStream       *base_stream;
-  gssize nskipped;
-
-  filter_stream = G_FILTER_INPUT_STREAM (stream);
-  base_stream = filter_stream->base_stream;
-
-  nskipped = g_input_stream_skip_finish (base_stream,
-                                         result,
-                                         error);
-
-  return nskipped;
-}
-
-static void
-g_filter_input_stream_close_ready (GObject       *object,
-                                   GAsyncResult  *result,
-                                   gpointer       user_data)
-{
-  GSimpleAsyncResult *simple = user_data;
-  GError *error = NULL;
-
-  g_input_stream_close_finish (G_INPUT_STREAM (object), result, &error);
-
-  if (error)
-    {
-      g_simple_async_result_set_from_error (simple, error);
-      g_error_free (error);
-    }
-
-  g_simple_async_result_complete (simple);
-  g_object_unref (simple);
-}
-
-static void
-g_filter_input_stream_close_async (GInputStream        *stream,
-                                   int                  io_priority,
-                                   GCancellable        *cancellable,
-                                   GAsyncReadyCallback  callback,
-                                   gpointer             user_data)
-{
-  GSimpleAsyncResult *simple;
-
-  simple = g_simple_async_result_new (G_OBJECT (stream),
-                                      callback, user_data,
-                                      g_filter_input_stream_close_async);
-
-  if (GET_PRIVATE (stream)->close_base)
-    {
-      GFilterInputStream *filter_stream = G_FILTER_INPUT_STREAM (stream);
-
-      g_input_stream_close_async (filter_stream->base_stream,
-                                  io_priority, cancellable,
-                                  g_filter_input_stream_close_ready,
-                                  g_object_ref (simple));
-    }
-  else
-    /* do nothing */
-    g_simple_async_result_complete_in_idle (simple);
-
-  g_object_unref (simple);
-}
-
-static gboolean
-g_filter_input_stream_close_finish (GInputStream  *stream,
-                                    GAsyncResult  *result,
-                                    GError       **error)
-{
-  GSimpleAsyncResult *simple;
-
-  g_return_val_if_fail (g_simple_async_result_is_valid (
-    result, G_OBJECT (stream), g_filter_input_stream_close_async), FALSE);
-
-  simple = G_SIMPLE_ASYNC_RESULT (result);
-
-  return !g_simple_async_result_propagate_error (simple, error);
-}
-
 #define __G_FILTER_INPUT_STREAM_C__
 #include "gioaliasdef.c"
diff --git a/gio/gfilteroutputstream.c b/gio/gfilteroutputstream.c
index 32fc6f7..606f669 100644
--- a/gio/gfilteroutputstream.c
+++ b/gio/gfilteroutputstream.c
@@ -64,34 +64,6 @@ static gboolean g_filter_output_stream_flush        (GOutputStream    *stream,
 static gboolean g_filter_output_stream_close        (GOutputStream  *stream,
                                                      GCancellable   *cancellable,
                                                      GError        **error);
-static void     g_filter_output_stream_write_async  (GOutputStream        *stream,
-                                                     const void           *buffer,
-                                                     gsize                 count,
-                                                     int                   io_priority,
-                                                     GCancellable         *cancellable,
-                                                     GAsyncReadyCallback   callback,
-                                                     gpointer              data);
-static gssize   g_filter_output_stream_write_finish (GOutputStream        *stream,
-                                                     GAsyncResult         *result,
-                                                     GError              **error);
-static void     g_filter_output_stream_flush_async  (GOutputStream        *stream,
-                                                     int                   io_priority,
-                                                     GCancellable         *cancellable,
-                                                     GAsyncReadyCallback   callback,
-                                                     gpointer              data);
-static gboolean g_filter_output_stream_flush_finish (GOutputStream        *stream,
-                                                     GAsyncResult         *result,
-                                                     GError              **error);
-static void     g_filter_output_stream_close_async  (GOutputStream        *stream,
-                                                     int                   io_priority,
-                                                     GCancellable         *cancellable,
-                                                     GAsyncReadyCallback   callback,
-                                                     gpointer              data);
-static gboolean g_filter_output_stream_close_finish (GOutputStream        *stream,
-                                                     GAsyncResult         *result,
-                                                     GError              **error);
-
-
 
 G_DEFINE_TYPE (GFilterOutputStream, g_filter_output_stream, G_TYPE_OUTPUT_STREAM)
 
@@ -118,12 +90,6 @@ g_filter_output_stream_class_init (GFilterOutputStreamClass *klass)
   ostream_class->write_fn = g_filter_output_stream_write;
   ostream_class->flush = g_filter_output_stream_flush;
   ostream_class->close_fn = g_filter_output_stream_close;
-  ostream_class->write_async  = g_filter_output_stream_write_async;
-  ostream_class->write_finish = g_filter_output_stream_write_finish;
-  ostream_class->flush_async  = g_filter_output_stream_flush_async;
-  ostream_class->flush_finish = g_filter_output_stream_flush_finish;
-  ostream_class->close_async  = g_filter_output_stream_close_async;
-  ostream_class->close_finish = g_filter_output_stream_close_finish;
 
   g_type_class_add_private (klass, sizeof (GFilterOutputStreamPrivate));
 
@@ -342,144 +308,5 @@ g_filter_output_stream_close (GOutputStream  *stream,
   return res;
 }
 
-static void
-g_filter_output_stream_write_async (GOutputStream       *stream,
-                                    const void          *buffer,
-                                    gsize                count,
-                                    int                  io_priority,
-                                    GCancellable        *cancellable,
-                                    GAsyncReadyCallback  callback,
-                                    gpointer             data)
-{
-  GFilterOutputStream *filter_stream;
-
-  filter_stream = G_FILTER_OUTPUT_STREAM (stream);
-
-  g_output_stream_write_async (filter_stream->base_stream,
-                               buffer,
-                               count,
-                               io_priority,
-                               cancellable,
-                               callback,
-                               data);
-
-}
-
-static gssize
-g_filter_output_stream_write_finish (GOutputStream  *stream,
-                                     GAsyncResult   *result,
-                                     GError        **error)
-{
-  GFilterOutputStream *filter_stream;
-  gssize nwritten;
-
-  filter_stream = G_FILTER_OUTPUT_STREAM (stream);
-
-  nwritten = g_output_stream_write_finish (filter_stream->base_stream,
-                                           result,
-                                           error);
-
-  return nwritten;
-}
-
-static void
-g_filter_output_stream_flush_async (GOutputStream       *stream,
-                                    int                  io_priority,
-                                    GCancellable        *cancellable,
-                                    GAsyncReadyCallback  callback,
-                                    gpointer             data)
-{
-  GFilterOutputStream *filter_stream;
-
-  filter_stream = G_FILTER_OUTPUT_STREAM (stream);
-
-  g_output_stream_flush_async (filter_stream->base_stream,
-                               io_priority,
-                               cancellable,
-                               callback,
-                               data);
-}
-
-static gboolean
-g_filter_output_stream_flush_finish (GOutputStream  *stream,
-                                     GAsyncResult   *result,
-                                     GError        **error)
-{
-  GFilterOutputStream *filter_stream;
-  gboolean res;
-
-  filter_stream = G_FILTER_OUTPUT_STREAM (stream);
-
-  res = g_output_stream_flush_finish (filter_stream->base_stream,
-                                      result,
-                                      error);
-
-  return res;
-}
-
-static void
-g_filter_output_stream_close_ready (GObject       *object,
-                                    GAsyncResult  *result,
-                                    gpointer       user_data)
-{
-  GSimpleAsyncResult *simple = user_data;
-  GError *error = NULL;
-
-  g_output_stream_close_finish (G_OUTPUT_STREAM (object), result, &error);
-
-  if (error)
-    {
-      g_simple_async_result_set_from_error (simple, error);
-      g_error_free (error);
-    }
-
-  g_simple_async_result_complete (simple);
-  g_object_unref (simple);
-}
-
-static void
-g_filter_output_stream_close_async (GOutputStream       *stream,
-                                    int                  io_priority,
-                                    GCancellable        *cancellable,
-                                    GAsyncReadyCallback  callback,
-                                    gpointer             user_data)
-{
-  GSimpleAsyncResult *simple;
-
-  simple = g_simple_async_result_new (G_OBJECT (stream),
-                                      callback, user_data,
-                                      g_filter_output_stream_close_async);
-
-  if (GET_PRIVATE (stream)->close_base)
-    {
-      GFilterOutputStream *filter_stream = G_FILTER_OUTPUT_STREAM (stream);
-
-      g_output_stream_close_async (filter_stream->base_stream,
-                                  io_priority, cancellable,
-                                  g_filter_output_stream_close_ready,
-                                  g_object_ref (simple));
-    }
-  else
-    /* do nothing */
-    g_simple_async_result_complete_in_idle (simple);
-
-  g_object_unref (simple);
-}
-
-static gboolean
-g_filter_output_stream_close_finish (GOutputStream  *stream,
-                                     GAsyncResult   *result,
-                                     GError        **error)
-{
-  GSimpleAsyncResult *simple;
-
-  g_return_val_if_fail (g_simple_async_result_is_valid (
-    result, G_OBJECT (stream), g_filter_output_stream_close_async), FALSE);
-
-  simple = G_SIMPLE_ASYNC_RESULT (result);
-
-  return !g_simple_async_result_propagate_error (simple, error);
-}
-
 #define __G_FILTER_OUTPUT_STREAM_C__
 #include "gioaliasdef.c"
-- 
1.6.5.2


0002-Initialise-variable-in-g_time_val_from_iso8601.patch:
 gtimer.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE 0002-Initialise-variable-in-g_time_val_from_iso8601.patch ---
>From 3a7a950b2b912d0c22ce1208b883128077319d1e Mon Sep 17 00:00:00 2001
From: Matthew W. S. Bell <matthew at bells23.org.uk>
Date: Wed, 2 Dec 2009 01:48:30 +0100
Subject: [PATCH 2/2] Initialise variable in g_time_val_from_iso8601()

The function does not initialise the struct tm,
giving it improper values of tm_isdst making the result
an hour out.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=603540
(cherry picked from commit 2321e5aed07154761223bb124770beba56700e41)
---
 glib/gtimer.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/glib/gtimer.c b/glib/gtimer.c
index 407ce85..cd6a082 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -301,7 +301,7 @@ gboolean
 g_time_val_from_iso8601 (const gchar *iso_date,
 			 GTimeVal    *time_)
 {
-  struct tm tm;
+  struct tm tm = {0};
   long val;
 
   g_return_val_if_fail (iso_date != NULL, FALSE);
@@ -328,7 +328,7 @@ g_time_val_from_iso8601 (const gchar *iso_date,
       tm.tm_mon = strtoul (iso_date, (char **)&iso_date, 10) - 1;
       
       if (*iso_date++ != '-')
-       	return FALSE;
+        return FALSE;
       
       tm.tm_mday = strtoul (iso_date, (char **)&iso_date, 10);
     }
@@ -390,7 +390,7 @@ g_time_val_from_iso8601 (const gchar *iso_date,
       val = strtoul (iso_date + 1, (char **)&iso_date, 10);
       
       if (*iso_date == ':')
-	val = 60 * val + strtoul (iso_date + 1, (char **)&iso_date, 10);
+        val = 60 * val + strtoul (iso_date + 1, (char **)&iso_date, 10);
       else
         val = 60 * (val / 100) + (val % 100);
 
@@ -399,6 +399,7 @@ g_time_val_from_iso8601 (const gchar *iso_date,
   else
     {
       /* No "Z" or offset, so local time */
+      tm.tm_isdst = -1; /* locale selects DST */
       time_->tv_sec = mktime (&tm);
     }
 
-- 
1.6.5.2



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- glib2.spec	1 Dec 2009 15:28:51 -0000	1.230
+++ glib2.spec	10 Dec 2009 06:24:23 -0000	1.231
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -21,6 +21,10 @@ BuildRequires: glibc-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 
+# upstream fixes
+Patch0: 0001-Remove-default-implementation-of-async-filter-steam-.patch
+Patch1: 0002-Initialise-variable-in-g_time_val_from_iso8601.patch
+
 %description
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -52,6 +56,8 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .async-ops
+%patch1 -p1 -b .dst-time
 
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
@@ -122,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.3-2
+- Incorporate two upstream fixes
+
 * Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.3-1
 - Update to 2.22.2
 - See http://download.gnome.org/sources/glib/2.22/glib-2.22.3.news



From rdieter at fedoraproject.org  Thu Dec 10 07:05:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Dec 2009 07:05:12 +0000 (UTC)
Subject: File maxima-5.20.0.tar.gz uploaded to lookaside cache by rdieter
Message-ID: <20091210070512.E582310F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for maxima:

46072a976c6980b601295fbc42cade8f  maxima-5.20.0.tar.gz



From rdieter at fedoraproject.org  Thu Dec 10 07:09:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Dec 2009 07:09:59 +0000 (UTC)
Subject: rpms/maxima/devel .cvsignore, 1.34, 1.35 maxima.spec, 1.141,
	1.142 sources, 1.32, 1.33
Message-ID: <20091210071000.1162E11C025D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24489

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.0-1
- maxima-5.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	30 Sep 2009 18:05:24 -0000	1.34
+++ .cvsignore	10 Dec 2009 07:09:58 -0000	1.35
@@ -3,3 +3,4 @@ macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
 maxima-5.19.2.tar.gz
+maxima-5.20.0.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- maxima.spec	26 Oct 2009 16:57:13 -0000	1.141
+++ maxima.spec	10 Dec 2009 07:09:58 -0000	1.142
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.19.2
+Version: 5.20.0
 
-Release: 3%{?dist} 
+Release: 1%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -431,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.0-1
+- maxima-5.20.0
+
 * Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-3
 - rebuild (sbcl)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	30 Sep 2009 18:05:24 -0000	1.32
+++ sources	10 Dec 2009 07:09:59 -0000	1.33
@@ -1,4 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-c75eec2586f5be18e02978e70fac0b07  maxima-5.19.2.tar.gz
+46072a976c6980b601295fbc42cade8f  maxima-5.20.0.tar.gz



From pravins at fedoraproject.org  Thu Dec 10 07:39:36 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 10 Dec 2009 07:39:36 +0000 (UTC)
Subject: rpms/system-config-language/F-12 system-config-language.spec, 1.58, 
	1.59
Message-ID: <20091210073937.01D3711C025D@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1462

Modified Files:
	system-config-language.spec 
Log Message:
* Thu Dec 10 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-4
 - updated URL and source field



Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/F-12/system-config-language.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- system-config-language.spec	27 Oct 2009 11:36:38 -0000	1.58
+++ system-config-language.spec	10 Dec 2009 07:39:34 -0000	1.59
@@ -1,8 +1,9 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.3
-Release: 3%{?dist}
-URL: http://fedoraproject.org/wiki/SystemConfig/language
+Release: 4%{?dist}
+URL: https://fedorahosted.org/system-config-language/
+source: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -86,6 +87,9 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Thu Dec 10 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-4
+- updated URL and source field
+
 * Mon Oct 26 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-3
 - fixed 530698
 



From jpopelka at fedoraproject.org  Thu Dec 10 08:02:21 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu, 10 Dec 2009 08:02:21 +0000 (UTC)
Subject: rpms/lockdev/devel lockdev-1.0.3-rh.patch, 1.1, 1.2 lockdev.spec,
	1.37, 1.38
Message-ID: <20091210080221.9FF1A11C025D@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/lockdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8936

Modified Files:
	lockdev-1.0.3-rh.patch lockdev.spec 
Log Message:
* Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-2
- Correct rh.patch


lockdev-1.0.3-rh.patch:
 Makefile      |   19 ++++++--
 src/baudboy.h |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lockdev.c |   48 +++++++++++++++-----
 src/lockdev.h |    4 +
 src/sample.c  |   64 +++++++++++++++++----------
 5 files changed, 234 insertions(+), 38 deletions(-)

Index: lockdev-1.0.3-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev-1.0.3-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lockdev-1.0.3-rh.patch	7 Dec 2009 09:28:58 -0000	1.1
+++ lockdev-1.0.3-rh.patch	10 Dec 2009 08:02:19 -0000	1.2
@@ -236,15 +236,15 @@ diff -up lockdev-1.0.3/src/lockdev.c.red
  		unlink( tpname);	/* in case there was */
  		rename( lockname, tpname);
  		if ( ! (fd=fopen( tpname, "r")) ) {
-@@ -511,7 +524,7 @@ dev_testlock(const char *devname)
- #endif /* DEBUG */
- 	_debug( 3, "dev_testlock(%s)\n", devname);
- 	if ( ! (p=_dl_check_devname( devname)) )
--	 	close_n_return( -1);
-+	 	close_n_return( -errno);
- 	strcpy( device, DEV_PATH);
- 	strcat( device, p);	/* now device has a copy of the pathname */
- 	_debug( 2, "dev_testlock() device = %s\n", device);
+@@ -520,7 +533,7 @@ dev_testlock(const char *devname)
+ 	 * and minor numbers
+ 	 */
+ 	if ( stat( device, &statbuf) == -1 ) {
+-		close_n_return( -1);
++		close_n_return(-errno);
+ 	}
+ 
+ 	/* first check for the FSSTND-1.2 lock, get the pid of the
 @@ -585,7 +598,7 @@ dev_lock (const char *devname)
  #endif /* DEBUG */
  	_debug( 3, "dev_lock(%s)\n", devname);


Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- lockdev.spec	7 Dec 2009 09:28:58 -0000	1.37
+++ lockdev.spec	10 Dec 2009 08:02:19 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -90,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-2
+- Correct rh.patch
+
 * Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-1
 - 1.0.3.  No longer need 1.0.0-signal, 1.0.1-subdir, 1.0.1-fcntl, 1.0.1-32bit patches.
 - Renumbered patches and sources.



From sandeeps at fedoraproject.org  Thu Dec 10 08:08:50 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 08:08:50 +0000 (UTC)
Subject: File woff-code-latest.zip uploaded to lookaside cache by sandeeps
Message-ID: <20091210080850.23EAF10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for woff:

1dcdbc9a7f48086185740c185d822279  woff-code-latest.zip



From sandeeps at fedoraproject.org  Thu Dec 10 08:21:30 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 08:21:30 +0000 (UTC)
Subject: rpms/woff/devel import.log, NONE, 1.1 woff.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210082130.91C1A11C025D@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/woff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11724/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log woff.spec 
Log Message:



--- NEW FILE import.log ---
woff-0_20091126-2_fc13:HEAD:woff-0.20091126-2.fc13.src.rpm:1260432538


--- NEW FILE woff.spec ---
Name:           woff
Version:        0.20091126
Release:        2%{?dist}
Summary:        Encoding and Decoding for Web Open Font Format(Woff)

Group:          Development/Tools
License:        GPLv2+ or LGPLv2+ or MPLv1.1
URL:            http://people.mozilla.com/~jkew/woff/
Source0:        http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  zlib-devel

%description
Encoding and Decoding for Web Open Font Format(Woff)

%prep
%setup -q -c  


%build
make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -m 755 -p $RPM_BUILD_ROOT/%{_bindir}
install -m755 sfnt2woff woff2sfnt $RPM_BUILD_ROOT/%{_bindir}/



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
%{_bindir}/*


%changelog
* Sun Nov 29 2009 Parag Nemade <pnemade at redhat.com>- 0.20091126-2.fc12
- Added BR:zlib-devel

* Fri Nov 27 2009 Parag Nemade <pnemade at redhat.com>- 0.20091126-1.fc12
- Initial specfile for Fedora




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/woff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:44:44 -0000	1.1
+++ .cvsignore	10 Dec 2009 08:21:29 -0000	1.2
@@ -0,0 +1 @@
+woff-code-latest.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/woff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:44:45 -0000	1.1
+++ sources	10 Dec 2009 08:21:29 -0000	1.2
@@ -0,0 +1 @@
+1dcdbc9a7f48086185740c185d822279  woff-code-latest.zip



From eseyman at fedoraproject.org  Thu Dec 10 08:35:09 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 10 Dec 2009 08:35:09 +0000 (UTC)
Subject: File CGI-Application-Plugin-ActionDispatch-0.97.tar.gz uploaded to
	lookaside cache by eseyman
Message-ID: <20091210083509.BF08910F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-CGI-Application-Plugin-ActionDispatch:

d99693993bfdfbfb22d9782e829dc38e  CGI-Application-Plugin-ActionDispatch-0.97.tar.gz



From eseyman at fedoraproject.org  Thu Dec 10 08:35:37 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 10 Dec 2009 08:35:37 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ActionDispatch/devel import.log,
	NONE, 1.1 perl-CGI-Application-Plugin-ActionDispatch.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210083537.97C9311C025D@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20633/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-ActionDispatch.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-ActionDispatch-0_97-1_fc12:HEAD:perl-CGI-Application-Plugin-ActionDispatch-0.97-1.fc12.src.rpm:1260434119


--- NEW FILE perl-CGI-Application-Plugin-ActionDispatch.spec ---
Name:           perl-CGI-Application-Plugin-ActionDispatch
Version:        0.97
Release:        1%{?dist}
Summary:        Adds attribute based support for parsing the PATH_INFO of an HTTP request
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-ActionDispatch/
Source0:        http://www.cpan.org/authors/id/J/JA/JAYWHY/CGI-Application-Plugin-ActionDispatch-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(Class::Inspector)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::ActionDispatch adds attribute based support for
parsing the PATH_INFO of the incoming HTTP request. For those who are familiar
with Catalyst, the interface works very similar.

%prep
%setup -q -n CGI-Application-Plugin-ActionDispatch-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Nov 23 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.97-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:47:54 -0000	1.1
+++ .cvsignore	10 Dec 2009 08:35:37 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-ActionDispatch-0.97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:47:54 -0000	1.1
+++ sources	10 Dec 2009 08:35:37 -0000	1.2
@@ -0,0 +1 @@
+d99693993bfdfbfb22d9782e829dc38e  CGI-Application-Plugin-ActionDispatch-0.97.tar.gz



From mhlavink at fedoraproject.org  Thu Dec 10 08:36:13 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 10 Dec 2009 08:36:13 +0000 (UTC)
Subject: File smartmontools-5.39.tar.gz uploaded to lookaside cache by
	mhlavink
Message-ID: <20091210083613.B735E10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for smartmontools:

63c1b5373a9ef91e9c9becb16e147571  smartmontools-5.39.tar.gz



From jnovy at fedoraproject.org  Thu Dec 10 08:36:31 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 10 Dec 2009 08:36:31 +0000 (UTC)
Subject: File netpbm-10.47.05.tar.xz uploaded to lookaside cache by jnovy
Message-ID: <20091210083631.0088310F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for netpbm:

b3076d696dff3673d66412d111356141  netpbm-10.47.05.tar.xz



From eseyman at fedoraproject.org  Thu Dec 10 08:36:47 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 10 Dec 2009 08:36:47 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ActionDispatch/F-12 import.log,
	NONE, 1.1 perl-CGI-Application-Plugin-ActionDispatch.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210083647.85F9E11C025D@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21222/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-ActionDispatch.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-ActionDispatch-0_97-1_fc12:F-12:perl-CGI-Application-Plugin-ActionDispatch-0.97-1.fc12.src.rpm:1260434185


--- NEW FILE perl-CGI-Application-Plugin-ActionDispatch.spec ---
Name:           perl-CGI-Application-Plugin-ActionDispatch
Version:        0.97
Release:        1%{?dist}
Summary:        Adds attribute based support for parsing the PATH_INFO of an HTTP request
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-ActionDispatch/
Source0:        http://www.cpan.org/authors/id/J/JA/JAYWHY/CGI-Application-Plugin-ActionDispatch-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(Class::Inspector)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::ActionDispatch adds attribute based support for
parsing the PATH_INFO of the incoming HTTP request. For those who are familiar
with Catalyst, the interface works very similar.

%prep
%setup -q -n CGI-Application-Plugin-ActionDispatch-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Nov 23 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.97-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:47:54 -0000	1.1
+++ .cvsignore	10 Dec 2009 08:36:47 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-ActionDispatch-0.97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:47:54 -0000	1.1
+++ sources	10 Dec 2009 08:36:47 -0000	1.2
@@ -0,0 +1 @@
+d99693993bfdfbfb22d9782e829dc38e  CGI-Application-Plugin-ActionDispatch-0.97.tar.gz



From eseyman at fedoraproject.org  Thu Dec 10 08:38:11 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 10 Dec 2009 08:38:11 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-ActionDispatch/F-11 import.log,
	NONE, 1.1 perl-CGI-Application-Plugin-ActionDispatch.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210083811.602A411C025D@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21844/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-ActionDispatch.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-ActionDispatch-0_97-1_fc12:F-11:perl-CGI-Application-Plugin-ActionDispatch-0.97-1.fc12.src.rpm:1260434253


--- NEW FILE perl-CGI-Application-Plugin-ActionDispatch.spec ---
Name:           perl-CGI-Application-Plugin-ActionDispatch
Version:        0.97
Release:        1%{?dist}
Summary:        Adds attribute based support for parsing the PATH_INFO of an HTTP request
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-ActionDispatch/
Source0:        http://www.cpan.org/authors/id/J/JA/JAYWHY/CGI-Application-Plugin-ActionDispatch-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(Class::Inspector)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::ActionDispatch adds attribute based support for
parsing the PATH_INFO of the incoming HTTP request. For those who are familiar
with Catalyst, the interface works very similar.

%prep
%setup -q -n CGI-Application-Plugin-ActionDispatch-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Nov 23 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.97-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:47:54 -0000	1.1
+++ .cvsignore	10 Dec 2009 08:38:11 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-ActionDispatch-0.97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-ActionDispatch/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:47:54 -0000	1.1
+++ sources	10 Dec 2009 08:38:11 -0000	1.2
@@ -0,0 +1 @@
+d99693993bfdfbfb22d9782e829dc38e  CGI-Application-Plugin-ActionDispatch-0.97.tar.gz



From petersen at fedoraproject.org  Thu Dec 10 08:38:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 10 Dec 2009 08:38:35 +0000 (UTC)
Subject: File libhangul-0.0.10.tar.gz uploaded to lookaside cache by petersen
Message-ID: <20091210083835.1087210F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libhangul:

696299109b86490c25989a539a0f9879  libhangul-0.0.10.tar.gz



From petersen at fedoraproject.org  Thu Dec 10 08:40:28 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 10 Dec 2009 08:40:28 +0000 (UTC)
Subject: rpms/libhangul/devel .cvsignore, 1.5, 1.6 libhangul.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <20091210084028.4D58C11C03FC@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/libhangul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22585

Modified Files:
	.cvsignore libhangul.spec sources 
Log Message:
- update to 0.0.10
- drop buildroot field and removal



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhangul/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jun 2009 04:19:11 -0000	1.5
+++ .cvsignore	10 Dec 2009 08:40:27 -0000	1.6
@@ -1 +1 @@
-libhangul-0.0.9.tar.gz
+libhangul-0.0.10.tar.gz


Index: libhangul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhangul/devel/libhangul.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libhangul.spec	25 Jul 2009 05:52:24 -0000	1.12
+++ libhangul.spec	10 Dec 2009 08:40:27 -0000	1.13
@@ -1,13 +1,11 @@
 Name:		libhangul
-Version:	0.0.9
-Release:	2%{?dist}
+Version:	0.0.10
+Release:	1%{?dist}
 
 License:	LGPLv2+
 URL:		http://kldp.net/projects/hangul/
-# no macros used since url changes every release:
-Source0:	http://kldp.net/frs/download.php/4943/libhangul-0.0.9.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+# url changes every release
+Source0:	http://kldp.net/frs/download.php/5417/libhangul-%{version}.tar.gz
 
 Summary:	Hangul input library
 Group:		System Environment/Libraries
@@ -38,8 +36,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}.la
@@ -59,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/lib*.so.*
-%{_libdir}/%{name}
+%{_datadir}/%{name}
 
 %files devel
 %defattr(-, root, root)
@@ -69,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Jens Petersen <petersen at redhat.com> - 0.0.10-1
+- update to 0.0.10
+- drop buildroot field and removal
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhangul/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jun 2009 04:19:11 -0000	1.5
+++ sources	10 Dec 2009 08:40:27 -0000	1.6
@@ -1 +1 @@
-9bd18fc131e86470b5350a199a326364  libhangul-0.0.9.tar.gz
+696299109b86490c25989a539a0f9879  libhangul-0.0.10.tar.gz



From sandeeps at fedoraproject.org  Thu Dec 10 08:41:57 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 08:41:57 +0000 (UTC)
Subject: rpms/woff/F-11 woff.spec,NONE,1.1
Message-ID: <20091210084157.BE3EE11C025D@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/woff/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23133

Added Files:
	woff.spec 
Log Message:
added woff.spec from devel branch


--- NEW FILE woff.spec ---
Name:           woff
Version:        0.20091126
Release:        2%{?dist}
Summary:        Encoding and Decoding for Web Open Font Format(Woff)

Group:          Development/Tools
License:        GPLv2+ or LGPLv2+ or MPLv1.1
URL:            http://people.mozilla.com/~jkew/woff/
Source0:        http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  zlib-devel

%description
Encoding and Decoding for Web Open Font Format(Woff)

%prep
%setup -q -c  


%build
make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -m 755 -p $RPM_BUILD_ROOT/%{_bindir}
install -m755 sfnt2woff woff2sfnt $RPM_BUILD_ROOT/%{_bindir}/



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
%{_bindir}/*


%changelog
* Sun Nov 29 2009 Parag Nemade <pnemade at redhat.com>- 0.20091126-2.fc12
- Added BR:zlib-devel

* Fri Nov 27 2009 Parag Nemade <pnemade at redhat.com>- 0.20091126-1.fc12
- Initial specfile for Fedora





From mhlavink at fedoraproject.org  Thu Dec 10 08:57:50 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 10 Dec 2009 08:57:50 +0000 (UTC)
Subject: rpms/smartmontools/devel .cvsignore, 1.7, 1.8 smartmontools.spec,
	1.69, 1.70 sources, 1.7, 1.8
Message-ID: <20091210085750.68CAD11C025D@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27954

Modified Files:
	.cvsignore smartmontools.spec sources 
Log Message:
* Wed Dec 10 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.39-1
- update to 5.39



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Dec 2009 10:23:41 -0000	1.7
+++ .cvsignore	10 Dec 2009 08:57:50 -0000	1.8
@@ -1 +1 @@
-smartmontools-5.39-rc1.tar.gz
+smartmontools-5.39.tar.gz


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- smartmontools.spec	2 Dec 2009 10:23:41 -0000	1.69
+++ smartmontools.spec	10 Dec 2009 08:57:50 -0000	1.70
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.39
-Release:	0.1.rc1%{?dist}
+Release:	1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -29,7 +29,7 @@ utilities will provide advanced warning 
 failure.
 
 %prep
-%setup -q -n %{name}-5.39
+%setup -q
 %patch1 -p1 -b .defaultconf
 %patch2 -p1 -b .lowcap
 
@@ -61,9 +61,6 @@ chmod a-x -R examplescripts/*
 install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd
 install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools
 
-# TODO: remove once 5.39 is released
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-5.39
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,6 +85,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Wed Dec 10 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.39-1
+- update to 5.39
+
 * Wed Dec 02 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.39-0.1.rc1
 - update to 5.39-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Dec 2009 10:23:41 -0000	1.7
+++ sources	10 Dec 2009 08:57:50 -0000	1.8
@@ -1 +1 @@
-1c5d1987f0d5fb779e6efe34ecf2d7d4  smartmontools-5.39-rc1.tar.gz
+63c1b5373a9ef91e9c9becb16e147571  smartmontools-5.39.tar.gz



From sandeeps at fedoraproject.org  Thu Dec 10 09:07:17 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 09:07:17 +0000 (UTC)
Subject: rpms/woff/F-11 sources,1.1,1.2 woff.spec,1.1,1.2
Message-ID: <20091210090717.D193F11C025D@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/woff/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31125

Modified Files:
	sources woff.spec 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/woff/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:44:45 -0000	1.1
+++ sources	10 Dec 2009 09:07:17 -0000	1.2
@@ -0,0 +1 @@
+1dcdbc9a7f48086185740c185d822279  woff-code-latest.zip


Index: woff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/woff/F-11/woff.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- woff.spec	10 Dec 2009 08:41:57 -0000	1.1
+++ woff.spec	10 Dec 2009 09:07:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           woff
 Version:        0.20091126
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Encoding and Decoding for Web Open Font Format(Woff)
 
 Group:          Development/Tools
@@ -34,11 +34,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc woff-2009-10-03.html
 %{_bindir}/*
 
 
 %changelog
+* Thu Dec 10 2009 Sandeep Shedmake <sshedmak at redhat.com>- 0.20091126-3
+- Added woff-2009-10-03.html
+
 * Sun Nov 29 2009 Parag Nemade <pnemade at redhat.com>- 0.20091126-2.fc12
 - Added BR:zlib-devel
 



From sandeeps at fedoraproject.org  Thu Dec 10 09:08:19 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 09:08:19 +0000 (UTC)
Subject: rpms/woff/F-12 woff.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091210090819.7F8BE11C025D@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/woff/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31447

Modified Files:
	sources 
Added Files:
	woff.spec 
Log Message:
initial import



--- NEW FILE woff.spec ---
Name:           woff
Version:        0.20091126
Release:        3%{?dist}
Summary:        Encoding and Decoding for Web Open Font Format(Woff)

Group:          Development/Tools
License:        GPLv2+ or LGPLv2+ or MPLv1.1
URL:            http://people.mozilla.com/~jkew/woff/
Source0:        http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  zlib-devel

%description
Encoding and Decoding for Web Open Font Format(Woff)

%prep
%setup -q -c  


%build
make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -m 755 -p $RPM_BUILD_ROOT/%{_bindir}
install -m755 sfnt2woff woff2sfnt $RPM_BUILD_ROOT/%{_bindir}/



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc woff-2009-10-03.html
%{_bindir}/*


%changelog
* Thu Dec 10 2009 Sandeep Shedmake <sshedmak at redhat.com>- 0.20091126-3
- Added woff-2009-10-03.html

* Sun Nov 29 2009 Parag Nemade <pnemade at redhat.com>- 0.20091126-2.fc12
- Added BR:zlib-devel

* Fri Nov 27 2009 Parag Nemade <pnemade at redhat.com>- 0.20091126-1.fc12
- Initial specfile for Fedora




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/woff/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:44:45 -0000	1.1
+++ sources	10 Dec 2009 09:08:19 -0000	1.2
@@ -0,0 +1 @@
+1dcdbc9a7f48086185740c185d822279  woff-code-latest.zip



From pravins at fedoraproject.org  Thu Dec 10 09:09:28 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 10 Dec 2009 09:09:28 +0000 (UTC)
Subject: rpms/system-config-language/F-12 system-config-language.spec, 1.59, 
	1.60
Message-ID: <20091210090928.2843411C025D@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31327

Modified Files:
	system-config-language.spec 
Log Message:
* Thu Dec 10 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-4
- updated URL and source field



Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/F-12/system-config-language.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- system-config-language.spec	10 Dec 2009 07:39:34 -0000	1.59
+++ system-config-language.spec	10 Dec 2009 09:09:27 -0000	1.60
@@ -3,12 +3,11 @@ Name: system-config-language
 Version: 1.3.3
 Release: 4%{?dist}
 URL: https://fedorahosted.org/system-config-language/
-source: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: %{name}-%{version}.tar.bz2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool



From mhlavink at fedoraproject.org  Thu Dec 10 09:11:57 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 10 Dec 2009 09:11:57 +0000 (UTC)
Subject: rpms/smartmontools/F-12 .cvsignore, 1.5,
	1.6 smartmontools-5.38-lowcap.patch, 1.6, 1.7 smartmontools.spec,
	1.68, 1.69 sources, 1.5, 1.6 smartmontools-5.37-addrinfo.patch,
	1.2, NONE smartmontools-5.38-cloexec.patch, 1.2,
	NONE smartmontools-5.38-perc.patch, 1.1,
	NONE smartmontools-5.38-selinux.patch, 1.1, NONE
Message-ID: <20091210091157.D1A9A11C025D@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv455

Modified Files:
	.cvsignore smartmontools-5.38-lowcap.patch smartmontools.spec 
	sources 
Removed Files:
	smartmontools-5.37-addrinfo.patch 
	smartmontools-5.38-cloexec.patch smartmontools-5.38-perc.patch 
	smartmontools-5.38-selinux.patch 
Log Message:
* Tue Nov 24 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.39-1
- update to 5.39



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Mar 2008 12:37:22 -0000	1.5
+++ .cvsignore	10 Dec 2009 09:11:57 -0000	1.6
@@ -1 +1 @@
-smartmontools-5.38.tar.gz
+smartmontools-5.39.tar.gz

smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 -
 configure.in |   34 +++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 +++++
 smartd.cpp   |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 97 insertions(+), 5 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- smartmontools-5.38-lowcap.patch	12 Oct 2009 15:17:53 -0000	1.6
+++ smartmontools-5.38-lowcap.patch	10 Dec 2009 09:11:57 -0000	1.7
@@ -1,7 +1,7 @@
-diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-12 17:00:53.889673785 +0200
-+++ smartmontools-5.38/configure.in	2009-10-12 17:00:53.896678618 +0200
-@@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
+diff -up smartmontools-5.39/configure.in.lowcap smartmontools-5.39/configure.in
+--- smartmontools-5.39/configure.in.lowcap	2009-11-19 10:54:53.000000000 +0100
++++ smartmontools-5.39/configure.in	2009-11-19 11:20:54.645701384 +0100
+@@ -219,6 +219,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
  
@@ -42,10 +42,10 @@ diff -up smartmontools-5.38/configure.in
  if test "$prefix" = "NONE"; then
      dnl no prefix and no mandir, so use ${prefix}/share/man as default
      if test "$mandir" = '${prefix}/man'; then
-diff -up smartmontools-5.38/Makefile.am.lowcap smartmontools-5.38/Makefile.am
---- smartmontools-5.38/Makefile.am.lowcap	2007-04-01 18:49:44.000000000 +0200
-+++ smartmontools-5.38/Makefile.am	2009-10-12 17:00:53.896678618 +0200
-@@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
+diff -up smartmontools-5.39/Makefile.am.lowcap smartmontools-5.39/Makefile.am
+--- smartmontools-5.39/Makefile.am.lowcap	2009-11-19 10:54:53.000000000 +0100
++++ smartmontools-5.39/Makefile.am	2009-11-19 11:20:54.646634706 +0100
+@@ -45,7 +45,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
  
@@ -54,10 +54,10 @@ diff -up smartmontools-5.38/Makefile.am.
  smartd_DEPENDENCIES = @os_deps@
  
  EXTRA_smartd_SOURCES = os_darwin.cpp    \
-diff -up smartmontools-5.38/smartd.8.in.lowcap smartmontools-5.38/smartd.8.in
---- smartmontools-5.38/smartd.8.in.lowcap	2008-03-04 23:09:47.000000000 +0100
-+++ smartmontools-5.38/smartd.8.in	2009-10-12 17:00:53.902672971 +0200
-@@ -145,6 +145,12 @@ input. This is useful for commands like:
+diff -up smartmontools-5.39/smartd.8.in.lowcap smartmontools-5.39/smartd.8.in
+--- smartmontools-5.39/smartd.8.in.lowcap	2009-11-19 10:54:53.000000000 +0100
++++ smartmontools-5.39/smartd.8.in	2009-11-19 11:20:54.651596342 +0100
+@@ -175,6 +175,12 @@ input. This is useful for commands like:
  to perform quick and simple checks without a configuration file.
  
  .TP
@@ -70,10 +70,10 @@ diff -up smartmontools-5.38/smartd.8.in.
  .B \-d, \-\-debug
  Runs \fBsmartd\fP in "debug" mode. In this mode, it displays status
  information to STDOUT rather than logging it to SYSLOG and does not
-diff -up smartmontools-5.38/smartd.cpp.lowcap smartmontools-5.38/smartd.cpp
---- smartmontools-5.38/smartd.cpp.lowcap	2009-10-12 17:00:53.883672847 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-12 17:04:18.600547796 +0200
-@@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
+diff -up smartmontools-5.39/smartd.cpp.lowcap smartmontools-5.39/smartd.cpp
+--- smartmontools-5.39/smartd.cpp.lowcap	2009-11-19 10:54:53.000000000 +0100
++++ smartmontools-5.39/smartd.cpp	2009-11-19 11:36:07.123632685 +0100
+@@ -77,6 +77,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__
  
@@ -84,7 +84,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
  // locally included files
  #include "int64.h"
  #include "atacmds.h"
-@@ -179,6 +183,11 @@ static int facility=LOG_DAEMON;
+@@ -190,6 +194,11 @@ static int facility=LOG_DAEMON;
  static bool do_fork=true;
  #endif
  
@@ -96,7 +96,17 @@ diff -up smartmontools-5.38/smartd.cpp.l
  // used for control of printing, passing arguments to atacmds.c
  smartmonctrl *con=NULL;
  
-@@ -613,6 +622,15 @@ void MailWarning(cfgfile *cfg, int which
+@@ -875,8 +884,7 @@ static void MailWarning(const dev_config
+   const char *unknown="[Unknown]";
+ 
+   // See if user wants us to send mail
+-  if (cfg.emailaddress.empty() && cfg.emailcmdline.empty())
+-    return;
++ 
+ 
+   std::string address = cfg.emailaddress;
+   const char * executable = cfg.emailcmdline.c_str();
+@@ -917,6 +925,15 @@ static void MailWarning(const dev_config
      if  (epoch<(mail->lastsent+days))
        return;
    }
@@ -112,49 +122,39 @@ diff -up smartmontools-5.38/smartd.cpp.l
  
    // record the time of this mail message, and the first mail message
    if (!mail->logged)
-@@ -1239,6 +1257,11 @@ void Usage (void){
-   PrintOut(LOG_INFO,"        Quit on one of: %s\n\n", GetValidArgList('q'));
-   PrintOut(LOG_INFO,"  -r, --report=TYPE\n");
-   PrintOut(LOG_INFO,"        Report transactions for one of: %s\n\n", GetValidArgList('r'));
+@@ -1464,6 +1481,11 @@ void Usage (void){
+   PrintOut(LOG_INFO,"\n");
+   PrintOut(LOG_INFO,"  -c NAME|-, --configfile=NAME|-\n");
+   PrintOut(LOG_INFO,"        Read configuration file NAME or stdin [default is %s]\n\n", configfile);
 +#ifdef HAVE_LIBCAP_NG
-+  PrintOut(LOG_INFO,"  -C, --usecapabilities\n");
++  PrintOut(LOG_INFO,"  -C, --capabilities\n");
 +  PrintOut(LOG_INFO,"        Use possix capabilities (EXPERIMENTAL).\n"
 +		    "        Warning: Mail notification does not work when used.\n\n");
 +#endif
- #ifdef _WIN32
-   PrintOut(LOG_INFO,"  --service\n");
-   PrintOut(LOG_INFO,"        Running as windows service (see man page), install with:\n");
-@@ -1260,6 +1283,9 @@ void Usage (void){
-   PrintOut(LOG_INFO,"  -p NAME    Write PID file NAME\n");
-   PrintOut(LOG_INFO,"  -q WHEN    Quit on one of: %s\n", GetValidArgList('q'));
-   PrintOut(LOG_INFO,"  -r TYPE    Report transactions for one of: %s\n", GetValidArgList('r'));
-+#ifdef HAVE_LIBCAP_NG
-+  PrintOut(LOG_INFO,"  -C         Use possix capabilities (EXPERIMENTAL)\n");
-+#endif
-   PrintOut(LOG_INFO,"  -V         Print License, Copyright, and version information\n");
- #endif
- }
-@@ -3866,7 +3892,7 @@ void ParseOpts(int argc, char **argv){
+   PrintOut(LOG_INFO,"  -d, --debug\n");
+   PrintOut(LOG_INFO,"        Start smartd in debug mode\n\n");
+   PrintOut(LOG_INFO,"  -D, --showdirectives\n");
+@@ -3701,7 +3723,7 @@ void ParseOpts(int argc, char **argv){
    char *tailptr;
    long lchecktime;
    // Please update GetValidArgList() if you edit shortopts
--  const char *shortopts = "c:l:q:dDni:p:r:Vh?";
-+  const char *shortopts = "c:l:q:dDni:p:r:VCh?";
- #ifdef HAVE_GETOPT_LONG
+-  const char *shortopts = "c:l:q:dDni:p:r:s:A:B:Vh?";
++  const char *shortopts = "c:l:q:dDni:p:r:s:A:B:VCh?";
    char *arg;
    // Please update GetValidArgList() if you edit longopts
-@@ -3890,6 +3916,9 @@ void ParseOpts(int argc, char **argv){
+   struct option longopts[] = {
+@@ -3727,6 +3749,9 @@ void ParseOpts(int argc, char **argv){
      { "copyright",      no_argument,       0, 'V' },
      { "help",           no_argument,       0, 'h' },
      { "usage",          no_argument,       0, 'h' },
 +#ifdef HAVE_LIBCAP_NG
-+    { "usecapabilities",no_argument,       0, 'C' },
++    { "capabilities",   no_argument,       0, 'C' },
 +#endif
      { 0,                0,                 0, 0   }
    };
- #endif
-@@ -4030,6 +4059,12 @@ void ParseOpts(int argc, char **argv){
-       PrintCopyleft();
+ 
+@@ -3885,6 +3910,12 @@ void ParseOpts(int argc, char **argv){
+       PrintOut(LOG_INFO, "%s", format_version_info("smartd", true /*full*/).c_str());
        EXIT(0);
        break;
 +#ifdef HAVE_LIBCAP_NG
@@ -166,11 +166,10 @@ diff -up smartmontools-5.38/smartd.cpp.l
      case 'h':
        // help: print summary of command-line options
        debugmode=1;
-@@ -4408,6 +4443,16 @@ static int smartd_main(int argc, char **
-   
-   // don't exit on bad checksums
-   con->checksumfail=0;
-+
+@@ -4224,6 +4255,16 @@ int main_worker(int argc, char **argv)
+ 
+   bool write_states_always = true;
+ 
 +#ifdef HAVE_LIBCAP_NG
 +  // Drop capabilities
 +  if (enable_capabilities) {
@@ -180,20 +179,21 @@ diff -up smartmontools-5.38/smartd.cpp.l
 +    capng_apply(CAPNG_SELECT_BOTH);
 +  }
 +#endif
-   
++
    // the main loop of the code
-   while (1){
-@@ -4482,7 +4527,18 @@ static int smartd_main(int argc, char **
-         PrintTestSchedule(ATAandSCSIdevlist);
+   for (;;) {
+ 
+@@ -4318,7 +4359,18 @@ int main_worker(int argc, char **argv)
+         PrintTestSchedule(configs, states, devices);
          EXIT(0);
        }
 -      
 +
 +#ifdef HAVE_LIBCAP_NG
 +      if (enable_capabilities) {
-+        for(int i=0; i<numdevata+numdevscsi; i++) {
-+          if (ATAandSCSIdevlist[i]->mailwarn) {
-+            PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
++        for (unsigned i = 0; i < configs.size(); i++) {
++	  if (configs.at(i).emailaddress.empty()) {
++            PrintOut(LOG_WARNING,"Mail can't be enabled together with --capabilities. All mail will be suppressed.\n");
 +            break;
 +          }
 +        }
@@ -202,4 +202,4 @@ diff -up smartmontools-5.38/smartd.cpp.l
 +
        // reset signal
        caughtsigHUP=0;
-     }
+ 


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- smartmontools.spec	25 Nov 2009 16:14:00 -0000	1.68
+++ smartmontools.spec	10 Dec 2009 09:11:57 -0000	1.69
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	5.38
-Release:	23%{?dist}
+Version:	5.39
+Release:	1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -10,26 +10,11 @@ Source0:	http://prdownloads.sourceforge.
 Source1:	smartd.initd
 Source2:	smartmontools.sysconf
 
-#exists upstream, required for <= 5.38
-Patch1:		smartmontools-5.38-cloexec.patch
-
-#exists upstream, required for <= 5.38
-Patch2:		smartmontools-5.37-addrinfo.patch
-
-#this was fixed upstream, required for <= 5.38
-Patch3:		smartmontools-5.38-perc.patch
-
-#exists upstream, required for <= 5.38
-Patch4:		smartmontools-5.38-selinux.patch
-
 #fedora/rhel specific
-Patch5:		smartmontools-5.38-defaultconf.patch
-
-#libcap-ng new feature
-Patch6:		smartmontools-5.38-lowcap.patch
+Patch1:		smartmontools-5.38-defaultconf.patch
 
-#taken from upstream, fixes building with autoconf 2.64, required for <= 5.38
-Patch7:         smartmontools-5.38-ac264.patch
+#libcap-ng new feature, testing for now
+Patch2:		smartmontools-5.38-lowcap.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:	fileutils mailx chkconfig initscripts
@@ -46,13 +31,8 @@ failure.
 
 %prep
 %setup -q
-%patch1 -p1 -b .cloexec
-%patch2 -p1 -b .addrinfo
-%patch3 -p1 -b .perc
-%patch4 -p1 -b .selinux
-%patch5 -p1 -b .defaultconf
-%patch6 -p1 -b .lowcap
-%patch7 -p1 -b .ac264
+%patch1 -p1 -b .defaultconf
+%patch2 -p1 -b .lowcap
 
 # fix encoding
 for fe in AUTHORS CHANGELOG
@@ -106,6 +86,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Tue Nov 24 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.39-1
+- update to 5.39
+
 * Tue Nov 24 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-23
 - fix building with autoconf 2.64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Mar 2008 12:37:22 -0000	1.5
+++ sources	10 Dec 2009 09:11:57 -0000	1.6
@@ -1 +1 @@
-a282846532ecbd6b4a28072373b3a70b  smartmontools-5.38.tar.gz
+63c1b5373a9ef91e9c9becb16e147571  smartmontools-5.39.tar.gz


--- smartmontools-5.37-addrinfo.patch DELETED ---


--- smartmontools-5.38-cloexec.patch DELETED ---


--- smartmontools-5.38-perc.patch DELETED ---


--- smartmontools-5.38-selinux.patch DELETED ---



From jnovy at fedoraproject.org  Thu Dec 10 09:25:06 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 10 Dec 2009 09:25:06 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-pamtosvg.patch, NONE, 1.1 .cvsignore, 1.60,
	1.61 netpbm-time.patch, 1.1, 1.2 netpbm.spec, 1.149,
	1.150 sources, 1.64, 1.65
Message-ID: <20091210092506.E781811C025D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5124

Modified Files:
	.cvsignore netpbm-time.patch netpbm.spec sources 
Added Files:
	netpbm-pamtosvg.patch 
Log Message:
* Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 10.47.05-1
- update to 10.47.05
- fixes pnmtofiasco, fiascotopnm, pamtosvg, pamtouil and ppmrainbow
- upstream fix to pamtosvg caused netpbm not to be rebuildable on
  any arch because of missing semicolon, the fix is now fixed :-/


netpbm-pamtosvg.patch:
 vector.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-pamtosvg.patch ---
diff -up netpbm-10.47.05/converter/other/pamtosvg/vector.c.pamtosvg netpbm-10.47.05/converter/other/pamtosvg/vector.c
--- netpbm-10.47.05/converter/other/pamtosvg/vector.c.pamtosvg	2009-12-10 08:34:36.000000000 +0100
+++ netpbm-10.47.05/converter/other/pamtosvg/vector.c	2009-12-10 09:58:16.000000000 +0100
@@ -39,7 +39,7 @@ vector_to_point(vector_type const v) {
 
     coord.x = v.dx;
     coord.y = v.dy;
-    coord.z = v.dz
+    coord.z = v.dz;
 
     return coord;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	21 Oct 2009 15:31:04 -0000	1.60
+++ .cvsignore	10 Dec 2009 09:25:05 -0000	1.61
@@ -1 +1 @@
-netpbm-10.47.04.tar.xz
+netpbm-10.47.05.tar.xz

netpbm-time.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: netpbm-time.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-time.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netpbm-time.patch	21 Oct 2009 15:11:20 -0000	1.1
+++ netpbm-time.patch	10 Dec 2009 09:25:05 -0000	1.2
@@ -1,20 +1,21 @@
---- netpbm-10.17/converter/other/fiasco/config.h.time	2001-05-28 02:43:11.000000000 +0200
-+++ netpbm-10.17/converter/other/fiasco/config.h	2003-09-08 15:23:17.000000000 +0200
+diff -up netpbm-10.47.05/converter/other/fiasco/config.h.time netpbm-10.47.05/converter/other/fiasco/config.h
+--- netpbm-10.47.05/converter/other/fiasco/config.h.time	2009-12-10 08:34:36.000000000 +0100
++++ netpbm-10.47.05/converter/other/fiasco/config.h	2009-12-10 08:43:54.000000000 +0100
 @@ -19,7 +19,7 @@
  #define STDC_HEADERS 1
  
  /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 -#define TIME_WITH_SYS_TIME 1
-+/* #undef TIME_WITH_SYS_TIME 1 */
++/* #undef TIME_WITH_SYS_TIME */
  
- /* Define if your processor stores words with the most significant
-    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-@@ -79,7 +79,7 @@
+ /* Define if the X Window System is missing or not being used.  */
+ #define X_DISPLAY_MISSING 1
+@@ -75,7 +75,7 @@
  #define HAVE_STRING_H 1
  
  /* Define if you have the <sys/time.h> header file.  */
 -#define HAVE_SYS_TIME_H 1
-+/* #undef HAVE_SYS_TIME_H 1 */
++/* #undef HAVE_SYS_TIME_H */
  
  /* Define if you have the <unistd.h> header file.  */
  #define HAVE_UNISTD_H 1


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- netpbm.spec	8 Dec 2009 09:18:42 -0000	1.149
+++ netpbm.spec	10 Dec 2009 09:25:05 -0000	1.150
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.47.04
-Release: 3%{?dist}
+Version: 10.47.05
+Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -28,6 +28,7 @@ Patch14: netpbm-pnmtofiasco-stdin.patch
 Patch15: netpbm-svgtopam.patch
 Patch16: netpbm-ppmpat-segfault.patch
 Patch17: netpbm-pnmsmooth-segfault.patch
+Patch18: netpbm-pamtosvg.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -86,6 +87,7 @@ netpbm-progs.  You'll also need to insta
 %patch15 -p1 -b .svgtopam
 %patch16 -p1 -b .ppmpat-segfault
 %patch17 -p1 -b .pnmsmooth-segfault
+%patch18 -p1 -b .pamtosvg
 
 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
@@ -214,6 +216,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 10.47.05-1
+- update to 10.47.05
+- fixes pnmtofiasco, fiascotopnm, pamtosvg, pamtouil and ppmrainbow
+- upstream fix to pamtosvg caused netpbm not to be rebuildable on
+  any arch because of missing semicolon, the fix is now fixed :-/
+
 * Mon Dec  7 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-3
 - fix segfault in pnmsmooth (#545089)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	21 Oct 2009 15:31:05 -0000	1.64
+++ sources	10 Dec 2009 09:25:05 -0000	1.65
@@ -1 +1 @@
-87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz
+b3076d696dff3673d66412d111356141  netpbm-10.47.05.tar.xz



From eseyman at fedoraproject.org  Thu Dec 10 09:27:25 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 10 Dec 2009 09:27:25 +0000 (UTC)
Subject: File Titanium-1.04.tar.gz uploaded to lookaside cache by eseyman
Message-ID: <20091210092725.98D3F10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Titanium:

f74318a8132b029a8611bc1580a75d32  Titanium-1.04.tar.gz



From petersen at fedoraproject.org  Thu Dec 10 09:28:26 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 10 Dec 2009 09:28:26 +0000 (UTC)
Subject: rpms/ghc-X11-xft/F-12 ghc-X11-xft.spec,1.2,1.3
Message-ID: <20091210092826.6434A11C025D@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-X11-xft/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6470

Modified Files:
	ghc-X11-xft.spec 
Log Message:
add ppc cabal workaround hack


Index: ghc-X11-xft.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-X11-xft/F-12/ghc-X11-xft.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-X11-xft.spec	10 Dec 2009 04:31:03 -0000	1.2
+++ ghc-X11-xft.spec	10 Dec 2009 09:28:25 -0000	1.3
@@ -8,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.3
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Haskell bindings to the Xft library
 
 Group:          Development/Libraries
@@ -90,6 +90,12 @@ built for ghc-%{ghc_version}.
 
 
 %build
+%ifarch ppc
+# hack around mysterious runghc fail
+%global cabal ./cabal
+ghc --make Setup -o cabal
+%endif
+
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
@@ -151,6 +157,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Jens Petersen <petersen at redhat.com> - 0.3-4.1
+- add ppc cabal workaround hack
+
 * Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.3-4
 - rebuild for ghc-X11-1.4.6.1
 - use %%ghc_pkg_ver for lib dep requires



From pravins at fedoraproject.org  Thu Dec 10 09:29:21 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 10 Dec 2009 09:29:21 +0000 (UTC)
Subject: rpms/system-config-language/devel s-c-l_530698.patch, NONE,
	1.1 system-config-language.spec, 1.57, 1.58
Message-ID: <20091210092921.4E32811C025D@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6793

Modified Files:
	system-config-language.spec 
Added Files:
	s-c-l_530698.patch 
Log Message:
* Thu Dec 10 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-4
- updated URL and source field


s-c-l_530698.patch:
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE s-c-l_530698.patch ---
diff -rup system-config-language-1.3.3/Makefile system-config-language-1.3.3_mod/Makefile
--- system-config-language-1.3.3/Makefile	2009-09-23 12:29:48.000000000 +0530
+++ system-config-language-1.3.3_mod/Makefile	2009-10-26 16:48:47.955072133 +0530
@@ -27,8 +27,8 @@ install: ${PKGNAME}.desktop
 	mkdir -p $(INSTROOT)$(SECURITY_DIR)
 	mkdir -p $(INSTROOT)$(PKGDATADIR)/pixmaps
 	mkdir -p $(INSTROOT)/usr/share/applications
-	mkdir -p $(INSTROOT)/usr/share/firstboot
-	mkdir -p $(INSTROOT)/usr/share/firstboot/modules
+#	mkdir -p $(INSTROOT)/usr/share/firstboot
+#	mkdir -p $(INSTROOT)/usr/share/firstboot/modules
 	mkdir -p $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
 
 	install src/*.py $(INSTROOT)$(PKGDATADIR)
@@ -40,7 +40,7 @@ install: ${PKGNAME}.desktop
 	install pixmaps/${PKGNAME}.png $(INSTROOT)$(PKGDATADIR)/pixmaps/${PKGNAME}.png
 	install pixmaps/${PKGNAME}.png $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
 	ln -sf consolehelper $(INSTROOT)/usr/bin/${PKGNAME}
-	ln -sf $(PKGDATADIR)/language_gui.py $(INSTROOT)/usr/share/firstboot/modules/language.py 
+#	ln -sf $(PKGDATADIR)/language_gui.py $(INSTROOT)/usr/share/firstboot/modules/language.py 
 	for d in $(SUBDIRS); do \
 	(cd $$d; $(MAKE) INSTROOT=$(INSTROOT) MANDIR=$(MANDIR) install) \
 		|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- system-config-language.spec	9 Oct 2009 06:19:28 -0000	1.57
+++ system-config-language.spec	10 Dec 2009 09:29:21 -0000	1.58
@@ -1,13 +1,13 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.3
-Release: 2%{?dist}
-URL: http://fedoraproject.org/wiki/SystemConfig/language
+Release: 4%{?dist}
+URL: https://fedorahosted.org/system-config-language/
+Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: %{name}-%{version}.tar.bz2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -19,6 +19,7 @@ Requires: yum >= 2.9.5
 Requires: gtk2 >= 2.6
 Obsoletes: locale_config  <= %{version}
 Patch1:         s-c-l_525040.patch
+Patch2:         s-c-l_530698.patch
 
 %description
 system-config-language is a graphical user interface that 
@@ -27,6 +28,7 @@ allows the user to change the default la
 %prep
 %setup -q
 %patch1 -p1 -b .1-525040
+%patch2 -p1 -b .1-530698
 
 %build
 make %{?_smp_mflags}
@@ -75,15 +77,21 @@ fi
 %{_bindir}/system-config-language
 %dir %{_datadir}/system-config-language
 %{_datadir}/system-config-language/*
-%dir %{_datadir}/firstboot/
-%dir %{_datadir}/firstboot/modules
-%{_datadir}/firstboot/modules/language.py*
+#%dir %{_datadir}/firstboot/
+#%dir %{_datadir}/firstboot/modules
+#%{_datadir}/firstboot/modules/language.py*
 %{_datadir}/applications/system-config-language.desktop
 %{_datadir}/icons/hicolor/48x48/apps/system-config-language.png
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-language
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Thu Dec 10 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-4
+- updated URL and source field
+
+* Mon Oct 26 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-3
+- fixed 530698
+
 * Fri Oct 09 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-2
 - fixed 525040
 



From sandeeps at fedoraproject.org  Thu Dec 10 09:38:03 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 09:38:03 +0000 (UTC)
Subject: File woffTools-0.1beta.tar.gz uploaded to lookaside cache by
	sandeeps
Message-ID: <20091210093803.496AE10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for woffTools:

a3303c4143041f7d6be0a84c13f41066  woffTools-0.1beta.tar.gz



From eseyman at fedoraproject.org  Thu Dec 10 09:38:11 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 10 Dec 2009 09:38:11 +0000 (UTC)
Subject: rpms/perl-Titanium/devel .cvsignore, 1.2, 1.3 perl-Titanium.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091210093811.BE93A11C025D@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Titanium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10094

Modified Files:
	.cvsignore perl-Titanium.spec sources 
Log Message:
Update to 1.04


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Titanium/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jul 2009 15:32:51 -0000	1.2
+++ .cvsignore	10 Dec 2009 09:38:11 -0000	1.3
@@ -1 +1 @@
-Titanium-1.03.tar.gz
+Titanium-1.04.tar.gz


Index: perl-Titanium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Titanium/devel/perl-Titanium.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Titanium.spec	4 Dec 2009 02:35:42 -0000	1.3
+++ perl-Titanium.spec	10 Dec 2009 09:38:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Titanium
-Version:        1.03
-Release:        2%{?dist}
+Version:        1.04
+Release:        1%{?dist}
 Summary:        Strong, lightweight web application famework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.04-1
+- Update to 1.04
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.03-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Titanium/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jul 2009 15:32:52 -0000	1.2
+++ sources	10 Dec 2009 09:38:11 -0000	1.3
@@ -1 +1 @@
-e75f72ff1a4855125774b31f1bf8e1e4  Titanium-1.03.tar.gz
+f74318a8132b029a8611bc1580a75d32  Titanium-1.04.tar.gz



From sandeeps at fedoraproject.org  Thu Dec 10 09:39:08 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 09:39:08 +0000 (UTC)
Subject: rpms/woffTools/devel import.log, NONE, 1.1 woffTools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210093908.EFE4411C025D@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/woffTools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10472/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log woffTools.spec 
Log Message:
initial import



--- NEW FILE import.log ---
woffTools-0_1-0_1_684svn_fc13:HEAD:woffTools-0.1-0.1.684svn.fc13.src.rpm:1260437887


--- NEW FILE woffTools.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define svnrev 684

Name:           woffTools
Version:        0.1
Release:        0.1.%{svnrev}svn%{?dist}
Summary:        Tool for manipulating and examining WOFF files

Group:          Development/Languages
License:        MIT
URL:            http://code.typesupply.com/wiki/woffTools
##### svn checkout HOWTO #####
#####  $ svn export -r %{svnrev} http://svn.typesupply.com/packages/woffTools/trunk woffTools #####
#####  $  python setup.py sdist --formats gztar                                 #####  
Source0:        woffTools-0.1beta.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires: fonttools

%description
woffTools is a collection of command line tools for verifying and
examining WOFF files. This is also a Python package that can be used
to manipulate and examine WOFF files just as you can examine SFNT files
with FontTools.

%prep
%setup -q -n %{name}-%{version}beta


%build
%{__python} setup.py build



%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt PKG-INFO
%{_bindir}/*
%{python_sitelib}/*


%changelog
* Fri Nov 27 2009 Parag Nemade <pnemade at redhat.com>- 0.1-0.1.684svn
- Initial specfile for Fedora




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/woffTools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:45:29 -0000	1.1
+++ .cvsignore	10 Dec 2009 09:39:08 -0000	1.2
@@ -0,0 +1 @@
+woffTools-0.1beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/woffTools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:45:29 -0000	1.1
+++ sources	10 Dec 2009 09:39:08 -0000	1.2
@@ -0,0 +1 @@
+a3303c4143041f7d6be0a84c13f41066  woffTools-0.1beta.tar.gz



From petersen at fedoraproject.org  Thu Dec 10 09:43:18 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 10 Dec 2009 09:43:18 +0000 (UTC)
Subject: rpms/ghc-xmonad-contrib/F-12 .cvsignore, 1.2,
	1.3 ghc-xmonad-contrib.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091210094318.836C511C025D@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-xmonad-contrib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12152

Modified Files:
	.cvsignore ghc-xmonad-contrib.spec sources 
Log Message:
backport 0.9 from rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-xmonad-contrib/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Sep 2009 21:19:49 -0000	1.2
+++ .cvsignore	10 Dec 2009 09:43:18 -0000	1.3
@@ -1 +1 @@
-xmonad-contrib-0.8.1.tar.gz
+xmonad-contrib-0.9.tar.gz


Index: ghc-xmonad-contrib.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-xmonad-contrib/F-12/ghc-xmonad-contrib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-xmonad-contrib.spec	24 Sep 2009 21:19:49 -0000	1.1
+++ ghc-xmonad-contrib.spec	10 Dec 2009 09:43:18 -0000	1.2
@@ -7,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        0.8.1
-Release:        8%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Third party extensions for xmonad
 
 Group:          Development/Libraries
@@ -26,6 +26,7 @@ BuildRequires:  ghc, ghc-rpm-macros
 BuildRequires:  ghc-doc
 BuildRequires:  ghc-utf8-string-doc
 BuildRequires:  ghc-X11-xft-doc
+BuildRequires:  ghc-xmonad-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
@@ -56,9 +57,9 @@ Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
-Requires:       ghc-xmonad-devel
-Requires:       ghc-utf8-string-devel
-Requires:       ghc-X11-xft-devel
+Requires:       ghc-xmonad-devel = %ghc_pkg_ver xmonad
+Requires:       ghc-utf8-string-devel = %ghc_pkg_ver utf8-string
+Requires:       ghc-X11-xft-devel = %ghc_pkg_ver X11-xft
 
 %description devel
 This package contains the development files for %{name}
@@ -72,10 +73,9 @@ Group:          Development/Libraries
 Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
-Requires:       ghc-xmonad-doc
-Requires:       ghc-utf8-string-doc
-Requires:       ghc-X11-xft-doc
-BuildRequires:  ghc-xmonad-doc
+Requires:       ghc-xmonad-doc = %ghc_pkg_ver xmonad
+Requires:       ghc-utf8-string-doc = %ghc_pkg_ver utf8-string
+Requires:       ghc-X11-xft-doc = %ghc_pkg_ver X11-xft
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -88,9 +88,9 @@ Summary:        Profiling libraries for 
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       ghc-prof = %{ghc_version}
-Requires:       ghc-xmonad-prof
-Requires:       ghc-utf8-string-prof
-Requires:       ghc-X11-xft-prof
+Requires:       ghc-xmonad-prof = %ghc_pkg_ver xmonad
+Requires:       ghc-utf8-string-prof = %ghc_pkg_ver utf8-string
+Requires:       ghc-X11-xft-prof = %ghc_pkg_ver X11-xft
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -164,6 +164,10 @@ fi
 
 
 %changelog
+* Tue Nov 17 2009 Jens Petersen <petersen at redhat.com> - 0.9-1
+- update to 0.9
+- use %%ghc_pkg_ver for dep requires versions
+
 * Fri Aug 28 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.8.1-8
 - added a few more docs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-xmonad-contrib/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Sep 2009 21:19:49 -0000	1.2
+++ sources	10 Dec 2009 09:43:18 -0000	1.3
@@ -1 +1 @@
-03f74fda270aca759407787da73e50d9  xmonad-contrib-0.8.1.tar.gz
+545485c8ec417de9e1c36975c17656d4  xmonad-contrib-0.9.tar.gz



From sandeeps at fedoraproject.org  Thu Dec 10 09:50:07 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 09:50:07 +0000 (UTC)
Subject: rpms/woffTools/F-12 woffTools.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091210095007.22D6811C03C6@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/woffTools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14059

Modified Files:
	sources 
Added Files:
	woffTools.spec 
Log Message:



--- NEW FILE woffTools.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define svnrev 684

Name:           woffTools
Version:        0.1
Release:        0.1.%{svnrev}svn%{?dist}
Summary:        Tool for manipulating and examining WOFF files

Group:          Development/Languages
License:        MIT
URL:            http://code.typesupply.com/wiki/woffTools
##### svn checkout HOWTO #####
#####  $ svn export -r %{svnrev} http://svn.typesupply.com/packages/woffTools/trunk woffTools #####
#####  $  python setup.py sdist --formats gztar                                 #####  
Source0:        woffTools-0.1beta.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires: fonttools

%description
woffTools is a collection of command line tools for verifying and
examining WOFF files. This is also a Python package that can be used
to manipulate and examine WOFF files just as you can examine SFNT files
with FontTools.

%prep
%setup -q -n %{name}-%{version}beta


%build
%{__python} setup.py build



%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt PKG-INFO
%{_bindir}/*
%{python_sitelib}/*


%changelog
* Fri Nov 27 2009 Parag Nemade <pnemade at redhat.com>- 0.1-0.1.684svn
- Initial specfile for Fedora




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/woffTools/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:45:29 -0000	1.1
+++ sources	10 Dec 2009 09:50:06 -0000	1.2
@@ -0,0 +1 @@
+a3303c4143041f7d6be0a84c13f41066  woffTools-0.1beta.tar.gz



From sandeeps at fedoraproject.org  Thu Dec 10 09:51:24 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Thu, 10 Dec 2009 09:51:24 +0000 (UTC)
Subject: rpms/woffTools/F-11 woffTools.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091210095124.6BFBB11C025D@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/woffTools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14591

Modified Files:
	sources 
Added Files:
	woffTools.spec 
Log Message:



--- NEW FILE woffTools.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define svnrev 684

Name:           woffTools
Version:        0.1
Release:        0.1.%{svnrev}svn%{?dist}
Summary:        Tool for manipulating and examining WOFF files

Group:          Development/Languages
License:        MIT
URL:            http://code.typesupply.com/wiki/woffTools
##### svn checkout HOWTO #####
#####  $ svn export -r %{svnrev} http://svn.typesupply.com/packages/woffTools/trunk woffTools #####
#####  $  python setup.py sdist --formats gztar                                 #####  
Source0:        woffTools-0.1beta.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires: fonttools

%description
woffTools is a collection of command line tools for verifying and
examining WOFF files. This is also a Python package that can be used
to manipulate and examine WOFF files just as you can examine SFNT files
with FontTools.

%prep
%setup -q -n %{name}-%{version}beta


%build
%{__python} setup.py build



%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt PKG-INFO
%{_bindir}/*
%{python_sitelib}/*


%changelog
* Fri Nov 27 2009 Parag Nemade <pnemade at redhat.com>- 0.1-0.1.684svn
- Initial specfile for Fedora




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/woffTools/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:45:29 -0000	1.1
+++ sources	10 Dec 2009 09:51:23 -0000	1.2
@@ -0,0 +1 @@
+a3303c4143041f7d6be0a84c13f41066  woffTools-0.1beta.tar.gz



From akurtakov at fedoraproject.org  Thu Dec 10 10:01:54 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 10 Dec 2009 10:01:54 +0000 (UTC)
Subject: File org.python.pydev.feature-1.5.3.1260390783-sources.zip uploaded
	to lookaside cache by akurtakov
Message-ID: <20091210100154.B9C7B10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-pydev:

3e19b990d1bdc6606391787e518af87f  org.python.pydev.feature-1.5.3.1260390783-sources.zip



From akurtakov at fedoraproject.org  Thu Dec 10 10:07:15 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 10 Dec 2009 10:07:15 +0000 (UTC)
Subject: rpms/eclipse-pydev/devel .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 eclipse-pydev.spec, 1.35, 1.36
Message-ID: <20091210100715.0BDEC11C025D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21191/devel

Modified Files:
	.cvsignore sources eclipse-pydev.spec 
Log Message:
Update to 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	9 Dec 2009 13:50:35 -0000	1.23
+++ .cvsignore	10 Dec 2009 10:07:14 -0000	1.24
@@ -5,3 +5,4 @@ org.python.pydev.feature-1.4.7.2843-sour
 org.python.pydev.feature-1.5.0.1251989166-sources.zip
 org.python.pydev.feature-1.5.1.1258496115-sources.zip
 org.python.pydev.feature-1.5.2.1260362205-sources.zip
+org.python.pydev.feature-1.5.3.1260390783-sources.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Dec 2009 13:50:35 -0000	1.23
+++ sources	10 Dec 2009 10:07:14 -0000	1.24
@@ -1 +1 @@
-b1ceb7a0ac4ab492e30e56e3fd6ef13b  org.python.pydev.feature-1.5.2.1260362205-sources.zip
+3e19b990d1bdc6606391787e518af87f  org.python.pydev.feature-1.5.3.1260390783-sources.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- eclipse-pydev.spec	9 Dec 2009 13:50:35 -0000	1.35
+++ eclipse-pydev.spec	10 Dec 2009 10:07:14 -0000	1.36
@@ -1,6 +1,6 @@
 # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
 %global debug_package %{nil}
-%global qualifier 1260362205
+%global qualifier 1260390783
 
 Epoch: 1
 
@@ -9,7 +9,7 @@ Epoch: 1
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          1.5.2
+Version:          1.5.3
 Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.org
@@ -205,6 +205,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Thu Dec 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.3-1
+- Update to 1.5.3.
+
 * Wed Dec 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.2-1
 - Update to 1.5.2.
 



From jzeleny at fedoraproject.org  Thu Dec 10 10:18:30 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu, 10 Dec 2009 10:18:30 +0000 (UTC)
Subject: rpms/fcoe-utils/devel fcoe-utils.spec,1.9,1.10
Message-ID: <20091210101830.60E9011C025D@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25282

Modified Files:
	fcoe-utils.spec 
Log Message:
excluded s390 and ppc


Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fcoe-utils.spec	4 Dec 2009 08:53:05 -0000	1.9
+++ fcoe-utils.spec	10 Dec 2009 10:18:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
 Version:        1.0.9
-Release:        1.20091204git%{?dist}
+Release:        2.20091204git%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -18,6 +18,7 @@ Patch1:         fcoe-utils-1.0.7-init-co
 Patch2:         fcoe-utils-1.0.8-includes.patch
 Patch3:         fcoe-utils-1.0.8-init-LSB.patch
 BuildRoot:      1{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:	s390 ppc
 
 BuildRequires:    libhbaapi-devel dcbd-devel libtool automake kernel-devel
 Requires:         dcbd libhbalinux >= 1.0.8
@@ -98,6 +99,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.9-2.20091204git
+- excluded s390 and ppc
+
 * Fri Dec 04 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.9-1.20091204git
 - rebase to latest version of fcoe-utils
 



From pbrobinson at fedoraproject.org  Thu Dec 10 10:21:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Dec 2009 10:21:03 +0000 (UTC)
Subject: File network-manager-netbook-1.7.0.tar.bz2 uploaded to lookaside
	cache by pbrobinson
Message-ID: <20091210102103.C7E4010F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for network-manager-netbook:

6a616eddd0a09cd2c0ba2019baef4133  network-manager-netbook-1.7.0.tar.bz2



From pbrobinson at fedoraproject.org  Thu Dec 10 10:21:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Dec 2009 10:21:52 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel .cvsignore, 1.4,
	1.5 network-manager-netbook.spec, 1.11, 1.12 sources, 1.5, 1.6
Message-ID: <20091210102152.3C07411C025D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/network-manager-netbook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26414

Modified Files:
	.cvsignore network-manager-netbook.spec sources 
Log Message:
- Update to new n-m-n git head, add bluetooth support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Oct 2009 18:28:12 -0000	1.4
+++ .cvsignore	10 Dec 2009 10:21:51 -0000	1.5
@@ -1 +1 @@
-network-manager-netbook-1.3.1.tar.bz2
+network-manager-netbook-1.7.0.tar.bz2


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- network-manager-netbook.spec	4 Dec 2009 05:29:12 -0000	1.11
+++ network-manager-netbook.spec	10 Dec 2009 10:21:51 -0000	1.12
@@ -1,25 +1,24 @@
 # Tarfile created using git
 # git clone git://git.gnome.org/network-manager-netbook
-# git checkout -b MplPanelClient origin/MplPanelClient
 # git archive --format=tar --prefix=network-manager-netbook-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
-%define git_version 84f9ed2
+%define git_version 37433bc
 %define tarfile %{name}-%{version}.tar.bz2
 
 Name:           network-manager-netbook
-Version:        1.3.1
-Release:        0.6%{?dist}
+Version:        1.7.0
+Release:        0.1%{?dist}
 Summary:        Moblin Netbook GUI for NetworkManger
 
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://projects.gnome.org/NetworkManager/
 Source0:        %{tarfile}
-Patch0:         network-manager-netbook-full-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
 BuildRequires: gtk2-devel
 BuildRequires: GConf2-devel
+BuildRequires: gnome-bluetooth-libs-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libnotify-devel
 BuildRequires: mobile-broadband-provider-info-devel
@@ -43,7 +42,6 @@ NetworkManager to connect to wired, wire
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixdesktop
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -61,6 +59,9 @@ make install DESTDIR=%{buildroot} INSTAL
 
 %find_lang %{name}
 
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
 %clean
 rm -rf %{buildroot}
 
@@ -81,6 +82,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc AUTHORS COPYING
 %{_sysconfdir}/xdg/autostart/network-manager-netbook.desktop
 %{_libexecdir}/network-manager-netbook
+%{_libdir}/gnome-bluetooth/plugins/libnma.so
 %{_datadir}/network-manager-netbook
 %{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.network.service
 %{_datadir}/icons/hicolor/22x22/apps/nm-*
@@ -88,6 +90,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Thu Dec 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.7.0-0.1
+- Update to new n-m-n git head, add bluetooth support
+
 * Fri Dec  4 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.6
 - Update n-m-n desktop file patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Nov 2009 14:03:01 -0000	1.5
+++ sources	10 Dec 2009 10:21:52 -0000	1.6
@@ -1 +1 @@
-9f247b76058d8f51e038c827c9216821  network-manager-netbook-1.3.1.tar.bz2
+6a616eddd0a09cd2c0ba2019baef4133  network-manager-netbook-1.7.0.tar.bz2



From pbrobinson at fedoraproject.org  Thu Dec 10 10:30:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Dec 2009 10:30:42 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel COPYING, 1.1,
	NONE network-manager-netbook-full-desktop.patch, 1.2, NONE
Message-ID: <20091210103042.2F48511C02CA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/network-manager-netbook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29309

Removed Files:
	COPYING network-manager-netbook-full-desktop.patch 
Log Message:
- remove upstream patches


--- COPYING DELETED ---


--- network-manager-netbook-full-desktop.patch DELETED ---



From jnovy at fedoraproject.org  Thu Dec 10 10:34:10 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 10 Dec 2009 10:34:10 +0000 (UTC)
Subject: rpms/netpbm/F-12 netpbm-pamtosvg.patch, NONE, 1.1 .cvsignore, 1.59, 
	1.60 netpbm-time.patch, 1.1, 1.2 netpbm.spec, 1.148,
	1.149 sources, 1.63, 1.64
Message-ID: <20091210103410.2892A11C025D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30720

Modified Files:
	.cvsignore netpbm-time.patch netpbm.spec sources 
Added Files:
	netpbm-pamtosvg.patch 
Log Message:
* Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 10.47.05-1
- update to 10.47.05
- fixes pnmtofiasco, fiascotopnm, pamtosvg, pamtouil and ppmrainbow
- upstream fix to pamtosvg caused netpbm not to be rebuildable on
  any arch because of missing semicolon, the fix is now fixed :-/


netpbm-pamtosvg.patch:
 vector.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-pamtosvg.patch ---
diff -up netpbm-10.47.05/converter/other/pamtosvg/vector.c.pamtosvg netpbm-10.47.05/converter/other/pamtosvg/vector.c
--- netpbm-10.47.05/converter/other/pamtosvg/vector.c.pamtosvg	2009-12-10 08:34:36.000000000 +0100
+++ netpbm-10.47.05/converter/other/pamtosvg/vector.c	2009-12-10 09:58:16.000000000 +0100
@@ -39,7 +39,7 @@ vector_to_point(vector_type const v) {
 
     coord.x = v.dx;
     coord.y = v.dy;
-    coord.z = v.dz
+    coord.z = v.dz;
 
     return coord;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	21 Oct 2009 16:06:18 -0000	1.59
+++ .cvsignore	10 Dec 2009 10:34:09 -0000	1.60
@@ -1 +1 @@
-netpbm-10.47.04.tar.xz
+netpbm-10.47.05.tar.xz

netpbm-time.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: netpbm-time.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/netpbm-time.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netpbm-time.patch	21 Oct 2009 16:06:19 -0000	1.1
+++ netpbm-time.patch	10 Dec 2009 10:34:09 -0000	1.2
@@ -1,20 +1,21 @@
---- netpbm-10.17/converter/other/fiasco/config.h.time	2001-05-28 02:43:11.000000000 +0200
-+++ netpbm-10.17/converter/other/fiasco/config.h	2003-09-08 15:23:17.000000000 +0200
+diff -up netpbm-10.47.05/converter/other/fiasco/config.h.time netpbm-10.47.05/converter/other/fiasco/config.h
+--- netpbm-10.47.05/converter/other/fiasco/config.h.time	2009-12-10 08:34:36.000000000 +0100
++++ netpbm-10.47.05/converter/other/fiasco/config.h	2009-12-10 08:43:54.000000000 +0100
 @@ -19,7 +19,7 @@
  #define STDC_HEADERS 1
  
  /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 -#define TIME_WITH_SYS_TIME 1
-+/* #undef TIME_WITH_SYS_TIME 1 */
++/* #undef TIME_WITH_SYS_TIME */
  
- /* Define if your processor stores words with the most significant
-    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-@@ -79,7 +79,7 @@
+ /* Define if the X Window System is missing or not being used.  */
+ #define X_DISPLAY_MISSING 1
+@@ -75,7 +75,7 @@
  #define HAVE_STRING_H 1
  
  /* Define if you have the <sys/time.h> header file.  */
 -#define HAVE_SYS_TIME_H 1
-+/* #undef HAVE_SYS_TIME_H 1 */
++/* #undef HAVE_SYS_TIME_H */
  
  /* Define if you have the <unistd.h> header file.  */
  #define HAVE_UNISTD_H 1


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/netpbm.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- netpbm.spec	8 Dec 2009 09:24:03 -0000	1.148
+++ netpbm.spec	10 Dec 2009 10:34:09 -0000	1.149
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.47.04
-Release: 3%{?dist}
+Version: 10.47.05
+Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -28,6 +28,7 @@ Patch14: netpbm-pnmtofiasco-stdin.patch
 Patch15: netpbm-svgtopam.patch
 Patch16: netpbm-ppmpat-segfault.patch
 Patch17: netpbm-pnmsmooth-segfault.patch
+Patch18: netpbm-pamtosvg.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -86,6 +87,7 @@ netpbm-progs.  You'll also need to insta
 %patch15 -p1 -b .svgtopam
 %patch16 -p1 -b .ppmpat-segfault
 %patch17 -p1 -b .pnmsmooth-segfault
+%patch18 -p1 -b .pamtosvg
 
 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
@@ -214,6 +216,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 10.47.05-1
+- update to 10.47.05
+- fixes pnmtofiasco, fiascotopnm, pamtosvg, pamtouil and ppmrainbow
+- upstream fix to pamtosvg caused netpbm not to be rebuildable on
+  any arch because of missing semicolon, the fix is now fixed :-/
+
 * Mon Dec  7 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-3
 - fix segfault in pnmsmooth (#545089)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	21 Oct 2009 16:06:19 -0000	1.63
+++ sources	10 Dec 2009 10:34:09 -0000	1.64
@@ -1 +1 @@
-87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz
+b3076d696dff3673d66412d111356141  netpbm-10.47.05.tar.xz



From akurtakov at fedoraproject.org  Thu Dec 10 10:58:23 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 10 Dec 2009 10:58:23 +0000 (UTC)
Subject: rpms/eclipse-pydev/F-12 eclipse-pydev.spec, 1.32, 1.33 .cvsignore, 
	1.21, 1.22 sources, 1.21, 1.22
Message-ID: <20091210105823.2E8B411C025D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-pydev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6652/F-12

Modified Files:
	eclipse-pydev.spec .cvsignore sources 
Log Message:
Update to 1.5.3


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-12/eclipse-pydev.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- eclipse-pydev.spec	6 Nov 2009 15:01:08 -0000	1.32
+++ eclipse-pydev.spec	10 Dec 2009 10:58:21 -0000	1.33
@@ -1,19 +1,15 @@
 # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
 %global debug_package %{nil}
-%global qualifier 1251989166
+%global qualifier 1260390783
 
 Epoch: 1
 
 %define eclipse_base        %{_libdir}/eclipse
 %define install_loc         %{_libdir}/eclipse/dropins
 
-%define major     1
-%define minor     5
-%define maint     0
-
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          %{major}.%{minor}.%{maint}
+Version:          1.5.3
 Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.org
@@ -131,6 +127,7 @@ popd
 
 %build
 %{eclipse_base}/buildscripts/pdebuild \
+  -d mylyn \
   -f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o `pwd`/orbitDeps
 
 %{eclipse_base}/buildscripts/pdebuild \
@@ -208,6 +205,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Thu Dec 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.3-1
+- Update to 1.5.3.
+
 * Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.0-1
 - Update to upstream 1.5.0.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	6 Nov 2009 15:01:08 -0000	1.21
+++ .cvsignore	10 Dec 2009 10:58:22 -0000	1.22
@@ -3,3 +3,4 @@ org.python.pydev.feature-1.4.5.2727-sour
 org.python.pydev.feature-1.4.6.2788-sources.zip
 org.python.pydev.feature-1.4.7.2843-sources.zip
 org.python.pydev.feature-1.5.0.1251989166-sources.zip
+org.python.pydev.feature-1.5.3.1260390783-sources.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	6 Nov 2009 15:01:08 -0000	1.21
+++ sources	10 Dec 2009 10:58:22 -0000	1.22
@@ -1 +1,2 @@
 3a72ab31ae84d1788925c5d3f1142446  org.python.pydev.feature-1.5.0.1251989166-sources.zip
+3e19b990d1bdc6606391787e518af87f  org.python.pydev.feature-1.5.3.1260390783-sources.zip



From npajkovs at fedoraproject.org  Thu Dec 10 11:06:35 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Thu, 10 Dec 2009 11:06:35 +0000 (UTC)
Subject: rpms/gpm/F-12 gpm.init,1.19,1.20 gpm.spec,1.80,1.81
Message-ID: <20091210110635.E54AC11C025D@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/gpm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9588

Modified Files:
	gpm.init gpm.spec 
Log Message:
add try-restart into gpm.init to be more LSB-compilant


Index: gpm.init
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-12/gpm.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gpm.init	6 Jan 2009 08:54:47 -0000	1.19
+++ gpm.init	10 Dec 2009 11:06:35 -0000	1.20
@@ -111,7 +111,7 @@ case "$1" in
   stop)
 	stop
 	;;
-  force-reload|reload)
+  force-reload|reload|try-restart)
 	echo "$0: Unimplemented feature."
 	RETVAL=3
 	;;
@@ -128,7 +128,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"
 	RETVAL=2
 esac
 


Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-12/gpm.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- gpm.spec	19 Nov 2009 13:33:51 -0000	1.80
+++ gpm.spec	10 Dec 2009 11:06:35 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
@@ -160,7 +160,10 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
-* Thu Nov 19 2009 Nikola Pajkovsky <npajkvos at redhat.com> 1.20.6-8
+* Thu Dec 10 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.20.6-9
+- add try-restart into gpm.init to be more LSB-compilant
+
+* Thu Nov 19 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.20.6-8
 - drop patch7
 - resolved #537724(does not work with capabilities)
 



From jreznik at fedoraproject.org  Thu Dec 10 11:09:29 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 10 Dec 2009 11:09:29 +0000 (UTC)
Subject: File arora-0.10.2.tar.gz uploaded to lookaside cache by jreznik
Message-ID: <20091210110929.8C05210F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for arora:

ccef0f214e0f03828cde8c521f7a5225  arora-0.10.2.tar.gz



From caolanm at fedoraproject.org  Thu Dec 10 11:15:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 10 Dec 2009 11:15:20 +0000 (UTC)
Subject: File myspell-da-1.7.31.tar.bz2 uploaded to lookaside cache by
	caolanm
Message-ID: <20091210111520.5548C10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hunspell-da:

f8f457df7c784458cea5e5200fe4eae9  myspell-da-1.7.31.tar.bz2



From caolanm at fedoraproject.org  Thu Dec 10 11:15:56 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 10 Dec 2009 11:15:56 +0000 (UTC)
Subject: rpms/hunspell-da/devel .cvsignore, 1.20, 1.21 hunspell-da.spec, 1.22,
	1.23 sources, 1.20, 1.21
Message-ID: <20091210111556.2A70611C025D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-da/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12620

Modified Files:
	.cvsignore hunspell-da.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	5 Nov 2009 15:42:46 -0000	1.20
+++ .cvsignore	10 Dec 2009 11:15:55 -0000	1.21
@@ -1 +1 @@
-myspell-da-1.7.30.tar.bz2
+myspell-da-1.7.31.tar.bz2


Index: hunspell-da.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/hunspell-da.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- hunspell-da.spec	5 Nov 2009 15:42:46 -0000	1.22
+++ hunspell-da.spec	10 Dec 2009 11:15:55 -0000	1.23
@@ -1,6 +1,6 @@
 Name: hunspell-da
 Summary: Danish hunspell dictionaries
-Version: 1.7.30
+Version: 1.7.31
 Release: 1%{?dist}
 Source: http://da.speling.org/filer/myspell-da-%{version}.tar.bz2
 Group: Applications/Text
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Dec 10 2009 Caolan McNamara <caolanm at redhat.com> - 1.7.31-1
+- latest version
+
 * Thu Nov 05 2009 Caolan McNamara <caolanm at redhat.com> - 1.7.30-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	5 Nov 2009 15:42:47 -0000	1.20
+++ sources	10 Dec 2009 11:15:55 -0000	1.21
@@ -1 +1 @@
-238192ae55de57ad11fe67817e09a9cd  myspell-da-1.7.30.tar.bz2
+f8f457df7c784458cea5e5200fe4eae9  myspell-da-1.7.31.tar.bz2



From caolanm at fedoraproject.org  Thu Dec 10 11:19:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 10 Dec 2009 11:19:22 +0000 (UTC)
Subject: File hunspell-ht-0.05.oxt uploaded to lookaside cache by caolanm
Message-ID: <20091210111922.3A7F110F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hunspell-ht:

4136daafe3c748bbc1813bfa9b3d3f40  hunspell-ht-0.05.oxt



From akurtakov at fedoraproject.org  Thu Dec 10 11:20:14 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 10 Dec 2009 11:20:14 +0000 (UTC)
Subject: rpms/eclipse-egit/F-12 sources, 1.11, 1.12 .cvsignore, 1.11,
	1.12 eclipse-egit.spec, 1.24, 1.25
Message-ID: <20091210112014.4672B11C03E3@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-egit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14725/F-12

Modified Files:
	sources .cvsignore eclipse-egit.spec 
Log Message:
Update to 0.6 git


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Jul 2009 14:48:14 -0000	1.11
+++ sources	10 Dec 2009 11:20:13 -0000	1.12
@@ -1,2 +1 @@
-fbe308592f12f3f9845bca4a6b3de7af  egit-c8a5b04b88bfbafc63c54512f874a763ef9bba08.tar.gz
-7972bf85576d2f862826ee48aa5c9b9e  jgit-9c5c2e73ba21014e3a9427b8b27c3e62fe6d1c14.tar.gz
+1b97f9de0c1829e2b9af06ebc37550d8  parallelip-egit-8c839d7ec7b884fba2e2a74321a057a58ea1114c.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Jul 2009 14:48:14 -0000	1.11
+++ .cvsignore	10 Dec 2009 11:20:14 -0000	1.12
@@ -3,3 +3,4 @@ egit-fedd114bcb8ef859b9cc2152bf136a554dc
 egit-3c268c8cc77a3ed3a50b47cf6354330a9416b726.tar.gz
 egit-c8a5b04b88bfbafc63c54512f874a763ef9bba08.tar.gz
 jgit-9c5c2e73ba21014e3a9427b8b27c3e62fe6d1c14.tar.gz
+parallelip-egit-8c839d7ec7b884fba2e2a74321a057a58ea1114c.tar.bz2


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-12/eclipse-egit.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- eclipse-egit.spec	24 Jul 2009 20:53:32 -0000	1.24
+++ eclipse-egit.spec	10 Dec 2009 11:20:14 -0000	1.25
@@ -3,23 +3,24 @@
 
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
-Version:          0.5.0
-Release:          2%{?dist}
+Version:          0.6.0
+Release:          0.1.git20091029%{?dist}
 License:          EPL and GPLv2 and LGPLv2
-URL:              http://repo.or.cz/w/egit.git
+URL:              http://www.eclipse.org/egit/
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=c8a5b04b88bfbafc63c54512f874a763ef9bba08;sf=tgz
-Source0:          egit-c8a5b04b88bfbafc63c54512f874a763ef9bba08.tar.gz
-# retrieved from http://repo.or.cz/w/jgit.git?a=snapshot;h=9c5c2e73ba21014e3a9427b8b27c3e62fe6d1c14;sf=tgz
-Source1:          jgit-9c5c2e73ba21014e3a9427b8b27c3e62fe6d1c14.tar.gz
+# retrieved from http://egit.eclipse.org/w/?p=egit/parallelip-egit.git;a=snapshot;h=8c839d7ec7b884fba2e2a74321a057a58ea1114c;sf=tbz2
+Source0:          parallelip-egit-8c839d7ec7b884fba2e2a74321a057a58ea1114c.tar.bz2
 Requires:         eclipse-platform >= 1:3.4.0
 Requires:         git-core
 BuildRequires:    java-devel >= 1.6.0
 
 BuildRequires:    eclipse-pde
+BuildRequires:    eclipse-jgit
 BuildRequires:    jpackage-utils >= 0:1.5
 
+Requires: eclipse-jgit
+
 BuildArch:        noarch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,10 +30,9 @@ interacting with Git repositories.
 
 %prep
 %setup -q -c 
-tar xf %{SOURCE1}
 
 %build
-%{eclipse_base}/buildscripts/pdebuild
+%{eclipse_base}/buildscripts/pdebuild -d "jgit"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{install_loc}
 
 %changelog
+* Tue Nov 10 2009 Alexander Kurtakov <akurtako at redhat.com> 0.6.0-0.1.git20091029
+- Update to 0.6 git.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Thu Dec 10 11:20:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 10 Dec 2009 11:20:20 +0000 (UTC)
Subject: rpms/hunspell-ht/devel .cvsignore, 1.2, 1.3 hunspell-ht.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <20091210112020.11EEF11C03E3@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14780

Modified Files:
	.cvsignore hunspell-ht.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ht/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Nov 2009 18:34:37 -0000	1.2
+++ .cvsignore	10 Dec 2009 11:20:19 -0000	1.3
@@ -1 +1 @@
-hunspell-ht-0.03.oxt
+hunspell-ht-0.05.oxt


Index: hunspell-ht.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ht/devel/hunspell-ht.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hunspell-ht.spec	19 Nov 2009 18:34:37 -0000	1.2
+++ hunspell-ht.spec	10 Dec 2009 11:20:19 -0000	1.3
@@ -1,9 +1,9 @@
 Name: hunspell-ht
 Summary: Haitian Creole hunspell dictionaries
-Version: 0.03.3
+Version: 0.05
 Release: 1%{?dist}
 Group: Applications/Text
-Source: http://extensions.services.openoffice.org/files/3247/1/%{name}-0.03.oxt
+Source: http://extensions.services.openoffice.org/files/3247/2/%{name}-%{version}.oxt
 URL: http://kok.logipam.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Dec 10 2009 Caolan McNamara <caolanm at redhat.com> - 0.05-1
+- latest version
+
 * Thu Nov 19 2009 Caolan McNamara <caolanm at redhat.com> - 0.03.3-1
 - initial version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ht/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Nov 2009 18:34:37 -0000	1.2
+++ sources	10 Dec 2009 11:20:19 -0000	1.3
@@ -1 +1 @@
-63000bb59f2d395c3c75e39d936e19c1  hunspell-ht-0.03.oxt
+4136daafe3c748bbc1813bfa9b3d3f40  hunspell-ht-0.05.oxt



From phuang at fedoraproject.org  Thu Dec 10 11:31:56 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 10 Dec 2009 11:31:56 +0000 (UTC)
Subject: rpms/ibus-pinyin/devel ibus-pinyin.spec,1.18,1.19
Message-ID: <20091210113156.9BE0111C025D@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18725

Modified Files:
	ibus-pinyin.spec 
Log Message:
Correct pinyin database download location.


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/ibus-pinyin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ibus-pinyin.spec	15 Sep 2009 05:49:16 -0000	1.18
+++ ibus-pinyin.spec	10 Dec 2009 11:31:55 -0000	1.19
@@ -2,13 +2,13 @@
 
 Name:       ibus-pinyin
 Version:    1.2.0.20090915
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
+Source1:    http://ibus.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
 # Patch0:     ibus-pinyin-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,9 @@ python -c "import pysqlitedb; db = pysql
 %{_libexecdir}/ibus-setup-pinyin
 
 %changelog
+* Thu Dec 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-2
+- Correct pinyin database download location.
+
 * Tue Sep 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-1
 - Update to 1.2.0.20090915.
 - Fix bug 508006 - The color of English Candidates doesn't work



From phuang at fedoraproject.org  Thu Dec 10 11:33:04 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 10 Dec 2009 11:33:04 +0000 (UTC)
Subject: rpms/ibus-pinyin/F-12 ibus-pinyin.spec,1.18,1.19
Message-ID: <20091210113304.D9A9A11C025D@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19222

Modified Files:
	ibus-pinyin.spec 
Log Message:
Correct pinyin database download location


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/F-12/ibus-pinyin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ibus-pinyin.spec	15 Sep 2009 05:49:16 -0000	1.18
+++ ibus-pinyin.spec	10 Dec 2009 11:33:04 -0000	1.19
@@ -2,13 +2,13 @@
 
 Name:       ibus-pinyin
 Version:    1.2.0.20090915
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The PinYin engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
+Source1:    http://ibus.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
 # Patch0:     ibus-pinyin-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,9 @@ python -c "import pysqlitedb; db = pysql
 %{_libexecdir}/ibus-setup-pinyin
 
 %changelog
+* Thu Dec 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-2
+- Correct pinyin database download location.
+
 * Tue Sep 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-1
 - Update to 1.2.0.20090915.
 - Fix bug 508006 - The color of English Candidates doesn't work



From akurtakov at fedoraproject.org  Thu Dec 10 11:51:41 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 10 Dec 2009 11:51:41 +0000 (UTC)
Subject: rpms/ant-contrib/F-11 ant-contrib.spec,1.5,1.6
Message-ID: <20091210115142.5478111C025D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/ant-contrib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25344/F-11

Modified Files:
	ant-contrib.spec 
Log Message:
Fix installation to make ant finding it correctly.


Index: ant-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant-contrib/F-11/ant-contrib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ant-contrib.spec	24 Feb 2009 01:10:34 -0000	1.5
+++ ant-contrib.spec	10 Dec 2009 11:51:40 -0000	1.6
@@ -1,10 +1,9 @@
-%define gcj_support 1
 %define beta_number b2
 
 Summary:        Collection of tasks for Ant
-Name:           ant-contrib 
+Name:           ant-contrib
 Version:        1.0
-Release:        0.7.%{beta_number}%{?dist}
+Release:        0.10.%{beta_number}%{?dist}
 License:        ASL 2.0
 URL:            http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries
@@ -17,22 +16,17 @@ BuildRequires:  ant-junit >= 1.6.2
 BuildRequires:  ant-nodeps >= 1.6.2
 BuildRequires:  xerces-j2
 BuildRequires:  bcel >= 5.0
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%else
 BuildRequires:  java-devel >= 1.4.2
 Requires:       java >= 1.4.2
-%endif
 Requires:       junit >= 3.8.0
 Requires:       ant >= 1.6.2
 Requires:       xerces-j2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 %description
-The Ant-Contrib project is a collection of tasks 
-(and at one point maybe types and other tools) 
+The Ant-Contrib project is a collection of tasks
+(and at one point maybe types and other tools)
 for Apache Ant.
 
 %package        javadoc
@@ -40,7 +34,7 @@ Summary:        Javadoc for %{name}
 Group:          Documentation
 
 %description    javadoc
-%{summary}.
+Api documentation for %{name}.
 
 %prep
 %setup -q  -n %{name}
@@ -62,14 +56,13 @@ CLASSPATH=build/lib/ant-contrib-%{versio
 echo $ANT_HOME
 ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
 install -Dpm 644 build/lib/%{name}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+      $RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
 
 # javadoc
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -77,37 +70,16 @@ cp -pr build/docs/api/* $RPM_BUILD_ROOT%
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 rm -rf build/docs/api
 
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
+echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{_sysconfdir}/ant.d/ant-contrib
+%{_javadir}/ant/*.jar
 %doc build/docs/LICENSE.txt
 %doc build/docs/tasks/*
 
@@ -119,6 +91,13 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.10.b2
+- Install ant contrib in ant.d.
+
+* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.9.b2
+- Drop gcj_support.
+- Install as proper ant plugin.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.7.b2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ovasik at fedoraproject.org  Thu Dec 10 12:15:17 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Dec 2009 12:15:17 +0000 (UTC)
Subject: rpms/wvdial/F-12 wvdial.spec,1.37,1.38
Message-ID: <20091210121518.5FE5A11C03DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/wvdial/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv910

Modified Files:
	wvdial.spec 
Log Message:
 Merge review cleanup (#226546), comment patches, license  to LGPLv2+, specify names in files section, fix source0 link...


Index: wvdial.spec
===================================================================
RCS file: /cvs/extras/rpms/wvdial/F-12/wvdial.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- wvdial.spec	27 Jul 2009 07:30:14 -0000	1.37
+++ wvdial.spec	10 Dec 2009 12:15:16 -0000	1.38
@@ -1,21 +1,31 @@
 Summary: A heuristic autodialer for PPP connections
 Name: wvdial
 Version: 1.60
-Release: 10%{?dist}
-License: LGPLv2
+Release: 11%{?dist}
+License: LGPLv2+
 URL: http://alumnit.ca/wiki/?WvDial
 Group: System Environment/Daemons
-Source0: http://alumnit.ca/download/wvdial-%{version}.tar.gz
+#Old location for <1.61 was http://alumnit.ca/download/wvdial-%{version}.tar.gz
+Source0: http://wvstreams.googlecode.com/files/wvdial-%{version}.tar.gz
+
+#allow specifying the remotename at startup-time
 Patch1: wvdial-1.60-remotename.patch
-Patch2: wvdial-1.60-dialtimeout.patch
+# added option for dial timeout(#200375) - in upstream now
+Patch2: wvdial-1.60-dialtimeout
+#added support for up to 9 alternative numbers instead of 4(#178025)
 Patch3: wvdial-1.54-9nums.patch
+#change Compuserve "Classic" login prompt to the "new" style (#146664)
 Patch4: wvdial-1.60-compuserve.patch
+#fixed wvdial.conf (5) manpage (#440161)
 Patch5: wvdial-manpages.patch
+#make wvdial compilable in rawhide (scandir api change),
+#reduce compiler warnings
 Patch6: wvdial-1.60-dirent.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libwvstreams-devel >= 0:4.4 lockdev-devel openssl-devel
+BuildRequires: libwvstreams-devel lockdev-devel openssl-devel
 BuildRequires: pkgconfig
-Requires: ppp >= 0:2.3.7
+Requires: ppp
 
 %description
 WvDial automatically locates and configures modems and can log into
@@ -33,6 +43,7 @@ negotiate the PPP connection using any m
 %patch6 -p1 -b .dirent
 
 %build
+%configure
 make \
 	CPPOPTS="$RPM_OPT_FLAGS -DUSE_LOCKDEV=1" \
 	LOCKDEV=-llockdev \
@@ -43,7 +54,7 @@ make \
 	PPPDIR=%{_sysconfdir}/ppp/peers $@
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 make install \
 	PREFIX=${RPM_BUILD_ROOT}%{_prefix} \
 	BINDIR=${RPM_BUILD_ROOT}%{_bindir} \
@@ -53,18 +64,24 @@ rm $RPM_BUILD_ROOT/%{_sysconfdir}/ppp/pe
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/wvdial.conf
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGES* COPYING* README* TODO FAQ
-%attr(0755,root,root)	%{_bindir}/*
-%attr(0644,root,root)	%{_mandir}/man1/*
-%attr(0644,root,root)	%{_mandir}/man5/*
+%{_bindir}/wvdialconf
+%{_bindir}/wvdial
+%{_mandir}/man1/wvdialconf.*
+%{_mandir}/man1/wvdial.*
+%{_mandir}/man5/wvdial.conf*
 %attr(0600,root,daemon)	%config(noreplace) %{_sysconfdir}/ppp/peers/wvdial
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
+* Thu Dec 10 2009 Ondrej Vasik <ovasik at redhat.com> - 1.61-11
+- Merge review cleanup (#226546), comment patches, license
+  to LGPLv2+, specify names in files section, fix source0 link...
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ovasik at fedoraproject.org  Thu Dec 10 12:15:59 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Dec 2009 12:15:59 +0000 (UTC)
Subject: rpms/wvdial/F-12 wvdial.spec,1.38,1.39
Message-ID: <20091210121559.A57EE11C025D@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/wvdial/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1150

Modified Files:
	wvdial.spec 
Log Message:
correct changelog entry


Index: wvdial.spec
===================================================================
RCS file: /cvs/extras/rpms/wvdial/F-12/wvdial.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- wvdial.spec	10 Dec 2009 12:15:16 -0000	1.38
+++ wvdial.spec	10 Dec 2009 12:15:59 -0000	1.39
@@ -78,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
-* Thu Dec 10 2009 Ondrej Vasik <ovasik at redhat.com> - 1.61-11
+* Thu Dec 10 2009 Ondrej Vasik <ovasik at redhat.com> - 1.60-11
 - Merge review cleanup (#226546), comment patches, license
   to LGPLv2+, specify names in files section, fix source0 link...
 



From jreznik at fedoraproject.org  Thu Dec 10 12:19:11 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 10 Dec 2009 12:19:11 +0000 (UTC)
Subject: rpms/arora/devel arora-0.10.2-fedorahome.patch, NONE,
	1.1 arora-0.10.2-gitversion.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 arora.spec, 1.26, 1.27 sources, 1.12,
	1.13 arora-0.10.0-fedorahome.patch, 1.1,
	NONE arora-0.10.1-gitversion.patch, 1.1, NONE
Message-ID: <20091210121911.B9CBB11C025D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2266

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.2-fedorahome.patch arora-0.10.2-gitversion.patch 
Removed Files:
	arora-0.10.0-fedorahome.patch arora-0.10.1-gitversion.patch 
Log Message:
* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
- Update to 0.10.2
- QtWebKit patch removed


arora-0.10.2-fedorahome.patch:
 browsermainwindow.cpp |    2 +-
 settings.cpp          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arora-0.10.2-fedorahome.patch ---
diff -up arora-0.10.2/src/browsermainwindow.cpp.fedorahome arora-0.10.2/src/browsermainwindow.cpp
--- arora-0.10.2/src/browsermainwindow.cpp.fedorahome	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/browsermainwindow.cpp	2009-12-10 12:52:34.359736509 +0100
@@ -1398,7 +1398,7 @@ void BrowserMainWindow::goHome()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString home = settings.value(QLatin1String("home"), QLatin1String("about:home")).toString();
+    QString home = settings.value(QLatin1String("home"), QLatin1String("http://start.fedoraproject.org/")).toString();
     tabWidget()->loadString(home);
 }
 
diff -up arora-0.10.2/src/settings.cpp.fedorahome arora-0.10.2/src/settings.cpp
--- arora-0.10.2/src/settings.cpp.fedorahome	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/settings.cpp	2009-12-10 12:52:34.359736509 +0100
@@ -143,7 +143,7 @@ void SettingsDialog::loadFromSettings()
     settings.endGroup();
 
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString defaultHome = QLatin1String("about:home");
+    QString defaultHome = QLatin1String("http://start.fedoraproject.org/");
     homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
     startupBehavior->setCurrentIndex(settings.value(QLatin1String("startupBehavior"), 0).toInt());
     settings.endGroup();

arora-0.10.2-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.2-gitversion.patch ---
diff -up arora-0.10.2/src/src.pri.gitversion arora-0.10.2/src/src.pri
--- arora-0.10.2/src/src.pri.gitversion	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/src.pri	2009-12-10 13:08:40.120548737 +0100
@@ -15,21 +15,8 @@ UI_DIR      = $$PWD/.ui
 MOC_DIR     = $$PWD/.moc
 OBJECTS_DIR = $$PWD/.obj
 
-
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-} else {
-    exists($$PWD/../.git/HEAD) {
-        GITVERSION=$$system(git log -n1 --pretty=format:%h)
-        DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\"
-        GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l)
-        DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\"
-    } else {
-        DEFINES += GITVERSION=\"\\\"0\\\"\"
-        DEFINES += GITCHANGENUMBER=\"\\\"0\\\"\"
-    }
-}
+DEFINES += GITVERSION=\"\\\"0a6f1f4\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1333\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	6 Oct 2009 10:39:24 -0000	1.12
+++ .cvsignore	10 Dec 2009 12:19:10 -0000	1.13
@@ -1 +1 @@
-arora-0.10.1.tar.gz
+arora-0.10.2.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- arora.spec	18 Nov 2009 20:18:08 -0000	1.26
+++ arora.spec	10 Dec 2009 12:19:11 -0000	1.27
@@ -1,20 +1,19 @@
 Name:           arora
-Version:        0.10.1
-Release:        4%{?dist}
+Version:        0.10.2
+Release:        1%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/arora/
 Source0:        http://arora.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         arora-0.10.1-gitversion.patch
+Patch0:         arora-0.10.2-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
-Patch2:         arora-0.10.0-fedorahome.patch
-Patch3:         arora-0.10.1-trunk-qtwebkit.patch
+Patch2:         arora-0.10.2-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt4-devel >= 4.4.0
+BuildRequires:  qt4-devel >= 4.5.0
 # for gnome default app path
 BuildRequires:  control-center-devel
 
@@ -41,7 +40,6 @@ Adds Arora to Preferred Applications lis
 %patch0 -p1 -b .gitversion
 %patch1 -p1 -b .fedorabookmarks
 %patch2 -p1 -b .fedorahome
-%patch3 -p1 -b .trunk-webkit
 
 %build
 qmake-qt4 PREFIX=%{_prefix}
@@ -101,6 +99,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
+- Update to 0.10.2
+- QtWebKit patch removed
+
 * Wed Nov 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-4
 - Build over latest qtwebkit trunk from qt 4.6-rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	6 Oct 2009 10:39:24 -0000	1.12
+++ sources	10 Dec 2009 12:19:11 -0000	1.13
@@ -1 +1 @@
-ac38282a2d9134687d9c30dbb73c0fbc  arora-0.10.1.tar.gz
+ccef0f214e0f03828cde8c521f7a5225  arora-0.10.2.tar.gz


--- arora-0.10.0-fedorahome.patch DELETED ---


--- arora-0.10.1-gitversion.patch DELETED ---



From ovasik at fedoraproject.org  Thu Dec 10 12:20:06 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Dec 2009 12:20:06 +0000 (UTC)
Subject: rpms/wvdial/F-12 wvdial.spec,1.39,1.40
Message-ID: <20091210122006.E55CB11C03FC@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/wvdial/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2782

Modified Files:
	wvdial.spec 
Log Message:
need coffee ...typo while backporting review changes to F-12


Index: wvdial.spec
===================================================================
RCS file: /cvs/extras/rpms/wvdial/F-12/wvdial.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- wvdial.spec	10 Dec 2009 12:15:59 -0000	1.39
+++ wvdial.spec	10 Dec 2009 12:20:06 -0000	1.40
@@ -11,7 +11,7 @@ Source0: http://wvstreams.googlecode.com
 #allow specifying the remotename at startup-time
 Patch1: wvdial-1.60-remotename.patch
 # added option for dial timeout(#200375) - in upstream now
-Patch2: wvdial-1.60-dialtimeout
+Patch2: wvdial-1.60-dialtimeout.patch
 #added support for up to 9 alternative numbers instead of 4(#178025)
 Patch3: wvdial-1.54-9nums.patch
 #change Compuserve "Classic" login prompt to the "new" style (#146664)



From mmaslano at fedoraproject.org  Thu Dec 10 12:23:38 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 10 Dec 2009 12:23:38 +0000 (UTC)
Subject: rpms/perl-XML-XPath/devel perl-XML-XPath.spec,1.11,1.12
Message-ID: <20091210122338.77D7211C025D@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XML-XPath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4102

Modified Files:
	perl-XML-XPath.spec 
Log Message:
* Thu Dec 10 2009 Marcela Maslanova <mmaslano at redhat.com> - 1.13-11
- 541668 fix requires for review



Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-XPath/devel/perl-XML-XPath.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-XML-XPath.spec	7 Dec 2009 03:59:38 -0000	1.11
+++ perl-XML-XPath.spec	10 Dec 2009 12:23:38 -0000	1.12
@@ -1,8 +1,6 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        XPath parser and evaluator for Perl
 
@@ -13,7 +11,7 @@ Source0:    http://www.cpan.org/authors/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(XML::Parser)
+BuildRequires:  perl(XML::Parser)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -58,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Marcela Maslanova <mmaslano at redhat.com> - 1.13-11
+- 541668 fix requires for review
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.13-10
 - rebuild against perl 5.10.1
 



From mmaslano at fedoraproject.org  Thu Dec 10 12:25:10 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 10 Dec 2009 12:25:10 +0000 (UTC)
Subject: rpms/perl-XML-XPath/F-12 perl-XML-XPath.spec,1.10,1.11
Message-ID: <20091210122510.6699E11C025D@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XML-XPath/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4734

Modified Files:
	perl-XML-XPath.spec 
Log Message:
* Thu Dec 10 2009 Marcela Maslanova <mmaslano at redhat.com> - 1.13-11
- 541668 fix requires for review



Index: perl-XML-XPath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-XPath/F-12/perl-XML-XPath.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-XML-XPath.spec	26 Jul 2009 17:40:52 -0000	1.10
+++ perl-XML-XPath.spec	10 Dec 2009 12:25:10 -0000	1.11
@@ -1,8 +1,6 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-XML-XPath
 Version:        1.13
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        XPath parser and evaluator for Perl
 
@@ -13,7 +11,7 @@ Source0:    http://www.cpan.org/authors/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(XML::Parser)
+BuildRequires:  perl(XML::Parser)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -58,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Marcela Maslanova <mmaslano at redhat.com> - 1.13-11
+- 541668 fix requires for review
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Thu Dec 10 12:25:24 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Dec 2009 12:25:24 +0000 (UTC)
Subject: rpms/moblin-session/devel moblin-session-MC5.patch, NONE,
	1.1 moblin-session.spec, 1.3, 1.4
Message-ID: <20091210122524.7EC7311C025D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4889

Modified Files:
	moblin-session.spec 
Added Files:
	moblin-session-MC5.patch 
Log Message:
- Start MC5 not MC. Fixes #540693

moblin-session-MC5.patch:
 moblin-xinitrc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE moblin-session-MC5.patch ---
--- moblin-session-0.12/moblin-xinitrc.orig	2009-12-10 12:20:26.000000000 +0000
+++ moblin-session-0.12/moblin-xinitrc	2009-12-10 12:20:58.000000000 +0000
@@ -81,7 +81,7 @@
 fi
 } &
 
-ionice -n7 /usr/libexec/mission-control &
+ionice -n7 /usr/libexec/mission-control-5 &
 #ionice -n7 nautilus --no-desktop --no-default-window &
 
 # Make OO.o use gtk+ theming


Index: moblin-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/devel/moblin-session.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-session.spec	7 Oct 2009 12:35:15 -0000	1.3
+++ moblin-session.spec	10 Dec 2009 12:25:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           moblin-session
 Version:        0.12
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Moblin User Experience Startup Scripts
 
 Group:          User Interface/Desktops
@@ -9,6 +9,7 @@ URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 Source1:        moblin.desktop
 Patch0:         moblin-session-mutter.patch
+Patch1:         moblin-session-MC5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,6 +22,7 @@ Moblin components and handles logout and
 %prep
 %setup -q
 %patch0 -p1 -b .mutter
+%patch1 -p1 -b .MC5
 
 %build
 # nothing to build
@@ -43,6 +45,9 @@ rm -rf %{buildroot}
 %{_datadir}/xsessions/moblin.desktop
 
 %changelog
+* Thu Dec 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-7
+- Start MC5 not MC. Fixes #540693
+
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-6
 - Shorten desktop name to plain Moblin
 



From ovasik at fedoraproject.org  Thu Dec 10 12:32:02 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Dec 2009 12:32:02 +0000 (UTC)
Subject: rpms/wvdial/F-12 wvdial.spec,1.40,1.41
Message-ID: <20091210123203.15D0D11C025D@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/wvdial/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7237

Modified Files:
	wvdial.spec 
Log Message:
do not call %%configure


Index: wvdial.spec
===================================================================
RCS file: /cvs/extras/rpms/wvdial/F-12/wvdial.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- wvdial.spec	10 Dec 2009 12:20:06 -0000	1.40
+++ wvdial.spec	10 Dec 2009 12:32:02 -0000	1.41
@@ -43,7 +43,6 @@ negotiate the PPP connection using any m
 %patch6 -p1 -b .dirent
 
 %build
-%configure
 make \
 	CPPOPTS="$RPM_OPT_FLAGS -DUSE_LOCKDEV=1" \
 	LOCKDEV=-llockdev \



From kraxel at fedoraproject.org  Thu Dec 10 12:44:01 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Thu, 10 Dec 2009 12:44:01 +0000 (UTC)
Subject: File xen-3.4.2.tar.gz uploaded to lookaside cache by kraxel
Message-ID: <20091210124401.0D25C10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xen:

f009a7abf51017aeee697c9130b6f8a6  xen-3.4.2.tar.gz



From jreznik at fedoraproject.org  Thu Dec 10 12:47:39 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 10 Dec 2009 12:47:39 +0000 (UTC)
Subject: rpms/arora/devel arora.spec,1.27,1.28
Message-ID: <20091210124739.529A911C025D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12595

Modified Files:
	arora.spec 
Log Message:
* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-2
- Conditionaly check for qt4 version



Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- arora.spec	10 Dec 2009 12:19:11 -0000	1.27
+++ arora.spec	10 Dec 2009 12:47:38 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           arora
 Version:        0.10.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
@@ -17,7 +17,7 @@ BuildRequires:  qt4-devel >= 4.5.0
 # for gnome default app path
 BuildRequires:  control-center-devel
 
-Requires: qt4%{?_isa} >= %{_qt4_version}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
 Arora is a simple, cross platform web browser based on the QtWebKit engine.
@@ -99,6 +99,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-2
+- Conditionaly check for qt4 version
+
 * Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
 - Update to 0.10.2
 - QtWebKit patch removed



From ovasik at fedoraproject.org  Thu Dec 10 12:49:01 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Dec 2009 12:49:01 +0000 (UTC)
Subject: rpms/openjade/devel openjade.spec,1.47,1.48
Message-ID: <20091210124901.47DAC11C025D@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/openjade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13209

Modified Files:
	openjade.spec 
Log Message:
 Merge Review (#226213) - added url, fixed rpmlint warnings, no macros in changelog


Index: openjade.spec
===================================================================
RCS file: /cvs/extras/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- openjade.spec	25 Jul 2009 20:48:10 -0000	1.47
+++ openjade.spec	10 Dec 2009 12:49:00 -0000	1.48
@@ -1,8 +1,9 @@
 Summary: A DSSSL implementation
 Name: openjade
 Version: 1.3.2
-Release: 35%{?dist}
-Prereq: sgml-common >= 0.5
+Release: 36%{?dist}
+Requires: sgml-common
+URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
 Patch1: openjade-1.3.1-nsl.patch
@@ -12,8 +13,11 @@ License: BSD
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: openjade-devel < 1.3.2-17
-Obsoletes: jade
-Provides: jade
+Provides: openjade-devel = %{version}-%{release}
+
+#Last jade version is from Red Hat 6.2
+Obsoletes: jade <= 1.2.1-9
+Provides: jade = %{version}-%{release}
 
 BuildRequires: opensp-devel
 
@@ -45,10 +49,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make install install-man DESTDIR=$RPM_BUILD_ROOT
 
-# Fix up libtool libraries
-find $RPM_BUILD_ROOT -name '*.la' | \
-  xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g"
-
 # oMy, othis ois osilly.
 ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade
 echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc jadedoc/* dsssl/README.jadetex
 %doc README COPYING VERSION
 %ghost /etc/sgml/%{name}-%{version}-%{release}.soc
@@ -92,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sgml/%{name}-%{version}
 
 %changelog
+* Thu Dec 10 2009 Ondrej Vasik <ovasik at redhat.com> 1.3.2-36
+- Merge Review (#226213) - added url, fixed rpmlint warnings,
+  no macros in changelog
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -214,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu May 22 2003 Tim Waugh <twaugh at redhat.com> 1.3.2-3
 - Fixes for GCC 3.3.
-- Use --parents for %doc.
+- Use --parents for %%doc.
 
 * Tue Mar 18 2003 Tim Waugh <twaugh at redhat.com> 1.3.2-2
 - Provide sgml2xml man page (bug #83759).



From allisson at fedoraproject.org  Thu Dec 10 13:09:50 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 10 Dec 2009 13:09:50 +0000 (UTC)
Subject: rpms/perl-MooseX-Singleton/F-12 import.log, 1.1,
	1.2 perl-MooseX-Singleton.spec, 1.4, 1.5
Message-ID: <20091210130950.46BDE11C025D@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-Singleton/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19889/F-12

Modified Files:
	import.log perl-MooseX-Singleton.spec 
Log Message:

- Update BR.
- Remove README from docs.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Mar 2009 21:20:55 -0000	1.1
+++ import.log	10 Dec 2009 13:09:49 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-Singleton-0_14-1_fc10:HEAD:perl-MooseX-Singleton-0.14-1.fc10.src.rpm:1236287799
+perl-MooseX-Singleton-0_21-2_fc12:F-12:perl-MooseX-Singleton-0.21-2.fc12.src.rpm:1260450530


Index: perl-MooseX-Singleton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/F-12/perl-MooseX-Singleton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Singleton.spec	19 Sep 2009 18:52:39 -0000	1.4
+++ perl-MooseX-Singleton.spec	10 Dec 2009 13:09:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Singleton
 Version:        0.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn your Moose class into a singleton
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -13,6 +13,8 @@ BuildRequires:  perl(Moose) >= 0.82
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Warn)
+BuildRequires:  perl(MooseX::StrictConstructor)
+BuildRequires:  perl(Test::Exception)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 Requires:       perl(Moose) >= 0.82
@@ -61,11 +63,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README
+%doc ChangeLog
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 10 2009 Allisson Azevedo <allisson at gmail.com> 0.21-2
+- Update BR.
+- Remove README from docs.
+
 * Sat Sep 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
 - auto-update to 0.21 (by cpan-spec-update 0.01)
 - altered br on perl(Moose) (0.74 => 0.82)



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:39 +0000
Subject: [pkgdb] python-matplotlib: limb has given up watchbugzilla
Message-ID: <20091210131439.35DB810F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-matplotlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:41 +0000
Subject: [pkgdb] python-matplotlib: limb has given up watchcommits
Message-ID: <20091210131441.C125B10F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-matplotlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:42 +0000
Subject: [pkgdb] python-matplotlib: limb has requested commit
Message-ID: <20091210131442.F1B3210F89E@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-matplotlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:47 +0000
Subject: [pkgdb] python-matplotlib: limb has requested approveacls
Message-ID: <20091210131447.C414D10F85F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-matplotlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:50 +0000
Subject: [pkgdb] python-matplotlib: limb has given up watchbugzilla
Message-ID: <20091210131450.DD5F510F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-matplotlib (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:51 +0000
Subject: [pkgdb] python-matplotlib: limb has given up watchcommits
Message-ID: <20091210131451.8D3A210F89E@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-matplotlib (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:51 +0000
Subject: [pkgdb] python-matplotlib: limb has requested commit
Message-ID: <20091210131452.028EB10F89D@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-matplotlib (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:52 +0000
Subject: [pkgdb] python-matplotlib: limb has requested approveacls
Message-ID: <20091210131452.AE3A410F8A2@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-matplotlib (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:58 +0000
Subject: [pkgdb] python-matplotlib: limb has requested approveacls
Message-ID: <20091210131458.C11AB10F8A2@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-matplotlib (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:55 +0000
Subject: [pkgdb] python-matplotlib: limb has given up watchcommits
Message-ID: <20091210131455.828A410F878@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-matplotlib (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:14:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:14:57 +0000
Subject: [pkgdb] python-matplotlib: limb has requested commit
Message-ID: <20091210131457.5A29110F89E@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-matplotlib (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:02 +0000
Subject: [pkgdb] python-matplotlib: limb has given up watchbugzilla
Message-ID: <20091210131503.087D510F8A5@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-matplotlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:03 +0000
Subject: [pkgdb] python-matplotlib: limb has requested commit
Message-ID: <20091210131503.7E97310F8A9@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-matplotlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:05 +0000
Subject: [pkgdb] python-matplotlib: limb has given up watchcommits
Message-ID: <20091210131506.058FC10F8B5@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-matplotlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:09 +0000
Subject: [pkgdb] python-matplotlib: limb has given up watchbugzilla
Message-ID: <20091210131511.6E11210F8B8@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-matplotlib (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:09 +0000
Subject: [pkgdb] python-matplotlib: limb has requested approveacls
Message-ID: <20091210131511.721BB10F8BB@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-matplotlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:21 +0000
Subject: [pkgdb] python-basemap: limb has given up watchcommits
Message-ID: <20091210131521.D44C510F865@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-basemap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:25 +0000
Subject: [pkgdb] python-basemap: limb has given up watchbugzilla
Message-ID: <20091210131525.2A80010F865@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-basemap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:26 +0000
Subject: [pkgdb] python-basemap: limb has requested approveacls
Message-ID: <20091210131526.5D9D510F865@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-basemap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:30 +0000
Subject: [pkgdb] python-basemap: limb has requested commit
Message-ID: <20091210131530.0E15F10F87D@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-basemap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:34 +0000
Subject: [pkgdb] python-basemap: limb has given up watchcommits
Message-ID: <20091210131534.2286210F87D@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-basemap (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:36 +0000
Subject: [pkgdb] python-basemap: limb has requested commit
Message-ID: <20091210131536.6CB6B10F8A3@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-basemap (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:38 +0000
Subject: [pkgdb] python-basemap: limb has requested approveacls
Message-ID: <20091210131538.52F3010F8A8@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-basemap (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:38 +0000
Subject: [pkgdb] python-basemap: limb has given up watchbugzilla
Message-ID: <20091210131538.5480210F8A9@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-basemap (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:41 +0000
Subject: [pkgdb] python-basemap: limb has given up watchbugzilla
Message-ID: <20091210131541.6E4FB10F865@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-basemap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:41 +0000
Subject: [pkgdb] python-basemap: limb has given up watchcommits
Message-ID: <20091210131541.9E47310F89D@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-basemap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:42 +0000
Subject: [pkgdb] python-basemap: limb has requested commit
Message-ID: <20091210131542.3B15410F8AC@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-basemap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:44 +0000
Subject: [pkgdb] python-basemap: limb has requested approveacls
Message-ID: <20091210131544.2A1CF10F8A6@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-basemap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:47 +0000
Subject: [pkgdb] python-basemap: limb has given up watchcommits
Message-ID: <20091210131548.078A710F865@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-basemap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:53 +0000
Subject: [pkgdb] python-basemap: limb has given up watchbugzilla
Message-ID: <20091210131553.CC38D10F8A8@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-basemap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:50 +0000
Subject: [pkgdb] python-basemap: limb has requested commit
Message-ID: <20091210131550.7CE1C10F89D@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-basemap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Thu Dec 10 13:15:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:15:51 +0000
Subject: [pkgdb] python-basemap: limb has requested approveacls
Message-ID: <20091210131551.BB76A10F8A1@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-basemap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From ovasik at fedoraproject.org  Thu Dec 10 13:16:15 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Dec 2009 13:16:15 +0000 (UTC)
Subject: rpms/openjade/devel openjade.spec,1.48,1.49
Message-ID: <20091210131615.0FCC511C025D@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/openjade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22090

Modified Files:
	openjade.spec 
Log Message:
Remove unnecessary obsoletes


Index: openjade.spec
===================================================================
RCS file: /cvs/extras/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- openjade.spec	10 Dec 2009 12:49:00 -0000	1.48
+++ openjade.spec	10 Dec 2009 13:16:14 -0000	1.49
@@ -12,8 +12,6 @@ Patch3: openjade-nola.patch
 License: BSD
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: openjade-devel < 1.3.2-17
-Provides: openjade-devel = %{version}-%{release}
 
 #Last jade version is from Red Hat 6.2
 Obsoletes: jade <= 1.2.1-9



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:30 +0000
Subject: [pkgdb] python-basemap-data: limb has given up watchcommits
Message-ID: <20091210131730.D5FE710F8A3@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-basemap-data (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:33 +0000
Subject: [pkgdb] python-basemap-data: limb has given up watchbugzilla
Message-ID: <20091210131733.DB1C710F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-basemap-data (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:34 +0000
Subject: [pkgdb] python-basemap-data: limb has requested commit
Message-ID: <20091210131734.EACCA10F85F@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-basemap-data (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:36 +0000
Subject: [pkgdb] python-basemap-data: limb has requested approveacls
Message-ID: <20091210131736.5FAFF10F85F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-basemap-data (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:44 +0000
Subject: [pkgdb] python-basemap-data: limb has given up watchcommits
Message-ID: <20091210131744.A223E10F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-basemap-data (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:45 +0000
Subject: [pkgdb] python-basemap-data: limb has requested commit
Message-ID: <20091210131745.8660410F89D@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-basemap-data (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:46 +0000
Subject: [pkgdb] python-basemap-data: limb has requested approveacls
Message-ID: <20091210131747.0407510F85F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-basemap-data (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:47 +0000
Subject: [pkgdb] python-basemap-data: limb has given up watchbugzilla
Message-ID: <20091210131747.A503610F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-basemap-data (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:50 +0000
Subject: [pkgdb] python-basemap-data: limb has given up watchbugzilla
Message-ID: <20091210131750.47DA010F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-basemap-data (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:52 +0000
Subject: [pkgdb] python-basemap-data: limb has requested commit
Message-ID: <20091210131752.A7A0C10F85F@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-basemap-data (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:54 +0000
Subject: [pkgdb] python-basemap-data: limb has given up watchcommits
Message-ID: <20091210131754.651B210F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-basemap-data (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:55 +0000
Subject: [pkgdb] python-basemap-data: limb has requested approveacls
Message-ID: <20091210131755.2EE1D10F85F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-basemap-data (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:58 +0000
Subject: [pkgdb] python-basemap-data: limb has given up watchcommits
Message-ID: <20091210131758.5799510F87D@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-basemap-data (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:57 +0000
Subject: [pkgdb] python-basemap-data: limb has given up watchbugzilla
Message-ID: <20091210131758.07B0A10F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-basemap-data (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:17:58 +0000
Subject: [pkgdb] python-basemap-data: limb has requested commit
Message-ID: <20091210131758.DCE0D10F865@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-basemap-data (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Thu Dec 10 13:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:18:00 +0000
Subject: [pkgdb] python-basemap-data: limb has requested approveacls
Message-ID: <20091210131800.49D2710F85F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-basemap-data (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From ovasik at fedoraproject.org  Thu Dec 10 13:19:08 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Dec 2009 13:19:08 +0000 (UTC)
Subject: rpms/openjade/devel openjade.spec,1.49,1.50
Message-ID: <20091210131908.EB76F11C025D@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/openjade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23038

Modified Files:
	openjade.spec 
Log Message:
Remove unnecessary obsoletes


Index: openjade.spec
===================================================================
RCS file: /cvs/extras/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- openjade.spec	10 Dec 2009 13:16:14 -0000	1.49
+++ openjade.spec	10 Dec 2009 13:19:08 -0000	1.50
@@ -14,7 +14,6 @@ Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Last jade version is from Red Hat 6.2
-Obsoletes: jade <= 1.2.1-9
 Provides: jade = %{version}-%{release}
 
 BuildRequires: opensp-devel



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:27 +0000
Subject: [pkgdb] python-dateutil: limb has given up watchbugzilla
Message-ID: <20091210131927.A7A3410F8AC@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-dateutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:28 +0000
Subject: [pkgdb] python-dateutil: limb has given up watchcommits
Message-ID: <20091210131928.3C6FD10F8B0@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-dateutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:29 +0000
Subject: [pkgdb] python-dateutil: limb has requested commit
Message-ID: <20091210131929.4387410F87D@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-dateutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:30 +0000
Subject: [pkgdb] python-dateutil: limb has requested approveacls
Message-ID: <20091210131930.88A7410F8B3@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-dateutil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From mlichvar at fedoraproject.org  Thu Dec 10 13:19:37 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 10 Dec 2009 13:19:37 +0000 (UTC)
Subject: File openbox-3.4.8.tar.gz uploaded to lookaside cache by mlichvar
Message-ID: <20091210131937.BB73F10F8B6@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for openbox:

3523fe9760947a15fb8ed3611090ccd2  openbox-3.4.8.tar.gz



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:37 +0000
Subject: [pkgdb] python-dateutil: limb has given up watchbugzilla
Message-ID: <20091210131937.99C8210F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-dateutil (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:40 +0000
Subject: [pkgdb] python-dateutil: limb has requested commit
Message-ID: <20091210131940.AFDC310F89E@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-dateutil (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:42 +0000
Subject: [pkgdb] python-dateutil: limb has requested approveacls
Message-ID: <20091210131942.4850410F8A4@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-dateutil (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:52 +0000
Subject: [pkgdb] python-dateutil: limb has requested commit
Message-ID: <20091210131952.9178310F8A8@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-dateutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:49 +0000
Subject: [pkgdb] python-dateutil: limb has requested approveacls
Message-ID: <20091210131949.B6E7610F8BC@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-dateutil (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:48 +0000
Subject: [pkgdb] python-dateutil: limb has given up watchcommits
Message-ID: <20091210131948.3281610F878@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-dateutil (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:51 +0000
Subject: [pkgdb] python-dateutil: limb has given up watchbugzilla
Message-ID: <20091210131951.D0AC210F8AF@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-dateutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:49 +0000
Subject: [pkgdb] python-dateutil: limb has requested commit
Message-ID: <20091210131949.5729910F8B7@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on python-dateutil (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:40 +0000
Subject: [pkgdb] python-dateutil: limb has given up watchcommits
Message-ID: <20091210131940.27F2510F8A2@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-dateutil (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:45 +0000
Subject: [pkgdb] python-dateutil: limb has given up watchbugzilla
Message-ID: <20091210131945.6C66610F8AD@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on python-dateutil (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:53 +0000
Subject: [pkgdb] python-dateutil: limb has requested approveacls
Message-ID: <20091210131954.0633010F8A1@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on python-dateutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:19:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:19:52 +0000
Subject: [pkgdb] python-dateutil: limb has given up watchcommits
Message-ID: <20091210131952.3A57610F8A2@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on python-dateutil (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:15 +0000
Subject: [pkgdb] pytz: limb has given up watchcommits
Message-ID: <20091210132015.39B5710F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on pytz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:17 +0000
Subject: [pkgdb] pytz: limb has requested commit
Message-ID: <20091210132017.52EB510F85F@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on pytz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:19 +0000
Subject: [pkgdb] pytz: limb has given up watchbugzilla
Message-ID: <20091210132019.5C0E810F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on pytz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:19 +0000
Subject: [pkgdb] pytz: limb has requested approveacls
Message-ID: <20091210132019.6F14310F87D@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on pytz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:29 +0000
Subject: [pkgdb] pytz: limb has given up watchcommits
Message-ID: <20091210132029.20D2110F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on pytz (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:31 +0000
Subject: [pkgdb] pytz: limb has requested commit
Message-ID: <20091210132031.4D3A310F85F@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on pytz (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:32 +0000
Subject: [pkgdb] pytz: limb has given up watchbugzilla
Message-ID: <20091210132032.C285F10F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on pytz (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:32 +0000
Subject: [pkgdb] pytz: limb has requested approveacls
Message-ID: <20091210132032.ECCE210F87D@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on pytz (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:35 +0000
Subject: [pkgdb] pytz: limb has given up watchcommits
Message-ID: <20091210132035.39CA110F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on pytz (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:37 +0000
Subject: [pkgdb] pytz: limb has requested commit
Message-ID: <20091210132037.95C3310F85F@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on pytz (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:38 +0000
Subject: [pkgdb] pytz: limb has requested approveacls
Message-ID: <20091210132038.3F08510F85C@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on pytz (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:39 +0000
Subject: [pkgdb] pytz: limb has given up watchbugzilla
Message-ID: <20091210132039.9967510F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on pytz (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:41 +0000
Subject: [pkgdb] pytz: limb has given up watchbugzilla
Message-ID: <20091210132041.33EDD10F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on pytz (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:41 +0000
Subject: [pkgdb] pytz: limb has given up watchcommits
Message-ID: <20091210132041.D5E5D10F85C@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on pytz (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:42 +0000
Subject: [pkgdb] pytz: limb has requested commit
Message-ID: <20091210132043.4D13C10F85C@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on pytz (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:20:44 +0000
Subject: [pkgdb] pytz: limb has requested approveacls
Message-ID: <20091210132044.2062610F85F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on pytz (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:03 +0000
Subject: [pkgdb] ScientificPython: limb has requested approveacls
Message-ID: <20091210132103.3BFCB10F865@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on ScientificPython (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:00 +0000
Subject: [pkgdb] ScientificPython: limb has given up watchbugzilla
Message-ID: <20091210132100.AC9BA10F865@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on ScientificPython (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:00 +0000
Subject: [pkgdb] ScientificPython: limb has given up watchcommits
Message-ID: <20091210132100.B962910F89D@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on ScientificPython (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:01 +0000
Subject: [pkgdb] ScientificPython: limb has requested commit
Message-ID: <20091210132101.9250810F89F@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on ScientificPython (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:07 +0000
Subject: [pkgdb] ScientificPython: limb has given up watchcommits
Message-ID: <20091210132107.9DA9910F878@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on ScientificPython (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:07 +0000
Subject: [pkgdb] ScientificPython: limb has given up watchbugzilla
Message-ID: <20091210132107.E4CDC10F89E@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on ScientificPython (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:08 +0000
Subject: [pkgdb] ScientificPython: limb has requested commit
Message-ID: <20091210132108.74B1710F878@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on ScientificPython (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:10 +0000
Subject: [pkgdb] ScientificPython: limb has requested approveacls
Message-ID: <20091210132110.4C83C10F85F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on ScientificPython (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:12 +0000
Subject: [pkgdb] ScientificPython: limb has given up watchcommits
Message-ID: <20091210132112.A7C6310F85F@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on ScientificPython (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:13 +0000
Subject: [pkgdb] ScientificPython: limb has requested commit
Message-ID: <20091210132113.6CF0F10F85F@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on ScientificPython (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:14 +0000
Subject: [pkgdb] ScientificPython: limb has requested approveacls
Message-ID: <20091210132114.AEE3810F85F@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on ScientificPython (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:14 +0000
Subject: [pkgdb] ScientificPython: limb has given up watchbugzilla
Message-ID: <20091210132114.DF37B10F87D@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on ScientificPython (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:17 +0000
Subject: [pkgdb] ScientificPython: limb has given up watchbugzilla
Message-ID: <20091210132118.1213110F89F@bastion2.fedora.phx.redhat.com>

limb has given up the watchbugzilla acl on ScientificPython (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:17 +0000
Subject: [pkgdb] ScientificPython: limb has given up watchcommits
Message-ID: <20091210132118.1422810F8A1@bastion2.fedora.phx.redhat.com>

limb has given up the watchcommits acl on ScientificPython (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:20 +0000
Subject: [pkgdb] ScientificPython: limb has requested approveacls
Message-ID: <20091210132120.48F6810F8A9@bastion2.fedora.phx.redhat.com>

limb has requested the approveacls acl on ScientificPython (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Thu Dec 10 13:21:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:21:18 +0000
Subject: [pkgdb] ScientificPython: limb has requested commit
Message-ID: <20091210132118.F222D10F8A5@bastion2.fedora.phx.redhat.com>

limb has requested the commit acl on ScientificPython (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From allisson at fedoraproject.org  Thu Dec 10 13:21:56 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 10 Dec 2009 13:21:56 +0000 (UTC)
Subject: rpms/perl-MooseX-Singleton/devel import.log, 1.1,
	1.2 perl-MooseX-Singleton.spec, 1.5, 1.6
Message-ID: <20091210132156.9A6B611C025D@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-Singleton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23905/devel

Modified Files:
	import.log perl-MooseX-Singleton.spec 
Log Message:

- Update BR.
- Remove README from docs.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Mar 2009 21:20:55 -0000	1.1
+++ import.log	10 Dec 2009 13:21:56 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-Singleton-0_14-1_fc10:HEAD:perl-MooseX-Singleton-0.14-1.fc10.src.rpm:1236287799
+perl-MooseX-Singleton-0_21-3_fc12:HEAD:perl-MooseX-Singleton-0.21-3.fc12.src.rpm:1260451189


Index: perl-MooseX-Singleton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Singleton/devel/perl-MooseX-Singleton.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-MooseX-Singleton.spec	4 Dec 2009 02:44:19 -0000	1.5
+++ perl-MooseX-Singleton.spec	10 Dec 2009 13:21:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Singleton
 Version:        0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Turn your Moose class into a singleton
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -13,6 +13,8 @@ BuildRequires:  perl(Moose) >= 0.82
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Warn)
+BuildRequires:  perl(MooseX::StrictConstructor)
+BuildRequires:  perl(Test::Exception)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 Requires:       perl(Moose) >= 0.82
@@ -61,11 +63,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README
+%doc ChangeLog
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 10 2009 Allisson Azevedo <allisson at gmail.com> 0.21-3
+- Update BR.
+- Remove README from docs.
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.21-2
 - rebuild against perl 5.10.1
 



From kraxel at fedoraproject.org  Thu Dec 10 13:31:29 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Thu, 10 Dec 2009 13:31:29 +0000 (UTC)
Subject: rpms/xen/devel .cvsignore, 1.42, 1.43 sources, 1.57, 1.58 xen.spec, 
	1.250,
	1.251 xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch, 1.1,
	NONE xen-fix-videoram-option.patch, 1.1,
	NONE xen-pygrub-fix-timeout-0.patch, 1.1,
	NONE xen-qemu-dm-fix-block-memory-leak.patch, 1.1, NONE
Message-ID: <20091210133129.0EA2611C025D@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27316

Modified Files:
	.cvsignore sources xen.spec 
Removed Files:
	xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch 
	xen-fix-videoram-option.patch xen-pygrub-fix-timeout-0.patch 
	xen-qemu-dm-fix-block-memory-leak.patch 
Log Message:
update to 3.4.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	7 Aug 2009 14:56:02 -0000	1.42
+++ .cvsignore	10 Dec 2009 13:31:28 -0000	1.43
@@ -5,4 +5,4 @@ newlib-1.16.0.tar.gz
 lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
-xen-3.4.1.tar.gz
+xen-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	7 Aug 2009 14:56:02 -0000	1.57
+++ sources	10 Dec 2009 13:31:28 -0000	1.58
@@ -3,4 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib
 36cc57650cffda9a0269493be2a169bb  lwip-1.3.0.tar.gz
 cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
-c3f8dbcf833140825b1e2f16b64655f3  xen-3.4.1.tar.gz
+f009a7abf51017aeee697c9130b6f8a6  xen-3.4.2.tar.gz


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- xen.spec	9 Oct 2009 14:55:39 -0000	1.250
+++ xen.spec	10 Dec 2009 13:31:28 -0000	1.251
@@ -5,8 +5,8 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 3.4.1
-Release: 5%{?dist}
+Version: 3.4.2
+Release: 1%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -37,12 +37,6 @@ Patch5: xen-net-disable-iptables-on-brid
 
 Patch10: xen-no-werror.patch
 
-# backports
-Patch20: xen-pygrub-fix-timeout-0.patch
-Patch21: xen-qemu-dm-fix-block-memory-leak.patch
-Patch22: xen-fix-videoram-option.patch
-Patch23: xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch
-
 Patch100: xen-configure-xend.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -147,11 +141,6 @@ which manage Xen virtual machines.
 
 %patch10 -p1
 
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-
 %patch100 -p1
 
 # stubdom sources
@@ -465,6 +454,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Thu Dec 10 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.2-1
+- update to 3.4.2 release.
+- drop backport patches.
+
 * Fri Oct 8 2009 Justin M. Forbes <jforbes at redhat.com> - 3.4.1-5
 - add PyXML to dependencies. (#496135)
 - Take ownership of {_libdir}/fs (#521806)


--- xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch DELETED ---


--- xen-fix-videoram-option.patch DELETED ---


--- xen-pygrub-fix-timeout-0.patch DELETED ---


--- xen-qemu-dm-fix-block-memory-leak.patch DELETED ---



From tuxbrewr at fedoraproject.org  Thu Dec 10 13:40:53 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Thu, 10 Dec 2009 13:40:53 +0000 (UTC)
Subject: File kpackagekit-0.5.2.tar.bz2 uploaded to lookaside cache by
	tuxbrewr
Message-ID: <20091210134053.B8CCE10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kpackagekit:

f8ea07be333aad9448a686a57453f080  kpackagekit-0.5.2.tar.bz2



From tuxbrewr at fedoraproject.org  Thu Dec 10 13:41:40 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Thu, 10 Dec 2009 13:41:40 +0000 (UTC)
Subject: rpms/kpackagekit/F-12 .cvsignore, 1.18, 1.19 kpackagekit.spec, 1.49,
	1.50 sources, 1.26, 1.27
Message-ID: <20091210134140.A58C311C025D@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30861

Modified Files:
	.cvsignore kpackagekit.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	17 Nov 2009 21:03:00 -0000	1.18
+++ .cvsignore	10 Dec 2009 13:41:40 -0000	1.19
@@ -1 +1 @@
-kpackagekit-0.5.1.1.tar.bz2
+kpackagekit-0.5.2.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/kpackagekit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- kpackagekit.spec	17 Nov 2009 21:03:00 -0000	1.49
+++ kpackagekit.spec	10 Dec 2009 13:41:40 -0000	1.50
@@ -1,22 +1,22 @@
 
-%define pk_version 0.5.3
+%define pk_version 0.5.5
 
 Name:	  	kpackagekit
-Version:	0.5.1.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
 Group:		Applications/System
 #Source0:	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
-Source0:	kpackagekit-0.5.1.1.tar.bz2
+Source0:	kpackagekit-0.5.2.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Hacks to smash kpackagekit: daily/none default (#469375)
 Patch50: kpackagekit-0.5.1-defaults_hacks.patch
-Patch51: KpKStrings.patch
-Patch52: KpKIcons.patch
+#Patch51: KpKStrings.patch
+#Patch52: KpKIcons.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -36,8 +36,8 @@ KDE interface for PackageKit.
 %setup -q -n %{name}-%{version}
 
 %patch50  -p1 -b .defaults_hacks
-%patch51 -p1 -b .strings
-%patch52 -p1 -b .icons
+#patch51 -p1 -b .strings
+#patch52 -p1 -b .icons
 
 
 %build
@@ -78,9 +78,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/kpackagekit/
 %{_kde4_appsdir}/KPackageKitSmartIcon/
 %{_datadir}/dbus-1/services/org.kde.KPackageKitSmartIcon.service
-
+%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 
 %changelog
+* Mon Dec 07 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.2
+- New upstream release
+
+* Thu Nov 19 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.1.1-2
+- Remove no longer need patches
+
 * Tue Nov 17 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.1.1-1
 - New upstream release fixes #531447, #533755, #536930
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	17 Nov 2009 21:03:00 -0000	1.26
+++ sources	10 Dec 2009 13:41:40 -0000	1.27
@@ -1 +1 @@
-a370aeeac0fee51b43ea11b74e8f59b8  kpackagekit-0.5.1.1.tar.bz2
+f8ea07be333aad9448a686a57453f080  kpackagekit-0.5.2.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec 10 13:56:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:56:14 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20091210135614.599AB10F85C@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora devel is now owned by jpopelka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Thu Dec 10 13:56:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 13:56:21 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20091210135621.E39D310F85F@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 12 is now owned by jpopelka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From mlichvar at fedoraproject.org  Thu Dec 10 14:12:59 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 10 Dec 2009 14:12:59 +0000 (UTC)
Subject: rpms/openbox/devel openbox-3.4.8-gdm.patch, NONE,
	1.1 openbox-3.4.8-gnomesession.patch, NONE,
	1.1 openbox-3.4.8-xdgautostart.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 openbox.spec, 1.44, 1.45 sources, 1.15,
	1.16 openbox-3.4.7.2-gdm.patch, 1.3,
	NONE openbox-3.4.7.2-gnomesession.patch, 1.3, NONE
Message-ID: <20091210141259.4BDDE11C025D@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9719

Modified Files:
	.cvsignore openbox.spec sources 
Added Files:
	openbox-3.4.8-gdm.patch openbox-3.4.8-gnomesession.patch 
	openbox-3.4.8-xdgautostart.patch 
Removed Files:
	openbox-3.4.7.2-gdm.patch openbox-3.4.7.2-gnomesession.patch 
Log Message:
- Update to 3.4.8
- Fix crash in xdg-autostart on desktop files with TryExec (#544006)


openbox-3.4.8-gdm.patch:
 openbox-gnome-session.in |    3 +++
 openbox-kde-session.in   |    3 +++
 openbox-session.in       |    3 +++
 3 files changed, 9 insertions(+)

--- NEW FILE openbox-3.4.8-gdm.patch ---
diff -up openbox-3.4.8/data/xsession/openbox-gnome-session.in.gdm openbox-3.4.8/data/xsession/openbox-gnome-session.in
--- openbox-3.4.8/data/xsession/openbox-gnome-session.in.gdm	2009-12-08 21:57:11.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-gnome-session.in	2009-12-10 14:06:27.000000000 +0100
@@ -7,6 +7,9 @@ if test -n "$1"; then
   exit
 fi
 
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
 VER=$(gnome-session --version 2>/dev/null | \
       sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
 
diff -up openbox-3.4.8/data/xsession/openbox-kde-session.in.gdm openbox-3.4.8/data/xsession/openbox-kde-session.in
--- openbox-3.4.8/data/xsession/openbox-kde-session.in.gdm	2009-12-08 15:32:06.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-kde-session.in	2009-12-10 14:06:04.000000000 +0100
@@ -7,6 +7,9 @@ if test -n "$1"; then
   exit
 fi
 
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
 # Run KDE with Openbox as its window manager
 export KDEWM="@bindir@/openbox"
 exec startkde "$@"
diff -up openbox-3.4.8/data/xsession/openbox-session.in.gdm openbox-3.4.8/data/xsession/openbox-session.in
--- openbox-3.4.8/data/xsession/openbox-session.in.gdm	2009-12-08 15:37:34.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-session.in	2009-12-10 14:06:49.000000000 +0100
@@ -7,6 +7,9 @@ if test -n "$1"; then
   exit
 fi
 
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
 AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
 GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
 

openbox-3.4.8-gnomesession.patch:
 openbox-gnome-session.in |   30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

--- NEW FILE openbox-3.4.8-gnomesession.patch ---
diff -up openbox-3.4.8/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.8/data/xsession/openbox-gnome-session.in
--- openbox-3.4.8/data/xsession/openbox-gnome-session.in.gnomesession	2009-12-10 14:14:13.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-gnome-session.in	2009-12-10 14:15:29.000000000 +0100
@@ -10,27 +10,13 @@ fi
 # Clean up after GDM
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
-VER=$(gnome-session --version 2>/dev/null | \
-      sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
-
-MAJOR=$(echo $VER | cut -d . -f 1)
-MINOR=$(echo $VER | cut -d . -f 2)
-
 # Run GNOME with Openbox as its window manager
-export WINDOW_MANAGER="@bindir@/openbox"
-
-if test $MAJOR -lt 2 || (test $MAJOR = 2 && test $MINOR -le 22); then
-  # old gnome-session allows multiple sessions to be saved
-  exec gnome-session --choose-session=openbox-session "$@"
-else
-  # make sure the gnome-wm script is being used
-  gconftool-2 -t string \
-      -s /desktop/gnome/session/required_components/windowmanager "gnome-wm" \
-      2> /dev/null
-
-  # new gnome-session does not allow multiple sessions
-  exec gnome-session "$@"
-fi
-
-
+SESSION=$(gconftool-2 -g /desktop/gnome/session/default_session 2> /dev/null)
+test -z "$SESSION" && SESSION="[openbox]"
+echo "$SESSION" | grep -q openbox || SESSION="${SESSION%]},openbox]"
+
+OPENBOX_SESSION=$(gconftool-2 -g /desktop/gnome/session/openbox_session 2> /dev/null)
+[ "$SESSION" != "$OPENBOX_SESSION" ] && gconftool-2 -t list --list-type=strings -s \
+  /desktop/gnome/session/openbox_session "$SESSION" 2> /dev/null
 
+exec gnome-session --default-session-key /desktop/gnome/session/openbox_session "$@"

openbox-3.4.8-xdgautostart.patch:
 xdg-autostart |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openbox-3.4.8-xdgautostart.patch ---
diff -up openbox-3.4.8/tools/xdg-autostart/xdg-autostart.xdgautostart openbox-3.4.8/tools/xdg-autostart/xdg-autostart
--- openbox-3.4.8/tools/xdg-autostart/xdg-autostart.xdgautostart	2009-12-08 15:32:06.000000000 +0100
+++ openbox-3.4.8/tools/xdg-autostart/xdg-autostart	2009-12-10 15:04:45.000000000 +0100
@@ -80,7 +80,7 @@ class AutostartFile:
     def __str__(self):
         return self.path + " : " + self.de.getName()
 
-    def _isexecfile(path):
+    def _isexecfile(self, path):
         return os.access(path, os.X_OK)
 
     def _findFile(self, path, search, match_func):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 May 2008 16:42:55 -0000	1.12
+++ .cvsignore	10 Dec 2009 14:12:57 -0000	1.13
@@ -1,2 +1,2 @@
 setlayout.c
-openbox-3.4.7.2.tar.gz
+openbox-3.4.8.tar.gz


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- openbox.spec	22 Sep 2009 11:34:56 -0000	1.44
+++ openbox.spec	10 Dec 2009 14:12:58 -0000	1.45
@@ -1,6 +1,6 @@
 Name:		openbox
-Version:	3.4.7.2
-Release:	11%{?dist}
+Version:	3.4.8
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -13,10 +13,11 @@ Source3:	menu.xml
 Source4:	openbox.desktop
 
 Patch0:		openbox-3.4.7.1-autostartdir.patch
-Patch1:		openbox-3.4.7.2-gdm.patch
-Patch2:		openbox-3.4.7.2-gnomesession.patch
+Patch1:		openbox-3.4.8-gdm.patch
+Patch2:		openbox-3.4.8-gnomesession.patch
 Patch3:		openbox-3.4.7.2-autostartid.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
+Patch5:		openbox-3.4.8-xdgautostart.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +79,7 @@ The %{name}-libs package contains shared
 %patch2 -p1 -b .gnomesession
 %patch3 -p1 -b .autostartid
 %patch4 -p1 -b .24bit
+%patch5 -p1 -b .xdgautostart
 
 
 %build
@@ -148,6 +150,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.8-1
+- Update to 3.4.8
+- Fix crash in xdg-autostart on desktop files with TryExec (#544006)
+
 * Tue Sep 22 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.7.2-11
 - Add support for 24-bit images (#524708)
 - Update setlayout.c


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Sep 2009 11:34:56 -0000	1.15
+++ sources	10 Dec 2009 14:12:58 -0000	1.16
@@ -1,2 +1,2 @@
-9e7589e90519bc6ac2f4656ea6869439  openbox-3.4.7.2.tar.gz
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
+3523fe9760947a15fb8ed3611090ccd2  openbox-3.4.8.tar.gz


--- openbox-3.4.7.2-gdm.patch DELETED ---


--- openbox-3.4.7.2-gnomesession.patch DELETED ---



From mlichvar at fedoraproject.org  Thu Dec 10 14:17:51 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 10 Dec 2009 14:17:51 +0000 (UTC)
Subject: rpms/openbox/F-12 openbox-3.4.8-gdm.patch, NONE,
	1.1 openbox-3.4.8-gnomesession.patch, NONE,
	1.1 openbox-3.4.8-xdgautostart.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 openbox.spec, 1.44, 1.45 sources, 1.15,
	1.16 openbox-3.4.7.2-gdm.patch, 1.3,
	NONE openbox-3.4.7.2-gnomesession.patch, 1.3, NONE
Message-ID: <20091210141751.147B211C025D@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11354

Modified Files:
	.cvsignore openbox.spec sources 
Added Files:
	openbox-3.4.8-gdm.patch openbox-3.4.8-gnomesession.patch 
	openbox-3.4.8-xdgautostart.patch 
Removed Files:
	openbox-3.4.7.2-gdm.patch openbox-3.4.7.2-gnomesession.patch 
Log Message:
- Update to 3.4.8
- Fix crash in xdg-autostart on desktop files with TryExec (#544006)


openbox-3.4.8-gdm.patch:
 openbox-gnome-session.in |    3 +++
 openbox-kde-session.in   |    3 +++
 openbox-session.in       |    3 +++
 3 files changed, 9 insertions(+)

--- NEW FILE openbox-3.4.8-gdm.patch ---
diff -up openbox-3.4.8/data/xsession/openbox-gnome-session.in.gdm openbox-3.4.8/data/xsession/openbox-gnome-session.in
--- openbox-3.4.8/data/xsession/openbox-gnome-session.in.gdm	2009-12-08 21:57:11.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-gnome-session.in	2009-12-10 14:06:27.000000000 +0100
@@ -7,6 +7,9 @@ if test -n "$1"; then
   exit
 fi
 
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
 VER=$(gnome-session --version 2>/dev/null | \
       sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
 
diff -up openbox-3.4.8/data/xsession/openbox-kde-session.in.gdm openbox-3.4.8/data/xsession/openbox-kde-session.in
--- openbox-3.4.8/data/xsession/openbox-kde-session.in.gdm	2009-12-08 15:32:06.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-kde-session.in	2009-12-10 14:06:04.000000000 +0100
@@ -7,6 +7,9 @@ if test -n "$1"; then
   exit
 fi
 
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
 # Run KDE with Openbox as its window manager
 export KDEWM="@bindir@/openbox"
 exec startkde "$@"
diff -up openbox-3.4.8/data/xsession/openbox-session.in.gdm openbox-3.4.8/data/xsession/openbox-session.in
--- openbox-3.4.8/data/xsession/openbox-session.in.gdm	2009-12-08 15:37:34.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-session.in	2009-12-10 14:06:49.000000000 +0100
@@ -7,6 +7,9 @@ if test -n "$1"; then
   exit
 fi
 
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
 AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
 GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
 

openbox-3.4.8-gnomesession.patch:
 openbox-gnome-session.in |   30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

--- NEW FILE openbox-3.4.8-gnomesession.patch ---
diff -up openbox-3.4.8/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.8/data/xsession/openbox-gnome-session.in
--- openbox-3.4.8/data/xsession/openbox-gnome-session.in.gnomesession	2009-12-10 14:14:13.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-gnome-session.in	2009-12-10 14:15:29.000000000 +0100
@@ -10,27 +10,13 @@ fi
 # Clean up after GDM
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
-VER=$(gnome-session --version 2>/dev/null | \
-      sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
-
-MAJOR=$(echo $VER | cut -d . -f 1)
-MINOR=$(echo $VER | cut -d . -f 2)
-
 # Run GNOME with Openbox as its window manager
-export WINDOW_MANAGER="@bindir@/openbox"
-
-if test $MAJOR -lt 2 || (test $MAJOR = 2 && test $MINOR -le 22); then
-  # old gnome-session allows multiple sessions to be saved
-  exec gnome-session --choose-session=openbox-session "$@"
-else
-  # make sure the gnome-wm script is being used
-  gconftool-2 -t string \
-      -s /desktop/gnome/session/required_components/windowmanager "gnome-wm" \
-      2> /dev/null
-
-  # new gnome-session does not allow multiple sessions
-  exec gnome-session "$@"
-fi
-
-
+SESSION=$(gconftool-2 -g /desktop/gnome/session/default_session 2> /dev/null)
+test -z "$SESSION" && SESSION="[openbox]"
+echo "$SESSION" | grep -q openbox || SESSION="${SESSION%]},openbox]"
+
+OPENBOX_SESSION=$(gconftool-2 -g /desktop/gnome/session/openbox_session 2> /dev/null)
+[ "$SESSION" != "$OPENBOX_SESSION" ] && gconftool-2 -t list --list-type=strings -s \
+  /desktop/gnome/session/openbox_session "$SESSION" 2> /dev/null
 
+exec gnome-session --default-session-key /desktop/gnome/session/openbox_session "$@"

openbox-3.4.8-xdgautostart.patch:
 xdg-autostart |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openbox-3.4.8-xdgautostart.patch ---
diff -up openbox-3.4.8/tools/xdg-autostart/xdg-autostart.xdgautostart openbox-3.4.8/tools/xdg-autostart/xdg-autostart
--- openbox-3.4.8/tools/xdg-autostart/xdg-autostart.xdgautostart	2009-12-08 15:32:06.000000000 +0100
+++ openbox-3.4.8/tools/xdg-autostart/xdg-autostart	2009-12-10 15:04:45.000000000 +0100
@@ -80,7 +80,7 @@ class AutostartFile:
     def __str__(self):
         return self.path + " : " + self.de.getName()
 
-    def _isexecfile(path):
+    def _isexecfile(self, path):
         return os.access(path, os.X_OK)
 
     def _findFile(self, path, search, match_func):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 May 2008 16:42:55 -0000	1.12
+++ .cvsignore	10 Dec 2009 14:17:50 -0000	1.13
@@ -1,2 +1,2 @@
 setlayout.c
-openbox-3.4.7.2.tar.gz
+openbox-3.4.8.tar.gz


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/openbox.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- openbox.spec	22 Sep 2009 11:34:56 -0000	1.44
+++ openbox.spec	10 Dec 2009 14:17:50 -0000	1.45
@@ -1,6 +1,6 @@
 Name:		openbox
-Version:	3.4.7.2
-Release:	11%{?dist}
+Version:	3.4.8
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -13,10 +13,11 @@ Source3:	menu.xml
 Source4:	openbox.desktop
 
 Patch0:		openbox-3.4.7.1-autostartdir.patch
-Patch1:		openbox-3.4.7.2-gdm.patch
-Patch2:		openbox-3.4.7.2-gnomesession.patch
+Patch1:		openbox-3.4.8-gdm.patch
+Patch2:		openbox-3.4.8-gnomesession.patch
 Patch3:		openbox-3.4.7.2-autostartid.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
+Patch5:		openbox-3.4.8-xdgautostart.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +79,7 @@ The %{name}-libs package contains shared
 %patch2 -p1 -b .gnomesession
 %patch3 -p1 -b .autostartid
 %patch4 -p1 -b .24bit
+%patch5 -p1 -b .xdgautostart
 
 
 %build
@@ -148,6 +150,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.8-1
+- Update to 3.4.8
+- Fix crash in xdg-autostart on desktop files with TryExec (#544006)
+
 * Tue Sep 22 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.7.2-11
 - Add support for 24-bit images (#524708)
 - Update setlayout.c


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Sep 2009 11:34:56 -0000	1.15
+++ sources	10 Dec 2009 14:17:50 -0000	1.16
@@ -1,2 +1,2 @@
-9e7589e90519bc6ac2f4656ea6869439  openbox-3.4.7.2.tar.gz
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
+3523fe9760947a15fb8ed3611090ccd2  openbox-3.4.8.tar.gz


--- openbox-3.4.7.2-gdm.patch DELETED ---


--- openbox-3.4.7.2-gnomesession.patch DELETED ---



From karsten at fedoraproject.org  Thu Dec 10 14:24:06 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Dec 2009 14:24:06 +0000 (UTC)
Subject: File libcap-2.17.tar.gz uploaded to lookaside cache by karsten
Message-ID: <20091210142406.99A3510F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libcap:

fa8c3841ce491b379de316a195e65da2  libcap-2.17.tar.gz



From karsten at fedoraproject.org  Thu Dec 10 14:24:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 10 Dec 2009 14:24:43 +0000 (UTC)
Subject: rpms/libcap/devel .cvsignore, 1.6, 1.7 libcap.spec, 1.44,
	1.45 sources, 1.7, 1.8
Message-ID: <20091210142443.554F711C025D@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/libcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13904

Modified Files:
	.cvsignore libcap.spec sources 
Log Message:
- update to 2.17


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcap/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Mar 2009 17:02:16 -0000	1.6
+++ .cvsignore	10 Dec 2009 14:24:42 -0000	1.7
@@ -1 +1 @@
-libcap-2.16.tar.gz
+libcap-2.17.tar.gz


Index: libcap.spec
===================================================================
RCS file: /cvs/extras/rpms/libcap/devel/libcap.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- libcap.spec	25 Jul 2009 05:24:01 -0000	1.44
+++ libcap.spec	10 Dec 2009 14:24:42 -0000	1.45
@@ -1,6 +1,6 @@
 Name: libcap
-Version: 2.16
-Release: 5%{?dist}
+Version: 2.17
+Release: 1%{?dist}
 Summary: Library for getting and setting POSIX.1e capabilities
 Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.gz
 Patch0: libcap-2.16-headerfix.patch
@@ -31,7 +31,7 @@ libcap.
 
 %prep
 %setup -q
-%patch0 -p1
+#patch0 -p1
 
 %build
 # libcap can not be build with _smp_mflags:
@@ -77,6 +77,9 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Thu Dec 10 2009 Karsten Hopp <karsten at redhat.com> 2.17-1
+- update to 2.17
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcap/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 Mar 2009 17:02:16 -0000	1.7
+++ sources	10 Dec 2009 14:24:42 -0000	1.8
@@ -1 +1 @@
-9e075fda242c4070ba76407064c13302  libcap-2.16.tar.gz
+fa8c3841ce491b379de316a195e65da2  libcap-2.17.tar.gz



From kzak at fedoraproject.org  Thu Dec 10 14:25:08 2009
From: kzak at fedoraproject.org (kzak)
Date: Thu, 10 Dec 2009 14:25:08 +0000 (UTC)
Subject: rpms/util-linux-ng/F-12 util-linux-ng.spec,1.66,1.67
Message-ID: <20091210142508.44A4511C025D@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14032

Modified Files:
	util-linux-ng.spec 
Log Message:
* Thu Dec 10 2009 Karel Zak <kzak at redhat.com> 2.16.2-3
- fix typo in spec file
- add Requires: libblkid and libuuid (bz#531992 comment #38)



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- util-linux-ng.spec	9 Dec 2009 20:58:54 -0000	1.66
+++ util-linux-ng.spec	10 Dec 2009 14:25:08 -0000	1.67
@@ -75,6 +75,8 @@ Requires(post): /sbin/install-info
 Requires(post): coreutils
 Requires: pam >= 1.0.90, /etc/pam.d/system-auth
 Requires: audit-libs >= 1.0.6
+Requires: libuuid = %{version}-%{release}
+Requires: libblkid = %{version}-%{release}
 %if %{include_raw}
 Requires: udev
 %endif
@@ -715,8 +717,9 @@ fi
 
 
 %changelog
-* Wed Dec  9 2009 Karel Zak <kzak at redhat.com> 2.16.2-3
+* Thu Dec 10 2009 Karel Zak <kzak at redhat.com> 2.16.2-3
 - fix typo in spec file
+- add Requires: libblkid and libuuid (bz#531992 comment #38)
 
 * Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-2
 - fix #536797 - ntfs volume labels are not correct in hal



From pbrobinson at fedoraproject.org  Thu Dec 10 14:28:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 10 Dec 2009 14:28:16 +0000 (UTC)
Subject: rpms/gupnp-vala/devel gupnp-vala.spec,1.10,1.11
Message-ID: <20091210142816.CFD1E11C025D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14914

Modified Files:
	gupnp-vala.spec 
Log Message:
- Disable the empty debuginfo package


Index: gupnp-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/gupnp-vala.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gupnp-vala.spec	21 Nov 2009 08:03:54 -0000	1.10
+++ gupnp-vala.spec	10 Dec 2009 14:28:16 -0000	1.11
@@ -1,6 +1,9 @@
+# Disable the debug package because vala isn't executable but rather is used to generate code
+%global debug_package %{nil}
+
 Name:           gupnp-vala
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GUPnP is a uPnP framework. This adds vala language bindings
 
 Group:          Development/Languages
@@ -30,8 +33,6 @@ This package adds vala language bindings
 %setup -q
 
 %build
-# The generated files are noarch, but configure need to be told the
-# real host alias for building
 %configure --target=%{_host_alias}
 make %{?_smp_mflags} V=1
 
@@ -60,6 +61,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/gupnp-vala-1.0.pc
 
 %changelog
+* Thu Dec 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.6.2-2
+- Disable the empty debuginfo package
+
 * Sat Nov 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.6.2-1
 - New upstream 0.6.2 release
 



From kzak at fedoraproject.org  Thu Dec 10 14:37:50 2009
From: kzak at fedoraproject.org (kzak)
Date: Thu, 10 Dec 2009 14:37:50 +0000 (UTC)
Subject: rpms/util-linux-ng/F-12 util-linux-ng.spec,1.67,1.68
Message-ID: <20091210143750.C1EBD11C025D@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17644

Modified Files:
	util-linux-ng.spec 
Log Message:
increment release number, fix changelog



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- util-linux-ng.spec	10 Dec 2009 14:25:08 -0000	1.67
+++ util-linux-ng.spec	10 Dec 2009 14:37:50 -0000	1.68
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -717,10 +717,12 @@ fi
 
 
 %changelog
-* Thu Dec 10 2009 Karel Zak <kzak at redhat.com> 2.16.2-3
-- fix typo in spec file
+* Thu Dec 10 2009 Karel Zak <kzak at redhat.com> 2.16.2-4
 - add Requires: libblkid and libuuid (bz#531992 comment #38)
 
+* Wed Dec  9 2009 Karel Zak <kzak at redhat.com> 2.16.2-3
+- fix typo in spec file
+
 * Mon Dec  7 2009 Karel Zak <kzak at redhat.com> 2.16.2-2
 - fix #536797 - ntfs volume labels are not correct in hal
 



From james at fedoraproject.org  Thu Dec 10 14:49:08 2009
From: james at fedoraproject.org (James Antill)
Date: Thu, 10 Dec 2009 14:49:08 +0000 (UTC)
Subject: rpms/yum/devel yum.spec,1.286,1.287
Message-ID: <20091210144908.8871F11C025D@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21557

Modified Files:
	yum.spec 
Log Message:
* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-5
- Fixes the mash bug, lookup in the tsInfo too. :(



Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- yum.spec	4 Dec 2009 14:26:31 -0000	1.286
+++ yum.spec	10 Dec 2009 14:49:08 -0000	1.287
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.25
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-5
+- Fixes the mash bug, lookup in the tsInfo too. :(
+
 * Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4
 - Fixes for yum clean all, BZ 544173
 - Also allow "yum clean rpmdb" to work, bad tester, bad.



From jreznik at fedoraproject.org  Thu Dec 10 14:52:14 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 10 Dec 2009 14:52:14 +0000 (UTC)
Subject: rpms/arora/F-12 arora-0.10.2-fedorahome.patch, NONE,
	1.1 arora-0.10.2-gitversion.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 arora.spec, 1.22, 1.23 sources, 1.12,
	1.13 arora-0.10.0-fedorahome.patch, 1.1,
	NONE arora-0.10.1-gitversion.patch, 1.1, NONE
Message-ID: <20091210145214.7D25B11C025D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22667

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.2-fedorahome.patch arora-0.10.2-gitversion.patch 
Removed Files:
	arora-0.10.0-fedorahome.patch arora-0.10.1-gitversion.patch 
Log Message:
* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-2
- Conditionaly check for qt4 version

* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
- Update to 0.10.2
- QtWebKit patch removed

* Wed Nov 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-4
- Build over latest qtwebkit trunk from qt 4.6-rc1

* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-3
- respin against newer qt

* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-2
- add dep on qt4 version built against

Synced with devel


arora-0.10.2-fedorahome.patch:
 browsermainwindow.cpp |    2 +-
 settings.cpp          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arora-0.10.2-fedorahome.patch ---
diff -up arora-0.10.2/src/browsermainwindow.cpp.fedorahome arora-0.10.2/src/browsermainwindow.cpp
--- arora-0.10.2/src/browsermainwindow.cpp.fedorahome	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/browsermainwindow.cpp	2009-12-10 12:52:34.359736509 +0100
@@ -1398,7 +1398,7 @@ void BrowserMainWindow::goHome()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString home = settings.value(QLatin1String("home"), QLatin1String("about:home")).toString();
+    QString home = settings.value(QLatin1String("home"), QLatin1String("http://start.fedoraproject.org/")).toString();
     tabWidget()->loadString(home);
 }
 
diff -up arora-0.10.2/src/settings.cpp.fedorahome arora-0.10.2/src/settings.cpp
--- arora-0.10.2/src/settings.cpp.fedorahome	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/settings.cpp	2009-12-10 12:52:34.359736509 +0100
@@ -143,7 +143,7 @@ void SettingsDialog::loadFromSettings()
     settings.endGroup();
 
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString defaultHome = QLatin1String("about:home");
+    QString defaultHome = QLatin1String("http://start.fedoraproject.org/");
     homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
     startupBehavior->setCurrentIndex(settings.value(QLatin1String("startupBehavior"), 0).toInt());
     settings.endGroup();

arora-0.10.2-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.2-gitversion.patch ---
diff -up arora-0.10.2/src/src.pri.gitversion arora-0.10.2/src/src.pri
--- arora-0.10.2/src/src.pri.gitversion	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/src.pri	2009-12-10 13:08:40.120548737 +0100
@@ -15,21 +15,8 @@ UI_DIR      = $$PWD/.ui
 MOC_DIR     = $$PWD/.moc
 OBJECTS_DIR = $$PWD/.obj
 
-
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-} else {
-    exists($$PWD/../.git/HEAD) {
-        GITVERSION=$$system(git log -n1 --pretty=format:%h)
-        DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\"
-        GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l)
-        DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\"
-    } else {
-        DEFINES += GITVERSION=\"\\\"0\\\"\"
-        DEFINES += GITCHANGENUMBER=\"\\\"0\\\"\"
-    }
-}
+DEFINES += GITVERSION=\"\\\"0a6f1f4\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1333\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	6 Oct 2009 10:49:15 -0000	1.12
+++ .cvsignore	10 Dec 2009 14:52:14 -0000	1.13
@@ -1 +1 @@
-arora-0.10.1.tar.gz
+arora-0.10.2.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/arora.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- arora.spec	6 Oct 2009 10:49:16 -0000	1.22
+++ arora.spec	10 Dec 2009 14:52:14 -0000	1.23
@@ -1,22 +1,23 @@
 Name:           arora
-Version:        0.10.1
-Release:        1%{?dist}
+Version:        0.10.2
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/arora/
 Source0:        http://arora.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         arora-0.10.1-gitversion.patch
+Patch0:         arora-0.10.2-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
-Patch2:         arora-0.10.0-fedorahome.patch
+Patch2:         arora-0.10.2-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt4-devel >= 4.4.0
+BuildRequires:  qt4-devel >= 4.5.0
 # for gnome default app path
 BuildRequires:  control-center-devel
 
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
 Arora is a simple, cross platform web browser based on the QtWebKit engine.
@@ -98,6 +99,22 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-2
+- Conditionaly check for qt4 version
+
+* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
+- Update to 0.10.2
+- QtWebKit patch removed
+
+* Wed Nov 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-4
+- Build over latest qtwebkit trunk from qt 4.6-rc1
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-3
+- respin against newer qt
+
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-2
+- add dep on qt4 version built against
+
 * Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
 - Update to 0.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	6 Oct 2009 10:49:16 -0000	1.12
+++ sources	10 Dec 2009 14:52:14 -0000	1.13
@@ -1 +1 @@
-ac38282a2d9134687d9c30dbb73c0fbc  arora-0.10.1.tar.gz
+ccef0f214e0f03828cde8c521f7a5225  arora-0.10.2.tar.gz


--- arora-0.10.0-fedorahome.patch DELETED ---


--- arora-0.10.1-gitversion.patch DELETED ---



From james at fedoraproject.org  Thu Dec 10 14:57:40 2009
From: james at fedoraproject.org (James Antill)
Date: Thu, 10 Dec 2009 14:57:40 +0000 (UTC)
Subject: rpms/yum/devel rpmdb-cache-BIG-post-releasever.path, 1.3,
	1.4 yum.spec, 1.287, 1.288
Message-ID: <20091210145740.0E88F11C025D@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24547

Modified Files:
	rpmdb-cache-BIG-post-releasever.path yum.spec 
Log Message:
* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-6
- Fixes the mash bug, lookup in the tsInfo too. :(



Index: rpmdb-cache-BIG-post-releasever.path
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/rpmdb-cache-BIG-post-releasever.path,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rpmdb-cache-BIG-post-releasever.path	4 Dec 2009 14:26:31 -0000	1.3
+++ rpmdb-cache-BIG-post-releasever.path	10 Dec 2009 14:57:39 -0000	1.4
@@ -997,3 +997,26 @@ index 83d9d00..4fe2fe1 100644
  
      if len(extcmds) == 0:
          base.logger.critical(_('Error: clean requires an option: %s') % (
+commit dbcdcd605d233c555f3ce3861152a2378bf9e622
+Author: James Antill <james at and.org>
+Date:   Thu Dec 10 09:46:00 2009 -0500
+
+    Fix when we have file require(s) from just to be installed pkgs. The mash bug
+
+diff --git a/yum/depsolve.py b/yum/depsolve.py
+index b5953c2..d46452c 100644
+--- a/yum/depsolve.py
++++ b/yum/depsolve.py
+@@ -1009,7 +1009,11 @@ class Depsolve(object):
+                 continue 
+ 
+             for pkgtup in reverselookup[filename]:
+-                po = self.getInstalledPackageObject(pkgtup)
++                po = self.tsInfo.getMembersWithState(pkgtup, TS_INSTALL_STATES)
++                if po:
++                    po = po[0] # Should only have one
++                else:
++                    po = self.getInstalledPackageObject(pkgtup)
+                 ret.append( (po, (filename, 0, '')) )
+ 
+         self.rpmdb.transactionCacheFileRequires(self.installedFileRequires, 


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- yum.spec	10 Dec 2009 14:49:08 -0000	1.287
+++ yum.spec	10 Dec 2009 14:57:39 -0000	1.288
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.25
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -112,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
-* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-5
+* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-6
 - Fixes the mash bug, lookup in the tsInfo too. :(
 
 * Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4



From varekova at fedoraproject.org  Thu Dec 10 14:58:01 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Thu, 10 Dec 2009 14:58:01 +0000 (UTC)
Subject: rpms/sysstat/F-12 sysstat-9.0.4-nfs.patch, NONE, 1.1 sysstat.spec, 
	1.73, 1.74
Message-ID: <20091210145801.63EFC11C025D@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24643

Modified Files:
	sysstat.spec 
Added Files:
	sysstat-9.0.4-nfs.patch 
Log Message:
- fix the problem in get_nfs_mount_nr function
  ( iostat -n causes stack smashing)


sysstat-9.0.4-nfs.patch:
 common.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

--- NEW FILE sysstat-9.0.4-nfs.patch ---
diff -up sysstat-9.0.4/common.c.orig sysstat-9.0.4/common.c
--- sysstat-9.0.4/common.c.orig	2009-12-10 09:48:07.158258512 -0500
+++ sysstat-9.0.4/common.c	2009-12-10 09:49:32.888299550 -0500
@@ -275,7 +275,7 @@ int get_nfs_mount_nr(void)
 {
 	FILE *fp;
 	char line[8192];
-	char type_name[10];
+	char *type_name;
 	unsigned int nfs = 0;
 
 	if ((fp = fopen(NFSMOUNTSTATS, "r")) == NULL)
@@ -285,12 +285,9 @@ int get_nfs_mount_nr(void)
 	while (fgets(line, 8192, fp) != NULL) {
 
 		if ((strstr(line, "mounted")) && (strstr(line, "on")) &&
-		    (strstr(line, "with")) && (strstr(line, "fstype"))) {
-	
-			sscanf(strstr(line, "fstype") + 6, "%10s", type_name);
-			if ((!strncmp(type_name, "nfs", 3)) && (strncmp(type_name, "nfsd", 4))) {
-				nfs ++;
-			}
+		    (strstr(line, "with fstype nfs")) &&
+		    !(strstr(line, "with fstype nfsd"))) {
+			nfs++;
 		}
 	}
 


Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/F-12/sysstat.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sysstat.spec	15 Sep 2009 14:49:20 -0000	1.73
+++ sysstat.spec	10 Dec 2009 14:58:01 -0000	1.74
@@ -1,12 +1,13 @@
 Name: sysstat
 Version: 9.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
 URL: 	http://perso.orange.fr/sebastien.godard/
 Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2
 Patch0: sysstat-9.0.4-init_script.patch
+Patch1: sysstat-9.0.4-nfs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -23,6 +24,7 @@ activity.
 %prep
 %setup -q
 %patch0 -p1 -b .ii
+%patch1 -p1 -b .nfs
 iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
 mv CREDITS.aux CREDITS
 
@@ -74,6 +76,10 @@ rm -rf %{buildroot}
 %{_localstatedir}/log/sa
 
 %changelog
+* Thu Dec 10 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 9.0.4-5
+- fix the problem in get_nfs_mount_nr function
+  ( iostat -n causes stack smashing)
+
 * Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> - 9.0.4-4
 - fix init script
 



From hadess at fedoraproject.org  Thu Dec 10 15:01:07 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 10 Dec 2009 15:01:07 +0000 (UTC)
Subject: rpms/libgpod/F-12 libgpod-handle-partial-utf16.patch, NONE,
	1.1 libgpod.spec, 1.29, 1.30
Message-ID: <20091210150107.797B611C025D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25930

Modified Files:
	libgpod.spec 
Added Files:
	libgpod-handle-partial-utf16.patch 
Log Message:
* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-6
- Handle partial UTF-16 strings (#542176)


libgpod-handle-partial-utf16.patch:
 itdb_itunesdb.c |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

--- NEW FILE libgpod-handle-partial-utf16.patch ---
--- libgpod-0.7.2/src/itdb_itunesdb.c	2009-12-10 14:39:04.000000000 +0000
+++ libgpod-0.7.2.new/src/itdb_itunesdb.c	2009-12-10 14:56:22.000000000 +0000
@@ -811,6 +811,22 @@ static inline guint64 get64bint (FConten
 }
 
 
+/* Try to convert from UTF-16 to UTF-8 and handle partial characters
+ * at the end of the string */
+static char *utf16_to_utf8_with_partial (gunichar2 *entry_utf16)
+{
+	GError *error = NULL;
+	char *entry_utf8;
+	glong items_read;
+
+	entry_utf8 = g_utf16_to_utf8 (entry_utf16, -1, &items_read, NULL, &error);
+	if (entry_utf8 == NULL && g_error_matches (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT)) {
+		g_error_free (error);
+		entry_utf8 = g_utf16_to_utf8 (entry_utf16, items_read, NULL, NULL, NULL);
+	}
+
+	return entry_utf8;
+}
 
 
 /* Fix little endian UTF16 String to correct byteorder if necessary
@@ -1302,7 +1318,7 @@ static char *extract_mhod_string (FConte
 	entry_utf16 = g_new0 (gunichar2, (len+2)/2);
 	if (seek_get_n_bytes (cts, (gchar *)entry_utf16, seek+16, len)) {
 	    fixup_little_utf16 (entry_utf16);
-	    entry_utf8= g_utf16_to_utf8 (entry_utf16, -1, NULL, NULL, NULL);
+	    entry_utf8 = utf16_to_utf8_with_partial (entry_utf16);
 	    g_free (entry_utf16);
 	} else { 
 	    g_free (entry_utf16);
@@ -1317,6 +1333,9 @@ static char *extract_mhod_string (FConte
 	}
     }
 
+    if (entry_utf8 == NULL)
+        return NULL;
+
     if (g_utf8_validate (entry_utf8, -1, NULL)) {
 	return entry_utf8;
     } else {


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-12/libgpod.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libgpod.spec	19 Oct 2009 16:04:27 -0000	1.29
+++ libgpod.spec	10 Dec 2009 15:01:07 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -13,6 +13,8 @@ Patch0: 0001-Use-var-run-hald-as-mount-d
 # http://gitorious.org/~teuf/libgpod/teuf-sandbox/commit/3847494a513b5ef04d7abbe55c3d95dbcd836ef6
 # https://bugzilla.redhat.com/show_bug.cgi?id=517642
 Patch1: libgpod-utf16-parsing.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=542176
+Patch2: libgpod-handle-partial-utf16.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -82,6 +84,7 @@ libgpod library.
 %setup -q
 %patch0 -p1 -b .selinux
 %patch1 -p1 -b .utf16
+%patch2 -p1 -b .partial-utf16
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
@@ -141,6 +144,9 @@ libgpod library.
 
 
 %changelog
+* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-6
+- Handle partial UTF-16 strings (#542176)
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-5
 - Fix UTF-16 string parsing patch again
 



From kklic at fedoraproject.org  Thu Dec 10 15:01:34 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Thu, 10 Dec 2009 15:01:34 +0000 (UTC)
Subject: File yp-tools-2.10.tar.bz2 uploaded to lookaside cache by kklic
Message-ID: <20091210150134.2749D10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for yp-tools:

c1bc7ea2339c766d8e6dffd3f5f2e8e1  yp-tools-2.10.tar.bz2



From maxamillion at fedoraproject.org  Thu Dec 10 15:01:50 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 10 Dec 2009 15:01:50 +0000 (UTC)
Subject: rpms/midori/F-11 .cvsignore, 1.15, 1.16 midori.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <20091210150150.95E8511C025D@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26277

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to latest midori




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/midori/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	20 Oct 2009 17:27:19 -0000	1.15
+++ .cvsignore	10 Dec 2009 15:01:50 -0000	1.16
@@ -1 +1 @@
-midori-0.2.0.tar.bz2
+midori-0.2.1.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/F-11/midori.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- midori.spec	20 Oct 2009 17:27:19 -0000	1.28
+++ midori.spec	10 Dec 2009 15:01:50 -0000	1.29
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.2.0
+Version:	0.2.1
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -103,6 +103,16 @@ fi
 
 
 %changelog
+* Wed Dec 02 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.1-1
+- Update to new upstream release (0.2.1): Fix Mouse Gestures to work after 
+  activation, Explicitly link to X11 to support gold, Implement various Hildon 
+  specific features, Hide the navigationbar in fullscreen, Implement permanent 
+  storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
+  Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
+  Introduce the Tab History List extension, Load icons laziy at startup to speed 
+  up startup, Introduce a Web Cache extension, Refactor and tweak the 
+  Preferences dialogue, Implement combos to choose external applications
+
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1
 - Update to new upstream release (0.2.0): Drag-scroll on touchscreen devices,
   Speed Dial fixes, faster AdBlock (for all WebKitGTK+ versions), updated DNS
@@ -122,6 +132,9 @@ fi
 - Revert to using the system waf, now that it no longer causes Python errors
   when compiling.
 
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 03 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.7-1
 - Update to new upstream release (0.1.7): Implements saving activation state
   of extensions, ignore mouse buttons used for horizontal scrolling, panel
@@ -130,9 +143,6 @@ fi
   introduces basic @-moz-document user style support, and additional tabs/font
   preferences.
   
-* Thu Apr 30 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.6-2.1
-- This time REALLY build against the new libunique support. 
-
 * Mon Apr 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.6-2
 - Re-enable libunique support, thanks to it being updated accordingly.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/midori/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	20 Oct 2009 17:27:19 -0000	1.15
+++ sources	10 Dec 2009 15:01:50 -0000	1.16
@@ -1 +1 @@
-805e2e59a93a0a4b7652d6547b2bd923  midori-0.2.0.tar.bz2
+3cee94c9a22316504a3ba99bc92e0245  midori-0.2.1.tar.bz2



From vcrhonek at fedoraproject.org  Thu Dec 10 15:11:05 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 10 Dec 2009 15:11:05 +0000 (UTC)
Subject: rpms/texinfo/F-12 texinfo-4.13a-mosdo-crash.patch, NONE,
	1.1 texinfo.spec, 1.64, 1.65
Message-ID: <20091210151105.29ACA11C025D@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29496

Modified Files:
	texinfo.spec 
Added Files:
	texinfo-4.13a-mosdo-crash.patch 
Log Message:
Fix memory allocation bug when using old-style --section Foo arguments

texinfo-4.13a-mosdo-crash.patch:
 install-info.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE texinfo-4.13a-mosdo-crash.patch ---
--- texinfo-4.13/install-info/install-info.c.mosdo-crash	2009-09-02 20:18:44.000000000 -0400
+++ texinfo-4.13/install-info/install-info.c	2009-09-02 20:19:53.000000000 -0400
@@ -1765,7 +1765,7 @@
             err = argz_add (&argz, &argz_len, opt);
           free (opt); opt = NULL;
 
-          opt = xmalloc (strlen (regex) + sizeof ("--section="));
+          opt = xmalloc (strlen (title) + sizeof ("--section="));
           if (sprintf (opt, "--section=%s", title) == -1)
             err = 1;
           if (!err)


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-12/texinfo.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- texinfo.spec	2 Sep 2009 13:31:02 -0000	1.64
+++ texinfo.spec	10 Dec 2009 15:11:04 -0000	1.65
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -12,6 +12,8 @@ Source1: info-dir
 Source2: texi2pdf.man
 Patch0: texinfo-4.12-zlib.patch
 Patch1: texinfo-4.13a-data_types.patch
+# Patch2: is already upstream
+Patch2: texinfo-4.13a-mosdo-crash.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +57,7 @@ for printing using TeX.
 %setup -q -n %{name}-4.13
 %patch0 -p1 -b .zlib
 %patch1 -p1 -b .data_types
+%patch2 -p1 -b .mosdo-crash
 
 %build
 %configure
@@ -154,6 +157,9 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Thu Dec 10 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-8
+- Fix memory allocation bug when using old-style --section "Foo" arguments
+
 * Wed Sep  2 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-7
 - Fix errors installing texinfo/info with --excludedocs
   Resolves: #515909



From kklic at fedoraproject.org  Thu Dec 10 15:13:14 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Thu, 10 Dec 2009 15:13:14 +0000 (UTC)
Subject: rpms/yp-tools/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 yp-tools.spec, 1.28, 1.29
Message-ID: <20091210151314.7BBD111C025D@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/pkgs/rpms/yp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30365

Modified Files:
	.cvsignore sources yp-tools.spec 
Log Message:
Update to newer version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yp-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Feb 2006 16:42:56 -0000	1.7
+++ .cvsignore	10 Dec 2009 15:13:14 -0000	1.8
@@ -1 +1 @@
-yp-tools-2.9.tar.bz2
+yp-tools-2.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yp-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Feb 2006 16:42:56 -0000	1.7
+++ sources	10 Dec 2009 15:13:14 -0000	1.8
@@ -1 +1 @@
-19de06a04129ec26773f9198e086fcd4  yp-tools-2.9.tar.bz2
+c1bc7ea2339c766d8e6dffd3f5f2e8e1  yp-tools-2.10.tar.bz2


Index: yp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yp-tools/devel/yp-tools.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- yp-tools.spec	10 Aug 2009 10:16:49 -0000	1.28
+++ yp-tools.spec	10 Dec 2009 15:13:14 -0000	1.29
@@ -1,14 +1,13 @@
-Summary: NIS (or YP) client programs.
+Summary: NIS (or YP) client programs
 Name: yp-tools
-Version: 2.9
-Release: 8%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
 Url: http://www.linux-nis.org/nis/yp-tools/index.html
 Patch1: yp-tools-2.7-md5.patch
 Patch2: yp-tools-2.9-sha-2.patch
-Obsoletes: yppasswd, yp-clients
 Requires: ypbind
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,7 +50,7 @@ make DESTDIR="$RPM_BUILD_ROOT" INSTALL_P
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog NEWS etc/nsswitch.conf
 %doc THANKS TODO
 /usr/bin/*
@@ -61,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/yp
 
 %changelog
+* Thu Dec 10 2009 Karel Klic <kklic at redhat.com> - 2.10-1
+- Updated to new version
+- Removed unnecessary obsoletes
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.9-8
 - Convert specfile to UTF-8.
 



From rdieter at fedoraproject.org  Thu Dec 10 15:29:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Dec 2009 15:29:51 +0000 (UTC)
Subject: File k3b-1.69.0alpha4.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091210152951.5EC4610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for k3b:

8e7c15565c806cb028e11764f8781b97  k3b-1.69.0alpha4.tar.bz2



From rdieter at fedoraproject.org  Thu Dec 10 15:30:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Dec 2009 15:30:29 +0000 (UTC)
Subject: rpms/k3b/devel .cvsignore, 1.23, 1.24 k3b.spec, 1.81, 1.82 sources, 
	1.24, 1.25
Message-ID: <20091210153029.24C1F11C03C6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3349

Modified Files:
	.cvsignore k3b.spec sources 
Log Message:
* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.69.0-1
- k3b-1.69.0 (alpha4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	15 Oct 2009 14:18:42 -0000	1.23
+++ .cvsignore	10 Dec 2009 15:30:28 -0000	1.24
@@ -1 +1 @@
-k3b-1.68.0alpha3.tar.bz2
+k3b-1.69.0alpha4.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- k3b.spec	23 Nov 2009 17:08:01 -0000	1.81
+++ k3b.spec	10 Dec 2009 15:30:28 -0000	1.82
@@ -5,13 +5,13 @@
 #define common 1
 %endif
 
-%define pre alpha3
+%define pre alpha4
 
 Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   1
-Version: 1.68.0
-Release: 3%{?dist}
+Version: 1.69.0
+Release: 1%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -168,6 +168,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.69.0-1
+- k3b-1.69.0 (alpha4)
+
 * Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-3 
 - rebuild (for qt-4.6.0-rc1, f13+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	15 Oct 2009 14:18:43 -0000	1.24
+++ sources	10 Dec 2009 15:30:28 -0000	1.25
@@ -1 +1 @@
-bfad8703714c6d71fae992ca7ba7fc38  k3b-1.68.0alpha3.tar.bz2
+8e7c15565c806cb028e11764f8781b97  k3b-1.69.0alpha4.tar.bz2



From hadess at fedoraproject.org  Thu Dec 10 15:30:48 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 10 Dec 2009 15:30:48 +0000 (UTC)
Subject: rpms/libgpod/devel libgpod-handle-partial-utf16.patch, NONE,
	1.1 libgpod.spec, 1.28, 1.29
Message-ID: <20091210153048.D564911C03C6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3530

Modified Files:
	libgpod.spec 
Added Files:
	libgpod-handle-partial-utf16.patch 
Log Message:
* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-6
- Handle partial UTF-16 strings (#542176)


libgpod-handle-partial-utf16.patch:
 itdb_itunesdb.c |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

--- NEW FILE libgpod-handle-partial-utf16.patch ---
--- libgpod-0.7.2/src/itdb_itunesdb.c	2009-12-10 14:39:04.000000000 +0000
+++ libgpod-0.7.2.new/src/itdb_itunesdb.c	2009-12-10 14:56:22.000000000 +0000
@@ -811,6 +811,22 @@ static inline guint64 get64bint (FConten
 }
 
 
+/* Try to convert from UTF-16 to UTF-8 and handle partial characters
+ * at the end of the string */
+static char *utf16_to_utf8_with_partial (gunichar2 *entry_utf16)
+{
+	GError *error = NULL;
+	char *entry_utf8;
+	glong items_read;
+
+	entry_utf8 = g_utf16_to_utf8 (entry_utf16, -1, &items_read, NULL, &error);
+	if (entry_utf8 == NULL && g_error_matches (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT)) {
+		g_error_free (error);
+		entry_utf8 = g_utf16_to_utf8 (entry_utf16, items_read, NULL, NULL, NULL);
+	}
+
+	return entry_utf8;
+}
 
 
 /* Fix little endian UTF16 String to correct byteorder if necessary
@@ -1302,7 +1318,7 @@ static char *extract_mhod_string (FConte
 	entry_utf16 = g_new0 (gunichar2, (len+2)/2);
 	if (seek_get_n_bytes (cts, (gchar *)entry_utf16, seek+16, len)) {
 	    fixup_little_utf16 (entry_utf16);
-	    entry_utf8= g_utf16_to_utf8 (entry_utf16, -1, NULL, NULL, NULL);
+	    entry_utf8 = utf16_to_utf8_with_partial (entry_utf16);
 	    g_free (entry_utf16);
 	} else { 
 	    g_free (entry_utf16);
@@ -1317,6 +1333,9 @@ static char *extract_mhod_string (FConte
 	}
     }
 
+    if (entry_utf8 == NULL)
+        return NULL;
+
     if (g_utf8_validate (entry_utf8, -1, NULL)) {
 	return entry_utf8;
     } else {


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/devel/libgpod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libgpod.spec	19 Oct 2009 16:17:36 -0000	1.28
+++ libgpod.spec	10 Dec 2009 15:30:48 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -13,6 +13,8 @@ Patch0: 0001-Use-var-run-hald-as-mount-d
 # http://gitorious.org/~teuf/libgpod/teuf-sandbox/commit/3847494a513b5ef04d7abbe55c3d95dbcd836ef6
 # https://bugzilla.redhat.com/show_bug.cgi?id=517642
 Patch1: libgpod-utf16-parsing.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=542176
+Patch2: libgpod-handle-partial-utf16.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -82,6 +84,7 @@ libgpod library.
 %setup -q
 %patch0 -p1 -b .selinux
 %patch1 -p1 -b .utf16
+%patch2 -p1 -b .partial-utf16
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
@@ -141,6 +144,9 @@ libgpod library.
 
 
 %changelog
+* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-6
+- Handle partial UTF-16 strings (#542176)
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-5
 - Fix UTF-16 string parsing patch again
 



From hadess at fedoraproject.org  Thu Dec 10 15:45:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 10 Dec 2009 15:45:24 +0000 (UTC)
Subject: rpms/rhythmbox/F-12 rb-webkit-crasher.patch, NONE,
	1.1 rhythmbox.spec, 1.274, 1.275
Message-ID: <20091210154524.5731E11C025D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8307

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-webkit-crasher.patch 
Log Message:
* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-2
- Fix crasher in WebKit when using the context pane (#540672)


rb-webkit-crasher.patch:
 ContextView.py |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE rb-webkit-crasher.patch ---
commit e93fd2d7afe1411a5a60052a4adecd6a56db5b7b
Author: Jonathan Matthew <jonathan at d14n.org>
Date:   Fri Nov 27 07:14:51 2009 +1000

    context: use an idle handler for track changes (bug #602140)
    
    The playing-song-changed signal is sometimes emitted on a streaming
    thread.  Calling into webkit on non-main threads causes it to crash
    pretty reliably, so we need to use an idle handler to process it on the
    main thread.

diff --git a/plugins/context/context/ContextView.py b/plugins/context/context/ContextView.py
index 7e2c0d6..e204fc4 100644
--- a/plugins/context/context/ContextView.py
+++ b/plugins/context/context/ContextView.py
@@ -174,6 +174,14 @@ class ContextView (gobject.GObject):
                 self.top_five_list[(i,)] = ("%d. " % (i+1), track)
 
     def playing_changed_cb (self, playing, user_data):
+        # this sometimes happens on a streaming thread, so we need to
+        # move it to the main thread
+        gobject.idle_add (self.playing_changed_idle_cb)
+
+    def playing_changed_idle_cb (self):
+        if self.sp is None:
+            return
+
         playing_entry = self.sp.get_playing_entry ()
         if playing_entry is None:
             return


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-12/rhythmbox.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- rhythmbox.spec	22 Nov 2009 15:57:41 -0000	1.274
+++ rhythmbox.spec	10 Dec 2009 15:45:23 -0000	1.275
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -52,6 +52,9 @@ ExcludeArch:    s390 s390x
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=596615
 Patch0: rb-no-HEAD-for-podcasts.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=540672
+# https://bugzilla.gnome.org/show_bug.cgi?id=602140
+Patch1: rb-webkit-crasher.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -86,6 +89,7 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 
 %patch0 -p1 -b .http-head
+%patch1 -p1 -b .webkit
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -217,6 +221,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-2
+- Fix crasher in WebKit when using the context pane (#540672)
+
 * Sun Nov 22 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-1
 - Update to 0.12.6
 



From hadess at fedoraproject.org  Thu Dec 10 15:47:13 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 10 Dec 2009 15:47:13 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-webkit-crasher.patch, NONE,
	1.1 rhythmbox.spec, 
	1.278, 1.279 0001-Fix-audio-tags-in-Brasero-project-files.patch,
	1.1, NONE 0001-Use-C-only-for-the-browser-plugin.patch, 1.1,
	NONE 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch, 
	1.1, NONE rb-fix-daap-plugin.patch, 1.1,
	NONE rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch, 1.1, NONE
Message-ID: <20091210154713.1C7E811C025D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9026

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-webkit-crasher.patch 
Removed Files:
	0001-Fix-audio-tags-in-Brasero-project-files.patch 
	0001-Use-C-only-for-the-browser-plugin.patch 
	0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch 
	rb-fix-daap-plugin.patch 
	rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch 
Log Message:
* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-3
- Fix crasher in WebKit when using the context pane (#540672)


rb-webkit-crasher.patch:
 ContextView.py |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE rb-webkit-crasher.patch ---
commit e93fd2d7afe1411a5a60052a4adecd6a56db5b7b
Author: Jonathan Matthew <jonathan at d14n.org>
Date:   Fri Nov 27 07:14:51 2009 +1000

    context: use an idle handler for track changes (bug #602140)
    
    The playing-song-changed signal is sometimes emitted on a streaming
    thread.  Calling into webkit on non-main threads causes it to crash
    pretty reliably, so we need to use an idle handler to process it on the
    main thread.

diff --git a/plugins/context/context/ContextView.py b/plugins/context/context/ContextView.py
index 7e2c0d6..e204fc4 100644
--- a/plugins/context/context/ContextView.py
+++ b/plugins/context/context/ContextView.py
@@ -174,6 +174,14 @@ class ContextView (gobject.GObject):
                 self.top_five_list[(i,)] = ("%d. " % (i+1), track)
 
     def playing_changed_cb (self, playing, user_data):
+        # this sometimes happens on a streaming thread, so we need to
+        # move it to the main thread
+        gobject.idle_add (self.playing_changed_idle_cb)
+
+    def playing_changed_idle_cb (self):
+        if self.sp is None:
+            return
+
         playing_entry = self.sp.get_playing_entry ()
         if playing_entry is None:
             return


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- rhythmbox.spec	7 Dec 2009 14:05:39 -0000	1.278
+++ rhythmbox.spec	10 Dec 2009 15:47:12 -0000	1.279
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -39,6 +39,7 @@ BuildRequires: gnome-doc-utils
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
 BuildRequires: libsoup-devel >= 2.3.0
+BuildRequires: hal-devel
 BuildRequires: lirc-devel
 BuildRequires: libmtp-devel
 BuildRequires: gstreamer-python-devel
@@ -51,6 +52,9 @@ ExcludeArch:    s390 s390x
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=596615
 Patch0: rb-no-HEAD-for-podcasts.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=540672
+# https://bugzilla.gnome.org/show_bug.cgi?id=602140
+Patch1: rb-webkit-crasher.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -85,6 +89,7 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 
 %patch0 -p1 -b .http-head
+%patch1 -p1 -b .webkit
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -216,6 +221,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-3
+- Fix crasher in WebKit when using the context pane (#540672)
+
 * Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-2
 - Remove libhal requirement
 


--- 0001-Fix-audio-tags-in-Brasero-project-files.patch DELETED ---


--- 0001-Use-C-only-for-the-browser-plugin.patch DELETED ---


--- 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch DELETED ---


--- rb-fix-daap-plugin.patch DELETED ---


--- rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Dec 10 15:50:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 15:50:25 +0000
Subject: [pkgdb] istanbul: pfrields has given up watchcommits
Message-ID: <20091210155025.CA98010F8AB@bastion2.fedora.phx.redhat.com>

pfrields has given up the watchcommits acl on istanbul (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Thu Dec 10 15:50:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 15:50:33 +0000
Subject: [pkgdb] istanbul: pfrields has given up watchbugzilla
Message-ID: <20091210155033.B57FC10F89C@bastion2.fedora.phx.redhat.com>

pfrields has given up the watchbugzilla acl on istanbul (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Thu Dec 10 15:50:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 15:50:40 +0000
Subject: [pkgdb] istanbul: pfrields has requested approveacls
Message-ID: <20091210155040.9E10510F8A2@bastion2.fedora.phx.redhat.com>

pfrields has requested the approveacls acl on istanbul (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Thu Dec 10 15:50:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 15:50:36 +0000
Subject: [pkgdb] istanbul: pfrields has requested commit
Message-ID: <20091210155036.3FA0D10F8AC@bastion2.fedora.phx.redhat.com>

pfrields has requested the commit acl on istanbul (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From mtasaka at fedoraproject.org  Thu Dec 10 15:50:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 15:50:44 +0000 (UTC)
Subject: rpms/xscreensaver/F-11
	xscreensaver-5.10-apple2-initialization.patch, 
	NONE, 1.1 xscreensaver-5.10-substrate-bz545847.patch, NONE,
	1.1 xscreensaver.spec, 1.94, 1.95
Message-ID: <20091210155044.7666511C03E3@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10081/F-11

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver-5.10-substrate-bz545847.patch 
Log Message:
* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
- Fix occasional crash on substrate (bug 545847)
- Fix initialization process on apple2, hopefully fix bug 540790


xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-5.10-apple2-initialization.patch ---
--- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
@@ -1020,21 +1020,23 @@
   int i,height;
   static const double levelfac[3]={-7.5, 5.5, 24.5};
 
-  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
 
     for (i=0; i<height; i++) {
       it->leveltable[height][i].index = 2;
     }
-    
-    if (avgheight>=3) {
-      it->leveltable[height][0].index=0;
-    }
-    if (avgheight>=5) {
-      it->leveltable[height][height-1].index=0;
-    }
-    if (avgheight>=7) {
-      it->leveltable[height][1].index=1;
-      it->leveltable[height][height-2].index=1;
+
+    if (height < avgheight + 2.0){
+      if (avgheight>=3) {
+        it->leveltable[height][0].index=0;
+      }
+      if (avgheight>=5) {
+        if (height >= 1) it->leveltable[height][height-1].index=0;
+      }
+      if (avgheight>=7) {
+        it->leveltable[height][1].index=1;
+        if (height >= 2) it->leveltable[height][height-2].index=1;
+      }
     }
 
     for (i=0; i<height; i++) {

xscreensaver-5.10-substrate-bz545847.patch:
 substrate.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.10-substrate-bz545847.patch ---
--- xscreensaver-5.10/hacks/substrate.c.debug	2008-07-31 19:19:57.000000000 +0900
+++ xscreensaver-5.10/hacks/substrate.c	2009-12-10 03:01:06.000000000 +0900
@@ -198,6 +198,13 @@
         /* We timed out.  Use our default values */
         px = cr->x;
         py = cr->y;
+
+        /* Sanity check needed */
+        if (px < 0) px = 0;
+        if (px >= f->width) px = f->width - 1;
+        if (py < 0) py = 0;
+        if (py >= f->height) py = f->height - 1;
+
         ref_cgrid(f, px, py) = cr->t;
     }
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/xscreensaver.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- xscreensaver.spec	8 Sep 2009 06:11:14 -0000	1.94
+++ xscreensaver.spec	10 Dec 2009 15:50:44 -0000	1.95
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -14,6 +14,7 @@
 %else
 %define default_text  %{_datadir}/doc/HTML/README-Accessibility
 %endif
+%define default_URL   http://planet.fedoraproject.org/rss20.xml
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -48,6 +49,8 @@ Patch21:         xscreensaver-5.07-webco
 #
 #
 # Not sent to upstream yet, must do later
+Patch30:         xscreensaver-5.10-substrate-bz545847.patch
+Patch31:         xscreensaver-5.10-apple2-initialization.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -202,6 +205,8 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch30 -p1 -b .subst
+%patch31 -p1 -b .apple
 
 change_option(){
    set +x
@@ -258,7 +263,10 @@ change_option driver/XScreenSaver.ad.in 
    lock=True \
    splash=False \
    ignoreUninstalledPrograms=True \
-   textProgram=fortune\ -s
+   textProgram=fortune\ -s \
+%if %{?fedora} >= 12
+   textURL=%{default_URL}
+%endif
 
 # Disable the following hacks by default
 # (disable, not remove)
@@ -533,12 +541,14 @@ cd ..
 %endif
 
 # Install desktop application autostart stuff
+# Add OnlyShowIn=GNOME (bug 517391)
 %if 0%{?fedora} >= 12
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
 install -cpm 0755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_libexecdir}/
 desktop-file-install \
    --vendor "" \
    --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+   --add-only-show-in=GNOME \
    %{SOURCE12}
 chmod 0644 ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop
 
@@ -666,6 +676,15 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+- Fix occasional crash on substrate (bug 545847)
+- Fix initialization process on apple2, hopefully fix bug 540790
+
+* Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
+- F-12+: Restrict Autostart effect to GNOME session only (bug 517391)
+- F-12+: Use planet.fedoraproject.org for textURL (still the default textMode
+  is "file", i.e. no net connection)
+
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
 - Update to 5.10
 - All non Fedora-specific patches applied upstream



From mtasaka at fedoraproject.org  Thu Dec 10 15:50:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 15:50:44 +0000 (UTC)
Subject: rpms/xscreensaver/F-10
	xscreensaver-5.10-apple2-initialization.patch, 
	NONE, 1.1 xscreensaver-5.10-substrate-bz545847.patch, NONE,
	1.1 xscreensaver.spec, 1.83, 1.84
Message-ID: <20091210155044.4A30111C03E3@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10081/F-10

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver-5.10-substrate-bz545847.patch 
Log Message:
* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
- Fix occasional crash on substrate (bug 545847)
- Fix initialization process on apple2, hopefully fix bug 540790


xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-5.10-apple2-initialization.patch ---
--- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
@@ -1020,21 +1020,23 @@
   int i,height;
   static const double levelfac[3]={-7.5, 5.5, 24.5};
 
-  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
 
     for (i=0; i<height; i++) {
       it->leveltable[height][i].index = 2;
     }
-    
-    if (avgheight>=3) {
-      it->leveltable[height][0].index=0;
-    }
-    if (avgheight>=5) {
-      it->leveltable[height][height-1].index=0;
-    }
-    if (avgheight>=7) {
-      it->leveltable[height][1].index=1;
-      it->leveltable[height][height-2].index=1;
+
+    if (height < avgheight + 2.0){
+      if (avgheight>=3) {
+        it->leveltable[height][0].index=0;
+      }
+      if (avgheight>=5) {
+        if (height >= 1) it->leveltable[height][height-1].index=0;
+      }
+      if (avgheight>=7) {
+        it->leveltable[height][1].index=1;
+        if (height >= 2) it->leveltable[height][height-2].index=1;
+      }
     }
 
     for (i=0; i<height; i++) {

xscreensaver-5.10-substrate-bz545847.patch:
 substrate.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.10-substrate-bz545847.patch ---
--- xscreensaver-5.10/hacks/substrate.c.debug	2008-07-31 19:19:57.000000000 +0900
+++ xscreensaver-5.10/hacks/substrate.c	2009-12-10 03:01:06.000000000 +0900
@@ -198,6 +198,13 @@
         /* We timed out.  Use our default values */
         px = cr->x;
         py = cr->y;
+
+        /* Sanity check needed */
+        if (px < 0) px = 0;
+        if (px >= f->width) px = f->width - 1;
+        if (py < 0) py = 0;
+        if (py >= f->height) py = f->height - 1;
+
         ref_cgrid(f, px, py) = cr->t;
     }
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- xscreensaver.spec	8 Sep 2009 06:11:13 -0000	1.83
+++ xscreensaver.spec	10 Dec 2009 15:50:43 -0000	1.84
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -14,6 +14,7 @@
 %else
 %define default_text  %{_datadir}/doc/HTML/README-Accessibility
 %endif
+%define default_URL   http://planet.fedoraproject.org/rss20.xml
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -48,6 +49,8 @@ Patch21:         xscreensaver-5.07-webco
 #
 #
 # Not sent to upstream yet, must do later
+Patch30:         xscreensaver-5.10-substrate-bz545847.patch
+Patch31:         xscreensaver-5.10-apple2-initialization.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -202,6 +205,8 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch30 -p1 -b .subst
+%patch31 -p1 -b .apple
 
 change_option(){
    set +x
@@ -258,7 +263,10 @@ change_option driver/XScreenSaver.ad.in 
    lock=True \
    splash=False \
    ignoreUninstalledPrograms=True \
-   textProgram=fortune\ -s
+   textProgram=fortune\ -s \
+%if %{?fedora} >= 12
+   textURL=%{default_URL}
+%endif
 
 # Disable the following hacks by default
 # (disable, not remove)
@@ -533,12 +541,14 @@ cd ..
 %endif
 
 # Install desktop application autostart stuff
+# Add OnlyShowIn=GNOME (bug 517391)
 %if 0%{?fedora} >= 12
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
 install -cpm 0755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_libexecdir}/
 desktop-file-install \
    --vendor "" \
    --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+   --add-only-show-in=GNOME \
    %{SOURCE12}
 chmod 0644 ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop
 
@@ -666,6 +676,15 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+- Fix occasional crash on substrate (bug 545847)
+- Fix initialization process on apple2, hopefully fix bug 540790
+
+* Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
+- F-12+: Restrict Autostart effect to GNOME session only (bug 517391)
+- F-12+: Use planet.fedoraproject.org for textURL (still the default textMode
+  is "file", i.e. no net connection)
+
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1
 - Update to 5.10
 - All non Fedora-specific patches applied upstream



From mtasaka at fedoraproject.org  Thu Dec 10 15:50:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 15:50:44 +0000 (UTC)
Subject: rpms/xscreensaver/F-12
	xscreensaver-5.10-apple2-initialization.patch, 
	NONE, 1.1 xscreensaver-5.10-substrate-bz545847.patch, NONE,
	1.1 xscreensaver.spec, 1.99, 1.100
Message-ID: <20091210155044.C7B8B11C03E3@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10081/F-12

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver-5.10-substrate-bz545847.patch 
Log Message:
* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
- Fix occasional crash on substrate (bug 545847)
- Fix initialization process on apple2, hopefully fix bug 540790


xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-5.10-apple2-initialization.patch ---
--- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
@@ -1020,21 +1020,23 @@
   int i,height;
   static const double levelfac[3]={-7.5, 5.5, 24.5};
 
-  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
 
     for (i=0; i<height; i++) {
       it->leveltable[height][i].index = 2;
     }
-    
-    if (avgheight>=3) {
-      it->leveltable[height][0].index=0;
-    }
-    if (avgheight>=5) {
-      it->leveltable[height][height-1].index=0;
-    }
-    if (avgheight>=7) {
-      it->leveltable[height][1].index=1;
-      it->leveltable[height][height-2].index=1;
+
+    if (height < avgheight + 2.0){
+      if (avgheight>=3) {
+        it->leveltable[height][0].index=0;
+      }
+      if (avgheight>=5) {
+        if (height >= 1) it->leveltable[height][height-1].index=0;
+      }
+      if (avgheight>=7) {
+        it->leveltable[height][1].index=1;
+        if (height >= 2) it->leveltable[height][height-2].index=1;
+      }
     }
 
     for (i=0; i<height; i++) {

xscreensaver-5.10-substrate-bz545847.patch:
 substrate.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.10-substrate-bz545847.patch ---
--- xscreensaver-5.10/hacks/substrate.c.debug	2008-07-31 19:19:57.000000000 +0900
+++ xscreensaver-5.10/hacks/substrate.c	2009-12-10 03:01:06.000000000 +0900
@@ -198,6 +198,13 @@
         /* We timed out.  Use our default values */
         px = cr->x;
         py = cr->y;
+
+        /* Sanity check needed */
+        if (px < 0) px = 0;
+        if (px >= f->width) px = f->width - 1;
+        if (py < 0) py = 0;
+        if (py >= f->height) py = f->height - 1;
+
         ref_cgrid(f, px, py) = cr->t;
     }
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-12/xscreensaver.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- xscreensaver.spec	7 Oct 2009 20:33:55 -0000	1.99
+++ xscreensaver.spec	10 Dec 2009 15:50:44 -0000	1.100
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -49,6 +49,8 @@ Patch21:         xscreensaver-5.07-webco
 #
 #
 # Not sent to upstream yet, must do later
+Patch30:         xscreensaver-5.10-substrate-bz545847.patch
+Patch31:         xscreensaver-5.10-apple2-initialization.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -203,6 +205,8 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch30 -p1 -b .subst
+%patch31 -p1 -b .apple
 
 change_option(){
    set +x
@@ -260,7 +264,9 @@ change_option driver/XScreenSaver.ad.in 
    splash=False \
    ignoreUninstalledPrograms=True \
    textProgram=fortune\ -s \
+%if %{?fedora} >= 12
    textURL=%{default_URL}
+%endif
 
 # Disable the following hacks by default
 # (disable, not remove)
@@ -670,9 +676,13 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+- Fix occasional crash on substrate (bug 545847)
+- Fix initialization process on apple2, hopefully fix bug 540790
+
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
-- Restrict Autostart effect to GNOME session only (bug 517391)
-- Use planet.fedoraproject.org for textURL (still the default textMode
+- F-12+: Restrict Autostart effect to GNOME session only (bug 517391)
+- F-12+: Use planet.fedoraproject.org for textURL (still the default textMode
   is "file", i.e. no net connection)
 
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1



From mtasaka at fedoraproject.org  Thu Dec 10 15:50:45 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 15:50:45 +0000 (UTC)
Subject: rpms/xscreensaver/devel
	xscreensaver-5.10-apple2-initialization.patch, 
	NONE, 1.1 xscreensaver-5.10-substrate-bz545847.patch, NONE,
	1.1 xscreensaver.spec, 1.99, 1.100
Message-ID: <20091210155045.3112511C03E3@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10081/devel

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver-5.10-substrate-bz545847.patch 
Log Message:
* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
- Fix occasional crash on substrate (bug 545847)
- Fix initialization process on apple2, hopefully fix bug 540790


xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-5.10-apple2-initialization.patch ---
--- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
@@ -1020,21 +1020,23 @@
   int i,height;
   static const double levelfac[3]={-7.5, 5.5, 24.5};
 
-  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
 
     for (i=0; i<height; i++) {
       it->leveltable[height][i].index = 2;
     }
-    
-    if (avgheight>=3) {
-      it->leveltable[height][0].index=0;
-    }
-    if (avgheight>=5) {
-      it->leveltable[height][height-1].index=0;
-    }
-    if (avgheight>=7) {
-      it->leveltable[height][1].index=1;
-      it->leveltable[height][height-2].index=1;
+
+    if (height < avgheight + 2.0){
+      if (avgheight>=3) {
+        it->leveltable[height][0].index=0;
+      }
+      if (avgheight>=5) {
+        if (height >= 1) it->leveltable[height][height-1].index=0;
+      }
+      if (avgheight>=7) {
+        it->leveltable[height][1].index=1;
+        if (height >= 2) it->leveltable[height][height-2].index=1;
+      }
     }
 
     for (i=0; i<height; i++) {

xscreensaver-5.10-substrate-bz545847.patch:
 substrate.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.10-substrate-bz545847.patch ---
--- xscreensaver-5.10/hacks/substrate.c.debug	2008-07-31 19:19:57.000000000 +0900
+++ xscreensaver-5.10/hacks/substrate.c	2009-12-10 03:01:06.000000000 +0900
@@ -198,6 +198,13 @@
         /* We timed out.  Use our default values */
         px = cr->x;
         py = cr->y;
+
+        /* Sanity check needed */
+        if (px < 0) px = 0;
+        if (px >= f->width) px = f->width - 1;
+        if (py < 0) py = 0;
+        if (py >= f->height) py = f->height - 1;
+
         ref_cgrid(f, px, py) = cr->t;
     }
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- xscreensaver.spec	7 Oct 2009 20:33:55 -0000	1.99
+++ xscreensaver.spec	10 Dec 2009 15:50:45 -0000	1.100
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -49,6 +49,8 @@ Patch21:         xscreensaver-5.07-webco
 #
 #
 # Not sent to upstream yet, must do later
+Patch30:         xscreensaver-5.10-substrate-bz545847.patch
+Patch31:         xscreensaver-5.10-apple2-initialization.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -203,6 +205,8 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch30 -p1 -b .subst
+%patch31 -p1 -b .apple
 
 change_option(){
    set +x
@@ -260,7 +264,9 @@ change_option driver/XScreenSaver.ad.in 
    splash=False \
    ignoreUninstalledPrograms=True \
    textProgram=fortune\ -s \
+%if %{?fedora} >= 12
    textURL=%{default_URL}
+%endif
 
 # Disable the following hacks by default
 # (disable, not remove)
@@ -670,9 +676,13 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+- Fix occasional crash on substrate (bug 545847)
+- Fix initialization process on apple2, hopefully fix bug 540790
+
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
-- Restrict Autostart effect to GNOME session only (bug 517391)
-- Use planet.fedoraproject.org for textURL (still the default textMode
+- F-12+: Restrict Autostart effect to GNOME session only (bug 517391)
+- F-12+: Use planet.fedoraproject.org for textURL (still the default textMode
   is "file", i.e. no net connection)
 
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1



From pkgdb at fedoraproject.org  Thu Dec 10 15:50:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 15:50:53 +0000
Subject: [pkgdb] istanbul: pfrields has given up watchbugzilla
Message-ID: <20091210155053.A6BA410F89A@bastion2.fedora.phx.redhat.com>

pfrields has given up the watchbugzilla acl on istanbul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Thu Dec 10 15:50:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 15:50:54 +0000
Subject: [pkgdb] istanbul: pfrields has given up watchcommits
Message-ID: <20091210155055.14F4810F89A@bastion2.fedora.phx.redhat.com>

pfrields has given up the watchcommits acl on istanbul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Thu Dec 10 15:50:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 15:50:56 +0000
Subject: [pkgdb] istanbul: pfrields has requested commit
Message-ID: <20091210155056.82A5B10F89A@bastion2.fedora.phx.redhat.com>

pfrields has requested the commit acl on istanbul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Thu Dec 10 15:50:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 15:50:58 +0000
Subject: [pkgdb] istanbul: pfrields has requested approveacls
Message-ID: <20091210155058.72BE010F87F@bastion2.fedora.phx.redhat.com>

pfrields has requested the approveacls acl on istanbul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From ovasik at fedoraproject.org  Thu Dec 10 16:00:03 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 10 Dec 2009 16:00:03 +0000 (UTC)
Subject: rpms/openjade/F-12 openjade.spec,1.47,1.48
Message-ID: <20091210160003.3035611C048B@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/openjade/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13180

Modified Files:
	openjade.spec 
Log Message:
Merge Review (#226213) - added url, fixed rpmlint warnings,  no macros in changelog


Index: openjade.spec
===================================================================
RCS file: /cvs/extras/rpms/openjade/F-12/openjade.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- openjade.spec	25 Jul 2009 20:48:10 -0000	1.47
+++ openjade.spec	10 Dec 2009 16:00:01 -0000	1.48
@@ -1,8 +1,9 @@
 Summary: A DSSSL implementation
 Name: openjade
 Version: 1.3.2
-Release: 35%{?dist}
-Prereq: sgml-common >= 0.5
+Release: 36%{?dist}
+Requires: sgml-common
+URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
 Patch1: openjade-1.3.1-nsl.patch
@@ -11,9 +12,9 @@ Patch3: openjade-nola.patch
 License: BSD
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: openjade-devel < 1.3.2-17
-Obsoletes: jade
-Provides: jade
+
+#Last jade version is from Red Hat 6.2
+Provides: jade = %{version}-%{release}
 
 BuildRequires: opensp-devel
 
@@ -45,10 +46,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make install install-man DESTDIR=$RPM_BUILD_ROOT
 
-# Fix up libtool libraries
-find $RPM_BUILD_ROOT -name '*.la' | \
-  xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g"
-
 # oMy, othis ois osilly.
 ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade
 echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
@@ -81,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc jadedoc/* dsssl/README.jadetex
 %doc README COPYING VERSION
 %ghost /etc/sgml/%{name}-%{version}-%{release}.soc
@@ -92,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sgml/%{name}-%{version}
 
 %changelog
+* Thu Dec 10 2009 Ondrej Vasik <ovasik at redhat.com> 1.3.2-36
+- Merge Review (#226213) - added url, fixed rpmlint warnings,
+  no macros in changelog
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -214,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu May 22 2003 Tim Waugh <twaugh at redhat.com> 1.3.2-3
 - Fixes for GCC 3.3.
-- Use --parents for %doc.
+- Use --parents for %%doc.
 
 * Tue Mar 18 2003 Tim Waugh <twaugh at redhat.com> 1.3.2-2
 - Provide sgml2xml man page (bug #83759).



From jreznik at fedoraproject.org  Thu Dec 10 16:05:48 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 10 Dec 2009 16:05:48 +0000 (UTC)
Subject: rpms/arora/F-11 arora-0.10.2-fedorahome.patch, NONE,
	1.1 arora-0.10.2-gitversion.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 arora.spec, 1.16, 1.17 sources, 1.11,
	1.12 arora-0.10.0-fedorahome.patch, 1.1,
	NONE arora-0.10.1-gitversion.patch, 1.1, NONE
Message-ID: <20091210160548.ADA2511C025D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15093

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.2-fedorahome.patch arora-0.10.2-gitversion.patch 
Removed Files:
	arora-0.10.0-fedorahome.patch arora-0.10.1-gitversion.patch 
Log Message:
* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-2
- Conditionaly check for qt4 version

* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
- Update to 0.10.2
- QtWebKit patch removed

* Wed Nov 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-4
- Build over latest qtwebkit trunk from qt 4.6-rc1

* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-3
- respin against newer qt

* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-2
- add dep on qt4 version built against


arora-0.10.2-fedorahome.patch:
 browsermainwindow.cpp |    2 +-
 settings.cpp          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arora-0.10.2-fedorahome.patch ---
diff -up arora-0.10.2/src/browsermainwindow.cpp.fedorahome arora-0.10.2/src/browsermainwindow.cpp
--- arora-0.10.2/src/browsermainwindow.cpp.fedorahome	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/browsermainwindow.cpp	2009-12-10 12:52:34.359736509 +0100
@@ -1398,7 +1398,7 @@ void BrowserMainWindow::goHome()
 {
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString home = settings.value(QLatin1String("home"), QLatin1String("about:home")).toString();
+    QString home = settings.value(QLatin1String("home"), QLatin1String("http://start.fedoraproject.org/")).toString();
     tabWidget()->loadString(home);
 }
 
diff -up arora-0.10.2/src/settings.cpp.fedorahome arora-0.10.2/src/settings.cpp
--- arora-0.10.2/src/settings.cpp.fedorahome	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/settings.cpp	2009-12-10 12:52:34.359736509 +0100
@@ -143,7 +143,7 @@ void SettingsDialog::loadFromSettings()
     settings.endGroup();
 
     settings.beginGroup(QLatin1String("MainWindow"));
-    QString defaultHome = QLatin1String("about:home");
+    QString defaultHome = QLatin1String("http://start.fedoraproject.org/");
     homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
     startupBehavior->setCurrentIndex(settings.value(QLatin1String("startupBehavior"), 0).toInt());
     settings.endGroup();

arora-0.10.2-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.2-gitversion.patch ---
diff -up arora-0.10.2/src/src.pri.gitversion arora-0.10.2/src/src.pri
--- arora-0.10.2/src/src.pri.gitversion	2009-12-05 23:45:07.000000000 +0100
+++ arora-0.10.2/src/src.pri	2009-12-10 13:08:40.120548737 +0100
@@ -15,21 +15,8 @@ UI_DIR      = $$PWD/.ui
 MOC_DIR     = $$PWD/.moc
 OBJECTS_DIR = $$PWD/.obj
 
-
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-} else {
-    exists($$PWD/../.git/HEAD) {
-        GITVERSION=$$system(git log -n1 --pretty=format:%h)
-        DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\"
-        GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l)
-        DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\"
-    } else {
-        DEFINES += GITVERSION=\"\\\"0\\\"\"
-        DEFINES += GITCHANGENUMBER=\"\\\"0\\\"\"
-    }
-}
+DEFINES += GITVERSION=\"\\\"0a6f1f4\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1333\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Oct 2009 10:51:46 -0000	1.10
+++ .cvsignore	10 Dec 2009 16:05:47 -0000	1.11
@@ -1 +1 @@
-arora-0.10.1.tar.gz
+arora-0.10.2.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/arora.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- arora.spec	6 Oct 2009 10:51:46 -0000	1.16
+++ arora.spec	10 Dec 2009 16:05:47 -0000	1.17
@@ -1,22 +1,23 @@
 Name:           arora
-Version:        0.10.1
-Release:        1%{?dist}
+Version:        0.10.2
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/arora/
 Source0:        http://arora.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         arora-0.10.1-gitversion.patch
+Patch0:         arora-0.10.2-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
-Patch2:         arora-0.10.0-fedorahome.patch
+Patch2:         arora-0.10.2-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt4-devel >= 4.4.0
+BuildRequires:  qt4-devel >= 4.5.0
 # for gnome default app path
 BuildRequires:  control-center-devel
 
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
 Arora is a simple, cross platform web browser based on the QtWebKit engine.
@@ -98,6 +99,22 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-2
+- Conditionaly check for qt4 version
+
+* Thu Dec 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.2-1
+- Update to 0.10.2
+- QtWebKit patch removed
+
+* Wed Nov 18 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-4
+- Build over latest qtwebkit trunk from qt 4.6-rc1
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-3
+- respin against newer qt
+
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-2
+- add dep on qt4 version built against
+
 * Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
 - Update to 0.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Oct 2009 10:51:46 -0000	1.11
+++ sources	10 Dec 2009 16:05:48 -0000	1.12
@@ -1 +1 @@
-ac38282a2d9134687d9c30dbb73c0fbc  arora-0.10.1.tar.gz
+ccef0f214e0f03828cde8c521f7a5225  arora-0.10.2.tar.gz


--- arora-0.10.0-fedorahome.patch DELETED ---


--- arora-0.10.1-gitversion.patch DELETED ---



From rmccabe at fedoraproject.org  Thu Dec 10 16:07:17 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 10 Dec 2009 16:07:17 +0000 (UTC)
Subject: File ricci-0.16.1.tar.gz uploaded to lookaside cache by rmccabe
Message-ID: <20091210160717.9B16010F89D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ricci:

b5d686be1a7c1a4fc545231ad41c3ec6  ricci-0.16.1.tar.gz



From cjb at fedoraproject.org  Thu Dec 10 16:09:08 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Thu, 10 Dec 2009 16:09:08 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091211git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091210160908.7A79F10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

c1480e3190621f539a447db4a842f14f  ohm-0.1.1-1.20091211git.tar.gz



From rmccabe at fedoraproject.org  Thu Dec 10 16:09:36 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 10 Dec 2009 16:09:36 +0000 (UTC)
Subject: File ricci-0.16.1.tar.gz uploaded to lookaside cache by rmccabe
Message-ID: <20091210160936.E9BA010F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ricci:

1709b2f0f7f4839d564a6bf6397f5e2f  ricci-0.16.1.tar.gz



From pghmcfc at fedoraproject.org  Thu Dec 10 16:09:45 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 10 Dec 2009 16:09:45 +0000 (UTC)
Subject: rpms/proftpd/F-11 proftpd-1.3.2b-segfault-on-auth-fail.patch, NONE, 
	1.1 proftpd.spec, 1.53, 1.54
Message-ID: <20091210160945.A916411C025D@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16782/F-11

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2b-segfault-on-auth-fail.patch 
Log Message:
Add patch for upstream bug 3350 - segfault on auth failures

proftpd-1.3.2b-segfault-on-auth-fail.patch:
 support.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE proftpd-1.3.2b-segfault-on-auth-fail.patch ---
Got this backtrace on auth failures on Fedora 12 with OpenSSL 1.0.0 beta 4

Core was generated by `proftpd -n'.
Program terminated with signal 11, Segmentation fault.
#0  strcmp () at ../sysdeps/x86_64/strcmp.S:64
64		cmpb	(%rsi), %al
(gdb) bt
#0  strcmp () at ../sysdeps/x86_64/strcmp.S:64
#1  0x0000003a1b00e965 in _dl_name_match_p (name=0x3a1b53a89e "libgcc_s.so.1", map=0x7fc600) at dl-misc.c:302
#2  0x0000003a1b007ad2 in _dl_map_object (loader=0x3a1b21f0e8, name=0x3a1b53a89e "libgcc_s.so.1", preloaded=<value optimized out>, 
    type=<value optimized out>, trace_mode=<value optimized out>, mode=-1879048191, nsid=<value optimized out>) at dl-load.c:1977
#3  0x0000003a1b012500 in dl_open_worker (a=0x7fff079d1010) at dl-open.c:254
#4  0x0000003a1b00dd46 in _dl_catch_error (objname=<value optimized out>, errstring=<value optimized out>, mallocedp=<value optimized out>, 
    operate=<value optimized out>, args=<value optimized out>) at dl-error.c:178
#5  0x0000003a1b011f87 in _dl_open (file=0x3a1b53a89e "libgcc_s.so.1", mode=-2147483647, caller_dlopen=0x0, nsid=-2, argc=2, 
    argv=<value optimized out>, env=<value optimized out>) at dl-open.c:583
#6  0x0000003a1b51a620 in do_dlopen (ptr=0x7fff079d1200) at dl-libc.c:86
#7  0x0000003a1b00dd46 in _dl_catch_error (objname=<value optimized out>, errstring=<value optimized out>, mallocedp=<value optimized out>, 
    operate=<value optimized out>, args=<value optimized out>) at dl-error.c:178
#8  0x0000003a1b51a777 in dlerror_run (args=<value optimized out>, operate=<value optimized out>) at dl-libc.c:47
#9  __libc_dlopen_mode (args=<value optimized out>, operate=<value optimized out>) at dl-libc.c:160
#10 0x0000003a1b4f3345 in init () at ../sysdeps/ia64/backtrace.c:41
#11 0x0000003a1bc0c733 in pthread_once () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S:104
#12 0x0000003a1b4f3444 in __backtrace (array=<value optimized out>, size=32) at ../sysdeps/ia64/backtrace.c:85
#13 0x0000000000414312 in handle_segv (signo=11, info=0x7fff079d1530, ptr=0x7fff079d1400) at main.c:1871
#14 <signal handler called>
#15 OPENSSL_cleanse () at x86_64cpuid.s:135
#16 0x0000000000424abb in pr_memscrub (ptr=0x7fbe40, ptrlen=0) at support.c:570
#17 0x0000000000473322 in setup_env (p=0x80b150, cmd=0x7fbdb8, user=0x80c3f0 "", pass=0x7fbe40 "") at mod_auth.c:1381
#18 0x0000000000474eb3 in auth_pass (cmd=0x7fbdb8) at mod_auth.c:1963
#19 0x000000000043a0ee in pr_module_call (m=0x6e3480, func=0x474d9e <auth_pass>, cmd=0x7fbdb8) at modules.c:502
#20 0x0000000000411702 in _dispatch (cmd=0x7fbdb8, cmd_type=2, validate=1, match=0x7fbe38 "PASS") at main.c:446
#21 0x0000000000411f5e in pr_cmd_dispatch_phase (cmd=0x7fbdb8, phase=0, flags=3) at main.c:703
#22 0x000000000041220d in pr_cmd_dispatch (cmd=0x7fbdb8) at main.c:773
#23 0x0000000000412796 in cmd_loop (server=0x7b4628, c=0x805e88) at main.c:914
#24 0x00000000004136be in fork_server (fd=9, l=0x804408, nofork=0 '\000') at main.c:1436
#25 0x0000000000413ca7 in daemon_loop () at main.c:1643
#26 0x00000000004151ff in standalone_main () at main.c:2504
#27 0x0000000000415e08 in main (argc=2, argv=0x7fff079d2118, envp=0x7fff079d2130) at main.c:3124

--- proftpd-1.3.3rc2/src/support.c	2009-08-04 16:53:28.000000000 +0100
+++ proftpd-1.3.3rc2/src/support.c	2009-12-10 13:52:06.916586992 +0000
@@ -567,6 +567,11 @@
   /* Just use OpenSSL's function for this.  They have optimized it for
    * performance in later OpenSSL releases.
    */
+
+  if (!ptr || ptrlen == 0) {
+    return;
+  }
+
   OPENSSL_cleanse(ptr, ptrlen);
 
 #else 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- proftpd.spec	9 Dec 2009 21:05:10 -0000	1.53
+++ proftpd.spec	10 Dec 2009 16:09:45 -0000	1.54
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,6 +31,7 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
+Patch4:			proftpd-1.3.2b-segfault-on-auth-fail.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -99,6 +100,9 @@ Module to add PostgreSQL support to the 
 # (upstream patch)
 %patch3 -p1 -b .mlsd
 
+# Fix segfault on auth failures (bug 3350)
+%patch4 -p1 -b .segfault-on-auth-failure
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -291,6 +295,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-3
+- Add patch for upstream bug 3350 - segfault on auth failures
+
 * Wed Dec  9 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-2
 - Reduce the mod_facts patch to the single commit addressing the issue with
   directory names with glob characters (#521634), avoiding introducing a



From pghmcfc at fedoraproject.org  Thu Dec 10 16:09:46 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 10 Dec 2009 16:09:46 +0000 (UTC)
Subject: rpms/proftpd/F-12 proftpd-1.3.2b-segfault-on-auth-fail.patch, NONE, 
	1.1 proftpd.spec, 1.59, 1.60
Message-ID: <20091210160946.BA90811C025D@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16782/F-12

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2b-segfault-on-auth-fail.patch 
Log Message:
Add patch for upstream bug 3350 - segfault on auth failures

proftpd-1.3.2b-segfault-on-auth-fail.patch:
 support.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE proftpd-1.3.2b-segfault-on-auth-fail.patch ---
Got this backtrace on auth failures on Fedora 12 with OpenSSL 1.0.0 beta 4

Core was generated by `proftpd -n'.
Program terminated with signal 11, Segmentation fault.
#0  strcmp () at ../sysdeps/x86_64/strcmp.S:64
64		cmpb	(%rsi), %al
(gdb) bt
#0  strcmp () at ../sysdeps/x86_64/strcmp.S:64
#1  0x0000003a1b00e965 in _dl_name_match_p (name=0x3a1b53a89e "libgcc_s.so.1", map=0x7fc600) at dl-misc.c:302
#2  0x0000003a1b007ad2 in _dl_map_object (loader=0x3a1b21f0e8, name=0x3a1b53a89e "libgcc_s.so.1", preloaded=<value optimized out>, 
    type=<value optimized out>, trace_mode=<value optimized out>, mode=-1879048191, nsid=<value optimized out>) at dl-load.c:1977
#3  0x0000003a1b012500 in dl_open_worker (a=0x7fff079d1010) at dl-open.c:254
#4  0x0000003a1b00dd46 in _dl_catch_error (objname=<value optimized out>, errstring=<value optimized out>, mallocedp=<value optimized out>, 
    operate=<value optimized out>, args=<value optimized out>) at dl-error.c:178
#5  0x0000003a1b011f87 in _dl_open (file=0x3a1b53a89e "libgcc_s.so.1", mode=-2147483647, caller_dlopen=0x0, nsid=-2, argc=2, 
    argv=<value optimized out>, env=<value optimized out>) at dl-open.c:583
#6  0x0000003a1b51a620 in do_dlopen (ptr=0x7fff079d1200) at dl-libc.c:86
#7  0x0000003a1b00dd46 in _dl_catch_error (objname=<value optimized out>, errstring=<value optimized out>, mallocedp=<value optimized out>, 
    operate=<value optimized out>, args=<value optimized out>) at dl-error.c:178
#8  0x0000003a1b51a777 in dlerror_run (args=<value optimized out>, operate=<value optimized out>) at dl-libc.c:47
#9  __libc_dlopen_mode (args=<value optimized out>, operate=<value optimized out>) at dl-libc.c:160
#10 0x0000003a1b4f3345 in init () at ../sysdeps/ia64/backtrace.c:41
#11 0x0000003a1bc0c733 in pthread_once () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S:104
#12 0x0000003a1b4f3444 in __backtrace (array=<value optimized out>, size=32) at ../sysdeps/ia64/backtrace.c:85
#13 0x0000000000414312 in handle_segv (signo=11, info=0x7fff079d1530, ptr=0x7fff079d1400) at main.c:1871
#14 <signal handler called>
#15 OPENSSL_cleanse () at x86_64cpuid.s:135
#16 0x0000000000424abb in pr_memscrub (ptr=0x7fbe40, ptrlen=0) at support.c:570
#17 0x0000000000473322 in setup_env (p=0x80b150, cmd=0x7fbdb8, user=0x80c3f0 "", pass=0x7fbe40 "") at mod_auth.c:1381
#18 0x0000000000474eb3 in auth_pass (cmd=0x7fbdb8) at mod_auth.c:1963
#19 0x000000000043a0ee in pr_module_call (m=0x6e3480, func=0x474d9e <auth_pass>, cmd=0x7fbdb8) at modules.c:502
#20 0x0000000000411702 in _dispatch (cmd=0x7fbdb8, cmd_type=2, validate=1, match=0x7fbe38 "PASS") at main.c:446
#21 0x0000000000411f5e in pr_cmd_dispatch_phase (cmd=0x7fbdb8, phase=0, flags=3) at main.c:703
#22 0x000000000041220d in pr_cmd_dispatch (cmd=0x7fbdb8) at main.c:773
#23 0x0000000000412796 in cmd_loop (server=0x7b4628, c=0x805e88) at main.c:914
#24 0x00000000004136be in fork_server (fd=9, l=0x804408, nofork=0 '\000') at main.c:1436
#25 0x0000000000413ca7 in daemon_loop () at main.c:1643
#26 0x00000000004151ff in standalone_main () at main.c:2504
#27 0x0000000000415e08 in main (argc=2, argv=0x7fff079d2118, envp=0x7fff079d2130) at main.c:3124

--- proftpd-1.3.3rc2/src/support.c	2009-08-04 16:53:28.000000000 +0100
+++ proftpd-1.3.3rc2/src/support.c	2009-12-10 13:52:06.916586992 +0000
@@ -567,6 +567,11 @@
   /* Just use OpenSSL's function for this.  They have optimized it for
    * performance in later OpenSSL releases.
    */
+
+  if (!ptr || ptrlen == 0) {
+    return;
+  }
+
   OPENSSL_cleanse(ptr, ptrlen);
 
 #else 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-12/proftpd.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- proftpd.spec	9 Dec 2009 21:05:10 -0000	1.59
+++ proftpd.spec	10 Dec 2009 16:09:45 -0000	1.60
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,6 +31,7 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
+Patch4:			proftpd-1.3.2b-segfault-on-auth-fail.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -99,6 +100,9 @@ Module to add PostgreSQL support to the 
 # (upstream patch)
 %patch3 -p1 -b .mlsd
 
+# Fix segfault on auth failures (bug 3350)
+%patch4 -p1 -b .segfault-on-auth-failure
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -291,6 +295,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-3
+- Add patch for upstream bug 3350 - segfault on auth failures
+
 * Wed Dec  9 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-2
 - Reduce the mod_facts patch to the single commit addressing the issue with
   directory names with glob characters (#521634), avoiding introducing a



From pghmcfc at fedoraproject.org  Thu Dec 10 16:09:47 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 10 Dec 2009 16:09:47 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd-1.3.2b-segfault-on-auth-fail.patch, NONE,
	1.1 proftpd.spec, 1.60, 1.61
Message-ID: <20091210160947.4EF6911C025D@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16782/devel

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2b-segfault-on-auth-fail.patch 
Log Message:
Add patch for upstream bug 3350 - segfault on auth failures

proftpd-1.3.2b-segfault-on-auth-fail.patch:
 support.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE proftpd-1.3.2b-segfault-on-auth-fail.patch ---
Got this backtrace on auth failures on Fedora 12 with OpenSSL 1.0.0 beta 4

Core was generated by `proftpd -n'.
Program terminated with signal 11, Segmentation fault.
#0  strcmp () at ../sysdeps/x86_64/strcmp.S:64
64		cmpb	(%rsi), %al
(gdb) bt
#0  strcmp () at ../sysdeps/x86_64/strcmp.S:64
#1  0x0000003a1b00e965 in _dl_name_match_p (name=0x3a1b53a89e "libgcc_s.so.1", map=0x7fc600) at dl-misc.c:302
#2  0x0000003a1b007ad2 in _dl_map_object (loader=0x3a1b21f0e8, name=0x3a1b53a89e "libgcc_s.so.1", preloaded=<value optimized out>, 
    type=<value optimized out>, trace_mode=<value optimized out>, mode=-1879048191, nsid=<value optimized out>) at dl-load.c:1977
#3  0x0000003a1b012500 in dl_open_worker (a=0x7fff079d1010) at dl-open.c:254
#4  0x0000003a1b00dd46 in _dl_catch_error (objname=<value optimized out>, errstring=<value optimized out>, mallocedp=<value optimized out>, 
    operate=<value optimized out>, args=<value optimized out>) at dl-error.c:178
#5  0x0000003a1b011f87 in _dl_open (file=0x3a1b53a89e "libgcc_s.so.1", mode=-2147483647, caller_dlopen=0x0, nsid=-2, argc=2, 
    argv=<value optimized out>, env=<value optimized out>) at dl-open.c:583
#6  0x0000003a1b51a620 in do_dlopen (ptr=0x7fff079d1200) at dl-libc.c:86
#7  0x0000003a1b00dd46 in _dl_catch_error (objname=<value optimized out>, errstring=<value optimized out>, mallocedp=<value optimized out>, 
    operate=<value optimized out>, args=<value optimized out>) at dl-error.c:178
#8  0x0000003a1b51a777 in dlerror_run (args=<value optimized out>, operate=<value optimized out>) at dl-libc.c:47
#9  __libc_dlopen_mode (args=<value optimized out>, operate=<value optimized out>) at dl-libc.c:160
#10 0x0000003a1b4f3345 in init () at ../sysdeps/ia64/backtrace.c:41
#11 0x0000003a1bc0c733 in pthread_once () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S:104
#12 0x0000003a1b4f3444 in __backtrace (array=<value optimized out>, size=32) at ../sysdeps/ia64/backtrace.c:85
#13 0x0000000000414312 in handle_segv (signo=11, info=0x7fff079d1530, ptr=0x7fff079d1400) at main.c:1871
#14 <signal handler called>
#15 OPENSSL_cleanse () at x86_64cpuid.s:135
#16 0x0000000000424abb in pr_memscrub (ptr=0x7fbe40, ptrlen=0) at support.c:570
#17 0x0000000000473322 in setup_env (p=0x80b150, cmd=0x7fbdb8, user=0x80c3f0 "", pass=0x7fbe40 "") at mod_auth.c:1381
#18 0x0000000000474eb3 in auth_pass (cmd=0x7fbdb8) at mod_auth.c:1963
#19 0x000000000043a0ee in pr_module_call (m=0x6e3480, func=0x474d9e <auth_pass>, cmd=0x7fbdb8) at modules.c:502
#20 0x0000000000411702 in _dispatch (cmd=0x7fbdb8, cmd_type=2, validate=1, match=0x7fbe38 "PASS") at main.c:446
#21 0x0000000000411f5e in pr_cmd_dispatch_phase (cmd=0x7fbdb8, phase=0, flags=3) at main.c:703
#22 0x000000000041220d in pr_cmd_dispatch (cmd=0x7fbdb8) at main.c:773
#23 0x0000000000412796 in cmd_loop (server=0x7b4628, c=0x805e88) at main.c:914
#24 0x00000000004136be in fork_server (fd=9, l=0x804408, nofork=0 '\000') at main.c:1436
#25 0x0000000000413ca7 in daemon_loop () at main.c:1643
#26 0x00000000004151ff in standalone_main () at main.c:2504
#27 0x0000000000415e08 in main (argc=2, argv=0x7fff079d2118, envp=0x7fff079d2130) at main.c:3124

--- proftpd-1.3.3rc2/src/support.c	2009-08-04 16:53:28.000000000 +0100
+++ proftpd-1.3.3rc2/src/support.c	2009-12-10 13:52:06.916586992 +0000
@@ -567,6 +567,11 @@
   /* Just use OpenSSL's function for this.  They have optimized it for
    * performance in later OpenSSL releases.
    */
+
+  if (!ptr || ptrlen == 0) {
+    return;
+  }
+
   OPENSSL_cleanse(ptr, ptrlen);
 
 #else 


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- proftpd.spec	9 Dec 2009 21:05:11 -0000	1.60
+++ proftpd.spec	10 Dec 2009 16:09:47 -0000	1.61
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,6 +31,7 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
+Patch4:			proftpd-1.3.2b-segfault-on-auth-fail.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -99,6 +100,9 @@ Module to add PostgreSQL support to the 
 # (upstream patch)
 %patch3 -p1 -b .mlsd
 
+# Fix segfault on auth failures (bug 3350)
+%patch4 -p1 -b .segfault-on-auth-failure
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -291,6 +295,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-3
+- Add patch for upstream bug 3350 - segfault on auth failures
+
 * Wed Dec  9 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-2
 - Reduce the mod_facts patch to the single commit addressing the issue with
   directory names with glob characters (#521634), avoiding introducing a



From cjb at fedoraproject.org  Thu Dec 10 16:10:28 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Thu, 10 Dec 2009 16:10:28 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore, 1.11, 1.12 ohm.spec, 1.19, 1.20 sources, 
	1.14, 1.15
Message-ID: <20091210161028.3F13711C03E3@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17165

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
- Trigger a scan on resume from powered down wlan, using iwlist scan.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	10 Dec 2009 02:34:14 -0000	1.11
+++ .cvsignore	10 Dec 2009 16:10:27 -0000	1.12
@@ -1 +1 @@
-ohm-0.1.1-1.20091210git.tar.gz
+ohm-0.1.1-1.20091211git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ohm.spec	10 Dec 2009 02:43:56 -0000	1.19
+++ ohm.spec	10 Dec 2009 16:10:28 -0000	1.20
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091210git
+%define alphatag                20091211git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.36.%{alphatag}%{?dist}
+Release: 9.37.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,6 +139,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.37.20091211git.olpc
+- Trigger a scan on resume from powered down wlan, using iwlist scan. 
+
 * Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.36.20091210git.olpc
 - Power down wlan on power button/lid close, using ethtool "wol d" command.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Dec 2009 02:43:56 -0000	1.14
+++ sources	10 Dec 2009 16:10:28 -0000	1.15
@@ -1 +1 @@
-123b4ad006e64dd51781a4954b97f54c  ohm-0.1.1-1.20091210git.tar.gz
+c1480e3190621f539a447db4a842f14f  ohm-0.1.1-1.20091211git.tar.gz



From tmraz at fedoraproject.org  Thu Dec 10 16:10:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 10 Dec 2009 16:10:29 +0000 (UTC)
Subject: File authconfig-6.0.0.tar.bz2 uploaded to lookaside cache by tmraz
Message-ID: <20091210161029.81EFF10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for authconfig:

4806810049b0e9106d469dd0381ba725  authconfig-6.0.0.tar.bz2



From rmccabe at fedoraproject.org  Thu Dec 10 16:10:39 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 10 Dec 2009 16:10:39 +0000 (UTC)
Subject: File ricci-0.16.1.tar.gz uploaded to lookaside cache by rmccabe
Message-ID: <20091210161039.9BCFA10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ricci:

1db0532ac01ce1c0058447714eb78a92  ricci-0.16.1.tar.gz



From rmccabe at fedoraproject.org  Thu Dec 10 16:11:15 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 10 Dec 2009 16:11:15 +0000 (UTC)
Subject: rpms/ricci/F-12 .cvsignore, 1.5, 1.6 ricci.spec, 1.20, 1.21 sources,
	1.12, 1.13 ricci-0.16.1-passauth.patch, 1.1, NONE
Message-ID: <20091210161115.6D07911C025D@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/ricci/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17646

Modified Files:
	.cvsignore ricci.spec sources 
Removed Files:
	ricci-0.16.1-passauth.patch 
Log Message:
* Wed Dec 09 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-5
- Don't update the cluster version via cman_set_version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Jul 2009 04:50:21 -0000	1.5
+++ .cvsignore	10 Dec 2009 16:11:15 -0000	1.6
@@ -1,2 +1 @@
-ricci-0.16.0.tar.gz
 ricci-0.16.1.tar.gz


Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-12/ricci.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ricci.spec	16 Sep 2009 18:25:17 -0000	1.20
+++ ricci.spec	10 Dec 2009 16:11:15 -0000	1.21
@@ -10,13 +10,12 @@
 
 Name: ricci
 Version: 0.16.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
 Summary: Remote Cluster and Storage Management System
 Source0: http://people.redhat.com/rmccabe/conga/fedora/src/ricci-0.16.1.tar.gz
-Patch1: ricci-0.16.1-passauth.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel python-devel libcap-devel
@@ -33,7 +32,6 @@ Requires(postun): initscripts
 
 %prep
 %setup -q
-%patch1 -p1 -b .passauth
 
 %build
 %configure --arch=%{_arch} --docdir=%{_docdir}
@@ -123,6 +121,9 @@ fi
 exit 0
 
 %changelog
+* Wed Dec 09 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-5
+- Don't update the cluster version via cman_set_version
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.1-4
 - Use password-auth common PAM configuration instead of system-auth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Jul 2009 04:50:21 -0000	1.12
+++ sources	10 Dec 2009 16:11:15 -0000	1.13
@@ -1,2 +1 @@
-fad8f74a0dc458d67191f134027d5265  ricci-0.16.0.tar.gz
-77638cb7f40369f24a583d839010cba3  ricci-0.16.1.tar.gz
+1db0532ac01ce1c0058447714eb78a92  ricci-0.16.1.tar.gz


--- ricci-0.16.1-passauth.patch DELETED ---



From tmraz at fedoraproject.org  Thu Dec 10 16:12:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 10 Dec 2009 16:12:58 +0000 (UTC)
Subject: rpms/authconfig/devel .cvsignore, 1.80, 1.81 authconfig.spec, 1.111,
	1.112 sources, 1.88, 1.89
Message-ID: <20091210161258.E500111C025D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18526

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Thu Dec 10 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-1
- support for SSSD enabling/disabling and basic support for
  SSSD domain setup
- safe atomic overwrites of the config files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	11 Nov 2009 14:57:39 -0000	1.80
+++ .cvsignore	10 Dec 2009 16:12:58 -0000	1.81
@@ -1 +1 @@
-authconfig-5.4.14.tar.bz2
+authconfig-6.0.0.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- authconfig.spec	11 Nov 2009 14:57:39 -0000	1.111
+++ authconfig.spec	10 Dec 2009 16:12:58 -0000	1.112
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.14
+Version: 6.0.0
 Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
@@ -10,8 +10,8 @@ URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
 Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
-Conflicts: nss_ldap < 254
-BuildRequires: glib2-devel, python >= 2.4.1, python-devel
+Conflicts: nss_ldap < 254, sssd < 1.0.0
+BuildRequires: glib2-devel, python >= 2.6, python-devel
 BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser
 
 %description 
@@ -23,7 +23,7 @@ authentication schemes.
 %package gtk
 Summary: Graphical tool for setting up authentication from network services
 Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}, pygtk2-libglade >= 2.4.0
+Requires: %{name} = %{version}-%{release}, pygtk2-libglade >= 2.14.0
 Requires: usermode-gtk
 
 %description gtk
@@ -101,6 +101,11 @@ authconfig --update --nostart >/dev/null
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Dec 10 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-1
+- support for SSSD enabling/disabling and basic support for
+  SSSD domain setup
+- safe atomic overwrites of the config files
+
 * Wed Nov 11 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.14-1
 - fixed missing truncation in the backup restores (#533881)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	11 Nov 2009 14:57:39 -0000	1.88
+++ sources	10 Dec 2009 16:12:58 -0000	1.89
@@ -1 +1 @@
-02721515659da2013d6f8551d8ea0b87  authconfig-5.4.14.tar.bz2
+4806810049b0e9106d469dd0381ba725  authconfig-6.0.0.tar.bz2



From kasal at fedoraproject.org  Thu Dec 10 16:18:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 10 Dec 2009 16:18:46 +0000 (UTC)
Subject: rpms/arts/devel arts-acinclude.patch,NONE,1.1 arts.spec,1.99,1.100
Message-ID: <20091210161846.959EE11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/arts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20628

Modified Files:
	arts.spec 
Added Files:
	arts-acinclude.patch 
Log Message:
- patch autoconfigury to build with autoconf >= 2.64

arts-acinclude.patch:
 acinclude.m4.in |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE arts-acinclude.patch ---
2009-12-10  Stepan Kasal  <skasal at redhat.com>

The change of implementation of AC_REQUIRE in 2.64 caused a regression
in the arts project.
This can be fixed by shuffling some macro calls.

I suppose that most of this patch will not be needed with a future
release of Autoconf.
But the last chunk of this patch is a real bug in this source and
should go upstream.

--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
@@ -3081,8 +3081,18 @@
 fi
 ])
 
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
+[ 
+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+  CFLAGS=" $CFLAGS"
+  AC_PROG_CC
+  CXXFLAGS=" $CXXFLAGS"
+  AC_PROG_CXX
+])
+
 AC_DEFUN([AC_CHECK_COMPILERS],
 [
+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
   AC_ARG_ENABLE(debug,
 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
@@ -3141,11 +3151,6 @@
     [kde_use_profiling="no"]
   )
 
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
   AC_PROG_CPP
 
   if test "$GCC" = "yes"; then
@@ -3174,10 +3179,6 @@
      LDFLAGS=""
   fi
 
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
   KDE_CHECK_FOR_BAD_COMPILER
 
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
@@ -3503,8 +3504,8 @@
 AC_REQUIRE([AC_LIBTOOL_DLOPEN])
 AC_REQUIRE([KDE_CHECK_LIB64])
 
-AC_OBJEXT
-AC_EXEEXT
+AC_REQUIRE([AC_OBJEXT])
+AC_REQUIRE([AC_EXEEXT])
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX


Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/devel/arts.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- arts.spec	7 Dec 2009 14:52:13 -0000	1.99
+++ arts.spec	10 Dec 2009 16:18:45 -0000	1.100
@@ -10,7 +10,7 @@ Summary: aRts (analog realtime synthesiz
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -33,6 +33,9 @@ Patch51: kde-3.5-libtool-shlibext.patch
 # CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
 Patch200: libltdl-CVE-2009-3736.patch
 
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: arts-acinclude.patch
+
 # used in artsdsp
 Requires: which
 
@@ -85,6 +88,10 @@ Install %{name}-devel if you intend to w
 
 %patch200 -p1 -b .CVE-2009-3736
 
+%patch300 -p1 -b .acinclude
+
+%build
+
 %if %{make_cvs}
 # hack/fix for newer automake
   sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
@@ -92,7 +99,6 @@ Install %{name}-devel if you intend to w
 %endif
 
 
-%build
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
@@ -187,6 +193,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
+- patch autoconfigury to build with autoconf >= 2.64
+
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
 - fix url
 - fix security issues in libltdl (CVE-2009-3736)



From jpopelka at fedoraproject.org  Thu Dec 10 16:21:53 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu, 10 Dec 2009 16:21:53 +0000 (UTC)
Subject: rpms/lockdev/devel lockdev-1.0.3-rh.patch, 1.2, 1.3 lockdev.spec,
	1.38, 1.39
Message-ID: <20091210162153.98F5C11C025D@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/lockdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21811

Modified Files:
	lockdev-1.0.3-rh.patch lockdev.spec 
Log Message:
* Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-3
- Correct rh.patch


lockdev-1.0.3-rh.patch:
 LockDev/Makefile.PL |    2 
 Makefile            |   22 +++++---
 src/baudboy.h       |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lockdev.c       |   48 +++++++++++++-----
 src/lockdev.h       |    4 +
 src/sample.c        |   64 +++++++++++++++---------
 6 files changed, 234 insertions(+), 43 deletions(-)

Index: lockdev-1.0.3-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev-1.0.3-rh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lockdev-1.0.3-rh.patch	10 Dec 2009 08:02:19 -0000	1.2
+++ lockdev-1.0.3-rh.patch	10 Dec 2009 16:21:53 -0000	1.3
@@ -1,15 +1,29 @@
+diff -up lockdev-1.0.3/LockDev/Makefile.PL.redhat lockdev-1.0.3/LockDev/Makefile.PL
+--- lockdev-1.0.3/LockDev/Makefile.PL.redhat	2005-10-03 19:49:17.000000000 +0200
++++ lockdev-1.0.3/LockDev/Makefile.PL	2009-12-10 17:07:42.000000000 +0100
+@@ -7,7 +7,7 @@ WriteMakefile(
+          'LIBS'	=> [''],
+        'DEFINE'	=> '',
+           'INC'	=> '-I../src',
+-     'MYEXTLIB'	=> '../src/lockdev.z',
++     'MYEXTLIB'	=> '../liblockdev.a',
+ );
+ 
+ sub MY::postamble {
 diff -up lockdev-1.0.3/Makefile.redhat lockdev-1.0.3/Makefile
 --- lockdev-1.0.3/Makefile.redhat	2005-10-03 20:51:53.000000000 +0200
 +++ lockdev-1.0.3/Makefile	2009-12-05 17:42:41.000000000 +0100
-@@ -6,6 +6,7 @@ pkgname = lockdev
+@@ -4,8 +4,8 @@ libname	= liblockdev
+ pkgname = lockdev
+ 
  objs	= src/lockdev.o
- shobjs	= src/lockdev.z
+-shobjs	= src/lockdev.z
  
 +lockdev	= src/sample.c
  
  VER	= $(shell expr `pwd` : '.*-\([0-9.]*\)')
  MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
-@@ -18,17 +19,18 @@ soname	= ${libname}.so.${MVER}
+@@ -18,27 +18,30 @@ soname	= ${libname}.so.${MVER}
  basedir	= /usr/local
  srcdir=.
  
@@ -31,20 +45,22 @@ diff -up lockdev-1.0.3/Makefile.redhat l
  
  static ${static}:       ${objs}
  	$(AR) $(ARFLAGS) ${static} $^
-@@ -36,6 +38,12 @@ static ${static}:       ${objs}
- shared ${shared}:	${shobjs}
+ 
+-shared ${shared}:	${shobjs}
++shared ${shared}:	${objs}
  	${CC} ${LCFLAGS} -shared -Wl,-soname,${soname} $^ -lc -o ${shared}
  
+-src/lockdev.z: src/lockdev.c
+-	${CC} ${CFLAGS} -c -fPIC -o $@ $?
 +lockdev.o: ${lockdev}
 +	${CC} ${CFLAGS} -I./src -o $@ -c $^
-+
+ 
 +lockdev: lockdev.o ${static}
 +	${CC} -o $@ $^
-+
- src/lockdev.z: src/lockdev.c
- 	${CC} ${CFLAGS} -c -fPIC -o $@ $?
  
-@@ -54,6 +62,7 @@ install_dev:	${static} src/lockdev.h
+ perl-lib:	static
+ 	cd LockDev && perl Makefile.PL INSTALLDIRS=vendor
+@@ -54,6 +57,7 @@ install_dev:	${static} src/lockdev.h
  	install -m755 -d	${incdir}
  	install -m644 src/lockdev.h	${incdir}
  	install -m644 src/ttylock.h	${incdir}
@@ -52,7 +68,7 @@ diff -up lockdev-1.0.3/Makefile.redhat l
  
  install_debug:	${static} ${shared}
  	install -m755 -d	${libdir}/debug
-@@ -71,7 +80,9 @@ install_doc:	docs/lockdev.3
+@@ -71,7 +75,9 @@ install_doc:	docs/lockdev.3
  
  install_run:	${shared}
  	install -m755 -d	${libdir}


Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- lockdev.spec	10 Dec 2009 08:02:19 -0000	1.38
+++ lockdev.spec	10 Dec 2009 16:21:53 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -77,7 +77,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc LICENSE
+%doc LICENSE AUTHORS ChangeLog ChangeLog.old
 %attr(2711,root,lock)  %{_sbindir}/lockdev
 %{_libdir}/*.so.*
 %{_mandir}/man8/*
@@ -90,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-3
+- Correct rh.patch
+
 * Thu Dec 10 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-2
 - Correct rh.patch
 



From cjb at fedoraproject.org  Thu Dec 10 16:22:36 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Thu, 10 Dec 2009 16:22:36 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091211git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091210162236.55CF610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ohm:

5acbb4ed1ed2f20ac5fb7453e6f202f9  ohm-0.1.1-1.20091211git.tar.gz



From cjb at fedoraproject.org  Thu Dec 10 16:23:33 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Thu, 10 Dec 2009 16:23:33 +0000 (UTC)
Subject: rpms/ohm/F-11 ohm.spec,1.20,1.21 sources,1.15,1.16
Message-ID: <20091210162333.9F43A11C025D@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22504

Modified Files:
	ohm.spec sources 
Log Message:
fix compile error



Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ohm.spec	10 Dec 2009 16:10:28 -0000	1.20
+++ ohm.spec	10 Dec 2009 16:23:33 -0000	1.21
@@ -7,7 +7,7 @@
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.37.%{alphatag}%{?dist}
+Release: 9.38.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,7 +139,7 @@ fi
 %{_includedir}/*
 
 %changelog
-* Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.37.20091211git.olpc
+* Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.38.20091211git.olpc
 - Trigger a scan on resume from powered down wlan, using iwlist scan. 
 
 * Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.36.20091210git.olpc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	10 Dec 2009 16:10:28 -0000	1.15
+++ sources	10 Dec 2009 16:23:33 -0000	1.16
@@ -1 +1 @@
-c1480e3190621f539a447db4a842f14f  ohm-0.1.1-1.20091211git.tar.gz
+5acbb4ed1ed2f20ac5fb7453e6f202f9  ohm-0.1.1-1.20091211git.tar.gz



From wtogami at fedoraproject.org  Thu Dec 10 16:24:58 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 10 Dec 2009 16:24:58 +0000 (UTC)
Subject: rpms/sabayon/F-12 .cvsignore, 1.25, 1.26 sabayon.spec, 1.67,
	1.68 selinux.patch, 1.3, 1.4 sources, 1.25,
	1.26 sabayon-2.29.2-paneldelegate-race.patch, 1.1, NONE
Message-ID: <20091210162458.0D25F11C025D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/sabayon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22094

Modified Files:
	.cvsignore sabayon.spec selinux.patch sources 
Removed Files:
	sabayon-2.29.2-paneldelegate-race.patch 
Log Message:
2.29.2 fixes important bugs and adds group apply which is considered important
upstream considers this to be the most stable release
"sabayon version number is IN NO WAY tied to gnome's version number"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sabayon/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	27 Oct 2009 10:46:16 -0000	1.25
+++ .cvsignore	10 Dec 2009 16:24:57 -0000	1.26
@@ -1 +1 @@
-sabayon-2.28.1.tar.bz2
+sabayon-2.29.2.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sabayon/F-12/sabayon.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sabayon.spec	9 Dec 2009 12:02:38 -0000	1.67
+++ sabayon.spec	10 Dec 2009 16:24:57 -0000	1.68
@@ -7,20 +7,17 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.28.1
-Release: 2%{?dist}
+Version: 2.29.2
+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/2.28/sabayon-%{version}.tar.bz2
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.29/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
-# from upstream
-Patch1:  sabayon-2.29.2-paneldelegate-race.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=486218 
 Patch3:  selinux.patch
 
@@ -58,6 +55,10 @@ BuildRequires: autoconf
 BuildRequires: perl(XML::Parser)
 BuildRequires: pyxdg
 
+BuildRequires: gnome-doc-utils
+# scrollkeeper replacement
+BuildRequires: rarian-compat
+
 Requires(post):  shadow-utils
 Requires(preun): shadow-utils
 
@@ -91,7 +92,6 @@ that need to be installed on the client 
 %prep
 %setup -q
 
-%patch1 -p1 -b .race
 %patch3 -p1 -b .selinux
 
 
@@ -186,9 +186,9 @@ fi
 %{python_sitearch}/%{name}/storage.py
 %{python_sitearch}/%{name}/storage.pyc
 %ghost %{python_sitearch}/%{name}/storage.pyo
-%{python_sitearch}/%{name}/userdb.py
-%{python_sitearch}/%{name}/userdb.pyc
-%ghost %{python_sitearch}/%{name}/userdb.pyo
+%{python_sitearch}/%{name}/systemdb.py
+%{python_sitearch}/%{name}/systemdb.pyc
+%ghost %{python_sitearch}/%{name}/systemdb.pyo
 %{python_sitearch}/%{name}/userprofile.py
 %{python_sitearch}/%{name}/userprofile.pyc
 %ghost %{python_sitearch}/%{name}/userprofile.pyo
@@ -208,8 +208,8 @@ fi
 %ghost %{python_sitearch}/%{name}/sources/*.pyo
 
 %files
-%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
-%doc doc/sabayon.css doc/*.jpg doc/*.gif
+%doc %{_datadir}/gnome/help/sabayon/*
+%doc %{_datadir}/omf/sabayon/*
 
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
@@ -242,6 +242,9 @@ fi
 %{python_sitearch}/%{name}/gconfviewer.py
 %{python_sitearch}/%{name}/gconfviewer.pyc
 %ghost %{python_sitearch}/%{name}/gconfviewer.pyo
+%{python_sitearch}/%{name}/groupsdialog.py
+%{python_sitearch}/%{name}/groupsdialog.pyc
+%ghost %{python_sitearch}/%{name}/groupsdialog.pyo
 %{python_sitearch}/%{name}/profilesdialog.py
 %{python_sitearch}/%{name}/profilesdialog.pyc
 %ghost %{python_sitearch}/%{name}/profilesdialog.pyo
@@ -273,11 +276,11 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
-* Wed Dec  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-2
-- Fixed race conditions while catching panel events
+* Wed Dec  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.2-1
+- Update to 2.29.2
 
-* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
-- Update to 2.28.1
+* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.0-1
+- Update to 2.29.0
 
 * Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> - 2.28.0-2
 - Move errors to sabayon-apply package

selinux.patch:
 admin-tool/profilesdialog.py |    6 ++++++
 admin-tool/sabayon-apply     |    2 +-
 lib/systemdb.py              |    6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

Index: selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sabayon/F-12/selinux.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- selinux.patch	23 Oct 2009 09:40:44 -0000	1.3
+++ selinux.patch	10 Dec 2009 16:24:57 -0000	1.4
@@ -1,7 +1,8 @@
-diff -up sabayon-2.22.0/admin-tool/profilesdialog.py.selinux sabayon-2.22.0/admin-tool/profilesdialog.py
---- sabayon-2.22.0/admin-tool/profilesdialog.py.selinux	2008-03-11 16:41:44.000000000 -0400
-+++ sabayon-2.22.0/admin-tool/profilesdialog.py	2008-03-11 20:45:59.000000000 -0400
-@@ -34,6 +34,7 @@ import protosession
+diff --git a/admin-tool/profilesdialog.py b/admin-tool/profilesdialog.py
+index adf5ab4..d70dec3 100755
+--- a/admin-tool/profilesdialog.py
++++ b/admin-tool/profilesdialog.py
+@@ -35,6 +35,7 @@ import protosession
  import debuglog
  import errors
  from config import *
@@ -9,7 +10,7 @@ diff -up sabayon-2.22.0/admin-tool/profi
  
  def dprint (fmt, *args):
      debuglog.debug_log (False, debuglog.DEBUG_LOG_DOMAIN_ADMIN_TOOL, fmt % args)
-@@ -110,6 +111,11 @@ class Session (gobject.GObject):
+@@ -111,6 +112,11 @@ class Session (gobject.GObject):
      def __copy_from_user (self, user_path, profile_path):
          os.chown (user_path, os.geteuid (), os.getegid ())
          shutil.move (user_path, profile_path)
@@ -21,19 +22,33 @@ diff -up sabayon-2.22.0/admin-tool/profi
          dprint ("Moved %s back from %s", user_path, profile_path)
  
      @errors.checked_callback (debuglog.DEBUG_LOG_DOMAIN_ADMIN_TOOL)
-diff -up sabayon-2.22.0/lib/userdb.py.selinux sabayon-2.22.0/lib/userdb.py
---- sabayon-2.22.0/lib/userdb.py.selinux	2008-03-11 16:41:44.000000000 -0400
-+++ sabayon-2.22.0/lib/userdb.py	2008-03-11 20:49:35.000000000 -0400
-@@ -28,6 +28,7 @@ import random
+diff --git a/admin-tool/sabayon-apply b/admin-tool/sabayon-apply
+index 78e8407..e8b3bbf 100755
+--- a/admin-tool/sabayon-apply
++++ b/admin-tool/sabayon-apply
+@@ -147,7 +147,7 @@ if __name__ == '__main__':
+ 
+         if errors.errors_have_recoverable_error ():
+             mprint ("There were recoverable errors while applying the profile.")
+-    except:
++    except Exception:
+         errors.errors_exit_with_fatal_exception (debuglog.DEBUG_LOG_DOMAIN_SABAYON_APPLY,
+                                                  util.get_admin_log_config_filename ())
+ 
+diff --git a/lib/systemdb.py b/lib/systemdb.py
+index 75f8caa..cec79f6 100644
+--- a/lib/systemdb.py
++++ b/lib/systemdb.py
+@@ -29,6 +29,7 @@ import random
  import ldap
  import socket
  import debuglog
 +import selinux
  
- defaultConf="""<profiles>
-   <default profile=""/>
-@@ -354,6 +355,11 @@ class UserDatabase:
-             raise UserDatabaseException(
+ #
+ # Default empty config.
+@@ -359,6 +360,11 @@ class SystemDatabase(object):
+             raise SystemDatabaseException(
                  _("Failed to save UserDatabase to %s") % filename)
  
 +        if selinux.is_selinux_enabled() > 0:
@@ -44,15 +59,3 @@ diff -up sabayon-2.22.0/lib/userdb.py.se
          self.modified = 0
  
      def set_default_profile (self, profile):
-diff -up sabayon-2.28.0/admin-tool/sabayon-apply~ sabayon-2.28.0/admin-tool/sabayon-apply
---- sabayon-2.28.0/admin-tool/sabayon-apply~	2009-09-21 16:12:03.000000000 -0400
-+++ sabayon-2.28.0/admin-tool/sabayon-apply	2009-10-22 16:23:21.000000000 -0400
-@@ -115,7 +115,7 @@ if __name__ == '__main__':
- 
-         if errors.errors_have_recoverable_error ():
-             mprint ("There were recoverable errors while applying the profile.")
--    except:
-+    except Exception:
-         errors.errors_exit_with_fatal_exception (debuglog.DEBUG_LOG_DOMAIN_SABAYON_APPLY,
-                                                  util.get_admin_log_config_filename ())
- 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sabayon/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	27 Oct 2009 10:46:16 -0000	1.25
+++ sources	10 Dec 2009 16:24:57 -0000	1.26
@@ -1 +1 @@
-eaadfd1ca66677ff02114265ebff5de6  sabayon-2.28.1.tar.bz2
+961b7d2fcc196256e82a0fd80acbdee4  sabayon-2.29.2.tar.bz2


--- sabayon-2.29.2-paneldelegate-race.patch DELETED ---



From twaugh at fedoraproject.org  Thu Dec 10 16:34:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 10 Dec 2009 16:34:08 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec, 1.240,
	1.241 hplip-duplex-vs-number-up.patch, 1.1, NONE
Message-ID: <20091210163408.4DD6311C025D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26282

Modified Files:
	hplip.spec 
Removed Files:
	hplip-duplex-vs-number-up.patch 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 3.9.8-22
- Reverted fix for bug #533462 until bug #541604 is solved.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- hplip.spec	26 Nov 2009 14:36:16 -0000	1.240
+++ hplip.spec	10 Dec 2009 16:34:07 -0000	1.241
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -29,8 +29,7 @@ Patch12: hplip-retry-open.patch
 Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch15: hplip-hpcups-plugin.patch
-Patch16: hplip-duplex-vs-number-up.patch
-Patch17: hplip-bad-low-ink-warning.patch
+Patch16: hplip-bad-low-ink-warning.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -167,19 +166,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # (bug #513283).
 %patch15 -p1 -b .hpcups-plugin
 
-# Fixed duplex handling in hpcups.drv (bug #533462).
-%patch16 -p1 -b .duplex-vs-number-up
-
 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
-%patch17 -p1 -b .bad-low-ink-warning
+%patch16 -p1 -b .bad-low-ink-warning
 
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
-sed -i.flipped-duplex \
-    -e 's,\(Attribute.*cupsBackSide\),//\1,' \
-    -e 's,\(Attribute.*cupsFlipDuplex\),//\1,' \
-    prnt/drv/hpcups.drv.in
 
 %build
 aclocal
@@ -398,6 +390,9 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 3.9.8-22
+- Reverted fix for bug #533462 until bug #541604 is solved.
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-21
 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 


--- hplip-duplex-vs-number-up.patch DELETED ---



From rdieter at fedoraproject.org  Thu Dec 10 16:35:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Dec 2009 16:35:29 +0000 (UTC)
Subject: File amarok-2.2.1.90.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091210163529.85A5710F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for amarok:

0fb6c98618c91159a26e3f2e837ef132  amarok-2.2.1.90.tar.bz2



From rdieter at fedoraproject.org  Thu Dec 10 16:36:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Dec 2009 16:36:44 +0000 (UTC)
Subject: rpms/amarok/devel amarok-2.2.1.90-qtscript_not_required.patch, NONE,
	1.1 .cvsignore, 1.53, 1.54 amarok.spec, 1.175, 1.176 sources,
	1.54, 1.55 amarok-2.0.90-qtscript_not_required.patch, 1.1,
	NONE playlist_default_layout_fix.diff, 1.1, NONE
Message-ID: <20091210163644.B068611C025D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27150

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-2.2.1.90-qtscript_not_required.patch 
Removed Files:
	amarok-2.0.90-qtscript_not_required.patch 
	playlist_default_layout_fix.diff 
Log Message:
* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
- amarok-2.2.1.90 (2.2.2 beta1)


amarok-2.2.1.90-qtscript_not_required.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE amarok-2.2.1.90-qtscript_not_required.patch ---
diff -up amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required amarok-2.2.1.90/CMakeLists.txt
--- amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required	2009-12-10 04:45:37.000000000 -0600
+++ amarok-2.2.1.90/CMakeLists.txt	2009-12-10 09:42:21.253183224 -0600
@@ -75,8 +75,8 @@ if( WITH_PLAYER )
 
     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.3.0" "" )
 
-    find_package( QtScriptQtBindings REQUIRED )
-    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
+    macro_optional_find_package( QtScriptQtBindings )
+    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
 
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	12 Nov 2009 13:03:08 -0000	1.53
+++ .cvsignore	10 Dec 2009 16:36:44 -0000	1.54
@@ -1 +1 @@
-amarok-2.2.1.tar.bz2
+amarok-2.2.1.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- amarok.spec	23 Nov 2009 16:28:45 -0000	1.175
+++ amarok.spec	10 Dec 2009 16:36:44 -0000	1.176
@@ -1,19 +1,18 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.2.1
-Release: 3%{?dist}
+Version: 2.2.1.90
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch50: amarok-2.0.90-qtscript_not_required.patch
+Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: playlist_default_layout_fix.diff
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -83,7 +82,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .playlist_default_layout_fix
 
 
 %build
@@ -175,6 +173,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
+- amarok-2.2.1.90 (2.2.2 beta1)
+
 * Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1-3 
 - rebuild (for qt-4.6.0-rc1, f13+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	12 Nov 2009 13:03:08 -0000	1.54
+++ sources	10 Dec 2009 16:36:44 -0000	1.55
@@ -1 +1 @@
-4f6f45f0c25f85f2a2a1fff169ac7193  amarok-2.2.1.tar.bz2
+0fb6c98618c91159a26e3f2e837ef132  amarok-2.2.1.90.tar.bz2


--- amarok-2.0.90-qtscript_not_required.patch DELETED ---


--- playlist_default_layout_fix.diff DELETED ---



From twaugh at fedoraproject.org  Thu Dec 10 16:42:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 10 Dec 2009 16:42:14 +0000 (UTC)
Subject: rpms/hplip/F-12 hplip.spec, 1.249,
	1.250 hplip-duplex-vs-number-up.patch, 1.1, NONE
Message-ID: <20091210164214.D274F11C025D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28686

Modified Files:
	hplip.spec 
Removed Files:
	hplip-duplex-vs-number-up.patch 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-25
- Reverted fix for bug #533462 until bug #541604 is solved.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- hplip.spec	26 Nov 2009 14:34:53 -0000	1.249
+++ hplip.spec	10 Dec 2009 16:42:14 -0000	1.250
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -27,8 +27,7 @@ Patch11: hplip-device-reconnected.patch
 Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch15: hplip-hpcups-plugin.patch
-Patch16: hplip-duplex-vs-number-up.patch
-Patch17: hplip-bad-low-ink-warning.patch
+Patch16: hplip-bad-low-ink-warning.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -162,19 +161,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # (bug #513283).
 %patch15 -p1 -b .hpcups-plugin
 
-# Fixed duplex handling in hpcups.drv (bug #533462).
-%patch16 -p1 -b .duplex-vs-number-up
-
 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
-%patch17 -p1 -b .bad-low-ink-warning
+%patch16 -p1 -b .bad-low-ink-warning
 
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
-sed -i.flipped-duplex \
-    -e 's,\(Attribute.*cupsBackSide\),//\1,' \
-    -e 's,\(Attribute.*cupsFlipDuplex\),//\1,' \
-    prnt/drv/hpcups.drv.in
 
 %build
 aclocal
@@ -379,6 +371,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-25
+- Reverted fix for bug #533462 until bug #541604 is solved.
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-24
 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 


--- hplip-duplex-vs-number-up.patch DELETED ---



From twaugh at fedoraproject.org  Thu Dec 10 16:44:09 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 10 Dec 2009 16:44:09 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec, 1.248,
	1.249 hplip-duplex-vs-number-up.patch, 1.1, NONE
Message-ID: <20091210164409.DC7A811C025D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29496

Modified Files:
	hplip.spec 
Removed Files:
	hplip-duplex-vs-number-up.patch 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 3.9.10-5
- Reverted fix for bug #533462 until bug #541604 is solved.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- hplip.spec	26 Nov 2009 14:33:07 -0000	1.248
+++ hplip.spec	10 Dec 2009 16:44:09 -0000	1.249
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -13,7 +13,6 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
-Patch1: hplip-duplex-vs-number-up.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
@@ -110,9 +109,6 @@ SANE driver for scanners in HP's multi-f
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Fixed duplex handling in hpcups.drv (bug #533462).
-%patch1 -p1 -b .duplex-vs-number-up
-
 # Fix compilation.
 %patch2 -p1 -b .strstr-const
 
@@ -141,10 +137,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
-sed -i.flipped-duplex \
-    -e 's,\(Attribute.*cupsBackSide\),//\1,' \
-    -e 's,\(Attribute.*cupsFlipDuplex\),//\1,' \
-    prnt/drv/hpcups.drv.in
 
 %build
 %configure \
@@ -346,6 +338,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 3.9.10-5
+- Reverted fix for bug #533462 until bug #541604 is solved.
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.10-4
 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 


--- hplip-duplex-vs-number-up.patch DELETED ---



From rdieter at fedoraproject.org  Thu Dec 10 16:54:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Dec 2009 16:54:59 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.82,1.83
Message-ID: <20091210165459.7654211C025D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32144

Modified Files:
	k3b.spec 
Log Message:
fix build



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- k3b.spec	10 Dec 2009 15:30:28 -0000	1.82
+++ k3b.spec	10 Dec 2009 16:54:59 -0000	1.83
@@ -75,7 +75,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: qt4%{?_isa} >= %{_qt4_version}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.
 
@@ -108,7 +108,6 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang k3b --with-kde || touch k3b.lang
-cat k3b*.lang > all.lang
 
 
 %check
@@ -130,21 +129,23 @@ if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %posttrans %{?common:common}
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
-%files %{?!common:-f all.lang}
+%files %{?!common:-f k3b.lang}
 %defattr(-,root,root,-)
 %doc AUTHORS README COPYING TODO ChangeLog
 %{_kde4_bindir}/k3b
 %{_kde4_libdir}/kde4/*.so
 
 %if 0%{?common}
-%files common -f all.lang
+%files common -f k3b.lang
 %endif
 %{_kde4_appsdir}/k3b/
 %{_kde4_appsdir}/konqsidebartng/virtual_folders/services/*.desktop
@@ -156,6 +157,7 @@ update-desktop-database -q &> /dev/null
 %{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
 %{_kde4_datadir}/sounds/k3b_*
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_datadir}/mime/packages/x-k3b.xml
 
 %files libs
 %defattr(-,root,root,-)



From cwickert at fedoraproject.org  Thu Dec 10 17:06:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Dec 2009 17:06:34 +0000 (UTC)
Subject: File Terminal-0.4.3.tar.bz2 uploaded to lookaside cache by cwickert
Message-ID: <20091210170634.ACCA510F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for Terminal:

0ce66b16bcb7ff274d7f93a69993f717  Terminal-0.4.3.tar.bz2



From mkasik at fedoraproject.org  Thu Dec 10 17:20:09 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Thu, 10 Dec 2009 17:20:09 +0000 (UTC)
Subject: rpms/cups-pk-helper/F-12
	cups-pk-helper-add-printer-ppd-optional.patch, NONE,
	1.1 cups-pk-helper.spec, 1.15, 1.16
Message-ID: <20091210172009.A2E5F11C03E3@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7922

Modified Files:
	cups-pk-helper.spec 
Added Files:
	cups-pk-helper-add-printer-ppd-optional.patch 
Log Message:
* Thu Dec 10 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-10
- Fix adding of printers without specification of ppd-name.
- Patch by Tim Waugh.
- Resolves: #545452


cups-pk-helper-add-printer-ppd-optional.patch:
 cups.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE cups-pk-helper-add-printer-ppd-optional.patch ---
--- cups-pk-helper-0.0.4/src/cups.c	2009-12-10 15:08:12.000000000 +0100
+++ cups-pk-helper-0.0.4/src/cups.c	2009-12-10 15:09:00.000000000 +0100
@@ -998,9 +998,11 @@ cph_cups_printer_add (CphCups    *cups,
 
         ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                       "printer-name", NULL, printer_name);
-        ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
-                      "ppd-name", NULL, ppd_file);
 
+        if (ppd_file && ppd_file[0] != '\0') {
+                ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
+                              "ppd-name", NULL, ppd_file);
+        }
         if (printer_uri && printer_uri[0] != '\0') {
                 ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
                               "device-uri", NULL, printer_uri);


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-12/cups-pk-helper.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cups-pk-helper.spec	3 Dec 2009 13:31:35 -0000	1.15
+++ cups-pk-helper.spec	10 Dec 2009 17:20:08 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -14,6 +14,7 @@ Patch2:         polkit_result.patch
 Patch3:         edit_job.patch
 Patch4:         cups-pk-helper-ppd-name.patch
 Patch5:         allow_authentication.patch
+Patch6:         cups-pk-helper-add-printer-ppd-optional.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,6 +50,7 @@ interfaces available under control of Po
 %patch3 -p1 -b .edit-job
 %patch4 -p1 -b .ppd-name
 %patch5 -p1 -b .allow_auth
+%patch6 -p1 -b .ppd
 
 %build
 # Patch0 modifies configure.ac
@@ -78,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-10
+- Fix adding of printers without specification of ppd-name.
+- Patch by Tim Waugh.
+- Resolves: #545452
+
 * Thu Dec  3 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-9
 - Allow inactive users and any user to authenticate
 - Resolves: #543085



From rjones at fedoraproject.org  Thu Dec 10 17:27:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 10 Dec 2009 17:27:56 +0000 (UTC)
Subject: rpms/vhostmd/devel vhostmd.conf,1.4,1.5 vhostmd.spec,1.8,1.9
Message-ID: <20091210172756.9D75811C025D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10540

Modified Files:
	vhostmd.conf vhostmd.spec 
Log Message:
Fix the PagedOutMemory and PagedInMemory stats to report MB instead of pages (fixes supplied by Joachim Schneider).


Index: vhostmd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vhostmd.conf	17 Nov 2009 11:16:24 -0000	1.4
+++ vhostmd.conf	10 Dec 2009 17:27:55 -0000	1.5
@@ -43,12 +43,18 @@ within the vm element.
     </metric>
     <metric type="string" context="host">
       <name>VirtualizationVendor</name>
-      <action>rpm -qi libvirt| grep Vendor: |awk '{print substr($0, index($0,$5)) }'</action>
+      <action>
+        rpm -qi libvirt| grep Vendor:   \
+          | gawk '{print substr($0, index($0,$5)) }'
+      </action>
     </metric>
     <!-- SAP "CIM"  -->
     <metric type="string" context="host">
       <name>VirtProductInfo</name>
-      <action>virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}'</action>
+      <action>
+        virsh -r CONNECT version | grep API   \
+          | gawk -F': ' '{print $2}'
+      </action>
     </metric>
     <!-- SAP "CIM"  -->
     <metric type="string" context="host">
@@ -58,61 +64,84 @@ within the vm element.
     <!-- SAP "CIM"  -->
     <metric type="uint32" context="host">
       <name>NumberOfPhysicalCPUsUtilized</name>
-      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>
+        virsh -r CONNECT nodeinfo | grep 'CPU(s):'    \
+          | gawk -F': +' '{print $2}'
+      </action>
     </metric>
     <!-- SAP "CIM"  -->
     <metric type="uint64" context="host">
       <name>MemoryAllocatedToVirtualServers</name>
-      <action>virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{ printf "%d\n", $3/1024 }'</action>
+      <action>
+        virsh -r CONNECT nodeinfo | grep 'Memory size:'   \
+          | gawk -F' +' '{ printf "%d\n", $3/1024 }'
+      </action>
     </metric>
     <!-- SAP "CIM"  -->
     <metric type="uint64" context="host">
       <name>FreePhysicalMemory</name>
       <action>
-        free|egrep -i '^[[:space:]]*(Mem:)'                          \
-        |awk 'BEGIN { sum = 0; }
+        free|egrep -i '^[[:space:]]*(Mem:)'   \
+          | gawk 'BEGIN { sum = 0; }
               { sum += $4; }
-              END { printf "%10d\n", sum/1024; }'
+              END { printf "%d\n", sum/1024; }'
       </action>
     </metric>
     <metric type="uint64" context="host">
       <name>UsedPhysicalMemory</name>
       <action>
-        free|egrep -i '^[[:space:]]*(Mem:)'                          \
-        |awk 'BEGIN { sum = 0; }
+        free|egrep -i '^[[:space:]]*(Mem:)'   \
+          | gawk 'BEGIN { sum = 0; }
               { sum += $3; }
-              END { printf "%10d\n", sum/1024; }'
+              END { printf "%d\n", sum/1024; }'
       </action>
     </metric>
     <!-- SAP "CIM"  -->
     <metric type="uint64" context="host">
       <name>FreeVirtualMemory</name>
       <action>
-        free|egrep -i '^[[:space:]]*(Mem:|Swap:)'                    \
-        |awk 'BEGIN { sum = 0; }
+        free|egrep -i '^[[:space:]]*(Mem:|Swap:)'   \
+          | gawk 'BEGIN { sum = 0; }
               { sum += $4; }
-              END { printf "%10d\n", sum/1024; }'
+              END { printf "%d\n", sum/1024; }'
       </action>
     </metric>
     <!-- SAP "CIM"  -->
     <metric type="uint64" context="host">
       <name>UsedVirtualMemory</name>
       <action>
-        free|egrep -i '^[[:space:]]*(Mem:|Swap:)'                    \
-        |awk 'BEGIN { sum = 0; }
+        free|egrep -i '^[[:space:]]*(Mem:|Swap:)'   \
+          | gawk 'BEGIN { sum = 0; }
               { sum += $3; }
-              END { printf "%10d\n", sum/1024; }'
+              END { printf "%d\n", sum/1024; }'
       </action>
     </metric>
     <metric type="uint64" context="host">
       <name>PagedInMemory</name>
-      <action>echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))"</action>
+      <action>
+        vmstat -s | gawk 'BEGIN {
+                        cmd = "getconf PAGESIZE";
+                        cmd | getline pagesize;
+                        close(cmd);
+                      }
+                      /pages swapped in/ {
+                        printf "%d\n", $1 / 1024 * pagesize / 1024;
+                      }'
+      </action>
     </metric>
     <!-- SAP "CIM"  -->
     <metric type="uint64" context="host">
-      <!-- TODO:  CHECK -->
       <name>PagedOutMemory</name>
-      <action>echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))"</action>
+      <action>
+        vmstat -s | gawk 'BEGIN {
+                        cmd = "getconf PAGESIZE";
+                        cmd | getline pagesize;
+                        close(cmd);
+                      }
+                      /pages swapped out/ {
+                        printf "%d\n", $1 / 1024 * pagesize / 1024;
+                      }'
+      </action>
     </metric>
     <metric type="group" context="host">
       <name>PageRates</name>
@@ -123,32 +152,45 @@ within the vm element.
     </metric>
     <!--<metric type="real64" context="host">
       <name>TotalCPUTime</name>
-      <action>virsh -r CONNECT dominfo 0 | sed 's/: */:/' | \
-                  gawk -F: '/CPU time/ {print $2;}'</action>
+      <action>
+        virsh -r CONNECT dominfo 0 | sed 's/: */:/'   \
+          | gawk -F: '/CPU time/ {print $2;}'
+      </action>
     </metric>-->
     <!-- SAP "CIM"  -->
     <metric type="real64" context="vm">
       <name>TotalCPUTime</name>
-      <action>virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \
-        gawk -F: '/CPU time/ {print $2;}'</action>
+      <action>
+        virsh -r CONNECT dominfo NAME | sed 's/: */:/'    \
+          | gawk -F: '/CPU time/ {print $2;}'
+      </action>
     </metric>
     <metric type="uint32" context="vm">
       <name>NumberOfAssignedPhysicalCPUs</name>
-      <action>virsh -r CONNECT dominfo NAME | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>
+        virsh -r CONNECT dominfo NAME | grep 'CPU(s):'    \
+          | gawk -F': +' '{print $2}'
+      </action>
     </metric>
     <!-- SAP "CIM"  -->
     <metric type="uint64" context="vm">
       <name>PhysicalMemoryAllocatedToVirtualSystem</name>
-      <action>virsh -r CONNECT dominfo NAME | grep 'Max memory:' | gawk -F' +' '{printf "%d\n", $3/1024}'</action>
+      <action>
+        virsh -r CONNECT dominfo NAME | grep 'Max memory:'    \
+          | gawk -F' +' '{printf "%d\n", $3/1024}'
+      </action>
     </metric>
     <!-- will only be supported by Fedora -->
     <!-- <metric type="uint64" context="vm">
       <name>UsedMem</name>
-      <action>virsh -r CONNECT dominfo NAME | grep 'Used memory:' | gawk -F' +' '{printf "%d\n", $3/1024}'</action>
+      <action>
+        virsh -r CONNECT dominfo NAME | grep 'Used memory:'   \
+          | gawk -F' +' '{printf "%d\n", $3/1024}'
+      </action>
     </metric> -->
   </metrics>
 </vhostmd>
 <!--
-  vi:ts=2:sw=2:expandtab:ignorecase:
+  vi:ts=2:sw=2:expandtab:ignorecase:nu:ruler
 -->
 <!-- EOF -->


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- vhostmd.spec	9 Dec 2009 15:33:09 -0000	1.8
+++ vhostmd.spec	10 Dec 2009 17:27:55 -0000	1.9
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -183,6 +183,10 @@ exit 0
 
 
 %changelog
+* Thu Dec 10 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-2
+- Fix the PagedOutMemory and PagedInMemory stats to report MB instead
+  of pages (fixes supplied by Joachim Schneider).
+
 * Wed Dec  9 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-1
 - vhostmd didn't chdir ("/") when daemonizing.  Fixed in this 0.4 release.
 



From stefansf at fedoraproject.org  Thu Dec 10 17:33:37 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Thu, 10 Dec 2009 17:33:37 +0000 (UTC)
Subject: File sec-2.5.3.tar.gz uploaded to lookaside cache by stefansf
Message-ID: <20091210173337.4905D10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sec:

11bb84273daf24d265a96624ab6413ca  sec-2.5.3.tar.gz



From stefansf at fedoraproject.org  Thu Dec 10 17:35:42 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Thu, 10 Dec 2009 17:35:42 +0000 (UTC)
Subject: rpms/sec/devel .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sec.spec,
	1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20091210173543.0626E11C025D@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/sec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13029/devel

Modified Files:
	.cvsignore import.log sec.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Oct 2009 07:35:39 -0000	1.5
+++ .cvsignore	10 Dec 2009 17:35:42 -0000	1.6
@@ -1 +1 @@
-sec-2.5.2.tar.gz
+sec-2.5.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Oct 2009 07:35:40 -0000	1.1
+++ import.log	10 Dec 2009 17:35:42 -0000	1.2
@@ -1 +1,2 @@
 sec-2_5_2-1_fc11:HEAD:sec-2.5.2-1.fc11.src.rpm:1254555264
+sec-2_5_3-0_fc11:HEAD:sec-2.5.3-0.fc11.src.rpm:1260466421


Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/sec.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sec.spec	7 Nov 2009 09:35:20 -0000	1.9
+++ sec.spec	10 Dec 2009 17:35:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           sec
-Version:        2.5.2
-Release:        1%{?dist}
+Version:        2.5.3
+Release:        0%{?dist}
 Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/sec.1*
 
 %changelog
+* Thu Dec 10 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.3-0
+- New upstream release
+
 * Tue Sep 29 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-1
 - New upstream release
 - SPEC file cleanup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Oct 2009 07:35:41 -0000	1.5
+++ sources	10 Dec 2009 17:35:42 -0000	1.6
@@ -1 +1 @@
-0e5e3c2e4e3ef6c21fc32a809c6263bb  sec-2.5.2.tar.gz
+11bb84273daf24d265a96624ab6413ca  sec-2.5.3.tar.gz



From deji at fedoraproject.org  Thu Dec 10 17:37:48 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 10 Dec 2009 17:37:48 +0000 (UTC)
Subject: rpms/mpich2/devel mpich2.spec,1.16,1.17
Message-ID: <20091210173749.031F311C025D@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13968

Modified Files:
	mpich2.spec 
Log Message:
* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
- Remove the *.a libs that have the shared version



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mpich2.spec	26 Nov 2009 14:50:24 -0000	1.16
+++ mpich2.spec	10 Dec 2009 17:37:48 -0000	1.17
@@ -181,7 +181,7 @@ done
 rm -rf %{buildroot}%{_sbindir}/mpe*
 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-
+rm -f %{_libdir}/%{name}/lib/lib*mpich*.a
 
 %clean
 rm -rf %{buildroot}
@@ -321,6 +321,9 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
+- Remove the *.a libs that have the shared version
+
 * Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
 - More fixes the mpich2.module patch.
 



From sharkcz at fedoraproject.org  Thu Dec 10 17:48:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 10 Dec 2009 17:48:03 +0000 (UTC)
Subject: rpms/s390utils/F-12 0015-s390tools-1.8.2-zipl-dm.patch, NONE,
	1.1 0016-s390tools-1.8.2-lsreipl-nss.patch, NONE,
	1.1 s390utils.spec, 1.15, 1.16
Message-ID: <20091210174803.9EC1F11C025D@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17378

Modified Files:
	s390utils.spec 
Added Files:
	0015-s390tools-1.8.2-zipl-dm.patch 
	0016-s390tools-1.8.2-lsreipl-nss.patch 
Log Message:
- added device-mapper support into zipl (#546280)
- added missing check and print NSS name in case an NSS has been IPLed (#546297)


0015-s390tools-1.8.2-zipl-dm.patch:
 include/disk.h                |   25 +
 include/install.h             |    9 
 include/job.h                 |   17 
 include/scan.h                |   19 -
 man/zipl.8                    |   88 +++++
 man/zipl.conf.5               |   71 ++++
 src/Makefile                  |    1 
 src/bootmap.c                 |   70 +---
 src/disk.c                    |  242 +++++++++++---
 src/install.c                 |   11 
 src/job.c                     |  362 ++++++++++++++++++++-
 src/scan.c                    |  262 ++++++++++++++-
 src/zipl.c                    |   13 
 src/zipl_helper.device-mapper |  717 +++++++++++++++++++++++++++++++++++++++++-
 14 files changed, 1759 insertions(+), 148 deletions(-)

--- NEW FILE 0015-s390tools-1.8.2-zipl-dm.patch ---
>From e089f907d7ba7f18479eaff61852171842a219e2 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 10 Dec 2009 18:27:58 +0100
Subject: [PATCH 15/16] s390tools-1.8.2-zipl-dm

device mapper support for zipl
---
 zipl/include/disk.h                |   25 ++-
 zipl/include/install.h             |    9 +-
 zipl/include/job.h                 |   17 +-
 zipl/include/scan.h                |   19 +-
 zipl/man/zipl.8                    |   88 +++++-
 zipl/man/zipl.conf.5               |   71 ++++-
 zipl/src/Makefile                  |    1 +
 zipl/src/bootmap.c                 |   70 ++---
 zipl/src/disk.c                    |  242 ++++++++++---
 zipl/src/install.c                 |   11 +-
 zipl/src/job.c                     |  362 +++++++++++++++++-
 zipl/src/scan.c                    |  262 ++++++++++++-
 zipl/src/zipl.c                    |   13 +-
 zipl/src/zipl_helper.device-mapper |  716 ++++++++++++++++++++++++++++++++++++
 14 files changed, 1759 insertions(+), 147 deletions(-)
 create mode 100644 zipl/src/zipl_helper.device-mapper

diff --git a/zipl/include/disk.h b/zipl/include/disk.h
index c5179b7..4b39698 100644
--- a/zipl/include/disk.h
+++ b/zipl/include/disk.h
@@ -2,7 +2,7 @@
  * s390-tools/zipl/include/disk.h
  *   Functions to handle disk layout specific operations.
  *
- * Copyright IBM Corp. 2001, 2006.
+ * Copyright IBM Corp. 2001, 2009.
  *
  * Author(s): Carsten Otte <cotte at de.ibm.com>
  *            Peter Oberparleiter <Peter.Oberparleiter at de.ibm.com>
@@ -59,6 +59,19 @@ struct hd_geometry {
 	unsigned long start;
 };
 
+/* Disk information source */
+typedef enum {
+	source_auto,
+	source_user,
+	source_script
+} source_t;
+
+/* targetbase definition */
+typedef enum {
+	defined_as_device,
+	defined_as_name
+} definition_t;
+
 /* Disk information type */
 struct disk_info {
 	disk_type_t type;
@@ -72,11 +85,17 @@ struct disk_info {
 	struct hd_geometry geo;
 	char* name;
 	char* drv_name;
+	source_t source;
+	definition_t targetbase;
 };
 
+struct job_target_data;
 
-int disk_get_info(const char* device, struct disk_info** info);
-int disk_get_info_from_file(const char* filename, struct disk_info** info);
+int disk_get_info(const char* device, struct job_target_data* target,
+		  struct disk_info** info);
+int disk_get_info_from_file(const char* filename,
+			    struct job_target_data* target,
+			    struct disk_info** info);
 void disk_free_info(struct disk_info* info);
 char* disk_get_type_name(disk_type_t type);
 int disk_is_large_volume(struct disk_info* info);
diff --git a/zipl/include/install.h b/zipl/include/install.h
index ba31bff..5504deb 100644
--- a/zipl/include/install.h
+++ b/zipl/include/install.h
@@ -2,7 +2,7 @@
  * s390-tools/zipl/include/install.h
  *   Functions handling the installation of the boot loader code onto disk.
  *
- * Copyright IBM Corp. 2001, 2006.
+ * Copyright IBM Corp. 2001, 2009.
  *
  * Author(s): Carsten Otte <cotte at de.ibm.com>
  *            Peter Oberparleiter <Peter.Oberparleiter at de.ibm.com>
@@ -24,8 +24,9 @@ int install_tapeloader(const char* device, const char* image,
 		       const char* parmline, const char* ramdisk,
 		       address_t image_addr, address_t parm_addr,
 		       address_t initrd_addr);
-int install_dump(const char* device, uint64_t mem);
-int install_mvdump(char* const device[], int device_count, uint64_t mem,
-		   uint8_t force);
+int install_dump(const char* device, struct job_target_data* target,
+		 uint64_t mem);
+int install_mvdump(char* const device[], struct job_target_data* target,
+		   int device_count, uint64_t mem, uint8_t force);
 
 #endif /* INSTALL_H */
diff --git a/zipl/include/job.h b/zipl/include/job.h
index 824ffc4..cf881db 100644
--- a/zipl/include/job.h
+++ b/zipl/include/job.h
@@ -3,7 +3,7 @@
  *   Functions and data structures representing the actual 'job' that the
  *   user wants us to execute.
  *
- * Copyright IBM Corp. 2001, 2006.
+ * Copyright IBM Corp. 2001, 2009.
  *
  * Author(s): Carsten Otte <cotte at de.ibm.com>
  *            Peter Oberparleiter <Peter.Oberparleiter at de.ibm.com>
@@ -13,6 +13,7 @@
 #define JOB_H
 
 #include "zipl.h"
+#include "disk.h"
 
 
 enum job_id {
@@ -27,6 +28,17 @@ enum job_id {
 	job_mvdump = 9,
 };
 
+struct job_target_data {
+	char* bootmap_dir;
+	char* targetbase;
+	disk_type_t targettype;
+	int targetcylinders;
+	int targetheads;
+	int targetsectors;
+	int targetblocksize;
+	blocknum_t targetoffset;
+};
+
 struct job_ipl_data {
 	char* image;
 	char* parmline;
@@ -94,7 +106,7 @@ struct job_menu_data {
 
 struct job_data {
 	enum job_id id;
-	char* bootmap_dir;
+	struct job_target_data target;
 	char* name;
 	union {
 		struct job_ipl_data ipl;
@@ -115,5 +127,6 @@ struct job_data {
 
 int job_get(int argc, char* argv[], struct job_data** data);
 void job_free(struct job_data* job);
+int type_from_target(char *target, disk_type_t *type);
 
 #endif /* not JOB_H */
diff --git a/zipl/include/scan.h b/zipl/include/scan.h
index b1c0e3a..ed5714e 100644
--- a/zipl/include/scan.h
+++ b/zipl/include/scan.h
@@ -2,7 +2,7 @@
  * s390-tools/zipl/include/scan.h
  *   Scanner for zipl.conf configuration files
  *
- * Copyright IBM Corp. 2001, 2006.
+ * Copyright IBM Corp. 2001, 2009.
  *
  * Author(s): Carsten Otte <cotte at de.ibm.com>
  *            Peter Oberparleiter <Peter.Oberparleiter at de.ibm.com>
@@ -15,7 +15,7 @@
 
 
 #define SCAN_SECTION_NUM		7
-#define SCAN_KEYWORD_NUM		14
+#define SCAN_KEYWORD_NUM		19
 
 enum scan_id {
 	scan_id_empty = 0,
@@ -40,6 +40,11 @@ enum scan_keyword_id {
 	scan_keyword_defaultmenu = 11,
 	scan_keyword_tape	= 12,
 	scan_keyword_mvdump	= 13,
+	scan_keyword_targetbase = 14,
+	scan_keyword_targettype = 15,
+	scan_keyword_targetgeometry = 16,
+	scan_keyword_targetblocksize = 17,
+	scan_keyword_targetoffset = 18,
 };
 
 enum scan_section_type {
@@ -53,6 +58,14 @@ enum scan_section_type {
 	section_mvdump		= 6,
 };
 
+enum scan_target_type {
+	target_type_invalid	= -1,
+	target_type_scsi	= 0,
[...2317 lines suppressed...]
+			$type = $DEV_TYPE_LDL;
+		} elsif ($format == 2) {
+			$type = $DEV_TYPE_CDL;
+		}
+	}
+
+	return ($type, $cyl, $heads, $sectors);
+}
+
+# get_partition_start(device)
+# Return the partition offset of device.
+sub get_partition_start($)
+{
+	my ($dev) = @_;
+	my $line;
+	my $offset;
+	local *HANDLE;
+
+	open(HANDLE, "$blockdev --report $dev 2>/dev/null|") or
+		return undef;
+	$line = <HANDLE>;
+	if ($line =~ /RO\s+RA\s+SSZ\s+BSZ\s+StartSec\s+Size\s+Device/) {
+		$line = <HANDLE>;
+		if ($line =~ /^\S+\s+\d+\s+\d+\s+\d+\s+(\d+)/) {
+			$offset = $1;
+		}
+	}
+	close(HANDLE);
+	return $offset;
+}
+
+# is_dasd(type)
+# Return whether disk with type is a DASD.
+sub is_dasd($)
+{
+	my ($type) = @_;
+
+	return ($type == $DEV_TYPE_CDL) || ($type == $DEV_TYPE_LDL) ||
+	       ($type == $DEV_TYPE_FBA);
+}
+
+# get_partition_base(type, major, minor)
+# Return (major, minor) of the base device on which the partition is located.
+sub get_partition_base($$$)
+{
+	my ($type, $major, $minor) = @_;
+
+	if (is_dasd($type)) {
+		return ($major, $minor & ~$DASD_PARTN_MASK);
+	} else {
+		return ($major, $minor & ~$SCSI_PARTN_MASK);
+	}
+}
+
+# get_device_characteristics(major, minor)
+# Returns (type, blocksize, geometry, bootsectors, partstart) for device.
+sub get_device_characteristics($$)
+{
+	my ($major, $minor) = @_;
+	my $dev;
+	my $blocksize;
+	my $type;
+	my $cyl;
+	my $heads;
+	my $sectors;
+	my $geometry;
+	my $bootsectors;
+	my $partstart;
+
+	$dev = create_temp_device_node("b", $major, $minor);
+	$blocksize = get_blocksize($dev);
+	if (!defined($blocksize)) {
+		unlink($dev);
+		die("Error: Could not get block size for ".
+		    get_device_name($major, $minor)."\n");
+	}
+	($type, $cyl, $heads, $sectors) = get_dasd_info($dev);
+	if (defined($type)) {
+		$geometry = "$cyl,$heads,$sectors";
+		if ($type == $DEV_TYPE_CDL) {
+			# First track contains IPL records
+			$bootsectors = $blocksize * $sectors / $SECTOR_SIZE;
+		} elsif ($type == $DEV_TYPE_LDL) {
+			# First two blocks contain IPL records
+			$bootsectors = $blocksize * 2 / $SECTOR_SIZE;
+		} elsif ($type == $DEV_TYPE_FBA) {
+			# First block contains IPL records
+			$bootsectors = $blocksize / $SECTOR_SIZE;
+		}
+	} else {
+		# Assume SCSI if get_dasd_info failed
+		$type = $DEV_TYPE_SCSI;
+		# First block contains IPL records
+		$bootsectors = $blocksize / $SECTOR_SIZE;
+	}
+	$partstart = get_partition_start($dev);
+	unlink($dev);
+	if (!defined($partstart)) {
+		die("Error: Could not determine partition start for ".
+		    get_device_name($major, $minor)."\n");
+	}
+	return ($type, $blocksize, $geometry, $bootsectors, $partstart);
+}
+
+# get_type_name(type)
+# Return textual representation of device type.
+sub get_type_name($)
+{
+	my ($type) = @_;
+
+	if ($type == $DEV_TYPE_CDL) {
+		return "CDL";
+	} elsif ($type == $DEV_TYPE_LDL) {
+		return "LDL";
+	} elsif ($type == $DEV_TYPE_FBA) {
+		return "FBA";
+	} elsif ($type == $DEV_TYPE_SCSI) {
+		return "SCSI";
+	}
+	return undef;
+}
+
+
+# check_for_mirror(index, target_list)
+# Die if there is a mirror target between index and 0.
+sub check_for_mirror($@)
+{
+	my ($i, @target_list) = @_;
+
+	for (;$i >= 0; $i--) {
+		my $entry = $target_list[$i];
+		my ($major, $minor, $target) = @$entry;
+
+		if ($target->[$TARGET_TYPE] == $TARGET_TYPE_MIRROR) {
+			# IPL records are not mirrored.
+			die("Error: Unsupported setup: Block 0 is not ".
+			    "mirrored in device '".
+			    get_device_name($major, $minor)."'\n");
+		}
+	}
+}
+
+# get_target_base(bottom_major, bottom_minor, start, length, target_list)
+# Return (major, minor) for the top most target in the target list that maps
+# the region on (bottom_major, bottom_minor) defined by start and length at
+# offset 0.
+sub get_target_base($$$$@)
+{
+	my ($bot_major, $bot_minor, $start, $length, @target_list) = @_;
+	my $entry;
+	my $top_major;
+	my $top_minor;
+	my $i;
+
+	# Pre-initialize with bottom major-minor
+	$top_major = $bot_major;
+	$top_minor = $bot_minor;
+	# Process all entries starting with the last one
+	for ($i = scalar(@target_list) - 1; $i >= 0; $i--) {
+		my $entry = $target_list[$i];
+		my ($major, $minor, $target) = @$entry;
+
+		if (($target->[$TARGET_START] != 0) ||
+		    (get_target_start($target) != 0) ||
+		    ($target->[$TARGET_LENGTH] < $length)) {
+			last;
+		}
+		$top_major = $major;
+		$top_minor = $minor;
+	}
+	# Check for mirrorring between base device and fs device.
+	check_for_mirror($i, @target_list);
+	return ($top_major, $top_minor);
+}
+
+# get_device_name(major, minor)
+# Return the name of the device specified by major and minor.
+sub get_device_name($$)
+{
+	my ($major, $minor) = @_;
+	my $name;
+	local *HANDLE;
+
+	$name = "$major:$minor";
+	open(HANDLE, "</proc/partitions") or goto out;
+	while (<HANDLE>) {
+		if (/^\s*(\d+)\s+(\d+)\s+\d+\s+(\S+)\s*$/) {
+			if (($major == $1) && ($minor == $2)) {
+				$name = $3;
+				last;
+			}
+		}
+	}
+	close(HANDLE);
+out:
+	return $name;
+}
-- 
1.6.3.3


0016-s390tools-1.8.2-lsreipl-nss.patch:
 ccw.c     |   42 ++++++++++++++++++------------------------
 chreipl.h |    9 ++++++---
 fcp.c     |   13 +++++++------
 ipl.c     |   57 +++++++++++++++++++++++++++++++++++----------------------
 main.c    |   25 +++++++++++++++++++------
 system.c  |    4 ++--
 6 files changed, 87 insertions(+), 63 deletions(-)

--- NEW FILE 0016-s390tools-1.8.2-lsreipl-nss.patch ---
>From 62fb535a68f1df693869e4361150259b42c6f211 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 10 Dec 2009 18:30:52 +0100
Subject: [PATCH 16/16] s390tools-1.8.2-lsreipl-nss

---
 ipl_tools/ccw.c     |   42 ++++++++++++++++---------------------
 ipl_tools/chreipl.h |    9 +++++--
 ipl_tools/fcp.c     |   13 ++++++-----
 ipl_tools/ipl.c     |   57 +++++++++++++++++++++++++++++++-------------------
 ipl_tools/main.c    |   25 +++++++++++++++++-----
 ipl_tools/system.c  |    3 +-
 6 files changed, 87 insertions(+), 62 deletions(-)

diff --git a/ipl_tools/ccw.c b/ipl_tools/ccw.c
index 7959831..eef4550 100644
--- a/ipl_tools/ccw.c
+++ b/ipl_tools/ccw.c
@@ -52,22 +52,19 @@ int isccwdev(const char *devno)
 }
 
 
-int get_ccw_devno_old_sysfs(char *device, char *devno)
+int get_ccw_devno_old_sysfs(char *device)
 {
 	FILE *filp;
-	int len, errorpath, rc;
+	int errorpath;
 	char path1[4096];
 	char buf[4096];
-	char *match, *s1, *s2;
+	char *match = NULL, *s1, *s2;
 
 	errorpath = 1;
-	rc = 0;
 	sprintf(path1, "/sys/block/%s/uevent", device);
 	filp = fopen(path1, "r");
-	if (!filp) {
-		rc = -1;
-		return rc;
-	}
+	if (!filp)
+		return -1;
 	/*
 	 * the uevent file contains an entry like this:
 	 * PHYSDEVPATH=/devices/css0/0.0.206a/0.0.7e78
@@ -77,16 +74,16 @@ int get_ccw_devno_old_sysfs(char *device, char *devno)
 		if (match != NULL)
 			break;
 	}
+	fclose(filp);
+	if (!match)
+		return -1;
 	s1 =  strchr(buf, '/');
 	s2 =  strrchr(buf, '/');
-	len = s2-s1;
-	strncpy(devno, s2 + 1, sizeof(devno));
-	devno[len] = '\0';
-	fclose(filp);
+	strncpy(devno, s2 + 1, sizeof(devno) - 1);
 	return 0;
 }
 
-int get_ccw_devno_new_sysfs(char *device, char *devno)
+int get_ccw_devno_new_sysfs(char *device)
 {
 	int len, errorpath, rc;
 	char path2[4096];
@@ -119,8 +116,7 @@ int get_ccw_devno_new_sysfs(char *device, char *devno)
 			return rc;
 		}
 	}
-	strncpy(devno, s2 + 1, sizeof(devno));
-	devno[len] = '\0';
+	strncpy(devno, s2 + 1, sizeof(devno) - 1);
 	return 0;
 }
 
@@ -134,16 +130,14 @@ int get_ccw_devno_new_sysfs(char *device, char *devno)
  *
  * This does not work when booting from tape
  */
-int get_ccw_devno(char *device, char *devno)
+int get_ccw_devno(char *device)
 {
-    if (get_ccw_devno_old_sysfs(device, devno) != 0) {
-	if (get_ccw_devno_new_sysfs(device, devno) != 0) {
-		fprintf(stderr, "%s: Failed to lookup the device number\n",
-			name);
-		return -1;
-	}
-    }
-    return 0;
+	if (get_ccw_devno_old_sysfs(device) == 0)
+		return 0;
+	if (get_ccw_devno_new_sysfs(device) == 0)
+		return 0;
+	fprintf(stderr, "%s: Failed to lookup the device number\n", name);
+	return -1;
 }
 
 int get_ccw_dev(char *partition, char *device)
diff --git a/ipl_tools/chreipl.h b/ipl_tools/chreipl.h
index 19a83eb..37807a7 100644
--- a/ipl_tools/chreipl.h
+++ b/ipl_tools/chreipl.h
@@ -34,6 +34,9 @@ extern char saction[8];
 extern char name[256];
 extern int action;
 
+#define IPL_TYPE_LEN_MAX	100
+#define NSS_NAME_LEN_MAX	8
+
 #define ACT_CCW		1
 #define ACT_FCP		2
 #define ACT_NODE	3
@@ -63,10 +66,10 @@ int is_valid_case(char *c);
 int is_valid_action(char *action);
 void parse_shutdown_options(int argc, char **argv);
 void strlow(char *s);
-int get_ccw_devno(char *device, char *devno);
-int get_reipl_type(void);
+int get_ccw_devno(char *device);
+int get_reipl_type(char *reipltype);
 void parse_lsreipl_options(int argc, char **argv);
-int get_ipl_type();
+int get_ipl_type(char *reipltype);
 int get_ipl_loadparam(void);
 void print_ipl_settings(void);
 int get_sa(char *action, char *file);
diff --git a/ipl_tools/fcp.c b/ipl_tools/fcp.c
index 86fa95b..7a8b4c5 100644
--- a/ipl_tools/fcp.c
+++ b/ipl_tools/fcp.c
@@ -33,12 +33,11 @@
 
 /*
  * return the current reipl type from /sys/firmware/reipl/reipl_type
- * 0 = fcp, 1 = ccw, -1, error
+ * 0 = fcp, 1 = ccw, 2 = nss, -1 = unknown
  */
-int get_reipl_type(void)
+int get_reipl_type(char *reipltype)
 {
 	FILE *filp;
-	char reipltype[4];
 	char path[4096];
 	int rc;
 
@@ -49,7 +48,7 @@ int get_reipl_type(void)
 			fprintf(stderr,	"%s: Can not open /sys/firmware/"
 				"reipl/reipl_type: ", name);
 			fprintf(stderr, "%s\n", strerror(errno));
-			return -1;
+			exit(1);
 		}
 		rc = fscanf(filp, "%s", reipltype);
 		fclose(filp);
@@ -57,17 +56,19 @@ int get_reipl_type(void)
 			fprintf(stderr, "%s: Failed to read "
 				"/sys/firmware/reipl/reipl_type:", name);
 			fprintf(stderr, "%s\n", strerror(errno));
-			return -1;
+			exit(1);
 		}
 		if (strncmp(reipltype, "fcp", strlen("fcp")) == 0)
 			return T_FCP;
 		else if (strncmp(reipltype, "ccw", strlen("ccw")) == 0)
 			return T_CCW;
-		/* TODO: add NSS support */
+		else if (strncmp(reipltype, "nss", strlen("nss")) == 0)
+			return T_NSS;
 	} else {
 		fprintf(stderr, "%s: Can not open /sys/firmware/reipl/"
 			"reipl_type:", name);
 		fprintf(stderr, " %s\n", strerror(errno));
+		exit(1);
 	}
 	return -1;
 }
diff --git a/ipl_tools/ipl.c b/ipl_tools/ipl.c
index 2bf817a..8cca700 100644
--- a/ipl_tools/ipl.c
+++ b/ipl_tools/ipl.c
@@ -33,12 +33,11 @@
 
 /*
  * return the ipl type based on /sys/firmware/ipl/ipl_type
- * returns 0 in case of fcp and 1 in case of ccw, -1 otherwise
+ * returns 0 in case of fcp and 1 in case of ccw, 2 for nss and -1 otherwise
  */
-int get_ipl_type()
+int get_ipl_type(char *reipltype)
 {
 	FILE *filp;
-	char reipltype[4];
 	char path[4096];
 	int rc;
 
@@ -49,7 +48,7 @@ int get_ipl_type()
 			fprintf(stderr,	"%s: Can not open /sys/firmware/ipl/"
 				"ipl_type: ", name);
 			fprintf(stderr, "%s\n", strerror(errno));
-			return -1;
+			exit(1);
 		}
 		rc = fscanf(filp, "%s", reipltype);
 		fclose(filp);
@@ -57,12 +56,14 @@ int get_ipl_type()
 			fprintf(stderr, "%s: Failed to read "
 				"/sys/firmware/ipl/ipl_type: ", name);
 			fprintf(stderr, "%s\n", strerror(errno));
-			return -1;
+			exit(1);
 		}
 		if (strncmp(reipltype, "fcp", strlen("fcp")) == 0)
 			return T_FCP;
 		else if (strncmp(reipltype, "ccw", strlen("ccw")) == 0)
 			return T_CCW;
+		else if (strncmp(reipltype, "nss", strlen("nss")) == 0)
+			return T_NSS;
 	} else {
 		fprintf(stderr, "%s: Can not open /sys/firmware/ipl/"
 			"ipl_type:", name);
@@ -111,30 +112,38 @@ int get_ipl_loadparam(void)
 void print_ipl_settings(void)
 {
 	int rc, type;
-	char bootprog[1024], lba[1024];
+	char bootprog[1024], lba[1024], nss_name[NSS_NAME_LEN_MAX + 1];
+	char reipltype[IPL_TYPE_LEN_MAX + 1];
 
-	type = get_ipl_type();
-	/*
-	 * TODO: add nss support
-	 */
-	if (type == 1)
+	type = get_ipl_type(reipltype);
+	switch (type) {
+	case T_NSS:
+		printf("IPL type:      nss\n");
+		rc = strrd(nss_name, "/sys/firmware/ipl/name");
+		if (rc != 0)
+			exit(1);
+		printf("Name:          %s\n", nss_name);
+		break;
+	case T_CCW:
 		printf("IPL type:      ccw\n");
-	if (type == 0)
-		printf("IPL type:      fcp\n");
-	rc = strrd(devno, "/sys/firmware/ipl/device");
-	if (rc != 0)
-		exit(1) /* the error msg comes from get_ipl_device */;
-	if (strlen(devno) > 0)
-		printf("Device:        %s\n", devno);
-	if (type == 1) {
+		rc = strrd(devno, "/sys/firmware/ipl/device");
+		if (rc != 0)
+			exit(1);
+		if (strlen(devno) > 0)
+			printf("Device:        %s\n", devno);
 		rc = get_ipl_loadparam();
 		if (rc != -1)
 			printf("Loadparm:      %d\n", rc);
 		else
 			printf("Loadparm:      \n");
-	}
-	if (type == 0) {
-		/* these settings are only available for fcp */
+		break;
+	case T_FCP:
+		printf("IPL type:      fcp\n");
+		rc = strrd(devno, "/sys/firmware/ipl/device");
+		if (rc != 0)
+			exit(1);
+		if (strlen(devno) > 0)
+			printf("Device:        %s\n", devno);
 		rc = strrd(wwpn, "/sys/firmware/reipl/fcp/wwpn");
 		if (rc != -1 && strlen(wwpn) > 0)
 			printf("WWPN:          %s\n", wwpn);
@@ -147,6 +156,10 @@ void print_ipl_settings(void)
 		rc = strrd(lba, "/sys/firmware/ipl/br_lba");
 		if (rc != -1 &&  strlen(lba) > 0)
 			printf("br_lba:        %s\n", lba);
+		break;
+	default:
+		printf("IPL type:      %s (unknown)\n", reipltype);
+		break;
 	}
 	exit(0);
 }
diff --git a/ipl_tools/main.c b/ipl_tools/main.c
index 2eaa043..bcebabe 100644
--- a/ipl_tools/main.c
+++ b/ipl_tools/main.c
@@ -57,13 +57,22 @@ int action;		/* either CCW, FCP or NODE */
 int lsreipl(int argc, char *argv[])
 {
 	int rc;
-	char bootprog[1024], lba[1024], val[9];
+	char bootprog[1024], lba[1024], val[9], reipltype[IPL_TYPE_LEN_MAX + 1];
+	char nss_name[NSS_NAME_LEN_MAX + 1];
 
 	/* parse the command line options in getop.c */
 	parse_lsreipl_options(argc, argv);
 
-	rc = get_reipl_type();
-	if (rc == 0) {
+	rc = get_reipl_type(reipltype);
+	switch (rc) {
+	case T_NSS:
+		printf("Re-IPL type:   nss\n");
+		rc = strrd(nss_name, "/sys/firmware/reipl/nss/name");
+		if (rc != 0)
+			exit(1);
+		printf("Name:          %s\n", nss_name);
+		break;
+	case T_FCP:
 		printf("Re-IPL type: fcp\n");
 		rc = strrd(wwpn, "/sys/firmware/reipl/fcp/wwpn");
 		if (rc != 0)
@@ -90,8 +99,8 @@ int lsreipl(int argc, char *argv[])
 			printf("bootprog:    %s\n", bootprog);
 		if (strlen(lba) > 0)
 			printf("br_lba:      %s\n", lba);
-	}
-	if (rc == 1) {
+		break;
+	case T_CCW:
 		printf("Re-IPL type:   ccw\n");
 		rc = strrd(devno, "/sys/firmware/reipl/ccw/device");
 		if (rc != 0)
@@ -106,6 +115,10 @@ int lsreipl(int argc, char *argv[])
 			printf("Loadparm:      %s\n", val);
 		else
 			printf("Loadparm:      \n");
+		break;
+	default:
+		printf("Re-IPL type: %s (unknown)\n", reipltype);
+		break;
 	}
 	return 0;
 }
@@ -134,7 +147,7 @@ int reipl(int argc, char *argv[])
 					"partition: %s\n", name, partition);
 				exit(1);
 			}
-			rc = get_ccw_devno(device, devno);
+			rc = get_ccw_devno(device);
 			if (rc != 0)  {
 				fprintf(stderr, "%s: Unable to lookup device"
 					" number for device %s\n", name,
diff --git a/ipl_tools/system.c b/ipl_tools/system.c
index fd5b76b..ca6c5af 100644
--- a/ipl_tools/system.c
+++ b/ipl_tools/system.c
@@ -174,7 +174,7 @@ int strrd(char *string, char *file)
 			fprintf(stderr, "%s\n", strerror(errno));
 			exit(1);
 		}
-		rc = fread(string, 4096, 1, filp);
+		rc = fread(string, 1, 4096, filp);
 		fclose(filp);
 		/*
 		 *  special handling is required for
@@ -193,6 +193,7 @@ int strrd(char *string, char *file)
 			fprintf(stderr, "%s\n", strerror(errno));
 			return -1;
 		} else {
+			string[rc] = 0;
 			if (string[strlen(string) - 1] == '\n')
 				string[strlen(string) - 1] = 0;
 			return 0;
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/s390utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- s390utils.spec	1 Dec 2009 09:59:31 -0000	1.15
+++ s390utils.spec	10 Dec 2009 17:48:03 -0000	1.16
@@ -46,6 +46,8 @@ Patch11:  0011-update-readahead-value-fo
 Patch12:  0012-fix-multipath-device-detection-in-ziomon.patch
 Patch13:  0013-zipl-handle-status-during-ipl.patch
 Patch14:  0014-dasdview-fdasd-fix-floating-point-error-for-unformat.patch
+Patch15:  0015-s390tools-1.8.2-zipl-dm.patch
+Patch16:  0016-s390tools-1.8.2-lsreipl-nss.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -117,6 +119,12 @@ be used together with the zSeries (s390)
 # Fix floating point error for unformatted devices in fdasd and dasdview (#537144)
 %patch14 -p1 -b .dasd-zero-division
 
+# Add device-mapper support into zipl (#546280)
+%patch15 -p1 -b .zipl-dm
+
+# Add missing check and print NSS name in case an NSS has been IPLed (#546297)
+%patch16 -p1 -b .lsreipl-nss
+
 #
 # cmsfs
 #
@@ -798,9 +806,11 @@ User-space development files for the s39
 
 
 %changelog
-* Tue Dec  1 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
+* Thu Dec 10 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
 - fixed return value in cpi initscript (#541389)
 - updated zfcpconf.sh script from dracut
+- added device-mapper support into zipl (#546280)
+- added missing check and print NSS name in case an NSS has been IPLed (#546297)
 
 * Fri Nov 13 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-5
 - added multiple fixes from IBM (#533955, #537142, #537144)



From deji at fedoraproject.org  Thu Dec 10 18:00:58 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 10 Dec 2009 18:00:58 +0000 (UTC)
Subject: rpms/orsa/F-12 orsa.spec,1.12,1.13
Message-ID: <20091210180058.4CE2111C025D@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/orsa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432

Modified Files:
	orsa.spec 
Log Message:
* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-11.1
- Rebuild for mpich2 and BR mpich2-devel-static
- Update the spec for changes in mpich2 packaging



Index: orsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-12/orsa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- orsa.spec	27 Aug 2009 14:41:39 -0000	1.12
+++ orsa.spec	10 Dec 2009 18:00:57 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:			orsa
 Version:		0.7.0
-Release:		11%{?dist}
+Release:		11%{?dist}.1
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -83,7 +83,7 @@ This package contains development files 
 Summary:	A build of %{name} with support for MPICH2 MPI
 Group:		Applications/Engineering
 
-BuildRequires: mpich2-devel
+BuildRequires: mpich2-devel-static
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	mpich2
 
@@ -164,9 +164,9 @@ cd ..
 . /etc/profile.d/modules.sh
 %global OpenMPI_BIN %(. /etc/profile.d/modules.sh; module load openmpi-%{_arch}; echo $MPI_BIN)
 %global OpenMPI_LIB %(. /etc/profile.d/modules.sh; module load openmpi-%{_arch}; echo $MPI_LIB)
+%global mpich2dir %(. /etc/profile.d/modules.sh; module load mpich2-%{_arch}; echo $MPI_HOME)
 %global LAM_BIN %(. /etc/profile.d/modules.sh; module load lam-%{_arch}; echo $MPI_BIN | sed 's|-L||')
 %global LAM_LIB %(. /etc/profile.d/modules.sh; module load lam-%{_arch}; echo $MPI_LIB | sed 's|-L||')
-%global MPICH_BIN %(. /etc/profile.d/modules.sh; module load mpich2.module; echo $PATH | cut -f 1 -d :)
 
 ################################
 echo -e "\n##############################\nNow making the non-MPI version\n##############################\n"
@@ -186,15 +186,15 @@ echo -e "\n#############################
 ################################
 
 module load openmpi-%{_arch}
-MPI_COMPILER=openmpi MPI_SUFFIX=_openmpi WITH_MPI=--with-mpi %dobuild
+WITH_MPI=--with-mpi %dobuild
 module unload openmpi-%{_arch}
 
 ################################
 echo -e "\n##############################\nNow making the MPICH2 version\n##############################\n"
 ################################
-module load mpich2.module
-MPI_COMPILER=mpich2 MPI_BIN=%{MPICH_BIN} MPI_LIB=%{_libdir}/mpich2/ MPICXX=mpicxx MPI_SUFFIX=_mpich2 CC=mpicxx WITH_MPI=--with-mpi %dobuild
-module unload mpich2.module
+module load mpich2-%{_arch}
+WITH_MPI=--with-mpi %dobuild
+module unload mpich2-%{_arch}
 
 ################################
 echo -e "\n##############################\nNow making the LAM version\n##############################\n"
@@ -220,17 +220,15 @@ rm $RPM_BUILD_ROOT%{_libdir}/{liborsa.la
 
 # Install OpenMPI version
 module load openmpi-%{_arch}
-MPI_COMPILER=openmpi
 make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
 rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
 module unload openmpi-%{_arch}
 
 # Install MPICH2 version
-module load mpich2.module
-MPI_COMPILER=mpich2
+module load mpich2-%{_arch}
 make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
-rm $RPM_BUILD_ROOT%{_libdir}/mpich2/{liborsa.la,libxorsa.la}
-module unload mpich2.module
+rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
+module unload mpich2-%{_arch}
 
 # Install LAM version
 module load lam-%{_arch}
@@ -273,13 +271,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files mpich2
 %defattr(-,root,root,-)
-%{MPICH_BIN}/*
-%{_libdir}/mpich2/liborsa.so.*
-%{_libdir}/mpich2/libxorsa.so.*
+%{mpich2dir}/bin/*
+%{mpich2dir}/lib/liborsa.so.*
+%{mpich2dir}/lib/libxorsa.so.*
 
 %files mpich2-devel
 %defattr(-,root,root,-)
-%{_libdir}/mpich2/*.so
+%{mpich2dir}/lib/*.so
 
 %files lam
 %defattr(-,root,root,-)
@@ -296,6 +294,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING DEVELOPERS ORSA_MPI
 
 %changelog
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-11.1
+- Rebuild for mpich2 and BR mpich2-devel-static
+- Update the spec for changes in mpich2 packaging
+
 * Thu Aug 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-11
 - Make compliant to new MPI guidelines:
 - Do not build in %%install (resolves BZ#513697)



From mclasen at fedoraproject.org  Thu Dec 10 18:13:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 18:13:41 +0000 (UTC)
Subject: rpms/control-center/F-12 and-no-wrong-keybindings-either.patch, NONE,
	1.1 control-center.spec, 1.510, 1.511
Message-ID: <20091210181341.C9EE711C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24586

Modified Files:
	control-center.spec 
Added Files:
	and-no-wrong-keybindings-either.patch 
Log Message:
more keybinding fixes


and-no-wrong-keybindings-either.patch:
 gnome-keybinding-properties.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE and-no-wrong-keybindings-either.patch ---
diff -up gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c.wm-confusion gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c
--- gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c.wm-confusion	2009-12-10 13:03:24.592158905 -0500
+++ gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c	2009-12-10 13:03:33.484378505 -0500
@@ -868,7 +868,7 @@ append_keys_to_tree_from_file (GtkBuilde
   /* If there's no keys to add, or the settings apply to a window manager
    * that's not the one we're running */
   if (keylist->entries->len == 0
-      || (keylist->wm_name != NULL && strv_contains (wm_keybindings, keylist->wm_name))
+      || (keylist->wm_name != NULL && !strv_contains (wm_keybindings, keylist->wm_name))
       || keylist->name == NULL)
     {
       g_free (keylist->name);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- control-center.spec	9 Dec 2009 02:45:31 -0000	1.510
+++ control-center.spec	10 Dec 2009 18:13:41 -0000	1.511
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -85,6 +85,8 @@ Patch60: override-redirect.patch
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=604130
 Patch62: no-duplicate-keybindings-dammit.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604295
+Patch63: and-no-wrong-keybindings-either.patch
 
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
@@ -233,6 +235,7 @@ for the GNOME desktop.
 %patch57 -p1 -b .monitor-aspect
 %patch60 -p1 -b .override-redirect
 %patch62 -p1 -b .no-duplicate-keybindings
+%patch63 -p1 -b .no-wrong-keybindings
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -424,6 +427,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-11
+- More wm keybinding fixes
+
 * Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-10
 - Avoid duplicate entries in the keybinding preferences (#542401)
 



From mclasen at fedoraproject.org  Thu Dec 10 18:16:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 18:16:16 +0000 (UTC)
Subject: rpms/control-center/devel and-no-wrong-keybindings-either.patch,
	NONE, 1.1 control-center.spec, 1.497, 1.498
Message-ID: <20091210181616.5DAA611C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25852

Modified Files:
	control-center.spec 
Added Files:
	and-no-wrong-keybindings-either.patch 
Log Message:
more keybinding fixes


and-no-wrong-keybindings-either.patch:
 gnome-keybinding-properties.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE and-no-wrong-keybindings-either.patch ---
diff -up gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c.wm-confusion gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c
--- gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c.wm-confusion	2009-12-10 13:03:24.592158905 -0500
+++ gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c	2009-12-10 13:03:33.484378505 -0500
@@ -868,7 +868,7 @@ append_keys_to_tree_from_file (GtkBuilde
   /* If there's no keys to add, or the settings apply to a window manager
    * that's not the one we're running */
   if (keylist->entries->len == 0
-      || (keylist->wm_name != NULL && strv_contains (wm_keybindings, keylist->wm_name))
+      || (keylist->wm_name != NULL && !strv_contains (wm_keybindings, keylist->wm_name))
       || keylist->name == NULL)
     {
       g_free (keylist->name);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- control-center.spec	9 Dec 2009 02:45:40 -0000	1.497
+++ control-center.spec	10 Dec 2009 18:16:15 -0000	1.498
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -85,6 +85,8 @@ Patch60: override-redirect.patch
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=604130
 Patch62: no-duplicate-keybindings-dammit.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604295
+Patch63: and-no-wrong-keybindings-either.patch
 
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
@@ -229,6 +231,7 @@ for the GNOME desktop.
 %patch57 -p1 -b .monitor-aspect
 %patch60 -p1 -b .override-redirect
 %patch62 -p1 -b .no-duplicate-keybindings
+%patch63 -p1 -b .no-wrong-keybindings
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -419,6 +422,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-11
+- More wm keybinding fixes
+
 * Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-10
 - Avoid duplicate entries in the keybinding preferences (#542401)
 



From mtasaka at fedoraproject.org  Thu Dec 10 18:16:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 18:16:34 +0000 (UTC)
Subject: rpms/xscreensaver/F-10
	xscreensaver-5.10-apple2-initialization.patch, 
	1.1, 1.2 xscreensaver.spec, 1.84, 1.85
Message-ID: <20091210181634.8145A11C025D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25981/F-10

Modified Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver.spec 
Log Message:
fix patch

xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: xscreensaver-5.10-apple2-initialization.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver-5.10-apple2-initialization.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 15:50:43 -0000	1.1
+++ xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 18:16:34 -0000	1.2
@@ -1,37 +1,16 @@
---- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
-+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
-@@ -1020,21 +1020,23 @@
-   int i,height;
-   static const double levelfac[3]={-7.5, 5.5, 24.5};
- 
--  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
-+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
- 
-     for (i=0; i<height; i++) {
-       it->leveltable[height][i].index = 2;
+--- xscreensaver-5.10/hacks/analogtv.c.debug1	2008-08-06 10:59:35.000000000 +0900
++++ xscreensaver-5.10/hacks/analogtv.c	2009-12-11 02:55:42.000000000 +0900
+@@ -1030,11 +1030,11 @@
+       it->leveltable[height][0].index=0;
      }
--    
--    if (avgheight>=3) {
--      it->leveltable[height][0].index=0;
--    }
--    if (avgheight>=5) {
+     if (avgheight>=5) {
 -      it->leveltable[height][height-1].index=0;
--    }
--    if (avgheight>=7) {
--      it->leveltable[height][1].index=1;
++      if (height >= 1) it->leveltable[height][height-1].index=0;
+     }
+     if (avgheight>=7) {
+       it->leveltable[height][1].index=1;
 -      it->leveltable[height][height-2].index=1;
-+
-+    if (height < avgheight + 2.0){
-+      if (avgheight>=3) {
-+        it->leveltable[height][0].index=0;
-+      }
-+      if (avgheight>=5) {
-+        if (height >= 1) it->leveltable[height][height-1].index=0;
-+      }
-+      if (avgheight>=7) {
-+        it->leveltable[height][1].index=1;
-+        if (height >= 2) it->leveltable[height][height-2].index=1;
-+      }
++      if (height >= 2) it->leveltable[height][height-2].index=1;
      }
  
      for (i=0; i<height; i++) {


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- xscreensaver.spec	10 Dec 2009 15:50:43 -0000	1.84
+++ xscreensaver.spec	10 Dec 2009 18:16:34 -0000	1.85
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    4
 
 %define extrarel      %{nil}
 
@@ -676,9 +676,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
-* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-4
 - Fix occasional crash on substrate (bug 545847)
-- Fix initialization process on apple2, hopefully fix bug 540790
+- Fix initialization process on apple2, hopefully fix bug 540790??
 
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
 - F-12+: Restrict Autostart effect to GNOME session only (bug 517391)



From mtasaka at fedoraproject.org  Thu Dec 10 18:16:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 18:16:34 +0000 (UTC)
Subject: rpms/xscreensaver/F-11
	xscreensaver-5.10-apple2-initialization.patch, 
	1.1, 1.2 xscreensaver.spec, 1.95, 1.96
Message-ID: <20091210181634.C7EB311C025D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25981/F-11

Modified Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver.spec 
Log Message:
fix patch

xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: xscreensaver-5.10-apple2-initialization.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/xscreensaver-5.10-apple2-initialization.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 15:50:44 -0000	1.1
+++ xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 18:16:34 -0000	1.2
@@ -1,37 +1,16 @@
---- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
-+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
-@@ -1020,21 +1020,23 @@
-   int i,height;
-   static const double levelfac[3]={-7.5, 5.5, 24.5};
- 
--  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
-+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
- 
-     for (i=0; i<height; i++) {
-       it->leveltable[height][i].index = 2;
+--- xscreensaver-5.10/hacks/analogtv.c.debug1	2008-08-06 10:59:35.000000000 +0900
++++ xscreensaver-5.10/hacks/analogtv.c	2009-12-11 02:55:42.000000000 +0900
+@@ -1030,11 +1030,11 @@
+       it->leveltable[height][0].index=0;
      }
--    
--    if (avgheight>=3) {
--      it->leveltable[height][0].index=0;
--    }
--    if (avgheight>=5) {
+     if (avgheight>=5) {
 -      it->leveltable[height][height-1].index=0;
--    }
--    if (avgheight>=7) {
--      it->leveltable[height][1].index=1;
++      if (height >= 1) it->leveltable[height][height-1].index=0;
+     }
+     if (avgheight>=7) {
+       it->leveltable[height][1].index=1;
 -      it->leveltable[height][height-2].index=1;
-+
-+    if (height < avgheight + 2.0){
-+      if (avgheight>=3) {
-+        it->leveltable[height][0].index=0;
-+      }
-+      if (avgheight>=5) {
-+        if (height >= 1) it->leveltable[height][height-1].index=0;
-+      }
-+      if (avgheight>=7) {
-+        it->leveltable[height][1].index=1;
-+        if (height >= 2) it->leveltable[height][height-2].index=1;
-+      }
++      if (height >= 2) it->leveltable[height][height-2].index=1;
      }
  
      for (i=0; i<height; i++) {


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/xscreensaver.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- xscreensaver.spec	10 Dec 2009 15:50:44 -0000	1.95
+++ xscreensaver.spec	10 Dec 2009 18:16:34 -0000	1.96
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    4
 
 %define extrarel      %{nil}
 
@@ -676,9 +676,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
-* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-4
 - Fix occasional crash on substrate (bug 545847)
-- Fix initialization process on apple2, hopefully fix bug 540790
+- Fix initialization process on apple2, hopefully fix bug 540790??
 
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
 - F-12+: Restrict Autostart effect to GNOME session only (bug 517391)



From mtasaka at fedoraproject.org  Thu Dec 10 18:16:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 18:16:35 +0000 (UTC)
Subject: rpms/xscreensaver/F-12
	xscreensaver-5.10-apple2-initialization.patch, 
	1.1, 1.2 xscreensaver.spec, 1.100, 1.101
Message-ID: <20091210181635.1D9ED11C025D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25981/F-12

Modified Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver.spec 
Log Message:
fix patch

xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: xscreensaver-5.10-apple2-initialization.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-12/xscreensaver-5.10-apple2-initialization.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 15:50:44 -0000	1.1
+++ xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 18:16:34 -0000	1.2
@@ -1,37 +1,16 @@
---- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
-+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
-@@ -1020,21 +1020,23 @@
-   int i,height;
-   static const double levelfac[3]={-7.5, 5.5, 24.5};
- 
--  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
-+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
- 
-     for (i=0; i<height; i++) {
-       it->leveltable[height][i].index = 2;
+--- xscreensaver-5.10/hacks/analogtv.c.debug1	2008-08-06 10:59:35.000000000 +0900
++++ xscreensaver-5.10/hacks/analogtv.c	2009-12-11 02:55:42.000000000 +0900
+@@ -1030,11 +1030,11 @@
+       it->leveltable[height][0].index=0;
      }
--    
--    if (avgheight>=3) {
--      it->leveltable[height][0].index=0;
--    }
--    if (avgheight>=5) {
+     if (avgheight>=5) {
 -      it->leveltable[height][height-1].index=0;
--    }
--    if (avgheight>=7) {
--      it->leveltable[height][1].index=1;
++      if (height >= 1) it->leveltable[height][height-1].index=0;
+     }
+     if (avgheight>=7) {
+       it->leveltable[height][1].index=1;
 -      it->leveltable[height][height-2].index=1;
-+
-+    if (height < avgheight + 2.0){
-+      if (avgheight>=3) {
-+        it->leveltable[height][0].index=0;
-+      }
-+      if (avgheight>=5) {
-+        if (height >= 1) it->leveltable[height][height-1].index=0;
-+      }
-+      if (avgheight>=7) {
-+        it->leveltable[height][1].index=1;
-+        if (height >= 2) it->leveltable[height][height-2].index=1;
-+      }
++      if (height >= 2) it->leveltable[height][height-2].index=1;
      }
  
      for (i=0; i<height; i++) {


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-12/xscreensaver.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- xscreensaver.spec	10 Dec 2009 15:50:44 -0000	1.100
+++ xscreensaver.spec	10 Dec 2009 18:16:34 -0000	1.101
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    4
 
 %define extrarel      %{nil}
 
@@ -676,9 +676,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
-* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-4
 - Fix occasional crash on substrate (bug 545847)
-- Fix initialization process on apple2, hopefully fix bug 540790
+- Fix initialization process on apple2, hopefully fix bug 540790??
 
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
 - F-12+: Restrict Autostart effect to GNOME session only (bug 517391)



From mtasaka at fedoraproject.org  Thu Dec 10 18:16:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 18:16:35 +0000 (UTC)
Subject: rpms/xscreensaver/devel
	xscreensaver-5.10-apple2-initialization.patch, 
	1.1, 1.2 xscreensaver.spec, 1.100, 1.101
Message-ID: <20091210181635.5EA5C11C025D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25981/devel

Modified Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver.spec 
Log Message:
fix patch

xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: xscreensaver-5.10-apple2-initialization.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.10-apple2-initialization.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 15:50:44 -0000	1.1
+++ xscreensaver-5.10-apple2-initialization.patch	10 Dec 2009 18:16:35 -0000	1.2
@@ -1,37 +1,16 @@
---- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
-+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
-@@ -1020,21 +1020,23 @@
-   int i,height;
-   static const double levelfac[3]={-7.5, 5.5, 24.5};
- 
--  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
-+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
- 
-     for (i=0; i<height; i++) {
-       it->leveltable[height][i].index = 2;
+--- xscreensaver-5.10/hacks/analogtv.c.debug1	2008-08-06 10:59:35.000000000 +0900
++++ xscreensaver-5.10/hacks/analogtv.c	2009-12-11 02:55:42.000000000 +0900
+@@ -1030,11 +1030,11 @@
+       it->leveltable[height][0].index=0;
      }
--    
--    if (avgheight>=3) {
--      it->leveltable[height][0].index=0;
--    }
--    if (avgheight>=5) {
+     if (avgheight>=5) {
 -      it->leveltable[height][height-1].index=0;
--    }
--    if (avgheight>=7) {
--      it->leveltable[height][1].index=1;
++      if (height >= 1) it->leveltable[height][height-1].index=0;
+     }
+     if (avgheight>=7) {
+       it->leveltable[height][1].index=1;
 -      it->leveltable[height][height-2].index=1;
-+
-+    if (height < avgheight + 2.0){
-+      if (avgheight>=3) {
-+        it->leveltable[height][0].index=0;
-+      }
-+      if (avgheight>=5) {
-+        if (height >= 1) it->leveltable[height][height-1].index=0;
-+      }
-+      if (avgheight>=7) {
-+        it->leveltable[height][1].index=1;
-+        if (height >= 2) it->leveltable[height][height-2].index=1;
-+      }
++      if (height >= 2) it->leveltable[height][height-2].index=1;
      }
  
      for (i=0; i<height; i++) {


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- xscreensaver.spec	10 Dec 2009 15:50:45 -0000	1.100
+++ xscreensaver.spec	10 Dec 2009 18:16:35 -0000	1.101
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    4
 
 %define extrarel      %{nil}
 
@@ -676,9 +676,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
-* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-4
 - Fix occasional crash on substrate (bug 545847)
-- Fix initialization process on apple2, hopefully fix bug 540790
+- Fix initialization process on apple2, hopefully fix bug 540790??
 
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
 - F-12+: Restrict Autostart effect to GNOME session only (bug 517391)



From twaugh at fedoraproject.org  Thu Dec 10 18:17:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 10 Dec 2009 18:17:41 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3448.patch,NONE,1.1 cups.spec,1.555,1.556
Message-ID: <20091210181741.9318A11C025D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26538

Modified Files:
	cups.spec 
Added Files:
	cups-str3448.patch 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
- Fixed invalid read in cupsAddDest (bug #547460).


cups-str3448.patch:
 dest.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE cups-str3448.patch ---
diff -up cups-1.4.2/cups/dest.c.str3448 cups-1.4.2/cups/dest.c
--- cups-1.4.2/cups/dest.c.str3448	2009-08-28 23:54:34.000000000 +0100
+++ cups-1.4.2/cups/dest.c	2009-12-10 18:15:50.910079549 +0000
@@ -145,6 +145,12 @@ cupsAddDest(const char  *name,		/* I  - 
 
     dest = cups_add_dest(name, instance, &num_dests, dests);
 
+   /*
+    * Find the base dest again now the array has been realloc'd.
+    */
+
+    parent = cupsGetDest(name, NULL, num_dests, *dests);
+
     if (instance && parent && parent->num_options > 0)
     {
      /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -p -r1.555 -r1.556
--- cups.spec	9 Dec 2009 11:32:18 -0000	1.555
+++ cups.spec	10 Dec 2009 18:17:41 -0000	1.556
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -28,6 +28,7 @@ Source15: textonly.ppd
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
+Patch4: cups-str3448.patch
 Patch5: cups-serial.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
@@ -206,6 +207,7 @@ module. 
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
+%patch4 -p1 -b .str3448
 %patch5 -p1 -b .serial
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
@@ -543,6 +545,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
+- Fixed invalid read in cupsAddDest (bug #547460).
+
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
 - Use upstream patch to fix scheduler crash when an active printer was
   deleted (rev 8914).



From twaugh at fedoraproject.org  Thu Dec 10 18:18:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 10 Dec 2009 18:18:57 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3448.patch,NONE,1.1 cups.spec,1.562,1.563
Message-ID: <20091210181857.878D011C025D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27285

Modified Files:
	cups.spec 
Added Files:
	cups-str3448.patch 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
- Fixed invalid read in cupsAddDest (bug #547460).


cups-str3448.patch:
 dest.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE cups-str3448.patch ---
diff -up cups-1.4.2/cups/dest.c.str3448 cups-1.4.2/cups/dest.c
--- cups-1.4.2/cups/dest.c.str3448	2009-08-28 23:54:34.000000000 +0100
+++ cups-1.4.2/cups/dest.c	2009-12-10 18:15:50.910079549 +0000
@@ -145,6 +145,12 @@ cupsAddDest(const char  *name,		/* I  - 
 
     dest = cups_add_dest(name, instance, &num_dests, dests);
 
+   /*
+    * Find the base dest again now the array has been realloc'd.
+    */
+
+    parent = cupsGetDest(name, NULL, num_dests, *dests);
+
     if (instance && parent && parent->num_options > 0)
     {
      /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -p -r1.562 -r1.563
--- cups.spec	9 Dec 2009 11:32:55 -0000	1.562
+++ cups.spec	10 Dec 2009 18:18:57 -0000	1.563
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -32,6 +32,7 @@ Patch4: cups-serial.patch
 Patch5: cups-banners.patch
 Patch6: cups-serverbin-compat.patch
 Patch7: cups-no-export-ssllibs.patch
+Patch8: cups-str3448.patch
 Patch9: cups-direct-usb.patch
 Patch10: cups-lpr-help.patch
 Patch11: cups-peercred.patch
@@ -210,6 +211,7 @@ module. 
 %patch5 -p1 -b .banners
 %patch6 -p1 -b .serverbin-compat
 %patch7 -p1 -b .no-export-ssllibs
+%patch8 -p1 -b .str3448
 %patch9 -p1 -b .direct-usb
 %patch10 -p1 -b .lpr-help
 %patch11 -p1 -b .peercred
@@ -549,6 +551,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
+- Fixed invalid read in cupsAddDest (bug #547460).
+
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
 - Use upstream patch to fix scheduler crash when an active printer was
   deleted (rev 8914).



From twaugh at fedoraproject.org  Thu Dec 10 18:19:33 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 10 Dec 2009 18:19:33 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.564,1.565
Message-ID: <20091210181933.A9D5311C025D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27547

Modified Files:
	cups.spec 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
- Fixed invalid read in cupsAddDest (bug #547460).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -p -r1.564 -r1.565
--- cups.spec	9 Dec 2009 11:39:16 -0000	1.564
+++ cups.spec	10 Dec 2009 18:19:33 -0000	1.565
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -30,6 +30,7 @@ Patch4: cups-serial.patch
 Patch5: cups-banners.patch
 Patch6: cups-serverbin-compat.patch
 Patch7: cups-no-export-ssllibs.patch
+Patch8: cups-str3448.patch
 Patch9: cups-direct-usb.patch
 Patch10: cups-lpr-help.patch
 Patch11: cups-peercred.patch
@@ -208,6 +209,7 @@ module. 
 %patch5 -p1 -b .banners
 %patch6 -p1 -b .serverbin-compat
 %patch7 -p1 -b .no-export-ssllibs
+%patch8 -p1 -b .str3448
 %patch9 -p1 -b .direct-usb
 %patch10 -p1 -b .lpr-help
 %patch11 -p1 -b .peercred
@@ -539,6 +541,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
+- Fixed invalid read in cupsAddDest (bug #547460).
+
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
 - Use upstream patch to fix scheduler crash when an active printer was
   deleted (rev 8914).



From twaugh at fedoraproject.org  Thu Dec 10 18:31:27 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 10 Dec 2009 18:31:27 +0000 (UTC)
Subject: rpms/cups/devel cups-str3448.patch,NONE,1.1 cups.spec,1.565,1.566
Message-ID: <20091210183127.E7D5111C025D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31237

Modified Files:
	cups.spec 
Added Files:
	cups-str3448.patch 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
- Fixed invalid read in cupsAddDest (bug #547460).


cups-str3448.patch:
 dest.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE cups-str3448.patch ---
diff -up cups-1.4.2/cups/dest.c.str3448 cups-1.4.2/cups/dest.c
--- cups-1.4.2/cups/dest.c.str3448	2009-08-28 23:54:34.000000000 +0100
+++ cups-1.4.2/cups/dest.c	2009-12-10 18:15:50.910079549 +0000
@@ -145,6 +145,12 @@ cupsAddDest(const char  *name,		/* I  - 
 
     dest = cups_add_dest(name, instance, &num_dests, dests);
 
+   /*
+    * Find the base dest again now the array has been realloc'd.
+    */
+
+    parent = cupsGetDest(name, NULL, num_dests, *dests);
+
     if (instance && parent && parent->num_options > 0)
     {
      /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -p -r1.565 -r1.566
--- cups.spec	10 Dec 2009 18:19:33 -0000	1.565
+++ cups.spec	10 Dec 2009 18:31:27 -0000	1.566
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -541,7 +541,7 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
 - Fixed invalid read in cupsAddDest (bug #547460).
 
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15



From deji at fedoraproject.org  Thu Dec 10 18:43:13 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 10 Dec 2009 18:43:13 +0000 (UTC)
Subject: rpms/orsa/devel orsa.spec,1.13,1.14
Message-ID: <20091210184313.1422011C025D@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2085

Modified Files:
	orsa.spec 
Log Message:
* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-13
- No need to force mpicxx to be CC for mpich2 subpackage
- BR mpich2-devel-static



Index: orsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/orsa.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- orsa.spec	26 Nov 2009 14:56:48 -0000	1.13
+++ orsa.spec	10 Dec 2009 18:43:12 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:			orsa
 Version:		0.7.0
-Release:		12%{?dist}
+Release:		13%{?dist}
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -83,7 +83,7 @@ This package contains development files 
 Summary:	A build of %{name} with support for MPICH2 MPI
 Group:		Applications/Engineering
 
-BuildRequires: mpich2-devel
+BuildRequires:	mpich2-devel-static
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	mpich2
 
@@ -166,7 +166,7 @@ module unload openmpi-%{_arch}
 echo -e "\n##############################\nNow making the MPICH2 version\n##############################\n"
 ################################
 module load mpich2-%{_arch}
-MPICXX=mpicxx CC=mpicxx WITH_MPI=--with-mpi %dobuild
+WITH_MPI=--with-mpi %dobuild
 module unload mpich2-%{_arch}
 
 %install
@@ -235,6 +235,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING DEVELOPERS ORSA_MPI
 
 %changelog
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-13
+- No need to force mpicxx to be CC for mpich2 subpackage
+- BR mpich2-devel-static
+
 * Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-12
 - Rebuild for mpich2 
 - Remove the lam subpackage, lam is no more in Fedora



From jjh at fedoraproject.org  Thu Dec 10 18:44:28 2009
From: jjh at fedoraproject.org (jjh)
Date: Thu, 10 Dec 2009 18:44:28 +0000 (UTC)
Subject: rpms/haproxy/F-12 haproxy.spec,1.26,1.27
Message-ID: <20091210184428.183B011C025D@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2516

Modified Files:
	haproxy.spec 
Log Message:
release bump


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/haproxy.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- haproxy.spec	17 Oct 2009 21:34:01 -0000	1.26
+++ haproxy.spec	10 Dec 2009 18:44:27 -0000	1.27
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -130,7 +130,10 @@ fi  
 
 
 %changelog
-* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-2
+* Thu Dec 10 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-2
+- release bump
+
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-1
 - update to 1.3.22
 - add logrotate configuration
 



From mtasaka at fedoraproject.org  Thu Dec 10 18:54:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 18:54:03 +0000 (UTC)
Subject: File jd-2.5.5.svn3244_trunk.tgz uploaded to lookaside cache by
	mtasaka
Message-ID: <20091210185403.AF38C10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for jd:

8da5f14bc3437fababbaa4e65693fc36  jd-2.5.5.svn3244_trunk.tgz



From mtasaka at fedoraproject.org  Thu Dec 10 18:54:45 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 10 Dec 2009 18:54:45 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.402, 1.403 jd.spec, 1.465, 1.466 sources,
	1.403, 1.404
Message-ID: <20091210185445.C126311C025D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5610

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3244



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- .cvsignore	6 Dec 2009 14:48:29 -0000	1.402
+++ .cvsignore	10 Dec 2009 18:54:45 -0000	1.403
@@ -1 +1 @@
-jd-2.5.0-091206.tgz
+jd-2.5.5.svn3244_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -p -r1.465 -r1.466
--- jd.spec	6 Dec 2009 14:48:29 -0000	1.465
+++ jd.spec	10 Dec 2009 18:54:45 -0000	1.466
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.5.0
-%define         strtag        091206
+%define         main_ver      2.5.5
+%define         strtag        svn3244_trunk
 %define         repoid        44788
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3244
+
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- sources	6 Dec 2009 14:48:30 -0000	1.403
+++ sources	10 Dec 2009 18:54:45 -0000	1.404
@@ -1 +1 @@
-a9775428a2b33c471ca60cf56bae6c5c  jd-2.5.0-091206.tgz
+8da5f14bc3437fababbaa4e65693fc36  jd-2.5.5.svn3244_trunk.tgz



From jwrdegoede at fedoraproject.org  Thu Dec 10 18:55:48 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 10 Dec 2009 18:55:48 +0000 (UTC)
Subject: rpms/vegastrike/devel vegastrike.spec,1.23,1.24
Message-ID: <20091210185548.14B5B11C025D@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/vegastrike/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6041

Modified Files:
	vegastrike.spec 
Log Message:
* Thu Dec 10 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-15
- Rebuild for silent boost-python ABI breakage (#540277)



Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- vegastrike.spec	28 Sep 2009 10:27:21 -0000	1.23
+++ vegastrike.spec	10 Dec 2009 18:55:47 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-15
+- Rebuild for silent boost-python ABI breakage (#540277)
+
 * Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.0-14
 - Rebuild for new ogre
 



From dwalsh at fedoraproject.org  Thu Dec 10 18:56:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Dec 2009 18:56:23 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.190,
	1.191 modules-minimum.conf, 1.39, 1.40 modules-targeted.conf,
	1.148, 1.149 nsadiff, 1.26, 1.27 policy-F13.patch, 1.6,
	1.7 selinux-policy.spec, 1.939, 1.940 sources, 1.209, 1.210
Message-ID: <20091210185623.6D40411C025D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6351

Modified Files:
	.cvsignore modules-minimum.conf modules-targeted.conf nsadiff 
	policy-F13.patch selinux-policy.spec sources 
Log Message:
* Fri Dec 4 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-1
- Update to upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- .cvsignore	25 Nov 2009 20:19:12 -0000	1.190
+++ .cvsignore	10 Dec 2009 18:56:22 -0000	1.191
@@ -194,3 +194,4 @@ serefpolicy-3.6.33.tgz
 serefpolicy-3.7.1.tgz
 serefpolicy-3.7.2.tgz
 serefpolicy-3.7.3.tgz
+serefpolicy-3.7.4.tgz


Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- modules-minimum.conf	20 Nov 2009 16:31:53 -0000	1.39
+++ modules-minimum.conf	10 Dec 2009 18:56:22 -0000	1.40
@@ -757,6 +757,13 @@ kdump = module
 kdumpgui = module
 
 # Layer: services
+# Module: ksmtuned
+#
+#  Kernel Samepage Merging (KSM) Tuning Daemon
+# 
+ksmtuned = module
+
+# Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
@@ -1576,6 +1583,13 @@ unconfined = module
 # 
 ulogd = module
 
+# Layer: services
+# Module: vhostmd
+#
+# vhostmd - A metrics gathering daemon
+# 
+vhostmd = module
+
 # Layer: apps
 # Module: wine
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- modules-targeted.conf	20 Nov 2009 16:31:53 -0000	1.148
+++ modules-targeted.conf	10 Dec 2009 18:56:22 -0000	1.149
@@ -757,6 +757,13 @@ kdump = module
 kdumpgui = module
 
 # Layer: services
+# Module: ksmtuned
+#
+#  Kernel Samepage Merging (KSM) Tuning Daemon
+# 
+ksmtuned = module
+
+# Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
@@ -1576,6 +1583,13 @@ unconfined = module
 # 
 ulogd = module
 
+# Layer: services
+# Module: vhostmd
+#
+# vhostmd - A metrics gathering daemon
+# 
+vhostmd = module
+
 # Layer: apps
 # Module: wine
 #


Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nsadiff	25 Nov 2009 20:19:12 -0000	1.26
+++ nsadiff	10 Dec 2009 18:56:22 -0000	1.27
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.3 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.4 > /tmp/diff

policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   77 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  111 +-
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 ++
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   31 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   45 
 policy/modules/kernel/devices.if          |   56 -
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++-
 policy/modules/kernel/files.te            |    2 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  127 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  459 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  116 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   24 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    6 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |    8 
 policy/modules/services/nut.if            |   82 +
 policy/modules/services/nut.te            |  127 ++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   91 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  628 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   25 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 ++
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1665 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 382 files changed, 19015 insertions(+), 2975 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.6 -r 1.7 policy-F13.patchIndex: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- policy-F13.patch	25 Nov 2009 20:19:12 -0000	1.6
+++ policy-F13.patch	10 Dec 2009 18:56:22 -0000	1.7
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.3/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.3/Makefile	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/Makefile	2009-12-04 12:33:34.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -10,9 +10,9 @@ diff -b -B --ignore-all-space --exclude-
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.3/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.3/policy/global_tunables	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/global_tunables	2009-12-04 12:33:34.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -48,9 +48,9 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(mmap_low_allowed, false)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.3/policy/modules/admin/alsa.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.3/policy/modules/admin/alsa.te	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-04 12:33:34.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -60,9 +60,9 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(alsa_t)
  
  init_use_fds(alsa_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.3/policy/modules/admin/anaconda.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.3/policy/modules/admin/anaconda.te	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-04 12:33:34.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -80,9 +80,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.3/policy/modules/admin/brctl.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.3/policy/modules/admin/brctl.te	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-04 12:33:34.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -92,9 +92,9 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_network_state(brctl_t)
  kernel_read_sysctl(brctl_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.3/policy/modules/admin/certwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.3/policy/modules/admin/certwatch.te	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-04 12:33:34.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -104,10 +104,18 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	apache_exec_modules(certwatch_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.3/policy/modules/admin/consoletype.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.3/policy/modules/admin/consoletype.te	2009-11-25 12:39:13.000000000 -0500
-@@ -84,6 +84,7 @@
++++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-04 12:33:34.000000000 -0500
+@@ -10,7 +10,6 @@
+ type consoletype_exec_t;
+ application_executable_file(consoletype_exec_t)
+ init_domain(consoletype_t, consoletype_exec_t)
+-init_system_domain(consoletype_t, consoletype_exec_t)
+ role system_r types consoletype_t;
+ 
+ ########################################
+@@ -84,6 +83,7 @@
  optional_policy(`
  	hal_dontaudit_use_fds(consoletype_t)
  	hal_dontaudit_rw_pipes(consoletype_t)
@@ -115,17 +123,17 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.3/policy/modules/admin/dmesg.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.3/policy/modules/admin/dmesg.fc	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-04 12:33:34.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.3/policy/modules/admin/dmesg.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.3/policy/modules/admin/dmesg.te	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-04 12:33:34.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -167,9 +175,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +#mcelog needs
 +dev_read_raw_memory(dmesg_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.3/policy/modules/admin/firstboot.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.3/policy/modules/admin/firstboot.te	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-04 12:33:34.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -192,9 +200,76 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.3/policy/modules/admin/logrotate.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
+--- nsaserefpolicy/policy/modules/admin/kismet.te	2009-11-25 15:15:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-04 12:33:34.000000000 -0500
+@@ -1,5 +1,5 @@
+ 
+-policy_module(kismet, 1.4.1)
++policy_module(kismet, 1.4.0)
+ 
+ ########################################
+ #
+@@ -11,9 +11,6 @@
+ application_domain(kismet_t, kismet_exec_t)
+ role system_r types kismet_t;
+ 
+-type kismet_home_t;
+-userdom_user_home_content(kismet_home_t)
+-
+ type kismet_log_t;
+ logging_log_file(kismet_log_t)
+ 
+@@ -29,6 +26,9 @@
+ type kismet_var_run_t;
+ files_pid_file(kismet_var_run_t)
+ 
++type kismet_home_t;
++userdom_user_home_content(kismet_home_t)
++
+ ########################################
+ #
+ # kismet local policy
+@@ -42,18 +42,14 @@
+ allow kismet_t self:unix_stream_socket create_stream_socket_perms;
+ allow kismet_t self:tcp_socket create_stream_socket_perms;
+ 
+-manage_dirs_pattern(kismet_t, kismet_home_t, kismet_home_t)
+-manage_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
+-manage_lnk_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
+-userdom_user_home_dir_filetrans(kismet_t, kismet_home_t, { file dir })
+-
+ manage_files_pattern(kismet_t, kismet_log_t, kismet_log_t)
+ allow kismet_t kismet_log_t:dir setattr;
+ logging_log_filetrans(kismet_t, kismet_log_t, { file dir })
+ 
+ manage_dirs_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
+ manage_files_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
+-files_tmp_filetrans(kismet_t, kismet_tmp_t, { file dir })
++manage_sock_files_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
++files_tmp_filetrans(kismet_t, kismet_tmp_t, { file dir sock_file })
+ 
+ manage_dirs_pattern(kismet_t, kismet_tmpfs_t, kismet_tmpfs_t)
+ manage_files_pattern(kismet_t, kismet_tmpfs_t, kismet_tmpfs_t)
+@@ -67,8 +63,15 @@
+ allow kismet_t kismet_var_run_t:dir manage_dir_perms;
+ files_pid_filetrans(kismet_t, kismet_var_run_t, { file dir })
+ 
++manage_dirs_pattern(kismet_t, kismet_home_t, kismet_home_t)
++manage_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
++manage_lnk_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
++userdom_search_user_home_dirs(kismet_t)
++userdom_user_home_dir_filetrans(kismet_t, kismet_home_t, { file dir })
++
+ kernel_search_debugfs(kismet_t)
[...10884 lines suppressed...]
 +	allow $1 { user_home_dir_t user_home_type }:dir search_dir_perms;
++	allow $1 { user_home_dir_t user_home_type }:lnk_file read_lnk_file_perms;
 +')
 +
 +########################################
@@ -31848,7 +33555,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3191,43 @@
+@@ -2897,7 +3186,43 @@
  		type user_tmp_t;
  	')
  
@@ -31893,7 +33600,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3264,7 @@
+@@ -2934,6 +3259,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -31901,7 +33608,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3395,619 @@
+@@ -3064,3 +3390,638 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -32199,10 +33906,10 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +interface(`userdom_execmod_user_home_files',`
 +	gen_require(`
-+		type user_home_t;
++		type user_home_type;
 +	')
 +
-+	allow $1 user_home_t:file execmod;
++	allow $1 user_home_type:file execmod;
 +')
 +
 +########################################
@@ -32243,6 +33950,25 @@ diff -b -B --ignore-all-space --exclude-
 +	exec_files_pattern($1, admin_home_t, admin_home_t)
 +')
 +
++########################################
++## <summary>
++##	Append files inherited
++##	in the /root directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_inherit_append_admin_home_files',`
++	gen_require(`
++		type admin_home_t;
++	')
++
++	allow $1 admin_home_t:file { getattr append };
++')
++
 +
 +#######################################
 +## <summary>
@@ -32521,9 +34247,9 @@ diff -b -B --ignore-all-space --exclude-
 +	read_files_pattern($1, home_cert_t, home_cert_t)
 +	read_lnk_files_pattern($1, home_cert_t, home_cert_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.3/policy/modules/system/userdomain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.3/policy/modules/system/userdomain.te	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-04 12:33:34.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -32612,9 +34338,38 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.3/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2009-11-25 11:47:19.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-09 13:28:05.000000000 -0500
+@@ -180,6 +180,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Connect to xm over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`xen_stream_connect_xm',`
++	gen_require(`
++		type xm_t;
++	')
++
++	files_search_pids($1)
++	stream_connect_pattern($1, xenstored_var_run_t, xenstored_var_run_t, xm_t)
++')
++
++########################################
++## <summary>
+ ##	Connect to xend over an unix domain stream socket.
+ ## </summary>
+ ## <param name="domain">
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.3/policy/modules/system/xen.te	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-09 12:33:13.000000000 -0500
 @@ -85,6 +85,7 @@
  type xenconsoled_t;
  type xenconsoled_exec_t;
@@ -32631,7 +34386,20 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_raw_read_fixed_disk(xend_t)
  storage_raw_write_fixed_disk(xend_t)
-@@ -438,6 +440,8 @@
+@@ -421,6 +423,12 @@
+ xen_stream_connect_xenstore(xm_t)
+ 
+ optional_policy(`
++	vhostmd_rw_tmpfs_files(xm_t)
++    	vhostmd_stream_connect(xm_t)
++	vhostmd_dontaudit_rw_stream_connect(xm_t)
++')
++
++optional_policy(`
+ 	virt_manage_images(xm_t)
+ 	virt_stream_connect(xm_t)
+ ')
+@@ -438,6 +446,8 @@
  	fs_manage_xenfs_dirs(xm_ssh_t)
  	fs_manage_xenfs_files(xm_ssh_t)
  
@@ -32640,10 +34408,37 @@ diff -b -B --ignore-all-space --exclude-
  	#Should have a boolean wrapping these
  	fs_list_auto_mountpoints(xend_t)
  	files_search_mnt(xend_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.3/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.3/policy/support/obj_perm_sets.spt	2009-11-25 12:39:13.000000000 -0500
-@@ -317,3 +317,15 @@
++++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-05 06:20:51.000000000 -0500
+@@ -199,12 +199,14 @@
+ #
+ define(`getattr_file_perms',`{ getattr }')
+ define(`setattr_file_perms',`{ setattr }')
+-define(`read_file_perms',`{ getattr open read lock ioctl }')
++define(`read_inherited_file_perms',`{ getattr read ioctl lock }')
++define(`read_file_perms',`{ open read_inherited_file_perms }')
+ define(`mmap_file_perms',`{ getattr open read execute ioctl }')
+ define(`exec_file_perms',`{ getattr open read execute ioctl execute_no_trans }')
+ define(`append_file_perms',`{ getattr open append lock ioctl }')
+ define(`write_file_perms',`{ getattr open write append lock ioctl }')
+-define(`rw_file_perms',`{ getattr open read write append ioctl lock }')
++define(`rw_inherited_file_perms',`{ getattr read write append ioctl lock }')
++define(`rw_file_perms',`{ open rw_inherited_file_perms }')
+ define(`create_file_perms',`{ getattr create open }')
+ define(`rename_file_perms',`{ getattr rename }')
+ define(`delete_file_perms',`{ getattr unlink }')
+@@ -305,7 +307,8 @@
+ #
+ # Use (read and write) terminals
+ #
+-define(`rw_term_perms', `{ getattr open read write ioctl }')
++define(`rw_inherited_term_perms', `{ getattr open read write ioctl append }')
++define(`rw_term_perms', `{ open rw_inherited_term_perms }')
+ 
+ #
+ # Sockets
+@@ -317,3 +320,14 @@
  # Keys
  #
  define(`manage_key_perms', `{ create link read search setattr view write } ')
@@ -32658,10 +34453,9 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_dbus_perms', `{ acquire_svc send_msg } ')
 +define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ')
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
-+
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.3/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.3/policy/users	2009-11-25 12:39:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/users	2009-12-04 12:33:34.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.939
retrieving revision 1.940
diff -u -p -r1.939 -r1.940
--- selinux-policy.spec	25 Nov 2009 20:19:12 -0000	1.939
+++ selinux-policy.spec	10 Dec 2009 18:56:22 -0000	1.940
@@ -19,7 +19,7 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.7.3
+Version: 3.7.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Dec 4 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-1
+- Update to upstream release
+
 * Mon Nov 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.3-1
 - Add asterisk policy back in
 - Update to upstream release 2.20091117


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- sources	25 Nov 2009 20:19:12 -0000	1.209
+++ sources	10 Dec 2009 18:56:22 -0000	1.210
@@ -1,2 +1,2 @@
 3651679c4b12a31d2ba5f4305bba5540  config.tgz
-ae593cb93bcd26546be99064d16b372a  serefpolicy-3.7.3.tgz
+c9aaca580877d56fe5d13dd814f58efa  serefpolicy-3.7.4.tgz



From jwrdegoede at fedoraproject.org  Thu Dec 10 18:56:30 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 10 Dec 2009 18:56:30 +0000 (UTC)
Subject: rpms/vegastrike/F-12 vegastrike.spec,1.23,1.24
Message-ID: <20091210185630.BB99311C025D@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/vegastrike/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6446

Modified Files:
	vegastrike.spec 
Log Message:
* Thu Dec 10 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-15
- Rebuild for silent boost-python ABI breakage (#540277)



Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/F-12/vegastrike.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- vegastrike.spec	28 Sep 2009 10:27:21 -0000	1.23
+++ vegastrike.spec	10 Dec 2009 18:56:30 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-15
+- Rebuild for silent boost-python ABI breakage (#540277)
+
 * Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.0-14
 - Rebuild for new ogre
 



From peter at fedoraproject.org  Thu Dec 10 19:01:41 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 10 Dec 2009 19:01:41 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd-captcha-bashism.patch, NONE,
	1.1 ejabberd-http-poll-web-page.patch, NONE,
	1.1 ejabberd-mod_admin_extra.patch, NONE,
	1.1 ejabberd-piefxis-vhost-export.patch, NONE,
	1.1 ejabberd-vcard-reqs-forwarding.patch, NONE,
	1.1 ejabberd-ejabberdctl_fix.diff, 1.7, 1.8 ejabberd.spec, 1.47,
	1.48 import.log, 1.15, 1.16
Message-ID: <20091210190141.DC27011C025D@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8075/devel

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.spec import.log 
Added Files:
	ejabberd-captcha-bashism.patch 
	ejabberd-http-poll-web-page.patch 
	ejabberd-mod_admin_extra.patch 
	ejabberd-piefxis-vhost-export.patch 
	ejabberd-vcard-reqs-forwarding.patch 
Log Message:
Fixed all issues, related with upgrading from the previous 2.0.5

ejabberd-captcha-bashism.patch:
 captcha.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ejabberd-captcha-bashism.patch ---
Makes the captcha script explicitly request bash as it uses
its special variable "RANDOM" which is not defined by POSIX.

The issue is tracked upstream at
https://support.process-one.net/browse/EJAB-1105

While it will be sensible to incorporate the upstream fix
(which will make the script work in POSIX-compliant shells also),
until bash is required in Debian, this patch is OK.

diff --git a/tools/captcha.sh b/tools/captcha.sh
index 4d40567..d68edfa 100755
--- a/tools/captcha.sh
+++ b/tools/captcha.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 INPUT=$1
 

ejabberd-http-poll-web-page.patch:
 ejabberd_http_poll.erl |   22 +++++++++++++++++++++-
 mod_http_bind.erl      |   25 ++++++++++++++++---------
 2 files changed, 37 insertions(+), 10 deletions(-)

--- NEW FILE ejabberd-http-poll-web-page.patch ---
Generates a human-readable XHTML page which is returned
when a user tries to browse the HTTP-poll URL configured
for the server (a common mistake).

This issue is tracked in EJAB-1106.

This changeset was introduced in revision 2751,
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/web/ejabberd_http_poll.erl	(revision 2750)
+++ b/src/web/ejabberd_http_poll.erl	(revision 2751)
@@ -154,12 +154,32 @@
 		    end
 	    end;
 	_ ->
-	    {200, [?CT, {"Set-Cookie", "ID=-2:0; expires=-1"}], ""}
+	    HumanHTMLxmlel = get_human_html_xmlel(),
+	    {200, [?CT, {"Set-Cookie", "ID=-2:0; expires=-1"}], HumanHTMLxmlel}
     end;
 process(_, _Request) ->
     {400, [], {xmlelement, "h1", [],
 	       [{xmlcdata, "400 Bad Request"}]}}.
 
+%% Code copied from mod_http_bind.erl and customized
+get_human_html_xmlel() ->
+    Heading = "ejabberd " ++ atom_to_list(?MODULE),
+    {xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"}],
+     [{xmlelement, "head", [],
+       [{xmlelement, "title", [], [{xmlcdata, Heading}]}]},
+      {xmlelement, "body", [],
+       [{xmlelement, "h1", [], [{xmlcdata, Heading}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "An implementation of "},
+          {xmlelement, "a",
+	   [{"href", "http://xmpp.org/extensions/xep-0025.html"}],
+           [{xmlcdata, "Jabber HTTP Polling (XEP-0025)"}]}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "This web page is only informative. "
+	   "To use HTTP-Poll you need a Jabber/XMPP client that supports it."}
+	 ]}
+       ]}]}.
+
 %%%----------------------------------------------------------------------
 %%% Callback functions from gen_fsm
 %%%----------------------------------------------------------------------
--- a/src/web/mod_http_bind.erl	(revision 2750)
+++ b/src/web/mod_http_bind.erl	(revision 2751)
@@ -69,7 +69,14 @@
     ejabberd_http_bind:process_request(Data, IP);
 process([], #request{method = 'GET',
                      data = []}) ->
-    Heading = "Ejabberd " ++ atom_to_list(?MODULE) ++ " v" ++ ?MOD_HTTP_BIND_VERSION,
+    get_human_html_xmlel();
+process(_Path, _Request) ->
+    ?DEBUG("Bad Request: ~p", [_Request]),
+    {400, [], {xmlelement, "h1", [],
+	       [{xmlcdata, "400 Bad Request"}]}}.
+
+get_human_html_xmlel() ->
+    Heading = "ejabberd " ++ atom_to_list(?MODULE) ++ " v" ++ ?MOD_HTTP_BIND_VERSION,
     {xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"}],
      [{xmlelement, "head", [],
        [{xmlelement, "title", [], [{xmlcdata, Heading}]}]},
@@ -77,15 +84,15 @@
        [{xmlelement, "h1", [], [{xmlcdata, Heading}]},
         {xmlelement, "p", [],
          [{xmlcdata, "An implementation of "},
-          {xmlelement, "a", [{"href", "http://www.xmpp.org/extensions/xep-0206.html"}],
-           [{xmlcdata, "XMPP over BOSH (XEP-0206)"}]}]}
-       ]}]};
-process(_Path, _Request) ->
-    ?DEBUG("Bad Request: ~p", [_Request]),
-    {400, [], {xmlelement, "h1", [],
-	       [{xmlcdata, "400 Bad Request"}]}}.
+          {xmlelement, "a",
+	   [{"href", "http://xmpp.org/extensions/xep-0206.html"}],
+           [{xmlcdata, "XMPP over BOSH (XEP-0206)"}]}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "This web page is only informative. "
+	   "To use HTTP-Bind you need a Jabber/XMPP client that supports it."}
+	 ]}
+       ]}]}.
 
-
 %%%----------------------------------------------------------------------
 %%% BEHAVIOUR CALLBACKS
 %%%----------------------------------------------------------------------

ejabberd-mod_admin_extra.patch:
 ejabberd.app        |    1 
 mod_admin_extra.erl | 1279 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1280 insertions(+)

--- NEW FILE ejabberd-mod_admin_extra.patch ---
Adds the mod_admin_extra module to ejabberd.
This module extends the functionality provided by ejabberdctl
by adding several new commands.

The code is taken from the ProcessOne repository:
https://forge.process-one.net/browse/ejabberd-modules/mod_admin_extra
(trunk, revision 976).

diff --git a/src/ejabberd.app b/src/ejabberd.app
index e0e943e..f017015 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -104,6 +104,7 @@
 	     mod_vcard_ldap,
 	     mod_vcard_odbc,
 	     mod_version,
+             mod_admin_extra,
 	     node_buddy,
 	     node_club,
 	     node_default,
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
new file mode 100644
index 0000000..9f3ca14
--- /dev/null
+++ b/src/mod_admin_extra.erl
@@ -0,0 +1,1279 @@
+%%%-------------------------------------------------------------------
+%%% File    : mod_admin_extra.erl
+%%% Author  : Badlop <badlop at process-one.net>
+%%% Purpose : Contributed administrative functions and commands
+%%% Created : 10 Aug 2008 by Badlop <badlop at process-one.net>
+%%%
+%%%
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%%
+%%% 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
+%%%
+%%%-------------------------------------------------------------------
+
+-module(mod_admin_extra).
+-author('badlop at process-one.net').
+
+-behaviour(gen_mod).
+
+-export([start/2, stop/1,
+	 %% Node
+	 compile/1,
+	 load_config/1,
+	 get_cookie/0,
+	 remove_node/1,
+	 export2odbc/2,
+	 %% Accounts
+	 set_password/3,
+	 check_password_hash/4,
+	 delete_old_users/1,
+	 delete_old_users_vhost/2,
+	 ban_account/3,
+	 num_active_users/2,
+	 %% Sessions
+	 num_resources/2,
+	 resource_num/3,
+	 kick_session/4,
+	 status_num/2, status_num/1,
+	 status_list/2, status_list/1,
+	 %% Vcard
+	 set_nickname/3,
+	 get_vcard/3,
+	 get_vcard/4,
+	 set_vcard/4,
+	 set_vcard/5,
+	 %% Roster
+	 add_rosteritem/7,
+	 delete_rosteritem/4,
+	 process_rosteritems/5,
+	 get_roster/2,
+	 push_roster/3,
+	 push_roster_all/1,
+	 push_alltoall/2,
+	 %% mod_shared_roster
+	 srg_create/5,
+	 srg_delete/2,
+	 srg_list/1,
+	 srg_get_info/2,
+	 srg_get_members/2,
+	 srg_user_add/4,
+	 srg_user_del/4,
+	 %% Stanza
+	 send_message_headline/4,
+	 send_message_chat/3,
+	 %% Stats
+	 stats/1, stats/2
+	]).
+
+-include("ejabberd.hrl").
+-include("ejabberd_commands.hrl").
+-include("mod_roster.hrl").
+-include("jlib.hrl").
+
+%% Copied from ejabberd_sm.erl
+-record(session, {sid, usr, us, priority, info}).
+
+
+%%%
+%%% gen_mod
+%%%
+
+start(_Host, _Opts) ->
+    ejabberd_commands:register_commands(commands()).
+
+stop(_Host) ->
+    ejabberd_commands:unregister_commands(commands()).
+
+
+%%%
+%%% Register commands
+%%%
+
+commands() ->
+    Vcard1FieldsString = "Some vcard field names in get/set_vcard are:\n"
+	" FN		- Full Name\n"
+	" NICKNAME	- Nickname\n"
+	" BDAY		- Birthday\n"
+	" TITLE		- Work: Position\n",
+    " ROLE		- Work: Role",
+
+    Vcard2FieldsString = "Some vcard field names and subnames in get/set_vcard2 are:\n"
+	" N FAMILY	- Family name\n"
+	" N GIVEN	- Given name\n"
+	" N MIDDLE	- Middle name\n"
+	" ADR CTRY	- Address: Country\n"
+	" ADR LOCALITY	- Address: City\n"
+	" EMAIL USERID	- E-Mail Address\n"
+	" ORG ORGNAME	- Work: Company\n"
+	" ORG ORGUNIT	- Work: Department",
+
+    VcardXEP = "For a full list of vCard fields check XEP-0054: vcard-temp at "
+	"http://www.xmpp.org/extensions/xep-0054.html",
+
+    [
+     #ejabberd_commands{name = compile, tags = [erlang],
+			desc = "Recompile and reload Erlang source code file",
+			module = ?MODULE, function = compile,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = load_config, tags = [server],
+			desc = "Load ejabberd configuration file",
+			module = ?MODULE, function = load_config,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = get_cookie, tags = [erlang],
+			desc = "Get the Erlang cookie of this node",
+			module = ?MODULE, function = get_cookie,
+			args = [],
+			result = {cookie, string}},
+     #ejabberd_commands{name = remove_node, tags = [erlang],
+			desc = "Remove an ejabberd node from Mnesia clustering config",
+			module = ?MODULE, function = remove_node,
+			args = [{node, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = export2odbc, tags = [mnesia],
+			desc = "Export Mnesia tables to files in directory",
+			module = ?MODULE, function = export2odbc,
+			args = [{host, string}, {path, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = num_active_users, tags = [accounts, stats],
+			desc = "Get number of users active in the last days",
+			module = ?MODULE, function = num_active_users,
+			args = [{host, string}, {days, integer}],
+			result = {users, integer}},
+     #ejabberd_commands{name = delete_old_users, tags = [accounts, purge],
+			desc = "Delete users that didn't log in last days",
+			module = ?MODULE, function = delete_old_users,
+			args = [{days, integer}],
+			result = {res, restuple}},
+     #ejabberd_commands{name = delete_old_users_vhost, tags = [accounts, purge],
+			desc = "Delete users that didn't log in last days in vhost",
+			module = ?MODULE, function = delete_old_users_vhost,
+			args = [{host, string}, {days, integer}],
+			result = {res, restuple}},
+
+     #ejabberd_commands{name = check_account, tags = [accounts],
+			desc = "Check if an acount exists or not",
+			module = ejabberd_auth, function = is_user_exists,
+			args = [{user, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = check_password, tags = [accounts],
+			desc = "Check if a password is correct",
+			module = ejabberd_auth, function = check_password,
+			args = [{user, string}, {host, string}, {password, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = check_password_hash, tags = [accounts],
+			desc = "Check if the password hash is correct",
+			longdesc = "Allowed hash methods: md5, sha.",
+			module = ?MODULE, function = check_password_hash,
+			args = [{user, string}, {host, string}, {passwordhash, string}, {hashmethod, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = change_password, tags = [accounts],
+			desc = "Change the password of an account",
+			module = ?MODULE, function = set_password,
+			args = [{user, string}, {host, string}, {newpass, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = ban_account, tags = [accounts],
+			desc = "Ban an account: kick sessions and set random password",
+			module = ?MODULE, function = ban_account,
+			args = [{user, string}, {host, string}, {reason, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = num_resources, tags = [session],
+			desc = "Get the number of resources of a user",
+			module = ?MODULE, function = num_resources,
+			args = [{user, string}, {host, string}],
+			result = {resources, integer}},
+     #ejabberd_commands{name = resource_num, tags = [session],
+			desc = "Resource string of a session number",
+			module = ?MODULE, function = resource_num,
+			args = [{user, string}, {host, string}, {num, integer}],
+			result = {resource, string}},
+     #ejabberd_commands{name = kick_session, tags = [session],
+			desc = "Kick a user session",
+			module = ?MODULE, function = kick_session,
+			args = [{user, string}, {host, string}, {resource, string}, {reason, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = status_num_host, tags = [session, stats],
+			desc = "Number of logged users with this status in host",
+			module = ?MODULE, function = status_num,
+			args = [{host, string}, {status, string}],
+			result = {users, integer}},
+     #ejabberd_commands{name = status_num, tags = [session, stats],
+			desc = "Number of logged users with this status",
+			module = ?MODULE, function = status_num,
+			args = [{status, string}],
+			result = {users, integer}},
+     #ejabberd_commands{name = status_list_host, tags = [session],
+			desc = "List of users logged in host with their statuses",
+			module = ?MODULE, function = status_list,
+			args = [{host, string}, {status, string}],
+			result = {users, {list,
+					  {userstatus, {tuple, [
+								{user, string},
+								{host, string},
+								{resource, string},
+								{priority, integer},
+								{status, string}
+							       ]}}
+					 }}},
+     #ejabberd_commands{name = status_list, tags = [session],
+			desc = "List of logged users with this status",
+			module = ?MODULE, function = status_list,
+			args = [{status, string}],
+			result = {users, {list,
+					  {userstatus, {tuple, [
+								{user, string},
+								{host, string},
+								{resource, string},
+								{priority, integer},
+								{status, string}
+							       ]}}
+					 }}},
+
+     #ejabberd_commands{name = set_nickname, tags = [vcard],
+			desc = "Set nickname in a user's vcard",
+			module = ?MODULE, function = set_nickname,
+			args = [{user, string}, {host, string}, {nickname, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = get_vcard, tags = [vcard],
+			desc = "Get content from a vCard field",
+			longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP,
+			module = ?MODULE, function = get_vcard,
+			args = [{user, string}, {host, string}, {name, string}],
+			result = {content, string}},
+     #ejabberd_commands{name = get_vcard2, tags = [vcard],
+			desc = "Get content from a vCard field",
+			longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
+			module = ?MODULE, function = get_vcard,
+			args = [{user, string}, {host, string}, {name, string}, {subname, string}],
+			result = {content, string}},
+     #ejabberd_commands{name = set_vcard, tags = [vcard],
+			desc = "Set content in a vCard field",
+			longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP,
+			module = ?MODULE, function = set_vcard,
+			args = [{user, string}, {host, string}, {name, string}, {content, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = set_vcard2, tags = [vcard],
+			desc = "Set content in a vCard subfield",
+			longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
+			module = ?MODULE, function = set_vcard2,
+			args = [{user, string}, {host, string}, {name, string}, {subname, string}, {content, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = add_rosteritem, tags = [roster],
+			desc = "Add an item to a user's roster",
+			module = ?MODULE, function = add_rosteritem,
+			args = [{localuser, string}, {localserver, string},
+				{user, string}, {server, string},
+				{nick, string}, {group, string},
+				{subs, string}],
+			result = {res, rescode}},
+     %%{"", "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"},
+     #ejabberd_commands{name = delete_rosteritem, tags = [roster],
+			desc = "Delete an item from a user's roster",
+			module = ?MODULE, function = delete_rosteritem,
+			args = [{localuser, string}, {localserver, string},
+				{user, string}, {server, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = process_rosteritems, tags = [roster],
+			desc = "List or delete rosteritems that match filtering options",
+			longdesc = "Explanation of each argument:\n"
+			" - action: what to do with each rosteritem that "
+			"matches all the filtering options\n"
+			" - subs: subscription type\n"
+			" - asks: pending subscription\n"
+			" - users: the JIDs of the local user\n"
+			" - contacts: the JIDs of the contact in the roster\n"
+			"\n"
+			"Allowed values in the arguments:\n"
+			"  ACTION = list | delete\n"
+			"  SUBS = SUB[:SUB]* | any\n"
+			"  SUB = none | from | to | both\n"
+			"  ASKS = ASK[:ASK]* | any\n"
+			"  ASK = none | out | in\n"
+			"  USERS = JID[:JID]* | any\n"
+			"  CONTACTS = JID[:JID]* | any\n"
+			"  JID = characters valid in a JID, and can use the "
+			"globs: *, ? and [...]\n"
+			"\n"
+			"This example will list roster items with subscription "
+			"'none', 'from' or 'to' that have any ask property, of "
+			"local users which JID is in the virtual host "
+			"'example.org' and that the contact JID is either a "
+			"bare server name (without user part) or that has a "
+			"user part and the server part contains the word 'icq'"
+			":\n  list none:from:to any *@example.org *:*@*icq*",
+			module = ?MODULE, function = process_rosteritems,
+			args = [{action, string}, {subs, string},
+				{asks, string}, {users, string},
+				{contacts, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = get_roster, tags = [roster],
+			desc = "Get roster of a local user",
+			module = ?MODULE, function = get_roster,
+			args = [{user, string}, {host, string}],
+			result = {contacts, {list, {contact, {tuple, [
+								      {jid, string},
+								      {nick, string},
+								      {group, string}
+								     ]}}}}},
+     #ejabberd_commands{name = push_roster, tags = [roster],
+			desc = "Push template roster from file to a user",
+			module = ?MODULE, function = push_roster,
+			args = [{file, string}, {user, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = push_roster_all, tags = [roster],
+			desc = "Push template roster from file to all those users",
+			module = ?MODULE, function = push_roster_all,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = push_alltoall, tags = [roster],
+			desc = "Add all the users to all the users of Host in Group",
+			module = ?MODULE, function = push_alltoall,
+			args = [{host, string}, {group, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = srg_create, tags = [shared_roster_group],
+			desc = "Create a Shared Roster Group",
+			longdesc = "If you want to specify several group "
+			"identifiers in the Display argument,\n"
+			"put  \\ \" around the argument and\nseparate the "
+			"identifiers with \\ \\ n\n"
+			"For example:\n"
+			"  ejabberdctl srg_create group3 localhost "
+			"name desc \\\"group1\\\\ngroup2\\\"",
+			module = ?MODULE, function = srg_create,
+			args = [{group, string}, {host, string},
+				{name, string}, {description, string}, {display, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_delete, tags = [shared_roster_group],
+			desc = "Delete a Shared Roster Group",
+			module = ?MODULE, function = srg_delete,
+			args = [{group, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_list, tags = [shared_roster_group],
+			desc = "List the Shared Roster Groups in Host",
+			module = ?MODULE, function = srg_list,
+			args = [{host, string}],
+			result = {groups, {list, {id, string}}}},
+     #ejabberd_commands{name = srg_get_info, tags = [shared_roster_group],
+			desc = "Get info of a Shared Roster Group",
+			module = ?MODULE, function = srg_get_info,
+			args = [{group, string}, {host, string}],
+			result = {informations, {list, {information, {tuple, [{key, string}, {value, string}]}}}}},
+     #ejabberd_commands{name = srg_get_members, tags = [shared_roster_group],
+			desc = "Get members of a Shared Roster Group",
+			module = ?MODULE, function = srg_get_members,
+			args = [{group, string}, {host, string}],
+			result = {members, {list, {member, string}}}},
+     #ejabberd_commands{name = srg_user_add, tags = [shared_roster_group],
+			desc = "Add the JID user at host to the Shared Roster Group",
+			module = ?MODULE, function = srg_user_add,
+			args = [{user, string}, {host, string}, {group, string}, {grouphost, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_user_del, tags = [shared_roster_group],
+			desc = "Delete this JID user at host from the Shared Roster Group",
+			module = ?MODULE, function = srg_user_del,
+			args = [{user, string}, {host, string}, {group, string}, {grouphost, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = send_message_chat, tags = [stanza],
+			desc = "Send a chat message to a local or remote bare of full JID",
+			module = ?MODULE, function = send_message_chat,
+			args = [{from, string}, {to, string}, {body, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = send_message_headline, tags = [stanza],
+			desc = "Send a headline message to a local or remote bare of full JID",
+			module = ?MODULE, function = send_message_headline,
+			args = [{from, string}, {to, string},
+				{subject, string}, {body, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = stats, tags = [stats],
+			desc = "Get statistical value: registeredusers onlineusers onlineusersnode uptimeseconds",
+			module = ?MODULE, function = stats,
+			args = [{name, string}],
+			result = {stat, integer}},
+     #ejabberd_commands{name = stats_host, tags = [stats],
+			desc = "Get statistical value for this host: registeredusers onlineusers",
+			module = ?MODULE, function = stats,
+			args = [{name, string}, {host, string}],
+			result = {stat, integer}}
+    ].
+
+
+%%%
+%%% Node
+%%%
+
+compile(File) ->
+    case compile:file(File) of
+	ok -> ok;
+	_ -> error
+    end.
+
+load_config(Path) ->
+    ok = ejabberd_config:load_file(Path).
+
+get_cookie() ->
+    atom_to_list(erlang:get_cookie()).
+
+remove_node(Node) ->
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ok.
+
+export2odbc(Host, Directory) ->
+    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([Directory, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on Host '~s' to file '~s'~n", [Table, Host, Filename]),
+		     Res = (catch ejd2odbc:TableFun(Host, Filename)),
+		     io:format("  Result: ~p~n", [Res])
+	     end,
+    lists:foreach(Export, Tables),
+    ok.
+
+
+%%%
+%%% Accounts
+%%%
+
+set_password(User, Host, Password) ->
+    case ejabberd_auth:set_password(User, Host, Password) of
+	ok ->
+	    ok;
+	_ ->
+	    error
+    end.
+
+%% Copied some code from ejabberd_commands.erl
+check_password_hash(User, Host, PasswordHash, HashMethod) ->
+    AccountPass = ejabberd_auth:get_password_s(User, Host),
+    AccountPassHash = case HashMethod of
+			  "md5" -> get_md5(AccountPass);
+			  "sha" -> get_sha(AccountPass);
+			  _ -> undefined
+		      end,
+    case AccountPassHash of
+	undefined -> error;
+	PasswordHash -> ok;
+	_ -> error
+    end.
+get_md5(AccountPass) ->
+    lists:flatten([io_lib:format("~.16B", [X])
+		   || X <- binary_to_list(crypto:md5(AccountPass))]).
+get_sha(AccountPass) ->
+    lists:flatten([io_lib:format("~.16B", [X])
+		   || X <- binary_to_list(crypto:sha(AccountPass))]).
+
+num_active_users(Host, Days) ->
+    list_last_activity(Host, true, Days).
+
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+list_last_activity(Host, Integral, Days) ->
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp = MegaSecs * 1000000 + Secs,
+    TS = TimeStamp - Days * 86400,
+    case catch mnesia:dirty_select(
+		 last_activity, [{{last_activity, {'_', Host}, '$1', '_'},
+				  [{'>', '$1', TS}],
+				  [{'trunc', {'/',
+					      {'-', TimeStamp, '$1'},
+					      86400}}]}]) of
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = Days - length(Hist),
+			 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 ->
+    histogram(T, Integral, Current, Count + 1, Hist);
+histogram([H | _] = Values, Integral, Current, Count, Hist) when Current < H ->
+    if
+	Integral ->
+	    histogram(Values, Integral, Current + 1, Count, [Count | Hist]);
+	true ->
+	    histogram(Values, Integral, Current + 1, 0, [Count | Hist])
+    end;
+histogram([], _Integral, _Current, Count, Hist) ->
+    if
+	Count > 0 ->
+	    lists:reverse([Count | Hist]);
+	true ->
+	    lists:reverse(Hist)
+    end.
+
+
+-record(last_activity, {us, timestamp, status}).
+
+delete_old_users(Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
+
+    {removed, N, UR} = delete_old_users(Days, Users),
+    {ok, io_lib:format("Deleted ~p users: ~p", [N, UR])}.
+
+delete_old_users_vhost(Host, Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:get_vh_registered_users(Host),
+
+    {removed, N, UR} = delete_old_users(Days, Users),
+    {ok, io_lib:format("Deleted ~p users: ~p", [N, UR])}.
+
+delete_old_users(Days, Users) ->
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% 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 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;
+			    %% 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}.
+
+
+%%
+%% Ban account
+
+ban_account(User, Host, ReasonText) ->
+    Reason = prepare_reason(ReasonText),
+    kick_sessions(User, Host, Reason),
+    set_random_password(User, Host, Reason),
+    ok.
+
+kick_sessions(User, Server, Reason) ->
+    lists:map(
+      fun(Resource) ->
+	      kick_this_session(User, Server, Resource, Reason)
+      end,
+      get_resources(User, Server)).
+
+get_resources(User, Server) ->
+    lists:map(
+      fun(Session) ->
+	      element(3, Session#session.usr)
+      end,
+      get_sessions(User, Server)).
+
+get_sessions(User, Server) ->
+    LUser = jlib:nodeprep(User),
+    LServer = jlib:nameprep(Server),
+    Sessions =  mnesia:dirty_index_read(session, {LUser, LServer}, #session.us),
+    true = is_list(Sessions),
+    Sessions.
+
+set_random_password(User, Server, Reason) ->
+    NewPass = build_random_password(Reason),
+    set_password_auth(User, Server, NewPass).
+
+build_random_password(Reason) ->
+    Date = jlib:timestamp_to_iso(calendar:universal_time()),
+    RandomString = randoms:get_string(),
+    "BANNED_ACCOUNT--" ++ Date ++ "--" ++ RandomString ++ "--" ++ Reason.
+
+set_password_auth(User, Server, Password) ->
+    ok = ejabberd_auth:set_password(User, Server, Password).
+
+prepare_reason([]) ->
+    "Kicked by administrator";
+prepare_reason([Reason]) ->
+    Reason;
+prepare_reason(Reason) when is_list(Reason) ->
+    Reason;
+prepare_reason(StringList) ->
+    string:join(StringList, "_").
+
+
+%%%
+%%% Sessions
+%%%
+
+num_resources(User, Host) ->
+    length(ejabberd_sm:get_user_resources(User, Host)).
+
+resource_num(User, Host, Num) ->
+    Resources = ejabberd_sm:get_user_resources(User, Host),
+    case (0<Num) and (Num=<length(Resources)) of
+	true ->
+	    lists:nth(Num, Resources);
+	false ->
+	    lists:flatten(io_lib:format("Error: Wrong resource number: ~p", [Num]))
+    end.
+
+kick_session(User, Server, Resource, ReasonText) ->
+    kick_this_session(User, Server, Resource, prepare_reason(ReasonText)),
+    ok.
+
+kick_this_session(User, Server, Resource, Reason) ->
+    ejabberd_router:route(
+      jlib:make_jid("", "", ""),
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, Reason}]}).
+
+
+status_num(Host, Status) ->
+    length(get_status_list(Host, Status)).
+status_num(Status) ->
+    status_num("all", Status).
+status_list(Host, Status) ->
+    Res = get_status_list(Host, Status),
+    [{U, S, R, P, St} || {U, S, R, P, St} <- Res].
+status_list(Status) ->
+    status_list("all", Status).
+
+
+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
+		"all" ->
+		    %% 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])].
+
+%% Make string more print-friendly
+stringize(String) ->
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
+
+
+%%%
+%%% Vcard
+%%%
+
+set_nickname(User, Host, Nickname) ->
+    R = mod_vcard:process_sm_iq(
+	  {jid, User, Host, "", User, Host, ""},
+	  {jid, User, Host, "", User, Host, ""},
+	  {iq, "", set, "", "en",
+	   {xmlelement, "vCard",
+	    [{"xmlns", "vcard-temp"}], [
+					{xmlelement, "NICKNAME", [], [{xmlcdata, Nickname}]}
+				       ]
+	   }}),
+    case R of
+	{iq, [], result, [], _L, []} ->
+	    ok;
+	_ ->
+	    error
+    end.
+
+get_vcard(User, Host, Name) ->
+    get_vcard_content(User, Host, [Name]).
+
+get_vcard(User, Host, Name, Subname) ->
+    get_vcard_content(User, Host, [Name, Subname]).
+
+set_vcard(User, Host, Name, Content) ->
+    set_vcard_content(User, Host, [Name], Content).
+
+set_vcard(User, Host, Name, Subname, Content) ->
+    set_vcard_content(User, Host, [Name, Subname], Content).
+
+
+%%
+%% Internal vcard
+
+get_vcard_content(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),
+    case IQr#iq.sub_el of
+	[A1] ->
+	    case get_vcard(Data, A1) of
+		false -> "Error: no_value";
+		Elem -> xml:get_tag_cdata(Elem)
+	    end;
+	[] ->
+	    "Error: no_vcard"
+    end.
+
+get_vcard([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> get_vcard([Data2], A2)
+    end;
+
+get_vcard([Data], A1) ->
+    xml:get_subtag(A1, Data).
+
+set_vcard_content(User, Server, Data, Content) ->
+    [{_, 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.
+
+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).
+
+
+%%%
+%%% Roster
+%%%
+
+add_rosteritem(LocalUser, LocalServer, User, Server, Nick, Group, Subs) ->
+    case add_rosteritem(LocalUser, LocalServer, User, Server, Nick, Group, list_to_atom(Subs), []) of
+	{atomic, ok} ->
+	    push_roster_item(LocalUser, LocalServer, User, Server, {add, Nick, Subs, Group}),
+	    ok;
+	_ ->
+	    error
+    end.
+
+add_rosteritem(LU, LS, User, Server, Nick, Group, Subscription, Xattrs) ->
+    subscribe(LU, LS, User, Server, Nick, Group, Subscription, Xattrs).
+
+subscribe(LU, LS, User, Server, Nick, Group, Subscription, Xattrs) ->
+    mnesia:transaction(
+      fun() ->
+	      mnesia:write({roster,
+			    {LU,LS,{User,Server,[]}}, % uj
+			    {LU,LS},                  % user
+			    {User,Server,[]},      % 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).
+
+delete_rosteritem(LocalUser, LocalServer, User, Server) ->
+    case unsubscribe(LocalUser, LocalServer, User, Server) of
+	{atomic, ok} ->
+	    push_roster_item(LocalUser, LocalServer, User, Server, remove),
+	    ok;
+	_  ->
+	    error
+    end.
+
+unsubscribe(LU, LS, User, Server) ->
+    mnesia:transaction(
+      fun() ->
+              mnesia:delete({roster, {LU, LS, {User, Server, []}}})
+      end).
+
+
+%% -----------------------------
+%% Get Roster
+%% -----------------------------
+
+get_roster(User, Server) ->
+    {ok, Roster} = get_roster2(User, Server),
+    make_roster_xmlrpc(Roster).
+
+get_roster2(User, Server) ->
+    Modules = gen_mod:loaded_modules(Server),
+    Roster = case lists:member(mod_roster, Modules) of
+		 true ->
+		     mod_roster:get_user_roster([], {User, Server});
+		 false ->
+		     case lists:member(mod_roster_odbc, Modules) of
+			 true ->
+			     mod_roster_odbc:get_user_roster([], {User, Server});
+			 false ->
+			     {error, "Neither mod_roster or mod_roster_odbc are enabled"}
+		     end
+	     end,
+    {ok, Roster}.
+
+%% Note: if a contact is in several groups, the contact is returned
+%% several times, each one in a different group.
+make_roster_xmlrpc(Roster) ->
+    lists:foldl(
+      fun(Item, Res) ->
+	      JIDS = jlib:jid_to_string(Item#roster.jid),
+	      Nick = Item#roster.name,
+	      Groups = case Item#roster.groups of
+			   [] -> [""];
+			   Gs -> Gs
+		       end,
+	      ItemsX = [{JIDS, Nick, Group}
+			|| Group <- Groups],
+	      ItemsX ++ Res
+      end,
+      [],
+      Roster).
+
+
+%%-----------------------------
+%% Push Roster from file
+%%-----------------------------
+
+push_roster(File, User, Server) ->
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
+
+push_roster_all(File) ->
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
+
+subscribe_all(Roster) ->
+    subscribe_all(Roster, Roster).
+subscribe_all([], _) ->
+    ok;
+subscribe_all([User1 | Users], Roster) ->
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
+
+subscribe_roster(_, []) ->
+    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({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | 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),
+    ok.
+
+build_list_users(_Group, [], Res) ->
+    Res;
+build_list_users(Group, [{User, Server}|Users], Res) ->
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+
+%% @spec(LU, LS, U, S, Action) -> ok
+%%       Action = {add, Nick, Subs, Group} | remove
+%% @doc Push to the roster of account LU at LS the contact U at S.
+%% The specific action to perform is defined in Action.
+push_roster_item(LU, LS, U, S, Action) ->
+    lists:foreach(fun(R) ->
+			  push_roster_item(LU, LS, R, U, S, Action)
+		  end, ejabberd_sm:get_user_resources(LU, LS)).
+
+push_roster_item(LU, LS, R, U, S, Action) ->
+    Item = build_roster_item(U, S, Action),
+    ResIQ = build_iq_roster_push(Item),
+    LJID = jlib:make_jid(LU, LS, R),
+    ejabberd_router:route(LJID, LJID, ResIQ).
+
+build_roster_item(U, S, {add, Nick, Subs, Group}) ->
+    {xmlelement, "item",
+     [{"jid", jlib:jid_to_string(jlib:make_jid(U, S, ""))},
+      {"name", Nick},
+      {"subscription", Subs}],
+     [{xmlelement, "group", [], [{xmlcdata, Group}]}]
+    };
+build_roster_item(U, S, remove) ->
+    {xmlelement, "item",
+     [{"jid", jlib:jid_to_string(jlib:make_jid(U, S, ""))},
+      {"subscription", "remove"}],
+     []
+    }.
+
+build_iq_roster_push(Item) ->
+    {xmlelement, "iq",
+     [{"type", "set"}, {"id", "push"}],
+     [{xmlelement, "query",
+       [{"xmlns", ?NS_ROSTER}],
+       [Item]
+      }
+     ]
+    }.
+
+
+%%%
+%%% Shared Roster Groups
+%%%
+
+srg_create(Group, Host, Name, Description, Display) ->
+    {ok, DisplayList} = regexp:split(Display, "\\\\n"),
+    Opts = [{name, Name},
+	    {displayed_groups, DisplayList},
+	    {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    ok.
+
+srg_delete(Group, Host) ->
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    ok.
+
+srg_list(Host) ->
+    lists:sort(mod_shared_roster:list_groups(Host)).
+
+srg_get_info(Group, Host) ->
+    Opts = mod_shared_roster:get_group_opts(Host,Group),
+    [{io_lib:format("~p", [Title]),
+      io_lib:format("~p", [Value])} || {Title, Value} <- Opts].
+
+srg_get_members(Group, Host) ->
+    Members = mod_shared_roster:get_group_explicit_users(Host,Group),
+    [jlib:jid_to_string(jlib:make_jid(MUser, MServer, ""))
+     || {MUser, MServer} <- Members].
+
+srg_user_add(User, Host, Group, GroupHost) ->
+    {atomic, ok} = mod_shared_roster:add_user_to_group(GroupHost, {User, Host}, Group),
+    ok.
+
+srg_user_del(User, Host, Group, GroupHost) ->
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(GroupHost, {User, Host}, Group),
+    ok.
+
+
+%%%
+%%% Stanza
+%%%
+
+%% @doc Send a chat message to a Jabber account.
+%% @spec (From::string(), To::string(), Body::string()) -> ok
+send_message_chat(From, To, Body) ->
+    Packet = build_packet(message_chat, [Body]),
+    send_packet_all_resources(From, To, Packet).
+
+%% @doc Send a headline message to a Jabber account.
+%% @spec (From::string(), To::string(), Subject::string(), Body::string()) -> ok
+send_message_headline(From, To, Subject, Body) ->
+    Packet = build_packet(message_headline, [Subject, Body]),
+    send_packet_all_resources(From, To, Packet).
+
+%% @doc Send a packet to a Jabber account.
+%% If a resource was specified in the JID,
+%% the packet is sent only to that specific resource.
+%% If no resource was specified in the JID,
+%% and the user is remote or local but offline,
+%% the packet is sent to the bare JID.
+%% If the user is local and is online in several resources,
+%% the packet is sent to all its resources.
+send_packet_all_resources(FromJIDString, ToJIDString, Packet) ->
+    FromJID = jlib:string_to_jid(FromJIDString),
+    ToJID = jlib:string_to_jid(ToJIDString),
+    ToUser = ToJID#jid.user,
+    ToServer = ToJID#jid.server,
+    case ToJID#jid.resource of
+	"" ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, Packet);
+	Res ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, Res, Packet)
+    end.
+
+send_packet_all_resources(FromJID, ToUser, ToServer, Packet) ->
+    case ejabberd_sm:get_user_resources(ToUser, ToServer) of
+	[] ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, "", Packet);
+	ToResources ->
+	    lists:foreach(
+	      fun(ToResource) ->
+		      send_packet_all_resources(FromJID, ToUser, ToServer,
+						ToResource, Packet)
+	      end,
+	      ToResources)
+    end.
+
+send_packet_all_resources(FromJID, ToU, ToS, ToR, Packet) ->
+    ToJID = jlib:make_jid(ToU, ToS, ToR),
+    ejabberd_router:route(FromJID, ToJID, Packet).
+
+
+build_packet(message_chat, [Body]) ->
+    {xmlelement, "message",
+     [{"type", "chat"}],
+     [{xmlelement, "body", [], [{xmlcdata, Body}]}]
+    };
+build_packet(message_headline, [Subject, Body]) ->
+    {xmlelement, "message",
+     [{"type", "headline"}],
+     [{xmlelement, "subject", [], [{xmlcdata, Subject}]},
+      {xmlelement, "body", [], [{xmlcdata, Body}]}
+     ]
+    }.
+
+%%%
+%%% Stats
+%%%
+
+stats(Name) ->
+    case Name of
+	"uptimeseconds" -> trunc(element(1, erlang:statistics(wall_clock))/1000);
+	"registeredusers" -> length(ejabberd_auth:dirty_get_registered_users());
+	"onlineusersnode" -> length(ejabberd_sm:dirty_get_my_sessions_list());
+	"onlineusers" -> length(ejabberd_sm:dirty_get_sessions_list())
+    end.
+
+stats(Name, Host) ->
+    case Name of
+	"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+    end.
+
+
+
+%%-----------------------------
+%% Purge roster items
+%%-----------------------------
+
+process_rosteritems(ActionS, SubsS, AsksS, UsersS, ContactsS) ->
+    Action = case ActionS of
+		 "list" -> list;
+		 "delete" -> delete
+	     end,
+
+    Subs = lists:foldl(
+	     fun(any, _) -> [none, from, to, both];
+		(Sub, Subs) -> [Sub | Subs]
+	     end,
+	     [],
+	     [list_to_atom(S) || S <- string:tokens(SubsS, ":")]
+	    ),
+
+    Asks = lists:foldl(
+	     fun(any, _) -> [none, out, in];
+		(Ask, Asks) -> [Ask | Asks]
+	     end,
+	     [],
+	     [list_to_atom(S) || S <- string:tokens(AsksS, ":")]
+	    ),
+
+    Users = lists:foldl(
+	      fun("any", _) -> ["*", "*@*"];
+		 (U, Us) -> [U | Us]
+	      end,
+	      [],
+	      [S || S <- string:tokens(UsersS, ":")]
+	     ),
+
+    Contacts = lists:foldl(
+		 fun("any", _) -> ["*", "*@*"];
+		    (U, Us) -> [U | Us]
+		 end,
+		 [],
+		 [S || S <- string:tokens(ContactsS, ":")]
+		),
+
+    case rosteritem_purge({Action, Subs, Asks, Users, Contacts}) of
+	{atomic, ok} ->
+	    ok;
+	{error, Reason} ->
+	    io:format("Error purging rosteritems: ~p~n", [Reason]),
+	    error;
+	{badrpc, Reason} ->
+	    io:format("BadRPC purging rosteritems: ~p~n", [Reason]),
+	    error
+    end.
+
+%% @spec ({Action::atom(), Subs::[atom()], Asks::[atom()], User::string(), Contact::string()}) -> {atomic, ok}
+rosteritem_purge(Options) ->
+    Num_rosteritems = mnesia:table_info(roster, size),
+    io:format("There are ~p roster items in total.~n", [Num_rosteritems]),
+    Key = mnesia:dirty_first(roster),
+    ok = rip(Key, Options, {0, Num_rosteritems, 0, 0}),
+    {atomic, ok}.
+
+rip('$end_of_table', _Options, Counters) ->
+    print_progress_line(Counters),
+    ok;
+rip(Key, Options, {Pr, NT, NV, ND}) ->
+    Key_next = mnesia:dirty_next(roster, Key),
+    {Action, _, _, _, _} = Options,
+    ND2 = case decide_rip(Key, Options) of
+	      true ->
+		  apply_action(Action, Key),
+		  ND+1;
+	      false ->
+		  ND
+	  end,
+    NV2 = NV+1,
+    Pr2 = print_progress_line({Pr, NT, NV2, ND2}),
+    rip(Key_next, Options, {Pr2, NT, NV2, ND2}).
+
+apply_action(list, Key) ->
+    {User, Server, JID} = Key,
+    {RUser, RServer, _} = JID,
+    io:format("Matches: ~s@~s ~s@~s~n", [User, Server, RUser, RServer]);
+apply_action(delete, Key) ->
+    apply_action(list, Key),
+    mnesia:dirty_delete(roster, Key).
+
+print_progress_line({Pr, NT, NV, ND}) ->
+    Pr2 = trunc((NV/NT)*100),
+    case Pr == Pr2 of
+	true ->
+	    ok;
+	false ->
+	    io:format("Progress ~p% - visited ~p - deleted ~p~n", [Pr2, NV, ND])
+    end,
+    Pr2.
+
+decide_rip(Key, {_Action, Subs, Asks, User, Contact}) ->
+    case catch mnesia:dirty_read(roster, Key) of
+	[RI] ->
+	    lists:member(RI#roster.subscription, Subs)
+		andalso lists:member(RI#roster.ask, Asks)
+		andalso decide_rip_jid(RI#roster.us, User)
+		andalso decide_rip_jid(RI#roster.jid, Contact);
+	_ ->
+	    false
+    end.
+
+%% Returns true if the server of the JID is included in the servers
+decide_rip_jid({UName, UServer, _UResource}, Match_list) ->
+    decide_rip_jid({UName, UServer}, Match_list);
+decide_rip_jid({UName, UServer}, Match_list) ->
+    lists:any(
+      fun(Match_string) ->
+	      MJID = jlib:string_to_jid(Match_string),
+	      MName = MJID#jid.luser,
+	      MServer = MJID#jid.lserver,
+	      Is_server = is_glob_match(UServer, MServer),
+	      case MName of
+		  [] when UName == [] ->
+		      Is_server;
+		  [] ->
+		      false;
+		  _ ->
+		      Is_server
+			  andalso is_glob_match(UName, MName)
+	      end
+      end,
+      Match_list).
+
+%% Copied from ejabberd-2.0.0/src/acl.erl
+is_regexp_match(String, RegExp) ->
+    case regexp:first_match(String, RegExp) of
+	nomatch ->
+	    false;
+	{match, _, _} ->
+	    true;
+	{error, ErrDesc} ->
+	    io:format(
+	      "Wrong regexp ~p in ACL: ~p",
+	      [RegExp, lists:flatten(regexp:format_error(ErrDesc))]),
+	    false
+    end.
+is_glob_match(String, Glob) ->
+    is_regexp_match(String, regexp:sh_to_awk(Glob)).

ejabberd-piefxis-vhost-export.patch:
 ejabberd_piefxis.erl |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

--- NEW FILE ejabberd-piefxis-vhost-export.patch ---
This patch enables generation of the main XML file
when exporting data of a virtual host into PIEFXIS format.

This issue is tracked upstream as EJAB-1098.

This changeset was introduced in revisions 2753,
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/ejabberd_piefxis.erl	(revision 2752)
+++ b/src/ejabberd_piefxis.erl	(revision 2753)
@@ -212,7 +212,7 @@
 		   El),
 	    ok;
 	{atomic, exists} ->
-	    ?INFO_MSG("User ~p@~p already exists, using stored profile...~n",
+	    io:format("Account ~s@~s already exists, updating it...~n",
 		      [User, Domain]),
 	    io:format(""),
 	    ok = exmpp_xml:foreach(
@@ -417,10 +417,10 @@
 
 %%%==================================
 
-%%%% Export server
+%%%% Export hosts
 
-%% @spec (Dir::string()) -> ok
-export_server(Dir) ->
+%% @spec (Dir::string(), Hosts::[string()]) -> ok
+export_hosts(Dir, Hosts) ->
     try_start_exmpp(),
 
     FnT = make_filename_template(),
@@ -430,7 +430,6 @@
     print(Fd, make_piefxis_xml_head()),
     print(Fd, make_piefxis_server_head()),
 
-    Hosts = ?MYHOSTS,
     FilesAndHosts = [{make_host_filename(FnT, Host), Host} || Host <- Hosts],
     [print(Fd, make_xinclude(FnH)) || {FnH, _Host} <- FilesAndHosts],
 
@@ -443,14 +442,20 @@
     ok.
 
 %%%==================================
+%%%% Export server
+
+%% @spec (Dir::string()) -> ok
+export_server(Dir) ->
+    Hosts = ?MYHOSTS,
+    export_hosts(Dir, Hosts).
+
+%%%==================================
 %%%% Export host
 
 %% @spec (Dir::string(), Host::string()) -> ok
 export_host(Dir, Host) ->
-    try_start_exmpp(),
-    FnT = make_filename_template(),
-    FnH = make_host_filename(FnT, Host),
-    export_host(Dir, FnH, Host).
+    Hosts = [Host],
+    export_hosts(Dir, Hosts).
 
 %% @spec (Dir::string(), Fn::string(), Host::string()) -> ok
 export_host(Dir, FnH, Host) ->

ejabberd-vcard-reqs-forwarding.patch:
 ejabberd_c2s.erl         |    2 -
 ejabberd_sm.erl          |    2 -
 mod_muc/mod_muc_room.erl |   58 ++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 54 insertions(+), 8 deletions(-)

--- NEW FILE ejabberd-vcard-reqs-forwarding.patch ---
This bug fixes a long-standing bug with ejabberd violating
RFC 3920 by intercepting vCard request coming to a user's
full JID, which should be forwarded to the user's client instead.
This behaviour is especially noticeable in MUC rooms.

This issue is tracked upstream as EJAB-1045.

This changeset was introduced in revisions 2766-2768
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/ejabberd_sm.erl	(revision 2762)
+++ b/src/ejabberd_sm.erl	(revision 2768)
@@ -481,7 +481,7 @@
 				_ ->
 				    Err =
 					jlib:make_error_reply(
-					  Packet, ?ERR_RECIPIENT_UNAVAILABLE),
+					  Packet, ?ERR_SERVICE_UNAVAILABLE),
 				    ejabberd_router:route(To, From, Err)
 			    end;
 			_ ->
--- a/src/mod_muc/mod_muc_room.erl	(revision 2762)
+++ b/src/mod_muc/mod_muc_room.erl	(revision 2768)
@@ -470,9 +470,10 @@
 	      {xmlelement, "iq", Attrs, _Els} = Packet},
 	     StateData) ->
     Lang = xml:get_attr_s("xml:lang", Attrs),
+    StanzaId = xml:get_attr_s("id", Attrs),
     case {(StateData#state.config)#config.allow_query_users,
-	  is_user_online(From, StateData)} of
-	{true, true} ->
+	  is_user_online_iq(StanzaId, From, StateData)} of
+	{true, {true, NewId, FromFull}} ->
 	    case find_jid_by_nick(ToNick, StateData) of
 		false ->
 		    case jlib:iq_query_info(Packet) of
@@ -489,13 +490,15 @@
 		    end;
 		ToJID ->
 		    {ok, #user{nick = FromNick}} =
-			?DICT:find(jlib:jid_tolower(From),
+			?DICT:find(jlib:jid_tolower(FromFull),
 				   StateData#state.users),
+		    {ToJID2, Packet2} = handle_iq_vcard(FromFull, ToJID,
+							StanzaId, NewId,Packet),
 		    ejabberd_router:route(
 		      jlib:jid_replace_resource(StateData#state.jid, FromNick),
-		      ToJID, Packet)
+		      ToJID2, Packet2)
 	    end;
-	{_, false} ->
+	{_, {false, _, _}} ->
 	    case jlib:iq_query_info(Packet) of
 		reply ->
 		    ok;
@@ -829,7 +832,6 @@
 	    {next_state, normal_state, StateData}
     end.
 
-
 %% @doc Check if this non participant can send message to room.
 %%
 %% XEP-0045 v1.23:
@@ -969,6 +971,50 @@
     LJID = jlib:jid_tolower(JID),
     ?DICT:is_key(LJID, StateData#state.users).
 
+
+%%%
+%%% Handle IQ queries of vCard
+%%%
+is_user_online_iq(StanzaId, JID, StateData) when JID#jid.lresource /= "" ->
+    {is_user_online(JID, StateData), StanzaId, JID};
+is_user_online_iq(StanzaId, JID, StateData) when JID#jid.lresource == "" ->
+    try stanzaid_unpack(StanzaId) of
+	{OriginalId, Resource} ->
+	    JIDWithResource = jlib:jid_replace_resource(JID, Resource),
+	    {is_user_online(JIDWithResource, StateData),
+	     OriginalId, JIDWithResource}
+    catch
+	_:_ ->
+	    {is_user_online(JID, StateData), StanzaId, JID}
+    end.
+
+handle_iq_vcard(FromFull, ToJID, StanzaId, NewId, Packet) ->
+    ToBareJID = jlib:jid_remove_resource(ToJID),
+    IQ = jlib:iq_query_info(Packet),
+    handle_iq_vcard2(FromFull, ToJID, ToBareJID, StanzaId, NewId, IQ, Packet).
+handle_iq_vcard2(_FromFull, ToJID, ToBareJID, StanzaId, _NewId,
+		 #iq{type = get, xmlns = ?NS_VCARD}, Packet)
+  when ToBareJID /= ToJID ->
+    {ToBareJID, change_stanzaid(StanzaId, ToJID, Packet)};
+handle_iq_vcard2(_FromFull, ToJID, _ToBareJID, _StanzaId, NewId, _IQ, Packet) ->
+    {ToJID, change_stanzaid(NewId, Packet)}.
+
+stanzaid_pack(OriginalId, Resource) ->
+    "berd"++base64:encode_to_string("ejab\0" ++ OriginalId ++ "\0" ++ Resource).
+stanzaid_unpack("berd"++StanzaIdBase64) ->
+    StanzaId = base64:decode_to_string(StanzaIdBase64),
+    ["ejab", OriginalId, Resource] = string:tokens(StanzaId, "\0"),
+    {OriginalId, Resource}.
+
+change_stanzaid(NewId, Packet) ->
+    {xmlelement, Name, Attrs, Els} = jlib:remove_attr("id", Packet),
+    {xmlelement, Name, [{"id", NewId} | Attrs], Els}.
+change_stanzaid(PreviousId, ToJID, Packet) ->
+    NewId = stanzaid_pack(PreviousId, ToJID#jid.lresource),
+    change_stanzaid(NewId, Packet).
+%%%
+%%%
+
 role_to_list(Role) ->
     case Role of
 	moderator ->   "moderator";
--- a/src/ejabberd_c2s.erl	(revision 2762)
+++ b/src/ejabberd_c2s.erl	(revision 2768)
@@ -1220,7 +1220,7 @@
 	    "iq" ->
 		IQ = jlib:iq_query_info(Packet),
 		case IQ of
-		    #iq{xmlns = ?NS_VCARD} ->
+		    #iq{xmlns = ?NS_VCARD} when (To#jid.luser == "") or (To#jid.lresource == "") ->
 			Host = StateData#state.server,
 			case ets:lookup(sm_iqtable, {?NS_VCARD, Host}) of
 			    [{_, Module, Function, Opts}] ->

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ejabberd-ejabberdctl_fix.diff	21 Nov 2009 08:01:19 -0000	1.7
+++ ejabberd-ejabberdctl_fix.diff	10 Dec 2009 19:01:41 -0000	1.8
@@ -1,5 +1,5 @@
---- src/ejabberdctl.template.fix_ctl	2009-11-06 22:53:19.000000000 +0300
-+++ src/ejabberdctl.template	2009-11-21 10:43:17.654686409 +0300
+--- src/ejabberdctl.template	2009-11-06 22:53:19.000000000 +0300
++++ src/ejabberdctl.template	2009-12-10 21:07:28.648659178 +0300
 @@ -9,10 +9,10 @@
  
  # define default environment variables
@@ -13,6 +13,15 @@
  
  # parse command line parameters
  ARGS=
+@@ -46,7 +46,7 @@
+     LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
+ fi
+ if [ "$SPOOLDIR" = "" ] ; then
+-    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
++    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd/spool
+ fi
+ if [ "$EJABBERD_DOC_PATH" = "" ] ; then
+     EJABBERD_DOC_PATH=@DOCDIR@
 @@ -60,14 +60,14 @@
  EJID=`id -g $INSTALLUSER`
  EXEC_CMD="false"


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ejabberd.spec	21 Nov 2009 08:01:19 -0000	1.47
+++ ejabberd.spec	10 Dec 2009 19:01:41 -0000	1.48
@@ -12,7 +12,7 @@
 
 Name:           ejabberd
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -24,7 +24,7 @@ Source2:        ejabberd.logrotate
 Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
-# this module will be removed in the near future in favor of mod_admin_extra
+# this module will be removed in the nearest future in favor of mod_admin_extra
 # svn export -r 1020 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
 Source4:        mod_ctlextra.erl
 
@@ -47,7 +47,23 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
 # fixed delays in s2s connections
 Patch8: ejabberd-fixed_delays_in_s2s.patch
-
+# captcha.sh uses some BASH-specific variables
+# see https://support.process-one.net/browse/EJAB-1105
+Patch9: ejabberd-captcha-bashism.patch
+# Introducing mod_admin_extra
+Patch10: ejabberd-mod_admin_extra.patch
+# Fixed long-standing bug with RFC 3920 violation
+# see https://support.process-one.net/browse/EJAB-1045
+Patch11: ejabberd-vcard-reqs-forwarding.patch
+# Generates a human-readable XHTML page which is returned
+# when a user tries to browse the HTTP-poll URL configured
+# for the server (a common mistake).
+# see https://support.process-one.net/browse/EJAB-1106
+Patch12: ejabberd-http-poll-web-page.patch
+# This patch enables generation of the main XML file
+# when exporting data of a virtual host into PIEFXIS format.
+# see https://support.process-one.net/browse/EJAB-1098
+Patch13: ejabberd-piefxis-vhost-export.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -93,6 +109,33 @@ Documentation for ejabberd.
 %{__fe_groupadd} %{uid} -r %{name} &>/dev/null || :
 %{__fe_useradd} %{uid} -r -s /sbin/nologin -d /var/lib/ejabberd -M \
 			-c 'ejabberd' -g %{name} %{name} &>/dev/null || :
+# we should backup DB in every upgrade
+if ejabberdctl status >/dev/null ; then
+	# Use timestamp to make database restoring easier
+	TIME=$(date +%Y-%m-%dT%H:%M:%S)
+	BACKUPDIR=$(mktemp -d -p /var/tmp/ ejabberd-$TIME.XXXXXX)
+	chown ejabberd:ejabberd $BACKUPDIR
+	BACKUP=$BACKUPDIR/ejabberd-database
+	ejabberdctl backup $BACKUP
+	# Change ownership to root:root because ejabberd user might be
+	# removed on package removal.
+	chown -R root:root $BACKUPDIR
+	chmod 700 $BACKUPDIR
+	echo
+	echo The ejabberd database has been backed up to $BACKUP.
+	echo
+fi
+
+# fix cookie path (since ver. 2.1.0 cookie stored in /var/lib/ejabberd/spool
+# rather than in /var/lib/ejabberd
+if [ -f /var/lib/ejabberd/.erlang.cookie ]; then
+	cp -pf /var/lib/ejabberd/{,spool/}.erlang.cookie
+	echo
+	echo The ejabberd cookie file was moved.
+	echo Please remove old one from /var/lib/ejabberd/.erlang.cookie
+	echo
+fi
+
 
 %post
 /sbin/chkconfig --add %{name}
@@ -134,6 +177,11 @@ fi
 %patch3 -p0 -b .pam_name
 %patch5 -p0 -b .mod_ctlextra
 %patch8 -p0 -b .s2s
+%patch9 -p1 -b .bashism
+%patch10 -p1 -b .mod_admin_extra
+%patch11 -p1 -b .vcard_rfc_violation
+%patch12 -p1 -b .xhtml
+%patch13 -p1 -b .piefxis
 
 dos2unix src/odbc/mssql2000.sql
 
@@ -169,6 +217,9 @@ chmod a+x %{buildroot}%{_libdir}/%{name}
 # fix example SSL certificate path to real one, which we created recently (see above)
 %{__perl} -pi -e 's!/path/to/ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
 
+# fix captcha path
+%{__perl} -pi -e 's!/lib/ejabberd/priv/bin/captcha.sh!%{_libdir}/%{name}/priv/bin/captcha.sh!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
+
 mkdir -p %{buildroot}/var/log/ejabberd
 mkdir -p %{buildroot}/var/lib/ejabberd/spool
 
@@ -194,12 +245,9 @@ install -p -m 0644 src/odbc/mssql2000.sq
 install -p -m 0644 src/odbc/mssql2005.sql %{buildroot}%{_datadir}/%{name}
 install -p -m 0644 src/odbc/mysql.sql %{buildroot}%{_datadir}/%{name}
 install -p -m 0644 src/odbc/pg.sql %{buildroot}%{_datadir}/%{name}
-# install example script for CAPTCHA-protection
-install -p -m 0644 tools/captcha.sh %{buildroot}%{_datadir}/%{name}
 
 # removed files, which would be packaged later (see 'files' section)
 rm -rf %{buildroot}%{_docdir}/%{name}
-rm -f %{buildroot}%{_libdir}/%{name}/priv/bin/captcha.sh
 
 %clean
 rm -rf %{buildroot}
@@ -253,6 +301,7 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/include/mod_roster.hrl
 %{_libdir}/%{name}/include/web/ejabberd_http.hrl
 %{_libdir}/%{name}/include/web/ejabberd_web_admin.hrl
+%{_libdir}/%{name}/priv/bin/captcha.sh
 %attr(4750,root,ejabberd) %{_libdir}/%{name}/priv/bin/epam
 %{_libdir}/%{name}/priv/lib/ejabberd_zlib_drv.so
 %{_libdir}/%{name}/priv/lib/expat_erl.so
@@ -262,7 +311,6 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/priv/msgs/*.msg
 
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/captcha.sh
 %{_datadir}/%{name}/mssql2000.sql
 %{_datadir}/%{name}/mssql2005.sql
 %{_datadir}/%{name}/mysql.sql
@@ -303,6 +351,11 @@ rm -rf %{buildroot}
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Dec 10 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-2
+- DB backups are made on every upgrade/uninstall
+- Fixed installation of captcha.sh example helper
+- Added patches 9,10,11,12,13 from Debian's package
+
 * Fri Nov 20 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-1
 - Ver. 2.1.0
 - Upstream no longer providing ChangeLog


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	21 Nov 2009 08:01:19 -0000	1.15
+++ import.log	10 Dec 2009 19:01:41 -0000	1.16
@@ -13,3 +13,4 @@ ejabberd-2_0_5-6_fc11:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-8_fc11:HEAD:ejabberd-2.0.5-8.fc11.src.rpm:1252493017
 ejabberd-2_0_5-10_fc11:HEAD:ejabberd-2.0.5-10.fc11.src.rpm:1257428310
 ejabberd-2_1_0-1_fc12:HEAD:ejabberd-2.1.0-1.fc12.src.rpm:1258790332
+ejabberd-2_1_0-2_fc12:HEAD:ejabberd-2.1.0-2.fc12.src.rpm:1260471420



From peter at fedoraproject.org  Thu Dec 10 19:09:43 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 10 Dec 2009 19:09:43 +0000 (UTC)
Subject: rpms/ejabberd/F-12 ejabberd-captcha-bashism.patch, NONE,
	1.1 ejabberd-http-poll-web-page.patch, NONE,
	1.1 ejabberd-mod_admin_extra.patch, NONE,
	1.1 ejabberd-piefxis-vhost-export.patch, NONE,
	1.1 ejabberd-vcard-reqs-forwarding.patch, NONE,
	1.1 ejabberd-ejabberdctl_fix.diff, 1.7, 1.8 ejabberd.spec, 1.47,
	1.48 import.log, 1.15, 1.16
Message-ID: <20091210190943.6875611C025D@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10376/F-12

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.spec import.log 
Added Files:
	ejabberd-captcha-bashism.patch 
	ejabberd-http-poll-web-page.patch 
	ejabberd-mod_admin_extra.patch 
	ejabberd-piefxis-vhost-export.patch 
	ejabberd-vcard-reqs-forwarding.patch 
Log Message:
Fixed all issues, related with upgrading from the previous 2.0.5

ejabberd-captcha-bashism.patch:
 captcha.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ejabberd-captcha-bashism.patch ---
Makes the captcha script explicitly request bash as it uses
its special variable "RANDOM" which is not defined by POSIX.

The issue is tracked upstream at
https://support.process-one.net/browse/EJAB-1105

While it will be sensible to incorporate the upstream fix
(which will make the script work in POSIX-compliant shells also),
until bash is required in Debian, this patch is OK.

diff --git a/tools/captcha.sh b/tools/captcha.sh
index 4d40567..d68edfa 100755
--- a/tools/captcha.sh
+++ b/tools/captcha.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 INPUT=$1
 

ejabberd-http-poll-web-page.patch:
 ejabberd_http_poll.erl |   22 +++++++++++++++++++++-
 mod_http_bind.erl      |   25 ++++++++++++++++---------
 2 files changed, 37 insertions(+), 10 deletions(-)

--- NEW FILE ejabberd-http-poll-web-page.patch ---
Generates a human-readable XHTML page which is returned
when a user tries to browse the HTTP-poll URL configured
for the server (a common mistake).

This issue is tracked in EJAB-1106.

This changeset was introduced in revision 2751,
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/web/ejabberd_http_poll.erl	(revision 2750)
+++ b/src/web/ejabberd_http_poll.erl	(revision 2751)
@@ -154,12 +154,32 @@
 		    end
 	    end;
 	_ ->
-	    {200, [?CT, {"Set-Cookie", "ID=-2:0; expires=-1"}], ""}
+	    HumanHTMLxmlel = get_human_html_xmlel(),
+	    {200, [?CT, {"Set-Cookie", "ID=-2:0; expires=-1"}], HumanHTMLxmlel}
     end;
 process(_, _Request) ->
     {400, [], {xmlelement, "h1", [],
 	       [{xmlcdata, "400 Bad Request"}]}}.
 
+%% Code copied from mod_http_bind.erl and customized
+get_human_html_xmlel() ->
+    Heading = "ejabberd " ++ atom_to_list(?MODULE),
+    {xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"}],
+     [{xmlelement, "head", [],
+       [{xmlelement, "title", [], [{xmlcdata, Heading}]}]},
+      {xmlelement, "body", [],
+       [{xmlelement, "h1", [], [{xmlcdata, Heading}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "An implementation of "},
+          {xmlelement, "a",
+	   [{"href", "http://xmpp.org/extensions/xep-0025.html"}],
+           [{xmlcdata, "Jabber HTTP Polling (XEP-0025)"}]}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "This web page is only informative. "
+	   "To use HTTP-Poll you need a Jabber/XMPP client that supports it."}
+	 ]}
+       ]}]}.
+
 %%%----------------------------------------------------------------------
 %%% Callback functions from gen_fsm
 %%%----------------------------------------------------------------------
--- a/src/web/mod_http_bind.erl	(revision 2750)
+++ b/src/web/mod_http_bind.erl	(revision 2751)
@@ -69,7 +69,14 @@
     ejabberd_http_bind:process_request(Data, IP);
 process([], #request{method = 'GET',
                      data = []}) ->
-    Heading = "Ejabberd " ++ atom_to_list(?MODULE) ++ " v" ++ ?MOD_HTTP_BIND_VERSION,
+    get_human_html_xmlel();
+process(_Path, _Request) ->
+    ?DEBUG("Bad Request: ~p", [_Request]),
+    {400, [], {xmlelement, "h1", [],
+	       [{xmlcdata, "400 Bad Request"}]}}.
+
+get_human_html_xmlel() ->
+    Heading = "ejabberd " ++ atom_to_list(?MODULE) ++ " v" ++ ?MOD_HTTP_BIND_VERSION,
     {xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"}],
      [{xmlelement, "head", [],
        [{xmlelement, "title", [], [{xmlcdata, Heading}]}]},
@@ -77,15 +84,15 @@
        [{xmlelement, "h1", [], [{xmlcdata, Heading}]},
         {xmlelement, "p", [],
          [{xmlcdata, "An implementation of "},
-          {xmlelement, "a", [{"href", "http://www.xmpp.org/extensions/xep-0206.html"}],
-           [{xmlcdata, "XMPP over BOSH (XEP-0206)"}]}]}
-       ]}]};
-process(_Path, _Request) ->
-    ?DEBUG("Bad Request: ~p", [_Request]),
-    {400, [], {xmlelement, "h1", [],
-	       [{xmlcdata, "400 Bad Request"}]}}.
+          {xmlelement, "a",
+	   [{"href", "http://xmpp.org/extensions/xep-0206.html"}],
+           [{xmlcdata, "XMPP over BOSH (XEP-0206)"}]}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "This web page is only informative. "
+	   "To use HTTP-Bind you need a Jabber/XMPP client that supports it."}
+	 ]}
+       ]}]}.
 
-
 %%%----------------------------------------------------------------------
 %%% BEHAVIOUR CALLBACKS
 %%%----------------------------------------------------------------------

ejabberd-mod_admin_extra.patch:
 ejabberd.app        |    1 
 mod_admin_extra.erl | 1279 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1280 insertions(+)

--- NEW FILE ejabberd-mod_admin_extra.patch ---
Adds the mod_admin_extra module to ejabberd.
This module extends the functionality provided by ejabberdctl
by adding several new commands.

The code is taken from the ProcessOne repository:
https://forge.process-one.net/browse/ejabberd-modules/mod_admin_extra
(trunk, revision 976).

diff --git a/src/ejabberd.app b/src/ejabberd.app
index e0e943e..f017015 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -104,6 +104,7 @@
 	     mod_vcard_ldap,
 	     mod_vcard_odbc,
 	     mod_version,
+             mod_admin_extra,
 	     node_buddy,
 	     node_club,
 	     node_default,
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
new file mode 100644
index 0000000..9f3ca14
--- /dev/null
+++ b/src/mod_admin_extra.erl
@@ -0,0 +1,1279 @@
+%%%-------------------------------------------------------------------
+%%% File    : mod_admin_extra.erl
+%%% Author  : Badlop <badlop at process-one.net>
+%%% Purpose : Contributed administrative functions and commands
+%%% Created : 10 Aug 2008 by Badlop <badlop at process-one.net>
+%%%
+%%%
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%%
+%%% 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
+%%%
+%%%-------------------------------------------------------------------
+
+-module(mod_admin_extra).
+-author('badlop at process-one.net').
+
+-behaviour(gen_mod).
+
+-export([start/2, stop/1,
+	 %% Node
+	 compile/1,
+	 load_config/1,
+	 get_cookie/0,
+	 remove_node/1,
+	 export2odbc/2,
+	 %% Accounts
+	 set_password/3,
+	 check_password_hash/4,
+	 delete_old_users/1,
+	 delete_old_users_vhost/2,
+	 ban_account/3,
+	 num_active_users/2,
+	 %% Sessions
+	 num_resources/2,
+	 resource_num/3,
+	 kick_session/4,
+	 status_num/2, status_num/1,
+	 status_list/2, status_list/1,
+	 %% Vcard
+	 set_nickname/3,
+	 get_vcard/3,
+	 get_vcard/4,
+	 set_vcard/4,
+	 set_vcard/5,
+	 %% Roster
+	 add_rosteritem/7,
+	 delete_rosteritem/4,
+	 process_rosteritems/5,
+	 get_roster/2,
+	 push_roster/3,
+	 push_roster_all/1,
+	 push_alltoall/2,
+	 %% mod_shared_roster
+	 srg_create/5,
+	 srg_delete/2,
+	 srg_list/1,
+	 srg_get_info/2,
+	 srg_get_members/2,
+	 srg_user_add/4,
+	 srg_user_del/4,
+	 %% Stanza
+	 send_message_headline/4,
+	 send_message_chat/3,
+	 %% Stats
+	 stats/1, stats/2
+	]).
+
+-include("ejabberd.hrl").
+-include("ejabberd_commands.hrl").
+-include("mod_roster.hrl").
+-include("jlib.hrl").
+
+%% Copied from ejabberd_sm.erl
+-record(session, {sid, usr, us, priority, info}).
+
+
+%%%
+%%% gen_mod
+%%%
+
+start(_Host, _Opts) ->
+    ejabberd_commands:register_commands(commands()).
+
+stop(_Host) ->
+    ejabberd_commands:unregister_commands(commands()).
+
+
+%%%
+%%% Register commands
+%%%
+
+commands() ->
+    Vcard1FieldsString = "Some vcard field names in get/set_vcard are:\n"
+	" FN		- Full Name\n"
+	" NICKNAME	- Nickname\n"
+	" BDAY		- Birthday\n"
+	" TITLE		- Work: Position\n",
+    " ROLE		- Work: Role",
+
+    Vcard2FieldsString = "Some vcard field names and subnames in get/set_vcard2 are:\n"
+	" N FAMILY	- Family name\n"
+	" N GIVEN	- Given name\n"
+	" N MIDDLE	- Middle name\n"
+	" ADR CTRY	- Address: Country\n"
+	" ADR LOCALITY	- Address: City\n"
+	" EMAIL USERID	- E-Mail Address\n"
+	" ORG ORGNAME	- Work: Company\n"
+	" ORG ORGUNIT	- Work: Department",
+
+    VcardXEP = "For a full list of vCard fields check XEP-0054: vcard-temp at "
+	"http://www.xmpp.org/extensions/xep-0054.html",
+
+    [
+     #ejabberd_commands{name = compile, tags = [erlang],
+			desc = "Recompile and reload Erlang source code file",
+			module = ?MODULE, function = compile,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = load_config, tags = [server],
+			desc = "Load ejabberd configuration file",
+			module = ?MODULE, function = load_config,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = get_cookie, tags = [erlang],
+			desc = "Get the Erlang cookie of this node",
+			module = ?MODULE, function = get_cookie,
+			args = [],
+			result = {cookie, string}},
+     #ejabberd_commands{name = remove_node, tags = [erlang],
+			desc = "Remove an ejabberd node from Mnesia clustering config",
+			module = ?MODULE, function = remove_node,
+			args = [{node, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = export2odbc, tags = [mnesia],
+			desc = "Export Mnesia tables to files in directory",
+			module = ?MODULE, function = export2odbc,
+			args = [{host, string}, {path, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = num_active_users, tags = [accounts, stats],
+			desc = "Get number of users active in the last days",
+			module = ?MODULE, function = num_active_users,
+			args = [{host, string}, {days, integer}],
+			result = {users, integer}},
+     #ejabberd_commands{name = delete_old_users, tags = [accounts, purge],
+			desc = "Delete users that didn't log in last days",
+			module = ?MODULE, function = delete_old_users,
+			args = [{days, integer}],
+			result = {res, restuple}},
+     #ejabberd_commands{name = delete_old_users_vhost, tags = [accounts, purge],
+			desc = "Delete users that didn't log in last days in vhost",
+			module = ?MODULE, function = delete_old_users_vhost,
+			args = [{host, string}, {days, integer}],
+			result = {res, restuple}},
+
+     #ejabberd_commands{name = check_account, tags = [accounts],
+			desc = "Check if an acount exists or not",
+			module = ejabberd_auth, function = is_user_exists,
+			args = [{user, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = check_password, tags = [accounts],
+			desc = "Check if a password is correct",
+			module = ejabberd_auth, function = check_password,
+			args = [{user, string}, {host, string}, {password, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = check_password_hash, tags = [accounts],
+			desc = "Check if the password hash is correct",
+			longdesc = "Allowed hash methods: md5, sha.",
+			module = ?MODULE, function = check_password_hash,
+			args = [{user, string}, {host, string}, {passwordhash, string}, {hashmethod, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = change_password, tags = [accounts],
+			desc = "Change the password of an account",
+			module = ?MODULE, function = set_password,
+			args = [{user, string}, {host, string}, {newpass, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = ban_account, tags = [accounts],
+			desc = "Ban an account: kick sessions and set random password",
+			module = ?MODULE, function = ban_account,
+			args = [{user, string}, {host, string}, {reason, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = num_resources, tags = [session],
+			desc = "Get the number of resources of a user",
+			module = ?MODULE, function = num_resources,
+			args = [{user, string}, {host, string}],
+			result = {resources, integer}},
+     #ejabberd_commands{name = resource_num, tags = [session],
+			desc = "Resource string of a session number",
+			module = ?MODULE, function = resource_num,
+			args = [{user, string}, {host, string}, {num, integer}],
+			result = {resource, string}},
+     #ejabberd_commands{name = kick_session, tags = [session],
+			desc = "Kick a user session",
+			module = ?MODULE, function = kick_session,
+			args = [{user, string}, {host, string}, {resource, string}, {reason, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = status_num_host, tags = [session, stats],
+			desc = "Number of logged users with this status in host",
+			module = ?MODULE, function = status_num,
+			args = [{host, string}, {status, string}],
+			result = {users, integer}},
+     #ejabberd_commands{name = status_num, tags = [session, stats],
+			desc = "Number of logged users with this status",
+			module = ?MODULE, function = status_num,
+			args = [{status, string}],
+			result = {users, integer}},
+     #ejabberd_commands{name = status_list_host, tags = [session],
+			desc = "List of users logged in host with their statuses",
+			module = ?MODULE, function = status_list,
+			args = [{host, string}, {status, string}],
+			result = {users, {list,
+					  {userstatus, {tuple, [
+								{user, string},
+								{host, string},
+								{resource, string},
+								{priority, integer},
+								{status, string}
+							       ]}}
+					 }}},
+     #ejabberd_commands{name = status_list, tags = [session],
+			desc = "List of logged users with this status",
+			module = ?MODULE, function = status_list,
+			args = [{status, string}],
+			result = {users, {list,
+					  {userstatus, {tuple, [
+								{user, string},
+								{host, string},
+								{resource, string},
+								{priority, integer},
+								{status, string}
+							       ]}}
+					 }}},
+
+     #ejabberd_commands{name = set_nickname, tags = [vcard],
+			desc = "Set nickname in a user's vcard",
+			module = ?MODULE, function = set_nickname,
+			args = [{user, string}, {host, string}, {nickname, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = get_vcard, tags = [vcard],
+			desc = "Get content from a vCard field",
+			longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP,
+			module = ?MODULE, function = get_vcard,
+			args = [{user, string}, {host, string}, {name, string}],
+			result = {content, string}},
+     #ejabberd_commands{name = get_vcard2, tags = [vcard],
+			desc = "Get content from a vCard field",
+			longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
+			module = ?MODULE, function = get_vcard,
+			args = [{user, string}, {host, string}, {name, string}, {subname, string}],
+			result = {content, string}},
+     #ejabberd_commands{name = set_vcard, tags = [vcard],
+			desc = "Set content in a vCard field",
+			longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP,
+			module = ?MODULE, function = set_vcard,
+			args = [{user, string}, {host, string}, {name, string}, {content, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = set_vcard2, tags = [vcard],
+			desc = "Set content in a vCard subfield",
+			longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
+			module = ?MODULE, function = set_vcard2,
+			args = [{user, string}, {host, string}, {name, string}, {subname, string}, {content, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = add_rosteritem, tags = [roster],
+			desc = "Add an item to a user's roster",
+			module = ?MODULE, function = add_rosteritem,
+			args = [{localuser, string}, {localserver, string},
+				{user, string}, {server, string},
+				{nick, string}, {group, string},
+				{subs, string}],
+			result = {res, rescode}},
+     %%{"", "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"},
+     #ejabberd_commands{name = delete_rosteritem, tags = [roster],
+			desc = "Delete an item from a user's roster",
+			module = ?MODULE, function = delete_rosteritem,
+			args = [{localuser, string}, {localserver, string},
+				{user, string}, {server, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = process_rosteritems, tags = [roster],
+			desc = "List or delete rosteritems that match filtering options",
+			longdesc = "Explanation of each argument:\n"
+			" - action: what to do with each rosteritem that "
+			"matches all the filtering options\n"
+			" - subs: subscription type\n"
+			" - asks: pending subscription\n"
+			" - users: the JIDs of the local user\n"
+			" - contacts: the JIDs of the contact in the roster\n"
+			"\n"
+			"Allowed values in the arguments:\n"
+			"  ACTION = list | delete\n"
+			"  SUBS = SUB[:SUB]* | any\n"
+			"  SUB = none | from | to | both\n"
+			"  ASKS = ASK[:ASK]* | any\n"
+			"  ASK = none | out | in\n"
+			"  USERS = JID[:JID]* | any\n"
+			"  CONTACTS = JID[:JID]* | any\n"
+			"  JID = characters valid in a JID, and can use the "
+			"globs: *, ? and [...]\n"
+			"\n"
+			"This example will list roster items with subscription "
+			"'none', 'from' or 'to' that have any ask property, of "
+			"local users which JID is in the virtual host "
+			"'example.org' and that the contact JID is either a "
+			"bare server name (without user part) or that has a "
+			"user part and the server part contains the word 'icq'"
+			":\n  list none:from:to any *@example.org *:*@*icq*",
+			module = ?MODULE, function = process_rosteritems,
+			args = [{action, string}, {subs, string},
+				{asks, string}, {users, string},
+				{contacts, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = get_roster, tags = [roster],
+			desc = "Get roster of a local user",
+			module = ?MODULE, function = get_roster,
+			args = [{user, string}, {host, string}],
+			result = {contacts, {list, {contact, {tuple, [
+								      {jid, string},
+								      {nick, string},
+								      {group, string}
+								     ]}}}}},
+     #ejabberd_commands{name = push_roster, tags = [roster],
+			desc = "Push template roster from file to a user",
+			module = ?MODULE, function = push_roster,
+			args = [{file, string}, {user, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = push_roster_all, tags = [roster],
+			desc = "Push template roster from file to all those users",
+			module = ?MODULE, function = push_roster_all,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = push_alltoall, tags = [roster],
+			desc = "Add all the users to all the users of Host in Group",
+			module = ?MODULE, function = push_alltoall,
+			args = [{host, string}, {group, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = srg_create, tags = [shared_roster_group],
+			desc = "Create a Shared Roster Group",
+			longdesc = "If you want to specify several group "
+			"identifiers in the Display argument,\n"
+			"put  \\ \" around the argument and\nseparate the "
+			"identifiers with \\ \\ n\n"
+			"For example:\n"
+			"  ejabberdctl srg_create group3 localhost "
+			"name desc \\\"group1\\\\ngroup2\\\"",
+			module = ?MODULE, function = srg_create,
+			args = [{group, string}, {host, string},
+				{name, string}, {description, string}, {display, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_delete, tags = [shared_roster_group],
+			desc = "Delete a Shared Roster Group",
+			module = ?MODULE, function = srg_delete,
+			args = [{group, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_list, tags = [shared_roster_group],
+			desc = "List the Shared Roster Groups in Host",
+			module = ?MODULE, function = srg_list,
+			args = [{host, string}],
+			result = {groups, {list, {id, string}}}},
+     #ejabberd_commands{name = srg_get_info, tags = [shared_roster_group],
+			desc = "Get info of a Shared Roster Group",
+			module = ?MODULE, function = srg_get_info,
+			args = [{group, string}, {host, string}],
+			result = {informations, {list, {information, {tuple, [{key, string}, {value, string}]}}}}},
+     #ejabberd_commands{name = srg_get_members, tags = [shared_roster_group],
+			desc = "Get members of a Shared Roster Group",
+			module = ?MODULE, function = srg_get_members,
+			args = [{group, string}, {host, string}],
+			result = {members, {list, {member, string}}}},
+     #ejabberd_commands{name = srg_user_add, tags = [shared_roster_group],
+			desc = "Add the JID user at host to the Shared Roster Group",
+			module = ?MODULE, function = srg_user_add,
+			args = [{user, string}, {host, string}, {group, string}, {grouphost, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_user_del, tags = [shared_roster_group],
+			desc = "Delete this JID user at host from the Shared Roster Group",
+			module = ?MODULE, function = srg_user_del,
+			args = [{user, string}, {host, string}, {group, string}, {grouphost, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = send_message_chat, tags = [stanza],
+			desc = "Send a chat message to a local or remote bare of full JID",
+			module = ?MODULE, function = send_message_chat,
+			args = [{from, string}, {to, string}, {body, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = send_message_headline, tags = [stanza],
+			desc = "Send a headline message to a local or remote bare of full JID",
+			module = ?MODULE, function = send_message_headline,
+			args = [{from, string}, {to, string},
+				{subject, string}, {body, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = stats, tags = [stats],
+			desc = "Get statistical value: registeredusers onlineusers onlineusersnode uptimeseconds",
+			module = ?MODULE, function = stats,
+			args = [{name, string}],
+			result = {stat, integer}},
+     #ejabberd_commands{name = stats_host, tags = [stats],
+			desc = "Get statistical value for this host: registeredusers onlineusers",
+			module = ?MODULE, function = stats,
+			args = [{name, string}, {host, string}],
+			result = {stat, integer}}
+    ].
+
+
+%%%
+%%% Node
+%%%
+
+compile(File) ->
+    case compile:file(File) of
+	ok -> ok;
+	_ -> error
+    end.
+
+load_config(Path) ->
+    ok = ejabberd_config:load_file(Path).
+
+get_cookie() ->
+    atom_to_list(erlang:get_cookie()).
+
+remove_node(Node) ->
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ok.
+
+export2odbc(Host, Directory) ->
+    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([Directory, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on Host '~s' to file '~s'~n", [Table, Host, Filename]),
+		     Res = (catch ejd2odbc:TableFun(Host, Filename)),
+		     io:format("  Result: ~p~n", [Res])
+	     end,
+    lists:foreach(Export, Tables),
+    ok.
+
+
+%%%
+%%% Accounts
+%%%
+
+set_password(User, Host, Password) ->
+    case ejabberd_auth:set_password(User, Host, Password) of
+	ok ->
+	    ok;
+	_ ->
+	    error
+    end.
+
+%% Copied some code from ejabberd_commands.erl
+check_password_hash(User, Host, PasswordHash, HashMethod) ->
+    AccountPass = ejabberd_auth:get_password_s(User, Host),
+    AccountPassHash = case HashMethod of
+			  "md5" -> get_md5(AccountPass);
+			  "sha" -> get_sha(AccountPass);
+			  _ -> undefined
+		      end,
+    case AccountPassHash of
+	undefined -> error;
+	PasswordHash -> ok;
+	_ -> error
+    end.
+get_md5(AccountPass) ->
+    lists:flatten([io_lib:format("~.16B", [X])
+		   || X <- binary_to_list(crypto:md5(AccountPass))]).
+get_sha(AccountPass) ->
+    lists:flatten([io_lib:format("~.16B", [X])
+		   || X <- binary_to_list(crypto:sha(AccountPass))]).
+
+num_active_users(Host, Days) ->
+    list_last_activity(Host, true, Days).
+
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+list_last_activity(Host, Integral, Days) ->
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp = MegaSecs * 1000000 + Secs,
+    TS = TimeStamp - Days * 86400,
+    case catch mnesia:dirty_select(
+		 last_activity, [{{last_activity, {'_', Host}, '$1', '_'},
+				  [{'>', '$1', TS}],
+				  [{'trunc', {'/',
+					      {'-', TimeStamp, '$1'},
+					      86400}}]}]) of
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = Days - length(Hist),
+			 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 ->
+    histogram(T, Integral, Current, Count + 1, Hist);
+histogram([H | _] = Values, Integral, Current, Count, Hist) when Current < H ->
+    if
+	Integral ->
+	    histogram(Values, Integral, Current + 1, Count, [Count | Hist]);
+	true ->
+	    histogram(Values, Integral, Current + 1, 0, [Count | Hist])
+    end;
+histogram([], _Integral, _Current, Count, Hist) ->
+    if
+	Count > 0 ->
+	    lists:reverse([Count | Hist]);
+	true ->
+	    lists:reverse(Hist)
+    end.
+
+
+-record(last_activity, {us, timestamp, status}).
+
+delete_old_users(Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
+
+    {removed, N, UR} = delete_old_users(Days, Users),
+    {ok, io_lib:format("Deleted ~p users: ~p", [N, UR])}.
+
+delete_old_users_vhost(Host, Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:get_vh_registered_users(Host),
+
+    {removed, N, UR} = delete_old_users(Days, Users),
+    {ok, io_lib:format("Deleted ~p users: ~p", [N, UR])}.
+
+delete_old_users(Days, Users) ->
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% 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 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;
+			    %% 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}.
+
+
+%%
+%% Ban account
+
+ban_account(User, Host, ReasonText) ->
+    Reason = prepare_reason(ReasonText),
+    kick_sessions(User, Host, Reason),
+    set_random_password(User, Host, Reason),
+    ok.
+
+kick_sessions(User, Server, Reason) ->
+    lists:map(
+      fun(Resource) ->
+	      kick_this_session(User, Server, Resource, Reason)
+      end,
+      get_resources(User, Server)).
+
+get_resources(User, Server) ->
+    lists:map(
+      fun(Session) ->
+	      element(3, Session#session.usr)
+      end,
+      get_sessions(User, Server)).
+
+get_sessions(User, Server) ->
+    LUser = jlib:nodeprep(User),
+    LServer = jlib:nameprep(Server),
+    Sessions =  mnesia:dirty_index_read(session, {LUser, LServer}, #session.us),
+    true = is_list(Sessions),
+    Sessions.
+
+set_random_password(User, Server, Reason) ->
+    NewPass = build_random_password(Reason),
+    set_password_auth(User, Server, NewPass).
+
+build_random_password(Reason) ->
+    Date = jlib:timestamp_to_iso(calendar:universal_time()),
+    RandomString = randoms:get_string(),
+    "BANNED_ACCOUNT--" ++ Date ++ "--" ++ RandomString ++ "--" ++ Reason.
+
+set_password_auth(User, Server, Password) ->
+    ok = ejabberd_auth:set_password(User, Server, Password).
+
+prepare_reason([]) ->
+    "Kicked by administrator";
+prepare_reason([Reason]) ->
+    Reason;
+prepare_reason(Reason) when is_list(Reason) ->
+    Reason;
+prepare_reason(StringList) ->
+    string:join(StringList, "_").
+
+
+%%%
+%%% Sessions
+%%%
+
+num_resources(User, Host) ->
+    length(ejabberd_sm:get_user_resources(User, Host)).
+
+resource_num(User, Host, Num) ->
+    Resources = ejabberd_sm:get_user_resources(User, Host),
+    case (0<Num) and (Num=<length(Resources)) of
+	true ->
+	    lists:nth(Num, Resources);
+	false ->
+	    lists:flatten(io_lib:format("Error: Wrong resource number: ~p", [Num]))
+    end.
+
+kick_session(User, Server, Resource, ReasonText) ->
+    kick_this_session(User, Server, Resource, prepare_reason(ReasonText)),
+    ok.
+
+kick_this_session(User, Server, Resource, Reason) ->
+    ejabberd_router:route(
+      jlib:make_jid("", "", ""),
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, Reason}]}).
+
+
+status_num(Host, Status) ->
+    length(get_status_list(Host, Status)).
+status_num(Status) ->
+    status_num("all", Status).
+status_list(Host, Status) ->
+    Res = get_status_list(Host, Status),
+    [{U, S, R, P, St} || {U, S, R, P, St} <- Res].
+status_list(Status) ->
+    status_list("all", Status).
+
+
+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
+		"all" ->
+		    %% 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])].
+
+%% Make string more print-friendly
+stringize(String) ->
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
+
+
+%%%
+%%% Vcard
+%%%
+
+set_nickname(User, Host, Nickname) ->
+    R = mod_vcard:process_sm_iq(
+	  {jid, User, Host, "", User, Host, ""},
+	  {jid, User, Host, "", User, Host, ""},
+	  {iq, "", set, "", "en",
+	   {xmlelement, "vCard",
+	    [{"xmlns", "vcard-temp"}], [
+					{xmlelement, "NICKNAME", [], [{xmlcdata, Nickname}]}
+				       ]
+	   }}),
+    case R of
+	{iq, [], result, [], _L, []} ->
+	    ok;
+	_ ->
+	    error
+    end.
+
+get_vcard(User, Host, Name) ->
+    get_vcard_content(User, Host, [Name]).
+
+get_vcard(User, Host, Name, Subname) ->
+    get_vcard_content(User, Host, [Name, Subname]).
+
+set_vcard(User, Host, Name, Content) ->
+    set_vcard_content(User, Host, [Name], Content).
+
+set_vcard(User, Host, Name, Subname, Content) ->
+    set_vcard_content(User, Host, [Name, Subname], Content).
+
+
+%%
+%% Internal vcard
+
+get_vcard_content(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),
+    case IQr#iq.sub_el of
+	[A1] ->
+	    case get_vcard(Data, A1) of
+		false -> "Error: no_value";
+		Elem -> xml:get_tag_cdata(Elem)
+	    end;
+	[] ->
+	    "Error: no_vcard"
+    end.
+
+get_vcard([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> get_vcard([Data2], A2)
+    end;
+
+get_vcard([Data], A1) ->
+    xml:get_subtag(A1, Data).
+
+set_vcard_content(User, Server, Data, Content) ->
+    [{_, 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.
+
+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).
+
+
+%%%
+%%% Roster
+%%%
+
+add_rosteritem(LocalUser, LocalServer, User, Server, Nick, Group, Subs) ->
+    case add_rosteritem(LocalUser, LocalServer, User, Server, Nick, Group, list_to_atom(Subs), []) of
+	{atomic, ok} ->
+	    push_roster_item(LocalUser, LocalServer, User, Server, {add, Nick, Subs, Group}),
+	    ok;
+	_ ->
+	    error
+    end.
+
+add_rosteritem(LU, LS, User, Server, Nick, Group, Subscription, Xattrs) ->
+    subscribe(LU, LS, User, Server, Nick, Group, Subscription, Xattrs).
+
+subscribe(LU, LS, User, Server, Nick, Group, Subscription, Xattrs) ->
+    mnesia:transaction(
+      fun() ->
+	      mnesia:write({roster,
+			    {LU,LS,{User,Server,[]}}, % uj
+			    {LU,LS},                  % user
+			    {User,Server,[]},      % 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).
+
+delete_rosteritem(LocalUser, LocalServer, User, Server) ->
+    case unsubscribe(LocalUser, LocalServer, User, Server) of
+	{atomic, ok} ->
+	    push_roster_item(LocalUser, LocalServer, User, Server, remove),
+	    ok;
+	_  ->
+	    error
+    end.
+
+unsubscribe(LU, LS, User, Server) ->
+    mnesia:transaction(
+      fun() ->
+              mnesia:delete({roster, {LU, LS, {User, Server, []}}})
+      end).
+
+
+%% -----------------------------
+%% Get Roster
+%% -----------------------------
+
+get_roster(User, Server) ->
+    {ok, Roster} = get_roster2(User, Server),
+    make_roster_xmlrpc(Roster).
+
+get_roster2(User, Server) ->
+    Modules = gen_mod:loaded_modules(Server),
+    Roster = case lists:member(mod_roster, Modules) of
+		 true ->
+		     mod_roster:get_user_roster([], {User, Server});
+		 false ->
+		     case lists:member(mod_roster_odbc, Modules) of
+			 true ->
+			     mod_roster_odbc:get_user_roster([], {User, Server});
+			 false ->
+			     {error, "Neither mod_roster or mod_roster_odbc are enabled"}
+		     end
+	     end,
+    {ok, Roster}.
+
+%% Note: if a contact is in several groups, the contact is returned
+%% several times, each one in a different group.
+make_roster_xmlrpc(Roster) ->
+    lists:foldl(
+      fun(Item, Res) ->
+	      JIDS = jlib:jid_to_string(Item#roster.jid),
+	      Nick = Item#roster.name,
+	      Groups = case Item#roster.groups of
+			   [] -> [""];
+			   Gs -> Gs
+		       end,
+	      ItemsX = [{JIDS, Nick, Group}
+			|| Group <- Groups],
+	      ItemsX ++ Res
+      end,
+      [],
+      Roster).
+
+
+%%-----------------------------
+%% Push Roster from file
+%%-----------------------------
+
+push_roster(File, User, Server) ->
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
+
+push_roster_all(File) ->
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
+
+subscribe_all(Roster) ->
+    subscribe_all(Roster, Roster).
+subscribe_all([], _) ->
+    ok;
+subscribe_all([User1 | Users], Roster) ->
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
+
+subscribe_roster(_, []) ->
+    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({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | 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),
+    ok.
+
+build_list_users(_Group, [], Res) ->
+    Res;
+build_list_users(Group, [{User, Server}|Users], Res) ->
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+
+%% @spec(LU, LS, U, S, Action) -> ok
+%%       Action = {add, Nick, Subs, Group} | remove
+%% @doc Push to the roster of account LU at LS the contact U at S.
+%% The specific action to perform is defined in Action.
+push_roster_item(LU, LS, U, S, Action) ->
+    lists:foreach(fun(R) ->
+			  push_roster_item(LU, LS, R, U, S, Action)
+		  end, ejabberd_sm:get_user_resources(LU, LS)).
+
+push_roster_item(LU, LS, R, U, S, Action) ->
+    Item = build_roster_item(U, S, Action),
+    ResIQ = build_iq_roster_push(Item),
+    LJID = jlib:make_jid(LU, LS, R),
+    ejabberd_router:route(LJID, LJID, ResIQ).
+
+build_roster_item(U, S, {add, Nick, Subs, Group}) ->
+    {xmlelement, "item",
+     [{"jid", jlib:jid_to_string(jlib:make_jid(U, S, ""))},
+      {"name", Nick},
+      {"subscription", Subs}],
+     [{xmlelement, "group", [], [{xmlcdata, Group}]}]
+    };
+build_roster_item(U, S, remove) ->
+    {xmlelement, "item",
+     [{"jid", jlib:jid_to_string(jlib:make_jid(U, S, ""))},
+      {"subscription", "remove"}],
+     []
+    }.
+
+build_iq_roster_push(Item) ->
+    {xmlelement, "iq",
+     [{"type", "set"}, {"id", "push"}],
+     [{xmlelement, "query",
+       [{"xmlns", ?NS_ROSTER}],
+       [Item]
+      }
+     ]
+    }.
+
+
+%%%
+%%% Shared Roster Groups
+%%%
+
+srg_create(Group, Host, Name, Description, Display) ->
+    {ok, DisplayList} = regexp:split(Display, "\\\\n"),
+    Opts = [{name, Name},
+	    {displayed_groups, DisplayList},
+	    {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    ok.
+
+srg_delete(Group, Host) ->
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    ok.
+
+srg_list(Host) ->
+    lists:sort(mod_shared_roster:list_groups(Host)).
+
+srg_get_info(Group, Host) ->
+    Opts = mod_shared_roster:get_group_opts(Host,Group),
+    [{io_lib:format("~p", [Title]),
+      io_lib:format("~p", [Value])} || {Title, Value} <- Opts].
+
+srg_get_members(Group, Host) ->
+    Members = mod_shared_roster:get_group_explicit_users(Host,Group),
+    [jlib:jid_to_string(jlib:make_jid(MUser, MServer, ""))
+     || {MUser, MServer} <- Members].
+
+srg_user_add(User, Host, Group, GroupHost) ->
+    {atomic, ok} = mod_shared_roster:add_user_to_group(GroupHost, {User, Host}, Group),
+    ok.
+
+srg_user_del(User, Host, Group, GroupHost) ->
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(GroupHost, {User, Host}, Group),
+    ok.
+
+
+%%%
+%%% Stanza
+%%%
+
+%% @doc Send a chat message to a Jabber account.
+%% @spec (From::string(), To::string(), Body::string()) -> ok
+send_message_chat(From, To, Body) ->
+    Packet = build_packet(message_chat, [Body]),
+    send_packet_all_resources(From, To, Packet).
+
+%% @doc Send a headline message to a Jabber account.
+%% @spec (From::string(), To::string(), Subject::string(), Body::string()) -> ok
+send_message_headline(From, To, Subject, Body) ->
+    Packet = build_packet(message_headline, [Subject, Body]),
+    send_packet_all_resources(From, To, Packet).
+
+%% @doc Send a packet to a Jabber account.
+%% If a resource was specified in the JID,
+%% the packet is sent only to that specific resource.
+%% If no resource was specified in the JID,
+%% and the user is remote or local but offline,
+%% the packet is sent to the bare JID.
+%% If the user is local and is online in several resources,
+%% the packet is sent to all its resources.
+send_packet_all_resources(FromJIDString, ToJIDString, Packet) ->
+    FromJID = jlib:string_to_jid(FromJIDString),
+    ToJID = jlib:string_to_jid(ToJIDString),
+    ToUser = ToJID#jid.user,
+    ToServer = ToJID#jid.server,
+    case ToJID#jid.resource of
+	"" ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, Packet);
+	Res ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, Res, Packet)
+    end.
+
+send_packet_all_resources(FromJID, ToUser, ToServer, Packet) ->
+    case ejabberd_sm:get_user_resources(ToUser, ToServer) of
+	[] ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, "", Packet);
+	ToResources ->
+	    lists:foreach(
+	      fun(ToResource) ->
+		      send_packet_all_resources(FromJID, ToUser, ToServer,
+						ToResource, Packet)
+	      end,
+	      ToResources)
+    end.
+
+send_packet_all_resources(FromJID, ToU, ToS, ToR, Packet) ->
+    ToJID = jlib:make_jid(ToU, ToS, ToR),
+    ejabberd_router:route(FromJID, ToJID, Packet).
+
+
+build_packet(message_chat, [Body]) ->
+    {xmlelement, "message",
+     [{"type", "chat"}],
+     [{xmlelement, "body", [], [{xmlcdata, Body}]}]
+    };
+build_packet(message_headline, [Subject, Body]) ->
+    {xmlelement, "message",
+     [{"type", "headline"}],
+     [{xmlelement, "subject", [], [{xmlcdata, Subject}]},
+      {xmlelement, "body", [], [{xmlcdata, Body}]}
+     ]
+    }.
+
+%%%
+%%% Stats
+%%%
+
+stats(Name) ->
+    case Name of
+	"uptimeseconds" -> trunc(element(1, erlang:statistics(wall_clock))/1000);
+	"registeredusers" -> length(ejabberd_auth:dirty_get_registered_users());
+	"onlineusersnode" -> length(ejabberd_sm:dirty_get_my_sessions_list());
+	"onlineusers" -> length(ejabberd_sm:dirty_get_sessions_list())
+    end.
+
+stats(Name, Host) ->
+    case Name of
+	"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+    end.
+
+
+
+%%-----------------------------
+%% Purge roster items
+%%-----------------------------
+
+process_rosteritems(ActionS, SubsS, AsksS, UsersS, ContactsS) ->
+    Action = case ActionS of
+		 "list" -> list;
+		 "delete" -> delete
+	     end,
+
+    Subs = lists:foldl(
+	     fun(any, _) -> [none, from, to, both];
+		(Sub, Subs) -> [Sub | Subs]
+	     end,
+	     [],
+	     [list_to_atom(S) || S <- string:tokens(SubsS, ":")]
+	    ),
+
+    Asks = lists:foldl(
+	     fun(any, _) -> [none, out, in];
+		(Ask, Asks) -> [Ask | Asks]
+	     end,
+	     [],
+	     [list_to_atom(S) || S <- string:tokens(AsksS, ":")]
+	    ),
+
+    Users = lists:foldl(
+	      fun("any", _) -> ["*", "*@*"];
+		 (U, Us) -> [U | Us]
+	      end,
+	      [],
+	      [S || S <- string:tokens(UsersS, ":")]
+	     ),
+
+    Contacts = lists:foldl(
+		 fun("any", _) -> ["*", "*@*"];
+		    (U, Us) -> [U | Us]
+		 end,
+		 [],
+		 [S || S <- string:tokens(ContactsS, ":")]
+		),
+
+    case rosteritem_purge({Action, Subs, Asks, Users, Contacts}) of
+	{atomic, ok} ->
+	    ok;
+	{error, Reason} ->
+	    io:format("Error purging rosteritems: ~p~n", [Reason]),
+	    error;
+	{badrpc, Reason} ->
+	    io:format("BadRPC purging rosteritems: ~p~n", [Reason]),
+	    error
+    end.
+
+%% @spec ({Action::atom(), Subs::[atom()], Asks::[atom()], User::string(), Contact::string()}) -> {atomic, ok}
+rosteritem_purge(Options) ->
+    Num_rosteritems = mnesia:table_info(roster, size),
+    io:format("There are ~p roster items in total.~n", [Num_rosteritems]),
+    Key = mnesia:dirty_first(roster),
+    ok = rip(Key, Options, {0, Num_rosteritems, 0, 0}),
+    {atomic, ok}.
+
+rip('$end_of_table', _Options, Counters) ->
+    print_progress_line(Counters),
+    ok;
+rip(Key, Options, {Pr, NT, NV, ND}) ->
+    Key_next = mnesia:dirty_next(roster, Key),
+    {Action, _, _, _, _} = Options,
+    ND2 = case decide_rip(Key, Options) of
+	      true ->
+		  apply_action(Action, Key),
+		  ND+1;
+	      false ->
+		  ND
+	  end,
+    NV2 = NV+1,
+    Pr2 = print_progress_line({Pr, NT, NV2, ND2}),
+    rip(Key_next, Options, {Pr2, NT, NV2, ND2}).
+
+apply_action(list, Key) ->
+    {User, Server, JID} = Key,
+    {RUser, RServer, _} = JID,
+    io:format("Matches: ~s@~s ~s@~s~n", [User, Server, RUser, RServer]);
+apply_action(delete, Key) ->
+    apply_action(list, Key),
+    mnesia:dirty_delete(roster, Key).
+
+print_progress_line({Pr, NT, NV, ND}) ->
+    Pr2 = trunc((NV/NT)*100),
+    case Pr == Pr2 of
+	true ->
+	    ok;
+	false ->
+	    io:format("Progress ~p% - visited ~p - deleted ~p~n", [Pr2, NV, ND])
+    end,
+    Pr2.
+
+decide_rip(Key, {_Action, Subs, Asks, User, Contact}) ->
+    case catch mnesia:dirty_read(roster, Key) of
+	[RI] ->
+	    lists:member(RI#roster.subscription, Subs)
+		andalso lists:member(RI#roster.ask, Asks)
+		andalso decide_rip_jid(RI#roster.us, User)
+		andalso decide_rip_jid(RI#roster.jid, Contact);
+	_ ->
+	    false
+    end.
+
+%% Returns true if the server of the JID is included in the servers
+decide_rip_jid({UName, UServer, _UResource}, Match_list) ->
+    decide_rip_jid({UName, UServer}, Match_list);
+decide_rip_jid({UName, UServer}, Match_list) ->
+    lists:any(
+      fun(Match_string) ->
+	      MJID = jlib:string_to_jid(Match_string),
+	      MName = MJID#jid.luser,
+	      MServer = MJID#jid.lserver,
+	      Is_server = is_glob_match(UServer, MServer),
+	      case MName of
+		  [] when UName == [] ->
+		      Is_server;
+		  [] ->
+		      false;
+		  _ ->
+		      Is_server
+			  andalso is_glob_match(UName, MName)
+	      end
+      end,
+      Match_list).
+
+%% Copied from ejabberd-2.0.0/src/acl.erl
+is_regexp_match(String, RegExp) ->
+    case regexp:first_match(String, RegExp) of
+	nomatch ->
+	    false;
+	{match, _, _} ->
+	    true;
+	{error, ErrDesc} ->
+	    io:format(
+	      "Wrong regexp ~p in ACL: ~p",
+	      [RegExp, lists:flatten(regexp:format_error(ErrDesc))]),
+	    false
+    end.
+is_glob_match(String, Glob) ->
+    is_regexp_match(String, regexp:sh_to_awk(Glob)).

ejabberd-piefxis-vhost-export.patch:
 ejabberd_piefxis.erl |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

--- NEW FILE ejabberd-piefxis-vhost-export.patch ---
This patch enables generation of the main XML file
when exporting data of a virtual host into PIEFXIS format.

This issue is tracked upstream as EJAB-1098.

This changeset was introduced in revisions 2753,
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/ejabberd_piefxis.erl	(revision 2752)
+++ b/src/ejabberd_piefxis.erl	(revision 2753)
@@ -212,7 +212,7 @@
 		   El),
 	    ok;
 	{atomic, exists} ->
-	    ?INFO_MSG("User ~p@~p already exists, using stored profile...~n",
+	    io:format("Account ~s@~s already exists, updating it...~n",
 		      [User, Domain]),
 	    io:format(""),
 	    ok = exmpp_xml:foreach(
@@ -417,10 +417,10 @@
 
 %%%==================================
 
-%%%% Export server
+%%%% Export hosts
 
-%% @spec (Dir::string()) -> ok
-export_server(Dir) ->
+%% @spec (Dir::string(), Hosts::[string()]) -> ok
+export_hosts(Dir, Hosts) ->
     try_start_exmpp(),
 
     FnT = make_filename_template(),
@@ -430,7 +430,6 @@
     print(Fd, make_piefxis_xml_head()),
     print(Fd, make_piefxis_server_head()),
 
-    Hosts = ?MYHOSTS,
     FilesAndHosts = [{make_host_filename(FnT, Host), Host} || Host <- Hosts],
     [print(Fd, make_xinclude(FnH)) || {FnH, _Host} <- FilesAndHosts],
 
@@ -443,14 +442,20 @@
     ok.
 
 %%%==================================
+%%%% Export server
+
+%% @spec (Dir::string()) -> ok
+export_server(Dir) ->
+    Hosts = ?MYHOSTS,
+    export_hosts(Dir, Hosts).
+
+%%%==================================
 %%%% Export host
 
 %% @spec (Dir::string(), Host::string()) -> ok
 export_host(Dir, Host) ->
-    try_start_exmpp(),
-    FnT = make_filename_template(),
-    FnH = make_host_filename(FnT, Host),
-    export_host(Dir, FnH, Host).
+    Hosts = [Host],
+    export_hosts(Dir, Hosts).
 
 %% @spec (Dir::string(), Fn::string(), Host::string()) -> ok
 export_host(Dir, FnH, Host) ->

ejabberd-vcard-reqs-forwarding.patch:
 ejabberd_c2s.erl         |    2 -
 ejabberd_sm.erl          |    2 -
 mod_muc/mod_muc_room.erl |   58 ++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 54 insertions(+), 8 deletions(-)

--- NEW FILE ejabberd-vcard-reqs-forwarding.patch ---
This bug fixes a long-standing bug with ejabberd violating
RFC 3920 by intercepting vCard request coming to a user's
full JID, which should be forwarded to the user's client instead.
This behaviour is especially noticeable in MUC rooms.

This issue is tracked upstream as EJAB-1045.

This changeset was introduced in revisions 2766-2768
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/ejabberd_sm.erl	(revision 2762)
+++ b/src/ejabberd_sm.erl	(revision 2768)
@@ -481,7 +481,7 @@
 				_ ->
 				    Err =
 					jlib:make_error_reply(
-					  Packet, ?ERR_RECIPIENT_UNAVAILABLE),
+					  Packet, ?ERR_SERVICE_UNAVAILABLE),
 				    ejabberd_router:route(To, From, Err)
 			    end;
 			_ ->
--- a/src/mod_muc/mod_muc_room.erl	(revision 2762)
+++ b/src/mod_muc/mod_muc_room.erl	(revision 2768)
@@ -470,9 +470,10 @@
 	      {xmlelement, "iq", Attrs, _Els} = Packet},
 	     StateData) ->
     Lang = xml:get_attr_s("xml:lang", Attrs),
+    StanzaId = xml:get_attr_s("id", Attrs),
     case {(StateData#state.config)#config.allow_query_users,
-	  is_user_online(From, StateData)} of
-	{true, true} ->
+	  is_user_online_iq(StanzaId, From, StateData)} of
+	{true, {true, NewId, FromFull}} ->
 	    case find_jid_by_nick(ToNick, StateData) of
 		false ->
 		    case jlib:iq_query_info(Packet) of
@@ -489,13 +490,15 @@
 		    end;
 		ToJID ->
 		    {ok, #user{nick = FromNick}} =
-			?DICT:find(jlib:jid_tolower(From),
+			?DICT:find(jlib:jid_tolower(FromFull),
 				   StateData#state.users),
+		    {ToJID2, Packet2} = handle_iq_vcard(FromFull, ToJID,
+							StanzaId, NewId,Packet),
 		    ejabberd_router:route(
 		      jlib:jid_replace_resource(StateData#state.jid, FromNick),
-		      ToJID, Packet)
+		      ToJID2, Packet2)
 	    end;
-	{_, false} ->
+	{_, {false, _, _}} ->
 	    case jlib:iq_query_info(Packet) of
 		reply ->
 		    ok;
@@ -829,7 +832,6 @@
 	    {next_state, normal_state, StateData}
     end.
 
-
 %% @doc Check if this non participant can send message to room.
 %%
 %% XEP-0045 v1.23:
@@ -969,6 +971,50 @@
     LJID = jlib:jid_tolower(JID),
     ?DICT:is_key(LJID, StateData#state.users).
 
+
+%%%
+%%% Handle IQ queries of vCard
+%%%
+is_user_online_iq(StanzaId, JID, StateData) when JID#jid.lresource /= "" ->
+    {is_user_online(JID, StateData), StanzaId, JID};
+is_user_online_iq(StanzaId, JID, StateData) when JID#jid.lresource == "" ->
+    try stanzaid_unpack(StanzaId) of
+	{OriginalId, Resource} ->
+	    JIDWithResource = jlib:jid_replace_resource(JID, Resource),
+	    {is_user_online(JIDWithResource, StateData),
+	     OriginalId, JIDWithResource}
+    catch
+	_:_ ->
+	    {is_user_online(JID, StateData), StanzaId, JID}
+    end.
+
+handle_iq_vcard(FromFull, ToJID, StanzaId, NewId, Packet) ->
+    ToBareJID = jlib:jid_remove_resource(ToJID),
+    IQ = jlib:iq_query_info(Packet),
+    handle_iq_vcard2(FromFull, ToJID, ToBareJID, StanzaId, NewId, IQ, Packet).
+handle_iq_vcard2(_FromFull, ToJID, ToBareJID, StanzaId, _NewId,
+		 #iq{type = get, xmlns = ?NS_VCARD}, Packet)
+  when ToBareJID /= ToJID ->
+    {ToBareJID, change_stanzaid(StanzaId, ToJID, Packet)};
+handle_iq_vcard2(_FromFull, ToJID, _ToBareJID, _StanzaId, NewId, _IQ, Packet) ->
+    {ToJID, change_stanzaid(NewId, Packet)}.
+
+stanzaid_pack(OriginalId, Resource) ->
+    "berd"++base64:encode_to_string("ejab\0" ++ OriginalId ++ "\0" ++ Resource).
+stanzaid_unpack("berd"++StanzaIdBase64) ->
+    StanzaId = base64:decode_to_string(StanzaIdBase64),
+    ["ejab", OriginalId, Resource] = string:tokens(StanzaId, "\0"),
+    {OriginalId, Resource}.
+
+change_stanzaid(NewId, Packet) ->
+    {xmlelement, Name, Attrs, Els} = jlib:remove_attr("id", Packet),
+    {xmlelement, Name, [{"id", NewId} | Attrs], Els}.
+change_stanzaid(PreviousId, ToJID, Packet) ->
+    NewId = stanzaid_pack(PreviousId, ToJID#jid.lresource),
+    change_stanzaid(NewId, Packet).
+%%%
+%%%
+
 role_to_list(Role) ->
     case Role of
 	moderator ->   "moderator";
--- a/src/ejabberd_c2s.erl	(revision 2762)
+++ b/src/ejabberd_c2s.erl	(revision 2768)
@@ -1220,7 +1220,7 @@
 	    "iq" ->
 		IQ = jlib:iq_query_info(Packet),
 		case IQ of
-		    #iq{xmlns = ?NS_VCARD} ->
+		    #iq{xmlns = ?NS_VCARD} when (To#jid.luser == "") or (To#jid.lresource == "") ->
 			Host = StateData#state.server,
 			case ets:lookup(sm_iqtable, {?NS_VCARD, Host}) of
 			    [{_, Module, Function, Opts}] ->

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ejabberd-ejabberdctl_fix.diff	21 Nov 2009 08:02:51 -0000	1.7
+++ ejabberd-ejabberdctl_fix.diff	10 Dec 2009 19:09:42 -0000	1.8
@@ -1,5 +1,5 @@
---- src/ejabberdctl.template.fix_ctl	2009-11-06 22:53:19.000000000 +0300
-+++ src/ejabberdctl.template	2009-11-21 10:43:17.654686409 +0300
+--- src/ejabberdctl.template	2009-11-06 22:53:19.000000000 +0300
++++ src/ejabberdctl.template	2009-12-10 21:07:28.648659178 +0300
 @@ -9,10 +9,10 @@
  
  # define default environment variables
@@ -13,6 +13,15 @@
  
  # parse command line parameters
  ARGS=
+@@ -46,7 +46,7 @@
+     LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
+ fi
+ if [ "$SPOOLDIR" = "" ] ; then
+-    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
++    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd/spool
+ fi
+ if [ "$EJABBERD_DOC_PATH" = "" ] ; then
+     EJABBERD_DOC_PATH=@DOCDIR@
 @@ -60,14 +60,14 @@
  EJID=`id -g $INSTALLUSER`
  EXEC_CMD="false"


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ejabberd.spec	21 Nov 2009 08:02:52 -0000	1.47
+++ ejabberd.spec	10 Dec 2009 19:09:42 -0000	1.48
@@ -12,7 +12,7 @@
 
 Name:           ejabberd
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -24,7 +24,7 @@ Source2:        ejabberd.logrotate
 Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
-# this module will be removed in the near future in favor of mod_admin_extra
+# this module will be removed in the nearest future in favor of mod_admin_extra
 # svn export -r 1020 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
 Source4:        mod_ctlextra.erl
 
@@ -47,7 +47,23 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
 # fixed delays in s2s connections
 Patch8: ejabberd-fixed_delays_in_s2s.patch
-
+# captcha.sh uses some BASH-specific variables
+# see https://support.process-one.net/browse/EJAB-1105
+Patch9: ejabberd-captcha-bashism.patch
+# Introducing mod_admin_extra
+Patch10: ejabberd-mod_admin_extra.patch
+# Fixed long-standing bug with RFC 3920 violation
+# see https://support.process-one.net/browse/EJAB-1045
+Patch11: ejabberd-vcard-reqs-forwarding.patch
+# Generates a human-readable XHTML page which is returned
+# when a user tries to browse the HTTP-poll URL configured
+# for the server (a common mistake).
+# see https://support.process-one.net/browse/EJAB-1106
+Patch12: ejabberd-http-poll-web-page.patch
+# This patch enables generation of the main XML file
+# when exporting data of a virtual host into PIEFXIS format.
+# see https://support.process-one.net/browse/EJAB-1098
+Patch13: ejabberd-piefxis-vhost-export.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -93,6 +109,33 @@ Documentation for ejabberd.
 %{__fe_groupadd} %{uid} -r %{name} &>/dev/null || :
 %{__fe_useradd} %{uid} -r -s /sbin/nologin -d /var/lib/ejabberd -M \
 			-c 'ejabberd' -g %{name} %{name} &>/dev/null || :
+# we should backup DB in every upgrade
+if ejabberdctl status >/dev/null ; then
+	# Use timestamp to make database restoring easier
+	TIME=$(date +%Y-%m-%dT%H:%M:%S)
+	BACKUPDIR=$(mktemp -d -p /var/tmp/ ejabberd-$TIME.XXXXXX)
+	chown ejabberd:ejabberd $BACKUPDIR
+	BACKUP=$BACKUPDIR/ejabberd-database
+	ejabberdctl backup $BACKUP
+	# Change ownership to root:root because ejabberd user might be
+	# removed on package removal.
+	chown -R root:root $BACKUPDIR
+	chmod 700 $BACKUPDIR
+	echo
+	echo The ejabberd database has been backed up to $BACKUP.
+	echo
+fi
+
+# fix cookie path (since ver. 2.1.0 cookie stored in /var/lib/ejabberd/spool
+# rather than in /var/lib/ejabberd
+if [ -f /var/lib/ejabberd/.erlang.cookie ]; then
+	cp -pf /var/lib/ejabberd/{,spool/}.erlang.cookie
+	echo
+	echo The ejabberd cookie file was moved.
+	echo Please remove old one from /var/lib/ejabberd/.erlang.cookie
+	echo
+fi
+
 
 %post
 /sbin/chkconfig --add %{name}
@@ -134,6 +177,11 @@ fi
 %patch3 -p0 -b .pam_name
 %patch5 -p0 -b .mod_ctlextra
 %patch8 -p0 -b .s2s
+%patch9 -p1 -b .bashism
+%patch10 -p1 -b .mod_admin_extra
+%patch11 -p1 -b .vcard_rfc_violation
+%patch12 -p1 -b .xhtml
+%patch13 -p1 -b .piefxis
 
 dos2unix src/odbc/mssql2000.sql
 
@@ -169,6 +217,9 @@ chmod a+x %{buildroot}%{_libdir}/%{name}
 # fix example SSL certificate path to real one, which we created recently (see above)
 %{__perl} -pi -e 's!/path/to/ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
 
+# fix captcha path
+%{__perl} -pi -e 's!/lib/ejabberd/priv/bin/captcha.sh!%{_libdir}/%{name}/priv/bin/captcha.sh!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
+
 mkdir -p %{buildroot}/var/log/ejabberd
 mkdir -p %{buildroot}/var/lib/ejabberd/spool
 
@@ -194,12 +245,9 @@ install -p -m 0644 src/odbc/mssql2000.sq
 install -p -m 0644 src/odbc/mssql2005.sql %{buildroot}%{_datadir}/%{name}
 install -p -m 0644 src/odbc/mysql.sql %{buildroot}%{_datadir}/%{name}
 install -p -m 0644 src/odbc/pg.sql %{buildroot}%{_datadir}/%{name}
-# install example script for CAPTCHA-protection
-install -p -m 0644 tools/captcha.sh %{buildroot}%{_datadir}/%{name}
 
 # removed files, which would be packaged later (see 'files' section)
 rm -rf %{buildroot}%{_docdir}/%{name}
-rm -f %{buildroot}%{_libdir}/%{name}/priv/bin/captcha.sh
 
 %clean
 rm -rf %{buildroot}
@@ -253,6 +301,7 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/include/mod_roster.hrl
 %{_libdir}/%{name}/include/web/ejabberd_http.hrl
 %{_libdir}/%{name}/include/web/ejabberd_web_admin.hrl
+%{_libdir}/%{name}/priv/bin/captcha.sh
 %attr(4750,root,ejabberd) %{_libdir}/%{name}/priv/bin/epam
 %{_libdir}/%{name}/priv/lib/ejabberd_zlib_drv.so
 %{_libdir}/%{name}/priv/lib/expat_erl.so
@@ -262,7 +311,6 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/priv/msgs/*.msg
 
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/captcha.sh
 %{_datadir}/%{name}/mssql2000.sql
 %{_datadir}/%{name}/mssql2005.sql
 %{_datadir}/%{name}/mysql.sql
@@ -303,6 +351,11 @@ rm -rf %{buildroot}
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Dec 10 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-2
+- DB backups are made on every upgrade/uninstall
+- Fixed installation of captcha.sh example helper
+- Added patches 9,10,11,12,13 from Debian's package
+
 * Fri Nov 20 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-1
 - Ver. 2.1.0
 - Upstream no longer providing ChangeLog


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	21 Nov 2009 08:02:52 -0000	1.15
+++ import.log	10 Dec 2009 19:09:42 -0000	1.16
@@ -13,3 +13,4 @@ ejabberd-2_0_5-6_fc11:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-8_fc11:HEAD:ejabberd-2.0.5-8.fc11.src.rpm:1252493017
 ejabberd-2_0_5-10_fc11:F-12:ejabberd-2.0.5-10.fc11.src.rpm:1257428464
 ejabberd-2_1_0-1_fc12:F-12:ejabberd-2.1.0-1.fc12.src.rpm:1258790540
+ejabberd-2_1_0-2_fc12:F-12:ejabberd-2.1.0-2.fc12.src.rpm:1260472047



From peter at fedoraproject.org  Thu Dec 10 19:11:12 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 10 Dec 2009 19:11:12 +0000 (UTC)
Subject: rpms/ejabberd/F-11 ejabberd-captcha-bashism.patch, NONE,
	1.1 ejabberd-http-poll-web-page.patch, NONE,
	1.1 ejabberd-mod_admin_extra.patch, NONE,
	1.1 ejabberd-piefxis-vhost-export.patch, NONE,
	1.1 ejabberd-vcard-reqs-forwarding.patch, NONE,
	1.1 ejabberd-ejabberdctl_fix.diff, 1.7, 1.8 ejabberd.spec, 1.41,
	1.42 import.log, 1.14, 1.15
Message-ID: <20091210191112.9853A11C025D@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11011/F-11

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.spec import.log 
Added Files:
	ejabberd-captcha-bashism.patch 
	ejabberd-http-poll-web-page.patch 
	ejabberd-mod_admin_extra.patch 
	ejabberd-piefxis-vhost-export.patch 
	ejabberd-vcard-reqs-forwarding.patch 
Log Message:
Fixed all issues, related with upgrading from the previous 2.0.5

ejabberd-captcha-bashism.patch:
 captcha.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ejabberd-captcha-bashism.patch ---
Makes the captcha script explicitly request bash as it uses
its special variable "RANDOM" which is not defined by POSIX.

The issue is tracked upstream at
https://support.process-one.net/browse/EJAB-1105

While it will be sensible to incorporate the upstream fix
(which will make the script work in POSIX-compliant shells also),
until bash is required in Debian, this patch is OK.

diff --git a/tools/captcha.sh b/tools/captcha.sh
index 4d40567..d68edfa 100755
--- a/tools/captcha.sh
+++ b/tools/captcha.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 INPUT=$1
 

ejabberd-http-poll-web-page.patch:
 ejabberd_http_poll.erl |   22 +++++++++++++++++++++-
 mod_http_bind.erl      |   25 ++++++++++++++++---------
 2 files changed, 37 insertions(+), 10 deletions(-)

--- NEW FILE ejabberd-http-poll-web-page.patch ---
Generates a human-readable XHTML page which is returned
when a user tries to browse the HTTP-poll URL configured
for the server (a common mistake).

This issue is tracked in EJAB-1106.

This changeset was introduced in revision 2751,
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/web/ejabberd_http_poll.erl	(revision 2750)
+++ b/src/web/ejabberd_http_poll.erl	(revision 2751)
@@ -154,12 +154,32 @@
 		    end
 	    end;
 	_ ->
-	    {200, [?CT, {"Set-Cookie", "ID=-2:0; expires=-1"}], ""}
+	    HumanHTMLxmlel = get_human_html_xmlel(),
+	    {200, [?CT, {"Set-Cookie", "ID=-2:0; expires=-1"}], HumanHTMLxmlel}
     end;
 process(_, _Request) ->
     {400, [], {xmlelement, "h1", [],
 	       [{xmlcdata, "400 Bad Request"}]}}.
 
+%% Code copied from mod_http_bind.erl and customized
+get_human_html_xmlel() ->
+    Heading = "ejabberd " ++ atom_to_list(?MODULE),
+    {xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"}],
+     [{xmlelement, "head", [],
+       [{xmlelement, "title", [], [{xmlcdata, Heading}]}]},
+      {xmlelement, "body", [],
+       [{xmlelement, "h1", [], [{xmlcdata, Heading}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "An implementation of "},
+          {xmlelement, "a",
+	   [{"href", "http://xmpp.org/extensions/xep-0025.html"}],
+           [{xmlcdata, "Jabber HTTP Polling (XEP-0025)"}]}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "This web page is only informative. "
+	   "To use HTTP-Poll you need a Jabber/XMPP client that supports it."}
+	 ]}
+       ]}]}.
+
 %%%----------------------------------------------------------------------
 %%% Callback functions from gen_fsm
 %%%----------------------------------------------------------------------
--- a/src/web/mod_http_bind.erl	(revision 2750)
+++ b/src/web/mod_http_bind.erl	(revision 2751)
@@ -69,7 +69,14 @@
     ejabberd_http_bind:process_request(Data, IP);
 process([], #request{method = 'GET',
                      data = []}) ->
-    Heading = "Ejabberd " ++ atom_to_list(?MODULE) ++ " v" ++ ?MOD_HTTP_BIND_VERSION,
+    get_human_html_xmlel();
+process(_Path, _Request) ->
+    ?DEBUG("Bad Request: ~p", [_Request]),
+    {400, [], {xmlelement, "h1", [],
+	       [{xmlcdata, "400 Bad Request"}]}}.
+
+get_human_html_xmlel() ->
+    Heading = "ejabberd " ++ atom_to_list(?MODULE) ++ " v" ++ ?MOD_HTTP_BIND_VERSION,
     {xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"}],
      [{xmlelement, "head", [],
        [{xmlelement, "title", [], [{xmlcdata, Heading}]}]},
@@ -77,15 +84,15 @@
        [{xmlelement, "h1", [], [{xmlcdata, Heading}]},
         {xmlelement, "p", [],
          [{xmlcdata, "An implementation of "},
-          {xmlelement, "a", [{"href", "http://www.xmpp.org/extensions/xep-0206.html"}],
-           [{xmlcdata, "XMPP over BOSH (XEP-0206)"}]}]}
-       ]}]};
-process(_Path, _Request) ->
-    ?DEBUG("Bad Request: ~p", [_Request]),
-    {400, [], {xmlelement, "h1", [],
-	       [{xmlcdata, "400 Bad Request"}]}}.
+          {xmlelement, "a",
+	   [{"href", "http://xmpp.org/extensions/xep-0206.html"}],
+           [{xmlcdata, "XMPP over BOSH (XEP-0206)"}]}]},
+        {xmlelement, "p", [],
+         [{xmlcdata, "This web page is only informative. "
+	   "To use HTTP-Bind you need a Jabber/XMPP client that supports it."}
+	 ]}
+       ]}]}.
 
-
 %%%----------------------------------------------------------------------
 %%% BEHAVIOUR CALLBACKS
 %%%----------------------------------------------------------------------

ejabberd-mod_admin_extra.patch:
 ejabberd.app        |    1 
 mod_admin_extra.erl | 1279 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1280 insertions(+)

--- NEW FILE ejabberd-mod_admin_extra.patch ---
Adds the mod_admin_extra module to ejabberd.
This module extends the functionality provided by ejabberdctl
by adding several new commands.

The code is taken from the ProcessOne repository:
https://forge.process-one.net/browse/ejabberd-modules/mod_admin_extra
(trunk, revision 976).

diff --git a/src/ejabberd.app b/src/ejabberd.app
index e0e943e..f017015 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -104,6 +104,7 @@
 	     mod_vcard_ldap,
 	     mod_vcard_odbc,
 	     mod_version,
+             mod_admin_extra,
 	     node_buddy,
 	     node_club,
 	     node_default,
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
new file mode 100644
index 0000000..9f3ca14
--- /dev/null
+++ b/src/mod_admin_extra.erl
@@ -0,0 +1,1279 @@
+%%%-------------------------------------------------------------------
+%%% File    : mod_admin_extra.erl
+%%% Author  : Badlop <badlop at process-one.net>
+%%% Purpose : Contributed administrative functions and commands
+%%% Created : 10 Aug 2008 by Badlop <badlop at process-one.net>
+%%%
+%%%
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%%
+%%% 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
+%%%
+%%%-------------------------------------------------------------------
+
+-module(mod_admin_extra).
+-author('badlop at process-one.net').
+
+-behaviour(gen_mod).
+
+-export([start/2, stop/1,
+	 %% Node
+	 compile/1,
+	 load_config/1,
+	 get_cookie/0,
+	 remove_node/1,
+	 export2odbc/2,
+	 %% Accounts
+	 set_password/3,
+	 check_password_hash/4,
+	 delete_old_users/1,
+	 delete_old_users_vhost/2,
+	 ban_account/3,
+	 num_active_users/2,
+	 %% Sessions
+	 num_resources/2,
+	 resource_num/3,
+	 kick_session/4,
+	 status_num/2, status_num/1,
+	 status_list/2, status_list/1,
+	 %% Vcard
+	 set_nickname/3,
+	 get_vcard/3,
+	 get_vcard/4,
+	 set_vcard/4,
+	 set_vcard/5,
+	 %% Roster
+	 add_rosteritem/7,
+	 delete_rosteritem/4,
+	 process_rosteritems/5,
+	 get_roster/2,
+	 push_roster/3,
+	 push_roster_all/1,
+	 push_alltoall/2,
+	 %% mod_shared_roster
+	 srg_create/5,
+	 srg_delete/2,
+	 srg_list/1,
+	 srg_get_info/2,
+	 srg_get_members/2,
+	 srg_user_add/4,
+	 srg_user_del/4,
+	 %% Stanza
+	 send_message_headline/4,
+	 send_message_chat/3,
+	 %% Stats
+	 stats/1, stats/2
+	]).
+
+-include("ejabberd.hrl").
+-include("ejabberd_commands.hrl").
+-include("mod_roster.hrl").
+-include("jlib.hrl").
+
+%% Copied from ejabberd_sm.erl
+-record(session, {sid, usr, us, priority, info}).
+
+
+%%%
+%%% gen_mod
+%%%
+
+start(_Host, _Opts) ->
+    ejabberd_commands:register_commands(commands()).
+
+stop(_Host) ->
+    ejabberd_commands:unregister_commands(commands()).
+
+
+%%%
+%%% Register commands
+%%%
+
+commands() ->
+    Vcard1FieldsString = "Some vcard field names in get/set_vcard are:\n"
+	" FN		- Full Name\n"
+	" NICKNAME	- Nickname\n"
+	" BDAY		- Birthday\n"
+	" TITLE		- Work: Position\n",
+    " ROLE		- Work: Role",
+
+    Vcard2FieldsString = "Some vcard field names and subnames in get/set_vcard2 are:\n"
+	" N FAMILY	- Family name\n"
+	" N GIVEN	- Given name\n"
+	" N MIDDLE	- Middle name\n"
+	" ADR CTRY	- Address: Country\n"
+	" ADR LOCALITY	- Address: City\n"
+	" EMAIL USERID	- E-Mail Address\n"
+	" ORG ORGNAME	- Work: Company\n"
+	" ORG ORGUNIT	- Work: Department",
+
+    VcardXEP = "For a full list of vCard fields check XEP-0054: vcard-temp at "
+	"http://www.xmpp.org/extensions/xep-0054.html",
+
+    [
+     #ejabberd_commands{name = compile, tags = [erlang],
+			desc = "Recompile and reload Erlang source code file",
+			module = ?MODULE, function = compile,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = load_config, tags = [server],
+			desc = "Load ejabberd configuration file",
+			module = ?MODULE, function = load_config,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = get_cookie, tags = [erlang],
+			desc = "Get the Erlang cookie of this node",
+			module = ?MODULE, function = get_cookie,
+			args = [],
+			result = {cookie, string}},
+     #ejabberd_commands{name = remove_node, tags = [erlang],
+			desc = "Remove an ejabberd node from Mnesia clustering config",
+			module = ?MODULE, function = remove_node,
+			args = [{node, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = export2odbc, tags = [mnesia],
+			desc = "Export Mnesia tables to files in directory",
+			module = ?MODULE, function = export2odbc,
+			args = [{host, string}, {path, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = num_active_users, tags = [accounts, stats],
+			desc = "Get number of users active in the last days",
+			module = ?MODULE, function = num_active_users,
+			args = [{host, string}, {days, integer}],
+			result = {users, integer}},
+     #ejabberd_commands{name = delete_old_users, tags = [accounts, purge],
+			desc = "Delete users that didn't log in last days",
+			module = ?MODULE, function = delete_old_users,
+			args = [{days, integer}],
+			result = {res, restuple}},
+     #ejabberd_commands{name = delete_old_users_vhost, tags = [accounts, purge],
+			desc = "Delete users that didn't log in last days in vhost",
+			module = ?MODULE, function = delete_old_users_vhost,
+			args = [{host, string}, {days, integer}],
+			result = {res, restuple}},
+
+     #ejabberd_commands{name = check_account, tags = [accounts],
+			desc = "Check if an acount exists or not",
+			module = ejabberd_auth, function = is_user_exists,
+			args = [{user, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = check_password, tags = [accounts],
+			desc = "Check if a password is correct",
+			module = ejabberd_auth, function = check_password,
+			args = [{user, string}, {host, string}, {password, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = check_password_hash, tags = [accounts],
+			desc = "Check if the password hash is correct",
+			longdesc = "Allowed hash methods: md5, sha.",
+			module = ?MODULE, function = check_password_hash,
+			args = [{user, string}, {host, string}, {passwordhash, string}, {hashmethod, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = change_password, tags = [accounts],
+			desc = "Change the password of an account",
+			module = ?MODULE, function = set_password,
+			args = [{user, string}, {host, string}, {newpass, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = ban_account, tags = [accounts],
+			desc = "Ban an account: kick sessions and set random password",
+			module = ?MODULE, function = ban_account,
+			args = [{user, string}, {host, string}, {reason, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = num_resources, tags = [session],
+			desc = "Get the number of resources of a user",
+			module = ?MODULE, function = num_resources,
+			args = [{user, string}, {host, string}],
+			result = {resources, integer}},
+     #ejabberd_commands{name = resource_num, tags = [session],
+			desc = "Resource string of a session number",
+			module = ?MODULE, function = resource_num,
+			args = [{user, string}, {host, string}, {num, integer}],
+			result = {resource, string}},
+     #ejabberd_commands{name = kick_session, tags = [session],
+			desc = "Kick a user session",
+			module = ?MODULE, function = kick_session,
+			args = [{user, string}, {host, string}, {resource, string}, {reason, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = status_num_host, tags = [session, stats],
+			desc = "Number of logged users with this status in host",
+			module = ?MODULE, function = status_num,
+			args = [{host, string}, {status, string}],
+			result = {users, integer}},
+     #ejabberd_commands{name = status_num, tags = [session, stats],
+			desc = "Number of logged users with this status",
+			module = ?MODULE, function = status_num,
+			args = [{status, string}],
+			result = {users, integer}},
+     #ejabberd_commands{name = status_list_host, tags = [session],
+			desc = "List of users logged in host with their statuses",
+			module = ?MODULE, function = status_list,
+			args = [{host, string}, {status, string}],
+			result = {users, {list,
+					  {userstatus, {tuple, [
+								{user, string},
+								{host, string},
+								{resource, string},
+								{priority, integer},
+								{status, string}
+							       ]}}
+					 }}},
+     #ejabberd_commands{name = status_list, tags = [session],
+			desc = "List of logged users with this status",
+			module = ?MODULE, function = status_list,
+			args = [{status, string}],
+			result = {users, {list,
+					  {userstatus, {tuple, [
+								{user, string},
+								{host, string},
+								{resource, string},
+								{priority, integer},
+								{status, string}
+							       ]}}
+					 }}},
+
+     #ejabberd_commands{name = set_nickname, tags = [vcard],
+			desc = "Set nickname in a user's vcard",
+			module = ?MODULE, function = set_nickname,
+			args = [{user, string}, {host, string}, {nickname, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = get_vcard, tags = [vcard],
+			desc = "Get content from a vCard field",
+			longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP,
+			module = ?MODULE, function = get_vcard,
+			args = [{user, string}, {host, string}, {name, string}],
+			result = {content, string}},
+     #ejabberd_commands{name = get_vcard2, tags = [vcard],
+			desc = "Get content from a vCard field",
+			longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
+			module = ?MODULE, function = get_vcard,
+			args = [{user, string}, {host, string}, {name, string}, {subname, string}],
+			result = {content, string}},
+     #ejabberd_commands{name = set_vcard, tags = [vcard],
+			desc = "Set content in a vCard field",
+			longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP,
+			module = ?MODULE, function = set_vcard,
+			args = [{user, string}, {host, string}, {name, string}, {content, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = set_vcard2, tags = [vcard],
+			desc = "Set content in a vCard subfield",
+			longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
+			module = ?MODULE, function = set_vcard2,
+			args = [{user, string}, {host, string}, {name, string}, {subname, string}, {content, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = add_rosteritem, tags = [roster],
+			desc = "Add an item to a user's roster",
+			module = ?MODULE, function = add_rosteritem,
+			args = [{localuser, string}, {localserver, string},
+				{user, string}, {server, string},
+				{nick, string}, {group, string},
+				{subs, string}],
+			result = {res, rescode}},
+     %%{"", "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"},
+     #ejabberd_commands{name = delete_rosteritem, tags = [roster],
+			desc = "Delete an item from a user's roster",
+			module = ?MODULE, function = delete_rosteritem,
+			args = [{localuser, string}, {localserver, string},
+				{user, string}, {server, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = process_rosteritems, tags = [roster],
+			desc = "List or delete rosteritems that match filtering options",
+			longdesc = "Explanation of each argument:\n"
+			" - action: what to do with each rosteritem that "
+			"matches all the filtering options\n"
+			" - subs: subscription type\n"
+			" - asks: pending subscription\n"
+			" - users: the JIDs of the local user\n"
+			" - contacts: the JIDs of the contact in the roster\n"
+			"\n"
+			"Allowed values in the arguments:\n"
+			"  ACTION = list | delete\n"
+			"  SUBS = SUB[:SUB]* | any\n"
+			"  SUB = none | from | to | both\n"
+			"  ASKS = ASK[:ASK]* | any\n"
+			"  ASK = none | out | in\n"
+			"  USERS = JID[:JID]* | any\n"
+			"  CONTACTS = JID[:JID]* | any\n"
+			"  JID = characters valid in a JID, and can use the "
+			"globs: *, ? and [...]\n"
+			"\n"
+			"This example will list roster items with subscription "
+			"'none', 'from' or 'to' that have any ask property, of "
+			"local users which JID is in the virtual host "
+			"'example.org' and that the contact JID is either a "
+			"bare server name (without user part) or that has a "
+			"user part and the server part contains the word 'icq'"
+			":\n  list none:from:to any *@example.org *:*@*icq*",
+			module = ?MODULE, function = process_rosteritems,
+			args = [{action, string}, {subs, string},
+				{asks, string}, {users, string},
+				{contacts, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = get_roster, tags = [roster],
+			desc = "Get roster of a local user",
+			module = ?MODULE, function = get_roster,
+			args = [{user, string}, {host, string}],
+			result = {contacts, {list, {contact, {tuple, [
+								      {jid, string},
+								      {nick, string},
+								      {group, string}
+								     ]}}}}},
+     #ejabberd_commands{name = push_roster, tags = [roster],
+			desc = "Push template roster from file to a user",
+			module = ?MODULE, function = push_roster,
+			args = [{file, string}, {user, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = push_roster_all, tags = [roster],
+			desc = "Push template roster from file to all those users",
+			module = ?MODULE, function = push_roster_all,
+			args = [{file, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = push_alltoall, tags = [roster],
+			desc = "Add all the users to all the users of Host in Group",
+			module = ?MODULE, function = push_alltoall,
+			args = [{host, string}, {group, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = srg_create, tags = [shared_roster_group],
+			desc = "Create a Shared Roster Group",
+			longdesc = "If you want to specify several group "
+			"identifiers in the Display argument,\n"
+			"put  \\ \" around the argument and\nseparate the "
+			"identifiers with \\ \\ n\n"
+			"For example:\n"
+			"  ejabberdctl srg_create group3 localhost "
+			"name desc \\\"group1\\\\ngroup2\\\"",
+			module = ?MODULE, function = srg_create,
+			args = [{group, string}, {host, string},
+				{name, string}, {description, string}, {display, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_delete, tags = [shared_roster_group],
+			desc = "Delete a Shared Roster Group",
+			module = ?MODULE, function = srg_delete,
+			args = [{group, string}, {host, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_list, tags = [shared_roster_group],
+			desc = "List the Shared Roster Groups in Host",
+			module = ?MODULE, function = srg_list,
+			args = [{host, string}],
+			result = {groups, {list, {id, string}}}},
+     #ejabberd_commands{name = srg_get_info, tags = [shared_roster_group],
+			desc = "Get info of a Shared Roster Group",
+			module = ?MODULE, function = srg_get_info,
+			args = [{group, string}, {host, string}],
+			result = {informations, {list, {information, {tuple, [{key, string}, {value, string}]}}}}},
+     #ejabberd_commands{name = srg_get_members, tags = [shared_roster_group],
+			desc = "Get members of a Shared Roster Group",
+			module = ?MODULE, function = srg_get_members,
+			args = [{group, string}, {host, string}],
+			result = {members, {list, {member, string}}}},
+     #ejabberd_commands{name = srg_user_add, tags = [shared_roster_group],
+			desc = "Add the JID user at host to the Shared Roster Group",
+			module = ?MODULE, function = srg_user_add,
+			args = [{user, string}, {host, string}, {group, string}, {grouphost, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = srg_user_del, tags = [shared_roster_group],
+			desc = "Delete this JID user at host from the Shared Roster Group",
+			module = ?MODULE, function = srg_user_del,
+			args = [{user, string}, {host, string}, {group, string}, {grouphost, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = send_message_chat, tags = [stanza],
+			desc = "Send a chat message to a local or remote bare of full JID",
+			module = ?MODULE, function = send_message_chat,
+			args = [{from, string}, {to, string}, {body, string}],
+			result = {res, rescode}},
+     #ejabberd_commands{name = send_message_headline, tags = [stanza],
+			desc = "Send a headline message to a local or remote bare of full JID",
+			module = ?MODULE, function = send_message_headline,
+			args = [{from, string}, {to, string},
+				{subject, string}, {body, string}],
+			result = {res, rescode}},
+
+     #ejabberd_commands{name = stats, tags = [stats],
+			desc = "Get statistical value: registeredusers onlineusers onlineusersnode uptimeseconds",
+			module = ?MODULE, function = stats,
+			args = [{name, string}],
+			result = {stat, integer}},
+     #ejabberd_commands{name = stats_host, tags = [stats],
+			desc = "Get statistical value for this host: registeredusers onlineusers",
+			module = ?MODULE, function = stats,
+			args = [{name, string}, {host, string}],
+			result = {stat, integer}}
+    ].
+
+
+%%%
+%%% Node
+%%%
+
+compile(File) ->
+    case compile:file(File) of
+	ok -> ok;
+	_ -> error
+    end.
+
+load_config(Path) ->
+    ok = ejabberd_config:load_file(Path).
+
+get_cookie() ->
+    atom_to_list(erlang:get_cookie()).
+
+remove_node(Node) ->
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ok.
+
+export2odbc(Host, Directory) ->
+    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([Directory, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on Host '~s' to file '~s'~n", [Table, Host, Filename]),
+		     Res = (catch ejd2odbc:TableFun(Host, Filename)),
+		     io:format("  Result: ~p~n", [Res])
+	     end,
+    lists:foreach(Export, Tables),
+    ok.
+
+
+%%%
+%%% Accounts
+%%%
+
+set_password(User, Host, Password) ->
+    case ejabberd_auth:set_password(User, Host, Password) of
+	ok ->
+	    ok;
+	_ ->
+	    error
+    end.
+
+%% Copied some code from ejabberd_commands.erl
+check_password_hash(User, Host, PasswordHash, HashMethod) ->
+    AccountPass = ejabberd_auth:get_password_s(User, Host),
+    AccountPassHash = case HashMethod of
+			  "md5" -> get_md5(AccountPass);
+			  "sha" -> get_sha(AccountPass);
+			  _ -> undefined
+		      end,
+    case AccountPassHash of
+	undefined -> error;
+	PasswordHash -> ok;
+	_ -> error
+    end.
+get_md5(AccountPass) ->
+    lists:flatten([io_lib:format("~.16B", [X])
+		   || X <- binary_to_list(crypto:md5(AccountPass))]).
+get_sha(AccountPass) ->
+    lists:flatten([io_lib:format("~.16B", [X])
+		   || X <- binary_to_list(crypto:sha(AccountPass))]).
+
+num_active_users(Host, Days) ->
+    list_last_activity(Host, true, Days).
+
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+list_last_activity(Host, Integral, Days) ->
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp = MegaSecs * 1000000 + Secs,
+    TS = TimeStamp - Days * 86400,
+    case catch mnesia:dirty_select(
+		 last_activity, [{{last_activity, {'_', Host}, '$1', '_'},
+				  [{'>', '$1', TS}],
+				  [{'trunc', {'/',
+					      {'-', TimeStamp, '$1'},
+					      86400}}]}]) of
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = Days - length(Hist),
+			 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 ->
+    histogram(T, Integral, Current, Count + 1, Hist);
+histogram([H | _] = Values, Integral, Current, Count, Hist) when Current < H ->
+    if
+	Integral ->
+	    histogram(Values, Integral, Current + 1, Count, [Count | Hist]);
+	true ->
+	    histogram(Values, Integral, Current + 1, 0, [Count | Hist])
+    end;
+histogram([], _Integral, _Current, Count, Hist) ->
+    if
+	Count > 0 ->
+	    lists:reverse([Count | Hist]);
+	true ->
+	    lists:reverse(Hist)
+    end.
+
+
+-record(last_activity, {us, timestamp, status}).
+
+delete_old_users(Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
+
+    {removed, N, UR} = delete_old_users(Days, Users),
+    {ok, io_lib:format("Deleted ~p users: ~p", [N, UR])}.
+
+delete_old_users_vhost(Host, Days) ->
+    %% Get the list of registered users
+    Users = ejabberd_auth:get_vh_registered_users(Host),
+
+    {removed, N, UR} = delete_old_users(Days, Users),
+    {ok, io_lib:format("Deleted ~p users: ~p", [N, UR])}.
+
+delete_old_users(Days, Users) ->
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% 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 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;
+			    %% 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}.
+
+
+%%
+%% Ban account
+
+ban_account(User, Host, ReasonText) ->
+    Reason = prepare_reason(ReasonText),
+    kick_sessions(User, Host, Reason),
+    set_random_password(User, Host, Reason),
+    ok.
+
+kick_sessions(User, Server, Reason) ->
+    lists:map(
+      fun(Resource) ->
+	      kick_this_session(User, Server, Resource, Reason)
+      end,
+      get_resources(User, Server)).
+
+get_resources(User, Server) ->
+    lists:map(
+      fun(Session) ->
+	      element(3, Session#session.usr)
+      end,
+      get_sessions(User, Server)).
+
+get_sessions(User, Server) ->
+    LUser = jlib:nodeprep(User),
+    LServer = jlib:nameprep(Server),
+    Sessions =  mnesia:dirty_index_read(session, {LUser, LServer}, #session.us),
+    true = is_list(Sessions),
+    Sessions.
+
+set_random_password(User, Server, Reason) ->
+    NewPass = build_random_password(Reason),
+    set_password_auth(User, Server, NewPass).
+
+build_random_password(Reason) ->
+    Date = jlib:timestamp_to_iso(calendar:universal_time()),
+    RandomString = randoms:get_string(),
+    "BANNED_ACCOUNT--" ++ Date ++ "--" ++ RandomString ++ "--" ++ Reason.
+
+set_password_auth(User, Server, Password) ->
+    ok = ejabberd_auth:set_password(User, Server, Password).
+
+prepare_reason([]) ->
+    "Kicked by administrator";
+prepare_reason([Reason]) ->
+    Reason;
+prepare_reason(Reason) when is_list(Reason) ->
+    Reason;
+prepare_reason(StringList) ->
+    string:join(StringList, "_").
+
+
+%%%
+%%% Sessions
+%%%
+
+num_resources(User, Host) ->
+    length(ejabberd_sm:get_user_resources(User, Host)).
+
+resource_num(User, Host, Num) ->
+    Resources = ejabberd_sm:get_user_resources(User, Host),
+    case (0<Num) and (Num=<length(Resources)) of
+	true ->
+	    lists:nth(Num, Resources);
+	false ->
+	    lists:flatten(io_lib:format("Error: Wrong resource number: ~p", [Num]))
+    end.
+
+kick_session(User, Server, Resource, ReasonText) ->
+    kick_this_session(User, Server, Resource, prepare_reason(ReasonText)),
+    ok.
+
+kick_this_session(User, Server, Resource, Reason) ->
+    ejabberd_router:route(
+      jlib:make_jid("", "", ""),
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, Reason}]}).
+
+
+status_num(Host, Status) ->
+    length(get_status_list(Host, Status)).
+status_num(Status) ->
+    status_num("all", Status).
+status_list(Host, Status) ->
+    Res = get_status_list(Host, Status),
+    [{U, S, R, P, St} || {U, S, R, P, St} <- Res].
+status_list(Status) ->
+    status_list("all", Status).
+
+
+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
+		"all" ->
+		    %% 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])].
+
+%% Make string more print-friendly
+stringize(String) ->
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
+
+
+%%%
+%%% Vcard
+%%%
+
+set_nickname(User, Host, Nickname) ->
+    R = mod_vcard:process_sm_iq(
+	  {jid, User, Host, "", User, Host, ""},
+	  {jid, User, Host, "", User, Host, ""},
+	  {iq, "", set, "", "en",
+	   {xmlelement, "vCard",
+	    [{"xmlns", "vcard-temp"}], [
+					{xmlelement, "NICKNAME", [], [{xmlcdata, Nickname}]}
+				       ]
+	   }}),
+    case R of
+	{iq, [], result, [], _L, []} ->
+	    ok;
+	_ ->
+	    error
+    end.
+
+get_vcard(User, Host, Name) ->
+    get_vcard_content(User, Host, [Name]).
+
+get_vcard(User, Host, Name, Subname) ->
+    get_vcard_content(User, Host, [Name, Subname]).
+
+set_vcard(User, Host, Name, Content) ->
+    set_vcard_content(User, Host, [Name], Content).
+
+set_vcard(User, Host, Name, Subname, Content) ->
+    set_vcard_content(User, Host, [Name, Subname], Content).
+
+
+%%
+%% Internal vcard
+
+get_vcard_content(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),
+    case IQr#iq.sub_el of
+	[A1] ->
+	    case get_vcard(Data, A1) of
+		false -> "Error: no_value";
+		Elem -> xml:get_tag_cdata(Elem)
+	    end;
+	[] ->
+	    "Error: no_vcard"
+    end.
+
+get_vcard([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> get_vcard([Data2], A2)
+    end;
+
+get_vcard([Data], A1) ->
+    xml:get_subtag(A1, Data).
+
+set_vcard_content(User, Server, Data, Content) ->
+    [{_, 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.
+
+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).
+
+
+%%%
+%%% Roster
+%%%
+
+add_rosteritem(LocalUser, LocalServer, User, Server, Nick, Group, Subs) ->
+    case add_rosteritem(LocalUser, LocalServer, User, Server, Nick, Group, list_to_atom(Subs), []) of
+	{atomic, ok} ->
+	    push_roster_item(LocalUser, LocalServer, User, Server, {add, Nick, Subs, Group}),
+	    ok;
+	_ ->
+	    error
+    end.
+
+add_rosteritem(LU, LS, User, Server, Nick, Group, Subscription, Xattrs) ->
+    subscribe(LU, LS, User, Server, Nick, Group, Subscription, Xattrs).
+
+subscribe(LU, LS, User, Server, Nick, Group, Subscription, Xattrs) ->
+    mnesia:transaction(
+      fun() ->
+	      mnesia:write({roster,
+			    {LU,LS,{User,Server,[]}}, % uj
+			    {LU,LS},                  % user
+			    {User,Server,[]},      % 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).
+
+delete_rosteritem(LocalUser, LocalServer, User, Server) ->
+    case unsubscribe(LocalUser, LocalServer, User, Server) of
+	{atomic, ok} ->
+	    push_roster_item(LocalUser, LocalServer, User, Server, remove),
+	    ok;
+	_  ->
+	    error
+    end.
+
+unsubscribe(LU, LS, User, Server) ->
+    mnesia:transaction(
+      fun() ->
+              mnesia:delete({roster, {LU, LS, {User, Server, []}}})
+      end).
+
+
+%% -----------------------------
+%% Get Roster
+%% -----------------------------
+
+get_roster(User, Server) ->
+    {ok, Roster} = get_roster2(User, Server),
+    make_roster_xmlrpc(Roster).
+
+get_roster2(User, Server) ->
+    Modules = gen_mod:loaded_modules(Server),
+    Roster = case lists:member(mod_roster, Modules) of
+		 true ->
+		     mod_roster:get_user_roster([], {User, Server});
+		 false ->
+		     case lists:member(mod_roster_odbc, Modules) of
+			 true ->
+			     mod_roster_odbc:get_user_roster([], {User, Server});
+			 false ->
+			     {error, "Neither mod_roster or mod_roster_odbc are enabled"}
+		     end
+	     end,
+    {ok, Roster}.
+
+%% Note: if a contact is in several groups, the contact is returned
+%% several times, each one in a different group.
+make_roster_xmlrpc(Roster) ->
+    lists:foldl(
+      fun(Item, Res) ->
+	      JIDS = jlib:jid_to_string(Item#roster.jid),
+	      Nick = Item#roster.name,
+	      Groups = case Item#roster.groups of
+			   [] -> [""];
+			   Gs -> Gs
+		       end,
+	      ItemsX = [{JIDS, Nick, Group}
+			|| Group <- Groups],
+	      ItemsX ++ Res
+      end,
+      [],
+      Roster).
+
+
+%%-----------------------------
+%% Push Roster from file
+%%-----------------------------
+
+push_roster(File, User, Server) ->
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
+
+push_roster_all(File) ->
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
+
+subscribe_all(Roster) ->
+    subscribe_all(Roster, Roster).
+subscribe_all([], _) ->
+    ok;
+subscribe_all([User1 | Users], Roster) ->
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
+
+subscribe_roster(_, []) ->
+    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({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | 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),
+    ok.
+
+build_list_users(_Group, [], Res) ->
+    Res;
+build_list_users(Group, [{User, Server}|Users], Res) ->
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+
+%% @spec(LU, LS, U, S, Action) -> ok
+%%       Action = {add, Nick, Subs, Group} | remove
+%% @doc Push to the roster of account LU at LS the contact U at S.
+%% The specific action to perform is defined in Action.
+push_roster_item(LU, LS, U, S, Action) ->
+    lists:foreach(fun(R) ->
+			  push_roster_item(LU, LS, R, U, S, Action)
+		  end, ejabberd_sm:get_user_resources(LU, LS)).
+
+push_roster_item(LU, LS, R, U, S, Action) ->
+    Item = build_roster_item(U, S, Action),
+    ResIQ = build_iq_roster_push(Item),
+    LJID = jlib:make_jid(LU, LS, R),
+    ejabberd_router:route(LJID, LJID, ResIQ).
+
+build_roster_item(U, S, {add, Nick, Subs, Group}) ->
+    {xmlelement, "item",
+     [{"jid", jlib:jid_to_string(jlib:make_jid(U, S, ""))},
+      {"name", Nick},
+      {"subscription", Subs}],
+     [{xmlelement, "group", [], [{xmlcdata, Group}]}]
+    };
+build_roster_item(U, S, remove) ->
+    {xmlelement, "item",
+     [{"jid", jlib:jid_to_string(jlib:make_jid(U, S, ""))},
+      {"subscription", "remove"}],
+     []
+    }.
+
+build_iq_roster_push(Item) ->
+    {xmlelement, "iq",
+     [{"type", "set"}, {"id", "push"}],
+     [{xmlelement, "query",
+       [{"xmlns", ?NS_ROSTER}],
+       [Item]
+      }
+     ]
+    }.
+
+
+%%%
+%%% Shared Roster Groups
+%%%
+
+srg_create(Group, Host, Name, Description, Display) ->
+    {ok, DisplayList} = regexp:split(Display, "\\\\n"),
+    Opts = [{name, Name},
+	    {displayed_groups, DisplayList},
+	    {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    ok.
+
+srg_delete(Group, Host) ->
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    ok.
+
+srg_list(Host) ->
+    lists:sort(mod_shared_roster:list_groups(Host)).
+
+srg_get_info(Group, Host) ->
+    Opts = mod_shared_roster:get_group_opts(Host,Group),
+    [{io_lib:format("~p", [Title]),
+      io_lib:format("~p", [Value])} || {Title, Value} <- Opts].
+
+srg_get_members(Group, Host) ->
+    Members = mod_shared_roster:get_group_explicit_users(Host,Group),
+    [jlib:jid_to_string(jlib:make_jid(MUser, MServer, ""))
+     || {MUser, MServer} <- Members].
+
+srg_user_add(User, Host, Group, GroupHost) ->
+    {atomic, ok} = mod_shared_roster:add_user_to_group(GroupHost, {User, Host}, Group),
+    ok.
+
+srg_user_del(User, Host, Group, GroupHost) ->
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(GroupHost, {User, Host}, Group),
+    ok.
+
+
+%%%
+%%% Stanza
+%%%
+
+%% @doc Send a chat message to a Jabber account.
+%% @spec (From::string(), To::string(), Body::string()) -> ok
+send_message_chat(From, To, Body) ->
+    Packet = build_packet(message_chat, [Body]),
+    send_packet_all_resources(From, To, Packet).
+
+%% @doc Send a headline message to a Jabber account.
+%% @spec (From::string(), To::string(), Subject::string(), Body::string()) -> ok
+send_message_headline(From, To, Subject, Body) ->
+    Packet = build_packet(message_headline, [Subject, Body]),
+    send_packet_all_resources(From, To, Packet).
+
+%% @doc Send a packet to a Jabber account.
+%% If a resource was specified in the JID,
+%% the packet is sent only to that specific resource.
+%% If no resource was specified in the JID,
+%% and the user is remote or local but offline,
+%% the packet is sent to the bare JID.
+%% If the user is local and is online in several resources,
+%% the packet is sent to all its resources.
+send_packet_all_resources(FromJIDString, ToJIDString, Packet) ->
+    FromJID = jlib:string_to_jid(FromJIDString),
+    ToJID = jlib:string_to_jid(ToJIDString),
+    ToUser = ToJID#jid.user,
+    ToServer = ToJID#jid.server,
+    case ToJID#jid.resource of
+	"" ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, Packet);
+	Res ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, Res, Packet)
+    end.
+
+send_packet_all_resources(FromJID, ToUser, ToServer, Packet) ->
+    case ejabberd_sm:get_user_resources(ToUser, ToServer) of
+	[] ->
+	    send_packet_all_resources(FromJID, ToUser, ToServer, "", Packet);
+	ToResources ->
+	    lists:foreach(
+	      fun(ToResource) ->
+		      send_packet_all_resources(FromJID, ToUser, ToServer,
+						ToResource, Packet)
+	      end,
+	      ToResources)
+    end.
+
+send_packet_all_resources(FromJID, ToU, ToS, ToR, Packet) ->
+    ToJID = jlib:make_jid(ToU, ToS, ToR),
+    ejabberd_router:route(FromJID, ToJID, Packet).
+
+
+build_packet(message_chat, [Body]) ->
+    {xmlelement, "message",
+     [{"type", "chat"}],
+     [{xmlelement, "body", [], [{xmlcdata, Body}]}]
+    };
+build_packet(message_headline, [Subject, Body]) ->
+    {xmlelement, "message",
+     [{"type", "headline"}],
+     [{xmlelement, "subject", [], [{xmlcdata, Subject}]},
+      {xmlelement, "body", [], [{xmlcdata, Body}]}
+     ]
+    }.
+
+%%%
+%%% Stats
+%%%
+
+stats(Name) ->
+    case Name of
+	"uptimeseconds" -> trunc(element(1, erlang:statistics(wall_clock))/1000);
+	"registeredusers" -> length(ejabberd_auth:dirty_get_registered_users());
+	"onlineusersnode" -> length(ejabberd_sm:dirty_get_my_sessions_list());
+	"onlineusers" -> length(ejabberd_sm:dirty_get_sessions_list())
+    end.
+
+stats(Name, Host) ->
+    case Name of
+	"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+    end.
+
+
+
+%%-----------------------------
+%% Purge roster items
+%%-----------------------------
+
+process_rosteritems(ActionS, SubsS, AsksS, UsersS, ContactsS) ->
+    Action = case ActionS of
+		 "list" -> list;
+		 "delete" -> delete
+	     end,
+
+    Subs = lists:foldl(
+	     fun(any, _) -> [none, from, to, both];
+		(Sub, Subs) -> [Sub | Subs]
+	     end,
+	     [],
+	     [list_to_atom(S) || S <- string:tokens(SubsS, ":")]
+	    ),
+
+    Asks = lists:foldl(
+	     fun(any, _) -> [none, out, in];
+		(Ask, Asks) -> [Ask | Asks]
+	     end,
+	     [],
+	     [list_to_atom(S) || S <- string:tokens(AsksS, ":")]
+	    ),
+
+    Users = lists:foldl(
+	      fun("any", _) -> ["*", "*@*"];
+		 (U, Us) -> [U | Us]
+	      end,
+	      [],
+	      [S || S <- string:tokens(UsersS, ":")]
+	     ),
+
+    Contacts = lists:foldl(
+		 fun("any", _) -> ["*", "*@*"];
+		    (U, Us) -> [U | Us]
+		 end,
+		 [],
+		 [S || S <- string:tokens(ContactsS, ":")]
+		),
+
+    case rosteritem_purge({Action, Subs, Asks, Users, Contacts}) of
+	{atomic, ok} ->
+	    ok;
+	{error, Reason} ->
+	    io:format("Error purging rosteritems: ~p~n", [Reason]),
+	    error;
+	{badrpc, Reason} ->
+	    io:format("BadRPC purging rosteritems: ~p~n", [Reason]),
+	    error
+    end.
+
+%% @spec ({Action::atom(), Subs::[atom()], Asks::[atom()], User::string(), Contact::string()}) -> {atomic, ok}
+rosteritem_purge(Options) ->
+    Num_rosteritems = mnesia:table_info(roster, size),
+    io:format("There are ~p roster items in total.~n", [Num_rosteritems]),
+    Key = mnesia:dirty_first(roster),
+    ok = rip(Key, Options, {0, Num_rosteritems, 0, 0}),
+    {atomic, ok}.
+
+rip('$end_of_table', _Options, Counters) ->
+    print_progress_line(Counters),
+    ok;
+rip(Key, Options, {Pr, NT, NV, ND}) ->
+    Key_next = mnesia:dirty_next(roster, Key),
+    {Action, _, _, _, _} = Options,
+    ND2 = case decide_rip(Key, Options) of
+	      true ->
+		  apply_action(Action, Key),
+		  ND+1;
+	      false ->
+		  ND
+	  end,
+    NV2 = NV+1,
+    Pr2 = print_progress_line({Pr, NT, NV2, ND2}),
+    rip(Key_next, Options, {Pr2, NT, NV2, ND2}).
+
+apply_action(list, Key) ->
+    {User, Server, JID} = Key,
+    {RUser, RServer, _} = JID,
+    io:format("Matches: ~s@~s ~s@~s~n", [User, Server, RUser, RServer]);
+apply_action(delete, Key) ->
+    apply_action(list, Key),
+    mnesia:dirty_delete(roster, Key).
+
+print_progress_line({Pr, NT, NV, ND}) ->
+    Pr2 = trunc((NV/NT)*100),
+    case Pr == Pr2 of
+	true ->
+	    ok;
+	false ->
+	    io:format("Progress ~p% - visited ~p - deleted ~p~n", [Pr2, NV, ND])
+    end,
+    Pr2.
+
+decide_rip(Key, {_Action, Subs, Asks, User, Contact}) ->
+    case catch mnesia:dirty_read(roster, Key) of
+	[RI] ->
+	    lists:member(RI#roster.subscription, Subs)
+		andalso lists:member(RI#roster.ask, Asks)
+		andalso decide_rip_jid(RI#roster.us, User)
+		andalso decide_rip_jid(RI#roster.jid, Contact);
+	_ ->
+	    false
+    end.
+
+%% Returns true if the server of the JID is included in the servers
+decide_rip_jid({UName, UServer, _UResource}, Match_list) ->
+    decide_rip_jid({UName, UServer}, Match_list);
+decide_rip_jid({UName, UServer}, Match_list) ->
+    lists:any(
+      fun(Match_string) ->
+	      MJID = jlib:string_to_jid(Match_string),
+	      MName = MJID#jid.luser,
+	      MServer = MJID#jid.lserver,
+	      Is_server = is_glob_match(UServer, MServer),
+	      case MName of
+		  [] when UName == [] ->
+		      Is_server;
+		  [] ->
+		      false;
+		  _ ->
+		      Is_server
+			  andalso is_glob_match(UName, MName)
+	      end
+      end,
+      Match_list).
+
+%% Copied from ejabberd-2.0.0/src/acl.erl
+is_regexp_match(String, RegExp) ->
+    case regexp:first_match(String, RegExp) of
+	nomatch ->
+	    false;
+	{match, _, _} ->
+	    true;
+	{error, ErrDesc} ->
+	    io:format(
+	      "Wrong regexp ~p in ACL: ~p",
+	      [RegExp, lists:flatten(regexp:format_error(ErrDesc))]),
+	    false
+    end.
+is_glob_match(String, Glob) ->
+    is_regexp_match(String, regexp:sh_to_awk(Glob)).

ejabberd-piefxis-vhost-export.patch:
 ejabberd_piefxis.erl |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

--- NEW FILE ejabberd-piefxis-vhost-export.patch ---
This patch enables generation of the main XML file
when exporting data of a virtual host into PIEFXIS format.

This issue is tracked upstream as EJAB-1098.

This changeset was introduced in revisions 2753,
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/ejabberd_piefxis.erl	(revision 2752)
+++ b/src/ejabberd_piefxis.erl	(revision 2753)
@@ -212,7 +212,7 @@
 		   El),
 	    ok;
 	{atomic, exists} ->
-	    ?INFO_MSG("User ~p@~p already exists, using stored profile...~n",
+	    io:format("Account ~s@~s already exists, updating it...~n",
 		      [User, Domain]),
 	    io:format(""),
 	    ok = exmpp_xml:foreach(
@@ -417,10 +417,10 @@
 
 %%%==================================
 
-%%%% Export server
+%%%% Export hosts
 
-%% @spec (Dir::string()) -> ok
-export_server(Dir) ->
+%% @spec (Dir::string(), Hosts::[string()]) -> ok
+export_hosts(Dir, Hosts) ->
     try_start_exmpp(),
 
     FnT = make_filename_template(),
@@ -430,7 +430,6 @@
     print(Fd, make_piefxis_xml_head()),
     print(Fd, make_piefxis_server_head()),
 
-    Hosts = ?MYHOSTS,
     FilesAndHosts = [{make_host_filename(FnT, Host), Host} || Host <- Hosts],
     [print(Fd, make_xinclude(FnH)) || {FnH, _Host} <- FilesAndHosts],
 
@@ -443,14 +442,20 @@
     ok.
 
 %%%==================================
+%%%% Export server
+
+%% @spec (Dir::string()) -> ok
+export_server(Dir) ->
+    Hosts = ?MYHOSTS,
+    export_hosts(Dir, Hosts).
+
+%%%==================================
 %%%% Export host
 
 %% @spec (Dir::string(), Host::string()) -> ok
 export_host(Dir, Host) ->
-    try_start_exmpp(),
-    FnT = make_filename_template(),
-    FnH = make_host_filename(FnT, Host),
-    export_host(Dir, FnH, Host).
+    Hosts = [Host],
+    export_hosts(Dir, Hosts).
 
 %% @spec (Dir::string(), Fn::string(), Host::string()) -> ok
 export_host(Dir, FnH, Host) ->

ejabberd-vcard-reqs-forwarding.patch:
 ejabberd_c2s.erl         |    2 -
 ejabberd_sm.erl          |    2 -
 mod_muc/mod_muc_room.erl |   58 ++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 54 insertions(+), 8 deletions(-)

--- NEW FILE ejabberd-vcard-reqs-forwarding.patch ---
This bug fixes a long-standing bug with ejabberd violating
RFC 3920 by intercepting vCard request coming to a user's
full JID, which should be forwarded to the user's client instead.
This behaviour is especially noticeable in MUC rooms.

This issue is tracked upstream as EJAB-1045.

This changeset was introduced in revisions 2766-2768
branch http://svn.process-one.net/ejabberd/branches/ejabberd-2.1.x

The first stable version containing the fix is 2.1.1.

--- a/src/ejabberd_sm.erl	(revision 2762)
+++ b/src/ejabberd_sm.erl	(revision 2768)
@@ -481,7 +481,7 @@
 				_ ->
 				    Err =
 					jlib:make_error_reply(
-					  Packet, ?ERR_RECIPIENT_UNAVAILABLE),
+					  Packet, ?ERR_SERVICE_UNAVAILABLE),
 				    ejabberd_router:route(To, From, Err)
 			    end;
 			_ ->
--- a/src/mod_muc/mod_muc_room.erl	(revision 2762)
+++ b/src/mod_muc/mod_muc_room.erl	(revision 2768)
@@ -470,9 +470,10 @@
 	      {xmlelement, "iq", Attrs, _Els} = Packet},
 	     StateData) ->
     Lang = xml:get_attr_s("xml:lang", Attrs),
+    StanzaId = xml:get_attr_s("id", Attrs),
     case {(StateData#state.config)#config.allow_query_users,
-	  is_user_online(From, StateData)} of
-	{true, true} ->
+	  is_user_online_iq(StanzaId, From, StateData)} of
+	{true, {true, NewId, FromFull}} ->
 	    case find_jid_by_nick(ToNick, StateData) of
 		false ->
 		    case jlib:iq_query_info(Packet) of
@@ -489,13 +490,15 @@
 		    end;
 		ToJID ->
 		    {ok, #user{nick = FromNick}} =
-			?DICT:find(jlib:jid_tolower(From),
+			?DICT:find(jlib:jid_tolower(FromFull),
 				   StateData#state.users),
+		    {ToJID2, Packet2} = handle_iq_vcard(FromFull, ToJID,
+							StanzaId, NewId,Packet),
 		    ejabberd_router:route(
 		      jlib:jid_replace_resource(StateData#state.jid, FromNick),
-		      ToJID, Packet)
+		      ToJID2, Packet2)
 	    end;
-	{_, false} ->
+	{_, {false, _, _}} ->
 	    case jlib:iq_query_info(Packet) of
 		reply ->
 		    ok;
@@ -829,7 +832,6 @@
 	    {next_state, normal_state, StateData}
     end.
 
-
 %% @doc Check if this non participant can send message to room.
 %%
 %% XEP-0045 v1.23:
@@ -969,6 +971,50 @@
     LJID = jlib:jid_tolower(JID),
     ?DICT:is_key(LJID, StateData#state.users).
 
+
+%%%
+%%% Handle IQ queries of vCard
+%%%
+is_user_online_iq(StanzaId, JID, StateData) when JID#jid.lresource /= "" ->
+    {is_user_online(JID, StateData), StanzaId, JID};
+is_user_online_iq(StanzaId, JID, StateData) when JID#jid.lresource == "" ->
+    try stanzaid_unpack(StanzaId) of
+	{OriginalId, Resource} ->
+	    JIDWithResource = jlib:jid_replace_resource(JID, Resource),
+	    {is_user_online(JIDWithResource, StateData),
+	     OriginalId, JIDWithResource}
+    catch
+	_:_ ->
+	    {is_user_online(JID, StateData), StanzaId, JID}
+    end.
+
+handle_iq_vcard(FromFull, ToJID, StanzaId, NewId, Packet) ->
+    ToBareJID = jlib:jid_remove_resource(ToJID),
+    IQ = jlib:iq_query_info(Packet),
+    handle_iq_vcard2(FromFull, ToJID, ToBareJID, StanzaId, NewId, IQ, Packet).
+handle_iq_vcard2(_FromFull, ToJID, ToBareJID, StanzaId, _NewId,
+		 #iq{type = get, xmlns = ?NS_VCARD}, Packet)
+  when ToBareJID /= ToJID ->
+    {ToBareJID, change_stanzaid(StanzaId, ToJID, Packet)};
+handle_iq_vcard2(_FromFull, ToJID, _ToBareJID, _StanzaId, NewId, _IQ, Packet) ->
+    {ToJID, change_stanzaid(NewId, Packet)}.
+
+stanzaid_pack(OriginalId, Resource) ->
+    "berd"++base64:encode_to_string("ejab\0" ++ OriginalId ++ "\0" ++ Resource).
+stanzaid_unpack("berd"++StanzaIdBase64) ->
+    StanzaId = base64:decode_to_string(StanzaIdBase64),
+    ["ejab", OriginalId, Resource] = string:tokens(StanzaId, "\0"),
+    {OriginalId, Resource}.
+
+change_stanzaid(NewId, Packet) ->
+    {xmlelement, Name, Attrs, Els} = jlib:remove_attr("id", Packet),
+    {xmlelement, Name, [{"id", NewId} | Attrs], Els}.
+change_stanzaid(PreviousId, ToJID, Packet) ->
+    NewId = stanzaid_pack(PreviousId, ToJID#jid.lresource),
+    change_stanzaid(NewId, Packet).
+%%%
+%%%
+
 role_to_list(Role) ->
     case Role of
 	moderator ->   "moderator";
--- a/src/ejabberd_c2s.erl	(revision 2762)
+++ b/src/ejabberd_c2s.erl	(revision 2768)
@@ -1220,7 +1220,7 @@
 	    "iq" ->
 		IQ = jlib:iq_query_info(Packet),
 		case IQ of
-		    #iq{xmlns = ?NS_VCARD} ->
+		    #iq{xmlns = ?NS_VCARD} when (To#jid.luser == "") or (To#jid.lresource == "") ->
 			Host = StateData#state.server,
 			case ets:lookup(sm_iqtable, {?NS_VCARD, Host}) of
 			    [{_, Module, Function, Opts}] ->

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ejabberd-ejabberdctl_fix.diff	21 Nov 2009 08:04:47 -0000	1.7
+++ ejabberd-ejabberdctl_fix.diff	10 Dec 2009 19:11:11 -0000	1.8
@@ -1,5 +1,5 @@
---- src/ejabberdctl.template.fix_ctl	2009-11-06 22:53:19.000000000 +0300
-+++ src/ejabberdctl.template	2009-11-21 10:43:17.654686409 +0300
+--- src/ejabberdctl.template	2009-11-06 22:53:19.000000000 +0300
++++ src/ejabberdctl.template	2009-12-10 21:07:28.648659178 +0300
 @@ -9,10 +9,10 @@
  
  # define default environment variables
@@ -13,6 +13,15 @@
  
  # parse command line parameters
  ARGS=
+@@ -46,7 +46,7 @@
+     LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
+ fi
+ if [ "$SPOOLDIR" = "" ] ; then
+-    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
++    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd/spool
+ fi
+ if [ "$EJABBERD_DOC_PATH" = "" ] ; then
+     EJABBERD_DOC_PATH=@DOCDIR@
 @@ -60,14 +60,14 @@
  EJID=`id -g $INSTALLUSER`
  EXEC_CMD="false"


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- ejabberd.spec	21 Nov 2009 08:04:47 -0000	1.41
+++ ejabberd.spec	10 Dec 2009 19:11:12 -0000	1.42
@@ -12,7 +12,7 @@
 
 Name:           ejabberd
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -24,7 +24,7 @@ Source2:        ejabberd.logrotate
 Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
-# this module will be removed in the near future in favor of mod_admin_extra
+# this module will be removed in the nearest future in favor of mod_admin_extra
 # svn export -r 1020 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
 Source4:        mod_ctlextra.erl
 
@@ -47,7 +47,23 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
 # fixed delays in s2s connections
 Patch8: ejabberd-fixed_delays_in_s2s.patch
-
+# captcha.sh uses some BASH-specific variables
+# see https://support.process-one.net/browse/EJAB-1105
+Patch9: ejabberd-captcha-bashism.patch
+# Introducing mod_admin_extra
+Patch10: ejabberd-mod_admin_extra.patch
+# Fixed long-standing bug with RFC 3920 violation
+# see https://support.process-one.net/browse/EJAB-1045
+Patch11: ejabberd-vcard-reqs-forwarding.patch
+# Generates a human-readable XHTML page which is returned
+# when a user tries to browse the HTTP-poll URL configured
+# for the server (a common mistake).
+# see https://support.process-one.net/browse/EJAB-1106
+Patch12: ejabberd-http-poll-web-page.patch
+# This patch enables generation of the main XML file
+# when exporting data of a virtual host into PIEFXIS format.
+# see https://support.process-one.net/browse/EJAB-1098
+Patch13: ejabberd-piefxis-vhost-export.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -93,6 +109,33 @@ Documentation for ejabberd.
 %{__fe_groupadd} %{uid} -r %{name} &>/dev/null || :
 %{__fe_useradd} %{uid} -r -s /sbin/nologin -d /var/lib/ejabberd -M \
 			-c 'ejabberd' -g %{name} %{name} &>/dev/null || :
+# we should backup DB in every upgrade
+if ejabberdctl status >/dev/null ; then
+	# Use timestamp to make database restoring easier
+	TIME=$(date +%Y-%m-%dT%H:%M:%S)
+	BACKUPDIR=$(mktemp -d -p /var/tmp/ ejabberd-$TIME.XXXXXX)
+	chown ejabberd:ejabberd $BACKUPDIR
+	BACKUP=$BACKUPDIR/ejabberd-database
+	ejabberdctl backup $BACKUP
+	# Change ownership to root:root because ejabberd user might be
+	# removed on package removal.
+	chown -R root:root $BACKUPDIR
+	chmod 700 $BACKUPDIR
+	echo
+	echo The ejabberd database has been backed up to $BACKUP.
+	echo
+fi
+
+# fix cookie path (since ver. 2.1.0 cookie stored in /var/lib/ejabberd/spool
+# rather than in /var/lib/ejabberd
+if [ -f /var/lib/ejabberd/.erlang.cookie ]; then
+	cp -pf /var/lib/ejabberd/{,spool/}.erlang.cookie
+	echo
+	echo The ejabberd cookie file was moved.
+	echo Please remove old one from /var/lib/ejabberd/.erlang.cookie
+	echo
+fi
+
 
 %post
 /sbin/chkconfig --add %{name}
@@ -134,6 +177,11 @@ fi
 %patch3 -p0 -b .pam_name
 %patch5 -p0 -b .mod_ctlextra
 %patch8 -p0 -b .s2s
+%patch9 -p1 -b .bashism
+%patch10 -p1 -b .mod_admin_extra
+%patch11 -p1 -b .vcard_rfc_violation
+%patch12 -p1 -b .xhtml
+%patch13 -p1 -b .piefxis
 
 dos2unix src/odbc/mssql2000.sql
 
@@ -169,6 +217,9 @@ chmod a+x %{buildroot}%{_libdir}/%{name}
 # fix example SSL certificate path to real one, which we created recently (see above)
 %{__perl} -pi -e 's!/path/to/ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
 
+# fix captcha path
+%{__perl} -pi -e 's!/lib/ejabberd/priv/bin/captcha.sh!%{_libdir}/%{name}/priv/bin/captcha.sh!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
+
 mkdir -p %{buildroot}/var/log/ejabberd
 mkdir -p %{buildroot}/var/lib/ejabberd/spool
 
@@ -194,12 +245,9 @@ install -p -m 0644 src/odbc/mssql2000.sq
 install -p -m 0644 src/odbc/mssql2005.sql %{buildroot}%{_datadir}/%{name}
 install -p -m 0644 src/odbc/mysql.sql %{buildroot}%{_datadir}/%{name}
 install -p -m 0644 src/odbc/pg.sql %{buildroot}%{_datadir}/%{name}
-# install example script for CAPTCHA-protection
-install -p -m 0644 tools/captcha.sh %{buildroot}%{_datadir}/%{name}
 
 # removed files, which would be packaged later (see 'files' section)
 rm -rf %{buildroot}%{_docdir}/%{name}
-rm -f %{buildroot}%{_libdir}/%{name}/priv/bin/captcha.sh
 
 %clean
 rm -rf %{buildroot}
@@ -253,6 +301,7 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/include/mod_roster.hrl
 %{_libdir}/%{name}/include/web/ejabberd_http.hrl
 %{_libdir}/%{name}/include/web/ejabberd_web_admin.hrl
+%{_libdir}/%{name}/priv/bin/captcha.sh
 %attr(4750,root,ejabberd) %{_libdir}/%{name}/priv/bin/epam
 %{_libdir}/%{name}/priv/lib/ejabberd_zlib_drv.so
 %{_libdir}/%{name}/priv/lib/expat_erl.so
@@ -262,7 +311,6 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/priv/msgs/*.msg
 
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/captcha.sh
 %{_datadir}/%{name}/mssql2000.sql
 %{_datadir}/%{name}/mssql2005.sql
 %{_datadir}/%{name}/mysql.sql
@@ -303,6 +351,11 @@ rm -rf %{buildroot}
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Dec 10 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-2
+- DB backups are made on every upgrade/uninstall
+- Fixed installation of captcha.sh example helper
+- Added patches 9,10,11,12,13 from Debian's package
+
 * Fri Nov 20 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-1
 - Ver. 2.1.0
 - Upstream no longer providing ChangeLog


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	21 Nov 2009 08:04:47 -0000	1.14
+++ import.log	10 Dec 2009 19:11:12 -0000	1.15
@@ -12,3 +12,4 @@ ejabberd-2_0_5-3_fc10:F-11:ejabberd-2.0.
 ejabberd-2_0_5-6_fc11:F-11:ejabberd-2.0.5-6.fc11.src.rpm:1251229070
 ejabberd-2_0_5-8_fc11:F-11:ejabberd-2.0.5-8.fc11.src.rpm:1252493180
 ejabberd-2_1_0-1_fc12:F-11:ejabberd-2.1.0-1.fc12.src.rpm:1258790645
+ejabberd-2_1_0-2_fc12:F-11:ejabberd-2.1.0-2.fc12.src.rpm:1260472235



From kasal at fedoraproject.org  Thu Dec 10 19:16:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 10 Dec 2009 19:16:40 +0000 (UTC)
Subject: rpms/automake/devel automake.spec,1.47,1.48
Message-ID: <20091210191640.D28E411C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/automake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12818

Modified Files:
	automake.spec 
Log Message:
* Wed Dec 09 2009 Karsten Hopp <karsten at redhat.com> 1.11.1-1
- update to version 1.11.1 to fix CVE-2009-4029


Index: automake.spec
===================================================================
RCS file: /cvs/extras/rpms/automake/devel/automake.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- automake.spec	1 Dec 2009 15:09:12 -0000	1.47
+++ automake.spec	10 Dec 2009 19:16:40 -0000	1.48
@@ -2,8 +2,8 @@
 
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
-Version:    %{api_version}
-Release:    6%{?dist}
+Version:    %{api_version}.1
+Release:    1%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -38,7 +38,7 @@ Makefiles. If you install Automake, you 
 GNU's Autoconf package.
 
 %prep
-%setup -q -n automake-%{version}
+%setup -q
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
@@ -85,6 +85,9 @@ fi
 %dir %{_datadir}/aclocal
 
 %changelog
+* Wed Dec 09 2009 Karsten Hopp <karsten at redhat.com> 1.11.1-1
+- update to version 1.11.1 to fix CVE-2009-4029
+
 * Tue Dec 01 2009 Karsten Hopp <karsten at redhat.com> 1.11-6
 - preserve time stamps of man pages (#225302)
 - drop MIT from list of licenses



From kasal at fedoraproject.org  Thu Dec 10 19:18:26 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 10 Dec 2009 19:18:26 +0000 (UTC)
Subject: rpms/automake/devel .cvsignore,1.22,1.23 sources,1.22,1.23
Message-ID: <20091210191826.397AE11C025D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/automake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13462/devel

Modified Files:
	.cvsignore sources 
Log Message:
- update to version 1.11.1 to fix CVE-2009-4029


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/automake/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	25 May 2009 11:40:04 -0000	1.22
+++ .cvsignore	10 Dec 2009 19:18:25 -0000	1.23
@@ -1 +1 @@
-automake-1.11.tar.bz2
+automake-1.11.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/automake/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	25 May 2009 11:40:04 -0000	1.22
+++ sources	10 Dec 2009 19:18:25 -0000	1.23
@@ -1 +1 @@
-4db4efe027e26b33930a7e151de19d0f  automake-1.11.tar.bz2
+c2972c4d9b3e29c03d5f2af86249876f  automake-1.11.1.tar.bz2



From dwalsh at fedoraproject.org  Thu Dec 10 19:20:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Dec 2009 19:20:14 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.7,1.8
Message-ID: <20091210192014.CAC2811C03E3@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14115

Modified Files:
	policy-F13.patch 
Log Message:
* Fri Dec 4 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-1
- Update to upstream release


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   77 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  111 +-
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 ++
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   31 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   45 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++-
 policy/modules/kernel/files.te            |    2 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  127 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  459 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  116 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   24 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    6 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |    8 
 policy/modules/services/nut.if            |   82 +
 policy/modules/services/nut.te            |  127 ++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   91 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  628 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   25 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 ++
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1665 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 382 files changed, 19014 insertions(+), 2974 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- policy-F13.patch	10 Dec 2009 18:56:22 -0000	1.7
+++ policy-F13.patch	10 Dec 2009 19:20:14 -0000	1.8
@@ -6116,7 +6116,7 @@ diff -b -B --ignore-all-space --exclude-
  #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.7.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-11-20 10:51:41.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/devices.if	2009-12-05 05:54:24.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/devices.if	2009-12-10 14:19:30.000000000 -0500
 @@ -783,6 +783,24 @@
  
  ########################################
@@ -6192,15 +6192,6 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read raw memory devices (e.g. /dev/mem).
  ## </summary>
  ## <param name="domain">
-@@ -3080,7 +3134,7 @@
- ##	</summary>
- ## </param>
- #
--interface(`dev_read_sound_mixer',`
-+interface(`dev_read_sound_mixr',`
- 	gen_require(`
- 		type device_t, sound_device_t;
- 	')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.7.4/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.4/policy/modules/kernel/domain.if	2009-12-04 12:33:34.000000000 -0500



From steved at fedoraproject.org  Thu Dec 10 19:24:28 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 10 Dec 2009 19:24:28 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-v4root-rel9.patch, 1.1,
	1.2 nfs-utils.spec, 1.256, 1.257
Message-ID: <20091210192428.71CA011C025D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15474

Modified Files:
	nfs-utils-1.2.0-v4root-rel9.patch nfs-utils.spec 
Log Message:
Update the  pseudo root to handle security flavors better.


nfs-utils-1.2.0-v4root-rel9.patch:
 support/export/xtab.c           |    6 +
 support/include/nfs/export.h    |    3 
 support/include/pseudoflavors.h |    1 
 support/include/v4root.h        |   15 ++
 support/nfs/exports.c           |   24 +++-
 utils/mountd/Makefile.am        |    2 
 utils/mountd/auth.c             |    3 
 utils/mountd/mountd.c           |    4 
 utils/mountd/v4root.c           |  218 ++++++++++++++++++++++++++++++++++++++++
 9 files changed, 270 insertions(+), 6 deletions(-)

Index: nfs-utils-1.2.0-v4root-rel9.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.2.0-v4root-rel9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-v4root-rel9.patch	7 Dec 2009 13:22:33 -0000	1.1
+++ nfs-utils-1.2.0-v4root-rel9.patch	10 Dec 2009 19:24:27 -0000	1.2
@@ -172,10 +172,10 @@ index 888fd8c..179ef17 100644
  					break;
 diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
 new file mode 100644
-index 0000000..817dfb4
+index 0000000..b1e483a
 --- /dev/null
 +++ b/utils/mountd/v4root.c
-@@ -0,0 +1,228 @@
+@@ -0,0 +1,218 @@
 +/*
 + * Copyright (C) 2009 Red Hat <nfs at redhat.com>
 + *
@@ -375,12 +375,6 @@ index 0000000..817dfb4
 +		}
 +	}
 +
-+	if (insecure && secflavors) {
-+		xlog(L_WARNING, "WARNING: The 'sec=' and 'insecure' export options "
-+			"are incompatible, causing the security flavors set by "
-+			"'sec=' to be ignored on V4 exports");
-+	}
-+
 +	/*
 +	 * If there are any insecure exports, the pseudo root
 +	 * also has to be insecure
@@ -391,16 +385,12 @@ index 0000000..817dfb4
 +
 +	/*
 +	 * Make sure the pseudo root is accessible from all
-+	 * security flavors unless the insecure port is set,
-+	 * which cause the kernel to silently fail v4 mounts 
-+	 * with security flavors set.
++	 * security flavors when it needs to be.
 +	 */
-+	if (secflavors && !insecure) {
-+		if (!flavors_setall(proot)) {
-+			xlog(L_WARNING, "v4root_set: Unable to set security "
-+				"flavors on pseudo root");
-+		}
++	if (secflavors && !flavors_setall(proot)) {
++		xlog(L_WARNING, "v4root_set: Unable to set security "
++			"flavors on pseudo root");
 +	}
-+}
 +
++}
 +


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- nfs-utils.spec	7 Dec 2009 22:50:35 -0000	1.256
+++ nfs-utils.spec	10 Dec 2009 19:24:27 -0000	1.257
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -250,6 +250,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Dec 10 2009 Steve Dickson <steved at redhat.com> 1.2.1-6
+- Update the  pseudo root to handle security flavors better.
+
 * Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 1.2.1-5
 - mount.nfs: Retry v4 mounts with v3 on ENOENT errors
 



From hadess at fedoraproject.org  Thu Dec 10 19:34:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 10 Dec 2009 19:34:45 +0000 (UTC)
Subject: rpms/rhythmbox/devel
	0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch, NONE,
	1.1 rhythmbox.spec, 1.279, 1.280
Message-ID: <20091210193445.E597611C025D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18621

Modified Files:
	rhythmbox.spec 
Added Files:
	0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch 
Log Message:
* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-4
- Fix crasher when musicbrainz cannot read a disc (#546188)


0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch:
 sj-metadata-musicbrainz3.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch ---
>From e65be779b4d39161db212e54bc5892f5598c0487 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 10 Dec 2009 19:32:31 +0000
Subject: [PATCH] Fix crasher when MusicBrainz can't read a disc

But we can.

https://bugzilla.redhat.com/show_bug.cgi?id=546188
---
 plugins/audiocd/sj-metadata-musicbrainz3.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/plugins/audiocd/sj-metadata-musicbrainz3.c b/plugins/audiocd/sj-metadata-musicbrainz3.c
index 5845e0a..5374399 100644
--- a/plugins/audiocd/sj-metadata-musicbrainz3.c
+++ b/plugins/audiocd/sj-metadata-musicbrainz3.c
@@ -244,6 +244,9 @@ mb_list_albums (SjMetadata *metadata, char **url, GError **error)
   }
 
   priv->disc = mb_read_disc (priv->cdrom);
+  if (priv->disc == NULL) {
+    return NULL;
+
   if (url != NULL) {
     mb_get_submission_url (priv->disc, NULL, 0, buffer, sizeof (buffer));
     *url = g_strdup (buffer);
-- 
1.6.5.2



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- rhythmbox.spec	10 Dec 2009 15:47:12 -0000	1.279
+++ rhythmbox.spec	10 Dec 2009 19:34:44 -0000	1.280
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -55,6 +55,8 @@ Patch0: rb-no-HEAD-for-podcasts.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=540672
 # https://bugzilla.gnome.org/show_bug.cgi?id=602140
 Patch1: rb-webkit-crasher.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=546188
+Patch2: 0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -221,6 +223,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-4
+- Fix crasher when musicbrainz cannot read a disc (#546188)
+
 * Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-3
 - Fix crasher in WebKit when using the context pane (#540672)
 



From pkgdb at fedoraproject.org  Thu Dec 10 19:36:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 19:36:59 +0000
Subject: [pkgdb] rhythmbox: krh has given up watchcommits
Message-ID: <20091210193659.E755010F874@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on rhythmbox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhythmbox



From pkgdb at fedoraproject.org  Thu Dec 10 19:37:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 19:37:09 +0000
Subject: [pkgdb] rhythmbox: krh has given up commit
Message-ID: <20091210193709.5586B10F85F@bastion2.fedora.phx.redhat.com>

krh has given up the commit acl on rhythmbox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhythmbox



From pkgdb at fedoraproject.org  Thu Dec 10 19:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 19:37:34 +0000
Subject: [pkgdb] rhythmbox: krh has given up watchcommits
Message-ID: <20091210193734.29B0A10F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on rhythmbox (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhythmbox



From pkgdb at fedoraproject.org  Thu Dec 10 19:37:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 19:37:38 +0000
Subject: [pkgdb] rhythmbox: krh has given up watchcommits
Message-ID: <20091210193738.F263210F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on rhythmbox (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhythmbox



From pkgdb at fedoraproject.org  Thu Dec 10 19:37:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 19:37:41 +0000
Subject: [pkgdb] rhythmbox: krh has given up watchcommits
Message-ID: <20091210193741.E99DE10F85F@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on rhythmbox (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhythmbox



From pkgdb at fedoraproject.org  Thu Dec 10 19:37:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 19:37:45 +0000
Subject: [pkgdb] rhythmbox: krh has given up watchcommits
Message-ID: <20091210193745.98E6A10F85F@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on rhythmbox (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhythmbox



From pkgdb at fedoraproject.org  Thu Dec 10 19:37:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 19:37:47 +0000
Subject: [pkgdb] rhythmbox: krh has given up watchcommits
Message-ID: <20091210193747.67FEB10F85F@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on rhythmbox (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhythmbox



From sharkcz at fedoraproject.org  Thu Dec 10 19:41:56 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 10 Dec 2009 19:41:56 +0000 (UTC)
Subject: File trytond-1.4.3.tar.gz uploaded to lookaside cache by sharkcz
Message-ID: <20091210194156.EC31D10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for trytond:

781d3d75f2f92877d72d72fcbf517101  trytond-1.4.3.tar.gz



From sharkcz at fedoraproject.org  Thu Dec 10 19:42:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 10 Dec 2009 19:42:53 +0000 (UTC)
Subject: rpms/trytond/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 trytond.spec, 1.10, 1.11
Message-ID: <20091210194253.8775111C025D@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21010

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Thu Dec 10 2009 Dan Hor?k <dan[at]danny.cz> 1.4.3-1
- update to upstream version 1.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Nov 2009 18:06:11 -0000	1.8
+++ .cvsignore	10 Dec 2009 19:42:53 -0000	1.9
@@ -1 +1 @@
-trytond-1.4.2.tar.gz
+trytond-1.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Nov 2009 18:06:11 -0000	1.8
+++ sources	10 Dec 2009 19:42:53 -0000	1.9
@@ -1 +1 @@
-10063fe782adc089db9a3ba695e23733  trytond-1.4.2.tar.gz
+781d3d75f2f92877d72d72fcbf517101  trytond-1.4.3.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/trytond.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- trytond.spec	28 Nov 2009 18:06:11 -0000	1.10
+++ trytond.spec	10 Dec 2009 19:42:53 -0000	1.11
@@ -3,7 +3,7 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Dan Hor?k <dan[at]danny.cz> 1.4.3-1
+- update to upstream version 1.4.3
+
 * Sat Nov 28 2009 Dan Hor?k <dan[at]danny.cz> 1.4.2-1
 - update to upstream version 1.4.2
 



From deji at fedoraproject.org  Thu Dec 10 19:47:23 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 10 Dec 2009 19:47:23 +0000 (UTC)
Subject: rpms/blacs/F-12 blacs.spec,1.35,1.36
Message-ID: <20091210194723.0D24A11C025D@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/blacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22206

Modified Files:
	blacs.spec 
Log Message:
* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-34.2
- mpich2 and openmpi macros can now be removed
- Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1
- Fix broken dep issue on F-12



Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/F-12/blacs.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- blacs.spec	7 Dec 2009 20:54:55 -0000	1.35
+++ blacs.spec	10 Dec 2009 19:47:22 -0000	1.36
@@ -1,24 +1,7 @@
-# These macros will go away soon. Hopefully.
-%global _openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
-
-%global _mpich2_load \
- . /etc/profile.d/modules.sh; \
- module load mpich2-%{__isa_bits}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _mpich2_unload \
- . /etc/profile.d/modules.sh; \
- module unload mpich2-%{__isa_bits};
-
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 34%{?dist}.1
+Release: 34%{?dist}.2
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -67,12 +50,12 @@ This file contains common files which ar
 %package mpich2
 Summary: BLACS libraries compiled against mpich2
 Group: Development/Libraries
-BuildRequires: mpich2-devel
+BuildRequires: mpich2-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
 # This is a dirty lie, but something needs to reap these dead subpackages.
 Provides: blacs-lam = %{version}-%{release}
-Obsoletes: blacs-lam < 1.1-33
+Obsoletes: blacs-lam <= 1.1-33
 
 %description mpich2
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -92,7 +75,7 @@ Summary: Development libraries for blacs
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
 Provides: blacs-lam-devel = %{version}-%{release}
-Obsoletes: blacs-lam-devel < 1.1-33
+Obsoletes: blacs-lam-devel <= 1.1-33
 
 %description mpich2-devel
 This package contains development libraries for blacs, compiled against mpich2.
@@ -101,7 +84,7 @@ This package contains development librar
 Summary: Static libraries for blacs (mpich2)
 Group: Development/Libraries
 Provides: blacs-lam-static = %{version}-%{release}
-Obsoletes: blacs-lam-static < 1.1-33
+Obsoletes: blacs-lam-static <= 1.1-33
 
 %description mpich2-static
 This package contains static libraries for blacs, compiled against mpich2.
@@ -258,6 +241,11 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/blacs-openmpi/*.a
 
 %changelog
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-34.2
+- mpich2 and openmpi macros can now be removed
+- Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1
+- Fix broken dep issue on F-12
+
 * Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34.1
 - readd macros to spec for F-12, only exit sanely in rawhide
 



From steved at fedoraproject.org  Thu Dec 10 19:52:28 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 10 Dec 2009 19:52:28 +0000 (UTC)
Subject: rpms/nfs-utils/F-12 nfs-utils-1.2.0-v4root-rel9.patch, 1.1,
	1.2 nfs-utils.spec, 1.252, 1.253
Message-ID: <20091210195228.26A0111C025D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23784

Modified Files:
	nfs-utils-1.2.0-v4root-rel9.patch nfs-utils.spec 
Log Message:
Update the  pseudo root to handle security flavors better.


nfs-utils-1.2.0-v4root-rel9.patch:
 support/export/xtab.c           |    6 +
 support/include/nfs/export.h    |    3 
 support/include/pseudoflavors.h |    1 
 support/include/v4root.h        |   15 ++
 support/nfs/exports.c           |   24 +++-
 utils/mountd/Makefile.am        |    2 
 utils/mountd/auth.c             |    3 
 utils/mountd/mountd.c           |    4 
 utils/mountd/v4root.c           |  218 ++++++++++++++++++++++++++++++++++++++++
 9 files changed, 270 insertions(+), 6 deletions(-)

Index: nfs-utils-1.2.0-v4root-rel9.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils-1.2.0-v4root-rel9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-v4root-rel9.patch	7 Dec 2009 22:56:49 -0000	1.1
+++ nfs-utils-1.2.0-v4root-rel9.patch	10 Dec 2009 19:52:27 -0000	1.2
@@ -172,10 +172,10 @@ index 888fd8c..179ef17 100644
  					break;
 diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
 new file mode 100644
-index 0000000..817dfb4
+index 0000000..b1e483a
 --- /dev/null
 +++ b/utils/mountd/v4root.c
-@@ -0,0 +1,228 @@
+@@ -0,0 +1,218 @@
 +/*
 + * Copyright (C) 2009 Red Hat <nfs at redhat.com>
 + *
@@ -375,12 +375,6 @@ index 0000000..817dfb4
 +		}
 +	}
 +
-+	if (insecure && secflavors) {
-+		xlog(L_WARNING, "WARNING: The 'sec=' and 'insecure' export options "
-+			"are incompatible, causing the security flavors set by "
-+			"'sec=' to be ignored on V4 exports");
-+	}
-+
 +	/*
 +	 * If there are any insecure exports, the pseudo root
 +	 * also has to be insecure
@@ -391,16 +385,12 @@ index 0000000..817dfb4
 +
 +	/*
 +	 * Make sure the pseudo root is accessible from all
-+	 * security flavors unless the insecure port is set,
-+	 * which cause the kernel to silently fail v4 mounts 
-+	 * with security flavors set.
++	 * security flavors when it needs to be.
 +	 */
-+	if (secflavors && !insecure) {
-+		if (!flavors_setall(proot)) {
-+			xlog(L_WARNING, "v4root_set: Unable to set security "
-+				"flavors on pseudo root");
-+		}
++	if (secflavors && !flavors_setall(proot)) {
++		xlog(L_WARNING, "v4root_set: Unable to set security "
++			"flavors on pseudo root");
 +	}
-+}
 +
++}
 +


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -r1.252 -r1.253
--- nfs-utils.spec	7 Dec 2009 22:56:49 -0000	1.252
+++ nfs-utils.spec	10 Dec 2009 19:52:27 -0000	1.253
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -253,6 +253,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Dec 10 2009 Steve Dickson <steved at redhat.com> 1.2.1-4
+- Update the  pseudo root to handle security flavors better.
+
 * Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 1.2.1-3
 - Updated to the latest pseudo root release (rel8).
 - mount.nfs: Retry v4 mounts with v3 on ENOENT error



From jnovy at fedoraproject.org  Thu Dec 10 19:53:31 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 10 Dec 2009 19:53:31 +0000 (UTC)
Subject: rpms/mc/F-12 mc-rpmvfs.patch, NONE, 1.1 .cvsignore, 1.40,
	1.41 mc-extensions.patch, 1.16, 1.17 mc.spec, 1.148,
	1.149 sources, 1.48, 1.49
Message-ID: <20091210195331.09FAE11C025D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24200

Modified Files:
	.cvsignore mc-extensions.patch mc.spec sources 
Added Files:
	mc-rpmvfs.patch 
Log Message:
* Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.5.pre4
- update to pre4:
  - fixes color parsing (#545805)
  - editor/viewer issues (#539292)
  - configuration saving (#537778)
  - tar VFS fix (#495791)
  - enhanced file search (#210620)
  - UTF-8 is added in Display Bits/Select (#196358)
- update bindings (#532784)
- show empty directories in RPM VFS (#529645)
- add gpm-devel to BR (#440580)


mc-rpmvfs.patch:
 b/vfs/cpio.c     |  283 ++++++++++++++++++++++++++++---------------------------
 b/vfs/direntry.c |   13 +-
 b/vfs/vfs.c      |    3 
 vfs/cpio.c       |    7 -
 4 files changed, 162 insertions(+), 144 deletions(-)

--- NEW FILE mc-rpmvfs.patch ---
commit 698385bdd0bfb485bcc42a634f86a8cd0ffae564
Author: Andrew Borodin <aborodin at vmail.ru>
Date:   Wed Nov 18 16:26:24 2009 +0300

    Ticket #1732: cpio VFS skips empty directories in the root of archive
    
    Initial step: some optimization and type accuracy.
    
    Signed-off-by: Andrew Borodin <aborodin at vmail.ru>

diff --git a/vfs/cpio.c b/vfs/cpio.c
index 5eeef95..8c24573 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -103,7 +103,6 @@ struct defer_inode {
 static int cpio_position;
 
 static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super);
-static int cpio_create_entry(struct vfs_class *me, struct vfs_s_super *super, struct stat *, char *name);
 static ssize_t cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *super);
 static ssize_t cpio_read_oldc_head(struct vfs_class *me, struct vfs_s_super *super);
 static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *super);
@@ -234,8 +233,8 @@ static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super)
 {
     char buf[256];
     int ptr = 0;
-    int top;
-    int tmp;
+    ssize_t top;
+    ssize_t tmp;
 
     top = mc_read (super->u.arch.fd, buf, 256);
     if (top > 0)
@@ -271,6 +270,140 @@ static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super)
 #undef RETURN
 #undef SEEKBACK
 
+static int
+cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super,
+		   struct stat *st, char *name)
+{
+    struct vfs_s_inode *inode = NULL;
+    struct vfs_s_inode *root = super->root;
+    struct vfs_s_entry *entry = NULL;
+    char *tn;
+
+    switch (st->st_mode & S_IFMT) {	/* For case of HP/UX archives */
+    case S_IFCHR:
+    case S_IFBLK:
+#ifdef S_IFSOCK
+    case S_IFSOCK:
+#endif
+#ifdef S_IFIFO
+    case S_IFIFO:
+#endif
+#ifdef S_IFNAM
+    case S_IFNAM:
+#endif
+	if ((st->st_size != 0) && (st->st_rdev == 0x0001)) {
+	    /* FIXME: representation of major/minor differs between */
+	    /* different operating systems. */
+	    st->st_rdev = (unsigned) st->st_size;
+	    st->st_size = 0;
+	}
+	break;
+    default:
+	break;
+    }
+
+    if ((st->st_nlink > 1)
+	     && ((super->u.arch.type == CPIO_NEWC)
+		    || (super->u.arch.type == CPIO_CRC))) {	/* For case of hardlinked files */
+	struct defer_inode i, *l;
+	i.inumber = st->st_ino;
+	i.device = st->st_dev;
+	i.inode = NULL;
+
+	l = cpio_defer_find (super->u.arch.deferred, &i);
+	if (l != NULL) {
+	    inode = l->inode;
+	    if (inode->st.st_size != 0 && st->st_size != 0
+		    && (inode->st.st_size != st->st_size)) {
+		message (D_ERROR, MSG_ERROR,
+			_("Inconsistent hardlinks of\n%s\nin cpio archive\n%s"),
+			name, super->name);
+		inode = NULL;
+	    } else if (inode->st.st_size == 0)
+		inode->st.st_size = st->st_size;
+	}
+    }
+
+    /* remove trailing slashes */
+    for (tn = name + strlen (name) - 1; tn >= name && *tn == PATH_SEP; tn--)
+	*tn = '\0';
+
+    tn = strrchr (name, PATH_SEP);
+    if (tn == NULL)
+	tn = name;
+    else {
+	*tn = '\0';
+	root = vfs_s_find_inode (me, super, name, LINK_FOLLOW, FL_MKDIR);
+	*tn = PATH_SEP;
+	tn++;
+    }
+
+    entry = MEDATA->find_entry (me, root, tn, LINK_FOLLOW, FL_NONE);	/* In case entry is already there */
+
+    if (entry != NULL) {
+	/* This shouldn't happen! (well, it can happen if there is a record for a 
+	   file and than a record for a directory it is in; cpio would die with
+	   'No such file or directory' is such case) */
+
+	if (!S_ISDIR (entry->ino->st.st_mode)) {
+	    /* This can be considered archive inconsistency */
+	    message (D_ERROR, MSG_ERROR,
+		     _("%s contains duplicate entries! Skipping!"),
+		     super->name);
+	} else {
+	    entry->ino->st.st_mode = st->st_mode;
+	    entry->ino->st.st_uid = st->st_uid;
+	    entry->ino->st.st_gid = st->st_gid;
+	    entry->ino->st.st_atime = st->st_atime;
+	    entry->ino->st.st_mtime = st->st_mtime;
+	    entry->ino->st.st_ctime = st->st_ctime;
+	}
+
+	g_free (name);
+    } else {			/* !entry */
+	if (inode == NULL) {
+	    inode = vfs_s_new_inode (me, super, st);
+	    if ((st->st_nlink > 0)
+		     && ((super->u.arch.type == CPIO_NEWC)
+			    || (super->u.arch.type == CPIO_CRC))) {
+		/* For case of hardlinked files */
+		struct defer_inode *i;
+		i = g_new (struct defer_inode, 1);
+		i->inumber = st->st_ino;
+		i->device = st->st_dev;
+		i->inode = inode;
+		i->next = super->u.arch.deferred;
+		super->u.arch.deferred = i;
+	    }
+	}
+
+	if (st->st_size != 0)
+	    inode->data_offset = CPIO_POS (super);
+
+	entry = vfs_s_new_entry (me, tn, inode);
+	vfs_s_insert_entry (me, root, entry);
+
+	g_free (name);
+
+	if (!S_ISLNK (st->st_mode))
+	    CPIO_SEEK_CUR (super, st->st_size);
+	else {
+	    inode->linkname = g_malloc (st->st_size + 1);
+
+	    if (mc_read (super->u.arch.fd, inode->linkname, st->st_size) < st->st_size) {
+		inode->linkname[0] = '\0';
+		return STATUS_EOF;
+	    }
+
+	    inode->linkname[st->st_size] = '\0';	/* Linkname stored without terminating \0 !!! */
+	    CPIO_POS (super) += st->st_size;
+	    cpio_skip_padding (super);
+	}
+    }				/* !entry */
+
+    return STATUS_OK;
+}
+
 #define HEAD_LENGTH (26)
 static ssize_t cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *super)
 {
@@ -278,7 +411,7 @@ static ssize_t cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *supe
 	struct old_cpio_header buf;
 	short shorts[HEAD_LENGTH >> 1];
     } u;
-    int len;
+    ssize_t len;
     char *name;
     struct stat st;
 
@@ -333,7 +466,7 @@ static ssize_t cpio_read_oldc_head(struct vfs_class *me, struct vfs_s_super *sup
 	struct stat st;
 	char buf[HEAD_LENGTH + 1];
     } u;
-    int len;
+    ssize_t len;
     char *name;
 
     if (mc_read (super->u.arch.fd, u.buf, HEAD_LENGTH) != HEAD_LENGTH)
@@ -385,25 +518,28 @@ static ssize_t cpio_read_oldc_head(struct vfs_class *me, struct vfs_s_super *sup
 #undef HEAD_LENGTH
 
 #define HEAD_LENGTH (110)
-static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *super)
+static ssize_t
+cpio_read_crc_head (struct vfs_class *me, struct vfs_s_super *super)
 {
     struct new_cpio_header hd;
     union {
 	struct stat st;
 	char buf[HEAD_LENGTH + 1];
     } u;
-    int len;
+    ssize_t len;
     char *name;
 
     if (mc_read (super->u.arch.fd, u.buf, HEAD_LENGTH) != HEAD_LENGTH)
 	return STATUS_EOF;
+
     CPIO_POS (super) += HEAD_LENGTH;
-    u.buf[HEAD_LENGTH] = 0;
+    u.buf[HEAD_LENGTH] = '\0';
 
     if (sscanf (u.buf, "%6ho%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx",
 	      &hd.c_magic, &hd.c_ino, &hd.c_mode, &hd.c_uid, &hd.c_gid,
 	      &hd.c_nlink,  &hd.c_mtime, &hd.c_filesize,
-	      (unsigned long *)&hd.c_dev, (unsigned long *)&hd.c_devmin, (unsigned long *)&hd.c_rdev, (unsigned long *)&hd.c_rdevmin,
+	      (unsigned long *)&hd.c_dev, (unsigned long *)&hd.c_devmin,
+	      (unsigned long *)&hd.c_rdev, (unsigned long *)&hd.c_rdevmin,
 	      &hd.c_namesize, &hd.c_chksum) < 14) {
 	message (D_ERROR, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
 		   super->name);
@@ -421,8 +557,9 @@ static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *supe
     }
 
     name = g_malloc(hd.c_namesize);
-    if((len = mc_read (super->u.arch.fd, name, hd.c_namesize)) == -1 ||
-       (unsigned long) len < hd.c_namesize) {
+    len = mc_read (super->u.arch.fd, name, hd.c_namesize);
+
+    if ((len == -1) || ((unsigned long) len < hd.c_namesize)) {
 	g_free (name);
 	return STATUS_EOF;
     }
@@ -430,7 +567,7 @@ static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *supe
     CPIO_POS(super) += len;
     cpio_skip_padding(super);
 
-    if(!strcmp("TRAILER!!!", name)) { /* We got to the last record */
+    if (strcmp ("TRAILER!!!", name) == 0) { /* We got to the last record */
 	g_free(name);
 	return STATUS_TRAIL;
     }
@@ -448,128 +585,6 @@ static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *supe
     return cpio_create_entry (me, super, &u.st, name);
 }
 
-static int
-cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super,
-		   struct stat *st, char *name)
-{
-    struct vfs_s_inode *inode = NULL;
-    struct vfs_s_inode *root = super->root;
-    struct vfs_s_entry *entry = NULL;
-    char *tn;
-
-    switch (st->st_mode & S_IFMT) {	/* For case of HP/UX archives */
-    case S_IFCHR:
-    case S_IFBLK:
-#ifdef S_IFSOCK
-    case S_IFSOCK:
-#endif
-#ifdef S_IFIFO
-    case S_IFIFO:
-#endif
-#ifdef S_IFNAM
-    case S_IFNAM:
-#endif
-	if ((st->st_size != 0) && (st->st_rdev == 0x0001)) {
-	    /* FIXME: representation of major/minor differs between */
-	    /* different operating systems. */
-	    st->st_rdev = (unsigned) st->st_size;
-	    st->st_size = 0;
-	}
-	break;
-    default:
-	break;
-    }
-
-    if ((st->st_nlink > 1) && (super->u.arch.type == CPIO_NEWC || super->u.arch.type == CPIO_CRC)) {	/* For case of hardlinked files */
-	struct defer_inode i, *l;
-	i.inumber = st->st_ino;
-	i.device = st->st_dev;
-	i.inode = NULL;
-	if ((l = cpio_defer_find (super->u.arch.deferred, &i)) != NULL) {
-	    inode = l->inode;
-	    if (inode->st.st_size && st->st_size
-		&& (inode->st.st_size != st->st_size)) {
-		message (D_ERROR, MSG_ERROR,
-			 _
-			 ("Inconsistent hardlinks of\n%s\nin cpio archive\n%s"),
-			 name, super->name);
-		inode = NULL;
-	    } else if (!inode->st.st_size)
-		inode->st.st_size = st->st_size;
-	}
-    }
-
-    for (tn = name + strlen (name) - 1; tn >= name && *tn == PATH_SEP; tn--)
-	*tn = 0;
-    if ((tn = strrchr (name, PATH_SEP))) {
-	*tn = 0;
-	root = vfs_s_find_inode (me, super, name, LINK_FOLLOW, FL_MKDIR);
-	*tn = PATH_SEP;
-	tn++;
-    } else
-	tn = name;
-
-    entry = MEDATA->find_entry (me, root, tn, LINK_FOLLOW, FL_NONE);	/* In case entry is already there */
-
-    if (entry) {		/* This shouldn't happen! (well, it can happen if there is a record for a 
-				   file and than a record for a directory it is in; cpio would die with
-				   'No such file or directory' is such case) */
-
-	if (!S_ISDIR (entry->ino->st.st_mode)) {	/* This can be considered archive inconsistency */
-	    message (D_ERROR, MSG_ERROR,
-		     _("%s contains duplicate entries! Skipping!"),
-		     super->name);
-	} else {
-	    entry->ino->st.st_mode = st->st_mode;
-	    entry->ino->st.st_uid = st->st_uid;
-	    entry->ino->st.st_gid = st->st_gid;
-	    entry->ino->st.st_atime = st->st_atime;
-	    entry->ino->st.st_mtime = st->st_mtime;
-	    entry->ino->st.st_ctime = st->st_ctime;
-	}
-
-    } else {			/* !entry */
-
-	if (!inode) {
-	    inode = vfs_s_new_inode (me, super, st);
-	    if ((st->st_nlink > 0) && (super->u.arch.type == CPIO_NEWC || super->u.arch.type == CPIO_CRC)) {	/* For case of hardlinked files */
-		struct defer_inode *i;
-		i = g_new (struct defer_inode, 1);
-		i->inumber = st->st_ino;
-		i->device = st->st_dev;
-		i->inode = inode;
-		i->next = super->u.arch.deferred;
-		super->u.arch.deferred = i;
-	    }
-	}
-
-	if (st->st_size)
-	    inode->data_offset = CPIO_POS (super);
-
-	entry = vfs_s_new_entry (me, tn, inode);
-	vfs_s_insert_entry (me, root, entry);
-
-	if (S_ISLNK (st->st_mode)) {
-	    inode->linkname = g_malloc (st->st_size + 1);
-	    if (mc_read (super->u.arch.fd, inode->linkname, st->st_size)
-		< st->st_size) {
-		inode->linkname[0] = 0;
-		g_free (name);
-		return STATUS_EOF;
-	    }
-	    inode->linkname[st->st_size] = 0;	/* Linkname stored without terminating \0 !!! */
-	    CPIO_POS (super) += st->st_size;
-	    cpio_skip_padding (super);
-	} else {
-	    CPIO_SEEK_CUR (super, st->st_size);
-	}
-
-    }				/* !entry */
-
-    g_free (name);
-    return STATUS_OK;
-}
-
 /* Need to CPIO_SEEK_CUR to skip the file at the end of add entry!!!! */
 
 static int
diff --git a/vfs/direntry.c b/vfs/direntry.c
index f7a8bfb..80b0b12 100644
--- a/vfs/direntry.c
+++ b/vfs/direntry.c
@@ -400,12 +400,12 @@ vfs_s_find_inode (struct vfs_class *me, const struct vfs_s_super *super,
 		  const char *path, int follow, int flags)
 {
     struct vfs_s_entry *ent;
-    if (!(MEDATA->flags & VFS_S_REMOTE) && (!*path))
+
+    if (((MEDATA->flags & VFS_S_REMOTE) == 0) && (*path == '\0'))
 	return super->root;
+
     ent = (MEDATA->find_entry) (me, super->root, path, follow, flags);
-    if (!ent)
-	return NULL;
-    return ent->ino;
+    return (ent != NULL) ? ent->ino : NULL;
 }
 
 /* Ook, these were functions around directory entries / inodes */
@@ -488,9 +488,8 @@ vfs_s_get_path_mangle (struct vfs_class *me, char *inname,
 
     for (super = MEDATA->supers; super != NULL; super = super->next) {
 	/* 0 == other, 1 == same, return it, 2 == other but stop scanning */
-	int i;
-	if ((i =
-	     MEDATA->archive_same (me, super, archive_name, op, cookie))) {
+	int i = MEDATA->archive_same (me, super, archive_name, op, cookie);
+	if (i != 0) {
 	    if (i == 1)
 		goto return_success;
 	    else
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 7c1de54..f8eb7a1 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -1124,7 +1124,8 @@ static char *
 mc_def_getlocalcopy (const char *filename)
 {
     char *tmp;
-    int fdin, fdout, i;
+    int fdin, fdout;
+    ssize_t i;
     char buffer[8192];
     struct stat mystat;
 
commit f84917a188f6f88cdc0d0d0067beefc13d42f40a
Author: Andrew Borodin <aborodin at vmail.ru>
Date:   Thu Nov 19 10:51:21 2009 +0300

    Fixed skip of empty directories in the root of cpio archive.
    
    Signed-off-by: Andrew Borodin <aborodin at vmail.ru>

diff --git a/vfs/cpio.c b/vfs/cpio.c
index 8c24573..0af9cda 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -331,7 +331,10 @@ cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super,
     tn = strrchr (name, PATH_SEP);
     if (tn == NULL)
 	tn = name;
-    else {
+    else if (tn == name + 1) {
+	/* started with "./" -- directory in the root of archive */
+	tn++;
+    } else {
 	*tn = '\0';
 	root = vfs_s_find_inode (me, super, name, LINK_FOLLOW, FL_MKDIR);
 	*tn = PATH_SEP;
@@ -341,7 +344,7 @@ cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super,
     entry = MEDATA->find_entry (me, root, tn, LINK_FOLLOW, FL_NONE);	/* In case entry is already there */
 
     if (entry != NULL) {
-	/* This shouldn't happen! (well, it can happen if there is a record for a 
+	/* This shouldn't happen! (well, it can happen if there is a record for a
 	   file and than a record for a directory it is in; cpio would die with
 	   'No such file or directory' is such case) */
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	1 Sep 2009 05:59:44 -0000	1.40
+++ .cvsignore	10 Dec 2009 19:53:30 -0000	1.41
@@ -1 +1 @@
-mc-4.7.0-pre2.tar.bz2
+mc-4.7.0-pre4.tar.bz2

mc-extensions.patch:
 configure.ac   |    2 +-
 misc/mc.ext.in |   54 +++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 18 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/mc-extensions.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mc-extensions.patch	1 Sep 2009 05:59:44 -0000	1.16
+++ mc-extensions.patch	10 Dec 2009 19:53:30 -0000	1.17
@@ -1,7 +1,7 @@
-diff -up mc-4.7.0-pre1/configure.ac.extensions mc-4.7.0-pre1/configure.ac
---- mc-4.7.0-pre1/configure.ac.extensions	2009-07-31 18:36:24.000000000 +0200
-+++ mc-4.7.0-pre1/configure.ac	2009-08-05 12:51:08.000000000 +0200
-@@ -67,7 +67,7 @@ AC_PROG_LN_S
+diff -up mc-4.7.0-pre4/configure.ac.extensions mc-4.7.0-pre4/configure.ac
+--- mc-4.7.0-pre4/configure.ac.extensions	2009-10-30 19:44:38.000000000 +0100
++++ mc-4.7.0-pre4/configure.ac	2009-12-10 20:41:43.000000000 +0100
+@@ -69,7 +69,7 @@ AC_PROG_LN_S
  AC_CHECK_TOOL(AR, ar, ar)
  
  dnl Only list browsers here that can be run in background (i.e. with `&')
@@ -10,10 +10,10 @@ diff -up mc-4.7.0-pre1/configure.ac.exte
  
  dnl
  dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
-diff -up mc-4.7.0-pre1/misc/mc.ext.in.extensions mc-4.7.0-pre1/misc/mc.ext.in
---- mc-4.7.0-pre1/misc/mc.ext.in.extensions	2009-06-23 20:55:11.000000000 +0200
-+++ mc-4.7.0-pre1/misc/mc.ext.in	2009-08-05 13:01:48.000000000 +0200
-@@ -221,8 +221,8 @@ regex/\.rpm$
+diff -up mc-4.7.0-pre4/misc/mc.ext.in.extensions mc-4.7.0-pre4/misc/mc.ext.in
+--- mc-4.7.0-pre4/misc/mc.ext.in.extensions	2009-10-29 20:02:37.000000000 +0100
++++ mc-4.7.0-pre4/misc/mc.ext.in	2009-12-10 20:46:47.000000000 +0100
+@@ -226,8 +226,8 @@ regex/\.rpm$
  
  # deb
  regex/\.u?deb$
@@ -24,7 +24,26 @@ diff -up mc-4.7.0-pre1/misc/mc.ext.in.ex
  
  # dpkg
  shell/.debd
-@@ -397,11 +397,16 @@ regex/\.([wW][aA][wW]22)$
+@@ -387,7 +387,7 @@ shell/.ico
+ 	Include=image
+ 
+ include/image
+-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
++	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (eog %f &); fi
+ 	View=%view{ascii} identify %f
+ 	#View=%view{ascii} asciiview %f
+ 
+@@ -395,7 +395,8 @@ include/image
+ ### Sound files ###
+ 
+ regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
+-       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Include=audio
++#       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 
+ regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
+        Open=mikmod %f
+@@ -405,15 +406,22 @@ regex/\.([wW][aA][wW]22)$
         Open=vplay -s 22 %f
  
  regex/\.([mM][pP]3)$
@@ -39,12 +58,19 @@ diff -up mc-4.7.0-pre1/misc/mc.ext.in.ex
  
  regex/\.([oO][gG][gG|aA|vV|xX])$
 -	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
-+	Open=ogg123 %f
++	Include=audio
++#	Open=ogg123 %f
 +#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
  	View=%view{ascii} ogginfo %s
  
  regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
-@@ -414,11 +419,15 @@ regex/\.([wW][mM][aA])$
+-	Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Include=audio
++#	Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 
+ regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
+ 	Open=timidity %f
+@@ -422,11 +430,15 @@ regex/\.([wW][mM][aA])$
  	Open=mplayer -vo null %f
  	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
  
@@ -61,7 +87,7 @@ diff -up mc-4.7.0-pre1/misc/mc.ext.in.ex
  
  
  ### Video ###
-@@ -432,6 +441,9 @@ regex/\.([aA][sS][fFxX])$
+@@ -440,6 +452,9 @@ regex/\.([aA][sS][fFxX])$
  regex/\.([dD][iI][vV][xX])$
  	Include=video
  
@@ -71,7 +97,31 @@ diff -up mc-4.7.0-pre1/misc/mc.ext.in.ex
  regex/\.([mM][oO][vV]|[qQ][tT])$
  	Include=video
  
-@@ -496,22 +508,27 @@ shell/.abw
+@@ -471,12 +486,12 @@ include/video
+ 
+ # Postscript
+ type/^PostScript
+-	Open=(gv %f &)
++	Open=(xdg-open %f &)
+ 	View=%view{ascii} ps2ascii %f
+ 
+ # PDF
+ type/^PDF
+-	Open=(xpdf %f &)
++	Open=(xdg-open %f &)
+ 	#Open=(acroread %f &)
+ 	#Open=(ghostview %f &)
+ 	View=%view{ascii} pdftotext %f -
+@@ -486,7 +501,7 @@ type/^PDF
+ 
+ # html
+ regex/\.([hH][tT][mM][lL]?)$
+-	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
++	Open=(if test -n "$DISPLAY"; then (xdg-open file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
+ 	View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
+ 
+ # StarOffice 5.2
+@@ -504,22 +519,27 @@ shell/.abw
  
  # Microsoft Word Document
  regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/mc.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- mc.spec	1 Sep 2009 05:59:44 -0000	1.148
+++ mc.spec	10 Dec 2009 19:53:30 -0000	1.149
@@ -1,19 +1,19 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.4.pre2%{?dist}
+Release:	0.5.pre4%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
 # tarball created from git clone git://midnight-commander.org/git/mc.git
-Source0:	mc-%{version}-pre2.tar.bz2
+Source0:	mc-%{version}-pre4.tar.bz2
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	glib2-devel e2fsprogs-devel slang-devel
+BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel
 Requires:	dev >= 3.3-3
 
-Patch1:		mc-exit.patch
-Patch2:		mc-extensions.patch
+Patch1:		mc-extensions.patch
+Patch2:		mc-rpmvfs.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -23,9 +23,9 @@ ability to FTP, view tar and zip files, 
 specific files.
 
 %prep
-%setup -q -n mc-%{version}-pre2
-%patch1 -p1 -b .exit
-%patch2 -p1 -b .extensions
+%setup -q -n mc-%{version}-pre4
+%patch1 -p1 -b .extensions
+%patch2 -p1 -b .rpmvfs
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -70,17 +70,30 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/mc/Syntax
 %config %{_sysconfdir}/mc/mc.charsets
 %config %{_sysconfdir}/mc/mc.lib
-%config(noreplace) %{_sysconfdir}/mc/*edit*
 %config(noreplace) %{_sysconfdir}/mc/mc.ext
-%config(noreplace) %{_sysconfdir}/mc/mc.menu
-%config(noreplace) %{_sysconfdir}/mc/extfs/extfs.ini
-%config(noreplace) %{_sysconfdir}/mc/extfs/sfs.ini
+%config(noreplace) %{_sysconfdir}/mc/*edit*
+%config(noreplace) %{_sysconfdir}/mc/mc.keymap*
+%config(noreplace) %{_sysconfdir}/mc/mc.menu*
+%config(noreplace) %{_sysconfdir}/mc/*.ini
+%config(noreplace) %{_sysconfdir}/mc/extfs/*.ini
 %dir %{_datadir}/mc
 %dir %{_sysconfdir}/mc
 %dir %{_sysconfdir}/mc/extfs
 %dir %{_libexecdir}/mc
 
 %changelog
+* Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.5.pre4
+- update to pre4:
+  - fixes color parsing (#545805)
+  - editor/viewer issues (#539292)
+  - configuration saving (#537778)
+  - tar VFS fix (#495791)
+  - enhanced file search (#210620)
+  - UTF-8 is added in Display Bits/Select (#196358)
+- update bindings (#532784)
+- show empty directories in RPM VFS (#529645)
+- add gpm-devel to BR (#440580)
+
 * Tue Sep  1 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.4.pre2
 - update to 4.7.0-pre2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	1 Sep 2009 05:59:45 -0000	1.48
+++ sources	10 Dec 2009 19:53:30 -0000	1.49
@@ -1 +1 @@
-347d0144709ed342302787e314146eef  mc-4.7.0-pre2.tar.bz2
+7bdc0ac4fe57c19a6bf2fd3e8894a073  mc-4.7.0-pre4.tar.bz2



From leigh123linux at fedoraproject.org  Thu Dec 10 19:55:09 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 10 Dec 2009 19:55:09 +0000 (UTC)
Subject: File qbittorrent-2.0.0.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091210195509.DF71910F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for qbittorrent:

5730bc420d830b16dbb5552d44fc60a9  qbittorrent-2.0.0.tar.gz



From leigh123linux at fedoraproject.org  Thu Dec 10 19:55:43 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 10 Dec 2009 19:55:43 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 .cvsignore, 1.18, 1.19 qbittorrent.spec, 1.41,
	1.42 sources, 1.19, 1.20
Message-ID: <20091210195543.A98CF11C025D@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24844

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Thu Dec 10 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-1
- update to 2.0.0
- add Br: libnotify-devel
- drop Br: curl-devel, zziplib-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	19 Nov 2009 19:39:05 -0000	1.18
+++ .cvsignore	10 Dec 2009 19:55:43 -0000	1.19
@@ -1 +1 @@
-qbittorrent-1.5.6.tar.gz
+qbittorrent-2.0.0.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- qbittorrent.spec	19 Nov 2009 19:39:05 -0000	1.41
+++ qbittorrent.spec	10 Dec 2009 19:55:43 -0000	1.42
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.5.6
+Version: 2.0.0
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -11,7 +11,6 @@ Release: 1%{?dist}
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 #Source0:  %{name}-%{svn_rev}svn.tar.gz
 Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
-Patch0:  qbittorrent_flag.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
@@ -21,9 +20,9 @@ BuildRequires: qt-devel >= 4.4.1   
 BuildRequires: desktop-file-utils
 BuildRequires: boost-devel
 BuildRequires: asio-devel
-BuildRequires: zziplib-devel
 BuildRequires: rb_libtorrent-devel >= 0.14.4
-BuildRequires: curl-devel, glib2-devel
+BuildRequires: glib2-devel
+BuildRequires: libnotify-devel
 
 %description
 A Bittorrent client using rb_libtorrent and a Qt4 Graphical User Interface.
@@ -31,7 +30,6 @@ It aims to be as fast as possible and to
 
 %prep
 %setup -q
-#patch0 -p1 -b .qbittorrent_flag
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -74,6 +72,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Thu Dec 10 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-1
+- update to 2.0.0
+- add Br: libnotify-devel
+- drop Br: curl-devel, zziplib-devel
+
 * Thu Nov 19 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.5.6-1
 - update to 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	19 Nov 2009 19:39:05 -0000	1.19
+++ sources	10 Dec 2009 19:55:43 -0000	1.20
@@ -1 +1 @@
-a1976d71614f4b8cfc22e3289fb16887  qbittorrent-1.5.6.tar.gz
+5730bc420d830b16dbb5552d44fc60a9  qbittorrent-2.0.0.tar.gz



From leigh123linux at fedoraproject.org  Thu Dec 10 19:56:13 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 10 Dec 2009 19:56:13 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.31, 1.32 qbittorrent.spec, 1.55,
	1.56 sources, 1.31, 1.32
Message-ID: <20091210195613.5F2B011C025D@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25019

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Thu Dec 10 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-1
- update to 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	7 Dec 2009 22:01:39 -0000	1.31
+++ .cvsignore	10 Dec 2009 19:56:13 -0000	1.32
@@ -1 +1 @@
-qbittorrent-3058svn.tar.gz
+qbittorrent-2.0.0.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- qbittorrent.spec	7 Dec 2009 22:01:39 -0000	1.55
+++ qbittorrent.spec	10 Dec 2009 19:56:13 -0000	1.56
@@ -1,17 +1,16 @@
-%define svn_rev 3058
+#define svn_rev 3058
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.0.0
-Release: 0.13.svn%{svn_rev}%{?dist}
+Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
 # rm -rf qbittorrent/.svn
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
-Source0:  %{name}-%{svn_rev}svn.tar.gz
-#Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
-Patch0:  qbittorrent_flag.patch
+#Source0:  %{name}-%{svn_rev}svn.tar.gz
+Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
@@ -33,7 +32,6 @@ It aims to be as fast as possible and to
 
 %prep
 %setup -q -n %{name}
-#patch0 -p1 -b .qbittorrent_flag
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -76,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Thu Dec 10 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-1
+- update to 2.0.0
+
 * Mon Dec 07 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-0.13.svn3058
 - update to svn 3058 (RC6)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	7 Dec 2009 22:01:39 -0000	1.31
+++ sources	10 Dec 2009 19:56:13 -0000	1.32
@@ -1 +1 @@
-95dd14a5b47014d4a5b13ecbb5e08826  qbittorrent-3058svn.tar.gz
+5730bc420d830b16dbb5552d44fc60a9  qbittorrent-2.0.0.tar.gz



From notting at fedoraproject.org  Thu Dec 10 19:57:11 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 10 Dec 2009 19:57:11 +0000 (UTC)
Subject: File gnucash-2.3.8.tar.bz2 uploaded to lookaside cache by notting
Message-ID: <20091210195711.13D4210F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnucash:

8ae3c77481236b143cee3068a35c9ef1  gnucash-2.3.8.tar.bz2



From notting at fedoraproject.org  Thu Dec 10 20:01:00 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 10 Dec 2009 20:01:00 +0000 (UTC)
Subject: rpms/gnucash/F-12 gnucash-2.3.7-label.patch, NONE, 1.1 gnucash.spec,
	1.102, 1.103
Message-ID: <20091210200100.B343011C025D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26391/F-12

Modified Files:
	gnucash.spec 
Added Files:
	gnucash-2.3.7-label.patch 
Log Message:
Sync branches, add bugfix patch for later builds.


gnucash-2.3.7-label.patch:
 dialog-utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnucash-2.3.7-label.patch ---
diff -up gnucash-2.3.7/src/gnome-utils/dialog-utils.c.foo gnucash-2.3.7/src/gnome-utils/dialog-utils.c
--- gnucash-2.3.7/src/gnome-utils/dialog-utils.c.foo	2009-12-01 12:13:08.000000000 -0500
+++ gnucash-2.3.7/src/gnome-utils/dialog-utils.c	2009-12-01 12:13:33.000000000 -0500
@@ -907,7 +907,7 @@ gnc_gtk_dialog_add_button (GtkWidget *di
 {
   GtkWidget *button;
 
-  button = gtk_button_new_with_label(label);
+  button = gtk_button_new_with_mnemonic(label);
   if (stock_id) {
     GtkWidget *image;
 


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/F-12/gnucash.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gnucash.spec	12 Aug 2009 17:09:01 -0000	1.102
+++ gnucash.spec	10 Dec 2009 20:01:00 -0000	1.103
@@ -16,6 +16,7 @@ BuildRequires: libofx-devel, aqbanking-d
 BuildRequires: desktop-file-utils, texinfo
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 Patch0: gnucash-quiet.patch
+Patch1: gnucash-2.3.7-label.patch
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
 Requires: perl(Finance::Quote)
@@ -37,6 +38,7 @@ balanced books.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
@@ -128,6 +130,9 @@ fi
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Thu Dec 10 2009 Bill Nottingham <notting at redhat.com>
+- Fix accelerators (#533019, #541915)
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.9-3
 - Use lzma compressed upstream tarball.
 



From notting at fedoraproject.org  Thu Dec 10 20:01:01 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 10 Dec 2009 20:01:01 +0000 (UTC)
Subject: rpms/gnucash/F-11 gnucash-2.3.7-label.patch, NONE, 1.1 gnucash.spec,
	1.100, 1.101
Message-ID: <20091210200101.47B6711C025D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26391/F-11

Modified Files:
	gnucash.spec 
Added Files:
	gnucash-2.3.7-label.patch 
Log Message:
Sync branches, add bugfix patch for later builds.


gnucash-2.3.7-label.patch:
 dialog-utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnucash-2.3.7-label.patch ---
diff -up gnucash-2.3.7/src/gnome-utils/dialog-utils.c.foo gnucash-2.3.7/src/gnome-utils/dialog-utils.c
--- gnucash-2.3.7/src/gnome-utils/dialog-utils.c.foo	2009-12-01 12:13:08.000000000 -0500
+++ gnucash-2.3.7/src/gnome-utils/dialog-utils.c	2009-12-01 12:13:33.000000000 -0500
@@ -907,7 +907,7 @@ gnc_gtk_dialog_add_button (GtkWidget *di
 {
   GtkWidget *button;
 
-  button = gtk_button_new_with_label(label);
+  button = gtk_button_new_with_mnemonic(label);
   if (stock_id) {
     GtkWidget *image;
 


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/F-11/gnucash.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gnucash.spec	5 Mar 2009 21:40:20 -0000	1.100
+++ gnucash.spec	10 Dec 2009 20:01:00 -0000	1.101
@@ -4,10 +4,10 @@ Name: gnucash
 Summary: Finance management application
 Version: 2.2.9
 URL: http://gnucash.org/
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
-Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2
+Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.lzma
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkhtml3-devel
 BuildRequires: libgsf-devel >= 1.12.2, goffice-devel, swig
@@ -16,6 +16,7 @@ BuildRequires: libofx-devel, aqbanking-d
 BuildRequires: desktop-file-utils, texinfo
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 Patch0: gnucash-quiet.patch
+Patch1: gnucash-2.3.7-label.patch
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
 Requires: perl(Finance::Quote)
@@ -37,6 +38,7 @@ balanced books.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
@@ -128,6 +130,15 @@ fi
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Thu Dec 10 2009 Bill Nottingham <notting at redhat.com>
+- Fix accelerators (#533019, #541915)
+
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.9-3
+- Use lzma compressed upstream tarball.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar  5 2009 Bill Nottingham <notting at redhat.com> - 2.2.9-1
 - update to 2.2.9
 



From notting at fedoraproject.org  Thu Dec 10 20:01:01 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 10 Dec 2009 20:01:01 +0000 (UTC)
Subject: rpms/gnucash/EL-5 gnucash-2.3.7-label.patch, NONE, 1.1 gnucash.spec,
	1.85, 1.86
Message-ID: <20091210200101.92CDB11C025D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26391/EL-5

Modified Files:
	gnucash.spec 
Added Files:
	gnucash-2.3.7-label.patch 
Log Message:
Sync branches, add bugfix patch for later builds.


gnucash-2.3.7-label.patch:
 dialog-utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnucash-2.3.7-label.patch ---
diff -up gnucash-2.3.7/src/gnome-utils/dialog-utils.c.foo gnucash-2.3.7/src/gnome-utils/dialog-utils.c
--- gnucash-2.3.7/src/gnome-utils/dialog-utils.c.foo	2009-12-01 12:13:08.000000000 -0500
+++ gnucash-2.3.7/src/gnome-utils/dialog-utils.c	2009-12-01 12:13:33.000000000 -0500
@@ -907,7 +907,7 @@ gnc_gtk_dialog_add_button (GtkWidget *di
 {
   GtkWidget *button;
 
-  button = gtk_button_new_with_label(label);
+  button = gtk_button_new_with_mnemonic(label);
   if (stock_id) {
     GtkWidget *image;
 


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/EL-5/gnucash.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- gnucash.spec	30 Sep 2008 20:11:09 -0000	1.85
+++ gnucash.spec	10 Dec 2009 20:01:01 -0000	1.86
@@ -1,13 +1,13 @@
-%define schemas /etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas /etc/gconf/schemas/apps_gnucash_dialog_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_hbci.schemas /etc/gconf/schemas/apps_gnucash_dialog_prices.schemas /etc/gconf/schemas/apps_gnucash_dialog_print_checks.schemas /etc/gconf/schemas/apps_gnucash_dialog_reconcile.schemas /etc/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas /etc/gconf/schemas/apps_gnucash_dialog_totd.schemas /etc/gconf/schemas/apps_gnucash_general.schemas /etc/gconf/schemas/apps_gnucash_history.schemas /etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas /etc/gconf/schemas/apps_gnucash_warnings.schemas /etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas /etc/gconf/schemas/apps_gnucash_window_pages_register.schemas
+%define schemas /etc/gconf/schemas/apps_gnucash_dialog_business_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_commodities.schemas /etc/gconf/schemas/apps_gnucash_dialog_common.schemas /etc/gconf/schemas/apps_gnucash_dialog_hbci.schemas /etc/gconf/schemas/apps_gnucash_dialog_prices.schemas /etc/gconf/schemas/apps_gnucash_dialog_print_checks.schemas /etc/gconf/schemas/apps_gnucash_dialog_reconcile.schemas /etc/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas /etc/gconf/schemas/apps_gnucash_dialog_totd.schemas /etc/gconf/schemas/apps_gnucash_general.schemas /etc/gconf/schemas/apps_gnucash_history.schemas /etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas /etc/gconf/schemas/apps_gnucash_warnings.schemas /etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas /etc/gconf/schemas/apps_gnucash_window_pages_register.schemas /etc/gconf/schemas/apps_gnucash_import_qif.schemas
 
 Name: gnucash
-Summary: GnuCash is an application to keep track of your finances
-Version: 2.2.7
+Summary: Finance management application
+Version: 2.2.9
 URL: http://gnucash.org/
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
-Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2
+Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.lzma
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkhtml38-devel
 BuildRequires: libgsf-devel >= 1.12.2, goffice-devel, swig
@@ -15,7 +15,8 @@ BuildRequires: libglade2-devel >= 2.3.6,
 BuildRequires: libofx-devel, aqbanking-devel, guile-devel
 BuildRequires: desktop-file-utils, texinfo
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
-Patch: gnucash-quiet.patch
+Patch0: gnucash-quiet.patch
+Patch1: gnucash-2.3.7-label.patch
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
 Requires: perl(Finance::Quote)
@@ -36,7 +37,8 @@ balanced books.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
@@ -128,6 +130,30 @@ fi
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Thu Dec 10 2009 Bill Nottingham <notting at redhat.com>
+- Fix accelerators (#533019, #541915)
+
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.9-3
+- Use lzma compressed upstream tarball.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar  5 2009 Bill Nottingham <notting at redhat.com> - 2.2.9-1
+- update to 2.2.9
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 22 2008 Bill Nottingham <notting at redhat.com> - 2.2.8-2
+- fix crash resulting from earlier crash fix (#474511, <jik at kamens.brookline.ma.us>)
+
+* Tue Dec 16 2008 Bill Nottingham <notting at redhat.com> - 2.2.8-1
+- update to 2.2.8
+
+* Fri Dec  5 2008 Bill Nottingham <notting at redhat.com> - 2.2.7-2
+- fix crash with glib-2.19 (#474511, <jik at kamens.brookline.ma.us>)
+
 * Tue Sep 30 2008 Bill Nottingham <notting at redhat.com> - 2.2.7-1
 - update to 2.2.7
  



From notting at fedoraproject.org  Thu Dec 10 20:02:36 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 10 Dec 2009 20:02:36 +0000 (UTC)
Subject: rpms/gnucash/EL-5 .cvsignore,1.33,1.34 sources,1.35,1.36
Message-ID: <20091210200236.0DDFF11C025D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26897

Modified Files:
	.cvsignore sources 
Log Message:
Sync.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucash/EL-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	30 Sep 2008 20:11:09 -0000	1.33
+++ .cvsignore	10 Dec 2009 20:02:35 -0000	1.34
@@ -1 +1 @@
-gnucash-2.2.7.tar.bz2
+gnucash-2.2.9.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucash/EL-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	30 Sep 2008 20:11:09 -0000	1.35
+++ sources	10 Dec 2009 20:02:35 -0000	1.36
@@ -1 +1 @@
-0f3f324c274b136070b769aa10591ccf  gnucash-2.2.7.tar.bz2
+b83c188506f749929a69b48c0632d3b8  gnucash-2.2.9.tar.lzma



From notting at fedoraproject.org  Thu Dec 10 20:02:50 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 10 Dec 2009 20:02:50 +0000 (UTC)
Subject: rpms/gnucash/F-11 .cvsignore,1.37,1.38 sources,1.39,1.40
Message-ID: <20091210200250.D816811C025D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26965

Modified Files:
	.cvsignore sources 
Log Message:
Sync.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucash/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	5 Mar 2009 21:28:53 -0000	1.37
+++ .cvsignore	10 Dec 2009 20:02:50 -0000	1.38
@@ -1 +1 @@
-gnucash-2.2.9.tar.bz2
+gnucash-2.2.9.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucash/F-11/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	5 Mar 2009 21:28:53 -0000	1.39
+++ sources	10 Dec 2009 20:02:50 -0000	1.40
@@ -1 +1 @@
-1d814de8673b4760045bf51b72924d04  gnucash-2.2.9.tar.bz2
+b83c188506f749929a69b48c0632d3b8  gnucash-2.2.9.tar.lzma



From notting at fedoraproject.org  Thu Dec 10 20:06:55 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 10 Dec 2009 20:06:55 +0000 (UTC)
Subject: rpms/gnucash/devel .cvsignore, 1.39, 1.40 gnucash.spec, 1.105,
	1.106 sources, 1.41, 1.42 gnucash-2.3.7-label.patch, 1.1, NONE
Message-ID: <20091210200655.BA36F11C025D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/gnucash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28088

Modified Files:
	.cvsignore gnucash.spec sources 
Removed Files:
	gnucash-2.3.7-label.patch 
Log Message:
Update to 2.3.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	1 Dec 2009 17:55:59 -0000	1.39
+++ .cvsignore	10 Dec 2009 20:06:55 -0000	1.40
@@ -1 +1 @@
-gnucash-2.3.7.tar.bz2
+gnucash-2.3.8.tar.bz2


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gnucash.spec	1 Dec 2009 17:35:16 -0000	1.105
+++ gnucash.spec	10 Dec 2009 20:06:55 -0000	1.106
@@ -2,7 +2,7 @@
 
 Name: gnucash
 Summary: Finance management application
-Version: 2.3.7
+Version: 2.3.8
 URL: http://gnucash.org/
 Release: 1%{?dist}
 License: GPLv2+
@@ -17,7 +17,6 @@ BuildRequires: desktop-file-utils, texin
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 BuildRequires: python-devel, libdbi-devel
 Patch0: gnucash-quiet.patch
-Patch1: gnucash-2.3.7-label.patch
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
 Requires: perl(Finance::Quote)
@@ -39,7 +38,6 @@ balanced books.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
@@ -130,6 +128,9 @@ fi
 %doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI
 
 %changelog
+* Thu Dec 10 2009 Bill Nottingham <notting at redhat.com> - 2.3.8-1
+- update to 2.3.8
+
 * Tue Dec  1 2009 Bill Nottingham <notting at redhat.com> - 2.3.7-1
 - Update to development version.
 - Fix accelerators (#533019, #541915)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	1 Dec 2009 17:55:59 -0000	1.41
+++ sources	10 Dec 2009 20:06:55 -0000	1.42
@@ -1 +1 @@
-28de0a77decdffe78cd7ae3aea24a02b  gnucash-2.3.7.tar.bz2
+8ae3c77481236b143cee3068a35c9ef1  gnucash-2.3.8.tar.bz2


--- gnucash-2.3.7-label.patch DELETED ---



From karlik at fedoraproject.org  Thu Dec 10 20:09:21 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Thu, 10 Dec 2009 20:09:21 +0000 (UTC)
Subject: rpms/tesseract-langpack/F-10 tesseract-langpack.spec,1.1,1.2
Message-ID: <20091210200921.0AAD011C025D@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract-langpack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28570/F-10

Modified Files:
	tesseract-langpack.spec 
Log Message:
Fix typo



Index: tesseract-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract-langpack/F-10/tesseract-langpack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tesseract-langpack.spec	24 Aug 2007 16:08:15 -0000	1.1
+++ tesseract-langpack.spec	10 Dec 2009 20:09:20 -0000	1.2
@@ -1,7 +1,7 @@
 %define upstreamname tesseract
 Name:		%{upstreamname}-langpack
 Version:	2.00
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Langpacks for tesseract
 
 Group:		Applications/File
@@ -36,7 +36,7 @@ Group:		Applications/File
 Requires:	%{upstreamname}
 
 %package es
-Summary:	Spanish langpack for {upstreamname}
+Summary:	Spanish langpack for %{upstreamname}
 Group:		Applications/File
 Requires:	%{upstreamname}
 
@@ -90,7 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{upstreamname}/tessdata/deu*
 
 %changelog
+* Thu Dec 10 2009 Karol Trzcionka <karlikt at gmail.com> - 2.00-3
+- Fix typo
 * Fri Aug 24 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-2
 - Fixed executable file in nl
 * Tue Aug 21 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-1
-- Initial Release
\ No newline at end of file
+- Initial Release



From karlik at fedoraproject.org  Thu Dec 10 20:09:21 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Thu, 10 Dec 2009 20:09:21 +0000 (UTC)
Subject: rpms/tesseract-langpack/F-11 tesseract-langpack.spec,1.2,1.3
Message-ID: <20091210200921.3B0AD11C025D@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract-langpack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28570/F-11

Modified Files:
	tesseract-langpack.spec 
Log Message:
Fix typo



Index: tesseract-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract-langpack/F-11/tesseract-langpack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tesseract-langpack.spec	25 Feb 2009 19:59:05 -0000	1.2
+++ tesseract-langpack.spec	10 Dec 2009 20:09:21 -0000	1.3
@@ -1,7 +1,7 @@
 %define upstreamname tesseract
 Name:		%{upstreamname}-langpack
 Version:	2.00
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Langpacks for tesseract
 
 Group:		Applications/File
@@ -36,7 +36,7 @@ Group:		Applications/File
 Requires:	%{upstreamname}
 
 %package es
-Summary:	Spanish langpack for {upstreamname}
+Summary:	Spanish langpack for %{upstreamname}
 Group:		Applications/File
 Requires:	%{upstreamname}
 
@@ -90,10 +90,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{upstreamname}/tessdata/deu*
 
 %changelog
+* Thu Dec 10 2009 Karol Trzcionka <karlikt at gmail.com> - 2.00-4
+- Fix typo
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Fri Aug 24 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-2
 - Fixed executable file in nl
 * Tue Aug 21 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-1
-- Initial Release
\ No newline at end of file
+- Initial Release



From karlik at fedoraproject.org  Thu Dec 10 20:09:21 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Thu, 10 Dec 2009 20:09:21 +0000 (UTC)
Subject: rpms/tesseract-langpack/devel tesseract-langpack.spec,1.3,1.4
Message-ID: <20091210200921.9449011C025D@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28570/devel

Modified Files:
	tesseract-langpack.spec 
Log Message:
Fix typo



Index: tesseract-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract-langpack/devel/tesseract-langpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tesseract-langpack.spec	27 Jul 2009 05:47:53 -0000	1.3
+++ tesseract-langpack.spec	10 Dec 2009 20:09:21 -0000	1.4
@@ -1,7 +1,7 @@
 %define upstreamname tesseract
 Name:		%{upstreamname}-langpack
 Version:	2.00
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Langpacks for tesseract
 
 Group:		Applications/File
@@ -36,7 +36,7 @@ Group:		Applications/File
 Requires:	%{upstreamname}
 
 %package es
-Summary:	Spanish langpack for {upstreamname}
+Summary:	Spanish langpack for %{upstreamname}
 Group:		Applications/File
 Requires:	%{upstreamname}
 
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{upstreamname}/tessdata/deu*
 
 %changelog
+* Thu Dec 10 2009 Karol Trzcionka <karlikt at gmail.com> - 2.00-5
+- Fix typo
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -99,4 +102,4 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Aug 24 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-2
 - Fixed executable file in nl
 * Tue Aug 21 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-1
-- Initial Release
\ No newline at end of file
+- Initial Release



From karlik at fedoraproject.org  Thu Dec 10 20:09:21 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Thu, 10 Dec 2009 20:09:21 +0000 (UTC)
Subject: rpms/tesseract-langpack/F-12 tesseract-langpack.spec,1.3,1.4
Message-ID: <20091210200921.70BB111C025D@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract-langpack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28570/F-12

Modified Files:
	tesseract-langpack.spec 
Log Message:
Fix typo



Index: tesseract-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract-langpack/F-12/tesseract-langpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tesseract-langpack.spec	27 Jul 2009 05:47:53 -0000	1.3
+++ tesseract-langpack.spec	10 Dec 2009 20:09:21 -0000	1.4
@@ -1,7 +1,7 @@
 %define upstreamname tesseract
 Name:		%{upstreamname}-langpack
 Version:	2.00
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Langpacks for tesseract
 
 Group:		Applications/File
@@ -36,7 +36,7 @@ Group:		Applications/File
 Requires:	%{upstreamname}
 
 %package es
-Summary:	Spanish langpack for {upstreamname}
+Summary:	Spanish langpack for %{upstreamname}
 Group:		Applications/File
 Requires:	%{upstreamname}
 
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{upstreamname}/tessdata/deu*
 
 %changelog
+* Thu Dec 10 2009 Karol Trzcionka <karlikt at gmail.com> - 2.00-5
+- Fix typo
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -99,4 +102,4 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Aug 24 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-2
 - Fixed executable file in nl
 * Tue Aug 21 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-1
-- Initial Release
\ No newline at end of file
+- Initial Release



From jgu at fedoraproject.org  Thu Dec 10 20:11:15 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 20:11:15 +0000 (UTC)
Subject: File shorewall-4.4.4.2.tar.bz2 uploaded to lookaside cache by jgu
Message-ID: <20091210201115.3492210F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for shorewall:

663a6adef814ab93c377cef08f76b4cc  shorewall-4.4.4.2.tar.bz2



From leigh123linux at fedoraproject.org  Thu Dec 10 20:15:36 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 10 Dec 2009 20:15:36 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.56,1.57
Message-ID: <20091210201536.6F89311C025D@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30324

Modified Files:
	qbittorrent.spec 
Log Message:
fix %prep name



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- qbittorrent.spec	10 Dec 2009 19:56:13 -0000	1.56
+++ qbittorrent.spec	10 Dec 2009 20:15:35 -0000	1.57
@@ -31,7 +31,7 @@ A Bittorrent client using rb_libtorrent 
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 %build
 # use ./configure instead of %%configure as it doesn't work



From dwalsh at fedoraproject.org  Thu Dec 10 20:17:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Dec 2009 20:17:28 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.8,1.9
Message-ID: <20091210201728.134A711C025D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31204

Modified Files:
	policy-F13.patch 
Log Message:
* Fri Dec 4 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-1
- Update to upstream release


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   77 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  111 +-
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 ++
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   31 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   45 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++-
 policy/modules/kernel/files.te            |    2 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  127 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  459 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  116 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   24 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    6 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |    8 
 policy/modules/services/nut.if            |   82 +
 policy/modules/services/nut.te            |  127 ++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |  101 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   91 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  628 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   25 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 ++
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1665 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 382 files changed, 19033 insertions(+), 2974 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- policy-F13.patch	10 Dec 2009 19:20:14 -0000	1.8
+++ policy-F13.patch	10 Dec 2009 20:17:27 -0000	1.9
@@ -637,8 +637,34 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.7.4/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/prelink.if	2009-12-04 12:33:34.000000000 -0500
-@@ -151,11 +151,11 @@
++++ serefpolicy-3.7.4/policy/modules/admin/prelink.if	2009-12-10 15:16:44.000000000 -0500
+@@ -21,6 +21,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Execute the prelink program in the current domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`prelink_exec',`
++	gen_require(`
++		type prelink_exec_t;
++	')
++
++	corecmd_search_bin($1)
++	can_exec($1, prelink_exec_t)
++')
++
++########################################
++## <summary>
+ ##	Execute the prelink program in the prelink domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -151,11 +170,11 @@
  ##	</summary>
  ## </param>
  #



From karlik at fedoraproject.org  Thu Dec 10 20:18:04 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Thu, 10 Dec 2009 20:18:04 +0000 (UTC)
Subject: rpms/tesseract-langpack/devel tesseract-langpack.spec,1.4,1.5
Message-ID: <20091210201804.A86B811C025D@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31509

Modified Files:
	tesseract-langpack.spec 
Log Message:
Delete macro


Index: tesseract-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract-langpack/devel/tesseract-langpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tesseract-langpack.spec	10 Dec 2009 20:09:21 -0000	1.4
+++ tesseract-langpack.spec	10 Dec 2009 20:18:04 -0000	1.5
@@ -1,7 +1,7 @@
 %define upstreamname tesseract
 Name:		%{upstreamname}-langpack
 Version:	2.00
-Release:	5%{?dist}
+Release:	6
 Summary:	Langpacks for tesseract
 
 Group:		Applications/File
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{upstreamname}/tessdata/deu*
 
 %changelog
+* Thu Dec 10 2009 Karol Trzcionka <karlikt at gmail.com> - 2.00-6
+- Delete %%{?dist} macro
+
 * Thu Dec 10 2009 Karol Trzcionka <karlikt at gmail.com> - 2.00-5
 - Fix typo
 



From jgu at fedoraproject.org  Thu Dec 10 20:32:37 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 20:32:37 +0000 (UTC)
Subject: File shorewall6-4.4.4.2.tar.bz2 uploaded to lookaside cache by jgu
Message-ID: <20091210203237.44CAC10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for shorewall:

72d3073650ff141bddfa79ff23f1cb80  shorewall6-4.4.4.2.tar.bz2



From jgu at fedoraproject.org  Thu Dec 10 20:32:39 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 20:32:39 +0000 (UTC)
Subject: File shorewall6-lite-4.4.4.2.tar.bz2 uploaded to lookaside cache by
	jgu
Message-ID: <20091210203239.A92F610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for shorewall:

7db60078fcb72e1048be10b2e82f29d0  shorewall6-lite-4.4.4.2.tar.bz2



From jgu at fedoraproject.org  Thu Dec 10 20:32:42 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 20:32:42 +0000 (UTC)
Subject: File shorewall-lite-4.4.4.tar.bz2 uploaded to lookaside cache by jgu
Message-ID: <20091210203242.32E0910F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for shorewall:

41f0b953db2cc59496aa34f612c7a438  shorewall-lite-4.4.4.tar.bz2



From jgu at fedoraproject.org  Thu Dec 10 20:33:05 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 20:33:05 +0000 (UTC)
Subject: rpms/shorewall/devel .cvsignore, 1.59, 1.60 shorewall.spec, 1.92,
	1.93 sources, 1.60, 1.61
Message-ID: <20091210203305.26A9311C025D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3798

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-1
- Update to 4.4.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	3 Sep 2009 17:32:03 -0000	1.59
+++ .cvsignore	10 Dec 2009 20:33:04 -0000	1.60
@@ -1,4 +1,4 @@
-shorewall-4.4.1.tar.bz2
-shorewall6-4.4.1.tar.bz2
-shorewall6-lite-4.4.1.tar.bz2
-shorewall-lite-4.4.1.tar.bz2
+shorewall-4.4.4.2.tar.bz2
+shorewall6-4.4.4.2.tar.bz2
+shorewall6-lite-4.4.4.2.tar.bz2
+shorewall-lite-4.4.4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- shorewall.spec	6 Nov 2009 23:39:28 -0000	1.92
+++ shorewall.spec	10 Dec 2009 20:33:04 -0000	1.93
@@ -1,11 +1,11 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
-%global major_ver 4.4.3
-%global shorewall_ver %{major_ver}
+%global major_ver 4.4.4
+%global shorewall_ver %{major_ver}.2
 %global lite_ver %{major_ver}
-%global shorewall6_ver %{major_ver}
-%global lite6_ver %{major_ver}
+%global shorewall6_ver %{major_ver}.2
+%global lite6_ver %{major_ver}.2
 
 Name:           shorewall
 Version:        %{shorewall_ver}
@@ -334,6 +334,9 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-1
+- Update to 4.4.4.2
+
 * Thu Nov  6 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.3-1
 - Update to 4.4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	6 Nov 2009 23:39:28 -0000	1.60
+++ sources	10 Dec 2009 20:33:04 -0000	1.61
@@ -1,4 +1,4 @@
-95134c917c202e5d56bfc54753a0f59e  shorewall-4.4.3.tar.bz2
-6c16ee908ac6f905bedb838788765e15  shorewall6-4.4.3.tar.bz2
-b82ed6ed0b0211d196412831dcbafc23  shorewall6-lite-4.4.3.tar.bz2
-b71a98acf45f02c8948282029712841b  shorewall-lite-4.4.3.tar.bz2
+663a6adef814ab93c377cef08f76b4cc  shorewall-4.4.4.2.tar.bz2
+72d3073650ff141bddfa79ff23f1cb80  shorewall6-4.4.4.2.tar.bz2
+7db60078fcb72e1048be10b2e82f29d0  shorewall6-lite-4.4.4.2.tar.bz2
+41f0b953db2cc59496aa34f612c7a438  shorewall-lite-4.4.4.tar.bz2



From jgu at fedoraproject.org  Thu Dec 10 20:34:02 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 20:34:02 +0000 (UTC)
Subject: rpms/shorewall/F-12 shorewall.spec,1.92,1.93 sources,1.60,1.61
Message-ID: <20091210203402.650F911C025D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4167

Modified Files:
	shorewall.spec sources 
Log Message:
* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-1
- Update to 4.4.4.2



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-12/shorewall.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- shorewall.spec	6 Nov 2009 23:38:40 -0000	1.92
+++ shorewall.spec	10 Dec 2009 20:34:02 -0000	1.93
@@ -1,11 +1,11 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
-%global major_ver 4.4.3
-%global shorewall_ver %{major_ver}
+%global major_ver 4.4.4
+%global shorewall_ver %{major_ver}.2
 %global lite_ver %{major_ver}
-%global shorewall6_ver %{major_ver}
-%global lite6_ver %{major_ver}
+%global shorewall6_ver %{major_ver}.2
+%global lite6_ver %{major_ver}.2
 
 Name:           shorewall
 Version:        %{shorewall_ver}
@@ -334,6 +334,9 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-1
+- Update to 4.4.4.2
+
 * Thu Nov  6 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.3-1
 - Update to 4.4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-12/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	6 Nov 2009 23:38:40 -0000	1.60
+++ sources	10 Dec 2009 20:34:02 -0000	1.61
@@ -1,4 +1,4 @@
-95134c917c202e5d56bfc54753a0f59e  shorewall-4.4.3.tar.bz2
-6c16ee908ac6f905bedb838788765e15  shorewall6-4.4.3.tar.bz2
-b82ed6ed0b0211d196412831dcbafc23  shorewall6-lite-4.4.3.tar.bz2
-b71a98acf45f02c8948282029712841b  shorewall-lite-4.4.3.tar.bz2
+663a6adef814ab93c377cef08f76b4cc  shorewall-4.4.4.2.tar.bz2
+72d3073650ff141bddfa79ff23f1cb80  shorewall6-4.4.4.2.tar.bz2
+7db60078fcb72e1048be10b2e82f29d0  shorewall6-lite-4.4.4.2.tar.bz2
+41f0b953db2cc59496aa34f612c7a438  shorewall-lite-4.4.4.tar.bz2



From jdieter at fedoraproject.org  Thu Dec 10 20:43:11 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Thu, 10 Dec 2009 20:43:11 +0000 (UTC)
Subject: File yum-presto-0.6.2.tar.bz2 uploaded to lookaside cache by jdieter
Message-ID: <20091210204311.2E49D10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for yum-presto:

f38cad477cdabf209b71b35a34cc04ec  yum-presto-0.6.2.tar.bz2



From jdieter at fedoraproject.org  Thu Dec 10 20:44:20 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Thu, 10 Dec 2009 20:44:20 +0000 (UTC)
Subject: rpms/yum-presto/F-12 .cvsignore, 1.12, 1.13 import.log, 1.3,
	1.4 sources, 1.12, 1.13 yum-presto.spec, 1.20, 1.21
Message-ID: <20091210204420.8A9E011C025D@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7156/F-12

Modified Files:
	.cvsignore import.log sources yum-presto.spec 
Log Message:
Remove multiple cleanup messages


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Sep 2009 10:07:57 -0000	1.12
+++ .cvsignore	10 Dec 2009 20:44:20 -0000	1.13
@@ -1 +1 @@
-yum-presto-0.6.1.tar.bz2
+yum-presto-0.6.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	18 Sep 2009 10:07:57 -0000	1.3
+++ import.log	10 Dec 2009 20:44:20 -0000	1.4
@@ -1,3 +1,4 @@
 yum-presto-0_5_0-1_fc10:HEAD:yum-presto-0.5.0-1.fc10.src.rpm:1241176734
 yum-presto-0_6_0-1_fc11:HEAD:yum-presto-0.6.0-1.fc11.src.rpm:1252786673
 yum-presto-0_6_1-1_fc11:HEAD:yum-presto-0.6.1-1.fc11.src.rpm:1253268412
+yum-presto-0_6_2-1_fc12:F-12:yum-presto-0.6.2-1.fc12.src.rpm:1260477804


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Sep 2009 10:07:57 -0000	1.12
+++ sources	10 Dec 2009 20:44:20 -0000	1.13
@@ -1 +1 @@
-b0db7817aff1fcfa2c432862c6b86c7b  yum-presto-0.6.1.tar.bz2
+f38cad477cdabf209b71b35a34cc04ec  yum-presto-0.6.2.tar.bz2


Index: yum-presto.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/F-12/yum-presto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- yum-presto.spec	18 Sep 2009 10:07:57 -0000	1.20
+++ yum-presto.spec	10 Dec 2009 20:44:20 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary: Presto plugin for yum
 Name: yum-presto
-Version: 0.6.1
+Version: 0.6.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -45,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Thu Dec 10 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.2-1
+- Register package name with yum
+- Remove multiple cleanup messages (#524633)
+
 * Thu Sep 17 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.1-1
 - Fix bug in attempting to read deltainfo.xml
 



From jdieter at fedoraproject.org  Thu Dec 10 20:46:54 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Thu, 10 Dec 2009 20:46:54 +0000 (UTC)
Subject: rpms/yum-presto/devel .cvsignore, 1.12, 1.13 import.log, 1.3,
	1.4 sources, 1.12, 1.13 yum-presto.spec, 1.20, 1.21
Message-ID: <20091210204654.4BEDC11C025D@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7909/devel

Modified Files:
	.cvsignore import.log sources yum-presto.spec 
Log Message:
Remove multiple cleanup messages


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Sep 2009 10:07:57 -0000	1.12
+++ .cvsignore	10 Dec 2009 20:46:53 -0000	1.13
@@ -1 +1 @@
-yum-presto-0.6.1.tar.bz2
+yum-presto-0.6.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	18 Sep 2009 10:07:57 -0000	1.3
+++ import.log	10 Dec 2009 20:46:54 -0000	1.4
@@ -1,3 +1,4 @@
 yum-presto-0_5_0-1_fc10:HEAD:yum-presto-0.5.0-1.fc10.src.rpm:1241176734
 yum-presto-0_6_0-1_fc11:HEAD:yum-presto-0.6.0-1.fc11.src.rpm:1252786673
 yum-presto-0_6_1-1_fc11:HEAD:yum-presto-0.6.1-1.fc11.src.rpm:1253268412
+yum-presto-0_6_2-1_fc12:HEAD:yum-presto-0.6.2-1.fc12.src.rpm:1260477959


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Sep 2009 10:07:57 -0000	1.12
+++ sources	10 Dec 2009 20:46:54 -0000	1.13
@@ -1 +1 @@
-b0db7817aff1fcfa2c432862c6b86c7b  yum-presto-0.6.1.tar.bz2
+f38cad477cdabf209b71b35a34cc04ec  yum-presto-0.6.2.tar.bz2


Index: yum-presto.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- yum-presto.spec	18 Sep 2009 10:07:57 -0000	1.20
+++ yum-presto.spec	10 Dec 2009 20:46:54 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary: Presto plugin for yum
 Name: yum-presto
-Version: 0.6.1
+Version: 0.6.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -45,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Thu Dec 10 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.2-1
+- Register package name with yum
+- Remove multiple cleanup messages (#524633)
+
 * Thu Sep 17 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.1-1
 - Fix bug in attempting to read deltainfo.xml
 



From jgu at fedoraproject.org  Thu Dec 10 20:53:27 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 20:53:27 +0000 (UTC)
Subject: rpms/shorewall/devel shorewall.spec,1.93,1.94
Message-ID: <20091210205327.7C7A711C025D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9906

Modified Files:
	shorewall.spec 
Log Message:
* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-2
- Add logrotate files to packages



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- shorewall.spec	10 Dec 2009 20:33:04 -0000	1.93
+++ shorewall.spec	10 Dec 2009 20:53:27 -0000	1.94
@@ -9,7 +9,7 @@
 
 Name:           shorewall
 Version:        %{shorewall_ver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -195,6 +195,7 @@ fi
 %attr(0755,root,root) /sbin/shorewall
 %dir %{_sysconfdir}/shorewall
 %config(noreplace) %{_sysconfdir}/shorewall/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall
 
 %dir %{_datadir}/shorewall
 %attr(0755,root,root) %{_datadir}/shorewall/wait4ifup
@@ -251,9 +252,11 @@ fi
 %attr(0755,root,root) /sbin/shorewall-lite
 %dir %{_sysconfdir}/shorewall-lite
 %config(noreplace) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall-lite
 %{_sysconfdir}/shorewall-lite/Makefile
 %attr(0755,root,root) %{_initrddir}/shorewall-lite
 %dir %{_localstatedir}/lib/shorewall-lite
+
 %dir %{_datadir}/shorewall-lite
 %{_datadir}/shorewall-lite/version
 %{_datadir}/shorewall-lite/configpath
@@ -273,6 +276,7 @@ fi
 %attr(0755,root,root) /sbin/shorewall6
 %dir %{_sysconfdir}/shorewall6
 %config(noreplace) %{_sysconfdir}/shorewall6/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6
 
 # Man files - can't use wildcard as shorewall6-lite also installs some man files
 %{_mandir}/man5/shorewall6-accounting.5.gz
@@ -319,6 +323,7 @@ fi
 %attr(0755,root,root) /sbin/shorewall6-lite
 %dir %{_sysconfdir}/shorewall6-lite
 %config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6
 %attr(0755,root,root) %{_initrddir}/shorewall6-lite
 %{_sysconfdir}/shorewall6-lite/Makefile
 %dir %{_localstatedir}/lib/shorewall6-lite
@@ -334,6 +339,9 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-2
+- Add logrotate files to packages
+
 * Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-1
 - Update to 4.4.4.2
 



From wcohen at fedoraproject.org  Thu Dec 10 20:55:17 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu, 10 Dec 2009 20:55:17 +0000 (UTC)
Subject: rpms/papi/devel papi-3.7.2-config.patch,NONE,1.1 papi.spec,1.8,1.9
Message-ID: <20091210205518.07C1111C025D@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/papi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10465

Modified Files:
	papi.spec 
Added Files:
	papi-3.7.2-config.patch 
Log Message:
* Thu Dec 10 2009 William Cohen <wcohen at redhat.com> - 3.7.2-3
- Adjust configure.



papi-3.7.2-config.patch:
 configure.in |   92 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

--- NEW FILE papi-3.7.2-config.patch ---
diff -up papi-3.7.2/src/configure.in.header papi-3.7.2/src/configure.in
--- papi-3.7.2/src/configure.in.header	2009-12-10 15:05:09.000000000 -0500
+++ papi-3.7.2/src/configure.in	2009-12-10 15:05:13.000000000 -0500
@@ -1013,61 +1013,63 @@ AC_ARG_WITH(pfm_libdir,
             )
 
 # PCL start
-# set PCL manually set with --with-pcl, 
-# or by default if perfctr and perfmon are not available
-# and linux kernel version is >= 31
-
-if test "$cross_compiling" = "no" -a "$OS" = "linux" -a "`uname -r | grep "2.6."`"; then
-# gives the position in $OSVER of *first* character in substring "2.6."
-POS1=`expr index "$OSVER" "2.6."`
-POS2=`expr $POS1 + 4`
-VERS=`expr substr "$OSVER" "$POS2" 2`
-
-# Version 2.6.31 of the kernel uses perf_counter.h and all subsequent versions use perf_event.h
-if test "$VERS" = "31"; then
-  perf_header="perf_counter.h"
-  CFLAGS="$CFLAGS -DKERNEL31"
-elif test "$VERS" -gt 31; then
-  perf_header="perf_event.h"
+if test "x$perfctr" != "xyes" -a "$perfmon" = "0"; then
+
+# Try to find perf_event.h or perf_counter.h on
+# user specific path or default of /usr/include/linux
+AC_ARG_WITH(pcl_incdir,
+	   [  --with-pcl-incdir=<path>	Specify path to the correct perf event header file],
+  [
+case "$with_pcl_incdir" in
+yes) AC_MSG_ERROR([--with-pcl-incdir requires an argument]) ;;
+''|no) ;;
+*) pcl_incdir=$with_pcl_incdir ;;
+esac],
+[pcl_incdir="/usr/include/linux"])
+
+# Linux 2.6.32 and newer check
+AC_CHECK_FILE($pcl_incdir/perf_event.h,
+	[pcl="yes" PCLPATH="$pcl_incdir/perf_event.h"])
+
+# Linux 2.6.31 check
+if test "x$PCLPATH" = "x"; then
+AC_CHECK_FILE($pcl_incdir/perf_counter.h,
+	[pcl="yes" PCLPATH="$pcl_incdir/perf_counter.h"
+	   CFLAGS="$CFLAGS -DKERNEL31"])
 fi
 
-if test "${VERS}" -ge 31; then
 AC_ARG_WITH(pcl,
             [  --with-pcl=<yes,no>		Specify existence of Performance Counters for Linux],
-            [pcl=$withval
-             AC_CHECK_FILE(/lib/modules/$OSVER/source/include/linux/$perf_header, [ pcl="yes"
-               PCLPATH="/lib/modules/$OSVER/source/include/linux/$perf_header"],
-                [ pcl="no" ])
-            ],
-            [if test "$perfctr" = "no" -a "$perfmon" = "0"; then
-              AC_CHECK_FILE(/lib/modules/$OSVER/source/include/linux/$perf_header, [ pcl="yes"
-               PCLPATH="/lib/modules/$OSVER/source/include/linux/$perf_header"],
-                [ pcl="no" ])
-             fi
-            ])
-elif test "$perfctr" = "no" -a "$perfmon" = "0"; then
-AC_MSG_ERROR([PAPI requires a patch for any kernel older than 2.6.31])
+            [pcl=$withval])
+
+#fall back check for the perf_event.h or perf_counter.h in -devel for running
+#linux kernel
+if test "x$cross_compiling" != "xyes" -a "$OS" = "linux" -a "x$PCLPATH" = "x"; then
+
+pcl_incdir="/lib/modules/$OSVER/source/include/linux"
+
+# Linux 2.6.32 and newer check
+AC_CHECK_FILE($pcl_incdir/perf_event.h,
+	[pcl="yes" PCLPATH="$pcl_incdir/perf_event.h"])
+
+# Linux 2.6.31 check
+if test "x$PCLPATH" = "x"; then
+AC_CHECK_FILE($pcl_incdir/perf_counter.h,
+	[pcl="yes" PCLPATH="$pcl_incdir/perf_counter.h"
+	   CFLAGS="$CFLAGS -DKERNEL31"])
+fi
+
+if test "x$PCLPATH" = "x"; then
+  pcl=no
 fi
 
-# If we are running a PCL kernel, the correct include file should have been found in 
-# /lib/modules/$OSVER/source/include/linux. If the file was not found
-# see if the user has set a path and ensure it can be found there
-if test "$pcl" = "no"; then
-AC_ARG_WITH(pcl_incdir,
-	   [  --with-pcl-incdir=<path>	Specify path to the correct perf event header file],
-	   [pcl_incdir=$withval
-	     AC_CHECK_FILE($pcl_incdir/$perf_header, [pcl="yes"
-              PCLPATH="$pcl_incdir/$perf_header"], 
-		[AC_MSG_ERROR([$perf_header could not be found at $pcl_incdir])])
-           ],
-           [if test "$perfctr" = "no" -a "$perfmon" = "0"; then
-            AC_MSG_ERROR([$perf_header could not be found and no patch is installed.])
-            fi
-           ])
 fi
 fi
 # PCL end
 
+if test "x$pcl" != "xyes" -a "x$perfctr" != "xyes" -a "$perfmon" = "0"; then
+  AC_MSG_ERROR([No performance monitoring interface available])
+fi
 
 AC_ARG_WITH(pmapi,
             [  --with-pmapi=<path>		Specify path of pmapi on aix system ],


Index: papi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papi/devel/papi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- papi.spec	9 Dec 2009 21:03:28 -0000	1.8
+++ papi.spec	10 Dec 2009 20:55:17 -0000	1.9
@@ -1,16 +1,18 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 3.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/System
 URL: http://icl.cs.utk.edu/papi/
 Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
+Patch1: papi-3.7.2-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 BuildRequires: kernel-headers >= 2.6.31
 BuildRequires: gcc-gfortran
 BuildRequires: chrpath
+BuildRequires: autoconf
 #Right now libpfm does not know anything about s390 and will fail
 ExcludeArch: s390, s390x
 
@@ -30,9 +32,12 @@ that uses PAPI.
 %prep
 %setup -q
 
+%patch1 -p1 -b .header
+
 %build
 cd src
-%configure --with-pcl=yes --disable-static --with-pcl-incdir=/usr/include/linux
+autoconf
+%configure --disable-static
 make %{?_smp_mflags}
 
 #%check
@@ -70,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 10 2009 William Cohen <wcohen at redhat.com> - 3.7.2-3
+- Adjust configure.
+
 * Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-2
 - Remove dependency on kernel-devel.
 



From jgu at fedoraproject.org  Thu Dec 10 21:01:27 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 21:01:27 +0000 (UTC)
Subject: rpms/shorewall/devel shorewall.spec,1.94,1.95
Message-ID: <20091210210127.1572811C025D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12181

Modified Files:
	shorewall.spec 
Log Message:
* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-3
- Fix typo in logrotate script name for shorewall6-lite



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- shorewall.spec	10 Dec 2009 20:53:27 -0000	1.94
+++ shorewall.spec	10 Dec 2009 21:01:26 -0000	1.95
@@ -9,7 +9,7 @@
 
 Name:           shorewall
 Version:        %{shorewall_ver}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -323,7 +323,7 @@ fi
 %attr(0755,root,root) /sbin/shorewall6-lite
 %dir %{_sysconfdir}/shorewall6-lite
 %config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6-lite
 %attr(0755,root,root) %{_initrddir}/shorewall6-lite
 %{_sysconfdir}/shorewall6-lite/Makefile
 %dir %{_localstatedir}/lib/shorewall6-lite
@@ -339,6 +339,9 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-3
+- Fix typo in logrotate script name for shorewall6-lite
+
 * Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-2
 - Add logrotate files to packages
 



From imain at fedoraproject.org  Thu Dec 10 21:01:40 2009
From: imain at fedoraproject.org (Ian Main)
Date: Thu, 10 Dec 2009 21:01:40 +0000 (UTC)
Subject: File libvirt-qpid-0.2.17.tar.gz uploaded to lookaside cache by imain
Message-ID: <20091210210140.5850F10F89C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libvirt-qpid:

42df86bafa5c4d63762ca110b8067710  libvirt-qpid-0.2.17.tar.gz



From imain at fedoraproject.org  Thu Dec 10 21:02:13 2009
From: imain at fedoraproject.org (Ian Main)
Date: Thu, 10 Dec 2009 21:02:13 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-11 libvirt-qpid.spec, 1.12, 1.13 sources, 1.10,
	1.11
Message-ID: <20091210210213.05D4F11C025D@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12465

Modified Files:
	libvirt-qpid.spec sources 
Log Message:
Don't need -lqmfengine.



Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-11/libvirt-qpid.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libvirt-qpid.spec	6 Nov 2009 21:07:07 -0000	1.12
+++ libvirt-qpid.spec	10 Dec 2009 21:02:12 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
 Version: 0.2.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -73,6 +73,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 
 
 %changelog
+* Thu Dec 10 2009 Ian Main <imain at redhat.com> - 0.2.17-3
+- Woops, don't need -lqmfengine.
+
 * Thu Nov 05 2009 Ian Main <imain at redhat.com> - 0.2.17-2
 - Fix libraries for new qpidc in src.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Nov 2009 21:11:26 -0000	1.10
+++ sources	10 Dec 2009 21:02:12 -0000	1.11
@@ -1,2 +1,2 @@
 22eb0647caaed1a47bac9bb791befa2e  libvirt-qpid-0.2.17-2.fc11.src.rpm
-25d9a4040fd0311b8774b6fa8254c1d2  libvirt-qpid-0.2.17.tar.gz
+42df86bafa5c4d63762ca110b8067710  libvirt-qpid-0.2.17.tar.gz



From imain at fedoraproject.org  Thu Dec 10 21:03:29 2009
From: imain at fedoraproject.org (Ian Main)
Date: Thu, 10 Dec 2009 21:03:29 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-12 libvirt-qpid.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <20091210210329.8D78311C025D@cvs1.fedora.phx.redhat.com>

Author: imain

Update of /cvs/pkgs/rpms/libvirt-qpid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12905

Modified Files:
	libvirt-qpid.spec sources 
Log Message:
don't need -lqmfengine



Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-12/libvirt-qpid.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libvirt-qpid.spec	2 Oct 2009 22:55:33 -0000	1.9
+++ libvirt-qpid.spec	10 Dec 2009 21:03:29 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
 Version: 0.2.17
-Release: 1%{?dist}
+Release: 3%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -32,9 +32,6 @@ a set of objects with properties and met
 
 %prep
 %setup -q
-# these libraries got renamed in the latest qmf
-sed -i -e 's/-lqmfcommon -lqmfagent/-lqmfengine -lqmf/g' src/Makefile.am
-sed -i -e 's/-lqmfcommon -lqmfagent/-lqmfengine -lqmf/g' src/Makefile.in
 
 %build
 %configure
@@ -76,6 +73,12 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 
 
 %changelog
+* Thu Dec 10 2009 Ian Main <imain at redhat.com> - 0.2.17-3
+- Woops, don't need -lqmfengine.
+
+* Thu Nov 05 2009 Ian Main <imain at redhat.com> - 0.2.17-2
+- Fix libraries for new qpidc in src.
+
 * Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.17-1
 - Rebuild for new qpidc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jul 2009 18:26:53 -0000	1.7
+++ sources	10 Dec 2009 21:03:29 -0000	1.8
@@ -1 +1 @@
-e8a5cde1299426f9a0c6fe72e6008d7c  libvirt-qpid-0.2.17.tar.gz
+42df86bafa5c4d63762ca110b8067710  libvirt-qpid-0.2.17.tar.gz



From wcohen at fedoraproject.org  Thu Dec 10 21:06:24 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu, 10 Dec 2009 21:06:24 +0000 (UTC)
Subject: rpms/papi/F-12 papi-3.7.2-config.patch, NONE, 1.1 papi.spec, 1.4,
	1.5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091210210624.6A27711C025D@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/papi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13718

Modified Files:
	papi.spec .cvsignore sources 
Added Files:
	papi-3.7.2-config.patch 
Log Message:
* Thu Dec 10 2009 William Cohen <wcohen at redhat.com> - 3.7.2-3
- Adjust configure.

* Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-2
- Remove dependency on kernel-devel.

* Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-1
- Import papi-3.7.2.



papi-3.7.2-config.patch:
 configure.in |   92 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

--- NEW FILE papi-3.7.2-config.patch ---
diff -up papi-3.7.2/src/configure.in.header papi-3.7.2/src/configure.in
--- papi-3.7.2/src/configure.in.header	2009-12-10 15:05:09.000000000 -0500
+++ papi-3.7.2/src/configure.in	2009-12-10 15:05:13.000000000 -0500
@@ -1013,61 +1013,63 @@ AC_ARG_WITH(pfm_libdir,
             )
 
 # PCL start
-# set PCL manually set with --with-pcl, 
-# or by default if perfctr and perfmon are not available
-# and linux kernel version is >= 31
-
-if test "$cross_compiling" = "no" -a "$OS" = "linux" -a "`uname -r | grep "2.6."`"; then
-# gives the position in $OSVER of *first* character in substring "2.6."
-POS1=`expr index "$OSVER" "2.6."`
-POS2=`expr $POS1 + 4`
-VERS=`expr substr "$OSVER" "$POS2" 2`
-
-# Version 2.6.31 of the kernel uses perf_counter.h and all subsequent versions use perf_event.h
-if test "$VERS" = "31"; then
-  perf_header="perf_counter.h"
-  CFLAGS="$CFLAGS -DKERNEL31"
-elif test "$VERS" -gt 31; then
-  perf_header="perf_event.h"
+if test "x$perfctr" != "xyes" -a "$perfmon" = "0"; then
+
+# Try to find perf_event.h or perf_counter.h on
+# user specific path or default of /usr/include/linux
+AC_ARG_WITH(pcl_incdir,
+	   [  --with-pcl-incdir=<path>	Specify path to the correct perf event header file],
+  [
+case "$with_pcl_incdir" in
+yes) AC_MSG_ERROR([--with-pcl-incdir requires an argument]) ;;
+''|no) ;;
+*) pcl_incdir=$with_pcl_incdir ;;
+esac],
+[pcl_incdir="/usr/include/linux"])
+
+# Linux 2.6.32 and newer check
+AC_CHECK_FILE($pcl_incdir/perf_event.h,
+	[pcl="yes" PCLPATH="$pcl_incdir/perf_event.h"])
+
+# Linux 2.6.31 check
+if test "x$PCLPATH" = "x"; then
+AC_CHECK_FILE($pcl_incdir/perf_counter.h,
+	[pcl="yes" PCLPATH="$pcl_incdir/perf_counter.h"
+	   CFLAGS="$CFLAGS -DKERNEL31"])
 fi
 
-if test "${VERS}" -ge 31; then
 AC_ARG_WITH(pcl,
             [  --with-pcl=<yes,no>		Specify existence of Performance Counters for Linux],
-            [pcl=$withval
-             AC_CHECK_FILE(/lib/modules/$OSVER/source/include/linux/$perf_header, [ pcl="yes"
-               PCLPATH="/lib/modules/$OSVER/source/include/linux/$perf_header"],
-                [ pcl="no" ])
-            ],
-            [if test "$perfctr" = "no" -a "$perfmon" = "0"; then
-              AC_CHECK_FILE(/lib/modules/$OSVER/source/include/linux/$perf_header, [ pcl="yes"
-               PCLPATH="/lib/modules/$OSVER/source/include/linux/$perf_header"],
-                [ pcl="no" ])
-             fi
-            ])
-elif test "$perfctr" = "no" -a "$perfmon" = "0"; then
-AC_MSG_ERROR([PAPI requires a patch for any kernel older than 2.6.31])
+            [pcl=$withval])
+
+#fall back check for the perf_event.h or perf_counter.h in -devel for running
+#linux kernel
+if test "x$cross_compiling" != "xyes" -a "$OS" = "linux" -a "x$PCLPATH" = "x"; then
+
+pcl_incdir="/lib/modules/$OSVER/source/include/linux"
+
+# Linux 2.6.32 and newer check
+AC_CHECK_FILE($pcl_incdir/perf_event.h,
+	[pcl="yes" PCLPATH="$pcl_incdir/perf_event.h"])
+
+# Linux 2.6.31 check
+if test "x$PCLPATH" = "x"; then
+AC_CHECK_FILE($pcl_incdir/perf_counter.h,
+	[pcl="yes" PCLPATH="$pcl_incdir/perf_counter.h"
+	   CFLAGS="$CFLAGS -DKERNEL31"])
+fi
+
+if test "x$PCLPATH" = "x"; then
+  pcl=no
 fi
 
-# If we are running a PCL kernel, the correct include file should have been found in 
-# /lib/modules/$OSVER/source/include/linux. If the file was not found
-# see if the user has set a path and ensure it can be found there
-if test "$pcl" = "no"; then
-AC_ARG_WITH(pcl_incdir,
-	   [  --with-pcl-incdir=<path>	Specify path to the correct perf event header file],
-	   [pcl_incdir=$withval
-	     AC_CHECK_FILE($pcl_incdir/$perf_header, [pcl="yes"
-              PCLPATH="$pcl_incdir/$perf_header"], 
-		[AC_MSG_ERROR([$perf_header could not be found at $pcl_incdir])])
-           ],
-           [if test "$perfctr" = "no" -a "$perfmon" = "0"; then
-            AC_MSG_ERROR([$perf_header could not be found and no patch is installed.])
-            fi
-           ])
 fi
 fi
 # PCL end
 
+if test "x$pcl" != "xyes" -a "x$perfctr" != "xyes" -a "$perfmon" = "0"; then
+  AC_MSG_ERROR([No performance monitoring interface available])
+fi
 
 AC_ARG_WITH(pmapi,
             [  --with-pmapi=<path>		Specify path of pmapi on aix system ],


Index: papi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papi/F-12/papi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- papi.spec	19 Nov 2009 16:33:53 -0000	1.4
+++ papi.spec	10 Dec 2009 21:06:23 -0000	1.5
@@ -1,16 +1,18 @@
 Summary: Performance Application Programming Interface
 Name: papi
-Version: 3.7.1
-Release: 4%{?dist}
+Version: 3.7.2
+Release: 3%{?dist}
 License: BSD
 Group: Development/System
 URL: http://icl.cs.utk.edu/papi/
 Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
+Patch1: papi-3.7.2-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
+BuildRequires: kernel-headers >= 2.6.31
 BuildRequires: gcc-gfortran
-BuildRequires: kernel-devel >= 2.6.31
 BuildRequires: chrpath
+BuildRequires: autoconf
 #Right now libpfm does not know anything about s390 and will fail
 ExcludeArch: s390, s390x
 
@@ -30,11 +32,12 @@ that uses PAPI.
 %prep
 %setup -q
 
+%patch1 -p1 -b .header
+
 %build
 cd src
-PERF_HEAD=`ls /usr/src/kernels/*/include/linux/perf_counter.h|sort |tail -n 1` || exit 1
-PERF_HEADER=`dirname $PERF_HEAD`
-%configure --with-pcl=yes --with-pcl-incdir=$PERF_HEADER --disable-static
+autoconf
+%configure --disable-static
 make %{?_smp_mflags}
 
 #%check
@@ -72,6 +75,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 10 2009 William Cohen <wcohen at redhat.com> - 3.7.2-3
+- Adjust configure.
+
+* Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-2
+- Remove dependency on kernel-devel.
+
+* Mon Dec 9 2009 William Cohen <wcohen at redhat.com> - 3.7.2-1
+- Import papi-3.7.2.
+
 * Thu Nov 19 2009 William Cohen <wcohen at redhat.com> - 3.7.1-4
 - Exclude s390 and s390x.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papi/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Nov 2009 19:49:02 -0000	1.3
+++ .cvsignore	10 Dec 2009 21:06:24 -0000	1.4
@@ -1 +1 @@
-papi-3.7.1.tar.gz
+papi-3.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papi/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Nov 2009 19:49:02 -0000	1.3
+++ sources	10 Dec 2009 21:06:24 -0000	1.4
@@ -1 +1 @@
-c9d9b073e62bc36dc13d5aa1ee65ec4e  papi-3.7.1.tar.gz
+2138a961b184046a863a5350937b89c8  papi-3.7.2.tar.gz



From kraxel at fedoraproject.org  Thu Dec 10 21:06:32 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Thu, 10 Dec 2009 21:06:32 +0000 (UTC)
Subject: rpms/xen/devel xen.modules,1.3,1.4 xen.spec,1.251,1.252
Message-ID: <20091210210632.32CD311C025D@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13883

Modified Files:
	xen.modules xen.spec 
Log Message:
adapt module load script to evtchn.ko -> xen-evtchn.ko rename


Index: xen.modules
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.modules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xen.modules	6 Mar 2009 11:26:51 -0000	1.3
+++ xen.modules	10 Dec 2009 21:06:31 -0000	1.4
@@ -5,6 +5,6 @@ test -f /proc/xen/capabilities			|| moun
 test -f /proc/xen/capabilities			|| exit 0
 grep -q "control_d" /proc/xen/capabilities	|| exit 0
 
-for module in evtchn blkbk netbk; do
+for module in xen-evtchn evtchn blkbk netbk; do
 	modprobe ${module} >/dev/null 2>&1
 done


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- xen.spec	10 Dec 2009 13:31:28 -0000	1.251
+++ xen.spec	10 Dec 2009 21:06:31 -0000	1.252
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -454,6 +454,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Thu Dec 10 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.2-2
+- adapt module load script to evtchn.ko -> xen-evtchn.ko rename.
+
 * Thu Dec 10 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.2-1
 - update to 3.4.2 release.
 - drop backport patches.



From jgu at fedoraproject.org  Thu Dec 10 21:07:40 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 10 Dec 2009 21:07:40 +0000 (UTC)
Subject: rpms/shorewall/F-12 shorewall.spec,1.93,1.94
Message-ID: <20091210210740.D664C11C025D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14397

Modified Files:
	shorewall.spec 
Log Message:
* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> -
  4.4.4.2-3
- Fix typo in logrotate script name for shorewall6-lite

* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> -
  4.4.4.2-2
- Add logrotate files to packages




Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-12/shorewall.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- shorewall.spec	10 Dec 2009 20:34:02 -0000	1.93
+++ shorewall.spec	10 Dec 2009 21:07:40 -0000	1.94
@@ -9,7 +9,7 @@
 
 Name:           shorewall
 Version:        %{shorewall_ver}
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -195,6 +195,7 @@ fi
 %attr(0755,root,root) /sbin/shorewall
 %dir %{_sysconfdir}/shorewall
 %config(noreplace) %{_sysconfdir}/shorewall/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall
 
 %dir %{_datadir}/shorewall
 %attr(0755,root,root) %{_datadir}/shorewall/wait4ifup
@@ -251,9 +252,11 @@ fi
 %attr(0755,root,root) /sbin/shorewall-lite
 %dir %{_sysconfdir}/shorewall-lite
 %config(noreplace) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall-lite
 %{_sysconfdir}/shorewall-lite/Makefile
 %attr(0755,root,root) %{_initrddir}/shorewall-lite
 %dir %{_localstatedir}/lib/shorewall-lite
+
 %dir %{_datadir}/shorewall-lite
 %{_datadir}/shorewall-lite/version
 %{_datadir}/shorewall-lite/configpath
@@ -273,6 +276,7 @@ fi
 %attr(0755,root,root) /sbin/shorewall6
 %dir %{_sysconfdir}/shorewall6
 %config(noreplace) %{_sysconfdir}/shorewall6/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6
 
 # Man files - can't use wildcard as shorewall6-lite also installs some man files
 %{_mandir}/man5/shorewall6-accounting.5.gz
@@ -319,6 +323,7 @@ fi
 %attr(0755,root,root) /sbin/shorewall6-lite
 %dir %{_sysconfdir}/shorewall6-lite
 %config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6-lite
 %attr(0755,root,root) %{_initrddir}/shorewall6-lite
 %{_sysconfdir}/shorewall6-lite/Makefile
 %dir %{_localstatedir}/lib/shorewall6-lite
@@ -334,6 +339,12 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-3
+- Fix typo in logrotate script name for shorewall6-lite
+
+* Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-2
+- Add logrotate files to packages
+
 * Thu Dec 10 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.4.2-1
 - Update to 4.4.4.2
 



From dwalsh at fedoraproject.org  Thu Dec 10 21:30:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Dec 2009 21:30:15 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.9,1.10
Message-ID: <20091210213015.5694D11C03FC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20267

Modified Files:
	policy-F13.patch 
Log Message:
* Fri Dec 4 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-1
- Update to upstream release


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   77 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  111 +
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   31 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   45 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++
 policy/modules/kernel/files.te            |    2 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  127 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  460 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  116 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   24 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |    8 
 policy/modules/services/nut.if            |   82 +
 policy/modules/services/nut.te            |  127 ++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  629 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   25 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1683 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 382 files changed, 19066 insertions(+), 2974 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- policy-F13.patch	10 Dec 2009 20:17:27 -0000	1.9
+++ policy-F13.patch	10 Dec 2009 21:30:13 -0000	1.10
@@ -3562,7 +3562,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.7.4/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/mozilla.te	2009-12-04 12:39:47.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/mozilla.te	2009-12-10 15:39:39.000000000 -0500
 @@ -91,6 +91,7 @@
  corenet_raw_sendrecv_generic_node(mozilla_t)
  corenet_tcp_sendrecv_http_port(mozilla_t)
@@ -3606,7 +3606,7 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	pulseaudio_exec(mozilla_t)
 +	pulseaudio_stream_connect(mozilla_t)
-+	pulseaudio_manage_config(mozilla_t)
++	pulseaudio_manage_home(mozilla_t)
  ')
  
  optional_policy(`
@@ -3965,7 +3965,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.7.4/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/nsplugin.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/nsplugin.te	2009-12-10 15:42:06.000000000 -0500
 @@ -0,0 +1,296 @@
 +
 +policy_module(nsplugin, 1.0.0)
@@ -4255,7 +4255,7 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	pulseaudio_exec(nsplugin_t)
 +	pulseaudio_stream_connect(nsplugin_t)
-+	pulseaudio_manage_config(nsplugin_t)
++	pulseaudio_manage_home(nsplugin_t)
 +')
 +
 +optional_policy(`
@@ -4498,7 +4498,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.7.4/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/pulseaudio.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/pulseaudio.te	2009-12-10 15:49:17.000000000 -0500
 @@ -11,6 +11,9 @@
  application_domain(pulseaudio_t, pulseaudio_exec_t)
  role system_r types pulseaudio_t;
@@ -4534,7 +4534,7 @@ diff -b -B --ignore-all-space --exclude-
 +	bluetooth_stream_connect(pulseaudio_t)
  ')
  
-+userdom_search_user_home_dirs($1)
++userdom_search_user_home_dirs(pulseaudio_t)
 +manage_dirs_pattern(pulseaudio_t, pulseaudio_home_t, pulseaudio_home_t)
 +manage_files_pattern(pulseaudio_t, pulseaudio_home_t, pulseaudio_home_t)
 +
@@ -8755,8 +8755,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.7.4/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.te	2009-12-09 10:12:48.000000000 -0500
-@@ -0,0 +1,459 @@
++++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.te	2009-12-10 15:25:41.000000000 -0500
+@@ -0,0 +1,460 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -8930,6 +8930,7 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
 +		xserver_rw_shm(unconfined_usertype)
 +		xserver_run_xauth(unconfined_usertype, unconfined_r)
++		xserver_xdm_dbus_chat(unconfined_usertype)
 +	')
 +')
 +
@@ -14465,7 +14466,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_sendrecv_generic_if(fetchmail_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.7.4/policy/modules/services/fprintd.te
 --- nsaserefpolicy/policy/modules/services/fprintd.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/fprintd.te	2009-12-05 06:04:00.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/fprintd.te	2009-12-10 15:34:41.000000000 -0500
 @@ -37,6 +37,8 @@
  files_read_etc_files(fprintd_t)
  files_read_usr_files(fprintd_t)
@@ -14475,12 +14476,11 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(fprintd_t)
  
  miscfiles_read_localization(fprintd_t)
-@@ -51,5 +53,9 @@
+@@ -51,5 +53,8 @@
  optional_policy(`
  	policykit_read_reload(fprintd_t)
  	policykit_read_lib(fprintd_t)
 +	policykit_dbus_chat(fprintd_t)
-+	policykit_auth_dbus_chat(fprintd_t)
  	policykit_domtrans_auth(fprintd_t)
 +	policykit_dbus_chat_auth(fprintd_t)
  ')
@@ -17906,8 +17906,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/plymouth(/.*)?				gen_context(system_u:object_r:plymouthd_var_run_t, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.if serefpolicy-3.7.4/policy/modules/services/plymouth.if
 --- nsaserefpolicy/policy/modules/services/plymouth.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/plymouth.if	2009-12-04 12:33:34.000000000 -0500
-@@ -0,0 +1,286 @@
++++ serefpolicy-3.7.4/policy/modules/services/plymouth.if	2009-12-10 15:27:39.000000000 -0500
+@@ -0,0 +1,304 @@
 +## <summary>policy for plymouthd</summary>
 +
 +########################################
@@ -17930,6 +17930,24 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	Execute a plymoth in the current domain
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`plymouth_exec', `
++	gen_require(`
++		type plymouthd_exec_t;
++	')
++
++	can_exec($1, plymouthd_exec_t)
++')
++
++########################################
++## <summary>
 +##	Execute a domain transition to run plymouthd.
 +## </summary>
 +## <param name="domain">
@@ -18196,8 +18214,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.te serefpolicy-3.7.4/policy/modules/services/plymouth.te
 --- nsaserefpolicy/policy/modules/services/plymouth.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/plymouth.te	2009-12-04 12:33:34.000000000 -0500
-@@ -0,0 +1,101 @@
++++ serefpolicy-3.7.4/policy/modules/services/plymouth.te	2009-12-10 15:30:43.000000000 -0500
+@@ -0,0 +1,102 @@
 +policy_module(plymouthd, 1.0.0)
 +
 +########################################
@@ -18256,6 +18274,7 @@ diff -b -B --ignore-all-space --exclude-
 +files_read_usr_files(plymouthd_t)
 +
 +miscfiles_read_localization(plymouthd_t)
++miscfiles_read_fonts(plymouthd_t)
 +
 +manage_dirs_pattern(plymouthd_t, plymouthd_var_run_t,  plymouthd_var_run_t)
 +manage_files_pattern(plymouthd_t, plymouthd_var_run_t,  plymouthd_var_run_t)
@@ -18319,7 +18338,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.7.4/policy/modules/services/policykit.if
 --- nsaserefpolicy/policy/modules/services/policykit.if	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/policykit.if	2009-12-05 06:04:03.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/policykit.if	2009-12-10 15:31:44.000000000 -0500
 @@ -17,12 +17,37 @@
  		class dbus send_msg;
  	')
@@ -24046,8 +24065,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/vhostmd.te serefpolicy-3.7.4/policy/modules/services/vhostmd.te
 --- nsaserefpolicy/policy/modules/services/vhostmd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/vhostmd.te	2009-12-09 13:28:27.000000000 -0500
-@@ -0,0 +1,91 @@
++++ serefpolicy-3.7.4/policy/modules/services/vhostmd.te	2009-12-10 16:06:39.000000000 -0500
+@@ -0,0 +1,86 @@
 +
 +policy_module(vhostmd,1.0.0)
 +
@@ -24134,11 +24153,6 @@ diff -b -B --ignore-all-space --exclude-
 +    xen_stream_connect_xenstore(vhostmd_t)
 +    xen_stream_connect_xm(vhostmd_t)
 +')
-+
-+optional_policy(`
-+    xm_stream_connect(vhostmd_t)
-+')
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.7.4/policy/modules/services/virt.fc
 --- nsaserefpolicy/policy/modules/services/virt.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.4/policy/modules/services/virt.fc	2009-12-04 12:33:34.000000000 -0500
@@ -25964,7 +25978,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.7.4/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/xserver.te	2009-12-09 11:40:20.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/xserver.te	2009-12-10 15:28:09.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -policy_module(xserver, 3.3.1)
@@ -26581,7 +26595,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -547,6 +675,38 @@
+@@ -547,6 +675,39 @@
  ')
  
  optional_policy(`
@@ -26598,6 +26612,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	plymouth_search_spool(xdm_t)
++	plymouth_exec(xdm_t)
 +')
 +
 +optional_policy(`
@@ -26620,7 +26635,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -555,8 +715,9 @@
+@@ -555,8 +716,9 @@
  ')
  
  optional_policy(`
@@ -26632,7 +26647,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -565,7 +726,6 @@
+@@ -565,7 +727,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -26640,7 +26655,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -576,6 +736,10 @@
+@@ -576,6 +737,10 @@
  ')
  
  optional_policy(`
@@ -26651,7 +26666,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -584,14 +748,6 @@
+@@ -584,14 +749,6 @@
  # X server local policy
  #
  
@@ -26666,7 +26681,7 @@ diff -b -B --ignore-all-space --exclude-
  # setuid/setgid for the wrapper program to change UID
  # sys_rawio is for iopl access - should not be needed for frame-buffer
  # sys_admin, locking shared mem?  chowning IPC message queues or semaphores?
-@@ -600,10 +756,9 @@
+@@ -600,10 +757,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -26678,7 +26693,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -615,13 +770,31 @@
+@@ -615,13 +771,31 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -26711,7 +26726,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -634,12 +807,19 @@
+@@ -634,12 +808,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -26733,7 +26748,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -673,7 +853,6 @@
+@@ -673,7 +854,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -26741,7 +26756,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -683,9 +862,12 @@
+@@ -683,9 +863,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -26755,7 +26770,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -700,8 +882,12 @@
+@@ -700,8 +883,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -26768,7 +26783,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -723,6 +909,7 @@
+@@ -723,6 +910,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -26776,7 +26791,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -745,7 +932,7 @@
+@@ -745,7 +933,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -26785,7 +26800,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -754,17 +941,15 @@
+@@ -754,17 +942,15 @@
  	# but typeattribute doesnt work in conditionals
  
  	allow xserver_t xserver_t:x_server *;
@@ -26806,7 +26821,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow xserver_t xextension_type:x_extension *;
  	allow xserver_t { x_domain xserver_t }:x_resource *;
  	allow xserver_t xevent_type:{ x_event x_synthetic_event } *;
-@@ -779,12 +964,20 @@
+@@ -779,12 +965,20 @@
  ')
  
  optional_policy(`
@@ -26828,7 +26843,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -811,12 +1004,12 @@
+@@ -811,12 +1005,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -26845,7 +26860,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Run xkbcomp.
  allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -832,9 +1025,14 @@
+@@ -832,9 +1026,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -26860,7 +26875,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -849,11 +1047,14 @@
+@@ -849,11 +1048,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -26876,7 +26891,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -867,150 +1068,163 @@
+@@ -867,150 +1069,163 @@
  #
  
  # Hacks
@@ -31923,7 +31938,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.7.4/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.if	2009-12-09 09:46:14.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.if	2009-12-10 15:29:06.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -33625,7 +33640,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3390,638 @@
+@@ -3064,3 +3390,656 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -34264,6 +34279,24 @@ diff -b -B --ignore-all-space --exclude-
 +	read_files_pattern($1, home_cert_t, home_cert_t)
 +	read_lnk_files_pattern($1, home_cert_t, home_cert_t)
 +')
++
++########################################
++## <summary>
++##	dontaudit Search getatrr /root files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_getattr_admin_home_files',`
++	gen_require(`
++		type admin_home_t;
++	')
++
++	dontaudit $1 admin_home_t:file getattr;
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-11-17 10:54:26.000000000 -0500
 +++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-04 12:33:34.000000000 -0500



From ensc at fedoraproject.org  Thu Dec 10 21:30:24 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 10 Dec 2009 21:30:24 +0000 (UTC)
Subject: rpms/dhcp-forwarder/devel dhcp-forwarder.upstart,1.3,1.4
Message-ID: <20091210213024.4C79411C04B6@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20391/devel

Modified Files:
	dhcp-forwarder.upstart 
Log Message:
optimized upstart script and start on runlevel 345 only



Index: dhcp-forwarder.upstart
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.upstart,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dhcp-forwarder.upstart	6 Dec 2009 11:13:49 -0000	1.3
+++ dhcp-forwarder.upstart	10 Dec 2009 21:30:24 -0000	1.4
@@ -1,9 +1,7 @@
 ### Uncomment *one* of the 'start' lines below
-#start on starting local
+#start on runlevel [345] and starting local
 
-stop  on (runlevel 0 or
-          runlevel 1 or
-          runlevel 6)
+stop  on runlevel [!345]
 
 respawn
 exec /usr/sbin/dhcp-fwd -n -c /etc/dhcp-fwd.conf



From ensc at fedoraproject.org  Thu Dec 10 21:31:35 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 10 Dec 2009 21:31:35 +0000 (UTC)
Subject: rpms/ip-sentinel/devel ip-sentinel.upstart,1.3,1.4
Message-ID: <20091210213135.3B6E211C025D@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20772

Modified Files:
	ip-sentinel.upstart 
Log Message:
optimized upstart script and start on runlevel 345 only



Index: ip-sentinel.upstart
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.upstart,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ip-sentinel.upstart	6 Dec 2009 11:10:44 -0000	1.3
+++ ip-sentinel.upstart	10 Dec 2009 21:31:35 -0000	1.4
@@ -2,11 +2,9 @@
 # before service can be enabled
 
 ### Uncomment *one* 'start' line below
-#start on starting local
+#start on runlevel [345] and starting local
 
-stop  on (runlevel 0 or
-          runlevel 1 or
-          runlevel 6)
+stop  on runlevel [!345]
 
 respawn
 exec /usr/sbin/ip-sentinel -u ip-sentinel -g ip-sentinel -n eth0



From ensc at fedoraproject.org  Thu Dec 10 21:32:22 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 10 Dec 2009 21:32:22 +0000 (UTC)
Subject: rpms/clamav/devel clamd.scan.upstart, 1.4, 1.5 clamav-milter.upstart,
	1.5, 1.6
Message-ID: <20091210213222.78A4811C025D@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21036

Modified Files:
	clamd.scan.upstart clamav-milter.upstart 
Log Message:
optimized upstart scripts and start on runlevel 345 only



Index: clamd.scan.upstart
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamd.scan.upstart,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- clamd.scan.upstart	6 Dec 2009 11:18:53 -0000	1.4
+++ clamd.scan.upstart	10 Dec 2009 21:32:22 -0000	1.5
@@ -6,11 +6,9 @@
 
 ### Uncomment this line when you want clamd.scan to be a generic
 ### scanner service
-#start on starting local
+#start on runlevel [345] and starting local
 
-stop  on (runlevel 0 or
-	  runlevel 1 or
-	  runlevel 6)
+stop  on runlevel [!345]
 
 respawn
 exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes


Index: clamav-milter.upstart
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav-milter.upstart,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- clamav-milter.upstart	6 Dec 2009 11:18:53 -0000	1.5
+++ clamav-milter.upstart	10 Dec 2009 21:32:22 -0000	1.6
@@ -6,11 +6,9 @@
 
 ### Uncomment these lines when you want clamav-milter to be a milter
 ### for a remotely running MTA
-#start on starting local
+#start on runlevel [345] and starting local
 
-stop  on (runlevel 0 or
-          runlevel 1 or
-          runlevel 6)
+stop  on runlevel [!345]
 
 respawn
 exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes



From ensc at fedoraproject.org  Thu Dec 10 21:32:59 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 10 Dec 2009 21:32:59 +0000 (UTC)
Subject: rpms/milter-greylist/devel milter-greylist.upstart,1.3,1.4
Message-ID: <20091210213259.6C5AC11C025D@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21227/devel

Modified Files:
	milter-greylist.upstart 
Log Message:
optimized upstart script and start on runlevel 345 only



Index: milter-greylist.upstart
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.upstart,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- milter-greylist.upstart	6 Dec 2009 10:50:23 -0000	1.3
+++ milter-greylist.upstart	10 Dec 2009 21:32:59 -0000	1.4
@@ -3,7 +3,7 @@
 ### Uncomment this line when you want milter-greylist to be a milter
 ### for a remote machine.
 
-#start on starting local
+#start on runlevel [345] and starting local
 
 
 ### Uncomment this line when you run want milter-greylist to be a
@@ -18,9 +18,7 @@
 #start on starting postfix
 
 
-stop  on (runlevel 0 or
-          runlevel 1 or
-          runlevel 6)
+stop  on runlevel [^345]
 
 respawn
 exec /usr/sbin/milter-greylist -D



From ensc at fedoraproject.org  Thu Dec 10 21:33:40 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 10 Dec 2009 21:33:40 +0000 (UTC)
Subject: rpms/tor/devel tor.upstart,1.5,1.6
Message-ID: <20091210213340.DBFCF11C025D@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21451

Modified Files:
	tor.upstart 
Log Message:
optimized upstart script and start on runlevel 345 only



Index: tor.upstart
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.upstart,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tor.upstart	6 Dec 2009 10:42:26 -0000	1.5
+++ tor.upstart	10 Dec 2009 21:33:40 -0000	1.6
@@ -1,10 +1,8 @@
 ### Uncomment matching 'start' lines below.
 
-#start on starting local
+#start on runlevel [345] and starting local
 
-stop  on (runlevel 0 or
-          runlevel 1 or
-          runlevel 6)
+stop  on runlevel [!345]
 
 limit nofile 4096
 



From dwalsh at fedoraproject.org  Thu Dec 10 21:38:25 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 10 Dec 2009 21:38:25 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.152,
	1.153 selinux-policy.spec, 1.980, 1.981
Message-ID: <20091210213825.2656811C025D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22917

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Dec 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-58
- Dontaudit udp_socket leaks for xauth_t


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   13 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   10 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |   80 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   43 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   45 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |   13 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  417 +++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  127 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  450 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  116 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  410 ++++---
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   25 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   21 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   51 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  117 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  276 ++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  637 ++++++++++-
 policy/modules/services/xserver.te        |  368 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   75 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  184 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   82 +
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1685 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 407 files changed, 20787 insertions(+), 2822 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- policy-F12.patch	9 Dec 2009 19:53:38 -0000	1.152
+++ policy-F12.patch	10 Dec 2009 21:38:24 -0000	1.153
@@ -666,8 +666,34 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.32/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-12-03 13:45:10.000000000 -0500
-@@ -151,11 +151,11 @@
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.if	2009-12-10 15:16:57.000000000 -0500
+@@ -21,6 +21,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Execute the prelink program in the current domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`prelink_exec',`
++	gen_require(`
++		type prelink_exec_t;
++	')
++
++	corecmd_search_bin($1)
++	can_exec($1, prelink_exec_t)
++')
++
++########################################
++## <summary>
+ ##	Execute the prelink program in the prelink domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -151,11 +170,11 @@
  ##	</summary>
  ## </param>
  #
@@ -3635,7 +3661,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.6.32/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-12-10 16:33:27.000000000 -0500
 @@ -59,6 +59,7 @@
  manage_files_pattern(mozilla_t, mozilla_home_t, mozilla_home_t)
  manage_lnk_files_pattern(mozilla_t, mozilla_home_t, mozilla_home_t)
@@ -3694,7 +3720,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_user_x_domain_template(mozilla, mozilla_t, mozilla_tmpfs_t)
  xserver_dontaudit_read_xdm_tmp_files(mozilla_t)
-@@ -231,11 +233,15 @@
+@@ -231,11 +233,20 @@
  optional_policy(`
  	dbus_system_bus_client(mozilla_t)
  	dbus_session_bus_client(mozilla_t)
@@ -3707,10 +3733,15 @@ diff -b -B --ignore-all-space --exclude-
  	gnome_stream_connect_gconf(mozilla_t)
  	gnome_manage_config(mozilla_t)
 +	gnome_manage_gconf_home_files(mozilla_t)
++')
++
++optional_policy(`
++	pulseaudio_exec(mozilla_t)
++	pulseaudio_stream_connect(mozilla_t)
  ')
  
  optional_policy(`
-@@ -256,5 +262,10 @@
+@@ -256,5 +267,10 @@
  ')
  
  optional_policy(`
@@ -4065,7 +4096,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.32/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.te	2009-12-10 15:41:45.000000000 -0500
 @@ -0,0 +1,295 @@
 +
 +policy_module(nsplugin, 1.0.0)
@@ -7282,7 +7313,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-05 18:26:09.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-10 10:34:27.000000000 -0500
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -9979,8 +10010,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-09 10:12:44.000000000 -0500
-@@ -0,0 +1,449 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-10 15:25:20.000000000 -0500
+@@ -0,0 +1,450 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -10155,6 +10186,7 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
 +		xserver_rw_shm(unconfined_usertype)
 +		xserver_run_xauth(unconfined_usertype, unconfined_r)
++		xserver_xdm_dbus_chat(unconfined_usertype)
 +	')
 +')
 +
@@ -10843,7 +10875,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-06 09:56:21.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-10 13:05:08.000000000 -0500
 @@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -10923,7 +10955,7 @@ diff -b -B --ignore-all-space --exclude-
  
  sysnet_read_config(abrt_t)
  
-@@ -96,22 +124,84 @@
+@@ -96,22 +124,90 @@
  miscfiles_read_certs(abrt_t)
  miscfiles_read_localization(abrt_t)
  
@@ -10931,10 +10963,8 @@ diff -b -B --ignore-all-space --exclude-
 -# read ~/.abrt/Bugzilla.conf
 -userdom_read_user_home_content_files(abrt_t)
 +userdom_dontaudit_read_user_home_content_files(abrt_t)
- 
- optional_policy(`
--	dbus_connect_system_bus(abrt_t)
--	dbus_system_bus_client(abrt_t)
++
++optional_policy(`
 +	dbus_system_domain(abrt_t, abrt_exec_t)
 +')
 +
@@ -10952,6 +10982,14 @@ diff -b -B --ignore-all-space --exclude-
 +	policykit_domtrans_auth(abrt_t)
 +	policykit_read_lib(abrt_t)
 +	policykit_read_reload(abrt_t)
++')
+ 
+ optional_policy(`
+-	dbus_connect_system_bus(abrt_t)
+-	dbus_system_bus_client(abrt_t)
++	prelink_exec(abrt_t)
++	libs_exec_ld_so(abrt_t)
++	corecmd_exec_all_executables(abrt_t)
  ')
  
  # to install debuginfo packages 
@@ -13919,7 +13957,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.32/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-12-10 15:36:16.000000000 -0500
 @@ -21,7 +21,7 @@
  # consolekit local policy
  #
@@ -13929,11 +13967,12 @@ diff -b -B --ignore-all-space --exclude-
  allow consolekit_t self:process { getsched signal };
  allow consolekit_t self:fifo_file rw_fifo_file_perms;
  allow consolekit_t self:unix_stream_socket create_stream_socket_perms;
-@@ -59,16 +59,21 @@
+@@ -59,16 +59,22 @@
  term_use_all_terms(consolekit_t)
  
  auth_use_nsswitch(consolekit_t)
 +auth_manage_pam_console_data(consolekit_t)
++auth_dontaudit_write_login_records(consolekit_t)
  
  init_telinit(consolekit_t)
  init_rw_utmp(consolekit_t)
@@ -13951,7 +13990,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_read_user_tmp_files(consolekit_t)
  
  hal_ptrace(consolekit_t)
-@@ -84,9 +89,12 @@
+@@ -84,9 +90,12 @@
  ')
  
  optional_policy(`
@@ -13965,7 +14004,7 @@ diff -b -B --ignore-all-space --exclude-
  		hal_dbus_chat(consolekit_t)
  	')
  
-@@ -100,6 +108,7 @@
+@@ -100,6 +109,7 @@
  ')
  
  optional_policy(`
@@ -13973,7 +14012,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(consolekit_t)
  	policykit_read_lib(consolekit_t)
  	policykit_read_reload(consolekit_t)
-@@ -108,10 +117,21 @@
+@@ -108,10 +118,21 @@
  optional_policy(`
  	xserver_read_xdm_pid(consolekit_t)
  	xserver_read_user_xauth(consolekit_t)
@@ -15478,9 +15517,20 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(dnsmasq_t)
  ')
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.6.32/policy/modules/services/dovecot.fc
+--- nsaserefpolicy/policy/modules/services/dovecot.fc	2009-09-16 10:01:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.fc	2009-12-10 13:09:30.000000000 -0500
+@@ -34,6 +34,7 @@
+ 
+ /var/lib/dovecot(/.*)?			gen_context(system_u:object_r:dovecot_var_lib_t,s0)
+ 
++/var/log/dovecot(/.*)?			gen_context(system_u:object_r:dovecot_var_log_t,s0)
+ /var/log/dovecot\.log.*			gen_context(system_u:object_r:dovecot_var_log_t,s0)
+ 
+ /var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.6.32/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-10 13:13:04.000000000 -0500
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -15490,7 +15540,18 @@ diff -b -B --ignore-all-space --exclude-
  allow dovecot_t self:fifo_file rw_fifo_file_perms;
  allow dovecot_t self:tcp_socket create_stream_socket_perms;
  allow dovecot_t self:unix_dgram_socket create_socket_perms;
-@@ -103,6 +103,7 @@
+@@ -73,8 +73,9 @@
+ 
+ can_exec(dovecot_t, dovecot_exec_t)
+ 
++manage_dirs_pattern(dovecot_t, dovecot_var_log_t, dovecot_var_log_t)
+ manage_files_pattern(dovecot_t, dovecot_var_log_t, dovecot_var_log_t)
+-logging_log_filetrans(dovecot_t, dovecot_var_log_t, file)
++logging_log_filetrans(dovecot_t, dovecot_var_log_t, { file dir })
+ 
+ manage_dirs_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
+ manage_files_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
+@@ -103,6 +104,7 @@
  dev_read_urand(dovecot_t)
  
  fs_getattr_all_fs(dovecot_t)
@@ -15498,7 +15559,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_search_auto_mountpoints(dovecot_t)
  fs_list_inotifyfs(dovecot_t)
  
-@@ -142,6 +143,10 @@
+@@ -142,6 +144,10 @@
  ')
  
  optional_policy(`
@@ -15509,7 +15570,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(dovecot_t)
  ')
  
-@@ -159,7 +164,7 @@
+@@ -159,7 +165,7 @@
  #
  
  allow dovecot_auth_t self:capability { chown dac_override setgid setuid };
@@ -15518,7 +15579,7 @@ diff -b -B --ignore-all-space --exclude-
  allow dovecot_auth_t self:fifo_file rw_fifo_file_perms;
  allow dovecot_auth_t self:unix_dgram_socket create_socket_perms;
  allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms;
-@@ -220,15 +225,23 @@
+@@ -220,15 +226,23 @@
  ')
  
  optional_policy(`
@@ -15542,7 +15603,7 @@ diff -b -B --ignore-all-space --exclude-
  allow dovecot_deliver_t dovecot_etc_t:file read_file_perms;
  allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms;
  
-@@ -260,3 +273,14 @@
+@@ -260,3 +274,14 @@
  optional_policy(`
  	mta_manage_spool(dovecot_deliver_t)
  ')
@@ -15644,7 +15705,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_sendrecv_generic_if(fetchmail_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.32/policy/modules/services/fprintd.te
 --- nsaserefpolicy/policy/modules/services/fprintd.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/fprintd.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/fprintd.te	2009-12-10 15:34:43.000000000 -0500
 @@ -37,6 +37,8 @@
  files_read_etc_files(fprintd_t)
  files_read_usr_files(fprintd_t)
@@ -15654,12 +15715,13 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(fprintd_t)
  
  miscfiles_read_localization(fprintd_t)
-@@ -51,5 +53,7 @@
+@@ -51,5 +53,8 @@
  optional_policy(`
  	policykit_read_reload(fprintd_t)
  	policykit_read_lib(fprintd_t)
 +	policykit_dbus_chat(fprintd_t)
  	policykit_domtrans_auth(fprintd_t)
++	policykit_dbus_chat_auth(fprintd_t)
  ')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.6.32/policy/modules/services/ftp.te
@@ -16423,8 +16485,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.32/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/hal.te	2009-12-03 13:45:11.000000000 -0500
-@@ -55,6 +55,9 @@
++++ serefpolicy-3.6.32/policy/modules/services/hal.te	2009-12-10 11:28:12.000000000 -0500
+@@ -55,13 +55,16 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
  
@@ -16434,6 +16496,14 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Local policy
+ #
+ 
+ # execute openvt which needs setuid
+-allow hald_t self:capability { chown setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio sys_tty_config };
++allow hald_t self:capability { chown setuid setgid kill net_admin sys_admin sys_nice sys_resource dac_override dac_read_search mknod sys_rawio sys_tty_config };
+ dontaudit hald_t self:capability {sys_ptrace sys_tty_config };
+ allow hald_t self:process { getattr signal_perms };
+ allow hald_t self:fifo_file rw_fifo_file_perms;
 @@ -100,7 +103,9 @@
  kernel_rw_irq_sysctls(hald_t)
  kernel_rw_vm_sysctls(hald_t)
@@ -18289,10 +18359,31 @@ diff -b -B --ignore-all-space --exclude-
 +	manage_lnk_files_pattern($1,nslcd_var_run_t,nslcd_var_run_t)
  ')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.fc serefpolicy-3.6.32/policy/modules/services/ntop.fc
+--- nsaserefpolicy/policy/modules/services/ntop.fc	2009-09-16 10:01:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ntop.fc	2009-12-10 11:04:30.000000000 -0500
+@@ -1,7 +1,6 @@
+ /etc/ntop(/.*)?			gen_context(system_u:object_r:ntop_etc_t,s0)
+ 
+ /usr/bin/ntop		--	gen_context(system_u:object_r:ntop_exec_t,s0)
+-/usr/share/ntop/html(/.*)?	gen_context(system_u:object_r:ntop_http_content_t,s0)
+ 
+ /var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
+ /var/run/ntop\.pid	--	gen_context(system_u:object_r:ntop_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.te serefpolicy-3.6.32/policy/modules/services/ntop.te
 --- nsaserefpolicy/policy/modules/services/ntop.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ntop.te	2009-12-03 13:45:11.000000000 -0500
-@@ -37,7 +37,9 @@
++++ serefpolicy-3.6.32/policy/modules/services/ntop.te	2009-12-10 11:04:34.000000000 -0500
+@@ -14,9 +14,6 @@
+ type ntop_etc_t;
+ files_config_file(ntop_etc_t)
+ 
+-type ntop_http_content_t;
+-files_type(ntop_http_content_t)
+-
+ type ntop_tmp_t;
+ files_tmp_file(ntop_tmp_t)
+ 
+@@ -37,15 +34,14 @@
  allow ntop_t self:fifo_file rw_fifo_file_perms;
  allow ntop_t self:tcp_socket create_stream_socket_perms;
  allow ntop_t self:udp_socket create_socket_perms;
@@ -18302,7 +18393,15 @@ diff -b -B --ignore-all-space --exclude-
  
  allow ntop_t ntop_etc_t:dir list_dir_perms;
  read_files_pattern(ntop_t, ntop_etc_t, ntop_etc_t)
-@@ -57,6 +59,8 @@
+ read_lnk_files_pattern(ntop_t, ntop_etc_t, ntop_etc_t)
+ 
+-allow ntop_t ntop_http_content_t:dir list_dir_perms;
+-read_files_pattern(ntop_t, ntop_http_content_t, ntop_http_content_t)
+-
+ manage_dirs_pattern(ntop_t, ntop_tmp_t, ntop_tmp_t)
+ manage_files_pattern(ntop_t, ntop_tmp_t, ntop_tmp_t)
+ files_tmp_filetrans(ntop_t, ntop_tmp_t, { file dir })
+@@ -57,6 +53,8 @@
  manage_files_pattern(ntop_t, ntop_var_run_t, ntop_var_run_t)
  files_pid_filetrans(ntop_t, ntop_var_run_t, file)
  
@@ -18311,7 +18410,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_network_state(ntop_t)
  kernel_read_kernel_sysctls(ntop_t)
  kernel_list_proc(ntop_t)
-@@ -72,12 +76,17 @@
+@@ -72,12 +70,17 @@
  corenet_raw_sendrecv_generic_node(ntop_t)
  corenet_tcp_sendrecv_all_ports(ntop_t)
  corenet_udp_sendrecv_all_ports(ntop_t)
@@ -18329,7 +18428,7 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(ntop_t)
  fs_search_auto_mountpoints(ntop_t)
-@@ -85,6 +94,7 @@
+@@ -85,6 +88,7 @@
  logging_send_syslog_msg(ntop_t)
  
  miscfiles_read_localization(ntop_t)
@@ -18337,7 +18436,7 @@ diff -b -B --ignore-all-space --exclude-
  
  sysnet_read_config(ntop_t)
  
-@@ -92,6 +102,10 @@
+@@ -92,6 +96,10 @@
  userdom_dontaudit_search_user_home_dirs(ntop_t)
  
  optional_policy(`
@@ -18743,21 +18842,24 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.6.32/policy/modules/services/nx.fc
 --- nsaserefpolicy/policy/modules/services/nx.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/nx.fc	2009-12-03 13:45:11.000000000 -0500
-@@ -1,7 +1,12 @@
++++ serefpolicy-3.6.32/policy/modules/services/nx.fc	2009-12-10 11:22:15.000000000 -0500
+@@ -1,7 +1,15 @@
  /opt/NX/bin/nxserver		--	gen_context(system_u:object_r:nx_server_exec_t,s0)
-+/opt/NX/home/nx(/.*)?			gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
- 
--/opt/NX/home/nx/\.ssh(/.*)?		gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
-+/var/lib/nxserver/home/.ssh(/.*)?  	gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
-+/var/lib/nxserver(/.*)? 		gen_context(system_u:object_r:nx_server_var_lib_t,s0)
  
++/opt/NX/home(/.*)?				gen_context(system_u:object_r:nx_server_var_lib_t,s0)
+ /opt/NX/home/nx/\.ssh(/.*)?		gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
+-
  /opt/NX/var(/.*)?			gen_context(system_u:object_r:nx_server_var_run_t,s0)
  
- /usr/libexec/nx/nxserver	--	gen_context(system_u:object_r:nx_server_exec_t,s0)
++/usr/NX/bin/nxserver		--	gen_context(system_u:object_r:nx_server_exec_t,s0)
++
++/usr/NX/home(/.*)?			gen_context(system_u:object_r:nx_server_var_lib_t,s0)
++/usr/NX/home/nx/\.ssh(/.*)?		gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
 +
-+/usr/NX/home/nx(/.*)?			gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
++/var/lib/nxserver/home/.ssh(/.*)?  	gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
++/var/lib/nxserver(/.*)? 		gen_context(system_u:object_r:nx_server_var_lib_t,s0)
 +
+ /usr/libexec/nx/nxserver	--	gen_context(system_u:object_r:nx_server_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.6.32/policy/modules/services/nx.if
 --- nsaserefpolicy/policy/modules/services/nx.if	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/nx.if	2009-12-03 13:45:11.000000000 -0500
@@ -19075,8 +19177,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/plymouth(/.*)?				gen_context(system_u:object_r:plymouthd_var_run_t, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.if serefpolicy-3.6.32/policy/modules/services/plymouth.if
 --- nsaserefpolicy/policy/modules/services/plymouth.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/plymouth.if	2009-12-03 13:45:11.000000000 -0500
-@@ -0,0 +1,286 @@
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.if	2009-12-10 15:27:49.000000000 -0500
+@@ -0,0 +1,304 @@
 +## <summary>policy for plymouthd</summary>
 +
 +########################################
@@ -19099,6 +19201,24 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	Execute a plymoth in the current domain
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`plymouth_exec', `
++	gen_require(`
++		type plymouthd_exec_t;
++	')
++
++	can_exec($1, plymouthd_exec_t)
++')
++
++########################################
++## <summary>
 +##	Execute a domain transition to run plymouthd.
 +## </summary>
 +## <param name="domain">
@@ -19365,8 +19485,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.te serefpolicy-3.6.32/policy/modules/services/plymouth.te
 --- nsaserefpolicy/policy/modules/services/plymouth.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/plymouth.te	2009-12-03 13:45:11.000000000 -0500
-@@ -0,0 +1,101 @@
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.te	2009-12-10 15:31:04.000000000 -0500
+@@ -0,0 +1,102 @@
 +policy_module(plymouthd, 1.0.0)
 +
 +########################################
@@ -19425,6 +19545,7 @@ diff -b -B --ignore-all-space --exclude-
 +files_read_usr_files(plymouthd_t)
 +
 +miscfiles_read_localization(plymouthd_t)
++miscfiles_read_fonts(plymouthd_t)
 +
 +manage_dirs_pattern(plymouthd_t, plymouthd_var_run_t,  plymouthd_var_run_t)
 +manage_files_pattern(plymouthd_t, plymouthd_var_run_t,  plymouthd_var_run_t)
@@ -19488,8 +19609,8 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.6.32/policy/modules/services/policykit.if
 --- nsaserefpolicy/policy/modules/services/policykit.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/policykit.if	2009-12-03 13:45:11.000000000 -0500
-@@ -17,6 +17,8 @@
++++ serefpolicy-3.6.32/policy/modules/services/policykit.if	2009-12-10 15:31:52.000000000 -0500
+@@ -17,12 +17,37 @@
  		class dbus send_msg;
  	')
  
@@ -19498,7 +19619,36 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 policykit_t:dbus send_msg;
  	allow policykit_t $1:dbus send_msg;
  ')
-@@ -62,6 +64,9 @@
+ 
+ ########################################
+ ## <summary>
++##	Send and receive messages from
++##	policykit over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`policykit_dbus_chat_auth',`
++	gen_require(`
++		type policykit_auth_t;
++		class dbus send_msg;
++	')
++
++	ps_process_pattern(policykit_auth_t, $1)
++
++	allow $1 policykit_auth_t:dbus send_msg;
++	allow policykit_auth_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
+ ##	Execute a domain transition to run polkit_auth.
+ ## </summary>
+ ## <param name="domain">
+@@ -62,6 +87,9 @@
  
  	policykit_domtrans_auth($1)
  	role $2 types policykit_auth_t;
@@ -19508,7 +19658,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -206,4 +211,47 @@
+@@ -206,4 +234,47 @@
  
  	files_search_var_lib($1)
  	read_files_pattern($1, policykit_var_lib_t, policykit_var_lib_t)
@@ -19558,7 +19708,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.6.32/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-12-09 09:05:31.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-12-10 10:38:47.000000000 -0500
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
@@ -19634,7 +19784,7 @@ diff -b -B --ignore-all-space --exclude-
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -92,12 +114,14 @@
+@@ -92,21 +114,25 @@
  manage_files_pattern(policykit_auth_t, policykit_var_run_t, policykit_var_run_t)
  files_pid_filetrans(policykit_auth_t, policykit_var_run_t, { file dir })
  
@@ -19642,16 +19792,19 @@ diff -b -B --ignore-all-space --exclude-
 -
  files_read_etc_files(policykit_auth_t)
  files_read_usr_files(policykit_auth_t)
- 
++files_search_home(policykit_auth_t)
++
 +fs_getattr_all_fs(polkit_auth_t)
 +fs_search_tmpfs(polkit_auth_t)
-+
+ 
  auth_use_nsswitch(policykit_auth_t)
 +auth_domtrans_chk_passwd(policykit_auth_t)
  
  logging_send_syslog_msg(policykit_auth_t)
  
-@@ -106,7 +130,7 @@
+ miscfiles_read_localization(policykit_auth_t)
++miscfiles_read_fonts(policykit_auth_t)
+ 
  userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
  
  optional_policy(`
@@ -19660,7 +19813,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -119,6 +143,14 @@
+@@ -119,6 +145,14 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -19675,7 +19828,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_grant local policy
-@@ -126,7 +158,8 @@
+@@ -126,7 +160,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -19685,7 +19838,7 @@ diff -b -B --ignore-all-space --exclude-
  allow policykit_grant_t self:unix_dgram_socket create_socket_perms;
  allow policykit_grant_t self:unix_stream_socket create_stream_socket_perms;
  
-@@ -156,9 +189,12 @@
+@@ -156,9 +191,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -19699,7 +19852,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -170,7 +206,8 @@
+@@ -170,7 +208,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -26357,21 +26510,22 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/nxserver/home/\.Xauthority.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.32/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-12-05 06:43:26.000000000 -0500
-@@ -74,6 +74,12 @@
++++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-12-10 15:23:11.000000000 -0500
+@@ -74,6 +74,13 @@
  
  	domtrans_pattern($2, iceauth_exec_t, iceauth_t)
  
 +ifdef(`hide_broken_symptoms', `
 +	dontaudit iceauth_t $2:unix_stream_socket rw_socket_perms;
 +	dontaudit iceauth_t $2:tcp_socket rw_socket_perms;
++	dontaudit iceauth_t $2:udp_socket rw_socket_perms;
 +	fs_dontaudit_rw_anon_inodefs_files(iceauth_t)
 +')
 +
  	allow $2 iceauth_home_t:file read_file_perms;
  
  	domtrans_pattern($2, xauth_exec_t, xauth_t)
-@@ -89,8 +95,8 @@
+@@ -89,8 +96,8 @@
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
  	allow $2 xdm_t:fifo_file { getattr read write ioctl };
@@ -26382,7 +26536,7 @@ diff -b -B --ignore-all-space --exclude-
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
  	# Client read xserver shm
-@@ -211,6 +217,7 @@
+@@ -211,6 +218,7 @@
  	relabel_dirs_pattern($2, user_fonts_config_t, user_fonts_config_t)
  	relabel_files_pattern($2, user_fonts_config_t, user_fonts_config_t)
  
@@ -26390,7 +26544,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -245,7 +252,7 @@
+@@ -245,7 +253,7 @@
  	allow $1 xserver_t:process signal;
  
  	# Read /tmp/.X0-lock
@@ -26399,7 +26553,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Client read xserver shm
  	allow $1 xserver_t:fd use;
-@@ -299,7 +306,7 @@
+@@ -299,7 +307,7 @@
  interface(`xserver_user_client',`
  	refpolicywarn(`$0() has been deprecated, please use xserver_user_x_domain_template instead.')
  	gen_require(`
@@ -26408,7 +26562,7 @@ diff -b -B --ignore-all-space --exclude-
  		type xauth_home_t, iceauth_home_t, xserver_t, xserver_tmpfs_t;
  	')
  
-@@ -308,14 +315,14 @@
+@@ -308,14 +316,14 @@
  	allow $1 self:unix_stream_socket { connectto create_stream_socket_perms };
  
  	# Read .Xauthority file
@@ -26428,7 +26582,7 @@ diff -b -B --ignore-all-space --exclude-
  	dontaudit $1 xdm_t:tcp_socket { read write };
  
  	# Allow connections to X server.
-@@ -367,7 +374,6 @@
+@@ -367,7 +375,6 @@
  		type input_xevent_t, focus_xevent_t, property_xevent_t, manage_xevent_t;
  		type xevent_t, client_xevent_t;
  
@@ -26436,7 +26590,7 @@ diff -b -B --ignore-all-space --exclude-
  		attribute xproperty_type;
  		attribute xevent_type;
  		attribute input_xevent_type;
-@@ -376,6 +382,8 @@
+@@ -376,6 +383,8 @@
  		class x_property all_x_property_perms;
  		class x_event all_x_event_perms;
  		class x_synthetic_event all_x_synthetic_event_perms;
@@ -26445,7 +26599,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -383,20 +391,11 @@
+@@ -383,20 +392,11 @@
  	# Local Policy
  	#
  
@@ -26466,7 +26620,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $2 $1_input_xevent_t:{ x_event x_synthetic_event } receive;
  	allow $2 $1_property_xevent_t:{ x_event x_synthetic_event } receive;
  	allow $2 $1_focus_xevent_t:{ x_event x_synthetic_event } receive;
-@@ -409,8 +408,10 @@
+@@ -409,8 +409,10 @@
  	type_transition $2 manage_xevent_t:x_event $1_manage_xevent_t;
  	type_transition $2 client_xevent_t:x_event $1_client_xevent_t;
  	type_transition $2 xevent_t:x_event $1_default_xevent_t;
@@ -26478,7 +26632,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -484,13 +485,14 @@
+@@ -484,13 +486,14 @@
  #
  template(`xserver_user_x_domain_template',`
  	gen_require(`
@@ -26497,7 +26651,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Read .Xauthority file
  	allow $2 xauth_home_t:file read_file_perms;
-@@ -498,9 +500,9 @@
+@@ -498,9 +501,9 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
@@ -26510,7 +26664,7 @@ diff -b -B --ignore-all-space --exclude-
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
  	# Allow connections to X server.
-@@ -526,6 +528,10 @@
+@@ -526,6 +529,10 @@
  		allow $2 xserver_t:shm rw_shm_perms;
  		allow $2 xserver_tmpfs_t:file rw_file_perms;
  	')
@@ -26521,7 +26675,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -585,6 +591,12 @@
+@@ -585,6 +592,13 @@
  	')
  
  	domtrans_pattern($1, xauth_exec_t, xauth_t)
@@ -26529,12 +26683,13 @@ diff -b -B --ignore-all-space --exclude-
 +ifdef(`hide_broken_symptoms', `
 +	dontaudit xauth_t $1:unix_stream_socket rw_socket_perms;
 +	dontaudit xauth_t $1:tcp_socket rw_socket_perms;
++	dontaudit xauth_t $1:udp_socket rw_socket_perms;
 +	fs_dontaudit_rw_anon_inodefs_files(xauth_t)
 +')
  ')
  
  ########################################
-@@ -728,7 +740,7 @@
+@@ -728,7 +742,7 @@
  		type xdm_t;
  	')
  
@@ -26543,7 +26698,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -764,11 +776,11 @@
+@@ -764,11 +778,11 @@
  #
  interface(`xserver_stream_connect_xdm',`
  	gen_require(`
@@ -26557,7 +26712,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -802,10 +814,10 @@
+@@ -802,10 +816,10 @@
  #
  interface(`xserver_setattr_xdm_tmp_dirs',`
  	gen_require(`
@@ -26570,7 +26725,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -821,12 +833,13 @@
+@@ -821,12 +835,13 @@
  #
  interface(`xserver_create_xdm_tmp_sockets',`
  	gen_require(`
@@ -26587,7 +26742,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -845,7 +858,44 @@
+@@ -845,7 +860,44 @@
  	')
  
  	files_search_pids($1)
@@ -26633,7 +26788,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -868,6 +918,75 @@
+@@ -868,6 +920,75 @@
  
  ########################################
  ## <summary>
@@ -26709,7 +26864,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -886,6 +1005,24 @@
+@@ -886,6 +1007,24 @@
  
  ########################################
  ## <summary>
@@ -26734,7 +26889,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute an X session in the target domain.  This
  ##	is an explicit transition, requiring the
  ##	caller to use setexeccon().
-@@ -961,6 +1098,27 @@
+@@ -961,6 +1100,27 @@
  
  ########################################
  ## <summary>
@@ -26762,7 +26917,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write the X server
  ##	log files.
  ## </summary>
-@@ -1014,11 +1172,11 @@
+@@ -1014,11 +1174,11 @@
  #
  interface(`xserver_read_xdm_tmp_files',`
  	gen_require(`
@@ -26776,7 +26931,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1033,11 +1191,11 @@
+@@ -1033,11 +1193,11 @@
  #
  interface(`xserver_dontaudit_read_xdm_tmp_files',`
  	gen_require(`
@@ -26791,7 +26946,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1052,11 +1210,11 @@
+@@ -1052,11 +1212,11 @@
  #
  interface(`xserver_rw_xdm_tmp_files',`
  	gen_require(`
@@ -26806,7 +26961,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1071,10 +1229,10 @@
+@@ -1071,10 +1231,10 @@
  #
  interface(`xserver_manage_xdm_tmp_files',`
  	gen_require(`
@@ -26819,7 +26974,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1089,10 +1247,10 @@
+@@ -1089,10 +1249,10 @@
  #
  interface(`xserver_dontaudit_getattr_xdm_tmp_sockets',`
  	gen_require(`
@@ -26832,7 +26987,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1107,10 +1265,11 @@
+@@ -1107,10 +1267,11 @@
  #
  interface(`xserver_domtrans',`
  	gen_require(`
@@ -26845,7 +27000,7 @@ diff -b -B --ignore-all-space --exclude-
  	domtrans_pattern($1, xserver_exec_t, xserver_t)
  ')
  
-@@ -1248,6 +1407,288 @@
+@@ -1248,6 +1409,288 @@
  
  ########################################
  ## <summary>
@@ -27134,7 +27289,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Interface to provide X object permissions on a given X server to
  ##	an X client domain.  Gives the domain complete control over the
  ##	display.
-@@ -1261,7 +1702,103 @@
+@@ -1261,7 +1704,103 @@
  interface(`xserver_unconfined',`
  	gen_require(`
  		attribute xserver_unconfined_type;
@@ -27240,7 +27395,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-09 11:40:19.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-10 15:28:03.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -27734,7 +27889,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -542,6 +677,38 @@
+@@ -542,6 +677,39 @@
  ')
  
  optional_policy(`
@@ -27751,6 +27906,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	plymouth_search_spool(xdm_t)
++	plymouth_exec(xdm_t)
 +')
 +
 +optional_policy(`
@@ -27773,7 +27929,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +717,9 @@
+@@ -550,8 +718,9 @@
  ')
  
  optional_policy(`
@@ -27785,7 +27941,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +728,6 @@
+@@ -560,7 +729,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -27793,7 +27949,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +738,10 @@
+@@ -571,6 +739,10 @@
  ')
  
  optional_policy(`
@@ -27804,7 +27960,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +758,9 @@
+@@ -587,10 +759,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -27816,7 +27972,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -602,9 +772,12 @@
+@@ -602,9 +773,12 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -27829,7 +27985,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +789,14 @@
+@@ -616,13 +790,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -27845,7 +28001,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,9 +809,19 @@
+@@ -635,9 +810,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -27865,7 +28021,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +855,6 @@
+@@ -671,7 +856,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -27873,7 +28029,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -681,9 +864,12 @@
+@@ -681,9 +865,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -27887,7 +28043,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +884,12 @@
+@@ -698,8 +885,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -27900,7 +28056,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +911,7 @@
+@@ -721,6 +912,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -27908,7 +28064,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +934,7 @@
+@@ -743,7 +935,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -27917,7 +28073,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +966,20 @@
+@@ -775,12 +967,20 @@
  ')
  
  optional_policy(`
@@ -27939,7 +28095,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,12 +1006,12 @@
+@@ -807,12 +1007,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -27956,7 +28112,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Run xkbcomp.
  allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -828,9 +1027,14 @@
+@@ -828,9 +1028,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -27971,7 +28127,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -845,11 +1049,14 @@
+@@ -845,11 +1050,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -27987,7 +28143,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1089,8 @@
+@@ -882,6 +1090,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -27996,7 +28152,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1115,8 @@
+@@ -906,6 +1116,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -28005,7 +28161,7 @@ diff -b -B --ignore-all-space --exclude-
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -973,17 +1184,49 @@
+@@ -973,17 +1185,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -28184,7 +28340,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.32/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-12-07 15:55:13.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-12-10 15:35:58.000000000 -0500
 @@ -40,17 +40,76 @@
  ##	</summary>
  ## </param>
@@ -28502,16 +28658,19 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.6.32/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/authlogin.te	2009-12-03 13:45:11.000000000 -0500
-@@ -103,6 +103,7 @@
++++ serefpolicy-3.6.32/policy/modules/system/authlogin.te	2009-12-10 13:28:10.000000000 -0500
+@@ -103,8 +103,10 @@
  
  fs_dontaudit_getattr_xattr_fs(chkpwd_t)
  
 +term_dontaudit_use_console(chkpwd_t)
  term_dontaudit_use_unallocated_ttys(chkpwd_t)
  term_dontaudit_use_generic_ptys(chkpwd_t)
++term_dontaudit_use_all_server_ptys(chkpwd_t)
+ 
+ auth_use_nsswitch(chkpwd_t)
  
-@@ -125,9 +126,18 @@
+@@ -125,9 +127,18 @@
  ')
  
  optional_policy(`
@@ -29537,7 +29696,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.32/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-12-10 11:41:15.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -29552,7 +29711,7 @@ diff -b -B --ignore-all-space --exclude-
  type ipsec_t;
  type ipsec_exec_t;
  init_daemon_domain(ipsec_t, ipsec_exec_t)
-@@ -15,6 +22,9 @@
+@@ -15,13 +22,22 @@
  type ipsec_conf_file_t;
  files_type(ipsec_conf_file_t)
  
@@ -29562,17 +29721,20 @@ diff -b -B --ignore-all-space --exclude-
  # type for file(s) containing ipsec keys - RSA or preshared
  type ipsec_key_file_t;
  files_type(ipsec_key_file_t)
-@@ -22,6 +32,9 @@
- # Default type for IPSEC SPD entries
- type ipsec_spd_t;
  
 +type ipsec_log_t;
 +logging_log_file(ipsec_log_t)
 +
+ # Default type for IPSEC SPD entries
+ type ipsec_spd_t;
+ 
++type ipsec_tmp_t;
++files_tmp_file(ipsec_tmp_t)
++
  # type for runtime files, including pluto.ctl
  type ipsec_var_run_t;
  files_pid_file(ipsec_var_run_t)
-@@ -43,6 +56,9 @@
+@@ -43,6 +59,9 @@
  init_daemon_domain(racoon_t, racoon_exec_t)
  role system_r types racoon_t;
  
@@ -29582,7 +29744,7 @@ diff -b -B --ignore-all-space --exclude-
  type setkey_t;
  type setkey_exec_t;
  init_system_domain(setkey_t, setkey_exec_t)
-@@ -53,21 +69,23 @@
+@@ -53,21 +72,23 @@
  # ipsec Local policy
  #
  
@@ -29609,7 +29771,7 @@ diff -b -B --ignore-all-space --exclude-
  read_lnk_files_pattern(ipsec_t, ipsec_key_file_t, ipsec_key_file_t)
  
  manage_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t)
-@@ -82,16 +100,17 @@
+@@ -82,16 +103,17 @@
  # so try flipping back into the ipsec_mgmt_t domain
  corecmd_shell_domtrans(ipsec_t, ipsec_mgmt_t)
  allow ipsec_mgmt_t ipsec_t:fd use;
@@ -29629,7 +29791,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_getattr_core_if(ipsec_t)
  kernel_getattr_message_if(ipsec_t)
  
-@@ -120,7 +139,9 @@
+@@ -120,7 +142,9 @@
  
  domain_use_interactive_fds(ipsec_t)
  
@@ -29639,7 +29801,7 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(ipsec_t)
  fs_search_auto_mountpoints(ipsec_t)
-@@ -154,16 +175,19 @@
+@@ -154,16 +178,19 @@
  #
  
  allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
@@ -29661,7 +29823,18 @@ diff -b -B --ignore-all-space --exclude-
  allow ipsec_mgmt_t ipsec_mgmt_var_run_t:file manage_file_perms;
  files_pid_filetrans(ipsec_mgmt_t, ipsec_mgmt_var_run_t, file)
  
-@@ -241,6 +265,7 @@
+@@ -188,6 +215,10 @@
+ manage_lnk_files_pattern(ipsec_mgmt_t, ipsec_key_file_t, ipsec_key_file_t)
+ files_etc_filetrans(ipsec_mgmt_t, ipsec_key_file_t, file)
+ 
++manage_dirs_pattern(ipsec_t, ipsec_tmp_t, ipsec_tmp_t)
++manage_files_pattern(ipsec_t, ipsec_tmp_t, ipsec_tmp_t)
++files_tmp_filetrans(ipsec_t, ipsec_tmp_t, { dir file }) 
++
+ # whack needs to connect to pluto
+ stream_connect_pattern(ipsec_mgmt_t, ipsec_var_run_t, ipsec_var_run_t, ipsec_t)
+ 
+@@ -241,6 +272,7 @@
  init_use_script_ptys(ipsec_mgmt_t)
  init_exec_script_files(ipsec_mgmt_t)
  init_use_fds(ipsec_mgmt_t)
@@ -29669,7 +29842,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(ipsec_mgmt_t)
  
-@@ -280,6 +305,13 @@
+@@ -280,6 +312,13 @@
  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_socket_perms;
@@ -29683,7 +29856,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # manage pid file
  manage_files_pattern(racoon_t, ipsec_var_run_t, ipsec_var_run_t)
-@@ -297,6 +329,13 @@
+@@ -297,6 +336,13 @@
  kernel_read_system_state(racoon_t)
  kernel_read_network_state(racoon_t)
  
@@ -29697,7 +29870,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(racoon_t)
  corenet_tcp_sendrecv_all_if(racoon_t)
  corenet_udp_sendrecv_all_if(racoon_t)
-@@ -314,6 +353,8 @@
+@@ -314,6 +360,8 @@
  
  files_read_etc_files(racoon_t)
  
@@ -29706,7 +29879,7 @@ diff -b -B --ignore-all-space --exclude-
  # allow racoon to use avc_has_perm to check context on proposed SA
  selinux_compute_access_vector(racoon_t)
  
-@@ -328,6 +369,14 @@
+@@ -328,6 +376,14 @@
  
  miscfiles_read_localization(racoon_t)
  
@@ -29721,7 +29894,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Setkey local policy
-@@ -341,12 +390,15 @@
+@@ -341,12 +397,15 @@
  read_files_pattern(setkey_t, ipsec_conf_file_t, ipsec_conf_file_t)
  read_lnk_files_pattern(setkey_t, ipsec_conf_file_t, ipsec_conf_file_t)
  
@@ -29737,6 +29910,12 @@ diff -b -B --ignore-all-space --exclude-
  
  # allow setkey to set the context for ipsec SAs and policy.
  ipsec_setcontext_default_spd(setkey_t)
+@@ -358,3 +417,5 @@
+ seutil_read_config(setkey_t)
+ 
+ userdom_use_user_terminals(setkey_t)
++
++userdom_read_user_tmp_files(setkey_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.6.32/policy/modules/system/iptables.fc
 --- nsaserefpolicy/policy/modules/system/iptables.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/iptables.fc	2009-12-03 13:45:11.000000000 -0500
@@ -33838,7 +34017,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-09 09:27:20.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-10 15:29:01.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -p -r1.980 -r1.981
--- selinux-policy.spec	9 Dec 2009 19:53:39 -0000	1.980
+++ selinux-policy.spec	10 Dec 2009 21:38:24 -0000	1.981
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 57%{?dist}
+Release: 58%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,8 +449,20 @@ exit 0
 %endif
 
 %changelog
+* Thu Dec 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-58
+- Dontaudit udp_socket leaks for xauth_t
+
 * Wed Dec 9 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-57
 - Allow unconfined_t to send dbus messages to setroubleshoot
+- Allow confined screen app to setattr on user ttys
+- remove wine_t from unconfined domain when unconfined.pp disabled
+- Allow sysadm_t to communicate with racoon
+- Allow xauth to be run from all unconfined user types
+- Fix labeling on all /var/cache/mod_* apps
+- Allow asterisk to communicate with postgresql
+- Fix labeling for /var/lib/certmaster
+- Add policy for ksmtuned and tgtd
+- Fixes fro vhostmd
 
 * Mon Dec 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-56
 - Dontaudit exec of fusermount from xguest



From cwickert at fedoraproject.org  Thu Dec 10 22:06:09 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Dec 2009 22:06:09 +0000 (UTC)
Subject: rpms/Terminal/devel .cvsignore, 1.13, 1.14 Terminal.spec, 1.33,
	1.34 sources, 1.13,
	1.14 Terminal-0.4.2-set-correct-gettext-domain.patch, 1.1, NONE
Message-ID: <20091210220610.05B2811C025D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/Terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30045

Modified Files:
	.cvsignore Terminal.spec sources 
Removed Files:
	Terminal-0.4.2-set-correct-gettext-domain.patch 
Log Message:
* Wed Dec 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.3-1
- Update to 0.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Oct 2009 21:39:19 -0000	1.13
+++ .cvsignore	10 Dec 2009 22:06:08 -0000	1.14
@@ -1 +1 @@
-Terminal-0.4.2.tar.bz2
+Terminal-0.4.3.tar.bz2


Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- Terminal.spec	8 Oct 2009 10:16:29 -0000	1.33
+++ Terminal.spec	10 Dec 2009 22:06:08 -0000	1.34
@@ -1,13 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.4.2
-Release: 2%{?dist}
+Version: 0.4.3
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
 Source0:  http://archive.xfce.org/src/apps/terminal/0.4/Terminal-%{version}.tar.bz2
-# http://bugzilla.xfce.org/show_bug.cgi?id=5842 was fixed with
-# http://git.xfce.org/apps/terminal/commit/?id=5c955bb0435dca6d7114903d246cf2e4a215cc5e
-Patch0: Terminal-0.4.2-set-correct-gettext-domain.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel >= 0.17.1
@@ -17,6 +14,8 @@ BuildRequires: gettext intltool
 BuildRequires: startup-notification-devel
 BuildRequires: dbus-glib-devel >= 0.22
 BuildRequires: desktop-file-utils
+# required for Terminal-default-apps.xml
+Requires: control-center-filesystem
 
 %description
 Terminal is a lightweight and easy to use terminal emulator application
@@ -25,11 +24,10 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,6 +51,14 @@ if [ $1 -eq 0 ] ; then
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+# workaround for # 447156 - rpm cannot change directory to symlink
+%pretrans
+for dir in C ca da fr gl id ja; do
+#    [ -d "%{_datadir}/doc/Terminal/$dir/images" -a ! -L "%{_datadir}/doc/Terminal/$dir/images" ] && \
+    [ ! -L "%{_datadir}/doc/Terminal/$dir/images" ] && \
+    rm -rf %{_datadir}/doc/Terminal/$dir/images  || :
+done
+
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -68,10 +74,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/stock/navigation/*.png
 %{_datadir}/pixmaps/terminal.xpm
 %{_datadir}/applications/Terminal.desktop
+%{_datadir}/gnome-control-center/default-apps/Terminal-default-apps.xml
 %{_mandir}/man1/Terminal.1.gz
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Wed Dec 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.3-1
+- Update to 0.4.3
+
 * Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
 - Fix locale problems in the UI (bugzilla.xfce.org #5842)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Oct 2009 21:39:19 -0000	1.13
+++ sources	10 Dec 2009 22:06:08 -0000	1.14
@@ -1 +1 @@
-9754afef6b79fa1df9aaf41fb8cc6374  Terminal-0.4.2.tar.bz2
+0ce66b16bcb7ff274d7f93a69993f717  Terminal-0.4.3.tar.bz2


--- Terminal-0.4.2-set-correct-gettext-domain.patch DELETED ---



From rmccabe at fedoraproject.org  Thu Dec 10 22:10:19 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 10 Dec 2009 22:10:19 +0000 (UTC)
Subject: File ricci-0.16.1.tar.gz uploaded to lookaside cache by rmccabe
Message-ID: <20091210221019.B958E10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ricci:

8def1dca5a6224b3b682e33416f9c3ee  ricci-0.16.1.tar.gz



From rmccabe at fedoraproject.org  Thu Dec 10 22:10:47 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 10 Dec 2009 22:10:47 +0000 (UTC)
Subject: rpms/ricci/devel .cvsignore, 1.5, 1.6 ricci.spec, 1.20, 1.21 sources,
	1.12, 1.13 ricci-0.16.1-passauth.patch, 1.1, NONE
Message-ID: <20091210221047.68D3411C03FC@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31445

Modified Files:
	.cvsignore ricci.spec sources 
Removed Files:
	ricci-0.16.1-passauth.patch 
Log Message:
* Thu Dec 10 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-6
- Add a ricci function to set the cluster version, as it's no longer done
  while syncing the configuration files via ccs_sync.

* Wed Dec 09 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-5
- Don't update the cluster version via cman_set_version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Jul 2009 04:50:21 -0000	1.5
+++ .cvsignore	10 Dec 2009 22:10:46 -0000	1.6
@@ -1,2 +1 @@
-ricci-0.16.0.tar.gz
 ricci-0.16.1.tar.gz


Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ricci.spec	16 Sep 2009 18:25:17 -0000	1.20
+++ ricci.spec	10 Dec 2009 22:10:47 -0000	1.21
@@ -10,13 +10,12 @@
 
 Name: ricci
 Version: 0.16.1
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
 Summary: Remote Cluster and Storage Management System
 Source0: http://people.redhat.com/rmccabe/conga/fedora/src/ricci-0.16.1.tar.gz
-Patch1: ricci-0.16.1-passauth.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel python-devel libcap-devel
@@ -33,7 +32,6 @@ Requires(postun): initscripts
 
 %prep
 %setup -q
-%patch1 -p1 -b .passauth
 
 %build
 %configure --arch=%{_arch} --docdir=%{_docdir}
@@ -123,6 +121,13 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 10 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-6
+- Add a ricci function to set the cluster version, as it's no longer done
+  while syncing the configuration files via ccs_sync.
+
+* Wed Dec 09 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-5
+- Don't update the cluster version via cman_set_version
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.1-4
 - Use password-auth common PAM configuration instead of system-auth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Jul 2009 04:50:21 -0000	1.12
+++ sources	10 Dec 2009 22:10:47 -0000	1.13
@@ -1,2 +1 @@
-fad8f74a0dc458d67191f134027d5265  ricci-0.16.0.tar.gz
-77638cb7f40369f24a583d839010cba3  ricci-0.16.1.tar.gz
+8def1dca5a6224b3b682e33416f9c3ee  ricci-0.16.1.tar.gz


--- ricci-0.16.1-passauth.patch DELETED ---



From rmccabe at fedoraproject.org  Thu Dec 10 22:12:08 2009
From: rmccabe at fedoraproject.org (Ryan McCabe)
Date: Thu, 10 Dec 2009 22:12:08 +0000 (UTC)
Subject: rpms/ricci/F-12 ricci.spec,1.21,1.22 sources,1.13,1.14
Message-ID: <20091210221208.9B69911C025D@cvs1.fedora.phx.redhat.com>

Author: rmccabe

Update of /cvs/pkgs/rpms/ricci/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32214

Modified Files:
	ricci.spec sources 
Log Message:
* Thu Dec 10 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-6
- Add a ricci function to set the cluster version, as it's no longer done
  while syncing the configuration files via ccs_sync.



Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-12/ricci.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ricci.spec	10 Dec 2009 16:11:15 -0000	1.21
+++ ricci.spec	10 Dec 2009 22:12:08 -0000	1.22
@@ -10,7 +10,7 @@
 
 Name: ricci
 Version: 0.16.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
@@ -121,6 +121,10 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 10 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-6
+- Add a ricci function to set the cluster version, as it's no longer done
+  while syncing the configuration files via ccs_sync.
+
 * Wed Dec 09 2009 Ryan McCabe <rmccabe at redhat.com> - 0.16.1-5
 - Don't update the cluster version via cman_set_version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Dec 2009 16:11:15 -0000	1.13
+++ sources	10 Dec 2009 22:12:08 -0000	1.14
@@ -1 +1 @@
-1db0532ac01ce1c0058447714eb78a92  ricci-0.16.1.tar.gz
+8def1dca5a6224b3b682e33416f9c3ee  ricci-0.16.1.tar.gz



From cwickert at fedoraproject.org  Thu Dec 10 22:15:30 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 10 Dec 2009 22:15:30 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.498,1.499
Message-ID: <20091210221530.D31D411C025D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv656

Modified Files:
	control-center.spec 
Log Message:
* Wed Dec 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.28.1-12
- Let filesystem package own %{_datadir}/gnome-control-center/default-apps



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -p -r1.498 -r1.499
--- control-center.spec	10 Dec 2009 18:16:15 -0000	1.498
+++ control-center.spec	10 Dec 2009 22:15:30 -0000	1.499
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -413,6 +413,7 @@ fi
 %dir %{_datadir}/gnome/wm-properties
 %dir %{_datadir}/gnome-control-center
 %dir %{_datadir}/gnome-control-center/keybindings
+%dir %{_datadir}/gnome-control-center/default-apps
 
 %files extra
 %defattr(-,root,root)
@@ -422,6 +423,9 @@ fi
 
 
 %changelog
+* Wed Dec 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.28.1-12
+- Let filesystem package own %%{_datadir}/gnome-control-center/default-apps
+
 * Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-11
 - More wm keybinding fixes
 



From slankes at fedoraproject.org  Thu Dec 10 22:21:36 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu, 10 Dec 2009 22:21:36 +0000 (UTC)
Subject: rpms/merkaartor/F-11 merkaartor-log-to-dev-null.patch, NONE,
	1.1 merkaartor.spec, 1.13, 1.14
Message-ID: <20091210222136.E3E6711C025D@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2173/F-11

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-log-to-dev-null.patch 
Log Message:
Add patch to write log to /dev/null by default (bz# 544284)


merkaartor-log-to-dev-null.patch:
 Main.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE merkaartor-log-to-dev-null.patch ---
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char** argv)
 	QApplication app(argc,argv);
 
 #if defined(Q_OS_UNIX)
-	QString logFilename("/tmp/merkaartor.log");
+	QString logFilename("/dev/null");
 #else
 	QString logFilename(qApp->applicationDirPath() + "/merkaartor.log");
 #endif


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-11/merkaartor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- merkaartor.spec	15 Aug 2009 21:22:07 -0000	1.13
+++ merkaartor.spec	10 Dec 2009 22:21:36 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           merkaartor
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://www.merkaartor.org
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
 Patch0:         merkaartor-noqgtkstyle.patch
+Patch1:         merkaartor-log-to-dev-null.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +27,7 @@ transparent display of map features like
 %prep
 %setup -q -n merkaartor-0.14 
 %patch0 -p0
+%patch1 -p1
 find \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x {} \;
 
 %build
@@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Thu Dec 10 2009 Sven Lankes <sven at lank.es> - 0.14-2
+- Write log to /dev/null unless specified (bz# 544284)
+
 * Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
 - 0.14
 



From slankes at fedoraproject.org  Thu Dec 10 22:21:37 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu, 10 Dec 2009 22:21:37 +0000 (UTC)
Subject: rpms/merkaartor/F-12 merkaartor-log-to-dev-null.patch, NONE,
	1.1 merkaartor.spec, 1.15, 1.16
Message-ID: <20091210222137.14AB311C02C8@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2173/F-12

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-log-to-dev-null.patch 
Log Message:
Add patch to write log to /dev/null by default (bz# 544284)


merkaartor-log-to-dev-null.patch:
 Main.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE merkaartor-log-to-dev-null.patch ---
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char** argv)
 	QApplication app(argc,argv);
 
 #if defined(Q_OS_UNIX)
-	QString logFilename("/tmp/merkaartor.log");
+	QString logFilename("/dev/null");
 #else
 	QString logFilename(qApp->applicationDirPath() + "/merkaartor.log");
 #endif


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-12/merkaartor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- merkaartor.spec	12 Aug 2009 14:52:29 -0000	1.15
+++ merkaartor.spec	10 Dec 2009 22:21:36 -0000	1.16
@@ -1,12 +1,13 @@
 Name:           merkaartor
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
+Patch0:         merkaartor-log-to-dev-null.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -23,6 +24,7 @@ transparent display of map features like
 
 %prep
 %setup -q -n merkaartor-0.14 
+%patch0 -p1
 find \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x {} \;
 
 %build
@@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Thu Dec 10 2009 Sven Lankes <sven at lank.es> - 0.14-2
+- Write log to /dev/null unless specified (bz# 544284)
+
 * Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
 - 0.14
 - Remove patch for gdal/qtgtkstyle-related crash - seems to be fixed in gdal



From slankes at fedoraproject.org  Thu Dec 10 22:21:37 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu, 10 Dec 2009 22:21:37 +0000 (UTC)
Subject: rpms/merkaartor/devel merkaartor-log-to-dev-null.patch, NONE,
	1.1 merkaartor.spec, 1.15, 1.16
Message-ID: <20091210222137.6F38A11C025D@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2173/devel

Modified Files:
	merkaartor.spec 
Added Files:
	merkaartor-log-to-dev-null.patch 
Log Message:
Add patch to write log to /dev/null by default (bz# 544284)


merkaartor-log-to-dev-null.patch:
 Main.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE merkaartor-log-to-dev-null.patch ---
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char** argv)
 	QApplication app(argc,argv);
 
 #if defined(Q_OS_UNIX)
-	QString logFilename("/tmp/merkaartor.log");
+	QString logFilename("/dev/null");
 #else
 	QString logFilename(qApp->applicationDirPath() + "/merkaartor.log");
 #endif


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- merkaartor.spec	12 Aug 2009 14:52:29 -0000	1.15
+++ merkaartor.spec	10 Dec 2009 22:21:37 -0000	1.16
@@ -1,12 +1,13 @@
 Name:           merkaartor
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
+Patch0:         merkaartor-log-to-dev-null.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -23,6 +24,7 @@ transparent display of map features like
 
 %prep
 %setup -q -n merkaartor-0.14 
+%patch0 -p1
 find \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x {} \;
 
 %build
@@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Thu Dec 10 2009 Sven Lankes <sven at lank.es> - 0.14-2
+- Write log to /dev/null unless specified (bz# 544284)
+
 * Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
 - 0.14
 - Remove patch for gdal/qtgtkstyle-related crash - seems to be fixed in gdal



From rdieter at fedoraproject.org  Thu Dec 10 22:28:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 10 Dec 2009 22:28:51 +0000 (UTC)
Subject: rpms/Terminal/devel Terminal.spec,1.34,1.35
Message-ID: <20091210222852.05A2511C025D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4742

Modified Files:
	Terminal.spec 
Log Message:
try %pre (and leave out 'C')



Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- Terminal.spec	10 Dec 2009 22:06:08 -0000	1.34
+++ Terminal.spec	10 Dec 2009 22:28:51 -0000	1.35
@@ -52,8 +52,8 @@ if [ $1 -eq 0 ] ; then
 fi
 
 # workaround for # 447156 - rpm cannot change directory to symlink
-%pretrans
-for dir in C ca da fr gl id ja; do
+%pre
+for dir in ca da fr gl id ja; do
 #    [ -d "%{_datadir}/doc/Terminal/$dir/images" -a ! -L "%{_datadir}/doc/Terminal/$dir/images" ] && \
     [ ! -L "%{_datadir}/doc/Terminal/$dir/images" ] && \
     rm -rf %{_datadir}/doc/Terminal/$dir/images  || :



From mnagy at fedoraproject.org  Thu Dec 10 22:34:35 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Thu, 10 Dec 2009 22:34:35 +0000 (UTC)
Subject: File bind-dyndb-ldap-0.1.0a1.tar.bz2 uploaded to lookaside cache by
	mnagy
Message-ID: <20091210223435.5B3ED10F87D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for bind-dyndb-ldap:

1c384f55119335f20b0e0edf2b67d698  bind-dyndb-ldap-0.1.0a1.tar.bz2



From pkgdb at fedoraproject.org  Thu Dec 10 22:37:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:37:46 +0000
Subject: [pkgdb] gnome-desktop: mccann has requested commit
Message-ID: <20091210223746.B5ADC10F890@bastion2.fedora.phx.redhat.com>

mccann has requested the commit acl on gnome-desktop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 22:37:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:37:51 +0000
Subject: [pkgdb] gnome-desktop: mccann has given up watchcommits
Message-ID: <20091210223751.7901410F890@bastion2.fedora.phx.redhat.com>

mccann has given up the watchcommits acl on gnome-desktop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 22:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:38:42 +0000
Subject: [pkgdb] gnome-desktop had acl change status
Message-ID: <20091210223842.9C60410F89A@bastion2.fedora.phx.redhat.com>

rstrode has set the approveacls acl on gnome-desktop (Fedora devel) to Approved for mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 22:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:38:45 +0000
Subject: [pkgdb] gnome-desktop: mccann has given up watchcommits
Message-ID: <20091210223845.96FC510F890@bastion2.fedora.phx.redhat.com>

mccann has given up the watchcommits acl on gnome-desktop (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 22:38:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:38:46 +0000
Subject: [pkgdb] gnome-desktop: mccann has requested commit
Message-ID: <20091210223846.E3BC010F890@bastion2.fedora.phx.redhat.com>

mccann has requested the commit acl on gnome-desktop (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 22:39:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:39:30 +0000
Subject: [pkgdb] gnome-desktop had acl change status
Message-ID: <20091210223930.B702210F890@bastion2.fedora.phx.redhat.com>

rstrode has set the approveacls acl on gnome-desktop (Fedora 12) to Approved for mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 22:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:40:09 +0000
Subject: [pkgdb] gnome-desktop had acl change status
Message-ID: <20091210224009.3F87410F890@bastion2.fedora.phx.redhat.com>

mccann has set the commit acl on gnome-desktop (Fedora 12) to Approved for mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 22:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:40:21 +0000
Subject: [pkgdb] gnome-desktop had acl change status
Message-ID: <20091210224021.A37A810F890@bastion2.fedora.phx.redhat.com>

mccann has set the commit acl on gnome-desktop (Fedora devel) to Approved for mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From mccann at fedoraproject.org  Thu Dec 10 22:42:20 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Thu, 10 Dec 2009 22:42:20 +0000 (UTC)
Subject: rpms/gnome-desktop/F-12 gnome-desktop.spec, 1.232,
	1.233 per-monitor-background.patch, 1.1, 1.2
Message-ID: <20091210224220.B694511C025D@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/gnome-desktop/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8544

Modified Files:
	gnome-desktop.spec per-monitor-background.patch 
Log Message:
Update per-monitor backgrounds patch (gnome #147808)




Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/gnome-desktop.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- gnome-desktop.spec	12 Nov 2009 23:39:36 -0000	1.232
+++ gnome-desktop.spec	10 Dec 2009 22:42:20 -0000	1.233
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.28.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.28.1-6
+- Update per-monitor backgrounds patch (gnome #147808)
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-5
 - Make slideshows work again (gnome #601753)
 

per-monitor-background.patch:
 b/libgnome-desktop/gnome-bg.c            |  251 +++++++++++++++++++------------
 b/libgnome-desktop/libgnomeui/gnome-bg.h |   12 -
 libgnome-desktop/gnome-bg.c              |    8 
 3 files changed, 168 insertions(+), 103 deletions(-)

Index: per-monitor-background.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/per-monitor-background.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- per-monitor-background.patch	9 Nov 2009 23:47:38 -0000	1.1
+++ per-monitor-background.patch	10 Dec 2009 22:42:20 -0000	1.2
@@ -1,50 +1,74 @@
-diff -up gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c.per-monitor-background gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c
---- gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c.per-monitor-background	2009-08-19 11:51:03.000000000 -0400
-+++ gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c	2009-11-09 17:05:49.839583495 -0500
-@@ -168,6 +168,9 @@ static gboolean   get_thumb_annotations 
+From 84657b9565dc5a70d709d2746def73efa0c7cf13 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann at redhat.com>
+Date: Sun, 8 Nov 2009 15:56:23 -0500
+Subject: [PATCH] Per monitors backgrounds support
+
+https://bugzilla.gnome.org/show_bug.cgi?id=147808
+---
+ libgnome-desktop/gnome-bg.c            |  251 ++++++++++++++++++++------------
+ libgnome-desktop/libgnomeui/gnome-bg.h |   11 +-
+ 2 files changed, 164 insertions(+), 98 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
+index a882551..c584147 100644
+--- a/libgnome-desktop/gnome-bg.c
++++ b/libgnome-desktop/gnome-bg.c
+@@ -168,7 +168,9 @@ static gboolean   get_thumb_annotations (GdkPixbuf             *thumb,
  					 int                   *orig_height);
  
  /* Cache */
+-static GdkPixbuf *get_pixbuf           (GnomeBG               *bg);
 +static GdkPixbuf *get_pixbuf_for_size  (GnomeBG               *bg,
 +					int                    width,
 +					int                    height);
- static GdkPixbuf *get_pixbuf           (GnomeBG               *bg);
  static void       clear_cache          (GnomeBG               *bg);
  static gboolean   is_different         (GnomeBG               *bg,
-@@ -685,12 +688,13 @@ get_scaled_pixbuf (GnomeBGPlacement plac
+ 					const char            *filename);
+@@ -183,7 +185,11 @@ static SlideShow * get_as_slideshow    (GnomeBG               *bg,
+ 					const char 	      *filename);
+ static Slide *     get_current_slide   (SlideShow 	      *show,
+ 		   			double    	      *alpha);
+-static gboolean    slideshow_changes_with_size (SlideShow *show);
++static gboolean    slideshow_has_multiple_sizes (SlideShow *show);
++
++static FileSize   *find_best_size      (GSList                *sizes,
++					gint                   width,
++					gint                   height);
+ 
+ static void
+ color_from_string (const char *string,
+@@ -685,12 +691,13 @@ get_scaled_pixbuf (GnomeBGPlacement placement,
  }
  
  static void
 -draw_image (GnomeBGPlacement  placement,
 -	    GdkPixbuf        *pixbuf,
 -	    GdkPixbuf        *dest)
-+draw_image_region (GnomeBGPlacement  placement,
-+		   GdkPixbuf        *pixbuf,
-+		   GdkPixbuf        *dest,
-+		   GdkRectangle     *region)
++draw_image_area (GnomeBGPlacement  placement,
++		 GdkPixbuf        *pixbuf,
++		 GdkPixbuf        *dest,
++		 GdkRectangle     *area)
  {
 -	int dest_width = gdk_pixbuf_get_width (dest);
 -	int dest_height = gdk_pixbuf_get_height (dest);
-+	int dest_width = region->width;
-+	int dest_height = region->height;
++	int dest_width = area->width;
++	int dest_height = area->height;
  	int x, y, w, h;
  	GdkPixbuf *scaled;
  	
-@@ -708,7 +712,7 @@ draw_image (GnomeBGPlacement  placement,
+@@ -708,7 +715,7 @@ draw_image (GnomeBGPlacement  placement,
  	case GNOME_BG_PLACEMENT_CENTERED:
  	case GNOME_BG_PLACEMENT_FILL_SCREEN:
  	case GNOME_BG_PLACEMENT_SCALED:
 -		pixbuf_blend (scaled, dest, 0, 0, w, h, x, y, 1.0);
-+		pixbuf_blend (scaled, dest, 0, 0, w, h, x + region->x, y + region->y, 1.0);
++		pixbuf_blend (scaled, dest, 0, 0, w, h, x + area->x, y + area->y, 1.0);
  		break;
  	default:
  		g_assert_not_reached ();
-@@ -718,15 +722,62 @@ draw_image (GnomeBGPlacement  placement,
+@@ -718,51 +725,82 @@ draw_image (GnomeBGPlacement  placement,
  	g_object_unref (scaled);
  }
  
--void
--gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest)
 +static void
 +draw_image (GnomeBGPlacement  placement,
 +	    GdkPixbuf        *pixbuf,
@@ -57,37 +81,42 @@ diff -up gnome-desktop-2.28.1/libgnome-d
 +	rect.width = gdk_pixbuf_get_width (dest);
 +	rect.height = gdk_pixbuf_get_height (dest);
 +
-+	draw_image_region (placement, pixbuf, dest, &rect);
++	draw_image_area (placement, pixbuf, dest, &rect);
 +}
 +
 +static void
-+draw_on_monitor (GnomeBG *bg, GdkPixbuf *dest, GdkRectangle *region)
++draw_each_monitor (GnomeBG   *bg,
++		   GdkPixbuf *dest,
++		   GdkScreen *screen)
 +{
-+	draw_image_region (bg->placement, get_pixbuf_for_size (bg, region->width, region->height), dest, region);
-+}
++	GdkRectangle rect;
 +
-+static void
-+draw_each_monitor (GnomeBG *bg, GdkPixbuf *dest, GdkScreen *screen)
-+{
 +	if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
++		GdkScreen *screen;
++
 +		/* don't worry about aligning on every monitor */
-+		draw_image (bg->placement, get_pixbuf (bg), dest);
++		screen = gdk_screen_get_default ();
++		gdk_screen_get_monitor_geometry (screen, 0, &rect);
++		draw_image (bg->placement,
++			    get_pixbuf_for_size (bg, rect.width, rect.height),
++			    dest);
 +	} else {
 +		gint num_monitors;
-+		GdkRectangle rect;
 +		int monitor;
 +
 +		num_monitors = gdk_screen_get_n_monitors (screen);
-+
 +		for (monitor = 0; monitor < num_monitors; monitor++) {
 +			gdk_screen_get_monitor_geometry (screen, monitor, &rect);
-+			draw_on_monitor (bg, dest, &rect);
++			draw_image_area (bg->placement,
++					 get_pixbuf_for_size (bg, rect.width, rect.height),
++					 dest, &rect);
 +		}
 +	}
 +}
 +
-+static void
-+draw_on_screen (GnomeBG *bg, GdkPixbuf *dest, GdkScreen *screen)
+ void
+-gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest)
++gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest, GdkScreen *screen)
  {
  	if (!bg)
  		return;
@@ -96,25 +125,287 @@ diff -up gnome-desktop-2.28.1/libgnome-d
  	
 -	draw_image (bg->placement, get_pixbuf (bg), dest);
 +	draw_each_monitor (bg, dest, screen);
-+}
-+
-+void
-+gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest)
-+{
-+	draw_on_screen (bg, dest, gdk_screen_get_default ());
  }
  
  gboolean
-@@ -883,7 +934,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+-gnome_bg_changes_with_size (GnomeBG *bg)
++gnome_bg_has_multiple_sizes (GnomeBG *bg)
+ {
+ 	SlideShow *show;
+ 
+ 	g_return_val_if_fail (bg != NULL, FALSE);
+ 
+ 	show = get_as_slideshow (bg, bg->filename);
+-	if (show) 
+-		return slideshow_changes_with_size (show);
+-	
+-	if (bg->color_type != GNOME_BG_COLOR_SOLID) {
+-		if (!get_pixbuf (bg))
+-			return TRUE;
+-		if (gdk_pixbuf_get_has_alpha (get_pixbuf (bg)))
+-			return TRUE;
+-		if (bg->placement == GNOME_BG_PLACEMENT_CENTERED)
+-			return TRUE;
+-		return FALSE;
+-	}
+-	else if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
+-		return FALSE;
+-	}
+-	else {
+-		return TRUE;
+-	}
++	if (show)
++		return slideshow_has_multiple_sizes (show);
++
++	return FALSE;
+ }
+ 
+ static void
+-gnome_bg_get_pixmap_size (GnomeBG  *bg,
+-			  int       width,
+-			  int       height,
+-			  int      *pixmap_width,
+-			  int      *pixmap_height)
++gnome_bg_get_pixmap_size (GnomeBG   *bg,
++			  int        width,
++			  int        height,
++			  int       *pixmap_width,
++			  int       *pixmap_height)
+ {
+ 	int dummy;
+ 	int pb_width, pb_height;
+@@ -774,8 +812,8 @@ gnome_bg_get_pixmap_size (GnomeBG  *bg,
+ 	
+ 	*pixmap_width = width;
+ 	*pixmap_height = height;
+-	
+-	if (!get_pixbuf (bg)) {
++
++	if (!bg->filename) {
+ 		switch (bg->color_type) {
+ 		case GNOME_BG_COLOR_SOLID:
+ 			*pixmap_width = 1;
+@@ -796,11 +834,13 @@ gnome_bg_get_pixmap_size (GnomeBG  *bg,
+ 		return;
+ 	}
+ 	
+-	pb_width = gdk_pixbuf_get_width (get_pixbuf (bg));
+-	pb_height = gdk_pixbuf_get_height (get_pixbuf (bg));
+-	
+ 	if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
+-		if (gdk_pixbuf_get_has_alpha (get_pixbuf (bg)) &&
++		GdkPixbuf *pixbuf;
++		pixbuf = get_pixbuf_for_size (bg, width, height);
++		pb_width = gdk_pixbuf_get_width (pixbuf);
++		pb_height = gdk_pixbuf_get_height (pixbuf);
++	
++		if (gdk_pixbuf_get_has_alpha (pixbuf) &&
+ 		    bg->color_type != GNOME_BG_COLOR_SOLID) {
+ 			if (bg->color_type == GNOME_BG_COLOR_H_GRADIENT) {
+ 				/* FIXME: Should this be
+@@ -860,6 +900,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+ 	bg->last_pixmap_width = width;
+ 	bg->last_pixmap_height = height;
+ 
++	/* has the side effect of loading and caching pixbuf only when in tile mode */
+ 	gnome_bg_get_pixmap_size (bg, width, height, &pm_width, &pm_height);
+ 	
+ 	if (root) {
+@@ -870,7 +911,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+ 		pixmap = gdk_pixmap_new (window, pm_width, pm_height, -1);
+ 	}
+ 	
+-	if (!get_pixbuf (bg) && bg->color_type == GNOME_BG_COLOR_SOLID) {
++	if (!bg->filename && bg->color_type == GNOME_BG_COLOR_SOLID) {
+ 		GdkGC *gc = gdk_gc_new (pixmap);
+ 		gdk_gc_set_rgb_fg_color (gc, &(bg->primary));
+ 		
+@@ -883,7 +924,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
  		
  		pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
  					 width, height);
 -		gnome_bg_draw (bg, pixbuf);
-+		draw_on_screen (bg, pixbuf, gdk_drawable_get_screen (GDK_DRAWABLE (window)));
++		gnome_bg_draw (bg, pixbuf, gdk_drawable_get_screen (GDK_DRAWABLE (window)));
  		gdk_draw_pixbuf (pixmap, NULL, pixbuf,
  				 0, 0,
  				 0, 0, width, height,
-@@ -1880,13 +1931,16 @@ find_best_size (GSList *sizes, gint widt
+@@ -899,10 +940,13 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+  * clients know what colors to draw on top with
+  */
+ gboolean
+-gnome_bg_is_dark (GnomeBG *bg)
++gnome_bg_is_dark (GnomeBG *bg,
++		  int      width,
++		  int      height)
+ {
+ 	GdkColor color;
+ 	int intensity;
++	GdkPixbuf *pixbuf;
+ 	
+ 	g_return_val_if_fail (bg != NULL, FALSE);
+ 	
+@@ -913,9 +957,9 @@ gnome_bg_is_dark (GnomeBG *bg)
+ 		color.green = (bg->primary.green + bg->secondary.green) / 2;
+ 		color.blue = (bg->primary.blue + bg->secondary.blue) / 2;
+ 	}
+-	
+-	if (get_pixbuf (bg)) {
+-		guint32 argb = pixbuf_average_value (get_pixbuf (bg));
++	pixbuf = get_pixbuf_for_size (bg, width, height);
++	if (pixbuf) {
++		guint32 argb = pixbuf_average_value (pixbuf);
+ 		guchar a = (argb >> 24) & 0xff;
+ 		guchar r = (argb >> 16) & 0xff;
+ 		guchar g = (argb >>  8) & 0xff;
+@@ -1001,9 +1045,31 @@ get_original_size (const char *filename,
+ 	return result;
+ }
+ 
++static const char *
++get_filename_for_size (GnomeBG *bg, gint best_width, gint best_height)
++{
++	SlideShow *show;
++	Slide *slide;
++	FileSize *size;
++
++	if (!bg->filename)
++		return NULL;
++
++	show = get_as_slideshow (bg, bg->filename);
++	if (!show) {
++		return bg->filename;
++	}
++
++	slide = get_current_slide (show, NULL);
++	size = find_best_size (slide->file1, best_width, best_height);
++	return size->file;
++}
++
+ gboolean
+ gnome_bg_get_image_size (GnomeBG	       *bg,
+ 			 GnomeDesktopThumbnailFactory *factory,
++			 int                    best_width,
++			 int                    best_height,
+ 			 int		       *width,
+ 			 int		       *height)
+ {
+@@ -1017,21 +1083,8 @@ gnome_bg_get_image_size (GnomeBG	       *bg,
+ 	if (!bg->filename)
+ 		return FALSE;
+ 	
+-	filename = bg->filename;
++	filename = get_filename_for_size (bg, best_width, best_height);
+ 	thumb = create_thumbnail_for_filename (factory, filename);
+-	
+-	if (!thumb) {
+-		SlideShow *show = get_as_slideshow (bg, bg->filename);
+-		if (show) {
+-			double alpha;
+-			FileSize *fs;
+-			Slide *slide = get_current_slide (show, &alpha);
+-			fs = slide->file1->data;
+-			filename = fs->file;
+-			thumb = create_thumbnail_for_filename (factory, filename);
+-		}
+-	}
+-
+ 	if (thumb) {
+ 		if (get_thumb_annotations (thumb, width, height))
+ 			result = TRUE;
+@@ -1316,7 +1369,7 @@ struct _SlideShow
+ 
+ 	GQueue *slides;
+ 	
+-	gboolean changes_with_size;
++	gboolean has_multiple_sizes;
+ 
+ 	/* used during parsing */
+ 	struct tm start_tm;
+@@ -1356,7 +1409,8 @@ get_current_slide (SlideShow *show,
+ 		Slide *slide = list->data;
+ 
+ 		if (elapsed + slide->duration > delta) {
+-			*alpha = (delta - elapsed) / (double)slide->duration;
++			if (alpha)
++				*alpha = (delta - elapsed) / (double)slide->duration;
+ 			return slide;
+ 		}
+ 
+@@ -1512,7 +1566,10 @@ file_cache_add_slide_show (GnomeBG *bg,
+ }
+ 
+ static GdkPixbuf *
+-get_as_pixbuf (GnomeBG *bg, const char *filename)
++get_as_pixbuf_for_size (GnomeBG    *bg,
++			const char *filename,
++			int         best_width,
++			int         best_height)
+ {
+ 	const FileCacheEntry *ent;
+ 	if ((ent = file_cache_lookup (bg, PIXBUF, filename))) {
+@@ -1523,14 +1580,14 @@ get_as_pixbuf (GnomeBG *bg, const char *filename)
+ 		GdkPixbuf *pixbuf;
+ 
+ 		/* If scalable choose maximum size */
+-		format = gdk_pixbuf_get_file_info (bg->filename, NULL, NULL);
++		format = gdk_pixbuf_get_file_info (filename, NULL, NULL);
+ 		if (format != NULL &&
+ 		    strcmp (gdk_pixbuf_format_get_name (format), "svg") == 0 &&
+-		    (bg->last_pixmap_width > 0 && bg->last_pixmap_height > 0) &&
++		    (best_width > 0 && best_height > 0) &&
+ 		    (bg->placement == GNOME_BG_PLACEMENT_FILL_SCREEN ||
+ 		     bg->placement == GNOME_BG_PLACEMENT_SCALED ||
+ 		     bg->placement == GNOME_BG_PLACEMENT_ZOOMED))
+-			pixbuf = gdk_pixbuf_new_from_file_at_size (filename, bg->last_pixmap_width, bg->last_pixmap_height, NULL);
++			pixbuf = gdk_pixbuf_new_from_file_at_size (filename, best_width, best_height, NULL);
+ 		else
+ 			pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ 
+@@ -1784,8 +1841,7 @@ create_img_thumbnail (GnomeBG                      *bg,
+ 				if (slide->fixed) {
+ 					GdkPixbuf *tmp;
+ 					FileSize *fs;
+-					
+-					fs = slide->file1->data;
++					fs = find_best_size (slide->file1, dest_width, dest_height);
+ 					tmp = get_as_thumbnail (bg, factory, fs->file);
+ 
+ 					thumb = scale_thumbnail (
+@@ -1793,26 +1849,23 @@ create_img_thumbnail (GnomeBG                      *bg,
+ 						tmp, screen, dest_width, dest_height);
+ 				}
+ 				else {
+-					FileSize *fs;
++					FileSize *fs1, *fs2;
+ 					GdkPixbuf *p1, *p2;
++					fs1 = find_best_size (slide->file1, dest_width, dest_height);
++					p1 = get_as_thumbnail (bg, factory, fs1->file);
+ 
+-					fs = slide->file1->data;
+-					p1 = get_as_thumbnail (bg, factory, fs->file);
+-
+-					fs = slide->file2->data;
+-					p2 = get_as_thumbnail (bg, factory, fs->file);
++					fs2 = find_best_size (slide->file2, dest_width, dest_height);
++					p2 = get_as_thumbnail (bg, factory, fs2->file);
+ 
+ 					if (p1 && p2) {
+ 						GdkPixbuf *thumb1, *thumb2;
+ 
+-						fs = slide->file1->data;
+ 						thumb1 = scale_thumbnail (
+-							bg->placement, fs->file,
++							bg->placement, fs1->file,
+ 							p1, screen, dest_width, dest_height);
+ 
+-						fs = slide->file2->data;
+ 						thumb2 = scale_thumbnail (
+-							bg->placement, fs->file,
++							bg->placement, fs2->file,
+ 							p2, screen, dest_width, dest_height);
+ 
+ 						thumb = blend (thumb1, thumb2, alpha);
+@@ -1880,18 +1933,26 @@ find_best_size (GSList *sizes, gint width, gint height)
  }
  
  static GdkPixbuf *
@@ -123,56 +414,152 @@ diff -up gnome-desktop-2.28.1/libgnome-d
  {
  	/* FIXME: this ref=TRUE/FALSE stuff is crazy */
 -	
-+	gint width, height;
  	guint time_until_next_change;
  	gboolean ref = FALSE;
 -	
+-	if (!bg->pixbuf_cache && bg->filename) {
++	gboolean hit_cache = FALSE;
 +
-+	width = (best_width > 0) ? best_width : bg->last_pixmap_width;
-+	height = (best_height > 0) ? best_height : bg->last_pixmap_height;
++	/* only hit the cache if the aspect ratio matches */
++	if (bg->pixbuf_cache) {
++		int width, height;
++		width = gdk_pixbuf_get_width (bg->pixbuf_cache);
++		height = gdk_pixbuf_get_height (bg->pixbuf_cache);
++		hit_cache = 0.2 > fabs ((best_width / (double)best_height) - (width / (double)height));
++	}
 +
- 	if (!bg->pixbuf_cache && bg->filename) {
++	if (!hit_cache && bg->filename) {
  		ref = TRUE;
  		bg->file_mtime = get_mtime (bg->filename);
-@@ -1906,15 +1960,15 @@ get_pixbuf (GnomeBG *bg)
+ 		
+-		bg->pixbuf_cache = get_as_pixbuf (bg, bg->filename);
++		bg->pixbuf_cache = get_as_pixbuf_for_size (bg, bg->filename, best_width, best_height);
+ 		time_until_next_change = G_MAXUINT;
+ 		if (!bg->pixbuf_cache) {
+ 			SlideShow *show = get_as_slideshow (bg, bg->filename);
+@@ -1906,16 +1967,16 @@ get_pixbuf (GnomeBG *bg)
  				time_until_next_change = (guint)get_slide_timeout (slide);
  				if (slide->fixed) {
  					FileSize *size;
 -					size = find_best_size (slide->file1, bg->last_pixmap_width, bg->last_pixmap_height);
-+					size = find_best_size (slide->file1, width, height);
- 					bg->pixbuf_cache = get_as_pixbuf (bg, size->file);
+-					bg->pixbuf_cache = get_as_pixbuf (bg, size->file);
++					size = find_best_size (slide->file1, best_width, best_height);
++					bg->pixbuf_cache = get_as_pixbuf_for_size (bg, size->file, best_width, best_height);
  				}
  				else {
  					FileSize *size;
  					GdkPixbuf *p1, *p2;
 -					size = find_best_size (slide->file1, bg->last_pixmap_width, bg->last_pixmap_height);
-+					size = find_best_size (slide->file1, width, height);
- 					p1 = get_as_pixbuf (bg, size->file);
+-					p1 = get_as_pixbuf (bg, size->file);
 -					size = find_best_size (slide->file2, bg->last_pixmap_width, bg->last_pixmap_height);
-+					size = find_best_size (slide->file2, width, height);
- 					p2 = get_as_pixbuf (bg, size->file);
+-					p2 = get_as_pixbuf (bg, size->file);
++					size = find_best_size (slide->file1, best_width, best_height);
++					p1 = get_as_pixbuf_for_size (bg, size->file, best_width, best_height);
++					size = find_best_size (slide->file2, best_width, best_height);
++					p2 = get_as_pixbuf_for_size (bg, size->file, best_width, best_height);
  
  
-@@ -1943,6 +1997,22 @@ get_pixbuf (GnomeBG *bg)
- 	return bg->pixbuf_cache;
+ 					if (p1 && p2) {
+@@ -2368,14 +2429,14 @@ handle_text (GMarkupParseContext *context,
+ 		fs->file = g_strdup (text);
+ 		slide->file1 = g_slist_prepend (slide->file1, fs);
+ 		if (slide->file1->next != NULL)
+-			parser->changes_with_size = TRUE;                       
++			parser->has_multiple_sizes = TRUE;                       
+ 	}
+ 	else if (stack_is (parser, "size", "file", "static", "background", NULL) ||
+ 		 stack_is (parser, "size", "from", "transition", "background", NULL)) {
+ 		fs = slide->file1->data;
+ 		fs->file = g_strdup (text);
+ 		if (slide->file1->next != NULL)
+-			parser->changes_with_size = TRUE; 
++			parser->has_multiple_sizes = TRUE; 
+ 	}
+ 	else if (stack_is (parser, "to", "transition", "background", NULL)) {
+ 		for (i = 0; text[i]; i++) {
+@@ -2390,13 +2451,13 @@ handle_text (GMarkupParseContext *context,
+ 		fs->file = g_strdup (text);
+ 		slide->file2 = g_slist_prepend (slide->file2, fs);
+ 		if (slide->file2->next != NULL)
+-			parser->changes_with_size = TRUE;                       
++			parser->has_multiple_sizes = TRUE;                       
+ 	}
+ 	else if (stack_is (parser, "size", "to", "transition", "background", NULL)) {
+ 		fs = slide->file2->data;
+ 		fs->file = g_strdup (text);
+ 		if (slide->file2->next != NULL)
+-			parser->changes_with_size = TRUE;
++			parser->has_multiple_sizes = TRUE;
+ 	}
+ }
+ 
+@@ -2639,9 +2700,9 @@ get_thumb_annotations (GdkPixbuf *thumb,
  }
  
-+static GdkPixbuf *
-+get_pixbuf (GnomeBG *bg)
-+{
-+	GdkPixbuf   *pixbuf;
-+	GdkScreen   *screen;
-+	GdkRectangle rect;
-+
-+	screen = gdk_screen_get_default ();
-+
-+	/* default to caching the primary monitor */
-+	gdk_screen_get_monitor_geometry (screen, 0, &rect);
-+	pixbuf = get_pixbuf_for_size (bg, rect.width, rect.height);
-+
-+	return pixbuf;
-+}
-+
  static gboolean
- is_different (GnomeBG    *bg,
- 	      const char *filename)
+-slideshow_changes_with_size (SlideShow *show)
++slideshow_has_multiple_sizes (SlideShow *show)
+ {
+-	return show->changes_with_size;
++	return show->has_multiple_sizes;
+ }
+ 
+ /*
+diff --git a/libgnome-desktop/libgnomeui/gnome-bg.h b/libgnome-desktop/libgnomeui/gnome-bg.h
+index 993173a..ddf9e5c 100644
+--- a/libgnome-desktop/libgnomeui/gnome-bg.h
++++ b/libgnome-desktop/libgnomeui/gnome-bg.h
+@@ -87,7 +87,8 @@ const gchar *    gnome_bg_get_filename          (GnomeBG               *bg);
+ 
+ /* Drawing and thumbnailing */
+ void             gnome_bg_draw                  (GnomeBG               *bg,
+-						 GdkPixbuf             *dest);
++						 GdkPixbuf             *dest,
++						 GdkScreen	       *screen);
+ GdkPixmap *      gnome_bg_create_pixmap         (GnomeBG               *bg,
+ 						 GdkWindow             *window,
+ 						 int                    width,
+@@ -95,6 +96,8 @@ GdkPixmap *      gnome_bg_create_pixmap         (GnomeBG               *bg,
+ 						 gboolean               root);
+ gboolean         gnome_bg_get_image_size        (GnomeBG               *bg,
+ 						 GnomeDesktopThumbnailFactory *factory,
++                                                 int                    best_width,
++                                                 int                    best_height,
+ 						 int                   *width,
+ 						 int                   *height);
+ GdkPixbuf *      gnome_bg_create_thumbnail      (GnomeBG               *bg,
+@@ -102,8 +105,10 @@ GdkPixbuf *      gnome_bg_create_thumbnail      (GnomeBG               *bg,
+ 						 GdkScreen             *screen,
+ 						 int                    dest_width,
+ 						 int                    dest_height);
+-gboolean         gnome_bg_is_dark               (GnomeBG               *bg);
+-gboolean         gnome_bg_changes_with_size     (GnomeBG               *bg);
++gboolean         gnome_bg_is_dark               (GnomeBG               *bg,
++                                                 int                    dest_width,
++						 int                    dest_height);
++gboolean         gnome_bg_has_multiple_sizes    (GnomeBG               *bg);
+ gboolean         gnome_bg_changes_with_time     (GnomeBG               *bg);
+ GdkPixbuf *      gnome_bg_create_frame_thumbnail (GnomeBG              *bg,
+ 						 GnomeDesktopThumbnailFactory *factory,
+-- 
+1.6.5.2
+
+diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
+index c584147..f050e70 100644
+--- a/libgnome-desktop/gnome-bg.c
++++ b/libgnome-desktop/gnome-bg.c
+@@ -1843,10 +1843,10 @@ create_img_thumbnail (GnomeBG                      *bg,
+ 					FileSize *fs;
+ 					fs = find_best_size (slide->file1, dest_width, dest_height);
+ 					tmp = get_as_thumbnail (bg, factory, fs->file);
+-
+-					thumb = scale_thumbnail (
+-						bg->placement, fs->file,
+-						tmp, screen, dest_width, dest_height);
++					if (tmp)
++						thumb = scale_thumbnail (
++									 bg->placement, fs->file,
++									 tmp, screen, dest_width, dest_height);
+ 				}
+ 				else {
+ 					FileSize *fs1, *fs2;



From pkgdb at fedoraproject.org  Thu Dec 10 22:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:43:09 +0000
Subject: [pkgdb] nautilus: rstrode has requested approveacls
Message-ID: <20091210224309.B1AD210F89D@bastion2.fedora.phx.redhat.com>

rstrode has requested the approveacls acl on nautilus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 22:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:43:20 +0000
Subject: [pkgdb] nautilus: mccann has given up watchcommits
Message-ID: <20091210224321.0C8E010F89A@bastion2.fedora.phx.redhat.com>

mccann has given up the watchcommits acl on nautilus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 22:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:43:22 +0000
Subject: [pkgdb] nautilus: mccann has requested commit
Message-ID: <20091210224322.756D510F89A@bastion2.fedora.phx.redhat.com>

mccann has requested the commit acl on nautilus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 22:43:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:43:31 +0000
Subject: [pkgdb] nautilus: mccann has given up watchcommits
Message-ID: <20091210224331.91AB710F890@bastion2.fedora.phx.redhat.com>

mccann has given up the watchcommits acl on nautilus (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 22:43:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:43:32 +0000
Subject: [pkgdb] nautilus: mccann has requested commit
Message-ID: <20091210224332.D4D3210F890@bastion2.fedora.phx.redhat.com>

mccann has requested the commit acl on nautilus (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 22:44:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:44:19 +0000
Subject: [pkgdb] control-center: mccann has given up watchcommits
Message-ID: <20091210224419.DFB3B10F89A@bastion2.fedora.phx.redhat.com>

mccann has given up the watchcommits acl on control-center (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 22:44:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:44:20 +0000
Subject: [pkgdb] control-center: mccann has requested commit
Message-ID: <20091210224420.B75A210F890@bastion2.fedora.phx.redhat.com>

mccann has requested the commit acl on control-center (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 22:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:44:24 +0000
Subject: [pkgdb] control-center: mccann has given up watchcommits
Message-ID: <20091210224424.F3F2810F890@bastion2.fedora.phx.redhat.com>

mccann has given up the watchcommits acl on control-center (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 22:44:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 22:44:25 +0000
Subject: [pkgdb] control-center: mccann has requested commit
Message-ID: <20091210224425.5DB6410F89C@bastion2.fedora.phx.redhat.com>

mccann has requested the commit acl on control-center (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From mnagy at fedoraproject.org  Thu Dec 10 22:47:24 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Thu, 10 Dec 2009 22:47:24 +0000 (UTC)
Subject: rpms/bind-dyndb-ldap/devel bind-dyndb-ldap.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <20091210224724.9E01C11C025D@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind-dyndb-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10140

Modified Files:
	bind-dyndb-ldap.spec sources 
Log Message:
* Thu Dec 10 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.6.a1.20091210git
- update to the latest git snapshot
- change upstream URL, project moved to fedorahosted
- change license to GPL version 2 or later
- add epoch to versioned requires
- add krb5-devel to the list of build requires



Index: bind-dyndb-ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/bind-dyndb-ldap/devel/bind-dyndb-ldap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bind-dyndb-ldap.spec	1 Dec 2009 14:45:18 -0000	1.5
+++ bind-dyndb-ldap.spec	10 Dec 2009 22:47:24 -0000	1.6
@@ -1,17 +1,19 @@
 Name:           bind-dyndb-ldap
 Version:        0.1.0
-Release:        0.5.a1%{?dist}
+Release:        0.6.a1.20091210git%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 Group:          System Environment/Libraries
-License:        GPLv2
-URL:            http://mnagy.github.com/bind-dyndb-ldap
-Source0:        http://cloud.github.com/downloads/mnagy/%{name}/%{name}-%{version}a1.tar.bz2
+License:        GPLv2+
+URL:            https://fedorahosted.org/bind-dyndb-ldap
+Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}a1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bind-devel >= 9.6.1-0.3.b1
+BuildRequires:  bind-devel >= 32:9.6.1-0.3.b1
+BuildRequires:  krb5-devel
 BuildRequires:  openldap-devel
-Requires:       bind >= 9.6.1-0.3.b1
+
+Requires:       bind >= 32:9.6.1-0.3.b1
 
 %description
 This package provides an LDAP back-end plug-in for BIND. It features
@@ -48,6 +50,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.6.a1.20091210git
+- update to the latest git snapshot
+- change upstream URL, project moved to fedorahosted
+- change license to GPL version 2 or later
+- add epoch to versioned requires
+- add krb5-devel to the list of build requires
+
 * Tue Dec 01 2009 Adam Tkac <atkac redhat com> - 0.1.0-0.5.a1
 - rebuild against new bind
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bind-dyndb-ldap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 May 2009 07:19:36 -0000	1.2
+++ sources	10 Dec 2009 22:47:24 -0000	1.3
@@ -1 +1 @@
-d2ccf56cc4e1018a667802cc084f0c2e  bind-dyndb-ldap-0.1.0a1.tar.bz2
+1c384f55119335f20b0e0edf2b67d698  bind-dyndb-ldap-0.1.0a1.tar.bz2



From nalin at fedoraproject.org  Thu Dec 10 22:50:50 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 10 Dec 2009 22:50:50 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.220,1.221
Message-ID: <20091210225050.E399E11C03E3@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11093

Modified Files:
	krb5.spec 
Log Message:
- move man pages that live in the -libs subpackage into the regular
  %%{_mandir} tree where they'll still be found if that package is the
  only one %installed (#529319)



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- krb5.spec	9 Dec 2009 21:40:48 -0000	1.220
+++ krb5.spec	10 Dec 2009 22:50:50 -0000	1.221
@@ -216,6 +216,11 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Thu Dec 10 2009 Nalin Dahyabhai <nalin at redhat.com>
+- move man pages that live in the -libs subpackage into the regular
+  %%{_mandir} tree where they'll still be found if that package is the
+  only one %installed (#529319)
+
 * Wed Dec  9 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-13
 - and put it back in
 
@@ -1690,6 +1695,13 @@ for library in libgssapi_krb5 libgssrpc 
 	popd
 done
 
+# Move man pages which will be in the -libs subpackage into %%{_mandir}'s tree.
+for man in man1/tmac.doc man1/kerberos.1 man5/.k5login.5 man5/krb5.conf.5 ; do
+	mkdir -p $RPM_BUILD_ROOT/%{_mandir}/${man%%/*}
+	mv $RPM_BUILD_ROOT/%{krb5prefix}/man/${man} \
+	   $RPM_BUILD_ROOT/%{_mandir}/${man%%/*}/
+done
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -1987,14 +1999,10 @@ exit 0
 %doc README
 %docdir %{krb5prefix}/man
 %verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf
-%dir %{krb5prefix}
-%dir %{krb5prefix}/man
-%dir %{krb5prefix}/man/man1
-%dir %{krb5prefix}/man/man5
-%{krb5prefix}/man/man1/tmac.doc*
-%{krb5prefix}/man/man1/kerberos.1*
-%{krb5prefix}/man/man5/.k5login.5*
-%{krb5prefix}/man/man5/krb5.conf.5*
+/%{_mandir}/man1/tmac.doc*
+/%{_mandir}/man1/kerberos.1*
+/%{_mandir}/man5/.k5login.5*
+/%{_mandir}/man5/krb5.conf.5*
 /%{_lib}/libgssapi_krb5.so.*
 /%{_lib}/libgssrpc.so.*
 /%{_lib}/libk5crypto.so.*



From pkgdb at fedoraproject.org  Thu Dec 10 23:14:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:14:19 +0000
Subject: [pkgdb] gnome-desktop: krh has given up watchcommits
Message-ID: <20091210231419.5A38710F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-desktop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 23:14:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:14:23 +0000
Subject: [pkgdb] gnome-desktop: krh has given up watchcommits
Message-ID: <20091210231423.B7C1D10F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-desktop (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 23:14:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:14:27 +0000
Subject: [pkgdb] gnome-desktop: krh has given up watchcommits
Message-ID: <20091210231427.C1A1E10F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-desktop (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 23:14:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:14:30 +0000
Subject: [pkgdb] gnome-desktop: krh has given up watchcommits
Message-ID: <20091210231430.C40ED10F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-desktop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 23:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:14:33 +0000
Subject: [pkgdb] gnome-desktop: krh has given up watchcommits
Message-ID: <20091210231433.DF5CC10F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-desktop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 23:14:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:14:37 +0000
Subject: [pkgdb] gnome-desktop: krh has given up watchcommits
Message-ID: <20091210231437.60FFA10F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-desktop (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 23:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:14:39 +0000
Subject: [pkgdb] gnome-desktop: krh has given up watchcommits
Message-ID: <20091210231440.1375710F89C@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-desktop (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-desktop



From pkgdb at fedoraproject.org  Thu Dec 10 23:15:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:15:45 +0000
Subject: [pkgdb] control-center: krh has given up watchcommits
Message-ID: <20091210231545.6A56A10F89D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on control-center (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 23:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:15:47 +0000
Subject: [pkgdb] control-center: krh has given up watchcommits
Message-ID: <20091210231547.B061510F89D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on control-center (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 23:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:15:49 +0000
Subject: [pkgdb] control-center: krh has given up watchcommits
Message-ID: <20091210231549.9D19C10F89D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on control-center (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 23:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:15:53 +0000
Subject: [pkgdb] control-center: krh has given up watchcommits
Message-ID: <20091210231553.49E8810F89D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on control-center (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 23:15:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:15:56 +0000
Subject: [pkgdb] control-center: krh has given up watchcommits
Message-ID: <20091210231556.8B72610F89E@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on control-center (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 23:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:15:59 +0000
Subject: [pkgdb] control-center: krh has given up watchcommits
Message-ID: <20091210231559.6D07C10F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on control-center (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pkgdb at fedoraproject.org  Thu Dec 10 23:16:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:16:01 +0000
Subject: [pkgdb] control-center: krh has given up watchcommits
Message-ID: <20091210231601.BB29310F89D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on control-center (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From pghmcfc at fedoraproject.org  Thu Dec 10 23:19:15 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 10 Dec 2009 23:19:15 +0000 (UTC)
Subject: File proftpd-1.3.2c.tar.bz2 uploaded to lookaside cache by pghmcfc
Message-ID: <20091210231915.6507D10F87D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for proftpd:

559fd3fb6959d42ddd66b333a03b0c49  proftpd-1.3.2c.tar.bz2



From otaylor at fedoraproject.org  Thu Dec 10 23:19:39 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu, 10 Dec 2009 23:19:39 +0000 (UTC)
Subject: rpms/metacity/F-12 Add-XFCE-Terminal-as-a-terminal.patch, NONE,
	1.1 Add-a-newwindowsalwaysontop-preference.patch, NONE,
	1.1 Add-nofocuswindows-preference-to-list-windows-that.patch, NONE,
	1.1 Allow-applications-to-raise-windows-when-raise_on_cl.patch, NONE, 
	1.1 Allow-explicit-raises-from-same-client-not-just-sa.patch, NONE,
	1.1 Dont-focus-ancestor-window-on-a-different-workspac.patch,
	NONE, 1.1 Dont-warn-about-a-missing-session-file.patch, NONE,
	1.1 For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch,
	NONE, 1.1 cm-selection-timestamp.patch, NONE,
	1.1 metacity-2.28-empty-keybindings.patch, NONE,
	1.1 metacity-2.28-visual-bell.patch, NONE,
	1.1 metacity-2.28-xioerror-unknown-display.patch, NONE,
	1.1 metacity.spec, 1.214, 1.215
Message-ID: <20091210231939.65C4411C025D@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18967

Modified Files:
	metacity.spec 
Added Files:
	Add-XFCE-Terminal-as-a-terminal.patch 
	Add-a-newwindowsalwaysontop-preference.patch 
	Add-nofocuswindows-preference-to-list-windows-that.patch 
	Allow-applications-to-raise-windows-when-raise_on_cl.patch 
	Allow-explicit-raises-from-same-client-not-just-sa.patch 
	Dont-focus-ancestor-window-on-a-different-workspac.patch 
	Dont-warn-about-a-missing-session-file.patch 
	For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch 
	cm-selection-timestamp.patch 
	metacity-2.28-empty-keybindings.patch 
	metacity-2.28-visual-bell.patch 
	metacity-2.28-xioerror-unknown-display.patch 
Log Message:
* Thu Dec 10 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-12
- Require gnome-themes rather than nodoka-metacity-theme (rhbz 532455, Stijn Hoop)
- Add patches for GNOME bugs
   445447 - Application-induced window raise fails when raise_on_click off (rhbz 526045)
   530702 - compiz doesn't start if metacity compositor is enabled (rhbz 537791)
   559816 - Doesn't update keybindings being disabled/cleared (rhbz 532282)
   567528 - Cannot raise windows from applications in Tcl/Tk and Java (rhbz 503522)
   577576 - Failed to read saved session file warning on new sessions (rhbz 493245)
   598231 - When Chromium rings the bell, metacity quits(rhbz 532282)
   598995 - Don't focus ancestor window on a different workspace (rhbz 237158)
   599097 - For mouse and sloppy focus, return to "mouse mode" on motion (rhbz 530261)
   599248 - Add no_focus_windows preference to list windows that shouldn't be focused (rhbz 530262)
   599261 - Add a new_windows_always_on_top preference (rhbz 530263)
   599262 - Add XFCE Terminal as a terminal
   604319 - XIOError unknown display (rhbz 537845)


Add-XFCE-Terminal-as-a-terminal.patch:
 window.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE Add-XFCE-Terminal-as-a-terminal.patch ---
>From bf7327acb41a43b2bdeee9f0855455ebaef8b816 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Wed, 21 Oct 2009 21:11:46 -0400
Subject: [PATCH] Add XFCE Terminal as a terminal

Include the XFCE terminal program 'Terminal' in the list of terminals.

https://bugzilla.gnome.org/show_bug.cgi?id=599262
---
 src/core/window.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/core/window.c b/src/core/window.c
index 0ae6a01..b481ccf 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1951,6 +1951,9 @@ __window_is_terminal (MetaWindow *window)
   /* mlterm ("multi lingual terminal emulator on X") */
   else if (strcmp (window->res_class, "mlterm") == 0)
     return TRUE;
+  /* Terminal -- XFCE Terminal */
+  else if (strcmp (window->res_class, "Terminal") == 0)
+    return TRUE;
 
   return FALSE;
 }
-- 
1.6.5.rc2
Add-a-newwindowsalwaysontop-preference.patch:
 core/prefs.c           |   17 ++++++++++++++++-
 core/window.c          |    6 +++++-
 include/prefs.h        |    2 ++
 metacity.schemas.in.in |   30 +++++++++++++++++++++++++++++-
 4 files changed, 52 insertions(+), 3 deletions(-)

--- NEW FILE Add-a-newwindowsalwaysontop-preference.patch ---
>From c4fba8198bacc8ecf911cb15c9cd9314f3204a85 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Wed, 21 Oct 2009 19:22:35 -0400
Subject: [PATCH] Add a new_windows_always_on_top preference

Add a /apps/metacity/general/new_windows_always_on_top preference.
When set, new windows are always placed on top, even if they are
denied focus.

This is useful on large screens and multihead setups where the
tasklist can be hard to notice and difficult to mouse to, so the
normal behavior of flashing in the tasklist is less effective.
---
 src/core/prefs.c           |   17 ++++++++++++++++-
 src/core/window.c          |    6 +++++-
 src/include/prefs.h        |    2 ++
 src/metacity.schemas.in.in |   29 +++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/core/prefs.c b/src/core/prefs.c
index e03c816..1bf888b 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -79,6 +79,7 @@ static MetaFocusMode focus_mode = META_FOCUS_MODE_CLICK;
 static MetaFocusNewWindows focus_new_windows = META_FOCUS_NEW_WINDOWS_SMART;
 static GSList *no_focus_windows = NULL;
 static gboolean raise_on_click = TRUE;
+static gboolean new_windows_always_on_top = TRUE;
 static char* current_theme = NULL;
 static int num_workspaces = 4;
 static MetaActionTitlebar action_double_click_titlebar = META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE;
@@ -358,6 +359,11 @@ static MetaBoolPreference preferences_bool[] =
       &raise_on_click,
       TRUE,
     },
+    { "/apps/metacity/general/new_windows_always_on_top",
+      META_PREF_NEW_WINDOWS_ALWAYS_ON_TOP,
+      &new_windows_always_on_top,
+      TRUE,
+    },
     { "/apps/metacity/general/titlebar_uses_system_font",
       META_PREF_TITLEBAR_FONT, /* note! shares a pref */
       &use_system_font,
@@ -1271,6 +1277,12 @@ meta_prefs_get_raise_on_click (void)
   return raise_on_click || focus_mode == META_FOCUS_MODE_CLICK;
 }
 
+gboolean
+meta_prefs_get_new_windows_always_on_top (void)
+{
+  return new_windows_always_on_top;
+}
+
 const char*
 meta_prefs_get_theme (void)
 {
@@ -1709,7 +1721,10 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_RAISE_ON_CLICK:
       return "RAISE_ON_CLICK";
-      
+
+    case META_PREF_NEW_WINDOWS_ALWAYS_ON_TOP:
+      return "NEW_WINDOWS_ALWAYS_ON_TOP";
+
     case META_PREF_THEME:
       return "THEME";
 
diff --git a/src/core/window.c b/src/core/window.c
index 10da47a..0ae6a01 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1983,7 +1983,7 @@ window_state_on_map (MetaWindow *window,
   if (!(window->input || window->take_focus))
     {
       *takes_focus = FALSE;
-      return;
+      goto out;
     }
 
   /* Terminal usage may be different; some users intend to launch
@@ -2030,6 +2030,10 @@ window_state_on_map (MetaWindow *window,
       /* The default is correct for these */
       break;
     }
+
+ out:
+  if (meta_prefs_get_new_windows_always_on_top ())
+    *places_on_top = TRUE;
 }
 
 static gboolean
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 6698dfe..8c7cd09 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -35,6 +35,7 @@ typedef enum
   META_PREF_FOCUS_MODE,
   META_PREF_FOCUS_NEW_WINDOWS,
   META_PREF_RAISE_ON_CLICK,
+  META_PREF_NEW_WINDOWS_ALWAYS_ON_TOP,
   META_PREF_ACTION_DOUBLE_CLICK_TITLEBAR,
   META_PREF_ACTION_MIDDLE_CLICK_TITLEBAR,
   META_PREF_ACTION_RIGHT_CLICK_TITLEBAR,
@@ -81,6 +82,7 @@ guint                       meta_prefs_get_mouse_button_menu  (void);
 MetaFocusMode               meta_prefs_get_focus_mode         (void);
 MetaFocusNewWindows         meta_prefs_get_focus_new_windows  (void);
 gboolean                    meta_prefs_get_raise_on_click     (void);
+gboolean                    meta_prefs_get_new_windows_always_on_top (void);
 const char*                 meta_prefs_get_theme              (void);
 /* returns NULL if GTK default should be used */
 const PangoFontDescription* meta_prefs_get_titlebar_font      (void);
diff --git a/src/metacity.schemas.in.in b/src/metacity.schemas.in.in
index 25ca5f3..14155fa 100644
--- a/src/metacity.schemas.in.in
+++ b/src/metacity.schemas.in.in
@@ -166,6 +166,35 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/metacity/general/new_windows_always_on_top</key>
+      <applyto>/apps/metacity/general/new_windows_always_on_top</applyto>
+      <owner>metacity</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Whether new windows should always be placed on top</short>
+         <long>
+           The normal behavior is that if a new window is not given the
+	   focus (since, for example, the user has interacted with another
+	   window after launching an application), then if the window would
+	   be stacked on top of the focus window, the window is instead
+	   stacked beneath and flashed in the taskbar. This behavior can
+	   be annoying on large screens and multihead setups where the
+	   taskbar is hard to notice and difficult to get to, so this option,
+	   if set, disables this behavior, and new windows are always placed
+	   on top, whether or not they get focus.
+
+           Note that if this option is set, a new window may completely hide
+	   the focus window but not get focus itself, which can be quite confusing
+	   to users. Also, note that setting this option breaks the normal
+	   invariant in the 'click' focus mode that the topmost window always
+	   has focus, so its most suitable for use with the 'mouse' and
+	   'sloppy' focus modes.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/metacity/general/action_double_click_titlebar</key>
       <applyto>/apps/metacity/general/action_double_click_titlebar</applyto>
       <owner>metacity</owner>
-- 
1.6.5.rc2


Add-nofocuswindows-preference-to-list-windows-that.patch:
 Makefile.am            |    2 
 core/prefs.c           |   43 +++
 core/window-matcher.c  |  582 +++++++++++++++++++++++++++++++++++++++++++++++++
 core/window-matcher.h  |   46 +++
 core/window.c          |    9 
 include/prefs.h        |    6 
 metacity.schemas.in.in |   28 ++
 7 files changed, 714 insertions(+), 2 deletions(-)

--- NEW FILE Add-nofocuswindows-preference-to-list-windows-that.patch ---
>From 88c66808ec5f2bfba425fc6d6f0b9ac43ed44696 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Wed, 21 Oct 2009 18:07:12 -0400
Subject: [PATCH] Add no_focus_windows preference to list windows that shouldn't be focused

Notification windows from legacy software that don't set _NET_WM_USER_TIME
can be a huge annoyance for users, since they will pop up and steal focus.

Add:

 /apps/metacity/general/no_focus_windows

which is a list of expressions identifying new windows that shouldn't ever
be focused. For example:

 (and (eq class 'Mylegacyapp') (glob name 'New mail*'))

https://bugzilla.gnome.org/show_bug.cgi?id=599248
---
 src/Makefile.am            |    2 +
 src/core/prefs.c           |   43 ++++
 src/core/window-matcher.c  |  582 ++++++++++++++++++++++++++++++++++++++++++++
 src/core/window-matcher.h  |   46 ++++
 src/core/window.c          |    9 +-
 src/include/prefs.h        |    6 +-
 src/metacity.schemas.in.in |   28 ++
 7 files changed, 714 insertions(+), 2 deletions(-)
 create mode 100644 src/core/window-matcher.c
 create mode 100644 src/core/window-matcher.h

diff --git a/src/Makefile.am b/src/Makefile.am
index bd3420f..3baf422 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,8 @@ metacity_SOURCES= 				\
 	core/stack.h				\
 	core/util.c				\
 	include/util.h				\
+	core/window-matcher.c			\
+	core/window-matcher.h			\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 6e41b3c..e03c816 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -25,6 +25,7 @@
 
 #include <config.h>
 #include "prefs.h"
+#include "window-matcher.h"
 #include "ui.h"
 #include "util.h"
 #ifdef HAVE_GCONF
@@ -76,6 +77,7 @@ static PangoFontDescription *titlebar_font = NULL;
 static MetaVirtualModifier mouse_button_mods = Mod1Mask;
 static MetaFocusMode focus_mode = META_FOCUS_MODE_CLICK;
 static MetaFocusNewWindows focus_new_windows = META_FOCUS_NEW_WINDOWS_SMART;
+static GSList *no_focus_windows = NULL;
 static gboolean raise_on_click = TRUE;
 static char* current_theme = NULL;
 static int num_workspaces = 4;
@@ -147,6 +149,7 @@ static void maybe_give_disable_workarounds_warning (void);
 
 static void titlebar_handler (MetaPreference, const gchar*, gboolean*);
 static void theme_name_handler (MetaPreference, const gchar*, gboolean*);
+static void no_focus_windows_handler (MetaPreference, const gchar*, gboolean*);
 static void mouse_button_mods_handler (MetaPreference, const gchar*, gboolean*);
 static void button_layout_handler (MetaPreference, const gchar*, gboolean*);
 
@@ -425,6 +428,11 @@ static MetaStringPreference preferences_string[] =
       theme_name_handler,
       NULL,
     },
+    { "/apps/metacity/general/no_focus_windows",
+      META_PREF_NO_FOCUS_WINDOWS,
+      no_focus_windows_handler,
+      NULL
+    },
     { KEY_TITLEBAR_FONT,
       META_PREF_TITLEBAR_FONT,
       titlebar_handler,
@@ -1344,6 +1352,30 @@ theme_name_handler (MetaPreference pref,
 }
 
 static void
+no_focus_windows_handler (MetaPreference pref,
+                          const gchar *string_value,
+                          gboolean *inform_listeners)
+{
+  if (no_focus_windows)
+    {
+      meta_window_matcher_list_free (no_focus_windows);
+      no_focus_windows = NULL;
+    }
+
+  if (string_value)
+    {
+      GError *error = NULL;
+      no_focus_windows = meta_window_matcher_list_from_string (string_value, &error);
+      if (error != NULL)
+        {
+          meta_warning ("Error parsing no_focus_windows='%s': %s\n",
+                        string_value, error->message);
+          g_error_free (error);
+        }
+    }
+}
+
+static void
 mouse_button_mods_handler (MetaPreference pref,
                            const gchar *string_value,
                            gboolean *inform_listeners)
@@ -1755,6 +1787,9 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_FORCE_FULLSCREEN:
       return "FORCE_FULLSCREEN";
+
+    case META_PREF_NO_FOCUS_WINDOWS:
+      return "NO_FOCUS_WINDOWS";
     }
 
   return "(unknown)";
@@ -2633,6 +2668,14 @@ meta_prefs_get_action_right_click_titlebar (void)
 }
 
 gboolean
+meta_prefs_window_is_no_focus (const char *window_name,
+                               const char *window_class)
+{
+  return meta_window_matcher_list_matches (no_focus_windows,
+                                           window_name, window_class);
+}
+
+gboolean
 meta_prefs_get_auto_raise (void)
 {
   return auto_raise;
diff --git a/src/core/window-matcher.c b/src/core/window-matcher.c
new file mode 100644
index 0000000..e2fd293
--- /dev/null
+++ b/src/core/window-matcher.c
@@ -0,0 +1,582 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Tiny language for matching against windows */
+
+/*
+ * Copyright (C) 2009 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by 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.
+ */
+
+#include <glib.h>
+#include <string.h>
+
+#include "window-matcher.h"
+
+typedef struct _MetaWindowMatcher MetaWindowMatcher;
+
+typedef enum {
+  MATCHER_OPERAND_CLASS,
+  MATCHER_OPERAND_NAME
+} MatcherOperand;
+
+typedef enum {
+  MATCHER_TOKEN_AND = G_TOKEN_LAST + 1,
+  MATCHER_TOKEN_OR,
+  MATCHER_TOKEN_NOT,
+  MATCHER_TOKEN_EQ,
+  MATCHER_TOKEN_GLOB,
+  MATCHER_TOKEN_NAME,
+  MATCHER_TOKEN_CLASS
+} MatcherToken;
+
+struct _MetaWindowMatcher {
+  enum {
+    MATCHER_AND,
+    MATCHER_OR,
+    MATCHER_NOT,
+    MATCHER_EQ,
+    MATCHER_GLOB
+  } type;
+
+  union {
+    struct {
+      MetaWindowMatcher *a;
+      MetaWindowMatcher *b;
+    } and;
+    struct {
+      MetaWindowMatcher *a;
+      MetaWindowMatcher *b;
+    } or;
+    struct {
+      MetaWindowMatcher *a;
+    } not;
+    struct {
+      MatcherOperand operand;
+      char *str;
+    } eq;
+    struct {
+      MatcherOperand operand;
+      char *str;
+      GPatternSpec *pattern;
+    } glob;
+  } u;
+};
+
+static void
+meta_window_matcher_free (MetaWindowMatcher *matcher)
+{
+  switch (matcher->type)
+    {
+    case MATCHER_AND:
+      meta_window_matcher_free (matcher->u.and.a);
+      meta_window_matcher_free (matcher->u.and.b);
+      break;
+    case MATCHER_OR:
+      meta_window_matcher_free (matcher->u.or.a);
+      meta_window_matcher_free (matcher->u.or.b);
+      break;
+    case MATCHER_NOT:
+      meta_window_matcher_free (matcher->u.or.a);
+      break;
+    case MATCHER_EQ:
+      g_free (matcher->u.eq.str);
+      break;
+    case MATCHER_GLOB:
+      g_free (matcher->u.glob.str);
+      g_pattern_spec_free (matcher->u.glob.pattern);
+      break;
+    }
+
+  g_slice_free (MetaWindowMatcher, matcher);
+}
+
+void
+meta_window_matcher_list_free (GSList *list)
+{
+  g_slist_foreach (list, (GFunc)meta_window_matcher_free, NULL);
+  g_slist_free (list);
+}
+
+static gboolean
+meta_window_matcher_matches (MetaWindowMatcher *matcher,
+                             const char        *window_name,
+                             const char        *window_class)
+{
+  switch (matcher->type)
+    {
+    case MATCHER_AND:
+      return (meta_window_matcher_matches (matcher->u.and.a, window_name, window_class) &&
+              meta_window_matcher_matches (matcher->u.and.b, window_name, window_class));
+    case MATCHER_OR:
+      return (meta_window_matcher_matches (matcher->u.or.a, window_name, window_class) ||
+              meta_window_matcher_matches(matcher->u.or.b, window_name, window_class));
+    case MATCHER_NOT:
+      return !meta_window_matcher_matches (matcher->u.not.a, window_name, window_class);
+    case MATCHER_EQ:
+      if (matcher->u.eq.operand == MATCHER_OPERAND_NAME)
+        return window_name && strcmp (matcher->u.eq.str, window_name) == 0;
+      else
+        return window_class && strcmp (matcher->u.eq.str, window_class) == 0;
+    case MATCHER_GLOB:
+      if (matcher->u.glob.operand == MATCHER_OPERAND_NAME)
+        return window_name && g_pattern_match_string (matcher->u.glob.pattern, window_name);
+      else
+        return window_class && g_pattern_match_string (matcher->u.glob.pattern, window_class);
+    }
+
+  g_assert_not_reached();
+  return FALSE;
+}
+
+gboolean
+meta_window_matcher_list_matches (GSList     *list,
+                                  const char *window_name,
+                                  const char *window_class)
+{
+  GSList *l;
+
+  for (l = list; l; l = l->next)
+    {
+      if (meta_window_matcher_matches (l->data, window_name, window_class))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static const GScannerConfig scanner_config =
+{
+  " \t\r\n"             /* cset_skip_characters */,
+  (
+   G_CSET_a_2_z
+   "_"
+   G_CSET_A_2_Z
+   )                    /* cset_identifier_first */,
+  (
+   G_CSET_a_2_z
+   "_"
+   G_CSET_A_2_Z
+   G_CSET_DIGITS
+   G_CSET_LATINS
+   G_CSET_LATINC
+   )                    /* cset_identifier_nth */,
+  NULL                  /* cpair_comment_single */,
+  TRUE                  /* case_sensitive */,
+  TRUE                  /* skip_comment_multi */,
+  FALSE                 /* skip_comment_single */,
+  TRUE                  /* scan_comment_multi */,
+  TRUE                  /* scan_identifier */,
+  TRUE                  /* scan_identifier_1char */,
+  FALSE                 /* scan_identifier_NULL */,
+  TRUE                  /* scan_symbols */,
+  FALSE                 /* scan_binary */,
+  TRUE                  /* scan_octal */,
+  TRUE                  /* scan_float */,
+  TRUE                  /* scan_hex */,
+  FALSE                 /* scan_hex_dollar */,
+  TRUE                  /* scan_string_sq */,
+  TRUE                  /* scan_string_dq */,
+  TRUE                  /* numbers_2_int */,
+  FALSE                 /* int_2_float */,
+  FALSE                 /* identifier_2_string */,
+  TRUE                  /* char_2_token */,
+  TRUE                  /* symbol_2_token */,
+  FALSE                 /* scope_0_fallback */,
+  FALSE                 /* store_int64 */,
+};
+
+static void
+set_error (GScanner   *scanner,
+           GError    **error,
+           const char *message)
+{
+  g_set_error (error, 0, 0,
+               "Parse error at %d:%d: %s",
+               g_scanner_cur_line (scanner),
+               g_scanner_cur_position (scanner),
+               message);
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_and (MetaWindowMatcher *a,
+                             MetaWindowMatcher *b)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_AND;
+  matcher->u.and.a = a;
+  matcher->u.and.b = b;
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_or (MetaWindowMatcher *a,
+                            MetaWindowMatcher *b)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_OR;
+  matcher->u.or.a = a;
+  matcher->u.or.b = b;
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_not (MetaWindowMatcher *a)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_NOT;
+  matcher->u.not.a = a;
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_eq (MatcherOperand operand,
+                            const char    *str)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_EQ;
+  matcher->u.eq.operand = operand;
+  matcher->u.eq.str = g_strdup (str);
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_glob (MatcherOperand operand,
+                              const char    *str)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_GLOB;
+  matcher->u.glob.operand = operand;
+  matcher->u.glob.str = g_strdup (str);
+  matcher->u.glob.pattern = g_pattern_spec_new (str);
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_from_scanner (GScanner *scanner,
+                                  GError  **error)
+{
+  MetaWindowMatcher *matcher = NULL;
+  GTokenType token;
+  GTokenValue value;
+
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_LEFT_PAREN)
+    {
+      set_error (scanner, error, "expected '('");
+      return NULL;
+    }
+
+  token = g_scanner_get_next_token (scanner);
+  switch (token)
+    {
+    case MATCHER_TOKEN_AND:
+    case MATCHER_TOKEN_OR:
+    case MATCHER_TOKEN_NOT:
+      {
+        MetaWindowMatcher *a, *b;
+
+        a = meta_window_matcher_from_scanner (scanner, error);
+        if (!a)
+          return NULL;
+
+        if (token != MATCHER_TOKEN_NOT)
+          {
+            b = meta_window_matcher_from_scanner (scanner, error);
+            if (!b)
+              {
+                meta_window_matcher_free (a);
+                return NULL;
+              }
+          }
+
+        switch (token)
+          {
+          case MATCHER_TOKEN_AND:
+            matcher = meta_window_matcher_new_and (a, b);
+            break;
+          case MATCHER_TOKEN_OR:
+            matcher = meta_window_matcher_new_or (a, b);
+            break;
+          case MATCHER_TOKEN_NOT:
+            matcher = meta_window_matcher_new_not (a);
+            break;
+          default:
+            g_assert_not_reached();
+            break;
+          }
+      }
+      break;
+    case MATCHER_TOKEN_EQ:
+    case MATCHER_TOKEN_GLOB:
+      {
+        MatcherOperand operand;
+
+        switch (g_scanner_get_next_token (scanner))
+          {
+          case MATCHER_TOKEN_NAME:
+            operand = MATCHER_OPERAND_NAME;
+            break;
+          case MATCHER_TOKEN_CLASS:
+            operand = MATCHER_OPERAND_CLASS;
+            break;
+          default:
+            set_error (scanner, error, "expected name/class");
+            return NULL;
+          }
+
+        if (g_scanner_get_next_token (scanner) != G_TOKEN_STRING)
+          {
+            set_error (scanner, error, "expected string");
+            return NULL;
+          }
+
+        value = g_scanner_cur_value (scanner);
+
+        switch (token)
+          {
+          case MATCHER_TOKEN_EQ:
+            matcher = meta_window_matcher_new_eq (operand, value.v_string);
+            break;
+          case MATCHER_TOKEN_GLOB:
+            matcher = meta_window_matcher_new_glob (operand, value.v_string);
+            break;
+          default:
+            g_assert_not_reached();
+          }
+      }
+      break;
+    default:
+      set_error (scanner, error, "expected and/or/not/eq/glob");
+      return NULL;
+    }
+
+  if (g_scanner_get_next_token (scanner) != G_TOKEN_RIGHT_PAREN)
+    {
+      set_error (scanner, error, "expected ')'");
+      return NULL;
+    }
+
+  return matcher;
+}
+
+GSList *
+meta_window_matcher_list_from_string (const char *str,
+                                      GError    **error)
+{
+  GScanner *scanner = g_scanner_new (&scanner_config);
+  GSList *result = NULL;
+
+  g_scanner_scope_add_symbol (scanner, 0, "and", GINT_TO_POINTER (MATCHER_TOKEN_AND));
+  g_scanner_scope_add_symbol (scanner, 0, "or", GINT_TO_POINTER (MATCHER_TOKEN_OR));
+  g_scanner_scope_add_symbol (scanner, 0, "not", GINT_TO_POINTER (MATCHER_TOKEN_NOT));
+  g_scanner_scope_add_symbol (scanner, 0, "eq", GINT_TO_POINTER (MATCHER_TOKEN_EQ));
+  g_scanner_scope_add_symbol (scanner, 0, "glob", GINT_TO_POINTER (MATCHER_TOKEN_GLOB));
+  g_scanner_scope_add_symbol (scanner, 0, "name", GINT_TO_POINTER (MATCHER_TOKEN_NAME));
+  g_scanner_scope_add_symbol (scanner, 0, "class", GINT_TO_POINTER (MATCHER_TOKEN_CLASS));
+
+  g_scanner_input_text (scanner, str, strlen (str));
+
+  while (g_scanner_peek_next_token (scanner) != G_TOKEN_EOF)
+    {
+      MetaWindowMatcher *matcher = meta_window_matcher_from_scanner (scanner, error);
+      if (!matcher)
+        {
+          meta_window_matcher_list_free (result);
+          return NULL;
+        }
+
+      result = g_slist_prepend (result, matcher);
+    }
+
+  g_scanner_destroy (scanner);
+
+  return g_slist_reverse (result);
+}
+
+#ifdef BUILD_MATCHER_TESTS
+
+static void
+append_operand_to_string (GString       *string,
+                          MatcherOperand operand)
+{
+  if (operand == MATCHER_OPERAND_NAME)
+    g_string_append (string, "name");
+  else
+    g_string_append (string, "class");
+}
+
+static void
+append_string_to_string (GString            *str,
+                         const char         *to_append)
+{
+  const char *p;
+
+  g_string_append_c (str, '"');
+  for (p = to_append; *p; p++)
+    {
+      if (*p == '"')
+        g_string_append (str, "\\\"");
+      else
+        g_string_append_c (str, *p);
+    }
+  g_string_append_c (str, '"');
+}
+
+static void
+append_matcher_to_string (GString           *str,
+                          MetaWindowMatcher *matcher)
+{
+  switch (matcher->type)
+    {
+    case MATCHER_AND:
+      g_string_append (str, "(and ");
+      append_matcher_to_string (str, matcher->u.and.a);
+      g_string_append_c (str, ' ');
+      append_matcher_to_string (str, matcher->u.and.b);
+      break;
+    case MATCHER_OR:
+      g_string_append (str, "(or ");
+      append_matcher_to_string (str, matcher->u.or.a);
+      g_string_append_c (str, ' ');
+      append_matcher_to_string (str, matcher->u.or.b);
+      break;
+    case MATCHER_NOT:
+      g_string_append (str, "(not ");
+      append_matcher_to_string (str, matcher->u.not.a);
+      break;
+    case MATCHER_EQ:
+      g_string_append (str, "(eq ");
+      append_operand_to_string (str, matcher->u.eq.operand);
+      g_string_append_c (str, ' ');
+      append_string_to_string (str, matcher->u.eq.str);
+      break;
+    case MATCHER_GLOB:
+      g_string_append (str, "(glob ");
+      append_operand_to_string (str, matcher->u.glob.operand);
+      g_string_append_c (str, ' ');
+      append_string_to_string (str, matcher->u.glob.str);
+      break;
+    }
+
+  g_string_append_c (str, ')');
+}
+
+static char *
+meta_window_matcher_list_to_string (GSList *list)
+{
+  GSList *l;
+  GString *str = g_string_new (NULL);
+
+  for (l = list; l; l = l->next)
+    {
+      if (str->len > 0)
+        g_string_append_c (str, ' ');
+
+      append_matcher_to_string (str, l->data);
+    }
+
+  return g_string_free (str, FALSE);
+}
+
+static void
+test_roundtrip (const char *str)
+{
+  GError *error = NULL;
+  GSList *list = meta_window_matcher_list_from_string (str, &error);
+  char *result;
+
+  if (error != NULL)
+    g_error ("Failed to parse '%s': %s\n", str, error->message);
+
+  result = meta_window_matcher_list_to_string (list);
+  if (strcmp (result, str) != 0)
+    g_error ("Round-trip conversion of '%s' gave '%s'\n", str, result);
+
+  g_free (result);
+  meta_window_matcher_list_free (list);
+}
+
+static void
+test_matches (const char *str,
+              const char *window_name,
+              const char *window_class,
+              gboolean    expected)
+{
+  GError *error = NULL;
+  GSList *list = meta_window_matcher_list_from_string (str, &error);
+  gboolean matches;
+
+  if (error != NULL)
+    g_error ("Failed to parse '%s': %s\n", str, error->message);
+
+  matches = meta_window_matcher_list_matches (list, window_name, window_class))
+  if (matches != expected)
+    {
+      g_error ("Tested '%s' against name=%s, class=%s, expected %s, got %s\n",
+               str, window_name, window_class,
+               expected ? "true" : "false",
+               matches ? "true" : "false");
+    }
+
+
+  meta_window_matcher_list_free (list);
+}
+
+int main (int argc, char **argv)
+{
+  test_roundtrip ("(eq name \"foo\")");
+  test_roundtrip ("(eq name \"fo\\\"o\")");
+  test_roundtrip ("(glob class \"*bar?baz\")");
+  test_roundtrip ("(and (eq name \"foo\") (glob class \"*bar?baz\"))");
+  test_roundtrip ("(or (eq name \"foo\") (glob class \"*bar?baz\"))");
+  test_roundtrip ("(not (eq name \"foo\"))");
+
+  test_roundtrip ("(eq name \"foo\") (glob class \"*bar?baz\")");
+
+  test_matches ("(eq name 'foo')", "foo", NULL, TRUE);
+  test_matches ("(eq name 'foo')", "foob", NULL, FALSE);
+  test_matches ("(eq name 'foo')", NULL, NULL, FALSE);
+  test_matches ("(eq class 'bar')", "foo", "bar", TRUE);
+  test_matches ("(eq class 'bar')", NULL, NULL, FALSE);
+
+  test_matches ("(glob name 'foo*')", "foooo", NULL, TRUE);
+  test_matches ("(glob name 'foo*')", NULL, NULL, FALSE);
+  test_matches ("(glob class 'b*r')", "foooo", "baaaar", TRUE);
+  test_matches ("(glob class 'b*r')", NULL, NULL, FALSE);
+
+  test_matches ("(and (eq name 'foo') (eq class 'bar'))", "foo", "bar", TRUE);
+  test_matches ("(and (eq name 'foo') (eq class 'bar'))", "foo", "baz", FALSE);
+  test_matches ("(and (eq name 'foo') (not (eq class 'bar')))", "foo", "bar", FALSE);
+  test_matches ("(and (eq name 'foo') (not (eq class 'bar')))", "foo", "baz", TRUE);
+
+  test_matches ("(or (eq name 'foo') (eq class 'bar'))", "foo", "baz", TRUE);
+  test_matches ("(or (eq name 'foo') (eq class 'bar'))", "fof", "baz", FALSE);
+
+  return 0;
+}
+
+#endif /* BUILD_MATCHER_TESTS */
diff --git a/src/core/window-matcher.h b/src/core/window-matcher.h
new file mode 100644
index 0000000..7fc7826
--- /dev/null
+++ b/src/core/window-matcher.h
@@ -0,0 +1,46 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Tiny language for matching against windows
+ *
+ * Expression Syntax:
+ *
+ *  (and <expr> <expr>)
+ *  (or <expr> <expr>)
+ *  (not <expr>)
+ *  (eq [name|class] "<value>")
+ *  (glob [name|class] "<glob>")
+ *
+ * A "matcher list" is a whitespace-separated list of expressions that are
+ * implicitly or'ed together. Globs are shell style patterns with
+ * matching 0 or more characters and ? matching one character.
+ */
+
+/*
+ * Copyright (C) 2009 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_WINDOW_MATCHER_H
+#define META_WINDOW_MATCHER_H
+
+GSList * meta_window_matcher_list_from_string (const char         *str,
+					       GError            **error);
+void     meta_window_matcher_list_free        (GSList             *list);
+gboolean meta_window_matcher_list_matches     (GSList             *list,
+					       const char         *window_name,
+					       const char         *window_class);
+#endif /* META_WINDOW_MATCHER_H */
diff --git a/src/core/window.c b/src/core/window.c
index 8d029a2..10da47a 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1965,7 +1965,14 @@ window_state_on_map (MetaWindow *window,
 {
   gboolean intervening_events;
 
-  intervening_events = intervening_user_event_occurred (window);
+  /* A 'no focus' window is a window that has been configured in GConf
+   * to never take focus on map; typically it will be a notification
+   * window from a legacy app that doesn't support _NET_WM_USER_TIME.
+   */
+  if (meta_prefs_window_is_no_focus (window->title, window->res_class))
+    intervening_events = TRUE;
+  else
+    intervening_events = intervening_user_event_occurred (window);
 
   *takes_focus = !intervening_events;
   *places_on_top = *takes_focus;
diff --git a/src/include/prefs.h b/src/include/prefs.h
index a4193ff..6698dfe 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -60,7 +60,8 @@ typedef enum
   META_PREF_CURSOR_SIZE,
   META_PREF_COMPOSITING_MANAGER,
   META_PREF_RESIZE_WITH_RIGHT_BUTTON,
-  META_PREF_FORCE_FULLSCREEN
+  META_PREF_FORCE_FULLSCREEN,
+  META_PREF_NO_FOCUS_WINDOWS
 } MetaPreference;
 
 typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
@@ -106,6 +107,9 @@ MetaActionTitlebar          meta_prefs_get_action_double_click_titlebar (void);
 MetaActionTitlebar          meta_prefs_get_action_middle_click_titlebar (void);
 MetaActionTitlebar          meta_prefs_get_action_right_click_titlebar (void);
 
+gboolean                    meta_prefs_window_is_no_focus (const char *window_name,
+                                                           const char *window_class);
+
 void meta_prefs_set_num_workspaces (int n_workspaces);
 
 const char* meta_prefs_get_workspace_name    (int         i);
diff --git a/src/metacity.schemas.in.in b/src/metacity.schemas.in.in
index a9dd397..34cd7d6 100644
--- a/src/metacity.schemas.in.in
+++ b/src/metacity.schemas.in.in
@@ -100,6 +100,34 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/metacity/general/no_focus_windows</key>
+      <applyto>/apps/metacity/general/no_focus_windows</applyto>
+      <owner>metacity</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+         <short>New windows that shouldn't get focus</short>
+         <long>
+            This option provides a way to specify new windows that shouldn't get
+	    focus. Normally an application specifies whether or not it gets focus
+	    by setting the _NET_WM_USER_TIME property, but legacy applications
+	    may not set this, which can cause unwanted focus stealing.
+
+	    The contents of this property is a space-separated list of expressions
+	    to match against windows. If any of the expressions match a window
+	    then the window will not get focus. The syntax of expressions is:
+
+	    (eq [name|class] "&lt;value&gt;"): window name (title) or the class from
+	    WM_CLASS matches &lt;value&gt; exactly.
+	    (glob [name|class] "&lt;glob&gt;"): window name (title) or the class from
+	    WM_CLASS matches the shell-style glob pattern &lt;glob&gt;.
+	    (and &lt;expr&gt; &lt;expr&gt;) (or &lt;expr&gt; &lt;expr&gt;) (not &lt;expr): Boolean combinations
+	    of expressions.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/metacity/general/raise_on_click</key>
       <applyto>/apps/metacity/general/raise_on_click</applyto>
       <owner>metacity</owner>

Allow-applications-to-raise-windows-when-raise_on_cl.patch:
 window.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE Allow-applications-to-raise-windows-when-raise_on_cl.patch ---
>From 55d4c4cc9455f348b5bc455675004a0e035ea31d Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Tue, 17 Nov 2009 17:24:53 -0500
Subject: [PATCH] Allow applications to raise windows when raise_on_click is off

Whether Metacity honors a raise request from an application should
not be affected by the raise_on_click setting; remove a check that
seems to have been added in error.

https://bugzilla.gnome.org/show_bug.cgi?id=445447
---
 src/core/window.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/core/window.c b/src/core/window.c
index b481ccf..db59de1 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4716,8 +4716,7 @@ meta_window_configure_request (MetaWindow *window,
     {
       MetaWindow *active_window;
       active_window = window->display->expected_focus_window;
-      if (meta_prefs_get_disable_workarounds () ||
-          !meta_prefs_get_raise_on_click ())
+      if (meta_prefs_get_disable_workarounds ())
         {
           meta_topic (META_DEBUG_STACK,
                       "%s sent an xconfigure stacking request; this is "
-- 
1.6.5.2


Allow-explicit-raises-from-same-client-not-just-sa.patch:
 window.c |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE Allow-explicit-raises-from-same-client-not-just-sa.patch ---
>From 7e116a394689718567406837740679c1f1f0d74f Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Mon, 19 Oct 2009 19:41:54 -0400
Subject: [PATCH] Allow explicit raises from same client, not just same app

We currently allow XRaiseWindow when the same application (defined
by the window group) is focused, but the kind of old applications
that XRaiseWindow are frequently not setting the window group.

Expand the check to allow the same X client (defined by the looking
at client ID) to raise windows above the focus window.

https://bugzilla.gnome.org/show_bug.cgi?id=567528
---
 src/core/window.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/core/window.c b/src/core/window.c
index 6de86ee..8d029a2 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -47,6 +47,7 @@
 #include "effects.h"
 
 #include <X11/Xatom.h>
+#include <X11/Xlibint.h> /* For display->resource_mask */
 #include <string.h>
 
 #ifdef HAVE_SHAPE
@@ -72,6 +73,9 @@ static gboolean process_property_notify   (MetaWindow     *window,
 static void     meta_window_show          (MetaWindow     *window);
 static void     meta_window_hide          (MetaWindow     *window);
 
+static gboolean meta_window_same_client (MetaWindow *window,
+                                         MetaWindow *other_window);
+
 static void     meta_window_save_rect         (MetaWindow    *window);
 static void     save_user_window_placement    (MetaWindow    *window);
 static void     force_save_user_window_placement (MetaWindow    *window);
@@ -4708,6 +4712,7 @@ meta_window_configure_request (MetaWindow *window,
         }
       else if (active_window &&
                !meta_window_same_application (window, active_window) &&
+               !meta_window_same_client (window, active_window) &&
                XSERVER_TIME_IS_BEFORE (window->net_wm_user_time,
                                        active_window->net_wm_user_time))
         {
@@ -7544,6 +7549,23 @@ meta_window_same_application (MetaWindow *window,
     group==other_group;
 }
 
+/* Generally meta_window_same_application() is a better idea
+ * of "sameness", since it handles the case where multiple apps
+ * want to look like the same app or the same app wants to look
+ * like multiple apps, but in the case of workarounds for legacy
+ * applications (which likely aren't setting the group properly
+ * anyways), it may be desirable to check this as well.
+ */
+static gboolean
+meta_window_same_client (MetaWindow *window,
+                         MetaWindow *other_window)
+{
+  int resource_mask = window->display->xdisplay->resource_mask;
+
+  return ((window->xwindow & ~resource_mask) ==
+          (other_window->xwindow & ~resource_mask));
+}
+
 void
 meta_window_refresh_resize_popup (MetaWindow *window)
 {
-- 
1.6.5.rc2
Dont-focus-ancestor-window-on-a-different-workspac.patch:
 workspace.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE Dont-focus-ancestor-window-on-a-different-workspac.patch ---
>From a17fb47e08257d09e1e795e8114b21b134b1f3c2 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Mon, 19 Oct 2009 18:43:00 -0400
Subject: [PATCH] Don't focus ancestor window on a different workspace

When we are moving a window with a modal dialog to a different
workspace, meta_workspace_focus_default_window() can be called
with 'not_this_one' being the focused modal dialog.

Since the ancestor of that window is also being moved, we must
not focus it as an alternative to the current window; this will
cause windows to be moved back and Metacity to get into an
inconsistent confused state.

https://bugzilla.redhat.com/show_bug.cgi?id=237158

https://bugzilla.gnome.org/show_bug.cgi?id=598995
---
 src/core/workspace.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/core/workspace.c b/src/core/workspace.c
index a0170a6..92993a7 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -969,7 +969,10 @@ focus_ancestor_or_mru_window (MetaWorkspace *workspace,
       MetaWindow *ancestor;
       ancestor = NULL;
       meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor);
-      if (ancestor != NULL)
+      if (ancestor != NULL &&
+          (ancestor->on_all_workspaces ||
+           ancestor->workspace == workspace) &&
+          meta_window_showing_on_its_workspace (ancestor))
         {
           meta_topic (META_DEBUG_FOCUS,
                       "Focusing %s, ancestor of %s\n", 
-- 
1.6.5.rc2
Dont-warn-about-a-missing-session-file.patch:
 session.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE Dont-warn-about-a-missing-session-file.patch ---
>From 3b06d1045cc990a8610bdbd5c9b83440b1b6e932 Mon Sep 17 00:00:00 2001
From: Tomislav Vujec <tvujec at gmail.com>
Date: Tue, 17 Nov 2009 19:42:38 -0500
Subject: [PATCH] Don't warn about a missing session file

When started without session related command line parameters (e.g. from
gnome-session), metacity picks up client_id from the DESKTOP_AUTOSTART_ID
environment variable. Unfortunately, there is no way to distinguish if this was
passed from a config file, representing old saved session, or generated by
gnome-session, therefore load_state is attempted in each case. If the client_id
is generated, there will be no session file, and metacity will report a
warning.

Just remove the warning so that users won't always find a warning at the
start of their .xsession-errors.

https://bugzilla.gnome.org/show_bug.cgi?id=577576
---
 src/core/session.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/core/session.c b/src/core/session.c
index 7e3b389..32fda97 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -1098,8 +1098,6 @@ load_state (const char *previous_save_file)
         {
           /* oh, just give up */
 
-          meta_warning (_("Failed to read saved session file %s: %s\n"),
-                    canonical_session_file, error->message);
           g_error_free (error);
           g_free (session_file);
           g_free (canonical_session_file);
-- 
1.6.5.2
For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch:
 display-private.h |   11 ++
 display.c         |  239 +++++++++++++++++++++++++++++++++++++++++++-----------
 keybindings.c     |   11 +-
 3 files changed, 210 insertions(+), 51 deletions(-)

--- NEW FILE For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch ---
>From e8a6af29a1f57024067a12567e2bd906e6bad5a4 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Tue, 20 Oct 2009 15:13:45 -0400
Subject: [PATCH] For mouse and sloppy focus, return to "mouse mode" on motion

For mouse and sloppy focus, there are various cases where the focus
window can be moved away from the focus window. Mostly these relate
to "display->mouse_mode = FALSE", which we enter when the user
starts keynav'ing, but it can also occur if a window is focus-denied
mapped and mapped under the pointer.

Prior to this patch, there was no fast way for the user to start
interacting with the window - if they just clicked on the window,
the click would be passed through, and could disturb the windows
contents, so the user had to either mouse out and then mouse back
in, or go up and click on the titlebar.

With this patch, when we get into this state, we add a timeout
and poll for pointer motion with XQueryPointer. If the user then
moves the pointer (more than a single pixel to handle jitter),
we focus the window under the pointer and return to mouse mode.

https://bugzilla.gnome.org/show_bug.cgi?id=599097
---
 src/core/display-private.h |   11 ++
 src/core/display.c         |  239 +++++++++++++++++++++++++++++++++++--------
 src/core/keybindings.c     |   10 +-
 3 files changed, 210 insertions(+), 50 deletions(-)

diff --git a/src/core/display-private.h b/src/core/display-private.h
index 19287f3..b14d7d7 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -150,6 +150,14 @@ struct _MetaDisplay
   guint       autoraise_timeout_id;
   MetaWindow* autoraise_window;
 
+  /* When we ignore an enter due to !display->mouse_mode, a timeout
+   * to check if the mouse is moved, in which case we should focus
+   * the pointer window and return to mouse mode */
+  guint       focus_on_motion_timeout_id;
+  Window      focus_on_motion_start_root_window;
+  int         focus_on_motion_start_x;
+  int         focus_on_motion_start_y;
+
   /* Alt+click button grabs */
   unsigned int window_grab_modifiers;
   
@@ -497,4 +505,7 @@ void meta_display_queue_autoraise_callback  (MetaDisplay *display,
                                              MetaWindow  *window);
 void meta_display_remove_autoraise_callback (MetaDisplay *display);
 
+void meta_display_disable_mouse_mode        (MetaDisplay *display);
+void meta_display_enable_mouse_mode         (MetaDisplay *display);
+
 #endif
diff --git a/src/core/display.c b/src/core/display.c
index 55c374a..78139bd 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -165,6 +165,9 @@ static void    sanity_check_timestamps   (MetaDisplay *display,
 
 MetaGroup*     get_focussed_group (MetaDisplay *display);
 
+static void start_focus_on_motion (MetaDisplay *display);
+static void stop_focus_on_motion  (MetaDisplay *display);
+
 /**
  * Destructor for MetaPingData structs. Will destroy the
  * event source for the struct as well.
@@ -876,6 +879,7 @@ meta_display_close (MetaDisplay *display,
   meta_prefs_remove_listener (prefs_changed_callback, display);
   
   meta_display_remove_autoraise_callback (display);
+  stop_focus_on_motion (display);
 
   if (display->grab_old_window_stacking)
     g_list_free (display->grab_old_window_stacking);
@@ -1816,67 +1820,86 @@ event_callback (XEvent   *event,
       if (window && !serial_is_ignored (display, event->xany.serial) &&
                event->xcrossing.mode != NotifyGrab && 
                event->xcrossing.mode != NotifyUngrab &&
-               event->xcrossing.detail != NotifyInferior &&
-               meta_display_focus_sentinel_clear (display))
+               event->xcrossing.detail != NotifyInferior)
         {
           switch (meta_prefs_get_focus_mode ())
             {
             case META_FOCUS_MODE_SLOPPY:
             case META_FOCUS_MODE_MOUSE:
-              display->mouse_mode = TRUE;
-              if (window->type != META_WINDOW_DOCK &&
-                  window->type != META_WINDOW_DESKTOP)
+              if (!meta_display_focus_sentinel_clear (display))
                 {
-                  meta_topic (META_DEBUG_FOCUS,
-                              "Focusing %s due to enter notify with serial %lu "
-                              "at time %lu, and setting display->mouse_mode to "
-                              "TRUE.\n",
-                              window->desc, 
-                              event->xany.serial,
-                              event->xcrossing.time);
-
-                  meta_window_focus (window, event->xcrossing.time);
-
-                  /* stop ignoring stuff */
-                  reset_ignores (display);
-                  
-                  if (meta_prefs_get_auto_raise ()) 
+                  /* There was an enter event that we want to ignore because
+                   * we're in "keynav mode" or because we are mapping
+                   * a focus-denied window; the next time the mouse is moved
+                   * we want to focus the window so the user doesn't have
+                   * to click (possibly messing up window contents) or
+                   * enter/leave to get focus to the window.
+                   *
+                   * (This check will also trigger for visual bell flashes
+                   * but it doesn't really do any harm to check for motion
+                   * in that case, since the next motion will just result in
+                   * the current window being focused.)
+                   */
+                  start_focus_on_motion (display);
+                }
+              else
+                {
+                  meta_display_enable_mouse_mode (display);
+                  if (window->type != META_WINDOW_DOCK &&
+                      window->type != META_WINDOW_DESKTOP)
                     {
-                      meta_display_queue_autoraise_callback (display, window);
+                      meta_topic (META_DEBUG_FOCUS,
+                                  "Focusing %s due to enter notify with serial %lu "
+                                  "at time %lu, and setting display->mouse_mode to "
+                                  "TRUE.\n",
+                                  window->desc, 
+                                  event->xany.serial,
+                                  event->xcrossing.time);
+
+                      meta_window_focus (window, event->xcrossing.time);
+
+                      /* stop ignoring stuff */
+                      reset_ignores (display);
+
+                      if (meta_prefs_get_auto_raise ()) 
+                        {
+                          meta_display_queue_autoraise_callback (display, window);
+                        }
+                      else
+                        {
+                          meta_topic (META_DEBUG_FOCUS,
+                                      "Auto raise is disabled\n");		      
+                        }
                     }
-                  else
+                  /* In mouse focus mode, we defocus when the mouse *enters*
+                   * the DESKTOP window, instead of defocusing on LeaveNotify.
+                   * This is because having the mouse enter override-redirect
+                   * child windows unfortunately causes LeaveNotify events that
+                   * we can't distinguish from the mouse actually leaving the
+                   * toplevel window as we expect.  But, since we filter out
+                   * EnterNotify events on override-redirect windows, this
+                   * alternative mechanism works great.
+                   */
+                  if (window->type == META_WINDOW_DESKTOP &&
+                      meta_prefs_get_focus_mode() == META_FOCUS_MODE_MOUSE &&
+                      display->expected_focus_window != NULL)
                     {
                       meta_topic (META_DEBUG_FOCUS,
-                                  "Auto raise is disabled\n");		      
+                                  "Unsetting focus from %s due to mouse entering "
+                                  "the DESKTOP window\n",
+                                  display->expected_focus_window->desc);
+                      meta_display_focus_the_no_focus_window (display, 
+                                                              window->screen,
+                                                              event->xcrossing.time);
                     }
                 }
-              /* In mouse focus mode, we defocus when the mouse *enters*
-               * the DESKTOP window, instead of defocusing on LeaveNotify.
-               * This is because having the mouse enter override-redirect
-               * child windows unfortunately causes LeaveNotify events that
-               * we can't distinguish from the mouse actually leaving the
-               * toplevel window as we expect.  But, since we filter out
-               * EnterNotify events on override-redirect windows, this
-               * alternative mechanism works great.
-               */
-              if (window->type == META_WINDOW_DESKTOP &&
-                  meta_prefs_get_focus_mode() == META_FOCUS_MODE_MOUSE &&
-                  display->expected_focus_window != NULL)
-                {
-                  meta_topic (META_DEBUG_FOCUS,
-                              "Unsetting focus from %s due to mouse entering "
-                              "the DESKTOP window\n",
-                              display->expected_focus_window->desc);
-                  meta_display_focus_the_no_focus_window (display, 
-                                                          window->screen,
-                                                          event->xcrossing.time);
-                }
               break;
             case META_FOCUS_MODE_CLICK:
               break;
             }
-          
-          if (window->type == META_WINDOW_DOCK)
+
+          if (window->type == META_WINDOW_DOCK &&
+              meta_display_focus_sentinel_clear (display))
             meta_window_raise (window);
         }
       break;
@@ -5140,6 +5163,132 @@ meta_display_remove_autoraise_callback (MetaDisplay *display)
     }
 }
 
+#define FOCUS_ON_MOTION_CHECK_INTERVAL 200 /* 0.2 seconds */
+#define FOCUS_ON_MOTION_THRESHOLD 2        /* Must move 2 pixels */
+
+static gboolean
+check_focus_on_motion (gpointer data)
+{
+  MetaDisplay *display = data;
+  Window root, child;
+  int root_x, root_y;
+  int window_x, window_y;
+  guint mask;
+
+  XQueryPointer (display->xdisplay,
+                 DefaultRootWindow (display->xdisplay),
+                 &root, &child,
+                 &root_x, &root_y,
+                 &window_x, &window_y,
+                 &mask);
+
+  if (root != display->focus_on_motion_start_root_window ||
+      MAX (ABS (root_x - display->focus_on_motion_start_x),
+           ABS (root_y - display->focus_on_motion_start_y)) >= FOCUS_ON_MOTION_THRESHOLD)
+    {
+      MetaScreen *screen;
+
+      meta_topic (META_DEBUG_FOCUS,
+                  "Returning to mouse mode on mouse motion\n");
+
+      meta_display_enable_mouse_mode (display);
+
+      screen = meta_display_screen_for_root (display, root);
+      if (screen != NULL)
+        {
+          MetaWindow *window = meta_screen_get_mouse_window (screen, NULL);
+          guint32 timestamp = meta_display_get_current_time_roundtrip (display);
+
+          if (window &&
+              window->type != META_WINDOW_DOCK &&
+              window->type != META_WINDOW_DESKTOP)
+            {
+              meta_topic (META_DEBUG_FOCUS,
+                          "Focusing mouse window %s\n", window->desc);
+
+              meta_window_focus (window, timestamp);
+
+              if (display->autoraise_window != window &&
+                  meta_prefs_get_auto_raise ())
+                {
+                  meta_display_queue_autoraise_callback (display, window);
+                }
+            }
+          else if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_MOUSE)
+            {
+              meta_topic (META_DEBUG_FOCUS,
+                          "Setting focus to no_focus_windowm, since no mouse window.\n");
+              meta_display_focus_the_no_focus_window (display, screen, timestamp);
+            }
+
+          /* for META_FOCUS_MODE_SLOPPY, if the pointer isn't over a window, we just
+           * leave the last window focused */
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+start_focus_on_motion (MetaDisplay *display)
+{
+  if (!display->focus_on_motion_timeout_id)
+    {
+      Window child;
+      guint mask;
+      int window_x, window_y;
+
+      XQueryPointer (display->xdisplay,
+                     DefaultRootWindow (display->xdisplay),
+                     &display->focus_on_motion_start_root_window,
+                     &child,
+                     &display->focus_on_motion_start_x,
+                     &display->focus_on_motion_start_y,
+                     &window_x, &window_y,
+                     &mask);
+
+      display->focus_on_motion_timeout_id =
+        g_timeout_add (FOCUS_ON_MOTION_CHECK_INTERVAL,
+                       check_focus_on_motion,
+                       display);
+    }
+}
+
+static void
+stop_focus_on_motion (MetaDisplay *display)
+{
+  if (display->focus_on_motion_timeout_id)
+    {
+      g_source_remove (display->focus_on_motion_timeout_id);
+      display->focus_on_motion_timeout_id = 0;
+    }
+}
+
+void
+meta_display_disable_mouse_mode (MetaDisplay *display)
+{
+  display->mouse_mode = FALSE;
+
+  /* mouse_mode disabled means that we are now allowing the
+   * mouse window to be different from the focus window;
+   * that discrepancy might not come until we ignore some
+   * enter event, but in a case like tabbing away from the
+   * mouse window, it occurs immediately, so we need to
+   * start checking for motion events to see if we should
+   * focus the mouse window and return to mouse mode.
+   */
+  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK)
+    start_focus_on_motion (display);
+}
+
+void
+meta_display_enable_mouse_mode (MetaDisplay *display)
+{
+  display->mouse_mode = TRUE;
+
+  stop_focus_on_motion (display);
+}
+
 #ifdef HAVE_COMPOSITE_EXTENSIONS
 void
 meta_display_get_compositor_version (MetaDisplay *display,
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 63596bb..7d9130f 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2027,7 +2027,7 @@ process_tab_grab (MetaDisplay *display,
           meta_topic (META_DEBUG_FOCUS, "Activating %s due to tab popup "
                       "selection and turning mouse_mode off\n",
                       target_window->desc);
-          display->mouse_mode = FALSE;
+          meta_display_disable_mouse_mode (display);
           meta_window_activate (target_window, event->xkey.time);
 
           meta_topic (META_DEBUG_KEYBINDINGS,
@@ -2763,7 +2763,7 @@ handle_panel (MetaDisplay    *display,
   meta_topic (META_DEBUG_KEYBINDINGS,
               "Sending panel message with timestamp %lu, and turning mouse_mode "
               "off due to keybinding press\n", event->xkey.time);
-  display->mouse_mode = FALSE;
+  meta_display_disable_mouse_mode (display);
 
   meta_error_trap_push (display);
 
@@ -2886,7 +2886,7 @@ do_choose_window (MetaDisplay    *display,
                       "Activating %s and turning off mouse_mode due to "
                       "switch/cycle windows with no modifiers\n",
                       initial_selection->desc);
-          display->mouse_mode = FALSE;
+          meta_display_disable_mouse_mode (display);
           meta_window_activate (initial_selection, event->xkey.time);
         }
       else if (meta_display_begin_grab_op (display,
@@ -2915,7 +2915,7 @@ do_choose_window (MetaDisplay    *display,
                           "modifier was released prior to grab\n",
                           initial_selection->desc);
               meta_display_end_grab_op (display, event->xkey.time);
-              display->mouse_mode = FALSE;
+              meta_display_disable_mouse_mode (display);
               meta_window_activate (initial_selection, event->xkey.time);
             }
           else
@@ -3156,7 +3156,7 @@ handle_move_to_workspace  (MetaDisplay    *display,
           meta_topic (META_DEBUG_FOCUS,
                       "Resetting mouse_mode to FALSE due to "
                       "handle_move_to_workspace() call with flip set.\n");
-          workspace->screen->display->mouse_mode = FALSE;
+          meta_display_disable_mouse_mode (display);
           meta_workspace_activate_with_focus (workspace,
                                               window,
                                               event->xkey.time);
-- 
1.6.5.rc2
cm-selection-timestamp.patch:
 screen-private.h |    1 +
 screen.c         |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE cm-selection-timestamp.patch ---
Patch from Travis Watkins
https://bugzilla.gnome.org/show_bug.cgi?id=530702

diff -ru metacity-2.27.0/src/core/screen.c metacity-2.27.0.new/src/core/screen.c
--- metacity-2.27.0/src/core/screen.c	2008-10-19 16:15:38.000000000 -0500
+++ metacity-2.27.0.new/src/core/screen.c	2009-08-24 04:56:26.929023537 -0500
@@ -2782,11 +2782,14 @@
   char selection[32];
   Atom a;
 
+  screen->wm_cm_timestamp = meta_display_get_current_time_roundtrip (
+                                                               screen->display);
+
   g_snprintf (selection, sizeof(selection), "_NET_WM_CM_S%d", screen->number);
   meta_verbose ("Setting selection: %s\n", selection);
   a = XInternAtom (screen->display->xdisplay, selection, FALSE);
   XSetSelectionOwner (screen->display->xdisplay, a, 
-                      screen->wm_cm_selection_window, CurrentTime);
+                      screen->wm_cm_selection_window, screen->wm_cm_timestamp);
 }
 
 void
@@ -2797,6 +2800,7 @@
 
   g_snprintf (selection, sizeof(selection), "_NET_WM_CM_S%d", screen->number);
   a = XInternAtom (screen->display->xdisplay, selection, FALSE);
-  XSetSelectionOwner (screen->display->xdisplay, a, None, CurrentTime);
+  XSetSelectionOwner (screen->display->xdisplay, a,
+                      None, screen->wm_cm_timestamp);
 }
 #endif /* HAVE_COMPOSITE_EXTENSIONS */
diff -ru metacity-2.27.0/src/core/screen-private.h metacity-2.27.0.new/src/core/screen-private.h
--- metacity-2.27.0/src/core/screen-private.h	2008-10-19 16:15:38.000000000 -0500
+++ metacity-2.27.0.new/src/core/screen-private.h	2009-08-24 04:50:41.469785283 -0500
@@ -113,6 +113,7 @@
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
   Window wm_cm_selection_window;
+  guint32 wm_cm_timestamp;
 #endif
 
   guint work_area_idle;


metacity-2.28-empty-keybindings.patch:
 ui.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE metacity-2.28-empty-keybindings.patch ---
>From 599f25e51d967febddb4de3aa21db4258356a9f9 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Fri, 20 Nov 2009 10:19:03 -0500
Subject: [PATCH] Accept an empty string as well as "disabled" for keybindings

Treat the empty string the same as "disabled" for GConf keybinding
keys. gnome-keybinding-properties was changed to write disabled
keys as the empty string a year or so ago.

https://bugzilla.gnome.org/show_bug.cgi?id=559816
---
 src/ui/ui.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/ui.c b/src/ui/ui.c
index 6df289f..1e68df0 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -765,7 +765,7 @@ meta_ui_parse_accelerator (const char          *accel,
   *keycode = 0;
   *mask = 0;
 
-  if (strcmp (accel, "disabled") == 0)
+  if (!accel[0] || strcmp (accel, "disabled") == 0)
     return TRUE;
   
   meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
@@ -852,7 +852,7 @@ meta_ui_parse_modifier (const char          *accel,
   
   *mask = 0;
 
-  if (accel == NULL || strcmp (accel, "disabled") == 0)
+  if (accel == NULL || !accel[0] || strcmp (accel, "disabled") == 0)
     return TRUE;
   
   meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
-- 
1.6.5.2


metacity-2.28-visual-bell.patch:
 bell.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE metacity-2.28-visual-bell.patch ---
>From 80bd3db7b6711c90af19c7ee17e86aea0b804d7c Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Fri, 20 Nov 2009 10:08:20 -0500
Subject: [PATCH] Don't crash for visual bell on undecorated window

When an XKB bell is sent on a undecorated window, flash the
entire screen rather than crashing trying to flash the frame.

Based on patch by Daniel Erat
https://bugzilla.gnome.org/show_bug.cgi?id=598231
---
 src/core/bell.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/bell.c b/src/core/bell.c
index 1e01cd6..9904f97 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -231,15 +231,16 @@ bell_flash_frame (MetaDisplay *display,
   
   g_assert (xkb_ev->xkb_type == XkbBellNotify);
   window = meta_display_lookup_x_window (display, xkb_bell_event->window);
-  if (!window && (display->focus_window) && (display->focus_window->frame))
+  if (!window)
     {
       window = display->focus_window;
     }
-  if (window)
+  if (window && window->frame)
     {
       bell_flash_window_frame (window);
     }
-  else /* revert to fullscreen flash if there's no focussed window */
+  else /* revert to fullscreen flash if there's no focused window or if it
+          has no frame */
     {
       bell_flash_fullscreen (display, xkb_ev);
     }
-- 
1.6.5.2


metacity-2.28-xioerror-unknown-display.patch:
 errors.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

--- NEW FILE metacity-2.28-xioerror-unknown-display.patch ---
>From 7c30ba2d034050e8e7d1776ea7541495bdf898b3 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Fri, 20 Nov 2009 10:42:07 -0500
Subject: [PATCH] Handle XError and XIOError for unknown displays

The atk-bridge GTK+ module opens its own display; if we get an
XIOError on that display, we shouldn't abort with a meta_bug()
but just exit normally. Also fix a segfault if we got an XError
for that display.
---
 src/core/errors.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/core/errors.c b/src/core/errors.c
index 8de4608..59f9c71 100644
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -222,10 +222,10 @@ x_error_handler (Display     *xdisplay,
 
   display = meta_display_for_x_display (xdisplay);
 
-  /* Display can be NULL here because the compositing manager
-   * has its own Display, but Xlib only has one global error handler
+  /* Display can be NULL here Xlib only has one global error handler; and
+   * there might be other displays open in the process.
    */
-  if (display->error_traps > 0)
+  if (display && display->error_traps > 0)
     {
       /* we're in an error trap, chain to the trap handler
        * saved from GDK
@@ -264,21 +264,18 @@ x_io_error_handler (Display *xdisplay)
 
   display = meta_display_for_x_display (xdisplay);
 
-  if (display == NULL)
-    meta_bug ("IO error received for unknown display?\n");
-  
   if (errno == EPIPE)
     {
       meta_warning (_("Lost connection to the display '%s';\n"
                       "most likely the X server was shut down or you killed/destroyed\n"
                       "the window manager.\n"),
-                    display->name);
+                    display ? display->name : DisplayString (xdisplay));
     }
   else
     {
       meta_warning (_("Fatal IO error %d (%s) on display '%s'.\n"),
                     errno, g_strerror (errno),
-                    display->name);
+                    display ? display->name : DisplayString (xdisplay));
     }
 
   /* Xlib would force an exit anyhow */
-- 
1.6.5.2



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- metacity.spec	26 Nov 2009 08:57:15 -0000	1.214
+++ metacity.spec	10 Dec 2009 23:19:38 -0000	1.215
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -28,6 +28,30 @@ Patch12: fresh-tooltips.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=600864
 # https://bugzilla.redhat.com/show_bug.cgi?id=533239
 Patch13: metacity-dont-do-bad-stuff-on-sigterm.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=567528
+Patch14: Allow-explicit-raises-from-same-client-not-just-sa.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=445447
+Patch15: Allow-applications-to-raise-windows-when-raise_on_cl.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=598995
+Patch16: Dont-focus-ancestor-window-on-a-different-workspac.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599262
+Patch17: Add-XFCE-Terminal-as-a-terminal.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599097
+Patch18: For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599248
+Patch19: Add-nofocuswindows-preference-to-list-windows-that.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599261
+Patch20: Add-a-newwindowsalwaysontop-preference.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=577576
+Patch21: Dont-warn-about-a-missing-session-file.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=530702
+Patch22: cm-selection-timestamp.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=598231
+Patch23: metacity-2.28-visual-bell.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=559816
+Patch24: metacity-2.28-empty-keybindings.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604319
+Patch25: metacity-2.28-xioerror-unknown-display.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -55,7 +79,7 @@ BuildRequires: dbus-devel
 BuildRequires: libcanberra-devel
 
 Requires: startup-notification >= 0.7
-Requires: nodoka-metacity-theme
+Requires: gnome-themes
 # for /usr/share/control-center/keybindings, /usr/share/gnome/wm-properties
 Requires: control-center-filesystem
 # for /etc/gconf/schemas
@@ -98,6 +122,19 @@ API. This package exists purely for tech
 %patch12 -p1 -b .fresh-tooltips
 %patch13 -p1 -b .sigterm
 
+%patch14 -p1 -b .raises-from-same-client
+%patch15 -p1 -b .raise-on-click-stacking
+%patch16 -p1 -b .focus-different-workspace
+%patch17 -p1 -b .xfce-terminal
+%patch18 -p1 -b .focus-on-motion
+%patch19 -p1 -b .no-focus-windows
+%patch20 -p1 -b .always-on-top
+%patch21 -p1 -b .missing-session
+%patch22 -p1 -b .cm-selection-timestamp
+%patch23 -p1 -b .visual-bell
+%patch24 -p1 -b .empty-keybindings
+%patch25 -p1 -b .xioerror-unknown-display
+
 # force regeneration
 rm src/metacity.schemas
 
@@ -204,6 +241,22 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Dec 10 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-12
+- Require gnome-themes rather than nodoka-metacity-theme (rhbz 532455, Stijn Hoop)
+- Add patches for GNOME bugs
+   445447 - Application-induced window raise fails when raise_on_click off (rhbz 526045)
+   530702 - compiz doesn't start if metacity compositor is enabled (rhbz 537791)
+   559816 - Doesn't update keybindings being disabled/cleared (rhbz 532282)
+   567528 - Cannot raise windows from applications in Tcl/Tk and Java (rhbz 503522)
+   577576 - Failed to read saved session file warning on new sessions (rhbz 493245)
+   598231 - When Chromium rings the bell, metacity quits(rhbz 532282)
+   598995 - Don't focus ancestor window on a different workspace (rhbz 237158)
+   599097 - For mouse and sloppy focus, return to "mouse mode" on motion (rhbz 530261)
+   599248 - Add no_focus_windows preference to list windows that shouldn't be focused (rhbz 530262)
+   599261 - Add a new_windows_always_on_top preference (rhbz 530263)
+   599262 - Add XFCE Terminal as a terminal
+   604319 - XIOError unknown display (rhbz 537845)
+
 * Thu Nov 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-11
 - Fix a problem with the previous change
 



From mclasen at fedoraproject.org  Thu Dec 10 23:21:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 23:21:09 +0000 (UTC)
Subject: rpms/control-center/F-12 control-center.spec, 1.511,
	1.512 monitor-aspect.patch, 1.1, 1.2
Message-ID: <20091210232109.2A07511C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19496

Modified Files:
	control-center.spec monitor-aspect.patch 
Log Message:
Update aspect ratio patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -p -r1.511 -r1.512
--- control-center.spec	10 Dec 2009 18:13:41 -0000	1.511
+++ control-center.spec	10 Dec 2009 23:21:08 -0000	1.512
@@ -4,7 +4,7 @@
 %define glib2_version 2.13.0
 %define gtk2_version 2.11.6
 %define gconf2_version 1.2.0
-%define gnome_desktop_version 2.27.5-5
+%define gnome_desktop_version 2.28.1-6
 %define libgnome_version 2.3.0
 %define libbonobo_version 2.3.0
 %define libgnomeui_version 2.3.0
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -427,6 +427,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> 2.28.1-12
+- Update aspect ratio patch (gnome #147808)
+
 * Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-11
 - More wm keybinding fixes
 

monitor-aspect.patch:
 appearance-desktop.c |  171 +++++++++++++++++++++++++++++++++++++++------------
 appearance.h         |    4 +
 gnome-wp-item.c      |   65 ++++++++++++-------
 gnome-wp-item.h      |   11 ++-
 4 files changed, 184 insertions(+), 67 deletions(-)

Index: monitor-aspect.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/monitor-aspect.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monitor-aspect.patch	10 Nov 2009 00:57:41 -0000	1.1
+++ monitor-aspect.patch	10 Dec 2009 23:21:08 -0000	1.2
@@ -1,21 +1,517 @@
+From 7d9a95c5197a3855f4d5b560c8dec860a029da03 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann at redhat.com>
+Date: Fri, 4 Dec 2009 19:54:47 -0500
+Subject: [PATCH] Add support for per-monitor backgrounds
+
+https://bugzilla.gnome.org/show_bug.cgi?id=147808
+---
+ capplets/appearance/appearance-desktop.c |  171 +++++++++++++++++++++++-------
+ capplets/appearance/appearance.h         |    4 +
+ capplets/appearance/gnome-wp-item.c      |   65 +++++++----
+ capplets/appearance/gnome-wp-item.h      |   10 ++-
+ 4 files changed, 184 insertions(+), 66 deletions(-)
+
+diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
+index 5979654..2ae6bd6 100644
+--- a/capplets/appearance/appearance-desktop.c
++++ b/capplets/appearance/appearance-desktop.c
+@@ -82,7 +82,6 @@ get_selected_item (AppearanceData *data,
+   if (selected != NULL)
+   {
+     GtkTreeIter sel_iter;
+-    gchar *wpfile;
+ 
+     gtk_tree_model_get_iter (data->wp_model, &sel_iter,
+                              selected->data);
+@@ -93,10 +92,7 @@ get_selected_item (AppearanceData *data,
+     if (iter)
+       *iter = sel_iter;
+ 
+-    gtk_tree_model_get (data->wp_model, &sel_iter, 2, &wpfile, -1);
+-
+-    item = g_hash_table_lookup (data->wp_hash, wpfile);
+-    g_free (wpfile);
++    gtk_tree_model_get (data->wp_model, &sel_iter, 1, &item, -1);
+   }
+ 
+   return item;
+@@ -129,7 +125,10 @@ static void on_item_changed (GnomeBG *bg, AppearanceData *data) {
+ 
+     g_signal_handlers_block_by_func (bg, G_CALLBACK (on_item_changed), data);
+ 
+-    pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
++    pixbuf = gnome_wp_item_get_thumbnail (item,
++                                          data->thumb_factory,
++                                          data->thumb_width,
++                                          data->thumb_height);
+     if (pixbuf) {
+       gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+       g_object_unref (pixbuf);
+@@ -153,13 +152,14 @@ wp_props_load_wallpaper (gchar *key,
+ 
+   gtk_list_store_append (GTK_LIST_STORE (data->wp_model), &iter);
+ 
+-  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
++  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory,
++                                        data->thumb_width,
++                                        data->thumb_height);
+   gnome_wp_item_update_description (item);
+ 
+   gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter,
+                       0, pixbuf,
+-                      1, item->description,
+-                      2, item->filename,
++                      1, item,
+                       -1);
+ 
+   if (pixbuf != NULL)
+@@ -313,7 +313,9 @@ wp_scale_type_changed (GtkComboBox *combobox,
+ 
+   item->options = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_style_menu));
+ 
+-  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
++  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory,
++                                        data->thumb_width,
++                                        data->thumb_height);
+   gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+   if (pixbuf != NULL)
+     g_object_unref (pixbuf);
+@@ -338,7 +340,9 @@ wp_shade_type_changed (GtkWidget *combobox,
+ 
+   item->shade_type = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_color_menu));
+ 
+-  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
++  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory,
++                                        data->thumb_width,
++                                        data->thumb_height);
+   gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+   if (pixbuf != NULL)
+     g_object_unref (pixbuf);
+@@ -768,7 +772,6 @@ wp_view_tooltip_cb (GtkWidget  *widget,
+                     AppearanceData *data)
+ {
+   GtkTreeIter iter;
+-  gchar *wpfile;
+   GnomeWPItem *item;
+ 
+   if (gtk_icon_view_get_tooltip_context (data->wp_view,
+@@ -778,10 +781,7 @@ wp_view_tooltip_cb (GtkWidget  *widget,
+                                          NULL,
+                                          &iter))
+     {
+-      gtk_tree_model_get (data->wp_model, &iter, 2, &wpfile, -1);
+-      item = g_hash_table_lookup (data->wp_hash, wpfile);
+-      g_free (wpfile);
+-
++      gtk_tree_model_get (data->wp_model, &iter, 1, &item, -1);
+       gtk_tooltip_set_markup (tooltip, item->description);
+ 
+       return TRUE;
+@@ -795,31 +795,25 @@ wp_list_sort (GtkTreeModel *model,
+               GtkTreeIter *a, GtkTreeIter *b,
+               AppearanceData *data)
+ {
+-  gchar *foo, *bar;
+-  gchar *desca, *descb;
++  GnomeWPItem *itema, *itemb;
+   gint retval;
+ 
+-  gtk_tree_model_get (model, a, 1, &desca, 2, &foo, -1);
+-  gtk_tree_model_get (model, b, 1, &descb, 2, &bar, -1);
++  gtk_tree_model_get (model, a, 1, &itema, -1);
++  gtk_tree_model_get (model, b, 1, &itemb, -1);
+ 
+-  if (!strcmp (foo, "(none)"))
++  if (!strcmp (itema->filename, "(none)"))
+   {
+     retval =  -1;
+   }
+-  else if (!strcmp (bar, "(none)"))
++  else if (!strcmp (itemb->filename, "(none)"))
+   {
+     retval =  1;
+   }
+   else
+   {
+-    retval = g_utf8_collate (desca, descb);
++    retval = g_utf8_collate (itema->description, itemb->description);
+   }
+ 
+-  g_free (desca);
+-  g_free (descb);
+-  g_free (foo);
+-  g_free (bar);
+-
+   return retval;
+ }
+ 
+@@ -875,6 +869,68 @@ wp_update_preview (GtkFileChooser *chooser,
+ }
+ 
+ static gboolean
++reload_item (GtkTreeModel *model,
++             GtkTreePath *path,
++             GtkTreeIter *iter,
++             AppearanceData *data)
++{
++  GnomeWPItem *item;
++  GdkPixbuf *pixbuf;
++
++  gtk_tree_model_get (model, iter, 1, &item, -1);
++
++  pixbuf = gnome_wp_item_get_thumbnail (item,
++                                        data->thumb_factory,
++                                        data->thumb_width,
++                                        data->thumb_height);
++  if (pixbuf) {
++    gtk_list_store_set (GTK_LIST_STORE (data->wp_model), iter, 0, pixbuf, -1);
++    g_object_unref (pixbuf);
++  }
++
++  return FALSE;
++}
++
++static gdouble
++get_monitor_aspect_ratio_for_widget (GtkWidget *widget)
++{
++  gdouble aspect;
++  gint monitor;
++  GdkRectangle rect;
++
++  monitor = gdk_screen_get_monitor_at_window (gtk_widget_get_screen (widget), gtk_widget_get_window (widget));
++  gdk_screen_get_monitor_geometry (gtk_widget_get_screen (widget), monitor, &rect);
++  aspect = rect.height / (gdouble)rect.width;
++
++  return aspect;
++}
++
++#define LIST_IMAGE_SIZE 108
++
++static void
++compute_thumbnail_sizes (AppearanceData *data)
++{
++  gdouble aspect;
++
++  aspect = get_monitor_aspect_ratio_for_widget (GTK_WIDGET (data->wp_view));
++  if (aspect > 1) {
++    /* portrait */
++    data->thumb_width = LIST_IMAGE_SIZE / aspect;
++    data->thumb_height = LIST_IMAGE_SIZE;
++  } else {
++    data->thumb_width = LIST_IMAGE_SIZE;
++    data->thumb_height = LIST_IMAGE_SIZE * aspect;
++  }
++}
++
++static void
++reload_wallpapers (AppearanceData *data)
++{
++  compute_thumbnail_sizes (data);
++  gtk_tree_model_foreach (data->wp_model, (GtkTreeModelForeachFunc)reload_item, data);
++}
++
++static gboolean
+ wp_load_stuffs (void *user_data)
+ {
+   AppearanceData *data;
+@@ -883,6 +939,8 @@ wp_load_stuffs (void *user_data)
+ 
+   data = (AppearanceData *) user_data;
+ 
++  compute_thumbnail_sizes (data);
++
+   gnome_wp_xml_load_list (data);
+   g_hash_table_foreach (data->wp_hash, (GHFunc) wp_props_load_wallpaper,
+                         data);
+@@ -976,8 +1034,11 @@ static void
+ wp_select_after_realize (GtkWidget *widget,
+                          AppearanceData *data)
+ {
+-  GnomeWPItem *item = get_selected_item (data, NULL);
++  GnomeWPItem *item;
++
++  g_idle_add (wp_load_stuffs, data);
+ 
++  item = get_selected_item (data, NULL);
+   if (item == NULL)
+     item = g_hash_table_lookup (data->wp_hash, "(none)");
+ 
+@@ -1043,7 +1104,11 @@ next_frame (AppearanceData  *data,
+   item = get_selected_item (data, &iter);
+ 
+   if (frame >= 0)
+-    pixbuf = gnome_wp_item_get_frame_thumbnail (item, data->thumb_factory, frame);
++    pixbuf = gnome_wp_item_get_frame_thumbnail (item,
++                                                data->thumb_factory,
++                                                data->thumb_width,
++                                                data->thumb_height,
++                                                frame);
+   if (pixbuf) {
+     gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+     g_object_unref (pixbuf);
+@@ -1056,7 +1121,11 @@ next_frame (AppearanceData  *data,
+       pb = buttons[0];
+   }
+   else {
+-    pixbuf = gnome_wp_item_get_frame_thumbnail (item, data->thumb_factory, frame + 1);
++    pixbuf = gnome_wp_item_get_frame_thumbnail (item,
++                                                data->thumb_factory,
++                                                data->thumb_width,
++                                                data->thumb_height,
++                                                frame + 1);
+     if (pixbuf)
+       g_object_unref (pixbuf);
+     else
+@@ -1140,6 +1209,13 @@ buttons_cell_data_func (GtkCellLayout   *layout,
+   gtk_tree_path_free (path);
+ }
+ 
++static void
++screen_monitors_changed (GdkScreen *screen,
++                         AppearanceData *data)
++{
++  reload_wallpapers (data);
++}
++
+ void
+ desktop_init (AppearanceData *data,
+ 	      const gchar **uris)
+@@ -1194,9 +1270,8 @@ desktop_init (AppearanceData *data,
+                            (GConfClientNotifyFunc) wp_color2_changed,
+                            data, NULL, NULL);
+ 
+-  data->wp_model = GTK_TREE_MODEL (gtk_list_store_new (3, GDK_TYPE_PIXBUF,
+-                                                 G_TYPE_STRING,
+-                                                 G_TYPE_STRING));
++  data->wp_model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF,
++                                                       G_TYPE_POINTER));
+ 
+   data->wp_view = GTK_ICON_VIEW (appearance_capplet_get_widget (data, "wp_view"));
+   gtk_icon_view_set_model (data->wp_view, GTK_TREE_MODEL (data->wp_model));
+@@ -1232,12 +1307,12 @@ desktop_init (AppearanceData *data,
+ 
+   data->frame = -1;
+ 
+-  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (data->wp_model), 2,
++  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (data->wp_model), 1,
+                                    (GtkTreeIterCompareFunc) wp_list_sort,
+                                    data, NULL);
+ 
+   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (data->wp_model),
+-                                        2, GTK_SORT_ASCENDING);
++                                        1, GTK_SORT_ASCENDING);
+ 
+   gtk_drag_dest_set (GTK_WIDGET (data->wp_view), GTK_DEST_DEFAULT_ALL, drop_types,
+                      G_N_ELEMENTS (drop_types), GDK_ACTION_COPY | GDK_ACTION_MOVE);
+@@ -1280,14 +1355,20 @@ desktop_init (AppearanceData *data,
+ 
+   g_signal_connect (data->wp_rem_button, "clicked",
+                     (GCallback) wp_remove_wallpaper, data);
+-
+-  g_idle_add (wp_load_stuffs, data);
++  data->screen_monitors_handler = g_signal_connect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)),
++                                                    "monitors-changed",
++                                                    G_CALLBACK (screen_monitors_changed),
++                                                    data);
++  data->screen_size_handler = g_signal_connect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)),
++                                                    "size-changed",
++                                                    G_CALLBACK (screen_monitors_changed),
++                                                    data);
+ 
+   g_signal_connect (data->wp_view, "selection-changed",
+                     (GCallback) wp_props_wp_selected, data);
+   g_signal_connect (data->wp_view, "query-tooltip",
+                     (GCallback) wp_view_tooltip_cb, data);
+-  gtk_widget_set_has_tooltip (data->wp_view, TRUE);
++  gtk_widget_set_has_tooltip (GTK_WIDGET (data->wp_view), TRUE);
+ 
+   wp_set_sensitivities (data);
+ 
+@@ -1300,6 +1381,18 @@ void
+ desktop_shutdown (AppearanceData *data)
+ {
+   gnome_wp_xml_save_list (data);
++
++  if (data->screen_monitors_handler > 0) {
++    g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)),
++                                 data->screen_monitors_handler);
++    data->screen_monitors_handler = 0;
++  }
++  if (data->screen_size_handler > 0) {
++    g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)),
++                                 data->screen_size_handler);
++    data->screen_size_handler = 0;
++  }
++
+   g_slist_foreach (data->wp_uris, (GFunc) g_free, NULL);
+   g_slist_free (data->wp_uris);
+   if (data->wp_filesel)
+diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h
+index 5b4dd59..c598b06 100644
+--- a/capplets/appearance/appearance.h
++++ b/capplets/appearance/appearance.h
+@@ -36,6 +36,8 @@ typedef struct
+   GConfClient *client;
+   GtkBuilder  *ui;
+   GnomeDesktopThumbnailFactory *thumb_factory;
++  gulong screen_size_handler;
++  gulong screen_monitors_handler;
+ 
+   /* desktop */
+   GHashTable *wp_hash;
+@@ -51,6 +53,8 @@ typedef struct
+   GtkWidget *wp_image;
+   GSList *wp_uris;
+   gint frame;
++  gint thumb_width;
++  gint thumb_height;
+ 
+   /* font */
+   GtkWidget *font_details;
 diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c
-index b4c86f2..5b28aca 100644
+index b4c86f2..b4af8fc 100644
 --- a/capplets/appearance/gnome-wp-item.c
 +++ b/capplets/appearance/gnome-wp-item.c
-@@ -211,9 +211,13 @@ GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item,
+@@ -205,22 +205,19 @@ add_slideshow_frame (GdkPixbuf *pixbuf)
+   return tmp;
+ }
+ 
+-#define LIST_IMAGE_WIDTH 108
+-
+ GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item,
  					       GnomeDesktopThumbnailFactory * thumbs,
++                                               int width,
++                                               int height,
                                                 gint frame) {
    GdkPixbuf *pixbuf = NULL;
 -  double aspect =
 -    (double)gdk_screen_get_height (gdk_screen_get_default()) /
 -    gdk_screen_get_width (gdk_screen_get_default());
-+  GdkRectangle rect;
-+  double aspect;
-+
-+  /* Use primary monitor for aspect.  Should we use the monitor with
-+     the pointer? */
-+  gdk_screen_get_monitor_geometry (gdk_screen_get_default(), 0, &rect);
-+  aspect = (double)rect.height / rect.width;
  
    set_bg_properties (item);
  
+   if (frame != -1)
+-    pixbuf = gnome_bg_create_frame_thumbnail (item->bg, thumbs, gdk_screen_get_default (), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect, frame);
++    pixbuf = gnome_bg_create_frame_thumbnail (item->bg, thumbs, gdk_screen_get_default (), width, height, frame);
+   else
+-    pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect);
++    pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), width, height);
+ 
+   if (pixbuf && gnome_bg_changes_with_time (item->bg))
+     {
+@@ -231,15 +228,17 @@ GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item,
+       pixbuf = tmp;
+     }
+ 
+-  gnome_bg_get_image_size (item->bg, thumbs, &item->width, &item->height);
++  gnome_bg_get_image_size (item->bg, thumbs, width, height, &item->width, &item->height);
+ 
+   return pixbuf;
+ }
+ 
+ 
+ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
+-					 GnomeDesktopThumbnailFactory * thumbs) {
+-  return gnome_wp_item_get_frame_thumbnail (item, thumbs, -1);
++					 GnomeDesktopThumbnailFactory * thumbs,
++                                         gint width,
++                                         gint height) {
++  return gnome_wp_item_get_frame_thumbnail (item, thumbs, width, height, -1);
+ }
+ 
+ void gnome_wp_item_update_description (GnomeWPItem * item) {
+@@ -252,37 +251,55 @@ void gnome_wp_item_update_description (GnomeWPItem * item) {
+     gchar *size;
+     gchar *dirname = g_path_get_dirname (item->filename);
+ 
++    description = NULL;
++    size = NULL;
++
+     if (strcmp (item->fileinfo->mime_type, "application/xml") == 0)
+       {
+         if (gnome_bg_changes_with_time (item->bg))
+           description = _("Slide Show");
+-        else
++        else if (item->width > 0 && item->height > 0)
+           description = _("Image");
+       }
+     else
+       description = g_content_type_get_description (item->fileinfo->mime_type);
+ 
+-    if (gnome_bg_changes_with_size (item->bg))
++    if (gnome_bg_has_multiple_sizes (item->bg))
+       size = g_strdup (_("multiple sizes"));
+-    else
++    else if (item->width > 0 && item->height > 0) {
+       /* translators: x pixel(s) by y pixel(s) */
+       size = g_strdup_printf ("%d %s by %d %s",
+                               item->width,
+                               ngettext ("pixel", "pixels", item->width),
+                               item->height,
+                               ngettext ("pixel", "pixels", item->height));
++    }
++
++    if (description && size) {
++      /* translators: <b>wallpaper name</b>
++       * mime type, size
++       * Folder: /path/to/file
++       */
++      item->description = g_markup_printf_escaped (_("<b>%s</b>\n"
++                                                     "%s, %s\n"
++                                                     "Folder: %s"),
++                                                   item->name,
++                                                   description,
++                                                   size,
++                                                   dirname);
++    } else {
++      /* translators: <b>wallpaper name</b>
++       * Image missing
++       * Folder: /path/to/file
++       */
++      item->description = g_markup_printf_escaped (_("<b>%s</b>\n"
++                                                     "%s\n"
++                                                     "Folder: %s"),
++                                                   item->name,
++                                                   _("Image missing"),
++                                                   dirname);
++    }
+ 
+-    /* translators: <b>wallpaper name</b>
+-     * mime type, size
+-     * Folder: /path/to/file
+-     */
+-    item->description = g_markup_printf_escaped (_("<b>%s</b>\n"
+-                                   "%s, %s\n"
+-                                   "Folder: %s"),
+-                                 item->name,
+-                                 description,
+-                                 size,
+-                                 dirname);
+     g_free (size);
+     g_free (dirname);
+   }
+diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h
+index 63bdb69..03dc417 100644
+--- a/capplets/appearance/gnome-wp-item.h
++++ b/capplets/appearance/gnome-wp-item.h
+@@ -71,10 +71,14 @@ GnomeWPItem * gnome_wp_item_new (const gchar *filename,
+ 
+ void gnome_wp_item_free (GnomeWPItem *item);
+ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem *item,
+-					 GnomeDesktopThumbnailFactory *thumbs);
+-GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem *item,
+ 					 GnomeDesktopThumbnailFactory *thumbs,
+-                                         gint frame);
++                                         gint width,
++                                         gint height);
++GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem *item,
++                                               GnomeDesktopThumbnailFactory *thumbs,
++                                               gint width,
++                                               gint height,
++                                               gint frame);
+ void gnome_wp_item_update (GnomeWPItem *item);
+ void gnome_wp_item_update_description (GnomeWPItem *item);
+ void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item);
+-- 
+1.6.5.2
+



From olea at fedoraproject.org  Thu Dec 10 23:22:12 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Thu, 10 Dec 2009 23:22:12 +0000 (UTC)
Subject: File chronojump-0.8.13.tar.bz2 uploaded to lookaside cache by olea
Message-ID: <20091210232212.1062610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for chronojump:

b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2



From olea at fedoraproject.org  Thu Dec 10 23:23:02 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Thu, 10 Dec 2009 23:23:02 +0000 (UTC)
Subject: rpms/chronojump/devel .cvsignore, 1.2, 1.3 chronojump.spec, 1.2,
	1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091210232302.854C311C025D@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20171/devel

Modified Files:
	.cvsignore chronojump.spec import.log sources 
Log Message:
update to 0.8.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Oct 2009 23:17:44 -0000	1.2
+++ .cvsignore	10 Dec 2009 23:23:02 -0000	1.3
@@ -1 +1 @@
-chronojump-0.8.11.tar.gz
+chronojump-0.8.13.tar.bz2


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/chronojump.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chronojump.spec	26 Oct 2009 20:53:06 -0000	1.2
+++ chronojump.spec	10 Dec 2009 23:23:02 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           chronojump
-Version:        0.8.11
-Release:        3%{?dist}
+Version:        0.8.13
+Release:        1%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://chronojump.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/chronojump/0.8/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/chronojump/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig mono-data-sqlite gtk-sharp2 gtk-sharp2-devel desktop-file-utils gettext mono-devel
@@ -107,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* Fri Dec 11 2009 <ismael at olea.org> - 0.8.13-1
+- update to 0.8.13
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.11-3
 - ExcludeArch sparc64.  no mono available
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Oct 2009 23:17:45 -0000	1.1
+++ import.log	10 Dec 2009 23:23:02 -0000	1.2
@@ -1 +1,2 @@
 chronojump-0_8_11-2_olea:HEAD:chronojump-0.8.11-2.olea.src.rpm:1254870981
+chronojump-0_8_13-1_olea:HEAD:chronojump-0.8.13-1.olea.src.rpm:1260487350


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Oct 2009 23:17:45 -0000	1.2
+++ sources	10 Dec 2009 23:23:02 -0000	1.3
@@ -1 +1 @@
-37497f95e5140241aa128c6da482f963  chronojump-0.8.11.tar.gz
+b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 10 23:24:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 23:24:36 +0000 (UTC)
Subject: rpms/nautilus/F-12 nautilus-monitor-change.patch, 1.1,
	1.2 nautilus.spec, 1.296, 1.297
Message-ID: <20091210232436.B6A5711C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20671

Modified Files:
	nautilus-monitor-change.patch nautilus.spec 
Log Message:
update the background patch


nautilus-monitor-change.patch:
 eel-background.c |   82 +++++++++++++++++++++++--------------------------------
 1 file changed, 35 insertions(+), 47 deletions(-)

Index: nautilus-monitor-change.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/F-12/nautilus-monitor-change.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nautilus-monitor-change.patch	10 Nov 2009 00:38:22 -0000	1.1
+++ nautilus-monitor-change.patch	10 Dec 2009 23:24:36 -0000	1.2
@@ -1,8 +1,37 @@
+From cd770f34590de85b7ea0f0feccf5657590550918 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann at redhat.com>
+Date: Thu, 3 Dec 2009 23:52:08 -0500
+Subject: [PATCH] Fixes to enable per-monitor backgrounds
+
+https://bugzilla.gnome.org/show_bug.cgi?id=147808
+---
+ eel/eel-background.c |   81 +++++++++++++++++++++----------------------------
+ 1 files changed, 35 insertions(+), 46 deletions(-)
+
 diff --git a/eel/eel-background.c b/eel/eel-background.c
-index 9c40629..2854a07 100644
+index 9c40629..4d9e8e8 100644
 --- a/eel/eel-background.c
 +++ b/eel/eel-background.c
-@@ -94,6 +94,8 @@ struct EelBackgroundDetails {
+@@ -50,8 +50,8 @@ static void       eel_background_init                      (gpointer       objec
+ static void       eel_background_finalize                  (GObject       *object);
+ static GdkPixmap *eel_background_get_pixmap_and_color      (EelBackground *background,
+ 							    GdkWindow     *window,
+-							    GdkColor      *color,
+-							    gboolean      *changes_with_size);
++							    GdkColor      *color);
++
+ static void set_image_properties (EelBackground *background);
+ 
+ static void init_fade (EelBackground *background, GtkWidget *widget);
+@@ -80,7 +80,6 @@ struct EelBackgroundDetails {
+ 	GtkWidget *widget;
+ 
+ 	/* Realized data: */
+-	gboolean background_changes_with_size;
+ 	GdkPixmap *background_pixmap;
+ 	gboolean background_pixmap_is_unset_root_pixmap;
+ 	GnomeBGCrossfade *fade;
+@@ -94,6 +93,8 @@ struct EelBackgroundDetails {
  	gboolean is_desktop;
  	/* Desktop screen size watcher */
  	gulong screen_size_handler;
@@ -11,7 +40,134 @@ index 9c40629..2854a07 100644
  	/* Can we use common pixmap for root window and desktop window */
  	gboolean use_common_pixmap;
  	guint change_idle_id;
-@@ -869,7 +871,6 @@ screen_size_changed (GdkScreen *screen, EelBackground *background)
+@@ -365,14 +366,6 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window)
+ 		gdk_rgb_find_color (style->colormap, &(background->details->default_color));
+ 	}
+ 
+-	/* If the pixmap doesn't change with the window size, never update
+-	 * it again.
+-	 */
+-	if (background->details->background_pixmap != NULL &&
+-	    !background->details->background_changes_with_size) {
+-		return FALSE;
+-	}
+-
+ 	/* If the window size is the same as last time, don't update */
+ 	if (entire_width == background->details->background_entire_width &&
+ 	    entire_height == background->details->background_entire_height) {
+@@ -385,7 +378,6 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window)
+ 
+ 	set_image_properties (background);
+ 
+-	background->details->background_changes_with_size = gnome_bg_changes_with_size (background->details->bg);
+ 	background->details->background_pixmap = gnome_bg_create_pixmap (background->details->bg,
+ 									 window,
+ 									 entire_width, entire_height,
+@@ -408,8 +400,7 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window)
+ static GdkPixmap *
+ eel_background_get_pixmap_and_color (EelBackground *background,
+ 				     GdkWindow     *window,
+-				     GdkColor      *color,
+-				     gboolean      *changes_with_size)
++				     GdkColor      *color)
+ {
+ 	int entire_width;
+ 	int entire_height;
+@@ -419,7 +410,6 @@ eel_background_get_pixmap_and_color (EelBackground *background,
+ 	eel_background_ensure_realized (background, window);
+ 	
+ 	*color = background->details->default_color;
+-	*changes_with_size = background->details->background_changes_with_size;
+ 	
+ 	if (background->details->background_pixmap != NULL) {
+ 		return g_object_ref (background->details->background_pixmap);
+@@ -434,7 +424,6 @@ eel_background_expose (GtkWidget                   *widget,
+ 	GdkColor color;
+ 	int window_width;
+ 	int window_height;
+-	gboolean changes_with_size;
+ 	GdkPixmap *pixmap;
+ 	GdkGC *gc;
+ 	GdkGCValues gc_values;
+@@ -452,19 +441,8 @@ eel_background_expose (GtkWidget                   *widget,
+ 	
+ 	pixmap = eel_background_get_pixmap_and_color (background,
+ 						      widget->window,
+-						      &color,
+-						      &changes_with_size);
+-
+-        if (!changes_with_size) {
+-                /* The background was already drawn by X, since we set
+-                 * the GdkWindow background/back_pixmap.
+-                 * No need to draw it again. */
+-                if (pixmap) {
+-                        g_object_unref (pixmap);
+-                }
+-                return;
+-        }
+- 
++						      &color);
++
+ 	if (pixmap) {
+ 		gc_values.tile = pixmap;
+ 		gc_values.ts_x_origin = 0;
+@@ -670,12 +648,10 @@ set_root_pixmap (EelBackground *background,
+ 	GdkPixmap *pixmap, *root_pixmap;
+ 	GdkScreen *screen;
+ 	GdkColor color;
+-	gboolean changes_with_size;
+ 
+ 	pixmap = eel_background_get_pixmap_and_color (background,
+ 						      window,
+-						      &color,
+-						      &changes_with_size);
++						      &color);
+ 	screen = gdk_drawable_get_screen (window);
+ 
+ 	if (background->details->use_common_pixmap) {
+@@ -730,7 +706,6 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+ 	int window_height;
+ 	
+ 	GdkWindow *window;
+-	gboolean changes_with_size;
+ 	gboolean in_fade;
+ 
+ 	if (!GTK_WIDGET_REALIZED (widget)) {
+@@ -741,8 +716,7 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+ 	
+ 	pixmap = eel_background_get_pixmap_and_color (background,
+ 						      widget->window,
+-						      &color, 
+-						      &changes_with_size);
++						      &color);
+ 
+ 	style = gtk_widget_get_style (widget);
+ 	
+@@ -761,17 +735,14 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+ 	}
+ 
+ 	if (!in_fade) {
+-	if (!changes_with_size || background->details->is_desktop) {
+-		gdk_window_set_back_pixmap (window, pixmap, FALSE);
+-	} else {
+-		gdk_window_set_back_pixmap (window, NULL, FALSE);
+-		gdk_window_set_background (window, &color);
+-	}
++		if (background->details->is_desktop) {
++			gdk_window_set_back_pixmap (window, pixmap, FALSE);
++		} else {
++			gdk_window_set_back_pixmap (window, NULL, FALSE);
++			gdk_window_set_background (window, &color);
++		}
+         }
+ 	
+-	background->details->background_changes_with_size =
+-		gnome_bg_changes_with_size (background->details->bg);
+-	
+ 	if (background->details->is_desktop && !in_fade) {
+ 		set_root_pixmap (background, window);
+ 	}
+@@ -869,7 +840,6 @@ screen_size_changed (GdkScreen *screen, EelBackground *background)
  	g_signal_emit (background, signals[APPEARANCE_CHANGED], 0);
  }
  
@@ -19,7 +175,7 @@ index 9c40629..2854a07 100644
  static void
  widget_realized_setup (GtkWidget *widget, gpointer data)
  {
-@@ -891,6 +892,13 @@ widget_realized_setup (GtkWidget *widget, gpointer data)
+@@ -891,6 +861,13 @@ widget_realized_setup (GtkWidget *widget, gpointer data)
  		background->details->screen_size_handler = 
  			g_signal_connect (screen, "size_changed",
              				  G_CALLBACK (screen_size_changed), background);
@@ -33,7 +189,7 @@ index 9c40629..2854a07 100644
  
  		root_window = gdk_screen_get_root_window(screen);			
  		
-@@ -928,6 +936,11 @@ widget_unrealize_cb (GtkWidget *widget, gpointer data)
+@@ -928,6 +905,11 @@ widget_unrealize_cb (GtkWidget *widget, gpointer data)
  				                     background->details->screen_size_handler);
  			background->details->screen_size_handler = 0;
  	}
@@ -45,3 +201,22 @@ index 9c40629..2854a07 100644
  	background->details->use_common_pixmap = FALSE;
  }
  
+@@ -1022,7 +1004,14 @@ eel_get_widget_background (GtkWidget *widget)
+ gboolean
+ eel_background_is_dark (EelBackground *background)
+ {
+-	return gnome_bg_is_dark (background->details->bg);
++	GdkScreen *screen;
++	GdkRectangle rect;
++
++	/* only check for the background on the 0th monitor */
++	screen = gdk_screen_get_default ();
++	gdk_screen_get_monitor_geometry (screen, 0, &rect);
++
++	return gnome_bg_is_dark (background->details->bg, rect.width, rect.height);
+ }
+    
+ /* handle dropped colors */
+-- 
+1.6.5.2
+


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/F-12/nautilus.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- nautilus.spec	8 Dec 2009 16:21:39 -0000	1.296
+++ nautilus.spec	10 Dec 2009 23:24:36 -0000	1.297
@@ -4,7 +4,7 @@
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define desktop_file_utils_version 0.7
-%define gnome_desktop_version 2.25.5
+%define gnome_desktop_version 2.28.1-6
 %define redhat_menus_version 0.25
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -59,6 +59,7 @@ BuildRequires:  gtk-doc
 Requires(pre): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
+Requires:	gnome-desktop >= %{gnome_desktop_version}
 
 Obsoletes:      nautilus-extras
 Obsoletes:      nautilus-suggested
@@ -269,6 +270,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.28.2-3
+- Update the monitor changes patch (gnome #147808)
+
 * Tue Dec  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-2
 - Fix some memory leaks
 



From pkgdb at fedoraproject.org  Thu Dec 10 23:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:26:31 +0000
Subject: [pkgdb] metacity: krh has given up watchcommits
Message-ID: <20091210232631.C3BC110F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on metacity (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/metacity



From pkgdb at fedoraproject.org  Thu Dec 10 23:26:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:26:35 +0000
Subject: [pkgdb] metacity: krh has given up watchcommits
Message-ID: <20091210232635.5AE3D10F87D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on metacity (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/metacity



From pkgdb at fedoraproject.org  Thu Dec 10 23:26:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:26:38 +0000
Subject: [pkgdb] metacity: krh has given up watchcommits
Message-ID: <20091210232638.D329310F87D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on metacity (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/metacity



From pkgdb at fedoraproject.org  Thu Dec 10 23:26:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:26:41 +0000
Subject: [pkgdb] metacity: krh has given up watchcommits
Message-ID: <20091210232641.A21E110F87D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on metacity (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/metacity



From pkgdb at fedoraproject.org  Thu Dec 10 23:26:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:26:45 +0000
Subject: [pkgdb] metacity: krh has given up watchcommits
Message-ID: <20091210232645.53FEE10F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on metacity (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/metacity



From pkgdb at fedoraproject.org  Thu Dec 10 23:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:26:46 +0000
Subject: [pkgdb] metacity: krh has given up watchcommits
Message-ID: <20091210232647.09F8B10F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on metacity (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/metacity



From pkgdb at fedoraproject.org  Thu Dec 10 23:26:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:26:53 +0000
Subject: [pkgdb] metacity: krh has given up watchcommits
Message-ID: <20091210232653.464E910F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on metacity (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/metacity



From mclasen at fedoraproject.org  Thu Dec 10 23:27:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 23:27:34 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec, 1.232,
	1.233 per-monitor-background.patch, 1.1, 1.2
Message-ID: <20091210232734.89DF511C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21942

Modified Files:
	gnome-desktop.spec per-monitor-background.patch 
Log Message:
copy F-12 changes



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- gnome-desktop.spec	5 Dec 2009 04:49:08 -0000	1.232
+++ gnome-desktop.spec	10 Dec 2009 23:27:34 -0000	1.233
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.29.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.29.3-2
+- Update per-monitor backgrounds patch (gnome #147808)
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 

per-monitor-background.patch:
 b/libgnome-desktop/gnome-bg.c            |  251 +++++++++++++++++++------------
 b/libgnome-desktop/libgnomeui/gnome-bg.h |   12 -
 libgnome-desktop/gnome-bg.c              |    8 
 3 files changed, 168 insertions(+), 103 deletions(-)

Index: per-monitor-background.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/per-monitor-background.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- per-monitor-background.patch	10 Nov 2009 00:20:38 -0000	1.1
+++ per-monitor-background.patch	10 Dec 2009 23:27:34 -0000	1.2
@@ -1,50 +1,74 @@
-diff -up gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c.per-monitor-background gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c
---- gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c.per-monitor-background	2009-08-19 11:51:03.000000000 -0400
-+++ gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c	2009-11-09 17:05:49.839583495 -0500
-@@ -168,6 +168,9 @@ static gboolean   get_thumb_annotations 
+From 84657b9565dc5a70d709d2746def73efa0c7cf13 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann at redhat.com>
+Date: Sun, 8 Nov 2009 15:56:23 -0500
+Subject: [PATCH] Per monitors backgrounds support
+
+https://bugzilla.gnome.org/show_bug.cgi?id=147808
+---
+ libgnome-desktop/gnome-bg.c            |  251 ++++++++++++++++++++------------
+ libgnome-desktop/libgnomeui/gnome-bg.h |   11 +-
+ 2 files changed, 164 insertions(+), 98 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
+index a882551..c584147 100644
+--- a/libgnome-desktop/gnome-bg.c
++++ b/libgnome-desktop/gnome-bg.c
+@@ -168,7 +168,9 @@ static gboolean   get_thumb_annotations (GdkPixbuf             *thumb,
  					 int                   *orig_height);
  
  /* Cache */
+-static GdkPixbuf *get_pixbuf           (GnomeBG               *bg);
 +static GdkPixbuf *get_pixbuf_for_size  (GnomeBG               *bg,
 +					int                    width,
 +					int                    height);
- static GdkPixbuf *get_pixbuf           (GnomeBG               *bg);
  static void       clear_cache          (GnomeBG               *bg);
  static gboolean   is_different         (GnomeBG               *bg,
-@@ -685,12 +688,13 @@ get_scaled_pixbuf (GnomeBGPlacement plac
+ 					const char            *filename);
+@@ -183,7 +185,11 @@ static SlideShow * get_as_slideshow    (GnomeBG               *bg,
+ 					const char 	      *filename);
+ static Slide *     get_current_slide   (SlideShow 	      *show,
+ 		   			double    	      *alpha);
+-static gboolean    slideshow_changes_with_size (SlideShow *show);
++static gboolean    slideshow_has_multiple_sizes (SlideShow *show);
++
++static FileSize   *find_best_size      (GSList                *sizes,
++					gint                   width,
++					gint                   height);
+ 
+ static void
+ color_from_string (const char *string,
+@@ -685,12 +691,13 @@ get_scaled_pixbuf (GnomeBGPlacement placement,
  }
  
  static void
 -draw_image (GnomeBGPlacement  placement,
 -	    GdkPixbuf        *pixbuf,
 -	    GdkPixbuf        *dest)
-+draw_image_region (GnomeBGPlacement  placement,
-+		   GdkPixbuf        *pixbuf,
-+		   GdkPixbuf        *dest,
-+		   GdkRectangle     *region)
++draw_image_area (GnomeBGPlacement  placement,
++		 GdkPixbuf        *pixbuf,
++		 GdkPixbuf        *dest,
++		 GdkRectangle     *area)
  {
 -	int dest_width = gdk_pixbuf_get_width (dest);
 -	int dest_height = gdk_pixbuf_get_height (dest);
-+	int dest_width = region->width;
-+	int dest_height = region->height;
++	int dest_width = area->width;
++	int dest_height = area->height;
  	int x, y, w, h;
  	GdkPixbuf *scaled;
  	
-@@ -708,7 +712,7 @@ draw_image (GnomeBGPlacement  placement,
+@@ -708,7 +715,7 @@ draw_image (GnomeBGPlacement  placement,
  	case GNOME_BG_PLACEMENT_CENTERED:
  	case GNOME_BG_PLACEMENT_FILL_SCREEN:
  	case GNOME_BG_PLACEMENT_SCALED:
 -		pixbuf_blend (scaled, dest, 0, 0, w, h, x, y, 1.0);
-+		pixbuf_blend (scaled, dest, 0, 0, w, h, x + region->x, y + region->y, 1.0);
++		pixbuf_blend (scaled, dest, 0, 0, w, h, x + area->x, y + area->y, 1.0);
  		break;
  	default:
  		g_assert_not_reached ();
-@@ -718,15 +722,62 @@ draw_image (GnomeBGPlacement  placement,
+@@ -718,51 +725,82 @@ draw_image (GnomeBGPlacement  placement,
  	g_object_unref (scaled);
  }
  
--void
--gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest)
 +static void
 +draw_image (GnomeBGPlacement  placement,
 +	    GdkPixbuf        *pixbuf,
@@ -57,37 +81,42 @@ diff -up gnome-desktop-2.28.1/libgnome-d
 +	rect.width = gdk_pixbuf_get_width (dest);
 +	rect.height = gdk_pixbuf_get_height (dest);
 +
-+	draw_image_region (placement, pixbuf, dest, &rect);
++	draw_image_area (placement, pixbuf, dest, &rect);
 +}
 +
 +static void
-+draw_on_monitor (GnomeBG *bg, GdkPixbuf *dest, GdkRectangle *region)
++draw_each_monitor (GnomeBG   *bg,
++		   GdkPixbuf *dest,
++		   GdkScreen *screen)
 +{
-+	draw_image_region (bg->placement, get_pixbuf_for_size (bg, region->width, region->height), dest, region);
-+}
++	GdkRectangle rect;
 +
-+static void
-+draw_each_monitor (GnomeBG *bg, GdkPixbuf *dest, GdkScreen *screen)
-+{
 +	if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
++		GdkScreen *screen;
++
 +		/* don't worry about aligning on every monitor */
-+		draw_image (bg->placement, get_pixbuf (bg), dest);
++		screen = gdk_screen_get_default ();
++		gdk_screen_get_monitor_geometry (screen, 0, &rect);
++		draw_image (bg->placement,
++			    get_pixbuf_for_size (bg, rect.width, rect.height),
++			    dest);
 +	} else {
 +		gint num_monitors;
-+		GdkRectangle rect;
 +		int monitor;
 +
 +		num_monitors = gdk_screen_get_n_monitors (screen);
-+
 +		for (monitor = 0; monitor < num_monitors; monitor++) {
 +			gdk_screen_get_monitor_geometry (screen, monitor, &rect);
-+			draw_on_monitor (bg, dest, &rect);
++			draw_image_area (bg->placement,
++					 get_pixbuf_for_size (bg, rect.width, rect.height),
++					 dest, &rect);
 +		}
 +	}
 +}
 +
-+static void
-+draw_on_screen (GnomeBG *bg, GdkPixbuf *dest, GdkScreen *screen)
+ void
+-gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest)
++gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest, GdkScreen *screen)
  {
  	if (!bg)
  		return;
@@ -96,25 +125,287 @@ diff -up gnome-desktop-2.28.1/libgnome-d
  	
 -	draw_image (bg->placement, get_pixbuf (bg), dest);
 +	draw_each_monitor (bg, dest, screen);
-+}
-+
-+void
-+gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest)
-+{
-+	draw_on_screen (bg, dest, gdk_screen_get_default ());
  }
  
  gboolean
-@@ -883,7 +934,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+-gnome_bg_changes_with_size (GnomeBG *bg)
++gnome_bg_has_multiple_sizes (GnomeBG *bg)
+ {
+ 	SlideShow *show;
+ 
+ 	g_return_val_if_fail (bg != NULL, FALSE);
+ 
+ 	show = get_as_slideshow (bg, bg->filename);
+-	if (show) 
+-		return slideshow_changes_with_size (show);
+-	
+-	if (bg->color_type != GNOME_BG_COLOR_SOLID) {
+-		if (!get_pixbuf (bg))
+-			return TRUE;
+-		if (gdk_pixbuf_get_has_alpha (get_pixbuf (bg)))
+-			return TRUE;
+-		if (bg->placement == GNOME_BG_PLACEMENT_CENTERED)
+-			return TRUE;
+-		return FALSE;
+-	}
+-	else if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
+-		return FALSE;
+-	}
+-	else {
+-		return TRUE;
+-	}
++	if (show)
++		return slideshow_has_multiple_sizes (show);
++
++	return FALSE;
+ }
+ 
+ static void
+-gnome_bg_get_pixmap_size (GnomeBG  *bg,
+-			  int       width,
+-			  int       height,
+-			  int      *pixmap_width,
+-			  int      *pixmap_height)
++gnome_bg_get_pixmap_size (GnomeBG   *bg,
++			  int        width,
++			  int        height,
++			  int       *pixmap_width,
++			  int       *pixmap_height)
+ {
+ 	int dummy;
+ 	int pb_width, pb_height;
+@@ -774,8 +812,8 @@ gnome_bg_get_pixmap_size (GnomeBG  *bg,
+ 	
+ 	*pixmap_width = width;
+ 	*pixmap_height = height;
+-	
+-	if (!get_pixbuf (bg)) {
++
++	if (!bg->filename) {
+ 		switch (bg->color_type) {
+ 		case GNOME_BG_COLOR_SOLID:
+ 			*pixmap_width = 1;
+@@ -796,11 +834,13 @@ gnome_bg_get_pixmap_size (GnomeBG  *bg,
+ 		return;
+ 	}
+ 	
+-	pb_width = gdk_pixbuf_get_width (get_pixbuf (bg));
+-	pb_height = gdk_pixbuf_get_height (get_pixbuf (bg));
+-	
+ 	if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
+-		if (gdk_pixbuf_get_has_alpha (get_pixbuf (bg)) &&
++		GdkPixbuf *pixbuf;
++		pixbuf = get_pixbuf_for_size (bg, width, height);
++		pb_width = gdk_pixbuf_get_width (pixbuf);
++		pb_height = gdk_pixbuf_get_height (pixbuf);
++	
++		if (gdk_pixbuf_get_has_alpha (pixbuf) &&
+ 		    bg->color_type != GNOME_BG_COLOR_SOLID) {
+ 			if (bg->color_type == GNOME_BG_COLOR_H_GRADIENT) {
+ 				/* FIXME: Should this be
+@@ -860,6 +900,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+ 	bg->last_pixmap_width = width;
+ 	bg->last_pixmap_height = height;
+ 
++	/* has the side effect of loading and caching pixbuf only when in tile mode */
+ 	gnome_bg_get_pixmap_size (bg, width, height, &pm_width, &pm_height);
+ 	
+ 	if (root) {
+@@ -870,7 +911,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+ 		pixmap = gdk_pixmap_new (window, pm_width, pm_height, -1);
+ 	}
+ 	
+-	if (!get_pixbuf (bg) && bg->color_type == GNOME_BG_COLOR_SOLID) {
++	if (!bg->filename && bg->color_type == GNOME_BG_COLOR_SOLID) {
+ 		GdkGC *gc = gdk_gc_new (pixmap);
+ 		gdk_gc_set_rgb_fg_color (gc, &(bg->primary));
+ 		
+@@ -883,7 +924,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
  		
  		pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
  					 width, height);
 -		gnome_bg_draw (bg, pixbuf);
-+		draw_on_screen (bg, pixbuf, gdk_drawable_get_screen (GDK_DRAWABLE (window)));
++		gnome_bg_draw (bg, pixbuf, gdk_drawable_get_screen (GDK_DRAWABLE (window)));
  		gdk_draw_pixbuf (pixmap, NULL, pixbuf,
  				 0, 0,
  				 0, 0, width, height,
-@@ -1880,13 +1931,16 @@ find_best_size (GSList *sizes, gint widt
+@@ -899,10 +940,13 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+  * clients know what colors to draw on top with
+  */
+ gboolean
+-gnome_bg_is_dark (GnomeBG *bg)
++gnome_bg_is_dark (GnomeBG *bg,
++		  int      width,
++		  int      height)
+ {
+ 	GdkColor color;
+ 	int intensity;
++	GdkPixbuf *pixbuf;
+ 	
+ 	g_return_val_if_fail (bg != NULL, FALSE);
+ 	
+@@ -913,9 +957,9 @@ gnome_bg_is_dark (GnomeBG *bg)
+ 		color.green = (bg->primary.green + bg->secondary.green) / 2;
+ 		color.blue = (bg->primary.blue + bg->secondary.blue) / 2;
+ 	}
+-	
+-	if (get_pixbuf (bg)) {
+-		guint32 argb = pixbuf_average_value (get_pixbuf (bg));
++	pixbuf = get_pixbuf_for_size (bg, width, height);
++	if (pixbuf) {
++		guint32 argb = pixbuf_average_value (pixbuf);
+ 		guchar a = (argb >> 24) & 0xff;
+ 		guchar r = (argb >> 16) & 0xff;
+ 		guchar g = (argb >>  8) & 0xff;
+@@ -1001,9 +1045,31 @@ get_original_size (const char *filename,
+ 	return result;
+ }
+ 
++static const char *
++get_filename_for_size (GnomeBG *bg, gint best_width, gint best_height)
++{
++	SlideShow *show;
++	Slide *slide;
++	FileSize *size;
++
++	if (!bg->filename)
++		return NULL;
++
++	show = get_as_slideshow (bg, bg->filename);
++	if (!show) {
++		return bg->filename;
++	}
++
++	slide = get_current_slide (show, NULL);
++	size = find_best_size (slide->file1, best_width, best_height);
++	return size->file;
++}
++
+ gboolean
+ gnome_bg_get_image_size (GnomeBG	       *bg,
+ 			 GnomeDesktopThumbnailFactory *factory,
++			 int                    best_width,
++			 int                    best_height,
+ 			 int		       *width,
+ 			 int		       *height)
+ {
+@@ -1017,21 +1083,8 @@ gnome_bg_get_image_size (GnomeBG	       *bg,
+ 	if (!bg->filename)
+ 		return FALSE;
+ 	
+-	filename = bg->filename;
++	filename = get_filename_for_size (bg, best_width, best_height);
+ 	thumb = create_thumbnail_for_filename (factory, filename);
+-	
+-	if (!thumb) {
+-		SlideShow *show = get_as_slideshow (bg, bg->filename);
+-		if (show) {
+-			double alpha;
+-			FileSize *fs;
+-			Slide *slide = get_current_slide (show, &alpha);
+-			fs = slide->file1->data;
+-			filename = fs->file;
+-			thumb = create_thumbnail_for_filename (factory, filename);
+-		}
+-	}
+-
+ 	if (thumb) {
+ 		if (get_thumb_annotations (thumb, width, height))
+ 			result = TRUE;
+@@ -1316,7 +1369,7 @@ struct _SlideShow
+ 
+ 	GQueue *slides;
+ 	
+-	gboolean changes_with_size;
++	gboolean has_multiple_sizes;
+ 
+ 	/* used during parsing */
+ 	struct tm start_tm;
+@@ -1356,7 +1409,8 @@ get_current_slide (SlideShow *show,
+ 		Slide *slide = list->data;
+ 
+ 		if (elapsed + slide->duration > delta) {
+-			*alpha = (delta - elapsed) / (double)slide->duration;
++			if (alpha)
++				*alpha = (delta - elapsed) / (double)slide->duration;
+ 			return slide;
+ 		}
+ 
+@@ -1512,7 +1566,10 @@ file_cache_add_slide_show (GnomeBG *bg,
+ }
+ 
+ static GdkPixbuf *
+-get_as_pixbuf (GnomeBG *bg, const char *filename)
++get_as_pixbuf_for_size (GnomeBG    *bg,
++			const char *filename,
++			int         best_width,
++			int         best_height)
+ {
+ 	const FileCacheEntry *ent;
+ 	if ((ent = file_cache_lookup (bg, PIXBUF, filename))) {
+@@ -1523,14 +1580,14 @@ get_as_pixbuf (GnomeBG *bg, const char *filename)
+ 		GdkPixbuf *pixbuf;
+ 
+ 		/* If scalable choose maximum size */
+-		format = gdk_pixbuf_get_file_info (bg->filename, NULL, NULL);
++		format = gdk_pixbuf_get_file_info (filename, NULL, NULL);
+ 		if (format != NULL &&
+ 		    strcmp (gdk_pixbuf_format_get_name (format), "svg") == 0 &&
+-		    (bg->last_pixmap_width > 0 && bg->last_pixmap_height > 0) &&
++		    (best_width > 0 && best_height > 0) &&
+ 		    (bg->placement == GNOME_BG_PLACEMENT_FILL_SCREEN ||
+ 		     bg->placement == GNOME_BG_PLACEMENT_SCALED ||
+ 		     bg->placement == GNOME_BG_PLACEMENT_ZOOMED))
+-			pixbuf = gdk_pixbuf_new_from_file_at_size (filename, bg->last_pixmap_width, bg->last_pixmap_height, NULL);
++			pixbuf = gdk_pixbuf_new_from_file_at_size (filename, best_width, best_height, NULL);
+ 		else
+ 			pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ 
+@@ -1784,8 +1841,7 @@ create_img_thumbnail (GnomeBG                      *bg,
+ 				if (slide->fixed) {
+ 					GdkPixbuf *tmp;
+ 					FileSize *fs;
+-					
+-					fs = slide->file1->data;
++					fs = find_best_size (slide->file1, dest_width, dest_height);
+ 					tmp = get_as_thumbnail (bg, factory, fs->file);
+ 
+ 					thumb = scale_thumbnail (
+@@ -1793,26 +1849,23 @@ create_img_thumbnail (GnomeBG                      *bg,
+ 						tmp, screen, dest_width, dest_height);
+ 				}
+ 				else {
+-					FileSize *fs;
++					FileSize *fs1, *fs2;
+ 					GdkPixbuf *p1, *p2;
++					fs1 = find_best_size (slide->file1, dest_width, dest_height);
++					p1 = get_as_thumbnail (bg, factory, fs1->file);
+ 
+-					fs = slide->file1->data;
+-					p1 = get_as_thumbnail (bg, factory, fs->file);
+-
+-					fs = slide->file2->data;
+-					p2 = get_as_thumbnail (bg, factory, fs->file);
++					fs2 = find_best_size (slide->file2, dest_width, dest_height);
++					p2 = get_as_thumbnail (bg, factory, fs2->file);
+ 
+ 					if (p1 && p2) {
+ 						GdkPixbuf *thumb1, *thumb2;
+ 
+-						fs = slide->file1->data;
+ 						thumb1 = scale_thumbnail (
+-							bg->placement, fs->file,
++							bg->placement, fs1->file,
+ 							p1, screen, dest_width, dest_height);
+ 
+-						fs = slide->file2->data;
+ 						thumb2 = scale_thumbnail (
+-							bg->placement, fs->file,
++							bg->placement, fs2->file,
+ 							p2, screen, dest_width, dest_height);
+ 
+ 						thumb = blend (thumb1, thumb2, alpha);
+@@ -1880,18 +1933,26 @@ find_best_size (GSList *sizes, gint width, gint height)
  }
  
  static GdkPixbuf *
@@ -123,56 +414,152 @@ diff -up gnome-desktop-2.28.1/libgnome-d
  {
  	/* FIXME: this ref=TRUE/FALSE stuff is crazy */
 -	
-+	gint width, height;
  	guint time_until_next_change;
  	gboolean ref = FALSE;
 -	
+-	if (!bg->pixbuf_cache && bg->filename) {
++	gboolean hit_cache = FALSE;
 +
-+	width = (best_width > 0) ? best_width : bg->last_pixmap_width;
-+	height = (best_height > 0) ? best_height : bg->last_pixmap_height;
++	/* only hit the cache if the aspect ratio matches */
++	if (bg->pixbuf_cache) {
++		int width, height;
++		width = gdk_pixbuf_get_width (bg->pixbuf_cache);
++		height = gdk_pixbuf_get_height (bg->pixbuf_cache);
++		hit_cache = 0.2 > fabs ((best_width / (double)best_height) - (width / (double)height));
++	}
 +
- 	if (!bg->pixbuf_cache && bg->filename) {
++	if (!hit_cache && bg->filename) {
  		ref = TRUE;
  		bg->file_mtime = get_mtime (bg->filename);
-@@ -1906,15 +1960,15 @@ get_pixbuf (GnomeBG *bg)
+ 		
+-		bg->pixbuf_cache = get_as_pixbuf (bg, bg->filename);
++		bg->pixbuf_cache = get_as_pixbuf_for_size (bg, bg->filename, best_width, best_height);
+ 		time_until_next_change = G_MAXUINT;
+ 		if (!bg->pixbuf_cache) {
+ 			SlideShow *show = get_as_slideshow (bg, bg->filename);
+@@ -1906,16 +1967,16 @@ get_pixbuf (GnomeBG *bg)
  				time_until_next_change = (guint)get_slide_timeout (slide);
  				if (slide->fixed) {
  					FileSize *size;
 -					size = find_best_size (slide->file1, bg->last_pixmap_width, bg->last_pixmap_height);
-+					size = find_best_size (slide->file1, width, height);
- 					bg->pixbuf_cache = get_as_pixbuf (bg, size->file);
+-					bg->pixbuf_cache = get_as_pixbuf (bg, size->file);
++					size = find_best_size (slide->file1, best_width, best_height);
++					bg->pixbuf_cache = get_as_pixbuf_for_size (bg, size->file, best_width, best_height);
  				}
  				else {
  					FileSize *size;
  					GdkPixbuf *p1, *p2;
 -					size = find_best_size (slide->file1, bg->last_pixmap_width, bg->last_pixmap_height);
-+					size = find_best_size (slide->file1, width, height);
- 					p1 = get_as_pixbuf (bg, size->file);
+-					p1 = get_as_pixbuf (bg, size->file);
 -					size = find_best_size (slide->file2, bg->last_pixmap_width, bg->last_pixmap_height);
-+					size = find_best_size (slide->file2, width, height);
- 					p2 = get_as_pixbuf (bg, size->file);
+-					p2 = get_as_pixbuf (bg, size->file);
++					size = find_best_size (slide->file1, best_width, best_height);
++					p1 = get_as_pixbuf_for_size (bg, size->file, best_width, best_height);
++					size = find_best_size (slide->file2, best_width, best_height);
++					p2 = get_as_pixbuf_for_size (bg, size->file, best_width, best_height);
  
  
-@@ -1943,6 +1997,22 @@ get_pixbuf (GnomeBG *bg)
- 	return bg->pixbuf_cache;
+ 					if (p1 && p2) {
+@@ -2368,14 +2429,14 @@ handle_text (GMarkupParseContext *context,
+ 		fs->file = g_strdup (text);
+ 		slide->file1 = g_slist_prepend (slide->file1, fs);
+ 		if (slide->file1->next != NULL)
+-			parser->changes_with_size = TRUE;                       
++			parser->has_multiple_sizes = TRUE;                       
+ 	}
+ 	else if (stack_is (parser, "size", "file", "static", "background", NULL) ||
+ 		 stack_is (parser, "size", "from", "transition", "background", NULL)) {
+ 		fs = slide->file1->data;
+ 		fs->file = g_strdup (text);
+ 		if (slide->file1->next != NULL)
+-			parser->changes_with_size = TRUE; 
++			parser->has_multiple_sizes = TRUE; 
+ 	}
+ 	else if (stack_is (parser, "to", "transition", "background", NULL)) {
+ 		for (i = 0; text[i]; i++) {
+@@ -2390,13 +2451,13 @@ handle_text (GMarkupParseContext *context,
+ 		fs->file = g_strdup (text);
+ 		slide->file2 = g_slist_prepend (slide->file2, fs);
+ 		if (slide->file2->next != NULL)
+-			parser->changes_with_size = TRUE;                       
++			parser->has_multiple_sizes = TRUE;                       
+ 	}
+ 	else if (stack_is (parser, "size", "to", "transition", "background", NULL)) {
+ 		fs = slide->file2->data;
+ 		fs->file = g_strdup (text);
+ 		if (slide->file2->next != NULL)
+-			parser->changes_with_size = TRUE;
++			parser->has_multiple_sizes = TRUE;
+ 	}
+ }
+ 
+@@ -2639,9 +2700,9 @@ get_thumb_annotations (GdkPixbuf *thumb,
  }
  
-+static GdkPixbuf *
-+get_pixbuf (GnomeBG *bg)
-+{
-+	GdkPixbuf   *pixbuf;
-+	GdkScreen   *screen;
-+	GdkRectangle rect;
-+
-+	screen = gdk_screen_get_default ();
-+
-+	/* default to caching the primary monitor */
-+	gdk_screen_get_monitor_geometry (screen, 0, &rect);
-+	pixbuf = get_pixbuf_for_size (bg, rect.width, rect.height);
-+
-+	return pixbuf;
-+}
-+
  static gboolean
- is_different (GnomeBG    *bg,
- 	      const char *filename)
+-slideshow_changes_with_size (SlideShow *show)
++slideshow_has_multiple_sizes (SlideShow *show)
+ {
+-	return show->changes_with_size;
++	return show->has_multiple_sizes;
+ }
+ 
+ /*
+diff --git a/libgnome-desktop/libgnomeui/gnome-bg.h b/libgnome-desktop/libgnomeui/gnome-bg.h
+index 993173a..ddf9e5c 100644
+--- a/libgnome-desktop/libgnomeui/gnome-bg.h
++++ b/libgnome-desktop/libgnomeui/gnome-bg.h
+@@ -87,7 +87,8 @@ const gchar *    gnome_bg_get_filename          (GnomeBG               *bg);
+ 
+ /* Drawing and thumbnailing */
+ void             gnome_bg_draw                  (GnomeBG               *bg,
+-						 GdkPixbuf             *dest);
++						 GdkPixbuf             *dest,
++						 GdkScreen	       *screen);
+ GdkPixmap *      gnome_bg_create_pixmap         (GnomeBG               *bg,
+ 						 GdkWindow             *window,
+ 						 int                    width,
+@@ -95,6 +96,8 @@ GdkPixmap *      gnome_bg_create_pixmap         (GnomeBG               *bg,
+ 						 gboolean               root);
+ gboolean         gnome_bg_get_image_size        (GnomeBG               *bg,
+ 						 GnomeDesktopThumbnailFactory *factory,
++                                                 int                    best_width,
++                                                 int                    best_height,
+ 						 int                   *width,
+ 						 int                   *height);
+ GdkPixbuf *      gnome_bg_create_thumbnail      (GnomeBG               *bg,
+@@ -102,8 +105,10 @@ GdkPixbuf *      gnome_bg_create_thumbnail      (GnomeBG               *bg,
+ 						 GdkScreen             *screen,
+ 						 int                    dest_width,
+ 						 int                    dest_height);
+-gboolean         gnome_bg_is_dark               (GnomeBG               *bg);
+-gboolean         gnome_bg_changes_with_size     (GnomeBG               *bg);
++gboolean         gnome_bg_is_dark               (GnomeBG               *bg,
++                                                 int                    dest_width,
++						 int                    dest_height);
++gboolean         gnome_bg_has_multiple_sizes    (GnomeBG               *bg);
+ gboolean         gnome_bg_changes_with_time     (GnomeBG               *bg);
+ GdkPixbuf *      gnome_bg_create_frame_thumbnail (GnomeBG              *bg,
+ 						 GnomeDesktopThumbnailFactory *factory,
+-- 
+1.6.5.2
+
+diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
+index c584147..f050e70 100644
+--- a/libgnome-desktop/gnome-bg.c
++++ b/libgnome-desktop/gnome-bg.c
+@@ -1843,10 +1843,10 @@ create_img_thumbnail (GnomeBG                      *bg,
+ 					FileSize *fs;
+ 					fs = find_best_size (slide->file1, dest_width, dest_height);
+ 					tmp = get_as_thumbnail (bg, factory, fs->file);
+-
+-					thumb = scale_thumbnail (
+-						bg->placement, fs->file,
+-						tmp, screen, dest_width, dest_height);
++					if (tmp)
++						thumb = scale_thumbnail (
++									 bg->placement, fs->file,
++									 tmp, screen, dest_width, dest_height);
+ 				}
+ 				else {
+ 					FileSize *fs1, *fs2;



From pkgdb at fedoraproject.org  Thu Dec 10 23:27:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:27:44 +0000
Subject: [pkgdb] nautilus: krh has given up watchcommits
Message-ID: <20091210232744.BA2D410F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on nautilus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 23:27:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:27:47 +0000
Subject: [pkgdb] nautilus: krh has given up watchcommits
Message-ID: <20091210232747.5B5C610F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on nautilus (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 23:27:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:27:51 +0000
Subject: [pkgdb] nautilus: krh has given up watchcommits
Message-ID: <20091210232751.7344510F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on nautilus (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 23:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:27:58 +0000
Subject: [pkgdb] nautilus: krh has given up watchcommits
Message-ID: <20091210232758.AD4A810F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on nautilus (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Thu Dec 10 23:28:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:28:01 +0000
Subject: [pkgdb] nautilus: krh has given up watchcommits
Message-ID: <20091210232801.477CE10F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on nautilus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pghmcfc at fedoraproject.org  Thu Dec 10 23:28:03 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 10 Dec 2009 23:28:03 +0000 (UTC)
Subject: rpms/proftpd/F-11 .cvsignore, 1.17, 1.18 proftpd.spec, 1.54,
	1.55 sources, 1.17,
	1.18 proftpd-1.3.2b-segfault-on-auth-fail.patch, 1.1, NONE
Message-ID: <20091210232803.B2EFE11C025D@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21998/F-11

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.2b-segfault-on-auth-fail.patch 
Log Message:
* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2c-1
- Update to 1.3.2c, addressing the following issues:
  - SSL/TLS renegotiation vulnerability (CVE-2009-3555, bug 3324)
  - Failed database transaction can cause mod_quotatab to loop (bug 3228)
  - Segfault in mod_wrap (bug 3332)
  - <Directory> sections can have <Limit> problems (bug 3337)
  - mod_wrap2 segfaults when a valid user retries the USER command (bug 3341)
  - mod_auth_file handles 'getgroups' request incorrectly (bug 3347)
  - Segfault caused by scrubbing zero-length portion of memory (bug 3350)
- Drop upstreamed segfault patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	16 Nov 2009 20:05:30 -0000	1.17
+++ .cvsignore	10 Dec 2009 23:28:03 -0000	1.18
@@ -1,3 +1,3 @@
-proftpd-1.3.2b.tar.bz2
+proftpd-1.3.2c.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
 proftpd-mod-exec-0.9.6.tar.gz


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- proftpd.spec	10 Dec 2009 16:09:45 -0000	1.54
+++ proftpd.spec	10 Dec 2009 23:28:03 -0000	1.55
@@ -7,11 +7,11 @@
 %endif
 
 #global prever rc3
-%global rpmrel 3
+%global rpmrel 1
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.2b
+Version:		1.3.2c
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -31,7 +31,6 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
-Patch4:			proftpd-1.3.2b-segfault-on-auth-fail.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -100,9 +99,6 @@ Module to add PostgreSQL support to the 
 # (upstream patch)
 %patch3 -p1 -b .mlsd
 
-# Fix segfault on auth failures (bug 3350)
-%patch4 -p1 -b .segfault-on-auth-failure
-
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -295,6 +291,17 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2c-1
+- Update to 1.3.2c, addressing the following issues:
+  - SSL/TLS renegotiation vulnerability (CVE-2009-3555, bug 3324)
+  - Failed database transaction can cause mod_quotatab to loop (bug 3228)
+  - Segfault in mod_wrap (bug 3332)
+  - <Directory> sections can have <Limit> problems (bug 3337)
+  - mod_wrap2 segfaults when a valid user retries the USER command (bug 3341)
+  - mod_auth_file handles 'getgroups' request incorrectly (bug 3347)
+  - Segfault caused by scrubbing zero-length portion of memory (bug 3350)
+- Drop upstreamed segfault patch
+
 * Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-3
 - Add patch for upstream bug 3350 - segfault on auth failures
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	16 Nov 2009 20:05:30 -0000	1.17
+++ sources	10 Dec 2009 23:28:03 -0000	1.18
@@ -1,3 +1,3 @@
-0d6777839f37115654ce384841f68131  proftpd-1.3.2b.tar.bz2
+559fd3fb6959d42ddd66b333a03b0c49  proftpd-1.3.2c.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
 dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz


--- proftpd-1.3.2b-segfault-on-auth-fail.patch DELETED ---



From pghmcfc at fedoraproject.org  Thu Dec 10 23:28:04 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 10 Dec 2009 23:28:04 +0000 (UTC)
Subject: rpms/proftpd/devel .cvsignore, 1.17, 1.18 proftpd.spec, 1.61,
	1.62 sources, 1.17,
	1.18 proftpd-1.3.2b-segfault-on-auth-fail.patch, 1.1, NONE
Message-ID: <20091210232804.95E9D11C025D@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21998/devel

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.2b-segfault-on-auth-fail.patch 
Log Message:
* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2c-1
- Update to 1.3.2c, addressing the following issues:
  - SSL/TLS renegotiation vulnerability (CVE-2009-3555, bug 3324)
  - Failed database transaction can cause mod_quotatab to loop (bug 3228)
  - Segfault in mod_wrap (bug 3332)
  - <Directory> sections can have <Limit> problems (bug 3337)
  - mod_wrap2 segfaults when a valid user retries the USER command (bug 3341)
  - mod_auth_file handles 'getgroups' request incorrectly (bug 3347)
  - Segfault caused by scrubbing zero-length portion of memory (bug 3350)
- Drop upstreamed segfault patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	21 Oct 2009 11:18:26 -0000	1.17
+++ .cvsignore	10 Dec 2009 23:28:04 -0000	1.18
@@ -1,3 +1,3 @@
-proftpd-1.3.2b.tar.bz2
+proftpd-1.3.2c.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
 proftpd-mod-exec-0.9.6.tar.gz


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- proftpd.spec	10 Dec 2009 16:09:47 -0000	1.61
+++ proftpd.spec	10 Dec 2009 23:28:04 -0000	1.62
@@ -7,11 +7,11 @@
 %endif
 
 #global prever rc3
-%global rpmrel 3
+%global rpmrel 1
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.2b
+Version:		1.3.2c
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -31,7 +31,6 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
-Patch4:			proftpd-1.3.2b-segfault-on-auth-fail.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -100,9 +99,6 @@ Module to add PostgreSQL support to the 
 # (upstream patch)
 %patch3 -p1 -b .mlsd
 
-# Fix segfault on auth failures (bug 3350)
-%patch4 -p1 -b .segfault-on-auth-failure
-
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -295,6 +291,17 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2c-1
+- Update to 1.3.2c, addressing the following issues:
+  - SSL/TLS renegotiation vulnerability (CVE-2009-3555, bug 3324)
+  - Failed database transaction can cause mod_quotatab to loop (bug 3228)
+  - Segfault in mod_wrap (bug 3332)
+  - <Directory> sections can have <Limit> problems (bug 3337)
+  - mod_wrap2 segfaults when a valid user retries the USER command (bug 3341)
+  - mod_auth_file handles 'getgroups' request incorrectly (bug 3347)
+  - Segfault caused by scrubbing zero-length portion of memory (bug 3350)
+- Drop upstreamed segfault patch
+
 * Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-3
 - Add patch for upstream bug 3350 - segfault on auth failures
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Oct 2009 11:18:26 -0000	1.17
+++ sources	10 Dec 2009 23:28:04 -0000	1.18
@@ -1,3 +1,3 @@
-0d6777839f37115654ce384841f68131  proftpd-1.3.2b.tar.bz2
+559fd3fb6959d42ddd66b333a03b0c49  proftpd-1.3.2c.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
 dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz


--- proftpd-1.3.2b-segfault-on-auth-fail.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Dec 10 23:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:28:04 +0000
Subject: [pkgdb] nautilus: krh has given up watchcommits
Message-ID: <20091210232804.45AEB10F89D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on nautilus (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pghmcfc at fedoraproject.org  Thu Dec 10 23:28:04 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 10 Dec 2009 23:28:04 +0000 (UTC)
Subject: rpms/proftpd/F-12 .cvsignore, 1.17, 1.18 proftpd.spec, 1.60,
	1.61 sources, 1.17,
	1.18 proftpd-1.3.2b-segfault-on-auth-fail.patch, 1.1, NONE
Message-ID: <20091210232804.2538311C025D@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21998/F-12

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.2b-segfault-on-auth-fail.patch 
Log Message:
* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2c-1
- Update to 1.3.2c, addressing the following issues:
  - SSL/TLS renegotiation vulnerability (CVE-2009-3555, bug 3324)
  - Failed database transaction can cause mod_quotatab to loop (bug 3228)
  - Segfault in mod_wrap (bug 3332)
  - <Directory> sections can have <Limit> problems (bug 3337)
  - mod_wrap2 segfaults when a valid user retries the USER command (bug 3341)
  - mod_auth_file handles 'getgroups' request incorrectly (bug 3347)
  - Segfault caused by scrubbing zero-length portion of memory (bug 3350)
- Drop upstreamed segfault patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	21 Oct 2009 11:34:58 -0000	1.17
+++ .cvsignore	10 Dec 2009 23:28:03 -0000	1.18
@@ -1,3 +1,3 @@
-proftpd-1.3.2b.tar.bz2
+proftpd-1.3.2c.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
 proftpd-mod-exec-0.9.6.tar.gz


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-12/proftpd.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- proftpd.spec	10 Dec 2009 16:09:45 -0000	1.60
+++ proftpd.spec	10 Dec 2009 23:28:03 -0000	1.61
@@ -7,11 +7,11 @@
 %endif
 
 #global prever rc3
-%global rpmrel 3
+%global rpmrel 1
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.2b
+Version:		1.3.2c
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -31,7 +31,6 @@ Source11:		http://www.castaglia.org/prof
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
-Patch4:			proftpd-1.3.2b-segfault-on-auth-fail.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -100,9 +99,6 @@ Module to add PostgreSQL support to the 
 # (upstream patch)
 %patch3 -p1 -b .mlsd
 
-# Fix segfault on auth failures (bug 3350)
-%patch4 -p1 -b .segfault-on-auth-failure
-
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -295,6 +291,17 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2c-1
+- Update to 1.3.2c, addressing the following issues:
+  - SSL/TLS renegotiation vulnerability (CVE-2009-3555, bug 3324)
+  - Failed database transaction can cause mod_quotatab to loop (bug 3228)
+  - Segfault in mod_wrap (bug 3332)
+  - <Directory> sections can have <Limit> problems (bug 3337)
+  - mod_wrap2 segfaults when a valid user retries the USER command (bug 3341)
+  - mod_auth_file handles 'getgroups' request incorrectly (bug 3347)
+  - Segfault caused by scrubbing zero-length portion of memory (bug 3350)
+- Drop upstreamed segfault patch
+
 * Thu Dec 10 2009 Paul Howarth <paul at city-fan.org> 1.3.2b-3
 - Add patch for upstream bug 3350 - segfault on auth failures
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Oct 2009 11:34:58 -0000	1.17
+++ sources	10 Dec 2009 23:28:03 -0000	1.18
@@ -1,3 +1,3 @@
-0d6777839f37115654ce384841f68131  proftpd-1.3.2b.tar.bz2
+559fd3fb6959d42ddd66b333a03b0c49  proftpd-1.3.2c.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
 dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz


--- proftpd-1.3.2b-segfault-on-auth-fail.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Dec 10 23:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 10 Dec 2009 23:28:07 +0000
Subject: [pkgdb] nautilus: krh has given up watchcommits
Message-ID: <20091210232807.65E4B10F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on nautilus (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From olea at fedoraproject.org  Thu Dec 10 23:29:46 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Thu, 10 Dec 2009 23:29:46 +0000 (UTC)
Subject: rpms/chronojump/F-12 .cvsignore, 1.2, 1.3 chronojump.spec, 1.2,
	1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091210232946.9050811C025D@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22993/F-12

Modified Files:
	.cvsignore chronojump.spec import.log sources 
Log Message:
update to 0.8.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Oct 2009 23:22:29 -0000	1.2
+++ .cvsignore	10 Dec 2009 23:29:45 -0000	1.3
@@ -1 +1 @@
-chronojump-0.8.11.tar.gz
+chronojump-0.8.13.tar.bz2


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/chronojump.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chronojump.spec	26 Oct 2009 20:51:21 -0000	1.2
+++ chronojump.spec	10 Dec 2009 23:29:45 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           chronojump
-Version:        0.8.11
-Release:        3%{?dist}
+Version:        0.8.13
+Release:        1%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://chronojump.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/chronojump/0.8/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/chronojump/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig mono-data-sqlite gtk-sharp2 gtk-sharp2-devel desktop-file-utils gettext mono-devel
@@ -107,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* Fri Dec 11 2009 <ismael at olea.org> - 0.8.13-1
+- update to 0.8.13
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.11-3
 - ExcludeArch sparc64.  no mono available
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Oct 2009 23:22:29 -0000	1.1
+++ import.log	10 Dec 2009 23:29:46 -0000	1.2
@@ -1 +1,2 @@
 chronojump-0_8_11-2_olea:F-12:chronojump-0.8.11-2.olea.src.rpm:1254871266
+chronojump-0_8_13-1_olea:F-12:chronojump-0.8.13-1.olea.src.rpm:1260487764


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Oct 2009 23:22:29 -0000	1.2
+++ sources	10 Dec 2009 23:29:46 -0000	1.3
@@ -1 +1 @@
-37497f95e5140241aa128c6da482f963  chronojump-0.8.11.tar.gz
+b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2



From james at fedoraproject.org  Thu Dec 10 23:29:50 2009
From: james at fedoraproject.org (James Antill)
Date: Thu, 10 Dec 2009 23:29:50 +0000 (UTC)
Subject: rpms/yum/devel rpmdb-cache-BIG-post-releasever.path, 1.4,
	1.5 yum.spec, 1.288, 1.289
Message-ID: <20091210232950.775E911C025D@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23019

Modified Files:
	rpmdb-cache-BIG-post-releasever.path yum.spec 
Log Message:
* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-7
- Fixes the mash bug, lookup in the tsInfo too. :(
- And fix the txmbr/po confusion ... third build the charm.



Index: rpmdb-cache-BIG-post-releasever.path
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/rpmdb-cache-BIG-post-releasever.path,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rpmdb-cache-BIG-post-releasever.path	10 Dec 2009 14:57:39 -0000	1.4
+++ rpmdb-cache-BIG-post-releasever.path	10 Dec 2009 23:29:50 -0000	1.5
@@ -1020,3 +1020,22 @@ index b5953c2..d46452c 100644
                  ret.append( (po, (filename, 0, '')) )
  
          self.rpmdb.transactionCacheFileRequires(self.installedFileRequires, 
+commit 67882783e6add4c5c9b717872554c23fc0ade913
+Author: James Antill <james at and.org>
+Date:   Thu Dec 10 18:28:28 2009 -0500
+
+    getMembers returns txmbrs not POs ... *sigh*
+
+diff --git a/yum/depsolve.py b/yum/depsolve.py
+index d46452c..a09bd4b 100644
+--- a/yum/depsolve.py
++++ b/yum/depsolve.py
+@@ -1011,7 +1011,7 @@ class Depsolve(object):
+             for pkgtup in reverselookup[filename]:
+                 po = self.tsInfo.getMembersWithState(pkgtup, TS_INSTALL_STATES)
+                 if po:
+-                    po = po[0] # Should only have one
++                    po = po[0].po # Should only have one
+                 else:
+                     po = self.getInstalledPackageObject(pkgtup)
+                 ret.append( (po, (filename, 0, '')) )


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- yum.spec	10 Dec 2009 14:57:39 -0000	1.288
+++ yum.spec	10 Dec 2009 23:29:50 -0000	1.289
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.25
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -112,8 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
-* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-6
+* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-7
 - Fixes the mash bug, lookup in the tsInfo too. :(
+- And fix the txmbr/po confusion ... third build the charm.
 
 * Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4
 - Fixes for yum clean all, BZ 544173



From olea at fedoraproject.org  Thu Dec 10 23:30:28 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Thu, 10 Dec 2009 23:30:28 +0000 (UTC)
Subject: rpms/chronojump/F-10 .cvsignore, 1.2, 1.3 chronojump.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091210233028.765B611C02CA@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23520/F-10

Modified Files:
	.cvsignore chronojump.spec import.log sources 
Log Message:
update to 0.8.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Oct 2009 23:24:15 -0000	1.2
+++ .cvsignore	10 Dec 2009 23:30:27 -0000	1.3
@@ -1 +1 @@
-chronojump-0.8.11.tar.gz
+chronojump-0.8.13.tar.bz2


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/chronojump.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- chronojump.spec	6 Oct 2009 23:24:15 -0000	1.1
+++ chronojump.spec	10 Dec 2009 23:30:28 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           chronojump
-Version:        0.8.11
-Release:        2%{?dist}
+Version:        0.8.13
+Release:        1%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://chronojump.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/chronojump/0.8/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/chronojump/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig mono-data-sqlite gtk-sharp2 gtk-sharp2-devel desktop-file-utils gettext mono-devel
@@ -28,6 +28,9 @@ Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 
+# no mono available
+ExcludeArch: sparc64
+
 %description doc
 ChronoJump is an open hardware, free software, multiplatform complete system
 for measurement, management and statistics of sport short-time tests.
@@ -104,6 +107,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* Fri Dec 11 2009 <ismael at olea.org> - 0.8.13-1
+- update to 0.8.13
+
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.11-3
+- ExcludeArch sparc64.  no mono available
 
 * Mon Sep 28 2009 <ismael at olea.org> 0.8.11-2
 - Fixing doc path


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Oct 2009 23:24:15 -0000	1.1
+++ import.log	10 Dec 2009 23:30:28 -0000	1.2
@@ -1 +1,2 @@
 chronojump-0_8_11-2_olea:F-10:chronojump-0.8.11-2.olea.src.rpm:1254871407
+chronojump-0_8_13-1_olea:F-10:chronojump-0.8.13-1.olea.src.rpm:1260487789


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Oct 2009 23:24:15 -0000	1.2
+++ sources	10 Dec 2009 23:30:28 -0000	1.3
@@ -1 +1 @@
-37497f95e5140241aa128c6da482f963  chronojump-0.8.11.tar.gz
+b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2



From otaylor at fedoraproject.org  Thu Dec 10 23:33:00 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu, 10 Dec 2009 23:33:00 +0000 (UTC)
Subject: rpms/metacity/devel Add-XFCE-Terminal-as-a-terminal.patch, NONE,
	1.1 Add-a-newwindowsalwaysontop-preference.patch, NONE,
	1.1 Add-nofocuswindows-preference-to-list-windows-that.patch, NONE,
	1.1 Allow-applications-to-raise-windows-when-raise_on_cl.patch, NONE, 
	1.1 Allow-explicit-raises-from-same-client-not-just-sa.patch, NONE,
	1.1 Dont-focus-ancestor-window-on-a-different-workspac.patch,
	NONE, 1.1 Dont-warn-about-a-missing-session-file.patch, NONE,
	1.1 For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch,
	NONE, 1.1 cm-selection-timestamp.patch, NONE,
	1.1 metacity-2.28-empty-keybindings.patch, NONE,
	1.1 metacity-2.28-visual-bell.patch, NONE,
	1.1 metacity-2.28-xioerror-unknown-display.patch, NONE,
	1.1 metacity.spec, 1.205, 1.206
Message-ID: <20091210233300.93E6C11C025D@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24443

Modified Files:
	metacity.spec 
Added Files:
	Add-XFCE-Terminal-as-a-terminal.patch 
	Add-a-newwindowsalwaysontop-preference.patch 
	Add-nofocuswindows-preference-to-list-windows-that.patch 
	Allow-applications-to-raise-windows-when-raise_on_cl.patch 
	Allow-explicit-raises-from-same-client-not-just-sa.patch 
	Dont-focus-ancestor-window-on-a-different-workspac.patch 
	Dont-warn-about-a-missing-session-file.patch 
	For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch 
	cm-selection-timestamp.patch 
	metacity-2.28-empty-keybindings.patch 
	metacity-2.28-visual-bell.patch 
	metacity-2.28-xioerror-unknown-display.patch 
Log Message:
* Thu Dec 10 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-12
- Require gnome-themes rather than nodoka-metacity-theme (rhbz 532455, Stijn Hoop)
- Add patches for GNOME bugs
   445447 - Application-induced window raise fails when raise_on_click off (rhbz 526045)
   530702 - compiz doesn't start if metacity compositor is enabled (rhbz 537791)
   559816 - Doesn't update keybindings being disabled/cleared (rhbz 532282)
   567528 - Cannot raise windows from applications in Tcl/Tk and Java (rhbz 503522)
   577576 - Failed to read saved session file warning on new sessions (rhbz 493245)
   598231 - When Chromium rings the bell, metacity quits(rhbz 532282)
   598995 - Don't focus ancestor window on a different workspace (rhbz 237158)
   599097 - For mouse and sloppy focus, return to "mouse mode" on motion (rhbz 530261)
   599248 - Add no_focus_windows preference to list windows that shouldn't be focused (rhbz 530262)
   599261 - Add a new_windows_always_on_top preference (rhbz 530263)
   599262 - Add XFCE Terminal as a terminal
   604319 - XIOError unknown display (rhbz 537845)


Add-XFCE-Terminal-as-a-terminal.patch:
 window.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE Add-XFCE-Terminal-as-a-terminal.patch ---
>From bf7327acb41a43b2bdeee9f0855455ebaef8b816 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Wed, 21 Oct 2009 21:11:46 -0400
Subject: [PATCH] Add XFCE Terminal as a terminal

Include the XFCE terminal program 'Terminal' in the list of terminals.

https://bugzilla.gnome.org/show_bug.cgi?id=599262
---
 src/core/window.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/core/window.c b/src/core/window.c
index 0ae6a01..b481ccf 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1951,6 +1951,9 @@ __window_is_terminal (MetaWindow *window)
   /* mlterm ("multi lingual terminal emulator on X") */
   else if (strcmp (window->res_class, "mlterm") == 0)
     return TRUE;
+  /* Terminal -- XFCE Terminal */
+  else if (strcmp (window->res_class, "Terminal") == 0)
+    return TRUE;
 
   return FALSE;
 }
-- 
1.6.5.rc2
Add-a-newwindowsalwaysontop-preference.patch:
 core/prefs.c           |   17 ++++++++++++++++-
 core/window.c          |    6 +++++-
 include/prefs.h        |    2 ++
 metacity.schemas.in.in |   30 +++++++++++++++++++++++++++++-
 4 files changed, 52 insertions(+), 3 deletions(-)

--- NEW FILE Add-a-newwindowsalwaysontop-preference.patch ---
>From c4fba8198bacc8ecf911cb15c9cd9314f3204a85 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Wed, 21 Oct 2009 19:22:35 -0400
Subject: [PATCH] Add a new_windows_always_on_top preference

Add a /apps/metacity/general/new_windows_always_on_top preference.
When set, new windows are always placed on top, even if they are
denied focus.

This is useful on large screens and multihead setups where the
tasklist can be hard to notice and difficult to mouse to, so the
normal behavior of flashing in the tasklist is less effective.
---
 src/core/prefs.c           |   17 ++++++++++++++++-
 src/core/window.c          |    6 +++++-
 src/include/prefs.h        |    2 ++
 src/metacity.schemas.in.in |   29 +++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/core/prefs.c b/src/core/prefs.c
index e03c816..1bf888b 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -79,6 +79,7 @@ static MetaFocusMode focus_mode = META_FOCUS_MODE_CLICK;
 static MetaFocusNewWindows focus_new_windows = META_FOCUS_NEW_WINDOWS_SMART;
 static GSList *no_focus_windows = NULL;
 static gboolean raise_on_click = TRUE;
+static gboolean new_windows_always_on_top = TRUE;
 static char* current_theme = NULL;
 static int num_workspaces = 4;
 static MetaActionTitlebar action_double_click_titlebar = META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE;
@@ -358,6 +359,11 @@ static MetaBoolPreference preferences_bool[] =
       &raise_on_click,
       TRUE,
     },
+    { "/apps/metacity/general/new_windows_always_on_top",
+      META_PREF_NEW_WINDOWS_ALWAYS_ON_TOP,
+      &new_windows_always_on_top,
+      TRUE,
+    },
     { "/apps/metacity/general/titlebar_uses_system_font",
       META_PREF_TITLEBAR_FONT, /* note! shares a pref */
       &use_system_font,
@@ -1271,6 +1277,12 @@ meta_prefs_get_raise_on_click (void)
   return raise_on_click || focus_mode == META_FOCUS_MODE_CLICK;
 }
 
+gboolean
+meta_prefs_get_new_windows_always_on_top (void)
+{
+  return new_windows_always_on_top;
+}
+
 const char*
 meta_prefs_get_theme (void)
 {
@@ -1709,7 +1721,10 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_RAISE_ON_CLICK:
       return "RAISE_ON_CLICK";
-      
+
+    case META_PREF_NEW_WINDOWS_ALWAYS_ON_TOP:
+      return "NEW_WINDOWS_ALWAYS_ON_TOP";
+
     case META_PREF_THEME:
       return "THEME";
 
diff --git a/src/core/window.c b/src/core/window.c
index 10da47a..0ae6a01 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1983,7 +1983,7 @@ window_state_on_map (MetaWindow *window,
   if (!(window->input || window->take_focus))
     {
       *takes_focus = FALSE;
-      return;
+      goto out;
     }
 
   /* Terminal usage may be different; some users intend to launch
@@ -2030,6 +2030,10 @@ window_state_on_map (MetaWindow *window,
       /* The default is correct for these */
       break;
     }
+
+ out:
+  if (meta_prefs_get_new_windows_always_on_top ())
+    *places_on_top = TRUE;
 }
 
 static gboolean
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 6698dfe..8c7cd09 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -35,6 +35,7 @@ typedef enum
   META_PREF_FOCUS_MODE,
   META_PREF_FOCUS_NEW_WINDOWS,
   META_PREF_RAISE_ON_CLICK,
+  META_PREF_NEW_WINDOWS_ALWAYS_ON_TOP,
   META_PREF_ACTION_DOUBLE_CLICK_TITLEBAR,
   META_PREF_ACTION_MIDDLE_CLICK_TITLEBAR,
   META_PREF_ACTION_RIGHT_CLICK_TITLEBAR,
@@ -81,6 +82,7 @@ guint                       meta_prefs_get_mouse_button_menu  (void);
 MetaFocusMode               meta_prefs_get_focus_mode         (void);
 MetaFocusNewWindows         meta_prefs_get_focus_new_windows  (void);
 gboolean                    meta_prefs_get_raise_on_click     (void);
+gboolean                    meta_prefs_get_new_windows_always_on_top (void);
 const char*                 meta_prefs_get_theme              (void);
 /* returns NULL if GTK default should be used */
 const PangoFontDescription* meta_prefs_get_titlebar_font      (void);
diff --git a/src/metacity.schemas.in.in b/src/metacity.schemas.in.in
index 25ca5f3..14155fa 100644
--- a/src/metacity.schemas.in.in
+++ b/src/metacity.schemas.in.in
@@ -166,6 +166,35 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/metacity/general/new_windows_always_on_top</key>
+      <applyto>/apps/metacity/general/new_windows_always_on_top</applyto>
+      <owner>metacity</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Whether new windows should always be placed on top</short>
+         <long>
+           The normal behavior is that if a new window is not given the
+	   focus (since, for example, the user has interacted with another
+	   window after launching an application), then if the window would
+	   be stacked on top of the focus window, the window is instead
+	   stacked beneath and flashed in the taskbar. This behavior can
+	   be annoying on large screens and multihead setups where the
+	   taskbar is hard to notice and difficult to get to, so this option,
+	   if set, disables this behavior, and new windows are always placed
+	   on top, whether or not they get focus.
+
+           Note that if this option is set, a new window may completely hide
+	   the focus window but not get focus itself, which can be quite confusing
+	   to users. Also, note that setting this option breaks the normal
+	   invariant in the 'click' focus mode that the topmost window always
+	   has focus, so its most suitable for use with the 'mouse' and
+	   'sloppy' focus modes.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/metacity/general/action_double_click_titlebar</key>
       <applyto>/apps/metacity/general/action_double_click_titlebar</applyto>
       <owner>metacity</owner>
-- 
1.6.5.rc2


Add-nofocuswindows-preference-to-list-windows-that.patch:
 Makefile.am            |    2 
 core/prefs.c           |   43 +++
 core/window-matcher.c  |  582 +++++++++++++++++++++++++++++++++++++++++++++++++
 core/window-matcher.h  |   46 +++
 core/window.c          |    9 
 include/prefs.h        |    6 
 metacity.schemas.in.in |   28 ++
 7 files changed, 714 insertions(+), 2 deletions(-)

--- NEW FILE Add-nofocuswindows-preference-to-list-windows-that.patch ---
>From 88c66808ec5f2bfba425fc6d6f0b9ac43ed44696 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Wed, 21 Oct 2009 18:07:12 -0400
Subject: [PATCH] Add no_focus_windows preference to list windows that shouldn't be focused

Notification windows from legacy software that don't set _NET_WM_USER_TIME
can be a huge annoyance for users, since they will pop up and steal focus.

Add:

 /apps/metacity/general/no_focus_windows

which is a list of expressions identifying new windows that shouldn't ever
be focused. For example:

 (and (eq class 'Mylegacyapp') (glob name 'New mail*'))

https://bugzilla.gnome.org/show_bug.cgi?id=599248
---
 src/Makefile.am            |    2 +
 src/core/prefs.c           |   43 ++++
 src/core/window-matcher.c  |  582 ++++++++++++++++++++++++++++++++++++++++++++
 src/core/window-matcher.h  |   46 ++++
 src/core/window.c          |    9 +-
 src/include/prefs.h        |    6 +-
 src/metacity.schemas.in.in |   28 ++
 7 files changed, 714 insertions(+), 2 deletions(-)
 create mode 100644 src/core/window-matcher.c
 create mode 100644 src/core/window-matcher.h

diff --git a/src/Makefile.am b/src/Makefile.am
index bd3420f..3baf422 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,8 @@ metacity_SOURCES= 				\
 	core/stack.h				\
 	core/util.c				\
 	include/util.h				\
+	core/window-matcher.c			\
+	core/window-matcher.h			\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 6e41b3c..e03c816 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -25,6 +25,7 @@
 
 #include <config.h>
 #include "prefs.h"
+#include "window-matcher.h"
 #include "ui.h"
 #include "util.h"
 #ifdef HAVE_GCONF
@@ -76,6 +77,7 @@ static PangoFontDescription *titlebar_font = NULL;
 static MetaVirtualModifier mouse_button_mods = Mod1Mask;
 static MetaFocusMode focus_mode = META_FOCUS_MODE_CLICK;
 static MetaFocusNewWindows focus_new_windows = META_FOCUS_NEW_WINDOWS_SMART;
+static GSList *no_focus_windows = NULL;
 static gboolean raise_on_click = TRUE;
 static char* current_theme = NULL;
 static int num_workspaces = 4;
@@ -147,6 +149,7 @@ static void maybe_give_disable_workarounds_warning (void);
 
 static void titlebar_handler (MetaPreference, const gchar*, gboolean*);
 static void theme_name_handler (MetaPreference, const gchar*, gboolean*);
+static void no_focus_windows_handler (MetaPreference, const gchar*, gboolean*);
 static void mouse_button_mods_handler (MetaPreference, const gchar*, gboolean*);
 static void button_layout_handler (MetaPreference, const gchar*, gboolean*);
 
@@ -425,6 +428,11 @@ static MetaStringPreference preferences_string[] =
       theme_name_handler,
       NULL,
     },
+    { "/apps/metacity/general/no_focus_windows",
+      META_PREF_NO_FOCUS_WINDOWS,
+      no_focus_windows_handler,
+      NULL
+    },
     { KEY_TITLEBAR_FONT,
       META_PREF_TITLEBAR_FONT,
       titlebar_handler,
@@ -1344,6 +1352,30 @@ theme_name_handler (MetaPreference pref,
 }
 
 static void
+no_focus_windows_handler (MetaPreference pref,
+                          const gchar *string_value,
+                          gboolean *inform_listeners)
+{
+  if (no_focus_windows)
+    {
+      meta_window_matcher_list_free (no_focus_windows);
+      no_focus_windows = NULL;
+    }
+
+  if (string_value)
+    {
+      GError *error = NULL;
+      no_focus_windows = meta_window_matcher_list_from_string (string_value, &error);
+      if (error != NULL)
+        {
+          meta_warning ("Error parsing no_focus_windows='%s': %s\n",
+                        string_value, error->message);
+          g_error_free (error);
+        }
+    }
+}
+
+static void
 mouse_button_mods_handler (MetaPreference pref,
                            const gchar *string_value,
                            gboolean *inform_listeners)
@@ -1755,6 +1787,9 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_FORCE_FULLSCREEN:
       return "FORCE_FULLSCREEN";
+
+    case META_PREF_NO_FOCUS_WINDOWS:
+      return "NO_FOCUS_WINDOWS";
     }
 
   return "(unknown)";
@@ -2633,6 +2668,14 @@ meta_prefs_get_action_right_click_titlebar (void)
 }
 
 gboolean
+meta_prefs_window_is_no_focus (const char *window_name,
+                               const char *window_class)
+{
+  return meta_window_matcher_list_matches (no_focus_windows,
+                                           window_name, window_class);
+}
+
+gboolean
 meta_prefs_get_auto_raise (void)
 {
   return auto_raise;
diff --git a/src/core/window-matcher.c b/src/core/window-matcher.c
new file mode 100644
index 0000000..e2fd293
--- /dev/null
+++ b/src/core/window-matcher.c
@@ -0,0 +1,582 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Tiny language for matching against windows */
+
+/*
+ * Copyright (C) 2009 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by 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.
+ */
+
+#include <glib.h>
+#include <string.h>
+
+#include "window-matcher.h"
+
+typedef struct _MetaWindowMatcher MetaWindowMatcher;
+
+typedef enum {
+  MATCHER_OPERAND_CLASS,
+  MATCHER_OPERAND_NAME
+} MatcherOperand;
+
+typedef enum {
+  MATCHER_TOKEN_AND = G_TOKEN_LAST + 1,
+  MATCHER_TOKEN_OR,
+  MATCHER_TOKEN_NOT,
+  MATCHER_TOKEN_EQ,
+  MATCHER_TOKEN_GLOB,
+  MATCHER_TOKEN_NAME,
+  MATCHER_TOKEN_CLASS
+} MatcherToken;
+
+struct _MetaWindowMatcher {
+  enum {
+    MATCHER_AND,
+    MATCHER_OR,
+    MATCHER_NOT,
+    MATCHER_EQ,
+    MATCHER_GLOB
+  } type;
+
+  union {
+    struct {
+      MetaWindowMatcher *a;
+      MetaWindowMatcher *b;
+    } and;
+    struct {
+      MetaWindowMatcher *a;
+      MetaWindowMatcher *b;
+    } or;
+    struct {
+      MetaWindowMatcher *a;
+    } not;
+    struct {
+      MatcherOperand operand;
+      char *str;
+    } eq;
+    struct {
+      MatcherOperand operand;
+      char *str;
+      GPatternSpec *pattern;
+    } glob;
+  } u;
+};
+
+static void
+meta_window_matcher_free (MetaWindowMatcher *matcher)
+{
+  switch (matcher->type)
+    {
+    case MATCHER_AND:
+      meta_window_matcher_free (matcher->u.and.a);
+      meta_window_matcher_free (matcher->u.and.b);
+      break;
+    case MATCHER_OR:
+      meta_window_matcher_free (matcher->u.or.a);
+      meta_window_matcher_free (matcher->u.or.b);
+      break;
+    case MATCHER_NOT:
+      meta_window_matcher_free (matcher->u.or.a);
+      break;
+    case MATCHER_EQ:
+      g_free (matcher->u.eq.str);
+      break;
+    case MATCHER_GLOB:
+      g_free (matcher->u.glob.str);
+      g_pattern_spec_free (matcher->u.glob.pattern);
+      break;
+    }
+
+  g_slice_free (MetaWindowMatcher, matcher);
+}
+
+void
+meta_window_matcher_list_free (GSList *list)
+{
+  g_slist_foreach (list, (GFunc)meta_window_matcher_free, NULL);
+  g_slist_free (list);
+}
+
+static gboolean
+meta_window_matcher_matches (MetaWindowMatcher *matcher,
+                             const char        *window_name,
+                             const char        *window_class)
+{
+  switch (matcher->type)
+    {
+    case MATCHER_AND:
+      return (meta_window_matcher_matches (matcher->u.and.a, window_name, window_class) &&
+              meta_window_matcher_matches (matcher->u.and.b, window_name, window_class));
+    case MATCHER_OR:
+      return (meta_window_matcher_matches (matcher->u.or.a, window_name, window_class) ||
+              meta_window_matcher_matches(matcher->u.or.b, window_name, window_class));
+    case MATCHER_NOT:
+      return !meta_window_matcher_matches (matcher->u.not.a, window_name, window_class);
+    case MATCHER_EQ:
+      if (matcher->u.eq.operand == MATCHER_OPERAND_NAME)
+        return window_name && strcmp (matcher->u.eq.str, window_name) == 0;
+      else
+        return window_class && strcmp (matcher->u.eq.str, window_class) == 0;
+    case MATCHER_GLOB:
+      if (matcher->u.glob.operand == MATCHER_OPERAND_NAME)
+        return window_name && g_pattern_match_string (matcher->u.glob.pattern, window_name);
+      else
+        return window_class && g_pattern_match_string (matcher->u.glob.pattern, window_class);
+    }
+
+  g_assert_not_reached();
+  return FALSE;
+}
+
+gboolean
+meta_window_matcher_list_matches (GSList     *list,
+                                  const char *window_name,
+                                  const char *window_class)
+{
+  GSList *l;
+
+  for (l = list; l; l = l->next)
+    {
+      if (meta_window_matcher_matches (l->data, window_name, window_class))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static const GScannerConfig scanner_config =
+{
+  " \t\r\n"             /* cset_skip_characters */,
+  (
+   G_CSET_a_2_z
+   "_"
+   G_CSET_A_2_Z
+   )                    /* cset_identifier_first */,
+  (
+   G_CSET_a_2_z
+   "_"
+   G_CSET_A_2_Z
+   G_CSET_DIGITS
+   G_CSET_LATINS
+   G_CSET_LATINC
+   )                    /* cset_identifier_nth */,
+  NULL                  /* cpair_comment_single */,
+  TRUE                  /* case_sensitive */,
+  TRUE                  /* skip_comment_multi */,
+  FALSE                 /* skip_comment_single */,
+  TRUE                  /* scan_comment_multi */,
+  TRUE                  /* scan_identifier */,
+  TRUE                  /* scan_identifier_1char */,
+  FALSE                 /* scan_identifier_NULL */,
+  TRUE                  /* scan_symbols */,
+  FALSE                 /* scan_binary */,
+  TRUE                  /* scan_octal */,
+  TRUE                  /* scan_float */,
+  TRUE                  /* scan_hex */,
+  FALSE                 /* scan_hex_dollar */,
+  TRUE                  /* scan_string_sq */,
+  TRUE                  /* scan_string_dq */,
+  TRUE                  /* numbers_2_int */,
+  FALSE                 /* int_2_float */,
+  FALSE                 /* identifier_2_string */,
+  TRUE                  /* char_2_token */,
+  TRUE                  /* symbol_2_token */,
+  FALSE                 /* scope_0_fallback */,
+  FALSE                 /* store_int64 */,
+};
+
+static void
+set_error (GScanner   *scanner,
+           GError    **error,
+           const char *message)
+{
+  g_set_error (error, 0, 0,
+               "Parse error at %d:%d: %s",
+               g_scanner_cur_line (scanner),
+               g_scanner_cur_position (scanner),
+               message);
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_and (MetaWindowMatcher *a,
+                             MetaWindowMatcher *b)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_AND;
+  matcher->u.and.a = a;
+  matcher->u.and.b = b;
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_or (MetaWindowMatcher *a,
+                            MetaWindowMatcher *b)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_OR;
+  matcher->u.or.a = a;
+  matcher->u.or.b = b;
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_not (MetaWindowMatcher *a)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_NOT;
+  matcher->u.not.a = a;
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_eq (MatcherOperand operand,
+                            const char    *str)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_EQ;
+  matcher->u.eq.operand = operand;
+  matcher->u.eq.str = g_strdup (str);
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_new_glob (MatcherOperand operand,
+                              const char    *str)
+{
+  MetaWindowMatcher *matcher = g_slice_new0 (MetaWindowMatcher);
+
+  matcher->type = MATCHER_GLOB;
+  matcher->u.glob.operand = operand;
+  matcher->u.glob.str = g_strdup (str);
+  matcher->u.glob.pattern = g_pattern_spec_new (str);
+
+  return matcher;
+}
+
+static MetaWindowMatcher *
+meta_window_matcher_from_scanner (GScanner *scanner,
+                                  GError  **error)
+{
+  MetaWindowMatcher *matcher = NULL;
+  GTokenType token;
+  GTokenValue value;
+
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_LEFT_PAREN)
+    {
+      set_error (scanner, error, "expected '('");
+      return NULL;
+    }
+
+  token = g_scanner_get_next_token (scanner);
+  switch (token)
+    {
+    case MATCHER_TOKEN_AND:
+    case MATCHER_TOKEN_OR:
+    case MATCHER_TOKEN_NOT:
+      {
+        MetaWindowMatcher *a, *b;
+
+        a = meta_window_matcher_from_scanner (scanner, error);
+        if (!a)
+          return NULL;
+
+        if (token != MATCHER_TOKEN_NOT)
+          {
+            b = meta_window_matcher_from_scanner (scanner, error);
+            if (!b)
+              {
+                meta_window_matcher_free (a);
+                return NULL;
+              }
+          }
+
+        switch (token)
+          {
+          case MATCHER_TOKEN_AND:
+            matcher = meta_window_matcher_new_and (a, b);
+            break;
+          case MATCHER_TOKEN_OR:
+            matcher = meta_window_matcher_new_or (a, b);
+            break;
+          case MATCHER_TOKEN_NOT:
+            matcher = meta_window_matcher_new_not (a);
+            break;
+          default:
+            g_assert_not_reached();
+            break;
+          }
+      }
+      break;
+    case MATCHER_TOKEN_EQ:
+    case MATCHER_TOKEN_GLOB:
+      {
+        MatcherOperand operand;
+
+        switch (g_scanner_get_next_token (scanner))
+          {
+          case MATCHER_TOKEN_NAME:
+            operand = MATCHER_OPERAND_NAME;
+            break;
+          case MATCHER_TOKEN_CLASS:
+            operand = MATCHER_OPERAND_CLASS;
+            break;
+          default:
+            set_error (scanner, error, "expected name/class");
+            return NULL;
+          }
+
+        if (g_scanner_get_next_token (scanner) != G_TOKEN_STRING)
+          {
+            set_error (scanner, error, "expected string");
+            return NULL;
+          }
+
+        value = g_scanner_cur_value (scanner);
+
+        switch (token)
+          {
+          case MATCHER_TOKEN_EQ:
+            matcher = meta_window_matcher_new_eq (operand, value.v_string);
+            break;
+          case MATCHER_TOKEN_GLOB:
+            matcher = meta_window_matcher_new_glob (operand, value.v_string);
+            break;
+          default:
+            g_assert_not_reached();
+          }
+      }
+      break;
+    default:
+      set_error (scanner, error, "expected and/or/not/eq/glob");
+      return NULL;
+    }
+
+  if (g_scanner_get_next_token (scanner) != G_TOKEN_RIGHT_PAREN)
+    {
+      set_error (scanner, error, "expected ')'");
+      return NULL;
+    }
+
+  return matcher;
+}
+
+GSList *
+meta_window_matcher_list_from_string (const char *str,
+                                      GError    **error)
+{
+  GScanner *scanner = g_scanner_new (&scanner_config);
+  GSList *result = NULL;
+
+  g_scanner_scope_add_symbol (scanner, 0, "and", GINT_TO_POINTER (MATCHER_TOKEN_AND));
+  g_scanner_scope_add_symbol (scanner, 0, "or", GINT_TO_POINTER (MATCHER_TOKEN_OR));
+  g_scanner_scope_add_symbol (scanner, 0, "not", GINT_TO_POINTER (MATCHER_TOKEN_NOT));
+  g_scanner_scope_add_symbol (scanner, 0, "eq", GINT_TO_POINTER (MATCHER_TOKEN_EQ));
+  g_scanner_scope_add_symbol (scanner, 0, "glob", GINT_TO_POINTER (MATCHER_TOKEN_GLOB));
+  g_scanner_scope_add_symbol (scanner, 0, "name", GINT_TO_POINTER (MATCHER_TOKEN_NAME));
+  g_scanner_scope_add_symbol (scanner, 0, "class", GINT_TO_POINTER (MATCHER_TOKEN_CLASS));
+
+  g_scanner_input_text (scanner, str, strlen (str));
+
+  while (g_scanner_peek_next_token (scanner) != G_TOKEN_EOF)
+    {
+      MetaWindowMatcher *matcher = meta_window_matcher_from_scanner (scanner, error);
+      if (!matcher)
+        {
+          meta_window_matcher_list_free (result);
+          return NULL;
+        }
+
+      result = g_slist_prepend (result, matcher);
+    }
+
+  g_scanner_destroy (scanner);
+
+  return g_slist_reverse (result);
+}
+
+#ifdef BUILD_MATCHER_TESTS
+
+static void
+append_operand_to_string (GString       *string,
+                          MatcherOperand operand)
+{
+  if (operand == MATCHER_OPERAND_NAME)
+    g_string_append (string, "name");
+  else
+    g_string_append (string, "class");
+}
+
+static void
+append_string_to_string (GString            *str,
+                         const char         *to_append)
+{
+  const char *p;
+
+  g_string_append_c (str, '"');
+  for (p = to_append; *p; p++)
+    {
+      if (*p == '"')
+        g_string_append (str, "\\\"");
+      else
+        g_string_append_c (str, *p);
+    }
+  g_string_append_c (str, '"');
+}
+
+static void
+append_matcher_to_string (GString           *str,
+                          MetaWindowMatcher *matcher)
+{
+  switch (matcher->type)
+    {
+    case MATCHER_AND:
+      g_string_append (str, "(and ");
+      append_matcher_to_string (str, matcher->u.and.a);
+      g_string_append_c (str, ' ');
+      append_matcher_to_string (str, matcher->u.and.b);
+      break;
+    case MATCHER_OR:
+      g_string_append (str, "(or ");
+      append_matcher_to_string (str, matcher->u.or.a);
+      g_string_append_c (str, ' ');
+      append_matcher_to_string (str, matcher->u.or.b);
+      break;
+    case MATCHER_NOT:
+      g_string_append (str, "(not ");
+      append_matcher_to_string (str, matcher->u.not.a);
+      break;
+    case MATCHER_EQ:
+      g_string_append (str, "(eq ");
+      append_operand_to_string (str, matcher->u.eq.operand);
+      g_string_append_c (str, ' ');
+      append_string_to_string (str, matcher->u.eq.str);
+      break;
+    case MATCHER_GLOB:
+      g_string_append (str, "(glob ");
+      append_operand_to_string (str, matcher->u.glob.operand);
+      g_string_append_c (str, ' ');
+      append_string_to_string (str, matcher->u.glob.str);
+      break;
+    }
+
+  g_string_append_c (str, ')');
+}
+
+static char *
+meta_window_matcher_list_to_string (GSList *list)
+{
+  GSList *l;
+  GString *str = g_string_new (NULL);
+
+  for (l = list; l; l = l->next)
+    {
+      if (str->len > 0)
+        g_string_append_c (str, ' ');
+
+      append_matcher_to_string (str, l->data);
+    }
+
+  return g_string_free (str, FALSE);
+}
+
+static void
+test_roundtrip (const char *str)
+{
+  GError *error = NULL;
+  GSList *list = meta_window_matcher_list_from_string (str, &error);
+  char *result;
+
+  if (error != NULL)
+    g_error ("Failed to parse '%s': %s\n", str, error->message);
+
+  result = meta_window_matcher_list_to_string (list);
+  if (strcmp (result, str) != 0)
+    g_error ("Round-trip conversion of '%s' gave '%s'\n", str, result);
+
+  g_free (result);
+  meta_window_matcher_list_free (list);
+}
+
+static void
+test_matches (const char *str,
+              const char *window_name,
+              const char *window_class,
+              gboolean    expected)
+{
+  GError *error = NULL;
+  GSList *list = meta_window_matcher_list_from_string (str, &error);
+  gboolean matches;
+
+  if (error != NULL)
+    g_error ("Failed to parse '%s': %s\n", str, error->message);
+
+  matches = meta_window_matcher_list_matches (list, window_name, window_class))
+  if (matches != expected)
+    {
+      g_error ("Tested '%s' against name=%s, class=%s, expected %s, got %s\n",
+               str, window_name, window_class,
+               expected ? "true" : "false",
+               matches ? "true" : "false");
+    }
+
+
+  meta_window_matcher_list_free (list);
+}
+
+int main (int argc, char **argv)
+{
+  test_roundtrip ("(eq name \"foo\")");
+  test_roundtrip ("(eq name \"fo\\\"o\")");
+  test_roundtrip ("(glob class \"*bar?baz\")");
+  test_roundtrip ("(and (eq name \"foo\") (glob class \"*bar?baz\"))");
+  test_roundtrip ("(or (eq name \"foo\") (glob class \"*bar?baz\"))");
+  test_roundtrip ("(not (eq name \"foo\"))");
+
+  test_roundtrip ("(eq name \"foo\") (glob class \"*bar?baz\")");
+
+  test_matches ("(eq name 'foo')", "foo", NULL, TRUE);
+  test_matches ("(eq name 'foo')", "foob", NULL, FALSE);
+  test_matches ("(eq name 'foo')", NULL, NULL, FALSE);
+  test_matches ("(eq class 'bar')", "foo", "bar", TRUE);
+  test_matches ("(eq class 'bar')", NULL, NULL, FALSE);
+
+  test_matches ("(glob name 'foo*')", "foooo", NULL, TRUE);
+  test_matches ("(glob name 'foo*')", NULL, NULL, FALSE);
+  test_matches ("(glob class 'b*r')", "foooo", "baaaar", TRUE);
+  test_matches ("(glob class 'b*r')", NULL, NULL, FALSE);
+
+  test_matches ("(and (eq name 'foo') (eq class 'bar'))", "foo", "bar", TRUE);
+  test_matches ("(and (eq name 'foo') (eq class 'bar'))", "foo", "baz", FALSE);
+  test_matches ("(and (eq name 'foo') (not (eq class 'bar')))", "foo", "bar", FALSE);
+  test_matches ("(and (eq name 'foo') (not (eq class 'bar')))", "foo", "baz", TRUE);
+
+  test_matches ("(or (eq name 'foo') (eq class 'bar'))", "foo", "baz", TRUE);
+  test_matches ("(or (eq name 'foo') (eq class 'bar'))", "fof", "baz", FALSE);
+
+  return 0;
+}
+
+#endif /* BUILD_MATCHER_TESTS */
diff --git a/src/core/window-matcher.h b/src/core/window-matcher.h
new file mode 100644
index 0000000..7fc7826
--- /dev/null
+++ b/src/core/window-matcher.h
@@ -0,0 +1,46 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Tiny language for matching against windows
+ *
+ * Expression Syntax:
+ *
+ *  (and <expr> <expr>)
+ *  (or <expr> <expr>)
+ *  (not <expr>)
+ *  (eq [name|class] "<value>")
+ *  (glob [name|class] "<glob>")
+ *
+ * A "matcher list" is a whitespace-separated list of expressions that are
+ * implicitly or'ed together. Globs are shell style patterns with
+ * matching 0 or more characters and ? matching one character.
+ */
+
+/*
+ * Copyright (C) 2009 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_WINDOW_MATCHER_H
+#define META_WINDOW_MATCHER_H
+
+GSList * meta_window_matcher_list_from_string (const char         *str,
+					       GError            **error);
+void     meta_window_matcher_list_free        (GSList             *list);
+gboolean meta_window_matcher_list_matches     (GSList             *list,
+					       const char         *window_name,
+					       const char         *window_class);
+#endif /* META_WINDOW_MATCHER_H */
diff --git a/src/core/window.c b/src/core/window.c
index 8d029a2..10da47a 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1965,7 +1965,14 @@ window_state_on_map (MetaWindow *window,
 {
   gboolean intervening_events;
 
-  intervening_events = intervening_user_event_occurred (window);
+  /* A 'no focus' window is a window that has been configured in GConf
+   * to never take focus on map; typically it will be a notification
+   * window from a legacy app that doesn't support _NET_WM_USER_TIME.
+   */
+  if (meta_prefs_window_is_no_focus (window->title, window->res_class))
+    intervening_events = TRUE;
+  else
+    intervening_events = intervening_user_event_occurred (window);
 
   *takes_focus = !intervening_events;
   *places_on_top = *takes_focus;
diff --git a/src/include/prefs.h b/src/include/prefs.h
index a4193ff..6698dfe 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -60,7 +60,8 @@ typedef enum
   META_PREF_CURSOR_SIZE,
   META_PREF_COMPOSITING_MANAGER,
   META_PREF_RESIZE_WITH_RIGHT_BUTTON,
-  META_PREF_FORCE_FULLSCREEN
+  META_PREF_FORCE_FULLSCREEN,
+  META_PREF_NO_FOCUS_WINDOWS
 } MetaPreference;
 
 typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
@@ -106,6 +107,9 @@ MetaActionTitlebar          meta_prefs_get_action_double_click_titlebar (void);
 MetaActionTitlebar          meta_prefs_get_action_middle_click_titlebar (void);
 MetaActionTitlebar          meta_prefs_get_action_right_click_titlebar (void);
 
+gboolean                    meta_prefs_window_is_no_focus (const char *window_name,
+                                                           const char *window_class);
+
 void meta_prefs_set_num_workspaces (int n_workspaces);
 
 const char* meta_prefs_get_workspace_name    (int         i);
diff --git a/src/metacity.schemas.in.in b/src/metacity.schemas.in.in
index a9dd397..34cd7d6 100644
--- a/src/metacity.schemas.in.in
+++ b/src/metacity.schemas.in.in
@@ -100,6 +100,34 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/metacity/general/no_focus_windows</key>
+      <applyto>/apps/metacity/general/no_focus_windows</applyto>
+      <owner>metacity</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+         <short>New windows that shouldn't get focus</short>
+         <long>
+            This option provides a way to specify new windows that shouldn't get
+	    focus. Normally an application specifies whether or not it gets focus
+	    by setting the _NET_WM_USER_TIME property, but legacy applications
+	    may not set this, which can cause unwanted focus stealing.
+
+	    The contents of this property is a space-separated list of expressions
+	    to match against windows. If any of the expressions match a window
+	    then the window will not get focus. The syntax of expressions is:
+
+	    (eq [name|class] "&lt;value&gt;"): window name (title) or the class from
+	    WM_CLASS matches &lt;value&gt; exactly.
+	    (glob [name|class] "&lt;glob&gt;"): window name (title) or the class from
+	    WM_CLASS matches the shell-style glob pattern &lt;glob&gt;.
+	    (and &lt;expr&gt; &lt;expr&gt;) (or &lt;expr&gt; &lt;expr&gt;) (not &lt;expr): Boolean combinations
+	    of expressions.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/metacity/general/raise_on_click</key>
       <applyto>/apps/metacity/general/raise_on_click</applyto>
       <owner>metacity</owner>

Allow-applications-to-raise-windows-when-raise_on_cl.patch:
 window.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE Allow-applications-to-raise-windows-when-raise_on_cl.patch ---
>From 55d4c4cc9455f348b5bc455675004a0e035ea31d Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Tue, 17 Nov 2009 17:24:53 -0500
Subject: [PATCH] Allow applications to raise windows when raise_on_click is off

Whether Metacity honors a raise request from an application should
not be affected by the raise_on_click setting; remove a check that
seems to have been added in error.

https://bugzilla.gnome.org/show_bug.cgi?id=445447
---
 src/core/window.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/core/window.c b/src/core/window.c
index b481ccf..db59de1 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4716,8 +4716,7 @@ meta_window_configure_request (MetaWindow *window,
     {
       MetaWindow *active_window;
       active_window = window->display->expected_focus_window;
-      if (meta_prefs_get_disable_workarounds () ||
-          !meta_prefs_get_raise_on_click ())
+      if (meta_prefs_get_disable_workarounds ())
         {
           meta_topic (META_DEBUG_STACK,
                       "%s sent an xconfigure stacking request; this is "
-- 
1.6.5.2


Allow-explicit-raises-from-same-client-not-just-sa.patch:
 window.c |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE Allow-explicit-raises-from-same-client-not-just-sa.patch ---
>From 7e116a394689718567406837740679c1f1f0d74f Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Mon, 19 Oct 2009 19:41:54 -0400
Subject: [PATCH] Allow explicit raises from same client, not just same app

We currently allow XRaiseWindow when the same application (defined
by the window group) is focused, but the kind of old applications
that XRaiseWindow are frequently not setting the window group.

Expand the check to allow the same X client (defined by the looking
at client ID) to raise windows above the focus window.

https://bugzilla.gnome.org/show_bug.cgi?id=567528
---
 src/core/window.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/core/window.c b/src/core/window.c
index 6de86ee..8d029a2 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -47,6 +47,7 @@
 #include "effects.h"
 
 #include <X11/Xatom.h>
+#include <X11/Xlibint.h> /* For display->resource_mask */
 #include <string.h>
 
 #ifdef HAVE_SHAPE
@@ -72,6 +73,9 @@ static gboolean process_property_notify   (MetaWindow     *window,
 static void     meta_window_show          (MetaWindow     *window);
 static void     meta_window_hide          (MetaWindow     *window);
 
+static gboolean meta_window_same_client (MetaWindow *window,
+                                         MetaWindow *other_window);
+
 static void     meta_window_save_rect         (MetaWindow    *window);
 static void     save_user_window_placement    (MetaWindow    *window);
 static void     force_save_user_window_placement (MetaWindow    *window);
@@ -4708,6 +4712,7 @@ meta_window_configure_request (MetaWindow *window,
         }
       else if (active_window &&
                !meta_window_same_application (window, active_window) &&
+               !meta_window_same_client (window, active_window) &&
                XSERVER_TIME_IS_BEFORE (window->net_wm_user_time,
                                        active_window->net_wm_user_time))
         {
@@ -7544,6 +7549,23 @@ meta_window_same_application (MetaWindow *window,
     group==other_group;
 }
 
+/* Generally meta_window_same_application() is a better idea
+ * of "sameness", since it handles the case where multiple apps
+ * want to look like the same app or the same app wants to look
+ * like multiple apps, but in the case of workarounds for legacy
+ * applications (which likely aren't setting the group properly
+ * anyways), it may be desirable to check this as well.
+ */
+static gboolean
+meta_window_same_client (MetaWindow *window,
+                         MetaWindow *other_window)
+{
+  int resource_mask = window->display->xdisplay->resource_mask;
+
+  return ((window->xwindow & ~resource_mask) ==
+          (other_window->xwindow & ~resource_mask));
+}
+
 void
 meta_window_refresh_resize_popup (MetaWindow *window)
 {
-- 
1.6.5.rc2
Dont-focus-ancestor-window-on-a-different-workspac.patch:
 workspace.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE Dont-focus-ancestor-window-on-a-different-workspac.patch ---
>From a17fb47e08257d09e1e795e8114b21b134b1f3c2 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Mon, 19 Oct 2009 18:43:00 -0400
Subject: [PATCH] Don't focus ancestor window on a different workspace

When we are moving a window with a modal dialog to a different
workspace, meta_workspace_focus_default_window() can be called
with 'not_this_one' being the focused modal dialog.

Since the ancestor of that window is also being moved, we must
not focus it as an alternative to the current window; this will
cause windows to be moved back and Metacity to get into an
inconsistent confused state.

https://bugzilla.redhat.com/show_bug.cgi?id=237158

https://bugzilla.gnome.org/show_bug.cgi?id=598995
---
 src/core/workspace.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/core/workspace.c b/src/core/workspace.c
index a0170a6..92993a7 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -969,7 +969,10 @@ focus_ancestor_or_mru_window (MetaWorkspace *workspace,
       MetaWindow *ancestor;
       ancestor = NULL;
       meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor);
-      if (ancestor != NULL)
+      if (ancestor != NULL &&
+          (ancestor->on_all_workspaces ||
+           ancestor->workspace == workspace) &&
+          meta_window_showing_on_its_workspace (ancestor))
         {
           meta_topic (META_DEBUG_FOCUS,
                       "Focusing %s, ancestor of %s\n", 
-- 
1.6.5.rc2
Dont-warn-about-a-missing-session-file.patch:
 session.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE Dont-warn-about-a-missing-session-file.patch ---
>From 3b06d1045cc990a8610bdbd5c9b83440b1b6e932 Mon Sep 17 00:00:00 2001
From: Tomislav Vujec <tvujec at gmail.com>
Date: Tue, 17 Nov 2009 19:42:38 -0500
Subject: [PATCH] Don't warn about a missing session file

When started without session related command line parameters (e.g. from
gnome-session), metacity picks up client_id from the DESKTOP_AUTOSTART_ID
environment variable. Unfortunately, there is no way to distinguish if this was
passed from a config file, representing old saved session, or generated by
gnome-session, therefore load_state is attempted in each case. If the client_id
is generated, there will be no session file, and metacity will report a
warning.

Just remove the warning so that users won't always find a warning at the
start of their .xsession-errors.

https://bugzilla.gnome.org/show_bug.cgi?id=577576
---
 src/core/session.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/core/session.c b/src/core/session.c
index 7e3b389..32fda97 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -1098,8 +1098,6 @@ load_state (const char *previous_save_file)
         {
           /* oh, just give up */
 
-          meta_warning (_("Failed to read saved session file %s: %s\n"),
-                    canonical_session_file, error->message);
           g_error_free (error);
           g_free (session_file);
           g_free (canonical_session_file);
-- 
1.6.5.2
For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch:
 display-private.h |   11 ++
 display.c         |  239 +++++++++++++++++++++++++++++++++++++++++++-----------
 keybindings.c     |   11 +-
 3 files changed, 210 insertions(+), 51 deletions(-)

--- NEW FILE For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch ---
>From e8a6af29a1f57024067a12567e2bd906e6bad5a4 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Tue, 20 Oct 2009 15:13:45 -0400
Subject: [PATCH] For mouse and sloppy focus, return to "mouse mode" on motion

For mouse and sloppy focus, there are various cases where the focus
window can be moved away from the focus window. Mostly these relate
to "display->mouse_mode = FALSE", which we enter when the user
starts keynav'ing, but it can also occur if a window is focus-denied
mapped and mapped under the pointer.

Prior to this patch, there was no fast way for the user to start
interacting with the window - if they just clicked on the window,
the click would be passed through, and could disturb the windows
contents, so the user had to either mouse out and then mouse back
in, or go up and click on the titlebar.

With this patch, when we get into this state, we add a timeout
and poll for pointer motion with XQueryPointer. If the user then
moves the pointer (more than a single pixel to handle jitter),
we focus the window under the pointer and return to mouse mode.

https://bugzilla.gnome.org/show_bug.cgi?id=599097
---
 src/core/display-private.h |   11 ++
 src/core/display.c         |  239 +++++++++++++++++++++++++++++++++++--------
 src/core/keybindings.c     |   10 +-
 3 files changed, 210 insertions(+), 50 deletions(-)

diff --git a/src/core/display-private.h b/src/core/display-private.h
index 19287f3..b14d7d7 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -150,6 +150,14 @@ struct _MetaDisplay
   guint       autoraise_timeout_id;
   MetaWindow* autoraise_window;
 
+  /* When we ignore an enter due to !display->mouse_mode, a timeout
+   * to check if the mouse is moved, in which case we should focus
+   * the pointer window and return to mouse mode */
+  guint       focus_on_motion_timeout_id;
+  Window      focus_on_motion_start_root_window;
+  int         focus_on_motion_start_x;
+  int         focus_on_motion_start_y;
+
   /* Alt+click button grabs */
   unsigned int window_grab_modifiers;
   
@@ -497,4 +505,7 @@ void meta_display_queue_autoraise_callback  (MetaDisplay *display,
                                              MetaWindow  *window);
 void meta_display_remove_autoraise_callback (MetaDisplay *display);
 
+void meta_display_disable_mouse_mode        (MetaDisplay *display);
+void meta_display_enable_mouse_mode         (MetaDisplay *display);
+
 #endif
diff --git a/src/core/display.c b/src/core/display.c
index 55c374a..78139bd 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -165,6 +165,9 @@ static void    sanity_check_timestamps   (MetaDisplay *display,
 
 MetaGroup*     get_focussed_group (MetaDisplay *display);
 
+static void start_focus_on_motion (MetaDisplay *display);
+static void stop_focus_on_motion  (MetaDisplay *display);
+
 /**
  * Destructor for MetaPingData structs. Will destroy the
  * event source for the struct as well.
@@ -876,6 +879,7 @@ meta_display_close (MetaDisplay *display,
   meta_prefs_remove_listener (prefs_changed_callback, display);
   
   meta_display_remove_autoraise_callback (display);
+  stop_focus_on_motion (display);
 
   if (display->grab_old_window_stacking)
     g_list_free (display->grab_old_window_stacking);
@@ -1816,67 +1820,86 @@ event_callback (XEvent   *event,
       if (window && !serial_is_ignored (display, event->xany.serial) &&
                event->xcrossing.mode != NotifyGrab && 
                event->xcrossing.mode != NotifyUngrab &&
-               event->xcrossing.detail != NotifyInferior &&
-               meta_display_focus_sentinel_clear (display))
+               event->xcrossing.detail != NotifyInferior)
         {
           switch (meta_prefs_get_focus_mode ())
             {
             case META_FOCUS_MODE_SLOPPY:
             case META_FOCUS_MODE_MOUSE:
-              display->mouse_mode = TRUE;
-              if (window->type != META_WINDOW_DOCK &&
-                  window->type != META_WINDOW_DESKTOP)
+              if (!meta_display_focus_sentinel_clear (display))
                 {
-                  meta_topic (META_DEBUG_FOCUS,
-                              "Focusing %s due to enter notify with serial %lu "
-                              "at time %lu, and setting display->mouse_mode to "
-                              "TRUE.\n",
-                              window->desc, 
-                              event->xany.serial,
-                              event->xcrossing.time);
-
-                  meta_window_focus (window, event->xcrossing.time);
-
-                  /* stop ignoring stuff */
-                  reset_ignores (display);
-                  
-                  if (meta_prefs_get_auto_raise ()) 
+                  /* There was an enter event that we want to ignore because
+                   * we're in "keynav mode" or because we are mapping
+                   * a focus-denied window; the next time the mouse is moved
+                   * we want to focus the window so the user doesn't have
+                   * to click (possibly messing up window contents) or
+                   * enter/leave to get focus to the window.
+                   *
+                   * (This check will also trigger for visual bell flashes
+                   * but it doesn't really do any harm to check for motion
+                   * in that case, since the next motion will just result in
+                   * the current window being focused.)
+                   */
+                  start_focus_on_motion (display);
+                }
+              else
+                {
+                  meta_display_enable_mouse_mode (display);
+                  if (window->type != META_WINDOW_DOCK &&
+                      window->type != META_WINDOW_DESKTOP)
                     {
-                      meta_display_queue_autoraise_callback (display, window);
+                      meta_topic (META_DEBUG_FOCUS,
+                                  "Focusing %s due to enter notify with serial %lu "
+                                  "at time %lu, and setting display->mouse_mode to "
+                                  "TRUE.\n",
+                                  window->desc, 
+                                  event->xany.serial,
+                                  event->xcrossing.time);
+
+                      meta_window_focus (window, event->xcrossing.time);
+
+                      /* stop ignoring stuff */
+                      reset_ignores (display);
+
+                      if (meta_prefs_get_auto_raise ()) 
+                        {
+                          meta_display_queue_autoraise_callback (display, window);
+                        }
+                      else
+                        {
+                          meta_topic (META_DEBUG_FOCUS,
+                                      "Auto raise is disabled\n");		      
+                        }
                     }
-                  else
+                  /* In mouse focus mode, we defocus when the mouse *enters*
+                   * the DESKTOP window, instead of defocusing on LeaveNotify.
+                   * This is because having the mouse enter override-redirect
+                   * child windows unfortunately causes LeaveNotify events that
+                   * we can't distinguish from the mouse actually leaving the
+                   * toplevel window as we expect.  But, since we filter out
+                   * EnterNotify events on override-redirect windows, this
+                   * alternative mechanism works great.
+                   */
+                  if (window->type == META_WINDOW_DESKTOP &&
+                      meta_prefs_get_focus_mode() == META_FOCUS_MODE_MOUSE &&
+                      display->expected_focus_window != NULL)
                     {
                       meta_topic (META_DEBUG_FOCUS,
-                                  "Auto raise is disabled\n");		      
+                                  "Unsetting focus from %s due to mouse entering "
+                                  "the DESKTOP window\n",
+                                  display->expected_focus_window->desc);
+                      meta_display_focus_the_no_focus_window (display, 
+                                                              window->screen,
+                                                              event->xcrossing.time);
                     }
                 }
-              /* In mouse focus mode, we defocus when the mouse *enters*
-               * the DESKTOP window, instead of defocusing on LeaveNotify.
-               * This is because having the mouse enter override-redirect
-               * child windows unfortunately causes LeaveNotify events that
-               * we can't distinguish from the mouse actually leaving the
-               * toplevel window as we expect.  But, since we filter out
-               * EnterNotify events on override-redirect windows, this
-               * alternative mechanism works great.
-               */
-              if (window->type == META_WINDOW_DESKTOP &&
-                  meta_prefs_get_focus_mode() == META_FOCUS_MODE_MOUSE &&
-                  display->expected_focus_window != NULL)
-                {
-                  meta_topic (META_DEBUG_FOCUS,
-                              "Unsetting focus from %s due to mouse entering "
-                              "the DESKTOP window\n",
-                              display->expected_focus_window->desc);
-                  meta_display_focus_the_no_focus_window (display, 
-                                                          window->screen,
-                                                          event->xcrossing.time);
-                }
               break;
             case META_FOCUS_MODE_CLICK:
               break;
             }
-          
-          if (window->type == META_WINDOW_DOCK)
+
+          if (window->type == META_WINDOW_DOCK &&
+              meta_display_focus_sentinel_clear (display))
             meta_window_raise (window);
         }
       break;
@@ -5140,6 +5163,132 @@ meta_display_remove_autoraise_callback (MetaDisplay *display)
     }
 }
 
+#define FOCUS_ON_MOTION_CHECK_INTERVAL 200 /* 0.2 seconds */
+#define FOCUS_ON_MOTION_THRESHOLD 2        /* Must move 2 pixels */
+
+static gboolean
+check_focus_on_motion (gpointer data)
+{
+  MetaDisplay *display = data;
+  Window root, child;
+  int root_x, root_y;
+  int window_x, window_y;
+  guint mask;
+
+  XQueryPointer (display->xdisplay,
+                 DefaultRootWindow (display->xdisplay),
+                 &root, &child,
+                 &root_x, &root_y,
+                 &window_x, &window_y,
+                 &mask);
+
+  if (root != display->focus_on_motion_start_root_window ||
+      MAX (ABS (root_x - display->focus_on_motion_start_x),
+           ABS (root_y - display->focus_on_motion_start_y)) >= FOCUS_ON_MOTION_THRESHOLD)
+    {
+      MetaScreen *screen;
+
+      meta_topic (META_DEBUG_FOCUS,
+                  "Returning to mouse mode on mouse motion\n");
+
+      meta_display_enable_mouse_mode (display);
+
+      screen = meta_display_screen_for_root (display, root);
+      if (screen != NULL)
+        {
+          MetaWindow *window = meta_screen_get_mouse_window (screen, NULL);
+          guint32 timestamp = meta_display_get_current_time_roundtrip (display);
+
+          if (window &&
+              window->type != META_WINDOW_DOCK &&
+              window->type != META_WINDOW_DESKTOP)
+            {
+              meta_topic (META_DEBUG_FOCUS,
+                          "Focusing mouse window %s\n", window->desc);
+
+              meta_window_focus (window, timestamp);
+
+              if (display->autoraise_window != window &&
+                  meta_prefs_get_auto_raise ())
+                {
+                  meta_display_queue_autoraise_callback (display, window);
+                }
+            }
+          else if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_MOUSE)
+            {
+              meta_topic (META_DEBUG_FOCUS,
+                          "Setting focus to no_focus_windowm, since no mouse window.\n");
+              meta_display_focus_the_no_focus_window (display, screen, timestamp);
+            }
+
+          /* for META_FOCUS_MODE_SLOPPY, if the pointer isn't over a window, we just
+           * leave the last window focused */
+        }
+    }
+
+  return TRUE;
+}
+
+static void
+start_focus_on_motion (MetaDisplay *display)
+{
+  if (!display->focus_on_motion_timeout_id)
+    {
+      Window child;
+      guint mask;
+      int window_x, window_y;
+
+      XQueryPointer (display->xdisplay,
+                     DefaultRootWindow (display->xdisplay),
+                     &display->focus_on_motion_start_root_window,
+                     &child,
+                     &display->focus_on_motion_start_x,
+                     &display->focus_on_motion_start_y,
+                     &window_x, &window_y,
+                     &mask);
+
+      display->focus_on_motion_timeout_id =
+        g_timeout_add (FOCUS_ON_MOTION_CHECK_INTERVAL,
+                       check_focus_on_motion,
+                       display);
+    }
+}
+
+static void
+stop_focus_on_motion (MetaDisplay *display)
+{
+  if (display->focus_on_motion_timeout_id)
+    {
+      g_source_remove (display->focus_on_motion_timeout_id);
+      display->focus_on_motion_timeout_id = 0;
+    }
+}
+
+void
+meta_display_disable_mouse_mode (MetaDisplay *display)
+{
+  display->mouse_mode = FALSE;
+
+  /* mouse_mode disabled means that we are now allowing the
+   * mouse window to be different from the focus window;
+   * that discrepancy might not come until we ignore some
+   * enter event, but in a case like tabbing away from the
+   * mouse window, it occurs immediately, so we need to
+   * start checking for motion events to see if we should
+   * focus the mouse window and return to mouse mode.
+   */
+  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK)
+    start_focus_on_motion (display);
+}
+
+void
+meta_display_enable_mouse_mode (MetaDisplay *display)
+{
+  display->mouse_mode = TRUE;
+
+  stop_focus_on_motion (display);
+}
+
 #ifdef HAVE_COMPOSITE_EXTENSIONS
 void
 meta_display_get_compositor_version (MetaDisplay *display,
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 63596bb..7d9130f 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2027,7 +2027,7 @@ process_tab_grab (MetaDisplay *display,
           meta_topic (META_DEBUG_FOCUS, "Activating %s due to tab popup "
                       "selection and turning mouse_mode off\n",
                       target_window->desc);
-          display->mouse_mode = FALSE;
+          meta_display_disable_mouse_mode (display);
           meta_window_activate (target_window, event->xkey.time);
 
           meta_topic (META_DEBUG_KEYBINDINGS,
@@ -2763,7 +2763,7 @@ handle_panel (MetaDisplay    *display,
   meta_topic (META_DEBUG_KEYBINDINGS,
               "Sending panel message with timestamp %lu, and turning mouse_mode "
               "off due to keybinding press\n", event->xkey.time);
-  display->mouse_mode = FALSE;
+  meta_display_disable_mouse_mode (display);
 
   meta_error_trap_push (display);
 
@@ -2886,7 +2886,7 @@ do_choose_window (MetaDisplay    *display,
                       "Activating %s and turning off mouse_mode due to "
                       "switch/cycle windows with no modifiers\n",
                       initial_selection->desc);
-          display->mouse_mode = FALSE;
+          meta_display_disable_mouse_mode (display);
           meta_window_activate (initial_selection, event->xkey.time);
         }
       else if (meta_display_begin_grab_op (display,
@@ -2915,7 +2915,7 @@ do_choose_window (MetaDisplay    *display,
                           "modifier was released prior to grab\n",
                           initial_selection->desc);
               meta_display_end_grab_op (display, event->xkey.time);
-              display->mouse_mode = FALSE;
+              meta_display_disable_mouse_mode (display);
               meta_window_activate (initial_selection, event->xkey.time);
             }
           else
@@ -3156,7 +3156,7 @@ handle_move_to_workspace  (MetaDisplay    *display,
           meta_topic (META_DEBUG_FOCUS,
                       "Resetting mouse_mode to FALSE due to "
                       "handle_move_to_workspace() call with flip set.\n");
-          workspace->screen->display->mouse_mode = FALSE;
+          meta_display_disable_mouse_mode (display);
           meta_workspace_activate_with_focus (workspace,
                                               window,
                                               event->xkey.time);
-- 
1.6.5.rc2
cm-selection-timestamp.patch:
 screen-private.h |    1 +
 screen.c         |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE cm-selection-timestamp.patch ---
Patch from Travis Watkins
https://bugzilla.gnome.org/show_bug.cgi?id=530702

diff -ru metacity-2.27.0/src/core/screen.c metacity-2.27.0.new/src/core/screen.c
--- metacity-2.27.0/src/core/screen.c	2008-10-19 16:15:38.000000000 -0500
+++ metacity-2.27.0.new/src/core/screen.c	2009-08-24 04:56:26.929023537 -0500
@@ -2782,11 +2782,14 @@
   char selection[32];
   Atom a;
 
+  screen->wm_cm_timestamp = meta_display_get_current_time_roundtrip (
+                                                               screen->display);
+
   g_snprintf (selection, sizeof(selection), "_NET_WM_CM_S%d", screen->number);
   meta_verbose ("Setting selection: %s\n", selection);
   a = XInternAtom (screen->display->xdisplay, selection, FALSE);
   XSetSelectionOwner (screen->display->xdisplay, a, 
-                      screen->wm_cm_selection_window, CurrentTime);
+                      screen->wm_cm_selection_window, screen->wm_cm_timestamp);
 }
 
 void
@@ -2797,6 +2800,7 @@
 
   g_snprintf (selection, sizeof(selection), "_NET_WM_CM_S%d", screen->number);
   a = XInternAtom (screen->display->xdisplay, selection, FALSE);
-  XSetSelectionOwner (screen->display->xdisplay, a, None, CurrentTime);
+  XSetSelectionOwner (screen->display->xdisplay, a,
+                      None, screen->wm_cm_timestamp);
 }
 #endif /* HAVE_COMPOSITE_EXTENSIONS */
diff -ru metacity-2.27.0/src/core/screen-private.h metacity-2.27.0.new/src/core/screen-private.h
--- metacity-2.27.0/src/core/screen-private.h	2008-10-19 16:15:38.000000000 -0500
+++ metacity-2.27.0.new/src/core/screen-private.h	2009-08-24 04:50:41.469785283 -0500
@@ -113,6 +113,7 @@
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
   Window wm_cm_selection_window;
+  guint32 wm_cm_timestamp;
 #endif
 
   guint work_area_idle;


metacity-2.28-empty-keybindings.patch:
 ui.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE metacity-2.28-empty-keybindings.patch ---
>From 599f25e51d967febddb4de3aa21db4258356a9f9 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Fri, 20 Nov 2009 10:19:03 -0500
Subject: [PATCH] Accept an empty string as well as "disabled" for keybindings

Treat the empty string the same as "disabled" for GConf keybinding
keys. gnome-keybinding-properties was changed to write disabled
keys as the empty string a year or so ago.

https://bugzilla.gnome.org/show_bug.cgi?id=559816
---
 src/ui/ui.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/ui.c b/src/ui/ui.c
index 6df289f..1e68df0 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -765,7 +765,7 @@ meta_ui_parse_accelerator (const char          *accel,
   *keycode = 0;
   *mask = 0;
 
-  if (strcmp (accel, "disabled") == 0)
+  if (!accel[0] || strcmp (accel, "disabled") == 0)
     return TRUE;
   
   meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
@@ -852,7 +852,7 @@ meta_ui_parse_modifier (const char          *accel,
   
   *mask = 0;
 
-  if (accel == NULL || strcmp (accel, "disabled") == 0)
+  if (accel == NULL || !accel[0] || strcmp (accel, "disabled") == 0)
     return TRUE;
   
   meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
-- 
1.6.5.2


metacity-2.28-visual-bell.patch:
 bell.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE metacity-2.28-visual-bell.patch ---
>From 80bd3db7b6711c90af19c7ee17e86aea0b804d7c Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Fri, 20 Nov 2009 10:08:20 -0500
Subject: [PATCH] Don't crash for visual bell on undecorated window

When an XKB bell is sent on a undecorated window, flash the
entire screen rather than crashing trying to flash the frame.

Based on patch by Daniel Erat
https://bugzilla.gnome.org/show_bug.cgi?id=598231
---
 src/core/bell.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/bell.c b/src/core/bell.c
index 1e01cd6..9904f97 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -231,15 +231,16 @@ bell_flash_frame (MetaDisplay *display,
   
   g_assert (xkb_ev->xkb_type == XkbBellNotify);
   window = meta_display_lookup_x_window (display, xkb_bell_event->window);
-  if (!window && (display->focus_window) && (display->focus_window->frame))
+  if (!window)
     {
       window = display->focus_window;
     }
-  if (window)
+  if (window && window->frame)
     {
       bell_flash_window_frame (window);
     }
-  else /* revert to fullscreen flash if there's no focussed window */
+  else /* revert to fullscreen flash if there's no focused window or if it
+          has no frame */
     {
       bell_flash_fullscreen (display, xkb_ev);
     }
-- 
1.6.5.2


metacity-2.28-xioerror-unknown-display.patch:
 errors.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

--- NEW FILE metacity-2.28-xioerror-unknown-display.patch ---
>From 7c30ba2d034050e8e7d1776ea7541495bdf898b3 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Fri, 20 Nov 2009 10:42:07 -0500
Subject: [PATCH] Handle XError and XIOError for unknown displays

The atk-bridge GTK+ module opens its own display; if we get an
XIOError on that display, we shouldn't abort with a meta_bug()
but just exit normally. Also fix a segfault if we got an XError
for that display.
---
 src/core/errors.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/core/errors.c b/src/core/errors.c
index 8de4608..59f9c71 100644
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -222,10 +222,10 @@ x_error_handler (Display     *xdisplay,
 
   display = meta_display_for_x_display (xdisplay);
 
-  /* Display can be NULL here because the compositing manager
-   * has its own Display, but Xlib only has one global error handler
+  /* Display can be NULL here Xlib only has one global error handler; and
+   * there might be other displays open in the process.
    */
-  if (display->error_traps > 0)
+  if (display && display->error_traps > 0)
     {
       /* we're in an error trap, chain to the trap handler
        * saved from GDK
@@ -264,21 +264,18 @@ x_io_error_handler (Display *xdisplay)
 
   display = meta_display_for_x_display (xdisplay);
 
-  if (display == NULL)
-    meta_bug ("IO error received for unknown display?\n");
-  
   if (errno == EPIPE)
     {
       meta_warning (_("Lost connection to the display '%s';\n"
                       "most likely the X server was shut down or you killed/destroyed\n"
                       "the window manager.\n"),
-                    display->name);
+                    display ? display->name : DisplayString (xdisplay));
     }
   else
     {
       meta_warning (_("Fatal IO error %d (%s) on display '%s'.\n"),
                     errno, g_strerror (errno),
-                    display->name);
+                    display ? display->name : DisplayString (xdisplay));
     }
 
   /* Xlib would force an exit anyhow */
-- 
1.6.5.2



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- metacity.spec	26 Nov 2009 08:56:04 -0000	1.205
+++ metacity.spec	10 Dec 2009 23:33:00 -0000	1.206
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 11%{?dist}
+Release: 13%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -28,6 +28,30 @@ Patch12: fresh-tooltips.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=600864
 # https://bugzilla.redhat.com/show_bug.cgi?id=533239
 Patch13: metacity-dont-do-bad-stuff-on-sigterm.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=567528
+Patch14: Allow-explicit-raises-from-same-client-not-just-sa.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=445447
+Patch15: Allow-applications-to-raise-windows-when-raise_on_cl.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=598995
+Patch16: Dont-focus-ancestor-window-on-a-different-workspac.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599262
+Patch17: Add-XFCE-Terminal-as-a-terminal.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599097
+Patch18: For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599248
+Patch19: Add-nofocuswindows-preference-to-list-windows-that.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599261
+Patch20: Add-a-newwindowsalwaysontop-preference.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=577576
+Patch21: Dont-warn-about-a-missing-session-file.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=530702
+Patch22: cm-selection-timestamp.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=598231
+Patch23: metacity-2.28-visual-bell.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=559816
+Patch24: metacity-2.28-empty-keybindings.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604319
+Patch25: metacity-2.28-xioerror-unknown-display.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -55,7 +79,7 @@ BuildRequires: dbus-devel
 BuildRequires: libcanberra-devel
 
 Requires: startup-notification >= 0.7
-Requires: nodoka-metacity-theme
+Requires: gnome-themes
 # for /usr/share/control-center/keybindings, /usr/share/gnome/wm-properties
 Requires: control-center-filesystem
 # for /etc/gconf/schemas
@@ -98,6 +122,19 @@ API. This package exists purely for tech
 %patch12 -p1 -b .fresh-tooltips
 %patch13 -p1 -b .sigterm
 
+%patch14 -p1 -b .raises-from-same-client
+%patch15 -p1 -b .raise-on-click-stacking
+%patch16 -p1 -b .focus-different-workspace
+%patch17 -p1 -b .xfce-terminal
+%patch18 -p1 -b .focus-on-motion
+%patch19 -p1 -b .no-focus-windows
+%patch20 -p1 -b .always-on-top
+%patch21 -p1 -b .missing-session
+%patch22 -p1 -b .cm-selection-timestamp
+%patch23 -p1 -b .visual-bell
+%patch24 -p1 -b .empty-keybindings
+%patch25 -p1 -b .xioerror-unknown-display
+
 # force regeneration
 rm src/metacity.schemas
 
@@ -204,6 +241,22 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Dec 10 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-12
+- Require gnome-themes rather than nodoka-metacity-theme (rhbz 532455, Stijn Hoop)
+- Add patches for GNOME bugs
+   445447 - Application-induced window raise fails when raise_on_click off (rhbz 526045)
+   530702 - compiz doesn't start if metacity compositor is enabled (rhbz 537791)
+   559816 - Doesn't update keybindings being disabled/cleared (rhbz 532282)
+   567528 - Cannot raise windows from applications in Tcl/Tk and Java (rhbz 503522)
+   577576 - Failed to read saved session file warning on new sessions (rhbz 493245)
+   598231 - When Chromium rings the bell, metacity quits(rhbz 532282)
+   598995 - Don't focus ancestor window on a different workspace (rhbz 237158)
+   599097 - For mouse and sloppy focus, return to "mouse mode" on motion (rhbz 530261)
+   599248 - Add no_focus_windows preference to list windows that shouldn't be focused (rhbz 530262)
+   599261 - Add a new_windows_always_on_top preference (rhbz 530263)
+   599262 - Add XFCE Terminal as a terminal
+   604319 - XIOError unknown display (rhbz 537845)
+
 * Thu Nov 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-11
 - Fix a problem with the previous change
 



From olea at fedoraproject.org  Thu Dec 10 23:37:34 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Thu, 10 Dec 2009 23:37:34 +0000 (UTC)
Subject: rpms/chronojump/F-11 .cvsignore, 1.2, 1.3 chronojump.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091210233734.A888A11C025D@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25889/F-11

Modified Files:
	.cvsignore chronojump.spec import.log sources 
Log Message:
update to 0.8.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Oct 2009 23:24:21 -0000	1.2
+++ .cvsignore	10 Dec 2009 23:37:34 -0000	1.3
@@ -1 +1 @@
-chronojump-0.8.11.tar.gz
+chronojump-0.8.13.tar.bz2


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/chronojump.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- chronojump.spec	6 Oct 2009 23:24:21 -0000	1.1
+++ chronojump.spec	10 Dec 2009 23:37:34 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           chronojump
-Version:        0.8.11
-Release:        2%{?dist}
+Version:        0.8.13
+Release:        1%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://chronojump.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/chronojump/0.8/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/chronojump/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig mono-data-sqlite gtk-sharp2 gtk-sharp2-devel desktop-file-utils gettext mono-devel
@@ -28,6 +28,9 @@ Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 
+# no mono available
+ExcludeArch: sparc64
+
 %description doc
 ChronoJump is an open hardware, free software, multiplatform complete system
 for measurement, management and statistics of sport short-time tests.
@@ -104,6 +107,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* Fri Dec 11 2009 <ismael at olea.org> - 0.8.13-1
+- update to 0.8.13
+
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.11-3
+- ExcludeArch sparc64.  no mono available
 
 * Mon Sep 28 2009 <ismael at olea.org> 0.8.11-2
 - Fixing doc path


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Oct 2009 23:24:21 -0000	1.1
+++ import.log	10 Dec 2009 23:37:34 -0000	1.2
@@ -1 +1,2 @@
 chronojump-0_8_11-2_olea:F-11:chronojump-0.8.11-2.olea.src.rpm:1254871409
+chronojump-0_8_13-1_olea:F-11:chronojump-0.8.13-1.olea.src.rpm:1260488113


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Oct 2009 23:24:21 -0000	1.2
+++ sources	10 Dec 2009 23:37:34 -0000	1.3
@@ -1 +1 @@
-37497f95e5140241aa128c6da482f963  chronojump-0.8.11.tar.gz
+b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 10 23:40:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 23:40:20 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.499,
	1.500 monitor-aspect.patch, 1.1, 1.2
Message-ID: <20091210234021.547D211C03FC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26609

Modified Files:
	control-center.spec monitor-aspect.patch 
Log Message:
update monitor aspect ratio patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -r1.499 -r1.500
--- control-center.spec	10 Dec 2009 22:15:30 -0000	1.499
+++ control-center.spec	10 Dec 2009 23:40:20 -0000	1.500
@@ -4,7 +4,7 @@
 %define glib2_version 2.13.0
 %define gtk2_version 2.11.6
 %define gconf2_version 1.2.0
-%define gnome_desktop_version 2.27.5-5
+%define gnome_desktop_version 2.28.1-6
 %define libgnome_version 2.3.0
 %define libbonobo_version 2.3.0
 %define libgnomeui_version 2.3.0
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -423,6 +423,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> 2.28.1-13
+- Update aspect ratio patch (gnome #147808)
+
 * Wed Dec 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.28.1-12
 - Let filesystem package own %%{_datadir}/gnome-control-center/default-apps
 

monitor-aspect.patch:
 appearance-desktop.c |  171 +++++++++++++++++++++++++++++++++++++++------------
 appearance.h         |    4 +
 gnome-wp-item.c      |   65 ++++++++++++-------
 gnome-wp-item.h      |   11 ++-
 4 files changed, 184 insertions(+), 67 deletions(-)

Index: monitor-aspect.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/monitor-aspect.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monitor-aspect.patch	10 Nov 2009 01:03:31 -0000	1.1
+++ monitor-aspect.patch	10 Dec 2009 23:40:20 -0000	1.2
@@ -1,21 +1,517 @@
+From 7d9a95c5197a3855f4d5b560c8dec860a029da03 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann at redhat.com>
+Date: Fri, 4 Dec 2009 19:54:47 -0500
+Subject: [PATCH] Add support for per-monitor backgrounds
+
+https://bugzilla.gnome.org/show_bug.cgi?id=147808
+---
+ capplets/appearance/appearance-desktop.c |  171 +++++++++++++++++++++++-------
+ capplets/appearance/appearance.h         |    4 +
+ capplets/appearance/gnome-wp-item.c      |   65 +++++++----
+ capplets/appearance/gnome-wp-item.h      |   10 ++-
+ 4 files changed, 184 insertions(+), 66 deletions(-)
+
+diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
+index 5979654..2ae6bd6 100644
+--- a/capplets/appearance/appearance-desktop.c
++++ b/capplets/appearance/appearance-desktop.c
+@@ -82,7 +82,6 @@ get_selected_item (AppearanceData *data,
+   if (selected != NULL)
+   {
+     GtkTreeIter sel_iter;
+-    gchar *wpfile;
+ 
+     gtk_tree_model_get_iter (data->wp_model, &sel_iter,
+                              selected->data);
+@@ -93,10 +92,7 @@ get_selected_item (AppearanceData *data,
+     if (iter)
+       *iter = sel_iter;
+ 
+-    gtk_tree_model_get (data->wp_model, &sel_iter, 2, &wpfile, -1);
+-
+-    item = g_hash_table_lookup (data->wp_hash, wpfile);
+-    g_free (wpfile);
++    gtk_tree_model_get (data->wp_model, &sel_iter, 1, &item, -1);
+   }
+ 
+   return item;
+@@ -129,7 +125,10 @@ static void on_item_changed (GnomeBG *bg, AppearanceData *data) {
+ 
+     g_signal_handlers_block_by_func (bg, G_CALLBACK (on_item_changed), data);
+ 
+-    pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
++    pixbuf = gnome_wp_item_get_thumbnail (item,
++                                          data->thumb_factory,
++                                          data->thumb_width,
++                                          data->thumb_height);
+     if (pixbuf) {
+       gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+       g_object_unref (pixbuf);
+@@ -153,13 +152,14 @@ wp_props_load_wallpaper (gchar *key,
+ 
+   gtk_list_store_append (GTK_LIST_STORE (data->wp_model), &iter);
+ 
+-  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
++  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory,
++                                        data->thumb_width,
++                                        data->thumb_height);
+   gnome_wp_item_update_description (item);
+ 
+   gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter,
+                       0, pixbuf,
+-                      1, item->description,
+-                      2, item->filename,
++                      1, item,
+                       -1);
+ 
+   if (pixbuf != NULL)
+@@ -313,7 +313,9 @@ wp_scale_type_changed (GtkComboBox *combobox,
+ 
+   item->options = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_style_menu));
+ 
+-  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
++  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory,
++                                        data->thumb_width,
++                                        data->thumb_height);
+   gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+   if (pixbuf != NULL)
+     g_object_unref (pixbuf);
+@@ -338,7 +340,9 @@ wp_shade_type_changed (GtkWidget *combobox,
+ 
+   item->shade_type = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_color_menu));
+ 
+-  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
++  pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory,
++                                        data->thumb_width,
++                                        data->thumb_height);
+   gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+   if (pixbuf != NULL)
+     g_object_unref (pixbuf);
+@@ -768,7 +772,6 @@ wp_view_tooltip_cb (GtkWidget  *widget,
+                     AppearanceData *data)
+ {
+   GtkTreeIter iter;
+-  gchar *wpfile;
+   GnomeWPItem *item;
+ 
+   if (gtk_icon_view_get_tooltip_context (data->wp_view,
+@@ -778,10 +781,7 @@ wp_view_tooltip_cb (GtkWidget  *widget,
+                                          NULL,
+                                          &iter))
+     {
+-      gtk_tree_model_get (data->wp_model, &iter, 2, &wpfile, -1);
+-      item = g_hash_table_lookup (data->wp_hash, wpfile);
+-      g_free (wpfile);
+-
++      gtk_tree_model_get (data->wp_model, &iter, 1, &item, -1);
+       gtk_tooltip_set_markup (tooltip, item->description);
+ 
+       return TRUE;
+@@ -795,31 +795,25 @@ wp_list_sort (GtkTreeModel *model,
+               GtkTreeIter *a, GtkTreeIter *b,
+               AppearanceData *data)
+ {
+-  gchar *foo, *bar;
+-  gchar *desca, *descb;
++  GnomeWPItem *itema, *itemb;
+   gint retval;
+ 
+-  gtk_tree_model_get (model, a, 1, &desca, 2, &foo, -1);
+-  gtk_tree_model_get (model, b, 1, &descb, 2, &bar, -1);
++  gtk_tree_model_get (model, a, 1, &itema, -1);
++  gtk_tree_model_get (model, b, 1, &itemb, -1);
+ 
+-  if (!strcmp (foo, "(none)"))
++  if (!strcmp (itema->filename, "(none)"))
+   {
+     retval =  -1;
+   }
+-  else if (!strcmp (bar, "(none)"))
++  else if (!strcmp (itemb->filename, "(none)"))
+   {
+     retval =  1;
+   }
+   else
+   {
+-    retval = g_utf8_collate (desca, descb);
++    retval = g_utf8_collate (itema->description, itemb->description);
+   }
+ 
+-  g_free (desca);
+-  g_free (descb);
+-  g_free (foo);
+-  g_free (bar);
+-
+   return retval;
+ }
+ 
+@@ -875,6 +869,68 @@ wp_update_preview (GtkFileChooser *chooser,
+ }
+ 
+ static gboolean
++reload_item (GtkTreeModel *model,
++             GtkTreePath *path,
++             GtkTreeIter *iter,
++             AppearanceData *data)
++{
++  GnomeWPItem *item;
++  GdkPixbuf *pixbuf;
++
++  gtk_tree_model_get (model, iter, 1, &item, -1);
++
++  pixbuf = gnome_wp_item_get_thumbnail (item,
++                                        data->thumb_factory,
++                                        data->thumb_width,
++                                        data->thumb_height);
++  if (pixbuf) {
++    gtk_list_store_set (GTK_LIST_STORE (data->wp_model), iter, 0, pixbuf, -1);
++    g_object_unref (pixbuf);
++  }
++
++  return FALSE;
++}
++
++static gdouble
++get_monitor_aspect_ratio_for_widget (GtkWidget *widget)
++{
++  gdouble aspect;
++  gint monitor;
++  GdkRectangle rect;
++
++  monitor = gdk_screen_get_monitor_at_window (gtk_widget_get_screen (widget), gtk_widget_get_window (widget));
++  gdk_screen_get_monitor_geometry (gtk_widget_get_screen (widget), monitor, &rect);
++  aspect = rect.height / (gdouble)rect.width;
++
++  return aspect;
++}
++
++#define LIST_IMAGE_SIZE 108
++
++static void
++compute_thumbnail_sizes (AppearanceData *data)
++{
++  gdouble aspect;
++
++  aspect = get_monitor_aspect_ratio_for_widget (GTK_WIDGET (data->wp_view));
++  if (aspect > 1) {
++    /* portrait */
++    data->thumb_width = LIST_IMAGE_SIZE / aspect;
++    data->thumb_height = LIST_IMAGE_SIZE;
++  } else {
++    data->thumb_width = LIST_IMAGE_SIZE;
++    data->thumb_height = LIST_IMAGE_SIZE * aspect;
++  }
++}
++
++static void
++reload_wallpapers (AppearanceData *data)
++{
++  compute_thumbnail_sizes (data);
++  gtk_tree_model_foreach (data->wp_model, (GtkTreeModelForeachFunc)reload_item, data);
++}
++
++static gboolean
+ wp_load_stuffs (void *user_data)
+ {
+   AppearanceData *data;
+@@ -883,6 +939,8 @@ wp_load_stuffs (void *user_data)
+ 
+   data = (AppearanceData *) user_data;
+ 
++  compute_thumbnail_sizes (data);
++
+   gnome_wp_xml_load_list (data);
+   g_hash_table_foreach (data->wp_hash, (GHFunc) wp_props_load_wallpaper,
+                         data);
+@@ -976,8 +1034,11 @@ static void
+ wp_select_after_realize (GtkWidget *widget,
+                          AppearanceData *data)
+ {
+-  GnomeWPItem *item = get_selected_item (data, NULL);
++  GnomeWPItem *item;
++
++  g_idle_add (wp_load_stuffs, data);
+ 
++  item = get_selected_item (data, NULL);
+   if (item == NULL)
+     item = g_hash_table_lookup (data->wp_hash, "(none)");
+ 
+@@ -1043,7 +1104,11 @@ next_frame (AppearanceData  *data,
+   item = get_selected_item (data, &iter);
+ 
+   if (frame >= 0)
+-    pixbuf = gnome_wp_item_get_frame_thumbnail (item, data->thumb_factory, frame);
++    pixbuf = gnome_wp_item_get_frame_thumbnail (item,
++                                                data->thumb_factory,
++                                                data->thumb_width,
++                                                data->thumb_height,
++                                                frame);
+   if (pixbuf) {
+     gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+     g_object_unref (pixbuf);
+@@ -1056,7 +1121,11 @@ next_frame (AppearanceData  *data,
+       pb = buttons[0];
+   }
+   else {
+-    pixbuf = gnome_wp_item_get_frame_thumbnail (item, data->thumb_factory, frame + 1);
++    pixbuf = gnome_wp_item_get_frame_thumbnail (item,
++                                                data->thumb_factory,
++                                                data->thumb_width,
++                                                data->thumb_height,
++                                                frame + 1);
+     if (pixbuf)
+       g_object_unref (pixbuf);
+     else
+@@ -1140,6 +1209,13 @@ buttons_cell_data_func (GtkCellLayout   *layout,
+   gtk_tree_path_free (path);
+ }
+ 
++static void
++screen_monitors_changed (GdkScreen *screen,
++                         AppearanceData *data)
++{
++  reload_wallpapers (data);
++}
++
+ void
+ desktop_init (AppearanceData *data,
+ 	      const gchar **uris)
+@@ -1194,9 +1270,8 @@ desktop_init (AppearanceData *data,
+                            (GConfClientNotifyFunc) wp_color2_changed,
+                            data, NULL, NULL);
+ 
+-  data->wp_model = GTK_TREE_MODEL (gtk_list_store_new (3, GDK_TYPE_PIXBUF,
+-                                                 G_TYPE_STRING,
+-                                                 G_TYPE_STRING));
++  data->wp_model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF,
++                                                       G_TYPE_POINTER));
+ 
+   data->wp_view = GTK_ICON_VIEW (appearance_capplet_get_widget (data, "wp_view"));
+   gtk_icon_view_set_model (data->wp_view, GTK_TREE_MODEL (data->wp_model));
+@@ -1232,12 +1307,12 @@ desktop_init (AppearanceData *data,
+ 
+   data->frame = -1;
+ 
+-  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (data->wp_model), 2,
++  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (data->wp_model), 1,
+                                    (GtkTreeIterCompareFunc) wp_list_sort,
+                                    data, NULL);
+ 
+   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (data->wp_model),
+-                                        2, GTK_SORT_ASCENDING);
++                                        1, GTK_SORT_ASCENDING);
+ 
+   gtk_drag_dest_set (GTK_WIDGET (data->wp_view), GTK_DEST_DEFAULT_ALL, drop_types,
+                      G_N_ELEMENTS (drop_types), GDK_ACTION_COPY | GDK_ACTION_MOVE);
+@@ -1280,14 +1355,20 @@ desktop_init (AppearanceData *data,
+ 
+   g_signal_connect (data->wp_rem_button, "clicked",
+                     (GCallback) wp_remove_wallpaper, data);
+-
+-  g_idle_add (wp_load_stuffs, data);
++  data->screen_monitors_handler = g_signal_connect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)),
++                                                    "monitors-changed",
++                                                    G_CALLBACK (screen_monitors_changed),
++                                                    data);
++  data->screen_size_handler = g_signal_connect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)),
++                                                    "size-changed",
++                                                    G_CALLBACK (screen_monitors_changed),
++                                                    data);
+ 
+   g_signal_connect (data->wp_view, "selection-changed",
+                     (GCallback) wp_props_wp_selected, data);
+   g_signal_connect (data->wp_view, "query-tooltip",
+                     (GCallback) wp_view_tooltip_cb, data);
+-  gtk_widget_set_has_tooltip (data->wp_view, TRUE);
++  gtk_widget_set_has_tooltip (GTK_WIDGET (data->wp_view), TRUE);
+ 
+   wp_set_sensitivities (data);
+ 
+@@ -1300,6 +1381,18 @@ void
+ desktop_shutdown (AppearanceData *data)
+ {
+   gnome_wp_xml_save_list (data);
++
++  if (data->screen_monitors_handler > 0) {
++    g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)),
++                                 data->screen_monitors_handler);
++    data->screen_monitors_handler = 0;
++  }
++  if (data->screen_size_handler > 0) {
++    g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)),
++                                 data->screen_size_handler);
++    data->screen_size_handler = 0;
++  }
++
+   g_slist_foreach (data->wp_uris, (GFunc) g_free, NULL);
+   g_slist_free (data->wp_uris);
+   if (data->wp_filesel)
+diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h
+index 5b4dd59..c598b06 100644
+--- a/capplets/appearance/appearance.h
++++ b/capplets/appearance/appearance.h
+@@ -36,6 +36,8 @@ typedef struct
+   GConfClient *client;
+   GtkBuilder  *ui;
+   GnomeDesktopThumbnailFactory *thumb_factory;
++  gulong screen_size_handler;
++  gulong screen_monitors_handler;
+ 
+   /* desktop */
+   GHashTable *wp_hash;
+@@ -51,6 +53,8 @@ typedef struct
+   GtkWidget *wp_image;
+   GSList *wp_uris;
+   gint frame;
++  gint thumb_width;
++  gint thumb_height;
+ 
+   /* font */
+   GtkWidget *font_details;
 diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c
-index b4c86f2..5b28aca 100644
+index b4c86f2..b4af8fc 100644
 --- a/capplets/appearance/gnome-wp-item.c
 +++ b/capplets/appearance/gnome-wp-item.c
-@@ -211,9 +211,13 @@ GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item,
+@@ -205,22 +205,19 @@ add_slideshow_frame (GdkPixbuf *pixbuf)
+   return tmp;
+ }
+ 
+-#define LIST_IMAGE_WIDTH 108
+-
+ GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item,
  					       GnomeDesktopThumbnailFactory * thumbs,
++                                               int width,
++                                               int height,
                                                 gint frame) {
    GdkPixbuf *pixbuf = NULL;
 -  double aspect =
 -    (double)gdk_screen_get_height (gdk_screen_get_default()) /
 -    gdk_screen_get_width (gdk_screen_get_default());
-+  GdkRectangle rect;
-+  double aspect;
-+
-+  /* Use primary monitor for aspect.  Should we use the monitor with
-+     the pointer? */
-+  gdk_screen_get_monitor_geometry (gdk_screen_get_default(), 0, &rect);
-+  aspect = (double)rect.height / rect.width;
  
    set_bg_properties (item);
  
+   if (frame != -1)
+-    pixbuf = gnome_bg_create_frame_thumbnail (item->bg, thumbs, gdk_screen_get_default (), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect, frame);
++    pixbuf = gnome_bg_create_frame_thumbnail (item->bg, thumbs, gdk_screen_get_default (), width, height, frame);
+   else
+-    pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect);
++    pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), width, height);
+ 
+   if (pixbuf && gnome_bg_changes_with_time (item->bg))
+     {
+@@ -231,15 +228,17 @@ GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item,
+       pixbuf = tmp;
+     }
+ 
+-  gnome_bg_get_image_size (item->bg, thumbs, &item->width, &item->height);
++  gnome_bg_get_image_size (item->bg, thumbs, width, height, &item->width, &item->height);
+ 
+   return pixbuf;
+ }
+ 
+ 
+ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
+-					 GnomeDesktopThumbnailFactory * thumbs) {
+-  return gnome_wp_item_get_frame_thumbnail (item, thumbs, -1);
++					 GnomeDesktopThumbnailFactory * thumbs,
++                                         gint width,
++                                         gint height) {
++  return gnome_wp_item_get_frame_thumbnail (item, thumbs, width, height, -1);
+ }
+ 
+ void gnome_wp_item_update_description (GnomeWPItem * item) {
+@@ -252,37 +251,55 @@ void gnome_wp_item_update_description (GnomeWPItem * item) {
+     gchar *size;
+     gchar *dirname = g_path_get_dirname (item->filename);
+ 
++    description = NULL;
++    size = NULL;
++
+     if (strcmp (item->fileinfo->mime_type, "application/xml") == 0)
+       {
+         if (gnome_bg_changes_with_time (item->bg))
+           description = _("Slide Show");
+-        else
++        else if (item->width > 0 && item->height > 0)
+           description = _("Image");
+       }
+     else
+       description = g_content_type_get_description (item->fileinfo->mime_type);
+ 
+-    if (gnome_bg_changes_with_size (item->bg))
++    if (gnome_bg_has_multiple_sizes (item->bg))
+       size = g_strdup (_("multiple sizes"));
+-    else
++    else if (item->width > 0 && item->height > 0) {
+       /* translators: x pixel(s) by y pixel(s) */
+       size = g_strdup_printf ("%d %s by %d %s",
+                               item->width,
+                               ngettext ("pixel", "pixels", item->width),
+                               item->height,
+                               ngettext ("pixel", "pixels", item->height));
++    }
++
++    if (description && size) {
++      /* translators: <b>wallpaper name</b>
++       * mime type, size
++       * Folder: /path/to/file
++       */
++      item->description = g_markup_printf_escaped (_("<b>%s</b>\n"
++                                                     "%s, %s\n"
++                                                     "Folder: %s"),
++                                                   item->name,
++                                                   description,
++                                                   size,
++                                                   dirname);
++    } else {
++      /* translators: <b>wallpaper name</b>
++       * Image missing
++       * Folder: /path/to/file
++       */
++      item->description = g_markup_printf_escaped (_("<b>%s</b>\n"
++                                                     "%s\n"
++                                                     "Folder: %s"),
++                                                   item->name,
++                                                   _("Image missing"),
++                                                   dirname);
++    }
+ 
+-    /* translators: <b>wallpaper name</b>
+-     * mime type, size
+-     * Folder: /path/to/file
+-     */
+-    item->description = g_markup_printf_escaped (_("<b>%s</b>\n"
+-                                   "%s, %s\n"
+-                                   "Folder: %s"),
+-                                 item->name,
+-                                 description,
+-                                 size,
+-                                 dirname);
+     g_free (size);
+     g_free (dirname);
+   }
+diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h
+index 63bdb69..03dc417 100644
+--- a/capplets/appearance/gnome-wp-item.h
++++ b/capplets/appearance/gnome-wp-item.h
+@@ -71,10 +71,14 @@ GnomeWPItem * gnome_wp_item_new (const gchar *filename,
+ 
+ void gnome_wp_item_free (GnomeWPItem *item);
+ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem *item,
+-					 GnomeDesktopThumbnailFactory *thumbs);
+-GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem *item,
+ 					 GnomeDesktopThumbnailFactory *thumbs,
+-                                         gint frame);
++                                         gint width,
++                                         gint height);
++GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem *item,
++                                               GnomeDesktopThumbnailFactory *thumbs,
++                                               gint width,
++                                               gint height,
++                                               gint frame);
+ void gnome_wp_item_update (GnomeWPItem *item);
+ void gnome_wp_item_update_description (GnomeWPItem *item);
+ void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item);
+-- 
+1.6.5.2
+



From mclasen at fedoraproject.org  Thu Dec 10 23:47:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 23:47:38 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.500,1.501
Message-ID: <20091210234738.6F41F11C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28499

Modified Files:
	control-center.spec 
Log Message:
update gnome-desktop version



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -p -r1.500 -r1.501
--- control-center.spec	10 Dec 2009 23:40:20 -0000	1.500
+++ control-center.spec	10 Dec 2009 23:47:37 -0000	1.501
@@ -4,7 +4,7 @@
 %define glib2_version 2.13.0
 %define gtk2_version 2.11.6
 %define gconf2_version 1.2.0
-%define gnome_desktop_version 2.28.1-6
+%define gnome_desktop_version 2.29.3-2
 %define libgnome_version 2.3.0
 %define libbonobo_version 2.3.0
 %define libgnomeui_version 2.3.0



From ke4qqq at fedoraproject.org  Thu Dec 10 23:50:56 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 10 Dec 2009 23:50:56 +0000 (UTC)
Subject: File nusoap-0.7.3.zip uploaded to lookaside cache by ke4qqq
Message-ID: <20091210235056.A296210F865@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-nusoap:

19843319571f6b79f9ed56ef3bb59100  nusoap-0.7.3.zip



From ke4qqq at fedoraproject.org  Thu Dec 10 23:52:17 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 10 Dec 2009 23:52:17 +0000 (UTC)
Subject: rpms/php-nusoap/devel import.log, NONE, 1.1 php-nusoap.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210235217.B702A11C025D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-nusoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29750/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-nusoap.spec 
Log Message:
* Thu Dec 10 2009 David Nalley <david at gnsa.us> 0.7.3-2
- initial commit




--- NEW FILE import.log ---
php-nusoap-0_7_3-2_fc12:HEAD:php-nusoap-0.7.3-2.fc12.src.rpm:1260489144


--- NEW FILE php-nusoap.spec ---
%global php_libname          nusoap
Name:      php-nusoap
Version:   0.7.3
Release:   2%{?dist}
License:   LGPLv2+
Summary:   SOAP Toolkit for PHP 
Group:     Development/Libraries
URL:       http://nusoap.sourceforge.net/
Source:    http://downloads.sourceforge.net/%{php_libname}/%{php_libname}-%{version}.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php-common
BuildRequires: dos2unix
BuildArch: noarch

%description
NuSOAP is a rewrite of SOAPx4, provided by NuSphere and Dietrich Ayala. It is 
a set of PHP classes - no PHP extensions required - that allow developers to 
create and consume web services based on SOAP 1.1, WSDL 1.1 and HTTP 1.0/1.1.

%prep
%setup -c -q
dos2unix samples/*
dos2unix lib/changelog
iconv -f iso8859-1 -t utf-8 lib/changelog > lib/changelog.txt && mv -f lib/changelog.txt lib/changelog

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php/%{php_libname}
cp -a lib/*.php %{buildroot}%{_datadir}/php/%{php_libname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc samples lib/changelog
%{_datadir}/php/%{php_libname}

%changelog
* Tue Dec 08 2009 David Nalley <david at gnsa.us> 0.7.3-2
- improved spec legibility with addition of newlines
- corrected license
- changed versioned php require to php-common
* Thu Nov 26 2009 David Nalley <david at gnsa.us> 0.7.3-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-nusoap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:40:31 -0000	1.1
+++ .cvsignore	10 Dec 2009 23:52:17 -0000	1.2
@@ -0,0 +1 @@
+nusoap-0.7.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-nusoap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:40:31 -0000	1.1
+++ sources	10 Dec 2009 23:52:17 -0000	1.2
@@ -0,0 +1 @@
+19843319571f6b79f9ed56ef3bb59100  nusoap-0.7.3.zip



From ke4qqq at fedoraproject.org  Thu Dec 10 23:53:09 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 10 Dec 2009 23:53:09 +0000 (UTC)
Subject: rpms/php-nusoap/F-12 import.log, NONE, 1.1 php-nusoap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210235309.7B54E11C025D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-nusoap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30313/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-nusoap.spec 
Log Message:
* Thu Dec 10 2009 David Nalley <david at gnsa.us> 0.7.3-2
- initial commit




--- NEW FILE import.log ---
php-nusoap-0_7_3-2_fc12:F-12:php-nusoap-0.7.3-2.fc12.src.rpm:1260489249


--- NEW FILE php-nusoap.spec ---
%global php_libname          nusoap
Name:      php-nusoap
Version:   0.7.3
Release:   2%{?dist}
License:   LGPLv2+
Summary:   SOAP Toolkit for PHP 
Group:     Development/Libraries
URL:       http://nusoap.sourceforge.net/
Source:    http://downloads.sourceforge.net/%{php_libname}/%{php_libname}-%{version}.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php-common
BuildRequires: dos2unix
BuildArch: noarch

%description
NuSOAP is a rewrite of SOAPx4, provided by NuSphere and Dietrich Ayala. It is 
a set of PHP classes - no PHP extensions required - that allow developers to 
create and consume web services based on SOAP 1.1, WSDL 1.1 and HTTP 1.0/1.1.

%prep
%setup -c -q
dos2unix samples/*
dos2unix lib/changelog
iconv -f iso8859-1 -t utf-8 lib/changelog > lib/changelog.txt && mv -f lib/changelog.txt lib/changelog

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php/%{php_libname}
cp -a lib/*.php %{buildroot}%{_datadir}/php/%{php_libname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc samples lib/changelog
%{_datadir}/php/%{php_libname}

%changelog
* Tue Dec 08 2009 David Nalley <david at gnsa.us> 0.7.3-2
- improved spec legibility with addition of newlines
- corrected license
- changed versioned php require to php-common
* Thu Nov 26 2009 David Nalley <david at gnsa.us> 0.7.3-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-nusoap/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:40:31 -0000	1.1
+++ .cvsignore	10 Dec 2009 23:53:09 -0000	1.2
@@ -0,0 +1 @@
+nusoap-0.7.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-nusoap/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:40:31 -0000	1.1
+++ sources	10 Dec 2009 23:53:09 -0000	1.2
@@ -0,0 +1 @@
+19843319571f6b79f9ed56ef3bb59100  nusoap-0.7.3.zip



From ke4qqq at fedoraproject.org  Thu Dec 10 23:53:58 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 10 Dec 2009 23:53:58 +0000 (UTC)
Subject: rpms/php-nusoap/F-11 import.log, NONE, 1.1 php-nusoap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210235358.3FD2511C025D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-nusoap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30713/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-nusoap.spec 
Log Message:
* Thu Dec 10 2009 David Nalley <david at gnsa.us> 0.7.3-2
- initial commit




--- NEW FILE import.log ---
php-nusoap-0_7_3-2_fc12:F-11:php-nusoap-0.7.3-2.fc12.src.rpm:1260489298


--- NEW FILE php-nusoap.spec ---
%global php_libname          nusoap
Name:      php-nusoap
Version:   0.7.3
Release:   2%{?dist}
License:   LGPLv2+
Summary:   SOAP Toolkit for PHP 
Group:     Development/Libraries
URL:       http://nusoap.sourceforge.net/
Source:    http://downloads.sourceforge.net/%{php_libname}/%{php_libname}-%{version}.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php-common
BuildRequires: dos2unix
BuildArch: noarch

%description
NuSOAP is a rewrite of SOAPx4, provided by NuSphere and Dietrich Ayala. It is 
a set of PHP classes - no PHP extensions required - that allow developers to 
create and consume web services based on SOAP 1.1, WSDL 1.1 and HTTP 1.0/1.1.

%prep
%setup -c -q
dos2unix samples/*
dos2unix lib/changelog
iconv -f iso8859-1 -t utf-8 lib/changelog > lib/changelog.txt && mv -f lib/changelog.txt lib/changelog

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php/%{php_libname}
cp -a lib/*.php %{buildroot}%{_datadir}/php/%{php_libname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc samples lib/changelog
%{_datadir}/php/%{php_libname}

%changelog
* Tue Dec 08 2009 David Nalley <david at gnsa.us> 0.7.3-2
- improved spec legibility with addition of newlines
- corrected license
- changed versioned php require to php-common
* Thu Nov 26 2009 David Nalley <david at gnsa.us> 0.7.3-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-nusoap/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:40:31 -0000	1.1
+++ .cvsignore	10 Dec 2009 23:53:57 -0000	1.2
@@ -0,0 +1 @@
+nusoap-0.7.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-nusoap/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:40:31 -0000	1.1
+++ sources	10 Dec 2009 23:53:58 -0000	1.2
@@ -0,0 +1 @@
+19843319571f6b79f9ed56ef3bb59100  nusoap-0.7.3.zip



From mclasen at fedoraproject.org  Thu Dec 10 23:54:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 10 Dec 2009 23:54:49 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-monitor-change.patch, 1.1,
	1.2 nautilus.spec, 1.295, 1.296
Message-ID: <20091210235449.9E87B11C025D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31102

Modified Files:
	nautilus-monitor-change.patch nautilus.spec 
Log Message:
update monitor aspect ratio patch


nautilus-monitor-change.patch:
 eel-background.c |   82 +++++++++++++++++++++++--------------------------------
 1 file changed, 35 insertions(+), 47 deletions(-)

Index: nautilus-monitor-change.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus-monitor-change.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nautilus-monitor-change.patch	10 Nov 2009 00:41:27 -0000	1.1
+++ nautilus-monitor-change.patch	10 Dec 2009 23:54:49 -0000	1.2
@@ -1,8 +1,37 @@
+From cd770f34590de85b7ea0f0feccf5657590550918 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann at redhat.com>
+Date: Thu, 3 Dec 2009 23:52:08 -0500
+Subject: [PATCH] Fixes to enable per-monitor backgrounds
+
+https://bugzilla.gnome.org/show_bug.cgi?id=147808
+---
+ eel/eel-background.c |   81 +++++++++++++++++++++----------------------------
+ 1 files changed, 35 insertions(+), 46 deletions(-)
+
 diff --git a/eel/eel-background.c b/eel/eel-background.c
-index 9c40629..2854a07 100644
+index 9c40629..4d9e8e8 100644
 --- a/eel/eel-background.c
 +++ b/eel/eel-background.c
-@@ -94,6 +94,8 @@ struct EelBackgroundDetails {
+@@ -50,8 +50,8 @@ static void       eel_background_init                      (gpointer       objec
+ static void       eel_background_finalize                  (GObject       *object);
+ static GdkPixmap *eel_background_get_pixmap_and_color      (EelBackground *background,
+ 							    GdkWindow     *window,
+-							    GdkColor      *color,
+-							    gboolean      *changes_with_size);
++							    GdkColor      *color);
++
+ static void set_image_properties (EelBackground *background);
+ 
+ static void init_fade (EelBackground *background, GtkWidget *widget);
+@@ -80,7 +80,6 @@ struct EelBackgroundDetails {
+ 	GtkWidget *widget;
+ 
+ 	/* Realized data: */
+-	gboolean background_changes_with_size;
+ 	GdkPixmap *background_pixmap;
+ 	gboolean background_pixmap_is_unset_root_pixmap;
+ 	GnomeBGCrossfade *fade;
+@@ -94,6 +93,8 @@ struct EelBackgroundDetails {
  	gboolean is_desktop;
  	/* Desktop screen size watcher */
  	gulong screen_size_handler;
@@ -11,7 +40,134 @@ index 9c40629..2854a07 100644
  	/* Can we use common pixmap for root window and desktop window */
  	gboolean use_common_pixmap;
  	guint change_idle_id;
-@@ -869,7 +871,6 @@ screen_size_changed (GdkScreen *screen, EelBackground *background)
+@@ -365,14 +366,6 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window)
+ 		gdk_rgb_find_color (style->colormap, &(background->details->default_color));
+ 	}
+ 
+-	/* If the pixmap doesn't change with the window size, never update
+-	 * it again.
+-	 */
+-	if (background->details->background_pixmap != NULL &&
+-	    !background->details->background_changes_with_size) {
+-		return FALSE;
+-	}
+-
+ 	/* If the window size is the same as last time, don't update */
+ 	if (entire_width == background->details->background_entire_width &&
+ 	    entire_height == background->details->background_entire_height) {
+@@ -385,7 +378,6 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window)
+ 
+ 	set_image_properties (background);
+ 
+-	background->details->background_changes_with_size = gnome_bg_changes_with_size (background->details->bg);
+ 	background->details->background_pixmap = gnome_bg_create_pixmap (background->details->bg,
+ 									 window,
+ 									 entire_width, entire_height,
+@@ -408,8 +400,7 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window)
+ static GdkPixmap *
+ eel_background_get_pixmap_and_color (EelBackground *background,
+ 				     GdkWindow     *window,
+-				     GdkColor      *color,
+-				     gboolean      *changes_with_size)
++				     GdkColor      *color)
+ {
+ 	int entire_width;
+ 	int entire_height;
+@@ -419,7 +410,6 @@ eel_background_get_pixmap_and_color (EelBackground *background,
+ 	eel_background_ensure_realized (background, window);
+ 	
+ 	*color = background->details->default_color;
+-	*changes_with_size = background->details->background_changes_with_size;
+ 	
+ 	if (background->details->background_pixmap != NULL) {
+ 		return g_object_ref (background->details->background_pixmap);
+@@ -434,7 +424,6 @@ eel_background_expose (GtkWidget                   *widget,
+ 	GdkColor color;
+ 	int window_width;
+ 	int window_height;
+-	gboolean changes_with_size;
+ 	GdkPixmap *pixmap;
+ 	GdkGC *gc;
+ 	GdkGCValues gc_values;
+@@ -452,19 +441,8 @@ eel_background_expose (GtkWidget                   *widget,
+ 	
+ 	pixmap = eel_background_get_pixmap_and_color (background,
+ 						      widget->window,
+-						      &color,
+-						      &changes_with_size);
+-
+-        if (!changes_with_size) {
+-                /* The background was already drawn by X, since we set
+-                 * the GdkWindow background/back_pixmap.
+-                 * No need to draw it again. */
+-                if (pixmap) {
+-                        g_object_unref (pixmap);
+-                }
+-                return;
+-        }
+- 
++						      &color);
++
+ 	if (pixmap) {
+ 		gc_values.tile = pixmap;
+ 		gc_values.ts_x_origin = 0;
+@@ -670,12 +648,10 @@ set_root_pixmap (EelBackground *background,
+ 	GdkPixmap *pixmap, *root_pixmap;
+ 	GdkScreen *screen;
+ 	GdkColor color;
+-	gboolean changes_with_size;
+ 
+ 	pixmap = eel_background_get_pixmap_and_color (background,
+ 						      window,
+-						      &color,
+-						      &changes_with_size);
++						      &color);
+ 	screen = gdk_drawable_get_screen (window);
+ 
+ 	if (background->details->use_common_pixmap) {
+@@ -730,7 +706,6 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+ 	int window_height;
+ 	
+ 	GdkWindow *window;
+-	gboolean changes_with_size;
+ 	gboolean in_fade;
+ 
+ 	if (!GTK_WIDGET_REALIZED (widget)) {
+@@ -741,8 +716,7 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+ 	
+ 	pixmap = eel_background_get_pixmap_and_color (background,
+ 						      widget->window,
+-						      &color, 
+-						      &changes_with_size);
++						      &color);
+ 
+ 	style = gtk_widget_get_style (widget);
+ 	
+@@ -761,17 +735,14 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+ 	}
+ 
+ 	if (!in_fade) {
+-	if (!changes_with_size || background->details->is_desktop) {
+-		gdk_window_set_back_pixmap (window, pixmap, FALSE);
+-	} else {
+-		gdk_window_set_back_pixmap (window, NULL, FALSE);
+-		gdk_window_set_background (window, &color);
+-	}
++		if (background->details->is_desktop) {
++			gdk_window_set_back_pixmap (window, pixmap, FALSE);
++		} else {
++			gdk_window_set_back_pixmap (window, NULL, FALSE);
++			gdk_window_set_background (window, &color);
++		}
+         }
+ 	
+-	background->details->background_changes_with_size =
+-		gnome_bg_changes_with_size (background->details->bg);
+-	
+ 	if (background->details->is_desktop && !in_fade) {
+ 		set_root_pixmap (background, window);
+ 	}
+@@ -869,7 +840,6 @@ screen_size_changed (GdkScreen *screen, EelBackground *background)
  	g_signal_emit (background, signals[APPEARANCE_CHANGED], 0);
  }
  
@@ -19,7 +175,7 @@ index 9c40629..2854a07 100644
  static void
  widget_realized_setup (GtkWidget *widget, gpointer data)
  {
-@@ -891,6 +892,13 @@ widget_realized_setup (GtkWidget *widget, gpointer data)
+@@ -891,6 +861,13 @@ widget_realized_setup (GtkWidget *widget, gpointer data)
  		background->details->screen_size_handler = 
  			g_signal_connect (screen, "size_changed",
              				  G_CALLBACK (screen_size_changed), background);
@@ -33,7 +189,7 @@ index 9c40629..2854a07 100644
  
  		root_window = gdk_screen_get_root_window(screen);			
  		
-@@ -928,6 +936,11 @@ widget_unrealize_cb (GtkWidget *widget, gpointer data)
+@@ -928,6 +905,11 @@ widget_unrealize_cb (GtkWidget *widget, gpointer data)
  				                     background->details->screen_size_handler);
  			background->details->screen_size_handler = 0;
  	}
@@ -45,3 +201,22 @@ index 9c40629..2854a07 100644
  	background->details->use_common_pixmap = FALSE;
  }
  
+@@ -1022,7 +1004,14 @@ eel_get_widget_background (GtkWidget *widget)
+ gboolean
+ eel_background_is_dark (EelBackground *background)
+ {
+-	return gnome_bg_is_dark (background->details->bg);
++	GdkScreen *screen;
++	GdkRectangle rect;
++
++	/* only check for the background on the 0th monitor */
++	screen = gdk_screen_get_default ();
++	gdk_screen_get_monitor_geometry (screen, 0, &rect);
++
++	return gnome_bg_is_dark (background->details->bg, rect.width, rect.height);
+ }
+    
+ /* handle dropped colors */
+-- 
+1.6.5.2
+


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- nautilus.spec	8 Dec 2009 16:27:12 -0000	1.295
+++ nautilus.spec	10 Dec 2009 23:54:49 -0000	1.296
@@ -4,7 +4,7 @@
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define desktop_file_utils_version 0.7
-%define gnome_desktop_version 2.25.5
+%define gnome_desktop_version 2.29.3-2
 %define redhat_menus_version 0.25
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -59,6 +59,7 @@ BuildRequires:  gtk-doc
 Requires(pre): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
+Requires:	gnome-desktop >= %{gnome_desktop_version}
 
 Obsoletes:      nautilus-extras
 Obsoletes:      nautilus-suggested
@@ -269,6 +270,9 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.28.2-3
+- Update the monitor changes patch (gnome #147808)
+
 * Tue Dec  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-2
 - Fix some memory leaks
 



From ke4qqq at fedoraproject.org  Thu Dec 10 23:55:01 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 10 Dec 2009 23:55:01 +0000 (UTC)
Subject: rpms/php-nusoap/EL-5 import.log, NONE, 1.1 php-nusoap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091210235501.5969A11C025D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-nusoap/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31254/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-nusoap.spec 
Log Message:
* Thu Dec 10 2009 David Nalley <david at gnsa.us> 0.7.3-2
- initial commit




--- NEW FILE import.log ---
php-nusoap-0_7_3-2_fc12:EL-5:php-nusoap-0.7.3-2.fc12.src.rpm:1260489362


--- NEW FILE php-nusoap.spec ---
%global php_libname          nusoap
Name:      php-nusoap
Version:   0.7.3
Release:   2%{?dist}
License:   LGPLv2+
Summary:   SOAP Toolkit for PHP 
Group:     Development/Libraries
URL:       http://nusoap.sourceforge.net/
Source:    http://downloads.sourceforge.net/%{php_libname}/%{php_libname}-%{version}.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php-common
BuildRequires: dos2unix
BuildArch: noarch

%description
NuSOAP is a rewrite of SOAPx4, provided by NuSphere and Dietrich Ayala. It is 
a set of PHP classes - no PHP extensions required - that allow developers to 
create and consume web services based on SOAP 1.1, WSDL 1.1 and HTTP 1.0/1.1.

%prep
%setup -c -q
dos2unix samples/*
dos2unix lib/changelog
iconv -f iso8859-1 -t utf-8 lib/changelog > lib/changelog.txt && mv -f lib/changelog.txt lib/changelog

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php/%{php_libname}
cp -a lib/*.php %{buildroot}%{_datadir}/php/%{php_libname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc samples lib/changelog
%{_datadir}/php/%{php_libname}

%changelog
* Tue Dec 08 2009 David Nalley <david at gnsa.us> 0.7.3-2
- improved spec legibility with addition of newlines
- corrected license
- changed versioned php require to php-common
* Thu Nov 26 2009 David Nalley <david at gnsa.us> 0.7.3-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-nusoap/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:40:31 -0000	1.1
+++ .cvsignore	10 Dec 2009 23:55:01 -0000	1.2
@@ -0,0 +1 @@
+nusoap-0.7.3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-nusoap/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:40:31 -0000	1.1
+++ sources	10 Dec 2009 23:55:01 -0000	1.2
@@ -0,0 +1 @@
+19843319571f6b79f9ed56ef3bb59100  nusoap-0.7.3.zip



From ke4qqq at fedoraproject.org  Thu Dec 10 23:57:48 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 10 Dec 2009 23:57:48 +0000 (UTC)
Subject: File OLE-1.0.0RC1.tgz uploaded to lookaside cache by ke4qqq
Message-ID: <20091210235748.D375C10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-pear-OLE:

232a44e1da145afc6f6a5b791ae605f8  OLE-1.0.0RC1.tgz



From ke4qqq at fedoraproject.org  Fri Dec 11 00:00:18 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Fri, 11 Dec 2009 00:00:18 +0000 (UTC)
Subject: rpms/php-pear-OLE/devel import.log, NONE, 1.1 php-pear-OLE.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091211000018.E752111C03E3@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-pear-OLE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv359/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-OLE.spec 
Log Message:
* Thu Dec 10 2009 David Nalley <david at gnsa.us> 1.0.0-0.4.rc1
- initial commit




--- NEW FILE import.log ---
php-pear-OLE-1_0_0-0_4_rc1_fc12:HEAD:php-pear-OLE-1.0.0-0.4.rc1.fc12.src.rpm:1260489557


--- NEW FILE php-pear-OLE.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name OLE

Name:           php-pear-OLE
Version:        1.0.0
Release:        0.4.rc1%{?dist}
Summary:        Package for reading and writing OLE containers

Group:          Development/Libraries
License:        PHP
URL:            http://pear.php.net/package/OLE
Source0:        http://pear.php.net/get/%{pear_name}-1.0.0RC1.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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}


%description
This package allows reading and writing of OLE (Object Linking and
Embedding) compound documents. This format is used as container for Excel
(.xls), Word (.doc) and other Microsoft file formats.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}RC1/%{name}.xml
cd %{pear_name}-%{version}RC1


%build
cd %{pear_name}-%{version}RC1
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}RC1
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/OLE
%{pear_phpdir}/OLE.php




%changelog
* Tue Dec 08 2009 David Nalley <david at gnsa.us> 1.0.0-0.4.rc1
- really fixed php-pear require
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.0-0.3.rc1
- added require for php(pear)
* Wed Dec 02 2009 David Nalley <david at gnsa.us> 1.0.0-0.2.rc1
- removed require for php
* Sat Nov 28 2009 David Nalley <david at gnsa.us> 1.0.0-0.1.rc1
- Initial packaging efforts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-OLE/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:39:24 -0000	1.1
+++ .cvsignore	11 Dec 2009 00:00:17 -0000	1.2
@@ -0,0 +1 @@
+OLE-1.0.0RC1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-OLE/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:39:25 -0000	1.1
+++ sources	11 Dec 2009 00:00:18 -0000	1.2
@@ -0,0 +1 @@
+232a44e1da145afc6f6a5b791ae605f8  OLE-1.0.0RC1.tgz



From tuxbrewr at fedoraproject.org  Fri Dec 11 00:00:54 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Fri, 11 Dec 2009 00:00:54 +0000 (UTC)
Subject: rpms/kpackagekit/F-12 kpackagekit.spec, 1.50, 1.51 KpKIcons.patch,
	1.1, NONE KpKStrings.patch, 1.1,
	NONE kpackagekit-0.5.0-defaults_hacks.patch, 1.1, NONE
Message-ID: <20091211000054.04C3B11C0345@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1250

Modified Files:
	kpackagekit.spec 
Removed Files:
	KpKIcons.patch KpKStrings.patch 
	kpackagekit-0.5.0-defaults_hacks.patch 
Log Message:
Cleaned up spec file, no build


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/kpackagekit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- kpackagekit.spec	10 Dec 2009 13:41:40 -0000	1.50
+++ kpackagekit.spec	11 Dec 2009 00:00:53 -0000	1.51
@@ -3,7 +3,7 @@
 
 Name:	  	kpackagekit
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -15,8 +15,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 #Hacks to smash kpackagekit: daily/none default (#469375)
 Patch50: kpackagekit-0.5.1-defaults_hacks.patch
-#Patch51: KpKStrings.patch
-#Patch52: KpKIcons.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -36,9 +34,6 @@ KDE interface for PackageKit.
 %setup -q -n %{name}-%{version}
 
 %patch50  -p1 -b .defaults_hacks
-#patch51 -p1 -b .strings
-#patch52 -p1 -b .icons
-
 
 %build
 mkdir -p %{_target_platform}
@@ -81,7 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 
 %changelog
-* Mon Dec 07 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.2
+* Thu Dec 10 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.2-2
+- Clean up spec file 
+
+* Mon Dec 07 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.2-1
 - New upstream release
 
 * Thu Nov 19 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.1.1-2


--- KpKIcons.patch DELETED ---


--- KpKStrings.patch DELETED ---


--- kpackagekit-0.5.0-defaults_hacks.patch DELETED ---



From ke4qqq at fedoraproject.org  Fri Dec 11 00:01:30 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Fri, 11 Dec 2009 00:01:30 +0000 (UTC)
Subject: rpms/php-pear-OLE/F-11 import.log, NONE, 1.1 php-pear-OLE.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091211000130.09CDB11C025D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-pear-OLE/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1502/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-OLE.spec 
Log Message:
* Thu Dec 10 2009 David Nalley <david at gnsa.us> 1.0.0-0.4.rc1
- initial commit



--- NEW FILE import.log ---
php-pear-OLE-1_0_0-0_4_rc1_fc12:F-11:php-pear-OLE-1.0.0-0.4.rc1.fc12.src.rpm:1260489743


--- NEW FILE php-pear-OLE.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name OLE

Name:           php-pear-OLE
Version:        1.0.0
Release:        0.4.rc1%{?dist}
Summary:        Package for reading and writing OLE containers

Group:          Development/Libraries
License:        PHP
URL:            http://pear.php.net/package/OLE
Source0:        http://pear.php.net/get/%{pear_name}-1.0.0RC1.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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}


%description
This package allows reading and writing of OLE (Object Linking and
Embedding) compound documents. This format is used as container for Excel
(.xls), Word (.doc) and other Microsoft file formats.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}RC1/%{name}.xml
cd %{pear_name}-%{version}RC1


%build
cd %{pear_name}-%{version}RC1
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}RC1
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/OLE
%{pear_phpdir}/OLE.php




%changelog
* Tue Dec 08 2009 David Nalley <david at gnsa.us> 1.0.0-0.4.rc1
- really fixed php-pear require
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.0-0.3.rc1
- added require for php(pear)
* Wed Dec 02 2009 David Nalley <david at gnsa.us> 1.0.0-0.2.rc1
- removed require for php
* Sat Nov 28 2009 David Nalley <david at gnsa.us> 1.0.0-0.1.rc1
- Initial packaging efforts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-OLE/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:39:24 -0000	1.1
+++ .cvsignore	11 Dec 2009 00:01:29 -0000	1.2
@@ -0,0 +1 @@
+OLE-1.0.0RC1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-OLE/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:39:25 -0000	1.1
+++ sources	11 Dec 2009 00:01:29 -0000	1.2
@@ -0,0 +1 @@
+232a44e1da145afc6f6a5b791ae605f8  OLE-1.0.0RC1.tgz



From ke4qqq at fedoraproject.org  Fri Dec 11 00:02:49 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Fri, 11 Dec 2009 00:02:49 +0000 (UTC)
Subject: rpms/php-pear-OLE/F-12 import.log, NONE, 1.1 php-pear-OLE.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091211000249.8FD6F11C025D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-pear-OLE/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2032/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-OLE.spec 
Log Message:
* Thu Dec 10 2009 David Nalley <david at gnsa.us> 1.0.0-0.4.rc1
- initial commit



--- NEW FILE import.log ---
php-pear-OLE-1_0_0-0_4_rc1_fc12:F-12:php-pear-OLE-1.0.0-0.4.rc1.fc12.src.rpm:1260489803


--- NEW FILE php-pear-OLE.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name OLE

Name:           php-pear-OLE
Version:        1.0.0
Release:        0.4.rc1%{?dist}
Summary:        Package for reading and writing OLE containers

Group:          Development/Libraries
License:        PHP
URL:            http://pear.php.net/package/OLE
Source0:        http://pear.php.net/get/%{pear_name}-1.0.0RC1.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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}


%description
This package allows reading and writing of OLE (Object Linking and
Embedding) compound documents. This format is used as container for Excel
(.xls), Word (.doc) and other Microsoft file formats.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}RC1/%{name}.xml
cd %{pear_name}-%{version}RC1


%build
cd %{pear_name}-%{version}RC1
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}RC1
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/OLE
%{pear_phpdir}/OLE.php




%changelog
* Tue Dec 08 2009 David Nalley <david at gnsa.us> 1.0.0-0.4.rc1
- really fixed php-pear require
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.0-0.3.rc1
- added require for php(pear)
* Wed Dec 02 2009 David Nalley <david at gnsa.us> 1.0.0-0.2.rc1
- removed require for php
* Sat Nov 28 2009 David Nalley <david at gnsa.us> 1.0.0-0.1.rc1
- Initial packaging efforts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-OLE/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:39:24 -0000	1.1
+++ .cvsignore	11 Dec 2009 00:02:49 -0000	1.2
@@ -0,0 +1 @@
+OLE-1.0.0RC1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-OLE/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:39:25 -0000	1.1
+++ sources	11 Dec 2009 00:02:49 -0000	1.2
@@ -0,0 +1 @@
+232a44e1da145afc6f6a5b791ae605f8  OLE-1.0.0RC1.tgz



From ke4qqq at fedoraproject.org  Fri Dec 11 00:05:02 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Fri, 11 Dec 2009 00:05:02 +0000 (UTC)
Subject: rpms/php-pear-OLE/EL-5 import.log, NONE, 1.1 php-pear-OLE.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091211000502.2D94611C025D@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-pear-OLE/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2837/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-OLE.spec 
Log Message:
* Thu Dec 10 2009 David Nalley <david at gnsa.us> 1.0.0-0.4.rc1
- initial commit



--- NEW FILE import.log ---
php-pear-OLE-1_0_0-0_4_rc1_fc12:EL-5:php-pear-OLE-1.0.0-0.4.rc1.fc12.src.rpm:1260489903


--- NEW FILE php-pear-OLE.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name OLE

Name:           php-pear-OLE
Version:        1.0.0
Release:        0.4.rc1%{?dist}
Summary:        Package for reading and writing OLE containers

Group:          Development/Libraries
License:        PHP
URL:            http://pear.php.net/package/OLE
Source0:        http://pear.php.net/get/%{pear_name}-1.0.0RC1.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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}


%description
This package allows reading and writing of OLE (Object Linking and
Embedding) compound documents. This format is used as container for Excel
(.xls), Word (.doc) and other Microsoft file formats.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}RC1/%{name}.xml
cd %{pear_name}-%{version}RC1


%build
cd %{pear_name}-%{version}RC1
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}RC1
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/OLE
%{pear_phpdir}/OLE.php




%changelog
* Tue Dec 08 2009 David Nalley <david at gnsa.us> 1.0.0-0.4.rc1
- really fixed php-pear require
* Sun Dec 06 2009 David Nalley <david at gnsa.us> 1.0.0-0.3.rc1
- added require for php(pear)
* Wed Dec 02 2009 David Nalley <david at gnsa.us> 1.0.0-0.2.rc1
- removed require for php
* Sat Nov 28 2009 David Nalley <david at gnsa.us> 1.0.0-0.1.rc1
- Initial packaging efforts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-OLE/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:39:24 -0000	1.1
+++ .cvsignore	11 Dec 2009 00:05:01 -0000	1.2
@@ -0,0 +1 @@
+OLE-1.0.0RC1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-OLE/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:39:25 -0000	1.1
+++ sources	11 Dec 2009 00:05:01 -0000	1.2
@@ -0,0 +1 @@
+232a44e1da145afc6f6a5b791ae605f8  OLE-1.0.0RC1.tgz



From cebbert at fedoraproject.org  Fri Dec 11 00:05:18 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 11 Dec 2009 00:05:18 +0000 (UTC)
Subject: File patch-2.6.31.7.bz2 uploaded to lookaside cache by cebbert
Message-ID: <20091211000518.C785F10F89A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kernel:

801b9c379a12339c0210dc5d1a8e9537  patch-2.6.31.7.bz2



From lutter at fedoraproject.org  Fri Dec 11 00:09:36 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Fri, 11 Dec 2009 00:09:36 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-12
	rubygem-actionpack-2.3.x-CVE-2009-4214.patch, NONE,
	1.1 rubygem-actionpack.spec, 1.14, 1.15
Message-ID: <20091211000937.01A4811C025D@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionpack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4388

Modified Files:
	rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.3.x-CVE-2009-4214.patch 
Log Message:
Patch for CVE-2009-4214 (bz 542786)

rubygem-actionpack-2.3.x-CVE-2009-4214.patch:
 lib/action_controller/vendor/html-scanner/html/node.rb |    2 +-
 test/controller/html-scanner/sanitizer_test.rb         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rubygem-actionpack-2.3.x-CVE-2009-4214.patch ---
>From bfe032858077bb2946abe25e95e485ba6da86bd5 Mon Sep 17 00:00:00 2001
From: Gabe da Silveira <gabe at websaviour.com>
Date: Mon, 16 Nov 2009 21:17:35 -0800
Subject: [PATCH] Make sure strip_tags removes tags which start with a non-printable character

Signed-off-by: Michael Koziarski <michael at koziarski.com>
---
 .../vendor/html-scanner/html/node.rb               |    2 +-
 .../test/controller/html-scanner/sanitizer_test.rb |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
index 6c03316..0cd05d8 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -162,7 +162,7 @@ module HTML #:nodoc:
           end
           
           closing = ( scanner.scan(/\//) ? :close : nil )
-          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[\w:-]+/)
+          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[-:\w\x00-\x09\x0b-\x0c\x0e-\x1f]+/)
           name.downcase!
   
           unless closing
diff --git a/actionpack/test/controller/html-scanner/sanitizer_test.rb b/actionpack/test/controller/html-scanner/sanitizer_test.rb
index e85a5c7..1923544 100644
--- a/actionpack/test/controller/html-scanner/sanitizer_test.rb
+++ b/actionpack/test/controller/html-scanner/sanitizer_test.rb
@@ -19,6 +19,7 @@ class SanitizerTest < ActionController::TestCase
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <!-- comment --> here.")
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <![CDATA[<section>]]> here.")
     assert_equal "This has an unclosed ", sanitizer.sanitize("This has an unclosed <![CDATA[<section>]] here...")
+    assert_equal "non printable char is a tag", sanitizer.sanitize("<\x07a href='/hello'>non printable char is a tag</a>")
     [nil, '', '   '].each { |blank| assert_equal blank, sanitizer.sanitize(blank) }
   end
 
-- 
1.6.0.1



Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-12/rubygem-actionpack.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rubygem-actionpack.spec	7 Oct 2009 23:12:56 -0000	1.14
+++ rubygem-actionpack.spec	11 Dec 2009 00:09:35 -0000	1.15
@@ -10,12 +10,13 @@ Summary: Web-flow and rendering framewor
 Name: rubygem-%{gemname}
 Epoch: 1
 Version: 2.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 Patch0:  rubygem-actionpack-2.3.4-enable-test.patch
+Patch1:  rubygem-actionpack-2.3.x-CVE-2009-4214.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
@@ -45,6 +46,7 @@ gem install --local --install-dir .%{gem
 
 pushd .%{geminstdir}
 %patch0 -p0
+%patch1 -p2
 
 # create missing symlink
 pushd test/fixtures/layout_tests/layouts/
@@ -110,6 +112,9 @@ rake test --trace
 
 
 %changelog
+* Thu Dec 10 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-3
+- Patch for CVE-2009-4214 (bz 542786)
+
 * Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
 - Bump Epoch to ensure upgrade path from F-11
 



From lutter at fedoraproject.org  Fri Dec 11 00:10:36 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Fri, 11 Dec 2009 00:10:36 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-11
	rubygem-actionpack-2.3.x-CVE-2009-4214.patch, NONE,
	1.1 rubygem-actionpack.spec, 1.13, 1.14
Message-ID: <20091211001036.B23B811C03FC@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionpack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4795

Modified Files:
	rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.3.x-CVE-2009-4214.patch 
Log Message:
Patch for CVE-2009-4214 (bz 542786)

rubygem-actionpack-2.3.x-CVE-2009-4214.patch:
 lib/action_controller/vendor/html-scanner/html/node.rb |    2 +-
 test/controller/html-scanner/sanitizer_test.rb         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rubygem-actionpack-2.3.x-CVE-2009-4214.patch ---
>From bfe032858077bb2946abe25e95e485ba6da86bd5 Mon Sep 17 00:00:00 2001
From: Gabe da Silveira <gabe at websaviour.com>
Date: Mon, 16 Nov 2009 21:17:35 -0800
Subject: [PATCH] Make sure strip_tags removes tags which start with a non-printable character

Signed-off-by: Michael Koziarski <michael at koziarski.com>
---
 .../vendor/html-scanner/html/node.rb               |    2 +-
 .../test/controller/html-scanner/sanitizer_test.rb |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
index 6c03316..0cd05d8 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -162,7 +162,7 @@ module HTML #:nodoc:
           end
           
           closing = ( scanner.scan(/\//) ? :close : nil )
-          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[\w:-]+/)
+          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[-:\w\x00-\x09\x0b-\x0c\x0e-\x1f]+/)
           name.downcase!
   
           unless closing
diff --git a/actionpack/test/controller/html-scanner/sanitizer_test.rb b/actionpack/test/controller/html-scanner/sanitizer_test.rb
index e85a5c7..1923544 100644
--- a/actionpack/test/controller/html-scanner/sanitizer_test.rb
+++ b/actionpack/test/controller/html-scanner/sanitizer_test.rb
@@ -19,6 +19,7 @@ class SanitizerTest < ActionController::TestCase
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <!-- comment --> here.")
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <![CDATA[<section>]]> here.")
     assert_equal "This has an unclosed ", sanitizer.sanitize("This has an unclosed <![CDATA[<section>]] here...")
+    assert_equal "non printable char is a tag", sanitizer.sanitize("<\x07a href='/hello'>non printable char is a tag</a>")
     [nil, '', '   '].each { |blank| assert_equal blank, sanitizer.sanitize(blank) }
   end
 
-- 
1.6.0.1



Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-11/rubygem-actionpack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-actionpack.spec	21 Oct 2009 14:36:10 -0000	1.13
+++ rubygem-actionpack.spec	11 Dec 2009 00:10:36 -0000	1.14
@@ -8,7 +8,7 @@ Summary:        Web-flow and rendering f
 Name:           rubygem-%{gemname}
 Epoch:          1
 Version:        2.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.rubyonrails.org
@@ -17,6 +17,7 @@ Patch0:         rubygem-actionpack-2.3.x
 # Ticket #2200 upstream. see also:
 # https://rails.lighthouseapp.com/projects/8994/tickets/2200-session-support-broken#ticket-2200-23
 Patch1:         rubygem-actionpack-2.3.2-fix-reset_session.patch
+Patch2:         rubygem-actionpack-2.3.x-CVE-2009-4214.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       rubygems
 Requires:       rubygem(activesupport) = %{version}
@@ -42,6 +43,7 @@ gem install --local --install-dir %{buil
 pushd %{buildroot}%{geminstdir}
 patch -s -p2 < %{PATCH0}
 patch -s -p2 < %{PATCH1}
+patch -s -p2 < %{PATCH2}
 popd
 
 # Remove backup files
@@ -80,6 +82,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-4
+- Patch for CVE-2009-4214 (bz 542786)
+
 * Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1:2.3.2-3
 - Fix activerecord test for reset_session (#2200 upstream)
 



From carllibpst at fedoraproject.org  Fri Dec 11 00:14:25 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 11 Dec 2009 00:14:25 +0000 (UTC)
Subject: File f2c.tar uploaded to lookaside cache by carllibpst
Message-ID: <20091211001425.1370210F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for f2c:

77b46dbed05b97259085440bd93c003b  f2c.tar



From carllibpst at fedoraproject.org  Fri Dec 11 00:16:23 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 11 Dec 2009 00:16:23 +0000 (UTC)
Subject: File f2c-20090411.patch uploaded to lookaside cache by carllibpst
Message-ID: <20091211001623.AE36010F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for f2c:

9a9d46f263d40cccb09670b6fc6428e3  f2c-20090411.patch



From carllibpst at fedoraproject.org  Fri Dec 11 00:16:41 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 11 Dec 2009 00:16:41 +0000 (UTC)
Subject: rpms/f2c/devel f2c.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20091211001641.B25E311C025D@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/f2c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6561

Modified Files:
	.cvsignore sources 
Added Files:
	f2c.spec 
Log Message:
initial version


--- NEW FILE f2c.spec ---
Name:           f2c
Summary:        A Fortran 77 to C/C++ conversion program
Version:        20090411
Release:        5%{?dist}
License:        MIT
Group:          Development/Languages
URL:            http://netlib.org/f2c/
Source:         ftp://netlib.org/f2c.tar
# Patch makefile to build a shared library
Patch:          f2c-20090411.patch
BuildRequires:  unzip
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires:       %{name}-libs = %{version}-%{release}
Provides:       %{name}-devel = %{version}-%{release}

%description
F2c converts Fortran 77 source code to C or C++ source files. If no
Fortran files are named on the command line, f2c can read Fortran from
standard input and write C to standard output.

%package libs
Summary:    Dynamic libraries from %{name}
Group:      Development/Libraries

%description libs
Dynamic libraries from %{name}.

%prep
%setup -q -n %{name}
mkdir libf2c
pushd libf2c
unzip ../libf2c.zip
popd
%patch

%build
cp src/makefile.u src/Makefile
cp libf2c/makefile.u libf2c/Makefile
make -C src %{?_smp_mflags} CFLAGS="%{optflags}" f2c
make -C libf2c %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"

%install
rm -rf %{buildroot}
install -D -p -m 644 f2c.h %{buildroot}%{_includedir}/f2c.h
install -D -p -m 755 src/f2c %{buildroot}%{_bindir}/f2c
install -D -p -m 644 src/f2c.1t %{buildroot}%{_mandir}/man1/f2c.1
install -D -p -m 755 libf2c/libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so.0.22
ln -s libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so.0
ln -s libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc f2c.ps f2c.pdf readme changes src/Notice src/README
%{_bindir}/f2c
%{_mandir}/man1/f2c.1*
%{_includedir}/f2c.h
%{_libdir}/libf2c.so

%files libs
%defattr(-,root,root,-)
%doc permission disclaimer
%{_libdir}/libf2c.so.*


%changelog
* Sun Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-5
- fully versioned provides

* Sat Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-4
- remove -devel subpackage, merge it into the main package which
  provides -devel and requires -libs.

* Sat Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-3
- remove patch backups
- add comment for patch purpose

* Thu Dec 03 2009 Carl Byington <carl at five-ten-sg.com> 20090411-2
- add symlink to fix rpmlint error
- remove unnecessary parts of the patch, which enables building a
  shared library.
- main package now requires -devel since that is needed to be useful.
- summary changed to specify this only works on F77 code.
- %%files use explicit libf2c rather than * wildcard

* Wed Dec 02 2009 Carl Byington <carl at five-ten-sg.com> 20090411-1
- update to newer upstream version
- add .pdf documentation also
- trim changelog
- move all the license related files into -libs, and both the
  main package and -devel require -libs, to avoid either duplicating
  files or installing any package without the license files.

* Sun Nov 25 2009 Carl Byington <carl at five-ten-sg.com> 20031026-3.0.3
- don't install the static library.
- preserve the alpha architecture patch and ifdef in the spec file
  even if it is not used by fedora.
- split off -libs and -devel packages.
- full version/release in requires

* Wed Nov 25 2009 Carl Byington <carl at five-ten-sg.com> 20031026-3.0.2
- convert to fedora compatible spec file.

* Sat Jun 14 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 20031026-3.0.1
- Fix not utf-8 specfile entries.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f2c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:23:44 -0000	1.1
+++ .cvsignore	11 Dec 2009 00:16:41 -0000	1.2
@@ -0,0 +1 @@
+f2c-20090411.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f2c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:23:44 -0000	1.1
+++ sources	11 Dec 2009 00:16:41 -0000	1.2
@@ -0,0 +1 @@
+9a9d46f263d40cccb09670b6fc6428e3  f2c-20090411.patch



From carllibpst at fedoraproject.org  Fri Dec 11 00:19:12 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 11 Dec 2009 00:19:12 +0000 (UTC)
Subject: rpms/f2c/F-11 f2c.spec,NONE,1.1
Message-ID: <20091211001912.24B3511C025D@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/f2c/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7374

Added Files:
	f2c.spec 
Log Message:
initial version


--- NEW FILE f2c.spec ---
Name:           f2c
Summary:        A Fortran 77 to C/C++ conversion program
Version:        20090411
Release:        5%{?dist}
License:        MIT
Group:          Development/Languages
URL:            http://netlib.org/f2c/
Source:         ftp://netlib.org/f2c.tar
# Patch makefile to build a shared library
Patch:          f2c-20090411.patch
BuildRequires:  unzip
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires:       %{name}-libs = %{version}-%{release}
Provides:       %{name}-devel = %{version}-%{release}

%description
F2c converts Fortran 77 source code to C or C++ source files. If no
Fortran files are named on the command line, f2c can read Fortran from
standard input and write C to standard output.

%package libs
Summary:    Dynamic libraries from %{name}
Group:      Development/Libraries

%description libs
Dynamic libraries from %{name}.

%prep
%setup -q -n %{name}
mkdir libf2c
pushd libf2c
unzip ../libf2c.zip
popd
%patch

%build
cp src/makefile.u src/Makefile
cp libf2c/makefile.u libf2c/Makefile
make -C src %{?_smp_mflags} CFLAGS="%{optflags}" f2c
make -C libf2c %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"

%install
rm -rf %{buildroot}
install -D -p -m 644 f2c.h %{buildroot}%{_includedir}/f2c.h
install -D -p -m 755 src/f2c %{buildroot}%{_bindir}/f2c
install -D -p -m 644 src/f2c.1t %{buildroot}%{_mandir}/man1/f2c.1
install -D -p -m 755 libf2c/libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so.0.22
ln -s libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so.0
ln -s libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc f2c.ps f2c.pdf readme changes src/Notice src/README
%{_bindir}/f2c
%{_mandir}/man1/f2c.1*
%{_includedir}/f2c.h
%{_libdir}/libf2c.so

%files libs
%defattr(-,root,root,-)
%doc permission disclaimer
%{_libdir}/libf2c.so.*


%changelog
* Sun Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-5
- fully versioned provides

* Sat Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-4
- remove -devel subpackage, merge it into the main package which
  provides -devel and requires -libs.

* Sat Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-3
- remove patch backups
- add comment for patch purpose

* Thu Dec 03 2009 Carl Byington <carl at five-ten-sg.com> 20090411-2
- add symlink to fix rpmlint error
- remove unnecessary parts of the patch, which enables building a
  shared library.
- main package now requires -devel since that is needed to be useful.
- summary changed to specify this only works on F77 code.
- %%files use explicit libf2c rather than * wildcard

* Wed Dec 02 2009 Carl Byington <carl at five-ten-sg.com> 20090411-1
- update to newer upstream version
- add .pdf documentation also
- trim changelog
- move all the license related files into -libs, and both the
  main package and -devel require -libs, to avoid either duplicating
  files or installing any package without the license files.

* Sun Nov 25 2009 Carl Byington <carl at five-ten-sg.com> 20031026-3.0.3
- don't install the static library.
- preserve the alpha architecture patch and ifdef in the spec file
  even if it is not used by fedora.
- split off -libs and -devel packages.
- full version/release in requires

* Wed Nov 25 2009 Carl Byington <carl at five-ten-sg.com> 20031026-3.0.2
- convert to fedora compatible spec file.

* Sat Jun 14 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 20031026-3.0.1
- Fix not utf-8 specfile entries.




From cebbert at fedoraproject.org  Fri Dec 11 00:24:06 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 11 Dec 2009 00:24:06 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.7.bz2.sign, NONE, 1.1 .cvsignore,
	1.1133, 1.1134 kernel.spec, 1.1952, 1.1953 sources, 1.1091,
	1.1092 upstream, 1.1005, 1.1006 patch-2.6.31.6.bz2.sign, 1.1, NONE
Message-ID: <20091211002406.9617311C025D@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8792

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31.7.bz2.sign 
Removed Files:
	patch-2.6.31.6.bz2.sign 
Log Message:
Linux 2.6.31.7
NOTE: drm patch still needs fixing.


--- NEW FILE patch-2.6.31.7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLHqktyGugalF9Dw4RAih9AJwPEh/+Vdi4L6B/s0toSsrlfzeInACfZ7f3
PZ+diwRzb3NiRLI2NLU4C50=
=3NOa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1133
retrieving revision 1.1134
diff -u -p -r1.1133 -r1.1134
--- .cvsignore	12 Nov 2009 16:40:36 -0000	1.1133
+++ .cvsignore	11 Dec 2009 00:24:05 -0000	1.1134
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.6.bz2
+patch-2.6.31.7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1952
retrieving revision 1.1953
diff -u -p -r1.1952 -r1.1953
--- kernel.spec	9 Dec 2009 14:29:02 -0000	1.1952
+++ kernel.spec	11 Dec 2009 00:24:05 -0000	1.1953
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -2173,6 +2173,10 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.6-167
+- Linux 2.6.31.7
+- NOTE: drm patch still needs fixing.
+
 * Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.6-166
 - ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch: CVE-2009-4131
   fix insufficient permission checking which could result in arbitrary


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1091
retrieving revision 1.1092
diff -u -p -r1.1091 -r1.1092
--- sources	12 Nov 2009 16:40:37 -0000	1.1091
+++ sources	11 Dec 2009 00:24:06 -0000	1.1092
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-89802830db41e517cdf0954145f73337  patch-2.6.31.6.bz2
+801b9c379a12339c0210dc5d1a8e9537  patch-2.6.31.7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1005
retrieving revision 1.1006
diff -u -p -r1.1005 -r1.1006
--- upstream	12 Nov 2009 16:40:37 -0000	1.1005
+++ upstream	11 Dec 2009 00:24:06 -0000	1.1006
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.6.bz2
+patch-2.6.31.7.bz2


--- patch-2.6.31.6.bz2.sign DELETED ---



From carllibpst at fedoraproject.org  Fri Dec 11 00:25:42 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 11 Dec 2009 00:25:42 +0000 (UTC)
Subject: rpms/f2c/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091211002542.2140611C025D@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/f2c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9249

Modified Files:
	.cvsignore sources 
Log Message:
need both source files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f2c/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Dec 2009 00:16:41 -0000	1.2
+++ .cvsignore	11 Dec 2009 00:25:41 -0000	1.3
@@ -1 +1,2 @@
+f2c.tar
 f2c-20090411.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f2c/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Dec 2009 00:16:41 -0000	1.2
+++ sources	11 Dec 2009 00:25:42 -0000	1.3
@@ -1 +1,2 @@
+77b46dbed05b97259085440bd93c003b  f2c.tar
 9a9d46f263d40cccb09670b6fc6428e3  f2c-20090411.patch



From carllibpst at fedoraproject.org  Fri Dec 11 00:30:22 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 11 Dec 2009 00:30:22 +0000 (UTC)
Subject: rpms/f2c/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091211003022.4A30611C02CA@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/f2c/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10891

Modified Files:
	.cvsignore sources 
Log Message:
initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f2c/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:23:44 -0000	1.1
+++ .cvsignore	11 Dec 2009 00:30:22 -0000	1.2
@@ -0,0 +1,2 @@
+f2c.tar
+f2c-20090411.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f2c/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:23:44 -0000	1.1
+++ sources	11 Dec 2009 00:30:22 -0000	1.2
@@ -0,0 +1,2 @@
+77b46dbed05b97259085440bd93c003b  f2c.tar
+9a9d46f263d40cccb09670b6fc6428e3  f2c-20090411.patch



From carllibpst at fedoraproject.org  Fri Dec 11 00:32:33 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 11 Dec 2009 00:32:33 +0000 (UTC)
Subject: rpms/f2c/F-12 f2c.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091211003233.DFEDD11C025D@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/f2c/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11663

Modified Files:
	sources 
Added Files:
	f2c.spec 
Log Message:
initial version


--- NEW FILE f2c.spec ---
Name:           f2c
Summary:        A Fortran 77 to C/C++ conversion program
Version:        20090411
Release:        5%{?dist}
License:        MIT
Group:          Development/Languages
URL:            http://netlib.org/f2c/
Source:         ftp://netlib.org/f2c.tar
# Patch makefile to build a shared library
Patch:          f2c-20090411.patch
BuildRequires:  unzip
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires:       %{name}-libs = %{version}-%{release}
Provides:       %{name}-devel = %{version}-%{release}

%description
F2c converts Fortran 77 source code to C or C++ source files. If no
Fortran files are named on the command line, f2c can read Fortran from
standard input and write C to standard output.

%package libs
Summary:    Dynamic libraries from %{name}
Group:      Development/Libraries

%description libs
Dynamic libraries from %{name}.

%prep
%setup -q -n %{name}
mkdir libf2c
pushd libf2c
unzip ../libf2c.zip
popd
%patch

%build
cp src/makefile.u src/Makefile
cp libf2c/makefile.u libf2c/Makefile
make -C src %{?_smp_mflags} CFLAGS="%{optflags}" f2c
make -C libf2c %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"

%install
rm -rf %{buildroot}
install -D -p -m 644 f2c.h %{buildroot}%{_includedir}/f2c.h
install -D -p -m 755 src/f2c %{buildroot}%{_bindir}/f2c
install -D -p -m 644 src/f2c.1t %{buildroot}%{_mandir}/man1/f2c.1
install -D -p -m 755 libf2c/libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so.0.22
ln -s libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so.0
ln -s libf2c.so.0.22 %{buildroot}%{_libdir}/libf2c.so

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc f2c.ps f2c.pdf readme changes src/Notice src/README
%{_bindir}/f2c
%{_mandir}/man1/f2c.1*
%{_includedir}/f2c.h
%{_libdir}/libf2c.so

%files libs
%defattr(-,root,root,-)
%doc permission disclaimer
%{_libdir}/libf2c.so.*


%changelog
* Sun Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-5
- fully versioned provides

* Sat Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-4
- remove -devel subpackage, merge it into the main package which
  provides -devel and requires -libs.

* Sat Dec 05 2009 Carl Byington <carl at five-ten-sg.com> 20090411-3
- remove patch backups
- add comment for patch purpose

* Thu Dec 03 2009 Carl Byington <carl at five-ten-sg.com> 20090411-2
- add symlink to fix rpmlint error
- remove unnecessary parts of the patch, which enables building a
  shared library.
- main package now requires -devel since that is needed to be useful.
- summary changed to specify this only works on F77 code.
- %%files use explicit libf2c rather than * wildcard

* Wed Dec 02 2009 Carl Byington <carl at five-ten-sg.com> 20090411-1
- update to newer upstream version
- add .pdf documentation also
- trim changelog
- move all the license related files into -libs, and both the
  main package and -devel require -libs, to avoid either duplicating
  files or installing any package without the license files.

* Sun Nov 25 2009 Carl Byington <carl at five-ten-sg.com> 20031026-3.0.3
- don't install the static library.
- preserve the alpha architecture patch and ifdef in the spec file
  even if it is not used by fedora.
- split off -libs and -devel packages.
- full version/release in requires

* Wed Nov 25 2009 Carl Byington <carl at five-ten-sg.com> 20031026-3.0.2
- convert to fedora compatible spec file.

* Sat Jun 14 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 20031026-3.0.1
- Fix not utf-8 specfile entries.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f2c/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:23:44 -0000	1.1
+++ sources	11 Dec 2009 00:32:33 -0000	1.2
@@ -0,0 +1,2 @@
+77b46dbed05b97259085440bd93c003b  f2c.tar
+9a9d46f263d40cccb09670b6fc6428e3  f2c-20090411.patch



From kyle at fedoraproject.org  Fri Dec 11 01:31:48 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 11 Dec 2009 01:31:48 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-b390f944.patch, 1.1, 1.2 kernel.spec,
	1.1953, 1.1954 crypto-via-padlock-fix-nano-aes.patch, 1.1,
	NONE highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch, 1.1, 
	NONE highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch,
	1.1, NONE highmem-fix-arm-powerpc-kmap_types.patch, 1.1,
	NONE ipv4-fix-null-ptr-deref-in-ip_fragment.patch, 1.1, NONE
Message-ID: <20091211013148.B08B911C025D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27102

Modified Files:
	drm-next-b390f944.patch kernel.spec 
Removed Files:
	crypto-via-padlock-fix-nano-aes.patch 
	highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch 
	highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch 
	highmem-fix-arm-powerpc-kmap_types.patch 
	ipv4-fix-null-ptr-deref-in-ip_fragment.patch 
Log Message:
* Thu Dec 10 2009 Kyle McMartin <kyle at redhat.com>
- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: upstream.
- nuke highmem patches now in stable.
- crypto-via-padlock-fix-nano-aes.patch: upstream.
- fix up drm-next-$sha.patch


drm-next-b390f944.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  308 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  542 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 | 1030 
 b/drivers/gpu/drm/drm_gem.c                       |   13 
 b/drivers/gpu/drm/drm_mm.c                        |   30 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   65 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  139 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  608 
 b/drivers/gpu/drm/i915/intel_drv.h                |    9 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  748 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  239 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atom.c                   |    1 
 b/drivers/gpu/drm/radeon/atombios.h               |   13 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  366 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1768 +
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  714 
 b/drivers/gpu/drm/radeon/r200.c                   |  454 
 b/drivers/gpu/drm/radeon/r300.c                   |  985 
 b/drivers/gpu/drm/radeon/r300d.h                  |  306 
 b/drivers/gpu/drm/radeon/r420.c                   |  305 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r500_reg.h               |   12 
 b/drivers/gpu/drm/radeon/r520.c                   |  286 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1847 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  858 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  783 
 b/drivers/gpu/drm/radeon/r600d.h                  |  667 
 b/drivers/gpu/drm/radeon/radeon.h                 |  454 
 b/drivers/gpu/drm/radeon/radeon_agp.c             |   12 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  386 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  434 
 b/drivers/gpu/drm/radeon/radeon_benchmark.c       |    4 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   46 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   28 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |  717 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  751 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  104 
 b/drivers/gpu/drm/radeon/radeon_cursor.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  352 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  193 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  309 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  700 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |   29 
 b/drivers/gpu/drm/radeon/radeon_gem.c             |   10 
 b/drivers/gpu/drm/radeon/radeon_i2c.c             |  109 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |   16 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |  152 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  505 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |  170 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   28 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_pm.c              |   65 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |  126 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_test.c            |    6 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |  101 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs100d.h                 |   40 
 b/drivers/gpu/drm/radeon/rs400.c                  |  331 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  610 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  359 
 b/drivers/gpu/drm/radeon/rs690d.h                 |  307 
 b/drivers/gpu/drm/radeon/rv200d.h                 |   36 
 b/drivers/gpu/drm/radeon/rv250d.h                 |  123 
 b/drivers/gpu/drm/radeon/rv350d.h                 |   52 
 b/drivers/gpu/drm/radeon/rv515.c                  |  882 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1063 -
 b/drivers/gpu/drm/radeon/rv770d.h                 |  346 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    6 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  105 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |   10 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  111 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_pciids.h                        |    4 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs690r.h                   |   99 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 189 files changed, 42492 insertions(+), 44061 deletions(-)

Index: drm-next-b390f944.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-next-b390f944.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-next-b390f944.patch	1 Dec 2009 04:13:23 -0000	1.1
+++ drm-next-b390f944.patch	11 Dec 2009 01:31:47 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..e4d971c 100644
+index 012cf1f..bdcfedc 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
 @@ -18,6 +18,14 @@ menuconfig DRM
@@ -37,10 +37,10 @@ index 39b393d..e4d971c 100644
  	help
  	  Choose this option if you have an ATI Radeon graphics card.  There
  	  are both PCI and AGP versions.  You don't need to choose this to
-@@ -82,11 +92,10 @@ config DRM_I830
- config DRM_I915
+@@ -83,11 +93,10 @@ config DRM_I915
  	tristate "i915 driver"
  	depends on AGP_INTEL
+ 	select SHMEM
 +	select DRM_KMS_HELPER
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
@@ -50,7 +50,7 @@ index 39b393d..e4d971c 100644
  	# i915 depends on ACPI_VIDEO when ACPI is enabled
  	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
  	select VIDEO_OUTPUT_CONTROL if ACPI
-@@ -116,6 +125,7 @@ endchoice
+@@ -117,6 +126,7 @@ endchoice
  config DRM_MGA
  	tristate "Matrox g200/g400"
  	depends on DRM
@@ -986,7 +986,7 @@ index b39d7bf..a75ca63 100644
  	DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
  	DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_rmmap_ioctl, DRM_AUTH),
 diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
-index 7f2728b..b54ba63 100644
+index 55fb98d..6ce18a2 100644
 --- a/drivers/gpu/drm/drm_edid.c
 +++ b/drivers/gpu/drm/drm_edid.c
 @@ -60,6 +60,12 @@
@@ -1383,29 +1383,7 @@ index 7f2728b..b54ba63 100644
  	mode = drm_mode_create(dev);
  	if (!mode)
  		return NULL;
-@@ -333,6 +653,21 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
- 	mode->vsync_end = mode->vsync_start + vsync_pulse_width;
- 	mode->vtotal = mode->vdisplay + vblank;
- 
-+	/* perform the basic check for the detailed timing */
-+	if (mode->hsync_end > mode->htotal ||
-+		mode->vsync_end > mode->vtotal) {
-+		drm_mode_destroy(dev, mode);
-+		DRM_DEBUG_KMS("Incorrect detailed timing. "
-+				"Sync is beyond the blank.\n");
-+		return NULL;
-+	}
-+
-+	/* Some EDIDs have bogus h/vtotal values */
-+	if (mode->hsync_end > mode->htotal)
-+		mode->htotal = mode->hsync_end + 1;
-+	if (mode->vsync_end > mode->vtotal)
-+		mode->vtotal = mode->vsync_end + 1;
-+
- 	drm_mode_set_name(mode);
- 
- 	if (pt->misc & DRM_EDID_PT_INTERLACED)
-@@ -451,6 +786,19 @@ static int add_established_modes(struct drm_connector *connector, struct edid *e
+@@ -457,6 +777,19 @@ static int add_established_modes(struct drm_connector *connector, struct edid *e
  
  	return modes;
  }
@@ -1425,7 +1403,7 @@ index 7f2728b..b54ba63 100644
  
  /**
   * add_standard_modes - get std. modes from EDID and add them
-@@ -463,6 +811,9 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
+@@ -469,6 +802,9 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
  {
  	struct drm_device *dev = connector->dev;
  	int i, modes = 0;
@@ -1435,7 +1413,7 @@ index 7f2728b..b54ba63 100644
  
  	for (i = 0; i < EDID_STD_TIMINGS; i++) {
  		struct std_timing *t = &edid->standard_timings[i];
-@@ -472,7 +823,8 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
+@@ -478,7 +814,8 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
  		if (t->hsize == 1 && t->vfreq_aspect == 1)
  			continue;
  
@@ -1445,7 +1423,7 @@ index 7f2728b..b54ba63 100644
  		if (newmode) {
  			drm_mode_probed_add(connector, newmode);
  			modes++;
-@@ -496,6 +848,9 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -502,6 +839,9 @@ static int add_detailed_info(struct drm_connector *connector,
  {
  	struct drm_device *dev = connector->dev;
  	int i, j, modes = 0;
@@ -1455,7 +1433,7 @@ index 7f2728b..b54ba63 100644
  
  	for (i = 0; i < EDID_DETAILED_TIMINGS; i++) {
  		struct detailed_timing *timing = &edid->detailed_timings[i];
-@@ -519,13 +874,14 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -525,13 +865,14 @@ static int add_detailed_info(struct drm_connector *connector,
  			case EDID_DETAIL_MONITOR_CPDATA:
  				break;
  			case EDID_DETAIL_STD_MODES:
@@ -1473,7 +1451,7 @@ index 7f2728b..b54ba63 100644
  					if (newmode) {
  						drm_mode_probed_add(connector, newmode);
  						modes++;
-@@ -551,6 +907,124 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -557,6 +898,124 @@ static int add_detailed_info(struct drm_connector *connector,
  
  	return modes;
  }
@@ -1598,7 +1576,7 @@ index 7f2728b..b54ba63 100644
  
  #define DDC_ADDR 0x50
  /**
-@@ -584,7 +1058,6 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
+@@ -590,7 +1049,6 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
  	if (i2c_transfer(adapter, msgs, 2) == 2)
  		return 0;
  
@@ -1606,7 +1584,7 @@ index 7f2728b..b54ba63 100644
  	return -1;
  }
  EXPORT_SYMBOL(drm_do_probe_ddc_edid);
-@@ -597,8 +1070,6 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
+@@ -603,8 +1061,6 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
  
  	ret = drm_do_probe_ddc_edid(adapter, buf, len);
  	if (ret != 0) {
@@ -1615,7 +1593,7 @@ index 7f2728b..b54ba63 100644
  		goto end;
  	}
  	if (!edid_is_valid((struct edid *)buf)) {
-@@ -610,7 +1081,6 @@ end:
+@@ -616,7 +1072,6 @@ end:
  	return ret;
  }
  
@@ -1623,7 +1601,7 @@ index 7f2728b..b54ba63 100644
  /**
   * drm_get_edid - get EDID data, if available
   * @connector: connector we're probing
-@@ -763,6 +1233,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
+@@ -769,6 +1224,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
  	num_modes += add_established_modes(connector, edid);
  	num_modes += add_standard_modes(connector, edid);
  	num_modes += add_detailed_info(connector, edid, quirks);
@@ -1631,7 +1609,7 @@ index 7f2728b..b54ba63 100644
  
  	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
  		edid_fixup_preferred(connector, quirks);
-@@ -788,3 +1259,49 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
+@@ -794,3 +1250,49 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
  	return num_modes;
  }
  EXPORT_SYMBOL(drm_add_edid_modes);
@@ -4341,7 +4319,7 @@ index c078d99..e8cf18d 100644
  	.gem_init_object = i915_gem_init_object,
  	.gem_free_object = i915_gem_free_object,
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 5b4f87e..77ed060 100644
+index 88b3eff..e5f20e4 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -85,7 +85,6 @@ struct drm_i915_gem_phys_object {
@@ -4465,7 +4443,7 @@ index 5b4f87e..77ed060 100644
  extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  
  #define IS_I830(dev) ((dev)->pci_device == 0x3577)
-@@ -903,6 +912,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -905,6 +914,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  /* dsparb controlled by hw only */
  #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
  
@@ -5095,10 +5073,10 @@ index e774a4a..200e398 100644
  	}
  
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 7ebc84c..6c89f2f 100644
+index 9431a72..42c1709 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -565,6 +565,27 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -573,6 +573,27 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
  
  			I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
  			I915_READ(PORT_HOTPLUG_STAT);
@@ -5127,7 +5105,7 @@ index 7ebc84c..6c89f2f 100644
  
  		I915_WRITE(IIR, iir);
 diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index 106a1ae..268d272 100644
+index c017fa1..1cd645e 100644
 --- a/drivers/gpu/drm/i915/i915_reg.h
 +++ b/drivers/gpu/drm/i915/i915_reg.h
 @@ -55,7 +55,7 @@
@@ -5393,7 +5371,7 @@ index 5ae4c1a..212e227 100644
  
  static int intel_crt_mode_valid(struct drm_connector *connector,
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 8b5af29..a865af5 100644
+index 318ba47..4c28f17 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -38,6 +38,7 @@
@@ -5639,7 +5617,7 @@ index 8b5af29..a865af5 100644
  }
  
  static void intel_crtc_prepare (struct drm_crtc *crtc)
-@@ -2079,6 +2138,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
+@@ -2080,6 +2139,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
  	return size;
  }
  
@@ -5658,7 +5636,7 @@ index 8b5af29..a865af5 100644
  static void i965_update_wm(struct drm_device *dev)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -2130,7 +2201,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
+@@ -2131,7 +2202,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
  	cwm = 2;
  
  	/* Calc sr entries for one plane configs */
@@ -5668,7 +5646,7 @@ index 8b5af29..a865af5 100644
  		/* self-refresh has much higher latency */
  		const static int sr_latency_ns = 6000;
  
-@@ -2145,8 +2217,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
+@@ -2146,8 +2218,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
  		srwm = total_size - sr_entries;
  		if (srwm < 0)
  			srwm = 1;
@@ -5678,7 +5656,7 @@ index 8b5af29..a865af5 100644
  	}
  
  	DRM_DEBUG("Setting FIFO watermarks - A: %d, B: %d, C: %d, SR %d\n",
-@@ -2220,9 +2291,6 @@ static void intel_update_watermarks(struct drm_device *dev)
+@@ -2221,9 +2292,6 @@ static void intel_update_watermarks(struct drm_device *dev)
  	unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
  	int enabled = 0, pixel_size = 0;
  
@@ -5688,7 +5666,7 @@ index 8b5af29..a865af5 100644
  	/* Get the clock config from both planes */
  	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
  		intel_crtc = to_intel_crtc(crtc);
-@@ -2255,7 +2323,9 @@ static void intel_update_watermarks(struct drm_device *dev)
+@@ -2256,7 +2324,9 @@ static void intel_update_watermarks(struct drm_device *dev)
  	else if (IS_IGD(dev))
  		igd_disable_cxsr(dev);
  
@@ -5699,7 +5677,7 @@ index 8b5af29..a865af5 100644
  		i965_update_wm(dev);
  	else if (IS_I9XX(dev) || IS_MOBILE(dev))
  		i9xx_update_wm(dev, planea_clock, planeb_clock, sr_hdisplay,
-@@ -2289,9 +2359,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2290,9 +2360,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  	int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
  	int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
  	int refclk, num_outputs = 0;
@@ -5712,7 +5690,7 @@ index 8b5af29..a865af5 100644
  	bool is_crt = false, is_lvds = false, is_tv = false, is_dp = false;
  	bool is_edp = false;
  	struct drm_mode_config *mode_config = &dev->mode_config;
-@@ -2374,6 +2444,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2375,6 +2445,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  		return -EINVAL;
  	}
  
@@ -5727,8 +5705,8 @@ index 8b5af29..a865af5 100644
  	/* SDVO TV has fixed PLL values depend on its clock range,
  	   this mirrors vbios setting. */
  	if (is_sdvo && is_tv) {
-@@ -2419,10 +2497,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
- 				  link_bw, &m_n);
+@@ -2482,10 +2560,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+ 		}
  	}
  
 -	if (IS_IGD(dev))
@@ -5747,7 +5725,7 @@ index 8b5af29..a865af5 100644
  
  	if (!IS_IGDNG(dev))
  		dpll = DPLL_VGA_MODE_DIS;
-@@ -2451,6 +2536,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2514,6 +2599,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  			/* also FPA1 */
  			if (IS_IGDNG(dev))
  				dpll |= (1 << (clock.p1 - 1)) << DPLL_FPA1_P1_POST_DIV_SHIFT;
@@ -5756,7 +5734,7 @@ index 8b5af29..a865af5 100644
  		}
  		switch (clock.p2) {
  		case 5:
-@@ -2598,6 +2685,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2661,6 +2748,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  		udelay(150);
  	}
  
@@ -5779,7 +5757,7 @@ index 8b5af29..a865af5 100644
  	I915_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) |
  		   ((adjusted_mode->crtc_htotal - 1) << 16));
  	I915_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) |
-@@ -2800,10 +2903,16 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
+@@ -2863,10 +2966,16 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
  	struct drm_device *dev = crtc->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -5796,7 +5774,7 @@ index 8b5af29..a865af5 100644
  	if (x < 0) {
  		temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
  		x = -x;
-@@ -2834,6 +2943,16 @@ void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
+@@ -2897,6 +3006,16 @@ void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
  	intel_crtc->lut_b[regno] = blue >> 8;
  }
  
@@ -5813,7 +5791,7 @@ index 8b5af29..a865af5 100644
  static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
  				 u16 *blue, uint32_t size)
  {
-@@ -3101,12 +3220,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
+@@ -3164,12 +3283,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
  	return mode;
  }
  
@@ -6135,7 +6113,7 @@ index 8b5af29..a865af5 100644
  	drm_crtc_cleanup(crtc);
  	kfree(intel_crtc);
  }
-@@ -3118,6 +3544,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
+@@ -3181,6 +3607,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
  	.mode_set_base = intel_pipe_set_base,
  	.prepare = intel_crtc_prepare,
  	.commit = intel_crtc_commit,
@@ -6143,7 +6121,7 @@ index 8b5af29..a865af5 100644
  };
  
  static const struct drm_crtc_funcs intel_crtc_funcs = {
-@@ -3153,15 +3580,10 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+@@ -3216,15 +3643,10 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
  	intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
  	drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
  
@@ -6162,7 +6140,7 @@ index 8b5af29..a865af5 100644
  }
  
  int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
-@@ -3169,30 +3591,26 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
+@@ -3232,30 +3654,26 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data;
@@ -6201,7 +6179,7 @@ index 8b5af29..a865af5 100644
  }
  
  struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
-@@ -3393,8 +3811,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
+@@ -3456,8 +3874,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
  	.fb_changed = intelfb_probe,
  };
  
@@ -6258,7 +6236,7 @@ index 8b5af29..a865af5 100644
  	int num_pipe;
  	int i;
  
-@@ -3429,15 +3895,47 @@ void intel_modeset_init(struct drm_device *dev)
+@@ -3492,15 +3958,47 @@ void intel_modeset_init(struct drm_device *dev)
  	DRM_DEBUG("%d display pipe%s available.\n",
  		  num_pipe, num_pipe > 1 ? "s" : "");
  
@@ -6341,7 +6319,7 @@ index 26a6227..dcfc53c 100644
  extern int intel_framebuffer_create(struct drm_device *dev,
  				    struct drm_mode_fb_cmd *mode_cmd,
 diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
-index 1d30802..2b0fe54 100644
+index 75a9b83..2b0fe54 100644
 --- a/drivers/gpu/drm/i915/intel_fb.c
 +++ b/drivers/gpu/drm/i915/intel_fb.c
 @@ -39,339 +39,36 @@
@@ -6426,7 +6404,7 @@ index 1d30802..2b0fe54 100644
 -	struct drm_framebuffer *fb = &intel_fb->base;
 -	int depth;
 -
--	if (var->pixclock == -1 || !var->pixclock)
+-	if (var->pixclock != 0)
 -		return -EINVAL;
 -
 -	/* Need to resize the fb object !!! */
@@ -6517,7 +6495,7 @@ index 1d30802..2b0fe54 100644
 -
 -	DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
 -
--	if (var->pixclock != -1) {
+-	if (var->pixclock != 0) {
 -
 -		DRM_ERROR("PIXEL CLOCK SET\n");
 -		return -EINVAL;
@@ -6941,7 +6919,7 @@ index 1d30802..2b0fe54 100644
 -	par->crtc_count = 1;
 -
 -	if (new_fb) {
--		info->var.pixclock = -1;
+-		info->var.pixclock = 0;
 -		if (register_framebuffer(info) < 0)
 -			return -EINVAL;
 -	} else
@@ -7095,7 +7073,7 @@ index 1d30802..2b0fe54 100644
 -	par->crtc_count = crtc_count;
 -
 -	if (new_fb) {
--		info->var.pixclock = -1;
+-		info->var.pixclock = 0;
 -		if (register_framebuffer(info) < 0)
 -			return -EINVAL;
 -	} else
@@ -64808,7 +64786,7 @@ index 0000000..797972e
 +};
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
-index ec383ed..cb2f16a 100644
+index f1d6d3d..fc5101a 100644
 --- a/drivers/gpu/drm/radeon/radeon_fb.c
 +++ b/drivers/gpu/drm/radeon/radeon_fb.c
 @@ -28,15 +28,7 @@
@@ -64910,7 +64888,7 @@ index ec383ed..cb2f16a 100644
 -	struct drm_framebuffer *fb = &rfb->base;
 -	int depth;
 -
--	if (var->pixclock == -1 || !var->pixclock) {
+-	if (var->pixclock != 0) {
 -		return -EINVAL;
 -	}
 -	/* Need to resize the fb object !!! */
@@ -65024,7 +65002,7 @@ index ec383ed..cb2f16a 100644
 -	int ret;
 -	int i;
 -
--	if (var->pixclock != -1) {
+-	if (var->pixclock != 0) {
 -		DRM_ERROR("PIXEL CLCOK SET\n");
 -		return -EINVAL;
 -	}
@@ -65457,7 +65435,7 @@ index ec383ed..cb2f16a 100644
  	fb->fbdev = info;
  	rfbdev->rfb = rfb;
  	rfbdev->rdev = rdev;
-@@ -726,148 +303,33 @@ out:
+@@ -726,148 +303,34 @@ out:
  	return ret;
  }
  
@@ -65567,7 +65545,7 @@ index ec383ed..cb2f16a 100644
 -	rfbdev->crtc_count = crtc_count;
 -
 -	if (new_fb) {
--		info->var.pixclock = -1;
+-		info->var.pixclock = 0;
 -		if (register_framebuffer(info) < 0)
 -			return -EINVAL;
 -	} else {
@@ -65584,7 +65562,7 @@ index ec383ed..cb2f16a 100644
 -	panic_mode = *modeset;
 -	atomic_notifier_chain_register(&panic_notifier_list, &paniced);
 -	printk(KERN_INFO "registered panic notifier\n");
--
+ 
  	return 0;
  }
  
@@ -65622,7 +65600,7 @@ index ec383ed..cb2f16a 100644
  
  int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
  {
-@@ -880,16 +342,17 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
+@@ -880,16 +343,17 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
  	}
  	info = fb->fbdev;
  	if (info) {
@@ -95950,7 +95928,7 @@ index ae304cc..1f90841 100644
  struct drm_mode_get_connector {
  
 diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
-index 8535084..923361b 100644
+index 3f6e545..e6f3b12 100644
 --- a/include/drm/drm_pciids.h
 +++ b/include/drm/drm_pciids.h
 @@ -80,7 +80,7 @@


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1953
retrieving revision 1.1954
diff -u -p -r1.1953 -r1.1954
--- kernel.spec	11 Dec 2009 00:24:05 -0000	1.1953
+++ kernel.spec	11 Dec 2009 01:31:47 -0000	1.1954
@@ -793,8 +793,6 @@ Patch14101: improve-resource-counter-sca
 Patch14420: perf-events-fix-swevent-hrtimer-sampling.patch
 Patch14421: perf-events-dont-generate-events-for-the-idle-task.patch
 
-Patch14430: crypto-via-padlock-fix-nano-aes.patch
-
 # tg3 fixes (#527209)
 Patch14451: tg3-01-delay-mdio-bus-init-until-fw-finishes.patch
 Patch14452: tg3-02-fix-tso-test-against-wrong-flags-var.patch
@@ -803,15 +801,8 @@ Patch14454: tg3-04-prevent-tx-bd-corrupt
 Patch14455: tg3-05-assign-flags-to-fixes-in-start_xmit_dma_bug.patch
 Patch14456: tg3-06-fix-5906-transmit-hangs.patch
 
-Patch14460: highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
-Patch14461: highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
-Patch14462: highmem-fix-arm-powerpc-kmap_types.patch
-
 Patch14463: dlm-fix-connection-close-handling.patch
 
-# rhbz#544144 [bbf31bf18d34caa87dd01f08bf713635593697f2]
-Patch14464: ipv4-fix-null-ptr-deref-in-ip_fragment.patch
-
 # rhbz#544471
 Patch14465: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
 
@@ -1492,9 +1483,6 @@ ApplyPatch improve-resource-counter-scal
 ApplyPatch perf-events-fix-swevent-hrtimer-sampling.patch
 ApplyPatch perf-events-dont-generate-events-for-the-idle-task.patch
 
-# Fix oops in padlock
-ApplyPatch crypto-via-padlock-fix-nano-aes.patch
-
 # tg3 fixes (#527209)
 ApplyPatch tg3-01-delay-mdio-bus-init-until-fw-finishes.patch
 ApplyPatch tg3-02-fix-tso-test-against-wrong-flags-var.patch
@@ -1512,15 +1500,8 @@ ApplyPatch sched-retune-scheduler-latenc
 # fix wakeup latency
 ApplyPatch sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
 
-ApplyPatch highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
-ApplyPatch highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
-ApplyPatch highmem-fix-arm-powerpc-kmap_types.patch
-
 ApplyPatch dlm-fix-connection-close-handling.patch
 
-# rhbz#544144
-ApplyPatch ipv4-fix-null-ptr-deref-in-ip_fragment.patch
-
 # rhbz#544471
 ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
 
@@ -2173,6 +2154,12 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 10 2009 Kyle McMartin <kyle at redhat.com>
+- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: upstream.
+- nuke highmem patches now in stable.
+- crypto-via-padlock-fix-nano-aes.patch: upstream.
+- fix up drm-next-$sha.patch
+
 * Wed Dec 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.6-167
 - Linux 2.6.31.7
 - NOTE: drm patch still needs fixing.


--- crypto-via-padlock-fix-nano-aes.patch DELETED ---


--- highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch DELETED ---


--- highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch DELETED ---


--- highmem-fix-arm-powerpc-kmap_types.patch DELETED ---


--- ipv4-fix-null-ptr-deref-in-ip_fragment.patch DELETED ---



From nb at fedoraproject.org  Fri Dec 11 01:35:08 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 11 Dec 2009 01:35:08 +0000 (UTC)
Subject: File znc-0.078-beta1.tar.gz uploaded to lookaside cache by nb
Message-ID: <20091211013508.F004610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for znc:

a2cb09e3e57b7fcf1c5e9dbc8577e827  znc-0.078-beta1.tar.gz



From pkgdb at fedoraproject.org  Fri Dec 11 01:45:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 01:45:20 +0000
Subject: [pkgdb] kernel: krh has given up watchcommits
Message-ID: <20091211014521.09F1E10F890@bastion2.fedora.phx.redhat.com>

krh 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 pkgdb at fedoraproject.org  Fri Dec 11 01:45:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 01:45:24 +0000
Subject: [pkgdb] kernel: krh has given up watchcommits
Message-ID: <20091211014525.1492310F89C@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on kernel (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Fri Dec 11 01:45:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 01:45:27 +0000
Subject: [pkgdb] kernel: krh has given up watchcommits
Message-ID: <20091211014527.546F610F89A@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on kernel (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Fri Dec 11 01:45:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 01:45:29 +0000
Subject: [pkgdb] kernel: krh has given up watchcommits
Message-ID: <20091211014529.4C23510F89C@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on kernel (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Fri Dec 11 01:45:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 01:45:32 +0000
Subject: [pkgdb] kernel: krh has given up watchcommits
Message-ID: <20091211014532.6E26B10F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on kernel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Fri Dec 11 01:45:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 01:45:36 +0000
Subject: [pkgdb] kernel: krh has given up watchcommits
Message-ID: <20091211014536.745E610F89D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on kernel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Fri Dec 11 01:45:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 01:45:39 +0000
Subject: [pkgdb] kernel: krh has given up watchcommits
Message-ID: <20091211014539.A9EB210F881@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on kernel (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Fri Dec 11 01:45:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 01:45:41 +0000
Subject: [pkgdb] kernel: krh has given up watchcommits
Message-ID: <20091211014541.E7D4910F881@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on kernel (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From rdieter at fedoraproject.org  Fri Dec 11 02:50:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 02:50:05 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.83,1.84
Message-ID: <20091211025005.6BE5911C03FC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15043

Modified Files:
	k3b.spec 
Log Message:
* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.69.0-2
- fix %post scriptlet



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- k3b.spec	10 Dec 2009 16:54:59 -0000	1.83
+++ k3b.spec	11 Dec 2009 02:50:05 -0000	1.84
@@ -11,7 +11,7 @@ Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   1
 Version: 1.69.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -122,6 +122,7 @@ rm -rf %{buildroot}
 
 %postun libs -p /sbin/ldconfig
 
+%post %{?common:common}
 touch --no-create %{_datadir}/icons/hicolor ||:
 
 %postun %{?common:common}
@@ -170,6 +171,9 @@ update-mime-database %{_kde4_datadir}/mi
 
 
 %changelog
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.69.0-2
+- fix %%post scriptlet
+
 * Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.69.0-1
 - k3b-1.69.0 (alpha4)
 



From olea at fedoraproject.org  Fri Dec 11 02:59:02 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Fri, 11 Dec 2009 02:59:02 +0000 (UTC)
Subject: rpms/chronojump/F-10 chronojump.spec,1.2,1.3 import.log,1.2,1.3
Message-ID: <20091211025902.D842311C025D@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17237/F-10

Modified Files:
	chronojump.spec import.log 
Log Message:
excluding ppc archs


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/chronojump.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chronojump.spec	10 Dec 2009 23:30:28 -0000	1.2
+++ chronojump.spec	11 Dec 2009 02:59:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           chronojump
 Version:        0.8.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering
@@ -12,6 +12,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  pkgconfig mono-data-sqlite gtk-sharp2 gtk-sharp2-devel desktop-file-utils gettext mono-devel
 Requires:       R-core hicolor-icon-theme
 
+ExcludeArch:    ppc64
+ExcludeArch:    ppc
+
+
 %description
 ChronoJump is an open hardware, free software, multiplatform complete system
 for measurement, management and statistics of sport short-time tests.
@@ -107,7 +111,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
-* Fri Dec 11 2009 <ismael at olea.org> - 0.8.13-1
+* Fri Dec 11 2009 Ismael Olea <ismael at olea.org> - 0.8.13-2
+- ExcludeArch: ppc64
+- ExcludeArch: ppc
+
+* Fri Dec 11 2009 Ismael Olea <ismael at olea.org> - 0.8.13-1
 - update to 0.8.13
 
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.11-3


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Dec 2009 23:30:28 -0000	1.2
+++ import.log	11 Dec 2009 02:59:02 -0000	1.3
@@ -1,2 +1,3 @@
 chronojump-0_8_11-2_olea:F-10:chronojump-0.8.11-2.olea.src.rpm:1254871407
 chronojump-0_8_13-1_olea:F-10:chronojump-0.8.13-1.olea.src.rpm:1260487789
+chronojump-0_8_13-2_olea:F-10:chronojump-0.8.13-2.olea.src.rpm:1260496498



From phuang at fedoraproject.org  Fri Dec 11 04:08:19 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 11 Dec 2009 04:08:19 +0000 (UTC)
Subject: File pinyin-database-1.2.99.tar.bz2 uploaded to lookaside cache by
	phuang
Message-ID: <20091211040819.2C19A10F89A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ibus-pinyin:

d0951b8daa7f56a2cbd3b6b4e42532e0  pinyin-database-1.2.99.tar.bz2



From phuang at fedoraproject.org  Fri Dec 11 04:08:44 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 11 Dec 2009 04:08:44 +0000 (UTC)
Subject: File ibus-pinyin-1.2.99.20091211.tar.gz uploaded to lookaside cache
	by phuang
Message-ID: <20091211040844.7180310F89D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ibus-pinyin:

39a54576c9fe24b6af294719e4a0a75c  ibus-pinyin-1.2.99.20091211.tar.gz



From deji at fedoraproject.org  Fri Dec 11 04:11:29 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 11 Dec 2009 04:11:29 +0000 (UTC)
Subject: rpms/blacs/F-12 blacs.spec,1.36,1.37
Message-ID: <20091211041129.4870711C03E3@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/blacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28827

Modified Files:
	blacs.spec 
Log Message:
* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-34.3
- Properly obsolete lam sub-package.



Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/F-12/blacs.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- blacs.spec	10 Dec 2009 19:47:22 -0000	1.36
+++ blacs.spec	11 Dec 2009 04:11:28 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 34%{?dist}.2
+Release: 34%{?dist}.3
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -55,7 +55,7 @@ Requires: %{name}-common = %{version}-%{
 Requires: environment-modules
 # This is a dirty lie, but something needs to reap these dead subpackages.
 Provides: blacs-lam = %{version}-%{release}
-Obsoletes: blacs-lam <= 1.1-33
+Obsoletes: blacs-lam < 1.1-34
 
 %description mpich2
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -75,7 +75,7 @@ Summary: Development libraries for blacs
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
 Provides: blacs-lam-devel = %{version}-%{release}
-Obsoletes: blacs-lam-devel <= 1.1-33
+Obsoletes: blacs-lam-devel < 1.1-34
 
 %description mpich2-devel
 This package contains development libraries for blacs, compiled against mpich2.
@@ -84,7 +84,7 @@ This package contains development librar
 Summary: Static libraries for blacs (mpich2)
 Group: Development/Libraries
 Provides: blacs-lam-static = %{version}-%{release}
-Obsoletes: blacs-lam-static <= 1.1-33
+Obsoletes: blacs-lam-static < 1.1-34
 
 %description mpich2-static
 This package contains static libraries for blacs, compiled against mpich2.
@@ -241,6 +241,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/blacs-openmpi/*.a
 
 %changelog
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-34.3
+- Properly obsolete lam sub-package.
+
 * Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-34.2
 - mpich2 and openmpi macros can now be removed
 - Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1



From petersen at fedoraproject.org  Fri Dec 11 05:23:40 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Dec 2009 05:23:40 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.114,1.115
Message-ID: <20091211052341.304A811C00C5@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16124

Modified Files:
	comps-f13.xml.in 
Log Message:
make m17n-db-korean optional again since libhangul/ibus-hangul now support romaja input


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- comps-f13.xml.in	8 Dec 2009 13:03:04 -0000	1.114
+++ comps-f13.xml.in	11 Dec 2009 05:23:39 -0000	1.115
@@ -3924,7 +3924,6 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ko</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ko</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ko_KR</packagereq>
-      <packagereq type="conditional" requires="m17n-db">m17n-db-korean</packagereq>
       <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="default">un-core-batang-fonts</packagereq>
       <packagereq type="default">un-core-dinaru-fonts</packagereq>
@@ -3938,6 +3937,7 @@
       <packagereq type="optional">baekmuk-ttf-gulim-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-hline-fonts</packagereq>
       <packagereq type="optional">lv</packagereq>
+      <packagereq type="optional">m17n-db-korean</packagereq>
       <packagereq type="optional">nabi</packagereq>
       <packagereq type="optional">un-extra-fonts-bom</packagereq>
       <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>



From phuang at fedoraproject.org  Fri Dec 11 05:48:00 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 11 Dec 2009 05:48:00 +0000 (UTC)
Subject: rpms/ibus-pinyin/devel .cvsignore, 1.16, 1.17 ibus-pinyin.spec, 1.19,
	1.20 sources, 1.16, 1.17
Message-ID: <20091211054800.CCF2E11C00C5@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-pinyin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22753

Modified Files:
	.cvsignore ibus-pinyin.spec sources 
Log Message:
Update to 1.2.99.20091211


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	15 Sep 2009 05:49:16 -0000	1.16
+++ .cvsignore	11 Dec 2009 05:47:59 -0000	1.17
@@ -1,2 +1,2 @@
-pinyin-database-0.1.10.6.tar.bz2
-ibus-pinyin-1.2.0.20090915.tar.gz
+pinyin-database-1.2.99.tar.bz2
+ibus-pinyin-1.2.99.20091211.tar.gz


Index: ibus-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/ibus-pinyin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ibus-pinyin.spec	10 Dec 2009 11:31:55 -0000	1.19
+++ ibus-pinyin.spec	11 Dec 2009 05:47:59 -0000	1.20
@@ -1,40 +1,50 @@
-%define reqiure_ibus_version 1.2.0
-
 Name:       ibus-pinyin
-Version:    1.2.0.20090915
-Release:    2%{?dist}
-Summary:    The PinYin engine for IBus platform
+Version:    1.2.99.20091211
+Release:    1%{?dist}
+Summary:    The Chinese Pinyin engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
-URL:        http://code.google.com/p/ibus/
+URL:        http://code.google.com/p/ibus
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    http://ibus.googlecode.com/files/pinyin-database-0.1.10.6.tar.bz2
-# Patch0:     ibus-pinyin-HEAD.patch
+Source1:    http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:  noarch
 
 BuildRequires:  gettext-devel
+BuildRequires:  intltool
+BuildRequires:  libtool
+BuildRequires:  pkgconfig
+BuildRequires:  sqlite-devel
+BuildRequires:  libuuid-devel
+BuildRequires:  ibus-devel >= 1.2.0
+
+# Requires(post): sqlite
 
-Requires:   ibus >= %{reqiure_ibus_version}
-Requires:   python-enchant
+Requires:   ibus >= 1.2.0
 
 %description
-PinYin engine for IBus platform. It provides a Chinese PinYin input method.
+The Chinese Pinyin input method for IBus platform.
+
+%package    open-phrase
+Summary:    The open phrase database for ibus Pinyin
+Group:      System Environment/Libraries
+Requires(post): sqlite
+
+%description open-phrase
+The open phrase database for ibus Pinyin engine.
 
 %prep
 %setup -q
-cp %{SOURCE1} engine
-# %patch0 -p1
+cp %{SOURCE1} data/db/open-phrase
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-db-open-phrase
 # make -C po update-gmo
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
+make DESTDIR=${RPM_BUILD_ROOT} install
 
 %find_lang %{name}
 
@@ -42,18 +52,33 @@ make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=
 rm -rf $RPM_BUILD_ROOT
 
 %post
-cd /usr/share/ibus-pinyin/engine
-python -c "import pysqlitedb; db = pysqlitedb.PYSQLiteDB (); db.create_indexes ();" >/dev/null
+# cd %{_datadir}/ibus-pinyin/db
+# sqlite3 android.db ".read create_index.sql"
+
+%post open-phrase
+# cd %{_datadir}/ibus-pinyin/db
+# sqlite3 open-phrase.db ".read create_index.sql"
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_datadir}/ibus-pinyin
-%{_datadir}/ibus/component/*
 %{_libexecdir}/ibus-engine-pinyin
 %{_libexecdir}/ibus-setup-pinyin
+%{_datadir}/ibus-pinyin/icons
+%{_datadir}/ibus-pinyin/setup
+%{_datadir}/ibus-pinyin/db/create_index.sql
+%{_datadir}/ibus-pinyin/db/android.db
+%dir %{_datadir}/ibus-pinyin
+%dir %{_datadir}/ibus-pinyin/db
+%{_datadir}/ibus/component/*
+
+%files open-phrase
+%{_datadir}/ibus-pinyin/db/open-phrase.db
 
 %changelog
+* Fri Dec 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.99.20091211-1
+- Update to 1.2.99.20091211-1
+
 * Thu Dec 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090915-2
 - Correct pinyin database download location.
 
@@ -104,13 +129,4 @@ python -c "import pysqlitedb; db = pysql
 - Update version to 0.1.1.20080901.
 
 * Sat Aug 23 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
-- Update version to 0.1.1.20080823.
-
-* Fri Aug 15 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080815-1
-- Update version to 0.1.1.20080815.
-
-* Thu Aug 12 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20080812-1
-- Update version to 0.1.1.20080812.
-
-* Sun Aug 10 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.0.20080810-1
 - The first version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-pinyin/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	15 Sep 2009 05:49:16 -0000	1.16
+++ sources	11 Dec 2009 05:47:59 -0000	1.17
@@ -1,2 +1,2 @@
-ebd8d2381993372bb97a877b549e14a0  pinyin-database-0.1.10.6.tar.bz2
-97b3c95280bec6a56c587d12158139a2  ibus-pinyin-1.2.0.20090915.tar.gz
+d0951b8daa7f56a2cbd3b6b4e42532e0  pinyin-database-1.2.99.tar.bz2
+39a54576c9fe24b6af294719e4a0a75c  ibus-pinyin-1.2.99.20091211.tar.gz



From phuang at fedoraproject.org  Fri Dec 11 06:02:28 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 11 Dec 2009 06:02:28 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.115,1.116
Message-ID: <20091211060228.56C6811C00C5@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368

Modified Files:
	comps-f13.xml.in 
Log Message:
Add subpackage ibus-pinyin-open-phrase of ibus-pinyin


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- comps-f13.xml.in	11 Dec 2009 05:23:39 -0000	1.115
+++ comps-f13.xml.in	11 Dec 2009 06:02:26 -0000	1.116
@@ -668,6 +668,7 @@
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh_TW</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-chewing</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-pinyin</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-pinyin-open-phrase</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Chinese</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Chinese-Big5</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Chinese</packagereq>
@@ -3247,6 +3248,7 @@
       <packagereq type="default">ibus-hangul</packagereq>
       <packagereq type="default">ibus-m17n</packagereq>
       <packagereq type="default">ibus-pinyin</packagereq>
+      <packagereq type="default">ibus-pinyin-open-phrase</packagereq>
       <packagereq type="default">ibus-rawcode</packagereq>
       <packagereq type="default">im-chooser</packagereq>
       <packagereq type="default">imsettings</packagereq>



From pkgdb at fedoraproject.org  Fri Dec 11 06:14:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 06:14:17 +0000
Subject: [pkgdb] webkitgtk: maxamillion has requested commit
Message-ID: <20091211061417.A599E10F890@bastion2.fedora.phx.redhat.com>

maxamillion has requested the commit acl on webkitgtk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From pkgdb at fedoraproject.org  Fri Dec 11 06:14:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 06:14:25 +0000
Subject: [pkgdb] webkitgtk: maxamillion has requested commit
Message-ID: <20091211061425.B4C8510F890@bastion2.fedora.phx.redhat.com>

maxamillion has requested the commit acl on webkitgtk (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From pkgdb at fedoraproject.org  Fri Dec 11 06:14:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 06:14:29 +0000
Subject: [pkgdb] webkitgtk: maxamillion has requested commit
Message-ID: <20091211061429.38A6210F890@bastion2.fedora.phx.redhat.com>

maxamillion has requested the commit acl on webkitgtk (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From mtasaka at fedoraproject.org  Fri Dec 11 06:17:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 11 Dec 2009 06:17:41 +0000 (UTC)
Subject: File jd-2.5.5-svn3244_trunk.tgz uploaded to lookaside cache by
	mtasaka
Message-ID: <20091211061741.B97F810F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for jd:

af5645c4ad483665036b52ad7bdda93e  jd-2.5.5-svn3244_trunk.tgz



From mtasaka at fedoraproject.org  Fri Dec 11 06:17:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 11 Dec 2009 06:17:58 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore,1.403,1.404 sources,1.404,1.405
Message-ID: <20091211061758.DA04E11C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30523

Modified Files:
	.cvsignore sources 
Log Message:
fix source


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- .cvsignore	10 Dec 2009 18:54:45 -0000	1.403
+++ .cvsignore	11 Dec 2009 06:17:57 -0000	1.404
@@ -1 +1 @@
-jd-2.5.5.svn3244_trunk.tgz
+jd-2.5.5-svn3244_trunk.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- sources	10 Dec 2009 18:54:45 -0000	1.404
+++ sources	11 Dec 2009 06:17:57 -0000	1.405
@@ -1 +1 @@
-8da5f14bc3437fababbaa4e65693fc36  jd-2.5.5.svn3244_trunk.tgz
+af5645c4ad483665036b52ad7bdda93e  jd-2.5.5-svn3244_trunk.tgz



From phuang at fedoraproject.org  Fri Dec 11 06:22:27 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 11 Dec 2009 06:22:27 +0000 (UTC)
Subject: File ibus-hangul-1.2.0.20091031.tar.gz uploaded to lookaside cache
	by phuang
Message-ID: <20091211062227.DC50510F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ibus-hangul:

558ae72f64d520835855a8dfe3ecd1f4  ibus-hangul-1.2.0.20091031.tar.gz



From mtasaka at fedoraproject.org  Fri Dec 11 06:34:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 11 Dec 2009 06:34:27 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.413, 1.414 jd.spec, 1.477, 1.478 sources,
	1.414, 1.415
Message-ID: <20091211063427.E204D11C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2591

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
rev 3244


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- .cvsignore	6 Dec 2009 14:48:29 -0000	1.413
+++ .cvsignore	11 Dec 2009 06:34:26 -0000	1.414
@@ -1 +1 @@
-jd-2.5.0-091206.tgz
+jd-2.5.5-svn3244_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -p -r1.477 -r1.478
--- jd.spec	6 Dec 2009 14:48:29 -0000	1.477
+++ jd.spec	11 Dec 2009 06:34:26 -0000	1.478
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.5.0
-%define         strtag        091206
+%define         main_ver      2.5.5
+%define         strtag        svn3244_trunk
 %define         repoid        44788
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3244
+
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- sources	6 Dec 2009 14:48:29 -0000	1.414
+++ sources	11 Dec 2009 06:34:26 -0000	1.415
@@ -1 +1 @@
-a9775428a2b33c471ca60cf56bae6c5c  jd-2.5.0-091206.tgz
+af5645c4ad483665036b52ad7bdda93e  jd-2.5.5-svn3244_trunk.tgz



From mtasaka at fedoraproject.org  Fri Dec 11 06:35:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 11 Dec 2009 06:35:01 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.413, 1.414 jd.spec, 1.476, 1.477 sources,
	1.414, 1.415
Message-ID: <20091211063501.6D44D11C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2857

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
rev 3244


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- .cvsignore	6 Dec 2009 14:48:28 -0000	1.413
+++ .cvsignore	11 Dec 2009 06:35:00 -0000	1.414
@@ -1 +1 @@
-jd-2.5.0-091206.tgz
+jd-2.5.5-svn3244_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -p -r1.476 -r1.477
--- jd.spec	6 Dec 2009 14:48:28 -0000	1.476
+++ jd.spec	11 Dec 2009 06:35:01 -0000	1.477
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.5.0
-%define         strtag        091206
+%define         main_ver      2.5.5
+%define         strtag        svn3244_trunk
 %define         repoid        44788
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3244
+
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- sources	6 Dec 2009 14:48:29 -0000	1.414
+++ sources	11 Dec 2009 06:35:01 -0000	1.415
@@ -1 +1 @@
-a9775428a2b33c471ca60cf56bae6c5c  jd-2.5.0-091206.tgz
+af5645c4ad483665036b52ad7bdda93e  jd-2.5.5-svn3244_trunk.tgz



From whot at fedoraproject.org  Fri Dec 11 06:40:47 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 11 Dec 2009 06:40:47 +0000 (UTC)
Subject: File xf86-input-evdev-2.3.2.tar.bz2 uploaded to lookaside cache by
	whot
Message-ID: <20091211064047.E384510F89A@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xorg-x11-drv-evdev:

b2bfe368022eedf2671ee28daba31efc  xf86-input-evdev-2.3.2.tar.bz2



From pravins at fedoraproject.org  Fri Dec 11 06:47:23 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Dec 2009 06:47:23 +0000 (UTC)
Subject: rpms/ibus-rawcode/F-12 bug-546521.patch, NONE, 1.1 ibus-rawcode.spec,
	1.5, 1.6
Message-ID: <20091211064724.2942011C00C5@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/ibus-rawcode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6364

Modified Files:
	ibus-rawcode.spec 
Added Files:
	bug-546521.patch 
Log Message:
* Fri Dec 11 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -4
- resolved bug 546521


bug-546521.patch:
 engine.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE bug-546521.patch ---
diff -rup ibus-rawcode-1.2.0.20090703/src/engine.c ibus-rawcode-1.2.0.20090703_mod/src/engine.c
--- ibus-rawcode-1.2.0.20090703/src/engine.c	2009-07-03 10:58:00.000000000 +0530
+++ ibus-rawcode-1.2.0.20090703_mod/src/engine.c	2009-12-11 12:11:53.000000000 +0530
@@ -273,7 +273,7 @@ ibus_rawcode_engine_process_key_event (I
     }
 
   if(keyval==IBUS_Up) {
-	if(rawcode->table) {
+	if(rawcode->table->candidates->len != 0) {
 //                g_debug("print len %d", rawcode->table->len);
 		ibus_lookup_table_cursor_up(rawcode->table);
 	        ibus_engine_update_lookup_table ((IBusEngine *)rawcode, rawcode->table, TRUE);
@@ -283,7 +283,7 @@ ibus_rawcode_engine_process_key_event (I
   
 
   if(keyval==IBUS_Down) {
-	if(rawcode->table) {
+	if(rawcode->table->candidates->len != 0) {
 		ibus_lookup_table_cursor_down(rawcode->table);
 	        ibus_engine_update_lookup_table ((IBusEngine *)rawcode, rawcode->table, TRUE);
 		return TRUE;
@@ -291,7 +291,7 @@ ibus_rawcode_engine_process_key_event (I
    }
 
   if(keyval==IBUS_Return) {
-	if(rawcode->table) {
+	if(rawcode->table->candidates->len != 0) {
 	        IBusText *text;
 		text = ibus_lookup_table_get_candidate(rawcode->table, rawcode->table->cursor_pos);
 		ibus_engine_commit_text ((IBusEngine *)rawcode, text);
@@ -303,7 +303,7 @@ ibus_rawcode_engine_process_key_event (I
 		ibus_engine_update_preedit_text ((IBusEngine *)rawcode, text, 0, FALSE);
 		g_object_unref (text);
 
-	       return FALSE;
+	       return TRUE;
 	}
   }
 


Index: ibus-rawcode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-rawcode/F-12/ibus-rawcode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ibus-rawcode.spec	17 Nov 2009 06:38:01 -0000	1.5
+++ ibus-rawcode.spec	11 Dec 2009 06:47:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       ibus-rawcode
 Version:    1.2.0.20090703
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    The Rawcode engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -15,7 +15,8 @@ BuildRequires:  pkgconfig
 BuildRequires:  ibus-devel
 
 Requires:   ibus
-Patch1: bug-531989.patch 
+Patch1: bug-531989.patch
+Patch2: bug-546521.patch 
 
 %description
 The Rawcode engine for IBus platform.
@@ -23,6 +24,7 @@ The Rawcode engine for IBus platform.
 %prep
 %setup -q
 %patch1 -p1 -b .1-crash-resolve 
+%patch2 -p1 -b .2-handled-up-down-key
 
 %build
 %configure --disable-static
@@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Dec 11 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -4
+- resolved bug 546521
+
 * Tue Nov 17 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -3
 - resolved bug 531989
 



From pravins at fedoraproject.org  Fri Dec 11 06:49:28 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri, 11 Dec 2009 06:49:28 +0000 (UTC)
Subject: rpms/ibus-rawcode/devel bug-546521.patch, NONE,
	1.1 ibus-rawcode.spec, 1.5, 1.6
Message-ID: <20091211064928.CF22B11C00C5@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/ibus-rawcode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6989

Modified Files:
	ibus-rawcode.spec 
Added Files:
	bug-546521.patch 
Log Message:
* Fri Dec 11 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -4
- resolved bug 546521


bug-546521.patch:
 engine.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE bug-546521.patch ---
diff -rup ibus-rawcode-1.2.0.20090703/src/engine.c ibus-rawcode-1.2.0.20090703_mod/src/engine.c
--- ibus-rawcode-1.2.0.20090703/src/engine.c	2009-07-03 10:58:00.000000000 +0530
+++ ibus-rawcode-1.2.0.20090703_mod/src/engine.c	2009-12-11 12:11:53.000000000 +0530
@@ -273,7 +273,7 @@ ibus_rawcode_engine_process_key_event (I
     }
 
   if(keyval==IBUS_Up) {
-	if(rawcode->table) {
+	if(rawcode->table->candidates->len != 0) {
 //                g_debug("print len %d", rawcode->table->len);
 		ibus_lookup_table_cursor_up(rawcode->table);
 	        ibus_engine_update_lookup_table ((IBusEngine *)rawcode, rawcode->table, TRUE);
@@ -283,7 +283,7 @@ ibus_rawcode_engine_process_key_event (I
   
 
   if(keyval==IBUS_Down) {
-	if(rawcode->table) {
+	if(rawcode->table->candidates->len != 0) {
 		ibus_lookup_table_cursor_down(rawcode->table);
 	        ibus_engine_update_lookup_table ((IBusEngine *)rawcode, rawcode->table, TRUE);
 		return TRUE;
@@ -291,7 +291,7 @@ ibus_rawcode_engine_process_key_event (I
    }
 
   if(keyval==IBUS_Return) {
-	if(rawcode->table) {
+	if(rawcode->table->candidates->len != 0) {
 	        IBusText *text;
 		text = ibus_lookup_table_get_candidate(rawcode->table, rawcode->table->cursor_pos);
 		ibus_engine_commit_text ((IBusEngine *)rawcode, text);
@@ -303,7 +303,7 @@ ibus_rawcode_engine_process_key_event (I
 		ibus_engine_update_preedit_text ((IBusEngine *)rawcode, text, 0, FALSE);
 		g_object_unref (text);
 
-	       return FALSE;
+	       return TRUE;
 	}
   }
 


Index: ibus-rawcode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-rawcode/devel/ibus-rawcode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ibus-rawcode.spec	17 Nov 2009 06:45:57 -0000	1.5
+++ ibus-rawcode.spec	11 Dec 2009 06:49:28 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       ibus-rawcode
 Version:    1.2.0.20090703
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    The Rawcode engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -15,7 +15,8 @@ BuildRequires:  pkgconfig
 BuildRequires:  ibus-devel
 
 Requires:   ibus
-Patch1: bug-531989.patch 
+Patch1: bug-531989.patch
+Patch2: bug-546521.patch 
 
 %description
 The Rawcode engine for IBus platform.
@@ -23,6 +24,7 @@ The Rawcode engine for IBus platform.
 %prep
 %setup -q
 %patch1 -p1 -b .1-crash-resolve 
+%patch2 -p1 -b .2-handled-up-down-key
 
 %build
 %configure --disable-static
@@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Dec 11 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -4
+- resolved bug 546521
+
 * Tue Nov 17 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -3
 - resolved bug 531989
 



From phuang at fedoraproject.org  Fri Dec 11 06:56:09 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 11 Dec 2009 06:56:09 +0000 (UTC)
Subject: rpms/ibus-hangul/devel .cvsignore, 1.8, 1.9 ibus-hangul.spec, 1.11, 
	1.12 sources, 1.8, 1.9
Message-ID: <20091211065609.B8DDB11C00C5@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-hangul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8838

Modified Files:
	.cvsignore ibus-hangul.spec sources 
Log Message:
Update to 1.2.0.20091031


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	22 Jun 2009 05:24:45 -0000	1.8
+++ .cvsignore	11 Dec 2009 06:56:09 -0000	1.9
@@ -1 +1 @@
-ibus-hangul-1.2.0.20090617.tar.gz
+ibus-hangul-1.2.0.20091031.tar.gz


Index: ibus-hangul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/devel/ibus-hangul.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ibus-hangul.spec	25 Jul 2009 03:01:59 -0000	1.11
+++ ibus-hangul.spec	11 Dec 2009 06:56:09 -0000	1.12
@@ -1,16 +1,16 @@
 %define require_ibus_version 1.2.0
-%define require_libhangul_version 0.0.9
+%define require_libhangul_version 0.0.10
 
 Name:       ibus-hangul
-Version:    1.2.0.20090617
-Release:    2%{?dist}
+Version:    1.2.0.20091031
+Release:    1%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch
-Patch1:     ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch
+# Patch0:     ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch
+# Patch1:     ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,8 +29,8 @@ libhangul.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+# %patch0 -p1
+# %patch1 -p1
 
 %build
 %configure --disable-static
@@ -55,6 +55,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Dec 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.1.0.20091031-1
+- Update version to 1.2.0.20091031.
+- Drop ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch and
+  ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch temporarily, because
+  patches conflict with 1.2.0.20091031, and the key configure will available
+  in next release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090617-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	22 Jun 2009 05:24:45 -0000	1.8
+++ sources	11 Dec 2009 06:56:09 -0000	1.9
@@ -1 +1 @@
-67f19f7290ec91ab2b1e07ff6dd887be  ibus-hangul-1.2.0.20090617.tar.gz
+558ae72f64d520835855a8dfe3ecd1f4  ibus-hangul-1.2.0.20091031.tar.gz



From jdieter at fedoraproject.org  Fri Dec 11 07:05:47 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Fri, 11 Dec 2009 07:05:47 +0000 (UTC)
Subject: rpms/deltarpm/F-11 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 deltarpm-system-zlib.patch, 1.1, 1.2 deltarpm.spec, 1.20,
	1.21 sources, 1.3,
	1.4 deltarpm-3.4-multilib-include-colored.patch, 1.1,
	NONE deltarpm-3.4-multilib-workaround.patch, 1.1,
	NONE deltarpm-3.4-prelink-bugfix.patch, 1.2,
	NONE deltarpm-3.4-sha256.patch, 1.2,
	NONE deltarpm-3.4-skipmd5.patch, 1.1, NONE
Message-ID: <20091211070547.80AAC11C00C5@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11688/F-11

Modified Files:
	.cvsignore deltarpm-system-zlib.patch deltarpm.spec sources 
Added Files:
	import.log 
Removed Files:
	deltarpm-3.4-multilib-include-colored.patch 
	deltarpm-3.4-multilib-workaround.patch 
	deltarpm-3.4-prelink-bugfix.patch deltarpm-3.4-sha256.patch 
	deltarpm-3.4-skipmd5.patch 
Log Message:
Update to 3.5 so we can work with xz-compressed rpms


--- NEW FILE import.log ---
deltarpm-3_5-0_4_20090913git_fc12:F-11:deltarpm-3.5-0.4.20090913git.fc12.src.rpm:1260515085


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Mar 2007 16:53:01 -0000	1.3
+++ .cvsignore	11 Dec 2009 07:05:46 -0000	1.4
@@ -1 +1 @@
-deltarpm-3.4.tar.bz2
+deltarpm-git-20090913.tar.bz2

deltarpm-system-zlib.patch:
 Makefile |   27 +++++++++++++++------------
 cfile.c  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 63 insertions(+), 24 deletions(-)

Index: deltarpm-system-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/F-11/deltarpm-system-zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- deltarpm-system-zlib.patch	1 Oct 2009 06:16:47 -0000	1.1
+++ deltarpm-system-zlib.patch	11 Dec 2009 07:05:47 -0000	1.2
@@ -1,28 +1,31 @@
-Index: deltarpm-3.4/Makefile
+Index: deltarpm-git-20090913/Makefile
 ===================================================================
---- deltarpm-3.4.orig/Makefile
-+++ deltarpm-3.4/Makefile
-@@ -3,29 +3,32 @@ bindir=$(prefix)/bin
+--- deltarpm-git-20090913.orig/Makefile
++++ deltarpm-git-20090913/Makefile
+@@ -4,9 +4,12 @@ libdir=$(prefix)/lib
  mandir=$(prefix)/man
  rpmdumpheader=$(bindir)/rpmdumpheader
  zlibdir=zlib-1.2.2.f-rsyncable
 +zlibbundled=$(zlibdir)/libz.a
 +zlibldflags=$(zlibbundled)
 +zlibcppflags=-I$(zlibdir)
- CFLAGS = -O2 -Wall -g
--CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
--LDLIBS = -lbz2 $(zlibdir)/libz.a
-+CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags)
-+LDLIBS = -lbz2 $(zlibldflags)
+ CFLAGS = -fPIC -O2 -Wall -g
+-CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
+-LDLIBS = -lbz2 $(zlibdir)/libz.a -llzma
++CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags)
++LDLIBS = -lbz2 $(zlibldflags) -llzma
  LDFLAGS =
+ PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
  
- all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
+@@ -14,31 +17,31 @@ all: makedeltarpm applydeltarpm rpmdumph
  
--makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o sha256.o digest.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
-+makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o sha256.o digest.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibbundled)
+ python: _deltarpmmodule.so
  
--applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o digest.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
-+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o digest.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibbundled)
+-makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
++makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibbundled)
+ 
+-applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
++applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibbundled)
  
 -combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibdir)/libz.a
 +combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibbundled)
@@ -30,8 +33,8 @@ Index: deltarpm-3.4/Makefile
  rpmdumpheader: rpmdumpheader.o
  	$(CC) $(LDFLAGS) $^ -lrpm -o $@
  
--makedeltaiso: makedeltaiso.o delta.o rpmoffs.o util.o md5.o cfile.o $(zlibdir)/libz.a
-+makedeltaiso: makedeltaiso.o delta.o rpmoffs.o util.o md5.o cfile.o $(zlibbundled)
+-makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
++makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
  
 -applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
 +applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
@@ -39,16 +42,28 @@ Index: deltarpm-3.4/Makefile
 -fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibdir)/libz.a
 +fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibbundled)
  
+-_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
++_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
+ 	for ver in $(PYTHONVERS) ; do \
+ 		if [ ! -f "$$ver/$@" ]; then \
+ 			mkdir -p $$ver ;\
+-			$(CC) $(CFLAGS) -I/usr/include/$$ver -I$(zlibdir) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
+-			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(zlibdir)/libz.a -llzma -lbz2; \
++			$(CC) $(CFLAGS) -I/usr/include/$$ver $(zlibcppflag) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
++			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \
+ 		fi; \
+ 	done
+ 
 -$(zlibdir)/libz.a:
 +$(zlibbundled):
- 	cd $(zlibdir) ; make CFLAGS="$(CFLAGS)" libz.a
+ 	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
  
  clean:
-Index: deltarpm-3.4/cfile.c
+Index: deltarpm-git-20090913/cfile.c
 ===================================================================
---- deltarpm-3.4.orig/cfile.c
-+++ deltarpm-3.4/cfile.c
-@@ -712,8 +712,6 @@ crunread_un(struct cfile *f, void *buf, 
+--- deltarpm-git-20090913.orig/cfile.c
++++ deltarpm-git-20090913/cfile.c
+@@ -888,8 +888,6 @@ crunread_un(struct cfile *f, void *buf, 
  }
  
  
@@ -57,7 +72,7 @@ Index: deltarpm-3.4/cfile.c
  int
  cfile_detect_rsync(struct cfile *f)
  {
-@@ -743,10 +741,22 @@ cfile_detect_rsync(struct cfile *f)
+@@ -919,10 +917,22 @@ cfile_detect_rsync(struct cfile *f)
      }
    for (i = 0; i < 2; i++)
      {
@@ -80,7 +95,7 @@ Index: deltarpm-3.4/cfile.c
  	{
  	  if (i)
  	    deflateEnd(&cstrm[0]);
-@@ -788,6 +798,23 @@ cfile_detect_rsync(struct cfile *f)
+@@ -964,6 +974,23 @@ cfile_detect_rsync(struct cfile *f)
  		{
  		  for (i = 0; i < 2 && !done; i++)
  		    {
@@ -104,7 +119,7 @@ Index: deltarpm-3.4/cfile.c
  		      cstrm[i].avail_in = sizeof(dbuf) - dstrm.avail_out;
  		      cstrm[i].next_in = dbuf;
  		      while (cstrm[i].avail_in)
-@@ -795,14 +822,23 @@ cfile_detect_rsync(struct cfile *f)
+@@ -971,14 +998,23 @@ cfile_detect_rsync(struct cfile *f)
  			  cstrm[i].avail_out = sizeof(cbuf);
  			  cstrm[i].next_out = cbuf;
  			  ret = deflate(&cstrm[i], dret == Z_STREAM_END ? Z_FINISH : Z_NO_FLUSH);
@@ -128,7 +143,7 @@ Index: deltarpm-3.4/cfile.c
  			      if (memcmp(b + p[i], cbuf, sizeof(cbuf) - cstrm[i].avail_out))
  				{
  				  comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
-@@ -811,6 +847,14 @@ cfile_detect_rsync(struct cfile *f)
+@@ -987,6 +1023,14 @@ cfile_detect_rsync(struct cfile *f)
  				}
  			      p[i] += sizeof(cbuf) - cstrm[i].avail_out;
  			    }
@@ -143,7 +158,7 @@ Index: deltarpm-3.4/cfile.c
  			  if (cstrm[i].avail_in && ret == BZ_STREAM_END)
  			    {
  			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
-@@ -835,7 +879,9 @@ cfile_detect_rsync(struct cfile *f)
+@@ -1011,7 +1055,9 @@ cfile_detect_rsync(struct cfile *f)
        b = b2;
      }
    deflateEnd(&cstrm[0]);
@@ -153,7 +168,7 @@ Index: deltarpm-3.4/cfile.c
    inflateEnd(&dstrm);
    f->bufN = -1;
    f->strm.gz.avail_in = 0;
-@@ -877,16 +923,6 @@ cfile_detect_rsync(struct cfile *f)
+@@ -1053,16 +1099,6 @@ cfile_detect_rsync(struct cfile *f)
    return comp == -1 ? -1 : 0;
  }
  


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/F-11/deltarpm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- deltarpm.spec	5 Oct 2009 10:14:45 -0000	1.20
+++ deltarpm.spec	11 Dec 2009 07:05:47 -0000	1.21
@@ -1,24 +1,25 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: Create deltas between rpms
 Name: deltarpm
-Version: 3.4
-Release: 18%{?dist}
+Version: 3.5
+Release: 0.4.20090913git%{?dist}
 License: BSD
 Group: System Environment/Base
-URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
-
-Source: ftp://ftp.suse.com/pub/projects/%{name}/%{name}-%{version}.tar.bz2
+URL: http://gitorious.org/deltarpm/deltarpm
+# Generate source by doing:
+# git clone git://gitorious.org/deltarpm/deltarpm
+# cd deltarpm
+# git archive --format=tar --prefix="deltarpm-git-20090913" f716bb7 | \
+# bzip2 > deltarpm-git-20090831.1.tar.bz2
+Source: %{name}-git-20090913.tar.bz2
+# Build with system zlib
+Patch0: deltarpm-system-zlib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: bzip2-devel, rpm-devel, popt-devel
+BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
 BuildRequires: zlib-devel
-
-Patch0: deltarpm-3.4-multilib-workaround.patch
-Patch1: deltarpm-3.4-multilib-include-colored.patch
-Patch2: deltarpm-3.4-prelink-bugfix.patch
-Patch3: deltarpm-3.4-skipmd5.patch
-Patch4: deltarpm-3.4-sha256.patch
-# Build with system zlib
-Patch5: deltarpm-system-zlib.patch
+BuildRequires: python-devel
 
 %description
 A deltarpm contains the difference between an old
@@ -35,20 +36,34 @@ Requires: deltarpm = %{version}-%{releas
 This package contains a tool to sync a file tree with
 deltarpms.
 
+%package -n deltaiso
+Summary: Create deltas between isos containing rpms
+Requires: deltarpm = %{version}-%{release}
+
+%description -n deltaiso
+This package contains tools for creating and using deltasisos,
+a difference between an old and a new iso containing rpms.
+
+%package -n python-deltarpm
+Summary: Python bindings for deltarpm
+Requires: deltarpm = %{version}-%{release}
+
+%description -n python-deltarpm
+This package contains python bindings for deltarpm.
+
 %prep
-%setup -q
-%patch0 -p0 -b .multilib
-%patch1 -p1 -b .multicolor
-%patch2 -p1 -b .prelink
-%patch3 -p1 -b .skipmd5
-%patch4 -p1 -b .sha256
+%setup -q -n %{name}-git-20090913
 # Build with system zlib
-%patch5 -p1 -b .zlib
+%patch0 -p1 -b .zlib
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
     bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
     zlibbundled='' zlibldflags='-lz' zlibcppflags=''
+%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+    zlibbundled='' zlibldflags='-lz' zlibcppflags='' \
+    python
 
 %install
 %{__rm} -rf %{buildroot}
@@ -63,12 +78,16 @@ deltarpms.
 %doc %{_mandir}/man8/applydeltarpm*
 %doc %{_mandir}/man8/makedeltarpm*
 %doc %{_mandir}/man8/combinedeltarpm*
-%doc %{_mandir}/man8/applydeltaiso*
-%doc %{_mandir}/man8/makedeltaiso*
 %{_bindir}/applydeltarpm
 %{_bindir}/combinedeltarpm
 %{_bindir}/makedeltarpm
 %{_bindir}/rpmdumpheader
+
+%files -n deltaiso
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD README
+%doc %{_mandir}/man8/applydeltaiso*
+%doc %{_mandir}/man8/makedeltaiso*
 %{_bindir}/applydeltaiso
 %{_bindir}/fragiso
 %{_bindir}/makedeltaiso
@@ -79,23 +98,69 @@ deltarpms.
 %doc %{_mandir}/man8/drpmsync*
 %{_bindir}/drpmsync
 
+%files -n python-deltarpm
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD
+%{python_sitearch}/*
+
 %changelog
-* Mon Oct  5 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.4-18
-- Re-split off drpmsync from main package
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.4.20090913git
+- Update patch to properly detect when an rpm is built with an rsync-friendly
+  zlib and bail out.
 
-* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-17
-- Work around cvs tag problem
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.3.20090913git
+- Make building with system zlib selectable at build time.
+- Fix cfile_detect_rsync() to detect rsync even if we don't have a zlib capable
+  of making rsync-friendly compressed files.
 
-* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-16
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
+- Correct prerelease rlease numbering.
 - Build against the system zlib, not the bundled library.  This remedies the
   fact that the included zlib is affected by CAN-2005-1849.
-- Fix cfile_detect_rsync() to detect rsync even if we don't have a zlib capable
-  of making rsync-friendly compressed files.
 
-* Thu Mar 26 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.4-15
+* Sun Sep 13 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090913
+- Merge python error patch upstream
+
+* Thu Sep 10 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.4
+- fix python bindings to not require kernel >= 2.6.27
+
+* Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.3
+- fix python bindings to:
+  - call _exit(), not exit()
+  - properly pythonize errors
+  - not leak file descriptors
+
+* Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831.1
+- Add python bindings sub-package
+- Fix build error
+
+* Mon Aug 17 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090729.1
+- Explain where we get the source from
+- Split *deltaiso commands into deltaiso subpackage (#501953)
+
+* Wed Jul 29 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090729
+- Fix bug in writing Fedora's xz-compressed rpms (surely that's the last one)
+
+* Mon Jul 27 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090727.1
+- Fix bug in reading Fedora's xz-compressed rpms
+
+* Mon Jul 27 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090727
+- Update to current upstream git repository
+- Add upstream xz compression support
+- Drop all patches (they're now in upstream)
+- Fix spelling mistakes (#505713)
+- Fix url error (#506179)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 22 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-16
+- Split drpmsync into a separate subpackage (#489231)
+
+* Thu Mar 26 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-15
 - Fix bug when checking sequence with new sha256 file digests
 
-* Tue Mar 24 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.4-14
+* Tue Mar 24 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-14
 - Add support for rpms with sha256 file digests
 
 * Fri Mar 06 2009 Jesse Keating <jkeating at redhat.com> - 3.4-13
@@ -104,28 +169,28 @@ deltarpms.
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sun Jul 13 2008 Jonathan Dieter <jdieter at lesbg.com> - 3.4-11
+* Sun Jul 13 2008 Jonathan Dieter <jdieter at gmail.com> - 3.4-11
 - Rebuild for rpm 4.6
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.4-10
 - Autorebuild for GCC 4.3
 
-* Mon Jan  7 2008 Jonathan Dieter <jdieter at lesbg.com> - 3.4-9
+* Mon Jan  7 2008 Jonathan Dieter <jdieter at gmail.com> - 3.4-9
 - Add patch that allows deltarpm to rebuild rpms from deltarpms that have
   had the rpm signature added after their creation.  The code came from
   upstream.
 - Drop nodoc patch added in 3.4-4 as most packages in repository have been
   updated since April-May 2007 and this patch was supposed to be temporary.
 
-* Wed Aug 29 2007 Jonathan Dieter <jdieter at lesbg.com> - 3.4-6
+* Wed Aug 29 2007 Jonathan Dieter <jdieter at gmail.com> - 3.4-6
 - Bring in popt-devel in BuildRequires to fix build in x86_64
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.4-5
 - Rebuild for selinux ppc32 issue.
 
-* Wed Jul 11 2007 Jonathan Dieter <jdieter at lesbg.com> - 3.4-4
+* Wed Jul 11 2007 Jonathan Dieter <jdieter at gmail.com> - 3.4-4
 - Fix prelink bug
-- Ignore verify bits on %doc files as they were set incorrectly in older
+- Ignore verify bits on doc files as they were set incorrectly in older
   versions of rpm.  Without this patch, deltarpm will not delta doc files
   in rpm created before April-May 2007
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Mar 2007 16:53:01 -0000	1.3
+++ sources	11 Dec 2009 07:05:47 -0000	1.4
@@ -1 +1 @@
-cac779a18a1bc256fb6497526a83ac82  deltarpm-3.4.tar.bz2
+d83662fbd6745b3eab85543d2ac7b6b4  deltarpm-git-20090913.tar.bz2


--- deltarpm-3.4-multilib-include-colored.patch DELETED ---


--- deltarpm-3.4-multilib-workaround.patch DELETED ---


--- deltarpm-3.4-prelink-bugfix.patch DELETED ---


--- deltarpm-3.4-sha256.patch DELETED ---


--- deltarpm-3.4-skipmd5.patch DELETED ---



From petersen at fedoraproject.org  Fri Dec 11 07:08:20 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Dec 2009 07:08:20 +0000 (UTC)
Subject: rpms/nabi/devel nabi.spec,1.12,1.13
Message-ID: <20091211070820.04CC311C00C5@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/nabi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12578

Modified Files:
	nabi.spec 
Log Message:
- update to 0.99.6
- require libhangul >= 0.0.10




Index: nabi.spec
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/nabi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nabi.spec	25 Jul 2009 15:41:42 -0000	1.12
+++ nabi.spec	11 Dec 2009 07:08:19 -0000	1.13
@@ -1,7 +1,9 @@
+%global libhangul_min_ver 0.0.10
+
 Summary: Hangul X Input Method
 Name: nabi
-Version: 0.99.3
-Release: 3%{?dist}
+Version: 0.99.6
+Release: 1%{?dist}
 
 Group: User Interface/X
 License: GPLv2+
@@ -11,10 +13,10 @@ Source1: xinput.d-%{name}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= 2.2.0
-BuildRequires: libhangul-devel >= 0.0.8
+BuildRequires: libhangul-devel >= %{libhangul_min_ver}
 BuildRequires: gettext, desktop-file-utils
 
-Requires:      libhangul >= 0.0.8
+Requires:      libhangul >= %{libhangul_min_ver}
 Requires:      im-chooser
 Requires(post): %{_sbindir}/alternatives
 Requires(preun): %{_sbindir}/alternatives
@@ -58,6 +60,10 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Jens Petersen <petersen at redhat.com> - 0.99.6-1
+- update to 0.99.6
+- require libhangul >= 0.0.10
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From petersen at fedoraproject.org  Fri Dec 11 07:09:24 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Dec 2009 07:09:24 +0000 (UTC)
Subject: File nabi-0.99.6.tar.gz uploaded to lookaside cache by petersen
Message-ID: <20091211070924.0597210F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nabi:

350979c7258fe62af5c8e8874e8e8f34  nabi-0.99.6.tar.gz



From jdieter at fedoraproject.org  Fri Dec 11 07:13:20 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Fri, 11 Dec 2009 07:13:20 +0000 (UTC)
Subject: rpms/deltarpm/F-11 deltarpm.spec,1.21,1.22
Message-ID: <20091211071320.5D76F11C00C5@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13873

Modified Files:
	deltarpm.spec 
Log Message:
Remerge deltarpm and deltaiso, so there aren't any surprises for current users



Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/F-11/deltarpm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- deltarpm.spec	11 Dec 2009 07:05:47 -0000	1.21
+++ deltarpm.spec	11 Dec 2009 07:13:19 -0000	1.22
@@ -36,14 +36,6 @@ Requires: deltarpm = %{version}-%{releas
 This package contains a tool to sync a file tree with
 deltarpms.
 
-%package -n deltaiso
-Summary: Create deltas between isos containing rpms
-Requires: deltarpm = %{version}-%{release}
-
-%description -n deltaiso
-This package contains tools for creating and using deltasisos,
-a difference between an old and a new iso containing rpms.
-
 %package -n python-deltarpm
 Summary: Python bindings for deltarpm
 Requires: deltarpm = %{version}-%{release}
@@ -78,16 +70,12 @@ This package contains python bindings fo
 %doc %{_mandir}/man8/applydeltarpm*
 %doc %{_mandir}/man8/makedeltarpm*
 %doc %{_mandir}/man8/combinedeltarpm*
+%doc %{_mandir}/man8/applydeltaiso*
+%doc %{_mandir}/man8/makedeltaiso*
 %{_bindir}/applydeltarpm
 %{_bindir}/combinedeltarpm
 %{_bindir}/makedeltarpm
 %{_bindir}/rpmdumpheader
-
-%files -n deltaiso
-%defattr(-, root, root, 0755)
-%doc LICENSE.BSD README
-%doc %{_mandir}/man8/applydeltaiso*
-%doc %{_mandir}/man8/makedeltaiso*
 %{_bindir}/applydeltaiso
 %{_bindir}/fragiso
 %{_bindir}/makedeltaiso
@@ -104,6 +92,10 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Fri Dec 11 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.4.20090913git
+- Remerge deltaiso package into deltarpm so current users don't lose access to
+  deltaiso
+
 * Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.4.20090913git
 - Update patch to properly detect when an rpm is built with an rsync-friendly
   zlib and bail out.



From jdieter at fedoraproject.org  Fri Dec 11 07:15:00 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Fri, 11 Dec 2009 07:15:00 +0000 (UTC)
Subject: rpms/deltarpm/F-11 deltarpm.spec,1.22,1.23
Message-ID: <20091211071500.5C07F11C00C5@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14389

Modified Files:
	deltarpm.spec 
Log Message:
Bump release so I can tag it.



Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/F-11/deltarpm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- deltarpm.spec	11 Dec 2009 07:13:19 -0000	1.22
+++ deltarpm.spec	11 Dec 2009 07:15:00 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.4.20090913git%{?dist}
+Release: 0.4.20090913git%{?dist}.1
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -92,7 +92,7 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
-* Fri Dec 11 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.4.20090913git
+* Fri Dec 11 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.4.20090913git.1
 - Remerge deltaiso package into deltarpm so current users don't lose access to
   deltaiso
 



From pkgdb at fedoraproject.org  Fri Dec 11 07:35:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 07:35:21 +0000
Subject: [pkgdb] webkitgtk had acl change status
Message-ID: <20091211073521.9E88710F891@bastion2.fedora.phx.redhat.com>

pgordon has set the commit acl on webkitgtk (Fedora devel) to Approved for maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From pkgdb at fedoraproject.org  Fri Dec 11 07:35:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 07:35:29 +0000
Subject: [pkgdb] webkitgtk had acl change status
Message-ID: <20091211073529.3ECBE10F891@bastion2.fedora.phx.redhat.com>

pgordon has set the commit acl on webkitgtk (Fedora 11) to Approved for maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From pkgdb at fedoraproject.org  Fri Dec 11 07:35:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 07:35:37 +0000
Subject: [pkgdb] webkitgtk had acl change status
Message-ID: <20091211073537.A98D810F85C@bastion2.fedora.phx.redhat.com>

pgordon has set the commit acl on webkitgtk (Fedora 12) to Approved for maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webkitgtk



From dchen at fedoraproject.org  Fri Dec 11 07:59:32 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 11 Dec 2009 07:59:32 +0000 (UTC)
Subject: File ibus-chewing-1.2.0.20091211-Source.tar.gz uploaded to lookaside
	cache by dchen
Message-ID: <20091211075932.441E310F890@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ibus-chewing:

4b4642c6d2f39dd5aa8c75a02ba2b813  ibus-chewing-1.2.0.20091211-Source.tar.gz



From dchen at fedoraproject.org  Fri Dec 11 08:00:25 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 11 Dec 2009 08:00:25 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.23, 1.24 ibus-chewing.spec,
	1.27, 1.28 import.log, 1.19, 1.20 sources, 1.24, 1.25
Message-ID: <20091211080025.6F8DF11C02CA@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26363/devel

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 Fixed Google code issue 608, 611, 660.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	4 Oct 2009 23:58:34 -0000	1.23
+++ .cvsignore	11 Dec 2009 08:00:23 -0000	1.24
@@ -1 +1 @@
-ibus-chewing-1.2.0.20091002-Source.tar.gz
+ibus-chewing-1.2.0.20091211-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ibus-chewing.spec	4 Oct 2009 23:58:34 -0000	1.27
+++ ibus-chewing.spec	11 Dec 2009 08:00:24 -0000	1.28
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20091002
+Version:    1.2.0.20091211
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -77,7 +77,14 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Mon Oct 05 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091002-1
+* Fri Dec 11 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091211-1
+- Fix Google issue 608: ibus-chewing does not show cursor in xim mode.
+- Fix Google issue 611: ibus-chewing keyboard setting reverts to default unexpectlly.
+- Fix Google issue 660: failed to build with binutils-gold.
+- Remove make target commit.
+- Add make target tag
+
+* Fri Oct 09 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091002-1
 - Bug 518901 - ibus-chewing would not work with locale zh_TW.Big
 - Fix Google issue 501: ibus-chewing buffer doesn't get cleared when
 toggling ibus on/off
@@ -209,3 +216,4 @@ Fix the errors which Funda Wang as point
 
 
 
+


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- import.log	5 Oct 2009 00:05:40 -0000	1.19
+++ import.log	11 Dec 2009 08:00:24 -0000	1.20
@@ -17,3 +17,4 @@ ibus-chewing-1_2_0_20090916-1_fc11:HEAD:
 ibus-chewing-1_2_0_20090917-1_fc11:HEAD:ibus-chewing-1.2.0.20090917-1.fc11.src.rpm:1253155437
 ibus-chewing-1_2_0_20091002-1_fc11:HEAD:ibus-chewing-1.2.0.20091002-1.fc11.src.rpm:1254700639
 ibus-chewing-1_2_0_20091002-1_fc11:HEAD:ibus-chewing-1.2.0.20091002-1.fc11.src.rpm:1254701039
+ibus-chewing-1_2_0_20091211-1_fc12:HEAD:ibus-chewing-1.2.0.20091211-1.fc12.src.rpm:1260518378


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	4 Oct 2009 23:58:34 -0000	1.24
+++ sources	11 Dec 2009 08:00:24 -0000	1.25
@@ -1 +1 @@
-fd4f70b4ac6e561201b668d0acbf085b  ibus-chewing-1.2.0.20091002-Source.tar.gz
+4b4642c6d2f39dd5aa8c75a02ba2b813  ibus-chewing-1.2.0.20091211-Source.tar.gz



From dchen at fedoraproject.org  Fri Dec 11 08:01:49 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 11 Dec 2009 08:01:49 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 .cvsignore, 1.23, 1.24 ibus-chewing.spec,
	1.27, 1.28 import.log, 1.19, 1.20 sources, 1.24, 1.25
Message-ID: <20091211080149.9864111C00C5@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26912/F-11

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 Fixed Google code issue 608, 611, 660.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	5 Oct 2009 00:00:57 -0000	1.23
+++ .cvsignore	11 Dec 2009 08:01:49 -0000	1.24
@@ -1 +1 @@
-ibus-chewing-1.2.0.20091002-Source.tar.gz
+ibus-chewing-1.2.0.20091211-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ibus-chewing.spec	5 Oct 2009 00:00:57 -0000	1.27
+++ ibus-chewing.spec	11 Dec 2009 08:01:49 -0000	1.28
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20091002
+Version:    1.2.0.20091211
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -77,7 +77,14 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Mon Oct 05 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091002-1
+* Fri Dec 11 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091211-1
+- Fix Google issue 608: ibus-chewing does not show cursor in xim mode.
+- Fix Google issue 611: ibus-chewing keyboard setting reverts to default unexpectlly.
+- Fix Google issue 660: failed to build with binutils-gold.
+- Remove make target commit.
+- Add make target tag
+
+* Fri Oct 09 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091002-1
 - Bug 518901 - ibus-chewing would not work with locale zh_TW.Big
 - Fix Google issue 501: ibus-chewing buffer doesn't get cleared when
 toggling ibus on/off
@@ -209,3 +216,4 @@ Fix the errors which Funda Wang as point
 
 
 
+


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- import.log	5 Oct 2009 00:00:57 -0000	1.19
+++ import.log	11 Dec 2009 08:01:49 -0000	1.20
@@ -17,3 +17,4 @@ ibus-chewing-1_2_0_20090831-1_fc11:F-11:
 ibus-chewing-1_2_0_20090916-1_fc11:F-11:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253072780
 ibus-chewing-1_2_0_20090917-1_fc11:F-11:ibus-chewing-1.2.0.20090917-1.fc11.src.rpm:1253164898
 ibus-chewing-1_2_0_20091002-1_fc11:F-11:ibus-chewing-1.2.0.20091002-1.fc11.src.rpm:1254700771
+ibus-chewing-1_2_0_20091211-1_fc12:F-11:ibus-chewing-1.2.0.20091211-1.fc12.src.rpm:1260518464


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	5 Oct 2009 00:00:57 -0000	1.24
+++ sources	11 Dec 2009 08:01:49 -0000	1.25
@@ -1 +1 @@
-fd4f70b4ac6e561201b668d0acbf085b  ibus-chewing-1.2.0.20091002-Source.tar.gz
+4b4642c6d2f39dd5aa8c75a02ba2b813  ibus-chewing-1.2.0.20091211-Source.tar.gz



From dchen at fedoraproject.org  Fri Dec 11 08:02:55 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 11 Dec 2009 08:02:55 +0000 (UTC)
Subject: rpms/ibus-chewing/F-12 .cvsignore, 1.23, 1.24 ibus-chewing.spec,
	1.27, 1.28 import.log, 1.18, 1.19 sources, 1.24, 1.25
Message-ID: <20091211080255.D0D2A11C00C5@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27341/F-12

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 Fixed Google code issue 608, 611, 660.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	5 Oct 2009 00:07:27 -0000	1.23
+++ .cvsignore	11 Dec 2009 08:02:55 -0000	1.24
@@ -1 +1 @@
-ibus-chewing-1.2.0.20091002-Source.tar.gz
+ibus-chewing-1.2.0.20091211-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-12/ibus-chewing.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ibus-chewing.spec	5 Oct 2009 00:07:27 -0000	1.27
+++ ibus-chewing.spec	11 Dec 2009 08:02:55 -0000	1.28
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20091002
+Version:    1.2.0.20091211
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -77,7 +77,14 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Mon Oct 05 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091002-1
+* Fri Dec 11 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091211-1
+- Fix Google issue 608: ibus-chewing does not show cursor in xim mode.
+- Fix Google issue 611: ibus-chewing keyboard setting reverts to default unexpectlly.
+- Fix Google issue 660: failed to build with binutils-gold.
+- Remove make target commit.
+- Add make target tag
+
+* Fri Oct 09 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20091002-1
 - Bug 518901 - ibus-chewing would not work with locale zh_TW.Big
 - Fix Google issue 501: ibus-chewing buffer doesn't get cleared when
 toggling ibus on/off
@@ -209,3 +216,4 @@ Fix the errors which Funda Wang as point
 
 
 
+


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-12/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- import.log	5 Oct 2009 00:07:27 -0000	1.18
+++ import.log	11 Dec 2009 08:02:55 -0000	1.19
@@ -16,3 +16,4 @@ ibus-chewing-1_2_0_20090624-1_fc11:HEAD:
 ibus-chewing-1_2_0_20090916-1_fc11:HEAD:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253071014
 ibus-chewing-1_2_0_20090917-1_fc11:HEAD:ibus-chewing-1.2.0.20090917-1.fc11.src.rpm:1253155437
 ibus-chewing-1_2_0_20091002-1_fc11:F-12:ibus-chewing-1.2.0.20091002-1.fc11.src.rpm:1254701155
+ibus-chewing-1_2_0_20091211-1_fc12:F-12:ibus-chewing-1.2.0.20091211-1.fc12.src.rpm:1260518547


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	5 Oct 2009 00:07:28 -0000	1.24
+++ sources	11 Dec 2009 08:02:55 -0000	1.25
@@ -1 +1 @@
-fd4f70b4ac6e561201b668d0acbf085b  ibus-chewing-1.2.0.20091002-Source.tar.gz
+4b4642c6d2f39dd5aa8c75a02ba2b813  ibus-chewing-1.2.0.20091211-Source.tar.gz



From jfch2222 at fedoraproject.org  Fri Dec 11 08:22:03 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 11 Dec 2009 08:22:03 +0000 (UTC)
Subject: File libssh-0.4.0.tar.gz uploaded to lookaside cache by jfch2222
Message-ID: <20091211082203.5101B10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libssh:

bcb3d567bacd54c9f6b5b0e8c4d1102c  libssh-0.4.0.tar.gz



From jskala at fedoraproject.org  Fri Dec 11 08:23:22 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 11 Dec 2009 08:23:22 +0000 (UTC)
Subject: rpms/bltk/F-12 bltk-1.0.9-rm_sudo.patch, NONE, 1.1 bltk.spec, 1.7, 
	1.8 bltk-1.0.9-sudo.patch, 1.1, NONE
Message-ID: <20091211082322.A951E11C00C5@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/bltk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv592

Modified Files:
	bltk.spec 
Added Files:
	bltk-1.0.9-rm_sudo.patch 
Removed Files:
	bltk-1.0.9-sudo.patch 
Log Message:
* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 1.0.9-7
- fixed #542688 - bltk will run any cmd as root


bltk-1.0.9-rm_sudo.patch:
 Makefile                          |    4 --
 include/bltk.h                    |    2 -
 tools/Makefile                    |    5 ---
 tools/bat_drain/bat_drain.sh      |   20 +------------
 tools/bltk/Makefile               |    2 -
 tools/bltk/bltk_check.sh          |    8 -----
 tools/bltk/bltk_get_dmidecode.sh  |   58 +-------------------------------------
 tools/bltk/bltk_get_hdparm.sh     |   47 ++++++++++++++++++++----------
 tools/bltk/bltk_get_user_field.sh |   47 ++++++++++++++++++++----------
 tools/bltk/bltk_install.sh        |   12 -------
 tools/bltk/bltk_save_sys_info.sh  |   30 ++-----------------
 tools/bltk/bltk_wl_common.sh      |   23 ---------------
 tools/bltk/main.c                 |   45 -----------------------------
 tools/bltk/stat.c                 |   49 --------------------------------
 wl_game/bltk_wl_game.sh           |    2 -
 wl_player/bltk_wl_player.sh       |   21 -------------
 wl_reader/bltk_wl_reader.sh       |    2 -
 17 files changed, 77 insertions(+), 300 deletions(-)

--- NEW FILE bltk-1.0.9-rm_sudo.patch ---
diff -up bltk-1.0.9/include/bltk.h.sec_sudo bltk-1.0.9/include/bltk.h
--- bltk-1.0.9/include/bltk.h.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/include/bltk.h	2009-12-08 14:28:23.868162165 +0100
@@ -429,8 +429,6 @@ extern int dpms_proc_flg;
 
 extern char *results;
 
-extern char *bltk_sudo;
-
 extern int abort_flg;
 extern int ac_ignore;
 
diff -up bltk-1.0.9/Makefile.sec_sudo bltk-1.0.9/Makefile
--- bltk-1.0.9/Makefile.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/Makefile	2009-12-08 14:28:23.868162165 +0100
@@ -89,10 +89,6 @@ clean : FORCE
 	@$(RM) *~ last_cmd last_results history
 	@$(RM) .bltk install.log uninstall.log .plot_history
 
-su : pre-install
-	$(MAKE) -C tools/sudo install
-	@touch .bltk
-
 _lazy : FORCE
 	@for f in $(CMDS); \
 	do \
diff -up bltk-1.0.9/tools/analyzer/bltk_report.sh.sec_sudo bltk-1.0.9/tools/analyzer/bltk_report.sh
diff -up bltk-1.0.9/tools/bat_drain/bat_drain.sh.sec_sudo bltk-1.0.9/tools/bat_drain/bat_drain.sh
--- bltk-1.0.9/tools/bat_drain/bat_drain.sh.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/bat_drain/bat_drain.sh	2009-12-10 13:55:46.454371019 +0100
@@ -100,16 +100,12 @@ set_bltk_root()
 set_bltk_root
 
 export BLTK_BIN=$BLTK_ROOT/bin
-export BLTK_SUDO=$BLTK_BIN/bltk_sudo
 export BLTK_GET_DMIDECODE=$BLTK_BIN/bltk_get_dmidecode
 export BLTK_GET_SYSTEM_RELEASE=$BLTK_BIN/bltk_get_system_release
 
-if [[ -x $BLTK_SUDO ]]
-then
-	MANUFACTURER=`$BLTK_SUDO $BLTK_GET_DMIDECODE -m`
-	PRODUCT_NAME=`$BLTK_SUDO $BLTK_GET_DMIDECODE -p`
-	SYSTEM_RELEASE=`$BLTK_GET_SYSTEM_RELEASE -v`
-fi
+MANUFACTURER=`cat /sys/devices/virtual/dmi/id/sys_vendor`
+PRODUCT_NAME=`cat /sys/devices/virtual/dmi/id/product_name`
+SYSTEM_RELEASE=`$BLTK_GET_SYSTEM_RELEASE -v`
 
 # percents
 BAT_CRITICAL=5
@@ -1874,16 +1870,6 @@ fini_user()
 	$fini_user_cmd
 }
 
-bat_startup()
-{
-	if [[ -x $BLTK_SUDO ]]
-	then
-		$BLTK_SUDO modprobe cpufreq_stats >/dev/null 2>&1
-	fi
-}
-
-bat_startup
-
 init_srgs "$@"
 
 if [[ $left_work_flg = TRUE ]]
diff -up bltk-1.0.9/tools/bltk/bltk_check.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_check.sh
--- bltk-1.0.9/tools/bltk/bltk_check.sh.sec_sudo	2009-12-08 14:28:23.846162271 +0100
+++ bltk-1.0.9/tools/bltk/bltk_check.sh	2009-12-08 14:28:23.876162742 +0100
@@ -85,14 +85,6 @@ command_line()
 cmd_startup
 [[ $? != 0 ]] && exit 1
 
-$BLTK_SUDO_CMD
-if [[ $? != 0 ]]
-then
-	echo "Cannot run $BLTK_SUDO_CMD"
-	echo "Please perform 'make su' command"
-	exit 2
-fi
-
 command_line "$@"
 
 #rm -rf $RES
diff -up bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh
--- bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh.sec_sudo	2009-12-08 14:28:23.825191233 +0100
+++ bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh	2009-12-08 14:28:23.877162125 +0100
@@ -74,65 +74,13 @@ command_line()
 	done
 
 	shift $((OPTIND-1))
-
-	DMIDECODE=$*
-	TMP_FILE=$BLTK_HOME/tmp/dmidecode
-
-	if [[ -z $DMIDECODE ]]
-	then
-		type -p dmidecode >/dev/null 2>&1
-		if [[ $? = 0 ]]
-		then
-			rm -f $TMP_FILE
-			$BLTK_SUDO_CMD dmidecode >$TMP_FILE
-			DMIDECODE=$TMP_FILE
-		else
-			if [[ $manufacturer_flg = TRUE ]]
-			then
-				:
-			elif [[ $product_name_flg = TRUE ]]
-			then
-				:
-			else
-				echo "MANUFACTURER ="
-				echo "PRODUCT_NAME ="
-			fi
-			exit 1
-		fi
-	fi
-
-	MANUFACTURER=
-	PRODUCT_NAME=
 }
 
 command_line "$@"
 
-while read line
-do
-	if [[ "$line" == *"System Information"* ]]
-	then
-		read line_m
-		read line_p
-		break
-	fi
-done < $DMIDECODE
-
-
-if [[ ! -z "$line_m" ]]
-then
-	if [[ "$line_m" == *"Manufacturer: "* ]]
-	then
-		MANUFACTURER=${line_m#Manufacturer: }
-	fi
-fi
+MANUFACTURER=`cat /sys/devices/virtual/dmi/id/sys_vendor`
 
-if [[ ! -z "$line_p" ]]
-then
-	if [[ "$line_p" == *"Product Name: "* ]]
-	then
-		PRODUCT_NAME=${line_p#Product Name: }
-	fi
-fi
+PRODUCT_NAME=`cat /sys/devices/virtual/dmi/id/product_name`
 
 if [[ $manufacturer_flg = TRUE ]]
 then
@@ -145,6 +93,4 @@ else
 	echo "PRODUCT_NAME = $PRODUCT_NAME"
 fi
 
-rm -f $TMP_FILE
-
 exit 0
diff -up bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh
--- bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh.sec_sudo	2009-12-08 14:28:23.817162439 +0100
+++ bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh	2009-12-10 15:55:25.035367622 +0100
@@ -56,7 +56,12 @@ warning()
 
 PARTITIONS=$1
 
+FOUND=0
+READING=0
 TMP_FILE=$BLTK_HOME/tmp/hdparm
+DEV_INFO=$BLTK_HOME/tmp/dev_info
+
+/usr/bin/devkit-disks --dump > $TMP_FILE
 
 str=`ls -d /sys/block/sd* | sed 's/^.*sd/sd/'`
 DF_NAME=${str%% *}
@@ -70,30 +75,40 @@ fi
 
 HD_DEV_NAME=/dev/$HD_NAME
 
+while read line
+do
+  if [[ $READING -eq 0 && `echo $line | grep '^Showing'` ]]; then
+    READING=1
+  elif [[ $READING -eq 1 && `echo $line | grep =====` ]]; then
+    READING=0
+    if [ $FOUND -eq 1 ]; then
+      break;
+    else
+      rm $DEV_INFO
+    fi
+  fi
+
+  if [[ $READING -eq 1 ]]; then  
+    echo $line >> $DEV_INFO
+  fi
+
+  if [[ `echo $line | grep "device-file: *$HD_DEV_NAME"` ]]; then 
+    FOUND=1
+  fi
+done < $TMP_FILE
+
 rm -f $TMP_FILE
-$BLTK_SUDO_CMD hdparm -iI "$HD_DEV_NAME" >$TMP_FILE 2>&1
 
 echo "DF_NAME = $DF_NAME"
 echo "DF_DEV_NAME = $DF_DEV_NAME"
 echo "HD_NAME = $HD_NAME"
 echo "HD_DEV_NAME = $HD_DEV_NAME"
 
-str=`grep '^ Model=' $TMP_FILE`
-str=${str# Model=}
-str=${str%%, *}
-if [[ -z "$str" ]]
-then
-	str=`grep '^	Model Number:' $TMP_FILE`
-	str=${str#*Model Number:}
-	str=`echo $str`
-fi
-echo "HD_MODEL = $str"
+echo "HD_MODEL = `grep '^model:' $DEV_INFO | sed 's/^model: //'`"
 
-str=`grep 'device size with M = 1000' $TMP_FILE`
-str=${str#*device size with M = 1000*:}
-str=`echo $str`
-echo "HD_SIZE = $str"
+str=`grep '^size:' $DEV_INFO | sed 's/^size: //'`
+echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)"
 
-rm -f $TMP_FILE
+rm $DEV_INFO
 
 exit 0
diff -up bltk-1.0.9/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_user_field.sh
--- bltk-1.0.9/tools/bltk/bltk_get_user_field.sh.sec_sudo	2009-12-08 14:28:23.826177205 +0100
+++ bltk-1.0.9/tools/bltk/bltk_get_user_field.sh	2009-12-10 15:58:45.697370853 +0100
@@ -57,7 +57,12 @@ warning()
 FIELD_NO=$1
 DELIM=$1
 
+FOUND=0
+READING=0
 TMP_FILE=$BLTK_HOME/tmp/hdparm
+DEV_INFO=$BLTK_HOME/tmp/dev_info
+
+/usr/bin/devkit-disks --dump > $TMP_FILE
 
 #str=`df -lk / | grep -v ^Filesystem`
 str=`df -lk / | grep ^/dev/`
@@ -74,30 +79,40 @@ fi
 
 HD_DEV_NAME=/dev/$HD_NAME
 
+while read line
+do
+  if [[ $READING -eq 0 && `echo $line | grep '^Showing'` ]]; then
+    READING=1
+  elif [[ $READING -eq 1 && `echo $line | grep =====` ]]; then
+    READING=0
+    if [ $FOUND -eq 1 ]; then
+      break;
+    else
+      rm $DEV_INFO
+    fi
+  fi
+
+  if [[ $READING -eq 1 ]]; then  
+    echo $line >> $DEV_INFO
+  fi
+
+  if [[ `echo $line | grep "device-file: *$HD_DEV_NAME"` ]]; then 
+    FOUND=1
+  fi
+done < $TMP_FILE
+
 rm -f $TMP_FILE
-$BLTK_SUDO_CMD /sbin/hdparm -iI "$HD_DEV_NAME" >$TMP_FILE 2>&1
 
 echo "DF_NAME = $DF_NAME"
 echo "DF_DEV_NAME = $DF_DEV_NAME"
 echo "HD_NAME = $HD_NAME"
 echo "HD_DEV_NAME = $HD_DEV_NAME"
 
-str=`grep '^ Model=' $TMP_FILE`
-str=${str# Model=}
-str=${str%%, *}
-if [[ -z "$str" ]]
-then
-	str=`grep '^	Model Number:' $TMP_FILE`
-	str=${str#*Model Number:}
-	str=`echo $str`
-fi
-echo "HD_MODEL = $str"
+echo "HD_MODEL = `grep '^model:' $DEV_INFO | sed 's/^model: //'`"
 
-str=`grep 'device size with M = 1000' $TMP_FILE`
-str=${str#*device size with M = 1000*:}
-str=`echo $str`
-echo "HD_SIZE = $str"
+str=`grep '^size:' $DEV_INFO | sed 's/^size: //'`
+echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)"
 
-rm -f $TMP_FILE
+rm $DEV_INFO
 
 exit 0
diff -up bltk-1.0.9/tools/bltk/bltk_hd_state.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_hd_state.sh
diff -up bltk-1.0.9/tools/bltk/bltk_install.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_install.sh
--- bltk-1.0.9/tools/bltk/bltk_install.sh.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/bltk/bltk_install.sh	2009-12-08 14:28:23.879167455 +0100
@@ -100,18 +100,6 @@ done
 cd $BLTK_ROOT
 [[ $? != 0 ]] && exit 1
 
-$BLTK_SUDO_CMD >/dev/null 2>&1
-if [[ $? != 0 ]]
-then
-	SU=TRUE
-fi
-
-if [[ $SU = TRUE ]]
-then
-	make su
-	[[ $? != 0 ]] && exit 1
-fi
-
 CWD=$PWD
 
 for work in $WORK
diff -up bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh
--- bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh	2009-12-08 14:28:23.880163066 +0100
@@ -48,13 +48,6 @@ group=`id -gn`
 
 trap 'trap_action 1; exit 1' 1 2 3 6 15
 #trap 'echo trap 11 >&2' 11
-trap_action()
-{
-	[[ ! -a "$SAVEDIR" ]] && return
-	$BLTK_SUDO_CMD chown -h -R $user:$group $SAVEDIR
-	$BLTK_SUDO_CMD chmod -R a+rw $SAVEDIR
-	$BLTK_SUDO_CMD rm -rf $SAVEDIR
-}
 
 PROG=$0
 
@@ -102,10 +95,7 @@ SAVELIST="
 
 if [[ -a $SAVEDIR ]]
 then
-	CMD="$BLTK_SUDO_CMD chmod -R a+rw $SAVEDIR"
-	$CMD
-	[[ $? != 0 ]] && error "$CMD failed"
-	CMD="$BLTK_SUDO_CMD rm -rf $SAVEDIR"
+	CMD="rm -rf $SAVEDIR"
 	$CMD
 	[[ $? != 0 ]] && error "$CMD failed"
 fi
@@ -122,13 +112,13 @@ do
 	CMD="mkdir -p -m 0777 $dstdir"
 	$CMD
 	[[ $? != 0 ]] && error "$CMD failed"
-	CMD="$BLTK_SUDO_CMD cp -d -r $src $dst"
+	CMD="cp -d -r $src $dst"
 	$CMD
 	[[ $? != 0 ]] && warning "$CMD failed"
-	CMD="$BLTK_SUDO_CMD chown -h -R $user:$group $dst"
+	CMD="chown -h -R $user:$group $dst"
 	$CMD
 	[[ $? != 0 ]] && warning "$CMD failed"
-	CMD="$BLTK_SUDO_CMD chmod -R a+rw $dst"
+	CMD="chmod -R a+rw $dst"
 	$CMD
 	[[ $? != 0 ]] && warning "$CMD failed"
 done >>$SAVEDIR/err.log 2>&1
@@ -144,21 +134,9 @@ free >$SAVEDIR/free 2>&1
 df -lk >$SAVEDIR/df 2>&1
 ps -lef >$SAVEDIR/ps 2>&1
 ###	glxinfo >$SAVEDIR/glxinfo 2>&1
-$BLTK_SUDO_CMD dmidecode >$SAVEDIR/dmidecode 2>&1
 xset q >$SAVEDIR/xset 2>&1
 
 HDPARM=hdparm
 
-for h in hda hdb hdc hdd sda sdb sdc sdd
-do
-	grep " $h " /proc/diskstats >/dev/null 2>&1
-	if [[ $? = 0 ]]
-	then
-		$BLTK_SUDO_CMD $HDPARM /dev/$h >$SAVEDIR/hdparm.$h 2>&1
-		$BLTK_SUDO_CMD $HDPARM -iI /dev/$h >>$SAVEDIR/hdparm.$h 2>&1
-		$BLTK_SUDO_CMD $HDPARM -C /dev/$h >>$SAVEDIR/hdparm.$h 2>&1
-	fi
-done
-
 exit 0
 
diff -up bltk-1.0.9/tools/bltk/bltk_wl_common.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_wl_common.sh
--- bltk-1.0.9/tools/bltk/bltk_wl_common.sh.sec_sudo	2009-12-08 14:28:23.847162491 +0100
+++ bltk-1.0.9/tools/bltk/bltk_wl_common.sh	2009-12-08 14:28:23.881171389 +0100
@@ -133,7 +133,6 @@ cmd_startup()
 	export BLTK_LIB=$BLTK_ROOT/lib
 	export BLTK_TMP=$HOME/.bltk/tmp
 
-	[[ -z $BLTK_SUDO_CMD ]] && export BLTK_SUDO_CMD=$BLTK_BIN/bltk_sudo
 	[[ -z $BLTK_CALC_CMD ]] && export BLTK_CALC_CMD=$BLTK_BIN/bltk_calc
 	[[ -z $BLTK_TIME_CMD ]] && export BLTK_TIME_CMD=$BLTK_BIN/bltk_time
 	[[ -z $BLTK_TYPE_COMMAND_CMD ]] && export BLTK_TYPE_COMMAND_CMD=$BLTK_BIN/bltk_type_command
@@ -211,7 +210,6 @@ wl_startup()
 
 	export BLTK_WL_INSTALL_FILE=$BLTK_WL_ROOT/.installed
 
-	[[ -z $BLTK_SUDO_CMD ]] && export BLTK_SUDO_CMD=$BLTK_BIN/bltk_sudo
 	[[ -z $BLTK_CALC_CMD ]] && export BLTK_CALC_CMD=$BLTK_BIN/bltk_calc
 	[[ -z $BLTK_TIME_CMD ]] && export BLTK_TIME_CMD=$BLTK_BIN/bltk_time
 	[[ -z $BLTK_TYPE_COMMAND_CMD ]] && export BLTK_TYPE_COMMAND_CMD=$BLTK_BIN/bltk_type_command
@@ -540,27 +538,6 @@ wl_remove_dir()
 	return 0
 }
 
-wl_remove_dir_su()
-{
-	typeset	dir=$1
-
-	if [[ -a $dir ]]
-	then
-		CMD="$BLTK_SUDO_CMD rm -rf $dir"
-		$CMD
-		if [[ $? != 0 ]]
-		then
-			wl_error_msg "$CMD failed"
-			wl_error_msg "Cannot remove $dir"
-			return 1
-		fi
-	fi
-#	CMD="rmdir -p `dirname $dir`"
-#	$CMD >/dev/null 2>&1
-#	return 0
-	return 0
-}
-
 wl_move_dir()
 {
 	typeset	dir1=$1
diff -up bltk-1.0.9/tools/bltk/main.c.sec_sudo bltk-1.0.9/tools/bltk/main.c
--- bltk-1.0.9/tools/bltk/main.c.sec_sudo	2009-12-08 14:28:23.852162407 +0100
+++ bltk-1.0.9/tools/bltk/main.c	2009-12-08 14:28:23.883191456 +0100
@@ -215,8 +215,6 @@ int stat_system = 0;
 int comment_cnt = 0;
 char *comment[MAX_LINES];
 
-char *bltk_sudo = "bltk_sudo_NOT_SET";
-
 char stop_fname[STR_LEN];
 
 int show_demo = 0;
@@ -250,7 +248,6 @@ int debug_workload_flg = 0;
 
 int start_prog_flg = 0;
 char *start_prog = NULL;
-int start_prog_su_flg = 0;
 
 xtime_t arg_time = EMPTY_VALUE;
 xtime_t idle_test_time = EMPTY_VALUE;
@@ -946,15 +943,6 @@ static void start_warning2(void)
 	write_to_stdout_work_out_log("Do NOT touch anything\n");
 }
 
-static void pre_init_vars(void)
-{
-	char cmd[STR_LEN];
-
-	(void)sprintf(cmd, "%s modprobe cpufreq_stats >>%s 2>&1",
-		      bltk_sudo, warning_log_fname);
-	(void)prog_system(cmd);
-}
-
 static int environment_init(int argc, char **argv)
 {
 	char cmdline[STR_LEN];
@@ -1056,26 +1044,6 @@ static int environment_init(int argc, ch
 	(void)sprintf(cmd, "%s >%s/cmd", cmdline, results);
 	(void)prog_system(cmd);
 
-	(void)sprintf(str, "%s/bin/bltk_sudo", bltk_root);
-	bltk_sudo = strdup(str);
-	if (access(str, X_OK) != 0) {
-		(void)sprintf(prt_str, "Cannot access %s\n", str);
-		write_to_err_log(prt_str);
-		(void)sprintf(prt_str, "Please perform 'make su' command\n");
-		write_to_err_log(prt_str);
-		prog_exit(1);
-	}
-	(void)sprintf(cmd, "%s/bin/bltk_sudo", bltk_root);
-	ret = prog_system(cmd);
-	if (ret != 0) {
-		(void)sprintf(prt_str, "Cannot run %s\n", str);
-		write_to_err_log(prt_str);
-		(void)sprintf(prt_str, "Please perform 'make su' command\n");
-		write_to_err_log(prt_str);
-		prog_exit(1);
-	}
-	prog_putenv("BLTK_SUDO_CMD", str);
-
 	set_signal(SIGTERM);
 	set_signal(SIGINT);
 	set_signal(SIGQUIT);
@@ -1092,8 +1060,6 @@ static int environment_init(int argc, ch
 		prog_exit(1);
 	}
 
-	pre_init_vars();
-
 	init_vars();
 
 	return (0);
@@ -2021,11 +1987,6 @@ int main(int argc, char **argv)
 		case 'e':
 			start_prog_flg = 1;
 			start_prog = optarg;
-			start_prog_su_flg = 1;
-			break;
-		case 'E':
-			start_prog_flg = 1;
-			start_prog = optarg;
 			break;
 		case 'y':
 			yes = 1;
@@ -2449,11 +2410,7 @@ int main(int argc, char **argv)
 	}
 
 	if (start_prog_flg) {
-		if (start_prog_su_flg) {
-			(void)sprintf(cmd, "%s '%s'", bltk_sudo, start_prog);
-		} else {
-			(void)sprintf(cmd, "%s", start_prog);
-		}
+		(void)sprintf(cmd, "%s", start_prog);
 		(void)sprintf(prt_str, "Start prog %s\n", cmd);
 		write_to_stdout_work_out_log(prt_str);
 		ret = prog_system(cmd);
diff -up bltk-1.0.9/tools/bltk/Makefile.sec_sudo bltk-1.0.9/tools/bltk/Makefile
--- bltk-1.0.9/tools/bltk/Makefile.sec_sudo	2009-12-08 14:28:23.806162596 +0100
+++ bltk-1.0.9/tools/bltk/Makefile	2009-12-08 14:28:23.875173697 +0100
@@ -14,7 +14,7 @@ HIDERS		= ../../include/bltk.h ../../inc
 TARGETS		= $(BIN)/bltk
 
 SHFILES		= \
-		bltk_hd_state bltk_save_sys_info bltk_get_info \
+		bltk_save_sys_info bltk_get_info \
 		bltk_get_ac_adapter bltk_get_bat bltk_get_cpustat \
 		bltk_get_cpufreq bltk_get_cpuinfo bltk_get_cpustate \
 		bltk_get_dmidecode bltk_get_hdparm \
diff -up bltk-1.0.9/tools/bltk/stat.c.sec_sudo bltk-1.0.9/tools/bltk/stat.c
--- bltk-1.0.9/tools/bltk/stat.c.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/bltk/stat.c	2009-12-08 14:28:23.886191838 +0100
@@ -205,24 +205,6 @@ void turn_off_stat_memory(void)
 	}
 }
 
-#define	LAPTOP_MODE	"laptop_mode"
-
-static int laptop_mode_stop_done = 0;
-
-void laptop_mode_stop(void)
-{
-	char cmd[STR_LEN];
-
-	if (!stat_log_proc_flg || laptop_mode_stop_done) {
-		return;
-	}
-
-	laptop_mode_stop_done = 1;
-	debug("laptop_mode_stop()");
-	(void)sprintf(cmd, "%s %s >/dev/null 2>&1", bltk_sudo, LAPTOP_MODE);
-	(void)prog_system(cmd);
-}
-
 void stat_sync(char *why)
 {
 	debug("stat_sync() by %s", why);
@@ -320,7 +302,6 @@ void check_critical_state(void)
 				if (stat_memory_saved) {
 					send_sighup();
 				}
-				laptop_mode_stop();
 				if (!idle_test_mode) {
 					save_sys_info_2();
 				}
@@ -438,34 +419,6 @@ get_percentage_delta(ll_t val_100, ll_t 
 	return (ret);
 }
 
-void hd_state(char *str)
-{
-	char cmd[STR_LEN];
-	int ret;
-
-	if (hd_stat_ignore) {
-		(void)sprintf(str, "  -");
-		return;
-	}
-
-	(void)sprintf(cmd, "./bin/bltk_hd_state %s >>%s 2>&1",
-		      hd_dev_name, "/dev/null");
-
-	ret = prog_system(cmd);
-	ret = WEXITSTATUS(ret);
-	if (ret == 100) {
-		(void)sprintf(str, "err");
-	} else if (ret == 101) {
-		(void)sprintf(str, "a/i");
-	} else if (ret == 102) {
-		(void)sprintf(str, " st");
-	} else if (ret == 103) {
-		(void)sprintf(str, " sl");
-	} else {
-		(void)sprintf(str, "err");
-	}
-}
-
 static int get_display_state(void)
 {
 	char cmd[STR_LEN];
@@ -1129,7 +1082,7 @@ void write_report_str(char *work_type, c
 	if (hd_stat_ignore == 0) {
 		int del_rd = 0, del_wr = 0;
 
-		hd_state(shd);
+		sprintf(shd, "a/i");
 
 		if (hd_stat_rd_wr_ignore == 0) {
 			get_hd_stat(1, &c_hd_stat);
diff -up bltk-1.0.9/tools/Makefile.sec_sudo bltk-1.0.9/tools/Makefile
--- bltk-1.0.9/tools/Makefile.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/Makefile	2009-12-08 14:28:23.869162456 +0100
@@ -1,5 +1,5 @@
 
-SUBDIRS = xse bltk sudo get_realpath type_command analyzer time bat_drain
+SUBDIRS = xse bltk get_realpath type_command analyzer time bat_drain
 
 all : FORCE
 	@for dir in $(SUBDIRS); \
@@ -19,8 +19,5 @@ install :
 
 uninstall :
 
-su sudo : FORCE
-	$(MAKE) -C sudo
-
 FORCE :
 
diff -up bltk-1.0.9/tools/sudo/bltk_sudo.c.sec_sudo bltk-1.0.9/tools/sudo/bltk_sudo.c
diff -up bltk-1.0.9/tools/sudo/Makefile.sec_sudo bltk-1.0.9/tools/sudo/Makefile
diff -up bltk-1.0.9/wl_game/bltk_wl_game.sh.sec_sudo bltk-1.0.9/wl_game/bltk_wl_game.sh
--- bltk-1.0.9/wl_game/bltk_wl_game.sh.sec_sudo	2009-12-08 14:28:23.797167456 +0100
+++ bltk-1.0.9/wl_game/bltk_wl_game.sh	2009-12-08 14:28:23.887196668 +0100
@@ -81,7 +81,7 @@ clean_gmhome()
 {
 	if [[ -d $GMHOME ]]
 	then
-		CMD="$BLTK_SUDO_CMD rm -rf $GMHOME"
+		CMD="rm -rf $GMHOME"
 		$CMD
 		wl_check_error $? "$CMD failed"
 	fi
diff -up bltk-1.0.9/wl_player/bltk_wl_player.sh.sec_sudo bltk-1.0.9/wl_player/bltk_wl_player.sh
--- bltk-1.0.9/wl_player/bltk_wl_player.sh.sec_sudo	2009-12-08 14:28:23.821177150 +0100
+++ bltk-1.0.9/wl_player/bltk_wl_player.sh	2009-12-08 14:28:23.888191092 +0100
@@ -95,27 +95,6 @@ startup()
 ###	env | sort >env.log
 }
 
-set_dvd_config()
-{
-	typeset dvd
-
-	for d in /dev/cdrom /dev/hdc /dev/hdd /dev/sr0
-	do
-		if [[ -a $d ]]
-		then
-			dvd=$d
-			break
-		fi
-	done
-
-	if [[ ! -a /dev/dvd && ! -z $dvd ]]
-	then
-		$BLTK_SUDO_CMD ln -s $dvd /dev/dvd
-		$BLTK_SUDO_CMD chmod a+r /dev/dvd
-		$BLTK_SUDO_CMD hdparm -d1 /dev/dvd
-	fi
-}
-
 run1()
 {
 	ST_TIME=`$BLTK_TIME_CMD`
diff -up bltk-1.0.9/wl_reader/bltk_wl_reader.sh.sec_sudo bltk-1.0.9/wl_reader/bltk_wl_reader.sh
--- bltk-1.0.9/wl_reader/bltk_wl_reader.sh.sec_sudo	2009-12-08 14:28:23.841162495 +0100
+++ bltk-1.0.9/wl_reader/bltk_wl_reader.sh	2009-12-08 14:28:23.889162188 +0100
@@ -103,7 +103,7 @@ startup()
 	fi
 	if [[ $default_flg = TRUE ]]
 	then
-		CMD="$BLTK_SUDO_CMD rm -f $tmp_reader_file"
+		CMD="rm -f $tmp_reader_file"
 		$CMD
 		wl_check_error $? "$CMD fialed"
 


Index: bltk.spec
===================================================================
RCS file: /cvs/extras/rpms/bltk/F-12/bltk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bltk.spec	3 Sep 2009 06:39:57 -0000	1.7
+++ bltk.spec	11 Dec 2009 08:23:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		bltk
 Version:	1.0.9
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The BLTK measures notebook battery life under any workload
 
 Group:		Applications/System
@@ -26,9 +26,9 @@ Patch10: bltk-1.0.9-opt_player.patch
 Patch11: bltk-1.0.9-home_dir.patch
 Patch12: bltk-1.0.9-opt_reader.patch
 Patch13: bltk-1.0.9-installed.patch
-Patch14: bltk-1.0.9-sudo.patch
 Patch15: bltk-1.0.9-xse.patch
 Patch16: bltk-1.0.9-conf_home.patch
+Patch17: bltk-1.0.9-rm_sudo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,9 +66,9 @@ The following workloads are currently im
 %patch11 -p1 -b .home_dir
 %patch12 -p1 -b .opt_reader
 %patch13 -p1 -b .installed
-%patch14 -p1 -b .sudo
 %patch15 -p1 -b .xse
 %patch16 -p1 -b .conf_home
+%patch17 -p1 -b .rm_sudo
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -188,7 +188,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bltk/bin/bltk_get_user_field
 %{_libdir}/bltk/bin/bltk_get_xdpyinfo
 
-%{_libdir}/bltk/bin/bltk_hd_state
 %{_libdir}/bltk/bin/bltk_install
 %{_libdir}/bltk/bin/bltk_func
 %{_libdir}/bltk/bin/bltk_plot
@@ -199,7 +198,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bltk/bin/bltk_report_uncompress
 %{_libdir}/bltk/bin/bltk_save_sys_info
 %{_libdir}/bltk/bin/bltk_spy
-%attr(4755, root, root) %{_libdir}/bltk/bin/bltk_sudo
 %{_libdir}/bltk/bin/bltk_time
 %{_libdir}/bltk/bin/bltk_type_command
 %{_libdir}/bltk/bin/bltk_winid
@@ -233,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bltk/wl_reader/war_and_peace.html
 
 %changelog
+* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 1.0.9-7
+- fixed #542688 - bltk will run any cmd as root
+
 * Thu Sep 03 2009 Jiri Skala <jskala at redhat.com> 1.0.9-6
 - fixed misspelled bash variable with stop file
 


--- bltk-1.0.9-sudo.patch DELETED ---



From jfch2222 at fedoraproject.org  Fri Dec 11 08:25:09 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 11 Dec 2009 08:25:09 +0000 (UTC)
Subject: rpms/libssh/devel .cvsignore, 1.3, 1.4 libssh.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <20091211082509.E6A0311C00C5@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/libssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1172

Modified Files:
	.cvsignore libssh.spec sources 
Log Message:
bounce versionn to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libssh/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Nov 2009 08:26:31 -0000	1.3
+++ .cvsignore	11 Dec 2009 08:25:09 -0000	1.4
@@ -1 +1 @@
-libssh-0.3.92.tar.gz
+libssh-0.4.0.tar.gz


Index: libssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libssh/devel/libssh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libssh.spec	26 Nov 2009 12:42:14 -0000	1.10
+++ libssh.spec	11 Dec 2009 08:25:09 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libssh
-Version:        0.3.92 
-Release:        2%{?dist}
+Version:        0.4.0 
+Release:        1%{?dist}
 Summary:        A library implementing the SSH2 protocol (0xbadc0de version)
 
 Group:          System Environment/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Fri Dec 11 2009 Jan F. Chadima <jchadima at redhat.com> - 0.4.0-1
+- bounce versionn to 0.4.0 (#541010)
+
 * Thu Nov 26 2009 Jan F. Chadima <jchadima at redhat.com> - 0.3.92-2
 - typo in spec file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libssh/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Nov 2009 08:26:31 -0000	1.3
+++ sources	11 Dec 2009 08:25:09 -0000	1.4
@@ -1 +1 @@
-4283e57f349c342c8288ebe00e655b01  libssh-0.3.92.tar.gz
+bcb3d567bacd54c9f6b5b0e8c4d1102c  libssh-0.4.0.tar.gz



From whot at fedoraproject.org  Fri Dec 11 08:30:39 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 11 Dec 2009 08:30:39 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-12 .cvsignore, 1.42, 1.43 sources, 1.42, 
	1.43 xorg-x11-drv-evdev.spec, 1.68, 1.69
Message-ID: <20091211083039.9643B11C02CA@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2774

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Fri Dec 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.2-1
- evdev 2.3.2
- disable autoreconf, we're not building from git anymore.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	20 Nov 2009 01:42:59 -0000	1.42
+++ .cvsignore	11 Dec 2009 08:30:39 -0000	1.43
@@ -1 +1 @@
-xf86-input-evdev-2.3.1.tar.bz2
+xf86-input-evdev-2.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	20 Nov 2009 01:42:59 -0000	1.42
+++ sources	11 Dec 2009 08:30:39 -0000	1.43
@@ -1 +1 @@
-e56ce4424b89b2409c6e73e007a85da7  xf86-input-evdev-2.3.1.tar.bz2
+b2bfe368022eedf2671ee28daba31efc  xf86-input-evdev-2.3.2.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/xorg-x11-drv-evdev.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- xorg-x11-drv-evdev.spec	20 Nov 2009 01:50:14 -0000	1.68
+++ xorg-x11-drv-evdev.spec	11 Dec 2009 08:30:39 -0000	1.69
@@ -6,8 +6,8 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.3.1
-Release:    2%{?dist}
+Version:    2.3.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -36,7 +36,7 @@ X.Org X11 evdev input driver.
 %setup -q -n %{tarball}-%{version}
 
 %build
-autoreconf -v --install || exit 1
+#autoreconf -v --install || exit 1
 %configure --disable-static
 make
 
@@ -72,6 +72,10 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Fri Dec 11 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.2-1
+- evdev 2.3.2
+- disable autoreconf, we're not building from git anymore.
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.1-2
 - 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch
   drop, merged upstream.



From jpopelka at fedoraproject.org  Fri Dec 11 08:31:07 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri, 11 Dec 2009 08:31:07 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.566,1.567
Message-ID: <20091211083107.81E3411C00C5@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2990

Modified Files:
	cups.spec 
Log Message:
Bug number fixed


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -p -r1.566 -r1.567
--- cups.spec	10 Dec 2009 18:31:27 -0000	1.566
+++ cups.spec	11 Dec 2009 08:31:07 -0000	1.567
@@ -542,7 +542,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
-- Fixed invalid read in cupsAddDest (bug #547460).
+- Fixed invalid read in cupsAddDest (bug #537460).
 
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
 - Use upstream patch to fix scheduler crash when an active printer was



From jpopelka at fedoraproject.org  Fri Dec 11 08:31:43 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri, 11 Dec 2009 08:31:43 +0000 (UTC)
Subject: rpms/cups/F-12 cups.spec,1.563,1.564
Message-ID: <20091211083143.2CD5511C00C5@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3203

Modified Files:
	cups.spec 
Log Message:
Bug number fixed


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -p -r1.563 -r1.564
--- cups.spec	10 Dec 2009 18:18:57 -0000	1.563
+++ cups.spec	11 Dec 2009 08:31:42 -0000	1.564
@@ -552,7 +552,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
-- Fixed invalid read in cupsAddDest (bug #547460).
+- Fixed invalid read in cupsAddDest (bug #537460).
 
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
 - Use upstream patch to fix scheduler crash when an active printer was



From jpopelka at fedoraproject.org  Fri Dec 11 08:32:20 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri, 11 Dec 2009 08:32:20 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.556,1.557
Message-ID: <20091211083220.0CB7D11C00C5@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3396

Modified Files:
	cups.spec 
Log Message:
Bug number fixed


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -p -r1.556 -r1.557
--- cups.spec	10 Dec 2009 18:17:41 -0000	1.556
+++ cups.spec	11 Dec 2009 08:32:19 -0000	1.557
@@ -546,7 +546,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
-- Fixed invalid read in cupsAddDest (bug #547460).
+- Fixed invalid read in cupsAddDest (bug #537460).
 
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
 - Use upstream patch to fix scheduler crash when an active printer was



From jskala at fedoraproject.org  Fri Dec 11 08:35:18 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 11 Dec 2009 08:35:18 +0000 (UTC)
Subject: rpms/bltk/devel bltk-1.0.9-rm_sudo.patch, NONE, 1.1 bltk.spec, 1.7, 
	1.8 bltk-1.0.9-sudo.patch, 1.1, NONE
Message-ID: <20091211083518.750E511C00C5@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/bltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4186

Modified Files:
	bltk.spec 
Added Files:
	bltk-1.0.9-rm_sudo.patch 
Removed Files:
	bltk-1.0.9-sudo.patch 
Log Message:
* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 1.0.9-7
- fixes #542688 - bltk will run any command as root


bltk-1.0.9-rm_sudo.patch:
 Makefile                          |    4 --
 include/bltk.h                    |    2 -
 tools/Makefile                    |    5 ---
 tools/bat_drain/bat_drain.sh      |   20 +------------
 tools/bltk/Makefile               |    2 -
 tools/bltk/bltk_check.sh          |    8 -----
 tools/bltk/bltk_get_dmidecode.sh  |   58 +-------------------------------------
 tools/bltk/bltk_get_hdparm.sh     |   47 ++++++++++++++++++++----------
 tools/bltk/bltk_get_user_field.sh |   47 ++++++++++++++++++++----------
 tools/bltk/bltk_install.sh        |   12 -------
 tools/bltk/bltk_save_sys_info.sh  |   30 ++-----------------
 tools/bltk/bltk_wl_common.sh      |   23 ---------------
 tools/bltk/main.c                 |   45 -----------------------------
 tools/bltk/stat.c                 |   49 --------------------------------
 wl_game/bltk_wl_game.sh           |    2 -
 wl_player/bltk_wl_player.sh       |   21 -------------
 wl_reader/bltk_wl_reader.sh       |    2 -
 17 files changed, 77 insertions(+), 300 deletions(-)

--- NEW FILE bltk-1.0.9-rm_sudo.patch ---
diff -up bltk-1.0.9/include/bltk.h.sec_sudo bltk-1.0.9/include/bltk.h
--- bltk-1.0.9/include/bltk.h.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/include/bltk.h	2009-12-08 14:28:23.868162165 +0100
@@ -429,8 +429,6 @@ extern int dpms_proc_flg;
 
 extern char *results;
 
-extern char *bltk_sudo;
-
 extern int abort_flg;
 extern int ac_ignore;
 
diff -up bltk-1.0.9/Makefile.sec_sudo bltk-1.0.9/Makefile
--- bltk-1.0.9/Makefile.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/Makefile	2009-12-08 14:28:23.868162165 +0100
@@ -89,10 +89,6 @@ clean : FORCE
 	@$(RM) *~ last_cmd last_results history
 	@$(RM) .bltk install.log uninstall.log .plot_history
 
-su : pre-install
-	$(MAKE) -C tools/sudo install
-	@touch .bltk
-
 _lazy : FORCE
 	@for f in $(CMDS); \
 	do \
diff -up bltk-1.0.9/tools/analyzer/bltk_report.sh.sec_sudo bltk-1.0.9/tools/analyzer/bltk_report.sh
diff -up bltk-1.0.9/tools/bat_drain/bat_drain.sh.sec_sudo bltk-1.0.9/tools/bat_drain/bat_drain.sh
--- bltk-1.0.9/tools/bat_drain/bat_drain.sh.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/bat_drain/bat_drain.sh	2009-12-10 13:55:46.454371019 +0100
@@ -100,16 +100,12 @@ set_bltk_root()
 set_bltk_root
 
 export BLTK_BIN=$BLTK_ROOT/bin
-export BLTK_SUDO=$BLTK_BIN/bltk_sudo
 export BLTK_GET_DMIDECODE=$BLTK_BIN/bltk_get_dmidecode
 export BLTK_GET_SYSTEM_RELEASE=$BLTK_BIN/bltk_get_system_release
 
-if [[ -x $BLTK_SUDO ]]
-then
-	MANUFACTURER=`$BLTK_SUDO $BLTK_GET_DMIDECODE -m`
-	PRODUCT_NAME=`$BLTK_SUDO $BLTK_GET_DMIDECODE -p`
-	SYSTEM_RELEASE=`$BLTK_GET_SYSTEM_RELEASE -v`
-fi
+MANUFACTURER=`cat /sys/devices/virtual/dmi/id/sys_vendor`
+PRODUCT_NAME=`cat /sys/devices/virtual/dmi/id/product_name`
+SYSTEM_RELEASE=`$BLTK_GET_SYSTEM_RELEASE -v`
 
 # percents
 BAT_CRITICAL=5
@@ -1874,16 +1870,6 @@ fini_user()
 	$fini_user_cmd
 }
 
-bat_startup()
-{
-	if [[ -x $BLTK_SUDO ]]
-	then
-		$BLTK_SUDO modprobe cpufreq_stats >/dev/null 2>&1
-	fi
-}
-
-bat_startup
-
 init_srgs "$@"
 
 if [[ $left_work_flg = TRUE ]]
diff -up bltk-1.0.9/tools/bltk/bltk_check.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_check.sh
--- bltk-1.0.9/tools/bltk/bltk_check.sh.sec_sudo	2009-12-08 14:28:23.846162271 +0100
+++ bltk-1.0.9/tools/bltk/bltk_check.sh	2009-12-08 14:28:23.876162742 +0100
@@ -85,14 +85,6 @@ command_line()
 cmd_startup
 [[ $? != 0 ]] && exit 1
 
-$BLTK_SUDO_CMD
-if [[ $? != 0 ]]
-then
-	echo "Cannot run $BLTK_SUDO_CMD"
-	echo "Please perform 'make su' command"
-	exit 2
-fi
-
 command_line "$@"
 
 #rm -rf $RES
diff -up bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh
--- bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh.sec_sudo	2009-12-08 14:28:23.825191233 +0100
+++ bltk-1.0.9/tools/bltk/bltk_get_dmidecode.sh	2009-12-08 14:28:23.877162125 +0100
@@ -74,65 +74,13 @@ command_line()
 	done
 
 	shift $((OPTIND-1))
-
-	DMIDECODE=$*
-	TMP_FILE=$BLTK_HOME/tmp/dmidecode
-
-	if [[ -z $DMIDECODE ]]
-	then
-		type -p dmidecode >/dev/null 2>&1
-		if [[ $? = 0 ]]
-		then
-			rm -f $TMP_FILE
-			$BLTK_SUDO_CMD dmidecode >$TMP_FILE
-			DMIDECODE=$TMP_FILE
-		else
-			if [[ $manufacturer_flg = TRUE ]]
-			then
-				:
-			elif [[ $product_name_flg = TRUE ]]
-			then
-				:
-			else
-				echo "MANUFACTURER ="
-				echo "PRODUCT_NAME ="
-			fi
-			exit 1
-		fi
-	fi
-
-	MANUFACTURER=
-	PRODUCT_NAME=
 }
 
 command_line "$@"
 
-while read line
-do
-	if [[ "$line" == *"System Information"* ]]
-	then
-		read line_m
-		read line_p
-		break
-	fi
-done < $DMIDECODE
-
-
-if [[ ! -z "$line_m" ]]
-then
-	if [[ "$line_m" == *"Manufacturer: "* ]]
-	then
-		MANUFACTURER=${line_m#Manufacturer: }
-	fi
-fi
+MANUFACTURER=`cat /sys/devices/virtual/dmi/id/sys_vendor`
 
-if [[ ! -z "$line_p" ]]
-then
-	if [[ "$line_p" == *"Product Name: "* ]]
-	then
-		PRODUCT_NAME=${line_p#Product Name: }
-	fi
-fi
+PRODUCT_NAME=`cat /sys/devices/virtual/dmi/id/product_name`
 
 if [[ $manufacturer_flg = TRUE ]]
 then
@@ -145,6 +93,4 @@ else
 	echo "PRODUCT_NAME = $PRODUCT_NAME"
 fi
 
-rm -f $TMP_FILE
-
 exit 0
diff -up bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh
--- bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh.sec_sudo	2009-12-08 14:28:23.817162439 +0100
+++ bltk-1.0.9/tools/bltk/bltk_get_hdparm.sh	2009-12-10 15:55:25.035367622 +0100
@@ -56,7 +56,12 @@ warning()
 
 PARTITIONS=$1
 
+FOUND=0
+READING=0
 TMP_FILE=$BLTK_HOME/tmp/hdparm
+DEV_INFO=$BLTK_HOME/tmp/dev_info
+
+/usr/bin/devkit-disks --dump > $TMP_FILE
 
 str=`ls -d /sys/block/sd* | sed 's/^.*sd/sd/'`
 DF_NAME=${str%% *}
@@ -70,30 +75,40 @@ fi
 
 HD_DEV_NAME=/dev/$HD_NAME
 
+while read line
+do
+  if [[ $READING -eq 0 && `echo $line | grep '^Showing'` ]]; then
+    READING=1
+  elif [[ $READING -eq 1 && `echo $line | grep =====` ]]; then
+    READING=0
+    if [ $FOUND -eq 1 ]; then
+      break;
+    else
+      rm $DEV_INFO
+    fi
+  fi
+
+  if [[ $READING -eq 1 ]]; then  
+    echo $line >> $DEV_INFO
+  fi
+
+  if [[ `echo $line | grep "device-file: *$HD_DEV_NAME"` ]]; then 
+    FOUND=1
+  fi
+done < $TMP_FILE
+
 rm -f $TMP_FILE
-$BLTK_SUDO_CMD hdparm -iI "$HD_DEV_NAME" >$TMP_FILE 2>&1
 
 echo "DF_NAME = $DF_NAME"
 echo "DF_DEV_NAME = $DF_DEV_NAME"
 echo "HD_NAME = $HD_NAME"
 echo "HD_DEV_NAME = $HD_DEV_NAME"
 
-str=`grep '^ Model=' $TMP_FILE`
-str=${str# Model=}
-str=${str%%, *}
-if [[ -z "$str" ]]
-then
-	str=`grep '^	Model Number:' $TMP_FILE`
-	str=${str#*Model Number:}
-	str=`echo $str`
-fi
-echo "HD_MODEL = $str"
+echo "HD_MODEL = `grep '^model:' $DEV_INFO | sed 's/^model: //'`"
 
-str=`grep 'device size with M = 1000' $TMP_FILE`
-str=${str#*device size with M = 1000*:}
-str=`echo $str`
-echo "HD_SIZE = $str"
+str=`grep '^size:' $DEV_INFO | sed 's/^size: //'`
+echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)"
 
-rm -f $TMP_FILE
+rm $DEV_INFO
 
 exit 0
diff -up bltk-1.0.9/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_get_user_field.sh
--- bltk-1.0.9/tools/bltk/bltk_get_user_field.sh.sec_sudo	2009-12-08 14:28:23.826177205 +0100
+++ bltk-1.0.9/tools/bltk/bltk_get_user_field.sh	2009-12-10 15:58:45.697370853 +0100
@@ -57,7 +57,12 @@ warning()
 FIELD_NO=$1
 DELIM=$1
 
+FOUND=0
+READING=0
 TMP_FILE=$BLTK_HOME/tmp/hdparm
+DEV_INFO=$BLTK_HOME/tmp/dev_info
+
+/usr/bin/devkit-disks --dump > $TMP_FILE
 
 #str=`df -lk / | grep -v ^Filesystem`
 str=`df -lk / | grep ^/dev/`
@@ -74,30 +79,40 @@ fi
 
 HD_DEV_NAME=/dev/$HD_NAME
 
+while read line
+do
+  if [[ $READING -eq 0 && `echo $line | grep '^Showing'` ]]; then
+    READING=1
+  elif [[ $READING -eq 1 && `echo $line | grep =====` ]]; then
+    READING=0
+    if [ $FOUND -eq 1 ]; then
+      break;
+    else
+      rm $DEV_INFO
+    fi
+  fi
+
+  if [[ $READING -eq 1 ]]; then  
+    echo $line >> $DEV_INFO
+  fi
+
+  if [[ `echo $line | grep "device-file: *$HD_DEV_NAME"` ]]; then 
+    FOUND=1
+  fi
+done < $TMP_FILE
+
 rm -f $TMP_FILE
-$BLTK_SUDO_CMD /sbin/hdparm -iI "$HD_DEV_NAME" >$TMP_FILE 2>&1
 
 echo "DF_NAME = $DF_NAME"
 echo "DF_DEV_NAME = $DF_DEV_NAME"
 echo "HD_NAME = $HD_NAME"
 echo "HD_DEV_NAME = $HD_DEV_NAME"
 
-str=`grep '^ Model=' $TMP_FILE`
-str=${str# Model=}
-str=${str%%, *}
-if [[ -z "$str" ]]
-then
-	str=`grep '^	Model Number:' $TMP_FILE`
-	str=${str#*Model Number:}
-	str=`echo $str`
-fi
-echo "HD_MODEL = $str"
+echo "HD_MODEL = `grep '^model:' $DEV_INFO | sed 's/^model: //'`"
 
-str=`grep 'device size with M = 1000' $TMP_FILE`
-str=${str#*device size with M = 1000*:}
-str=`echo $str`
-echo "HD_SIZE = $str"
+str=`grep '^size:' $DEV_INFO | sed 's/^size: //'`
+echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)"
 
-rm -f $TMP_FILE
+rm $DEV_INFO
 
 exit 0
diff -up bltk-1.0.9/tools/bltk/bltk_hd_state.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_hd_state.sh
diff -up bltk-1.0.9/tools/bltk/bltk_install.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_install.sh
--- bltk-1.0.9/tools/bltk/bltk_install.sh.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/bltk/bltk_install.sh	2009-12-08 14:28:23.879167455 +0100
@@ -100,18 +100,6 @@ done
 cd $BLTK_ROOT
 [[ $? != 0 ]] && exit 1
 
-$BLTK_SUDO_CMD >/dev/null 2>&1
-if [[ $? != 0 ]]
-then
-	SU=TRUE
-fi
-
-if [[ $SU = TRUE ]]
-then
-	make su
-	[[ $? != 0 ]] && exit 1
-fi
-
 CWD=$PWD
 
 for work in $WORK
diff -up bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh
--- bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/bltk/bltk_save_sys_info.sh	2009-12-08 14:28:23.880163066 +0100
@@ -48,13 +48,6 @@ group=`id -gn`
 
 trap 'trap_action 1; exit 1' 1 2 3 6 15
 #trap 'echo trap 11 >&2' 11
-trap_action()
-{
-	[[ ! -a "$SAVEDIR" ]] && return
-	$BLTK_SUDO_CMD chown -h -R $user:$group $SAVEDIR
-	$BLTK_SUDO_CMD chmod -R a+rw $SAVEDIR
-	$BLTK_SUDO_CMD rm -rf $SAVEDIR
-}
 
 PROG=$0
 
@@ -102,10 +95,7 @@ SAVELIST="
 
 if [[ -a $SAVEDIR ]]
 then
-	CMD="$BLTK_SUDO_CMD chmod -R a+rw $SAVEDIR"
-	$CMD
-	[[ $? != 0 ]] && error "$CMD failed"
-	CMD="$BLTK_SUDO_CMD rm -rf $SAVEDIR"
+	CMD="rm -rf $SAVEDIR"
 	$CMD
 	[[ $? != 0 ]] && error "$CMD failed"
 fi
@@ -122,13 +112,13 @@ do
 	CMD="mkdir -p -m 0777 $dstdir"
 	$CMD
 	[[ $? != 0 ]] && error "$CMD failed"
-	CMD="$BLTK_SUDO_CMD cp -d -r $src $dst"
+	CMD="cp -d -r $src $dst"
 	$CMD
 	[[ $? != 0 ]] && warning "$CMD failed"
-	CMD="$BLTK_SUDO_CMD chown -h -R $user:$group $dst"
+	CMD="chown -h -R $user:$group $dst"
 	$CMD
 	[[ $? != 0 ]] && warning "$CMD failed"
-	CMD="$BLTK_SUDO_CMD chmod -R a+rw $dst"
+	CMD="chmod -R a+rw $dst"
 	$CMD
 	[[ $? != 0 ]] && warning "$CMD failed"
 done >>$SAVEDIR/err.log 2>&1
@@ -144,21 +134,9 @@ free >$SAVEDIR/free 2>&1
 df -lk >$SAVEDIR/df 2>&1
 ps -lef >$SAVEDIR/ps 2>&1
 ###	glxinfo >$SAVEDIR/glxinfo 2>&1
-$BLTK_SUDO_CMD dmidecode >$SAVEDIR/dmidecode 2>&1
 xset q >$SAVEDIR/xset 2>&1
 
 HDPARM=hdparm
 
-for h in hda hdb hdc hdd sda sdb sdc sdd
-do
-	grep " $h " /proc/diskstats >/dev/null 2>&1
-	if [[ $? = 0 ]]
-	then
-		$BLTK_SUDO_CMD $HDPARM /dev/$h >$SAVEDIR/hdparm.$h 2>&1
-		$BLTK_SUDO_CMD $HDPARM -iI /dev/$h >>$SAVEDIR/hdparm.$h 2>&1
-		$BLTK_SUDO_CMD $HDPARM -C /dev/$h >>$SAVEDIR/hdparm.$h 2>&1
-	fi
-done
-
 exit 0
 
diff -up bltk-1.0.9/tools/bltk/bltk_wl_common.sh.sec_sudo bltk-1.0.9/tools/bltk/bltk_wl_common.sh
--- bltk-1.0.9/tools/bltk/bltk_wl_common.sh.sec_sudo	2009-12-08 14:28:23.847162491 +0100
+++ bltk-1.0.9/tools/bltk/bltk_wl_common.sh	2009-12-08 14:28:23.881171389 +0100
@@ -133,7 +133,6 @@ cmd_startup()
 	export BLTK_LIB=$BLTK_ROOT/lib
 	export BLTK_TMP=$HOME/.bltk/tmp
 
-	[[ -z $BLTK_SUDO_CMD ]] && export BLTK_SUDO_CMD=$BLTK_BIN/bltk_sudo
 	[[ -z $BLTK_CALC_CMD ]] && export BLTK_CALC_CMD=$BLTK_BIN/bltk_calc
 	[[ -z $BLTK_TIME_CMD ]] && export BLTK_TIME_CMD=$BLTK_BIN/bltk_time
 	[[ -z $BLTK_TYPE_COMMAND_CMD ]] && export BLTK_TYPE_COMMAND_CMD=$BLTK_BIN/bltk_type_command
@@ -211,7 +210,6 @@ wl_startup()
 
 	export BLTK_WL_INSTALL_FILE=$BLTK_WL_ROOT/.installed
 
-	[[ -z $BLTK_SUDO_CMD ]] && export BLTK_SUDO_CMD=$BLTK_BIN/bltk_sudo
 	[[ -z $BLTK_CALC_CMD ]] && export BLTK_CALC_CMD=$BLTK_BIN/bltk_calc
 	[[ -z $BLTK_TIME_CMD ]] && export BLTK_TIME_CMD=$BLTK_BIN/bltk_time
 	[[ -z $BLTK_TYPE_COMMAND_CMD ]] && export BLTK_TYPE_COMMAND_CMD=$BLTK_BIN/bltk_type_command
@@ -540,27 +538,6 @@ wl_remove_dir()
 	return 0
 }
 
-wl_remove_dir_su()
-{
-	typeset	dir=$1
-
-	if [[ -a $dir ]]
-	then
-		CMD="$BLTK_SUDO_CMD rm -rf $dir"
-		$CMD
-		if [[ $? != 0 ]]
-		then
-			wl_error_msg "$CMD failed"
-			wl_error_msg "Cannot remove $dir"
-			return 1
-		fi
-	fi
-#	CMD="rmdir -p `dirname $dir`"
-#	$CMD >/dev/null 2>&1
-#	return 0
-	return 0
-}
-
 wl_move_dir()
 {
 	typeset	dir1=$1
diff -up bltk-1.0.9/tools/bltk/main.c.sec_sudo bltk-1.0.9/tools/bltk/main.c
--- bltk-1.0.9/tools/bltk/main.c.sec_sudo	2009-12-08 14:28:23.852162407 +0100
+++ bltk-1.0.9/tools/bltk/main.c	2009-12-08 14:28:23.883191456 +0100
@@ -215,8 +215,6 @@ int stat_system = 0;
 int comment_cnt = 0;
 char *comment[MAX_LINES];
 
-char *bltk_sudo = "bltk_sudo_NOT_SET";
-
 char stop_fname[STR_LEN];
 
 int show_demo = 0;
@@ -250,7 +248,6 @@ int debug_workload_flg = 0;
 
 int start_prog_flg = 0;
 char *start_prog = NULL;
-int start_prog_su_flg = 0;
 
 xtime_t arg_time = EMPTY_VALUE;
 xtime_t idle_test_time = EMPTY_VALUE;
@@ -946,15 +943,6 @@ static void start_warning2(void)
 	write_to_stdout_work_out_log("Do NOT touch anything\n");
 }
 
-static void pre_init_vars(void)
-{
-	char cmd[STR_LEN];
-
-	(void)sprintf(cmd, "%s modprobe cpufreq_stats >>%s 2>&1",
-		      bltk_sudo, warning_log_fname);
-	(void)prog_system(cmd);
-}
-
 static int environment_init(int argc, char **argv)
 {
 	char cmdline[STR_LEN];
@@ -1056,26 +1044,6 @@ static int environment_init(int argc, ch
 	(void)sprintf(cmd, "%s >%s/cmd", cmdline, results);
 	(void)prog_system(cmd);
 
-	(void)sprintf(str, "%s/bin/bltk_sudo", bltk_root);
-	bltk_sudo = strdup(str);
-	if (access(str, X_OK) != 0) {
-		(void)sprintf(prt_str, "Cannot access %s\n", str);
-		write_to_err_log(prt_str);
-		(void)sprintf(prt_str, "Please perform 'make su' command\n");
-		write_to_err_log(prt_str);
-		prog_exit(1);
-	}
-	(void)sprintf(cmd, "%s/bin/bltk_sudo", bltk_root);
-	ret = prog_system(cmd);
-	if (ret != 0) {
-		(void)sprintf(prt_str, "Cannot run %s\n", str);
-		write_to_err_log(prt_str);
-		(void)sprintf(prt_str, "Please perform 'make su' command\n");
-		write_to_err_log(prt_str);
-		prog_exit(1);
-	}
-	prog_putenv("BLTK_SUDO_CMD", str);
-
 	set_signal(SIGTERM);
 	set_signal(SIGINT);
 	set_signal(SIGQUIT);
@@ -1092,8 +1060,6 @@ static int environment_init(int argc, ch
 		prog_exit(1);
 	}
 
-	pre_init_vars();
-
 	init_vars();
 
 	return (0);
@@ -2021,11 +1987,6 @@ int main(int argc, char **argv)
 		case 'e':
 			start_prog_flg = 1;
 			start_prog = optarg;
-			start_prog_su_flg = 1;
-			break;
-		case 'E':
-			start_prog_flg = 1;
-			start_prog = optarg;
 			break;
 		case 'y':
 			yes = 1;
@@ -2449,11 +2410,7 @@ int main(int argc, char **argv)
 	}
 
 	if (start_prog_flg) {
-		if (start_prog_su_flg) {
-			(void)sprintf(cmd, "%s '%s'", bltk_sudo, start_prog);
-		} else {
-			(void)sprintf(cmd, "%s", start_prog);
-		}
+		(void)sprintf(cmd, "%s", start_prog);
 		(void)sprintf(prt_str, "Start prog %s\n", cmd);
 		write_to_stdout_work_out_log(prt_str);
 		ret = prog_system(cmd);
diff -up bltk-1.0.9/tools/bltk/Makefile.sec_sudo bltk-1.0.9/tools/bltk/Makefile
--- bltk-1.0.9/tools/bltk/Makefile.sec_sudo	2009-12-08 14:28:23.806162596 +0100
+++ bltk-1.0.9/tools/bltk/Makefile	2009-12-08 14:28:23.875173697 +0100
@@ -14,7 +14,7 @@ HIDERS		= ../../include/bltk.h ../../inc
 TARGETS		= $(BIN)/bltk
 
 SHFILES		= \
-		bltk_hd_state bltk_save_sys_info bltk_get_info \
+		bltk_save_sys_info bltk_get_info \
 		bltk_get_ac_adapter bltk_get_bat bltk_get_cpustat \
 		bltk_get_cpufreq bltk_get_cpuinfo bltk_get_cpustate \
 		bltk_get_dmidecode bltk_get_hdparm \
diff -up bltk-1.0.9/tools/bltk/stat.c.sec_sudo bltk-1.0.9/tools/bltk/stat.c
--- bltk-1.0.9/tools/bltk/stat.c.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/bltk/stat.c	2009-12-08 14:28:23.886191838 +0100
@@ -205,24 +205,6 @@ void turn_off_stat_memory(void)
 	}
 }
 
-#define	LAPTOP_MODE	"laptop_mode"
-
-static int laptop_mode_stop_done = 0;
-
-void laptop_mode_stop(void)
-{
-	char cmd[STR_LEN];
-
-	if (!stat_log_proc_flg || laptop_mode_stop_done) {
-		return;
-	}
-
-	laptop_mode_stop_done = 1;
-	debug("laptop_mode_stop()");
-	(void)sprintf(cmd, "%s %s >/dev/null 2>&1", bltk_sudo, LAPTOP_MODE);
-	(void)prog_system(cmd);
-}
-
 void stat_sync(char *why)
 {
 	debug("stat_sync() by %s", why);
@@ -320,7 +302,6 @@ void check_critical_state(void)
 				if (stat_memory_saved) {
 					send_sighup();
 				}
-				laptop_mode_stop();
 				if (!idle_test_mode) {
 					save_sys_info_2();
 				}
@@ -438,34 +419,6 @@ get_percentage_delta(ll_t val_100, ll_t 
 	return (ret);
 }
 
-void hd_state(char *str)
-{
-	char cmd[STR_LEN];
-	int ret;
-
-	if (hd_stat_ignore) {
-		(void)sprintf(str, "  -");
-		return;
-	}
-
-	(void)sprintf(cmd, "./bin/bltk_hd_state %s >>%s 2>&1",
-		      hd_dev_name, "/dev/null");
-
-	ret = prog_system(cmd);
-	ret = WEXITSTATUS(ret);
-	if (ret == 100) {
-		(void)sprintf(str, "err");
-	} else if (ret == 101) {
-		(void)sprintf(str, "a/i");
-	} else if (ret == 102) {
-		(void)sprintf(str, " st");
-	} else if (ret == 103) {
-		(void)sprintf(str, " sl");
-	} else {
-		(void)sprintf(str, "err");
-	}
-}
-
 static int get_display_state(void)
 {
 	char cmd[STR_LEN];
@@ -1129,7 +1082,7 @@ void write_report_str(char *work_type, c
 	if (hd_stat_ignore == 0) {
 		int del_rd = 0, del_wr = 0;
 
-		hd_state(shd);
+		sprintf(shd, "a/i");
 
 		if (hd_stat_rd_wr_ignore == 0) {
 			get_hd_stat(1, &c_hd_stat);
diff -up bltk-1.0.9/tools/Makefile.sec_sudo bltk-1.0.9/tools/Makefile
--- bltk-1.0.9/tools/Makefile.sec_sudo	2009-07-29 11:38:48.000000000 +0200
+++ bltk-1.0.9/tools/Makefile	2009-12-08 14:28:23.869162456 +0100
@@ -1,5 +1,5 @@
 
-SUBDIRS = xse bltk sudo get_realpath type_command analyzer time bat_drain
+SUBDIRS = xse bltk get_realpath type_command analyzer time bat_drain
 
 all : FORCE
 	@for dir in $(SUBDIRS); \
@@ -19,8 +19,5 @@ install :
 
 uninstall :
 
-su sudo : FORCE
-	$(MAKE) -C sudo
-
 FORCE :
 
diff -up bltk-1.0.9/tools/sudo/bltk_sudo.c.sec_sudo bltk-1.0.9/tools/sudo/bltk_sudo.c
diff -up bltk-1.0.9/tools/sudo/Makefile.sec_sudo bltk-1.0.9/tools/sudo/Makefile
diff -up bltk-1.0.9/wl_game/bltk_wl_game.sh.sec_sudo bltk-1.0.9/wl_game/bltk_wl_game.sh
--- bltk-1.0.9/wl_game/bltk_wl_game.sh.sec_sudo	2009-12-08 14:28:23.797167456 +0100
+++ bltk-1.0.9/wl_game/bltk_wl_game.sh	2009-12-08 14:28:23.887196668 +0100
@@ -81,7 +81,7 @@ clean_gmhome()
 {
 	if [[ -d $GMHOME ]]
 	then
-		CMD="$BLTK_SUDO_CMD rm -rf $GMHOME"
+		CMD="rm -rf $GMHOME"
 		$CMD
 		wl_check_error $? "$CMD failed"
 	fi
diff -up bltk-1.0.9/wl_player/bltk_wl_player.sh.sec_sudo bltk-1.0.9/wl_player/bltk_wl_player.sh
--- bltk-1.0.9/wl_player/bltk_wl_player.sh.sec_sudo	2009-12-08 14:28:23.821177150 +0100
+++ bltk-1.0.9/wl_player/bltk_wl_player.sh	2009-12-08 14:28:23.888191092 +0100
@@ -95,27 +95,6 @@ startup()
 ###	env | sort >env.log
 }
 
-set_dvd_config()
-{
-	typeset dvd
-
-	for d in /dev/cdrom /dev/hdc /dev/hdd /dev/sr0
-	do
-		if [[ -a $d ]]
-		then
-			dvd=$d
-			break
-		fi
-	done
-
-	if [[ ! -a /dev/dvd && ! -z $dvd ]]
-	then
-		$BLTK_SUDO_CMD ln -s $dvd /dev/dvd
-		$BLTK_SUDO_CMD chmod a+r /dev/dvd
-		$BLTK_SUDO_CMD hdparm -d1 /dev/dvd
-	fi
-}
-
 run1()
 {
 	ST_TIME=`$BLTK_TIME_CMD`
diff -up bltk-1.0.9/wl_reader/bltk_wl_reader.sh.sec_sudo bltk-1.0.9/wl_reader/bltk_wl_reader.sh
--- bltk-1.0.9/wl_reader/bltk_wl_reader.sh.sec_sudo	2009-12-08 14:28:23.841162495 +0100
+++ bltk-1.0.9/wl_reader/bltk_wl_reader.sh	2009-12-08 14:28:23.889162188 +0100
@@ -103,7 +103,7 @@ startup()
 	fi
 	if [[ $default_flg = TRUE ]]
 	then
-		CMD="$BLTK_SUDO_CMD rm -f $tmp_reader_file"
+		CMD="rm -f $tmp_reader_file"
 		$CMD
 		wl_check_error $? "$CMD fialed"
 


Index: bltk.spec
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bltk.spec	3 Sep 2009 06:39:57 -0000	1.7
+++ bltk.spec	11 Dec 2009 08:35:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		bltk
 Version:	1.0.9
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The BLTK measures notebook battery life under any workload
 
 Group:		Applications/System
@@ -12,7 +12,6 @@ Source2:  OOCALC_FILE_SAMPLE.ods
 Source3:  OODRAW_FILE_SAMPLE.odg
 Source4:  OOWRITER_FILE_SAMPLE.odt
 
-#Patch0:  bltk-1.0.9-all.patch
 Patch1:  bltk-1.0.9-man.patch
 Patch2:  bltk-1.0.9-office_scen.patch
 Patch3:  bltk-1.0.9-bltk_paths.patch
@@ -26,9 +25,9 @@ Patch10: bltk-1.0.9-opt_player.patch
 Patch11: bltk-1.0.9-home_dir.patch
 Patch12: bltk-1.0.9-opt_reader.patch
 Patch13: bltk-1.0.9-installed.patch
-Patch14: bltk-1.0.9-sudo.patch
 Patch15: bltk-1.0.9-xse.patch
 Patch16: bltk-1.0.9-conf_home.patch
+Patch17: bltk-1.0.9-rm_sudo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,9 +65,9 @@ The following workloads are currently im
 %patch11 -p1 -b .home_dir
 %patch12 -p1 -b .opt_reader
 %patch13 -p1 -b .installed
-%patch14 -p1 -b .sudo
 %patch15 -p1 -b .xse
 %patch16 -p1 -b .conf_home
+%patch17 -p1 -b .rm_sudo
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -188,7 +187,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bltk/bin/bltk_get_user_field
 %{_libdir}/bltk/bin/bltk_get_xdpyinfo
 
-%{_libdir}/bltk/bin/bltk_hd_state
 %{_libdir}/bltk/bin/bltk_install
 %{_libdir}/bltk/bin/bltk_func
 %{_libdir}/bltk/bin/bltk_plot
@@ -199,7 +197,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bltk/bin/bltk_report_uncompress
 %{_libdir}/bltk/bin/bltk_save_sys_info
 %{_libdir}/bltk/bin/bltk_spy
-%attr(4755, root, root) %{_libdir}/bltk/bin/bltk_sudo
 %{_libdir}/bltk/bin/bltk_time
 %{_libdir}/bltk/bin/bltk_type_command
 %{_libdir}/bltk/bin/bltk_winid
@@ -233,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bltk/wl_reader/war_and_peace.html
 
 %changelog
+* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 1.0.9-7
+- fixes #542688 - bltk will run any command as root
+
 * Thu Sep 03 2009 Jiri Skala <jskala at redhat.com> 1.0.9-6
 - fixed misspelled bash variable with stop file
 


--- bltk-1.0.9-sudo.patch DELETED ---



From nim at fedoraproject.org  Fri Dec 11 08:35:31 2009
From: nim at fedoraproject.org (nim)
Date: Fri, 11 Dec 2009 08:35:31 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.116,1.117
Message-ID: <20091211083531.404EC11C00C5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4282

Modified Files:
	comps-f13.xml.in 
Log Message:
sort


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- comps-f13.xml.in	11 Dec 2009 06:02:26 -0000	1.116
+++ comps-f13.xml.in	11 Dec 2009 08:35:30 -0000	1.117
@@ -661,8 +661,6 @@
     <langonly>zh</langonly>
     <packagelist>
       <packagereq type="mandatory">wqy-zenhei-fonts</packagereq>
-      <packagereq type="default">cjkuni-ukai-fonts</packagereq>
-      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="conditional" requires="autocorr-en">autocorr-zh</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh_TW</packagereq>
@@ -680,6 +678,8 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_CN</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
       <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
+      <packagereq type="default">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">ibus-table-array30</packagereq>
       <packagereq type="optional">ibus-table-cangjie</packagereq>
@@ -1285,8 +1285,8 @@
       <packagereq type="mandatory">eclipse-jdt</packagereq>
       <packagereq type="default">eclipse-callgraph</packagereq>
       <packagereq type="default">eclipse-changelog</packagereq>
-      <packagereq type="default">eclipse-egit</packagereq>
       <packagereq type="default">eclipse-dtp</packagereq>
+      <packagereq type="default">eclipse-egit</packagereq>
       <packagereq type="default">eclipse-mylyn</packagereq>
       <packagereq type="default">eclipse-mylyn-java</packagereq>
       <packagereq type="default">eclipse-oprofile</packagereq>
@@ -1405,11 +1405,11 @@
       <packagereq type="default">avra</packagereq>
       <packagereq type="default">avrdude</packagereq>
       <packagereq type="default">covered</packagereq>
+      <packagereq type="default">dfu-programmer</packagereq>
       <packagereq type="default">dia-CMOS</packagereq>
       <packagereq type="default">dia-Digital</packagereq>
       <packagereq type="default">dia-electric2</packagereq>
       <packagereq type="default">dia-electronic</packagereq>
-      <packagereq type="default">dfu-programmer</packagereq>
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
       <packagereq type="default">eclipse-cdt</packagereq>
@@ -3077,10 +3077,8 @@
       <packagereq type="default">cabal2spec</packagereq>
       <packagereq type="default">darcs</packagereq>
       <packagereq type="default">ghc</packagereq>
-      <packagereq type="default">ghc-doc</packagereq>
-      <packagereq type="default">happy</packagereq>
-      <packagereq type="default">haskell-platform</packagereq>
       <packagereq type="default">ghc-cgi-devel</packagereq>
+      <packagereq type="default">ghc-doc</packagereq>
       <packagereq type="default">ghc-editline-devel</packagereq>
       <packagereq type="default">ghc-fgl-devel</packagereq>
       <packagereq type="default">ghc-GLUT-devel</packagereq>
@@ -3091,6 +3089,8 @@
       <packagereq type="default">ghc-time-devel</packagereq>
       <packagereq type="default">ghc-utf8-string-devel</packagereq>
       <packagereq type="default">ghc-zlib-devel</packagereq>
+      <packagereq type="default">happy</packagereq>
+      <packagereq type="default">haskell-platform</packagereq>
       <packagereq type="optional">cpphs</packagereq>
       <packagereq type="optional">ghc-gtk-devel</packagereq>
       <packagereq type="optional">ghc-gtk2hs-doc</packagereq>
@@ -3766,9 +3766,9 @@
       <packagereq type="optional">kbibtex</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
+      <packagereq type="optional">kcm_touchpad</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
       <packagereq type="optional">kcometen4</packagereq>
-      <packagereq type="optional">kcm_touchpad</packagereq>
       <packagereq type="optional">kde-colorscheme-plastik</packagereq>
       <packagereq type="optional">kde-plasma-ihatethecashew</packagereq>
       <packagereq type="optional">kde-plasma-ktorrent</packagereq>
@@ -5577,9 +5577,9 @@
       <packagereq type="optional">iftop</packagereq>
       <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
-      <packagereq type="optional">ipsec-tools</packagereq>
       <packagereq type="optional">iotop</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
+      <packagereq type="optional">ipsec-tools</packagereq>
       <packagereq type="optional">iptraf</packagereq>
       <packagereq type="optional">ircp-tray</packagereq>
       <packagereq type="optional">isic</packagereq>
@@ -5811,10 +5811,10 @@
       <packagereq type="optional">trickle</packagereq>
       <packagereq type="optional">w3m</packagereq>
       <packagereq type="optional">websec</packagereq>
+      <packagereq type="optional">whatmask</packagereq>
       <packagereq type="optional">xprobe2</packagereq>
       <packagereq type="optional">yafc</packagereq>
       <packagereq type="optional">youtube-dl</packagereq>
-      <packagereq type="optional">whatmask</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5978,8 +5978,8 @@
       <packagereq type="mandatory">paktype-naqsh-fonts</packagereq>
       <packagereq type="mandatory">paktype-tehreer-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ur</packagereq>
-      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">nafees-web-naskh-fonts</packagereq>



From nim at fedoraproject.org  Fri Dec 11 08:37:15 2009
From: nim at fedoraproject.org (nim)
Date: Fri, 11 Dec 2009 08:37:15 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.117,1.118
Message-ID: <20091211083715.629CC11C00C5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4751

Modified Files:
	comps-f13.xml.in 
Log Message:
add woffs


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- comps-f13.xml.in	11 Dec 2009 08:35:30 -0000	1.117
+++ comps-f13.xml.in	11 Dec 2009 08:37:14 -0000	1.118
@@ -1805,6 +1805,8 @@
       <packagereq type="optional">scribus</packagereq>
       <packagereq type="optional">scribus-doc</packagereq>
       <packagereq type="optional">subversion</packagereq>
+      <packagereq type="optional">woff</packagereq>
+      <packagereq type="optional">woffTools</packagereq>
       <packagereq type="optional">xmbdfed</packagereq>
     </packagelist>
   </group>



From jfch2222 at fedoraproject.org  Fri Dec 11 08:39:05 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 11 Dec 2009 08:39:05 +0000 (UTC)
Subject: rpms/libssh/F-12 libssh.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091211083905.700FC11C00C5@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/libssh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5187

Modified Files:
	libssh.spec sources 
Log Message:
bounce versionn to 0.4.0


Index: libssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libssh/F-12/libssh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libssh.spec	21 Aug 2009 14:21:43 -0000	1.3
+++ libssh.spec	11 Dec 2009 08:39:05 -0000	1.4
@@ -1,17 +1,18 @@
 Name:           libssh
-Version:        0.2 
-Release:        4%{?dist}
+Version:        0.4.0 
+Release:        1%{?dist}
 Summary:        A library implementing the SSH2 protocol (0xbadc0de version)
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://0xbadc0de.be/?part=libssh
-Source0:        http://0xbadc0de.be/libssh/%{name}-%{version}.tgz
-Patch0:         libssh-0.2-libdir.patch
+#original URL:	http://0xbadc0de.be/?part=libssh
+URL:            http://www.libssh.org/
+Source0:        http://www.libssh.org/files/rc/%{name}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel   
+BuildRequires:  cmake
 
 %description
 The SSH library with
@@ -33,14 +34,16 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .libdir
 
 %build
-%configure --disable-static --enable-shared
-make # doesn't build with %{?_smp_mflags}
+mkdir obj
+cd obj
+%cmake ..
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd obj
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} + 
 chmod 644 $RPM_BUILD_ROOT/usr/include/libssh/*
@@ -54,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING README
+%doc AUTHORS BSD ChangeLog COPYING README
 %{_libdir}/*.so.*
 
 %files devel
@@ -63,6 +66,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Fri Dec 11 2009 Jan F. Chadima <jchadima at redhat.com> - 0.4.0-1
+- bounce versionn to 0.4.0 (#541010)
+
+* Thu Nov 26 2009 Jan F. Chadima <jchadima at redhat.com> - 0.3.92-2
+- typo in spec file
+
+* Thu Nov 26 2009 Jan F. Chadima <jchadima at redhat.com> - 0.3.92-1
+- bounce versionn to 0.3.92 (0.4 beta2) (#541010)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-4
 - rebuilt with new openssl
 
@@ -74,3 +86,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jun 01 2009 Jan F. Chadima <jchadima at redhat.com> - 0.2-1
 - Initial build
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libssh/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 13:12:03 -0000	1.2
+++ sources	11 Dec 2009 08:39:05 -0000	1.3
@@ -1 +1 @@
-8a76c03579a3e27046e6bafe88ffd171  libssh-0.2.tgz
+bcb3d567bacd54c9f6b5b0e8c4d1102c  libssh-0.4.0.tar.gz



From sbose at fedoraproject.org  Fri Dec 11 08:48:51 2009
From: sbose at fedoraproject.org (sbose)
Date: Fri, 11 Dec 2009 08:48:51 +0000 (UTC)
Subject: rpms/ctdb/F-12 0001-Fixes-for-init-script-to-meet-guidelines.patch, 
	NONE, 1.1 .cvsignore, 1.11, 1.12 ctdb.spec, 1.14, 1.15 sources,
	1.11, 1.12
Message-ID: <20091211084851.8A2FE11C00C5@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7770

Modified Files:
	.cvsignore ctdb.spec sources 
Added Files:
	0001-Fixes-for-init-script-to-meet-guidelines.patch 
Log Message:
Update to ctdb version 1.0.108
- added fix for bz537223
- added tdb-tools to Requires, fixes bz526479


0001-Fixes-for-init-script-to-meet-guidelines.patch:
 ctdb.init |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

--- NEW FILE 0001-Fixes-for-init-script-to-meet-guidelines.patch ---
>From f3aafa1329088531fdff480d37cec8c43125168a Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Tue, 24 Nov 2009 23:11:28 +0100
Subject: [PATCH] Fixes for init script to meet guidelines

---
 config/ctdb.init |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config/ctdb.init b/config/ctdb.init
index 67747fd..ca2f0fc 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -137,7 +137,7 @@ start() {
 
     ctdb ping >/dev/null 2>&1 && {
 	echo $"CTDB is already running"
-	return 1
+	return 0
     }
 
     build_ctdb_options
@@ -153,7 +153,7 @@ start() {
     case $init_style in
 	valgrind)
 	    valgrind -q --log-file=/var/log/ctdb_valgrind \
-		$ctdbd --nosetsched $CTDB_OPTIONS 
+		$ctdbd --nosetsched $CTDB_OPTIONS
 	    RETVAL=$?
 	    echo
 	    ;;
@@ -180,7 +180,7 @@ start() {
     set_ctdb_variables
 
     return $RETVAL
-}	
+}
 
 stop() {
     echo -n $"Shutting down ctdbd service: "
@@ -227,20 +227,26 @@ stop() {
 restart() {
     stop
     start
-}	
+}
 
 status() {
     echo -n $"Checking for ctdbd service: "
     ctdb ping >/dev/null 2>&1 || {
 	RETVAL=$?
-	echo -n "  ctdbd not running. "
 	case $init_style in
 	    suse)
+		echo -n "  ctdbd not running. "
 		set_retval $RETVAL
 		rc_status -v
 		;;
 	    redhat)
-		echo ""
+		if [ -f /var/lock/subsys/ctdb ]; then
+			echo $"ctdb dead but subsys locked"
+			RETVAL=2
+		else
+			echo $"ctdb is stopped"
+			RETVAL=3
+		fi
 		;;
 	esac
 	return $RETVAL
@@ -257,13 +263,13 @@ case "$1" in
     stop)
   	stop
 	;;
-    restart|reload)
+    restart|reload|force-reload)
   	restart
 	;;
     status)
   	status
 	;;
-    condrestart)
+    condrestart|try-restart)
   	ctdb status > /dev/null && restart || :
 	;;
     cron)
@@ -271,7 +277,7 @@ case "$1" in
   	ctdb status > /dev/null || restart
 	;;
     *)
-	echo $"Usage: $0 {start|stop|restart|status|cron|condrestart}"
+	echo $"Usage: $0 {start|stop|restart|reload|force-reload|status|cron|condrestart|try-restart}"
 	exit 1
 esac
 
-- 
1.6.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	29 Sep 2009 20:11:20 -0000	1.11
+++ .cvsignore	11 Dec 2009 08:48:51 -0000	1.12
@@ -1 +1 @@
-ctdb-1.0.91.tar.bz2
+ctdb-1.0.108.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/F-12/ctdb.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ctdb.spec	29 Sep 2009 20:11:20 -0000	1.14
+++ ctdb.spec	11 Dec 2009 08:48:51 -0000	1.15
@@ -2,7 +2,7 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 1.0.91
+Version: 1.0.108
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -17,8 +17,12 @@ Source0: %{name}-%{version}.tar.bz2
 # Fedora specific patch, ctdb should not be enabled by default in the runlevels
 Patch1: ctdb-no_default_runlevel.patch
 
+# Fix for bz537223, submitted to upstream for review http://lists.samba.org/archive/samba-technical/2009-November/068016.html
+Patch2: 0001-Fixes-for-init-script-to-meet-guidelines.patch
+
 Requires: chkconfig coreutils psmisc
 Requires: fileutils sed
+Requires: tdb-tools
 Requires(preun): chkconfig initscripts
 Requires(post): chkconfig
 Requires(postun): initscripts
@@ -51,6 +55,7 @@ and use CTDB instead.
 # setup the init script and sysconfig file
 %setup -T -D -n ctdb-%{version} -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -77,6 +82,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -m644 config/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
 install -m755 config/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
 
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/ctdb/tests/bin
+install -m755 tests/bin/ctdb_transaction $RPM_BUILD_ROOT%{_docdir}/ctdb/tests/bin
+
+
 # Remove "*.old" files
 find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
 
@@ -132,6 +141,188 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Tue Dec 8 2009 Sumit Bose <sbose at redhat.com> - 1.0.108-1
+ - Update to ctdb version 1.0.108
+ - added fix for bz537223
+ - added tdb-tools to Requires, fixes bz526479
+
+* Wed Dec 2 2009 Sumit Bose <sbose at redhat.com> - 1.0.107-1
+ - Update to ctdb version 1.0.107
+
+* Wed Dec 2 2009 : Version 1.0.107
+ - fix for rusty to solve a double-free that can happen when there are
+   multiple packets queued and the connection is destroyed before
+   all packets are processed.
+
+* Tue Dec 1 2009 : Version 1.0.106
+ - Buildscript changes from Michael Adam
+ - Dont do a full recovery when there is a mismatch detected for ip addresses,
+   just do a less disruptive ip-reallocation
+ - When starting ctdbd, wait until all initial recoveries have finished
+   before we issue the "startup" event.
+   So dont start services or monitoring until the cluster has
+   stabilized.
+ - Major eventscript overhaul by Ronnie, Rusty and Martins and fixes of a few
+   bugs found.
+
+* Thu Nov 19 2009 : Version 1.0.105
+ - Fix a bug where we could SEGV if multiple concurrent "ctdb eventscript ..."
+   are used and some of them block.
+ - Monitor the daemon from the syslog child process so we shutdown cleanly when
+   the main daemon terminates.
+ - Add a 500k line ringbuffer in memory where all log messages are stored.
+ - Add a "ctdb getlog <level>" command to pull log messages from the in memory
+   ringbuffer.
+ - From martin : fixes to cifs and nfs autotests
+ - from michael a : fix a bashism in 11.natgw
+
+* Fri Nov 6 2009 : Version 1.0.104
+ - Suggestion from Metze, we can now use killtcp to kill local connections
+   for nfs so change the killtcp script to kill both directions of an NFS
+   connection.
+   We used to deliberately only kill one direction in these cases due to
+   limitations.
+ - Suggestion from christian Ambach, when using natgw, try to avoid using a
+   UNHEALTHY node as the natgw master.
+ - From Michael Adam: Fix a SEGV bug in the recent change to the eventscripts
+   to allow the timeout to apply to each individual script.
+ - fix a talloc bug in teh vacuuming code that produced nasty valgrind
+   warnings.
+ - From Rusty: Set up ulimit to create core files for ctdb, and spawned
+   processes by default. This is useful for debugging and testing but can be
+   disabled by setting CTDB_SUPRESS_COREFILE=yes in the sysconfig file.
+ - Remove the wbinfo -t check from the startup check that winbindd is happy.
+ - Enhance the test for bond devices so we also check if the sysadmin have
+   disabled all slave devices using "ifdown".
+
+* Tue Nov 3 2009 : Version 1.0.103
+ - Dont use vacuuming on persistent databases
+ - Michael A : transaction updates to persistent databases
+ - Dont activate service automatically when installing the RPM. Leave this to
+   the admin.
+ - Create a child process to send all log messages to, to prevent a hung/slow
+   syslogd from blocking the main daemon. In this case, discard log messages
+   instead and let the child process block.
+ - Michael A: updates to log messages
+
+* Thu Oct 29 2009 : Version 1.0.102
+ - Wolfgang: fix for the vacuuming code
+ - Wolfgang: stronger tests for persistent database filename tests
+ - Improve the log message when we refuse to startup since wbinfo -t fails
+   to make it easier to spot in the log.
+ - Update the uptime command output and the man page to indicate that
+   "time since last ..." if from either the last recovery OR the last failover
+ - Michael A: transaction updates
+
+* Wed Oct 28 2009 : Version 1.0.101
+ - create a separate context for non-monitoring events so they dont interfere
+   with the monitor event
+ - make sure to return status 0 in teh callback when we abort an event
+
+* Wed Oct 28 2009 : Version 1.0.100
+ - Change eventscript handling to allow EventScriptTimeout for each individual
+   script instead of for all scripts as a whole.
+ - Enhanced logging from the eventscripts, log the name and the duration for
+   each script as it finishes.
+ - Add a check to use wbinfo -t for the startup event of samba
+ - TEMP: allow clients to attach to databases even when teh node is in recovery
+   mode
+ - dont run the monitor event as frequently after an event has failed
+ - DEBUG: in the eventloops, check the local time and warn if the time changes
+   backward or rapidly forward
+ - From Metze, fix a bug where recovery master becoming unhealthy did not
+   trigger an ip failover.
+ - Disable the multipath script by default
+ - Automatically re-activate the reclock checking if the reclock file is
+   specified at runtime. Update manpage to reflect this.
+ - Add a mechanism where samba can register a SRVID and if samba unexpectedly
+   disconnects, a message will be broadcasted to all other samba daemons.
+ - Log the pstree on hung scripts to a file in /tmp isntead of
+   /var/log/messages
+ - change ban count before unhealthy/banned to 10
+
+* Thu Oct 22 2009 : Version 1.0.99
+ - Fix a SEGV in the new db priority code.
+ - From Wolfgang : eliminate a ctdb_fatal() if there is a dmaster violation
+   detected.
+ - During testing we often add/delete eventscripts at runtime. This could cause
+   an eventscript to fail and mark the node unhealthy if an eventscript was
+   deleted while we were listing the names. Handle the errorcode and make sure
+   the node does not becomne unhealthy in this case.
+ - Lower the debuglevel for the messages when ctdb creates a filedescruiptor so
+   we dont spam the logs with these messages.
+ - Dont have the RPM automatically restart ctdb
+ - Volker : add a missing transaction_cancel() in the handling of persistent
+   databases
+ - Treat interfaces with the anme ethX* as bond devices in 10.interfaces so we
+   do the correct test for if they are up or not.
+
+* Tue Oct 20 2009 : Version 1.0.98
+ - Fix for the vacuuming database from Wolfgang M
+ - Create a directory where the test framework can put temporary overrides
+   to variables and functions.
+ - Wait a lot longer before shutting down the node when the reclock file
+   is incorrectly configured, and log where it is configured.
+ - Try to avoid running the "monitor" event when databases are frozen.
+ - Add logging for every time we create a filedescriptor so we can trap
+   fd leaks.
+
+* Thu Oct 14 2009 : Version 1.0.97
+ - From martins : update onnode.
+   Update onnode to allow specifying an alternative nodes file from
+   the command line and also to be able to specify hostnames on the
+   list of targets :
+   onnode host1,host2,...
+* Wed Oct 14 2009 Sumit Bose <sbose at redhat.com> - 1.0.96-1
+ - Update to ctdb version 1.0.96
+
+* Tue Oct 13 2009 : Version 1.0.96
+ - Add more debugging output when eventscripts have trouble. Print a
+   "pstree -p" to the log when scripts have hung.
+ - Update the initscript,  only print the "No reclock file used" warning
+   when we do "service ctdb start", dont also print them for all other
+   actions.
+ - When changing between unhealthy/healthy state, push a request to the
+   recovery master to perform an ip reallocation   instead of waiting for the
+   recovery master to pull and check the state change.
+ - Fix a bug in the new db-priority handling where a pre-.95 recovery master
+   could no longer lock the databases on a post-.95 daemon.
+ - Always create the nfs state directories during the "monitor" event.
+   This makes it easier to configure and enable nfs at runtime.
+ - From Volker, forward-port a simper deadlock avoiding patch from the 1.0.82
+   branch. This is a simpler versionof the "db priority lock order" patch
+   that went into 1.0.95, and will be kept for a few versions until samba
+   has been updated to use the functionality from 1.0.95.
+
+* Mon Oct 12 2009 : Version 1.0.95
+ - Add database priorities. Allow samba to set the priority of databases
+   and lock the databases in priority order during recovery
+   to avoid a deadlock when samba locks one database then blocks indefinitely
+   while waiting for the second databaso to become locked.
+ - Be aggressive and ban nodes where the recovery transaction start call
+   fails.
+
+* Thu Oct 10 2009 : Version 1.0.94
+ - Be very aggressive and quickly ban nodes that can not freeze their databases
+
+* Tue Oct 8 2009 : Version 1.0.93
+ - When adding an ip, make sure to update this assignment on all nodes
+   so it wont show up as -1 on other nodes.
+ - When adding an ip and immediately deleting it, it was possible that
+   the daemon would crash accessing already freed memory.
+   Readjust the memory hierarchy so the destructors are called in the right
+   order.
+ - Add a handshake to the recovery daemon to eliminate some rare cases where
+   addip/delip might cause a recovery to occur.
+ - updated onnode documenation from Martin S
+ - Updates to the natgw eventscript to allow disabling natgw at runtime
+
+* Fri Oct 2 2009 : Version 1.0.92
+ - Test updates and merge from martin
+ - Add notification for "startup"
+ - Add documentation for notification
+ - from martin, a fix for restarting vsftpd in the eventscript
+
 * Wed Sep 29 2009 Sumit Bose <sbose at redhat.com> - 1.0.91-1
  - Update to ctdb version 1.0.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Sep 2009 20:11:20 -0000	1.11
+++ sources	11 Dec 2009 08:48:51 -0000	1.12
@@ -1 +1 @@
-9680d0c250daeb87327a9cd87ad8421b  ctdb-1.0.91.tar.bz2
+a91d1dc747bb7f0216c9ddd7a0d25739  ctdb-1.0.108.tar.bz2



From jdieter at fedoraproject.org  Fri Dec 11 08:57:01 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Fri, 11 Dec 2009 08:57:01 +0000 (UTC)
Subject: rpms/yum-presto/F-11 import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 sources, 1.10, 1.11 yum-presto.spec, 1.12, 1.13
Message-ID: <20091211085701.EDAD611C00C5@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9910/F-11

Modified Files:
	.cvsignore sources yum-presto.spec 
Added Files:
	import.log 
Log Message:
Remove multiple cleanup messages


--- NEW FILE import.log ---
yum-presto-0_6_2-1_fc12:F-11:yum-presto-0.6.2-1.fc12.src.rpm:1260521645


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	10 Apr 2008 07:25:15 -0000	1.9
+++ .cvsignore	11 Dec 2009 08:57:01 -0000	1.10
@@ -1 +1 @@
-yum-presto-0.4.5.tar.bz2
+yum-presto-0.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 May 2009 19:57:26 -0000	1.10
+++ sources	11 Dec 2009 08:57:01 -0000	1.11
@@ -1 +1 @@
-1b292f04005220f0963d9efc45a03ef5  yum-presto-0.5.0.tar.bz2
+f38cad477cdabf209b71b35a34cc04ec  yum-presto-0.6.2.tar.bz2


Index: yum-presto.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/F-11/yum-presto.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- yum-presto.spec	11 May 2009 19:57:26 -0000	1.12
+++ yum-presto.spec	11 Dec 2009 08:57:01 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: Presto plugin for yum
 Name: yum-presto
-Version: 0.5.0
+Version: 0.6.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -45,10 +45,22 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
-* Mon May 11 2009 James Antill <james at fedoraproject.org> - 0.5.0-1
-- Add to updates-testing
+* Thu Dec 10 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.2-1
+- Register package name with yum
+- Remove multiple cleanup messages (#524633)
+
+* Thu Sep 17 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.1-1
+- Fix bug in attempting to read deltainfo.xml
+
+* Sat Sep 12 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.6.0-1
+- Change savings sentence to be more grammatically correct (#517014)
+- Support reading deltainfo.xml files as well as prestodelta.xml
+- Cleanup delta packages on yum clean all (#504854)
 
-* Fri May  1 2009 Jonathan Dieter <jdieter at gmail.com> - 0.5.0-1
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May  1 2009 Jonathan Dieter <jdieter at lesbg.com> - 0.5.0-1
 - Remove patches (now upstream)
 - Reduce summary to one-line sentence
 
@@ -76,87 +88,87 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.5-2
 - Rebuild for Python 2.6
 
-* Thu Apr 10 2008 Jonathan Dieter <jdieter at gmail.com> - 0.4.5-1
+* Thu Apr 10 2008 Jonathan Dieter <jdieter at lesbg.com> - 0.4.5-1
 - Fix bug in showing savings
 
-* Mon Apr  7 2008 Jonathan Dieter <jdieter at gmail.com> - 0.4.4-1
+* Mon Apr  7 2008 Jonathan Dieter <jdieter at lesbg.com> - 0.4.4-1
 - Show savings
 - Use setuptools for installation
 - Get Python Egg stuff working for F9
 
-* Sat Nov 17 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.3-1
+* Sat Nov 17 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.4.3-1
 - Fix README so it is now accurate for 0.4.x
 - Fix a small bug that caused AVC denials when SELinux is enabled
 
-* Fri Sep 28 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.2-1
+* Fri Sep 28 2007 Jonathan Dieter <jdieter at lesbg.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
+* Sun Aug  5 2007 Jonathan Dieter <jdieter at lesbg.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
 
-* Wed Jul 11 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.0-1
+* Wed Jul 11 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.4.0-1
 - Complete rewrite (thanks, Jeremy)
 - Many features removed in preparation for inclusion in Fedora 8
 
-* Tue May  1 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.10-1
+* Tue May  1 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.10-1
 - Use new -a option to deltarpm to only check against a certain architecture.
   This allows us to work completely correctly on x86_64.
 - Add "*" to repository of deltarpm as it *doesn't* screw up depsolving.
 
-* Sun Apr 15 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.9-1
+* Sun Apr 15 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.9-1
 - Modifications to make yum-presto compatible with both FC6 and Rawhide
 - Many other bugfixes - see ChangeLog
 
-* Fri Apr  6 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.8-1
+* Fri Apr  6 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.8-1
 - Small bugfix
 
-* Thu Apr  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.7-1
+* Thu Apr  5 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.7-1
 - Conf file cleanup
 
-* Thu Apr  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.6-1
+* Thu Apr  5 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.6-1
 - Housecleaning in preparation for Extras
 
-* Wed Apr  4 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.5-1
+* Wed Apr  4 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.5-1
 - Fix many small bugs
 - Improve logging
 - Use full path to yum-plugins rather than macro to fix x86_64 bug
 
-* Tue Apr  3 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.4-1
+* Tue Apr  3 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.4-1
 - Build rpms in separate thread to help performance
 - Fix miscellaneous spec file errors
 
-* Fri Mar 30 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.3-1
+* Fri Mar 30 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.3-1
 - Upstream changed way the presto.xml.gz stores sequence information
 
-* Fri Mar 30 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.2-2
+* Fri Mar 30 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.2-2
 - Take ownership of %%{_datadir}/presto
 
-* Thu Mar 29 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.2-1
+* Thu Mar 29 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.2-1
 - Changes to remove rpmlint complaints
 
-* Thu Mar 29 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.1-1
+* Thu Mar 29 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.1-1
 - Fix minor bug with importing public gpg keys.
 - Update README
 
-* Wed Mar 28 2007 Jonathan Dieter <jdieter at gmail.com> - 0.3.0-1
+* Wed Mar 28 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.3.0-1
 - Take over downloading of deltarpms so we can fallback to
   yum if the building of the rpm fails.
 
-* Mon Mar 26 2007 Jonathan Dieter <jdieter at gmail.com> - 0.2.9-1
+* Mon Mar 26 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.2.9-1
 - Added logging to /var/log/presto.log
 - Fixed crash bug
 - Properly exit when unable to apply deltarpm
 - Do a full (slow) MD5 check when checking to see if
   delta will apply cleanly
 
-* Sat Mar 24 2007 Jonathan Dieter <jdieter at gmail.com> - 0.2.3-1
+* Sat Mar 24 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.2.3-1
 - Rebase to upstream
 
-* Fri Mar 23 2007 Jonathan Dieter <jdieter at gmail.com> - 0.2.1-1
+* Fri Mar 23 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.2.1-1
 - Rebase to upstream
 
-* Thu Mar 22 2007 Jonathan Dieter <jdieter at gmail.com> - 0.2-1
+* Thu Mar 22 2007 Jonathan Dieter <jdieter at lesbg.com> - 0.2-1
 - Initial release



From arbiter at fedoraproject.org  Fri Dec 11 08:59:43 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 08:59:43 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies/F-11 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091211085943.A248E11C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10877

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-3
- Add -devel package and move CMake and pkgconfig files there



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:48:59 -0000	1.1
+++ .cvsignore	11 Dec 2009 08:59:43 -0000	1.2
@@ -0,0 +1 @@
+shared-desktop-ontologies-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:48:59 -0000	1.1
+++ sources	11 Dec 2009 08:59:43 -0000	1.2
@@ -0,0 +1 @@
+6c004e1c377f768cae5b321bc111876b  shared-desktop-ontologies-0.2.tar.bz2



From arbiter at fedoraproject.org  Fri Dec 11 09:01:57 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 09:01:57 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies/F-12 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091211090157.4660811C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11471

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-3
- Add -devel package and move CMake and pkgconfig files there



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:48:59 -0000	1.1
+++ .cvsignore	11 Dec 2009 09:01:56 -0000	1.2
@@ -0,0 +1 @@
+shared-desktop-ontologies-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:48:59 -0000	1.1
+++ sources	11 Dec 2009 09:01:57 -0000	1.2
@@ -0,0 +1 @@
+6c004e1c377f768cae5b321bc111876b  shared-desktop-ontologies-0.2.tar.bz2



From arbiter at fedoraproject.org  Fri Dec 11 09:04:50 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 09:04:50 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies/F-11 shared-desktop-ontologies.spec, 
	NONE, 1.1
Message-ID: <20091211090450.0EF5211C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12449

Added Files:
	shared-desktop-ontologies.spec 
Log Message:
* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-3
- Add -devel package and move CMake and pkgconfig files there



--- NEW FILE shared-desktop-ontologies.spec ---
Name:           shared-desktop-ontologies
Version:        0.2
Release:        3%{?dist}
Summary:        Shared ontologies needed for semantic environments

Group:          User Interface/Desktops
License:        BSD or CC-BY
URL:            http://oscaf.sourceforge.net/
Source0:        http://downloads.sourceforge.net/project/oscaf/shared-desktop-ontologies/%{version}/shared-desktop-ontologies-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  cmake >= 2.6.0


%description
The vision of the Social Semantic Desktop defines a user?s personal
information environment as a source and end-point of the Semantic Web:
Knowledge workers comprehensively express their information and data
with respect to their own conceptualizations.

Semantic Web languages and protocols are used to formalize these
conceptualizations and for coordinating local and global information
access. The Resource Description Framework serves as a common data
representation format. With a particular focus on addressing certain
limitations of RDF, a novel representational language akin to RDF and
the Web Ontology Language, plus a number of other high-level
ontologies were created.

Together, they provide a means to build the semantic bridges necessary
for data exchange and application integration on distributed social
semantic desktops. Although initially designed to fulfill requirements
for the Nepomuk project, these ontologies are useful for the semantic
web community in general.



%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


%build
%cmake .


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE.BSD LICENSE.CC-BY README
%{_datadir}/ontology

%files devel
%defattr(-,root,root,-)
%{_datadir}/cmake/SharedDesktopOntologies
%{_datadir}/pkgconfig/shared-desktop-ontologies.pc


%changelog
* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-3
- Add -devel package and move CMake and pkgconfig files there

* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-2
- Fix license tag

* Sat Dec  5 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-1
- Initial release



From arbiter at fedoraproject.org  Fri Dec 11 09:06:08 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 09:06:08 +0000 (UTC)
Subject: rpms/shared-desktop-ontologies/F-12 shared-desktop-ontologies.spec, 
	NONE, 1.1
Message-ID: <20091211090608.E588911C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12952

Added Files:
	shared-desktop-ontologies.spec 
Log Message:
* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-3
- Add -devel package and move CMake and pkgconfig files there



--- NEW FILE shared-desktop-ontologies.spec ---
Name:           shared-desktop-ontologies
Version:        0.2
Release:        3%{?dist}
Summary:        Shared ontologies needed for semantic environments

Group:          User Interface/Desktops
License:        BSD or CC-BY
URL:            http://oscaf.sourceforge.net/
Source0:        http://downloads.sourceforge.net/project/oscaf/shared-desktop-ontologies/%{version}/shared-desktop-ontologies-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  cmake >= 2.6.0


%description
The vision of the Social Semantic Desktop defines a user?s personal
information environment as a source and end-point of the Semantic Web:
Knowledge workers comprehensively express their information and data
with respect to their own conceptualizations.

Semantic Web languages and protocols are used to formalize these
conceptualizations and for coordinating local and global information
access. The Resource Description Framework serves as a common data
representation format. With a particular focus on addressing certain
limitations of RDF, a novel representational language akin to RDF and
the Web Ontology Language, plus a number of other high-level
ontologies were created.

Together, they provide a means to build the semantic bridges necessary
for data exchange and application integration on distributed social
semantic desktops. Although initially designed to fulfill requirements
for the Nepomuk project, these ontologies are useful for the semantic
web community in general.



%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


%build
%cmake .


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE.BSD LICENSE.CC-BY README
%{_datadir}/ontology

%files devel
%defattr(-,root,root,-)
%{_datadir}/cmake/SharedDesktopOntologies
%{_datadir}/pkgconfig/shared-desktop-ontologies.pc


%changelog
* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-3
- Add -devel package and move CMake and pkgconfig files there

* Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-2
- Fix license tag

* Sat Dec  5 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-1
- Initial release



From arbiter at fedoraproject.org  Fri Dec 11 09:08:49 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 09:08:49 +0000 (UTC)
Subject: rpms/attica/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091211090849.2F09811C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/attica/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13770

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
- upstream tarball
- %files: tighten up a bit, track sonames



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:43:42 -0000	1.1
+++ .cvsignore	11 Dec 2009 09:08:48 -0000	1.2
@@ -0,0 +1 @@
+attica-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:43:42 -0000	1.1
+++ sources	11 Dec 2009 09:08:48 -0000	1.2
@@ -0,0 +1 @@
+ff8d6ba041125b1ace0048741855b89d  attica-0.1.0.tar.bz2



From arbiter at fedoraproject.org  Fri Dec 11 09:08:55 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 09:08:55 +0000 (UTC)
Subject: rpms/attica/F-12 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091211090855.B019311C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/attica/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13846

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
- upstream tarball
- %files: tighten up a bit, track sonames



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:43:42 -0000	1.1
+++ .cvsignore	11 Dec 2009 09:08:55 -0000	1.2
@@ -0,0 +1 @@
+attica-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:43:42 -0000	1.1
+++ sources	11 Dec 2009 09:08:55 -0000	1.2
@@ -0,0 +1 @@
+ff8d6ba041125b1ace0048741855b89d  attica-0.1.0.tar.bz2



From arbiter at fedoraproject.org  Fri Dec 11 09:09:48 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 09:09:48 +0000 (UTC)
Subject: rpms/attica/F-11 attica.spec,NONE,1.1
Message-ID: <20091211090948.524D011C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/attica/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14325

Added Files:
	attica.spec 
Log Message:
* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
- upstream tarball
- %files: tighten up a bit, track sonames



--- NEW FILE attica.spec ---
Name:           attica
Version:        0.1.0
Release:        3%{?dist}
Summary:        Implementation of the Open Collaboration Services API

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.kde.org
Source0:        ftp://ftp.kde.org/pub/kde/stable/attica/attica-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  qt4-devel
BuildRequires:  openssl-devel

%description
Attica is a Qt library that implements the Open Collaboration Services
API version 1.4.


%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


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/libattica.so.0*

%files devel
%defattr(-,root,root,-)
%{_includedir}/attica/
%{_libdir}/libattica.so
%{_libdir}/pkgconfig/libattica.pc


%changelog
* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
- upstream tarball
- %files: tighten up a bit, track sonames

* Mon Dec  7 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.1.0-2
- Out of sourcetree build
- Use make install/fast

* Sat Dec 5 2009 lvillani <lvillani at enterprise.binaryhelix.net> 0.1.0-1
- Initial release




From arbiter at fedoraproject.org  Fri Dec 11 09:09:52 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 09:09:52 +0000 (UTC)
Subject: rpms/attica/F-12 attica.spec,NONE,1.1
Message-ID: <20091211090952.9C5FC11C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/attica/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14369

Added Files:
	attica.spec 
Log Message:
* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
- upstream tarball
- %files: tighten up a bit, track sonames



--- NEW FILE attica.spec ---
Name:           attica
Version:        0.1.0
Release:        3%{?dist}
Summary:        Implementation of the Open Collaboration Services API

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.kde.org
Source0:        ftp://ftp.kde.org/pub/kde/stable/attica/attica-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  qt4-devel
BuildRequires:  openssl-devel

%description
Attica is a Qt library that implements the Open Collaboration Services
API version 1.4.


%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


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/libattica.so.0*

%files devel
%defattr(-,root,root,-)
%{_includedir}/attica/
%{_libdir}/libattica.so
%{_libdir}/pkgconfig/libattica.pc


%changelog
* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
- upstream tarball
- %files: tighten up a bit, track sonames

* Mon Dec  7 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.1.0-2
- Out of sourcetree build
- Use make install/fast

* Sat Dec 5 2009 lvillani <lvillani at enterprise.binaryhelix.net> 0.1.0-1
- Initial release




From pghmcfc at fedoraproject.org  Fri Dec 11 09:18:47 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 11 Dec 2009 09:18:47 +0000 (UTC)
Subject: File Math-Pari-2.01080603.tar.gz uploaded to lookaside cache by
	pghmcfc
Message-ID: <20091211091847.361CF10F891@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for perl-Math-Pari:

e5f970b7a351f671e0641fa8266ce770  Math-Pari-2.01080603.tar.gz



From nphilipp at fedoraproject.org  Fri Dec 11 09:31:58 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 11 Dec 2009 09:31:58 +0000 (UTC)
Subject: File gimp-2.6.8.tar.bz2 uploaded to lookaside cache by nphilipp
Message-ID: <20091211093158.DF34310F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gimp:

a4d9462c9420954824a80c9b1963f9d9  gimp-2.6.8.tar.bz2



From nphilipp at fedoraproject.org  Fri Dec 11 09:35:04 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 11 Dec 2009 09:35:04 +0000 (UTC)
Subject: rpms/gimp/devel .cvsignore, 1.52, 1.53 gimp.spec, 1.199,
	1.200 sources, 1.52, 1.53 gimp-2.6.7-bmp-hardening.patch, 1.1,
	NONE gimp-2.6.7-psd-hardening.patch, 1.1, NONE
Message-ID: <20091211093504.83BAF11C00C5@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21495

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.6.7-bmp-hardening.patch gimp-2.6.7-psd-hardening.patch 
Log Message:
version 2.6.8
remove obsolete bmp-hardening, psd-hardening patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	14 Aug 2009 09:58:51 -0000	1.52
+++ .cvsignore	11 Dec 2009 09:35:04 -0000	1.53
@@ -1 +1 @@
-gimp-2.6.7.tar.bz2
+gimp-2.6.8.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- gimp.spec	17 Nov 2009 11:21:23 -0000	1.199
+++ gimp.spec	11 Dec 2009 09:35:04 -0000	1.200
@@ -30,8 +30,8 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.7
-Release:        3%{?dist}
+Version:        2.6.8
+Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -128,12 +128,6 @@ Patch1:         gimp-2.6.7-jpeg-units.pa
 # https://bugzilla.gnome.org/show_bug.cgi?id=556896
 # "Dialogs don't get minimized with single image window"
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600484
-# "Gimp BMP Integer Overflow Vulnerability"
-Patch3:         gimp-2.6.7-bmp-hardening.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600741
-# '"read_channel_data()" Integer Overflow Vulnerability'
-Patch4:         gimp-2.6.7-psd-hardening.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -215,8 +209,6 @@ EOF
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
-%patch3 -p1 -b .bmp-hardening
-%patch4 -p1 -b .psd-hardening
 
 %build
 # if [ ! -f configure ]; then
@@ -507,6 +499,52 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Fri Dec 11 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.8-1
+- version 2.6.8
+
+  Overview of Changes from GIMP 2.6.7 to GIMP 2.6.8
+  =================================================
+
+  * Bugs fixed:
+
+   470698 - MapObject cannot modify highlight
+   593848 - FG color changed to black when FG-BG Editor tab created
+   594651 - layer.scale() raises RuntimeError
+   594998 - Keyboard shortcuts does not work for first image when dock
+            is focused
+   599765 - F1 key on gimp-tool-align in menu have wrong link and it
+            open gimp-tool-move
+   600484 - Gimp BMP Integer Overflow Vulnerability
+   600741 - "read_channel_data()" Integer Overflow Vulnerability
+   601891 - gimp_image_get_selection returns None
+   602761 - plug-in-grid: Parameters Horizontal/Vertical Spacing and
+            Horizontal/Vertical Offset are reversed.
+   603995 - PCX plugin doesn't sanitize input to avoid allocation overflows.
+   603998 - PCX: Calculating amount of memory to allocate may overflow.
+   604000 - SGI: sanitize input
+   604001 - SGI: Calculating amount of memory to allocate may overflow.
+   604002 - SGI: RLE encoded input data may write beyond allocated buffers
+   604004 - SGI: allocate memory consistently
+   604008 - GBR, PAT: sanitize input data
+   604078 - Crash when pressing Backspace with Free Select Tool
+
+  * Updated and new translations:
+
+   Basque (eu)
+   British English (en_GB)
+   Czech (cs)
+   French (fr)
+   Greek (el)
+   Italian (it)
+   Japanese (ja)
+   Norwegian Nynorsk (nn)
+   Polish (pl)
+   Romanian (ro)
+   Russian (ru)
+   Simplified Chinese (zh_CN)
+
+- remove obsolete bmp-hardening, psd-hardening patches
+
 * Tue Nov 17 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-3
 - avoid overflow in the BMP image file plugin (#537356)
 - avoid overflow in the PSD image file plugin (#537370)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	14 Aug 2009 09:58:51 -0000	1.52
+++ sources	11 Dec 2009 09:35:04 -0000	1.53
@@ -1 +1 @@
-77ed86a8de9b48587efb24f2b115ad38  gimp-2.6.7.tar.bz2
+a4d9462c9420954824a80c9b1963f9d9  gimp-2.6.8.tar.bz2


--- gimp-2.6.7-bmp-hardening.patch DELETED ---


--- gimp-2.6.7-psd-hardening.patch DELETED ---



From pghmcfc at fedoraproject.org  Fri Dec 11 09:37:42 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 11 Dec 2009 09:37:42 +0000 (UTC)
Subject: rpms/perl-Math-Pari/devel .cvsignore, 1.12, 1.13 perl-Math-Pari.spec,
	1.22, 1.23 sources, 1.12, 1.13
Message-ID: <20091211093742.508C011C00C5@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Math-Pari/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22556

Modified Files:
	.cvsignore perl-Math-Pari.spec sources 
Log Message:
Update to 2.01080603 (see Changes for details)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Nov 2009 10:50:04 -0000	1.12
+++ .cvsignore	11 Dec 2009 09:37:42 -0000	1.13
@@ -1,2 +1,2 @@
-Math-Pari-2.01080602.tar.gz
+Math-Pari-2.01080603.tar.gz
 pari-2.3.4.tar.gz


Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Math-Pari.spec	12 Nov 2009 10:50:04 -0000	1.22
+++ perl-Math-Pari.spec	11 Dec 2009 09:37:42 -0000	1.23
@@ -10,12 +10,12 @@
 %global pari_version	2.3.4
 %global pari_int_version %(echo %{pari_version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d+)\\.(\\d+)/sprintf("%d%03d%03d",$1,$2,$3)/e')
 
-%global extraversion	02
+%global extraversion	03
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
 Version:	2.010806
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
@@ -89,6 +89,9 @@ as Perl functions, and (almost) seamless
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Fri Dec 11 2009 Paul Howarth <paul at city-fan.org> - 2.010806-3
+- Update to 2.01080603 (see Changes for details)
+
 * Thu Nov 12 2009 Paul Howarth <paul at city-fan.org> - 2.010806-2
 - Update to 2.01080602 (see Changes for details)
 - No longer need to fix test suite for 64-bit builds


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	12 Nov 2009 10:50:04 -0000	1.12
+++ sources	11 Dec 2009 09:37:42 -0000	1.13
@@ -1,2 +1,2 @@
-3148a58fe17ebe4c54e28b2a6ba19ab8  Math-Pari-2.01080602.tar.gz
+e5f970b7a351f671e0641fa8266ce770  Math-Pari-2.01080603.tar.gz
 35c896266e4257793387ba22d5d76078  pari-2.3.4.tar.gz



From nphilipp at fedoraproject.org  Fri Dec 11 09:38:50 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 11 Dec 2009 09:38:50 +0000 (UTC)
Subject: rpms/gimp/F-12 .cvsignore, 1.52, 1.53 gimp.spec, 1.199,
	1.200 sources, 1.52, 1.53 gimp-2.6.7-bmp-hardening.patch, 1.1,
	NONE gimp-2.6.7-psd-hardening.patch, 1.1, NONE
Message-ID: <20091211093850.E0B3B11C00C5@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22903

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.6.7-bmp-hardening.patch gimp-2.6.7-psd-hardening.patch 
Log Message:
version 2.6.8
remove obsolete bmp-hardening, psd-hardening patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-12/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	14 Aug 2009 09:58:51 -0000	1.52
+++ .cvsignore	11 Dec 2009 09:38:50 -0000	1.53
@@ -1 +1 @@
-gimp-2.6.7.tar.bz2
+gimp-2.6.8.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-12/gimp.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- gimp.spec	17 Nov 2009 11:23:45 -0000	1.199
+++ gimp.spec	11 Dec 2009 09:38:50 -0000	1.200
@@ -30,8 +30,8 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.7
-Release:        3%{?dist}
+Version:        2.6.8
+Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -128,12 +128,6 @@ Patch1:         gimp-2.6.7-jpeg-units.pa
 # https://bugzilla.gnome.org/show_bug.cgi?id=556896
 # "Dialogs don't get minimized with single image window"
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600484
-# "Gimp BMP Integer Overflow Vulnerability"
-Patch3:         gimp-2.6.7-bmp-hardening.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600741
-# '"read_channel_data()" Integer Overflow Vulnerability'
-Patch4:         gimp-2.6.7-psd-hardening.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -215,8 +209,6 @@ EOF
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
-%patch3 -p1 -b .bmp-hardening
-%patch4 -p1 -b .psd-hardening
 
 %build
 # if [ ! -f configure ]; then
@@ -507,6 +499,52 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Fri Dec 11 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.8-1
+- version 2.6.8
+
+  Overview of Changes from GIMP 2.6.7 to GIMP 2.6.8
+  =================================================
+
+  * Bugs fixed:
+
+   470698 - MapObject cannot modify highlight
+   593848 - FG color changed to black when FG-BG Editor tab created
+   594651 - layer.scale() raises RuntimeError
+   594998 - Keyboard shortcuts does not work for first image when dock
+            is focused
+   599765 - F1 key on gimp-tool-align in menu have wrong link and it
+            open gimp-tool-move
+   600484 - Gimp BMP Integer Overflow Vulnerability
+   600741 - "read_channel_data()" Integer Overflow Vulnerability
+   601891 - gimp_image_get_selection returns None
+   602761 - plug-in-grid: Parameters Horizontal/Vertical Spacing and
+            Horizontal/Vertical Offset are reversed.
+   603995 - PCX plugin doesn't sanitize input to avoid allocation overflows.
+   603998 - PCX: Calculating amount of memory to allocate may overflow.
+   604000 - SGI: sanitize input
+   604001 - SGI: Calculating amount of memory to allocate may overflow.
+   604002 - SGI: RLE encoded input data may write beyond allocated buffers
+   604004 - SGI: allocate memory consistently
+   604008 - GBR, PAT: sanitize input data
+   604078 - Crash when pressing Backspace with Free Select Tool
+
+  * Updated and new translations:
+
+   Basque (eu)
+   British English (en_GB)
+   Czech (cs)
+   French (fr)
+   Greek (el)
+   Italian (it)
+   Japanese (ja)
+   Norwegian Nynorsk (nn)
+   Polish (pl)
+   Romanian (ro)
+   Russian (ru)
+   Simplified Chinese (zh_CN)
+
+- remove obsolete bmp-hardening, psd-hardening patches
+
 * Tue Nov 17 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-3
 - avoid overflow in the BMP image file plugin (#537356)
 - avoid overflow in the PSD image file plugin (#537370)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-12/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	14 Aug 2009 09:58:51 -0000	1.52
+++ sources	11 Dec 2009 09:38:50 -0000	1.53
@@ -1 +1 @@
-77ed86a8de9b48587efb24f2b115ad38  gimp-2.6.7.tar.bz2
+a4d9462c9420954824a80c9b1963f9d9  gimp-2.6.8.tar.bz2


--- gimp-2.6.7-bmp-hardening.patch DELETED ---


--- gimp-2.6.7-psd-hardening.patch DELETED ---



From nphilipp at fedoraproject.org  Fri Dec 11 09:39:39 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 11 Dec 2009 09:39:39 +0000 (UTC)
Subject: rpms/gimp/F-11 .cvsignore, 1.52, 1.53 gimp.spec, 1.195,
	1.196 sources, 1.52, 1.53 gimp-2.6.7-bmp-hardening.patch, 1.1,
	NONE gimp-2.6.7-psd-hardening.patch, 1.1, NONE
Message-ID: <20091211093939.ACBBD11C00C5@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23268

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.6.7-bmp-hardening.patch gimp-2.6.7-psd-hardening.patch 
Log Message:
version 2.6.8
remove obsolete bmp-hardening, psd-hardening patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-11/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	14 Aug 2009 10:15:11 -0000	1.52
+++ .cvsignore	11 Dec 2009 09:39:39 -0000	1.53
@@ -1 +1 @@
-gimp-2.6.7.tar.bz2
+gimp-2.6.8.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-11/gimp.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- gimp.spec	17 Nov 2009 11:25:31 -0000	1.195
+++ gimp.spec	11 Dec 2009 09:39:39 -0000	1.196
@@ -30,8 +30,8 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.7
-Release:        3%{?dist}
+Version:        2.6.8
+Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -128,12 +128,6 @@ Patch1:         gimp-2.6.7-jpeg-units.pa
 # https://bugzilla.gnome.org/show_bug.cgi?id=556896
 # "Dialogs don't get minimized with single image window"
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600484
-# "Gimp BMP Integer Overflow Vulnerability"
-Patch3:         gimp-2.6.7-bmp-hardening.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600741
-# '"read_channel_data()" Integer Overflow Vulnerability'
-Patch4:         gimp-2.6.7-psd-hardening.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -215,8 +209,6 @@ EOF
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
-%patch3 -p1 -b .bmp-hardening
-%patch4 -p1 -b .psd-hardening
 
 %build
 # if [ ! -f configure ]; then
@@ -507,6 +499,52 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Fri Dec 11 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.8-1
+- version 2.6.8
+
+  Overview of Changes from GIMP 2.6.7 to GIMP 2.6.8
+  =================================================
+
+  * Bugs fixed:
+
+   470698 - MapObject cannot modify highlight
+   593848 - FG color changed to black when FG-BG Editor tab created
+   594651 - layer.scale() raises RuntimeError
+   594998 - Keyboard shortcuts does not work for first image when dock
+            is focused
+   599765 - F1 key on gimp-tool-align in menu have wrong link and it
+            open gimp-tool-move
+   600484 - Gimp BMP Integer Overflow Vulnerability
+   600741 - "read_channel_data()" Integer Overflow Vulnerability
+   601891 - gimp_image_get_selection returns None
+   602761 - plug-in-grid: Parameters Horizontal/Vertical Spacing and
+            Horizontal/Vertical Offset are reversed.
+   603995 - PCX plugin doesn't sanitize input to avoid allocation overflows.
+   603998 - PCX: Calculating amount of memory to allocate may overflow.
+   604000 - SGI: sanitize input
+   604001 - SGI: Calculating amount of memory to allocate may overflow.
+   604002 - SGI: RLE encoded input data may write beyond allocated buffers
+   604004 - SGI: allocate memory consistently
+   604008 - GBR, PAT: sanitize input data
+   604078 - Crash when pressing Backspace with Free Select Tool
+
+  * Updated and new translations:
+
+   Basque (eu)
+   British English (en_GB)
+   Czech (cs)
+   French (fr)
+   Greek (el)
+   Italian (it)
+   Japanese (ja)
+   Norwegian Nynorsk (nn)
+   Polish (pl)
+   Romanian (ro)
+   Russian (ru)
+   Simplified Chinese (zh_CN)
+
+- remove obsolete bmp-hardening, psd-hardening patches
+
 * Tue Nov 17 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-3
 - avoid overflow in the BMP image file plugin (#537356)
 - avoid overflow in the PSD image file plugin (#537370)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-11/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	14 Aug 2009 10:15:11 -0000	1.52
+++ sources	11 Dec 2009 09:39:39 -0000	1.53
@@ -1 +1 @@
-77ed86a8de9b48587efb24f2b115ad38  gimp-2.6.7.tar.bz2
+a4d9462c9420954824a80c9b1963f9d9  gimp-2.6.8.tar.bz2


--- gimp-2.6.7-bmp-hardening.patch DELETED ---


--- gimp-2.6.7-psd-hardening.patch DELETED ---



From nphilipp at fedoraproject.org  Fri Dec 11 09:40:09 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 11 Dec 2009 09:40:09 +0000 (UTC)
Subject: rpms/gimp/F-10 .cvsignore, 1.52, 1.53 gimp.spec, 1.185,
	1.186 sources, 1.52, 1.53 gimp-2.6.7-bmp-hardening.patch, 1.1,
	NONE gimp-2.6.7-psd-hardening.patch, 1.1, NONE
Message-ID: <20091211094009.99C4D11C03FC@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23475

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.6.7-bmp-hardening.patch gimp-2.6.7-psd-hardening.patch 
Log Message:
version 2.6.8
remove obsolete bmp-hardening, psd-hardening patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	14 Aug 2009 10:20:10 -0000	1.52
+++ .cvsignore	11 Dec 2009 09:40:09 -0000	1.53
@@ -1 +1 @@
-gimp-2.6.7.tar.bz2
+gimp-2.6.8.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/gimp.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- gimp.spec	17 Nov 2009 11:31:20 -0000	1.185
+++ gimp.spec	11 Dec 2009 09:40:09 -0000	1.186
@@ -30,8 +30,8 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.7
-Release:        3%{?dist}
+Version:        2.6.8
+Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -128,12 +128,6 @@ Patch1:         gimp-2.6.7-jpeg-units.pa
 # https://bugzilla.gnome.org/show_bug.cgi?id=556896
 # "Dialogs don't get minimized with single image window"
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600484
-# "Gimp BMP Integer Overflow Vulnerability"
-Patch3:         gimp-2.6.7-bmp-hardening.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600741
-# '"read_channel_data()" Integer Overflow Vulnerability'
-Patch4:         gimp-2.6.7-psd-hardening.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -215,8 +209,6 @@ EOF
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
-%patch3 -p1 -b .bmp-hardening
-%patch4 -p1 -b .psd-hardening
 
 %build
 # if [ ! -f configure ]; then
@@ -507,6 +499,52 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Fri Dec 11 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.8-1
+- version 2.6.8
+
+  Overview of Changes from GIMP 2.6.7 to GIMP 2.6.8
+  =================================================
+
+  * Bugs fixed:
+
+   470698 - MapObject cannot modify highlight
+   593848 - FG color changed to black when FG-BG Editor tab created
+   594651 - layer.scale() raises RuntimeError
+   594998 - Keyboard shortcuts does not work for first image when dock
+            is focused
+   599765 - F1 key on gimp-tool-align in menu have wrong link and it
+            open gimp-tool-move
+   600484 - Gimp BMP Integer Overflow Vulnerability
+   600741 - "read_channel_data()" Integer Overflow Vulnerability
+   601891 - gimp_image_get_selection returns None
+   602761 - plug-in-grid: Parameters Horizontal/Vertical Spacing and
+            Horizontal/Vertical Offset are reversed.
+   603995 - PCX plugin doesn't sanitize input to avoid allocation overflows.
+   603998 - PCX: Calculating amount of memory to allocate may overflow.
+   604000 - SGI: sanitize input
+   604001 - SGI: Calculating amount of memory to allocate may overflow.
+   604002 - SGI: RLE encoded input data may write beyond allocated buffers
+   604004 - SGI: allocate memory consistently
+   604008 - GBR, PAT: sanitize input data
+   604078 - Crash when pressing Backspace with Free Select Tool
+
+  * Updated and new translations:
+
+   Basque (eu)
+   British English (en_GB)
+   Czech (cs)
+   French (fr)
+   Greek (el)
+   Italian (it)
+   Japanese (ja)
+   Norwegian Nynorsk (nn)
+   Polish (pl)
+   Romanian (ro)
+   Russian (ru)
+   Simplified Chinese (zh_CN)
+
+- remove obsolete bmp-hardening, psd-hardening patches
+
 * Tue Nov 17 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-3
 - avoid overflow in the BMP image file plugin (#537356)
 - avoid overflow in the PSD image file plugin (#537370)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	14 Aug 2009 10:20:10 -0000	1.52
+++ sources	11 Dec 2009 09:40:09 -0000	1.53
@@ -1 +1 @@
-77ed86a8de9b48587efb24f2b115ad38  gimp-2.6.7.tar.bz2
+a4d9462c9420954824a80c9b1963f9d9  gimp-2.6.8.tar.bz2


--- gimp-2.6.7-bmp-hardening.patch DELETED ---


--- gimp-2.6.7-psd-hardening.patch DELETED ---



From rhughes at fedoraproject.org  Fri Dec 11 09:47:40 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 11 Dec 2009 09:47:40 +0000 (UTC)
Subject: File gnome-packagekit-2.28.3-20091211.tar.gz uploaded to lookaside
	cache by rhughes
Message-ID: <20091211094740.8553310F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-packagekit:

1abef10b7142f1b23eb98e6e79109588  gnome-packagekit-2.28.3-20091211.tar.gz



From rhughes at fedoraproject.org  Fri Dec 11 09:49:44 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 11 Dec 2009 09:49:44 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-12 .cvsignore, 1.62,
	1.63 gnome-packagekit.spec, 1.106, 1.107 sources, 1.63, 1.64
Message-ID: <20091211094944.98DF811C00C5@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26413

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Dec 11 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.3-0.1.20091211git
- New snapshot from the gnome-2-28 branch
- Don't show the selected packages as deps of the to be updated packages.
  Note, this only affects PackageKit >= 0.5.5. Fixes rh#546247
- Check the GpkDbusTask object only replies once to each session request



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	7 Dec 2009 16:21:31 -0000	1.62
+++ .cvsignore	11 Dec 2009 09:49:44 -0000	1.63
@@ -1 +1 @@
-gnome-packagekit-2.28.2.tar.gz
+gnome-packagekit-2.28.3-20091211.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/gnome-packagekit.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- gnome-packagekit.spec	7 Dec 2009 16:21:32 -0000	1.106
+++ gnome-packagekit.spec	11 Dec 2009 09:49:44 -0000	1.107
@@ -7,20 +7,20 @@
 %define unique_version			1.0.0
 %define devicekit_power_version		007
 %define libcanberra_version		0.10
-%define alphatag			20091116
+%define alphatag			20091211
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
-Version:   2.28.2
-#Release:   0.2.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Version:   2.28.3
+Release:   0.1.%{?alphatag}git%{?dist}
+#Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}.tar.gz
-#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}-%{?alphatag}.tar.gz
+#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}.tar.gz
+Source0:   http://download.gnome.org/sources/gnome-packagekit/2.28/%{name}-%{version}-%{?alphatag}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  glib2 >= %{glib2_version}
@@ -86,8 +86,8 @@ Requires: %{name} = %{version}-%{release
 Extra GNOME applications for using PackageKit that are not normally needed.
 
 %prep
-#%setup -q -n %{?name}-%{?version}-%{?alphatag}
-%setup -q
+%setup -q -n %{?name}-%{?version}-%{?alphatag}
+#%setup -q
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -221,11 +221,17 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Dec 11 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.3-0.1.20091211git
+- New snapshot from the gnome-2-28 branch
+- Don't show the selected packages as deps of the to be updated packages.
+  Note, this only affects PackageKit >= 0.5.5. Fixes rh#546247
+- Check the GpkDbusTask object only replies once to each session request
+
 * Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-1
 - Update to 2.28.2
-- Remove the original package from the dep-confirmation screen (Richard Hughes)
-- Ignore generic errors such as 'Failed' and do not show UI in this case (Richard Hughes)
-- Use the desktop icon when we unselect the installed application in gpk-application. Fixes fd#25098 (Richard Hughes)
+- Remove the original package from the dep-confirmation screen
+- Ignore generic errors such as 'Failed' and do not show UI in this case
+- Use the desktop icon when we unselect the installed application in gpk-application. Fixes fd#25098
 
 * Mon Nov 16 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-0.2.20091116git
 - New snapshot from the gnome-2-28 branch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	7 Dec 2009 16:21:32 -0000	1.63
+++ sources	11 Dec 2009 09:49:44 -0000	1.64
@@ -1 +1 @@
-3282c845c2b7a9e157f84a919c7a0105  gnome-packagekit-2.28.2.tar.gz
+1abef10b7142f1b23eb98e6e79109588  gnome-packagekit-2.28.3-20091211.tar.gz



From jfch2222 at fedoraproject.org  Fri Dec 11 09:53:37 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 11 Dec 2009 09:53:37 +0000 (UTC)
Subject: rpms/libssh/F-11 libssh.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091211095337.528B411C00C5@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/libssh/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27689

Modified Files:
	libssh.spec sources 
Log Message:
bounce versionn to 0.4.0


Index: libssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libssh/F-11/libssh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libssh.spec	4 Jun 2009 13:15:32 -0000	1.1
+++ libssh.spec	11 Dec 2009 09:53:37 -0000	1.2
@@ -1,17 +1,18 @@
 Name:           libssh
-Version:        0.2 
-Release:        2%{?dist}
+Version:        0.4.0 
+Release:        1%{?dist}
 Summary:        A library implementing the SSH2 protocol (0xbadc0de version)
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://0xbadc0de.be/?part=libssh
-Source0:        http://0xbadc0de.be/libssh/%{name}-%{version}.tgz
-Patch0:         libssh-0.2-libdir.patch
+#original URL:	http://0xbadc0de.be/?part=libssh
+URL:            http://www.libssh.org/
+Source0:        http://www.libssh.org/files/rc/%{name}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel   
+BuildRequires:  cmake
 
 %description
 The SSH library with
@@ -33,14 +34,16 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .libdir
 
 %build
-%configure --disable-static --enable-shared
-make # doesn't build with %{?_smp_mflags}
+mkdir obj
+cd obj
+%cmake ..
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd obj
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} + 
 chmod 644 $RPM_BUILD_ROOT/usr/include/libssh/*
@@ -54,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING README
+%doc AUTHORS BSD ChangeLog COPYING README
 %{_libdir}/*.so.*
 
 %files devel
@@ -63,8 +66,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Fri Dec 11 2009 Jan F. Chadima <jchadima at redhat.com> - 0.4.0-1
+- bounce versionn to 0.4.0 (#541010)
+
+* Thu Nov 26 2009 Jan F. Chadima <jchadima at redhat.com> - 0.3.92-2
+- typo in spec file
+
+* Thu Nov 26 2009 Jan F. Chadima <jchadima at redhat.com> - 0.3.92-1
+- bounce versionn to 0.3.92 (0.4 beta2) (#541010)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-4
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 02 2009 Jan F. Chadima <jchadima at redhat.com> - 0.2-2
 - Small changes during review
 
 * Mon Jun 01 2009 Jan F. Chadima <jchadima at redhat.com> - 0.2-1
 - Initial build
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libssh/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 13:15:32 -0000	1.2
+++ sources	11 Dec 2009 09:53:37 -0000	1.3
@@ -1 +1 @@
-8a76c03579a3e27046e6bafe88ffd171  libssh-0.2.tgz
+bcb3d567bacd54c9f6b5b0e8c4d1102c  libssh-0.4.0.tar.gz



From mitr at fedoraproject.org  Fri Dec 11 10:19:15 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Fri, 11 Dec 2009 10:19:15 +0000 (UTC)
Subject: File libuser-0.56.13.tar.bz2 uploaded to lookaside cache by mitr
Message-ID: <20091211101915.708F710F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libuser:

1b70a2d1d11209438db025b5c4bbb026  libuser-0.56.13.tar.bz2



From caolanm at fedoraproject.org  Fri Dec 11 10:34:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Dec 2009 10:34:31 +0000 (UTC)
Subject: rpms/planner/F-12 planner-gnome604355-scrolling.patch, NONE,
	1.1 planner.spec, 1.72, 1.73
Message-ID: <20091211103431.6E83A11C00C5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6669/F-12

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604355-scrolling.patch 
Log Message:
Resolves: rhbz#546515 allow scrolling

planner-gnome604355-scrolling.patch:
 planner-gantt-view.c |    8 ++++++--
 planner-usage-view.c |    6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE planner-gnome604355-scrolling.patch ---
diff -ru planner-0.14.4.orig/src/planner-gantt-view.c planner-0.14.4/src/planner-gantt-view.c
--- planner-0.14.4.orig/src/planner-gantt-view.c	2008-08-02 21:00:12.000000000 +0100
+++ planner-0.14.4/src/planner-gantt-view.c	2009-12-11 10:21:01.000000000 +0000
@@ -201,19 +201,23 @@
 static gboolean
 gantt_view_chart_scroll_event (GtkWidget * gki, GdkEventScroll * event, PlannerGanttView *view)
 {
+	gboolean dontpropogate = FALSE;
+
 	gboolean can_in, can_out;
 	PlannerGanttViewPriv *priv;
-	
+
 	if (event->state & GDK_CONTROL_MASK) {
 		priv = view->priv;
 		planner_gantt_chart_can_zoom (PLANNER_GANTT_CHART (priv->gantt), &can_in, &can_out);
 		switch (event->direction) {
       			case GDK_SCROLL_UP: {
+      				dontpropogate = TRUE;
 				if (can_in)
 					gantt_view_zoom_in_cb  (NULL, view);
 	        		break;
 			}
 			case GDK_SCROLL_DOWN:
+      				dontpropogate = TRUE;
 				if (can_out)
 					gantt_view_zoom_out_cb  (NULL, view);
 			        break;
@@ -222,7 +226,7 @@
 		}
     	}
 
-	return TRUE;
+	return dontpropogate;
 }
 
 static void
diff -ru planner-0.14.4.orig/src/planner-usage-view.c planner-0.14.4/src/planner-usage-view.c
--- planner-0.14.4.orig/src/planner-usage-view.c	2008-08-02 20:56:19.000000000 +0100
+++ planner-0.14.4/src/planner-usage-view.c	2009-12-11 10:22:01.000000000 +0000
@@ -122,6 +122,8 @@
 static gboolean
 usage_view_chart_scroll_event (GtkWidget * gki, GdkEventScroll * event, PlannerView *view)
 {
+	gboolean dontpropogate = FALSE;
+
 	gboolean can_in, can_out;
 	PlannerUsageViewPriv *priv;
 	
@@ -130,11 +132,13 @@
 		planner_usage_chart_can_zoom (priv->chart, &can_in, &can_out);
 		switch (event->direction) {
       			case GDK_SCROLL_UP: {
+				dontpropogate = TRUE;
 				if (can_in)
 					usage_view_zoom_in_cb  (NULL, view);
 	        		break;
 			}
 			case GDK_SCROLL_DOWN:
+				dontpropogate = TRUE;
 				if (can_out)
 					usage_view_zoom_out_cb  (NULL, view);
 			        break;
@@ -143,7 +147,7 @@
 		}
     	}
 
-	return TRUE;
+	return dontpropogate;
 }
 
 


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- planner.spec	9 Dec 2009 12:37:25 -0000	1.72
+++ planner.spec	11 Dec 2009 10:34:31 -0000	1.73
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -25,6 +25,7 @@ Patch3: planner-gnome550559-fitzoom.patc
 Patch4: planner-buildfix.patch
 Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
 Patch6: planner-gnome604169-comboboxentry.patch
+Patch7: planner-gnome604355-scrolling.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -61,6 +62,7 @@ This package provides a plugin to integr
 %patch4 -p1 -b .buildfix
 %patch5 -p1 -b .edittask
 %patch6 -p1 -b .combobox
+%patch7 -p1 -b .scrolling
 
 %build
 rm -rf libegg
@@ -161,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Dec 11 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-8
+- Resolves: rhbz#546515 allow scrolling
+
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-7
 - Resolves: rhbz#545711 use GtkComboBoxEntry instead of GtkCombo
 



From caolanm at fedoraproject.org  Fri Dec 11 10:34:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Dec 2009 10:34:31 +0000 (UTC)
Subject: rpms/planner/devel planner-gnome604355-scrolling.patch, NONE,
	1.1 planner.spec, 1.72, 1.73
Message-ID: <20091211103431.AAAF211C00C5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6669/devel

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604355-scrolling.patch 
Log Message:
Resolves: rhbz#546515 allow scrolling

planner-gnome604355-scrolling.patch:
 planner-gantt-view.c |    8 ++++++--
 planner-usage-view.c |    6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE planner-gnome604355-scrolling.patch ---
diff -ru planner-0.14.4.orig/src/planner-gantt-view.c planner-0.14.4/src/planner-gantt-view.c
--- planner-0.14.4.orig/src/planner-gantt-view.c	2008-08-02 21:00:12.000000000 +0100
+++ planner-0.14.4/src/planner-gantt-view.c	2009-12-11 10:21:01.000000000 +0000
@@ -201,19 +201,23 @@
 static gboolean
 gantt_view_chart_scroll_event (GtkWidget * gki, GdkEventScroll * event, PlannerGanttView *view)
 {
+	gboolean dontpropogate = FALSE;
+
 	gboolean can_in, can_out;
 	PlannerGanttViewPriv *priv;
-	
+
 	if (event->state & GDK_CONTROL_MASK) {
 		priv = view->priv;
 		planner_gantt_chart_can_zoom (PLANNER_GANTT_CHART (priv->gantt), &can_in, &can_out);
 		switch (event->direction) {
       			case GDK_SCROLL_UP: {
+      				dontpropogate = TRUE;
 				if (can_in)
 					gantt_view_zoom_in_cb  (NULL, view);
 	        		break;
 			}
 			case GDK_SCROLL_DOWN:
+      				dontpropogate = TRUE;
 				if (can_out)
 					gantt_view_zoom_out_cb  (NULL, view);
 			        break;
@@ -222,7 +226,7 @@
 		}
     	}
 
-	return TRUE;
+	return dontpropogate;
 }
 
 static void
diff -ru planner-0.14.4.orig/src/planner-usage-view.c planner-0.14.4/src/planner-usage-view.c
--- planner-0.14.4.orig/src/planner-usage-view.c	2008-08-02 20:56:19.000000000 +0100
+++ planner-0.14.4/src/planner-usage-view.c	2009-12-11 10:22:01.000000000 +0000
@@ -122,6 +122,8 @@
 static gboolean
 usage_view_chart_scroll_event (GtkWidget * gki, GdkEventScroll * event, PlannerView *view)
 {
+	gboolean dontpropogate = FALSE;
+
 	gboolean can_in, can_out;
 	PlannerUsageViewPriv *priv;
 	
@@ -130,11 +132,13 @@
 		planner_usage_chart_can_zoom (priv->chart, &can_in, &can_out);
 		switch (event->direction) {
       			case GDK_SCROLL_UP: {
+				dontpropogate = TRUE;
 				if (can_in)
 					usage_view_zoom_in_cb  (NULL, view);
 	        		break;
 			}
 			case GDK_SCROLL_DOWN:
+				dontpropogate = TRUE;
 				if (can_out)
 					usage_view_zoom_out_cb  (NULL, view);
 			        break;
@@ -143,7 +147,7 @@
 		}
     	}
 
-	return TRUE;
+	return dontpropogate;
 }
 
 


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- planner.spec	9 Dec 2009 12:36:21 -0000	1.72
+++ planner.spec	11 Dec 2009 10:34:31 -0000	1.73
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -25,6 +25,7 @@ Patch3: planner-gnome550559-fitzoom.patc
 Patch4: planner-buildfix.patch
 Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
 Patch6: planner-gnome604169-comboboxentry.patch
+Patch7: planner-gnome604355-scrolling.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -61,6 +62,7 @@ This package provides a plugin to integr
 %patch4 -p1 -b .buildfix
 %patch5 -p1 -b .edittask
 %patch6 -p1 -b .combobox
+%patch7 -p1 -b .scrolling
 
 %build
 rm -rf libegg
@@ -159,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Dec 11 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-8
+- Resolves: rhbz#546515 allow scrolling
+
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-7
 - Resolves: rhbz#545711 use GtkComboBoxEntry instead of GtkCombo
 



From mitr at fedoraproject.org  Fri Dec 11 10:36:04 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Fri, 11 Dec 2009 10:36:04 +0000 (UTC)
Subject: rpms/libuser/devel .cvsignore, 1.53, 1.54 libuser.spec, 1.86,
	1.87 sources, 1.55, 1.56
Message-ID: <20091211103604.D093111C00C5@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/libuser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7334

Modified Files:
	.cvsignore libuser.spec sources 
Log Message:
* Fri Dec 11 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.13-1
- Update to libuser-0.56.13.
  Resolves: #251951
  Resolves: #454079
  Resolves: #456373
  Resolves: #456382
  Resolves: #530513



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	1 Oct 2009 23:15:15 -0000	1.53
+++ .cvsignore	11 Dec 2009 10:36:04 -0000	1.54
@@ -1 +1 @@
-libuser-0.56.12.tar.bz2
+libuser-0.56.13.tar.bz2


Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- libuser.spec	1 Oct 2009 23:15:15 -0000	1.86
+++ libuser.spec	11 Dec 2009 10:36:04 -0000	1.87
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libuser
-Version: 0.56.12
+Version: 0.56.13
 Release: 1%{?dist}
 Group: System Environment/Base
 License: LGPLv2+
@@ -100,6 +100,14 @@ python -c "import libuser"
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Dec 11 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.13-1
+- Update to libuser-0.56.13.
+  Resolves: #251951
+  Resolves: #454079
+  Resolves: #456373
+  Resolves: #456382
+  Resolves: #530513
+
 * Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.12-1
 - Update to libuser-0.56.12.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	1 Oct 2009 23:15:15 -0000	1.55
+++ sources	11 Dec 2009 10:36:04 -0000	1.56
@@ -1 +1 @@
-a79e3a84aed576cc8fab27487843f749  libuser-0.56.12.tar.bz2
+1b70a2d1d11209438db025b5c4bbb026  libuser-0.56.13.tar.bz2



From caolanm at fedoraproject.org  Fri Dec 11 10:39:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Dec 2009 10:39:30 +0000 (UTC)
Subject: File lower_sorbian_spelling_dictionary-1.1.3.oxt uploaded to
	lookaside cache by caolanm
Message-ID: <20091211103930.5865210F89D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hunspell-dsb:

9a938d179626c5c3e40e2256720dea2d  lower_sorbian_spelling_dictionary-1.1.3.oxt



From caolanm at fedoraproject.org  Fri Dec 11 10:40:16 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Dec 2009 10:40:16 +0000 (UTC)
Subject: rpms/hunspell-dsb/devel .cvsignore, 1.2, 1.3 hunspell-dsb.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091211104016.C411A11C03E3@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-dsb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8891

Modified Files:
	.cvsignore hunspell-dsb.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-dsb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Nov 2009 16:36:26 -0000	1.2
+++ .cvsignore	11 Dec 2009 10:40:16 -0000	1.3
@@ -1 +1 @@
-lower_sorbian_spelling_dictionary-1.1.2.oxt
+lower_sorbian_spelling_dictionary-1.1.3.oxt


Index: hunspell-dsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-dsb/devel/hunspell-dsb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hunspell-dsb.spec	3 Nov 2009 16:36:26 -0000	1.2
+++ hunspell-dsb.spec	11 Dec 2009 10:40:16 -0000	1.3
@@ -1,9 +1,9 @@
 Name: hunspell-dsb
 Summary: Lower Sorbian hunspell dictionaries
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 Group: Applications/Text
-Source: http://extensions.services.openoffice.org/files/3045/2/lower_sorbian_spelling_dictionary-%{version}.oxt
+Source: http://extensions.services.openoffice.org/files/3045/3/lower_sorbian_spelling_dictionary-%{version}.oxt
 URL: http://dsb-spell.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2+
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Dec 11 2009 Caolan McNamara <caolanm at redhat.com> - 1.1.3-1
+- latest version
+
 * Tue Nov 03 2009 Caolan McNamara <caolanm at redhat.com> - 1.1.2-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-dsb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Nov 2009 16:36:26 -0000	1.2
+++ sources	11 Dec 2009 10:40:16 -0000	1.3
@@ -1 +1 @@
-b27c8728a9a2f58efdc8a24de525940b  lower_sorbian_spelling_dictionary-1.1.2.oxt
+9a938d179626c5c3e40e2256720dea2d  lower_sorbian_spelling_dictionary-1.1.3.oxt



From varekova at fedoraproject.org  Fri Dec 11 10:41:10 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 11 Dec 2009 10:41:10 +0000 (UTC)
Subject: rpms/sysstat/devel sysstat-9.0.6-nfs.patch, NONE, 1.1 sysstat.spec, 
	1.74, 1.75
Message-ID: <20091211104110.66F6911C00C5@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9295

Modified Files:
	sysstat.spec 
Added Files:
	sysstat-9.0.6-nfs.patch 
Log Message:
- fix the problem in get_nfs_mount_nr function
  ( iostat -n causes stack smashing)


sysstat-9.0.6-nfs.patch:
 common.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE sysstat-9.0.6-nfs.patch ---
diff -up sysstat-9.0.6/common.c.pom sysstat-9.0.6/common.c
--- sysstat-9.0.6/common.c.pom	2009-09-12 20:59:04.000000000 +0200
+++ sysstat-9.0.6/common.c	2009-12-11 11:20:41.000000000 +0100
@@ -275,7 +275,6 @@ int get_nfs_mount_nr(void)
 {
 	FILE *fp;
 	char line[8192];
-	char type_name[10];
 	unsigned int nfs = 0;
 
 	if ((fp = fopen(NFSMOUNTSTATS, "r")) == NULL)
@@ -285,12 +284,9 @@ int get_nfs_mount_nr(void)
 	while (fgets(line, 8192, fp) != NULL) {
 
 		if ((strstr(line, "mounted")) && (strstr(line, "on")) &&
-		    (strstr(line, "with")) && (strstr(line, "fstype"))) {
-	
-			sscanf(strstr(line, "fstype") + 6, "%10s", type_name);
-			if ((!strncmp(type_name, "nfs", 3)) && (strncmp(type_name, "nfsd", 4))) {
-				nfs ++;
-			}
+		   (strstr(line, "with fstype nfs")) &&
+		    !(strstr(line, "with fstype nfsd"))) {
+			nfs++;
 		}
 	}
 


Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sysstat.spec	2 Dec 2009 07:46:45 -0000	1.74
+++ sysstat.spec	11 Dec 2009 10:41:10 -0000	1.75
@@ -1,12 +1,13 @@
 Name: sysstat
 Version: 9.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
 URL: 	http://perso.orange.fr/sebastien.godard/
 Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2
 Patch0: sysstat-9.0.4-init_script.patch
+Patch1: sysstat-9.0.6-nfs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -23,6 +24,7 @@ activity.
 %prep
 %setup -q
 %patch0 -p1 -b .ii
+%patch1 -p1 -b .nfs
 iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
 mv CREDITS.aux CREDITS
 
@@ -74,6 +76,10 @@ rm -rf %{buildroot}
 %{_localstatedir}/log/sa
 
 %changelog
+* Fri Dec 11 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 9.0.6-2
+- fix the problem in get_nfs_mount_nr function
+  ( iostat -n causes stack smashing)
+
 * Wed Dec  2 2009 Ivana Hutarva Varekova <varekova at redhat.com> - 9.0.6-1
 - update to 9.0.6
 



From jskala at fedoraproject.org  Fri Dec 11 10:43:09 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 11 Dec 2009 10:43:09 +0000 (UTC)
Subject: rpms/ppp/F-12 .cvsignore, 1.7, 1.8 ppp-2.4.2-pppoatm-make.patch, 1.2,
	1.3 ppp-2.4.3-fix.patch, 1.1, 1.2 ppp-2.4.3-fix64.patch, 1.1,
	1.2 ppp-2.4.3-make.patch, 1.1, 1.2 ppp-2.4.4-lib64.patch, 1.2,
	1.3 ppp-2.4.4-no_strip.patch, 1.1, 1.2 ppp.spec, 1.51,
	1.52 sources, 1.7, 1.8 ppp-2.4.1-pkgcheck.patch, 1.1,
	NONE ppp-2.4.2-bpf.patch, 1.1, NONE ppp-2.4.2-fix.patch, 1.1,
	NONE ppp-2.4.2-fix64.patch, 1.1, NONE ppp-2.4.2-lib64.patch, 1.1,
	NONE ppp-2.4.2-make.patch, 1.2, NONE ppp-2.4.2-no_strip.patch,
	1.1, NONE ppp-2.4.2-pcap.patch, 1.1,
	NONE ppp-2.4.2-pppoatm-mtu.patch, 1.1,
	NONE ppp-2.4.2-pppoatm.patch, 1.3, NONE ppp-2.4.2-signal.patch,
	1.1, NONE ppp-2.4.4-bogus_dns_addr.patch, 1.1,
	NONE ppp-2.4.4-closelog.patch, 1.1,
	NONE ppp-2.4.4-new_speeds.patch, 1.1,
	NONE ppp-2.4.4-response_len.patch, 1.1, NONE
Message-ID: <20091211104309.1896B11C00C5@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/ppp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10349

Modified Files:
	.cvsignore ppp-2.4.2-pppoatm-make.patch ppp-2.4.3-fix.patch 
	ppp-2.4.3-fix64.patch ppp-2.4.3-make.patch 
	ppp-2.4.4-lib64.patch ppp-2.4.4-no_strip.patch ppp.spec 
	sources 
Removed Files:
	ppp-2.4.1-pkgcheck.patch ppp-2.4.2-bpf.patch 
	ppp-2.4.2-fix.patch ppp-2.4.2-fix64.patch 
	ppp-2.4.2-lib64.patch ppp-2.4.2-make.patch 
	ppp-2.4.2-no_strip.patch ppp-2.4.2-pcap.patch 
	ppp-2.4.2-pppoatm-mtu.patch ppp-2.4.2-pppoatm.patch 
	ppp-2.4.2-signal.patch ppp-2.4.4-bogus_dns_addr.patch 
	ppp-2.4.4-closelog.patch ppp-2.4.4-new_speeds.patch 
	ppp-2.4.4-response_len.patch 
Log Message:
* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 2.4.5-1
- re-base to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Jul 2006 18:09:31 -0000	1.7
+++ .cvsignore	11 Dec 2009 10:43:08 -0000	1.8
@@ -1,3 +1 @@
-ppp-2.4.2.tar.gz
-ppp-2.4.3.tar.gz
-ppp-2.4.4.tar.gz
+ppp-2.4.5.tar.gz

ppp-2.4.2-pppoatm-make.patch:
 Makefile.linux |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ppp-2.4.2-pppoatm-make.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp-2.4.2-pppoatm-make.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ppp-2.4.2-pppoatm-make.patch	28 Aug 2008 21:44:37 -0000	1.2
+++ ppp-2.4.2-pppoatm-make.patch	11 Dec 2009 10:43:08 -0000	1.3
@@ -2,7 +2,7 @@ diff -up ppp-2.4.4/pppd/plugins/pppoatm/
 --- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.atm-make	2008-08-28 17:36:10.000000000 -0400
 +++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux	2008-08-28 17:36:56.000000000 -0400
 @@ -1,5 +1,5 @@
- CC	= gcc
+ #CC	= gcc
 -COPTS	= -O2 -g
 +COPTS	= $(RPM_OPT_FLAGS)
  CFLAGS	= $(COPTS) -I../.. -I../../../include -fPIC

ppp-2.4.3-fix.patch:
 pppd/ipv6cp.c                     |    5 ++++-
 pppd/plugins/rp-pppoe/discovery.c |    2 ++
 pppdump/bsd-comp.c                |    8 ++++----
 pppdump/deflate.c                 |    5 +++--
 pppdump/pppdump.c                 |    5 +++--
 5 files changed, 16 insertions(+), 9 deletions(-)

Index: ppp-2.4.3-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp-2.4.3-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.3-fix.patch	18 Jul 2005 11:55:02 -0000	1.1
+++ ppp-2.4.3-fix.patch	11 Dec 2009 10:43:08 -0000	1.2
@@ -1,14 +1,14 @@
 --- ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c.fix	2004-11-04 11:07:37.000000000 +0100
 +++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2004-11-22 16:00:24.522462124 +0100
 @@ -13,6 +13,8 @@
- 
  #include "pppoe.h"
+ #include "pppd/pppd.h"
  
 +void warn __P((char *, ...));   /* log a warning message */
 +
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
- #endif
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
 --- ppp-2.4.3/pppd/ipv6cp.c.fix	2004-11-13 03:28:15.000000000 +0100
 +++ ppp-2.4.3/pppd/ipv6cp.c	2004-11-22 16:00:27.049114044 +0100
 @@ -151,6 +151,7 @@
@@ -30,30 +30,6 @@
  /*
   * ipv6_check_options - check that any IP-related options are OK,
   * and assign appropriate defaults.
---- ppp-2.4.3/include/linux/if_pppox.h.fix	2001-12-15 01:34:24.000000000 +0100
-+++ ppp-2.4.3/include/linux/if_pppox.h	2004-11-22 16:00:27.049114044 +0100
-@@ -18,7 +18,7 @@
- 
- 
- #include <asm/types.h>
--#include <asm/byteorder.h>
-+#include <endian.h>
- 
- #ifdef  __KERNEL__
- #include <linux/if_ether.h>
-@@ -97,10 +97,10 @@
- #define PTT_GEN_ERR  	__constant_htons(0x0203)
- 
- struct pppoe_hdr {
--#if defined(__LITTLE_ENDIAN_BITFIELD)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- 	__u8 ver : 4;
- 	__u8 type : 4;
--#elif defined(__BIG_ENDIAN_BITFIELD)
-+#elif __BYTE_ORDER == __BIG_ENDIAN
- 	__u8 type : 4;
- 	__u8 ver : 4;
- #else
 --- ppp-2.4.3/pppdump/deflate.c.fix	2004-02-02 04:36:46.000000000 +0100
 +++ ppp-2.4.3/pppdump/deflate.c	2004-11-22 16:02:18.071820020 +0100
 @@ -39,6 +39,7 @@

ppp-2.4.3-fix64.patch:
 sha1.c |    1 +
 1 file changed, 1 insertion(+)

Index: ppp-2.4.3-fix64.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp-2.4.3-fix64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.3-fix64.patch	18 Jul 2005 11:55:02 -0000	1.1
+++ ppp-2.4.3-fix64.patch	11 Dec 2009 10:43:08 -0000	1.2
@@ -5,6 +5,6 @@
  #include <string.h>
  #include <netinet/in.h>	/* htonl() */
 +#include <sys/types.h>	/* u_int32_t */
+ #include <net/ppp_defs.h>
  #include "sha1.h"
  
- static void

ppp-2.4.3-make.patch:
 chat/Makefile.linux                  |    2 +-
 pppd/Makefile.linux                  |   10 +++++-----
 pppd/plugins/Makefile.linux          |    2 +-
 pppd/plugins/radius/Makefile.linux   |    2 +-
 pppd/plugins/rp-pppoe/Makefile.linux |    2 +-
 pppdump/Makefile.linux               |    2 +-
 pppstats/Makefile.linux              |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

Index: ppp-2.4.3-make.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp-2.4.3-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.3-make.patch	18 Jul 2005 11:55:02 -0000	1.1
+++ ppp-2.4.3-make.patch	11 Dec 2009 10:43:08 -0000	1.2
@@ -28,7 +28,7 @@
 --- ppp-2.4.3/pppd/plugins/Makefile.linux.make	2004-11-14 08:57:35.000000000 +0100
 +++ ppp-2.4.3/pppd/plugins/Makefile.linux	2004-11-22 15:46:49.873309203 +0100
 @@ -1,5 +1,5 @@
- CC	= gcc
+ #CC	= gcc
 -COPTS	= -O2 -g
 +COPTS	= $(RPM_OPT_FLAGS)
  CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
@@ -47,13 +47,13 @@
  # MS-CHAP authentication protocol.
 --- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.make	2004-11-14 08:58:37.000000000 +0100
 +++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-22 15:46:49.875308929 +0100
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
  # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
- VERSION=3.3
+ RP_VERSION=3.8p
  
 -COPTS=-O2 -g
 +COPTS=$(RPM_OPT_FLAGS)
- CFLAGS=$(COPTS) -I../../../include/linux
+ CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
  all: rp-pppoe.so pppoe-discovery
  
 --- ppp-2.4.3/pppdump/Makefile.linux.make	2004-10-31 02:36:52.000000000 +0200

ppp-2.4.4-lib64.patch:
 Makefile.linux                  |    3 ++-
 pathnames.h                     |    2 +-
 plugins/Makefile.linux          |    2 +-
 plugins/pppoatm/Makefile.linux  |    4 ++--
 plugins/radius/Makefile.linux   |    2 +-
 plugins/rp-pppoe/Makefile.linux |    2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

Index: ppp-2.4.4-lib64.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp-2.4.4-lib64.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ppp-2.4.4-lib64.patch	24 Jul 2006 18:51:38 -0000	1.2
+++ ppp-2.4.4-lib64.patch	11 Dec 2009 10:43:08 -0000	1.3
@@ -26,7 +26,7 @@
  
  #***********************************************************************
  
--DESTDIR = @DESTDIR@
+-DESTDIR = $(INSTROOT)@DESTDIR@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 +DESTDIR = $(INSTROOT)@DESTDIR@
 +LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
@@ -42,7 +42,7 @@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 +LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
  
- SUBDIRS := rp-pppoe pppoatm
+ SUBDIRS := rp-pppoe pppoatm pppol2tp
  # Uncomment the next line to include the radius authentication plugin
 --- ppp-2.4.4/pppd/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
 +++ ppp-2.4.4/pppd/Makefile.linux	2006-07-24 20:43:40.000000000 +0200

ppp-2.4.4-no_strip.patch:
 chat/Makefile.linux                     |    2 +-
 chat/Makefile.linux.make                |    2 +-
 pppd/Makefile.linux                     |    4 ++--
 pppd/Makefile.linux.lib64               |    4 ++--
 pppd/Makefile.linux.make                |    4 ++--
 pppd/Makefile.linux.pie                 |    4 ++--
 pppd/plugins/radius/Makefile.linux      |    6 +++---
 pppd/plugins/radius/Makefile.linux.make |    6 +++---
 pppd/plugins/rp-pppoe/Makefile.linux    |    4 ++--
 pppdump/Makefile.linux                  |    2 +-
 pppdump/Makefile.linux.make             |    2 +-
 pppstats/Makefile.linux                 |    2 +-
 pppstats/Makefile.linux.make            |    2 +-
 13 files changed, 22 insertions(+), 22 deletions(-)

Index: ppp-2.4.4-no_strip.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp-2.4.4-no_strip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.4-no_strip.patch	24 Jul 2006 18:09:32 -0000	1.1
+++ ppp-2.4.4-no_strip.patch	11 Dec 2009 10:43:08 -0000	1.2
@@ -68,23 +68,9 @@
  	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
  	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
  
---- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.make.no_strip	2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.make	2006-07-19 14:29:41.000000000 +0200
-@@ -39,9 +39,9 @@
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
-+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
- 	$(INSTALL) -d -m 755 $(BINDIR)
--	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
-+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
- 
- clean:
- 	rm -f *.o *.so
 --- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.no_strip	2006-07-19 14:29:41.000000000 +0200
 +++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux	2006-07-19 14:29:41.000000000 +0200
-@@ -39,9 +39,9 @@
+@@ -43,9 +43,9 @@
  
  install: all
  	$(INSTALL) -d -m 755 $(LIBDIR)
@@ -95,7 +81,7 @@
 +	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
  
  clean:
- 	rm -f *.o *.so
+ 	rm -f *.o *.so pppoe-discovery
 --- ppp-2.4.4/pppd/Makefile.linux.lib64.no_strip	2006-07-19 14:29:41.000000000 +0200
 +++ ppp-2.4.4/pppd/Makefile.linux.lib64	2006-07-19 14:29:41.000000000 +0200
 @@ -99,7 +99,7 @@


Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ppp.spec	16 Sep 2009 17:58:44 -0000	1.51
+++ ppp.spec	11 Dec 2009 10:43:08 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
-Version: 2.4.4
-Release: 13%{?dist}
+Version: 2.4.5
+Release: 1%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -17,17 +17,12 @@ Patch8: ppp-2.4.3-fix.patch
 Patch9: ppp-2.4.3-fix64.patch
 Patch11: ppp-2.4.2-change_resolv_conf.patch
 Patch13: ppp-2.4.4-no_strip.patch
-Patch16: ppp-2.4.2-pppoatm-mtu.patch
 Patch17: ppp-2.4.2-pppoatm-make.patch
 Patch19: ppp-2.4.3-local.patch
 Patch20: ppp-2.4.3-ipv6-accept-remote.patch
 Patch21: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
 Patch22: ppp-2.4.4-cbcp.patch
 Patch23: ppp-2.4.2-dontwriteetc.patch
-Patch24: ppp-2.4.4-closelog.patch
-Patch25: ppp-2.4.4-response_len.patch
-Patch26: ppp-2.4.4-new_speeds.patch
-Patch27: ppp-2.4.4-bogus_dns_addr.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: pam-devel, libpcap-devel
@@ -61,17 +56,12 @@ This package contains the header files f
 %patch9 -p1 -b .fix64
 %patch11 -p1 -b .change_resolv_conf
 %patch13 -p1 -b .no_strip
-%patch16 -p1 -b .atm-mtu
 %patch17 -p1 -b .atm-make
 %patch19 -p1 -b .local
 %patch20 -p1 -b .ipv6cp
 %patch21 -p1 -b .usepeerdns-var_run_ppp_resolv
 %patch22 -p1 -b .cbcp
 %patch23 -p1 -b .dontwriteetc
-%patch24 -p1 -b .closelog
-%patch25 -p1 -b .response_len
-%patch26 -p1 -b .new_speeds
-%patch27 -p1 -b .bogus_dns_addr
 
 rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
@@ -136,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 2.4.5-1
+- re-base to latest upstream
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 2.4.4-13
 - use password-auth common PAM configuration instead of system-auth
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Jul 2006 18:09:32 -0000	1.7
+++ sources	11 Dec 2009 10:43:08 -0000	1.8
@@ -1,2 +1 @@
-848f6c3cafeb6074ffeb293c3af79b7c  ppp-2.4.3.tar.gz
-183800762e266132218b204dfb428d29  ppp-2.4.4.tar.gz
+4621bc56167b6953ec4071043fe0ec57  ppp-2.4.5.tar.gz


--- ppp-2.4.1-pkgcheck.patch DELETED ---


--- ppp-2.4.2-bpf.patch DELETED ---


--- ppp-2.4.2-fix.patch DELETED ---


--- ppp-2.4.2-fix64.patch DELETED ---


--- ppp-2.4.2-lib64.patch DELETED ---


--- ppp-2.4.2-make.patch DELETED ---


--- ppp-2.4.2-no_strip.patch DELETED ---


--- ppp-2.4.2-pcap.patch DELETED ---


--- ppp-2.4.2-pppoatm-mtu.patch DELETED ---


--- ppp-2.4.2-pppoatm.patch DELETED ---


--- ppp-2.4.2-signal.patch DELETED ---


--- ppp-2.4.4-bogus_dns_addr.patch DELETED ---


--- ppp-2.4.4-closelog.patch DELETED ---


--- ppp-2.4.4-new_speeds.patch DELETED ---


--- ppp-2.4.4-response_len.patch DELETED ---



From caolanm at fedoraproject.org  Fri Dec 11 10:45:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Dec 2009 10:45:08 +0000 (UTC)
Subject: File dict-zu_ZA-2009.12.10.oxt uploaded to lookaside cache by
	caolanm
Message-ID: <20091211104508.7407410F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hunspell-zu:

2f01b2291f2482bf217ffc4a34654f0d  dict-zu_ZA-2009.12.10.oxt



From mitr at fedoraproject.org  Fri Dec 11 10:45:11 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Fri, 11 Dec 2009 10:45:11 +0000 (UTC)
Subject: rpms/libuser/F-12 .cvsignore, 1.53, 1.54 libuser.spec, 1.86,
	1.87 sources, 1.55, 1.56
Message-ID: <20091211104511.39DDE11C00C5@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/libuser/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11130

Modified Files:
	.cvsignore libuser.spec sources 
Log Message:
* Fri Dec 11 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.13-1
- Update to libuser-0.56.13.
  Resolves: #251951
  Resolves: #454079
  Resolves: #456373
  Resolves: #456382
  Resolves: #530513



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/F-12/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	1 Oct 2009 23:24:06 -0000	1.53
+++ .cvsignore	11 Dec 2009 10:45:10 -0000	1.54
@@ -1 +1 @@
-libuser-0.56.12.tar.bz2
+libuser-0.56.13.tar.bz2


Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/F-12/libuser.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- libuser.spec	1 Oct 2009 23:24:07 -0000	1.86
+++ libuser.spec	11 Dec 2009 10:45:10 -0000	1.87
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libuser
-Version: 0.56.12
+Version: 0.56.13
 Release: 1%{?dist}
 Group: System Environment/Base
 License: LGPLv2+
@@ -100,6 +100,14 @@ python -c "import libuser"
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Dec 11 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.13-1
+- Update to libuser-0.56.13.
+  Resolves: #251951
+  Resolves: #454079
+  Resolves: #456373
+  Resolves: #456382
+  Resolves: #530513
+
 * Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.12-1
 - Update to libuser-0.56.12.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/F-12/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	1 Oct 2009 23:24:07 -0000	1.55
+++ sources	11 Dec 2009 10:45:11 -0000	1.56
@@ -1 +1 @@
-a79e3a84aed576cc8fab27487843f749  libuser-0.56.12.tar.bz2
+1b70a2d1d11209438db025b5c4bbb026  libuser-0.56.13.tar.bz2



From kraxel at fedoraproject.org  Fri Dec 11 10:46:41 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Fri, 11 Dec 2009 10:46:41 +0000 (UTC)
Subject: rpms/xen/F-12 .cvsignore, 1.42, 1.43 sources, 1.57, 1.58 xen.modules,
	1.3, 1.4 xen.spec, 1.249,
	1.250 xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch, 1.1,
	NONE xen-fix-videoram-option.patch, 1.1,
	NONE xen-pygrub-fix-timeout-0.patch, 1.1,
	NONE xen-qemu-dm-fix-block-memory-leak.patch, 1.1, NONE
Message-ID: <20091211104641.3933D11C00C5@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11794

Modified Files:
	.cvsignore sources xen.modules xen.spec 
Removed Files:
	xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch 
	xen-fix-videoram-option.patch xen-pygrub-fix-timeout-0.patch 
	xen-qemu-dm-fix-block-memory-leak.patch 
Log Message:
update to 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	7 Aug 2009 14:56:02 -0000	1.42
+++ .cvsignore	11 Dec 2009 10:46:40 -0000	1.43
@@ -5,4 +5,4 @@ newlib-1.16.0.tar.gz
 lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
-xen-3.4.1.tar.gz
+xen-3.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-12/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	7 Aug 2009 14:56:02 -0000	1.57
+++ sources	11 Dec 2009 10:46:40 -0000	1.58
@@ -3,4 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib
 36cc57650cffda9a0269493be2a169bb  lwip-1.3.0.tar.gz
 cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
-c3f8dbcf833140825b1e2f16b64655f3  xen-3.4.1.tar.gz
+f009a7abf51017aeee697c9130b6f8a6  xen-3.4.2.tar.gz


Index: xen.modules
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-12/xen.modules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xen.modules	6 Mar 2009 11:26:51 -0000	1.3
+++ xen.modules	11 Dec 2009 10:46:41 -0000	1.4
@@ -5,6 +5,6 @@ test -f /proc/xen/capabilities			|| moun
 test -f /proc/xen/capabilities			|| exit 0
 grep -q "control_d" /proc/xen/capabilities	|| exit 0
 
-for module in evtchn blkbk netbk; do
+for module in xen-evtchn evtchn blkbk netbk; do
 	modprobe ${module} >/dev/null 2>&1
 done


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-12/xen.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- xen.spec	9 Oct 2009 14:47:03 -0000	1.249
+++ xen.spec	11 Dec 2009 10:46:41 -0000	1.250
@@ -5,8 +5,8 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 3.4.1
-Release: 5%{?dist}
+Version: 3.4.2
+Release: 1%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -37,12 +37,6 @@ Patch5: xen-net-disable-iptables-on-brid
 
 Patch10: xen-no-werror.patch
 
-# backports
-Patch20: xen-pygrub-fix-timeout-0.patch
-Patch21: xen-qemu-dm-fix-block-memory-leak.patch
-Patch22: xen-fix-videoram-option.patch
-Patch23: xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch
-
 Patch100: xen-configure-xend.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -147,11 +141,6 @@ which manage Xen virtual machines.
 
 %patch10 -p1
 
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-
 %patch100 -p1
 
 # stubdom sources
@@ -465,6 +454,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Fri Dec 11 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.2-1
+- update to 3.4.2 release.
+- adapt module load script to evtchn.ko -> xen-evtchn.ko rename.
+
 * Thu Oct 7 2009 Justin M. Forbes <jforbes at redhat.com> - 3.4.1-5
 - add PyXML to dependencies. (#496135)
 - Take ownership of {_libdir}/fs (#521806)


--- xen-341-add-bzip2-lzma-pv-bootloader-support-v2.patch DELETED ---


--- xen-fix-videoram-option.patch DELETED ---


--- xen-pygrub-fix-timeout-0.patch DELETED ---


--- xen-qemu-dm-fix-block-memory-leak.patch DELETED ---



From caolanm at fedoraproject.org  Fri Dec 11 10:49:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 11 Dec 2009 10:49:26 +0000 (UTC)
Subject: rpms/hunspell-zu/devel .cvsignore, 1.3, 1.4 hunspell-zu.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <20091211104926.96CA011C00C5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-zu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12861

Modified Files:
	.cvsignore hunspell-zu.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-zu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Jul 2007 10:34:46 -0000	1.3
+++ .cvsignore	11 Dec 2009 10:49:26 -0000	1.4
@@ -1 +1 @@
-myspell-zu_ZA-20060120.zip
+dict-zu_ZA-2009.12.10.oxt


Index: hunspell-zu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-zu/devel/hunspell-zu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- hunspell-zu.spec	25 Jul 2009 02:46:33 -0000	1.6
+++ hunspell-zu.spec	11 Dec 2009 10:49:26 -0000	1.7
@@ -1,9 +1,9 @@
 Name: hunspell-zu
 Summary: Zulu hunspell dictionaries
-%define upstreamid 20060120
+%define upstreamid 20091210
 Version: 0.%{upstreamid}
-Release: 4%{?dist}
-Source: http://downloads.sourceforge.net/translate/myspell-zu_ZA-%{upstreamid}.zip
+Release: 1%{?dist}
+Source: http://extensions.services.openoffice.org/files/3132/1/dict-zu_ZA-2009.12.10.oxt
 Group: Applications/Text
 URL: http://www.translate.org.za/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,9 +16,19 @@ Requires: hunspell
 Zulu hunspell dictionaries.
 
 %prep
-%setup -q -c -n hunspell-zu_ZA
+%setup -q -c
 
 %build
+for i in README-zu_ZA.txt package-description.txt release-notes-zu_ZA.txt; do
+  if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
+    iconv -f ISO-8859-2 -t UTF-8 $i > $i.new
+    touch -r $i $i.new
+    mv -f $i.new $i
+  fi
+  tr -d '\r' < $i > $i.new
+  touch -r $i $i.new
+  mv -f $i.new $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -30,10 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_zu_ZA.txt
+%doc README-zu_ZA.txt package-description.txt release-notes-zu_ZA.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Dec 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091210-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20060120-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-zu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Jul 2007 10:34:46 -0000	1.3
+++ sources	11 Dec 2009 10:49:26 -0000	1.4
@@ -1 +1 @@
-3f1f9d5c41d6a7520e4dbb5d37a115b7  myspell-zu_ZA-20060120.zip
+2f01b2291f2482bf217ffc4a34654f0d  dict-zu_ZA-2009.12.10.oxt



From varekova at fedoraproject.org  Fri Dec 11 10:57:11 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 11 Dec 2009 10:57:11 +0000 (UTC)
Subject: rpms/sysstat/F-11 sysstat-8.0.4-nfs.patch, NONE, 1.1 sysstat.spec, 
	1.67, 1.68
Message-ID: <20091211105711.A771711C00C5@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15112

Modified Files:
	sysstat.spec 
Added Files:
	sysstat-8.0.4-nfs.patch 
Log Message:
- fix the problem in get_nfs_mount_nr function
  ( iostat -n causes stack smashing)


sysstat-8.0.4-nfs.patch:
 common.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

--- NEW FILE sysstat-8.0.4-nfs.patch ---
diff -up sysstat-8.0.4/common.c.pom sysstat-8.0.4/common.c
--- sysstat-8.0.4/common.c.pom	2009-12-11 11:42:00.000000000 +0100
+++ sysstat-8.0.4/common.c	2009-12-11 11:44:28.000000000 +0100
@@ -413,7 +413,6 @@ int get_nfs_mount_nr(void)
 {
    FILE *fp;
    char line[8192];
-   char type_name[10];
    unsigned int nfs = 0;
 
    if ((fp = fopen(NFSMOUNTSTATS, "r")) == NULL)
@@ -422,13 +421,10 @@ int get_nfs_mount_nr(void)
 
    while (fgets(line, 8192, fp) != NULL) {
 
-      if ((strstr(line, "mounted")) && (strstr(line, "on")) && (strstr(line, "with")) &&
-	  (strstr(line, "fstype"))) {
-	
-	 sscanf(strstr(line, "fstype") + 6, "%10s", type_name);
-	 if ((!strncmp(type_name, "nfs", 3)) && (strncmp(type_name, "nfsd", 4))) {
-	    nfs ++;
-	 }
+      if ((strstr(line, "mounted")) && (strstr(line, "on")) &&
+	 (strstr(line, "with fstype nfs")) &&
+	 !(strstr(line, "with fstype nfsd"))) {
+		nfs++;
       }
    }
 


Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/F-11/sysstat.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sysstat.spec	26 Feb 2009 04:56:48 -0000	1.67
+++ sysstat.spec	11 Dec 2009 10:57:11 -0000	1.68
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 8.0.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
@@ -10,6 +10,7 @@ Patch0: sysstat-8.0.4-write.patch
 Patch1: sysstat-8.0.4-nfs_ext.patch
 Patch2: sysstat-8.0.4-cpu.patch
 Patch3: sysstat-8.0.4-procdisksts.patch
+Patch4: sysstat-8.0.4-nfs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -29,6 +30,7 @@ activity.
 %patch1 -p1 -b .nfse
 %patch2 -p1 -b .cpu
 %patch3 -p1 -b .diskst
+%patch4 -p1 -b .nfs
 iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
 mv CREDITS.aux CREDITS
 
@@ -80,6 +82,10 @@ rm -rf %{buildroot}
 %{_localstatedir}/log/sa
 
 %changelog
+* Fri Dec 11 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 8.0.4-8
+- fix the problem in get_nfs_mount_nr function
+  ( iostat -n causes stack smashing)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.0.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jskala at fedoraproject.org  Fri Dec 11 10:58:44 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 11 Dec 2009 10:58:44 +0000 (UTC)
Subject: rpms/ppp/F-12 ppp-2.4.3-local.patch,1.2,1.3 ppp.spec,1.52,1.53
Message-ID: <20091211105844.661B511C00C5@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/ppp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15772

Modified Files:
	ppp-2.4.3-local.patch ppp.spec 
Log Message:
* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 2.4.5-2
- fixed one line in ppp...local.patch


ppp-2.4.3-local.patch:
 configure           |    2 +-
 pppd/Makefile.linux |    4 ++--
 scripts/ppp-on-rsh  |    2 +-
 scripts/ppp-on-ssh  |    4 ++--
 scripts/secure-card |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)



Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ppp.spec	11 Dec 2009 10:43:08 -0000	1.52
+++ ppp.spec	11 Dec 2009 10:58:44 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 2.4.5-2
+- fixed one line in ppp...local.patch
+
 * Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> 2.4.5-1
 - re-base to latest upstream
 



From rrakus at fedoraproject.org  Fri Dec 11 11:08:08 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 11 Dec 2009 11:08:08 +0000 (UTC)
Subject: rpms/bash/F-11 bash-4.0-emacs.patch,NONE,1.1 bash.spec,1.182,1.183
Message-ID: <20091211110808.4DD3511C00C5@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18190

Modified Files:
	bash.spec 
Added Files:
	bash-4.0-emacs.patch 
Log Message:
Don't segfault when TERM=eterm* and EMCAS is unset (#530911)

bash-4.0-emacs.patch:
 shell.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bash-4.0-emacs.patch ---
--- bash-4.0/shell.c.orig	2009-10-15 15:57:56.000000000 -0400
+++ bash-4.0/shell.c	2009-10-15 15:58:28.000000000 -0400
@@ -572,7 +572,7 @@
 
       /* running_under_emacs == 2 for `eterm' */
       running_under_emacs = (emacs != 0) || (term && STREQN (term, "emacs", 5));
-      running_under_emacs += term && STREQN (term, "eterm", 5) && strstr (emacs, "term");
+      running_under_emacs += term && STREQN (term, "eterm", 5) && (emacs != 0) && strstr (emacs, "term");
 
       if (running_under_emacs)
 	gnu_error_format = 1;


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/F-11/bash.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- bash.spec	27 Aug 2009 10:42:23 -0000	1.182
+++ bash.spec	11 Dec 2009 11:08:07 -0000	1.183
@@ -3,7 +3,7 @@
 Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -52,7 +52,6 @@ Patch107: bash-2.05b-pgrp_sync.patch
 Patch108: bash-2.05b-readline-oom.patch
 Patch109: bash-2.05b-xcc.patch
 Patch110: bash-3.2-audit.patch
-#Patch111: bash-3.2-rng.patch
 Patch112: bash-3.2-ssh_source_bash.patch
 Patch113: bash-bashbug.patch
 Patch114: bash-cond-rmatch.patch
@@ -60,10 +59,8 @@ Patch115: bash-infotags.patch
 Patch116: bash-requires.patch
 Patch117: bash-setlocale.patch
 Patch118: bash-tty-tests.patch
-#Patch119: bash-ulimit-m.patch
-#Patch120: bash-4.0-no_debug_output.patch
-#Patch121: bash-4.0-shell_pipelines_handling.patch
 Patch122: bash-4.0-key_alloc.patch
+Patch123: bash-4.0-emacs.patch
 
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -129,7 +126,6 @@ This package contains documentation file
 %patch108 -p1 -b .readline_oom
 %patch109 -p1 -b .xcc
 %patch110 -p1 -b .audit
-#%patch111 -p1 -b .rng
 %patch112 -p1 -b .ssh_source_bash
 %patch113 -p1 -b .bashbug
 %patch114 -p1 -b .cond_rmatch
@@ -137,10 +133,8 @@ This package contains documentation file
 %patch116 -p1 -b .requires
 %patch117 -p1 -b .setlocale
 %patch118 -p1 -b .tty_tests
-#%patch119 -p1 -b .ulimit-m
-#%patch120 -p1 -b .no_debug_output
-#%patch121 -p1 -b .pipelines_handling
 %patch122 -p1 -b .key_alloc
+%patch123 -p1 -b .emacs
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -304,6 +298,10 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Dec 10 2009 Roman Rakus <rrakus at redhat.com> - 4.0-9
+- Don't segfault when TERM=eterm* and EMCAS is unset (#530911)
+  
+
 * Thu Aug 27 2009 Roman Rakus <rrakus at redhat.com> - 4.0-8
 - alloc memory for key in creation associative array (#518644)
 



From rrakus at fedoraproject.org  Fri Dec 11 11:35:39 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 11 Dec 2009 11:35:39 +0000 (UTC)
Subject: rpms/bash/F-12 bash-4.0-emacs.patch,NONE,1.1 bash.spec,1.190,1.191
Message-ID: <20091211113539.5ADB511C00C5@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25473

Modified Files:
	bash.spec 
Added Files:
	bash-4.0-emacs.patch 
Log Message:
Don't segfault when TERM=eterm* and EMACS is unset (#530911)

bash-4.0-emacs.patch:
 shell.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bash-4.0-emacs.patch ---
--- bash-4.0/shell.c.orig	2009-10-15 15:57:56.000000000 -0400
+++ bash-4.0/shell.c	2009-10-15 15:58:28.000000000 -0400
@@ -572,7 +572,7 @@
 
       /* running_under_emacs == 2 for `eterm' */
       running_under_emacs = (emacs != 0) || (term && STREQN (term, "emacs", 5));
-      running_under_emacs += term && STREQN (term, "eterm", 5) && strstr (emacs, "term");
+      running_under_emacs += term && STREQN (term, "eterm", 5) && (emacs != 0) && strstr (emacs, "term");
 
       if (running_under_emacs)
 	gnu_error_format = 1;


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/F-12/bash.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- bash.spec	16 Sep 2009 10:07:26 -0000	1.190
+++ bash.spec	11 Dec 2009 11:35:39 -0000	1.191
@@ -5,7 +5,7 @@
 Version: %{baseversion}%{patchlevel}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -76,6 +76,9 @@ Patch118: bash-tty-tests.patch
 # 484809, check if interp section is NOBITS
 Patch123: bash-4.0-nobits.patch
 
+# 530911, bash was segfaulting when TERM=eterm* and EMACS was unset
+Patch124: bash-4.0-emacs.patch
+
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -157,6 +160,7 @@ This package contains documentation file
 %patch117 -p1 -b .setlocale
 %patch118 -p1 -b .tty_tests
 %patch123 -p1 -b .nobits
+%patch124 -p1 -b .emacs
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -323,6 +327,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Fri Dec 11 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-2
+- Don't segfault when TERM=eterm* and EMACS is unset (#530911)
+
 * Wed Sep 16 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-1
 - Patch level 33
 - spec file cleanup



From rrakus at fedoraproject.org  Fri Dec 11 11:38:00 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 11 Dec 2009 11:38:00 +0000 (UTC)
Subject: rpms/bash/F-12 bash40-034, NONE, 1.1 bash40-035, NONE, 1.1 bash.spec,
	1.191, 1.192
Message-ID: <20091211113800.92DA511C00C5@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26039

Modified Files:
	bash.spec 
Added Files:
	bash40-034 bash40-035 
Log Message:
patch level 35


--- NEW FILE bash40-034 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.0
Patch-ID:	bash40-034

Bug-Reported-by:	Anders Kaseorg <andersk at mit.edu>
Bug-Reference-ID:	<1252856832.991059.8162.nullmailer at balanced-tree.mit.edu>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-09/msg00043.html

Bug-Description:

When using the globstar option, bash incorrectly interprets wildcarded path
components between a **/ and the last / as matching any path, even if the
constructed path does not match any files.

Patch:

*** ../bash-4.0-patched/lib/glob/glob.c	2009-07-22 23:18:50.000000000 -0400
--- lib/glob/glob.c	2009-09-18 17:53:25.000000000 -0400
***************
*** 920,928 ****
  	  char **temp_results;
  
  	  /* Scan directory even on a NULL filename.  That way, `*h/'
  	     returns only directories ending in `h', instead of all
  	     files ending in `h' with a `/' appended. */
  	  dname = directories[i];
! 	  dflags = flags & ~GX_MARKDIRS;
  	  if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
  	    dflags |= GX_ALLDIRS|GX_ADDCURDIR;
--- 927,938 ----
  	  char **temp_results;
  
+ 	  /* XXX -- we've recursively scanned any directories resulting from
+ 	     a `**', so turn off the flag.  We turn it on again below if
+ 	     filename is `**' */
  	  /* Scan directory even on a NULL filename.  That way, `*h/'
  	     returns only directories ending in `h', instead of all
  	     files ending in `h' with a `/' appended. */
  	  dname = directories[i];
! 	  dflags = flags & ~(GX_MARKDIRS|GX_ALLDIRS|GX_ADDCURDIR);
  	  if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
  	    dflags |= GX_ALLDIRS|GX_ADDCURDIR;
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 33
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 34
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-035 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.0
Patch-ID:	bash40-035

Bug-Reported-by:	Freddy Vulto <fvulto at gmail.com>
Bug-Reference-ID:	<e9c463930909171341p7cbe6e43pa3788ebbe3adec4d at mail.gmail.com>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-09/msg00044.html

Bug-Description:

Bash-4.0 incorrectly treated single and double quotes as delimiters rather
than introducing quoted strings when splitting the line into words for
programmable completion functions.

Patch:

*** ../bash-4.0-patched/pcomplete.c	2009-03-08 21:24:31.000000000 -0400
--- pcomplete.c	2009-09-26 16:30:16.000000000 -0400
***************
*** 1176,1186 ****
    WORD_LIST *ret;
    char *delims;
  
! #if 0
!   delims = "()<>;&| \t\n";	/* shell metacharacters break words */
! #else
!   delims = rl_completer_word_break_characters;
! #endif
    ret = split_at_delims (line, llen, delims, sentinel, nwp, cwp);
    return (ret);
  }
--- 1176,1188 ----
    WORD_LIST *ret;
    char *delims;
+   int i, j;
  
!   delims = xmalloc (strlen (rl_completer_word_break_characters) + 1);
!   for (i = j = 0; rl_completer_word_break_characters[i]; i++)
!     if (rl_completer_word_break_characters[i] != '\'' && rl_completer_word_break_characters[i] != '"')
!       delims[j++] = rl_completer_word_break_characters[i];
!   delims[j] = '\0';
    ret = split_at_delims (line, llen, delims, sentinel, nwp, cwp);
+   free (delims);
    return (ret);
  }
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 34
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 35
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/F-12/bash.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- bash.spec	11 Dec 2009 11:35:39 -0000	1.191
+++ bash.spec	11 Dec 2009 11:38:00 -0000	1.192
@@ -1,5 +1,5 @@
 #%define beta_tag rc1
-%define patchlevel .33
+%define patchlevel .35
 %define baseversion 4.0
 
 Version: %{baseversion}%{patchlevel}
@@ -52,6 +52,8 @@ Patch030: ftp://ftp.gnu.org/pub/gnu/bash
 Patch031: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-031
 Patch032: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-032
 Patch033: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-033
+Patch034: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-034
+Patch035: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-035
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -140,6 +142,8 @@ This package contains documentation file
 %patch031 -p0 -b .031
 %patch032 -p0 -b .032
 %patch033 -p0 -b .033
+%patch034 -p0 -b .034
+%patch035 -p0 -b .035
 
 # Other patches
 %patch101 -p1 -b .security
@@ -327,8 +331,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
-* Fri Dec 11 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-2
+* Fri Dec 11 2009 Roman Rakus <rrakus at redhat.com> - 4.0.35-1
 - Don't segfault when TERM=eterm* and EMACS is unset (#530911)
+- patch level 35
 
 * Wed Sep 16 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-1
 - Patch level 33



From thias at fedoraproject.org  Fri Dec 11 11:46:33 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 11 Dec 2009 11:46:33 +0000 (UTC)
Subject: rpms/xmms-flac/F-11 flac-1.2.1-gcc43.patch, NONE,
	1.1 xmms-flac.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 sources,
	1.3, 1.4 xmms-flac.spec, 1.10, 1.11
Message-ID: <20091211114633.D1E3911C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-flac/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28293/F-11

Modified Files:
	.cvsignore sources xmms-flac.spec 
Added Files:
	flac-1.2.1-gcc43.patch xmms-flac.desktop 
Log Message:
Backport latest devel changes (update + appear in contextual menus).


flac-1.2.1-gcc43.patch:
 main.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE flac-1.2.1-gcc43.patch ---
diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp
--- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43	2007-09-13 17:58:03.000000000 +0200
+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2008-01-08 10:27:39.000000000 +0100
@@ -29,6 +29,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include "FLAC++/metadata.h"
 #include "FLAC++/encoder.h"


--- NEW FILE xmms-flac.desktop ---
[Desktop Entry]
Name=XMMS
Exec=xmms -p -e %F
Icon=xmms
MimeType=audio/x-flac;audio/flac;
Categories=AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Feb 2007 15:55:13 -0000	1.3
+++ .cvsignore	11 Dec 2009 11:46:33 -0000	1.4
@@ -1 +1 @@
-flac-1.1.4.tar.gz
+flac-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Feb 2007 15:55:13 -0000	1.3
+++ sources	11 Dec 2009 11:46:33 -0000	1.4
@@ -1 +1 @@
-3958cbd5b6ed8c14966792538e44223b  flac-1.1.4.tar.gz
+153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz


Index: xmms-flac.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-11/xmms-flac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xmms-flac.spec	26 Feb 2009 10:18:18 -0000	1.10
+++ xmms-flac.spec	11 Dec 2009 11:46:33 -0000	1.11
@@ -2,18 +2,23 @@
 
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
-Version: 1.1.4
-Release: 5%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 # The entire FLAC sources are covered by multiple licenses, but the xmms plugin
 # is only GPLv2+
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
-Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source0: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source1: xmms-flac.desktop
 Patch0: xmms-flac-1.1.4-rpath.patch
+Patch1: flac-1.2.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: xmms-devel, libogg-devel, gettext-devel
 BuildRequires: flac-devel
+BuildRequires: desktop-file-utils
 
 %description
 FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming,
@@ -24,6 +29,7 @@ This is the input plugin for XMMS to be 
 %prep
 %setup -q -n flac-%{version}
 %patch0 -p1 -b .rpath
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -35,19 +41,37 @@ This is the input plugin for XMMS to be 
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 src/plugin_xmms/.libs/libxmms-flac.so \
     %{buildroot}%{xmms_inputdir}/libxmms-flac.so
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post
+update-desktop-database &> /dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING.GPL
+%{_datadir}/applications/xmms-flac.desktop
 %{xmms_inputdir}/libxmms-flac.so
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.2.1-1
+- Update to 1.2.1.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.4-7
+- Include hidden desktop entry for the mimetype (#508203).
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From thias at fedoraproject.org  Fri Dec 11 11:46:34 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri, 11 Dec 2009 11:46:34 +0000 (UTC)
Subject: rpms/xmms-flac/F-12 flac-1.2.1-gcc43.patch, NONE,
	1.1 xmms-flac.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 sources,
	1.3, 1.4 xmms-flac.spec, 1.11, 1.12
Message-ID: <20091211114634.3D91B11C00C5@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-flac/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28293/F-12

Modified Files:
	.cvsignore sources xmms-flac.spec 
Added Files:
	flac-1.2.1-gcc43.patch xmms-flac.desktop 
Log Message:
Backport latest devel changes (update + appear in contextual menus).


flac-1.2.1-gcc43.patch:
 main.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE flac-1.2.1-gcc43.patch ---
diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp
--- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43	2007-09-13 17:58:03.000000000 +0200
+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2008-01-08 10:27:39.000000000 +0100
@@ -29,6 +29,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include "FLAC++/metadata.h"
 #include "FLAC++/encoder.h"


--- NEW FILE xmms-flac.desktop ---
[Desktop Entry]
Name=XMMS
Exec=xmms -p -e %F
Icon=xmms
MimeType=audio/x-flac;audio/flac;
Categories=AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Feb 2007 15:55:13 -0000	1.3
+++ .cvsignore	11 Dec 2009 11:46:33 -0000	1.4
@@ -1 +1 @@
-flac-1.1.4.tar.gz
+flac-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Feb 2007 15:55:13 -0000	1.3
+++ sources	11 Dec 2009 11:46:33 -0000	1.4
@@ -1 +1 @@
-3958cbd5b6ed8c14966792538e44223b  flac-1.1.4.tar.gz
+153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz


Index: xmms-flac.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-12/xmms-flac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xmms-flac.spec	27 Jul 2009 08:16:34 -0000	1.11
+++ xmms-flac.spec	11 Dec 2009 11:46:34 -0000	1.12
@@ -2,18 +2,23 @@
 
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
-Version: 1.1.4
-Release: 6%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 # The entire FLAC sources are covered by multiple licenses, but the xmms plugin
 # is only GPLv2+
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
-Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source0: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source1: xmms-flac.desktop
 Patch0: xmms-flac-1.1.4-rpath.patch
+Patch1: flac-1.2.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: xmms-devel, libogg-devel, gettext-devel
 BuildRequires: flac-devel
+BuildRequires: desktop-file-utils
 
 %description
 FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming,
@@ -24,6 +29,7 @@ This is the input plugin for XMMS to be 
 %prep
 %setup -q -n flac-%{version}
 %patch0 -p1 -b .rpath
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -35,19 +41,34 @@ This is the input plugin for XMMS to be 
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 src/plugin_xmms/.libs/libxmms-flac.so \
     %{buildroot}%{xmms_inputdir}/libxmms-flac.so
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post
+update-desktop-database &> /dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING.GPL
+%{_datadir}/applications/xmms-flac.desktop
 %{xmms_inputdir}/libxmms-flac.so
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.2.1-1
+- Update to 1.2.1.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.4-7
+- Include hidden desktop entry for the mimetype (#508203).
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mlichvar at fedoraproject.org  Fri Dec 11 12:00:05 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 11 Dec 2009 12:00:05 +0000 (UTC)
Subject: File xterm-253.tgz uploaded to lookaside cache by mlichvar
Message-ID: <20091211120005.792F910F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for xterm:

363cc4865b7691bd0ae5eebb42cde9c9  xterm-253.tgz



From mlichvar at fedoraproject.org  Fri Dec 11 12:04:09 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 11 Dec 2009 12:04:09 +0000 (UTC)
Subject: rpms/xterm/devel .cvsignore, 1.41, 1.42 sources, 1.41,
	1.42 xterm.spec, 1.83, 1.84
Message-ID: <20091211120409.63A8E11C00C5@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
- update to 253



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	8 Dec 2009 13:40:51 -0000	1.41
+++ .cvsignore	11 Dec 2009 12:04:09 -0000	1.42
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-252.tgz
+xterm-253.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	8 Dec 2009 13:40:51 -0000	1.41
+++ sources	11 Dec 2009 12:04:09 -0000	1.42
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-b92777f7adbb2aa4c9029752ab24fee1  xterm-252.tgz
+363cc4865b7691bd0ae5eebb42cde9c9  xterm-253.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- xterm.spec	8 Dec 2009 13:40:51 -0000	1.83
+++ xterm.spec	11 Dec 2009 12:04:09 -0000	1.84
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 252
+Version: 253
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -78,7 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
-* Thu Dec 08 2009 Miroslav Lichvar <mlichvar at redhat.com> 252-1
+* Fri Dec 11 2009 Miroslav Lichvar <mlichvar at redhat.com> 253-1
+- update to 253
+
+* Tue Dec 08 2009 Miroslav Lichvar <mlichvar at redhat.com> 252-1
 - update to 252
 
 * Thu Nov 19 2009 Miroslav Lichvar <mlichvar at redhat.com> 251-1



From rrakus at fedoraproject.org  Fri Dec 11 12:05:04 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 11 Dec 2009 12:05:04 +0000 (UTC)
Subject: rpms/bash/devel bash-4.0-emacs.patch, NONE, 1.1 bash.spec, 1.192,
	1.193
Message-ID: <20091211120504.3B0FD11C00C5@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1023

Modified Files:
	bash.spec 
Added Files:
	bash-4.0-emacs.patch 
Log Message:
Don't segfault when TERM=eterm* and EMACS is unset (#530911)

bash-4.0-emacs.patch:
 shell.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bash-4.0-emacs.patch ---
--- bash-4.0/shell.c.orig	2009-10-15 15:57:56.000000000 -0400
+++ bash-4.0/shell.c	2009-10-15 15:58:28.000000000 -0400
@@ -572,7 +572,7 @@
 
       /* running_under_emacs == 2 for `eterm' */
       running_under_emacs = (emacs != 0) || (term && STREQN (term, "emacs", 5));
-      running_under_emacs += term && STREQN (term, "eterm", 5) && strstr (emacs, "term");
+      running_under_emacs += term && STREQN (term, "eterm", 5) && (emacs != 0) && strstr (emacs, "term");
 
       if (running_under_emacs)
 	gnu_error_format = 1;


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- bash.spec	29 Oct 2009 15:08:55 -0000	1.192
+++ bash.spec	11 Dec 2009 12:05:03 -0000	1.193
@@ -5,7 +5,7 @@
 Version: %{baseversion}%{patchlevel}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -61,7 +61,7 @@ Patch102: bash-2.03-paths.patch
 Patch103: bash-2.03-profile.patch
 Patch104: bash-2.05a-interpreter.patch
 Patch105: bash-2.05b-debuginfo.patch
-Patch106: bash-2.05b-manso.patch
+#Patch106: bash-2.05b-manso.patch
 Patch107: bash-2.05b-pgrp_sync.patch
 Patch108: bash-2.05b-readline-oom.patch
 Patch109: bash-2.05b-xcc.patch
@@ -78,6 +78,9 @@ Patch118: bash-tty-tests.patch
 # 484809, check if interp section is NOBITS
 Patch123: bash-4.0-nobits.patch
 
+# 530911, bash was segfaulting when TERM=eterm* and EMACS was unset
+Patch124: bash-4.0-emacs.patch
+
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -139,8 +142,8 @@ This package contains documentation file
 %patch031 -p0 -b .031
 %patch032 -p0 -b .032
 %patch033 -p0 -b .033
-%patch034 -p0 -b .034
-%patch035 -p0 -b .035
+#%patch034 -p0 -b .034
+#%patch035 -p0 -b .035
 
 # Other patches
 %patch101 -p1 -b .security
@@ -148,7 +151,7 @@ This package contains documentation file
 %patch103 -p1 -b .profile
 %patch104 -p1 -b .interpreter
 %patch105 -p1 -b .debuginfo
-%patch106 -p1 -b .manso
+#%patch106 -p1 -b .manso
 %patch107 -p1 -b .pgrp_sync
 %patch108 -p1 -b .readline_oom
 %patch109 -p1 -b .xcc
@@ -161,6 +164,7 @@ This package contains documentation file
 %patch117 -p1 -b .setlocale
 %patch118 -p1 -b .tty_tests
 %patch123 -p1 -b .nobits
+%patch124 -p1 -b .emacs
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -328,6 +332,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Fri Dec 11 2009 Roman Rakus <rrakus at redhat.com> - 4.0.35-2
+- Don't segfault when TERM=eterm* and EMACS is unset (#530911)
+
 * Thu Oct 29 2009 Roman Rakus <rrakus at redhat.com> - 4.0.35-1
 - Patch level 35
 



From mlichvar at fedoraproject.org  Fri Dec 11 12:10:12 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 11 Dec 2009 12:10:12 +0000 (UTC)
Subject: rpms/xterm/F-12 .cvsignore, 1.38, 1.39 sources, 1.38,
	1.39 xterm.spec, 
	1.79, 1.80 xterm-222-can-2003-0063.patch, 1.1, NONE
Message-ID: <20091211121012.4EACE11C03FC@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2523

Modified Files:
	.cvsignore sources xterm.spec 
Removed Files:
	xterm-222-can-2003-0063.patch 
Log Message:
- update to 253



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-12/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	8 Oct 2009 12:24:39 -0000	1.38
+++ .cvsignore	11 Dec 2009 12:10:11 -0000	1.39
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-249.tgz
+xterm-253.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-12/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	8 Oct 2009 12:24:39 -0000	1.38
+++ sources	11 Dec 2009 12:10:11 -0000	1.39
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-d51ebabd8f2114911494310cdda38a12  xterm-249.tgz
+363cc4865b7691bd0ae5eebb42cde9c9  xterm-253.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-12/xterm.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- xterm.spec	8 Oct 2009 12:24:39 -0000	1.79
+++ xterm.spec	11 Dec 2009 12:10:11 -0000	1.80
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 249
+Version: 253
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -14,7 +14,6 @@ Source1: ftp://invisible-island.net/xter
 Source2: %{name}.desktop
 
 Patch1: xterm-245-resources.patch
-Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
 
 %bcond_with trace
@@ -30,7 +29,6 @@ programs that can't use the window syste
 %setup -q
 
 %patch1 -p1 -b .resources
-%patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
 
 %build
@@ -63,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n
+%doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n THANKS
 %{_bindir}/xterm
 %{_bindir}/koi8rxterm
 %{_bindir}/resize
@@ -80,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Fri Dec 11 2009 Miroslav Lichvar <mlichvar at redhat.com> 253-1
+- update to 253
+
 * Thu Oct 08 2009 Miroslav Lichvar <mlichvar at redhat.com> 249-1
 - update to 249
 


--- xterm-222-can-2003-0063.patch DELETED ---



From than at fedoraproject.org  Fri Dec 11 12:15:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Dec 2009 12:15:10 +0000 (UTC)
Subject: rpms/kdelibs3/devel arts-acinclude.patch, NONE, 1.1 kdelibs3.spec, 
	1.79, 1.80
Message-ID: <20091211121510.E2E1011C00C5@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4063

Modified Files:
	kdelibs3.spec 
Added Files:
	arts-acinclude.patch 
Log Message:
- patch autoconfigury to build with autoconf >= 2.64 (Stepan Kasal)



arts-acinclude.patch:
 acinclude.m4.in |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE arts-acinclude.patch ---
2009-12-10  Stepan Kasal  <skasal at redhat.com>

The change of implementation of AC_REQUIRE in 2.64 caused a regression
in the arts project.
This can be fixed by shuffling some macro calls.

I suppose that most of this patch will not be needed with a future
release of Autoconf.
But the last chunk of this patch is a real bug in this source and
should go upstream.

--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
@@ -3081,8 +3081,18 @@
 fi
 ])
 
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
+[ 
+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+  CFLAGS=" $CFLAGS"
+  AC_PROG_CC
+  CXXFLAGS=" $CXXFLAGS"
+  AC_PROG_CXX
+])
+
 AC_DEFUN([AC_CHECK_COMPILERS],
 [
+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
   AC_ARG_ENABLE(debug,
 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
@@ -3141,11 +3151,6 @@
     [kde_use_profiling="no"]
   )
 
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
   AC_PROG_CPP
 
   if test "$GCC" = "yes"; then
@@ -3174,10 +3179,6 @@
      LDFLAGS=""
   fi
 
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
   KDE_CHECK_FOR_BAD_COMPILER
 
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
@@ -3503,8 +3504,8 @@
 AC_REQUIRE([AC_LIBTOOL_DLOPEN])
 AC_REQUIRE([KDE_CHECK_LIB64])
 
-AC_OBJEXT
-AC_EXEEXT
+AC_REQUIRE([AC_OBJEXT])
+AC_REQUIRE([AC_EXEEXT])
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- kdelibs3.spec	9 Dec 2009 18:32:39 -0000	1.79
+++ kdelibs3.spec	11 Dec 2009 12:15:10 -0000	1.80
@@ -85,7 +85,7 @@ Patch106: kdelibs-3.5.10-kio.patch
 Patch107: kdelibs-3.5.10-assert.patch
 Patch108: kdelibs-3.5.10-dtoa.patch
 Patch109: kdelibs-3.5.10-kabc.patch
-
+Patch110: arts-acinclude.patch
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -251,6 +251,7 @@ format for easy browsing
 %patch107 -p1 -b .assert
 %patch108 -p1 -b .alias
 %patch109 -p1 -b .kabc
+%patch110 -p1 -b .autoconf
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -587,6 +588,8 @@ touch --no-create %{_datadir}/icons/crys
 * Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
 - fix security issues in libltdl bundle within kdelibs CVE-2009-3736
 - backport upstream patches
+- patch autoconfigury to build with autoconf >= 2.64 (Stepan Kasal)
+
 
 * Mon Nov  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428



From hadess at fedoraproject.org  Fri Dec 11 12:30:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 12:30:52 +0000 (UTC)
Subject: File totem-pl-parser-2.28.2.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091211123052.BD68B10F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for totem-pl-parser:

a641b6061761535eb3646752bb1545f3  totem-pl-parser-2.28.2.tar.bz2



From hadess at fedoraproject.org  Fri Dec 11 12:31:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 12:31:09 +0000 (UTC)
Subject: rpms/totem-pl-parser/F-12 .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 totem-pl-parser.spec, 1.48, 1.49 reentrant.patch, 1.1, NONE
Message-ID: <20091211123109.E65B511C00C5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem-pl-parser/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8148

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Removed Files:
	reentrant.patch 
Log Message:
* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-12/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	29 Sep 2009 15:18:40 -0000	1.26
+++ .cvsignore	11 Dec 2009 12:31:09 -0000	1.27
@@ -1 +1 @@
-totem-pl-parser-2.28.1.tar.bz2
+totem-pl-parser-2.28.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	29 Sep 2009 15:18:40 -0000	1.26
+++ sources	11 Dec 2009 12:31:09 -0000	1.27
@@ -1 +1 @@
-bd4ef8ce1cd3c467cd6adc2835f027bc  totem-pl-parser-2.28.1.tar.bz2
+a641b6061761535eb3646752bb1545f3  totem-pl-parser-2.28.2.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-12/totem-pl-parser.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- totem-pl-parser.spec	15 Oct 2009 13:14:16 -0000	1.48
+++ totem-pl-parser.spec	11 Dec 2009 12:31:09 -0000	1.49
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
-Version:	2.28.1
-Release:	2%{?dist}
+Version:	2.28.2
+Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -16,9 +16,6 @@ BuildRequires:	libxml2-devel
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser) intltool
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=572705
-Patch0:		reentrant.patch
-
 %description
 A library to parse and save playlists, as used in music and movie players.
 
@@ -37,7 +34,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .reentrant
 
 %build
 %configure --enable-static=no
@@ -70,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
+- Update to 2.28.2
+
 * Thu Oct 15 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
 - Fix crasher when parsing multiple XML-ish playlists in Rhythmbox
 


--- reentrant.patch DELETED ---



From hadess at fedoraproject.org  Fri Dec 11 12:32:00 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 12:32:00 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 totem-pl-parser.spec, 1.48, 1.49 reentrant.patch, 1.1, NONE
Message-ID: <20091211123200.5FA9211C00C5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem-pl-parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8429

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Removed Files:
	reentrant.patch 
Log Message:
* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	29 Sep 2009 15:34:54 -0000	1.26
+++ .cvsignore	11 Dec 2009 12:32:00 -0000	1.27
@@ -1 +1 @@
-totem-pl-parser-2.28.1.tar.bz2
+totem-pl-parser-2.28.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	29 Sep 2009 15:34:54 -0000	1.26
+++ sources	11 Dec 2009 12:32:00 -0000	1.27
@@ -1 +1 @@
-bd4ef8ce1cd3c467cd6adc2835f027bc  totem-pl-parser-2.28.1.tar.bz2
+a641b6061761535eb3646752bb1545f3  totem-pl-parser-2.28.2.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- totem-pl-parser.spec	15 Oct 2009 13:22:41 -0000	1.48
+++ totem-pl-parser.spec	11 Dec 2009 12:32:00 -0000	1.49
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
-Version:	2.28.1
-Release:	2%{?dist}
+Version:	2.28.2
+Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -16,9 +16,6 @@ BuildRequires:	libxml2-devel
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser) intltool
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=572705
-Patch0:		reentrant.patch
-
 %description
 A library to parse and save playlists, as used in music and movie players.
 
@@ -37,7 +34,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .reentrant
 
 %build
 %configure --enable-static=no
@@ -70,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
+- Update to 2.28.2
+
 * Thu Oct 15 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
 - Fix crasher when parsing multiple XML-ish playlists in Rhythmbox
 


--- reentrant.patch DELETED ---



From twoerner at fedoraproject.org  Fri Dec 11 12:33:07 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Fri, 11 Dec 2009 12:33:07 +0000 (UTC)
Subject: File tuned-0.2.7.tar.bz2 uploaded to lookaside cache by twoerner
Message-ID: <20091211123307.6128010F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for tuned:

f7ca10d6f4ff46d6063ed4094848a0d1  tuned-0.2.7.tar.bz2



From pkgdb at fedoraproject.org  Fri Dec 11 12:36:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:36:25 +0000
Subject: [pkgdb] tuned: twoerner has given up watchbugzilla
Message-ID: <20091211123625.EAF7410F891@bastion2.fedora.phx.redhat.com>

twoerner has given up the watchbugzilla acl on tuned (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:36:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:36:27 +0000
Subject: [pkgdb] tuned: twoerner has given up watchcommits
Message-ID: <20091211123627.BACAF10F891@bastion2.fedora.phx.redhat.com>

twoerner has given up the watchcommits acl on tuned (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:36:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:36:27 +0000
Subject: [pkgdb] tuned: twoerner has requested commit
Message-ID: <20091211123627.F2F1510F89D@bastion2.fedora.phx.redhat.com>

twoerner has requested the commit acl on tuned (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:36:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:36:34 +0000
Subject: [pkgdb] tuned: twoerner has given up watchcommits
Message-ID: <20091211123634.8480B10F89A@bastion2.fedora.phx.redhat.com>

twoerner has given up the watchcommits acl on tuned (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:36:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:36:49 +0000
Subject: [pkgdb] tuned: twoerner has requested commit
Message-ID: <20091211123649.9E44C10F89F@bastion2.fedora.phx.redhat.com>

twoerner has requested the commit acl on tuned (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:36:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:36:45 +0000
Subject: [pkgdb] tuned: twoerner has given up watchbugzilla
Message-ID: <20091211123645.C5BC110F89C@bastion2.fedora.phx.redhat.com>

twoerner has given up the watchbugzilla acl on tuned (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:36:55 +0000
Subject: [pkgdb] tuned: twoerner has given up watchbugzilla
Message-ID: <20091211123655.E908C10F87F@bastion2.fedora.phx.redhat.com>

twoerner has given up the watchbugzilla acl on tuned (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:36:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:36:59 +0000
Subject: [pkgdb] tuned: twoerner has given up watchcommits
Message-ID: <20091211123659.DA64210F87F@bastion2.fedora.phx.redhat.com>

twoerner has given up the watchcommits acl on tuned (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:37:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:37:03 +0000
Subject: [pkgdb] tuned: twoerner has requested commit
Message-ID: <20091211123703.6B0CD10F87F@bastion2.fedora.phx.redhat.com>

twoerner has requested the commit acl on tuned (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From karsten at fedoraproject.org  Fri Dec 11 12:40:20 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 11 Dec 2009 12:40:20 +0000 (UTC)
Subject: File hdparm-9.27.tar.gz uploaded to lookaside cache by karsten
Message-ID: <20091211124020.95A0F10F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for hdparm:

e652dabb6c9233fb8a23ef60a17a1829  hdparm-9.27.tar.gz



From karsten at fedoraproject.org  Fri Dec 11 12:41:02 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 11 Dec 2009 12:41:02 +0000 (UTC)
Subject: rpms/hdparm/devel hdparm-9.27-timeout-536731.patch, NONE,
	1.1 .cvsignore, 1.21, 1.22 hdparm.spec, 1.49, 1.50 sources, 1.23, 1.24
Message-ID: <20091211124102.2DCD511C00C5@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/hdparm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10645

Modified Files:
	.cvsignore hdparm.spec sources 
Added Files:
	hdparm-9.27-timeout-536731.patch 
Log Message:
- update to 9.27
- enhance security-erase timeout to 12h (#536731)


hdparm-9.27-timeout-536731.patch:
 hdparm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hdparm-9.27-timeout-536731.patch ---
diff -up hdparm-9.27/hdparm.c.sec_timeout hdparm-9.27/hdparm.c
--- hdparm-9.27/hdparm.c.sec_timeout	2009-12-11 12:48:43.000000000 +0100
+++ hdparm-9.27/hdparm.c	2009-12-11 12:47:48.000000000 +0100
@@ -137,7 +137,7 @@ static int	please_destroy_my_drive = 0;
 
 const int timeout_12secs = 12;
 const int timeout_5mins = (5 * 60);
-const int timeout_2hrs   = (2 * 60 * 60);
+const int timeout_12hrs   = (12 * 60 * 60);
 
 static int open_flags = O_RDONLY|O_NONBLOCK;
 
@@ -767,7 +767,7 @@ do_set_security (int fd)
 			err = errno;
 			perror("ERASE_PREPARE");
 		} else {
-			if ((do_taskfile_cmd(fd, r, timeout_2hrs))) {
+			if ((do_taskfile_cmd(fd, r, timeout_12hrs))) {
 				err = errno;
 				perror("SECURITY_ERASE");
 			}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdparm/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	4 Mar 2009 20:56:05 -0000	1.21
+++ .cvsignore	11 Dec 2009 12:41:01 -0000	1.22
@@ -1 +1 @@
-hdparm-9.12.tar.gz
+hdparm-9.27.tar.gz


Index: hdparm.spec
===================================================================
RCS file: /cvs/extras/rpms/hdparm/devel/hdparm.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- hdparm.spec	20 Aug 2009 13:59:57 -0000	1.49
+++ hdparm.spec	11 Dec 2009 12:41:01 -0000	1.50
@@ -1,11 +1,12 @@
 Summary: A utility for displaying and/or setting hard disk parameters
 Name: hdparm
-Version: 9.16
-Release: 3%{?dist}
+Version: 9.27
+Release: 1%{?dist}
 License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
 Source: http://download.sourceforge.net/hdparm/hdparm-%{version}.tar.gz
+Patch0: hdparm-9.27-timeout-536731.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x
 
@@ -16,6 +17,7 @@ performance and to spin down hard drives
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} STRIP=/bin/true LDFLAGS=
@@ -37,6 +39,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Fri Dec 11 2009 Karsten Hopp <karsten at redhat.com> 9.27-1
+- update to 9.27
+- enhance security-erase timeout to 12h (#536731)
+
 * Thu Aug 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 9.16-3
 - Let rpmbuild strip the executable (#513025).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdparm/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	17 Jul 2009 21:05:49 -0000	1.23
+++ sources	11 Dec 2009 12:41:01 -0000	1.24
@@ -1 +1 @@
-d11e2158c4ca8863de830f686574a4a3  hdparm-9.16.tar.gz
+e652dabb6c9233fb8a23ef60a17a1829  hdparm-9.27.tar.gz



From jcollie at fedoraproject.org  Fri Dec 11 12:47:58 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 11 Dec 2009 12:47:58 +0000 (UTC)
Subject: File pitivi-0.13.3-837f0d7.tar.bz2 uploaded to lookaside cache by
	jcollie
Message-ID: <20091211124758.B9E4610F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pitivi:

f27d71f12f0cf0c2abf8e5eeda9d0c40  pitivi-0.13.3-837f0d7.tar.bz2



From jcollie at fedoraproject.org  Fri Dec 11 12:48:01 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 11 Dec 2009 12:48:01 +0000 (UTC)
Subject: File common-888e0a26.tar.bz2 uploaded to lookaside cache by jcollie
Message-ID: <20091211124801.943DD10F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pitivi:

cb52781416d89653b9168f24fa2f9ca0  common-888e0a26.tar.bz2



From pkgdb at fedoraproject.org  Fri Dec 11 12:58:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:58:52 +0000
Subject: [pkgdb] tuned had acl change status
Message-ID: <20091211125852.922EF10F878@bastion2.fedora.phx.redhat.com>

pknirsch has set the commit acl on tuned (Fedora devel) to Approved for twoerner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:58:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:58:54 +0000
Subject: [pkgdb] tuned had acl change status
Message-ID: <20091211125855.0D7FF10F878@bastion2.fedora.phx.redhat.com>

pknirsch has set the commit acl on tuned (Fedora 11) to Approved for twoerner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From pkgdb at fedoraproject.org  Fri Dec 11 12:58:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 12:58:56 +0000
Subject: [pkgdb] tuned had acl change status
Message-ID: <20091211125857.0DFBD10F878@bastion2.fedora.phx.redhat.com>

pknirsch has set the commit acl on tuned (Fedora 12) to Approved for twoerner

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tuned



From hadess at fedoraproject.org  Fri Dec 11 13:01:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 13:01:15 +0000 (UTC)
Subject: File gnome-bluetooth-2.28.4.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091211130115.88E3310F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-bluetooth:

7b32e8af8773cc4224f7060f115256f7  gnome-bluetooth-2.28.4.tar.bz2



From hadess at fedoraproject.org  Fri Dec 11 13:01:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 13:01:29 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-12 .cvsignore, 1.24,
	1.25 gnome-bluetooth.spec, 1.96, 1.97 sources, 1.25, 1.26
Message-ID: <20091211130129.E9B8D11C00C5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15979

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.4-1
- Update to 2.28.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	20 Oct 2009 13:43:46 -0000	1.24
+++ .cvsignore	11 Dec 2009 13:01:29 -0000	1.25
@@ -1 +1 @@
-gnome-bluetooth-2.28.3.tar.bz2
+gnome-bluetooth-2.28.4.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/gnome-bluetooth.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- gnome-bluetooth.spec	20 Oct 2009 13:43:46 -0000	1.96
+++ gnome-bluetooth.spec	11 Dec 2009 13:01:29 -0000	1.97
@@ -1,5 +1,5 @@
 Name:		gnome-bluetooth
-Version:	2.28.3
+Version:	2.28.4
 Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
@@ -196,6 +196,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.4-1
+- Update to 2.28.4
+
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.3-1
 - Update to 2.28.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	20 Oct 2009 13:43:46 -0000	1.25
+++ sources	11 Dec 2009 13:01:29 -0000	1.26
@@ -1 +1 @@
-1cadae3e520adb620df35c9cec2813d1  gnome-bluetooth-2.28.3.tar.bz2
+7b32e8af8773cc4224f7060f115256f7  gnome-bluetooth-2.28.4.tar.bz2



From twoerner at fedoraproject.org  Fri Dec 11 13:07:51 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Fri, 11 Dec 2009 13:07:51 +0000 (UTC)
Subject: rpms/tuned/F-12 .cvsignore, 1.10, 1.11 sources, 1.12,
	1.13 tuned.spec, 1.13, 1.14
Message-ID: <20091211130751.6AA7A11C00C5@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/tuned/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17685

Modified Files:
	.cvsignore sources tuned.spec 
Log Message:
- Updated ktune to version 0.4-1
  - Supports start and stop options in profile scripts calls
  - Fixed CMDLINE_ELEVATOR test (rhbz#496940#c9)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	8 Dec 2009 14:06:03 -0000	1.10
+++ .cvsignore	11 Dec 2009 13:07:51 -0000	1.11
@@ -1 +1,2 @@
 tuned-0.2.6.tar.bz2
+tuned-0.2.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Dec 2009 14:06:03 -0000	1.12
+++ sources	11 Dec 2009 13:07:51 -0000	1.13
@@ -1 +1 @@
-e6242748a202e91deb6384a158ce24ee  tuned-0.2.6.tar.bz2
+f7ca10d6f4ff46d6063ed4094848a0d1  tuned-0.2.7.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/tuned.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tuned.spec	8 Dec 2009 14:06:03 -0000	1.13
+++ tuned.spec	11 Dec 2009 13:07:51 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.6
+Version: 0.2.7
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -102,6 +102,11 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Thomas Woerner <twoerner at redhat.com> 0.2.7-1
+- Updated ktune to version 0.4-1
+  - Supports start and stop options in profile scripts calls
+  - Fixed CMDLINE_ELEVATOR test (rhbz#496940#c9)
+
 * Tue Dec 08 2009 Phil Knirsch <pknirsch at redhat.com> 0.2.6-1
 - Included Jan Vcelak's patch for pyo and pyc files
 - Updated ktune.sh script for laptop-battery-powersave profile with latest



From jskala at fedoraproject.org  Fri Dec 11 13:08:19 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 11 Dec 2009 13:08:19 +0000 (UTC)
Subject: rpms/quagga/F-12 quagga-0.99.15-posix.patch, NONE, 1.1 .cvsignore, 
	1.21, 1.22 quagga.spec, 1.54, 1.55 sources, 1.21, 1.22
Message-ID: <20091211130819.E728411C00C5@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/quagga/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17942

Modified Files:
	.cvsignore quagga.spec sources 
Added Files:
	quagga-0.99.15-posix.patch 
Log Message:
* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> - 0.99.15-1
- latest upstream version
- back ported posix compliance of init script


quagga-0.99.15-posix.patch:
 bgpd.init   |   10 +++++++---
 ospf6d.init |   10 +++++++---
 ospfd.init  |   10 +++++++---
 ripd.init   |   10 +++++++---
 ripngd.init |   10 +++++++---
 zebra.init  |   10 +++++++---
 6 files changed, 42 insertions(+), 18 deletions(-)

--- NEW FILE quagga-0.99.15-posix.patch ---
diff -up quagga-0.99.15/redhat/bgpd.init.posix quagga-0.99.15/redhat/bgpd.init
--- quagga-0.99.15/redhat/bgpd.init.posix	2009-10-19 08:52:03.018303218 +0200
+++ quagga-0.99.15/redhat/bgpd.init	2009-10-19 09:58:18.694292887 +0200
@@ -30,6 +30,10 @@ case "$1" in
 
 	# The process must be configured first.
 	[ -f $CONF_FILE ] || exit 6
+	if [ `id -u` -ne 0 ]; then
+		echo $"Insufficient privilege" 1>&2
+		exit 4
+	fi
 
 	echo -n $"Starting $PROG: "
         daemon $cmd -d $BGPD_OPTS
@@ -44,12 +48,12 @@ case "$1" in
 	[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
 	echo
 	;;
-  restart|reload)
+  restart|reload|force-reload)
         $0 stop
         $0 start
 	RETVAL=$?
         ;;
-  condrestart)
+  condrestart|try-restart)
         if [ -f $LOCK_FILE ]; then
                 $0 stop
 		$0 start
@@ -61,7 +65,7 @@ case "$1" in
 	RETVAL=$?
         ;;
   *)
-	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
 	exit 2
 esac
 
diff -up quagga-0.99.15/redhat/ospf6d.init.posix quagga-0.99.15/redhat/ospf6d.init
--- quagga-0.99.15/redhat/ospf6d.init.posix	2009-10-19 08:54:10.135543594 +0200
+++ quagga-0.99.15/redhat/ospf6d.init	2009-10-19 09:53:29.288294085 +0200
@@ -29,6 +29,10 @@ case "$1" in
 
 	# The process must be configured first.
 	[ -f $CONF_FILE ] || exit 6
+	if [ `id -u` -ne 0 ]; then
+		echo $"Insufficient privilege" 1>&2
+		exit 4
+	fi
 
 	echo -n $"Starting $PROG: "
         daemon $cmd -d $OSPF6D_OPTS
@@ -43,12 +47,12 @@ case "$1" in
 	[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
 	echo
 	;;
-  restart|reload)
+  restart|reload|force-reload)
         $0 stop
         $0 start
 	RETVAL=$?
         ;;
-  condrestart)
+  condrestart|try-restart)
         if [ -f $LOCK_FILE ]; then
                 $0 stop
 		$0 start
@@ -60,7 +64,7 @@ case "$1" in
 	RETVAL=$?
         ;;
   *)
-	echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
+	echo $"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
 	exit 2
 esac
 
diff -up quagga-0.99.15/redhat/ospfd.init.posix quagga-0.99.15/redhat/ospfd.init
--- quagga-0.99.15/redhat/ospfd.init.posix	2009-10-19 08:52:03.017303137 +0200
+++ quagga-0.99.15/redhat/ospfd.init	2009-10-19 09:56:42.380294279 +0200
@@ -29,6 +29,10 @@ case "$1" in
 
 	# The process must be configured first.
 	[ -f $CONF_FILE ] || exit 6
+	if [ `id -u` -ne 0 ]; then
+		echo $"Insufficient privilege" 1>&2
+		exit 4
+	fi
 
 	echo -n $"Starting $PROG: "
         daemon $cmd -d $OSPFD_OPTS
@@ -43,12 +47,12 @@ case "$1" in
 	[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
 	echo
 	;;
-  restart|reload)
+  restart|reload|force-reload)
         $0 stop
         $0 start
 	RETVAL=$?
         ;;
-  condrestart)
+  condrestart|try-restart)
         if [ -f $LOCK_FILE ]; then
                 $0 stop
 		$0 start
@@ -60,7 +64,7 @@ case "$1" in
 	RETVAL=$?
         ;;
   *)
-	echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
+	echo $"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
 	exit 2
 esac
 
diff -up quagga-0.99.15/redhat/ripd.init.posix quagga-0.99.15/redhat/ripd.init
--- quagga-0.99.15/redhat/ripd.init.posix	2009-10-19 09:57:08.605329988 +0200
+++ quagga-0.99.15/redhat/ripd.init	2009-10-19 09:59:21.872294779 +0200
@@ -29,6 +29,10 @@ case "$1" in
 
 	# The process must be configured first.
 	[ -f $CONF_FILE ] || exit 6
+	if [ `id -u` -ne 0 ]; then
+		echo $"Insufficient privilege" 1>&2
+		exit 4
+	fi
 
 	echo -n $"Starting $PROG: "
         daemon $cmd -d $RIPD_OPTS
@@ -43,12 +47,12 @@ case "$1" in
 	[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
 	echo
 	;;
-  restart|reload)
+  restart|reload|force-reload)
         $0 stop
         $0 start
 	RETVAL=$?
         ;;
-  condrestart)
+  condrestart|try-restart)
         if [ -f $LOCK_FILE ]; then
                 $0 stop
 		$0 start
@@ -60,7 +64,7 @@ case "$1" in
 	RETVAL=$?
         ;;
   *)
-	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
 	exit 2
 esac
 
diff -up quagga-0.99.15/redhat/ripngd.init.posix quagga-0.99.15/redhat/ripngd.init
--- quagga-0.99.15/redhat/ripngd.init.posix	2009-10-19 09:59:42.545325446 +0200
+++ quagga-0.99.15/redhat/ripngd.init	2009-10-19 10:04:01.286294713 +0200
@@ -29,6 +29,10 @@ case "$1" in
 
 	# The process must be configured first.
 	[ -f $CONF_FILE ] || exit 6
+	if [ `id -u` -ne 0 ]; then
+		echo $"Insufficient privilege" 1>&2
+		exit 4
+	fi
 
 	echo -n $"Starting $PROG: "
         daemon $cmd -d $RIPNGD_OPTS
@@ -43,12 +47,12 @@ case "$1" in
 	[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
 	echo
 	;;
-  restart|reload)
+  restart|reload|force-reload)
         $0 stop
         $0 start
 	RETVAL=$?
         ;;
-  condrestart)
+  condrestart|try-restart)
         if [ -f $LOCK_FILE ]; then
                 $0 stop
 		$0 start
@@ -60,7 +64,7 @@ case "$1" in
 	RETVAL=$?
         ;;
   *)
-	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
 	exit 2
 esac
 
diff -up quagga-0.99.15/redhat/zebra.init.posix quagga-0.99.15/redhat/zebra.init
--- quagga-0.99.15/redhat/zebra.init.posix	2009-10-19 10:00:32.754573536 +0200
+++ quagga-0.99.15/redhat/zebra.init	2009-10-19 10:06:26.378294314 +0200
@@ -26,6 +26,10 @@ case "$1" in
 
 	# The process must be configured first.
 	[ -f $CONF_FILE ] || exit 6
+	if [ `id -u` -ne 0 ]; then
+		echo $"Insufficient privilege" 1>&2
+		exit 4
+	fi
 
 	echo -n $"Starting $PROG: "
 
@@ -43,12 +47,12 @@ case "$1" in
 	[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
 	echo
 	;;
-  restart|reload)
+  restart|reload|force-reload)
         $0 stop
         $0 start
 	RETVAL=$?
         ;;
-  condrestart)
+  condrestart|try-restart)
         if [ -f $LOCK_FILE ]; then
                 $0 stop
 		$0 start
@@ -60,7 +64,7 @@ case "$1" in
 	RETVAL=$?
         ;;
   *)
-	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
 	exit 2
 esac
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quagga/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	20 May 2009 12:38:58 -0000	1.21
+++ .cvsignore	11 Dec 2009 13:08:19 -0000	1.22
@@ -1 +1 @@
-quagga-0.99.12.tar.gz
+quagga-0.99.15.tar.gz


Index: quagga.spec
===================================================================
RCS file: /cvs/extras/rpms/quagga/F-12/quagga.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- quagga.spec	14 Sep 2009 12:05:04 -0000	1.54
+++ quagga.spec	11 Dec 2009 13:08:19 -0000	1.55
@@ -31,8 +31,8 @@
 
 Summary:    Routing daemon
 Name:		quagga
-Version:	0.99.12
-Release:    4%{?dist}
+Version:	0.99.15
+Release:    1%{?dist}
 Epoch:      0
 License:	GPLv2+
 Group:      System Environment/Daemons
@@ -40,6 +40,7 @@ Source0:	http://www.quagga.net/download/
 Source1:    quagga-filter-perl-requires.sh
 Patch2:		quagga-0.96.5-nostart.patch
 Patch7:		quagga-0.99.9-initscript.patch
+Patch8:		quagga-0.99.15-posix.patch
 
 URL:		http://www.quagga.net
 %if %with_snmp
@@ -95,6 +96,7 @@ developing OSPF-API and quagga applicati
 %patch2 -p1 -b .nostart
 # This creates a .diff file that we apply after configuring
 %patch7 -p1 -b .initscript
+%patch8 -p1 -b .posix
 
 %build
 # FC5+ automatic -fstack-protector-all switch
@@ -346,6 +348,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec 11 2009 Jiri Skala <jskala at redhat.com> - 0.99.15-1
+- latest upstream version
+- back ported posix compliance of init script
+
 * Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 0.99.12-3
 - fixed #516005 - Errors installing quagga-0.99.11-2.fc11.i586 with --excludedocs
 - fixed #522787 - quagga: build future versions without PAM


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quagga/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	20 May 2009 12:38:58 -0000	1.21
+++ sources	11 Dec 2009 13:08:19 -0000	1.22
@@ -1 +1 @@
-d2bb513f4ac113dbb300c15a0bd0a241  quagga-0.99.12.tar.gz
+8975414c76a295f4855a417af0b5ddce  quagga-0.99.15.tar.gz



From twoerner at fedoraproject.org  Fri Dec 11 13:09:23 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Fri, 11 Dec 2009 13:09:23 +0000 (UTC)
Subject: rpms/tuned/devel tuned.spec,1.14,1.15
Message-ID: <20091211130923.33C6D11C00C5@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18290

Modified Files:
	tuned.spec 
Log Message:
- Updated ktune to version 0.4-1
  - Supports start and stop options in profile scripts calls
  - Fixed CMDLINE_ELEVATOR test (rhbz#496940#c9)




Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tuned.spec	8 Dec 2009 14:10:44 -0000	1.14
+++ tuned.spec	11 Dec 2009 13:09:23 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.6
+Version: 0.2.7
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -102,6 +102,11 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Thomas Woerner <twoerner at redhat.com> 0.2.7-1
+- Updated ktune to version 0.4-1
+  - Supports start and stop options in profile scripts calls
+  - Fixed CMDLINE_ELEVATOR test (rhbz#496940#c9)
+
 * Tue Dec 08 2009 Phil Knirsch <pknirsch at redhat.com> 0.2.6-1
 - Included Jan Vcelak's patch for pyo and pyc files
 - Updated ktune.sh script for laptop-battery-powersave profile with latest



From hadess at fedoraproject.org  Fri Dec 11 13:15:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 13:15:11 +0000 (UTC)
Subject: File gnome-user-share-2.28.2.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091211131511.D273110F874@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gnome-user-share:

4a82f83ddf90c57dcfd1c79cba2bbd3f  gnome-user-share-2.28.2.tar.bz2



From hadess at fedoraproject.org  Fri Dec 11 13:15:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 13:15:26 +0000 (UTC)
Subject: rpms/gnome-user-share/F-12 .cvsignore, 1.22,
	1.23 gnome-user-share.spec, 1.68, 1.69 sources, 1.22,
	1.23 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch, 
	1.1, NONE
Message-ID: <20091211131527.08ED611C00C5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20077

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Removed Files:
	0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch 
Log Message:
* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	26 Oct 2009 11:01:47 -0000	1.22
+++ .cvsignore	11 Dec 2009 13:15:25 -0000	1.23
@@ -1 +1 @@
-gnome-user-share-2.28.1.tar.bz2
+gnome-user-share-2.28.2.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-12/gnome-user-share.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- gnome-user-share.spec	10 Nov 2009 16:33:06 -0000	1.68
+++ gnome-user-share.spec	11 Dec 2009 13:15:26 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 2.28.1
-Release: 3%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -14,8 +14,6 @@ Patch1: 0001-Bug-558244-Enabling-gnome-u
 %define		_default_patch_fuzz 2
 Patch2: 0001-Use-same-directories-in-nautilus-bar-and-app.patch
 BuildRequires: intltool automake autoconf libtool
-# https://bugzilla.redhat.com/show_bug.cgi?id=533977
-Patch3: 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,7 +58,6 @@ The program also allows to share files u
 %patch0 -p1 -b .menu-path
 %patch1 -p1 -b .cluebar
 %patch2 -p1 -b .dirs
-%patch3 -p1 -b .exit-crash
 
 autoreconf -f -i
 
@@ -143,6 +140,9 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
+- Update to 2.28.2
+
 * Tue Nov 10 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
 - Fix crasher on exit when ObexFTP isn't started (#533977)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	26 Oct 2009 11:01:47 -0000	1.22
+++ sources	11 Dec 2009 13:15:26 -0000	1.23
@@ -1 +1 @@
-4dde75de682805357af5995a748d6e4e  gnome-user-share-2.28.1.tar.bz2
+4a82f83ddf90c57dcfd1c79cba2bbd3f  gnome-user-share-2.28.2.tar.bz2


--- 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch DELETED ---



From twoerner at fedoraproject.org  Fri Dec 11 13:21:58 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Fri, 11 Dec 2009 13:21:58 +0000 (UTC)
Subject: rpms/tuned/devel sources,1.12,1.13
Message-ID: <20091211132158.4F03E11C00C5@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22170

Modified Files:
	sources 
Log Message:
- use new sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Dec 2009 14:10:44 -0000	1.12
+++ sources	11 Dec 2009 13:21:58 -0000	1.13
@@ -1 +1 @@
-e6242748a202e91deb6384a158ce24ee  tuned-0.2.6.tar.bz2
+f7ca10d6f4ff46d6063ed4094848a0d1  tuned-0.2.7.tar.bz2



From mitr at fedoraproject.org  Fri Dec 11 13:30:33 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Fri, 11 Dec 2009 13:30:33 +0000 (UTC)
Subject: File volume_key-0.3.1.tar.bz2 uploaded to lookaside cache by mitr
Message-ID: <20091211133033.205CB10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for volume_key:

c5fc7956e691db0ca428a8686bfa47db  volume_key-0.3.1.tar.bz2



From hadess at fedoraproject.org  Fri Dec 11 13:35:08 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 13:35:08 +0000 (UTC)
Subject: rpms/gnome-user-share/F-12 gnome-user-share.spec,1.69,1.70
Message-ID: <20091211133508.C607811C00C5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26050

Modified Files:
	gnome-user-share.spec 
Log Message:
add missing libunique BR


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-12/gnome-user-share.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- gnome-user-share.spec	11 Dec 2009 13:15:26 -0000	1.69
+++ gnome-user-share.spec	11 Dec 2009 13:35:08 -0000	1.70
@@ -31,6 +31,7 @@ BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: libnotify-devel
 BuildRequires: nautilus-devel
+BuildRequires: unique-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool
 Requires(post): GConf2



From mitr at fedoraproject.org  Fri Dec 11 13:37:02 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Fri, 11 Dec 2009 13:37:02 +0000 (UTC)
Subject: rpms/volume_key/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 volume_key.spec, 1.4, 1.5
Message-ID: <20091211133702.46CB111C00C5@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/volume_key/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26594

Modified Files:
	.cvsignore sources volume_key.spec 
Log Message:
* Fri Dec 11 2009 Miloslav Trma? <mitr at redhat.com> - 0.3.1-1
- Update to volume_key-0.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Sep 2009 15:47:30 -0000	1.3
+++ .cvsignore	11 Dec 2009 13:37:01 -0000	1.4
@@ -1 +1 @@
-volume_key-0.3.tar.bz2
+volume_key-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Sep 2009 15:47:30 -0000	1.3
+++ sources	11 Dec 2009 13:37:02 -0000	1.4
@@ -1 +1 @@
-fa406b4c4fd444967e413e2fbd6ff528  volume_key-0.3.tar.bz2
+c5fc7956e691db0ca428a8686bfa47db  volume_key-0.3.1.tar.bz2


Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/volume_key.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- volume_key.spec	30 Sep 2009 15:47:30 -0000	1.4
+++ volume_key.spec	11 Dec 2009 13:37:02 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
-Version: 0.3
+Version: 0.3.1
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Fri Dec 11 2009 Miloslav Trma? <mitr at redhat.com> - 0.3.1-1
+- Update to volume_key-0.3.1.
+
 * Wed Sep 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.3-1
 - Update to volume_key-0.3.
 - Drop bundled libcryptsetup.



From pkgdb at fedoraproject.org  Fri Dec 11 13:37:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 13:37:17 +0000
Subject: [pkgdb] nautilus had acl change status
Message-ID: <20091211133718.0F51110F874@bastion2.fedora.phx.redhat.com>

tbzatek has set the approveacls acl on nautilus (Fedora devel) to Approved for rstrode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Fri Dec 11 13:37:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 13:37:20 +0000
Subject: [pkgdb] nautilus had acl change status
Message-ID: <20091211133720.7200B10F878@bastion2.fedora.phx.redhat.com>

tbzatek has set the commit acl on nautilus (Fedora devel) to Approved for mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From pkgdb at fedoraproject.org  Fri Dec 11 13:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 13:37:40 +0000
Subject: [pkgdb] nautilus had acl change status
Message-ID: <20091211133740.7C6C410F874@bastion2.fedora.phx.redhat.com>

tbzatek has set the commit acl on nautilus (Fedora 12) to Approved for mccann

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nautilus



From dsd at fedoraproject.org  Fri Dec 11 13:41:25 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri, 11 Dec 2009 13:41:25 +0000 (UTC)
Subject: File sugar-0.84.9.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091211134125.0421610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sugar:

e7a01fecf2f67bf02f20de3470206667  sugar-0.84.9.tar.bz2



From dsd at fedoraproject.org  Fri Dec 11 13:42:57 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri, 11 Dec 2009 13:42:57 +0000 (UTC)
Subject: rpms/sugar/F-11 .cvsignore, 1.40, 1.41 sources, 1.42,
	1.43 sugar.spec, 1.64, 1.65
Message-ID: <20091211134257.68DC611C00C5@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/sugar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28366

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
v0.84.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	2 Dec 2009 12:36:06 -0000	1.40
+++ .cvsignore	11 Dec 2009 13:42:57 -0000	1.41
@@ -1 +1 @@
-sugar-0.84.8.tar.bz2
+sugar-0.84.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	2 Dec 2009 12:36:06 -0000	1.42
+++ sources	11 Dec 2009 13:42:57 -0000	1.43
@@ -1 +1 @@
-3cf91e134761761aaa33cf73140f8554  sugar-0.84.8.tar.bz2
+e7a01fecf2f67bf02f20de3470206667  sugar-0.84.9.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-11/sugar.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sugar.spec	2 Dec 2009 12:36:06 -0000	1.64
+++ sugar.spec	11 Dec 2009 13:42:57 -0000	1.65
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.84.8
+Version: 0.84.9
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -140,6 +140,9 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Fri Dec 11 2009 Daniel Drake <dsd at laptop.org> - 0.84.9-1
+- bugfix and translations release
+
 * Thu Dec  2 2009 Daniel Drake <dsd at laptop.org> - 0.84.8-1
 - bugfix release
 



From mitr at fedoraproject.org  Fri Dec 11 13:48:32 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Fri, 11 Dec 2009 13:48:32 +0000 (UTC)
Subject: rpms/volume_key/F-12 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 volume_key.spec, 1.4, 1.5
Message-ID: <20091211134832.57EC511C00C5@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/volume_key/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29997

Modified Files:
	.cvsignore sources volume_key.spec 
Log Message:
* Fri Dec 11 2009 Miloslav Trma? <mitr at redhat.com> - 0.3.1-1
- Update to volume_key-0.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Sep 2009 15:50:13 -0000	1.3
+++ .cvsignore	11 Dec 2009 13:48:32 -0000	1.4
@@ -1 +1 @@
-volume_key-0.3.tar.bz2
+volume_key-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Sep 2009 15:50:13 -0000	1.3
+++ sources	11 Dec 2009 13:48:32 -0000	1.4
@@ -1 +1 @@
-fa406b4c4fd444967e413e2fbd6ff528  volume_key-0.3.tar.bz2
+c5fc7956e691db0ca428a8686bfa47db  volume_key-0.3.1.tar.bz2


Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/F-12/volume_key.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- volume_key.spec	30 Sep 2009 15:50:13 -0000	1.4
+++ volume_key.spec	11 Dec 2009 13:48:32 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
-Version: 0.3
+Version: 0.3.1
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Fri Dec 11 2009 Miloslav Trma? <mitr at redhat.com> - 0.3.1-1
+- Update to volume_key-0.3.1.
+
 * Wed Sep 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.3-1
 - Update to volume_key-0.3.
 - Drop bundled libcryptsetup.



From rdieter at fedoraproject.org  Fri Dec 11 13:51:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 13:51:07 +0000 (UTC)
Subject: File gc-7.2alpha4.tar.gz uploaded to lookaside cache by rdieter
Message-ID: <20091211135107.1948610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gc:

0a6785ebb61c6e2b50c3952c3bbf9ea1  gc-7.2alpha4.tar.gz



From rdieter at fedoraproject.org  Fri Dec 11 13:51:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 13:51:51 +0000 (UTC)
Subject: rpms/gc/devel .cvsignore, 1.11, 1.12 gc.spec, 1.42, 1.43 sources,
	1.10, 
	1.11 gc-7.1-dont_add_byte.patch, 1.1, NONE gc-7.1-gcinit.patch,
	1.1, NONE gc-7.1-sparc.patch, 1.1, NONE
Message-ID: <20091211135151.E810B11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31150

Modified Files:
	.cvsignore gc.spec sources 
Removed Files:
	gc-7.1-dont_add_byte.patch gc-7.1-gcinit.patch 
	gc-7.1-sparc.patch 
Log Message:
* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 7.2-0.1.alpha4
- gc-7.2alpha4
- use/package internal libatomic_ops



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	5 May 2008 02:32:47 -0000	1.11
+++ .cvsignore	11 Dec 2009 13:51:51 -0000	1.12
@@ -1 +1 @@
-gc-7.1.tar.gz
+gc-7.2alpha4.tar.gz


Index: gc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gc/devel/gc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gc.spec	8 Dec 2009 21:13:44 -0000	1.42
+++ gc.spec	11 Dec 2009 13:51:51 -0000	1.43
@@ -1,28 +1,24 @@
 
+%define pre alpha4
+
 Summary: A garbage collector for C and C++ 
 Name:    gc	
-Version: 7.1
+Version: 7.2
+Release: 0.1.%{pre}%{?dist}
 
-Release: 10%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source0: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-%{version}.tar.gz
+Source0: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-%{version}%{?pre}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# To be more backward-compatible abi-wise, TODO: upstream ml reference
-Patch1: gc-7.1-gcinit.patch
-Patch3: gc-7.1-sparc.patch
-
 ## upstreamable patches
 Patch50: gc-7.1-dup_cpp_headers.patch
+Patch51: gc-7.2alpha4-install_dups.patch
 
 ## upstream patches
-# http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2008-May/002206.html
-Patch100: gc-7.1-dont_add_byte.patch
 
 BuildRequires: automake libtool 
-BuildRequires: libatomic_ops-static libatomic_ops-devel
 BuildRequires: pkgconfig
 
 # rpmforge compatibility
@@ -43,23 +39,26 @@ Provides:  libgc-devel = %{version}-%{re
 %description devel
 %{summary}.
 
+%package -n libatomic_ops-devel
+Summary:   Atomic memory update operations
+Group:     Development/Libraries
+Provides:  libatomic_ops-static = %{version}-%{release}
+%description -n libatomic_ops-devel 
+Provides implementations for atomic memory update operations on a
+number of architectures. This allows direct use of these in reasonably
+portable code. Unlike earlier similar packages, this one explicitly
+considers memory barrier semantics, and allows the construction of code
+that involves minimum overhead across a variety of architectures.
 
-%prep
-%setup -q 
 
-# FIXME? -- Rex
-%if 0%{?rhel} < 6 && 0%{?fedora} < 10
-%patch1 -p1 -b .gcinit
-%endif
-%patch3 -p1 -b .sparc
+%prep
+%setup -q -n gc-%{version}%{?pre}
 
 %patch50 -p1 -b .dup_cpp_headers
-
-%patch100 -p1 -b .dont_add_byte
+%patch51 -p1 -b .install_dups
 
 # refresh auto*/libtool to purge rpaths
 rm -f libtool libtool.m4
-libtoolize --force
 autoreconf -i
 
 
@@ -73,25 +72,30 @@ autoreconf -i
 %ifarch %{ix86}
   --enable-parallel-mark \
 %endif
-  --enable-threads=posix
+  --enable-threads=posix \
+  --with-libatomic-ops=no
 
 make %{?_smp_mflags}
+make %{?_smp_mflags} -C libatomic_ops
 
 
 %install
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} 
+make install DESTDIR=%{buildroot} -C libatomic_ops
 
 install -p -D -m644 doc/gc.man	%{buildroot}%{_mandir}/man3/gc.3
 
 ## Unpackaged files
-rm -rf %{buildroot}%{_datadir}/gc
+rm -rf %{buildroot}%{_datadir}/gc/
+rm -rf %{buildroot}%{_datadir}/libatomic_ops/{COPYING,*.txt}
 rm -f  %{buildroot}%{_libdir}/lib*.la
 
 
 %check
 make check
+make check -C libatomic_ops
 
 
 %clean
@@ -108,19 +112,39 @@ rm -rf %{buildroot}
 %doc doc/README
 %doc doc/README.changes doc/README.contributors 
 %doc doc/README.environment doc/README.linux
-%{_libdir}/lib*.so.*
+%{_libdir}/libcord.so.1*
+%{_libdir}/libgc.so.1*
+%{_libdir}/libgccpp.so.1*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*.html
-%{_includedir}/*.h
+%{_includedir}/gc.h
+%{_includedir}/gc_cpp.h
 %{_includedir}/gc/
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*
-%{_mandir}/man?/*
+%{_libdir}/libcord.so
+%{_libdir}/libgc.so
+%{_libdir}/libgccpp.so
+%{_libdir}/pkgconfig/bdw-gc.pc
+%{_mandir}/man3/gc.3*
+
+%files -n libatomic_ops-devel
+%defattr(-,root,root,-)
+%doc libatomic_ops/AUTHORS libatomic_ops/ChangeLog libatomic_ops/COPYING libatomic_ops/NEWS libatomic_ops/README
+%doc libatomic_ops/doc/*.txt
+%{_includedir}/atomic_ops.h
+%{_includedir}/atomic_ops_malloc.h
+%{_includedir}/atomic_ops_stack.h
+%{_includedir}/atomic_ops/
+%{_libdir}/libatomic_ops.a
+%{_libdir}/libatomic_ops_gpl.a
 
 
 %changelog
+* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 7.2-0.1.alpha4
+- gc-7.2alpha4
+- use/package internal libatomic_ops
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 7.1-10
 - Explicitly BR libatomic_ops-static in accordance with the Packaging
   Guidelines (libatomic_ops-devel is still static-only).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gc/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 May 2008 02:32:47 -0000	1.10
+++ sources	11 Dec 2009 13:51:51 -0000	1.11
@@ -1 +1 @@
-2ff9924c7249ef7f736ecfe6f08f3f9b  gc-7.1.tar.gz
+0a6785ebb61c6e2b50c3952c3bbf9ea1  gc-7.2alpha4.tar.gz


--- gc-7.1-dont_add_byte.patch DELETED ---


--- gc-7.1-gcinit.patch DELETED ---


--- gc-7.1-sparc.patch DELETED ---



From ingvar at fedoraproject.org  Fri Dec 11 13:53:39 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Fri, 11 Dec 2009 13:53:39 +0000 (UTC)
Subject: rpms/munin/devel munin-1.4.1-fontfix.patch, NONE, 1.1 munin.spec,
	1.30, 1.31
Message-ID: <20091211135339.E1C7111C00C5@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31667

Modified Files:
	munin.spec 
Added Files:
	munin-1.4.1-fontfix.patch 
Log Message:
- More correct fedora and el versions for previous font path fix
- Added a patch that fixes a quoting bug in GraphOld.pm, fixing fonts on el4



munin-1.4.1-fontfix.patch:
 GraphOld.pm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE munin-1.4.1-fontfix.patch ---
diff -Naur ../munin-1.4.1.orig/master/lib/Munin/Master/GraphOld.pm ./master/lib/Munin/Master/GraphOld.pm
--- ../munin-1.4.1.orig/master/lib/Munin/Master/GraphOld.pm	2009-12-04 12:13:58.000000000 +0100
+++ ./master/lib/Munin/Master/GraphOld.pm	2009-12-11 13:19:19.825500312 +0100
@@ -1099,12 +1099,12 @@
                 push(@complete, '--font', 'LEGEND:7:monospace');
             }
             else {
-                push(@complete, '--font', 'LEGEND:7:$libdir/VeraMono.ttf');
+                push(@complete, '--font', "LEGEND:7:$libdir/VeraMono.ttf");
             }
 
             push(@complete,
-                '--font', 'UNIT:7:$libdir/VeraMono.ttf',
-                '--font', 'AXIS:7:$libdir/VeraMono.ttf');
+                '--font', "UNIT:7:$libdir/VeraMono.ttf",
+                '--font', "AXIS:7:$libdir/VeraMono.ttf");
         }
 
         push(@complete, '-W', $watermark) if $RRDs::VERSION >= 1.2;


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- munin.spec	9 Dec 2009 13:36:18 -0000	1.30
+++ munin.spec	11 Dec 2009 13:53:39 -0000	1.31
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.4.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
 
 Patch1: munin-1.4.0-config.patch
+Patch2: munin-1.4.1-fontfix.patch
 
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
@@ -38,7 +39,11 @@ Requires: logrotate
 Requires: /bin/mail
 Requires(pre): shadow-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%if 0%{?rhel} > 5 || 0%{?fedora} > 6
 Requires: dejavu-sans-mono-fonts
+%else
+Requires: bitstream-vera-fonts
+%endif
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -116,6 +121,7 @@ java-plugins for munin-node. 
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p0
 
 %build
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
@@ -180,7 +186,7 @@ install -m 0644 %{SOURCE6} %{buildroot}/
 
 # Use font from bitstream-vera-fonts-sans-mono
 rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-%if 0%{?rhel} > 0 || 0%{?fedora} > 10
+%if 0%{?rhel} > 5 || 0%{?fedora} > 6
 ln -s /usr/share/fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
 %else
 ln -s /usr/share/fonts/bitstream-vera/VeraMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
@@ -283,6 +289,10 @@ exit 0
 %endif
 
 %changelog
+* Fri Dec 11 2009 Ingvar Hagelund <ingvar at linpro.no> - 1.4.1-3
+- More correct fedora and el versions for previous font path fix
+- Added a patch that fixes a quoting bug in GraphOld.pm, fixing fonts on el4
+
 * Wed Dec 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 1.4.1-2
 - Remove jmx plugins when not supported (like on el4 and older fedora)
 - Correct font path on older distros like el5, el4 and fedora<11



From kalev at fedoraproject.org  Fri Dec 11 14:00:00 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri, 11 Dec 2009 14:00:00 +0000 (UTC)
Subject: rpms/mono-bouncycastle/devel bccrypto-nopatents.patch, 1.1,
	1.2 mono-bouncycastle.spec, 1.2, 1.3
Message-ID: <20091211140000.E2E4D11C00C5@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mono-bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv901

Modified Files:
	bccrypto-nopatents.patch mono-bouncycastle.spec 
Log Message:
Updated mono-nopatents.patch to the version sent upstream


bccrypto-nopatents.patch:
 NBuild.build                       |   26 ++++++++++++++------------
 src/security/ParameterUtilities.cs |    4 ++++
 2 files changed, 18 insertions(+), 12 deletions(-)

Index: bccrypto-nopatents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/bccrypto-nopatents.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bccrypto-nopatents.patch	3 Dec 2009 08:40:55 -0000	1.1
+++ bccrypto-nopatents.patch	11 Dec 2009 14:00:00 -0000	1.2
@@ -1,7 +1,9 @@
+Fix build with IDEA code removed.
+
 diff -up csharp/crypto/NBuild.build.nopatents csharp/crypto/NBuild.build
---- csharp/crypto/NBuild.build.nopatents	2009-08-18 15:11:56.000000000 +0300
-+++ csharp/crypto/NBuild.build	2009-11-13 01:27:18.000000000 +0200
-@@ -136,18 +136,6 @@
+--- csharp/crypto/NBuild.build.nopatents	2009-12-11 15:22:15.000000000 +0200
++++ csharp/crypto/NBuild.build	2009-12-11 15:23:14.000000000 +0200
+@@ -136,18 +136,20 @@
          <include name="System.dll"/>
        </references>
      </csc>
@@ -17,28 +19,46 @@ diff -up csharp/crypto/NBuild.build.nopa
 -        <include name="System.dll"/>
 -      </references>
 -    </csc>
++    <if test="${file::exists(api-srcpath + '/crypto/engines/IdeaEngine.cs')}">
++      <csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${dist-path}/${name-ext}.dll"
++        verbose="false" debug="false" optimize="true" define="${compile-defines};STRONG_NAME;INCLUDE_IDEA">
++        <sources>
++          <include name="${api-srcpath}/**/*.cs"/>
++          <exclude name="${api-srcpath}/cms/CMSAuthenticated*.cs"/>
++          <include name="${bzip2-srcpath}/**/*.cs"/>
++        </sources>
++        <references>
++          <include name="mscorlib.dll"/>
++          <include name="System.dll"/>
++        </references>
++      </csc>
++    </if>
    </target>
  
    <target name="all" depends="compile-debug, compile-release"/>
 diff -up csharp/crypto/src/security/ParameterUtilities.cs.nopatents csharp/crypto/src/security/ParameterUtilities.cs
---- csharp/crypto/src/security/ParameterUtilities.cs.nopatents	2009-11-13 01:26:10.000000000 +0200
-+++ csharp/crypto/src/security/ParameterUtilities.cs	2009-11-13 01:26:49.000000000 +0200
-@@ -226,9 +226,6 @@ namespace Org.BouncyCastle.Security
+--- csharp/crypto/src/security/ParameterUtilities.cs.nopatents	2009-07-06 04:52:58.000000000 +0300
++++ csharp/crypto/src/security/ParameterUtilities.cs	2009-12-11 15:22:15.000000000 +0200
+@@ -226,9 +226,11 @@ namespace Org.BouncyCastle.Security
  					case "RC2":
  						iv = RC2CbcParameter.GetInstance(asn1Params).GetIV();
  						break;
--					case "IDEA":
--						iv = IdeaCbcPar.GetInstance(asn1Params).GetIV();
--						break;
++#if INCLUDE_IDEA
+ 					case "IDEA":
+ 						iv = IdeaCbcPar.GetInstance(asn1Params).GetIV();
+ 						break;
++#endif
  					case "CAST5":
  						iv = Cast5CbcParameters.GetInstance(asn1Params).GetIV();
  						break;
-@@ -292,8 +289,6 @@ namespace Org.BouncyCastle.Security
+@@ -292,8 +294,10 @@ namespace Org.BouncyCastle.Security
  				case "DESEDE":
  				case "DESEDE3":
  					return CreateIVOctetString(random, 8);
--				case "IDEA":
--					return new IdeaCbcPar(CreateIV(random, 8));
++#if INCLUDE_IDEA
+ 				case "IDEA":
+ 					return new IdeaCbcPar(CreateIV(random, 8));
++#endif
  				case "NOEKEON":
  					return CreateIVOctetString(random, 16);
  				case "RC2":


Index: mono-bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/mono-bouncycastle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mono-bouncycastle.spec	3 Dec 2009 09:52:37 -0000	1.2
+++ mono-bouncycastle.spec	11 Dec 2009 14:00:00 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           mono-bouncycastle
 Version:        1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Bouncy Castle Crypto Package for Mono
 
 Group:          System Environment/Libraries
@@ -22,6 +22,7 @@ Source2:        mono.snk
 # Patch to enable building with Mono
 Patch0:         bccrypto-mono.patch
 # Patch to fix build with patent encumbered code removed
+# http://www.bouncycastle.org/jira/browse/BMA-53
 Patch1:         bccrypto-nopatents.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mono/bouncycastle/
 
 %changelog
+* Fri Dec 11 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-5
+- Updated mono-nopatents.patch to the version sent upstream
+
 * Wed Dec 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-4
 - Updated License tag to read 'MIT and ASL 1.1'
 



From rdieter at fedoraproject.org  Fri Dec 11 14:01:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 14:01:49 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.215,1.216
Message-ID: <20091211140149.D341A11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1552

Modified Files:
	kdeedu.spec 
Log Message:
(temporarily) disable ocaml/facile support (f13)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- kdeedu.spec	2 Dec 2009 11:59:14 -0000	1.215
+++ kdeedu.spec	11 Dec 2009 14:01:49 -0000	1.216
@@ -1,8 +1,14 @@
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
 %ifarch alpha %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
+%if 0%{?fedora} > 12
+# re-enable when fixed:
+# https://bugzilla.redhat.com/show_bug.cgi?id=545116
+%define with_facile 0
+%else
 %define with_facile 1
 %endif
+%endif
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications



From sgallagh at fedoraproject.org  Fri Dec 11 14:10:53 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 11 Dec 2009 14:10:53 +0000 (UTC)
Subject: File sssd-0.99.1.tar.gz uploaded to lookaside cache by sgallagh
Message-ID: <20091211141053.48F2410F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for sssd:

00468f7fe1b75e53cc3c1027f2a92902  sssd-0.99.1.tar.gz



From rdieter at fedoraproject.org  Fri Dec 11 14:11:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 14:11:00 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.266,1.267
Message-ID: <20091211141100.AC63C11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4271

Modified Files:
	kdebindings.spec 
Log Message:
use safer %_qt4_version constructs for newer rpm



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- kdebindings.spec	4 Dec 2009 15:30:19 -0000	1.266
+++ kdebindings.spec	11 Dec 2009 14:11:00 -0000	1.267
@@ -174,7 +174,7 @@ Provides: kimono4 = %{version}-%{release
 %package -n qyoto
 Group:    Development/Languages
 Summary:  C# bindings for Qt4
-Requires: qt4 >= %{_qt4_version} 
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 Provides: qyoto4 = %{version}-%{release}
 %description -n qyoto
 %{summary}.
@@ -211,7 +211,7 @@ Provides: korundum4-devel = %{version}-%
 %package -n QtRuby
 Group:    Development/Languages
 Summary:  Ruby bindings for Qt4
-Requires: qt4 >= %{_qt4_version} 
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 Provides: QtRuby4 = %{version}-%{release}
 Requires: ruby
 %description -n QtRuby
@@ -230,7 +230,7 @@ Provides: QtRuby4-devel = %{version}-%{r
 %package -n php-qt
 Group:    Development/Languages
 Summary:  PHP bindings for Qt4
-Requires: qt4 >= %{_qt4_version} 
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 Provides: php-qt4 = %{version}-%{release}
 %description -n php-qt
 %{summary}.



From sgallagh at fedoraproject.org  Fri Dec 11 14:16:51 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 11 Dec 2009 14:16:51 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 sssd.spec,
	1.28, 1.29
Message-ID: <20091211141651.C9BD411C00C5@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6184

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
David O'Brien (1):
 * Copy-edit sssd-ipa man page

Dmitri Pal (5):
 * COMMON Improvements to the trace macro
 * COLLECTION Create reference to the top level collection
 * COLLECTION: Cleaning FIXME comments
 * INI: Cleaning FIXME comments.
 * INI Correcting build warnings.

Fabian Affolter (1):
 * Add German translation

G?ran Uddeborg (2):
 * Add Swedish translation for sss_client
 * Add Swedish translation for SSSD server

Jakub Hrozek (13):
 * Warn visibly about permission problems with the config file
 * Better error message when there is no local domain configured
 * Setup ldap child logging from IPA backend
 * Check the services started against a list of known services
 * Handle spaces in config parser
 * Fail on nonexistent input file
 * Do not start with provider=files
 * Reduce code duplication between LDAP child and Kerberos child
 * Change ares usage to be c-ares 1.7.0 compatible
 * Import ares 1.7.0 helpers
 * Don't build the SRV and TXT parsing code except for tests
 * Document the failover feature in manpages
 * Consolidate code for splitting strings by separator

Martin Nagy (3):
 * Fix egg-info file generation in the spec file
 * Add some debugging statements to fail_over and resolver
 * Correctly restart server status after the timeout

Simo Sorce (17):
 * Fix tabs
 * Fix memberof plugin
 * Compute and save memberuid in cache as well
 * Use memberuid and not member in group enumerations
 * Use the custom password field in groups too.
 * Resolve nested groups also when rfc2307bis is used
 * Make strdn build functions more available
 * Fix nested group memberships
 * Allow nesting to fix #310
 * Fix bug #311, properly set callback attribute
 * Change dhash API to be talloc-friendly
 * dhash: Add private pointer for delete callback
 * Add comments to document latest changes
 * Add rebuild task to memberof plugin
 * Handle the special 02 upgrade case for 04->05
 * Fix for #316
 * Fix for #322, update from old database versions.

Stephen Gallagher (28):
 * Remove ELAPI from build and tarball
 * Stop configuring ELAPI
 * Make debug log timestamps human-readable
 * Raise debug log level for LDB_DEBUG_WARNING
 * Add allocation error check
 * Avoid returning uninitialized result.
 * Fix potential uninitialized value errors in nsssrv_cmd.c
 * Fix potential uninitialized value error in responder_dp.c
 * SSSDDomain.remove_provider() requires only the provider type
 * Make SSSDDomain.remove_provider() remove configured options
 * Run dhash tests
 * Add SSSDDomain.set_name() function to SSSDConfig API
 * Reduce the verbosity of the SSSDConfigTest
 * Fix broken SSSDChangeConf.set() function
 * Fix SSSDConfig API bugs around [de-]activation of domains
 * Fix RPM spec for RHEL6
 * SSSDConfig API: fix deactivate_domain()
 * SSSDConfig.get_domain() should properly detect active state
 * Ensure that list_active_domains returns the real value
 * Properly deny id_provider=files
 * Add missing options to sssd-ipa configuraion
 * Add missing SSSDConfig file for IPA for make install
 * Fix processing of Boolean values in SSSDConfig
 * Add 'permit' and 'deny' access providers to SSSDConfig API
 * Remove default for ldap_use_start_tls in IPA providers
 * Run SSSDConfig tests during 'make check'
 * Fix stupid copy-paste error
 * Updating to version 0.99.1

Sumit Bose (13):
 * Do not include libsss_ipa.la in rpm package
 * Immediately return a krb5 change password request when offline
 * Check LDAP structure before calling ldap_unbind_ext()
 * Add sysdb_search_custom request
 * Do not treat missing proc files as errors.
 * Add basic OS detection
 * Make packaging of *.egg-info files more flexible
 * Try to renew Kerberos credentials
 * Add checks to test the memberuid handling
 * Add offline support for ipa_access
 * Add dummy credentials to an empty ccache file
 * Always update sysdb to the latest version
 * Fix DEBUG message for sysdb_init

beckerde (1):
 * Add Spanish translation

ruigo (1):
 * Add Portuguese translation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	30 Nov 2009 15:39:15 -0000	1.14
+++ .cvsignore	11 Dec 2009 14:16:51 -0000	1.15
@@ -1 +1 @@
-sssd-0.99.0.tar.gz
+sssd-0.99.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	30 Nov 2009 15:39:15 -0000	1.15
+++ sources	11 Dec 2009 14:16:51 -0000	1.16
@@ -1 +1 @@
-c3209c97adb1d8dcbd6d5fd1f3562116  sssd-0.99.0.tar.gz
+00468f7fe1b75e53cc3c1027f2a92902  sssd-0.99.1.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sssd.spec	30 Nov 2009 15:39:15 -0000	1.28
+++ sssd.spec	11 Dec 2009 14:16:51 -0000	1.29
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.99.0
+Version: 0.99.1
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -37,7 +37,12 @@ BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: m4
 %{?fedora:BuildRequires: popt-devel}
-%{?rhel:BuildRequires: popt}
+%if 0%{?rhel} <= 5
+BuildRequires: popt
+%endif
+%if 0%{?rhel} >= 6
+BuildRequires: popt-devel
+%endif
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
 BuildRequires: libtdb-devel
@@ -120,6 +125,10 @@ then
     # Older versions of rpmbuild can only handle one -f option
     echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang
 fi
+for file in `ls $RPM_BUILD_ROOT/%{python_sitelib}/*.egg-info 2> /dev/null`
+do
+    echo %{python_sitelib}/`basename $file` >> sss_daemon.lang
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -163,7 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sssd_krb5_locator_plugin.8*
 %{python_sitearch}/pysss.so
 %{python_sitelib}/*.py*
-%{?fedora:%{python_sitelib}/*.egg-info}
 
 
 %files client -f sss_client.lang
@@ -197,6 +205,9 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 11 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.1-1
+- New upstream bugfix release 0.99.1
+
 * Mon Nov 30 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.0-1
 - New upstream release 0.99.0
 



From jcollie at fedoraproject.org  Fri Dec 11 14:20:02 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 11 Dec 2009 14:20:02 +0000 (UTC)
Subject: rpms/pitivi/devel .cvsignore, 1.19, 1.20 pitivi.spec, 1.42,
	1.43 sources, 1.19, 1.20
Message-ID: <20091211142002.7B72B11C03E3@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7721

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Thu Dec 10 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3.2.837f0d73
- Update to git master to see if this fixes anyone's problems
- Call update-desktop-database/update-mime-database in post/postun



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	16 Sep 2009 03:10:35 -0000	1.19
+++ .cvsignore	11 Dec 2009 14:20:02 -0000	1.20
@@ -1 +1,2 @@
-pitivi-0.13.3.tar.bz2
+pitivi-0.13.3-837f0d7.tar.bz2
+common-888e0a26.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- pitivi.spec	3 Dec 2009 23:13:59 -0000	1.42
+++ pitivi.spec	11 Dec 2009 14:20:02 -0000	1.43
@@ -1,14 +1,33 @@
+%define pitivi_git	837f0d73
+%define common_git	888e0a26
 %define major   0.13
 %define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        3%{?dist}
+Release:        3.2.%{pitivi_git}%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://www.pitivi.org/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}.tar.bz2
+
+#Source0:        http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}-%{pitivi_git}.tar.bz2
+
+
+# To generate the source tarballs:
+#
+# git clone git://git.pitivi.org/git/pitivi.git
+# cd pitivi
+# pitivi_git=`git show-ref --hash=8 HEAD`
+# git archive --format=tar --prefix=pitivi-0.13.3-${pitivi_git}/ ${pitivi_git} | bzip2 > pitivi-0.13.3-${pitivi_git}.tar.bz2
+# git submodule init
+# git submodule update
+# common_git=`git submodule status common | awk '{print substr($1,1,8)}'`
+# cd common
+# git archive --format=tar --prefix=common/ ${common_git} | bzip2 > ../common-${common_git}.tar.bz2
+
+Source0:        pitivi-%{version}-%{pitivi_git}.tar.bz2
+Source1:	common-%{common_git}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -33,7 +52,7 @@ At this level of development it can be c
 program. 
 
 %prep
-%setup0 -q
+%setup0 -q -n %{name}-%{version}-%{pitivi_git} -a 1
 
 for f in `find . -name \*.py`
 do
@@ -41,6 +60,8 @@ do
 done
 
 %build
+./autogen.sh
+
 %configure --libdir=%{_datadir}
 
 make %{?_smp_mflags}
@@ -58,6 +79,14 @@ desktop-file-install --vendor fedora    
 %clean
 rm -rf %{buildroot}
 
+%post
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS
@@ -68,6 +97,10 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Thu Dec 10 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3.2.837f0d73
+- Update to git master to see if this fixes anyone's problems
+- Call update-desktop-database/update-mime-database in post/postun
+
 * Thu Dec  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3
 - Add Req on python-setuptools for BZ#540192
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Sep 2009 03:10:36 -0000	1.19
+++ sources	11 Dec 2009 14:20:02 -0000	1.20
@@ -1 +1,2 @@
-ef9385f74173ddeb5bb10389c46d442a  pitivi-0.13.3.tar.bz2
+f27d71f12f0cf0c2abf8e5eeda9d0c40  pitivi-0.13.3-837f0d7.tar.bz2
+cb52781416d89653b9168f24fa2f9ca0  common-888e0a26.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 11 14:26:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 14:26:47 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec, 1.216,
	1.217 kdeedu-4.3.75-enable-kalzium.patch, 1.1, NONE
Message-ID: <20091211142647.2144F11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9696

Modified Files:
	kdeedu.spec 
Removed Files:
	kdeedu-4.3.75-enable-kalzium.patch 
Log Message:
drop old patch



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- kdeedu.spec	11 Dec 2009 14:01:49 -0000	1.216
+++ kdeedu.spec	11 Dec 2009 14:26:46 -0000	1.217
@@ -24,7 +24,6 @@ Source0: ftp://ftp.kde.org/pub/kde/unsta
 
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
 Patch2: kdeedu-4.3.75-desktop-fix.patch
-Patch3: kdeedu-4.3.75-enable-kalzium.patch
 ## upstream patches
 
 Obsoletes: kdeedu4 < %{version}-%{release}
@@ -180,7 +179,6 @@ Educational/Edutainment Math application
 
 %patch1 -p1 -b .indi_nodrivers
 %patch2 -p1 -b .desktop-fix
-%patch3 -p1 -b .enable-kalzium
 
 
 %build


--- kdeedu-4.3.75-enable-kalzium.patch DELETED ---



From arbiter at fedoraproject.org  Fri Dec 11 14:27:45 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 14:27:45 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.80-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.152, 1.153 kdegames-4.3.3-trademarks.patch,
	1.1, NONE kdegames-4.3.75-trademarks.patch, 1.1, NONE
Message-ID: <20091211142745.A60BD11C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10125

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.80-trademarks.patch 
Removed Files:
	kdegames-4.3.3-trademarks.patch 
	kdegames-4.3.75-trademarks.patch 
Log Message:
- Please review the updated trademarks patch

kdegames-4.3.80-trademarks.patch:
 README                               |   12 +++-
 doc/kbattleship/index.docbook        |   37 +++++++-------
 doc/ktron/index.docbook              |   11 ++--
 kbattleship/src/kbattleship.desktop  |   91 +++++++++++++++++------------------
 kbattleship/src/kbattleship.protocol |   54 ++++++++++----------
 kbattleship/src/main.cpp             |    6 +-
 kbattleship/src/message.cpp          |    2 
 kbattleship/src/playfield.cpp        |    2 
 ktron/general.ui                     |    4 -
 ktron/ktron.desktop                  |   87 ++-------------------------------
 ktron/main.cpp                       |    5 +
 ktron/player.cpp                     |    2 
 ktron/snakepart.cpp                  |    4 -
 13 files changed, 126 insertions(+), 191 deletions(-)

--- NEW FILE kdegames-4.3.80-trademarks.patch ---
diff -Naur kdegames-4.3.80.orig/doc/kbattleship/index.docbook kdegames-4.3.80/doc/kbattleship/index.docbook
--- kdegames-4.3.80.orig/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.3.80/doc/kbattleship/index.docbook	2009-12-11 15:22:46.274953367 +0100
@@ -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 "&kbattleship;">
+  <!ENTITY kappname "<application>KSinkShips</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kbattleship; Handbook</title>
+<title>The &kappname; Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,16 +57,17 @@
 
 <abstract>
 <para>
-&kbattleship; is a network-enabled implementation of the famous <quote>Battle Ship</quote> game for &kde;.</para>
+&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>kbattleship</keyword>
+<keyword>ksinkships</keyword>
 <keyword>game</keyword>
-<keyword>battleship</keyword>
-<keyword>battle</keyword>
+<keyword>sinkships</keyword>
+<keyword>sink</keyword>
+<keyword>ships</keyword>
 </keywordset>
 
 </bookinfo>
@@ -76,7 +77,7 @@
 <note><title>Gametype:</title><para>Strategy, Board</para></note><!-- Game genre. Use as many as necessary. Available game types are: Arcade, Board, Card, Dice, Toys, Logic, Strategy.-->
 <note><title>Number of possible players:</title><para>Two</para></note><!--Number of possible players. It can be: One, Two,..., Multiplayer-->
 <para>
-&kbattleship; is a Battle Ship game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
+&kappname; is a ship sinking game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
 ships in turns without knowing where they are placed. The first player to destroy all ships wins the game.
 </para>
 </chapter>
@@ -85,14 +86,14 @@
 <title>How to Play</title>
 <note><title>Objective:</title><para>Sink all of the opponent?s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
 <para>
-If you want to play &kbattleship;, you will need two players, either play
+If you want to play &kappname;, you will need two players, either play
 against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
 
 <para>
 To start a network game, one player has to host the game by selecting <guilabel>Host network game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Host Game...</guimenuitem></menuchoice>.
 A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally,
-&kbattleship; will suggest your full name, but you can enter any string
+&kappname; will suggest your full name, but you can enter any string
 you want. The predefined port should be ok. However, if you encounter
 problems, you can choose any other free port above 1024.
 </para>
@@ -186,10 +187,10 @@
 <title>Multiplayer support</title>
 
 <para>
-&kbattleship; can be played online on any GGZ Gaming Zone site. You can
+&kappname; can be played online on any GGZ Gaming Zone site. You can
 find other players there, and compete against them. Just enter one
-of the available Battleship rooms with any GGZ core client, such as
-kggz, and &kbattleship; will be offered to you as your favourite
+of the available rooms with any GGZ core client, such as
+kggz, and &kappname; will be offered to you as your favourite
 game client. If a GGZ core client is installed, you can try
 out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
 </para>
@@ -197,7 +198,7 @@
 <para>
 Remember that when playing online, the opponent might be either a
 human player or a computer player. The latter one might behave
-differently from the computer player included in &kbattleship;.
+differently from the computer player included in &kappname;.
 </para>
 
 </sect1>
@@ -314,7 +315,7 @@
 </term>
 <listitem>
 <para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
 </para>
 </listitem>
 </varlistentry>
@@ -394,7 +395,7 @@
 </term>
 <listitem>
 <para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -408,7 +409,7 @@
 </term>
 <listitem>
 <para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
 </para>
 </listitem>
 </varlistentry>
@@ -437,7 +438,7 @@
 </question>
 <answer>
 <para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
 </para>
 </answer>
 </qandaentry>
@@ -474,7 +475,7 @@
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
 
 <itemizedlist>
 <title>Authors</title>
diff -Naur kdegames-4.3.80.orig/doc/ktron/index.docbook kdegames-4.3.80/doc/ktron/index.docbook
--- kdegames-4.3.80.orig/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.3.80/doc/ktron/index.docbook	2009-12-11 15:22:46.274953367 +0100
@@ -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">
@@ -61,7 +61,7 @@
 
 <abstract>
 <para>
-&kappname; is a simple <quote>Tron</quote> clone for &kde;, which you can
+&kappname; is a simple snake duel game for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -69,11 +69,12 @@
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 <keyword>KSnake</keyword>
 <keyword>snake</keyword>
+<keyword>duel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -81,7 +82,7 @@
 <title>Introduction</title>
 
 <para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
 &kappname; against the computer or a friend.
 The aim of the game is to live longer than your opponent. To do that,
diff -Naur kdegames-4.3.80.orig/kbattleship/src/kbattleship.desktop kdegames-4.3.80/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.80.orig/kbattleship/src/kbattleship.desktop	2009-11-13 11:56:47.000000000 +0100
+++ kdegames-4.3.80/kbattleship/src/kbattleship.desktop	2009-12-11 15:22:46.275953368 +0100
@@ -1,64 +1,64 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
+Name[af]=KSinkShips
 Name[be]=?????? ???
 Name[bn]=??-??????????
-Name[br]=KBattleship
-Name[ca]=KBattleship
+Name[br]=KSinkShips
+Name[ca]=KSinkShips
 Name[cs]=Lod?
-Name[cy]=KBattleship
-Name[da]=KBattleship
-Name[de]=KBattleship
-Name[el]=KBattleship
-Name[en_GB]=KBattleship
-Name[eo]=KBattleship
-Name[es]=KBattleship
-Name[et]=KBattleship
-Name[eu]=KBattleship
+Name[cy]=KSinkShips
+Name[da]=KSinkShips
+Name[de]=KSinkShips
+Name[el]=KSinkShips
+Name[en_GB]=KSinkShips
+Name[eo]=KSinkShips
+Name[es]=KSinkShips
+Name[et]=KSinkShips
+Name[eu]=KSinkShips
 Name[fa]=???? ???????
-Name[fi]=KBattleship
-Name[fr]=KBattleship
-Name[ga]=KBattleship
-Name[gl]=KBattleship
-Name[he]=KBattleship
+Name[fi]=KSinkShips
+Name[fr]=KSinkShips
+Name[ga]=KSinkShips
+Name[gl]=KSinkShips
+Name[he]=KSinkShips
 Name[hne]=??-???????
 Name[hr]=KPotapanje brodova
-Name[hu]=KBattleship
+Name[hu]=KSinkShips
 Name[is]=KSj?orrusta
-Name[it]=KBattleship
-Name[ja]=KBattleship
-Name[km]=KBattleship
-Name[ko]=KBattleship
-Name[lt]=KBattleship
-Name[lv]=KBattleship
-Name[mk]=KBattleship
-Name[nb]=KBattleship
+Name[it]=KSinkShips
+Name[ja]=KSinkShips
+Name[km]=KSinkShips
+Name[ko]=KSinkShips
+Name[lt]=KSinkShips
+Name[lv]=KSinkShips
+Name[mk]=KSinkShips
+Name[nb]=KSinkShips
 Name[nds]=Scheep versenken
 Name[ne]=????? ?????????
-Name[nl]=KBattleship
-Name[nn]=KBattleship
+Name[nl]=KSinkShips
+Name[nn]=KSinkShips
 Name[pa]=??-???? ?????
-Name[pl]=KBattleship
-Name[pt]=KBattleship
-Name[pt_BR]=KBattleship
+Name[pl]=KSinkShips
+Name[pt]=KSinkShips
+Name[pt_BR]=KSinkShips
 Name[ro]=B?t?lie naval?
-Name[ru]=KBattleship
-Name[se]=KBattleship
-Name[sk]=KBattleship
-Name[sl]=KBattleship
+Name[ru]=KSinkShips
+Name[se]=KSinkShips
+Name[sk]=KSinkShips
+Name[sl]=KSinkShips
 Name[sr]=????????????
 Name[sr at latin]=K?podmornice
-Name[sv]=Kbattleship
+Name[sv]=KSinkShips
 Name[ta]=??????????????
 Name[tg]=K????? ???????
-Name[tr]=KBattleship
+Name[tr]=KSinkShips
 Name[uk]=???????? ???
-Name[vi]=KBattleship
-Name[wa]=KBattleship
-Name[xh]=KBattleship
-Name[x-test]=xxKBattleshipxx
-Name[zh_CN]=KBattleship
-Name[zh_TW]=KBattleship ??
+Name[vi]=KSinkShips
+Name[wa]=KSinkShips
+Name[xh]=KSinkShips
+Name[x-test]=xxKSinkShipsxx
+Name[zh_CN]=KSinkShips
+Name[zh_TW]=KSinkShips ??
 Exec=kbattleship -caption "%c" %U
 MimeType=inode/vnd.kde.service.kbattleship;
 Icon=kbattleship
@@ -81,7 +81,6 @@
 GenericName[fa]=???? ??? ???????
 GenericName[fi]=Meritaistelupeli
 GenericName[fr]=Jeu de bataille navale
-GenericName[ga]=Cluiche cos?il le "Battleship"
 GenericName[gl]=Xogo de batalla naval
 GenericName[he]=???? ??????
 GenericName[hne]=??????? ???
@@ -115,7 +114,7 @@
 GenericName[tr]=Amiral Batt? Oyunu
 GenericName[uk]=??? ? ???????? ???
 GenericName[wa]=Djeu di batreye di bateas
-GenericName[x-test]=xxBattleship Gamexx
+GenericName[x-test]=xxShip Sinking Gamexx
 GenericName[zh_CN]=??????
 GenericName[zh_TW]=????
 Terminal=false
diff -Naur kdegames-4.3.80.orig/kbattleship/src/kbattleship.protocol kdegames-4.3.80/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.80.orig/kbattleship/src/kbattleship.protocol	2009-12-01 01:33:15.000000000 +0100
+++ kdegames-4.3.80/kbattleship/src/kbattleship.protocol	2009-12-11 15:23:40.919703255 +0100
@@ -5,36 +5,36 @@
 output=none
 
 Icon=kbattleship
-Description=A protocol for the game KBattleship
-Description[ca]=Un protocol pel joc KBattleship
-Description[da]=En protokol for spillet KBattleship
-Description[de]=Ein Protokoll f?r das KBattleship-Spiel.
-Description[el]=??? ?????????? ??? ?? ???????? KBattleship
-Description[en_GB]=A protocol for the game KBattleship
-Description[es]=Protocolo para el juego KBattleship
-Description[et]=KBattleshipi protokoll
-Description[eu]=KBattleship jokoaren protokoloa
-Description[fr]=Un protocole pour le jeu KBattleship
-Description[ga]=Pr?tacal le haghaidh an chluiche KBattleship
-Description[gl]=Un protocolo para o xogo KBattleship
-Description[hu]=Protokoll a KBattleship j?t?khoz
-Description[it]=Un protocollo per KBattleship
-Description[lv]=Protokols sp?lei KBattleship
-Description[nds]=En Protokoll f?r dat Speel "KBattleship"
-Description[nl]=Een protocol voor het spel KBattleship
-Description[nn]=Protokoll for KBattleship
-Description[pl]=Protok?? gry KBattleship
-Description[pt]=Um protocolo para o jogo KBattleship
-Description[pt_BR]=Um protocolo para o jogo KBattleship
-Description[ru]=???????? ??? ???? KBattleship
-Description[sl]=Protokol za igro KBattleship
+Description=A protocol for the game KSinkShips
+Description[ca]=Un protocol pel joc KSinkShips
+Description[da]=En protokol for spillet KSinkShips
+Description[de]=Ein Protokoll f?r das KSinkShips-Spiel.
+Description[el]=??? ?????????? ??? ?? ???????? KSinkShips
+Description[en_GB]=A protocol for the game KSinkShips
+Description[es]=Protocolo para el juego KSinkShips
+Description[et]=KSinkShipsi protokoll
+Description[eu]=KSinkShips jokoaren protokoloa
+Description[fr]=Un protocole pour le jeu KSinkShips
+Description[ga]=Pr?tacal le haghaidh an chluiche KSinkShips
+Description[gl]=Un protocolo para o xogo KSinkShips
+Description[hu]=Protokoll a KSinkShips j?t?khoz
+Description[it]=Un protocollo per KSinkShips
+Description[lv]=Protokols sp?lei KSinkShips
+Description[nds]=En Protokoll f?r dat Speel "KSinkShips"
+Description[nl]=Een protocol voor het spel KSinkShips
+Description[nn]=Protokoll for KSinkShips
+Description[pl]=Protok?? gry KSinkShips
+Description[pt]=Um protocolo para o jogo KSinkShips
+Description[pt_BR]=Um protocolo para o jogo KSinkShips
+Description[ru]=???????? ??? ???? KSinkShips
+Description[sl]=Protokol za igro KSinkShips
 Description[sr]=???????? ?? ????????????
 Description[sr at latin]=Protokol za K?podmornice
 Description[sv]=Ett protokoll f?r spelet S?nka fartyg
-Description[uk]=???????? ??? ??? KBattleship
-Description[x-test]=xxA protocol for the game KBattleshipxx
-Description[zh_CN]=KBattleship ??????
-Description[zh_TW]=KBattleship ???????
+Description[uk]=???????? ??? ??? KSinkShips
+Description[x-test]=xxA protocol for the game KSinkShipsxx
+Description[zh_CN]=KSinkShips ??????
+Description[zh_TW]=KSinkShips ???????
 
 helper=true
 Class=:internet
diff -Naur kdegames-4.3.80.orig/kbattleship/src/main.cpp kdegames-4.3.80/kbattleship/src/main.cpp
--- kdegames-4.3.80.orig/kbattleship/src/main.cpp	2009-08-12 11:59:08.000000000 +0200
+++ kdegames-4.3.80/kbattleship/src/main.cpp	2009-12-11 15:22:46.276953531 +0100
@@ -21,8 +21,8 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
-        ki18n("The KDE Battleship clone"), KAboutData::License_GPL, 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
+        ki18n("The KDE sinking ships game"), KAboutData::License_GPL, 
         ki18n("(c) 2000-2005  Nikolas Zimmermann, Daniel Molkentin\n"
               "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
     
@@ -48,7 +48,7 @@
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup"));
+    options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup"));
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KApplication app;
     KGlobal::locale()->insertCatalog("libkdegames");
diff -Naur kdegames-4.3.80.orig/kbattleship/src/message.cpp kdegames-4.3.80/kbattleship/src/message.cpp
--- kdegames-4.3.80.orig/kbattleship/src/message.cpp	2009-01-16 16:08:44.000000000 +0100
+++ kdegames-4.3.80/kbattleship/src/message.cpp	2009-12-11 15:22:46.276953531 +0100
@@ -24,7 +24,7 @@
 : m_protocol_version("0.1.0")
 , m_client_name("KBattleship")
 , m_client_version("4.0")
-, m_client_description("The KDE Battleship clone")
+, m_client_description("The KDE sinking ships game")
 {
 }
 
diff -Naur kdegames-4.3.80.orig/kbattleship/src/playfield.cpp kdegames-4.3.80/kbattleship/src/playfield.cpp
--- kdegames-4.3.80.orig/kbattleship/src/playfield.cpp	2009-03-18 10:57:42.000000000 +0100
+++ kdegames-4.3.80/kbattleship/src/playfield.cpp	2009-12-11 15:22:46.276953531 +0100
@@ -251,7 +251,7 @@
 void PlayField::setCompatibility(int level)
 {
     if (level == Entity::COMPAT_KBS3) {
-        KMessageBox::information(this, i18n("Your opponent is using a pre-KDE4 version of KBattleship. Note that, according to the rules enforced by old clients, ships cannot be placed adjacent to one another."));
+        KMessageBox::information(this, i18n("Your opponent is using a pre-KDE4 version of KSinkShips. Note that, according to the rules enforced by old clients, ships cannot be placed adjacent to one another."));
     }
 }
 
diff -Naur kdegames-4.3.80.orig/ktron/general.ui kdegames-4.3.80/ktron/general.ui
--- kdegames-4.3.80.orig/ktron/general.ui	2009-05-06 12:13:13.000000000 +0200
+++ kdegames-4.3.80/ktron/general.ui	2009-12-11 15:22:46.276953531 +0100
@@ -39,12 +39,12 @@
           <widget class="KComboBox" name="kcfg_GameType">
            <item>
             <property name="text">
-             <string>KTron: Player vs Computer</string>
+             <string>KSnakeDuel: Player vs Computer</string>
             </property>
            </item>
            <item>
             <property name="text">
-             <string>KTron: Player vs Player</string>
+             <string>KSnakeDuel: Player vs Player</string>
             </property>
            </item>
            <item>
diff -Naur kdegames-4.3.80.orig/ktron/ktron.desktop kdegames-4.3.80/ktron/ktron.desktop
--- kdegames-4.3.80.orig/ktron/ktron.desktop	2009-12-01 01:33:02.000000000 +0100
+++ kdegames-4.3.80/ktron/ktron.desktop	2009-12-11 15:25:13.784828694 +0100
@@ -3,87 +3,14 @@
 Exec=ktron -caption "%c" %i
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[ca]=Joc similar al Tron
-GenericName[cs]=Hra typu Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=?Tron?-Spiel
-GenericName[el]=???????? ???????? ?? ?? Tron
-GenericName[en_GB]=Tron-like Game
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Troni moodi m?ng
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[ga]=Cluiche Cos?il le Tron
-GenericName[gl]=Xogo similar ao Tron
-GenericName[hu]=Tron-szer? j?t?k
-GenericName[it]=Un gioco simile a Tron
-GenericName[ja]=Tron ???????
-GenericName[lv]=Tron l?dz?ga sp?le
-GenericName[nds]=Tron-liek Speel
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra podobna do Tron
-GenericName[pt]=Jogo Semelhante ao Tron
-GenericName[pt_BR]=Jogo semelhante ao Tron
-GenericName[ru]=???? ? ????? ??????
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=???? ????? ?? ????
-GenericName[sr at latin]=Igra nalik na tron
-GenericName[sv]=Tron-liknande spel
-GenericName[uk]=???, ????? ?? Tron
-GenericName[x-test]=xxTron-like Gamexx
-GenericName[zh_CN]=?? Tron ???
-GenericName[zh_TW]=?? Tron ??
+GenericName=Snake Duel Game
+GenericName[de]=Schlangenduell-Spiel
+GenericName[fr]=Jeu de duel de serpents
+GenericName[it]=Gioco di duello di serpenti
+GenericName[x-test]=xxSnake Duel Gamexx
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[bn]=??-????
-Name[br]=KTron
-Name[ca]=KTron
-Name[cs]=KTron
-Name[cy]=KTron
-Name[da]=KTron
-Name[de]=KTron
-Name[el]=KTron
-Name[en_GB]=KTron
-Name[es]=KTron
-Name[et]=KTron
-Name[eu]=KTron
-Name[fr]=KTron
-Name[ga]=KTron
-Name[gl]=KTron
-Name[he]=KTron
-Name[hr]=KTron
-Name[hu]=KTron
-Name[is]=KTron
-Name[it]=KTron
-Name[ja]=KTron
-Name[lv]=KTron
-Name[mk]=KTron
-Name[nds]=KTron
-Name[nl]=KTron
-Name[nn]=KTron
-Name[pl]=KTron
-Name[pt]=KTron
-Name[pt_BR]=KTron
-Name[ro]=KTron
-Name[ru]=????
-Name[sk]=KTron
-Name[sl]=KTron
-Name[sr]=??????
-Name[sr at latin]=K?tron
-Name[sv]=Ktron
-Name[ta]=K??????
-Name[tg]=K????
-Name[tr]=KTron
-Name[uk]=KTron
-Name[vi]=KTron
-Name[wa]=KTron
-Name[xh]=KTron
-Name[x-test]=xxKTronxx
-Name[zh_CN]=KTron
-Name[zh_TW]=KTron
+Name=KSnakeDuel
+Name[x-test]=xxKSnakeDuelxx
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -Naur kdegames-4.3.80.orig/ktron/main.cpp kdegames-4.3.80/ktron/main.cpp
--- kdegames-4.3.80.orig/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.3.80/ktron/main.cpp	2009-12-11 15:22:46.277953226 +0100
@@ -41,7 +41,7 @@
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", 0, ki18n("KTron"), 
+  KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@
   KCmdLineArgs::init( argc, argv, &aboutData );
 
   KCmdLineOptions options;
-  options.add("ktron", ki18n("Start in KTron mode"));
+  // This is the default anyway, why does this need an option? -- Kevin Kofler
+  // options.add("ktron", ki18n("Start in KTron mode"));
   options.add("snake", ki18n("Start in KSnake mode"));
   KCmdLineArgs::addCmdLineOptions(options);
 
diff -Naur kdegames-4.3.80.orig/ktron/player.cpp kdegames-4.3.80/ktron/player.cpp
--- kdegames-4.3.80.orig/ktron/player.cpp	2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.80/ktron/player.cpp	2009-12-11 15:22:46.278953446 +0100
@@ -92,7 +92,7 @@
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -Naur kdegames-4.3.80.orig/ktron/snakepart.cpp kdegames-4.3.80/ktron/snakepart.cpp
--- kdegames-4.3.80.orig/ktron/snakepart.cpp	2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.80/ktron/snakepart.cpp	2009-12-11 15:22:46.278953446 +0100
@@ -120,11 +120,11 @@
 	// Player
 	if (getPlayerNumber() == 0)
 	{
-		name = "tron1-";
+		name = "snake1-";
 	}
 	else if (getPlayerNumber() == 1)
 	{
-		name = "tron2-";
+		name = "snake2-";
 	}
 
 	// Heads (or tails)
diff -Naur kdegames-4.3.80.orig/README kdegames-4.3.80/README
--- kdegames-4.3.80.orig/README	2009-11-02 13:00:47.000000000 +0100
+++ kdegames-4.3.80/README	2009-12-11 15:22:46.278953446 +0100
@@ -28,9 +28,6 @@
     Play backgammon against a local human player, via a game server or
     against GNU Backgammon (not included)
 
-* kbattleship
-    Sink battleship of your opponents, with built-in game server.
-
 * kblackbox
     Find the balls hidden in the black box by shooting laser beams!
 
@@ -73,6 +70,15 @@
 * kshisen
     Patience game where you take away all pieces.
 
+* ksinkships
+    Sink ships of your opponents, with built-in game server.
+
+* ksnake
+    Don't bite yourself, eat apples!
+
+* ksnakeduel
+    Like ksnake, but without fruits.
+
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- kdegames.spec	2 Dec 2009 13:07:56 -0000	1.152
+++ kdegames.spec	11 Dec 2009 14:27:45 -0000	1.153
@@ -104,7 +104,7 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
-%patch0 -p1 -b .trademarks
+# %patch0 -p1 -b .trademarks
 
 %build
 # trademarks issue in RHEL


--- kdegames-4.3.3-trademarks.patch DELETED ---


--- kdegames-4.3.75-trademarks.patch DELETED ---



From than at fedoraproject.org  Fri Dec 11 14:29:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Dec 2009 14:29:33 +0000 (UTC)
Subject: rpms/doxygen/F-12 doxygen.spec,1.70,1.71
Message-ID: <20091211142933.EA64011C00C5@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10690

Modified Files:
	doxygen.spec 
Log Message:
 bz#225709, merged review




Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-12/doxygen.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- doxygen.spec	25 Aug 2009 12:57:26 -0000	1.70
+++ doxygen.spec	11 Dec 2009 14:29:33 -0000	1.71
@@ -3,10 +3,10 @@
 %define qt_version 4.4
 %{!?with_qt:%define with_qt 1}
 
-Summary: A documentation system for C/C++.
+Summary: A documentation system for C/C++
 Name: doxygen
 Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
@@ -81,6 +81,13 @@ make install DESTDIR=%{buildroot}
   rm -rf %{buildroot}%{_mandir}/man1/doxywizard*
 %endif
 
+# convert into utf-8
+iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
+touch -r LANGUAGE.HOWTO.new && mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
+
+# drop -x bit
+find examples -type f | xargs chmod -x
+
 %clean
 rm -rf %{buildroot}
 
@@ -101,6 +108,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Dec 11 2009 Than Ngo <than at redhat.com> - 1:1.6.1-2
+- bz#225709, merged review 
+
 * Tue Aug 25 2009 Than Ngo <than at redhat.com> - 1.6.1-1
 - 1.6.1
 



From rdieter at fedoraproject.org  Fri Dec 11 14:30:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 14:30:33 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.176,1.177
Message-ID: <20091211143033.2182811C02CA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11242

Modified Files:
	amarok.spec 
Log Message:
bump taglib-extras dep



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- amarok.spec	10 Dec 2009 16:36:44 -0000	1.176
+++ amarok.spec	11 Dec 2009 14:30:32 -0000	1.177
@@ -33,7 +33,7 @@ BuildRequires: mysql-embedded-devel
 BuildRequires: qca2-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
-BuildRequires: taglib-extras-devel >= 1.0.0
+BuildRequires: taglib-extras-devel >= 1.0.1
 
 %global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings



From rdieter at fedoraproject.org  Fri Dec 11 14:31:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 14:31:10 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.203,1.204
Message-ID: <20091211143110.7F33411C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11474

Modified Files:
	kdeutils.spec 
Log Message:
drop short-lived -devel subpkg



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- kdeutils.spec	2 Dec 2009 14:47:28 -0000	1.203
+++ kdeutils.spec	11 Dec 2009 14:31:10 -0000	1.204
@@ -78,15 +78,6 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
-%package devel
-Summary:  Development files for %{name}
-Group:    Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-# TODO: what other stuff might be needed?
-Requires: kdelibs4-devel%{?_isa} >= %{version}
-%description devel
-%{summary}.
-
 %package printer-applet
 Summary:  KDE printer applet
 Group:    Applications/System
@@ -98,7 +89,7 @@ Requires: system-config-printer-libs
 
 
 %prep
-%setup -q -n kdeutils-%{version}%{?alphatag}
+%setup -q -n kdeutils-%{version}
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
@@ -217,10 +208,10 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_includedir}/KDE/Kasten/
-%{_kde4_includedir}/KDE/Okteta/
-%{_kde4_includedir}/kasten/
-%{_kde4_includedir}/okteta/
+#{_kde4_includedir}/KDE/Kasten/
+#{_kde4_includedir}/KDE/Okteta/
+#{_kde4_includedir}/kasten/
+#{_kde4_includedir}/okteta/
 %{_kde4_libdir}/lib*.so
 
 %if 0%{?printer_applet}



From jcollie at fedoraproject.org  Fri Dec 11 14:34:11 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 11 Dec 2009 14:34:11 +0000 (UTC)
Subject: File pitivi-0.13.3-837f0d73.tar.bz2 uploaded to lookaside cache by
	jcollie
Message-ID: <20091211143411.408C410F89D@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for pitivi:

0502329cf1d2dfc0f9a5dd25d8bb61d4  pitivi-0.13.3-837f0d73.tar.bz2



From jcollie at fedoraproject.org  Fri Dec 11 14:35:18 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 11 Dec 2009 14:35:18 +0000 (UTC)
Subject: rpms/pitivi/devel .cvsignore, 1.20, 1.21 pitivi.spec, 1.43,
	1.44 sources, 1.20, 1.21
Message-ID: <20091211143518.46C5711C00C5@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12756

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Fri Dec 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3.3.837f0d73
- Make sure we have the correct source uploaded.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	11 Dec 2009 14:20:02 -0000	1.20
+++ .cvsignore	11 Dec 2009 14:35:17 -0000	1.21
@@ -1,2 +1,2 @@
-pitivi-0.13.3-837f0d7.tar.bz2
+pitivi-0.13.3-837f0d73.tar.bz2
 common-888e0a26.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- pitivi.spec	11 Dec 2009 14:20:02 -0000	1.43
+++ pitivi.spec	11 Dec 2009 14:35:17 -0000	1.44
@@ -4,7 +4,7 @@
 %define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        3.2.%{pitivi_git}%{?dist}
+Release:        3.3.%{pitivi_git}%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -13,7 +13,6 @@ URL:            http://www.pitivi.org/
 
 #Source0:        http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}-%{pitivi_git}.tar.bz2
 
-
 # To generate the source tarballs:
 #
 # git clone git://git.pitivi.org/git/pitivi.git
@@ -97,6 +96,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Fri Dec 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3.3.837f0d73
+- Make sure we have the correct source uploaded.
+
 * Thu Dec 10 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3.2.837f0d73
 - Update to git master to see if this fixes anyone's problems
 - Call update-desktop-database/update-mime-database in post/postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	11 Dec 2009 14:20:02 -0000	1.20
+++ sources	11 Dec 2009 14:35:18 -0000	1.21
@@ -1,2 +1,2 @@
-f27d71f12f0cf0c2abf8e5eeda9d0c40  pitivi-0.13.3-837f0d7.tar.bz2
+0502329cf1d2dfc0f9a5dd25d8bb61d4  pitivi-0.13.3-837f0d73.tar.bz2
 cb52781416d89653b9168f24fa2f9ca0  common-888e0a26.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 11 14:36:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 14:36:00 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.204,1.205
Message-ID: <20091211143600.692E911C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11705

Modified Files:
	kdeutils.spec 
Log Message:
drop more -devel bits



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- kdeutils.spec	11 Dec 2009 14:31:10 -0000	1.204
+++ kdeutils.spec	11 Dec 2009 14:36:00 -0000	1.205
@@ -206,14 +206,6 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 
-%files devel
-%defattr(-,root,root,-)
-#{_kde4_includedir}/KDE/Kasten/
-#{_kde4_includedir}/KDE/Okteta/
-#{_kde4_includedir}/kasten/
-#{_kde4_includedir}/okteta/
-%{_kde4_libdir}/lib*.so
-
 %if 0%{?printer_applet}
 %files printer-applet
 %defattr(-,root,root,-)



From sgallagh at fedoraproject.org  Fri Dec 11 14:37:02 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 11 Dec 2009 14:37:02 +0000 (UTC)
Subject: rpms/sssd/F-12 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 sssd.spec,
	1.28, 1.29
Message-ID: <20091211143702.8738D11C00C5@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13373

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
David O'Brien (1):
 * Copy-edit sssd-ipa man page

Dmitri Pal (5):
 * COMMON Improvements to the trace macro
 * COLLECTION Create reference to the top level collection
 * COLLECTION: Cleaning FIXME comments
 * INI: Cleaning FIXME comments.
 * INI Correcting build warnings.

Fabian Affolter (1):
 * Add German translation

G?ran Uddeborg (2):
 * Add Swedish translation for sss_client
 * Add Swedish translation for SSSD server

Jakub Hrozek (13):
 * Warn visibly about permission problems with the config file
 * Better error message when there is no local domain configured
 * Setup ldap child logging from IPA backend
 * Check the services started against a list of known services
 * Handle spaces in config parser
 * Fail on nonexistent input file
 * Do not start with provider=files
 * Reduce code duplication between LDAP child and Kerberos child
 * Change ares usage to be c-ares 1.7.0 compatible
 * Import ares 1.7.0 helpers
 * Don't build the SRV and TXT parsing code except for tests
 * Document the failover feature in manpages
 * Consolidate code for splitting strings by separator

Martin Nagy (3):
 * Fix egg-info file generation in the spec file
 * Add some debugging statements to fail_over and resolver
 * Correctly restart server status after the timeout

Simo Sorce (17):
 * Fix tabs
 * Fix memberof plugin
 * Compute and save memberuid in cache as well
 * Use memberuid and not member in group enumerations
 * Use the custom password field in groups too.
 * Resolve nested groups also when rfc2307bis is used
 * Make strdn build functions more available
 * Fix nested group memberships
 * Allow nesting to fix #310
 * Fix bug #311, properly set callback attribute
 * Change dhash API to be talloc-friendly
 * dhash: Add private pointer for delete callback
 * Add comments to document latest changes
 * Add rebuild task to memberof plugin
 * Handle the special 02 upgrade case for 04->05
 * Fix for #316
 * Fix for #322, update from old database versions.

Stephen Gallagher (28):
 * Remove ELAPI from build and tarball
 * Stop configuring ELAPI
 * Make debug log timestamps human-readable
 * Raise debug log level for LDB_DEBUG_WARNING
 * Add allocation error check
 * Avoid returning uninitialized result.
 * Fix potential uninitialized value errors in nsssrv_cmd.c
 * Fix potential uninitialized value error in responder_dp.c
 * SSSDDomain.remove_provider() requires only the provider type
 * Make SSSDDomain.remove_provider() remove configured options
 * Run dhash tests
 * Add SSSDDomain.set_name() function to SSSDConfig API
 * Reduce the verbosity of the SSSDConfigTest
 * Fix broken SSSDChangeConf.set() function
 * Fix SSSDConfig API bugs around [de-]activation of domains
 * Fix RPM spec for RHEL6
 * SSSDConfig API: fix deactivate_domain()
 * SSSDConfig.get_domain() should properly detect active state
 * Ensure that list_active_domains returns the real value
 * Properly deny id_provider=files
 * Add missing options to sssd-ipa configuraion
 * Add missing SSSDConfig file for IPA for make install
 * Fix processing of Boolean values in SSSDConfig
 * Add 'permit' and 'deny' access providers to SSSDConfig API
 * Remove default for ldap_use_start_tls in IPA providers
 * Run SSSDConfig tests during 'make check'
 * Fix stupid copy-paste error
 * Updating to version 0.99.1

Sumit Bose (13):
 * Do not include libsss_ipa.la in rpm package
 * Immediately return a krb5 change password request when offline
 * Check LDAP structure before calling ldap_unbind_ext()
 * Add sysdb_search_custom request
 * Do not treat missing proc files as errors.
 * Add basic OS detection
 * Make packaging of *.egg-info files more flexible
 * Try to renew Kerberos credentials
 * Add checks to test the memberuid handling
 * Add offline support for ipa_access
 * Add dummy credentials to an empty ccache file
 * Always update sysdb to the latest version
 * Fix DEBUG message for sysdb_init

beckerde (1):
 * Add Spanish translation

ruigo (1):
 * Add Portuguese translation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	30 Nov 2009 16:08:02 -0000	1.14
+++ .cvsignore	11 Dec 2009 14:37:02 -0000	1.15
@@ -1 +1 @@
-sssd-0.99.0.tar.gz
+sssd-0.99.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	30 Nov 2009 16:08:03 -0000	1.15
+++ sources	11 Dec 2009 14:37:02 -0000	1.16
@@ -1 +1 @@
-c3209c97adb1d8dcbd6d5fd1f3562116  sssd-0.99.0.tar.gz
+00468f7fe1b75e53cc3c1027f2a92902  sssd-0.99.1.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sssd.spec	30 Nov 2009 16:08:03 -0000	1.28
+++ sssd.spec	11 Dec 2009 14:37:02 -0000	1.29
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.99.0
+Version: 0.99.1
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -37,7 +37,12 @@ BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: m4
 %{?fedora:BuildRequires: popt-devel}
-%{?rhel:BuildRequires: popt}
+%if 0%{?rhel} <= 5
+BuildRequires: popt
+%endif
+%if 0%{?rhel} >= 6
+BuildRequires: popt-devel
+%endif
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
 BuildRequires: libtdb-devel
@@ -120,6 +125,10 @@ then
     # Older versions of rpmbuild can only handle one -f option
     echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang
 fi
+for file in `ls $RPM_BUILD_ROOT/%{python_sitelib}/*.egg-info 2> /dev/null`
+do
+    echo %{python_sitelib}/`basename $file` >> sss_daemon.lang
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -163,7 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sssd_krb5_locator_plugin.8*
 %{python_sitearch}/pysss.so
 %{python_sitelib}/*.py*
-%{?fedora:%{python_sitelib}/*.egg-info}
 
 
 %files client -f sss_client.lang
@@ -197,6 +205,9 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 11 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.1-1
+- New upstream bugfix release 0.99.1
+
 * Mon Nov 30 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.0-1
 - New upstream release 0.99.0
 



From jnovy at fedoraproject.org  Fri Dec 11 14:45:39 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 11 Dec 2009 14:45:39 +0000 (UTC)
Subject: rpms/latex2html/devel latex2html.spec,1.13,1.14
Message-ID: <20091211144539.2299911C00C5@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/latex2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16662

Modified Files:
	latex2html.spec 
Log Message:
* Fri Dec 11 2009 Jindrich Novy <jnovy at redhat.com> 2008-4
- require netpbm-progs
- review fixes (#225980):
  - include documentation
  - set executable bit for makeseg and makemap scripts
  - white-space spec correction
  - move docs and example directory to %doc
  - nuke duplicated stuff



Index: latex2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2html/devel/latex2html.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- latex2html.spec	25 Jul 2009 04:59:04 -0000	1.13
+++ latex2html.spec	11 Dec 2009 14:45:38 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: Converts LaTeX documents to HTML
 Name: latex2html
 Version: 2008
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://www.latex2html.org/
@@ -19,7 +19,7 @@ Patch3: latex2html-2K.1beta-DB.patch
 Patch4: latex2html-2002-2-1-SHLIB.patch
 Patch5: latex2html-2002-2-1-gsfont.patch
 Patch6: latex2html-2002.2.1-grayimg.patch
-Requires: tex(latex), tex(dvips)
+Requires: tex(latex), tex(dvips), netpbm-progs
 BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm >= 9.21, tex(latex)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -55,6 +55,8 @@ pushd %{name}-%{version}
 for i in Dos Mac OS2 Win32; do
   rm -f L2hos/${i}.pm
 done
+rm -rf cweb2html
+rm -f readme.hthtml
 popd
 
 %if %{enable_japanese}
@@ -75,22 +77,22 @@ pushd %{name}-%{version}
 cp %{SOURCE1} cfgcache.pm
 tar fxz %{SOURCE2}
 
-./configure  --program-prefix=%{?_program_prefix} \
-             --prefix=%{_prefix} \
-             --exec-prefix=%{_exec_prefix} \
-             --bindir=%{_bindir} \
-             --sbindir=%{_sbindir} \
-             --sysconfdir=%{_sysconfdir} \
-             --datadir=%{_datadir} \
-             --includedir=%{_includedir} \
-             --libdir=%{_datadir}/latex2html \
-             --libexecdir=%{_libexecdir} \
-             --localstatedir=%{_localstatedir} \
-             --sharedstatedir=%{_sharedstatedir} \
-             --mandir=%{_mandir} \
-             --infodir=%{_infodir} \
-	     --shlibdir=%{_datadir}/latex2html \
-	     --with-texpath=%{_datadir}/texmf/tex/latex/html
+./configure	--program-prefix=%{?_program_prefix} \
+		--prefix=%{_prefix} \
+		--exec-prefix=%{_exec_prefix} \
+		--bindir=%{_bindir} \
+		--sbindir=%{_sbindir} \
+		--sysconfdir=%{_sysconfdir} \
+		--datadir=%{_datadir} \
+		--includedir=%{_includedir} \
+		--libdir=%{_datadir}/latex2html \
+		--libexecdir=%{_libexecdir} \
+		--localstatedir=%{_localstatedir} \
+		--sharedstatedir=%{_sharedstatedir} \
+		--mandir=%{_mandir} \
+		--infodir=%{_infodir} \
+		--shlibdir=%{_datadir}/latex2html \
+		--with-texpath=%{_datadir}/texmf/tex/latex/html
 
 perl -pi -e"s,/usr/(share/)?lib,%{_datadir}," cfgcache.pm
 make
@@ -102,56 +104,58 @@ sed s/latex2html/jlatex2html/g < %{SOURC
 perl -pi -e"s,/usr/bin/dvips,/usr/bin/pdvips," cfgcache.pm
 perl -pi -e"s,/usr/bin/latex,/usr/bin/platex," cfgcache.pm
 
-./configure  --program-prefix=%{?_program_prefix} \
-             --prefix=%{_prefix} \
-             --exec-prefix=%{_exec_prefix} \
-             --bindir=%{_bindir} \
-             --sbindir=%{_sbindir} \
-             --sysconfdir=%{_sysconfdir} \
-             --datadir=%{_datadir} \
-             --includedir=%{_includedir} \
-             --libdir=%{_datadir}/jlatex2html \
-             --libexecdir=%{_libexecdir} \
-             --localstatedir=%{_localstatedir} \
-             --sharedstatedir=%{_sharedstatedir} \
-             --mandir=%{_mandir} \
-             --infodir=%{_infodir} \
-	     --shlibdir=%{_datadir}/jlatex2html \
-	     --with-texpath=%{_datadir}/texmf/tex/latex/html
+./configure	--program-prefix=%{?_program_prefix} \
+		--prefix=%{_prefix} \
+		--exec-prefix=%{_exec_prefix} \
+		--bindir=%{_bindir} \
+		--sbindir=%{_sbindir} \
+		--sysconfdir=%{_sysconfdir} \
+		--datadir=%{_datadir} \
+		--includedir=%{_includedir} \
+		--libdir=%{_datadir}/jlatex2html \
+		--libexecdir=%{_libexecdir} \
+		--localstatedir=%{_localstatedir} \
+		--sharedstatedir=%{_sharedstatedir} \
+		--mandir=%{_mandir} \
+		--infodir=%{_infodir} \
+		--shlibdir=%{_datadir}/jlatex2html \
+		--with-texpath=%{_datadir}/texmf/tex/latex/html
 
 perl -pi -e"s,/usr/(share/)?lib,%{_datadir},;
-            s,%{_datadir}/latex2html,%{_datadir}/jlatex2html," cfgcache.pm
+	    s,%{_datadir}/latex2html,%{_datadir}/jlatex2html," cfgcache.pm
 make
-perl -pi -e"s,${RPM_BUILD_ROOT},," l2hconf.pm
 perl -pi -e"s,\\\${dd}pstoimg,\\\${dd}jpstoimg, ;
-	   s,\\\${dd}texexpand,\\\${dd}jtexexpand," l2hconf.pm
+	    s,\\\${dd}texexpand,\\\${dd}jtexexpand," l2hconf.pm
 
 for i in latex2html pstoimg texexpand ; do
-  mv ${i} j${i}
+	mv ${i} j${i}
 done
 popd
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 pushd %{name}-%{version}
-perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm
+perl -pi -e"s,%{_prefix},%{buildroot}%{_prefix}," cfgcache.pm
 perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/texexpand,;
-            s,/.*\\\${dd}pstoimg,%{_bindir}/pstoimg,;
-            s,/.*\\\${dd}*icons,\\\${LATEX2HTMLDIR}/icons,;
-            s,/.*\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,;
-            s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," latex2html
-perl -pi -e"s,$RPM_BUILD_ROOT,," l2hconf.pm
+	    s,/.*\\\${dd}pstoimg,%{_bindir}/pstoimg,;
+	    s,/.*\\\${dd}*icons,\\\${LATEX2HTMLDIR}/icons,;
+	    s,/.*\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,;
+	    s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," latex2html
+perl -pi -e"s,%{buildroot},," l2hconf.pm
 
 make install
 rm -f %{buildroot}%{_datadir}/latex2html/versions/table.pl.orig
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_datadir}/latex2html/cfgcache.pm
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/pstoimg
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/texexpand
-perl -pi -e"s,$RPM_BUILD_ROOT,," cfgcache.pm
+rm -rf %{buildroot}%{_datadir}/latex2html/docs/
+rm -rf %{buildroot}%{_datadir}/latex2html/example/
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_datadir}/latex2html/cfgcache.pm
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_bindir}/pstoimg
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_bindir}/texexpand
+perl -pi -e"s,%{buildroot},," cfgcache.pm
 perl -pi -e"s,$cfg{'GS_LIB'} = q'';,$cfg{'GS_LIB'} = q'%{_datadir}/ghostscript/`ghostscript --version`';," cfgcache.pm
 install -m0644 *.pm %{buildroot}%{_datadir}/latex2html
+chmod +x %{buildroot}%{_datadir}/latex2html/makeseg/makeseg %{buildroot}%{_datadir}/latex2html/makemap
 
 # install man pages
 mkdir -p %{buildroot}%{_mandir}/man1
@@ -160,35 +164,38 @@ popd
 
 %if %{enable_japanese}
 pushd %{name}-%{version}JA
-perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm
+perl -pi -e"s,%{_prefix},%{buildroot}%{_prefix}," cfgcache.pm
 perl -pi -e"s,latex2html pstoimg texexpand,jlatex2html jpstoimg jtexexpand," config/install.pl
 perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/jtexexpand,;
-            s,/.*\\\${dd}pstoimg,%{_bindir}/jpstoimg,;
-            s,/.*\\\${dd}icons,\\\${LATEX2HTMLDIR}/icons,;
-            s,/.*\\\${dd}styles\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,;
-            s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," jlatex2html
-perl -pi -e"s,$RPM_BUILD_ROOT,," l2hconf.pm
+	    s,/.*\\\${dd}pstoimg,%{_bindir}/jpstoimg,;
+	    s,/.*\\\${dd}icons,\\\${LATEX2HTMLDIR}/icons,;
+	    s,/.*\\\${dd}styles\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,;
+	    s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," jlatex2html
+perl -pi -e"s,%{buildroot},," l2hconf.pm
 
 make install
 rm -f %{buildroot}%{_datadir}/jlatex2html/versions/table.pl.orig
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_datadir}/jlatex2html/cfgcache.pm
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/jpstoimg
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/jtexexpand
-perl -pi -e"s,$RPM_BUILD_ROOT,," cfgcache.pm
+rm -rf %{buildroot}%{_datadir}/jlatex2html/docs/
+rm -rf %{buildroot}%{_datadir}/jlatex2html/example/
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_datadir}/jlatex2html/cfgcache.pm
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_bindir}/jpstoimg
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_bindir}/jtexexpand
+perl -pi -e"s,%{buildroot},," cfgcache.pm
 perl -pi -e"s,$cfg{'GS_LIB'} = q'';,$cfg{'GS_LIB'} = q'%{_datadir}/ghostscript/`ghostscript --version`';," cfgcache.pm
 install -m0644 *.pm %{buildroot}%{_datadir}/jlatex2html
+chmod +x %{buildroot}%{_datadir}/jlatex2html/makeseg/makeseg %{buildroot}%{_datadir}/jlatex2html/makemap
 popd
 %endif
 
 for f in cweb2html/cweb2html makeseg/makeseg makemap ; do
-   perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," $RPM_BUILD_ROOT%{_datadir}/latex2html/$f
+	perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," %{buildroot}%{_datadir}/latex2html/$f
 %if %{enable_japanese}
-   perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," $RPM_BUILD_ROOT%{_datadir}/jlatex2html/$f
+	perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," %{buildroot}%{_datadir}/jlatex2html/$f
 %endif
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
@@ -198,6 +205,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc latex2html-2008/{LICENSE,LICENSE.orig,README,FAQ,BUGS,docs,example}
 %{_bindir}/latex2html
 %{_bindir}/pstoimg
 %{_bindir}/texexpand
@@ -219,6 +227,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pstoimg.*
 
 %changelog
+* Fri Dec 11 2009 Jindrich Novy <jnovy at redhat.com> 2008-4
+- require netpbm-progs
+- review fixes (#225980):
+  - include documentation
+  - set executable bit for makeseg and makemap scripts
+  - white-space spec correction
+  - move docs and example directory to %%doc
+  - nuke duplicated stuff
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Fri Dec 11 14:50:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 14:50:58 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec, 1.267,
	1.268 kdebindings-4.2.85-old-PyQt4.patch, 1.2,
	NONE kdebindings-4.3.3-qt46.patch, 1.5, NONE
Message-ID: <20091211145058.CE2B011C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18272

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.2.85-old-PyQt4.patch 
	kdebindings-4.3.3-qt46.patch 
Log Message:
take out a few patches, try again



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- kdebindings.spec	11 Dec 2009 14:11:00 -0000	1.267
+++ kdebindings.spec	11 Dec 2009 14:50:58 -0000	1.268
@@ -64,12 +64,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 # patch to disable examples (trouble with them installing to the buildroot)
 Patch0:  kdebindings-qyoto-examples.patch
-# workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
-Patch1:  kdebindings-4.2.85-old-PyQt4.patch
 # fix build with CMAKE_SKIP_RPATH - also needs sed line below
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
 Patch2:  kdebindings-4.3.75-no-rpath.patch
+# or
+%define _cmake_skip_rpath %{nil}
 
 ## upstream patches
 
@@ -278,13 +278,12 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
 %patch0
-%patch1 -p0 -b .old-PyQt4
 
 # upstream patches
 
 # do the no-rpath hack last, after the upstream backports (if any)
-%patch2 -p1 -b .no-rpath
-sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
+#patch2 -p1 -b .no-rpath
+#sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
 
 
 %build


--- kdebindings-4.2.85-old-PyQt4.patch DELETED ---


--- kdebindings-4.3.3-qt46.patch DELETED ---



From pbrobinson at fedoraproject.org  Fri Dec 11 14:57:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 11 Dec 2009 14:57:23 +0000 (UTC)
Subject: rpms/geoclue/devel geoclue.spec,1.19,1.20
Message-ID: <20091211145724.03D3411C00C5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19859

Modified Files:
	geoclue.spec 
Log Message:
- typo fix


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- geoclue.spec	26 Oct 2009 13:09:52 -0000	1.19
+++ geoclue.spec	11 Dec 2009 14:57:23 -0000	1.20
@@ -192,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Oct 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.9
-- New git snapshit, enable NetworkManager support for WiFi location, gsmloc and new Skyhook plugin
+- New git snapshot, enable NetworkManager support for WiFi location, gsmloc and new Skyhook plugin
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1.1-0.8.20090310git3a31d26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From rdieter at fedoraproject.org  Fri Dec 11 15:01:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 15:01:18 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.205,1.206
Message-ID: <20091211150118.D04C311C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20827

Modified Files:
	kdeutils.spec 
Log Message:
unpackaged files



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- kdeutils.spec	11 Dec 2009 14:36:00 -0000	1.205
+++ kdeutils.spec	11 Dec 2009 15:01:18 -0000	1.206
@@ -112,7 +112,8 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # nothing should build against these
-rm -f %{buildroot}%{_kde4_libdir}/libokteta{core,gui}.so
+rm -f %{buildroot}%{_kde4_libdir}/libkasten{controllers,core,gui}.so
+rm -f %{buildroot}%{_kde4_libdir}/libokteta{core,gui,kastencontrollers,kastencore,kastengui}.so
 rm -f %{buildroot}%{_kde4_libdir}/libkdelirc_shared.so
 rm -f %{buildroot}%{_kde4_libdir}/libkerfuffle.so
 rm -f %{buildroot}%{_kde4_libdir}/libkmilo.so



From rdieter at fedoraproject.org  Fri Dec 11 15:05:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 15:05:23 +0000 (UTC)
Subject: rpms/gc/devel gc-7.2alpha4-install_dups.patch,NONE,1.1
Message-ID: <20091211150523.E108A11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22017

Added Files:
	gc-7.2alpha4-install_dups.patch 
Log Message:
import


gc-7.2alpha4-install_dups.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gc-7.2alpha4-install_dups.patch ---
diff -up gc-7.2alpha4/libatomic_ops/doc/Makefile.am.install_dups gc-7.2alpha4/libatomic_ops/doc/Makefile.am
--- gc-7.2alpha4/libatomic_ops/doc/Makefile.am.install_dups	2009-09-29 08:41:50.000000000 -0500
+++ gc-7.2alpha4/libatomic_ops/doc/Makefile.am	2009-12-11 07:31:08.816754621 -0600
@@ -1,3 +1,3 @@
 # installed documentation
 #
-dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
+dist_pkgdata_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt
diff -up gc-7.2alpha4/libatomic_ops/doc/Makefile.in.install_dups gc-7.2alpha4/libatomic_ops/doc/Makefile.in
--- gc-7.2alpha4/libatomic_ops/doc/Makefile.in.install_dups	2009-12-11 07:28:57.584740154 -0600
+++ gc-7.2alpha4/libatomic_ops/doc/Makefile.in	2009-12-11 07:31:44.285741617 -0600
@@ -177,7 +177,7 @@ top_srcdir = @top_srcdir@
 
 # installed documentation
 #
-dist_pkgdata_DATA = COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
+dist_pkgdata_DATA = COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt
 all: all-am
 
 .SUFFIXES:



From rdieter at fedoraproject.org  Fri Dec 11 15:12:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 15:12:47 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.217,1.218
Message-ID: <20091211151247.9864611C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24153

Modified Files:
	kdeedu.spec 
Log Message:
fix %files



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- kdeedu.spec	11 Dec 2009 14:26:46 -0000	1.217
+++ kdeedu.spec	11 Dec 2009 15:12:47 -0000	1.218
@@ -402,6 +402,7 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/kturtle
 %{_kde4_docdir}/HTML/en/kwordquiz/
 %{_kde4_docdir}/HTML/en/parley/
+%{_kde4_docdir}/HTML/en/rocs/
 %{_kde4_docdir}/HTML/en/step/
 
 %{_kde4_iconsdir}/hicolor/*/*/blinken.*



From rdieter at fedoraproject.org  Fri Dec 11 15:25:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 15:25:20 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel kdepim-runtime.spec,1.15,1.16
Message-ID: <20091211152520.CC98511C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28232

Modified Files:
	kdepim-runtime.spec 
Log Message:
* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.80-4
- BR: shared-desktop-ontologies
- tighten some deps



Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kdepim-runtime.spec	8 Dec 2009 15:57:50 -0000	1.15
+++ kdepim-runtime.spec	11 Dec 2009 15:25:20 -0000	1.16
@@ -1,26 +1,27 @@
-%define akonadi_version 1.2.61
+
+%define akonadi_version 1.2.80
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Version: 4.3.80
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: akonadi-devel >= %{akonadi_version}
 BuildRequires: desktop-file-utils
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: zlib-devel
+BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: shared-desktop-ontologies
 BuildRequires: soprano-devel
-BuildRequires: libxslt-devel
-BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
+
 
 %description
 %{summary}
@@ -39,7 +40,7 @@ Requires: akonadi%{?_isa} >= %{akonadi_v
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdepimlibs-devel
 
 %description devel
@@ -130,6 +131,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.80-4
+- BR: shared-desktop-ontologies
+- tighten some deps
+
 * Tue Dec 08 2009 Than Ngo <than at redhat.com> - 4.3.80-3
 - drop BR kdelibs-experimental-devel
 



From rdieter at fedoraproject.org  Fri Dec 11 15:34:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 15:34:20 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore,1.78,1.79 sources,1.85,1.86
Message-ID: <20091211153420.333A311C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31293

Modified Files:
	.cvsignore sources 
Log Message:
awol sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	2 Dec 2009 13:37:02 -0000	1.78
+++ .cvsignore	11 Dec 2009 15:34:19 -0000	1.79
@@ -1 +1,2 @@
+krdc-icons.tar.bz2
 kdenetwork-4.3.80.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	2 Dec 2009 13:37:02 -0000	1.85
+++ sources	11 Dec 2009 15:34:19 -0000	1.86
@@ -1 +1,2 @@
+7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
 87f2d595ba44cec7853e0fad75ad2ff3  kdenetwork-4.3.80.tar.bz2



From arbiter at fedoraproject.org  Fri Dec 11 15:39:27 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 15:39:27 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.251,1.252
Message-ID: <20091211153927.AB29511C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv376

Modified Files:
	kdepim.spec 
Log Message:
* Fri Dec 11 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.3.80-5
- KPilot is no longer part of kdepim
  (see http://bertjan.broeksemaatjes.nl/node/50)



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- kdepim.spec	9 Dec 2009 15:19:58 -0000	1.251
+++ kdepim.spec	11 Dec 2009 15:39:27 -0000	1.252
@@ -1,12 +1,8 @@
-%ifnarch s390 s390x
-%define _with_pilot_link 1
-%endif
-
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.80
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -18,7 +14,7 @@ Patch0:  kdepim-4.1.80-libqgpgme-link-fi
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 # add -fno-var-tracking-assignments for kmail/globalsettings_base.cpp (#538233)
-Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch 
+Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch
 Patch3:  kdepim-4.3.75-desktop-fixes.patch
 
 # upstream patches (4.4 branch):
@@ -51,11 +47,6 @@ BuildRequires: libXpm-devel libXScrnSave
 # Not used, has broken deps to boot -- Rex
 #BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
-%if 0%{?_with_pilot_link:1}
-# libmal currently not used, recheck with kdepim-4.3
-#BuildRequirs: libmal-devel >= 0.40
-BuildRequires: pilot-link-devel >= 0.12
-%endif
 BuildRequires: python-devel
 BuildRequires: soprano-devel
 BuildRequires: qca2-devel
@@ -77,7 +68,7 @@ Requires(hint): spambayes
 * 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}
@@ -171,9 +162,6 @@ rm -rf %{buildroot}
 %doc README README.Kolab
 %doc COPYING
 %{_kde4_bindir}/*
-%if 0%{?_with_pilot_link:1}
-%{_kde4_libdir}/libkpilot_*.so
-%endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
 %{_kde4_datadir}/akonadi/agents/*.desktop
@@ -196,9 +184,6 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kontactsummary/
 %{_kde4_appsdir}/korgac/
 %{_kde4_appsdir}/korganizer/
-%if 0%{?_with_pilot_link:1}
-%{_kde4_appsdir}/kpilot/
-%endif
 %{_kde4_appsdir}/ktimetracker/
 %{_kde4_appsdir}/kwatchgnupg/
 %{_kde4_appsdir}/libkdepim/
@@ -223,12 +208,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%if 0%{?_with_pilot_link:1}
-%exclude %{_kde4_libdir}/libkpilot_*.so
-%endif
 
 
 %changelog
+* Fri Dec 11 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.3.80-5
+- KPilot is no longer part of kdepim
+  (see http://bertjan.broeksemaatjes.nl/node/50)
+
 * Wed Dec 09 2009 Than Ngo <than at redhat.com> - 4.3.80-4
 - apply upstream patch to fix crash in Kontact+KOrganizer with Qt4.6
 
@@ -302,7 +288,7 @@ rm -rf %{buildroot}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
-- 4.3rc3 
+- 4.3rc3
 
 * Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
 - 4.3rc2



From dsd at fedoraproject.org  Fri Dec 11 15:43:33 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri, 11 Dec 2009 15:43:33 +0000 (UTC)
Subject: File olpc-utils-1.0.14.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091211154333.3C73310F88C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for olpc-utils:

a50d7330e2cd9a5bffa42bca18007860  olpc-utils-1.0.14.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 11 15:45:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 15:45:13 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.206,1.207
Message-ID: <20091211154513.5630011C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2263

Modified Files:
	kdeutils.spec 
Log Message:
* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
- BR: xz-devel



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- kdeutils.spec	11 Dec 2009 15:01:18 -0000	1.206
+++ kdeutils.spec	11 Dec 2009 15:45:13 -0000	1.207
@@ -5,7 +5,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.3.80
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -34,6 +34,7 @@ BuildRequires:  libzip-devel
 BuildRequires:  python-devel python
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
+BuildRequires:  xz-devel
 
 %if 0%{?printer_applet}
 %if 0%{?fedora} &&  0%{?fedora} < 11
@@ -217,6 +218,9 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
+- BR: xz-devel
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From rdieter at fedoraproject.org  Fri Dec 11 15:46:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 15:46:20 +0000 (UTC)
Subject: rpms/kdeutils/F-12 kdeutils.spec,1.199,1.200
Message-ID: <20091211154620.BAF7711C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2793

Modified Files:
	kdeutils.spec 
Log Message:
* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2
- BR: xz-devel



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-12/kdeutils.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- kdeutils.spec	1 Dec 2009 16:56:54 -0000	1.199
+++ kdeutils.spec	11 Dec 2009 15:46:20 -0000	1.200
@@ -5,7 +5,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -33,6 +33,7 @@ BuildRequires:  libzip-devel
 BuildRequires:  python-devel python
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
+BuildRequires:  xz-devel
 
 %if 0%{?printer_applet}
 %if 0%{?fedora} &&  0%{?fedora} < 11
@@ -215,6 +216,9 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2
+- BR: xz-devel
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 



From dsd at fedoraproject.org  Fri Dec 11 15:49:01 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri, 11 Dec 2009 15:49:01 +0000 (UTC)
Subject: rpms/olpc-utils/devel .cvsignore, 1.13, 1.14 olpc-utils.spec, 1.23, 
	1.24 sources, 1.15, 1.16
Message-ID: <20091211154901.1306D11C00C5@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3956

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Dec 2009 11:35:33 -0000	1.13
+++ .cvsignore	11 Dec 2009 15:49:00 -0000	1.14
@@ -1 +1 @@
-olpc-utils-1.0.13.tar.bz2
+olpc-utils-1.0.14.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- olpc-utils.spec	9 Dec 2009 22:05:57 -0000	1.23
+++ olpc-utils.spec	11 Dec 2009 15:49:00 -0000	1.24
@@ -1,6 +1,6 @@
 Name:       olpc-utils
-Version:    1.0.13
-Release:    2%{?dist}
+Version:    1.0.14
+Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Fri Dec 11 2009 Daniel Drake <dsd at laptop.org> - 1.0.14-1
+- Bump to v1.0.14 for DDC config
+
 * Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> -  1.0.13-2
 - adjust for upstart 0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	4 Dec 2009 11:35:33 -0000	1.15
+++ sources	11 Dec 2009 15:49:00 -0000	1.16
@@ -1 +1 @@
-b3dc4f96d43063c7675c906e2fec2929  olpc-utils-1.0.13.tar.bz2
+a50d7330e2cd9a5bffa42bca18007860  olpc-utils-1.0.14.tar.bz2



From dsd at fedoraproject.org  Fri Dec 11 15:50:07 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Fri, 11 Dec 2009 15:50:07 +0000 (UTC)
Subject: rpms/olpc-utils/F-11 .cvsignore, 1.11, 1.12 olpc-utils.spec, 1.20, 
	1.21 sources, 1.14, 1.15
Message-ID: <20091211155007.C7ADE11C03DB@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4403

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Dec 2009 11:36:11 -0000	1.11
+++ .cvsignore	11 Dec 2009 15:50:07 -0000	1.12
@@ -1 +1 @@
-olpc-utils-1.0.13.tar.bz2
+olpc-utils-1.0.14.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- olpc-utils.spec	4 Dec 2009 11:36:11 -0000	1.20
+++ olpc-utils.spec	11 Dec 2009 15:50:07 -0000	1.21
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.13
+Version:    1.0.14
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Fri Dec 11 2009 Daniel Drake <dsd at laptop.org> - 1.0.14-1
+- Bump to v1.0.14 for DDC config
+
 * Fri Dec  4 2009 Daniel Drake <dsd at laptop.org> - 1.0.13-1
 - Bump to v1.0.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Dec 2009 11:36:11 -0000	1.14
+++ sources	11 Dec 2009 15:50:07 -0000	1.15
@@ -1 +1 @@
-b3dc4f96d43063c7675c906e2fec2929  olpc-utils-1.0.13.tar.bz2
+a50d7330e2cd9a5bffa42bca18007860  olpc-utils-1.0.14.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 11 15:50:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 15:50:40 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.218,1.219
Message-ID: <20091211155040.EE2A511C03DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4675

Modified Files:
	kdenetwork.spec 
Log Message:
fix %files



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- kdenetwork.spec	2 Dec 2009 14:47:53 -0000	1.218
+++ kdenetwork.spec	11 Dec 2009 15:50:40 -0000	1.219
@@ -185,7 +185,6 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_includedir}/kopete/
 %{_kde4_includedir}/krdc/
-%{_kde4_includedir}/KRfb/
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libqgroupwise.so
 



From mef at fedoraproject.org  Fri Dec 11 16:03:52 2009
From: mef at fedoraproject.org (mef)
Date: Fri, 11 Dec 2009 16:03:52 +0000 (UTC)
Subject: rpms/jakarta-commons-pool/F-12 commons-pool-1.3.pom, NONE,
	1.1 jakarta-commons-pool.spec, 1.26, 1.27
Message-ID: <20091211160352.E726411C00C5@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/jakarta-commons-pool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8860/F-12

Modified Files:
	jakarta-commons-pool.spec 
Added Files:
	commons-pool-1.3.pom 
Log Message:
* Fri Dec 11 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:1.3-13
- Include Maven metadata
- Fix badly auto-incremented release version



--- NEW FILE commons-pool-1.3.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-pool</groupId>
  <artifactId>commons-pool</artifactId>
  <name>Commons Pool</name>
  <version>1.3</version>
  <description>Commons Object Pooling Library</description>
  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
  <issueManagement>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>commons-dev at jakarta.apache.org</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev at jakarta.apache.org</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user at jakarta.apache.org</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>morgand</id>
      <name>Morgan Delagrange</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>geirm</id>
      <name>Geir Magnusson</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>craigmcc</id>
      <name>Craig McClanahan</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>rwaldhoff</id>
      <name>Rodney Waldhoff</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dweinr1</id>
      <name>David Weinrich</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dirkv</id>
      <name>Dirk Verbeeck</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>rdonkin</id>
      <name>Robert Burrell Donkin</name>
      <email></email>
      <organization>Apache Software Foundation</organization>
    </developer>
    <developer>
      <id>sandymac</id>
      <name>Sandy McArthur</name>
      <email></email>
      <organization>Apache Software Foundation</organization>
    </developer>
  </developers>
  <contributors>
    <contributor>
      <name>Todd Carmichael</name>
      <email>toddc at concur.com</email>
    </contributor>
  </contributors>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <targetPath>META-INF</targetPath>
        <directory>${basedir}</directory>
        <includes>
          <include>NOTICE.txt</include>
        </includes>
      </resource>
    </resources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>org/apache/commons/pool/Test*Factory.java</include>
            <include>org/apache/commons/pool/TestBaseObjectPool.java</include>
            <include>org/apache/commons/pool/TestBaseKeyedObjectPool.java</include>
            <include>org/apache/commons/pool/TestPoolUtils.java</include>
            <include>org/apache/commons/pool/impl/Test*Pool.java</include>
          </includes>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-plugin-plugin</artifactId>
        <version>1.7</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.7 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-scm-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-jdiff-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-changes-plugin</artifactId>
        <version>1.6</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.6 (minimum)</comment>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
    </site>
    <status>converted</status>
  </distributionManagement>
</project>

Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-pool/F-12/jakarta-commons-pool.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- jakarta-commons-pool.spec	25 Jul 2009 03:51:59 -0000	1.26
+++ jakarta-commons-pool.spec	11 Dec 2009 16:03:52 -0000	1.27
@@ -45,7 +45,7 @@
 
 Name:           jakarta-commons-pool
 Version:        1.3
-Release:        12.5%{?dist}
+Release:        13%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Pool Package
 License:        ASL 2.0
@@ -59,6 +59,7 @@ Source5:        commons-build.tar.gz
 # svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
 # tar czf commons-build.tar.gz commons-build
 Source6:        pool-tomcat5-build.xml
+Source7:	http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
 Patch0:         jakarta-commons-pool-build.patch
 
 Url:            http://jakarta.apache.org/commons/%{base_name}/
@@ -95,6 +96,9 @@ Requires(post):         java-gcj-compat
 Requires(postun):       java-gcj-compat
 %endif
 
+Requires(post):		jpackage-utils
+Requires(postun):	jpackage-utils
+
 %description
 The goal of Pool package it to create and maintain an object 
 (instance) pooling package to be distributed under the ASF license.
@@ -140,6 +144,7 @@ find . -name "*.jar" -exec rm -f {} \;
 gzip -dc %{SOURCE5} | tar xf -
 %patch0
 cp %{SOURCE6} .
+cp %{SOURCE7} .
 
 %build
 mkdir ./tmp
@@ -193,6 +198,11 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docd
 cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %endif
 
+# Add Maven information
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 %{short_name}-%{version}.pom $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{short_name}.pom
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -200,16 +210,18 @@ cp -pr target/docs/* $RPM_BUILD_ROOT%{_d
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%if %{gcj_support}
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -240,6 +252,8 @@ fi
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
 %{_javadir}/%{short_name}-%{version}.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
 
 %if %{gcj_support}
 %attr(-,root,root) 
@@ -269,6 +283,10 @@ fi
 %endif
 
 %changelog
+* Fri Dec 11 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:1.3-13
+- Include Maven metadata
+- Fix badly auto-incremented release version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3-12.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mef at fedoraproject.org  Fri Dec 11 16:03:52 2009
From: mef at fedoraproject.org (mef)
Date: Fri, 11 Dec 2009 16:03:52 +0000 (UTC)
Subject: rpms/jakarta-commons-pool/F-11 commons-pool-1.3.pom, NONE,
	1.1 jakarta-commons-pool.spec, 1.25, 1.26
Message-ID: <20091211160352.C412011C00C5@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/jakarta-commons-pool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8860/F-11

Modified Files:
	jakarta-commons-pool.spec 
Added Files:
	commons-pool-1.3.pom 
Log Message:
* Fri Dec 11 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:1.3-13
- Include Maven metadata
- Fix badly auto-incremented release version



--- NEW FILE commons-pool-1.3.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-pool</groupId>
  <artifactId>commons-pool</artifactId>
  <name>Commons Pool</name>
  <version>1.3</version>
  <description>Commons Object Pooling Library</description>
  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
  <issueManagement>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>commons-dev at jakarta.apache.org</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev at jakarta.apache.org</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user at jakarta.apache.org</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>morgand</id>
      <name>Morgan Delagrange</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>geirm</id>
      <name>Geir Magnusson</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>craigmcc</id>
      <name>Craig McClanahan</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>rwaldhoff</id>
      <name>Rodney Waldhoff</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dweinr1</id>
      <name>David Weinrich</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dirkv</id>
      <name>Dirk Verbeeck</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>rdonkin</id>
      <name>Robert Burrell Donkin</name>
      <email></email>
      <organization>Apache Software Foundation</organization>
    </developer>
    <developer>
      <id>sandymac</id>
      <name>Sandy McArthur</name>
      <email></email>
      <organization>Apache Software Foundation</organization>
    </developer>
  </developers>
  <contributors>
    <contributor>
      <name>Todd Carmichael</name>
      <email>toddc at concur.com</email>
    </contributor>
  </contributors>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <targetPath>META-INF</targetPath>
        <directory>${basedir}</directory>
        <includes>
          <include>NOTICE.txt</include>
        </includes>
      </resource>
    </resources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>org/apache/commons/pool/Test*Factory.java</include>
            <include>org/apache/commons/pool/TestBaseObjectPool.java</include>
            <include>org/apache/commons/pool/TestBaseKeyedObjectPool.java</include>
            <include>org/apache/commons/pool/TestPoolUtils.java</include>
            <include>org/apache/commons/pool/impl/Test*Pool.java</include>
          </includes>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-plugin-plugin</artifactId>
        <version>1.7</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.7 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-scm-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-jdiff-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-changes-plugin</artifactId>
        <version>1.6</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.6 (minimum)</comment>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
    </site>
    <status>converted</status>
  </distributionManagement>
</project>

Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-pool/F-11/jakarta-commons-pool.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- jakarta-commons-pool.spec	25 Feb 2009 08:52:08 -0000	1.25
+++ jakarta-commons-pool.spec	11 Dec 2009 16:03:52 -0000	1.26
@@ -45,7 +45,7 @@
 
 Name:           jakarta-commons-pool
 Version:        1.3
-Release:        11.5%{?dist}
+Release:        13%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Pool Package
 License:        ASL 2.0
@@ -59,6 +59,7 @@ Source5:        commons-build.tar.gz
 # svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
 # tar czf commons-build.tar.gz commons-build
 Source6:        pool-tomcat5-build.xml
+Source7:	http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
 Patch0:         jakarta-commons-pool-build.patch
 
 Url:            http://jakarta.apache.org/commons/%{base_name}/
@@ -95,6 +96,9 @@ Requires(post):         java-gcj-compat
 Requires(postun):       java-gcj-compat
 %endif
 
+Requires(post):		jpackage-utils
+Requires(postun):	jpackage-utils
+
 %description
 The goal of Pool package it to create and maintain an object 
 (instance) pooling package to be distributed under the ASF license.
@@ -140,6 +144,7 @@ find . -name "*.jar" -exec rm -f {} \;
 gzip -dc %{SOURCE5} | tar xf -
 %patch0
 cp %{SOURCE6} .
+cp %{SOURCE7} .
 
 %build
 mkdir ./tmp
@@ -193,6 +198,11 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docd
 cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %endif
 
+# Add Maven information
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 %{short_name}-%{version}.pom $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{short_name}.pom
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -200,16 +210,18 @@ cp -pr target/docs/* $RPM_BUILD_ROOT%{_d
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%if %{gcj_support}
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -240,6 +252,8 @@ fi
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
 %{_javadir}/%{short_name}-%{version}.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
 
 %if %{gcj_support}
 %attr(-,root,root) 
@@ -269,6 +283,10 @@ fi
 %endif
 
 %changelog
+* Fri Dec 11 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:1.3-13
+- Include Maven metadata
+- Fix badly auto-incremented release version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3-11.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mef at fedoraproject.org  Fri Dec 11 16:03:53 2009
From: mef at fedoraproject.org (mef)
Date: Fri, 11 Dec 2009 16:03:53 +0000 (UTC)
Subject: rpms/jakarta-commons-pool/devel commons-pool-1.3.pom, NONE,
	1.1 jakarta-commons-pool.spec, 1.26, 1.27
Message-ID: <20091211160353.3320811C00C5@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/jakarta-commons-pool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8860/devel

Modified Files:
	jakarta-commons-pool.spec 
Added Files:
	commons-pool-1.3.pom 
Log Message:
* Fri Dec 11 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:1.3-13
- Include Maven metadata
- Fix badly auto-incremented release version



--- NEW FILE commons-pool-1.3.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-pool</groupId>
  <artifactId>commons-pool</artifactId>
  <name>Commons Pool</name>
  <version>1.3</version>
  <description>Commons Object Pooling Library</description>
  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
  <issueManagement>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>commons-dev at jakarta.apache.org</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev at jakarta.apache.org</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user at jakarta.apache.org</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>morgand</id>
      <name>Morgan Delagrange</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>geirm</id>
      <name>Geir Magnusson</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>craigmcc</id>
      <name>Craig McClanahan</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>rwaldhoff</id>
      <name>Rodney Waldhoff</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dweinr1</id>
      <name>David Weinrich</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dirkv</id>
      <name>Dirk Verbeeck</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>rdonkin</id>
      <name>Robert Burrell Donkin</name>
      <email></email>
      <organization>Apache Software Foundation</organization>
    </developer>
    <developer>
      <id>sandymac</id>
      <name>Sandy McArthur</name>
      <email></email>
      <organization>Apache Software Foundation</organization>
    </developer>
  </developers>
  <contributors>
    <contributor>
      <name>Todd Carmichael</name>
      <email>toddc at concur.com</email>
    </contributor>
  </contributors>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <targetPath>META-INF</targetPath>
        <directory>${basedir}</directory>
        <includes>
          <include>NOTICE.txt</include>
        </includes>
      </resource>
    </resources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>org/apache/commons/pool/Test*Factory.java</include>
            <include>org/apache/commons/pool/TestBaseObjectPool.java</include>
            <include>org/apache/commons/pool/TestBaseKeyedObjectPool.java</include>
            <include>org/apache/commons/pool/TestPoolUtils.java</include>
            <include>org/apache/commons/pool/impl/Test*Pool.java</include>
          </includes>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-plugin-plugin</artifactId>
        <version>1.7</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.7 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-scm-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-jdiff-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-changes-plugin</artifactId>
        <version>1.6</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.6 (minimum)</comment>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
    </site>
    <status>converted</status>
  </distributionManagement>
</project>

Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- jakarta-commons-pool.spec	25 Jul 2009 03:51:59 -0000	1.26
+++ jakarta-commons-pool.spec	11 Dec 2009 16:03:53 -0000	1.27
@@ -45,7 +45,7 @@
 
 Name:           jakarta-commons-pool
 Version:        1.3
-Release:        12.5%{?dist}
+Release:        13%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Pool Package
 License:        ASL 2.0
@@ -59,6 +59,7 @@ Source5:        commons-build.tar.gz
 # svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
 # tar czf commons-build.tar.gz commons-build
 Source6:        pool-tomcat5-build.xml
+Source7:	http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
 Patch0:         jakarta-commons-pool-build.patch
 
 Url:            http://jakarta.apache.org/commons/%{base_name}/
@@ -95,6 +96,9 @@ Requires(post):         java-gcj-compat
 Requires(postun):       java-gcj-compat
 %endif
 
+Requires(post):		jpackage-utils
+Requires(postun):	jpackage-utils
+
 %description
 The goal of Pool package it to create and maintain an object 
 (instance) pooling package to be distributed under the ASF license.
@@ -140,6 +144,7 @@ find . -name "*.jar" -exec rm -f {} \;
 gzip -dc %{SOURCE5} | tar xf -
 %patch0
 cp %{SOURCE6} .
+cp %{SOURCE7} .
 
 %build
 mkdir ./tmp
@@ -193,6 +198,11 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docd
 cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %endif
 
+# Add Maven information
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 %{short_name}-%{version}.pom $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{short_name}.pom
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -200,16 +210,18 @@ cp -pr target/docs/* $RPM_BUILD_ROOT%{_d
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%if %{gcj_support}
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -240,6 +252,8 @@ fi
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
 %{_javadir}/%{short_name}-%{version}.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
 
 %if %{gcj_support}
 %attr(-,root,root) 
@@ -269,6 +283,10 @@ fi
 %endif
 
 %changelog
+* Fri Dec 11 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:1.3-13
+- Include Maven metadata
+- Fix badly auto-incremented release version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3-12.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ovasik at fedoraproject.org  Fri Dec 11 16:16:19 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 11 Dec 2009 16:16:19 +0000 (UTC)
Subject: rpms/xmltex/devel xmltex.spec,1.24,1.25
Message-ID: <20091211161619.B49D811C00C5@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmltex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12963

Modified Files:
	xmltex.spec 
Log Message:
Merge review(#226567) - fix buildroot, source0 location, do not zip readme.txt


Index: xmltex.spec
===================================================================
RCS file: /cvs/extras/rpms/xmltex/devel/xmltex.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xmltex.spec	28 Aug 2009 08:27:14 -0000	1.24
+++ xmltex.spec	11 Dec 2009 16:16:18 -0000	1.25
@@ -1,15 +1,16 @@
 Summary:	Namespace-aware XML parser written in TeX
 Name:		xmltex
 Version:	20020625
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	LPPL
 Group:		Applications/Publishing
-URL:			http://www.dcarlisle.demon.co.uk/xmltex/manual.html
-Source0:	ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex-1.9.tar.gz
-Source1:  xmltex.1
+URL:	http://www.dcarlisle.demon.co.uk/xmltex/manual.html
+#Source0 located at ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex
+Source0:	xmltex-1.9.tar.gz
+Source1:	xmltex.1
 Requires:	tex(latex)
 BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: tex(latex)
 
@@ -27,15 +28,13 @@ mv -f xmltex/base/* .
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex
 install -d $RPM_BUILD_ROOT%{_bindir}
-install -p *.xmt %{name}.cfg *.ini *.tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex
+install -p -m 0644 *.xmt %{name}.cfg *.ini *.tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex
 ln -s pdftex ${RPM_BUILD_ROOT}%{_bindir}/pdf%{name}
 ln -s latex ${RPM_BUILD_ROOT}%{_bindir}/%{name}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 install -c -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1
 ln -s xmltex.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/pdfxmltex.1
 
-gzip -9nf readme.txt
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,14 +55,19 @@ done
 exit 0
 
 %files
-%defattr(644,root,root,755)
-%doc *.gz *.html
-%attr(755,root,root) %{_bindir}/*
+%defattr(-,root,root,-)
+%doc readme.txt manual.html
+%attr(755,root,root) %{_bindir}/xmltex
+%attr(755,root,root) %{_bindir}/pdfxmltex
 %{_datadir}/texmf/tex/xmltex
 %{_mandir}/man1/xmltex.1*
 %{_mandir}/man1/pdfxmltex.1*
 
 %changelog
+* Fri Dec 11 2009 Ondrej Vasik <ovasik at redhat.com> - 20020625-16
+- Merge review(#226567) - fix buildroot, source0 location, do not 
+  zip readme.txt
+
 * Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 20020625-15
 - ship xmltex manpage from Debian
 
@@ -167,8 +171,8 @@ exit 0
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-Revision 1.24  2009/08/28 08:27:14  ovasik
-ship xmltex manpage from Debian
+Revision 1.25  2009/12/11 16:16:18  ovasik
+Merge review(#226567) - fix buildroot, source0 location, do not zip readme.txt
 
 Revision 1.6  2001/03/27 16:50:29  wiget
 add xmltex.cfg file and one missing dir in %%files; release 3



From ovasik at fedoraproject.org  Fri Dec 11 16:17:31 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 11 Dec 2009 16:17:31 +0000 (UTC)
Subject: rpms/xmltex/F-12 xmltex.spec,1.24,1.25
Message-ID: <20091211161731.E777811C00C5@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmltex/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13408

Modified Files:
	xmltex.spec 
Log Message:
Merge review(#226567) - fix buildroot, source0 location, do not zip readme.txt


Index: xmltex.spec
===================================================================
RCS file: /cvs/extras/rpms/xmltex/F-12/xmltex.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xmltex.spec	28 Aug 2009 08:27:14 -0000	1.24
+++ xmltex.spec	11 Dec 2009 16:17:31 -0000	1.25
@@ -1,15 +1,16 @@
 Summary:	Namespace-aware XML parser written in TeX
 Name:		xmltex
 Version:	20020625
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	LPPL
 Group:		Applications/Publishing
-URL:			http://www.dcarlisle.demon.co.uk/xmltex/manual.html
-Source0:	ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex-1.9.tar.gz
-Source1:  xmltex.1
+URL:	http://www.dcarlisle.demon.co.uk/xmltex/manual.html
+#Source0 located at ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex
+Source0:	xmltex-1.9.tar.gz
+Source1:	xmltex.1
 Requires:	tex(latex)
 BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: tex(latex)
 
@@ -27,15 +28,13 @@ mv -f xmltex/base/* .
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex
 install -d $RPM_BUILD_ROOT%{_bindir}
-install -p *.xmt %{name}.cfg *.ini *.tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex
+install -p -m 0644 *.xmt %{name}.cfg *.ini *.tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex
 ln -s pdftex ${RPM_BUILD_ROOT}%{_bindir}/pdf%{name}
 ln -s latex ${RPM_BUILD_ROOT}%{_bindir}/%{name}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 install -c -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1
 ln -s xmltex.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/pdfxmltex.1
 
-gzip -9nf readme.txt
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,14 +55,19 @@ done
 exit 0
 
 %files
-%defattr(644,root,root,755)
-%doc *.gz *.html
-%attr(755,root,root) %{_bindir}/*
+%defattr(-,root,root,-)
+%doc readme.txt manual.html
+%attr(755,root,root) %{_bindir}/xmltex
+%attr(755,root,root) %{_bindir}/pdfxmltex
 %{_datadir}/texmf/tex/xmltex
 %{_mandir}/man1/xmltex.1*
 %{_mandir}/man1/pdfxmltex.1*
 
 %changelog
+* Fri Dec 11 2009 Ondrej Vasik <ovasik at redhat.com> - 20020625-16
+- Merge review(#226567) - fix buildroot, source0 location, do not 
+  zip readme.txt
+
 * Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 20020625-15
 - ship xmltex manpage from Debian
 
@@ -167,8 +171,8 @@ exit 0
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-Revision 1.24  2009/08/28 08:27:14  ovasik
-ship xmltex manpage from Debian
+Revision 1.25  2009/12/11 16:17:31  ovasik
+Merge review(#226567) - fix buildroot, source0 location, do not zip readme.txt
 
 Revision 1.6  2001/03/27 16:50:29  wiget
 add xmltex.cfg file and one missing dir in %%files; release 3



From ovasik at fedoraproject.org  Fri Dec 11 16:20:36 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 11 Dec 2009 16:20:36 +0000 (UTC)
Subject: File coreutils-8.2.tar.xz uploaded to lookaside cache by ovasik
Message-ID: <20091211162036.E475810F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for coreutils:

e037fcb353de2df7762406e0a170b152  coreutils-8.2.tar.xz



From jnovy at fedoraproject.org  Fri Dec 11 16:27:14 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 11 Dec 2009 16:27:14 +0000 (UTC)
Subject: rpms/latex2html/F-12 latex2html.spec,1.13,1.14
Message-ID: <20091211162714.513EF11C00C5@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/latex2html/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16480

Modified Files:
	latex2html.spec 
Log Message:
* Fri Dec 11 2009 Jindrich Novy <jnovy at redhat.com> 2008-4
- require netpbm-progs
- review fixes (#225980):
  - include documentation
  - set executable bit for makeseg and makemap scripts
  - white-space spec correction
  - move docs and example directory to %doc
  - nuke duplicated stuff



Index: latex2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2html/F-12/latex2html.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- latex2html.spec	25 Jul 2009 04:59:04 -0000	1.13
+++ latex2html.spec	11 Dec 2009 16:27:14 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: Converts LaTeX documents to HTML
 Name: latex2html
 Version: 2008
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://www.latex2html.org/
@@ -19,7 +19,7 @@ Patch3: latex2html-2K.1beta-DB.patch
 Patch4: latex2html-2002-2-1-SHLIB.patch
 Patch5: latex2html-2002-2-1-gsfont.patch
 Patch6: latex2html-2002.2.1-grayimg.patch
-Requires: tex(latex), tex(dvips)
+Requires: tex(latex), tex(dvips), netpbm-progs
 BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm >= 9.21, tex(latex)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -55,6 +55,8 @@ pushd %{name}-%{version}
 for i in Dos Mac OS2 Win32; do
   rm -f L2hos/${i}.pm
 done
+rm -rf cweb2html
+rm -f readme.hthtml
 popd
 
 %if %{enable_japanese}
@@ -75,22 +77,22 @@ pushd %{name}-%{version}
 cp %{SOURCE1} cfgcache.pm
 tar fxz %{SOURCE2}
 
-./configure  --program-prefix=%{?_program_prefix} \
-             --prefix=%{_prefix} \
-             --exec-prefix=%{_exec_prefix} \
-             --bindir=%{_bindir} \
-             --sbindir=%{_sbindir} \
-             --sysconfdir=%{_sysconfdir} \
-             --datadir=%{_datadir} \
-             --includedir=%{_includedir} \
-             --libdir=%{_datadir}/latex2html \
-             --libexecdir=%{_libexecdir} \
-             --localstatedir=%{_localstatedir} \
-             --sharedstatedir=%{_sharedstatedir} \
-             --mandir=%{_mandir} \
-             --infodir=%{_infodir} \
-	     --shlibdir=%{_datadir}/latex2html \
-	     --with-texpath=%{_datadir}/texmf/tex/latex/html
+./configure	--program-prefix=%{?_program_prefix} \
+		--prefix=%{_prefix} \
+		--exec-prefix=%{_exec_prefix} \
+		--bindir=%{_bindir} \
+		--sbindir=%{_sbindir} \
+		--sysconfdir=%{_sysconfdir} \
+		--datadir=%{_datadir} \
+		--includedir=%{_includedir} \
+		--libdir=%{_datadir}/latex2html \
+		--libexecdir=%{_libexecdir} \
+		--localstatedir=%{_localstatedir} \
+		--sharedstatedir=%{_sharedstatedir} \
+		--mandir=%{_mandir} \
+		--infodir=%{_infodir} \
+		--shlibdir=%{_datadir}/latex2html \
+		--with-texpath=%{_datadir}/texmf/tex/latex/html
 
 perl -pi -e"s,/usr/(share/)?lib,%{_datadir}," cfgcache.pm
 make
@@ -102,56 +104,58 @@ sed s/latex2html/jlatex2html/g < %{SOURC
 perl -pi -e"s,/usr/bin/dvips,/usr/bin/pdvips," cfgcache.pm
 perl -pi -e"s,/usr/bin/latex,/usr/bin/platex," cfgcache.pm
 
-./configure  --program-prefix=%{?_program_prefix} \
-             --prefix=%{_prefix} \
-             --exec-prefix=%{_exec_prefix} \
-             --bindir=%{_bindir} \
-             --sbindir=%{_sbindir} \
-             --sysconfdir=%{_sysconfdir} \
-             --datadir=%{_datadir} \
-             --includedir=%{_includedir} \
-             --libdir=%{_datadir}/jlatex2html \
-             --libexecdir=%{_libexecdir} \
-             --localstatedir=%{_localstatedir} \
-             --sharedstatedir=%{_sharedstatedir} \
-             --mandir=%{_mandir} \
-             --infodir=%{_infodir} \
-	     --shlibdir=%{_datadir}/jlatex2html \
-	     --with-texpath=%{_datadir}/texmf/tex/latex/html
+./configure	--program-prefix=%{?_program_prefix} \
+		--prefix=%{_prefix} \
+		--exec-prefix=%{_exec_prefix} \
+		--bindir=%{_bindir} \
+		--sbindir=%{_sbindir} \
+		--sysconfdir=%{_sysconfdir} \
+		--datadir=%{_datadir} \
+		--includedir=%{_includedir} \
+		--libdir=%{_datadir}/jlatex2html \
+		--libexecdir=%{_libexecdir} \
+		--localstatedir=%{_localstatedir} \
+		--sharedstatedir=%{_sharedstatedir} \
+		--mandir=%{_mandir} \
+		--infodir=%{_infodir} \
+		--shlibdir=%{_datadir}/jlatex2html \
+		--with-texpath=%{_datadir}/texmf/tex/latex/html
 
 perl -pi -e"s,/usr/(share/)?lib,%{_datadir},;
-            s,%{_datadir}/latex2html,%{_datadir}/jlatex2html," cfgcache.pm
+	    s,%{_datadir}/latex2html,%{_datadir}/jlatex2html," cfgcache.pm
 make
-perl -pi -e"s,${RPM_BUILD_ROOT},," l2hconf.pm
 perl -pi -e"s,\\\${dd}pstoimg,\\\${dd}jpstoimg, ;
-	   s,\\\${dd}texexpand,\\\${dd}jtexexpand," l2hconf.pm
+	    s,\\\${dd}texexpand,\\\${dd}jtexexpand," l2hconf.pm
 
 for i in latex2html pstoimg texexpand ; do
-  mv ${i} j${i}
+	mv ${i} j${i}
 done
 popd
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 pushd %{name}-%{version}
-perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm
+perl -pi -e"s,%{_prefix},%{buildroot}%{_prefix}," cfgcache.pm
 perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/texexpand,;
-            s,/.*\\\${dd}pstoimg,%{_bindir}/pstoimg,;
-            s,/.*\\\${dd}*icons,\\\${LATEX2HTMLDIR}/icons,;
-            s,/.*\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,;
-            s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," latex2html
-perl -pi -e"s,$RPM_BUILD_ROOT,," l2hconf.pm
+	    s,/.*\\\${dd}pstoimg,%{_bindir}/pstoimg,;
+	    s,/.*\\\${dd}*icons,\\\${LATEX2HTMLDIR}/icons,;
+	    s,/.*\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,;
+	    s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," latex2html
+perl -pi -e"s,%{buildroot},," l2hconf.pm
 
 make install
 rm -f %{buildroot}%{_datadir}/latex2html/versions/table.pl.orig
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_datadir}/latex2html/cfgcache.pm
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/pstoimg
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/texexpand
-perl -pi -e"s,$RPM_BUILD_ROOT,," cfgcache.pm
+rm -rf %{buildroot}%{_datadir}/latex2html/docs/
+rm -rf %{buildroot}%{_datadir}/latex2html/example/
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_datadir}/latex2html/cfgcache.pm
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_bindir}/pstoimg
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_bindir}/texexpand
+perl -pi -e"s,%{buildroot},," cfgcache.pm
 perl -pi -e"s,$cfg{'GS_LIB'} = q'';,$cfg{'GS_LIB'} = q'%{_datadir}/ghostscript/`ghostscript --version`';," cfgcache.pm
 install -m0644 *.pm %{buildroot}%{_datadir}/latex2html
+chmod +x %{buildroot}%{_datadir}/latex2html/makeseg/makeseg %{buildroot}%{_datadir}/latex2html/makemap
 
 # install man pages
 mkdir -p %{buildroot}%{_mandir}/man1
@@ -160,35 +164,38 @@ popd
 
 %if %{enable_japanese}
 pushd %{name}-%{version}JA
-perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm
+perl -pi -e"s,%{_prefix},%{buildroot}%{_prefix}," cfgcache.pm
 perl -pi -e"s,latex2html pstoimg texexpand,jlatex2html jpstoimg jtexexpand," config/install.pl
 perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/jtexexpand,;
-            s,/.*\\\${dd}pstoimg,%{_bindir}/jpstoimg,;
-            s,/.*\\\${dd}icons,\\\${LATEX2HTMLDIR}/icons,;
-            s,/.*\\\${dd}styles\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,;
-            s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," jlatex2html
-perl -pi -e"s,$RPM_BUILD_ROOT,," l2hconf.pm
+	    s,/.*\\\${dd}pstoimg,%{_bindir}/jpstoimg,;
+	    s,/.*\\\${dd}icons,\\\${LATEX2HTMLDIR}/icons,;
+	    s,/.*\\\${dd}styles\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,;
+	    s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," jlatex2html
+perl -pi -e"s,%{buildroot},," l2hconf.pm
 
 make install
 rm -f %{buildroot}%{_datadir}/jlatex2html/versions/table.pl.orig
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_datadir}/jlatex2html/cfgcache.pm
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/jpstoimg
-perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/jtexexpand
-perl -pi -e"s,$RPM_BUILD_ROOT,," cfgcache.pm
+rm -rf %{buildroot}%{_datadir}/jlatex2html/docs/
+rm -rf %{buildroot}%{_datadir}/jlatex2html/example/
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_datadir}/jlatex2html/cfgcache.pm
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_bindir}/jpstoimg
+perl -pi -e"s,%{buildroot},," %{buildroot}%{_bindir}/jtexexpand
+perl -pi -e"s,%{buildroot},," cfgcache.pm
 perl -pi -e"s,$cfg{'GS_LIB'} = q'';,$cfg{'GS_LIB'} = q'%{_datadir}/ghostscript/`ghostscript --version`';," cfgcache.pm
 install -m0644 *.pm %{buildroot}%{_datadir}/jlatex2html
+chmod +x %{buildroot}%{_datadir}/jlatex2html/makeseg/makeseg %{buildroot}%{_datadir}/jlatex2html/makemap
 popd
 %endif
 
 for f in cweb2html/cweb2html makeseg/makeseg makemap ; do
-   perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," $RPM_BUILD_ROOT%{_datadir}/latex2html/$f
+	perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," %{buildroot}%{_datadir}/latex2html/$f
 %if %{enable_japanese}
-   perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," $RPM_BUILD_ROOT%{_datadir}/jlatex2html/$f
+	perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," %{buildroot}%{_datadir}/jlatex2html/$f
 %endif
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
@@ -198,6 +205,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc latex2html-2008/{LICENSE,LICENSE.orig,README,FAQ,BUGS,docs,example}
 %{_bindir}/latex2html
 %{_bindir}/pstoimg
 %{_bindir}/texexpand
@@ -219,6 +227,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pstoimg.*
 
 %changelog
+* Fri Dec 11 2009 Jindrich Novy <jnovy at redhat.com> 2008-4
+- require netpbm-progs
+- review fixes (#225980):
+  - include documentation
+  - set executable bit for makeseg and makemap scripts
+  - white-space spec correction
+  - move docs and example directory to %%doc
+  - nuke duplicated stuff
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From petersen at fedoraproject.org  Fri Dec 11 16:37:43 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Dec 2009 16:37:43 +0000 (UTC)
Subject: rpms/nabi/devel sources,1.6,1.7
Message-ID: <20091211163743.17B0D11C00C5@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/nabi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19155

Modified Files:
	sources 
Log Message:
update src to 0.99.6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nabi/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Feb 2009 06:19:27 -0000	1.6
+++ sources	11 Dec 2009 16:37:42 -0000	1.7
@@ -1 +1 @@
-eb385e0356d7afb0a85bd4af4fbc45f7  nabi-0.99.3.tar.gz
+350979c7258fe62af5c8e8874e8e8f34  nabi-0.99.6.tar.gz



From ovasik at fedoraproject.org  Fri Dec 11 16:38:48 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 11 Dec 2009 16:38:48 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils.spec, 1.289, 1.290 sources, 1.27,
	1.28 coreutils-8.1-kojiutimens-symlinks.patch, 1.1,
	NONE coreutils-8.1-unsearchablepath.patch, 1.1, NONE
Message-ID: <20091211163848.7B8AA11C00C5@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19502

Modified Files:
	coreutils.spec sources 
Removed Files:
	coreutils-8.1-kojiutimens-symlinks.patch 
	coreutils-8.1-unsearchablepath.patch 
Log Message:
new upstream release 8.2, remove applied patches


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- coreutils.spec	27 Nov 2009 13:24:09 -0000	1.289
+++ coreutils.spec	11 Dec 2009 16:38:48 -0000	1.290
@@ -1,6 +1,6 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 8.1
+Version: 8.2
 Release: 1%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
@@ -18,8 +18,6 @@ Source202:  coreutils-su-l.pamd
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
-Patch1:   coreutils-8.1-unsearchablepath.patch
-Patch2:   coreutils-8.1-kojiutimens-symlinks.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -110,8 +108,6 @@ Libraries for coreutils package.
 %setup -q
 
 # From upstream
-%patch1 -p1 -b .path
-%patch2 -p1 -b .koji
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -330,6 +326,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Fri Dec 11 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-1
+- new upstream release 8.2
+- removed applied patches
+
 * Fri Nov 27 2009 Ondrej Vasik <ovasik at redhat.com> - 8.1-1
 - new upstream release 8.1
 - fix build under koji (no test failures with underlying


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	27 Nov 2009 13:24:09 -0000	1.27
+++ sources	11 Dec 2009 16:38:48 -0000	1.28
@@ -1 +1 @@
-e8ab20814c61924197c0951ee292c38a  coreutils-8.1.tar.xz
+e037fcb353de2df7762406e0a170b152  coreutils-8.2.tar.xz


--- coreutils-8.1-kojiutimens-symlinks.patch DELETED ---


--- coreutils-8.1-unsearchablepath.patch DELETED ---



From wcohen at fedoraproject.org  Fri Dec 11 16:40:58 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri, 11 Dec 2009 16:40:58 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile.spec,1.85,1.86
Message-ID: <20091211164058.D532811C00C5@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20248

Modified Files:
	oprofile.spec 
Log Message:
* Fri Dec 11 2009 Will Cohen <wcohen at redhat.com> - 0.9.6-2
- Clean up oprofile.spec file.




Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- oprofile.spec	24 Nov 2009 19:18:32 -0000	1.85
+++ oprofile.spec	11 Dec 2009 16:40:58 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -79,11 +79,7 @@ agent library.
 %prep
 %setup -q -n %{name}-%{version}
 %patch10 -p1 -b .guess2
-#%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
-#%patch83 -p1 -b .xen
-#%patch104 -p1 -b .lgpl
-#%patch105 -p1 -b .timer
 
 ./autogen.sh
 
@@ -231,7 +227,10 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
-* Tue Nov 24 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-1
+* Fri Dec 11 2009 Will Cohen <wcohen at redhat.com> - 0.9.6-2
+- Clean up oprofile.spec file.
+
+* Tue Nov 24 2009 Will Cohen <wcohen at redhat.com> - 0.9.6-1
 - Rebase on OProfile 0.9.6.
 
 * Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4



From limb at fedoraproject.org  Fri Dec 11 16:42:26 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 16:42:26 +0000 (UTC)
Subject: File scipy-0.7.1.tar.gz uploaded to lookaside cache by limb
Message-ID: <20091211164226.C15E810F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for scipy:

0d2f0e92e9fbcf8cdae8ca5c19c7ee8f  scipy-0.7.1.tar.gz



From limb at fedoraproject.org  Fri Dec 11 16:43:13 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 16:43:13 +0000 (UTC)
Subject: rpms/scipy/devel .cvsignore, 1.7, 1.8 scipy.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <20091211164313.6E2E211C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/scipy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21056

Modified Files:
	.cvsignore scipy.spec sources 
Log Message:
Update to 0.7.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Feb 2009 23:56:30 -0000	1.7
+++ .cvsignore	11 Dec 2009 16:43:13 -0000	1.8
@@ -1 +1 @@
-scipy-0.7.0.tar.gz
+scipy-0.7.1.tar.gz


Index: scipy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/devel/scipy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- scipy.spec	27 Jul 2009 03:58:20 -0000	1.23
+++ scipy.spec	11 Dec 2009 16:43:13 -0000	1.24
@@ -1,8 +1,8 @@
 %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
 Summary: Scipy: Scientific Tools for Python
 Name: scipy
-Version: 0.7.0
-Release: 5%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
 
 Group: Development/Libraries
 License: BSD and LGPLv2+
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Jon Ciesla <limb at jcomserv.net> - 0.7.1-1
+- Update to 0.7.1.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Feb 2009 23:56:30 -0000	1.7
+++ sources	11 Dec 2009 16:43:13 -0000	1.8
@@ -1 +1 @@
-80078ed5f47a48aec2cde3769ba39972  scipy-0.7.0.tar.gz
+0d2f0e92e9fbcf8cdae8ca5c19c7ee8f  scipy-0.7.1.tar.gz



From npajkovs at fedoraproject.org  Fri Dec 11 16:48:14 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Fri, 11 Dec 2009 16:48:14 +0000 (UTC)
Subject: rpms/inn/devel inn-redhat_build.patch, NONE, 1.1 inn-shared.patch, 
	NONE, 1.1 inn.spec, 1.71, 1.72 inn-2.4.1.pie.patch, 1.4,
	NONE inn-2.4.3-nologinshell.patch, 1.3, NONE
Message-ID: <20091211164814.44CE311C00C5@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22282

Modified Files:
	inn.spec 
Added Files:
	inn-redhat_build.patch inn-shared.patch 
Removed Files:
	inn-2.4.1.pie.patch inn-2.4.3-nologinshell.patch 
Log Message:
#225901 - Merge Review: inn

inn-redhat_build.patch:
 scripts/Makefile     |    2 +-
 support/fixscript.in |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE inn-redhat_build.patch ---
diff -up inn-2.5.1/scripts/Makefile.redhat_build inn-2.5.1/scripts/Makefile
--- inn-2.5.1/scripts/Makefile.redhat_build	2009-12-01 14:06:00.977311656 +0100
+++ inn-2.5.1/scripts/Makefile	2009-12-01 14:06:00.977311656 +0100
@@ -27,7 +27,7 @@ install: all
 	done
 	for F in innreport_inn.pm innshellvars innshellvars.pl \
 	         innshellvars.tcl ; do \
-	    $(CP_RPUB) $$F $D$(PATHLIB)/$$F ; \
+	    $(CP_RPUB) $$F $D$(PATHBIN)/$$F ; \
 	done
 
 bootstrap:
diff -up inn-2.5.1/support/fixscript.in.redhat_build inn-2.5.1/support/fixscript.in
--- inn-2.5.1/support/fixscript.in.redhat_build	2009-12-01 14:18:13.664811185 +0100
+++ inn-2.5.1/support/fixscript.in	2009-12-01 14:18:50.024811262 +0100
@@ -26,6 +26,7 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 libdir="@libdir@"
 libperldir="@LIBPERLDIR@"
+libexecdir="@libexecdir@"
 
 # We can probably just assume sed is on the path, but since we have it, we may
 # as well use it.
@@ -60,7 +61,7 @@ interpreter=`head -n 1 "$input"`
 case "$interpreter" in
 */sh|*SH*)
     path="@SHELL@"
-    lib=". $libdir/innshellvars"
+    lib=". $libexecdir/news/innshellvars"
     ;;
 */perl*|*PERL*)
     path=`echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"`

inn-shared.patch:
 buffindexed/ovmethod.mk |   10 +++++-----
 tradindexed/ovmethod.mk |    8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE inn-shared.patch ---
diff -up inn-2.5.1/storage/buffindexed/ovmethod.mk.shared inn-2.5.1/storage/buffindexed/ovmethod.mk
--- inn-2.5.1/storage/buffindexed/ovmethod.mk.shared	2009-12-01 16:50:37.174811272 +0100
+++ inn-2.5.1/storage/buffindexed/ovmethod.mk	2009-12-01 16:53:24.914809560 +0100
@@ -1,9 +1,9 @@
 # This rule requires a compiler that supports -o with -c.  Since it's normally
 # used by developers, that should be acceptable.
-buffindexed/buffindexed_d.o: buffindexed/buffindexed.c
-	$(CC) $(CFLAGS) -DBUFF_DEBUG -c -o $@ buffindexed/buffindexed.c
+buffindexed/buffindexed_d.$(EXTOBJ): buffindexed/buffindexed.c
+	$(LIBCC) $(CFLAGS) -DBUFF_DEBUG -c -o $@ buffindexed/buffindexed.c
 
-buffindexed/buffindexed_d: buffindexed/buffindexed_d.o libstorage.$(EXTLIB) $(LIBHIST)
-	$(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.o \
-	    buffindexed/shmem.o expire.o ov.o \
+buffindexed/buffindexed_d: buffindexed/buffindexed_d.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
+	$(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.$(EXTOBJ) \
+	    buffindexed/shmem.$(EXTOBJ) expire.$(EXTOBJ) ov.$(EXTOBJ) \
 	    $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
diff -up inn-2.5.1/storage/tradindexed/ovmethod.mk.shared inn-2.5.1/storage/tradindexed/ovmethod.mk
--- inn-2.5.1/storage/tradindexed/ovmethod.mk.shared	2009-12-01 16:53:35.644811390 +0100
+++ inn-2.5.1/storage/tradindexed/ovmethod.mk	2009-12-01 16:53:59.964810001 +0100
@@ -1,6 +1,6 @@
-tradindexed/tdx-util.o: tradindexed/tdx-util.c
-	$(CC) $(CFLAGS) -c -o $@ tradindexed/tdx-util.c
+tradindexed/tdx-util.$(EXTOBJ): tradindexed/tdx-util.c
+	$(LIBCC) $(CFLAGS) -c -o $@ tradindexed/tdx-util.c
 
-tradindexed/tdx-util: tradindexed/tdx-util.o libstorage.$(EXTLIB) $(LIBHIST)
-	$(LIBLD) $(LDFLAGS) -o $@ tradindexed/tdx-util.o \
+tradindexed/tdx-util: tradindexed/tdx-util.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
+	$(LIBLD) $(LDFLAGS) -o $@ tradindexed/tdx-util.$(EXTOBJ) \
 	    $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- inn.spec	6 Dec 2009 23:11:31 -0000	1.71
+++ inn.spec	11 Dec 2009 16:48:14 -0000	1.72
@@ -22,7 +22,9 @@ Patch8: inn-2.4.2-makedbz.patch
 Patch10: inn-2.5.1-nologinshell.patch
 Patch11: inn-2.4.5-dynlib.patch
 Patch13: inn-2.5.0-chown.patch
-BuildRequires: perl-devel python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel
+Patch14: inn-redhat_build.patch
+Patch15: inn-shared.patch
+BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
 BuildRequires: perl(ExtUtils::Embed)
 Requires(pre): shadow-utils
 Requires: chkconfig, grep, coreutils, sed
@@ -74,6 +76,13 @@ specified in the inn.conf file.
 Install inews if you need a program for posting Usenet articles to
 local news servers.
 
+%package libs
+Summary: Libraries provided by INN
+Group: Applications/System
+
+%description libs
+This package contains dynamic libraries provided by INN project
+
 %pre
 getent group news >/dev/null || groupadd -g 13 -r news
 getent passwd news >/dev/null || \
@@ -82,128 +91,119 @@ useradd -r -u 9 -g news -d /etc/news -s 
 exit 0
 
 %prep
-%setup  -q  -a 10
+%setup -q
 %patch1 -p1 -b .rh
-%patch2 -p1 -b .perl
+#%patch2 -p1 -b .perl
 %patch4 -p1 -b .pie
 %patch6 -p1 -b .posix
 %patch7 -p1 -b .warn
 %patch8 -p1 -b .makedbz
 %patch10 -p1 -b .nologin
-%patch11 -p1 -b .dynlib
+#%patch11 -p1 -b .dynlib
 %patch13 -p1 -b .chown
+%patch14 -p1 -b .redhat_build
+%patch15 -p1 -b .shared
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
 
 %build
 export DEFINE_INN_FLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -DHAVE_ET_COM_ERR_H"
+export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
 %ifarch s390 s390x sparc sparcv9 sparc64
-export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+export CFLAGS="$CFLAGS -fPIC"
 %else
-export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -fpic -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+export CFLAGS="$CFLAGS -fpic"
 %endif
 
-with_tmp_path=/var/lib/news/tmp ./configure \
-  --prefix=/usr/lib/news \
-  --sysconfdir=/etc/news --mandir=%{_mandir} \
+%configure --bindir=%{_libexecdir}/news \
+  --sysconfdir=%{_sysconfdir}/news --exec-prefix=%{_libexecdir}/news \
   --with-log-dir=/var/log/news --with-spool-dir=/var/spool/news\
-  --with-db-dir=/var/lib/news --with-run-dir=/var/run/news \
-  --with-etc-dir=/etc/news --with-tmp-dir=/var/lib/news/tmp \
+  --with-db-dir=%{_sharedstatedir}/news --with-run-dir=/var/run/news \
+  --with-etc-dir=%{_sysconfdir}/news --with-tmp-dir=%{_sharedstatedir}/news/tmp \
   --with-perl --enable-shared --enable-uucp-rnews \
+  --with-libperl-dir=%{perl_vendorlib} \
   --enable-pgp-verify --with-sendmail=/usr/sbin/sendmail \
   --with-news-user=news --with-news-group=news --with-news-master=news \
-  --enable-ipv6 \
-  --enable-libtool \
-  %{_target_platform}
+  --enable-ipv6 --with-http-dir=%{_sharedstatedir}/news/http \
+  --enable-libtool --disable-static --with-pic
 
-# XXX don't include <db1/ndbm.h> to avoid linking with -ldb1.
-perl -pi -e 's/HAVE_DB1_NDBM_H/XXX_HAVE_DB1_NDBM_H/' ./include/config.h
+# Don't hardcode 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
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/news/http
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # -- Install man pages needed by suck et al.
-mkdir -p $RPM_BUILD_ROOT/usr/include/inn
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/inn
 
 for f in clibrary.h config.h
 do
-    install -c -m 0644 ./include/$f $RPM_BUILD_ROOT/usr/include/inn
+    install -p -m 0644 ./include/$f $RPM_BUILD_ROOT%{_includedir}/inn
 done
 for f in defines.h system.h libinn.h storage.h options.h dbz.h
 do
-    install -c -m 0644 ./include/inn/$f $RPM_BUILD_ROOT/usr/include/inn
+    install -p -m 0644 ./include/inn/$f $RPM_BUILD_ROOT%{_includedir}/inn
 done
 
-mkdir -p $RPM_BUILD_ROOT/etc
-mv $RPM_BUILD_ROOT/usr/lib/news/bin/rc.news $RPM_BUILD_ROOT/etc
-
-touch     $RPM_BUILD_ROOT/var/lib/news/subscriptions
-chmod 644 $RPM_BUILD_ROOT/var/lib/news/subscriptions
+touch     $RPM_BUILD_ROOT%{_sharedstatedir}/news/subscriptions
+chmod 644 $RPM_BUILD_ROOT%{_sharedstatedir}/news/subscriptions
 
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/lib/news/distributions
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sharedstatedir}/news/distributions
 
-mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily}
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.daily/inn-cron-expire
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.hourly/inn-cron-rnews
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/cron.hourly/inn-cron-nntpsend
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.{hourly,daily}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/inn-cron-expire
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/inn-cron-rnews
+install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/inn-cron-nntpsend
 
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/innd
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+install %{SOURCE8} $RPM_BUILD_ROOT%{_initrddir}/innd
 
 tar xf %{SOURCE10}
 mv inn.html FAQ.html
 
-touch $RPM_BUILD_ROOT/var/lib/news/history
+touch $RPM_BUILD_ROOT%{_sharedstatedir}/news/history
 #LD_LIBRARY_PATH=$RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/bin/makedbz -i \
 # -f $RPM_BUILD_ROOT/var/lib/news/history
 #chmod 644 $RPM_BUILD_ROOT/var/lib/news/*
 
-cat > $RPM_BUILD_ROOT/etc/news/.profile <<EOF
-PATH=\$PATH:/usr/lib/news/bin
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/news/.profile <<EOF
+PATH=\$PATH:%{_libexecdir}/news
 export PATH
 EOF
 
 # we get this from cleanfeed
-rm -f $RPM_BUILD_ROOT/usr/lib/news/bin/filter/filter_innd.pl
+rm -f $RPM_BUILD_ROOT%{_libexecdir}/news/filter/filter_innd.pl
 
 #Fix perms in sample directory to avoid bogus dependencies
 find samples -name "*.in" -exec chmod a-x {} \;
 
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-ln -sf ../lib/news/bin/inews $RPM_BUILD_ROOT/usr/bin/inews
-ln -sf ../lib/news/bin/rnews $RPM_BUILD_ROOT/usr/bin/rnews
-
-rm -rf $RPM_BUILD_ROOT/usr/lib/news/lib/*.la
-rm -rf $RPM_BUILD_ROOT/usr/lib/news/lib/*.a
-
-%if "%{_libdir}" != "/usr/lib"
-rm -rf $RPM_BUILD_ROOT%{_libdir}/news/lib/*.a
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/news/lib
-mv $RPM_BUILD_ROOT/usr/lib/news/lib/*.so* $RPM_BUILD_ROOT%{_libdir}/news/lib
-%endif
-
-mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/
-
-echo '%{_libdir}/news/lib' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/inn-%{_arch}.conf
-
-rm -rf $RPM_BUILD_ROOT/usr/lib/news/include
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+ln -sf %{_libexecdir}/news/inews $RPM_BUILD_ROOT%{_bindir}/inews
+ln -sf %{_libexecdir}/news/rnews $RPM_BUILD_ROOT%{_bindir}/rnews
+
+# Remove unwanted files
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 
+# Documentation is installed via rpm %%doc directive
+rm -rf $RPM_BUILD_ROOT/usr/doc/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -f files.list files.main files.devel files.inews
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add innd
 #su -m news -c '/usr/lib/news/bin/makehistory'
-su -m news -c '/usr/lib/news/bin/makedbz -i -o'
+su -m news -c '/usr/libexec/news/makedbz -i -o'
 
 umask 002
 touch /var/log/news/news.notice
@@ -211,10 +211,10 @@ touch /var/log/news/news.crit
 touch /var/log/news/news.err
 chown -R news:news /var/log/news*
 
+%post libs -p /sbin/ldconfig
+
 %triggerpostun -- inn < 2.3.0
 service innd stop > /dev/null 2>&1
-exit 0
-
 
 %triggerin -- rsyslog
 if [ -f /etc/rsyslog.conf ]; then
@@ -274,24 +274,23 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-/sbin/ldconfig
 if [ "$1" -ge 1 ]; then
     service innd condrestart > /dev/null 2>&1
 fi
-exit 0
 
-%files
-%defattr(-,news,news,-)
-/usr/bin/rnews
+%postun libs -p /sbin/ldconfig
 
+%files
+%defattr(0755,news,news,-)
+%{_bindir}/rnews
+%defattr(0755,root,root,-)
 # /etc config files plus cron config
-%config(noreplace) /etc/rc.news
-%config(noreplace) /etc/ld.so.conf.d/inn-%{_arch}.conf
-%config(noreplace) %attr(-,root,root) /etc/rc.d/init.d/innd
-%config(noreplace) %attr(-,root,root) /etc/cron.hourly/inn-cron-rnews
-%config(noreplace) %attr(-,root,root) /etc/cron.hourly/inn-cron-nntpsend
-%config(noreplace) %attr(-,root,root) /etc/cron.daily/inn-cron-expire
+%{_initrddir}/innd
+%{_sysconfdir}/cron.hourly/inn-cron-rnews
+%{_sysconfdir}/cron.hourly/inn-cron-nntpsend
+%{_sysconfdir}/cron.daily/inn-cron-expire
 
+%defattr(-,news,news,-)
 # /etc/news config files
 %dir %{_sysconfdir}/news
 %config(noreplace) %{_sysconfdir}/news/passwd.nntp
@@ -324,181 +323,147 @@ exit 0
 %config(noreplace) %{_sysconfdir}/news/readers.conf
 %config(noreplace) %{_sysconfdir}/news/distributions
 
-%dir /var/lib/news
-%config(noreplace) /var/lib/news/active.times
-%config(noreplace) /var/lib/news/distributions
-%config(noreplace) /var/lib/news/newsgroups
-%config(noreplace) /var/lib/news/active
-%config(noreplace) /var/lib/news/subscriptions
-%config(noreplace) /var/lib/news/history
-
-%dir /usr/lib/news
-%dir /usr/lib/news/bin
-/usr/lib/news/bin/controlbatch
-%attr(4510,root,news) /usr/lib/news/bin/innbind
-/usr/lib/news/bin/docheckgroups
-/usr/lib/news/bin/imapfeed
-/usr/lib/news/bin/send-nntp
-/usr/lib/news/bin/actmerge
-/usr/lib/news/bin/ovdb_server
-/usr/lib/news/bin/filechan
-/usr/lib/news/bin/ninpaths
-/usr/lib/news/bin/mod-active
-/usr/lib/news/bin/news2mail
-/usr/lib/news/bin/innconfval
-/usr/lib/news/bin/shlock
-/usr/lib/news/bin/nnrpd
-/usr/lib/news/bin/controlchan
-/usr/lib/news/bin/procbatch
-/usr/lib/news/bin/expire
-/usr/lib/news/bin/convdate
-/usr/lib/news/bin/pullnews
-/usr/lib/news/bin/archive
-/usr/lib/news/bin/cnfsstat
-/usr/lib/news/bin/grephistory
-/usr/lib/news/bin/send-ihave
-/usr/lib/news/bin/tinyleaf
-/usr/lib/news/bin/cvtbatch
-/usr/lib/news/bin/expirerm
-%attr(4550,uucp,news) /usr/lib/news/bin/rnews
-/usr/lib/news/bin/innxmit
-/usr/lib/news/bin/actsyncd
-/usr/lib/news/bin/shrinkfile
-/usr/lib/news/bin/makedbz
-/usr/lib/news/bin/actsync
-/usr/lib/news/bin/pgpverify
-/usr/lib/news/bin/inndf
-/usr/lib/news/bin/scanlogs
-/usr/lib/news/bin/simpleftp
-/usr/lib/news/bin/ovdb_init
-/usr/lib/news/bin/ctlinnd
-/usr/lib/news/bin/innstat
-/usr/lib/news/bin/send-uucp
-/usr/lib/news/bin/buffchan
-/usr/lib/news/bin/perl-nocem
-/usr/lib/news/bin/scanspool
-/usr/lib/news/bin/expireover
-/usr/lib/news/bin/batcher
-/usr/lib/news/bin/fastrm
-/usr/lib/news/bin/innmail
-/usr/lib/news/bin/innxbatch
-/usr/lib/news/bin/buffindexed_d
-/usr/lib/news/bin/nntpget
-/usr/lib/news/bin/cnfsheadconf
-/usr/lib/news/bin/ovdb_stat
-/usr/lib/news/bin/prunehistory
-/usr/lib/news/bin/innreport
-/usr/lib/news/bin/getlist
-/usr/lib/news/bin/innd
-/usr/lib/news/bin/innupgrade
-/usr/lib/news/bin/news.daily
-/usr/lib/news/bin/sm
-/usr/lib/news/bin/innwatch
-/usr/lib/news/bin/inncheck
-/usr/lib/news/bin/writelog
-/usr/lib/news/bin/signcontrol
-/usr/lib/news/bin/tdx-util
-/usr/lib/news/bin/tally.control
-/usr/lib/news/bin/overchan
-/usr/lib/news/bin/sendinpaths
-/usr/lib/news/bin/makehistory
-/usr/lib/news/bin/nntpsend
-/usr/lib/news/bin/mailpost
-/usr/lib/news/bin/innfeed
-/usr/lib/news/bin/ovdb_monitor
-/usr/lib/news/bin/sendxbatches
-
-%dir /usr/lib/news/bin/filter
-/usr/lib/news/bin/filter/filter_nnrpd.pl
-/usr/lib/news/bin/filter/nnrpd_access.pl
-/usr/lib/news/bin/filter/startup_innd.pl
-/usr/lib/news/bin/filter/nnrpd_auth.py
-/usr/lib/news/bin/filter/nnrpd_access.py
-/usr/lib/news/bin/filter/nnrpd_auth.pl
-/usr/lib/news/bin/filter/INN.py
-/usr/lib/news/bin/filter/nnrpd.py
-/usr/lib/news/bin/filter/filter_innd.py
-/usr/lib/news/bin/filter/nnrpd_dynamic.py
-
-%dir /usr/lib/news/bin/auth
-%dir /usr/lib/news/bin/auth/passwd
-/usr/lib/news/bin/auth/passwd/radius
-/usr/lib/news/bin/auth/passwd/ckpasswd
-
-%dir /usr/lib/news/bin/auth/resolv
-/usr/lib/news/bin/auth/resolv/domain
-/usr/lib/news/bin/auth/resolv/ident
-
-%dir /usr/lib/news/bin/control
-/usr/lib/news/bin/control/version.pl
-/usr/lib/news/bin/control/ihave.pl
-/usr/lib/news/bin/control/sendsys.pl
-/usr/lib/news/bin/control/sendme.pl
-/usr/lib/news/bin/control/checkgroups.pl
-/usr/lib/news/bin/control/senduuname.pl
-/usr/lib/news/bin/control/newgroup.pl
-/usr/lib/news/bin/control/rmgroup.pl
-
-%dir /usr/lib/news/bin/rnews.libexec
-/usr/lib/news/bin/rnews.libexec/encode
-/usr/lib/news/bin/rnews.libexec/gunbatch
-/usr/lib/news/bin/rnews.libexec/decode
-/usr/lib/news/bin/rnews.libexec/bunbatch
-/usr/lib/news/bin/rnews.libexec/c7unbatch
-
-%dir /usr/lib/news/lib
-/usr/lib/news/lib/innreport_inn.pm
-%{_libdir}/news/lib/libinnhist.so.2
-%{_libdir}/news/lib/libinnhist.so.2.0.0
-%{_libdir}/news/lib/libinnhist.so
-%{_libdir}/news/lib/libstorage.so
-%{_libdir}/news/lib/libstorage.so.2
-%{_libdir}/news/lib/libstorage.so.2.0.0
-%{_libdir}/news/lib/libinn.so
-%{_libdir}/news/lib/libinn.so.2
-%{_libdir}/news/lib/libinn.so.2.0.0
-
-%config(noreplace) /usr/lib/news/lib/innshellvars.pl
-%config(noreplace) /usr/lib/news/lib/innshellvars
-%config(noreplace) /usr/lib/news/lib/innshellvars.tcl
-
-%dir /usr/lib/news/doc
-/usr/lib/news/doc/LICENSE
-/usr/lib/news/doc/config-design
-/usr/lib/news/doc/history-innfeed
-/usr/lib/news/doc/GPL
-/usr/lib/news/doc/sample-control
-/usr/lib/news/doc/config-semantics
-/usr/lib/news/doc/CONTRIBUTORS
-/usr/lib/news/doc/external-auth
-/usr/lib/news/doc/TODO
-/usr/lib/news/doc/README
-/usr/lib/news/doc/NEWS
-/usr/lib/news/doc/HACKING
-/usr/lib/news/doc/hook-python
-/usr/lib/news/doc/config-syntax
-/usr/lib/news/doc/hook-perl
-/usr/lib/news/doc/INSTALL
-/usr/lib/news/doc/history
-
-%dir /usr/lib/news/http
-/usr/lib/news/http/innreport.css
-
-%dir /usr/lib/news/lib/perl
-%dir /usr/lib/news/lib/perl/INN
-/usr/lib/news/lib/perl/INN/Config.pm
-
-# %dir /var/log/news
-# %config(noreplace) /var/lib/news/active.times
-# %config(noreplace) /var/lib/news/distributions
-# %config(noreplace) /var/lib/news/newsgroups
-# %config(noreplace) /var/lib/news/active
-# %config(noreplace) /var/lib/news/subscriptions
-# %config(noreplace) /var/lib/news/history
+%dir %{_sharedstatedir}/news
+%config(noreplace) %{_sharedstatedir}/news/active.times
+%config(noreplace) %{_sharedstatedir}/news/distributions
+%config(noreplace) %{_sharedstatedir}/news/newsgroups
+%config(noreplace) %{_sharedstatedir}/news/active
+%config(noreplace) %{_sharedstatedir}/news/subscriptions
+%config(noreplace) %{_sharedstatedir}/news/history
+
+%defattr(0755,root,news,-)
+%dir %{_libexecdir}/news
+%{_libexecdir}/news/controlbatch
+%attr(4510,root,news) %{_libexecdir}/news/innbind
+%{_libexecdir}/news/docheckgroups
+%{_libexecdir}/news/imapfeed
+%{_libexecdir}/news/send-nntp
+%{_libexecdir}/news/actmerge
+%{_libexecdir}/news/ovdb_server
+%{_libexecdir}/news/filechan
+%{_libexecdir}/news/ninpaths
+%{_libexecdir}/news/mod-active
+%{_libexecdir}/news/news2mail
+%{_libexecdir}/news/innconfval
+%{_libexecdir}/news/shlock
+%{_libexecdir}/news/nnrpd
+%{_libexecdir}/news/controlchan
+%{_libexecdir}/news/procbatch
+%{_libexecdir}/news/expire
+%{_libexecdir}/news/convdate
+%{_libexecdir}/news/pullnews
+%{_libexecdir}/news/archive
+%{_libexecdir}/news/cnfsstat
+%{_libexecdir}/news/grephistory
+%{_libexecdir}/news/send-ihave
+%{_libexecdir}/news/tinyleaf
+%{_libexecdir}/news/cvtbatch
+%{_libexecdir}/news/expirerm
+%{_libexecdir}/news/rc.news
+%attr(4550,uucp,news) %{_libexecdir}/news/rnews
+%{_libexecdir}/news/innxmit
+%{_libexecdir}/news/actsyncd
+%{_libexecdir}/news/shrinkfile
+%{_libexecdir}/news/makedbz
+%{_libexecdir}/news/actsync
+%{_libexecdir}/news/pgpverify
+%{_libexecdir}/news/inndf
+%{_libexecdir}/news/scanlogs
+%{_libexecdir}/news/simpleftp
+%{_libexecdir}/news/ovdb_init
+%{_libexecdir}/news/ctlinnd
+%{_libexecdir}/news/innstat
+%{_libexecdir}/news/send-uucp
+%{_libexecdir}/news/buffchan
+%{_libexecdir}/news/perl-nocem
+%{_libexecdir}/news/scanspool
+%{_libexecdir}/news/expireover
+%{_libexecdir}/news/batcher
+%{_libexecdir}/news/fastrm
+%{_libexecdir}/news/innmail
+%{_libexecdir}/news/innxbatch
+%{_libexecdir}/news/buffindexed_d
+%{_libexecdir}/news/nntpget
+%{_libexecdir}/news/cnfsheadconf
+%{_libexecdir}/news/ovdb_stat
+%{_libexecdir}/news/prunehistory
+%{_libexecdir}/news/innreport
+%attr(0644,root,news) %{_libexecdir}/news/innreport_inn.pm
+%{_libexecdir}/news/getlist
+%{_libexecdir}/news/innd
+%{_libexecdir}/news/innupgrade
+%{_libexecdir}/news/news.daily
+%{_libexecdir}/news/sm
+%{_libexecdir}/news/innwatch
+%{_libexecdir}/news/inncheck
+%{_libexecdir}/news/writelog
+%{_libexecdir}/news/signcontrol
+%{_libexecdir}/news/tdx-util
+%{_libexecdir}/news/tally.control
+%{_libexecdir}/news/overchan
+%{_libexecdir}/news/sendinpaths
+%{_libexecdir}/news/makehistory
+%{_libexecdir}/news/nntpsend
+%{_libexecdir}/news/mailpost
+%{_libexecdir}/news/innfeed
+%{_libexecdir}/news/ovdb_monitor
+%{_libexecdir}/news/sendxbatches
+
+%define filterdir %{_libexecdir}/news/filter
+%dir %{filterdir}
+%{filterdir}/filter_nnrpd.pl
+%{filterdir}/nnrpd_access.pl
+%{filterdir}/startup_innd.pl
+%{filterdir}/nnrpd_auth.py*
+%{filterdir}/nnrpd_access.py*
+%{filterdir}/nnrpd_auth.pl
+%{filterdir}/INN.py*
+%{filterdir}/nnrpd.py*
+%{filterdir}/filter_innd.py*
+%{filterdir}/nnrpd_dynamic.py*
+
+%define authdir %{_libexecdir}/news/auth
+%define passwddir %{authdir}/passwd
+%dir %{authdir}
+%dir %{passwddir}
+%{passwddir}/radius
+%{passwddir}/ckpasswd
+
+%define resolvdir %{authdir}/resolv
+%dir %{resolvdir}
+%{resolvdir}/domain
+%{resolvdir}/ident
+
+%define controldir %{_libexecdir}/news/control
+%dir %{controldir}
+%{controldir}/version.pl
+%{controldir}/ihave.pl
+%{controldir}/sendsys.pl
+%{controldir}/sendme.pl
+%{controldir}/checkgroups.pl
+%{controldir}/senduuname.pl
+%{controldir}/newgroup.pl
+%{controldir}/rmgroup.pl
+
+%define rnewsdir %{_libexecdir}/news/rnews.libexec
+%dir %{rnewsdir}
+%{rnewsdir}/encode
+%{rnewsdir}/gunbatch
+%{rnewsdir}/decode
+%{rnewsdir}/bunbatch
+%{rnewsdir}/c7unbatch
+
+%{_libexecdir}/news/innshellvars.pl
+%{_libexecdir}/news/innshellvars
+%{_libexecdir}/news/innshellvars.tcl
 
-%if "%{_libdir}" != "/usr/lib"
-%dir %{_libdir}/news
-%endif
+%dir %{_sharedstatedir}/news/http
+%{_sharedstatedir}/news/http/innreport.css
+
+%dir %{perl_vendorlib}/INN
+%{perl_vendorlib}/INN/Config.pm
+
+%defattr(-,news,news,-)
 %dir /var/spool/news
 %dir /var/spool/news/archive
 %dir /var/spool/news/articles
@@ -508,9 +473,9 @@ exit 0
 %dir /var/spool/news/outgoing
 %dir /var/spool/news/overview
 %dir /var/log/news/OLD
-%dir /var/lib/news/tmp
+%dir %{_sharedstatedir}/news/tmp
 %dir /var/run/news
-%defattr(-,root,root)
+%defattr(0644,root,root,-)
 %{_mandir}/man1/c*.1.gz
 %{_mandir}/man1/f*.1.gz
 %{_mandir}/man1/g*.1.gz
@@ -520,35 +485,34 @@ exit 0
 %{_mandir}/man1/r*.1.gz
 %{_mandir}/man1/s*.1.gz
 %{_mandir}/man[58]/*
-%doc NEWS README* ChangeLog CONTRIBUTORS LICENSE INSTALL FAQ.html
+%doc NEWS README* HACKING ChangeLog CONTRIBUTORS LICENSE INSTALL FAQ.html 
+%doc doc/config-design doc/history-innfeed doc/GPL doc/sample-control
+%doc doc/config-semantics doc/external-auth TODO doc/hook-python doc/config-syntax
+%doc doc/hook-perl doc/history
+%defattr(0755,root,root,-)
 %doc %dir samples
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+
 %files devel
-%defattr(-,root,root)
-%dir /usr/include/inn
-/usr/include/inn/clibrary.h
-/usr/include/inn/config.h
-/usr/include/inn/dbz.h
-/usr/include/inn/defines.h
-/usr/include/inn/libinn.h
-/usr/include/inn/storage.h
-/usr/include/inn/system.h
-/usr/include/inn/options.h
-%{_libdir}/news/lib/libstorage.so
-%{_libdir}/news/lib/libinn.so
-%{_libdir}/news/lib/libinnhist.so
+%defattr(-,root,root,-)
+%dir %{_includedir}/inn/
+%{_includedir}/inn/*
+%{_libdir}/lib*.so
 %{_mandir}/man3/*
 
 %files -n inews
-%defattr(-,root,root)
-%config(noreplace) %attr(-,news,news) /etc/news/inn.conf
-/usr/bin/inews
-%attr(0755,root,root) /usr/lib/news/bin/inews
+%defattr(-,root,root,-)
+%config(noreplace) %attr(-,news,news) %{_sysconfdir}/news/inn.conf
+%{_bindir}/inews
+%attr(0755,root,root) %{_libexecdir}/news/inews
 %{_mandir}/man1/inews*
 
 %changelog
-* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.5.1-2
-- rebuild against perl 5.10.1
+* Fri Dec 11 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 2.5.1-2
+- #225901 - Merge Review: inn
 
 * Tue Oct 13 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.1-1
 - New upstream release
@@ -565,7 +529,7 @@ exit 0
 
 * Wed Jun 24 2009 Ondrej Vasik <ovasik at redhat.com> - 2.5.0-2
 - add support for load average to makehistory(#276061)
-- update faq, ship it in %doc
+- update faq, ship it in %%doc
 - fix typo in filelist
 
 * Tue Jun 09 2009 Ondrej Vasik <ovasik at redhat.com> - 2.5.0-1


--- inn-2.4.1.pie.patch DELETED ---


--- inn-2.4.3-nologinshell.patch DELETED ---



From limb at fedoraproject.org  Fri Dec 11 16:48:32 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 16:48:32 +0000 (UTC)
Subject: File matplotlib-0.99.1.2.tar.gz uploaded to lookaside cache by limb
Message-ID: <20091211164832.DF7CD10F87E@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-matplotlib:

952e2c992e4a762b8538171f51c9140a  matplotlib-0.99.1.2.tar.gz



From limb at fedoraproject.org  Fri Dec 11 16:49:00 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 16:49:00 +0000 (UTC)
Subject: rpms/python-matplotlib/devel .cvsignore, 1.20,
	1.21 python-matplotlib.spec, 1.44, 1.45 sources, 1.20, 1.21
Message-ID: <20091211164900.CEE3D11C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/python-matplotlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22608

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Log Message:
Update to 0.99.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-matplotlib/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	23 Dec 2008 07:50:29 -0000	1.20
+++ .cvsignore	11 Dec 2009 16:49:00 -0000	1.21
@@ -1 +1 @@
-matplotlib-0.98.5.2.tar.gz
+matplotlib-0.99.1.2.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- python-matplotlib.spec	26 Jul 2009 20:38:59 -0000	1.44
+++ python-matplotlib.spec	11 Dec 2009 16:49:00 -0000	1.45
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.98.5.2
-Release:        5%{?dist}
+Version:        0.99.1.2
+Release:        1%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -38,7 +38,8 @@ Requires:       tkinter
 
 
 %prep
-%setup -q -n matplotlib-%{version}
+#%setup -q -n matplotlib-%{version}
+%setup -q -n matplotlib-0.99.1.1
 #%patch0 -p1
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 
@@ -78,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 11 2009 Jon Ciesla <limb at jcomserv.net> - 0.99.1.2
+- Update to 0.99.1.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.98.5.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-matplotlib/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	23 Dec 2008 07:50:29 -0000	1.20
+++ sources	11 Dec 2009 16:49:00 -0000	1.21
@@ -1 +1 @@
-3e8210ec8bb71a18962ec8b43688509c  matplotlib-0.98.5.2.tar.gz
+952e2c992e4a762b8538171f51c9140a  matplotlib-0.99.1.2.tar.gz



From hadess at fedoraproject.org  Fri Dec 11 16:49:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 16:49:32 +0000 (UTC)
Subject: File totem-2.28.5.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091211164932.008BB10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for totem:

03b43f3c3a93b6dbcf1d1b370cc9297f  totem-2.28.5.tar.bz2



From hadess at fedoraproject.org  Fri Dec 11 16:49:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 11 Dec 2009 16:49:45 +0000 (UTC)
Subject: rpms/totem/F-12 .cvsignore, 1.82, 1.83 sources, 1.82,
	1.83 totem.spec, 1.270, 1.271
Message-ID: <20091211164945.BD52911C00C5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22903

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.5-1
- Update to 2.28.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	19 Nov 2009 15:07:44 -0000	1.82
+++ .cvsignore	11 Dec 2009 16:49:45 -0000	1.83
@@ -1 +1 @@
-totem-2.28.4.tar.bz2
+totem-2.28.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	19 Nov 2009 15:07:44 -0000	1.82
+++ sources	11 Dec 2009 16:49:45 -0000	1.83
@@ -1 +1 @@
-a08fca39db3c3e7885c584e0fd533f5a  totem-2.28.4.tar.bz2
+03b43f3c3a93b6dbcf1d1b370cc9297f  totem-2.28.5.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/totem.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- totem.spec	19 Nov 2009 15:07:44 -0000	1.270
+++ totem.spec	11 Dec 2009 16:49:45 -0000	1.271
@@ -5,7 +5,7 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.28.4
+Version: 2.28.5
 Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
@@ -381,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.5-1
+- Update to 2.28.5
+
 * Thu Nov 19 2009 Bastien Nocera <bnocera at redhat.com> 2.28.4-1
 - Update to 2.28.4
 



From ovasik at fedoraproject.org  Fri Dec 11 17:07:22 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 11 Dec 2009 17:07:22 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-6.10-configuration.patch, 1.24,
	1.25 coreutils.spec, 1.290, 1.291
Message-ID: <20091211170722.1771D11C00C5@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28520

Modified Files:
	coreutils-6.10-configuration.patch coreutils.spec 
Log Message:
temporarily do not run dup_cloexec(), dependent gnulib tests failing in koji

coreutils-6.10-configuration.patch:
 coreutils-6.11/tests/test-lib.sh         |    4 ++--
 coreutils-7.1/src/ls.c                   |    8 ++++----
 coreutils-7.2/gnulib-tests/gnulib.mk     |   12 ++++++------
 coreutils-8.1/tests/touch/no-dereference |    2 ++
 coreutils-8.2/gnulib-tests/gnulib.mk     |   24 ++++++++++++------------
 5 files changed, 26 insertions(+), 24 deletions(-)

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- coreutils-6.10-configuration.patch	27 Nov 2009 13:24:08 -0000	1.24
+++ coreutils-6.10-configuration.patch	11 Dec 2009 17:07:21 -0000	1.25
@@ -78,3 +78,58 @@ diff -urNp coreutils-8.1-orig/tests/touc
  
  # Changing time of dangling symlink is okay.
  touch -h dangling || fail=1
+diff -urNp coreutils-8.2-orig/gnulib-tests/gnulib.mk coreutils-8.2/gnulib-tests/gnulib.mk
+--- coreutils-8.2-orig/gnulib-tests/gnulib.mk	2009-12-11 17:54:36.850815863 +0100
++++ coreutils-8.2/gnulib-tests/gnulib.mk	2009-12-11 18:03:01.034460289 +0100
+@@ -233,9 +233,9 @@ EXTRA_DIST += test-chown.h test-chown.c
+ 
+ ## begin gnulib module cloexec-tests
+ 
+-TESTS += test-cloexec
+-check_PROGRAMS += test-cloexec
+-EXTRA_DIST += test-cloexec.c
++#TESTS += test-cloexec
++#check_PROGRAMS += test-cloexec
++#EXTRA_DIST += test-cloexec.c
+ 
+ ## end   gnulib module cloexec-tests
+ 
+@@ -293,9 +293,9 @@ EXTRA_DIST += test-dirname.c
+ 
+ ## begin gnulib module dup2-tests
+ 
+-TESTS += test-dup2
+-check_PROGRAMS += test-dup2
+-EXTRA_DIST += test-dup2.c
++#TESTS += test-dup2
++#check_PROGRAMS += test-dup2
++#EXTRA_DIST += test-dup2.c
+ 
+ ## end   gnulib module dup2-tests
+ 
+@@ -337,9 +337,9 @@ EXTRA_DIST += test-exclude.c test-exclud
+ 
+ ## begin gnulib module fchdir-tests
+ 
+-TESTS += test-fchdir
+-check_PROGRAMS += test-fchdir
+-EXTRA_DIST += test-fchdir.c
++#TESTS += test-fchdir
++#check_PROGRAMS += test-fchdir
++#EXTRA_DIST += test-fchdir.c
+ 
+ ## end   gnulib module fchdir-tests
+ 
+@@ -1463,9 +1463,9 @@ EXTRA_DIST += test-uname.c
+ 
+ ## begin gnulib module unistd-safer-tests
+ 
+-TESTS += test-dup-safer
+-check_PROGRAMS += test-dup-safer
+-EXTRA_DIST += test-dup-safer.c
++#TESTS += test-dup-safer
++#check_PROGRAMS += test-dup-safer
++#EXTRA_DIST += test-dup-safer.c
+ 
+ ## end   gnulib module unistd-safer-tests
+ 


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- coreutils.spec	11 Dec 2009 16:38:48 -0000	1.290
+++ coreutils.spec	11 Dec 2009 17:07:21 -0000	1.291
@@ -328,7 +328,8 @@ fi
 %changelog
 * Fri Dec 11 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-1
 - new upstream release 8.2
-- removed applied patches
+- removed applied patches, temporarily do not run dup_cloexec()
+  dependent gnulib tests failing in koji
 
 * Fri Nov 27 2009 Ondrej Vasik <ovasik at redhat.com> - 8.1-1
 - new upstream release 8.1



From pkgdb at fedoraproject.org  Fri Dec 11 17:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 17:09:50 +0000
Subject: [pkgdb] squashfs-tools had acl change status
Message-ID: <20091211170951.274F510F891@bastion2.fedora.phx.redhat.com>

kyle has set the commit acl on squashfs-tools (Fedora devel) to Approved for bruno

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From than at fedoraproject.org  Fri Dec 11 17:10:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 11 Dec 2009 17:10:24 +0000 (UTC)
Subject: rpms/kdelibs3/F-12 arts-acinclude.patch, NONE, 1.1 kdelibs3.spec,
	1.79, 1.80
Message-ID: <20091211171024.4B44111C03FC@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29639

Modified Files:
	kdelibs3.spec 
Added Files:
	arts-acinclude.patch 
Log Message:
patch autoconfigury to build with autoconf >= 2.64 (Stepan Kasal)



arts-acinclude.patch:
 acinclude.m4.in |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE arts-acinclude.patch ---
2009-12-10  Stepan Kasal  <skasal at redhat.com>

The change of implementation of AC_REQUIRE in 2.64 caused a regression
in the arts project.
This can be fixed by shuffling some macro calls.

I suppose that most of this patch will not be needed with a future
release of Autoconf.
But the last chunk of this patch is a real bug in this source and
should go upstream.

--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
@@ -3081,8 +3081,18 @@
 fi
 ])
 
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
+[ 
+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+  CFLAGS=" $CFLAGS"
+  AC_PROG_CC
+  CXXFLAGS=" $CXXFLAGS"
+  AC_PROG_CXX
+])
+
 AC_DEFUN([AC_CHECK_COMPILERS],
 [
+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
   AC_ARG_ENABLE(debug,
 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
@@ -3141,11 +3151,6 @@
     [kde_use_profiling="no"]
   )
 
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
   AC_PROG_CPP
 
   if test "$GCC" = "yes"; then
@@ -3174,10 +3179,6 @@
      LDFLAGS=""
   fi
 
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
   KDE_CHECK_FOR_BAD_COMPILER
 
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
@@ -3503,8 +3504,8 @@
 AC_REQUIRE([AC_LIBTOOL_DLOPEN])
 AC_REQUIRE([KDE_CHECK_LIB64])
 
-AC_OBJEXT
-AC_EXEEXT
+AC_REQUIRE([AC_OBJEXT])
+AC_REQUIRE([AC_EXEEXT])
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-12/kdelibs3.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- kdelibs3.spec	9 Dec 2009 18:30:07 -0000	1.79
+++ kdelibs3.spec	11 Dec 2009 17:10:24 -0000	1.80
@@ -85,7 +85,7 @@ Patch106: kdelibs-3.5.10-kio.patch
 Patch107: kdelibs-3.5.10-assert.patch
 Patch108: kdelibs-3.5.10-dtoa.patch
 Patch109: kdelibs-3.5.10-kabc.patch
-
+Patch110: arts-acinclude.patch
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -251,6 +251,7 @@ format for easy browsing
 %patch107 -p1 -b .assert
 %patch108 -p1 -b .alias
 %patch109 -p1 -b .kabc
+%patch110 -p1 -b .autoconf
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -587,6 +588,8 @@ touch --no-create %{_datadir}/icons/crys
 * Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
 - fix security issues in libltdl bundle within kdelibs CVE-2009-3736
 - backport upstream patches
+- patch autoconfigury to build with autoconf >= 2.64 (Stepan Kasal)
+
 
 * Mon Nov  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428



From limb at fedoraproject.org  Fri Dec 11 17:27:40 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 17:27:40 +0000 (UTC)
Subject: File basemap-0.99.4.tar.gz uploaded to lookaside cache by limb
Message-ID: <20091211172740.4EF0310F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-basemap:

07fe1a01c321c43db4739c18e99d4d44  basemap-0.99.4.tar.gz



From limb at fedoraproject.org  Fri Dec 11 17:30:17 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 17:30:17 +0000 (UTC)
Subject: rpms/python-basemap/devel .cvsignore, 1.12, 1.13 python-basemap.spec,
	1.29, 1.30 sources, 1.13, 1.14
Message-ID: <20091211173017.73D4A11C0345@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/python-basemap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3376

Modified Files:
	.cvsignore python-basemap.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Dec 2008 17:48:36 -0000	1.12
+++ .cvsignore	11 Dec 2009 17:30:17 -0000	1.13
@@ -1 +1 @@
-basemap-0.99.2.tar.gz
+basemap-0.99.4.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- python-basemap.spec	26 Jul 2009 20:09:31 -0000	1.29
+++ python-basemap.spec	11 Dec 2009 17:30:17 -0000	1.30
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-basemap
-Version:        0.99.2
-Release:        5%{?dist}
+Version:        0.99.4
+Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
 License:        LGPLv2+
@@ -10,7 +10,7 @@ URL:            http://matplotlib.source
 Source0:        http://downloads.sourceforge.net/matplotlib/basemap-%{version}.tar.gz
 #Patch0:         python-basemap-0.99-setup.cfg.patch
 #Patch1:         python-basemap-0.99-setup.patch
-Patch2:         python-basemap-0.99-datadir.patch
+#Patch2:         python-basemap-0.99-datadir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, proj-devel, shapelib-devel, numpy-f2py, geos-devel 
@@ -26,7 +26,7 @@ projections (with continental and politi
 %setup -q -n basemap-%{version}
 #%patch0 -p0
 #%patch1 -p0
-%patch2 -p0
+#%patch2 -p0
 #Remove the bundled libraries
 #mv src/_pyproj.c src/basemap_pycompat.h .
 #rm -rf src pyshapelib/shapelib
@@ -36,6 +36,7 @@ rm -rf lib/mpl_toolkits/basemap/data/
 
 %build
 export GEOS_LIB="/usr/"
+export BASEMAPDATA="/usr/share/basemap"
 %{__python} setup.py config
 %{__python} setup.py build
 
@@ -67,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/_geoslib.so
 
 %changelog
+* Fri Dec 11 2009 Jon Ciesla <limb at jcomserv.net> - 0.99.4-1
+- Update to latest upstream.
+- Dropped datadir patch, now handled with environment variable.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Dec 2008 10:25:18 -0000	1.13
+++ sources	11 Dec 2009 17:30:17 -0000	1.14
@@ -1 +1 @@
-ba81a00fa77daf71cb27fca5f4c86fb9  basemap-0.99.2.tar.gz
+07fe1a01c321c43db4739c18e99d4d44  basemap-0.99.4.tar.gz



From limb at fedoraproject.org  Fri Dec 11 17:32:48 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 17:32:48 +0000 (UTC)
Subject: File basemap-0.99.4-examples.tar.gz uploaded to lookaside cache by
	limb
Message-ID: <20091211173248.37D1010F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-basemap-data:

3700f4d59b9b01e33db30b7c83f69071  basemap-0.99.4-examples.tar.gz



From rdieter at fedoraproject.org  Fri Dec 11 17:38:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 17:38:01 +0000 (UTC)
Subject: rpms/amarok/F-12 amarok-2.2.1.90-qtscript_not_required.patch, NONE, 
	1.1 .cvsignore, 1.53, 1.54 amarok.spec, 1.173, 1.174 sources,
	1.54, 1.55 amarok-2.0.90-qtscript_not_required.patch, 1.1,
	NONE playlist_default_layout_fix.diff, 1.1, NONE
Message-ID: <20091211173801.6A2CE11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6053

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-2.2.1.90-qtscript_not_required.patch 
Removed Files:
	amarok-2.0.90-qtscript_not_required.patch 
	playlist_default_layout_fix.diff 
Log Message:
* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
- amarok-2.2.1.90 (2.2.2 beta1)


amarok-2.2.1.90-qtscript_not_required.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE amarok-2.2.1.90-qtscript_not_required.patch ---
diff -up amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required amarok-2.2.1.90/CMakeLists.txt
--- amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required	2009-12-10 04:45:37.000000000 -0600
+++ amarok-2.2.1.90/CMakeLists.txt	2009-12-10 09:42:21.253183224 -0600
@@ -75,8 +75,8 @@ if( WITH_PLAYER )
 
     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.3.0" "" )
 
-    find_package( QtScriptQtBindings REQUIRED )
-    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
+    macro_optional_find_package( QtScriptQtBindings )
+    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
 
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	12 Nov 2009 13:26:44 -0000	1.53
+++ .cvsignore	11 Dec 2009 17:38:01 -0000	1.54
@@ -1 +1 @@
-amarok-2.2.1.tar.bz2
+amarok-2.2.1.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- amarok.spec	16 Nov 2009 15:29:46 -0000	1.173
+++ amarok.spec	11 Dec 2009 17:38:01 -0000	1.174
@@ -1,19 +1,18 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.2.1
-Release: 2%{?dist}
+Version: 2.2.1.90
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch50: amarok-2.0.90-qtscript_not_required.patch
+Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: playlist_default_layout_fix.diff
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -34,7 +33,7 @@ BuildRequires: mysql-embedded-devel
 BuildRequires: qca2-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
-BuildRequires: taglib-extras-devel >= 1.0.0
+BuildRequires: taglib-extras-devel >= 1.0.1
 
 %global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
@@ -83,7 +82,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .playlist_default_layout_fix
 
 
 %build
@@ -175,6 +173,12 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
+- amarok-2.2.1.90 (2.2.2 beta1)
+
+* Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1-3 
+- rebuild (for qt-4.6.0-rc1, f13+)
+
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.1-2
 - playlist_default_layout_fix.diff (kde#211717)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	12 Nov 2009 13:26:44 -0000	1.54
+++ sources	11 Dec 2009 17:38:01 -0000	1.55
@@ -1 +1 @@
-4f6f45f0c25f85f2a2a1fff169ac7193  amarok-2.2.1.tar.bz2
+0fb6c98618c91159a26e3f2e837ef132  amarok-2.2.1.90.tar.bz2


--- amarok-2.0.90-qtscript_not_required.patch DELETED ---


--- playlist_default_layout_fix.diff DELETED ---



From pkgdb at fedoraproject.org  Fri Dec 11 17:48:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 17:48:35 +0000
Subject: [pkgdb] totem: krh has given up watchcommits
Message-ID: <20091211174835.5E83910F881@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on totem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From pkgdb at fedoraproject.org  Fri Dec 11 17:48:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 17:48:40 +0000
Subject: [pkgdb] totem: krh has given up watchcommits
Message-ID: <20091211174840.2121510F881@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on totem (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From pkgdb at fedoraproject.org  Fri Dec 11 17:48:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 17:48:42 +0000
Subject: [pkgdb] totem: krh has given up watchcommits
Message-ID: <20091211174842.B780610F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on totem (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From pkgdb at fedoraproject.org  Fri Dec 11 17:48:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 17:48:45 +0000
Subject: [pkgdb] totem: krh has given up watchcommits
Message-ID: <20091211174845.1D27210F881@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on totem (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From pkgdb at fedoraproject.org  Fri Dec 11 17:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 17:48:48 +0000
Subject: [pkgdb] totem: krh has given up watchcommits
Message-ID: <20091211174848.C06F710F881@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on totem (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From pkgdb at fedoraproject.org  Fri Dec 11 17:48:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 17:48:52 +0000
Subject: [pkgdb] totem: krh has given up watchcommits
Message-ID: <20091211174852.A503410F881@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on totem (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From pkgdb at fedoraproject.org  Fri Dec 11 17:48:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 17:48:57 +0000
Subject: [pkgdb] totem: krh has given up watchcommits
Message-ID: <20091211174857.1628710F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on totem (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From mdomsch at fedoraproject.org  Fri Dec 11 18:01:14 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 11 Dec 2009 18:01:14 +0000 (UTC)
Subject: File libsmbios-2.2.19.tar.bz2 uploaded to lookaside cache by mdomsch
Message-ID: <20091211180114.366FF10F881@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libsmbios:

ea18d71a3d310d1efe2404e8af218e15  libsmbios-2.2.19.tar.bz2



From bressers at fedoraproject.org  Fri Dec 11 18:05:35 2009
From: bressers at fedoraproject.org (Josh Bressers)
Date: Fri, 11 Dec 2009 18:05:35 +0000 (UTC)
Subject: CVSROOT avail,1.65,1.66
Message-ID: <20091211180535.D300E11C00C5@cvs1.fedora.phx.redhat.com>

Author: bressers

Update of /cvs/fedora/CVSROOT
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14670

Modified Files:
	avail 
Log Message:
Fis up the fedora-security permissions


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- avail	9 Sep 2009 16:18:26 -0000	1.65
+++ avail	11 Dec 2009 18:05:35 -0000	1.66
@@ -38,9 +38,9 @@
 # Fedora security repository
 unavail | | fedora-security
 # Red Hat Security Response Team
-avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security
-avail | lkundrak, thoger, vdanen | fedora-security
+avail | mjc,bressers,jorton,notting | fedora-security
+avail | thoger, vdanen, jlieskov | fedora-security
 # Fedora Security Response Team
 avail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security
-avail | trassl,kevin,dercorny,eteo | fedora-security
+avail | trassl,kevin,dercorny,eteo,lkundrak | fedora-security
 



From rdieter at fedoraproject.org  Fri Dec 11 18:07:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 18:07:45 +0000 (UTC)
Subject: rpms/phonon/F-11 phonon-4.3.50-xine_pulseaudio.patch, NONE,
	1.1 phonon-4.3.80-pa_min_ver.patch, NONE, 1.1 phonon_snapshot.sh,
	NONE, 1.1 .cvsignore, 1.12, 1.13 phonon.spec, 1.40, 1.41 sources,
	1.14, 1.15 phonon-4.2.96-pulseaudio.patch, 1.1,
	NONE phonon-4.2.96-xine-pulseaudio.patch, 1.1,
	NONE phonon-4.3.2-gstreamer-utf8-url.patch, 1.1,
	NONE phonon-4.3.2-gstreamer-volumefader.patch, 1.1,
	NONE phonon-4.3.2-kdebug#172242-2.patch, 1.1,
	NONE phonon-4.3.2-kdebug#172242.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch, 1.1, NONE
Message-ID: <20091211180745.9289A11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15311

Modified Files:
	.cvsignore phonon.spec sources 
Added Files:
	phonon-4.3.50-xine_pulseaudio.patch 
	phonon-4.3.80-pa_min_ver.patch phonon_snapshot.sh 
Removed Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.2.96-xine-pulseaudio.patch 
	phonon-4.3.2-gstreamer-utf8-url.patch 
	phonon-4.3.2-gstreamer-volumefader.patch 
	phonon-4.3.2-kdebug#172242-2.patch 
	phonon-4.3.2-kdebug#172242.patch 
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
sync w/devel for phonon-4.3.80 goodness


phonon-4.3.50-xine_pulseaudio.patch:
 backend.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE phonon-4.3.50-xine_pulseaudio.patch ---
diff -up phonon/xine/backend.cpp.pulseaudio phonon/xine/backend.cpp
--- phonon/xine/backend.cpp.pulseaudio	2009-10-03 14:00:19.000000000 -0500
+++ phonon/xine/backend.cpp	2009-10-19 12:23:17.768923476 -0500
@@ -649,7 +649,7 @@ void Backend::checkAudioOutputs()
                             "in KDE2 and KDE3. Its use is discouraged.</p></html>"),
                         /*icon name */"audio-backend-arts", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                addAudioOutput(nextIndex++, 10, tr("PulseAudio"),
+                addAudioOutput(nextIndex++, 2000, tr("PulseAudio"),
                         xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]),
                         /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "esd")) {

phonon-4.3.80-pa_min_ver.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE phonon-4.3.80-pa_min_ver.patch ---
diff -up phonon-4.3.80/phonon/CMakeLists.txt.phonon_ver phonon-4.3.80/phonon/CMakeLists.txt
--- phonon-4.3.80/phonon/CMakeLists.txt.phonon_ver	2009-12-03 13:29:35.000000000 -0600
+++ phonon-4.3.80/phonon/CMakeLists.txt	2009-12-11 12:03:20.413741629 -0600
@@ -8,7 +8,7 @@ endif (PHONON_BUILD_EXAMPLES)
 
 add_subdirectory(experimental)
 
-set(PULSEAUDIO_MINIMUM_VERSION "0.9.21")
+set(PULSEAUDIO_MINIMUM_VERSION "0.9.15")
 macro_optional_find_package(PulseAudio)
 macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "A cross-platform, networked sound server." "http://www.pulseaudio.org" FALSE "" "Allows audio playback via the PulseAudio soundserver when it is running")
 macro_optional_find_package(GLIB2)


--- NEW FILE phonon_snapshot.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=phonon

set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/phonon $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	7 Oct 2009 14:24:40 -0000	1.12
+++ .cvsignore	11 Dec 2009 18:07:44 -0000	1.13
@@ -1,8 +1,8 @@
 gstreamer-logo.svg
-phonon-4.3.1.tar.bz2
 hi128-phonon-gstreamer.png
 hi16-phonon-gstreamer.png
 hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
+phonon-4.3.80.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/phonon.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- phonon.spec	7 Oct 2009 14:24:40 -0000	1.40
+++ phonon.spec	11 Dec 2009 18:07:45 -0000	1.41
@@ -1,12 +1,16 @@
 
+#define snap 20091203svn
+
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.3.1
-Release: 102%{?dist}
+Version: 4.3.80
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/phonon/phonon-%{version}.tar.bz2
+#Source0: phonon-%{snap}.tar.bz2
+Source1: phonon_snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
@@ -17,27 +21,15 @@ Source14: hi48-phonon-gstreamer.png
 Source15: hi64-phonon-gstreamer.png
 Source16: hi128-phonon-gstreamer.png
 
-# Make PulseAudio the default when listed by the backend.
-# Note that this currently only works for the Xine backend. Device selection in
-# the GStreamer backend is weird: there is a setting for "sink" which cannot be
-# set through systemsettings, and listed devices are only those supported by the
-# "sink". So it never lists "PulseAudio" as a supported device, you have to pick
-# it as a "sink", and then the device setting is ignored entirely.
-Patch0:  phonon-4.2.96-pulseaudio.patch
-Patch1:  phonon-4.2.96-xine-pulseaudio.patch
-Patch2:  qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
-
-## define to build phonon-backend-xine only
-#define xine_only 1
-#Patch10: phonon-4.3.1-xineonly.patch
+# Prefer PulseAudio
+# This one was easiest to port, but doesn't seem to work by itself as-is
+# maybe we can just wait for the improvie PA support to land.
+Patch1:  phonon-4.3.50-xine_pulseaudio.patch
+
+# relax min version of pulseaudio
+Patch2: phonon-4.3.80-pa_min_ver.patch
 
 ## Upstream patches
-Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
-Patch101: phonon-4.3.2-gstreamer-volumefader.patch
-# fix for non-ascii filenames in xine backend
-Patch102: phonon-4.3.2-kdebug#172242.patch
-# escape '#' too
-Patch103: phonon-4.3.2-kdebug#172242-2.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
@@ -50,14 +42,15 @@ BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
+%if 0%{?fedora} > 10
+BuildRequires: pulseaudio-libs-devel >= 0.9.15
+%else
+%define pa_keep_old_hacks 1
+%endif
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
-%if 0%{?fedora} > 11
-Requires: qt4%{?_isa} >= 4.5.2-21 
-%else
 Requires: qt4%{?_isa} >= %{_qt4_version}
-%endif
 
 %description
 %{summary}.
@@ -84,6 +77,7 @@ Summary: Gstreamer phonon backend
 Group:   Applications/Multimedia
 Epoch:   2
 Requires: %{name} = %{version}-%{release}
+Requires: gstreamer-plugins-good
 Provides: phonon-backend%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
@@ -92,19 +86,12 @@ Provides:  %{name}-backend-gst = %{versi
 
 
 %prep
-%setup -q -n phonon-%{version}%{?alphatag}
-%patch0 -p1 -b .pulseaudio
-%patch1 -p1 -b .xine-pulseaudio
-%patch2 -p4 -b .gst-pulseaudio
-%patch100 -p0 -b .gstreamer-utf8-url
-%patch101 -p0 -b .gstreamer-volumefader
-%patch102 -p1 -b .xine_nonascii
-%patch103 -p1 -b .xine_nonascii-2
-
-# not working?  use -C .../xine hack below instead for now  -- Rex
-%if 0%{?xine_only}
-#patch10 -p1 -b .xineonly
+%setup -q -n phonon%{!?snap:-%{version}}
+
+%if 0%{?pa_keep_old_hacks}
+%patch1 -p1 -b .xine_pulseaudio
 %endif
+%patch2 -p1 -b .pa_min_ver
 
 
 %build
@@ -121,6 +108,9 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}%{?xine_only:/xine}
 
+# symlink for qt/phonon compatibility
+ln -s ../KDE/Phonon %{buildroot}%{_includedir}/phonon/Phonon
+
 # move the oxygen-only phonon-xine icons to hicolor
 mv %{buildroot}%{_datadir}/icons/oxygen \
    %{buildroot}%{_datadir}/icons/hicolor
@@ -204,6 +194,31 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
+- phonon-4.3.80 (upstream tarball, yes getting rediculous now)
+
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-1.20091203
+- phonon-4.3.80 (20091203 snapshot)
+
+* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-6.20091203
+- phonon-4.3.50 (20091203 snapshot)
+
+* Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-5.20091124
+- backend-gstreamer: Requires: gstreamer-plugins-good
+
+* Fri Nov 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-4.20091124
+- ln -s ../KDE/Phonon %%_includedir/phonon/Phonon (qt/phonon compat)
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-3.20091124
+- phonon-4.3.50 (20091124 snapshot)
+- enable pulseaudio integration (F-12+)
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-2.20091118
+- phonon-4.3.50 (20091118 snapshot)
+
+* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-1.20091019
+- phonon-4.3.50 (20091019 snapshot)
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
 - Requires: qt4 >= 4.5.2-21 (f12+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	7 Oct 2009 14:24:40 -0000	1.14
+++ sources	11 Dec 2009 18:07:45 -0000	1.15
@@ -1,8 +1,8 @@
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-767cb68052c108e95f293f30acdef3fb  phonon-4.3.1.tar.bz2
 60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
 7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
 0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
+6b0c5554291615433c14c3c38f741690  phonon-4.3.80.tar.bz2


--- phonon-4.2.96-pulseaudio.patch DELETED ---


--- phonon-4.2.96-xine-pulseaudio.patch DELETED ---


--- phonon-4.3.2-gstreamer-utf8-url.patch DELETED ---


--- phonon-4.3.2-gstreamer-volumefader.patch DELETED ---


--- phonon-4.3.2-kdebug#172242-2.patch DELETED ---


--- phonon-4.3.2-kdebug#172242.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch DELETED ---



From limb at fedoraproject.org  Fri Dec 11 18:08:11 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 18:08:11 +0000 (UTC)
Subject: File basemap-0.99.4.tar.gz uploaded to lookaside cache by limb
Message-ID: <20091211180811.DD1BB10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for python-basemap-data:

07fe1a01c321c43db4739c18e99d4d44  basemap-0.99.4.tar.gz



From nalin at fedoraproject.org  Fri Dec 11 18:08:12 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Fri, 11 Dec 2009 18:08:12 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-spnego-deleg.patch,1.1,1.2
Message-ID: <20091211180812.C036B11C00C5@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15460

Modified Files:
	krb5-1.7-spnego-deleg.patch 
Log Message:
- add the upstream RT number


krb5-1.7-spnego-deleg.patch:
 gssapiP_spnego.h |    9 +++++++++
 spnego_mech.c    |   17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

Index: krb5-1.7-spnego-deleg.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-spnego-deleg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- krb5-1.7-spnego-deleg.patch	8 Dec 2009 20:05:41 -0000	1.1
+++ krb5-1.7-spnego-deleg.patch	11 Dec 2009 18:08:12 -0000	1.2
@@ -4,7 +4,7 @@ method.  Not completely sure this is the
 change gssspi_set_cred_option() to keep going if it gets GSS_S_UNAVAILABLE
 back from the mechanism-specific function (which is what the Kerberos
 mechanism, previously the only provider of a set_cred_option(), returns
-if it doesn't understand the request).
+if it doesn't understand the request). RT#6594
 
 diff -up krb5/src/lib/gssapi/spnego/gssapiP_spnego.h krb5/src/lib/gssapi/spnego/gssapiP_spnego.h
 --- krb5/src/lib/gssapi/spnego/gssapiP_spnego.h	2009-12-08 14:46:57.000000000 -0500



From pbrobinson at fedoraproject.org  Fri Dec 11 18:12:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 11 Dec 2009 18:12:31 +0000 (UTC)
Subject: File dalston-0.1.12.tar.bz2 uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091211181231.8350610F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for dalston:

1accfce3cef2206346895c3def4d6a28  dalston-0.1.12.tar.bz2



From pbrobinson at fedoraproject.org  Fri Dec 11 18:13:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 11 Dec 2009 18:13:35 +0000 (UTC)
Subject: rpms/dalston/devel .cvsignore, 1.4, 1.5 dalston.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20091211181335.D059E11C00C5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17278

Modified Files:
	.cvsignore dalston.spec sources 
Log Message:
- new upstream 0.1.12 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Oct 2009 18:02:58 -0000	1.4
+++ .cvsignore	11 Dec 2009 18:13:35 -0000	1.5
@@ -1 +1 @@
-dalston-0.1.11.tar.bz2
+dalston-0.1.12.tar.bz2


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/dalston.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dalston.spec	31 Oct 2009 10:43:36 -0000	1.8
+++ dalston.spec	11 Dec 2009 18:13:35 -0000	1.9
@@ -1,13 +1,6 @@
-# Creation of the tarball as follows:
-# wget http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-# tar xf %{name}-%{version}.tar.bz2
-# cd %{name}-%{version}
-# patch -p1 0001-Update-to-latest-gnome-volume-control-code.patch
-# make dist
-
 Name:          dalston
-Version:       0.1.11
-Release:       4%{?dist}
+Version:       0.1.12
+Release:       1%{?dist}
 Summary:       Moblin System Information Icons
 
 Group:         System Environment/Libraries
@@ -41,7 +34,8 @@ management applets.
 %setup -q
 %patch0 -p1 -b .gnome-vol
 
-./autogen.sh 
+# run autogen.sh until we have a proper release
+NOCONFIGURE=yes ./autogen.sh
 
 %build
 %configure --disable-static
@@ -67,6 +61,9 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.volume.service
 
 %changelog
+* Fri Dec 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.12-1
+- new upstream 0.1.12 release
+
 * Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.11-3
 - and again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Oct 2009 18:02:59 -0000	1.4
+++ sources	11 Dec 2009 18:13:35 -0000	1.5
@@ -1 +1 @@
-fb71c27c06fc7a165b4a7ea72e37c494  dalston-0.1.11.tar.bz2
+1accfce3cef2206346895c3def4d6a28  dalston-0.1.12.tar.bz2



From petersen at fedoraproject.org  Fri Dec 11 18:17:07 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Dec 2009 18:17:07 +0000 (UTC)
Subject: rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.8,
	1.9 ghc-rpm-macros.spec, 1.10, 1.11
Message-ID: <20091211181707.6CCFC11C00C5@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-rpm-macros/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18138

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
major updates for ghc-6.12, package.conf.d, and shared libraries

- add shared support to cabal_configure, ghc_gen_filelists
- version ghcdocdir
- replace ghc_gen_scripts, ghc_install_scripts, ghc_register_pkg, ghc_unregister_pkg
  with cabal_pkg_conf
- allow (ghc to) override ghc_version




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ghc-rpm-macros.ghc	16 Nov 2009 12:27:56 -0000	1.8
+++ ghc-rpm-macros.ghc	11 Dec 2009 18:17:07 -0000	1.9
@@ -1,7 +1,7 @@
 %cabal %{_bindir}/runghc Setup
 
 %cabal_configure \
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{ghcdocdir} --libsubdir='$compiler/$pkgid'
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{ghcdocdir} --libsubdir='$compiler/$pkgid' %{?with_shared:--enable-shared}
 
 %cabal_makefile \
 %cabal makefile -f cabal-rpm.mk \
@@ -10,31 +10,33 @@ make -f cabal-rpm.mk %{_smp_mflags} \
 
 %cabal_install %cabal copy --destdir=${RPM_BUILD_ROOT} -v
 
-%ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}
-%ghcpkgdir %{_libdir}/ghc-%(ghc --numeric-version)/%{?pkg_name}%{!?pkg_name:%name}-%{version}
+%ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}-%{version}
+%ghcpkgdir %{_libdir}/ghc-%{ghc_version}/%{?pkg_name}%{!?pkg_name:%name}-%{version}
 
 %ghc_gen_filelists() \
-rm -f %1-devel.files %1-prof.files %1-doc.files \
+rm -f %1.files %1-devel.files %1-prof.files %1-doc.files \
+echo '%defattr(-,root,root,-)' > %1.files \
+echo '%dir %{ghcpkgdir}' >> %1.files \
+echo '%attr(755,root,root) %{ghcpkgdir}/libHS%{?pkg_name}%{!?pkg_name:%name}-%{version}-ghc%{ghc_version}.so' >> %1.files \
 echo '%defattr(-,root,root,-)' > %1-devel.files \
+echo '%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{?pkg_name}%{!?pkg_name:%name}-%{version}-*.conf' >> %1-devel.files \
 find ${RPM_BUILD_ROOT}%{ghcpkgdir} -type d | sed 's/^/%dir /' >> %1-devel.files \
-find ${RPM_BUILD_ROOT}%{ghcpkgdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1-devel.files \
+find ${RPM_BUILD_ROOT}%{ghcpkgdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' -o -name 'libHS*.so' \\) >> %1-devel.files \
 echo '%defattr(-,root,root,-)' > %1-prof.files \
 find ${RPM_BUILD_ROOT}%{ghcpkgdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \
-sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1-devel.files %1-prof.files \
+sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1.files %1-devel.files %1-prof.files \
 echo '%defattr(-,root,root,-)' > %1-doc.files \
 echo '%{ghcdocdir}' >> %1-doc.files \
 %{nil}
 
-%ghc_gen_scripts %cabal register --gen-script ; %cabal unregister --gen-script
-
-%ghc_install_scripts install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{ghcpkgdir}
-
-%ghc_register_pkg %{ghcpkgdir}/register.sh >/dev/null || :
-
-%ghc_unregister_pkg %{ghcpkgdir}/unregister.sh >/dev/null || :
-
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
-%ghc_version %(ghc --numeric-version)
+%ghc_version %{!?ghc_version:%(ghc --numeric-version)}%{?ghc_version}
 
 %ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")
+
+%cabal_pkg_conf \
+%cabal register --gen-pkg-config \
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ghc-%(ghc --numeric-version)/package.conf.d \
+install --mode=0644 %{?pkg_name}%{!?pkg_name:%name}-%{version}.conf $RPM_BUILD_ROOT%{_libdir}/ghc-%{ghc_version}/package.conf.d
+ 


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ghc-rpm-macros.spec	16 Nov 2009 12:27:56 -0000	1.10
+++ ghc-rpm-macros.spec	11 Dec 2009 18:17:07 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.2.5
+Version:	0.3.0
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 12 2009 Jens Petersen <petersen at redhat.com> - 0.3.0-1
+- major updates for ghc-6.12, package.conf.d, and shared libraries
+- add shared support to cabal_configure, ghc_gen_filelists
+- version ghcdocdir
+- replace ghc_gen_scripts, ghc_install_scripts, ghc_register_pkg, ghc_unregister_pkg
+  with cabal_pkg_conf
+- allow (ghc to) override ghc_version
+
 * Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.5-1
 - make ghc_pkg_ver only return pkg version
 



From limb at fedoraproject.org  Fri Dec 11 18:19:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 11 Dec 2009 18:19:55 +0000 (UTC)
Subject: rpms/python-basemap-data/devel .cvsignore, 1.7,
	1.8 python-basemap-data.spec, 1.14, 1.15 sources, 1.7, 1.8
Message-ID: <20091211181955.9112411C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/python-basemap-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19387

Modified Files:
	.cvsignore python-basemap-data.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap-data/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Dec 2008 10:25:30 -0000	1.7
+++ .cvsignore	11 Dec 2009 18:19:55 -0000	1.8
@@ -1,2 +1,2 @@
-basemap-0.99.2-examples.tar.gz
-basemap-0.99.2.tar.gz
+basemap-0.99.4-examples.tar.gz
+basemap-0.99.4.tar.gz


Index: python-basemap-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap-data/devel/python-basemap-data.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- python-basemap-data.spec	26 Jul 2009 20:09:51 -0000	1.14
+++ python-basemap-data.spec	11 Dec 2009 18:19:55 -0000	1.15
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-basemap-data
-Version:        0.99.2
-Release:        3%{?dist}
+Version:        0.99.4
+Release:        1%{?dist}
 Summary:        Data for python-basemap
 Group:          Development/Libraries
 License:        GPLv2 and Public Domain
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 11 2009 Jon Ciesla <limb at jcomserv.net> - 0.99.4-1
+- Update to latest upstream.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap-data/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Dec 2008 10:25:30 -0000	1.7
+++ sources	11 Dec 2009 18:19:55 -0000	1.8
@@ -1,2 +1,2 @@
-c1a2211bbb0440232536bf273efce15a  basemap-0.99.2-examples.tar.gz
-ba81a00fa77daf71cb27fca5f4c86fb9  basemap-0.99.2.tar.gz
+3700f4d59b9b01e33db30b7c83f69071  basemap-0.99.4-examples.tar.gz
+07fe1a01c321c43db4739c18e99d4d44  basemap-0.99.4.tar.gz



From pbrobinson at fedoraproject.org  Fri Dec 11 18:21:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 11 Dec 2009 18:21:22 +0000 (UTC)
Subject: rpms/dalston/F-12 .cvsignore, 1.4, 1.5 dalston.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20091211182122.A65EE11C00C5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20231

Modified Files:
	.cvsignore dalston.spec sources 
Log Message:
- new upstream 0.1.12 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Oct 2009 10:51:52 -0000	1.4
+++ .cvsignore	11 Dec 2009 18:21:22 -0000	1.5
@@ -1 +1 @@
-dalston-0.1.11.tar.bz2
+dalston-0.1.12.tar.bz2


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/dalston.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dalston.spec	31 Oct 2009 10:51:52 -0000	1.3
+++ dalston.spec	11 Dec 2009 18:21:22 -0000	1.4
@@ -1,12 +1,5 @@
-# Creation of the tarball as follows:
-# wget http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-# tar xf %{name}-%{version}.tar.bz2
-# cd %{name}-%{version}
-# patch -p1 0001-Update-to-latest-gnome-volume-control-code.patch
-# make dist
-
 Name:          dalston
-Version:       0.1.11
+Version:       0.1.12
 Release:       1%{?dist}
 Summary:       Moblin System Information Icons
 
@@ -41,7 +34,8 @@ management applets.
 %setup -q
 %patch0 -p1 -b .gnome-vol
 
-./autogen.sh 
+# run autogen.sh until we have a proper release
+NOCONFIGURE=yes ./autogen.sh
 
 %build
 %configure --disable-static
@@ -67,6 +61,15 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.volume.service
 
 %changelog
+* Fri Dec 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.12-1
+- new upstream 0.1.12 release
+
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.11-3
+- and again
+
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.11-3
+- fix build.
+
 * Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.11-1
 - new upstream 0.1.11 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Oct 2009 10:51:52 -0000	1.4
+++ sources	11 Dec 2009 18:21:22 -0000	1.5
@@ -1 +1 @@
-fb71c27c06fc7a165b4a7ea72e37c494  dalston-0.1.11.tar.bz2
+1accfce3cef2206346895c3def4d6a28  dalston-0.1.12.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 11 18:26:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 18:26:36 +0000 (UTC)
Subject: rpms/phonon/F-11 phonon.spec, 1.41,
	1.42 phonon-4.3.80-pa_min_ver.patch, 1.1, NONE
Message-ID: <20091211182636.B8DAE11C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22054

Modified Files:
	phonon.spec 
Removed Files:
	phonon-4.3.80-pa_min_ver.patch 
Log Message:
ok, f11's pa is too old, try without it then



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/phonon.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- phonon.spec	11 Dec 2009 18:07:45 -0000	1.41
+++ phonon.spec	11 Dec 2009 18:26:36 -0000	1.42
@@ -26,9 +26,6 @@ Source16: hi128-phonon-gstreamer.png
 # maybe we can just wait for the improvie PA support to land.
 Patch1:  phonon-4.3.50-xine_pulseaudio.patch
 
-# relax min version of pulseaudio
-Patch2: phonon-4.3.80-pa_min_ver.patch
-
 ## Upstream patches
 
 BuildRequires: automoc4 >= 0.9.86
@@ -42,8 +39,8 @@ BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
-%if 0%{?fedora} > 10
-BuildRequires: pulseaudio-libs-devel >= 0.9.15
+%if 0%{?fedora} > 11
+BuildRequires: pulseaudio-libs-devel >= 0.9.21
 %else
 %define pa_keep_old_hacks 1
 %endif
@@ -91,7 +88,6 @@ Provides:  %{name}-backend-gst = %{versi
 %if 0%{?pa_keep_old_hacks}
 %patch1 -p1 -b .xine_pulseaudio
 %endif
-%patch2 -p1 -b .pa_min_ver
 
 
 %build


--- phonon-4.3.80-pa_min_ver.patch DELETED ---



From petersen at fedoraproject.org  Fri Dec 11 18:29:31 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Dec 2009 18:29:31 +0000 (UTC)
Subject: File ghc-6.12.1-src.tar.bz2 uploaded to lookaside cache by petersen
Message-ID: <20091211182931.9FC5510F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ghc:

3a2b23f29013605f721ebdfc29de9c92  ghc-6.12.1-src.tar.bz2



From lkundrak at fedoraproject.org  Fri Dec 11 18:33:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 11 Dec 2009 18:33:23 +0000 (UTC)
Subject: rpms/ovaldi/devel ovaldi.spec,1.15,1.16
Message-ID: <20091211183323.C39B211C00C5@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/ovaldi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24540

Modified Files:
	ovaldi.spec 
Log Message:
* Fri Dec 11 2009 Lubomir Rintel <lkundrak at v3.sk> 5.5.25-2
- Rebuild for RPM 4.8.0



Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ovaldi.spec	7 Sep 2009 11:00:55 -0000	1.15
+++ ovaldi.spec	11 Dec 2009 18:33:23 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           ovaldi
 Version:        5.5.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reference implementation of the OVAL interpreter
 
 Group:          Applications/System
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 11 2009 Lubomir Rintel <lkundrak at v3.sk> 5.5.25-2
+- Rebuild for RPM 4.8.0
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> 5.5.25-1
 - New upstream relase
 



From lkundrak at fedoraproject.org  Fri Dec 11 18:35:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 11 Dec 2009 18:35:00 +0000 (UTC)
Subject: rpms/perl-RPM2/devel perl-RPM2.spec,1.13,1.14
Message-ID: <20091211183500.D4D9011C00C5@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-RPM2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25286

Modified Files:
	perl-RPM2.spec 
Log Message:
* Fri Dec 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.68-6
- Rebuild for RPM 4.8.0



Index: perl-RPM2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-RPM2/devel/perl-RPM2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-RPM2.spec	7 Dec 2009 06:02:42 -0000	1.13
+++ perl-RPM2.spec	11 Dec 2009 18:35:00 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-RPM2
 Version:        0.68
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl bindings for the RPM Package Manager API
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.68-6
+- Rebuild for RPM 4.8.0
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.68-5
 - rebuild against perl 5.10.1
 



From ovasik at fedoraproject.org  Fri Dec 11 18:38:30 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 11 Dec 2009 18:38:30 +0000 (UTC)
Subject: rpms/coreutils/F-12 coreutils-CVE-2009-4135.patch, NONE,
	1.1 coreutils.spec, 1.281, 1.282
Message-ID: <20091211183830.CE41F11C00C5@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26544

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-CVE-2009-4135.patch 
Log Message:
CVE-2009-4135 : Unsafe temporary directory use in distcheck rule

coreutils-CVE-2009-4135.patch:
 dist-check.mk |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE coreutils-CVE-2009-4135.patch ---
diff -urNp coreutils-7.6-orig/dist-check.mk coreutils-7.6/dist-check.mk
--- coreutils-7.6-orig/dist-check.mk	2009-09-01 13:01:16.000000000 +0200
+++ coreutils-7.6/dist-check.mk	2009-12-11 19:25:01.231452251 +0100
@@ -4,14 +4,14 @@ bin=bin-$$$$
 
 write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)'
 
-TMPDIR ?= /tmp
-t=$(TMPDIR)/$(PACKAGE)/test
+tmpdir = $(abs_top_builddir)/tests/torture
+t=$(tmpdir)/$(PACKAGE)/test
 pfx=$(t)/i
 
 # More than once, tainted build and source directory names would
 # have caused at least one "make check" test to apply "chmod 700"
 # to all directories under $HOME.  Make sure it doesn't happen again.
-tp := $(shell echo "$(TMPDIR)/$(PACKAGE)-$$$$")
+tp = $(tmpdir)/taint
 t_prefix = $(tp)/a
 t_taint = '$(t_prefix) b'
 fake_home = $(tp)/home
@@ -30,10 +30,11 @@ taint-distcheck: $(DIST_ARCHIVES)
 	touch $(fake_home)/f
 	mkdir -p $(fake_home)/d/e
 	ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-before
+	HOME=$(fake_home); export HOME;			\
 	cd $(t_taint)/$(distdir)			\
 	  && ./configure				\
 	  && $(MAKE)					\
-	  && HOME=$(fake_home) $(MAKE) check		\
+	  && $(MAKE) check				\
 	  && ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-after \
 	  && diff $(tp)/.ls-before $(tp)/.ls-after	\
 	  && test -d $(t_prefix)
@@ -52,6 +53,7 @@ endef
 # Install, then verify that all binaries and man pages are in place.
 # Note that neither the binary, ginstall, nor the ].1 man page is installed.
 define my-instcheck
+  echo running my-instcheck;				\
   $(MAKE) prefix=$(pfx) install				\
     && test ! -f $(pfx)/bin/ginstall			\
     && { fail=0;					\
@@ -70,6 +72,7 @@ endef
 
 define coreutils-path-check
   {							\
+    echo running coreutils-path-check;			\
     if test -f $(srcdir)/src/true.c; then		\
       fail=1;						\
       mkdir $(bin)					\
@@ -117,7 +120,7 @@ my-distcheck: $(DIST_ARCHIVES) $(local-c
 	mkdir -p $(t)
 	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
 	cd $(t)/$(distdir)				\
-	  && ./configure --enable-gcc-warnings --disable-nls \
+	  && ./configure --quiet --enable-gcc-warnings --disable-nls \
 	  && $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
 	  && $(MAKE) dvi				\
 	  && $(install-transform-check)			\
@@ -128,6 +131,7 @@ my-distcheck: $(DIST_ARCHIVES) $(local-c
 	  && $(AMTAR) -zxf - ) < $(distdir).tar.gz
 	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
 	-rm -rf $(t)
+	rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)
 	@echo "========================"; \
 	echo "$(distdir).tar.gz is ready for distribution"; \
 	echo "========================"


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/F-12/coreutils.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- coreutils.spec	23 Nov 2009 09:56:03 -0000	1.281
+++ coreutils.spec	11 Dec 2009 18:38:30 -0000	1.282
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -25,6 +25,7 @@ Patch4: coreutils-7.6-tail-F-renaming.pa
 Patch5: coreutils-7.6-trueexecve.patch
 Patch6: coreutils-7.6-ls-infloop.patch
 Patch7: coreutils-7.6-ls-derefdanglinginode.patch
+Patch8: coreutils-CVE-2009-4135.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -120,6 +121,7 @@ Libraries for coreutils package.
 %patch4 -p1 -b .renaming
 %patch5 -p1 -b .execve
 %patch6 -p1 -b .infloop
+%patch8 -p1 -b .unsafetmp
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -341,6 +343,9 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Fri Dec 11 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-8
+- CVE-2009-4135 : Unsafe temporary directory use in "distcheck" rule
+
 * Mon Nov 23 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-7
 - update /etc/DIR_COLORS* files
 - ls -LR exits with status 2, not 0, when it encounters



From petersen at fedoraproject.org  Fri Dec 11 18:40:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Dec 2009 18:40:17 +0000 (UTC)
Subject: rpms/ghc/devel .cvsignore, 1.20, 1.21 ghc.spec, 1.111, 1.112 sources,
	1.22, 1.23
Message-ID: <20091211184017.262D311C03F6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27014

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
- update to ghc-6.12.1-pre
- separate bcond options into enabled and disabled for clarity
- only enable shared for intel x86 archs (Lorenzo Villani)
- add quick build profile (Lorenzo Villani)
- remove package_debugging hack (use "make install-short")
- drop sed BR (Lorenzo Villani)
- put all build.mk config into one cat block (Lorenzo Villani)
- export CFLAGS to configure (Lorenzo Villani)
- add dynamic linking test to check section (thanks Lorenzo Villani)
- remove old ghc66 obsoletes
- subpackage huge ghc internals library (thanks Lorenzo Villani)
  - BR ghc-rpm-macros >= 0.3.0
- move html docs to docdir/ghc from html subdir (Lorenzo Villani)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	23 Nov 2009 12:43:54 -0000	1.20
+++ .cvsignore	11 Dec 2009 18:40:16 -0000	1.21
@@ -1 +1 @@
-ghc-6.12.0.20091121-src.tar.bz2
+ghc-6.12.1-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- ghc.spec	23 Nov 2009 13:40:42 -0000	1.111
+++ ghc.spec	11 Dec 2009 18:40:16 -0000	1.112
@@ -1,34 +1,29 @@
+## default enabled options ##
+# experimental shared libraries support available in ghc-6.12 for x86
+%ifarch %{ix86} x86_64
+%bcond_without shared
+%endif
 # test builds can made faster and smaller by disabling profiled libraries
 # (currently libHSrts_thr_p.a breaks no prof build)
 %bcond_without prof
 # build users_guide, etc
 %bcond_without manual
+
+## default disabled options ##
 # include extralibs
 %bcond_with extralibs
-
-# experimental shared libraries support available in ghc-6.12
-%bcond_without shared
+# quick build profile
+%bcond_with quick
 # include colored html src
 %bcond_with hscolour
 
 %global haddock_version 2.5.0
 
-# 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.
-%global package_debugging 0
 
 Name: ghc
 # break of haskell-platform-2009.2.0.2
-Version: 6.12.0.20091121
-Release: 1%{?dist}
+Version: 6.12.1
+Release: 0.1%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -40,13 +35,13 @@ Source1: http://www.haskell.org/ghc/dist
 %endif
 URL: http://haskell.org/ghc/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: ghc682, ghc681, ghc661, ghc66, haddock09
+Obsoletes: ghc682, ghc681, haddock09
 # introduced for f11 and can be removed for f13:
 Obsoletes: haddock < %{haddock_version}, ghc-haddock-devel < %{haddock_version}
 Provides: haddock = %{haddock_version}
-Requires: gcc, gmp-devel
-BuildRequires: ghc, happy, sed
+BuildRequires: ghc, happy, ghc-rpm-macros >= 0.3.0
 BuildRequires: gmp-devel, ncurses-devel
+Requires: gcc, gmp-devel
 %if %{with shared}
 # not sure if this is actually needed:
 BuildRequires: libffi-devel
@@ -82,7 +77,32 @@ Preformatted documentation for the Glori
 (GHC) and its libraries.  It should be installed if you like to have local
 access to the documentation in HTML format.
 
+%package ghc-doc
+Summary: Documentation for the ghc internals library
+Group: Development/Languages
+Requires(posttrans): %{name} = %{version}-%{release}
+
+%description ghc-doc
+Documentation for the ghc internals library.
+
+%package ghc-devel
+Summary: Development files for ghc internals
+Group: Development/Libraries
+%if %{with shared}
+Requires: %{name}-ghc = %{version}-%{release}
+%endif
+
+%description ghc-devel
+Development files for the ghc internals library.
+
 %if %{with shared}
+%package ghc
+Summary: GHC internals library
+Group: Development/Libraries
+
+%description ghc
+Library to access internals of the Glasgow Haskell Compilation System.
+
 %package libs
 Summary: Shared libraries for GHC
 Group: Development/Libraries
@@ -96,12 +116,21 @@ Shared libraries for Glorious Glasgow Ha
 Summary: Profiling libraries for GHC
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Obsoletes: ghc682-prof, ghc681-prof, ghc661-prof, ghc66-prof
+Obsoletes: ghc682-prof, ghc681-prof
 Obsoletes: ghc-haddock-prof < %{haddock_version}
 
 %description prof
 Profiling libraries for Glorious Glasgow Haskell Compilation System (GHC).
 They should be installed when GHC's profiling subsystem is needed.
+
+%package ghc-prof
+Summary: Profiling libraries for the ghc internals library
+Group: Development/Libraries
+Requires: %{name}-ghc-devel = %{version}-%{release}
+Requires: %{name}-prof = %{version}-%{release}
+
+%description ghc-prof
+Profiling libraries for the ghc internals library.
 %endif
 
 # the debuginfo subpackage is currently empty anyway, so don't generate it
@@ -111,28 +140,27 @@ They should be installed when GHC's prof
 %setup -q -n %{name}-%{version} %{?with_extralibs:-b1}
 
 %build
-# hack for building a local test package quickly from a prebuilt tree 
-%if %{package_debugging}
-pushd ..
-rm -rf %{name}-%{version}
-cp -al %{name}-%{version}.built %{name}-%{version}
-popd
-exit 0
-%endif
-
+cat > mk/build.mk << EOF
 %if %{without prof}
-echo "GhcLibWays = v %{?with_shared:dyn}" >> mk/build.mk
+GhcLibWays = v %{?with_shared:dyn}
 %endif
-
-# so where is the switch?
-%if %{with manual}
-#echo "XMLDocWays = html" >> mk/build.mk
+%if %{without manual}
+HADDOCK_DOCS       = NO
+BUILD_DOCBOOK_HTML = NO
+%endif
+%if %{with quick}
+SRC_HC_OPTS        = -H64m -O0 -fasm
+GhcStage1HcOpts    = -O -fasm
+GhcStage2HcOpts    = -O0 -fasm
+GhcLibHcOpts       = -O0 -fasm
+SplitObjs          = NO
 %endif
-
 %if %{without hscolour}
-echo "HSCOLOUR_SRCS = NO" >> mk/build.mk
+HSCOLOUR_SRCS = NO
 %endif
+EOF
 
+export CFLAGS="${CFLAGS:-%optflags}"
 ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
   --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
@@ -144,16 +172,20 @@ make %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=${RPM_BUILD_ROOT} install
 
+# hack around apparent html/ hardcoding
+mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html{,-tmp}
+mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html-tmp/* ${RPM_BUILD_ROOT}%{_docdir}/%{name}
+rmdir ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html-tmp
+
 SRC_TOP=$PWD
 rm -f rpm-*.files
 ( cd $RPM_BUILD_ROOT
-  find .%{_libdir}/%{name}-%{version} -maxdepth 1 -type d ! -name 'include' ! -name 'package.conf.d' -fprintf $SRC_TOP/rpm-lib-dir.files "%%%%dir %%p\n"
-  find .%{_libdir}/%{name}-%{version} -type d -fprintf $SRC_TOP/rpm-dev-dir.files "%%%%dir %%p\n"
-  find .%{_libdir}/%{name}-%{version} \( -name 'libHS*-ghc%{version}.so' -fprintf $SRC_TOP/rpm-lib.files "%%%%attr(755,root,root) %%p\n" \) -o \( \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( \( -name '*.hi' -o -name '*.dyn_hi' -o -name 'libHS*.a' -o -name 'HS*.o' -o -name '*.h' -o -name '*.conf' -o -type f -not -name 'package.cache' \) -fprint $SRC_TOP/rpm-base.files \)
-  find .%{_docdir}/%{name}/html/* -type d ! -name libraries ! -name src > $SRC_TOP/rpm-doc.files
+  find .%{_libdir}/%{name}-%{version} -maxdepth 1 -type d ! -name 'include' ! -name 'package.conf.d' ! -name 'ghc-%{version}' -fprintf $SRC_TOP/rpm-lib-dir.files "%%%%dir %%p\n"
+  find .%{_libdir}/%{name}-%{version} -type d \( -path 'ghc-%{version}' -prune -o -fprintf $SRC_TOP/rpm-dev-dir.files "%%%%dir %%p\n" \)
+  find .%{_libdir}/%{name}-%{version} \( -path 'ghc-%{version}' -prune \) -o \( -name 'libHS*-ghc%{version}.so' -fprintf $SRC_TOP/rpm-lib.files "%%%%attr(755,root,root) %%p\n" \) -o \( \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( \( -name '*.hi' -o -name '*.dyn_hi' -o -name 'libHS*.a' -o -name 'HS*.o' -o -name '*.h' -o -name '*.conf' -o -type f -not -name 'package.cache' \) -fprint $SRC_TOP/rpm-base.files \)
+  find .%{_docdir}/%{name}/* -type d ! -name libraries ! -name 'ghc-%{version}' ! -name src > $SRC_TOP/rpm-doc.files
 )
 
 # make paths absolute (filter "./usr" to "/usr")
@@ -162,6 +194,10 @@ sed -i -e "s|\.%{_prefix}|%{_prefix}|" r
 cat rpm-lib-dir.files rpm-lib.files > rpm-libs.files
 cat rpm-dev-dir.files rpm-base.files > rpm-ghc.files
 
+# subpackage ghc library
+%define ghc_version %{version}
+%ghc_gen_filelists ghc-ghc %{version}
+
 # these are handled as alternatives
 for i in hsc2hs runhaskell; do
   if [ -x ${RPM_BUILD_ROOT}%{_bindir}/$i-ghc ]; then
@@ -184,6 +220,12 @@ echo 'main = putStrLn "Foo"' > testghc/f
 inplace/bin/ghc-stage2 testghc/foo.hs -o testghc/foo -O2
 [ "$(testghc/foo)" = "Foo" ]
 rm testghc/*
+%if %{with shared}
+echo 'main = putStrLn "Foo"' > testghc/foo.hs
+inplace/bin/ghc-stage2 testghc/foo.hs -o testghc/foo -dynamic
+[ "$(testghc/foo)" = "Foo" ]
+rm testghc/*
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -217,7 +259,7 @@ ghc-pkg recache
 
 %posttrans doc
 # (posttrans to make sure any old documentation has been removed first)
-( cd %{_docdir}/ghc/html/libraries && ./gen_contents_index ) || :
+( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
 
 %files -f rpm-ghc.files
 %defattr(-,root,root,-)
@@ -230,31 +272,58 @@ ghc-pkg recache
 
 %files doc -f rpm-doc.files
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}/html/libraries
-%{_docdir}/%{name}/html/libraries/frames.html
-%{_docdir}/%{name}/html/libraries/gen_contents_index
-%{_docdir}/%{name}/html/libraries/hscolour.css
-%{_docdir}/%{name}/html/libraries/prologue.txt
-%{_docdir}/%{name}/html/index.html
-%ghost %{_docdir}/%{name}/html/libraries/doc-index*.html
-%ghost %{_docdir}/%{name}/html/libraries/haddock.css
-%ghost %{_docdir}/%{name}/html/libraries/haddock-util.js
-%ghost %{_docdir}/%{name}/html/libraries/haskell_icon.gif
-%ghost %{_docdir}/%{name}/html/libraries/index*.html
-%ghost %{_docdir}/%{name}/html/libraries/minus.gif
-%ghost %{_docdir}/%{name}/html/libraries/plus.gif
+%dir %{_docdir}/%{name}/libraries
+%{_docdir}/%{name}/libraries/frames.html
+%{_docdir}/%{name}/libraries/gen_contents_index
+%{_docdir}/%{name}/libraries/hscolour.css
+%{_docdir}/%{name}/libraries/prologue.txt
+%{_docdir}/%{name}/index.html
+%ghost %{_docdir}/%{name}/libraries/doc-index*.html
+%ghost %{_docdir}/%{name}/libraries/haddock.css
+%ghost %{_docdir}/%{name}/libraries/haddock-util.js
+%ghost %{_docdir}/%{name}/libraries/haskell_icon.gif
+%ghost %{_docdir}/%{name}/libraries/index*.html
+%ghost %{_docdir}/%{name}/libraries/minus.gif
+%ghost %{_docdir}/%{name}/libraries/plus.gif
 
 %if %{with shared}
 %files libs -f rpm-libs.files
 %defattr(-,root,root,-)
+
+%files ghc -f ghc-ghc.files
+%defattr(-,root,root,-)
 %endif
 
+%files ghc-devel -f ghc-ghc-devel.files
+%defattr(-,root,root,-)
+
+%files ghc-doc -f ghc-ghc-doc.files
+%defattr(-,root,root,-)
+
 %if %{with prof}
 %files prof -f rpm-prof.files
 %defattr(-,root,root,-)
+
+%files ghc-prof -f ghc-ghc-prof.files
+%defattr(-,root,root,-)
 %endif
 
 %changelog
+* Fri Dec 11 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.1
+- update to ghc-6.12.1-pre
+- separate bcond options into enabled and disabled for clarity
+- only enable shared for intel x86 archs (Lorenzo Villani)
+- add quick build profile (Lorenzo Villani)
+- remove package_debugging hack (use "make install-short")
+- drop sed BR (Lorenzo Villani)
+- put all build.mk config into one cat block (Lorenzo Villani)
+- export CFLAGS to configure (Lorenzo Villani)
+- add dynamic linking test to check section (thanks Lorenzo Villani)
+- remove old ghc66 obsoletes
+- subpackage huge ghc internals library (thanks Lorenzo Villani)
+  - BR ghc-rpm-macros >= 0.3.0
+- move html docs to docdir/ghc from html subdir (Lorenzo Villani)
+
 * Wed Nov 18 2009 Jens Petersen <petersen at redhat.com> - 6.12.0.20091121-1
 - update to 6.12.1 rc2
 - build shared libs, yay! and package in standalone libs subpackage
@@ -668,7 +737,7 @@ ghc-pkg recache
 * Fri Feb 26 1999 Manuel Chakravarty
 - modified for GHC 4.02
 
-* Thu Dec 24 1998 Zoltan Vorosbaranyi 
+* Thu Dec 24 1998 Zoltan Vorosbaranyi
 - added BuildRoot
 - files located in /usr/local/bin, /usr/local/lib moved to /usr/bin, /usr/lib
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	23 Nov 2009 12:43:54 -0000	1.22
+++ sources	11 Dec 2009 18:40:16 -0000	1.23
@@ -1 +1 @@
-198ccfaabc251e7e01578d6a143f55cf  ghc-6.12.0.20091121-src.tar.bz2
+3a2b23f29013605f721ebdfc29de9c92  ghc-6.12.1-src.tar.bz2



From ovasik at fedoraproject.org  Fri Dec 11 18:50:15 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 11 Dec 2009 18:50:15 +0000 (UTC)
Subject: rpms/coreutils/F-11 coreutils-CVE-2009-4135.patch, NONE,
	1.1 coreutils.spec, 1.260, 1.261
Message-ID: <20091211185015.6A81711C03C6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30987

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-CVE-2009-4135.patch 
Log Message:
CVE-2009-4135 : Unsafe temporary directory use in distcheck rule

coreutils-CVE-2009-4135.patch:
 maint.mk |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE coreutils-CVE-2009-4135.patch ---
diff -urNp coreutils-7.2-orig/maint.mk coreutils-7.2/maint.mk
--- coreutils-7.2-orig/maint.mk	2009-03-29 19:44:10.000000000 +0200
+++ coreutils-7.2/maint.mk	2009-12-11 19:44:19.699563781 +0100
@@ -666,14 +666,14 @@ bin=bin-$$$$
 
 write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)'
 
-TMPDIR ?= /tmp
-t=$(TMPDIR)/$(PACKAGE)/test
+tmpdir = $(abs_top_builddir)/tests/torture
+t=$(tmpdir)/$(PACKAGE)/test
 pfx=$(t)/i
 
 # More than once, tainted build and source directory names would
 # have caused at least one "make check" test to apply "chmod 700"
 # to all directories under $HOME.  Make sure it doesn't happen again.
-tp := $(shell echo "$(TMPDIR)/$(PACKAGE)-$$$$")
+tp = $(tmpdir)/taint
 t_prefix = $(tp)/a
 t_taint = '$(t_prefix) b'
 fake_home = $(tp)/home
@@ -691,10 +691,11 @@ taint-distcheck: $(DIST_ARCHIVES)
 	touch $(fake_home)/f
 	mkdir -p $(fake_home)/d/e
 	ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-before
+	HOME=$(fake_home); export HOME;			\
 	cd $(t_taint)/$(distdir)			\
 	  && ./configure				\
 	  && $(MAKE)					\
-	  && HOME=$(fake_home) $(MAKE) check		\
+	  && $(MAKE) check				\
 	  && ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-after \
 	  && diff $(tp)/.ls-before $(tp)/.ls-after	\
 	  && test -d $(t_prefix)
@@ -713,6 +714,7 @@ endef
 # Install, then verify that all binaries and man pages are in place.
 # Note that neither the binary, ginstall, nor the ].1 man page is installed.
 define my-instcheck
+  echo running my-instcheck;				\
   $(MAKE) prefix=$(pfx) install				\
     && test ! -f $(pfx)/bin/ginstall			\
     && { fail=0;					\
@@ -731,6 +733,7 @@ endef
 
 define coreutils-path-check
   {							\
+    echo running coreutils-path-check;			\
     if test -f $(srcdir)/src/true.c; then		\
       fail=1;						\
       mkdir $(bin)					\
@@ -777,7 +780,7 @@ my-distcheck: $(DIST_ARCHIVES) $(local-c
 	mkdir -p $(t)
 	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
 	cd $(t)/$(distdir)				\
-	  && ./configure --disable-nls			\
+	  && ./configure --quiet --disable-nls		\
 	  && $(MAKE) CFLAGS='$(warn_cflags)'		\
 	      AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)'	\
 	  && $(MAKE) dvi				\
@@ -789,6 +792,7 @@ my-distcheck: $(DIST_ARCHIVES) $(local-c
 	  && $(AMTAR) -zxf - ) < $(distdir).tar.gz
 	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
 	-rm -rf $(t)
+	rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)
 	@echo "========================"; \
 	echo "$(distdir).tar.gz is ready for distribution"; \
 	echo "========================"


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/F-11/coreutils.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- coreutils.spec	8 Sep 2009 08:46:55 -0000	1.260
+++ coreutils.spec	11 Dec 2009 18:50:15 -0000	1.261
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -23,6 +23,7 @@ Patch1: coreutils-7.4-ls-1U.patch
 Patch2: coreutils-7.4-install-SELinux.patch
 Patch3: coreutils-7.5-ls-inode.patch
 Patch4: coreutils-7.2-ls-fr_FR-misalignment.patch
+Patch5: coreutils-CVE-2009-4135.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -107,6 +108,7 @@ the old GNU fileutils, sh-utils, and tex
 %patch2 -p1 -b .install-SELinux
 %patch3 -p1 -b .lsinode
 %patch4 -p1 -b .frenchmonths
+%patch5 -p1 -b .unsafetmp
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -325,6 +327,9 @@ fi
 /sbin/runuser
 
 %changelog
+* Fri Dec 11 2009 Ondrej Vasik <ovasik at redhat.com> - 7.2-5
+- CVE-2009-4135 : Unsafe temporary directory use in "distcheck" rule
+
 * Tue Sep 08 2009 Ondrej Vasik <ovasik at redhat.com> - 7.2-4
 - ls -i: print consistent inode numbers also for mount points
   (#453709)



From mdomsch at fedoraproject.org  Fri Dec 11 18:51:17 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 11 Dec 2009 18:51:17 +0000 (UTC)
Subject: rpms/libsmbios/devel libsmbios.spec, 1.25, 1.26 sources, 1.17,
	1.18 .cvsignore, 1.17, 1.18
Message-ID: <20091211185117.259FF11C02BC@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/libsmbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31733

Modified Files:
	libsmbios.spec sources .cvsignore 
Log Message:
update to upstream 2.2.19


Index: libsmbios.spec
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/libsmbios.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libsmbios.spec	25 Jul 2009 08:38:57 -0000	1.25
+++ libsmbios.spec	11 Dec 2009 18:51:16 -0000	1.26
@@ -1,39 +1,42 @@
 # pkg/libsmbios.spec.  Generated from libsmbios.spec.in by configure.
+# required by suse build system
+# norootforbuild
 
 # these are all substituted by autoconf
 %define major 2
 %define minor 2
-%define micro 16
+%define micro 19
 %define extra %{nil}
+%define pot_file  libsmbios
 %define lang_dom  libsmbios-2.2
-%define release_version %{major}.%{minor}.%{micro}%{extra}
+%define release_version 2.2.19
 
 %define release_name libsmbios
 %define other_name   libsmbios2
-
-# suse naming conventions
 %if 0%{?suse_version}
 %define release_name libsmbios2
 %define other_name   libsmbios
 %endif
 
-# required by suse build system
-# norootforbuild
-
 %{!?build_python:   %define build_python 1}
 %{?_with_python:    %define build_python 1}
-%{?_without_python: %define build_python 0}
+%{?_without_python: %undefine build_python}
 
-%{!?run_unit_tests:     %define run_unit_tests 1}
-%{?_without_unit_tests: %define run_unit_tests 0}
+# run_unit_tests not defined by default as cppunit
+# not available in OS on several major OS
+%{?_without_unit_tests: %undefine run_unit_tests}
 %{?_with_unit_tests:    %define run_unit_tests 1}
 
+%{!?as_needed:         %define as_needed 1}
+%{?_without_as_needed: %undefine as_needed}
+%{?_with_as_needed:    %define as_needed 1}
+
 # some distros already have fdupes macro. If not, we just set it to something innocuous
 %{?!fdupes: %define fdupes /usr/sbin/hardlink -c -v}
 
+%define cppunit_BR cppunit-devel
 %define pkgconfig_BR pkgconfig
 %define ctypes_BR python-ctypes
-%define cppunit_BR cppunit-devel
 %define fdupes_BR hardlink
 %define valgrind_BR valgrind
 # Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
@@ -44,6 +47,8 @@
 %if 0%{?suse_version}
 %if 0%{?suse_version} < 1000
     %define valgrind_BR %{nil}
+    # sles 9 doesnt have as_needed
+    %undefine as_needed
 %endif
 %if 0%{?suse_version} >= 1020
     # suse never added python-ctypes provides to python 2.5 :(
@@ -57,26 +62,24 @@
 %endif
 %endif
 
-# rhel
-%if 0%{?rhel_version}
-%if 0%{?rhel_version} < 500
+# rhel (should work on OBS and EPEL)
+%if 0%{?rhel}
+%if 0%{?rhel} < 5
     %define fdupes echo fdupes disabled
     %define fdupes_BR %{nil}
-    # dont yet have rhel4 cppunit
-    %define cppunit_BR %{nil}
 %endif
-%if 0%{?rhel_version} < 400
+%if 0%{?rhel} < 4
     # dont yet have rhel3 valgrind
     %define valgrind_BR %{nil}
     # no python-ctypes for python <= 2.2
-    %define build_python 0
+    %undefine build_python
+    # rhel3 doesnt have -as-needed
+    %undefine as_needed
 %endif
 %endif
 
 %define python_devel_BR %{nil}
-%define cond_disable_python --disable-python
-%if %{build_python}
-    %define cond_disable_python %{nil}
+%if 0%{?build_python}
     %define python_devel_BR python-devel
     # per fedora and suse python packaging guidelines
     # suse: will define py_sitedir for us
@@ -84,14 +87,13 @@
     %{!?py_sitedir: %define py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %endif
 
-%if !%{run_unit_tests}
-    %define valgrind_BR %{nil}
-    %define cppunit_BR %{nil}
-%endif
+# if unit tests are disabled, get rid of a few BuildRequires
+%{!?run_unit_tests: %define cppunit_BR %{nil}}
+%{!?run_unit_tests: %define valgrind_BR %{nil}}
 
 Name: %{release_name}
 Version: %{release_version}
-Release: 3.1%{?releasesuffix}%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ or OSL 2.1
 Summary: Libsmbios C/C++ shared libraries
 Group: System Environment/Libraries
@@ -124,16 +126,16 @@ should use the libsmbios C interface.
 Summary: Python interface to Libsmbios C library
 Group: System Environment/Libraries
 Requires: %{release_name} = 0:%{version}-%{release}
-Requires: python %{ctypes_BR} redhat-rpm-config
+Requires: python %{ctypes_BR}
 
 %description -n python-smbios
 This package provides a Python interface to libsmbios
 
 %package -n smbios-utils
-Summary: meta-package that pulls in all smbios utilities (binary executables and python scripts)
+Summary: Meta-package that pulls in all smbios binaries and python scripts
 Group: Applications/System
 Requires: smbios-utils-bin
-%if %{build_python}
+%if 0%{?build_python}
 Requires: smbios-utils-python
 %endif
 Obsoletes: libsmbios-bin < 0:2.0.0
@@ -180,8 +182,30 @@ information from standard BIOS tables, s
 This package contains the headers and .a files necessary to compile new client
 programs against libsmbios.
 
+%package -n yum-dellsysid
+Summary: YUM plugin to retrieve the Dell System ID
+Group: Development/Tools
+Requires: smbios-utils-python = 0:%{version}-%{release}
+
+%description -n yum-dellsysid
+Libsmbios is a library and utilities that can be used by client programs to get
+information from standard BIOS tables, such as the SMBIOS table.
+
+This package contains a YUM plugin which allows the use of certain
+substitutions in yum repository configuration files on Dell systems.
+
 
 %prep
+: '########################################'
+: '########################################'
+: '#'
+: '# build_python: %{?build_python}'
+: '# run_unit_tests: %{?run_unit_tests}'
+: '# rhel: %{?rhel}'
+: '# suse_version: %{?suse_version}'
+: '#'
+: '########################################'
+: '########################################'
 %setup -q -n libsmbios-%{version}
 find . -type d -exec chmod -f 755 {} \;
 find doc src -type f -exec chmod -f 644 {} \;
@@ -190,12 +214,7 @@ chmod 755 src/cppunit/*.sh
 %build
 # this line lets us build an RPM directly from a git tarball
 # and retains any customized version information we might have
-[ -e ./configure ] || \
-    RELEASE_MAJOR=%{major}  \
-    RELEASE_MINOR=%{minor}  \
-    RELEASE_MICRO=%{micro}  \
-    RELEASE_EXTRA=%{extra}  \
-    ./autogen.sh --no-configure
+[ -e ./configure ] || ./autogen.sh --no-configure
 
 mkdir _build
 cd _build
@@ -203,14 +222,13 @@ echo '../configure "$@"' > configure
 chmod +x ./configure
 
 %configure \
-    --disable-static    \
-    %{cond_disable_python} \
-    CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+    %{?!as_needed:--disable-as-needed} %{?!build_python:--disable-python}
+
 mkdir -p out/libsmbios_c
 mkdir -p out/libsmbios_c++
-make -e %{?_smp_mflags} 2>&1 | tee build.log
+make %{?_smp_mflags} 2>&1 | tee build-%{_arch}.log
 
-echo \%doc _build/build.log > buildlogs.txt
+echo \%doc _build/build-%{_arch}.log > buildlogs.txt
 
 %check
 runtest() {
@@ -219,9 +237,10 @@ runtest() {
     pushd _$1$2
     ../configure
     make -e $1 CFLAGS="$CFLAGS -DDEBUG_OUTPUT_ALL" 2>&1 | tee $1$2.log
-    #make -e $1 2>&1 | tee $1$2.log
+    touch -r ../configure.ac $1$2-%{_arch}.log
+    make -e $1 2>&1 | tee $1$2.log
     popd
-    echo \%doc _$1$2/$1$2.log >> _build/buildlogs.txt
+    echo \%doc _$1$2/$1$2-%{_arch}.log >> _build/buildlogs.txt
 %endif
 }
 
@@ -249,23 +268,79 @@ mkdir %{buildroot}
 cd _build
 TOPDIR=..
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
-mkdir -p %{buildroot}/usr/include
-cp -a $TOPDIR/src/include/*  %{buildroot}/usr/include/
-cp -a out/public-include/*  %{buildroot}/usr/include/
-rm -f %{buildroot}/%{_libdir}/lib*.la
-find %{buildroot}/usr/include out/libsmbios_c++ out/libsmbios_c -exec touch -r $TOPDIR/configure.ac {} \;
+mkdir -p %{buildroot}/%{_includedir}
+cp -a $TOPDIR/src/include/*  %{buildroot}/%{_includedir}/
+cp -a out/public-include/*  %{buildroot}/%{_includedir}/
+rm -f %{buildroot}/%{_libdir}/lib*.{la,a}
+find %{buildroot}/%{_includedir} out/libsmbios_c++ out/libsmbios_c -exec touch -r $TOPDIR/configure.ac {} \;
 
-# backwards compatible:
-%if %{build_python}
-ln -s ../sbin/dellWirelessCtl %{buildroot}/usr/bin/dellWirelessCtl
-ln -s smbios-sys-info %{buildroot}%{_sbindir}/getSystemId
-ln -s smbios-wireless-ctl %{buildroot}%{_sbindir}/dellWirelessCtl
-ln -s smbios-lcd-brightness %{buildroot}%{_sbindir}/dellLcdBrightness
-ln -s smbios-rbu-bios-update %{buildroot}%{_sbindir}/dellBiosUpdate
-%endif
+mv out/libsmbios_c++  out/libsmbios_c++-%{_arch}
+mv out/libsmbios_c    out/libsmbios_c-%{_arch}
 
+rename %{pot_file}.mo %{lang_dom}.mo $(find %{buildroot}/%{_datadir} -name %{pot_file}.mo)
 %find_lang %{lang_dom}
 
+touch files-yum-dellsysid
+touch files-smbios-utils-python
+touch files-python-smbios
+
+%if 0%{?build_python}
+
+# backwards compatible:
+ln -s %{_sbindir}/dellWirelessCtl %{buildroot}/%{_bindir}/dellWirelessCtl
+ln -s smbios-sys-info %{buildroot}/%{_sbindir}/getSystemId
+ln -s smbios-wireless-ctl %{buildroot}/%{_sbindir}/dellWirelessCtl
+ln -s smbios-lcd-brightness %{buildroot}/%{_sbindir}/dellLcdBrightness
+ln -s smbios-rbu-bios-update %{buildroot}/%{_sbindir}/dellBiosUpdate
+
+cat > files-python-smbios <<-EOF
+	%doc COPYING-GPL COPYING-OSL README
+	%{py_sitedir}/*
+EOF
+
+cat > files-smbios-utils-python <<-EOF
+	%doc COPYING-GPL COPYING-OSL README
+	%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
+	%doc doc/pkgheader.sh
+	%dir %{_sysconfdir}/libsmbios
+	%config(noreplace) %{_sysconfdir}/libsmbios/*
+	
+	# python utilities
+	%{_sbindir}/smbios-sys-info
+	%{_sbindir}/smbios-token-ctl
+	%{_sbindir}/smbios-passwd
+	%{_sbindir}/smbios-wakeup-ctl
+	%{_sbindir}/smbios-wireless-ctl
+	%{_sbindir}/smbios-rbu-bios-update
+	%{_sbindir}/smbios-lcd-brightness
+	
+	# symlinks: backwards compat
+	%{_sbindir}/dellLcdBrightness
+	%{_sbindir}/getSystemId
+	%{_sbindir}/dellWirelessCtl
+	%{_sbindir}/dellBiosUpdate
+	# used by HAL in old location, so keep it around until HAL is updated.
+	%{_bindir}/dellWirelessCtl
+	
+	# data files
+	%{_datadir}/smbios-utils
+EOF
+
+cat > files-yum-dellsysid <<-EOF
+	%doc COPYING-GPL COPYING-OSL README
+	# YUM Plugin
+	%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/*
+	%{_exec_prefix}/lib/yum-plugins/*
+	# SUSE build has anal directory ownership check. RPM which owns all dirs *must*
+	# be installed at buildtime.
+	%if 0%{?suse_version} >= 1100
+	%dir %{_sysconfdir}/yum
+	%dir %{_sysconfdir}/yum/pluginconf.d/
+	%dir %{_exec_prefix}/lib/yum-plugins/
+	%endif
+EOF
+%endif
+
 # hardlink files to save some space.
 %fdupes $RPM_BUILD_ROOT
 
@@ -275,28 +350,21 @@ rm -rf %{buildroot}
 %post   -n %{release_name}   -p /sbin/ldconfig
 %postun -n %{release_name}   -p /sbin/ldconfig
 
-%files -n %{release_name} -f _build/%{lang_dom}.lang
+%files -f _build/%{lang_dom}.lang
 %defattr(-,root,root,-)
 %{_libdir}/libsmbios_c.so.*
 %{_libdir}/libsmbios.so.*
 
-%if %{build_python}
-%files -n python-smbios
-%defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL README
-%{py_sitedir}/*
-%endif
-
 %files -n libsmbios-devel -f _build/buildlogs.txt
 %defattr(-,root,root,-)
 %doc COPYING-GPL COPYING-OSL README src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
-/usr/include/smbios
-/usr/include/smbios_c
+%{_includedir}/smbios
+%{_includedir}/smbios_c
 %{_libdir}/libsmbios.so
 %{_libdir}/libsmbios_c.so
 %{_libdir}/pkgconfig/*.pc
-%doc _build/out/libsmbios_c++
-%doc _build/out/libsmbios_c
+%doc _build/out/libsmbios_c++-%{_arch}
+%doc _build/out/libsmbios_c-%{_arch}
 
 %files -n smbios-utils
 # opensuse 11.1 enforces non-empty file list :(
@@ -309,66 +377,39 @@ rm -rf %{buildroot}
 %doc COPYING-GPL COPYING-OSL README
 %doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
 %doc doc/pkgheader.sh
-
+#
 # legacy C++
 %{_sbindir}/dellBiosUpdate-compat
 %{_sbindir}/dellLEDCtl
 %ifnarch ia64
 %{_sbindir}/dellMediaDirectCtl
 %endif
-
+#
 # new C utilities
 %{_sbindir}/smbios-state-byte-ctl
 %{_sbindir}/smbios-get-ut-data
 %{_sbindir}/smbios-upflag-ctl
 %{_sbindir}/smbios-sys-info-lite
 
-
-%if %{build_python}
-%files -n smbios-utils-python
+%files -n python-smbios -f _build/files-python-smbios
 %defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL README
-%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
-%doc doc/pkgheader.sh
-%dir %{_sysconfdir}/libsmbios
-%config(noreplace) %{_sysconfdir}/libsmbios/*
 
-# YUM Plugin
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/dellsysidplugin2.conf
-%{_exec_prefix}/lib/yum-plugins/*
-# SUSE build has anal directory ownership check. RPM which owns all dirs *must*
-# be installed at buildtime.
-%if 0%{?suse_version} >= 1100
-%dir %{_sysconfdir}/yum
-%dir %{_sysconfdir}/yum/pluginconf.d/
-%dir %{_exec_prefix}/lib/yum-plugins/
-%endif
-
-# python utilities
-%{_sbindir}/smbios-sys-info
-%{_sbindir}/smbios-token-ctl
-%{_sbindir}/smbios-passwd
-%{_sbindir}/smbios-wakeup-ctl
-%{_sbindir}/smbios-wireless-ctl
-%{_sbindir}/smbios-rbu-bios-update
-%{_sbindir}/smbios-lcd-brightness
-
-# symlinks: backwards compat
-%{_sbindir}/dellLcdBrightness
-%{_sbindir}/getSystemId
-%{_sbindir}/dellWirelessCtl
-%{_sbindir}/dellBiosUpdate
-# used by HAL in old location, so keep it around until HAL is updated.
-%{_bindir}/dellWirelessCtl
+%files -n smbios-utils-python -f _build/files-smbios-utils-python
+%defattr(-,root,root,-)
 
-# data files
-%{_datadir}/smbios-utils
-%endif
+%files -n yum-dellsysid -f _build/files-yum-dellsysid
+%defattr(-,root,root,-)
 
 %changelog
+* Fri Dec 11 2009 Matt Domsch <mdomsch at fedoraproject.org> - 2.2.19-1
+- update to upstream 2.2.19
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.16-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Mon May 18 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.2.16-3
+- split yum plugin into yum-dellsysid package
+
 * Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.16-1
 - add gcc 4.4 support
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	15 May 2009 01:57:29 -0000	1.17
+++ sources	11 Dec 2009 18:51:16 -0000	1.18
@@ -1 +1 @@
-678d5940f6c39fa631bc2ed406f2b313  libsmbios-2.2.16.tar.bz2
+ea18d71a3d310d1efe2404e8af218e15  libsmbios-2.2.19.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	15 May 2009 01:57:29 -0000	1.17
+++ .cvsignore	11 Dec 2009 18:51:17 -0000	1.18
@@ -1 +1 @@
-libsmbios-2.2.16.tar.bz2
+libsmbios-2.2.19.tar.bz2



From mclasen at fedoraproject.org  Fri Dec 11 18:51:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 11 Dec 2009 18:51:36 +0000 (UTC)
Subject: rpms/gnome-screensaver/F-12 popsquares-error-handling.patch, NONE, 
	1.1 gnome-screensaver.spec, 1.234, 1.235
Message-ID: <20091211185136.80EB311C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31805

Modified Files:
	gnome-screensaver.spec 
Added Files:
	popsquares-error-handling.patch 
Log Message:
Fix cmdline parsing errors in popsquares


popsquares-error-handling.patch:
 popsquares.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE popsquares-error-handling.patch ---
diff -up gnome-screensaver-2.28.0/savers/popsquares.c.error-handling gnome-screensaver-2.28.0/savers/popsquares.c
--- gnome-screensaver-2.28.0/savers/popsquares.c.error-handling	2009-12-11 13:23:31.587245522 -0500
+++ gnome-screensaver-2.28.0/savers/popsquares.c	2009-12-11 13:33:07.221003198 -0500
@@ -45,7 +45,12 @@ main (int argc, char **argv)
 
         error = NULL;
 
-        gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error);
+        if (!gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error)) {
+		g_printerr (_("%s. See --help for usage information.\n"),
+			    error->message);
+		g_error_free (error);
+	        exit (1);
+	}
 
         window = gs_theme_window_new ();
         g_signal_connect (G_OBJECT (window), "delete-event",


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- gnome-screensaver.spec	3 Dec 2009 14:27:56 -0000	1.234
+++ gnome-screensaver.spec	11 Dec 2009 18:51:36 -0000	1.235
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.28.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
@@ -30,6 +30,9 @@ Patch10: multihead-issues.patch
 Patch11: ask-to-die.patch
 Patch12: remove-session-inhibits.patch
 
+# fixed upstream
+Patch13: popsquares-error-handling.path
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
@@ -84,6 +87,7 @@ simple, sane, secure defaults and be wel
 %patch10 -p1 -b .multihead-issues
 %patch11 -p1 -b .ask-to-die
 %patch12 -p1 -b .remove-session-inhibits
+%patch13 -p1 -b .error-handling
 
 libtoolize --force --copy
 
@@ -158,6 +162,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri Dec 11 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-8
+- Properly handle cmdline parsing errors in popsquares (#546656)
+
 * Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-7
 - Drop an unwanted dependency
 



From arbiter at fedoraproject.org  Fri Dec 11 18:55:20 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri, 11 Dec 2009 18:55:20 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.153,1.154
Message-ID: <20091211185520.8D90D11C00C5@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1020

Modified Files:
	kdegames.spec 
Log Message:
noone kicked me with rebased patch, it should be ok - uncomment it in the .spec and use it


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- kdegames.spec	11 Dec 2009 14:27:45 -0000	1.153
+++ kdegames.spec	11 Dec 2009 18:55:20 -0000	1.154
@@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # In ktron.desktop, just remove all the translations containing "Tron" or
 # "KTron". Use my translations of GenericName for de, fr, it, feel free to add
 # more, but don't use "Tron" in them! -- Kevin
-Patch0: kdegames-4.3.75-trademarks.patch
+Patch0: kdegames-4.3.80-trademarks.patch
 
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
@@ -104,7 +104,7 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
-# %patch0 -p1 -b .trademarks
+%patch0 -p1 -b .trademarks
 
 %build
 # trademarks issue in RHEL



From mathstuf at fedoraproject.org  Fri Dec 11 18:55:29 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 11 Dec 2009 18:55:29 +0000 (UTC)
Subject: File libqinfinity-1.0b4.tar.gz uploaded to lookaside cache by
	mathstuf
Message-ID: <20091211185529.B759A10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libqinfinity:

9dcfdd37033563e47c6b25383a455030  libqinfinity-1.0b4.tar.gz



From pkgdb at fedoraproject.org  Fri Dec 11 18:57:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 18:57:07 +0000
Subject: [pkgdb] gnome-screensaver: krh has given up watchcommits
Message-ID: <20091211185707.290D510F891@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-screensaver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver



From pkgdb at fedoraproject.org  Fri Dec 11 18:57:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 18:57:09 +0000
Subject: [pkgdb] gnome-screensaver: krh has given up watchcommits
Message-ID: <20091211185709.3D81210F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-screensaver (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver



From pkgdb at fedoraproject.org  Fri Dec 11 18:57:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 18:57:11 +0000
Subject: [pkgdb] gnome-screensaver: krh has given up watchcommits
Message-ID: <20091211185711.ECF2310F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-screensaver (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver



From pkgdb at fedoraproject.org  Fri Dec 11 18:57:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 18:57:13 +0000
Subject: [pkgdb] gnome-screensaver: krh has given up watchcommits
Message-ID: <20091211185713.7682910F891@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-screensaver (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver



From pkgdb at fedoraproject.org  Fri Dec 11 18:57:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 18:57:16 +0000
Subject: [pkgdb] gnome-screensaver: krh has given up watchcommits
Message-ID: <20091211185716.7C65C10F891@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-screensaver (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver



From pkgdb at fedoraproject.org  Fri Dec 11 18:57:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 18:57:18 +0000
Subject: [pkgdb] gnome-screensaver: krh has given up watchcommits
Message-ID: <20091211185718.F2C7D10F89C@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-screensaver (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver



From pkgdb at fedoraproject.org  Fri Dec 11 18:57:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 18:57:19 +0000
Subject: [pkgdb] gnome-screensaver: krh has given up watchcommits
Message-ID: <20091211185719.B3BF910F89D@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on gnome-screensaver (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver



From mdomsch at fedoraproject.org  Fri Dec 11 18:57:22 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 11 Dec 2009 18:57:22 +0000 (UTC)
Subject: File firmware-tools-2.1.9.tar.bz2 uploaded to lookaside cache by
	mdomsch
Message-ID: <20091211185722.3E00A10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for firmware-tools:

66ebd7ee576857741e7b8d528af566c8  firmware-tools-2.1.9.tar.bz2



From mathstuf at fedoraproject.org  Fri Dec 11 18:58:03 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 11 Dec 2009 18:58:03 +0000 (UTC)
Subject: rpms/libqinfinity/devel .cvsignore, 1.2, 1.3 libqinfinity.spec, 1.2,
	1.3 sources, 1.2, 1.3 libqinfinity-1.0b3-cmake-libsuffix.patch,
	1.1, NONE libqinfinity-1.0b3-install-libsuffix.patch, 1.1, NONE
Message-ID: <20091211185803.D1BE211C00C5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/libqinfinity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2353

Modified Files:
	.cvsignore libqinfinity.spec sources 
Removed Files:
	libqinfinity-1.0b3-cmake-libsuffix.patch 
	libqinfinity-1.0b3-install-libsuffix.patch 
Log Message:
Update to beta4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Jul 2009 01:30:48 -0000	1.2
+++ .cvsignore	11 Dec 2009 18:58:03 -0000	1.3
@@ -1 +1 @@
-libqinfinity-1.0b3.tar.gz
+libqinfinity-1.0b4.tar.gz


Index: libqinfinity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/devel/libqinfinity.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libqinfinity.spec	25 Jul 2009 08:30:42 -0000	1.2
+++ libqinfinity.spec	11 Dec 2009 18:58:03 -0000	1.3
@@ -1,14 +1,12 @@
 Name:           libqinfinity
 Version:        1.0
-Release:        0.2.b3%{?dist}
+Release:        0.2.b4%{?dist}
 Summary:        Qt interface for libinfinity
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://greghaynes.github.com/libqinfinity/
-Source0:        http://cloud.github.com/downloads/greghaynes/libqinfinity/libqinfinity-1.0b3.tar.gz
-Patch0:         libqinfinity-1.0b3-install-libsuffix.patch
-Patch1:         libqinfinity-1.0b3-cmake-libsuffix.patch
+Source0:        http://cloud.github.com/downloads/greghaynes/libqinfinity/libqinfinity-1.0b4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libinfinity-devel
@@ -32,9 +30,7 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-1.0b3
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-1.0b4
 
 
 %build
@@ -60,7 +56,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_libdir}/libqinfinity.so.1
+%{_libdir}/libqinfinity.so.2
 %{_libdir}/libqinfinity.so.0.1
 
 %files devel
@@ -70,8 +66,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.2.b3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Dec 11 2009 Ben Boeckel <MathStuf at gmail.com> - 1.0-0.2.b4
+- Update to beta4
 
 * Sat Jun 29 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-0.1.b3
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jul 2009 01:30:48 -0000	1.2
+++ sources	11 Dec 2009 18:58:03 -0000	1.3
@@ -1 +1 @@
-3869160a983386405c615460dc79511b  libqinfinity-1.0b3.tar.gz
+9dcfdd37033563e47c6b25383a455030  libqinfinity-1.0b4.tar.gz


--- libqinfinity-1.0b3-cmake-libsuffix.patch DELETED ---


--- libqinfinity-1.0b3-install-libsuffix.patch DELETED ---



From rdieter at fedoraproject.org  Fri Dec 11 18:58:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 18:58:10 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime.spec,1.129,1.130
Message-ID: <20091211185810.342F411C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2427

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2.1
- enable phonon/pa patch on f11 too



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- kdebase-runtime.spec	5 Dec 2009 15:23:08 -0000	1.129
+++ kdebase-runtime.spec	11 Dec 2009 18:58:10 -0000	1.130
@@ -1,7 +1,7 @@
 
 %if 0%{?fedora}
 %define flags 1
-%if 0%{?fedora} > 11
+%if 0%{?fedora} > 10
 %define phonon_pa_patch 1
 %endif
 %endif
@@ -9,7 +9,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.4
-Release:       2%{?dist}
+Release:       2%{?dist}.1
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -243,6 +243,9 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2.1
+- enable phonon/pa patch on f11 too
+
 * Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2
 - phonon/pulseaudio patch from mandriva, kudos to coling (f12)
 



From mclasen at fedoraproject.org  Fri Dec 11 18:58:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 11 Dec 2009 18:58:15 +0000 (UTC)
Subject: rpms/gnome-screensaver/F-12 gnome-screensaver.spec,1.235,1.236
Message-ID: <20091211185815.87C8F11C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2372

Modified Files:
	gnome-screensaver.spec 
Log Message:
fix spec



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- gnome-screensaver.spec	11 Dec 2009 18:51:36 -0000	1.235
+++ gnome-screensaver.spec	11 Dec 2009 18:58:15 -0000	1.236
@@ -31,7 +31,7 @@ Patch11: ask-to-die.patch
 Patch12: remove-session-inhibits.patch
 
 # fixed upstream
-Patch13: popsquares-error-handling.path
+Patch13: popsquares-error-handling.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org



From mclasen at fedoraproject.org  Fri Dec 11 18:59:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 11 Dec 2009 18:59:46 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel popsquares-error-handling.patch, NONE, 
	1.1 gnome-screensaver.spec, 1.233, 1.234
Message-ID: <20091211185946.BC18911C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1610

Modified Files:
	gnome-screensaver.spec 
Added Files:
	popsquares-error-handling.patch 
Log Message:
Fix cmdline error handling in popsquares


popsquares-error-handling.patch:
 popsquares.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE popsquares-error-handling.patch ---
diff -up gnome-screensaver-2.28.0/savers/popsquares.c.error-handling gnome-screensaver-2.28.0/savers/popsquares.c
--- gnome-screensaver-2.28.0/savers/popsquares.c.error-handling	2009-12-11 13:23:31.587245522 -0500
+++ gnome-screensaver-2.28.0/savers/popsquares.c	2009-12-11 13:33:07.221003198 -0500
@@ -45,7 +45,12 @@ main (int argc, char **argv)
 
         error = NULL;
 
-        gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error);
+        if (!gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error)) {
+		g_printerr (_("%s. See --help for usage information.\n"),
+			    error->message);
+		g_error_free (error);
+	        exit (1);
+	}
 
         window = gs_theme_window_new ();
         g_signal_connect (G_OBJECT (window), "delete-event",


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- gnome-screensaver.spec	3 Dec 2009 14:33:30 -0000	1.233
+++ gnome-screensaver.spec	11 Dec 2009 18:59:45 -0000	1.234
@@ -36,6 +36,9 @@ Patch12: remove-session-inhibits.patch
 # from upstream
 Patch13: 0001-Add-an-API-to-show-a-message-on-the-locked-screen.patch
 
+# fixed upstream
+Patch14: popsquares-error-handling.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
@@ -91,6 +94,7 @@ simple, sane, secure defaults and be wel
 %patch11 -p1 -b .ask-to-die
 %patch12 -p1 -b .remove-session-inhibits
 %patch13 -p1 -b .message-api
+%patch14 -p1 -b .error-handling
 
 autoreconf -f -i
 
@@ -161,6 +165,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri Dec 11 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-9
+- Properly handle cmdline parsing errors in popsquares (#546656)
+
 * Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-8
 - Drop an unwanted dependency
 



From mclasen at fedoraproject.org  Fri Dec 11 19:01:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 11 Dec 2009 19:01:38 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.234,1.235
Message-ID: <20091211190138.3CF0611C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3932

Modified Files:
	gnome-screensaver.spec 
Log Message:
Bump rev



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- gnome-screensaver.spec	11 Dec 2009 18:59:45 -0000	1.234
+++ gnome-screensaver.spec	11 Dec 2009 19:01:38 -0000	1.235
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.28.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2



From mathstuf at fedoraproject.org  Fri Dec 11 19:02:39 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 11 Dec 2009 19:02:39 +0000 (UTC)
Subject: File kobby-1.0b4.tar.gz uploaded to lookaside cache by mathstuf
Message-ID: <20091211190239.128DB10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for kobby:

cfe6bbb4e5591371d52fac083e9e6d12  kobby-1.0b4.tar.gz



From mathstuf at fedoraproject.org  Fri Dec 11 19:03:08 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 11 Dec 2009 19:03:08 +0000 (UTC)
Subject: rpms/kobby/devel .cvsignore, 1.2, 1.3 kobby.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <20091211190308.0D4F111C00C5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4514

Modified Files:
	.cvsignore kobby.spec sources 
Log Message:
Update to beta4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jul 2009 00:12:20 -0000	1.2
+++ .cvsignore	11 Dec 2009 19:03:07 -0000	1.3
@@ -1 +1 @@
-kobby-1.0b3.tar.gz
+kobby-1.0b4.tar.gz


Index: kobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/devel/kobby.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kobby.spec	30 Jul 2009 16:31:30 -0000	1.2
+++ kobby.spec	11 Dec 2009 19:03:07 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           kobby
 Version:        1.0
-Release:        0.2.b3%{?dist}
+Release:        0.3.b4%{?dist}
 Summary:        Collaborative editor using the infinote protocol
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://greghaynes.github.com/kobby/
-Source0:        http://cloud.github.com/downloads/greghaynes/kobby/kobby-1.0b3.tar.gz
+Source0:        http://cloud.github.com/downloads/greghaynes/kobby/kobby-1.0b4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libqinfinity-devel
@@ -17,7 +17,7 @@ KDE collaborative editor using the infin
 
 
 %prep
-%setup -q -n kobby-1.0b3
+%setup -q -n kobby-1.0b4
 
 
 %build
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 11 2009 Ben Boeckel <MathStuf at gmail.com> - 1.0-0.3.b4
+- Update to beta4
+
 * Thu Jul 30 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-0.2.b3
 - Fix summary
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jul 2009 00:12:20 -0000	1.2
+++ sources	11 Dec 2009 19:03:07 -0000	1.3
@@ -1 +1 @@
-82661e018e89b3eee998b46f9fb9264f  kobby-1.0b3.tar.gz
+cfe6bbb4e5591371d52fac083e9e6d12  kobby-1.0b4.tar.gz



From mathstuf at fedoraproject.org  Fri Dec 11 19:07:15 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 11 Dec 2009 19:07:15 +0000 (UTC)
Subject: rpms/libqinfinity/F-12 .cvsignore, 1.2, 1.3 libqinfinity.spec, 1.2, 
	1.3 sources, 1.2, 1.3 libqinfinity-1.0b3-cmake-libsuffix.patch,
	1.1, NONE libqinfinity-1.0b3-install-libsuffix.patch, 1.1, NONE
Message-ID: <20091211190715.BA60E11C00C5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/libqinfinity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6025

Modified Files:
	.cvsignore libqinfinity.spec sources 
Removed Files:
	libqinfinity-1.0b3-cmake-libsuffix.patch 
	libqinfinity-1.0b3-install-libsuffix.patch 
Log Message:
Update to beta4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Jul 2009 01:30:48 -0000	1.2
+++ .cvsignore	11 Dec 2009 19:07:15 -0000	1.3
@@ -1 +1 @@
-libqinfinity-1.0b3.tar.gz
+libqinfinity-1.0b4.tar.gz


Index: libqinfinity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/F-12/libqinfinity.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libqinfinity.spec	25 Jul 2009 08:30:42 -0000	1.2
+++ libqinfinity.spec	11 Dec 2009 19:07:15 -0000	1.3
@@ -1,14 +1,12 @@
 Name:           libqinfinity
 Version:        1.0
-Release:        0.2.b3%{?dist}
+Release:        0.2.b4%{?dist}
 Summary:        Qt interface for libinfinity
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://greghaynes.github.com/libqinfinity/
-Source0:        http://cloud.github.com/downloads/greghaynes/libqinfinity/libqinfinity-1.0b3.tar.gz
-Patch0:         libqinfinity-1.0b3-install-libsuffix.patch
-Patch1:         libqinfinity-1.0b3-cmake-libsuffix.patch
+Source0:        http://cloud.github.com/downloads/greghaynes/libqinfinity/libqinfinity-1.0b4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libinfinity-devel
@@ -32,9 +30,7 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-1.0b3
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-1.0b4
 
 
 %build
@@ -60,7 +56,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_libdir}/libqinfinity.so.1
+%{_libdir}/libqinfinity.so.2
 %{_libdir}/libqinfinity.so.0.1
 
 %files devel
@@ -70,8 +66,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.2.b3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Dec 11 2009 Ben Boeckel <MathStuf at gmail.com> - 1.0-0.2.b4
+- Update to beta4
 
 * Sat Jun 29 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-0.1.b3
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jul 2009 01:30:48 -0000	1.2
+++ sources	11 Dec 2009 19:07:15 -0000	1.3
@@ -1 +1 @@
-3869160a983386405c615460dc79511b  libqinfinity-1.0b3.tar.gz
+9dcfdd37033563e47c6b25383a455030  libqinfinity-1.0b4.tar.gz


--- libqinfinity-1.0b3-cmake-libsuffix.patch DELETED ---


--- libqinfinity-1.0b3-install-libsuffix.patch DELETED ---



From mathstuf at fedoraproject.org  Fri Dec 11 19:07:43 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 11 Dec 2009 19:07:43 +0000 (UTC)
Subject: rpms/libqinfinity/F-11 .cvsignore, 1.1, 1.2 libqinfinity.spec, 1.3, 
	1.4 sources, 1.2, 1.3 libqinfinity-1.0b3-cmake-libsuffix.patch,
	1.1, NONE libqinfinity-1.0b3-install-libsuffix.patch, 1.1, NONE
Message-ID: <20091211190743.A847111C00C5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/libqinfinity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6218

Modified Files:
	.cvsignore libqinfinity.spec sources 
Removed Files:
	libqinfinity-1.0b3-cmake-libsuffix.patch 
	libqinfinity-1.0b3-install-libsuffix.patch 
Log Message:
Update to beta4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Jul 2009 03:57:23 -0000	1.1
+++ .cvsignore	11 Dec 2009 19:07:43 -0000	1.2
@@ -0,0 +1 @@
+libqinfinity-1.0b4.tar.gz


Index: libqinfinity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/F-11/libqinfinity.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libqinfinity.spec	30 Jul 2009 00:28:54 -0000	1.3
+++ libqinfinity.spec	11 Dec 2009 19:07:43 -0000	1.4
@@ -1,14 +1,12 @@
 Name:           libqinfinity
 Version:        1.0
-Release:        0.2.b3%{?dist}.2
+Release:        0.2.b4%{?dist}
 Summary:        Qt interface for libinfinity
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://greghaynes.github.com/libqinfinity/
-Source0:        http://cloud.github.com/downloads/greghaynes/libqinfinity/libqinfinity-1.0b3.tar.gz
-Patch0:         libqinfinity-1.0b3-install-libsuffix.patch
-Patch1:         libqinfinity-1.0b3-cmake-libsuffix.patch
+Source0:        http://cloud.github.com/downloads/greghaynes/libqinfinity/libqinfinity-1.0b4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libinfinity-devel
@@ -32,9 +30,7 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-1.0b3
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-1.0b4
 
 
 %build
@@ -60,7 +56,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_libdir}/libqinfinity.so.1
+%{_libdir}/libqinfinity.so.2
 %{_libdir}/libqinfinity.so.0.1
 
 %files devel
@@ -70,14 +66,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Jul 29 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-0.1.b3.2
-- Request override tags
-
-* Tue Jul 28 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-0.1.b3.1
-- Wait for newRepo task in koji
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.2.b3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Dec 11 2009 Ben Boeckel <MathStuf at gmail.com> - 1.0-0.2.b4
+- Update to beta4
 
 * Sat Jun 29 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-0.1.b3
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libqinfinity/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Jul 2009 23:44:23 -0000	1.2
+++ sources	11 Dec 2009 19:07:43 -0000	1.3
@@ -1 +1 @@
-3869160a983386405c615460dc79511b  libqinfinity-1.0b3.tar.gz
+9dcfdd37033563e47c6b25383a455030  libqinfinity-1.0b4.tar.gz


--- libqinfinity-1.0b3-cmake-libsuffix.patch DELETED ---


--- libqinfinity-1.0b3-install-libsuffix.patch DELETED ---



From mathstuf at fedoraproject.org  Fri Dec 11 19:08:24 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 11 Dec 2009 19:08:24 +0000 (UTC)
Subject: rpms/kobby/F-12 .cvsignore, 1.2, 1.3 kobby.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091211190824.A233911C00C5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kobby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6557

Modified Files:
	.cvsignore kobby.spec sources 
Log Message:
Update to beta4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jul 2009 00:12:20 -0000	1.2
+++ .cvsignore	11 Dec 2009 19:08:24 -0000	1.3
@@ -1 +1 @@
-kobby-1.0b3.tar.gz
+kobby-1.0b4.tar.gz


Index: kobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/F-12/kobby.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kobby.spec	30 Jul 2009 16:31:30 -0000	1.2
+++ kobby.spec	11 Dec 2009 19:08:24 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           kobby
 Version:        1.0
-Release:        0.2.b3%{?dist}
+Release:        0.3.b4%{?dist}
 Summary:        Collaborative editor using the infinote protocol
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://greghaynes.github.com/kobby/
-Source0:        http://cloud.github.com/downloads/greghaynes/kobby/kobby-1.0b3.tar.gz
+Source0:        http://cloud.github.com/downloads/greghaynes/kobby/kobby-1.0b4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libqinfinity-devel
@@ -17,7 +17,7 @@ KDE collaborative editor using the infin
 
 
 %prep
-%setup -q -n kobby-1.0b3
+%setup -q -n kobby-1.0b4
 
 
 %build
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 11 2009 Ben Boeckel <MathStuf at gmail.com> - 1.0-0.3.b4
+- Update to beta4
+
 * Thu Jul 30 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-0.2.b3
 - Fix summary
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jul 2009 00:12:20 -0000	1.2
+++ sources	11 Dec 2009 19:08:24 -0000	1.3
@@ -1 +1 @@
-82661e018e89b3eee998b46f9fb9264f  kobby-1.0b3.tar.gz
+cfe6bbb4e5591371d52fac083e9e6d12  kobby-1.0b4.tar.gz



From mathstuf at fedoraproject.org  Fri Dec 11 19:08:48 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 11 Dec 2009 19:08:48 +0000 (UTC)
Subject: rpms/kobby/F-11 .cvsignore, 1.1, 1.2 kobby.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091211190848.7E0DE11C00C5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kobby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6746

Modified Files:
	.cvsignore kobby.spec sources 
Log Message:
Update to beta4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Jul 2009 01:05:39 -0000	1.1
+++ .cvsignore	11 Dec 2009 19:08:48 -0000	1.2
@@ -0,0 +1 @@
+kobby-1.0b4.tar.gz


Index: kobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/F-11/kobby.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kobby.spec	30 Jul 2009 16:57:41 -0000	1.2
+++ kobby.spec	11 Dec 2009 19:08:48 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           kobby
 Version:        1.0
-Release:        0.2.b3%{?dist}
+Release:        0.3.b4%{?dist}
 Summary:        Collaborative editor using the infinote protocol
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://greghaynes.github.com/kobby/
-Source0:        http://cloud.github.com/downloads/greghaynes/kobby/kobby-1.0b3.tar.gz
+Source0:        http://cloud.github.com/downloads/greghaynes/kobby/kobby-1.0b4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libqinfinity-devel
@@ -17,7 +17,7 @@ KDE collaborative editor using the infin
 
 
 %prep
-%setup -q -n kobby-1.0b3
+%setup -q -n kobby-1.0b4
 
 
 %build
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 11 2009 Ben Boeckel <MathStuf at gmail.com> - 1.0-0.3.b4
+- Update to beta4
+
 * Thu Jul 30 2009 Ben Boeckel <MathStuf at gmail.com> 1.0-0.2.b3
 - Fix summary
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kobby/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jul 2009 00:28:05 -0000	1.2
+++ sources	11 Dec 2009 19:08:48 -0000	1.3
@@ -1 +1 @@
-82661e018e89b3eee998b46f9fb9264f  kobby-1.0b3.tar.gz
+cfe6bbb4e5591371d52fac083e9e6d12  kobby-1.0b4.tar.gz



From mdomsch at fedoraproject.org  Fri Dec 11 19:17:12 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 11 Dec 2009 19:17:12 +0000 (UTC)
Subject: rpms/firmware-addon-dell/devel firmware-addon-dell.spec,1.21,1.22
Message-ID: <20091211191712.9A53B11C00C5@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/firmware-addon-dell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10058

Modified Files:
	firmware-addon-dell.spec 
Log Message:
update to upstream 2.2.1


Index: firmware-addon-dell.spec
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/firmware-addon-dell.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- firmware-addon-dell.spec	24 Jul 2009 22:49:15 -0000	1.21
+++ firmware-addon-dell.spec	11 Dec 2009 19:17:12 -0000	1.22
@@ -1,11 +1,17 @@
 # vim:tw=0:ts=4:sw=4:et
 %define major 2
-%define minor 1
-%define sub 2
+%define minor 2
+%define micro 1
 %define extralevel %{nil}
-%define rpm_release 1
 %define release_name firmware-addon-dell
-%define release_version %{major}.%{minor}.%{sub}%{extralevel}
+%define release_version %{major}.%{minor}.%{micro}%{extralevel}
+
+# required by suse build system
+# norootforbuild
+
+%define run_unit_tests 1
+%{?_without_unit_tests: %define run_unit_tests 0}
+%{?_with_unit_tests:    %define run_unit_tests 1}
 
 %define python_xml_BR %{nil}
 # Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
@@ -23,12 +29,12 @@
 
 Name:           %{release_name}
 Version:        %{release_version} 
-Release:        5.3%{?releasesuffix}%{?dist}
+Release:        1%{?dist}
 Summary:        A firmware-tools plugin to handle BIOS/Firmware for Dell systems
 
 Group:          Applications/System
 License:        GPLv2+ or OSL 2.1
-URL:            http://linux.dell.com/libsmbios/download/ 
+URL:            http://linux.dell.com/libsmbios/download/
 Source0:        http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,13 +46,13 @@ ExclusiveArch: x86_64 ia64 %{ix86}
 # be installed at buildtime. This means we have to BuildRequire them, even if
 # we dont really need them at build time.
 %if 0%{?suse_version}
-BuildRequires: firmware-tools yum
+BuildRequires: firmware-tools
 %endif
 
-Requires: smbios-utils
+Requires: smbios-utils python-smbios
 Requires: firmware-tools >= 0:2.0.0
 Provides: firmware_inventory(system_bios)  = 0:%{version}
-BuildRequires:  python-devel, firmware-tools, %{python_xml_BR}
+BuildRequires:  python-smbios, python-devel, firmware-tools, %{python_xml_BR}
 
 %description
 The firmware-addon-dell package provides plugins to firmware-tools which enable
@@ -67,17 +73,19 @@ applicable to most Dell systems.
 touch configure
 find . -type f -newer configure -print0 | xargs -r0 touch
 
-%configure
-make -e %{?_smp_mflags} 
+%configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra}
+make %{?_smp_mflags}
 
 %check
-make -e %{?_smp_mflags} check
+%if 0%{?run_unit_tests}
+make %{?_smp_mflags} check
+%endif
 
 %install
 # Fedora Packaging guidelines
 rm -rf $RPM_BUILD_ROOT
 # SUSE Packaging rpmlint
-mkdir -p $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT
 
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware/dell/bios
@@ -92,13 +100,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING-GPL COPYING-OSL
 %{python_sitelib}/*
 %config(noreplace) %{_sysconfdir}/firmware/firmware.d/*.conf
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/dellsysidplugin.conf
 %{_datadir}/firmware/dell
-%{_exec_prefix}/lib/yum-plugins/*
 %{_datadir}/firmware-tools/*
 
 
 %changelog
+* Fri Dec 11 2009 Matt Domsch <mdomsch at fedoraproject.org> - 2.2.1-1
+- rebase to latest upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-5.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From petersen at fedoraproject.org  Fri Dec 11 19:17:18 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 11 Dec 2009 19:17:18 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.112,1.113
Message-ID: <20091211191718.B0EE611C00C5@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10156

Modified Files:
	ghc.spec 
Log Message:
disable smp build for now: broken for 8 cpus at least


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- ghc.spec	11 Dec 2009 18:40:16 -0000	1.112
+++ ghc.spec	11 Dec 2009 19:17:18 -0000	1.113
@@ -168,7 +168,9 @@ export CFLAGS="${CFLAGS:-%optflags}"
   --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
   %{?with_shared:--enable-shared}
 
-make %{_smp_mflags}
+# 8 cpus seems to break build
+#make %{_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -323,6 +325,7 @@ ghc-pkg recache
 - subpackage huge ghc internals library (thanks Lorenzo Villani)
   - BR ghc-rpm-macros >= 0.3.0
 - move html docs to docdir/ghc from html subdir (Lorenzo Villani)
+- disable smp build for now: broken for 8 cpus at least
 
 * Wed Nov 18 2009 Jens Petersen <petersen at redhat.com> - 6.12.0.20091121-1
 - update to 6.12.1 rc2



From mdomsch at fedoraproject.org  Fri Dec 11 19:24:51 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 11 Dec 2009 19:24:51 +0000 (UTC)
Subject: File firmware-addon-dell-2.2.1.tar.gz uploaded to lookaside cache by
	mdomsch
Message-ID: <20091211192451.74A1710F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for firmware-addon-dell:

180729694fd893f7c5fc029a1ca83717  firmware-addon-dell-2.2.1.tar.gz



From mdomsch at fedoraproject.org  Fri Dec 11 19:25:42 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 11 Dec 2009 19:25:42 +0000 (UTC)
Subject: rpms/firmware-addon-dell/devel firmware-addon-dell.spec, 1.22,
	1.23 sources, 1.15, 1.16 .cvsignore, 1.15, 1.16
Message-ID: <20091211192542.BD75411C00C5@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/firmware-addon-dell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14021

Modified Files:
	firmware-addon-dell.spec sources .cvsignore 
Log Message:
remember to upload the tarball first


Index: firmware-addon-dell.spec
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/firmware-addon-dell.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- firmware-addon-dell.spec	11 Dec 2009 19:17:12 -0000	1.22
+++ firmware-addon-dell.spec	11 Dec 2009 19:25:42 -0000	1.23
@@ -29,7 +29,7 @@
 
 Name:           %{release_name}
 Version:        %{release_version} 
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A firmware-tools plugin to handle BIOS/Firmware for Dell systems
 
 Group:          Applications/System
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 11 2009 Matt Domsch <mdomsch at fedoraproject.org> - 2.2.1-2
+- remember to upload the tarball first
+
 * Fri Dec 11 2009 Matt Domsch <mdomsch at fedoraproject.org> - 2.2.1-1
 - rebase to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	15 May 2009 03:17:08 -0000	1.15
+++ sources	11 Dec 2009 19:25:42 -0000	1.16
@@ -1 +1 @@
-1e15ab2cbdebf0ff14729d429f1293c6  firmware-addon-dell-2.1.2.tar.gz
+180729694fd893f7c5fc029a1ca83717  firmware-addon-dell-2.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	15 May 2009 03:17:08 -0000	1.15
+++ .cvsignore	11 Dec 2009 19:25:42 -0000	1.16
@@ -1 +1 @@
-firmware-addon-dell-2.1.2.tar.gz
+firmware-addon-dell-2.2.1.tar.gz



From rdieter at fedoraproject.org  Fri Dec 11 19:29:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 11 Dec 2009 19:29:59 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch, NONE,
	1.1 kdebase-workspace.spec, 1.327, 1.328
Message-ID: <20091211192959.166E911C00C5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15561

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch 
Log Message:
* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-4
- SELinux is preventing access to a leaked .xsession-errors-:0 file descriptor (#542312)


kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch:
 client.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch ---
diff -up kdebase-workspace-4.3.80/kdm/backend/client.c.append kdebase-workspace-4.3.80/kdm/backend/client.c
--- kdebase-workspace-4.3.80/kdm/backend/client.c.append	2009-11-02 06:01:32.000000000 -0600
+++ kdebase-workspace-4.3.80/kdm/backend/client.c	2009-12-11 13:16:49.047992973 -0600
@@ -1182,7 +1182,7 @@ createClientLog( const char *log )
 		if (!(lname = expandMacros( log, macros )))
 			exit( 1 );
 		unlink( lname );
-		if ((lfd = open( lname, O_WRONLY|O_CREAT|O_EXCL, 0600 )) >= 0) {
+		if ((lfd = open( lname, O_WRONLY|O_CREAT|O_EXCL|O_APPEND, 0600 )) >= 0) {
 			dup2( lfd, 1 );
 			dup2( lfd, 2 );
 			close( lfd );


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- kdebase-workspace.spec	9 Dec 2009 23:31:51 -0000	1.327
+++ kdebase-workspace.spec	11 Dec 2009 19:29:58 -0000	1.328
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.80
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -38,6 +38,7 @@ Patch17: kdebase-workspace-4.3.75-classi
 # Fix the version
 Patch18: kdebase-workspace-4.3.80-cmake-targets.patch
 Patch19: kdebase-workspace-4.3.3-kdm_plymouth.patch
+Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -274,6 +275,7 @@ Requires: akonadi
 %patch17 -p1 -b .classicmenu-logout
 %patch18 -p1 -b .cmake-targets
 %patch19 -p1 -b .kdm_plymouth
+%patch20 -p1 -b .xsession_errors_O_APPEND
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -613,6 +615,9 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-4
+- SELinux is preventing access to a leaked .xsession-errors-:0 file descriptor (#542312)
+
 * Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - drop polkit-qt* Obsoletes, we have a new polkit-qt now
 



From ssp at fedoraproject.org  Fri Dec 11 19:44:01 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Fri, 11 Dec 2009 19:44:01 +0000 (UTC)
Subject: rpms/pixman/F-12
	0001-region-Enable-or-disable-fatal-errors-and-selfchecks.patch,
	NONE, 1.1 pixman.spec, 1.44, 1.45
Message-ID: <20091211194401.16D6D11C00C5@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20563

Modified Files:
	pixman.spec 
Added Files:
	0001-region-Enable-or-disable-fatal-errors-and-selfchecks.patch 
Log Message:
Disable asserts

0001-region-Enable-or-disable-fatal-errors-and-selfchecks.patch:
 pixman-region.c |   42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

--- NEW FILE 0001-region-Enable-or-disable-fatal-errors-and-selfchecks.patch ---
>From 54bc3ee64e5582a348cb0e48b3c54b1680ba7937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann at redhat.com>
Date: Fri, 11 Dec 2009 11:14:19 -0500
Subject: [PATCH] region: Enable or disable fatal errors and selfchecks based on version number

For stable releases, assertions and selfchecks are turned off.

For unstable releases, assertions and selfchecks are turned on.

For random git checkouts, assertions are on, but selfchecks are off.
---
 pixman/pixman-region.c |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index f88955f..df38ea0 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -66,9 +66,42 @@
 #define GOOD_RECT(rect) ((rect)->x1 < (rect)->x2 && (rect)->y1 < (rect)->y2)
 #define BAD_RECT(rect) ((rect)->x1 > (rect)->x2 || (rect)->y1 > (rect)->y2)
 
-#define noPIXMAN_REGION_LOG_FAILURES
+/* Turn on debugging depending on what type of release this is
+ */
 
-#if defined PIXMAN_REGION_LOG_FAILURES || defined PIXMAN_REGION_DEBUG
+#if ((PIXMAN_VERSION_MICRO % 2) == 1)
+/* Random git checkout.
+ * 
+ * Those are often used for performance work, so we don't turn on the
+ * full self-checking, but we do turn on the asserts.
+ */
+#    define   FATAL_BUGS
+#    define noSELF_CHECKS
+#elif ((PIXMAN_VERSION_MINOR % 2) == 0)
+/* Stable release.
+ *
+ * We don't want assertions because the X server should stay alive
+ * if possible. We also don't want self-checks for performance-reasons.
+ */
+#    define noFATAL_BUGS
+#    define noSELF_CHECKS
+#else
+/* Development snapshot.
+ *
+ * These are the things that get shipped in development distributions
+ * such as Rawhide. We want both self-checking and fatal assertions
+ * to catch as many bugs as possible.
+ */
+#    define FATAL_BUGS
+#    define SELF_CHECKS
+#endif
+
+#ifndef FATAL_BUGS
+#    define assert(expr)
+#    define abort()
+#endif
+
+#ifdef SELF_CHECKS
 
 static void
 log_region_error (const char *function, const char *message)
@@ -83,9 +116,7 @@ log_region_error (const char *function, const char *message)
 		 "Set a breakpoint on 'log_region_error' to debug\n\n",
                  function, message);
 
-#if defined PIXMAN_REGION_DEBUG
-        abort ();
-#endif
+        abort (); /* This is #defined away unless FATAL_BUGS is defined */
 
 	n_messages++;
     }
-- 
1.6.5.2



Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/F-12/pixman.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- pixman.spec	28 Sep 2009 13:52:56 -0000	1.44
+++ pixman.spec	11 Dec 2009 19:44:00 -0000	1.45
@@ -15,6 +15,8 @@ URL:            http://cgit.freedesktop.
 Source0:        http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         0001-region-Enable-or-disable-fatal-errors-and-selfchecks.patch
+
 
 # BuildRequires:  automake autoconf libtool pkgconfig
 
@@ -32,6 +34,7 @@ Development library for pixman.
 
 %prep
 %setup -q
+%patch0 -p1 -b .disable-asserts
 
 %build
 %configure --disable-static
@@ -61,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Fri Dec 11 2009 Soren Sandmann <ssp at redhat.com> - 0.16.2-2
+- Add patch to disable asserts in stable releases.
+
 * Mon Sep 28 2009 Soren Sandmann <ssp at redhat.com> - 0.16.2-1
 - pixman 0.16.2
 



From ssp at fedoraproject.org  Fri Dec 11 19:44:21 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Fri, 11 Dec 2009 19:44:21 +0000 (UTC)
Subject: rpms/pixman/F-12 pixman.spec,1.45,1.46
Message-ID: <20091211194421.D908411C00C5@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20791

Modified Files:
	pixman.spec 
Log Message:
Disable asserts


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/F-12/pixman.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- pixman.spec	11 Dec 2009 19:44:00 -0000	1.45
+++ pixman.spec	11 Dec 2009 19:44:21 -0000	1.46
@@ -3,7 +3,7 @@
 
 Name:           pixman
 Version:        0.16.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries



From heffer at fedoraproject.org  Fri Dec 11 20:09:20 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 11 Dec 2009 20:09:20 +0000 (UTC)
Subject: File opengfx-0.2.0-source.tar.gz uploaded to lookaside cache by
	heffer
Message-ID: <20091211200920.3997E10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for openttd-opengfx:

468b4c4d8252b1ab0a45da84d48d3044  opengfx-0.2.0-source.tar.gz



From heffer at fedoraproject.org  Fri Dec 11 20:14:30 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 11 Dec 2009 20:14:30 +0000 (UTC)
Subject: rpms/openttd-opengfx/devel .cvsignore, 1.4, 1.5 opengfx.obg, 1.1,
	1.2 openttd-opengfx.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091211201430.D3B7711C00C5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd-opengfx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31467

Modified Files:
	.cvsignore opengfx.obg openttd-opengfx.spec sources 
Log Message:
* Fri Dec 11 2009 Felix Kaechele <felix at fetzig.org> - 0.2.0-1
- update to 0.2.0
- cleaned up docs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Oct 2009 10:01:54 -0000	1.4
+++ .cvsignore	11 Dec 2009 20:14:30 -0000	1.5
@@ -1 +1 @@
-opengfx-0.1.1-source.tar.gz
+opengfx-0.2.0-source.tar.gz


Index: opengfx.obg
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/opengfx.obg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- opengfx.obg	10 Oct 2009 13:11:36 -0000	1.1
+++ opengfx.obg	11 Dec 2009 20:14:30 -0000	1.2
@@ -1,10 +1,15 @@
 [metadata]
 name        = OpenGFX
 shortname   = OGFX
-version     = 202
-description = OpenGFX base graphics replacement set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX 0.1.1]
+version     = 274
 palette     = Windows
-
+description       = OpenGFX base graphics set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.en_GB = OpenGFX base graphics set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.de_DE = OpenGFX Basisgrafiken f?r OpenTTD. Frei verf?gbar unter der GNU General Public License in der Version 2. Weitere Informationen sind in der Datei readme.txt oder unter http://wiki.openttd.org/OpenGFX_Readme verf?gbar. [OpenGFX nightly-r274]
+description.sv_SE = OpenGFX basgrafikpaket f?r OpenTTD. Fritt tillg?ngligt enligt villkoren f?r GNU General Public License version 2 licensen. Mer information ?r tillg?nglig i readme-dokumentet p? http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.zh_TW = ?OpenTTD???OpenGFX???????????GNU General Public License version 2??????????????http://wiki.openttd.org/OpenGFX_Readme?????? [OpenGFX nightly-r274]
+description.nl_NL = OpenGFX basisgraphicsset voor OpenTTD. Vrij verkrijgbaar onder de voorwaarden van de GNU General Public License versie 2. Meer informatie is beschikbaar in de documentatie op http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.hu_HU = OpenGFX grafikus alapcsomag az OpenTTD-hez. Ingyenesen hozz?f?het? a GNU General Public License (?ltal?nos Nyilv?nos Licenc) 2. vezi?j?ban foglalt felt?telekkel. Tov?bbi inform?ci? el?rhet? a http://wiki.openttd.org/OpenGFX_Readme webhelyen. [OpenGFX nightly-r274]
 [files]
 base     = ogfx1_base.grf
 arctic   = ogfxc_arctic.grf
@@ -14,12 +19,12 @@ toyland  = ogfxt_toyland.grf
 extra    = ogfxe_extra.grf
 
 [md5s]
-ogfx1_base.grf     = fe381d9c24c816e60b06031f52085d05
+ogfx1_base.grf     = 10918be9dca236415e95f4f492cc3f53
 ogfxc_arctic.grf   = 8c8007eaeae8c0cbfdbd3e012ad7927e
 ogfxh_tropical.grf = b53a1f61623540a64b81da3e9f87b007
-ogfxi_logos.grf    = d5e448a6c2cea2ae625bf8439d6d2484
-ogfxt_toyland.grf  = d18531d9173ee73c623b6dc14aff90e8
-ogfxe_extra.grf    = 45f29ac95624d69be774e3ae7719a6ab
+ogfxi_logos.grf    = c25d95e446bd38b1574889be4e46c0c7
+ogfxt_toyland.grf  = b7c413a20c3115174172c49948590182
+ogfxe_extra.grf    = df538a10536cb1b79c41f521a9040e6a
 
 [origin]
 default = Please redownload from official source.


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/openttd-opengfx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openttd-opengfx.spec	10 Oct 2009 13:11:36 -0000	1.5
+++ openttd-opengfx.spec	11 Dec 2009 20:14:30 -0000	1.6
@@ -2,8 +2,8 @@
 #define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0.1.1
-Release:        2%{?prever:.%{prever}}%{?dist}
+Version:        0.2.0
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
@@ -15,7 +15,7 @@ Source1:        opengfx.obg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec nforenum dos2unix
+BuildRequires:  grfcodec nforenum
 Requires:       openttd
 
 
@@ -27,9 +27,6 @@ graphics from the original game.
 
 %prep
 %setup -q -n %{realname}-%{version}%{?prever:-%{prever}}-source 
-dos2unix docs/authoroverview.csv docs/changelog.ptxt docs/license.ptxt \
-    docs/readme.ptxt docs/aoHTMLoutput/config.inc.php \
-    docs/aoHTMLoutput/script.php docs/aoHTMLoutput/style.css
 
 
 %build
@@ -48,7 +45,7 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 
 %check
-cd opengfx-nightly
+cd opengfx-%{version}
 # Split md5sums out of .obg file and check it
 sed -e 's/^\(.*\.grf\)[[:blank:]]*=[[:blank:]]*\([0-9a-f]\{32\}\)/\2  \1/' \
     -e 't end' -e 'D' -e ':end' %{SOURCE1} | md5sum -c
@@ -60,12 +57,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc docs/*.txt
-%doc docs/aoHTMLoutput/
+%doc docs/
 %{_datadir}/openttd/data/*
 
 
 %changelog
+* Fri Dec 11 2009 Felix Kaechele <felix at fetzig.org> - 0.2.0-1
+- update to 0.2.0
+- cleaned up docs
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
 - Correct generation of grfs, using nforenum
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Oct 2009 10:01:54 -0000	1.4
+++ sources	11 Dec 2009 20:14:30 -0000	1.5
@@ -1 +1 @@
-716f4a7e27090ef2c0c89bdc48462f42  opengfx-0.1.1-source.tar.gz
+468b4c4d8252b1ab0a45da84d48d3044  opengfx-0.2.0-source.tar.gz



From dwalsh at fedoraproject.org  Fri Dec 11 20:18:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 11 Dec 2009 20:18:55 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.40,
	1.41 modules-mls.conf, 1.60, 1.61 modules-targeted.conf, 1.149,
	1.150 policy-F13.patch, 1.10, 1.11 selinux-policy.spec, 1.940, 1.941
Message-ID: <20091211201855.83FAA11C00C5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv746

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	policy-F13.patch selinux-policy.spec 
Log Message:
* Fri Dec 11 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-2
- Add tgtd policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- modules-minimum.conf	10 Dec 2009 18:56:22 -0000	1.40
+++ modules-minimum.conf	11 Dec 2009 20:18:54 -0000	1.41
@@ -233,6 +233,13 @@ certwatch = module
 certmaster = module
 
 # Layer: services
+# Module: certmonger
+#
+# Certificate status monitor and PKI enrollment client
+# 
+certmonger = module
+
+# Layer: services
 # Module: cipe
 #
 # Encrypted tunnel daemon
@@ -1555,6 +1562,13 @@ sysstat = module
 # 
 tcpd = module
 
+# Layer: services
+# Module: tgtd
+#
+# Linux Target Framework Daemon.
+# 
+tgtd = module
+
 # Layer: system
 # Module: udev
 #
@@ -1579,7 +1593,7 @@ unconfined = module
 # Layer: services
 # Module: ulogd
 #
-# 
+# netfilter/iptables ULOG daemon
 # 
 ulogd = module
 


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- modules-mls.conf	16 Nov 2009 19:57:19 -0000	1.60
+++ modules-mls.conf	11 Dec 2009 20:18:54 -0000	1.61
@@ -1372,6 +1372,13 @@ sysstat = module
 # 
 tcpd = module
 
+# Layer: services
+# Module: tgtd
+#
+# Linux Target Framework Daemon.
+# 
+tgtd = module
+
 # Layer: system
 # Module: udev
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- modules-targeted.conf	10 Dec 2009 18:56:22 -0000	1.149
+++ modules-targeted.conf	11 Dec 2009 20:18:54 -0000	1.150
@@ -233,6 +233,13 @@ certwatch = module
 certmaster = module
 
 # Layer: services
+# Module: certmonger
+#
+# Certificate status monitor and PKI enrollment client
+# 
+certmonger = module
+
+# Layer: services
 # Module: cipe
 #
 # Encrypted tunnel daemon
@@ -1555,6 +1562,13 @@ sysstat = module
 # 
 tcpd = module
 
+# Layer: services
+# Module: tgtd
+#
+# Linux Target Framework Daemon.
+# 
+tgtd = module
+
 # Layer: system
 # Module: udev
 #
@@ -1579,7 +1593,7 @@ unconfined = module
 # Layer: services
 # Module: ulogd
 #
-# 
+# netfilter/iptables ULOG daemon
 # 
 ulogd = module
 

policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   11 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   77 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  111 +
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   31 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   45 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  460 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  116 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  429 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   24 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |    8 
 policy/modules/services/nut.if            |   82 +
 policy/modules/services/nut.te            |  127 ++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  281 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  629 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   25 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1683 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 385 files changed, 19389 insertions(+), 2972 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- policy-F13.patch	10 Dec 2009 21:30:13 -0000	1.10
+++ policy-F13.patch	11 Dec 2009 20:18:54 -0000	1.11
@@ -1789,7 +1789,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.7.4/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/tmpreaper.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/tmpreaper.te	2009-12-11 15:00:25.000000000 -0500
 @@ -42,6 +42,7 @@
  cron_system_entry(tmpreaper_t, tmpreaper_exec_t)
  
@@ -1798,11 +1798,12 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_delete_user_home_content_dirs(tmpreaper_t)
  	userdom_delete_user_home_content_files(tmpreaper_t)
  	userdom_delete_user_home_content_symlinks(tmpreaper_t)
-@@ -52,6 +53,11 @@
+@@ -52,6 +53,12 @@
  ')
  
  optional_policy(`
 +	apache_delete_sys_content_rw(tmpreaper_t)
++	apache_list_cache(tmpreaper_t)
 +	apache_delete_cache(tmpreaper_t)
 +')
 +
@@ -1810,7 +1811,7 @@ diff -b -B --ignore-all-space --exclude-
  	kismet_manage_log(tmpreaper_t)
  ')
  
-@@ -60,5 +66,9 @@
+@@ -60,5 +67,9 @@
  ')
  
  optional_policy(`
@@ -3562,7 +3563,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.7.4/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/mozilla.te	2009-12-10 15:39:39.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/mozilla.te	2009-12-11 09:38:55.000000000 -0500
 @@ -91,6 +91,7 @@
  corenet_raw_sendrecv_generic_node(mozilla_t)
  corenet_tcp_sendrecv_http_port(mozilla_t)
@@ -6142,7 +6143,7 @@ diff -b -B --ignore-all-space --exclude-
  #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.7.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-11-20 10:51:41.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/devices.if	2009-12-10 14:19:30.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/devices.if	2009-12-11 14:54:55.000000000 -0500
 @@ -783,6 +783,24 @@
  
  ########################################
@@ -7067,8 +7068,16 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.7.4/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/files.te	2009-12-04 12:33:34.000000000 -0500
-@@ -43,6 +43,7 @@
++++ serefpolicy-3.7.4/policy/modules/kernel/files.te	2009-12-11 09:33:22.000000000 -0500
+@@ -12,6 +12,7 @@
+ attribute mountpoint;
+ attribute pidfile;
+ attribute configfile;
++attribute etcfile;
+ 
+ # For labeling types that are to be polyinstantiated
+ attribute polydir;
+@@ -43,6 +44,7 @@
  #
  type boot_t;
  files_mountpoint(boot_t)
@@ -7076,7 +7085,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # default_t is the default type for files that do not
  # match any specification in the file_contexts configuration
-@@ -194,6 +195,7 @@
+@@ -194,6 +196,7 @@
  fs_associate_noxattr(file_type)
  fs_associate_tmpfs(file_type)
  fs_associate_ramfs(file_type)
@@ -7757,7 +7766,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.7.4/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/roles/sysadm.te	2009-12-09 08:29:51.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/sysadm.te	2009-12-11 15:18:11.000000000 -0500
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -7800,7 +7809,7 @@ diff -b -B --ignore-all-space --exclude-
  	backup_run(sysadm_t, sysadm_r)
  ')
  
-@@ -99,18 +97,10 @@
+@@ -99,15 +97,11 @@
  ')
  
  optional_policy(`
@@ -7813,13 +7822,11 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 -	cdrecord_role(sysadm_r, sysadm_t)
--')
--
--optional_policy(`
- 	certwatch_run(sysadm_t, sysadm_r)
++	certmonger_dbus_chat(sysadm_t)
  ')
  
-@@ -127,7 +117,7 @@
+ optional_policy(`
+@@ -127,7 +121,7 @@
  ')
  
  optional_policy(`
@@ -7828,7 +7835,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -135,10 +125,6 @@
+@@ -135,10 +129,6 @@
  ')
  
  optional_policy(`
@@ -7839,7 +7846,7 @@ diff -b -B --ignore-all-space --exclude-
  	dcc_run_cdcc(sysadm_t, sysadm_r)
  	dcc_run_client(sysadm_t, sysadm_r)
  	dcc_run_dbclean(sysadm_t, sysadm_r)
-@@ -166,10 +152,6 @@
+@@ -166,10 +156,6 @@
  ')
  
  optional_policy(`
@@ -7850,7 +7857,7 @@ diff -b -B --ignore-all-space --exclude-
  	firstboot_run(sysadm_t, sysadm_r)
  ')
  
-@@ -178,22 +160,6 @@
+@@ -178,22 +164,6 @@
  ')
  
  optional_policy(`
@@ -7873,7 +7880,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_run(sysadm_t, sysadm_r)
  ')
  
-@@ -205,6 +171,9 @@
+@@ -205,6 +175,9 @@
  	ipsec_stream_connect(sysadm_t)
  	# for lsof
  	ipsec_getattr_key_sockets(sysadm_t)
@@ -7883,7 +7890,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -212,11 +181,7 @@
+@@ -212,11 +185,7 @@
  ')
  
  optional_policy(`
@@ -7896,7 +7903,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -228,10 +193,6 @@
+@@ -228,10 +197,6 @@
  ')
  
  optional_policy(`
@@ -7907,7 +7914,7 @@ diff -b -B --ignore-all-space --exclude-
  	logrotate_run(sysadm_t, sysadm_r)
  ')
  
-@@ -255,14 +216,6 @@
+@@ -255,14 +220,6 @@
  ')
  
  optional_policy(`
@@ -7922,7 +7929,7 @@ diff -b -B --ignore-all-space --exclude-
  	mta_role(sysadm_r, sysadm_t)
  ')
  
-@@ -290,11 +243,6 @@
+@@ -290,11 +247,6 @@
  ')
  
  optional_policy(`
@@ -7934,7 +7941,7 @@ diff -b -B --ignore-all-space --exclude-
  	pcmcia_run_cardctl(sysadm_t, sysadm_r)
  ')
  
-@@ -308,7 +256,7 @@
+@@ -308,7 +260,7 @@
  ')
  
  optional_policy(`
@@ -7943,7 +7950,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -320,10 +268,6 @@
+@@ -320,10 +272,6 @@
  ')
  
  optional_policy(`
@@ -7954,7 +7961,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpc_domtrans_nfsd(sysadm_t)
  ')
  
-@@ -332,10 +276,6 @@
+@@ -332,10 +280,6 @@
  ')
  
  optional_policy(`
@@ -7965,7 +7972,7 @@ diff -b -B --ignore-all-space --exclude-
  	rsync_exec(sysadm_t)
  ')
  
-@@ -345,10 +285,6 @@
+@@ -345,10 +289,6 @@
  ')
  
  optional_policy(`
@@ -7976,7 +7983,7 @@ diff -b -B --ignore-all-space --exclude-
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +294,15 @@
+@@ -358,35 +298,15 @@
  ')
  
  optional_policy(`
@@ -8012,7 +8019,7 @@ diff -b -B --ignore-all-space --exclude-
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +310,10 @@
+@@ -394,18 +314,10 @@
  ')
  
  optional_policy(`
@@ -8031,7 +8038,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,17 +326,13 @@
+@@ -418,17 +330,13 @@
  ')
  
  optional_policy(`
@@ -8050,7 +8057,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -440,13 +343,16 @@
+@@ -440,13 +347,16 @@
  ')
  
  optional_policy(`
@@ -8084,7 +8091,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.7.4/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.if	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.if	2009-12-11 11:30:20.000000000 -0500
 @@ -0,0 +1,667 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -9634,7 +9641,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.7.4/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/abrt.te	2009-12-10 13:04:52.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/abrt.te	2009-12-11 11:26:03.000000000 -0500
 @@ -33,12 +33,25 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -10225,7 +10232,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.7.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/apache.if	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/apache.if	2009-12-11 15:00:30.000000000 -0500
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -10548,10 +10555,29 @@ diff -b -B --ignore-all-space --exclude-
  ##	TCP sockets.
  ## </summary>
  ## <param name="domain">
-@@ -503,6 +462,67 @@
+@@ -503,6 +462,86 @@
  
  ########################################
  ## <summary>
++##	Allow the specified domain to list
++##	Apache cache.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`apache_list_cache',`
++	gen_require(`
++		type httpd_cache_t;
++	')
++
++	list_dirs_pattern($1, httpd_cache_t, httpd_cache_t)
++')
++
++########################################
++## <summary>
 +##	Allow the specified domain to delete
 +##	Apache cache.
 +## </summary>
@@ -10616,7 +10642,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Allow the specified domain to read
  ##	apache configuration files.
  ## </summary>
-@@ -579,7 +599,7 @@
+@@ -579,7 +618,7 @@
  ## </param>
  ## <param name="role">
  ##	<summary>
@@ -10625,7 +10651,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	</summary>
  ## </param>
  ## <rolecap/>
-@@ -715,6 +735,7 @@
+@@ -715,6 +754,7 @@
  	')
  
  	allow $1 httpd_modules_t:dir list_dir_perms;
@@ -10633,7 +10659,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -782,6 +803,32 @@
+@@ -782,6 +822,32 @@
  
  ########################################
  ## <summary>
@@ -10666,7 +10692,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute all web scripts in the system
  ##	script domain.
  ## </summary>
-@@ -791,16 +838,18 @@
+@@ -791,16 +857,18 @@
  ##	</summary>
  ## </param>
  #
@@ -10689,7 +10715,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -859,6 +908,8 @@
+@@ -859,6 +927,8 @@
  ##	</summary>
  ## </param>
  #
@@ -10698,7 +10724,7 @@ diff -b -B --ignore-all-space --exclude-
  interface(`apache_run_all_scripts',`
  	gen_require(`
  		attribute httpd_exec_scripts, httpd_script_domains;
-@@ -884,7 +935,7 @@
+@@ -884,7 +954,7 @@
  		type httpd_squirrelmail_t;
  	')
  
@@ -10707,7 +10733,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1043,6 +1094,44 @@
+@@ -1043,6 +1113,44 @@
  
  ########################################
  ## <summary>
@@ -10752,7 +10778,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate an apache environment
  ## </summary>
  ## <param name="prefix">
-@@ -1072,11 +1161,17 @@
+@@ -1072,11 +1180,17 @@
  		type httpd_modules_t, httpd_lock_t;
  		type httpd_var_run_t, httpd_php_tmp_t;
  		type httpd_suexec_tmp_t, httpd_tmp_t;
@@ -10770,7 +10796,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_manage_all_content($1)
  	miscfiles_manage_public_files($1)
  
-@@ -1096,12 +1191,57 @@
+@@ -1096,12 +1210,57 @@
  
  	kernel_search_proc($1)
  	allow $1 httpd_t:dir list_dir_perms;
@@ -12003,7 +12029,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.7.4/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/bluetooth.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/bluetooth.te	2009-12-11 14:46:18.000000000 -0500
 @@ -54,9 +54,9 @@
  # Bluetooth services local policy
  #
@@ -12174,6 +12200,315 @@ diff -b -B --ignore-all-space --exclude-
  allow certmaster_t self:tcp_socket create_stream_socket_perms;
  
  # config files
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.fc serefpolicy-3.7.4/policy/modules/services/certmonger.fc
+--- nsaserefpolicy/policy/modules/services/certmonger.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/certmonger.fc	2009-12-11 14:28:45.000000000 -0500
+@@ -0,0 +1,6 @@
++/etc/rc\.d/init\.d/certmonger	--	gen_context(system_u:object_r:certmonger_initrc_exec_t,s0)
++
++/usr/sbin/certmonger	--	gen_context(system_u:object_r:certmonger_exec_t,s0)
++
++/var/run/certmonger.pid		--	gen_context(system_u:object_r:certmonger_var_run_t,s0)
++/var/lib/certmonger(/.*)?			gen_context(system_u:object_r:certmonger_var_lib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.if serefpolicy-3.7.4/policy/modules/services/certmonger.if
+--- nsaserefpolicy/policy/modules/services/certmonger.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/certmonger.if	2009-12-11 14:32:30.000000000 -0500
+@@ -0,0 +1,217 @@
++
++## <summary>Certificate status monitor and PKI enrollment client</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run certmonger.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`certmonger_domtrans',`
++	gen_require(`
++		type certmonger_t, certmonger_exec_t;
++	')
++
++	domtrans_pattern($1, certmonger_exec_t, certmonger_t)
++')
++
++
++########################################
++## <summary>
++##	Execute certmonger server in the certmonger domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`certmonger_initrc_domtrans',`
++	gen_require(`
++		type certmonger_initrc_exec_t;
++	')
++
++	init_labeled_script_domtrans($1, certmonger_initrc_exec_t)
++')
++
++########################################
++## <summary>
++##	Read certmonger PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`certmonger_read_pid_files',`
++	gen_require(`
++		type certmonger_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 certmonger_var_run_t:file read_file_perms;
++')
++
++########################################
++## <summary>
++##	Manage certmonger var_run files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`certmonger_manage_var_run',`
++	gen_require(`
++		type certmonger_var_run_t;
++	')
++
++         manage_dirs_pattern($1, certmonger_var_run_t, certmonger_var_run_t)
++         manage_files_pattern($1, certmonger_var_run_t, certmonger_var_run_t)
++         manage_lnk_files_pattern($1, certmonger_var_run_t, certmonger_var_run_t)
++')
++
++
++########################################
++## <summary>
++##	Search certmonger lib directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`certmonger_search_lib',`
++	gen_require(`
++		type certmonger_var_lib_t;
++	')
++
++	allow $1 certmonger_var_lib_t:dir search_dir_perms;
++	files_search_var_lib($1)
++')
++
++########################################
++## <summary>
++##	Read certmonger lib files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`certmonger_read_lib_files',`
++	gen_require(`
++		type certmonger_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++        read_files_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
++')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	certmonger lib files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`certmonger_manage_lib_files',`
++	gen_require(`
++		type certmonger_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++        manage_files_pattern($1, certmonger_var_lib_t,  certmonger_var_lib_t)
++')
++
++########################################
++## <summary>
++##	Manage certmonger var_lib files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`certmonger_manage_var_lib',`
++	gen_require(`
++		type certmonger_var_lib_t;
++	')
++
++         manage_dirs_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
++         manage_files_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
++         manage_lnk_files_pattern($1, certmonger_var_lib_t, certmonger_var_lib_t)
++')
++
++
++########################################
++## <summary>
++##	Send and receive messages from
++##	certmonger over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`certmonger_dbus_chat',`
++	gen_require(`
++		type certmonger_t;
++		class dbus send_msg;
++	')
++
++	allow $1 certmonger_t:dbus send_msg;
++	allow certmonger_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
++##	All of the rules required to administrate 
++##	an certmonger environment
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	Role allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`certmonger_admin',`
++	gen_require(`
++		type certmonger_t, certmonger_initrc_exec_t;
++	')
++
++	allow $1 certmonger_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, certmonger_t, certmonger_t)
++
++	# Allow certmonger_t to restart the apache service
++	certmonger_initrc_domtrans($1)
++	domain_system_change_exemption($1)
++	role_transition $2 certmonger_initrc_exec_t system_r;
++	allow $2 system_r;
++
++	files_search_var_lib($1)
++	admin_pattern($1, cermonger_var_lib_t)
++
++	files_search_pids($1)
++	admin_pattern($1, cermonger_var_run_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.te serefpolicy-3.7.4/policy/modules/services/certmonger.te
+--- nsaserefpolicy/policy/modules/services/certmonger.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/certmonger.te	2009-12-11 14:28:19.000000000 -0500
+@@ -0,0 +1,74 @@
++policy_module(certmonger,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type certmonger_t;
++type certmonger_exec_t;
++init_daemon_domain(certmonger_t, certmonger_exec_t)
++
++permissive certmonger_t;
++
++type certmonger_initrc_exec_t;
++init_script_file(certmonger_initrc_exec_t)
++
++type certmonger_var_run_t;
++files_pid_file(certmonger_var_run_t)
++
++type certmonger_var_lib_t;
++files_type(certmonger_var_lib_t)
++
++########################################
++#
++# certmonger local policy
++#
++
++allow certmonger_t self:capability { kill sys_nice };
++allow certmonger_t self:process { fork getsched setsched sigkill };
++allow certmonger_t self:fifo_file rw_file_perms;
++allow certmonger_t self:unix_stream_socket create_stream_socket_perms;
++allow certmonger_t self:tcp_socket create_stream_socket_perms;
++allow certmonger_t self:netlink_route_socket r_netlink_socket_perms;
++
++manage_dirs_pattern(certmonger_t, certmonger_var_run_t,  certmonger_var_run_t)
++manage_files_pattern(certmonger_t, certmonger_var_run_t,  certmonger_var_run_t)
++files_pid_filetrans(certmonger_t, certmonger_var_run_t, { file dir })
++
++manage_dirs_pattern(certmonger_t, certmonger_var_lib_t,  certmonger_var_lib_t)
++manage_files_pattern(certmonger_t, certmonger_var_lib_t,  certmonger_var_lib_t)
++files_var_lib_filetrans(certmonger_t, certmonger_var_lib_t, { file dir } )
++
++domain_use_interactive_fds(certmonger_t)
++
++corenet_tcp_sendrecv_generic_if(certmonger_t)
++corenet_tcp_sendrecv_generic_node(certmonger_t)
++corenet_tcp_sendrecv_all_ports(certmonger_t)
++corenet_tcp_connect_certmaster_port(certmonger_t)
++
++dev_read_urand(certmonger_t)
++
++files_read_etc_files(certmonger_t)
++files_read_usr_files(certmonger_t)
++files_list_tmp(certmonger_t)
++
++miscfiles_read_localization(certmonger_t)
++miscfiles_manage_cert_files(certmonger_t)
++
++logging_send_syslog_msg(certmonger_t)
++
++sysnet_dns_name_resolve(certmonger_t)
++
++optional_policy(`
++	dbus_system_bus_client(certmonger_t)
++	dbus_connect_system_bus(certmonger_t)
++')
++
++optional_policy(`
++	kerberos_use(certmonger_t)
++')
++
++optional_policy(`
++	unconfined_dbus_send(certmonger_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.fc serefpolicy-3.7.4/policy/modules/services/chronyd.fc
 --- nsaserefpolicy/policy/modules/services/chronyd.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.7.4/policy/modules/services/chronyd.fc	2009-12-04 12:33:34.000000000 -0500
@@ -24440,7 +24775,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.7.4/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/virt.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/virt.te	2009-12-11 14:52:36.000000000 -0500
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -24486,7 +24821,7 @@ diff -b -B --ignore-all-space --exclude-
  type virt_log_t;
  logging_log_file(virt_log_t)
  
-@@ -48,27 +75,55 @@
+@@ -48,27 +75,56 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -24520,6 +24855,7 @@ diff -b -B --ignore-all-space --exclude-
  allow virtd_t self:tcp_socket create_stream_socket_perms;
 -allow virtd_t self:tun_socket create;
 +allow virtd_t self:tun_socket create_socket_perms;
++allow virtd_t self:netlink_kobject_uevent_socket create_socket_perms;
 +
 +allow virtd_t virt_domain:process { getattr getsched setsched transition signal signull sigkill };
  
@@ -24546,7 +24882,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
-@@ -76,6 +131,7 @@
+@@ -76,6 +132,7 @@
  
  manage_dirs_pattern(virtd_t, virt_var_lib_t, virt_var_lib_t)
  manage_files_pattern(virtd_t, virt_var_lib_t, virt_var_lib_t)
@@ -24554,7 +24890,7 @@ diff -b -B --ignore-all-space --exclude-
  files_var_lib_filetrans(virtd_t, virt_var_lib_t, { file dir })
  
  manage_dirs_pattern(virtd_t, virt_var_run_t, virt_var_run_t)
-@@ -86,7 +142,8 @@
+@@ -86,7 +143,8 @@
  kernel_read_system_state(virtd_t)
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
@@ -24564,7 +24900,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -97,30 +154,50 @@
+@@ -97,40 +155,75 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -24576,10 +24912,11 @@ diff -b -B --ignore-all-space --exclude-
  corenet_rw_tun_tap_dev(virtd_t)
  
 -dev_read_sysfs(virtd_t)
-+dev_rw_sysfs(virtd_t)
++dev_getattr_all_chr_files(virtd_t)
  dev_read_rand(virtd_t)
 +dev_rw_kvm(virtd_t)
-+dev_getattr_all_chr_files(virtd_t)
++dev_rw_mtrr(virtd_t)
++dev_rw_sysfs(virtd_t)
  
  # Init script handling
  domain_use_interactive_fds(virtd_t)
@@ -24618,14 +24955,16 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -128,9 +205,22 @@
- miscfiles_read_localization(virtd_t)
- miscfiles_read_certs(virtd_t)
  
+-miscfiles_read_localization(virtd_t)
+ miscfiles_read_certs(virtd_t)
++miscfiles_read_hwdata(virtd_t)
++miscfiles_read_localization(virtd_t)
++
 +modutils_read_module_deps(virtd_t)
 +modutils_read_module_config(virtd_t)
 +modutils_manage_module_config(virtd_t)
-+
+ 
  logging_send_syslog_msg(virtd_t)
  
 +sysnet_domtrans_ifconfig(virtd_t)
@@ -24641,7 +24980,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +258,36 @@
+@@ -168,22 +261,36 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -24652,6 +24991,10 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	iptables_domtrans(virtd_t)
 +	iptables_initrc_domtrans(virtd_t)
++')
++
++optional_policy(`
++	kerberos_keytab_template(virtd, virtd_t)
  ')
  
 -#optional_policy(`
@@ -24659,11 +25002,6 @@ diff -b -B --ignore-all-space --exclude-
 -#	polkit_domtrans_resolve(virtd_t)
 -#')
 +optional_policy(`
-+	kerberos_keytab_template(virtd, virtd_t)
-+')
- 
- optional_policy(`
--	qemu_domtrans(virtd_t)
 +	lvm_domtrans(virtd_t)
 +')
 +
@@ -24673,8 +25011,9 @@ diff -b -B --ignore-all-space --exclude-
 +	policykit_domtrans_resolve(virtd_t)
 +	policykit_read_lib(virtd_t)
 +')
-+
-+optional_policy(`
+ 
+ optional_policy(`
+-	qemu_domtrans(virtd_t)
 +	qemu_spec_domtrans(virtd_t, svirt_t)
  	qemu_read_state(virtd_t)
  	qemu_signal(virtd_t)
@@ -24683,7 +25022,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +300,152 @@
+@@ -196,8 +303,152 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -p -r1.940 -r1.941
--- selinux-policy.spec	10 Dec 2009 18:56:22 -0000	1.940
+++ selinux-policy.spec	11 Dec 2009 20:18:55 -0000	1.941
@@ -13,14 +13,14 @@
 %if %{?BUILD_MLS:0}%{!?BUILD_MLS:1}
 %define BUILD_MLS 1
 %endif
-%define POLICYVER 23
-%define libsepolver 2.0.20-1
-%define POLICYCOREUTILSVER 2.0.71-2
-%define CHECKPOLICYVER 2.0.16-3
+%define POLICYVER 24
+%define libsepolver 2.0.41-1
+%define POLICYCOREUTILSVER 2.0.78-3
+%define CHECKPOLICYVER 2.0.21-1
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.7.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -181,7 +181,7 @@ FILE_CONTEXT=%{_sysconfdir}/selinux/%1/c
 selinuxenabled; \
 if [ $? = 0  -a "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
-	restorecon -R /var/log /var/run 2> /dev/null; \
+        restorecon -R /root /var/log /var/run /var/lib 2> /dev/null;\
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 
 
@@ -317,7 +317,7 @@ SELinux Reference policy targeted base m
 if [ $1 -eq 1 ]; then
    packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
-   restorecon -R /root /var/log /var/run 2> /dev/null
+   restorecon -R /root /var/log /var/run /var/lib 2> /dev/null
 else
    semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit_auth -r polkit -r rtkit_daemon -r ModemManager 2>/dev/null
    packages="%{expand:%%moduleList targeted}"
@@ -373,7 +373,7 @@ semanage -S minimum -i - << __eof
 login -m  -s unconfined_u -r s0-s0:c0.c1023 __default__
 login -m  -s unconfined_u -r s0-s0:c0.c1023 root
 __eof
-restorecon -R /root /var/log /var/run 2> /dev/null
+restorecon -R /root /var/log /var/run /var/lib 2> /dev/null
 else
 %relabel minimum
 fi
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Dec 11 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-2
+- Add tgtd policy
+
 * Fri Dec 4 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-1
 - Update to upstream release
 



From heffer at fedoraproject.org  Fri Dec 11 20:19:47 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 11 Dec 2009 20:19:47 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-12 .cvsignore, 1.4, 1.5 opengfx.obg, 1.1,
	1.2 openttd-opengfx.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091211201947.9248B11C00C5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd-opengfx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1242

Modified Files:
	.cvsignore opengfx.obg openttd-opengfx.spec sources 
Log Message:
* Fri Dec 11 2009 Felix Kaechele <felix at fetzig.org> - 0.2.0-1
- update to 0.2.0
- cleaned up docs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Oct 2009 10:07:32 -0000	1.4
+++ .cvsignore	11 Dec 2009 20:19:47 -0000	1.5
@@ -1 +1 @@
-opengfx-0.1.1-source.tar.gz
+opengfx-0.2.0-source.tar.gz


Index: opengfx.obg
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-12/opengfx.obg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- opengfx.obg	10 Oct 2009 13:29:24 -0000	1.1
+++ opengfx.obg	11 Dec 2009 20:19:47 -0000	1.2
@@ -1,10 +1,15 @@
 [metadata]
 name        = OpenGFX
 shortname   = OGFX
-version     = 202
-description = OpenGFX base graphics replacement set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX 0.1.1]
+version     = 274
 palette     = Windows
-
+description       = OpenGFX base graphics set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.en_GB = OpenGFX base graphics set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.de_DE = OpenGFX Basisgrafiken f?r OpenTTD. Frei verf?gbar unter der GNU General Public License in der Version 2. Weitere Informationen sind in der Datei readme.txt oder unter http://wiki.openttd.org/OpenGFX_Readme verf?gbar. [OpenGFX nightly-r274]
+description.sv_SE = OpenGFX basgrafikpaket f?r OpenTTD. Fritt tillg?ngligt enligt villkoren f?r GNU General Public License version 2 licensen. Mer information ?r tillg?nglig i readme-dokumentet p? http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.zh_TW = ?OpenTTD???OpenGFX???????????GNU General Public License version 2??????????????http://wiki.openttd.org/OpenGFX_Readme?????? [OpenGFX nightly-r274]
+description.nl_NL = OpenGFX basisgraphicsset voor OpenTTD. Vrij verkrijgbaar onder de voorwaarden van de GNU General Public License versie 2. Meer informatie is beschikbaar in de documentatie op http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.hu_HU = OpenGFX grafikus alapcsomag az OpenTTD-hez. Ingyenesen hozz?f?het? a GNU General Public License (?ltal?nos Nyilv?nos Licenc) 2. vezi?j?ban foglalt felt?telekkel. Tov?bbi inform?ci? el?rhet? a http://wiki.openttd.org/OpenGFX_Readme webhelyen. [OpenGFX nightly-r274]
 [files]
 base     = ogfx1_base.grf
 arctic   = ogfxc_arctic.grf
@@ -14,12 +19,12 @@ toyland  = ogfxt_toyland.grf
 extra    = ogfxe_extra.grf
 
 [md5s]
-ogfx1_base.grf     = fe381d9c24c816e60b06031f52085d05
+ogfx1_base.grf     = 10918be9dca236415e95f4f492cc3f53
 ogfxc_arctic.grf   = 8c8007eaeae8c0cbfdbd3e012ad7927e
 ogfxh_tropical.grf = b53a1f61623540a64b81da3e9f87b007
-ogfxi_logos.grf    = d5e448a6c2cea2ae625bf8439d6d2484
-ogfxt_toyland.grf  = d18531d9173ee73c623b6dc14aff90e8
-ogfxe_extra.grf    = 45f29ac95624d69be774e3ae7719a6ab
+ogfxi_logos.grf    = c25d95e446bd38b1574889be4e46c0c7
+ogfxt_toyland.grf  = b7c413a20c3115174172c49948590182
+ogfxe_extra.grf    = df538a10536cb1b79c41f521a9040e6a
 
 [origin]
 default = Please redownload from official source.


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-12/openttd-opengfx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openttd-opengfx.spec	10 Oct 2009 13:29:25 -0000	1.5
+++ openttd-opengfx.spec	11 Dec 2009 20:19:47 -0000	1.6
@@ -2,8 +2,8 @@
 #define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0.1.1
-Release:        2%{?prever:.%{prever}}%{?dist}
+Version:        0.2.0
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
@@ -15,7 +15,7 @@ Source1:        opengfx.obg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec nforenum dos2unix
+BuildRequires:  grfcodec nforenum
 Requires:       openttd
 
 
@@ -27,9 +27,6 @@ graphics from the original game.
 
 %prep
 %setup -q -n %{realname}-%{version}%{?prever:-%{prever}}-source 
-dos2unix docs/authoroverview.csv docs/changelog.ptxt docs/license.ptxt \
-    docs/readme.ptxt docs/aoHTMLoutput/config.inc.php \
-    docs/aoHTMLoutput/script.php docs/aoHTMLoutput/style.css
 
 
 %build
@@ -48,7 +45,7 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 
 %check
-cd opengfx-nightly
+cd opengfx-%{version}
 # Split md5sums out of .obg file and check it
 sed -e 's/^\(.*\.grf\)[[:blank:]]*=[[:blank:]]*\([0-9a-f]\{32\}\)/\2  \1/' \
     -e 't end' -e 'D' -e ':end' %{SOURCE1} | md5sum -c
@@ -60,12 +57,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc docs/*.txt
-%doc docs/aoHTMLoutput/
+%doc docs/
 %{_datadir}/openttd/data/*
 
 
 %changelog
+* Fri Dec 11 2009 Felix Kaechele <felix at fetzig.org> - 0.2.0-1
+- update to 0.2.0
+- cleaned up docs
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
 - Correct generation of grfs, using nforenum
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Oct 2009 10:07:33 -0000	1.4
+++ sources	11 Dec 2009 20:19:47 -0000	1.5
@@ -1 +1 @@
-716f4a7e27090ef2c0c89bdc48462f42  opengfx-0.1.1-source.tar.gz
+468b4c4d8252b1ab0a45da84d48d3044  opengfx-0.2.0-source.tar.gz



From sgrubb at fedoraproject.org  Fri Dec 11 20:20:45 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 11 Dec 2009 20:20:45 +0000 (UTC)
Subject: rpms/aide/devel aide.spec,1.36,1.37
Message-ID: <20091211202045.ADDEE11C03E3@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/aide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1663

Modified Files:
	aide.spec 
Log Message:
* Fri Dec 11 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-15
- Get rid of .dedosify files



Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- aide.spec	9 Dec 2009 18:10:04 -0000	1.36
+++ aide.spec	11 Dec 2009 20:20:45 -0000	1.37
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.13.1
-Release: 14%{?dist}
+Release: 15%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
@@ -43,7 +43,7 @@ checker and intrusion detection program.
 %prep
 %setup -q
 %patch1 -p1 -b .contextsize
-%patch2 -p1 -b .dedosify
+%patch2 -p1
 %patch3 -p1 -b .manpages
 %patch4 -p1 -b .prelink
 %patch5 -p1 -b .libgcrypt
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 11 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-15
+- Get rid of .dedosify files
+
 * Wed Dec 09 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-14
 - Revise patch for Initialize libgcrypt correctly (#530485)
 



From heffer at fedoraproject.org  Fri Dec 11 20:21:27 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 11 Dec 2009 20:21:27 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-11 .cvsignore, 1.4, 1.5 opengfx.obg, 1.1,
	1.2 openttd-opengfx.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091211202127.BA65B11C00C5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd-opengfx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2018

Modified Files:
	.cvsignore opengfx.obg openttd-opengfx.spec sources 
Log Message:
* Fri Dec 11 2009 Felix Kaechele <felix at fetzig.org> - 0.2.0-1
- update to 0.2.0
- cleaned up docs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Oct 2009 10:12:41 -0000	1.4
+++ .cvsignore	11 Dec 2009 20:21:27 -0000	1.5
@@ -1 +1 @@
-opengfx-0.1.1-source.tar.gz
+opengfx-0.2.0-source.tar.gz


Index: opengfx.obg
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/opengfx.obg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- opengfx.obg	10 Oct 2009 13:30:58 -0000	1.1
+++ opengfx.obg	11 Dec 2009 20:21:27 -0000	1.2
@@ -1,10 +1,15 @@
 [metadata]
 name        = OpenGFX
 shortname   = OGFX
-version     = 202
-description = OpenGFX base graphics replacement set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX 0.1.1]
+version     = 274
 palette     = Windows
-
+description       = OpenGFX base graphics set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.en_GB = OpenGFX base graphics set for OpenTTD. Freely available under the terms of the GNU General Public License version 2. More information available in the readme at http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.de_DE = OpenGFX Basisgrafiken f?r OpenTTD. Frei verf?gbar unter der GNU General Public License in der Version 2. Weitere Informationen sind in der Datei readme.txt oder unter http://wiki.openttd.org/OpenGFX_Readme verf?gbar. [OpenGFX nightly-r274]
+description.sv_SE = OpenGFX basgrafikpaket f?r OpenTTD. Fritt tillg?ngligt enligt villkoren f?r GNU General Public License version 2 licensen. Mer information ?r tillg?nglig i readme-dokumentet p? http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.zh_TW = ?OpenTTD???OpenGFX???????????GNU General Public License version 2??????????????http://wiki.openttd.org/OpenGFX_Readme?????? [OpenGFX nightly-r274]
+description.nl_NL = OpenGFX basisgraphicsset voor OpenTTD. Vrij verkrijgbaar onder de voorwaarden van de GNU General Public License versie 2. Meer informatie is beschikbaar in de documentatie op http://wiki.openttd.org/OpenGFX_Readme. [OpenGFX nightly-r274]
+description.hu_HU = OpenGFX grafikus alapcsomag az OpenTTD-hez. Ingyenesen hozz?f?het? a GNU General Public License (?ltal?nos Nyilv?nos Licenc) 2. vezi?j?ban foglalt felt?telekkel. Tov?bbi inform?ci? el?rhet? a http://wiki.openttd.org/OpenGFX_Readme webhelyen. [OpenGFX nightly-r274]
 [files]
 base     = ogfx1_base.grf
 arctic   = ogfxc_arctic.grf
@@ -14,12 +19,12 @@ toyland  = ogfxt_toyland.grf
 extra    = ogfxe_extra.grf
 
 [md5s]
-ogfx1_base.grf     = fe381d9c24c816e60b06031f52085d05
+ogfx1_base.grf     = 10918be9dca236415e95f4f492cc3f53
 ogfxc_arctic.grf   = 8c8007eaeae8c0cbfdbd3e012ad7927e
 ogfxh_tropical.grf = b53a1f61623540a64b81da3e9f87b007
-ogfxi_logos.grf    = d5e448a6c2cea2ae625bf8439d6d2484
-ogfxt_toyland.grf  = d18531d9173ee73c623b6dc14aff90e8
-ogfxe_extra.grf    = 45f29ac95624d69be774e3ae7719a6ab
+ogfxi_logos.grf    = c25d95e446bd38b1574889be4e46c0c7
+ogfxt_toyland.grf  = b7c413a20c3115174172c49948590182
+ogfxe_extra.grf    = df538a10536cb1b79c41f521a9040e6a
 
 [origin]
 default = Please redownload from official source.


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/openttd-opengfx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openttd-opengfx.spec	10 Oct 2009 13:30:58 -0000	1.4
+++ openttd-opengfx.spec	11 Dec 2009 20:21:27 -0000	1.5
@@ -2,8 +2,8 @@
 #define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0.1.1
-Release:        2%{?prever:.%{prever}}%{?dist}
+Version:        0.2.0
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
@@ -15,7 +15,7 @@ Source1:        opengfx.obg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec nforenum dos2unix
+BuildRequires:  grfcodec nforenum
 Requires:       openttd
 
 
@@ -27,9 +27,6 @@ graphics from the original game.
 
 %prep
 %setup -q -n %{realname}-%{version}%{?prever:-%{prever}}-source 
-dos2unix docs/authoroverview.csv docs/changelog.ptxt docs/license.ptxt \
-    docs/readme.ptxt docs/aoHTMLoutput/config.inc.php \
-    docs/aoHTMLoutput/script.php docs/aoHTMLoutput/style.css
 
 
 %build
@@ -48,7 +45,7 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 
 %check
-cd opengfx-nightly
+cd opengfx-%{version}
 # Split md5sums out of .obg file and check it
 sed -e 's/^\(.*\.grf\)[[:blank:]]*=[[:blank:]]*\([0-9a-f]\{32\}\)/\2  \1/' \
     -e 't end' -e 'D' -e ':end' %{SOURCE1} | md5sum -c
@@ -60,12 +57,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc docs/*.txt
-%doc docs/aoHTMLoutput/
+%doc docs/
 %{_datadir}/openttd/data/*
 
 
 %changelog
+* Fri Dec 11 2009 Felix Kaechele <felix at fetzig.org> - 0.2.0-1
+- update to 0.2.0
+- cleaned up docs
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
 - Correct generation of grfs, using nforenum
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Oct 2009 10:12:41 -0000	1.4
+++ sources	11 Dec 2009 20:21:27 -0000	1.5
@@ -1 +1 @@
-716f4a7e27090ef2c0c89bdc48462f42  opengfx-0.1.1-source.tar.gz
+468b4c4d8252b1ab0a45da84d48d3044  opengfx-0.2.0-source.tar.gz



From pkgdb at fedoraproject.org  Fri Dec 11 20:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:24:38 +0000
Subject: [pkgdb] kernel: konradr has requested commit
Message-ID: <20091211202438.A863810F878@bastion2.fedora.phx.redhat.com>

konradr has requested the commit acl on kernel (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From jakub at fedoraproject.org  Fri Dec 11 20:25:31 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 11 Dec 2009 20:25:31 +0000 (UTC)
Subject: File gcc-4.4.2-20091211.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091211202531.B195710F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for gcc:

10e73e2a3e3d5d5d9ca01395b2af5621  gcc-4.4.2-20091211.tar.bz2



From wcohen at fedoraproject.org  Fri Dec 11 20:31:44 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Fri, 11 Dec 2009 20:31:44 +0000 (UTC)
Subject: rpms/oprofile/F-12 oprofile.spec, 1.84, 1.85 .cvsignore, 1.15,
	1.16 sources, 1.16, 1.17
Message-ID: <20091211203144.7648011C00C5@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5968

Modified Files:
	oprofile.spec .cvsignore sources 
Log Message:
* Fri Dec 11 2009 Will Cohen <wcohen at redhat.com> - 0.9.6-2
- Clean up oprofile.spec file.

* Tue Nov 24 2009 Will Cohen <wcohen at redhat.com> - 0.9.6-1
- Rebase on OProfile 0.9.6.




Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-12/oprofile.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- oprofile.spec	21 Oct 2009 17:30:54 -0000	1.84
+++ oprofile.spec	11 Dec 2009 20:31:44 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
-Version: 0.9.5
-Release: 4%{?dist}
+Version: 0.9.6
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -13,7 +13,7 @@ Patch10: oprofile-0.4-guess2.patch
 Patch63: oprofile-0.7-libs.patch
 Patch83: oprofile-0.9.3-xen.patch
 #Patch104: oprofile-jvmpi-lgpl.patch
-Patch105: oprofile-0.9.5-timer.patch
+#Patch105: oprofile-0.9.5-timer.patch
 
 URL: http://oprofile.sf.net
 
@@ -79,11 +79,7 @@ agent library.
 %prep
 %setup -q -n %{name}-%{version}
 %patch10 -p1 -b .guess2
-#%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
-#%patch83 -p1 -b .xen
-#%patch104 -p1 -b .lgpl
-%patch105 -p1 -b .timer
 
 ./autogen.sh
 
@@ -231,6 +227,12 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Fri Dec 11 2009 Will Cohen <wcohen at redhat.com> - 0.9.6-2
+- Clean up oprofile.spec file.
+
+* Tue Nov 24 2009 Will Cohen <wcohen at redhat.com> - 0.9.6-1
+- Rebase on OProfile 0.9.6.
+
 * Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
 - Switch to using ExcludeArch.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	4 Aug 2009 18:21:44 -0000	1.15
+++ .cvsignore	11 Dec 2009 20:31:44 -0000	1.16
@@ -1 +1 @@
-oprofile-0.9.5.tar.gz
+oprofile-0.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	4 Aug 2009 18:21:44 -0000	1.16
+++ sources	11 Dec 2009 20:31:44 -0000	1.17
@@ -1 +1 @@
-4b2ceca3fa013c95cc8d47c790807dc2  oprofile-0.9.5.tar.gz
+4e407093ac06200185d5a5e6437d7242  oprofile-0.9.6.tar.gz



From heffer at fedoraproject.org  Fri Dec 11 20:32:57 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 11 Dec 2009 20:32:57 +0000 (UTC)
Subject: rpms/php-ZendFramework/devel php-ZendFramework.spec,1.21,1.22
Message-ID: <20091211203257.034B211C00C5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/php-ZendFramework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6752

Modified Files:
	php-ZendFramework.spec 
Log Message:
* Tue Dec 08 2009 Felix Kaechele <felix at fetzig.org> - 1.9.6-2
- insert correct provides/obsoletes for tests subpackage removal



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- php-ZendFramework.spec	30 Nov 2009 08:40:28 -0000	1.21
+++ php-ZendFramework.spec	11 Dec 2009 20:32:56 -0000	1.22
@@ -4,7 +4,7 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.9.6
-Release:         1%{?posttag}%{?dist}
+Release:         2%{?posttag}%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -35,6 +35,10 @@ Requires: php-xml
 # missing for Http_Client
 # Requires: php-mime_magic
 
+# Needed after the removal of the tests subpackage
+Provides:  %{name}-tests = %{version}-%{release}
+Obsoletes: %{name}-tests < 1.9.6-2
+
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
 object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -605,6 +609,9 @@ cd ..
 
 
 %changelog
+* Tue Dec 08 2009 Felix Kaechele <felix at fetzig.org> - 1.9.6-2
+- insert correct provides/obsoletes for tests subpackage removal
+
 * Mon Nov 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.6-1
 - update to 1.9.6
 



From heffer at fedoraproject.org  Fri Dec 11 20:36:53 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 11 Dec 2009 20:36:53 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-12 php-ZendFramework.spec,1.21,1.22
Message-ID: <20091211203653.BC54F11C00C5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/php-ZendFramework/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8320

Modified Files:
	php-ZendFramework.spec 
Log Message:
* Tue Dec 08 2009 Felix Kaechele <felix at fetzig.org> - 1.9.6-2
- insert correct provides/obsoletes for tests subpackage removal



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-12/php-ZendFramework.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- php-ZendFramework.spec	30 Nov 2009 08:54:15 -0000	1.21
+++ php-ZendFramework.spec	11 Dec 2009 20:36:53 -0000	1.22
@@ -4,7 +4,7 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.9.6
-Release:         1%{?posttag}%{?dist}
+Release:         2%{?posttag}%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -35,6 +35,10 @@ Requires: php-xml
 # missing for Http_Client
 # Requires: php-mime_magic
 
+# Needed after the removal of the tests subpackage
+Provides:  %{name}-tests = %{version}-%{release}
+Obsoletes: %{name}-tests < 1.9.6-2
+
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
 object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -605,6 +609,9 @@ cd ..
 
 
 %changelog
+* Tue Dec 08 2009 Felix Kaechele <felix at fetzig.org> - 1.9.6-2
+- insert correct provides/obsoletes for tests subpackage removal
+
 * Mon Nov 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.6-1
 - update to 1.9.6
 



From heffer at fedoraproject.org  Fri Dec 11 20:39:48 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 11 Dec 2009 20:39:48 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-11 php-ZendFramework.spec,1.20,1.21
Message-ID: <20091211203949.013B311C00C5@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/php-ZendFramework/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9636

Modified Files:
	php-ZendFramework.spec 
Log Message:
* Tue Dec 08 2009 Felix Kaechele <felix at fetzig.org> - 1.9.6-2
- insert correct provides/obsoletes for tests subpackage removal



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-11/php-ZendFramework.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- php-ZendFramework.spec	30 Nov 2009 08:58:30 -0000	1.20
+++ php-ZendFramework.spec	11 Dec 2009 20:39:48 -0000	1.21
@@ -4,7 +4,7 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.9.6
-Release:         1%{?posttag}%{?dist}
+Release:         2%{?posttag}%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -35,6 +35,10 @@ Requires: php-xml
 # missing for Http_Client
 # Requires: php-mime_magic
 
+# Needed after the removal of the tests subpackage
+Provides:  %{name}-tests = %{version}-%{release}
+Obsoletes: %{name}-tests < 1.9.6-2
+
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
 object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -605,6 +609,9 @@ cd ..
 
 
 %changelog
+* Tue Dec 08 2009 Felix Kaechele <felix at fetzig.org> - 1.9.6-2
+- insert correct provides/obsoletes for tests subpackage removal
+
 * Mon Nov 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.6-1
 - update to 1.9.6
 



From jakub at fedoraproject.org  Fri Dec 11 20:43:03 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 11 Dec 2009 20:43:03 +0000 (UTC)
Subject: rpms/gcc/F-12 .cvsignore, 1.314, 1.315 gcc.spec, 1.97, 1.98 sources,
	1.321, 1.322 gcc44-c++-comdat-vdtors.patch, 1.1, NONE
Message-ID: <20091211204303.7B5BA11C00C5@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10935

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-c++-comdat-vdtors.patch 
Log Message:
4.4.2-16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- .cvsignore	9 Dec 2009 13:02:17 -0000	1.314
+++ .cvsignore	11 Dec 2009 20:43:03 -0000	1.315
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091209.tar.bz2
+gcc-4.4.2-20091211.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- gcc.spec	9 Dec 2009 13:02:17 -0000	1.97
+++ gcc.spec	11 Dec 2009 20:43:03 -0000	1.98
@@ -1,9 +1,9 @@
-%global DATE 20091209
-%global SVNREV 155104
+%global DATE 20091211
+%global SVNREV 155176
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 15
+%global gcc_release 16
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,7 +161,6 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
-Patch20: gcc44-c++-comdat-vdtors.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -467,7 +466,6 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
-%patch20 -p0 -b .c++-comdat-vdtors~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1853,6 +1851,12 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Dec 11 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-16
+- update from gcc-4_4-branch
+  - PRs c++/27425, c++/34274, c++/42301, fortran/42268, java/41991,
+	libstdc++/42273, rtl-optimization/41574, target/41196, target/41939
+	target/42263
+
 * Wed Dec  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-15
 - VTA backports
   - PRs debug/42166, debug/42234, debug/42244, debug/42299


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- sources	9 Dec 2009 13:02:17 -0000	1.321
+++ sources	11 Dec 2009 20:43:03 -0000	1.322
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-8a1470b14967beec07c26aba5f286b0d  gcc-4.4.2-20091209.tar.bz2
+10e73e2a3e3d5d5d9ca01395b2af5621  gcc-4.4.2-20091211.tar.bz2


--- gcc44-c++-comdat-vdtors.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Dec 11 20:44:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:44:11 +0000
Subject: [pkgdb] revelation: smooge has given up watchbugzilla
Message-ID: <20091211204411.2DDC210F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchbugzilla acl on revelation (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:44:15 +0000
Subject: [pkgdb] revelation: smooge has given up watchcommits
Message-ID: <20091211204415.6039B10F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchcommits acl on revelation (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:44:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:44:18 +0000
Subject: [pkgdb] revelation: smooge has requested commit
Message-ID: <20091211204418.E31F710F890@bastion2.fedora.phx.redhat.com>

smooge has requested the commit acl on revelation (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:44:24 +0000
Subject: [pkgdb] revelation: smooge has requested approveacls
Message-ID: <20091211204424.55D2110F890@bastion2.fedora.phx.redhat.com>

smooge has requested the approveacls acl on revelation (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:44:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:44:52 +0000
Subject: [pkgdb] revelation: smooge has given up watchbugzilla
Message-ID: <20091211204452.CD2DB10F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchbugzilla acl on revelation (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:44:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:44:54 +0000
Subject: [pkgdb] revelation: smooge has requested commit
Message-ID: <20091211204454.4C26E10F890@bastion2.fedora.phx.redhat.com>

smooge has requested the commit acl on revelation (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:44:59 +0000
Subject: [pkgdb] revelation: smooge has given up watchcommits
Message-ID: <20091211204459.97D2410F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchcommits acl on revelation (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:45:04 +0000
Subject: [pkgdb] revelation: smooge has requested approveacls
Message-ID: <20091211204504.443A310F890@bastion2.fedora.phx.redhat.com>

smooge has requested the approveacls acl on revelation (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:45:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:45:11 +0000
Subject: [pkgdb] revelation: smooge has given up watchbugzilla
Message-ID: <20091211204511.E4E1D10F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchbugzilla acl on revelation (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:45:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:45:14 +0000
Subject: [pkgdb] revelation: smooge has requested commit
Message-ID: <20091211204514.32A7910F890@bastion2.fedora.phx.redhat.com>

smooge has requested the commit acl on revelation (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:45:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:45:17 +0000
Subject: [pkgdb] revelation: smooge has given up watchcommits
Message-ID: <20091211204517.46C4B10F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchcommits acl on revelation (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:45:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:45:21 +0000
Subject: [pkgdb] revelation: smooge has requested approveacls
Message-ID: <20091211204521.7EDA610F890@bastion2.fedora.phx.redhat.com>

smooge has requested the approveacls acl on revelation (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:00 +0000
Subject: [pkgdb] istanbul: smooge has given up watchcommits
Message-ID: <20091211204600.6175710F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchcommits acl on istanbul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:00 +0000
Subject: [pkgdb] istanbul: smooge has requested commit
Message-ID: <20091211204601.17BAC10F891@bastion2.fedora.phx.redhat.com>

smooge has requested the commit acl on istanbul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:06 +0000
Subject: [pkgdb] istanbul: smooge has given up watchbugzilla
Message-ID: <20091211204606.6A7AE10F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchbugzilla acl on istanbul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:10 +0000
Subject: [pkgdb] istanbul: smooge has requested approveacls
Message-ID: <20091211204610.8DA4D10F890@bastion2.fedora.phx.redhat.com>

smooge has requested the approveacls acl on istanbul (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:26 +0000
Subject: [pkgdb] istanbul: smooge has given up watchcommits
Message-ID: <20091211204626.D949B10F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchcommits acl on istanbul (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:34 +0000
Subject: [pkgdb] istanbul: smooge has given up watchbugzilla
Message-ID: <20091211204634.7FAE010F891@bastion2.fedora.phx.redhat.com>

smooge has given up the watchbugzilla acl on istanbul (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:36 +0000
Subject: [pkgdb] istanbul: smooge has requested commit
Message-ID: <20091211204636.D599810F890@bastion2.fedora.phx.redhat.com>

smooge has requested the commit acl on istanbul (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:39 +0000
Subject: [pkgdb] istanbul: smooge has requested approveacls
Message-ID: <20091211204640.12AED10F890@bastion2.fedora.phx.redhat.com>

smooge has requested the approveacls acl on istanbul (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:47 +0000
Subject: [pkgdb] istanbul: smooge has given up watchbugzilla
Message-ID: <20091211204647.68B7810F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchbugzilla acl on istanbul (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:50 +0000
Subject: [pkgdb] istanbul: smooge has given up watchcommits
Message-ID: <20091211204650.37E0B10F890@bastion2.fedora.phx.redhat.com>

smooge has given up the watchcommits acl on istanbul (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:52 +0000
Subject: [pkgdb] istanbul: smooge has requested commit
Message-ID: <20091211204652.C943110F890@bastion2.fedora.phx.redhat.com>

smooge has requested the commit acl on istanbul (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Fri Dec 11 20:46:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:46:56 +0000
Subject: [pkgdb] istanbul: smooge has requested approveacls
Message-ID: <20091211204656.CBAFE10F890@bastion2.fedora.phx.redhat.com>

smooge has requested the approveacls acl on istanbul (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From heffer at fedoraproject.org  Fri Dec 11 20:51:14 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 11 Dec 2009 20:51:14 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-10 php-ZendFramework.spec,1.16,1.17
Message-ID: <20091211205114.E23B511C02CA@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/php-ZendFramework/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14069

Modified Files:
	php-ZendFramework.spec 
Log Message:
* Tue Dec 08 2009 Felix Kaechele <felix at fetzig.org> - 1.9.6-3
- insert correct provides/obsoletes for tests subpackage removal



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-10/php-ZendFramework.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- php-ZendFramework.spec	30 Nov 2009 09:28:55 -0000	1.16
+++ php-ZendFramework.spec	11 Dec 2009 20:51:14 -0000	1.17
@@ -4,7 +4,7 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.9.6
-Release:         2%{?posttag}%{?dist}
+Release:         3%{?posttag}%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -35,6 +35,10 @@ Requires: php-xml
 # missing for Http_Client
 # Requires: php-mime_magic
 
+# Needed after the removal of the tests subpackage
+Provides:  %{name}-tests = %{version}-%{release}
+Obsoletes: %{name}-tests < 1.9.6-2
+
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
 object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -606,6 +610,9 @@ cd ..
 
 
 %changelog
+* Tue Dec 08 2009 Felix Kaechele <felix at fetzig.org> - 1.9.6-3
+- insert correct provides/obsoletes for tests subpackage removal
+
 * Mon Nov 30 2009 Felix Kaechele <heffer at fedoraproject.org> - 1.9.6-2
 - fix interbase missing deps
 



From pkgdb at fedoraproject.org  Fri Dec 11 20:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:54:12 +0000
Subject: [pkgdb] pixman: krh has given up watchcommits
Message-ID: <20091211205412.A824F10F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on pixman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From pkgdb at fedoraproject.org  Fri Dec 11 20:54:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:54:16 +0000
Subject: [pkgdb] pixman: krh has given up watchcommits
Message-ID: <20091211205416.C01D110F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on pixman (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From pkgdb at fedoraproject.org  Fri Dec 11 20:54:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:54:16 +0000
Subject: [pkgdb] pixman: krh has given up commit
Message-ID: <20091211205417.2CA5410F89D@bastion2.fedora.phx.redhat.com>

krh has given up the commit acl on pixman (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From pkgdb at fedoraproject.org  Fri Dec 11 20:54:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:54:23 +0000
Subject: [pkgdb] pixman: krh has given up watchcommits
Message-ID: <20091211205424.1DC6E10F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on pixman (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From pkgdb at fedoraproject.org  Fri Dec 11 20:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:54:27 +0000
Subject: [pkgdb] pixman: krh has given up watchcommits
Message-ID: <20091211205427.815E910F89C@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on pixman (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From pkgdb at fedoraproject.org  Fri Dec 11 20:54:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:54:30 +0000
Subject: [pkgdb] pixman: krh has given up watchcommits
Message-ID: <20091211205430.432E310F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on pixman (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From pkgdb at fedoraproject.org  Fri Dec 11 20:54:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 20:54:32 +0000
Subject: [pkgdb] pixman: krh has given up watchcommits
Message-ID: <20091211205432.D621410F890@bastion2.fedora.phx.redhat.com>

krh has given up the watchcommits acl on pixman (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From maxamillion at fedoraproject.org  Fri Dec 11 21:07:17 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 11 Dec 2009 21:07:17 +0000 (UTC)
Subject: File webkit-1.1.15.4.tar.gz uploaded to lookaside cache by
	maxamillion
Message-ID: <20091211210717.F1AE210F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for webkitgtk:

47301fb7120421ac38bf714db8f5d428  webkit-1.1.15.4.tar.gz



From maxamillion at fedoraproject.org  Fri Dec 11 21:07:55 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 11 Dec 2009 21:07:55 +0000 (UTC)
Subject: rpms/webkitgtk/F-12 import.log, NONE, 1.1 .cvsignore, 1.13,
	1.14 sources, 1.13, 1.14 webkitgtk.spec, 1.26,
	1.27 webkit-1.1.12-atomic-word.patch, 1.1,
	NONE webkit-1.1.12-no-execmem.patch, 1.1,
	NONE webkit-1.1.13-no-execmem.patch, 1.1,
	NONE webkit-1.1.14-atomic-word.patch, 1.1, NONE
Message-ID: <20091211210755.F22D011C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/webkitgtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20385/F-12

Modified Files:
	.cvsignore sources webkitgtk.spec 
Added Files:
	import.log 
Removed Files:
	webkit-1.1.12-atomic-word.patch webkit-1.1.12-no-execmem.patch 
	webkit-1.1.13-no-execmem.patch webkit-1.1.14-atomic-word.patch 
Log Message:
Update to 1.1.15-4




--- NEW FILE import.log ---
webkitgtk-1_1_15_4-1_fc12:F-12:webkitgtk-1.1.15.4-1.fc12.src.rpm:1260565641


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/webkitgtk/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	31 Oct 2009 22:38:39 -0000	1.13
+++ .cvsignore	11 Dec 2009 21:07:55 -0000	1.14
@@ -1 +1 @@
-webkit-1.1.15.3.tar.gz
+webkit-1.1.15.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/webkitgtk/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	31 Oct 2009 22:38:39 -0000	1.13
+++ sources	11 Dec 2009 21:07:55 -0000	1.14
@@ -1 +1 @@
-18736af3c751eb078fa3f4a7393cc864  webkit-1.1.15.3.tar.gz
+47301fb7120421ac38bf714db8f5d428  webkit-1.1.15.4.tar.gz


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/webkitgtk/F-12/webkitgtk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- webkitgtk.spec	31 Oct 2009 22:38:39 -0000	1.26
+++ webkitgtk.spec	11 Dec 2009 21:07:55 -0000	1.27
@@ -34,7 +34,7 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.15.3
+Version:	1.1.15.4
 Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
@@ -197,6 +197,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 11 2009 Adam Miller <maxamillion at fedoraproject.org> - 1.1.15.4-1
+- Update to 1.1.15.4
+ 
 * Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.3-1
 - Update to 1.1.15.3, more crash fixes and important media player fixes
 - See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000047.html


--- webkit-1.1.12-atomic-word.patch DELETED ---


--- webkit-1.1.12-no-execmem.patch DELETED ---


--- webkit-1.1.13-no-execmem.patch DELETED ---


--- webkit-1.1.14-atomic-word.patch DELETED ---



From cwickert at fedoraproject.org  Fri Dec 11 21:54:25 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 11 Dec 2009 21:54:25 +0000 (UTC)
Subject: rpms/lxsession/devel .cvsignore, 1.2, 1.3 lxsession.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091211215425.A7EC911C00C5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4739

Modified Files:
	.cvsignore lxsession.spec sources 
Log Message:
* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 May 2009 23:25:26 -0000	1.2
+++ .cvsignore	11 Dec 2009 21:54:25 -0000	1.3
@@ -1 +1 @@
-lxsession-0.3.8.tar.gz
+lxsession-0.4.0.tar.gz


Index: lxsession.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession/devel/lxsession.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxsession.spec	25 Jul 2009 11:31:52 -0000	1.3
+++ lxsession.spec	11 Dec 2009 21:54:25 -0000	1.4
@@ -3,8 +3,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=442268
 
 Name:           lxsession
-Version:        0.3.8
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Lightweight X11 session manager
 Summary(de):    Leichtgewichtiger X11 Sitzungsverwalter
 
@@ -17,8 +17,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  gtk2-devel > 2.6 dbus-glib-devel
 BuildRequires:  docbook-utils intltool gettext
 Requires:       hal
+# name changed back from lxsession-lite to lxsession
 Obsoletes:      lxsession-lite <= 0.3.6-6
 Provides:       lxsession-lite = %{version}-%{release}
+# lxde-settings-daemon was merged into lxsession
+Obsoletes:      lxde-settings-daemon <= 0.4.1-2
+Provides:       lxde-settings-daemon = 0.4.1-3
+
 
 %description
 LXSession is a standard-compliant X11 session manager with shutdown/
@@ -61,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README desktop.conf.example
 %{_bindir}/%{name}
 %{_bindir}/%{name}-logout
 %{_datadir}/%{name}/
@@ -70,6 +75,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/xdg/%{name}
 
 %changelog
+* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
+- Update to 0.4.1
+
+* Tue Dec 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
+- Update to 0.4.0
+- Obsolete lxde-settings-deamon
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 May 2009 23:25:26 -0000	1.2
+++ sources	11 Dec 2009 21:54:25 -0000	1.3
@@ -1 +1 @@
-7262c587ea085bf3aa7688f3be55c516  lxsession-0.3.8.tar.gz
+d1d63d674df3957556d4e44771c25b55  lxsession-0.4.0.tar.gz



From praveenp at fedoraproject.org  Fri Dec 11 21:58:27 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri, 11 Dec 2009 21:58:27 +0000 (UTC)
Subject: rpms/openwsman/F-12 openwsman-pam-auth.patch, NONE,
	1.1 openwsman.rpmlintrc, NONE, 1.1 perl-bindings.patch, NONE,
	1.1 openwsman-initscript.patch, 1.1, 1.2 openwsman.spec, 1.5, 1.6
Message-ID: <20091211215827.C873711C00C5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6473

Modified Files:
	openwsman-initscript.patch openwsman.spec 
Added Files:
	openwsman-pam-auth.patch openwsman.rpmlintrc 
	perl-bindings.patch 
Log Message:
Broke the package into lib, server and client parts


openwsman-pam-auth.patch:
 openwsman.conf |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openwsman-pam-auth.patch ---
Index: openwsman.conf
===================================================================
--- openwsman-2.0.0/etc/openwsman.conf	(revision 3221)
+++ openwsman-2.0.0/etc/openwsman.conf	(working copy)
@@ -4,7 +4,7 @@
 ssl_cert_file = /etc/openwsman/servercert.pem
 ssl_key_file = /etc/openwsman/serverkey.pem
 digest_password_file = /etc/openwsman/digest_auth.passwd
-basic_password_file = /etc/openwsman/simple_auth.passwd
+#basic_password_file = /etc/openwsman/simple_auth.passwd
 
 min_threads = 4
 max_threads = 10
@@ -15,8 +15,8 @@
 # Authentication backend for BASIC authentication. Default is to read a configuration file defined with 'basic_password_file'
 #
 
-#basic_authenticator = libwsman_pam_auth.so
-#basic_authenticator_arg = openwsman
+basic_authenticator = libwsman_pam_auth.so
+basic_authenticator_arg = openwsman
 
 #
 # WS-Management unauthenticated wsmid:Identify file


--- NEW FILE openwsman.rpmlintrc ---
addFilter("devel-file-in-non-devel-package .*/usr/lib.*/openwsman/.*/.*")
addFilter("openwsman-client.*shlib-policy-name-error.*")

perl-bindings.patch:
 Makefile.am |    1 +
 Makefile.in |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE perl-bindings.patch ---
diff -up openwsman-2.2.0/bindings/perl/Makefile.am.org openwsman-2.2.0/bindings/perl/Makefile.am
--- openwsman-2.2.0/bindings/perl/Makefile.am.org	2009-12-10 13:34:55.000000000 -0600
+++ openwsman-2.2.0/bindings/perl/Makefile.am	2009-12-10 13:35:56.000000000 -0600
@@ -33,6 +33,7 @@ SWIG_INPUT = ../openwsman.i
 openwsman_la_SOURCES = openwsman_wrap.c \
 			 ../openwsman.c \
 			 $(SWIG_INPUT)
+all-local: openwsman.pm
 
 openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
 
diff -up openwsman-2.2.0/bindings/perl/Makefile.in.org openwsman-2.2.0/bindings/perl/Makefile.in
--- openwsman-2.2.0/bindings/perl/Makefile.in.org	2009-12-10 13:35:03.000000000 -0600
+++ openwsman-2.2.0/bindings/perl/Makefile.in	2009-12-10 13:36:18.000000000 -0600
@@ -289,6 +289,7 @@ SWIG_INPUT = ../openwsman.i
 openwsman_la_SOURCES = openwsman_wrap.c \
 			 ../openwsman.c \
 			 $(SWIG_INPUT)
+all-local: openwsman.pm
 
 openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
 openwsman_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)

openwsman-initscript.patch:
 openwsmand.sh.in |   67 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 16 deletions(-)

Index: openwsman-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/openwsman-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openwsman-initscript.patch	1 Nov 2008 10:57:30 -0000	1.1
+++ openwsman-initscript.patch	11 Dec 2009 21:58:26 -0000	1.2
@@ -1,28 +1,120 @@
---- openwsman-2.0.0/etc/init/openwsmand.sh.in.orig	2008-09-07 00:01:29.000000000 -0500
-+++ openwsman-2.0.0/etc/init/openwsmand.sh.in	2008-09-07 00:34:57.000000000 -0500
-@@ -4,15 +4,13 @@
- # Provides: openwsmand
+diff -up ./etc/init/openwsmand.sh.in.org ./etc/init/openwsmand.sh.in
+--- ./etc/init/openwsmand.sh.in.org	2009-12-11 13:04:10.000000000 -0600
++++ ./etc/init/openwsmand.sh.in	2009-12-11 13:14:14.000000000 -0600
+@@ -5,7 +5,7 @@
  # Required-Start: $remote_fs
  # Required-Stop: $network
--# Default-Start: 2 3 4 5
+ # Default-Start: 2 3 4 5
 -# Default-Stop: 0 1 6 
++# Default-Stop:  0 1 6
  # Short-Description: Openwsman Daemon
  # Description: openwsmand
  #       Start/Stop the Openwsman Daemon
- ### END INIT INFO
- #
- #
--# chkconfig: 2345 36 64
-+# chkconfig: - 36 64
- # description: Openwsman Daemon
- # processname: openwsmand
- 
-@@ -57,7 +55,7 @@ case "$1" in
-             if [ "x${FQDN}" = "x" ]; then
-                 FQDN=localhost.localdomain
-             fi
--cat << EOF | sh @SYSCONFDIR@/owsmangencert.sh > /dev/null 2>&1
-+cat << EOF | sh @libexecdir@/openwsman/owsmangencert.sh > /dev/null 2>&1
- --
- SomeState
- SomeCity
+@@ -18,7 +18,7 @@
+ 
+ NAME=openwsmand
+ DAEMON=/usr/sbin/$NAME
+-OPTIONS=
++OPTIONS=-S
+ PIDFILE=/var/run/$NAME.pid
+ 
+ if [ $EUID != 0 ]; then
+@@ -37,12 +37,14 @@ lockfile=${SVIlock:-/var/lock/subsys/$NA
+ if [ -f "/etc/sysconfig/openwsman" ]; then
+     . /etc/sysconfig/openwsman
+ fi
+-# See how we were called.
+-. /etc/rc.status
+ 
+-# Reset status of this service
+-rc_reset
++if [ -f "/etc/SuSe-release" ]; then
++     # See how we were called.
++     . /etc/rc.status
+ 
++     # Reset status of this service
++     rc_reset
++fi
+ 
+ case "$1" in
+     start)
+@@ -71,16 +73,28 @@ EOF
+ 
+     # Start daemons.
+     echo -n "Starting the $DESCRIPTIVE"
+-    startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++    	startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
++    	rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++    	$DAEMON -S && echo "          done." || echo "   failed."
++    fi
++    
+     touch $lockfile
+     ;;
+ 
+     stop)
+     # Stop daemons.
+     echo -n "Shutting down $DESCRIPTIVE"
+-    killproc -p $PIDFILE -TERM $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++       killproc -p $PIDFILE -TERM $DAEMON
++       rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++       kill -9 `pidof openwsmand` > /dev/null 2>&1
++          if [ $? -eq 0 ]; then
++             echo "         done"
++          fi
++    fi
+     rm -f $lockfile
+     ;;
+ 
+@@ -91,19 +105,40 @@ EOF
+     ;;
+ 
+     reload)
+-    echo -n "Reload service $DESCRIPTIVE"
+-    killproc -p $PIDFILE  -HUP $DAEMON
+-    rc_status -v
++    echo -n "Reloading service $DESCRIPTIVE"
++    if [ -f "/etc-SuSe-release" ]; then
++    	killproc -p $PIDFILE  -HUP $DAEMON
++    	rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++    	killall -HUP openwsmad && echo "            done."|| echo "    failed."
++    fi
+     ;;
+ 
+     status)
+     echo -n "Checking for service $DESCRIPTIVE"
+-    checkproc -p $PIDFILE $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++        checkproc -p $PIDFILE $DAEMON
++        rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++        pidof opewsmand > /dev/null 2>&1
++        if [ $? -eq 0 ]; then
++           echo "         running"
++        else
++           echo "         stopped"
++        fi 
++    fi
++        
++    ;;
++    condrestart)
++       [ -f $lockfile ] && restart || :
+     ;;
+ 
+     *)
+-    echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
++    echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
+ esac
+ 
++if [ -f "/etc/SuSe-release" ]; then
+ rc_exit
++elif [ -f "/etc/redhat-release" ]; then
++exit 0 
++fi


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/openwsman.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openwsman.spec	1 Oct 2009 18:17:09 -0000	1.5
+++ openwsman.spec	11 Dec 2009 21:58:27 -0000	1.6
@@ -1,22 +1,46 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+#
+# spec file for package openwsman (Version 2.2.0)
+#
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
-%define ruby_libdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
-Name:          openwsman
-Version:       2.2.0
-Release:        1%{?dist}
-License:        BSD
+Name:           openwsman
+BuildRequires:  swig
+BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
+BuildRequires:  python python-devel ruby ruby-devel perl
+BuildRequires:  perl-devel pkgconfig openssl-devel
+BuildRequires:  libtool
+Requires:       net-tools
+Version:        2.2.0
+Release:        2%{?dist}
 Url:            http://www.openwsman.org/
-Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-initscript.patch
+License:        BSD
+Group:          Applications/System
+Summary:        Opensource Implementation of WS-Management
+Source:         %{name}-%{version}.tar.bz2
+Source1:        %{name}.rpmlintrc
+Patch0:         %{name}-pam-auth.patch
+Patch1:         %{name}-initscript.patch
+Patch2:         perl-bindings.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
-Group:          System Environment/Daemons
-Summary:        Web Services Management libraries
-BuildRequires:  sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(postun): initscripts
 
 %description
 Openwsman is a project intended to provide an open-source
@@ -28,129 +52,279 @@ requirements that exposes a set of opera
 all system management aspects.
 
 
-%package devel
-Summary:        Openwsman Development files
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package -n libwsman1
+License:        BSD
+Group:          System Environment/Libraries
+Summary:        Opensource Implementation of WS-Management
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
+Requires:       %{name}-client
+
+%description -n libwsman1
+Openwsman library for packages dependent on openwsman
+
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package -n libwsman-devel
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-%description devel
-Openwsman Development files
+Summary:        Opensource Implementation of WS-Management
+Provides:       %{name}-devel = %{version}
+Obsoletes:      %{name}-devel < %{version}
+Requires:       libwsman1 = %{version}
+Requires:       %{name}-server = %{version}
+Requires:       %{name}-client = %{version}
+Requires:       sblim-sfcc-devel libxml2-devel pam-devel
+Requires:       libcurl-devel
+
+%description -n libwsman-devel
+Development files for openwsman
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package client
+License:        BSD
+Group:          System Environment/Libraries
+Summary:        Openwsman Client libraries
+
+%description client
+Openwsman Client libraries
+
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package server
+License:        BSD
+Group:          System Environment/Daemons
+Requires:       net-tools
+Requires:       openwsman-client
+Summary:        Openwsman Server and service libraries
+
+%description server
+Openwsman Server and service libraries
+
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
 
 %package python
-Summary:        Openwsman Python bindings
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:        Python bindings for openwsman client API
+Requires:       python
+
 %description python
-Openwsman python bindings
+This package provides Python bindings to access the openwsman client
+API.
+
+
 
-%package -n ruby-%{name}
-Summary:        Openwsman Ruby bindings
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package ruby
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Provides:       ruby(%{name}) = %{version}
-%description -n ruby-%{name}
-Openwsman ruby bindings
+Summary:        Ruby bindings for openwsman client API
+
+%description ruby
+This package provides Ruby bindings to access the openwsman client API.
+
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package perl
+License:        BSD
+Group:          Development/Libraries
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Summary:        Perl bindings for openwsman client API
+
+%description perl
+This package provides Perl bindings to access the openwsman client API.
+
+
 
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
-echo "%{ruby_sitearch}"
+%patch1 -p1
+%patch2 -p1
 
 %build
-chmod a-x src/lib/*.[ch]
-chmod a-x src/cpp/*.[ch]
-chmod a-x include/*.[ch]
-
-# disable eventing, as Fedora libcurl isn't linked against openssl
-# disable tests in 2.1.0, http://www.openwsman.org/bug/263
-%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings
-make %{?_smp_flags}
+sh autoconfiscate.sh
+# Removing executable permissions on .c and .h files to fix rpmlint warnings. 
+chmod -x src/cpp/WsmanClient.h
+chmod -x src/lib/wsman-filter.c
+chmod -x include/wsman-filter.h
+%configure \
+    --disable-more-warnings \
+    --disable-static \
+    --enable-python \
+    --enable-ruby \
+    --enable-perl \
+    --enable-ipv6
+#make clean
+
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA"
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-install -m 0644 etc/openwsman.conf %{buildroot}/etc/openwsman
-install -m 0644 etc/ssleay.cnf %{buildroot}/etc/openwsman
-install -D -m 0755 etc/init/%{name}d.sh %{buildroot}/%{_initrddir}/%{name}d
-# move this helper script out of /etc
-mkdir -p %{buildroot}/%{_libexecdir}/%{name}/
-chmod 0755 %{buildroot}/etc/%{name}/owsmangencert.sh
-mv %{buildroot}/etc/%{name}/owsmangencert.sh %{buildroot}/%{_libexecdir}/%{name}/
-find %{buildroot} -type f -name \*.la -exec rm \{\} \;
-find %{buildroot} -type f -name \*.a -exec rm \{\} \;
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/authenticators/*.la
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -m 644 etc/openwsman.conf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 644 etc/ssleay.cnf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 755 etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openwsmand
+ln -sf %{_sysconfdir}/init.d/openwsmand $RPM_BUILD_ROOT%{_sbindir}/rcopenwsmand
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+%post -n libwsman1 -p /sbin/ldconfig
+
+%postun -n libwsman1 -p /sbin/ldconfig
 
-%files
+%post server
+/sbin/ldconfig
+chkconfig --add  openwsmand
+
+%preun server
+chkconfig --del openwsmand
+
+%postun server
+rm -f /var/log/wsmand.log
+/sbin/ldconfig
+
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
+
+%files -n libwsman1
 %defattr(-,root,root)
-%{_sbindir}/%{name}d
-%{_initrddir}/%{name}d
-%{_libexecdir}/%{name}
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/authenticators
-%{_libdir}/libwsman*.so.*
-%{_libdir}/%{name}/plugins/*so.*
-%{_libdir}/%{name}/authenticators/*so.*
-%dir /etc/openwsman
-%config(noreplace) /etc/openwsman/openwsman.conf
-%config(noreplace) /etc/openwsman/ssleay.cnf
-%{ruby_libdir}/openwsman
-%config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%doc COPYING README
+%doc AUTHORS COPYING ChangeLog README TODO
+%{_libdir}/libwsman.so.*
+%{_libdir}/libwsman_client.so.*
+%{_libdir}/libwsman_curl_client_transport.so.*
 
-%files devel
+%files -n libwsman-devel
 %defattr(-,root,root)
 %{_includedir}/*
+%{_libdir}/pkgconfig/*
 %{_libdir}/*.so
-%{_libdir}/%{name}/plugins/*so
-%{_libdir}/%{name}/authenticators/*so
-%{_libdir}/pkgconfig/%{name}*.pc
-%doc COPYING examples/serialize.c doc/plugin* 
+%doc AUTHORS COPYING ChangeLog README
 
 %files python
 %defattr(-,root,root)
-%{python_sitelib}/pywsman.py
 %{python_sitearch}/*.so
-%doc COPYING
+%{python_sitelib}/*.py
+#%{python_sitelib}/*.pyc
+#%{python_sitelib}/*.pyo
+%doc AUTHORS COPYING ChangeLog README
 
-%files -n ruby-%{name}
+%files ruby
 %defattr(-,root,root)
-%{ruby_sitearch}/*.so
-%doc COPYING
+%{ruby_sitearch}/openwsman.so
+%dir %{ruby_sitelib}/openwsman
+%{ruby_sitelib}/openwsman/openwsman.rb
+%{ruby_sitelib}/openwsman/wsxmlnode.rb
+%doc AUTHORS COPYING ChangeLog README
 
-%post
-/sbin/ldconfig
-/sbin/chkconfig --add %{name}d
-
-%preun
-if [ $1 = 0 ] ; then
-    /sbin/service %{name}d stop >/dev/null 2>&1
-    /sbin/chkconfig --del %{name}d
-fi
+%files perl
+%defattr(-,root,root)
+%{perl_vendorarch}/openwsman.so
+%{perl_vendorlib}/openwsman.pm
+%doc AUTHORS COPYING ChangeLog README
+
+%files server
+# Don't remove *.so files from the server package.
+# the server fails to start without these files.
+%defattr(-,root,root)
+%dir %{_sysconfdir}/openwsman
+%config(noreplace) %{_sysconfdir}/openwsman/openwsman.conf
+%config(noreplace) %{_sysconfdir}/openwsman/ssleay.cnf
+%attr(0755,root,root) %{_sysconfdir}/openwsman/owsmangencert.sh
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
+%attr(0755,root,root) %{_sysconfdir}/init.d/openwsmand
+%dir %{_libdir}/openwsman
+%dir %{_libdir}/openwsman/authenticators
+%{_libdir}/openwsman/authenticators/*.so
+%{_libdir}/openwsman/authenticators/*.so.*
+%dir %{_libdir}/openwsman/plugins
+%{_libdir}/openwsman/plugins/*.so
+%{_libdir}/openwsman/plugins/*.so.*
+%{_sbindir}/openwsmand
+%{_sbindir}/rcopenwsmand
+%{_libdir}/libwsman_server.so.*
+%doc AUTHORS COPYING ChangeLog README
 
-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ] ; then
-    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-fi
+%files client
+%defattr(-,root,root)
+%{_libdir}/libwsman_clientpp.so.*
+%doc AUTHORS COPYING ChangeLog README
 
 
 %changelog
+* Wed Dec  9 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
+- Re-wrote the spec file to break the openwmsman pkg into lib, client
+- and server components following the upstream spec file.
+
 * Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
 - Updated the sources to 2.2.0. Couple of major changes are as follows:
 - Major changes:
-- 	Adapt IANA ports of 5985 (http) and 5986 (https)
-- 	Change the Ruby bindings module name to 'Openwsman'
-- 	Change the Ruby plugin module name to 'Openwsman'
-- 	IPv6 support (A_Venkatachalam at Dell.com)
-- 	preliminary support for wbem intrinsic operations
--           'EnumerateClassNames' and 'GetClass' (kkaempf at suse.de)
+-       Adapt IANA ports of 5985 (http) and 5986 (https)
+-       Change the Ruby bindings module name to 'Openwsman'
+-       Change the Ruby plugin module name to 'Openwsman'
+-       IPv6 support (A_Venkatachalam at Dell.com)
+-       preliminary support for wbem intrinsic operations
+-            'EnumerateClassNames' and 'GetClass' (kkaempf at suse.de)
 -            (needs fixed sblim-sfcc, see www.openwsman.org for details)
--  
+  
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.0-4
 - rebuilt with new openssl



From jistone at fedoraproject.org  Fri Dec 11 22:00:02 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Fri, 11 Dec 2009 22:00:02 +0000 (UTC)
Subject: rpms/systemtap/devel systemtap.spec,1.54,1.55
Message-ID: <20091211220002.CBB5411C03F6@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7312

Modified Files:
	systemtap.spec 
Log Message:
Rebuild against rpm-4.8.0


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- systemtap.spec	21 Oct 2009 15:36:43 -0000	1.54
+++ systemtap.spec	11 Dec 2009 22:00:02 -0000	1.55
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -397,6 +397,9 @@ exit 0
 
 
 %changelog
+* Fri Dec 11 2009 Josh Stone <jistone at redhat.com> - 1.0-3
+- Rebuild against rpm-4.8.0
+
 * Wed Oct 21 2009 Josh Stone <jistone at redhat.com> - 1.0-2
 - Fix three --unprivileged DOS issues (CVE-2009-2911)
 



From cwickert at fedoraproject.org  Fri Dec 11 22:00:10 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 11 Dec 2009 22:00:10 +0000 (UTC)
Subject: File lxsession-0.4.1.tar.gz uploaded to lookaside cache by cwickert
Message-ID: <20091211220010.703C710F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lxsession:

037137ab9c84516a5cac5bc9b2905c69  lxsession-0.4.1.tar.gz



From cwickert at fedoraproject.org  Fri Dec 11 22:01:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 11 Dec 2009 22:01:34 +0000 (UTC)
Subject: rpms/lxsession/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20091211220134.7775511C00C5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7987

Modified Files:
	.cvsignore sources 
Log Message:
upload new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Dec 2009 21:54:25 -0000	1.3
+++ .cvsignore	11 Dec 2009 22:01:34 -0000	1.4
@@ -1 +1 @@
-lxsession-0.4.0.tar.gz
+lxsession-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Dec 2009 21:54:25 -0000	1.3
+++ sources	11 Dec 2009 22:01:34 -0000	1.4
@@ -1 +1 @@
-d1d63d674df3957556d4e44771c25b55  lxsession-0.4.0.tar.gz
+037137ab9c84516a5cac5bc9b2905c69  lxsession-0.4.1.tar.gz



From pkgdb at fedoraproject.org  Fri Dec 11 22:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:04:35 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091211220435.1D2E310F88C@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python (Fedora devel) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Dec 11 22:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:04:41 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091211220441.3B08610F88C@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python (Fedora 10) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Dec 11 22:04:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:04:42 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091211220442.A93B610F88C@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python (Fedora 11) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Dec 11 22:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:04:44 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091211220444.E889E10F88C@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python (Fedora 12) to Obsolete for katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Dec 11 22:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:08:54 +0000
Subject: [pkgdb] qpidc ownership updated
Message-ID: <20091211220854.DD51A10F890@bastion2.fedora.phx.redhat.com>

Package qpidc in Fedora devel is now owned by nsantos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpidc



From pkgdb at fedoraproject.org  Fri Dec 11 22:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:09:16 +0000
Subject: [pkgdb] qpidc ownership updated
Message-ID: <20091211220916.2CD1C10F890@bastion2.fedora.phx.redhat.com>

Package qpidc in Fedora 12 is now owned by nsantos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpidc



From pkgdb at fedoraproject.org  Fri Dec 11 22:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:09:33 +0000
Subject: [pkgdb] qpidc ownership updated
Message-ID: <20091211220933.6E8BC10F890@bastion2.fedora.phx.redhat.com>

Package qpidc in Fedora 11 is now owned by nsantos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpidc



From jjohnstn at fedoraproject.org  Fri Dec 11 22:10:07 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 11 Dec 2009 22:10:07 +0000 (UTC)
Subject: File eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz uploaded to
	lookaside cache by jjohnstn
Message-ID: <20091211221007.1BDF310F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-cdt:

5560963f84030d8a535ce56c7c3c79f5  eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz



From jjohnstn at fedoraproject.org  Fri Dec 11 22:10:24 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 11 Dec 2009 22:10:24 +0000 (UTC)
Subject: File eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz uploaded to
	lookaside cache by jjohnstn
Message-ID: <20091211221024.A64C910F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for eclipse-cdt:

10762b14bfee59132ef50324bb343f71  eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz



From jjohnstn at fedoraproject.org  Fri Dec 11 22:11:48 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 11 Dec 2009 22:11:48 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-12 .cvsignore, 1.48,
	1.49 eclipse-cdt-autotools-local.patch, 1.1,
	1.2 eclipse-cdt.spec, 1.137, 1.138 make-autotools-tarball.sh,
	1.3, 1.4 make-libhover-tarball.sh, 1.2, 1.3 sources, 1.58, 1.59
Message-ID: <20091211221148.50C4611C00C5@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11889

Modified Files:
	.cvsignore eclipse-cdt-autotools-local.patch eclipse-cdt.spec 
	make-autotools-tarball.sh make-libhover-tarball.sh sources 
Log Message:

* Fri Dec 11 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-5
- Rebase Autotools to Linux tools 0.4.0.1 release.
- Rebase Libhover to Linux tools 0.4.0 release.
- Remove libhover patch which is now part of rebase.





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	16 Oct 2009 22:03:15 -0000	1.48
+++ .cvsignore	11 Dec 2009 22:11:47 -0000	1.49
@@ -39,3 +39,5 @@ acmacros-2.61.xml
 ammacros-1.4-p6.xml
 ammacros-1.9.5.xml
 ammacros-1.9.6.xml
+eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
+eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz

eclipse-cdt-autotools-local.patch:
 build.properties |    1 +
 1 file changed, 1 insertion(+)

Index: eclipse-cdt-autotools-local.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt-autotools-local.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-cdt-autotools-local.patch	16 Oct 2009 22:03:15 -0000	1.1
+++ eclipse-cdt-autotools-local.patch	11 Dec 2009 22:11:47 -0000	1.2
@@ -1,11 +1,11 @@
 diff -up ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix ./org.eclipse.linuxtools.cdt.autotools/build.properties
---- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix	2009-10-16 16:20:57.126201920 -0400
-+++ ./org.eclipse.linuxtools.cdt.autotools/build.properties	2009-10-16 16:21:32.342201408 -0400
-@@ -5,6 +5,7 @@ bin.includes = plugin.xml,\
+--- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix	2009-12-11 16:51:18.000000000 -0500
++++ ./org.eclipse.linuxtools.cdt.autotools/build.properties	2009-12-11 16:52:05.000000000 -0500
+@@ -3,6 +3,7 @@ output.. = bin/
+ bin.includes = plugin.xml,\
+                META-INF/,\
                 .,\
-                icons/,\
-                html/,\
 +               macros/,\
                 plugin.properties,\
-                templates/
+                icons/
  


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- eclipse-cdt.spec	16 Oct 2009 22:03:15 -0000	1.137
+++ eclipse-cdt.spec	11 Dec 2009 22:11:48 -0000	1.138
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -36,9 +36,9 @@ Requires:       eclipse-platform
 Source0: %{name}-fetched-src-CDT_6_0_1.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
 
-Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz
 
 ## The following tarball was generated thusly:
 ##
@@ -91,10 +91,6 @@ Patch13: %{name}-testaggregation.patch
 # plugin and not require html to access them.
 Patch14: %{name}-libhover-local.patch
 
-# Following is a patch to libhover to fix member resolution, plugin loading,
-# and to enable local plugin file support for docs.
-Patch15: %{name}-libhover.patch
-
 # Patches for ppc64
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272380
 
@@ -242,8 +238,10 @@ popd
 mkdir libhover
 pushd libhover
 tar -xzf %{SOURCE2}
+# newlib libhover is an optional feature...remove it from CDT base
+rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
+rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
 %patch14 -p0
-%patch15 -p0
 pushd org.eclipse.linuxtools.cdt.libhover
 mkdir libhoverdocs
 pushd libhoverdocs
@@ -623,6 +621,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Dec 11 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-5
+- Rebase Autotools to Linux tools 0.4.0.1 release.
+- Rebase Libhover to Linux tools 0.4.0 release.
+- Remove libhover patch which is now part of rebase.
+
 * Fri Oct 16 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-4
 - Rebase Autotools to 1.0.5.
 - Add patch to move macro hover docs locally into Autotools plugin.


Index: make-autotools-tarball.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/make-autotools-tarball.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- make-autotools-tarball.sh	15 Oct 2008 23:08:47 -0000	1.3
+++ make-autotools-tarball.sh	11 Dec 2009 22:11:48 -0000	1.4
@@ -4,7 +4,7 @@ tag=`echo $rel | sed -e 's/\./_/g'`
 echo $tag
 mkdir -p temp && cd temp
 rm -rf autotools
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$rel autotools
+svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$tag autotools
 cd autotools
 pwd
 rm -rf org.eclipse.linuxtools.cdt.autotools.tests


Index: make-libhover-tarball.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/make-libhover-tarball.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- make-libhover-tarball.sh	24 Sep 2009 22:20:05 -0000	1.2
+++ make-libhover-tarball.sh	11 Dec 2009 22:11:48 -0000	1.3
@@ -4,7 +4,7 @@ tag=`echo $rel | sed -e 's/\./_/g'`
 echo $tag
 mkdir -p temp && cd temp
 rm -rf libhover
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$rel libhover
+svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$tag libhover
 cd libhover
 pwd
 # We don't want newlib libhover shipped unconditionally


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	16 Oct 2009 22:03:15 -0000	1.58
+++ sources	11 Dec 2009 22:11:48 -0000	1.59
@@ -2,12 +2,12 @@
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
-2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 62e2dcbf8fb1f1b23cc71ae762b873b8  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
-b273bf4bd39f9effb1cdf7e4cc68a1f0  eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
 992ad18bb8b4d95e5ecab9138dc379ae  acmacros-2.13.xml
 5bcf3e0c2a780b237bb06226eda7a4e7  acmacros-2.59.xml
 0e096b343447578000c73002dc448afa  acmacros-2.61.xml
 4404043432f7f30300139ce39288ba93  ammacros-1.4-p6.xml
 f6edf5299e6f0d89017bd295a296c2cd  ammacros-1.9.5.xml
 f5c671311f49cdb33eaaa64ab6d781fa  ammacros-1.9.6.xml
+5560963f84030d8a535ce56c7c3c79f5  eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
+10762b14bfee59132ef50324bb343f71  eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz



From kkofler at fedoraproject.org  Fri Dec 11 22:17:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 11 Dec 2009 22:17:45 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.73,1.74
Message-ID: <20091211221745.6BEFD11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14123/devel

Modified Files:
	kdeplasma-addons.spec 
Log Message:
BuildRequires: attica-devel


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- kdeplasma-addons.spec	2 Dec 2009 14:05:30 -0000	1.73
+++ kdeplasma-addons.spec	11 Dec 2009 22:17:45 -0000	1.74
@@ -16,6 +16,7 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 
+BuildRequires:  attica-devel
 BuildRequires:  boost-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}



From kkofler at fedoraproject.org  Fri Dec 11 22:41:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 11 Dec 2009 22:41:03 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.74,1.75
Message-ID: <20091211224103.EF9BD11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22815/devel

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Fix file list (rm libocsclient, dropped upstream, replaced by libattica and not used anywhere outside of kdeplasma-addons according to repoquery).


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- kdeplasma-addons.spec	11 Dec 2009 22:17:45 -0000	1.74
+++ kdeplasma-addons.spec	11 Dec 2009 22:41:02 -0000	1.75
@@ -145,7 +145,6 @@ rm -rf %{buildroot}
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libocsclient.so.*
 %{_kde4_libdir}/liblancelot.so.*
 %{_kde4_libdir}/libplasmapotdprovidercore.so.*
 %{_kde4_libdir}/libplasmacomicprovidercore.so.*
@@ -155,7 +154,6 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/lancelot/
-%{_kde4_libdir}/libocsclient.so
 %{_kde4_libdir}/liblancelot.so
 %{_kde4_libdir}/libplasma*.so
 %{_kde4_libdir}/librtm.so



From jjohnstn at fedoraproject.org  Fri Dec 11 22:48:35 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 11 Dec 2009 22:48:35 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.49,
	1.50 eclipse-cdt-autotools-local.patch, 1.1,
	1.2 eclipse-cdt.spec, 1.140, 1.141 sources, 1.58, 1.59
Message-ID: <20091211224835.6530B11C00C5@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25691

Modified Files:
	.cvsignore eclipse-cdt-autotools-local.patch eclipse-cdt.spec 
	sources 
Log Message:

* Fri Dec 11 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-7
- Rebase Autotools to Linux tools 0.4.0.1 release.
- Rebase Libhover to Linux tools 0.4.0 release.
- Remove libhover patch which is now part of rebase.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	28 Oct 2009 12:55:29 -0000	1.49
+++ .cvsignore	11 Dec 2009 22:48:34 -0000	1.50
@@ -39,5 +39,5 @@ acmacros-2.61.xml
 ammacros-1.4-p6.xml
 ammacros-1.9.5.xml
 ammacros-1.9.6.xml
-eclipse-cdt-target_filter.gif.gz
-eclipse-cdt-cppunit-20061102.tar.gz
+eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
+eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz

eclipse-cdt-autotools-local.patch:
 build.properties |    1 +
 1 file changed, 1 insertion(+)

Index: eclipse-cdt-autotools-local.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt-autotools-local.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-cdt-autotools-local.patch	16 Oct 2009 22:04:42 -0000	1.1
+++ eclipse-cdt-autotools-local.patch	11 Dec 2009 22:48:34 -0000	1.2
@@ -1,11 +1,11 @@
 diff -up ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix ./org.eclipse.linuxtools.cdt.autotools/build.properties
---- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix	2009-10-16 16:20:57.126201920 -0400
-+++ ./org.eclipse.linuxtools.cdt.autotools/build.properties	2009-10-16 16:21:32.342201408 -0400
-@@ -5,6 +5,7 @@ bin.includes = plugin.xml,\
+--- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix	2009-12-11 16:51:18.000000000 -0500
++++ ./org.eclipse.linuxtools.cdt.autotools/build.properties	2009-12-11 16:52:05.000000000 -0500
+@@ -3,6 +3,7 @@ output.. = bin/
+ bin.includes = plugin.xml,\
+                META-INF/,\
                 .,\
-                icons/,\
-                html/,\
 +               macros/,\
                 plugin.properties,\
-                templates/
+                icons/
  


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- eclipse-cdt.spec	28 Oct 2009 12:55:29 -0000	1.140
+++ eclipse-cdt.spec	11 Dec 2009 22:48:34 -0000	1.141
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -36,9 +36,9 @@ Requires:       eclipse-platform
 Source0: %{name}-fetched-src-CDT_6_0_1.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
 
-Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz
 
 ## The following tarball was generated thusly:
 ##
@@ -91,10 +91,6 @@ Patch13: %{name}-testaggregation.patch
 # plugin and not require html to access them.
 Patch14: %{name}-libhover-local.patch
 
-# Following is a patch to libhover to fix member resolution, plugin loading,
-# and to enable local plugin file support for docs.
-Patch15: %{name}-libhover.patch
-
 # Patches for ppc64
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272380
 
@@ -235,8 +231,10 @@ popd
 mkdir libhover
 pushd libhover
 tar -xzf %{SOURCE2}
+# newlib libhover is an optional feature...remove it from CDT base
+rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
+rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
 %patch14 -p0
-%patch15 -p0
 pushd org.eclipse.linuxtools.cdt.libhover
 mkdir libhoverdocs
 pushd libhoverdocs
@@ -589,6 +587,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Dec 11 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-7
+- Rebase Autotools to Linux tools 0.4.0.1 release.
+- Rebase Libhover to Linux tools 0.4.0 release.
+- Remove libhover patch which is now part of rebase.
+
 * Wed Oct 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:6.0.1-6
 - Disable mylyn bridge build, part of eclipse-mylyn srpm now.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	16 Oct 2009 22:04:42 -0000	1.58
+++ sources	11 Dec 2009 22:48:35 -0000	1.59
@@ -2,12 +2,12 @@
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
-2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 62e2dcbf8fb1f1b23cc71ae762b873b8  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
-b273bf4bd39f9effb1cdf7e4cc68a1f0  eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
 992ad18bb8b4d95e5ecab9138dc379ae  acmacros-2.13.xml
 5bcf3e0c2a780b237bb06226eda7a4e7  acmacros-2.59.xml
 0e096b343447578000c73002dc448afa  acmacros-2.61.xml
 4404043432f7f30300139ce39288ba93  ammacros-1.4-p6.xml
 f6edf5299e6f0d89017bd295a296c2cd  ammacros-1.9.5.xml
 f5c671311f49cdb33eaaa64ab6d781fa  ammacros-1.9.6.xml
+5560963f84030d8a535ce56c7c3c79f5  eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
+10762b14bfee59132ef50324bb343f71  eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz



From pkgdb at fedoraproject.org  Fri Dec 11 22:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:49:59 +0000
Subject: [pkgdb] liveusb-creator ownership updated
Message-ID: <20091211224959.F372F10F88C@bastion2.fedora.phx.redhat.com>

Package liveusb-creator in Fedora devel is now owned by lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liveusb-creator



From pkgdb at fedoraproject.org  Fri Dec 11 22:50:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:50:22 +0000
Subject: [pkgdb] liveusb-creator ownership updated
Message-ID: <20091211225022.8130110F88C@bastion2.fedora.phx.redhat.com>

Package liveusb-creator in Fedora 9 is now owned by lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liveusb-creator



From pkgdb at fedoraproject.org  Fri Dec 11 22:50:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:50:24 +0000
Subject: [pkgdb] liveusb-creator ownership updated
Message-ID: <20091211225024.2791810F88C@bastion2.fedora.phx.redhat.com>

Package liveusb-creator in Fedora EPEL 5 is now owned by lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liveusb-creator



From pkgdb at fedoraproject.org  Fri Dec 11 22:50:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:50:24 +0000
Subject: [pkgdb] liveusb-creator ownership updated
Message-ID: <20091211225024.AD32210F890@bastion2.fedora.phx.redhat.com>

Package liveusb-creator in Fedora 10 is now owned by lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liveusb-creator



From pkgdb at fedoraproject.org  Fri Dec 11 22:50:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:50:26 +0000
Subject: [pkgdb] liveusb-creator ownership updated
Message-ID: <20091211225026.0F57310F88C@bastion2.fedora.phx.redhat.com>

Package liveusb-creator in Fedora 11 is now owned by lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liveusb-creator



From pkgdb at fedoraproject.org  Fri Dec 11 22:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 11 Dec 2009 22:50:27 +0000
Subject: [pkgdb] liveusb-creator ownership updated
Message-ID: <20091211225027.905E210F88C@bastion2.fedora.phx.redhat.com>

Package liveusb-creator in Fedora 12 is now owned by lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/liveusb-creator



From cwickert at fedoraproject.org  Fri Dec 11 22:55:45 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 11 Dec 2009 22:55:45 +0000 (UTC)
Subject: rpms/lxappearance/devel .cvsignore, 1.3, 1.4 lxappearance.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20091211225545.650E411C00C5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxappearance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28273

Modified Files:
	.cvsignore lxappearance.spec sources 
Log Message:
* Fri Dec 11 2009 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
- Update to 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxappearance/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jul 2009 23:20:18 -0000	1.3
+++ .cvsignore	11 Dec 2009 22:55:45 -0000	1.4
@@ -1 +1 @@
-lxappearance-0.2.1.tar.gz
+lxappearance-0.3.0.tar.gz


Index: lxappearance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxappearance/devel/lxappearance.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lxappearance.spec	23 Nov 2009 00:28:40 -0000	1.6
+++ lxappearance.spec	11 Dec 2009 22:55:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lxappearance
-Version:        0.2.1
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Feature-rich GTK+ theme switcher for LXDE
 
 Group:          User Interface/Desktops
@@ -9,7 +9,8 @@ URL:            http://lxde.sourceforge.
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel > 2.6, gettext, desktop-file-utils
+BuildRequires:  gtk2-devel > 2.6, gettext, intltool, desktop-file-utils
+Requires:       lxsession >= 0.4.0
 
 %description
 LXAppearance is a new GTK+ theme switcher developed for LXDE, the Lightweight 
@@ -19,14 +20,14 @@ immediately in the preview area. After c
 settings will be written to gtkrc, and all running programs will be asked to 
 reload their themes.
 
+
 %prep
 %setup -q
+sed -i 's|Gtk;|GTK;|g' %{name}.desktop
 
 
 %build
 %configure
-# workaround for FTBFS #538963
-touch -r po/Makefile po/stamp-it
 make %{?_smp_mflags}
 
 
@@ -55,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 11 2009 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
+- Update to 0.3.0
+
 * Mon Nov 23 2009 Christoph Wickert <fedora christoph-wickert de> - 0.2.1-3
 - Workaround for infinite loop that causes FTBFS (#538963)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxappearance/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jul 2009 23:20:18 -0000	1.3
+++ sources	11 Dec 2009 22:55:45 -0000	1.4
@@ -1 +1 @@
-9ca29df5dc9642e96ad1e1b6bffd4b08  lxappearance-0.2.1.tar.gz
+916f4f49d47a7ba47eb297c11c81ba9d  lxappearance-0.3.0.tar.gz



From kkofler at fedoraproject.org  Fri Dec 11 22:57:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 11 Dec 2009 22:57:10 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.80-fix-liblogine-link.patch, NONE, 
	1.1 kdegames.spec, 1.154, 1.155
Message-ID: <20091211225710.3552D11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29064/devel

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.80-fix-liblogine-link.patch 
Log Message:
* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
- fix liblogine to link (upstream patch)
- fix file list for unversioned internal liblogine.so and libloscript.so libs

kdegames-4.3.80-fix-liblogine-link.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdegames-4.3.80-fix-liblogine-link.patch ---
Index: ksudoku/engine/CMakeLists.txt
===================================================================
--- ksudoku/engine/CMakeLists.txt	(revision 1058293)
+++ ksudoku/engine/CMakeLists.txt	(revision 1058294)
@@ -25,6 +25,8 @@
 
 target_link_libraries(logine
 	${QT_LIBRARIES}
+	${QT_QTCORE_LIBRARY}
+	${QT_QTSCRIPT_LIBRARY}
 )
 
-add_subdirectory(script)
\ No newline at end of file
+add_subdirectory(script)


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- kdegames.spec	11 Dec 2009 18:55:20 -0000	1.154
+++ kdegames.spec	11 Dec 2009 22:57:09 -0000	1.155
@@ -2,7 +2,7 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -19,6 +19,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # more, but don't use "Tron" in them! -- Kevin
 Patch0: kdegames-4.3.80-trademarks.patch
 
+# upstream patch from 4.4 trunk (Nicolas L?cureuil)
+# fix liblogine to link: http://websvn.kde.org/?view=revision&revision=1058294
+Patch100: kdegames-4.3.80-fix-liblogine-link.patch
+
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
 
@@ -105,6 +109,7 @@ game applications for KDE 4.
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
 %patch0 -p1 -b .trademarks
+%patch100 -p0 -b .fix-liblogine-link
 
 %build
 # trademarks issue in RHEL
@@ -216,6 +221,9 @@ rm -rf %{buildroot}
 %else
 %{_ggz_configdir}/ggz.modules.d/kdegames
 %endif
+# unversioned libraries
+%{_kde4_libdir}/liblogine.so
+%{_kde4_libdir}/libloscript.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -227,10 +235,17 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
+# unversioned libraries
+%exclude %{_kde4_libdir}/liblogine.so
+%exclude %{_kde4_libdir}/libloscript.so
 
 
 %changelog
-* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
+- fix liblogine to link (upstream patch)
+- fix file list for unversioned internal liblogine.so and libloscript.so libs
+
+* Tue Dec 01 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
@@ -743,6 +758,3 @@ rm -rf %{buildroot}
 
 * Wed Mar 27 2002 Than Ngo <than at redhat.com> 3.0.0-1
 - final
-
-
-



From kkofler at fedoraproject.org  Fri Dec 11 23:06:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 11 Dec 2009 23:06:44 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.268,1.269
Message-ID: <20091211230644.E9ACD11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32617/devel

Modified Files:
	kdebindings.spec 
Log Message:
Restore the no-rpath hack, it's not what caused the build failure and we're not ready to build without CMAKE_SKIP_RPATH.


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- kdebindings.spec	11 Dec 2009 14:50:58 -0000	1.268
+++ kdebindings.spec	11 Dec 2009 23:06:44 -0000	1.269
@@ -68,8 +68,6 @@ Patch0:  kdebindings-qyoto-examples.patc
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
 Patch2:  kdebindings-4.3.75-no-rpath.patch
-# or
-%define _cmake_skip_rpath %{nil}
 
 ## upstream patches
 
@@ -282,8 +280,8 @@ Falcon plugin for the Kross archtecture 
 # upstream patches
 
 # do the no-rpath hack last, after the upstream backports (if any)
-#patch2 -p1 -b .no-rpath
-#sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
+%patch2 -p1 -b .no-rpath
+sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
 
 
 %build



From kkofler at fedoraproject.org  Fri Dec 11 23:22:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 11 Dec 2009 23:22:59 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch, NONE,
	1.1 kdebindings.spec, 1.269, 1.270
Message-ID: <20091211232259.5DCD411C02CA@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5629/devel

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.3.80-fix-build.patch 
Log Message:
* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
- fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)

kdebindings-4.3.80-fix-build.patch:
 smokeconfig.xml |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdebindings-4.3.80-fix-build.patch ---
diff -ur kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml
--- kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml	2009-11-21 10:43:27.000000000 +0100
+++ kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml	2009-12-12 00:17:57.000000000 +0100
@@ -24,6 +24,7 @@
         <signature>.*Q3.*</signature>
         
         <signature>.*Nepomuk::ResourceManager::allResources\(\).*</signature>
+        <signature>.*Nepomuk::ResourceManager::generateUniqueUri\(.*</signature>
     </exclude>
     <functions>
         <!-- everything in that namespace.. -->


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- kdebindings.spec	11 Dec 2009 23:06:44 -0000	1.269
+++ kdebindings.spec	11 Dec 2009 23:22:57 -0000	1.270
@@ -52,7 +52,7 @@
 
 Name: kdebindings
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -67,7 +67,10 @@ Patch0:  kdebindings-qyoto-examples.patc
 # fix build with CMAKE_SKIP_RPATH - also needs sed line below
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
-Patch2:  kdebindings-4.3.75-no-rpath.patch
+Patch1:  kdebindings-4.3.75-no-rpath.patch
+# fix the NepomukSmoke build by blacklisting
+# Nepomuk::ResourceManager::generateUniqueUri
+Patch2:  kdebindings-4.3.80-fix-build.patch
 
 ## upstream patches
 
@@ -276,11 +279,12 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
 %patch0
+%patch2 -p1 -b .fix-build
 
 # upstream patches
 
 # do the no-rpath hack last, after the upstream backports (if any)
-%patch2 -p1 -b .no-rpath
+%patch1 -p1 -b .no-rpath
 sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
 
 
@@ -544,10 +548,13 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
+- fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
+
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - respin
 
-* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+* Tue Dec 01 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 
 * Thu Nov 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.4.svn1048496



From kkofler at fedoraproject.org  Fri Dec 11 23:46:01 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 11 Dec 2009 23:46:01 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.80-fix-libloscript-link.patch, NONE,
	1.1 kdegames.spec, 1.155, 1.156
Message-ID: <20091211234601.972EF11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13848/devel

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.80-fix-libloscript-link.patch 
Log Message:
* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
- fix liblogine and libloscript to link (upstream patches)
- update description to list new games

kdegames-4.3.80-fix-libloscript-link.patch:
 CMakeLists.txt        |    5 ++---
 script/CMakeLists.txt |    5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE kdegames-4.3.80-fix-libloscript-link.patch ---
Index: ksudoku/engine/script/CMakeLists.txt
===================================================================
--- ksudoku/engine/script/CMakeLists.txt	(revision 1058758)
+++ ksudoku/engine/script/CMakeLists.txt	(revision 1058759)
@@ -1,6 +1,8 @@
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
+	${QT_QTCORE_INCLUDE_DIR}
+	${QT_QTSCRIPT_INCLUDE_DIR}
 )
 
 set(loscript_SRCS
@@ -17,8 +19,9 @@
 
 qt4_automoc(${loscript_SRCS})
 
-add_library(loscript ${loscript_SRCS})
+kde4_add_library(loscript STATIC ${loscript_SRCS})
 
 target_link_libraries(loscript
 	logine
+	${QT_QTSCRIPT_LIBRARY}
 )
Index: ksudoku/engine/CMakeLists.txt
===================================================================
--- ksudoku/engine/CMakeLists.txt	(revision 1058758)
+++ ksudoku/engine/CMakeLists.txt	(revision 1058759)
@@ -1,6 +1,7 @@
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
+	${QT_QTCORE_INCLUDE_DIR}
 )
 
 set(liblogine_SRCS
@@ -21,12 +22,10 @@
 
 qt4_automoc(${liblogine_SRCS})
 
-add_library(logine ${liblogine_SRCS})
+kde4_add_library(logine STATIC ${liblogine_SRCS})
 
 target_link_libraries(logine
-	${QT_LIBRARIES}
 	${QT_QTCORE_LIBRARY}
-	${QT_QTSCRIPT_LIBRARY}
 )
 
 add_subdirectory(script)


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kdegames.spec	11 Dec 2009 22:57:09 -0000	1.155
+++ kdegames.spec	11 Dec 2009 23:46:00 -0000	1.156
@@ -19,9 +19,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # more, but don't use "Tron" in them! -- Kevin
 Patch0: kdegames-4.3.80-trademarks.patch
 
-# upstream patch from 4.4 trunk (Nicolas L?cureuil)
-# fix liblogine to link: http://websvn.kde.org/?view=revision&revision=1058294
+# upstream patches from 4.4 trunk
+# fix liblogine to link (Nicolas L?cureuil):
+# http://websvn.kde.org/?view=revision&revision=1058294
 Patch100: kdegames-4.3.80-fix-liblogine-link.patch
+# make liblogine and libloscript static, fixes libloscript to link (Funda Wang)
+# http://websvn.kde.org/?view=revision&revision=1058759
+Patch101: kdegames-4.3.80-fix-libloscript-link.patch
 
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
@@ -53,6 +57,7 @@ Requires(preun): ggz-client-libs
 Games for the K Desktop Environment 4, including:
 * bomber
 * bovo
+* granatier
 * kapman
 * katomic
 * kblackbox
@@ -62,6 +67,7 @@ Games for the K Desktop Environment 4, i
 * kdiamond
 * kfourinline
 * kgoldrunner
+* kigo
 * killbots
 * kiriki
 * kjumpingcube
@@ -87,6 +93,7 @@ Games for the K Desktop Environment 4, i
 * ktuberling
 * kubrick
 * lskat
+* palapeli
 
 %package libs
 Summary: Runtime libraries for %{name}
@@ -110,6 +117,7 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}%{?alphatag}
 %patch0 -p1 -b .trademarks
 %patch100 -p0 -b .fix-liblogine-link
+%patch101 -p0 -b .fix-libloscript-link
 
 %build
 # trademarks issue in RHEL
@@ -141,6 +149,9 @@ install -m644 -p -D ./kreversi/module.ds
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
 %endif
 
+# don't ship internal static libraries
+rm -f %{buildroot}%{_kde4_libdir}/liblo{gine,script}.a
+
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -221,9 +232,6 @@ rm -rf %{buildroot}
 %else
 %{_ggz_configdir}/ggz.modules.d/kdegames
 %endif
-# unversioned libraries
-%{_kde4_libdir}/liblogine.so
-%{_kde4_libdir}/libloscript.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -235,15 +243,12 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-# unversioned libraries
-%exclude %{_kde4_libdir}/liblogine.so
-%exclude %{_kde4_libdir}/libloscript.so
 
 
 %changelog
 * Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
-- fix liblogine to link (upstream patch)
-- fix file list for unversioned internal liblogine.so and libloscript.so libs
+- fix liblogine and libloscript to link (upstream patches)
+- update description to list new games
 
 * Tue Dec 01 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)



From kkofler at fedoraproject.org  Sat Dec 12 00:03:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Dec 2009 00:03:03 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch, 1.1,
	1.2 kdebindings.spec, 1.270, 1.271
Message-ID: <20091212000303.C6E4211C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20202/devel

Modified Files:
	kdebindings-4.3.80-fix-build.patch kdebindings.spec 
Log Message:
* Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
- fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
- fix the PyKDE4 Akonadi bindings to build

kdebindings-4.3.80-fix-build.patch:
 python/pykde4/sip/akonadi/agentfilterproxymodel.sip |    6 ------
 python/pykde4/sip/akonadi/preprocessorbase.sip      |    6 ------
 smoke/nepomuk/smokeconfig.xml                       |    1 +
 3 files changed, 1 insertion(+), 12 deletions(-)

Index: kdebindings-4.3.80-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-fix-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebindings-4.3.80-fix-build.patch	11 Dec 2009 23:22:57 -0000	1.1
+++ kdebindings-4.3.80-fix-build.patch	12 Dec 2009 00:03:03 -0000	1.2
@@ -1,3 +1,63 @@
+diff -ur kdebindings-4.3.80/python/pykde4/sip/akonadi/agentfilterproxymodel.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/akonadi/agentfilterproxymodel.sip
+--- kdebindings-4.3.80/python/pykde4/sip/akonadi/agentfilterproxymodel.sip	2009-12-04 09:28:47.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/akonadi/agentfilterproxymodel.sip	2009-12-12 00:59:18.000000000 +0100
+@@ -136,8 +136,6 @@
+         sipType = sipType_Akonadi_ServerManager;
+     else if (dynamic_cast<Akonadi::Session*>(sipCpp))
+         sipType = sipType_Akonadi_Session;
+-    else if (dynamic_cast<Akonadi::SpecialCollections*>(sipCpp))
+-        sipType = sipType_Akonadi_SpecialCollections;
+     else if (dynamic_cast<Akonadi::StandardActionManager*>(sipCpp))
+         sipType = sipType_Akonadi_StandardActionManager;
+     else if (dynamic_cast<Akonadi::AgentInstanceCreateJob*>(sipCpp))
+@@ -192,8 +190,6 @@
+         else if (dynamic_cast<Akonadi::TransactionSequence*>(sipCpp))
+             {
+             sipType = sipType_Akonadi_TransactionSequence;
+-            if (dynamic_cast<Akonadi::SpecialCollectionsRequestJob*>(sipCpp))
+-                sipType = sipType_Akonadi_SpecialCollectionsRequestJob;
+             }
+         else if (dynamic_cast<Akonadi::UnlinkJob*>(sipCpp))
+             sipType = sipType_Akonadi_UnlinkJob;
+@@ -226,8 +222,6 @@
+         sipType = sipType_Akonadi_CollectionFilterProxyModel;
+     else if (dynamic_cast<Akonadi::EntityMimeTypeFilterModel*>(sipCpp))
+         sipType = sipType_Akonadi_EntityMimeTypeFilterModel;
+-    else if (dynamic_cast<Akonadi::EntityRightsFilterModel*>(sipCpp))
+-        sipType = sipType_Akonadi_EntityRightsFilterModel;
+     else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
+         sipType = sipType_Akonadi_StatisticsProxyModel;
+     else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
+diff -ur kdebindings-4.3.80/python/pykde4/sip/akonadi/preprocessorbase.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/akonadi/preprocessorbase.sip
+--- kdebindings-4.3.80/python/pykde4/sip/akonadi/preprocessorbase.sip	2009-12-04 09:28:47.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/akonadi/preprocessorbase.sip	2009-12-12 01:00:08.000000000 +0100
+@@ -68,8 +68,6 @@
+         sipClass = sipClass_Akonadi_ServerManager;
+     else if (dynamic_cast<Akonadi::Session*>(sipCpp))
+         sipClass = sipClass_Akonadi_Session;
+-    else if (dynamic_cast<Akonadi::SpecialCollections*>(sipCpp))
+-        sipClass = sipClass_Akonadi_SpecialCollections;
+     else if (dynamic_cast<Akonadi::StandardActionManager*>(sipCpp))
+         sipClass = sipClass_Akonadi_StandardActionManager;
+     else if (dynamic_cast<Akonadi::AgentInstanceCreateJob*>(sipCpp))
+@@ -124,8 +122,6 @@
+         else if (dynamic_cast<Akonadi::TransactionSequence*>(sipCpp))
+             {
+             sipClass = sipClass_Akonadi_TransactionSequence;
+-            if (dynamic_cast<Akonadi::SpecialCollectionsRequestJob*>(sipCpp))
+-                sipClass = sipClass_Akonadi_SpecialCollectionsRequestJob;
+             }
+         else if (dynamic_cast<Akonadi::UnlinkJob*>(sipCpp))
+             sipClass = sipClass_Akonadi_UnlinkJob;
+@@ -152,8 +148,6 @@
+         sipClass = sipClass_Akonadi_CollectionFilterProxyModel;
+     else if (dynamic_cast<Akonadi::EntityMimeTypeFilterModel*>(sipCpp))
+         sipClass = sipClass_Akonadi_EntityMimeTypeFilterModel;
+-    else if (dynamic_cast<Akonadi::EntityRightsFilterModel*>(sipCpp))
+-        sipClass = sipClass_Akonadi_EntityRightsFilterModel;
+     else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
+         sipClass = sipClass_Akonadi_StatisticsProxyModel;
+     else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
 diff -ur kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml
 --- kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml	2009-11-21 10:43:27.000000000 +0100
 +++ kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml	2009-12-12 00:17:57.000000000 +0100


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- kdebindings.spec	11 Dec 2009 23:22:57 -0000	1.270
+++ kdebindings.spec	12 Dec 2009 00:03:03 -0000	1.271
@@ -70,6 +70,7 @@ Patch0:  kdebindings-qyoto-examples.patc
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 # fix the NepomukSmoke build by blacklisting
 # Nepomuk::ResourceManager::generateUniqueUri
+# also fix the PyKDE4 Akonadi bindings to build
 Patch2:  kdebindings-4.3.80-fix-build.patch
 
 ## upstream patches
@@ -548,8 +549,9 @@ fi
 
 
 %changelog
-* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
+* Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
+- fix the PyKDE4 Akonadi bindings to build
 
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - respin



From bpepple at fedoraproject.org  Sat Dec 12 00:04:48 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 12 Dec 2009 00:04:48 +0000 (UTC)
Subject: File freeciv-2.1.10.tar.bz2 uploaded to lookaside cache by bpepple
Message-ID: <20091212000448.6DB5010F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for freeciv:

a2aa9b247d7f1581eff9e66786f4f747  freeciv-2.1.10.tar.bz2



From kkofler at fedoraproject.org  Sat Dec 12 00:15:14 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Dec 2009 00:15:14 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.156,1.157
Message-ID: <20091212001514.D740311C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24749/devel

Modified Files:
	kdegames.spec 
Log Message:
- update file lists and scriptlets for Palapeli


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- kdegames.spec	11 Dec 2009 23:46:00 -0000	1.156
+++ kdegames.spec	12 Dec 2009 00:15:14 -0000	1.157
@@ -170,6 +170,7 @@ done
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
@@ -178,6 +179,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
@@ -223,10 +225,15 @@ rm -rf %{buildroot}
 %if 0%{?fedora}
 %{_kde4_datadir}/kde4/services/kbattleship.protocol
 %endif
+%{_kde4_datadir}/kde4/services/ServiceMenus/palapeli_servicemenu.desktop
+%{_kde4_datadir}/kde4/services/pala*.desktop
+%{_kde4_datadir}/kde4/servicetypes/libpala-slicerplugin.desktop
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_libdir}/kde4/pala*.so
+%{_datadir}/mime/packages/palapeli-mimetypes.xml
 %if 0%{?_skip_ggzconfig:1}
 %{_ggz_datadir}/*.dsc
 %else
@@ -243,12 +250,15 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
+%dir %{_kde4_libdir}/libpala/
+%{_kde4_libdir}/libpala/*.cmake
 
 
 %changelog
-* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
+* Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
 - fix liblogine and libloscript to link (upstream patches)
 - update description to list new games
+- update file lists and scriptlets for Palapeli
 
 * Tue Dec 01 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)



From robert at fedoraproject.org  Sat Dec 12 00:15:19 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 12 Dec 2009 00:15:19 +0000 (UTC)
Subject: rpms/libICE/devel libICE.spec,1.31,1.32
Message-ID: <20091212001519.68BC511C00C5@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libICE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24774

Modified Files:
	libICE.spec 
Log Message:
Own the /usr/include/X11/ICE directory including its content



Index: libICE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libICE.spec	28 Aug 2009 06:06:53 -0000	1.31
+++ libICE.spec	12 Dec 2009 00:15:19 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: X.Org X11 ICE runtime library
 Name: libICE
 Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -55,11 +55,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/X11/ICE/*.h
+%{_includedir}/X11/ICE
 %{_libdir}/libICE.so
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Sat Dec 12 2009 Robert Scheck <robert at fedoraproject.org> 1.0.6-2
+- Own the /usr/include/X11/ICE directory including its content
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.6-1
 - libICE 1.0.6
 



From bpepple at fedoraproject.org  Sat Dec 12 00:20:48 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 12 Dec 2009 00:20:48 +0000 (UTC)
Subject: rpms/freeciv/devel .cvsignore, 1.22, 1.23 freeciv.spec, 1.47,
	1.48 sources, 1.22, 1.23
Message-ID: <20091212002048.8368E11C03E3@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/freeciv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26975

Modified Files:
	.cvsignore freeciv.spec sources 
Log Message:
* Fri Dec 11 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1.10-1
- Update to 2.1.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	5 Apr 2009 20:05:05 -0000	1.22
+++ .cvsignore	12 Dec 2009 00:20:48 -0000	1.23
@@ -1 +1 @@
-freeciv-2.1.9.tar.bz2
+freeciv-2.1.10.tar.bz2


Index: freeciv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- freeciv.spec	24 Jul 2009 23:06:01 -0000	1.47
+++ freeciv.spec	12 Dec 2009 00:20:48 -0000	1.48
@@ -4,8 +4,8 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(%{_ggz_config} --datadir >& /dev/null ||:)}
 
 Name:           freeciv
-Version:        2.1.9
-Release:        2%{?dist}
+Version:        2.1.10
+Release:        1%{?dist}
 Summary:        A multi-player strategy game
 
 Group:          Amusements/Games
@@ -111,6 +111,9 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1.10-1
+- Update to 2.1.10.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	5 Apr 2009 20:05:05 -0000	1.22
+++ sources	12 Dec 2009 00:20:48 -0000	1.23
@@ -1 +1 @@
-caffaa201b2f5dfdfe00b6e6c3f32fb1  freeciv-2.1.9.tar.bz2
+a2aa9b247d7f1581eff9e66786f4f747  freeciv-2.1.10.tar.bz2



From robert at fedoraproject.org  Sat Dec 12 00:22:26 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 12 Dec 2009 00:22:26 +0000 (UTC)
Subject: rpms/libXext/devel libXext-1.1-XAllocID.patch, NONE,
	1.1 libXext-1.1-event_vec-smash.patch, NONE, 1.1 libXext.spec,
	1.30, 1.31
Message-ID: <20091212002226.482AD11C00C5@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libXext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27392

Modified Files:
	libXext.spec 
Added Files:
	libXext-1.1-XAllocID.patch libXext-1.1-event_vec-smash.patch 
Log Message:
- libXext-1.1-XAllocID.patch: call XAllocID with the display lock held.
- libXext-1.1-event_vec-smash.patch: don't smash the event processing vector if the server has an older extension version than the client.


libXext-1.1-XAllocID.patch:
 XShm.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libXext-1.1-XAllocID.patch ---
>From 956fd30e1046e5779ac0b6c07ec4f0e87250869a Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey at minilop.net>
Date: Wed, 7 Oct 2009 19:31:21 -0700
Subject: [PATCH] XAllocID must only be called with the Display lock held.

This patch makes XShmAttach follow the same XID allocation pattern used in
other stubs, such as XShmCreatePixmap.

Reported-by: <fdsteve at ihug.co.nz>
Signed-off-by: Jamey Sharp <jamey at minilop.net>
---
 src/XShm.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/XShm.c b/src/XShm.c
index 922b4cb..38efa9f 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -235,12 +235,11 @@ Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo)
 
     ShmCheckExtension (dpy, info, 0);
 
-    shminfo->shmseg = XAllocID(dpy);
     LockDisplay(dpy);
     GetReq(ShmAttach, req);
     req->reqType = info->codes->major_opcode;
     req->shmReqType = X_ShmAttach;
-    req->shmseg = shminfo->shmseg;
+    req->shmseg = shminfo->shmseg = XAllocID(dpy);
     req->shmid = shminfo->shmid;
     req->readOnly = shminfo->readOnly ? xTrue : xFalse;
     UnlockDisplay(dpy);
-- 
1.6.5.2


libXext-1.1-event_vec-smash.patch:
 extutil.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

--- NEW FILE libXext-1.1-event_vec-smash.patch ---
>From 83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 26 Nov 2009 09:38:31 +1000
Subject: [PATCH] Don't smash the event_vec if num_events differs between lib and server.

If the library extension thinks there's more events to an extension than the
server actually has, the event_vec for the overlapping range can get
overwritten. This depends on the initialization order of the libraries.

Reported-by: Nathan Kidd
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Julien Cristau <jcristau at debian.org>
---
 src/extutil.c |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/src/extutil.c b/src/extutil.c
index 8f4923a..a8f4d5d 100644
--- a/src/extutil.c
+++ b/src/extutil.c
@@ -103,6 +103,7 @@ XExtDisplayInfo *XextAddDisplay (
     int nevents,
     XPointer data)
 {
+    static unsigned char ext_handlers[64] = {0};
     XExtDisplayInfo *dpyinfo;
 
     dpyinfo = (XExtDisplayInfo *) Xmalloc (sizeof (XExtDisplayInfo));
@@ -117,10 +118,54 @@ XExtDisplayInfo *XextAddDisplay (
      */
     if (dpyinfo->codes) {
 	int i, j;
+	int idx = dpyinfo->codes->first_event & 0x3f;
+
+
+	/* Xlib extensions use compiled in event numbers. A new library
+	 * against an older server may thus expect a different (higher)
+	 * number of events than the server will send. We have no way of
+	 * knowing the number of events for an extension, the server won't
+	 * tell us.
+	 *
+	 * Depending on the extension initialization order, this smashes the
+	 * event_vec[type] for anything after the extension with the
+	 * different number of events.
+	 *
+	 * e.g. server with inputproto 1.3 expects 15 events, libXi with
+	 * inputproto 2.0 expects 17 events.
+	 * base code is 80, events [80,96] are handled by libXi. events [95,
+	 * 96] belong to the next extension already though.
+	 * This requires XI to be initialized after the extension occupying
+	 * the next range of event codes.
+	 *
+	 * To avoid this, we have a zeroed out array of extension handlers.
+	 * If an extension handler for an event type is already set, and the
+	 * previous event code (before base_code) is the same extension, we
+	 * have the nevents conflict. Unset all those handlers and allow
+	 * overwriting them with the new handlers.
+	 *
+	 * If a handler for a (base + n) event is already set, stop
+	 * registering this extension for the event codes.
+	 *
+	 * event_codes are subtracted by 64 since we don't need to worry
+	 * about core.
+	 */
+
+	if (idx && ext_handlers[idx - 1] == ext_handlers[idx]) {
+	    for (i = idx; i < 64; i++) {
+		if (ext_handlers[idx - 1] == ext_handlers[i])
+		    ext_handlers[i] = 0;
+		else
+		    break;
+	    }
+	}
 
-	for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++) {
+	for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++, idx++) {
+	    if (ext_handlers[idx]) /* don't smash the following extension */
+		break;
 	    XESetWireToEvent (dpy, j, hooks->wire_to_event);
 	    XESetEventToWire (dpy, j, hooks->event_to_wire);
+	    ext_handlers[idx] = dpyinfo->codes->first_event & 0x3f;
 	}
 
         /* register extension for XGE */
-- 
1.6.5.2



Index: libXext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libXext.spec	6 Oct 2009 17:00:32 -0000	1.30
+++ libXext.spec	12 Dec 2009 00:22:26 -0000	1.31
@@ -1,13 +1,17 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 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
+# From upstream, drop if updating to 1.1.1
+Patch1: libXext-1.1-XAllocID.patch
+# From upstream
+Patch2: libXext-1.1-event_vec-smash.patch
 
 BuildRequires: xorg-x11-proto-devel >= 7.4-23
 BuildRequires: libX11-devel
@@ -33,6 +37,8 @@ X.Org X11 libXext development package
 
 %prep
 %setup -q
+%patch1 -p1 
+%patch2 -p1 
 
 %build
 %configure --disable-static
@@ -85,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Dec 12 2009 Robert Scheck <robert at fedoraproject.org> 1.1-2
+- libXext-1.1-XAllocID.patch: call XAllocID with the display lock held.
+- libXext-1.1-event_vec-smash.patch: don't smash the event processing vector
+  if the server has an older extension version than the client.
+
 * Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
 - libXext 1.1
 



From cwickert at fedoraproject.org  Sat Dec 12 00:24:39 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 12 Dec 2009 00:24:39 +0000 (UTC)
Subject: rpms/lxde-common/devel lxde-common-0.5.0-fix-session-startup.patch, 
	NONE, 1.1 lxde-common-0.5.0-pulseaudio.patch, NONE,
	1.1 lxde-common-0.5.0-vendor.patch, NONE, 1.1 lxde-common.spec,
	1.14, 1.15 lxde-lock-screen.desktop, 1.1,
	1.2 lxde-common-0.3.2.1-gdm-number-of-desktops.patch, 1.2,
	NONE lxde-common-0.4-lxde-logout.desktop.patch, 1.2,
	NONE lxde-common-0.4-pulseaudio.patch, 1.1, NONE
Message-ID: <20091212002439.512C811C00C5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28439

Modified Files:
	lxde-common.spec lxde-lock-screen.desktop 
Added Files:
	lxde-common-0.5.0-fix-session-startup.patch 
	lxde-common-0.5.0-pulseaudio.patch 
	lxde-common-0.5.0-vendor.patch 
Removed Files:
	lxde-common-0.3.2.1-gdm-number-of-desktops.patch 
	lxde-common-0.4-lxde-logout.desktop.patch 
	lxde-common-0.4-pulseaudio.patch 
Log Message:
* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-1
- Update to 0.5.0


lxde-common-0.5.0-fix-session-startup.patch:
 startlxde.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lxde-common-0.5.0-fix-session-startup.patch ---
--- trunk/lxde-common/startlxde.in	2009/09/03 00:34:22	1964
+++ trunk/lxde-common/startlxde.in	2009/12/10 18:54:36	2187
@@ -25,4 +25,4 @@
 export SAL_USE_VCLPLUGIN=gtk
 
 # Start the LXDE session
-exec @prefix@/bin/lxsession -s LXDE
+exec @prefix@/bin/lxsession -s LXDE -e LXDE

lxde-common-0.5.0-pulseaudio.patch:
 autostart |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE lxde-common-0.5.0-pulseaudio.patch ---
--- lxde-common-0.5.0/autostart.orig	2009-12-11 02:15:10.000000000 +0100
+++ lxde-common-0.5.0/autostart	2009-12-11 02:16:33.000000000 +0100
@@ -1,3 +1,4 @@
- at xscreensaver -no-splash
 @lxpanel --profile LXDE
 @pcmanfm -d
+ at xscreensaver -no-splash
+ at pulseaudio -D

lxde-common-0.5.0-vendor.patch:
 desktop.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lxde-common-0.5.0-vendor.patch ---
--- lxde-common-0.5.0/desktop.conf.orig	2009-12-12 00:07:25.000000000 +0100
+++ lxde-common-0.5.0/desktop.conf	2009-12-12 00:07:59.000000000 +0100
@@ -3,7 +3,7 @@
 
 [GTK]
 sNet/ThemeName=Clearlooks
-sNet/IconThemeName=nuoveXT2
+sNet/IconThemeName=Fedora
 sGtk/FontName=Sans 10
 iGtk/ToolbarStyle=3
 iGtk/ButtonImages=1


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- lxde-common.spec	26 Oct 2009 23:42:43 -0000	1.14
+++ lxde-common.spec	12 Dec 2009 00:24:39 -0000	1.15
@@ -1,31 +1,29 @@
 # Review: https://bugzilla.redhat.com/show_bug.cgi?id=442270
 
 Name:           lxde-common
-Version:        0.4.2
-Release:        2%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 Source1:        lxde-lock-screen.desktop
-# fix lxde-logout.desktop
-Patch6:         %{name}-0.4-lxde-logout.desktop.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde/trunk/lxde-common/startlxde.in?r1=1964&r2=2187
+Patch0:         lxde-common-0.5.0-fix-session-startup.patch
 # Distro specific patches
 Patch10:        %{name}-0.3.2.1-pcmanfm-config.patch
 Patch11:        %{name}-0.4-lxpanel-config.patch
 Patch12:        %{name}-0.4-openbox-menu.patch
 Patch13:        %{name}-0.3.2.1-logout-banner.patch
-Patch14:        %{name}-0.4-olpc-keyboard-shortcuts.patch
-# Pulseaudio
-Patch4:         %{name}-0.4-pulseaudio.patch
-# Because of new gdm, committed to upstream SVN
-Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
+Patch14:        %{name}-0.5.0-pulseaudio.patch
+Patch15:        %{name}-0.5.0-vendor.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-Requires:       lxsession lxpanel pcmanfm openbox xdg-utils 
+Requires:       lxsession >= 0.4.0
+Requires:       lxpanel pcmanfm openbox xdg-utils 
 Requires:       lxmenu-data lxde-settings-daemon
 # Use vendor's artwork
 Requires:       system-logos
@@ -33,7 +31,7 @@ Requires:       system-logos
 Requires:       desktop-backgrounds-basic
 %else
 Requires:       desktop-backgrounds-compat
-# needed for new gdm fix
+# needed because of new gdm
 Requires:       xorg-x11-utils
 %endif
 Obsoletes:      %{name}-data <= 0.3.2.1-5
@@ -50,17 +48,13 @@ Desktop Environment.
 
 %prep
 %setup -q
+%patch0 -p2 -b .session-startup
 %patch10 -p1 -b .orig
 %patch11 -p1 -b .orig
 %patch12 -p1 -b .orig
 %patch13 -p1 -b .logout-banner
-#%patch14 -p1 -b .olpc
-%patch4 -p1 -b .pulseaudio
-%patch6 -p1 -b .desktop
-%if 0%{?fedora} > 8
-%patch5 -p1 -b .gdm-desktops
-%endif
-
+%patch14 -p1 -b .pulseaudio
+%patch15 -p1 -b .vendor
 
 %build
 %configure
@@ -70,13 +64,12 @@ Desktop Environment.
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 desktop-file-install                                           \
+      --remove-key=Encoding                                    \
       --dir=%{buildroot}%{_datadir}/applications               \
       lxde-logout.desktop
 desktop-file-install                                           \
       --dir=%{buildroot}%{_datadir}/applications               \
       %{SOURCE1}
-# the icon theme is packaged in a different package
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/
 
 
 %clean
@@ -88,11 +81,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING
 %dir %{_sysconfdir}/xdg/lxsession/LXDE/
 %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart
-%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config
+%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/desktop.conf
 %{_bindir}/startlxde
 %{_bindir}/lxde-logout
 %{_bindir}/openbox-lxde
-%{_datadir}/lxde/*
+%{_datadir}/lxde/
 %{_datadir}/lxpanel/profile/LXDE/
 %{_mandir}/man1/*.1.gz
 %{_datadir}/xsessions/LXDE.desktop
@@ -100,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0
+
 * Tue Oct 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
 - Final tweaks for the LXDE Spin
 


Index: lxde-lock-screen.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-lock-screen.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-lock-screen.desktop	13 Jun 2009 17:52:30 -0000	1.1
+++ lxde-lock-screen.desktop	12 Dec 2009 00:24:39 -0000	1.2
@@ -1,6 +1,4 @@
-
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Name=Lock Screen
 Name[de_DE]=Bildschirm sperren


--- lxde-common-0.3.2.1-gdm-number-of-desktops.patch DELETED ---


--- lxde-common-0.4-lxde-logout.desktop.patch DELETED ---


--- lxde-common-0.4-pulseaudio.patch DELETED ---



From cwickert at fedoraproject.org  Sat Dec 12 00:29:27 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 12 Dec 2009 00:29:27 +0000 (UTC)
Subject: File lxde-common-0.5.0.tar.gz uploaded to lookaside cache by
	cwickert
Message-ID: <20091212002927.F2D6A10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lxde-common:

23606ab3d6e1039386d62a4b68b4ffc6  lxde-common-0.5.0.tar.gz



From bpepple at fedoraproject.org  Sat Dec 12 00:32:50 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 12 Dec 2009 00:32:50 +0000 (UTC)
Subject: rpms/freeciv/F-12 .cvsignore, 1.22, 1.23 freeciv.spec, 1.47,
	1.48 sources, 1.22, 1.23
Message-ID: <20091212003250.5720711C00C5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/freeciv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31674

Modified Files:
	.cvsignore freeciv.spec sources 
Log Message:
* Fri Dec 11 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1.10-1
- Update to 2.1.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	5 Apr 2009 20:05:05 -0000	1.22
+++ .cvsignore	12 Dec 2009 00:32:49 -0000	1.23
@@ -1 +1 @@
-freeciv-2.1.9.tar.bz2
+freeciv-2.1.10.tar.bz2


Index: freeciv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-12/freeciv.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- freeciv.spec	24 Jul 2009 23:06:01 -0000	1.47
+++ freeciv.spec	12 Dec 2009 00:32:50 -0000	1.48
@@ -4,8 +4,8 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(%{_ggz_config} --datadir >& /dev/null ||:)}
 
 Name:           freeciv
-Version:        2.1.9
-Release:        2%{?dist}
+Version:        2.1.10
+Release:        1%{?dist}
 Summary:        A multi-player strategy game
 
 Group:          Amusements/Games
@@ -111,6 +111,9 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.1.10-1
+- Update to 2.1.10.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	5 Apr 2009 20:05:05 -0000	1.22
+++ sources	12 Dec 2009 00:32:50 -0000	1.23
@@ -1 +1 @@
-caffaa201b2f5dfdfe00b6e6c3f32fb1  freeciv-2.1.9.tar.bz2
+a2aa9b247d7f1581eff9e66786f4f747  freeciv-2.1.10.tar.bz2



From cwickert at fedoraproject.org  Sat Dec 12 00:36:26 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 12 Dec 2009 00:36:26 +0000 (UTC)
Subject: rpms/lxde-common/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20091212003626.6671311C00C5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv638

Modified Files:
	.cvsignore sources 
Log Message:
upload new source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Jul 2009 02:02:12 -0000	1.5
+++ .cvsignore	12 Dec 2009 00:36:26 -0000	1.6
@@ -1 +1 @@
-lxde-common-0.4.2.tar.bz2
+lxde-common-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Jul 2009 02:02:13 -0000	1.5
+++ sources	12 Dec 2009 00:36:26 -0000	1.6
@@ -1 +1 @@
-81978c149ef7f349d904c4796d623ee6  lxde-common-0.4.2.tar.bz2
+23606ab3d6e1039386d62a4b68b4ffc6  lxde-common-0.5.0.tar.gz



From kkofler at fedoraproject.org  Sat Dec 12 00:43:40 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Dec 2009 00:43:40 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch, 1.2,
	1.3 kdebindings.spec, 1.271, 1.272
Message-ID: <20091212004340.3B8DD11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3184/devel

Modified Files:
	kdebindings-4.3.80-fix-build.patch kdebindings.spec 
Log Message:
Fix the PyKDE4 kdeui bindings to build.

kdebindings-4.3.80-fix-build.patch:
 python/pykde4/sip/akonadi/agentfilterproxymodel.sip   |    6 ------
 python/pykde4/sip/akonadi/preprocessorbase.sip        |    6 ------
 python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip |    6 ------
 smoke/nepomuk/smokeconfig.xml                         |    1 +
 4 files changed, 1 insertion(+), 18 deletions(-)

Index: kdebindings-4.3.80-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-fix-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdebindings-4.3.80-fix-build.patch	12 Dec 2009 00:03:03 -0000	1.2
+++ kdebindings-4.3.80-fix-build.patch	12 Dec 2009 00:43:39 -0000	1.3
@@ -58,6 +58,40 @@ diff -ur kdebindings-4.3.80/python/pykde
      else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
          sipClass = sipClass_Akonadi_StatisticsProxyModel;
      else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
+diff -ur kdebindings-4.3.80/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip
+--- kdebindings-4.3.80/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip	2009-11-21 10:43:24.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip	2009-12-12 01:40:23.000000000 +0100
+@@ -63,7 +63,6 @@
+ #include <kdatetable.h>
+ #include <kdatetimewidget.h>
+ #include <kdatewidget.h>
+-#include <kdescendantsproxymodel.h>
+ #include <kdialog.h>
+ #include <kdialogbuttonbox.h>
+ #include <kdialogjobuidelegate.h>
+@@ -136,7 +135,6 @@
+ #include <kshortcutsdialog.h>
+ #include <kshortcutseditor.h>
+ #include <kshortcutwidget.h>
+-#include <ksortfilterproxymodel.h>
+ #include <ksplashscreen.h>
+ #include <ksqueezedtextlabel.h>
+ #include <kstartupinfo.h>
+@@ -289,14 +287,10 @@
+         if (dynamic_cast<KPageWidgetModel*>(sipCpp))
+             sipType = sipType_KPageWidgetModel;
+         }
+-    else if (dynamic_cast<KDescendantsProxyModel*>(sipCpp))
+-        sipType = sipType_KDescendantsProxyModel;
+     else if (dynamic_cast<KSelectionProxyModel*>(sipCpp))
+         sipType = sipType_KSelectionProxyModel;
+     else if (dynamic_cast<KCategorizedSortFilterProxyModel*>(sipCpp))
+         sipType = sipType_KCategorizedSortFilterProxyModel;
+-    else if (dynamic_cast<KSortFilterProxyModel*>(sipCpp))
+-        sipType = sipType_KSortFilterProxyModel;
+     else if (dynamic_cast<KAction*>(sipCpp))
+         {
+         sipType = sipType_KAction;
 diff -ur kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml
 --- kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml	2009-11-21 10:43:27.000000000 +0100
 +++ kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml	2009-12-12 00:17:57.000000000 +0100


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- kdebindings.spec	12 Dec 2009 00:03:03 -0000	1.271
+++ kdebindings.spec	12 Dec 2009 00:43:39 -0000	1.272
@@ -70,7 +70,7 @@ Patch0:  kdebindings-qyoto-examples.patc
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 # fix the NepomukSmoke build by blacklisting
 # Nepomuk::ResourceManager::generateUniqueUri
-# also fix the PyKDE4 Akonadi bindings to build
+# also fix the PyKDE4 Akonadi and kdeui bindings to build
 Patch2:  kdebindings-4.3.80-fix-build.patch
 
 ## upstream patches
@@ -551,7 +551,7 @@ fi
 %changelog
 * Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
-- fix the PyKDE4 Akonadi bindings to build
+- fix the PyKDE4 Akonadi and kdeui bindings to build
 
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - respin



From pbrobinson at fedoraproject.org  Sat Dec 12 00:43:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 12 Dec 2009 00:43:50 +0000 (UTC)
Subject: rpms/libiphone/devel libiphone.spec,1.17,1.18
Message-ID: <20091212004350.A225F11C00C5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3279

Modified Files:
	libiphone.spec 
Log Message:
- Rebuild for libplist .so bump


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libiphone.spec	6 Nov 2009 14:59:40 -0000	1.17
+++ libiphone.spec	12 Dec 2009 00:43:50 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           libiphone
 Version:        0.9.4
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/libiphone/
 
 %changelog
+* Sat Dec 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-3
+- Rebuild for libplist .so bump
+
 * Wed Oct 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-2
 - Update from libusb to libusb1
 



From pbrobinson at fedoraproject.org  Sat Dec 12 00:45:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 12 Dec 2009 00:45:23 +0000 (UTC)
Subject: rpms/ifuse/devel ifuse.spec,1.9,1.10
Message-ID: <20091212004523.D5FE511C00C5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3921

Modified Files:
	ifuse.spec 
Log Message:
- Rebuild for libplist .so bump


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/ifuse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ifuse.spec	29 Oct 2009 13:38:30 -0000	1.9
+++ ifuse.spec	12 Dec 2009 00:45:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          ifuse
 Version:       0.9.4
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -37,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ifuse
 
 %changelog
+* Sat Dev 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-3
+- Rebuild for libplist .so bump
+
 * Wed Oct 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-2
 - Fix included files
 



From pbrobinson at fedoraproject.org  Sat Dec 12 00:46:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 12 Dec 2009 00:46:14 +0000 (UTC)
Subject: rpms/ifuse/devel ifuse.spec,1.10,1.11
Message-ID: <20091212004614.C7F3711C00C5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4231

Modified Files:
	ifuse.spec 
Log Message:
- Rebuild for libplist .so bump


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/ifuse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ifuse.spec	12 Dec 2009 00:45:23 -0000	1.10
+++ ifuse.spec	12 Dec 2009 00:46:14 -0000	1.11
@@ -37,7 +37,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ifuse
 
 %changelog
-* Sat Dev 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-3
+* Sat Dec 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-3
 - Rebuild for libplist .so bump
 
 * Wed Oct 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-2



From kkofler at fedoraproject.org  Sat Dec 12 01:19:48 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Dec 2009 01:19:48 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.80-pykdeui-trunk.patch, NONE,
	1.1 kdebindings-4.3.80-fix-build.patch, 1.3,
	1.4 kdebindings.spec, 1.272, 1.273
Message-ID: <20091212011948.147D411C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15772/devel

Modified Files:
	kdebindings-4.3.80-fix-build.patch kdebindings.spec 
Added Files:
	kdebindings-4.3.80-pykdeui-trunk.patch 
Log Message:
Try upstream backport to fix the PyKDE4 kdeui build.

kdebindings-4.3.80-pykdeui-trunk.patch:
 kabstractwidgetjobtracker.sip |  266 +++++++++++++++++-------------------------
 kactioncollection.sip         |    2 
 kdescendantsproxymodel.sip    |   50 -------
 kdeuimod.sip                  |    2 
 kiconcache.sip                |   12 +
 ksortfilterproxymodel.sip     |   33 -----
 kstatusnotifieritem.sip       |    7 -
 ktimezonewidget.sip           |    5 
 kwallet.sip                   |    2 
 kwindowsystem.sip             |    2 
 netwm.sip                     |    2 
 netwm_def.sip                 |    3 
 12 files changed, 137 insertions(+), 249 deletions(-)

--- NEW FILE kdebindings-4.3.80-pykdeui-trunk.patch ---
Index: python/pykde4/sip/kdeui/kdescendantsproxymodel.sip
===================================================================
--- python/pykde4/sip/kdeui/kdescendantsproxymodel.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/kdescendantsproxymodel.sip	(revision 1060018)
@@ -1,50 +0,0 @@
-// Copyright 2009 Simon Edwards <simon at simonzone.com>
-
-//                 Generated by twine2
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Library General Public License as
-// published by the Free Software Foundation; either version 2, 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 Library 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.
-
-class KDescendantsProxyModel : QAbstractProxyModel
-{
-%TypeHeaderCode
-#include <kdescendantsproxymodel.h>
-%End
-
-public:
-    explicit                KDescendantsProxyModel (QObject* parent /TransferThis/ = 0);
-    virtual ~KDescendantsProxyModel ();
-    virtual void            setSourceModel (QAbstractItemModel* model);
-    void                    setRootIndex (const QModelIndex& index);
-    void                    setDisplayAncestorData (bool display);
-    bool                    displayAncestorData () const;
-    void                    setAncestorSeparator (const QString& separator);
-    QString                 ancestorSeparator () const;
-//FIXME not implemented
-//ig    int                     descendantCount (const QModelIndex& index) const;
-    QModelIndex             mapFromSource (const QModelIndex& sourceIndex) const;
-    QModelIndex             mapToSource (const QModelIndex& proxyIndex) const;
-    virtual Qt::ItemFlags   flags (const QModelIndex& index) const;
-    QVariant                data (const QModelIndex& index, int role = Qt::DisplayRole) const;
-    virtual int             rowCount (const QModelIndex& parent = QModelIndex()) const;
-    virtual QMimeData*      mimeData (const QModelIndexList& indexes) const;
-    virtual QStringList     mimeTypes () const;
-    virtual bool            hasChildren (const QModelIndex& parent = QModelIndex()) const;
-    virtual QModelIndex     index (int, int, const QModelIndex& parent = QModelIndex()) const;
-    virtual QModelIndex     parent (const QModelIndex&) const;
-    virtual int             columnCount (const QModelIndex& index = QModelIndex()) const;
-    virtual Qt::DropActions  supportedDropActions () const;
-    virtual QModelIndexList  match (const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const;
-};
Index: python/pykde4/sip/kdeui/ksortfilterproxymodel.sip
===================================================================
--- python/pykde4/sip/kdeui/ksortfilterproxymodel.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/ksortfilterproxymodel.sip	(revision 1060018)
@@ -1,33 +0,0 @@
-// Copyright 2009 Simon Edwards <simon at simonzone.com>
-
-//                 Generated by twine2
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Library General Public License as
-// published by the Free Software Foundation; either version 2, 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 Library 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.
-
-class KSortFilterProxyModel : QSortFilterProxyModel
-{
-%TypeHeaderCode
-#include <ksortfilterproxymodel.h>
-%End
-
-public:
-                            KSortFilterProxyModel (QObject* parent /TransferThis/ = 0);
-    ~KSortFilterProxyModel ();
-    bool                    showAllChildren () const;
-    void                    setShowAllChildren (bool showAllChildren);
-protected:
-    virtual bool            filterAcceptsRow (int source_row, const QModelIndex& source_parent) const;
-};
Index: python/pykde4/sip/kdeui/netwm.sip
===================================================================
--- python/pykde4/sip/kdeui/netwm.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/netwm.sip	(revision 1060018)
@@ -267,6 +267,8 @@
 //end
 //ig                            NETWinInfo (Display* display, Window window, Window rootWindow, const unsigned long properties [], int properties_size, NET::Role role = NET::Role::Client);
     ~NETWinInfo ();
+    void                    setFrameOverlap (NETStrut strut);
+    NETStrut                frameOverlap () const;
 };
 // NETWinInfo
 
Index: python/pykde4/sip/kdeui/kiconcache.sip
===================================================================
--- python/pykde4/sip/kdeui/kiconcache.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/kiconcache.sip	(revision 1060018)
@@ -46,7 +46,19 @@
     unsigned int            mostRecentMTime (const QSet<QString>& dirNames) const;
 public:
     ~KIconCache ();
+%ConvertToSubClassCode
+    // CTSCC for subclasses of 'KPixmapCache'
+    sipType = NULL;
+
+    if (dynamic_cast<KIconCache*>(sipCpp))
+        sipType = sipType_KIconCache;
+%End
 };
 // KIconCache
 
 
+%ModuleHeaderCode
+//ctscc
+#include <kiconcache.h>
+#include <kpixmapcache.h>
+%End
Index: python/pykde4/sip/kdeui/netwm_def.sip
===================================================================
--- python/pykde4/sip/kdeui/netwm_def.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/netwm_def.sip	(revision 1060018)
@@ -316,7 +316,8 @@
         WM2Opacity,
         WM2DesktopLayout,
         WM2FullPlacement,
-        WM2FullscreenMonitors
+        WM2FullscreenMonitors,
+        WM2FrameOverlap
     };
 
 
Index: python/pykde4/sip/kdeui/ktimezonewidget.sip
===================================================================
--- python/pykde4/sip/kdeui/ktimezonewidget.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/ktimezonewidget.sip	(revision 1060018)
@@ -33,6 +33,11 @@
     void                    setSelected (const QString& zone, bool selected);
     static QString          displayName (const KTimeZone& zone);
     ~KTimeZoneWidget ();
+    void                    setItemsCheckable (bool enable);
+    bool                    itemsCheckable () const;
+    void                    setSelectionMode (QAbstractItemView::SelectionMode mode);
+    QAbstractItemView::SelectionMode  selectionMode () const;
+    void                    clearSelection ();
 };
 // KTimeZoneWidget
 
Index: python/pykde4/sip/kdeui/kactioncollection.sip
===================================================================
--- python/pykde4/sip/kdeui/kactioncollection.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/kactioncollection.sip	(revision 1060018)
@@ -68,7 +68,9 @@
 
 protected:
 //ig    virtual void            connectNotify (const char* signal);
+//force
     virtual void            connectNotify (SIP_SIGNAL);
+//end
     virtual void            slotActionTriggered ();
     virtual void            slotActionHighlighted ();
 
Index: python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip
===================================================================
--- python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip	(revision 1060018)
@@ -63,7 +63,6 @@
 #include <kdatetable.h>
 #include <kdatetimewidget.h>
 #include <kdatewidget.h>
-#include <kdescendantsproxymodel.h>
 #include <kdialog.h>
 #include <kdialogbuttonbox.h>
 #include <kdialogjobuidelegate.h>
@@ -136,7 +135,6 @@
 #include <kshortcutsdialog.h>
 #include <kshortcutseditor.h>
 #include <kshortcutwidget.h>
-#include <ksortfilterproxymodel.h>
 #include <ksplashscreen.h>
 #include <ksqueezedtextlabel.h>
 #include <kstartupinfo.h>
@@ -226,11 +224,9 @@
     else if (dynamic_cast<KConfigSkeleton*>(sipCpp))
         sipType = sipType_KConfigSkeleton;
     else if (dynamic_cast<KFind*>(sipCpp))
-        {
         sipType = sipType_KFind;
-        if (dynamic_cast<KReplace*>(sipCpp))
-            sipType = sipType_KReplace;
-        }
+    else if (dynamic_cast<KReplace*>(sipCpp))
+        sipType = sipType_KReplace;
     else if (dynamic_cast<KGlobalAccel*>(sipCpp))
         sipType = sipType_KGlobalAccel;
     else if (dynamic_cast<KGlobalSettings*>(sipCpp))
@@ -241,14 +237,12 @@
         sipType = sipType_KHelpMenu;
     else if (dynamic_cast<KIconLoader*>(sipCpp))
         sipType = sipType_KIconLoader;
+    else if (dynamic_cast<KStatusBarJobTracker*>(sipCpp))
+        sipType = sipType_KStatusBarJobTracker;
+    else if (dynamic_cast<KWidgetJobTracker*>(sipCpp))
+        sipType = sipType_KWidgetJobTracker;
     else if (dynamic_cast<KAbstractWidgetJobTracker*>(sipCpp))
-        {
         sipType = sipType_KAbstractWidgetJobTracker;
-        if (dynamic_cast<KStatusBarJobTracker*>(sipCpp))
-            sipType = sipType_KStatusBarJobTracker;
-        else if (dynamic_cast<KWidgetJobTracker*>(sipCpp))
-            sipType = sipType_KWidgetJobTracker;
-        }
     else if (dynamic_cast<KUiServerJobTracker*>(sipCpp))
         sipType = sipType_KUiServerJobTracker;
     else if (dynamic_cast<KDialogJobUiDelegate*>(sipCpp))
@@ -284,59 +278,45 @@
     else if (dynamic_cast<KExtendableItemDelegate*>(sipCpp))
         sipType = sipType_KExtendableItemDelegate;
     else if (dynamic_cast<KPageModel*>(sipCpp))
-        {
         sipType = sipType_KPageModel;
-        if (dynamic_cast<KPageWidgetModel*>(sipCpp))
-            sipType = sipType_KPageWidgetModel;
-        }
-    else if (dynamic_cast<KDescendantsProxyModel*>(sipCpp))
-        sipType = sipType_KDescendantsProxyModel;
+    else if (dynamic_cast<KPageWidgetModel*>(sipCpp))
+        sipType = sipType_KPageWidgetModel;
     else if (dynamic_cast<KSelectionProxyModel*>(sipCpp))
         sipType = sipType_KSelectionProxyModel;
     else if (dynamic_cast<KCategorizedSortFilterProxyModel*>(sipCpp))
         sipType = sipType_KCategorizedSortFilterProxyModel;
-    else if (dynamic_cast<KSortFilterProxyModel*>(sipCpp))
-        sipType = sipType_KSortFilterProxyModel;
+    else if (dynamic_cast<KActionMenu*>(sipCpp))
+        sipType = sipType_KActionMenu;
+    else if (dynamic_cast<KPasteTextAction*>(sipCpp))
+        sipType = sipType_KPasteTextAction;
+    else if (dynamic_cast<KCodecAction*>(sipCpp))
+        sipType = sipType_KCodecAction;
+    else if (dynamic_cast<KFontAction*>(sipCpp))
+        sipType = sipType_KFontAction;
+    else if (dynamic_cast<KFontSizeAction*>(sipCpp))
+        sipType = sipType_KFontSizeAction;
+    else if (dynamic_cast<KRecentFilesAction*>(sipCpp))
+        sipType = sipType_KRecentFilesAction;
+    else if (dynamic_cast<KSelectAction*>(sipCpp))
+        sipType = sipType_KSelectAction;
+    else if (dynamic_cast<KToggleAction*>(sipCpp))
+        sipType = sipType_KToggleAction;
+    else if (dynamic_cast<KToggleFullScreenAction*>(sipCpp))
+        sipType = sipType_KToggleFullScreenAction;
+    else if (dynamic_cast<KToggleToolBarAction*>(sipCpp))
+        sipType = sipType_KToggleToolBarAction;
+    else if (dynamic_cast<KToolBarLabelAction*>(sipCpp))
+        sipType = sipType_KToolBarLabelAction;
+    else if (dynamic_cast<KToolBarPopupAction*>(sipCpp))
+        sipType = sipType_KToolBarPopupAction;
+    else if (dynamic_cast<KToolBarSpacerAction*>(sipCpp))
+        sipType = sipType_KToolBarSpacerAction;
     else if (dynamic_cast<KAction*>(sipCpp))
-        {
         sipType = sipType_KAction;
-        if (dynamic_cast<KActionMenu*>(sipCpp))
-            sipType = sipType_KActionMenu;
-        else if (dynamic_cast<KPasteTextAction*>(sipCpp))
-            sipType = sipType_KPasteTextAction;
-        else if (dynamic_cast<KSelectAction*>(sipCpp))
-            {
-            sipType = sipType_KSelectAction;
-            if (dynamic_cast<KCodecAction*>(sipCpp))
-                sipType = sipType_KCodecAction;
-            else if (dynamic_cast<KFontAction*>(sipCpp))
-                sipType = sipType_KFontAction;
-            else if (dynamic_cast<KFontSizeAction*>(sipCpp))
-                sipType = sipType_KFontSizeAction;
-            else if (dynamic_cast<KRecentFilesAction*>(sipCpp))
-                sipType = sipType_KRecentFilesAction;
-            }
-        else if (dynamic_cast<KToggleAction*>(sipCpp))
-            {
-            sipType = sipType_KToggleAction;
-            if (dynamic_cast<KToggleFullScreenAction*>(sipCpp))
-                sipType = sipType_KToggleFullScreenAction;
-            else if (dynamic_cast<KToggleToolBarAction*>(sipCpp))
-                sipType = sipType_KToggleToolBarAction;
-            }
-        else if (dynamic_cast<KToolBarLabelAction*>(sipCpp))
-            sipType = sipType_KToolBarLabelAction;
-        else if (dynamic_cast<KToolBarPopupAction*>(sipCpp))
-            sipType = sipType_KToolBarPopupAction;
-        else if (dynamic_cast<KToolBarSpacerAction*>(sipCpp))
-            sipType = sipType_KToolBarSpacerAction;
-        }
+    else if (dynamic_cast<KUniqueApplication*>(sipCpp))
+        sipType = sipType_KUniqueApplication;
     else if (dynamic_cast<KApplication*>(sipCpp))
-        {
         sipType = sipType_KApplication;
-        if (dynamic_cast<KUniqueApplication*>(sipCpp))
-            sipType = sipType_KUniqueApplication;
-        }
     else if (dynamic_cast<KStyle*>(sipCpp))
         sipType = sipType_KStyle;
     else if (dynamic_cast<KSvgRenderer*>(sipCpp))
@@ -390,19 +370,15 @@
     else if (dynamic_cast<KMultiTabBar*>(sipCpp))
         sipType = sipType_KMultiTabBar;
     else if (dynamic_cast<KNumInput*>(sipCpp))
-        {
         sipType = sipType_KNumInput;
-        if (dynamic_cast<KDoubleNumInput*>(sipCpp))
-            sipType = sipType_KDoubleNumInput;
-        else if (dynamic_cast<KIntNumInput*>(sipCpp))
-            sipType = sipType_KIntNumInput;
-        }
+    else if (dynamic_cast<KDoubleNumInput*>(sipCpp))
+        sipType = sipType_KDoubleNumInput;
+    else if (dynamic_cast<KIntNumInput*>(sipCpp))
+        sipType = sipType_KIntNumInput;
     else if (dynamic_cast<KPageView*>(sipCpp))
-        {
         sipType = sipType_KPageView;
-        if (dynamic_cast<KPageWidget*>(sipCpp))
-            sipType = sipType_KPageWidget;
-        }
+    else if (dynamic_cast<KPageWidget*>(sipCpp))
+        sipType = sipType_KPageWidget;
     else if (dynamic_cast<KPixmapRegionSelectorWidget*>(sipCpp))
         sipType = sipType_KPixmapRegionSelectorWidget;
     else if (dynamic_cast<KPixmapSequenceWidget*>(sipCpp))
@@ -417,94 +393,80 @@
         sipType = sipType_KTreeWidgetSearchLineWidget;
     else if (dynamic_cast<KXMessages*>(sipCpp))
         sipType = sipType_KXMessages;
+    else if (dynamic_cast<KHueSaturationSelector*>(sipCpp))
+        sipType = sipType_KHueSaturationSelector;
     else if (dynamic_cast<KXYSelector*>(sipCpp))
-        {
         sipType = sipType_KXYSelector;
-        if (dynamic_cast<KHueSaturationSelector*>(sipCpp))
-            sipType = sipType_KHueSaturationSelector;
-        }
     else if (dynamic_cast<KArrowButton*>(sipCpp))
         sipType = sipType_KArrowButton;
     else if (dynamic_cast<KColorButton*>(sipCpp))
         sipType = sipType_KColorButton;
+    else if (dynamic_cast<KMultiTabBarTab*>(sipCpp))
+        sipType = sipType_KMultiTabBarTab;
     else if (dynamic_cast<KMultiTabBarButton*>(sipCpp))
-        {
         sipType = sipType_KMultiTabBarButton;
-        if (dynamic_cast<KMultiTabBarTab*>(sipCpp))
-            sipType = sipType_KMultiTabBarTab;
-        }
     else if (dynamic_cast<KPushButton*>(sipCpp))
         sipType = sipType_KPushButton;
     else if (dynamic_cast<KAnimatedButton*>(sipCpp))
         sipType = sipType_KAnimatedButton;
     else if (dynamic_cast<KRuler*>(sipCpp))
         sipType = sipType_KRuler;
+    else if (dynamic_cast<KColorValueSelector*>(sipCpp))
+        sipType = sipType_KColorValueSelector;
+    else if (dynamic_cast<KGradientSelector*>(sipCpp))
+        sipType = sipType_KGradientSelector;
     else if (dynamic_cast<KSelector*>(sipCpp))
-        {
         sipType = sipType_KSelector;
-        if (dynamic_cast<KColorValueSelector*>(sipCpp))
-            sipType = sipType_KColorValueSelector;
-        else if (dynamic_cast<KGradientSelector*>(sipCpp))
-            sipType = sipType_KGradientSelector;
-        }
     else if (dynamic_cast<KIntSpinBox*>(sipCpp))
         sipType = sipType_KIntSpinBox;
     else if (dynamic_cast<KColorCombo*>(sipCpp))
         sipType = sipType_KColorCombo;
+    else if (dynamic_cast<KFontComboBox*>(sipCpp))
+        sipType = sipType_KFontComboBox;
+    else if (dynamic_cast<KHistoryComboBox*>(sipCpp))
+        sipType = sipType_KHistoryComboBox;
+    else if (dynamic_cast<Sonnet::DictionaryComboBox*>(sipCpp))
+        sipType = sipType_Sonnet_DictionaryComboBox;
     else if (dynamic_cast<KComboBox*>(sipCpp))
-        {
         sipType = sipType_KComboBox;
-        if (dynamic_cast<KFontComboBox*>(sipCpp))
-            sipType = sipType_KFontComboBox;
-        else if (dynamic_cast<KHistoryComboBox*>(sipCpp))
-            sipType = sipType_KHistoryComboBox;
-        else if (dynamic_cast<Sonnet::DictionaryComboBox*>(sipCpp))
-            sipType = sipType_Sonnet_DictionaryComboBox;
-        }
     else if (dynamic_cast<KDialog*>(sipCpp))
-        {
         sipType = sipType_KDialog;
-        if (dynamic_cast<KAboutApplicationDialog*>(sipCpp))
-            sipType = sipType_KAboutApplicationDialog;
-        else if (dynamic_cast<KBugReport*>(sipCpp))
-            sipType = sipType_KBugReport;
-        else if (dynamic_cast<KColorDialog*>(sipCpp))
-            sipType = sipType_KColorDialog;
-        else if (dynamic_cast<KEditToolBar*>(sipCpp))
-            sipType = sipType_KEditToolBar;
-        else if (dynamic_cast<KFindDialog*>(sipCpp))
-            {
-            sipType = sipType_KFindDialog;
-            if (dynamic_cast<KReplaceDialog*>(sipCpp))
-                sipType = sipType_KReplaceDialog;
-            }
-        else if (dynamic_cast<KFontDialog*>(sipCpp))
-            sipType = sipType_KFontDialog;
-        else if (dynamic_cast<KNewPasswordDialog*>(sipCpp))
-            sipType = sipType_KNewPasswordDialog;
-        else if (dynamic_cast<KPageDialog*>(sipCpp))
-            {
-            sipType = sipType_KPageDialog;
-            if (dynamic_cast<KAssistantDialog*>(sipCpp))
-                sipType = sipType_KAssistantDialog;
-            else if (dynamic_cast<KConfigDialog*>(sipCpp))
-                sipType = sipType_KConfigDialog;
-            }
-        else if (dynamic_cast<KPasswordDialog*>(sipCpp))
-            sipType = sipType_KPasswordDialog;
-        else if (dynamic_cast<KPixmapRegionSelectorDialog*>(sipCpp))
-            sipType = sipType_KPixmapRegionSelectorDialog;
-        else if (dynamic_cast<KProgressDialog*>(sipCpp))
-            sipType = sipType_KProgressDialog;
-        else if (dynamic_cast<KShortcutsDialog*>(sipCpp))
-            sipType = sipType_KShortcutsDialog;
-        else if (dynamic_cast<KTipDialog*>(sipCpp))
-            sipType = sipType_KTipDialog;
-        else if (dynamic_cast<Sonnet::ConfigDialog*>(sipCpp))
-            sipType = sipType_Sonnet_ConfigDialog;
-        else if (dynamic_cast<Sonnet::Dialog*>(sipCpp))
-            sipType = sipType_Sonnet_Dialog;
-        }
+    else if (dynamic_cast<KAboutApplicationDialog*>(sipCpp))
+        sipType = sipType_KAboutApplicationDialog;
+    else if (dynamic_cast<KBugReport*>(sipCpp))
+        sipType = sipType_KBugReport;
+    else if (dynamic_cast<KColorDialog*>(sipCpp))
+        sipType = sipType_KColorDialog;
+    else if (dynamic_cast<KEditToolBar*>(sipCpp))
+        sipType = sipType_KEditToolBar;
+    else if (dynamic_cast<KFindDialog*>(sipCpp))
+        sipType = sipType_KFindDialog;
+    else if (dynamic_cast<KReplaceDialog*>(sipCpp))
+        sipType = sipType_KReplaceDialog;
+    else if (dynamic_cast<KFontDialog*>(sipCpp))
+        sipType = sipType_KFontDialog;
+    else if (dynamic_cast<KNewPasswordDialog*>(sipCpp))
+        sipType = sipType_KNewPasswordDialog;
+    else if (dynamic_cast<KAssistantDialog*>(sipCpp))
+        sipType = sipType_KAssistantDialog;
+    else if (dynamic_cast<KConfigDialog*>(sipCpp))
+        sipType = sipType_KConfigDialog;
+    else if (dynamic_cast<KPageDialog*>(sipCpp))
+        sipType = sipType_KPageDialog;
+    else if (dynamic_cast<KPasswordDialog*>(sipCpp))
+        sipType = sipType_KPasswordDialog;
+    else if (dynamic_cast<KPixmapRegionSelectorDialog*>(sipCpp))
+        sipType = sipType_KPixmapRegionSelectorDialog;
+    else if (dynamic_cast<KProgressDialog*>(sipCpp))
+        sipType = sipType_KProgressDialog;
+    else if (dynamic_cast<KShortcutsDialog*>(sipCpp))
+        sipType = sipType_KShortcutsDialog;
+    else if (dynamic_cast<KTipDialog*>(sipCpp))
+        sipType = sipType_KTipDialog;
+    else if (dynamic_cast<Sonnet::ConfigDialog*>(sipCpp))
+        sipType = sipType_Sonnet_ConfigDialog;
+    else if (dynamic_cast<Sonnet::Dialog*>(sipCpp))
+        sipType = sipType_Sonnet_Dialog;
     else if (dynamic_cast<KDialogButtonBox*>(sipCpp))
         sipType = sipType_KDialogButtonBox;
     else if (dynamic_cast<KColorPatch*>(sipCpp))
@@ -512,11 +474,9 @@
     else if (dynamic_cast<KDatePicker*>(sipCpp))
         sipType = sipType_KDatePicker;
     else if (dynamic_cast<KHBox*>(sipCpp))
-        {
         sipType = sipType_KHBox;
-        if (dynamic_cast<KVBox*>(sipCpp))
-            sipType = sipType_KVBox;
-        }
+    else if (dynamic_cast<KVBox*>(sipCpp))
+        sipType = sipType_KVBox;
     else if (dynamic_cast<KPassivePopup*>(sipCpp))
         sipType = sipType_KPassivePopup;
     else if (dynamic_cast<KPlotWidget*>(sipCpp))
@@ -528,25 +488,19 @@
     else if (dynamic_cast<KCategorizedView*>(sipCpp))
         sipType = sipType_KCategorizedView;
     else if (dynamic_cast<KListWidget*>(sipCpp))
-        {
         sipType = sipType_KListWidget;
-        if (dynamic_cast<KCompletionBox*>(sipCpp))
-            sipType = sipType_KCompletionBox;
-        }
+    else if (dynamic_cast<KCompletionBox*>(sipCpp))
+        sipType = sipType_KCompletionBox;
     else if (dynamic_cast<KColorCells*>(sipCpp))
         sipType = sipType_KColorCells;
     else if (dynamic_cast<KTimeZoneWidget*>(sipCpp))
         sipType = sipType_KTimeZoneWidget;
+    else if (dynamic_cast<KRichTextWidget*>(sipCpp))
+        sipType = sipType_KRichTextWidget;
+    else if (dynamic_cast<KRichTextEdit*>(sipCpp))
+        sipType = sipType_KRichTextEdit;
     else if (dynamic_cast<KTextEdit*>(sipCpp))
-        {
         sipType = sipType_KTextEdit;
-        if (dynamic_cast<KRichTextEdit*>(sipCpp))
-            {
-            sipType = sipType_KRichTextEdit;
-            if (dynamic_cast<KRichTextWidget*>(sipCpp))
-                sipType = sipType_KRichTextWidget;
-            }
-        }
     else if (dynamic_cast<KTextBrowser*>(sipCpp))
         sipType = sipType_KTextBrowser;
     else if (dynamic_cast<KSqueezedTextLabel*>(sipCpp))
@@ -557,22 +511,18 @@
         sipType = sipType_KButtonGroup;
     else if (dynamic_cast<KEditListBox*>(sipCpp))
         sipType = sipType_KEditListBox;
+    else if (dynamic_cast<KListWidgetSearchLine*>(sipCpp))
+        sipType = sipType_KListWidgetSearchLine;
+    else if (dynamic_cast<KRestrictedLine*>(sipCpp))
+        sipType = sipType_KRestrictedLine;
+    else if (dynamic_cast<KTreeWidgetSearchLine*>(sipCpp))
+        sipType = sipType_KTreeWidgetSearchLine;
     else if (dynamic_cast<KLineEdit*>(sipCpp))
-        {
         sipType = sipType_KLineEdit;
-        if (dynamic_cast<KListWidgetSearchLine*>(sipCpp))
-            sipType = sipType_KListWidgetSearchLine;
-        else if (dynamic_cast<KRestrictedLine*>(sipCpp))
-            sipType = sipType_KRestrictedLine;
-        else if (dynamic_cast<KTreeWidgetSearchLine*>(sipCpp))
-            sipType = sipType_KTreeWidgetSearchLine;
-        }
+    else if (dynamic_cast<KXmlGuiWindow*>(sipCpp))
+        sipType = sipType_KXmlGuiWindow;
     else if (dynamic_cast<KMainWindow*>(sipCpp))
-        {
         sipType = sipType_KMainWindow;
-        if (dynamic_cast<KXmlGuiWindow*>(sipCpp))
-            sipType = sipType_KXmlGuiWindow;
-        }
     else if (dynamic_cast<KMenu*>(sipCpp))
         sipType = sipType_KMenu;
     else if (dynamic_cast<KMenuBar*>(sipCpp))
Index: python/pykde4/sip/kdeui/kdeuimod.sip
===================================================================
--- python/pykde4/sip/kdeui/kdeuimod.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/kdeuimod.sip	(revision 1060018)
@@ -74,7 +74,6 @@
 %Include kdatetimewidget.sip
 %Include kdatewidget.sip
 %Include kdeprintdialog.sip
-%Include kdescendantsproxymodel.sip
 %Include kdialog.sip
 %Include kdialogbuttonbox.sip
 %Include kdialogjobuidelegate.sip
@@ -165,7 +164,6 @@
 %Include kshortcutsdialog.sip
 %Include kshortcutseditor.sip
 %Include kshortcutwidget.sip
-%Include ksortfilterproxymodel.sip
 %Include ksplashscreen.sip
 %Include ksqueezedtextlabel.sip
 %Include kstandardaction.sip
Index: python/pykde4/sip/kdeui/kwallet.sip
===================================================================
--- python/pykde4/sip/kdeui/kwallet.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/kwallet.sip	(revision 1060018)
@@ -83,7 +83,7 @@
     virtual int             readMap (const QString& key, QMap<QString,QString>& value /Out/);
     virtual int             readPassword (const QString& key, QString& value /Out/);
     int                     readEntryList (const QString& key, QMap<QString,QByteArray>& value /Out/);
-//ig    int                 readMapList (const QString& key, QMap<QString,QMap<QString,QString>>& value /Out/);
+//ig    int                     readMapList (const QString& key, QMap<QString,QMap<QString,QString>>& value /Out/);
     int                     readPasswordList (const QString& key, QMap<QString,QString>& value /Out/);
     virtual int             writeEntry (const QString& key, const QByteArray& value, KWallet::Wallet::EntryType entryType);
     virtual int             writeEntry (const QString& key, const QByteArray& value);
Index: python/pykde4/sip/kdeui/kwindowsystem.sip
===================================================================
--- python/pykde4/sip/kdeui/kwindowsystem.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/kwindowsystem.sip	(revision 1060018)
@@ -99,7 +99,9 @@
     void                    showingDesktopChanged (bool showing);
 
 protected:
+//force
     virtual void            connectNotify (SIP_SIGNAL);
+//end
 
 private:
                             KWindowSystem ();
Index: python/pykde4/sip/kdeui/kstatusnotifieritem.sip
===================================================================
--- python/pykde4/sip/kdeui/kstatusnotifieritem.sip	(revision 1060017)
+++ python/pykde4/sip/kdeui/kstatusnotifieritem.sip	(revision 1060018)
@@ -60,10 +60,6 @@
     QString                 attentionIconName () const;
     void                    setAttentionIconByPixmap (const QIcon& icon);
     QIcon                   attentionIconPixmap () const;
-    void                    setAttentionMovie (QMovie* movie);
-    void                    setAttentionMovie (const QVector<QPixmap>& movie);
-    void                    setAttentionMovie (const QVector<QImage>& movie);
-    QMovie*                 attentionMovie () const;
     void                    setToolTip (const QString& iconName, const QString& title, const QString& subTitle);
     void                    setToolTip (const QIcon& icon, const QString& title, const QString& subTitle);
     void                    setToolTipIconByName (const QString& name);
@@ -89,4 +85,7 @@
     void                    secondaryActivateRequested (const QPoint& pos);
 protected:
     bool                    eventFilter (QObject* watched, QEvent* event);
+public:
+    void                    setAttentionMovieByName (const QString& name);
+    QString                 attentionMovieName () const;
 };

kdebindings-4.3.80-fix-build.patch:
 python/pykde4/sip/akonadi/agentfilterproxymodel.sip |    6 ------
 python/pykde4/sip/akonadi/preprocessorbase.sip      |    6 ------
 smoke/nepomuk/smokeconfig.xml                       |    1 +
 3 files changed, 1 insertion(+), 12 deletions(-)

Index: kdebindings-4.3.80-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-fix-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdebindings-4.3.80-fix-build.patch	12 Dec 2009 00:43:39 -0000	1.3
+++ kdebindings-4.3.80-fix-build.patch	12 Dec 2009 01:19:47 -0000	1.4
@@ -58,40 +58,6 @@ diff -ur kdebindings-4.3.80/python/pykde
      else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
          sipClass = sipClass_Akonadi_StatisticsProxyModel;
      else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
-diff -ur kdebindings-4.3.80/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip
---- kdebindings-4.3.80/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip	2009-11-21 10:43:24.000000000 +0100
-+++ kdebindings-4.3.80-fix-build/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip	2009-12-12 01:40:23.000000000 +0100
-@@ -63,7 +63,6 @@
- #include <kdatetable.h>
- #include <kdatetimewidget.h>
- #include <kdatewidget.h>
--#include <kdescendantsproxymodel.h>
- #include <kdialog.h>
- #include <kdialogbuttonbox.h>
- #include <kdialogjobuidelegate.h>
-@@ -136,7 +135,6 @@
- #include <kshortcutsdialog.h>
- #include <kshortcutseditor.h>
- #include <kshortcutwidget.h>
--#include <ksortfilterproxymodel.h>
- #include <ksplashscreen.h>
- #include <ksqueezedtextlabel.h>
- #include <kstartupinfo.h>
-@@ -289,14 +287,10 @@
-         if (dynamic_cast<KPageWidgetModel*>(sipCpp))
-             sipType = sipType_KPageWidgetModel;
-         }
--    else if (dynamic_cast<KDescendantsProxyModel*>(sipCpp))
--        sipType = sipType_KDescendantsProxyModel;
-     else if (dynamic_cast<KSelectionProxyModel*>(sipCpp))
-         sipType = sipType_KSelectionProxyModel;
-     else if (dynamic_cast<KCategorizedSortFilterProxyModel*>(sipCpp))
-         sipType = sipType_KCategorizedSortFilterProxyModel;
--    else if (dynamic_cast<KSortFilterProxyModel*>(sipCpp))
--        sipType = sipType_KSortFilterProxyModel;
-     else if (dynamic_cast<KAction*>(sipCpp))
-         {
-         sipType = sipType_KAction;
 diff -ur kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml
 --- kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml	2009-11-21 10:43:27.000000000 +0100
 +++ kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml	2009-12-12 00:17:57.000000000 +0100


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- kdebindings.spec	12 Dec 2009 00:43:39 -0000	1.272
+++ kdebindings.spec	12 Dec 2009 01:19:47 -0000	1.273
@@ -70,10 +70,13 @@ Patch0:  kdebindings-qyoto-examples.patc
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 # fix the NepomukSmoke build by blacklisting
 # Nepomuk::ResourceManager::generateUniqueUri
-# also fix the PyKDE4 Akonadi and kdeui bindings to build
+# also fix the PyKDE4 Akonadi bindings to build
 Patch2:  kdebindings-4.3.80-fix-build.patch
 
 ## upstream patches
+# fix the PyKDE4 kdeui bindings to build
+# http://websvn.kde.org/?view=revision&revision=1060018
+Patch100: kdebindings-4.3.80-pykdeui-trunk.patch
 
 
 BuildRequires:  akonadi-devel >= 1.1.0
@@ -283,6 +286,7 @@ Falcon plugin for the Kross archtecture 
 %patch2 -p1 -b .fix-build
 
 # upstream patches
+%patch100 -p0 -b .pykdeui-trunk
 
 # do the no-rpath hack last, after the upstream backports (if any)
 %patch1 -p1 -b .no-rpath



From cwickert at fedoraproject.org  Sat Dec 12 01:27:18 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 12 Dec 2009 01:27:18 +0000 (UTC)
Subject: rpms/lxpanel/devel lxpanel-0.5.4-default.patch, NONE,
	1.1 lxpanel-0.5.4-fix-ca.po.patch, NONE,
	1.1 lxpanel-0.5.4-remove-cpufreq-from-configure.patch, NONE,
	1.1 lxpanel.spec, 1.26, 1.27 lxpanel-default.patch, 1.7, NONE
Message-ID: <20091212012718.C76C111C00C5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18391

Modified Files:
	lxpanel.spec 
Added Files:
	lxpanel-0.5.4-default.patch lxpanel-0.5.4-fix-ca.po.patch 
	lxpanel-0.5.4-remove-cpufreq-from-configure.patch 
Removed Files:
	lxpanel-default.patch 
Log Message:
* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-1
- Update to 0.5.4
- Restore toggle functionality of the show deskop plugin


lxpanel-0.5.4-default.patch:
 panel.in |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE lxpanel-0.5.4-default.patch ---
--- lxpanel-0.5.4.orig/data/default/panels/panel.in	2009-04-20 17:07:32.000000000 +0200
+++ lxpanel-0.5.4/data/default/panels/panel.in	2009-12-12 02:18:21.000000000 +0100
@@ -50,13 +50,10 @@
     type = launchbar
     Config {
         Button {
-            id=pcmanfm.desktop
-        }
-        Button {
             id=gnome-terminal.desktop
         }
         Button {
-            id=firefox.desktop
+            id=mozilla-firefox.desktop
         }
     }
 }
@@ -73,6 +70,7 @@
     Config {
         Button1=iconify
         Button2=shade
+        Toggle=1
     }
 }
 

lxpanel-0.5.4-fix-ca.po.patch:
 ca.po |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lxpanel-0.5.4-fix-ca.po.patch ---
--- trunk/lxpanel/po/ca.po	2009/12/11 02:43:39	2188
+++ trunk/lxpanel/po/ca.po	2009/12/11 04:00:56	2189
@@ -417,7 +417,7 @@
 #: ../src/panel.c:1356
 #, c-format
 msgid " --log <number> -- set log level 0-5. 0 - none 5 - chatty\n"
-msgstr "  --log <nombre> -- defineix el nivell de registre 0-5. 0 - cap 5 - xerraire"
+msgstr "  --log <nombre> -- defineix el nivell de registre 0-5. 0 - cap 5 - xerraire\n"
 
 #. g_print(_(" --configure -- launch configuration utility\n"));
 #: ../src/panel.c:1358
@@ -447,7 +447,7 @@
 "\n"
 "Visit http://lxde.org/ for detail.\n"
 "\n"
-msgstr "Visiteu http://lxde.org/ per a m?s informaci?.\n"
+msgstr "\nVisiteu http://lxde.org/ per a m?s informaci?.\n"
 
 #: ../src/gtk-run.c:312
 msgid "Enter the command you want to execute:"

lxpanel-0.5.4-remove-cpufreq-from-configure.patch:
 configure |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

--- NEW FILE lxpanel-0.5.4-remove-cpufreq-from-configure.patch ---
--- lxpanel-0.5.4.orig/configure	2009-12-10 19:46:47.000000000 +0100
+++ lxpanel-0.5.4/configure	2009-12-12 01:41:37.000000000 +0100
@@ -1595,7 +1595,7 @@
                          plugins may be comma separated
                          'all' builds all plugins (default), 'none' builds none
                          Possible plugins are:
-                         netstatus, volume, volumealsa, cpu, deskno, batt, kbled, xkb, thermal, cpufreq
+                         netstatus, volume, volumealsa, cpu, deskno, batt, kbled, xkb, thermal
   --with-x                use the X Window System
   --with-xml-catalog=CATALOG
                           path to xml catalog to use
@@ -11693,7 +11693,6 @@
 plugin_xkb=
 plugin_kbled=
 plugin_thermal=
-plugin_cpufreq=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which plugins should be built dynamically" >&5
 $as_echo_n "checking which plugins should be built dynamically... " >&6; }
@@ -11726,7 +11725,6 @@
     plugin_kbled=kbled
     plugin_xkb=xkb
     plugin_thermal=thermal
-    plugin_cpufreq=cpufreq
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: all" >&5
 $as_echo "all" >&6; }
@@ -11763,9 +11761,6 @@
             thermal)
                 plugin_thermal=thermal
                 ;;
-            cpufreq)
-                plugin_cpufreq=cpufreq
-                ;;
             *)
                 echo "Unknown plugin $plugin."
                 exit 1
@@ -11795,8 +11790,7 @@
     $plugin_batt \
     $plugin_kbled \
     $plugin_xkb \
-    $plugin_thermal \
-    $plugin_cpufreq"
+    $plugin_thermal"
 
 
 
@@ -13545,7 +13539,7 @@
 fi
 
 
-ac_config_files="$ac_config_files lxpanel.pc Makefile src/Makefile src/plugins/Makefile src/plugins/netstatus/Makefile src/plugins/volume/Makefile src/plugins/volumealsa/Makefile src/plugins/cpu/Makefile src/plugins/deskno/Makefile src/plugins/batt/Makefile src/plugins/kbled/Makefile src/plugins/xkb/Makefile src/plugins/thermal/Makefile src/plugins/cpufreq/Makefile po/Makefile.in data/Makefile data/default/panels/panel man/Makefile"
+ac_config_files="$ac_config_files lxpanel.pc Makefile src/Makefile src/plugins/Makefile src/plugins/netstatus/Makefile src/plugins/volume/Makefile src/plugins/volumealsa/Makefile src/plugins/cpu/Makefile src/plugins/deskno/Makefile src/plugins/batt/Makefile src/plugins/kbled/Makefile src/plugins/xkb/Makefile src/plugins/thermal/Makefile po/Makefile.in data/Makefile data/default/panels/panel man/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14550,7 +14544,6 @@
     "src/plugins/kbled/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/kbled/Makefile" ;;
     "src/plugins/xkb/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/xkb/Makefile" ;;
     "src/plugins/thermal/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/thermal/Makefile" ;;
-    "src/plugins/cpufreq/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/cpufreq/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "data/default/panels/panel") CONFIG_FILES="$CONFIG_FILES data/default/panels/panel" ;;
@@ -15974,10 +15967,6 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: result:     thermal - Temperature monitor" >&5
 $as_echo "    thermal - Temperature monitor" >&6; }
     fi
-    if test x"$plugin_cpufreq" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result:     cpufreq - CpuFreq frontend" >&5
-$as_echo "    cpufreq - CpuFreq frontend" >&6; }
-    fi
 else
 echo Dynamic loader for plugins....... : disabled.
 fi


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- lxpanel.spec	9 Aug 2009 19:36:02 -0000	1.26
+++ lxpanel.spec	12 Dec 2009 01:27:18 -0000	1.27
@@ -4,7 +4,7 @@
 #define _default_patch_fuzz 0
 
 Name:           lxpanel
-Version:        0.5.3
+Version:        0.5.4
 Release:        1%{?dist}
 Summary:        A lightweight X11 desktop panel
 
@@ -12,15 +12,19 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
-Patch1:         lxpanel-default.patch
-Patch3:         lxpanel-0.3.8.1-nm-connection-editor.patch
+Patch0:         lxpanel-0.5.4-default.patch
+Patch1:         lxpanel-0.3.8.1-nm-connection-editor.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde/trunk/lxpanel/po/ca.po?view=patch&r1=2189&r2=2188&pathrev=2189
+# without this build will fail due to an invalid po file
+Patch2:         lxpanel-0.5.4-fix-ca.po.patch
+# without this one configure will break, because cpufreq plugin is no in the tarball
+Patch3:         lxpanel-0.5.4-remove-cpufreq-from-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  docbook-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel 
 BuildRequires:  intltool
-#BuildRequires:  libXmu-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  startup-notification-devel
 # required for alsa mixer plugin
@@ -40,7 +44,6 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtk2-devel 
 Requires:       libXpm-devel
-#Requires:       libXmu-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -49,8 +52,10 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch1 -p1 -b .default
-%patch3 -p1 -b .system-config-network
+%patch0 -p1 -b .default
+%patch1 -p1 -b .system-config-network
+%patch2 -p2 -b .hosed
+%patch3 -p1 -b .cpufreq
 
 
 %build
@@ -82,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
+* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-1
+- Update to 0.5.4
+- Restore toggle functionality of the show deskop plugin
+
 * Thu Aug 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3, fixes vertical panel size (#515748)
 


--- lxpanel-default.patch DELETED ---



From rathann at fedoraproject.org  Sat Dec 12 01:27:53 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 12 Dec 2009 01:27:53 +0000 (UTC)
Subject: File libdvdread-svn1188.tar.bz2 uploaded to lookaside cache by
	rathann
Message-ID: <20091212012753.A2EC910F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libdvdread:

ee7cb8f99371fa332feea2f420694b6b  libdvdread-svn1188.tar.bz2



From rathann at fedoraproject.org  Sat Dec 12 01:29:18 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 12 Dec 2009 01:29:18 +0000 (UTC)
Subject: rpms/libdvdread/devel .cvsignore, 1.6, 1.7 libdvdread.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20091212012918.0D64811C00C5@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdread/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19198

Modified Files:
	.cvsignore libdvdread.spec sources 
Log Message:
* Sat Dec 12 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.2.svn1188
- updated to SVN r1188 (rhbz#540155)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Sep 2009 23:40:35 -0000	1.6
+++ .cvsignore	12 Dec 2009 01:29:17 -0000	1.7
@@ -1 +1 @@
-libdvdread-svn1183.tar.bz2
+libdvdread-svn1188.tar.bz2


Index: libdvdread.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/libdvdread.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libdvdread.spec	26 Sep 2009 23:40:36 -0000	1.13
+++ libdvdread.spec	12 Dec 2009 01:29:17 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           libdvdread
 Version:        4.1.4
-Release:        0.1.svn1183%{?dist}
+Release:        0.2.svn1188%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 #Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2
 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
-Source:         %{name}-svn1183.tar.bz2
+Source:         %{name}-svn1188.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fix endianness issues on bigendian platforms
 Patch0:         %{name}-endian.patch
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dvdread.pc
 
 %changelog
+* Sat Dec 12 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.2.svn1188
+- updated to SVN r1188 (rhbz#540155)
+
 * Sun Sep 27 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.1.svn1183
 - updated to SVN r1183
 - simplified multilib patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Sep 2009 23:40:36 -0000	1.7
+++ sources	12 Dec 2009 01:29:17 -0000	1.8
@@ -1 +1 @@
-0fdb0cfb8655abecfb1498a4ea73ef71  libdvdread-svn1183.tar.bz2
+ee7cb8f99371fa332feea2f420694b6b  libdvdread-svn1188.tar.bz2



From rathann at fedoraproject.org  Sat Dec 12 01:35:01 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 12 Dec 2009 01:35:01 +0000 (UTC)
Subject: rpms/libdvdread/F-12 .cvsignore, 1.6, 1.7 libdvdread.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20091212013501.B9FD511C00C5@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdread/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21537

Modified Files:
	.cvsignore libdvdread.spec sources 
Log Message:
* Sat Dec 12 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.2.svn1188
- updated to SVN r1188 (rhbz#540155)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Sep 2009 23:40:35 -0000	1.6
+++ .cvsignore	12 Dec 2009 01:35:01 -0000	1.7
@@ -1 +1 @@
-libdvdread-svn1183.tar.bz2
+libdvdread-svn1188.tar.bz2


Index: libdvdread.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-12/libdvdread.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libdvdread.spec	26 Sep 2009 23:40:36 -0000	1.13
+++ libdvdread.spec	12 Dec 2009 01:35:01 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           libdvdread
 Version:        4.1.4
-Release:        0.1.svn1183%{?dist}
+Release:        0.2.svn1188%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 #Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2
 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
-Source:         %{name}-svn1183.tar.bz2
+Source:         %{name}-svn1188.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fix endianness issues on bigendian platforms
 Patch0:         %{name}-endian.patch
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dvdread.pc
 
 %changelog
+* Sat Dec 12 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.2.svn1188
+- updated to SVN r1188 (rhbz#540155)
+
 * Sun Sep 27 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.1.svn1183
 - updated to SVN r1183
 - simplified multilib patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Sep 2009 23:40:36 -0000	1.7
+++ sources	12 Dec 2009 01:35:01 -0000	1.8
@@ -1 +1 @@
-0fdb0cfb8655abecfb1498a4ea73ef71  libdvdread-svn1183.tar.bz2
+ee7cb8f99371fa332feea2f420694b6b  libdvdread-svn1188.tar.bz2



From cwickert at fedoraproject.org  Sat Dec 12 01:35:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 12 Dec 2009 01:35:55 +0000 (UTC)
Subject: File lxpanel-0.5.4.tar.gz uploaded to lookaside cache by cwickert
Message-ID: <20091212013555.3BD1E10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for lxpanel:

48ee6b2904a65eb57087befa85ebd4b7  lxpanel-0.5.4.tar.gz



From rathann at fedoraproject.org  Sat Dec 12 01:37:10 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 12 Dec 2009 01:37:10 +0000 (UTC)
Subject: rpms/libdvdread/F-11 .cvsignore, 1.6, 1.7 libdvdread.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20091212013710.4CD8011C00C5@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libdvdread/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22445

Modified Files:
	.cvsignore libdvdread.spec sources 
Log Message:
* Sat Dec 12 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.2.svn1188
- updated to SVN r1188 (rhbz#540155)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Nov 2009 20:32:17 -0000	1.6
+++ .cvsignore	12 Dec 2009 01:37:09 -0000	1.7
@@ -1 +1 @@
-libdvdread-svn1183.tar.bz2
+libdvdread-svn1188.tar.bz2


Index: libdvdread.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-11/libdvdread.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libdvdread.spec	14 Nov 2009 20:32:18 -0000	1.10
+++ libdvdread.spec	12 Dec 2009 01:37:09 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           libdvdread
 Version:        4.1.4
-Release:        0.1.svn1183%{?dist}
+Release:        0.2.svn1188%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 #Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2
 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
-Source:         %{name}-svn1183.tar.bz2
+Source:         %{name}-svn1188.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fix endianness issues on bigendian platforms
 Patch0:         %{name}-endian.patch
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dvdread.pc
 
 %changelog
+* Sat Dec 12 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.2.svn1188
+- updated to SVN r1188 (rhbz#540155)
+
 * Sat Nov 14 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.1.svn1183
 - updated to SVN r1183
 - simplified multilib patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Nov 2009 20:32:18 -0000	1.7
+++ sources	12 Dec 2009 01:37:10 -0000	1.8
@@ -1 +1 @@
-0fdb0cfb8655abecfb1498a4ea73ef71  libdvdread-svn1183.tar.bz2
+ee7cb8f99371fa332feea2f420694b6b  libdvdread-svn1188.tar.bz2



From cwickert at fedoraproject.org  Sat Dec 12 01:40:32 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 12 Dec 2009 01:40:32 +0000 (UTC)
Subject: rpms/lxpanel/devel .cvsignore,1.16,1.17 sources,1.16,1.17
Message-ID: <20091212014032.BF06B11C03FC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23789

Modified Files:
	.cvsignore sources 
Log Message:
upload new sources (damn, 3rd time today i forgot it)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	9 Aug 2009 19:36:02 -0000	1.16
+++ .cvsignore	12 Dec 2009 01:40:32 -0000	1.17
@@ -1 +1 @@
-lxpanel-0.5.3.tar.gz
+lxpanel-0.5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	9 Aug 2009 19:36:02 -0000	1.16
+++ sources	12 Dec 2009 01:40:32 -0000	1.17
@@ -1 +1 @@
-7203f037791fffd272f7cf50798933ae  lxpanel-0.5.3.tar.gz
+48ee6b2904a65eb57087befa85ebd4b7  lxpanel-0.5.4.tar.gz



From steve at fedoraproject.org  Sat Dec 12 01:52:50 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 12 Dec 2009 01:52:50 +0000 (UTC)
Subject: File openvpn-2.1.1.tar.gz uploaded to lookaside cache by steve
Message-ID: <20091212015250.0AD1410F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for openvpn:

b273ed2b5ec8616fb9834cde8634bce7  openvpn-2.1.1.tar.gz



From steve at fedoraproject.org  Sat Dec 12 01:52:51 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 12 Dec 2009 01:52:51 +0000 (UTC)
Subject: File openvpn-2.1.1.tar.gz.asc uploaded to lookaside cache by steve
Message-ID: <20091212015251.B93BD10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for openvpn:

83ab0bca3f051fc0b26673008c34aa20  openvpn-2.1.1.tar.gz.asc



From kkofler at fedoraproject.org  Sat Dec 12 02:04:53 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Dec 2009 02:04:53 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.80-pykdeui-trunk.patch, 1.1, 
	1.2
Message-ID: <20091212020453.25F1D11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32651/devel

Modified Files:
	kdebindings-4.3.80-pykdeui-trunk.patch 
Log Message:
Drop part of the upstream patch which requires a kdelibs newer than 4.3.80.

kdebindings-4.3.80-pykdeui-trunk.patch:
 kabstractwidgetjobtracker.sip |  266 +++++++++++++++++-------------------------
 kactioncollection.sip         |    2 
 kdescendantsproxymodel.sip    |   50 -------
 kdeuimod.sip                  |    2 
 kiconcache.sip                |   12 +
 ksortfilterproxymodel.sip     |   33 -----
 ktimezonewidget.sip           |    5 
 kwallet.sip                   |    2 
 kwindowsystem.sip             |    2 
 netwm.sip                     |    2 
 netwm_def.sip                 |    3 
 11 files changed, 134 insertions(+), 245 deletions(-)

Index: kdebindings-4.3.80-pykdeui-trunk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-pykdeui-trunk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebindings-4.3.80-pykdeui-trunk.patch	12 Dec 2009 01:19:47 -0000	1.1
+++ kdebindings-4.3.80-pykdeui-trunk.patch	12 Dec 2009 02:04:52 -0000	1.2
@@ -610,26 +610,3 @@ Index: python/pykde4/sip/kdeui/kwindowsy
  
  private:
                              KWindowSystem ();
-Index: python/pykde4/sip/kdeui/kstatusnotifieritem.sip
-===================================================================
---- python/pykde4/sip/kdeui/kstatusnotifieritem.sip	(revision 1060017)
-+++ python/pykde4/sip/kdeui/kstatusnotifieritem.sip	(revision 1060018)
-@@ -60,10 +60,6 @@
-     QString                 attentionIconName () const;
-     void                    setAttentionIconByPixmap (const QIcon& icon);
-     QIcon                   attentionIconPixmap () const;
--    void                    setAttentionMovie (QMovie* movie);
--    void                    setAttentionMovie (const QVector<QPixmap>& movie);
--    void                    setAttentionMovie (const QVector<QImage>& movie);
--    QMovie*                 attentionMovie () const;
-     void                    setToolTip (const QString& iconName, const QString& title, const QString& subTitle);
-     void                    setToolTip (const QIcon& icon, const QString& title, const QString& subTitle);
-     void                    setToolTipIconByName (const QString& name);
-@@ -89,4 +85,7 @@
-     void                    secondaryActivateRequested (const QPoint& pos);
- protected:
-     bool                    eventFilter (QObject* watched, QEvent* event);
-+public:
-+    void                    setAttentionMovieByName (const QString& name);
-+    QString                 attentionMovieName () const;
- };



From steve at fedoraproject.org  Sat Dec 12 02:11:39 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 12 Dec 2009 02:11:39 +0000 (UTC)
Subject: rpms/openvpn/devel .cvsignore, 1.28, 1.29 openvpn.spec, 1.51,
	1.52 sources, 1.28, 1.29
Message-ID: <20091212021139.E206A11C00C5@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2082

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	21 Nov 2009 20:03:45 -0000	1.28
+++ .cvsignore	12 Dec 2009 02:11:39 -0000	1.29
@@ -1,2 +1,2 @@
-openvpn-2.1_rc22.tar.gz
-openvpn-2.1_rc22.tar.gz.asc
+openvpn-2.1.1.tar.gz
+openvpn-2.1.1.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- openvpn.spec	21 Nov 2009 20:03:45 -0000	1.51
+++ openvpn.spec	12 Dec 2009 02:11:39 -0000	1.52
@@ -1,10 +1,10 @@
-%define prerelease rc22
+#define prerelease rc22
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.1
-Release:           0.39%{?prerelease:.%{prerelease}}%{?dist}
+Version:           2.1.1
+Release:           1%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -170,6 +170,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Dec 11 2009 Steven Pritchard <steve at kspei.com> 2.1.1-1
+- Update to 2.1.1.
+
 * Sat Nov 21 2009 Steven Pritchard <steve at kspei.com> 2.1-0.39.rc22
 - Update to 2.1_rc22.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	21 Nov 2009 20:03:45 -0000	1.28
+++ sources	12 Dec 2009 02:11:39 -0000	1.29
@@ -1,2 +1,2 @@
-a4ca5d79f7467fc537b216bff1c744f2  openvpn-2.1_rc22.tar.gz
-2c40603579fa7a71701abbefd5799f65  openvpn-2.1_rc22.tar.gz.asc
+b273ed2b5ec8616fb9834cde8634bce7  openvpn-2.1.1.tar.gz
+83ab0bca3f051fc0b26673008c34aa20  openvpn-2.1.1.tar.gz.asc



From mtasaka at fedoraproject.org  Sat Dec 12 03:23:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 12 Dec 2009 03:23:10 +0000 (UTC)
Subject: File jd-2.5.5-svn3226_trunk.tgz uploaded to lookaside cache by
	mtasaka
Message-ID: <20091212032310.1F89A10F85C@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for jd:

922d04e88f4c98417280f2908b102d61  jd-2.5.5-svn3226_trunk.tgz



From mtasaka at fedoraproject.org  Sat Dec 12 03:25:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 12 Dec 2009 03:25:13 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.414, 1.415 jd.spec, 1.477, 1.478 sources,
	1.415, 1.416
Message-ID: <20091212032513.8CD1F11C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28718/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3226



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- .cvsignore	11 Dec 2009 06:35:00 -0000	1.414
+++ .cvsignore	12 Dec 2009 03:25:13 -0000	1.415
@@ -1 +1 @@
-jd-2.5.5-svn3244_trunk.tgz
+jd-2.5.5-svn3226_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -p -r1.477 -r1.478
--- jd.spec	11 Dec 2009 06:35:01 -0000	1.477
+++ jd.spec	12 Dec 2009 03:25:13 -0000	1.478
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3244_trunk
+%define         strtag        svn3226_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3244
+* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3226
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- sources	11 Dec 2009 06:35:01 -0000	1.415
+++ sources	12 Dec 2009 03:25:13 -0000	1.416
@@ -1 +1 @@
-af5645c4ad483665036b52ad7bdda93e  jd-2.5.5-svn3244_trunk.tgz
+922d04e88f4c98417280f2908b102d61  jd-2.5.5-svn3226_trunk.tgz



From mtasaka at fedoraproject.org  Sat Dec 12 03:25:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 12 Dec 2009 03:25:13 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.414, 1.415 jd.spec, 1.478, 1.479 sources,
	1.415, 1.416
Message-ID: <20091212032513.C822111C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28718/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3226



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- .cvsignore	11 Dec 2009 06:34:26 -0000	1.414
+++ .cvsignore	12 Dec 2009 03:25:13 -0000	1.415
@@ -1 +1 @@
-jd-2.5.5-svn3244_trunk.tgz
+jd-2.5.5-svn3226_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -p -r1.478 -r1.479
--- jd.spec	11 Dec 2009 06:34:26 -0000	1.478
+++ jd.spec	12 Dec 2009 03:25:13 -0000	1.479
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3244_trunk
+%define         strtag        svn3226_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3244
+* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3226
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- sources	11 Dec 2009 06:34:26 -0000	1.415
+++ sources	12 Dec 2009 03:25:13 -0000	1.416
@@ -1 +1 @@
-af5645c4ad483665036b52ad7bdda93e  jd-2.5.5-svn3244_trunk.tgz
+922d04e88f4c98417280f2908b102d61  jd-2.5.5-svn3226_trunk.tgz



From mtasaka at fedoraproject.org  Sat Dec 12 03:25:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 12 Dec 2009 03:25:14 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.404, 1.405 jd.spec, 1.466, 1.467 sources,
	1.405, 1.406
Message-ID: <20091212032514.1F96911C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28718/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3226



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- .cvsignore	11 Dec 2009 06:17:57 -0000	1.404
+++ .cvsignore	12 Dec 2009 03:25:13 -0000	1.405
@@ -1 +1 @@
-jd-2.5.5-svn3244_trunk.tgz
+jd-2.5.5-svn3226_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -p -r1.466 -r1.467
--- jd.spec	10 Dec 2009 18:54:45 -0000	1.466
+++ jd.spec	12 Dec 2009 03:25:13 -0000	1.467
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3244_trunk
+%define         strtag        svn3226_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Dec 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3244
+* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3226
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- sources	11 Dec 2009 06:17:57 -0000	1.405
+++ sources	12 Dec 2009 03:25:13 -0000	1.406
@@ -1 +1 @@
-af5645c4ad483665036b52ad7bdda93e  jd-2.5.5-svn3244_trunk.tgz
+922d04e88f4c98417280f2908b102d61  jd-2.5.5-svn3226_trunk.tgz



From rakesh at fedoraproject.org  Sat Dec 12 03:26:11 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 12 Dec 2009 03:26:11 +0000 (UTC)
Subject: rpms/egoboo/devel egoboo.spec,1.11,1.12
Message-ID: <20091212032611.B5BBC11C00C5@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/egoboo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29374

Modified Files:
	egoboo.spec 
Log Message:
Updated to consume new libenet


Index: egoboo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/egoboo/devel/egoboo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- egoboo.spec	24 Jul 2009 21:55:54 -0000	1.11
+++ egoboo.spec	12 Dec 2009 03:26:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           egoboo
 Version:        2.7.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A top down graphical (3D) RPG in the spirit of Nethack
 Group:          Amusements/Games
 License:        GPLv3
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.7.5-8
+- Updated to consume new libenet
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Sat Dec 12 03:33:42 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Dec 2009 03:33:42 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch, 1.4,
	1.5 kdebindings.spec, 1.273, 1.274
Message-ID: <20091212033342.1F64011C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32444/devel

Modified Files:
	kdebindings-4.3.80-fix-build.patch kdebindings.spec 
Log Message:
Fix the PyKDE4 Phonon bindings to build.

kdebindings-4.3.80-fix-build.patch:
 python/pykde4/sip/akonadi/agentfilterproxymodel.sip |    6 ------
 python/pykde4/sip/akonadi/preprocessorbase.sip      |    6 ------
 python/pykde4/sip/phonon/phononmod.sip              |    3 ---
 smoke/nepomuk/smokeconfig.xml                       |    1 +
 4 files changed, 1 insertion(+), 15 deletions(-)

Index: kdebindings-4.3.80-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-fix-build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kdebindings-4.3.80-fix-build.patch	12 Dec 2009 01:19:47 -0000	1.4
+++ kdebindings-4.3.80-fix-build.patch	12 Dec 2009 03:33:41 -0000	1.5
@@ -58,6 +58,19 @@ diff -ur kdebindings-4.3.80/python/pykde
      else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
          sipClass = sipClass_Akonadi_StatisticsProxyModel;
      else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
+diff -ur kdebindings-4.3.80/python/pykde4/sip/phonon/phononmod.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/phononmod.sip
+--- kdebindings-4.3.80/python/pykde4/sip/phonon/phononmod.sip	2009-11-21 10:43:24.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/phononmod.sip	2009-12-12 04:28:58.000000000 +0100
+@@ -31,9 +31,6 @@
+ %Include phononnamespace.sip
+ %Include objectdescription.sip
+ %Include objectdescriptionmodel.sip
+-%Include abstractaudiooutput.sip
+-%Include audiodataoutput.sip
+-%Include audiodataoutputinterface.sip
+ %Include abstractmediastream.sip
+ %Include abstractvideooutput.sip
+ %Include audiooutput.sip
 diff -ur kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml
 --- kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml	2009-11-21 10:43:27.000000000 +0100
 +++ kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml	2009-12-12 00:17:57.000000000 +0100


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- kdebindings.spec	12 Dec 2009 01:19:47 -0000	1.273
+++ kdebindings.spec	12 Dec 2009 03:33:41 -0000	1.274
@@ -70,7 +70,9 @@ Patch0:  kdebindings-qyoto-examples.patc
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 # fix the NepomukSmoke build by blacklisting
 # Nepomuk::ResourceManager::generateUniqueUri
-# also fix the PyKDE4 Akonadi bindings to build
+# also fix the PyKDE4 Akonadi and Phonon bindings to build
+# (The Phonon change is a workaround for a missing .sip file, the other stuff is
+# APIs which are just not there to bind.)
 Patch2:  kdebindings-4.3.80-fix-build.patch
 
 ## upstream patches
@@ -555,7 +557,7 @@ fi
 %changelog
 * Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
-- fix the PyKDE4 Akonadi and kdeui bindings to build
+- fix the PyKDE4 Akonadi, kdeui and Phonon bindings to build
 
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - respin



From Matt_Domsch at Dell.com  Sat Dec 12 03:35:46 2009
From: Matt_Domsch at Dell.com (Matt_Domsch at Dell.com)
Date: Fri, 11 Dec 2009 21:35:46 -0600
Subject: rpms/openwsman/F-12 openwsman-pam-auth.patch, NONE,	1.1
 openwsman.rpmlintrc, NONE, 1.1 perl-bindings.patch, NONE,	1.1
 openwsman-initscript.patch, 1.1, 1.2 openwsman.spec, 1.5, 1.6
In-Reply-To: <20091211215827.C873711C00C5@cvs1.fedora.phx.redhat.com>
References: <20091211215827.C873711C00C5@cvs1.fedora.phx.redhat.com>
Message-ID: <1B9798A3396AB0429545ADFEA20793150D2298CBF2@AUSX7MCPS302.AMER.DELL.COM>

I think you'll want these back in the server subpackage:

-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(postun): initscripts



--
Matt Domsch
Technology Strategist, Dell Office of the CTO
linux.dell.com & www.dell.com/linux


-----Original Message-----
From: Praveen K Paladugu [mailto:praveenp at fedoraproject.org]
Sent: Friday, December 11, 2009 3:58 PM
To: cvsextras at fedoraproject.org; openwsman-owner at fedoraproject.org
Subject: rpms/openwsman/F-12 openwsman-pam-auth.patch, NONE, 1.1 openwsman.rpmlintrc, NONE, 1.1 perl-bindings.patch, NONE, 1.1 openwsman-initscript.patch, 1.1, 1.2 openwsman.spec, 1.5, 1.6

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6473

Modified Files:
        openwsman-initscript.patch openwsman.spec
Added Files:
        openwsman-pam-auth.patch openwsman.rpmlintrc
        perl-bindings.patch
Log Message:
Broke the package into lib, server and client parts


openwsman-pam-auth.patch:
 openwsman.conf |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openwsman-pam-auth.patch ---
Index: openwsman.conf
===================================================================
--- openwsman-2.0.0/etc/openwsman.conf  (revision 3221)
+++ openwsman-2.0.0/etc/openwsman.conf  (working copy)
@@ -4,7 +4,7 @@
 ssl_cert_file = /etc/openwsman/servercert.pem
 ssl_key_file = /etc/openwsman/serverkey.pem
 digest_password_file = /etc/openwsman/digest_auth.passwd
-basic_password_file = /etc/openwsman/simple_auth.passwd
+#basic_password_file = /etc/openwsman/simple_auth.passwd

 min_threads = 4
 max_threads = 10
@@ -15,8 +15,8 @@
 # Authentication backend for BASIC authentication. Default is to read a configuration file defined with 'basic_password_file'
 #

-#basic_authenticator = libwsman_pam_auth.so
-#basic_authenticator_arg = openwsman
+basic_authenticator = libwsman_pam_auth.so
+basic_authenticator_arg = openwsman

 #
 # WS-Management unauthenticated wsmid:Identify file


--- NEW FILE openwsman.rpmlintrc ---
addFilter("devel-file-in-non-devel-package .*/usr/lib.*/openwsman/.*/.*")
addFilter("openwsman-client.*shlib-policy-name-error.*")

perl-bindings.patch:
 Makefile.am |    1 +
 Makefile.in |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE perl-bindings.patch ---
diff -up openwsman-2.2.0/bindings/perl/Makefile.am.org openwsman-2.2.0/bindings/perl/Makefile.am
--- openwsman-2.2.0/bindings/perl/Makefile.am.org       2009-12-10 13:34:55.000000000 -0600
+++ openwsman-2.2.0/bindings/perl/Makefile.am   2009-12-10 13:35:56.000000000 -0600
@@ -33,6 +33,7 @@ SWIG_INPUT = ../openwsman.i
 openwsman_la_SOURCES = openwsman_wrap.c \
                         ../openwsman.c \
                         $(SWIG_INPUT)
+all-local: openwsman.pm

 openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)

diff -up openwsman-2.2.0/bindings/perl/Makefile.in.org openwsman-2.2.0/bindings/perl/Makefile.in
--- openwsman-2.2.0/bindings/perl/Makefile.in.org       2009-12-10 13:35:03.000000000 -0600
+++ openwsman-2.2.0/bindings/perl/Makefile.in   2009-12-10 13:36:18.000000000 -0600
@@ -289,6 +289,7 @@ SWIG_INPUT = ../openwsman.i
 openwsman_la_SOURCES = openwsman_wrap.c \
                         ../openwsman.c \
                         $(SWIG_INPUT)
+all-local: openwsman.pm

 openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
 openwsman_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)

openwsman-initscript.patch:
 openwsmand.sh.in |   67 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 16 deletions(-)

Index: openwsman-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/openwsman-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openwsman-initscript.patch  1 Nov 2008 10:57:30 -0000       1.1
+++ openwsman-initscript.patch  11 Dec 2009 21:58:26 -0000      1.2
@@ -1,28 +1,120 @@
---- openwsman-2.0.0/etc/init/openwsmand.sh.in.orig     2008-09-07 00:01:29.000000000 -0500
-+++ openwsman-2.0.0/etc/init/openwsmand.sh.in  2008-09-07 00:34:57.000000000 -0500
-@@ -4,15 +4,13 @@
- # Provides: openwsmand
+diff -up ./etc/init/openwsmand.sh.in.org ./etc/init/openwsmand.sh.in
+--- ./etc/init/openwsmand.sh.in.org    2009-12-11 13:04:10.000000000 -0600
++++ ./etc/init/openwsmand.sh.in        2009-12-11 13:14:14.000000000 -0600
+@@ -5,7 +5,7 @@
  # Required-Start: $remote_fs
  # Required-Stop: $network
--# Default-Start: 2 3 4 5
+ # Default-Start: 2 3 4 5
 -# Default-Stop: 0 1 6
++# Default-Stop:  0 1 6
  # Short-Description: Openwsman Daemon
  # Description: openwsmand
  #       Start/Stop the Openwsman Daemon
- ### END INIT INFO
- #
- #
--# chkconfig: 2345 36 64
-+# chkconfig: - 36 64
- # description: Openwsman Daemon
- # processname: openwsmand
-
-@@ -57,7 +55,7 @@ case "$1" in
-             if [ "x${FQDN}" = "x" ]; then
-                 FQDN=localhost.localdomain
-             fi
--cat << EOF | sh @SYSCONFDIR@/owsmangencert.sh > /dev/null 2>&1
-+cat << EOF | sh @libexecdir@/openwsman/owsmangencert.sh > /dev/null 2>&1
- --
- SomeState
- SomeCity
+@@ -18,7 +18,7 @@
+
+ NAME=openwsmand
+ DAEMON=/usr/sbin/$NAME
+-OPTIONS=
++OPTIONS=-S
+ PIDFILE=/var/run/$NAME.pid
+
+ if [ $EUID != 0 ]; then
+@@ -37,12 +37,14 @@ lockfile=${SVIlock:-/var/lock/subsys/$NA
+ if [ -f "/etc/sysconfig/openwsman" ]; then
+     . /etc/sysconfig/openwsman
+ fi
+-# See how we were called.
+-. /etc/rc.status
+
+-# Reset status of this service
+-rc_reset
++if [ -f "/etc/SuSe-release" ]; then
++     # See how we were called.
++     . /etc/rc.status
+
++     # Reset status of this service
++     rc_reset
++fi
+
+ case "$1" in
+     start)
+@@ -71,16 +73,28 @@ EOF
+
+     # Start daemons.
+     echo -n "Starting the $DESCRIPTIVE"
+-    startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++      startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
++      rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++      $DAEMON -S && echo "          done." || echo "   failed."
++    fi
++
+     touch $lockfile
+     ;;
+
+     stop)
+     # Stop daemons.
+     echo -n "Shutting down $DESCRIPTIVE"
+-    killproc -p $PIDFILE -TERM $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++       killproc -p $PIDFILE -TERM $DAEMON
++       rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++       kill -9 `pidof openwsmand` > /dev/null 2>&1
++          if [ $? -eq 0 ]; then
++             echo "         done"
++          fi
++    fi
+     rm -f $lockfile
+     ;;
+
+@@ -91,19 +105,40 @@ EOF
+     ;;
+
+     reload)
+-    echo -n "Reload service $DESCRIPTIVE"
+-    killproc -p $PIDFILE  -HUP $DAEMON
+-    rc_status -v
++    echo -n "Reloading service $DESCRIPTIVE"
++    if [ -f "/etc-SuSe-release" ]; then
++      killproc -p $PIDFILE  -HUP $DAEMON
++      rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++      killall -HUP openwsmad && echo "            done."|| echo "    failed."
++    fi
+     ;;
+
+     status)
+     echo -n "Checking for service $DESCRIPTIVE"
+-    checkproc -p $PIDFILE $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++        checkproc -p $PIDFILE $DAEMON
++        rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++        pidof opewsmand > /dev/null 2>&1
++        if [ $? -eq 0 ]; then
++           echo "         running"
++        else
++           echo "         stopped"
++        fi
++    fi
++
++    ;;
++    condrestart)
++       [ -f $lockfile ] && restart || :
+     ;;
+
+     *)
+-    echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
++    echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
+ esac
+
++if [ -f "/etc/SuSe-release" ]; then
+ rc_exit
++elif [ -f "/etc/redhat-release" ]; then
++exit 0
++fi


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/openwsman.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openwsman.spec      1 Oct 2009 18:17:09 -0000       1.5
+++ openwsman.spec      11 Dec 2009 21:58:27 -0000      1.6
@@ -1,22 +1,46 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+#
+# spec file for package openwsman (Version 2.2.0)
+#
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
-%define ruby_libdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}

-Name:          openwsman
-Version:       2.2.0
-Release:        1%{?dist}
-License:        BSD
+Name:           openwsman
+BuildRequires:  swig
+BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
+BuildRequires:  python python-devel ruby ruby-devel perl
+BuildRequires:  perl-devel pkgconfig openssl-devel
+BuildRequires:  libtool
+Requires:       net-tools
+Version:        2.2.0
+Release:        2%{?dist}
 Url:            http://www.openwsman.org/
-Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-initscript.patch
+License:        BSD
+Group:          Applications/System
+Summary:        Opensource Implementation of WS-Management
+Source:         %{name}-%{version}.tar.bz2
+Source1:        %{name}.rpmlintrc
+Patch0:         %{name}-pam-auth.patch
+Patch1:         %{name}-initscript.patch
+Patch2:         perl-bindings.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
-Group:          System Environment/Daemons
-Summary:        Web Services Management libraries
-BuildRequires:  sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(postun): initscripts

 %description
 Openwsman is a project intended to provide an open-source
@@ -28,129 +52,279 @@ requirements that exposes a set of opera
 all system management aspects.


-%package devel
-Summary:        Openwsman Development files
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package -n libwsman1
+License:        BSD
+Group:          System Environment/Libraries
+Summary:        Opensource Implementation of WS-Management
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
+Requires:       %{name}-client
+
+%description -n libwsman1
+Openwsman library for packages dependent on openwsman
+
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package -n libwsman-devel
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-%description devel
-Openwsman Development files
+Summary:        Opensource Implementation of WS-Management
+Provides:       %{name}-devel = %{version}
+Obsoletes:      %{name}-devel < %{version}
+Requires:       libwsman1 = %{version}
+Requires:       %{name}-server = %{version}
+Requires:       %{name}-client = %{version}
+Requires:       sblim-sfcc-devel libxml2-devel pam-devel
+Requires:       libcurl-devel
+
+%description -n libwsman-devel
+Development files for openwsman
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package client
+License:        BSD
+Group:          System Environment/Libraries
+Summary:        Openwsman Client libraries
+
+%description client
+Openwsman Client libraries
+
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package server
+License:        BSD
+Group:          System Environment/Daemons
+Requires:       net-tools
+Requires:       openwsman-client
+Summary:        Openwsman Server and service libraries
+
+%description server
+Openwsman Server and service libraries
+
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>

 %package python
-Summary:        Openwsman Python bindings
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:        Python bindings for openwsman client API
+Requires:       python
+
 %description python
-Openwsman python bindings
+This package provides Python bindings to access the openwsman client
+API.
+
+

-%package -n ruby-%{name}
-Summary:        Openwsman Ruby bindings
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package ruby
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Provides:       ruby(%{name}) = %{version}
-%description -n ruby-%{name}
-Openwsman ruby bindings
+Summary:        Ruby bindings for openwsman client API
+
+%description ruby
+This package provides Ruby bindings to access the openwsman client API.
+
+
+
+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>
+
+%package perl
+License:        BSD
+Group:          Development/Libraries
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Summary:        Perl bindings for openwsman client API
+
+%description perl
+This package provides Perl bindings to access the openwsman client API.
+
+

+Authors:
+--------
+    Anas Nashif <anas.nashif at intel.com>
+    Vadim Revyakin <vadim.revyakin at intel.com>
+    Denis Sadykov <denis.sadykov at intel.com>

 %prep
-%setup -q
+%setup -q
 %patch0 -p1
-echo "%{ruby_sitearch}"
+%patch1 -p1
+%patch2 -p1

 %build
-chmod a-x src/lib/*.[ch]
-chmod a-x src/cpp/*.[ch]
-chmod a-x include/*.[ch]
-
-# disable eventing, as Fedora libcurl isn't linked against openssl
-# disable tests in 2.1.0, http://www.openwsman.org/bug/263
-%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings
-make %{?_smp_flags}
+sh autoconfiscate.sh
+# Removing executable permissions on .c and .h files to fix rpmlint warnings.
+chmod -x src/cpp/WsmanClient.h
+chmod -x src/lib/wsman-filter.c
+chmod -x include/wsman-filter.h
+%configure \
+    --disable-more-warnings \
+    --disable-static \
+    --enable-python \
+    --enable-ruby \
+    --enable-perl \
+    --enable-ipv6
+#make clean
+
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA"
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}

 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-install -m 0644 etc/openwsman.conf %{buildroot}/etc/openwsman
-install -m 0644 etc/ssleay.cnf %{buildroot}/etc/openwsman
-install -D -m 0755 etc/init/%{name}d.sh %{buildroot}/%{_initrddir}/%{name}d
-# move this helper script out of /etc
-mkdir -p %{buildroot}/%{_libexecdir}/%{name}/
-chmod 0755 %{buildroot}/etc/%{name}/owsmangencert.sh
-mv %{buildroot}/etc/%{name}/owsmangencert.sh %{buildroot}/%{_libexecdir}/%{name}/
-find %{buildroot} -type f -name \*.la -exec rm \{\} \;
-find %{buildroot} -type f -name \*.a -exec rm \{\} \;
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/authenticators/*.la
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -m 644 etc/openwsman.conf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 644 etc/ssleay.cnf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 755 etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openwsmand
+ln -sf %{_sysconfdir}/init.d/openwsmand $RPM_BUILD_ROOT%{_sbindir}/rcopenwsmand

 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+%post -n libwsman1 -p /sbin/ldconfig
+
+%postun -n libwsman1 -p /sbin/ldconfig

-%files
+%post server
+/sbin/ldconfig
+chkconfig --add  openwsmand
+
+%preun server
+chkconfig --del openwsmand
+
+%postun server
+rm -f /var/log/wsmand.log
+/sbin/ldconfig
+
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
+
+%files -n libwsman1
 %defattr(-,root,root)
-%{_sbindir}/%{name}d
-%{_initrddir}/%{name}d
-%{_libexecdir}/%{name}
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/authenticators
-%{_libdir}/libwsman*.so.*
-%{_libdir}/%{name}/plugins/*so.*
-%{_libdir}/%{name}/authenticators/*so.*
-%dir /etc/openwsman
-%config(noreplace) /etc/openwsman/openwsman.conf
-%config(noreplace) /etc/openwsman/ssleay.cnf
-%{ruby_libdir}/openwsman
-%config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%doc COPYING README
+%doc AUTHORS COPYING ChangeLog README TODO
+%{_libdir}/libwsman.so.*
+%{_libdir}/libwsman_client.so.*
+%{_libdir}/libwsman_curl_client_transport.so.*

-%files devel
+%files -n libwsman-devel
 %defattr(-,root,root)
 %{_includedir}/*
+%{_libdir}/pkgconfig/*
 %{_libdir}/*.so
-%{_libdir}/%{name}/plugins/*so
-%{_libdir}/%{name}/authenticators/*so
-%{_libdir}/pkgconfig/%{name}*.pc
-%doc COPYING examples/serialize.c doc/plugin*
+%doc AUTHORS COPYING ChangeLog README

 %files python
 %defattr(-,root,root)
-%{python_sitelib}/pywsman.py
 %{python_sitearch}/*.so
-%doc COPYING
+%{python_sitelib}/*.py
+#%{python_sitelib}/*.pyc
+#%{python_sitelib}/*.pyo
+%doc AUTHORS COPYING ChangeLog README

-%files -n ruby-%{name}
+%files ruby
 %defattr(-,root,root)
-%{ruby_sitearch}/*.so
-%doc COPYING
+%{ruby_sitearch}/openwsman.so
+%dir %{ruby_sitelib}/openwsman
+%{ruby_sitelib}/openwsman/openwsman.rb
+%{ruby_sitelib}/openwsman/wsxmlnode.rb
+%doc AUTHORS COPYING ChangeLog README

-%post
-/sbin/ldconfig
-/sbin/chkconfig --add %{name}d
-
-%preun
-if [ $1 = 0 ] ; then
-    /sbin/service %{name}d stop >/dev/null 2>&1
-    /sbin/chkconfig --del %{name}d
-fi
+%files perl
+%defattr(-,root,root)
+%{perl_vendorarch}/openwsman.so
+%{perl_vendorlib}/openwsman.pm
+%doc AUTHORS COPYING ChangeLog README
+
+%files server
+# Don't remove *.so files from the server package.
+# the server fails to start without these files.
+%defattr(-,root,root)
+%dir %{_sysconfdir}/openwsman
+%config(noreplace) %{_sysconfdir}/openwsman/openwsman.conf
+%config(noreplace) %{_sysconfdir}/openwsman/ssleay.cnf
+%attr(0755,root,root) %{_sysconfdir}/openwsman/owsmangencert.sh
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
+%attr(0755,root,root) %{_sysconfdir}/init.d/openwsmand
+%dir %{_libdir}/openwsman
+%dir %{_libdir}/openwsman/authenticators
+%{_libdir}/openwsman/authenticators/*.so
+%{_libdir}/openwsman/authenticators/*.so.*
+%dir %{_libdir}/openwsman/plugins
+%{_libdir}/openwsman/plugins/*.so
+%{_libdir}/openwsman/plugins/*.so.*
+%{_sbindir}/openwsmand
+%{_sbindir}/rcopenwsmand
+%{_libdir}/libwsman_server.so.*
+%doc AUTHORS COPYING ChangeLog README

-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ] ; then
-    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-fi
+%files client
+%defattr(-,root,root)
+%{_libdir}/libwsman_clientpp.so.*
+%doc AUTHORS COPYING ChangeLog README


 %changelog
+* Wed Dec  9 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
+- Re-wrote the spec file to break the openwmsman pkg into lib, client
+- and server components following the upstream spec file.
+
 * Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
 - Updated the sources to 2.2.0. Couple of major changes are as follows:
 - Major changes:
--      Adapt IANA ports of 5985 (http) and 5986 (https)
--      Change the Ruby bindings module name to 'Openwsman'
--      Change the Ruby plugin module name to 'Openwsman'
--      IPv6 support (A_Venkatachalam at Dell.com)
--      preliminary support for wbem intrinsic operations
--           'EnumerateClassNames' and 'GetClass' (kkaempf at suse.de)
+-       Adapt IANA ports of 5985 (http) and 5986 (https)
+-       Change the Ruby bindings module name to 'Openwsman'
+-       Change the Ruby plugin module name to 'Openwsman'
+-       IPv6 support (A_Venkatachalam at Dell.com)
+-       preliminary support for wbem intrinsic operations
+-            'EnumerateClassNames' and 'GetClass' (kkaempf at suse.de)
 -            (needs fixed sblim-sfcc, see www.openwsman.org for details)
--
+

 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.0-4
 - rebuilt with new openssl




From petersen at fedoraproject.org  Sat Dec 12 03:59:38 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 12 Dec 2009 03:59:38 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.113,1.114
Message-ID: <20091212035938.5584211C00C5@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9303

Modified Files:
	ghc.spec 
Log Message:
- remove redundant mingw and perl from ghc-tarballs/
- fix exclusion of ghc internals lib from base packages with -mindepth
- rename the final file lists to PKGNAME.files for clarity




Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- ghc.spec	11 Dec 2009 19:17:18 -0000	1.113
+++ ghc.spec	12 Dec 2009 03:59:37 -0000	1.114
@@ -23,7 +23,7 @@
 Name: ghc
 # break of haskell-platform-2009.2.0.2
 Version: 6.12.1
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -139,6 +139,9 @@ Profiling libraries for the ghc internal
 %prep
 %setup -q -n %{name}-%{version} %{?with_extralibs:-b1}
 
+# make sure we don't use these
+rm -r ghc-tarballs/{mingw,perl}
+
 %build
 cat > mk/build.mk << EOF
 %if %{without prof}
@@ -182,19 +185,20 @@ mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/h
 rmdir ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html-tmp
 
 SRC_TOP=$PWD
-rm -f rpm-*.files
+#rm -f rpm-*.files
+# exclude ghc library since it is subpackaged separately
 ( cd $RPM_BUILD_ROOT
   find .%{_libdir}/%{name}-%{version} -maxdepth 1 -type d ! -name 'include' ! -name 'package.conf.d' ! -name 'ghc-%{version}' -fprintf $SRC_TOP/rpm-lib-dir.files "%%%%dir %%p\n"
-  find .%{_libdir}/%{name}-%{version} -type d \( -path 'ghc-%{version}' -prune -o -fprintf $SRC_TOP/rpm-dev-dir.files "%%%%dir %%p\n" \)
-  find .%{_libdir}/%{name}-%{version} \( -path 'ghc-%{version}' -prune \) -o \( -name 'libHS*-ghc%{version}.so' -fprintf $SRC_TOP/rpm-lib.files "%%%%attr(755,root,root) %%p\n" \) -o \( \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( \( -name '*.hi' -o -name '*.dyn_hi' -o -name 'libHS*.a' -o -name 'HS*.o' -o -name '*.h' -o -name '*.conf' -o -type f -not -name 'package.cache' \) -fprint $SRC_TOP/rpm-base.files \)
-  find .%{_docdir}/%{name}/* -type d ! -name libraries ! -name 'ghc-%{version}' ! -name src > $SRC_TOP/rpm-doc.files
+  find .%{_libdir}/%{name}-%{version} -mindepth 1 -type d \( -name 'ghc-%{version}' -prune -o -fprintf $SRC_TOP/rpm-dev-dir.files "%%%%dir %%p\n" \)
+  find .%{_libdir}/%{name}-%{version} -mindepth 1 \( -name 'ghc-%{version}' -prune \) -o \( -name 'libHS*-ghc%{version}.so' -fprintf $SRC_TOP/rpm-lib.files "%%%%attr(755,root,root) %%p\n" \) -o \( \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/ghc-prof.files \) -o \( \( -name '*.hi' -o -name '*.dyn_hi' -o -name 'libHS*.a' -o -name 'HS*.o' -o -name '*.h' -o -name '*.conf' -o -type f -not -name 'package.cache' \) -fprint $SRC_TOP/rpm-base.files \)
+  find .%{_docdir}/%{name}/* -type d ! -name libraries ! -name 'ghc-%{version}' ! -name src > $SRC_TOP/ghc-doc.files
 )
 
 # make paths absolute (filter "./usr" to "/usr")
-sed -i -e "s|\.%{_prefix}|%{_prefix}|" rpm-*.files
+sed -i -e "s|\.%{_prefix}|%{_prefix}|" *.files
 
-cat rpm-lib-dir.files rpm-lib.files > rpm-libs.files
-cat rpm-dev-dir.files rpm-base.files > rpm-ghc.files
+cat rpm-lib-dir.files rpm-lib.files > ghc-libs.files
+cat rpm-dev-dir.files rpm-base.files > ghc.files
 
 # subpackage ghc library
 %define ghc_version %{version}
@@ -263,16 +267,17 @@ ghc-pkg recache
 # (posttrans to make sure any old documentation has been removed first)
 ( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
 
-%files -f rpm-ghc.files
+%files -f ghc.files
 %defattr(-,root,root,-)
 %doc ANNOUNCE HACKING LICENSE README
 %{_bindir}/*
+%dir %{_libdir}/%{name}-%{version}
 %config(noreplace) %{_libdir}/%{name}-%{version}/package.conf.d/package.cache
 %if %{with manual}
 %{_mandir}/man1/ghc.*
 %endif
 
-%files doc -f rpm-doc.files
+%files doc -f ghc-doc.files
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}/libraries
 %{_docdir}/%{name}/libraries/frames.html
@@ -289,7 +294,7 @@ ghc-pkg recache
 %ghost %{_docdir}/%{name}/libraries/plus.gif
 
 %if %{with shared}
-%files libs -f rpm-libs.files
+%files libs -f ghc-libs.files
 %defattr(-,root,root,-)
 
 %files ghc -f ghc-ghc.files
@@ -303,7 +308,7 @@ ghc-pkg recache
 %defattr(-,root,root,-)
 
 %if %{with prof}
-%files prof -f rpm-prof.files
+%files prof -f ghc-prof.files
 %defattr(-,root,root,-)
 
 %files ghc-prof -f ghc-ghc-prof.files
@@ -311,6 +316,11 @@ ghc-pkg recache
 %endif
 
 %changelog
+* Sat Dec 12 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.2
+- remove redundant mingw and perl from ghc-tarballs/
+- fix exclusion of ghc internals lib from base packages with -mindepth
+- rename the final file lists to PKGNAME.files for clarity
+
 * Fri Dec 11 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.1
 - update to ghc-6.12.1-pre
 - separate bcond options into enabled and disabled for clarity



From kkofler at fedoraproject.org  Sat Dec 12 04:12:13 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 12 Dec 2009 04:12:13 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch,1.5,1.6
Message-ID: <20091212041213.9F0A411C0265@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6184/devel

Modified Files:
	kdebindings-4.3.80-fix-build.patch 
Log Message:
Remove more of the new stuff which doesn't build due to the AWOL abstractaudiooutput.sip file.

kdebindings-4.3.80-fix-build.patch:
 python/pykde4/sip/akonadi/agentfilterproxymodel.sip |    6 ------
 python/pykde4/sip/akonadi/preprocessorbase.sip      |    6 ------
 python/pykde4/sip/phonon/medianode.sip              |   10 +---------
 python/pykde4/sip/phonon/phononmod.sip              |    3 ---
 smoke/nepomuk/smokeconfig.xml                       |    1 +
 5 files changed, 2 insertions(+), 24 deletions(-)

Index: kdebindings-4.3.80-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-fix-build.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kdebindings-4.3.80-fix-build.patch	12 Dec 2009 03:33:41 -0000	1.5
+++ kdebindings-4.3.80-fix-build.patch	12 Dec 2009 04:12:12 -0000	1.6
@@ -58,6 +58,34 @@ diff -ur kdebindings-4.3.80/python/pykde
      else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
          sipClass = sipClass_Akonadi_StatisticsProxyModel;
      else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
+diff -ur kdebindings-4.3.80/python/pykde4/sip/phonon/medianode.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/medianode.sip
+--- kdebindings-4.3.80/python/pykde4/sip/phonon/medianode.sip	2009-11-21 10:43:24.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/medianode.sip	2009-12-12 05:11:05.000000000 +0100
+@@ -41,13 +41,7 @@
+     // CTSCC for subclasses of 'MediaNode'
+     sipType = NULL;
+ 
+-    if (dynamic_cast<Phonon::AbstractAudioOutput*>(sipCpp))
+-        {
+-        sipType = sipType_Phonon_AbstractAudioOutput;
+-        if (dynamic_cast<Phonon::AudioDataOutput*>(sipCpp))
+-            sipType = sipType_Phonon_AudioDataOutput;
+-        }
+-    else if (dynamic_cast<Phonon::AbstractVideoOutput*>(sipCpp))
++    if (dynamic_cast<Phonon::AbstractVideoOutput*>(sipCpp))
+         sipType = sipType_Phonon_AbstractVideoOutput;
+     else if (dynamic_cast<Phonon::Effect*>(sipCpp))
+         {
+@@ -67,9 +61,7 @@
+ 
+ %ModuleHeaderCode
+ //ctscc
+-#include <phonon/abstractaudiooutput.h>
+ #include <phonon/abstractvideooutput.h>
+-#include <phonon/audiodataoutput.h>
+ #include <phonon/effect.h>
+ #include <phonon/medianode.h>
+ #include <phonon/mediaobject.h>
 diff -ur kdebindings-4.3.80/python/pykde4/sip/phonon/phononmod.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/phononmod.sip
 --- kdebindings-4.3.80/python/pykde4/sip/phonon/phononmod.sip	2009-11-21 10:43:24.000000000 +0100
 +++ kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/phononmod.sip	2009-12-12 04:28:58.000000000 +0100



From pkgdb at fedoraproject.org  Sat Dec 12 05:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:10:35 +0000
Subject: [pkgdb] raptor: oget has given up watchbugzilla
Message-ID: <20091212051035.E29DC10F891@bastion2.fedora.phx.redhat.com>

oget has given up the watchbugzilla acl on raptor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:10:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:10:39 +0000
Subject: [pkgdb] raptor: oget has given up watchcommits
Message-ID: <20091212051039.4819A10F891@bastion2.fedora.phx.redhat.com>

oget has given up the watchcommits acl on raptor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:10:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:10:42 +0000
Subject: [pkgdb] raptor: oget has requested commit
Message-ID: <20091212051042.44FE610F891@bastion2.fedora.phx.redhat.com>

oget has requested the commit acl on raptor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:10:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:10:42 +0000
Subject: [pkgdb] raptor: oget has requested approveacls
Message-ID: <20091212051042.8EA9610F89E@bastion2.fedora.phx.redhat.com>

oget has requested the approveacls acl on raptor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:11:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:11:06 +0000
Subject: [pkgdb] raptor: oget has given up watchcommits
Message-ID: <20091212051107.0908810F891@bastion2.fedora.phx.redhat.com>

oget has given up the watchcommits acl on raptor (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:11:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:11:10 +0000
Subject: [pkgdb] raptor: oget has given up watchbugzilla
Message-ID: <20091212051110.2103110F891@bastion2.fedora.phx.redhat.com>

oget has given up the watchbugzilla acl on raptor (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:11:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:11:32 +0000
Subject: [pkgdb] raptor: oget has requested commit
Message-ID: <20091212051132.C804510F891@bastion2.fedora.phx.redhat.com>

oget has requested the commit acl on raptor (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:11:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:11:38 +0000
Subject: [pkgdb] raptor: oget has requested approveacls
Message-ID: <20091212051138.662DA10F891@bastion2.fedora.phx.redhat.com>

oget has requested the approveacls acl on raptor (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:13:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:13:39 +0000
Subject: [pkgdb] rasqal: oget has given up watchcommits
Message-ID: <20091212051339.A192110F891@bastion2.fedora.phx.redhat.com>

oget has given up the watchcommits acl on rasqal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rasqal



From pkgdb at fedoraproject.org  Sat Dec 12 05:13:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:13:41 +0000
Subject: [pkgdb] rasqal: oget has requested approveacls
Message-ID: <20091212051341.23CF910F891@bastion2.fedora.phx.redhat.com>

oget has requested the approveacls acl on rasqal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rasqal



From pkgdb at fedoraproject.org  Sat Dec 12 05:13:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:13:55 +0000
Subject: [pkgdb] rasqal: oget has requested commit
Message-ID: <20091212051355.AEB9210F891@bastion2.fedora.phx.redhat.com>

oget has requested the commit acl on rasqal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rasqal



From pkgdb at fedoraproject.org  Sat Dec 12 05:13:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:13:57 +0000
Subject: [pkgdb] rasqal: oget has given up watchbugzilla
Message-ID: <20091212051357.E9F3A10F89C@bastion2.fedora.phx.redhat.com>

oget has given up the watchbugzilla acl on rasqal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rasqal



From pkgdb at fedoraproject.org  Sat Dec 12 05:14:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:14:04 +0000
Subject: [pkgdb] rasqal: oget has given up watchcommits
Message-ID: <20091212051404.B7C2B10F891@bastion2.fedora.phx.redhat.com>

oget has given up the watchcommits acl on rasqal (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rasqal



From pkgdb at fedoraproject.org  Sat Dec 12 05:14:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:14:05 +0000
Subject: [pkgdb] rasqal: oget has requested commit
Message-ID: <20091212051405.AB8A510F89A@bastion2.fedora.phx.redhat.com>

oget has requested the commit acl on rasqal (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rasqal



From pkgdb at fedoraproject.org  Sat Dec 12 05:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:14:06 +0000
Subject: [pkgdb] rasqal: oget has requested approveacls
Message-ID: <20091212051406.7DFE110F891@bastion2.fedora.phx.redhat.com>

oget has requested the approveacls acl on rasqal (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rasqal



From pkgdb at fedoraproject.org  Sat Dec 12 05:14:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:14:17 +0000
Subject: [pkgdb] rasqal: oget has given up watchbugzilla
Message-ID: <20091212051417.3F80910F891@bastion2.fedora.phx.redhat.com>

oget has given up the watchbugzilla acl on rasqal (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rasqal



From pkgdb at fedoraproject.org  Sat Dec 12 05:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:14:53 +0000
Subject: [pkgdb] redland: oget has given up watchcommits
Message-ID: <20091212051453.8E7C010F89A@bastion2.fedora.phx.redhat.com>

oget has given up the watchcommits acl on redland (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:14:54 +0000
Subject: [pkgdb] redland: oget has requested approveacls
Message-ID: <20091212051454.BA52510F89A@bastion2.fedora.phx.redhat.com>

oget has requested the approveacls acl on redland (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:15:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:15:09 +0000
Subject: [pkgdb] redland: oget has requested commit
Message-ID: <20091212051509.B464D10F89A@bastion2.fedora.phx.redhat.com>

oget has requested the commit acl on redland (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:15:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:15:10 +0000
Subject: [pkgdb] redland: oget has given up watchbugzilla
Message-ID: <20091212051511.085EF10F89D@bastion2.fedora.phx.redhat.com>

oget has given up the watchbugzilla acl on redland (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:15:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:15:19 +0000
Subject: [pkgdb] redland: oget has given up watchcommits
Message-ID: <20091212051519.DD5CC10F89A@bastion2.fedora.phx.redhat.com>

oget has given up the watchcommits acl on redland (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:15:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:15:41 +0000
Subject: [pkgdb] redland: oget has given up watchbugzilla
Message-ID: <20091212051541.C0D6810F89A@bastion2.fedora.phx.redhat.com>

oget has given up the watchbugzilla acl on redland (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:15:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:15:42 +0000
Subject: [pkgdb] redland: oget has requested commit
Message-ID: <20091212051542.D6FFE10F89A@bastion2.fedora.phx.redhat.com>

oget has requested the commit acl on redland (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:15:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:15:43 +0000
Subject: [pkgdb] redland: oget has requested approveacls
Message-ID: <20091212051543.4A72410F8A2@bastion2.fedora.phx.redhat.com>

oget has requested the approveacls acl on redland (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:16:45 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051645.2695210F891@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on raptor (Fedora devel) to Awaiting Review for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:16:46 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051646.57F6410F891@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on raptor (Fedora devel) to Awaiting Review for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:16:50 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051650.8A4B810F891@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on raptor (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:16:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:16:52 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051652.6375810F891@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on raptor (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:16:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:16:52 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051652.9EAF710F89E@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on raptor (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:16:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:16:54 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051654.3264F10F89C@bastion2.fedora.phx.redhat.com>

kkofler has set the approveacls acl on raptor (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:17:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:17:03 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051703.33C4810F891@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on raptor (Fedora 12) to Awaiting Review for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:17:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:17:05 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051705.4743510F891@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on raptor (Fedora 12) to Awaiting Review for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:17:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:17:08 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051709.06DB910F891@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on raptor (Fedora 12) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:17:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:17:20 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051720.3DD0A10F891@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on raptor (Fedora 12) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:17:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:17:21 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051721.7D87A10F891@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on raptor (Fedora 12) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:17:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:17:24 +0000
Subject: [pkgdb] raptor had acl change status
Message-ID: <20091212051724.C3CFF10F891@bastion2.fedora.phx.redhat.com>

kkofler has set the approveacls acl on raptor (Fedora 12) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raptor



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:14 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051814.4D16E10F89A@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on redland (Fedora devel) to Awaiting Review for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:15 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051815.A36D710F89A@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on redland (Fedora devel) to Awaiting Review for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:20 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051821.053C610F89A@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on redland (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:22 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051822.5D4EE10F89A@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on redland (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:23 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051823.2975610F89D@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on redland (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:23 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051824.0B0C710F89A@bastion2.fedora.phx.redhat.com>

kkofler has set the approveacls acl on redland (Fedora devel) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:32 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051832.45D0210F89A@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on redland (Fedora 12) to Awaiting Review for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:32 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051832.DA4D410F89D@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on redland (Fedora 12) to Awaiting Review for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:37 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051837.3664A10F89A@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on redland (Fedora 12) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:37 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051837.C8DE310F865@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on redland (Fedora 12) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:38 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051838.940EB10F89D@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on redland (Fedora 12) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From pkgdb at fedoraproject.org  Sat Dec 12 05:18:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 05:18:39 +0000
Subject: [pkgdb] redland had acl change status
Message-ID: <20091212051839.8929610F89A@bastion2.fedora.phx.redhat.com>

kkofler has set the approveacls acl on redland (Fedora 12) to Approved for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redland



From emaldonado at fedoraproject.org  Sat Dec 12 06:16:21 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 12 Dec 2009 06:16:21 +0000 (UTC)
Subject: File nss-pem-20091208.tar.bz2 uploaded to lookaside cache by
	emaldonado
Message-ID: <20091212061621.0569E10F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nss:

3d7e42205aac21b29eecc65420aa1120  nss-pem-20091208.tar.bz2



From oget at fedoraproject.org  Sat Dec 12 06:24:29 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 12 Dec 2009 06:24:29 +0000 (UTC)
Subject: File raptor-1.4.20.tar.gz uploaded to lookaside cache by oget
Message-ID: <20091212062429.6080310F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for raptor:

4d9c950ea794d3e141ff60875b0a2bbc  raptor-1.4.20.tar.gz



From oget at fedoraproject.org  Sat Dec 12 06:25:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 12 Dec 2009 06:25:30 +0000 (UTC)
Subject: rpms/raptor/devel .cvsignore, 1.6, 1.7 raptor.spec, 1.18,
	1.19 sources, 1.6, 1.7
Message-ID: <20091212062530.54AC111C0264@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/raptor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24487

Modified Files:
	.cvsignore raptor.spec sources 
Log Message:
* Sat Dec 12 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.20-1
- New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/raptor/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 Jul 2008 13:07:10 -0000	1.6
+++ .cvsignore	12 Dec 2009 06:25:29 -0000	1.7
@@ -1 +1 @@
-raptor-1.4.18.tar.gz
+raptor-1.4.20.tar.gz


Index: raptor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/raptor/devel/raptor.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- raptor.spec	29 Oct 2009 06:07:45 -0000	1.18
+++ raptor.spec	12 Dec 2009 06:25:29 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
-Version:       1.4.18
-Release:       5%{?dist}
+Version:       1.4.20
+Release:       1%{?dist}
 License:       LGPLv2+ or ASL 2.0
 Group:         System Environment/Libraries
 Source:        http://download.librdf.org/source/raptor-%{version}.tar.gz
@@ -31,6 +31,11 @@ RDF/XML or N-Triples.
 %setup -q
 %patch0 -p1 -b .multilib
 
+# Fix encoding
+iconv -f ISO-8859-1 -t UTF8 NEWS > NEWS.tmp
+touch -r NEWS NEWS.tmp
+mv -f NEWS.tmp NEWS
+
 # hack to nuke rpaths
 %if "%{_libdir}" != "/usr/lib"
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -55,8 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
-%doc %{_mandir}/man1/rapper.1*
+%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html
+%doc LICENSE.txt  NEWS NEWS.html NOTICE README README.html RELEASE.html
+%{_mandir}/man1/rapper.1*
 %{_libdir}/libraptor.so.1*
 %{_bindir}/rapper
 
@@ -75,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/raptor-config
 
 %changelog
+* Sat Dec 12 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.20-1
+- New version.
+
 * Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
 - Fix multilib conflict (RHBZ#477342)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/raptor/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Jul 2008 13:07:10 -0000	1.6
+++ sources	12 Dec 2009 06:25:29 -0000	1.7
@@ -1 +1 @@
-284e768eeda0e2898b0d5bf7e26a016e  raptor-1.4.18.tar.gz
+4d9c950ea794d3e141ff60875b0a2bbc  raptor-1.4.20.tar.gz



From emaldonado at fedoraproject.org  Sat Dec 12 06:27:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 12 Dec 2009 06:27:49 +0000 (UTC)
Subject: File nss-pem-20091210.tar.bz2 uploaded to lookaside cache by
	emaldonado
Message-ID: <20091212062749.1933910F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for nss:

82c2c72c961f2783c8e975a42fa939cf  nss-pem-20091210.tar.bz2



From emaldonado at fedoraproject.org  Sat Dec 12 06:40:32 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 12 Dec 2009 06:40:32 +0000 (UTC)
Subject: rpms/nss/devel .cvsignore,1.28,1.29 sources,1.30,1.31
Message-ID: <20091212064032.52F9D11C03FC@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30129

Modified Files:
	.cvsignore sources 
Log Message:
Remove redundant header from pem module


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	3 Dec 2009 22:13:38 -0000	1.28
+++ .cvsignore	12 Dec 2009 06:40:29 -0000	1.29
@@ -1,2 +1,2 @@
 nss-3.12.5-stripped.tar.bz2
-nss-pem-20090907.tar.bz2
+nss-pem-20091210.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	3 Dec 2009 22:13:38 -0000	1.30
+++ sources	12 Dec 2009 06:40:30 -0000	1.31
@@ -1,2 +1,2 @@
 51c5958153b6c01fada2e74cedc66835  nss-3.12.5-stripped.tar.bz2
-895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2
+82c2c72c961f2783c8e975a42fa939cf  nss-pem-20091210.tar.bz2



From emaldonado at fedoraproject.org  Sat Dec 12 06:48:43 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 12 Dec 2009 06:48:43 +0000 (UTC)
Subject: rpms/nss/devel nsssysinit.patch,NONE,1.1 nss.spec,1.128,1.129
Message-ID: <20091212064843.9351111C0264@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv720

Modified Files:
	nss.spec 
Added Files:
	nsssysinit.patch 
Log Message:
Patch nsssysinit to set the default flags on the crypto module - #545779

nsssysinit.patch:
 nsssysinit.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE nsssysinit.patch ---
Index: mozilla/security/nss/lib/sysinit/nsssysinit.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/sysinit/nsssysinit.c,v
retrieving revision 1.1
diff -u -p -r1.1 nsssysinit.c
--- mozilla/security/nss/lib/sysinit/nsssysinit.c	8 Oct 2009 17:08:36 -0000	1.1
+++ mozilla/security/nss/lib/sysinit/nsssysinit.c	12 Dec 2009 03:34:17 -0000
@@ -198,11 +198,20 @@ getFIPSMode(void)
  * the decision making process.
  *
  */
+static const char *nssDefaultFlags = "trustOrder=75 cipherOrder=100 \
+slotParams={0x00000001=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM \
+askpw=any timeout=30 ] }  ";
+static const char *nssDefaultFIPSFlags = "trustOrder=75 cipherOrder=100 \
+slotParams={0x00000003=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM \
+askpw=any timeout=30 ] }  ";
+
 static char **
 get_list(char *filename, char *stripped_parameters)
 {
     char **module_list = PORT_ZNewArray(char *, 4);
     char *userdb;
+    int isFIPS = getFIPSMode();
+    const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
     int next = 0;
 
     /* can't get any space */
@@ -217,8 +226,9 @@ get_list(char *filename, char *stripped_
 	    "library= "
 	    "module=\"NSS User database\" "
 	    "parameters=\"configdir='sql:%s' %s\" "
-	    "NSS=\"flags=internal%s\"", 
-		userdb, stripped_parameters, getFIPSMode() ? ",FIPS" : "");
+        "NSS=\"%sflags=internal%s\"",
+        userdb, stripped_parameters, nssflags,
+        isFIPS ? ",FIPS" : "");
 
 	/* now open the user's defined PKCS #11 modules */
 	/* skip the local user DB entry */
@@ -235,7 +245,7 @@ get_list(char *filename, char *stripped_
 	"library= "
 	"module=\"NSS system database\" "
 	"parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
-	"NSS=\"flags=internal,critical\"",filename);
+    "NSS=\"%sflags=internal,critical\"",filename, nssDefaultFlags);
 
     /* that was the last module */
     module_list[next] = 0;


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- nss.spec	9 Dec 2009 17:04:26 -0000	1.128
+++ nss.spec	12 Dec 2009 06:48:43 -0000	1.129
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.4
+Release:          1%{?dist}.5
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -43,6 +43,7 @@ Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           533125-ammend.patch
 Patch8:           nss-sysinit.patch
+Patch9:           nsssysinit.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -110,6 +111,7 @@ low level services.
 %patch6 -p0 -b .libpem
 %patch7 -p0 -b .533125-ammend
 %patch8 -p0 -b .sysinit
+%patch9 -p0 -b .nsssysinit
 
 %build
 
@@ -471,7 +473,11 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
-* Wed Dec 09 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-2.1
+* Thu Dec 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.5
+- Fix nsssysinit to set the default flags on the crypto module (#545779)
+- Remove redundant header from the pem module
+
+* Wed Dec 09 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.1
 - Remove unneeded patch
 
 * Thu Dec 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.1



From llaumgui at fedoraproject.org  Sat Dec 12 08:20:05 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 12 Dec 2009 08:20:05 +0000 (UTC)
Subject: File DatabaseSchema-1.4.3.tgz uploaded to lookaside cache by
	llaumgui
Message-ID: <20091212082005.EFA4310F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-ezc-DatabaseSchema:

f6b1f59ada5b7166dd9f99f09e7538d1  DatabaseSchema-1.4.3.tgz



From llaumgui at fedoraproject.org  Sat Dec 12 08:29:01 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 12 Dec 2009 08:29:01 +0000 (UTC)
Subject: rpms/php-ezc-DatabaseSchema/F-12 .cvsignore, 1.2,
	1.3 php-ezc-DatabaseSchema.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091212082901.5F44611C0265@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-DatabaseSchema/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4468/F-12

Modified Files:
	.cvsignore php-ezc-DatabaseSchema.spec sources 
Log Message:
Update to 1.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Nov 2009 09:36:25 -0000	1.2
+++ .cvsignore	12 Dec 2009 08:29:00 -0000	1.3
@@ -1 +1 @@
-DatabaseSchema-1.4.2.tgz
+DatabaseSchema-1.4.3.tgz


Index: php-ezc-DatabaseSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/F-12/php-ezc-DatabaseSchema.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-DatabaseSchema.spec	18 Nov 2009 09:36:25 -0000	1.1
+++ php-ezc-DatabaseSchema.spec	12 Dec 2009 08:29:00 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-DatabaseSchema
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        A set of classes that allow you to use information from a database schema
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6
+Requires:       php-pear(%{channel}/Base) >= 1.7
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -92,5 +92,8 @@ fi
 
 
 %changelog
+* Sat Dec 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.3-1
+- Update to 1.4.3
+
 * Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.2-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Nov 2009 09:36:25 -0000	1.2
+++ sources	12 Dec 2009 08:29:00 -0000	1.3
@@ -1 +1 @@
-9448d755177150cfe848ed27c41c3c38  DatabaseSchema-1.4.2.tgz
+f6b1f59ada5b7166dd9f99f09e7538d1  DatabaseSchema-1.4.3.tgz



From llaumgui at fedoraproject.org  Sat Dec 12 08:29:01 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 12 Dec 2009 08:29:01 +0000 (UTC)
Subject: rpms/php-ezc-DatabaseSchema/devel .cvsignore, 1.2,
	1.3 php-ezc-DatabaseSchema.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091212082901.5F55411C02C8@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-DatabaseSchema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4468/devel

Modified Files:
	.cvsignore php-ezc-DatabaseSchema.spec sources 
Log Message:
Update to 1.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Nov 2009 09:30:04 -0000	1.2
+++ .cvsignore	12 Dec 2009 08:29:00 -0000	1.3
@@ -1 +1 @@
-DatabaseSchema-1.4.2.tgz
+DatabaseSchema-1.4.3.tgz


Index: php-ezc-DatabaseSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/devel/php-ezc-DatabaseSchema.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-DatabaseSchema.spec	18 Nov 2009 09:30:05 -0000	1.1
+++ php-ezc-DatabaseSchema.spec	12 Dec 2009 08:29:00 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-DatabaseSchema
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        A set of classes that allow you to use information from a database schema
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6
+Requires:       php-pear(%{channel}/Base) >= 1.7
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -92,5 +92,8 @@ fi
 
 
 %changelog
+* Sat Dec 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.3-1
+- Update to 1.4.3
+
 * Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.2-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Nov 2009 09:30:05 -0000	1.2
+++ sources	12 Dec 2009 08:29:00 -0000	1.3
@@ -1 +1 @@
-9448d755177150cfe848ed27c41c3c38  DatabaseSchema-1.4.2.tgz
+f6b1f59ada5b7166dd9f99f09e7538d1  DatabaseSchema-1.4.3.tgz



From llaumgui at fedoraproject.org  Sat Dec 12 08:29:01 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 12 Dec 2009 08:29:01 +0000 (UTC)
Subject: rpms/php-ezc-DatabaseSchema/F-11 .cvsignore, 1.2,
	1.3 php-ezc-DatabaseSchema.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091212082901.5F3F511C0264@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-DatabaseSchema/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4468/F-11

Modified Files:
	.cvsignore php-ezc-DatabaseSchema.spec sources 
Log Message:
Update to 1.4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Nov 2009 09:34:24 -0000	1.2
+++ .cvsignore	12 Dec 2009 08:28:59 -0000	1.3
@@ -1 +1 @@
-DatabaseSchema-1.4.2.tgz
+DatabaseSchema-1.4.3.tgz


Index: php-ezc-DatabaseSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/F-11/php-ezc-DatabaseSchema.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-DatabaseSchema.spec	18 Nov 2009 09:34:24 -0000	1.1
+++ php-ezc-DatabaseSchema.spec	12 Dec 2009 08:28:59 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-DatabaseSchema
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        A set of classes that allow you to use information from a database schema
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6
+Requires:       php-pear(%{channel}/Base) >= 1.7
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -92,5 +92,8 @@ fi
 
 
 %changelog
+* Sat Dec 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.3-1
+- Update to 1.4.3
+
 * Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.2-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-DatabaseSchema/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Nov 2009 09:34:24 -0000	1.2
+++ sources	12 Dec 2009 08:28:59 -0000	1.3
@@ -1 +1 @@
-9448d755177150cfe848ed27c41c3c38  DatabaseSchema-1.4.2.tgz
+f6b1f59ada5b7166dd9f99f09e7538d1  DatabaseSchema-1.4.3.tgz



From llaumgui at fedoraproject.org  Sat Dec 12 08:38:58 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 12 Dec 2009 08:38:58 +0000 (UTC)
Subject: File bytekit-1.0.0.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091212083858.82B9710F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for php-phpunit-bytekit:

833f1cd7f385cb8b39c88102a5ba3911  bytekit-1.0.0.tgz



From llaumgui at fedoraproject.org  Sat Dec 12 08:39:58 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 12 Dec 2009 08:39:58 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit/devel import.log, NONE,
	1.1 php-phpunit-bytekit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091212083958.408D111C0264@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-bytekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8526/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-phpunit-bytekit.spec 
Log Message:
"Initial import"



--- NEW FILE import.log ---
php-phpunit-bytekit-1_0_0-2_fc12:HEAD:php-phpunit-bytekit-1.0.0-2.fc12.src.rpm:1260607148


--- NEW FILE php-phpunit-bytekit.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name bytekit
%define channel pear.phpunit.de

Name:           php-phpunit-bytekit
Version:        1.0.0
Release:        2%{?dist}
Summary:        A command-line tool built on the PHP Bytekit extension

Group:          Development/Libraries
License:        BSD
URL:            http://github.com/sebastianbergmann/bytekit-cli
Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-channel(%{channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Bytekit is a PHP extension that provides userspace access to the opcodes
generated by PHP's compiler.

bytekit-cli is a command-line tool that leverages Bytekit to perform common code
analysis tasks.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
%{__sed} -i -e "s@<min>1.8.1</min>@<min>1.7.2</min>@" %{name}.xml


%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 %{name}.xml

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.phpunit.de/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Bytekit/Scanner/Rule/DisallowedOpcodes.php
%{pear_phpdir}/Bytekit/Scanner/Rule/DirectOutput.php
%{pear_phpdir}/Bytekit/Scanner/Rule.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Graph.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Text.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/Text.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/XML.php
%{pear_phpdir}/Bytekit/TextUI/Command.php
%{pear_phpdir}/Bytekit/TextUI/Getopt.php
%{pear_phpdir}/Bytekit/Util/FilterIterator.php
%{pear_phpdir}/Bytekit/Disassembler.php
%{pear_phpdir}/Bytekit/Functions.php
%{pear_phpdir}/Bytekit/Scanner.php
%{_bindir}/bytekit


%changelog
* Thu Nov 26 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-2
- F-(10|11)

* Wed Oct 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:41:24 -0000	1.1
+++ .cvsignore	12 Dec 2009 08:39:57 -0000	1.2
@@ -0,0 +1 @@
+bytekit-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:41:25 -0000	1.1
+++ sources	12 Dec 2009 08:39:57 -0000	1.2
@@ -0,0 +1 @@
+833f1cd7f385cb8b39c88102a5ba3911  bytekit-1.0.0.tgz



From llaumgui at fedoraproject.org  Sat Dec 12 08:43:05 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 12 Dec 2009 08:43:05 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit/F-12 import.log, NONE,
	1.1 php-phpunit-bytekit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091212084305.3891611C0264@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-bytekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9716/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-phpunit-bytekit.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
php-phpunit-bytekit-1_0_0-2_fc12:F-12:php-phpunit-bytekit-1.0.0-2.fc12.src.rpm:1260607291


--- NEW FILE php-phpunit-bytekit.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name bytekit
%define channel pear.phpunit.de

Name:           php-phpunit-bytekit
Version:        1.0.0
Release:        2%{?dist}
Summary:        A command-line tool built on the PHP Bytekit extension

Group:          Development/Libraries
License:        BSD
URL:            http://github.com/sebastianbergmann/bytekit-cli
Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-channel(%{channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Bytekit is a PHP extension that provides userspace access to the opcodes
generated by PHP's compiler.

bytekit-cli is a command-line tool that leverages Bytekit to perform common code
analysis tasks.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
%{__sed} -i -e "s@<min>1.8.1</min>@<min>1.7.2</min>@" %{name}.xml


%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 %{name}.xml

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.phpunit.de/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Bytekit/Scanner/Rule/DisallowedOpcodes.php
%{pear_phpdir}/Bytekit/Scanner/Rule/DirectOutput.php
%{pear_phpdir}/Bytekit/Scanner/Rule.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Graph.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Text.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/Text.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/XML.php
%{pear_phpdir}/Bytekit/TextUI/Command.php
%{pear_phpdir}/Bytekit/TextUI/Getopt.php
%{pear_phpdir}/Bytekit/Util/FilterIterator.php
%{pear_phpdir}/Bytekit/Disassembler.php
%{pear_phpdir}/Bytekit/Functions.php
%{pear_phpdir}/Bytekit/Scanner.php
%{_bindir}/bytekit


%changelog
* Thu Nov 26 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-2
- F-(10|11)

* Wed Oct 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:41:24 -0000	1.1
+++ .cvsignore	12 Dec 2009 08:43:04 -0000	1.2
@@ -0,0 +1 @@
+bytekit-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:41:25 -0000	1.1
+++ sources	12 Dec 2009 08:43:04 -0000	1.2
@@ -0,0 +1 @@
+833f1cd7f385cb8b39c88102a5ba3911  bytekit-1.0.0.tgz



From llaumgui at fedoraproject.org  Sat Dec 12 08:45:30 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 12 Dec 2009 08:45:30 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit/F-11 import.log, NONE,
	1.1 php-phpunit-bytekit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091212084530.8246211C0264@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-bytekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11094/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-phpunit-bytekit.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
php-phpunit-bytekit-1_0_0-2_fc12:F-11:php-phpunit-bytekit-1.0.0-2.fc12.src.rpm:1260607474


--- NEW FILE php-phpunit-bytekit.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name bytekit
%define channel pear.phpunit.de

Name:           php-phpunit-bytekit
Version:        1.0.0
Release:        2%{?dist}
Summary:        A command-line tool built on the PHP Bytekit extension

Group:          Development/Libraries
License:        BSD
URL:            http://github.com/sebastianbergmann/bytekit-cli
Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-channel(%{channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
Bytekit is a PHP extension that provides userspace access to the opcodes
generated by PHP's compiler.

bytekit-cli is a command-line tool that leverages Bytekit to perform common code
analysis tasks.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
%{__sed} -i -e "s@<min>1.8.1</min>@<min>1.7.2</min>@" %{name}.xml


%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 %{name}.xml

# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.phpunit.de/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Bytekit/Scanner/Rule/DisallowedOpcodes.php
%{pear_phpdir}/Bytekit/Scanner/Rule/DirectOutput.php
%{pear_phpdir}/Bytekit/Scanner/Rule.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Graph.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Text.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/Text.php
%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/XML.php
%{pear_phpdir}/Bytekit/TextUI/Command.php
%{pear_phpdir}/Bytekit/TextUI/Getopt.php
%{pear_phpdir}/Bytekit/Util/FilterIterator.php
%{pear_phpdir}/Bytekit/Disassembler.php
%{pear_phpdir}/Bytekit/Functions.php
%{pear_phpdir}/Bytekit/Scanner.php
%{_bindir}/bytekit


%changelog
* Thu Nov 26 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-2
- F-(10|11)

* Wed Oct 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:41:24 -0000	1.1
+++ .cvsignore	12 Dec 2009 08:45:30 -0000	1.2
@@ -0,0 +1 @@
+bytekit-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:41:25 -0000	1.1
+++ sources	12 Dec 2009 08:45:30 -0000	1.2
@@ -0,0 +1 @@
+833f1cd7f385cb8b39c88102a5ba3911  bytekit-1.0.0.tgz



From pkgdb at fedoraproject.org  Sat Dec 12 09:40:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 09:40:03 +0000
Subject: [pkgdb] mono: snecker has requested commit
Message-ID: <20091212094003.7320710F891@bastion2.fedora.phx.redhat.com>

snecker has requested the commit acl on mono (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Dec 12 09:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 09:40:21 +0000
Subject: [pkgdb] mono: snecker has requested commit
Message-ID: <20091212094021.3F28710F891@bastion2.fedora.phx.redhat.com>

snecker has requested the commit acl on mono (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Dec 12 09:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 12 Dec 2009 09:40:35 +0000
Subject: [pkgdb] mono: snecker has requested commit
Message-ID: <20091212094035.A388E10F891@bastion2.fedora.phx.redhat.com>

snecker has requested the commit acl on mono (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mono



From petersen at fedoraproject.org  Sat Dec 12 10:47:39 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 12 Dec 2009 10:47:39 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.114,1.115
Message-ID: <20091212104739.8AFE311C0264@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18188

Modified Files:
	ghc.spec 
Log Message:
- exclude ghc .conf file from package.conf.d in base package
- use ghc_reindex_haddock
- add scripts for ghc-ghc-devel and ghc-ghc-doc
- add doc bcond




Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- ghc.spec	12 Dec 2009 03:59:37 -0000	1.114
+++ ghc.spec	12 Dec 2009 10:47:38 -0000	1.115
@@ -3,10 +3,11 @@
 %ifarch %{ix86} x86_64
 %bcond_without shared
 %endif
+%bcond_without doc
 # test builds can made faster and smaller by disabling profiled libraries
 # (currently libHSrts_thr_p.a breaks no prof build)
 %bcond_without prof
-# build users_guide, etc
+# build xml manuals (users_guide, etc)
 %bcond_without manual
 
 ## default disabled options ##
@@ -23,7 +24,7 @@
 Name: ghc
 # break of haskell-platform-2009.2.0.2
 Version: 6.12.1
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -77,13 +78,17 @@ Preformatted documentation for the Glori
 (GHC) and its libraries.  It should be installed if you like to have local
 access to the documentation in HTML format.
 
+%if %{with doc}
 %package ghc-doc
 Summary: Documentation for the ghc internals library
 Group: Development/Languages
-Requires(posttrans): %{name} = %{version}-%{release}
+Requires: %{name}-doc = %{version}
+Requires(post): %{name}-doc = %{version}
+Requires(postun): %{name}-doc = %{version}
 
 %description ghc-doc
 Documentation for the ghc internals library.
+%endif
 
 %package ghc-devel
 Summary: Development files for ghc internals
@@ -147,8 +152,10 @@ cat > mk/build.mk << EOF
 %if %{without prof}
 GhcLibWays = v %{?with_shared:dyn}
 %endif
-%if %{without manual}
+%if %{without doc}
 HADDOCK_DOCS       = NO
+%endif
+%if %{without manual}
 BUILD_DOCBOOK_HTML = NO
 %endif
 %if %{with quick}
@@ -190,7 +197,7 @@ SRC_TOP=$PWD
 ( cd $RPM_BUILD_ROOT
   find .%{_libdir}/%{name}-%{version} -maxdepth 1 -type d ! -name 'include' ! -name 'package.conf.d' ! -name 'ghc-%{version}' -fprintf $SRC_TOP/rpm-lib-dir.files "%%%%dir %%p\n"
   find .%{_libdir}/%{name}-%{version} -mindepth 1 -type d \( -name 'ghc-%{version}' -prune -o -fprintf $SRC_TOP/rpm-dev-dir.files "%%%%dir %%p\n" \)
-  find .%{_libdir}/%{name}-%{version} -mindepth 1 \( -name 'ghc-%{version}' -prune \) -o \( -name 'libHS*-ghc%{version}.so' -fprintf $SRC_TOP/rpm-lib.files "%%%%attr(755,root,root) %%p\n" \) -o \( \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/ghc-prof.files \) -o \( \( -name '*.hi' -o -name '*.dyn_hi' -o -name 'libHS*.a' -o -name 'HS*.o' -o -name '*.h' -o -name '*.conf' -o -type f -not -name 'package.cache' \) -fprint $SRC_TOP/rpm-base.files \)
+  find .%{_libdir}/%{name}-%{version} -mindepth 1 \( -name 'ghc-%{version}*' -prune \) -o \( -name 'libHS*-ghc%{version}.so' -fprintf $SRC_TOP/rpm-lib.files "%%%%attr(755,root,root) %%p\n" \) -o \( \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/ghc-prof.files \) -o \( \( -name '*.hi' -o -name '*.dyn_hi' -o -name 'libHS*.a' -o -name 'HS*.o' -o -name '*.h' -o -name '*.conf' -o -type f -not -name 'package.cache' \) -fprint $SRC_TOP/rpm-base.files \)
   find .%{_docdir}/%{name}/* -type d ! -name libraries ! -name 'ghc-%{version}' ! -name src > $SRC_TOP/ghc-doc.files
 )
 
@@ -261,11 +268,28 @@ if [ "$1" = 0 ]; then
 fi
 
 %posttrans
+# (posttrans to make sure any old libs have been removed first)
+ghc-pkg recache
+
+%post ghc-devel
+ghc-pkg recache
+
+%postun ghc-devel
 ghc-pkg recache
 
 %posttrans doc
-# (posttrans to make sure any old documentation has been removed first)
-( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
+# (posttrans to make sure any old docs have been removed first)
+%ghc_reindex_haddock
+
+%if %{with doc}
+%post ghc-doc
+%ghc_reindex_haddock
+
+%postun ghc-doc
+if [ "$1" -eq 0 ] ; then
+  %ghc_reindex_haddock
+fi
+%endif
 
 %files -f ghc.files
 %defattr(-,root,root,-)
@@ -279,6 +303,7 @@ ghc-pkg recache
 
 %files doc -f ghc-doc.files
 %defattr(-,root,root,-)
+%if %{with doc}
 %dir %{_docdir}/%{name}/libraries
 %{_docdir}/%{name}/libraries/frames.html
 %{_docdir}/%{name}/libraries/gen_contents_index
@@ -292,6 +317,7 @@ ghc-pkg recache
 %ghost %{_docdir}/%{name}/libraries/index*.html
 %ghost %{_docdir}/%{name}/libraries/minus.gif
 %ghost %{_docdir}/%{name}/libraries/plus.gif
+%endif
 
 %if %{with shared}
 %files libs -f ghc-libs.files
@@ -304,8 +330,10 @@ ghc-pkg recache
 %files ghc-devel -f ghc-ghc-devel.files
 %defattr(-,root,root,-)
 
+%if %{with doc}
 %files ghc-doc -f ghc-ghc-doc.files
 %defattr(-,root,root,-)
+%endif
 
 %if %{with prof}
 %files prof -f ghc-prof.files
@@ -316,6 +344,12 @@ ghc-pkg recache
 %endif
 
 %changelog
+* Sat Dec 12 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.3
+- exclude ghc .conf file from package.conf.d in base package
+- use ghc_reindex_haddock
+- add scripts for ghc-ghc-devel and ghc-ghc-doc
+- add doc bcond
+
 * Sat Dec 12 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.2
 - remove redundant mingw and perl from ghc-tarballs/
 - fix exclusion of ghc internals lib from base packages with -mindepth



From petersen at fedoraproject.org  Sat Dec 12 11:34:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Sat, 12 Dec 2009 11:34:17 +0000 (UTC)
Subject: rpms/ghc/devel ghc-6.12.1-gen_contents_index-haddock-path.patch,
	NONE, 1.1 ghc.spec, 1.115, 1.116
Message-ID: <20091212113417.9FA7011C0264@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6510

Modified Files:
	ghc.spec 
Added Files:
	ghc-6.12.1-gen_contents_index-haddock-path.patch 
Log Message:
- add ghc-6.12.1-gen_contents_index-haddock-path.patch to adjust haddock path
  since we removed html/ from libraries path



ghc-6.12.1-gen_contents_index-haddock-path.patch:
 gen_contents_index |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ghc-6.12.1-gen_contents_index-haddock-path.patch ---
diff -u ghc-6.12.1/libraries/gen_contents_index\~ ghc-6.12.1/libraries/gen_contents_index
--- ghc-6.12.1/libraries/gen_contents_index~	2009-12-11 04:11:33.000000000 +1000
+++ ghc-6.12.1/libraries/gen_contents_index	2009-12-12 21:08:02.000000000 +1000
@@ -20,7 +20,7 @@
     done
     ;;
 *)
-    HADDOCK=../../../../../bin/haddock
+    HADDOCK=/usr/bin/haddock
     # We don't want the GHC API to swamp the index
     HADDOCK_FILES=`ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort`
     for HADDOCK_FILE in $HADDOCK_FILES


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- ghc.spec	12 Dec 2009 10:47:38 -0000	1.115
+++ ghc.spec	12 Dec 2009 11:34:17 -0000	1.116
@@ -54,6 +54,7 @@ BuildRequires: libxslt, docbook-style-xs
 %if %{with hscolour}
 BuildRequires: hscolour
 %endif
+Patch1: ghc-6.12.1-gen_contents_index-haddock-path.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -143,6 +144,8 @@ Profiling libraries for the ghc internal
 
 %prep
 %setup -q -n %{name}-%{version} %{?with_extralibs:-b1}
+# tweak haddock path for html/libraries -> libraries
+%patch1 -p1 -b .orig
 
 # make sure we don't use these
 rm -r ghc-tarballs/{mingw,perl}
@@ -349,6 +352,8 @@ fi
 - use ghc_reindex_haddock
 - add scripts for ghc-ghc-devel and ghc-ghc-doc
 - add doc bcond
+- add ghc-6.12.1-gen_contents_index-haddock-path.patch to adjust haddock path
+  since we removed html/ from libraries path
 
 * Sat Dec 12 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.2
 - remove redundant mingw and perl from ghc-tarballs/



From epienbro at fedoraproject.org  Sat Dec 12 11:48:51 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 12 Dec 2009 11:48:51 +0000 (UTC)
Subject: rpms/par2cmdline/devel par2cmdline.spec,1.13,1.14
Message-ID: <20091212114851.E009211C0264@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/par2cmdline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11993

Modified Files:
	par2cmdline.spec 
Log Message:
Rebuild for new tbb



Index: par2cmdline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/par2cmdline/devel/par2cmdline.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- par2cmdline.spec	22 Nov 2009 12:20:00 -0000	1.13
+++ par2cmdline.spec	12 Dec 2009 11:48:50 -0000	1.14
@@ -3,7 +3,7 @@
 Summary:        PAR 2.0 compatible file verification and repair tool
 Name:           par2cmdline
 Version:        0.4.tbb.%{revision}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
 Source:         http://www.chuchusoft.com/par2_tbb/par2cmdline-0.4-tbb-%{revision}.tar.gz
@@ -83,6 +83,9 @@ make check-TESTS
 
 
 %changelog
+* Sat Dec 12 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.4.tbb.20090203-3
+- Rebuild for new tbb
+
 * Sun Nov 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.4.tbb.20090203-2
 - FTBFS fix, BZ #539005
 



From robert at fedoraproject.org  Sat Dec 12 12:11:52 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 12 Dec 2009 12:11:52 +0000 (UTC)
Subject: rpms/mailx/devel mailx-12.4-openssl.patch, NONE, 1.1 mailx.spec,
	1.35, 1.36
Message-ID: <20091212121152.60B7011C0264@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mailx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20641

Modified Files:
	mailx.spec 
Added Files:
	mailx-12.4-openssl.patch 
Log Message:
Make OpenSSL support working again if NSS flag is disabled


mailx-12.4-openssl.patch:
 makeconfig |   21 ++++++++++++++++++++-
 openssl.c  |   44 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 58 insertions(+), 7 deletions(-)

--- NEW FILE mailx-12.4-openssl.patch ---
http://nail.cvs.sourceforge.net/viewvc/nail/nail/makeconfig?r1=1.14&r2=1.15
http://nail.cvs.sourceforge.net/viewvc/nail/nail/openssl.c?r1=1.12&r2=1.13

--- nail/makeconfig	2007/04/14 15:26:00	1.14
+++ nail/makeconfig	2009/05/26 21:04:15	1.15
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Sccsid @(#)makeconfig	1.43 (gritter) 4/14/07
+# Sccsid @(#)makeconfig	1.44 (gritter) 5/26/09
 #
 
 tmp=___build$$
@@ -393,6 +393,25 @@
 !
 fi
 
+if test x$have_openssl = xyes
+then
+	compile_check stack_of 'for STACK_OF()' '#define HAVE_STACK_OF' <<\!
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/x509v3.h>
+#include <openssl/x509.h>
+#include <openssl/rand.h>
+
+int main(void)
+{
+	STACK_OF(GENERAL_NAME)	*gens = NULL;
+	printf("%p", gens);	/* to make it used */
+	SSLv23_client_method();
+	PEM_read_PrivateKey(0, 0, 0, 0);
+	return 0;
+}
+!
+fi
 
 cat >$tmp2.c <<\!
 #include <gssapi/gssapi.h>
--- nail/openssl.c	2007/08/04 11:41:36	1.12
+++ nail/openssl.c	2009/05/26 21:04:15	1.13
@@ -38,7 +38,7 @@
 
 #ifndef lint
 #ifdef	DOSCCS
-static char sccsid[] = "@(#)openssl.c	1.25 (gritter) 8/4/07";
+static char sccsid[] = "@(#)openssl.c	1.26 (gritter) 5/26/09";
 #endif
 #endif /* not lint */
 
@@ -101,12 +101,17 @@
 static int ssl_rand_init(void);
 static void ssl_init(void);
 static int ssl_verify_cb(int success, X509_STORE_CTX *store);
-static SSL_METHOD *ssl_select_method(const char *uhp);
+static const SSL_METHOD *ssl_select_method(const char *uhp);
 static void ssl_load_verifications(struct sock *sp);
 static void ssl_certificate(struct sock *sp, const char *uhp);
 static enum okay ssl_check_host(const char *server, struct sock *sp);
+#ifdef HAVE_STACK_OF
+static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
+		X509_STORE *store);
+#else
 static int smime_verify(struct message *m, int n, STACK *chain,
 		X509_STORE *store);
+#endif
 static EVP_CIPHER *smime_cipher(const char *name);
 static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
 static FILE *smime_sign_cert(const char *xname, const char *xname2, int warn);
@@ -203,10 +208,10 @@
 	return 1;
 }
 
-static SSL_METHOD *
+static const SSL_METHOD *
 ssl_select_method(const char *uhp)
 {
-	SSL_METHOD *method;
+	const SSL_METHOD *method;
 	char	*cp;
 
 	cp = ssl_method_string(uhp);
@@ -308,7 +313,11 @@
 	X509 *cert;
 	X509_NAME *subj;
 	char data[256];
+#ifdef HAVE_STACK_OF
+	STACK_OF(GENERAL_NAME)	*gens;
+#else
 	/*GENERAL_NAMES*/STACK	*gens;
+#endif
 	GENERAL_NAME	*gen;
 	int	i;
 
@@ -357,7 +366,8 @@
 
 	ssl_init();
 	ssl_set_vrfy_level(uhp);
-	if ((sp->s_ctx = SSL_CTX_new(ssl_select_method(uhp))) == NULL) {
+	if ((sp->s_ctx =
+	     SSL_CTX_new((SSL_METHOD *)ssl_select_method(uhp))) == NULL) {
 		ssl_gen_err(catgets(catd, CATSET, 261, "SSL_CTX_new() failed"));
 		return STOP;
 	}
@@ -496,7 +506,11 @@
 }
 
 static int
+#ifdef HAVE_STACK_OF
+smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
+#else
 smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
+#endif
 {
 	struct message	*x;
 	char	*cp, *sender, *to, *cc, *cnttype;
@@ -505,7 +519,12 @@
 	off_t	size;
 	BIO	*fb, *pb;
 	PKCS7	*pkcs7;
+#ifdef HAVE_STACK_OF
+	STACK_OF(X509)	*certs;
+	STACK_OF(GENERAL_NAME)	*gens;
+#else
 	STACK	*certs, *gens;
+#endif
 	X509	*cert;
 	X509_NAME	*subj;
 	char	data[LINESIZE];
@@ -614,7 +633,11 @@
 {
 	int	*msgvec = vp, *ip;
 	int	ec = 0;
+#ifdef HAVE_STACK_OF
+	STACK_OF(X509)	*chain = NULL;
+#else
 	STACK	*chain = NULL;
+#endif
 	X509_STORE	*store;
 	char	*ca_dir, *ca_file;
 
@@ -687,7 +710,11 @@
 	X509	*cert;
 	PKCS7	*pkcs7;
 	BIO	*bb, *yb;
+#ifdef HAVE_STACK_OF
+	STACK_OF(X509)	*certs;
+#else
 	STACK	*certs;
+#endif
 	EVP_CIPHER	*cipher;
 
 	certfile = expand((char *)certfile);
@@ -950,9 +977,14 @@
 	off_t	size;
 	BIO	*fb, *pb;
 	PKCS7	*pkcs7;
+#ifdef HAVE_STACK_OF
+	STACK_OF(X509)	*certs;
+	STACK_OF(X509)	*chain = NULL;
+#else
 	STACK	*certs;
-	X509	*cert;
 	STACK	*chain = NULL;
+#endif
+	X509	*cert;
 	enum okay	ok = OKAY;
 
 	message_number = n;


Index: mailx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- mailx.spec	25 Jul 2009 11:40:39 -0000	1.35
+++ mailx.spec	12 Dec 2009 12:11:52 -0000	1.36
@@ -4,7 +4,7 @@
 Summary: Enhanced implementation of the mailx command
 Name: mailx
 Version: 12.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: 	Applications/Internet
 License: BSD with advertising
 URL: http://heirloom.sourceforge.net/mailx.html
@@ -12,6 +12,7 @@ Source0: http://dl.sourceforge.net/heirl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: nail-11.25-config.patch
 Patch1: mailx-12.3-pager.patch
+Patch2: mailx-12.4-openssl.patch
 
 %if %{use_nss}
 BuildRequires: nss-devel, pkgconfig, krb5-devel
@@ -46,6 +47,7 @@ as well as "nail" (the initial name of t
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 sed -i 's,/etc/nail.rc,%{mailrc},g' mailx.1 mailx.1.html
 
@@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 12 2009 Robert Scheck <robert at fedoraproject.org> - 12.4-4
+- Make OpenSSL support working again if NSS flag is disabled
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Sat Dec 12 12:33:48 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 12 Dec 2009 12:33:48 +0000 (UTC)
Subject: File libiphone-0.9.5.tar.bz2 uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091212123348.9F46810F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for libiphone:

1789faa31c37524687147a9327300f32  libiphone-0.9.5.tar.bz2



From pbrobinson at fedoraproject.org  Sat Dec 12 12:33:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 12 Dec 2009 12:33:54 +0000 (UTC)
Subject: File ifuse-0.9.5.tar.bz2 uploaded to lookaside cache by pbrobinson
Message-ID: <20091212123354.B01C210F85F@bastion2.fedora.phx.redhat.com>

A file has been added to the lookaside cache for ifuse:

c062c9a46686ab812323f886dd59b9b1  ifuse-0.9.5.tar.bz2



From pbrobinson at fedoraproject.org  Sat Dec 12 12:34:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 12 Dec 2009 12:34:23 +0000 (UTC)
Subject: rpms/libiphone/devel .cvsignore, 1.7, 1.8 libiphone.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <20091212123423.F021711C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28747

Modified Files:
	.cvsignore libiphone.spec sources 
Log Message:
- Update to 0.9.5 release for new usbmuxd/libplist 1.0.0 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	28 Oct 2009 16:07:26 -0000	1.7
+++ .cvsignore	12 Dec 2009 12:34:22 -0000	1.8
@@ -1 +1 @@
-libiphone-0.9.4.tar.bz2
+libiphone-0.9.5.tar.bz2


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libiphone.spec	12 Dec 2009 00:43:50 -0000	1.18
+++ libiphone.spec	12 Dec 2009 12:34:22 -0000	1.19
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libiphone
-Version:        0.9.4
-Release:        4%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/libiphone/
 
 %changelog
+* Sat Dec 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.5-1
+- Update to 0.9.5 release for new usbmuxd/libplist 1.0.0 final
+
 * Sat Dec 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-3
 - Rebuild for libplist .so bump
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Oct 2009 16:07:26 -0000	1.8
+++ sources	12 Dec 2009 12:34:22 -0000	1.9
@@ -1 +1 @@
-028c850b20993844d42b713524a1268b  libiphone-0.9.4.tar.bz2
+1789faa31c37524687147a9327300f32  libiphone-0.9.5.tar.bz2



From pbrobinson at fedoraproject.org  Sat Dec 12 12:34:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 12 Dec 2009 12:34:45 +0000 (UTC)
Subject: rpms/ifuse/devel .cvsignore, 1.6, 1.7 ifuse.spec, 1.11, 1.12 sources,
	1.6, 1.7
Message-ID: <20091212123445.C34AD11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28985

Modified Files:
	.cvsignore ifuse.spec sources 
Log Message:
- Update to 0.9.5 release for new usbmuxd/libplist 1.0.0 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Oct 2009 16:23:10 -0000	1.6
+++ .cvsignore	12 Dec 2009 12:34:45 -0000	1.7
@@ -1 +1 @@
-ifuse-0.9.4.tar.bz2
+ifuse-0.9.5.tar.bz2


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/ifuse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ifuse.spec	12 Dec 2009 00:46:14 -0000	1.11
+++ ifuse.spec	12 Dec 2009 12:34:45 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          ifuse
-Version:       0.9.4
-Release:       3%{?dist}
+Version:       0.9.5
+Release:       1%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -37,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ifuse
 
 %changelog
+* Sat Dec 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.5-1
+- Update to 0.9.5 release for new usbmuxd/libplist 1.0.0 final
+
 * Sat Dec 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-3
 - Rebuild for libplist .so bump
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Oct 2009 16:23:10 -0000	1.6
+++ sources	12 Dec 2009 12:34:45 -0000	1.7
@@ -1 +1 @@
-185610ecee09a66676f52a2a57507c04  ifuse-0.9.4.tar.bz2
+c062c9a46686ab812323f886dd59b9b1  ifuse-0.9.5.tar.bz2



From kanarip at fedoraproject.org  Sat Dec 12 12:58:03 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sat, 12 Dec 2009 12:58:03 +0000 (UTC)
Subject: rpms/rubygem-attributes/devel import.log, 1.1,
	1.2 rubygem-attributes.spec, 1.3, 1.4
Message-ID: <20091212125803.C220E11C0264@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-attributes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5280/devel

Modified Files:
	import.log rubygem-attributes.spec 
Log Message:
5.0.1-6


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-attributes/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Aug 2008 12:39:23 -0000	1.1
+++ import.log	12 Dec 2009 12:58:03 -0000	1.2
@@ -1 +1,2 @@
 rubygem-attributes-5_0_1-3_fc10:HEAD:rubygem-attributes-5.0.1-3.fc10.src.rpm:1219495150
+rubygem-attributes-5_0_1-6_fc12:HEAD:rubygem-attributes-5.0.1-6.fc12.src.rpm:1260622648


Index: rubygem-attributes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-attributes/devel/rubygem-attributes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rubygem-attributes.spec	27 Jul 2009 03:26:15 -0000	1.3
+++ rubygem-attributes.spec	12 Dec 2009 12:58:03 -0000	1.4
@@ -6,7 +6,7 @@
 Name:		rubygem-%{gemname}
 Summary: 	Attributes RubyGem
 Version: 	5.0.1
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Group: 		Development/Languages
 License:	GPLv2+ or Ruby
 URL: 		http://codeforpeople.com/lib/ruby/%{gemname}/
@@ -41,12 +41,16 @@ rm -rf %{buildroot}
 %files
 %defattr(-, root, root, -)
 %doc %{gemdir}/gems/%{gemname}-%{version}/README
+%doc %{gemdir}/doc/%{gemname}-%{version}/
 %{gemdir}/gems/%{gemname}-%{version}/
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 
 %changelog
+* Sat Dec 12 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 5.0.1-6
+- Rebuild for FTBFS (#539108)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Sun Dec 13 02:19:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 02:19:01 +0000
Subject: [pkgdb] lamson ownership updated
Message-ID: <20091213021902.E46B828ECFE@bastion3.fedora.phx2.redhat.com>

Package lamson in Fedora devel was orphaned by silas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lamson



From pkgdb at fedoraproject.org  Sun Dec 13 02:19:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 02:19:16 +0000
Subject: [pkgdb] lamson ownership updated
Message-ID: <20091213021917.ED9F728ECF4@bastion3.fedora.phx2.redhat.com>

Package lamson in Fedora 12 was orphaned by silas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lamson



From pkgdb at fedoraproject.org  Sun Dec 13 12:06:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:06:51 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120652.1DC0228EDF7@bastion3.fedora.phx2.redhat.com>

snecker has set the watchcommits acl on mapnik (Fedora devel) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:06:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:06:53 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120654.663FD28EDF8@bastion3.fedora.phx2.redhat.com>

snecker has set the approveacls acl on mapnik (Fedora devel) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:06:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:06:54 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120657.5B23728EDF8@bastion3.fedora.phx2.redhat.com>

snecker has set the watchbugzilla acl on mapnik (Fedora devel) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:06:55 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120658.0867028EDF7@bastion3.fedora.phx2.redhat.com>

snecker has set the commit acl on mapnik (Fedora devel) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:07:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:07:02 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120703.43A3728EE00@bastion3.fedora.phx2.redhat.com>

snecker has set the watchcommits acl on mapnik (Fedora 11) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:07:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:07:06 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120707.0686428EE06@bastion3.fedora.phx2.redhat.com>

snecker has set the approveacls acl on mapnik (Fedora 11) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:07:09 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120710.F318528EE14@bastion3.fedora.phx2.redhat.com>

snecker has set the watchcommits acl on mapnik (Fedora 12) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:07:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:07:06 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120708.5055F28EE00@bastion3.fedora.phx2.redhat.com>

snecker has set the commit acl on mapnik (Fedora 11) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:07:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:07:06 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120709.6FC1A28EE17@bastion3.fedora.phx2.redhat.com>

snecker has set the watchbugzilla acl on mapnik (Fedora 11) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:07:10 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120712.0C3EF28EDF7@bastion3.fedora.phx2.redhat.com>

snecker has set the approveacls acl on mapnik (Fedora 12) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:07:12 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120714.DB16628EE00@bastion3.fedora.phx2.redhat.com>

snecker has set the watchbugzilla acl on mapnik (Fedora 12) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 12:07:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 12:07:14 +0000
Subject: [pkgdb] mapnik had acl change status
Message-ID: <20091213120717.9562028EE14@bastion3.fedora.phx2.redhat.com>

snecker has set the commit acl on mapnik (Fedora 12) to Approved for alexlan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mapnik



From pkgdb at fedoraproject.org  Sun Dec 13 15:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 15:12:30 +0000
Subject: [pkgdb] kernel: aarapov has given up watchbugzilla
Message-ID: <20091213151232.91A6B28EFEC@bastion3.fedora.phx2.redhat.com>

aarapov has given up the watchbugzilla acl on kernel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Sun Dec 13 15:12:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 15:12:49 +0000
Subject: [pkgdb] kernel: aarapov has given up watchbugzilla
Message-ID: <20091213151250.1EC8F28EFFA@bastion3.fedora.phx2.redhat.com>

aarapov has given up the watchbugzilla acl on kernel (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Sun Dec 13 15:13:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 15:13:02 +0000
Subject: [pkgdb] kernel: aarapov has given up watchcommits
Message-ID: <20091213151304.3513E28EFF8@bastion3.fedora.phx2.redhat.com>

aarapov has given up the watchcommits acl on kernel (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Sun Dec 13 15:13:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 15:13:07 +0000
Subject: [pkgdb] kernel: aarapov has given up watchcommits
Message-ID: <20091213151308.6059828EFEC@bastion3.fedora.phx2.redhat.com>

aarapov has given up the watchcommits acl on kernel (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Sun Dec 13 15:13:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 15:13:18 +0000
Subject: [pkgdb] kernel: aarapov has requested commit
Message-ID: <20091213151319.800AC28EFFD@bastion3.fedora.phx2.redhat.com>

aarapov has requested the commit acl on kernel (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Sun Dec 13 15:13:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 13 Dec 2009 15:13:33 +0000
Subject: [pkgdb] kernel: aarapov has requested commit
Message-ID: <20091213151334.5D28928EFFE@bastion3.fedora.phx2.redhat.com>

aarapov has requested the commit acl on kernel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From iarnell at fedoraproject.org  Mon Dec 14 04:33:58 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 14 Dec 2009 04:33:58 +0000 (UTC)
Subject: rpms/clc-intercal/devel clc-intercal.spec,1.2,1.3
Message-ID: <20091214043358.4C21011C00EB@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/clc-intercal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28264

Modified Files:
	clc-intercal.spec 
Log Message:
* Mon Dec 14 2009 Iain Arnell <iarnell at gmail.com> 0-0.3.1._94._2
- update Source0 url (upstream has moved)



Index: clc-intercal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clc-intercal/devel/clc-intercal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- clc-intercal.spec	24 Jul 2009 19:02:58 -0000	1.2
+++ clc-intercal.spec	14 Dec 2009 04:33:56 -0000	1.3
@@ -1,12 +1,12 @@
 %define         perversion      1.-94.-2
 Name:           clc-intercal
 Version:        0
-Release:        0.2.%(echo %{perversion}|sed -e's/-/_/g')%{?dist}
+Release:        0.3.%(echo %{perversion}|sed -e's/-/_/g')%{?dist}
 Summary:        Compiler for the INTERCAL language
 License:        BSD
 Group:          Development/Libraries
-URL:            http://intercal.freeshell.org/
-Source0:        http://intercal.freeshell.org/download/CLC-INTERCAL-%{perversion}/CLC-INTERCAL-%{perversion}.tar.gz
+URL:            http://clc.intercal.org.uk/
+Source0:        http://overload.intercal.org.uk/clc/CLC-INTERCAL-%{perversion}/CLC-INTERCAL-%{perversion}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Iain Arnell <iarnell at gmail.com> 0-0.3.1._94._2
+- update Source0 url (upstream has moved)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.2.1._94._2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec 14 05:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:17:32 +0000
Subject: [pkgdb] alltray: huzaifas has given up watchcommits
Message-ID: <20091214051734.6952928ED2E@bastion3.fedora.phx2.redhat.com>

huzaifas has given up the watchcommits acl on alltray (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:17:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:17:35 +0000
Subject: [pkgdb] alltray: huzaifas has requested approveacls
Message-ID: <20091214051737.D40D028ED2E@bastion3.fedora.phx2.redhat.com>

huzaifas has requested the approveacls acl on alltray (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:17:48 +0000
Subject: [pkgdb] alltray: huzaifas has requested commit
Message-ID: <20091214051750.84B3428ED43@bastion3.fedora.phx2.redhat.com>

huzaifas has requested the commit acl on alltray (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:17:50 +0000
Subject: [pkgdb] alltray: huzaifas has given up watchbugzilla
Message-ID: <20091214051752.780D828ED42@bastion3.fedora.phx2.redhat.com>

huzaifas has given up the watchbugzilla acl on alltray (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:18:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:18:16 +0000
Subject: [pkgdb] alltray: huzaifas has given up watchbugzilla
Message-ID: <20091214051818.B310728ED43@bastion3.fedora.phx2.redhat.com>

huzaifas has given up the watchbugzilla acl on alltray (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:18:19 +0000
Subject: [pkgdb] alltray: huzaifas has requested approveacls
Message-ID: <20091214051821.61CDA28ED44@bastion3.fedora.phx2.redhat.com>

huzaifas has requested the approveacls acl on alltray (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:18:24 +0000
Subject: [pkgdb] alltray: huzaifas has given up watchcommits
Message-ID: <20091214051825.EE14F28ED42@bastion3.fedora.phx2.redhat.com>

huzaifas has given up the watchcommits acl on alltray (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:18:27 +0000
Subject: [pkgdb] alltray: huzaifas has given up watchcommits
Message-ID: <20091214051829.3440028ED42@bastion3.fedora.phx2.redhat.com>

huzaifas has given up the watchcommits acl on alltray (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:18:29 +0000
Subject: [pkgdb] alltray: huzaifas has requested commit
Message-ID: <20091214051831.08DA928ED44@bastion3.fedora.phx2.redhat.com>

huzaifas has requested the commit acl on alltray (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:18:35 +0000
Subject: [pkgdb] alltray: huzaifas has given up watchbugzilla
Message-ID: <20091214051836.E4AF428ED42@bastion3.fedora.phx2.redhat.com>

huzaifas has given up the watchbugzilla acl on alltray (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:18:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:18:40 +0000
Subject: [pkgdb] alltray: huzaifas has requested commit
Message-ID: <20091214051842.48EDE28ED4A@bastion3.fedora.phx2.redhat.com>

huzaifas has requested the commit acl on alltray (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 05:18:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 05:18:44 +0000
Subject: [pkgdb] alltray: huzaifas has requested approveacls
Message-ID: <20091214051845.F284B28ED51@bastion3.fedora.phx2.redhat.com>

huzaifas has requested the approveacls acl on alltray (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From toshio at fedoraproject.org  Mon Dec 14 05:44:13 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 14 Dec 2009 05:44:13 +0000 (UTC)
Subject: rpms/python-setuptools/devel python-setuptools.spec,1.27,1.28
Message-ID: <20091214054413.C93DF11C00EB@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-setuptools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4629

Modified Files:
	python-setuptools.spec 
Log Message:
Rebuild to test that the buildsystem is back up.



Index: python-setuptools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- python-setuptools.spec	17 Nov 2009 03:30:29 -0000	1.27
+++ python-setuptools.spec	14 Dec 2009 05:44:12 -0000	1.28
@@ -4,7 +4,7 @@
 
 Name:           python-setuptools
 Version:        0.6.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.8-2
+- Test rebuild
+
 * Mon Nov 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.8-1
 - Update to 0.6.8.
 - Fix directory => file transition when updating from setuptools-0.6c9.



From nb at fedoraproject.org  Mon Dec 14 05:44:38 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon, 14 Dec 2009 05:44:38 +0000 (UTC)
Subject: rpms/wordpress-mu-plugin-defaults/devel
	wordpress-mu-plugin-defaults.spec, 1.2, 1.3
Message-ID: <20091214054438.A304011C00EB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/wordpress-mu-plugin-defaults/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4984

Modified Files:
	wordpress-mu-plugin-defaults.spec 
Log Message:
Bump release



Index: wordpress-mu-plugin-defaults.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu-plugin-defaults/devel/wordpress-mu-plugin-defaults.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- wordpress-mu-plugin-defaults.spec	27 Jul 2009 07:23:38 -0000	1.2
+++ wordpress-mu-plugin-defaults.spec	14 Dec 2009 05:44:38 -0000	1.3
@@ -5,7 +5,7 @@ Name:		wordpress-mu-plugin-%{plugin_name
 # This does not come from wordpress.org, so I made my own plugin_name and plugin_human_name
 # I spoke to ianweller about this and he said just to comment the spec file
 Version:	1.2.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	%{plugin_human_name} plugin for WordPress MU
 
 Group:		Applications/Publishing



From nb at fedoraproject.org  Mon Dec 14 05:47:29 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon, 14 Dec 2009 05:47:29 +0000 (UTC)
Subject: File znc-0.078-rc1.tar.gz uploaded to lookaside cache by nb
Message-ID: <20091214054729.2283E28ED57@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for znc:

57002305905f3e389492d46629bc7f40  znc-0.078-rc1.tar.gz



From nb at fedoraproject.org  Mon Dec 14 05:48:28 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon, 14 Dec 2009 05:48:28 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 znc.spec, 
	1.23, 1.24
Message-ID: <20091214054828.3A7D611C00EB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7146

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Update to 0.078-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	7 Dec 2009 16:17:00 -0000	1.12
+++ .cvsignore	14 Dec 2009 05:48:27 -0000	1.13
@@ -1 +1 @@
-znc-0.077-1.svn1672.tar.bz2
+znc-0.078-rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	7 Dec 2009 16:17:00 -0000	1.13
+++ sources	14 Dec 2009 05:48:28 -0000	1.14
@@ -1 +1 @@
-7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2
+57002305905f3e389492d46629bc7f40  znc-0.078-rc1.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- znc.spec	7 Dec 2009 16:42:03 -0000	1.23
+++ znc.spec	14 Dec 2009 05:48:28 -0000	1.24
@@ -1,14 +1,15 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.077
-Release:        1.svn1672%{?dist}
+Version:        0.078
+Release:        0.2.rc1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
 #Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
 # To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
 # Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
-Source0:        znc-0.077-1.svn1672.tar.bz2
+# Source0:        znc-0.077-1.svn1672.tar.bz2
+Source0:	http://people.znc.in/~psychon/znc/releases/znc-0.078-rc1.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -44,7 +45,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q -n znc-0.077-1.svn1672
+%setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -129,6 +130,8 @@ chmod -x modules/q.cpp
 
 %changelog
 
+* Sun Dec 13 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-0.1.rc1
+- Update to znc 0.078.rc1
 * Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
 - Users cloned via the admin module no longer automatically connect into IRC. (r1653)



From mtasaka at fedoraproject.org  Mon Dec 14 06:03:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Dec 2009 06:03:56 +0000 (UTC)
Subject: File jd-2.5.5-svn3231_trunk.tgz uploaded to lookaside cache by
	mtasaka
Message-ID: <20091214060356.97BB828ED62@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for jd:

e0df6d618e0e4c3b412c6f4ce14ce9c9  jd-2.5.5-svn3231_trunk.tgz



From toshio at fedoraproject.org  Mon Dec 14 06:04:24 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 14 Dec 2009 06:04:24 +0000 (UTC)
Subject: rpms/bzr/F-10 bzr.spec,1.54,1.55
Message-ID: <20091214060424.44A1211C00EB@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17397

Modified Files:
	bzr.spec 
Log Message:
Rebuild to test buildsystem



Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-10/bzr.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- bzr.spec	29 Jun 2009 11:28:00 -0000	1.54
+++ bzr.spec	14 Dec 2009 06:04:23 -0000	1.55
@@ -5,7 +5,7 @@
 
 Name:           bzr
 Version:        %{bzrver}.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Dec 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.16.1-2
+- Rebuild to test buildsystem
+
 * Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.16.1-1
 - Update to 1.16.1
 



From mtasaka at fedoraproject.org  Mon Dec 14 06:04:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Dec 2009 06:04:48 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.405, 1.406 jd.spec, 1.467, 1.468 sources,
	1.406, 1.407
Message-ID: <20091214060448.C86A911C00EB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17832

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Dec 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3231



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- .cvsignore	12 Dec 2009 03:25:13 -0000	1.405
+++ .cvsignore	14 Dec 2009 06:04:48 -0000	1.406
@@ -1 +1 @@
-jd-2.5.5-svn3226_trunk.tgz
+jd-2.5.5-svn3231_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -p -r1.467 -r1.468
--- jd.spec	12 Dec 2009 03:25:13 -0000	1.467
+++ jd.spec	14 Dec 2009 06:04:48 -0000	1.468
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3226_trunk
+%define         strtag        svn3231_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3226
+* Mon Dec 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3231
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- sources	12 Dec 2009 03:25:13 -0000	1.406
+++ sources	14 Dec 2009 06:04:48 -0000	1.407
@@ -1 +1 @@
-922d04e88f4c98417280f2908b102d61  jd-2.5.5-svn3226_trunk.tgz
+e0df6d618e0e4c3b412c6f4ce14ce9c9  jd-2.5.5-svn3231_trunk.tgz



From mtasaka at fedoraproject.org  Mon Dec 14 06:34:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Dec 2009 06:34:22 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.415, 1.416 jd.spec, 1.479, 1.480 sources,
	1.416, 1.417
Message-ID: <20091214063422.B883E11C00EB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1780

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
rev 3231


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- .cvsignore	12 Dec 2009 03:25:13 -0000	1.415
+++ .cvsignore	14 Dec 2009 06:34:21 -0000	1.416
@@ -1 +1 @@
-jd-2.5.5-svn3226_trunk.tgz
+jd-2.5.5-svn3231_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -p -r1.479 -r1.480
--- jd.spec	12 Dec 2009 03:25:13 -0000	1.479
+++ jd.spec	14 Dec 2009 06:34:21 -0000	1.480
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3226_trunk
+%define         strtag        svn3231_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3226
+* Mon Dec 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3231
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- sources	12 Dec 2009 03:25:13 -0000	1.416
+++ sources	14 Dec 2009 06:34:21 -0000	1.417
@@ -1 +1 @@
-922d04e88f4c98417280f2908b102d61  jd-2.5.5-svn3226_trunk.tgz
+e0df6d618e0e4c3b412c6f4ce14ce9c9  jd-2.5.5-svn3231_trunk.tgz



From mtasaka at fedoraproject.org  Mon Dec 14 06:34:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 14 Dec 2009 06:34:58 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.415, 1.416 jd.spec, 1.478, 1.479 sources,
	1.416, 1.417
Message-ID: <20091214063458.4D95B11C00EB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2334

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
rev 3231


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- .cvsignore	12 Dec 2009 03:25:13 -0000	1.415
+++ .cvsignore	14 Dec 2009 06:34:57 -0000	1.416
@@ -1 +1 @@
-jd-2.5.5-svn3226_trunk.tgz
+jd-2.5.5-svn3231_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -p -r1.478 -r1.479
--- jd.spec	12 Dec 2009 03:25:13 -0000	1.478
+++ jd.spec	14 Dec 2009 06:34:57 -0000	1.479
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3226_trunk
+%define         strtag        svn3231_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Dec 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3226
+* Mon Dec 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3231
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- sources	12 Dec 2009 03:25:13 -0000	1.416
+++ sources	14 Dec 2009 06:34:58 -0000	1.417
@@ -1 +1 @@
-922d04e88f4c98417280f2908b102d61  jd-2.5.5-svn3226_trunk.tgz
+e0df6d618e0e4c3b412c6f4ce14ce9c9  jd-2.5.5-svn3231_trunk.tgz



From chitlesh at fedoraproject.org  Mon Dec 14 06:39:51 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 14 Dec 2009 06:39:51 +0000 (UTC)
Subject: File verilog-20091212.tar.bz2 uploaded to lookaside cache by
	chitlesh
Message-ID: <20091214063951.44C7B28ED72@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for iverilog:

5626552cdba4f022613d4b978641f1f6  verilog-20091212.tar.bz2



From chitlesh at fedoraproject.org  Mon Dec 14 06:42:50 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 14 Dec 2009 06:42:50 +0000 (UTC)
Subject: rpms/iverilog/F-11 .cvsignore, 1.12, 1.13 import.log, 1.6,
	1.7 iverilog.spec, 1.14, 1.15 sources, 1.13, 1.14
Message-ID: <20091214064250.EBC3511C00EB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7155/F-11

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
final round of testing before 0.9.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	5 Dec 2009 12:52:48 -0000	1.12
+++ .cvsignore	14 Dec 2009 06:42:50 -0000	1.13
@@ -1 +1 @@
-verilog-20091205.tar.bz2
+verilog-20091212.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	5 Dec 2009 12:52:48 -0000	1.6
+++ import.log	14 Dec 2009 06:42:50 -0000	1.7
@@ -4,3 +4,4 @@ iverilog-0_9_20090423-4__fc10:HEAD:iveri
 iverilog-0_9_20090423-5_fc11:F-11:iverilog-0.9.20090423-5.fc11.src.rpm:1247523896
 iverilog-0_9_20091204-1_fc12:F-11:iverilog-0.9.20091204-1.fc12.src.rpm:1259966454
 iverilog-0_9_20091205-1_fc12:F-11:iverilog-0.9.20091205-1.fc12.src.rpm:1260017424
+iverilog-0_9_20091212-1_fc12:F-11:iverilog-0.9.20091212-1.fc12.src.rpm:1260772739


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/iverilog.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- iverilog.spec	5 Dec 2009 12:52:48 -0000	1.14
+++ iverilog.spec	14 Dec 2009 06:42:50 -0000	1.15
@@ -5,16 +5,28 @@
 #Version:     1.0
 #Release:     1.snap%{snapshot}%{?dist}
 
-%define      snapshot 20091205
+#
+# Test suite for iverilog is detailed on
+# https://fedorahosted.org/fedora-electronic-lab/wiki/Testing/iverilog
+# Please execute the testsuite as explained before pushed a new release to stable repos
+#
+
+%define      snapshot 20091212
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
 Release:     1%{?dist}
 Summary:     Icarus Verilog is a verilog compiler and simulator
+
 Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
+
+# Snapshot : git clone git://icarus.com/~steve-icarus/verilog
+# cd verilog
+# git checkout --track -b v0_9-branch origin/v0_9-branch
 Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
@@ -91,6 +103,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 12 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091212-1
+- New development snapshot - 0.9.2 final prerelease snapshot
+
 * Sat Dec 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091205-1
 - New development snapshot - 0.9.2 prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	5 Dec 2009 12:52:48 -0000	1.13
+++ sources	14 Dec 2009 06:42:50 -0000	1.14
@@ -1 +1 @@
-fe3bab76aec4b0bc8e6f0bc2f56db4a1  verilog-20091205.tar.bz2
+5626552cdba4f022613d4b978641f1f6  verilog-20091212.tar.bz2



From chitlesh at fedoraproject.org  Mon Dec 14 06:44:35 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 14 Dec 2009 06:44:35 +0000 (UTC)
Subject: rpms/iverilog/F-12 .cvsignore, 1.12, 1.13 import.log, 1.6,
	1.7 iverilog.spec, 1.15, 1.16 sources, 1.13, 1.14
Message-ID: <20091214064435.BCA1111C00EB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8359/F-12

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
final round of testing before 0.9.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	5 Dec 2009 13:04:11 -0000	1.12
+++ .cvsignore	14 Dec 2009 06:44:35 -0000	1.13
@@ -1 +1 @@
-verilog-20091205.tar.bz2
+verilog-20091212.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	5 Dec 2009 13:04:11 -0000	1.6
+++ import.log	14 Dec 2009 06:44:35 -0000	1.7
@@ -4,3 +4,4 @@ iverilog-0_9_20090423-4__fc10:HEAD:iveri
 iverilog-0_9_20090423-5_fc11:HEAD:iverilog-0.9.20090423-5.fc11.src.rpm:1247523987
 iverilog-0_9_20091204-1_fc12:F-12:iverilog-0.9.20091204-1.fc12.src.rpm:1259966766
 iverilog-0_9_20091205-1_fc12:F-12:iverilog-0.9.20091205-1.fc12.src.rpm:1260018138
+iverilog-0_9_20091212-1_fc12:F-12:iverilog-0.9.20091212-1.fc12.src.rpm:1260772968


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/iverilog.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- iverilog.spec	5 Dec 2009 13:04:11 -0000	1.15
+++ iverilog.spec	14 Dec 2009 06:44:35 -0000	1.16
@@ -5,16 +5,28 @@
 #Version:     1.0
 #Release:     1.snap%{snapshot}%{?dist}
 
-%define      snapshot 20091205
+#
+# Test suite for iverilog is detailed on
+# https://fedorahosted.org/fedora-electronic-lab/wiki/Testing/iverilog
+# Please execute the testsuite as explained before pushed a new release to stable repos
+#
+
+%define      snapshot 20091212
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
 Release:     1%{?dist}
 Summary:     Icarus Verilog is a verilog compiler and simulator
+
 Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
+
+# Snapshot : git clone git://icarus.com/~steve-icarus/verilog
+# cd verilog
+# git checkout --track -b v0_9-branch origin/v0_9-branch
 Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
@@ -91,6 +103,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 12 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091212-1
+- New development snapshot - 0.9.2 final prerelease snapshot
+
 * Sat Dec 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091205-1
 - New development snapshot - 0.9.2 prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	5 Dec 2009 13:04:11 -0000	1.13
+++ sources	14 Dec 2009 06:44:35 -0000	1.14
@@ -1 +1 @@
-fe3bab76aec4b0bc8e6f0bc2f56db4a1  verilog-20091205.tar.bz2
+5626552cdba4f022613d4b978641f1f6  verilog-20091212.tar.bz2



From chitlesh at fedoraproject.org  Mon Dec 14 06:47:15 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 14 Dec 2009 06:47:15 +0000 (UTC)
Subject: rpms/iverilog/devel .cvsignore, 1.12, 1.13 import.log, 1.6,
	1.7 iverilog.spec, 1.15, 1.16 sources, 1.13, 1.14
Message-ID: <20091214064715.4DC7811C00EB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10171/devel

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
final round of testing before 0.9.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	5 Dec 2009 13:07:50 -0000	1.12
+++ .cvsignore	14 Dec 2009 06:47:14 -0000	1.13
@@ -1 +1 @@
-verilog-20091205.tar.bz2
+verilog-20091212.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	5 Dec 2009 13:07:50 -0000	1.6
+++ import.log	14 Dec 2009 06:47:15 -0000	1.7
@@ -4,3 +4,4 @@ iverilog-0_9_20090423-4__fc10:HEAD:iveri
 iverilog-0_9_20090423-5_fc11:HEAD:iverilog-0.9.20090423-5.fc11.src.rpm:1247523987
 iverilog-0_9_20091204-1_fc12:HEAD:iverilog-0.9.20091204-1.fc12.src.rpm:1259965837
 iverilog-0_9_20091205-1_fc12:HEAD:iverilog-0.9.20091205-1.fc12.src.rpm:1260018305
+iverilog-0_9_20091212-1_fc12:HEAD:iverilog-0.9.20091212-1.fc12.src.rpm:1260773067


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/iverilog.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- iverilog.spec	5 Dec 2009 13:07:50 -0000	1.15
+++ iverilog.spec	14 Dec 2009 06:47:15 -0000	1.16
@@ -5,16 +5,28 @@
 #Version:     1.0
 #Release:     1.snap%{snapshot}%{?dist}
 
-%define      snapshot 20091205
+#
+# Test suite for iverilog is detailed on
+# https://fedorahosted.org/fedora-electronic-lab/wiki/Testing/iverilog
+# Please execute the testsuite as explained before pushed a new release to stable repos
+#
+
+%define      snapshot 20091212
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
 Release:     1%{?dist}
 Summary:     Icarus Verilog is a verilog compiler and simulator
+
 Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
+
+# Snapshot : git clone git://icarus.com/~steve-icarus/verilog
+# cd verilog
+# git checkout --track -b v0_9-branch origin/v0_9-branch
 Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
@@ -91,6 +103,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 12 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091212-1
+- New development snapshot - 0.9.2 final prerelease snapshot
+
 * Sat Dec 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091205-1
 - New development snapshot - 0.9.2 prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	5 Dec 2009 13:07:50 -0000	1.13
+++ sources	14 Dec 2009 06:47:15 -0000	1.14
@@ -1 +1 @@
-fe3bab76aec4b0bc8e6f0bc2f56db4a1  verilog-20091205.tar.bz2
+5626552cdba4f022613d4b978641f1f6  verilog-20091212.tar.bz2



From cdamian at fedoraproject.org  Mon Dec 14 07:11:54 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Mon, 14 Dec 2009 07:11:54 +0000 (UTC)
Subject: File phploc-1.4.0.tgz uploaded to lookaside cache by cdamian
Message-ID: <20091214071154.86E8C28ED70@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for php-phpunit-phploc:

d62979533e887a0b2ce4e4b4cc14c4bb  phploc-1.4.0.tgz



From pkgdb at fedoraproject.org  Mon Dec 14 07:12:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 07:12:44 +0000
Subject: [pkgdb] alltray had acl change status
Message-ID: <20091214071246.B283728ED8D@bastion3.fedora.phx2.redhat.com>

sundaram has set the commit acl on alltray (Fedora devel) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 07:12:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 07:12:45 +0000
Subject: [pkgdb] alltray had acl change status
Message-ID: <20091214071247.C090F28ED70@bastion3.fedora.phx2.redhat.com>

sundaram has set the approveacls acl on alltray (Fedora devel) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 07:12:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 07:12:55 +0000
Subject: [pkgdb] alltray had acl change status
Message-ID: <20091214071257.70AF228ED70@bastion3.fedora.phx2.redhat.com>

sundaram has set the commit acl on alltray (Fedora 11) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 07:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 07:12:59 +0000
Subject: [pkgdb] alltray had acl change status
Message-ID: <20091214071301.4135428ED70@bastion3.fedora.phx2.redhat.com>

sundaram has set the approveacls acl on alltray (Fedora 11) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 07:13:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 07:13:05 +0000
Subject: [pkgdb] alltray had acl change status
Message-ID: <20091214071306.D56D328ED93@bastion3.fedora.phx2.redhat.com>

sundaram has set the approveacls acl on alltray (Fedora 12) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 07:13:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 07:13:05 +0000
Subject: [pkgdb] alltray had acl change status
Message-ID: <20091214071307.3F08228ED95@bastion3.fedora.phx2.redhat.com>

sundaram has set the commit acl on alltray (Fedora 12) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 07:13:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 07:13:22 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20091214071324.00C2528ED99@bastion3.fedora.phx2.redhat.com>

Package alltray in Fedora 11 is now owned by huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Mon Dec 14 07:13:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 07:13:29 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20091214071331.753F428ED90@bastion3.fedora.phx2.redhat.com>

Package alltray in Fedora 12 is now owned by huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From cdamian at fedoraproject.org  Mon Dec 14 07:14:03 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Mon, 14 Dec 2009 07:14:03 +0000 (UTC)
Subject: rpms/php-phpunit-phploc/devel .cvsignore, 1.2,
	1.3 php-phpunit-phploc.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091214071403.A698211C00E9@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-phploc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26960

Modified Files:
	.cvsignore php-phpunit-phploc.spec sources 
Log Message:
upstream 1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Nov 2009 23:27:06 -0000	1.2
+++ .cvsignore	14 Dec 2009 07:14:02 -0000	1.3
@@ -1 +1 @@
-phploc-1.2.0.tgz
+phploc-1.4.0.tgz


Index: php-phpunit-phploc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/devel/php-phpunit-phploc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-phpunit-phploc.spec	7 Nov 2009 17:50:08 -0000	1.2
+++ php-phpunit-phploc.spec	14 Dec 2009 07:14:02 -0000	1.3
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-phploc
-Version:        1.2.0
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
 Group:          Development/Libraries
@@ -19,6 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
@@ -79,12 +80,14 @@ fi
 %{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/XML.php
 %{pear_phpdir}/PHPLOC/TextUI/Command.php
 %{pear_phpdir}/PHPLOC/TextUI/Getopt.php
-%{pear_phpdir}/PHPLOC/Util/FilterIterator.php
 %{pear_phpdir}/PHPLOC/Analyser.php
 %{_bindir}/phploc
 
 
 %changelog
+* Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.4.0-1
+- upstream 1.4.0
+
 * Sat Nov 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-2
 - F-(10|11) / EL-5 compatibility
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Nov 2009 23:27:06 -0000	1.2
+++ sources	14 Dec 2009 07:14:02 -0000	1.3
@@ -1 +1 @@
-20bb7d549f3f7ff37dd1f6309a0b883a  phploc-1.2.0.tgz
+d62979533e887a0b2ce4e4b4cc14c4bb  phploc-1.4.0.tgz



From cdamian at fedoraproject.org  Mon Dec 14 07:21:08 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Mon, 14 Dec 2009 07:21:08 +0000 (UTC)
Subject: File phpcpd-1.2.2.tgz uploaded to lookaside cache by cdamian
Message-ID: <20091214072108.E6CE528ED8C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for php-phpunit-phpcpd:

4a4db8d9c34c43b238c49aa65c1fee9c  phpcpd-1.2.2.tgz



From cdamian at fedoraproject.org  Mon Dec 14 07:22:13 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Mon, 14 Dec 2009 07:22:13 +0000 (UTC)
Subject: rpms/php-phpunit-phpcpd/devel .cvsignore, 1.2,
	1.3 php-phpunit-phpcpd.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091214072213.2F2B211C00E9@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-phpcpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31587

Modified Files:
	.cvsignore php-phpunit-phpcpd.spec sources 
Log Message:
upstream 1.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Nov 2009 11:15:22 -0000	1.2
+++ .cvsignore	14 Dec 2009 07:22:13 -0000	1.3
@@ -1 +1 @@
-phpcpd-1.2.0.tgz
+phpcpd-1.2.2.tgz


Index: php-phpunit-phpcpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/devel/php-phpunit-phpcpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-phpcpd.spec	18 Nov 2009 11:15:22 -0000	1.1
+++ php-phpunit-phpcpd.spec	14 Dec 2009 07:22:13 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-phpcpd
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Copy/Paste Detector (CPD) for PHP code
 
@@ -19,6 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
@@ -80,7 +81,6 @@ fi
 %{pear_phpdir}/PHPCPD/TextUI/Command.php
 %{pear_phpdir}/PHPCPD/TextUI/Getopt.php
 %{pear_phpdir}/PHPCPD/TextUI/ResultPrinter.php
-%{pear_phpdir}/PHPCPD/Util/FilterIterator.php
 %{pear_phpdir}/PHPCPD/Clone.php
 %{pear_phpdir}/PHPCPD/CloneMap.php
 %{pear_phpdir}/PHPCPD/Detector.php
@@ -88,5 +88,8 @@ fi
 
 
 %changelog
+* Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.2.2-1
+- upstream 1.2.2
+
 * Thu Oct 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Nov 2009 11:15:22 -0000	1.2
+++ sources	14 Dec 2009 07:22:13 -0000	1.3
@@ -1 +1 @@
-84cc68a7e05df6c360ec3054f6dd4214  phpcpd-1.2.0.tgz
+4a4db8d9c34c43b238c49aa65c1fee9c  phpcpd-1.2.2.tgz



From sandeeps at fedoraproject.org  Mon Dec 14 08:18:14 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 08:18:14 +0000 (UTC)
Subject: File Pothana2k-Li.zip uploaded to lookaside cache by sandeeps
Message-ID: <20091214081814.6A81928EDA0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for pothana2000-fonts:

24f546309998cf29e36154c1479256ea  Pothana2k-Li.zip



From pbrobinson at fedoraproject.org  Mon Dec 14 08:20:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 08:20:45 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel network-manager-netbook.spec,
	1.12, 1.13
Message-ID: <20091214082045.D812D11C0376@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/network-manager-netbook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30582

Modified Files:
	network-manager-netbook.spec 
Log Message:
- Update to new upstream 1.7.0 release


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- network-manager-netbook.spec	10 Dec 2009 10:21:51 -0000	1.12
+++ network-manager-netbook.spec	14 Dec 2009 08:20:44 -0000	1.13
@@ -1,19 +1,19 @@
 # Tarfile created using git
 # git clone git://git.gnome.org/network-manager-netbook
 # git archive --format=tar --prefix=network-manager-netbook-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
-%define git_version 37433bc
+%define git_version f13f37d
 %define tarfile %{name}-%{version}.tar.bz2
 
-Name:           network-manager-netbook
-Version:        1.7.0
-Release:        0.1%{?dist}
-Summary:        Moblin Netbook GUI for NetworkManger
-
-Group:          Applications/Internet
-License:        GPLv2
-URL:            http://projects.gnome.org/NetworkManager/
-Source0:        %{tarfile}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:          network-manager-netbook
+Version:       1.7.0
+Release:       1%{?dist}
+Summary:       Moblin Netbook GUI for NetworkManger
+
+Group:         Applications/Internet
+License:       GPLv2
+URL:           http://projects.gnome.org/NetworkManager/
+Source0:       %{tarfile}
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
 BuildRequires: gtk2-devel
@@ -90,6 +90,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> 1.7.0-1
+- Update to new upstream 1.7.0 release
+
 * Thu Dec 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.7.0-0.1
 - Update to new n-m-n git head, add bluetooth support
 



From sandeeps at fedoraproject.org  Mon Dec 14 08:24:54 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 08:24:54 +0000 (UTC)
Subject: rpms/pothana2000-fonts/devel pothana2000-fonts.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091214082454.B47DA11C00E9@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/pothana2000-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32559

Modified Files:
	pothana2000-fonts.spec sources 
Log Message:
Preparing for 1.3.2-1 release



Index: pothana2000-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pothana2000-fonts/devel/pothana2000-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pothana2000-fonts.spec	26 Jul 2009 19:18:28 -0000	1.2
+++ pothana2000-fonts.spec	14 Dec 2009 08:24:54 -0000	1.3
@@ -2,12 +2,12 @@
 %global fontconf 69-%{fontname}.conf
 
 Name: %{fontname}-fonts
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 Summary: Unicode compliant OpenType font for Telugu
 
 Group: User Interface/X
-License: GPLv2+
+License: GPLv2+ with exceptions
 URL: http://www.kavya-nandanam.com/dload.htm
 
 Source0: Pothana2k-Li.zip
@@ -19,7 +19,7 @@ BuildRequires: fontpackages-devel
 Requires: fontpackages-filesystem
 
 %description
-Its Free OpenType font for Telugu created by
+A Free OpenType font for Telugu created by
 Dr. Tirumala Krishna Desikacharyulu. 
 
 %prep
@@ -47,8 +47,10 @@ rm -fr %{buildroot}
 %doc gpl.txt
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Dec 14 2009 <sshedmak at redhat.com> - 1.3.2-1
+- Fixed FSType, Preferred Style, UinqueID and Fullname
+- Fixed Invalid Glyph Names reported by fontlint
+- with exceptions string added in License
 
 * Wed Mar 25 2009 <sshedmak at redhat.com> - 1.3.1-2
 - Fixed download URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pothana2000-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 09:01:53 -0000	1.2
+++ sources	14 Dec 2009 08:24:54 -0000	1.3
@@ -1 +1 @@
-8c392bfbc921d816b8659f9e330372ad  Pothana2k-Li.zip
+24f546309998cf29e36154c1479256ea  Pothana2k-Li.zip



From yaneti at fedoraproject.org  Mon Dec 14 08:30:35 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Mon, 14 Dec 2009 08:30:35 +0000 (UTC)
Subject: File gtg-0.2.tar.gz uploaded to lookaside cache by yaneti
Message-ID: <20091214083035.1343128ED27@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gtg:

1a8ba423cab1efe61967f103c1f04935  gtg-0.2.tar.gz



From yaneti at fedoraproject.org  Mon Dec 14 08:32:05 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Mon, 14 Dec 2009 08:32:05 +0000 (UTC)
Subject: rpms/gtg/devel .cvsignore,1.3,1.4 gtg.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20091214083205.C2C0111C00E9@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/gtg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4423

Modified Files:
	.cvsignore gtg.spec sources 
Log Message:
- 0.2 final.
  http://gtg.fritalk.com/post/2009/12/10/The-new-Getting-Things-GNOME!-0.2-Gorignak-has-landed!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Dec 2009 11:33:55 -0000	1.3
+++ .cvsignore	14 Dec 2009 08:32:05 -0000	1.4
@@ -1 +1 @@
-gtg-0.1.9.tar.gz
+gtg-0.2.tar.gz


Index: gtg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/devel/gtg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gtg.spec	3 Dec 2009 11:33:55 -0000	1.3
+++ gtg.spec	14 Dec 2009 08:32:05 -0000	1.4
@@ -1,7 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define gtg_milestone 0.2
 
 Name:           gtg
-Version:        0.1.9
+Version:        0.2
 Release:        1%{?dist}
 Summary:        Personal organizer for the GNOME desktop
 
@@ -9,7 +10,7 @@ Group:          Applications/Productivit
 License:        GPLv3+
 URL:            http://gtg.fritalk.com
 BuildArch:      noarch
-Source0:        http://launchpad.net/%{name}/trunk/0.2/+download/%{name}-%{version}.tar.gz
+Source0:        http://launchpad.net/%{name}/trunk/%{gtg_milestone}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -61,15 +62,20 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG LICENSE README
-%{_bindir}/%{name}
+%{_bindir}/gtg
+%{_bindir}/gtg_new_task
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{python_sitelib}/*
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/*.1.gz
 
 
 %changelog
+* Mon Dec 14 2009 Yanko Kaneti <yaneti at declera.com> 0.2-1
+- 0.2 final.
+  http://gtg.fritalk.com/post/2009/12/10/The-new-Getting-Things-GNOME!-0.2-Gorignak-has-landed!
+
 * Thu Dec  3 2009 Yanko Kaneti <yaneti at declera.com> 0.1.9-1
 - 0.2 beta.
   http://gtg.fritalk.com/post/2009/12/02/Getting-Things-GNOME!-0.1.9-is-out!


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Dec 2009 11:33:55 -0000	1.3
+++ sources	14 Dec 2009 08:32:05 -0000	1.4
@@ -1 +1 @@
-65c4138ccee894f1396d75c82924d73a  gtg-0.1.9.tar.gz
+1a8ba423cab1efe61967f103c1f04935  gtg-0.2.tar.gz



From yaneti at fedoraproject.org  Mon Dec 14 08:37:02 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Mon, 14 Dec 2009 08:37:02 +0000 (UTC)
Subject: rpms/gtg/devel gtg.spec,1.4,1.5
Message-ID: <20091214083702.4515511C00E9@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/gtg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6924

Modified Files:
	gtg.spec 
Log Message:
messed tag. bumping



Index: gtg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/devel/gtg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gtg.spec	14 Dec 2009 08:32:05 -0000	1.4
+++ gtg.spec	14 Dec 2009 08:37:02 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           gtg
 Version:        0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Personal organizer for the GNOME desktop
 
 Group:          Applications/Productivity
@@ -72,7 +72,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
-* Mon Dec 14 2009 Yanko Kaneti <yaneti at declera.com> 0.2-1
+* Mon Dec 14 2009 Yanko Kaneti <yaneti at declera.com> 0.2-2
 - 0.2 final.
   http://gtg.fritalk.com/post/2009/12/10/The-new-Getting-Things-GNOME!-0.2-Gorignak-has-landed!
 



From corsepiu at fedoraproject.org  Mon Dec 14 08:42:32 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 14 Dec 2009 08:42:32 +0000 (UTC)
Subject: File rt-3.8.7.tar.gz uploaded to lookaside cache by corsepiu
Message-ID: <20091214084232.67AED28ED3B@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for rt3:

1e269e88cb03a94f7992b115d4d0828a  rt-3.8.7.tar.gz



From corsepiu at fedoraproject.org  Mon Dec 14 08:42:55 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 14 Dec 2009 08:42:55 +0000 (UTC)
Subject: rpms/rt3/devel .cvsignore, 1.16, 1.17 rt3.spec, 1.48, 1.49 sources, 
	1.16, 1.17
Message-ID: <20091214084255.9F9A511C00E9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9522

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.7-1
- Upstream update.
- Add UPGRADING.mysql, perl(Text::Quoted), R: perl(Text::WikiFormat)
  (BZ #546786; Thanks to Dale Bewley <dale at fedoraproject.org>)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	4 Dec 2009 15:02:42 -0000	1.16
+++ .cvsignore	14 Dec 2009 08:42:55 -0000	1.17
@@ -1 +1 @@
-rt-3.8.6.tar.gz
+rt-3.8.7.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- rt3.spec	4 Dec 2009 15:02:42 -0000	1.48
+++ rt3.spec	14 Dec 2009 08:42:55 -0000	1.49
@@ -18,12 +18,12 @@
 
 # --with devel_mode/--without devel_mode
 #	enable/disable building/installing devel files
-#	Default: with
+#	Default: --with
 %bcond_without devel_mode
 
 # --with gpg/--without gpg
 #	enable/disable building gpg support
-#	Default: without
+#	Default: --without
 %bcond_with gpg
 
 # --with tests
@@ -39,7 +39,7 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.8.6
+Version:	3.8.7
 Release:	1%{?dist}
 Summary:	Request tracker 3
 
@@ -175,6 +175,8 @@ Requires: perl(LWP::MediaTypes)
 Requires: perl(mod_perl2)
 Requires: perl(Module::Versions::Report)
 Requires: perl(Net::Server::PreFork)
+Requires: perl(Text::Quoted)
+Requires: perl(Text::WikiFormat)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
 Requires: perl(XML::RSS)
@@ -386,7 +388,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README UPGRADING README.fedora
+%doc COPYING README UPGRADING UPGRADING.mysql README.fedora
 %{_bindir}/*
 %{_sbindir}/*
 %exclude %{_sbindir}/rt-mailgate
@@ -431,6 +433,11 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.7-1
+- Upstream update.
+- Add UPGRADING.mysql, perl(Text::Quoted), R: perl(Text::WikiFormat)
+  (BZ #546786; Thanks to Dale Bewley <dale at fedoraproject.org>)
+
 * Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.6-1
 - Upstream update.
 - Remove rt-3.8.4-Makefile.diff, rt-3.8.4-test-dependencies.diff, 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	4 Dec 2009 15:02:42 -0000	1.16
+++ sources	14 Dec 2009 08:42:55 -0000	1.17
@@ -1 +1 @@
-522f93e39c6978ba9f49efa00eb5621e  rt-3.8.6.tar.gz
+1e269e88cb03a94f7992b115d4d0828a  rt-3.8.7.tar.gz



From corsepiu at fedoraproject.org  Mon Dec 14 08:44:12 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 14 Dec 2009 08:44:12 +0000 (UTC)
Subject: rpms/rt3/F-12 rt3.spec,1.46,1.47
Message-ID: <20091214084412.F358211C00E9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10250

Modified Files:
	rt3.spec 
Log Message:
* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-8
- Add UPGRADING.mysql, perl(Text::Quoted), R: perl(Text::WikiFormat)
  (BZ #546786; Thanks to Dale Bewley <dale at fedoraproject.org>)



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-12/rt3.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rt3.spec	4 Dec 2009 11:23:35 -0000	1.46
+++ rt3.spec	14 Dec 2009 08:44:12 -0000	1.47
@@ -18,12 +18,12 @@
 
 # --with devel_mode/--without devel_mode
 #	enable/disable building/installing devel files
-#	Default: with
+#	Default: --with
 %bcond_without devel_mode
 
 # --with gpg/--without gpg
 #	enable/disable building gpg support
-#	Default: without
+#	Default: --without
 %bcond_with gpg
 
 # --with tests
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -185,6 +185,8 @@ Requires: perl(LWP::MediaTypes)
 Requires: perl(mod_perl2)
 Requires: perl(Module::Versions::Report)
 Requires: perl(Net::Server::PreFork)
+Requires: perl(Text::Quoted)
+Requires: perl(Text::WikiFormat)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
 Requires: perl(XML::RSS)
@@ -398,7 +400,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README UPGRADING README.fedora
+%doc COPYING README UPGRADING UPGRADING.mysql README.fedora
 %{_bindir}/*
 %{_sbindir}/*
 %exclude %{_sbindir}/rt-mailgate
@@ -443,6 +445,10 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-8
+- Add UPGRADING.mysql, perl(Text::Quoted), R: perl(Text::WikiFormat)
+  (BZ #546786; Thanks to Dale Bewley <dale at fedoraproject.org>)
+
 * Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-7
 - Add rt-3.8.4-rh-bz543962.diff (BZ #543962).
 



From corsepiu at fedoraproject.org  Mon Dec 14 08:45:22 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 14 Dec 2009 08:45:22 +0000 (UTC)
Subject: rpms/rt3/F-11 rt3.spec,1.44,1.45
Message-ID: <20091214084522.2251B11C018B@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10716

Modified Files:
	rt3.spec 
Log Message:
* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-13
- Add UPGRADING.mysql, perl(Text::Quoted), R: perl(Text::WikiFormat)
  (BZ #546786; Thanks to Dale Bewley <dale at fedoraproject.org>)



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-11/rt3.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- rt3.spec	4 Dec 2009 11:25:50 -0000	1.44
+++ rt3.spec	14 Dec 2009 08:45:22 -0000	1.45
@@ -18,12 +18,12 @@
 
 # --with devel_mode/--without devel_mode
 #	enable/disable building/installing devel files
-#	Default: with
+#	Default: --with
 %bcond_without devel_mode
 
 # --with gpg/--without gpg
 #	enable/disable building gpg support
-#	Default: without
+#	Default: --without
 %bcond_with gpg
 
 # --with tests
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -190,6 +190,8 @@ Requires: perl(LWP::MediaTypes)
 Requires: perl(mod_perl2)
 Requires: perl(Module::Versions::Report)
 Requires: perl(Net::Server::PreFork)
+Requires: perl(Text::Quoted)
+Requires: perl(Text::WikiFormat)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
 Requires: perl(XML::RSS)
@@ -404,7 +406,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README UPGRADING README.fedora
+%doc COPYING README UPGRADING UPGRADING.mysql README.fedora
 %{_bindir}/*
 %{_sbindir}/*
 %exclude %{_sbindir}/rt-mailgate
@@ -449,6 +451,10 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-13
+- Add UPGRADING.mysql, perl(Text::Quoted), R: perl(Text::WikiFormat)
+  (BZ #546786; Thanks to Dale Bewley <dale at fedoraproject.org>)
+
 * Fri Dec 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-12
 - Add rt-3.8.2-rh-bz543962.diff (BZ #543962).
 



From npajkovs at fedoraproject.org  Mon Dec 14 08:50:19 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Mon, 14 Dec 2009 08:50:19 +0000 (UTC)
Subject: rpms/less/F-12 less.spec,1.59,1.60 lesspipe.sh,1.12,1.13
Message-ID: <20091214085019.D7F4711C0345@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/less/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13181

Modified Files:
	less.spec lesspipe.sh 
Log Message:
#546613 - RFE: add *.jar *.nbm to lesspipe.sh


Index: less.spec
===================================================================
RCS file: /cvs/extras/rpms/less/F-12/less.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- less.spec	9 Dec 2009 16:56:44 -0000	1.59
+++ less.spec	14 Dec 2009 08:50:19 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better
 Name: less
 Version: 436
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -65,6 +65,9 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Dec 12 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 436-4
+- #546613 - RFE: add *.jar *.nbm to lesspipe.sh
+
 * Wed Dec 9 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 436-3
 - Resolves: #537746 - Two different descriptions about the default value of LESSBINFMT
 


Index: lesspipe.sh
===================================================================
RCS file: /cvs/extras/rpms/less/F-12/lesspipe.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- lesspipe.sh	31 Mar 2009 08:25:57 -0000	1.12
+++ lesspipe.sh	14 Dec 2009 08:50:19 -0000	1.13
@@ -26,7 +26,7 @@ lesspipe() {
   *.[zZ]|*.gz) gzip -dc -- "$1" ;;
   *.bz2) bzip2 -dc -- "$1" ;;
   *.lzma) lzma -c -d -- "$1" ;;
-  *.zip) zipinfo -- "$1" ;;
+  *.zip|*.jar|*.nbm) zipinfo -- "$1" ;;
   *.rpm) rpm -qpivl --changelog -- "$1" ;;
   *.cpi|*.cpio) cpio -itv < "$1" ;;
   *.gif|*.jpeg|*.jpg|*.pcd|*.png|*.tga|*.tiff|*.tif)



From yaneti at fedoraproject.org  Mon Dec 14 08:50:22 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Mon, 14 Dec 2009 08:50:22 +0000 (UTC)
Subject: rpms/gtg/F-12 .cvsignore,1.2,1.3 gtg.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091214085022.93BC411C0345@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/gtg/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13147

Modified Files:
	.cvsignore gtg.spec sources 
Log Message:
- New upstream release.
  http://gtg.fritalk.com/post/2009/12/10/The-new-Getting-Things-GNOME!-0.2-Gorignak-has-landed!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Jul 2009 08:20:29 -0000	1.2
+++ .cvsignore	14 Dec 2009 08:50:22 -0000	1.3
@@ -1 +1 @@
-gtg-0.1.2.tar.gz
+gtg-0.2.tar.gz


Index: gtg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/F-12/gtg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gtg.spec	25 Jul 2009 01:39:10 -0000	1.2
+++ gtg.spec	14 Dec 2009 08:50:22 -0000	1.3
@@ -1,15 +1,16 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define gtg_milestone 0.2
 
 Name:           gtg
-Version:        0.1.2
-Release:        4%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Personal organizer for the GNOME desktop
 
 Group:          Applications/Productivity
 License:        GPLv3+
 URL:            http://gtg.fritalk.com
 BuildArch:      noarch
-Source0:        http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        http://launchpad.net/%{name}/trunk/%{gtg_milestone}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -26,12 +27,6 @@ used as more than just GTD software.
 
 %prep
 %setup -q
-# patch up setup.py, which otherwise requires a running X server
-sed -e 's/import GTG//' \
-    -e "s|GTG.VERSION|'%{version}'|" \
-    -e 's|GTG.URL|"http://gtg.fritalk.com"|' \
-    -e 's|GTG.EMAIL|"gtg at lists.launchpad.net"|' \
-    -i.bak setup.py
 sed -i -e "s|#!/usr/bin/env python||" GTG/gtg.py
 
 
@@ -66,15 +61,20 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG LICENSE README
-%{_bindir}/%{name}
+%{_bindir}/gtg
+%{_bindir}/gtg_new_task
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{python_sitelib}/*
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/*.1.gz
 
 
 %changelog
+* Mon Dec 14 2009 Yanko Kaneti <yaneti at declera.com> 0.2-1
+- New upstream release.
+  http://gtg.fritalk.com/post/2009/12/10/The-new-Getting-Things-GNOME!-0.2-Gorignak-has-landed!
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 08:20:30 -0000	1.2
+++ sources	14 Dec 2009 08:50:22 -0000	1.3
@@ -1 +1 @@
-276d5dbad074e4f50283a61bb569e9d4  gtg-0.1.2.tar.gz
+1a8ba423cab1efe61967f103c1f04935  gtg-0.2.tar.gz



From sandeeps at fedoraproject.org  Mon Dec 14 09:00:48 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 09:00:48 +0000 (UTC)
Subject: rpms/pothana2000-fonts/F-11 pothana2000-fonts.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091214090048.2AC5911C01EA@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/pothana2000-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17841

Modified Files:
	pothana2000-fonts.spec sources 
Log Message:
Preparing for 1.3.2-1 release



Index: pothana2000-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pothana2000-fonts/F-11/pothana2000-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pothana2000-fonts.spec	17 Jul 2009 05:59:07 -0000	1.1
+++ pothana2000-fonts.spec	14 Dec 2009 09:00:47 -0000	1.2
@@ -2,12 +2,12 @@
 %global fontconf 69-%{fontname}.conf
 
 Name: %{fontname}-fonts
-Version: 1.3.1
-Release: 2%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 Summary: Unicode compliant OpenType font for Telugu
 
 Group: User Interface/X
-License: GPLv2+
+License: GPLv2+ with exceptions
 URL: http://www.kavya-nandanam.com/dload.htm
 
 Source0: Pothana2k-Li.zip
@@ -19,7 +19,7 @@ BuildRequires: fontpackages-devel
 Requires: fontpackages-filesystem
 
 %description
-Its Free OpenType font for Telugu created by
+A Free OpenType font for Telugu created by
 Dr. Tirumala Krishna Desikacharyulu. 
 
 %prep
@@ -47,6 +47,11 @@ rm -fr %{buildroot}
 %doc gpl.txt
 
 %changelog
+* Mon Dec 14 2009 <sshedmak at redhat.com> - 1.3.2-1
+- Fixed FSType, Preferred Style, UinqueID and Fullname
+- Fixed Invalid Glyph Names reported by fontlint
+- with exceptions string added in License
+
 * Wed Mar 25 2009 <sshedmak at redhat.com> - 1.3.1-2
 - Fixed download URL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pothana2000-fonts/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 05:57:49 -0000	1.2
+++ sources	14 Dec 2009 09:00:48 -0000	1.3
@@ -1 +1 @@
-8c392bfbc921d816b8659f9e330372ad  Pothana2k-Li.zip
+24f546309998cf29e36154c1479256ea  Pothana2k-Li.zip



From sandeeps at fedoraproject.org  Mon Dec 14 09:01:24 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 09:01:24 +0000 (UTC)
Subject: rpms/pothana2000-fonts/F-12 pothana2000-fonts.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091214090124.F07D611C01EA@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/pothana2000-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18116

Modified Files:
	pothana2000-fonts.spec sources 
Log Message:
Preparing for 1.3.2-1 release



Index: pothana2000-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pothana2000-fonts/F-12/pothana2000-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pothana2000-fonts.spec	26 Jul 2009 19:18:28 -0000	1.2
+++ pothana2000-fonts.spec	14 Dec 2009 09:01:24 -0000	1.3
@@ -2,12 +2,12 @@
 %global fontconf 69-%{fontname}.conf
 
 Name: %{fontname}-fonts
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 Summary: Unicode compliant OpenType font for Telugu
 
 Group: User Interface/X
-License: GPLv2+
+License: GPLv2+ with exceptions
 URL: http://www.kavya-nandanam.com/dload.htm
 
 Source0: Pothana2k-Li.zip
@@ -19,7 +19,7 @@ BuildRequires: fontpackages-devel
 Requires: fontpackages-filesystem
 
 %description
-Its Free OpenType font for Telugu created by
+A Free OpenType font for Telugu created by
 Dr. Tirumala Krishna Desikacharyulu. 
 
 %prep
@@ -47,8 +47,10 @@ rm -fr %{buildroot}
 %doc gpl.txt
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Dec 14 2009 <sshedmak at redhat.com> - 1.3.2-1
+- Fixed FSType, Preferred Style, UinqueID and Fullname
+- Fixed Invalid Glyph Names reported by fontlint
+- with exceptions string added in License
 
 * Wed Mar 25 2009 <sshedmak at redhat.com> - 1.3.1-2
 - Fixed download URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pothana2000-fonts/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 09:01:53 -0000	1.2
+++ sources	14 Dec 2009 09:01:24 -0000	1.3
@@ -1 +1 @@
-8c392bfbc921d816b8659f9e330372ad  Pothana2k-Li.zip
+24f546309998cf29e36154c1479256ea  Pothana2k-Li.zip



From ovasik at fedoraproject.org  Mon Dec 14 09:02:34 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 14 Dec 2009 09:02:34 +0000 (UTC)
Subject: rpms/passivetex/devel passivetex.spec,1.20,1.21
Message-ID: <20091214090234.F0ABD11C00E9@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/passivetex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18945

Modified Files:
	passivetex.spec 
Log Message:
Merge Review(#226231): Fixed sources, license, buildroot, added build section


Index: passivetex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/passivetex/devel/passivetex.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- passivetex.spec	25 Jul 2009 23:17:00 -0000	1.20
+++ passivetex.spec	14 Dec 2009 09:02:34 -0000	1.21
@@ -1,10 +1,13 @@
 Summary:	Macros to process XSL formatting objects
 Name:		passivetex
 Version:	1.25
-Release:  10%{?dist}
-License:	LPPL
+Release:  11%{?dist}
+License:	Copyright only
 Group:		Applications/Publishing
-Source0:	http://www.tei-c.org.uk/Software/passivetex/%{name}-%{version}.zip
+#Source0 could be obtained at
+# http://www.tei-c.org.uk/Software/passivetex/passivetex.zip
+Source0:	passivetex-%{version}.zip
+#Fix leader length.
 Patch0:		passivetex-1.21-leader.patch
 URL:		http://www.tei-c.org.uk/Software/passivetex/
 BuildArch:	noarch
@@ -12,7 +15,7 @@ Requires: tex(latex)
 Requires(post): tex(latex)
 Requires:	xmltex >= 20020625-10
 BuildRequires: tex(latex)
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 PassiveTeX is a library of TeX macros which can be used to process an
@@ -26,12 +29,14 @@ objects.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -p -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex/passivetex
-install -p *.sty *.xmt $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex/passivetex
+install -m 0755 -p -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex/passivetex
+install -m 0644 -p *.sty *.xmt $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex/passivetex
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%build
+
 %post
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 /usr/bin/env - PATH=$PATH:%{_bindir} fmtutil-sys --all > /dev/null 2>&1
@@ -47,12 +52,16 @@ exit 0
 exit 0
 
 %files
-%defattr(644,root,root,755)
+%defattr(-,root,root,-)
 %doc README.passivetex LICENSE
 %{_datadir}/texmf/tex/xmltex/passivetex
 
 
 %changelog
+* Mon Dec 14 2009 Ondrej Vasik <ovasik at redhat.com> - 1.25-11
+- Merge Review(#226231): Fixed sources, license, buildroot,
+  added build section
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -155,8 +164,8 @@ exit 0
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-Revision 1.20  2009/07/25 23:17:00  jkeating
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+Revision 1.21  2009/12/14 09:02:34  ovasik
+Merge Review(#226231): Fixed sources, license, buildroot, added build section
 
 Revision 1.8  2001/08/21 10:12:42  wrobell
 - ver. 1.6



From npajkovs at fedoraproject.org  Mon Dec 14 09:05:26 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Mon, 14 Dec 2009 09:05:26 +0000 (UTC)
Subject: rpms/less/devel less-436-manpage.patch, NONE, 1.1 less.spec, 1.58, 
	1.59 lesspipe.sh, 1.12, 1.13
Message-ID: <20091214090526.CFC3411C00E9@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/less/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19927

Modified Files:
	less.spec lesspipe.sh 
Added Files:
	less-436-manpage.patch 
Log Message:
Resolves: #546613 - RFE: add *.jar *.nbm to lesspipe.sh
Resolves: #537746 - Two different descriptions about the default value of LESSBINFMT


less-436-manpage.patch:
 less.man |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE less-436-manpage.patch ---
diff -up less-436/less.man.manpage less-436/less.man
--- less-436/less.man.manpage	2009-07-08 00:27:22.000000000 +0200
+++ less-436/less.man	2009-12-09 17:48:54.571351651 +0100
@@ -1164,10 +1164,10 @@ LESS(1)                                 
        attribute  is  assumed.   The remainder of LESSBINFMT is a string which
        may include one printf-style escape sequence (a % followed by x, X,  o,
        d,  etc.).   For  example, if LESSBINFMT is "*u[%x]", binary characters
-       are displayed in underlined hexadecimal surrounded  by  brackets.   The
-       default  if  no LESSBINFMT is specified is "*s<%X>".  The default if no
-       LESSBINFMT is specified is "*s<%02X>".  Warning: the result of  expand-
-       ing the character via LESSBINFMT must be less than 31 characters.
+       are displayed in underlined hexadecimal surrounded  by  brackets.   The 
+       default if no LESSBINFMT  is  specified  is  "*s<%02X>".  Warning:  the 
+       result of  expanding the character via LESSBINFMT must be less  than 31
+       characters.
 
        When the character set is utf-8, the LESSUTFBINFMT environment variable
        acts similarly to LESSBINFMT but it applies to Unicode code points that


Index: less.spec
===================================================================
RCS file: /cvs/extras/rpms/less/devel/less.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- less.spec	25 Jul 2009 05:05:09 -0000	1.58
+++ less.spec	14 Dec 2009 09:05:26 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better
 Name: less
 Version: 436
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@ Source3: less.csh
 Patch1:	less-406-Foption.patch
 Patch4: less-394-time.patch
 Patch5: less-418-fsync.patch
+Patch6: less-436-manpage.patch
 URL: http://www.greenwoodsoftware.com/less/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: ncurses-devel
@@ -32,6 +33,7 @@ files, and you'll use it frequently.
 %patch1 -p1 -b .Foption
 %patch4 -p1 -b .time
 %patch5 -p1 -b .fsync
+%patch6 -p1 -b .manpage
 
 autoreconf
 
@@ -63,6 +65,12 @@ ls -la $RPM_BUILD_ROOT/etc/profile.d
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Dec 12 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 436-4
+- #546613 - RFE: add *.jar *.nbm to lesspipe.sh
+
+* Wed Dec 9 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 436-3
+- Resolves: #537746 - Two different descriptions about the default value of LESSBINFMT
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 436-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: lesspipe.sh
===================================================================
RCS file: /cvs/extras/rpms/less/devel/lesspipe.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- lesspipe.sh	31 Mar 2009 08:25:57 -0000	1.12
+++ lesspipe.sh	14 Dec 2009 09:05:26 -0000	1.13
@@ -26,7 +26,7 @@ lesspipe() {
   *.[zZ]|*.gz) gzip -dc -- "$1" ;;
   *.bz2) bzip2 -dc -- "$1" ;;
   *.lzma) lzma -c -d -- "$1" ;;
-  *.zip) zipinfo -- "$1" ;;
+  *.zip|*.jar|*.nbm) zipinfo -- "$1" ;;
   *.rpm) rpm -qpivl --changelog -- "$1" ;;
   *.cpi|*.cpio) cpio -itv < "$1" ;;
   *.gif|*.jpeg|*.jpg|*.pcd|*.png|*.tga|*.tiff|*.tif)



From caolanm at fedoraproject.org  Mon Dec 14 09:08:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Dec 2009 09:08:02 +0000 (UTC)
Subject: rpms/planner/F-12 planner-gnome604510.calcolors.patch, NONE,
	1.1 planner.spec, 1.73, 1.74
Message-ID: <20091214090802.7577411C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21455/F-12

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604510.calcolors.patch 
Log Message:
- Resolves: rhbz#546850 use different colors for different day types

planner-gnome604510.calcolors.patch:
 libplanner/mrp-calendar.c |    5 -
 src/planner-calendar.c    |  177 ++++++++++++++++------------------------------
 src/planner-calendar.h    |   26 ------
 3 files changed, 68 insertions(+), 140 deletions(-)

--- NEW FILE planner-gnome604510.calcolors.patch ---
diff -ru planner-0.14.4.orig/libplanner/mrp-calendar.c planner-0.14.4/libplanner/mrp-calendar.c
--- planner-0.14.4.orig/libplanner/mrp-calendar.c	2008-07-22 14:41:46.000000000 +0100
+++ planner-0.14.4/libplanner/mrp-calendar.c	2009-12-12 17:08:50.000000000 +0000
@@ -159,9 +161,10 @@
 
 	g_object_class_install_property (object_class,
 					 PROP_PROJECT,
-					 g_param_spec_pointer ("project",
+					 g_param_spec_object ("project",
 							       "Project",
 							       "The project this calendar belongs to",
+							       G_TYPE_OBJECT,
 							       G_PARAM_READWRITE));
 
 	imrp_day_setup_defaults ();
@@ -254,7 +257,7 @@
 		mrp_calendar_set_name (calendar, g_value_get_string (value));
 		break;
 	case PROP_PROJECT:
-		priv->project = MRP_PROJECT (g_value_get_pointer (value));
+		priv->project = g_value_get_object (value);
 		break;
 	default:
 		break;
diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-calendar.c
--- planner-0.14.4.orig/src/planner-calendar.c	2009-12-14 08:55:30.000000000 +0000
+++ planner-0.14.4/src/planner-calendar.c	2009-12-13 15:47:15.000000000 +0000
@@ -180,10 +180,8 @@
 #define HEADER_BG_COLOR(widget)		 (& (widget)->style->bg[GTK_WIDGET_STATE (widget)])
 #define SELECTED_BG_COLOR(widget)	 (& (widget)->style->base[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
 #define SELECTED_FG_COLOR(widget)	 (& (widget)->style->text[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
-#define NORMAL_DAY_COLOR(widget)	 (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
 #define PREV_MONTH_COLOR(widget)	 (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 #define NEXT_MONTH_COLOR(widget)	 (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
-#define MARKED_COLOR(widget)		 (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
 #define BACKGROUND_COLOR(widget)	 (& (widget)->style->base[GTK_WIDGET_STATE (widget)])
 #define HIGHLIGHT_BACK_COLOR(widget)	 (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 
@@ -430,6 +428,25 @@
 			      G_TYPE_NONE, 0);
 }
 
+/* Tango palette */
+static const GdkColor tango_palette[14] =
+{
+    { 0, 0xcccc, 0x0000, 0x0000 },
+    { 0, 0x4e4e, 0x9a9a, 0x0606 },
+    { 0, 0xc4c4, 0xa0a0, 0x0000 }, 
+    { 0, 0x3434, 0x6565, 0xa4a4 },
+    { 0, 0x7575, 0x5050, 0x7b7b },
+    { 0, 0x0606, 0x9820, 0x9a9a },
+    { 0, 0x5555, 0x5757, 0x5353 },
+    { 0, 0xefef, 0x2929, 0x2929 },
+    { 0, 0x8a8a, 0xe2e2, 0x3434 }, 
+    { 0, 0xfcfc, 0xe9e9, 0x4f4f },
+    { 0, 0x7272, 0x9f9f, 0xcfcf },
+    { 0, 0xadad, 0x7f7f, 0xa8a8 },             
+    { 0, 0x3434, 0xe2e2, 0xe2e2 },
+    { 0, 0xeeee, 0xeeee, 0xecec }
+};
+
 static void
 planner_calendar_init (PlannerCalendar *calendar)
 {
@@ -470,8 +487,11 @@
 	calendar->year  = 1900 + tm->tm_year;
   
 	for (i=0;i<31;i++)
-		calendar->marked_date[i] = PLANNER_CALENDAR_MARK_NONE;
-	calendar->num_marked_dates = 0;
+		calendar->marked_date[i] = NULL;
+
+	for (i=0;i<14;i++)
+		calendar->mark_colors[i] = tango_palette[i];
+
 	calendar->selected_day = tm->tm_mday;
   
 	calendar->display_flags = ( PLANNER_CALENDAR_SHOW_HEADING | 
@@ -1049,6 +1069,7 @@
 	PlannerCalendarPrivateData *private_data;
 	GdkWindowAttr attributes;
 	gint attributes_mask;
+	gint i;
 	GdkGCValues values;
 
 	calendar = PLANNER_CALENDAR (widget);
@@ -1110,6 +1131,9 @@
 						   &values,
 						   GDK_GC_FOREGROUND |
 						   GDK_GC_FUNCTION);
+
+	for (i=0;i<14;i++)
+		gdk_rgb_find_color(attributes.colormap, &(calendar->mark_colors[i]));
 }
 
 static void
@@ -1839,51 +1863,13 @@
 			gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
 					    private_data->day_width, day_height);
 		}
-		else
+		else if (calendar->marked_date[day-1])
 		{
-			switch (calendar->marked_date[day-1]) {
-			case PLANNER_CALENDAR_MARK_NONE:
-			case PLANNER_CALENDAR_MARK_UNDERLINE:
-			case PLANNER_CALENDAR_MARK_BOLD:
-				break;
-			case PLANNER_CALENDAR_MARK_SHADE:
-				gdk_gc_set_foreground (gc, SHADED_BG_COLOR (GTK_WIDGET (calendar)));
-				gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-						    private_data->day_width, day_height);
-				break;
-			case PLANNER_CALENDAR_MARK_STRIPE:
-			{
-				static GdkBitmap *stripe_stipple = NULL;
-				gchar             stipple_pattern[] = { 2, 1, 8, 4 };
-
-				if (!stripe_stipple) {
-					stripe_stipple = gdk_bitmap_create_from_data (NULL,
-										      stipple_pattern,
-										      4, 4);
-				}
-		      
-				gdk_gc_set_foreground (gc, STRIPED_BG_COLOR (GTK_WIDGET (calendar)));
-				gdk_gc_set_fill (gc, GDK_STIPPLED);
-				gdk_gc_set_stipple (gc, stripe_stipple);
-				gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-						    private_data->day_width, day_height);
-				gdk_gc_set_fill (gc, GDK_SOLID);
-			}
-			break;
-			}
+			gdk_gc_set_foreground (gc, calendar->marked_date[day-1]);
+			gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
+					    private_data->day_width, day_height);
 		}
       
-		switch (calendar->marked_date[day-1]) {
-		case PLANNER_CALENDAR_MARK_BOLD:
-			gdk_gc_set_foreground (gc, MARKED_COLOR (GTK_WIDGET (calendar)));
-			break;
-		case PLANNER_CALENDAR_MARK_SHADE:
-		case PLANNER_CALENDAR_MARK_UNDERLINE:
-		case PLANNER_CALENDAR_MARK_NONE:
-			gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar)));
-			break;
-		}
-  
 		if (calendar->selected_day == day)
 			gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar)));
 		else
@@ -1901,17 +1887,6 @@
 	gdk_draw_layout (private_data->main_win, gc,
 			 x_loc, y_loc, layout);
 
-	switch (calendar->marked_date[day-1]) {
-	case PLANNER_CALENDAR_MARK_BOLD:
-		if (calendar->day_month[row][col] == MONTH_CURRENT) 
-			gdk_draw_layout (private_data->main_win, gc,
-					 x_loc-1, y_loc, layout);
-		break;
-	  
-	default:
-		break;
-	}
-
 	if (GTK_WIDGET_HAS_FOCUS (calendar) 
 	    && calendar->focus_row == row && calendar->focus_col == col)
 	{
@@ -2257,46 +2232,6 @@
 }
 
 void
-planner_calendar_clear_marks (PlannerCalendar *calendar)
-{
-	guint day;
-  
-	g_return_if_fail (PLANNER_IS_CALENDAR (calendar));
-  
-	for (day = 0; day < 31; day++)
-	{
-		calendar->marked_date[day] = PLANNER_CALENDAR_MARK_NONE;
-	}
- 
-	calendar->num_marked_dates = 0;
- 
-	if (GTK_WIDGET_DRAWABLE (calendar))
-	{
-		planner_calendar_paint_main (GTK_WIDGET (calendar));
-	}
-}
-
-gboolean
-planner_calendar_unmark_day (PlannerCalendar *calendar,
-			guint	      day)
-{
-	g_return_val_if_fail (PLANNER_IS_CALENDAR (calendar), FALSE);
-  
-	if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
-	{
-		calendar->marked_date[day - 1] = FALSE;
-		calendar->num_marked_dates--;
-	}
-  
-	if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
-	{
-		planner_calendar_paint_main (GTK_WIDGET (calendar));
-	}
-  
-	return TRUE;
-}
-
-void
 planner_calendar_get_date (PlannerCalendar *calendar,
 		      guint	   *year,
 		      guint	   *month,
@@ -2754,10 +2689,10 @@
 
 /* ------------------------------- */
 
-void
+static void
 planner_calendar_mark_day (PlannerCalendar         *calendar,
 		      guint               day,
-		      PlannerCalendarMarkType  type)
+		      const GdkColor *color)
 {
 	gint index;
 	
@@ -2766,16 +2701,11 @@
 
 	index = day - 1;
 	
-	if (calendar->marked_date[index] == type) {
+	if (calendar->marked_date[index] == color) {
 		return;
 	}
 
-	calendar->marked_date[index] = type;
-	if (type != PLANNER_CALENDAR_MARK_NONE) {
-		calendar->num_marked_dates++;
-	} else {
-		calendar->num_marked_dates--;
-	}
+	calendar->marked_date[index] = color;
 
 	if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar))) {
 		planner_calendar_paint_main (GTK_WIDGET (calendar));
@@ -2790,9 +2720,19 @@
 	MrpTime      *t;
 	mrptime      time;
 	MrpDay       *day;
+	MrpProject   *project=NULL;
+	const GdkColor     *color;
+	GList        *daytypes;
+	gint         dayindex;
 
 	planner_calendar_get_date (calendar, &y, &m, &d);
 
+	g_object_get (mrp_calendar, "project", &project, NULL);
+
+	daytypes = mrp_day_get_all (project);
+	daytypes = g_list_prepend (daytypes, mrp_day_get_nonwork ());
+	daytypes = g_list_prepend (daytypes, mrp_day_get_work ());
+
 	t = mrp_time2_new ();
 	mrp_time2_set_date (t, y, m+1, 1);
 	mrp_time2_set_time (t, 0, 0, 0);
@@ -2801,19 +2741,26 @@
 		time = mrp_time2_get_epoch (t);
 
 		day = mrp_calendar_get_day (mrp_calendar, time, TRUE);
+		dayindex = g_list_index (daytypes, day);
 
-		if (day == mrp_day_get_nonwork ()) {
-			planner_calendar_mark_day (calendar,
-						   d,
-						   PLANNER_CALENDAR_MARK_SHADE);
-		}
-		else if (day == mrp_day_get_work ()) {
-			planner_calendar_mark_day (calendar,
-						   d,
-						   PLANNER_CALENDAR_MARK_NONE);
+		switch (dayindex)
+		{
+			case 0:
+				color = NULL;
+				break;
+			case 1:
+				color = SHADED_BG_COLOR (GTK_WIDGET (calendar));
+				break;
+			default:
+				color = &(calendar->mark_colors[(dayindex-2)%14]);
+				break;
 		}
 
+		planner_calendar_mark_day (calendar, d, color);
+
 		mrp_time2_add_days (t, 1);
 	}
 	mrp_time2_free (t);
+	g_list_free (daytypes);
+	g_object_unref (project);
 }
diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-calendar.h
--- planner-0.14.4.orig/src/planner-calendar.h	2009-12-14 08:55:30.000000000 +0000
+++ planner-0.14.4/src/planner-calendar.h	2009-12-13 15:44:31.000000000 +0000
@@ -52,15 +52,6 @@
 	PLANNER_CALENDAR_SHOW_WEEK_NUMBERS	= 1 << 3,
 	PLANNER_CALENDAR_WEEK_START_MONDAY	= 1 << 4} PlannerCalendarDisplayOptions;
 
-typedef enum
-{
-	PLANNER_CALENDAR_MARK_NONE,
-	PLANNER_CALENDAR_MARK_BOLD,
-	PLANNER_CALENDAR_MARK_UNDERLINE,
-	PLANNER_CALENDAR_MARK_SHADE,
-	PLANNER_CALENDAR_MARK_STRIPE
-} PlannerCalendarMarkType;
-
 struct _PlannerCalendar
 {
 	GtkWidget widget;
@@ -75,10 +66,9 @@
 	gint day_month[6][7];
 	gint day[6][7];
 	
-	gint num_marked_dates;
-	gint marked_date[31];
+	const GdkColor *marked_date[31];
 	PlannerCalendarDisplayOptions  display_flags;
-	GdkColor marked_date_color[31];
+	GdkColor mark_colors[14];
 	
 	GdkGC *gc;
 	GdkGC *xor_gc;
@@ -123,10 +113,6 @@
 					 guint	      year);
 void	   planner_calendar_select_day	(PlannerCalendar *calendar,
 					 guint	      day);
-gboolean   planner_calendar_unmark_day	(PlannerCalendar *calendar,
-					 guint	      day);
-void	   planner_calendar_clear_marks	(PlannerCalendar *calendar);
-
 
 void	   planner_calendar_display_options (PlannerCalendar		  *calendar,
 					 PlannerCalendarDisplayOptions flags);
@@ -138,14 +124,8 @@
 void	   planner_calendar_freeze		(PlannerCalendar *calendar);
 void	   planner_calendar_thaw		(PlannerCalendar *calendar);
 
-
-
-void       planner_calendar_mark_day (PlannerCalendar         *calendar,
-				 guint               day,
-				 PlannerCalendarMarkType  type);
-
 void       planner_calendar_mark_days (PlannerCalendar         *calendar,
-				 MrpCalendar *mrp_calendar);
+				       MrpCalendar *mrp_calendar);
 
 
 #endif /* __PLANNER_CALENDAR_H__ */


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- planner.spec	11 Dec 2009 10:34:31 -0000	1.73
+++ planner.spec	14 Dec 2009 09:08:02 -0000	1.74
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   8%{?dist}
+Release:   9%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -26,6 +26,7 @@ Patch4: planner-buildfix.patch
 Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
 Patch6: planner-gnome604169-comboboxentry.patch
 Patch7: planner-gnome604355-scrolling.patch
+Patch8: planner-gnome604510.calcolors.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -63,6 +64,7 @@ This package provides a plugin to integr
 %patch5 -p1 -b .edittask
 %patch6 -p1 -b .combobox
 %patch7 -p1 -b .scrolling
+%patch8 -p1 -b .calcolors
 
 %build
 rm -rf libegg
@@ -163,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-9
+- Resolves: rhbz#546850 use different colors for different day types
+
 * Fri Dec 11 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-8
 - Resolves: rhbz#546515 allow scrolling
 



From caolanm at fedoraproject.org  Mon Dec 14 09:08:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Dec 2009 09:08:02 +0000 (UTC)
Subject: rpms/planner/devel planner-gnome604510.calcolors.patch, NONE,
	1.1 planner.spec, 1.73, 1.74
Message-ID: <20091214090802.AC59111C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21455/devel

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604510.calcolors.patch 
Log Message:
- Resolves: rhbz#546850 use different colors for different day types

planner-gnome604510.calcolors.patch:
 libplanner/mrp-calendar.c |    5 -
 src/planner-calendar.c    |  177 ++++++++++++++++------------------------------
 src/planner-calendar.h    |   26 ------
 3 files changed, 68 insertions(+), 140 deletions(-)

--- NEW FILE planner-gnome604510.calcolors.patch ---
diff -ru planner-0.14.4.orig/libplanner/mrp-calendar.c planner-0.14.4/libplanner/mrp-calendar.c
--- planner-0.14.4.orig/libplanner/mrp-calendar.c	2008-07-22 14:41:46.000000000 +0100
+++ planner-0.14.4/libplanner/mrp-calendar.c	2009-12-12 17:08:50.000000000 +0000
@@ -159,9 +161,10 @@
 
 	g_object_class_install_property (object_class,
 					 PROP_PROJECT,
-					 g_param_spec_pointer ("project",
+					 g_param_spec_object ("project",
 							       "Project",
 							       "The project this calendar belongs to",
+							       G_TYPE_OBJECT,
 							       G_PARAM_READWRITE));
 
 	imrp_day_setup_defaults ();
@@ -254,7 +257,7 @@
 		mrp_calendar_set_name (calendar, g_value_get_string (value));
 		break;
 	case PROP_PROJECT:
-		priv->project = MRP_PROJECT (g_value_get_pointer (value));
+		priv->project = g_value_get_object (value);
 		break;
 	default:
 		break;
diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-calendar.c
--- planner-0.14.4.orig/src/planner-calendar.c	2009-12-14 08:55:30.000000000 +0000
+++ planner-0.14.4/src/planner-calendar.c	2009-12-13 15:47:15.000000000 +0000
@@ -180,10 +180,8 @@
 #define HEADER_BG_COLOR(widget)		 (& (widget)->style->bg[GTK_WIDGET_STATE (widget)])
 #define SELECTED_BG_COLOR(widget)	 (& (widget)->style->base[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
 #define SELECTED_FG_COLOR(widget)	 (& (widget)->style->text[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
-#define NORMAL_DAY_COLOR(widget)	 (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
 #define PREV_MONTH_COLOR(widget)	 (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 #define NEXT_MONTH_COLOR(widget)	 (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
-#define MARKED_COLOR(widget)		 (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
 #define BACKGROUND_COLOR(widget)	 (& (widget)->style->base[GTK_WIDGET_STATE (widget)])
 #define HIGHLIGHT_BACK_COLOR(widget)	 (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 
@@ -430,6 +428,25 @@
 			      G_TYPE_NONE, 0);
 }
 
+/* Tango palette */
+static const GdkColor tango_palette[14] =
+{
+    { 0, 0xcccc, 0x0000, 0x0000 },
+    { 0, 0x4e4e, 0x9a9a, 0x0606 },
+    { 0, 0xc4c4, 0xa0a0, 0x0000 }, 
+    { 0, 0x3434, 0x6565, 0xa4a4 },
+    { 0, 0x7575, 0x5050, 0x7b7b },
+    { 0, 0x0606, 0x9820, 0x9a9a },
+    { 0, 0x5555, 0x5757, 0x5353 },
+    { 0, 0xefef, 0x2929, 0x2929 },
+    { 0, 0x8a8a, 0xe2e2, 0x3434 }, 
+    { 0, 0xfcfc, 0xe9e9, 0x4f4f },
+    { 0, 0x7272, 0x9f9f, 0xcfcf },
+    { 0, 0xadad, 0x7f7f, 0xa8a8 },             
+    { 0, 0x3434, 0xe2e2, 0xe2e2 },
+    { 0, 0xeeee, 0xeeee, 0xecec }
+};
+
 static void
 planner_calendar_init (PlannerCalendar *calendar)
 {
@@ -470,8 +487,11 @@
 	calendar->year  = 1900 + tm->tm_year;
   
 	for (i=0;i<31;i++)
-		calendar->marked_date[i] = PLANNER_CALENDAR_MARK_NONE;
-	calendar->num_marked_dates = 0;
+		calendar->marked_date[i] = NULL;
+
+	for (i=0;i<14;i++)
+		calendar->mark_colors[i] = tango_palette[i];
+
 	calendar->selected_day = tm->tm_mday;
   
 	calendar->display_flags = ( PLANNER_CALENDAR_SHOW_HEADING | 
@@ -1049,6 +1069,7 @@
 	PlannerCalendarPrivateData *private_data;
 	GdkWindowAttr attributes;
 	gint attributes_mask;
+	gint i;
 	GdkGCValues values;
 
 	calendar = PLANNER_CALENDAR (widget);
@@ -1110,6 +1131,9 @@
 						   &values,
 						   GDK_GC_FOREGROUND |
 						   GDK_GC_FUNCTION);
+
+	for (i=0;i<14;i++)
+		gdk_rgb_find_color(attributes.colormap, &(calendar->mark_colors[i]));
 }
 
 static void
@@ -1839,51 +1863,13 @@
 			gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
 					    private_data->day_width, day_height);
 		}
-		else
+		else if (calendar->marked_date[day-1])
 		{
-			switch (calendar->marked_date[day-1]) {
-			case PLANNER_CALENDAR_MARK_NONE:
-			case PLANNER_CALENDAR_MARK_UNDERLINE:
-			case PLANNER_CALENDAR_MARK_BOLD:
-				break;
-			case PLANNER_CALENDAR_MARK_SHADE:
-				gdk_gc_set_foreground (gc, SHADED_BG_COLOR (GTK_WIDGET (calendar)));
-				gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-						    private_data->day_width, day_height);
-				break;
-			case PLANNER_CALENDAR_MARK_STRIPE:
-			{
-				static GdkBitmap *stripe_stipple = NULL;
-				gchar             stipple_pattern[] = { 2, 1, 8, 4 };
-
-				if (!stripe_stipple) {
-					stripe_stipple = gdk_bitmap_create_from_data (NULL,
-										      stipple_pattern,
-										      4, 4);
-				}
-		      
-				gdk_gc_set_foreground (gc, STRIPED_BG_COLOR (GTK_WIDGET (calendar)));
-				gdk_gc_set_fill (gc, GDK_STIPPLED);
-				gdk_gc_set_stipple (gc, stripe_stipple);
-				gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-						    private_data->day_width, day_height);
-				gdk_gc_set_fill (gc, GDK_SOLID);
-			}
-			break;
-			}
+			gdk_gc_set_foreground (gc, calendar->marked_date[day-1]);
+			gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
+					    private_data->day_width, day_height);
 		}
       
-		switch (calendar->marked_date[day-1]) {
-		case PLANNER_CALENDAR_MARK_BOLD:
-			gdk_gc_set_foreground (gc, MARKED_COLOR (GTK_WIDGET (calendar)));
-			break;
-		case PLANNER_CALENDAR_MARK_SHADE:
-		case PLANNER_CALENDAR_MARK_UNDERLINE:
-		case PLANNER_CALENDAR_MARK_NONE:
-			gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar)));
-			break;
-		}
-  
 		if (calendar->selected_day == day)
 			gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar)));
 		else
@@ -1901,17 +1887,6 @@
 	gdk_draw_layout (private_data->main_win, gc,
 			 x_loc, y_loc, layout);
 
-	switch (calendar->marked_date[day-1]) {
-	case PLANNER_CALENDAR_MARK_BOLD:
-		if (calendar->day_month[row][col] == MONTH_CURRENT) 
-			gdk_draw_layout (private_data->main_win, gc,
-					 x_loc-1, y_loc, layout);
-		break;
-	  
-	default:
-		break;
-	}
-
 	if (GTK_WIDGET_HAS_FOCUS (calendar) 
 	    && calendar->focus_row == row && calendar->focus_col == col)
 	{
@@ -2257,46 +2232,6 @@
 }
 
 void
-planner_calendar_clear_marks (PlannerCalendar *calendar)
-{
-	guint day;
-  
-	g_return_if_fail (PLANNER_IS_CALENDAR (calendar));
-  
-	for (day = 0; day < 31; day++)
-	{
-		calendar->marked_date[day] = PLANNER_CALENDAR_MARK_NONE;
-	}
- 
-	calendar->num_marked_dates = 0;
- 
-	if (GTK_WIDGET_DRAWABLE (calendar))
-	{
-		planner_calendar_paint_main (GTK_WIDGET (calendar));
-	}
-}
-
-gboolean
-planner_calendar_unmark_day (PlannerCalendar *calendar,
-			guint	      day)
-{
-	g_return_val_if_fail (PLANNER_IS_CALENDAR (calendar), FALSE);
-  
-	if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
-	{
-		calendar->marked_date[day - 1] = FALSE;
-		calendar->num_marked_dates--;
-	}
-  
-	if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
-	{
-		planner_calendar_paint_main (GTK_WIDGET (calendar));
-	}
-  
-	return TRUE;
-}
-
-void
 planner_calendar_get_date (PlannerCalendar *calendar,
 		      guint	   *year,
 		      guint	   *month,
@@ -2754,10 +2689,10 @@
 
 /* ------------------------------- */
 
-void
+static void
 planner_calendar_mark_day (PlannerCalendar         *calendar,
 		      guint               day,
-		      PlannerCalendarMarkType  type)
+		      const GdkColor *color)
 {
 	gint index;
 	
@@ -2766,16 +2701,11 @@
 
 	index = day - 1;
 	
-	if (calendar->marked_date[index] == type) {
+	if (calendar->marked_date[index] == color) {
 		return;
 	}
 
-	calendar->marked_date[index] = type;
-	if (type != PLANNER_CALENDAR_MARK_NONE) {
-		calendar->num_marked_dates++;
-	} else {
-		calendar->num_marked_dates--;
-	}
+	calendar->marked_date[index] = color;
 
 	if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar))) {
 		planner_calendar_paint_main (GTK_WIDGET (calendar));
@@ -2790,9 +2720,19 @@
 	MrpTime      *t;
 	mrptime      time;
 	MrpDay       *day;
+	MrpProject   *project=NULL;
+	const GdkColor     *color;
+	GList        *daytypes;
+	gint         dayindex;
 
 	planner_calendar_get_date (calendar, &y, &m, &d);
 
+	g_object_get (mrp_calendar, "project", &project, NULL);
+
+	daytypes = mrp_day_get_all (project);
+	daytypes = g_list_prepend (daytypes, mrp_day_get_nonwork ());
+	daytypes = g_list_prepend (daytypes, mrp_day_get_work ());
+
 	t = mrp_time2_new ();
 	mrp_time2_set_date (t, y, m+1, 1);
 	mrp_time2_set_time (t, 0, 0, 0);
@@ -2801,19 +2741,26 @@
 		time = mrp_time2_get_epoch (t);
 
 		day = mrp_calendar_get_day (mrp_calendar, time, TRUE);
+		dayindex = g_list_index (daytypes, day);
 
-		if (day == mrp_day_get_nonwork ()) {
-			planner_calendar_mark_day (calendar,
-						   d,
-						   PLANNER_CALENDAR_MARK_SHADE);
-		}
-		else if (day == mrp_day_get_work ()) {
-			planner_calendar_mark_day (calendar,
-						   d,
-						   PLANNER_CALENDAR_MARK_NONE);
+		switch (dayindex)
+		{
+			case 0:
+				color = NULL;
+				break;
+			case 1:
+				color = SHADED_BG_COLOR (GTK_WIDGET (calendar));
+				break;
+			default:
+				color = &(calendar->mark_colors[(dayindex-2)%14]);
+				break;
 		}
 
+		planner_calendar_mark_day (calendar, d, color);
+
 		mrp_time2_add_days (t, 1);
 	}
 	mrp_time2_free (t);
+	g_list_free (daytypes);
+	g_object_unref (project);
 }
diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-calendar.h
--- planner-0.14.4.orig/src/planner-calendar.h	2009-12-14 08:55:30.000000000 +0000
+++ planner-0.14.4/src/planner-calendar.h	2009-12-13 15:44:31.000000000 +0000
@@ -52,15 +52,6 @@
 	PLANNER_CALENDAR_SHOW_WEEK_NUMBERS	= 1 << 3,
 	PLANNER_CALENDAR_WEEK_START_MONDAY	= 1 << 4} PlannerCalendarDisplayOptions;
 
-typedef enum
-{
-	PLANNER_CALENDAR_MARK_NONE,
-	PLANNER_CALENDAR_MARK_BOLD,
-	PLANNER_CALENDAR_MARK_UNDERLINE,
-	PLANNER_CALENDAR_MARK_SHADE,
-	PLANNER_CALENDAR_MARK_STRIPE
-} PlannerCalendarMarkType;
-
 struct _PlannerCalendar
 {
 	GtkWidget widget;
@@ -75,10 +66,9 @@
 	gint day_month[6][7];
 	gint day[6][7];
 	
-	gint num_marked_dates;
-	gint marked_date[31];
+	const GdkColor *marked_date[31];
 	PlannerCalendarDisplayOptions  display_flags;
-	GdkColor marked_date_color[31];
+	GdkColor mark_colors[14];
 	
 	GdkGC *gc;
 	GdkGC *xor_gc;
@@ -123,10 +113,6 @@
 					 guint	      year);
 void	   planner_calendar_select_day	(PlannerCalendar *calendar,
 					 guint	      day);
-gboolean   planner_calendar_unmark_day	(PlannerCalendar *calendar,
-					 guint	      day);
-void	   planner_calendar_clear_marks	(PlannerCalendar *calendar);
-
 
 void	   planner_calendar_display_options (PlannerCalendar		  *calendar,
 					 PlannerCalendarDisplayOptions flags);
@@ -138,14 +124,8 @@
 void	   planner_calendar_freeze		(PlannerCalendar *calendar);
 void	   planner_calendar_thaw		(PlannerCalendar *calendar);
 
-
-
-void       planner_calendar_mark_day (PlannerCalendar         *calendar,
-				 guint               day,
-				 PlannerCalendarMarkType  type);
-
 void       planner_calendar_mark_days (PlannerCalendar         *calendar,
-				 MrpCalendar *mrp_calendar);
+				       MrpCalendar *mrp_calendar);
 
 
 #endif /* __PLANNER_CALENDAR_H__ */


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- planner.spec	11 Dec 2009 10:34:31 -0000	1.73
+++ planner.spec	14 Dec 2009 09:08:02 -0000	1.74
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   8%{?dist}
+Release:   9%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -26,6 +26,7 @@ Patch4: planner-buildfix.patch
 Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
 Patch6: planner-gnome604169-comboboxentry.patch
 Patch7: planner-gnome604355-scrolling.patch
+Patch8: planner-gnome604510.calcolors.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -63,6 +64,7 @@ This package provides a plugin to integr
 %patch5 -p1 -b .edittask
 %patch6 -p1 -b .combobox
 %patch7 -p1 -b .scrolling
+%patch8 -p1 -b .calcolors
 
 %build
 rm -rf libegg
@@ -161,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-9
+- Resolves: rhbz#546850 use different colors for different day types
+
 * Fri Dec 11 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-8
 - Resolves: rhbz#546515 allow scrolling
 



From stevetraylen at fedoraproject.org  Mon Dec 14 09:08:34 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 14 Dec 2009 09:08:34 +0000 (UTC)
Subject: File torque-2.3.8.tar.gz uploaded to lookaside cache by stevetraylen
Message-ID: <20091214090834.3F76D28EC63@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for torque:

3497ff80e900c1249279d96341cb9d00  torque-2.3.8.tar.gz



From sandeeps at fedoraproject.org  Mon Dec 14 09:22:44 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 09:22:44 +0000 (UTC)
Subject: rpms/pothana2000-fonts/F-11 pothana2000-fonts.spec,1.2,1.3
Message-ID: <20091214092244.BE15711C00E9@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/pothana2000-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27407

Modified Files:
	pothana2000-fonts.spec 
Log Message:
Preparing for 1.3.2-2 release



Index: pothana2000-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pothana2000-fonts/F-11/pothana2000-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pothana2000-fonts.spec	14 Dec 2009 09:00:47 -0000	1.2
+++ pothana2000-fonts.spec	14 Dec 2009 09:22:44 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: %{fontname}-fonts
 Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Unicode compliant OpenType font for Telugu
 
 Group: User Interface/X
@@ -47,6 +47,9 @@ rm -fr %{buildroot}
 %doc gpl.txt
 
 %changelog
+* Mon Dec 14 2009 <sshedmak at redhat.com> - 1.3.2-2
+- Release bump
+
 * Mon Dec 14 2009 <sshedmak at redhat.com> - 1.3.2-1
 - Fixed FSType, Preferred Style, UinqueID and Fullname
 - Fixed Invalid Glyph Names reported by fontlint



From sandeeps at fedoraproject.org  Mon Dec 14 09:25:49 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 09:25:49 +0000 (UTC)
Subject: rpms/pothana2000-fonts/F-12 pothana2000-fonts.spec,1.3,1.4
Message-ID: <20091214092549.09D8211C00E9@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/pothana2000-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28586

Modified Files:
	pothana2000-fonts.spec 
Log Message:
Preparing for 1.3.2-2 release



Index: pothana2000-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pothana2000-fonts/F-12/pothana2000-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pothana2000-fonts.spec	14 Dec 2009 09:01:24 -0000	1.3
+++ pothana2000-fonts.spec	14 Dec 2009 09:25:48 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: %{fontname}-fonts
 Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Unicode compliant OpenType font for Telugu
 
 Group: User Interface/X
@@ -47,6 +47,9 @@ rm -fr %{buildroot}
 %doc gpl.txt
 
 %changelog
+* Mon Dec 14 2009 <sshedmak at redhat.com> - 1.3.2-2
+- Release bump
+
 * Mon Dec 14 2009 <sshedmak at redhat.com> - 1.3.2-1
 - Fixed FSType, Preferred Style, UinqueID and Fullname
 - Fixed Invalid Glyph Names reported by fontlint



From sailer at fedoraproject.org  Mon Dec 14 09:33:26 2009
From: sailer at fedoraproject.org (sailer)
Date: Mon, 14 Dec 2009 09:33:26 +0000 (UTC)
Subject: rpms/ghdl/devel grt-dispmemleak.patch, NONE,
	1.1 grt-processtimeoutchain.patch, NONE, 1.1 ghdl.spec, 1.58, 1.59
Message-ID: <20091214093327.0304111C00E9@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31727

Modified Files:
	ghdl.spec 
Added Files:
	grt-dispmemleak.patch grt-processtimeoutchain.patch 
Log Message:
Process Timeout Chain bugfix, --trace-signals memory leak fix


grt-dispmemleak.patch:
 grt-rtis_utils.adb |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE grt-dispmemleak.patch ---
--- gcc/vhdl/grt/grt-rtis_utils.adb.orig	2009-12-13 02:53:11.000000000 +0100
+++ gcc/vhdl/grt/grt-rtis_utils.adb	2009-12-13 02:53:05.000000000 +0100
@@ -502,6 +502,7 @@
    begin
       Rtis_Utils.Get_Value (Name, Value, Type_Rti);
       Put (Stream, Name);
+      Free (Name);
    end Disp_Value;
 
    procedure Get_Enum_Value

grt-processtimeoutchain.patch:
 grt-processes.adb |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE grt-processtimeoutchain.patch ---
--- gcc/vhdl/grt/grt-processes.adb.orig	2009-12-13 00:36:47.000000000 +0100
+++ gcc/vhdl/grt/grt-processes.adb	2009-12-13 00:37:24.000000000 +0100
@@ -312,6 +312,8 @@
          Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
            Proc.Timeout_Chain_Prev;
       end if;
+      Proc.Timeout_Chain_Next := null;
+      Proc.Timeout_Chain_Prev := null;
    end Remove_Process_From_Timeout_Chain;
 
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ghdl.spec	2 Dec 2009 14:24:32 -0000	1.58
+++ ghdl.spec	14 Dec 2009 09:33:26 -0000	1.59
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.1%{?dist}
+Release: 0.%{ghdlsvnver}svn.2%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,6 +27,10 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
+# https://gna.org/bugs/index.php?14930
+Patch108: grt-processtimeoutchain.patch
+# https://gna.org/bugs/index.php?14931
+Patch109: grt-dispmemleak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -94,6 +98,9 @@ Requires: ghdl-grt = %{version}-%{releas
 %global gcc_target_platform %{_target_platform}
 %endif
 
+# do not strip libgrt.a -- makes debugging tedious otherwise
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's#/usr/lib/rpm/redhat/brp-strip-static-archive .*##g')
+
 %description
 GHDL is a VHDL simulator, using the GCC technology. VHDL is a language
 standardized by the IEEE, intended for developing electronic systems. GHDL
@@ -129,6 +136,8 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
+%patch108 -p0 -b .processtimeoutchain
+%patch109 -p0 -b .dispmemleak
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -326,6 +335,10 @@ P64=%{buildroot}/%{_libdir}/gcc/%{gcc_ta
 
 
 %changelog
+* Mon Dec 14 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.2
+- Process Timeout Chain bugfix
+- --trace-signals memory leak fix
+
 * Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.1
 - copy v08 libraries instead of symlink
 



From sandeeps at fedoraproject.org  Mon Dec 14 09:33:31 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 09:33:31 +0000 (UTC)
Subject: File Vemana2k-Li.zip uploaded to lookaside cache by sandeeps
Message-ID: <20091214093331.99B4F28ED6A@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for vemana2000-fonts:

a044265b4fbdede4d58f51eb1c9a9c7f  Vemana2k-Li.zip



From sailer at fedoraproject.org  Mon Dec 14 09:35:53 2009
From: sailer at fedoraproject.org (sailer)
Date: Mon, 14 Dec 2009 09:35:53 +0000 (UTC)
Subject: rpms/ghdl/F-12 grt-dispmemleak.patch, NONE,
	1.1 grt-processtimeoutchain.patch, NONE, 1.1 ghdl.spec, 1.56, 1.57
Message-ID: <20091214093553.0CDEA11C00E9@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32749

Modified Files:
	ghdl.spec 
Added Files:
	grt-dispmemleak.patch grt-processtimeoutchain.patch 
Log Message:
Process Timeout Chain bugfix, --trace-signals memory leak fix


grt-dispmemleak.patch:
 grt-rtis_utils.adb |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE grt-dispmemleak.patch ---
--- gcc/vhdl/grt/grt-rtis_utils.adb.orig	2009-12-13 02:53:11.000000000 +0100
+++ gcc/vhdl/grt/grt-rtis_utils.adb	2009-12-13 02:53:05.000000000 +0100
@@ -502,6 +502,7 @@
    begin
       Rtis_Utils.Get_Value (Name, Value, Type_Rti);
       Put (Stream, Name);
+      Free (Name);
    end Disp_Value;
 
    procedure Get_Enum_Value

grt-processtimeoutchain.patch:
 grt-processes.adb |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE grt-processtimeoutchain.patch ---
--- gcc/vhdl/grt/grt-processes.adb.orig	2009-12-13 00:36:47.000000000 +0100
+++ gcc/vhdl/grt/grt-processes.adb	2009-12-13 00:37:24.000000000 +0100
@@ -312,6 +312,8 @@
          Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
            Proc.Timeout_Chain_Prev;
       end if;
+      Proc.Timeout_Chain_Next := null;
+      Proc.Timeout_Chain_Prev := null;
    end Remove_Process_From_Timeout_Chain;
 
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-12/ghdl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- ghdl.spec	5 Dec 2009 13:07:16 -0000	1.56
+++ ghdl.spec	14 Dec 2009 09:35:52 -0000	1.57
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.0%{?dist}
+Release: 0.%{ghdlsvnver}svn.1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,6 +27,10 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
+# https://gna.org/bugs/index.php?14930
+Patch108: grt-processtimeoutchain.patch
+# https://gna.org/bugs/index.php?14931
+Patch109: grt-dispmemleak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -94,6 +98,9 @@ Requires: ghdl-grt = %{version}-%{releas
 %global gcc_target_platform %{_target_platform}
 %endif
 
+# do not strip libgrt.a -- makes debugging tedious otherwise
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's#/usr/lib/rpm/redhat/brp-strip-static-archive .*##g')
+
 %description
 GHDL is a VHDL simulator, using the GCC technology. VHDL is a language
 standardized by the IEEE, intended for developing electronic systems. GHDL
@@ -129,6 +136,8 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
+%patch108 -p0 -b .processtimeoutchain
+%patch109 -p0 -b .dispmemleak
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -309,8 +318,10 @@ popd
 # %{gcc_target_platform}/%{gccver} subdirectory
 %{_libdir}/gcc/
 
-
 %changelog
+* Sun Dec 13 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.1
+- Process Timeout Chain bugfix
+
 * Sat Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
 - update to svn131
 



From dwmw2 at fedoraproject.org  Mon Dec 14 09:40:14 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon, 14 Dec 2009 09:40:14 +0000 (UTC)
Subject: rpms/openconnect/F-12 .cvsignore, 1.10, 1.11 openconnect.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20091214094014.33F8311C03C6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/openconnect/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2491

Modified Files:
	.cvsignore openconnect.spec sources 
Log Message:
update to 2.12; fix bug 545223


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Nov 2009 16:47:37 -0000	1.10
+++ .cvsignore	14 Dec 2009 09:40:13 -0000	1.11
@@ -1 +1 @@
-openconnect-2.11.tar.gz
+openconnect-2.12.tar.gz


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-12/openconnect.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- openconnect.spec	17 Nov 2009 16:47:37 -0000	1.17
+++ openconnect.spec	14 Dec 2009 09:40:14 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		openconnect
-Version:	2.11
+Version:	2.12
 Release:	1%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec  7 2009 David Woodhouse <David.Woodhouse at intel.com> - 2.12-1
+- Update to 2.12.
+
 * Tue Nov 17 2009 David Woodhouse <David.Woodhouse at intel.com> - 2.11-1
 - Update to 2.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Nov 2009 16:47:37 -0000	1.10
+++ sources	14 Dec 2009 09:40:14 -0000	1.11
@@ -1 +1 @@
-509ebd34647dc44115289b2ede5319cd  openconnect-2.11.tar.gz
+2a9f97a6dd2627553dbf0c3ffbd5c05f  openconnect-2.12.tar.gz



From sailer at fedoraproject.org  Mon Dec 14 09:40:35 2009
From: sailer at fedoraproject.org (sailer)
Date: Mon, 14 Dec 2009 09:40:35 +0000 (UTC)
Subject: rpms/ghdl/F-11 grt-dispmemleak.patch, NONE,
	1.1 grt-processtimeoutchain.patch, NONE, 1.1 ghdl.spec, 1.51, 1.52
Message-ID: <20091214094035.53F2711C03C6@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2527

Modified Files:
	ghdl.spec 
Added Files:
	grt-dispmemleak.patch grt-processtimeoutchain.patch 
Log Message:
Process Timeout Chain bugfix and --trace-signals memory leak fix


grt-dispmemleak.patch:
 grt-rtis_utils.adb |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE grt-dispmemleak.patch ---
--- gcc/vhdl/grt/grt-rtis_utils.adb.orig	2009-12-13 02:53:11.000000000 +0100
+++ gcc/vhdl/grt/grt-rtis_utils.adb	2009-12-13 02:53:05.000000000 +0100
@@ -502,6 +502,7 @@
    begin
       Rtis_Utils.Get_Value (Name, Value, Type_Rti);
       Put (Stream, Name);
+      Free (Name);
    end Disp_Value;
 
    procedure Get_Enum_Value

grt-processtimeoutchain.patch:
 grt-processes.adb |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE grt-processtimeoutchain.patch ---
--- gcc/vhdl/grt/grt-processes.adb.orig	2009-12-13 00:36:47.000000000 +0100
+++ gcc/vhdl/grt/grt-processes.adb	2009-12-13 00:37:24.000000000 +0100
@@ -312,6 +312,8 @@
          Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
            Proc.Timeout_Chain_Prev;
       end if;
+      Proc.Timeout_Chain_Next := null;
+      Proc.Timeout_Chain_Prev := null;
    end Remove_Process_From_Timeout_Chain;
 
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/ghdl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ghdl.spec	5 Dec 2009 11:41:50 -0000	1.51
+++ ghdl.spec	14 Dec 2009 09:40:35 -0000	1.52
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.0%{?dist}
+Release: 0.%{ghdlsvnver}svn.1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,6 +27,10 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
+# https://gna.org/bugs/index.php?14930
+Patch108: grt-processtimeoutchain.patch
+# https://gna.org/bugs/index.php?14931
+Patch109: grt-dispmemleak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -94,6 +98,9 @@ Requires: ghdl-grt = %{version}-%{releas
 %global gcc_target_platform %{_target_platform}
 %endif
 
+# do not strip libgrt.a -- makes debugging tedious otherwise
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's#/usr/lib/rpm/redhat/brp-strip-static-archive .*##g')
+
 %description
 GHDL is a VHDL simulator, using the GCC technology. VHDL is a language
 standardized by the IEEE, intended for developing electronic systems. GHDL
@@ -129,6 +136,8 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
+%patch108 -p0 -b .processtimeoutchain
+%patch109 -p0 -b .dispmemleak
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -311,6 +320,9 @@ popd
 
 
 %changelog
+* Mon Dec 14 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.1
+- Process Timeout Chain bugfix
+
 * Sat Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
 - update to 0.28/svn131
 



From stevetraylen at fedoraproject.org  Mon Dec 14 09:43:06 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 14 Dec 2009 09:43:06 +0000 (UTC)
Subject: rpms/torque/EL-5 .cvsignore, 1.13, 1.14 pbs-config-multilib, 1.2,
	1.3 sources, 1.13, 1.14 torque.spec, 1.21, 1.22
Message-ID: <20091214094306.9854011C00E9@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/torque/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3660

Modified Files:
	.cvsignore pbs-config-multilib sources torque.spec 
Log Message:
2.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Dec 2009 15:09:13 -0000	1.13
+++ .cvsignore	14 Dec 2009 09:43:06 -0000	1.14
@@ -1 +1 @@
-torque-2.4.2.tar.gz
+torque-2.3.8.tar.gz


Index: pbs-config-multilib
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/pbs-config-multilib,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pbs-config-multilib	3 Dec 2009 15:33:47 -0000	1.2
+++ pbs-config-multilib	14 Dec 2009 09:43:06 -0000	1.3
@@ -1,7 +1,7 @@
 #! /bin/sh
  
 package="pbs"
-version="2.4.2"
+version="2.3.8"
  
 prefix="/usr"
 exec_prefix="/usr"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Dec 2009 15:09:13 -0000	1.13
+++ sources	14 Dec 2009 09:43:06 -0000	1.14
@@ -1 +1 @@
-cd1b0e63d9c54d49232f89c3dbd29272  torque-2.4.2.tar.gz
+3497ff80e900c1249279d96341cb9d00  torque-2.3.8.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-5/torque.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- torque.spec	3 Dec 2009 15:52:13 -0000	1.21
+++ torque.spec	14 Dec 2009 09:43:06 -0000	1.22
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.4.2
+%define version 2.3.8
 #%%define snap 200604251602
 %define release 1
 
@@ -465,8 +465,8 @@ A simple PAM module to authorize users o
 
 
 %changelog
-* Thu Dec 3 2009 Steve Traylen <steve.traylen at cern.ch> - 2.4.2-1
-- Updated to upstream 2.4.2
+* Thu Dec 3 2009 Steve Traylen <steve.traylen at cern.ch> - 2.3.8-1
+- Updated to upstream 2.3.8
 - First EPEL build.
 - Add new commands to package.
    /usr/bin/pbs_track



From tomspur at fedoraproject.org  Mon Dec 14 09:44:30 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 14 Dec 2009 09:44:30 +0000 (UTC)
Subject: File gbirthday-0.5.5.tar.xz uploaded to lookaside cache by tomspur
Message-ID: <20091214094430.73BD328ED27@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gbirthday:

716c10163d0a8c31d55dc622a3412104  gbirthday-0.5.5.tar.xz



From sandeeps at fedoraproject.org  Mon Dec 14 09:44:36 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 09:44:36 +0000 (UTC)
Subject: rpms/vemana2000-fonts/devel sources, 1.2, 1.3 vemana2000-fonts.spec,
	1.1, 1.2
Message-ID: <20091214094436.6BD2811C00E9@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/vemana2000-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4235

Modified Files:
	sources vemana2000-fonts.spec 
Log Message:
Preparing for 1.1.2-1 release



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2009 07:11:47 -0000	1.2
+++ sources	14 Dec 2009 09:44:36 -0000	1.3
@@ -1 +1 @@
-b1a631b2725e59bda082af9cfafb51a6  Vemana2k-Li.zip
+a044265b4fbdede4d58f51eb1c9a9c7f  Vemana2k-Li.zip


Index: vemana2000-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/devel/vemana2000-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vemana2000-fonts.spec	31 Aug 2009 07:11:48 -0000	1.1
+++ vemana2000-fonts.spec	14 Dec 2009 09:44:36 -0000	1.2
@@ -2,12 +2,12 @@
 %global fontconf 69-%{fontname}.conf
 
 Name: %{fontname}-fonts
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Unicode compliant OpenType font for Telugu
 
 Group: User Interface/X
-License: GPLv2+
+License: GPLv2+ with exceptions
 URL: http://www.kavya-nandanam.com/dload.htm
 
 Source0: Vemana2k-Li.zip
@@ -47,6 +47,11 @@ rm -fr %{buildroot}
 %doc gpl.txt
 
 %changelog
+* Mon Dec 14 2009 <sshedmak at redhat.com> - 1.1.2-1
+- Fixed FSType, Preferred Styles, UniqueID and Fullname
+- Fixed Invalid Glyph Names reported by fontlint
+- with exceptions string added in License
+
 * Tue Aug 31 2009 <sshedmak at redhat.com> - 1.1.1-2
 - Changed the Pothana2000 strings to Vemana2000
 



From sandeeps at fedoraproject.org  Mon Dec 14 09:44:59 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 09:44:59 +0000 (UTC)
Subject: rpms/vemana2000-fonts/F-11 .cvsignore, 1.1, 1.2 sources, 1.2,
	1.3 vemana2000-fonts.spec, 1.1, 1.2
Message-ID: <20091214094459.C9A5811C00E9@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/vemana2000-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4459

Modified Files:
	.cvsignore sources vemana2000-fonts.spec 
Log Message:
Preparing for 1.1.2-1 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:40:36 -0000	1.1
+++ .cvsignore	14 Dec 2009 09:44:59 -0000	1.2
@@ -0,0 +1 @@
+Vemana2k-Li.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2009 07:37:25 -0000	1.2
+++ sources	14 Dec 2009 09:44:59 -0000	1.3
@@ -1 +1 @@
-b1a631b2725e59bda082af9cfafb51a6  Vemana2k-Li.zip
+a044265b4fbdede4d58f51eb1c9a9c7f  Vemana2k-Li.zip


Index: vemana2000-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/F-11/vemana2000-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vemana2000-fonts.spec	31 Aug 2009 07:37:25 -0000	1.1
+++ vemana2000-fonts.spec	14 Dec 2009 09:44:59 -0000	1.2
@@ -2,12 +2,12 @@
 %global fontconf 69-%{fontname}.conf
 
 Name: %{fontname}-fonts
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Unicode compliant OpenType font for Telugu
 
 Group: User Interface/X
-License: GPLv2+
+License: GPLv2+ with exceptions
 URL: http://www.kavya-nandanam.com/dload.htm
 
 Source0: Vemana2k-Li.zip
@@ -47,6 +47,11 @@ rm -fr %{buildroot}
 %doc gpl.txt
 
 %changelog
+* Mon Dec 14 2009 <sshedmak at redhat.com> - 1.1.2-1
+- Fixed FSType, Preferred Styles, UniqueID and Fullname
+- Fixed Invalid Glyph Names reported by fontlint
+- with exceptions string added in License
+
 * Tue Aug 31 2009 <sshedmak at redhat.com> - 1.1.1-2
 - Changed the Pothana2000 strings to Vemana2000
 



From tomspur at fedoraproject.org  Mon Dec 14 09:45:26 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 14 Dec 2009 09:45:26 +0000 (UTC)
Subject: rpms/gbirthday/devel .cvsignore, 1.6, 1.7 gbirthday.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20091214094526.3861B11C00E9@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4681

Modified Files:
	.cvsignore gbirthday.spec sources 
Log Message:
new version 0.5.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Nov 2009 18:57:29 -0000	1.6
+++ .cvsignore	14 Dec 2009 09:45:26 -0000	1.7
@@ -1 +1 @@
-gbirthday-0.5.4.tar.xz
+gbirthday-0.5.5.tar.xz


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gbirthday.spec	24 Nov 2009 18:57:29 -0000	1.7
+++ gbirthday.spec	14 Dec 2009 09:45:26 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gbirthday
-Version:        0.5.4
+Version:        0.5.5
 Release:        1%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
@@ -16,6 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 Requires:       notify-python
 Requires:       evolution
+Requires:       gnome-python2-evolution
 Requires:       python
 Requires:       MySQL-python
 Requires:       pygtk2
@@ -59,6 +60,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Mon Dec 14 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-1
+- new version
+
 * Sat Nov 21 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.4-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Nov 2009 18:57:29 -0000	1.6
+++ sources	14 Dec 2009 09:45:26 -0000	1.7
@@ -1 +1 @@
-65c363caf4b3c671f3da074702ee3424  gbirthday-0.5.4.tar.xz
+716c10163d0a8c31d55dc622a3412104  gbirthday-0.5.5.tar.xz



From sandeeps at fedoraproject.org  Mon Dec 14 09:45:32 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 14 Dec 2009 09:45:32 +0000 (UTC)
Subject: rpms/vemana2000-fonts/F-12 sources, 1.2, 1.3 vemana2000-fonts.spec, 
	1.1, 1.2
Message-ID: <20091214094532.309A011C00E9@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/vemana2000-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4572

Modified Files:
	sources vemana2000-fonts.spec 
Log Message:
Preparing for 1.1.2-1 release



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2009 07:11:47 -0000	1.2
+++ sources	14 Dec 2009 09:45:32 -0000	1.3
@@ -1 +1 @@
-b1a631b2725e59bda082af9cfafb51a6  Vemana2k-Li.zip
+a044265b4fbdede4d58f51eb1c9a9c7f  Vemana2k-Li.zip


Index: vemana2000-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/F-12/vemana2000-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vemana2000-fonts.spec	31 Aug 2009 07:11:48 -0000	1.1
+++ vemana2000-fonts.spec	14 Dec 2009 09:45:32 -0000	1.2
@@ -2,12 +2,12 @@
 %global fontconf 69-%{fontname}.conf
 
 Name: %{fontname}-fonts
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Unicode compliant OpenType font for Telugu
 
 Group: User Interface/X
-License: GPLv2+
+License: GPLv2+ with exceptions
 URL: http://www.kavya-nandanam.com/dload.htm
 
 Source0: Vemana2k-Li.zip
@@ -47,6 +47,11 @@ rm -fr %{buildroot}
 %doc gpl.txt
 
 %changelog
+* Mon Dec 14 2009 <sshedmak at redhat.com> - 1.1.2-1
+- Fixed FSType, Preferred Styles, UniqueID and Fullname
+- Fixed Invalid Glyph Names reported by fontlint
+- with exceptions string added in License
+
 * Tue Aug 31 2009 <sshedmak at redhat.com> - 1.1.1-2
 - Changed the Pothana2000 strings to Vemana2000
 



From leigh123linux at fedoraproject.org  Mon Dec 14 10:02:29 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 14 Dec 2009 10:02:29 +0000 (UTC)
Subject: File qbittorrent-2.0.1.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091214100229.A9A0828ED98@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for qbittorrent:

2072e200ba861035c874ff1c8392809b  qbittorrent-2.0.1.tar.gz



From leigh123linux at fedoraproject.org  Mon Dec 14 10:06:00 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 14 Dec 2009 10:06:00 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 .cvsignore, 1.19, 1.20 qbittorrent.spec, 1.42,
	1.43 sources, 1.20, 1.21
Message-ID: <20091214100600.CB36B11C00E9@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13870

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Mon Dec 14 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.1-1
- update to 2.0.1
- clean up spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	10 Dec 2009 19:55:43 -0000	1.19
+++ .cvsignore	14 Dec 2009 10:06:00 -0000	1.20
@@ -1 +1 @@
-qbittorrent-2.0.0.tar.gz
+qbittorrent-2.0.1.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- qbittorrent.spec	10 Dec 2009 19:55:43 -0000	1.42
+++ qbittorrent.spec	14 Dec 2009 10:06:00 -0000	1.43
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -14,7 +14,7 @@ Source0: http://downloads.sf.net/qbittor
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License: GPLv2+
 BuildRequires: qt-devel >= 4.4.1   
 BuildRequires: desktop-file-utils
@@ -33,7 +33,6 @@ It aims to be as fast as possible and to
 
 %build
 # use ./configure instead of %%configure as it doesn't work
-CFLAGS="%optflags" CXXFLAGS="%optflags" \
 ./configure --prefix=%{_prefix}
 make %{?_smp_mflags}
 
@@ -72,6 +71,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Mon Dec 14 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.1-1
+- update to 2.0.1
+- clean up spec file
+
 * Thu Dec 10 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-1
 - update to 2.0.0
 - add Br: libnotify-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	10 Dec 2009 19:55:43 -0000	1.20
+++ sources	14 Dec 2009 10:06:00 -0000	1.21
@@ -1 +1 @@
-5730bc420d830b16dbb5552d44fc60a9  qbittorrent-2.0.0.tar.gz
+2072e200ba861035c874ff1c8392809b  qbittorrent-2.0.1.tar.gz



From diegobz at fedoraproject.org  Mon Dec 14 10:15:07 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 14 Dec 2009 10:15:07 +0000 (UTC)
Subject: File polib-0.5.0.tar.gz uploaded to lookaside cache by diegobz
Message-ID: <20091214101507.C945F28ED98@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-polib:

104b60fdc2ac3b6810fecf6f32e3d247  polib-0.5.0.tar.gz



From caolanm at fedoraproject.org  Mon Dec 14 10:15:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Dec 2009 10:15:31 +0000 (UTC)
Subject: rpms/planner/F-12 planner-gnome604515-usagestatus.patch, NONE,
	1.1 planner.spec, 1.74, 1.75
Message-ID: <20091214101531.0817111C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17264/F-12

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604515-usagestatus.patch 
Log Message:
Resolves: rhbz#546846 show date in resource usage statusbar

planner-gnome604515-usagestatus.patch:
 planner-gantt-header.c |    2 +-
 planner-usage-chart.c  |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE planner-gnome604515-usagestatus.patch ---
diff -ru planner-0.14.4.orig/src/planner-usage-chart.c planner-0.14.4/src/planner-usage-chart.c
--- planner-0.14.4.orig/src/planner-usage-chart.c	2009-12-14 09:24:16.000000000 +0000
+++ planner-0.14.4/src/planner-usage-chart.c	2009-12-14 09:59:53.000000000 +0000
@@ -300,6 +300,14 @@
 }
 
 static void
+usage_chart_header_date_hint_changed_cb (GtkWidget         *header,
+					 const gchar       *hint,
+					 PlannerUsageChart *chart)
+{
+        planner_usage_chart_status_updated (chart, hint);
+}
+
+static void
 usage_chart_init (PlannerUsageChart * chart)
 {
         PlannerUsageChartPriv *priv;
@@ -323,6 +331,11 @@
                                      "scale", SCALE (priv->zoom),
                                      "zoom", priv->zoom, NULL);
 
+	g_signal_connect (priv->header,
+			  "date_hint_changed",
+			  G_CALLBACK (usage_chart_header_date_hint_changed_cb),
+			  chart);
+
         gtk_box_pack_start (GTK_BOX (chart), GTK_WIDGET (priv->header), FALSE, 
                             TRUE,
                             0);
diff -ru planner-0.14.4.orig/src/planner-gantt-header.c planner-0.14.4/src/planner-gantt-header.c
--- planner-0.14.4.orig/src/planner-gantt-header.c	2009-12-14 09:24:16.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-header.c	2009-12-14 09:36:18.000000000 +0000
@@ -668,7 +668,7 @@
 	priv = header->priv;
 
 	t = floor ((priv->x1 + event->x) / priv->hscale + 0.5);
-	str = mrp_time_format (_("%e %b %Y"), t);
+	str = mrp_time_format (_("%a, %e %b %Y"), t);
 
 	if (!priv->date_hint || strcmp (str, priv->date_hint) != 0) {
 		g_signal_emit (widget, signals[DATE_HINT_CHANGED], 0, str);


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- planner.spec	14 Dec 2009 09:08:02 -0000	1.74
+++ planner.spec	14 Dec 2009 10:15:30 -0000	1.75
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   9%{?dist}
+Release:   10%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -27,6 +27,7 @@ Patch5: planner-gnome603693-planner-cale
 Patch6: planner-gnome604169-comboboxentry.patch
 Patch7: planner-gnome604355-scrolling.patch
 Patch8: planner-gnome604510.calcolors.patch
+Patch9: planner-gnome604515-usagestatus.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -65,6 +66,7 @@ This package provides a plugin to integr
 %patch6 -p1 -b .combobox
 %patch7 -p1 -b .scrolling
 %patch8 -p1 -b .calcolors
+%patch9 -p1 -b .resourcestatus
 
 %build
 rm -rf libegg
@@ -165,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-10
+- Resolves: rhbz#546846 show date in resource usage statusbar
+
 * Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-9
 - Resolves: rhbz#546850 use different colors for different day types
 



From caolanm at fedoraproject.org  Mon Dec 14 10:15:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Dec 2009 10:15:31 +0000 (UTC)
Subject: rpms/planner/devel planner-gnome604515-usagestatus.patch, NONE,
	1.1 planner.spec, 1.74, 1.75
Message-ID: <20091214101531.2D4CA11C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17264/devel

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604515-usagestatus.patch 
Log Message:
Resolves: rhbz#546846 show date in resource usage statusbar

planner-gnome604515-usagestatus.patch:
 planner-gantt-header.c |    2 +-
 planner-usage-chart.c  |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE planner-gnome604515-usagestatus.patch ---
diff -ru planner-0.14.4.orig/src/planner-usage-chart.c planner-0.14.4/src/planner-usage-chart.c
--- planner-0.14.4.orig/src/planner-usage-chart.c	2009-12-14 09:24:16.000000000 +0000
+++ planner-0.14.4/src/planner-usage-chart.c	2009-12-14 09:59:53.000000000 +0000
@@ -300,6 +300,14 @@
 }
 
 static void
+usage_chart_header_date_hint_changed_cb (GtkWidget         *header,
+					 const gchar       *hint,
+					 PlannerUsageChart *chart)
+{
+        planner_usage_chart_status_updated (chart, hint);
+}
+
+static void
 usage_chart_init (PlannerUsageChart * chart)
 {
         PlannerUsageChartPriv *priv;
@@ -323,6 +331,11 @@
                                      "scale", SCALE (priv->zoom),
                                      "zoom", priv->zoom, NULL);
 
+	g_signal_connect (priv->header,
+			  "date_hint_changed",
+			  G_CALLBACK (usage_chart_header_date_hint_changed_cb),
+			  chart);
+
         gtk_box_pack_start (GTK_BOX (chart), GTK_WIDGET (priv->header), FALSE, 
                             TRUE,
                             0);
diff -ru planner-0.14.4.orig/src/planner-gantt-header.c planner-0.14.4/src/planner-gantt-header.c
--- planner-0.14.4.orig/src/planner-gantt-header.c	2009-12-14 09:24:16.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-header.c	2009-12-14 09:36:18.000000000 +0000
@@ -668,7 +668,7 @@
 	priv = header->priv;
 
 	t = floor ((priv->x1 + event->x) / priv->hscale + 0.5);
-	str = mrp_time_format (_("%e %b %Y"), t);
+	str = mrp_time_format (_("%a, %e %b %Y"), t);
 
 	if (!priv->date_hint || strcmp (str, priv->date_hint) != 0) {
 		g_signal_emit (widget, signals[DATE_HINT_CHANGED], 0, str);


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- planner.spec	14 Dec 2009 09:08:02 -0000	1.74
+++ planner.spec	14 Dec 2009 10:15:31 -0000	1.75
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   9%{?dist}
+Release:   10%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -27,6 +27,7 @@ Patch5: planner-gnome603693-planner-cale
 Patch6: planner-gnome604169-comboboxentry.patch
 Patch7: planner-gnome604355-scrolling.patch
 Patch8: planner-gnome604510.calcolors.patch
+Patch9: planner-gnome604515-usagestatus.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -65,6 +66,7 @@ This package provides a plugin to integr
 %patch6 -p1 -b .combobox
 %patch7 -p1 -b .scrolling
 %patch8 -p1 -b .calcolors
+%patch9 -p1 -b .resourcestatus
 
 %build
 rm -rf libegg
@@ -163,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-10
+- Resolves: rhbz#546846 show date in resource usage statusbar
+
 * Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-9
 - Resolves: rhbz#546850 use different colors for different day types
 



From jpopelka at fedoraproject.org  Mon Dec 14 10:56:22 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon, 14 Dec 2009 10:56:22 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp-4.1.0p1-logpid.patch, NONE, 1.1 dhcp.spec,
	1.279, 1.280
Message-ID: <20091214105622.2925211C00E9@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25344

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.0p1-logpid.patch 
Log Message:
* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-15
- dhclient logs its pid to make troubleshooting NM managed systems
  with multiple dhclients running easier (#546792)


dhcp-4.1.0p1-logpid.patch:
 dhclient.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dhcp-4.1.0p1-logpid.patch ---
diff -up dhcp-4.1.0p1/client/dhclient.c.logpid dhcp-4.1.0p1/client/dhclient.c
--- dhcp-4.1.0p1/client/dhclient.c.logpid	2009-12-14 11:39:47.000000000 +0100
+++ dhcp-4.1.0p1/client/dhclient.c	2009-12-14 11:41:17.000000000 +0100
@@ -148,7 +148,7 @@ main(int argc, char **argv) {
 	else if (fd != -1)
 		close(fd);
 
-	openlog("dhclient", LOG_NDELAY, LOG_DAEMON);
+	openlog("dhclient", LOG_NDELAY | LOG_PID, LOG_DAEMON);
 
 #if !(defined(DEBUG) || defined(__CYGWIN32__))
 	setlogmask(LOG_UPTO(LOG_INFO));


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- dhcp.spec	23 Nov 2009 09:14:24 -0000	1.279
+++ dhcp.spec	14 Dec 2009 10:56:21 -0000	1.280
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  14%{?dist}
+Release:  15%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -55,6 +55,7 @@ Patch20:  %{name}-4.1.0-add_timeout_when
 Patch21:  %{name}-4.1.0-64_bit_lease_parse.patch
 Patch22:  %{name}-4.1.0-CVE-2009-1892.patch
 Patch23:  %{name}-4.1.0p1-capability.patch
+Patch24:  %{name}-4.1.0p1-logpid.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -218,6 +219,10 @@ libdhcpctl and libomapi static libraries
 # Drop unnecessary capabilities in dhclient (#517649)
 %patch23 -p1
 
+# dhclient logs its pid to make troubleshooting NM managed systems
+# with multiple dhclients running easier (#546792)
+%patch24 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -481,6 +486,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-15
+- dhclient logs its pid to make troubleshooting NM managed systems
+  with multiple dhclients running easier (#546792)
+
 * Mon Nov 23 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-14
 - Honor DEFROUTE=yes|no for all connection types (#530209)
 



From jpopelka at fedoraproject.org  Mon Dec 14 10:56:36 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon, 14 Dec 2009 10:56:36 +0000 (UTC)
Subject: rpms/dhcp/F-12 dhcp-4.1.0p1-logpid.patch, NONE, 1.1 dhcp.spec, 1.279,
	1.280
Message-ID: <20091214105636.C480511C00E9@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25414

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.0p1-logpid.patch 
Log Message:
* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-15
- dhclient logs its pid to make troubleshooting NM managed systems
  with multiple dhclients running easier (#546792)


dhcp-4.1.0p1-logpid.patch:
 dhclient.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dhcp-4.1.0p1-logpid.patch ---
diff -up dhcp-4.1.0p1/client/dhclient.c.logpid dhcp-4.1.0p1/client/dhclient.c
--- dhcp-4.1.0p1/client/dhclient.c.logpid	2009-12-14 11:39:47.000000000 +0100
+++ dhcp-4.1.0p1/client/dhclient.c	2009-12-14 11:41:17.000000000 +0100
@@ -148,7 +148,7 @@ main(int argc, char **argv) {
 	else if (fd != -1)
 		close(fd);
 
-	openlog("dhclient", LOG_NDELAY, LOG_DAEMON);
+	openlog("dhclient", LOG_NDELAY | LOG_PID, LOG_DAEMON);
 
 #if !(defined(DEBUG) || defined(__CYGWIN32__))
 	setlogmask(LOG_UPTO(LOG_INFO));


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhcp.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- dhcp.spec	23 Nov 2009 09:12:07 -0000	1.279
+++ dhcp.spec	14 Dec 2009 10:56:36 -0000	1.280
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  14%{?dist}
+Release:  15%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -55,6 +55,7 @@ Patch20:  %{name}-4.1.0-add_timeout_when
 Patch21:  %{name}-4.1.0-64_bit_lease_parse.patch
 Patch22:  %{name}-4.1.0-CVE-2009-1892.patch
 Patch23:  %{name}-4.1.0p1-capability.patch
+Patch24:  %{name}-4.1.0p1-logpid.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -218,6 +219,10 @@ libdhcpctl and libomapi static libraries
 # Drop unnecessary capabilities in dhclient (#517649)
 %patch23 -p1
 
+# dhclient logs its pid to make troubleshooting NM managed systems
+# with multiple dhclients running easier (#546792)
+%patch24 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -481,6 +486,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-15
+- dhclient logs its pid to make troubleshooting NM managed systems
+  with multiple dhclients running easier (#546792)
+
 * Mon Nov 23 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-14
 - Honor DEFROUTE=yes|no for all connection types (#530209)
 



From huzaifas at fedoraproject.org  Mon Dec 14 10:58:01 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 14 Dec 2009 10:58:01 +0000 (UTC)
Subject: rpms/gnumeric/F-12 gnumeric-1.8.4-local.patch, NONE,
	1.1 gnumeric.spec, 1.50, 1.51
Message-ID: <20091214105801.D6FE111C00E9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25718

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.8.4-local.patch 
Log Message:
Fix rhbz #508679

gnumeric-1.8.4-local.patch:
 Makefile.in                               |   20 
 aclocal.m4                                | 3125 +--
 autom4te.cache/output.0                   |30904 ++++++++++++++++++++++++++++++
 autom4te.cache/output.1                   |30892 +++++++++++++++++++++++++++++
 autom4te.cache/requests                   |  239 
 autom4te.cache/traces.0                   |10327 ++++++++++
 autom4te.cache/traces.1                   | 1684 +
 configure                                 | 8159 ++++---
 doc/C/Makefile.in                         |   20 
 doc/C/figures/Makefile.in                 |   20 
 doc/C/figures/icons/Makefile.in           |   20 
 doc/Makefile.in                           |   20 
 doc/developer/Makefile.in                 |   20 
 icons/Makefile.in                         |   20 
 plugins/Makefile.in                       |   20 
 plugins/applix/Makefile.in                |   20 
 plugins/corba/Makefile.in                 |   20 
 plugins/derivatives/Makefile.in           |   20 
 plugins/dif/Makefile.in                   |   20 
 plugins/excel/Makefile.in                 |   20 
 plugins/fn-complex/Makefile.in            |   20 
 plugins/fn-database/Makefile.in           |   20 
 plugins/fn-date/Makefile.in               |   20 
 plugins/fn-eng/Makefile.in                |   20 
 plugins/fn-erlang/Makefile.in             |   20 
 plugins/fn-financial/Makefile.in          |   20 
 plugins/fn-info/Makefile.in               |   20 
 plugins/fn-logical/Makefile.in            |   20 
 plugins/fn-lookup/Makefile.in             |   20 
 plugins/fn-math/Makefile.in               |   20 
 plugins/fn-r/Makefile.in                  |   20 
 plugins/fn-random/Makefile.in             |   20 
 plugins/fn-stat/Makefile.in               |   20 
 plugins/fn-string/Makefile.in             |   20 
 plugins/fn-tsa/Makefile.in                |   20 
 plugins/gda/Makefile.in                   |   20 
 plugins/gnome-db/Makefile.in              |   20 
 plugins/gnome-glossary/Makefile.in        |   20 
 plugins/html/Makefile.in                  |   20 
 plugins/lotus-123/Makefile.in             |   20 
 plugins/mps/Makefile.in                   |   20 
 plugins/numtheory/Makefile.in             |   20 
 plugins/oleo/Makefile.in                  |   20 
 plugins/openoffice/Makefile.in            |   20 
 plugins/paradox/Makefile.in               |   20 
 plugins/perl-func/Makefile.in             |   20 
 plugins/perl-loader/Makefile.in           |   20 
 plugins/plan-perfect/Makefile.in          |   20 
 plugins/psiconv/Makefile.in               |   20 
 plugins/py-func/Makefile.in               |   20 
 plugins/python-loader/Makefile.in         |   20 
 plugins/qpro/Makefile.in                  |   20 
 plugins/sample_datasource/Makefile.in     |   20 
 plugins/sc/Makefile.in                    |   20 
 plugins/sylk/Makefile.in                  |   20 
 plugins/uihello/Makefile.in               |   20 
 plugins/xbase/Makefile.in                 |   20 
 po/Makefile.in.in                         |  173 
 schemas/Makefile.in                       |   20 
 src/Makefile.in                           |   20 
 src/cut-n-paste-code/Makefile.in          |   20 
 src/dialogs/Makefile.in                   |   20 
 src/pixmaps/Makefile.in                   |   20 
 src/tools/Makefile.in                     |   20 
 src/tools/solver/Makefile.in              |   20 
 src/tools/solver/glpk/Makefile.in         |   20 
 src/tools/solver/glpk/include/Makefile.in |   20 
 src/tools/solver/glpk/source/Makefile.in  |   20 
 src/tools/solver/lp_solve/Makefile.in     |   20 
 src/widgets/Makefile.in                   |   20 
 templates/Makefile.in                     |   20 
 templates/autoformat/Makefile.in          |   20 
 templates/english/Makefile.in             |   20 
 test/Makefile.in                          |   20 
 tools/Makefile.in                         |   20 
 75 files changed, 81138 insertions(+), 5705 deletions(-)

--- NEW FILE gnumeric-1.8.4-local.patch ---
diff -Naur gnumeric-1.8.4/aclocal.m4 gnumeric-1.8.4.local/aclocal.m4
--- gnumeric-1.8.4/aclocal.m4	2009-01-18 21:45:00.000000000 +0530
+++ gnumeric-1.8.4.local/aclocal.m4	2009-12-14 07:17:31.000000000 +0530
@@ -13,952 +13,812 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
+m4_if(AC_AUTOCONF_VERSION, [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  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.
+dnl AM_GCONF_SOURCE_2
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+dnl  (i.e. pass to gconftool-2
+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+dnl  you should install foo.schemas files
+dnl
 
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
+AC_DEFUN([AM_GCONF_SOURCE_2],
+[
+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  else
+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+  fi
 
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
+  AC_ARG_WITH([gconf-source],
+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
+			     [Config database for installing schema files.]),
+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
 
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
 
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+  fi
 
-# Copyright (C) 2001, 2003, 2005  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.
+  AC_ARG_WITH([gconf-schema-file-dir],
+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+			     [Directory for installing schema files.]),
+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
 
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+  AC_ARG_ENABLE(schemas-install,
+     [  --disable-schemas-install	Disable the schemas installation],
+     [case ${enableval} in
+       yes|no) ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
+      esac])
+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+])
+
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
 #
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
 #
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
 #
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
 #
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor at redhat.com>, 12/15/1998
 #
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Major rework to remove unused code
+# Owen Taylor <otaylor at redhat.com>, 12/11/2002
 #
-# 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.
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
 
-# serial 8
+dnl
+dnl We go to great lengths to make sure that aclocal won't 
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
 
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
[...96685 lines suppressed...]
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -245,6 +264,7 @@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 autoformat_categories = 3D Classical Colourful Financial General List
diff -Naur gnumeric-1.8.4/templates/english/Makefile.in gnumeric-1.8.4.local/templates/english/Makefile.in
--- gnumeric-1.8.4/templates/english/Makefile.in	2009-01-18 21:45:13.000000000 +0530
+++ gnumeric-1.8.4.local/templates/english/Makefile.in	2009-12-14 07:17:54.000000000 +0530
@@ -130,10 +130,29 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -255,6 +274,7 @@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 templatesdir = $(gnumeric_datadir)/templates
diff -Naur gnumeric-1.8.4/templates/Makefile.in gnumeric-1.8.4.local/templates/Makefile.in
--- gnumeric-1.8.4/templates/Makefile.in	2009-01-18 21:45:13.000000000 +0530
+++ gnumeric-1.8.4.local/templates/Makefile.in	2009-12-14 07:17:54.000000000 +0530
@@ -132,10 +132,29 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -257,6 +276,7 @@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = autoformat english
diff -Naur gnumeric-1.8.4/test/Makefile.in gnumeric-1.8.4.local/test/Makefile.in
--- gnumeric-1.8.4/test/Makefile.in	2009-01-18 21:45:13.000000000 +0530
+++ gnumeric-1.8.4.local/test/Makefile.in	2009-12-14 07:17:54.000000000 +0530
@@ -142,10 +142,29 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -267,6 +286,7 @@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 TESTS = $(wildcard t[0-9][0-9][0-9][0-9]-*.pl)
diff -Naur gnumeric-1.8.4/tools/Makefile.in gnumeric-1.8.4.local/tools/Makefile.in
--- gnumeric-1.8.4/tools/Makefile.in	2009-01-18 21:45:13.000000000 +0530
+++ gnumeric-1.8.4.local/tools/Makefile.in	2009-12-14 07:17:54.000000000 +0530
@@ -152,10 +152,29 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -277,6 +296,7 @@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = $(GNUMERIC_CFLAGS) -DGNUMERIC_INTERNAL


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-12/gnumeric.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gnumeric.spec	2 Dec 2009 09:02:06 -0000	1.50
+++ gnumeric.spec	14 Dec 2009 10:58:00 -0000	1.51
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          6%{?dist}
+Release:          7%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -16,6 +16,7 @@ Patch3:		  gnumeric-1.8.4-backport-20090
 Patch4:		  gnumeric-1.8.4-backport-20090309.patch
 Patch5:		  gnumeric-1.8.4-backport-20090314.patch
 Patch6:		  gnumeric-1.8.4-backport-20090430.patch
+Patch7:		  gnumeric-1.8.4-local.patch		
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -71,6 +72,8 @@ This package contains the following addi
 %patch4 -p1 -b backport-20090309
 %patch5 -p1 -b backport-20090314
 %patch6 -p1 -b backport-20090430
+%patch7 -p1 -b local
+
 
 chmod -x plugins/excel/rc4.?
 
@@ -199,6 +202,9 @@ fi
 
 
 %changelog
+* Mon Dec 14 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-7
+- Fix rhbz #508679
+
 * Wed Dec 02 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-6
 - Bump version
 



From tomspur at fedoraproject.org  Mon Dec 14 11:03:12 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 14 Dec 2009 11:03:12 +0000 (UTC)
Subject: rpms/gbirthday/F-12 gbirthday.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20091214110312.89FEA11C00E9@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26766

Modified Files:
	gbirthday.spec sources 
Log Message:
new version 0.5.5


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/gbirthday.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gbirthday.spec	24 Nov 2009 19:06:20 -0000	1.6
+++ gbirthday.spec	14 Dec 2009 11:03:12 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gbirthday
-Version:        0.5.4
+Version:        0.5.5
 Release:        1%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
@@ -16,6 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 Requires:       notify-python
 Requires:       evolution
+Requires:       gnome-python2-evolution
 Requires:       python
 Requires:       MySQL-python
 Requires:       pygtk2
@@ -59,6 +60,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Mon Dec 14 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-1
+- new version
+
 * Sat Nov 21 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.4-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Nov 2009 19:06:20 -0000	1.6
+++ sources	14 Dec 2009 11:03:12 -0000	1.7
@@ -1 +1 @@
-65c363caf4b3c671f3da074702ee3424  gbirthday-0.5.4.tar.xz
+716c10163d0a8c31d55dc622a3412104  gbirthday-0.5.5.tar.xz



From tomspur at fedoraproject.org  Mon Dec 14 11:06:09 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 14 Dec 2009 11:06:09 +0000 (UTC)
Subject: rpms/gbirthday/F-11 gbirthday.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <20091214110609.609EE11C00E9@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27289

Modified Files:
	gbirthday.spec sources 
Log Message:
new version 0.5.5


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/gbirthday.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gbirthday.spec	24 Nov 2009 19:17:03 -0000	1.5
+++ gbirthday.spec	14 Dec 2009 11:06:09 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gbirthday
-Version:        0.5.4
+Version:        0.5.5
 Release:        1%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Mon Dec 14 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-1
+- new version
+
 * Sat Nov 21 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.4-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Nov 2009 19:17:03 -0000	1.6
+++ sources	14 Dec 2009 11:06:09 -0000	1.7
@@ -1 +1 @@
-65c363caf4b3c671f3da074702ee3424  gbirthday-0.5.4.tar.xz
+716c10163d0a8c31d55dc622a3412104  gbirthday-0.5.5.tar.xz



From olea at fedoraproject.org  Mon Dec 14 11:15:27 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:15:27 +0000 (UTC)
Subject: rpms/chronojump/F-10 chronojump.spec,1.3,1.4
Message-ID: <20091214111527.B7A2311C00E9@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28566

Modified Files:
	chronojump.spec 
Log Message:
Update to 0.8.14


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/chronojump.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- chronojump.spec	11 Dec 2009 02:59:02 -0000	1.3
+++ chronojump.spec	14 Dec 2009 11:15:27 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           chronojump
-Version:        0.8.13
+Version:        0.8.14
 Release:        2%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
@@ -111,6 +111,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+
+* Fri Dec 12 2009 <ismael at olea.org> - 0.8.14-1
+- update to 0.8.14
+
 * Fri Dec 11 2009 Ismael Olea <ismael at olea.org> - 0.8.13-2
 - ExcludeArch: ppc64
 - ExcludeArch: ppc



From olea at fedoraproject.org  Mon Dec 14 11:19:53 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:19:53 +0000 (UTC)
Subject: rpms/chronojump/F-10 chronojump.spec,1.4,1.5
Message-ID: <20091214111953.5F1C811C00E9@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29290

Modified Files:
	chronojump.spec 
Log Message:
Update to 0.8.14


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/chronojump.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- chronojump.spec	14 Dec 2009 11:15:27 -0000	1.4
+++ chronojump.spec	14 Dec 2009 11:19:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           chronojump
 Version:        0.8.14
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering



From olea at fedoraproject.org  Mon Dec 14 11:28:00 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:28:00 +0000 (UTC)
Subject: File chronojump-0.8.14.tar.bz2 uploaded to lookaside cache by olea
Message-ID: <20091214112800.6109228ED0D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for chronojump:

2f87d240686f99799173a67d52c6184b  chronojump-0.8.14.tar.bz2



From olea at fedoraproject.org  Mon Dec 14 11:34:26 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:34:26 +0000 (UTC)
Subject: rpms/chronojump/devel .cvsignore, 1.3, 1.4 chronojump.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091214113426.187F611C00E9@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31618/devel

Modified Files:
	.cvsignore chronojump.spec import.log sources 
Log Message:
updating to 0.8.14




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Dec 2009 23:23:02 -0000	1.3
+++ .cvsignore	14 Dec 2009 11:34:25 -0000	1.4
@@ -1 +1 @@
-chronojump-0.8.13.tar.bz2
+chronojump-0.8.14.tar.bz2


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/chronojump.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- chronojump.spec	10 Dec 2009 23:23:02 -0000	1.3
+++ chronojump.spec	14 Dec 2009 11:34:25 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           chronojump
-Version:        0.8.13
+Version:        0.8.14
 Release:        1%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
@@ -107,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* Fri Dec 12 2009 <ismael at olea.org> - 0.8.14-1
+- update to 0.8.14
+
 * Fri Dec 11 2009 <ismael at olea.org> - 0.8.13-1
 - update to 0.8.13
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Dec 2009 23:23:02 -0000	1.2
+++ import.log	14 Dec 2009 11:34:25 -0000	1.3
@@ -1,2 +1,3 @@
 chronojump-0_8_11-2_olea:HEAD:chronojump-0.8.11-2.olea.src.rpm:1254870981
 chronojump-0_8_13-1_olea:HEAD:chronojump-0.8.13-1.olea.src.rpm:1260487350
+chronojump-0_8_14-1_olea:HEAD:chronojump-0.8.14-1.olea.src.rpm:1260790097


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Dec 2009 23:23:02 -0000	1.3
+++ sources	14 Dec 2009 11:34:25 -0000	1.4
@@ -1 +1 @@
-b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2
+2f87d240686f99799173a67d52c6184b  chronojump-0.8.14.tar.bz2



From olea at fedoraproject.org  Mon Dec 14 11:36:47 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:36:47 +0000 (UTC)
Subject: rpms/chronojump/F-10 sources,1.3,1.4
Message-ID: <20091214113647.7580E11C00E9@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32362

Modified Files:
	sources 
Log Message:
Update to 0.8.14


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Dec 2009 23:30:28 -0000	1.3
+++ sources	14 Dec 2009 11:36:47 -0000	1.4
@@ -1 +1 @@
-b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2
+2f87d240686f99799173a67d52c6184b  chronojump-0.8.14.tar.bz2



From olea at fedoraproject.org  Mon Dec 14 11:41:29 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:41:29 +0000 (UTC)
Subject: rpms/chronojump/F-10 chronojump.spec,1.5,1.6
Message-ID: <20091214114129.E767E11C03C6@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv666

Modified Files:
	chronojump.spec 
Log Message:
Update to 0.8.14


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/chronojump.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- chronojump.spec	14 Dec 2009 11:19:53 -0000	1.5
+++ chronojump.spec	14 Dec 2009 11:41:29 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           chronojump
 Version:        0.8.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering



From pbrobinson at fedoraproject.org  Mon Dec 14 11:42:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 11:42:05 +0000 (UTC)
Subject: rpms/sugar-pippy/devel sugar-pippy.spec,1.10,1.11
Message-ID: <20091214114205.7BE3411C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-pippy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv840

Modified Files:
	sugar-pippy.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539103


Index: sugar-pippy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-pippy/devel/sugar-pippy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sugar-pippy.spec	15 Aug 2009 21:13:42 -0000	1.10
+++ sugar-pippy.spec	14 Dec 2009 11:42:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           sugar-pippy
 Version:        34
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Pippy for Sugar
 
 Group:          Sugar/Activities
@@ -12,6 +12,7 @@ BuildArch:      noarch
 
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
+BuildRequires:  gettext 
 
 Requires:       sugar
 Requires:       pygame
@@ -74,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 34-6
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539103
+
 * Sat Aug 15 2009 Fabian Affolter <fabian at bernewireless.net> - 34-5
 - Bump release for a new build
 



From olea at fedoraproject.org  Mon Dec 14 11:42:13 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:42:13 +0000 (UTC)
Subject: rpms/chronojump/F-12 .cvsignore, 1.3, 1.4 chronojump.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091214114213.26C9F11C00E9@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv876/F-12

Modified Files:
	.cvsignore chronojump.spec import.log sources 
Log Message:
updating to 0.8.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Dec 2009 23:29:45 -0000	1.3
+++ .cvsignore	14 Dec 2009 11:42:13 -0000	1.4
@@ -1 +1 @@
-chronojump-0.8.13.tar.bz2
+chronojump-0.8.14.tar.bz2


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/chronojump.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- chronojump.spec	10 Dec 2009 23:29:45 -0000	1.3
+++ chronojump.spec	14 Dec 2009 11:42:13 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           chronojump
-Version:        0.8.13
+Version:        0.8.14
 Release:        1%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
@@ -107,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* Fri Dec 12 2009 <ismael at olea.org> - 0.8.14-1
+- update to 0.8.14
+
 * Fri Dec 11 2009 <ismael at olea.org> - 0.8.13-1
 - update to 0.8.13
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Dec 2009 23:29:46 -0000	1.2
+++ import.log	14 Dec 2009 11:42:13 -0000	1.3
@@ -1,2 +1,3 @@
 chronojump-0_8_11-2_olea:F-12:chronojump-0.8.11-2.olea.src.rpm:1254871266
 chronojump-0_8_13-1_olea:F-12:chronojump-0.8.13-1.olea.src.rpm:1260487764
+chronojump-0_8_14-1_olea:F-12:chronojump-0.8.14-1.olea.src.rpm:1260790595


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Dec 2009 23:29:46 -0000	1.3
+++ sources	14 Dec 2009 11:42:13 -0000	1.4
@@ -1 +1 @@
-b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2
+2f87d240686f99799173a67d52c6184b  chronojump-0.8.14.tar.bz2



From olea at fedoraproject.org  Mon Dec 14 11:42:53 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:42:53 +0000 (UTC)
Subject: rpms/chronojump/F-10 chronojump.spec,1.6,1.7
Message-ID: <20091214114253.7089611C00E9@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1172

Modified Files:
	chronojump.spec 
Log Message:
Update to 0.8.14


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/chronojump.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- chronojump.spec	14 Dec 2009 11:41:29 -0000	1.6
+++ chronojump.spec	14 Dec 2009 11:42:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           chronojump
 Version:        0.8.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering



From olea at fedoraproject.org  Mon Dec 14 11:48:16 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 14 Dec 2009 11:48:16 +0000 (UTC)
Subject: rpms/chronojump/F-11 .cvsignore, 1.3, 1.4 chronojump.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091214114816.49CF711C00E9@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/chronojump/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2181/F-11

Modified Files:
	.cvsignore chronojump.spec import.log sources 
Log Message:
updating to 0.8.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Dec 2009 23:37:34 -0000	1.3
+++ .cvsignore	14 Dec 2009 11:48:15 -0000	1.4
@@ -1 +1 @@
-chronojump-0.8.13.tar.bz2
+chronojump-0.8.14.tar.bz2


Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/chronojump.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chronojump.spec	10 Dec 2009 23:37:34 -0000	1.2
+++ chronojump.spec	14 Dec 2009 11:48:16 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           chronojump
-Version:        0.8.13
+Version:        0.8.14
 Release:        1%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
@@ -107,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* Fri Dec 12 2009 <ismael at olea.org> - 0.8.14-1
+- update to 0.8.14
+
 * Fri Dec 11 2009 <ismael at olea.org> - 0.8.13-1
 - update to 0.8.13
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Dec 2009 23:37:34 -0000	1.2
+++ import.log	14 Dec 2009 11:48:16 -0000	1.3
@@ -1,2 +1,3 @@
 chronojump-0_8_11-2_olea:F-11:chronojump-0.8.11-2.olea.src.rpm:1254871409
 chronojump-0_8_13-1_olea:F-11:chronojump-0.8.13-1.olea.src.rpm:1260488113
+chronojump-0_8_14-1_olea:F-11:chronojump-0.8.14-1.olea.src.rpm:1260791262


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Dec 2009 23:37:34 -0000	1.3
+++ sources	14 Dec 2009 11:48:16 -0000	1.4
@@ -1 +1 @@
-b8db06e4321931c6efb11d937f2c48e0  chronojump-0.8.13.tar.bz2
+2f87d240686f99799173a67d52c6184b  chronojump-0.8.14.tar.bz2



From kzak at fedoraproject.org  Mon Dec 14 11:50:10 2009
From: kzak at fedoraproject.org (kzak)
Date: Mon, 14 Dec 2009 11:50:10 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.68,1.69
Message-ID: <20091214115010.5AF6811C0396@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2591

Modified Files:
	util-linux-ng.spec 
Log Message:
* Mon Dec 14 2009 Karel Zak <kzak at redhat.com> 2.17-0.6
- minor fixes in spec file (fix URL, add Requires, add LGPLv2+)



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- util-linux-ng.spec	9 Dec 2009 12:52:55 -0000	1.68
+++ util-linux-ng.spec	14 Dec 2009 11:50:10 -0000	1.69
@@ -4,8 +4,8 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.17
-Release: 0.5%{?dist}
-License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
+Release: 0.6%{?dist}
+License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
 
@@ -34,7 +34,7 @@ BuildRequires: zlib-devel
 BuildRequires: popt-devel
 
 ### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-%{upstream_version}.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/util-linux-ng-%{upstream_version}.tar.bz2
 Source1: util-linux-ng-login.pamd
 Source2: util-linux-ng-remote.pamd
 Source3: util-linux-ng-chsh-chfn.pamd
@@ -75,6 +75,8 @@ Requires(post): /sbin/install-info
 Requires(post): coreutils
 Requires: pam >= 1.0.90, /etc/pam.d/system-auth
 Requires: audit-libs >= 1.0.6
+Requires: libuuid = %{version}-%{release}
+Requires: libblkid = %{version}-%{release}
 %if %{include_raw}
 Requires: udev
 %endif
@@ -711,6 +713,9 @@ fi
 
 
 %changelog
+* Mon Dec 14 2009 Karel Zak <kzak at redhat.com> 2.17-0.6
+- minor fixes in spec file (fix URL, add Requires, add LGPLv2+)
+
 * Wed Dec  9 2009 Karel Zak <kzak at redhat.com> 2.17-0.5
 - upgrade to 2.17-rc2
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc2-ChangeLog



From diegobz at fedoraproject.org  Mon Dec 14 11:50:39 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 14 Dec 2009 11:50:39 +0000 (UTC)
Subject: File polib-0.5.1.tar.gz uploaded to lookaside cache by diegobz
Message-ID: <20091214115039.B5BDE28EDA6@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-polib:

0e4e5b8c408eaf981e8b6f6820fd569c  polib-0.5.1.tar.gz



From pbrobinson at fedoraproject.org  Mon Dec 14 11:51:41 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 11:51:41 +0000 (UTC)
Subject: rpms/sugar-moon/devel sugar-moon.spec,1.6,1.7
Message-ID: <20091214115141.65CA611C0345@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-moon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2895

Modified Files:
	sugar-moon.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539034


Index: sugar-moon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-moon/devel/sugar-moon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sugar-moon.spec	27 Jul 2009 05:03:17 -0000	1.6
+++ sugar-moon.spec	14 Dec 2009 11:51:41 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name: sugar-moon
 Version: 10
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Moon phases activity for sugar
 
 Group: Sugar/Activities
@@ -11,6 +11,8 @@ BuildArch: noarch
 URL: http://wiki.laptop.org/go/Moon
 Source0: http://download.sugarlabs.org/sources/honey/Moon/Moon-10.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gettext
 BuildRequires: python 
 BuildRequires: sugar-toolkit
 Requires: sugar 
@@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 10-3
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539034
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec 14 11:55:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 11:55:14 +0000 (UTC)
Subject: rpms/sugar-calculator/devel sugar-calculator.spec,1.6,1.7
Message-ID: <20091214115514.815EE11C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-calculator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3450

Modified Files:
	sugar-calculator.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539143


Index: sugar-calculator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/devel/sugar-calculator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sugar-calculator.spec	27 Jul 2009 04:59:28 -0000	1.6
+++ sugar-calculator.spec	14 Dec 2009 11:55:14 -0000	1.7
@@ -1,12 +1,14 @@
 Name: sugar-calculator
 Version: 30
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Calculator for Sugar
 Group: Sugar/Activities
 License: GPLv2+
 URL: http://wiki.laptop.org/go/Calculate
 Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Calculate/Calculate-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  gettext
 BuildRequires:  python sugar-toolkit
 Requires: sugar
 BuildArch: noarch
@@ -41,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 30-3
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539143
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From diegobz at fedoraproject.org  Mon Dec 14 11:58:05 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 14 Dec 2009 11:58:05 +0000 (UTC)
Subject: rpms/python-polib/devel .cvsignore, 1.3, 1.4 python-polib.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091214115805.8C5FD11C00E9@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/python-polib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3940

Modified Files:
	.cvsignore python-polib.spec sources 
Log Message:
Updated to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Aug 2009 13:35:43 -0000	1.3
+++ .cvsignore	14 Dec 2009 11:58:05 -0000	1.4
@@ -1 +1 @@
-polib-0.4.2.tar.gz
+polib-0.5.1.tar.gz


Index: python-polib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/devel/python-polib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-polib.spec	19 Aug 2009 13:35:43 -0000	1.3
+++ python-polib.spec	14 Dec 2009 11:58:05 -0000	1.4
@@ -3,7 +3,7 @@
 #%define alphatag r60
 
 Name:           python-polib
-Version:        0.4.2
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        A library to parse and manage gettext catalogs
 
@@ -13,7 +13,7 @@ URL:            http://code.google.com/p
 # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60
 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60
 #Source0:        polib-%{version}-%{alphatag}.tar.gz
-Source0:	http://polib.googlecode.com/files/polib-0.4.2.tar.gz
+Source0:	http://polib.googlecode.com/files/polib-0.5.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,10 +44,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README docs/
+%doc LICENSE README
 %{python_sitelib}/*
 
 %changelog
+* Mon Dec 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.5.1-1
+- Updated to 0.5.1 release
+
 * Wed Aug 19 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.4.2-1
 - Updated to 0.4.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Aug 2009 13:35:43 -0000	1.3
+++ sources	14 Dec 2009 11:58:05 -0000	1.4
@@ -1 +1 @@
-1a06c04444486271c3119953128a4844  polib-0.4.2.tar.gz
+0e4e5b8c408eaf981e8b6f6820fd569c  polib-0.5.1.tar.gz



From pbrobinson at fedoraproject.org  Mon Dec 14 12:00:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:00:47 +0000 (UTC)
Subject: rpms/sugar-clock/devel sugar-clock.spec,1.5,1.6
Message-ID: <20091214120047.B4C2211C0345@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-clock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4473

Modified Files:
	sugar-clock.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 538921


Index: sugar-clock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-clock/devel/sugar-clock.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sugar-clock.spec	27 Jul 2009 04:59:52 -0000	1.5
+++ sugar-clock.spec	14 Dec 2009 12:00:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           sugar-clock
 Version:        5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Clock activity for Sugar
 
 Group:          Sugar/Activities
@@ -10,6 +10,7 @@ Source0:        http://download.sugarlab
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{_id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  gettext
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
 
@@ -54,6 +55,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 5-3
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 538921
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec 14 12:03:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:03:37 +0000 (UTC)
Subject: rpms/sugar-jukebox/devel sugar-jukebox.spec,1.8,1.9
Message-ID: <20091214120337.466CD11C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-jukebox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5132

Modified Files:
	sugar-jukebox.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 538871


Index: sugar-jukebox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/devel/sugar-jukebox.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sugar-jukebox.spec	27 Jul 2009 05:02:36 -0000	1.8
+++ sugar-jukebox.spec	14 Dec 2009 12:03:37 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		sugar-jukebox
 Version:	11
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Media player activity for Sugar
 
 Group:		Sugar/Activities
@@ -9,6 +9,7 @@ URL:		http://wiki.laptop.org/go/Jukebox
 Source0:	http://download.sugarlabs.org/sources/sucrose/fructose/Jukebox/Jukebox-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  gettext
 BuildRequires:	python sugar-toolkit
 BuildArch:	noarch
 Requires:	sugar
@@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 11-3
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 538871
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec 14 12:10:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:10:16 +0000 (UTC)
Subject: rpms/sugar-connect/devel sugar-connect.spec,1.3,1.4
Message-ID: <20091214121016.BC5DF11C03C6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-connect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6093

Modified Files:
	sugar-connect.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 538900


Index: sugar-connect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-connect/devel/sugar-connect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sugar-connect.spec	27 Jul 2009 05:00:04 -0000	1.3
+++ sugar-connect.spec	14 Dec 2009 12:10:16 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sugar-connect
 Version:        22
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Connect for Sugar
 
 Group:          Sugar/Activities
@@ -11,6 +11,7 @@ Source1:        %{name}-checkout.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{_id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  gettext
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
 
@@ -48,6 +49,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 22-5
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 538900
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 22-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec 14 12:18:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:18:01 +0000 (UTC)
Subject: rpms/sugar-distance/devel sugar-distance.spec,1.3,1.4
Message-ID: <20091214121801.AD17C11C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-distance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7196

Modified Files:
	sugar-distance.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539162


Index: sugar-distance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-distance/devel/sugar-distance.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sugar-distance.spec	27 Jul 2009 05:00:51 -0000	1.3
+++ sugar-distance.spec	14 Dec 2009 12:18:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sugar-distance
 Version:        13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Distance measurement for Sugar
 
 Group:          Sugar/Activities
@@ -10,6 +10,7 @@ Source0:        Distance-%{version}.tar.
 Source1:        sugar-distance-checkout.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  gettext
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
 Requires:       sugar
@@ -48,6 +49,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 13-4
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539162
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From diegobz at fedoraproject.org  Mon Dec 14 12:18:08 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 14 Dec 2009 12:18:08 +0000 (UTC)
Subject: rpms/python-polib/F-12 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 python-polib.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091214121808.AB48511C00E9@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/python-polib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7242/F-12

Modified Files:
	.cvsignore import.log python-polib.spec sources 
Log Message:
Updated to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Aug 2009 13:35:43 -0000	1.3
+++ .cvsignore	14 Dec 2009 12:18:08 -0000	1.4
@@ -1 +1 @@
-polib-0.4.2.tar.gz
+polib-0.5.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	19 Aug 2009 13:35:43 -0000	1.2
+++ import.log	14 Dec 2009 12:18:08 -0000	1.3
@@ -1,2 +1,3 @@
 python-polib-0_4_0-1_20080217svnr60:HEAD:python-polib-0.4.0-1.20080217svnr60.src.rpm:1236173174
 python-polib-0_4_2-1_fc11:HEAD:python-polib-0.4.2-1.fc11.src.rpm:1250689023
+python-polib-0_5_1-1_fc13:F-12:python-polib-0.5.1-1.fc13.src.rpm:1260793321


Index: python-polib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-12/python-polib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-polib.spec	19 Aug 2009 13:35:43 -0000	1.3
+++ python-polib.spec	14 Dec 2009 12:18:08 -0000	1.4
@@ -3,7 +3,7 @@
 #%define alphatag r60
 
 Name:           python-polib
-Version:        0.4.2
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        A library to parse and manage gettext catalogs
 
@@ -13,7 +13,7 @@ URL:            http://code.google.com/p
 # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60
 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60
 #Source0:        polib-%{version}-%{alphatag}.tar.gz
-Source0:	http://polib.googlecode.com/files/polib-0.4.2.tar.gz
+Source0:	http://polib.googlecode.com/files/polib-0.5.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,10 +44,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README docs/
+%doc LICENSE README
 %{python_sitelib}/*
 
 %changelog
+* Mon Dec 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.5.1-1
+- Updated to 0.5.1 release
+
 * Wed Aug 19 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.4.2-1
 - Updated to 0.4.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Aug 2009 13:35:43 -0000	1.3
+++ sources	14 Dec 2009 12:18:08 -0000	1.4
@@ -1 +1 @@
-1a06c04444486271c3119953128a4844  polib-0.4.2.tar.gz
+0e4e5b8c408eaf981e8b6f6820fd569c  polib-0.5.1.tar.gz



From pbrobinson at fedoraproject.org  Mon Dec 14 12:20:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:20:16 +0000 (UTC)
Subject: rpms/sugar-implode/devel sugar-implode.spec,1.4,1.5
Message-ID: <20091214122016.703A911C0396@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-implode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7765

Modified Files:
	sugar-implode.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539177


Index: sugar-implode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-implode/devel/sugar-implode.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sugar-implode.spec	27 Jul 2009 05:01:56 -0000	1.4
+++ sugar-implode.spec	14 Dec 2009 12:20:16 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           sugar-implode
 Version:        5
-Release:        4.%{date}%{?dist}
+Release:        5.%{date}%{?dist}
 Summary:        Implode for Sugar
 
 Group:          Sugar/Activities
@@ -13,6 +13,7 @@ Source1:        sugar-implode-checkout.s
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  gettext
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
 
@@ -62,6 +63,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 5-5
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539177
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5-4.20090717
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From diegobz at fedoraproject.org  Mon Dec 14 12:21:05 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 14 Dec 2009 12:21:05 +0000 (UTC)
Subject: rpms/python-polib/F-11 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 python-polib.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091214122105.6480C11C0396@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/python-polib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7973/F-11

Modified Files:
	.cvsignore import.log python-polib.spec sources 
Log Message:
Updated to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Aug 2009 13:41:04 -0000	1.3
+++ .cvsignore	14 Dec 2009 12:21:05 -0000	1.4
@@ -1 +1 @@
-polib-0.4.2.tar.gz
+polib-0.5.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	19 Aug 2009 13:41:04 -0000	1.2
+++ import.log	14 Dec 2009 12:21:05 -0000	1.3
@@ -1,2 +1,3 @@
 python-polib-0_4_0-1_20080217svnr60:HEAD:python-polib-0.4.0-1.20080217svnr60.src.rpm:1236173174
 python-polib-0_4_2-1_fc11:F-11:python-polib-0.4.2-1.fc11.src.rpm:1250689348
+python-polib-0_5_1-1_fc13:F-11:python-polib-0.5.1-1.fc13.src.rpm:1260793458


Index: python-polib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-11/python-polib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-polib.spec	19 Aug 2009 13:41:04 -0000	1.2
+++ python-polib.spec	14 Dec 2009 12:21:05 -0000	1.3
@@ -3,7 +3,7 @@
 #%define alphatag r60
 
 Name:           python-polib
-Version:        0.4.2
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        A library to parse and manage gettext catalogs
 
@@ -13,7 +13,7 @@ URL:            http://code.google.com/p
 # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60
 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60
 #Source0:        polib-%{version}-%{alphatag}.tar.gz
-Source0:	http://polib.googlecode.com/files/polib-0.4.2.tar.gz
+Source0:	http://polib.googlecode.com/files/polib-0.5.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,10 +44,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README docs/
+%doc LICENSE README
 %{python_sitelib}/*
 
 %changelog
+* Mon Dec 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.5.1-1
+- Updated to 0.5.1 release
+
 * Wed Aug 19 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.4.2-1
 - Updated to 0.4.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Aug 2009 13:41:04 -0000	1.3
+++ sources	14 Dec 2009 12:21:05 -0000	1.4
@@ -1 +1 @@
-1a06c04444486271c3119953128a4844  polib-0.4.2.tar.gz
+0e4e5b8c408eaf981e8b6f6820fd569c  polib-0.5.1.tar.gz



From pbrobinson at fedoraproject.org  Mon Dec 14 12:23:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:23:42 +0000 (UTC)
Subject: rpms/sugar-infoslicer/devel sugar-infoslicer.spec,1.5,1.6
Message-ID: <20091214122342.3A95C11C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-infoslicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8406

Modified Files:
	sugar-infoslicer.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539177


Index: sugar-infoslicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-infoslicer/devel/sugar-infoslicer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sugar-infoslicer.spec	20 Nov 2009 23:19:25 -0000	1.5
+++ sugar-infoslicer.spec	14 Dec 2009 12:23:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           sugar-infoslicer
 Version:        6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Downloader for articles from Wikipedia
 
 Group:          Sugar/Activities
@@ -10,6 +10,7 @@ Source0:        http://download.sugarlab
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  gettext
 BuildRequires:  python-devel
 BuildRequires:  sugar-toolkit
 
@@ -47,6 +48,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 6-2
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539177
+
 * Fri Nov 20 2009 Fabian Affolter <fabian at bernewireless.net> - 6-1
 - Updated to new upstream version 6
 



From diegobz at fedoraproject.org  Mon Dec 14 12:26:41 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 14 Dec 2009 12:26:41 +0000 (UTC)
Subject: rpms/python-polib/EL-5 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 python-polib.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091214122641.0FDAF11C00E9@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/python-polib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8979/EL-5

Modified Files:
	.cvsignore import.log python-polib.spec sources 
Log Message:
Updated to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Aug 2009 13:46:37 -0000	1.3
+++ .cvsignore	14 Dec 2009 12:26:40 -0000	1.4
@@ -1 +1 @@
-polib-0.4.2.tar.gz
+polib-0.5.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	19 Aug 2009 13:46:37 -0000	1.2
+++ import.log	14 Dec 2009 12:26:40 -0000	1.3
@@ -1,2 +1,3 @@
 python-polib-0_4_0-1_fc11_20080217svnr60:EL-5:python-polib-0.4.0-1.fc11.20080217svnr60.src.rpm:1236175108
 python-polib-0_4_2-1_fc11:EL-5:python-polib-0.4.2-1.fc11.src.rpm:1250689665
+python-polib-0_5_1-1_fc13:EL-5:python-polib-0.5.1-1.fc13.src.rpm:1260793794


Index: python-polib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/EL-5/python-polib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-polib.spec	19 Aug 2009 13:46:37 -0000	1.2
+++ python-polib.spec	14 Dec 2009 12:26:40 -0000	1.3
@@ -3,7 +3,7 @@
 #%define alphatag r60
 
 Name:           python-polib
-Version:        0.4.2
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        A library to parse and manage gettext catalogs
 
@@ -13,7 +13,7 @@ URL:            http://code.google.com/p
 # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60
 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60
 #Source0:        polib-%{version}-%{alphatag}.tar.gz
-Source0:	http://polib.googlecode.com/files/polib-0.4.2.tar.gz
+Source0:	http://polib.googlecode.com/files/polib-0.5.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,10 +44,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README docs/
+%doc LICENSE README
 %{python_sitelib}/*
 
 %changelog
+* Mon Dec 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.5.1-1
+- Updated to 0.5.1 release
+
 * Wed Aug 19 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.4.2-1
 - Updated to 0.4.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Aug 2009 13:46:37 -0000	1.3
+++ sources	14 Dec 2009 12:26:40 -0000	1.4
@@ -1 +1 @@
-1a06c04444486271c3119953128a4844  polib-0.4.2.tar.gz
+0e4e5b8c408eaf981e8b6f6820fd569c  polib-0.5.1.tar.gz



From pbrobinson at fedoraproject.org  Mon Dec 14 12:27:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:27:30 +0000 (UTC)
Subject: rpms/sugar-memorize/devel sugar-memorize.spec,1.7,1.8
Message-ID: <20091214122730.8F64111C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-memorize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9176

Modified Files:
	sugar-memorize.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539053


Index: sugar-memorize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-memorize/devel/sugar-memorize.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sugar-memorize.spec	8 Aug 2009 22:21:22 -0000	1.7
+++ sugar-memorize.spec	14 Dec 2009 12:27:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           sugar-memorize
 Version:        33
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Memorize for Sugar
 
 Group:          Sugar/Activities
@@ -10,6 +10,7 @@ Source0:        http://download.sugarlab
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  gettext
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
 
@@ -50,6 +51,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 33-3
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539053
+
 * Sat Aug 08 2009 Fabian Affolter <fabian at bernewireless.net> - 33-2
 - Bump release
 



From pbrobinson at fedoraproject.org  Mon Dec 14 12:29:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:29:23 +0000 (UTC)
Subject: rpms/sugar-playgo/devel sugar-playgo.spec,1.3,1.4
Message-ID: <20091214122923.70A5F11C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-playgo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9549

Modified Files:
	sugar-playgo.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539218


Index: sugar-playgo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-playgo/devel/sugar-playgo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sugar-playgo.spec	27 Jul 2009 05:03:46 -0000	1.3
+++ sugar-playgo.spec	14 Dec 2009 12:29:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sugar-playgo
 Version:        5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Go for Sugar
 
 Group:          Sugar/Activities
@@ -11,6 +11,7 @@ Source1:        %{name}-checkout.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{_id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  gettext
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
 
@@ -52,6 +53,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 5-4
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539218
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Dec 14 12:31:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 14 Dec 2009 12:31:35 +0000 (UTC)
Subject: rpms/sugar-record/devel sugar-record.spec,1.1,1.2
Message-ID: <20091214123135.4472011C02CA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-record/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10076

Modified Files:
	sugar-record.spec 
Log Message:
- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539221


Index: sugar-record.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-record/devel/sugar-record.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sugar-record.spec	20 Aug 2009 22:48:17 -0000	1.1
+++ sugar-record.spec	14 Dec 2009 12:31:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           sugar-record
 Version:        64
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Recording tool for Sugar
 
 Group:          Sugar/Activities
@@ -10,6 +10,7 @@ Source0:        http://download.sugarlab
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  gettext
 BuildRequires:  python-devel
 BuildRequires:  sugar-toolkit
 
@@ -55,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 64-4
+- Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 539221
+
 * Sun Aug 16 2009 Fabian Affolter <fabian at bernewireless.net> - 64-3
 - Readded noarch
 - Removed duplicated docs 



From caolanm at fedoraproject.org  Mon Dec 14 12:55:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Dec 2009 12:55:08 +0000 (UTC)
Subject: rpms/planner/F-12 planner-gnome604531-tooltips.patch, NONE,
	1.1 planner.spec, 1.75, 1.76
Message-ID: <20091214125508.E77BE11C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13464/F-12

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604531-tooltips.patch 
Log Message:
Resolves: rhbz#546844 add tooltips to views

planner-gnome604531-tooltips.patch:
 planner-gantt-chart.c |    1 +
 planner-gantt-chart.h |    2 ++
 planner-gantt-row.c   |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 planner-usage-chart.c |    1 +
 planner-usage-chart.h |    3 +++
 planner-usage-row.c   |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 101 insertions(+)

--- NEW FILE planner-gnome604531-tooltips.patch ---
diff -ru planner-0.14.4.orig/src/planner-gantt-chart.c planner-0.14.4/src/planner-gantt-chart.c
--- planner-0.14.4.orig/src/planner-gantt-chart.c	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-chart.c	2009-12-14 12:38:26.000000000 +0000
@@ -369,6 +369,7 @@
 			    0);		/* padding */
 
 	priv->canvas = GNOME_CANVAS (gnome_canvas_new ());
+	planner_gantt_chart_init_tooltips(priv->canvas);
 	priv->canvas->close_enough = 5;
 	gnome_canvas_set_center_scroll_region (priv->canvas, FALSE);
 
diff -ru planner-0.14.4.orig/src/planner-gantt-chart.h planner-0.14.4/src/planner-gantt-chart.h
--- planner-0.14.4.orig/src/planner-gantt-chart.h	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-chart.h	2009-12-14 12:38:26.000000000 +0000
@@ -104,5 +104,7 @@
 gboolean
 planner_gantt_chart_get_nonstandard_days             (PlannerGanttChart *chart);
 
+void
+planner_gantt_chart_init_tooltips                    (GnomeCanvas *canvas);
 
 #endif /* __PLANNER_GANTT_CHART_H__ */
diff -ru planner-0.14.4.orig/src/planner-gantt-row.c planner-0.14.4/src/planner-gantt-row.c
--- planner-0.14.4.orig/src/planner-gantt-row.c	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-row.c	2009-12-14 12:42:52.000000000 +0000
@@ -3497,3 +3497,50 @@
 	
 	return list;
 }
+
+static gboolean
+query_tooltip_canvas_cb(GtkWidget *widget,
+			int        x,
+			int        y,
+			gboolean   keybord_tip,
+			GtkTooltip *tooltip,
+			gpointer data)
+{
+	GnomeCanvasItem *mouse_over_item;
+	PlannerGanttRow *row;
+	PlannerGanttRowPriv *priv;
+	int scrollx, scrolly;
+	double wx, wy;
+
+	if (keybord_tip)
+		return FALSE;
+
+	gnome_canvas_get_scroll_offsets (GNOME_CANVAS(widget), &scrollx, &scrolly);
+	gnome_canvas_window_to_world (GNOME_CANVAS(widget), x+scrollx, y+scrolly, &wx, &wy);
+
+	mouse_over_item = gnome_canvas_get_item_at (GNOME_CANVAS(widget), wx, wy);
+	if (!mouse_over_item)
+		return FALSE;
+
+        if (!PLANNER_IS_GANTT_ROW (mouse_over_item))
+		return FALSE;
+
+	row = PLANNER_GANTT_ROW (mouse_over_item);
+	priv = row->priv;
+
+	if (!priv->task)
+		return FALSE;
+
+	gtk_tooltip_set_text(tooltip, mrp_task_get_name(priv->task));
+
+	return TRUE;
+}
+
+void
+planner_gantt_chart_init_tooltips(GnomeCanvas *canvas)
+{
+	g_object_set (canvas, "has-tooltip", TRUE, NULL);
+	g_signal_connect (canvas, "query-tooltip",
+			  G_CALLBACK (query_tooltip_canvas_cb),
+			  NULL );
+}
diff -ru planner-0.14.4.orig/src/planner-usage-chart.c planner-0.14.4/src/planner-usage-chart.c
--- planner-0.14.4.orig/src/planner-usage-chart.c	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-usage-chart.c	2009-12-14 12:38:26.000000000 +0000
@@ -341,6 +341,7 @@
                             0);
 
         priv->canvas = GNOME_CANVAS (gnome_canvas_new ());
+        planner_usage_chart_init_tooltips(priv->canvas);
         priv->canvas->close_enough = 5;
         gnome_canvas_set_center_scroll_region (priv->canvas, FALSE);
 
diff -ru planner-0.14.4.orig/src/planner-usage-chart.h planner-0.14.4/src/planner-usage-chart.h
--- planner-0.14.4.orig/src/planner-usage-chart.h	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-usage-chart.h	2009-12-14 12:38:26.000000000 +0000
@@ -81,4 +81,7 @@
 
 void planner_usage_chart_setup_root_task (PlannerUsageChart *chart);
 
+void
+planner_usage_chart_init_tooltips                  (GnomeCanvas *canvas);
+
 #endif /* __PLANNER_USAGE_CHART_H__ */
diff -ru planner-0.14.4.orig/src/planner-usage-row.c planner-0.14.4/src/planner-usage-row.c
--- planner-0.14.4.orig/src/planner-usage-row.c	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-usage-row.c	2009-12-14 12:42:48.000000000 +0000
@@ -1632,3 +1632,50 @@
 
 	return FALSE;
 }
+
+static gboolean
+query_tooltip_canvas_cb(GtkWidget *widget,
+			int        x,
+			int        y,
+			gboolean   keybord_tip,
+			GtkTooltip *tooltip,
+			gpointer data)
+{
+	GnomeCanvasItem *mouse_over_item;
+	PlannerUsageRow *row;
+	PlannerUsageRowPriv *priv;
+	int scrollx, scrolly;
+	double wx, wy;
+
+	if (keybord_tip)
+		return FALSE;
+
+	gnome_canvas_get_scroll_offsets (GNOME_CANVAS(widget), &scrollx, &scrolly);
+	gnome_canvas_window_to_world (GNOME_CANVAS(widget), x+scrollx, y+scrolly, &wx, &wy);
+
+	mouse_over_item = gnome_canvas_get_item_at (GNOME_CANVAS(widget), wx, wy);
+	if (!mouse_over_item)
+		return FALSE;
+
+        if (!PLANNER_IS_USAGE_ROW (mouse_over_item))
+                return FALSE;
+
+	row = PLANNER_USAGE_ROW (mouse_over_item);
+	priv = row->priv;
+
+	if (!priv->resource)
+		return FALSE;
+
+	gtk_tooltip_set_text(tooltip, mrp_resource_get_name(priv->resource));
+
+	return TRUE;
+}
+
+void
+planner_usage_chart_init_tooltips(GnomeCanvas *canvas)
+{
+	g_object_set (canvas, "has-tooltip", TRUE, NULL);
+	g_signal_connect (canvas, "query-tooltip",
+			  G_CALLBACK (query_tooltip_canvas_cb),
+			  NULL );
+}


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- planner.spec	14 Dec 2009 10:15:30 -0000	1.75
+++ planner.spec	14 Dec 2009 12:55:08 -0000	1.76
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   10%{?dist}
+Release:   11%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -28,6 +28,7 @@ Patch6: planner-gnome604169-comboboxentr
 Patch7: planner-gnome604355-scrolling.patch
 Patch8: planner-gnome604510.calcolors.patch
 Patch9: planner-gnome604515-usagestatus.patch
+Patch10: planner-gnome604531-tooltips.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -67,6 +68,7 @@ This package provides a plugin to integr
 %patch7 -p1 -b .scrolling
 %patch8 -p1 -b .calcolors
 %patch9 -p1 -b .resourcestatus
+%patch10 -p1 -b .tooltips
 
 %build
 rm -rf libegg
@@ -167,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-11
+- Resolves: rhbz#546844 add tooltips to views
+
 * Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-10
 - Resolves: rhbz#546846 show date in resource usage statusbar
 



From caolanm at fedoraproject.org  Mon Dec 14 12:55:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Dec 2009 12:55:09 +0000 (UTC)
Subject: rpms/planner/devel planner-gnome604531-tooltips.patch, NONE,
	1.1 planner.spec, 1.75, 1.76
Message-ID: <20091214125509.1786211C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13464/devel

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604531-tooltips.patch 
Log Message:
Resolves: rhbz#546844 add tooltips to views

planner-gnome604531-tooltips.patch:
 planner-gantt-chart.c |    1 +
 planner-gantt-chart.h |    2 ++
 planner-gantt-row.c   |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 planner-usage-chart.c |    1 +
 planner-usage-chart.h |    3 +++
 planner-usage-row.c   |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 101 insertions(+)

--- NEW FILE planner-gnome604531-tooltips.patch ---
diff -ru planner-0.14.4.orig/src/planner-gantt-chart.c planner-0.14.4/src/planner-gantt-chart.c
--- planner-0.14.4.orig/src/planner-gantt-chart.c	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-chart.c	2009-12-14 12:38:26.000000000 +0000
@@ -369,6 +369,7 @@
 			    0);		/* padding */
 
 	priv->canvas = GNOME_CANVAS (gnome_canvas_new ());
+	planner_gantt_chart_init_tooltips(priv->canvas);
 	priv->canvas->close_enough = 5;
 	gnome_canvas_set_center_scroll_region (priv->canvas, FALSE);
 
diff -ru planner-0.14.4.orig/src/planner-gantt-chart.h planner-0.14.4/src/planner-gantt-chart.h
--- planner-0.14.4.orig/src/planner-gantt-chart.h	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-chart.h	2009-12-14 12:38:26.000000000 +0000
@@ -104,5 +104,7 @@
 gboolean
 planner_gantt_chart_get_nonstandard_days             (PlannerGanttChart *chart);
 
+void
+planner_gantt_chart_init_tooltips                    (GnomeCanvas *canvas);
 
 #endif /* __PLANNER_GANTT_CHART_H__ */
diff -ru planner-0.14.4.orig/src/planner-gantt-row.c planner-0.14.4/src/planner-gantt-row.c
--- planner-0.14.4.orig/src/planner-gantt-row.c	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-row.c	2009-12-14 12:42:52.000000000 +0000
@@ -3497,3 +3497,50 @@
 	
 	return list;
 }
+
+static gboolean
+query_tooltip_canvas_cb(GtkWidget *widget,
+			int        x,
+			int        y,
+			gboolean   keybord_tip,
+			GtkTooltip *tooltip,
+			gpointer data)
+{
+	GnomeCanvasItem *mouse_over_item;
+	PlannerGanttRow *row;
+	PlannerGanttRowPriv *priv;
+	int scrollx, scrolly;
+	double wx, wy;
+
+	if (keybord_tip)
+		return FALSE;
+
+	gnome_canvas_get_scroll_offsets (GNOME_CANVAS(widget), &scrollx, &scrolly);
+	gnome_canvas_window_to_world (GNOME_CANVAS(widget), x+scrollx, y+scrolly, &wx, &wy);
+
+	mouse_over_item = gnome_canvas_get_item_at (GNOME_CANVAS(widget), wx, wy);
+	if (!mouse_over_item)
+		return FALSE;
+
+        if (!PLANNER_IS_GANTT_ROW (mouse_over_item))
+		return FALSE;
+
+	row = PLANNER_GANTT_ROW (mouse_over_item);
+	priv = row->priv;
+
+	if (!priv->task)
+		return FALSE;
+
+	gtk_tooltip_set_text(tooltip, mrp_task_get_name(priv->task));
+
+	return TRUE;
+}
+
+void
+planner_gantt_chart_init_tooltips(GnomeCanvas *canvas)
+{
+	g_object_set (canvas, "has-tooltip", TRUE, NULL);
+	g_signal_connect (canvas, "query-tooltip",
+			  G_CALLBACK (query_tooltip_canvas_cb),
+			  NULL );
+}
diff -ru planner-0.14.4.orig/src/planner-usage-chart.c planner-0.14.4/src/planner-usage-chart.c
--- planner-0.14.4.orig/src/planner-usage-chart.c	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-usage-chart.c	2009-12-14 12:38:26.000000000 +0000
@@ -341,6 +341,7 @@
                             0);
 
         priv->canvas = GNOME_CANVAS (gnome_canvas_new ());
+        planner_usage_chart_init_tooltips(priv->canvas);
         priv->canvas->close_enough = 5;
         gnome_canvas_set_center_scroll_region (priv->canvas, FALSE);
 
diff -ru planner-0.14.4.orig/src/planner-usage-chart.h planner-0.14.4/src/planner-usage-chart.h
--- planner-0.14.4.orig/src/planner-usage-chart.h	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-usage-chart.h	2009-12-14 12:38:26.000000000 +0000
@@ -81,4 +81,7 @@
 
 void planner_usage_chart_setup_root_task (PlannerUsageChart *chart);
 
+void
+planner_usage_chart_init_tooltips                  (GnomeCanvas *canvas);
+
 #endif /* __PLANNER_USAGE_CHART_H__ */
diff -ru planner-0.14.4.orig/src/planner-usage-row.c planner-0.14.4/src/planner-usage-row.c
--- planner-0.14.4.orig/src/planner-usage-row.c	2009-12-14 10:29:48.000000000 +0000
+++ planner-0.14.4/src/planner-usage-row.c	2009-12-14 12:42:48.000000000 +0000
@@ -1632,3 +1632,50 @@
 
 	return FALSE;
 }
+
+static gboolean
+query_tooltip_canvas_cb(GtkWidget *widget,
+			int        x,
+			int        y,
+			gboolean   keybord_tip,
+			GtkTooltip *tooltip,
+			gpointer data)
+{
+	GnomeCanvasItem *mouse_over_item;
+	PlannerUsageRow *row;
+	PlannerUsageRowPriv *priv;
+	int scrollx, scrolly;
+	double wx, wy;
+
+	if (keybord_tip)
+		return FALSE;
+
+	gnome_canvas_get_scroll_offsets (GNOME_CANVAS(widget), &scrollx, &scrolly);
+	gnome_canvas_window_to_world (GNOME_CANVAS(widget), x+scrollx, y+scrolly, &wx, &wy);
+
+	mouse_over_item = gnome_canvas_get_item_at (GNOME_CANVAS(widget), wx, wy);
+	if (!mouse_over_item)
+		return FALSE;
+
+        if (!PLANNER_IS_USAGE_ROW (mouse_over_item))
+                return FALSE;
+
+	row = PLANNER_USAGE_ROW (mouse_over_item);
+	priv = row->priv;
+
+	if (!priv->resource)
+		return FALSE;
+
+	gtk_tooltip_set_text(tooltip, mrp_resource_get_name(priv->resource));
+
+	return TRUE;
+}
+
+void
+planner_usage_chart_init_tooltips(GnomeCanvas *canvas)
+{
+	g_object_set (canvas, "has-tooltip", TRUE, NULL);
+	g_signal_connect (canvas, "query-tooltip",
+			  G_CALLBACK (query_tooltip_canvas_cb),
+			  NULL );
+}


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- planner.spec	14 Dec 2009 10:15:31 -0000	1.75
+++ planner.spec	14 Dec 2009 12:55:08 -0000	1.76
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   10%{?dist}
+Release:   11%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -28,6 +28,7 @@ Patch6: planner-gnome604169-comboboxentr
 Patch7: planner-gnome604355-scrolling.patch
 Patch8: planner-gnome604510.calcolors.patch
 Patch9: planner-gnome604515-usagestatus.patch
+Patch10: planner-gnome604531-tooltips.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -67,6 +68,7 @@ This package provides a plugin to integr
 %patch7 -p1 -b .scrolling
 %patch8 -p1 -b .calcolors
 %patch9 -p1 -b .resourcestatus
+%patch10 -p1 -b .tooltips
 
 %build
 rm -rf libegg
@@ -165,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-11
+- Resolves: rhbz#546844 add tooltips to views
+
 * Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-10
 - Resolves: rhbz#546846 show date in resource usage statusbar
 



From caolanm at fedoraproject.org  Mon Dec 14 13:00:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Dec 2009 13:00:42 +0000 (UTC)
Subject: File hunspell-sk-20091213.zip uploaded to lookaside cache by caolanm
Message-ID: <20091214130042.E7A4028ED0D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for hunspell-sk:

fe5e01cab43c4ebf467d1ea32a2a665e  hunspell-sk-20091213.zip



From atkac at fedoraproject.org  Mon Dec 14 13:01:29 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 14 Dec 2009 13:01:29 +0000 (UTC)
Subject: rpms/enscript/devel enscript.spec,1.44,1.45
Message-ID: <20091214130129.2CAAE11C0345@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/enscript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14673

Modified Files:
	enscript.spec 
Log Message:
- merge review related fixes (#225729)



Index: enscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- enscript.spec	30 Nov 2009 14:01:37 -0000	1.44
+++ enscript.spec	14 Dec 2009 13:01:28 -0000	1.45
@@ -1,30 +1,43 @@
 Summary: A plain ASCII to PostScript converter
 Name: enscript
 Version: 1.6.4
-Release: 15%{?dist}
-License: GPLv2
+Release: 16%{?dist}
+License: GPLv2+
 Group: Applications/Publishing
-Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz
+URL: http://www.gnu.org/software/enscript
+# Tarball exists nowhere. You have to obtain it via:
+# $ git clone git://git.savannah.gnu.org/enscript.git
+# $ git archive --format=tar --prefix=enscript-1.6.4/ v1.6.4 |gzip > enscript-1.6.4.tar.gz
+Source0: enscript-%{version}.tar.gz
 Source1: enscript-ruby-1.6.4.tar.gz
 #http://neugierig.org/software/ruby/ruby-enscript.tar.gz
 Source2: enscript-php-1.6.4.st
 #http://home.raxnet.net/downloads/viewcvs/php.st
+
+# Make `make DESTDIR=dir install`  working
 Patch0: enscript-1.6.1-config.patch
+# RH #177336
 Patch1: enscript-1.6.4-hilight.patch
+# RH #61294
 Patch3: enscript-1.6.1-locale.patch
+# RH #132964
 Patch4: enscript-doublefree.patch
+
 Patch6: enscript-1.6.1-CAN-2004-1185.patch
 Patch7: enscript-1.6.1-CAN-2004-1186.patch
+
+# RH #224548
 Patch8: enscript-wrap_header.patch
+
 Patch9: enscript-1.6.4-rh457719.patch
 Patch10:enscript-1.6.4-rh457720.patch
 Patch11:enscript-CVE-2008-3863+CVE-2008-4306.patch
 Patch12:enscript-rh477382.patch
-URL: http://www.codento.com/people/mtr/genscript/
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: nenscript
+Obsoletes: nenscript < 1.13++-13
+Provides: nenscript = 1.13++-13
 
 BuildRequires: autoconf, automake
 
@@ -76,7 +89,7 @@ rm -f %{buildroot}%{_datadir}/info/dir
   ln .%{_prefix}/bin/enscript .%{_prefix}/bin/nenscript
 )
 
-cat %{name}.lang >> share.list
+%find_lang %{name} %{name}.lang
 
 for all in README THANKS; do
 	iconv -f ISO88591 -t UTF8 < $all > $all.new
@@ -98,17 +111,19 @@ fi
 [ -f %{_infodir}/%{name}.info.gz ] && \
   /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
 
-%files -f share.list
+%files -f %{name}.lang -f share.list
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog docs/FAQ.html NEWS README README.ESCAPES THANKS TODO 
+%doc AUTHORS ChangeLog COPYING docs/FAQ.html NEWS README README.ESCAPES THANKS TODO
 %{_bindir}/*
 %{_mandir}/man1/*
 %dir %{_datadir}/enscript
 %{_infodir}/%{name}*
 %config(noreplace) %{_sysconfdir}/enscript.cfg
 
-
 %changelog
+* Mon Dec 14 2009 Adam Tkac <atkac redhat com> - 1.6.4-16
+- merge review related fixes (#225729)
+
 * Mon Nov 30 2009 Adam Tkac <atkac redhat com> - 1.6.4-15
 - ship postscript files with .eps extension (#505775)
 - merge review fixes (#225729)



From caolanm at fedoraproject.org  Mon Dec 14 13:03:34 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 14 Dec 2009 13:03:34 +0000 (UTC)
Subject: rpms/hunspell-sk/devel .cvsignore, 1.6, 1.7 hunspell-sk.spec, 1.11, 
	1.12 sources, 1.7, 1.8
Message-ID: <20091214130334.A72E111C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15137

Modified Files:
	.cvsignore hunspell-sk.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	1 Apr 2009 08:36:21 -0000	1.6
+++ .cvsignore	14 Dec 2009 13:03:34 -0000	1.7
@@ -1 +1 @@
-hunspell-sk-20090330.zip
+hunspell-sk-20091213.zip


Index: hunspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/hunspell-sk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- hunspell-sk.spec	25 Jul 2009 02:39:49 -0000	1.11
+++ hunspell-sk.spec	14 Dec 2009 13:03:34 -0000	1.12
@@ -1,10 +1,10 @@
 Name: hunspell-sk
 Summary: Slovak hunspell dictionaries
 Epoch: 1
-%define upstreamid 20090330
+%define upstreamid 20091213
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
-Source: http://www.sk-spell.sk.cx/file_download/51/%{name}-%{upstreamid}.zip
+Release: 1%{?dist}
+Source: http://www.sk-spell.sk.cx/file_download/75/%{name}-%{upstreamid}.zip
 Group: Applications/Text
 URL: http://www.sk-spell.sk.cx/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,7 +17,7 @@ Requires: hunspell
 Slovak hunspell dictionaries.
 
 %prep
-%setup -q -n hunspell-sk-20090106
+%setup -q -n %{name}-%{upstreamid}
 
 %build
 
@@ -31,9 +31,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc doc/*
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Dec 14 2009 Caolan McNamara <caolanm at redhat.com> - 1:0.20091213-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.20090330-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Apr 2009 08:36:21 -0000	1.7
+++ sources	14 Dec 2009 13:03:34 -0000	1.8
@@ -1 +1 @@
-f5d7adfd55c2802438b3d7386fc7d971  hunspell-sk-20090330.zip
+fe5e01cab43c4ebf467d1ea32a2a665e  hunspell-sk-20091213.zip



From cebbert at fedoraproject.org  Mon Dec 14 13:12:21 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 14 Dec 2009 13:12:21 +0000 (UTC)
Subject: File patch-2.6.31.8-rc1.bz2 uploaded to lookaside cache by cebbert
Message-ID: <20091214131221.7764E28ED61@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for kernel:

599d1e51c678f33be388ca1137d08366  patch-2.6.31.8-rc1.bz2



From pkgdb at fedoraproject.org  Mon Dec 14 13:16:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:16:23 +0000
Subject: [pkgdb] libburn: npajkovs has given up watchcommits
Message-ID: <20091214131624.BCB7028ED8A@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libburn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:16:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:16:33 +0000
Subject: [pkgdb] libburn: npajkovs has given up watchbugzilla
Message-ID: <20091214131634.8D11C28ED61@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libburn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:16:37 +0000
Subject: [pkgdb] libburn: npajkovs has requested commit
Message-ID: <20091214131637.F0B6C28ED5F@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libburn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:16:50 +0000
Subject: [pkgdb] libburn: npajkovs has given up watchbugzilla
Message-ID: <20091214131650.E32DD28ED68@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libburn (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:16:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:16:54 +0000
Subject: [pkgdb] libburn: npajkovs has given up watchcommits
Message-ID: <20091214131654.8CBE128ED8A@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libburn (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:00 +0000
Subject: [pkgdb] libburn: npajkovs has requested commit
Message-ID: <20091214131703.6AD9A28ED68@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libburn (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:11 +0000
Subject: [pkgdb] libburn: npajkovs has given up watchbugzilla
Message-ID: <20091214131712.A477428ED5F@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libburn (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:15 +0000
Subject: [pkgdb] libburn: npajkovs has given up watchcommits
Message-ID: <20091214131715.C7D4728ED8A@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libburn (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:18 +0000
Subject: [pkgdb] libburn: npajkovs has requested commit
Message-ID: <20091214131719.3A67728EDA3@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libburn (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libburn



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:35 +0000
Subject: [pkgdb] libdiscid: npajkovs has given up watchbugzilla
Message-ID: <20091214131736.8883B28EDAE@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libdiscid (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:41 +0000
Subject: [pkgdb] libdiscid: npajkovs has given up watchcommits
Message-ID: <20091214131744.7955C28EDA3@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libdiscid (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:46 +0000
Subject: [pkgdb] libdiscid: npajkovs has requested commit
Message-ID: <20091214131747.22B8828ED68@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libdiscid (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:55 +0000
Subject: [pkgdb] libdiscid: npajkovs has given up watchbugzilla
Message-ID: <20091214131756.3698428ED8A@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libdiscid (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:17:58 +0000
Subject: [pkgdb] libdiscid: npajkovs has given up watchcommits
Message-ID: <20091214131759.9DF0A28ED61@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libdiscid (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:18:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:18:05 +0000
Subject: [pkgdb] libdiscid: npajkovs has requested commit
Message-ID: <20091214131808.80CE428ED68@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libdiscid (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:18:20 +0000
Subject: [pkgdb] libdiscid: npajkovs has given up watchbugzilla
Message-ID: <20091214131823.4353928EDAE@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libdiscid (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:18:24 +0000
Subject: [pkgdb] libdiscid: npajkovs has given up watchcommits
Message-ID: <20091214131826.0E2EC28EDB1@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libdiscid (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:18:32 +0000
Subject: [pkgdb] libdiscid: npajkovs has requested commit
Message-ID: <20091214131835.450DC28ED8A@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libdiscid (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Mon Dec 14 13:19:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:19:13 +0000
Subject: [pkgdb] libisofs: npajkovs has given up watchbugzilla
Message-ID: <20091214131915.CBB2E28ED61@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libisofs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From pkgdb at fedoraproject.org  Mon Dec 14 13:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:19:20 +0000
Subject: [pkgdb] libisofs: npajkovs has given up watchcommits
Message-ID: <20091214131921.DED0228ED61@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libisofs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From pkgdb at fedoraproject.org  Mon Dec 14 13:19:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:19:24 +0000
Subject: [pkgdb] libisofs: npajkovs has requested commit
Message-ID: <20091214131925.040C328ED7C@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libisofs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From pkgdb at fedoraproject.org  Mon Dec 14 13:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:19:37 +0000
Subject: [pkgdb] libisofs: npajkovs has given up watchbugzilla
Message-ID: <20091214131937.E637F28ED3B@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libisofs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From pkgdb at fedoraproject.org  Mon Dec 14 13:19:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:19:45 +0000
Subject: [pkgdb] libisofs: npajkovs has given up watchcommits
Message-ID: <20091214131948.05B5728ED61@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libisofs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From pkgdb at fedoraproject.org  Mon Dec 14 13:19:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:19:49 +0000
Subject: [pkgdb] libisofs: npajkovs has requested commit
Message-ID: <20091214131950.56C0D28ED9E@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libisofs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From pkgdb at fedoraproject.org  Mon Dec 14 13:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:19:59 +0000
Subject: [pkgdb] libisofs: npajkovs has given up watchbugzilla
Message-ID: <20091214132001.0253128ED3B@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchbugzilla acl on libisofs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From pkgdb at fedoraproject.org  Mon Dec 14 13:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:20:04 +0000
Subject: [pkgdb] libisofs: npajkovs has given up watchcommits
Message-ID: <20091214132006.6D6C228EDA6@bastion3.fedora.phx2.redhat.com>

npajkovs has given up the watchcommits acl on libisofs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From pkgdb at fedoraproject.org  Mon Dec 14 13:20:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:20:12 +0000
Subject: [pkgdb] libisofs: npajkovs has requested commit
Message-ID: <20091214132015.0CE4228ED8A@bastion3.fedora.phx2.redhat.com>

npajkovs has requested the commit acl on libisofs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libisofs



From tmraz at fedoraproject.org  Mon Dec 14 13:21:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 14 Dec 2009 13:21:23 +0000 (UTC)
Subject: rpms/authconfig/devel authconfig.spec,1.112,1.113
Message-ID: <20091214132123.AD4BA11C00EB@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18043

Modified Files:
	authconfig.spec 
Log Message:
* Mon Dec 14 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-2
- should work fine with sssd >= 0.99.1 (#547344)



Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- authconfig.spec	10 Dec 2009 16:12:58 -0000	1.112
+++ authconfig.spec	14 Dec 2009 13:21:23 -0000	1.113
@@ -1,7 +1,7 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
 Version: 6.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -10,7 +10,7 @@ URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
 Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
-Conflicts: nss_ldap < 254, sssd < 1.0.0
+Conflicts: nss_ldap < 254, sssd < 0.99.1
 BuildRequires: glib2-devel, python >= 2.6, python-devel
 BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser
 
@@ -101,6 +101,9 @@ authconfig --update --nostart >/dev/null
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Dec 14 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-2
+- should work fine with sssd >= 0.99.1 (#547344)
+
 * Thu Dec 10 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-1
 - support for SSSD enabling/disabling and basic support for
   SSSD domain setup



From hadess at fedoraproject.org  Mon Dec 14 13:22:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 14 Dec 2009 13:22:16 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-12
	0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch, NONE,
	1.1 0002-Fix-crash-when-obex-client-isn-t-running-already.patch,
	NONE, 1.1 gnome-bluetooth.spec, 1.97, 1.98
Message-ID: <20091214132216.CB3E711C00EB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18336

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch 
	0002-Fix-crash-when-obex-client-isn-t-running-already.patch 
Log Message:
* Mon Dec 14 2009 Bastien Nocera <bnocera at redhat.com> 2.28.4-2
- Add patch to fix possible crasher in bluetooth-sendto (#544881)


0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch:
 bluetooth-agent.c |   64 ++++++++++++++++++++++++++++++++++++++++--------------
 obex-agent.c      |   33 ++++++++++++++++++++-------
 2 files changed, 72 insertions(+), 25 deletions(-)

--- NEW FILE 0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch ---
>From 201b71d13882bf963d41845b88401ce5f90c7a9b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 14 Dec 2009 11:58:54 +0000
Subject: [PATCH 1/2] Fix memory leaks when using dbus_g_method_get_sender()

---
 lib/bluetooth-agent.c |   64 ++++++++++++++++++++++++++++++++++++------------
 lib/obex-agent.c      |   32 ++++++++++++++++++------
 2 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/lib/bluetooth-agent.c b/lib/bluetooth-agent.c
index 00e8dcb..a08eb9c 100644
--- a/lib/bluetooth-agent.c
+++ b/lib/bluetooth-agent.c
@@ -80,14 +80,18 @@ static gboolean bluetooth_agent_request_pin_code(BluetoothAgent *agent,
 			const char *path, DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->pincode_func) {
 		if (priv->adapter != NULL)
@@ -110,14 +114,18 @@ static gboolean bluetooth_agent_request_passkey(BluetoothAgent *agent,
 			const char *path, DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->passkey_func) {
 		if (priv->adapter != NULL)
@@ -141,14 +149,18 @@ static gboolean bluetooth_agent_display_passkey(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->display_func) {
 		if (priv->adapter != NULL)
@@ -172,14 +184,18 @@ static gboolean bluetooth_agent_request_confirmation(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->confirm_func) {
 		if (priv->adapter != NULL)
@@ -203,14 +219,18 @@ static gboolean bluetooth_agent_authorize(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->authorize_func) {
 		if (priv->adapter != NULL)
@@ -233,12 +253,16 @@ static gboolean bluetooth_agent_confirm_mode(BluetoothAgent *agent,
 			const char *mode, DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	dbus_g_method_return(context);
 
@@ -249,13 +273,17 @@ static gboolean bluetooth_agent_cancel(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->cancel_func)
 		result = priv->cancel_func(context, priv->cancel_data);
@@ -267,12 +295,16 @@ static gboolean bluetooth_agent_release(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	g_object_unref(agent);
 
diff --git a/lib/obex-agent.c b/lib/obex-agent.c
index 714dc6a..38b2fde 100644
--- a/lib/obex-agent.c
+++ b/lib/obex-agent.c
@@ -73,13 +73,17 @@ static gboolean obex_agent_request(ObexAgent *agent, const char *path,
 						DBusGMethodInvocation *context)
 {
 	ObexAgentPrivate *priv = OBEX_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->request_func) {
 		DBusGProxy *proxy;
@@ -102,13 +106,17 @@ static gboolean obex_agent_progress(ObexAgent *agent, const char *path,
 			guint64 transferred, DBusGMethodInvocation *context)
 {
 	ObexAgentPrivate *priv = OBEX_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->progress_func) {
 		DBusGProxy *proxy;
@@ -130,13 +138,17 @@ static gboolean obex_agent_complete(ObexAgent *agent, const char *path,
 						DBusGMethodInvocation *context)
 {
 	ObexAgentPrivate *priv = OBEX_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->complete_func) {
 		DBusGProxy *proxy;
@@ -158,13 +170,17 @@ static gboolean obex_agent_release(ObexAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	ObexAgentPrivate *priv = OBEX_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->release_func)
 		result = priv->release_func(context, priv->release_data);
-- 
1.6.5.2


0002-Fix-crash-when-obex-client-isn-t-running-already.patch:
 obex-agent.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE 0002-Fix-crash-when-obex-client-isn-t-running-already.patch ---
>From ed95cf3ab7b4ab65127b014a80b971188a3b02da Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 14 Dec 2009 12:58:31 +0000
Subject: [PATCH 2/2] Fix crash when obex-client isn't running already

When obex-client isn't running yet, we can't get a name owner
for the service. But we'd still get a callback from the service
when trying to use it, and crash trying to compare the sender
with a NULL string.

Instead, set the owner's dbus name if we don't already have one
in obex_agent_request().

See: https://bugzilla.redhat.com/show_bug.cgi?id=544881
---
 lib/obex-agent.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/obex-agent.c b/lib/obex-agent.c
index 38b2fde..276fcb3 100644
--- a/lib/obex-agent.c
+++ b/lib/obex-agent.c
@@ -78,13 +78,19 @@ static gboolean obex_agent_request(ObexAgent *agent, const char *path,
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE) {
+	if (priv->busname == NULL) {
+		/* When we get called the first time, if OBEX_SERVICE
+		 * was not available, we get its name here */
+		priv->busname = sender;
+	} else {
+		if (g_str_equal(sender, priv->busname) == FALSE) {
+			g_free (sender);
+			return FALSE;
+		}
+
 		g_free (sender);
-		return FALSE;
 	}
 
-	g_free (sender);
-
 	if (priv->request_func) {
 		DBusGProxy *proxy;
 
-- 
1.6.5.2



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/gnome-bluetooth.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- gnome-bluetooth.spec	11 Dec 2009 13:01:29 -0000	1.97
+++ gnome-bluetooth.spec	14 Dec 2009 13:22:16 -0000	1.98
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.28.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -34,6 +34,10 @@ Requires:	pulseaudio-module-bluetooth
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=544881
+Patch0:		0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch
+Patch1:		0002-Fix-crash-when-obex-client-isn-t-running-already.patch
+
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
@@ -62,13 +66,13 @@ for writing applications that require a 
 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-desktop-update --disable-icon-update
 
-# FIXME
-# make %{?_smp_mflags}
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -196,6 +200,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Mon Dec 14 2009 Bastien Nocera <bnocera at redhat.com> 2.28.4-2
+- Add patch to fix possible crasher in bluetooth-sendto (#544881)
+
 * Fri Dec 11 2009 Bastien Nocera <bnocera at redhat.com> 2.28.4-1
 - Update to 2.28.4
 



From mclasen at fedoraproject.org  Mon Dec 14 13:31:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 13:31:22 +0000 (UTC)
Subject: rpms/file-roller/F-12 property-get.patch, NONE, 1.1 file-roller.spec,
	1.159, 1.160
Message-ID: <20091214133122.0706F11C00EB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19601

Modified Files:
	file-roller.spec 
Added Files:
	property-get.patch 
Log Message:
Fix a crash


property-get.patch:
 fr-window.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE property-get.patch ---
diff -up file-roller-2.28.1/src/fr-window.c.property-get file-roller-2.28.1/src/fr-window.c
--- file-roller-2.28.1/src/fr-window.c.property-get	2009-12-14 00:59:59.792797354 -0500
+++ file-roller-2.28.1/src/fr-window.c	2009-12-14 01:01:49.141546600 -0500
@@ -4138,13 +4138,14 @@ get_xds_atom_value (GdkDragContext *cont
 	g_return_val_if_fail (context != NULL, NULL);
 	g_return_val_if_fail (context->source_window != NULL, NULL);
 
-	gdk_property_get (context->source_window,
-			  XDS_ATOM, TEXT_ATOM,
-			  0, MAX_XDS_ATOM_VAL_LEN,
-			  FALSE, NULL, NULL, NULL,
-			  (unsigned char **) &ret);
+	if (gdk_property_get (context->source_window,
+			      XDS_ATOM, TEXT_ATOM,
+			      0, MAX_XDS_ATOM_VAL_LEN,
+			      FALSE, NULL, NULL, NULL,
+			      (unsigned char **) &ret))
+		return ret;
 
-	return ret;
+	return NULL;
 }
 
 


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- file-roller.spec	30 Oct 2009 03:32:15 -0000	1.159
+++ file-roller.spec	14 Dec 2009 13:31:21 -0000	1.160
@@ -20,13 +20,15 @@ Source:		http://download.gnome.org/sourc
 # https://bugzilla.gnome.org/show_bug.cgi?id=590606
 Patch0:		sticky-dnd.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604535
+Patch1:         property-get.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libglade2-devel
 BuildRequires: nautilus-devel >= %{nautilus_version}
-BuildRequires: automake autoconf
 BuildRequires: libtool
 BuildRequires: gettext
 BuildRequires: libSM-devel
@@ -55,6 +57,7 @@ such as tar or zip files.
 %prep
 %setup -q
 %patch0 -p1 -b .sticky-dnd
+%patch1 -p1 -b .property-get
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -131,6 +134,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-3
+- Fix a wrong use of gdk_property_get (#538535)
+
 * Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
 - Fix sticky DND
 



From dsommers at fedoraproject.org  Mon Dec 14 13:32:49 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Mon, 14 Dec 2009 13:32:49 +0000 (UTC)
Subject: File python-dmidecode-3.10.8.tar.gz uploaded to lookaside cache by
	dsommers
Message-ID: <20091214133249.87A2728ED5D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-dmidecode:

a2bc1cf271c908478dbecf119649c075  python-dmidecode-3.10.8.tar.gz



From mclasen at fedoraproject.org  Mon Dec 14 13:33:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 13:33:12 +0000 (UTC)
Subject: rpms/file-roller/devel property-get.patch,NONE,1.1
Message-ID: <20091214133312.4C45911C00EB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20069

Added Files:
	property-get.patch 
Log Message:
Add F12 changes


property-get.patch:
 fr-window.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE property-get.patch ---
diff -up file-roller-2.28.1/src/fr-window.c.property-get file-roller-2.28.1/src/fr-window.c
--- file-roller-2.28.1/src/fr-window.c.property-get	2009-12-14 00:59:59.792797354 -0500
+++ file-roller-2.28.1/src/fr-window.c	2009-12-14 01:01:49.141546600 -0500
@@ -4138,13 +4138,14 @@ get_xds_atom_value (GdkDragContext *cont
 	g_return_val_if_fail (context != NULL, NULL);
 	g_return_val_if_fail (context->source_window != NULL, NULL);
 
-	gdk_property_get (context->source_window,
-			  XDS_ATOM, TEXT_ATOM,
-			  0, MAX_XDS_ATOM_VAL_LEN,
-			  FALSE, NULL, NULL, NULL,
-			  (unsigned char **) &ret);
+	if (gdk_property_get (context->source_window,
+			      XDS_ATOM, TEXT_ATOM,
+			      0, MAX_XDS_ATOM_VAL_LEN,
+			      FALSE, NULL, NULL, NULL,
+			      (unsigned char **) &ret))
+		return ret;
 
-	return ret;
+	return NULL;
 }
 
 



From dsommers at fedoraproject.org  Mon Dec 14 13:34:43 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Mon, 14 Dec 2009 13:34:43 +0000 (UTC)
Subject: rpms/python-dmidecode/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-dmidecode.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091214133443.B44E311C00EB@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20417/devel

Modified Files:
	.cvsignore import.log python-dmidecode.spec sources 
Log Message:
Updated python-dmidecode to 3.10.8, which adds better unit testing, also during build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Dec 2009 06:59:51 -0000	1.2
+++ .cvsignore	14 Dec 2009 13:34:43 -0000	1.3
@@ -1 +1 @@
-python-dmidecode-3.10.7.tar.gz
+python-dmidecode-3.10.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Dec 2009 06:59:51 -0000	1.1
+++ import.log	14 Dec 2009 13:34:43 -0000	1.2
@@ -1 +1,2 @@
 python-dmidecode-3_10_7-3_fc11:HEAD:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737152
+python-dmidecode-3_10_8-1_fc11:HEAD:python-dmidecode-3.10.8-1.fc11.src.rpm:1260797632


Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/python-dmidecode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-dmidecode.spec	2 Dec 2009 06:59:51 -0000	1.1
+++ python-dmidecode.spec	14 Dec 2009 13:34:43 -0000	1.2
@@ -3,8 +3,8 @@
 
 Summary: Python module to access DMI data
 Name: python-dmidecode
-Version: 3.10.7
-Release: 3%{?dist}
+Version: 3.10.8
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://projects.autonomy.net.au/python-dmidecode/
@@ -25,6 +25,9 @@ as python data structures or as XML data
 
 %build
 make build
+cd unit-tests
+make
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Dec 2009 06:59:51 -0000	1.2
+++ sources	14 Dec 2009 13:34:43 -0000	1.3
@@ -1 +1 @@
-22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz
+a2bc1cf271c908478dbecf119649c075  python-dmidecode-3.10.8.tar.gz



From mclasen at fedoraproject.org  Mon Dec 14 13:35:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 13:35:37 +0000 (UTC)
Subject: rpms/file-roller/F-12 file-roller.spec,1.160,1.161
Message-ID: <20091214133537.9BD4E11C00EB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20745

Modified Files:
	file-roller.spec 
Log Message:
 bump rev



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- file-roller.spec	14 Dec 2009 13:31:21 -0000	1.160
+++ file-roller.spec	14 Dec 2009 13:35:37 -0000	1.161
@@ -11,7 +11,7 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.28.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/



From mclasen at fedoraproject.org  Mon Dec 14 13:40:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 13:40:22 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.163,1.164
Message-ID: <20091214134022.5F15211C00EB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21457

Modified Files:
	file-roller.spec 
Log Message:
copy F12 changes



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- file-roller.spec	2 Dec 2009 15:35:08 -0000	1.163
+++ file-roller.spec	14 Dec 2009 13:40:22 -0000	1.164
@@ -11,7 +11,7 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.29.2
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -44,12 +44,16 @@ Requires: GConf2
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604535
+Patch0: property-get.patch
+
 %description
 File Roller is an application for creating and viewing archives files,
 such as tar or zip files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .property-get
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -126,6 +130,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> 2.29.2-3
+- Fix a wrong use of gdk_property_get (#538535)
+
 * Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> 2.29.2-2
 - Drop unneded BRs
 



From pkgdb at fedoraproject.org  Mon Dec 14 13:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:45:16 +0000
Subject: [pkgdb] ptouch-driver: jpopelka has given up watchbugzilla
Message-ID: <20091214134517.7B0EE28EDAC@bastion3.fedora.phx2.redhat.com>

jpopelka has given up the watchbugzilla acl on ptouch-driver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptouch-driver



From hadess at fedoraproject.org  Mon Dec 14 13:45:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 14 Dec 2009 13:45:20 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel
	0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch, NONE,
	1.1 0002-Fix-crash-when-obex-client-isn-t-running-already.patch,
	NONE, 1.1 gnome-bluetooth.spec, 1.102, 1.103
Message-ID: <20091214134520.9214E11C00EB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22291

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch 
	0002-Fix-crash-when-obex-client-isn-t-running-already.patch 
Log Message:
* Mon Dec 14 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-2
- Add patch to fix possible crasher in bluetooth-sendto (#544881)


0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch:
 bluetooth-agent.c |   64 ++++++++++++++++++++++++++++++++++++++++--------------
 obex-agent.c      |   33 ++++++++++++++++++++-------
 2 files changed, 72 insertions(+), 25 deletions(-)

--- NEW FILE 0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch ---
>From 201b71d13882bf963d41845b88401ce5f90c7a9b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 14 Dec 2009 11:58:54 +0000
Subject: [PATCH 1/2] Fix memory leaks when using dbus_g_method_get_sender()

---
 lib/bluetooth-agent.c |   64 ++++++++++++++++++++++++++++++++++++------------
 lib/obex-agent.c      |   32 ++++++++++++++++++------
 2 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/lib/bluetooth-agent.c b/lib/bluetooth-agent.c
index 00e8dcb..a08eb9c 100644
--- a/lib/bluetooth-agent.c
+++ b/lib/bluetooth-agent.c
@@ -80,14 +80,18 @@ static gboolean bluetooth_agent_request_pin_code(BluetoothAgent *agent,
 			const char *path, DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->pincode_func) {
 		if (priv->adapter != NULL)
@@ -110,14 +114,18 @@ static gboolean bluetooth_agent_request_passkey(BluetoothAgent *agent,
 			const char *path, DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->passkey_func) {
 		if (priv->adapter != NULL)
@@ -141,14 +149,18 @@ static gboolean bluetooth_agent_display_passkey(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->display_func) {
 		if (priv->adapter != NULL)
@@ -172,14 +184,18 @@ static gboolean bluetooth_agent_request_confirmation(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->confirm_func) {
 		if (priv->adapter != NULL)
@@ -203,14 +219,18 @@ static gboolean bluetooth_agent_authorize(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	DBusGProxy *device;
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->authorize_func) {
 		if (priv->adapter != NULL)
@@ -233,12 +253,16 @@ static gboolean bluetooth_agent_confirm_mode(BluetoothAgent *agent,
 			const char *mode, DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	dbus_g_method_return(context);
 
@@ -249,13 +273,17 @@ static gboolean bluetooth_agent_cancel(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->cancel_func)
 		result = priv->cancel_func(context, priv->cancel_data);
@@ -267,12 +295,16 @@ static gboolean bluetooth_agent_release(BluetoothAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	g_object_unref(agent);
 
diff --git a/lib/obex-agent.c b/lib/obex-agent.c
index 714dc6a..38b2fde 100644
--- a/lib/obex-agent.c
+++ b/lib/obex-agent.c
@@ -73,13 +73,17 @@ static gboolean obex_agent_request(ObexAgent *agent, const char *path,
 						DBusGMethodInvocation *context)
 {
 	ObexAgentPrivate *priv = OBEX_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->request_func) {
 		DBusGProxy *proxy;
@@ -102,13 +106,17 @@ static gboolean obex_agent_progress(ObexAgent *agent, const char *path,
 			guint64 transferred, DBusGMethodInvocation *context)
 {
 	ObexAgentPrivate *priv = OBEX_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->progress_func) {
 		DBusGProxy *proxy;
@@ -130,13 +138,17 @@ static gboolean obex_agent_complete(ObexAgent *agent, const char *path,
 						DBusGMethodInvocation *context)
 {
 	ObexAgentPrivate *priv = OBEX_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->complete_func) {
 		DBusGProxy *proxy;
@@ -158,13 +170,17 @@ static gboolean obex_agent_release(ObexAgent *agent,
 						DBusGMethodInvocation *context)
 {
 	ObexAgentPrivate *priv = OBEX_AGENT_GET_PRIVATE(agent);
-	const char *sender = dbus_g_method_get_sender(context);
+	char *sender = dbus_g_method_get_sender(context);
 	gboolean result = FALSE;
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE)
+	if (g_str_equal(sender, priv->busname) == FALSE) {
+		g_free (sender);
 		return FALSE;
+	}
+
+	g_free (sender);
 
 	if (priv->release_func)
 		result = priv->release_func(context, priv->release_data);
-- 
1.6.5.2


0002-Fix-crash-when-obex-client-isn-t-running-already.patch:
 obex-agent.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE 0002-Fix-crash-when-obex-client-isn-t-running-already.patch ---
>From ed95cf3ab7b4ab65127b014a80b971188a3b02da Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 14 Dec 2009 12:58:31 +0000
Subject: [PATCH 2/2] Fix crash when obex-client isn't running already

When obex-client isn't running yet, we can't get a name owner
for the service. But we'd still get a callback from the service
when trying to use it, and crash trying to compare the sender
with a NULL string.

Instead, set the owner's dbus name if we don't already have one
in obex_agent_request().

See: https://bugzilla.redhat.com/show_bug.cgi?id=544881
---
 lib/obex-agent.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/obex-agent.c b/lib/obex-agent.c
index 38b2fde..276fcb3 100644
--- a/lib/obex-agent.c
+++ b/lib/obex-agent.c
@@ -78,13 +78,19 @@ static gboolean obex_agent_request(ObexAgent *agent, const char *path,
 
 	DBG("agent %p sender %s", agent, sender);
 
-	if (g_str_equal(sender, priv->busname) == FALSE) {
+	if (priv->busname == NULL) {
+		/* When we get called the first time, if OBEX_SERVICE
+		 * was not available, we get its name here */
+		priv->busname = sender;
+	} else {
+		if (g_str_equal(sender, priv->busname) == FALSE) {
+			g_free (sender);
+			return FALSE;
+		}
+
 		g_free (sender);
-		return FALSE;
 	}
 
-	g_free (sender);
-
 	if (priv->request_func) {
 		DBusGProxy *proxy;
 
-- 
1.6.5.2



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gnome-bluetooth.spec	30 Nov 2009 19:18:05 -0000	1.102
+++ gnome-bluetooth.spec	14 Dec 2009 13:45:20 -0000	1.103
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.29.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -37,6 +37,10 @@ Requires:	pulseaudio-module-bluetooth
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=544881
+Patch0:		0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch
+Patch1:		0002-Fix-crash-when-obex-client-isn-t-running-already.patch
+
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
@@ -74,6 +78,8 @@ This package contains the Moblin user in
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-desktop-update --disable-icon-update --enable-introspection=no
@@ -215,6 +221,9 @@ fi
 %{_bindir}/bluetooth-panel
 
 %changelog
+* Mon Dec 14 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-2
+- Add patch to fix possible crasher in bluetooth-sendto (#544881)
+
 * Mon Nov 30 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From pkgdb at fedoraproject.org  Mon Dec 14 13:45:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:45:20 +0000
Subject: [pkgdb] ptouch-driver: jpopelka has given up watchcommits
Message-ID: <20091214134521.65FF728EDAE@bastion3.fedora.phx2.redhat.com>

jpopelka has given up the watchcommits acl on ptouch-driver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptouch-driver



From pkgdb at fedoraproject.org  Mon Dec 14 13:45:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:45:27 +0000
Subject: [pkgdb] ptouch-driver: jpopelka has requested commit
Message-ID: <20091214134529.44CF628EDA6@bastion3.fedora.phx2.redhat.com>

jpopelka has requested the commit acl on ptouch-driver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptouch-driver



From pkgdb at fedoraproject.org  Mon Dec 14 13:45:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:45:39 +0000
Subject: [pkgdb] ptouch-driver: jpopelka has given up watchbugzilla
Message-ID: <20091214134540.2E5FE28EDAE@bastion3.fedora.phx2.redhat.com>

jpopelka has given up the watchbugzilla acl on ptouch-driver (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptouch-driver



From pkgdb at fedoraproject.org  Mon Dec 14 13:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:45:45 +0000
Subject: [pkgdb] ptouch-driver: jpopelka has given up watchcommits
Message-ID: <20091214134547.415E428ED91@bastion3.fedora.phx2.redhat.com>

jpopelka has given up the watchcommits acl on ptouch-driver (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptouch-driver



From pkgdb at fedoraproject.org  Mon Dec 14 13:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:45:49 +0000
Subject: [pkgdb] ptouch-driver: jpopelka has requested commit
Message-ID: <20091214134549.87FE528EDAA@bastion3.fedora.phx2.redhat.com>

jpopelka has requested the commit acl on ptouch-driver (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ptouch-driver



From pkgdb at fedoraproject.org  Mon Dec 14 13:46:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:46:30 +0000
Subject: [pkgdb] python-feedparser: jpopelka has given up watchbugzilla
Message-ID: <20091214134631.8F1D928ED91@bastion3.fedora.phx2.redhat.com>

jpopelka has given up the watchbugzilla acl on python-feedparser (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Mon Dec 14 13:46:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:46:34 +0000
Subject: [pkgdb] python-feedparser: jpopelka has given up watchcommits
Message-ID: <20091214134635.1861728EDA5@bastion3.fedora.phx2.redhat.com>

jpopelka has given up the watchcommits acl on python-feedparser (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Mon Dec 14 13:46:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:46:38 +0000
Subject: [pkgdb] python-feedparser: jpopelka has requested commit
Message-ID: <20091214134638.BD1E828ED91@bastion3.fedora.phx2.redhat.com>

jpopelka has requested the commit acl on python-feedparser (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Mon Dec 14 13:46:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:46:46 +0000
Subject: [pkgdb] python-feedparser: jpopelka has given up watchbugzilla
Message-ID: <20091214134647.2C7C828ED8C@bastion3.fedora.phx2.redhat.com>

jpopelka has given up the watchbugzilla acl on python-feedparser (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Mon Dec 14 13:46:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:46:49 +0000
Subject: [pkgdb] python-feedparser: jpopelka has given up watchcommits
Message-ID: <20091214134649.90E6C28ED91@bastion3.fedora.phx2.redhat.com>

jpopelka has given up the watchcommits acl on python-feedparser (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Mon Dec 14 13:46:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:46:54 +0000
Subject: [pkgdb] python-feedparser: jpopelka has requested commit
Message-ID: <20091214134655.3CB5B28ED8C@bastion3.fedora.phx2.redhat.com>

jpopelka has requested the commit acl on python-feedparser (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Mon Dec 14 13:48:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:48:06 +0000
Subject: [pkgdb] mercurial: jzeleny has given up watchcommits
Message-ID: <20091214134807.6F80D28EDB5@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on mercurial (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:48:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:48:14 +0000
Subject: [pkgdb] mercurial: jzeleny has given up watchbugzilla
Message-ID: <20091214134815.6E5D928EDA6@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on mercurial (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:48:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:48:25 +0000
Subject: [pkgdb] mercurial: jzeleny has requested commit
Message-ID: <20091214134828.0189F28EDAA@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on mercurial (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:48:29 +0000
Subject: [pkgdb] mercurial: jzeleny has requested approveacls
Message-ID: <20091214134830.8D6CA28EDB3@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on mercurial (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:48:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:48:59 +0000
Subject: [pkgdb] mercurial: jzeleny has given up watchbugzilla
Message-ID: <20091214134859.D618A28EDA6@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on mercurial (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:49:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:49:01 +0000
Subject: [pkgdb] mercurial: jzeleny has requested approveacls
Message-ID: <20091214134902.2A2F328EDA5@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on mercurial (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:49:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:49:02 +0000
Subject: [pkgdb] mercurial: jzeleny has given up watchcommits
Message-ID: <20091214134904.09FAC28EDC5@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on mercurial (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:49:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:49:01 +0000
Subject: [pkgdb] mercurial: jzeleny has requested commit
Message-ID: <20091214134902.93B7228EDAA@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on mercurial (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:49:07 +0000
Subject: [pkgdb] mercurial: jzeleny has given up watchcommits
Message-ID: <20091214134909.5564A28EDC1@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on mercurial (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:49:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:49:10 +0000
Subject: [pkgdb] mercurial: jzeleny has requested approveacls
Message-ID: <20091214134912.23FD828EDA6@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on mercurial (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:49:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:49:13 +0000
Subject: [pkgdb] mercurial: jzeleny has given up watchbugzilla
Message-ID: <20091214134916.2A80E28EDB0@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on mercurial (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:49:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:49:11 +0000
Subject: [pkgdb] mercurial: jzeleny has requested commit
Message-ID: <20091214134914.34E9C28EDC6@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on mercurial (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mercurial



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:02 +0000
Subject: [pkgdb] bzr: jzeleny has given up watchcommits
Message-ID: <20091214135003.6316928ED91@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on bzr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:07 +0000
Subject: [pkgdb] bzr: jzeleny has requested commit
Message-ID: <20091214135009.2AAB428EDA5@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on bzr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:08 +0000
Subject: [pkgdb] bzr: jzeleny has requested approveacls
Message-ID: <20091214135010.5915D28EDA0@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on bzr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:14 +0000
Subject: [pkgdb] bzr: jzeleny has given up watchbugzilla
Message-ID: <20091214135015.3639C28EDA6@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on bzr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:25 +0000
Subject: [pkgdb] bzr: jzeleny has given up watchcommits
Message-ID: <20091214135026.B9F1228EDAA@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on bzr (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:27 +0000
Subject: [pkgdb] bzr: jzeleny has requested commit
Message-ID: <20091214135028.7FAC628EDAF@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on bzr (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:29 +0000
Subject: [pkgdb] bzr: jzeleny has requested approveacls
Message-ID: <20091214135032.21B5428EDBA@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on bzr (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:35 +0000
Subject: [pkgdb] bzr: jzeleny has given up watchbugzilla
Message-ID: <20091214135036.9728228EDA0@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on bzr (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:42 +0000
Subject: [pkgdb] bzr: jzeleny has given up watchcommits
Message-ID: <20091214135043.AD1A528EDB3@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on bzr (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:50 +0000
Subject: [pkgdb] bzr: jzeleny has given up watchbugzilla
Message-ID: <20091214135051.8584428EDAE@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on bzr (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:55 +0000
Subject: [pkgdb] bzr: jzeleny has requested approveacls
Message-ID: <20091214135056.B437228EDAF@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on bzr (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:50:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:50:58 +0000
Subject: [pkgdb] bzr: jzeleny has requested commit
Message-ID: <20091214135101.15ECA28ED91@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on bzr (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bzr



From pkgdb at fedoraproject.org  Mon Dec 14 13:51:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:51:38 +0000
Subject: [pkgdb] tla: jzeleny has given up watchbugzilla
Message-ID: <20091214135139.D6A1C28EDC2@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on tla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:51:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:51:41 +0000
Subject: [pkgdb] tla: jzeleny has given up watchcommits
Message-ID: <20091214135142.E4F5828EDAE@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on tla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:51:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:51:45 +0000
Subject: [pkgdb] tla: jzeleny has requested commit
Message-ID: <20091214135146.9BBAB28EDC2@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on tla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:51:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:51:45 +0000
Subject: [pkgdb] tla: jzeleny has requested approveacls
Message-ID: <20091214135147.BE09028EDC9@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on tla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:51:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:51:56 +0000
Subject: [pkgdb] tla: jzeleny has requested commit
Message-ID: <20091214135157.0FD5128EDAC@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on tla (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:51:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:51:58 +0000
Subject: [pkgdb] tla: jzeleny has requested approveacls
Message-ID: <20091214135159.7723A28EDC9@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on tla (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:52:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:52:02 +0000
Subject: [pkgdb] tla: jzeleny has given up watchcommits
Message-ID: <20091214135203.1680C28EDAA@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on tla (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:52:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:52:07 +0000
Subject: [pkgdb] tla: jzeleny has given up watchbugzilla
Message-ID: <20091214135208.E6B4028EDAF@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on tla (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:52:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:52:14 +0000
Subject: [pkgdb] tla: jzeleny has given up watchbugzilla
Message-ID: <20091214135215.ADC2E28EDC1@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchbugzilla acl on tla (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:52:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:52:21 +0000
Subject: [pkgdb] tla: jzeleny has requested approveacls
Message-ID: <20091214135222.B913628EDC9@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the approveacls acl on tla (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:52:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:52:15 +0000
Subject: [pkgdb] tla: jzeleny has given up watchcommits
Message-ID: <20091214135216.2E7A628EDC2@bastion3.fedora.phx2.redhat.com>

jzeleny has given up the watchcommits acl on tla (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From pkgdb at fedoraproject.org  Mon Dec 14 13:52:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 13:52:18 +0000
Subject: [pkgdb] tla: jzeleny has requested commit
Message-ID: <20091214135219.1409D28EDAC@bastion3.fedora.phx2.redhat.com>

jzeleny has requested the commit acl on tla (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tla



From dsd at fedoraproject.org  Mon Dec 14 13:53:54 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 14 Dec 2009 13:53:54 +0000 (UTC)
Subject: File dracut-modules-olpc-0.3.2.tar.bz2 uploaded to lookaside cache
	by dsd
Message-ID: <20091214135354.B2D0228ED7E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for dracut-modules-olpc:

1296fa897162249cad99cc006855ea92  dracut-modules-olpc-0.3.2.tar.bz2



From mclasen at fedoraproject.org  Mon Dec 14 13:54:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 13:54:33 +0000 (UTC)
Subject: rpms/seahorse/F-12 property-get.patch, NONE, 1.1 seahorse.spec, 1.83,
	1.84
Message-ID: <20091214135433.7ECB911C00EB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23719

Modified Files:
	seahorse.spec 
Added Files:
	property-get.patch 
Log Message:
Fix a wrong use of gdk_property_get


property-get.patch:
 seahorse-key-manager-store.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE property-get.patch ---
diff -up seahorse-2.28.1/src/seahorse-key-manager-store.c.property-get seahorse-2.28.1/src/seahorse-key-manager-store.c
--- seahorse-2.28.1/src/seahorse-key-manager-store.c.property-get	2009-12-14 08:48:11.767890524 -0500
+++ seahorse-2.28.1/src/seahorse-key-manager-store.c	2009-12-14 08:48:46.853113546 -0500
@@ -407,13 +407,14 @@ xds_get_atom_value (GdkDragContext *cont
 	g_return_val_if_fail (context != NULL, NULL);
 	g_return_val_if_fail (context->source_window != NULL, NULL);
 
-	gdk_property_get (context->source_window,
-			  XDS_ATOM, TEXT_ATOM,
-			  0, MAX_XDS_ATOM_VAL_LEN,
-			  FALSE, NULL, NULL, NULL,
-			  (unsigned char **) &ret);
+	if (gdk_property_get (context->source_window,
+			      XDS_ATOM, TEXT_ATOM,
+			      0, MAX_XDS_ATOM_VAL_LEN,
+			      FALSE, NULL, NULL, NULL,
+			      (unsigned char **) &ret);
+		return ret;
 
-	return ret;
+	return NULL;
 }
 
 static gboolean


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/F-12/seahorse.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- seahorse.spec	19 Oct 2009 08:58:37 -0000	1.83
+++ seahorse.spec	14 Dec 2009 13:54:33 -0000	1.84
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.28.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -40,6 +40,9 @@ Requires:       pinentry-gtk
 
 Obsoletes: gnome-keyring-manager
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604541
+Patch0: property-get.patch
+
 %description
 Seahorse is a graphical interface for managing and using encryption keys.
 It also integrates with nautilus, gedit and other places for encryption
@@ -59,6 +62,7 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
+%patch0 -p1 -b .property-get
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -164,6 +168,9 @@ fi
 %{_datadir}/gtk-doc/html/libseahorse
 
 %changelog
+* Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
+- Fix a wrong use of gdk_property_get that can lead to crashes
+
 * Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From dsd at fedoraproject.org  Mon Dec 14 13:55:00 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 14 Dec 2009 13:55:00 +0000 (UTC)
Subject: rpms/dracut-modules-olpc/devel .cvsignore, 1.8,
	1.9 dracut-modules-olpc.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20091214135500.1DB5711C00EB@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/dracut-modules-olpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23892

Modified Files:
	.cvsignore dracut-modules-olpc.spec sources 
Log Message:
v0.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Dec 2009 09:39:57 -0000	1.8
+++ .cvsignore	14 Dec 2009 13:54:59 -0000	1.9
@@ -1 +1 @@
-dracut-modules-olpc-0.3.1.tar.bz2
+dracut-modules-olpc-0.3.2.tar.bz2


Index: dracut-modules-olpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/devel/dracut-modules-olpc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dracut-modules-olpc.spec	7 Dec 2009 09:39:57 -0000	1.10
+++ dracut-modules-olpc.spec	14 Dec 2009 13:55:00 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		dracut-modules-olpc
-Version:	0.3.1
+Version:	0.3.2
 Release:	1%{?dist}
 Summary:	OLPC modules for dracut initramfs
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Daniel Drake <dsd at laptop.org> - 0.3.2-1
+- New version to fix activation code
+
 * Mon Dec 7 2009 Daniel Drake <dsd at laptop.org> - 0.3.1-1
 - New version to fix booting alternate image
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	7 Dec 2009 09:39:57 -0000	1.10
+++ sources	14 Dec 2009 13:55:00 -0000	1.11
@@ -1 +1 @@
-e818ad8a497e05821fe489b2e41e441a  dracut-modules-olpc-0.3.1.tar.bz2
+1296fa897162249cad99cc006855ea92  dracut-modules-olpc-0.3.2.tar.bz2



From mclasen at fedoraproject.org  Mon Dec 14 13:57:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 13:57:29 +0000 (UTC)
Subject: rpms/seahorse/devel property-get.patch, NONE, 1.1 seahorse.spec,
	1.85, 1.86
Message-ID: <20091214135729.47A0211C00EB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24314

Modified Files:
	seahorse.spec 
Added Files:
	property-get.patch 
Log Message:
Fix a wrong use of gdk_property_get


property-get.patch:
 seahorse-key-manager-store.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE property-get.patch ---
diff -up seahorse-2.28.1/src/seahorse-key-manager-store.c.property-get seahorse-2.28.1/src/seahorse-key-manager-store.c
--- seahorse-2.28.1/src/seahorse-key-manager-store.c.property-get	2009-12-14 08:48:11.767890524 -0500
+++ seahorse-2.28.1/src/seahorse-key-manager-store.c	2009-12-14 08:48:46.853113546 -0500
@@ -407,13 +407,14 @@ xds_get_atom_value (GdkDragContext *cont
 	g_return_val_if_fail (context != NULL, NULL);
 	g_return_val_if_fail (context->source_window != NULL, NULL);
 
-	gdk_property_get (context->source_window,
-			  XDS_ATOM, TEXT_ATOM,
-			  0, MAX_XDS_ATOM_VAL_LEN,
-			  FALSE, NULL, NULL, NULL,
-			  (unsigned char **) &ret);
+	if (gdk_property_get (context->source_window,
+			      XDS_ATOM, TEXT_ATOM,
+			      0, MAX_XDS_ATOM_VAL_LEN,
+			      FALSE, NULL, NULL, NULL,
+			      (unsigned char **) &ret);
+		return ret;
 
-	return ret;
+	return NULL;
 }
 
 static gboolean


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- seahorse.spec	30 Nov 2009 16:41:36 -0000	1.85
+++ seahorse.spec	14 Dec 2009 13:57:29 -0000	1.86
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.29.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -40,6 +40,9 @@ Requires:       pinentry-gtk
 
 Obsoletes: gnome-keyring-manager
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604541 
+Patch0: property-get.patch
+
 %description
 Seahorse is a graphical interface for managing and using encryption keys.
 It also integrates with nautilus, gedit and other places for encryption
@@ -59,6 +62,7 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
+%patch0 -p1 -b .property-get
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -164,6 +168,9 @@ fi
 %{_datadir}/gtk-doc/html/libseahorse
 
 %changelog
+* Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> 2.29.3-2
+- Fix a wrong use of gdk_property_get that can lead to crashes
+
 * Mon Nov 30 2009 Tomas Bzatek <tbzatek at redhat.com> 2.29.3-1
 - Update to 2.29.3
 



From pkgdb at fedoraproject.org  Mon Dec 14 14:03:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:03:36 +0000
Subject: [pkgdb] opencv: kklic has requested commit
Message-ID: <20091214140340.1399C28EDBB@bastion3.fedora.phx2.redhat.com>

kklic has requested the commit acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:03:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:03:34 +0000
Subject: [pkgdb] opencv: kklic has given up watchcommits
Message-ID: <20091214140338.A9AD328EDDD@bastion3.fedora.phx2.redhat.com>

kklic has given up the watchcommits acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:03:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:03:39 +0000
Subject: [pkgdb] opencv: kklic has given up watchbugzilla
Message-ID: <20091214140343.78A0D28EDAE@bastion3.fedora.phx2.redhat.com>

kklic has given up the watchbugzilla acl on opencv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:03:48 +0000
Subject: [pkgdb] opencv: kklic has given up watchcommits
Message-ID: <20091214140350.15EC628EDAE@bastion3.fedora.phx2.redhat.com>

kklic has given up the watchcommits acl on opencv (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:03:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:03:52 +0000
Subject: [pkgdb] opencv: kklic has given up watchbugzilla
Message-ID: <20091214140356.A744B28EDC0@bastion3.fedora.phx2.redhat.com>

kklic has given up the watchbugzilla acl on opencv (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:03:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:03:52 +0000
Subject: [pkgdb] opencv: kklic has requested commit
Message-ID: <20091214140355.8037728EDAC@bastion3.fedora.phx2.redhat.com>

kklic has requested the commit acl on opencv (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:03:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:03:57 +0000
Subject: [pkgdb] opencv: kklic has given up watchcommits
Message-ID: <20091214140359.6C86F28EDC0@bastion3.fedora.phx2.redhat.com>

kklic has given up the watchcommits acl on opencv (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:04:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:04:00 +0000
Subject: [pkgdb] opencv: kklic has requested commit
Message-ID: <20091214140403.E55CC28EDA9@bastion3.fedora.phx2.redhat.com>

kklic has requested the commit acl on opencv (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:04:15 +0000
Subject: [pkgdb] opencv: kklic has given up watchbugzilla
Message-ID: <20091214140416.CDFB728EDB5@bastion3.fedora.phx2.redhat.com>

kklic has given up the watchbugzilla acl on opencv (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From dsommers at fedoraproject.org  Mon Dec 14 14:16:10 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Mon, 14 Dec 2009 14:16:10 +0000 (UTC)
Subject: rpms/python-dmidecode/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-dmidecode.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091214141610.E129A11C00EB@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27133/F-11

Modified Files:
	.cvsignore import.log python-dmidecode.spec sources 
Log Message:
Updated to latest upstream release, 3.10.8 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Dec 2009 07:07:57 -0000	1.2
+++ .cvsignore	14 Dec 2009 14:16:10 -0000	1.3
@@ -1 +1 @@
-python-dmidecode-3.10.7.tar.gz
+python-dmidecode-3.10.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Dec 2009 07:07:57 -0000	1.1
+++ import.log	14 Dec 2009 14:16:10 -0000	1.2
@@ -1 +1,2 @@
 python-dmidecode-3_10_7-3_fc11:F-11:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737645
+python-dmidecode-3_10_8-1_fc11:F-11:python-dmidecode-3.10.8-1.fc11.src.rpm:1260800116


Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/python-dmidecode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-dmidecode.spec	2 Dec 2009 07:07:57 -0000	1.1
+++ python-dmidecode.spec	14 Dec 2009 14:16:10 -0000	1.2
@@ -3,8 +3,8 @@
 
 Summary: Python module to access DMI data
 Name: python-dmidecode
-Version: 3.10.7
-Release: 3%{?dist}
+Version: 3.10.8
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://projects.autonomy.net.au/python-dmidecode/
@@ -25,6 +25,9 @@ as python data structures or as XML data
 
 %build
 make build
+cd unit-tests
+make
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Dec 2009 07:07:57 -0000	1.2
+++ sources	14 Dec 2009 14:16:10 -0000	1.3
@@ -1 +1 @@
-22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz
+a2bc1cf271c908478dbecf119649c075  python-dmidecode-3.10.8.tar.gz



From dsommers at fedoraproject.org  Mon Dec 14 14:17:45 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Mon, 14 Dec 2009 14:17:45 +0000 (UTC)
Subject: rpms/python-dmidecode/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-dmidecode.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091214141745.40B7511C00EB@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27547/F-12

Modified Files:
	.cvsignore import.log python-dmidecode.spec sources 
Log Message:
Updated to latest upstream release, 3.10.8 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Dec 2009 07:09:03 -0000	1.2
+++ .cvsignore	14 Dec 2009 14:17:45 -0000	1.3
@@ -1 +1 @@
-python-dmidecode-3.10.7.tar.gz
+python-dmidecode-3.10.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Dec 2009 07:09:04 -0000	1.1
+++ import.log	14 Dec 2009 14:17:45 -0000	1.2
@@ -1 +1,2 @@
 python-dmidecode-3_10_7-3_fc11:F-12:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737718
+python-dmidecode-3_10_8-1_fc11:F-12:python-dmidecode-3.10.8-1.fc11.src.rpm:1260800218


Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/python-dmidecode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-dmidecode.spec	2 Dec 2009 07:09:04 -0000	1.1
+++ python-dmidecode.spec	14 Dec 2009 14:17:45 -0000	1.2
@@ -3,8 +3,8 @@
 
 Summary: Python module to access DMI data
 Name: python-dmidecode
-Version: 3.10.7
-Release: 3%{?dist}
+Version: 3.10.8
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://projects.autonomy.net.au/python-dmidecode/
@@ -25,6 +25,9 @@ as python data structures or as XML data
 
 %build
 make build
+cd unit-tests
+make
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Dec 2009 07:09:04 -0000	1.2
+++ sources	14 Dec 2009 14:17:45 -0000	1.3
@@ -1 +1 @@
-22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz
+a2bc1cf271c908478dbecf119649c075  python-dmidecode-3.10.8.tar.gz



From rdieter at fedoraproject.org  Mon Dec 14 14:24:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 14:24:14 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec, 1.154, 1.155 kuser.pam, 1.1,
	NONE kuser.pamd, 1.7, NONE
Message-ID: <20091214142414.E373C11C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28688

Modified Files:
	kdeadmin.spec 
Removed Files:
	kuser.pam kuser.pamd 
Log Message:
* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
- Repositioning the KDE Brand (#547361)
- omit kpackage
- drop old/unused kuser consolehelper files



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- kdeadmin.spec	3 Dec 2009 23:13:55 -0000	1.154
+++ kdeadmin.spec	14 Dec 2009 14:24:14 -0000	1.155
@@ -1,13 +1,14 @@
 %if 0%{?fedora}
 %define system_config_printer_kde 1
-%define include_kpackage 1
 %endif
+## define to include kpackage
+#define kpackage 1
 
 Name:           kdeadmin
-Summary:        K Desktop Environment - Administrative tools
+Summary:        KDE Administrative tools
 Epoch:          7
 Version:        4.3.80
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -15,9 +16,6 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source1:        kuser.pam
-Source2:        kuser.pamd
-
 # FIXME/TODO: upstream this -- Rex
 Patch0:         kdeadmin-4.2.85-printing.patch
 
@@ -30,6 +28,11 @@ BuildRequires:  python-devel
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
+%if ! 0%{?kpackage}
+Obsoletes: kdeadmin-kpackage < %{epoch}:%{version}-%{release}
+%endif
+
+
 %if ! 0%{?system_config_printer_kde}
 Obsoletes: system-config-printer-kde < %{epoch}:%{version}-%{release}
 %endif
@@ -73,7 +76,7 @@ a CUPS print server.
 sed -i -e 's:macro_optional_add_subdirectory(system-config-printer-kde):#macro_optional_add_subdirectory(system-config-printer-kde):g' CMakeLists.txt
 %endif
 
-%if ! 0%{?include_kpackage}
+%if ! 0%{?kpackage}
 sed -i -e 's:macro_optional_add_subdirectory(kpackage):#macro_optional_add_subdirectory(kpackage):g' CMakeLists.txt
 sed -i -e 's:add_subdirectory(kpackage):#add_subdirectory(kpackage):g' doc/CMakeLists.txt
 %endif
@@ -111,7 +114,7 @@ touch --no-create %{_kde4_iconsdir}/hico
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
-%if 0%{?include_kpackage}
+%if 0%{?kpackage}
 %post kpackage
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
@@ -148,7 +151,7 @@ fi
 %{_kde4_libdir}/kde4/kcm_cron.so
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
 
-%if 0%{?include_kpackage}
+%if 0%{?kpackage}
 %files kpackage
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kpackage
@@ -168,6 +171,11 @@ fi
 
 
 %changelog
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
+- Repositioning the KDE Brand (#547361)
+- omit kpackage
+- drop old/unused kuser consolehelper files
+
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - fix rhel conditionals
 


--- kuser.pam DELETED ---


--- kuser.pamd DELETED ---



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:17 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142818.A274D28ED56@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:21 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142822.3FB2628ED56@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:23 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142824.830CB28ED56@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:30 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142830.CA47528ED56@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:31 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142833.B7C3328ED0D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:35 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142836.4467928ED7E@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:35 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142837.7958928EDA5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:39 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142840.B069528ED0D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:28:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:28:42 +0000
Subject: [pkgdb] gok: krh has given up watchcommits
Message-ID: <20091214142844.5A65328ED56@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gok (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gok



From pkgdb at fedoraproject.org  Mon Dec 14 14:32:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:32:00 +0000
Subject: [pkgdb] chkfontpath ownership updated
Message-ID: <20091214143201.C156B28EDA6@bastion3.fedora.phx2.redhat.com>

Package chkfontpath in Fedora devel was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chkfontpath



From pkgdb at fedoraproject.org  Mon Dec 14 14:33:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:33:23 +0000
Subject: [pkgdb] isicom ownership updated
Message-ID: <20091214143325.1D0D228EDAA@bastion3.fedora.phx2.redhat.com>

Package isicom in Fedora devel was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isicom



From pkgdb at fedoraproject.org  Mon Dec 14 14:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:33:52 +0000
Subject: [pkgdb] isicom ownership updated
Message-ID: <20091214143354.3C64928ED7C@bastion3.fedora.phx2.redhat.com>

Package isicom in Fedora 7 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isicom



From pkgdb at fedoraproject.org  Mon Dec 14 14:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:33:58 +0000
Subject: [pkgdb] isicom ownership updated
Message-ID: <20091214143400.B250A28EDB5@bastion3.fedora.phx2.redhat.com>

Package isicom in Fedora 8 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isicom



From pkgdb at fedoraproject.org  Mon Dec 14 14:33:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:33:59 +0000
Subject: [pkgdb] isicom ownership updated
Message-ID: <20091214143401.43AF428EDC1@bastion3.fedora.phx2.redhat.com>

Package isicom in Fedora 9 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isicom



From dsd at fedoraproject.org  Mon Dec 14 14:34:28 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 14 Dec 2009 14:34:28 +0000 (UTC)
Subject: rpms/dracut-modules-olpc/F-12 .cvsignore, 1.4,
	1.5 dracut-modules-olpc.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091214143428.A629F11C00EB@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/dracut-modules-olpc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30097

Modified Files:
	.cvsignore dracut-modules-olpc.spec sources 
Log Message:
v0.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Dec 2009 09:46:44 -0000	1.4
+++ .cvsignore	14 Dec 2009 14:34:28 -0000	1.5
@@ -1 +1 @@
-dracut-modules-olpc-0.3.1.tar.bz2
+dracut-modules-olpc-0.3.2.tar.bz2


Index: dracut-modules-olpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-12/dracut-modules-olpc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dracut-modules-olpc.spec	7 Dec 2009 09:46:44 -0000	1.4
+++ dracut-modules-olpc.spec	14 Dec 2009 14:34:28 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		dracut-modules-olpc
-Version:	0.3.1
+Version:	0.3.2
 Release:	1%{?dist}
 Summary:	OLPC modules for dracut initramfs
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Daniel Drake <dsd at laptop.org> - 0.3.2-1
+- New version to fix activation code
+
 * Mon Dec 7 2009 Daniel Drake <dsd at laptop.org> - 0.3.1-1
 - New version to fix booting alternate image
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Dec 2009 09:46:44 -0000	1.4
+++ sources	14 Dec 2009 14:34:28 -0000	1.5
@@ -1 +1 @@
-e818ad8a497e05821fe489b2e41e441a  dracut-modules-olpc-0.3.1.tar.bz2
+1296fa897162249cad99cc006855ea92  dracut-modules-olpc-0.3.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec 14 14:34:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:34:38 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091214143441.B713D28ED56@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora devel was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Mon Dec 14 14:34:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:34:51 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091214143451.4FE0028EE0D@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora 10 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Mon Dec 14 14:34:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:34:43 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091214143445.3420D28EDEC@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora 8 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Mon Dec 14 14:34:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:34:57 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091214143502.6624228EDC7@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora 12 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From dsd at fedoraproject.org  Mon Dec 14 14:35:08 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 14 Dec 2009 14:35:08 +0000 (UTC)
Subject: rpms/dracut-modules-olpc/F-11 .cvsignore, 1.9,
	1.10 dracut-modules-olpc.spec, 1.10, 1.11 sources, 1.11, 1.12
Message-ID: <20091214143508.B182811C00EB@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/dracut-modules-olpc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30501

Modified Files:
	.cvsignore dracut-modules-olpc.spec sources 
Log Message:
v0.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 Dec 2009 09:40:24 -0000	1.9
+++ .cvsignore	14 Dec 2009 14:35:08 -0000	1.10
@@ -1 +1 @@
-dracut-modules-olpc-0.3.1.tar.bz2
+dracut-modules-olpc-0.3.2.tar.bz2


Index: dracut-modules-olpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-11/dracut-modules-olpc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dracut-modules-olpc.spec	7 Dec 2009 09:40:24 -0000	1.10
+++ dracut-modules-olpc.spec	14 Dec 2009 14:35:08 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		dracut-modules-olpc
-Version:	0.3.1
+Version:	0.3.2
 Release:	1%{?dist}
 Summary:	OLPC modules for dracut initramfs
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Daniel Drake <dsd at laptop.org> - 0.3.2-1
+- New version to fix activation code
+
 * Mon Dec 7 2009 Daniel Drake <dsd at laptop.org> - 0.3.1-1
 - New version to fix booting alternate image
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut-modules-olpc/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Dec 2009 09:40:24 -0000	1.11
+++ sources	14 Dec 2009 14:35:08 -0000	1.12
@@ -1 +1 @@
-e818ad8a497e05821fe489b2e41e441a  dracut-modules-olpc-0.3.1.tar.bz2
+1296fa897162249cad99cc006855ea92  dracut-modules-olpc-0.3.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec 14 14:34:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:34:59 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091214143503.A986428EDCF@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora 11 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Mon Dec 14 14:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:34:41 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091214143442.7134828EDDC@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora 7 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Mon Dec 14 14:34:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:34:52 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091214143453.9DD0D28EE0C@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora 9 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Mon Dec 14 14:36:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:36:14 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20091214143617.9EE1A28EDBC@bastion3.fedora.phx2.redhat.com>

kwizart has set the commit acl on opencv (Fedora devel) to Approved for kklic

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:36:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:36:31 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20091214143633.D255928EDB0@bastion3.fedora.phx2.redhat.com>

kwizart has set the commit acl on opencv (Fedora 11) to Approved for kklic

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:36:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:36:42 +0000
Subject: [pkgdb] opencv had acl change status
Message-ID: <20091214143646.4B08628EDFE@bastion3.fedora.phx2.redhat.com>

kwizart has set the commit acl on opencv (Fedora 12) to Approved for kklic

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From pkgdb at fedoraproject.org  Mon Dec 14 14:38:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:38:01 +0000
Subject: [pkgdb] compiz ownership updated
Message-ID: <20091214143802.8B1E028EDED@bastion3.fedora.phx2.redhat.com>

Package compiz in Fedora 7 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz



From pkgdb at fedoraproject.org  Mon Dec 14 14:38:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:38:11 +0000
Subject: [pkgdb] compiz ownership updated
Message-ID: <20091214143813.6F54728EE4B@bastion3.fedora.phx2.redhat.com>

Package compiz in Fedora 10 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz



From sharkcz at fedoraproject.org  Mon Dec 14 14:38:34 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 14 Dec 2009 14:38:34 +0000 (UTC)
Subject: File hercules-svn5544.tar.bz2 uploaded to lookaside cache by sharkcz
Message-ID: <20091214143834.2634228EE97@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for hercules:

4a2ca4b822fadf26287681dadca7d8c8  hercules-svn5544.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec 14 14:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:38:02 +0000
Subject: [pkgdb] compiz ownership updated
Message-ID: <20091214143804.DB8CE28EE02@bastion3.fedora.phx2.redhat.com>

Package compiz in Fedora 8 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz



From pkgdb at fedoraproject.org  Mon Dec 14 14:38:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:38:15 +0000
Subject: [pkgdb] compiz ownership updated
Message-ID: <20091214143817.751CC28EE1C@bastion3.fedora.phx2.redhat.com>

Package compiz in Fedora 11 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz



From pkgdb at fedoraproject.org  Mon Dec 14 14:38:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:38:19 +0000
Subject: [pkgdb] compiz ownership updated
Message-ID: <20091214143822.78EFB28EE6C@bastion3.fedora.phx2.redhat.com>

Package compiz in Fedora 12 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz



From pkgdb at fedoraproject.org  Mon Dec 14 14:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:38:06 +0000
Subject: [pkgdb] compiz ownership updated
Message-ID: <20091214143807.E093E28EE1E@bastion3.fedora.phx2.redhat.com>

Package compiz in Fedora 9 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz



From pkgdb at fedoraproject.org  Mon Dec 14 14:40:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:40:24 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091214144026.507D828EDBC@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora devel was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Mon Dec 14 14:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:40:35 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091214144037.66A0528EDD6@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora 8 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Mon Dec 14 14:40:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:40:33 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091214144035.44F7C28EDAE@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora 7 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Mon Dec 14 14:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:40:35 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091214144036.55FB628EDBC@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora 11 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Mon Dec 14 14:40:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:40:50 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091214144051.63AC528EE35@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora 12 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Mon Dec 14 14:40:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:40:44 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091214144046.1A98128EDB0@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora 10 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Mon Dec 14 14:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:40:42 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091214144045.049E828EDCE@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora 9 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Mon Dec 14 14:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:44:43 +0000
Subject: [pkgdb] imake ownership updated
Message-ID: <20091214144443.B069928ED96@bastion3.fedora.phx2.redhat.com>

Package imake in Fedora devel was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imake



From pkgdb at fedoraproject.org  Mon Dec 14 14:44:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:44:54 +0000
Subject: [pkgdb] imake ownership updated
Message-ID: <20091214144455.294A028EDC5@bastion3.fedora.phx2.redhat.com>

Package imake in Fedora 7 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imake



From pkgdb at fedoraproject.org  Mon Dec 14 14:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:44:58 +0000
Subject: [pkgdb] imake ownership updated
Message-ID: <20091214144500.4B48828EDE9@bastion3.fedora.phx2.redhat.com>

Package imake in Fedora 8 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imake



From pkgdb at fedoraproject.org  Mon Dec 14 14:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:45:16 +0000
Subject: [pkgdb] imake ownership updated
Message-ID: <20091214144518.8A0DD28EE39@bastion3.fedora.phx2.redhat.com>

Package imake in Fedora 11 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imake



From pkgdb at fedoraproject.org  Mon Dec 14 14:45:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:45:15 +0000
Subject: [pkgdb] imake ownership updated
Message-ID: <20091214144517.16DE128EE2C@bastion3.fedora.phx2.redhat.com>

Package imake in Fedora 12 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imake



From pkgdb at fedoraproject.org  Mon Dec 14 14:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:45:16 +0000
Subject: [pkgdb] imake ownership updated
Message-ID: <20091214144517.3AC7028EE2D@bastion3.fedora.phx2.redhat.com>

Package imake in Fedora 10 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imake



From pkgdb at fedoraproject.org  Mon Dec 14 14:45:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:45:05 +0000
Subject: [pkgdb] imake ownership updated
Message-ID: <20091214144507.4F06528ED7C@bastion3.fedora.phx2.redhat.com>

Package imake in Fedora 9 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imake



From pkgdb at fedoraproject.org  Mon Dec 14 14:46:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:46:03 +0000
Subject: [pkgdb] synaptics ownership updated
Message-ID: <20091214144605.E16D028EE4C@bastion3.fedora.phx2.redhat.com>

Package synaptics in Fedora 7 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptics



From pkgdb at fedoraproject.org  Mon Dec 14 14:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:46:01 +0000
Subject: [pkgdb] synaptics ownership updated
Message-ID: <20091214144602.E891828EE37@bastion3.fedora.phx2.redhat.com>

Package synaptics in Fedora 8 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptics



From pkgdb at fedoraproject.org  Mon Dec 14 14:45:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:45:58 +0000
Subject: [pkgdb] synaptics ownership updated
Message-ID: <20091214144559.9203728EDA9@bastion3.fedora.phx2.redhat.com>

Package synaptics in Fedora devel is now owned by whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptics



From pkgdb at fedoraproject.org  Mon Dec 14 14:46:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:46:09 +0000
Subject: [pkgdb] synaptics ownership updated
Message-ID: <20091214144612.1008728EE66@bastion3.fedora.phx2.redhat.com>

Package synaptics in Fedora 10 is now owned by whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptics



From pkgdb at fedoraproject.org  Mon Dec 14 14:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:46:10 +0000
Subject: [pkgdb] synaptics ownership updated
Message-ID: <20091214144615.321AC28EE75@bastion3.fedora.phx2.redhat.com>

Package synaptics in Fedora 9 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptics



From hguemar at fedoraproject.org  Mon Dec 14 14:46:22 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Mon, 14 Dec 2009 14:46:22 +0000 (UTC)
Subject: rpms/python-feedparser/devel python-feedparser.spec,1.12,1.13
Message-ID: <20091214144622.6052B11C00EB@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/pkgs/rpms/python-feedparser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32319

Modified Files:
	python-feedparser.spec 
Log Message:
rebuild for F13


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-feedparser/devel/python-feedparser.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-feedparser.spec	7 Aug 2009 12:53:59 -0000	1.12
+++ python-feedparser.spec	14 Dec 2009 14:46:22 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           python-feedparser
 Version:        4.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 4.1-11
+- rebuild for Fedora 13
+
 * Fri Aug 07 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-10
 - Apply patch for title munging issue (#491373)
 



From pkgdb at fedoraproject.org  Mon Dec 14 14:46:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:46:52 +0000
Subject: [pkgdb] xkeyboard-config ownership updated
Message-ID: <20091214144656.BB69628EDE2@bastion3.fedora.phx2.redhat.com>

Package xkeyboard-config in Fedora 7 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From pkgdb at fedoraproject.org  Mon Dec 14 14:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:46:47 +0000
Subject: [pkgdb] xkeyboard-config ownership updated
Message-ID: <20091214144648.6D85928EE36@bastion3.fedora.phx2.redhat.com>

Package xkeyboard-config in Fedora devel is now owned by whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From pkgdb at fedoraproject.org  Mon Dec 14 14:47:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:47:58 +0000
Subject: [pkgdb] xkeyboard-config ownership updated
Message-ID: <20091214144759.2049328EDA9@bastion3.fedora.phx2.redhat.com>

Package xkeyboard-config in Fedora 8 is now owned by whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From pkgdb at fedoraproject.org  Mon Dec 14 14:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:48:03 +0000
Subject: [pkgdb] xkeyboard-config ownership updated
Message-ID: <20091214144804.B213A28EDB0@bastion3.fedora.phx2.redhat.com>

Package xkeyboard-config in Fedora 9 is now owned by whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From pkgdb at fedoraproject.org  Mon Dec 14 14:48:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:48:08 +0000
Subject: [pkgdb] xkeyboard-config ownership updated
Message-ID: <20091214144809.A9E3A28EDEF@bastion3.fedora.phx2.redhat.com>

Package xkeyboard-config in Fedora 10 is now owned by whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From pkgdb at fedoraproject.org  Mon Dec 14 14:48:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:48:04 +0000
Subject: [pkgdb] xkeyboard-config ownership updated
Message-ID: <20091214144806.AB90728EDE3@bastion3.fedora.phx2.redhat.com>

Package xkeyboard-config in Fedora OLPC 3 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From pkgdb at fedoraproject.org  Mon Dec 14 14:48:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:48:16 +0000
Subject: [pkgdb] xkeyboard-config ownership updated
Message-ID: <20091214144819.35E3F28EE21@bastion3.fedora.phx2.redhat.com>

Package xkeyboard-config in Fedora 11 is now owned by whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From pkgdb at fedoraproject.org  Mon Dec 14 14:48:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:48:14 +0000
Subject: [pkgdb] xkeyboard-config ownership updated
Message-ID: <20091214144815.F213C28EE0A@bastion3.fedora.phx2.redhat.com>

Package xkeyboard-config in Fedora 12 is now owned by whot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From pkgdb at fedoraproject.org  Mon Dec 14 14:49:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:49:44 +0000
Subject: [pkgdb] imake ownership updated
Message-ID: <20091214144945.4451528EDA9@bastion3.fedora.phx2.redhat.com>

Package imake in Fedora devel is now owned by ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imake



From pkgdb at fedoraproject.org  Mon Dec 14 14:52:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:52:23 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091214145223.E194428EDAE@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora OLPC 3 was orphaned by krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:27 +0000
Subject: [pkgdb] ConsoleKit: krh has given up watchcommits
Message-ID: <20091214145428.B1A5428EDB0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ConsoleKit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:32 +0000
Subject: [pkgdb] ConsoleKit: krh has given up watchcommits
Message-ID: <20091214145433.7A11828EDAE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ConsoleKit (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:34 +0000
Subject: [pkgdb] ConsoleKit: krh has given up watchcommits
Message-ID: <20091214145436.A32C928EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ConsoleKit (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:39 +0000
Subject: [pkgdb] ConsoleKit: krh has given up watchcommits
Message-ID: <20091214145440.32C3628EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ConsoleKit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:42 +0000
Subject: [pkgdb] ConsoleKit: krh has given up watchcommits
Message-ID: <20091214145444.EAA1028EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ConsoleKit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:44 +0000
Subject: [pkgdb] ConsoleKit: krh has given up watchcommits
Message-ID: <20091214145445.4311528ED96@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ConsoleKit (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:47 +0000
Subject: [pkgdb] ConsoleKit: krh has given up watchcommits
Message-ID: <20091214145449.799BB28ED96@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ConsoleKit (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:52 +0000
Subject: [pkgdb] GConf2: krh has given up watchcommits
Message-ID: <20091214145453.7330428EDB1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on GConf2 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/GConf2



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:52 +0000
Subject: [pkgdb] GConf2: krh has given up watchcommits
Message-ID: <20091214145454.C8FC428EDC4@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on GConf2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/GConf2



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:57 +0000
Subject: [pkgdb] GConf2: krh has given up watchcommits
Message-ID: <20091214145458.474C428ED96@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on GConf2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/GConf2



From pkgdb at fedoraproject.org  Mon Dec 14 14:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:54:57 +0000
Subject: [pkgdb] GConf2: krh has given up watchcommits
Message-ID: <20091214145458.E1C3828EDB0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on GConf2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/GConf2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:00 +0000
Subject: [pkgdb] GConf2: krh has given up watchcommits
Message-ID: <20091214145501.E9E8828EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on GConf2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/GConf2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:05 +0000
Subject: [pkgdb] GConf2: krh has given up watchcommits
Message-ID: <20091214145508.A428328ED8D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on GConf2 (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/GConf2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:01 +0000
Subject: [pkgdb] GConf2: krh has given up watchcommits
Message-ID: <20091214145504.9B7BC28EDC9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on GConf2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/GConf2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:09 +0000
Subject: [pkgdb] NetworkManager: krh has given up watchcommits
Message-ID: <20091214145510.E86DC28EDC4@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on NetworkManager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:13 +0000
Subject: [pkgdb] NetworkManager: krh has given up watchcommits
Message-ID: <20091214145513.A1D2B28EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on NetworkManager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:13 +0000
Subject: [pkgdb] NetworkManager: krh has given up watchcommits
Message-ID: <20091214145514.87F6628EDAE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on NetworkManager (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:14 +0000
Subject: [pkgdb] NetworkManager: krh has given up watchcommits
Message-ID: <20091214145518.9C70C28EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on NetworkManager (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:18 +0000
Subject: [pkgdb] NetworkManager: krh has given up watchcommits
Message-ID: <20091214145520.A8F3C28EDD9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on NetworkManager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:19 +0000
Subject: [pkgdb] NetworkManager: krh has given up watchcommits
Message-ID: <20091214145521.63F6528EDC1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on NetworkManager (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:22 +0000
Subject: [pkgdb] NetworkManager: krh has given up watchcommits
Message-ID: <20091214145523.59F0828EDB1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on NetworkManager (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:27 +0000
Subject: [pkgdb] NetworkManager: krh has given up watchcommits
Message-ID: <20091214145530.70C2128ED8D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on NetworkManager (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:32 +0000
Subject: [pkgdb] ORBit2: krh has given up watchcommits
Message-ID: <20091214145533.5341528EDB4@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ORBit2 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ORBit2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:32 +0000
Subject: [pkgdb] ORBit2: krh has given up watchcommits
Message-ID: <20091214145534.AADE128ED8D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ORBit2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ORBit2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:35 +0000
Subject: [pkgdb] ORBit2: krh has given up watchcommits
Message-ID: <20091214145537.459BD28ED8D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ORBit2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ORBit2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:35 +0000
Subject: [pkgdb] ORBit2: krh has given up watchcommits
Message-ID: <20091214145538.88B1D28EDC0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ORBit2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ORBit2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:40 +0000
Subject: [pkgdb] ORBit2: krh has given up watchcommits
Message-ID: <20091214145541.08DF528ED8D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ORBit2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ORBit2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:39 +0000
Subject: [pkgdb] ORBit2: krh has given up watchcommits
Message-ID: <20091214145541.5895328EDC0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ORBit2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ORBit2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:44 +0000
Subject: [pkgdb] ORBit2: krh has given up watchcommits
Message-ID: <20091214145545.ADC5D28ED8D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on ORBit2 (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ORBit2



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:47 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145547.C446328EDB1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:48 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145549.1C2A128EDB1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:52 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145553.54B8928EDB2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:52 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145553.EE82C28EDB0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:57 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145559.CB4A728EDAE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:56:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:56:00 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145602.9F60028ED96@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:56:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:56:02 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145602.B91B528EDB2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:56:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:56:02 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145604.B01B328EDC4@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:56:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:56:06 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145608.9337228ED8D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:56:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:56:58 +0000
Subject: [pkgdb] dbus: krh has given up watchcommits
Message-ID: <20091214145700.E48F928EDC4@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on dbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:05 +0000
Subject: [pkgdb] dbus: krh has given up watchcommits
Message-ID: <20091214145707.2369628EDC1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on dbus (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:00 +0000
Subject: [pkgdb] dbus: krh has given up watchcommits
Message-ID: <20091214145702.4B1DF28EDCE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on dbus (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:29 +0000
Subject: [pkgdb] dbus: krh has given up watchcommits
Message-ID: <20091214145731.DBF5B28EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on dbus (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus



From pkgdb at fedoraproject.org  Mon Dec 14 14:55:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:55:57 +0000
Subject: [pkgdb] Pyrex: krh has given up watchcommits
Message-ID: <20091214145559.999CA28ED96@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on Pyrex (Red Hat Linux 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:32 +0000
Subject: [pkgdb] cairo: krh has given up watchcommits
Message-ID: <20091214145733.082DF28EDB4@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:31 +0000
Subject: [pkgdb] dbus: krh has given up watchcommits
Message-ID: <20091214145734.CF1BD28EDB2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on dbus (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:33 +0000
Subject: [pkgdb] cairo: krh has given up watchcommits
Message-ID: <20091214145734.E20C728EDAE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on cairo (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:34 +0000
Subject: [pkgdb] dbus: krh has given up watchcommits
Message-ID: <20091214145738.483DA28EDAE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on dbus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:36 +0000
Subject: [pkgdb] cairo: krh has given up watchcommits
Message-ID: <20091214145738.3225428EDCD@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on cairo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:38 +0000
Subject: [pkgdb] cairo: krh has given up watchcommits
Message-ID: <20091214145739.A294128EDCE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on cairo (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:45 +0000
Subject: [pkgdb] desktop-backgrounds: krh has given up watchcommits
Message-ID: <20091214145746.2BF2628ED7C@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on desktop-backgrounds (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/desktop-backgrounds



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:42 +0000
Subject: [pkgdb] dbus: krh has given up watchcommits
Message-ID: <20091214145745.A558328EDBC@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on dbus (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:48 +0000
Subject: [pkgdb] desktop-backgrounds: krh has given up watchcommits
Message-ID: <20091214145750.65EFD28EDAE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on desktop-backgrounds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/desktop-backgrounds



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:46 +0000
Subject: [pkgdb] dbus: krh has given up watchcommits
Message-ID: <20091214145749.D13B128EDC7@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on dbus (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:50 +0000
Subject: [pkgdb] desktop-backgrounds: krh has given up watchcommits
Message-ID: <20091214145751.D886D28EDD2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on desktop-backgrounds (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/desktop-backgrounds



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:46 +0000
Subject: [pkgdb] cairo: krh has given up watchcommits
Message-ID: <20091214145750.1E2A228EDCB@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on cairo (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:50 +0000
Subject: [pkgdb] cairo: krh has given up watchcommits
Message-ID: <20091214145752.EAC5828EDC1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on cairo (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:50 +0000
Subject: [pkgdb] cairo: krh has given up watchcommits
Message-ID: <20091214145752.BB25328EDB1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on cairo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:54 +0000
Subject: [pkgdb] desktop-backgrounds: krh has given up watchcommits
Message-ID: <20091214145756.92D4628EDDE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on desktop-backgrounds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/desktop-backgrounds



From pkgdb at fedoraproject.org  Mon Dec 14 14:57:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:57:52 +0000
Subject: [pkgdb] eog: krh has given up watchcommits
Message-ID: <20091214145754.51D4328EDB0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on eog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eog



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:01 +0000
Subject: [pkgdb] desktop-backgrounds: krh has given up watchcommits
Message-ID: <20091214145803.38D9E28EDBC@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on desktop-backgrounds (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/desktop-backgrounds



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:02 +0000
Subject: [pkgdb] desktop-backgrounds: krh has given up watchcommits
Message-ID: <20091214145805.3CDD528EDB1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on desktop-backgrounds (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/desktop-backgrounds



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:02 +0000
Subject: [pkgdb] desktop-backgrounds: krh has given up watchcommits
Message-ID: <20091214145804.A455B28EDAE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on desktop-backgrounds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/desktop-backgrounds



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:06 +0000
Subject: [pkgdb] eog: krh has given up watchcommits
Message-ID: <20091214145808.8ECAE28EDD2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on eog (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eog



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:06 +0000
Subject: [pkgdb] eog: krh has given up watchcommits
Message-ID: <20091214145807.72B3728EDC7@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on eog (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eog



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:10 +0000
Subject: [pkgdb] eog: krh has given up watchcommits
Message-ID: <20091214145812.E26A128EDB8@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on eog (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eog



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:05 +0000
Subject: [pkgdb] eog: krh has given up watchcommits
Message-ID: <20091214145808.472E228EDCE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on eog (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eog



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:06 +0000
Subject: [pkgdb] eog: krh has given up watchcommits
Message-ID: <20091214145809.2911228EDD1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on eog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eog



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:09 +0000
Subject: [pkgdb] eog: krh has given up watchcommits
Message-ID: <20091214145812.CA5FD28EDE0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on eog (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eog



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:13 +0000
Subject: [pkgdb] evolution: krh has given up watchcommits
Message-ID: <20091214145814.9D89328EDB2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:16 +0000
Subject: [pkgdb] evolution: krh has given up watchcommits
Message-ID: <20091214145818.249BC28EDC9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:21 +0000
Subject: [pkgdb] evolution: krh has given up watchcommits
Message-ID: <20091214145822.9D8E228ED7C@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:22 +0000
Subject: [pkgdb] evolution: krh has given up watchcommits
Message-ID: <20091214145824.9BBD828EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:25 +0000
Subject: [pkgdb] evolution: krh has given up watchcommits
Message-ID: <20091214145826.8E86E28EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:26 +0000
Subject: [pkgdb] evolution: krh has given up watchcommits
Message-ID: <20091214145829.130E928ED7C@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:32 +0000
Subject: [pkgdb] file-roller: krh has given up watchcommits
Message-ID: <20091214145834.4C89A28EDB1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on file-roller (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file-roller



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:39 +0000
Subject: [pkgdb] file-roller: krh has given up watchcommits
Message-ID: <20091214145840.E967428EDC6@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on file-roller (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file-roller



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:35 +0000
Subject: [pkgdb] file-roller: krh has given up watchcommits
Message-ID: <20091214145836.9171A28EDC6@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on file-roller (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file-roller



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:36 +0000
Subject: [pkgdb] file-roller: krh has given up watchcommits
Message-ID: <20091214145838.B756728EDC0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on file-roller (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file-roller



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:43 +0000
Subject: [pkgdb] file-roller: krh has given up watchcommits
Message-ID: <20091214145846.C640D28EDB2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on file-roller (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file-roller



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:44 +0000
Subject: [pkgdb] file-roller: krh has given up watchcommits
Message-ID: <20091214145846.5AA0D28EDDB@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on file-roller (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file-roller



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:39 +0000
Subject: [pkgdb] file-roller: krh has given up watchcommits
Message-ID: <20091214145842.8E27F28EDDE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on file-roller (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/file-roller



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:53 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145856.CE6E928EDB1@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:54 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145856.EC1D128EDB8@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:57 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145859.1DC8128EDB8@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Red Hat Linux 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:58 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145901.03FB828EDC5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:01 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145905.925B428EDD5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:02 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145904.DCA7F28EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:02 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145905.D834328EDDB@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Red Hat Linux 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:07 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145910.6D39E28EDD5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:09 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145911.B1B5928ED7C@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:58:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:58:49 +0000
Subject: [pkgdb] evolution: krh has given up watchcommits
Message-ID: <20091214145912.D041A28EDAE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:12 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145913.A91E328ED96@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:19 +0000
Subject: [pkgdb] fontconfig: krh has given up watchcommits
Message-ID: <20091214145920.B45E428ED96@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on fontconfig (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontconfig



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:16 +0000
Subject: [pkgdb] firefox: krh has given up watchcommits
Message-ID: <20091214145920.B743F28EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on firefox (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/firefox



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:21 +0000
Subject: [pkgdb] fontconfig: krh has given up watchcommits
Message-ID: <20091214145923.3224228EDB8@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on fontconfig (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontconfig



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:23 +0000
Subject: [pkgdb] fontconfig: krh has given up watchcommits
Message-ID: <20091214145924.C6B6128EDCB@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on fontconfig (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontconfig



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:26 +0000
Subject: [pkgdb] fontconfig: krh has given up watchcommits
Message-ID: <20091214145927.30E4B28EDA9@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on fontconfig (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontconfig



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:30 +0000
Subject: [pkgdb] fontconfig: krh has given up watchcommits
Message-ID: <20091214145931.C952328ECD8@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on fontconfig (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontconfig



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:32 +0000
Subject: [pkgdb] fontconfig: krh has given up watchcommits
Message-ID: <20091214145935.02DF628ECCF@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on fontconfig (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontconfig



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:36 +0000
Subject: [pkgdb] fontconfig: krh has given up watchcommits
Message-ID: <20091214145937.CEAE728ECCD@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on fontconfig (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontconfig



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:38 +0000
Subject: [pkgdb] freetype: krh has given up watchcommits
Message-ID: <20091214145939.4D80428ECCA@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on freetype (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:43 +0000
Subject: [pkgdb] freetype: krh has given up watchcommits
Message-ID: <20091214145944.EC00328ECDC@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on freetype (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:43 +0000
Subject: [pkgdb] freetype: krh has given up watchcommits
Message-ID: <20091214145944.611F228ECCD@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on freetype (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:48 +0000
Subject: [pkgdb] freetype: krh has given up watchcommits
Message-ID: <20091214145950.1A89928ECCD@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on freetype (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:50 +0000
Subject: [pkgdb] freetype: krh has given up watchcommits
Message-ID: <20091214145950.E693A28ECDC@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on freetype (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:50 +0000
Subject: [pkgdb] freetype: krh has given up watchcommits
Message-ID: <20091214145952.C96E628ECD5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on freetype (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype



From pkgdb at fedoraproject.org  Mon Dec 14 14:59:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 14:59:52 +0000
Subject: [pkgdb] freetype: krh has given up watchcommits
Message-ID: <20091214145954.343C928ECF3@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on freetype (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetype



From pkgdb at fedoraproject.org  Mon Dec 14 15:02:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:02:42 +0000
Subject: [pkgdb] python-feedparser had acl change status
Message-ID: <20091214150243.68FC128EDB7@bastion3.fedora.phx2.redhat.com>

hguemar has set the commit acl on python-feedparser (Fedora devel) to Approved for jpopelka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Mon Dec 14 15:02:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:02:52 +0000
Subject: [pkgdb] python-feedparser had acl change status
Message-ID: <20091214150253.8D9B628ED4C@bastion3.fedora.phx2.redhat.com>

hguemar has set the commit acl on python-feedparser (Fedora 12) to Approved for jpopelka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-feedparser



From pkgdb at fedoraproject.org  Mon Dec 14 15:10:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:10:16 +0000
Subject: [pkgdb] gtk2: krh has given up watchcommits
Message-ID: <20091214151017.81B3828ECE0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtk2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Mon Dec 14 15:10:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:10:19 +0000
Subject: [pkgdb] gtk2: krh has given up watchcommits
Message-ID: <20091214151020.9FAAA28ECE0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtk2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Mon Dec 14 15:10:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:10:20 +0000
Subject: [pkgdb] gtk2: krh has given up watchcommits
Message-ID: <20091214151023.0E8AD28ECD5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtk2 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Mon Dec 14 15:10:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:10:24 +0000
Subject: [pkgdb] gtk2: krh has given up watchcommits
Message-ID: <20091214151025.9740128ECE0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtk2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Mon Dec 14 15:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:10:26 +0000
Subject: [pkgdb] gtk2: krh has given up watchcommits
Message-ID: <20091214151028.B708C28ECD5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtk2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Mon Dec 14 15:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:10:30 +0000
Subject: [pkgdb] gtk2: krh has given up watchcommits
Message-ID: <20091214151032.4C9F928ECD5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtk2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Mon Dec 14 15:10:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:10:31 +0000
Subject: [pkgdb] gtk2: krh has given up watchcommits
Message-ID: <20091214151033.3EAF428ECE0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtk2 (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From mcrha at fedoraproject.org  Mon Dec 14 15:24:21 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:24:21 +0000 (UTC)
Subject: File gtkhtml-3.28.2.tar.bz2 uploaded to lookaside cache by mcrha
Message-ID: <20091214152421.25E9C28EC9E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gtkhtml3:

0a1b6b27b8b9f6a658c9ab323c95d36e  gtkhtml-3.28.2.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 14 15:25:25 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:25:25 +0000 (UTC)
Subject: rpms/gtkhtml3/F-12 .cvsignore, 1.104, 1.105 gtkhtml3.spec, 1.161,
	1.162 sources, 1.104, 1.105
Message-ID: <20091214152525.84DED11C00EB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/gtkhtml3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5524

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 3.28.2-1.fc12
- Update to 3.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-12/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore	19 Oct 2009 09:40:28 -0000	1.104
+++ .cvsignore	14 Dec 2009 15:25:25 -0000	1.105
@@ -1 +1 @@
-gtkhtml-3.28.1.tar.bz2
+gtkhtml-3.28.2.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-12/gtkhtml3.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- gtkhtml3.spec	19 Oct 2009 09:40:28 -0000	1.161
+++ gtkhtml3.spec	14 Dec 2009 15:25:25 -0000	1.162
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.28.1
+Version: 3.28.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 3.28.2-1.fc12
+- Update to 3.28.2
+
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 3.28.1-1.fc12
 - Update to 3.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-12/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- sources	19 Oct 2009 09:40:28 -0000	1.104
+++ sources	14 Dec 2009 15:25:25 -0000	1.105
@@ -1 +1 @@
-332bea8d39e1348c0f630a79146de5f6  gtkhtml-3.28.1.tar.bz2
+0a1b6b27b8b9f6a658c9ab323c95d36e  gtkhtml-3.28.2.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 14 15:27:16 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:27:16 +0000 (UTC)
Subject: File evolution-data-server-2.28.2.tar.bz2 uploaded to lookaside
	cache by mcrha
Message-ID: <20091214152716.A88FA28ECE8@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for evolution-data-server:

416248e60b1bec3f913a6857576cbcb0  evolution-data-server-2.28.2.tar.bz2



From ovasik at fedoraproject.org  Mon Dec 14 15:28:29 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 14 Dec 2009 15:28:29 +0000 (UTC)
Subject: rpms/elinks/devel elinks.spec,1.77,1.78
Message-ID: <20091214152829.336E911C00EB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6212

Modified Files:
	elinks.spec 
Log Message:
 Add buildrequires for gpm-devel to enable gpm support(#547064)


Index: elinks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- elinks.spec	14 Aug 2009 20:19:51 -0000	1.77
+++ elinks.spec	14 Dec 2009 15:28:28 -0000	1.78
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.19.pre5%{?dist}
+Release:   0.20.pre5%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -17,6 +17,7 @@ BuildRequires: krb5-devel
 BuildRequires: nss_compat_ossl-devel >= 0.9.3
 BuildRequires: nss-devel
 BuildRequires: pkgconfig
+BuildRequires: gpm-devel
 Requires: zlib >= 1.2.0.2
 Requires(preun): %{_sbindir}/alternatives
 Requires(post): coreutils
@@ -128,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 
 %changelog
+* Mon Dec 14 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.20.pre5
+- Add buildrequires for gpm-devel to enable gpm support(#547064)
+
 * Fri Aug 14 2009 Orion Poplawski <orion at cora.nwra.com> 0.12-0.19.pre5
 - Add Requires(post/postun): coreutils for readlink
 



From rdieter at fedoraproject.org  Mon Dec 14 15:28:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 15:28:55 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-12
	kdebase-workspace-4.3.4-solid_hal_0_5_14.patch, NONE,
	1.1 kdebase-workspace.spec, 1.313, 1.314
Message-ID: <20091214152855.6DBE111C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6335

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.4-solid_hal_0_5_14.patch 
Log Message:
* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-3
- hal-0.5.14-1 and failures with brightness controls (#545258)


kdebase-workspace-4.3.4-solid_hal_0_5_14.patch:
 libs/solid/control/powermanager.cpp |    2 +-
 solid/hal/halpower.cpp              |   14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-workspace-4.3.4-solid_hal_0_5_14.patch ---
diff -up kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp.hal kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp
--- kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp.hal	2009-12-14 08:49:30.623026679 -0600
+++ kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp	2009-12-14 08:50:50.842767523 -0600
@@ -203,7 +203,7 @@ float Solid::Control::PowerManager::brig
         else
         {
             return_SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(),
-                      false, brightness(controls.keys().at(0)));
+                      false, brightness(controls.keys(Solid::Control::PowerManager::Screen).at(0)));
         }
     }
     else
diff -up kdebase-workspace-4.3.4/solid/hal/halpower.cpp.hal kdebase-workspace-4.3.4/solid/hal/halpower.cpp
--- kdebase-workspace-4.3.4/solid/hal/halpower.cpp.hal	2009-02-26 03:12:20.000000000 -0600
+++ kdebase-workspace-4.3.4/solid/hal/halpower.cpp	2009-12-14 08:56:30.768778165 -0600
@@ -378,15 +378,17 @@ float HalPower::brightness(const QString
     if(m_halManager.call("FindDeviceByCapability", "laptop_panel").arguments().at(0).toStringList().contains(device))
     {
         QDBusInterface deviceInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device.LaptopPanel", QDBusConnection::systemBus());
-        brightness = deviceInterface.call("GetBrightness").arguments().at(0).toDouble();
-        if(deviceInterface.lastError().isValid())
+        QDBusReply<int> brightnessReply = deviceInterface.call("GetBrightness");
+        if(!brightnessReply.isValid())
         {
-            return 0;
+            return 0.0;
         }
-        else
+        brightness = brightnessReply;
+        QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
+        QDBusReply<int> levelsReply = propertyInterface.call("GetProperty", "laptop_panel.num_levels");
+        if (levelsReply.isValid())
         {
-            QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
-            int levels = propertyInterface.call("GetProperty", "laptop_panel.num_levels").arguments().at(0).toInt();
+            int levels = levelsReply;
             return (float)(100*(brightness/(levels-1)));
         }
     }


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- kdebase-workspace.spec	6 Dec 2009 20:13:24 -0000	1.313
+++ kdebase-workspace.spec	14 Dec 2009 15:28:55 -0000	1.314
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -42,6 +42,8 @@ Patch18: kdebase-workspace-4.3.3-kdm_ply
 Patch50: kdebase-workspace-4.3.3-kde#171685.patch
 # kubuntu working to upstream this
 Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/download/head:/kubuntu_101_brightne-20091019223214-s1uoamqahgp3uee7-1/kubuntu_101_brightness_fn_keys_and_osd.diff
+# fixups for hal-0.5.14 compat
+Patch52: kdebase-workspace-4.3.4-solid_hal_0_5_14.patch
 # 4.3 branch
 
 # trunk
@@ -280,6 +282,7 @@ Requires: akonadi
 # upstream patches
 %patch50 -p1 -b .kde#171685
 %patch51 -p1 -b .brightness_keys
+%patch52 -p1 -b .solid_hal_0_5_14
 
 
 %build
@@ -614,6 +617,9 @@ fi
 
 
 %changelog
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-3
+- hal-0.5.14-1 and failures with brightness controls (#545258)
+
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 4.3.4-2
 - fix conditional for RHEL
 



From mcrha at fedoraproject.org  Mon Dec 14 15:29:18 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:29:18 +0000 (UTC)
Subject: rpms/evolution-data-server/F-12 .cvsignore, 1.116,
	1.117 evolution-data-server.spec, 1.279, 1.280 sources, 1.116, 1.117
Message-ID: <20091214152918.DA20811C00EB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6285

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 2.28.2-1.fc12
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-12/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- .cvsignore	19 Oct 2009 09:45:13 -0000	1.116
+++ .cvsignore	14 Dec 2009 15:29:18 -0000	1.117
@@ -1 +1 @@
-evolution-data-server-2.28.1.tar.bz2
+evolution-data-server-2.28.2.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-12/evolution-data-server.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- evolution-data-server.spec	27 Oct 2009 15:59:17 -0000	1.279
+++ evolution-data-server.spec	14 Dec 2009 15:29:18 -0000	1.280
@@ -27,7 +27,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.28.1
+Version: 2.28.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -361,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 2.28.2-1.fc12
+- Update to 2.28.2
+
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-12/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- sources	19 Oct 2009 09:45:13 -0000	1.116
+++ sources	14 Dec 2009 15:29:18 -0000	1.117
@@ -1 +1 @@
-ea516bef48900020c4f137514123e34d  evolution-data-server-2.28.1.tar.bz2
+416248e60b1bec3f913a6857576cbcb0  evolution-data-server-2.28.2.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 14 15:31:21 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:31:21 +0000 (UTC)
Subject: File evolution-2.28.2.tar.bz2 uploaded to lookaside cache by mcrha
Message-ID: <20091214153121.332B128EC9E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for evolution:

2af2e699cd8a46b8f7b9baec3184f685  evolution-2.28.2.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 14 15:34:51 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:34:51 +0000 (UTC)
Subject: rpms/evolution/F-12 .cvsignore, 1.123, 1.124 evolution.spec, 1.423, 
	1.424 sources, 1.123, 1.124
Message-ID: <20091214153451.3370B11C00EB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7358

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 2.28.2-1.fc12
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- .cvsignore	19 Oct 2009 09:52:51 -0000	1.123
+++ .cvsignore	14 Dec 2009 15:34:50 -0000	1.124
@@ -1 +1 @@
-evolution-2.28.1.tar.bz2
+evolution-2.28.2.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -p -r1.423 -r1.424
--- evolution.spec	2 Dec 2009 19:53:47 -0000	1.423
+++ evolution.spec	14 Dec 2009 15:34:50 -0000	1.424
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.28.1
-Release: 4%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 2.28.2-1.fc12
+- Update to 2.28.2
+
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 - Remove patch 'Tweak desktop file for GNOME Shell' (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- sources	19 Oct 2009 09:52:52 -0000	1.123
+++ sources	14 Dec 2009 15:34:50 -0000	1.124
@@ -1 +1 @@
-15043e64f22000f6f0bf57e0373c7169  evolution-2.28.1.tar.bz2
+2af2e699cd8a46b8f7b9baec3184f685  evolution-2.28.2.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 14 15:35:47 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:35:47 +0000 (UTC)
Subject: File evolution-exchange-2.28.2.tar.bz2 uploaded to lookaside cache
	by mcrha
Message-ID: <20091214153547.DFF9128EC01@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for evolution-exchange:

82f70761960c7e9efdb24650c1b3229b  evolution-exchange-2.28.2.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 14 15:37:29 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:37:29 +0000 (UTC)
Subject: rpms/evolution-exchange/F-12 .cvsignore, 1.51,
	1.52 evolution-exchange.spec, 1.75, 1.76 sources, 1.51, 1.52
Message-ID: <20091214153729.D33C511C00EB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8084

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:
* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 2.28.2-1.fc12
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-12/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	19 Oct 2009 09:55:26 -0000	1.51
+++ .cvsignore	14 Dec 2009 15:37:29 -0000	1.52
@@ -1 +1 @@
-evolution-exchange-2.28.1.tar.bz2
+evolution-exchange-2.28.2.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-12/evolution-exchange.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- evolution-exchange.spec	19 Oct 2009 09:55:26 -0000	1.75
+++ evolution-exchange.spec	14 Dec 2009 15:37:29 -0000	1.76
@@ -17,7 +17,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.28.1
+Version: 2.28.2
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -121,6 +121,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 2.28.2-1.fc12
+- Update to 2.28.2
+
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-12/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	19 Oct 2009 09:55:26 -0000	1.51
+++ sources	14 Dec 2009 15:37:29 -0000	1.52
@@ -1 +1 @@
-fa8892c4859018b464a33acaf3383e91  evolution-exchange-2.28.1.tar.bz2
+82f70761960c7e9efdb24650c1b3229b  evolution-exchange-2.28.2.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 14 15:38:05 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:38:05 +0000 (UTC)
Subject: File evolution-mapi-0.28.2.tar.bz2 uploaded to lookaside cache by
	mcrha
Message-ID: <20091214153805.4C65828EC1E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for evolution-mapi:

6f1c61b28778983806d39214f717810f  evolution-mapi-0.28.2.tar.bz2



From ovasik at fedoraproject.org  Mon Dec 14 15:38:31 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 14 Dec 2009 15:38:31 +0000 (UTC)
Subject: rpms/elinks/F-12 elinks.spec,1.77,1.78
Message-ID: <20091214153831.A466F11C00EB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/elinks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8355

Modified Files:
	elinks.spec 
Log Message:
Add buildrequires for gpm-devel to enable gpm support(#547064)


Index: elinks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elinks/F-12/elinks.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- elinks.spec	14 Aug 2009 20:19:51 -0000	1.77
+++ elinks.spec	14 Dec 2009 15:38:31 -0000	1.78
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.19.pre5%{?dist}
+Release:   0.20.pre5%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -17,6 +17,7 @@ BuildRequires: krb5-devel
 BuildRequires: nss_compat_ossl-devel >= 0.9.3
 BuildRequires: nss-devel
 BuildRequires: pkgconfig
+BuildRequires: gpm-devel
 Requires: zlib >= 1.2.0.2
 Requires(preun): %{_sbindir}/alternatives
 Requires(post): coreutils
@@ -128,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 
 %changelog
+* Mon Dec 14 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.20.pre5
+- Add buildrequires for gpm-devel to enable gpm support(#547064)
+
 * Fri Aug 14 2009 Orion Poplawski <orion at cora.nwra.com> 0.12-0.19.pre5
 - Add Requires(post/postun): coreutils for readlink
 



From mcrha at fedoraproject.org  Mon Dec 14 15:39:17 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 14 Dec 2009 15:39:17 +0000 (UTC)
Subject: rpms/evolution-mapi/F-12 .cvsignore, 1.16, 1.17 evolution-mapi.spec,
	1.20, 1.21 sources, 1.16, 1.17
Message-ID: <20091214153917.5049111C00EB@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-mapi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8566

Modified Files:
	.cvsignore evolution-mapi.spec sources 
Log Message:
* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 0.28.2-1
- Update to 0.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	19 Oct 2009 10:21:03 -0000	1.16
+++ .cvsignore	14 Dec 2009 15:39:17 -0000	1.17
@@ -1 +1 @@
-evolution-mapi-0.28.1.tar.bz2
+evolution-mapi-0.28.2.tar.bz2


Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/F-12/evolution-mapi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- evolution-mapi.spec	19 Oct 2009 10:21:03 -0000	1.20
+++ evolution-mapi.spec	14 Dec 2009 15:39:17 -0000	1.21
@@ -11,7 +11,7 @@
 ### Abstract ###
 
 Name: evolution-mapi
-Version: 0.28.1
+Version: 0.28.2
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 0.28.2-1
+- Update to 0.28.2
+
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 0.28.1-1
 - Update to 0.28.1
 - Remove patch for Gnome bug #588453 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	19 Oct 2009 10:21:04 -0000	1.16
+++ sources	14 Dec 2009 15:39:17 -0000	1.17
@@ -1 +1 @@
-9a165a3e12f9f8a77e54914837ef5359  evolution-mapi-0.28.1.tar.bz2
+6f1c61b28778983806d39214f717810f  evolution-mapi-0.28.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec 14 15:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:40:37 +0000
Subject: [pkgdb] evolution-data-server: krh has given up watchcommits
Message-ID: <20091214154038.8A57828ECE4@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution-data-server (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Dec 14 15:40:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:40:43 +0000
Subject: [pkgdb] evolution-data-server: krh has given up watchcommits
Message-ID: <20091214154044.27AE428ECE4@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution-data-server (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Dec 14 15:40:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:40:43 +0000
Subject: [pkgdb] evolution-data-server: krh has given up watchcommits
Message-ID: <20091214154045.B2B5E28EC01@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution-data-server (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Dec 14 15:40:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:40:50 +0000
Subject: [pkgdb] evolution-data-server: krh has given up watchcommits
Message-ID: <20091214154050.E660328ECEA@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution-data-server (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Dec 14 15:40:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:40:48 +0000
Subject: [pkgdb] evolution-data-server: krh has given up watchcommits
Message-ID: <20091214154050.E4DD328ECA2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution-data-server (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Dec 14 15:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:40:53 +0000
Subject: [pkgdb] evolution-data-server: krh has given up watchcommits
Message-ID: <20091214154055.2AE4828ECA2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution-data-server (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Dec 14 15:40:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:40:57 +0000
Subject: [pkgdb] evolution-data-server: krh has given up watchcommits
Message-ID: <20091214154059.11DDA28ECA2@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on evolution-data-server (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evolution-data-server



From pkgdb at fedoraproject.org  Mon Dec 14 15:41:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:41:02 +0000
Subject: [pkgdb] gtkhtml3: krh has given up watchcommits
Message-ID: <20091214154103.3501128ECEF@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtkhtml3 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 15:41:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:41:03 +0000
Subject: [pkgdb] gtkhtml3: krh has given up watchcommits
Message-ID: <20091214154105.76F6D28ECF3@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtkhtml3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 15:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:41:06 +0000
Subject: [pkgdb] gtkhtml3: krh has given up watchcommits
Message-ID: <20091214154107.5E82728ECEF@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtkhtml3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 15:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:41:07 +0000
Subject: [pkgdb] gtkhtml3: krh has given up watchcommits
Message-ID: <20091214154110.28C2C28ECF0@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtkhtml3 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 15:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:41:09 +0000
Subject: [pkgdb] gtkhtml3: krh has given up watchcommits
Message-ID: <20091214154111.3F22228EC1E@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtkhtml3 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 15:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:41:13 +0000
Subject: [pkgdb] gtkhtml3: krh has given up watchcommits
Message-ID: <20091214154116.5E15A28ECEA@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtkhtml3 (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 15:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 15:41:11 +0000
Subject: [pkgdb] gtkhtml3: krh has given up watchcommits
Message-ID: <20091214154113.36D6B28ECFE@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on gtkhtml3 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkhtml3



From mbroz at fedoraproject.org  Mon Dec 14 15:43:51 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Mon, 14 Dec 2009 15:43:51 +0000 (UTC)
Subject: rpms/cryptsetup-luks/F-12 .cvsignore, 1.14,
	1.15 cryptsetup-luks.spec, 1.71, 1.72 sources, 1.14, 1.15
Message-ID: <20091214154351.B73C311C00EB@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9153

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
Update to cryptsetup 1.1.0-rc3

Resolves: #547119




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	11 Sep 2009 11:46:38 -0000	1.14
+++ .cvsignore	14 Dec 2009 15:43:51 -0000	1.15
@@ -1 +1 @@
-cryptsetup-1.1.0-test0.tar.bz2
+cryptsetup-1.1.0-rc3.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/F-12/cryptsetup-luks.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- cryptsetup-luks.spec	11 Sep 2009 11:46:38 -0000	1.71
+++ cryptsetup-luks.spec	14 Dec 2009 15:43:51 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.1.0
-Release: 0.1%{?dist}
+Release: 0.4%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
@@ -14,7 +14,7 @@ Obsoletes: cryptsetup <= 0.1
 Requires: cryptsetup-luks-libs = %{version}-%{release}
 
 %define _root_sbindir /sbin
-%define upstream_version %{version}-test0
+%define upstream_version %{version}-rc3
 Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
@@ -89,6 +89,9 @@ popd 
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Dec 14 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.4
+- Update to cryptsetup 1.1.0-rc3
+
 * Thu Sep 11 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.1
 - Update to new upstream testing version with new API interface.
 - Add luksSuspend and luksResume commands.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	11 Sep 2009 11:46:38 -0000	1.14
+++ sources	14 Dec 2009 15:43:51 -0000	1.15
@@ -1 +1 @@
-61f0ba826ae2d69d20e9db4e471f8e78  cryptsetup-1.1.0-test0.tar.bz2
+ec18128afd25617a0fb2a45e4c55ae27  cryptsetup-1.1.0-rc3.tar.bz2



From firewing at fedoraproject.org  Mon Dec 14 15:46:50 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Mon, 14 Dec 2009 15:46:50 +0000 (UTC)
Subject: File audio-convert-mod-3.46.0b.tar.bz2 uploaded to lookaside cache
	by firewing
Message-ID: <20091214154650.B394128EC01@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for audio-convert-mod:

ee500c8cdee8923df6cc15d2ea5e137c  audio-convert-mod-3.46.0b.tar.bz2



From firewing at fedoraproject.org  Mon Dec 14 15:49:08 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Mon, 14 Dec 2009 15:49:08 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-11 .cvsignore, 1.9,
	1.10 audio-convert-mod.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20091214154908.9B42611C00EB@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/audio-convert-mod/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10213/F-11

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
- Update to 3.46.0b (see ChangeLog for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Aug 2009 21:09:35 -0000	1.9
+++ .cvsignore	14 Dec 2009 15:49:08 -0000	1.10
@@ -1 +1 @@
-audio-convert-mod-3.46.0a.tar.bz2
+audio-convert-mod-3.46.0b.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-11/audio-convert-mod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- audio-convert-mod.spec	14 Aug 2009 21:09:35 -0000	1.13
+++ audio-convert-mod.spec	14 Dec 2009 15:49:08 -0000	1.14
@@ -1,8 +1,8 @@
 Name:              audio-convert-mod
-Version:           3.46.0a
+Version:           3.46.0b
 Release:           1%{?dist}
 BuildArch:         noarch
-Summary:           A simple audio file converter which supports many formats
+Summary:           A simple audio file converter that supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/audio-convert-mod
@@ -58,14 +58,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 
-%doc AUTHORS ChangeLog COPYING README TODO
-
 
 %changelog
+* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
+- Update to 3.46.0b (see ChangeLog for details on version changes)
+
 * Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
 - Update to 3.46.0a (see ChangeLog for details on version changes)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Aug 2009 21:09:35 -0000	1.9
+++ sources	14 Dec 2009 15:49:08 -0000	1.10
@@ -1 +1 @@
-ddac31ef193852474be9420821b6001d  audio-convert-mod-3.46.0a.tar.bz2
+ee500c8cdee8923df6cc15d2ea5e137c  audio-convert-mod-3.46.0b.tar.bz2



From firewing at fedoraproject.org  Mon Dec 14 15:49:08 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Mon, 14 Dec 2009 15:49:08 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-10 .cvsignore, 1.9,
	1.10 audio-convert-mod.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20091214154908.7AC8311C00EB@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/audio-convert-mod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10213/F-10

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
- Update to 3.46.0b (see ChangeLog for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Aug 2009 21:09:34 -0000	1.9
+++ .cvsignore	14 Dec 2009 15:49:08 -0000	1.10
@@ -1 +1 @@
-audio-convert-mod-3.46.0a.tar.bz2
+audio-convert-mod-3.46.0b.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-10/audio-convert-mod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- audio-convert-mod.spec	14 Aug 2009 21:09:34 -0000	1.11
+++ audio-convert-mod.spec	14 Dec 2009 15:49:08 -0000	1.12
@@ -1,8 +1,8 @@
 Name:              audio-convert-mod
-Version:           3.46.0a
+Version:           3.46.0b
 Release:           1%{?dist}
 BuildArch:         noarch
-Summary:           A simple audio file converter which supports many formats
+Summary:           A simple audio file converter that supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/audio-convert-mod
@@ -58,14 +58,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 
-%doc AUTHORS ChangeLog COPYING README TODO
-
 
 %changelog
+* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
+- Update to 3.46.0b (see ChangeLog for details on version changes)
+
 * Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
 - Update to 3.46.0a (see ChangeLog for details on version changes)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Aug 2009 21:09:34 -0000	1.9
+++ sources	14 Dec 2009 15:49:08 -0000	1.10
@@ -1 +1 @@
-ddac31ef193852474be9420821b6001d  audio-convert-mod-3.46.0a.tar.bz2
+ee500c8cdee8923df6cc15d2ea5e137c  audio-convert-mod-3.46.0b.tar.bz2



From firewing at fedoraproject.org  Mon Dec 14 15:49:08 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Mon, 14 Dec 2009 15:49:08 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-12 .cvsignore, 1.9,
	1.10 audio-convert-mod.spec, 1.14, 1.15 sources, 1.9, 1.10
Message-ID: <20091214154908.D350211C00EB@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/audio-convert-mod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10213/F-12

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
- Update to 3.46.0b (see ChangeLog for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Aug 2009 21:09:35 -0000	1.9
+++ .cvsignore	14 Dec 2009 15:49:08 -0000	1.10
@@ -1 +1 @@
-audio-convert-mod-3.46.0a.tar.bz2
+audio-convert-mod-3.46.0b.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-12/audio-convert-mod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- audio-convert-mod.spec	14 Aug 2009 21:09:35 -0000	1.14
+++ audio-convert-mod.spec	14 Dec 2009 15:49:08 -0000	1.15
@@ -1,8 +1,8 @@
 Name:              audio-convert-mod
-Version:           3.46.0a
+Version:           3.46.0b
 Release:           1%{?dist}
 BuildArch:         noarch
-Summary:           A simple audio file converter which supports many formats
+Summary:           A simple audio file converter that supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/audio-convert-mod
@@ -58,14 +58,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 
-%doc AUTHORS ChangeLog COPYING README TODO
-
 
 %changelog
+* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
+- Update to 3.46.0b (see ChangeLog for details on version changes)
+
 * Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
 - Update to 3.46.0a (see ChangeLog for details on version changes)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Aug 2009 21:09:35 -0000	1.9
+++ sources	14 Dec 2009 15:49:08 -0000	1.10
@@ -1 +1 @@
-ddac31ef193852474be9420821b6001d  audio-convert-mod-3.46.0a.tar.bz2
+ee500c8cdee8923df6cc15d2ea5e137c  audio-convert-mod-3.46.0b.tar.bz2



From firewing at fedoraproject.org  Mon Dec 14 15:49:09 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Mon, 14 Dec 2009 15:49:09 +0000 (UTC)
Subject: rpms/audio-convert-mod/devel .cvsignore, 1.9,
	1.10 audio-convert-mod.spec, 1.14, 1.15 sources, 1.9, 1.10
Message-ID: <20091214154909.0A4AD11C00EB@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/audio-convert-mod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10213/devel

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
- Update to 3.46.0b (see ChangeLog for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Aug 2009 21:09:35 -0000	1.9
+++ .cvsignore	14 Dec 2009 15:49:08 -0000	1.10
@@ -1 +1 @@
-audio-convert-mod-3.46.0a.tar.bz2
+audio-convert-mod-3.46.0b.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- audio-convert-mod.spec	14 Aug 2009 21:09:35 -0000	1.14
+++ audio-convert-mod.spec	14 Dec 2009 15:49:08 -0000	1.15
@@ -1,8 +1,8 @@
 Name:              audio-convert-mod
-Version:           3.46.0a
+Version:           3.46.0b
 Release:           1%{?dist}
 BuildArch:         noarch
-Summary:           A simple audio file converter which supports many formats
+Summary:           A simple audio file converter that supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/audio-convert-mod
@@ -58,14 +58,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 
-%doc AUTHORS ChangeLog COPYING README TODO
-
 
 %changelog
+* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
+- Update to 3.46.0b (see ChangeLog for details on version changes)
+
 * Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
 - Update to 3.46.0a (see ChangeLog for details on version changes)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Aug 2009 21:09:35 -0000	1.9
+++ sources	14 Dec 2009 15:49:08 -0000	1.10
@@ -1 +1 @@
-ddac31ef193852474be9420821b6001d  audio-convert-mod-3.46.0a.tar.bz2
+ee500c8cdee8923df6cc15d2ea5e137c  audio-convert-mod-3.46.0b.tar.bz2



From marx at fedoraproject.org  Mon Dec 14 15:55:04 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Mon, 14 Dec 2009 15:55:04 +0000 (UTC)
Subject: File system-config-lvm-1.1.11.tar.gz uploaded to lookaside cache by
	marx
Message-ID: <20091214155504.1160C28ECA1@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for system-config-lvm:

990260f1ef36359cf4ae828a256bb692  system-config-lvm-1.1.11.tar.gz



From marx at fedoraproject.org  Mon Dec 14 15:58:01 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Mon, 14 Dec 2009 15:58:01 +0000 (UTC)
Subject: rpms/system-config-lvm/F-11 .cvsignore, 1.26, 1.27 sources, 1.28,
	1.29 system-config-lvm.spec, 1.37, 1.38
Message-ID: <20091214155801.4B21F11C00EB@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11765

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
New version 1.1.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	14 Sep 2009 12:55:58 -0000	1.26
+++ .cvsignore	14 Dec 2009 15:58:00 -0000	1.27
@@ -1 +1 @@
-system-config-lvm-1.1.10.tar.gz
+system-config-lvm-1.1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	14 Sep 2009 12:55:58 -0000	1.28
+++ sources	14 Dec 2009 15:58:00 -0000	1.29
@@ -1 +1 @@
-042e369e6f45cc27a35d2c3ea97b525c  system-config-lvm-1.1.10.tar.gz
+990260f1ef36359cf4ae828a256bb692  system-config-lvm-1.1.11.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/system-config-lvm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- system-config-lvm.spec	14 Sep 2009 12:55:58 -0000	1.37
+++ system-config-lvm.spec	14 Dec 2009 15:58:01 -0000	1.38
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.10
+Version: 1.1.11
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -62,6 +62,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Mon Dec 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.11
+- Resolves: #455945 - resizing a lv results in the fstab entry being altered
+- Resolves: #475434 - removing swap entries from fstab
+- Resolves: #522200 - system-config-lvm crashes at startup
+
 * Mon Sep 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.10
 - Resolves: #522315 - Fails when using pvcreate
 - Resolves: #522448 - Request for rebuilding



From rdieter at fedoraproject.org  Mon Dec 14 16:06:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 16:06:33 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib-1.1.17-flac_priority.patch, NONE,
	1.1 xine-lib.spec, 1.80, 1.81
Message-ID: <20091214160633.C95F811C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13391

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.17-flac_priority.patch 
Log Message:
* Sat Dec 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.17-3
- bump flac_decoder priority (rh#301861,xine#225)


xine-lib-1.1.17-flac_priority.patch:
 decoder_flac.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xine-lib-1.1.17-flac_priority.patch ---
diff -up xine-lib-1.1.17/src/combined/decoder_flac.c.flac_priority xine-lib-1.1.17/src/combined/decoder_flac.c
--- xine-lib-1.1.17/src/combined/decoder_flac.c.flac_priority	2009-11-30 14:55:46.000000000 -0600
+++ xine-lib-1.1.17/src/combined/decoder_flac.c	2009-12-12 21:34:19.095500951 -0600
@@ -426,7 +426,7 @@ static uint32_t audio_types[] = {
 
 static const decoder_info_t dec_info_audio = {
   audio_types,         /* supported types */
-  5                    /* priority        */
+  8                    /* priority        */
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- xine-lib.spec	7 Dec 2009 13:55:57 -0000	1.80
+++ xine-lib.spec	14 Dec 2009 16:06:33 -0000	1.81
@@ -56,6 +56,9 @@ Patch8:         xine-lib-1.1.17-avsync_h
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstreamable patches
+# https://bugzilla.redhat.com/show_bug.cgi?id=301861
+# http://bugs.xine-project.org/show_bug.cgi?id=225
+Patch50: xine-lib-1.1.17-flac_priority.patch
 ## upstream patches
 
 Provides:         xine-lib(plugin-abi) = %{plugin_abi}
@@ -190,6 +193,7 @@ touch -r m4/optimizations.m4.stamp m4/op
 #patch6 -p1 -b .deepbind
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
+%patch50 -p1 -b .flac_priority
 
 # autotools patch + touch'ing above seems to miss something, aclocal
 # runs on make anyway, let's use the ./autogen.sh hammer for now.
@@ -429,6 +433,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.17-3
+- bump flac_decoder priority (rh#301861,xine#225)
+
 * Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 1.1.17-2
 - Remove gnome-vfs2 plugin, it's mostly useless
 



From kkofler at fedoraproject.org  Mon Dec 14 16:07:50 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 14 Dec 2009 16:07:50 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-12
	kde-plasma-networkmanagement.spec, 1.21, 1.21.2.1
Message-ID: <20091214160750.E648911C00EB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13692/F-12

Modified Files:
      Tag: kde-plasma-networkmanagement-0_9-0_3_20090930svn_fc12_x
	kde-plasma-networkmanagement.spec 
Log Message:
* Mon Dec 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.3.20090930svn.1
- Rebuild for F12 to fix upgrade path from F11


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/kde-plasma-networkmanagement.spec,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -p -r1.21 -r1.21.2.1
--- kde-plasma-networkmanagement.spec	30 Sep 2009 15:38:37 -0000	1.21
+++ kde-plasma-networkmanagement.spec	14 Dec 2009 16:07:50 -0000	1.21.2.1
@@ -7,7 +7,7 @@ Name:           kde-plasma-networkmanage
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
 Version:        0.9
-Release:        0.3.20090930svn%{?dist}
+Release:        0.3.20090930svn%{?dist}.1
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -180,6 +180,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Mon Dec 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.3.20090930svn.1
+- Rebuild for F12 to fix upgrade path from F11
+
 * Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
 - New snapshot
 



From marx at fedoraproject.org  Mon Dec 14 16:08:23 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Mon, 14 Dec 2009 16:08:23 +0000 (UTC)
Subject: rpms/system-config-lvm/devel .cvsignore, 1.28, 1.29 sources, 1.30, 
	1.31 system-config-lvm.spec, 1.43, 1.44
Message-ID: <20091214160823.1EB3A11C00EB@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13788

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	14 Sep 2009 12:49:48 -0000	1.28
+++ .cvsignore	14 Dec 2009 16:08:22 -0000	1.29
@@ -1,2 +1 @@
-system-config-lvm-1.1.9.tar.gz
-system-config-lvm-1.1.10.tar.gz
+system-config-lvm-1.1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	14 Sep 2009 12:49:48 -0000	1.30
+++ sources	14 Dec 2009 16:08:22 -0000	1.31
@@ -1 +1 @@
-042e369e6f45cc27a35d2c3ea97b525c  system-config-lvm-1.1.10.tar.gz
+990260f1ef36359cf4ae828a256bb692  system-config-lvm-1.1.11.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- system-config-lvm.spec	14 Sep 2009 12:49:48 -0000	1.43
+++ system-config-lvm.spec	14 Dec 2009 16:08:23 -0000	1.44
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.10
+Version: 1.1.11
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -61,6 +61,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Mon Dec 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.11
+- Resolves: #455945 - resizing a lv results in the fstab entry being altered
+- Resolves: #475434 - removing swap entries from fstab
+- Resolves: #522200 - system-config-lvm crashes at startup
+
 * Mon Sep 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.10
 - Resolves: #522315 - Fails when using pvcreate
 - Resolves: #522448 - Request for rebuilding



From rdieter at fedoraproject.org  Mon Dec 14 16:09:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 16:09:13 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.81,1.82
Message-ID: <20091214160913.7FF2711C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14077

Modified Files:
	xine-lib.spec 
Log Message:
Release++



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- xine-lib.spec	14 Dec 2009 16:06:33 -0000	1.81
+++ xine-lib.spec	14 Dec 2009 16:09:13 -0000	1.82
@@ -33,7 +33,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.xine-project.org/ 



From jmoskovc at fedoraproject.org  Mon Dec 14 16:11:03 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Mon, 14 Dec 2009 16:11:03 +0000 (UTC)
Subject: File abrt-1.0.2.tar.gz uploaded to lookaside cache by jmoskovc
Message-ID: <20091214161103.B8C7328ECD1@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for abrt:

755f119d24511b613b02270b51d09312  abrt-1.0.2.tar.gz



From marx at fedoraproject.org  Mon Dec 14 16:14:47 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Mon, 14 Dec 2009 16:14:47 +0000 (UTC)
Subject: rpms/system-config-lvm/F-12 .cvsignore, 1.28, 1.29 sources, 1.30,
	1.31 system-config-lvm.spec, 1.43, 1.44
Message-ID: <20091214161447.452A711C00E9@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14958

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
Version 1.1.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	14 Sep 2009 12:49:48 -0000	1.28
+++ .cvsignore	14 Dec 2009 16:14:46 -0000	1.29
@@ -1,2 +1 @@
-system-config-lvm-1.1.9.tar.gz
-system-config-lvm-1.1.10.tar.gz
+system-config-lvm-1.1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	14 Sep 2009 12:49:48 -0000	1.30
+++ sources	14 Dec 2009 16:14:46 -0000	1.31
@@ -1 +1 @@
-042e369e6f45cc27a35d2c3ea97b525c  system-config-lvm-1.1.10.tar.gz
+990260f1ef36359cf4ae828a256bb692  system-config-lvm-1.1.11.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-12/system-config-lvm.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- system-config-lvm.spec	14 Sep 2009 12:49:48 -0000	1.43
+++ system-config-lvm.spec	14 Dec 2009 16:14:46 -0000	1.44
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.10
+Version: 1.1.11
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -61,6 +61,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Mon Dec 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.11
+- Resolves: #455945 - resizing a lv results in the fstab entry being altered
+- Resolves: #475434 - removing swap entries from fstab
+- Resolves: #522200 - system-config-lvm crashes at startup
+
 * Mon Sep 14 2009 Marek Grac <mgrac at redhat.com> - 1.1.10
 - Resolves: #522315 - Fails when using pvcreate
 - Resolves: #522448 - Request for rebuilding



From vcrhonek at fedoraproject.org  Mon Dec 14 16:16:27 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Mon, 14 Dec 2009 16:16:27 +0000 (UTC)
Subject: rpms/texinfo/devel texinfo-4.13a-mosdo-crash.patch, NONE,
	1.1 texinfo.spec, 1.64, 1.65
Message-ID: <20091214161627.03E6D11C00E9@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/pkgs/rpms/texinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15326

Modified Files:
	texinfo.spec 
Added Files:
	texinfo-4.13a-mosdo-crash.patch 
Log Message:
Fix memory allocation bug when using old-style --section 'Foo' arguments

texinfo-4.13a-mosdo-crash.patch:
 install-info.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE texinfo-4.13a-mosdo-crash.patch ---
--- texinfo-4.13/install-info/install-info.c.mosdo-crash	2009-09-02 20:18:44.000000000 -0400
+++ texinfo-4.13/install-info/install-info.c	2009-09-02 20:19:53.000000000 -0400
@@ -1765,7 +1765,7 @@
             err = argz_add (&argz, &argz_len, opt);
           free (opt); opt = NULL;
 
-          opt = xmalloc (strlen (regex) + sizeof ("--section="));
+          opt = xmalloc (strlen (title) + sizeof ("--section="));
           if (sprintf (opt, "--section=%s", title) == -1)
             err = 1;
           if (!err)


Index: texinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- texinfo.spec	2 Sep 2009 13:31:02 -0000	1.64
+++ texinfo.spec	14 Dec 2009 16:16:26 -0000	1.65
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -12,6 +12,8 @@ Source1: info-dir
 Source2: texi2pdf.man
 Patch0: texinfo-4.12-zlib.patch
 Patch1: texinfo-4.13a-data_types.patch
+# Patch2: is already upstream
+Patch2: texinfo-4.13a-mosdo-crash.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +57,7 @@ for printing using TeX.
 %setup -q -n %{name}-4.13
 %patch0 -p1 -b .zlib
 %patch1 -p1 -b .data_types
+%patch2 -p1 -b .mosdo-crash
 
 %build
 %configure
@@ -154,6 +157,9 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Mon Dec 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-8
+- Fix memory allocation bug when using old-style --section "Foo" arguments
+
 * Wed Sep  2 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-7
 - Fix errors installing texinfo/info with --excludedocs
   Resolves: #515909



From mclasen at fedoraproject.org  Mon Dec 14 16:17:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 16:17:41 +0000 (UTC)
Subject: rpms/seahorse/F-12 property-get.patch,1.1,1.2
Message-ID: <20091214161741.0297F11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15588

Modified Files:
	property-get.patch 
Log Message:
fix the patch


property-get.patch:
 seahorse-key-manager-store.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Index: property-get.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/F-12/property-get.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- property-get.patch	14 Dec 2009 13:54:33 -0000	1.1
+++ property-get.patch	14 Dec 2009 16:17:40 -0000	1.2
@@ -14,7 +14,7 @@ diff -up seahorse-2.28.1/src/seahorse-ke
 +			      XDS_ATOM, TEXT_ATOM,
 +			      0, MAX_XDS_ATOM_VAL_LEN,
 +			      FALSE, NULL, NULL, NULL,
-+			      (unsigned char **) &ret);
++			      (unsigned char **) &ret))
 +		return ret;
  
 -	return ret;



From madko at fedoraproject.org  Mon Dec 14 16:19:33 2009
From: madko at fedoraproject.org (madko)
Date: Mon, 14 Dec 2009 16:19:33 +0000 (UTC)
Subject: rpms/purple-msn-pecan/F-12
	purple-msn-pecan-handle_malformed_data.patch, NONE,
	1.1 purple-msn-pecan.spec, 1.6, 1.7
Message-ID: <20091214161933.2996511C00E9@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15854

Modified Files:
	purple-msn-pecan.spec 
Added Files:
	purple-msn-pecan-handle_malformed_data.patch 
Log Message:
Bug #547078 - add Simone Contini's patch to handle malformed data in process_body_receive



purple-msn-pecan-handle_malformed_data.patch:
 pn_oim.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE purple-msn-pecan-handle_malformed_data.patch ---
diff -Naur msn-pecan-0.1.0-rc1.orig/pn_oim.c msn-pecan-0.1.0-rc1/pn_oim.c
--- msn-pecan-0.1.0-rc1.orig/pn_oim.c	2009-07-19 13:10:53.000000000 +0200
+++ msn-pecan-0.1.0-rc1/pn_oim.c	2009-12-14 15:29:24.000000000 +0100
@@ -466,6 +466,8 @@
         cur += 2;
         end = strstr (cur, "\r\n\r\n");
         *end = '\0';
+	if (end)
+		*end = '\0';
         message = (gchar *) purple_base64_decode (cur, NULL);
     }
 


Index: purple-msn-pecan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-12/purple-msn-pecan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- purple-msn-pecan.spec	11 Aug 2009 12:45:07 -0000	1.6
+++ purple-msn-pecan.spec	14 Dec 2009 16:19:32 -0000	1.7
@@ -1,13 +1,17 @@
 %define		realname msn-pecan
 Name:		purple-%{realname}
 Version:	0.1.0
-Release:	0.1.rc1%{?dist}
+Release:	0.2.rc1%{?dist}
 Summary:	Alternative MSN protocol plugin for libpurple 
 
 Group:		Applications/Internet 
 License:	GPLv2+
 URL:		http://code.google.com/p/msn-pecan/ 
 Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}-rc1.tar.bz2
+
+# Upstream has applied this patch see http://groups.google.com/group/msn-pecan/browse_thread/thread/3df8df31f2faa25b?pli=1
+Patch0:		purple-msn-pecan-handle_malformed_data.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel 
@@ -40,7 +44,7 @@ Other features:
 
 %prep
 %setup -q -n %{realname}-%{version}-rc1
-
+%patch0 -p1 -b malformed_data.rej
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes
@@ -70,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.2.rc1
+- Add Simone Contini's patch to handle malformed data in process_body_receive (bz #547078)
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.1.0-0.1.rc1
 - Update to 0.1.0-rc1.
 



From mclasen at fedoraproject.org  Mon Dec 14 16:22:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 16:22:38 +0000 (UTC)
Subject: rpms/seahorse/devel property-get.patch,1.1,1.2
Message-ID: <20091214162238.D63E011C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15646

Modified Files:
	property-get.patch 
Log Message:
fix the patch


property-get.patch:
 seahorse-key-manager-store.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Index: property-get.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/property-get.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- property-get.patch	14 Dec 2009 13:57:28 -0000	1.1
+++ property-get.patch	14 Dec 2009 16:22:38 -0000	1.2
@@ -14,7 +14,7 @@ diff -up seahorse-2.28.1/src/seahorse-ke
 +			      XDS_ATOM, TEXT_ATOM,
 +			      0, MAX_XDS_ATOM_VAL_LEN,
 +			      FALSE, NULL, NULL, NULL,
-+			      (unsigned char **) &ret);
++			      (unsigned char **) &ret))
 +		return ret;
  
 -	return ret;



From jmoskovc at fedoraproject.org  Mon Dec 14 16:27:27 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Mon, 14 Dec 2009 16:27:27 +0000 (UTC)
Subject: rpms/abrt/F-12 .cvsignore, 1.15, 1.16 abrt.spec, 1.21, 1.22 sources,
	1.16, 1.17
Message-ID: <20091214162727.3718311C00E9@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17216

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
Nev version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	8 Dec 2009 18:20:41 -0000	1.15
+++ .cvsignore	14 Dec 2009 16:26:56 -0000	1.16
@@ -1 +1 @@
-abrt-1.0.1.tar.gz
+abrt-1.0.2.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/abrt.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- abrt.spec	8 Dec 2009 18:20:41 -0000	1.21
+++ abrt.spec	14 Dec 2009 16:26:56 -0000	1.22
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -384,7 +384,7 @@ fi
 
 %files addon-python
 %defattr(-,root,root,-)
-%attr(2755, root, abrt) %{_bindir}/%{name}-pyhook-helper
+%attr(2755, root, abrt) %{_libexecdir}/abrt-hook-python
 %{_libdir}/%{name}/libPython.so*
 %{python_site}/*.py*
 
@@ -398,6 +398,21 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Dec 14 2009  Jiri Moskovcak <jmoskovc at redhat.com> 1.0.2-1
+- disabled GPG check again (jmoskovc at redhat.com)
+- abrt-pyhook-helper rename (vda.linux at googlemail.com)
+- abrt-cli: report success/failure of reporting. closes bug 71 (vda.linux at googlemail.com)
+- less logging (vda.linux at googlemail.com)
+- mkde abrt-gui --help and --version behave as expected. closes bug 85 (vda.linux at googlemail.com)
+- dbus lib: fix parsing of 0-element arrays. Fixes bug 95 (vda.linux at googlemail.com)
+- make "abrt-cli --delete randomuuid" report that deletion failed. closes bug 59 (vda.linux at googlemail.com)
+- applet: make animation stop after 1 minute. (closes bug 108) (vda.linux at googlemail.com)
+- show comment and how to reproduce fields, when BT rating > 3 (jmoskovc at redhat.com)
+- Gui: make report status window's text wrap. Fixes bug 82 (vda.linux at googlemail.com)
+- CCpp analyzer: added "info sharedlib" (https://fedorahosted.org/abrt/ticket/90) (vda.linux at googlemail.com)
+- added link to bugzilla new account page to Bugzilla config dialog (jmoskovc at redhat.com)
+- GUI: added log window (jmoskovc at redhat.com)
+
 * Tue Dec  8 2009  Jiri Moskovcak <jmoskovc at redhat.com> 1.0.1-1
 - PyHook: better logic for checking if abrtd is running rhbz#539987 (jmoskovc at redhat.com)
 - re-enabled gpg sign checking (jmoskovc at redhat.com)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	8 Dec 2009 18:20:41 -0000	1.16
+++ sources	14 Dec 2009 16:26:56 -0000	1.17
@@ -1 +1 @@
-85b4fb411f8d969afd02cb998d527235  abrt-1.0.1.tar.gz
+755f119d24511b613b02270b51d09312  abrt-1.0.2.tar.gz



From schwab at fedoraproject.org  Mon Dec 14 16:34:19 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 14 Dec 2009 16:34:19 +0000 (UTC)
Subject: File glibc-2.11-73-g2510d01-fedora.tar.bz2 uploaded to lookaside
	cache by schwab
Message-ID: <20091214163419.DCDA228ECE0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for glibc:

fae6f0cf6083dde530d39b37266540d3  glibc-2.11-73-g2510d01-fedora.tar.bz2



From schwab at fedoraproject.org  Mon Dec 14 16:36:21 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 14 Dec 2009 16:36:21 +0000 (UTC)
Subject: File glibc-2.11-73-g2510d01.tar.bz2 uploaded to lookaside cache by
	schwab
Message-ID: <20091214163621.D62EE28ECF3@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for glibc:

54ffdf3a3bfa33e5ab9da62119d2719c  glibc-2.11-73-g2510d01.tar.bz2



From schwab at fedoraproject.org  Mon Dec 14 16:39:30 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 14 Dec 2009 16:39:30 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.294, 1.295 glibc-fedora.patch, 1.328,
	1.329 glibc.spec, 1.421, 1.422 import.log, 1.37, 1.38 sources,
	1.319, 1.320
Message-ID: <20091214163930.1C1E011C00E9@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19431/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.11.90-4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- .cvsignore	30 Nov 2009 14:16:32 -0000	1.294
+++ .cvsignore	14 Dec 2009 16:39:28 -0000	1.295
@@ -1,2 +1,2 @@
-glibc-2.11-55-gb55ec98-fedora.tar.bz2
-glibc-2.11-55-gb55ec98.tar.bz2
+glibc-2.11-73-g2510d01-fedora.tar.bz2
+glibc-2.11-73-g2510d01.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   23 +
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |   25 +
 Makeconfig                                     |    6 
 csu/Makefile                                   |    3 
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 include/bits/stdlib-ldbl.h                     |    1 
 include/bits/wchar-ldbl.h                      |    1 
 include/features.h                             |    9 
 intl/locale.alias                              |    2 
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 manual/libc.texinfo                            |    2 
 misc/sys/cdefs.h                               |   20 +
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h  |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/nscd.conf                                 |    2 
 nscd/nscd.init                                 |   32 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |   10 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 timezone/zic.c                                 |    2 
 55 files changed, 685 insertions(+), 461 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- glibc-fedora.patch	30 Nov 2009 14:16:32 -0000	1.328
+++ glibc-fedora.patch	14 Dec 2009 16:39:28 -0000	1.329
@@ -1,6 +1,6 @@
---- glibc-2.11-55-gb55ec98/ChangeLog
-+++ glibc-2.11.90-2/ChangeLog
-@@ -1222,6 +1222,11 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
+--- glibc-2.11-73-g2510d01/ChangeLog
++++ glibc-2.11.90-3/ChangeLog
+@@ -1315,6 +1315,11 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -1487,6 +1492,11 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
+@@ -1580,6 +1585,11 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -10180,6 +10190,10 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
+@@ -10273,6 +10283,10 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -35,7 +35,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -11437,6 +11451,15 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
+@@ -11530,6 +11544,15 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -51,8 +51,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.11-55-gb55ec98/ChangeLog.15
-+++ glibc-2.11.90-2/ChangeLog.15
+--- glibc-2.11-73-g2510d01/ChangeLog.15
++++ glibc-2.11.90-3/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -118,8 +118,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.11-55-gb55ec98/ChangeLog.16
-+++ glibc-2.11.90-2/ChangeLog.16
+--- glibc-2.11-73-g2510d01/ChangeLog.16
++++ glibc-2.11.90-3/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -173,8 +173,8 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
---- glibc-2.11-55-gb55ec98/Makeconfig
-+++ glibc-2.11.90-2/Makeconfig
+--- glibc-2.11-73-g2510d01/Makeconfig
++++ glibc-2.11.90-3/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -191,8 +191,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.11-55-gb55ec98/csu/Makefile
-+++ glibc-2.11.90-2/csu/Makefile
+--- glibc-2.11-73-g2510d01/csu/Makefile
++++ glibc-2.11.90-3/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -203,8 +203,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.11-55-gb55ec98/csu/elf-init.c
-+++ glibc-2.11.90-2/csu/elf-init.c
+--- glibc-2.11-73-g2510d01/csu/elf-init.c
++++ glibc-2.11.90-3/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -229,8 +229,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.11-55-gb55ec98/debug/tst-chk1.c
-+++ glibc-2.11.90-2/debug/tst-chk1.c
+--- glibc-2.11-73-g2510d01/debug/tst-chk1.c
++++ glibc-2.11.90-3/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -259,8 +259,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.11-55-gb55ec98/elf/ldconfig.c
-+++ glibc-2.11.90-2/elf/ldconfig.c
+--- glibc-2.11-73-g2510d01/elf/ldconfig.c
++++ glibc-2.11.90-3/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -342,8 +342,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.11-55-gb55ec98/elf/tst-stackguard1.c
-+++ glibc-2.11.90-2/elf/tst-stackguard1.c
+--- glibc-2.11-73-g2510d01/elf/tst-stackguard1.c
++++ glibc-2.11.90-3/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -368,16 +368,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.11-55-gb55ec98/include/bits/stdlib-ldbl.h
-+++ glibc-2.11.90-2/include/bits/stdlib-ldbl.h
+--- glibc-2.11-73-g2510d01/include/bits/stdlib-ldbl.h
++++ glibc-2.11.90-3/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.11-55-gb55ec98/include/bits/wchar-ldbl.h
-+++ glibc-2.11.90-2/include/bits/wchar-ldbl.h
+--- glibc-2.11-73-g2510d01/include/bits/wchar-ldbl.h
++++ glibc-2.11.90-3/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.11-55-gb55ec98/include/features.h
-+++ glibc-2.11.90-2/include/features.h
+--- glibc-2.11-73-g2510d01/include/features.h
++++ glibc-2.11.90-3/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -394,8 +394,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.11-55-gb55ec98/intl/locale.alias
-+++ glibc-2.11.90-2/intl/locale.alias
+--- glibc-2.11-73-g2510d01/intl/locale.alias
++++ glibc-2.11.90-3/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -405,8 +405,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.11-55-gb55ec98/libio/stdio.h
-+++ glibc-2.11.90-2/libio/stdio.h
+--- glibc-2.11-73-g2510d01/libio/stdio.h
++++ glibc-2.11.90-3/libio/stdio.h
 @@ -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.  */
@@ -420,8 +420,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.11-55-gb55ec98/locale/iso-4217.def
-+++ glibc-2.11.90-2/locale/iso-4217.def
+--- glibc-2.11-73-g2510d01/locale/iso-4217.def
++++ glibc-2.11.90-3/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -513,8 +513,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.11-55-gb55ec98/locale/programs/locarchive.c
-+++ glibc-2.11.90-2/locale/programs/locarchive.c
+--- glibc-2.11-73-g2510d01/locale/programs/locarchive.c
++++ glibc-2.11.90-3/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -546,8 +546,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.11-55-gb55ec98/localedata/Makefile
-+++ glibc-2.11.90-2/localedata/Makefile
+--- glibc-2.11-73-g2510d01/localedata/Makefile
++++ glibc-2.11.90-3/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -556,8 +556,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.11-55-gb55ec98/localedata/SUPPORTED
-+++ glibc-2.11.90-2/localedata/SUPPORTED
+--- glibc-2.11-73-g2510d01/localedata/SUPPORTED
++++ glibc-2.11.90-3/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -599,8 +599,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.11-55-gb55ec98/localedata/locales/cy_GB
-+++ glibc-2.11.90-2/localedata/locales/cy_GB
+--- glibc-2.11-73-g2510d01/localedata/locales/cy_GB
++++ glibc-2.11.90-3/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  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>"
@@ -615,8 +615,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.11-55-gb55ec98/localedata/locales/en_GB
-+++ glibc-2.11.90-2/localedata/locales/en_GB
+--- glibc-2.11-73-g2510d01/localedata/locales/en_GB
++++ glibc-2.11.90-3/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  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>"
@@ -628,8 +628,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-2.11-55-gb55ec98/localedata/locales/no_NO
-+++ glibc-2.11.90-2/localedata/locales/no_NO
+--- glibc-2.11-73-g2510d01/localedata/locales/no_NO
++++ glibc-2.11.90-3/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -700,8 +700,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.11-55-gb55ec98/localedata/locales/zh_TW
-+++ glibc-2.11.90-2/localedata/locales/zh_TW
+--- glibc-2.11-73-g2510d01/localedata/locales/zh_TW
++++ glibc-2.11.90-3/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -729,8 +729,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.11-55-gb55ec98/malloc/mcheck.c
-+++ glibc-2.11.90-2/malloc/mcheck.c
+--- glibc-2.11-73-g2510d01/malloc/mcheck.c
++++ glibc-2.11.90-3/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -806,8 +806,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.11-55-gb55ec98/manual/libc.texinfo
-+++ glibc-2.11.90-2/manual/libc.texinfo
+--- glibc-2.11-73-g2510d01/manual/libc.texinfo
++++ glibc-2.11.90-3/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -817,8 +817,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.11-55-gb55ec98/misc/sys/cdefs.h
-+++ glibc-2.11.90-2/misc/sys/cdefs.h
+--- glibc-2.11-73-g2510d01/misc/sys/cdefs.h
++++ glibc-2.11.90-3/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -862,17 +862,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.11-55-gb55ec98/nis/nss
-+++ glibc-2.11.90-2/nis/nss
+--- glibc-2.11-73-g2510d01/nis/nss
++++ glibc-2.11.90-3/nis/nss
 @@ -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-2.11-55-gb55ec98/nptl/ChangeLog
-+++ glibc-2.11.90-2/nptl/ChangeLog
-@@ -3771,6 +3771,15 @@
+--- glibc-2.11-73-g2510d01/nptl/ChangeLog
++++ glibc-2.11.90-3/nptl/ChangeLog
+@@ -3792,6 +3792,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -888,7 +888,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4507,6 +4516,11 @@
+@@ -4528,6 +4537,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -900,7 +900,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6581,6 +6595,11 @@
+@@ -6602,6 +6616,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -912,8 +912,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.11-55-gb55ec98/nptl/Makefile
-+++ glibc-2.11.90-2/nptl/Makefile
+--- glibc-2.11-73-g2510d01/nptl/Makefile
++++ glibc-2.11.90-3/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -946,8 +946,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.11-55-gb55ec98/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.11.90-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.11-73-g2510d01/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.11.90-3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -956,8 +956,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.11-55-gb55ec98/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.11.90-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.11-73-g2510d01/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.11.90-3/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -965,8 +965,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.11-55-gb55ec98/nptl/tst-stackguard1.c
-+++ glibc-2.11.90-2/nptl/tst-stackguard1.c
+--- glibc-2.11-73-g2510d01/nptl/tst-stackguard1.c
++++ glibc-2.11.90-3/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -991,8 +991,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.11-55-gb55ec98/nscd/nscd.conf
-+++ glibc-2.11.90-2/nscd/nscd.conf
+--- glibc-2.11-73-g2510d01/nscd/nscd.conf
++++ glibc-2.11.90-3/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1002,8 +1002,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.11-55-gb55ec98/nscd/nscd.init
-+++ glibc-2.11.90-2/nscd/nscd.init
+--- glibc-2.11-73-g2510d01/nscd/nscd.init
++++ glibc-2.11.90-3/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1075,8 +1075,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.11-55-gb55ec98/posix/Makefile
-+++ glibc-2.11.90-2/posix/Makefile
+--- glibc-2.11-73-g2510d01/posix/Makefile
++++ glibc-2.11.90-3/posix/Makefile
 @@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1097,8 +1097,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.11-55-gb55ec98/posix/getconf.speclist.h
-+++ glibc-2.11.90-2/posix/getconf.speclist.h
+--- glibc-2.11-73-g2510d01/posix/getconf.speclist.h
++++ glibc-2.11.90-3/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1139,8 +1139,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.11-55-gb55ec98/streams/Makefile
-+++ glibc-2.11.90-2/streams/Makefile
+--- glibc-2.11-73-g2510d01/streams/Makefile
++++ glibc-2.11.90-3/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1150,8 +1150,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.11-55-gb55ec98/sysdeps/generic/dl-cache.h
-+++ glibc-2.11.90-2/sysdeps/generic/dl-cache.h
+--- glibc-2.11-73-g2510d01/sysdeps/generic/dl-cache.h
++++ glibc-2.11.90-3/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1167,8 +1167,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-2.11-55-gb55ec98/sysdeps/i386/Makefile
-+++ glibc-2.11.90-2/sysdeps/i386/Makefile
+--- glibc-2.11-73-g2510d01/sysdeps/i386/Makefile
++++ glibc-2.11.90-3/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1193,8 +1193,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.11-55-gb55ec98/sysdeps/ia64/Makefile
-+++ glibc-2.11.90-2/sysdeps/ia64/Makefile
+--- glibc-2.11-73-g2510d01/sysdeps/ia64/Makefile
++++ glibc-2.11.90-3/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1206,8 +1206,8 @@
  endif
  endif
  
---- glibc-2.11-55-gb55ec98/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.11.90-2/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.11-73-g2510d01/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.11.90-3/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1559,8 +1559,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.11-55-gb55ec98/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.11.90-2/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.11-73-g2510d01/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.11.90-3/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1646,8 +1646,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.11-55-gb55ec98/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.11.90-2/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.11-73-g2510d01/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.11.90-3/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1656,8 +1656,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.11-55-gb55ec98/sysdeps/unix/nice.c
-+++ glibc-2.11.90-2/sysdeps/unix/nice.c
+--- glibc-2.11-73-g2510d01/sysdeps/unix/nice.c
++++ glibc-2.11.90-3/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1672,8 +1672,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1689,8 +1689,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1738,8 +1738,8 @@
      }
    else
  #endif
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1782,8 +1782,8 @@
      {
        size_t filelen = strlen (file);
        if (__builtin_expect (filelen == 0, 0))
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1844,8 +1844,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -1878,29 +1878,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -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-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -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-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1926,8 +1926,8 @@
  
  struct netlink_res
  {
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1937,8 +1937,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.11-73-g2510d01/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.11.90-3/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -1984,8 +1984,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.11-55-gb55ec98/timezone/zic.c
-+++ glibc-2.11.90-2/timezone/zic.c
+--- glibc-2.11-73-g2510d01/timezone/zic.c
++++ glibc-2.11.90-3/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -p -r1.421 -r1.422
--- glibc.spec	30 Nov 2009 14:16:32 -0000	1.421
+++ glibc.spec	14 Dec 2009 16:39:29 -0000	1.422
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.11-55-gb55ec98
+%define glibcsrcdir glibc-2.11-73-g2510d01
 %define glibcversion 2.11.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 3
+Release: 4
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1033,6 +1033,16 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Dec 14 2009 Andreas Schwab <schwab at redhat.com> - 2.11.90-4
+- Update from master.
+  - Add Requeue-PI support for x86 arch.
+  - Redefine O_SYNC and O_DSYNC to match 2.6.33+ kernels.
+  - Fix a few error cases in *name4_r lookup handling (BZ#11000).
+  - Fix kernel version check in recent ptsname change (BZ#11046).
+  - Add more warnings to exec functions (BZ#11056).
+  - Add recvmmsg interface.
+  - Define SCHED_IDLE and SCHED_RESET_ON_FORK for Linux.
+
 * Mon Nov 30 2009 Andreas Schwab <schwab at redhat.com> - 2.11.90-3
 - Update from master.
   - Fix infloop in __pthread_disable_asynccancel on x86_64 (#537690).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- import.log	30 Nov 2009 14:16:32 -0000	1.37
+++ import.log	14 Dec 2009 16:39:29 -0000	1.38
@@ -35,3 +35,4 @@ glibc-2_10_90-24:HEAD:glibc-2.10.90-24.s
 glibc-2_11_90-1:HEAD:glibc-2.11.90-1.src.rpm:1258048159
 glibc-2_11_90-2:HEAD:glibc-2.11.90-2.src.rpm:1259077749
 glibc-2_11_90-3:HEAD:glibc-2.11.90-3.src.rpm:1259590502
+glibc-2_11_90-4:HEAD:glibc-2.11.90-4.src.rpm:1260808586


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- sources	30 Nov 2009 14:16:32 -0000	1.319
+++ sources	14 Dec 2009 16:39:29 -0000	1.320
@@ -1,2 +1,2 @@
-dd7994030ce90df1033fc396fdb475c8  glibc-2.11-55-gb55ec98-fedora.tar.bz2
-f25608ae96e0b7f5d22ce30ebee2bd61  glibc-2.11-55-gb55ec98.tar.bz2
+fae6f0cf6083dde530d39b37266540d3  glibc-2.11-73-g2510d01-fedora.tar.bz2
+54ffdf3a3bfa33e5ab9da62119d2719c  glibc-2.11-73-g2510d01.tar.bz2



From steved at fedoraproject.org  Mon Dec 14 16:43:38 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 14 Dec 2009 16:43:38 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.2-rc3.patch, NONE,
	1.1 nfs-utils.spec, 1.257,
	1.258 nfs-utils-1.2.1-mount-eperm.patch, 1.1,
	NONE nfs-utils-1.2.1-nfsd-bootfail.patch, 1.1, NONE
Message-ID: <20091214164338.16E2911C00E9@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20082

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.2-rc3.patch 
Removed Files:
	nfs-utils-1.2.1-mount-eperm.patch 
	nfs-utils-1.2.1-nfsd-bootfail.patch 
Log Message:
Updated to latest upstream RC release: nfs-utils-1-2-2-rc3


nfs-utils-1.2.2-rc3.patch:
 support/include/ha-callout.h |    4 
 support/include/nfsrpc.h     |   12 +
 support/nfs/getport.c        |   92 ++++++++-
 utils/gssd/gssd.c            |    6 
 utils/gssd/gssd.h            |   12 +
 utils/gssd/gssd_main_loop.c  |  102 +++++++++-
 utils/gssd/gssd_proc.c       |  422 +++++++++++++++++++++++++++++++++----------
 utils/gssd/krb5_util.c       |   22 +-
 utils/gssd/krb5_util.h       |    3 
 utils/gssd/svcgssd_proc.c    |   94 ++++++++-
 utils/mount/mount.c          |    3 
 utils/mount/network.c        |  128 ++++++++-----
 utils/mount/network.h        |    5 
 utils/mount/nfs.man          |  104 +++++++---
 utils/mount/nfs4mount.c      |   25 +-
 utils/mount/nfsmount.c       |    7 
 utils/mount/nfsumount.c      |   15 +
 utils/mount/stropts.c        |  131 ++++++++-----
 utils/mountd/auth.c          |    3 
 utils/nfsd/nfssvc.c          |    2 
 utils/statd/Makefile.am      |    7 
 utils/statd/callback.c       |    4 
 utils/statd/misc.c           |   12 -
 utils/statd/monitor.c        |   47 ++--
 utils/statd/rmtcall.c        |   36 +--
 utils/statd/simu.c           |   10 -
 utils/statd/simulate.c       |   52 ++---
 utils/statd/sm-notify.c      |  213 +++++++--------------
 utils/statd/sm-notify.man    |    6 
 utils/statd/stat.c           |    8 
 utils/statd/statd.c          |   57 ++---
 utils/statd/statd.h          |    9 
 utils/statd/svc_run.c        |    7 
 33 files changed, 1108 insertions(+), 552 deletions(-)

--- NEW FILE nfs-utils-1.2.2-rc3.patch ---
diff -up nfs-utils-1.2.1/support/include/ha-callout.h.orig nfs-utils-1.2.1/support/include/ha-callout.h
--- nfs-utils-1.2.1/support/include/ha-callout.h.orig	2009-11-04 06:13:56.000000000 -0500
+++ nfs-utils-1.2.1/support/include/ha-callout.h	2009-12-14 11:36:12.961824114 -0500
@@ -53,11 +53,7 @@ ha_callout(char *event, char *arg1, char
 		default: pid = waitpid(pid, &ret, 0);
   	}
 	sigaction(SIGCHLD, &oldact, &newact);
-#ifdef dprintf
-	dprintf(N_DEBUG, "ha callout returned %d\n", WEXITSTATUS(ret));
-#else
 	xlog(D_GENERAL, "ha callout returned %d\n", WEXITSTATUS(ret));
-#endif
 }
 
 #endif
diff -up nfs-utils-1.2.1/support/include/nfsrpc.h.orig nfs-utils-1.2.1/support/include/nfsrpc.h
--- nfs-utils-1.2.1/support/include/nfsrpc.h.orig	2009-11-04 06:13:56.000000000 -0500
+++ nfs-utils-1.2.1/support/include/nfsrpc.h	2009-12-14 11:36:12.962825032 -0500
@@ -90,6 +90,18 @@ extern CLIENT		*nfs_get_priv_rpcclient( 
 				struct timeval *);
 
 /*
+ * Convert a netid to a protocol number and protocol family
+ */
+extern int		nfs_get_proto(const char *netid, sa_family_t *family,
+				unsigned long *protocol);
+
+/*
+ * Convert a protocol family and protocol name to a netid
+ */
+extern char		*nfs_get_netid(const sa_family_t family,
+				const unsigned long protocol);
+
+/*
  * Convert a socket address to a universal address
  */
 extern char		*nfs_sockaddr2universal(const struct sockaddr *);
diff -up nfs-utils-1.2.1/support/nfs/getport.c.orig nfs-utils-1.2.1/support/nfs/getport.c
--- nfs-utils-1.2.1/support/nfs/getport.c.orig	2009-11-04 06:13:56.000000000 -0500
+++ nfs-utils-1.2.1/support/nfs/getport.c	2009-12-14 11:36:12.962825032 -0500
@@ -199,7 +199,63 @@ static CLIENT *nfs_gp_get_rpcbclient(str
 	return clnt;
 }
 
-/*
+/**
+ * nfs_get_proto - Convert a netid to an address family and protocol number
+ * @netid: C string containing a netid
+ * @family: OUT: address family
+ * @protocol: OUT: protocol number
+ *
+ * Returns 1 and fills in @protocol if the netid was recognized;
+ * otherwise zero is returned.
+ */
+#ifdef HAVE_LIBTIRPC
+int
+nfs_get_proto(const char *netid, sa_family_t *family, unsigned long *protocol)
+{
+	struct netconfig *nconf;
+	struct protoent *proto;
+
+	nconf = getnetconfigent(netid);
+	if (nconf == NULL)
+		return 0;
+
+	proto = getprotobyname(nconf->nc_proto);
+	if (proto == NULL) {
+		freenetconfigent(nconf);
+		return 0;
+	}
+
+	*family = AF_UNSPEC;
+	if (strcmp(nconf->nc_protofmly, NC_INET) == 0)
+		*family = AF_INET;
+	if (strcmp(nconf->nc_protofmly, NC_INET6) == 0)
+		*family = AF_INET6;
+	freenetconfigent(nconf);
+
+	*protocol = (unsigned long)proto->p_proto;
+	return 1;
+}
+#else	/* !HAVE_LIBTIRPC */
+int
+nfs_get_proto(const char *netid, sa_family_t *family, unsigned long *protocol)
+{
+	struct protoent *proto;
+
+	proto = getprotobyname(netid);
+	if (proto == NULL)
+		return 0;
+
+	*family = AF_INET;
+	*protocol = (unsigned long)proto->p_proto;
+	return 1;
+}
+#endif /* !HAVE_LIBTIRPC */
+
+/**
+ * nfs_get_netid - Convert a protocol family and protocol name to a netid
+ * @family: protocol family
+ * @protocol: protocol number
+ *
  * One of the arguments passed when querying remote rpcbind services
  * via rpcbind v3 or v4 is a netid string.  This replaces the pm_prot
  * field used in legacy PMAP_GETPORT calls.
@@ -213,13 +269,12 @@ static CLIENT *nfs_gp_get_rpcbclient(str
  * first entry that matches @family and @protocol and whose netid string
  * fits in the provided buffer.
  *
- * Returns a '\0'-terminated string if successful; otherwise NULL.
+ * Returns a '\0'-terminated string if successful.  Caller must
+ * free the returned string.  Otherwise NULL is returned, and
  * rpc_createerr.cf_stat is set to reflect the error.
  */
 #ifdef HAVE_LIBTIRPC
-
-static char *nfs_gp_get_netid(const sa_family_t family,
-			      const unsigned short protocol)
+char *nfs_get_netid(const sa_family_t family, const unsigned long protocol)
 {
 	char *nc_protofmly, *nc_proto, *nc_netid;
 	struct netconfig *nconf;
@@ -255,6 +310,9 @@ static char *nfs_gp_get_netid(const sa_f
 
 		nc_netid = strdup(nconf->nc_netid);
 		endnetconfig(handle);
+
+		if (nc_netid == NULL)
+			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
 		return nc_netid;
 	}
 	endnetconfig(handle);
@@ -263,8 +321,28 @@ out:
 	rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
 	return NULL;
 }
+#else	/* !HAVE_LIBTIRPC */
+char *nfs_get_netid(const sa_family_t family, const unsigned long protocol)
+{
+	struct protoent *proto;
+	char *netid;
 
-#endif	/* HAVE_LIBTIRPC */
+	if (family != AF_INET)
+		goto out;
+	proto = getprotobynumber((int)protocol);
+	if (proto == NULL)
+		goto out;
+
+	netid = strdup(proto->p_name);
+	if (netid == NULL)
+		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+	return netid;
+
+out:
+	rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
+	return NULL;
+}
+#endif	/* !HAVE_LIBTIRPC */
 
 /*
  * Extract a port number from a universal address, and terminate the
@@ -421,7 +499,7 @@ static int nfs_gp_init_rpcb_parms(const 
 {
 	char *netid, *addr;
 
-	netid = nfs_gp_get_netid(sap->sa_family, protocol);
+	netid = nfs_get_netid(sap->sa_family, protocol);
 	if (netid == NULL)
 		return 0;
 
diff -up nfs-utils-1.2.1/utils/gssd/gssd.c.orig nfs-utils-1.2.1/utils/gssd/gssd.c
--- nfs-utils-1.2.1/utils/gssd/gssd.c.orig	2009-11-04 06:13:56.000000000 -0500
+++ nfs-utils-1.2.1/utils/gssd/gssd.c	2009-12-14 11:36:12.963824196 -0500
@@ -56,7 +56,6 @@
 #include "krb5_util.h"
 
 char pipefs_dir[PATH_MAX] = GSSD_PIPEFS_DIR;
-char pipefs_nfsdir[PATH_MAX] = GSSD_PIPEFS_DIR;
 char keytabfile[PATH_MAX] = GSSD_DEFAULT_KEYTAB_FILE;
 char ccachedir[PATH_MAX] = GSSD_DEFAULT_CRED_DIR;
 char *ccachesearch[GSSD_MAX_CCACHE_SEARCH + 1];
@@ -159,11 +158,6 @@ main(int argc, char *argv[])
 	if (preferred_realm == NULL)
 		gssd_k5_get_default_realm(&preferred_realm);
 
-	snprintf(pipefs_nfsdir, sizeof(pipefs_nfsdir), "%s/%s",
-		 pipefs_dir, GSSD_SERVICE_NAME);
-	if (pipefs_nfsdir[sizeof(pipefs_nfsdir)-1] != '\0')
-		errx(1, "pipefs_nfsdir path name too long");
-
 	if ((progname = strrchr(argv[0], '/')))
 		progname++;
 	else
diff -up nfs-utils-1.2.1/utils/gssd/gssd.h.orig nfs-utils-1.2.1/utils/gssd/gssd.h
--- nfs-utils-1.2.1/utils/gssd/gssd.h.orig	2009-11-04 06:13:56.000000000 -0500
+++ nfs-utils-1.2.1/utils/gssd/gssd.h	2009-12-14 11:36:12.963824196 -0500
@@ -60,7 +60,6 @@ enum {AUTHTYPE_KRB5, AUTHTYPE_SPKM3, AUT
 
[...3099 lines suppressed...]
 	my_svc_exit();
 }
@@ -141,7 +137,7 @@ static void log_modes(void)
 	if (run_mode & MODE_LOG_STDERR)
 		strcat(buf,"Log-STDERR ");
 
-	note(N_WARNING,buf);
+	xlog_warn(buf);
 }
 
 /*
@@ -175,13 +171,12 @@ static void create_pidfile(void)
 	unlink(pidfile);
 	fp = fopen(pidfile, "w");
 	if (!fp)
-		die("Opening %s failed: %s\n",
-		    pidfile, strerror(errno));
+		xlog_err("Opening %s failed: %m\n", pidfile);
 	fprintf(fp, "%d\n", getpid());
 	pidfd = dup(fileno(fp));
 	if (fclose(fp) < 0) {
-		note(N_WARNING, "Flushing pid file failed: errno %d (%s)\n",
-			errno, strerror(errno));
+		xlog_warn("Flushing pid file failed: errno %d (%m)\n",
+			errno);
 	}
 }
 
@@ -189,8 +184,8 @@ static void truncate_pidfile(void)
 {
 	if (pidfd >= 0) {
 		if (ftruncate(pidfd, 0) < 0) {
-			note(N_WARNING, "truncating pid file failed: errno %d (%s)\n",
-				errno, strerror(errno));
+			xlog_warn("truncating pid file failed: errno %d (%m)\n",
+				errno);
 		}
 	}
 }
@@ -206,8 +201,8 @@ static void drop_privs(void)
 	}
 
 	if (st.st_uid == 0) {
-		note(N_WARNING, "statd running as root. chown %s to choose different user\n",
-		    SM_DIR);
+		xlog_warn("Running as 'root'.  "
+			"chown %s to choose different user\n", SM_DIR);
 		return;
 	}
 	/* better chown the pid file before dropping, as if it
@@ -215,14 +210,14 @@ static void drop_privs(void)
 	 */
 	if (pidfd >= 0) {
 		if (fchown(pidfd, st.st_uid, st.st_gid) < 0) {
-			note(N_ERROR, "Unable to change owner of %s: %d (%s)",
+			xlog(L_ERROR, "Unable to change owner of %s: %d (%s)",
 					SM_DIR, strerror (errno));
 		}
 	}
 	setgroups(0, NULL);
 	if (setgid(st.st_gid) == -1
 	    || setuid(st.st_uid) == -1) {
-		note(N_ERROR, "Fail to drop privileges");
+		xlog(L_ERROR, "Fail to drop privileges");
 		exit(1);
 	}
 }
@@ -266,6 +261,8 @@ int main (int argc, char **argv)
 
 	/* Default: daemon mode, no other options */
 	run_mode = 0;
+	xlog_stderr(0);
+	xlog_syslog(1);
 
 	/* Set the basename */
 	if ((name_p = strrchr(argv[0],'/')) != NULL) {
@@ -274,13 +271,6 @@ int main (int argc, char **argv)
 		name_p = argv[0];
 	}
 
-	/* Get the version */
-	if ((version_p = strrchr(VERSION,' ')) != NULL) {
-		version_p++;
-	} else {
-		version_p = VERSION;
-	}
-	
 	/* Set hostname */
 	MY_NAME = NULL;
 
@@ -289,7 +279,7 @@ int main (int argc, char **argv)
 		switch (arg) {
 		case 'V':	/* Version */
 		case 'v':
-			printf("%s version %s\n",name_p,version_p);
+			printf("%s version " VERSION "\n",name_p);
 			exit(0);
 		case 'F':	/* Foreground/nodaemon mode */
 			run_mode |= MODE_NODAEMON;
@@ -383,7 +373,6 @@ int main (int argc, char **argv)
 		run_sm_notify(out_port);
 	}
 
-
 	if (!(run_mode & MODE_NODAEMON)) {
 		run_mode &= ~MODE_LOG_STDERR;	/* Never log to console in
 						   daemon mode. */
@@ -455,7 +444,13 @@ int main (int argc, char **argv)
 
 	/* Child. */
 
-	log_init (/*name_p,version_p*/);
+	if (run_mode & MODE_LOG_STDERR) {
+		xlog_syslog(0);
+		xlog_stderr(1);
+		xlog_config(D_ALL, 1);
+	}
+	xlog_open(name_p);
+	xlog(L_NOTICE, "Version " VERSION " starting");
 
 	log_modes();
 
@@ -505,7 +500,7 @@ int main (int argc, char **argv)
 	if (pipefds[1] > 0) {
 		status = 0;
 		if (write(pipefds[1], &status, 1) != 1) {
-			note(N_WARNING, "writing to parent pipe failed: errno %d (%s)\n",
+			xlog_warn("writing to parent pipe failed: errno %d (%s)\n",
 				errno, strerror(errno));
 		}
 		close(pipefds[1]);
@@ -552,7 +547,7 @@ load_state_number(void)
 		return;
 
 	if (read(fd, &MY_STATE, sizeof(MY_STATE)) != sizeof(MY_STATE)) {
-		note(N_WARNING, "Unable to read state from '%s': errno %d (%s)",
+		xlog_warn("Unable to read state from '%s': errno %d (%s)",
 				SM_STAT_PATH, errno, strerror(errno));
 	}
 	close(fd);
@@ -561,7 +556,7 @@ load_state_number(void)
 		char buf[20];
 		snprintf(buf, sizeof(buf), "%d", MY_STATE);
 		if (write(fd, buf, strlen(buf)) != strlen(buf))
-			note(N_WARNING, "Writing to '%s' failed: errno %d (%s)",
+			xlog_warn("Writing to '%s' failed: errno %d (%s)",
 				file, errno, strerror(errno));
 		close(fd);
 	}
diff -up nfs-utils-1.2.1/utils/statd/statd.h.orig nfs-utils-1.2.1/utils/statd/statd.h
--- nfs-utils-1.2.1/utils/statd/statd.h.orig	2009-12-14 11:35:16.304699406 -0500
+++ nfs-utils-1.2.1/utils/statd/statd.h	2009-12-14 11:36:12.976836745 -0500
@@ -11,7 +11,7 @@
 
 #include "sm_inter.h"
 #include "system.h"
-#include "log.h"
+#include "xlog.h"
 
 /*
  * Paths and filenames.
@@ -85,10 +85,3 @@ extern int run_mode;
  * another host.... */
 #define STATIC_HOSTNAME 8	/* Always use the hostname set by -n */
 #define	MODE_NO_NOTIFY	16	/* Don't notify peers of a reboot */
-/*
- * Program name and version pointers -- See statd.c for the reasoning
- * as to why they're global.
- */
-extern char *name_p;		/* program basename */
-extern const char *version_p;	/* program version */
-
diff -up nfs-utils-1.2.1/utils/statd/svc_run.c.orig nfs-utils-1.2.1/utils/statd/svc_run.c
--- nfs-utils-1.2.1/utils/statd/svc_run.c.orig	2009-11-04 06:13:56.000000000 -0500
+++ nfs-utils-1.2.1/utils/statd/svc_run.c	2009-12-14 11:36:12.977852736 -0500
@@ -101,12 +101,12 @@ my_svc_run(void)
 
 			tv.tv_sec  = NL_WHEN(notify) - now;
 			tv.tv_usec = 0;
-			dprintf(N_DEBUG, "Waiting for reply... (timeo %d)",
+			xlog(D_GENERAL, "Waiting for reply... (timeo %d)",
 							tv.tv_sec);
 			selret = select(FD_SETSIZE, &readfds,
 				(void *) 0, (void *) 0, &tv);
 		} else {
-			dprintf(N_DEBUG, "Waiting for client connections.");
+			xlog(D_GENERAL, "Waiting for client connections");
 			selret = select(FD_SETSIZE, &readfds,
 				(void *) 0, (void *) 0, (struct timeval *) 0);
 		}
@@ -116,8 +116,7 @@ my_svc_run(void)
 			if (errno == EINTR || errno == ECONNREFUSED
 			 || errno == ENETUNREACH || errno == EHOSTUNREACH)
 				continue;
-			note(N_ERROR, "my_svc_run() - select: %s",
-				strerror (errno));
+			xlog(L_ERROR, "my_svc_run() - select: %m");
 			return;
 
 		case 0:


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- nfs-utils.spec	10 Dec 2009 19:24:27 -0000	1.257
+++ nfs-utils.spec	14 Dec 2009 16:43:37 -0000	1.258
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -22,9 +22,9 @@ Patch00: nfs-utils-1.0.5-statdpath.patch
 Patch01: nfs-utils-1.1.0-smnotify-path.patch
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
+Patch100: nfs-utils-1.2.2-rc3.patch
+
 Patch200: nfs-utils-1.2.0-v4root-rel9.patch
-Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
-Patch202: nfs-utils-1.2.1-mount-eperm.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -76,9 +76,9 @@ This package also contains the mount.nfs
 %patch01 -p1
 %patch02 -p1
 
+%patch100 -p1
+
 %patch200 -p1
-%patch201 -p1
-%patch202 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -250,6 +250,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Dec 14 2009 Steve Dickson <steved at redhat.com> 1.2.1-7
+- Updated to latest upstream RC release: nfs-utils-1-2-2-rc3
+
 * Thu Dec 10 2009 Steve Dickson <steved at redhat.com> 1.2.1-6
 - Update the  pseudo root to handle security flavors better.
 


--- nfs-utils-1.2.1-mount-eperm.patch DELETED ---


--- nfs-utils-1.2.1-nfsd-bootfail.patch DELETED ---



From mhlavink at fedoraproject.org  Mon Dec 14 16:45:57 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 14 Dec 2009 16:45:57 +0000 (UTC)
Subject: File INIT.2009-12-11.tgz uploaded to lookaside cache by mhlavink
Message-ID: <20091214164557.01A9A28EC9E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ksh:

9a8411936bb2117314db78b02d502ddd  INIT.2009-12-11.tgz



From mhlavink at fedoraproject.org  Mon Dec 14 16:46:04 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 14 Dec 2009 16:46:04 +0000 (UTC)
Subject: File ast-ksh.2009-12-11.tgz uploaded to lookaside cache by mhlavink
Message-ID: <20091214164604.0F53328EC9E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ksh:

a3a4628de96f15844b2770c73a506b56  ast-ksh.2009-12-11.tgz



From than at fedoraproject.org  Mon Dec 14 16:50:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 14 Dec 2009 16:50:14 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 kdelibs-3.5.10-ossl-1.x.patch,NONE,1.1
Message-ID: <20091214165014.4CEA811C00E9@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21151

Added Files:
	kdelibs-3.5.10-ossl-1.x.patch 
Log Message:
add missing kdelibs-3.5.10-ossl-1.x.patch


kdelibs-3.5.10-ossl-1.x.patch:
 kopenssl.cc        |   22 +++++++++++++++++++---
 kopenssl.h         |   16 ++++++++++++++--
 ksmimecrypto.cc    |    2 +-
 ksslcertificate.cc |   32 +++++++++++++++++++++++---------
 4 files changed, 57 insertions(+), 15 deletions(-)

--- NEW FILE kdelibs-3.5.10-ossl-1.x.patch ---
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
 static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
                                    const EVP_CIPHER *,unsigned char *,int ,
                                             pem_password_cb *, void *) = 0L;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
+#else
 static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
 static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
 static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
+#endif
 static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
 static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
 static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
@@ -430,9 +435,14 @@ KConfig *cfg;
       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
+#else
       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
+#endif
       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
@@ -594,7 +604,7 @@ KConfig *cfg;
       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
 #endif
 
 
@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
    else return -1;
 }
 
-
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
+   else return -1;
+}
+#else
 ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
    else return 0L;
@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
    else return -1;
 }
-
+#endif
 
 int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
--- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
 #include <openssl/stack.h>
 #include <openssl/bn.h>
 #undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
 #endif
 
 #include <kstaticdeleter.h>
@@ -446,12 +449,12 @@ public:
     */
    int PEM_write_bio_X509(BIO *bp, X509 *x);
 
-
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
    /*
     *   X509_asn1_meth - used for netscape output
     */
    ASN1_METHOD *X509_asn1_meth();
-
+#endif
 
    /*
     *   ASN1_i2d_fp - used for netscape output
@@ -531,6 +534,9 @@ public:
     */
    void sk_free(STACK *s);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
 
    /* 
     *  Number of elements in the stack
@@ -543,6 +549,9 @@ public:
     */
    char *sk_value(STACK *s, int n);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
 
    /* 
     *  Create a new stack
@@ -555,6 +564,9 @@ public:
     */
    int sk_push(STACK *s, char *d);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
 
    /* 
     *  Duplicate the stack
diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
--- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
 
 
 STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
-    STACK_OF(X509) *x509 = sk_new(NULL);
+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
     KSSLCertificate *cert = certs.first();
     while(cert) {
 	sk_X509_push(x509, cert->getCert());
diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
@@ -1003,17 +1003,31 @@ return qba;
 QByteArray KSSLCertificate::toNetscape() {
 QByteArray qba;
 #ifdef KSSL_HAVE_SSL
-ASN1_HEADER ah;
-ASN1_OCTET_STRING os;
-KTempFile ktf;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	NETSCAPE_X509 nx;
+	ASN1_OCTET_STRING hdr;
+#else
+   ASN1_HEADER ah;
+   ASN1_OCTET_STRING os;
+#endif
+	KTempFile ktf;
 
-	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-	os.length = strlen(NETSCAPE_CERT_HDR);
-	ah.header = &os;
-	ah.data = (char *)getCert();
-	ah.meth = d->kossl->X509_asn1_meth();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
+	hdr.length = strlen(NETSCAPE_CERT_HDR);
+	nx.header = &hdr;
+	nx.cert = getCert();
+
+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
+#else
+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+   os.length = strlen(NETSCAPE_CERT_HDR);
+   ah.header = &os;
+   ah.data = (char *)getCert();
+   ah.meth = d->kossl->X509_asn1_meth();
 
-	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+#endif
 
 	ktf.close();
 



From than at fedoraproject.org  Mon Dec 14 16:51:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 14 Dec 2009 16:51:28 +0000 (UTC)
Subject: rpms/kdelibs3/F-11 arts-acinclude.patch, NONE, 1.1 kdelibs3.spec,
	1.67, 1.68
Message-ID: <20091214165128.6666011C00E9@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21455

Modified Files:
	kdelibs3.spec 
Added Files:
	arts-acinclude.patch 
Log Message:
patch autoconfigury to build with autoconf >= 2.64 (Stepan Kasal)


arts-acinclude.patch:
 acinclude.m4.in |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE arts-acinclude.patch ---
2009-12-10  Stepan Kasal  <skasal at redhat.com>

The change of implementation of AC_REQUIRE in 2.64 caused a regression
in the arts project.
This can be fixed by shuffling some macro calls.

I suppose that most of this patch will not be needed with a future
release of Autoconf.
But the last chunk of this patch is a real bug in this source and
should go upstream.

--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
@@ -3081,8 +3081,18 @@
 fi
 ])
 
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
+[ 
+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+  CFLAGS=" $CFLAGS"
+  AC_PROG_CC
+  CXXFLAGS=" $CXXFLAGS"
+  AC_PROG_CXX
+])
+
 AC_DEFUN([AC_CHECK_COMPILERS],
 [
+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
   AC_ARG_ENABLE(debug,
 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
@@ -3141,11 +3151,6 @@
     [kde_use_profiling="no"]
   )
 
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
   AC_PROG_CPP
 
   if test "$GCC" = "yes"; then
@@ -3174,10 +3179,6 @@
      LDFLAGS=""
   fi
 
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
   KDE_CHECK_FOR_BAD_COMPILER
 
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
@@ -3503,8 +3504,8 @@
 AC_REQUIRE([AC_LIBTOOL_DLOPEN])
 AC_REQUIRE([KDE_CHECK_LIB64])
 
-AC_OBJEXT
-AC_EXEEXT
+AC_REQUIRE([AC_OBJEXT])
+AC_REQUIRE([AC_EXEEXT])
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- kdelibs3.spec	9 Dec 2009 18:31:39 -0000	1.67
+++ kdelibs3.spec	14 Dec 2009 16:51:28 -0000	1.68
@@ -85,7 +85,7 @@ Patch106: kdelibs-3.5.10-kio.patch
 Patch107: kdelibs-3.5.10-assert.patch
 Patch108: kdelibs-3.5.10-dtoa.patch
 Patch109: kdelibs-3.5.10-kabc.patch
-
+Patch110: arts-acinclude.patch
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -251,6 +251,7 @@ format for easy browsing
 %patch107 -p1 -b .assert
 %patch108 -p1 -b .alias
 %patch109 -p1 -b .kabc
+%patch110 -p1 -b .autoconf
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -587,6 +588,8 @@ touch --no-create %{_datadir}/icons/crys
 * Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
 - fix security issues in libltdl bundle within kdelibs CVE-2009-3736
 - backport upstream patches
+- patch autoconfigury to build with autoconf >= 2.64 (Stepan Kasal)
+
 
 * Mon Nov  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428



From rdieter at fedoraproject.org  Mon Dec 14 17:00:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 17:00:22 +0000 (UTC)
Subject: rpms/ggz-base-libs/devel ggz-base-libs.spec,1.4,1.5
Message-ID: <20091214170022.08A5F11C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ggz-base-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22854

Modified Files:
	ggz-base-libs.spec 
Log Message:
* Sat Dec 12 2009 Rex Dieter <rdieter at fedoraproject.org> 0.99.5-6
- Verify Check ( rpm -V ggz-client-libs ) (#487984)



Index: ggz-base-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-base-libs/devel/ggz-base-libs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ggz-base-libs.spec	25 Jul 2009 00:02:12 -0000	1.4
+++ ggz-base-libs.spec	14 Dec 2009 17:00:21 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: Base libraries for GGZ gaming zone
 Name:    ggz-base-libs
 Version: 0.99.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: LGPLv2+ and GPLv2+
 Group:   System Environment/Libraries
@@ -54,11 +54,11 @@ Requires: rpm
 %prep
 %setup -q -n %{name}-snapshot-%{version}
 
-%if 0
+%if 1 
 # some auto*/libtool love to quash rpaths
 rm -f m4/libtool.m4 m4/lt*
-libtoolize -f --automake
-aclocal -Im4
+#libtoolize -f --automake
+#aclocal -Im4
 autoreconf -i -f
 %else
 # avoid lib64 rpaths, quick-n-dirty
@@ -115,7 +115,7 @@ rm -rf %{buildroot}
 %files -f all.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%config(noreplace) %{_sysconfdir}/ggz.modules
+%verify(not size md5 mtime) %config(noreplace) %{_sysconfdir}/ggz.modules
 %dir %{_sysconfdir}/ggz.modules.d
 # GPLv2+
 %{_bindir}/ggz-config
@@ -153,6 +153,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 12 2009 Rex Dieter <rdieter at fedoraproject.org> 0.99.5-6
+- Verify Check ( rpm -V ggz-client-libs ) (#487984)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Mon Dec 14 17:03:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 17:03:24 +0000 (UTC)
Subject: rpms/ggz-base-libs/devel ggz-base-libs.spec,1.5,1.6
Message-ID: <20091214170324.CA29011C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ggz-base-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23343

Modified Files:
	ggz-base-libs.spec 
Log Message:
revert auto*foo munging



Index: ggz-base-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-base-libs/devel/ggz-base-libs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ggz-base-libs.spec	14 Dec 2009 17:00:21 -0000	1.5
+++ ggz-base-libs.spec	14 Dec 2009 17:03:24 -0000	1.6
@@ -54,7 +54,7 @@ Requires: rpm
 %prep
 %setup -q -n %{name}-snapshot-%{version}
 
-%if 1 
+%if 0 
 # some auto*/libtool love to quash rpaths
 rm -f m4/libtool.m4 m4/lt*
 #libtoolize -f --automake



From jpopelka at fedoraproject.org  Mon Dec 14 17:10:02 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon, 14 Dec 2009 17:10:02 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-troubleshooter-debugcancel.patch, NONE,
	1.1 system-config-printer.spec, 1.325, 1.326
Message-ID: <20091214171002.B06BD11C00E9@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24874

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-troubleshooter-debugcancel.patch 
Log Message:
* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-8
- Prevent traceback when cancel button in troubleshooter pressed (#546821).


system-config-printer-troubleshooter-debugcancel.patch:
 ErrorLogCheckpoint.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-troubleshooter-debugcancel.patch ---
diff -up system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py.debugcancel system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py
--- system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py.debugcancel	2009-09-01 13:08:33.000000000 +0200
+++ system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py	2009-12-14 17:16:32.000000000 +0100
@@ -23,7 +23,7 @@ import cups
 import os
 import tempfile
 import time
-from timedops import TimedOperation
+from timedops import TimedOperation, OperationCanceled
 from base import *
 class ErrorLogCheckpoint(Question):
     def __init__ (self, troubleshooter):
@@ -162,7 +162,7 @@ class ErrorLogCheckpoint(Question):
             self.op = TimedOperation (self.authconn.adminGetServerSettings,
                                       parent=parent)
             settings = self.op.run ()
-        except cups.IPPError:
+        except (cups.IPPError, OperationCanceled):
             self.troubleshooter.ready ()
             self.forward_allowed = True
             handler (button)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- system-config-printer.spec	9 Dec 2009 10:56:15 -0000	1.325
+++ system-config-printer.spec	14 Dec 2009 17:10:02 -0000	1.326
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -22,6 +22,7 @@ Patch4: system-config-printer-cupsd.conf
 Patch5: system-config-printer-troubleshooter-traceback.patch
 Patch6: system-config-printer-lpd-uri.patch
 Patch7: system-config-printer-short-lived-states.patch
+Patch8: system-config-printer-troubleshooter-debugcancel.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -88,6 +89,7 @@ printers.
 %patch5 -p1 -b .troubleshooter-traceback
 %patch6 -p1 -b .lpd-uri
 %patch7 -p1 -b .short-lived-states
+%patch8 -p1 -b .troubleshooter-debugcancel
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -200,6 +202,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-8
+- Prevent traceback when cancel button in troubleshooter pressed (#546821).
+
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
 - Fixed jobviewer traceback with short-lived state reasons (bug #545733).
 



From jpopelka at fedoraproject.org  Mon Dec 14 17:10:11 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon, 14 Dec 2009 17:10:11 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-troubleshooter-debugcancel.patch, NONE,
	1.1 system-config-printer.spec, 1.321, 1.322
Message-ID: <20091214171011.EF90F11C00E9@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24920

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-troubleshooter-debugcancel.patch 
Log Message:
* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-8
- Prevent traceback when cancel button in troubleshooter pressed (#546821).


system-config-printer-troubleshooter-debugcancel.patch:
 ErrorLogCheckpoint.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-troubleshooter-debugcancel.patch ---
diff -up system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py.debugcancel system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py
--- system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py.debugcancel	2009-09-01 13:08:33.000000000 +0200
+++ system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py	2009-12-14 17:16:32.000000000 +0100
@@ -23,7 +23,7 @@ import cups
 import os
 import tempfile
 import time
-from timedops import TimedOperation
+from timedops import TimedOperation, OperationCanceled
 from base import *
 class ErrorLogCheckpoint(Question):
     def __init__ (self, troubleshooter):
@@ -162,7 +162,7 @@ class ErrorLogCheckpoint(Question):
             self.op = TimedOperation (self.authconn.adminGetServerSettings,
                                       parent=parent)
             settings = self.op.run ()
-        except cups.IPPError:
+        except (cups.IPPError, OperationCanceled):
             self.troubleshooter.ready ()
             self.forward_allowed = True
             handler (button)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- system-config-printer.spec	9 Dec 2009 10:57:04 -0000	1.321
+++ system-config-printer.spec	14 Dec 2009 17:10:11 -0000	1.322
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -22,6 +22,7 @@ Patch4: system-config-printer-cupsd.conf
 Patch5: system-config-printer-troubleshooter-traceback.patch
 Patch6: system-config-printer-lpd-uri.patch
 Patch7: system-config-printer-short-lived-states.patch
+Patch8: system-config-printer-troubleshooter-debugcancel.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -88,6 +89,7 @@ printers.
 %patch5 -p1 -b .troubleshooter-traceback
 %patch6 -p1 -b .lpd-uri
 %patch7 -p1 -b .short-lived-states
+%patch8 -p1 -b .troubleshooter-debugcancel
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -200,6 +202,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-8
+- Prevent traceback when cancel button in troubleshooter pressed (#546821).
+
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
 - Fixed jobviewer traceback with short-lived state reasons (bug #545733).
 



From rdieter at fedoraproject.org  Mon Dec 14 17:14:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 17:14:39 +0000 (UTC)
Subject: File 2.0.10.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091214171439.2160C28EC9E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for eigen2:

4b73cd71a887b7e501fa9c4760e3d33a  2.0.10.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 14 17:15:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 17:15:40 +0000 (UTC)
Subject: rpms/eigen2/devel .cvsignore, 1.13, 1.14 eigen2.spec, 1.20,
	1.21 sources, 1.13, 1.14 eigen2-pkgconfig_noarch.patch, 1.1, NONE
Message-ID: <20091214171540.CC1E411C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25854

Modified Files:
	.cvsignore eigen2.spec sources 
Removed Files:
	eigen2-pkgconfig_noarch.patch 
Log Message:
Revert to (stable) eigen2-2.0.x

* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> 1:2.0.10-1
- eigen-2.0.10
- Provides: eigen2-static



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Jun 2009 16:45:13 -0000	1.13
+++ .cvsignore	14 Dec 2009 17:15:40 -0000	1.14
@@ -1 +1 @@
-default.tar.bz2
+2.0.10.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- eigen2.spec	24 Jul 2009 21:56:56 -0000	1.20
+++ eigen2.spec	14 Dec 2009 17:15:40 -0000	1.21
@@ -1,32 +1,25 @@
 
-# Fedora package review
-# http://bugzilla.redhat.com/459705
+# Fedora review http://bugzilla.redhat.com/459705
 
 %define _with_check -DEIGEN_BUILD_TESTS:BOOL=ON
-#define pre rc1
-## If using a snapshot, check version in Eigen/src/Core/util/Macros.h
-%define snap 20090622
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
-Version: 2.0.52
-Release: 0.3.%{snap}%{?dist} 
+Epoch:   1
+Version: 2.0.10
+Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
 %if 0%{?snap:1}
-Source0: http://bitbucket.org/eigen/eigen2/get/default.tar.bz2
+Source0: http://bitbucket.org/eigen/eigen/get/default.tar.bz2
 %else
-Source0: http://bitbucket.org/eigen/eigen2/get/%{version}%{?pre:-%{pre}}.tar.bz2
+Source0: http://bitbucket.org/eigen/eigen/get/%{version}%{?pre:-%{pre}}.tar.bz2
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-## upstreamable patches
-Patch50: eigen2-pkgconfig_noarch.patch
-
 BuildRequires: cmake
-BuildRequires: pkgconfig
 #docs
 BuildRequires: doxygen graphviz
 
@@ -58,15 +51,14 @@ Summary: A lightweight C++ template libr
 Group:   Development/Libraries
 # -devel subpkg only atm, compat with other distros
 Provides: %{name} = %{version}-%{release}
-Requires: pkgconfig
+# not *strictly* a -static pkg, but the results are the same
+Provides: %{name}-static = %{version}-%{release}
 %description devel
 %{summary}
 
 
 %prep
-%setup -q -n eigen2%{!?snap:-%{version}}
-
-%patch50 -p1 -b .pkgconfig_noarch
+%setup -q -n eigen2
 
 
 %build
@@ -92,7 +84,7 @@ make install DESTDIR=%{buildroot} -C %{_
 
 %check
 %if 0%{?_with_check:1}
-( cd %{_target_platform}/test && ctest %{?snap:||:} )
+( cd %{_target_platform}/test; ctest )
 %endif
 
 
@@ -105,18 +97,21 @@ rm -rf %{buildroot}
 %doc COPYING COPYING.LESSER
 %doc html/
 %{_includedir}/eigen2/
-%{_datadir}/pkgconfig/eigen2.pc
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.52-0.3.20090622
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> 1:2.0.10-1
+- eigen-2.0.10
+- Provides: eigen2-static
+
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 1:2.0.6-1
+- eigen-2.0.6
 
-* Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.52-0.2.20090622
-- switch to upstream-provided snapshot
+* Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.3-1
+- eigen-2.0.3
 
-* Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.52-0.1.20090518svn
-- 2.0.52 20090518 snapshot
+* Tue May 19 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.1-1.1
+- disable build tests (temporarily) to bootstrap secondary archs (s309)
 
 * Mon Apr 15 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.1-1
 - eigen-2.0.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 Jun 2009 16:45:13 -0000	1.13
+++ sources	14 Dec 2009 17:15:40 -0000	1.14
@@ -1 +1 @@
-e1bcbd6ef22df47af5a55badeb39af28  default.tar.bz2
+4b73cd71a887b7e501fa9c4760e3d33a  2.0.10.tar.bz2


--- eigen2-pkgconfig_noarch.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:19:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:19:19 +0000
Subject: [pkgdb] istanbul had acl change status
Message-ID: <20091214171920.66FF128ED21@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on istanbul (Fedora devel) to Approved for pfrields

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Mon Dec 14 17:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:19:23 +0000
Subject: [pkgdb] istanbul had acl change status
Message-ID: <20091214171923.BB51828ED21@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on istanbul (Fedora devel) to Approved for pfrields

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Mon Dec 14 17:19:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:19:30 +0000
Subject: [pkgdb] istanbul had acl change status
Message-ID: <20091214171933.7F17428ED21@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on istanbul (Fedora devel) to Approved for smooge

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Mon Dec 14 17:19:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:19:35 +0000
Subject: [pkgdb] istanbul had acl change status
Message-ID: <20091214171938.1F9C228ED27@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on istanbul (Fedora devel) to Approved for smooge

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/istanbul



From pkgdb at fedoraproject.org  Mon Dec 14 17:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:23:40 +0000
Subject: [pkgdb] ScientificPython had acl change status
Message-ID: <20091214172341.2491728ED21@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on ScientificPython (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Mon Dec 14 17:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:23:47 +0000
Subject: [pkgdb] ScientificPython had acl change status
Message-ID: <20091214172349.4C60528ED24@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on ScientificPython (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Mon Dec 14 17:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:23:59 +0000
Subject: [pkgdb] php-pear-Spreadsheet-Excel-Writer was added for ke4qqq
Message-ID: <20091214172401.AAA3728ECA2@bastion3.fedora.phx2.redhat.com>

kevin has added Package php-pear-Spreadsheet-Excel-Writer with summary Package for generating excel spreadsheets
kevin has approved Package php-pear-Spreadsheet-Excel-Writer
kevin has added a Fedora devel branch for php-pear-Spreadsheet-Excel-Writer with an owner of ke4qqq
kevin has approved php-pear-Spreadsheet-Excel-Writer in Fedora devel
kevin has approved Package php-pear-Spreadsheet-Excel-Writer
kevin has set commit to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora devel)
kevin has set checkout to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora devel)
kevin has set build to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Spreadsheet-Excel-Writer



From pkgdb at fedoraproject.org  Mon Dec 14 17:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:24:08 +0000
Subject: [pkgdb] php-pear-Spreadsheet-Excel-Writer summary updated by kevin
Message-ID: <20091214172409.739B428ED21@bastion3.fedora.phx2.redhat.com>

kevin set package php-pear-Spreadsheet-Excel-Writer summary to Package for generating excel spreadsheets

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Spreadsheet-Excel-Writer



From pkgdb at fedoraproject.org  Mon Dec 14 17:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:24:08 +0000
Subject: [pkgdb] php-pear-Spreadsheet-Excel-Writer (Fedora,
	11) updated by kevin
Message-ID: <20091214172410.4BD8F28ED3D@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for php-pear-Spreadsheet-Excel-Writer
kevin has set commit to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora 11)
kevin has set checkout to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora 11)
kevin has set build to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Spreadsheet-Excel-Writer



From pkgdb at fedoraproject.org  Mon Dec 14 17:24:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:24:09 +0000
Subject: [pkgdb] php-pear-Spreadsheet-Excel-Writer (Fedora,
	12) updated by kevin
Message-ID: <20091214172410.EDEC528ED26@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for php-pear-Spreadsheet-Excel-Writer
kevin has set commit to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora 12)
kevin has set checkout to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora 12)
kevin has set build to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Spreadsheet-Excel-Writer



From pkgdb at fedoraproject.org  Mon Dec 14 17:24:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:24:09 +0000
Subject: [pkgdb] php-pear-Spreadsheet-Excel-Writer (Fedora EPEL,
	5) updated by kevin
Message-ID: <20091214172411.B9EEE28ED50@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for php-pear-Spreadsheet-Excel-Writer
kevin has set commit to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-pear-Spreadsheet-Excel-Writer (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-Spreadsheet-Excel-Writer



From kevin at fedoraproject.org  Mon Dec 14 17:24:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:24:39 +0000 (UTC)
Subject: rpms/php-pear-Spreadsheet-Excel-Writer - New directory
Message-ID: <20091214172439.28BB711C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL27146/rpms/php-pear-Spreadsheet-Excel-Writer

Log Message:
Directory /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:24:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:24:39 +0000 (UTC)
Subject: rpms/php-pear-Spreadsheet-Excel-Writer/devel - New directory
Message-ID: <20091214172439.4481F11C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL27146/rpms/php-pear-Spreadsheet-Excel-Writer/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:24:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:24:46 +0000 (UTC)
Subject: rpms/php-pear-Spreadsheet-Excel-Writer Makefile,NONE,1.1
Message-ID: <20091214172446.9605011C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL27146/rpms/php-pear-Spreadsheet-Excel-Writer

Added Files:
	Makefile 
Log Message:
Setup of module php-pear-Spreadsheet-Excel-Writer


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Spreadsheet-Excel-Writer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:24:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:24:46 +0000 (UTC)
Subject: rpms/php-pear-Spreadsheet-Excel-Writer/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091214172446.E6F0C11C02CA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL27146/rpms/php-pear-Spreadsheet-Excel-Writer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Spreadsheet-Excel-Writer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-Spreadsheet-Excel-Writer
# $Id: Makefile,v 1.1 2009/12/14 17:24:46 kevin Exp $
NAME := php-pear-Spreadsheet-Excel-Writer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:26:12 +0000
Subject: [pkgdb] emacs-spice-mode was added for sagarun
Message-ID: <20091214172612.CB09E28ED51@bastion3.fedora.phx2.redhat.com>

kevin has added Package emacs-spice-mode with summary SPICE Mode for GNU Emacs
kevin has approved Package emacs-spice-mode
kevin has added a Fedora devel branch for emacs-spice-mode with an owner of sagarun
kevin has approved emacs-spice-mode in Fedora devel
kevin has approved Package emacs-spice-mode
kevin has set commit to Approved for 107427 on emacs-spice-mode (Fedora devel)
kevin has set checkout to Approved for 107427 on emacs-spice-mode (Fedora devel)
kevin has set build to Approved for 107427 on emacs-spice-mode (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-spice-mode



From pkgdb at fedoraproject.org  Mon Dec 14 17:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:26:59 +0000
Subject: [pkgdb] emacs-spice-mode summary updated by kevin
Message-ID: <20091214172701.21C8D28ED50@bastion3.fedora.phx2.redhat.com>

kevin set package emacs-spice-mode summary to SPICE Mode for GNU Emacs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-spice-mode



From pkgdb at fedoraproject.org  Mon Dec 14 17:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:26:59 +0000
Subject: [pkgdb] emacs-spice-mode (Fedora EPEL, 5) updated by kevin
Message-ID: <20091214172702.8E57528ED57@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for emacs-spice-mode
kevin has set commit to Approved for 107427 on emacs-spice-mode (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on emacs-spice-mode (Fedora EPEL 5)
kevin has set build to Approved for 107427 on emacs-spice-mode (Fedora EPEL 5)
kevin approved watchbugzilla on emacs-spice-mode (Fedora EPEL 5) for chitlesh
kevin approved watchcommits on emacs-spice-mode (Fedora EPEL 5) for chitlesh
kevin approved commit on emacs-spice-mode (Fedora EPEL 5) for chitlesh
kevin approved build on emacs-spice-mode (Fedora EPEL 5) for chitlesh
kevin approved approveacls on emacs-spice-mode (Fedora EPEL 5) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-spice-mode



From pkgdb at fedoraproject.org  Mon Dec 14 17:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:27:00 +0000
Subject: [pkgdb] emacs-spice-mode (Fedora, 11) updated by kevin
Message-ID: <20091214172704.2E35528ED51@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for emacs-spice-mode
kevin has set commit to Approved for 107427 on emacs-spice-mode (Fedora 11)
kevin has set checkout to Approved for 107427 on emacs-spice-mode (Fedora 11)
kevin has set build to Approved for 107427 on emacs-spice-mode (Fedora 11)
kevin approved watchbugzilla on emacs-spice-mode (Fedora 11) for chitlesh
kevin approved watchcommits on emacs-spice-mode (Fedora 11) for chitlesh
kevin approved commit on emacs-spice-mode (Fedora 11) for chitlesh
kevin approved build on emacs-spice-mode (Fedora 11) for chitlesh
kevin approved approveacls on emacs-spice-mode (Fedora 11) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-spice-mode



From pkgdb at fedoraproject.org  Mon Dec 14 17:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:27:00 +0000
Subject: [pkgdb] emacs-spice-mode (Fedora, 12) updated by kevin
Message-ID: <20091214172706.012D728ED58@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for emacs-spice-mode
kevin has set commit to Approved for 107427 on emacs-spice-mode (Fedora 12)
kevin has set checkout to Approved for 107427 on emacs-spice-mode (Fedora 12)
kevin has set build to Approved for 107427 on emacs-spice-mode (Fedora 12)
kevin approved watchbugzilla on emacs-spice-mode (Fedora 12) for chitlesh
kevin approved watchcommits on emacs-spice-mode (Fedora 12) for chitlesh
kevin approved commit on emacs-spice-mode (Fedora 12) for chitlesh
kevin approved build on emacs-spice-mode (Fedora 12) for chitlesh
kevin approved approveacls on emacs-spice-mode (Fedora 12) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-spice-mode



From pkgdb at fedoraproject.org  Mon Dec 14 17:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:27:00 +0000
Subject: [pkgdb] emacs-spice-mode (Fedora, devel) updated by kevin
Message-ID: <20091214172707.E8F7D28ED5E@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on emacs-spice-mode (Fedora devel) for chitlesh
kevin approved watchcommits on emacs-spice-mode (Fedora devel) for chitlesh
kevin approved commit on emacs-spice-mode (Fedora devel) for chitlesh
kevin approved build on emacs-spice-mode (Fedora devel) for chitlesh
kevin approved approveacls on emacs-spice-mode (Fedora devel) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-spice-mode



From kevin at fedoraproject.org  Mon Dec 14 17:27:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:27:12 +0000 (UTC)
Subject: rpms/emacs-spice-mode - New directory
Message-ID: <20091214172712.1712D11C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-spice-mode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz27680/rpms/emacs-spice-mode

Log Message:
Directory /cvs/pkgs/rpms/emacs-spice-mode added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:27:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:27:12 +0000 (UTC)
Subject: rpms/emacs-spice-mode/devel - New directory
Message-ID: <20091214172712.2E4B911C02CA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-spice-mode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz27680/rpms/emacs-spice-mode/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-spice-mode/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:27:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:27:19 +0000 (UTC)
Subject: rpms/emacs-spice-mode Makefile,NONE,1.1
Message-ID: <20091214172719.6DB3811C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-spice-mode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz27680/rpms/emacs-spice-mode

Added Files:
	Makefile 
Log Message:
Setup of module emacs-spice-mode


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-spice-mode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:27:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:27:19 +0000 (UTC)
Subject: rpms/emacs-spice-mode/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091214172719.9205111C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-spice-mode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz27680/rpms/emacs-spice-mode/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-spice-mode


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-spice-mode
# $Id: Makefile,v 1.1 2009/12/14 17:27:19 kevin Exp $
NAME := emacs-spice-mode
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:27:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:27:57 +0000
Subject: [pkgdb] activemq-cpp was added for stevetraylen
Message-ID: <20091214172758.ECEFB28ED60@bastion3.fedora.phx2.redhat.com>

kevin has added Package activemq-cpp with summary C++ implementation of JMS-like messaging client
kevin has approved Package activemq-cpp
kevin has added a Fedora devel branch for activemq-cpp with an owner of stevetraylen
kevin has approved activemq-cpp in Fedora devel
kevin has approved Package activemq-cpp
kevin has set commit to Approved for 107427 on activemq-cpp (Fedora devel)
kevin has set checkout to Approved for 107427 on activemq-cpp (Fedora devel)
kevin has set build to Approved for 107427 on activemq-cpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/activemq-cpp



From pkgdb at fedoraproject.org  Mon Dec 14 17:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:28:04 +0000
Subject: [pkgdb] activemq-cpp (Fedora, 11) updated by kevin
Message-ID: <20091214172807.5F51B28ED5D@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for activemq-cpp
kevin has set commit to Approved for 107427 on activemq-cpp (Fedora 11)
kevin has set checkout to Approved for 107427 on activemq-cpp (Fedora 11)
kevin has set build to Approved for 107427 on activemq-cpp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/activemq-cpp



From pkgdb at fedoraproject.org  Mon Dec 14 17:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:28:04 +0000
Subject: [pkgdb] activemq-cpp summary updated by kevin
Message-ID: <20091214172806.0E8FC28ED59@bastion3.fedora.phx2.redhat.com>

kevin set package activemq-cpp summary to C++ implementation of JMS-like messaging client

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/activemq-cpp



From pkgdb at fedoraproject.org  Mon Dec 14 17:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:28:04 +0000
Subject: [pkgdb] activemq-cpp (Fedora, 12) updated by kevin
Message-ID: <20091214172809.AB18228ED67@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for activemq-cpp
kevin has set commit to Approved for 107427 on activemq-cpp (Fedora 12)
kevin has set checkout to Approved for 107427 on activemq-cpp (Fedora 12)
kevin has set build to Approved for 107427 on activemq-cpp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/activemq-cpp



From kevin at fedoraproject.org  Mon Dec 14 17:28:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:28:16 +0000 (UTC)
Subject: rpms/activemq-cpp/devel - New directory
Message-ID: <20091214172816.2A5F311C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/activemq-cpp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN28021/rpms/activemq-cpp/devel

Log Message:
Directory /cvs/pkgs/rpms/activemq-cpp/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:28:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:28:16 +0000 (UTC)
Subject: rpms/activemq-cpp - New directory
Message-ID: <20091214172816.1451F11C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/activemq-cpp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN28021/rpms/activemq-cpp

Log Message:
Directory /cvs/pkgs/rpms/activemq-cpp added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:28:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:28:23 +0000 (UTC)
Subject: rpms/activemq-cpp Makefile,NONE,1.1
Message-ID: <20091214172823.50F7D11C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/activemq-cpp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN28021/rpms/activemq-cpp

Added Files:
	Makefile 
Log Message:
Setup of module activemq-cpp


--- NEW FILE Makefile ---
# Top level Makefile for module activemq-cpp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:28:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:28:23 +0000 (UTC)
Subject: rpms/activemq-cpp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091214172823.75A1711C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/activemq-cpp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN28021/rpms/activemq-cpp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module activemq-cpp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: activemq-cpp
# $Id: Makefile,v 1.1 2009/12/14 17:28:23 kevin Exp $
NAME := activemq-cpp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:29:39 +0000
Subject: [pkgdb] pyactivemq was added for stevetraylen
Message-ID: <20091214172941.B7A4328EC1E@bastion3.fedora.phx2.redhat.com>

kevin has added Package pyactivemq with summary Python wrapper around activemq-cpp for messaging
kevin has approved Package pyactivemq
kevin has added a Fedora devel branch for pyactivemq with an owner of stevetraylen
kevin has approved pyactivemq in Fedora devel
kevin has approved Package pyactivemq
kevin has set commit to Approved for 107427 on pyactivemq (Fedora devel)
kevin has set checkout to Approved for 107427 on pyactivemq (Fedora devel)
kevin has set build to Approved for 107427 on pyactivemq (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyactivemq



From pkgdb at fedoraproject.org  Mon Dec 14 17:29:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:29:46 +0000
Subject: [pkgdb] pyactivemq summary updated by kevin
Message-ID: <20091214172947.59CC428ECEB@bastion3.fedora.phx2.redhat.com>

kevin set package pyactivemq summary to Python wrapper around activemq-cpp for messaging

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyactivemq



From pkgdb at fedoraproject.org  Mon Dec 14 17:29:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:29:46 +0000
Subject: [pkgdb] pyactivemq (Fedora, 11) updated by kevin
Message-ID: <20091214172948.72C5F28ECA1@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for pyactivemq
kevin has set commit to Approved for 107427 on pyactivemq (Fedora 11)
kevin has set checkout to Approved for 107427 on pyactivemq (Fedora 11)
kevin has set build to Approved for 107427 on pyactivemq (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyactivemq



From pkgdb at fedoraproject.org  Mon Dec 14 17:29:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:29:46 +0000
Subject: [pkgdb] pyactivemq (Fedora, 12) updated by kevin
Message-ID: <20091214172949.9732828ECEE@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for pyactivemq
kevin has set commit to Approved for 107427 on pyactivemq (Fedora 12)
kevin has set checkout to Approved for 107427 on pyactivemq (Fedora 12)
kevin has set build to Approved for 107427 on pyactivemq (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyactivemq



From kevin at fedoraproject.org  Mon Dec 14 17:30:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:30:07 +0000 (UTC)
Subject: rpms/pyactivemq/devel - New directory
Message-ID: <20091214173007.2945D11C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyactivemq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc28430/rpms/pyactivemq/devel

Log Message:
Directory /cvs/pkgs/rpms/pyactivemq/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:30:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:30:07 +0000 (UTC)
Subject: rpms/pyactivemq - New directory
Message-ID: <20091214173007.13CA611C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyactivemq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc28430/rpms/pyactivemq

Log Message:
Directory /cvs/pkgs/rpms/pyactivemq added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:30:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:30:14 +0000 (UTC)
Subject: rpms/pyactivemq/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091214173014.8614311C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyactivemq/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc28430/rpms/pyactivemq/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyactivemq


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pyactivemq
# $Id: Makefile,v 1.1 2009/12/14 17:30:14 kevin Exp $
NAME := pyactivemq
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Mon Dec 14 17:30:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:30:14 +0000 (UTC)
Subject: rpms/pyactivemq Makefile,NONE,1.1
Message-ID: <20091214173014.650F811C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyactivemq
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc28430/rpms/pyactivemq

Added Files:
	Makefile 
Log Message:
Setup of module pyactivemq


--- NEW FILE Makefile ---
# Top level Makefile for module pyactivemq
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Dec 14 17:30:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:30:54 +0000
Subject: [pkgdb] oflb-dignas-handwriting-fonts was added for musuruan
Message-ID: <20091214173055.261A228ED08@bastion3.fedora.phx2.redhat.com>

kevin has added Package oflb-dignas-handwriting-fonts with summary Handwriting font
kevin has approved Package oflb-dignas-handwriting-fonts
kevin has added a Fedora devel branch for oflb-dignas-handwriting-fonts with an owner of musuruan
kevin has approved oflb-dignas-handwriting-fonts in Fedora devel
kevin has approved Package oflb-dignas-handwriting-fonts
kevin has set commit to Approved for 107427 on oflb-dignas-handwriting-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on oflb-dignas-handwriting-fonts (Fedora devel)
kevin has set build to Approved for 107427 on oflb-dignas-handwriting-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oflb-dignas-handwriting-fonts



From pkgdb at fedoraproject.org  Mon Dec 14 17:31:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:31:01 +0000
Subject: [pkgdb] oflb-dignas-handwriting-fonts summary updated by kevin
Message-ID: <20091214173102.5737128ED06@bastion3.fedora.phx2.redhat.com>

kevin set package oflb-dignas-handwriting-fonts summary to Handwriting font

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oflb-dignas-handwriting-fonts



From pkgdb at fedoraproject.org  Mon Dec 14 17:31:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:31:01 +0000
Subject: [pkgdb] oflb-dignas-handwriting-fonts (Fedora,
	devel) updated by kevin
Message-ID: <20091214173103.5EDC228ED08@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on oflb-dignas-handwriting-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on oflb-dignas-handwriting-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oflb-dignas-handwriting-fonts



From pkgdb at fedoraproject.org  Mon Dec 14 17:31:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:31:01 +0000
Subject: [pkgdb] oflb-dignas-handwriting-fonts (Fedora, 12) updated by kevin
Message-ID: <20091214173104.8BCB728ED06@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for oflb-dignas-handwriting-fonts
kevin has set commit to Approved for 107427 on oflb-dignas-handwriting-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on oflb-dignas-handwriting-fonts (Fedora 12)
kevin has set build to Approved for 107427 on oflb-dignas-handwriting-fonts (Fedora 12)
kevin approved watchbugzilla on oflb-dignas-handwriting-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on oflb-dignas-handwriting-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oflb-dignas-handwriting-fonts



From kevin at fedoraproject.org  Mon Dec 14 17:31:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:31:23 +0000 (UTC)
Subject: rpms/oflb-dignas-handwriting-fonts - New directory
Message-ID: <20091214173123.1244911C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28736/rpms/oflb-dignas-handwriting-fonts

Log Message:
Directory /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:31:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:31:23 +0000 (UTC)
Subject: rpms/oflb-dignas-handwriting-fonts/devel - New directory
Message-ID: <20091214173123.2FE6011C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28736/rpms/oflb-dignas-handwriting-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:31:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:31:30 +0000 (UTC)
Subject: rpms/oflb-dignas-handwriting-fonts Makefile,NONE,1.1
Message-ID: <20091214173130.896AD11C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28736/rpms/oflb-dignas-handwriting-fonts

Added Files:
	Makefile 
Log Message:
Setup of module oflb-dignas-handwriting-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module oflb-dignas-handwriting-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:31:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:31:30 +0000 (UTC)
Subject: rpms/oflb-dignas-handwriting-fonts/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091214173130.B1B9C11C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28736/rpms/oflb-dignas-handwriting-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oflb-dignas-handwriting-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: oflb-dignas-handwriting-fonts
# $Id: Makefile,v 1.1 2009/12/14 17:31:30 kevin Exp $
NAME := oflb-dignas-handwriting-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 $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From sagarun at fedoraproject.org  Mon Dec 14 17:34:44 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Mon, 14 Dec 2009 17:34:44 +0000 (UTC)
Subject: File spice-mode-1.2.25.tar.gz uploaded to lookaside cache by sagarun
Message-ID: <20091214173445.0043A28ED0D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for emacs-spice-mode:

9902d60313b33ed82d44d4ffc7ef9b63  spice-mode-1.2.25.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 14 17:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:34:58 +0000
Subject: [pkgdb] imagej was added for manawy
Message-ID: <20091214173458.DB1E528ECCD@bastion3.fedora.phx2.redhat.com>

kevin has added Package imagej with summary Image Processing and Analysis in Java
kevin has approved Package imagej
kevin has added a Fedora devel branch for imagej with an owner of manawy
kevin has approved imagej in Fedora devel
kevin has approved Package imagej
kevin has set commit to Approved for 107427 on imagej (Fedora devel)
kevin has set checkout to Approved for 107427 on imagej (Fedora devel)
kevin has set build to Approved for 107427 on imagej (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imagej



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:03 +0000
Subject: [pkgdb] imagej summary updated by kevin
Message-ID: <20091214173504.890AF28ECF5@bastion3.fedora.phx2.redhat.com>

kevin set package imagej summary to Image Processing and Analysis in Java

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imagej



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:03 +0000
Subject: [pkgdb] imagej (Fedora, 11) updated by kevin
Message-ID: <20091214173505.70CBE28ECF5@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for imagej
kevin has set commit to Approved for 107427 on imagej (Fedora 11)
kevin has set checkout to Approved for 107427 on imagej (Fedora 11)
kevin has set build to Approved for 107427 on imagej (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imagej



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:03 +0000
Subject: [pkgdb] imagej (Fedora, 12) updated by kevin
Message-ID: <20091214173506.8CC4F28ECCD@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for imagej
kevin has set commit to Approved for 107427 on imagej (Fedora 12)
kevin has set checkout to Approved for 107427 on imagej (Fedora 12)
kevin has set build to Approved for 107427 on imagej (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/imagej



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:09 +0000
Subject: [pkgdb] gpodder had acl change status
Message-ID: <20091214173510.7650B28ECDB@bastion3.fedora.phx2.redhat.com>

jspaleta has set the watchcommits acl on gpodder (Fedora devel) to Approved for vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpodder



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:11 +0000
Subject: [pkgdb] gpodder had acl change status
Message-ID: <20091214173512.8809828ECDB@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on gpodder (Fedora devel) to Approved for vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpodder



From kevin at fedoraproject.org  Mon Dec 14 17:35:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:35:14 +0000 (UTC)
Subject: rpms/imagej - New directory
Message-ID: <20091214173514.2906211C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/imagej
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn29514/rpms/imagej

Log Message:
Directory /cvs/pkgs/rpms/imagej added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:35:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:35:14 +0000 (UTC)
Subject: rpms/imagej/devel - New directory
Message-ID: <20091214173514.3DB0F11C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/imagej/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn29514/rpms/imagej/devel

Log Message:
Directory /cvs/pkgs/rpms/imagej/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:35:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:35:21 +0000 (UTC)
Subject: rpms/imagej Makefile,NONE,1.1
Message-ID: <20091214173521.7DB8711C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/imagej
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn29514/rpms/imagej

Added Files:
	Makefile 
Log Message:
Setup of module imagej


--- NEW FILE Makefile ---
# Top level Makefile for module imagej
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:35:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:35:21 +0000 (UTC)
Subject: rpms/imagej/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091214173521.9AC7211C01EA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/imagej/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn29514/rpms/imagej/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module imagej


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: imagej
# $Id: Makefile,v 1.1 2009/12/14 17:35:21 kevin Exp $
NAME := imagej
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:28 +0000
Subject: [pkgdb] gpodder had acl change status
Message-ID: <20091214173529.6347A28ED4D@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on gpodder (Fedora devel) to Approved for vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpodder



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:21 +0000
Subject: [pkgdb] gpodder had acl change status
Message-ID: <20091214173523.0142828ED08@bastion3.fedora.phx2.redhat.com>

jspaleta has set the watchbugzilla acl on gpodder (Fedora devel) to Approved for vpv

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpodder



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:46 +0000
Subject: [pkgdb] python-basemap had acl change status
Message-ID: <20091214173547.8F23328ECBE@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on python-basemap (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From pkgdb at fedoraproject.org  Mon Dec 14 17:35:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:35:51 +0000
Subject: [pkgdb] python-basemap had acl change status
Message-ID: <20091214173552.CF12728ECDB@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on python-basemap (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap



From sagarun at fedoraproject.org  Mon Dec 14 17:36:04 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Mon, 14 Dec 2009 17:36:04 +0000 (UTC)
Subject: rpms/emacs-spice-mode/devel emacs-spice-mode-fix.patch, NONE,
	1.1 emacs-spice-mode.spec, NONE, 1.1 import.log, NONE,
	1.1 spice-mode-init.el, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091214173604.A4A5611C00E9@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-spice-mode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29680/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-spice-mode-fix.patch emacs-spice-mode.spec import.log 
	spice-mode-init.el 
Log Message:
commiting emacs-spice-mode


emacs-spice-mode-fix.patch:
 spice-mode.el |   92 +++++++++++++++++++++-------------------------------------
 1 file changed, 34 insertions(+), 58 deletions(-)

--- NEW FILE emacs-spice-mode-fix.patch ---
diff -up ./spice-mode/spice-mode.el.fix ./spice-mode/spice-mode.el
--- ./spice-mode/spice-mode.el.fix	2009-12-13 08:28:15.000000000 +0530
+++ ./spice-mode/spice-mode.el	2009-12-13 16:58:17.000000000 +0530
@@ -5,7 +5,7 @@
 ;; Author: Geert A. M. Van der Plas <geert_vanderplas at email.com> 1999-
 ;;         Emmanuel Rouat <emmanuel.rouat at wanadoo.fr> 1997-
 ;;         Carlin J. Vieri, MIT AI Lab <cvieri at ai.mit.edu> 1994 
-;; Keywords: spice, spice2g6, spice3, eldo, hspice, layla, mondriaan, fasthenry, CDL, spectre compatibility, netlist editing
+;; Keywords: ngspice, gnucap, spice, spice2g6, spice3, eldo, hspice, layla, mondriaan, fasthenry, CDL, spectre compatibility, netlist editing
 ;; Filename: spice-mode.el
 ;; Version: 1.2.25
 ;; Maintainer: Geert A. M. Van der Plas <geert_vanderplas at email.com>
@@ -57,6 +57,8 @@
 ;; (setq auto-mode-alist (append (list (cons "\\.sp$" 'spice-mode)
 ;; 				       (cons "\\.cir$" 'spice-mode)
 ;; 				       (cons "\\.ckt$" 'spice-mode)
+;;                     (cons "\\.spc$" 'spice-mode) ; xcircuit output
+;;                     (cons "\\.spice$" 'spice-mode) ; magic output
 ;; 				       (cons "\\.mod$" 'spice-mode)
 ;; 				       (cons "\\.cdl$" 'spice-mode)
 ;; 				       (cons "\\.chi$" 'spice-mode) ;eldo outpt
@@ -89,7 +91,7 @@
 ;;  '(spice-standard (quote (spice2g6 (hspice eldo))))    ;; hspice and eldo
 ;;  '(spice-standard (quote (spice2g6 ())))               ;; spice2g6/3 only
 ;;  '(spice-simulator "Spice3")                           ;; default simulator
-;;  '(spice-waveform-viewer "Nutmeg")                     ;; default waveform 
+;;  '(spice-waveform-viewer "ngnutmeg")                   ;; default waveform 
 ;;  '(spice-highlight-keywords nil)                       ;; less highlighting
 ;;  '(spice-section-alist                                 ;; add own sections
 ;;    ;; this is ugly, I know ;)
@@ -146,7 +148,19 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defconst spice-version "1.2.25 (03 Jan 2007)"
+;; free variables
+
+(defvar fume-function-name-regexp-alist)
+(defvar fume-function-name-regexp)
+(defvar compilation-file-regexp-alist)
+(defvar fume-find-function-name-method-alist)
+(defvar fume-menubar-menu-name)
+(defvar fume-buffer-menu)
+(defvar fume-buffer-name)
+(defvar fume-index-method)
+(defvar msb-menu-cond)
+
+(defconst spice-version "1.2.26 (12 Dec 2009)"
   "Current version of spice mode (spice2g6/spice3/hspice/eldo(rf&verilog-a)/fasthenry/layla/mondriaan/draccdl/spectre).")
 
 (defconst spice-developer 
@@ -159,7 +173,6 @@
 (defvar spice-tempo-tags nil
   "List of templates used in spice mode.")
 
-
 ;; help function
 (defun spice-custom-set (variable value &rest functions)
   "Set variables as in `custom-set-default' and call FUNCTIONS (if
@@ -193,6 +206,7 @@ bound) afterwards."
 Basic standard:
   Spice2g6    : Original Berkeley Spice (leave this always on!)
 Additional standards:
+  Gnucap      : The Gnu Circuit Analysis Package
   Hspice (TM) : Commercial Spice, formerly Meta Software, now owned by Synopsys
   Eldo (TM)   : Commercial Spice, formerly Anacad, now owned by Mentor Graphics
   EldoRf (TM) : RF Steady State analyses of Eldo (also turn on Eldo!)
@@ -299,7 +313,7 @@ variable and insert its contents into th
   '(
     ;; Spice3; spice3 -b <file.cir> 
     ;; 
-    ("Spice3" "spice3 -b" ""
+    ("Gnucap" "gnucap -b" ""
      ("\\s-*Error[\t ]+on[ \t]+line[\t ]+\\([0-9]+\\) +:.+" 
       0 1 nil (buffer-file-name)) 
      ("Circuit: \\(.*\\)$" 1)) ; spice3 hack, is not the filename, but that's no prob
@@ -390,9 +404,9 @@ see also `spice-simulator'."
   '(
     ;; Nutmeg; nutmeg <waveformdata.dat> 
     ;; 
-    ("Nutmeg"  "nutmeg" "" spice-run-interactive (".dat" ".ac0" ".tr0")) ; spice3 nutmeg viewer
     ("Gwave"   "gwave"  "" spice-run-silent 
      (".raw" ".braw" ".ac0" ".tr0" ".sw0" ".W" ".N" ".acs")) ; gwave viewer
+    ("ngnutmeg"  "ngnutmeg" "" spice-run-interactive (".dat" ".ac0" ".tr0")) ; spice3 nutmeg viewer
     ("Xelga"   "xelga"  "" spice-run-silent ".cou") ; xelga eldo viewer
     ("Awaves"  "awaves_emacs" "" spice-run-silent (".ac0" ".tr0")) ; awaves hspice viewer, this doesn't work yet and will it ever ? Explanation: awaves is a script that starts an executable/binary in the background. This means the shell starting awaves ends immediately after the forking of the executable; after which all backgrounded programs get killed by emacs since their parent's parent shell (/bin/sh) ends. awaves shouldn't return immediately and then this will work; that's why I called the program awaves_emacs...
 
@@ -431,7 +445,7 @@ waveform viewer command.
 
 
 ;;;###autoload
-(defcustom spice-waveform-viewer nil ; example: "Nutmeg"
+(defcustom spice-waveform-viewer nil ; example: "ngnutmeg"
   "*Spice command, used when starting waveform viewer,
 see also `spice-waveform-viewer-switches'."
   :group 'spice-simulate
@@ -6246,19 +6260,19 @@ uses cache generated with the `spice-cac
 
 (defmacro spice-layla-function-template (name type)
   "Create a layla tempo define for name and type"
-  (` (let (p_prompt)
-       (setq p_prompt (concat "[Name of " (, name) "]: "))
+  `(let (p_prompt)
+       (setq p_prompt (concat "[Name of " ,name "]: "))
        (tempo-define-template 
-	(concat "layla-" (, name) "-" (, type))
-	(list (concat "." (, name) "_" (, type) "_param(")
+	(concat "layla-" ,name "-" ,type)
+	(list (concat "." ,name "_" ,type "_param(")
 	   (list 'p p_prompt) ", "
 	   '(p "[Name of parameter]: ") ", "
 	   '(p "[Value of parameter]: ") ")"
 	   'n)
-	(concat "layla-" (, name) "-" (, type))
-	(concat "template for inserting a " (, type) " parameter for a Layla "
-		(, name))
-	'spice-tempo-tags))))
+	(concat "layla-" ,name "-" ,type)
+	(concat "template for inserting a " ,type " parameter for a Layla "
+		,name)
+	'spice-tempo-tags)))
 
 (spice-layla-function-template "bus" "double")
 (spice-layla-function-template "bus" "integer")
@@ -7297,7 +7311,7 @@ is t, the filename itself is returned un
       (message "started %s" command)
       (if spice-after-start-process-function
 	  (funcall spice-after-start-process-function process))
-      (process-kill-without-query process))))
+      (process-query-on-exit-flag process))))
 
 (defun spice-run-interactive (name command file)
   "Run waveform viewer interactively.
@@ -7488,7 +7502,6 @@ that has been selected."
     ) ; when
   )
 
-
 (defun spice-func-menu-init ()
   "Initialize function menu." ; buffer local stuff
   ;; hook in the spice-mode mode regular expression above into the
@@ -7516,7 +7529,7 @@ that has been selected."
   (setq fume-menubar-menu-name "Subckts"
 	fume-buffer-name "*Subcircuits List*"
 	fume-index-method 2)
-  (make-local-hook 'find-file-hooks)
+  ;; (make-local-hook 'find-file-hooks) not available since Emacs 21.1
   (add-hook 'find-file-hooks 'fume-add-menubar-entry)   
   (define-key global-map '(shift button2) 'fume-mouse-function-goto)
   (fume-add-menubar-entry))
@@ -8173,43 +8186,6 @@ returns it. Non-comment paragraphs can a
   "Set mode line name of spice mode"
   (setq mode-name 
 	(concat 
-	 (when (not spice-output-local)
-	   (concat
-	    (when (spice-standard-p 'layla) "Layla")
-	    (when (spice-standard-p 'mondriaan) "-Mdrn")
-	    (when (spice-standard-p 'hspice)
-	      (when (spice-standard-p 'layla) "/"))
-	    (when (spice-standard-p 'hspice) "Hspice")
-	    (when (spice-standard-p 'eldo)
-	      (when (or (spice-standard-p 'hspice) 
-			(spice-standard-p 'layla)) "/"))
-	    (when (spice-standard-p 'eldo) "Eldo")
-	    (when (spice-standard-p 'eldorf) "-RF")
-	    (when (spice-standard-p 'eldovloga) "-VlA")
-	    (when (spice-standard-p 'fasthenry)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla)) "/"))
-	    (when (spice-standard-p 'fasthenry) "FastHenry")
-	    (when (spice-standard-p 'draccdl)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla) 
-			(spice-standard-p 'fasthenry)) "/"))
-	    (when (spice-standard-p 'draccdl) "DracCDL")
-	    (when (spice-standard-p 'spectre)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla) 
-			(spice-standard-p 'fasthenry) 
-			(spice-standard-p 'draccdl)) "/"))
-	    (when (spice-standard-p 'spectre) "Spectre")
-	    (when (or (spice-standard-p 'fasthenry) 
-		      (spice-standard-p 'eldo) 
-		      (spice-standard-p 'hspice) 
-		      (spice-standard-p 'layla) 
-		      (spice-standard-p 'draccdl) 
-		      (spice-standard-p 'spectre)) "|")))
 	 "Spice"
 	 (when spice-output-local "-output")
 	 (when spice-some-comment-regions-are-hidden " H+"))))
@@ -8639,11 +8615,11 @@ Key bindings for other parts in the file
     ;;------------------------------------------------------------
     ;; now hook in 'spice-colorize-libraries (eldo-mode.el)
     ;; all buffer local:
-    ;;(make-local-hook 'font-lock-mode-hook)
-    (make-local-hook 'font-lock-after-fontify-buffer-hook); doesn't exist in emacs 20
+    ;;(make-local-hook 'font-lock-mode-hook) ; not available since emacs 21.1
+    ;; (make-local-hook 'font-lock-after-fontify-buffer-hook); doesn't exist in emacs 20
     ;;(add-hook 'font-lock-mode-hook 'spice-colorize-libraries-buffer t t)
     (add-hook 'font-lock-after-fontify-buffer-hook 'spice-colorize-libraries-buffer t t) ; not in emacs 20
-    (make-local-hook 'after-change-functions)
+    ;; (make-local-hook 'after-change-functions) ; not available since emacs 21.1
     (add-hook 'after-change-functions 'spice-colorize-libraries t t)
     (spice-colorize-libraries-buffer)
 


--- NEW FILE emacs-spice-mode.spec ---
%global pkg spice-mode
%global pkgname Emacs-spice-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:		emacs-%{pkg}
Version:	1.2.25
Release:	2%{?dist}
Summary:	SPICE Mode for GNU Emacs

Group:		Applications/Editors
License:	GPLv2+
URL:		http://spice-mode.4t.com/
Source0:	http://spice-mode.4t.com/spice-mode-1.2.25.tar.gz
Source1:	%{pkg}-init.el
#Patch provided by shakthi kannan - shakthimaan AT gmail dot com and chitlesh goorah - chitlesh AT gmail dot com
#Fixes free variables and backquote,adds nguntmeg to simulators list and minor fixes
Patch0:		emacs-spice-mode-fix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version} gnucap gwave
		
%description
This package provides an Emacs major mode for editing SPICE decks.

%package el
Summary:	Source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%setup -q -n %{pkg}
%patch0 -p2

%build
emacs -batch -f batch-byte-compile %{pkg}.el

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}	
%{__install} -pm 644 %{pkg}.* %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS Changes COPYING README test_netlist.cir
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{emacs_startdir}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Mon Dec 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-2
- More file extenstions are handled by spice-mode
- Default simulator is now Gnucap
- Default wave form viewer is now Gwave
- Added gnucap and gwave to requires
- Fixed free variables and blackquote


* Sun Dec 06 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-1
- Initial release 1.2.25-1


--- NEW FILE import.log ---
emacs-spice-mode-1_2_25-2_fc12:HEAD:emacs-spice-mode-1.2.25-2.fc12.src.rpm:1260812088


--- NEW FILE spice-mode-init.el ---
;init file for spice-mode
(autoload 'spice-mode "spice-mode" "Spice Editing Mode" t)
(custom-set-variables
  '(spice-simulator "Gnucap")                        ;; default simulator
  '(spice-waveform-viewer "Gwave")                   ;; default waveform 
  '(spice-output-local "Gnucap")
)
(setq auto-mode-alist (append (list (cons "\\.sp$" 'spice-mode)
                                     (cons "\\.cir$" 'spice-mode)
                                     (cons "\\.ckt$" 'spice-mode)
                                     (cons "\\.mod$" 'spice-mode)
                                     (cons "\\.spc$" 'spice-mode) ; xcircuit output
                                     (cons "\\.spice$" 'spice-mode) ; magic output
                                     (cons "\\.cdl$" 'spice-mode)
                                     (cons "\\.chi$" 'spice-mode) ;eldo output
                                     (cons "\\.inp$" 'spice-mode))
                               auto-mode-alist))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:27:19 -0000	1.1
+++ .cvsignore	14 Dec 2009 17:36:04 -0000	1.2
@@ -0,0 +1 @@
+spice-mode-1.2.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:27:19 -0000	1.1
+++ sources	14 Dec 2009 17:36:04 -0000	1.2
@@ -0,0 +1 @@
+9902d60313b33ed82d44d4ffc7ef9b63  spice-mode-1.2.25.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 14 17:36:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:36:17 +0000
Subject: [pkgdb] python-basemap-data had acl change status
Message-ID: <20091214173618.47D5728ECBE@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on python-basemap-data (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Mon Dec 14 17:36:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:36:22 +0000
Subject: [pkgdb] perl-CGI-Application-Structured-Tools was added for eseyman
Message-ID: <20091214173623.0646128ECCD@bastion3.fedora.phx2.redhat.com>

kevin has added Package perl-CGI-Application-Structured-Tools with summary Tools to generate and maintain CGI::Application::Structured web based apps
kevin has approved Package perl-CGI-Application-Structured-Tools
kevin has added a Fedora devel branch for perl-CGI-Application-Structured-Tools with an owner of eseyman
kevin has approved perl-CGI-Application-Structured-Tools in Fedora devel
kevin has approved Package perl-CGI-Application-Structured-Tools
kevin has set commit to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora devel)
kevin has set build to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Structured-Tools



From pkgdb at fedoraproject.org  Mon Dec 14 17:37:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:37:13 +0000
Subject: [pkgdb] python-basemap-data had acl change status
Message-ID: <20091214173714.0016728ECF4@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on python-basemap-data (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-basemap-data



From pkgdb at fedoraproject.org  Mon Dec 14 17:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:37:34 +0000
Subject: [pkgdb] perl-CGI-Application-Structured-Tools summary updated by
	kevin
Message-ID: <20091214173735.DE2C228ECA0@bastion3.fedora.phx2.redhat.com>

kevin set package perl-CGI-Application-Structured-Tools summary to Tools to generate and maintain CGI::Application::Structured web based apps

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Structured-Tools



From pkgdb at fedoraproject.org  Mon Dec 14 17:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:37:34 +0000
Subject: [pkgdb] perl-CGI-Application-Structured-Tools (Fedora,
	devel) updated by kevin
Message-ID: <20091214173736.C02F828ECDB@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on perl-CGI-Application-Structured-Tools (Fedora devel) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Structured-Tools (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Structured-Tools



From pkgdb at fedoraproject.org  Mon Dec 14 17:37:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:37:35 +0000
Subject: [pkgdb] perl-CGI-Application-Structured-Tools (Fedora,
	11) updated by kevin
Message-ID: <20091214173737.E7C8928ED1F@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for perl-CGI-Application-Structured-Tools
kevin has set commit to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora 11)
kevin has set build to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora 11)
kevin approved watchbugzilla on perl-CGI-Application-Structured-Tools (Fedora 11) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Structured-Tools (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Structured-Tools



From pkgdb at fedoraproject.org  Mon Dec 14 17:37:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:37:35 +0000
Subject: [pkgdb] perl-CGI-Application-Structured-Tools (Fedora,
	12) updated by kevin
Message-ID: <20091214173739.2288D28ECBE@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for perl-CGI-Application-Structured-Tools
kevin has set commit to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora 12)
kevin has set build to Approved for 107427 on perl-CGI-Application-Structured-Tools (Fedora 12)
kevin approved watchbugzilla on perl-CGI-Application-Structured-Tools (Fedora 12) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Structured-Tools (Fedora 12) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Structured-Tools



From kevin at fedoraproject.org  Mon Dec 14 17:38:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:38:26 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Structured-Tools - New directory
Message-ID: <20091214173826.1323E11C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30352/rpms/perl-CGI-Application-Structured-Tools

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:38:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:38:26 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Structured-Tools/devel - New directory
Message-ID: <20091214173826.2C41211C02CA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30352/rpms/perl-CGI-Application-Structured-Tools/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:38:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:38:33 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Structured-Tools Makefile,NONE,1.1
Message-ID: <20091214173833.A934811C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30352/rpms/perl-CGI-Application-Structured-Tools

Added Files:
	Makefile 
Log Message:
Setup of module perl-CGI-Application-Structured-Tools


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CGI-Application-Structured-Tools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:38:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:38:34 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Structured-Tools/devel .cvsignore, NONE, 
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091214173834.1B2EE11C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30352/rpms/perl-CGI-Application-Structured-Tools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CGI-Application-Structured-Tools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-CGI-Application-Structured-Tools
# $Id: Makefile,v 1.1 2009/12/14 17:38:33 kevin Exp $
NAME := perl-CGI-Application-Structured-Tools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:38:39 +0000
Subject: [pkgdb] python-jsonpickle was added for mathstuf
Message-ID: <20091214173840.1F8EC28ECF4@bastion3.fedora.phx2.redhat.com>

kevin has added Package python-jsonpickle with summary A module that allows any object to be serialized into JSON
kevin has approved Package python-jsonpickle
kevin has added a Fedora devel branch for python-jsonpickle with an owner of mathstuf
kevin has approved python-jsonpickle in Fedora devel
kevin has approved Package python-jsonpickle
kevin has set commit to Approved for 107427 on python-jsonpickle (Fedora devel)
kevin has set checkout to Approved for 107427 on python-jsonpickle (Fedora devel)
kevin has set build to Approved for 107427 on python-jsonpickle (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-jsonpickle



From pkgdb at fedoraproject.org  Mon Dec 14 17:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:38:45 +0000
Subject: [pkgdb] python-jsonpickle (Fedora, 12) updated by kevin
Message-ID: <20091214173847.4F03428ED5B@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for python-jsonpickle
kevin has set commit to Approved for 107427 on python-jsonpickle (Fedora 12)
kevin has set checkout to Approved for 107427 on python-jsonpickle (Fedora 12)
kevin has set build to Approved for 107427 on python-jsonpickle (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-jsonpickle



From pkgdb at fedoraproject.org  Mon Dec 14 17:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:38:45 +0000
Subject: [pkgdb] python-jsonpickle summary updated by kevin
Message-ID: <20091214173845.C1EEC28ED1F@bastion3.fedora.phx2.redhat.com>

kevin set package python-jsonpickle summary to A module that allows any object to be serialized into JSON

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-jsonpickle



From pkgdb at fedoraproject.org  Mon Dec 14 17:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:38:45 +0000
Subject: [pkgdb] python-jsonpickle (Fedora, 11) updated by kevin
Message-ID: <20091214173846.8C0A728ED3A@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for python-jsonpickle
kevin has set commit to Approved for 107427 on python-jsonpickle (Fedora 11)
kevin has set checkout to Approved for 107427 on python-jsonpickle (Fedora 11)
kevin has set build to Approved for 107427 on python-jsonpickle (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-jsonpickle



From kevin at fedoraproject.org  Mon Dec 14 17:38:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:38:59 +0000 (UTC)
Subject: rpms/python-jsonpickle - New directory
Message-ID: <20091214173859.127A311C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-jsonpickle
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY30733/rpms/python-jsonpickle

Log Message:
Directory /cvs/pkgs/rpms/python-jsonpickle added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:38:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:38:59 +0000 (UTC)
Subject: rpms/python-jsonpickle/devel - New directory
Message-ID: <20091214173859.3B62511C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-jsonpickle/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY30733/rpms/python-jsonpickle/devel

Log Message:
Directory /cvs/pkgs/rpms/python-jsonpickle/devel added to the repository




From sagarun at fedoraproject.org  Mon Dec 14 17:39:05 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Mon, 14 Dec 2009 17:39:05 +0000 (UTC)
Subject: rpms/emacs-spice-mode/F-11 emacs-spice-mode-fix.patch, NONE,
	1.1 emacs-spice-mode.spec, NONE, 1.1 import.log, NONE,
	1.1 spice-mode-init.el, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091214173905.2210711C00EF@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-spice-mode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30655/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-spice-mode-fix.patch emacs-spice-mode.spec import.log 
	spice-mode-init.el 
Log Message:
commiting emacs-spice-mode on F-11 branch


emacs-spice-mode-fix.patch:
 spice-mode.el |   92 +++++++++++++++++++++-------------------------------------
 1 file changed, 34 insertions(+), 58 deletions(-)

--- NEW FILE emacs-spice-mode-fix.patch ---
diff -up ./spice-mode/spice-mode.el.fix ./spice-mode/spice-mode.el
--- ./spice-mode/spice-mode.el.fix	2009-12-13 08:28:15.000000000 +0530
+++ ./spice-mode/spice-mode.el	2009-12-13 16:58:17.000000000 +0530
@@ -5,7 +5,7 @@
 ;; Author: Geert A. M. Van der Plas <geert_vanderplas at email.com> 1999-
 ;;         Emmanuel Rouat <emmanuel.rouat at wanadoo.fr> 1997-
 ;;         Carlin J. Vieri, MIT AI Lab <cvieri at ai.mit.edu> 1994 
-;; Keywords: spice, spice2g6, spice3, eldo, hspice, layla, mondriaan, fasthenry, CDL, spectre compatibility, netlist editing
+;; Keywords: ngspice, gnucap, spice, spice2g6, spice3, eldo, hspice, layla, mondriaan, fasthenry, CDL, spectre compatibility, netlist editing
 ;; Filename: spice-mode.el
 ;; Version: 1.2.25
 ;; Maintainer: Geert A. M. Van der Plas <geert_vanderplas at email.com>
@@ -57,6 +57,8 @@
 ;; (setq auto-mode-alist (append (list (cons "\\.sp$" 'spice-mode)
 ;; 				       (cons "\\.cir$" 'spice-mode)
 ;; 				       (cons "\\.ckt$" 'spice-mode)
+;;                     (cons "\\.spc$" 'spice-mode) ; xcircuit output
+;;                     (cons "\\.spice$" 'spice-mode) ; magic output
 ;; 				       (cons "\\.mod$" 'spice-mode)
 ;; 				       (cons "\\.cdl$" 'spice-mode)
 ;; 				       (cons "\\.chi$" 'spice-mode) ;eldo outpt
@@ -89,7 +91,7 @@
 ;;  '(spice-standard (quote (spice2g6 (hspice eldo))))    ;; hspice and eldo
 ;;  '(spice-standard (quote (spice2g6 ())))               ;; spice2g6/3 only
 ;;  '(spice-simulator "Spice3")                           ;; default simulator
-;;  '(spice-waveform-viewer "Nutmeg")                     ;; default waveform 
+;;  '(spice-waveform-viewer "ngnutmeg")                   ;; default waveform 
 ;;  '(spice-highlight-keywords nil)                       ;; less highlighting
 ;;  '(spice-section-alist                                 ;; add own sections
 ;;    ;; this is ugly, I know ;)
@@ -146,7 +148,19 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defconst spice-version "1.2.25 (03 Jan 2007)"
+;; free variables
+
+(defvar fume-function-name-regexp-alist)
+(defvar fume-function-name-regexp)
+(defvar compilation-file-regexp-alist)
+(defvar fume-find-function-name-method-alist)
+(defvar fume-menubar-menu-name)
+(defvar fume-buffer-menu)
+(defvar fume-buffer-name)
+(defvar fume-index-method)
+(defvar msb-menu-cond)
+
+(defconst spice-version "1.2.26 (12 Dec 2009)"
   "Current version of spice mode (spice2g6/spice3/hspice/eldo(rf&verilog-a)/fasthenry/layla/mondriaan/draccdl/spectre).")
 
 (defconst spice-developer 
@@ -159,7 +173,6 @@
 (defvar spice-tempo-tags nil
   "List of templates used in spice mode.")
 
-
 ;; help function
 (defun spice-custom-set (variable value &rest functions)
   "Set variables as in `custom-set-default' and call FUNCTIONS (if
@@ -193,6 +206,7 @@ bound) afterwards."
 Basic standard:
   Spice2g6    : Original Berkeley Spice (leave this always on!)
 Additional standards:
+  Gnucap      : The Gnu Circuit Analysis Package
   Hspice (TM) : Commercial Spice, formerly Meta Software, now owned by Synopsys
   Eldo (TM)   : Commercial Spice, formerly Anacad, now owned by Mentor Graphics
   EldoRf (TM) : RF Steady State analyses of Eldo (also turn on Eldo!)
@@ -299,7 +313,7 @@ variable and insert its contents into th
   '(
     ;; Spice3; spice3 -b <file.cir> 
     ;; 
-    ("Spice3" "spice3 -b" ""
+    ("Gnucap" "gnucap -b" ""
      ("\\s-*Error[\t ]+on[ \t]+line[\t ]+\\([0-9]+\\) +:.+" 
       0 1 nil (buffer-file-name)) 
      ("Circuit: \\(.*\\)$" 1)) ; spice3 hack, is not the filename, but that's no prob
@@ -390,9 +404,9 @@ see also `spice-simulator'."
   '(
     ;; Nutmeg; nutmeg <waveformdata.dat> 
     ;; 
-    ("Nutmeg"  "nutmeg" "" spice-run-interactive (".dat" ".ac0" ".tr0")) ; spice3 nutmeg viewer
     ("Gwave"   "gwave"  "" spice-run-silent 
      (".raw" ".braw" ".ac0" ".tr0" ".sw0" ".W" ".N" ".acs")) ; gwave viewer
+    ("ngnutmeg"  "ngnutmeg" "" spice-run-interactive (".dat" ".ac0" ".tr0")) ; spice3 nutmeg viewer
     ("Xelga"   "xelga"  "" spice-run-silent ".cou") ; xelga eldo viewer
     ("Awaves"  "awaves_emacs" "" spice-run-silent (".ac0" ".tr0")) ; awaves hspice viewer, this doesn't work yet and will it ever ? Explanation: awaves is a script that starts an executable/binary in the background. This means the shell starting awaves ends immediately after the forking of the executable; after which all backgrounded programs get killed by emacs since their parent's parent shell (/bin/sh) ends. awaves shouldn't return immediately and then this will work; that's why I called the program awaves_emacs...
 
@@ -431,7 +445,7 @@ waveform viewer command.
 
 
 ;;;###autoload
-(defcustom spice-waveform-viewer nil ; example: "Nutmeg"
+(defcustom spice-waveform-viewer nil ; example: "ngnutmeg"
   "*Spice command, used when starting waveform viewer,
 see also `spice-waveform-viewer-switches'."
   :group 'spice-simulate
@@ -6246,19 +6260,19 @@ uses cache generated with the `spice-cac
 
 (defmacro spice-layla-function-template (name type)
   "Create a layla tempo define for name and type"
-  (` (let (p_prompt)
-       (setq p_prompt (concat "[Name of " (, name) "]: "))
+  `(let (p_prompt)
+       (setq p_prompt (concat "[Name of " ,name "]: "))
        (tempo-define-template 
-	(concat "layla-" (, name) "-" (, type))
-	(list (concat "." (, name) "_" (, type) "_param(")
+	(concat "layla-" ,name "-" ,type)
+	(list (concat "." ,name "_" ,type "_param(")
 	   (list 'p p_prompt) ", "
 	   '(p "[Name of parameter]: ") ", "
 	   '(p "[Value of parameter]: ") ")"
 	   'n)
-	(concat "layla-" (, name) "-" (, type))
-	(concat "template for inserting a " (, type) " parameter for a Layla "
-		(, name))
-	'spice-tempo-tags))))
+	(concat "layla-" ,name "-" ,type)
+	(concat "template for inserting a " ,type " parameter for a Layla "
+		,name)
+	'spice-tempo-tags)))
 
 (spice-layla-function-template "bus" "double")
 (spice-layla-function-template "bus" "integer")
@@ -7297,7 +7311,7 @@ is t, the filename itself is returned un
       (message "started %s" command)
       (if spice-after-start-process-function
 	  (funcall spice-after-start-process-function process))
-      (process-kill-without-query process))))
+      (process-query-on-exit-flag process))))
 
 (defun spice-run-interactive (name command file)
   "Run waveform viewer interactively.
@@ -7488,7 +7502,6 @@ that has been selected."
     ) ; when
   )
 
-
 (defun spice-func-menu-init ()
   "Initialize function menu." ; buffer local stuff
   ;; hook in the spice-mode mode regular expression above into the
@@ -7516,7 +7529,7 @@ that has been selected."
   (setq fume-menubar-menu-name "Subckts"
 	fume-buffer-name "*Subcircuits List*"
 	fume-index-method 2)
-  (make-local-hook 'find-file-hooks)
+  ;; (make-local-hook 'find-file-hooks) not available since Emacs 21.1
   (add-hook 'find-file-hooks 'fume-add-menubar-entry)   
   (define-key global-map '(shift button2) 'fume-mouse-function-goto)
   (fume-add-menubar-entry))
@@ -8173,43 +8186,6 @@ returns it. Non-comment paragraphs can a
   "Set mode line name of spice mode"
   (setq mode-name 
 	(concat 
-	 (when (not spice-output-local)
-	   (concat
-	    (when (spice-standard-p 'layla) "Layla")
-	    (when (spice-standard-p 'mondriaan) "-Mdrn")
-	    (when (spice-standard-p 'hspice)
-	      (when (spice-standard-p 'layla) "/"))
-	    (when (spice-standard-p 'hspice) "Hspice")
-	    (when (spice-standard-p 'eldo)
-	      (when (or (spice-standard-p 'hspice) 
-			(spice-standard-p 'layla)) "/"))
-	    (when (spice-standard-p 'eldo) "Eldo")
-	    (when (spice-standard-p 'eldorf) "-RF")
-	    (when (spice-standard-p 'eldovloga) "-VlA")
-	    (when (spice-standard-p 'fasthenry)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla)) "/"))
-	    (when (spice-standard-p 'fasthenry) "FastHenry")
-	    (when (spice-standard-p 'draccdl)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla) 
-			(spice-standard-p 'fasthenry)) "/"))
-	    (when (spice-standard-p 'draccdl) "DracCDL")
-	    (when (spice-standard-p 'spectre)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla) 
-			(spice-standard-p 'fasthenry) 
-			(spice-standard-p 'draccdl)) "/"))
-	    (when (spice-standard-p 'spectre) "Spectre")
-	    (when (or (spice-standard-p 'fasthenry) 
-		      (spice-standard-p 'eldo) 
-		      (spice-standard-p 'hspice) 
-		      (spice-standard-p 'layla) 
-		      (spice-standard-p 'draccdl) 
-		      (spice-standard-p 'spectre)) "|")))
 	 "Spice"
 	 (when spice-output-local "-output")
 	 (when spice-some-comment-regions-are-hidden " H+"))))
@@ -8639,11 +8615,11 @@ Key bindings for other parts in the file
     ;;------------------------------------------------------------
     ;; now hook in 'spice-colorize-libraries (eldo-mode.el)
     ;; all buffer local:
-    ;;(make-local-hook 'font-lock-mode-hook)
-    (make-local-hook 'font-lock-after-fontify-buffer-hook); doesn't exist in emacs 20
+    ;;(make-local-hook 'font-lock-mode-hook) ; not available since emacs 21.1
+    ;; (make-local-hook 'font-lock-after-fontify-buffer-hook); doesn't exist in emacs 20
     ;;(add-hook 'font-lock-mode-hook 'spice-colorize-libraries-buffer t t)
     (add-hook 'font-lock-after-fontify-buffer-hook 'spice-colorize-libraries-buffer t t) ; not in emacs 20
-    (make-local-hook 'after-change-functions)
+    ;; (make-local-hook 'after-change-functions) ; not available since emacs 21.1
     (add-hook 'after-change-functions 'spice-colorize-libraries t t)
     (spice-colorize-libraries-buffer)
 


--- NEW FILE emacs-spice-mode.spec ---
%global pkg spice-mode
%global pkgname Emacs-spice-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:		emacs-%{pkg}
Version:	1.2.25
Release:	2%{?dist}
Summary:	SPICE Mode for GNU Emacs

Group:		Applications/Editors
License:	GPLv2+
URL:		http://spice-mode.4t.com/
Source0:	http://spice-mode.4t.com/spice-mode-1.2.25.tar.gz
Source1:	%{pkg}-init.el
#Patch provided by shakthi kannan - shakthimaan AT gmail dot com and chitlesh goorah - chitlesh AT gmail dot com
#Fixes free variables and backquote,adds nguntmeg to simulators list and minor fixes
Patch0:		emacs-spice-mode-fix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version} gnucap gwave
		
%description
This package provides an Emacs major mode for editing SPICE decks.

%package el
Summary:	Source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%setup -q -n %{pkg}
%patch0 -p2

%build
emacs -batch -f batch-byte-compile %{pkg}.el

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}	
%{__install} -pm 644 %{pkg}.* %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS Changes COPYING README test_netlist.cir
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{emacs_startdir}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Mon Dec 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-2
- More file extenstions are handled by spice-mode
- Default simulator is now Gnucap
- Default wave form viewer is now Gwave
- Added gnucap and gwave to requires
- Fixed free variables and blackquote


* Sun Dec 06 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-1
- Initial release 1.2.25-1


--- NEW FILE import.log ---
emacs-spice-mode-1_2_25-2_fc12:F-11:emacs-spice-mode-1.2.25-2.fc12.src.rpm:1260812286


--- NEW FILE spice-mode-init.el ---
;init file for spice-mode
(autoload 'spice-mode "spice-mode" "Spice Editing Mode" t)
(custom-set-variables
  '(spice-simulator "Gnucap")                        ;; default simulator
  '(spice-waveform-viewer "Gwave")                   ;; default waveform 
  '(spice-output-local "Gnucap")
)
(setq auto-mode-alist (append (list (cons "\\.sp$" 'spice-mode)
                                     (cons "\\.cir$" 'spice-mode)
                                     (cons "\\.ckt$" 'spice-mode)
                                     (cons "\\.mod$" 'spice-mode)
                                     (cons "\\.spc$" 'spice-mode) ; xcircuit output
                                     (cons "\\.spice$" 'spice-mode) ; magic output
                                     (cons "\\.cdl$" 'spice-mode)
                                     (cons "\\.chi$" 'spice-mode) ;eldo output
                                     (cons "\\.inp$" 'spice-mode))
                               auto-mode-alist))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:27:19 -0000	1.1
+++ .cvsignore	14 Dec 2009 17:39:04 -0000	1.2
@@ -0,0 +1 @@
+spice-mode-1.2.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:27:19 -0000	1.1
+++ sources	14 Dec 2009 17:39:04 -0000	1.2
@@ -0,0 +1 @@
+9902d60313b33ed82d44d4ffc7ef9b63  spice-mode-1.2.25.tar.gz



From kevin at fedoraproject.org  Mon Dec 14 17:39:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:39:06 +0000 (UTC)
Subject: rpms/python-jsonpickle Makefile,NONE,1.1
Message-ID: <20091214173906.98D6111C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-jsonpickle
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY30733/rpms/python-jsonpickle

Added Files:
	Makefile 
Log Message:
Setup of module python-jsonpickle


--- NEW FILE Makefile ---
# Top level Makefile for module python-jsonpickle
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:39:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:39:08 +0000 (UTC)
Subject: rpms/python-jsonpickle/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091214173908.A629A11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-jsonpickle/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY30733/rpms/python-jsonpickle/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-jsonpickle


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-jsonpickle
# $Id: Makefile,v 1.1 2009/12/14 17:39:08 kevin Exp $
NAME := python-jsonpickle
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:39:42 +0000
Subject: [pkgdb] usbview was added for itamarjp
Message-ID: <20091214173943.49AB428ECCD@bastion3.fedora.phx2.redhat.com>

kevin has added Package usbview with summary USB topology and device viewer
kevin has approved Package usbview
kevin has added a Fedora devel branch for usbview with an owner of itamarjp
kevin has approved usbview in Fedora devel
kevin has approved Package usbview
kevin has set commit to Approved for 107427 on usbview (Fedora devel)
kevin has set checkout to Approved for 107427 on usbview (Fedora devel)
kevin has set build to Approved for 107427 on usbview (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/usbview



From pkgdb at fedoraproject.org  Mon Dec 14 17:39:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:39:49 +0000
Subject: [pkgdb] usbview summary updated by kevin
Message-ID: <20091214173950.5478728ECF5@bastion3.fedora.phx2.redhat.com>

kevin set package usbview summary to USB topology and device viewer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/usbview



From pkgdb at fedoraproject.org  Mon Dec 14 17:39:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:39:50 +0000
Subject: [pkgdb] usbview (Fedora, 11) updated by kevin
Message-ID: <20091214173951.BD19228ED6C@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for usbview
kevin has set commit to Approved for 107427 on usbview (Fedora 11)
kevin has set checkout to Approved for 107427 on usbview (Fedora 11)
kevin has set build to Approved for 107427 on usbview (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/usbview



From pkgdb at fedoraproject.org  Mon Dec 14 17:39:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:39:50 +0000
Subject: [pkgdb] usbview (Fedora EPEL, 5) updated by kevin
Message-ID: <20091214173954.769E728ED1C@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for usbview
kevin has set commit to Approved for 107427 on usbview (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on usbview (Fedora EPEL 5)
kevin has set build to Approved for 107427 on usbview (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/usbview



From pkgdb at fedoraproject.org  Mon Dec 14 17:39:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:39:50 +0000
Subject: [pkgdb] usbview (Fedora, 12) updated by kevin
Message-ID: <20091214173955.D519928ED61@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for usbview
kevin has set commit to Approved for 107427 on usbview (Fedora 12)
kevin has set checkout to Approved for 107427 on usbview (Fedora 12)
kevin has set build to Approved for 107427 on usbview (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/usbview



From kevin at fedoraproject.org  Mon Dec 14 17:40:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:40:11 +0000 (UTC)
Subject: rpms/usbview - New directory
Message-ID: <20091214174011.1280D11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/usbview
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS31235/rpms/usbview

Log Message:
Directory /cvs/pkgs/rpms/usbview added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:40:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:40:11 +0000 (UTC)
Subject: rpms/usbview/devel - New directory
Message-ID: <20091214174011.28B1C11C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/usbview/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS31235/rpms/usbview/devel

Log Message:
Directory /cvs/pkgs/rpms/usbview/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:40:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:40:18 +0000 (UTC)
Subject: rpms/usbview Makefile,NONE,1.1
Message-ID: <20091214174018.8419F11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/usbview
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS31235/rpms/usbview

Added Files:
	Makefile 
Log Message:
Setup of module usbview


--- NEW FILE Makefile ---
# Top level Makefile for module usbview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:40:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:40:18 +0000 (UTC)
Subject: rpms/usbview/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091214174018.B702011C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/usbview/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS31235/rpms/usbview/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module usbview


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: usbview
# $Id: Makefile,v 1.1 2009/12/14 17:40:18 kevin Exp $
NAME := usbview
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:40:53 +0000
Subject: [pkgdb] pki-util was added for kwright
Message-ID: <20091214174054.6AE1F28ED5B@bastion3.fedora.phx2.redhat.com>

kevin has added Package pki-util with summary The Dogtag PKI Utility Framework
kevin has approved Package pki-util
kevin has added a Fedora devel branch for pki-util with an owner of kwright
kevin has approved pki-util in Fedora devel
kevin has approved Package pki-util
kevin has set commit to Approved for 107427 on pki-util (Fedora devel)
kevin has set checkout to Approved for 107427 on pki-util (Fedora devel)
kevin has set build to Approved for 107427 on pki-util (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-util



From pkgdb at fedoraproject.org  Mon Dec 14 17:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:41:06 +0000
Subject: [pkgdb] pki-util summary updated by kevin
Message-ID: <20091214174106.7764D28ED1F@bastion3.fedora.phx2.redhat.com>

kevin set package pki-util summary to The Dogtag PKI Utility Framework

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-util



From pkgdb at fedoraproject.org  Mon Dec 14 17:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:41:06 +0000
Subject: [pkgdb] pki-util (Fedora, 11) updated by kevin
Message-ID: <20091214174107.31A2C28ED5B@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for pki-util
kevin has set commit to Approved for 107427 on pki-util (Fedora 11)
kevin has set checkout to Approved for 107427 on pki-util (Fedora 11)
kevin has set build to Approved for 107427 on pki-util (Fedora 11)
kevin approved watchbugzilla on pki-util (Fedora 11) for ausil
kevin approved watchcommits on pki-util (Fedora 11) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-util



From pkgdb at fedoraproject.org  Mon Dec 14 17:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:41:06 +0000
Subject: [pkgdb] pki-util (Fedora, devel) updated by kevin
Message-ID: <20091214174108.1CBE128ED3A@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on pki-util (Fedora devel) for ausil
kevin approved watchcommits on pki-util (Fedora devel) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-util



From pkgdb at fedoraproject.org  Mon Dec 14 17:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:41:06 +0000
Subject: [pkgdb] pki-util (Fedora EPEL, 5) updated by kevin
Message-ID: <20091214174109.DC4CC28ED72@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for pki-util
kevin has set commit to Approved for 107427 on pki-util (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on pki-util (Fedora EPEL 5)
kevin has set build to Approved for 107427 on pki-util (Fedora EPEL 5)
kevin approved watchbugzilla on pki-util (Fedora EPEL 5) for ausil
kevin approved watchcommits on pki-util (Fedora EPEL 5) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-util



From pkgdb at fedoraproject.org  Mon Dec 14 17:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:41:06 +0000
Subject: [pkgdb] pki-util (Fedora, 12) updated by kevin
Message-ID: <20091214174108.99E0128ED70@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for pki-util
kevin has set commit to Approved for 107427 on pki-util (Fedora 12)
kevin has set checkout to Approved for 107427 on pki-util (Fedora 12)
kevin has set build to Approved for 107427 on pki-util (Fedora 12)
kevin approved watchbugzilla on pki-util (Fedora 12) for ausil
kevin approved watchcommits on pki-util (Fedora 12) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-util



From kevin at fedoraproject.org  Mon Dec 14 17:41:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:41:40 +0000 (UTC)
Subject: rpms/pki-util - New directory
Message-ID: <20091214174140.1532511C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pki-util
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss31739/rpms/pki-util

Log Message:
Directory /cvs/pkgs/rpms/pki-util added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:41:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:41:40 +0000 (UTC)
Subject: rpms/pki-util/devel - New directory
Message-ID: <20091214174140.2DA8D11C02CA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pki-util/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss31739/rpms/pki-util/devel

Log Message:
Directory /cvs/pkgs/rpms/pki-util/devel added to the repository




From pkgdb at fedoraproject.org  Mon Dec 14 17:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:41:49 +0000
Subject: [pkgdb] python-dateutil had acl change status
Message-ID: <20091214174151.AB6B928ED95@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on python-dateutil (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From kevin at fedoraproject.org  Mon Dec 14 17:41:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:41:47 +0000 (UTC)
Subject: rpms/pki-util/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091214174147.88E6211C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pki-util/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss31739/rpms/pki-util/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pki-util


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pki-util
# $Id: Makefile,v 1.1 2009/12/14 17:41:47 kevin Exp $
NAME := pki-util
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Mon Dec 14 17:41:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:41:47 +0000 (UTC)
Subject: rpms/pki-util Makefile,NONE,1.1
Message-ID: <20091214174147.67FF911C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pki-util
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss31739/rpms/pki-util

Added Files:
	Makefile 
Log Message:
Setup of module pki-util


--- NEW FILE Makefile ---
# Top level Makefile for module pki-util
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Dec 14 17:41:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:41:47 +0000
Subject: [pkgdb] python-dateutil had acl change status
Message-ID: <20091214174149.516BB28ED8D@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on python-dateutil (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dateutil



From sagarun at fedoraproject.org  Mon Dec 14 17:41:51 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Mon, 14 Dec 2009 17:41:51 +0000 (UTC)
Subject: rpms/emacs-spice-mode/F-12 emacs-spice-mode-fix.patch, NONE,
	1.1 emacs-spice-mode.spec, NONE, 1.1 import.log, NONE,
	1.1 spice-mode-init.el, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091214174151.43A0B11C00EF@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-spice-mode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31552/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-spice-mode-fix.patch emacs-spice-mode.spec import.log 
	spice-mode-init.el 
Log Message:
commiting emacs-spice-mode on F-12 branch


emacs-spice-mode-fix.patch:
 spice-mode.el |   92 +++++++++++++++++++++-------------------------------------
 1 file changed, 34 insertions(+), 58 deletions(-)

--- NEW FILE emacs-spice-mode-fix.patch ---
diff -up ./spice-mode/spice-mode.el.fix ./spice-mode/spice-mode.el
--- ./spice-mode/spice-mode.el.fix	2009-12-13 08:28:15.000000000 +0530
+++ ./spice-mode/spice-mode.el	2009-12-13 16:58:17.000000000 +0530
@@ -5,7 +5,7 @@
 ;; Author: Geert A. M. Van der Plas <geert_vanderplas at email.com> 1999-
 ;;         Emmanuel Rouat <emmanuel.rouat at wanadoo.fr> 1997-
 ;;         Carlin J. Vieri, MIT AI Lab <cvieri at ai.mit.edu> 1994 
-;; Keywords: spice, spice2g6, spice3, eldo, hspice, layla, mondriaan, fasthenry, CDL, spectre compatibility, netlist editing
+;; Keywords: ngspice, gnucap, spice, spice2g6, spice3, eldo, hspice, layla, mondriaan, fasthenry, CDL, spectre compatibility, netlist editing
 ;; Filename: spice-mode.el
 ;; Version: 1.2.25
 ;; Maintainer: Geert A. M. Van der Plas <geert_vanderplas at email.com>
@@ -57,6 +57,8 @@
 ;; (setq auto-mode-alist (append (list (cons "\\.sp$" 'spice-mode)
 ;; 				       (cons "\\.cir$" 'spice-mode)
 ;; 				       (cons "\\.ckt$" 'spice-mode)
+;;                     (cons "\\.spc$" 'spice-mode) ; xcircuit output
+;;                     (cons "\\.spice$" 'spice-mode) ; magic output
 ;; 				       (cons "\\.mod$" 'spice-mode)
 ;; 				       (cons "\\.cdl$" 'spice-mode)
 ;; 				       (cons "\\.chi$" 'spice-mode) ;eldo outpt
@@ -89,7 +91,7 @@
 ;;  '(spice-standard (quote (spice2g6 (hspice eldo))))    ;; hspice and eldo
 ;;  '(spice-standard (quote (spice2g6 ())))               ;; spice2g6/3 only
 ;;  '(spice-simulator "Spice3")                           ;; default simulator
-;;  '(spice-waveform-viewer "Nutmeg")                     ;; default waveform 
+;;  '(spice-waveform-viewer "ngnutmeg")                   ;; default waveform 
 ;;  '(spice-highlight-keywords nil)                       ;; less highlighting
 ;;  '(spice-section-alist                                 ;; add own sections
 ;;    ;; this is ugly, I know ;)
@@ -146,7 +148,19 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defconst spice-version "1.2.25 (03 Jan 2007)"
+;; free variables
+
+(defvar fume-function-name-regexp-alist)
+(defvar fume-function-name-regexp)
+(defvar compilation-file-regexp-alist)
+(defvar fume-find-function-name-method-alist)
+(defvar fume-menubar-menu-name)
+(defvar fume-buffer-menu)
+(defvar fume-buffer-name)
+(defvar fume-index-method)
+(defvar msb-menu-cond)
+
+(defconst spice-version "1.2.26 (12 Dec 2009)"
   "Current version of spice mode (spice2g6/spice3/hspice/eldo(rf&verilog-a)/fasthenry/layla/mondriaan/draccdl/spectre).")
 
 (defconst spice-developer 
@@ -159,7 +173,6 @@
 (defvar spice-tempo-tags nil
   "List of templates used in spice mode.")
 
-
 ;; help function
 (defun spice-custom-set (variable value &rest functions)
   "Set variables as in `custom-set-default' and call FUNCTIONS (if
@@ -193,6 +206,7 @@ bound) afterwards."
 Basic standard:
   Spice2g6    : Original Berkeley Spice (leave this always on!)
 Additional standards:
+  Gnucap      : The Gnu Circuit Analysis Package
   Hspice (TM) : Commercial Spice, formerly Meta Software, now owned by Synopsys
   Eldo (TM)   : Commercial Spice, formerly Anacad, now owned by Mentor Graphics
   EldoRf (TM) : RF Steady State analyses of Eldo (also turn on Eldo!)
@@ -299,7 +313,7 @@ variable and insert its contents into th
   '(
     ;; Spice3; spice3 -b <file.cir> 
     ;; 
-    ("Spice3" "spice3 -b" ""
+    ("Gnucap" "gnucap -b" ""
      ("\\s-*Error[\t ]+on[ \t]+line[\t ]+\\([0-9]+\\) +:.+" 
       0 1 nil (buffer-file-name)) 
      ("Circuit: \\(.*\\)$" 1)) ; spice3 hack, is not the filename, but that's no prob
@@ -390,9 +404,9 @@ see also `spice-simulator'."
   '(
     ;; Nutmeg; nutmeg <waveformdata.dat> 
     ;; 
-    ("Nutmeg"  "nutmeg" "" spice-run-interactive (".dat" ".ac0" ".tr0")) ; spice3 nutmeg viewer
     ("Gwave"   "gwave"  "" spice-run-silent 
      (".raw" ".braw" ".ac0" ".tr0" ".sw0" ".W" ".N" ".acs")) ; gwave viewer
+    ("ngnutmeg"  "ngnutmeg" "" spice-run-interactive (".dat" ".ac0" ".tr0")) ; spice3 nutmeg viewer
     ("Xelga"   "xelga"  "" spice-run-silent ".cou") ; xelga eldo viewer
     ("Awaves"  "awaves_emacs" "" spice-run-silent (".ac0" ".tr0")) ; awaves hspice viewer, this doesn't work yet and will it ever ? Explanation: awaves is a script that starts an executable/binary in the background. This means the shell starting awaves ends immediately after the forking of the executable; after which all backgrounded programs get killed by emacs since their parent's parent shell (/bin/sh) ends. awaves shouldn't return immediately and then this will work; that's why I called the program awaves_emacs...
 
@@ -431,7 +445,7 @@ waveform viewer command.
 
 
 ;;;###autoload
-(defcustom spice-waveform-viewer nil ; example: "Nutmeg"
+(defcustom spice-waveform-viewer nil ; example: "ngnutmeg"
   "*Spice command, used when starting waveform viewer,
 see also `spice-waveform-viewer-switches'."
   :group 'spice-simulate
@@ -6246,19 +6260,19 @@ uses cache generated with the `spice-cac
 
 (defmacro spice-layla-function-template (name type)
   "Create a layla tempo define for name and type"
-  (` (let (p_prompt)
-       (setq p_prompt (concat "[Name of " (, name) "]: "))
+  `(let (p_prompt)
+       (setq p_prompt (concat "[Name of " ,name "]: "))
        (tempo-define-template 
-	(concat "layla-" (, name) "-" (, type))
-	(list (concat "." (, name) "_" (, type) "_param(")
+	(concat "layla-" ,name "-" ,type)
+	(list (concat "." ,name "_" ,type "_param(")
 	   (list 'p p_prompt) ", "
 	   '(p "[Name of parameter]: ") ", "
 	   '(p "[Value of parameter]: ") ")"
 	   'n)
-	(concat "layla-" (, name) "-" (, type))
-	(concat "template for inserting a " (, type) " parameter for a Layla "
-		(, name))
-	'spice-tempo-tags))))
+	(concat "layla-" ,name "-" ,type)
+	(concat "template for inserting a " ,type " parameter for a Layla "
+		,name)
+	'spice-tempo-tags)))
 
 (spice-layla-function-template "bus" "double")
 (spice-layla-function-template "bus" "integer")
@@ -7297,7 +7311,7 @@ is t, the filename itself is returned un
       (message "started %s" command)
       (if spice-after-start-process-function
 	  (funcall spice-after-start-process-function process))
-      (process-kill-without-query process))))
+      (process-query-on-exit-flag process))))
 
 (defun spice-run-interactive (name command file)
   "Run waveform viewer interactively.
@@ -7488,7 +7502,6 @@ that has been selected."
     ) ; when
   )
 
-
 (defun spice-func-menu-init ()
   "Initialize function menu." ; buffer local stuff
   ;; hook in the spice-mode mode regular expression above into the
@@ -7516,7 +7529,7 @@ that has been selected."
   (setq fume-menubar-menu-name "Subckts"
 	fume-buffer-name "*Subcircuits List*"
 	fume-index-method 2)
-  (make-local-hook 'find-file-hooks)
+  ;; (make-local-hook 'find-file-hooks) not available since Emacs 21.1
   (add-hook 'find-file-hooks 'fume-add-menubar-entry)   
   (define-key global-map '(shift button2) 'fume-mouse-function-goto)
   (fume-add-menubar-entry))
@@ -8173,43 +8186,6 @@ returns it. Non-comment paragraphs can a
   "Set mode line name of spice mode"
   (setq mode-name 
 	(concat 
-	 (when (not spice-output-local)
-	   (concat
-	    (when (spice-standard-p 'layla) "Layla")
-	    (when (spice-standard-p 'mondriaan) "-Mdrn")
-	    (when (spice-standard-p 'hspice)
-	      (when (spice-standard-p 'layla) "/"))
-	    (when (spice-standard-p 'hspice) "Hspice")
-	    (when (spice-standard-p 'eldo)
-	      (when (or (spice-standard-p 'hspice) 
-			(spice-standard-p 'layla)) "/"))
-	    (when (spice-standard-p 'eldo) "Eldo")
-	    (when (spice-standard-p 'eldorf) "-RF")
-	    (when (spice-standard-p 'eldovloga) "-VlA")
-	    (when (spice-standard-p 'fasthenry)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla)) "/"))
-	    (when (spice-standard-p 'fasthenry) "FastHenry")
-	    (when (spice-standard-p 'draccdl)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla) 
-			(spice-standard-p 'fasthenry)) "/"))
-	    (when (spice-standard-p 'draccdl) "DracCDL")
-	    (when (spice-standard-p 'spectre)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla) 
-			(spice-standard-p 'fasthenry) 
-			(spice-standard-p 'draccdl)) "/"))
-	    (when (spice-standard-p 'spectre) "Spectre")
-	    (when (or (spice-standard-p 'fasthenry) 
-		      (spice-standard-p 'eldo) 
-		      (spice-standard-p 'hspice) 
-		      (spice-standard-p 'layla) 
-		      (spice-standard-p 'draccdl) 
-		      (spice-standard-p 'spectre)) "|")))
 	 "Spice"
 	 (when spice-output-local "-output")
 	 (when spice-some-comment-regions-are-hidden " H+"))))
@@ -8639,11 +8615,11 @@ Key bindings for other parts in the file
     ;;------------------------------------------------------------
     ;; now hook in 'spice-colorize-libraries (eldo-mode.el)
     ;; all buffer local:
-    ;;(make-local-hook 'font-lock-mode-hook)
-    (make-local-hook 'font-lock-after-fontify-buffer-hook); doesn't exist in emacs 20
+    ;;(make-local-hook 'font-lock-mode-hook) ; not available since emacs 21.1
+    ;; (make-local-hook 'font-lock-after-fontify-buffer-hook); doesn't exist in emacs 20
     ;;(add-hook 'font-lock-mode-hook 'spice-colorize-libraries-buffer t t)
     (add-hook 'font-lock-after-fontify-buffer-hook 'spice-colorize-libraries-buffer t t) ; not in emacs 20
-    (make-local-hook 'after-change-functions)
+    ;; (make-local-hook 'after-change-functions) ; not available since emacs 21.1
     (add-hook 'after-change-functions 'spice-colorize-libraries t t)
     (spice-colorize-libraries-buffer)
 


--- NEW FILE emacs-spice-mode.spec ---
%global pkg spice-mode
%global pkgname Emacs-spice-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:		emacs-%{pkg}
Version:	1.2.25
Release:	2%{?dist}
Summary:	SPICE Mode for GNU Emacs

Group:		Applications/Editors
License:	GPLv2+
URL:		http://spice-mode.4t.com/
Source0:	http://spice-mode.4t.com/spice-mode-1.2.25.tar.gz
Source1:	%{pkg}-init.el
#Patch provided by shakthi kannan - shakthimaan AT gmail dot com and chitlesh goorah - chitlesh AT gmail dot com
#Fixes free variables and backquote,adds nguntmeg to simulators list and minor fixes
Patch0:		emacs-spice-mode-fix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version} gnucap gwave
		
%description
This package provides an Emacs major mode for editing SPICE decks.

%package el
Summary:	Source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%setup -q -n %{pkg}
%patch0 -p2

%build
emacs -batch -f batch-byte-compile %{pkg}.el

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}	
%{__install} -pm 644 %{pkg}.* %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS Changes COPYING README test_netlist.cir
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{emacs_startdir}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Mon Dec 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-2
- More file extenstions are handled by spice-mode
- Default simulator is now Gnucap
- Default wave form viewer is now Gwave
- Added gnucap and gwave to requires
- Fixed free variables and blackquote


* Sun Dec 06 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-1
- Initial release 1.2.25-1


--- NEW FILE import.log ---
emacs-spice-mode-1_2_25-2_fc12:F-12:emacs-spice-mode-1.2.25-2.fc12.src.rpm:1260812407


--- NEW FILE spice-mode-init.el ---
;init file for spice-mode
(autoload 'spice-mode "spice-mode" "Spice Editing Mode" t)
(custom-set-variables
  '(spice-simulator "Gnucap")                        ;; default simulator
  '(spice-waveform-viewer "Gwave")                   ;; default waveform 
  '(spice-output-local "Gnucap")
)
(setq auto-mode-alist (append (list (cons "\\.sp$" 'spice-mode)
                                     (cons "\\.cir$" 'spice-mode)
                                     (cons "\\.ckt$" 'spice-mode)
                                     (cons "\\.mod$" 'spice-mode)
                                     (cons "\\.spc$" 'spice-mode) ; xcircuit output
                                     (cons "\\.spice$" 'spice-mode) ; magic output
                                     (cons "\\.cdl$" 'spice-mode)
                                     (cons "\\.chi$" 'spice-mode) ;eldo output
                                     (cons "\\.inp$" 'spice-mode))
                               auto-mode-alist))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:27:19 -0000	1.1
+++ .cvsignore	14 Dec 2009 17:41:51 -0000	1.2
@@ -0,0 +1 @@
+spice-mode-1.2.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:27:19 -0000	1.1
+++ sources	14 Dec 2009 17:41:51 -0000	1.2
@@ -0,0 +1 @@
+9902d60313b33ed82d44d4ffc7ef9b63  spice-mode-1.2.25.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 14 17:42:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:42:28 +0000
Subject: [pkgdb] compiz-fusion-unsupported was added for leigh123linux
Message-ID: <20091214174234.9477728ED1C@bastion3.fedora.phx2.redhat.com>

kevin has added Package compiz-fusion-unsupported with summary Unsupported Compiz Fusion plugins for Compiz
kevin has approved Package compiz-fusion-unsupported
kevin has added a Fedora devel branch for compiz-fusion-unsupported with an owner of leigh123linux
kevin has approved compiz-fusion-unsupported in Fedora devel
kevin has approved Package compiz-fusion-unsupported
kevin has set commit to Approved for 107427 on compiz-fusion-unsupported (Fedora devel)
kevin has set checkout to Approved for 107427 on compiz-fusion-unsupported (Fedora devel)
kevin has set build to Approved for 107427 on compiz-fusion-unsupported (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion-unsupported



From pkgdb at fedoraproject.org  Mon Dec 14 17:42:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:42:38 +0000
Subject: [pkgdb] compiz-fusion-unsupported summary updated by kevin
Message-ID: <20091214174238.E0DEB28ED1C@bastion3.fedora.phx2.redhat.com>

kevin set package compiz-fusion-unsupported summary to Unsupported Compiz Fusion plugins for Compiz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion-unsupported



From pkgdb at fedoraproject.org  Mon Dec 14 17:42:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:42:38 +0000
Subject: [pkgdb] compiz-fusion-unsupported (Fedora, 12) updated by kevin
Message-ID: <20091214174239.CDD0628ED61@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for compiz-fusion-unsupported
kevin has set commit to Approved for 107427 on compiz-fusion-unsupported (Fedora 12)
kevin has set checkout to Approved for 107427 on compiz-fusion-unsupported (Fedora 12)
kevin has set build to Approved for 107427 on compiz-fusion-unsupported (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion-unsupported



From kevin at fedoraproject.org  Mon Dec 14 17:42:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:42:58 +0000 (UTC)
Subject: rpms/compiz-fusion-unsupported - New directory
Message-ID: <20091214174258.24FED11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/compiz-fusion-unsupported
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC32243/rpms/compiz-fusion-unsupported

Log Message:
Directory /cvs/pkgs/rpms/compiz-fusion-unsupported added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:42:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:42:58 +0000 (UTC)
Subject: rpms/compiz-fusion-unsupported/devel - New directory
Message-ID: <20091214174258.341F111C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/compiz-fusion-unsupported/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC32243/rpms/compiz-fusion-unsupported/devel

Log Message:
Directory /cvs/pkgs/rpms/compiz-fusion-unsupported/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:43:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:43:07 +0000 (UTC)
Subject: rpms/compiz-fusion-unsupported Makefile,NONE,1.1
Message-ID: <20091214174307.BE8BC11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/compiz-fusion-unsupported
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC32243/rpms/compiz-fusion-unsupported

Added Files:
	Makefile 
Log Message:
Setup of module compiz-fusion-unsupported


--- NEW FILE Makefile ---
# Top level Makefile for module compiz-fusion-unsupported
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:43:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:43:07 +0000 (UTC)
Subject: rpms/compiz-fusion-unsupported/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091214174307.F1DB511C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/compiz-fusion-unsupported/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC32243/rpms/compiz-fusion-unsupported/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compiz-fusion-unsupported


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: compiz-fusion-unsupported
# $Id: Makefile,v 1.1 2009/12/14 17:43:07 kevin Exp $
NAME := compiz-fusion-unsupported
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:43:22 +0000
Subject: [pkgdb] mingw32-gtkhtml3 was added for epienbro
Message-ID: <20091214174323.63A6628ED61@bastion3.fedora.phx2.redhat.com>

kevin has added Package mingw32-gtkhtml3 with summary MinGW Windows port of GtkHTML
kevin has approved Package mingw32-gtkhtml3
kevin has added a Fedora devel branch for mingw32-gtkhtml3 with an owner of epienbro
kevin has approved mingw32-gtkhtml3 in Fedora devel
kevin has approved Package mingw32-gtkhtml3
kevin has set commit to Approved for 107427 on mingw32-gtkhtml3 (Fedora devel)
kevin has set checkout to Approved for 107427 on mingw32-gtkhtml3 (Fedora devel)
kevin has set build to Approved for 107427 on mingw32-gtkhtml3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 17:43:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:43:44 +0000
Subject: [pkgdb] mingw32-gtkhtml3 summary updated by kevin
Message-ID: <20091214174346.655E328ED1C@bastion3.fedora.phx2.redhat.com>

kevin set package mingw32-gtkhtml3 summary to MinGW Windows port of GtkHTML

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 17:43:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:43:44 +0000
Subject: [pkgdb] mingw32-gtkhtml3 (Fedora, 11) updated by kevin
Message-ID: <20091214174348.818F828ED08@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for mingw32-gtkhtml3
kevin has set commit to Approved for 107427 on mingw32-gtkhtml3 (Fedora 11)
kevin has set checkout to Approved for 107427 on mingw32-gtkhtml3 (Fedora 11)
kevin has set build to Approved for 107427 on mingw32-gtkhtml3 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtkhtml3



From pkgdb at fedoraproject.org  Mon Dec 14 17:43:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:43:44 +0000
Subject: [pkgdb] mingw32-gtkhtml3 (Fedora, 12) updated by kevin
Message-ID: <20091214174350.9FC2D28ED08@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for mingw32-gtkhtml3
kevin has set commit to Approved for 107427 on mingw32-gtkhtml3 (Fedora 12)
kevin has set checkout to Approved for 107427 on mingw32-gtkhtml3 (Fedora 12)
kevin has set build to Approved for 107427 on mingw32-gtkhtml3 (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gtkhtml3



From kevin at fedoraproject.org  Mon Dec 14 17:44:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:44:05 +0000 (UTC)
Subject: rpms/mingw32-gtkhtml3/devel - New directory
Message-ID: <20091214174405.2B8D011C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32531/rpms/mingw32-gtkhtml3/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-gtkhtml3/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:44:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:44:05 +0000 (UTC)
Subject: rpms/mingw32-gtkhtml3 - New directory
Message-ID: <20091214174405.12E9111C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gtkhtml3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32531/rpms/mingw32-gtkhtml3

Log Message:
Directory /cvs/pkgs/rpms/mingw32-gtkhtml3 added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:44:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:44:12 +0000 (UTC)
Subject: rpms/mingw32-gtkhtml3 Makefile,NONE,1.1
Message-ID: <20091214174412.81EB711C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gtkhtml3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32531/rpms/mingw32-gtkhtml3

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-gtkhtml3


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-gtkhtml3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:44:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:44:12 +0000 (UTC)
Subject: rpms/mingw32-gtkhtml3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091214174412.A086411C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz32531/rpms/mingw32-gtkhtml3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-gtkhtml3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-gtkhtml3
# $Id: Makefile,v 1.1 2009/12/14 17:44:12 kevin Exp $
NAME := mingw32-gtkhtml3
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:44:31 +0000
Subject: [pkgdb] gscribble was added for roshansingh
Message-ID: <20091214174433.BA57A28ED72@bastion3.fedora.phx2.redhat.com>

kevin has added Package gscribble with summary A desktop client for blogging
kevin has approved Package gscribble
kevin has added a Fedora devel branch for gscribble with an owner of roshansingh
kevin has approved gscribble in Fedora devel
kevin has approved Package gscribble
kevin has set commit to Approved for 107427 on gscribble (Fedora devel)
kevin has set checkout to Approved for 107427 on gscribble (Fedora devel)
kevin has set build to Approved for 107427 on gscribble (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gscribble



From pkgdb at fedoraproject.org  Mon Dec 14 17:44:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:44:46 +0000
Subject: [pkgdb] gscribble (Fedora, 12) updated by kevin
Message-ID: <20091214174452.39BEF28ED1C@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for gscribble
kevin has set commit to Approved for 107427 on gscribble (Fedora 12)
kevin has set checkout to Approved for 107427 on gscribble (Fedora 12)
kevin has set build to Approved for 107427 on gscribble (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gscribble



From pkgdb at fedoraproject.org  Mon Dec 14 17:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:44:45 +0000
Subject: [pkgdb] gscribble (Fedora, 11) updated by kevin
Message-ID: <20091214174450.2DE9528ECDB@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for gscribble
kevin has set commit to Approved for 107427 on gscribble (Fedora 11)
kevin has set checkout to Approved for 107427 on gscribble (Fedora 11)
kevin has set build to Approved for 107427 on gscribble (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gscribble



From pkgdb at fedoraproject.org  Mon Dec 14 17:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:44:45 +0000
Subject: [pkgdb] gscribble summary updated by kevin
Message-ID: <20091214174447.BD20E28ED74@bastion3.fedora.phx2.redhat.com>

kevin set package gscribble summary to A desktop client for blogging

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gscribble



From kevin at fedoraproject.org  Mon Dec 14 17:45:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:45:05 +0000 (UTC)
Subject: rpms/gscribble/devel - New directory
Message-ID: <20091214174505.28CBC11C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gscribble/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPwx316/rpms/gscribble/devel

Log Message:
Directory /cvs/pkgs/rpms/gscribble/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:45:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:45:05 +0000 (UTC)
Subject: rpms/gscribble - New directory
Message-ID: <20091214174505.1930E11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gscribble
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPwx316/rpms/gscribble

Log Message:
Directory /cvs/pkgs/rpms/gscribble added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:45:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:45:14 +0000 (UTC)
Subject: rpms/gscribble Makefile,NONE,1.1
Message-ID: <20091214174514.86B2E11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gscribble
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPwx316/rpms/gscribble

Added Files:
	Makefile 
Log Message:
Setup of module gscribble


--- NEW FILE Makefile ---
# Top level Makefile for module gscribble
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:45:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:45:14 +0000 (UTC)
Subject: rpms/gscribble/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091214174514.E221911C02CA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gscribble/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPwx316/rpms/gscribble/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gscribble


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gscribble
# $Id: Makefile,v 1.1 2009/12/14 17:45:14 kevin Exp $
NAME := gscribble
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:45:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:45:14 +0000
Subject: [pkgdb] artha was added for roshansingh
Message-ID: <20091214174515.298CE28ED70@bastion3.fedora.phx2.redhat.com>

kevin has added Package artha with summary A handy thesaurus based on WordNet
kevin has approved Package artha
kevin has added a Fedora devel branch for artha with an owner of roshansingh
kevin has approved artha in Fedora devel
kevin has approved Package artha
kevin has set commit to Approved for 107427 on artha (Fedora devel)
kevin has set checkout to Approved for 107427 on artha (Fedora devel)
kevin has set build to Approved for 107427 on artha (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/artha



From sagarun at fedoraproject.org  Mon Dec 14 17:45:29 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Mon, 14 Dec 2009 17:45:29 +0000 (UTC)
Subject: rpms/emacs-spice-mode/EL-5 emacs-spice-mode-fix.patch, NONE,
	1.1 emacs-spice-mode.spec, NONE, 1.1 import.log, NONE,
	1.1 spice-mode-init.el, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091214174529.BD8BE11C00EF@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-spice-mode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32579/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-spice-mode-fix.patch emacs-spice-mode.spec import.log 
	spice-mode-init.el 
Log Message:
commiting emacs-spice-mode on EL-5


emacs-spice-mode-fix.patch:
 spice-mode.el |   92 +++++++++++++++++++++-------------------------------------
 1 file changed, 34 insertions(+), 58 deletions(-)

--- NEW FILE emacs-spice-mode-fix.patch ---
diff -up ./spice-mode/spice-mode.el.fix ./spice-mode/spice-mode.el
--- ./spice-mode/spice-mode.el.fix	2009-12-13 08:28:15.000000000 +0530
+++ ./spice-mode/spice-mode.el	2009-12-13 16:58:17.000000000 +0530
@@ -5,7 +5,7 @@
 ;; Author: Geert A. M. Van der Plas <geert_vanderplas at email.com> 1999-
 ;;         Emmanuel Rouat <emmanuel.rouat at wanadoo.fr> 1997-
 ;;         Carlin J. Vieri, MIT AI Lab <cvieri at ai.mit.edu> 1994 
-;; Keywords: spice, spice2g6, spice3, eldo, hspice, layla, mondriaan, fasthenry, CDL, spectre compatibility, netlist editing
+;; Keywords: ngspice, gnucap, spice, spice2g6, spice3, eldo, hspice, layla, mondriaan, fasthenry, CDL, spectre compatibility, netlist editing
 ;; Filename: spice-mode.el
 ;; Version: 1.2.25
 ;; Maintainer: Geert A. M. Van der Plas <geert_vanderplas at email.com>
@@ -57,6 +57,8 @@
 ;; (setq auto-mode-alist (append (list (cons "\\.sp$" 'spice-mode)
 ;; 				       (cons "\\.cir$" 'spice-mode)
 ;; 				       (cons "\\.ckt$" 'spice-mode)
+;;                     (cons "\\.spc$" 'spice-mode) ; xcircuit output
+;;                     (cons "\\.spice$" 'spice-mode) ; magic output
 ;; 				       (cons "\\.mod$" 'spice-mode)
 ;; 				       (cons "\\.cdl$" 'spice-mode)
 ;; 				       (cons "\\.chi$" 'spice-mode) ;eldo outpt
@@ -89,7 +91,7 @@
 ;;  '(spice-standard (quote (spice2g6 (hspice eldo))))    ;; hspice and eldo
 ;;  '(spice-standard (quote (spice2g6 ())))               ;; spice2g6/3 only
 ;;  '(spice-simulator "Spice3")                           ;; default simulator
-;;  '(spice-waveform-viewer "Nutmeg")                     ;; default waveform 
+;;  '(spice-waveform-viewer "ngnutmeg")                   ;; default waveform 
 ;;  '(spice-highlight-keywords nil)                       ;; less highlighting
 ;;  '(spice-section-alist                                 ;; add own sections
 ;;    ;; this is ugly, I know ;)
@@ -146,7 +148,19 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defconst spice-version "1.2.25 (03 Jan 2007)"
+;; free variables
+
+(defvar fume-function-name-regexp-alist)
+(defvar fume-function-name-regexp)
+(defvar compilation-file-regexp-alist)
+(defvar fume-find-function-name-method-alist)
+(defvar fume-menubar-menu-name)
+(defvar fume-buffer-menu)
+(defvar fume-buffer-name)
+(defvar fume-index-method)
+(defvar msb-menu-cond)
+
+(defconst spice-version "1.2.26 (12 Dec 2009)"
   "Current version of spice mode (spice2g6/spice3/hspice/eldo(rf&verilog-a)/fasthenry/layla/mondriaan/draccdl/spectre).")
 
 (defconst spice-developer 
@@ -159,7 +173,6 @@
 (defvar spice-tempo-tags nil
   "List of templates used in spice mode.")
 
-
 ;; help function
 (defun spice-custom-set (variable value &rest functions)
   "Set variables as in `custom-set-default' and call FUNCTIONS (if
@@ -193,6 +206,7 @@ bound) afterwards."
 Basic standard:
   Spice2g6    : Original Berkeley Spice (leave this always on!)
 Additional standards:
+  Gnucap      : The Gnu Circuit Analysis Package
   Hspice (TM) : Commercial Spice, formerly Meta Software, now owned by Synopsys
   Eldo (TM)   : Commercial Spice, formerly Anacad, now owned by Mentor Graphics
   EldoRf (TM) : RF Steady State analyses of Eldo (also turn on Eldo!)
@@ -299,7 +313,7 @@ variable and insert its contents into th
   '(
     ;; Spice3; spice3 -b <file.cir> 
     ;; 
-    ("Spice3" "spice3 -b" ""
+    ("Gnucap" "gnucap -b" ""
      ("\\s-*Error[\t ]+on[ \t]+line[\t ]+\\([0-9]+\\) +:.+" 
       0 1 nil (buffer-file-name)) 
      ("Circuit: \\(.*\\)$" 1)) ; spice3 hack, is not the filename, but that's no prob
@@ -390,9 +404,9 @@ see also `spice-simulator'."
   '(
     ;; Nutmeg; nutmeg <waveformdata.dat> 
     ;; 
-    ("Nutmeg"  "nutmeg" "" spice-run-interactive (".dat" ".ac0" ".tr0")) ; spice3 nutmeg viewer
     ("Gwave"   "gwave"  "" spice-run-silent 
      (".raw" ".braw" ".ac0" ".tr0" ".sw0" ".W" ".N" ".acs")) ; gwave viewer
+    ("ngnutmeg"  "ngnutmeg" "" spice-run-interactive (".dat" ".ac0" ".tr0")) ; spice3 nutmeg viewer
     ("Xelga"   "xelga"  "" spice-run-silent ".cou") ; xelga eldo viewer
     ("Awaves"  "awaves_emacs" "" spice-run-silent (".ac0" ".tr0")) ; awaves hspice viewer, this doesn't work yet and will it ever ? Explanation: awaves is a script that starts an executable/binary in the background. This means the shell starting awaves ends immediately after the forking of the executable; after which all backgrounded programs get killed by emacs since their parent's parent shell (/bin/sh) ends. awaves shouldn't return immediately and then this will work; that's why I called the program awaves_emacs...
 
@@ -431,7 +445,7 @@ waveform viewer command.
 
 
 ;;;###autoload
-(defcustom spice-waveform-viewer nil ; example: "Nutmeg"
+(defcustom spice-waveform-viewer nil ; example: "ngnutmeg"
   "*Spice command, used when starting waveform viewer,
 see also `spice-waveform-viewer-switches'."
   :group 'spice-simulate
@@ -6246,19 +6260,19 @@ uses cache generated with the `spice-cac
 
 (defmacro spice-layla-function-template (name type)
   "Create a layla tempo define for name and type"
-  (` (let (p_prompt)
-       (setq p_prompt (concat "[Name of " (, name) "]: "))
+  `(let (p_prompt)
+       (setq p_prompt (concat "[Name of " ,name "]: "))
        (tempo-define-template 
-	(concat "layla-" (, name) "-" (, type))
-	(list (concat "." (, name) "_" (, type) "_param(")
+	(concat "layla-" ,name "-" ,type)
+	(list (concat "." ,name "_" ,type "_param(")
 	   (list 'p p_prompt) ", "
 	   '(p "[Name of parameter]: ") ", "
 	   '(p "[Value of parameter]: ") ")"
 	   'n)
-	(concat "layla-" (, name) "-" (, type))
-	(concat "template for inserting a " (, type) " parameter for a Layla "
-		(, name))
-	'spice-tempo-tags))))
+	(concat "layla-" ,name "-" ,type)
+	(concat "template for inserting a " ,type " parameter for a Layla "
+		,name)
+	'spice-tempo-tags)))
 
 (spice-layla-function-template "bus" "double")
 (spice-layla-function-template "bus" "integer")
@@ -7297,7 +7311,7 @@ is t, the filename itself is returned un
       (message "started %s" command)
       (if spice-after-start-process-function
 	  (funcall spice-after-start-process-function process))
-      (process-kill-without-query process))))
+      (process-query-on-exit-flag process))))
 
 (defun spice-run-interactive (name command file)
   "Run waveform viewer interactively.
@@ -7488,7 +7502,6 @@ that has been selected."
     ) ; when
   )
 
-
 (defun spice-func-menu-init ()
   "Initialize function menu." ; buffer local stuff
   ;; hook in the spice-mode mode regular expression above into the
@@ -7516,7 +7529,7 @@ that has been selected."
   (setq fume-menubar-menu-name "Subckts"
 	fume-buffer-name "*Subcircuits List*"
 	fume-index-method 2)
-  (make-local-hook 'find-file-hooks)
+  ;; (make-local-hook 'find-file-hooks) not available since Emacs 21.1
   (add-hook 'find-file-hooks 'fume-add-menubar-entry)   
   (define-key global-map '(shift button2) 'fume-mouse-function-goto)
   (fume-add-menubar-entry))
@@ -8173,43 +8186,6 @@ returns it. Non-comment paragraphs can a
   "Set mode line name of spice mode"
   (setq mode-name 
 	(concat 
-	 (when (not spice-output-local)
-	   (concat
-	    (when (spice-standard-p 'layla) "Layla")
-	    (when (spice-standard-p 'mondriaan) "-Mdrn")
-	    (when (spice-standard-p 'hspice)
-	      (when (spice-standard-p 'layla) "/"))
-	    (when (spice-standard-p 'hspice) "Hspice")
-	    (when (spice-standard-p 'eldo)
-	      (when (or (spice-standard-p 'hspice) 
-			(spice-standard-p 'layla)) "/"))
-	    (when (spice-standard-p 'eldo) "Eldo")
-	    (when (spice-standard-p 'eldorf) "-RF")
-	    (when (spice-standard-p 'eldovloga) "-VlA")
-	    (when (spice-standard-p 'fasthenry)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla)) "/"))
-	    (when (spice-standard-p 'fasthenry) "FastHenry")
-	    (when (spice-standard-p 'draccdl)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla) 
-			(spice-standard-p 'fasthenry)) "/"))
-	    (when (spice-standard-p 'draccdl) "DracCDL")
-	    (when (spice-standard-p 'spectre)
-	      (when (or (spice-standard-p 'eldo) 
-			(spice-standard-p 'hspice) 
-			(spice-standard-p 'layla) 
-			(spice-standard-p 'fasthenry) 
-			(spice-standard-p 'draccdl)) "/"))
-	    (when (spice-standard-p 'spectre) "Spectre")
-	    (when (or (spice-standard-p 'fasthenry) 
-		      (spice-standard-p 'eldo) 
-		      (spice-standard-p 'hspice) 
-		      (spice-standard-p 'layla) 
-		      (spice-standard-p 'draccdl) 
-		      (spice-standard-p 'spectre)) "|")))
 	 "Spice"
 	 (when spice-output-local "-output")
 	 (when spice-some-comment-regions-are-hidden " H+"))))
@@ -8639,11 +8615,11 @@ Key bindings for other parts in the file
     ;;------------------------------------------------------------
     ;; now hook in 'spice-colorize-libraries (eldo-mode.el)
     ;; all buffer local:
-    ;;(make-local-hook 'font-lock-mode-hook)
-    (make-local-hook 'font-lock-after-fontify-buffer-hook); doesn't exist in emacs 20
+    ;;(make-local-hook 'font-lock-mode-hook) ; not available since emacs 21.1
+    ;; (make-local-hook 'font-lock-after-fontify-buffer-hook); doesn't exist in emacs 20
     ;;(add-hook 'font-lock-mode-hook 'spice-colorize-libraries-buffer t t)
     (add-hook 'font-lock-after-fontify-buffer-hook 'spice-colorize-libraries-buffer t t) ; not in emacs 20
-    (make-local-hook 'after-change-functions)
+    ;; (make-local-hook 'after-change-functions) ; not available since emacs 21.1
     (add-hook 'after-change-functions 'spice-colorize-libraries t t)
     (spice-colorize-libraries-buffer)
 


--- NEW FILE emacs-spice-mode.spec ---
%global pkg spice-mode
%global pkgname Emacs-spice-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:		emacs-%{pkg}
Version:	1.2.25
Release:	2%{?dist}
Summary:	SPICE Mode for GNU Emacs

Group:		Applications/Editors
License:	GPLv2+
URL:		http://spice-mode.4t.com/
Source0:	http://spice-mode.4t.com/spice-mode-1.2.25.tar.gz
Source1:	%{pkg}-init.el
#Patch provided by shakthi kannan - shakthimaan AT gmail dot com and chitlesh goorah - chitlesh AT gmail dot com
#Fixes free variables and backquote,adds nguntmeg to simulators list and minor fixes
Patch0:		emacs-spice-mode-fix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version} gnucap gwave
		
%description
This package provides an Emacs major mode for editing SPICE decks.

%package el
Summary:	Source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%setup -q -n %{pkg}
%patch0 -p2

%build
emacs -batch -f batch-byte-compile %{pkg}.el

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}	
%{__install} -pm 644 %{pkg}.* %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS Changes COPYING README test_netlist.cir
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{emacs_startdir}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Mon Dec 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-2
- More file extenstions are handled by spice-mode
- Default simulator is now Gnucap
- Default wave form viewer is now Gwave
- Added gnucap and gwave to requires
- Fixed free variables and blackquote


* Sun Dec 06 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-1
- Initial release 1.2.25-1


--- NEW FILE import.log ---
emacs-spice-mode-1_2_25-2_fc12:EL-5:emacs-spice-mode-1.2.25-2.fc12.src.rpm:1260812577


--- NEW FILE spice-mode-init.el ---
;init file for spice-mode
(autoload 'spice-mode "spice-mode" "Spice Editing Mode" t)
(custom-set-variables
  '(spice-simulator "Gnucap")                        ;; default simulator
  '(spice-waveform-viewer "Gwave")                   ;; default waveform 
  '(spice-output-local "Gnucap")
)
(setq auto-mode-alist (append (list (cons "\\.sp$" 'spice-mode)
                                     (cons "\\.cir$" 'spice-mode)
                                     (cons "\\.ckt$" 'spice-mode)
                                     (cons "\\.mod$" 'spice-mode)
                                     (cons "\\.spc$" 'spice-mode) ; xcircuit output
                                     (cons "\\.spice$" 'spice-mode) ; magic output
                                     (cons "\\.cdl$" 'spice-mode)
                                     (cons "\\.chi$" 'spice-mode) ;eldo output
                                     (cons "\\.inp$" 'spice-mode))
                               auto-mode-alist))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:27:19 -0000	1.1
+++ .cvsignore	14 Dec 2009 17:45:27 -0000	1.2
@@ -0,0 +1 @@
+spice-mode-1.2.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:27:19 -0000	1.1
+++ sources	14 Dec 2009 17:45:29 -0000	1.2
@@ -0,0 +1 @@
+9902d60313b33ed82d44d4ffc7ef9b63  spice-mode-1.2.25.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 14 17:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:45:43 +0000
Subject: [pkgdb] artha summary updated by kevin
Message-ID: <20091214174544.C253E28ED6C@bastion3.fedora.phx2.redhat.com>

kevin set package artha summary to A handy thesaurus based on WordNet

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/artha



From pkgdb at fedoraproject.org  Mon Dec 14 17:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:45:43 +0000
Subject: [pkgdb] artha (Fedora, 11) updated by kevin
Message-ID: <20091214174546.2D76528ED72@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for artha
kevin has set commit to Approved for 107427 on artha (Fedora 11)
kevin has set checkout to Approved for 107427 on artha (Fedora 11)
kevin has set build to Approved for 107427 on artha (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/artha



From pkgdb at fedoraproject.org  Mon Dec 14 17:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:45:43 +0000
Subject: [pkgdb] artha (Fedora EPEL, 5) updated by kevin
Message-ID: <20091214174547.1759628ED77@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for artha
kevin has set commit to Approved for 107427 on artha (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on artha (Fedora EPEL 5)
kevin has set build to Approved for 107427 on artha (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/artha



From pkgdb at fedoraproject.org  Mon Dec 14 17:45:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:45:44 +0000
Subject: [pkgdb] artha (Fedora, 12) updated by kevin
Message-ID: <20091214174548.E4B6828ED72@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for artha
kevin has set commit to Approved for 107427 on artha (Fedora 12)
kevin has set checkout to Approved for 107427 on artha (Fedora 12)
kevin has set build to Approved for 107427 on artha (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/artha



From kevin at fedoraproject.org  Mon Dec 14 17:46:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:46:03 +0000 (UTC)
Subject: rpms/artha/devel - New directory
Message-ID: <20091214174603.30DEF11C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/artha/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUyo634/rpms/artha/devel

Log Message:
Directory /cvs/pkgs/rpms/artha/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:46:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:46:03 +0000 (UTC)
Subject: rpms/artha - New directory
Message-ID: <20091214174603.1321311C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/artha
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUyo634/rpms/artha

Log Message:
Directory /cvs/pkgs/rpms/artha added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:46:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:46:10 +0000 (UTC)
Subject: rpms/artha Makefile,NONE,1.1
Message-ID: <20091214174610.A9AC711C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/artha
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUyo634/rpms/artha

Added Files:
	Makefile 
Log Message:
Setup of module artha


--- NEW FILE Makefile ---
# Top level Makefile for module artha
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:46:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:46:11 +0000 (UTC)
Subject: rpms/artha/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091214174611.14BED11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/artha/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUyo634/rpms/artha/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module artha


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: artha
# $Id: Makefile,v 1.1 2009/12/14 17:46:10 kevin Exp $
NAME := artha
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:48:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:48:38 +0000
Subject: [pkgdb] mysql-mmm was added for derks
Message-ID: <20091214174839.01EA528ECD4@bastion3.fedora.phx2.redhat.com>

kevin has added Package mysql-mmm with summary Multi-Master Replication Manager for MySQL
kevin has approved Package mysql-mmm
kevin has added a Fedora devel branch for mysql-mmm with an owner of derks
kevin has approved mysql-mmm in Fedora devel
kevin has approved Package mysql-mmm
kevin has set commit to Approved for 107427 on mysql-mmm (Fedora devel)
kevin has set checkout to Approved for 107427 on mysql-mmm (Fedora devel)
kevin has set build to Approved for 107427 on mysql-mmm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-mmm



From pkgdb at fedoraproject.org  Mon Dec 14 17:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:49:09 +0000
Subject: [pkgdb] mysql-mmm summary updated by kevin
Message-ID: <20091214174910.C216228EC9E@bastion3.fedora.phx2.redhat.com>

kevin set package mysql-mmm summary to Multi-Master Replication Manager for MySQL

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-mmm



From pkgdb at fedoraproject.org  Mon Dec 14 17:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:49:09 +0000
Subject: [pkgdb] mysql-mmm (Fedora EPEL, 5) updated by kevin
Message-ID: <20091214174912.7584E28EC9E@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for mysql-mmm
kevin has set commit to Approved for 107427 on mysql-mmm (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on mysql-mmm (Fedora EPEL 5)
kevin has set build to Approved for 107427 on mysql-mmm (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-mmm



From pkgdb at fedoraproject.org  Mon Dec 14 17:49:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:49:10 +0000
Subject: [pkgdb] mysql-mmm (Fedora, 11) updated by kevin
Message-ID: <20091214174913.5170C28ECD4@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for mysql-mmm
kevin has set commit to Approved for 107427 on mysql-mmm (Fedora 11)
kevin has set checkout to Approved for 107427 on mysql-mmm (Fedora 11)
kevin has set build to Approved for 107427 on mysql-mmm (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-mmm



From pkgdb at fedoraproject.org  Mon Dec 14 17:49:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:49:10 +0000
Subject: [pkgdb] mysql-mmm (Fedora, 12) updated by kevin
Message-ID: <20091214174914.95AAB28EC93@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for mysql-mmm
kevin has set commit to Approved for 107427 on mysql-mmm (Fedora 12)
kevin has set checkout to Approved for 107427 on mysql-mmm (Fedora 12)
kevin has set build to Approved for 107427 on mysql-mmm (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-mmm



From kevin at fedoraproject.org  Mon Dec 14 17:50:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:50:03 +0000 (UTC)
Subject: rpms/mysql-mmm - New directory
Message-ID: <20091214175003.1515011C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mysql-mmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsit1464/rpms/mysql-mmm

Log Message:
Directory /cvs/pkgs/rpms/mysql-mmm added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:50:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:50:03 +0000 (UTC)
Subject: rpms/mysql-mmm/devel - New directory
Message-ID: <20091214175003.299B111C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mysql-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsit1464/rpms/mysql-mmm/devel

Log Message:
Directory /cvs/pkgs/rpms/mysql-mmm/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 14 17:50:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:50:10 +0000 (UTC)
Subject: rpms/mysql-mmm Makefile,NONE,1.1
Message-ID: <20091214175010.C5B9911C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mysql-mmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsit1464/rpms/mysql-mmm

Added Files:
	Makefile 
Log Message:
Setup of module mysql-mmm


--- NEW FILE Makefile ---
# Top level Makefile for module mysql-mmm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 14 17:50:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 14 Dec 2009 17:50:11 +0000 (UTC)
Subject: rpms/mysql-mmm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091214175011.117A011C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mysql-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsit1464/rpms/mysql-mmm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mysql-mmm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mysql-mmm
# $Id: Makefile,v 1.1 2009/12/14 17:50:10 kevin Exp $
NAME := mysql-mmm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 14 17:50:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:50:28 +0000
Subject: [pkgdb] log4c (Fedora EPEL, 4) updated by kevin
Message-ID: <20091214175029.6E46C28ED05@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 4 branch for log4c
kevin has set commit to Approved for 107427 on log4c (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on log4c (Fedora EPEL 4)
kevin has set build to Approved for 107427 on log4c (Fedora EPEL 4)
kevin changed owner of log4c in Fedora EPEL 4 to stevetraylen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/log4c



From pkgdb at fedoraproject.org  Mon Dec 14 17:50:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:50:28 +0000
Subject: [pkgdb] log4c (Fedora EPEL, 5) updated by kevin
Message-ID: <20091214175030.6293E28ED24@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for log4c
kevin has set commit to Approved for 107427 on log4c (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on log4c (Fedora EPEL 5)
kevin has set build to Approved for 107427 on log4c (Fedora EPEL 5)
kevin changed owner of log4c in Fedora EPEL 5 to stevetraylen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/log4c



From pkgdb at fedoraproject.org  Mon Dec 14 17:55:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:55:12 +0000
Subject: [pkgdb] python-matplotlib had acl change status
Message-ID: <20091214175512.84A4428EC9E@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on python-matplotlib (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From pkgdb at fedoraproject.org  Mon Dec 14 17:55:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 17:55:15 +0000
Subject: [pkgdb] python-matplotlib had acl change status
Message-ID: <20091214175516.991EB28EC9E@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on python-matplotlib (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-matplotlib



From cdamian at fedoraproject.org  Mon Dec 14 18:03:41 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Mon, 14 Dec 2009 18:03:41 +0000 (UTC)
Subject: rpms/php-phpunit-phpcpd/F-11 .cvsignore, 1.2,
	1.3 php-phpunit-phpcpd.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091214180341.A4E6811C00EF@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-phpcpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4002

Modified Files:
	.cvsignore php-phpunit-phpcpd.spec sources 
Log Message:
upstream 1.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Nov 2009 11:44:49 -0000	1.2
+++ .cvsignore	14 Dec 2009 18:03:41 -0000	1.3
@@ -1 +1 @@
-phpcpd-1.2.0.tgz
+phpcpd-1.2.2.tgz


Index: php-phpunit-phpcpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/F-11/php-phpunit-phpcpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-phpcpd.spec	18 Nov 2009 11:44:49 -0000	1.1
+++ php-phpunit-phpcpd.spec	14 Dec 2009 18:03:41 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-phpcpd
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Copy/Paste Detector (CPD) for PHP code
 
@@ -19,6 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
@@ -80,7 +81,6 @@ fi
 %{pear_phpdir}/PHPCPD/TextUI/Command.php
 %{pear_phpdir}/PHPCPD/TextUI/Getopt.php
 %{pear_phpdir}/PHPCPD/TextUI/ResultPrinter.php
-%{pear_phpdir}/PHPCPD/Util/FilterIterator.php
 %{pear_phpdir}/PHPCPD/Clone.php
 %{pear_phpdir}/PHPCPD/CloneMap.php
 %{pear_phpdir}/PHPCPD/Detector.php
@@ -88,5 +88,8 @@ fi
 
 
 %changelog
+* Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.2.2-1
+- upstream 1.2.2
+
 * Thu Oct 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Nov 2009 11:44:49 -0000	1.2
+++ sources	14 Dec 2009 18:03:41 -0000	1.3
@@ -1 +1 @@
-84cc68a7e05df6c360ec3054f6dd4214  phpcpd-1.2.0.tgz
+4a4db8d9c34c43b238c49aa65c1fee9c  phpcpd-1.2.2.tgz



From epienbro at fedoraproject.org  Mon Dec 14 18:10:36 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon, 14 Dec 2009 18:10:36 +0000 (UTC)
Subject: File gtkhtml-3.29.3.tar.bz2 uploaded to lookaside cache by epienbro
Message-ID: <20091214181036.553B528ECEE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mingw32-gtkhtml3:

1439783818e20933c69199fa08a87e19  gtkhtml-3.29.3.tar.bz2



From epienbro at fedoraproject.org  Mon Dec 14 18:11:44 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon, 14 Dec 2009 18:11:44 +0000 (UTC)
Subject: rpms/mingw32-gtkhtml3/F-11
	gtkhtml-dont-search-for-gnome-icon-theme.patch, NONE,
	1.1 gtkhtml-make-gconf-optional.patch, NONE,
	1.1 gtkhtml-make-iso-codes-optional.patch, NONE,
	1.1 gtkhtml-perform-g-thread-init-in-test-program.patch, NONE,
	1.1 gtkhtml_enable_static_build.patch, NONE,
	1.1 mingw32-gtkhtml3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091214181144.559C611C00EF@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtkhtml3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5783/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gtkhtml-dont-search-for-gnome-icon-theme.patch 
	gtkhtml-make-gconf-optional.patch 
	gtkhtml-make-iso-codes-optional.patch 
	gtkhtml-perform-g-thread-init-in-test-program.patch 
	gtkhtml_enable_static_build.patch mingw32-gtkhtml3.spec 
Log Message:
Initial import


gtkhtml-dont-search-for-gnome-icon-theme.patch:
 configure.ac |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE gtkhtml-dont-search-for-gnome-icon-theme.patch ---
--- a/configure.ac
+++ b/configure.ac
@@ -178,11 +183,6 @@ AM_CONDITIONAL(HAVE_SOUP, test x$have_soup != xno)
 AM_CONDITIONAL(HAVE_NEWSOUP, test x$HAVE_NEWSOUP != xno)
 
 dnl **************************************************
-dnl * Gnome Icon Theme
-dnl **************************************************
-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)
-
-dnl **************************************************
 dnl * iso-codes
 dnl **************************************************
 

gtkhtml-make-gconf-optional.patch:
 configure.ac                 |    7 ++++++-
 gtkhtml/Makefile.am          |    5 +++++
 gtkhtml/gtkhtml-properties.h |    4 ++++
 gtkhtml/gtkhtml.c            |   40 ++++++++++++++++++++++++++++++++++++++--
 4 files changed, 53 insertions(+), 3 deletions(-)

--- NEW FILE gtkhtml-make-gconf-optional.patch ---
diff --git a/configure.ac b/configure.ac
index 2e28dbe..5d2f5a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,11 +136,16 @@ PKG_CHECK_MODULES(GTHREAD, $GTHREAD_MODULES)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant gconf-2.0 iso-codes"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
+PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
+if test "$have_gconf" = "true" ; then
+	GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
+fi
 PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
 AC_SUBST(GTKHTML_MODULES)
+AM_CONDITIONAL(HAVE_GCONF, test x$have_gconf != xno)
 
 # Glade catalog files
 AC_ARG_WITH(glade-catalog,
diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am
index 6ac2d02..9e781c0 100644
--- a/gtkhtml/Makefile.am
+++ b/gtkhtml/Makefile.am
@@ -12,6 +12,10 @@ if HAVE_NEWSOUP
 have_new_soup = -DHAVE_NEWSOUP
 endif
 
+if HAVE_GCONF
+have_gconf = -DHAVE_GCONF
+endif
+
 AM_CPPFLAGS = 				\
 	-I$(top_srcdir)			\
 	-I$(srcdir)			\
@@ -19,6 +23,7 @@ AM_CPPFLAGS = 				\
 	$(SOUP_CFLAGS)			\
 	$(I18N_LIB_CFLAGS)		\
 	-DG_LOG_DOMAIN=\"gtkhtml\"	\
+	${have_gconf}			\
 	${have_new_soup}
 
 AM_CFLAGS = 						\
diff --git a/gtkhtml/gtkhtml-properties.h b/gtkhtml/gtkhtml-properties.h
index ebfacf2..6eed7d7 100644
--- a/gtkhtml/gtkhtml-properties.h
+++ b/gtkhtml/gtkhtml-properties.h
@@ -27,7 +27,11 @@
 #define GTK_HTML_GNOME_CONFIG_PREFIX "/gtkhtml/Settings/"
 
 #include <gtk/gtk.h>
+#ifdef HAVE_GCONF
 #include <gconf/gconf-client.h>
+#else
+typedef void* GConfClient;
+#endif
 
 #include "gtkhtml-types.h"
 #include "gtkhtml.h"
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 6aa0cef..7ed2d0d 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -128,8 +128,10 @@ struct _ClipboardContents {
 
 static GtkLayoutClass *parent_class = NULL;
 
+#ifdef HAVE_GCONF
 static GConfClient *gconf_client = NULL;
 static GError      *gconf_error  = NULL;
+#endif
 
 enum {
 	TITLE_CHANGED,
@@ -791,7 +793,9 @@ destroy (GtkObject *object)
 		}
 
 		if (html->priv->notify_monospace_font_id) {
+#ifdef HAVE_GCONF
 			gconf_client_notify_remove (gconf_client, html->priv->notify_monospace_font_id);
+#endif
 			html->priv->notify_monospace_font_id = 0;
 		}
 
@@ -832,13 +836,19 @@ gtk_html_get_top_html (GtkHTML *html)
 static cairo_font_options_t *
 get_font_options (void)
 {
-	gchar *antialiasing, *hinting, *subpixel_order;
+	gchar *antialiasing = NULL;
+	gchar *hinting = NULL;
+	gchar  *subpixel_order = NULL;
+#ifdef HAVE_GCONF
 	GConfClient *gconf = gconf_client_get_default ();
+#endif
 	cairo_font_options_t *font_options = cairo_font_options_create ();
 
 	/* Antialiasing */
+#ifdef HAVE_GCONF
 	antialiasing = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/antialiasing", NULL);
+#endif
 	if (antialiasing == NULL) {
 		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
 	} else {
@@ -851,8 +861,10 @@ get_font_options (void)
 		else
 			cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
 	}
+#ifdef HAVE_GCONF
 	hinting = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/hinting", NULL);
+#endif
 	if (hinting == NULL) {
 		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
 	} else {
@@ -867,8 +879,10 @@ get_font_options (void)
 		else
 			cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
 	}
+#ifdef HAVE_GCONF
 	subpixel_order = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/rgba_order", NULL);
+#endif
 	if (subpixel_order == NULL) {
 		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
 	} else {
@@ -886,7 +900,9 @@ get_font_options (void)
 	g_free (antialiasing);
 	g_free (hinting);
 	g_free (subpixel_order);
+#ifdef HAVE_GCONF
 	g_object_unref (gconf);
+#endif
 	return font_options;
 }
 
@@ -925,6 +941,7 @@ gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
 		}
 	}
 
+#ifdef HAVE_GCONF
 	if (!fixed_name) {
 		GConfClient *gconf;
 
@@ -943,6 +960,7 @@ gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
 		}
 		g_object_unref (gconf);
 	}
+#endif
 
 	if (!fixed_name) {
 		fixed_family = "Monospace";
@@ -2365,6 +2383,7 @@ setup_class_properties (GtkHTML *html)
 	if (!klass->properties) {
 		klass->properties = gtk_html_class_properties_new (GTK_WIDGET (html));
 
+#ifdef HAVE_GCONF
 		if (!gconf_is_initialized ()) {
 			gchar *argv[] = { (gchar *) "gtkhtml", NULL };
 
@@ -2381,6 +2400,7 @@ setup_class_properties (GtkHTML *html)
 		gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
 		if (gconf_error)
 			g_error ("gconf error: %s\n", gconf_error->message);
+#endif
 	}
 }
 
@@ -2751,13 +2771,16 @@ drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint t
 static void
 read_key_theme (GtkHTMLClass *html_class)
 {
-	gchar *key_theme;
+	gchar *key_theme = NULL;
 
+#ifdef HAVE_GCONF
 	key_theme = gconf_client_get_string (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme", NULL);
+#endif
 	html_class->use_emacs_bindings = key_theme && !strcmp (key_theme, "Emacs");
 	g_free (key_theme);
 }
 
+#ifdef HAVE_GCONF
 static void
 client_notify_key_theme (GConfClient* client, guint cnxn_id, GConfEntry* entry, gpointer data)
 {
@@ -2783,6 +2806,7 @@ client_notify_cursor_blink (GConfClient* client, guint cnxn_id, GConfEntry* entr
 	else
 		html_engine_set_cursor_blink_timeout (0);
 }
+#endif
 
 static void
 gtk_html_direction_changed (GtkWidget *widget, GtkTextDirection previous_dir)
@@ -2823,7 +2847,9 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	GtkLayoutClass    *layout_class;
 	GtkContainerClass *container_class;
 	gchar *filename;
+#ifdef HAVE_GCONF
 	GConfClient *client;
+#endif
 
 	html_class = (GtkHTMLClass *) klass;
 #ifdef USE_PROPS
@@ -3178,6 +3204,7 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
 	read_key_theme (html_class);
 
+#ifdef HAVE_GCONF
 	client = gconf_client_get_default ();
 
 	gconf_client_notify_add (client, "/desktop/gnome/interface/gtk_key_theme",
@@ -3188,6 +3215,7 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	client_notify_cursor_blink (client, 0, NULL, NULL);
 
 	g_object_unref (client);
+#endif
 }
 
 static void
@@ -3195,8 +3223,10 @@ init_properties_widget (GtkHTML *html)
 {
 	setup_class_properties (html);
 
+#ifdef HAVE_GCONF
 	if (!gconf_client)
 		gconf_client = gconf_client_get_default ();
+#endif
 
 }
 
@@ -3478,9 +3508,11 @@ gtk_html_init (GtkHTML* html)
 	g_signal_connect (G_OBJECT (html->priv->im_context), "delete_surrounding",
 			  G_CALLBACK (gtk_html_im_delete_surrounding_cb), html);
 
+#ifdef HAVE_GCONF
 	html->priv->notify_monospace_font_id =
 		gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/monospace_font_name",
 					 client_notify_monospace_font, html, NULL, &gconf_error);
+#endif
 
 	gtk_html_construct (html);
 }
@@ -6042,7 +6074,11 @@ gtk_html_edit_make_cursor_visible (GtkHTML *html)
 gboolean
 gtk_html_build_with_gconf (void)
 {
+#ifdef HAVE_GCONF
 	return TRUE;
+#else
+	return FALSE;
+#endif
 }
 
 static void

gtkhtml-make-iso-codes-optional.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gtkhtml-make-iso-codes-optional.patch ---
--- gtkhtml-3.28.0/configure.ac.orig	2009-09-24 19:01:36.394784545 +0200
+++ gtkhtml-3.28.0/configure.ac	2009-09-24 19:01:56.310533792 +0200
@@ -137,7 +137,7 @@
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant"
 PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
 if test "$have_gconf" = "true" ; then
 	GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"

gtkhtml-perform-g-thread-init-in-test-program.patch:
 testgtkhtml.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE gtkhtml-perform-g-thread-init-in-test-program.patch ---
--- gtkhtml/testgtkhtml.c.orig	2009-09-24 19:50:51.248533238 +0200
+++ gtkhtml/testgtkhtml.c	2009-09-24 19:52:46.923783930 +0200
@@ -1190,6 +1190,8 @@
 	gpointer p = malloc (1024);	/* to make linker happy with ccmalloc */
 #endif
 
+	if (!g_thread_supported ()) g_thread_init (NULL);
+
 	gtk_init(&argc, &argv);
 
 	app = gtk_window_new (GTK_WINDOW_TOPLEVEL);

gtkhtml_enable_static_build.patch:
 dllmain.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gtkhtml_enable_static_build.patch ---
--- gtkhtml/dllmain.c.orig	2009-07-03 06:46:11.000000000 +0200
+++ gtkhtml/dllmain.c	2009-09-24 19:12:41.653533555 +0200
@@ -84,6 +84,8 @@
 #undef DATADIR
 #include <windows.h>
 
+#ifndef GLIB_STATIC_COMPILATION
+
 /* Silence gcc with a prototype */
 BOOL WINAPI DllMain (HINSTANCE hinstDLL,
 		     DWORD     fdwReason,
@@ -103,6 +105,8 @@
         return TRUE;
 }
 
+#endif
+
 /* Include gtkhtml-private.h now to get prototypes for the getter
  * functions, to silence gcc. Can't include it earlier as we need the
  * definitions of the *DIR macros from the Makefile above, and


--- NEW FILE mingw32-gtkhtml3.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}

Name:           mingw32-gtkhtml3
Version:        3.29.3
Release:        2%{?dist}
Summary:        MinGW library for embedding a lightweight web browser in GTK programs

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://projects.gnome.org/evolution/
Source:         http://download.gnome.org/sources/gtkhtml/3.29/gtkhtml-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# GConf doesn't work well on Win32 and it's only used by GtkHTML
# to figure out font-related settings like antialiasing. Even if
# we enable GConf support it doesn't make any sense as Windows maintains
# such settings in the Win32 registry and there isn't a relation between
# the GConf registry and the Win32 registry. This patch makes the
# GConf dependency optional and makes GtkHTML use the default font settings
Patch0:         gtkhtml-make-gconf-optional.patch

# The configure script searches for the presence of the pkgconfig file for
# gnome-icon-theme which we don't have for Fedora-MinGW (as it only contains
# a collection of icons and no source code). This patch strips out the
# dependency for gnome-icon-theme and shouldn't cause any side-effects
Patch1:         gtkhtml-dont-search-for-gnome-icon-theme.patch

# The same situation as with Patch1 also applies to the iso-codes dependency 
Patch2:         gtkhtml-make-iso-codes-optional.patch

# Normally GtkHTML always exports a function named 'DllMain' on
# Win32 environments. When GtkHTML is built as a static library, this
# function doesn't serve any purpose and it can introduce potential
# conflicts with other static libraries which may export a 'DllMain' function
# This patch causes the DllMain function to be ignore when GtkHTML is
# being built as a static library
Patch3:         gtkhtml_enable_static_build.patch

# When executing the testgtkhtml.exe program an error occurs mentioning
# that the GLib threads system wasn't initialized yet. This patch
# adds that initialisation
Patch4:         gtkhtml-perform-g-thread-init-in-test-program.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 53
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtk2
BuildRequires:  mingw32-libgnurx
BuildRequires:  mingw32-libsoup
BuildRequires:  mingw32-enchant

BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  libtool
BuildRequires:  intltool
BuildRequires:  glib2-devel

Requires:       pkgconfig

%description
GtkHTML is a lightweight HTML rendering/printing/editing engine
This is the MinGW build of GtkHTML


%package static
Summary:        Static version of the MinGW Windows GtkHTML library
Requires:       %{name} = %{version}-%{release}
Group:          Development/Libraries

%description static
Static version of the MinGW Windows GtkHTML library.


%{_mingw32_debug_package}


%prep
%setup -q -n gtkhtml-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p0
%patch4 -p0

autoreconf
libtoolize --copy --force


%build
# GtkHTML can't build static and shared libraries in one go, so we
# build GtkHTML twice here
mkdir build_static
pushd build_static
    %{_mingw32_configure} --enable-static --disable-shared CFLAGS="$CFLAGS -DGLIB_STATIC_COMPILATION -DGOBJECT_STATIC_COMPILATION"
    make %{?_smp_mflags}
popd

mkdir build_shared
pushd build_shared
    %{_mingw32_configure} --disable-static --enable-shared
    make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

# First install all the files belonging to the shared build
make -C build_shared DESTDIR=$RPM_BUILD_ROOT install

# Install all the files from the static build in a seperate folder
# and move the static libraries to the right location
make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}

# Manually merge the libtool files
sed -i s/"old_library=''"/"old_library='libgtkhtml-3.14.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-3.14.la
sed -i s/"old_library=''"/"old_library='libgtkhtml-editor.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-editor.la

# Drop the folder which was temporary used for installing the static bits
rm -rf $RPM_BUILD_ROOT/build_static

# Install a small test program
install -m0755 build_shared/gtkhtml/.libs/testgtkhtml.exe $RPM_BUILD_ROOT%{_mingw32_bindir}/testgtkhtml.exe

%find_lang gtkhtml-3.14


%clean
rm -rf $RPM_BUILD_ROOT


%files -f gtkhtml-3.14.lang
%defattr(-,root,root,-)
%doc COPYING.LIB
%{_mingw32_bindir}/gtkhtml-editor-test.exe
%{_mingw32_bindir}/libgtkhtml-3.14-19.dll
%{_mingw32_bindir}/libgtkhtml-editor-0.dll
%{_mingw32_bindir}/testgtkhtml.exe
%{_mingw32_includedir}/libgtkhtml-3.14
%{_mingw32_libdir}/libgtkhtml-3.14.dll.a
%{_mingw32_libdir}/libgtkhtml-3.14.la
%{_mingw32_libdir}/libgtkhtml-editor.dll.a
%{_mingw32_libdir}/libgtkhtml-editor.la
%{_mingw32_libdir}/pkgconfig/libgtkhtml-3.14.pc
%{_mingw32_libdir}/pkgconfig/gtkhtml-editor.pc
%{_mingw32_datadir}/gtkhtml-3.14

%files static
%defattr(-,root,root,-)
%{_mingw32_libdir}/libgtkhtml-3.14.a
%{_mingw32_libdir}/libgtkhtml-editor.a


%changelog
* Fri Dec 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.29.3-2
- Looks like the original license tag was correct: LGPLv2+
- Bundle COPYING.LIB instead of COPYING

* Fri Dec 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.29.3-1
- Update to 3.29.3
- Renamed 'webbrowser' in the summary to 'web browser' to keep rpmlint happy
- Fixed the license tag

* Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.28.0-1
- Update to 3.28.0
- Use %%global instead of %%define
- Automatically generate debuginfo subpackage
- Simplified the original patch to strip unnecessary deps
- Added translations

* Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.25.90-2
- Added -static subpackage

* Fri Feb 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.25.90-1
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtkhtml3/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:44:12 -0000	1.1
+++ .cvsignore	14 Dec 2009 18:11:43 -0000	1.2
@@ -0,0 +1 @@
+gtkhtml-3.29.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtkhtml3/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:44:12 -0000	1.1
+++ sources	14 Dec 2009 18:11:44 -0000	1.2
@@ -0,0 +1 @@
+1439783818e20933c69199fa08a87e19  gtkhtml-3.29.3.tar.bz2



From epienbro at fedoraproject.org  Mon Dec 14 18:11:44 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon, 14 Dec 2009 18:11:44 +0000 (UTC)
Subject: rpms/mingw32-gtkhtml3/F-12
	gtkhtml-dont-search-for-gnome-icon-theme.patch, NONE,
	1.1 gtkhtml-make-gconf-optional.patch, NONE,
	1.1 gtkhtml-make-iso-codes-optional.patch, NONE,
	1.1 gtkhtml-perform-g-thread-init-in-test-program.patch, NONE,
	1.1 gtkhtml_enable_static_build.patch, NONE,
	1.1 mingw32-gtkhtml3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091214181144.A131211C00EF@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtkhtml3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5783/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gtkhtml-dont-search-for-gnome-icon-theme.patch 
	gtkhtml-make-gconf-optional.patch 
	gtkhtml-make-iso-codes-optional.patch 
	gtkhtml-perform-g-thread-init-in-test-program.patch 
	gtkhtml_enable_static_build.patch mingw32-gtkhtml3.spec 
Log Message:
Initial import


gtkhtml-dont-search-for-gnome-icon-theme.patch:
 configure.ac |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE gtkhtml-dont-search-for-gnome-icon-theme.patch ---
--- a/configure.ac
+++ b/configure.ac
@@ -178,11 +183,6 @@ AM_CONDITIONAL(HAVE_SOUP, test x$have_soup != xno)
 AM_CONDITIONAL(HAVE_NEWSOUP, test x$HAVE_NEWSOUP != xno)
 
 dnl **************************************************
-dnl * Gnome Icon Theme
-dnl **************************************************
-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)
-
-dnl **************************************************
 dnl * iso-codes
 dnl **************************************************
 

gtkhtml-make-gconf-optional.patch:
 configure.ac                 |    7 ++++++-
 gtkhtml/Makefile.am          |    5 +++++
 gtkhtml/gtkhtml-properties.h |    4 ++++
 gtkhtml/gtkhtml.c            |   40 ++++++++++++++++++++++++++++++++++++++--
 4 files changed, 53 insertions(+), 3 deletions(-)

--- NEW FILE gtkhtml-make-gconf-optional.patch ---
diff --git a/configure.ac b/configure.ac
index 2e28dbe..5d2f5a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,11 +136,16 @@ PKG_CHECK_MODULES(GTHREAD, $GTHREAD_MODULES)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant gconf-2.0 iso-codes"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
+PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
+if test "$have_gconf" = "true" ; then
+	GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
+fi
 PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
 AC_SUBST(GTKHTML_MODULES)
+AM_CONDITIONAL(HAVE_GCONF, test x$have_gconf != xno)
 
 # Glade catalog files
 AC_ARG_WITH(glade-catalog,
diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am
index 6ac2d02..9e781c0 100644
--- a/gtkhtml/Makefile.am
+++ b/gtkhtml/Makefile.am
@@ -12,6 +12,10 @@ if HAVE_NEWSOUP
 have_new_soup = -DHAVE_NEWSOUP
 endif
 
+if HAVE_GCONF
+have_gconf = -DHAVE_GCONF
+endif
+
 AM_CPPFLAGS = 				\
 	-I$(top_srcdir)			\
 	-I$(srcdir)			\
@@ -19,6 +23,7 @@ AM_CPPFLAGS = 				\
 	$(SOUP_CFLAGS)			\
 	$(I18N_LIB_CFLAGS)		\
 	-DG_LOG_DOMAIN=\"gtkhtml\"	\
+	${have_gconf}			\
 	${have_new_soup}
 
 AM_CFLAGS = 						\
diff --git a/gtkhtml/gtkhtml-properties.h b/gtkhtml/gtkhtml-properties.h
index ebfacf2..6eed7d7 100644
--- a/gtkhtml/gtkhtml-properties.h
+++ b/gtkhtml/gtkhtml-properties.h
@@ -27,7 +27,11 @@
 #define GTK_HTML_GNOME_CONFIG_PREFIX "/gtkhtml/Settings/"
 
 #include <gtk/gtk.h>
+#ifdef HAVE_GCONF
 #include <gconf/gconf-client.h>
+#else
+typedef void* GConfClient;
+#endif
 
 #include "gtkhtml-types.h"
 #include "gtkhtml.h"
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 6aa0cef..7ed2d0d 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -128,8 +128,10 @@ struct _ClipboardContents {
 
 static GtkLayoutClass *parent_class = NULL;
 
+#ifdef HAVE_GCONF
 static GConfClient *gconf_client = NULL;
 static GError      *gconf_error  = NULL;
+#endif
 
 enum {
 	TITLE_CHANGED,
@@ -791,7 +793,9 @@ destroy (GtkObject *object)
 		}
 
 		if (html->priv->notify_monospace_font_id) {
+#ifdef HAVE_GCONF
 			gconf_client_notify_remove (gconf_client, html->priv->notify_monospace_font_id);
+#endif
 			html->priv->notify_monospace_font_id = 0;
 		}
 
@@ -832,13 +836,19 @@ gtk_html_get_top_html (GtkHTML *html)
 static cairo_font_options_t *
 get_font_options (void)
 {
-	gchar *antialiasing, *hinting, *subpixel_order;
+	gchar *antialiasing = NULL;
+	gchar *hinting = NULL;
+	gchar  *subpixel_order = NULL;
+#ifdef HAVE_GCONF
 	GConfClient *gconf = gconf_client_get_default ();
+#endif
 	cairo_font_options_t *font_options = cairo_font_options_create ();
 
 	/* Antialiasing */
+#ifdef HAVE_GCONF
 	antialiasing = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/antialiasing", NULL);
+#endif
 	if (antialiasing == NULL) {
 		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
 	} else {
@@ -851,8 +861,10 @@ get_font_options (void)
 		else
 			cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
 	}
+#ifdef HAVE_GCONF
 	hinting = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/hinting", NULL);
+#endif
 	if (hinting == NULL) {
 		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
 	} else {
@@ -867,8 +879,10 @@ get_font_options (void)
 		else
 			cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
 	}
+#ifdef HAVE_GCONF
 	subpixel_order = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/rgba_order", NULL);
+#endif
 	if (subpixel_order == NULL) {
 		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
 	} else {
@@ -886,7 +900,9 @@ get_font_options (void)
 	g_free (antialiasing);
 	g_free (hinting);
 	g_free (subpixel_order);
+#ifdef HAVE_GCONF
 	g_object_unref (gconf);
+#endif
 	return font_options;
 }
 
@@ -925,6 +941,7 @@ gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
 		}
 	}
 
+#ifdef HAVE_GCONF
 	if (!fixed_name) {
 		GConfClient *gconf;
 
@@ -943,6 +960,7 @@ gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
 		}
 		g_object_unref (gconf);
 	}
+#endif
 
 	if (!fixed_name) {
 		fixed_family = "Monospace";
@@ -2365,6 +2383,7 @@ setup_class_properties (GtkHTML *html)
 	if (!klass->properties) {
 		klass->properties = gtk_html_class_properties_new (GTK_WIDGET (html));
 
+#ifdef HAVE_GCONF
 		if (!gconf_is_initialized ()) {
 			gchar *argv[] = { (gchar *) "gtkhtml", NULL };
 
@@ -2381,6 +2400,7 @@ setup_class_properties (GtkHTML *html)
 		gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
 		if (gconf_error)
 			g_error ("gconf error: %s\n", gconf_error->message);
+#endif
 	}
 }
 
@@ -2751,13 +2771,16 @@ drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint t
 static void
 read_key_theme (GtkHTMLClass *html_class)
 {
-	gchar *key_theme;
+	gchar *key_theme = NULL;
 
+#ifdef HAVE_GCONF
 	key_theme = gconf_client_get_string (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme", NULL);
+#endif
 	html_class->use_emacs_bindings = key_theme && !strcmp (key_theme, "Emacs");
 	g_free (key_theme);
 }
 
+#ifdef HAVE_GCONF
 static void
 client_notify_key_theme (GConfClient* client, guint cnxn_id, GConfEntry* entry, gpointer data)
 {
@@ -2783,6 +2806,7 @@ client_notify_cursor_blink (GConfClient* client, guint cnxn_id, GConfEntry* entr
 	else
 		html_engine_set_cursor_blink_timeout (0);
 }
+#endif
 
 static void
 gtk_html_direction_changed (GtkWidget *widget, GtkTextDirection previous_dir)
@@ -2823,7 +2847,9 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	GtkLayoutClass    *layout_class;
 	GtkContainerClass *container_class;
 	gchar *filename;
+#ifdef HAVE_GCONF
 	GConfClient *client;
+#endif
 
 	html_class = (GtkHTMLClass *) klass;
 #ifdef USE_PROPS
@@ -3178,6 +3204,7 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
 	read_key_theme (html_class);
 
+#ifdef HAVE_GCONF
 	client = gconf_client_get_default ();
 
 	gconf_client_notify_add (client, "/desktop/gnome/interface/gtk_key_theme",
@@ -3188,6 +3215,7 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	client_notify_cursor_blink (client, 0, NULL, NULL);
 
 	g_object_unref (client);
+#endif
 }
 
 static void
@@ -3195,8 +3223,10 @@ init_properties_widget (GtkHTML *html)
 {
 	setup_class_properties (html);
 
+#ifdef HAVE_GCONF
 	if (!gconf_client)
 		gconf_client = gconf_client_get_default ();
+#endif
 
 }
 
@@ -3478,9 +3508,11 @@ gtk_html_init (GtkHTML* html)
 	g_signal_connect (G_OBJECT (html->priv->im_context), "delete_surrounding",
 			  G_CALLBACK (gtk_html_im_delete_surrounding_cb), html);
 
+#ifdef HAVE_GCONF
 	html->priv->notify_monospace_font_id =
 		gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/monospace_font_name",
 					 client_notify_monospace_font, html, NULL, &gconf_error);
+#endif
 
 	gtk_html_construct (html);
 }
@@ -6042,7 +6074,11 @@ gtk_html_edit_make_cursor_visible (GtkHTML *html)
 gboolean
 gtk_html_build_with_gconf (void)
 {
+#ifdef HAVE_GCONF
 	return TRUE;
+#else
+	return FALSE;
+#endif
 }
 
 static void

gtkhtml-make-iso-codes-optional.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gtkhtml-make-iso-codes-optional.patch ---
--- gtkhtml-3.28.0/configure.ac.orig	2009-09-24 19:01:36.394784545 +0200
+++ gtkhtml-3.28.0/configure.ac	2009-09-24 19:01:56.310533792 +0200
@@ -137,7 +137,7 @@
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant"
 PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
 if test "$have_gconf" = "true" ; then
 	GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"

gtkhtml-perform-g-thread-init-in-test-program.patch:
 testgtkhtml.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE gtkhtml-perform-g-thread-init-in-test-program.patch ---
--- gtkhtml/testgtkhtml.c.orig	2009-09-24 19:50:51.248533238 +0200
+++ gtkhtml/testgtkhtml.c	2009-09-24 19:52:46.923783930 +0200
@@ -1190,6 +1190,8 @@
 	gpointer p = malloc (1024);	/* to make linker happy with ccmalloc */
 #endif
 
+	if (!g_thread_supported ()) g_thread_init (NULL);
+
 	gtk_init(&argc, &argv);
 
 	app = gtk_window_new (GTK_WINDOW_TOPLEVEL);

gtkhtml_enable_static_build.patch:
 dllmain.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gtkhtml_enable_static_build.patch ---
--- gtkhtml/dllmain.c.orig	2009-07-03 06:46:11.000000000 +0200
+++ gtkhtml/dllmain.c	2009-09-24 19:12:41.653533555 +0200
@@ -84,6 +84,8 @@
 #undef DATADIR
 #include <windows.h>
 
+#ifndef GLIB_STATIC_COMPILATION
+
 /* Silence gcc with a prototype */
 BOOL WINAPI DllMain (HINSTANCE hinstDLL,
 		     DWORD     fdwReason,
@@ -103,6 +105,8 @@
         return TRUE;
 }
 
+#endif
+
 /* Include gtkhtml-private.h now to get prototypes for the getter
  * functions, to silence gcc. Can't include it earlier as we need the
  * definitions of the *DIR macros from the Makefile above, and


--- NEW FILE mingw32-gtkhtml3.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}

Name:           mingw32-gtkhtml3
Version:        3.29.3
Release:        2%{?dist}
Summary:        MinGW library for embedding a lightweight web browser in GTK programs

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://projects.gnome.org/evolution/
Source:         http://download.gnome.org/sources/gtkhtml/3.29/gtkhtml-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# GConf doesn't work well on Win32 and it's only used by GtkHTML
# to figure out font-related settings like antialiasing. Even if
# we enable GConf support it doesn't make any sense as Windows maintains
# such settings in the Win32 registry and there isn't a relation between
# the GConf registry and the Win32 registry. This patch makes the
# GConf dependency optional and makes GtkHTML use the default font settings
Patch0:         gtkhtml-make-gconf-optional.patch

# The configure script searches for the presence of the pkgconfig file for
# gnome-icon-theme which we don't have for Fedora-MinGW (as it only contains
# a collection of icons and no source code). This patch strips out the
# dependency for gnome-icon-theme and shouldn't cause any side-effects
Patch1:         gtkhtml-dont-search-for-gnome-icon-theme.patch

# The same situation as with Patch1 also applies to the iso-codes dependency 
Patch2:         gtkhtml-make-iso-codes-optional.patch

# Normally GtkHTML always exports a function named 'DllMain' on
# Win32 environments. When GtkHTML is built as a static library, this
# function doesn't serve any purpose and it can introduce potential
# conflicts with other static libraries which may export a 'DllMain' function
# This patch causes the DllMain function to be ignore when GtkHTML is
# being built as a static library
Patch3:         gtkhtml_enable_static_build.patch

# When executing the testgtkhtml.exe program an error occurs mentioning
# that the GLib threads system wasn't initialized yet. This patch
# adds that initialisation
Patch4:         gtkhtml-perform-g-thread-init-in-test-program.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 53
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtk2
BuildRequires:  mingw32-libgnurx
BuildRequires:  mingw32-libsoup
BuildRequires:  mingw32-enchant

BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  libtool
BuildRequires:  intltool
BuildRequires:  glib2-devel

Requires:       pkgconfig

%description
GtkHTML is a lightweight HTML rendering/printing/editing engine
This is the MinGW build of GtkHTML


%package static
Summary:        Static version of the MinGW Windows GtkHTML library
Requires:       %{name} = %{version}-%{release}
Group:          Development/Libraries

%description static
Static version of the MinGW Windows GtkHTML library.


%{_mingw32_debug_package}


%prep
%setup -q -n gtkhtml-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p0
%patch4 -p0

autoreconf
libtoolize --copy --force


%build
# GtkHTML can't build static and shared libraries in one go, so we
# build GtkHTML twice here
mkdir build_static
pushd build_static
    %{_mingw32_configure} --enable-static --disable-shared CFLAGS="$CFLAGS -DGLIB_STATIC_COMPILATION -DGOBJECT_STATIC_COMPILATION"
    make %{?_smp_mflags}
popd

mkdir build_shared
pushd build_shared
    %{_mingw32_configure} --disable-static --enable-shared
    make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

# First install all the files belonging to the shared build
make -C build_shared DESTDIR=$RPM_BUILD_ROOT install

# Install all the files from the static build in a seperate folder
# and move the static libraries to the right location
make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}

# Manually merge the libtool files
sed -i s/"old_library=''"/"old_library='libgtkhtml-3.14.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-3.14.la
sed -i s/"old_library=''"/"old_library='libgtkhtml-editor.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-editor.la

# Drop the folder which was temporary used for installing the static bits
rm -rf $RPM_BUILD_ROOT/build_static

# Install a small test program
install -m0755 build_shared/gtkhtml/.libs/testgtkhtml.exe $RPM_BUILD_ROOT%{_mingw32_bindir}/testgtkhtml.exe

%find_lang gtkhtml-3.14


%clean
rm -rf $RPM_BUILD_ROOT


%files -f gtkhtml-3.14.lang
%defattr(-,root,root,-)
%doc COPYING.LIB
%{_mingw32_bindir}/gtkhtml-editor-test.exe
%{_mingw32_bindir}/libgtkhtml-3.14-19.dll
%{_mingw32_bindir}/libgtkhtml-editor-0.dll
%{_mingw32_bindir}/testgtkhtml.exe
%{_mingw32_includedir}/libgtkhtml-3.14
%{_mingw32_libdir}/libgtkhtml-3.14.dll.a
%{_mingw32_libdir}/libgtkhtml-3.14.la
%{_mingw32_libdir}/libgtkhtml-editor.dll.a
%{_mingw32_libdir}/libgtkhtml-editor.la
%{_mingw32_libdir}/pkgconfig/libgtkhtml-3.14.pc
%{_mingw32_libdir}/pkgconfig/gtkhtml-editor.pc
%{_mingw32_datadir}/gtkhtml-3.14

%files static
%defattr(-,root,root,-)
%{_mingw32_libdir}/libgtkhtml-3.14.a
%{_mingw32_libdir}/libgtkhtml-editor.a


%changelog
* Fri Dec 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.29.3-2
- Looks like the original license tag was correct: LGPLv2+
- Bundle COPYING.LIB instead of COPYING

* Fri Dec 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.29.3-1
- Update to 3.29.3
- Renamed 'webbrowser' in the summary to 'web browser' to keep rpmlint happy
- Fixed the license tag

* Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.28.0-1
- Update to 3.28.0
- Use %%global instead of %%define
- Automatically generate debuginfo subpackage
- Simplified the original patch to strip unnecessary deps
- Added translations

* Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.25.90-2
- Added -static subpackage

* Fri Feb 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.25.90-1
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtkhtml3/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:44:12 -0000	1.1
+++ .cvsignore	14 Dec 2009 18:11:44 -0000	1.2
@@ -0,0 +1 @@
+gtkhtml-3.29.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtkhtml3/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:44:12 -0000	1.1
+++ sources	14 Dec 2009 18:11:44 -0000	1.2
@@ -0,0 +1 @@
+1439783818e20933c69199fa08a87e19  gtkhtml-3.29.3.tar.bz2



From epienbro at fedoraproject.org  Mon Dec 14 18:11:45 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon, 14 Dec 2009 18:11:45 +0000 (UTC)
Subject: rpms/mingw32-gtkhtml3/devel
	gtkhtml-dont-search-for-gnome-icon-theme.patch, NONE,
	1.1 gtkhtml-make-gconf-optional.patch, NONE,
	1.1 gtkhtml-make-iso-codes-optional.patch, NONE,
	1.1 gtkhtml-perform-g-thread-init-in-test-program.patch, NONE,
	1.1 gtkhtml_enable_static_build.patch, NONE,
	1.1 mingw32-gtkhtml3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091214181145.35F0B11C00EF@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5783/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtkhtml-dont-search-for-gnome-icon-theme.patch 
	gtkhtml-make-gconf-optional.patch 
	gtkhtml-make-iso-codes-optional.patch 
	gtkhtml-perform-g-thread-init-in-test-program.patch 
	gtkhtml_enable_static_build.patch mingw32-gtkhtml3.spec 
Log Message:
Initial import


gtkhtml-dont-search-for-gnome-icon-theme.patch:
 configure.ac |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE gtkhtml-dont-search-for-gnome-icon-theme.patch ---
--- a/configure.ac
+++ b/configure.ac
@@ -178,11 +183,6 @@ AM_CONDITIONAL(HAVE_SOUP, test x$have_soup != xno)
 AM_CONDITIONAL(HAVE_NEWSOUP, test x$HAVE_NEWSOUP != xno)
 
 dnl **************************************************
-dnl * Gnome Icon Theme
-dnl **************************************************
-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)
-
-dnl **************************************************
 dnl * iso-codes
 dnl **************************************************
 

gtkhtml-make-gconf-optional.patch:
 configure.ac                 |    7 ++++++-
 gtkhtml/Makefile.am          |    5 +++++
 gtkhtml/gtkhtml-properties.h |    4 ++++
 gtkhtml/gtkhtml.c            |   40 ++++++++++++++++++++++++++++++++++++++--
 4 files changed, 53 insertions(+), 3 deletions(-)

--- NEW FILE gtkhtml-make-gconf-optional.patch ---
diff --git a/configure.ac b/configure.ac
index 2e28dbe..5d2f5a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,11 +136,16 @@ PKG_CHECK_MODULES(GTHREAD, $GTHREAD_MODULES)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant gconf-2.0 iso-codes"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
+PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
+if test "$have_gconf" = "true" ; then
+	GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
+fi
 PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
 AC_SUBST(GTKHTML_MODULES)
+AM_CONDITIONAL(HAVE_GCONF, test x$have_gconf != xno)
 
 # Glade catalog files
 AC_ARG_WITH(glade-catalog,
diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am
index 6ac2d02..9e781c0 100644
--- a/gtkhtml/Makefile.am
+++ b/gtkhtml/Makefile.am
@@ -12,6 +12,10 @@ if HAVE_NEWSOUP
 have_new_soup = -DHAVE_NEWSOUP
 endif
 
+if HAVE_GCONF
+have_gconf = -DHAVE_GCONF
+endif
+
 AM_CPPFLAGS = 				\
 	-I$(top_srcdir)			\
 	-I$(srcdir)			\
@@ -19,6 +23,7 @@ AM_CPPFLAGS = 				\
 	$(SOUP_CFLAGS)			\
 	$(I18N_LIB_CFLAGS)		\
 	-DG_LOG_DOMAIN=\"gtkhtml\"	\
+	${have_gconf}			\
 	${have_new_soup}
 
 AM_CFLAGS = 						\
diff --git a/gtkhtml/gtkhtml-properties.h b/gtkhtml/gtkhtml-properties.h
index ebfacf2..6eed7d7 100644
--- a/gtkhtml/gtkhtml-properties.h
+++ b/gtkhtml/gtkhtml-properties.h
@@ -27,7 +27,11 @@
 #define GTK_HTML_GNOME_CONFIG_PREFIX "/gtkhtml/Settings/"
 
 #include <gtk/gtk.h>
+#ifdef HAVE_GCONF
 #include <gconf/gconf-client.h>
+#else
+typedef void* GConfClient;
+#endif
 
 #include "gtkhtml-types.h"
 #include "gtkhtml.h"
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 6aa0cef..7ed2d0d 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -128,8 +128,10 @@ struct _ClipboardContents {
 
 static GtkLayoutClass *parent_class = NULL;
 
+#ifdef HAVE_GCONF
 static GConfClient *gconf_client = NULL;
 static GError      *gconf_error  = NULL;
+#endif
 
 enum {
 	TITLE_CHANGED,
@@ -791,7 +793,9 @@ destroy (GtkObject *object)
 		}
 
 		if (html->priv->notify_monospace_font_id) {
+#ifdef HAVE_GCONF
 			gconf_client_notify_remove (gconf_client, html->priv->notify_monospace_font_id);
+#endif
 			html->priv->notify_monospace_font_id = 0;
 		}
 
@@ -832,13 +836,19 @@ gtk_html_get_top_html (GtkHTML *html)
 static cairo_font_options_t *
 get_font_options (void)
 {
-	gchar *antialiasing, *hinting, *subpixel_order;
+	gchar *antialiasing = NULL;
+	gchar *hinting = NULL;
+	gchar  *subpixel_order = NULL;
+#ifdef HAVE_GCONF
 	GConfClient *gconf = gconf_client_get_default ();
+#endif
 	cairo_font_options_t *font_options = cairo_font_options_create ();
 
 	/* Antialiasing */
+#ifdef HAVE_GCONF
 	antialiasing = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/antialiasing", NULL);
+#endif
 	if (antialiasing == NULL) {
 		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
 	} else {
@@ -851,8 +861,10 @@ get_font_options (void)
 		else
 			cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
 	}
+#ifdef HAVE_GCONF
 	hinting = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/hinting", NULL);
+#endif
 	if (hinting == NULL) {
 		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
 	} else {
@@ -867,8 +879,10 @@ get_font_options (void)
 		else
 			cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
 	}
+#ifdef HAVE_GCONF
 	subpixel_order = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/rgba_order", NULL);
+#endif
 	if (subpixel_order == NULL) {
 		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
 	} else {
@@ -886,7 +900,9 @@ get_font_options (void)
 	g_free (antialiasing);
 	g_free (hinting);
 	g_free (subpixel_order);
+#ifdef HAVE_GCONF
 	g_object_unref (gconf);
+#endif
 	return font_options;
 }
 
@@ -925,6 +941,7 @@ gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
 		}
 	}
 
+#ifdef HAVE_GCONF
 	if (!fixed_name) {
 		GConfClient *gconf;
 
@@ -943,6 +960,7 @@ gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
 		}
 		g_object_unref (gconf);
 	}
+#endif
 
 	if (!fixed_name) {
 		fixed_family = "Monospace";
@@ -2365,6 +2383,7 @@ setup_class_properties (GtkHTML *html)
 	if (!klass->properties) {
 		klass->properties = gtk_html_class_properties_new (GTK_WIDGET (html));
 
+#ifdef HAVE_GCONF
 		if (!gconf_is_initialized ()) {
 			gchar *argv[] = { (gchar *) "gtkhtml", NULL };
 
@@ -2381,6 +2400,7 @@ setup_class_properties (GtkHTML *html)
 		gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
 		if (gconf_error)
 			g_error ("gconf error: %s\n", gconf_error->message);
+#endif
 	}
 }
 
@@ -2751,13 +2771,16 @@ drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint t
 static void
 read_key_theme (GtkHTMLClass *html_class)
 {
-	gchar *key_theme;
+	gchar *key_theme = NULL;
 
+#ifdef HAVE_GCONF
 	key_theme = gconf_client_get_string (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme", NULL);
+#endif
 	html_class->use_emacs_bindings = key_theme && !strcmp (key_theme, "Emacs");
 	g_free (key_theme);
 }
 
+#ifdef HAVE_GCONF
 static void
 client_notify_key_theme (GConfClient* client, guint cnxn_id, GConfEntry* entry, gpointer data)
 {
@@ -2783,6 +2806,7 @@ client_notify_cursor_blink (GConfClient* client, guint cnxn_id, GConfEntry* entr
 	else
 		html_engine_set_cursor_blink_timeout (0);
 }
+#endif
 
 static void
 gtk_html_direction_changed (GtkWidget *widget, GtkTextDirection previous_dir)
@@ -2823,7 +2847,9 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	GtkLayoutClass    *layout_class;
 	GtkContainerClass *container_class;
 	gchar *filename;
+#ifdef HAVE_GCONF
 	GConfClient *client;
+#endif
 
 	html_class = (GtkHTMLClass *) klass;
 #ifdef USE_PROPS
@@ -3178,6 +3204,7 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
 	read_key_theme (html_class);
 
+#ifdef HAVE_GCONF
 	client = gconf_client_get_default ();
 
 	gconf_client_notify_add (client, "/desktop/gnome/interface/gtk_key_theme",
@@ -3188,6 +3215,7 @@ gtk_html_class_init (GtkHTMLClass *klass)
 	client_notify_cursor_blink (client, 0, NULL, NULL);
 
 	g_object_unref (client);
+#endif
 }
 
 static void
@@ -3195,8 +3223,10 @@ init_properties_widget (GtkHTML *html)
 {
 	setup_class_properties (html);
 
+#ifdef HAVE_GCONF
 	if (!gconf_client)
 		gconf_client = gconf_client_get_default ();
+#endif
 
 }
 
@@ -3478,9 +3508,11 @@ gtk_html_init (GtkHTML* html)
 	g_signal_connect (G_OBJECT (html->priv->im_context), "delete_surrounding",
 			  G_CALLBACK (gtk_html_im_delete_surrounding_cb), html);
 
+#ifdef HAVE_GCONF
 	html->priv->notify_monospace_font_id =
 		gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/monospace_font_name",
 					 client_notify_monospace_font, html, NULL, &gconf_error);
+#endif
 
 	gtk_html_construct (html);
 }
@@ -6042,7 +6074,11 @@ gtk_html_edit_make_cursor_visible (GtkHTML *html)
 gboolean
 gtk_html_build_with_gconf (void)
 {
+#ifdef HAVE_GCONF
 	return TRUE;
+#else
+	return FALSE;
+#endif
 }
 
 static void

gtkhtml-make-iso-codes-optional.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gtkhtml-make-iso-codes-optional.patch ---
--- gtkhtml-3.28.0/configure.ac.orig	2009-09-24 19:01:36.394784545 +0200
+++ gtkhtml-3.28.0/configure.ac	2009-09-24 19:01:56.310533792 +0200
@@ -137,7 +137,7 @@
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant"
 PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
 if test "$have_gconf" = "true" ; then
 	GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"

gtkhtml-perform-g-thread-init-in-test-program.patch:
 testgtkhtml.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE gtkhtml-perform-g-thread-init-in-test-program.patch ---
--- gtkhtml/testgtkhtml.c.orig	2009-09-24 19:50:51.248533238 +0200
+++ gtkhtml/testgtkhtml.c	2009-09-24 19:52:46.923783930 +0200
@@ -1190,6 +1190,8 @@
 	gpointer p = malloc (1024);	/* to make linker happy with ccmalloc */
 #endif
 
+	if (!g_thread_supported ()) g_thread_init (NULL);
+
 	gtk_init(&argc, &argv);
 
 	app = gtk_window_new (GTK_WINDOW_TOPLEVEL);

gtkhtml_enable_static_build.patch:
 dllmain.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gtkhtml_enable_static_build.patch ---
--- gtkhtml/dllmain.c.orig	2009-07-03 06:46:11.000000000 +0200
+++ gtkhtml/dllmain.c	2009-09-24 19:12:41.653533555 +0200
@@ -84,6 +84,8 @@
 #undef DATADIR
 #include <windows.h>
 
+#ifndef GLIB_STATIC_COMPILATION
+
 /* Silence gcc with a prototype */
 BOOL WINAPI DllMain (HINSTANCE hinstDLL,
 		     DWORD     fdwReason,
@@ -103,6 +105,8 @@
         return TRUE;
 }
 
+#endif
+
 /* Include gtkhtml-private.h now to get prototypes for the getter
  * functions, to silence gcc. Can't include it earlier as we need the
  * definitions of the *DIR macros from the Makefile above, and


--- NEW FILE mingw32-gtkhtml3.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}

Name:           mingw32-gtkhtml3
Version:        3.29.3
Release:        2%{?dist}
Summary:        MinGW library for embedding a lightweight web browser in GTK programs

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://projects.gnome.org/evolution/
Source:         http://download.gnome.org/sources/gtkhtml/3.29/gtkhtml-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# GConf doesn't work well on Win32 and it's only used by GtkHTML
# to figure out font-related settings like antialiasing. Even if
# we enable GConf support it doesn't make any sense as Windows maintains
# such settings in the Win32 registry and there isn't a relation between
# the GConf registry and the Win32 registry. This patch makes the
# GConf dependency optional and makes GtkHTML use the default font settings
Patch0:         gtkhtml-make-gconf-optional.patch

# The configure script searches for the presence of the pkgconfig file for
# gnome-icon-theme which we don't have for Fedora-MinGW (as it only contains
# a collection of icons and no source code). This patch strips out the
# dependency for gnome-icon-theme and shouldn't cause any side-effects
Patch1:         gtkhtml-dont-search-for-gnome-icon-theme.patch

# The same situation as with Patch1 also applies to the iso-codes dependency 
Patch2:         gtkhtml-make-iso-codes-optional.patch

# Normally GtkHTML always exports a function named 'DllMain' on
# Win32 environments. When GtkHTML is built as a static library, this
# function doesn't serve any purpose and it can introduce potential
# conflicts with other static libraries which may export a 'DllMain' function
# This patch causes the DllMain function to be ignore when GtkHTML is
# being built as a static library
Patch3:         gtkhtml_enable_static_build.patch

# When executing the testgtkhtml.exe program an error occurs mentioning
# that the GLib threads system wasn't initialized yet. This patch
# adds that initialisation
Patch4:         gtkhtml-perform-g-thread-init-in-test-program.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 53
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtk2
BuildRequires:  mingw32-libgnurx
BuildRequires:  mingw32-libsoup
BuildRequires:  mingw32-enchant

BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  libtool
BuildRequires:  intltool
BuildRequires:  glib2-devel

Requires:       pkgconfig

%description
GtkHTML is a lightweight HTML rendering/printing/editing engine
This is the MinGW build of GtkHTML


%package static
Summary:        Static version of the MinGW Windows GtkHTML library
Requires:       %{name} = %{version}-%{release}
Group:          Development/Libraries

%description static
Static version of the MinGW Windows GtkHTML library.


%{_mingw32_debug_package}


%prep
%setup -q -n gtkhtml-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p0
%patch4 -p0

autoreconf
libtoolize --copy --force


%build
# GtkHTML can't build static and shared libraries in one go, so we
# build GtkHTML twice here
mkdir build_static
pushd build_static
    %{_mingw32_configure} --enable-static --disable-shared CFLAGS="$CFLAGS -DGLIB_STATIC_COMPILATION -DGOBJECT_STATIC_COMPILATION"
    make %{?_smp_mflags}
popd

mkdir build_shared
pushd build_shared
    %{_mingw32_configure} --disable-static --enable-shared
    make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

# First install all the files belonging to the shared build
make -C build_shared DESTDIR=$RPM_BUILD_ROOT install

# Install all the files from the static build in a seperate folder
# and move the static libraries to the right location
make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}

# Manually merge the libtool files
sed -i s/"old_library=''"/"old_library='libgtkhtml-3.14.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-3.14.la
sed -i s/"old_library=''"/"old_library='libgtkhtml-editor.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-editor.la

# Drop the folder which was temporary used for installing the static bits
rm -rf $RPM_BUILD_ROOT/build_static

# Install a small test program
install -m0755 build_shared/gtkhtml/.libs/testgtkhtml.exe $RPM_BUILD_ROOT%{_mingw32_bindir}/testgtkhtml.exe

%find_lang gtkhtml-3.14


%clean
rm -rf $RPM_BUILD_ROOT


%files -f gtkhtml-3.14.lang
%defattr(-,root,root,-)
%doc COPYING.LIB
%{_mingw32_bindir}/gtkhtml-editor-test.exe
%{_mingw32_bindir}/libgtkhtml-3.14-19.dll
%{_mingw32_bindir}/libgtkhtml-editor-0.dll
%{_mingw32_bindir}/testgtkhtml.exe
%{_mingw32_includedir}/libgtkhtml-3.14
%{_mingw32_libdir}/libgtkhtml-3.14.dll.a
%{_mingw32_libdir}/libgtkhtml-3.14.la
%{_mingw32_libdir}/libgtkhtml-editor.dll.a
%{_mingw32_libdir}/libgtkhtml-editor.la
%{_mingw32_libdir}/pkgconfig/libgtkhtml-3.14.pc
%{_mingw32_libdir}/pkgconfig/gtkhtml-editor.pc
%{_mingw32_datadir}/gtkhtml-3.14

%files static
%defattr(-,root,root,-)
%{_mingw32_libdir}/libgtkhtml-3.14.a
%{_mingw32_libdir}/libgtkhtml-editor.a


%changelog
* Fri Dec 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.29.3-2
- Looks like the original license tag was correct: LGPLv2+
- Bundle COPYING.LIB instead of COPYING

* Fri Dec 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.29.3-1
- Update to 3.29.3
- Renamed 'webbrowser' in the summary to 'web browser' to keep rpmlint happy
- Fixed the license tag

* Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.28.0-1
- Update to 3.28.0
- Use %%global instead of %%define
- Automatically generate debuginfo subpackage
- Simplified the original patch to strip unnecessary deps
- Added translations

* Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.25.90-2
- Added -static subpackage

* Fri Feb 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.25.90-1
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtkhtml3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:44:12 -0000	1.1
+++ .cvsignore	14 Dec 2009 18:11:44 -0000	1.2
@@ -0,0 +1 @@
+gtkhtml-3.29.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtkhtml3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:44:12 -0000	1.1
+++ sources	14 Dec 2009 18:11:45 -0000	1.2
@@ -0,0 +1 @@
+1439783818e20933c69199fa08a87e19  gtkhtml-3.29.3.tar.bz2



From ajax at fedoraproject.org  Mon Dec 14 18:26:32 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 14 Dec 2009 18:26:32 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xorg-x11-server.spec,1.509,1.510
Message-ID: <20091214182632.DEADF11C00EF@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8008

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Dec 14 2009 Adam Jackson <ajax at redhat.com> 1.7.3-2
- xserver-1.7.1-sigaction.patch: Drop, exacerbates a race that leads to weird
  behaviour like spontaneously repeating keys.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -p -r1.509 -r1.510
--- xorg-x11-server.spec	8 Dec 2009 03:51:50 -0000	1.509
+++ xorg-x11-server.spec	14 Dec 2009 18:26:31 -0000	1.510
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.3
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -79,7 +79,6 @@ Patch6048: xserver-1.7.0-exa-fix-mixed.p
 Patch6049: xserver-1.7.1-multilib.patch
 Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
 Patch6052: xserver-1.7.1-libcrypto.patch
-Patch6053: xserver-1.7.1-sigaction.patch
 Patch6066: xserver-1.7.1-glx14-swrast.patch
 
 %define moduledir	%{_libdir}/xorg/modules
@@ -508,6 +507,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Dec 14 2009 Adam Jackson <ajax at redhat.com> 1.7.3-2
+- xserver-1.7.1-sigaction.patch: Drop, exacerbates a race that leads to weird
+  behaviour like spontaneously repeating keys.
+
 * Tue Dec 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.7.3-1
 - xserver 1.7.3
 - xserver-1.7.1-stat-sanity.patch: Drop, merged upstream.



From musuruan at fedoraproject.org  Mon Dec 14 18:33:20 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Mon, 14 Dec 2009 18:33:20 +0000 (UTC)
Subject: File phranzysko_-_Digna_s_Handwriting.ttf uploaded to lookaside
	cache by musuruan
Message-ID: <20091214183320.5D21F28ED04@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for oflb-dignas-handwriting-fonts:

f899c6cae2e5a30df3320e0c81e9dd48  phranzysko_-_Digna_s_Handwriting.ttf



From musuruan at fedoraproject.org  Mon Dec 14 18:33:53 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Mon, 14 Dec 2009 18:33:53 +0000 (UTC)
Subject: rpms/oflb-dignas-handwriting-fonts/devel import.log, NONE,
	1.1 oflb-dignas-handwriting-fonts-fontconfig.conf, NONE,
	1.1 oflb-dignas-handwriting-fonts.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214183353.8FADA11C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9246/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log oflb-dignas-handwriting-fonts-fontconfig.conf 
	oflb-dignas-handwriting-fonts.spec 
Log Message:
First import



--- NEW FILE import.log ---
oflb-dignas-handwriting-fonts-20031109-2_fc12:HEAD:oflb-dignas-handwriting-fonts-20031109-2.fc12.src.rpm:1260815610


--- NEW FILE oflb-dignas-handwriting-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Digna's Handwriting</family>
    </prefer>
  </alias>
  <alias>
    <family>Digna's Handwriting</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE oflb-dignas-handwriting-fonts.spec ---
%global fontname oflb-dignas-handwriting
%global fontconf 63-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20031109
Release:        2%{?dist}
Summary:        Handwriting font

Group:          User Interface/X
License:        OFL
URL:            http://openfontlibrary.org/media/files/phranzysko/407
Source0:        http://openfontlibrary.org/people/phranzysko/phranzysko_-_Digna_s_Handwriting.ttf 
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Phranzysko's sister handwriting.


%prep
%setup -q -c -T
cp %{SOURCE0} .


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf


%changelog
* Wed Dec 09 2009 Andrea Musuruane <musuruan at gmail.com> 20031109-2
- Changed package name to comply to Font Packaging Guidelines

* Sun Nov 29 2009 Andrea Musuruane <musuruan at gmail.com> 20031109-1
- First release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:31:30 -0000	1.1
+++ .cvsignore	14 Dec 2009 18:33:53 -0000	1.2
@@ -0,0 +1 @@
+phranzysko_-_Digna_s_Handwriting.ttf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:31:30 -0000	1.1
+++ sources	14 Dec 2009 18:33:53 -0000	1.2
@@ -0,0 +1 @@
+f899c6cae2e5a30df3320e0c81e9dd48  phranzysko_-_Digna_s_Handwriting.ttf



From musuruan at fedoraproject.org  Mon Dec 14 18:35:21 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Mon, 14 Dec 2009 18:35:21 +0000 (UTC)
Subject: rpms/oflb-dignas-handwriting-fonts/F-12 import.log, NONE,
	1.1 oflb-dignas-handwriting-fonts-fontconfig.conf, NONE,
	1.1 oflb-dignas-handwriting-fonts.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214183521.D236611C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9635/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log oflb-dignas-handwriting-fonts-fontconfig.conf 
	oflb-dignas-handwriting-fonts.spec 
Log Message:
First import



--- NEW FILE import.log ---
oflb-dignas-handwriting-fonts-20031109-2_fc12:F-12:oflb-dignas-handwriting-fonts-20031109-2.fc12.src.rpm:1260815693


--- NEW FILE oflb-dignas-handwriting-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Digna's Handwriting</family>
    </prefer>
  </alias>
  <alias>
    <family>Digna's Handwriting</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE oflb-dignas-handwriting-fonts.spec ---
%global fontname oflb-dignas-handwriting
%global fontconf 63-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20031109
Release:        2%{?dist}
Summary:        Handwriting font

Group:          User Interface/X
License:        OFL
URL:            http://openfontlibrary.org/media/files/phranzysko/407
Source0:        http://openfontlibrary.org/people/phranzysko/phranzysko_-_Digna_s_Handwriting.ttf 
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Phranzysko's sister handwriting.


%prep
%setup -q -c -T
cp %{SOURCE0} .


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf


%changelog
* Wed Dec 09 2009 Andrea Musuruane <musuruan at gmail.com> 20031109-2
- Changed package name to comply to Font Packaging Guidelines

* Sun Nov 29 2009 Andrea Musuruane <musuruan at gmail.com> 20031109-1
- First release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:31:30 -0000	1.1
+++ .cvsignore	14 Dec 2009 18:35:21 -0000	1.2
@@ -0,0 +1 @@
+phranzysko_-_Digna_s_Handwriting.ttf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-dignas-handwriting-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:31:30 -0000	1.1
+++ sources	14 Dec 2009 18:35:21 -0000	1.2
@@ -0,0 +1 @@
+f899c6cae2e5a30df3320e0c81e9dd48  phranzysko_-_Digna_s_Handwriting.ttf



From stevetraylen at fedoraproject.org  Mon Dec 14 18:44:47 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 14 Dec 2009 18:44:47 +0000 (UTC)
Subject: File pyactivemq-0.1.0.tar.gz uploaded to lookaside cache by
	stevetraylen
Message-ID: <20091214184447.6B5A528ED1D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for pyactivemq:

2ba32ab034c91a6fc6d0deb581d6ea27  pyactivemq-0.1.0.tar.gz



From stevetraylen at fedoraproject.org  Mon Dec 14 18:46:24 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 14 Dec 2009 18:46:24 +0000 (UTC)
Subject: rpms/pyactivemq/devel import.log, NONE,
	1.1 pyactivemq-use-activemq-cpp-config.patch, NONE,
	1.1 pyactivemq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214184624.2113711C00E9@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/pyactivemq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11544/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pyactivemq-use-activemq-cpp-config.patch 
	pyactivemq.spec 
Log Message:
Inital Import: rhbz#538172



--- NEW FILE import.log ---
pyactivemq-0_1_0-1_fc13:HEAD:pyactivemq-0.1.0-1.fc13.src.rpm:1260816295

pyactivemq-use-activemq-cpp-config.patch:
 setup.py |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE pyactivemq-use-activemq-cpp-config.patch ---
diff -uNr pyactivemq-0.1.0.ORIG/setup.py pyactivemq-0.1.0/setup.py
--- pyactivemq-0.1.0.ORIG/setup.py	2009-11-14 11:58:55.567999708 +0100
+++ pyactivemq-0.1.0/setup.py	2009-11-17 20:53:58.450618046 +0100
@@ -17,6 +17,8 @@
 from distutils.util import get_platform
 import os.path
 import sys
+import subprocess
+from subprocess import Popen, PIPE
 
 if get_platform().startswith('win'):
     include_dirs = [
@@ -66,21 +68,26 @@
         ('PYACTIVEMQ_ENABLE_DOCSTRINGS', 0)
         ]
 else:
-    include_dirs = [
-        '/opt/activemq-cpp-2.2.1/include/activemq-cpp-2.2.1'
-        ]
+    if os.path.exists('/usr/bin/activemqcpp-config'):
+        include_dirs = [ subprocess.Popen(['/usr/bin/activemqcpp-config','--includes'],stdout=PIPE).communicate()[0][2:-1] ]
+        library_dirs = [ subprocess.Popen(['/usr/bin/activemqcpp-config','--libs'],stdout=PIPE).communicate()[0][2:-1] ]
+        extra_link_args = [] 
+    else:
+        include_dirs = [
+              '/opt/activemq-cpp-2.2.1/include/activemq-cpp-2.2.1'
+               ]
+        library_dirs = [
+              '/opt/activemq-cpp-2.2.1/lib'
+               ]
+        extra_link_args = [
+             '-Wl,-rpath,/opt/activemq-cpp-2.2.1/lib' ]
+
     libraries = [
         'activemq-cpp',
         'uuid',
         'boost_python'
         ]
-    library_dirs = [
-        '/opt/activemq-cpp-2.2.1/lib'
-        ]
     extra_compile_args = []
-    extra_link_args = [
-        '-Wl,-rpath,/opt/activemq-cpp-2.2.1/lib'
-        ]
     define_macros = [
         ('BOOST_PYTHON_NO_PY_SIGNATURES', 1),
         ('PYACTIVEMQ_ENABLE_DOCSTRINGS', 0)


--- NEW FILE pyactivemq.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyactivemq
Version:        0.1.0
Release:        1%{?dist}
Summary:        Python wrapper around activemq-cpp for messaging

Group:          Development/Languages
License:        ASL 2.0
URL:            http://code.google.com/p/pyactivemq/
Source0:        http://pyactivemq.googlecode.com/files/pyactivemq-%{version}.tar.gz
# Allow setup.py to use activemq-cpp-config to file include paths etc.
# http://code.google.com/p/pyactivemq/issues/detail?id=30
Patch0:         pyactivemq-use-activemq-cpp-config.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  boost-devel
BuildRequires:  activemq-cpp-devel

%description
pyactivemq is a Python module for communicating with the 
message brokers which implement the Java Message Service 
specification or stomp.

%prep
%setup -q
%patch0 -p1

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt
%{python_sitearch}/*

%changelog
* Tue Nov 17 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1.0-1
First version of package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyactivemq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:30:14 -0000	1.1
+++ .cvsignore	14 Dec 2009 18:46:23 -0000	1.2
@@ -0,0 +1 @@
+pyactivemq-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyactivemq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:30:14 -0000	1.1
+++ sources	14 Dec 2009 18:46:23 -0000	1.2
@@ -0,0 +1 @@
+2ba32ab034c91a6fc6d0deb581d6ea27  pyactivemq-0.1.0.tar.gz



From kkofler at fedoraproject.org  Mon Dec 14 18:47:36 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 14 Dec 2009 18:47:36 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-12
	kde-plasma-networkmanagement.spec, 1.21.2.1, 1.21.2.2
Message-ID: <20091214184736.EC6B311C00E9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12159/F-12

Modified Files:
      Tag: kde-plasma-networkmanagement-0_9-0_3_20090930svn_fc12_x
	kde-plasma-networkmanagement.spec 
Log Message:
* Mon Dec 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.3.20090930svn.2
- Rebuild again, against KDE 4.3.3, not 4.3.4


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/kde-plasma-networkmanagement.spec,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -p -r1.21.2.1 -r1.21.2.2
--- kde-plasma-networkmanagement.spec	14 Dec 2009 16:07:50 -0000	1.21.2.1
+++ kde-plasma-networkmanagement.spec	14 Dec 2009 18:47:36 -0000	1.21.2.2
@@ -7,7 +7,7 @@ Name:           kde-plasma-networkmanage
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
 Version:        0.9
-Release:        0.3.20090930svn%{?dist}.1
+Release:        0.3.20090930svn%{?dist}.2
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -180,6 +180,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Mon Dec 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.3.20090930svn.2
+- Rebuild again, against KDE 4.3.3, not 4.3.4
+
 * Mon Dec 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.3.20090930svn.1
 - Rebuild for F12 to fix upgrade path from F11
 



From stevetraylen at fedoraproject.org  Mon Dec 14 18:47:42 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 14 Dec 2009 18:47:42 +0000 (UTC)
Subject: File activemq-cpp-2.2.6-src.tar.gz uploaded to lookaside cache by
	stevetraylen
Message-ID: <20091214184742.6255628ECDA@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for activemq-cpp:

1222f0d6c5f86ef3ed5a558a533c7564  activemq-cpp-2.2.6-src.tar.gz



From stevetraylen at fedoraproject.org  Mon Dec 14 18:48:49 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 14 Dec 2009 18:48:49 +0000 (UTC)
Subject: rpms/activemq-cpp/devel activemq-cpp-local-texmf.patch, NONE,
	1.1 activemq-cpp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214184849.CD1EC11C00E9@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/activemq-cpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12351/devel

Modified Files:
	.cvsignore sources 
Added Files:
	activemq-cpp-local-texmf.patch activemq-cpp.spec import.log 
Log Message:
Import #rhbz 533899


activemq-cpp-local-texmf.patch:
 doxygen-include.am |    4 ++--
 texmf.cnf          |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE activemq-cpp-local-texmf.patch ---
diff -uNr activemq-cpp-2.2.6.ORIG/texmf.cnf activemq-cpp-2.2.6/texmf.cnf
--- activemq-cpp-2.2.6.ORIG/texmf.cnf	1970-01-01 01:00:00.000000000 +0100
+++ activemq-cpp-2.2.6/texmf.cnf	2009-11-07 20:47:00.466113909 +0100
@@ -0,0 +1,2 @@
+pool_size = 4000000
+
diff -uNr activemq-cpp-2.2.6.ORIG/doxygen-include.am activemq-cpp-2.2.6/doxygen-include.am
--- activemq-cpp-2.2.6.ORIG/doxygen-include.am	2009-01-23 14:56:26.000000000 +0100
+++ activemq-cpp-2.2.6/doxygen-include.am	2009-11-07 20:52:10.558509912 +0100
@@ -153,12 +153,12 @@
 	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
 	$(DX_PDFLATEX) refman.tex; \
 	$(DX_MAKEINDEX) refman.idx; \
-	$(DX_PDFLATEX) refman.tex; \
+	TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \
 	countdown=5; \
 	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
 	                  refman.log > /dev/null 2>&1 \
 	   && test $$countdown -gt 0; do \
-	    $(DX_PDFLATEX) refman.tex; \
+	    TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \
 	    countdown=`expr $$countdown - 1`; \
 	done; \
 	mv refman.pdf ../@PACKAGE at .pdf


--- NEW FILE activemq-cpp.spec ---
Name:           activemq-cpp
Version:        2.2.6
Release:        5%{?dist}
Summary:        C++ implementation of JMS-like messaging client

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://activemq.apache.org/cms/
Source0:        http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-%{version}-src.tar.gz
# Some local texmf configuration to increase default pool_size.
Patch1:         %{name}-local-texmf.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen
BuildRequires:  graphviz
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  tex(latex)
%else
BuildRequires:  tetex-latex
%endif

BuildRequires:  automake >= 1.10
BuildRequires:  autoconf >= 2.60
BuildRequires:  libtool  >= 1.5.24
BuildRequires:  apr-util-devel%{?_isa} >= 1.3
BuildRequires:  cppunit-devel%{?_isa} >= 1.10.2

%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  libuuid-devel%{?_isa}
%else
BuildRequires:  e2fsprogs-devel%{?_isa}
%endif

%description
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make your 
C++ client code much neater and easier to follow. To get a better feel for 
CMS try the API Reference. 
ActiveMQ-CPP is a client only library, a message broker such as Apache 
ActiveMQ is still needed for your clients to communicate.  

%package devel
Summary:        C++ implementation header files for JMS-like messaging
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
Requires:  libuuid-devel%{?_isa}
%else
Requires:  e2fsprogs-devel%{?_isa}
%endif




%description devel
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make 
your C++ client code much neater and easier to follow. To get a better
feel for CMS try the API Reference.  ActiveMQ-CPP is a client only 
library, a message broker such as Apache ActiveMQ is still needed 
for your clients to communicate.  

%{name}-devel contains development header files.


%package doc
Summary:        C++ implementation header files for JMS-like messaging
Group:          Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make 
your C++ client code much neater and easier to follow. To get a better
feel for CMS try the API Reference.  ActiveMQ-CPP is a client only 
library, a message broker such as Apache ActiveMQ is still needed 
for your clients to communicate.  

%{name}-doc contains api documentation.

%prep
%setup -q
%patch1 -p1



%build
mkdir config
./autogen.sh
# Build pdf(30MB) rather than default html(400MB). 
%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
make %{?_smp_mflags}
make %{?_smp_mflags}  doxygen-run
cp -p texmf.cnf doc/latex/texmf.cnf
make %{?_smp_mflags} doxygen-pdf


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
rm $RPM_BUILD_ROOT/%{_bindir}/example

%clean
rm -rf $RPM_BUILD_ROOT

%check
make %{?_smp_mflags} check

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.so.*
%doc LICENSE.txt  NOTICE.txt  README.txt  RELEASE_NOTES.txt

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.so
%{_includedir}/%{name}-%{version}
%{_libdir}/pkgconfig/%{name}.pc
%{_bindir}/activemqcpp-config

%files doc
%defattr(-,root,root,-)
%doc doc/%{name}.pdf

%changelog
* Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-5
- Add libuuid-devel as Requires to -devel package.
* Sat Nov 14 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-4
- Remove patch to relocate headers from versioned directory.
- Add make smp options to make check.
* Fri Nov 6 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-3
- Relocate headers to non versioned directory with patch0
* Fri Nov 6 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-2
- Adapted to Fedora guidelines.
* Thu Feb 26 2009 Ricardo Rocha <ricardo.rocha at cern.ch> - 2.2.6-1
- First version of the spec file




--- NEW FILE import.log ---
activemq-cpp-2_2_6-5_fc13:HEAD:activemq-cpp-2.2.6-5.fc13.src.rpm:1260816471


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:28:23 -0000	1.1
+++ .cvsignore	14 Dec 2009 18:48:49 -0000	1.2
@@ -0,0 +1 @@
+activemq-cpp-2.2.6-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:28:23 -0000	1.1
+++ sources	14 Dec 2009 18:48:49 -0000	1.2
@@ -0,0 +1 @@
+1222f0d6c5f86ef3ed5a558a533c7564  activemq-cpp-2.2.6-src.tar.gz



From cdamian at fedoraproject.org  Mon Dec 14 18:50:22 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Mon, 14 Dec 2009 18:50:22 +0000 (UTC)
Subject: rpms/php-phpunit-phpcpd/F-12 .cvsignore, 1.2,
	1.3 php-phpunit-phpcpd.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091214185022.A0DE911C00E9@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-phpcpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12880

Modified Files:
	.cvsignore php-phpunit-phpcpd.spec sources 
Log Message:
upstream 1.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Nov 2009 11:21:13 -0000	1.2
+++ .cvsignore	14 Dec 2009 18:50:22 -0000	1.3
@@ -1 +1 @@
-phpcpd-1.2.0.tgz
+phpcpd-1.2.2.tgz


Index: php-phpunit-phpcpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/F-12/php-phpunit-phpcpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-phpcpd.spec	18 Nov 2009 11:21:14 -0000	1.1
+++ php-phpunit-phpcpd.spec	14 Dec 2009 18:50:22 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-phpcpd
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Copy/Paste Detector (CPD) for PHP code
 
@@ -19,6 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
@@ -80,7 +81,6 @@ fi
 %{pear_phpdir}/PHPCPD/TextUI/Command.php
 %{pear_phpdir}/PHPCPD/TextUI/Getopt.php
 %{pear_phpdir}/PHPCPD/TextUI/ResultPrinter.php
-%{pear_phpdir}/PHPCPD/Util/FilterIterator.php
 %{pear_phpdir}/PHPCPD/Clone.php
 %{pear_phpdir}/PHPCPD/CloneMap.php
 %{pear_phpdir}/PHPCPD/Detector.php
@@ -88,5 +88,8 @@ fi
 
 
 %changelog
+* Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.2.2-1
+- upstream 1.2.2
+
 * Thu Oct 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Nov 2009 11:21:14 -0000	1.2
+++ sources	14 Dec 2009 18:50:22 -0000	1.3
@@ -1 +1 @@
-84cc68a7e05df6c360ec3054f6dd4214  phpcpd-1.2.0.tgz
+4a4db8d9c34c43b238c49aa65c1fee9c  phpcpd-1.2.2.tgz



From jkratoch at fedoraproject.org  Mon Dec 14 18:54:51 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 14 Dec 2009 18:54:51 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-bz533176-fortran-omp-step.patch, NONE,
	1.1 gdb-6.3-rh-testversion-20041202.patch, 1.3,
	1.4 gdb-6.8-inlining-addon.patch, 1.9, 1.10 gdb-archer.patch,
	1.38, 1.39 gdb-bz538626-bp_location-accel-bp-cond.patch, 1.1,
	1.2 gdb.spec, 1.400, 1.401
Message-ID: <20091214185451.916C211C00E9@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13610

Modified Files:
	gdb-6.3-rh-testversion-20041202.patch 
	gdb-6.8-inlining-addon.patch gdb-archer.patch 
	gdb-bz538626-bp_location-accel-bp-cond.patch gdb.spec 
Added Files:
	gdb-bz533176-fortran-omp-step.patch 
Log Message:
* Mon Dec 14 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-10.fc12
- Make gdb-6.3-rh-testversion-20041202.patch to accept both RHEL and Fedora GDB.
- Adjust BuildRequires for Fedora-12, RHEL-6 and RHEL-5 builds.
- [vla] Fix compatibility of dynamic arrays with iFort (BZ 514287).
- Fix stepping through OMP parallel Fortran sections (BZ 533176).
- New fix of bp conditionals [bp_location-accel] regression (BZ 538626).


gdb-bz533176-fortran-omp-step.patch:
 infrun.c                           |    7 +++++++
 testsuite/gdb.fortran/omp-step.exp |   31 +++++++++++++++++++++++++++++++
 testsuite/gdb.fortran/omp-step.f90 |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)

--- NEW FILE gdb-bz533176-fortran-omp-step.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=533176#c4

I find it a bug in DWARF and gdb behaves correctly according to it.  From the
current DWARF's point of view the is a function call which you skip by "next".

If you hide any /usr/lib/debug such as using:
gdb -nx -ex 'set debug-file-directory /qwe' -ex 'file ./tpcommon_gfortran44'
and use "step" command instead of "next" there it will work.
(You need to hide debuginfo from libgomp as you would step into libgomp sources
to maintain the threads for execution.)

There should be some DWARF extension for it, currently tried to detect
substring ".omp_fn." as this function is called "MAIN__.omp_fn.0" and do not
consider such sub-function as a skippable by "next".

Another problem is that with "set scheduler-locking" being "off" (default
upstream) or "step" (default in F/RHEL) the simultaneous execution of the
threads is inconvenient.  Setting it to "on" will lockup the debugging as the
threads need to get synchronized at some point.  This is a more general
debugging problem of GOMP outside of the scope of this Bug.



--- ./gdb/infrun.c	2009-12-09 22:03:33.000000000 +0100
+++ ./gdb/infrun.c	2009-12-09 22:29:56.000000000 +0100
@@ -3994,6 +3994,12 @@ infrun: not switching back to stepped th
 
       if (ecs->event_thread->step_over_calls == STEP_OVER_ALL)
 	{
+	  struct symbol *stop_fn = find_pc_function (stop_pc);
+
+	  if (stop_fn == NULL
+	      || strstr (SYMBOL_LINKAGE_NAME (stop_fn), ".omp_fn.") == NULL)
+{	/* ".omp_fn." */
+
 	  /* We're doing a "next".
 
 	     Normal (forward) execution: set a breakpoint at the
@@ -4020,6 +4026,7 @@ infrun: not switching back to stepped th
 
 	  keep_going (ecs);
 	  return;
+}	/* ".omp_fn." */
 	}
 
       /* If we are in a function call trampoline (a stub between the
--- ./gdb/testsuite/gdb.fortran/omp-step.exp	1970-01-01 01:00:00.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/omp-step.exp	2009-12-09 22:31:04.000000000 +0100
@@ -0,0 +1,31 @@
+# Copyright 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set testfile "omp-step"
+set srcfile ${testfile}.f90
+if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f77 additional_flags=-fopenmp}] } {
+    return -1
+}
+
+if ![runto [gdb_get_line_number "start-here"]] {
+    perror "Couldn't run to start-here"
+    return 0
+}
+
+gdb_test "next" {!\$omp parallel} "step closer"
+gdb_test "next" {a\(omp_get_thread_num\(\) \+ 1\) = 1} "step into omp"
+
+gdb_breakpoint [gdb_get_line_number "success"]
+gdb_continue_to_breakpoint "success" ".*success.*"
--- ./gdb/testsuite/gdb.fortran/omp-step.f90	1970-01-01 01:00:00.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/omp-step.f90	2009-12-09 22:25:35.000000000 +0100
@@ -0,0 +1,32 @@
+! Copyright 2009 Free Software Foundation, Inc.
+
+! This program is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 3 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License
+! along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+      use omp_lib
+      integer nthreads, i, a(1000)
+      nthreads = omp_get_num_threads()
+      if (nthreads .gt. 1000) call abort
+
+      do i = 1, nthreads
+          a(i) = 0
+      end do
+      print *, "start-here"
+!$omp parallel
+      a(omp_get_thread_num() + 1) = 1
+!$omp end parallel
+      do i = 1, nthreads
+          if (a(i) .ne. 1) call abort
+      end do
+      print *, "success"
+      end

gdb-6.3-rh-testversion-20041202.patch:
 selftest.exp |    3 +++
 1 file changed, 3 insertions(+)

Index: gdb-6.3-rh-testversion-20041202.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.3-rh-testversion-20041202.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdb-6.3-rh-testversion-20041202.patch	14 Jul 2008 09:09:04 -0000	1.3
+++ gdb-6.3-rh-testversion-20041202.patch	14 Dec 2009 18:54:50 -0000	1.4
@@ -11,8 +11,8 @@ Index: gdb-6.8/gdb/testsuite/gdb.gdb/sel
  	-re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" {
  	    pass "printed version with cast"
  	}
-+	-re ".\[0-9\]+ = .Fedora \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" {
-+	    pass "printed version Fedora only"
++	-re ".\[0-9\]+ = .(Fedora|Red Hat Enterprise Linux) \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" {
++	    pass "printed version Fedora or Red Hat Enterprise Linux only"
 +	}
  	-re ".*$gdb_prompt $"	{ fail "printed version" }
  	timeout		{ fail "(timeout) printed version" }

gdb-6.8-inlining-addon.patch:
 breakpoint.c                        |   35 +++++++++++++---
 dwarf2read.c                        |    6 ++
 frame.c                             |    8 ++-
 gdbthread.h                         |    6 ++
 infcmd.c                            |   76 ++++++++++++++++++++++++++----------
 inline-frame.c                      |   34 +++++++++++++---
 inline-frame.h                      |    4 +
 target.c                            |    1 
 testsuite/gdb.opt/inline-bt.c       |   10 +++-
 testsuite/gdb.opt/inline-cmds.c     |   10 +++-
 testsuite/gdb.opt/inline-cmds.exp   |   28 ++++++-------
 testsuite/gdb.opt/inline-locals.c   |    9 +++-
 testsuite/gdb.opt/inline-locals.exp |    6 ++
 testsuite/gdb.opt/inline-markers.c  |    5 --
 14 files changed, 176 insertions(+), 62 deletions(-)

Index: gdb-6.8-inlining-addon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.8-inlining-addon.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gdb-6.8-inlining-addon.patch	17 Sep 2009 12:15:41 -0000	1.9
+++ gdb-6.8-inlining-addon.patch	14 Dec 2009 18:54:50 -0000	1.10
@@ -236,19 +236,19 @@ Index: gdb-6.8.91.20090917/gdb/breakpoin
      {
        int value_is_zero = 0;
        
-@@ -3383,6 +3398,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
- 	    bs->print = 0;
- 	  }
- 	bs->commands = copy_command_lines (bs->commands);
-+
-+	/* Display the innermost inlined frame at a breakpont as it gives to
-+	   most of the available information.  */
-+	if (b->type != bp_until && b->type != bp_finish)
-+	  while (inline_skipped_frames (ptid))
-+	    step_into_inline_frame (ptid);
-       }
+@@ -3399,6 +3399,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+ 		  bs->print = 0;
+ 		}
+ 	      bs->commands = copy_command_lines (bs->commands);
++
++	      /* Display the innermost inlined frame at a breakpont as it gives to
++		 most of the available information.  */
++	      if (b->type != bp_until && b->type != bp_finish)
++		while (inline_skipped_frames (ptid))
++		  step_into_inline_frame (ptid);
+ 	    }
  
-     /* Print nothing for this entry if we dont stop or if we dont print.  */
+ 	  /* Print nothing for this entry if we dont stop or if we dont print.  */
 @@ -5572,9 +5593,9 @@ set_momentary_breakpoint (struct gdbarch
  {
    struct breakpoint *b;

gdb-archer.patch:
 Makefile.in                                              |   92 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  773 ++++--
 breakpoint.h                                             |   21 
 c-exp.y                                                  |  240 ++
 c-lang.c                                                 |    6 
 c-typeprint.c                                            |   47 
 cli/cli-cmds.c                                           |   72 
 coffread.c                                               |    3 
 config.in                                                |    8 
 config/i386/nm-i386.h                                    |  125 +
 config/i386/nm-linux64.h                                 |   54 
 config/mips/nm-irix5.h                                   |   44 
 configure                                                |   76 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  294 +-
 cp-support.c                                             |  123 +
 cp-support.h                                             |   50 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  438 +++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |    9 
 dwarf2expr.c                                             |    7 
 dwarf2expr.h                                             |    2 
 dwarf2loc.c                                              |  227 +
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1761 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  209 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  457 ---
 f-lang.h                                                 |   45 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 
 findvar.c                                                |  126 -
 frame.c                                                  |    8 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    7 
 gdbtypes.c                                               |  599 ++++-
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infcall.c                                                |    8 
 infcmd.c                                                 |   34 
 inferior.h                                               |    2 
 infrun.c                                                 |  190 +
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   73 
 linux-nat.c                                              |   88 
 linux-nat.h                                              |    6 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |    1 
 mi/mi-main.c                                             |    2 
 mipsread.c                                               |    1 
 objfiles.c                                               |   19 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 ppc-linux-nat.c                                          |   19 
 printcmd.c                                               |   90 
 python/lib/gdb/FrameIterator.py                          |   33 
 python/lib/gdb/FrameWrapper.py                           |  112 
 python/lib/gdb/__init__.py                               |   19 
 python/lib/gdb/backtrace.py                              |   42 
 python/lib/gdb/command/__init__.py                       |    1 
 python/lib/gdb/command/alias.py                          |   59 
 python/lib/gdb/command/backtrace.py                      |  106 
 python/lib/gdb/command/ignore_errors.py                  |   37 
 python/lib/gdb/command/pahole.py                         |   75 
 python/lib/gdb/command/require.py                        |   57 
 python/lib/gdb/command/save_breakpoints.py               |   65 
 python/lib/gdb/command/upto.py                           |  129 +
 python/lib/gdb/function/__init__.py                      |    1 
 python/lib/gdb/function/caller_is.py                     |   58 
 python/lib/gdb/function/in_scope.py                      |   47 
 python/py-block.c                                        |  265 ++
 python/py-breakpoint.c                                   |  665 +++++
 python/py-cmd.c                                          |   17 
 python/py-frame.c                                        |  116 
 python/py-hooks.c                                        |   50 
 python/py-inferior.c                                     |  926 +++++++
 python/py-infthread.c                                    |  285 ++
 python/py-membuf.c                                       |  268 ++
 python/py-param.c                                        |  606 +++++
 python/py-prettyprint.c                                  |   21 
 python/py-symbol.c                                       |  336 ++
 python/py-symtab.c                                       |  322 ++
 python/py-type.c                                         |  170 +
 python/py-utils.c                                        |   46 
 python/py-value.c                                        |   55 
 python/python-internal.h                                 |   69 
 python/python.c                                          |  384 +++
 python/python.h                                          |    4 
 scm-lang.c                                               |    1 
 scm-valprint.c                                           |    4 
 solib-darwin.c                                           |    1 
 solib-spu.c                                              |    7 
 solib-svr4.c                                             |    4 
 solib.c                                                  |    3 
 solist.h                                                 |    2 
 somread.c                                                |    1 
 spu-tdep.c                                               |    2 
 stabsread.c                                              |    4 
 stack.c                                                  |   38 
 symfile.c                                                |   37 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   41 
 testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 testsuite/gdb.arch/powerpc-power7.s                      |  107 
 testsuite/gdb.arch/x86_64-vla-pointer-foo.S              |  457 +++
 testsuite/gdb.arch/x86_64-vla-pointer.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-pointer.exp                |   66 
 testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 testsuite/gdb.base/arrayidx.c                            |    7 
 testsuite/gdb.base/arrayidx.exp                          |   10 
 testsuite/gdb.base/help.exp                              |    2 
 testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 testsuite/gdb.base/lineno-makeup.c                       |   35 
 testsuite/gdb.base/lineno-makeup.exp                     |   78 
 testsuite/gdb.base/macscp.exp                            |    8 
 testsuite/gdb.base/radix.exp                             |    7 
 testsuite/gdb.base/valgrind-attach.c                     |   28 
 testsuite/gdb.base/valgrind-attach.exp                   |   94 
 testsuite/gdb.base/valgrind-attach.sh                    |   20 
 testsuite/gdb.base/vla-overflow.c                        |   30 
 testsuite/gdb.base/vla-overflow.exp                      |  108 
 testsuite/gdb.base/vla.c                                 |   55 
 testsuite/gdb.base/vla.exp                               |   62 
 testsuite/gdb.base/watchpoint-hw.c                       |    6 
 testsuite/gdb.base/watchpoint-hw.exp                     |   45 
 testsuite/gdb.cp/Makefile.in                             |    2 
 testsuite/gdb.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |   10 
 testsuite/gdb.cp/cplusfuncs.exp                          |  225 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 testsuite/gdb.cp/gdb9593.cc                              |  180 +
 testsuite/gdb.cp/gdb9593.exp                             |  185 +
 testsuite/gdb.cp/member-ptr.cc                           |   17 
 testsuite/gdb.cp/member-ptr.exp                          |   34 
 testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 testsuite/gdb.cp/namespace-recursive.cc                  |   47 
 testsuite/gdb.cp/namespace-recursive.exp                 |   75 
 testsuite/gdb.cp/namespace-stress-declarations.cc        |   93 
 testsuite/gdb.cp/namespace-stress-declarations.exp       |   50 
 testsuite/gdb.cp/namespace-stress.cc                     |   60 
 testsuite/gdb.cp/namespace-stress.exp                    |   50 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  132 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   48 
 testsuite/gdb.cp/shadowing.exp                           |   91 
 testsuite/gdb.dwarf2/dw2-aranges.S                       |  140 +
 testsuite/gdb.dwarf2/dw2-aranges.exp                     |   40 
 testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 testsuite/gdb.fortran/common-block.exp                   |  101 
 testsuite/gdb.fortran/common-block.f90                   |   67 
 testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 testsuite/gdb.fortran/dynamic.exp                        |  145 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/library-module-lib.f90             |   28 
 testsuite/gdb.fortran/library-module-main.f90            |   23 
 testsuite/gdb.fortran/library-module.exp                 |   53 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/module.exp                         |   28 
 testsuite/gdb.fortran/module.f90                         |   37 
 testsuite/gdb.fortran/string.exp                         |   59 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.java/jnpe.exp                              |   77 
 testsuite/gdb.java/jnpe.java                             |   38 
 testsuite/gdb.opt/array-from-register-func.c             |   22 
 testsuite/gdb.opt/array-from-register.c                  |   28 
 testsuite/gdb.opt/array-from-register.exp                |   33 
 testsuite/gdb.opt/fortran-string.exp                     |   41 
 testsuite/gdb.opt/fortran-string.f90                     |   28 
 testsuite/gdb.python/py-cmd.exp                          |   27 
 testsuite/gdb.python/py-frame.exp                        |   48 
 testsuite/gdb.python/py-function.exp                     |   27 
 testsuite/gdb.python/py-inferior.c                       |   49 
 testsuite/gdb.python/py-inferior.exp                     |  201 +
 testsuite/gdb.python/py-infthread.c                      |   14 
 testsuite/gdb.python/py-infthread.exp                    |   58 
 testsuite/gdb.python/py-prettyprint.exp                  |   22 
 testsuite/gdb.python/py-template.exp                     |   25 
 testsuite/gdb.python/py-value.exp                        |   31 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c          |  175 +
 testsuite/gdb.threads/watchpoint-fork-mt.c               |  157 +
 testsuite/gdb.threads/watchpoint-fork.c                  |   57 
 testsuite/gdb.threads/watchpoint-fork.exp                |  130 +
 testsuite/gdb.threads/watchthreads-reorder.c             |  366 +++
 testsuite/gdb.threads/watchthreads-reorder.exp           |  105 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/python-support.exp                         |   53 
 thread.c                                                 |   18 
 top.c                                                    |    1 
 typeprint.c                                              |   14 
 typeprint.h                                              |    3 
 ui-file.c                                                |   20 
 ui-file.h                                                |    6 
 utils.c                                                  |    7 
 valarith.c                                               |   45 
 valops.c                                                 |  258 +-
 valprint.c                                               |    4 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |   76 
 xcoffread.c                                              |    1 
 244 files changed, 19173 insertions(+), 2450 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-archer.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gdb-archer.patch	7 Dec 2009 18:39:26 -0000	1.38
+++ gdb-archer.patch	14 Dec 2009 18:54:50 -0000	1.39
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 16276c1aad1366b92e687c72cab30192280e1906
+commit 200516d5be8a1cab02f0b18d607d1c1fb9cfa3e7
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -7626,7 +7626,7 @@ index 6e79d4a..198bae3 100644
    default_symfile_offsets,	/* sym_offsets:  Translate ext. to int. relocation */
    elf_symfile_segments,		/* sym_segments: Get segment information from
 diff --git a/gdb/eval.c b/gdb/eval.c
-index 2926465..4c6de78 100644
+index 2926465..b53f895 100644
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
 @@ -39,8 +39,12 @@
@@ -7767,17 +7767,23 @@ index 2926465..4c6de78 100644
  	}
        else if (op == OP_VAR_VALUE)
  	{
-@@ -1549,7 +1601,10 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -1549,6 +1601,8 @@ evaluate_subexp_standard (struct type *expect_type,
  
        /* First determine the type code we are dealing with.  */
        arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
 +      old_chain = make_cleanup (null_cleanup, 0);
 +      object_address_set (value_raw_address (arg1));
        type = check_typedef (value_type (arg1));
-+      do_cleanups (old_chain);
        code = TYPE_CODE (type);
  
-       if (code == TYPE_CODE_PTR)
+@@ -1569,6 +1623,7 @@ evaluate_subexp_standard (struct type *expect_type,
+ 	      code = TYPE_CODE (type);
+ 	    }
+ 	} 
++      do_cleanups (old_chain);
+ 
+       switch (code)
+ 	{
 @@ -1716,6 +1771,37 @@ evaluate_subexp_standard (struct type *expect_type,
  	  error (_("non-pointer-to-member value used in pointer-to-member construct"));
  	}
@@ -7858,7 +7864,10 @@ index 2926465..4c6de78 100644
 -	offset_item = subscript_array[ndimensions - 1];
 +	offset_item = 0;
 +	offset_byte = 0;
-+
+ 
+-	for (i = ndimensions - 1; i > 0; --i)
+-	  offset_item =
+-	    array_size_array[i - 1] * offset_item + subscript_array[i - 1];
 +	for (i = ndimensions - 1; i >= 0; --i)
 +	  {
 +	    offset_item *= array_size_array[i];
@@ -7867,10 +7876,7 @@ index 2926465..4c6de78 100644
 +	    else
 +	      offset_byte += subscript_array[i] * byte_stride_array[i];
 +	  }
- 
--	for (i = ndimensions - 1; i > 0; --i)
--	  offset_item =
--	    array_size_array[i - 1] * offset_item + subscript_array[i - 1];
++
 +	element_size = TYPE_LENGTH (TYPE_TARGET_TYPE (tmp_type));
 +	offset_byte += offset_item * element_size;
  
@@ -7885,7 +7891,74 @@ index 2926465..4c6de78 100644
        }
  
      case BINOP_LOGICAL_AND:
-@@ -2598,7 +2705,7 @@ evaluate_subexp_for_address (struct expression *exp, int *pos,
+@@ -2291,14 +2398,22 @@ evaluate_subexp_standard (struct type *expect_type,
+       if (expect_type && TYPE_CODE (expect_type) == TYPE_CODE_PTR)
+ 	expect_type = TYPE_TARGET_TYPE (check_typedef (expect_type));
+       arg1 = evaluate_subexp (expect_type, exp, pos, noside);
++      old_chain = make_cleanup (null_cleanup, 0);
++      object_address_set (value_raw_address (arg1));
+       type = check_typedef (value_type (arg1));
+       if (TYPE_CODE (type) == TYPE_CODE_METHODPTR
+ 	  || TYPE_CODE (type) == TYPE_CODE_MEMBERPTR)
+ 	error (_("Attempt to dereference pointer to member without an object"));
+       if (noside == EVAL_SKIP)
+-	goto nosideret;
++	{
++	  do_cleanups (old_chain);
++	  goto nosideret;
++	}
+       if (unop_user_defined_p (op, arg1))
+-	return value_x_unop (arg1, op, noside);
++	{
++	  do_cleanups (old_chain);
++	  return value_x_unop (arg1, op, noside);
++	}
+       else if (noside == EVAL_AVOID_SIDE_EFFECTS)
+ 	{
+ 	  type = check_typedef (value_type (arg1));
+@@ -2307,12 +2422,18 @@ evaluate_subexp_standard (struct type *expect_type,
+ 	  /* In C you can dereference an array to get the 1st elt.  */
+ 	      || TYPE_CODE (type) == TYPE_CODE_ARRAY
+ 	    )
+-	    return value_zero (TYPE_TARGET_TYPE (type),
+-			       lval_memory);
++	    {
++	      do_cleanups (old_chain);
++	      return value_zero (TYPE_TARGET_TYPE (type),
++				 lval_memory);
++	    }
+ 	  else if (TYPE_CODE (type) == TYPE_CODE_INT)
+-	    /* GDB allows dereferencing an int.  */
+-	    return value_zero (builtin_type (exp->gdbarch)->builtin_int,
+-			       lval_memory);
++	    {
++	      do_cleanups (old_chain);
++	      /* GDB allows dereferencing an int.  */
++	      return value_zero (builtin_type (exp->gdbarch)->builtin_int,
++				 lval_memory);
++	    }
+ 	  else
+ 	    error (_("Attempt to take contents of a non-pointer value."));
+ 	}
+@@ -2322,9 +2443,14 @@ evaluate_subexp_standard (struct type *expect_type,
+ 	 do.  "long long" variables are rare enough that
+ 	 BUILTIN_TYPE_LONGEST would seem to be a mistake.  */
+       if (TYPE_CODE (type) == TYPE_CODE_INT)
+-	return value_at_lazy (builtin_type (exp->gdbarch)->builtin_int,
+-			      (CORE_ADDR) value_as_address (arg1));
+-      return value_ind (arg1);
++	{
++	  do_cleanups (old_chain);
++	  return value_at_lazy (builtin_type (exp->gdbarch)->builtin_int,
++				(CORE_ADDR) value_as_address (arg1));
++	}
++      arg1 = value_ind (arg1);
++      do_cleanups (old_chain);
++      return arg1;
+ 
+     case UNOP_ADDR:
+       /* C++: check for and handle pointer to members.  */
+@@ -2598,7 +2724,7 @@ evaluate_subexp_for_address (struct expression *exp, int *pos,
        (*pos) += 5 + BYTES_TO_EXP_ELEM (tem + 1);
        x = value_aggregate_elt (exp->elts[pc + 1].type,
  			       &exp->elts[pc + 3].string,
@@ -7894,7 +7967,7 @@ index 2926465..4c6de78 100644
        if (x == NULL)
  	error (_("There is no field named %s"), &exp->elts[pc + 3].string);
        return x;
-@@ -2643,7 +2750,7 @@ evaluate_subexp_with_coercion (struct expression *exp,
+@@ -2643,7 +2769,7 @@ evaluate_subexp_with_coercion (struct expression *exp,
  {
    enum exp_opcode op;
    int pc;
@@ -7903,7 +7976,7 @@ index 2926465..4c6de78 100644
    struct symbol *var;
    struct type *type;
  
-@@ -2654,12 +2761,17 @@ evaluate_subexp_with_coercion (struct expression *exp,
+@@ -2654,12 +2780,17 @@ evaluate_subexp_with_coercion (struct expression *exp,
      {
      case OP_VAR_VALUE:
        var = exp->elts[pc + 2].symbol;
@@ -7922,7 +7995,7 @@ index 2926465..4c6de78 100644
  	  return value_cast (lookup_pointer_type (TYPE_TARGET_TYPE (type)),
  			     val);
  	}
-@@ -2711,9 +2823,13 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos)
+@@ -2711,9 +2842,13 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos)
  
      case OP_VAR_VALUE:
        (*pos) += 4;
@@ -20541,6 +20614,590 @@ index 0000000..98b2e79
 +	.long	0xedc07834	/* 194: frsqrtes f14,f15          */
 +	.long	0xedc07835	/* 198: frsqrtes. f14,f15         */
 +	.long	0x7c43271e	/* 19c: isel    r2,r3,r4,28       */
+diff --git a/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S b/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S
+new file mode 100644
+index 0000000..83faaf6
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S
+@@ -0,0 +1,457 @@
++	.file	"x86_64-vla-pointer.c"
++	.section	.debug_abbrev,"", at progbits
++.Ldebug_abbrev0:
++	.section	.debug_info,"", at progbits
++.Ldebug_info0:
++	.section	.debug_line,"", at progbits
++.Ldebug_line0:
++	.text
++.Ltext0:
++.globl foo
++	.type	foo, @function
++foo:
++.LFB2:
++	.file 1 "x86_64-vla-pointer.c"
++	.loc 1 22 0
++	pushq	%rbp
++.LCFI0:
++	movq	%rsp, %rbp
++.LCFI1:
++	subq	$64, %rsp
++.LCFI2:
++	movl	%edi, -36(%rbp)
++	.loc 1 22 0
++	movq	%rsp, %rax
++	movq	%rax, -48(%rbp)
++	.loc 1 23 0
++	movl	-36(%rbp), %edx
++	movslq	%edx,%rax
++	subq	$1, %rax
++	movq	%rax, -24(%rbp)
++	.loc 1 24 0
++	movslq	%edx,%rax
++	addq	$15, %rax
++	addq	$15, %rax
++	shrq	$4, %rax
++	salq	$4, %rax
++	subq	%rax, %rsp
++	movq	%rsp, -56(%rbp)
++	movq	-56(%rbp), %rax
++	addq	$15, %rax
++	shrq	$4, %rax
++	salq	$4, %rax
++	movq	%rax, -56(%rbp)
++	movq	-56(%rbp), %rax
++	movq	%rax, -16(%rbp)
++	.loc 1 27 0
++	movl	$0, -4(%rbp)
++	jmp	.L2
++.L3:
++	.loc 1 28 0
++	movl	-4(%rbp), %esi
++	movl	-4(%rbp), %eax
++	movl	%eax, %ecx
++	movq	-16(%rbp), %rdx
++	movslq	%esi,%rax
++	movb	%cl, (%rdx,%rax)
++	.loc 1 27 0
++	addl	$1, -4(%rbp)
++.L2:
++	movl	-4(%rbp), %eax
++	cmpl	-36(%rbp), %eax
++	jl	.L3
++	.loc 1 30 0
++	.globl	break_here
++break_here:
++	movq	-16(%rbp), %rax
++	movb	$0, (%rax)
++	movq	-48(%rbp), %rsp
++	.loc 1 31 0
++	leave
++	ret
++.LFE2:
++	.size	foo, .-foo
++	.section	.debug_frame,"", at progbits
++.Lframe0:
++	.long	.LECIE0-.LSCIE0
++.LSCIE0:
++	.long	0xffffffff
++	.byte	0x1
++	.string	""
++	.uleb128 0x1
++	.sleb128 -8
++	.byte	0x10
++	.byte	0xc
++	.uleb128 0x7
++	.uleb128 0x8
++	.byte	0x90
++	.uleb128 0x1
++	.align 8
++.LECIE0:
++.LSFDE0:
++	.long	.LEFDE0-.LASFDE0
++.LASFDE0:
++	.long	.Lframe0
++	.quad	.LFB2
++	.quad	.LFE2-.LFB2
++	.byte	0x4
++	.long	.LCFI0-.LFB2
++	.byte	0xe
++	.uleb128 0x10
++	.byte	0x86
++	.uleb128 0x2
++	.byte	0x4
++	.long	.LCFI1-.LCFI0
++	.byte	0xd
++	.uleb128 0x6
++	.align 8
++.LEFDE0:
++	.section	.eh_frame,"a", at progbits
++.Lframe1:
++	.long	.LECIE1-.LSCIE1
++.LSCIE1:
++	.long	0x0
++	.byte	0x1
++	.string	"zR"
++	.uleb128 0x1
++	.sleb128 -8
++	.byte	0x10
++	.uleb128 0x1
++	.byte	0x3
++	.byte	0xc
++	.uleb128 0x7
++	.uleb128 0x8
++	.byte	0x90
++	.uleb128 0x1
++	.align 8
++.LECIE1:
++.LSFDE1:
++	.long	.LEFDE1-.LASFDE1
++.LASFDE1:
++	.long	.LASFDE1-.Lframe1
++	.long	.LFB2
++	.long	.LFE2-.LFB2
++	.uleb128 0x0
++	.byte	0x4
++	.long	.LCFI0-.LFB2
++	.byte	0xe
++	.uleb128 0x10
++	.byte	0x86
++	.uleb128 0x2
++	.byte	0x4
++	.long	.LCFI1-.LCFI0
++	.byte	0xd
++	.uleb128 0x6
++	.align 8
++.LEFDE1:
++	.text
++.Letext0:
++	.section	.debug_loc,"", at progbits
++.Ldebug_loc0:
++.LLST0:
++	.quad	.LFB2-.Ltext0
++	.quad	.LCFI0-.Ltext0
++	.value	0x2
++	.byte	0x77
++	.sleb128 8
++	.quad	.LCFI0-.Ltext0
++	.quad	.LCFI1-.Ltext0
++	.value	0x2
++	.byte	0x77
++	.sleb128 16
++	.quad	.LCFI1-.Ltext0
++	.quad	.LFE2-.Ltext0
++	.value	0x2
++	.byte	0x76
++	.sleb128 16
++	.quad	0x0
++	.quad	0x0
++	.section	.debug_info
++.Ldebug_relative:
++	.long	.Ldebug_end - .Ldebug_start
++.Ldebug_start:
++	.value	0x2
++	.long	.Ldebug_abbrev0
++	.byte	0x8
++	.uleb128 0x1
++	.long	.LASF2
++	.byte	0x1
++	.long	.LASF3
++	.long	.LASF4
++	.quad	.Ltext0
++	.quad	.Letext0
++	.long	.Ldebug_line0
++	.uleb128 0x2
++	.byte	0x1
++	.string	"foo"
++	.byte	0x1
++	.byte	0x16
++	.byte	0x1
++	.quad	.LFB2
++	.quad	.LFE2
++	.long	.LLST0
++	.long	.Ltype_int - .Ldebug_relative
++	.uleb128 0x3
++	.long	.LASF5
++	.byte	0x1
++	.byte	0x15
++	.long	.Ltype_int - .Ldebug_relative
++	.byte	0x2
++	.byte	0x91
++	.sleb128 -52
++.Ltag_pointer:
++	.uleb128 0x4
++	.byte	0x8	/* DW_AT_byte_size */
++	.long	.Ltag_array_type - .debug_info	/* DW_AT_type */
++	.uleb128 0x5	/* Abbrev Number: 5 (DW_TAG_variable) */
++	.long	.LASF0
++	.byte	0x1
++	.byte	0x18
++#if 1
++	.long	.Ltag_pointer - .debug_info
++#else
++	/* Debugging only: Skip the typedef indirection.  */
++	.long	.Ltag_array_type - .debug_info
++#endif
++	/* DW_AT_location: DW_FORM_block1: start */
++	.byte	0x3
++	.byte	0x91
++	.sleb128 -32
++#if 0
++	.byte	0x6	/* DW_OP_deref */
++#else
++	.byte	0x96	/* DW_OP_nop */
++#endif
++	/* DW_AT_location: DW_FORM_block1: end */
++	.uleb128 0x6
++	.string	"i"
++	.byte	0x1
++	.byte	0x19
++	.long	.Ltype_int - .Ldebug_relative
++	.byte	0x2
++	.byte	0x91
++	.sleb128 -20
++	.byte	0x0
++.Ltype_int:
++	.uleb128 0x7
++	.byte	0x4
++	.byte	0x5
++	.string	"int"
++.Ltag_array_type:
++	.uleb128 0x8	/* Abbrev Number: 8 (DW_TAG_array_type) */
++	.long	.Ltype_char - .Ldebug_relative
++	.long	.Ltype_ulong - .Ldebug_relative	/* DW_AT_sibling: DW_FORM_ref4 */
++1:	/* DW_AT_data_location: DW_FORM_block1: start */
++	.byte	2f - 3f	/* length */
++3:
++	.byte	0x97	/* DW_OP_push_object_address */
++#if 1
++	.byte	0x6	/* DW_OP_deref */
++#else
++	.byte	0x96	/* DW_OP_nop */
++#endif
++2:	/* DW_AT_data_location: DW_FORM_block1: end */
++	.uleb128 0x9
++	.long	.Ltype_char - .Ldebug_relative	/* DW_AT_type: DW_FORM_ref4 */
++	.byte	0x3
++	.byte	0x91
++	.sleb128 -40
++	.byte	0x6
++	.byte	0x0
++.Ltype_ulong:
++	.uleb128 0xa
++	.byte	0x8
++	.byte	0x7
++.Ltype_char:
++	.uleb128 0xb
++	.byte	0x1
++	.byte	0x6
++	.long	.LASF1
++	.byte	0x0
++.Ldebug_end:
++	.section	.debug_abbrev
++	.uleb128 0x1
++	.uleb128 0x11
++	.byte	0x1
++	.uleb128 0x25
++	.uleb128 0xe
++	.uleb128 0x13
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0xe
++	.uleb128 0x1b
++	.uleb128 0xe
++	.uleb128 0x11
++	.uleb128 0x1
++	.uleb128 0x12
++	.uleb128 0x1
++	.uleb128 0x10
++	.uleb128 0x6
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x2
++	.uleb128 0x2e
++	.byte	0x1
++	.uleb128 0x3f
++	.uleb128 0xc
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x27
++	.uleb128 0xc
++	.uleb128 0x11
++	.uleb128 0x1
++	.uleb128 0x12
++	.uleb128 0x1
++	.uleb128 0x40
++	.uleb128 0x6
++	.uleb128 0x1
++	.uleb128 0x13
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0x5
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0xe
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x2
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x4	/* .Ltag_pointer abbrev */
++	.uleb128 0x0f	/* DW_TAG_pointer_type */
++	.byte	0x0
++	.uleb128 0x0b
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x5
++	.uleb128 0x34
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0xe
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x2
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x6
++	.uleb128 0x34
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x2
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x7
++	.uleb128 0x24
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3e
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0x8
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x8	/* Abbrev Number: 8 (DW_TAG_array_type) */
++	.uleb128 0x1
++	.byte	0x1
++	.uleb128 0x49	/* DW_AT_type */
++	.uleb128 0x13	/* DW_FORM_ref4 */
++	.uleb128 0x1	/* DW_AT_sibling */
++	.uleb128 0x13	/* DW_FORM_ref4 */
++	.uleb128 0x50	/* DW_AT_data_location */
++	.uleb128 0xa	/* DW_FORM_block1 */
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x9
++	.uleb128 0x21
++	.byte	0x0
++	.uleb128 0x49	/* DW_AT_type */
++	.uleb128 0x13	/* DW_FORM_ref4 */
++	.uleb128 0x2f
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0xa
++	.uleb128 0x24
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3e
++	.uleb128 0xb
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0x24
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3e
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0xe
++	.byte	0x0
++	.byte	0x0
++	.byte	0x0
++	.section	.debug_pubnames,"", at progbits
++	.long	0x16
++	.value	0x2
++	.long	.Ldebug_info0
++	.long	0xa8
++	.long	0x2d
++	.string	"foo"
++	.long	0x0
++	.section	.debug_aranges,"", at progbits
++	.long	0x2c
++	.value	0x2
++	.long	.Ldebug_info0
++	.byte	0x8
++	.byte	0x0
++	.value	0x0
++	.value	0x0
++	.quad	.Ltext0
++	.quad	.Letext0-.Ltext0
++	.quad	0x0
++	.quad	0x0
++	.section	.debug_str,"MS", at progbits,1
++.LASF0:
++	.string	"array"
++.LASF5:
++	.string	"size"
++.LASF3:
++	.string	"x86_64-vla-pointer.c"
++.LASF6:
++	.string	"array_t"
++.LASF1:
++	.string	"char"
++.LASF4:
++	.string	"gdb.arch"
++.LASF2:
++	.string	"GNU C 4.3.2 20081105 (Red Hat 4.3.2-7)"
++	.ident	"GCC: (GNU) 4.3.2 20081105 (Red Hat 4.3.2-7)"
++	.section	.note.GNU-stack,"", at progbits
+diff --git a/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c b/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c
+new file mode 100644
+index 0000000..fe2c8f7
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c
+@@ -0,0 +1,43 @@
++/* This testcase is part of GDB, the GNU debugger.
++
++   Copyright 2009 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#if 0
++
++void
++foo (int size)
++{
++  typedef char array_t[size];
++  array_t array;
++  int i;
++
++  for (i = 0; i < size; i++)
++    array[i] = i;
++
++  array[0] = 0;	/* break-here */
++}
++
++#else
++
++int
++main (void)
++{
++  foo (26);
++  foo (78);
++  return 0;
++}
++
++#endif
+diff --git a/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp b/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp
+new file mode 100644
+index 0000000..d243cf1
+--- /dev/null
++++ b/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp
+@@ -0,0 +1,66 @@
++# Copyright 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++if ![istarget "x86_64-*-*"] then {
++    verbose "Skipping over gdb.arch/x86_64-vla-pointer.exp test made only for x86_64."
++    return
++}
++
++set testfile x86_64-vla-pointer
++set srcasmfile ${testfile}-foo.S
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++set binobjfile ${objdir}/${subdir}/${testfile}-foo.o
++if  { [gdb_compile "${srcdir}/${subdir}/${srcasmfile}" "${binobjfile}" object {}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${binobjfile}" "${binfile}" executable {debug}] != "" } {
++    untested "Couldn't compile test program"
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++if ![runto_main] {
++    untested x86_64-vla-pointer
++    return -1
++}
++
++gdb_breakpoint "break_here"
++
++gdb_continue_to_breakpoint "break_here"
++
++gdb_test "whatis array" "type = char \\(\\*\\)\\\[variable\\\]" "first: whatis array"
++gdb_test "ptype array" "type = char \\(\\*\\)\\\[26\\\]" "first: ptype array"
++
++gdb_test "whatis *array" "type = char \\\[26\\\]" "first: whatis *array"
++gdb_test "ptype *array" "type = char \\\[26\\\]" "first: ptype *array"
++
++gdb_test "p (*array)\[1\]" "\\$\[0-9\] = 1 '\\\\001'"
++gdb_test "p (*array)\[2\]" "\\$\[0-9\] = 2 '\\\\002'"
++gdb_test "p (*array)\[3\]" "\\$\[0-9\] = 3 '\\\\003'"
++gdb_test "p (*array)\[4\]" "\\$\[0-9\] = 4 '\\\\004'"
++
++gdb_continue_to_breakpoint "break_here"
++
++gdb_test "whatis array" "type = char \\(\\*\\)\\\[variable\\\]" "second: whatis array"
++gdb_test "ptype array" "type = char \\(\\*\\)\\\[78\\\]" "second: ptype array"
++
++gdb_test "whatis *array" "type = char \\\[78\\\]" "second: whatis *array"
++gdb_test "ptype *array" "type = char \\\[78\\\]" "second: ptype *array"
 diff --git a/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S b/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
 new file mode 100644
 index 0000000..66f7a39

gdb-bz538626-bp_location-accel-bp-cond.patch:
 breakpoint.c                     |  158 +++++++++++++++++++--------------------
 testsuite/gdb.base/condbreak.exp |   43 ++++++++++
 2 files changed, 121 insertions(+), 80 deletions(-)

Index: gdb-bz538626-bp_location-accel-bp-cond.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-bz538626-bp_location-accel-bp-cond.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-bz538626-bp_location-accel-bp-cond.patch	25 Nov 2009 10:38:24 -0000	1.1
+++ gdb-bz538626-bp_location-accel-bp-cond.patch	14 Dec 2009 18:54:51 -0000	1.2
@@ -1,89 +1,264 @@
-Index: gdb-7.0/gdb/breakpoint.c
-===================================================================
---- gdb-7.0.orig/gdb/breakpoint.c	2009-11-25 10:24:49.000000000 +0100
-+++ gdb-7.0/gdb/breakpoint.c	2009-11-25 10:28:35.000000000 +0100
-@@ -337,14 +337,21 @@ static int executing_startup;
- 	     B ? (TMP=B->next, 1): 0;	\
- 	     B = TMP)
- 
--/* Similar iterator for the low-level breakpoints.  SAFE variant is not
--   provided so update_global_location_list must not be called while executing
--   the block of ALL_BP_LOCATIONS.  */
--
--#define ALL_BP_LOCATIONS(B,BP_TMP)					\
--	for (BP_TMP = bp_location;					\
--	     BP_TMP < bp_location + bp_location_count && (B = *BP_TMP);	\
--	     BP_TMP++)
-+/* Similar iterator for the low-level breakpoints.  This iterator
-+   requires a defined BP_LOCATION array and BP_LOCATION_COUNT.  */
-+
-+#define ALL_BP_LOCATIONS_FROM(B,BP_TMP,BP_LOCATION,BP_LOCATION_COUNT)	\
-+  for (BP_TMP = BP_LOCATION;						\
-+       BP_TMP < BP_LOCATION + BP_LOCATION_COUNT && (B = *BP_TMP);	\
-+       BP_TMP++)
-+
-+/* Iterator that calls ALL_BP_LOCATIONS_FROM with the global
-+   bp_locations and bp_location_count variables.  SAFE variant is not
-+   provided so update_global_location_list must not be called while
-+   executing the block of ALL_BP_LOCATIONS.  */
-+
-+#define ALL_BP_LOCATIONS(B,BP_TMP) \
-+  ALL_BP_LOCATIONS_FROM(B,BP_TMP,bp_location, bp_location_count)
- 
- /* Iterator for tracepoints only.  */
- 
-@@ -3313,6 +3320,7 @@ bpstat_check_breakpoint_conditions (bpst
- bpstat
- bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid)
- {
-+  struct cleanup *old_chain;
-   struct breakpoint *b = NULL;
-   struct bp_location *bl, **blp_tmp;
-   struct bp_location *loc;
-@@ -3322,8 +3330,14 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+http://sourceware.org/ml/gdb-patches/2009-12/msg00180.html
+Subject: [patch] Fix a regression by me on breakpoint-cond-infcall
+
+Hi,
+
+GDB has now a regression since:
+	Re: [patch] Performance optimize large bp_location count
+	http://sourceware.org/ml/gdb-patches/2009-10/msg00632.html
+	=
+	2009-10-25  Jan Kratochvil  <jan.kratochvil at redhat.com>
+	Performance optimize large bp_location count.
+
+on breakpoints with conditions calling inferior.
+
+Bringing the code back to the state before my acceleration patch.
+
+The code before already assumed no breakpoints or their bp_locations can
+change across the inferior call which should be true - trying to do some:
+	break a if b()
+	break b
+	command 1
+	delete 2
+	end
+or similar cannot work as inside "if b()" evaluation no breakpoints can be
+added or removed.
+
+update_global_location_list also does not removed/add `struct bp_location's
+themselves but only pointers to them in the bp_location array.  As the new
+iteration no longer uses the bp_location array it is no longer a problem.
+
+Original problem was found by and fixed differently by Phil Muldoon.
+
+No regressions on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu.
+
+
+Thanks,
+Jan
+
+
+gdb/
+2009-12-13  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* breakpoint.c (bpstat_stop_status): Iterate using ALL_BREAKPOINTS and
+	the B->LOC list.  Remove gdb_assert on B.  Change bp_hardware_watchpoint
+	continue to break.  Remove variable update_locations.  Remove HIT_COUNT
+	increment protection by an ENABLE_STATE check.  Inline the delayed
+	update_global_location_list call.
+
+gdb/testsuite/
+2009-12-13  Jan Kratochvil  <jan.kratochvil at redhat.com>
+	    Phil Muldoon  <pmuldoon at redhat.com>
+
+	* gdb.base/condbreak.exp: Put breakpoint on marker3 and marker4.
+	(bp_location13, bp_location14, bp_location17, bp_location18)
+	(marker3_proto, marker4_proto): New variables.
+	(breakpoint info): Update output.
+	(run until breakpoint at marker3, run until breakpoint at marker4): New
+	tests.
+
+[ Backported for F-12.  ]
+
+--- ./gdb/breakpoint.c	2009-12-14 00:25:55.000000000 +0100
++++ ./gdb/breakpoint.c	2009-12-14 00:32:32.000000000 +0100
+@@ -3298,93 +3298,93 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+   /* Pointer to the last thing in the chain currently.  */
    bpstat bs = root_bs;
    int ix;
-   int need_remove_insert, update_locations = 0;
-+  struct bp_location  **saved_bp_location; 
-+  int saved_bp_location_count = bp_location_count; 
+-  int need_remove_insert, update_locations = 0;
++  int need_remove_insert;
  
 -  ALL_BP_LOCATIONS (bl, blp_tmp)
-+  saved_bp_location = xmalloc (sizeof (*bp_location) * bp_location_count);
-+  memcpy (saved_bp_location, bp_location, sizeof (*bp_location) * bp_location_count);
-+  old_chain = make_cleanup (xfree, saved_bp_location);
-+
-+  ALL_BP_LOCATIONS_FROM (bl, blp_tmp, saved_bp_location, saved_bp_location_count)
-   {
-     bpstat bs_prev = bs;
- 
-@@ -3460,6 +3474,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
-       insert_breakpoints ();
-     }
+-  {
+-    bpstat bs_prev = bs;
++  /* ALL_BP_LOCATIONS iteration would break across
++     update_global_location_list possibly executed by
++     bpstat_check_breakpoint_conditions's inferior call.  */
+ 
+-    b = bl->owner;
+-    gdb_assert (b);
+-    if (!breakpoint_enabled (b) && b->enable_state != bp_permanent)
+-      continue;
+-
+-    /* For hardware watchpoints, we look only at the first location.
+-       The watchpoint_check function will work on entire expression,
+-       not the individual locations.  For read watchopints, the
+-       watchpoints_triggered function have checked all locations
+-       alrea
+-     */
+-    if (b->type == bp_hardware_watchpoint && bl != b->loc)
+-      continue;
+-
+-    if (!bpstat_check_location (bl, bp_addr))
+-      continue;
+-
+-    /* Come here if it's a watchpoint, or if the break address matches */
+-
+-    bs = bpstat_alloc (bl, bs);	/* Alloc a bpstat to explain stop */
+-    gdb_assert (bs_prev->next == bs);
+-
+-    /* Assume we stop.  Should we find watchpoint that is not actually
+-       triggered, or if condition of breakpoint is false, we'll reset
+-       'stop' to 0.  */
+-    bs->stop = 1;
+-    bs->print = 1;
++  ALL_BREAKPOINTS (b)
++    {
++      if (!breakpoint_enabled (b) && b->enable_state != bp_permanent)
++	continue;
+ 
+-    if (!bpstat_check_watchpoint (bs))
+-      {
+-	/* Ensure bpstat_explains_signal stays false if this BL could not be
+-	   the cause of this trap.  */
++      for (bl = b->loc; bl != NULL; bl = bl->next)
++	{
++	  bpstat bs_prev = bs;
++
++	  /* For hardware watchpoints, we look only at the first location.
++	     The watchpoint_check function will work on entire expression,
++	     not the individual locations.  For read watchopints, the
++	     watchpoints_triggered function have checked all locations
++	     alrea
++	   */
++	  if (b->type == bp_hardware_watchpoint && bl != b->loc)
++	    break;
+ 
+-	gdb_assert (bs->print_it == print_it_noop);
+-	gdb_assert (!bs->stop);
+-	xfree (bs);
+-	bs = bs_prev;
+-	bs->next = NULL;
+-	continue;
+-      }
++	  if (!bpstat_check_location (bl, bp_addr))
++	    continue;
+ 
+-    if (b->type == bp_thread_event || b->type == bp_overlay_event
+-	|| b->type == bp_longjmp_master || b->type == bp_exception_master)
+-      /* We do not stop for these.  */
+-      bs->stop = 0;
+-    else
+-      bpstat_check_breakpoint_conditions (bs, ptid);
+-  
+-    if (bs->stop)
+-      {
+-	if (b->enable_state != bp_disabled)
+-	  ++(b->hit_count);
++	  /* Come here if it's a watchpoint, or if the break address matches */
+ 
+-	/* We will stop here */
+-	if (b->disposition == disp_disable)
+-	  {
+-	    if (b->enable_state != bp_permanent)
+-	      b->enable_state = bp_disabled;
+-	    update_locations = 1;
+-	  }
+-	if (b->silent)
+-	  bs->print = 0;
+-	bs->commands = b->commands;
+-	if (bs->commands
+-	    && (strcmp ("silent", bs->commands->line) == 0
+-		|| (xdb_commands && strcmp ("Q", bs->commands->line) == 0)))
+-	  {
+-	    bs->commands = bs->commands->next;
+-	    bs->print = 0;
+-	  }
+-	bs->commands = copy_command_lines (bs->commands);
+-      }
++	  bs = bpstat_alloc (bl, bs);	/* Alloc a bpstat to explain stop */
++	  gdb_assert (bs_prev->next == bs);
+ 
+-    /* Print nothing for this entry if we dont stop or if we dont print.  */
+-    if (bs->stop == 0 || bs->print == 0)
+-      bs->print_it = print_it_noop;
+-  }
++	  /* Assume we stop.  Should we find watchpoint that is not actually
++	     triggered, or if condition of breakpoint is false, we'll reset
++	     'stop' to 0.  */
++	  bs->stop = 1;
++	  bs->print = 1;
+ 
+-  /* Delay this call which would break the ALL_BP_LOCATIONS iteration above.  */
+-  if (update_locations)
+-    update_global_location_list (0);
++	  if (!bpstat_check_watchpoint (bs))
++	    {
++	      /* Ensure bpstat_explains_signal stays false if this BL could not be
++		 the cause of this trap.  */
++
++	      gdb_assert (bs->print_it == print_it_noop);
++	      gdb_assert (!bs->stop);
++	      xfree (bs);
++	      bs = bs_prev;
++	      bs->next = NULL;
++	      continue;
++	    }
++
++	  if (b->type == bp_thread_event || b->type == bp_overlay_event
++	      || b->type == bp_longjmp_master || b->type == bp_exception_master)
++	    /* We do not stop for these.  */
++	    bs->stop = 0;
++	  else
++	    bpstat_check_breakpoint_conditions (bs, ptid);
++	
++	  if (bs->stop)
++	    {
++	      ++(b->hit_count);
++
++	      /* We will stop here */
++	      if (b->disposition == disp_disable)
++		{
++		  if (b->enable_state != bp_permanent)
++		    b->enable_state = bp_disabled;
++		  update_global_location_list (0);
++		}
++	      if (b->silent)
++		bs->print = 0;
++	      bs->commands = b->commands;
++	      if (bs->commands
++		  && (strcmp ("silent", bs->commands->line) == 0
++		      || (xdb_commands && strcmp ("Q", bs->commands->line) == 0)))
++		{
++		  bs->commands = bs->commands->next;
++		  bs->print = 0;
++		}
++	      bs->commands = copy_command_lines (bs->commands);
++	    }
++
++	  /* Print nothing for this entry if we dont stop or if we dont print.  */
++	  if (bs->stop == 0 || bs->print == 0)
++	    bs->print_it = print_it_noop;
++	}
++    }
  
-+  do_cleanups (old_chain);
-   return root_bs->next;
- }
- 

-Index: gdb-7.0/gdb/testsuite/gdb.base/condbreak.exp
-===================================================================
---- gdb-7.0.orig/gdb/testsuite/gdb.base/condbreak.exp	2009-01-03 06:58:03.000000000 +0100
-+++ gdb-7.0/gdb/testsuite/gdb.base/condbreak.exp	2009-11-25 10:27:50.000000000 +0100
-@@ -68,6 +68,8 @@ set bp_location1  [gdb_get_line_number "
+   for (ix = 0; VEC_iterate (bp_location_p, moribund_locations, ix, loc); ++ix)
+     {
+--- ./gdb/testsuite/gdb.base/condbreak.exp	2009-01-03 06:58:03.000000000 +0100
++++ ./gdb/testsuite/gdb.base/condbreak.exp	2009-12-14 00:27:21.000000000 +0100
+@@ -68,8 +68,12 @@ set bp_location1  [gdb_get_line_number "
  set bp_location6  [gdb_get_line_number "set breakpoint 6 here"]
  set bp_location8  [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
  set bp_location9  [gdb_get_line_number "set breakpoint 9 here" $srcfile1]
-+set bp_location13  [gdb_get_line_number "set breakpoint 13 here" $srcfile1]
-+set bp_location14  [gdb_get_line_number "set breakpoint 14 here" $srcfile1]
++set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1]
++set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1]
  set bp_location15 [gdb_get_line_number "set breakpoint 15 here" $srcfile1]
  set bp_location16 [gdb_get_line_number "set breakpoint 16 here" $srcfile1]
++set bp_location17 [gdb_get_line_number "set breakpoint 17 here" $srcfile1]
++set bp_location18 [gdb_get_line_number "set breakpoint 18 here" $srcfile1]
  
-@@ -110,15 +112,23 @@ gdb_test "break marker2 if (a==43)" \
+ #
+ # test break at function
+@@ -110,15 +114,29 @@ gdb_test "break marker2 if (a==43)" \
      "Breakpoint.*at.* file .*$srcfile1, line.*"
  
  #
 +# Check break involving inferior function call.
++# Ensure there is at least one additional breakpoint with higher VMA.
 +#
-+gdb_test "break marker4 if (multi_line_if_conditional(1,1,1)==0)" \
++gdb_test "break marker3 if (multi_line_if_conditional(1,1,1)==0)" \
++    "Breakpoint.*at.* file .*$srcfile1, line.*"
++gdb_test "break marker4" \
 +    "Breakpoint.*at.* file .*$srcfile1, line.*"
 +
 +#
@@ -93,42 +268,50 @@ Index: gdb-7.0/gdb/testsuite/gdb.base/co
  if {$hp_aCC_compiler} {
      set marker1_proto "\\(void\\)"
      set marker2_proto "\\(int\\)"
++    # Not checked.
++    set marker3_proto "\\(char \\*, char \\*\\)"
 +    set marker4_proto "\\(long\\)"
  } else {
      set marker1_proto ""
      set marker2_proto ""
++    set marker3_proto ""
 +    set marker4_proto ""
  }
  
  gdb_test "info break" \
-@@ -129,7 +139,9 @@ gdb_test "info break" \
+@@ -129,7 +147,10 @@ gdb_test "info break" \
  \[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location1.*
  \[\t \]+stop only if \\(1==1\\).*
  \[0-9\]+\[\t \]+breakpoint     keep y.* in marker2$marker2_proto at .*$srcfile1:($bp_location8|$bp_location9).*
 -\[\t \]+stop only if \\(a==43\\).*" \
 +\[\t \]+stop only if \\(a==43\\).*
-+\[0-9\]+\[\t \]+breakpoint     keep y.* in marker4$marker4_proto at .*$srcfile1:($bp_location13|$bp_location14).*
-+\[\t \]+stop only if \\(multi_line_if_conditional\\(1,1,1\\)==0\\).*" \
++\[0-9\]+\[\t \]+breakpoint     keep y.* in marker3$marker3_proto at .*$srcfile1:($bp_location17|$bp_location18).*
++\[\t \]+stop only if \\(multi_line_if_conditional\\(1,1,1\\)==0\\).*
++\[0-9\]+\[\t \]+breakpoint     keep y.* in marker4$marker4_proto at .*$srcfile1:($bp_location13|$bp_location14).*" \
      "breakpoint info"
  
  
-@@ -220,3 +232,19 @@ gdb_expect {
+@@ -220,3 +241,23 @@ gdb_expect {
  	fail "(timeout) run until breakpoint at marker2"
      }
  }
 +
-+send_gdb "continue\n"
-+gdb_expect {
-+    -re "Continuing\\..*Breakpoint \[0-9\]+, marker4 \\(d=177601976\\) at .*$srcfile1:($bp_location13|$bp_location14).*($bp_location13|$bp_location14)\[\t \]+.*" {
-+	pass "run until breakpoint at marker4"
++set test "run until breakpoint at marker3"
++gdb_test_multiple "continue" $test {
++    -re "Continuing\\..*Breakpoint \[0-9\]+, marker3 \\(a=$hex \"stack\", b=$hex \"trace\"\\) at .*$srcfile1:($bp_location17|$bp_location18).*($bp_location17|$bp_location18)\[\t \]+.*$gdb_prompt $" {
++	pass $test
 +    }
-+    -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker4 \\(d=177601976\\) at .*$srcfile1:($bp_location13|$bp_location14).*($bp_location13|$bp_location14)\[\t \]+.*" {
-+	xfail "run until breakpoint at marker4"
++    -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker3 \\(a=$hex \"stack\", b=$hex \"trace\"\\) at .*$srcfile1:($bp_location17|$bp_location18).*($bp_location17|$bp_location18)\[\t \]+.*$gdb_prompt $" {
++	xfail $test
 +    }
-+    -re "$gdb_prompt $" {
-+	fail "run until breakpoint at marker4"
++}
++
++set test "run until breakpoint at marker4"
++gdb_test_multiple "continue" $test {
++    -re "Continuing\\..*Breakpoint \[0-9\]+, marker4 \\(d=177601976\\) at .*$srcfile1:($bp_location13|$bp_location14).*($bp_location13|$bp_location14)\[\t \]+.*$gdb_prompt $" {
++	pass $test
 +    }
-+    timeout {
-+	fail "(timeout) run until breakpoint at marker4"
++    -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker4 \\(d=177601976\\) at .*$srcfile1:($bp_location13|$bp_location14).*($bp_location13|$bp_location14)\[\t \]+.*$gdb_prompt $" {
++	xfail $test
 +    }
 +}


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- gdb.spec	7 Dec 2009 18:39:26 -0000	1.400
+++ gdb.spec	14 Dec 2009 18:54:51 -0000	1.401
@@ -4,6 +4,18 @@
 # --with upstream: No Fedora specific patches get applied.
 # --without python: No python support.
 
+# RHEL-5 was the last not providing `/etc/rpm/macros.dist'.
+%if 0%{!?dist:1}
+%define rhel 5
+%define dist .el5
+%define el5 1
+%define gnat_version 4.1
+%define gcj_version 7rh
+%else
+%define gnat_version 4.4
+%define gcj_version 10
+%endif
+
 Summary: A GNU source-level debugger for C, C++, Java and other languages
 Name: gdb%{?_with_debug:-debug}
 
@@ -14,7 +26,7 @@ Version: 7.0
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 9%{?_with_upstream:.upstream}%{?dist}
+Release: 10%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -372,7 +384,7 @@ Patch385: gdb-bz528668-symfile-multi.pat
 # Support GNU IFUNCs - indirect functions (BZ 539590).
 Patch387: gdb-bz539590-gnu-ifunc.patch
 
-# Fix bp conditionals [bp_location-accel] regression (Phil Muldoon, BZ 538626).
+# Fix bp conditionals [bp_location-accel] regression (BZ 538626).
 Patch388: gdb-bz538626-bp_location-accel-bp-cond.patch
 
 # Fix callback-mode readline-6.0 regression for CTRL-C.
@@ -381,6 +393,9 @@ Patch390: gdb-readline-6.0-signal.patch
 # Fix syscall restarts for amd64->i386 biarch.
 Patch391: gdb-x86_64-i386-syscall-restart.patch
 
+# Fix stepping with OMP parallel Fortran sections (BZ 533176).
+Patch392: gdb-bz533176-fortran-omp-step.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -400,25 +415,34 @@ BuildRequires: libstdc++
 BuildRequires: sharutils dejagnu
 # gcc-objc++ is not covered by the GDB testsuite.
 BuildRequires: gcc gcc-c++ gcc-gfortran gcc-java gcc-objc glibc-static
+# Prelink is broken on sparcv9/sparc64
+%ifnarch sparcv9 sparc64
+BuildRequires: prelink
+%endif
 %if 0%{!?rhel:1}
 BuildRequires: fpc
 %endif
+%if 0%{?el5:1}
+BuildRequires: gcc44 gcc44-gfortran
+%endif
 # Ensure the devel libraries are installed for both multilib arches.
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 # Copied from gcc-4.1.2-32
 %ifarch %{ix86} x86_64 ia64 ppc alpha
 BuildRequires: gcc-gnat
 %ifarch %{multilib_64_archs} ppc
-BuildRequires: %{_exec_prefix}/lib64/libgnat-4.4.so %{_exec_prefix}/lib/libgnat-4.4.so
+BuildRequires: %{_exec_prefix}/lib64/libgnat-%{gnat_version}.so %{_exec_prefix}/lib/libgnat-%{gnat_version}.so
 %endif
 %endif
 %ifarch %{multilib_64_archs} sparc sparcv9 ppc
 BuildRequires: /lib/libc.so.6 %{_exec_prefix}/lib/libc.so /lib64/libc.so.6 %{_exec_prefix}/lib64/libc.so
 BuildRequires: /lib/libgcc_s.so.1 /lib64/libgcc_s.so.1
 BuildRequires: %{_exec_prefix}/lib/libstdc++.so.6 %{_exec_prefix}/lib64/libstdc++.so.6
-BuildRequires: %{_exec_prefix}/lib64/libgcj.so.10 %{_exec_prefix}/lib/libgcj.so.10
+BuildRequires: %{_exec_prefix}/lib64/libgcj.so.%{gcj_version} %{_exec_prefix}/lib/libgcj.so.%{gcj_version}
 # multilib glibc-static is open Bug 488472:
-#BuildRequires: %{_exec_prefix}/lib64/libc.a %{_exec_prefix}/lib/libc.a
+%if 0%{?el5:1}
+BuildRequires: %{_exec_prefix}/lib64/libc.a %{_exec_prefix}/lib/libc.a
+%endif
 # for gcc-java:
 BuildRequires: %{_exec_prefix}/lib64/libz.so %{_exec_prefix}/lib/libz.so
 %endif
@@ -427,11 +451,6 @@ BuildRequires: %{_exec_prefix}/lib64/lib
 %ifarch ia64
 BuildRequires: libunwind-devel >= 0.99-0.1.frysk20070405cvs
 Requires: libunwind >= 0.99-0.1.frysk20070405cvs
-%else
-# Prelink is broken on sparcv9/sparc64
-%ifnarch sparcv9 sparc64
-BuildRequires: prelink
-%endif
 %endif
 
 Requires(post): /sbin/install-info
@@ -479,6 +498,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch383 -p1
 %patch384 -p1
 %patch385 -p1
+%patch388 -p1
 %patch124 -p1
 %patch1 -p1
 %patch3 -p1
@@ -582,10 +602,10 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch381 -p1
 %patch382 -p1
 %patch387 -p1
-%patch388 -p1
 %patch389 -p1
 %patch390 -p1
 %patch391 -p1
+%patch392 -p1
 
 find -name "*.orig" | xargs rm -f
 ! find -name "*.rej"	# Should not happen.
@@ -594,6 +614,8 @@ find -name "*.orig" | xargs rm -f
 
 # Change the version that gets printed at GDB startup, so it is Fedora
 # specific.
+# Fedora (%{version}-%{release})
+# Red Hat Enterprise Linux (%{version}-%{release})
 cat > gdb/version.in << _FOO
 Fedora (%{version}-%{release})
 _FOO
@@ -659,9 +681,8 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 	--without-python				\
 %endif
 $(: Workaround rpm.org#76, BZ 508193 on recent OSes. )	\
-$(: RHEL-5 was the last not providing %{dist}. )	\
 $(: RHEL-5 librpm has incompatible API. )		\
-%if 0%{!?dist:1}
+%if 0%{?el5:1}
 	--without-rpm					\
 %else
 	--with-rpm=librpm.so.0				\
@@ -890,6 +911,13 @@ fi
 %endif
 
 %changelog
+* Mon Dec 14 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-10.fc12
+- Make gdb-6.3-rh-testversion-20041202.patch to accept both RHEL and Fedora GDB.
+- Adjust BuildRequires for Fedora-12, RHEL-6 and RHEL-5 builds.
+- [vla] Fix compatibility of dynamic arrays with iFort (BZ 514287).
+- Fix stepping through OMP parallel Fortran sections (BZ 533176).
+- New fix of bp conditionals [bp_location-accel] regression (BZ 538626).
+
 * Mon Dec  7 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-9.fc12
 - Replace the PIE (Position Indepdent Executable) support patch by a new one.
 - Drop gdb-6.3-nonthreaded-wp-20050117.patch as fuzzy + redundant.



From stevetraylen at fedoraproject.org  Mon Dec 14 18:55:19 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 14 Dec 2009 18:55:19 +0000 (UTC)
Subject: rpms/activemq-cpp/F-11 activemq-cpp-local-texmf.patch, NONE,
	1.1 activemq-cpp.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091214185519.1978211C00E9@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/activemq-cpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13816/F-11

Modified Files:
	sources 
Added Files:
	activemq-cpp-local-texmf.patch activemq-cpp.spec 
Log Message:
First versions.


activemq-cpp-local-texmf.patch:
 doxygen-include.am |    4 ++--
 texmf.cnf          |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE activemq-cpp-local-texmf.patch ---
diff -uNr activemq-cpp-2.2.6.ORIG/texmf.cnf activemq-cpp-2.2.6/texmf.cnf
--- activemq-cpp-2.2.6.ORIG/texmf.cnf	1970-01-01 01:00:00.000000000 +0100
+++ activemq-cpp-2.2.6/texmf.cnf	2009-11-07 20:47:00.466113909 +0100
@@ -0,0 +1,2 @@
+pool_size = 4000000
+
diff -uNr activemq-cpp-2.2.6.ORIG/doxygen-include.am activemq-cpp-2.2.6/doxygen-include.am
--- activemq-cpp-2.2.6.ORIG/doxygen-include.am	2009-01-23 14:56:26.000000000 +0100
+++ activemq-cpp-2.2.6/doxygen-include.am	2009-11-07 20:52:10.558509912 +0100
@@ -153,12 +153,12 @@
 	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
 	$(DX_PDFLATEX) refman.tex; \
 	$(DX_MAKEINDEX) refman.idx; \
-	$(DX_PDFLATEX) refman.tex; \
+	TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \
 	countdown=5; \
 	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
 	                  refman.log > /dev/null 2>&1 \
 	   && test $$countdown -gt 0; do \
-	    $(DX_PDFLATEX) refman.tex; \
+	    TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \
 	    countdown=`expr $$countdown - 1`; \
 	done; \
 	mv refman.pdf ../@PACKAGE at .pdf


--- NEW FILE activemq-cpp.spec ---
Name:           activemq-cpp
Version:        2.2.6
Release:        5%{?dist}
Summary:        C++ implementation of JMS-like messaging client

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://activemq.apache.org/cms/
Source0:        http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-%{version}-src.tar.gz
# Some local texmf configuration to increase default pool_size.
Patch1:         %{name}-local-texmf.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen
BuildRequires:  graphviz
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  tex(latex)
%else
BuildRequires:  tetex-latex
%endif

BuildRequires:  automake >= 1.10
BuildRequires:  autoconf >= 2.60
BuildRequires:  libtool  >= 1.5.24
BuildRequires:  apr-util-devel%{?_isa} >= 1.3
BuildRequires:  cppunit-devel%{?_isa} >= 1.10.2

%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  libuuid-devel%{?_isa}
%else
BuildRequires:  e2fsprogs-devel%{?_isa}
%endif

%description
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make your 
C++ client code much neater and easier to follow. To get a better feel for 
CMS try the API Reference. 
ActiveMQ-CPP is a client only library, a message broker such as Apache 
ActiveMQ is still needed for your clients to communicate.  

%package devel
Summary:        C++ implementation header files for JMS-like messaging
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
Requires:  libuuid-devel%{?_isa}
%else
Requires:  e2fsprogs-devel%{?_isa}
%endif




%description devel
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make 
your C++ client code much neater and easier to follow. To get a better
feel for CMS try the API Reference.  ActiveMQ-CPP is a client only 
library, a message broker such as Apache ActiveMQ is still needed 
for your clients to communicate.  

%{name}-devel contains development header files.


%package doc
Summary:        C++ implementation header files for JMS-like messaging
Group:          Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make 
your C++ client code much neater and easier to follow. To get a better
feel for CMS try the API Reference.  ActiveMQ-CPP is a client only 
library, a message broker such as Apache ActiveMQ is still needed 
for your clients to communicate.  

%{name}-doc contains api documentation.

%prep
%setup -q
%patch1 -p1



%build
mkdir config
./autogen.sh
# Build pdf(30MB) rather than default html(400MB). 
%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
make %{?_smp_mflags}
make %{?_smp_mflags}  doxygen-run
cp -p texmf.cnf doc/latex/texmf.cnf
make %{?_smp_mflags} doxygen-pdf


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
rm $RPM_BUILD_ROOT/%{_bindir}/example

%clean
rm -rf $RPM_BUILD_ROOT

%check
make %{?_smp_mflags} check

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.so.*
%doc LICENSE.txt  NOTICE.txt  README.txt  RELEASE_NOTES.txt

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.so
%{_includedir}/%{name}-%{version}
%{_libdir}/pkgconfig/%{name}.pc
%{_bindir}/activemqcpp-config

%files doc
%defattr(-,root,root,-)
%doc doc/%{name}.pdf

%changelog
* Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-5
- Add libuuid-devel as Requires to -devel package.
* Sat Nov 14 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-4
- Remove patch to relocate headers from versioned directory.
- Add make smp options to make check.
* Fri Nov 6 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-3
- Relocate headers to non versioned directory with patch0
* Fri Nov 6 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-2
- Adapted to Fedora guidelines.
* Thu Feb 26 2009 Ricardo Rocha <ricardo.rocha at cern.ch> - 2.2.6-1
- First version of the spec file




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:28:23 -0000	1.1
+++ sources	14 Dec 2009 18:55:19 -0000	1.2
@@ -0,0 +1 @@
+1222f0d6c5f86ef3ed5a558a533c7564  activemq-cpp-2.2.6-src.tar.gz



From stevetraylen at fedoraproject.org  Mon Dec 14 18:55:19 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 14 Dec 2009 18:55:19 +0000 (UTC)
Subject: rpms/activemq-cpp/F-12 activemq-cpp-local-texmf.patch, NONE,
	1.1 activemq-cpp.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091214185519.6C16311C00E9@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/activemq-cpp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13816/F-12

Modified Files:
	sources 
Added Files:
	activemq-cpp-local-texmf.patch activemq-cpp.spec 
Log Message:
First versions.


activemq-cpp-local-texmf.patch:
 doxygen-include.am |    4 ++--
 texmf.cnf          |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE activemq-cpp-local-texmf.patch ---
diff -uNr activemq-cpp-2.2.6.ORIG/texmf.cnf activemq-cpp-2.2.6/texmf.cnf
--- activemq-cpp-2.2.6.ORIG/texmf.cnf	1970-01-01 01:00:00.000000000 +0100
+++ activemq-cpp-2.2.6/texmf.cnf	2009-11-07 20:47:00.466113909 +0100
@@ -0,0 +1,2 @@
+pool_size = 4000000
+
diff -uNr activemq-cpp-2.2.6.ORIG/doxygen-include.am activemq-cpp-2.2.6/doxygen-include.am
--- activemq-cpp-2.2.6.ORIG/doxygen-include.am	2009-01-23 14:56:26.000000000 +0100
+++ activemq-cpp-2.2.6/doxygen-include.am	2009-11-07 20:52:10.558509912 +0100
@@ -153,12 +153,12 @@
 	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
 	$(DX_PDFLATEX) refman.tex; \
 	$(DX_MAKEINDEX) refman.idx; \
-	$(DX_PDFLATEX) refman.tex; \
+	TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \
 	countdown=5; \
 	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
 	                  refman.log > /dev/null 2>&1 \
 	   && test $$countdown -gt 0; do \
-	    $(DX_PDFLATEX) refman.tex; \
+	    TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \
 	    countdown=`expr $$countdown - 1`; \
 	done; \
 	mv refman.pdf ../@PACKAGE at .pdf


--- NEW FILE activemq-cpp.spec ---
Name:           activemq-cpp
Version:        2.2.6
Release:        5%{?dist}
Summary:        C++ implementation of JMS-like messaging client

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://activemq.apache.org/cms/
Source0:        http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-%{version}-src.tar.gz
# Some local texmf configuration to increase default pool_size.
Patch1:         %{name}-local-texmf.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen
BuildRequires:  graphviz
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  tex(latex)
%else
BuildRequires:  tetex-latex
%endif

BuildRequires:  automake >= 1.10
BuildRequires:  autoconf >= 2.60
BuildRequires:  libtool  >= 1.5.24
BuildRequires:  apr-util-devel%{?_isa} >= 1.3
BuildRequires:  cppunit-devel%{?_isa} >= 1.10.2

%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  libuuid-devel%{?_isa}
%else
BuildRequires:  e2fsprogs-devel%{?_isa}
%endif

%description
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make your 
C++ client code much neater and easier to follow. To get a better feel for 
CMS try the API Reference. 
ActiveMQ-CPP is a client only library, a message broker such as Apache 
ActiveMQ is still needed for your clients to communicate.  

%package devel
Summary:        C++ implementation header files for JMS-like messaging
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
Requires:  libuuid-devel%{?_isa}
%else
Requires:  e2fsprogs-devel%{?_isa}
%endif




%description devel
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make 
your C++ client code much neater and easier to follow. To get a better
feel for CMS try the API Reference.  ActiveMQ-CPP is a client only 
library, a message broker such as Apache ActiveMQ is still needed 
for your clients to communicate.  

%{name}-devel contains development header files.


%package doc
Summary:        C++ implementation header files for JMS-like messaging
Group:          Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
activemq-cpp is a JMS-like API for C++ for interfacing with Message 
Brokers such as Apache ActiveMQ.  C++ messaging service helps to make 
your C++ client code much neater and easier to follow. To get a better
feel for CMS try the API Reference.  ActiveMQ-CPP is a client only 
library, a message broker such as Apache ActiveMQ is still needed 
for your clients to communicate.  

%{name}-doc contains api documentation.

%prep
%setup -q
%patch1 -p1



%build
mkdir config
./autogen.sh
# Build pdf(30MB) rather than default html(400MB). 
%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
make %{?_smp_mflags}
make %{?_smp_mflags}  doxygen-run
cp -p texmf.cnf doc/latex/texmf.cnf
make %{?_smp_mflags} doxygen-pdf


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
rm $RPM_BUILD_ROOT/%{_bindir}/example

%clean
rm -rf $RPM_BUILD_ROOT

%check
make %{?_smp_mflags} check

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.so.*
%doc LICENSE.txt  NOTICE.txt  README.txt  RELEASE_NOTES.txt

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.so
%{_includedir}/%{name}-%{version}
%{_libdir}/pkgconfig/%{name}.pc
%{_bindir}/activemqcpp-config

%files doc
%defattr(-,root,root,-)
%doc doc/%{name}.pdf

%changelog
* Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-5
- Add libuuid-devel as Requires to -devel package.
* Sat Nov 14 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-4
- Remove patch to relocate headers from versioned directory.
- Add make smp options to make check.
* Fri Nov 6 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-3
- Relocate headers to non versioned directory with patch0
* Fri Nov 6 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-2
- Adapted to Fedora guidelines.
* Thu Feb 26 2009 Ricardo Rocha <ricardo.rocha at cern.ch> - 2.2.6-1
- First version of the spec file




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:28:23 -0000	1.1
+++ sources	14 Dec 2009 18:55:19 -0000	1.2
@@ -0,0 +1 @@
+1222f0d6c5f86ef3ed5a558a533c7564  activemq-cpp-2.2.6-src.tar.gz



From epienbro at fedoraproject.org  Mon Dec 14 18:57:22 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon, 14 Dec 2009 18:57:22 +0000 (UTC)
Subject: rpms/mingw32-gtkhtml3/F-11 mingw32-gtkhtml3.spec,1.1,1.2
Message-ID: <20091214185722.C221811C00E9@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtkhtml3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14318

Modified Files:
	mingw32-gtkhtml3.spec 
Log Message:
Droppped automatic debuginfo generation for the F-11 branch as it isn't available on F-11



Index: mingw32-gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtkhtml3/F-11/mingw32-gtkhtml3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-gtkhtml3.spec	14 Dec 2009 18:11:44 -0000	1.1
+++ mingw32-gtkhtml3.spec	14 Dec 2009 18:57:21 -0000	1.2
@@ -3,7 +3,6 @@
 %global _use_internal_dependency_generator 0
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
-%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtkhtml3
 Version:        3.29.3
@@ -48,7 +47,7 @@ Patch4:         gtkhtml-perform-g-thread
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 53
+BuildRequires:  mingw32-filesystem >= 36
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-gtk2
@@ -78,9 +77,6 @@ Group:          Development/Libraries
 Static version of the MinGW Windows GtkHTML library.
 
 
-%{_mingw32_debug_package}
-
-
 %prep
 %setup -q -n gtkhtml-%{version}
 %patch0 -p1



From kwizart at fedoraproject.org  Mon Dec 14 18:57:22 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 14 Dec 2009 18:57:22 +0000 (UTC)
Subject: rpms/perl-BDB/devel perl-BDB.spec, 1.12,
	1.13 BDB-1.84-nocommon.patch, 1.1, NONE
Message-ID: <20091214185722.D17DE11C0260@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14405

Modified Files:
	perl-BDB.spec 
Removed Files:
	BDB-1.84-nocommon.patch 
Log Message:
Remove uneedeed patch



Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-BDB.spec	8 Dec 2009 22:37:51 -0000	1.12
+++ perl-BDB.spec	14 Dec 2009 18:57:22 -0000	1.13
@@ -1,17 +1,17 @@
 Name:           perl-BDB
 Version:        1.86
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Asynchronous Berkeley DB access
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/BDB/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/BDB-%{version}.tar.gz
-Patch0:         BDB-1.84-nocommon.patch
 Patch1:         BDB-1.86-db_48.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(common::sense)
 BuildRequires:  db4-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -21,7 +21,6 @@ Asynchronous Berkeley DB access.
 
 %prep
 %setup -q -n BDB-%{version}
-%patch0 -p1 -b .nocommon
 %patch1 -p1 -b .db48
 
 
@@ -56,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 13 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.86-3
+- Drop Patch0
+
 * Tue Dec 8 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.86-2
 - Patch to force db 4.8.
 


--- BDB-1.84-nocommon.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Dec 14 19:09:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 19:09:49 +0000
Subject: [pkgdb] pytz had acl change status
Message-ID: <20091214190950.7DF0A28ED1F@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on pytz (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Mon Dec 14 19:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 19:09:50 +0000
Subject: [pkgdb] pytz had acl change status
Message-ID: <20091214190951.4E6B328ED3B@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on pytz (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pytz



From pkgdb at fedoraproject.org  Mon Dec 14 19:10:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 19:10:49 +0000
Subject: [pkgdb] revelation had acl change status
Message-ID: <20091214191050.A3BD928ED5F@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on revelation (Fedora devel) to Approved for smooge

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From pkgdb at fedoraproject.org  Mon Dec 14 19:10:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 19:10:54 +0000
Subject: [pkgdb] revelation had acl change status
Message-ID: <20091214191054.F26C828ED5F@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on revelation (Fedora devel) to Approved for smooge

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revelation



From mclasen at fedoraproject.org  Mon Dec 14 19:12:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 19:12:04 +0000 (UTC)
Subject: rpms/GConf2/F-12 no-access-crash.patch, NONE, 1.1 GConf2.spec, 1.114,
	1.115
Message-ID: <20091214191204.4C33911C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17170

Modified Files:
	GConf2.spec 
Added Files:
	no-access-crash.patch 
Log Message:
Avoid a gconftool-2 crash


no-access-crash.patch:
 gconf.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE no-access-crash.patch ---
diff -up GConf-2.28.0/gconf/gconf.c.no-access GConf-2.28.0/gconf/gconf.c
--- GConf-2.28.0/gconf/gconf.c.no-access	2009-12-14 14:05:28.356082892 -0500
+++ GConf-2.28.0/gconf/gconf.c	2009-12-14 14:06:57.345056432 -0500
@@ -511,6 +511,7 @@ gconf_engine_get_local      (const gchar
 {
   GConfEngine* conf;
   GConfSource* source;
+  GConfSources* sources;
 
   g_return_val_if_fail(address != NULL, NULL);
   g_return_val_if_fail(err == NULL || *err == NULL, NULL);
@@ -519,10 +520,14 @@ gconf_engine_get_local      (const gchar
 
   if (source == NULL)
     return NULL;
-  
+
+  sources = gconf_sources_new_from_source(source);
+  if (sources == NULL)
+    return NULL;
+
   conf = gconf_engine_blank(FALSE);
 
-  conf->local_sources = gconf_sources_new_from_source(source);
+  conf->local_sources = sources;
 
   g_assert (gconf_engine_is_local (conf));
   
@@ -534,13 +539,19 @@ gconf_engine_get_local_for_addresses (GS
 				      GError **err)
 {
   GConfEngine *conf;
+  GConfSources* sources;
 
   g_return_val_if_fail (addresses != NULL, NULL);
   g_return_val_if_fail (err == NULL || *err == NULL, NULL);
   
+  sources = gconf_sources_new_from_addresses (addresses, err);
+
+  if (sources == NULL)
+    return NULL;
+
   conf = gconf_engine_blank (FALSE);
 
-  conf->local_sources = gconf_sources_new_from_addresses (addresses, err);
+  conf->local_sources = sources;
 
   g_assert (gconf_engine_is_local (conf));
   


Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/F-12/GConf2.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- GConf2.spec	7 Oct 2009 23:39:35 -0000	1.114
+++ GConf2.spec	14 Dec 2009 19:12:04 -0000	1.115
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2
@@ -38,6 +38,8 @@ Conflicts: GConf2-dbus
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
 Patch1: GConf-gettext.patch
+#
+Patch2: no-access-crash.patch
 
 
 %description
@@ -75,6 +77,7 @@ which require GTK+.
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .gettext
+%patch2 -p1 -b .no-access
 
 autoreconf -f -i
 
@@ -151,6 +154,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Avoid a crash when gconftool-2 can't read the db  (#547238)
+
 * Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Fix a problem with schema translations
 



From mclasen at fedoraproject.org  Mon Dec 14 19:13:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 14 Dec 2009 19:13:45 +0000 (UTC)
Subject: rpms/GConf2/devel no-access-crash.patch, NONE, 1.1 GConf2.spec,
	1.113, 1.114
Message-ID: <20091214191345.4F4E011C00EB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17541

Modified Files:
	GConf2.spec 
Added Files:
	no-access-crash.patch 
Log Message:
Avoid a gconftool-2 crash


no-access-crash.patch:
 gconf.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE no-access-crash.patch ---
diff -up GConf-2.28.0/gconf/gconf.c.no-access GConf-2.28.0/gconf/gconf.c
--- GConf-2.28.0/gconf/gconf.c.no-access	2009-12-14 14:05:28.356082892 -0500
+++ GConf-2.28.0/gconf/gconf.c	2009-12-14 14:06:57.345056432 -0500
@@ -511,6 +511,7 @@ gconf_engine_get_local      (const gchar
 {
   GConfEngine* conf;
   GConfSource* source;
+  GConfSources* sources;
 
   g_return_val_if_fail(address != NULL, NULL);
   g_return_val_if_fail(err == NULL || *err == NULL, NULL);
@@ -519,10 +520,14 @@ gconf_engine_get_local      (const gchar
 
   if (source == NULL)
     return NULL;
-  
+
+  sources = gconf_sources_new_from_source(source);
+  if (sources == NULL)
+    return NULL;
+
   conf = gconf_engine_blank(FALSE);
 
-  conf->local_sources = gconf_sources_new_from_source(source);
+  conf->local_sources = sources;
 
   g_assert (gconf_engine_is_local (conf));
   
@@ -534,13 +539,19 @@ gconf_engine_get_local_for_addresses (GS
 				      GError **err)
 {
   GConfEngine *conf;
+  GConfSources* sources;
 
   g_return_val_if_fail (addresses != NULL, NULL);
   g_return_val_if_fail (err == NULL || *err == NULL, NULL);
   
+  sources = gconf_sources_new_from_addresses (addresses, err);
+
+  if (sources == NULL)
+    return NULL;
+
   conf = gconf_engine_blank (FALSE);
 
-  conf->local_sources = gconf_sources_new_from_addresses (addresses, err);
+  conf->local_sources = sources;
 
   g_assert (gconf_engine_is_local (conf));
   


Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- GConf2.spec	23 Sep 2009 22:21:50 -0000	1.113
+++ GConf2.spec	14 Dec 2009 19:13:45 -0000	1.114
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2
@@ -38,6 +38,8 @@ Conflicts: GConf2-dbus
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
 Patch1: GConf-gettext.patch
+#
+Patch2: no-access-crash.patch
 
 
 %description
@@ -75,6 +77,7 @@ which require GTK+.
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .gettext
+%patch2 -p1 -b .no-access
 
 autoreconf -f -i
 
@@ -151,6 +154,12 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Avoid a crash when gconftool-2 can't read the db  (#547238)
+
+* Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Fix a problem with schema translations
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From pkgdb at fedoraproject.org  Mon Dec 14 19:15:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 19:15:05 +0000
Subject: [pkgdb] scipy had acl change status
Message-ID: <20091214191506.6BCE628ED62@bastion3.fedora.phx2.redhat.com>

jspaleta has set the commit acl on scipy (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From pkgdb at fedoraproject.org  Mon Dec 14 19:15:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 19:15:30 +0000
Subject: [pkgdb] scipy had acl change status
Message-ID: <20091214191530.ECD3D28ED60@bastion3.fedora.phx2.redhat.com>

jspaleta has set the approveacls acl on scipy (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scipy



From cdamian at fedoraproject.org  Mon Dec 14 19:19:34 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Mon, 14 Dec 2009 19:19:34 +0000 (UTC)
Subject: rpms/php-phpunit-phploc/F-12 .cvsignore, 1.2,
	1.3 php-phpunit-phploc.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091214191934.B6B7C11C00EB@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-phploc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18452

Modified Files:
	.cvsignore php-phpunit-phploc.spec sources 
Log Message:
upstream 1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Nov 2009 23:37:46 -0000	1.2
+++ .cvsignore	14 Dec 2009 19:19:34 -0000	1.3
@@ -1 +1 @@
-phploc-1.2.0.tgz
+phploc-1.4.0.tgz


Index: php-phpunit-phploc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/F-12/php-phpunit-phploc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-phpunit-phploc.spec	7 Nov 2009 17:50:08 -0000	1.2
+++ php-phpunit-phploc.spec	14 Dec 2009 19:19:34 -0000	1.3
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-phploc
-Version:        1.2.0
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
 Group:          Development/Libraries
@@ -19,6 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
@@ -79,12 +80,14 @@ fi
 %{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/XML.php
 %{pear_phpdir}/PHPLOC/TextUI/Command.php
 %{pear_phpdir}/PHPLOC/TextUI/Getopt.php
-%{pear_phpdir}/PHPLOC/Util/FilterIterator.php
 %{pear_phpdir}/PHPLOC/Analyser.php
 %{_bindir}/phploc
 
 
 %changelog
+* Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.4.0-1
+- upstream 1.4.0
+
 * Sat Nov 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-2
 - F-(10|11) / EL-5 compatibility
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Nov 2009 23:37:46 -0000	1.2
+++ sources	14 Dec 2009 19:19:34 -0000	1.3
@@ -1 +1 @@
-20bb7d549f3f7ff37dd1f6309a0b883a  phploc-1.2.0.tgz
+d62979533e887a0b2ce4e4b4cc14c4bb  phploc-1.4.0.tgz



From rdieter at fedoraproject.org  Mon Dec 14 19:26:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 19:26:33 +0000 (UTC)
Subject: File poppler-data-0.4.0.tar.gz uploaded to lookaside cache by
	rdieter
Message-ID: <20091214192633.030A428ECA1@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for poppler-data:

6975bf8e9ea2cfb42b9ecdbcc257cf57  poppler-data-0.4.0.tar.gz



From rdieter at fedoraproject.org  Mon Dec 14 19:28:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 19:28:11 +0000 (UTC)
Subject: rpms/poppler-data/devel .cvsignore, 1.4, 1.5 poppler-data.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20091214192811.6698711C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19644

Modified Files:
	.cvsignore poppler-data.spec sources 
Log Message:
* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
- poppler-data-0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Nov 2009 21:45:14 -0000	1.4
+++ .cvsignore	14 Dec 2009 19:28:11 -0000	1.5
@@ -1 +1 @@
-poppler-data-0.3.1.tar.gz
+poppler-data-0.4.0.tar.gz


Index: poppler-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/poppler-data.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- poppler-data.spec	23 Nov 2009 21:45:14 -0000	1.4
+++ poppler-data.spec	14 Dec 2009 19:28:11 -0000	1.5
@@ -1,7 +1,7 @@
 
 Summary: Encoding files 
 Name:    poppler-data
-Version: 0.3.1
+Version: 0.4.0
 Release: 1%{?dist}
 # The cMap data files installed by the poppler-data package are
 # under the COPYING.adobe license
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
+- poppler-data-0.4.0
+
 * Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.1-1
 - poppler-data-0.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Nov 2009 21:45:14 -0000	1.4
+++ sources	14 Dec 2009 19:28:11 -0000	1.5
@@ -1 +1 @@
-1222399ddebf74482e10be815c8df035  poppler-data-0.3.1.tar.gz
+6975bf8e9ea2cfb42b9ecdbcc257cf57  poppler-data-0.4.0.tar.gz



From rdieter at fedoraproject.org  Mon Dec 14 19:29:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 14 Dec 2009 19:29:17 +0000 (UTC)
Subject: rpms/poppler-data/F-12 .cvsignore, 1.4, 1.5 poppler-data.spec, 1.4, 
	1.5 sources, 1.4, 1.5
Message-ID: <20091214192917.334E611C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler-data/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19873

Modified Files:
	.cvsignore poppler-data.spec sources 
Log Message:
* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
- poppler-data-0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Nov 2009 21:53:15 -0000	1.4
+++ .cvsignore	14 Dec 2009 19:29:16 -0000	1.5
@@ -1 +1 @@
-poppler-data-0.3.1.tar.gz
+poppler-data-0.4.0.tar.gz


Index: poppler-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/F-12/poppler-data.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- poppler-data.spec	23 Nov 2009 21:53:15 -0000	1.4
+++ poppler-data.spec	14 Dec 2009 19:29:17 -0000	1.5
@@ -1,7 +1,7 @@
 
 Summary: Encoding files 
 Name:    poppler-data
-Version: 0.3.1
+Version: 0.4.0
 Release: 1%{?dist}
 # The cMap data files installed by the poppler-data package are
 # under the COPYING.adobe license
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
+- poppler-data-0.4.0
+
 * Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.1-1
 - poppler-data-0.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Nov 2009 21:53:15 -0000	1.4
+++ sources	14 Dec 2009 19:29:17 -0000	1.5
@@ -1 +1 @@
-1222399ddebf74482e10be815c8df035  poppler-data-0.3.1.tar.gz
+6975bf8e9ea2cfb42b9ecdbcc257cf57  poppler-data-0.4.0.tar.gz



From dcbw at fedoraproject.org  Mon Dec 14 19:37:48 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 19:37:48 +0000 (UTC)
Subject: rpms/ModemManager/devel ModemManager.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20091214193748.4F61311C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21191

Modified Files:
	ModemManager.spec sources 
Log Message:
* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1.git20091214
- cdma: fix signal strength reporting on some devices
- cdma: better registration state detection when dialing (ex Sierra 5275)




Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/ModemManager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ModemManager.spec	8 Dec 2009 06:17:28 -0000	1.6
+++ ModemManager.spec	14 Dec 2009 19:37:47 -0000	1.7
@@ -1,9 +1,9 @@
-%define snapshot %{nil}
+%define snapshot .git20091214
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
 Version: 0.2.997
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
@@ -62,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1.git20091214
+- cdma: fix signal strength reporting on some devices
+- cdma: better registration state detection when dialing (ex Sierra 5275)
+
 * Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1
 - core: fix reconnect after manual disconnect (rh #541314)
 - core: fix various segfaults during registration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Dec 2009 06:17:28 -0000	1.5
+++ sources	14 Dec 2009 19:37:48 -0000	1.6
@@ -1 +0,0 @@
-b2b550d36eaf98616b20b656bcb21800  ModemManager-0.2.997.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 19:38:02 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 19:38:02 +0000 (UTC)
Subject: File ModemManager-0.2.997.git20091214.tar.bz2 uploaded to lookaside
	cache by dcbw
Message-ID: <20091214193802.C59D328ECF0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ModemManager:

c97f2415a223ff2b34bef4c62d43aaaf  ModemManager-0.2.997.git20091214.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 19:38:21 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 19:38:21 +0000 (UTC)
Subject: rpms/ModemManager/devel .cvsignore,1.5,1.6 sources,1.6,1.7
Message-ID: <20091214193821.D4AAC11C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21307

Modified Files:
	.cvsignore sources 
Log Message:
Add source for git20091214 snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Dec 2009 06:17:28 -0000	1.5
+++ .cvsignore	14 Dec 2009 19:38:21 -0000	1.6
@@ -2,3 +2,4 @@ ModemManager-0.2-20090707.tar.bz2
 ModemManager-0.2-20090826.tar.bz2
 ModemManager-0.2-20091105.tar.bz2
 ModemManager-0.2.997.tar.bz2
+ModemManager-0.2.997.git20091214.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Dec 2009 19:37:48 -0000	1.6
+++ sources	14 Dec 2009 19:38:21 -0000	1.7
@@ -0,0 +1 @@
+c97f2415a223ff2b34bef4c62d43aaaf  ModemManager-0.2.997.git20091214.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 19:40:06 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 19:40:06 +0000 (UTC)
Subject: rpms/ModemManager/devel ModemManager.spec,1.7,1.8
Message-ID: <20091214194006.966D411C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21661

Modified Files:
	ModemManager.spec 
Log Message:
Fix changelog's NVR



Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/ModemManager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ModemManager.spec	14 Dec 2009 19:37:47 -0000	1.7
+++ ModemManager.spec	14 Dec 2009 19:40:06 -0000	1.8
@@ -62,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
-* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1.git20091214
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-2.git20091214
 - cdma: fix signal strength reporting on some devices
 - cdma: better registration state detection when dialing (ex Sierra 5275)
 



From dcbw at fedoraproject.org  Mon Dec 14 19:42:16 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 19:42:16 +0000 (UTC)
Subject: rpms/ModemManager/F-12 ModemManager.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20091214194216.164C211C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22274

Modified Files:
	ModemManager.spec sources 
Log Message:
* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-2.git20091214
- cdma: fix signal strength reporting on some devices
- cdma: better registration state detection when dialing (ex Sierra 5275)




Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/ModemManager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ModemManager.spec	8 Dec 2009 06:32:54 -0000	1.6
+++ ModemManager.spec	14 Dec 2009 19:42:15 -0000	1.7
@@ -1,9 +1,9 @@
-%define snapshot %{nil}
+%define snapshot .git20091214
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
 Version: 0.2.997
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
@@ -62,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-2.git20091214
+- cdma: fix signal strength reporting on some devices
+- cdma: better registration state detection when dialing (ex Sierra 5275)
+
 * Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1
 - core: fix reconnect after manual disconnect (rh #541314)
 - core: fix various segfaults during registration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Dec 2009 06:32:54 -0000	1.5
+++ sources	14 Dec 2009 19:42:15 -0000	1.6
@@ -1 +1 @@
-b2b550d36eaf98616b20b656bcb21800  ModemManager-0.2.997.tar.bz2
+c97f2415a223ff2b34bef4c62d43aaaf  ModemManager-0.2.997.git20091214.tar.bz2



From derks at fedoraproject.org  Mon Dec 14 19:43:45 2009
From: derks at fedoraproject.org (derks)
Date: Mon, 14 Dec 2009 19:43:45 +0000 (UTC)
Subject: File mysql-mmm-2.0.10-1.pdf uploaded to lookaside cache by derks
Message-ID: <20091214194345.45C0228ED04@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mysql-mmm:

822a0d8819af1bcf6fb228f0ecfd3ed4  mysql-mmm-2.0.10-1.pdf



From derks at fedoraproject.org  Mon Dec 14 19:43:46 2009
From: derks at fedoraproject.org (derks)
Date: Mon, 14 Dec 2009 19:43:46 +0000 (UTC)
Subject: File mysql-mmm-2.0.10.tar.gz uploaded to lookaside cache by derks
Message-ID: <20091214194346.5237528ED17@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mysql-mmm:

e8b8df923eeeeae9c4f8ec5584f5023d  mysql-mmm-2.0.10.tar.gz



From derks at fedoraproject.org  Mon Dec 14 19:44:24 2009
From: derks at fedoraproject.org (derks)
Date: Mon, 14 Dec 2009 19:44:24 +0000 (UTC)
Subject: rpms/mysql-mmm/devel import.log, NONE,
	1.1 mysql-mmm-2.0.10-default_logging.patch, NONE,
	1.1 mysql-mmm-2.0.10-lp473446.patch, NONE,
	1.1 mysql-mmm-2.0.9-configs.patch, NONE,
	1.1 mysql-mmm-2.0.9-paths.patch, NONE, 1.1 mysql-mmm-agent.init,
	NONE, 1.1 mysql-mmm-monitor.init, NONE, 1.1 mysql-mmm.logrotate,
	NONE, 1.1 mysql-mmm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091214194424.D302911C00EB@cvs1.fedora.phx.redhat.com>

Author: derks

Update of /cvs/pkgs/rpms/mysql-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22882/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mysql-mmm-2.0.10-default_logging.patch 
	mysql-mmm-2.0.10-lp473446.patch mysql-mmm-2.0.9-configs.patch 
	mysql-mmm-2.0.9-paths.patch mysql-mmm-agent.init 
	mysql-mmm-monitor.init mysql-mmm.logrotate mysql-mmm.spec 
Log Message:
Initial import of mysql-mmm-2.0.10-4.src.rpm




--- NEW FILE import.log ---
mysql-mmm-2_0_10-4:HEAD:mysql-mmm-2.0.10-4.src.rpm:1260819829

mysql-mmm-2.0.10-default_logging.patch:
 Log.pm |   45 ++++++++++-----------------------------------
 1 file changed, 10 insertions(+), 35 deletions(-)

--- NEW FILE mysql-mmm-2.0.10-default_logging.patch ---
--- mysql-mmm-2.0.10/lib/Common/Log.pm.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/lib/Common/Log.pm	2009-11-17 13:04:08.000000000 -0600
@@ -31,42 +31,17 @@
 
 	# Use default configuration
 	my $conf = "
-		log4perl.logger = INFO, FileInfo, FileWarn, FileError, FileFatal, MailFatal
+		log4perl.logger = INFO, MMMLog
 
-		log4perl.appender.FileInfo                          = Log::Log4perl::Appender::File
-		log4perl.appender.FileInfo.Threshold                = INFO 
-		log4perl.appender.FileInfo.filename                 = /var/log/mysql-mmm/$progam.info
-		log4perl.appender.FileInfo.recreate                 = 1
-		log4perl.appender.FileInfo.layout                   = PatternLayout
-		log4perl.appender.FileInfo.layout.ConversionPattern = %d %5p %m%n
-
-		log4perl.appender.FileWarn                          = Log::Log4perl::Appender::File
-		log4perl.appender.FileWarn.Threshold                = WARN 
-		log4perl.appender.FileWarn.filename                 = /var/log/mysql-mmm/$progam.warn
-		log4perl.appender.FileWarn.recreate                 = 1
-		log4perl.appender.FileWarn.layout                   = PatternLayout
-		log4perl.appender.FileWarn.layout.ConversionPattern = %d %5p %m%n
-
-		log4perl.appender.FileError                         = Log::Log4perl::Appender::File
-		log4perl.appender.FileError.Threshold               = ERROR 
-		log4perl.appender.FileError.filename                = /var/log/mysql-mmm/$progam.error
-		log4perl.appender.FileError.recreate                = 1
-		log4perl.appender.FileError.layout                  = PatternLayout
-		log4perl.appender.FileError.layout.ConversionPattern= %d %5p %m%n
-
-		log4perl.appender.FileFatal                         = Log::Log4perl::Appender::File
-		log4perl.appender.FileFatal.Threshold               = FATAL 
-		log4perl.appender.FileFatal.filename                = /var/log/mysql-mmm/$progam.fatal
-		log4perl.appender.FileFatal.recreate                = 1
-		log4perl.appender.FileFatal.layout                  = PatternLayout
-		log4perl.appender.FileFatal.layout.ConversionPattern= %d %5p %m%n
-
-		log4perl.appender.MailFatal                         = Log::Dispatch::Email::MailSend
-		log4perl.appender.MailFatal.Threshold               = FATAL 
-		log4perl.appender.MailFatal.to                      = root
-		log4perl.appender.MailFatal.subject                 = FATAL error in $progam
-		log4perl.appender.MailFatal.layout                  = PatternLayout
-		log4perl.appender.MailFatal.layout.ConversionPattern= %d %m%n
+		log4perl.appender.MMMLog                            = Log::Log4perl::Appender::File
+		log4perl.appender.MMMLog.Threshold                  = INFO 
+		log4perl.appender.MMMLog.filename                   = /var/log/mysql-mmm/$progam.log
+		log4perl.appender.MMMLog.recreate                   = 1
+		log4perl.appender.MMMLog.layout                     = PatternLayout
+		log4perl.appender.MMMLog.layout.ConversionPattern   = %d %5p %m%n
+
+ 		log4perl.appender.MailFatal                         = Log::Dispatch::Email::MailSend
+ 		log4perl.appender.MailFatal.Threshold               = FATAL 
 	";
 	Log::Log4perl->init(\$conf);
 

mysql-mmm-2.0.10-lp473446.patch:
 Angel.pm |   23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

--- NEW FILE mysql-mmm-2.0.10-lp473446.patch ---
https://bugs.launchpad.net/mysql-mmm/+bug/473446

--- mysql-mmm/lib/Common/Angel.pm	2009-11-17 11:35:20.000000000 -0600
+++ angel-infinit-failures/lib/Common/Angel.pm	2009-11-17 11:32:32.000000000 -0600
@@ -10,12 +10,17 @@
 
 our $start_process;
 our $pid;
+our $attempts;
+our $starttime;
+
 
 sub Init($) { 
 	my $pidfile = shift;
 
 	
 	$MMM::Common::Angel::start_process	= 1;
+	$MMM::Common::Angel::attempts		= 0;
+	$MMM::Common::Angel::starttime		= time();
 	my $is_shutdown	= 0;
 
 	$pidfile->create() if (defined($pidfile));
@@ -25,6 +30,7 @@
 	local $SIG{QUIT}	= \&MMM::Common::Angel::SignalHandler;
 
 	do {
+		$MMM::Common::Angel::attempts++;
 
 		if ($MMM::Common::Angel::start_process) {
 			$MMM::Common::Angel::start_process = 0;
@@ -41,6 +47,9 @@
 
 		# Wait for child to exit
 		if (waitpid($MMM::Common::Angel::pid, 0) == -1) {
+			# child exited clean, reset attempts and starttime
+			$MMM::Common::Angel::attempts = 0;
+			$MMM::Common::Angel::starttime = time();
 			if ($ERRNO{ECHLD}) {
 				$is_shutdown = 1 unless ($MMM::Common::Angel::start_process);
 			}
@@ -52,8 +61,18 @@
 					$is_shutdown = 1;
 				}
 				else {
-					FATAL sprintf("Child exited with exitcode %s, restarting", WEXITSTATUS($?));
-					$MMM::Common::Angel::start_process	= 1;
+					my $now = time();
+					my $diff = $now - $MMM::Common::Angel::starttime;
+					if ($MMM::Common::Angel::attempts >= 10 && $diff < 300) {
+						FATAL sprintf("Child exited with exitcode %s and has failed more than 10 times consecutively in the last 5 minutes, not restarting", WEXITSTATUS($?));
+						$MMM::Common::Angel::start_process	= 0;
+						$is_shutdown = 1;
+					}
+					else {
+						FATAL sprintf("Child exited with exitcode %s, restarting after 10 second sleep", WEXITSTATUS($?));
+						sleep(10);
+						$MMM::Common::Angel::start_process	= 1;
+					}
 				}
 			}
 			if (WIFSIGNALED($CHILD_ERROR)) {

mysql-mmm-2.0.9-configs.patch:
 mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf |    4 ++
 mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf   |   22 ++++++++-----
 mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf |   44 +++++++++++---------------
 mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf  |   42 ++++++++++++------------
 4 files changed, 60 insertions(+), 52 deletions(-)

--- NEW FILE mysql-mmm-2.0.9-configs.patch ---
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf	2009-11-03 12:47:50.000000000 -0600
@@ -1,45 +1,41 @@
-active_master_role	writer
-
+active_master_role      writer
 
 <host default>
-	cluster_interface		eth0
-
-	pid_path				/var/run/mmmd_agent.pid
-	bin_path				/usr/bin/mysql-mmm/
-
+    cluster_interface       eth0
+    pid_path                /var/run/mysql-mmm/mmmd_agent.pid
+    bin_path                /usr/libexec/mysql-mmm/
     replication_user        replication
     replication_password    slave
-
-	agent_user				mmm_agent
-	agent_password			RepAgent
+    agent_user              mmm_agent
+    agent_password          RepAgent
 </host>
 
 <host db1>
-	ip						192.168.0.31
-	mode					master
-	peer					db2
+    ip      192.168.0.31
+    mode    master
+    peer    db2
 </host>
 
 <host db2>
-	ip						192.168.0.32
-	mode					master
-	peer					db1
+    ip      192.168.0.32
+    mode    master
+    peer    db1
 </host>
 
 <host db3>
-	ip						192.168.0.33
-	mode					slave
+    ip      192.168.0.33
+    mode    slave
 </host>
 
 
 <role writer>
-	hosts					db1, db2
-	ips						192.168.0.50
-	mode					exclusive
+    hosts   db1, db2
+    ips     192.168.0.50
+    mode    exclusive
 </role>
 
 <role reader>
-	hosts					db1, db2, db3
-	ips						192.168.0.51, 192.168.0.52, 192.168.0.53
-	mode					balanced
+    hosts   db1, db2, db3
+    ips     192.168.0.51, 192.168.0.52, 192.168.0.53
+    mode    balanced
 </role>
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf	2009-11-03 12:51:47.000000000 -0600
@@ -1,43 +1,43 @@
 include mmm_agent.conf
 
-default_copy_method			scp
-clone_dirs					data, logs
+default_copy_method         scp
+clone_dirs                  data, logs
 
 <host default>
-	ssh_user				root
+    ssh_user                root
 
-    lvm_snapshot_size		1G
-    lvm_logical_volume		mysql
-    lvm_volume_group		storage
-    lvm_mount_dir			/mmm_snapshot
-    lvm_mount_opts			-orw,nouuid
+    lvm_snapshot_size       1G
+    lvm_logical_volume      mysql
+    lvm_volume_group        storage
+    lvm_mount_dir           /mmm_snapshot
+    lvm_mount_opts          -orw,nouuid
 
-	tools_user				mmm_tools
-	tools_password			RepTools
+    tools_user              mmm_tools
+    tools_password          RepTools
 
-	backup_dir				/mmm_backup
-	restore_dir				/mysql
+    backup_dir              /mmm_backup
+    restore_dir             /mysql
 </host>
 
 
 <copy_method scp>
     backup_command scp -c blowfish -r %SSH_USER%@%IP%:%SNAPSHOT%/%CLONE_DIR% %DEST_DIR%/
     restore_command cp -axv %BACKUP_DIR%/* %DEST_DIR%/
-	true_copy 1
+    true_copy 1
 </copy_method>
 
 <copy_method rdiff>
-	backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
-	restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
-	incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
-	single_run 1
-	incremental 1
+    backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
+    restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
+    incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
+    single_run 1
+    incremental 1
 </copy_method>
 
 <copy_method ssh-gz>
-	backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
-	restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
-	single_run 1
+    backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
+    restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
+    single_run 1
 </copy_method>
 
 
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf	2009-11-03 17:29:11.000000000 -0600
@@ -1,2 +1,6 @@
 include mmm_common.conf
+
+# The 'this' variable refers to this server.  Proper operation requires 
+# that 'this' server (db1 by default), as well as all other servers, have the 
+# proper IP addresses set in mmm_common.conf.
 this db1
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf	2009-11-03 17:54:12.000000000 -0600
@@ -1,16 +1,24 @@
 include mmm_common.conf
 
 <monitor>
-	ip						127.0.0.1
-	pid_path				/var/run/mmmd_mon.pid
-	bin_path				/usr/bin/mysql-mmm/
-	status_path				/var/lib/misc/mmmd_mon.status
-	ping_ips				192.168.0.1, 192.168.0.2, 192.168.0.3
+    ip                  127.0.0.1
+    pid_path            /var/run/mysql-mmm/mmmd_mon.pid
+    bin_path            /usr/libexec/mysql-mmm
+    status_path         /var/lib/mysql-mmm/mmmd_mon.status
+    ping_ips            192.168.0.1, 192.168.0.2, 192.168.0.3
+    auto_set_online     60
+
+    # The kill_host_bin does not exist by default, though the monitor will
+    # throw a warning about it missing.  See the section 5.10 "Kill Host 
+    # Functionality" in the PDF documentation.
+    #
+    # kill_host_bin     /usr/libexec/mysql-mmm/monitor/kill_host
+    #
 </monitor>
 
 <host default>
-	monitor_user			mmm_monitor
-	monitor_password		RepMonitor
+    monitor_user        mmm_monitor
+    monitor_password    RepMonitor
 </host>
 
 debug 0

mysql-mmm-2.0.9-paths.patch:
 Makefile                     |    2 +-
 etc/init.d/mysql-mmm-agent   |    6 +++---
 etc/init.d/mysql-mmm-monitor |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE mysql-mmm-2.0.9-paths.patch ---
--- mysql-mmm-2.0.9/etc/init.d/mysql-mmm-monitor.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/init.d/mysql-mmm-monitor	2009-10-19 22:40:05.000000000 -0500
@@ -6,8 +6,8 @@
 # chkconfig: - 64 36
 # description:  MMM Monitor.
 # processname: mmmd_mon
-# config: /etc/mmm_mon.conf
-# pidfile: /var/run/mmmd_mon.pid
+# config: /etc/mysql-mmm/mmm_mon.conf
+# pidfile: /var/run/mysql-mmm/mmmd_mon.pid
 
 # Cluster name (it can be empty for default cases)
 CLUSTER=''
@@ -17,10 +17,10 @@
 # Paths
 if [ "$CLUSTER" != "" ]; then
     MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
-    MMMD_MON_PIDFILE="/var/run/mmmd_mon-$CLUSTER.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
 else 
     MMMD_MON_BIN="/usr/sbin/mmmd_mon"
-    MMMD_MON_PIDFILE="/var/run/mmmd_mon.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
 fi
 
 echo "Daemon bin: '$MMMD_MON_BIN'"
--- mysql-mmm-2.0.9/etc/init.d/mysql-mmm-agent.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/init.d/mysql-mmm-agent	2009-10-19 22:39:37.000000000 -0500
@@ -6,12 +6,12 @@
 # chkconfig: - 64 36
 # description:  MMM Agent.
 # processname: mmmd_agent
-# config: /etc/mmm_agent.conf
-# pidfile: /var/run/mmmd_agent.pid
+# config: /etc/mysql-mmm/mmm_agent.conf
+# pidfile: /var/run/mysql-mmm/mmmd_agent.pid
 
 # Paths
 MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
-MMMD_AGENT_PIDFILE="/var/run/mmmd_agent.pid"
+MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
 
 #-----------------------------------------------------------------------
 # See how we were called.
--- mysql-mmm-2.0.9/Makefile.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/Makefile	2009-10-19 22:26:47.000000000 -0500
@@ -4,7 +4,7 @@
 endif
 
 MODULEDIR = $(DESTDIR)$(shell eval "`perl -V:${INSTALLDIR}`"; echo "$$${INSTALLDIR}")/MMM
-BINDIR    = $(DESTDIR)/usr/bin/mysql-mmm
+BINDIR    = $(DESTDIR)/usr/libexec/mysql-mmm
 SBINDIR   = $(DESTDIR)/usr/sbin
 LOGDIR    = $(DESTDIR)/var/log/mysql-mmm
 ETCDIR    = $(DESTDIR)/etc


--- NEW FILE mysql-mmm-agent.init ---
#!/bin/sh
#
# mysql-mmm-agent    This shell script takes care of starting and stopping
#                    the mmm agent daemon.
#
# chkconfig: - 64 36
# description:  MMM Agent.
# processname: mmmd_agent
# config: /etc/mysql-mmm/mmm_agent.conf
# pidfile: /var/run/mysql-mmm/mmmd_agent.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Paths
MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
LOCKFILE='/var/lock/subsys/mysql-mmm-agent'
prog='MMM Agent Daemon'

start() {
        echo -n "Starting $prog: "
        if [ -s $MMMD_AGENT_PIDFILE ] && kill -0 `cat $MMMD_AGENT_PIDFILE` 2> /dev/null; then
            echo " already running."
            exit 0
        fi
        daemon $MMMD_AGENT_BIN
        RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch $LOCKFILE
        return $RETVAL
}

stop() {
        # Stop daemon.
        echo -n "Stopping $prog: "
        killproc -p $MMMD_AGENT_PIDFILE $MMMD_AGENT_BIN
        RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f $LOCKFILE
        return $RETVAL
}

case "$1" in
  start)
        start
        ;;

  stop)
        stop
        ;;

  status)
        status -p $MMMD_AGENT_PIDFILE $MMMD_AGENT_BIN
        RETVAL=$?
        ;;

  restart|reload)
        stop
        start
        ;;

  condrestart)
        if [ -f $LOCKFILE ]; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $0 {start|stop|restart|condrestart|status}"
        ;;
esac

exit $RETVAL 


--- NEW FILE mysql-mmm-monitor.init ---
#!/bin/sh
#
# mysql-mmm-monitor  This shell script takes care of starting and stopping
#                    the mmm monitoring daemon.
#
# chkconfig: - 64 36
# description:  MMM Monitor.
# processname: mmmd_mon
# config: /etc/mysql-mmm/mmm_mon.conf
# pidfile: /var/run/mysql-mmm/mmmd_mon.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Cluster name (it can be empty for default cases)
CLUSTER=''
LOCKFILE='/var/lock/subsys/mysql-mmm-monitor'
prog='MMM Monitor Daemon'

if [ "$CLUSTER" != "" ]; then
    MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
else 
    MMMD_MON_BIN="/usr/sbin/mmmd_mon"
    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
fi


start() {
        echo -n "Starting $prog: "
        if [ -s $MMMD_MON_PIDFILE ] && kill -0 `cat $MMMD_MON_PIDFILE` 2> /dev/null; then
            echo " already running."
            exit 0
        fi
        daemon $MMMD_MON_BIN
        RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch $LOCKFILE
        return $RETVAL
}

stop() {
        # Stop daemon.
        echo -n "Stopping $prog: "
        killproc -p $MMMD_MON_PIDFILE $MMMD_MON_BIN
        RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f $LOCKFILE
        return $RETVAL
}

case "$1" in
  start)
        start
        ;;

  stop)
        stop
        ;;

  status)
        status -p $MMMD_MON_PIDFILE $MMMD_MON_BIN
        RETVAL=$?
        ;;

  restart|reload)
        stop
        start
        ;;

  condrestart)
        if [ -f $LOCKFILE ]; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $0 {start|stop|restart|condrestart|status}"
        ;;
esac

exit $RETVAL 


--- NEW FILE mysql-mmm.logrotate ---
/var/log/mysql-mmm/*.log {
    daily
    missingok
    rotate 7
    compress
    delaycompress
    notifempty
    create 640 root adm
}


--- NEW FILE mysql-mmm.spec ---

Name: mysql-mmm
Version: 2.0.10 
Release: 4%{?dist}
Summary: Multi-Master Replication Manager for MySQL
License: GPLv2
URL: http://mysql-mmm.org
Group: Applications/System
Source: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}.tar.gz 
Source1: mysql-mmm.logrotate
Source2: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}-1.pdf
Source3: mysql-mmm-agent.init
Source4: mysql-mmm-monitor.init
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
BuildArch: noarch
Provides: mmm = %{version}-%{release} 
Provides: mysql-master-master = %{version}-%{release}

Patch0: mysql-mmm-2.0.9-paths.patch
Patch1: mysql-mmm-2.0.9-configs.patch 
Patch3: mysql-mmm-2.0.10-lp473446.patch
Patch4: mysql-mmm-2.0.10-default_logging.patch

%description
MMM (MySQL Master-Master Replication Manager) is a set of flexible scripts 
to perform monitoring/failover and management of MySQL Master-Master 
replication configurations (with only one node writable at any time). The 
toolset also has the ability to read balance standard master/slave 
configurations with any number of slaves, so you can use it to move virtual 
IP addresses around a group of servers depending on whether they are behind 
in replication. In addition to that, it also has scripts for data backups, 
resynchronization between nodes etc.

%package agent
Summary: MMM Database Server Agent Daemon and Libraries
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: iproute
Provides: mysql-master-master-agent = %{version}-%{release}
Provides: mmm-agent = %{version}-%{release}

%description agent
Agent daemon and libraries which run on each MySQL server and provides the 
monitoring node with a simple set of remote services.

%package monitor 
Summary: MMM Monitor Server Daemon and Libraries 
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: perl(Class::Singleton), perl(DBD::mysql) 
Provides: mysql-master-master-monitor = %{version}-%{release} 
Provides: mmm-monitor = %{version}-%{release}

%description monitor
Monitoring daemon and libraries that do all monitoring work and make all 
decisions about roles moving and so on.

%package tools 
Summary: MMM Control Scripts and Libraries
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Provides: mysql-master-master-tools = %{version}-%{release} 
Provides: mmm-tools = %{version}-%{release}

%description tools 
Scripts and libraries dedicated to management of the mmmd_mon processes 
by com- mands.

%prep
%setup -q 
cp -a %{SOURCE2} . 

# currently the README included with mysql-mmm is zero-length
cat >>README <<EOF
Full documentation can be found at:

    %{_docdir}/%{name}-%{version}/%{name}-%{version}-1.pdf
EOF


%patch0 -p1 
%patch1 -p1
%patch3 -p1
%patch4 -p1


%build
# pass

%install
rm -rf %{buildroot}

# Install
make install DESTDIR=%{buildroot}

# additional
%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d \
             %{buildroot}%{_localstatedir}/run/%{name} \
             %{buildroot}%{_localstatedir}/lib/%{name}

install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm

# place our init scripts
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor

install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor


%clean
%{__rm} -rf %{buildroot}


%post agent
if [ $1 -eq 1 ]; then 
    /sbin/chkconfig --add mysql-mmm-agent
    /sbin/chkconfig mysql-mmm-agent off 
elif [ $1 -ge 2 ]; then
    /sbin/service mysql-mmm-agent condrestart 
fi


%post monitor
if [ $1 -eq 1 ]; then 
    /sbin/chkconfig --add mysql-mmm-monitor 
    /sbin/chkconfig mysql-mmm-monitor off
elif [ $1 -ge 2 ] ; then
    /sbin/service mysql-mmm-monitor condrestart 
fi

%preun agent
if [ $1 -eq 0 ]; then
    /sbin/service mysql-mmm-agent stop > /dev/null 2>&1
    /sbin/chkconfig --del mysql-mmm-agent
fi

%preun monitor
if [ $1 -eq 0 ]; then
    /sbin/service mysql-mmm-monitor stop > /dev/null 2>&1
    /sbin/chkconfig --del mysql-mmm-monitor
fi


%files
%defattr(-,root,root,-)
%doc COPYING INSTALL README VERSION %{name}-%{version}-1.pdf 
%dir %{_sysconfdir}/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/lib/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/run/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/log/mysql-mmm
%config(noreplace) %{_sysconfdir}/logrotate.d/mysql-mmm
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_common.conf
%{perl_vendorlib}/MMM/Common

%files tools 
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/mysql-mmm/mmm_tools.conf
%{perl_vendorlib}/MMM/Tools
%{_libexecdir}/mysql-mmm/tools/
%{_sbindir}/mmm_backup
%{_sbindir}/mmm_clone
%{_sbindir}/mmm_restore

%files agent
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
%{perl_vendorlib}/MMM/Agent
%{_libexecdir}/mysql-mmm/agent/
%{_sbindir}/mmmd_agent

%files monitor
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon.conf
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
%{perl_vendorlib}/MMM/Monitor
%{_libexecdir}/mysql-mmm/monitor/
%{_sbindir}/mmmd_mon
%{_sbindir}/mmm_control


%changelog
* Fri Dec 04 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-4
- Add auto_set_online to 60 in mmm_mon.conf
- Provides full version-release for all subpackages
- Append doc location to pdf documentation in README
- Use subsys/lockfile in init scripts

* Thu Nov 19 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-3
- BuildArch: noarch
- Monitor subpackage Requires: perl(DBD::mysql)
- Provides full version-release for  mmm, mysql-master-master
- Removed redundant /var/run/mysql-mmm entry
- Use _localstatedir macro for /var/log/mysql-mmm file listing 
- Fixed logic in post and postun scripts to properly handle
  install/upgrade conditions.
- Post scripts now perform condrestart
- Added Source3: mysql-mmm-agent.init
- Added Source4: mysql-mmm-monitor.init

* Tue Nov 17 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-2
- Removed Patch2: mysql-mmm-2.0.10-sleep.patch (obsoleted by Patch3)
- Added Patch3: mysql-mmm-2.0.10-lp473446.patch
- Added Patch4: mysql-mmm-2.0.10-default_logging.patch

* Tue Nov 03 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-1
- Latest sources from upstream.
- Added Patch1: mysql-mmm-2.0.9-configs.patch 
- Added Patch2: mysql-mmm-2.0.10-sleep.patch
- Moved mmm_control under monitor package

* Mon Oct 19 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.9-1
- Starting mostly from scratch with 2.0 branch
- Added Patch0: mysql-mmm-2.0.9-patchs.patch

* Tue Oct 13 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-4
- Cleaning up rpmlint errors
- No longer require perl-DBD-MySQL

* Tue Sep 29 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.3
- Removing .rs tag (Packaging for Fedora/Epel).

* Mon Sep 28 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.2.rs
- Change subpackage -control to -tools
- No longer build or include send_arp, removing requirement of
  libnet
- Keep etc config files actually in /etc, symlink at _mmm_instdir/etc

* Thu Sep 23 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.rs
- Cleaned up spec a bit further, moved sed changes to patches
- Added Patch1: mysql-master-master-1.2.6-libnet_1.1.patch
- Added Patch2: mysql-master-master-1.2.6-paths.patch
- Explicitly require libnet >= 1.1
- Added subpackages to break up agent, monitor, and control (backup/restore)

* Mon Sep 21 2009 Andrew Garner <andrew.garner at rackspace.com> - 1.2.6-2.abg
- Added patch for http://code.google.com/p/mysql-master-master/issues/detail?id=35

* Wed Sep 02 2009 Andrew Garner <andrew.garner at rackspace.com> - 1.2.6-1.abg
- New upstream release

* Thu Jul 09 2009 Andrew Garner <andrew.garner at rackspace.com>
- Fix release string to drop out incorrect ~rs identifier
- Updated to release 5.abg

* Thu Apr 16 2009 Andrew Garner <andrew.garner at rackspace.com>
- Change /etc/init.d/mysql-mmm_{mon,agent} back to mmm_{mon,agent}
- symlink /etc/mysql-mmm to /usr/lib/mysql-mmm (not the other way around)

* Mon Apr 14 2009 Andrew Garner <andrew.garner at rackspace.com>
- Cleanup spec
- Use standard state/log paths
- Rebuild fping
- Added dist suffix
- Changed Release to 4.rs-abg

* Sun Apr 13 2009 Andrew Garner <andrew.garner at rackspace.com>
- Fix send_arp for RHEL 5.3's libnet
- Changed /usr/local/mmm to /usr/lib/mysql-mmm/
- Changed /etc/init.d/mmm_{mon,agent} to mysql-mmm_{mon,agent}
- Changed Release to 3.rs-abg

* Thu Apr 09 2009 Andrew Garner <andrew.garner at rackspace.com>
- Updating for Rackspace

* Wed Feb 25 2009 Ryan Lowe <ryan.a.lowe at percona.com>
- Initial build (I owe JayKim)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:50:10 -0000	1.1
+++ .cvsignore	14 Dec 2009 19:44:24 -0000	1.2
@@ -0,0 +1,2 @@
+mysql-mmm-2.0.10-1.pdf
+mysql-mmm-2.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:50:10 -0000	1.1
+++ sources	14 Dec 2009 19:44:24 -0000	1.2
@@ -0,0 +1,2 @@
+822a0d8819af1bcf6fb228f0ecfd3ed4  mysql-mmm-2.0.10-1.pdf
+e8b8df923eeeeae9c4f8ec5584f5023d  mysql-mmm-2.0.10.tar.gz



From sgallagh at fedoraproject.org  Mon Dec 14 19:49:49 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 14 Dec 2009 19:49:49 +0000 (UTC)
Subject: rpms/sssd/F-11 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 sssd.spec,
	1.25, 1.26
Message-ID: <20091214194949.C8BE511C00EB@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24066

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
Bouska (1):
      Add French translation to sss_client

David O'Brien (1):
      Copy-edit sssd-ipa man page

Dmitri Pal (5):
      COMMON Improvements to the trace macro
      COLLECTION Create reference to the top level collection
      COLLECTION: Cleaning FIXME comments
      INI: Cleaning FIXME comments.
      INI Correcting build warnings.

Fabian Affolter (1):
      Add German translation

G?ran Uddeborg (2):
      Add Swedish translation for sss_client
      Add Swedish translation for SSSD server

Jakub Hrozek (30):
      Fix migration script for pre-0.5 local domains
      Do not migrate Data Provider
      Free the PCRE regexp with destructor
      Do not delete users, groups outside domain range
      Add missing include
      IPA time rules parsing routines
      Fix regression in error message when deleting groups
      Assorted manpage fixes
      Make the password field configurable in NSS
      Add Simo's ipachangeconf
      SSSDChangeConf - a wrapper around ipachangeconf
      Change the upgrade script to use ipachangeconf
      Convert SSSDConfig API to ipachangeconf
      SSSDConfigAPI fixes
      upgrade_config fixes for SSSD 0.6 and later
      Split helpers for child processes
      Get TGT in a child process.
      Warn visibly about permission problems with the config file
      Better error message when there is no local domain configured
      Setup ldap child logging from IPA backend
      Check the services started against a list of known services
      Handle spaces in config parser
      Fail on nonexistent input file
      Do not start with provider=files
      Reduce code duplication between LDAP child and Kerberos child
      Change ares usage to be c-ares 1.7.0 compatible
      Import ares 1.7.0 helpers
      Don't build the SRV and TXT parsing code except for tests
      Document the failover feature in manpages
      Consolidate code for splitting strings by separator

Martin Nagy (8):
      Add missing include file to files-tests.c
      Fix a bad free in async_resolv.c
      Add DLIST_FOR_EACH() macro
      Add simple reference counting wrappers for talloc
      Add fail over utility functions
      Fix egg-info file generation in the spec file
      Add some debugging statements to fail_over and resolver
      Correctly restart server status after the timeout

Piotr Dr?g (1):
      Updating polish translation for 0.7.0

Simo Sorce (65):
      Copy option overrides.
      Read the right buffer, avoids potential segfaults
      Add IPA conf template
      Zero pointers on free
      Use standard coding practice to set last login
      Fix segfault
      Add proper support for IPA/AD schemas
      Move responsibility for entry expiration timeout
      Kill the ldap connection when we go offline
      Tidy up ipa options
      Add support to get rootDSE from the LDAP server.
      Fix segfault when SASL is not used at all
      Rename sdap_id_map to sdap_attr_map
      Make available method to quickly retrive string
      Make useful function more broadly available.
      Store the original memberof attributes if any
      Unify parse routines, use maps in generic searches
      Fix and enhance initgroups call
      Unify code to use the generic search interface
      Reorganize ldap id provider files
      Split async helpers in multiple files
      Always set last update and expire time
      Fix build
      Fix ldap driver
      Check return, zero free hostent, adhere to style
      Fix enumerations
      Fix tevent_req error checking.
      Refactor delete functions and add a few
      Add cleanup task
      Try to fix offline logins
      Fix double free case.
      Fix check_cache bug in dealing with the callback
      Change var name to make its use more clear.
      Fix crash due to uninitialized timeout variable
      Change initgroups code to use and check the cache
      Change the pam code to perform an initgroups call
      Store initgr expire time on initgr call
      Failover fixes and additions
      Better behavior on cleanup
      Correctly escape DN value.
      Add reference to sssd-krb5 man page.
      Optimize sysdb_enumgrent
      Filter by id range before actually storing entries.
      Raise some timeouts
      Add initial failover support for ldap and ipa
      Fix ticket #289
      Fix internal options numbers test
      In IPA, the realm is always the domain uppercased.
      Fix tabs
      Fix memberof plugin
      Compute and save memberuid in cache as well
      Use memberuid and not member in group enumerations
      Use the custom password field in groups too.
      Resolve nested groups also when rfc2307bis is used
      Make strdn build functions more available
      Fix nested group memberships
      Allow nesting to fix #310
      Fix bug #311, properly set callback attribute
      Change dhash API to be talloc-friendly
      dhash: Add private pointer for delete callback
      Add comments to document latest changes
      Add rebuild task to memberof plugin
      Handle the special 02 upgrade case for 04->05
      Fix for #316
      Fix for #322, update from old database versions.

Stephen Gallagher (60):
      Remove DP from example configuration
      Remove [dp] section from example config
      Fix sssd.api.conf with correct entry_cache_timeout
      Clean up warnings in dhash tests
      Make config_file_version a hidden setting in SSSDConfig API
      Remove magic_private_groups from SSSDConfig API schema
      Add support for option descriptions to SSSDConfig API
      Localize SSSDConfig strings
      Add complete pydoc for SSSDConfig API
      Add Requires: cyrus-sasl-gssapi
      Simplify debug_fn()
      Add configure check for sasl.h
      Update midpoint refresh logic to be relative to cache timeout
      Increase the sbus dispatch DEBUG level to 9
      Build files.c only for tools
      Clean up unused dependencies
      Update sssd.spec to use only the required KRB5_LIBS and NSS_LIBS
      Fix segfault on unknown user/domain
      Fix Requires: sssd-client line in specfile
      Make the sysdb user and group names case-sensitive
      Upgrade cache and local databases to case-sensitive names
      Update translatable strings
      Fix sysdb upgrade bug
      Add empty NL translation
      Only display errors in unit tests
      Update PL translation
      Update NL translation
      Make backend request type a bitfield
      Speed up user requests while offline
      Update translation strings for string freeze
      Fix bug with bad ldb pkg-config files
      Update version to 0.99.0
      Remove ELAPI from build and tarball
      Stop configuring ELAPI
      Make debug log timestamps human-readable
      Raise debug log level for LDB_DEBUG_WARNING
      Add allocation error check
      Avoid returning uninitialized result.
      Fix potential uninitialized value errors in nsssrv_cmd.c
      Fix potential uninitialized value error in responder_dp.c
      SSSDDomain.remove_provider() requires only the provider type
      Make SSSDDomain.remove_provider() remove configured options
      Run dhash tests
      Add SSSDDomain.set_name() function to SSSDConfig API
      Reduce the verbosity of the SSSDConfigTest
      Fix broken SSSDChangeConf.set() function
      Fix SSSDConfig API bugs around [de-]activation of domains
      Fix RPM spec for RHEL6
      SSSDConfig API: fix deactivate_domain()
      SSSDConfig.get_domain() should properly detect active state
      Ensure that list_active_domains returns the real value
      Properly deny id_provider=files
      Add missing options to sssd-ipa configuraion
      Add missing SSSDConfig file for IPA for make install
      Fix processing of Boolean values in SSSDConfig
      Add 'permit' and 'deny' access providers to SSSDConfig API
      Remove default for ldap_use_start_tls in IPA providers
      Run SSSDConfig tests during 'make check'
      Fix stupid copy-paste error
      Updating to version 0.99.1

Sumit Bose (45):
      store original DN with cached group objects if available
      added a ASQ search API for sysdb
      Allow sysdb_search_entry request to return more than one result
      Add AM_CFLAGS to unit tests
      Fix compiler warnings in krb5_utils-tests.
      remove old sysdb file before starting tests
      set ipa_hostname if not given in config file
      Make debug message less irritating.
      add sysdb_delete_recursive request to sysdb API
      Add sysdb_attrs_replace_name to sysdb API.
      Fix for a seg fault during recursive delete
      add replacements for missing Kerberos calls
      Check is ccache structure is initialized before calling krb5_cc_destroy
      added access module of IPA provider
      Simplify krb5 child handler
      Add check for access-time rules to ipa_access.
      Add support for host, source host and user category
      Fix inconsistent use of krb5_ccname_template
      Fixes for proxy provider
      Make 'permit' the default for the access target
      Fix option name krb5_changepw_principal
      Validate Kerberos credentials with local keytab
      Improve handling of ccache files
      Add ipa_auth
      Enhance check for remote hosts
      Add ldap_pwd_policy option
      Read KDC info from file instead from environment
      Really check return value from pam_set_item
      Use ldb modules from build root for tests
      Make ldb lib dir configurable
      Fix an internal error when cache_credentials=FALSE
      Remove unneeded debugging code
      Do not include libsss_ipa.la in rpm package
      Immediately return a krb5 change password request when offline
      Check LDAP structure before calling ldap_unbind_ext()
      Add sysdb_search_custom request
      Do not treat missing proc files as errors.
      Add basic OS detection
      Make packaging of *.egg-info files more flexible
      Try to renew Kerberos credentials
      Add checks to test the memberuid handling
      Add offline support for ipa_access
      Add dummy credentials to an empty ccache file
      Always update sysdb to the latest version
      Fix DEBUG message for sysdb_init

beckerde (1):
      Add Spanish translation

deneb (1):
      Add Italian translation for sss_client

noriko (1):
      Adding Japanese translation

raven (1):
      Update PL translation

ruigo (1):
      Add Portuguese translation





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	27 Oct 2009 20:00:56 -0000	1.13
+++ .cvsignore	14 Dec 2009 19:49:49 -0000	1.14
@@ -1 +1 @@
-sssd-0.7.1.tar.gz
+sssd-0.99.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Oct 2009 20:00:57 -0000	1.13
+++ sources	14 Dec 2009 19:49:49 -0000	1.14
@@ -1 +1 @@
-827ef46d27c54ce790d329a6b1b82586  sssd-0.7.1.tar.gz
+00468f7fe1b75e53cc3c1027f2a92902  sssd-0.99.1.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sssd.spec	27 Oct 2009 20:00:57 -0000	1.25
+++ sssd.spec	14 Dec 2009 19:49:49 -0000	1.26
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.7.1
+Version: 0.99.1
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -18,7 +18,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
-Requires: sssd-client = 0.7.1
+Requires: sssd-client = %{version}-%{release}
+Requires: cyrus-sasl-gssapi
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -27,6 +28,7 @@ Requires(postun): /sbin/service
 %define sssdstatedir %{_localstatedir}/lib/sss
 %define dbpath %{sssdstatedir}/db
 %define pipepath %{sssdstatedir}/pipes
+%define pubconfpath %{sssdstatedir}/pubconf
 
 ### Build Dependencies ###
 
@@ -35,7 +37,12 @@ BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: m4
 %{?fedora:BuildRequires: popt-devel}
-%{?rhel:BuildRequires: popt}
+%if 0%{?rhel} <= 5
+BuildRequires: popt
+%endif
+%if 0%{?rhel} >= 6
+BuildRequires: popt-devel
+%endif
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
 BuildRequires: libtdb-devel
@@ -73,10 +80,13 @@ service.
 %setup -q
 
 %build
+NSS_LIBS=-lnss3 \
+KRB5_LIBS=-lkrb5 \
 %configure \
     --without-tests \
     --with-db-path=%{dbpath} \
     --with-pipe-path=%{pipepath} \
+    --with-pubconf-path=%{pubconfpath} \
     --with-init-dir=%{_initrddir} \
     --enable-nsslibdir=/%{_lib}
 
@@ -91,9 +101,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_daemon
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
 
+# Copy default sssd.conf file
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
 install -m600 server/examples/sssd.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
-
 install -m400 server/config/etc/sssd.api.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.conf
 install -m400 server/config/etc/sssd.api.d/* $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d/
 
@@ -105,6 +115,7 @@ rm -f \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ldap.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_proxy.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_krb5.la \
+    $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ipa.la \
     $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \
     $RPM_BUILD_ROOT/%{python_sitearch}/pysss.la
 
@@ -114,6 +125,10 @@ then
     # Older versions of rpmbuild can only handle one -f option
     echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang
 fi
+for file in `ls $RPM_BUILD_ROOT/%{python_sitelib}/*.egg-info 2> /dev/null`
+do
+    echo %{python_sitelib}/`basename $file` >> sss_daemon.lang
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f sss_daemon.lang
 %defattr(-,root,root,-)
 %doc COPYING
-%attr(755,root,root) %{_initrddir}/%{name}
+%{_initrddir}/%{name}
 %{_sbindir}/sssd
 %{_sbindir}/sss_useradd
 %{_sbindir}/sss_userdel
@@ -135,6 +150,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{sssdstatedir}
 %attr(700,root,root) %dir %{dbpath}
 %attr(755,root,root) %dir %{pipepath}
+%attr(755,root,root) %dir %{pubconfpath}
 %attr(700,root,root) %dir %{pipepath}/private
 %attr(750,root,root) %dir %{_var}/log/%{name}
 %attr(700,root,root) %dir %{_sysconfdir}/sssd
@@ -156,7 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sssd_krb5_locator_plugin.8*
 %{python_sitearch}/pysss.so
 %{python_sitelib}/*.py*
-%{?fedora:%{python_sitelib}/*.egg-info}
+
 
 %files client -f sss_client.lang
 %defattr(-,root,root,-)
@@ -189,6 +205,12 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 11 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.1-1
+- New upstream bugfix release 0.99.1
+
+* Mon Nov 30 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.0-1
+- New upstream release 0.99.0
+
 * Tue Oct 27 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.1-1
 - Fix segfault in sssd_pam when cache_credentials was enabled
 - Update the sample configuration



From cdamian at fedoraproject.org  Mon Dec 14 19:50:06 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Mon, 14 Dec 2009 19:50:06 +0000 (UTC)
Subject: rpms/php-phpunit-phploc/F-11 .cvsignore, 1.2,
	1.3 php-phpunit-phploc.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091214195006.3693A11C00EB@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-phploc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24184

Modified Files:
	.cvsignore php-phpunit-phploc.spec sources 
Log Message:
upstream 1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Nov 2009 23:31:39 -0000	1.2
+++ .cvsignore	14 Dec 2009 19:50:05 -0000	1.3
@@ -1 +1 @@
-phploc-1.2.0.tgz
+phploc-1.4.0.tgz


Index: php-phpunit-phploc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/F-11/php-phpunit-phploc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-phpunit-phploc.spec	7 Nov 2009 17:50:08 -0000	1.2
+++ php-phpunit-phploc.spec	14 Dec 2009 19:50:06 -0000	1.3
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-phploc
-Version:        1.2.0
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
 Group:          Development/Libraries
@@ -19,6 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
@@ -79,12 +80,14 @@ fi
 %{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/XML.php
 %{pear_phpdir}/PHPLOC/TextUI/Command.php
 %{pear_phpdir}/PHPLOC/TextUI/Getopt.php
-%{pear_phpdir}/PHPLOC/Util/FilterIterator.php
 %{pear_phpdir}/PHPLOC/Analyser.php
 %{_bindir}/phploc
 
 
 %changelog
+* Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.4.0-1
+- upstream 1.4.0
+
 * Sat Nov 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-2
 - F-(10|11) / EL-5 compatibility
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Nov 2009 23:31:39 -0000	1.2
+++ sources	14 Dec 2009 19:50:06 -0000	1.3
@@ -1 +1 @@
-20bb7d549f3f7ff37dd1f6309a0b883a  phploc-1.2.0.tgz
+d62979533e887a0b2ce4e4b4cc14c4bb  phploc-1.4.0.tgz



From imntreal at fedoraproject.org  Mon Dec 14 19:58:37 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 19:58:37 +0000 (UTC)
Subject: File libprojectM-2.0.1.tar.bz2 uploaded to lookaside cache by
	imntreal
Message-ID: <20091214195837.11D5528ED08@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libprojectM:

30065f98c336a342c76ee448a513a718  libprojectM-2.0.1.tar.bz2



From imntreal at fedoraproject.org  Mon Dec 14 19:59:06 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 19:59:06 +0000 (UTC)
Subject: rpms/libprojectM/F-11 .cvsignore, 1.2, 1.3 import.log, 1.6,
	1.7 libprojectM-fonts.patch, 1.1, 1.2 libprojectM.spec, 1.5,
	1.6 sources, 1.2, 1.3 libprojectM-pc-libsuffix.patch, 1.1,
	NONE libprojectM-stdio.patch, 1.1, NONE
Message-ID: <20091214195906.C5FF211C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25797/F-11

Modified Files:
	.cvsignore import.log libprojectM-fonts.patch libprojectM.spec 
	sources 
Removed Files:
	libprojectM-pc-libsuffix.patch libprojectM-stdio.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Nov 2008 00:52:00 -0000	1.2
+++ .cvsignore	14 Dec 2009 19:59:06 -0000	1.3
@@ -1 +1 @@
-libprojectM-1.2.0.tar.bz2
+libprojectM-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	26 Feb 2009 01:07:00 -0000	1.6
+++ import.log	14 Dec 2009 19:59:06 -0000	1.7
@@ -4,3 +4,4 @@ libprojectM-1_2_0-6_fc10:HEAD:libproject
 libprojectM-1_2_0-7_fc10:HEAD:libprojectM-1.2.0-7.fc10.src.rpm:1231557473
 libprojectM-1_2_0-8_fc10:HEAD:libprojectM-1.2.0-8.fc10.src.rpm:1235528442
 libprojectM-1_2_0-9_fc10:HEAD:libprojectM-1.2.0-9.fc10.src.rpm:1235610375
+libprojectM-2_0_1-1_fc12:F-11:libprojectM-2.0.1-1.fc12.src.rpm:1260820718

libprojectM-fonts.patch:
 CMakeLists.txt |    2 --
 1 file changed, 2 deletions(-)

Index: libprojectM-fonts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-11/libprojectM-fonts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libprojectM-fonts.patch	7 Nov 2008 00:52:00 -0000	1.1
+++ libprojectM-fonts.patch	14 Dec 2009 19:59:06 -0000	1.2
@@ -1,24 +1,11 @@
-diff -Naur libprojectM-1.2.0-orig/CMakeLists.txt libprojectM-1.2.0/CMakeLists.txt
---- libprojectM-1.2.0-orig/CMakeLists.txt	2008-09-18 23:30:58.000000000 -0400
-+++ libprojectM-1.2.0/CMakeLists.txt	2008-09-18 23:31:14.000000000 -0400
-@@ -129,8 +129,6 @@
+--- libprojectM-1.2.0SVN12092008-orig/CMakeLists.txt	2008-12-09 00:39:53.000000000 -0500
++++ libprojectM-1.2.0SVN12092008/CMakeLists.txt	2008-12-09 00:40:13.000000000 -0500
+@@ -169,8 +169,6 @@
  
  FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
  INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
 -FILE(GLOB fonts "fonts/*.ttf")
 -INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts)
- INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+ INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
- INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PresetFrameIO.hpp PCM.hpp  DESTINATION include/libprojectM)
-#diff -Naur libprojectM-1.2.0-orig/config.inp.in libprojectM-1.2.0/config.inp.in
-#--- libprojectM-1.2.0-orig/config.inp.in	2008-09-18 23:30:58.000000000 -0400
-#+++ libprojectM-1.2.0/config.inp.in	2008-09-18 23:33:38.000000000 -0400
-#@@ -17,6 +17,6 @@
-# Aspect Correction = true	# Custom Shape Aspect Correction
-# 
-# Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
-#-Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
-#-Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
-#+Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/Vera.ttf
-#+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
-#  


Index: libprojectM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-11/libprojectM.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libprojectM.spec	26 Feb 2009 01:07:00 -0000	1.5
+++ libprojectM.spec	14 Dec 2009 19:59:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libprojectM
-Version:	1.2.0
-Release:	9%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -9,11 +9,6 @@ Source0:	http://downloads.sourceforge.ne
 #Remove fonts from package:
 Patch0:		libprojectM-fonts.patch
 
-#Add LIB_SUFFIX to libprojectM.pc.in
-Patch1:		libprojectM-pc-libsuffix.patch
-
-#Add include stdio.h in BuiltinParams.cpp to fix compile error
-Patch2:		libprojectM-stdio.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ftgl-devel, cmake, glew-devel
 Requires:	dejavu-sans-mono-fonts, dejavu-sans-fonts
@@ -37,8 +32,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 sed -i 's/\r//' ChangeLog
 
 %build
@@ -75,6 +68,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- SVN Release to prepare for v2
+
 * Wed Feb 25 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0-9
 - Aparently stdio.h didn't need to be included in BuiltinParams.cpp before, but is now
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Nov 2008 00:52:00 -0000	1.2
+++ sources	14 Dec 2009 19:59:06 -0000	1.3
@@ -1 +1 @@
-3bb7abb0f2d929780851bad1ca4fd045  libprojectM-1.2.0.tar.bz2
+30065f98c336a342c76ee448a513a718  libprojectM-2.0.1.tar.bz2


--- libprojectM-pc-libsuffix.patch DELETED ---


--- libprojectM-stdio.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 19:59:50 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 19:59:50 +0000 (UTC)
Subject: rpms/libprojectM/F-12 .cvsignore, 1.2, 1.3 import.log, 1.6,
	1.7 libprojectM-fonts.patch, 1.1, 1.2 libprojectM.spec, 1.7,
	1.8 sources, 1.2, 1.3 libprojectM-ftgl.patch, 1.1,
	NONE libprojectM-pc-libsuffix.patch, 1.1,
	NONE libprojectM-stdio.patch, 1.1, NONE
Message-ID: <20091214195950.A638411C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26164/F-12

Modified Files:
	.cvsignore import.log libprojectM-fonts.patch libprojectM.spec 
	sources 
Removed Files:
	libprojectM-ftgl.patch libprojectM-pc-libsuffix.patch 
	libprojectM-stdio.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Nov 2008 00:52:00 -0000	1.2
+++ .cvsignore	14 Dec 2009 19:59:50 -0000	1.3
@@ -1 +1 @@
-libprojectM-1.2.0.tar.bz2
+libprojectM-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-12/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	26 Feb 2009 01:07:00 -0000	1.6
+++ import.log	14 Dec 2009 19:59:50 -0000	1.7
@@ -4,3 +4,4 @@ libprojectM-1_2_0-6_fc10:HEAD:libproject
 libprojectM-1_2_0-7_fc10:HEAD:libprojectM-1.2.0-7.fc10.src.rpm:1231557473
 libprojectM-1_2_0-8_fc10:HEAD:libprojectM-1.2.0-8.fc10.src.rpm:1235528442
 libprojectM-1_2_0-9_fc10:HEAD:libprojectM-1.2.0-9.fc10.src.rpm:1235610375
+libprojectM-2_0_1-1_fc12:F-12:libprojectM-2.0.1-1.fc12.src.rpm:1260820774

libprojectM-fonts.patch:
 CMakeLists.txt |    2 --
 1 file changed, 2 deletions(-)

Index: libprojectM-fonts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-12/libprojectM-fonts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libprojectM-fonts.patch	7 Nov 2008 00:52:00 -0000	1.1
+++ libprojectM-fonts.patch	14 Dec 2009 19:59:50 -0000	1.2
@@ -1,24 +1,11 @@
-diff -Naur libprojectM-1.2.0-orig/CMakeLists.txt libprojectM-1.2.0/CMakeLists.txt
---- libprojectM-1.2.0-orig/CMakeLists.txt	2008-09-18 23:30:58.000000000 -0400
-+++ libprojectM-1.2.0/CMakeLists.txt	2008-09-18 23:31:14.000000000 -0400
-@@ -129,8 +129,6 @@
+--- libprojectM-1.2.0SVN12092008-orig/CMakeLists.txt	2008-12-09 00:39:53.000000000 -0500
++++ libprojectM-1.2.0SVN12092008/CMakeLists.txt	2008-12-09 00:40:13.000000000 -0500
+@@ -169,8 +169,6 @@
  
  FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
  INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
 -FILE(GLOB fonts "fonts/*.ttf")
 -INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts)
- INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+ INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
- INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PresetFrameIO.hpp PCM.hpp  DESTINATION include/libprojectM)
-#diff -Naur libprojectM-1.2.0-orig/config.inp.in libprojectM-1.2.0/config.inp.in
-#--- libprojectM-1.2.0-orig/config.inp.in	2008-09-18 23:30:58.000000000 -0400
-#+++ libprojectM-1.2.0/config.inp.in	2008-09-18 23:33:38.000000000 -0400
-#@@ -17,6 +17,6 @@
-# Aspect Correction = true	# Custom Shape Aspect Correction
-# 
-# Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
-#-Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
-#-Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
-#+Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/Vera.ttf
-#+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
-#  


Index: libprojectM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-12/libprojectM.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libprojectM.spec	29 Jul 2009 10:32:09 -0000	1.7
+++ libprojectM.spec	14 Dec 2009 19:59:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		libprojectM
-Version:	1.2.0
-Release:	11%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -9,14 +9,6 @@ Source0:	http://downloads.sourceforge.ne
 #Remove fonts from package:
 Patch0:		libprojectM-fonts.patch
 
-#Add LIB_SUFFIX to libprojectM.pc.in
-Patch1:		libprojectM-pc-libsuffix.patch
-
-#Add include stdio.h in BuiltinParams.cpp to fix compile error
-Patch2:		libprojectM-stdio.patch
-
-# FTGL.h -> ftgl.h to compile
-Patch3:		libprojectM-ftgl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ftgl-devel, cmake, glew-devel
 Requires:	dejavu-sans-mono-fonts, dejavu-sans-fonts
@@ -40,9 +32,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 sed -i 's/\r//' ChangeLog
 
 %build
@@ -79,11 +68,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Jul 29 2009 Caol?n McNamara <caolanm at redhat.com> - 1.2.0-11
-- Resolves: rhbz#511587 FTBFS libprojectM
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- SVN Release to prepare for v2
 
 * Wed Feb 25 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0-9
 - Aparently stdio.h didn't need to be included in BuiltinParams.cpp before, but is now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Nov 2008 00:52:00 -0000	1.2
+++ sources	14 Dec 2009 19:59:50 -0000	1.3
@@ -1 +1 @@
-3bb7abb0f2d929780851bad1ca4fd045  libprojectM-1.2.0.tar.bz2
+30065f98c336a342c76ee448a513a718  libprojectM-2.0.1.tar.bz2


--- libprojectM-ftgl.patch DELETED ---


--- libprojectM-pc-libsuffix.patch DELETED ---


--- libprojectM-stdio.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:00:34 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:00:34 +0000 (UTC)
Subject: rpms/libprojectM/devel .cvsignore, 1.2, 1.3 import.log, 1.6,
	1.7 libprojectM-fonts.patch, 1.1, 1.2 libprojectM.spec, 1.7,
	1.8 sources, 1.2, 1.3 libprojectM-ftgl.patch, 1.1,
	NONE libprojectM-pc-libsuffix.patch, 1.1,
	NONE libprojectM-stdio.patch, 1.1, NONE
Message-ID: <20091214200034.A176E11C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26523/devel

Modified Files:
	.cvsignore import.log libprojectM-fonts.patch libprojectM.spec 
	sources 
Removed Files:
	libprojectM-ftgl.patch libprojectM-pc-libsuffix.patch 
	libprojectM-stdio.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Nov 2008 00:52:00 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:00:34 -0000	1.3
@@ -1 +1 @@
-libprojectM-1.2.0.tar.bz2
+libprojectM-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	26 Feb 2009 01:07:00 -0000	1.6
+++ import.log	14 Dec 2009 20:00:34 -0000	1.7
@@ -4,3 +4,4 @@ libprojectM-1_2_0-6_fc10:HEAD:libproject
 libprojectM-1_2_0-7_fc10:HEAD:libprojectM-1.2.0-7.fc10.src.rpm:1231557473
 libprojectM-1_2_0-8_fc10:HEAD:libprojectM-1.2.0-8.fc10.src.rpm:1235528442
 libprojectM-1_2_0-9_fc10:HEAD:libprojectM-1.2.0-9.fc10.src.rpm:1235610375
+libprojectM-2_0_1-1_fc12:HEAD:libprojectM-2.0.1-1.fc12.src.rpm:1260820819

libprojectM-fonts.patch:
 CMakeLists.txt |    2 --
 1 file changed, 2 deletions(-)

Index: libprojectM-fonts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/libprojectM-fonts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libprojectM-fonts.patch	7 Nov 2008 00:52:00 -0000	1.1
+++ libprojectM-fonts.patch	14 Dec 2009 20:00:34 -0000	1.2
@@ -1,24 +1,11 @@
-diff -Naur libprojectM-1.2.0-orig/CMakeLists.txt libprojectM-1.2.0/CMakeLists.txt
---- libprojectM-1.2.0-orig/CMakeLists.txt	2008-09-18 23:30:58.000000000 -0400
-+++ libprojectM-1.2.0/CMakeLists.txt	2008-09-18 23:31:14.000000000 -0400
-@@ -129,8 +129,6 @@
+--- libprojectM-1.2.0SVN12092008-orig/CMakeLists.txt	2008-12-09 00:39:53.000000000 -0500
++++ libprojectM-1.2.0SVN12092008/CMakeLists.txt	2008-12-09 00:40:13.000000000 -0500
+@@ -169,8 +169,6 @@
  
  FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
  INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
 -FILE(GLOB fonts "fonts/*.ttf")
 -INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts)
- INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+ INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
- INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PresetFrameIO.hpp PCM.hpp  DESTINATION include/libprojectM)
-#diff -Naur libprojectM-1.2.0-orig/config.inp.in libprojectM-1.2.0/config.inp.in
-#--- libprojectM-1.2.0-orig/config.inp.in	2008-09-18 23:30:58.000000000 -0400
-#+++ libprojectM-1.2.0/config.inp.in	2008-09-18 23:33:38.000000000 -0400
-#@@ -17,6 +17,6 @@
-# Aspect Correction = true	# Custom Shape Aspect Correction
-# 
-# Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
-#-Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
-#-Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
-#+Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/Vera.ttf
-#+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
-#  


Index: libprojectM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/libprojectM.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libprojectM.spec	29 Jul 2009 10:32:09 -0000	1.7
+++ libprojectM.spec	14 Dec 2009 20:00:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		libprojectM
-Version:	1.2.0
-Release:	11%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -9,14 +9,6 @@ Source0:	http://downloads.sourceforge.ne
 #Remove fonts from package:
 Patch0:		libprojectM-fonts.patch
 
-#Add LIB_SUFFIX to libprojectM.pc.in
-Patch1:		libprojectM-pc-libsuffix.patch
-
-#Add include stdio.h in BuiltinParams.cpp to fix compile error
-Patch2:		libprojectM-stdio.patch
-
-# FTGL.h -> ftgl.h to compile
-Patch3:		libprojectM-ftgl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ftgl-devel, cmake, glew-devel
 Requires:	dejavu-sans-mono-fonts, dejavu-sans-fonts
@@ -40,9 +32,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 sed -i 's/\r//' ChangeLog
 
 %build
@@ -79,11 +68,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Jul 29 2009 Caol?n McNamara <caolanm at redhat.com> - 1.2.0-11
-- Resolves: rhbz#511587 FTBFS libprojectM
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- SVN Release to prepare for v2
 
 * Wed Feb 25 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0-9
 - Aparently stdio.h didn't need to be included in BuiltinParams.cpp before, but is now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Nov 2008 00:52:00 -0000	1.2
+++ sources	14 Dec 2009 20:00:34 -0000	1.3
@@ -1 +1 @@
-3bb7abb0f2d929780851bad1ca4fd045  libprojectM-1.2.0.tar.bz2
+30065f98c336a342c76ee448a513a718  libprojectM-2.0.1.tar.bz2


--- libprojectM-ftgl.patch DELETED ---


--- libprojectM-pc-libsuffix.patch DELETED ---


--- libprojectM-stdio.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:02:07 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:02:07 +0000 (UTC)
Subject: File libprojectM-qt-2.0.1.tar.bz2 uploaded to lookaside cache by
	imntreal
Message-ID: <20091214200207.E7EA028ECD1@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libprojectM-qt:

e004edadf8aa3ae7e089c108e1982725  libprojectM-qt-2.0.1.tar.bz2



From imntreal at fedoraproject.org  Mon Dec 14 20:02:26 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:02:26 +0000 (UTC)
Subject: rpms/libprojectM-qt/F-11 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 libprojectM-qt.spec, 1.3, 1.4 sources, 1.2,
	1.3 libprojectM-qt-pc-libsuffix.patch, 1.1, NONE
Message-ID: <20091214200226.B6B4811C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM-qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27032/F-11

Modified Files:
	.cvsignore import.log libprojectM-qt.spec sources 
Removed Files:
	libprojectM-qt-pc-libsuffix.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 23:30:35 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:02:26 -0000	1.3
@@ -1 +1 @@
-libprojectM-qt-1.2.0.tar.bz2
+libprojectM-qt-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Nov 2008 06:13:07 -0000	1.2
+++ import.log	14 Dec 2009 20:02:26 -0000	1.3
@@ -1,2 +1,3 @@
 libprojectM-qt-1_2_0-3_fc9:HEAD:libprojectM-qt-1.2.0-3.fc9.src.rpm:1226187012
 libprojectM-qt-1_2_0-4_fc9:HEAD:libprojectM-qt-1.2.0-4.fc9.src.rpm:1226211154
+libprojectM-qt-2_0_1-1_fc12:F-11:libprojectM-qt-2.0.1-1.fc12.src.rpm:1260820929


Index: libprojectM-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/F-11/libprojectM-qt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libprojectM-qt.spec	25 Feb 2009 17:38:16 -0000	1.3
+++ libprojectM-qt.spec	14 Dec 2009 20:02:26 -0000	1.4
@@ -1,14 +1,11 @@
 Name:		libprojectM-qt
-Version:	1.2.0
-Release:	5%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The Qt frontend to the projectM visualization plugin
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Patch to correct libsuffix in the pc file:
-Patch0:		libprojectM-qt-pc-libsuffix.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, qt4-devel, libprojectM-devel = %{version}
 
@@ -31,7 +28,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} .
@@ -65,6 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Nov 2008 23:30:35 -0000	1.2
+++ sources	14 Dec 2009 20:02:26 -0000	1.3
@@ -1 +1 @@
-3b741fb6a2874d8d726e3b615f2d7a60  libprojectM-qt-1.2.0.tar.bz2
+e004edadf8aa3ae7e089c108e1982725  libprojectM-qt-2.0.1.tar.bz2


--- libprojectM-qt-pc-libsuffix.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:03:00 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:03:00 +0000 (UTC)
Subject: rpms/libprojectM-qt/F-12 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 libprojectM-qt.spec, 1.6, 1.7 sources, 1.2,
	1.3 libprojectM-qt-pc-libsuffix.patch, 1.1, NONE
Message-ID: <20091214200300.1B78F11C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM-qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27394/F-12

Modified Files:
	.cvsignore import.log libprojectM-qt.spec sources 
Removed Files:
	libprojectM-qt-pc-libsuffix.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 23:30:35 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:02:59 -0000	1.3
@@ -1 +1 @@
-libprojectM-qt-1.2.0.tar.bz2
+libprojectM-qt-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Nov 2008 06:13:07 -0000	1.2
+++ import.log	14 Dec 2009 20:02:59 -0000	1.3
@@ -1,2 +1,3 @@
 libprojectM-qt-1_2_0-3_fc9:HEAD:libprojectM-qt-1.2.0-3.fc9.src.rpm:1226187012
 libprojectM-qt-1_2_0-4_fc9:HEAD:libprojectM-qt-1.2.0-4.fc9.src.rpm:1226211154
+libprojectM-qt-2_0_1-1_fc12:F-12:libprojectM-qt-2.0.1-1.fc12.src.rpm:1260820964


Index: libprojectM-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/F-12/libprojectM-qt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libprojectM-qt.spec	20 Sep 2009 18:05:13 -0000	1.6
+++ libprojectM-qt.spec	14 Dec 2009 20:03:00 -0000	1.7
@@ -1,14 +1,11 @@
 Name:		libprojectM-qt
-Version:	1.2.0
-Release:	7%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The Qt frontend to the projectM visualization plugin
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Patch to correct libsuffix in the pc file:
-Patch0:		libprojectM-qt-pc-libsuffix.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, qt4-devel, libprojectM-devel = %{version}
 
@@ -20,7 +17,7 @@ preset playlists for projectM-jack and p
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}, pkgconfig, libprojectM-devel, qt4-devel
+Requires:	%{name} = %{version}-%{release}, pkgconfig, libprojectM-devel, qt-devel
 
 %description	devel
 projectM-qt is a GUI designed to enhance the projectM user and preset writer
@@ -31,17 +28,15 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{cmake} .
-
-make %{?_smp_mflags} 
+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} .
+make %{?_smp_mflags} VERBOSE=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install/fast DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -55,24 +50,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libprojectM-qt.so.1*
+%{_libdir}/*.so.*
 %{_datadir}/pixmaps/prjm16-transparent.svg
 
 %files devel
 %defattr(-,root,root,-)
 %doc ReadMe
-%{_includedir}/libprojectM-qt/
-%{_libdir}/libprojectM-qt.so
-%{_libdir}/pkgconfig/libprojectM-qt.pc
+%{_includedir}/%{name}
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-7
-- cleanup %%cmake macro usage
-- %%files: track file and sonames closer
-- FTBFS libprojectM-qt-1.2.0-5.fc11 (#511744)
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Nov 2008 23:30:35 -0000	1.2
+++ sources	14 Dec 2009 20:03:00 -0000	1.3
@@ -1 +1 @@
-3b741fb6a2874d8d726e3b615f2d7a60  libprojectM-qt-1.2.0.tar.bz2
+e004edadf8aa3ae7e089c108e1982725  libprojectM-qt-2.0.1.tar.bz2


--- libprojectM-qt-pc-libsuffix.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:03:38 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:03:38 +0000 (UTC)
Subject: rpms/libprojectM-qt/devel .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 libprojectM-qt.spec, 1.6, 1.7 sources, 1.2,
	1.3 libprojectM-qt-pc-libsuffix.patch, 1.1, NONE
Message-ID: <20091214200338.7D2F111C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27638/devel

Modified Files:
	.cvsignore import.log libprojectM-qt.spec sources 
Removed Files:
	libprojectM-qt-pc-libsuffix.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 23:30:35 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:03:38 -0000	1.3
@@ -1 +1 @@
-libprojectM-qt-1.2.0.tar.bz2
+libprojectM-qt-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Nov 2008 06:13:07 -0000	1.2
+++ import.log	14 Dec 2009 20:03:38 -0000	1.3
@@ -1,2 +1,3 @@
 libprojectM-qt-1_2_0-3_fc9:HEAD:libprojectM-qt-1.2.0-3.fc9.src.rpm:1226187012
 libprojectM-qt-1_2_0-4_fc9:HEAD:libprojectM-qt-1.2.0-4.fc9.src.rpm:1226211154
+libprojectM-qt-2_0_1-1_fc12:HEAD:libprojectM-qt-2.0.1-1.fc12.src.rpm:1260821001


Index: libprojectM-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/devel/libprojectM-qt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libprojectM-qt.spec	20 Sep 2009 18:05:13 -0000	1.6
+++ libprojectM-qt.spec	14 Dec 2009 20:03:38 -0000	1.7
@@ -1,14 +1,11 @@
 Name:		libprojectM-qt
-Version:	1.2.0
-Release:	7%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The Qt frontend to the projectM visualization plugin
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Patch to correct libsuffix in the pc file:
-Patch0:		libprojectM-qt-pc-libsuffix.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, qt4-devel, libprojectM-devel = %{version}
 
@@ -20,7 +17,7 @@ preset playlists for projectM-jack and p
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}, pkgconfig, libprojectM-devel, qt4-devel
+Requires:	%{name} = %{version}-%{release}, pkgconfig, libprojectM-devel, qt-devel
 
 %description	devel
 projectM-qt is a GUI designed to enhance the projectM user and preset writer
@@ -31,17 +28,15 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{cmake} .
-
-make %{?_smp_mflags} 
+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} .
+make %{?_smp_mflags} VERBOSE=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install/fast DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -55,24 +50,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libprojectM-qt.so.1*
+%{_libdir}/*.so.*
 %{_datadir}/pixmaps/prjm16-transparent.svg
 
 %files devel
 %defattr(-,root,root,-)
 %doc ReadMe
-%{_includedir}/libprojectM-qt/
-%{_libdir}/libprojectM-qt.so
-%{_libdir}/pkgconfig/libprojectM-qt.pc
+%{_includedir}/%{name}
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-7
-- cleanup %%cmake macro usage
-- %%files: track file and sonames closer
-- FTBFS libprojectM-qt-1.2.0-5.fc11 (#511744)
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Nov 2008 23:30:35 -0000	1.2
+++ sources	14 Dec 2009 20:03:38 -0000	1.3
@@ -1 +1 @@
-3b741fb6a2874d8d726e3b615f2d7a60  libprojectM-qt-1.2.0.tar.bz2
+e004edadf8aa3ae7e089c108e1982725  libprojectM-qt-2.0.1.tar.bz2


--- libprojectM-qt-pc-libsuffix.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:04:16 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:04:16 +0000 (UTC)
Subject: File projectM-jack-2.0.1.tar.bz2 uploaded to lookaside cache by
	imntreal
Message-ID: <20091214200416.6EAF628ECD1@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for projectM-jack:

b3045573298c99893376bd0bbb3a0310  projectM-jack-2.0.1.tar.bz2



From imntreal at fedoraproject.org  Mon Dec 14 20:04:37 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:04:37 +0000 (UTC)
Subject: rpms/projectM-jack/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 projectM-jack.spec, 1.2, 1.3 sources, 1.2,
	1.3 projectM-jack.desktop.patch, 1.1, NONE
Message-ID: <20091214200437.4F2BF11C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-jack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28008/F-11

Modified Files:
	.cvsignore import.log projectM-jack.spec sources 
Removed Files:
	projectM-jack.desktop.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2008 06:25:04 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:04:37 -0000	1.3
@@ -1 +1 @@
-projectM-jack-1.2.0.tar.bz2
+projectM-jack-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Nov 2008 06:25:04 -0000	1.1
+++ import.log	14 Dec 2009 20:04:37 -0000	1.2
@@ -1 +1,2 @@
 projectM-jack-1_2_0-4_fc9:HEAD:projectM-jack-1.2.0-4.fc9.src.rpm:1226643863
+projectM-jack-2_0_1-1_fc12:F-11:projectM-jack-2.0.1-1.fc12.src.rpm:1260821058


Index: projectM-jack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/F-11/projectM-jack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- projectM-jack.spec	27 Feb 2009 02:30:32 -0000	1.2
+++ projectM-jack.spec	14 Dec 2009 20:04:37 -0000	1.3
@@ -1,14 +1,11 @@
 Name:		projectM-jack
-Version:	1.2.0
-Release:	5%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for jack
 Group:		Applications/Multimedia
 License:	GPLv2+ and MIT
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Fix up .desktop file:
-Patch0:		projectM-jack.desktop.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, libprojectM-qt-devel, jack-audio-connection-kit-devel, desktop-file-utils
 
@@ -18,7 +15,6 @@ JACK compatible applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %cmake .
@@ -42,6 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2008 06:25:05 -0000	1.2
+++ sources	14 Dec 2009 20:04:37 -0000	1.3
@@ -1 +1 @@
-0b033d8535fe7959ccfa4fc6c431ce58  projectM-jack-1.2.0.tar.bz2
+b3045573298c99893376bd0bbb3a0310  projectM-jack-2.0.1.tar.bz2


--- projectM-jack.desktop.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:05:12 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:05:12 +0000 (UTC)
Subject: rpms/projectM-jack/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 projectM-jack.spec, 1.3, 1.4 sources, 1.2,
	1.3 projectM-jack.desktop.patch, 1.1, NONE
Message-ID: <20091214200512.62B3611C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-jack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28267/F-12

Modified Files:
	.cvsignore import.log projectM-jack.spec sources 
Removed Files:
	projectM-jack.desktop.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2008 06:25:04 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:05:12 -0000	1.3
@@ -1 +1 @@
-projectM-jack-1.2.0.tar.bz2
+projectM-jack-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Nov 2008 06:25:04 -0000	1.1
+++ import.log	14 Dec 2009 20:05:12 -0000	1.2
@@ -1 +1,2 @@
 projectM-jack-1_2_0-4_fc9:HEAD:projectM-jack-1.2.0-4.fc9.src.rpm:1226643863
+projectM-jack-2_0_1-1_fc12:F-12:projectM-jack-2.0.1-1.fc12.src.rpm:1260821095


Index: projectM-jack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/F-12/projectM-jack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- projectM-jack.spec	26 Jul 2009 19:28:48 -0000	1.3
+++ projectM-jack.spec	14 Dec 2009 20:05:12 -0000	1.4
@@ -1,14 +1,11 @@
 Name:		projectM-jack
-Version:	1.2.0
-Release:	6%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for jack
 Group:		Applications/Multimedia
 License:	GPLv2+ and MIT
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Fix up .desktop file:
-Patch0:		projectM-jack.desktop.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, libprojectM-qt-devel, jack-audio-connection-kit-devel, desktop-file-utils
 
@@ -18,7 +15,6 @@ JACK compatible applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %cmake .
@@ -42,8 +38,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2008 06:25:05 -0000	1.2
+++ sources	14 Dec 2009 20:05:12 -0000	1.3
@@ -1 +1 @@
-0b033d8535fe7959ccfa4fc6c431ce58  projectM-jack-1.2.0.tar.bz2
+b3045573298c99893376bd0bbb3a0310  projectM-jack-2.0.1.tar.bz2


--- projectM-jack.desktop.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:05:48 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:05:48 +0000 (UTC)
Subject: rpms/projectM-jack/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 projectM-jack.spec, 1.3, 1.4 sources, 1.2,
	1.3 projectM-jack.desktop.patch, 1.1, NONE
Message-ID: <20091214200548.52AB811C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-jack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28547/devel

Modified Files:
	.cvsignore import.log projectM-jack.spec sources 
Removed Files:
	projectM-jack.desktop.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2008 06:25:04 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:05:48 -0000	1.3
@@ -1 +1 @@
-projectM-jack-1.2.0.tar.bz2
+projectM-jack-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Nov 2008 06:25:04 -0000	1.1
+++ import.log	14 Dec 2009 20:05:48 -0000	1.2
@@ -1 +1,2 @@
 projectM-jack-1_2_0-4_fc9:HEAD:projectM-jack-1.2.0-4.fc9.src.rpm:1226643863
+projectM-jack-2_0_1-1_fc12:HEAD:projectM-jack-2.0.1-1.fc12.src.rpm:1260821133


Index: projectM-jack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/devel/projectM-jack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- projectM-jack.spec	26 Jul 2009 19:28:48 -0000	1.3
+++ projectM-jack.spec	14 Dec 2009 20:05:48 -0000	1.4
@@ -1,14 +1,11 @@
 Name:		projectM-jack
-Version:	1.2.0
-Release:	6%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for jack
 Group:		Applications/Multimedia
 License:	GPLv2+ and MIT
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Fix up .desktop file:
-Patch0:		projectM-jack.desktop.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, libprojectM-qt-devel, jack-audio-connection-kit-devel, desktop-file-utils
 
@@ -18,7 +15,6 @@ JACK compatible applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %cmake .
@@ -42,8 +38,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-jack/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2008 06:25:05 -0000	1.2
+++ sources	14 Dec 2009 20:05:48 -0000	1.3
@@ -1 +1 @@
-0b033d8535fe7959ccfa4fc6c431ce58  projectM-jack-1.2.0.tar.bz2
+b3045573298c99893376bd0bbb3a0310  projectM-jack-2.0.1.tar.bz2


--- projectM-jack.desktop.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:06:34 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:06:34 +0000 (UTC)
Subject: File projectM-libvisual-2.0.1.tar.bz2 uploaded to lookaside cache by
	imntreal
Message-ID: <20091214200634.AA66628ECEA@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for projectM-libvisual:

8f86de90fdfc84b0c38b344b15ab8315  projectM-libvisual-2.0.1.tar.bz2



From derks at fedoraproject.org  Mon Dec 14 20:06:42 2009
From: derks at fedoraproject.org (derks)
Date: Mon, 14 Dec 2009 20:06:42 +0000 (UTC)
Subject: rpms/mysql-mmm/F-12 import.log, NONE,
	1.1 mysql-mmm-2.0.10-default_logging.patch, NONE,
	1.1 mysql-mmm-2.0.10-lp473446.patch, NONE,
	1.1 mysql-mmm-2.0.9-configs.patch, NONE,
	1.1 mysql-mmm-2.0.9-paths.patch, NONE, 1.1 mysql-mmm-agent.init,
	NONE, 1.1 mysql-mmm-monitor.init, NONE, 1.1 mysql-mmm.logrotate,
	NONE, 1.1 mysql-mmm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091214200642.A0AEC11C00EB@cvs1.fedora.phx.redhat.com>

Author: derks

Update of /cvs/pkgs/rpms/mysql-mmm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28951/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mysql-mmm-2.0.10-default_logging.patch 
	mysql-mmm-2.0.10-lp473446.patch mysql-mmm-2.0.9-configs.patch 
	mysql-mmm-2.0.9-paths.patch mysql-mmm-agent.init 
	mysql-mmm-monitor.init mysql-mmm.logrotate mysql-mmm.spec 
Log Message:
Initial import into F-12.




--- NEW FILE import.log ---
mysql-mmm-2_0_10-4:F-12:mysql-mmm-2.0.10-4.src.rpm:1260821179

mysql-mmm-2.0.10-default_logging.patch:
 Log.pm |   45 ++++++++++-----------------------------------
 1 file changed, 10 insertions(+), 35 deletions(-)

--- NEW FILE mysql-mmm-2.0.10-default_logging.patch ---
--- mysql-mmm-2.0.10/lib/Common/Log.pm.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/lib/Common/Log.pm	2009-11-17 13:04:08.000000000 -0600
@@ -31,42 +31,17 @@
 
 	# Use default configuration
 	my $conf = "
-		log4perl.logger = INFO, FileInfo, FileWarn, FileError, FileFatal, MailFatal
+		log4perl.logger = INFO, MMMLog
 
-		log4perl.appender.FileInfo                          = Log::Log4perl::Appender::File
-		log4perl.appender.FileInfo.Threshold                = INFO 
-		log4perl.appender.FileInfo.filename                 = /var/log/mysql-mmm/$progam.info
-		log4perl.appender.FileInfo.recreate                 = 1
-		log4perl.appender.FileInfo.layout                   = PatternLayout
-		log4perl.appender.FileInfo.layout.ConversionPattern = %d %5p %m%n
-
-		log4perl.appender.FileWarn                          = Log::Log4perl::Appender::File
-		log4perl.appender.FileWarn.Threshold                = WARN 
-		log4perl.appender.FileWarn.filename                 = /var/log/mysql-mmm/$progam.warn
-		log4perl.appender.FileWarn.recreate                 = 1
-		log4perl.appender.FileWarn.layout                   = PatternLayout
-		log4perl.appender.FileWarn.layout.ConversionPattern = %d %5p %m%n
-
-		log4perl.appender.FileError                         = Log::Log4perl::Appender::File
-		log4perl.appender.FileError.Threshold               = ERROR 
-		log4perl.appender.FileError.filename                = /var/log/mysql-mmm/$progam.error
-		log4perl.appender.FileError.recreate                = 1
-		log4perl.appender.FileError.layout                  = PatternLayout
-		log4perl.appender.FileError.layout.ConversionPattern= %d %5p %m%n
-
-		log4perl.appender.FileFatal                         = Log::Log4perl::Appender::File
-		log4perl.appender.FileFatal.Threshold               = FATAL 
-		log4perl.appender.FileFatal.filename                = /var/log/mysql-mmm/$progam.fatal
-		log4perl.appender.FileFatal.recreate                = 1
-		log4perl.appender.FileFatal.layout                  = PatternLayout
-		log4perl.appender.FileFatal.layout.ConversionPattern= %d %5p %m%n
-
-		log4perl.appender.MailFatal                         = Log::Dispatch::Email::MailSend
-		log4perl.appender.MailFatal.Threshold               = FATAL 
-		log4perl.appender.MailFatal.to                      = root
-		log4perl.appender.MailFatal.subject                 = FATAL error in $progam
-		log4perl.appender.MailFatal.layout                  = PatternLayout
-		log4perl.appender.MailFatal.layout.ConversionPattern= %d %m%n
+		log4perl.appender.MMMLog                            = Log::Log4perl::Appender::File
+		log4perl.appender.MMMLog.Threshold                  = INFO 
+		log4perl.appender.MMMLog.filename                   = /var/log/mysql-mmm/$progam.log
+		log4perl.appender.MMMLog.recreate                   = 1
+		log4perl.appender.MMMLog.layout                     = PatternLayout
+		log4perl.appender.MMMLog.layout.ConversionPattern   = %d %5p %m%n
+
+ 		log4perl.appender.MailFatal                         = Log::Dispatch::Email::MailSend
+ 		log4perl.appender.MailFatal.Threshold               = FATAL 
 	";
 	Log::Log4perl->init(\$conf);
 

mysql-mmm-2.0.10-lp473446.patch:
 Angel.pm |   23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

--- NEW FILE mysql-mmm-2.0.10-lp473446.patch ---
https://bugs.launchpad.net/mysql-mmm/+bug/473446

--- mysql-mmm/lib/Common/Angel.pm	2009-11-17 11:35:20.000000000 -0600
+++ angel-infinit-failures/lib/Common/Angel.pm	2009-11-17 11:32:32.000000000 -0600
@@ -10,12 +10,17 @@
 
 our $start_process;
 our $pid;
+our $attempts;
+our $starttime;
+
 
 sub Init($) { 
 	my $pidfile = shift;
 
 	
 	$MMM::Common::Angel::start_process	= 1;
+	$MMM::Common::Angel::attempts		= 0;
+	$MMM::Common::Angel::starttime		= time();
 	my $is_shutdown	= 0;
 
 	$pidfile->create() if (defined($pidfile));
@@ -25,6 +30,7 @@
 	local $SIG{QUIT}	= \&MMM::Common::Angel::SignalHandler;
 
 	do {
+		$MMM::Common::Angel::attempts++;
 
 		if ($MMM::Common::Angel::start_process) {
 			$MMM::Common::Angel::start_process = 0;
@@ -41,6 +47,9 @@
 
 		# Wait for child to exit
 		if (waitpid($MMM::Common::Angel::pid, 0) == -1) {
+			# child exited clean, reset attempts and starttime
+			$MMM::Common::Angel::attempts = 0;
+			$MMM::Common::Angel::starttime = time();
 			if ($ERRNO{ECHLD}) {
 				$is_shutdown = 1 unless ($MMM::Common::Angel::start_process);
 			}
@@ -52,8 +61,18 @@
 					$is_shutdown = 1;
 				}
 				else {
-					FATAL sprintf("Child exited with exitcode %s, restarting", WEXITSTATUS($?));
-					$MMM::Common::Angel::start_process	= 1;
+					my $now = time();
+					my $diff = $now - $MMM::Common::Angel::starttime;
+					if ($MMM::Common::Angel::attempts >= 10 && $diff < 300) {
+						FATAL sprintf("Child exited with exitcode %s and has failed more than 10 times consecutively in the last 5 minutes, not restarting", WEXITSTATUS($?));
+						$MMM::Common::Angel::start_process	= 0;
+						$is_shutdown = 1;
+					}
+					else {
+						FATAL sprintf("Child exited with exitcode %s, restarting after 10 second sleep", WEXITSTATUS($?));
+						sleep(10);
+						$MMM::Common::Angel::start_process	= 1;
+					}
 				}
 			}
 			if (WIFSIGNALED($CHILD_ERROR)) {

mysql-mmm-2.0.9-configs.patch:
 mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf |    4 ++
 mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf   |   22 ++++++++-----
 mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf |   44 +++++++++++---------------
 mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf  |   42 ++++++++++++------------
 4 files changed, 60 insertions(+), 52 deletions(-)

--- NEW FILE mysql-mmm-2.0.9-configs.patch ---
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf	2009-11-03 12:47:50.000000000 -0600
@@ -1,45 +1,41 @@
-active_master_role	writer
-
+active_master_role      writer
 
 <host default>
-	cluster_interface		eth0
-
-	pid_path				/var/run/mmmd_agent.pid
-	bin_path				/usr/bin/mysql-mmm/
-
+    cluster_interface       eth0
+    pid_path                /var/run/mysql-mmm/mmmd_agent.pid
+    bin_path                /usr/libexec/mysql-mmm/
     replication_user        replication
     replication_password    slave
-
-	agent_user				mmm_agent
-	agent_password			RepAgent
+    agent_user              mmm_agent
+    agent_password          RepAgent
 </host>
 
 <host db1>
-	ip						192.168.0.31
-	mode					master
-	peer					db2
+    ip      192.168.0.31
+    mode    master
+    peer    db2
 </host>
 
 <host db2>
-	ip						192.168.0.32
-	mode					master
-	peer					db1
+    ip      192.168.0.32
+    mode    master
+    peer    db1
 </host>
 
 <host db3>
-	ip						192.168.0.33
-	mode					slave
+    ip      192.168.0.33
+    mode    slave
 </host>
 
 
 <role writer>
-	hosts					db1, db2
-	ips						192.168.0.50
-	mode					exclusive
+    hosts   db1, db2
+    ips     192.168.0.50
+    mode    exclusive
 </role>
 
 <role reader>
-	hosts					db1, db2, db3
-	ips						192.168.0.51, 192.168.0.52, 192.168.0.53
-	mode					balanced
+    hosts   db1, db2, db3
+    ips     192.168.0.51, 192.168.0.52, 192.168.0.53
+    mode    balanced
 </role>
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf	2009-11-03 12:51:47.000000000 -0600
@@ -1,43 +1,43 @@
 include mmm_agent.conf
 
-default_copy_method			scp
-clone_dirs					data, logs
+default_copy_method         scp
+clone_dirs                  data, logs
 
 <host default>
-	ssh_user				root
+    ssh_user                root
 
-    lvm_snapshot_size		1G
-    lvm_logical_volume		mysql
-    lvm_volume_group		storage
-    lvm_mount_dir			/mmm_snapshot
-    lvm_mount_opts			-orw,nouuid
+    lvm_snapshot_size       1G
+    lvm_logical_volume      mysql
+    lvm_volume_group        storage
+    lvm_mount_dir           /mmm_snapshot
+    lvm_mount_opts          -orw,nouuid
 
-	tools_user				mmm_tools
-	tools_password			RepTools
+    tools_user              mmm_tools
+    tools_password          RepTools
 
-	backup_dir				/mmm_backup
-	restore_dir				/mysql
+    backup_dir              /mmm_backup
+    restore_dir             /mysql
 </host>
 
 
 <copy_method scp>
     backup_command scp -c blowfish -r %SSH_USER%@%IP%:%SNAPSHOT%/%CLONE_DIR% %DEST_DIR%/
     restore_command cp -axv %BACKUP_DIR%/* %DEST_DIR%/
-	true_copy 1
+    true_copy 1
 </copy_method>
 
 <copy_method rdiff>
-	backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
-	restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
-	incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
-	single_run 1
-	incremental 1
+    backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
+    restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
+    incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
+    single_run 1
+    incremental 1
 </copy_method>
 
 <copy_method ssh-gz>
-	backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
-	restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
-	single_run 1
+    backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
+    restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
+    single_run 1
 </copy_method>
 
 
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf	2009-11-03 17:29:11.000000000 -0600
@@ -1,2 +1,6 @@
 include mmm_common.conf
+
+# The 'this' variable refers to this server.  Proper operation requires 
+# that 'this' server (db1 by default), as well as all other servers, have the 
+# proper IP addresses set in mmm_common.conf.
 this db1
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf	2009-11-03 17:54:12.000000000 -0600
@@ -1,16 +1,24 @@
 include mmm_common.conf
 
 <monitor>
-	ip						127.0.0.1
-	pid_path				/var/run/mmmd_mon.pid
-	bin_path				/usr/bin/mysql-mmm/
-	status_path				/var/lib/misc/mmmd_mon.status
-	ping_ips				192.168.0.1, 192.168.0.2, 192.168.0.3
+    ip                  127.0.0.1
+    pid_path            /var/run/mysql-mmm/mmmd_mon.pid
+    bin_path            /usr/libexec/mysql-mmm
+    status_path         /var/lib/mysql-mmm/mmmd_mon.status
+    ping_ips            192.168.0.1, 192.168.0.2, 192.168.0.3
+    auto_set_online     60
+
+    # The kill_host_bin does not exist by default, though the monitor will
+    # throw a warning about it missing.  See the section 5.10 "Kill Host 
+    # Functionality" in the PDF documentation.
+    #
+    # kill_host_bin     /usr/libexec/mysql-mmm/monitor/kill_host
+    #
 </monitor>
 
 <host default>
-	monitor_user			mmm_monitor
-	monitor_password		RepMonitor
+    monitor_user        mmm_monitor
+    monitor_password    RepMonitor
 </host>
 
 debug 0

mysql-mmm-2.0.9-paths.patch:
 Makefile                     |    2 +-
 etc/init.d/mysql-mmm-agent   |    6 +++---
 etc/init.d/mysql-mmm-monitor |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE mysql-mmm-2.0.9-paths.patch ---
--- mysql-mmm-2.0.9/etc/init.d/mysql-mmm-monitor.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/init.d/mysql-mmm-monitor	2009-10-19 22:40:05.000000000 -0500
@@ -6,8 +6,8 @@
 # chkconfig: - 64 36
 # description:  MMM Monitor.
 # processname: mmmd_mon
-# config: /etc/mmm_mon.conf
-# pidfile: /var/run/mmmd_mon.pid
+# config: /etc/mysql-mmm/mmm_mon.conf
+# pidfile: /var/run/mysql-mmm/mmmd_mon.pid
 
 # Cluster name (it can be empty for default cases)
 CLUSTER=''
@@ -17,10 +17,10 @@
 # Paths
 if [ "$CLUSTER" != "" ]; then
     MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
-    MMMD_MON_PIDFILE="/var/run/mmmd_mon-$CLUSTER.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
 else 
     MMMD_MON_BIN="/usr/sbin/mmmd_mon"
-    MMMD_MON_PIDFILE="/var/run/mmmd_mon.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
 fi
 
 echo "Daemon bin: '$MMMD_MON_BIN'"
--- mysql-mmm-2.0.9/etc/init.d/mysql-mmm-agent.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/init.d/mysql-mmm-agent	2009-10-19 22:39:37.000000000 -0500
@@ -6,12 +6,12 @@
 # chkconfig: - 64 36
 # description:  MMM Agent.
 # processname: mmmd_agent
-# config: /etc/mmm_agent.conf
-# pidfile: /var/run/mmmd_agent.pid
+# config: /etc/mysql-mmm/mmm_agent.conf
+# pidfile: /var/run/mysql-mmm/mmmd_agent.pid
 
 # Paths
 MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
-MMMD_AGENT_PIDFILE="/var/run/mmmd_agent.pid"
+MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
 
 #-----------------------------------------------------------------------
 # See how we were called.
--- mysql-mmm-2.0.9/Makefile.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/Makefile	2009-10-19 22:26:47.000000000 -0500
@@ -4,7 +4,7 @@
 endif
 
 MODULEDIR = $(DESTDIR)$(shell eval "`perl -V:${INSTALLDIR}`"; echo "$$${INSTALLDIR}")/MMM
-BINDIR    = $(DESTDIR)/usr/bin/mysql-mmm
+BINDIR    = $(DESTDIR)/usr/libexec/mysql-mmm
 SBINDIR   = $(DESTDIR)/usr/sbin
 LOGDIR    = $(DESTDIR)/var/log/mysql-mmm
 ETCDIR    = $(DESTDIR)/etc


--- NEW FILE mysql-mmm-agent.init ---
#!/bin/sh
#
# mysql-mmm-agent    This shell script takes care of starting and stopping
#                    the mmm agent daemon.
#
# chkconfig: - 64 36
# description:  MMM Agent.
# processname: mmmd_agent
# config: /etc/mysql-mmm/mmm_agent.conf
# pidfile: /var/run/mysql-mmm/mmmd_agent.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Paths
MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
LOCKFILE='/var/lock/subsys/mysql-mmm-agent'
prog='MMM Agent Daemon'

start() {
        echo -n "Starting $prog: "
        if [ -s $MMMD_AGENT_PIDFILE ] && kill -0 `cat $MMMD_AGENT_PIDFILE` 2> /dev/null; then
            echo " already running."
            exit 0
        fi
        daemon $MMMD_AGENT_BIN
        RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch $LOCKFILE
        return $RETVAL
}

stop() {
        # Stop daemon.
        echo -n "Stopping $prog: "
        killproc -p $MMMD_AGENT_PIDFILE $MMMD_AGENT_BIN
        RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f $LOCKFILE
        return $RETVAL
}

case "$1" in
  start)
        start
        ;;

  stop)
        stop
        ;;

  status)
        status -p $MMMD_AGENT_PIDFILE $MMMD_AGENT_BIN
        RETVAL=$?
        ;;

  restart|reload)
        stop
        start
        ;;

  condrestart)
        if [ -f $LOCKFILE ]; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $0 {start|stop|restart|condrestart|status}"
        ;;
esac

exit $RETVAL 


--- NEW FILE mysql-mmm-monitor.init ---
#!/bin/sh
#
# mysql-mmm-monitor  This shell script takes care of starting and stopping
#                    the mmm monitoring daemon.
#
# chkconfig: - 64 36
# description:  MMM Monitor.
# processname: mmmd_mon
# config: /etc/mysql-mmm/mmm_mon.conf
# pidfile: /var/run/mysql-mmm/mmmd_mon.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Cluster name (it can be empty for default cases)
CLUSTER=''
LOCKFILE='/var/lock/subsys/mysql-mmm-monitor'
prog='MMM Monitor Daemon'

if [ "$CLUSTER" != "" ]; then
    MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
else 
    MMMD_MON_BIN="/usr/sbin/mmmd_mon"
    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
fi


start() {
        echo -n "Starting $prog: "
        if [ -s $MMMD_MON_PIDFILE ] && kill -0 `cat $MMMD_MON_PIDFILE` 2> /dev/null; then
            echo " already running."
            exit 0
        fi
        daemon $MMMD_MON_BIN
        RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch $LOCKFILE
        return $RETVAL
}

stop() {
        # Stop daemon.
        echo -n "Stopping $prog: "
        killproc -p $MMMD_MON_PIDFILE $MMMD_MON_BIN
        RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f $LOCKFILE
        return $RETVAL
}

case "$1" in
  start)
        start
        ;;

  stop)
        stop
        ;;

  status)
        status -p $MMMD_MON_PIDFILE $MMMD_MON_BIN
        RETVAL=$?
        ;;

  restart|reload)
        stop
        start
        ;;

  condrestart)
        if [ -f $LOCKFILE ]; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $0 {start|stop|restart|condrestart|status}"
        ;;
esac

exit $RETVAL 


--- NEW FILE mysql-mmm.logrotate ---
/var/log/mysql-mmm/*.log {
    daily
    missingok
    rotate 7
    compress
    delaycompress
    notifempty
    create 640 root adm
}


--- NEW FILE mysql-mmm.spec ---

Name: mysql-mmm
Version: 2.0.10 
Release: 4%{?dist}
Summary: Multi-Master Replication Manager for MySQL
License: GPLv2
URL: http://mysql-mmm.org
Group: Applications/System
Source: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}.tar.gz 
Source1: mysql-mmm.logrotate
Source2: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}-1.pdf
Source3: mysql-mmm-agent.init
Source4: mysql-mmm-monitor.init
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
BuildArch: noarch
Provides: mmm = %{version}-%{release} 
Provides: mysql-master-master = %{version}-%{release}

Patch0: mysql-mmm-2.0.9-paths.patch
Patch1: mysql-mmm-2.0.9-configs.patch 
Patch3: mysql-mmm-2.0.10-lp473446.patch
Patch4: mysql-mmm-2.0.10-default_logging.patch

%description
MMM (MySQL Master-Master Replication Manager) is a set of flexible scripts 
to perform monitoring/failover and management of MySQL Master-Master 
replication configurations (with only one node writable at any time). The 
toolset also has the ability to read balance standard master/slave 
configurations with any number of slaves, so you can use it to move virtual 
IP addresses around a group of servers depending on whether they are behind 
in replication. In addition to that, it also has scripts for data backups, 
resynchronization between nodes etc.

%package agent
Summary: MMM Database Server Agent Daemon and Libraries
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: iproute
Provides: mysql-master-master-agent = %{version}-%{release}
Provides: mmm-agent = %{version}-%{release}

%description agent
Agent daemon and libraries which run on each MySQL server and provides the 
monitoring node with a simple set of remote services.

%package monitor 
Summary: MMM Monitor Server Daemon and Libraries 
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: perl(Class::Singleton), perl(DBD::mysql) 
Provides: mysql-master-master-monitor = %{version}-%{release} 
Provides: mmm-monitor = %{version}-%{release}

%description monitor
Monitoring daemon and libraries that do all monitoring work and make all 
decisions about roles moving and so on.

%package tools 
Summary: MMM Control Scripts and Libraries
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Provides: mysql-master-master-tools = %{version}-%{release} 
Provides: mmm-tools = %{version}-%{release}

%description tools 
Scripts and libraries dedicated to management of the mmmd_mon processes 
by com- mands.

%prep
%setup -q 
cp -a %{SOURCE2} . 

# currently the README included with mysql-mmm is zero-length
cat >>README <<EOF
Full documentation can be found at:

    %{_docdir}/%{name}-%{version}/%{name}-%{version}-1.pdf
EOF


%patch0 -p1 
%patch1 -p1
%patch3 -p1
%patch4 -p1


%build
# pass

%install
rm -rf %{buildroot}

# Install
make install DESTDIR=%{buildroot}

# additional
%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d \
             %{buildroot}%{_localstatedir}/run/%{name} \
             %{buildroot}%{_localstatedir}/lib/%{name}

install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm

# place our init scripts
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor

install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor


%clean
%{__rm} -rf %{buildroot}


%post agent
if [ $1 -eq 1 ]; then 
    /sbin/chkconfig --add mysql-mmm-agent
    /sbin/chkconfig mysql-mmm-agent off 
elif [ $1 -ge 2 ]; then
    /sbin/service mysql-mmm-agent condrestart 
fi


%post monitor
if [ $1 -eq 1 ]; then 
    /sbin/chkconfig --add mysql-mmm-monitor 
    /sbin/chkconfig mysql-mmm-monitor off
elif [ $1 -ge 2 ] ; then
    /sbin/service mysql-mmm-monitor condrestart 
fi

%preun agent
if [ $1 -eq 0 ]; then
    /sbin/service mysql-mmm-agent stop > /dev/null 2>&1
    /sbin/chkconfig --del mysql-mmm-agent
fi

%preun monitor
if [ $1 -eq 0 ]; then
    /sbin/service mysql-mmm-monitor stop > /dev/null 2>&1
    /sbin/chkconfig --del mysql-mmm-monitor
fi


%files
%defattr(-,root,root,-)
%doc COPYING INSTALL README VERSION %{name}-%{version}-1.pdf 
%dir %{_sysconfdir}/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/lib/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/run/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/log/mysql-mmm
%config(noreplace) %{_sysconfdir}/logrotate.d/mysql-mmm
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_common.conf
%{perl_vendorlib}/MMM/Common

%files tools 
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/mysql-mmm/mmm_tools.conf
%{perl_vendorlib}/MMM/Tools
%{_libexecdir}/mysql-mmm/tools/
%{_sbindir}/mmm_backup
%{_sbindir}/mmm_clone
%{_sbindir}/mmm_restore

%files agent
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
%{perl_vendorlib}/MMM/Agent
%{_libexecdir}/mysql-mmm/agent/
%{_sbindir}/mmmd_agent

%files monitor
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon.conf
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
%{perl_vendorlib}/MMM/Monitor
%{_libexecdir}/mysql-mmm/monitor/
%{_sbindir}/mmmd_mon
%{_sbindir}/mmm_control


%changelog
* Fri Dec 04 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-4
- Add auto_set_online to 60 in mmm_mon.conf
- Provides full version-release for all subpackages
- Append doc location to pdf documentation in README
- Use subsys/lockfile in init scripts

* Thu Nov 19 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-3
- BuildArch: noarch
- Monitor subpackage Requires: perl(DBD::mysql)
- Provides full version-release for  mmm, mysql-master-master
- Removed redundant /var/run/mysql-mmm entry
- Use _localstatedir macro for /var/log/mysql-mmm file listing 
- Fixed logic in post and postun scripts to properly handle
  install/upgrade conditions.
- Post scripts now perform condrestart
- Added Source3: mysql-mmm-agent.init
- Added Source4: mysql-mmm-monitor.init

* Tue Nov 17 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-2
- Removed Patch2: mysql-mmm-2.0.10-sleep.patch (obsoleted by Patch3)
- Added Patch3: mysql-mmm-2.0.10-lp473446.patch
- Added Patch4: mysql-mmm-2.0.10-default_logging.patch

* Tue Nov 03 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-1
- Latest sources from upstream.
- Added Patch1: mysql-mmm-2.0.9-configs.patch 
- Added Patch2: mysql-mmm-2.0.10-sleep.patch
- Moved mmm_control under monitor package

* Mon Oct 19 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.9-1
- Starting mostly from scratch with 2.0 branch
- Added Patch0: mysql-mmm-2.0.9-patchs.patch

* Tue Oct 13 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-4
- Cleaning up rpmlint errors
- No longer require perl-DBD-MySQL

* Tue Sep 29 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.3
- Removing .rs tag (Packaging for Fedora/Epel).

* Mon Sep 28 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.2.rs
- Change subpackage -control to -tools
- No longer build or include send_arp, removing requirement of
  libnet
- Keep etc config files actually in /etc, symlink at _mmm_instdir/etc

* Thu Sep 23 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.rs
- Cleaned up spec a bit further, moved sed changes to patches
- Added Patch1: mysql-master-master-1.2.6-libnet_1.1.patch
- Added Patch2: mysql-master-master-1.2.6-paths.patch
- Explicitly require libnet >= 1.1
- Added subpackages to break up agent, monitor, and control (backup/restore)

* Mon Sep 21 2009 Andrew Garner <andrew.garner at rackspace.com> - 1.2.6-2.abg
- Added patch for http://code.google.com/p/mysql-master-master/issues/detail?id=35

* Wed Sep 02 2009 Andrew Garner <andrew.garner at rackspace.com> - 1.2.6-1.abg
- New upstream release

* Thu Jul 09 2009 Andrew Garner <andrew.garner at rackspace.com>
- Fix release string to drop out incorrect ~rs identifier
- Updated to release 5.abg

* Thu Apr 16 2009 Andrew Garner <andrew.garner at rackspace.com>
- Change /etc/init.d/mysql-mmm_{mon,agent} back to mmm_{mon,agent}
- symlink /etc/mysql-mmm to /usr/lib/mysql-mmm (not the other way around)

* Mon Apr 14 2009 Andrew Garner <andrew.garner at rackspace.com>
- Cleanup spec
- Use standard state/log paths
- Rebuild fping
- Added dist suffix
- Changed Release to 4.rs-abg

* Sun Apr 13 2009 Andrew Garner <andrew.garner at rackspace.com>
- Fix send_arp for RHEL 5.3's libnet
- Changed /usr/local/mmm to /usr/lib/mysql-mmm/
- Changed /etc/init.d/mmm_{mon,agent} to mysql-mmm_{mon,agent}
- Changed Release to 3.rs-abg

* Thu Apr 09 2009 Andrew Garner <andrew.garner at rackspace.com>
- Updating for Rackspace

* Wed Feb 25 2009 Ryan Lowe <ryan.a.lowe at percona.com>
- Initial build (I owe JayKim)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:50:10 -0000	1.1
+++ .cvsignore	14 Dec 2009 20:06:42 -0000	1.2
@@ -0,0 +1,2 @@
+mysql-mmm-2.0.10-1.pdf
+mysql-mmm-2.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:50:10 -0000	1.1
+++ sources	14 Dec 2009 20:06:42 -0000	1.2
@@ -0,0 +1,2 @@
+822a0d8819af1bcf6fb228f0ecfd3ed4  mysql-mmm-2.0.10-1.pdf
+e8b8df923eeeeae9c4f8ec5584f5023d  mysql-mmm-2.0.10.tar.gz



From imntreal at fedoraproject.org  Mon Dec 14 20:06:51 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:06:51 +0000 (UTC)
Subject: rpms/projectM-libvisual/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 projectM-libvisual.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091214200651.0311411C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-libvisual/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29094/F-11

Modified Files:
	.cvsignore import.log projectM-libvisual.spec sources 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2008 06:05:37 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:06:50 -0000	1.3
@@ -1 +1 @@
-projectM-libvisual-1.2.0.tar.bz2
+projectM-libvisual-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Nov 2008 06:05:37 -0000	1.1
+++ import.log	14 Dec 2009 20:06:50 -0000	1.2
@@ -1 +1,2 @@
 projectM-libvisual-1_2_0-4_fc9:HEAD:projectM-libvisual-1.2.0-4.fc9.src.rpm:1226642695
+projectM-libvisual-2_0_1-1_fc12:F-11:projectM-libvisual-2.0.1-1.fc12.src.rpm:1260821196


Index: projectM-libvisual.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/F-11/projectM-libvisual.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- projectM-libvisual.spec	27 Feb 2009 02:31:31 -0000	1.2
+++ projectM-libvisual.spec	14 Dec 2009 20:06:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		projectM-libvisual
-Version:	1.2.0
-Release:	5%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for libvisual
 Group:		Applications/Multimedia
 License:	GPLv2+ and LGPLv2+ and MIT
@@ -41,6 +41,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libvisual-0.4/
 
 %changelog
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2008 06:05:37 -0000	1.2
+++ sources	14 Dec 2009 20:06:50 -0000	1.3
@@ -1 +1 @@
-41a90c5b8931a2cfcdd406eca89e83f9  projectM-libvisual-1.2.0.tar.bz2
+8f86de90fdfc84b0c38b344b15ab8315  projectM-libvisual-2.0.1.tar.bz2



From imntreal at fedoraproject.org  Mon Dec 14 20:07:24 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:07:24 +0000 (UTC)
Subject: rpms/projectM-libvisual/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 projectM-libvisual.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091214200724.E06E411C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-libvisual/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29452/F-12

Modified Files:
	.cvsignore import.log projectM-libvisual.spec sources 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2008 06:05:37 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:07:24 -0000	1.3
@@ -1 +1 @@
-projectM-libvisual-1.2.0.tar.bz2
+projectM-libvisual-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Nov 2008 06:05:37 -0000	1.1
+++ import.log	14 Dec 2009 20:07:24 -0000	1.2
@@ -1 +1,2 @@
 projectM-libvisual-1_2_0-4_fc9:HEAD:projectM-libvisual-1.2.0-4.fc9.src.rpm:1226642695
+projectM-libvisual-2_0_1-1_fc12:F-12:projectM-libvisual-2.0.1-1.fc12.src.rpm:1260821231


Index: projectM-libvisual.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/F-12/projectM-libvisual.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- projectM-libvisual.spec	26 Jul 2009 19:29:07 -0000	1.3
+++ projectM-libvisual.spec	14 Dec 2009 20:07:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		projectM-libvisual
-Version:	1.2.0
-Release:	6%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for libvisual
 Group:		Applications/Multimedia
 License:	GPLv2+ and LGPLv2+ and MIT
@@ -41,8 +41,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libvisual-0.4/
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2008 06:05:37 -0000	1.2
+++ sources	14 Dec 2009 20:07:24 -0000	1.3
@@ -1 +1 @@
-41a90c5b8931a2cfcdd406eca89e83f9  projectM-libvisual-1.2.0.tar.bz2
+8f86de90fdfc84b0c38b344b15ab8315  projectM-libvisual-2.0.1.tar.bz2



From derks at fedoraproject.org  Mon Dec 14 20:08:09 2009
From: derks at fedoraproject.org (derks)
Date: Mon, 14 Dec 2009 20:08:09 +0000 (UTC)
Subject: rpms/mysql-mmm/F-11 import.log, NONE,
	1.1 mysql-mmm-2.0.10-default_logging.patch, NONE,
	1.1 mysql-mmm-2.0.10-lp473446.patch, NONE,
	1.1 mysql-mmm-2.0.9-configs.patch, NONE,
	1.1 mysql-mmm-2.0.9-paths.patch, NONE, 1.1 mysql-mmm-agent.init,
	NONE, 1.1 mysql-mmm-monitor.init, NONE, 1.1 mysql-mmm.logrotate,
	NONE, 1.1 mysql-mmm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091214200809.3D5DE11C00EB@cvs1.fedora.phx.redhat.com>

Author: derks

Update of /cvs/pkgs/rpms/mysql-mmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29981/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mysql-mmm-2.0.10-default_logging.patch 
	mysql-mmm-2.0.10-lp473446.patch mysql-mmm-2.0.9-configs.patch 
	mysql-mmm-2.0.9-paths.patch mysql-mmm-agent.init 
	mysql-mmm-monitor.init mysql-mmm.logrotate mysql-mmm.spec 
Log Message:
Initial import into F-11.




--- NEW FILE import.log ---
mysql-mmm-2_0_10-4:F-11:mysql-mmm-2.0.10-4.src.rpm:1260821274

mysql-mmm-2.0.10-default_logging.patch:
 Log.pm |   45 ++++++++++-----------------------------------
 1 file changed, 10 insertions(+), 35 deletions(-)

--- NEW FILE mysql-mmm-2.0.10-default_logging.patch ---
--- mysql-mmm-2.0.10/lib/Common/Log.pm.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/lib/Common/Log.pm	2009-11-17 13:04:08.000000000 -0600
@@ -31,42 +31,17 @@
 
 	# Use default configuration
 	my $conf = "
-		log4perl.logger = INFO, FileInfo, FileWarn, FileError, FileFatal, MailFatal
+		log4perl.logger = INFO, MMMLog
 
-		log4perl.appender.FileInfo                          = Log::Log4perl::Appender::File
-		log4perl.appender.FileInfo.Threshold                = INFO 
-		log4perl.appender.FileInfo.filename                 = /var/log/mysql-mmm/$progam.info
-		log4perl.appender.FileInfo.recreate                 = 1
-		log4perl.appender.FileInfo.layout                   = PatternLayout
-		log4perl.appender.FileInfo.layout.ConversionPattern = %d %5p %m%n
-
-		log4perl.appender.FileWarn                          = Log::Log4perl::Appender::File
-		log4perl.appender.FileWarn.Threshold                = WARN 
-		log4perl.appender.FileWarn.filename                 = /var/log/mysql-mmm/$progam.warn
-		log4perl.appender.FileWarn.recreate                 = 1
-		log4perl.appender.FileWarn.layout                   = PatternLayout
-		log4perl.appender.FileWarn.layout.ConversionPattern = %d %5p %m%n
-
-		log4perl.appender.FileError                         = Log::Log4perl::Appender::File
-		log4perl.appender.FileError.Threshold               = ERROR 
-		log4perl.appender.FileError.filename                = /var/log/mysql-mmm/$progam.error
-		log4perl.appender.FileError.recreate                = 1
-		log4perl.appender.FileError.layout                  = PatternLayout
-		log4perl.appender.FileError.layout.ConversionPattern= %d %5p %m%n
-
-		log4perl.appender.FileFatal                         = Log::Log4perl::Appender::File
-		log4perl.appender.FileFatal.Threshold               = FATAL 
-		log4perl.appender.FileFatal.filename                = /var/log/mysql-mmm/$progam.fatal
-		log4perl.appender.FileFatal.recreate                = 1
-		log4perl.appender.FileFatal.layout                  = PatternLayout
-		log4perl.appender.FileFatal.layout.ConversionPattern= %d %5p %m%n
-
-		log4perl.appender.MailFatal                         = Log::Dispatch::Email::MailSend
-		log4perl.appender.MailFatal.Threshold               = FATAL 
-		log4perl.appender.MailFatal.to                      = root
-		log4perl.appender.MailFatal.subject                 = FATAL error in $progam
-		log4perl.appender.MailFatal.layout                  = PatternLayout
-		log4perl.appender.MailFatal.layout.ConversionPattern= %d %m%n
+		log4perl.appender.MMMLog                            = Log::Log4perl::Appender::File
+		log4perl.appender.MMMLog.Threshold                  = INFO 
+		log4perl.appender.MMMLog.filename                   = /var/log/mysql-mmm/$progam.log
+		log4perl.appender.MMMLog.recreate                   = 1
+		log4perl.appender.MMMLog.layout                     = PatternLayout
+		log4perl.appender.MMMLog.layout.ConversionPattern   = %d %5p %m%n
+
+ 		log4perl.appender.MailFatal                         = Log::Dispatch::Email::MailSend
+ 		log4perl.appender.MailFatal.Threshold               = FATAL 
 	";
 	Log::Log4perl->init(\$conf);
 

mysql-mmm-2.0.10-lp473446.patch:
 Angel.pm |   23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

--- NEW FILE mysql-mmm-2.0.10-lp473446.patch ---
https://bugs.launchpad.net/mysql-mmm/+bug/473446

--- mysql-mmm/lib/Common/Angel.pm	2009-11-17 11:35:20.000000000 -0600
+++ angel-infinit-failures/lib/Common/Angel.pm	2009-11-17 11:32:32.000000000 -0600
@@ -10,12 +10,17 @@
 
 our $start_process;
 our $pid;
+our $attempts;
+our $starttime;
+
 
 sub Init($) { 
 	my $pidfile = shift;
 
 	
 	$MMM::Common::Angel::start_process	= 1;
+	$MMM::Common::Angel::attempts		= 0;
+	$MMM::Common::Angel::starttime		= time();
 	my $is_shutdown	= 0;
 
 	$pidfile->create() if (defined($pidfile));
@@ -25,6 +30,7 @@
 	local $SIG{QUIT}	= \&MMM::Common::Angel::SignalHandler;
 
 	do {
+		$MMM::Common::Angel::attempts++;
 
 		if ($MMM::Common::Angel::start_process) {
 			$MMM::Common::Angel::start_process = 0;
@@ -41,6 +47,9 @@
 
 		# Wait for child to exit
 		if (waitpid($MMM::Common::Angel::pid, 0) == -1) {
+			# child exited clean, reset attempts and starttime
+			$MMM::Common::Angel::attempts = 0;
+			$MMM::Common::Angel::starttime = time();
 			if ($ERRNO{ECHLD}) {
 				$is_shutdown = 1 unless ($MMM::Common::Angel::start_process);
 			}
@@ -52,8 +61,18 @@
 					$is_shutdown = 1;
 				}
 				else {
-					FATAL sprintf("Child exited with exitcode %s, restarting", WEXITSTATUS($?));
-					$MMM::Common::Angel::start_process	= 1;
+					my $now = time();
+					my $diff = $now - $MMM::Common::Angel::starttime;
+					if ($MMM::Common::Angel::attempts >= 10 && $diff < 300) {
+						FATAL sprintf("Child exited with exitcode %s and has failed more than 10 times consecutively in the last 5 minutes, not restarting", WEXITSTATUS($?));
+						$MMM::Common::Angel::start_process	= 0;
+						$is_shutdown = 1;
+					}
+					else {
+						FATAL sprintf("Child exited with exitcode %s, restarting after 10 second sleep", WEXITSTATUS($?));
+						sleep(10);
+						$MMM::Common::Angel::start_process	= 1;
+					}
 				}
 			}
 			if (WIFSIGNALED($CHILD_ERROR)) {

mysql-mmm-2.0.9-configs.patch:
 mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf |    4 ++
 mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf   |   22 ++++++++-----
 mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf |   44 +++++++++++---------------
 mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf  |   42 ++++++++++++------------
 4 files changed, 60 insertions(+), 52 deletions(-)

--- NEW FILE mysql-mmm-2.0.9-configs.patch ---
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf	2009-11-03 12:47:50.000000000 -0600
@@ -1,45 +1,41 @@
-active_master_role	writer
-
+active_master_role      writer
 
 <host default>
-	cluster_interface		eth0
-
-	pid_path				/var/run/mmmd_agent.pid
-	bin_path				/usr/bin/mysql-mmm/
-
+    cluster_interface       eth0
+    pid_path                /var/run/mysql-mmm/mmmd_agent.pid
+    bin_path                /usr/libexec/mysql-mmm/
     replication_user        replication
     replication_password    slave
-
-	agent_user				mmm_agent
-	agent_password			RepAgent
+    agent_user              mmm_agent
+    agent_password          RepAgent
 </host>
 
 <host db1>
-	ip						192.168.0.31
-	mode					master
-	peer					db2
+    ip      192.168.0.31
+    mode    master
+    peer    db2
 </host>
 
 <host db2>
-	ip						192.168.0.32
-	mode					master
-	peer					db1
+    ip      192.168.0.32
+    mode    master
+    peer    db1
 </host>
 
 <host db3>
-	ip						192.168.0.33
-	mode					slave
+    ip      192.168.0.33
+    mode    slave
 </host>
 
 
 <role writer>
-	hosts					db1, db2
-	ips						192.168.0.50
-	mode					exclusive
+    hosts   db1, db2
+    ips     192.168.0.50
+    mode    exclusive
 </role>
 
 <role reader>
-	hosts					db1, db2, db3
-	ips						192.168.0.51, 192.168.0.52, 192.168.0.53
-	mode					balanced
+    hosts   db1, db2, db3
+    ips     192.168.0.51, 192.168.0.52, 192.168.0.53
+    mode    balanced
 </role>
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf	2009-11-03 12:51:47.000000000 -0600
@@ -1,43 +1,43 @@
 include mmm_agent.conf
 
-default_copy_method			scp
-clone_dirs					data, logs
+default_copy_method         scp
+clone_dirs                  data, logs
 
 <host default>
-	ssh_user				root
+    ssh_user                root
 
-    lvm_snapshot_size		1G
-    lvm_logical_volume		mysql
-    lvm_volume_group		storage
-    lvm_mount_dir			/mmm_snapshot
-    lvm_mount_opts			-orw,nouuid
+    lvm_snapshot_size       1G
+    lvm_logical_volume      mysql
+    lvm_volume_group        storage
+    lvm_mount_dir           /mmm_snapshot
+    lvm_mount_opts          -orw,nouuid
 
-	tools_user				mmm_tools
-	tools_password			RepTools
+    tools_user              mmm_tools
+    tools_password          RepTools
 
-	backup_dir				/mmm_backup
-	restore_dir				/mysql
+    backup_dir              /mmm_backup
+    restore_dir             /mysql
 </host>
 
 
 <copy_method scp>
     backup_command scp -c blowfish -r %SSH_USER%@%IP%:%SNAPSHOT%/%CLONE_DIR% %DEST_DIR%/
     restore_command cp -axv %BACKUP_DIR%/* %DEST_DIR%/
-	true_copy 1
+    true_copy 1
 </copy_method>
 
 <copy_method rdiff>
-	backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
-	restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
-	incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
-	single_run 1
-	incremental 1
+    backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
+    restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
+    incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
+    single_run 1
+    incremental 1
 </copy_method>
 
 <copy_method ssh-gz>
-	backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
-	restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
-	single_run 1
+    backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
+    restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
+    single_run 1
 </copy_method>
 
 
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf	2009-11-03 17:29:11.000000000 -0600
@@ -1,2 +1,6 @@
 include mmm_common.conf
+
+# The 'this' variable refers to this server.  Proper operation requires 
+# that 'this' server (db1 by default), as well as all other servers, have the 
+# proper IP addresses set in mmm_common.conf.
 this db1
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf	2009-11-03 17:54:12.000000000 -0600
@@ -1,16 +1,24 @@
 include mmm_common.conf
 
 <monitor>
-	ip						127.0.0.1
-	pid_path				/var/run/mmmd_mon.pid
-	bin_path				/usr/bin/mysql-mmm/
-	status_path				/var/lib/misc/mmmd_mon.status
-	ping_ips				192.168.0.1, 192.168.0.2, 192.168.0.3
+    ip                  127.0.0.1
+    pid_path            /var/run/mysql-mmm/mmmd_mon.pid
+    bin_path            /usr/libexec/mysql-mmm
+    status_path         /var/lib/mysql-mmm/mmmd_mon.status
+    ping_ips            192.168.0.1, 192.168.0.2, 192.168.0.3
+    auto_set_online     60
+
+    # The kill_host_bin does not exist by default, though the monitor will
+    # throw a warning about it missing.  See the section 5.10 "Kill Host 
+    # Functionality" in the PDF documentation.
+    #
+    # kill_host_bin     /usr/libexec/mysql-mmm/monitor/kill_host
+    #
 </monitor>
 
 <host default>
-	monitor_user			mmm_monitor
-	monitor_password		RepMonitor
+    monitor_user        mmm_monitor
+    monitor_password    RepMonitor
 </host>
 
 debug 0

mysql-mmm-2.0.9-paths.patch:
 Makefile                     |    2 +-
 etc/init.d/mysql-mmm-agent   |    6 +++---
 etc/init.d/mysql-mmm-monitor |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE mysql-mmm-2.0.9-paths.patch ---
--- mysql-mmm-2.0.9/etc/init.d/mysql-mmm-monitor.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/init.d/mysql-mmm-monitor	2009-10-19 22:40:05.000000000 -0500
@@ -6,8 +6,8 @@
 # chkconfig: - 64 36
 # description:  MMM Monitor.
 # processname: mmmd_mon
-# config: /etc/mmm_mon.conf
-# pidfile: /var/run/mmmd_mon.pid
+# config: /etc/mysql-mmm/mmm_mon.conf
+# pidfile: /var/run/mysql-mmm/mmmd_mon.pid
 
 # Cluster name (it can be empty for default cases)
 CLUSTER=''
@@ -17,10 +17,10 @@
 # Paths
 if [ "$CLUSTER" != "" ]; then
     MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
-    MMMD_MON_PIDFILE="/var/run/mmmd_mon-$CLUSTER.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
 else 
     MMMD_MON_BIN="/usr/sbin/mmmd_mon"
-    MMMD_MON_PIDFILE="/var/run/mmmd_mon.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
 fi
 
 echo "Daemon bin: '$MMMD_MON_BIN'"
--- mysql-mmm-2.0.9/etc/init.d/mysql-mmm-agent.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/init.d/mysql-mmm-agent	2009-10-19 22:39:37.000000000 -0500
@@ -6,12 +6,12 @@
 # chkconfig: - 64 36
 # description:  MMM Agent.
 # processname: mmmd_agent
-# config: /etc/mmm_agent.conf
-# pidfile: /var/run/mmmd_agent.pid
+# config: /etc/mysql-mmm/mmm_agent.conf
+# pidfile: /var/run/mysql-mmm/mmmd_agent.pid
 
 # Paths
 MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
-MMMD_AGENT_PIDFILE="/var/run/mmmd_agent.pid"
+MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
 
 #-----------------------------------------------------------------------
 # See how we were called.
--- mysql-mmm-2.0.9/Makefile.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/Makefile	2009-10-19 22:26:47.000000000 -0500
@@ -4,7 +4,7 @@
 endif
 
 MODULEDIR = $(DESTDIR)$(shell eval "`perl -V:${INSTALLDIR}`"; echo "$$${INSTALLDIR}")/MMM
-BINDIR    = $(DESTDIR)/usr/bin/mysql-mmm
+BINDIR    = $(DESTDIR)/usr/libexec/mysql-mmm
 SBINDIR   = $(DESTDIR)/usr/sbin
 LOGDIR    = $(DESTDIR)/var/log/mysql-mmm
 ETCDIR    = $(DESTDIR)/etc


--- NEW FILE mysql-mmm-agent.init ---
#!/bin/sh
#
# mysql-mmm-agent    This shell script takes care of starting and stopping
#                    the mmm agent daemon.
#
# chkconfig: - 64 36
# description:  MMM Agent.
# processname: mmmd_agent
# config: /etc/mysql-mmm/mmm_agent.conf
# pidfile: /var/run/mysql-mmm/mmmd_agent.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Paths
MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
LOCKFILE='/var/lock/subsys/mysql-mmm-agent'
prog='MMM Agent Daemon'

start() {
        echo -n "Starting $prog: "
        if [ -s $MMMD_AGENT_PIDFILE ] && kill -0 `cat $MMMD_AGENT_PIDFILE` 2> /dev/null; then
            echo " already running."
            exit 0
        fi
        daemon $MMMD_AGENT_BIN
        RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch $LOCKFILE
        return $RETVAL
}

stop() {
        # Stop daemon.
        echo -n "Stopping $prog: "
        killproc -p $MMMD_AGENT_PIDFILE $MMMD_AGENT_BIN
        RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f $LOCKFILE
        return $RETVAL
}

case "$1" in
  start)
        start
        ;;

  stop)
        stop
        ;;

  status)
        status -p $MMMD_AGENT_PIDFILE $MMMD_AGENT_BIN
        RETVAL=$?
        ;;

  restart|reload)
        stop
        start
        ;;

  condrestart)
        if [ -f $LOCKFILE ]; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $0 {start|stop|restart|condrestart|status}"
        ;;
esac

exit $RETVAL 


--- NEW FILE mysql-mmm-monitor.init ---
#!/bin/sh
#
# mysql-mmm-monitor  This shell script takes care of starting and stopping
#                    the mmm monitoring daemon.
#
# chkconfig: - 64 36
# description:  MMM Monitor.
# processname: mmmd_mon
# config: /etc/mysql-mmm/mmm_mon.conf
# pidfile: /var/run/mysql-mmm/mmmd_mon.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Cluster name (it can be empty for default cases)
CLUSTER=''
LOCKFILE='/var/lock/subsys/mysql-mmm-monitor'
prog='MMM Monitor Daemon'

if [ "$CLUSTER" != "" ]; then
    MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
else 
    MMMD_MON_BIN="/usr/sbin/mmmd_mon"
    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
fi


start() {
        echo -n "Starting $prog: "
        if [ -s $MMMD_MON_PIDFILE ] && kill -0 `cat $MMMD_MON_PIDFILE` 2> /dev/null; then
            echo " already running."
            exit 0
        fi
        daemon $MMMD_MON_BIN
        RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch $LOCKFILE
        return $RETVAL
}

stop() {
        # Stop daemon.
        echo -n "Stopping $prog: "
        killproc -p $MMMD_MON_PIDFILE $MMMD_MON_BIN
        RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f $LOCKFILE
        return $RETVAL
}

case "$1" in
  start)
        start
        ;;

  stop)
        stop
        ;;

  status)
        status -p $MMMD_MON_PIDFILE $MMMD_MON_BIN
        RETVAL=$?
        ;;

  restart|reload)
        stop
        start
        ;;

  condrestart)
        if [ -f $LOCKFILE ]; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $0 {start|stop|restart|condrestart|status}"
        ;;
esac

exit $RETVAL 


--- NEW FILE mysql-mmm.logrotate ---
/var/log/mysql-mmm/*.log {
    daily
    missingok
    rotate 7
    compress
    delaycompress
    notifempty
    create 640 root adm
}


--- NEW FILE mysql-mmm.spec ---

Name: mysql-mmm
Version: 2.0.10 
Release: 4%{?dist}
Summary: Multi-Master Replication Manager for MySQL
License: GPLv2
URL: http://mysql-mmm.org
Group: Applications/System
Source: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}.tar.gz 
Source1: mysql-mmm.logrotate
Source2: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}-1.pdf
Source3: mysql-mmm-agent.init
Source4: mysql-mmm-monitor.init
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
BuildArch: noarch
Provides: mmm = %{version}-%{release} 
Provides: mysql-master-master = %{version}-%{release}

Patch0: mysql-mmm-2.0.9-paths.patch
Patch1: mysql-mmm-2.0.9-configs.patch 
Patch3: mysql-mmm-2.0.10-lp473446.patch
Patch4: mysql-mmm-2.0.10-default_logging.patch

%description
MMM (MySQL Master-Master Replication Manager) is a set of flexible scripts 
to perform monitoring/failover and management of MySQL Master-Master 
replication configurations (with only one node writable at any time). The 
toolset also has the ability to read balance standard master/slave 
configurations with any number of slaves, so you can use it to move virtual 
IP addresses around a group of servers depending on whether they are behind 
in replication. In addition to that, it also has scripts for data backups, 
resynchronization between nodes etc.

%package agent
Summary: MMM Database Server Agent Daemon and Libraries
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: iproute
Provides: mysql-master-master-agent = %{version}-%{release}
Provides: mmm-agent = %{version}-%{release}

%description agent
Agent daemon and libraries which run on each MySQL server and provides the 
monitoring node with a simple set of remote services.

%package monitor 
Summary: MMM Monitor Server Daemon and Libraries 
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: perl(Class::Singleton), perl(DBD::mysql) 
Provides: mysql-master-master-monitor = %{version}-%{release} 
Provides: mmm-monitor = %{version}-%{release}

%description monitor
Monitoring daemon and libraries that do all monitoring work and make all 
decisions about roles moving and so on.

%package tools 
Summary: MMM Control Scripts and Libraries
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Provides: mysql-master-master-tools = %{version}-%{release} 
Provides: mmm-tools = %{version}-%{release}

%description tools 
Scripts and libraries dedicated to management of the mmmd_mon processes 
by com- mands.

%prep
%setup -q 
cp -a %{SOURCE2} . 

# currently the README included with mysql-mmm is zero-length
cat >>README <<EOF
Full documentation can be found at:

    %{_docdir}/%{name}-%{version}/%{name}-%{version}-1.pdf
EOF


%patch0 -p1 
%patch1 -p1
%patch3 -p1
%patch4 -p1


%build
# pass

%install
rm -rf %{buildroot}

# Install
make install DESTDIR=%{buildroot}

# additional
%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d \
             %{buildroot}%{_localstatedir}/run/%{name} \
             %{buildroot}%{_localstatedir}/lib/%{name}

install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm

# place our init scripts
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor

install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor


%clean
%{__rm} -rf %{buildroot}


%post agent
if [ $1 -eq 1 ]; then 
    /sbin/chkconfig --add mysql-mmm-agent
    /sbin/chkconfig mysql-mmm-agent off 
elif [ $1 -ge 2 ]; then
    /sbin/service mysql-mmm-agent condrestart 
fi


%post monitor
if [ $1 -eq 1 ]; then 
    /sbin/chkconfig --add mysql-mmm-monitor 
    /sbin/chkconfig mysql-mmm-monitor off
elif [ $1 -ge 2 ] ; then
    /sbin/service mysql-mmm-monitor condrestart 
fi

%preun agent
if [ $1 -eq 0 ]; then
    /sbin/service mysql-mmm-agent stop > /dev/null 2>&1
    /sbin/chkconfig --del mysql-mmm-agent
fi

%preun monitor
if [ $1 -eq 0 ]; then
    /sbin/service mysql-mmm-monitor stop > /dev/null 2>&1
    /sbin/chkconfig --del mysql-mmm-monitor
fi


%files
%defattr(-,root,root,-)
%doc COPYING INSTALL README VERSION %{name}-%{version}-1.pdf 
%dir %{_sysconfdir}/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/lib/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/run/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/log/mysql-mmm
%config(noreplace) %{_sysconfdir}/logrotate.d/mysql-mmm
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_common.conf
%{perl_vendorlib}/MMM/Common

%files tools 
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/mysql-mmm/mmm_tools.conf
%{perl_vendorlib}/MMM/Tools
%{_libexecdir}/mysql-mmm/tools/
%{_sbindir}/mmm_backup
%{_sbindir}/mmm_clone
%{_sbindir}/mmm_restore

%files agent
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
%{perl_vendorlib}/MMM/Agent
%{_libexecdir}/mysql-mmm/agent/
%{_sbindir}/mmmd_agent

%files monitor
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon.conf
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
%{perl_vendorlib}/MMM/Monitor
%{_libexecdir}/mysql-mmm/monitor/
%{_sbindir}/mmmd_mon
%{_sbindir}/mmm_control


%changelog
* Fri Dec 04 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-4
- Add auto_set_online to 60 in mmm_mon.conf
- Provides full version-release for all subpackages
- Append doc location to pdf documentation in README
- Use subsys/lockfile in init scripts

* Thu Nov 19 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-3
- BuildArch: noarch
- Monitor subpackage Requires: perl(DBD::mysql)
- Provides full version-release for  mmm, mysql-master-master
- Removed redundant /var/run/mysql-mmm entry
- Use _localstatedir macro for /var/log/mysql-mmm file listing 
- Fixed logic in post and postun scripts to properly handle
  install/upgrade conditions.
- Post scripts now perform condrestart
- Added Source3: mysql-mmm-agent.init
- Added Source4: mysql-mmm-monitor.init

* Tue Nov 17 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-2
- Removed Patch2: mysql-mmm-2.0.10-sleep.patch (obsoleted by Patch3)
- Added Patch3: mysql-mmm-2.0.10-lp473446.patch
- Added Patch4: mysql-mmm-2.0.10-default_logging.patch

* Tue Nov 03 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-1
- Latest sources from upstream.
- Added Patch1: mysql-mmm-2.0.9-configs.patch 
- Added Patch2: mysql-mmm-2.0.10-sleep.patch
- Moved mmm_control under monitor package

* Mon Oct 19 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.9-1
- Starting mostly from scratch with 2.0 branch
- Added Patch0: mysql-mmm-2.0.9-patchs.patch

* Tue Oct 13 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-4
- Cleaning up rpmlint errors
- No longer require perl-DBD-MySQL

* Tue Sep 29 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.3
- Removing .rs tag (Packaging for Fedora/Epel).

* Mon Sep 28 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.2.rs
- Change subpackage -control to -tools
- No longer build or include send_arp, removing requirement of
  libnet
- Keep etc config files actually in /etc, symlink at _mmm_instdir/etc

* Thu Sep 23 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.rs
- Cleaned up spec a bit further, moved sed changes to patches
- Added Patch1: mysql-master-master-1.2.6-libnet_1.1.patch
- Added Patch2: mysql-master-master-1.2.6-paths.patch
- Explicitly require libnet >= 1.1
- Added subpackages to break up agent, monitor, and control (backup/restore)

* Mon Sep 21 2009 Andrew Garner <andrew.garner at rackspace.com> - 1.2.6-2.abg
- Added patch for http://code.google.com/p/mysql-master-master/issues/detail?id=35

* Wed Sep 02 2009 Andrew Garner <andrew.garner at rackspace.com> - 1.2.6-1.abg
- New upstream release

* Thu Jul 09 2009 Andrew Garner <andrew.garner at rackspace.com>
- Fix release string to drop out incorrect ~rs identifier
- Updated to release 5.abg

* Thu Apr 16 2009 Andrew Garner <andrew.garner at rackspace.com>
- Change /etc/init.d/mysql-mmm_{mon,agent} back to mmm_{mon,agent}
- symlink /etc/mysql-mmm to /usr/lib/mysql-mmm (not the other way around)

* Mon Apr 14 2009 Andrew Garner <andrew.garner at rackspace.com>
- Cleanup spec
- Use standard state/log paths
- Rebuild fping
- Added dist suffix
- Changed Release to 4.rs-abg

* Sun Apr 13 2009 Andrew Garner <andrew.garner at rackspace.com>
- Fix send_arp for RHEL 5.3's libnet
- Changed /usr/local/mmm to /usr/lib/mysql-mmm/
- Changed /etc/init.d/mmm_{mon,agent} to mysql-mmm_{mon,agent}
- Changed Release to 3.rs-abg

* Thu Apr 09 2009 Andrew Garner <andrew.garner at rackspace.com>
- Updating for Rackspace

* Wed Feb 25 2009 Ryan Lowe <ryan.a.lowe at percona.com>
- Initial build (I owe JayKim)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:50:10 -0000	1.1
+++ .cvsignore	14 Dec 2009 20:08:08 -0000	1.2
@@ -0,0 +1,2 @@
+mysql-mmm-2.0.10-1.pdf
+mysql-mmm-2.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:50:10 -0000	1.1
+++ sources	14 Dec 2009 20:08:09 -0000	1.2
@@ -0,0 +1,2 @@
+822a0d8819af1bcf6fb228f0ecfd3ed4  mysql-mmm-2.0.10-1.pdf
+e8b8df923eeeeae9c4f8ec5584f5023d  mysql-mmm-2.0.10.tar.gz



From imntreal at fedoraproject.org  Mon Dec 14 20:08:09 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:08:09 +0000 (UTC)
Subject: rpms/projectM-libvisual/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 projectM-libvisual.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091214200809.EA69D11C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-libvisual/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30027/devel

Modified Files:
	.cvsignore import.log projectM-libvisual.spec sources 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2008 06:05:37 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:08:09 -0000	1.3
@@ -1 +1 @@
-projectM-libvisual-1.2.0.tar.bz2
+projectM-libvisual-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Nov 2008 06:05:37 -0000	1.1
+++ import.log	14 Dec 2009 20:08:09 -0000	1.2
@@ -1 +1,2 @@
 projectM-libvisual-1_2_0-4_fc9:HEAD:projectM-libvisual-1.2.0-4.fc9.src.rpm:1226642695
+projectM-libvisual-2_0_1-1_fc12:HEAD:projectM-libvisual-2.0.1-1.fc12.src.rpm:1260821276


Index: projectM-libvisual.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/devel/projectM-libvisual.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- projectM-libvisual.spec	26 Jul 2009 19:29:07 -0000	1.3
+++ projectM-libvisual.spec	14 Dec 2009 20:08:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		projectM-libvisual
-Version:	1.2.0
-Release:	6%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for libvisual
 Group:		Applications/Multimedia
 License:	GPLv2+ and LGPLv2+ and MIT
@@ -41,8 +41,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libvisual-0.4/
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-libvisual/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2008 06:05:37 -0000	1.2
+++ sources	14 Dec 2009 20:08:09 -0000	1.3
@@ -1 +1 @@
-41a90c5b8931a2cfcdd406eca89e83f9  projectM-libvisual-1.2.0.tar.bz2
+8f86de90fdfc84b0c38b344b15ab8315  projectM-libvisual-2.0.1.tar.bz2



From tmraz at fedoraproject.org  Mon Dec 14 20:08:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 14 Dec 2009 20:08:10 +0000 (UTC)
Subject: rpms/authconfig/F-12 .cvsignore, 1.80, 1.81 authconfig.spec, 1.111, 
	1.112 sources, 1.88, 1.89
Message-ID: <20091214200810.7E6D811C00EB@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30061

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Mon Dec 14 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-2
- should work fine with sssd >= 0.99.1 (#547344)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-12/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	11 Nov 2009 20:17:52 -0000	1.80
+++ .cvsignore	14 Dec 2009 20:08:10 -0000	1.81
@@ -1 +1 @@
-authconfig-5.4.14.tar.bz2
+authconfig-6.0.0.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-12/authconfig.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- authconfig.spec	11 Nov 2009 20:17:52 -0000	1.111
+++ authconfig.spec	14 Dec 2009 20:08:10 -0000	1.112
@@ -1,7 +1,7 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.14
-Release: 1%{?dist}
+Version: 6.0.0
+Release: 2%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -10,8 +10,8 @@ URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
 Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
-Conflicts: nss_ldap < 254
-BuildRequires: glib2-devel, python >= 2.4.1, python-devel
+Conflicts: nss_ldap < 254, sssd < 0.99.1
+BuildRequires: glib2-devel, python >= 2.6, python-devel
 BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser
 
 %description 
@@ -23,7 +23,7 @@ authentication schemes.
 %package gtk
 Summary: Graphical tool for setting up authentication from network services
 Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}, pygtk2-libglade >= 2.4.0
+Requires: %{name} = %{version}-%{release}, pygtk2-libglade >= 2.14.0
 Requires: usermode-gtk
 
 %description gtk
@@ -101,6 +101,14 @@ authconfig --update --nostart >/dev/null
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Dec 14 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-2
+- should work fine with sssd >= 0.99.1 (#547344)
+
+* Thu Dec 10 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-1
+- support for SSSD enabling/disabling and basic support for
+  SSSD domain setup
+- safe atomic overwrites of the config files
+
 * Wed Nov 11 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.14-1
 - fixed missing truncation in the backup restores (#533881)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-12/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	11 Nov 2009 20:17:52 -0000	1.88
+++ sources	14 Dec 2009 20:08:10 -0000	1.89
@@ -1 +1 @@
-02721515659da2013d6f8551d8ea0b87  authconfig-5.4.14.tar.bz2
+4806810049b0e9106d469dd0381ba725  authconfig-6.0.0.tar.bz2



From imntreal at fedoraproject.org  Mon Dec 14 20:08:41 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:08:41 +0000 (UTC)
Subject: File projectM-pulseaudio-2.0.1.tar.bz2 uploaded to lookaside cache
	by imntreal
Message-ID: <20091214200841.A183F28ED08@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for projectM-pulseaudio:

3d948f962e4a2e6316047082906f9ada  projectM-pulseaudio-2.0.1.tar.bz2



From kyle at fedoraproject.org  Mon Dec 14 20:09:07 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 14 Dec 2009 20:09:07 +0000 (UTC)
Subject: File patch-2.6.32.1.bz2 uploaded to lookaside cache by kyle
Message-ID: <20091214200907.5CE0228ED08@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for kernel:

abc24a9beb8431a75301dd3884b37a3c  patch-2.6.32.1.bz2



From imntreal at fedoraproject.org  Mon Dec 14 20:09:21 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:09:21 +0000 (UTC)
Subject: rpms/projectM-pulseaudio/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 projectM-pulseaudio.spec, 1.2, 1.3 sources, 1.2,
	1.3 projectM-pulseaudio.desktop.patch, 1.1, NONE
Message-ID: <20091214200921.7974511C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-pulseaudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30725/F-11

Modified Files:
	.cvsignore import.log projectM-pulseaudio.spec sources 
Removed Files:
	projectM-pulseaudio.desktop.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Nov 2008 00:31:55 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:09:20 -0000	1.3
@@ -1 +1 @@
-projectM-pulseaudio-1.2.0.tar.bz2
+projectM-pulseaudio-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Nov 2008 00:31:56 -0000	1.1
+++ import.log	14 Dec 2009 20:09:21 -0000	1.2
@@ -1 +1,2 @@
 projectM-pulseaudio-1_2_0-3_fc9:HEAD:projectM-pulseaudio-1.2.0-3.fc9.src.rpm:1226536095
+projectM-pulseaudio-2_0_1-1_fc12:F-11:projectM-pulseaudio-2.0.1-1.fc12.src.rpm:1260821323


Index: projectM-pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/F-11/projectM-pulseaudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- projectM-pulseaudio.spec	27 Feb 2009 02:32:29 -0000	1.2
+++ projectM-pulseaudio.spec	14 Dec 2009 20:09:21 -0000	1.3
@@ -1,14 +1,11 @@
 Name:		projectM-pulseaudio
-Version:	1.2.0
-Release:	4%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for pulseaudio
 Group:		Applications/Multimedia
 License:	GPLv2+ and MIT
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Correct syntax of .desktop file
-Patch0:		projectM-pulseaudio.desktop.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, pulseaudio-libs-devel, libprojectM-qt-devel, desktop-file-utils
 
@@ -18,7 +15,6 @@ pulseaudio compatible applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %cmake .
@@ -41,6 +37,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Nov 2008 00:31:56 -0000	1.2
+++ sources	14 Dec 2009 20:09:21 -0000	1.3
@@ -1 +1 @@
-4222fc690adf775f3c4a437867a0d1bd  projectM-pulseaudio-1.2.0.tar.bz2
+3d948f962e4a2e6316047082906f9ada  projectM-pulseaudio-2.0.1.tar.bz2


--- projectM-pulseaudio.desktop.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:09:54 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:09:54 +0000 (UTC)
Subject: rpms/projectM-pulseaudio/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 projectM-pulseaudio.spec, 1.3, 1.4 sources, 1.2,
	1.3 projectM-pulseaudio.desktop.patch, 1.1, NONE
Message-ID: <20091214200954.34ED311C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-pulseaudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31024/F-12

Modified Files:
	.cvsignore import.log projectM-pulseaudio.spec sources 
Removed Files:
	projectM-pulseaudio.desktop.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Nov 2008 00:31:55 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:09:53 -0000	1.3
@@ -1 +1 @@
-projectM-pulseaudio-1.2.0.tar.bz2
+projectM-pulseaudio-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Nov 2008 00:31:56 -0000	1.1
+++ import.log	14 Dec 2009 20:09:54 -0000	1.2
@@ -1 +1,2 @@
 projectM-pulseaudio-1_2_0-3_fc9:HEAD:projectM-pulseaudio-1.2.0-3.fc9.src.rpm:1226536095
+projectM-pulseaudio-2_0_1-1_fc12:F-12:projectM-pulseaudio-2.0.1-1.fc12.src.rpm:1260821381


Index: projectM-pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/F-12/projectM-pulseaudio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- projectM-pulseaudio.spec	26 Jul 2009 19:29:24 -0000	1.3
+++ projectM-pulseaudio.spec	14 Dec 2009 20:09:54 -0000	1.4
@@ -1,14 +1,11 @@
 Name:		projectM-pulseaudio
-Version:	1.2.0
-Release:	5%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for pulseaudio
 Group:		Applications/Multimedia
 License:	GPLv2+ and MIT
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Correct syntax of .desktop file
-Patch0:		projectM-pulseaudio.desktop.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, pulseaudio-libs-devel, libprojectM-qt-devel, desktop-file-utils
 
@@ -18,7 +15,6 @@ pulseaudio compatible applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %cmake .
@@ -41,8 +37,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Nov 2008 00:31:56 -0000	1.2
+++ sources	14 Dec 2009 20:09:54 -0000	1.3
@@ -1 +1 @@
-4222fc690adf775f3c4a437867a0d1bd  projectM-pulseaudio-1.2.0.tar.bz2
+3d948f962e4a2e6316047082906f9ada  projectM-pulseaudio-2.0.1.tar.bz2


--- projectM-pulseaudio.desktop.patch DELETED ---



From imntreal at fedoraproject.org  Mon Dec 14 20:10:29 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Mon, 14 Dec 2009 20:10:29 +0000 (UTC)
Subject: rpms/projectM-pulseaudio/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 projectM-pulseaudio.spec, 1.3, 1.4 sources, 1.2,
	1.3 projectM-pulseaudio.desktop.patch, 1.1, NONE
Message-ID: <20091214201029.44D1C11C00EB@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/projectM-pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31311/devel

Modified Files:
	.cvsignore import.log projectM-pulseaudio.spec sources 
Removed Files:
	projectM-pulseaudio.desktop.patch 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Nov 2008 00:31:55 -0000	1.2
+++ .cvsignore	14 Dec 2009 20:10:29 -0000	1.3
@@ -1 +1 @@
-projectM-pulseaudio-1.2.0.tar.bz2
+projectM-pulseaudio-2.0.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Nov 2008 00:31:56 -0000	1.1
+++ import.log	14 Dec 2009 20:10:29 -0000	1.2
@@ -1 +1,2 @@
 projectM-pulseaudio-1_2_0-3_fc9:HEAD:projectM-pulseaudio-1.2.0-3.fc9.src.rpm:1226536095
+projectM-pulseaudio-2_0_1-1_fc12:HEAD:projectM-pulseaudio-2.0.1-1.fc12.src.rpm:1260821414


Index: projectM-pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/devel/projectM-pulseaudio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- projectM-pulseaudio.spec	26 Jul 2009 19:29:24 -0000	1.3
+++ projectM-pulseaudio.spec	14 Dec 2009 20:10:29 -0000	1.4
@@ -1,14 +1,11 @@
 Name:		projectM-pulseaudio
-Version:	1.2.0
-Release:	5%{?dist}
+Version:	2.0.1
+Release:	1%{?dist}
 Summary:	The projectM visualization plugin for pulseaudio
 Group:		Applications/Multimedia
 License:	GPLv2+ and MIT
 URL:		http://projectm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-#Correct syntax of .desktop file
-Patch0:		projectM-pulseaudio.desktop.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	cmake, pulseaudio-libs-devel, libprojectM-qt-devel, desktop-file-utils
 
@@ -18,7 +15,6 @@ pulseaudio compatible applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %cmake .
@@ -41,8 +37,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Dec 13 2009 Jameson Pugh (imntreal at gmail.com) - 2.0.1-1
+- New release
+
+* Mon Oct 12 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0r1300-1
+- New SVN version to prepare for v2
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/projectM-pulseaudio/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Nov 2008 00:31:56 -0000	1.2
+++ sources	14 Dec 2009 20:10:29 -0000	1.3
@@ -1 +1 @@
-4222fc690adf775f3c4a437867a0d1bd  projectM-pulseaudio-1.2.0.tar.bz2
+3d948f962e4a2e6316047082906f9ada  projectM-pulseaudio-2.0.1.tar.bz2


--- projectM-pulseaudio.desktop.patch DELETED ---



From manawy at fedoraproject.org  Mon Dec 14 20:12:05 2009
From: manawy at fedoraproject.org (Fabien Georget)
Date: Mon, 14 Dec 2009 20:12:05 +0000 (UTC)
Subject: File ij143m-src.zip uploaded to lookaside cache by manawy
Message-ID: <20091214201205.F23C528ED4A@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for imagej:

266866864fd0a2d575338daccc09ec72  ij143m-src.zip



From manawy at fedoraproject.org  Mon Dec 14 20:12:15 2009
From: manawy at fedoraproject.org (Fabien Georget)
Date: Mon, 14 Dec 2009 20:12:15 +0000 (UTC)
Subject: File macros.zip uploaded to lookaside cache by manawy
Message-ID: <20091214201215.1563E28ED24@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for imagej:

8161ec95aa84e9fa3e46e68a00fada4d  macros.zip



From dcbw at fedoraproject.org  Mon Dec 14 20:12:35 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:12:35 +0000 (UTC)
Subject: File NetworkManager-0.7.997.git20091214.tar.bz2 uploaded to
	lookaside cache by dcbw
Message-ID: <20091214201235.2E90B28ED24@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for NetworkManager:

2ad5369255534adb2315a44ef839e2b6  NetworkManager-0.7.997.git20091214.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 20:12:47 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:12:47 +0000 (UTC)
Subject: File network-manager-applet-0.7.997.git20091214.tar.bz2 uploaded to
	lookaside cache by dcbw
Message-ID: <20091214201247.5B1C128ED26@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for NetworkManager:

c16a47cc1c76e45915e7d8e0580acee7  network-manager-applet-0.7.997.git20091214.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 20:13:03 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:13:03 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.114,
	1.115 NetworkManager.spec, 1.295, 1.296 sources, 1.156, 1.157
Message-ID: <20091214201303.CF54011C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32232

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-2.git20091214
- core: fix recognition of standalone 802.1x private keys
- applet: clean notification text to ensure it passes libnotify validation




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- .cvsignore	8 Dec 2009 07:11:05 -0000	1.114
+++ .cvsignore	14 Dec 2009 20:13:03 -0000	1.115
@@ -173,3 +173,5 @@ NetworkManager-0.7.996.git20091113.tar.b
 network-manager-applet-0.7.996.git20091113.tar.bz2
 NetworkManager-0.7.997.tar.bz2
 network-manager-applet-0.7.997.tar.bz2
+NetworkManager-0.7.997.git20091214.tar.bz2
+network-manager-applet-0.7.997.git20091214.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- NetworkManager.spec	8 Dec 2009 07:11:05 -0000	1.295
+++ NetworkManager.spec	14 Dec 2009 20:13:03 -0000	1.296
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20091214
+%define applet_snapshot .git20091214
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.997
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -360,6 +360,10 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-2.git20091214
+- core: fix recognition of standalone 802.1x private keys
+- applet: clean notification text to ensure it passes libnotify validation
+
 * Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-1
 - core: remove haldaemon from initscript dependencies (rh #542078)
 - core: handle PEM certificates without an ending newline (rh #507315)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- sources	8 Dec 2009 07:11:05 -0000	1.156
+++ sources	14 Dec 2009 20:13:03 -0000	1.157
@@ -1,2 +1,2 @@
-c7d647ffcad0ae2f22e93f1aea8449b5  NetworkManager-0.7.997.tar.bz2
-4a07695989e4584b645fec39a14ab424  network-manager-applet-0.7.997.tar.bz2
+2ad5369255534adb2315a44ef839e2b6  NetworkManager-0.7.997.git20091214.tar.bz2
+c16a47cc1c76e45915e7d8e0580acee7  network-manager-applet-0.7.997.git20091214.tar.bz2



From manawy at fedoraproject.org  Mon Dec 14 20:16:33 2009
From: manawy at fedoraproject.org (Fabien Georget)
Date: Mon, 14 Dec 2009 20:16:33 +0000 (UTC)
Subject: rpms/imagej/devel imagej-1.43-patch0.patch, NONE,
	1.1 imagej-1.43-patch1.patch, NONE, 1.1 imagej.desktop, NONE,
	1.1 imagej.spec, NONE, 1.1 import.log, NONE, 1.1 unix-script.txt,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214201633.36D2911C00EB@cvs1.fedora.phx.redhat.com>

Author: manawy

Update of /cvs/pkgs/rpms/imagej/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32414/devel

Modified Files:
	.cvsignore sources 
Added Files:
	imagej-1.43-patch0.patch imagej-1.43-patch1.patch 
	imagej.desktop imagej.spec import.log unix-script.txt 
Log Message:


first import - imagej 1.43-1.m


imagej-1.43-patch0.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE imagej-1.43-patch0.patch ---
diff -up ./source/build.xml.patch0 ./source/build.xml
--- ./source/build.xml.patch0	2008-06-09 11:47:52.000000000 +0200
+++ ./source/build.xml	2009-11-15 17:47:01.731056352 +0100
@@ -19,8 +19,8 @@
     <copy file="IJ_Props.txt" todir="build" />
     <copy file="images/microscope.gif" tofile="build/microscope.gif" />
     <copy file="images/about.jpg" tofile="build/about.jpg" />
-	<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
-	<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> 
+	<!--<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
+	<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> -->
     <copy todir="build/macros"><fileset dir="macros"/></copy>
     <!-- Build ij.jar. -->
     <jar jarfile="ij.jar" basedir="build"

imagej-1.43-patch1.patch:
 imagej.sh |   97 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

--- NEW FILE imagej-1.43-patch1.patch ---
diff -up .find ./imagej.sh.patch1 ./imagej.sh
--- ./imagej.sh.patch1	2009-11-16 17:24:43.486407325 +0100
+++ ./imagej.sh	2009-11-16 17:29:56.947412083 +0100
@@ -6,50 +6,38 @@
 # This program is free software, but comes with no warrenty or guarantee
 # send bug reports or feedback to jjackson at familyjackson dot net
 # Author: Jon Jackson
-# Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
-# $Revision: 51 $
+# Maintainer : Fabien Georget for fedora
+# Last modified date: 2009-11-18
+# Revision: 52 
 #
-# INSTALLATION INSTRUCTIONS
 #
 ### WARNING ###########################################################
 # This file must be edited with a program that supports unix new line characters
 # - it won't run if edited in 'Notepad' !
 #######################################################################
 
-# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
-# 1) Save this script in the ImageJ directory as 'imagej'
-# 2) Modify path variables according to your system 
-# 3) Give the new file execute permission
-# 4) Be sure the 'imagej' wrapper is in the 'PATH' 
-
 # setup environment
-set +u # don't give error for unset variables (matters for environment variables)
+set +u 
+# don't give error for unset variables (matters for environment variables)
 shopt -s extglob # allow extended pattern matching
 
 ############ SITE SPECIFIC VARIABLES #########################
 # Trailing / is not required for path variables
 # IMAGEJ PATH - production installation
-ij_path='/local/ImageJ'
-# Path to ImageJ development installation
-ij_path_dev='/home/jjackson/ImageJ'
+ij_path='/usr/share/java'
+#path to data files
+ij_data_path='/usr/share/imagej'
+# Path to user
+ij_user_path="${HOME}/.imagej"
 # JAVA PATH
-# assumes executable is ${java_home}/bin/java
-# set java_home variables ='' to use JAVA_HOME environment variable
-if [[ -d /usr/java/jdk1.5 ]] ; then
-	java_home='/usr/java/jdk1.5'
-else
-	# Optionally specify java path for all available OS / architecture combinations
-	java_home_Linux="${ij_path}/jre"
-	java_home_Linux_x86_64="${ij_path}/jre64"
-	java_home_SunOS="${ij_path}/jre64"
-	# 
-fi
-ijadmin=''
+JAVA_HOME=$(dirname $(dirname $(readlink /etc/alternatives/java)))
+# report bug to http://bugzilla.redhat.com/
+ijadmin='Fedora project'
 # DOCUMENTATION URL
 doc_url='http://rsb.info.nih.gov/ij/'
 
 # TEMP FOLDER
-ij_tmp='/tmp/imagej'
+ij_tmp="${HOME}/.imagej/tmp"
 # LOG FILE
 #ij_log="${ij_tmp}/log.txt"
 # default behaviour when an ImageJ window is already open
@@ -84,26 +72,17 @@ declare -i mem
 declare -i max_mem
 declare -i free_mem
 
-java_home="${java_home:-$JAVA_HOME}"
+java_path="${JAVA_HOME}/bin/java"
 
-if [[ "$OS" == 'SunOS' ]] ; then
-    java_arch='-d64'
-	JAVA_HOME="${java_home_SunOS:-$java_home}"	
-	max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
-	free_mem="max_mem"
-	mem=${free_mem}/2
-	if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
-elif [[ "$OS" == 'Linux' ]] ; then
+if [[ "$OS" == 'Linux' ]] ; then
 	if [[ "$processor" == 'x86_64' ]] ; then
     	java_arch='-d64'
-        JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
     	max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		mem=${free_mem}/3*2
 		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
 	else
 		java_arch='-d32'
-    	JAVA_HOME="${java_home_Linux:-$java_home}"
     	max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		mem=${free_mem}/3*2
@@ -112,16 +91,38 @@ elif [[ "$OS" == 'Linux' ]] ; then
 fi
 
 
-# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line 
-# to point to tools.jar. The -compile switch will load tools.jar into the 
-# classpath and enable plugins to be compiled in imagej
+# create plugins, macros, luts dirs
+mkdir -p $ij_user_path/plugins
+mkdir -p $ij_user_path/macros
+mkdir -p $ij_user_path/luts
 
-if [[ -f "${ij_path}/tools.jar" ]] ; then
-    tools="${ij_path}/tools.jar"
-else
-    tools=''
+if [[ ! -d "$ij_tmp" ]] ; then
+    mkdir -p "$ij_tmp"
 fi
 
+# makes symbolik links from shared plugins, macros and luts 
+
+ls $ij_data_path/plugins | while read p ; do
+  if [ ! -e "$ij_user_path/plugins/$p" ] ; then
+    ln -s $ij_data_path/plugins/$p $ij_user_path/plugins/$p
+  fi
+done
+
+ls $ij_data_path/macros | while read p; do
+  if [ ! -e "$ij_user_path/macros/$p" ] ; then
+      ln -s "$ij_data_path/macros/$p" "$ij_user_path/macros/$p"
+  fi
+done
+
+ls $ij_data_path/luts | while read p ; do
+    if [ ! -e "$ij_user_path/luts/$p" ] ; then
+	ln -s $ij_data_path/luts/$p $ij_user_path/luts/$p
+    fi
+done
+
+# enable plugins to be compiled with imageJ
+tools="${JAVA_HOME}/../lib/tools.jar"
+
 # End Site specific variables ---------------------------------------------------------
 
 # other variables 
@@ -320,9 +321,9 @@ fi	
 
 # Resolving ij.jar path.  If ij.jar is a symbolic link to ij_<version>.jar
 # this allows updating ij.jar without crashing running sessions
-ij_jar_path=$(derefln ${ij_path}/ij.jar)    
+ij_jar_path=$(derefln ${ij_path}/ImageJ-1.43.jar)    
                                          
-for mod_jar in ${ij_path}/lib/*jar  ; do
+for mod_jar in ${ij_path}/*jar  ; do
     modules="${modules:-}${modules+:}$mod_jar"
 done
 modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
@@ -470,9 +471,9 @@ if [[ "$portopen" == 'false' ]] ; then
 fi
 
 if (( $verbosity > 0 )) ; then
-    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
+    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
 fi
 
 cd "$dir"
-eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
+eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ  -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
 exit 0


--- NEW FILE imagej.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=ImageJ
GenericName=Image Editor                                       
GenericName[ar]=???? ???                                       
GenericName[be]=???????? ?????????                             
GenericName[bg]=???????? ?? ???????????                        
GenericName[ca]=Editor d'imatges                               
GenericName[ca at valencia]=Editor d'imatges                      
GenericName[cs]=Editor obr?zk?                                 
GenericName[da]=Billedredigering                               
GenericName[de]=Bildeditor                                     
GenericName[dz]=????????? ????????                             
GenericName[el]=???????????? ???????                           
GenericName[en_CA]=Image Editor                                
GenericName[en_GB]=Image Editor                                
GenericName[eo]=Bilada Redaktilo                               
GenericName[es]=Editor de imagen                               
GenericName[et]=Pildiredaktor                                  
GenericName[eu]=Irudi-editorea                                 
GenericName[fa]=???????? ?????                                 
GenericName[fi]=Kuvank?sittely                                 
GenericName[fr]=?diteur d'image                                
GenericName[gl]=Editor de imaxes                               
GenericName[gu]=???? ?????                                     
GenericName[hu]=K?pszerkeszt?                                  
GenericName[is]=Myndvinnsluforrit                              
GenericName[it]=Editor immagine                                
GenericName[ja]=??????                                   
GenericName[ka]=??????????????? ?????????                      
GenericName[km]=??????????????                                 
GenericName[kn]=??? ??????                                     
GenericName[ko]=??? ???                                  
GenericName[lt]=Paveiksl?li? rengykl?                          
GenericName[lv]=Att?la redaktors                               
GenericName[mk]=??????? ?? ?????                               
GenericName[mr]=?????? ?????                                   
GenericName[nb]=Bildebehandler                                 
GenericName[ne]=??? ??????                                     
GenericName[nl]=Afbeeldingsbewerker                            
GenericName[nn]=Biletbehandlar                                 
GenericName[or]=????? ??????                                   
GenericName[pa]=???? ?????                                     
GenericName[pl]=Edytor obrazu                                  
GenericName[pt]=Editor de Imagens                              
GenericName[pt_BR]=Editor de Imagens                           
GenericName[ro]=Editor de imagine                              
GenericName[ru]=???????? ???????????                           
GenericName[sk]=Editor obr?zkov                                
GenericName[sl]=Urejevalnik slik                               
GenericName[sr]=?????? ?????                                   
GenericName[sr at latin]=Obrada slika                             
GenericName[sv]=Bildredigerare                                 
GenericName[ta]=???? ???????                                   
GenericName[th]=?????????                                      
GenericName[tr]=Resim D?zenleyici                              
GenericName[tt]=S?r?t T?z?tke?                                 
GenericName[uk]=???????? ?????????                             
GenericName[vi]=B? bi?n so?n ?nh                               
GenericName[xh]=UmHleli woMfanekiso                            
GenericName[zh_CN]=?????                                  
GenericName[zh_HK]=?????                                  
GenericName[zh_TW]=?????    
Comment=Image Processing and Analysis in Java
Exec=imagej %f
TryExec=imagej 
Icon=/usr/share/pixmaps/microscope.gif
Terminal=false
Type=Application
Categories=Application;Graphics;
MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjeg;image/png;image/tiff;image/x-bmp;image/x-fits;image/x-png;image/x-psd;image/x-xbitmap;application/dicom;


--- NEW FILE imagej.spec ---
Name:           imagej
Version:        1.43
Release:        1.m%{?dist}
Summary:        Image Processing and Analysis in Java

Group:          Applications/Engineering
License:        Public Domain
URL:            http://rsbweb.nih.gov/ij/index.html
Source0:        http://rsbweb.nih.gov/ij/download/src/ij143m-src.zip
Source1:        %{name}.desktop
Source2:        http://rsbweb.nih.gov/ij/macros/macros.zip
Source3:        http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
# don't copy .class files 
patch0:         %{name}-%{version}-patch0.patch
# modify imagej.sh for fedora compatibility
patch1:         %{name}-%{version}-patch1.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  jpackage-utils
BuildRequires:  java-devel >= 1.6.0
BuildRequires:  ant
BuildRequires:  desktop-file-utils


Requires:       jpackage-utils
# java-devel not java for plugins build
Requires:       java-devel >= 1.6.0

%description
ImageJ is a public domain Java image processing program. It can display,        
edit, analyze a wide variety of image data, including image sequences. Imagej   
can be used for quantitative analysis of engineering and scientific image data.

%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
BuildArch:      noarch
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -c -n "%{name}-%{version}" 
# patch build.xml
%patch0 -p1 -b .patch0
# unzip macros.zip
unzip -u %{SOURCE2} 
# erase binary and useless files 
rm -rf macros/.FBC*
rm macros/build.xml
rm -rf __MACOSX
#get and patch unix-script.txt
cp %{SOURCE3} ./imagej.sh
%patch1 -p1 -b .patch1

find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

%build
cd source
ant build javadocs
cd ..

%install
rm -rf $RPM_BUILD_ROOT

# install jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p source/ij.jar   \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

# install javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp api  \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}

# install icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp -p source/build/microscope.gif $RPM_BUILD_ROOT%{_datadir}/pixmaps

# install data files
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -p source/build/about.jpg $RPM_BUILD_ROOT%{_datadir}/%{name}/about.jpg
cp -p source/build/IJ_Props.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/IJ_Props.txt

#install macros
chmod 644 macros/About\ Startup\ Macros 
find ./macros -name \*.txt -type f -exec chmod 644 {} \;
find ./macros -type d -exec chmod 755 {} \;
cp -rp macros $RPM_BUILD_ROOT%{_datadir}/%{name}


#install luts
mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/luts 

# install script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
chmod +x imagej.sh
cp -p imagej.sh $RPM_BUILD_ROOT%{_bindir}/%{name}

# directory for plugins
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
cp source/plugins/JavaScriptEvaluator.source $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/JavaScriptEvaluator.java

# desktop file
desktop-file-install --vendor=""                     \
       --dir=%{buildroot}%{_datadir}/applications/   \
       %{SOURCE1}

%post

#update icon cache
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-desktop-database &> /dev/null || :

%postun
# update icon cache
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-desktop-database &> /dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/microscope.gif
%{_bindir}/%{name}
%doc source/aREADME.txt source/release-notes.html source/applet.html

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Fri Dec 11 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-1.m
- version 1.43m 

* Sun Nov 21 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.5.j
- set build directory to {name}-{version}
- modify wrapper script
- add java-devel to requires

* Sun Nov 15 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.4.j
- modify name from ImageJ to imagej
- modify wrapper script for fedora compatibility 

* Mon Nov 10 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.3.j
- get macros from  http://rsbweb.nih.gov/ij/macros/macros.zip
- get launch script from  http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
- don't copy macros in the jar but in /usr/share/ImageJ/macros

* Mon Nov 10 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.2.j
- change group to Application/Engineering
- change description
- add comments
- change version tag

* Sat Nov 7 2008 Georget Fabien <fabien.georget at gmail.com> 1.43-0.1
- Creation


--- NEW FILE import.log ---
imagej-1_43-1_m_fc12:HEAD:imagej-1.43-1.m.fc12.src.rpm:1260821544


--- NEW FILE unix-script.txt ---
#!/bin/bash 
# A wrapper script to launch imagej from the UNIX command line
# Images given as arguments will be opened, macros may also be given as arguments
# Looks for macros in the imagej macro directory
#
# This program is free software, but comes with no warrenty or guarantee
# send bug reports or feedback to jjackson at familyjackson dot net
# Author: Jon Jackson
# Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
# $Revision: 51 $
#
# INSTALLATION INSTRUCTIONS
#
### WARNING ###########################################################
# This file must be edited with a program that supports unix new line characters
# - it won't run if edited in 'Notepad' !
#######################################################################

# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
# 1) Save this script in the ImageJ directory as 'imagej'
# 2) Modify path variables according to your system 
# 3) Give the new file execute permission
# 4) Be sure the 'imagej' wrapper is in the 'PATH' 

# setup environment
set +u # don't give error for unset variables (matters for environment variables)
shopt -s extglob # allow extended pattern matching

############ SITE SPECIFIC VARIABLES #########################
# Trailing / is not required for path variables
# IMAGEJ PATH - production installation
ij_path='/local/ImageJ'
# Path to ImageJ development installation
ij_path_dev='/home/jjackson/ImageJ'
# JAVA PATH
# assumes executable is ${java_home}/bin/java
# set java_home variables ='' to use JAVA_HOME environment variable
if [[ -d /usr/java/jdk1.5 ]] ; then
	java_home='/usr/java/jdk1.5'
else
	# Optionally specify java path for all available OS / architecture combinations
	java_home_Linux="${ij_path}/jre"
	java_home_Linux_x86_64="${ij_path}/jre64"
	java_home_SunOS="${ij_path}/jre64"
	# 
fi
ijadmin=''
# DOCUMENTATION URL
doc_url='http://rsb.info.nih.gov/ij/'

# TEMP FOLDER
ij_tmp='/tmp/imagej'
# LOG FILE
#ij_log="${ij_tmp}/log.txt"
# default behaviour when an ImageJ window is already open
newwindow='true'
#newwindow='false'
# macro argument delimiter character
separator=':'
# a ' ' may work provided no arguments would contain spaces
# use macro functions:  args=getArgument(); argArray=split(args, ':'); 
# to recover macro arguments

############ DEFAULT MEMORY SETTINGS  #########################

declare -i default_mem=768
declare -i min_mem=32
declare -i max_32bit=1800 # empirical
declare -i max_64bit=17000000000 # conservative

############ SITE SPECIFIC MODULES #########################

# JAR libraries for additional modules may be placed in ${ij_path}/lib
# jmf.jar jai_codec.jar jai_core.jar mlibwrapper_jai.jar

# Native libraries may be placed in ${ij_path}/lib/$OS
# where OS matches the output of the 'uname' command

############ END SITE SPECIFIC VARIABLES #########################

OS=$(uname)
processor=$(uname -m) # -p doesn't work on ubuntu
declare -i mem
declare -i max_mem
declare -i free_mem

java_home="${java_home:-$JAVA_HOME}"

if [[ "$OS" == 'SunOS' ]] ; then
    java_arch='-d64'
	JAVA_HOME="${java_home_SunOS:-$java_home}"	
	max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
	free_mem="max_mem"
	mem=${free_mem}/2
	if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
elif [[ "$OS" == 'Linux' ]] ; then
	if [[ "$processor" == 'x86_64' ]] ; then
    	java_arch='-d64'
        JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
    	max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		mem=${free_mem}/3*2
		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
	else
		java_arch='-d32'
    	JAVA_HOME="${java_home_Linux:-$java_home}"
    	max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		mem=${free_mem}/3*2
		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi	
	fi
fi


# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line 
# to point to tools.jar. The -compile switch will load tools.jar into the 
# classpath and enable plugins to be compiled in imagej

if [[ -f "${ij_path}/tools.jar" ]] ; then
    tools="${ij_path}/tools.jar"
else
    tools=''
fi

# End Site specific variables ---------------------------------------------------------

# other variables 
dir=`pwd`
user=`whoami`
host=`hostname`
if [[ -z "$DISPLAY" ]] ; then
    echo 'Display variable not set'
    echo 'If ImageJ fails to load, try '
    echo '% setenv DISPLAY yourcomputer:0'
    echo 'if you use the "csh" or for "bash" try'
    echo '% export DISPLAY=yourcomputer:0'
    display='default' 
else
    display="$DISPLAY"
fi

declare -i port=0
declare -i verbosity=0
images=''
macrocmd=''
macroargs=''


function usage {
    echo 
    echo 'Image display and analysis program. Opens formats including:'
    echo 'UNC, Analyze, Dicom, NIFTI, Tiff, Jpeg, Gif, PNG ...'  
    echo
    echo 'imagej [options] image [ image2 ... image3 ]'
    echo '    -h        print help and more options'
    echo '    -o        open images in an open ImageJ panel'
    echo '    -p <N>    open images in ImageJ panel number <N>' 
    echo "    -x <MB>   set available memory (default=${mem} max=${max_mem})"     
    echo 
}

function fullusage {
    echo 
    echo 'Image display and analysis program. Opens formats including:'
    echo 'UNC, Analyze, Dicom, NIFTI, Tiff, Jpeg, Gif, PNG ...'  
    echo 
    echo 'imagej [options] image [ image2 ... image3 ] -> open images'
    echo
    echo 'basic options:'
    echo '  -h        print help and more options'
    echo '  -o        open images in existing ImageJ panel if one exists'
    echo '  -p <N>    open images in existing ImageJ panel number <N>' 
    echo "  -x <MB>   set available memory (default=${mem} max=${max_mem})"
    echo
    echo 'advanced options:'
    echo '  -c        enable plugin compilation within imagej'
    echo '  -d        use development version'
    echo '  -v        be verbose (vv or vvv increases verbosity)'  
    echo
    echo 'options for batch processing:'
    echo "  -e 'Macro Code'            execute macro code"
    echo "  -r 'Menu Command'          run menu command"
    echo "Quotation marks '' are required around commands including spaces"
    echo 'Commands can be sent to open ImageJ panels with the -p option'
    echo 
    echo 'options for macros:'
    echo 'imagej [-i image] [-b|-m] [arg1 ... argN] '
    echo '  -b macro    run macro without graphics window' 
    echo '  -m macro    run macro' 
    echo '"image" will be opened before macro is run'
    echo 'all following arguments are passed to macro'        
    echo 
    echo "Documentation - $doc_url "
	echo "Report problems with this software to $ijadmin"
    echo
}

function macroCmdError {
	fullusage 
	echo 'Only one command option (-b -e -m OR -r) may be specified' 1>&2
	exit 1
}

function getFullPath {
    # Return full path to file
    # treats multiple arguments as a single file with spaces
    if (( $# == 0 )) ; then
        echo "error getting full path for '${*}'" 1>&2
    fi
    pwd_getFullPath="$PWD"
    \cd $(dirname "${*}") > /dev/null
    dir_getFullPath="$PWD"
    \cd "$pwd_getFullPath" > /dev/null
    echo "$dir_getFullPath"/$(basename "${*}")
}
function derefln { 
    # Returns the full path of file to which link points
    # following multiple levels of symbolic links.
    # NOTE: if you use this function in a script, don't use any
    # of the variable names used here
    if (( $# == 0 )) ; then
        return
    fi
    local the_link="$1"
    local link_dir 
    local current_dir="$PWD"
    while file "$the_link" | grep symbolic > /dev/null ; do # resolve links until target is regular file
        if [[ "$the_link" == */* ]] ; then # path contains  /
            \cd $(dirname "${the_link}") > /dev/null
            the_link=$(basename "$the_link")
        fi
        link_dir="$PWD" 
	    # some versions of 'file' surround the path in `' quotes, hence the tr to remove them
        the_link=$(file "${the_link}" | awk '/symbolic link/ {print $NF}' | tr -d "\140\047" )
        if [[ "$the_link" != /* ]] ; then # path is not absolute path  - make it one
            the_link="$link_dir/$the_link"
        fi
        \cd "$current_dir" > /dev/null
    done 
    echo $the_link
}


# parse input arguments
while getopts b:cde:hi:m:nop:r:vx: options
do
	case $options in
		b)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd="-batch ${OPTARG}"
			;;
		c)	modules="${modules:-}${modules+:}${tools}"
			;;
		d)	ij_path="$ij_path_dev"
			;;
		e)  if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd='-eval'
			macroargs="'${OPTARG}'"
			;;
		h)  fullusage
			exit 0
			;;
		i)  images="${images}'${OPTARG}' "
			;;
		m)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd="-macro ${OPTARG}"
			;;
        n)  newwindow='true'
            ;;
		o)  newwindow='false'
			;;
		p)	newwindow='false'
			port="${OPTARG}"
        	if (( "$port" < 1 || "$port" > 99 )) ; then
            	echo "${OPTARG} is not a permissible value for port number (-p)" 1>&2
            	exit 1
        	fi
			;;
		r)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd='-run'
			macroargs="'${OPTARG}'"
			;;
		v)	verbosity=verbosity+1
			if (( $verbosity == 2 )) ; then set -x ; fi
			if (( $verbosity == 3 )) ; then set -v ; fi
			;;
		x)	mem="${OPTARG}"
            newwindow='true'
			if (( $mem < $min_mem || $mem > $max_mem )) ; then
            	echo "${OPTARG} is not a permissible value for memory (-x)" 1>&2
            	echo "min=${min_mem}, max=${max_mem}" 1>&2
            	exit 1				
			fi
			;;
		\?) usage
			exit 1 
			;;
	esac
done
			
#for ((i=1; i < $OPTIND; i++)) 
#do
#	shift
#done
## above syntax not supported in bash < 2.05
declare -i i=1
while (( i < $OPTIND )) ; do
	shift
	i=i+1
done

if [[ "$#" == 0 && -z "$macrocmd" ]] ; then
	usage
fi	

# The best way to install .jar libraries required by plugins is to copy them 
# to the imagej plugins/jars directory
# Alternatively, either copy them to ${ij_path}/jre/lib/ext/ or add the .jar
# filepath to the modules line below. Paths are separated by a colon
# Classpath must follow command line arguments, as ij_path is dependent on the -d option

# Resolving ij.jar path.  If ij.jar is a symbolic link to ij_<version>.jar
# this allows updating ij.jar without crashing running sessions
ij_jar_path=$(derefln ${ij_path}/ij.jar)    
                                         
for mod_jar in ${ij_path}/lib/*jar  ; do
    modules="${modules:-}${modules+:}$mod_jar"
done
modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
#${ij_path}/plugins/jars/dcmie.jar

export LD_LIBRARY_PATH="${ij_path}/lib/${OS}_$processor"
if (( $verbosity > 0 )) ; then
    echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
fi

# -b and -m options only:
# remaining command line arguments are passed as macro arguments 
# separated by $separator
if [[ -n "$macrocmd" && -z "$macroargs" ]] ; then
	while (( "$#" > 0 )) ; do
        if [[ -z "$macroargs" ]] ; then 
            macroargs="${1}"
        else
            macroargs="${macroargs}${separator}${1}"
        fi
        shift 		
	done
	macroargs="'$macroargs'"
fi

# PROTECT POSSIBLE SPACES IN IMAGE FILENAMES
if (( "$#" > 0 )) ; then
	while (( "$#" > 0 )) ; do
        filearg="${1}"
        # full file path required when sending images to running ImageJ panel
        if [[ "${newwindow}" == 'false' && -f "${filearg}" ]]  && ! expr "${filearg}" : '/.*' > /dev/null; then 
            filearg="$(getFullPath ${filearg})"
        fi
		images="${images}'$filearg' "
		shift 
	done
fi	

# CREATE IMAGEJ SOCKET-LOCK DIRECTORY IF NON EXISTANT 
if [[ ! -d "$ij_tmp" ]] ; then
    mkdir "$ij_tmp"
    chmod 777 "$ij_tmp"
fi

# CREATE IMAGEJ LOG FILE IF NON EXISTANT 
if [[ -n "$ij_log" && ! -f "$ij_log" ]] ; then
    touch "$ij_log"
    chmod 666 "$ij_log"
fi

# CREATES A TEMP FILE INDICATING A PORT IS IN USE BY IMAGEJ
cd "$ij_tmp"
declare -i count=1
portopen='false'
lockFileCreated='false'
declare -a locklist=(`ls | grep '[0-9][0-9]-.*'`)

[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tNew Window = $newwindow" >> "$ij_log" 2> /dev/null
[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tPort = $port" >> "$ij_log" 2> /dev/null
[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tlocklist: \n ${locklist[*]}" >> "$ij_log" 2> /dev/null
if (( $verbosity > 0 )) ; then echo -e "locklist: \n ${locklist[*]}" ; fi

# PORT SPECIFIED BY USER
if (( $port > 0 )) ; then
    # look for a lock on the port specified
    for lockname in ${locklist[*]} ; do
        prefix=`printf '%02u' $port`
        if [[ "$lockname" == ${prefix}-${user}-${host}* ]] ; then
        	# found lock on the requested port, owned by user on current display
            portopen='true'
            if (( $verbosity > 0 )) ; then echo "Using socket lock: $lockname" ; fi
            count=$port
            break
        elif [[ "$lockname" == ${prefix}-* ]] ; then
            echo "Port $port is in use by some other user or a different host" 1>&2
            if (( $verbosity > 0 )) ; then echo "Port lock: $lockname" ; fi
            exit 1
        fi
    done 
    # specified port not in use 
    count=$port

# IF EXISTING WINDOW IS REQUESTED, LOOK FOR LISTENING PORT
elif [[ "$newwindow" == 'false' && ${#locklist} != 0 ]] ; then
    # look for a lock on the current display for this user
    for lockname in ${locklist[*]} ; do
        if [[ "$lockname" == [0-9][0-9]-${user}-${host}-${display} ]] ; then
            portopen='true'
            if (( $verbosity > 0 )) ; then echo "Found socket lock: $lockname" ; fi
            # if a matching user/display is found, use this one
            count="${lockname%-*-*-*}"
            #count=`echo $lockname | sed  -e 's/^\([0-9][0-9]\).*/\1/' -e 's/^0//'` # csh?
            break
        fi
    done
fi

# IF A NEW PORT IS TO BE USED
if [[ "$portopen" == 'false' ]] ; then
    # new window requested or no matching port found
    # if port is not specified, look for first free port
    if (( "$port" == 0 )) ; then 
        if (( ${#locklist} == 0 )) ; then
            # no active locks - use first port
            count=1
        else
            # active locks - check each port number so see if it is in use
            # this is not synchronised!!
            count=0
            inuse='true'
            while [[ "$inuse" == 'true' ]] ; do
                count=count+1
                prefix=`printf '%02u' $count`
                inuse='false'
                for lockname in ${locklist[*]} ; do
                    if [[ "$lockname" == ${prefix}-* ]] ; then
                        inuse='true'
                    fi
                done
            done
        fi
    fi
    # CREATING A NEW PORT LOCK
    prefix=`printf '%02u' $count`
    lockname=${prefix}-${user}-${host}-${display}
    
    [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tCreating lock\t$lockname" >> "$ij_log" 2> /dev/null
	if (( $verbosity > 0 )) ; then echo -n "creating lock $lockname ... " ; fi
	touch $lockname
	trap '\rm -f ${ij_tmp}/$lockname >/dev/null ; [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tReleasing lock\t$lockname" >> "$ij_log" 2> /dev/null' EXIT TERM KILL 
	# Quitting ImageJ sends EXIT, as does a kill/kill -9 
	# CTRL+C in terminal sends INT + EXIT
	# System shutdown sends TERM (+EXIT??)
	
	if (( $verbosity > 0 )) ; then  echo 'done' ; fi

    lockFileCreated='true'
    if [[ -z "$macrocmd" ]] ; then 
	    echo 'Open other images in this ImageJ panel as follows:'
	    echo "  imagej -p $count <image1> [<image2> ... <imageN>]"
    fi
    [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tSocket lock:\t$lockname" >> "$ij_log" 2> /dev/null
    if (( $verbosity > 0 )) ; then echo "Socket lock: $lockname" ; fi
	echo
fi

if (( $verbosity > 0 )) ; then
    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
fi

cd "$dir"
eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imagej/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:35:21 -0000	1.1
+++ .cvsignore	14 Dec 2009 20:16:32 -0000	1.2
@@ -0,0 +1,2 @@
+ij143m-src.zip
+macros.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imagej/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:35:21 -0000	1.1
+++ sources	14 Dec 2009 20:16:33 -0000	1.2
@@ -0,0 +1,2 @@
+266866864fd0a2d575338daccc09ec72  ij143m-src.zip
+8161ec95aa84e9fa3e46e68a00fada4d  macros.zip



From kyle at fedoraproject.org  Mon Dec 14 20:16:53 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 14 Dec 2009 20:16:53 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32.1.bz2.sign, NONE, 1.1 .cvsignore,
	1.1148, 1.1149 kernel.spec, 1.1871, 1.1872 sources, 1.1107,
	1.1108 upstream, 1.1020, 1.1021
Message-ID: <20091214201653.EDC3611C00EB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv716

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.32.1.bz2.sign 
Log Message:
* Mon Dec 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.1-9
- 2.6.32.1
- ext4 patches and more...



--- NEW FILE patch-2.6.32.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLJn4XyGugalF9Dw4RAoiNAJsH6d71HhqKfjPI+wFwv1SOmJUipgCfdGRD
uNbbnlH6IJxCrgDqlqkrrnc=
=4fM4
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1148
retrieving revision 1.1149
diff -u -p -r1.1148 -r1.1149
--- .cvsignore	3 Dec 2009 07:04:20 -0000	1.1148
+++ .cvsignore	14 Dec 2009 20:16:52 -0000	1.1149
@@ -5,3 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.32
 linux-2.6.32.tar.bz2
+patch-2.6.32.1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1871
retrieving revision 1.1872
diff -u -p -r1.1871 -r1.1872
--- kernel.spec	10 Dec 2009 01:41:24 -0000	1.1871
+++ kernel.spec	14 Dec 2009 20:16:53 -0000	1.1872
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -727,9 +727,6 @@ Patch12010: linux-2.6-dell-laptop-rfkill
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
-# rhbz#544471
-Patch12014: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
-
 Patch12015: perf-dont-free-perf_mmap_data-until-work-has-been-done.patch
 
 %endif
@@ -1347,9 +1344,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 # Patches headed upstream
 ApplyPatch linux-2.6-rfkill-all.patch
 
-# rhbz#544471
-ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
-
 ApplyPatch perf-dont-free-perf_mmap_data-until-work-has-been-done.patch
 
 # END OF PATCH APPLICATIONS
@@ -2007,6 +2001,10 @@ fi
 # and build.
 
 %changelog
+* Mon Dec 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.1-9
+- 2.6.32.1
+- ext4 patches and more...
+
 * Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-8
 - Add a patch off lkml from krh to fix perf when DEBUG_PERF_USE_VMALLOC
   (rhbz#542791)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1107
retrieving revision 1.1108
diff -u -p -r1.1107 -r1.1108
--- sources	3 Dec 2009 07:04:21 -0000	1.1107
+++ sources	14 Dec 2009 20:16:53 -0000	1.1108
@@ -1 +1,2 @@
 260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
+abc24a9beb8431a75301dd3884b37a3c  patch-2.6.32.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1020
retrieving revision 1.1021
diff -u -p -r1.1020 -r1.1021
--- upstream	3 Dec 2009 07:04:21 -0000	1.1020
+++ upstream	14 Dec 2009 20:16:53 -0000	1.1021
@@ -1 +1,2 @@
 linux-2.6.32.tar.bz2
+patch-2.6.32.1.bz2



From tmraz at fedoraproject.org  Mon Dec 14 20:17:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 14 Dec 2009 20:17:44 +0000 (UTC)
Subject: rpms/authconfig/F-11 .cvsignore, 1.76, 1.77 authconfig.spec, 1.106, 
	1.107 sources, 1.84, 1.85
Message-ID: <20091214201744.C5EB011C00EB@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv977

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Mon Dec 14 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-2
- should work fine with sssd >= 0.99.1 (#547344)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-11/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	23 Apr 2009 10:16:44 -0000	1.76
+++ .cvsignore	14 Dec 2009 20:17:44 -0000	1.77
@@ -1 +1 @@
-authconfig-5.4.10.tar.bz2
+authconfig-6.0.0.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-11/authconfig.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- authconfig.spec	23 Apr 2009 10:16:44 -0000	1.106
+++ authconfig.spec	14 Dec 2009 20:17:44 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.10
-Release: 1%{?dist}
+Version: 6.0.0
+Release: 2%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -10,8 +10,8 @@ URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
 Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
-Conflicts: nss_ldap < 254
-BuildRequires: glib2-devel, python >= 2.4.1, python-devel
+Conflicts: nss_ldap < 254, sssd < 0.99.1
+BuildRequires: glib2-devel, python >= 2.6, python-devel
 BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser
 
 %description 
@@ -23,7 +23,7 @@ authentication schemes.
 %package gtk
 Summary: Graphical tool for setting up authentication from network services
 Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}, pygtk2-libglade >= 2.4.0
+Requires: %{name} = %{version}-%{release}, pygtk2-libglade >= 2.14.0
 Requires: usermode-gtk
 
 %description gtk
@@ -101,6 +101,27 @@ authconfig --update --nostart >/dev/null
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Dec 14 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-2
+- should work fine with sssd >= 0.99.1 (#547344)
+
+* Thu Dec 10 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.0-1
+- support for SSSD enabling/disabling and basic support for
+  SSSD domain setup
+- safe atomic overwrites of the config files
+
+* Wed Nov 11 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.14-1
+- fixed missing truncation in the backup restores (#533881)
+
+* Fri Sep 25 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.13-1
+- updated translations
+
+* Thu Sep 17 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.12-1
+- fixed indentation error (#523534)
+
+* Mon Sep 14 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.11-1
+- updated translations (#522444)
+- silence failures when restarting services (#500385)
+
 * Thu Apr 23 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.10-1
 - update PAM configuration when updating from old authconfig versions (#495924)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/F-11/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- sources	23 Apr 2009 10:16:44 -0000	1.84
+++ sources	14 Dec 2009 20:17:44 -0000	1.85
@@ -1 +1 @@
-368fb2d5738cf86d46de64ceced1b20a  authconfig-5.4.10.tar.bz2
+4806810049b0e9106d469dd0381ba725  authconfig-6.0.0.tar.bz2



From kyle at fedoraproject.org  Mon Dec 14 20:19:38 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 14 Dec 2009 20:19:38 +0000 (UTC)
Subject: File patch-2.6.31.8.bz2 uploaded to lookaside cache by kyle
Message-ID: <20091214201938.B9E4C28ED04@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for kernel:

0fda994c76a981a67464f43c766f2180  patch-2.6.31.8.bz2



From manawy at fedoraproject.org  Mon Dec 14 20:19:56 2009
From: manawy at fedoraproject.org (Fabien Georget)
Date: Mon, 14 Dec 2009 20:19:56 +0000 (UTC)
Subject: rpms/imagej/F-12 imagej-1.43-patch0.patch, NONE,
	1.1 imagej-1.43-patch1.patch, NONE, 1.1 imagej.desktop, NONE,
	1.1 imagej.spec, NONE, 1.1 import.log, NONE, 1.1 unix-script.txt,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214201956.A64A611C00EB@cvs1.fedora.phx.redhat.com>

Author: manawy

Update of /cvs/pkgs/rpms/imagej/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1586/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	imagej-1.43-patch0.patch imagej-1.43-patch1.patch 
	imagej.desktop imagej.spec import.log unix-script.txt 
Log Message:


first commit - imagej-1.43-1.m



imagej-1.43-patch0.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE imagej-1.43-patch0.patch ---
diff -up ./source/build.xml.patch0 ./source/build.xml
--- ./source/build.xml.patch0	2008-06-09 11:47:52.000000000 +0200
+++ ./source/build.xml	2009-11-15 17:47:01.731056352 +0100
@@ -19,8 +19,8 @@
     <copy file="IJ_Props.txt" todir="build" />
     <copy file="images/microscope.gif" tofile="build/microscope.gif" />
     <copy file="images/about.jpg" tofile="build/about.jpg" />
-	<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
-	<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> 
+	<!--<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
+	<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> -->
     <copy todir="build/macros"><fileset dir="macros"/></copy>
     <!-- Build ij.jar. -->
     <jar jarfile="ij.jar" basedir="build"

imagej-1.43-patch1.patch:
 imagej.sh |   97 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

--- NEW FILE imagej-1.43-patch1.patch ---
diff -up .find ./imagej.sh.patch1 ./imagej.sh
--- ./imagej.sh.patch1	2009-11-16 17:24:43.486407325 +0100
+++ ./imagej.sh	2009-11-16 17:29:56.947412083 +0100
@@ -6,50 +6,38 @@
 # This program is free software, but comes with no warrenty or guarantee
 # send bug reports or feedback to jjackson at familyjackson dot net
 # Author: Jon Jackson
-# Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
-# $Revision: 51 $
+# Maintainer : Fabien Georget for fedora
+# Last modified date: 2009-11-18
+# Revision: 52 
 #
-# INSTALLATION INSTRUCTIONS
 #
 ### WARNING ###########################################################
 # This file must be edited with a program that supports unix new line characters
 # - it won't run if edited in 'Notepad' !
 #######################################################################
 
-# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
-# 1) Save this script in the ImageJ directory as 'imagej'
-# 2) Modify path variables according to your system 
-# 3) Give the new file execute permission
-# 4) Be sure the 'imagej' wrapper is in the 'PATH' 
-
 # setup environment
-set +u # don't give error for unset variables (matters for environment variables)
+set +u 
+# don't give error for unset variables (matters for environment variables)
 shopt -s extglob # allow extended pattern matching
 
 ############ SITE SPECIFIC VARIABLES #########################
 # Trailing / is not required for path variables
 # IMAGEJ PATH - production installation
-ij_path='/local/ImageJ'
-# Path to ImageJ development installation
-ij_path_dev='/home/jjackson/ImageJ'
+ij_path='/usr/share/java'
+#path to data files
+ij_data_path='/usr/share/imagej'
+# Path to user
+ij_user_path="${HOME}/.imagej"
 # JAVA PATH
-# assumes executable is ${java_home}/bin/java
-# set java_home variables ='' to use JAVA_HOME environment variable
-if [[ -d /usr/java/jdk1.5 ]] ; then
-	java_home='/usr/java/jdk1.5'
-else
-	# Optionally specify java path for all available OS / architecture combinations
-	java_home_Linux="${ij_path}/jre"
-	java_home_Linux_x86_64="${ij_path}/jre64"
-	java_home_SunOS="${ij_path}/jre64"
-	# 
-fi
-ijadmin=''
+JAVA_HOME=$(dirname $(dirname $(readlink /etc/alternatives/java)))
+# report bug to http://bugzilla.redhat.com/
+ijadmin='Fedora project'
 # DOCUMENTATION URL
 doc_url='http://rsb.info.nih.gov/ij/'
 
 # TEMP FOLDER
-ij_tmp='/tmp/imagej'
+ij_tmp="${HOME}/.imagej/tmp"
 # LOG FILE
 #ij_log="${ij_tmp}/log.txt"
 # default behaviour when an ImageJ window is already open
@@ -84,26 +72,17 @@ declare -i mem
 declare -i max_mem
 declare -i free_mem
 
-java_home="${java_home:-$JAVA_HOME}"
+java_path="${JAVA_HOME}/bin/java"
 
-if [[ "$OS" == 'SunOS' ]] ; then
-    java_arch='-d64'
-	JAVA_HOME="${java_home_SunOS:-$java_home}"	
-	max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
-	free_mem="max_mem"
-	mem=${free_mem}/2
-	if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
-elif [[ "$OS" == 'Linux' ]] ; then
+if [[ "$OS" == 'Linux' ]] ; then
 	if [[ "$processor" == 'x86_64' ]] ; then
     	java_arch='-d64'
-        JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
     	max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		mem=${free_mem}/3*2
 		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
 	else
 		java_arch='-d32'
-    	JAVA_HOME="${java_home_Linux:-$java_home}"
     	max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		mem=${free_mem}/3*2
@@ -112,16 +91,38 @@ elif [[ "$OS" == 'Linux' ]] ; then
 fi
 
 
-# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line 
-# to point to tools.jar. The -compile switch will load tools.jar into the 
-# classpath and enable plugins to be compiled in imagej
+# create plugins, macros, luts dirs
+mkdir -p $ij_user_path/plugins
+mkdir -p $ij_user_path/macros
+mkdir -p $ij_user_path/luts
 
-if [[ -f "${ij_path}/tools.jar" ]] ; then
-    tools="${ij_path}/tools.jar"
-else
-    tools=''
+if [[ ! -d "$ij_tmp" ]] ; then
+    mkdir -p "$ij_tmp"
 fi
 
+# makes symbolik links from shared plugins, macros and luts 
+
+ls $ij_data_path/plugins | while read p ; do
+  if [ ! -e "$ij_user_path/plugins/$p" ] ; then
+    ln -s $ij_data_path/plugins/$p $ij_user_path/plugins/$p
+  fi
+done
+
+ls $ij_data_path/macros | while read p; do
+  if [ ! -e "$ij_user_path/macros/$p" ] ; then
+      ln -s "$ij_data_path/macros/$p" "$ij_user_path/macros/$p"
+  fi
+done
+
+ls $ij_data_path/luts | while read p ; do
+    if [ ! -e "$ij_user_path/luts/$p" ] ; then
+	ln -s $ij_data_path/luts/$p $ij_user_path/luts/$p
+    fi
+done
+
+# enable plugins to be compiled with imageJ
+tools="${JAVA_HOME}/../lib/tools.jar"
+
 # End Site specific variables ---------------------------------------------------------
 
 # other variables 
@@ -320,9 +321,9 @@ fi	
 
 # Resolving ij.jar path.  If ij.jar is a symbolic link to ij_<version>.jar
 # this allows updating ij.jar without crashing running sessions
-ij_jar_path=$(derefln ${ij_path}/ij.jar)    
+ij_jar_path=$(derefln ${ij_path}/ImageJ-1.43.jar)    
                                          
-for mod_jar in ${ij_path}/lib/*jar  ; do
+for mod_jar in ${ij_path}/*jar  ; do
     modules="${modules:-}${modules+:}$mod_jar"
 done
 modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
@@ -470,9 +471,9 @@ if [[ "$portopen" == 'false' ]] ; then
 fi
 
 if (( $verbosity > 0 )) ; then
-    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
+    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
 fi
 
 cd "$dir"
-eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
+eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ  -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
 exit 0


--- NEW FILE imagej.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=ImageJ
GenericName=Image Editor                                       
GenericName[ar]=???? ???                                       
GenericName[be]=???????? ?????????                             
GenericName[bg]=???????? ?? ???????????                        
GenericName[ca]=Editor d'imatges                               
GenericName[ca at valencia]=Editor d'imatges                      
GenericName[cs]=Editor obr?zk?                                 
GenericName[da]=Billedredigering                               
GenericName[de]=Bildeditor                                     
GenericName[dz]=????????? ????????                             
GenericName[el]=???????????? ???????                           
GenericName[en_CA]=Image Editor                                
GenericName[en_GB]=Image Editor                                
GenericName[eo]=Bilada Redaktilo                               
GenericName[es]=Editor de imagen                               
GenericName[et]=Pildiredaktor                                  
GenericName[eu]=Irudi-editorea                                 
GenericName[fa]=???????? ?????                                 
GenericName[fi]=Kuvank?sittely                                 
GenericName[fr]=?diteur d'image                                
GenericName[gl]=Editor de imaxes                               
GenericName[gu]=???? ?????                                     
GenericName[hu]=K?pszerkeszt?                                  
GenericName[is]=Myndvinnsluforrit                              
GenericName[it]=Editor immagine                                
GenericName[ja]=??????                                   
GenericName[ka]=??????????????? ?????????                      
GenericName[km]=??????????????                                 
GenericName[kn]=??? ??????                                     
GenericName[ko]=??? ???                                  
GenericName[lt]=Paveiksl?li? rengykl?                          
GenericName[lv]=Att?la redaktors                               
GenericName[mk]=??????? ?? ?????                               
GenericName[mr]=?????? ?????                                   
GenericName[nb]=Bildebehandler                                 
GenericName[ne]=??? ??????                                     
GenericName[nl]=Afbeeldingsbewerker                            
GenericName[nn]=Biletbehandlar                                 
GenericName[or]=????? ??????                                   
GenericName[pa]=???? ?????                                     
GenericName[pl]=Edytor obrazu                                  
GenericName[pt]=Editor de Imagens                              
GenericName[pt_BR]=Editor de Imagens                           
GenericName[ro]=Editor de imagine                              
GenericName[ru]=???????? ???????????                           
GenericName[sk]=Editor obr?zkov                                
GenericName[sl]=Urejevalnik slik                               
GenericName[sr]=?????? ?????                                   
GenericName[sr at latin]=Obrada slika                             
GenericName[sv]=Bildredigerare                                 
GenericName[ta]=???? ???????                                   
GenericName[th]=?????????                                      
GenericName[tr]=Resim D?zenleyici                              
GenericName[tt]=S?r?t T?z?tke?                                 
GenericName[uk]=???????? ?????????                             
GenericName[vi]=B? bi?n so?n ?nh                               
GenericName[xh]=UmHleli woMfanekiso                            
GenericName[zh_CN]=?????                                  
GenericName[zh_HK]=?????                                  
GenericName[zh_TW]=?????    
Comment=Image Processing and Analysis in Java
Exec=imagej %f
TryExec=imagej 
Icon=/usr/share/pixmaps/microscope.gif
Terminal=false
Type=Application
Categories=Application;Graphics;
MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjeg;image/png;image/tiff;image/x-bmp;image/x-fits;image/x-png;image/x-psd;image/x-xbitmap;application/dicom;


--- NEW FILE imagej.spec ---
Name:           imagej
Version:        1.43
Release:        1.m%{?dist}
Summary:        Image Processing and Analysis in Java

Group:          Applications/Engineering
License:        Public Domain
URL:            http://rsbweb.nih.gov/ij/index.html
Source0:        http://rsbweb.nih.gov/ij/download/src/ij143m-src.zip
Source1:        %{name}.desktop
Source2:        http://rsbweb.nih.gov/ij/macros/macros.zip
Source3:        http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
# don't copy .class files 
patch0:         %{name}-%{version}-patch0.patch
# modify imagej.sh for fedora compatibility
patch1:         %{name}-%{version}-patch1.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  jpackage-utils
BuildRequires:  java-devel >= 1.6.0
BuildRequires:  ant
BuildRequires:  desktop-file-utils


Requires:       jpackage-utils
# java-devel not java for plugins build
Requires:       java-devel >= 1.6.0

%description
ImageJ is a public domain Java image processing program. It can display,        
edit, analyze a wide variety of image data, including image sequences. Imagej   
can be used for quantitative analysis of engineering and scientific image data.

%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
BuildArch:      noarch
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -c -n "%{name}-%{version}" 
# patch build.xml
%patch0 -p1 -b .patch0
# unzip macros.zip
unzip -u %{SOURCE2} 
# erase binary and useless files 
rm -rf macros/.FBC*
rm macros/build.xml
rm -rf __MACOSX
#get and patch unix-script.txt
cp %{SOURCE3} ./imagej.sh
%patch1 -p1 -b .patch1

find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

%build
cd source
ant build javadocs
cd ..

%install
rm -rf $RPM_BUILD_ROOT

# install jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p source/ij.jar   \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

# install javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp api  \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}

# install icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp -p source/build/microscope.gif $RPM_BUILD_ROOT%{_datadir}/pixmaps

# install data files
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -p source/build/about.jpg $RPM_BUILD_ROOT%{_datadir}/%{name}/about.jpg
cp -p source/build/IJ_Props.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/IJ_Props.txt

#install macros
chmod 644 macros/About\ Startup\ Macros 
find ./macros -name \*.txt -type f -exec chmod 644 {} \;
find ./macros -type d -exec chmod 755 {} \;
cp -rp macros $RPM_BUILD_ROOT%{_datadir}/%{name}


#install luts
mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/luts 

# install script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
chmod +x imagej.sh
cp -p imagej.sh $RPM_BUILD_ROOT%{_bindir}/%{name}

# directory for plugins
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
cp source/plugins/JavaScriptEvaluator.source $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/JavaScriptEvaluator.java

# desktop file
desktop-file-install --vendor=""                     \
       --dir=%{buildroot}%{_datadir}/applications/   \
       %{SOURCE1}

%post

#update icon cache
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-desktop-database &> /dev/null || :

%postun
# update icon cache
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-desktop-database &> /dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/microscope.gif
%{_bindir}/%{name}
%doc source/aREADME.txt source/release-notes.html source/applet.html

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Fri Dec 11 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-1.m
- version 1.43m 

* Sun Nov 21 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.5.j
- set build directory to {name}-{version}
- modify wrapper script
- add java-devel to requires

* Sun Nov 15 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.4.j
- modify name from ImageJ to imagej
- modify wrapper script for fedora compatibility 

* Mon Nov 10 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.3.j
- get macros from  http://rsbweb.nih.gov/ij/macros/macros.zip
- get launch script from  http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
- don't copy macros in the jar but in /usr/share/ImageJ/macros

* Mon Nov 10 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.2.j
- change group to Application/Engineering
- change description
- add comments
- change version tag

* Sat Nov 7 2008 Georget Fabien <fabien.georget at gmail.com> 1.43-0.1
- Creation


--- NEW FILE import.log ---
imagej-1_43-1_m_fc12:F-12:imagej-1.43-1.m.fc12.src.rpm:1260821948


--- NEW FILE unix-script.txt ---
#!/bin/bash 
# A wrapper script to launch imagej from the UNIX command line
# Images given as arguments will be opened, macros may also be given as arguments
# Looks for macros in the imagej macro directory
#
# This program is free software, but comes with no warrenty or guarantee
# send bug reports or feedback to jjackson at familyjackson dot net
# Author: Jon Jackson
# Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
# $Revision: 51 $
#
# INSTALLATION INSTRUCTIONS
#
### WARNING ###########################################################
# This file must be edited with a program that supports unix new line characters
# - it won't run if edited in 'Notepad' !
#######################################################################

# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
# 1) Save this script in the ImageJ directory as 'imagej'
# 2) Modify path variables according to your system 
# 3) Give the new file execute permission
# 4) Be sure the 'imagej' wrapper is in the 'PATH' 

# setup environment
set +u # don't give error for unset variables (matters for environment variables)
shopt -s extglob # allow extended pattern matching

############ SITE SPECIFIC VARIABLES #########################
# Trailing / is not required for path variables
# IMAGEJ PATH - production installation
ij_path='/local/ImageJ'
# Path to ImageJ development installation
ij_path_dev='/home/jjackson/ImageJ'
# JAVA PATH
# assumes executable is ${java_home}/bin/java
# set java_home variables ='' to use JAVA_HOME environment variable
if [[ -d /usr/java/jdk1.5 ]] ; then
	java_home='/usr/java/jdk1.5'
else
	# Optionally specify java path for all available OS / architecture combinations
	java_home_Linux="${ij_path}/jre"
	java_home_Linux_x86_64="${ij_path}/jre64"
	java_home_SunOS="${ij_path}/jre64"
	# 
fi
ijadmin=''
# DOCUMENTATION URL
doc_url='http://rsb.info.nih.gov/ij/'

# TEMP FOLDER
ij_tmp='/tmp/imagej'
# LOG FILE
#ij_log="${ij_tmp}/log.txt"
# default behaviour when an ImageJ window is already open
newwindow='true'
#newwindow='false'
# macro argument delimiter character
separator=':'
# a ' ' may work provided no arguments would contain spaces
# use macro functions:  args=getArgument(); argArray=split(args, ':'); 
# to recover macro arguments

############ DEFAULT MEMORY SETTINGS  #########################

declare -i default_mem=768
declare -i min_mem=32
declare -i max_32bit=1800 # empirical
declare -i max_64bit=17000000000 # conservative

############ SITE SPECIFIC MODULES #########################

# JAR libraries for additional modules may be placed in ${ij_path}/lib
# jmf.jar jai_codec.jar jai_core.jar mlibwrapper_jai.jar

# Native libraries may be placed in ${ij_path}/lib/$OS
# where OS matches the output of the 'uname' command

############ END SITE SPECIFIC VARIABLES #########################

OS=$(uname)
processor=$(uname -m) # -p doesn't work on ubuntu
declare -i mem
declare -i max_mem
declare -i free_mem

java_home="${java_home:-$JAVA_HOME}"

if [[ "$OS" == 'SunOS' ]] ; then
    java_arch='-d64'
	JAVA_HOME="${java_home_SunOS:-$java_home}"	
	max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
	free_mem="max_mem"
	mem=${free_mem}/2
	if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
elif [[ "$OS" == 'Linux' ]] ; then
	if [[ "$processor" == 'x86_64' ]] ; then
    	java_arch='-d64'
        JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
    	max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		mem=${free_mem}/3*2
		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
	else
		java_arch='-d32'
    	JAVA_HOME="${java_home_Linux:-$java_home}"
    	max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		mem=${free_mem}/3*2
		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi	
	fi
fi


# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line 
# to point to tools.jar. The -compile switch will load tools.jar into the 
# classpath and enable plugins to be compiled in imagej

if [[ -f "${ij_path}/tools.jar" ]] ; then
    tools="${ij_path}/tools.jar"
else
    tools=''
fi

# End Site specific variables ---------------------------------------------------------

# other variables 
dir=`pwd`
user=`whoami`
host=`hostname`
if [[ -z "$DISPLAY" ]] ; then
    echo 'Display variable not set'
    echo 'If ImageJ fails to load, try '
    echo '% setenv DISPLAY yourcomputer:0'
    echo 'if you use the "csh" or for "bash" try'
    echo '% export DISPLAY=yourcomputer:0'
    display='default' 
else
    display="$DISPLAY"
fi

declare -i port=0
declare -i verbosity=0
images=''
macrocmd=''
macroargs=''


function usage {
    echo 
    echo 'Image display and analysis program. Opens formats including:'
    echo 'UNC, Analyze, Dicom, NIFTI, Tiff, Jpeg, Gif, PNG ...'  
    echo
    echo 'imagej [options] image [ image2 ... image3 ]'
    echo '    -h        print help and more options'
    echo '    -o        open images in an open ImageJ panel'
    echo '    -p <N>    open images in ImageJ panel number <N>' 
    echo "    -x <MB>   set available memory (default=${mem} max=${max_mem})"     
    echo 
}

function fullusage {
    echo 
    echo 'Image display and analysis program. Opens formats including:'
    echo 'UNC, Analyze, Dicom, NIFTI, Tiff, Jpeg, Gif, PNG ...'  
    echo 
    echo 'imagej [options] image [ image2 ... image3 ] -> open images'
    echo
    echo 'basic options:'
    echo '  -h        print help and more options'
    echo '  -o        open images in existing ImageJ panel if one exists'
    echo '  -p <N>    open images in existing ImageJ panel number <N>' 
    echo "  -x <MB>   set available memory (default=${mem} max=${max_mem})"
    echo
    echo 'advanced options:'
    echo '  -c        enable plugin compilation within imagej'
    echo '  -d        use development version'
    echo '  -v        be verbose (vv or vvv increases verbosity)'  
    echo
    echo 'options for batch processing:'
    echo "  -e 'Macro Code'            execute macro code"
    echo "  -r 'Menu Command'          run menu command"
    echo "Quotation marks '' are required around commands including spaces"
    echo 'Commands can be sent to open ImageJ panels with the -p option'
    echo 
    echo 'options for macros:'
    echo 'imagej [-i image] [-b|-m] [arg1 ... argN] '
    echo '  -b macro    run macro without graphics window' 
    echo '  -m macro    run macro' 
    echo '"image" will be opened before macro is run'
    echo 'all following arguments are passed to macro'        
    echo 
    echo "Documentation - $doc_url "
	echo "Report problems with this software to $ijadmin"
    echo
}

function macroCmdError {
	fullusage 
	echo 'Only one command option (-b -e -m OR -r) may be specified' 1>&2
	exit 1
}

function getFullPath {
    # Return full path to file
    # treats multiple arguments as a single file with spaces
    if (( $# == 0 )) ; then
        echo "error getting full path for '${*}'" 1>&2
    fi
    pwd_getFullPath="$PWD"
    \cd $(dirname "${*}") > /dev/null
    dir_getFullPath="$PWD"
    \cd "$pwd_getFullPath" > /dev/null
    echo "$dir_getFullPath"/$(basename "${*}")
}
function derefln { 
    # Returns the full path of file to which link points
    # following multiple levels of symbolic links.
    # NOTE: if you use this function in a script, don't use any
    # of the variable names used here
    if (( $# == 0 )) ; then
        return
    fi
    local the_link="$1"
    local link_dir 
    local current_dir="$PWD"
    while file "$the_link" | grep symbolic > /dev/null ; do # resolve links until target is regular file
        if [[ "$the_link" == */* ]] ; then # path contains  /
            \cd $(dirname "${the_link}") > /dev/null
            the_link=$(basename "$the_link")
        fi
        link_dir="$PWD" 
	    # some versions of 'file' surround the path in `' quotes, hence the tr to remove them
        the_link=$(file "${the_link}" | awk '/symbolic link/ {print $NF}' | tr -d "\140\047" )
        if [[ "$the_link" != /* ]] ; then # path is not absolute path  - make it one
            the_link="$link_dir/$the_link"
        fi
        \cd "$current_dir" > /dev/null
    done 
    echo $the_link
}


# parse input arguments
while getopts b:cde:hi:m:nop:r:vx: options
do
	case $options in
		b)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd="-batch ${OPTARG}"
			;;
		c)	modules="${modules:-}${modules+:}${tools}"
			;;
		d)	ij_path="$ij_path_dev"
			;;
		e)  if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd='-eval'
			macroargs="'${OPTARG}'"
			;;
		h)  fullusage
			exit 0
			;;
		i)  images="${images}'${OPTARG}' "
			;;
		m)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd="-macro ${OPTARG}"
			;;
        n)  newwindow='true'
            ;;
		o)  newwindow='false'
			;;
		p)	newwindow='false'
			port="${OPTARG}"
        	if (( "$port" < 1 || "$port" > 99 )) ; then
            	echo "${OPTARG} is not a permissible value for port number (-p)" 1>&2
            	exit 1
        	fi
			;;
		r)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd='-run'
			macroargs="'${OPTARG}'"
			;;
		v)	verbosity=verbosity+1
			if (( $verbosity == 2 )) ; then set -x ; fi
			if (( $verbosity == 3 )) ; then set -v ; fi
			;;
		x)	mem="${OPTARG}"
            newwindow='true'
			if (( $mem < $min_mem || $mem > $max_mem )) ; then
            	echo "${OPTARG} is not a permissible value for memory (-x)" 1>&2
            	echo "min=${min_mem}, max=${max_mem}" 1>&2
            	exit 1				
			fi
			;;
		\?) usage
			exit 1 
			;;
	esac
done
			
#for ((i=1; i < $OPTIND; i++)) 
#do
#	shift
#done
## above syntax not supported in bash < 2.05
declare -i i=1
while (( i < $OPTIND )) ; do
	shift
	i=i+1
done

if [[ "$#" == 0 && -z "$macrocmd" ]] ; then
	usage
fi	

# The best way to install .jar libraries required by plugins is to copy them 
# to the imagej plugins/jars directory
# Alternatively, either copy them to ${ij_path}/jre/lib/ext/ or add the .jar
# filepath to the modules line below. Paths are separated by a colon
# Classpath must follow command line arguments, as ij_path is dependent on the -d option

# Resolving ij.jar path.  If ij.jar is a symbolic link to ij_<version>.jar
# this allows updating ij.jar without crashing running sessions
ij_jar_path=$(derefln ${ij_path}/ij.jar)    
                                         
for mod_jar in ${ij_path}/lib/*jar  ; do
    modules="${modules:-}${modules+:}$mod_jar"
done
modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
#${ij_path}/plugins/jars/dcmie.jar

export LD_LIBRARY_PATH="${ij_path}/lib/${OS}_$processor"
if (( $verbosity > 0 )) ; then
    echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
fi

# -b and -m options only:
# remaining command line arguments are passed as macro arguments 
# separated by $separator
if [[ -n "$macrocmd" && -z "$macroargs" ]] ; then
	while (( "$#" > 0 )) ; do
        if [[ -z "$macroargs" ]] ; then 
            macroargs="${1}"
        else
            macroargs="${macroargs}${separator}${1}"
        fi
        shift 		
	done
	macroargs="'$macroargs'"
fi

# PROTECT POSSIBLE SPACES IN IMAGE FILENAMES
if (( "$#" > 0 )) ; then
	while (( "$#" > 0 )) ; do
        filearg="${1}"
        # full file path required when sending images to running ImageJ panel
        if [[ "${newwindow}" == 'false' && -f "${filearg}" ]]  && ! expr "${filearg}" : '/.*' > /dev/null; then 
            filearg="$(getFullPath ${filearg})"
        fi
		images="${images}'$filearg' "
		shift 
	done
fi	

# CREATE IMAGEJ SOCKET-LOCK DIRECTORY IF NON EXISTANT 
if [[ ! -d "$ij_tmp" ]] ; then
    mkdir "$ij_tmp"
    chmod 777 "$ij_tmp"
fi

# CREATE IMAGEJ LOG FILE IF NON EXISTANT 
if [[ -n "$ij_log" && ! -f "$ij_log" ]] ; then
    touch "$ij_log"
    chmod 666 "$ij_log"
fi

# CREATES A TEMP FILE INDICATING A PORT IS IN USE BY IMAGEJ
cd "$ij_tmp"
declare -i count=1
portopen='false'
lockFileCreated='false'
declare -a locklist=(`ls | grep '[0-9][0-9]-.*'`)

[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tNew Window = $newwindow" >> "$ij_log" 2> /dev/null
[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tPort = $port" >> "$ij_log" 2> /dev/null
[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tlocklist: \n ${locklist[*]}" >> "$ij_log" 2> /dev/null
if (( $verbosity > 0 )) ; then echo -e "locklist: \n ${locklist[*]}" ; fi

# PORT SPECIFIED BY USER
if (( $port > 0 )) ; then
    # look for a lock on the port specified
    for lockname in ${locklist[*]} ; do
        prefix=`printf '%02u' $port`
        if [[ "$lockname" == ${prefix}-${user}-${host}* ]] ; then
        	# found lock on the requested port, owned by user on current display
            portopen='true'
            if (( $verbosity > 0 )) ; then echo "Using socket lock: $lockname" ; fi
            count=$port
            break
        elif [[ "$lockname" == ${prefix}-* ]] ; then
            echo "Port $port is in use by some other user or a different host" 1>&2
            if (( $verbosity > 0 )) ; then echo "Port lock: $lockname" ; fi
            exit 1
        fi
    done 
    # specified port not in use 
    count=$port

# IF EXISTING WINDOW IS REQUESTED, LOOK FOR LISTENING PORT
elif [[ "$newwindow" == 'false' && ${#locklist} != 0 ]] ; then
    # look for a lock on the current display for this user
    for lockname in ${locklist[*]} ; do
        if [[ "$lockname" == [0-9][0-9]-${user}-${host}-${display} ]] ; then
            portopen='true'
            if (( $verbosity > 0 )) ; then echo "Found socket lock: $lockname" ; fi
            # if a matching user/display is found, use this one
            count="${lockname%-*-*-*}"
            #count=`echo $lockname | sed  -e 's/^\([0-9][0-9]\).*/\1/' -e 's/^0//'` # csh?
            break
        fi
    done
fi

# IF A NEW PORT IS TO BE USED
if [[ "$portopen" == 'false' ]] ; then
    # new window requested or no matching port found
    # if port is not specified, look for first free port
    if (( "$port" == 0 )) ; then 
        if (( ${#locklist} == 0 )) ; then
            # no active locks - use first port
            count=1
        else
            # active locks - check each port number so see if it is in use
            # this is not synchronised!!
            count=0
            inuse='true'
            while [[ "$inuse" == 'true' ]] ; do
                count=count+1
                prefix=`printf '%02u' $count`
                inuse='false'
                for lockname in ${locklist[*]} ; do
                    if [[ "$lockname" == ${prefix}-* ]] ; then
                        inuse='true'
                    fi
                done
            done
        fi
    fi
    # CREATING A NEW PORT LOCK
    prefix=`printf '%02u' $count`
    lockname=${prefix}-${user}-${host}-${display}
    
    [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tCreating lock\t$lockname" >> "$ij_log" 2> /dev/null
	if (( $verbosity > 0 )) ; then echo -n "creating lock $lockname ... " ; fi
	touch $lockname
	trap '\rm -f ${ij_tmp}/$lockname >/dev/null ; [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tReleasing lock\t$lockname" >> "$ij_log" 2> /dev/null' EXIT TERM KILL 
	# Quitting ImageJ sends EXIT, as does a kill/kill -9 
	# CTRL+C in terminal sends INT + EXIT
	# System shutdown sends TERM (+EXIT??)
	
	if (( $verbosity > 0 )) ; then  echo 'done' ; fi

    lockFileCreated='true'
    if [[ -z "$macrocmd" ]] ; then 
	    echo 'Open other images in this ImageJ panel as follows:'
	    echo "  imagej -p $count <image1> [<image2> ... <imageN>]"
    fi
    [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tSocket lock:\t$lockname" >> "$ij_log" 2> /dev/null
    if (( $verbosity > 0 )) ; then echo "Socket lock: $lockname" ; fi
	echo
fi

if (( $verbosity > 0 )) ; then
    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
fi

cd "$dir"
eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imagej/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:35:21 -0000	1.1
+++ .cvsignore	14 Dec 2009 20:19:56 -0000	1.2
@@ -0,0 +1,2 @@
+ij143m-src.zip
+macros.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imagej/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:35:21 -0000	1.1
+++ sources	14 Dec 2009 20:19:56 -0000	1.2
@@ -0,0 +1,2 @@
+266866864fd0a2d575338daccc09ec72  ij143m-src.zip
+8161ec95aa84e9fa3e46e68a00fada4d  macros.zip



From manawy at fedoraproject.org  Mon Dec 14 20:24:38 2009
From: manawy at fedoraproject.org (Fabien Georget)
Date: Mon, 14 Dec 2009 20:24:38 +0000 (UTC)
Subject: rpms/imagej/F-11 imagej-1.43-patch0.patch, NONE,
	1.1 imagej-1.43-patch1.patch, NONE, 1.1 imagej.desktop, NONE,
	1.1 imagej.spec, NONE, 1.1 import.log, NONE, 1.1 unix-script.txt,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214202438.9EBB111C00EB@cvs1.fedora.phx.redhat.com>

Author: manawy

Update of /cvs/pkgs/rpms/imagej/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2757/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	imagej-1.43-patch0.patch imagej-1.43-patch1.patch 
	imagej.desktop imagej.spec import.log unix-script.txt 
Log Message:


first-commit : imagej 1.43-1.m


imagej-1.43-patch0.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE imagej-1.43-patch0.patch ---
diff -up ./source/build.xml.patch0 ./source/build.xml
--- ./source/build.xml.patch0	2008-06-09 11:47:52.000000000 +0200
+++ ./source/build.xml	2009-11-15 17:47:01.731056352 +0100
@@ -19,8 +19,8 @@
     <copy file="IJ_Props.txt" todir="build" />
     <copy file="images/microscope.gif" tofile="build/microscope.gif" />
     <copy file="images/about.jpg" tofile="build/about.jpg" />
-	<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
-	<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> 
+	<!--<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
+	<copy file="plugins/JavaScriptEvaluator.class" tofile="build/JavaScriptEvaluator.class" /> -->
     <copy todir="build/macros"><fileset dir="macros"/></copy>
     <!-- Build ij.jar. -->
     <jar jarfile="ij.jar" basedir="build"

imagej-1.43-patch1.patch:
 imagej.sh |   97 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

--- NEW FILE imagej-1.43-patch1.patch ---
diff -up .find ./imagej.sh.patch1 ./imagej.sh
--- ./imagej.sh.patch1	2009-11-16 17:24:43.486407325 +0100
+++ ./imagej.sh	2009-11-16 17:29:56.947412083 +0100
@@ -6,50 +6,38 @@
 # This program is free software, but comes with no warrenty or guarantee
 # send bug reports or feedback to jjackson at familyjackson dot net
 # Author: Jon Jackson
-# Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
-# $Revision: 51 $
+# Maintainer : Fabien Georget for fedora
+# Last modified date: 2009-11-18
+# Revision: 52 
 #
-# INSTALLATION INSTRUCTIONS
 #
 ### WARNING ###########################################################
 # This file must be edited with a program that supports unix new line characters
 # - it won't run if edited in 'Notepad' !
 #######################################################################
 
-# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
-# 1) Save this script in the ImageJ directory as 'imagej'
-# 2) Modify path variables according to your system 
-# 3) Give the new file execute permission
-# 4) Be sure the 'imagej' wrapper is in the 'PATH' 
-
 # setup environment
-set +u # don't give error for unset variables (matters for environment variables)
+set +u 
+# don't give error for unset variables (matters for environment variables)
 shopt -s extglob # allow extended pattern matching
 
 ############ SITE SPECIFIC VARIABLES #########################
 # Trailing / is not required for path variables
 # IMAGEJ PATH - production installation
-ij_path='/local/ImageJ'
-# Path to ImageJ development installation
-ij_path_dev='/home/jjackson/ImageJ'
+ij_path='/usr/share/java'
+#path to data files
+ij_data_path='/usr/share/imagej'
+# Path to user
+ij_user_path="${HOME}/.imagej"
 # JAVA PATH
-# assumes executable is ${java_home}/bin/java
-# set java_home variables ='' to use JAVA_HOME environment variable
-if [[ -d /usr/java/jdk1.5 ]] ; then
-	java_home='/usr/java/jdk1.5'
-else
-	# Optionally specify java path for all available OS / architecture combinations
-	java_home_Linux="${ij_path}/jre"
-	java_home_Linux_x86_64="${ij_path}/jre64"
-	java_home_SunOS="${ij_path}/jre64"
-	# 
-fi
-ijadmin=''
+JAVA_HOME=$(dirname $(dirname $(readlink /etc/alternatives/java)))
+# report bug to http://bugzilla.redhat.com/
+ijadmin='Fedora project'
 # DOCUMENTATION URL
 doc_url='http://rsb.info.nih.gov/ij/'
 
 # TEMP FOLDER
-ij_tmp='/tmp/imagej'
+ij_tmp="${HOME}/.imagej/tmp"
 # LOG FILE
 #ij_log="${ij_tmp}/log.txt"
 # default behaviour when an ImageJ window is already open
@@ -84,26 +72,17 @@ declare -i mem
 declare -i max_mem
 declare -i free_mem
 
-java_home="${java_home:-$JAVA_HOME}"
+java_path="${JAVA_HOME}/bin/java"
 
-if [[ "$OS" == 'SunOS' ]] ; then
-    java_arch='-d64'
-	JAVA_HOME="${java_home_SunOS:-$java_home}"	
-	max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
-	free_mem="max_mem"
-	mem=${free_mem}/2
-	if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
-elif [[ "$OS" == 'Linux' ]] ; then
+if [[ "$OS" == 'Linux' ]] ; then
 	if [[ "$processor" == 'x86_64' ]] ; then
     	java_arch='-d64'
-        JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
     	max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		mem=${free_mem}/3*2
 		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
 	else
 		java_arch='-d32'
-    	JAVA_HOME="${java_home_Linux:-$java_home}"
     	max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
 		mem=${free_mem}/3*2
@@ -112,16 +91,38 @@ elif [[ "$OS" == 'Linux' ]] ; then
 fi
 
 
-# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line 
-# to point to tools.jar. The -compile switch will load tools.jar into the 
-# classpath and enable plugins to be compiled in imagej
+# create plugins, macros, luts dirs
+mkdir -p $ij_user_path/plugins
+mkdir -p $ij_user_path/macros
+mkdir -p $ij_user_path/luts
 
-if [[ -f "${ij_path}/tools.jar" ]] ; then
-    tools="${ij_path}/tools.jar"
-else
-    tools=''
+if [[ ! -d "$ij_tmp" ]] ; then
+    mkdir -p "$ij_tmp"
 fi
 
+# makes symbolik links from shared plugins, macros and luts 
+
+ls $ij_data_path/plugins | while read p ; do
+  if [ ! -e "$ij_user_path/plugins/$p" ] ; then
+    ln -s $ij_data_path/plugins/$p $ij_user_path/plugins/$p
+  fi
+done
+
+ls $ij_data_path/macros | while read p; do
+  if [ ! -e "$ij_user_path/macros/$p" ] ; then
+      ln -s "$ij_data_path/macros/$p" "$ij_user_path/macros/$p"
+  fi
+done
+
+ls $ij_data_path/luts | while read p ; do
+    if [ ! -e "$ij_user_path/luts/$p" ] ; then
+	ln -s $ij_data_path/luts/$p $ij_user_path/luts/$p
+    fi
+done
+
+# enable plugins to be compiled with imageJ
+tools="${JAVA_HOME}/../lib/tools.jar"
+
 # End Site specific variables ---------------------------------------------------------
 
 # other variables 
@@ -320,9 +321,9 @@ fi	
 
 # Resolving ij.jar path.  If ij.jar is a symbolic link to ij_<version>.jar
 # this allows updating ij.jar without crashing running sessions
-ij_jar_path=$(derefln ${ij_path}/ij.jar)    
+ij_jar_path=$(derefln ${ij_path}/ImageJ-1.43.jar)    
                                          
-for mod_jar in ${ij_path}/lib/*jar  ; do
+for mod_jar in ${ij_path}/*jar  ; do
     modules="${modules:-}${modules+:}$mod_jar"
 done
 modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
@@ -470,9 +471,9 @@ if [[ "$portopen" == 'false' ]] ; then
 fi
 
 if (( $verbosity > 0 )) ; then
-    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
+    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
 fi
 
 cd "$dir"
-eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
+eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ  -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs} "
 exit 0


--- NEW FILE imagej.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=ImageJ
GenericName=Image Editor                                       
GenericName[ar]=???? ???                                       
GenericName[be]=???????? ?????????                             
GenericName[bg]=???????? ?? ???????????                        
GenericName[ca]=Editor d'imatges                               
GenericName[ca at valencia]=Editor d'imatges                      
GenericName[cs]=Editor obr?zk?                                 
GenericName[da]=Billedredigering                               
GenericName[de]=Bildeditor                                     
GenericName[dz]=????????? ????????                             
GenericName[el]=???????????? ???????                           
GenericName[en_CA]=Image Editor                                
GenericName[en_GB]=Image Editor                                
GenericName[eo]=Bilada Redaktilo                               
GenericName[es]=Editor de imagen                               
GenericName[et]=Pildiredaktor                                  
GenericName[eu]=Irudi-editorea                                 
GenericName[fa]=???????? ?????                                 
GenericName[fi]=Kuvank?sittely                                 
GenericName[fr]=?diteur d'image                                
GenericName[gl]=Editor de imaxes                               
GenericName[gu]=???? ?????                                     
GenericName[hu]=K?pszerkeszt?                                  
GenericName[is]=Myndvinnsluforrit                              
GenericName[it]=Editor immagine                                
GenericName[ja]=??????                                   
GenericName[ka]=??????????????? ?????????                      
GenericName[km]=??????????????                                 
GenericName[kn]=??? ??????                                     
GenericName[ko]=??? ???                                  
GenericName[lt]=Paveiksl?li? rengykl?                          
GenericName[lv]=Att?la redaktors                               
GenericName[mk]=??????? ?? ?????                               
GenericName[mr]=?????? ?????                                   
GenericName[nb]=Bildebehandler                                 
GenericName[ne]=??? ??????                                     
GenericName[nl]=Afbeeldingsbewerker                            
GenericName[nn]=Biletbehandlar                                 
GenericName[or]=????? ??????                                   
GenericName[pa]=???? ?????                                     
GenericName[pl]=Edytor obrazu                                  
GenericName[pt]=Editor de Imagens                              
GenericName[pt_BR]=Editor de Imagens                           
GenericName[ro]=Editor de imagine                              
GenericName[ru]=???????? ???????????                           
GenericName[sk]=Editor obr?zkov                                
GenericName[sl]=Urejevalnik slik                               
GenericName[sr]=?????? ?????                                   
GenericName[sr at latin]=Obrada slika                             
GenericName[sv]=Bildredigerare                                 
GenericName[ta]=???? ???????                                   
GenericName[th]=?????????                                      
GenericName[tr]=Resim D?zenleyici                              
GenericName[tt]=S?r?t T?z?tke?                                 
GenericName[uk]=???????? ?????????                             
GenericName[vi]=B? bi?n so?n ?nh                               
GenericName[xh]=UmHleli woMfanekiso                            
GenericName[zh_CN]=?????                                  
GenericName[zh_HK]=?????                                  
GenericName[zh_TW]=?????    
Comment=Image Processing and Analysis in Java
Exec=imagej %f
TryExec=imagej 
Icon=/usr/share/pixmaps/microscope.gif
Terminal=false
Type=Application
Categories=Application;Graphics;
MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjeg;image/png;image/tiff;image/x-bmp;image/x-fits;image/x-png;image/x-psd;image/x-xbitmap;application/dicom;


--- NEW FILE imagej.spec ---
Name:           imagej
Version:        1.43
Release:        1.m%{?dist}
Summary:        Image Processing and Analysis in Java

Group:          Applications/Engineering
License:        Public Domain
URL:            http://rsbweb.nih.gov/ij/index.html
Source0:        http://rsbweb.nih.gov/ij/download/src/ij143m-src.zip
Source1:        %{name}.desktop
Source2:        http://rsbweb.nih.gov/ij/macros/macros.zip
Source3:        http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
# don't copy .class files 
patch0:         %{name}-%{version}-patch0.patch
# modify imagej.sh for fedora compatibility
patch1:         %{name}-%{version}-patch1.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  jpackage-utils
BuildRequires:  java-devel >= 1.6.0
BuildRequires:  ant
BuildRequires:  desktop-file-utils


Requires:       jpackage-utils
# java-devel not java for plugins build
Requires:       java-devel >= 1.6.0

%description
ImageJ is a public domain Java image processing program. It can display,        
edit, analyze a wide variety of image data, including image sequences. Imagej   
can be used for quantitative analysis of engineering and scientific image data.

%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
BuildArch:      noarch
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -c -n "%{name}-%{version}" 
# patch build.xml
%patch0 -p1 -b .patch0
# unzip macros.zip
unzip -u %{SOURCE2} 
# erase binary and useless files 
rm -rf macros/.FBC*
rm macros/build.xml
rm -rf __MACOSX
#get and patch unix-script.txt
cp %{SOURCE3} ./imagej.sh
%patch1 -p1 -b .patch1

find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;

%build
cd source
ant build javadocs
cd ..

%install
rm -rf $RPM_BUILD_ROOT

# install jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p source/ij.jar   \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

# install javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp api  \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}

# install icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp -p source/build/microscope.gif $RPM_BUILD_ROOT%{_datadir}/pixmaps

# install data files
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -p source/build/about.jpg $RPM_BUILD_ROOT%{_datadir}/%{name}/about.jpg
cp -p source/build/IJ_Props.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/IJ_Props.txt

#install macros
chmod 644 macros/About\ Startup\ Macros 
find ./macros -name \*.txt -type f -exec chmod 644 {} \;
find ./macros -type d -exec chmod 755 {} \;
cp -rp macros $RPM_BUILD_ROOT%{_datadir}/%{name}


#install luts
mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/luts 

# install script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
chmod +x imagej.sh
cp -p imagej.sh $RPM_BUILD_ROOT%{_bindir}/%{name}

# directory for plugins
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
cp source/plugins/JavaScriptEvaluator.source $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/JavaScriptEvaluator.java

# desktop file
desktop-file-install --vendor=""                     \
       --dir=%{buildroot}%{_datadir}/applications/   \
       %{SOURCE1}

%post

#update icon cache
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-desktop-database &> /dev/null || :

%postun
# update icon cache
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-desktop-database &> /dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/microscope.gif
%{_bindir}/%{name}
%doc source/aREADME.txt source/release-notes.html source/applet.html

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Fri Dec 11 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-1.m
- version 1.43m 

* Sun Nov 21 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.5.j
- set build directory to {name}-{version}
- modify wrapper script
- add java-devel to requires

* Sun Nov 15 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.4.j
- modify name from ImageJ to imagej
- modify wrapper script for fedora compatibility 

* Mon Nov 10 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.3.j
- get macros from  http://rsbweb.nih.gov/ij/macros/macros.zip
- get launch script from  http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
- don't copy macros in the jar but in /usr/share/ImageJ/macros

* Mon Nov 10 2009 Georget Fabien <fabien.georget at gmail.com> 1.43-0.2.j
- change group to Application/Engineering
- change description
- add comments
- change version tag

* Sat Nov 7 2008 Georget Fabien <fabien.georget at gmail.com> 1.43-0.1
- Creation


--- NEW FILE import.log ---
imagej-1_43-1_m_fc12:F-11:imagej-1.43-1.m.fc12.src.rpm:1260822119


--- NEW FILE unix-script.txt ---
#!/bin/bash 
# A wrapper script to launch imagej from the UNIX command line
# Images given as arguments will be opened, macros may also be given as arguments
# Looks for macros in the imagej macro directory
#
# This program is free software, but comes with no warrenty or guarantee
# send bug reports or feedback to jjackson at familyjackson dot net
# Author: Jon Jackson
# Last modified date: $Date: 2008-09-17 10:31:27 +0100 (Wed, 17 Sep 2008) $
# $Revision: 51 $
#
# INSTALLATION INSTRUCTIONS
#
### WARNING ###########################################################
# This file must be edited with a program that supports unix new line characters
# - it won't run if edited in 'Notepad' !
#######################################################################

# Source location: http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
# 1) Save this script in the ImageJ directory as 'imagej'
# 2) Modify path variables according to your system 
# 3) Give the new file execute permission
# 4) Be sure the 'imagej' wrapper is in the 'PATH' 

# setup environment
set +u # don't give error for unset variables (matters for environment variables)
shopt -s extglob # allow extended pattern matching

############ SITE SPECIFIC VARIABLES #########################
# Trailing / is not required for path variables
# IMAGEJ PATH - production installation
ij_path='/local/ImageJ'
# Path to ImageJ development installation
ij_path_dev='/home/jjackson/ImageJ'
# JAVA PATH
# assumes executable is ${java_home}/bin/java
# set java_home variables ='' to use JAVA_HOME environment variable
if [[ -d /usr/java/jdk1.5 ]] ; then
	java_home='/usr/java/jdk1.5'
else
	# Optionally specify java path for all available OS / architecture combinations
	java_home_Linux="${ij_path}/jre"
	java_home_Linux_x86_64="${ij_path}/jre64"
	java_home_SunOS="${ij_path}/jre64"
	# 
fi
ijadmin=''
# DOCUMENTATION URL
doc_url='http://rsb.info.nih.gov/ij/'

# TEMP FOLDER
ij_tmp='/tmp/imagej'
# LOG FILE
#ij_log="${ij_tmp}/log.txt"
# default behaviour when an ImageJ window is already open
newwindow='true'
#newwindow='false'
# macro argument delimiter character
separator=':'
# a ' ' may work provided no arguments would contain spaces
# use macro functions:  args=getArgument(); argArray=split(args, ':'); 
# to recover macro arguments

############ DEFAULT MEMORY SETTINGS  #########################

declare -i default_mem=768
declare -i min_mem=32
declare -i max_32bit=1800 # empirical
declare -i max_64bit=17000000000 # conservative

############ SITE SPECIFIC MODULES #########################

# JAR libraries for additional modules may be placed in ${ij_path}/lib
# jmf.jar jai_codec.jar jai_core.jar mlibwrapper_jai.jar

# Native libraries may be placed in ${ij_path}/lib/$OS
# where OS matches the output of the 'uname' command

############ END SITE SPECIFIC VARIABLES #########################

OS=$(uname)
processor=$(uname -m) # -p doesn't work on ubuntu
declare -i mem
declare -i max_mem
declare -i free_mem

java_home="${java_home:-$JAVA_HOME}"

if [[ "$OS" == 'SunOS' ]] ; then
    java_arch='-d64'
	JAVA_HOME="${java_home_SunOS:-$java_home}"	
	max_mem=`vmstat | awk 'BEGIN{maxMem='$max_64bit'} NR == 3 {fmem=int($5 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
	free_mem="max_mem"
	mem=${free_mem}/2
	if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
elif [[ "$OS" == 'Linux' ]] ; then
	if [[ "$processor" == 'x86_64' ]] ; then
    	java_arch='-d64'
        JAVA_HOME="${java_home_Linux_x86_64:-$java_home}"
    	max_mem=`free | awk -v maxMem=$max_64bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		free_mem=`free | awk -v maxMem=$max_64bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		mem=${free_mem}/3*2
		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi
	else
		java_arch='-d32'
    	JAVA_HOME="${java_home_Linux:-$java_home}"
    	max_mem=`free | awk -v maxMem=$max_32bit 'NR == 2 {fmem=int($2 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		free_mem=`free | awk -v maxMem=$max_32bit 'NR == 3 {fmem=int($4 / 1024); if (fmem < maxMem) {print fmem} else {print maxMem}}'`
		mem=${free_mem}/3*2
		if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi	
	fi
fi


# if tools.jar is not in ${ij_path}/jre/lib/ext/ edit the 'tools=' line 
# to point to tools.jar. The -compile switch will load tools.jar into the 
# classpath and enable plugins to be compiled in imagej

if [[ -f "${ij_path}/tools.jar" ]] ; then
    tools="${ij_path}/tools.jar"
else
    tools=''
fi

# End Site specific variables ---------------------------------------------------------

# other variables 
dir=`pwd`
user=`whoami`
host=`hostname`
if [[ -z "$DISPLAY" ]] ; then
    echo 'Display variable not set'
    echo 'If ImageJ fails to load, try '
    echo '% setenv DISPLAY yourcomputer:0'
    echo 'if you use the "csh" or for "bash" try'
    echo '% export DISPLAY=yourcomputer:0'
    display='default' 
else
    display="$DISPLAY"
fi

declare -i port=0
declare -i verbosity=0
images=''
macrocmd=''
macroargs=''


function usage {
    echo 
    echo 'Image display and analysis program. Opens formats including:'
    echo 'UNC, Analyze, Dicom, NIFTI, Tiff, Jpeg, Gif, PNG ...'  
    echo
    echo 'imagej [options] image [ image2 ... image3 ]'
    echo '    -h        print help and more options'
    echo '    -o        open images in an open ImageJ panel'
    echo '    -p <N>    open images in ImageJ panel number <N>' 
    echo "    -x <MB>   set available memory (default=${mem} max=${max_mem})"     
    echo 
}

function fullusage {
    echo 
    echo 'Image display and analysis program. Opens formats including:'
    echo 'UNC, Analyze, Dicom, NIFTI, Tiff, Jpeg, Gif, PNG ...'  
    echo 
    echo 'imagej [options] image [ image2 ... image3 ] -> open images'
    echo
    echo 'basic options:'
    echo '  -h        print help and more options'
    echo '  -o        open images in existing ImageJ panel if one exists'
    echo '  -p <N>    open images in existing ImageJ panel number <N>' 
    echo "  -x <MB>   set available memory (default=${mem} max=${max_mem})"
    echo
    echo 'advanced options:'
    echo '  -c        enable plugin compilation within imagej'
    echo '  -d        use development version'
    echo '  -v        be verbose (vv or vvv increases verbosity)'  
    echo
    echo 'options for batch processing:'
    echo "  -e 'Macro Code'            execute macro code"
    echo "  -r 'Menu Command'          run menu command"
    echo "Quotation marks '' are required around commands including spaces"
    echo 'Commands can be sent to open ImageJ panels with the -p option'
    echo 
    echo 'options for macros:'
    echo 'imagej [-i image] [-b|-m] [arg1 ... argN] '
    echo '  -b macro    run macro without graphics window' 
    echo '  -m macro    run macro' 
    echo '"image" will be opened before macro is run'
    echo 'all following arguments are passed to macro'        
    echo 
    echo "Documentation - $doc_url "
	echo "Report problems with this software to $ijadmin"
    echo
}

function macroCmdError {
	fullusage 
	echo 'Only one command option (-b -e -m OR -r) may be specified' 1>&2
	exit 1
}

function getFullPath {
    # Return full path to file
    # treats multiple arguments as a single file with spaces
    if (( $# == 0 )) ; then
        echo "error getting full path for '${*}'" 1>&2
    fi
    pwd_getFullPath="$PWD"
    \cd $(dirname "${*}") > /dev/null
    dir_getFullPath="$PWD"
    \cd "$pwd_getFullPath" > /dev/null
    echo "$dir_getFullPath"/$(basename "${*}")
}
function derefln { 
    # Returns the full path of file to which link points
    # following multiple levels of symbolic links.
    # NOTE: if you use this function in a script, don't use any
    # of the variable names used here
    if (( $# == 0 )) ; then
        return
    fi
    local the_link="$1"
    local link_dir 
    local current_dir="$PWD"
    while file "$the_link" | grep symbolic > /dev/null ; do # resolve links until target is regular file
        if [[ "$the_link" == */* ]] ; then # path contains  /
            \cd $(dirname "${the_link}") > /dev/null
            the_link=$(basename "$the_link")
        fi
        link_dir="$PWD" 
	    # some versions of 'file' surround the path in `' quotes, hence the tr to remove them
        the_link=$(file "${the_link}" | awk '/symbolic link/ {print $NF}' | tr -d "\140\047" )
        if [[ "$the_link" != /* ]] ; then # path is not absolute path  - make it one
            the_link="$link_dir/$the_link"
        fi
        \cd "$current_dir" > /dev/null
    done 
    echo $the_link
}


# parse input arguments
while getopts b:cde:hi:m:nop:r:vx: options
do
	case $options in
		b)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd="-batch ${OPTARG}"
			;;
		c)	modules="${modules:-}${modules+:}${tools}"
			;;
		d)	ij_path="$ij_path_dev"
			;;
		e)  if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd='-eval'
			macroargs="'${OPTARG}'"
			;;
		h)  fullusage
			exit 0
			;;
		i)  images="${images}'${OPTARG}' "
			;;
		m)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd="-macro ${OPTARG}"
			;;
        n)  newwindow='true'
            ;;
		o)  newwindow='false'
			;;
		p)	newwindow='false'
			port="${OPTARG}"
        	if (( "$port" < 1 || "$port" > 99 )) ; then
            	echo "${OPTARG} is not a permissible value for port number (-p)" 1>&2
            	exit 1
        	fi
			;;
		r)	if [[ -n "$macrocmd" ]] ; then macroCmdError ; fi
			macrocmd='-run'
			macroargs="'${OPTARG}'"
			;;
		v)	verbosity=verbosity+1
			if (( $verbosity == 2 )) ; then set -x ; fi
			if (( $verbosity == 3 )) ; then set -v ; fi
			;;
		x)	mem="${OPTARG}"
            newwindow='true'
			if (( $mem < $min_mem || $mem > $max_mem )) ; then
            	echo "${OPTARG} is not a permissible value for memory (-x)" 1>&2
            	echo "min=${min_mem}, max=${max_mem}" 1>&2
            	exit 1				
			fi
			;;
		\?) usage
			exit 1 
			;;
	esac
done
			
#for ((i=1; i < $OPTIND; i++)) 
#do
#	shift
#done
## above syntax not supported in bash < 2.05
declare -i i=1
while (( i < $OPTIND )) ; do
	shift
	i=i+1
done

if [[ "$#" == 0 && -z "$macrocmd" ]] ; then
	usage
fi	

# The best way to install .jar libraries required by plugins is to copy them 
# to the imagej plugins/jars directory
# Alternatively, either copy them to ${ij_path}/jre/lib/ext/ or add the .jar
# filepath to the modules line below. Paths are separated by a colon
# Classpath must follow command line arguments, as ij_path is dependent on the -d option

# Resolving ij.jar path.  If ij.jar is a symbolic link to ij_<version>.jar
# this allows updating ij.jar without crashing running sessions
ij_jar_path=$(derefln ${ij_path}/ij.jar)    
                                         
for mod_jar in ${ij_path}/lib/*jar  ; do
    modules="${modules:-}${modules+:}$mod_jar"
done
modules="-cp ${ij_jar_path}:${modules+:}${modules:-}"
#${ij_path}/plugins/jars/dcmie.jar

export LD_LIBRARY_PATH="${ij_path}/lib/${OS}_$processor"
if (( $verbosity > 0 )) ; then
    echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
fi

# -b and -m options only:
# remaining command line arguments are passed as macro arguments 
# separated by $separator
if [[ -n "$macrocmd" && -z "$macroargs" ]] ; then
	while (( "$#" > 0 )) ; do
        if [[ -z "$macroargs" ]] ; then 
            macroargs="${1}"
        else
            macroargs="${macroargs}${separator}${1}"
        fi
        shift 		
	done
	macroargs="'$macroargs'"
fi

# PROTECT POSSIBLE SPACES IN IMAGE FILENAMES
if (( "$#" > 0 )) ; then
	while (( "$#" > 0 )) ; do
        filearg="${1}"
        # full file path required when sending images to running ImageJ panel
        if [[ "${newwindow}" == 'false' && -f "${filearg}" ]]  && ! expr "${filearg}" : '/.*' > /dev/null; then 
            filearg="$(getFullPath ${filearg})"
        fi
		images="${images}'$filearg' "
		shift 
	done
fi	

# CREATE IMAGEJ SOCKET-LOCK DIRECTORY IF NON EXISTANT 
if [[ ! -d "$ij_tmp" ]] ; then
    mkdir "$ij_tmp"
    chmod 777 "$ij_tmp"
fi

# CREATE IMAGEJ LOG FILE IF NON EXISTANT 
if [[ -n "$ij_log" && ! -f "$ij_log" ]] ; then
    touch "$ij_log"
    chmod 666 "$ij_log"
fi

# CREATES A TEMP FILE INDICATING A PORT IS IN USE BY IMAGEJ
cd "$ij_tmp"
declare -i count=1
portopen='false'
lockFileCreated='false'
declare -a locklist=(`ls | grep '[0-9][0-9]-.*'`)

[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tNew Window = $newwindow" >> "$ij_log" 2> /dev/null
[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tPort = $port" >> "$ij_log" 2> /dev/null
[[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tlocklist: \n ${locklist[*]}" >> "$ij_log" 2> /dev/null
if (( $verbosity > 0 )) ; then echo -e "locklist: \n ${locklist[*]}" ; fi

# PORT SPECIFIED BY USER
if (( $port > 0 )) ; then
    # look for a lock on the port specified
    for lockname in ${locklist[*]} ; do
        prefix=`printf '%02u' $port`
        if [[ "$lockname" == ${prefix}-${user}-${host}* ]] ; then
        	# found lock on the requested port, owned by user on current display
            portopen='true'
            if (( $verbosity > 0 )) ; then echo "Using socket lock: $lockname" ; fi
            count=$port
            break
        elif [[ "$lockname" == ${prefix}-* ]] ; then
            echo "Port $port is in use by some other user or a different host" 1>&2
            if (( $verbosity > 0 )) ; then echo "Port lock: $lockname" ; fi
            exit 1
        fi
    done 
    # specified port not in use 
    count=$port

# IF EXISTING WINDOW IS REQUESTED, LOOK FOR LISTENING PORT
elif [[ "$newwindow" == 'false' && ${#locklist} != 0 ]] ; then
    # look for a lock on the current display for this user
    for lockname in ${locklist[*]} ; do
        if [[ "$lockname" == [0-9][0-9]-${user}-${host}-${display} ]] ; then
            portopen='true'
            if (( $verbosity > 0 )) ; then echo "Found socket lock: $lockname" ; fi
            # if a matching user/display is found, use this one
            count="${lockname%-*-*-*}"
            #count=`echo $lockname | sed  -e 's/^\([0-9][0-9]\).*/\1/' -e 's/^0//'` # csh?
            break
        fi
    done
fi

# IF A NEW PORT IS TO BE USED
if [[ "$portopen" == 'false' ]] ; then
    # new window requested or no matching port found
    # if port is not specified, look for first free port
    if (( "$port" == 0 )) ; then 
        if (( ${#locklist} == 0 )) ; then
            # no active locks - use first port
            count=1
        else
            # active locks - check each port number so see if it is in use
            # this is not synchronised!!
            count=0
            inuse='true'
            while [[ "$inuse" == 'true' ]] ; do
                count=count+1
                prefix=`printf '%02u' $count`
                inuse='false'
                for lockname in ${locklist[*]} ; do
                    if [[ "$lockname" == ${prefix}-* ]] ; then
                        inuse='true'
                    fi
                done
            done
        fi
    fi
    # CREATING A NEW PORT LOCK
    prefix=`printf '%02u' $count`
    lockname=${prefix}-${user}-${host}-${display}
    
    [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tCreating lock\t$lockname" >> "$ij_log" 2> /dev/null
	if (( $verbosity > 0 )) ; then echo -n "creating lock $lockname ... " ; fi
	touch $lockname
	trap '\rm -f ${ij_tmp}/$lockname >/dev/null ; [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tReleasing lock\t$lockname" >> "$ij_log" 2> /dev/null' EXIT TERM KILL 
	# Quitting ImageJ sends EXIT, as does a kill/kill -9 
	# CTRL+C in terminal sends INT + EXIT
	# System shutdown sends TERM (+EXIT??)
	
	if (( $verbosity > 0 )) ; then  echo 'done' ; fi

    lockFileCreated='true'
    if [[ -z "$macrocmd" ]] ; then 
	    echo 'Open other images in this ImageJ panel as follows:'
	    echo "  imagej -p $count <image1> [<image2> ... <imageN>]"
    fi
    [[ -n "$ij_log" ]] && echo -e "$$\t$(date)\tSocket lock:\t$lockname" >> "$ij_log" 2> /dev/null
    if (( $verbosity > 0 )) ; then echo "Socket lock: $lockname" ; fi
	echo
fi

if (( $verbosity > 0 )) ; then
    echo ${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs}
fi

cd "$dir"
eval "${JAVA_HOME}/bin/java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_path} -port${count} ${images} ${macrocmd} ${macroargs} "
exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imagej/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:35:21 -0000	1.1
+++ .cvsignore	14 Dec 2009 20:24:37 -0000	1.2
@@ -0,0 +1,2 @@
+ij143m-src.zip
+macros.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imagej/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:35:21 -0000	1.1
+++ sources	14 Dec 2009 20:24:38 -0000	1.2
@@ -0,0 +1,2 @@
+266866864fd0a2d575338daccc09ec72  ij143m-src.zip
+8161ec95aa84e9fa3e46e68a00fada4d  macros.zip



From kyle at fedoraproject.org  Mon Dec 14 20:25:12 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 14 Dec 2009 20:25:12 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.8.bz2.sign, NONE, 1.1 .cvsignore,
	1.1134, 1.1135 kernel.spec, 1.1954, 1.1955 sources, 1.1092,
	1.1093 upstream, 1.1006, 1.1007 patch-2.6.31.7.bz2.sign, 1.1, NONE
Message-ID: <20091214202512.A241511C00EB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3061

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31.8.bz2.sign 
Removed Files:
	patch-2.6.31.7.bz2.sign 
Log Message:
* Mon Dec 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.8-169
- 2.6.31.8



--- NEW FILE patch-2.6.31.8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLJnAZyGugalF9Dw4RAkh1AJ4wiHC57Oor6t030ayJQSoosL0+YQCfVxf0
LU9kJXlet2fV/7vU2ETOh1I=
=AKEE
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1134
retrieving revision 1.1135
diff -u -p -r1.1134 -r1.1135
--- .cvsignore	11 Dec 2009 00:24:05 -0000	1.1134
+++ .cvsignore	14 Dec 2009 20:25:12 -0000	1.1135
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.7.bz2
+patch-2.6.31.8.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1954
retrieving revision 1.1955
diff -u -p -r1.1954 -r1.1955
--- kernel.spec	11 Dec 2009 01:31:47 -0000	1.1954
+++ kernel.spec	14 Dec 2009 20:25:12 -0000	1.1955
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 7
+%define stable_update 8
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -803,9 +803,6 @@ Patch14456: tg3-06-fix-5906-transmit-han
 
 Patch14463: dlm-fix-connection-close-handling.patch
 
-# rhbz#544471
-Patch14465: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1502,9 +1499,6 @@ ApplyPatch sched-update-the-clock-of-run
 
 ApplyPatch dlm-fix-connection-close-handling.patch
 
-# rhbz#544471
-ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2154,6 +2148,9 @@ fi
 # and build.
 
 %changelog
+* Mon Dec 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.8-169
+- 2.6.31.8
+
 * Thu Dec 10 2009 Kyle McMartin <kyle at redhat.com>
 - ipv4-fix-null-ptr-deref-in-ip_fragment.patch: upstream.
 - nuke highmem patches now in stable.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1092
retrieving revision 1.1093
diff -u -p -r1.1092 -r1.1093
--- sources	11 Dec 2009 00:24:06 -0000	1.1092
+++ sources	14 Dec 2009 20:25:12 -0000	1.1093
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-801b9c379a12339c0210dc5d1a8e9537  patch-2.6.31.7.bz2
+0fda994c76a981a67464f43c766f2180  patch-2.6.31.8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1006
retrieving revision 1.1007
diff -u -p -r1.1006 -r1.1007
--- upstream	11 Dec 2009 00:24:06 -0000	1.1006
+++ upstream	14 Dec 2009 20:25:12 -0000	1.1007
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.7.bz2
+patch-2.6.31.8.bz2


--- patch-2.6.31.7.bz2.sign DELETED ---



From dcbw at fedoraproject.org  Mon Dec 14 20:26:35 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:26:35 +0000 (UTC)
Subject: File NetworkManager-vpnc-0.7.997.tar.bz2 uploaded to lookaside cache
	by dcbw
Message-ID: <20091214202635.E596528ED18@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for NetworkManager-vpnc:

fa7fae637c75607a87d8e370cd8ef9d1  NetworkManager-vpnc-0.7.997.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec 14 20:29:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:29:05 +0000
Subject: [pkgdb] ncmpcpp: arbiter has requested commit
Message-ID: <20091214202906.9C22128ED51@bastion3.fedora.phx2.redhat.com>

arbiter has requested the commit acl on ncmpcpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Mon Dec 14 20:29:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:29:10 +0000
Subject: [pkgdb] ncmpcpp: arbiter has given up watchcommits
Message-ID: <20091214202911.5010228ED51@bastion3.fedora.phx2.redhat.com>

arbiter has given up the watchcommits acl on ncmpcpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Mon Dec 14 20:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:29:15 +0000
Subject: [pkgdb] ncmpcpp: arbiter has given up watchbugzilla
Message-ID: <20091214202916.5FEBF28ED4F@bastion3.fedora.phx2.redhat.com>

arbiter has given up the watchbugzilla acl on ncmpcpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Mon Dec 14 20:29:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:29:26 +0000
Subject: [pkgdb] ncmpcpp: arbiter has requested commit
Message-ID: <20091214202927.6996828ED4F@bastion3.fedora.phx2.redhat.com>

arbiter has requested the commit acl on ncmpcpp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Mon Dec 14 20:29:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:29:31 +0000
Subject: [pkgdb] ncmpcpp: arbiter has requested commit
Message-ID: <20091214202932.54B5928ED5A@bastion3.fedora.phx2.redhat.com>

arbiter has requested the commit acl on ncmpcpp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Mon Dec 14 20:29:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:29:37 +0000
Subject: [pkgdb] ncmpcpp: arbiter has given up watchcommits
Message-ID: <20091214202937.F1C7A28ED5A@bastion3.fedora.phx2.redhat.com>

arbiter has given up the watchcommits acl on ncmpcpp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Mon Dec 14 20:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:29:47 +0000
Subject: [pkgdb] ncmpcpp: arbiter has given up watchbugzilla
Message-ID: <20091214202948.A6ACD28ED7D@bastion3.fedora.phx2.redhat.com>

arbiter has given up the watchbugzilla acl on ncmpcpp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Mon Dec 14 20:30:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:30:49 +0000
Subject: [pkgdb] ncmpcpp: arbiter has given up watchbugzilla
Message-ID: <20091214203050.AE92B28ED8E@bastion3.fedora.phx2.redhat.com>

arbiter has given up the watchbugzilla acl on ncmpcpp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Mon Dec 14 20:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 20:30:52 +0000
Subject: [pkgdb] ncmpcpp: arbiter has given up watchcommits
Message-ID: <20091214203053.ADF5328ED77@bastion3.fedora.phx2.redhat.com>

arbiter has given up the watchcommits acl on ncmpcpp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From dcbw at fedoraproject.org  Mon Dec 14 20:32:32 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:32:32 +0000 (UTC)
Subject: File NetworkManager-openvpn-0.7.997.tar.bz2 uploaded to lookaside
	cache by dcbw
Message-ID: <20091214203232.D996C28ED22@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for NetworkManager-openvpn:

90deb680bb62a9f846c794e56f5713b4  NetworkManager-openvpn-0.7.997.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 20:32:56 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:32:56 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.29,
	1.30 NetworkManager-vpnc.spec, 1.57, 1.58 sources, 1.36, 1.37
Message-ID: <20091214203256.567CB11C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4545

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Log Message:
* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1
- Add some debug options (VPNC_DEBUG, --persist)
- Make .desktop file pass validation (rh #489475)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	21 Sep 2009 22:49:44 -0000	1.29
+++ .cvsignore	14 Dec 2009 20:32:56 -0000	1.30
@@ -25,3 +25,4 @@ NetworkManager-vpnc-0.7.0.97.tar.gz
 NetworkManager-vpnc-0.7.0.99.tar.gz
 NetworkManager-vpnc-0.7.996.git20090828.tar.bz2
 NetworkManager-vpnc-0.7.996.git20090921.tar.bz2
+NetworkManager-vpnc-0.7.997.tar.bz2


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- NetworkManager-vpnc.spec	21 Sep 2009 22:48:21 -0000	1.57
+++ NetworkManager-vpnc.spec	14 Dec 2009 20:32:56 -0000	1.58
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.996-1
+%define nm_version          1:0.7.997-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define vpnc_version        0.5
 %define shared_mime_version 0.16-3
 
-%define git_snapshot .git20090921
+%define git_snapshot %{nil}
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   0.7.996
-Release:   3%{git_snapshot}%{?dist}
+Version:   0.7.997
+Release:   1%{git_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -97,6 +97,10 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1
+- Add some debug options (VPNC_DEBUG, --persist)
+- Make .desktop file pass validation (rh #489475)
+
 * Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-3
 - Rebuild for updated NetworkManager
 - Convert imported files to UTF8 before parsing


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	21 Sep 2009 22:49:45 -0000	1.36
+++ sources	14 Dec 2009 20:32:56 -0000	1.37
@@ -1 +1 @@
-2659f140a0fd631ea1067c2df493a82c  NetworkManager-vpnc-0.7.996.git20090921.tar.bz2
+fa7fae637c75607a87d8e370cd8ef9d1  NetworkManager-vpnc-0.7.997.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 20:33:38 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:33:38 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel .cvsignore, 1.21,
	1.22 NetworkManager-openvpn.spec, 1.40, 1.41 sources, 1.25, 1.26
Message-ID: <20091214203338.0BE1411C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4740

Modified Files:
	.cvsignore NetworkManager-openvpn.spec sources 
Log Message:
* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1
- Implement export capability
- Fix some import bugs
- Correctly handle PEM certificates without an ending newline (rh #507315)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	23 Sep 2009 09:33:47 -0000	1.21
+++ .cvsignore	14 Dec 2009 20:33:37 -0000	1.22
@@ -16,3 +16,4 @@ NetworkManager-openvpn-0.7.1.git20090714
 NetworkManager-openvpn-0.7.996.git20090828.tar.bz2
 NetworkManager-openvpn-0.7.996.git20090921.tar.bz2
 NetworkManager-openvpn-0.7.996.git20090923.tar.bz2
+NetworkManager-openvpn-0.7.997.tar.bz2


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- NetworkManager-openvpn.spec	5 Oct 2009 17:43:50 -0000	1.40
+++ NetworkManager-openvpn.spec	14 Dec 2009 20:33:37 -0000	1.41
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.996-2
+%define nm_version          1:0.7.997-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define snapshot .git20090923
+%define snapshot %{nil}
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
-Version: 0.7.996
-Release: 4%{snapshot}%{?dist}
+Version: 0.7.997
+Release: 1%{snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -103,6 +103,11 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1
+- Implement export capability
+- Fix some import bugs
+- Correctly handle PEM certificates without an ending newline (rh #507315)
+
 * Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090923
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	23 Sep 2009 09:33:47 -0000	1.25
+++ sources	14 Dec 2009 20:33:37 -0000	1.26
@@ -1 +1 @@
-07cf14f98db13b87ad677f9db2f568dc  NetworkManager-openvpn-0.7.996.git20090923.tar.bz2
+90deb680bb62a9f846c794e56f5713b4  NetworkManager-openvpn-0.7.997.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 20:38:28 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:38:28 +0000 (UTC)
Subject: File NetworkManager-pptp-0.7.997.tar.bz2 uploaded to lookaside cache
	by dcbw
Message-ID: <20091214203828.794DD28ED4E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for NetworkManager-pptp:

8cc3b32ec753421327fa64a82c571b24  NetworkManager-pptp-0.7.997.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 20:38:55 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:38:55 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/devel .cvsignore, 1.10,
	1.11 NetworkManager-pptp.spec, 1.18, 1.19 sources, 1.10, 1.11
Message-ID: <20091214203855.3621D11C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5689

Modified Files:
	.cvsignore NetworkManager-pptp.spec sources 
Log Message:
* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1
- Add debugging helpers
- Fix saving MPPE-related settings from the properties dialog
- Resolve PPTP gateway hostname if necessary




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Sep 2009 22:59:20 -0000	1.10
+++ .cvsignore	14 Dec 2009 20:38:54 -0000	1.11
@@ -7,3 +7,4 @@ NetworkManager-pptp-0.7.0.97.tar.bz2
 NetworkManager-pptp-0.7.0.99.tar.bz2
 NetworkManager-pptp-0.7.996.git20090828.tar.bz2
 NetworkManager-pptp-0.7.996.git20090921.tar.bz2
+NetworkManager-pptp-0.7.997.tar.bz2


Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- NetworkManager-pptp.spec	5 Oct 2009 17:59:50 -0000	1.18
+++ NetworkManager-pptp.spec	14 Dec 2009 20:38:54 -0000	1.19
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.996-2
+%define nm_version          1:0.7.997-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot .git20090921
+%define svn_snapshot %{nil}
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
-Version:   0.7.996
-Release:   4%{svn_snapshot}%{?dist}
+Version:   0.7.997
+Release:   1%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -104,6 +104,11 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1
+- Add debugging helpers
+- Fix saving MPPE-related settings from the properties dialog
+- Resolve PPTP gateway hostname if necessary
+
 * Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Sep 2009 22:59:21 -0000	1.10
+++ sources	14 Dec 2009 20:38:54 -0000	1.11
@@ -1 +1 @@
-7793770d136a65e8aebb66855a4f2ab4  NetworkManager-pptp-0.7.996.git20090921.tar.bz2
+8cc3b32ec753421327fa64a82c571b24  NetworkManager-pptp-0.7.997.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 20:42:05 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:42:05 +0000 (UTC)
Subject: File NetworkManager-openconnect-0.7.997.tar.bz2 uploaded to
	lookaside cache by dcbw
Message-ID: <20091214204205.D352728ED4E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for NetworkManager-openconnect:

a54fc1e072ba618fe21be25ceb4d8a61  NetworkManager-openconnect-0.7.997.tar.bz2



From dcbw at fedoraproject.org  Mon Dec 14 20:42:48 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 20:42:48 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/devel .cvsignore, 1.8,
	1.9 NetworkManager-openconnect.spec, 1.18, 1.19 sources, 1.9, 1.10
Message-ID: <20091214204249.0574911C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6761

Modified Files:
	.cvsignore NetworkManager-openconnect.spec sources 
Log Message:
* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1
- Correctly handle PEM certificates without an ending newline (rh #507315)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Sep 2009 23:08:41 -0000	1.8
+++ .cvsignore	14 Dec 2009 20:42:48 -0000	1.9
@@ -3,3 +3,4 @@ NetworkManager-openconnect-0.7.0.97.tar.
 NetworkManager-openconnect-0.7.0.99.tar.gz
 NetworkManager-openconnect-0.7.996.git20090828.tar.bz2
 NetworkManager-openconnect-0.7.996.git20090921.tar.bz2
+NetworkManager-openconnect-0.7.997.tar.bz2


Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- NetworkManager-openconnect.spec	5 Oct 2009 18:02:09 -0000	1.18
+++ NetworkManager-openconnect.spec	14 Dec 2009 20:42:48 -0000	1.19
@@ -1,14 +1,14 @@
-%define nm_version          1:0.7.996-2
+%define nm_version          1:0.7.997-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openconnect_version 0.99
 
-%define svn_snapshot        .git20090921
+%define svn_snapshot %{nil}
 
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
-Version:   0.7.996
-Release:   4%{svn_snapshot}%{?dist}
+Version:   0.7.997
+Release:   1%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -96,6 +96,9 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.997-1
+- Correctly handle PEM certificates without an ending newline (rh #507315)
+
 * Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Sep 2009 23:08:41 -0000	1.9
+++ sources	14 Dec 2009 20:42:48 -0000	1.10
@@ -1 +1 @@
-9b1fddcc1b98f3223d33644a59cd96d7  NetworkManager-openconnect-0.7.996.git20090921.tar.bz2
+a54fc1e072ba618fe21be25ceb4d8a61  NetworkManager-openconnect-0.7.997.tar.bz2



From kwizart at fedoraproject.org  Mon Dec 14 20:49:27 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 14 Dec 2009 20:49:27 +0000 (UTC)
Subject: rpms/perl-BDB/F-12 perl-BDB.spec, 1.9, 1.10 BDB-1.84-nocommon.patch,
	1.1, NONE
Message-ID: <20091214204927.37DE211C00EB@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7792

Modified Files:
	perl-BDB.spec 
Removed Files:
	BDB-1.84-nocommon.patch 
Log Message:
- Update to 1.86
- Drop patch0



Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/F-12/perl-BDB.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-BDB.spec	31 Aug 2009 15:21:53 -0000	1.9
+++ perl-BDB.spec	14 Dec 2009 20:49:27 -0000	1.10
@@ -1,16 +1,16 @@
 Name:           perl-BDB
-Version:        1.84
-Release:        1%{?dist}
+Version:        1.86
+Release:        3%{?dist}
 Summary:        Asynchronous Berkeley DB access
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/BDB/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/BDB-%{version}.tar.gz
-Patch0:         BDB-1.84-nocommon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(common::sense)
 BuildRequires:  db4-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -20,7 +20,6 @@ Asynchronous Berkeley DB access.
 
 %prep
 %setup -q -n BDB-%{version}
-%patch0 -p1 -b .nocommon
 
 
 %build
@@ -54,6 +53,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 13 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.86-3
+- Drop Patch0
+
+* Mon Dec 7 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.86-1
+- Update to 1.86
+
 * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.84-1
 - Update to 1.84
 - Add Patch to get rid of common:sense


--- BDB-1.84-nocommon.patch DELETED ---



From itamarjp at fedoraproject.org  Mon Dec 14 20:51:48 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 14 Dec 2009 20:51:48 +0000 (UTC)
Subject: File usbview-1.1.tar.gz uploaded to lookaside cache by itamarjp
Message-ID: <20091214205148.5A40228ECE9@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for usbview:

8bf5e66351156356f3ad07454123affa  usbview-1.1.tar.gz



From jakub at fedoraproject.org  Mon Dec 14 20:52:31 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 14 Dec 2009 20:52:31 +0000 (UTC)
Subject: File gcc-4.4.2-20091214.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091214205231.2573628ED7E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gcc:

d7c6ca8b8bb6d3748d413614aba9dce2  gcc-4.4.2-20091214.tar.bz2



From jakub at fedoraproject.org  Mon Dec 14 20:54:26 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 14 Dec 2009 20:54:26 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-pr41183.patch, NONE, 1.1 .cvsignore, 1.315,
	1.316 gcc.spec, 1.98, 1.99 sources, 1.322, 1.323
Message-ID: <20091214205426.89A0111C00EB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8996

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-pr41183.patch 
Log Message:
4.4.2-17

gcc44-pr41183.patch:
 cp/cp-tree.h                       |    3 ++-
 testsuite/g++.dg/torture/pr41183.C |   30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-pr41183.patch ---
2009-12-14  Jakub Jelinek  <jakub at redhat.com>

	PR c++/41183
	* cp-tree.h (current_class_ptr): Give NULL even when cfun
	has NULL cfun->language.

	* g++.dg/torture/pr41183.C: New test.

--- gcc/cp/cp-tree.h.jj	2009-09-24 10:21:50.000000000 +0200
+++ gcc/cp/cp-tree.h	2009-12-14 15:06:38.000000000 +0100
@@ -883,7 +883,8 @@ struct language_function GTY(())
    expression for `*this'.  */
 
 #define current_class_ptr \
-  (cfun ? cp_function_chain->x_current_class_ptr : NULL_TREE)
+  (cfun && cp_function_chain					\
+   ? cp_function_chain->x_current_class_ptr : NULL_TREE)
 #define current_class_ref \
   (cfun ? cp_function_chain->x_current_class_ref : NULL_TREE)
 
--- gcc/testsuite/g++.dg/torture/pr41183.C.jj	2009-12-14 15:10:57.000000000 +0100
+++ gcc/testsuite/g++.dg/torture/pr41183.C	2009-12-14 15:11:01.000000000 +0100
@@ -0,0 +1,30 @@
+// PR c++/41183
+// { dg-do compile }
+
+void foo (const char *);
+
+template <int *>
+struct A
+{
+  template <typename T> A (const int &, T);
+  int i;
+};
+
+template <int *X>
+template <typename T>
+A<X>::A (const int &j, T) : i(j)
+{
+  foo (0);
+  foo (0);
+  foo (__PRETTY_FUNCTION__);
+}
+
+int N;
+
+struct B
+{
+  B ();
+  A<&N> a;
+};
+
+B::B() : a(N, 0) {}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- .cvsignore	11 Dec 2009 20:43:03 -0000	1.315
+++ .cvsignore	14 Dec 2009 20:54:26 -0000	1.316
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091211.tar.bz2
+gcc-4.4.2-20091214.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- gcc.spec	11 Dec 2009 20:43:03 -0000	1.98
+++ gcc.spec	14 Dec 2009 20:54:26 -0000	1.99
@@ -1,9 +1,9 @@
-%global DATE 20091211
-%global SVNREV 155176
+%global DATE 20091214
+%global SVNREV 155239
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 16
+%global gcc_release 17
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,6 +161,7 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
+Patch20: gcc44-pr41183.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -466,6 +467,7 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
+%patch20 -p0 -b .pr41183~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1851,6 +1853,15 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Dec 14 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-17
+- propagate TREE_NOTHROW/TREE_READONLY/DECL_PURE_P from ipa-pure-const and
+  EH opt to all same body aliases (#547286)
+- don't emit DWARF location list entries with no location or DW_AT_location
+  with empty blocks (PR debug/41473)
+- fix up AMD LWP support
+- don't crash when mangling C++ decls inside of middle-end generated functions
+  (PR c++/41183)
+
 * Fri Dec 11 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-16
 - update from gcc-4_4-branch
   - PRs c++/27425, c++/34274, c++/42301, fortran/42268, java/41991,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- sources	11 Dec 2009 20:43:03 -0000	1.322
+++ sources	14 Dec 2009 20:54:26 -0000	1.323
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-10e73e2a3e3d5d5d9ca01395b2af5621  gcc-4.4.2-20091211.tar.bz2
+d7c6ca8b8bb6d3748d413614aba9dce2  gcc-4.4.2-20091214.tar.bz2



From itamarjp at fedoraproject.org  Mon Dec 14 20:55:32 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 14 Dec 2009 20:55:32 +0000 (UTC)
Subject: rpms/usbview/devel import.log, NONE, 1.1 usbview.desktop, NONE,
	1.1 usbview.spec, NONE, 1.1 usbview_icon.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214205532.9A89811C00EB@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/usbview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8739/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log usbview.desktop usbview.spec usbview_icon.png 
Log Message:
initial import



--- NEW FILE import.log ---
usbview-1_1-3_fc13:HEAD:usbview-1.1-3.fc13.src.rpm:1260823919


--- NEW FILE usbview.desktop ---
[Desktop Entry]
Name=USB Viewer
GenericName=USB Viewer
Comment=USB topology and device viewer
Exec=usbview
Icon=usbview_icon
Terminal=false
Type=Application
Categories=System;


--- NEW FILE usbview.spec ---
Name:           usbview
Version:        1.1
Release:        3%{?dist}
Summary:        USB topology and device viewer

Group:          Applications/System
License:        GPLv2
URL:            http://www.kroah.com/linux-usb/
Source0:        http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel

Source1:        %{name}_icon.png
Source2:        %{name}.desktop


BuildRequires:  desktop-file-utils


%description
Display information about the topology of the devices connected to the USB bus
on a Linux machine. It also displays detailed information on the individual
devices.

%prep
%setup -q
# Convert to utf-8
for file in ChangeLog; do
    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
    touch -r $file $file.new && \
    mv $file.new $file
done

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#install desktop icon
install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_icon.png

#install desktop file
desktop-file-install                                    \
--add-category="System"                                 \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
%{SOURCE2}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING* README TODO
%{_bindir}/usbview
%{_mandir}/man8/usbview*
%{_datadir}/pixmaps/%{name}_icon.png
%{_datadir}/applications/%{name}.desktop

%changelog
* Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-3
- increasy usage of macros, fix icon permission

* Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-2
- install desktop icon

* Sun Nov 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-1
- Initial RPM for fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:40:18 -0000	1.1
+++ .cvsignore	14 Dec 2009 20:55:32 -0000	1.2
@@ -0,0 +1 @@
+usbview-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:40:18 -0000	1.1
+++ sources	14 Dec 2009 20:55:32 -0000	1.2
@@ -0,0 +1 @@
+8bf5e66351156356f3ad07454123affa  usbview-1.1.tar.gz



From itamarjp at fedoraproject.org  Mon Dec 14 20:57:03 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 14 Dec 2009 20:57:03 +0000 (UTC)
Subject: rpms/usbview/F-12 import.log, NONE, 1.1 usbview.desktop, NONE,
	1.1 usbview.spec, NONE, 1.1 usbview_icon.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214205703.9A36111C00EB@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/usbview/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9666/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log usbview.desktop usbview.spec usbview_icon.png 
Log Message:
initial import



--- NEW FILE import.log ---
usbview-1_1-3_fc13:F-12:usbview-1.1-3.fc13.src.rpm:1260824186


--- NEW FILE usbview.desktop ---
[Desktop Entry]
Name=USB Viewer
GenericName=USB Viewer
Comment=USB topology and device viewer
Exec=usbview
Icon=usbview_icon
Terminal=false
Type=Application
Categories=System;


--- NEW FILE usbview.spec ---
Name:           usbview
Version:        1.1
Release:        3%{?dist}
Summary:        USB topology and device viewer

Group:          Applications/System
License:        GPLv2
URL:            http://www.kroah.com/linux-usb/
Source0:        http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel

Source1:        %{name}_icon.png
Source2:        %{name}.desktop


BuildRequires:  desktop-file-utils


%description
Display information about the topology of the devices connected to the USB bus
on a Linux machine. It also displays detailed information on the individual
devices.

%prep
%setup -q
# Convert to utf-8
for file in ChangeLog; do
    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
    touch -r $file $file.new && \
    mv $file.new $file
done

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#install desktop icon
install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_icon.png

#install desktop file
desktop-file-install                                    \
--add-category="System"                                 \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
%{SOURCE2}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING* README TODO
%{_bindir}/usbview
%{_mandir}/man8/usbview*
%{_datadir}/pixmaps/%{name}_icon.png
%{_datadir}/applications/%{name}.desktop

%changelog
* Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-3
- increasy usage of macros, fix icon permission

* Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-2
- install desktop icon

* Sun Nov 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-1
- Initial RPM for fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:40:18 -0000	1.1
+++ .cvsignore	14 Dec 2009 20:57:03 -0000	1.2
@@ -0,0 +1 @@
+usbview-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:40:18 -0000	1.1
+++ sources	14 Dec 2009 20:57:03 -0000	1.2
@@ -0,0 +1 @@
+8bf5e66351156356f3ad07454123affa  usbview-1.1.tar.gz



From jjohnstn at fedoraproject.org  Mon Dec 14 21:01:25 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Mon, 14 Dec 2009 21:01:25 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-12 eclipse-cdt.spec,1.138,1.139
Message-ID: <20091214210125.AB26811C00EB@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10566

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Mon Dec 14 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-6
- Fix build id to match upstream 6.0.1.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- eclipse-cdt.spec	11 Dec 2009 22:11:48 -0000	1.138
+++ eclipse-cdt.spec	14 Dec 2009 21:01:25 -0000	1.139
@@ -9,7 +9,7 @@ Epoch: 1
 %define majmin                  %{major}.%{minor}
 %define micro                   1
 %define eclipse_base            %{_libdir}/eclipse
-%define build_id		200906161748
+%define build_id		200909110608
 
 
 # All arches line up except i386 -> x86
@@ -621,6 +621,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Dec 14 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-6
+- Fix build id to match upstream 6.0.1.
+
 * Fri Dec 11 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-5
 - Rebase Autotools to Linux tools 0.4.0.1 release.
 - Rebase Libhover to Linux tools 0.4.0 release.



From itamarjp at fedoraproject.org  Mon Dec 14 21:01:56 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 14 Dec 2009 21:01:56 +0000 (UTC)
Subject: rpms/usbview/F-11 import.log, NONE, 1.1 usbview.desktop, NONE,
	1.1 usbview.spec, NONE, 1.1 usbview_icon.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214210156.0E58011C00EB@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/usbview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10371/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log usbview.desktop usbview.spec usbview_icon.png 
Log Message:
initial import



--- NEW FILE import.log ---
usbview-1_1-3_fc13:F-11:usbview-1.1-3.fc13.src.rpm:1260824304


--- NEW FILE usbview.desktop ---
[Desktop Entry]
Name=USB Viewer
GenericName=USB Viewer
Comment=USB topology and device viewer
Exec=usbview
Icon=usbview_icon
Terminal=false
Type=Application
Categories=System;


--- NEW FILE usbview.spec ---
Name:           usbview
Version:        1.1
Release:        3%{?dist}
Summary:        USB topology and device viewer

Group:          Applications/System
License:        GPLv2
URL:            http://www.kroah.com/linux-usb/
Source0:        http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel

Source1:        %{name}_icon.png
Source2:        %{name}.desktop


BuildRequires:  desktop-file-utils


%description
Display information about the topology of the devices connected to the USB bus
on a Linux machine. It also displays detailed information on the individual
devices.

%prep
%setup -q
# Convert to utf-8
for file in ChangeLog; do
    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
    touch -r $file $file.new && \
    mv $file.new $file
done

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#install desktop icon
install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_icon.png

#install desktop file
desktop-file-install                                    \
--add-category="System"                                 \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
%{SOURCE2}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING* README TODO
%{_bindir}/usbview
%{_mandir}/man8/usbview*
%{_datadir}/pixmaps/%{name}_icon.png
%{_datadir}/applications/%{name}.desktop

%changelog
* Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-3
- increasy usage of macros, fix icon permission

* Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-2
- install desktop icon

* Sun Nov 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-1
- Initial RPM for fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:40:18 -0000	1.1
+++ .cvsignore	14 Dec 2009 21:01:55 -0000	1.2
@@ -0,0 +1 @@
+usbview-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:40:18 -0000	1.1
+++ sources	14 Dec 2009 21:01:55 -0000	1.2
@@ -0,0 +1 @@
+8bf5e66351156356f3ad07454123affa  usbview-1.1.tar.gz



From jjohnstn at fedoraproject.org  Mon Dec 14 21:02:44 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Mon, 14 Dec 2009 21:02:44 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-12 eclipse-cdt.spec,1.139,1.140
Message-ID: <20091214210244.80DF711C00EB@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10875

Modified Files:
	eclipse-cdt.spec 
Log Message:

Fix release number.



Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- eclipse-cdt.spec	14 Dec 2009 21:01:25 -0000	1.139
+++ eclipse-cdt.spec	14 Dec 2009 21:02:44 -0000	1.140
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt



From itamarjp at fedoraproject.org  Mon Dec 14 21:05:31 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 14 Dec 2009 21:05:31 +0000 (UTC)
Subject: rpms/usbview/EL-5 import.log, NONE, 1.1 usbview.desktop, NONE,
	1.1 usbview.spec, NONE, 1.1 usbview_icon.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214210531.E7D5211C00EB@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/usbview/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11356/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log usbview.desktop usbview.spec usbview_icon.png 
Log Message:
initial import



--- NEW FILE import.log ---
usbview-1_1-3_fc13:EL-5:usbview-1.1-3.fc13.src.rpm:1260824579


--- NEW FILE usbview.desktop ---
[Desktop Entry]
Name=USB Viewer
GenericName=USB Viewer
Comment=USB topology and device viewer
Exec=usbview
Icon=usbview_icon
Terminal=false
Type=Application
Categories=System;


--- NEW FILE usbview.spec ---
Name:           usbview
Version:        1.1
Release:        3%{?dist}
Summary:        USB topology and device viewer

Group:          Applications/System
License:        GPLv2
URL:            http://www.kroah.com/linux-usb/
Source0:        http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel

Source1:        %{name}_icon.png
Source2:        %{name}.desktop


BuildRequires:  desktop-file-utils


%description
Display information about the topology of the devices connected to the USB bus
on a Linux machine. It also displays detailed information on the individual
devices.

%prep
%setup -q
# Convert to utf-8
for file in ChangeLog; do
    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
    touch -r $file $file.new && \
    mv $file.new $file
done

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#install desktop icon
install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_icon.png

#install desktop file
desktop-file-install                                    \
--add-category="System"                                 \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
%{SOURCE2}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING* README TODO
%{_bindir}/usbview
%{_mandir}/man8/usbview*
%{_datadir}/pixmaps/%{name}_icon.png
%{_datadir}/applications/%{name}.desktop

%changelog
* Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-3
- increasy usage of macros, fix icon permission

* Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-2
- install desktop icon

* Sun Nov 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-1
- Initial RPM for fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:40:18 -0000	1.1
+++ .cvsignore	14 Dec 2009 21:05:31 -0000	1.2
@@ -0,0 +1 @@
+usbview-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:40:18 -0000	1.1
+++ sources	14 Dec 2009 21:05:31 -0000	1.2
@@ -0,0 +1 @@
+8bf5e66351156356f3ad07454123affa  usbview-1.1.tar.gz



From dcbw at fedoraproject.org  Mon Dec 14 21:28:17 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 14 Dec 2009 21:28:17 +0000 (UTC)
Subject: rpms/NetworkManager/F-12 NetworkManager.spec, 1.296, 1.297 sources, 
	1.156, 1.157
Message-ID: <20091214212817.A2D4511C00EB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15371

Modified Files:
	NetworkManager.spec sources 
Log Message:
* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-2.git20091214
- core: fix recognition of standalone 802.1x private keys
- applet: clean notification text to ensure it passes libnotify validation




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/NetworkManager.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- NetworkManager.spec	8 Dec 2009 07:59:45 -0000	1.296
+++ NetworkManager.spec	14 Dec 2009 21:28:15 -0000	1.297
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20091214
+%define applet_snapshot .git20091214
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.997
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -360,6 +360,10 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-2.git20091214
+- core: fix recognition of standalone 802.1x private keys
+- applet: clean notification text to ensure it passes libnotify validation
+
 * Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.7.997-1
 - core: remove haldaemon from initscript dependencies (rh #542078)
 - core: handle PEM certificates without an ending newline (rh #507315)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/sources,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- sources	8 Dec 2009 07:59:45 -0000	1.156
+++ sources	14 Dec 2009 21:28:16 -0000	1.157
@@ -1,2 +1,2 @@
-c7d647ffcad0ae2f22e93f1aea8449b5  NetworkManager-0.7.997.tar.bz2
-4a07695989e4584b645fec39a14ab424  network-manager-applet-0.7.997.tar.bz2
+2ad5369255534adb2315a44ef839e2b6  NetworkManager-0.7.997.git20091214.tar.bz2
+c16a47cc1c76e45915e7d8e0580acee7  network-manager-applet-0.7.997.git20091214.tar.bz2



From eseyman at fedoraproject.org  Mon Dec 14 21:37:07 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Mon, 14 Dec 2009 21:37:07 +0000 (UTC)
Subject: File CGI-Application-Structured-Tools-0.007.tar.gz uploaded to
	lookaside cache by eseyman
Message-ID: <20091214213707.65DAB28EDC7@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-CGI-Application-Structured-Tools:

d290b1e7a5c3a0418a162f41ce9f1895  CGI-Application-Structured-Tools-0.007.tar.gz



From eseyman at fedoraproject.org  Mon Dec 14 21:38:09 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Mon, 14 Dec 2009 21:38:09 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Structured-Tools/devel import.log, NONE, 
	1.1 perl-CGI-Application-Structured-Tools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214213809.7A08811C00EB@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16932/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Structured-Tools.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Structured-Tools-0_007-1_fc12:HEAD:perl-CGI-Application-Structured-Tools-0.007-1.fc12.src.rpm:1260826636


--- NEW FILE perl-CGI-Application-Structured-Tools.spec ---
Name:           perl-CGI-Application-Structured-Tools
Version:        0.007
Release:        1%{?dist}
Summary:        Tools to generate and maintain CGI::Application::Structured based web apps
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Structured-Tools/
Source0:        http://www.cpan.org/authors/id/V/VA/VANAMBURG/CGI-Application-Structured-Tools-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application::Structured)
BuildRequires:  perl(DBIx::Class::Schema::Loader)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Slurp)
BuildRequires:  perl(HTML::Template)
BuildRequires:  perl(Module::Signature)
BuildRequires:  perl(Module::Starter)
BuildRequires:  perl(Module::Starter::Plugin::Template)
BuildRequires:  perl(Module::Starter::Simple)
BuildRequires:  perl(Pod::Coverage)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::WWW::Mechanize::CGIApp)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A simple, medium-weight, MVC, DB web micro-framework built on
CGI::Application. The framework combines tested, well known plugins, templates
and helper scripts to provide a rapid development environment.

%prep
%setup -q -n CGI-Application-Structured-Tools-%{version}

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(<tmpl_var)/d'
EOF

%global __perl_requires %{_builddir}/CGI-Application-Structured-Tools-%{version}/%{name}-req
chmod +x %{__perl_requires}

cd lib/CGI/Application/Structured/Tools/templates
for i in create_dbic_schema.pl create_controller.pl \
         boilerplate.t perl-critic.t pod.t pod-coverage.t \
         test-app.t 00-signature.t 01-load.t; do
    chmod 755 $i;
    sed -i 's#!perl#!\/usr\/bin\/perl#' $i;
done

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*
%{_bindir}/cas-starter.pl

%changelog
* Thu Oct 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.007-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:38:33 -0000	1.1
+++ .cvsignore	14 Dec 2009 21:38:08 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Structured-Tools-0.007.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:38:33 -0000	1.1
+++ sources	14 Dec 2009 21:38:09 -0000	1.2
@@ -0,0 +1 @@
+d290b1e7a5c3a0418a162f41ce9f1895  CGI-Application-Structured-Tools-0.007.tar.gz



From eseyman at fedoraproject.org  Mon Dec 14 21:48:40 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Mon, 14 Dec 2009 21:48:40 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Structured-Tools/F-12 import.log, NONE,
	1.1 perl-CGI-Application-Structured-Tools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214214840.64DE411C00EB@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18961/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Structured-Tools.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Structured-Tools-0_007-1_fc12:F-12:perl-CGI-Application-Structured-Tools-0.007-1.fc12.src.rpm:1260826933


--- NEW FILE perl-CGI-Application-Structured-Tools.spec ---
Name:           perl-CGI-Application-Structured-Tools
Version:        0.007
Release:        1%{?dist}
Summary:        Tools to generate and maintain CGI::Application::Structured based web apps
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Structured-Tools/
Source0:        http://www.cpan.org/authors/id/V/VA/VANAMBURG/CGI-Application-Structured-Tools-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application::Structured)
BuildRequires:  perl(DBIx::Class::Schema::Loader)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Slurp)
BuildRequires:  perl(HTML::Template)
BuildRequires:  perl(Module::Signature)
BuildRequires:  perl(Module::Starter)
BuildRequires:  perl(Module::Starter::Plugin::Template)
BuildRequires:  perl(Module::Starter::Simple)
BuildRequires:  perl(Pod::Coverage)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::WWW::Mechanize::CGIApp)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A simple, medium-weight, MVC, DB web micro-framework built on
CGI::Application. The framework combines tested, well known plugins, templates
and helper scripts to provide a rapid development environment.

%prep
%setup -q -n CGI-Application-Structured-Tools-%{version}

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(<tmpl_var)/d'
EOF

%global __perl_requires %{_builddir}/CGI-Application-Structured-Tools-%{version}/%{name}-req
chmod +x %{__perl_requires}

cd lib/CGI/Application/Structured/Tools/templates
for i in create_dbic_schema.pl create_controller.pl \
         boilerplate.t perl-critic.t pod.t pod-coverage.t \
         test-app.t 00-signature.t 01-load.t; do
    chmod 755 $i;
    sed -i 's#!perl#!\/usr\/bin\/perl#' $i;
done

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*
%{_bindir}/cas-starter.pl

%changelog
* Thu Oct 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.007-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:38:33 -0000	1.1
+++ .cvsignore	14 Dec 2009 21:48:39 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Structured-Tools-0.007.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:38:33 -0000	1.1
+++ sources	14 Dec 2009 21:48:39 -0000	1.2
@@ -0,0 +1 @@
+d290b1e7a5c3a0418a162f41ce9f1895  CGI-Application-Structured-Tools-0.007.tar.gz



From eseyman at fedoraproject.org  Mon Dec 14 21:49:38 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Mon, 14 Dec 2009 21:49:38 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Structured-Tools/F-11 import.log, NONE,
	1.1 perl-CGI-Application-Structured-Tools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214214938.F0EBC11C00EB@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19248/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Structured-Tools.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Structured-Tools-0_007-1_fc12:F-11:perl-CGI-Application-Structured-Tools-0.007-1.fc12.src.rpm:1260827360


--- NEW FILE perl-CGI-Application-Structured-Tools.spec ---
Name:           perl-CGI-Application-Structured-Tools
Version:        0.007
Release:        1%{?dist}
Summary:        Tools to generate and maintain CGI::Application::Structured based web apps
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Structured-Tools/
Source0:        http://www.cpan.org/authors/id/V/VA/VANAMBURG/CGI-Application-Structured-Tools-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application::Structured)
BuildRequires:  perl(DBIx::Class::Schema::Loader)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Slurp)
BuildRequires:  perl(HTML::Template)
BuildRequires:  perl(Module::Signature)
BuildRequires:  perl(Module::Starter)
BuildRequires:  perl(Module::Starter::Plugin::Template)
BuildRequires:  perl(Module::Starter::Simple)
BuildRequires:  perl(Pod::Coverage)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::WWW::Mechanize::CGIApp)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A simple, medium-weight, MVC, DB web micro-framework built on
CGI::Application. The framework combines tested, well known plugins, templates
and helper scripts to provide a rapid development environment.

%prep
%setup -q -n CGI-Application-Structured-Tools-%{version}

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(<tmpl_var)/d'
EOF

%global __perl_requires %{_builddir}/CGI-Application-Structured-Tools-%{version}/%{name}-req
chmod +x %{__perl_requires}

cd lib/CGI/Application/Structured/Tools/templates
for i in create_dbic_schema.pl create_controller.pl \
         boilerplate.t perl-critic.t pod.t pod-coverage.t \
         test-app.t 00-signature.t 01-load.t; do
    chmod 755 $i;
    sed -i 's#!perl#!\/usr\/bin\/perl#' $i;
done

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*
%{_bindir}/cas-starter.pl

%changelog
* Thu Oct 15 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.007-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:38:33 -0000	1.1
+++ .cvsignore	14 Dec 2009 21:49:38 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Structured-Tools-0.007.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Structured-Tools/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:38:33 -0000	1.1
+++ sources	14 Dec 2009 21:49:38 -0000	1.2
@@ -0,0 +1 @@
+d290b1e7a5c3a0418a162f41ce9f1895  CGI-Application-Structured-Tools-0.007.tar.gz



From whot at fedoraproject.org  Mon Dec 14 21:56:05 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 14 Dec 2009 21:56:05 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-12 .cvsignore, 1.19, 1.20 sources,
	1.19, 1.20 xorg-x11-drv-synaptics.spec, 1.38,
	1.39 synaptics-1.2.0-timer-fix.patch, 1.1, NONE
Message-ID: <20091214215605.2ADCE11C00EB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20310

Modified Files:
	.cvsignore sources xorg-x11-drv-synaptics.spec 
Removed Files:
	synaptics-1.2.0-timer-fix.patch 
Log Message:
* Mon Dec 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-1
- synaptics 1.2.1
- synaptics-1.2.0-timer-fix.patch: Drop, upstreamed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	9 Oct 2009 00:14:52 -0000	1.19
+++ .cvsignore	14 Dec 2009 21:56:04 -0000	1.20
@@ -1 +1 @@
-xf86-input-synaptics-1.2.0.tar.bz2
+xf86-input-synaptics-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	9 Oct 2009 00:14:52 -0000	1.19
+++ sources	14 Dec 2009 21:56:04 -0000	1.20
@@ -1 +1 @@
-2cf0a2b0b3006bcfcd85bb77d966244a  xf86-input-synaptics-1.2.0.tar.bz2
+29a6f9da5123149e4abc8ff83880ed5c  xf86-input-synaptics-1.2.1.tar.bz2


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- xorg-x11-drv-synaptics.spec	9 Dec 2009 17:43:39 -0000	1.38
+++ xorg-x11-drv-synaptics.spec	14 Dec 2009 21:56:04 -0000	1.39
@@ -6,8 +6,8 @@
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
-Version:        1.2.0
-Release:        3%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,8 +18,6 @@ Source0:        ftp://ftp.x.org/pub/indi
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
-Patch0:		synaptics-1.2.0-timer-fix.patch
-
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -76,7 +74,6 @@ Features:
 %prep
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
-%patch0 -p1 -b .timer-fix
 
 %build
 autoreconf -v --install --force || exit 1
@@ -125,6 +122,10 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Mon Dec 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-1
+- synaptics 1.2.1
+- synaptics-1.2.0-timer-fix.patch: Drop, upstreamed.
+
 * Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.2.0-3
 - synaptics-1.2.0-timer-fix.patch: Don't free the timer in DeviceClose, since
   that gets called on VT switch. (#540248)


--- synaptics-1.2.0-timer-fix.patch DELETED ---



From mjakubicek at fedoraproject.org  Mon Dec 14 21:58:40 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 14 Dec 2009 21:58:40 +0000 (UTC)
Subject: File cvs2svn-trunk.tar.xz uploaded to lookaside cache by mjakubicek
Message-ID: <20091214215840.079E328EDC1@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for cvs2svn:

26ba0403a98d81b471e06179d598581c  cvs2svn-trunk.tar.xz



From mjakubicek at fedoraproject.org  Mon Dec 14 21:59:18 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 14 Dec 2009 21:59:18 +0000 (UTC)
Subject: rpms/cvs2svn/devel cvs2svn.1, NONE, 1.1 .cvsignore, 1.9,
	1.10 cvs2svn.spec, 1.16, 1.17 sources, 1.9, 1.10
Message-ID: <20091214215918.F112011C00EB@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/cvs2svn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20988

Modified Files:
	.cvsignore cvs2svn.spec sources 
Added Files:
	cvs2svn.1 
Log Message:
- Ship also cvs2git from a 2.3.0 prerelease, split common files into a cvs2commons subpackage




--- NEW FILE cvs2svn.1 ---
.\" Process this file with
.\" groff -man -Tascii cvs2svn.1
.TH CVS2SVN "1" "Oct 24, 2004" "Subversion" "User Commands"
.SH NAME
cvs2svn \- convert a cvs repository into a subversion repository
.SH SYNOPSIS
.B cvs2svn
[\fIOPTION\fR]... \fIOUTPUT-OPTION CVS-REPOS-PATH\fR
.br
.B cvs2svn
[\fIOPTION\fR]... \fI--options=PATH\fR
.SH DESCRIPTION
Create a new Subversion repository based on the version history stored in a
CVS repository. Each CVS commit will be mirrored in the Subversion
repository, including such information as date of commit and id of the
committer.
.P
\fICVS-REPOS-PATH\fR is the filesystem path of the part of the CVS
repository that you want to convert.  It is not possible to convert a
CVS repository to which you only have remote access; see the FAQ for
more information.  This path doesn't have to be the top level
directory of a CVS repository; it can point at a project within a
repository, in which case only that project will be converted.  This
path or one of its parent directories has to contain a subdirectory
called CVSROOT (though the CVSROOT directory can be empty).
.P
Multiple CVS repositories can be converted into a single Subversion
repository in a single run of cvs2svn, but only by using an
\fB--options\fR file.
.SH "OPTIONS FILE"
.TP
\fB--options\fR=\fIpath\fR
Read the conversion options from \fIpath\fR instead of from the
command line.  This option allows far more conversion flexibility than
can be achieved using the command-line alone.  See the documentation
for more information.  Only the following command-line options are
allowed in combination with \fB--options\fR: \fB-h\fR/\fB--help\fR,
\fB--help-passes\fR, \fB--version\fR, \fB-v\fR/\fB--verbose\fR,
\fB-q\fR/\fB--quiet\fR, \fB-p\fR/\fB--pass\fR/\fB--passes\fR,
\fB--dry-run\fR, and \fB--profile\fR.
.SH "OUTPUT OPTIONS"
.TP
\fB-s\fR, \fB--svnrepos\fR \fIpath\fR
Write the output of the conversion into a Subversion repository
located at \fIpath\fR.  This option causes a new Subversion repository
to be created at \fIpath\fR unless the \fB--existing-svnrepos\fR
option is also used.
.TP
\fB--existing-svnrepos\fR
Load the converted CVS repository into an existing Subversion
repository, instead of creating a new repository.  (This option should
be used in combination with \fB-s\fR/\fB--svnrepos\fR.)  The
repository must either be empty or contain no paths that overlap with
those that will result from the conversion.  Please note that you need
write permission for the repository files.
.TP
\fB--fs-type\fR
Pass \fI--fs-type\fR=\fItype\fR to "svnadmin create" when creating a
new repository.
.TP
\fB--bdb-txn-nosync\fR
Pass \fI--bdb-txn-nosync\fR to "svnadmin create" when creating a new
BDB-style Subversion repository.
.TP
\fB--create-option\fR=\fIopt\fR
Pass \fIopt\fR to "svnadmin create" when creating a new Subversion
repository (can be specified multiple times to pass multiple options).
.TP
\fB--dumpfile\fR=\fIpath\fR
Just produce a dumpfile; don't commit to an SVN repository.  Write the
dumpfile to \fIpath\fR.
.TP
\fB--dry-run\fR
Do not create a repository or a dumpfile; just print the details of what
cvs2svn would do if it were really converting your repository.
.SH "CONVERSION OPTIONS"
.TP
\fB--trunk-only\fR
Convert only trunk commits, not tags nor branches.
.TP
\fB--trunk\fR=\fIpath\fR
Set the top-level path to use for trunk in the Subversion repository.
The default is \fItrunk\fR.
.TP
\fB--branches\fR=\fIpath\fR
Set the top-level path to use for branches in the Subversion
repository.  The default is \fIbranches\fR.
.TP
\fB--tags\fR=\fIpath\fR
Set the top-level path to use for tags in the Subversion repository.
The default is \fItags\fR.
.TP
\fB--no-prune\fR
When all files are deleted from a directory in the Subversion
repository, don't delete the empty directory (the default is to delete
any empty directories.
.TP
\fB--encoding\fR=\fIencoding\fR
Use \fIencoding\fR as the encoding for filenames, log messages, and
author names in the CVS repos.  This option may be specified
multiple times, in which case the encodings are tried in order
until one succeeds.  Default: ascii.  See
http://docs.python.org/lib/standard-encodings.html for a list of other
standard encodings.
.TP
\fB--fallback-encoding\fR=\fIencoding\fR
If none of the encodings specified with \fB--encoding\fR succeed in
decoding an author name or log message, then fall back to using
\fIencoding\fR in lossy 'replace' mode.  Use of this option may cause
information to be lost, but at least it allows the conversion to run
to completion.  This option only affects the encoding of log messages
and author names; there is no fallback encoding for filenames.  (By
using an \fB--options\fR file, it is possible to specify a fallback
encoding for filenames.)  Default: disabled.
.TP
\fB--symbol-transform\fR=\fIpattern\fR:\fIreplacement\fR
Transform RCS/CVS symbol names before entering them into Subversion.
\fIpattern\fR is a Python regexp pattern that is matches against the
entire symbol name; \fIreplacement\fR is a replacement using Python's
regexp reference syntax.  You may specify any number of these options;
they will be applied in the order given on the command line.
.TP
\fB--symbol-hints\fR=\fIpath\fR
Read symbol conversion hints from \fIpath\fR.  The format of
\fIpath\fR is the same as the format output by
\fB--write-symbol-info\fR, namely a text file with four
whitespace-separated columns: \fIproject-id\fR, \fIsymbol\fR,
\fIconversion\fR, and \fIparent-lod-name\fR.  \fIproject-id\fR is
the numerical ID of the project to which the symbol belongs, counting
from 0.  \fIproject-id\fR can be set to '.' if project-specificity is
not needed.  \fIsymbol-name\fR is the name of the symbol being
specified.  \fIconversion\fR specifies how the symbol should be
converted, and can be one of the values 'branch', 'tag', or 'exclude'.
If \fIconversion\fR is '.', then this rule does not affect how the
symbol is converted.  \fIparent-lod-name\fR is the name of the symbol
from which this symbol should sprout, or '.trunk.' if the symbol
should sprout from trunk.  If \fIparent-lod-name\fR is omitted or '.',
then this rule does not affect the preferred parent of this symbol.
The file may contain blank lines or comment lines (lines whose first
non-whitespace character is '#').
.TP
\fB--force-branch\fR=\fIregexp\fR
Force symbols whose names match \fIregexp\fR to be branches.
\fIregexp\fR must match the whole symbol name.
.TP
\fB--force-tag\fR=\fIregexp\fR
Force symbols whose names match \fIregexp\fR to be tags.  \fIregexp\fR
must match the whole symbol name.
.TP
\fB--exclude\fR=\fIregexp\fR
Exclude branches and tags whose names match \fIregexp\fR from the
conversion.  \fIregexp\fR must match the whole symbol name.
.TP
\fB--keep-trivial-imports\fR
Do not exclude branches that were only used for a single import.  (By
default such branches are excluded because they are usually created by
the inappropriate use of \fBcvs import\fR.)
.TP
\fB--symbol-default\fR=\fIopt\fR
Specify how to convert ambiguous symbols (those that appear in the CVS
archive as both branches and tags).  \fIopt\fR must be `heuristic'
(decide how to treat each ambiguous symbol based on whether it was
used more often as a branch/tag in CVS), `strict' (no default; every
ambiguous symbol has to be resolved manually using
\fB--force-branch\fR, \fB--force-tag\fR, or \fB--exclude\fR), `branch'
(treat every ambiguous symbol as a branch), or `tag' (treat every
ambiguous symbol as a tag).  The default is `heuristic'.
.TP
\fB--keep-cvsignore\fR
Include \fI.cvsignore\fR files in the output.  (Normally they are
unneeded because cvs2svn sets the corresponding \fIsvn:ignore\fR
properties.)
.TP
\fB--retain-conflicting-attic-files\fR
If a file appears both inside an outside of the CVS attic, retain the
attic version in an SVN subdirectory called `Attic'.  (Normally this
situation is treated as a fatal error.)
.TP
\fB--username\fR=\fIname\fR
Set the default username to \fIname\fR when cvs2svn needs to generate
a commit for which CVS does not record the original username.  This
happens when a branch or tag is created.  The default is to use no
author at all for such commits.
.TP
\fB--cvs-revnums\fR
Record CVS revision numbers as file properties in the Subversion
repository.  (Note that unless it is removed explicitly, the last CVS
revision number will remain associated with the file even after the
file is changed within Subversion.)
.TP
\fB--mime-types\fR=\fIfile\fR
Specify an apache-style mime.types \fIfile\fR for setting
svn:mime-type.
.TP
\fB--eol-from-mime-type\fR
For files that don't have the kb expansion mode but have a known mime
type, set the eol-style based on the mime type.  For such files, set
svn:eol-style to "native" if the mime type begins with "text/", and
leave it unset (i.e., no EOL translation) otherwise.  Files with
unknown mime types are not affected by this option.  This option has
no effect unless the \fB--mime-types\fR option is also specified.
.TP
\fB--auto-props\fR=\fIfile\fR
Specify a file in the format of Subversion's config file, whose
[auto-props] section can be used to set arbitrary properties on files
in the Subversion repository based on their filenames.  (The
[auto-props] section header must be present; other sections of the
config file, including the enable-auto-props setting, are ignored.)
Filenames are matched to the filename patterns case-insensitively.
.TP
\fB--default-eol\fR=\fIstyle\fR
Set svn:eol-style to \fIstyle\fR for files that don't have the CVS
`kb' expansion mode and whose end-of-line translation mode hasn't been
determined by one of the other options.  \fIstyle\fR must be `binary'
(default), `native', `CRLF', `LF', or `CR'.
.TP
\fB--keywords-off\fR
By default, cvs2svn sets svn:keywords on CVS files to "author id date"
if the mode of the RCS file in question is either kv, kvl or unset.
If you use the --keywords-off switch, cvs2svn will not set
svn:keywords for any file.  While this will not touch the keywords in
the contents of your files, Subversion will not expand them.
.SH "EXTRACTION OPTIONS"
.TP
\fB--use-internal-co\fR
Use internal code to extract revision contents.  This is up to 50%
faster than using \fB--use-rcs\fR, but needs a lot of disk space:
Roughly the size of your CVS repository plus the peak size of a
complete checkout of the repository with all branches that existed and
still had commits pending at a given time.  This option is the
default.
.TP
\fB--use-rcs\fR
Use RCS 'co' to extract revision contents.
.TP
\fB--use-cvs\fR
Use CVS to extract revision contents (only use this if having
problems with \fB--use-internal-co\fR or \fB--use-rcs\fR, as those
options are much faster).
.SH "ENVIRONMENT OPTIONS"
.TP
\fB--tmpdir\fR=\fIpath\fR
Set the \fIpath\fR to use for temporary data.  Default is a directory
called \fIcvs2svn-tmp\fR under the current directory.
.TP
\fB--svnadmin\fR=\fIpath\fR
Path to the \fIsvnadmin\fR program.  (\fIsvnadmin\fR is needed when
the \fB-s\fR/\fB--svnrepos\fR output option is used.)
.TP
\fB--co\fR=\fIpath\fR
Path to the \fIco\fR program.  (\fIco\fR is needed if the
\fB--use-rcs\fR option is used.)
.TP
\fB--cvs\fR=\fIpath\fR
Path to the \fIcvs\fR program.  (\fIcvs\fR is needed if the
\fB--use-cvs\fR option is used.)
.TP
\fB--sort\fR=\fIpath\fR
Path to the GNU \fIsort\fR program.  (cvs2svn requires GNU sort.)
.SH "PARTIAL CONVERSIONS"
.TP
\fB-p\fR, \fB--pass\fR \fIpass\fR
Execute only pass \fIpass\fR of the conversion.  \fIpass\fR can be
specified by name or by number (see \fB--help-passes\fR).
.TP
\fB-p\fR, \fB--passes\fR [\fIstart\fR]:[\fIend\fR]
Execute passes \fIstart\fR through \fIend\fR of the conversion
(inclusive).  \fIstart\fR and \fIend\fR can be specified by name or by
number (see \fB--help-passes\fR).  If \fIstart\fR or \fIend\fR is
missing, it defaults to the first or last pass, respectively.  For
this to work the earlier passes must have been completed before on the
same CVS repository, and the generated data files must be in the
temporary directory (see \fB--tmpdir\fR).
.SH "INFORMATION OPTIONS"
.TP
\fB--version\fR
Print the version number.
.TP
\fB-h\fR, \fB--help\fR
Print the usage message and exit with success.
.TP
\fB--help-passes\fR
Print the numbers and names of the conversion passes and exit with
success.
.TP
\fB-v\fR, \fB--verbose\fR
Print more information while running.  This option may be specified
twice to output voluminous debugging information.
.TP
\fB-q\fR, \fB--quiet\fR
Print less information while running.  This option may be specified
twice to suppress all non-error output.
.TP
\fB--write-symbol-info\fR=\fIpath\fR
Write symbol statistics and information about how symbols were
converted to \fIpath\fR during CollateSymbolsPass.
.TP
\fB--skip-cleanup\fR
Prevent the deletion of temporary files.
.TP
\fB--profile\fR
Profile with 'hotshot' (into file \fIcvs2svn.hotshot\fR).
.SH FILES
A directory called \fIcvs2svn-tmp\fR (or the directory specified by
\fB--tmpdir\fR) is used as scratch space for temporary data files.
.SH AUTHORS
Main authors are:
.br
C. Michael Pilato <cmpilato at collab.net>
.br
Greg Stein <gstein at lyra.org>
.br
Branko ?ibej <brane at xbc.nu>
.br
Blair Zajac <blair at orcaware.com>
.br
Max Bowsher <maxb at ukf.net>
.br
Brian Fitzpatrick <fitz at red-bean.com>
.br
Tobias Ringstr?m <tobias at ringstrom.mine.nu>
.br
Karl Fogel <kfogel at collab.net>
.br
Erik H?lsmann <e.huelsmann at gmx.net>
.br
David Summers <david at summersoft.fay.ar.us>
.br
Michael Haggerty <mhagger at alum.mit.edu>
.PP
Manpage was written for the Debian GNU/Linux system by
Laszlo 'GCS' Boszormenyi <gcs at lsc.hu> (but may be used by others).
.SH SEE ALSO
cvs(1), svn(1), svnadmin(1)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cvs2svn/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Dec 2008 02:01:54 -0000	1.9
+++ .cvsignore	14 Dec 2009 21:59:18 -0000	1.10
@@ -1 +1 @@
-cvs2svn-2.2.0.tar.gz
+cvs2svn-trunk.tar.xz


Index: cvs2svn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvs2svn/devel/cvs2svn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- cvs2svn.spec	24 Jul 2009 19:51:07 -0000	1.16
+++ cvs2svn.spec	14 Dec 2009 21:59:18 -0000	1.17
@@ -1,29 +1,78 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           cvs2svn
-Version:        2.2.0
-Release:        3%{?dist}
+Version:        2.3.0
+Release:        0.1.r4998svn%{?dist}
 Summary:        CVS to Subversion Repository Converter
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://cvs2svn.tigris.org/
-Source0:        http://cvs2svn.tigris.org/files/documents/1462/44372/cvs2svn-2.2.0.tar.gz
+# The sources tarball has been generated from upstream SVN repository:
+# svn co --username=guest http://cvs2svn.tigris.org/svn/cvs2svn/trunk cvs2svn-trunk
+# (use blank password)
+Source0:        cvs2svn-trunk.tar.xz
+# Man page not in repository (but present in 2.2.0 tarball):
+Source1:        cvs2svn.1
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:       cvs, rcs, subversion
-
+Requires:       subversion
+Requires:       cvs2commons
 
 %description
 cvs2svn is a Python script that converts a CVS repository to a 
 Subversion repository. It is designed for one-time conversions, not for 
 repeated synchronizations between CVS and Subversion.
 
+%package -n cvs2commons
+Summary:        Common files for CVS to Subversion and Git Repository Converter
+Requires:       cvs, rcs
+
+%description -n cvs2commons
+This package contains files common for cvs2svn and cvs2git (Python scripts that
+convert a CVS repository to a Subversion and Git repository).
+
+%package -n cvs2git
+Summary:        CVS to Git Repository Converter
+# earlier versions of git contain a bug in "git fast-import" which makes this package unusable:
+Requires:       git >= 1.5.4.4
+Requires:       cvs2commons
+
+
+%description -n cvs2git
+cvs2git is a Python script that converts a CVS repository to a 
+Git repository. It is designed for one-time conversions, not for 
+repeated synchronizations between CVS and Git.
+
+#
+# FOR FUTURE WORK WHEN BZR-FASTIMPORT WILL BE PACKAGED
+#
+#%package -n cvs2bzr
+#Requires:      bzr >= 1.13
+#Requires:      bzr-fastimport
+#Requires:      cvs2commons
+#%description -n cvs2bzr
+#cvs2bzr is a Python script that converts a CVS repository to a 
+#Bzr repository. It is designed for one-time conversions, not for 
+#repeated synchronizations between CVS and Bzr.
+
+#
+# EXPERIMENTAL, NOT INSTALLED BY DEFAULT => WE DO NOT SHIP IT BY NOW
+#
+#%package -n cvs2hg
+#Summary:        CVS to Subversion, Git, Bzr or Mercurial Repository Converter
+#Requires:      mercurial
+#Requires:      cvs2commons
+#
+#%description -n cvs2hg
+#cvs2bzr is a Python script that converts a CVS repository to a 
+#Mercurial repository. It is designed for one-time conversions, not for 
+#repeated synchronizations between CVS and Mercurial.
 
 %prep
-%setup -q
+%setup -q -n %{name}-trunk
 
 
 %build
@@ -34,23 +83,43 @@ repeated synchronizations between CVS an
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 0644 *.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-
+install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+rm -f $RPM_BUILD_ROOT%{_bindir}/cvs2bzr
+chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}_rcsparse/{run-tests.py,parse_rcs_file.py}
+chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}_lib/{main.py,version.py}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%files -n cvs2commons
+%defattr(-,root,root,-)
+%doc BUGS CHANGES COMMITTERS COPYING HACKING README
+%{python_sitelib}/*
+
 %files
 %defattr(-,root,root,-)
-%doc BUGS CHANGES COMMITTERS COPYING HACKING README www/*.html
-%doc cvs2svn-example.options
-%{_bindir}/*
+%doc cvs2svn-example.options www/cvs2svn.html
 %{_mandir}/man?/*
-%{python_sitelib}/*
+%{_bindir}/cvs2svn
+
+%files -n cvs2git
+%defattr(-,root,root,-)
+%doc cvs2git-example.options www/cvs2git.html
+%{_bindir}/cvs2git
 
+#%files -n cvs2bzr
+#%doc cvs2bzr-example.options www/cvs2bzr.html
+#%{_bindir}/cvs2hg
+
+#%files -n cvs2hg
+#%doc cvs2hg-example.options
+#%{_bindir}/cvs2hg
 
 %changelog
+* Mon Dec 14 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.3.0-0.1.r4998svn
+- Ship also cvs2git from a 2.3.0 prerelease, split common files into a cvs2commons subpackage
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cvs2svn/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Dec 2008 02:01:54 -0000	1.9
+++ sources	14 Dec 2009 21:59:18 -0000	1.10
@@ -1 +1 @@
-466b757fdef5378a46bba4ceefd047a4  cvs2svn-2.2.0.tar.gz
+26ba0403a98d81b471e06179d598581c  cvs2svn-trunk.tar.xz



From chkr at fedoraproject.org  Mon Dec 14 22:06:45 2009
From: chkr at fedoraproject.org (chkr)
Date: Mon, 14 Dec 2009 22:06:45 +0000 (UTC)
Subject: rpms/f-spot/devel f-spot.spec,1.97,1.98
Message-ID: <20091214220645.75C9B11C00EB@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22448

Modified Files:
	f-spot.spec 
Log Message:
* Mon Dec 14 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-2
- Corrected the permission fix for all .exe and .dll files in order
  to generate the dependencies correctly (BZ 547063)



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- f-spot.spec	8 Nov 2009 17:43:40 -0000	1.97
+++ f-spot.spec	14 Dec 2009 22:06:44 -0000	1.98
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -86,7 +86,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f
 
 # only files marked executable are used to auto-generate the
 # requires/provides of the package
-find $RPM_BUILD_ROOT%{_libdir}/%{name} -name '*.exe' -or -name '*.dll' \
+find $RPM_BUILD_ROOT \( -name '*.exe' -or -name '*.dll' \) \
      -exec chmod a+x {} \;
 
 for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -142,6 +142,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Mon Dec 14 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-2
+- Corrected the permission fix for all .exe and .dll files in order
+  to generate the dependencies correctly (BZ 547063)
+
 * Sun Nov 08 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-1
 - Update to 0.6.1.5 (BZ 531955)
 - Build f-spot against system gnome-keyring-sharp library (BZ 442343)



From ajax at fedoraproject.org  Mon Dec 14 22:13:35 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 14 Dec 2009 22:13:35 +0000 (UTC)
Subject: File util-macros-1.4.1.tar.bz2 uploaded to lookaside cache by ajax
Message-ID: <20091214221335.1262528ED38@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for xorg-x11-util-macros:

6c01aac2d7fbefd4f8d80e8320d69c7c  util-macros-1.4.1.tar.bz2



From ajax at fedoraproject.org  Mon Dec 14 22:16:07 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 14 Dec 2009 22:16:07 +0000 (UTC)
Subject: rpms/xorg-x11-util-macros/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xorg-x11-util-macros.spec, 1.31, 1.32
Message-ID: <20091214221607.C8C8A11C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-util-macros/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24459

Modified Files:
	.cvsignore sources xorg-x11-util-macros.spec 
Log Message:
* Mon Dec 14 2009 Adam Jackson <ajax at redhat.com> 1.4.1-1
- util-macros 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	9 Sep 2009 23:04:09 -0000	1.15
+++ .cvsignore	14 Dec 2009 22:16:07 -0000	1.16
@@ -1 +1 @@
-util-macros-1.3.0.tar.bz2
+util-macros-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	9 Sep 2009 23:04:09 -0000	1.15
+++ sources	14 Dec 2009 22:16:07 -0000	1.16
@@ -1 +1 @@
-0837fe88af7d692308b25815457a3288  util-macros-1.3.0.tar.bz2
+6c01aac2d7fbefd4f8d80e8320d69c7c  util-macros-1.4.1.tar.bz2


Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xorg-x11-util-macros.spec	9 Sep 2009 23:04:09 -0000	1.31
+++ xorg-x11-util-macros.spec	14 Dec 2009 22:16:07 -0000	1.32
@@ -3,7 +3,7 @@
 
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
-Version: 1.3.0
+Version: 1.4.1
 Release: 1%{?dist}
 License: MIT
 Group: Development/System
@@ -38,8 +38,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog
 %{_datadir}/aclocal/xorg-macros.m4
+%{_datadir}/pkgconfig/xorg-macros.pc
+%{_docdir}/util-macros/INSTALL
 
 %changelog
+* Mon Dec 14 2009 Adam Jackson <ajax at redhat.com> 1.4.1-1
+- util-macros 1.4.1
+
 * Thu Sep 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
 - util-macros 1.3.0
 



From kwizart at fedoraproject.org  Mon Dec 14 22:20:56 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 14 Dec 2009 22:20:56 +0000 (UTC)
Subject: rpms/libvdpau/F-12 .cvsignore, 1.3, 1.4 libvdpau.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091214222056.D753E11C0375@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25274/F-12

Modified Files:
	.cvsignore libvdpau.spec sources 
Log Message:
- Update to 0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Sep 2009 19:52:33 -0000	1.3
+++ .cvsignore	14 Dec 2009 22:20:56 -0000	1.4
@@ -1 +1 @@
-libvdpau-0.2.tar.gz
+libvdpau-0.3.tar.bz2


Index: libvdpau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/F-12/libvdpau.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvdpau.spec	17 Sep 2009 19:57:07 -0000	1.3
+++ libvdpau.spec	14 Dec 2009 22:20:56 -0000	1.4
@@ -1,14 +1,22 @@
 Name:           libvdpau
-Version:        0.2
+Version:        0.3
 Release:        1%{?dist}
 Summary:        Wrapper library for the Video Decode and Presentation API
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://freedesktop.org/wiki/Software/VDPAU
-Source0:        http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.gz
+Source0:        http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libtool
+
+%{?!_without_docs:
+BuildRequires:  doxygen
+BuildRequires:  graphviz
+BuildRequires:  texlive
+}
+
 BuildRequires:  libX11-devel
 
 
@@ -17,6 +25,14 @@ VDPAU is the Video Decode and Presentati
 It provides an interface to video decode acceleration and presentation
 hardware present in modern GPUs.
 
+%{?!_without_docs:
+%package        docs
+Summary:        Documentation for %{name}
+Group:          Documentation
+
+%description    docs
+The %{name}-docs package contains documentation for %{name}.
+}
 
 %package        devel
 Summary:        Development files for %{name}
@@ -32,11 +48,13 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-
+autoreconf -vif
 
 
 %build
-%configure --disable-static
+%configure --disable-static \
+ %{?_without_docs:--disable-documentation }
+
 make %{?_smp_mflags}
 
 
@@ -46,6 +64,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -59,7 +78,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_libdir}/*.so.*
-%{_libdir}/libvdpau_trace.so
+%dir %{_libdir}/vdpau
+%{_libdir}/vdpau/libvdpau_trace.so*
+
+%{?!_without_docs:
+%files docs
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}
+}
 
 %files devel
 %defattr(-,root,root,-)
@@ -69,6 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 22 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.3-1
+- Update to 0.3
+- Create docs sub-package
+- Allow --without docs conditional
+
 * Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2-1
 - Update to 0.2
 - Disable ExclusiveArch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Sep 2009 19:52:34 -0000	1.3
+++ sources	14 Dec 2009 22:20:56 -0000	1.4
@@ -1 +1 @@
-e0641a208839eb88fe7c01ee5af83735  libvdpau-0.2.tar.gz
+bf714e773ea55ba06d068dee3bc28135  libvdpau-0.3.tar.bz2



From kwizart at fedoraproject.org  Mon Dec 14 22:20:57 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 14 Dec 2009 22:20:57 +0000 (UTC)
Subject: rpms/libvdpau/F-11 .cvsignore, 1.1, 1.2 libvdpau.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091214222057.0763411C0375@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libvdpau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25274/F-11

Modified Files:
	.cvsignore libvdpau.spec sources 
Log Message:
- Update to 0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:07:17 -0000	1.1
+++ .cvsignore	14 Dec 2009 22:20:56 -0000	1.2
@@ -0,0 +1 @@
+libvdpau-0.3.tar.bz2


Index: libvdpau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/F-11/libvdpau.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvdpau.spec	17 Sep 2009 20:28:23 -0000	1.1
+++ libvdpau.spec	14 Dec 2009 22:20:56 -0000	1.2
@@ -1,14 +1,22 @@
 Name:           libvdpau
-Version:        0.2
+Version:        0.3
 Release:        1%{?dist}
 Summary:        Wrapper library for the Video Decode and Presentation API
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://freedesktop.org/wiki/Software/VDPAU
-Source0:        http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.gz
+Source0:        http://people.freedesktop.org/~aplattner/vdpau/libvdpau-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libtool
+
+%{?!_without_docs:
+BuildRequires:  doxygen
+BuildRequires:  graphviz
+BuildRequires:  texlive
+}
+
 BuildRequires:  libX11-devel
 
 
@@ -17,6 +25,14 @@ VDPAU is the Video Decode and Presentati
 It provides an interface to video decode acceleration and presentation
 hardware present in modern GPUs.
 
+%{?!_without_docs:
+%package        docs
+Summary:        Documentation for %{name}
+Group:          Documentation
+
+%description    docs
+The %{name}-docs package contains documentation for %{name}.
+}
 
 %package        devel
 Summary:        Development files for %{name}
@@ -32,11 +48,13 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-
+autoreconf -vif
 
 
 %build
-%configure --disable-static
+%configure --disable-static \
+ %{?_without_docs:--disable-documentation }
+
 make %{?_smp_mflags}
 
 
@@ -46,6 +64,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -59,7 +78,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_libdir}/*.so.*
-%{_libdir}/libvdpau_trace.so
+%dir %{_libdir}/vdpau
+%{_libdir}/vdpau/libvdpau_trace.so*
+
+%{?!_without_docs:
+%files docs
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}
+}
 
 %files devel
 %defattr(-,root,root,-)
@@ -69,6 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 22 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.3-1
+- Update to 0.3
+- Create docs sub-package
+- Allow --without docs conditional
+
 * Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2-1
 - Update to 0.2
 - Disable ExclusiveArch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvdpau/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 20:25:44 -0000	1.2
+++ sources	14 Dec 2009 22:20:56 -0000	1.3
@@ -1 +1 @@
-e0641a208839eb88fe7c01ee5af83735  libvdpau-0.2.tar.gz
+bf714e773ea55ba06d068dee3bc28135  libvdpau-0.3.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec 14 22:33:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:33:35 +0000
Subject: [pkgdb] tpm-tools ownership updated
Message-ID: <20091214223336.37A8428ED50@bastion3.fedora.phx2.redhat.com>

Package tpm-tools in Fedora 11 is now owned by ejratl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tpm-tools



From chkr at fedoraproject.org  Mon Dec 14 22:36:00 2009
From: chkr at fedoraproject.org (chkr)
Date: Mon, 14 Dec 2009 22:36:00 +0000 (UTC)
Subject: rpms/f-spot/F-12 f-spot.spec,1.97,1.98
Message-ID: <20091214223600.EDADB11C00E9@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27399

Modified Files:
	f-spot.spec 
Log Message:
* Mon Dec 14 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-2
- Corrected the permission fix for all .exe and .dll files in order
  to generate the dependencies correctly (BZ 547063)



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-12/f-spot.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- f-spot.spec	10 Nov 2009 19:55:03 -0000	1.97
+++ f-spot.spec	14 Dec 2009 22:36:00 -0000	1.98
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -86,7 +86,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f
 
 # only files marked executable are used to auto-generate the
 # requires/provides of the package
-find $RPM_BUILD_ROOT%{_libdir}/%{name} -name '*.exe' -or -name '*.dll' \
+find $RPM_BUILD_ROOT \( -name '*.exe' -or -name '*.dll' \) \
      -exec chmod a+x {} \;
 
 for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -142,6 +142,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Mon Dec 14 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-2
+- Corrected the permission fix for all .exe and .dll files in order
+  to generate the dependencies correctly (BZ 547063)
+
 * Sun Nov 08 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-1
 - Update to 0.6.1.5 (BZ 531955)
 - Build f-spot against system gnome-keyring-sharp library (BZ 442343)



From pkgdb at fedoraproject.org  Mon Dec 14 22:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:36:09 +0000
Subject: [pkgdb] xorg-x11-util-macros: krh has given up watchcommits
Message-ID: <20091214223611.0C39C28ED4B@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on xorg-x11-util-macros (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-util-macros



From pkgdb at fedoraproject.org  Mon Dec 14 22:36:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:36:12 +0000
Subject: [pkgdb] xorg-x11-util-macros: krh has given up watchcommits
Message-ID: <20091214223614.0352E28ED63@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on xorg-x11-util-macros (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-util-macros



From pkgdb at fedoraproject.org  Mon Dec 14 22:36:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:36:13 +0000
Subject: [pkgdb] xorg-x11-util-macros: krh has given up watchcommits
Message-ID: <20091214223614.DFEC728ED64@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on xorg-x11-util-macros (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-util-macros



From pkgdb at fedoraproject.org  Mon Dec 14 22:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:36:16 +0000
Subject: [pkgdb] xorg-x11-util-macros: krh has given up watchcommits
Message-ID: <20091214223618.4C9D928ED63@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on xorg-x11-util-macros (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-util-macros



From pkgdb at fedoraproject.org  Mon Dec 14 22:36:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:36:19 +0000
Subject: [pkgdb] xorg-x11-util-macros: krh has given up watchcommits
Message-ID: <20091214223620.49F0228ED69@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on xorg-x11-util-macros (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-util-macros



From pkgdb at fedoraproject.org  Mon Dec 14 22:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:36:21 +0000
Subject: [pkgdb] xorg-x11-util-macros: krh has given up watchcommits
Message-ID: <20091214223623.1F44528ED8D@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on xorg-x11-util-macros (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-util-macros



From pkgdb at fedoraproject.org  Mon Dec 14 22:36:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:36:23 +0000
Subject: [pkgdb] xorg-x11-util-macros: krh has given up watchcommits
Message-ID: <20091214223625.97F8F28ED69@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on xorg-x11-util-macros (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-util-macros



From pkgdb at fedoraproject.org  Mon Dec 14 22:40:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:40:48 +0000
Subject: [pkgdb] f-spot: krh has given up watchcommits
Message-ID: <20091214224048.B48CD28ED69@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on f-spot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Mon Dec 14 22:40:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:40:48 +0000
Subject: [pkgdb] f-spot: krh has given up watchcommits
Message-ID: <20091214224049.4405728ED68@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on f-spot (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Mon Dec 14 22:40:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:40:50 +0000
Subject: [pkgdb] f-spot: krh has given up watchcommits
Message-ID: <20091214224051.27D1B28ED6C@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on f-spot (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Mon Dec 14 22:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:40:53 +0000
Subject: [pkgdb] f-spot: krh has given up watchcommits
Message-ID: <20091214224053.E6D9C28ED68@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on f-spot (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Mon Dec 14 22:40:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:40:54 +0000
Subject: [pkgdb] f-spot: krh has given up watchcommits
Message-ID: <20091214224055.3C82D28ED6C@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on f-spot (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Mon Dec 14 22:40:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:40:56 +0000
Subject: [pkgdb] f-spot: krh has given up watchcommits
Message-ID: <20091214224056.E394628ED69@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on f-spot (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Mon Dec 14 22:40:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 14 Dec 2009 22:40:58 +0000
Subject: [pkgdb] f-spot: krh has given up watchcommits
Message-ID: <20091214224058.DF1D728ED69@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on f-spot (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/f-spot



From chkr at fedoraproject.org  Mon Dec 14 22:41:12 2009
From: chkr at fedoraproject.org (chkr)
Date: Mon, 14 Dec 2009 22:41:12 +0000 (UTC)
Subject: rpms/f-spot/F-11 f-spot.spec,1.96,1.97
Message-ID: <20091214224112.27E1C11C00E9@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28287

Modified Files:
	f-spot.spec 
Log Message:
* Mon Dec 14 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-2
- Corrected the permission fix for all .exe and .dll files in order
  to generate the dependencies correctly (BZ 547063)



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- f-spot.spec	10 Nov 2009 22:03:20 -0000	1.96
+++ f-spot.spec	14 Dec 2009 22:41:11 -0000	1.97
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -86,7 +86,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f
 
 # only files marked executable are used to auto-generate the
 # requires/provides of the package
-find $RPM_BUILD_ROOT%{_libdir}/%{name} -name '*.exe' -or -name '*.dll' \
+find $RPM_BUILD_ROOT \( -name '*.exe' -or -name '*.dll' \) \
      -exec chmod a+x {} \;
 
 for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -142,6 +142,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Mon Dec 14 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-2
+- Corrected the permission fix for all .exe and .dll files in order
+  to generate the dependencies correctly (BZ 547063)
+
 * Sun Nov 08 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-1
 - Update to 0.6.1.5 (BZ 531955)
 - Build f-spot against system gnome-keyring-sharp library (BZ 442343)



From bpepple at fedoraproject.org  Mon Dec 14 22:41:25 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 14 Dec 2009 22:41:25 +0000 (UTC)
Subject: File empathy-2.28.2.tar.bz2 uploaded to lookaside cache by bpepple
Message-ID: <20091214224125.79CD528ED88@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for empathy:

8d578d82d1e51dc8c83642b81c0fb65a  empathy-2.28.2.tar.bz2



From stahnma at fedoraproject.org  Mon Dec 14 23:01:02 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Mon, 14 Dec 2009 23:01:02 +0000 (UTC)
Subject: rpms/rubygem-rspec/EL-5 rubygem-rspec.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20091214230102.A6F5011C00E9@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/pkgs/rpms/rubygem-rspec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31415

Modified Files:
	rubygem-rspec.spec sources 
Log Message:
New version 1.2.9


Index: rubygem-rspec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rspec/EL-5/rubygem-rspec.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rubygem-rspec.spec	23 Jun 2009 04:19:04 -0000	1.3
+++ rubygem-rspec.spec	14 Dec 2009 23:01:01 -0000	1.4
@@ -1,4 +1,3 @@
-# Generated from rspec-1.1.3.gem by gem2rpm -*- rpm-spec -*-
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %define gemname rspec
@@ -6,7 +5,7 @@
 
 Summary: Behaviour driven development (BDD) framework for Ruby
 Name: rubygem-%{gemname}
-Version: 1.2.7
+Version: 1.2.9
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -53,6 +52,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 09 2009 Michael Stahnke <stahnma at fedoraproject.org> - 1.2.9-1
+- New Version
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 22 2009 Michael Stahnke <stahnma at fedoraproject.org> - 1.2.7-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rspec/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jun 2009 04:19:04 -0000	1.4
+++ sources	14 Dec 2009 23:01:01 -0000	1.5
@@ -1 +1 @@
-df7d2bdc3f50d7e8ff75f5345e360d1a  rspec-1.2.7.gem
+9c47f7f286441a24dfc5f9ad6edd3245  rspec-1.2.9.gem



From leigh123linux at fedoraproject.org  Mon Dec 14 23:13:44 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 14 Dec 2009 23:13:44 +0000 (UTC)
Subject: File compiz-plugins-unsupported-0.8.2.tar.bz2 uploaded to lookaside
	cache by leigh123linux
Message-ID: <20091214231344.3AE7928ED18@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for compiz-fusion-unsupported:

3f824a0eee6ea1907337bdddb55f0228  compiz-plugins-unsupported-0.8.2.tar.bz2



From leigh123linux at fedoraproject.org  Mon Dec 14 23:16:15 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 14 Dec 2009 23:16:15 +0000 (UTC)
Subject: rpms/compiz-fusion-unsupported/F-12 compiz-fusion-unsupported.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20091214231616.17E7C11C00E9@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/compiz-fusion-unsupported/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1272/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	compiz-fusion-unsupported.spec import.log 
Log Message:
Inital import



--- NEW FILE compiz-fusion-unsupported.spec ---
%define plugins atlantis cubemodel elements fakeargb mswitch snow tile
 
Name:  compiz-fusion-unsupported
Version: 0.8.2
Release: 1%{?dist}
Summary: Additional plugins for Compiz
Group: User Interface/Desktops
License: GPLv2+
URL: http://compiz-fusion.org
Source0: http://releases.compiz-fusion.org/%{version}/compiz-plugins-unsupported-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# libdrm is not available on these arches
ExcludeArch: s390 s390x

BuildRequires: compiz-fusion-devel >= %{version}
BuildRequires: compiz-bcop >= %{version}
BuildRequires: perl(XML::Parser)
BuildRequires: GConf2
BuildRequires: intltool
BuildRequires: mesa-libGL-devel


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 Unsupported gnome configuration
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description gnome
This package contains the GNOME configuration for
Compiz Fusion Unsupported

%package devel
Group: Development/Libraries
Summary: Development files for Compiz-Fusion
Requires: compiz-fusion-devel >= %{version}
Requires: %{name} = %{version}-%{release}

%description devel
This package contain development files required for developing other plugins


%prep
%setup -q -n compiz-plugins-unsupported-%{version}
chmod -x src/cubemodel/*.c src/cubemodel/*.h


%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-plugins-unsupported


%post gnome
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`

  for p in in %{plugins}; do
      echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
      | xargs %{_bindir}/gconftool-2 --makefile-install-rule >& /dev/null || :


%pre gnome
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`

  for p in in %{plugins}; do
	echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :

fi

%preun gnome
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`

  for p in in %{plugins}; do
	echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :
  
fi

%clean
rm -rf $RPM_BUILD_ROOT


%files -f compiz-plugins-unsupported.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_libdir}/compiz/*.so
%{_datadir}/compiz/*.xml
%{_datadir}/compiz/*.png

%files gnome
%defattr(-,root,root,-)
%config %{_sysconfdir}/gconf/schemas/*.schemas

%files devel
%defattr(-,root,root,-)
%{_includedir}/compiz/compiz-elements.h



%changelog
* Mon Jun 8 2009 Leigh Scott <leigh123linux at googlemail.com> 0.8.2-1
- bump to version 0.8.2
- fix permissions on the debug package
- add devel for compiz-elements
- make some of the recommended changes for the review

* Fri Dec 12 2008 Leigh Scott <leigh123linux at googlemail.com> 0.7.8-1
- First build 




--- NEW FILE import.log ---
compiz-fusion-unsupported-0_8_2-1_fc12:F-12:compiz-fusion-unsupported-0.8.2-1.fc12.src.rpm:1260832511


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-unsupported/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:43:07 -0000	1.1
+++ .cvsignore	14 Dec 2009 23:16:15 -0000	1.2
@@ -0,0 +1 @@
+compiz-plugins-unsupported-0.8.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-unsupported/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:43:07 -0000	1.1
+++ sources	14 Dec 2009 23:16:15 -0000	1.2
@@ -0,0 +1 @@
+3f824a0eee6ea1907337bdddb55f0228  compiz-plugins-unsupported-0.8.2.tar.bz2



From leigh123linux at fedoraproject.org  Mon Dec 14 23:17:52 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon, 14 Dec 2009 23:17:52 +0000 (UTC)
Subject: rpms/compiz-fusion-unsupported/devel compiz-fusion-unsupported.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091214231752.C89B611C00E9@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/compiz-fusion-unsupported/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1994/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compiz-fusion-unsupported.spec import.log 
Log Message:
Inital import



--- NEW FILE compiz-fusion-unsupported.spec ---
%define plugins atlantis cubemodel elements fakeargb mswitch snow tile
 
Name:  compiz-fusion-unsupported
Version: 0.8.2
Release: 1%{?dist}
Summary: Additional plugins for Compiz
Group: User Interface/Desktops
License: GPLv2+
URL: http://compiz-fusion.org
Source0: http://releases.compiz-fusion.org/%{version}/compiz-plugins-unsupported-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# libdrm is not available on these arches
ExcludeArch: s390 s390x

BuildRequires: compiz-fusion-devel >= %{version}
BuildRequires: compiz-bcop >= %{version}
BuildRequires: perl(XML::Parser)
BuildRequires: GConf2
BuildRequires: intltool
BuildRequires: mesa-libGL-devel


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 Unsupported gnome configuration
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description gnome
This package contains the GNOME configuration for
Compiz Fusion Unsupported

%package devel
Group: Development/Libraries
Summary: Development files for Compiz-Fusion
Requires: compiz-fusion-devel >= %{version}
Requires: %{name} = %{version}-%{release}

%description devel
This package contain development files required for developing other plugins


%prep
%setup -q -n compiz-plugins-unsupported-%{version}
chmod -x src/cubemodel/*.c src/cubemodel/*.h


%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-plugins-unsupported


%post gnome
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`

  for p in in %{plugins}; do
      echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
      | xargs %{_bindir}/gconftool-2 --makefile-install-rule >& /dev/null || :


%pre gnome
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`

  for p in in %{plugins}; do
	echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :

fi

%preun gnome
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`

  for p in in %{plugins}; do
	echo %{_sysconfdir}/gconf/schemas/compiz-${p}.schemas ; done \
	| xargs %{_bindir}/gconftool-2 --makefile-uninstall-rule >& /dev/null || :
  
fi

%clean
rm -rf $RPM_BUILD_ROOT


%files -f compiz-plugins-unsupported.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_libdir}/compiz/*.so
%{_datadir}/compiz/*.xml
%{_datadir}/compiz/*.png

%files gnome
%defattr(-,root,root,-)
%config %{_sysconfdir}/gconf/schemas/*.schemas

%files devel
%defattr(-,root,root,-)
%{_includedir}/compiz/compiz-elements.h



%changelog
* Mon Jun 8 2009 Leigh Scott <leigh123linux at googlemail.com> 0.8.2-1
- bump to version 0.8.2
- fix permissions on the debug package
- add devel for compiz-elements
- make some of the recommended changes for the review

* Fri Dec 12 2008 Leigh Scott <leigh123linux at googlemail.com> 0.7.8-1
- First build 




--- NEW FILE import.log ---
compiz-fusion-unsupported-0_8_2-1_fc12:HEAD:compiz-fusion-unsupported-0.8.2-1.fc12.src.rpm:1260832627


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-unsupported/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:43:07 -0000	1.1
+++ .cvsignore	14 Dec 2009 23:17:52 -0000	1.2
@@ -0,0 +1 @@
+compiz-plugins-unsupported-0.8.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-unsupported/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:43:07 -0000	1.1
+++ sources	14 Dec 2009 23:17:52 -0000	1.2
@@ -0,0 +1 @@
+3f824a0eee6ea1907337bdddb55f0228  compiz-plugins-unsupported-0.8.2.tar.bz2



From jspaleta at fedoraproject.org  Mon Dec 14 23:18:38 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Mon, 14 Dec 2009 23:18:38 +0000 (UTC)
Subject: File python-xlib-0.15rc1.tar.gz uploaded to lookaside cache by
	jspaleta
Message-ID: <20091214231838.2F2AD28ED18@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-xlib:

7941e91bc3e92dc921dfc930cc8f7830  python-xlib-0.15rc1.tar.gz



From jspaleta at fedoraproject.org  Mon Dec 14 23:22:10 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Mon, 14 Dec 2009 23:22:10 +0000 (UTC)
Subject: rpms/python-xlib/devel defs, NONE, 1.1 fix-rhomboid-examples, NONE, 
	1.1 fix-ssh-tunnel-auth, NONE, 1.1 fix-unix-socket-in-display,
	NONE, 1.1 increase-receiving-buffer, NONE, 1.1 .cvsignore, 1.3,
	1.4 python-xlib.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091214232210.5979211C00E9@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/python-xlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3094

Modified Files:
	.cvsignore python-xlib.spec sources 
Added Files:
	defs fix-rhomboid-examples fix-ssh-tunnel-auth 
	fix-unix-socket-in-display increase-receiving-buffer 
Log Message:
* Mon Dec 14  2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15-0.1.rc1
- New upstream pre-release and some cherry picked patches from Debian from Fedora bug 537264 



--- NEW FILE defs ---
# Definitions for documentation makefiles

SRCDIR = ../src

TOPSRC = $(SRCDIR)/python-xlib.texi

SRCS = $(TOPSRC) \
     $(SRCDIR)/concepts.texi $(SRCDIR)/package.texi \
     $(SRCDIR)/connect.texi $(SRCDIR)/errors.texi \
     $(SRCDIR)/events.texi $(SRCDIR)/objects.texi

     


--- NEW FILE fix-rhomboid-examples ---
Index: trunk/examples/draw.py
===================================================================
--- trunk.orig/examples/draw.py	2009-04-11 19:18:15.000000000 -0400
+++ trunk/examples/draw.py	2009-11-05 06:06:25.000000000 -0500
@@ -115,7 +115,7 @@
                         sys.exit(0)
 
 # A drawed objects, consisting of either a single
-# romboid, or two romboids connected by a winding line
+# rhomboid, or two rhomboids connected by a winding line
 
 class Movement:
     def __init__(self, win, ev):
@@ -129,7 +129,7 @@
         self.time = ev.time
         self.lines = [(ev.event_x, ev.event_y)]
 
-        self.first = Romboid(self.win, ev)
+        self.first = Rhomboid(self.win, ev)
         self.last = None
 
     def motion(self, ev):
@@ -182,7 +182,7 @@
     def finish(self, ev):
         self.motion(ev)
         if len(self.lines) > 1:
-            self.last = Romboid(self.win, ev)
+            self.last = Rhomboid(self.win, ev)
 
             self.left = min(ev.event_x - 5, self.left)
             self.right = max(ev.event_x + 5, self.right)
@@ -204,8 +204,8 @@
                 self.last.draw()
 
 
-# A romboid, drawed around the Movement endpoints
-class Romboid:
+# A rhomboid, drawed around the Movement endpoints
+class Rhomboid:
     def __init__(self, win, ev):
         self.win = win
         self.x = ev.event_x
@@ -213,7 +213,7 @@
         self.draw()
 
     def draw(self):
-        # Draw the segments of the romboid
+        # Draw the segments of the rhomboid
         self.win.window.poly_line(self.win.gc, X.CoordModePrevious,
                                   [(self.x, self.y - 5),
                                    (5, 5),
Index: trunk/examples/draw-proto.py
===================================================================
--- trunk.orig/examples/draw-proto.py	2009-04-11 19:18:15.000000000 -0400
+++ trunk/examples/draw-proto.py	2009-11-05 06:06:25.000000000 -0500
@@ -104,7 +104,7 @@
                 current.motion(e)
 
 # A drawed objects, consisting of either a single
-# romboid, or two romboids connected by a winding line
+# rhomboid, or two rhomboids connected by a winding line
 
 class Movement:
     def __init__(self, win, ev):
@@ -118,7 +118,7 @@
         self.time = ev.time
         self.lines = [(ev.event_x, ev.event_y)]
 
-        self.first = Romboid(self.win, ev)
+        self.first = Rhomboid(self.win, ev)
         self.last = None
 
     def motion(self, ev):
@@ -179,7 +179,7 @@
     def finish(self, ev):
         self.motion(ev)
         if len(self.lines) > 1:
-            self.last = Romboid(self.win, ev)
+            self.last = Rhomboid(self.win, ev)
 
             self.left = min(ev.event_x - 5, self.left)
             self.right = max(ev.event_x + 5, self.right)
@@ -203,8 +203,8 @@
                 self.last.draw()
 
 
-# A romboid, drawed around the Movement endpoints
-class Romboid:
+# A rhomboid, drawed around the Movement endpoints
+class Rhomboid:
     def __init__(self, win, ev):
         self.win = win
         self.x = ev.event_x
@@ -212,7 +212,7 @@
         self.draw()
 
     def draw(self):
-        # Draw the segments of the romboid
+        # Draw the segments of the rhomboid
         PolyLine(self.win.d, None,
                  X.CoordModePrevious,
                  self.win.window,


--- NEW FILE fix-ssh-tunnel-auth ---
Index: trunk/Xlib/support/unix_connect.py
===================================================================
--- trunk.orig/Xlib/support/unix_connect.py	2009-11-05 06:06:09.000000000 -0500
+++ trunk/Xlib/support/unix_connect.py	2009-11-05 06:06:23.000000000 -0500
@@ -161,6 +161,14 @@
     except os.error:
         pass
 
+    if not auth_data and host=='localhost':
+	# 127.0.0.1 counts as FamilyLocal, not FamilyInternet
+	# See Xtransutil.c:ConvertAddress.
+	# There might be more ways to spell 127.0.0.1 but
+	# 'localhost', yet this code fixes a the case of
+	# OpenSSH tunneling X.
+	return get_auth('unix:%d' % dno, 'unix', dno)
+
     return auth_name, auth_data
 
 get_auth = new_get_auth


--- NEW FILE fix-unix-socket-in-display ---
Index: trunk/Xlib/support/unix_connect.py
===================================================================
--- trunk.orig/Xlib/support/unix_connect.py	2008-07-23 11:33:36.000000000 -0400
+++ trunk/Xlib/support/unix_connect.py	2009-11-05 06:06:50.000000000 -0500
@@ -60,6 +60,8 @@
 
     name = display
     host = m.group(1)
+    if host == 'unix':
+        host = ''
     dno = int(m.group(2))
     screen = m.group(4)
     if screen:


--- NEW FILE increase-receiving-buffer ---
Index: trunk/Xlib/protocol/display.py
===================================================================
--- trunk.orig/Xlib/protocol/display.py	2008-03-18 16:08:27.000000000 -0400
+++ trunk/Xlib/protocol/display.py	2009-11-05 06:06:15.000000000 -0500
@@ -533,7 +533,7 @@
                 # We're the recieving thread, parse the data
                 if recieving:
                     try:
-                        bytes_recv = self.socket.recv(2048)
+                        bytes_recv = self.socket.recv(4096)
                     except socket.error, err:
                         self.close_internal('server: %s' % err[1])
                         raise self.socket_error


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-xlib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2008 19:54:48 -0000	1.3
+++ .cvsignore	14 Dec 2009 23:22:09 -0000	1.4
@@ -1 +1 @@
-python-xlib-0.14.tar.gz
+python-xlib-0.15rc1.tar.gz


Index: python-xlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xlib/devel/python-xlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-xlib.spec	27 Jul 2009 01:32:52 -0000	1.6
+++ python-xlib.spec	14 Dec 2009 23:22:10 -0000	1.7
@@ -1,17 +1,21 @@
 # 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()")}
-
+%define pre_release rc1 
 Name:           python-xlib
-Version:        0.14
-Release:        5%{?dist}
+Version:        0.15
+Release:        0.1.%{pre_release}%{?dist}
 Summary:        X client library for Python
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://python-xlib.sourceforge.net/
-Source0:        http://prdownloads.sourceforge.net/python-xlib/python-xlib-%{version}.tar.gz
+Source0:        http://prdownloads.sourceforge.net/python-xlib/python-xlib-%{version}%{pre_release}.tar.gz
+Source1:        defs 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch0:         increase-receiving-buffer
+Patch1:         fix-unix-socket-in-display
+Patch2:         fix-ssh-tunnel-auth 
+Patch3:         fix-rhomboid-examples 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  texinfo-tex tetex-dvips
@@ -32,11 +36,15 @@ Install this package if you want the dev
 that tell you how to program with python-xlib.
 
 %prep
-%setup -q
-
+%setup -q -n %{name}-%{version}%{pre_release}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__python} setup.py build
+cp %{SOURCE1} doc/src/ 
 cd doc
 make html ps
 cd html
@@ -63,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14  2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15-0.1.rc1
+- New upstream pre-release and some cherry picked patches from Debian from Fedora bug 537264 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-xlib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2008 19:54:48 -0000	1.3
+++ sources	14 Dec 2009 23:22:10 -0000	1.4
@@ -1 +1 @@
-a038c2f410d8445f3fa8f6dcd45659c5  python-xlib-0.14.tar.gz
+7941e91bc3e92dc921dfc930cc8f7830  python-xlib-0.15rc1.tar.gz



From shishz at fedoraproject.org  Mon Dec 14 23:34:11 2009
From: shishz at fedoraproject.org (Zing Zing Shishak)
Date: Mon, 14 Dec 2009 23:34:11 +0000 (UTC)
Subject: rpms/snownews/devel snownews-1.5.12-ncursesw.patch, NONE,
	1.1 snownews.spec, 1.22, 1.23
Message-ID: <20091214233411.69FAA11C00E9@cvs1.fedora.phx.redhat.com>

Author: shishz

Update of /cvs/pkgs/rpms/snownews/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4856

Modified Files:
	snownews.spec 
Added Files:
	snownews-1.5.12-ncursesw.patch 
Log Message:
* Mon Dec 14 2009 Zing <zing at fastmail.fm> - 1.5.12-2
- Bring back link with ncursesw, set -DUTF_8 for xmlUTF8Strlen #546431
  mistakenly dropped when charset patch went upstream


snownews-1.5.12-ncursesw.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snownews-1.5.12-ncursesw.patch ---
--- snownews-1.5.12/configure.orig	2009-12-14 14:55:02.059524232 -0500
+++ snownews-1.5.12/configure	2009-12-14 14:55:18.154460825 -0500
@@ -13,7 +13,7 @@ chomp($xmlldflags);
 
 my $prefix = "/usr/local";
 my $cflags = "-Wall -Wno-format-y2k -O2 -DLOCALEPATH=\"\\\"\$(LOCALEPATH)\\\"\" -DOS=\\\"$os\\\" $xmlcflags \$(EXTRA_CFLAGS) ";
-my $ldflags = "-lncurses -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
+my $ldflags = "-lncursesw -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
 
 my $use_nls = 1;
 parse_cmdl_line();


Index: snownews.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- snownews.spec	6 Oct 2009 01:58:45 -0000	1.22
+++ snownews.spec	14 Dec 2009 23:34:10 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		snownews
 Version: 	1.5.12
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPLv2
@@ -9,6 +9,7 @@ Source0: 	http://home.kcore.de/~kiza/sof
 Patch0:		snownews-1.5.10-nocheck.patch
 Patch1:		snownews-1.5.10-nostrip.patch
 Patch2:		snownews-1.5.12-manpage.patch
+Patch3:		snownews-1.5.12-ncursesw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
@@ -28,10 +29,11 @@ with any version of libxml2.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 ./configure --prefix=%{_prefix}
-EXTRA_CFLAGS="$RPM_OPT_FLAGS -fPIE" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
+EXTRA_CFLAGS="$RPM_OPT_FLAGS -fPIE -DUTF_8" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man1/*
 
 %changelog
+* Mon Dec 14 2009 Zing <zing at fastmail.fm> - 1.5.12-2
+- Bring back link with ncursesw, set -DUTF_8 for xmlUTF8Strlen #546431
+  mistakenly dropped when charset patch went upstream
+
 * Mon Oct  5 2009 Zing <zing at fastmail.fm> - 1.5.12-1
 - Bug fixes + openssl added as a requirement
 - Corrected two crashes when using mark unread and open URL on



From bpepple at fedoraproject.org  Mon Dec 14 23:41:48 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 14 Dec 2009 23:41:48 +0000 (UTC)
Subject: File telepathy-python-0.15.13.tar.gz uploaded to lookaside cache by
	bpepple
Message-ID: <20091214234148.921ED28ED2D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-telepathy:

e21018271b4ee19e9a295ec08d5553d3  telepathy-python-0.15.13.tar.gz



From jspaleta at fedoraproject.org  Mon Dec 14 23:44:02 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Mon, 14 Dec 2009 23:44:02 +0000 (UTC)
Subject: rpms/python-xlib/F-12 fix-rhomboid-examples, NONE,
	1.1 fix-ssh-tunnel-auth, NONE, 1.1 fix-unix-socket-in-display,
	NONE, 1.1 increase-receiving-buffer, NONE, 1.1 python-xlib.spec,
	1.6, 1.7
Message-ID: <20091214234402.A46E711C00E9@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/python-xlib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6330

Modified Files:
	python-xlib.spec 
Added Files:
	fix-rhomboid-examples fix-ssh-tunnel-auth 
	fix-unix-socket-in-display increase-receiving-buffer 
Log Message:
* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14-6
- Add patches to fix crasher bug 537264
 
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



--- NEW FILE fix-rhomboid-examples ---
Index: trunk/examples/draw.py
===================================================================
--- trunk.orig/examples/draw.py	2009-04-11 19:18:15.000000000 -0400
+++ trunk/examples/draw.py	2009-11-05 06:06:25.000000000 -0500
@@ -115,7 +115,7 @@
                         sys.exit(0)
 
 # A drawed objects, consisting of either a single
-# romboid, or two romboids connected by a winding line
+# rhomboid, or two rhomboids connected by a winding line
 
 class Movement:
     def __init__(self, win, ev):
@@ -129,7 +129,7 @@
         self.time = ev.time
         self.lines = [(ev.event_x, ev.event_y)]
 
-        self.first = Romboid(self.win, ev)
+        self.first = Rhomboid(self.win, ev)
         self.last = None
 
     def motion(self, ev):
@@ -182,7 +182,7 @@
     def finish(self, ev):
         self.motion(ev)
         if len(self.lines) > 1:
-            self.last = Romboid(self.win, ev)
+            self.last = Rhomboid(self.win, ev)
 
             self.left = min(ev.event_x - 5, self.left)
             self.right = max(ev.event_x + 5, self.right)
@@ -204,8 +204,8 @@
                 self.last.draw()
 
 
-# A romboid, drawed around the Movement endpoints
-class Romboid:
+# A rhomboid, drawed around the Movement endpoints
+class Rhomboid:
     def __init__(self, win, ev):
         self.win = win
         self.x = ev.event_x
@@ -213,7 +213,7 @@
         self.draw()
 
     def draw(self):
-        # Draw the segments of the romboid
+        # Draw the segments of the rhomboid
         self.win.window.poly_line(self.win.gc, X.CoordModePrevious,
                                   [(self.x, self.y - 5),
                                    (5, 5),
Index: trunk/examples/draw-proto.py
===================================================================
--- trunk.orig/examples/draw-proto.py	2009-04-11 19:18:15.000000000 -0400
+++ trunk/examples/draw-proto.py	2009-11-05 06:06:25.000000000 -0500
@@ -104,7 +104,7 @@
                 current.motion(e)
 
 # A drawed objects, consisting of either a single
-# romboid, or two romboids connected by a winding line
+# rhomboid, or two rhomboids connected by a winding line
 
 class Movement:
     def __init__(self, win, ev):
@@ -118,7 +118,7 @@
         self.time = ev.time
         self.lines = [(ev.event_x, ev.event_y)]
 
-        self.first = Romboid(self.win, ev)
+        self.first = Rhomboid(self.win, ev)
         self.last = None
 
     def motion(self, ev):
@@ -179,7 +179,7 @@
     def finish(self, ev):
         self.motion(ev)
         if len(self.lines) > 1:
-            self.last = Romboid(self.win, ev)
+            self.last = Rhomboid(self.win, ev)
 
             self.left = min(ev.event_x - 5, self.left)
             self.right = max(ev.event_x + 5, self.right)
@@ -203,8 +203,8 @@
                 self.last.draw()
 
 
-# A romboid, drawed around the Movement endpoints
-class Romboid:
+# A rhomboid, drawed around the Movement endpoints
+class Rhomboid:
     def __init__(self, win, ev):
         self.win = win
         self.x = ev.event_x
@@ -212,7 +212,7 @@
         self.draw()
 
     def draw(self):
-        # Draw the segments of the romboid
+        # Draw the segments of the rhomboid
         PolyLine(self.win.d, None,
                  X.CoordModePrevious,
                  self.win.window,


--- NEW FILE fix-ssh-tunnel-auth ---
Index: trunk/Xlib/support/unix_connect.py
===================================================================
--- trunk.orig/Xlib/support/unix_connect.py	2009-11-05 06:06:09.000000000 -0500
+++ trunk/Xlib/support/unix_connect.py	2009-11-05 06:06:23.000000000 -0500
@@ -161,6 +161,14 @@
     except os.error:
         pass
 
+    if not auth_data and host=='localhost':
+	# 127.0.0.1 counts as FamilyLocal, not FamilyInternet
+	# See Xtransutil.c:ConvertAddress.
+	# There might be more ways to spell 127.0.0.1 but
+	# 'localhost', yet this code fixes a the case of
+	# OpenSSH tunneling X.
+	return get_auth('unix:%d' % dno, 'unix', dno)
+
     return auth_name, auth_data
 
 get_auth = new_get_auth


--- NEW FILE fix-unix-socket-in-display ---
Index: trunk/Xlib/support/unix_connect.py
===================================================================
--- trunk.orig/Xlib/support/unix_connect.py	2008-07-23 11:33:36.000000000 -0400
+++ trunk/Xlib/support/unix_connect.py	2009-11-05 06:06:50.000000000 -0500
@@ -60,6 +60,8 @@
 
     name = display
     host = m.group(1)
+    if host == 'unix':
+        host = ''
     dno = int(m.group(2))
     screen = m.group(4)
     if screen:


--- NEW FILE increase-receiving-buffer ---
Index: trunk/Xlib/protocol/display.py
===================================================================
--- trunk.orig/Xlib/protocol/display.py	2008-03-18 16:08:27.000000000 -0400
+++ trunk/Xlib/protocol/display.py	2009-11-05 06:06:15.000000000 -0500
@@ -533,7 +533,7 @@
                 # We're the recieving thread, parse the data
                 if recieving:
                     try:
-                        bytes_recv = self.socket.recv(2048)
+                        bytes_recv = self.socket.recv(4096)
                     except socket.error, err:
                         self.close_internal('server: %s' % err[1])
                         raise self.socket_error


Index: python-xlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xlib/F-12/python-xlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-xlib.spec	27 Jul 2009 01:32:52 -0000	1.6
+++ python-xlib.spec	14 Dec 2009 23:44:02 -0000	1.7
@@ -3,13 +3,17 @@
 
 Name:           python-xlib
 Version:        0.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        X client library for Python
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://python-xlib.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/python-xlib/python-xlib-%{version}.tar.gz
+Patch0:         increase-receiving-buffer
+Patch1:         fix-unix-socket-in-display
+Patch2:         fix-ssh-tunnel-auth 
+Patch3:         fix-rhomboid-examples 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,6 +37,10 @@ that tell you how to program with python
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -63,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14-6
+- Add patches to fix crasher bug 537264
+ 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From crobinso at fedoraproject.org  Mon Dec 14 23:48:07 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon, 14 Dec 2009 23:48:07 +0000 (UTC)
Subject: File virt-manager-0.8.2.tar.gz uploaded to lookaside cache by
	crobinso
Message-ID: <20091214234807.90B7C28ED28@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for virt-manager:

96faafba635f9f4d6474980440220ab3  virt-manager-0.8.2.tar.gz



From bpepple at fedoraproject.org  Mon Dec 14 23:49:56 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 14 Dec 2009 23:49:56 +0000 (UTC)
Subject: rpms/python-telepathy/devel .cvsignore, 1.22,
	1.23 python-telepathy.spec, 1.34, 1.35 sources, 1.22, 1.23
Message-ID: <20091214234956.BE3D411C00E9@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/python-telepathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7560

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Mon Dec 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.13-1
- Update to 0.15.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	12 Oct 2009 23:04:00 -0000	1.22
+++ .cvsignore	14 Dec 2009 23:49:56 -0000	1.23
@@ -1 +1 @@
-telepathy-python-0.15.12.tar.gz
+telepathy-python-0.15.13.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- python-telepathy.spec	12 Oct 2009 23:04:00 -0000	1.34
+++ python-telepathy.spec	14 Dec 2009 23:49:56 -0000	1.35
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.15.12
+Version:        0.15.13
 Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.13-1
+- Update to 0.15.13.
+
 * Mon Oct 12 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.12-1
 - Update to 0.15.12.
 - Modify to use autotools.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	12 Oct 2009 23:04:00 -0000	1.22
+++ sources	14 Dec 2009 23:49:56 -0000	1.23
@@ -1 +1 @@
-5d3956d9729862c23be34e4815c77d33  telepathy-python-0.15.12.tar.gz
+e21018271b4ee19e9a295ec08d5553d3  telepathy-python-0.15.13.tar.gz



From shishz at fedoraproject.org  Mon Dec 14 23:50:14 2009
From: shishz at fedoraproject.org (Zing Zing Shishak)
Date: Mon, 14 Dec 2009 23:50:14 +0000 (UTC)
Subject: rpms/snownews/F-12 snownews-1.5.12-ncursesw.patch, NONE,
	1.1 snownews.spec, 1.21, 1.22
Message-ID: <20091214235014.9D27D11C0375@cvs1.fedora.phx.redhat.com>

Author: shishz

Update of /cvs/pkgs/rpms/snownews/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7743

Modified Files:
	snownews.spec 
Added Files:
	snownews-1.5.12-ncursesw.patch 
Log Message:
* Mon Dec 14 2009 Zing <zing at fastmail.fm> - 1.5.12-2
- Bring back link with ncursesw, set -DUTF_8 for xmlUTF8Strlen #546431
  mistakenly dropped when charset patch went upstream


snownews-1.5.12-ncursesw.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snownews-1.5.12-ncursesw.patch ---
--- snownews-1.5.12/configure.orig	2009-12-14 14:55:02.059524232 -0500
+++ snownews-1.5.12/configure	2009-12-14 14:55:18.154460825 -0500
@@ -13,7 +13,7 @@ chomp($xmlldflags);
 
 my $prefix = "/usr/local";
 my $cflags = "-Wall -Wno-format-y2k -O2 -DLOCALEPATH=\"\\\"\$(LOCALEPATH)\\\"\" -DOS=\\\"$os\\\" $xmlcflags \$(EXTRA_CFLAGS) ";
-my $ldflags = "-lncurses -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
+my $ldflags = "-lncursesw -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
 
 my $use_nls = 1;
 parse_cmdl_line();


Index: snownews.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/F-12/snownews.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- snownews.spec	7 Oct 2009 22:02:52 -0000	1.21
+++ snownews.spec	14 Dec 2009 23:50:14 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		snownews
 Version: 	1.5.12
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPLv2
@@ -9,6 +9,7 @@ Source0: 	http://home.kcore.de/~kiza/sof
 Patch0:		snownews-1.5.10-nocheck.patch
 Patch1:		snownews-1.5.10-nostrip.patch
 Patch2:		snownews-1.5.12-manpage.patch
+Patch3:		snownews-1.5.12-ncursesw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
@@ -28,10 +29,11 @@ with any version of libxml2.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 ./configure --prefix=%{_prefix}
-EXTRA_CFLAGS="$RPM_OPT_FLAGS -fPIE" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
+EXTRA_CFLAGS="$RPM_OPT_FLAGS -fPIE -DUTF_8" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man1/*
 
 %changelog
+* Mon Dec 14 2009 Zing <zing at fastmail.fm> - 1.5.12-2
+- Bring back link with ncursesw, set -DUTF_8 for xmlUTF8Strlen #546431
+  mistakenly dropped when charset patch went upstream
+
 * Wed Oct  7 2009 Zing <zing at fastmail.fm> - 1.5.12-1
 - Bug fixes + openssl added as a requirement
 - Corrected two crashes when using mark unread and open URL on



From crobinso at fedoraproject.org  Mon Dec 14 23:57:24 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon, 14 Dec 2009 23:57:24 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.8.2-perms-qemu-user.patch,
	NONE, 
	1.1 .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 virt-manager.spec,
	1.66, 1.67 virt-manager-0.8.1-perms-qemu-user.patch, 1.1,
	NONE virt-manager-0.8.1-select-right-click.patch, 1.1, NONE
Message-ID: <20091214235724.B4BF311C00E9@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8835

Modified Files:
	.cvsignore sources virt-manager.spec 
Added Files:
	virt-manager-0.8.2-perms-qemu-user.patch 
Removed Files:
	virt-manager-0.8.1-perms-qemu-user.patch 
	virt-manager-0.8.1-select-right-click.patch 
Log Message:
Update to 0.8.2 release
Fix first virt-manager run on a new install
Enable floppy media eject/connect


virt-manager-0.8.2-perms-qemu-user.patch:
 uihelpers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-manager-0.8.2-perms-qemu-user.patch ---
diff -rup virt-manager-0.8.1/src/virtManager/uihelpers.py new/src/virtManager/uihelpers.py
--- virt-manager-0.8.1/src/virtManager/uihelpers.py	2009-12-03 16:15:01.000000000 -0500
+++ new/src/virtManager/uihelpers.py	2009-12-03 17:15:09.101994000 -0500
@@ -38,7 +38,7 @@ OPTICAL_MEDIA_KEY = 4
 # may use a nonroot user, so simply changing this will cause several UI
 # pieces to attempt to verify that permissions are correct. Eventually this
 # should be exposed via capabilities so we can determine this programmatically.
-QEMU_SYSTEM_EMULATOR_USER = "root"
+QEMU_SYSTEM_EMULATOR_USER = "qemu"
 
 ##############################################################
 # Initialize an error object to use for validation functions #


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	3 Dec 2009 22:45:10 -0000	1.24
+++ .cvsignore	14 Dec 2009 23:57:23 -0000	1.25
@@ -1 +1 @@
-virt-manager-0.8.1.tar.gz
+virt-manager-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	3 Dec 2009 22:45:10 -0000	1.24
+++ sources	14 Dec 2009 23:57:23 -0000	1.25
@@ -1 +1 @@
-6e461e91d679dc87d9fc506f34832d90  virt-manager-0.8.1.tar.gz
+96faafba635f9f4d6474980440220ab3  virt-manager-0.8.2.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- virt-manager.spec	9 Dec 2009 21:24:10 -0000	1.66
+++ virt-manager.spec	14 Dec 2009 23:57:23 -0000	1.67
@@ -7,8 +7,8 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.8.1
-Release: 3%{_extra_release}
+Version: 0.8.2
+Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -19,8 +19,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 # Check QEMU permissions against the qemu user
 Patch1: %{name}-%{version}-perms-qemu-user.patch
-# Select manager row on right click, regressed with 0.8.1
-Patch2: %{name}-%{version}-select-right-click.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -80,7 +78,6 @@ management API.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure
@@ -154,6 +151,11 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Mon Dec 14 2009 Cole Robinson <crobinso at redhat.com> - 0.8.2-1.fc13
+- Update to 0.8.2 release
+- Fix first virt-manager run on a new install
+- Enable floppy media eject/connect
+
 * Wed Dec 09 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-3.fc13
 - Select manager row on right click, regressed with 0.8.1
 


--- virt-manager-0.8.1-perms-qemu-user.patch DELETED ---


--- virt-manager-0.8.1-select-right-click.patch DELETED ---



From crobinso at fedoraproject.org  Mon Dec 14 23:58:37 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon, 14 Dec 2009 23:58:37 +0000 (UTC)
Subject: rpms/virt-manager/F-12 virt-manager-0.8.2-perms-qemu-user.patch,
	NONE, 
	1.1 virt-manager-0.8.2-prefer-hal.patch, NONE, 1.1 .cvsignore,
	1.24, 1.25 sources, 1.24, 1.25 virt-manager.spec, 1.65,
	1.66 virt-manager-0.8.1-perms-qemu-user.patch, 1.1,
	NONE virt-manager-0.8.1-prefer-hal.patch, 1.1,
	NONE virt-manager-0.8.1-select-right-click.patch, 1.1, NONE
Message-ID: <20091214235837.E7BA511C00E9@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9115

Modified Files:
	.cvsignore sources virt-manager.spec 
Added Files:
	virt-manager-0.8.2-perms-qemu-user.patch 
	virt-manager-0.8.2-prefer-hal.patch 
Removed Files:
	virt-manager-0.8.1-perms-qemu-user.patch 
	virt-manager-0.8.1-prefer-hal.patch 
	virt-manager-0.8.1-select-right-click.patch 
Log Message:
Update to 0.8.2 release
Fix first virt-manager run on a new install
Enable floppy media eject/connect


virt-manager-0.8.2-perms-qemu-user.patch:
 uihelpers.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-manager-0.8.2-perms-qemu-user.patch ---
diff -rup virt-manager-0.8.1/src/virtManager/uihelpers.py new/src/virtManager/uihelpers.py
--- virt-manager-0.8.1/src/virtManager/uihelpers.py	2009-12-03 16:15:01.000000000 -0500
+++ new/src/virtManager/uihelpers.py	2009-12-03 17:15:09.101994000 -0500
@@ -38,7 +38,7 @@ OPTICAL_MEDIA_KEY = 4
 # may use a nonroot user, so simply changing this will cause several UI
 # pieces to attempt to verify that permissions are correct. Eventually this
 # should be exposed via capabilities so we can determine this programmatically.
-QEMU_SYSTEM_EMULATOR_USER = "root"
+QEMU_SYSTEM_EMULATOR_USER = "qemu"
 
 ##############################################################
 # Initialize an error object to use for validation functions #

virt-manager-0.8.2-prefer-hal.patch:
 connection.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE virt-manager-0.8.2-prefer-hal.patch ---
diff -rup virt-manager-0.8.2/src/virtManager/connection.py new/src/virtManager/connection.py
--- virt-manager-0.8.2/src/virtManager/connection.py	2009-12-14 17:32:35.000000000 -0500
+++ new/src/virtManager/connection.py	2009-12-14 18:56:03.000000000 -0500
@@ -170,7 +170,8 @@ class vmmConnection(gobject.GObject):
         """
         Determine how we will be polling for net devices (HAL or libvirt)
         """
-        if self.is_nodedev_capable() and self.interface_capable:
+        if (self.is_remote() and
+            self.is_nodedev_capable() and self.interface_capable):
             try:
                 self._build_libvirt_netdev_list()
                 self.netdev_use_libvirt = True
@@ -207,7 +208,7 @@ class vmmConnection(gobject.GObject):
                 logging.debug("Using HAL for netdev enumeration")
 
     def _init_mediadev(self):
-        if self.is_nodedev_capable():
+        if self.is_remote() and self.is_nodedev_capable():
             try:
                 self.connect("nodedev-added", self._nodedev_mediadev_added)
                 self.connect("nodedev-removed", self._nodedev_mediadev_removed)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	3 Dec 2009 22:44:49 -0000	1.24
+++ .cvsignore	14 Dec 2009 23:58:37 -0000	1.25
@@ -1 +1 @@
-virt-manager-0.8.1.tar.gz
+virt-manager-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	3 Dec 2009 22:44:49 -0000	1.24
+++ sources	14 Dec 2009 23:58:37 -0000	1.25
@@ -1 +1 @@
-6e461e91d679dc87d9fc506f34832d90  virt-manager-0.8.1.tar.gz
+96faafba635f9f4d6474980440220ab3  virt-manager-0.8.2.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/virt-manager.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- virt-manager.spec	9 Dec 2009 21:26:57 -0000	1.65
+++ virt-manager.spec	14 Dec 2009 23:58:37 -0000	1.66
@@ -7,8 +7,8 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.8.1
-Release: 3%{_extra_release}
+Version: 0.8.2
+Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -21,8 +21,6 @@ BuildArch: noarch
 Patch1: %{name}-%{version}-perms-qemu-user.patch
 # Prefer HAL for device enumeration, to avoid possible regressions
 Patch2: %{name}-%{version}-prefer-hal.patch
-# Select manager row on right click, regressed with 0.8.1
-Patch3: %{name}-%{version}-select-right-click.patch
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -83,7 +81,6 @@ management API.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %configure
@@ -157,10 +154,15 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Mon Dec 14 2009 Cole Robinson <crobinso at redhat.com> - 0.8.2-1.fc12
+- Update to 0.8.2 release
+- Fix first virt-manager run on a new install
+- Enable floppy media eject/connect
+
 * Wed Dec 09 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-3.fc12
 - Select manager row on right click, regressed with 0.8.1
 
-* Sat Dec  5 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-2.fc13
+* Sat Dec  5 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-2.fc12
 - Set proper version Requires: for python-virtinst
 
 * Thu Dec  3 2009 Cole Robinson <crobinso at redhat.com> - 0.8.1-1.fc12


--- virt-manager-0.8.1-perms-qemu-user.patch DELETED ---


--- virt-manager-0.8.1-prefer-hal.patch DELETED ---


--- virt-manager-0.8.1-select-right-click.patch DELETED ---



From jspaleta at fedoraproject.org  Tue Dec 15 00:18:26 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 15 Dec 2009 00:18:26 +0000 (UTC)
Subject: File safekeep-1.2.1.tar.gz uploaded to lookaside cache by jspaleta
Message-ID: <20091215001826.78C7128ED05@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for safekeep:

cf86fb2397ca66c65f4d8c8d9cbc7185  safekeep-1.2.1.tar.gz



From jspaleta at fedoraproject.org  Tue Dec 15 00:18:47 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 15 Dec 2009 00:18:47 +0000 (UTC)
Subject: rpms/safekeep/devel .cvsignore, 1.4, 1.5 safekeep.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091215001848.3A72B11C00E9@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/safekeep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12175

Modified Files:
	.cvsignore safekeep.spec sources 
Log Message:
* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.2.1-1
  - Latest upstream release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Jan 2009 02:18:32 -0000	1.4
+++ .cvsignore	15 Dec 2009 00:18:46 -0000	1.5
@@ -1 +1 @@
-safekeep-1.0.5.tar.gz
+safekeep-1.2.1.tar.gz


Index: safekeep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/devel/safekeep.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- safekeep.spec	27 Jul 2009 03:44:54 -0000	1.5
+++ safekeep.spec	15 Dec 2009 00:18:46 -0000	1.6
@@ -1,6 +1,6 @@
 %define name    safekeep
-%define version 1.0.5
-%define release 3
+%define version 1.2.1
+%define release 1
 %define homedir %{_localstatedir}/lib/%{name}
 
 Name:           %{name}
@@ -116,9 +116,12 @@ id %{name} >/dev/null 2>&1 || \
 %{_sysconfdir}/cron.daily/safekeep
 %{_mandir}/man5/safekeep.conf.5*
 %{_mandir}/man5/safekeep.backup.5*
-%doc sample.backup
+%doc samples/
 
 %changelog
+* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.2.1-1
+  - Latest upstream release 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Jan 2009 02:18:32 -0000	1.4
+++ sources	15 Dec 2009 00:18:46 -0000	1.5
@@ -1 +1 @@
-fbcec8c5dfb8a2956b317744942ffbf7  safekeep-1.0.5.tar.gz
+cf86fb2397ca66c65f4d8c8d9cbc7185  safekeep-1.2.1.tar.gz



From pbrobinson at fedoraproject.org  Tue Dec 15 00:19:38 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 15 Dec 2009 00:19:38 +0000 (UTC)
Subject: rpms/amsn/F-12 amsn.spec,1.27,1.28
Message-ID: <20091215001938.B890211C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/amsn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12386

Modified Files:
	amsn.spec 
Log Message:
- Rebuild for new gupnp-igd


Index: amsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-12/amsn.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- amsn.spec	5 Dec 2009 09:21:34 -0000	1.27
+++ amsn.spec	15 Dec 2009 00:19:38 -0000	1.28
@@ -3,7 +3,7 @@
 
 Name:           amsn
 Version:        0.98.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Tue Dec 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.98.1-4
+- Rebuild for new gupnp-igd
+
 * Sat Dec 05 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-3
 - add requires on tcl-snack, it is needed for voice-clip support
 - since we need snack anyway, use it for all audio and drop requirement on alsa-utils



From pbrobinson at fedoraproject.org  Tue Dec 15 00:19:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 15 Dec 2009 00:19:49 +0000 (UTC)
Subject: rpms/libnice/F-12 libnice.spec,1.10,1.11
Message-ID: <20091215001949.26B9A11C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libnice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12474

Modified Files:
	libnice.spec 
Log Message:
- Rebuild for new gupnp-igd


Index: libnice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/F-12/libnice.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libnice.spec	17 Sep 2009 20:46:09 -0000	1.10
+++ libnice.spec	15 Dec 2009 00:19:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libnice
 Version:        0.0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GLib ICE implementation
 
 Group:          System Environment/Libraries
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.9-3
+- Rebuild for new gupnp-igd
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.0.9-2
 - Rebuild for new gupnp
 



From pbrobinson at fedoraproject.org  Tue Dec 15 00:19:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 15 Dec 2009 00:19:56 +0000 (UTC)
Subject: rpms/farsight2/F-12 farsight2.spec,1.19,1.20
Message-ID: <20091215001956.DE89111C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/farsight2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12564

Modified Files:
	farsight2.spec 
Log Message:
- Rebuild for new gupnp-igd


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/F-12/farsight2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- farsight2.spec	23 Oct 2009 15:56:46 -0000	1.19
+++ farsight2.spec	15 Dec 2009 00:19:56 -0000	1.20
@@ -7,7 +7,7 @@
 
 Name:           farsight2
 Version:        0.0.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.16-2
+- Rebuild for new gupnp-igd
+
 * Tue Oct  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.16-1
 - Update to 0.0.16.
 



From jspaleta at fedoraproject.org  Tue Dec 15 00:32:34 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 15 Dec 2009 00:32:34 +0000 (UTC)
Subject: File gourmet-0.15.1.tar.gz uploaded to lookaside cache by jspaleta
Message-ID: <20091215003234.6808828ECEE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gourmet:

fb1b635e9db5f3adb0568b3c5f8f2c45  gourmet-0.15.1.tar.gz



From jspaleta at fedoraproject.org  Tue Dec 15 00:33:51 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 15 Dec 2009 00:33:51 +0000 (UTC)
Subject: rpms/gourmet/devel gourmet.spec,1.19,1.20 sources,1.10,1.11
Message-ID: <20091215003351.1E1FC11C00E9@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14582

Modified Files:
	gourmet.spec sources 
Log Message:
* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.1-1
- New upstream release



Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/devel/gourmet.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gourmet.spec	4 Sep 2009 23:10:08 -0000	1.19
+++ gourmet.spec	15 Dec 2009 00:33:50 -0000	1.20
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gourmet
-Version:	0.15.0
-Release:	4%{?dist}
+Version:	0.15.1
+Release:	1%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
@@ -69,6 +69,9 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.1-1
+- New upstream release
+
 * Fri Sep 4 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-4
 - add gnome-python2-gtkspell for spellingchecking plugin support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 Aug 2009 17:25:04 -0000	1.10
+++ sources	15 Dec 2009 00:33:50 -0000	1.11
@@ -1 +1 @@
-a53d8dd05893755cf634f2e75b4e9696  gourmet-0.15.0.tar.gz
+fb1b635e9db5f3adb0568b3c5f8f2c45  gourmet-0.15.1.tar.gz



From jspaleta at fedoraproject.org  Tue Dec 15 00:39:34 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 15 Dec 2009 00:39:34 +0000 (UTC)
Subject: File gpodder-2.1.tar.gz uploaded to lookaside cache by jspaleta
Message-ID: <20091215003934.CD2C328ECEE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gpodder:

57ed679e3722b7c214956b8d4e13141a  gpodder-2.1.tar.gz



From jspaleta at fedoraproject.org  Tue Dec 15 00:40:02 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 15 Dec 2009 00:40:02 +0000 (UTC)
Subject: rpms/gpodder/devel .cvsignore, 1.25, 1.26 gpodder.spec, 1.34,
	1.35 sources, 1.25, 1.26
Message-ID: <20091215004002.9C52611C00E9@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gpodder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15599

Modified Files:
	.cvsignore gpodder.spec sources 
Log Message:
* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.1-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	16 Sep 2009 06:37:37 -0000	1.25
+++ .cvsignore	15 Dec 2009 00:40:02 -0000	1.26
@@ -1 +1 @@
-gpodder-2.0.tar.gz
+gpodder-2.1.tar.gz


Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/gpodder.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gpodder.spec	16 Sep 2009 06:37:38 -0000	1.34
+++ gpodder.spec	15 Dec 2009 00:40:02 -0000	1.35
@@ -2,7 +2,7 @@
 
 
 Name:           gpodder
-Version:        2.0
+Version:        2.1
 Release:        1%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
@@ -74,6 +74,9 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.1-1
+- New upstream release
+
 * Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.0-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	16 Sep 2009 06:37:38 -0000	1.25
+++ sources	15 Dec 2009 00:40:02 -0000	1.26
@@ -1 +1 @@
-288641768cdef679ed2e7976562b200e  gpodder-2.0.tar.gz
+57ed679e3722b7c214956b8d4e13141a  gpodder-2.1.tar.gz



From toshio at fedoraproject.org  Tue Dec 15 02:00:00 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 15 Dec 2009 02:00:00 +0000 (UTC)
Subject: rpms/python-setuptools/F-12 python-setuptools.spec,1.21,1.22
Message-ID: <20091215020000.1A40811C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-setuptools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6563

Modified Files:
	python-setuptools.spec 
Log Message:
 Rebuild to test build system and update are working.




Index: python-setuptools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/F-12/python-setuptools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- python-setuptools.spec	26 Jul 2009 21:03:38 -0000	1.21
+++ python-setuptools.spec	15 Dec 2009 01:59:59 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           python-setuptools
 Version:        0.6c9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6c9-6
+- Rebuild to test build system and update are working.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6c9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ke4qqq at fedoraproject.org  Tue Dec 15 02:01:09 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Tue, 15 Dec 2009 02:01:09 +0000 (UTC)
Subject: File Spreadsheet_Excel_Writer-0.9.2.tgz uploaded to lookaside cache
	by ke4qqq
Message-ID: <20091215020109.5B1BB28ECEE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for php-pear-Spreadsheet-Excel-Writer:

15691145ca8ac71ccd501a38892ee64a  Spreadsheet_Excel_Writer-0.9.2.tgz



From ke4qqq at fedoraproject.org  Tue Dec 15 02:02:06 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Tue, 15 Dec 2009 02:02:06 +0000 (UTC)
Subject: rpms/php-pear-Spreadsheet-Excel-Writer/devel import.log, NONE,
	1.1 php-pear-Spreadsheet-Excel-Writer.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215020206.12C6011C00E6@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7263/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-Spreadsheet-Excel-Writer.spec 
Log Message:
* Mon Dec 14 2009 David Nalley <david at gnsa.us> 0.9.2-2
- initial cvs commit




--- NEW FILE import.log ---
php-pear-Spreadsheet-Excel-Writer-0_9_2-2_fc12:HEAD:php-pear-Spreadsheet-Excel-Writer-0.9.2-2.fc12.src.rpm:1260842558


--- NEW FILE php-pear-Spreadsheet-Excel-Writer.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Spreadsheet_Excel_Writer

Name:           php-pear-Spreadsheet-Excel-Writer
Version:        0.9.2
Release:        2%{?dist}
Summary:        Package for generating Excel spreadsheets

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://pear.php.net/package/Spreadsheet_Excel_Writer
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(OLE) >= 0.5, php-common >= 4.1.0

%description
Spreadsheet_Excel_Writer was born as a porting of the
Spreadsheet::WriteExcel Perl module to PHP.
It allows writing of Excel spreadsheets without the need for COM objects.
It supports formulas, images (BMP) and all kinds of formatting for text
and cells.
It currently supports the BIFF5 format (Excel 5.0), so functionality
appeared in the latest Excel versions is not yet available.
 


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Spreadsheet




%changelog 
* Fri Dec 11 2009 David Nalley <david at gnsa.us> 0.9.2-2
- changed require on php to php-common
* Wed Dec 02 2009 David Nalley <david at gnsa.us> 0.9.2-1
- upgraded to latest release from upstream
- fixed php-pear-ole require
- uncommented clean section
* Sat Nov 28 2009 David Nalley <david at gnsa.us> 0.9.1-2
- fixed files section to include entire directory
- fixed require to reflect proper package name
* Fri Nov 27 2009 David Nalley <david at gnsa.us> 0.9.1-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:24:46 -0000	1.1
+++ .cvsignore	15 Dec 2009 02:02:05 -0000	1.2
@@ -0,0 +1 @@
+Spreadsheet_Excel_Writer-0.9.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:24:46 -0000	1.1
+++ sources	15 Dec 2009 02:02:05 -0000	1.2
@@ -0,0 +1 @@
+15691145ca8ac71ccd501a38892ee64a  Spreadsheet_Excel_Writer-0.9.2.tgz



From ke4qqq at fedoraproject.org  Tue Dec 15 02:02:55 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Tue, 15 Dec 2009 02:02:55 +0000 (UTC)
Subject: rpms/php-pear-Spreadsheet-Excel-Writer/F-11 import.log, NONE,
	1.1 php-pear-Spreadsheet-Excel-Writer.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215020255.803A811C00E6@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7592/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-Spreadsheet-Excel-Writer.spec 
Log Message:
* Mon Dec 14 2009 David Nalley <david at gnsa.us> 0.9.2-2
- initial cvs commit




--- NEW FILE import.log ---
php-pear-Spreadsheet-Excel-Writer-0_9_2-2_fc12:F-11:php-pear-Spreadsheet-Excel-Writer-0.9.2-2.fc12.src.rpm:1260842643


--- NEW FILE php-pear-Spreadsheet-Excel-Writer.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Spreadsheet_Excel_Writer

Name:           php-pear-Spreadsheet-Excel-Writer
Version:        0.9.2
Release:        2%{?dist}
Summary:        Package for generating Excel spreadsheets

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://pear.php.net/package/Spreadsheet_Excel_Writer
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(OLE) >= 0.5, php-common >= 4.1.0

%description
Spreadsheet_Excel_Writer was born as a porting of the
Spreadsheet::WriteExcel Perl module to PHP.
It allows writing of Excel spreadsheets without the need for COM objects.
It supports formulas, images (BMP) and all kinds of formatting for text
and cells.
It currently supports the BIFF5 format (Excel 5.0), so functionality
appeared in the latest Excel versions is not yet available.
 


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Spreadsheet




%changelog 
* Fri Dec 11 2009 David Nalley <david at gnsa.us> 0.9.2-2
- changed require on php to php-common
* Wed Dec 02 2009 David Nalley <david at gnsa.us> 0.9.2-1
- upgraded to latest release from upstream
- fixed php-pear-ole require
- uncommented clean section
* Sat Nov 28 2009 David Nalley <david at gnsa.us> 0.9.1-2
- fixed files section to include entire directory
- fixed require to reflect proper package name
* Fri Nov 27 2009 David Nalley <david at gnsa.us> 0.9.1-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:24:46 -0000	1.1
+++ .cvsignore	15 Dec 2009 02:02:55 -0000	1.2
@@ -0,0 +1 @@
+Spreadsheet_Excel_Writer-0.9.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:24:46 -0000	1.1
+++ sources	15 Dec 2009 02:02:55 -0000	1.2
@@ -0,0 +1 @@
+15691145ca8ac71ccd501a38892ee64a  Spreadsheet_Excel_Writer-0.9.2.tgz



From ke4qqq at fedoraproject.org  Tue Dec 15 02:03:47 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Tue, 15 Dec 2009 02:03:47 +0000 (UTC)
Subject: rpms/php-pear-Spreadsheet-Excel-Writer/F-12 import.log, NONE,
	1.1 php-pear-Spreadsheet-Excel-Writer.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215020347.3EE0511C00E6@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7922/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-Spreadsheet-Excel-Writer.spec 
Log Message:
* Mon Dec 14 2009 David Nalley <david at gnsa.us> 0.9.2-2
- initial cvs commit




--- NEW FILE import.log ---
php-pear-Spreadsheet-Excel-Writer-0_9_2-2_fc12:F-12:php-pear-Spreadsheet-Excel-Writer-0.9.2-2.fc12.src.rpm:1260842695


--- NEW FILE php-pear-Spreadsheet-Excel-Writer.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Spreadsheet_Excel_Writer

Name:           php-pear-Spreadsheet-Excel-Writer
Version:        0.9.2
Release:        2%{?dist}
Summary:        Package for generating Excel spreadsheets

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://pear.php.net/package/Spreadsheet_Excel_Writer
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(OLE) >= 0.5, php-common >= 4.1.0

%description
Spreadsheet_Excel_Writer was born as a porting of the
Spreadsheet::WriteExcel Perl module to PHP.
It allows writing of Excel spreadsheets without the need for COM objects.
It supports formulas, images (BMP) and all kinds of formatting for text
and cells.
It currently supports the BIFF5 format (Excel 5.0), so functionality
appeared in the latest Excel versions is not yet available.
 


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Spreadsheet




%changelog 
* Fri Dec 11 2009 David Nalley <david at gnsa.us> 0.9.2-2
- changed require on php to php-common
* Wed Dec 02 2009 David Nalley <david at gnsa.us> 0.9.2-1
- upgraded to latest release from upstream
- fixed php-pear-ole require
- uncommented clean section
* Sat Nov 28 2009 David Nalley <david at gnsa.us> 0.9.1-2
- fixed files section to include entire directory
- fixed require to reflect proper package name
* Fri Nov 27 2009 David Nalley <david at gnsa.us> 0.9.1-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:24:46 -0000	1.1
+++ .cvsignore	15 Dec 2009 02:03:47 -0000	1.2
@@ -0,0 +1 @@
+Spreadsheet_Excel_Writer-0.9.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:24:46 -0000	1.1
+++ sources	15 Dec 2009 02:03:47 -0000	1.2
@@ -0,0 +1 @@
+15691145ca8ac71ccd501a38892ee64a  Spreadsheet_Excel_Writer-0.9.2.tgz



From toshio at fedoraproject.org  Tue Dec 15 02:04:24 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 15 Dec 2009 02:04:24 +0000 (UTC)
Subject: File distribute-0.6.9.tar.gz uploaded to lookaside cache by toshio
Message-ID: <20091215020424.0454F28ED18@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-setuptools:

5b1a2fde063a361aa241f98e0f9e1931  distribute-0.6.9.tar.gz



From ke4qqq at fedoraproject.org  Tue Dec 15 02:04:43 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Tue, 15 Dec 2009 02:04:43 +0000 (UTC)
Subject: rpms/php-pear-Spreadsheet-Excel-Writer/EL-5 import.log, NONE,
	1.1 php-pear-Spreadsheet-Excel-Writer.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215020443.DDC9211C00E6@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8226/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-Spreadsheet-Excel-Writer.spec 
Log Message:
* Mon Dec 14 2009 David Nalley <david at gnsa.us> 0.9.2-2
- initial cvs commit




--- NEW FILE import.log ---
php-pear-Spreadsheet-Excel-Writer-0_9_2-2_fc12:EL-5:php-pear-Spreadsheet-Excel-Writer-0.9.2-2.fc12.src.rpm:1260842742


--- NEW FILE php-pear-Spreadsheet-Excel-Writer.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Spreadsheet_Excel_Writer

Name:           php-pear-Spreadsheet-Excel-Writer
Version:        0.9.2
Release:        2%{?dist}
Summary:        Package for generating Excel spreadsheets

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://pear.php.net/package/Spreadsheet_Excel_Writer
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(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(OLE) >= 0.5, php-common >= 4.1.0

%description
Spreadsheet_Excel_Writer was born as a porting of the
Spreadsheet::WriteExcel Perl module to PHP.
It allows writing of Excel spreadsheets without the need for COM objects.
It supports formulas, images (BMP) and all kinds of formatting for text
and cells.
It currently supports the BIFF5 format (Excel 5.0), so functionality
appeared in the latest Excel versions is not yet available.
 


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml



# 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 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        pear.php.net/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Spreadsheet




%changelog 
* Fri Dec 11 2009 David Nalley <david at gnsa.us> 0.9.2-2
- changed require on php to php-common
* Wed Dec 02 2009 David Nalley <david at gnsa.us> 0.9.2-1
- upgraded to latest release from upstream
- fixed php-pear-ole require
- uncommented clean section
* Sat Nov 28 2009 David Nalley <david at gnsa.us> 0.9.1-2
- fixed files section to include entire directory
- fixed require to reflect proper package name
* Fri Nov 27 2009 David Nalley <david at gnsa.us> 0.9.1-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:24:46 -0000	1.1
+++ .cvsignore	15 Dec 2009 02:04:43 -0000	1.2
@@ -0,0 +1 @@
+Spreadsheet_Excel_Writer-0.9.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Spreadsheet-Excel-Writer/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:24:46 -0000	1.1
+++ sources	15 Dec 2009 02:04:43 -0000	1.2
@@ -0,0 +1 @@
+15691145ca8ac71ccd501a38892ee64a  Spreadsheet_Excel_Writer-0.9.2.tgz



From behdad at fedoraproject.org  Tue Dec 15 04:40:37 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue, 15 Dec 2009 04:40:37 +0000 (UTC)
Subject: rpms/fontconfig/devel fontconfig.spec,1.140,1.141
Message-ID: <20091215044037.9B09411C00E7@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22346

Modified Files:
	fontconfig.spec 
Log Message:
- Remove stale code to remove stale caches! 



Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- fontconfig.spec	3 Dec 2009 20:51:28 -0000	1.140
+++ fontconfig.spec	15 Dec 2009 04:40:36 -0000	1.141
@@ -85,9 +85,6 @@ rm -rf $RPM_BUILD_ROOT
 umask 0022
 
 mkdir -p %{_localstatedir}/cache/fontconfig
-# Remove stale caches
-rm -f %{_localstatedir}/cache/fontconfig/????????????????????????????????.cache-2
-rm -f %{_localstatedir}/cache/fontconfig/stamp
 
 # Force regeneration of all fontconfig cache files
 # The check for existance is needed on dual-arch installs (the second
@@ -131,6 +128,8 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+- Remove stale code to remove stale caches!
+
 * Thu Dec  3 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.8.0-1
 - Update to 2.8.0
 



From mtasaka at fedoraproject.org  Tue Dec 15 06:50:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 15 Dec 2009 06:50:00 +0000 (UTC)
Subject: File marc-0.3.1.gem uploaded to lookaside cache by mtasaka
Message-ID: <20091215065000.7A24A28ECD5@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for rubygem-marc:

295f344ef93e06603da719becb5c0462  marc-0.3.1.gem



From mtasaka at fedoraproject.org  Tue Dec 15 06:52:47 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 15 Dec 2009 06:52:47 +0000 (UTC)
Subject: rpms/rubygem-marc/devel .cvsignore, 1.2, 1.3 rubygem-marc.spec, 1.1,
	1.2 sources, 1.2, 1.3 rubygem-marc-0.3.0-test-rexml.patch, 1.1, NONE
Message-ID: <20091215065248.261EC11C02B9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-marc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8961/devel

Modified Files:
	.cvsignore rubygem-marc.spec sources 
Removed Files:
	rubygem-marc-0.3.0-test-rexml.patch 
Log Message:
* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
- 0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Nov 2009 05:14:02 -0000	1.2
+++ .cvsignore	15 Dec 2009 06:52:47 -0000	1.3
@@ -1 +1 @@
-marc-0.3.0.gem
+marc-0.3.1.gem


Index: rubygem-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/devel/rubygem-marc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-marc.spec	24 Nov 2009 05:14:02 -0000	1.1
+++ rubygem-marc.spec	15 Dec 2009 06:52:47 -0000	1.2
@@ -7,16 +7,14 @@
 %global		rubyabi		1.8
 
 Name:		rubygem-%{gemname}
-Version:	0.3.0
-Release:	2%{?dist}
+Version:	0.3.1
+Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
 
 License:	MIT
 URL:		http://marc.rubyforge.org/
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-# Fix test failure, will report upstream
-Patch0:		rubygem-marc-0.3.0-test-rexml.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -62,10 +60,6 @@ gem install \
 	-V \
 	%{SOURCE0}
 
-pushd .%{geminstdir}
-%patch0 -p1
-popd
-
 find .%{geminstdir}/{lib,test} -name \*.rb -print0 | xargs -0 chmod 0644
 find .%{geminstdir}/{lib,test} -name \*.rb -print0 | \
 	xargs -0 grep -l --null '#![ \t]*%{_bindir}' | \
@@ -168,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
+- 0.3.1
+
 * Mon Nov 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.0-2
 - Fix Summary
 - Surely create .%%{gemdir} before installing gem file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Nov 2009 05:14:02 -0000	1.2
+++ sources	15 Dec 2009 06:52:47 -0000	1.3
@@ -1 +1 @@
-b7be21e483da741beab88cf18ee9b81d  marc-0.3.0.gem
+295f344ef93e06603da719becb5c0462  marc-0.3.1.gem


--- rubygem-marc-0.3.0-test-rexml.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Dec 15 06:52:47 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 15 Dec 2009 06:52:47 +0000 (UTC)
Subject: rpms/rubygem-marc/F-12 .cvsignore, 1.2, 1.3 rubygem-marc.spec, 1.1, 
	1.2 sources, 1.2, 1.3 rubygem-marc-0.3.0-test-rexml.patch, 1.1, NONE
Message-ID: <20091215065248.257A411C0297@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-marc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8961/F-12

Modified Files:
	.cvsignore rubygem-marc.spec sources 
Removed Files:
	rubygem-marc-0.3.0-test-rexml.patch 
Log Message:
* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
- 0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Nov 2009 05:14:02 -0000	1.2
+++ .cvsignore	15 Dec 2009 06:52:47 -0000	1.3
@@ -1 +1 @@
-marc-0.3.0.gem
+marc-0.3.1.gem


Index: rubygem-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-12/rubygem-marc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-marc.spec	24 Nov 2009 05:14:02 -0000	1.1
+++ rubygem-marc.spec	15 Dec 2009 06:52:47 -0000	1.2
@@ -7,16 +7,14 @@
 %global		rubyabi		1.8
 
 Name:		rubygem-%{gemname}
-Version:	0.3.0
-Release:	2%{?dist}
+Version:	0.3.1
+Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
 
 License:	MIT
 URL:		http://marc.rubyforge.org/
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-# Fix test failure, will report upstream
-Patch0:		rubygem-marc-0.3.0-test-rexml.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -62,10 +60,6 @@ gem install \
 	-V \
 	%{SOURCE0}
 
-pushd .%{geminstdir}
-%patch0 -p1
-popd
-
 find .%{geminstdir}/{lib,test} -name \*.rb -print0 | xargs -0 chmod 0644
 find .%{geminstdir}/{lib,test} -name \*.rb -print0 | \
 	xargs -0 grep -l --null '#![ \t]*%{_bindir}' | \
@@ -168,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
+- 0.3.1
+
 * Mon Nov 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.0-2
 - Fix Summary
 - Surely create .%%{gemdir} before installing gem file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Nov 2009 05:14:02 -0000	1.2
+++ sources	15 Dec 2009 06:52:47 -0000	1.3
@@ -1 +1 @@
-b7be21e483da741beab88cf18ee9b81d  marc-0.3.0.gem
+295f344ef93e06603da719becb5c0462  marc-0.3.1.gem


--- rubygem-marc-0.3.0-test-rexml.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Dec 15 06:52:47 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 15 Dec 2009 06:52:47 +0000 (UTC)
Subject: rpms/rubygem-marc/F-11 .cvsignore, 1.2, 1.3 rubygem-marc.spec, 1.1, 
	1.2 sources, 1.2, 1.3 rubygem-marc-0.3.0-test-rexml.patch, 1.1, NONE
Message-ID: <20091215065248.2380111C00E7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-marc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8961/F-11

Modified Files:
	.cvsignore rubygem-marc.spec sources 
Removed Files:
	rubygem-marc-0.3.0-test-rexml.patch 
Log Message:
* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
- 0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Nov 2009 05:14:02 -0000	1.2
+++ .cvsignore	15 Dec 2009 06:52:46 -0000	1.3
@@ -1 +1 @@
-marc-0.3.0.gem
+marc-0.3.1.gem


Index: rubygem-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-11/rubygem-marc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-marc.spec	24 Nov 2009 05:14:02 -0000	1.1
+++ rubygem-marc.spec	15 Dec 2009 06:52:47 -0000	1.2
@@ -7,16 +7,14 @@
 %global		rubyabi		1.8
 
 Name:		rubygem-%{gemname}
-Version:	0.3.0
-Release:	2%{?dist}
+Version:	0.3.1
+Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
 
 License:	MIT
 URL:		http://marc.rubyforge.org/
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-# Fix test failure, will report upstream
-Patch0:		rubygem-marc-0.3.0-test-rexml.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -62,10 +60,6 @@ gem install \
 	-V \
 	%{SOURCE0}
 
-pushd .%{geminstdir}
-%patch0 -p1
-popd
-
 find .%{geminstdir}/{lib,test} -name \*.rb -print0 | xargs -0 chmod 0644
 find .%{geminstdir}/{lib,test} -name \*.rb -print0 | \
 	xargs -0 grep -l --null '#![ \t]*%{_bindir}' | \
@@ -168,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
+- 0.3.1
+
 * Mon Nov 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.0-2
 - Fix Summary
 - Surely create .%%{gemdir} before installing gem file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Nov 2009 05:14:02 -0000	1.2
+++ sources	15 Dec 2009 06:52:47 -0000	1.3
@@ -1 +1 @@
-b7be21e483da741beab88cf18ee9b81d  marc-0.3.0.gem
+295f344ef93e06603da719becb5c0462  marc-0.3.1.gem


--- rubygem-marc-0.3.0-test-rexml.patch DELETED ---



From denis at fedoraproject.org  Tue Dec 15 07:07:29 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:07:29 +0000 (UTC)
Subject: rpms/glibmm24/F-11 glibmm.spec,1.54,1.55
Message-ID: <20091215070730.03D5B11C02A7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11412/F-11

Modified Files:
	glibmm.spec 
Log Message:
Project URL fix


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/F-11/glibmm.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- glibmm.spec	25 Jun 2009 04:48:39 -0000	1.54
+++ glibmm.spec	15 Dec 2009 07:07:28 -0000	1.55
@@ -5,7 +5,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:07:29 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:07:29 +0000 (UTC)
Subject: rpms/glibmm24/F-12 glibmm.spec,1.62,1.63
Message-ID: <20091215070729.F052911C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11412/F-12

Modified Files:
	glibmm.spec 
Log Message:
Project URL fix


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/F-12/glibmm.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- glibmm.spec	25 Sep 2009 07:23:50 -0000	1.62
+++ glibmm.spec	15 Dec 2009 07:07:29 -0000	1.63
@@ -5,7 +5,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.22/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:07:29 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:07:29 +0000 (UTC)
Subject: rpms/glibmm24/devel glibmm.spec,1.62,1.63
Message-ID: <20091215070729.F33DA11C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11412/devel

Modified Files:
	glibmm.spec 
Log Message:
Project URL fix


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- glibmm.spec	25 Sep 2009 07:23:50 -0000	1.62
+++ glibmm.spec	15 Dec 2009 07:07:29 -0000	1.63
@@ -5,7 +5,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.22/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From mtasaka at fedoraproject.org  Tue Dec 15 07:07:50 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 15 Dec 2009 07:07:50 +0000 (UTC)
Subject: File nokogiri-1.4.1.gem uploaded to lookaside cache by mtasaka
Message-ID: <20091215070750.3175328ECDA@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for rubygem-nokogiri:

13405908a02c71daf1f302392ffa1507  nokogiri-1.4.1.gem



From mtasaka at fedoraproject.org  Tue Dec 15 07:09:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 15 Dec 2009 07:09:01 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-12 .cvsignore, 1.8,
	1.9 rubygem-nokogiri.spec, 1.14, 1.15 sources, 1.8, 1.9
Message-ID: <20091215070901.AF98A11C00E7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11769/F-12

Modified Files:
	.cvsignore rubygem-nokogiri.spec sources 
Log Message:
* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.1-1
- 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Jul 2009 18:13:48 -0000	1.8
+++ .cvsignore	15 Dec 2009 07:09:01 -0000	1.9
@@ -1 +1 @@
-nokogiri-1.3.3.gem
+nokogiri-1.4.1.gem


Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-12/rubygem-nokogiri.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rubygem-nokogiri.spec	1 Dec 2009 17:55:44 -0000	1.14
+++ rubygem-nokogiri.spec	15 Dec 2009 07:09:01 -0000	1.15
@@ -12,14 +12,12 @@
 
 Summary:	An HTML, XML, SAX, and Reader parser
 Name:		rubygem-%{gemname}
-Version:	1.3.3
-Release:	3%{?dist}
+Version:	1.4.1
+Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://nokogiri.rubyforge.org/nokogiri/
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-# Not needed with nokogiri 1.4.0
-Patch0:		rubygem-nokogiri-1.3.3-optional_attr-test.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -73,10 +71,6 @@ gem install \
 	-V --force \
 	%{SOURCE0}
 
-pushd .%{geminstdir}
-%patch0 -p0
-popd
-
 %build
 # cflags wrong (-O3 passed), recompiling
 pushd ./%{geminstdir}
@@ -208,9 +202,11 @@ popd
 %{ruby_sitelib}/xsd/
 
 %changelog
-* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-3
-- Rebuild against libxml2 again (bug 537303)
-- And add patch to make test pass (related to GNOME bug 581803)
+* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.1-1
+- 1.4.1
+
+* Mon Nov  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.0-1
+- 1.4.0
 
 * Sat Aug 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-2
 - Fix test failure on sparc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Jul 2009 18:13:48 -0000	1.8
+++ sources	15 Dec 2009 07:09:01 -0000	1.9
@@ -1 +1 @@
-24f7b482886690b723ce6f74d6d879f4  nokogiri-1.3.3.gem
+13405908a02c71daf1f302392ffa1507  nokogiri-1.4.1.gem



From mtasaka at fedoraproject.org  Tue Dec 15 07:09:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 15 Dec 2009 07:09:02 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/devel .cvsignore, 1.9,
	1.10 rubygem-nokogiri.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20091215070902.9644A11C00E7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11769/devel

Modified Files:
	.cvsignore rubygem-nokogiri.spec sources 
Log Message:
* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.1-1
- 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	8 Nov 2009 16:21:12 -0000	1.9
+++ .cvsignore	15 Dec 2009 07:09:01 -0000	1.10
@@ -1 +1 @@
-nokogiri-1.4.0.gem
+nokogiri-1.4.1.gem


Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/rubygem-nokogiri.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-nokogiri.spec	8 Nov 2009 16:21:12 -0000	1.13
+++ rubygem-nokogiri.spec	15 Dec 2009 07:09:01 -0000	1.14
@@ -12,7 +12,7 @@
 
 Summary:	An HTML, XML, SAX, and Reader parser
 Name:		rubygem-%{gemname}
-Version:	1.4.0
+Version:	1.4.1
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
@@ -202,6 +202,9 @@ popd
 %{ruby_sitelib}/xsd/
 
 %changelog
+* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.1-1
+- 1.4.1
+
 * Mon Nov  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.0-1
 - 1.4.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 Nov 2009 16:21:12 -0000	1.9
+++ sources	15 Dec 2009 07:09:01 -0000	1.10
@@ -1 +1 @@
-25c9618f30993e6415aa68d23e597390  nokogiri-1.4.0.gem
+13405908a02c71daf1f302392ffa1507  nokogiri-1.4.1.gem



From denis at fedoraproject.org  Tue Dec 15 07:10:35 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:10:35 +0000 (UTC)
Subject: rpms/gconfmm26/F-11 gconfmm.spec,1.21,1.22
Message-ID: <20091215071035.B8FDF11C0375@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gconfmm26/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12207/F-11

Modified Files:
	gconfmm.spec 
Log Message:
Fix project URL


Index: gconfmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/F-11/gconfmm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gconfmm.spec	24 Feb 2009 19:54:14 -0000	1.21
+++ gconfmm.spec	15 Dec 2009 07:10:35 -0000	1.22
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for GConf2
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.18/gconfmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:10:35 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:10:35 +0000 (UTC)
Subject: rpms/gconfmm26/F-12 gconfmm.spec,1.23,1.24
Message-ID: <20091215071035.E25D511C0375@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gconfmm26/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12207/F-12

Modified Files:
	gconfmm.spec 
Log Message:
Fix project URL


Index: gconfmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/F-12/gconfmm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gconfmm.spec	25 Sep 2009 07:43:54 -0000	1.23
+++ gconfmm.spec	15 Dec 2009 07:10:35 -0000	1.24
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for GConf2
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.28/gconfmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:10:36 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:10:36 +0000 (UTC)
Subject: rpms/gconfmm26/devel gconfmm.spec,1.23,1.24
Message-ID: <20091215071036.2D01711C0375@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gconfmm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12207/devel

Modified Files:
	gconfmm.spec 
Log Message:
Fix project URL


Index: gconfmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gconfmm.spec	25 Sep 2009 07:43:54 -0000	1.23
+++ gconfmm.spec	15 Dec 2009 07:10:35 -0000	1.24
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for GConf2
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.28/gconfmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:11:24 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:11:24 +0000 (UTC)
Subject: rpms/gconfmm26/EL-4 gconfmm.spec,1.4,1.5
Message-ID: <20091215071124.D98A811C0375@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gconfmm26/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12392/EL-4

Modified Files:
	gconfmm.spec 
Log Message:
Fix project URL


Index: gconfmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/EL-4/gconfmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gconfmm.spec	14 Jan 2007 18:39:48 -0000	1.4
+++ gconfmm.spec	15 Dec 2009 07:11:24 -0000	1.5
@@ -5,7 +5,7 @@ Summary:        A C++ interface for GCon
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.8/gconfmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:15:48 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:15:48 +0000 (UTC)
Subject: rpms/glibmm24/EL-4 glibmm.spec,1.4,1.5
Message-ID: <20091215071548.1B2D911C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975/EL-4

Modified Files:
	glibmm.spec 
Log Message:
Fixed project URL


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/EL-4/glibmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- glibmm.spec	14 Jan 2007 03:31:38 -0000	1.4
+++ glibmm.spec	15 Dec 2009 07:15:47 -0000	1.5
@@ -5,7 +5,7 @@ Summary:        A C++ interface for GLib
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.4/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:15:48 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:15:48 +0000 (UTC)
Subject: rpms/glibmm24/EL-5 glibmm.spec,1.20,1.21
Message-ID: <20091215071548.3CA5B11C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975/EL-5

Modified Files:
	glibmm.spec 
Log Message:
Fixed project URL


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/EL-5/glibmm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- glibmm.spec	10 Jul 2007 09:37:49 -0000	1.20
+++ glibmm.spec	15 Dec 2009 07:15:48 -0000	1.21
@@ -5,7 +5,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:15:48 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:15:48 +0000 (UTC)
Subject: rpms/glibmm24/F-12 glibmm.spec,1.63,1.64
Message-ID: <20091215071548.8506811C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975/F-12

Modified Files:
	glibmm.spec 
Log Message:
Fixed project URL


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/F-12/glibmm.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- glibmm.spec	15 Dec 2009 07:07:29 -0000	1.63
+++ glibmm.spec	15 Dec 2009 07:15:48 -0000	1.64
@@ -5,7 +5,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://http://www.gtkmm.org/.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.22/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:15:48 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:15:48 +0000 (UTC)
Subject: rpms/glibmm24/devel glibmm.spec,1.63,1.64
Message-ID: <20091215071548.A9F3411C02B9@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975/devel

Modified Files:
	glibmm.spec 
Log Message:
Fixed project URL


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- glibmm.spec	15 Dec 2009 07:07:29 -0000	1.63
+++ glibmm.spec	15 Dec 2009 07:15:48 -0000	1.64
@@ -5,7 +5,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://http://www.gtkmm.org/.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.22/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:15:48 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:15:48 +0000 (UTC)
Subject: rpms/glibmm24/F-11 glibmm.spec,1.55,1.56
Message-ID: <20091215071548.5EE4F11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975/F-11

Modified Files:
	glibmm.spec 
Log Message:
Fixed project URL


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/F-11/glibmm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- glibmm.spec	15 Dec 2009 07:07:28 -0000	1.55
+++ glibmm.spec	15 Dec 2009 07:15:48 -0000	1.56
@@ -5,7 +5,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://http://www.gtkmm.org/.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:21:51 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:21:51 +0000 (UTC)
Subject: rpms/glibmm24/EL-4 glibmm.spec,1.5,1.6
Message-ID: <20091215072152.0339311C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14114/EL-4

Modified Files:
	glibmm.spec 
Log Message:
Fixed project URL


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/EL-4/glibmm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- glibmm.spec	15 Dec 2009 07:15:47 -0000	1.5
+++ glibmm.spec	15 Dec 2009 07:21:51 -0000	1.6
@@ -5,7 +5,7 @@ Summary:        A C++ interface for GLib
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://http://www.gtkmm.org/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.4/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:21:52 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:21:52 +0000 (UTC)
Subject: rpms/glibmm24/EL-5 glibmm.spec,1.21,1.22
Message-ID: <20091215072152.1F2B911C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14114/EL-5

Modified Files:
	glibmm.spec 
Log Message:
Fixed project URL


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/EL-5/glibmm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- glibmm.spec	15 Dec 2009 07:15:48 -0000	1.21
+++ glibmm.spec	15 Dec 2009 07:21:51 -0000	1.22
@@ -5,7 +5,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://http://www.gtkmm.org/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:23:00 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:23:00 +0000 (UTC)
Subject: rpms/gnome-vfsmm26/EL-4 gnome-vfsmm.spec,1.4,1.5
Message-ID: <20091215072300.9240E11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-vfsmm26/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14328/EL-4

Modified Files:
	gnome-vfsmm.spec 
Log Message:
Fixed projet URL


Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/EL-4/gnome-vfsmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-vfsmm.spec	14 Jan 2007 19:08:59 -0000	1.4
+++ gnome-vfsmm.spec	15 Dec 2009 07:23:00 -0000	1.5
@@ -5,7 +5,7 @@ Summary:        A C++ interface for gnom
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.8/gnome-vfsmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:23:00 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:23:00 +0000 (UTC)
Subject: rpms/gnome-vfsmm26/F-11 gnome-vfsmm.spec,1.21,1.22
Message-ID: <20091215072300.D4DB611C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-vfsmm26/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14328/F-11

Modified Files:
	gnome-vfsmm.spec 
Log Message:
Fixed projet URL


Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/F-11/gnome-vfsmm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-vfsmm.spec	25 Jun 2009 05:40:24 -0000	1.21
+++ gnome-vfsmm.spec	15 Dec 2009 07:23:00 -0000	1.22
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for gnome-vf
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.18/gnome-vfsmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:23:01 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:23:01 +0000 (UTC)
Subject: rpms/gnome-vfsmm26/F-12 gnome-vfsmm.spec,1.22,1.23
Message-ID: <20091215072301.2915211C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-vfsmm26/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14328/F-12

Modified Files:
	gnome-vfsmm.spec 
Log Message:
Fixed projet URL


Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/F-12/gnome-vfsmm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnome-vfsmm.spec	17 Aug 2009 08:17:44 -0000	1.22
+++ gnome-vfsmm.spec	15 Dec 2009 07:23:00 -0000	1.23
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for gnome-vf
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.18/gnome-vfsmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:23:01 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:23:01 +0000 (UTC)
Subject: rpms/gnome-vfsmm26/devel gnome-vfsmm.spec,1.22,1.23
Message-ID: <20091215072301.4F1C511C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-vfsmm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14328/devel

Modified Files:
	gnome-vfsmm.spec 
Log Message:
Fixed projet URL


Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnome-vfsmm.spec	17 Aug 2009 08:17:44 -0000	1.22
+++ gnome-vfsmm.spec	15 Dec 2009 07:23:01 -0000	1.23
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for gnome-vf
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.18/gnome-vfsmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:24:45 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:24:45 +0000 (UTC)
Subject: rpms/goocanvasmm/F-11 goocanvasmm.spec,1.8,1.9
Message-ID: <20091215072445.98C9811C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvasmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14705/F-11

Modified Files:
	goocanvasmm.spec 
Log Message:
Fixed project URL


Index: goocanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/F-11/goocanvasmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- goocanvasmm.spec	7 Nov 2009 09:04:01 -0000	1.8
+++ goocanvasmm.spec	15 Dec 2009 07:24:45 -0000	1.9
@@ -6,7 +6,7 @@ Summary:        C++ interface for goocan
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.14/goocanvasmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:24:45 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:24:45 +0000 (UTC)
Subject: rpms/goocanvasmm/F-12 goocanvasmm.spec,1.9,1.10
Message-ID: <20091215072445.B1E7111C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvasmm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14705/F-12

Modified Files:
	goocanvasmm.spec 
Log Message:
Fixed project URL


Index: goocanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/F-12/goocanvasmm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- goocanvasmm.spec	7 Nov 2009 09:03:09 -0000	1.9
+++ goocanvasmm.spec	15 Dec 2009 07:24:45 -0000	1.10
@@ -6,7 +6,7 @@ Summary:        C++ interface for goocan
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.14/goocanvasmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:24:45 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:24:45 +0000 (UTC)
Subject: rpms/goocanvasmm/devel goocanvasmm.spec,1.9,1.10
Message-ID: <20091215072445.D22E611C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvasmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14705/devel

Modified Files:
	goocanvasmm.spec 
Log Message:
Fixed project URL


Index: goocanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/goocanvasmm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- goocanvasmm.spec	7 Nov 2009 09:03:41 -0000	1.9
+++ goocanvasmm.spec	15 Dec 2009 07:24:45 -0000	1.10
@@ -6,7 +6,7 @@ Summary:        C++ interface for goocan
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.14/goocanvasmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:26:35 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:26:35 +0000 (UTC)
Subject: rpms/gtkmm24/EL-4 gtkmm.spec,1.6,1.7
Message-ID: <20091215072635.DC64011C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15038/EL-4

Modified Files:
	gtkmm.spec 
Log Message:
Fixed project URL


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/EL-4/gtkmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gtkmm.spec	14 Jan 2007 15:02:12 -0000	1.6
+++ gtkmm.spec	15 Dec 2009 07:26:35 -0000	1.7
@@ -5,7 +5,7 @@ Summary:        A C++ interface for GTK2
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:26:36 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:26:36 +0000 (UTC)
Subject: rpms/gtkmm24/EL-5 gtkmm.spec,1.23,1.24
Message-ID: <20091215072636.1552211C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15038/EL-5

Modified Files:
	gtkmm.spec 
Log Message:
Fixed project URL


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/EL-5/gtkmm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gtkmm.spec	10 Jul 2007 09:48:15 -0000	1.23
+++ gtkmm.spec	15 Dec 2009 07:26:35 -0000	1.24
@@ -6,7 +6,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.10/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:26:36 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:26:36 +0000 (UTC)
Subject: rpms/gtkmm24/F-11 gtkmm.spec,1.51,1.52
Message-ID: <20091215072636.47F1D11C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15038/F-11

Modified Files:
	gtkmm.spec 
Log Message:
Fixed project URL


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/F-11/gtkmm.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- gtkmm.spec	6 Apr 2009 10:30:24 -0000	1.51
+++ gtkmm.spec	15 Dec 2009 07:26:36 -0000	1.52
@@ -6,7 +6,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.15/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:26:36 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:26:36 +0000 (UTC)
Subject: rpms/gtkmm24/F-12 gtkmm.spec,1.58,1.59
Message-ID: <20091215072636.A3DA711C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15038/F-12

Modified Files:
	gtkmm.spec 
Log Message:
Fixed project URL


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/F-12/gtkmm.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- gtkmm.spec	24 Oct 2009 15:39:50 -0000	1.58
+++ gtkmm.spec	15 Dec 2009 07:26:36 -0000	1.59
@@ -6,7 +6,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:26:36 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:26:36 +0000 (UTC)
Subject: rpms/gtkmm24/devel gtkmm.spec,1.58,1.59
Message-ID: <20091215072636.B69B211C02A7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15038/devel

Modified Files:
	gtkmm.spec 
Log Message:
Fixed project URL


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- gtkmm.spec	24 Oct 2009 13:46:47 -0000	1.58
+++ gtkmm.spec	15 Dec 2009 07:26:36 -0000	1.59
@@ -6,7 +6,7 @@ Summary:        C++ interface for GTK2 (
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:28:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:28:30 +0000 (UTC)
Subject: rpms/libglademm24/EL-4 libglademm.spec,1.4,1.5
Message-ID: <20091215072830.A809311C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libglademm24/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15405/EL-4

Modified Files:
	libglademm.spec 
Log Message:
Fixed project URL


Index: libglademm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/EL-4/libglademm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libglademm.spec	14 Jan 2007 18:51:11 -0000	1.4
+++ libglademm.spec	15 Dec 2009 07:28:30 -0000	1.5
@@ -5,7 +5,7 @@ Summary:        A C++ interface for libg
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.4/libglademm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:28:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:28:30 +0000 (UTC)
Subject: rpms/libglademm24/F-11 libglademm.spec,1.16,1.17
Message-ID: <20091215072830.E242C11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libglademm24/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15405/F-11

Modified Files:
	libglademm.spec 
Log Message:
Fixed project URL


Index: libglademm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/F-11/libglademm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libglademm.spec	25 Feb 2009 15:11:13 -0000	1.16
+++ libglademm.spec	15 Dec 2009 07:28:30 -0000	1.17
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for libglade
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/libglademm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:28:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:28:30 +0000 (UTC)
Subject: rpms/libglademm24/EL-5 libglademm.spec,1.12,1.13
Message-ID: <20091215072830.BE87B11C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libglademm24/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15405/EL-5

Modified Files:
	libglademm.spec 
Log Message:
Fixed project URL


Index: libglademm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/EL-5/libglademm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libglademm.spec	10 Jun 2009 09:45:59 -0000	1.12
+++ libglademm.spec	15 Dec 2009 07:28:30 -0000	1.13
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for libglade
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/libglademm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:28:31 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:28:31 +0000 (UTC)
Subject: rpms/libglademm24/F-12 libglademm.spec,1.17,1.18
Message-ID: <20091215072831.176BD11C02B9@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libglademm24/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15405/F-12

Modified Files:
	libglademm.spec 
Log Message:
Fixed project URL


Index: libglademm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/F-12/libglademm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libglademm.spec	25 Jul 2009 05:44:48 -0000	1.17
+++ libglademm.spec	15 Dec 2009 07:28:30 -0000	1.18
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for libglade
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/libglademm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:28:31 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:28:31 +0000 (UTC)
Subject: rpms/libglademm24/devel libglademm.spec,1.17,1.18
Message-ID: <20091215072831.3C48C11C02BB@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libglademm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15405/devel

Modified Files:
	libglademm.spec 
Log Message:
Fixed project URL


Index: libglademm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libglademm.spec	25 Jul 2009 05:44:48 -0000	1.17
+++ libglademm.spec	15 Dec 2009 07:28:31 -0000	1.18
@@ -6,7 +6,7 @@ Summary:        C++ wrapper for libglade
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/libglademm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:34:39 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:34:39 +0000 (UTC)
Subject: rpms/libgnomecanvasmm26/F-11 libgnomecanvasmm.spec,1.20,1.21
Message-ID: <20091215073439.E351D11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomecanvasmm26/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16364/F-11

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Fixed project URL


Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/F-11/libgnomecanvasmm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libgnomecanvasmm.spec	6 Apr 2009 10:32:55 -0000	1.20
+++ libgnomecanvasmm.spec	15 Dec 2009 07:34:39 -0000	1.21
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.22/libgnomecanvasmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:34:40 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:34:40 +0000 (UTC)
Subject: rpms/libgnomecanvasmm26/F-12 libgnomecanvasmm.spec,1.21,1.22
Message-ID: <20091215073440.0C95511C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomecanvasmm26/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16364/F-12

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Fixed project URL


Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/F-12/libgnomecanvasmm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libgnomecanvasmm.spec	25 Jul 2009 05:46:37 -0000	1.21
+++ libgnomecanvasmm.spec	15 Dec 2009 07:34:39 -0000	1.22
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.22/libgnomecanvasmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:34:40 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:34:40 +0000 (UTC)
Subject: rpms/libgnomecanvasmm26/devel libgnomecanvasmm.spec,1.21,1.22
Message-ID: <20091215073440.62D7411C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomecanvasmm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16364/devel

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Fixed project URL


Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libgnomecanvasmm.spec	25 Jul 2009 05:46:37 -0000	1.21
+++ libgnomecanvasmm.spec	15 Dec 2009 07:34:40 -0000	1.22
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.22/libgnomecanvasmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:34:40 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:34:40 +0000 (UTC)
Subject: rpms/libgnomecanvasmm26/EL-4 libgnomecanvasmm.spec,1.3,1.4
Message-ID: <20091215073440.3C4A211C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomecanvasmm26/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16364/EL-4

Modified Files:
	libgnomecanvasmm.spec 
Log Message:
Fixed project URL


Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/EL-4/libgnomecanvasmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libgnomecanvasmm.spec	14 Jan 2007 19:12:04 -0000	1.3
+++ libgnomecanvasmm.spec	15 Dec 2009 07:34:40 -0000	1.4
@@ -5,7 +5,7 @@ Summary:        A C++ interface for Gnom
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.8/libgnomecanvasmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:38:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:38:30 +0000 (UTC)
Subject: rpms/libgnomemm26/F-11 libgnomemm.spec,1.22,1.23
Message-ID: <20091215073830.4629D11C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17290/F-11

Modified Files:
	libgnomemm.spec 
Log Message:
Fixed project URL


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/F-11/libgnomemm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libgnomemm.spec	7 Apr 2009 06:35:11 -0000	1.22
+++ libgnomemm.spec	15 Dec 2009 07:38:30 -0000	1.23
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.22/libgnomemm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:38:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:38:30 +0000 (UTC)
Subject: rpms/libgnomemm26/devel libgnomemm.spec,1.24,1.25
Message-ID: <20091215073830.95C5611C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17290/devel

Modified Files:
	libgnomemm.spec 
Log Message:
Fixed project URL


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libgnomemm.spec	25 Sep 2009 07:50:19 -0000	1.24
+++ libgnomemm.spec	15 Dec 2009 07:38:30 -0000	1.25
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.28/libgnomemm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:38:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:38:30 +0000 (UTC)
Subject: rpms/libgnomemm26/EL-4 libgnomemm.spec,1.4,1.5
Message-ID: <20091215073830.273C011C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17290/EL-4

Modified Files:
	libgnomemm.spec 
Log Message:
Fixed project URL


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/EL-4/libgnomemm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libgnomemm.spec	14 Jan 2007 19:18:24 -0000	1.4
+++ libgnomemm.spec	15 Dec 2009 07:38:29 -0000	1.5
@@ -5,7 +5,7 @@ Summary:        A C++ interface for Gnom
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.8/libgnomemm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:38:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:38:30 +0000 (UTC)
Subject: rpms/libgnomemm26/F-12 libgnomemm.spec,1.24,1.25
Message-ID: <20091215073830.6CA1B11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17290/F-12

Modified Files:
	libgnomemm.spec 
Log Message:
Fixed project URL


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/F-12/libgnomemm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libgnomemm.spec	25 Sep 2009 07:50:19 -0000	1.24
+++ libgnomemm.spec	15 Dec 2009 07:38:30 -0000	1.25
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.28/libgnomemm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:40:27 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:40:27 +0000 (UTC)
Subject: rpms/libgnomeuimm26/EL-4 libgnomeuimm.spec,1.4,1.5
Message-ID: <20091215074027.C6CD411C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17654/EL-4

Modified Files:
	libgnomeuimm.spec 
Log Message:
Fixed project URL


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/EL-4/libgnomeuimm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libgnomeuimm.spec	14 Jan 2007 19:32:10 -0000	1.4
+++ libgnomeuimm.spec	15 Dec 2009 07:40:27 -0000	1.5
@@ -5,7 +5,7 @@ Summary:        A C++ interface for Gnom
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.8/libgnomeuimm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:40:27 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:40:27 +0000 (UTC)
Subject: rpms/libgnomeuimm26/F-11 libgnomeuimm.spec,1.22,1.23
Message-ID: <20091215074027.F02B311C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17654/F-11

Modified Files:
	libgnomeuimm.spec 
Log Message:
Fixed project URL


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/F-11/libgnomeuimm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libgnomeuimm.spec	7 Apr 2009 06:37:57 -0000	1.22
+++ libgnomeuimm.spec	15 Dec 2009 07:40:27 -0000	1.23
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.18/libgnomeuimm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:40:28 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:40:28 +0000 (UTC)
Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec,1.24,1.25
Message-ID: <20091215074028.4318711C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17654/devel

Modified Files:
	libgnomeuimm.spec 
Log Message:
Fixed project URL


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libgnomeuimm.spec	25 Sep 2009 07:54:23 -0000	1.24
+++ libgnomeuimm.spec	15 Dec 2009 07:40:28 -0000	1.25
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.28/libgnomeuimm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:40:28 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:40:28 +0000 (UTC)
Subject: rpms/libgnomeuimm26/F-12 libgnomeuimm.spec,1.24,1.25
Message-ID: <20091215074028.6CA2B11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17654/F-12

Modified Files:
	libgnomeuimm.spec 
Log Message:
Fixed project URL


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/F-12/libgnomeuimm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libgnomeuimm.spec	25 Sep 2009 07:54:23 -0000	1.24
+++ libgnomeuimm.spec	15 Dec 2009 07:40:28 -0000	1.25
@@ -6,7 +6,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libgnomeuimm/2.28/libgnomeuimm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:43:36 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:43:36 +0000 (UTC)
Subject: rpms/libnotifymm/F-11 libnotifymm.spec,1.5,1.6
Message-ID: <20091215074336.E0DDB11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libnotifymm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18241/F-11

Modified Files:
	libnotifymm.spec 
Log Message:
Fixed project URL


Index: libnotifymm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/F-11/libnotifymm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libnotifymm.spec	25 Feb 2009 16:42:09 -0000	1.5
+++ libnotifymm.spec	15 Dec 2009 07:43:36 -0000	1.6
@@ -8,7 +8,7 @@ Summary:        C++ interface for libnot
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libnotifymm/0.6/%{name}-%{version}.tar.bz2
 Patch1:         libnotifymm-0.6.1-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From denis at fedoraproject.org  Tue Dec 15 07:43:37 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:43:37 +0000 (UTC)
Subject: rpms/libnotifymm/devel libnotifymm.spec,1.6,1.7
Message-ID: <20091215074337.3DDD511C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libnotifymm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18241/devel

Modified Files:
	libnotifymm.spec 
Log Message:
Fixed project URL


Index: libnotifymm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/devel/libnotifymm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libnotifymm.spec	25 Jul 2009 06:14:02 -0000	1.6
+++ libnotifymm.spec	15 Dec 2009 07:43:37 -0000	1.7
@@ -8,7 +8,7 @@ Summary:        C++ interface for libnot
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libnotifymm/0.6/%{name}-%{version}.tar.bz2
 Patch1:         libnotifymm-0.6.1-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From denis at fedoraproject.org  Tue Dec 15 07:43:37 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:43:37 +0000 (UTC)
Subject: rpms/libnotifymm/F-12 libnotifymm.spec,1.6,1.7
Message-ID: <20091215074337.0C8EF11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libnotifymm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18241/F-12

Modified Files:
	libnotifymm.spec 
Log Message:
Fixed project URL


Index: libnotifymm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/F-12/libnotifymm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libnotifymm.spec	25 Jul 2009 06:14:02 -0000	1.6
+++ libnotifymm.spec	15 Dec 2009 07:43:36 -0000	1.7
@@ -8,7 +8,7 @@ Summary:        C++ interface for libnot
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libnotifymm/0.6/%{name}-%{version}.tar.bz2
 Patch1:         libnotifymm-0.6.1-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From denis at fedoraproject.org  Tue Dec 15 07:45:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:45:09 +0000 (UTC)
Subject: rpms/libpanelappletmm/F-11 libpanelappletmm.spec,1.7,1.8
Message-ID: <20091215074509.1AF4511C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libpanelappletmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18518/F-11

Modified Files:
	libpanelappletmm.spec 
Log Message:
Fixed project URL


Index: libpanelappletmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpanelappletmm/F-11/libpanelappletmm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libpanelappletmm.spec	7 Nov 2009 11:14:39 -0000	1.7
+++ libpanelappletmm.spec	15 Dec 2009 07:45:08 -0000	1.8
@@ -5,7 +5,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libpanelappletmm/2.26/libpanelappletmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:45:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:45:09 +0000 (UTC)
Subject: rpms/libpanelappletmm/F-12 libpanelappletmm.spec,1.8,1.9
Message-ID: <20091215074509.32A7411C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libpanelappletmm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18518/F-12

Modified Files:
	libpanelappletmm.spec 
Log Message:
Fixed project URL


Index: libpanelappletmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpanelappletmm/F-12/libpanelappletmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libpanelappletmm.spec	7 Nov 2009 11:14:39 -0000	1.8
+++ libpanelappletmm.spec	15 Dec 2009 07:45:09 -0000	1.9
@@ -5,7 +5,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libpanelappletmm/2.26/libpanelappletmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:45:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:45:09 +0000 (UTC)
Subject: rpms/libpanelappletmm/devel libpanelappletmm.spec,1.8,1.9
Message-ID: <20091215074509.5230611C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libpanelappletmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18518/devel

Modified Files:
	libpanelappletmm.spec 
Log Message:
Fixed project URL


Index: libpanelappletmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpanelappletmm/devel/libpanelappletmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libpanelappletmm.spec	7 Nov 2009 11:14:40 -0000	1.8
+++ libpanelappletmm.spec	15 Dec 2009 07:45:09 -0000	1.9
@@ -5,7 +5,7 @@ Summary:        C++ interface for Gnome 
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libpanelappletmm/2.26/libpanelappletmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:46:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:46:09 +0000 (UTC)
Subject: rpms/pangomm/F-11 pangomm.spec,1.7,1.8
Message-ID: <20091215074609.23CB811C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18707/F-11

Modified Files:
	pangomm.spec 
Log Message:
Fixed project URL


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/F-11/pangomm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pangomm.spec	6 Apr 2009 10:26:31 -0000	1.7
+++ pangomm.spec	15 Dec 2009 07:46:08 -0000	1.8
@@ -7,7 +7,7 @@ Summary:        C++ interface for Pango
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.13/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:46:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:46:09 +0000 (UTC)
Subject: rpms/pangomm/F-12 pangomm.spec,1.12,1.13
Message-ID: <20091215074609.49C7711C0265@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18707/F-12

Modified Files:
	pangomm.spec 
Log Message:
Fixed project URL


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/F-12/pangomm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pangomm.spec	25 Sep 2009 07:28:51 -0000	1.12
+++ pangomm.spec	15 Dec 2009 07:46:09 -0000	1.13
@@ -7,7 +7,7 @@ Summary:        C++ interface for Pango
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Tue Dec 15 07:46:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 15 Dec 2009 07:46:09 +0000 (UTC)
Subject: rpms/pangomm/devel pangomm.spec,1.12,1.13
Message-ID: <20091215074609.7242B11C00E7@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pangomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18707/devel

Modified Files:
	pangomm.spec 
Log Message:
Fixed project URL


Index: pangomm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pangomm/devel/pangomm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pangomm.spec	25 Sep 2009 07:28:51 -0000	1.12
+++ pangomm.spec	15 Dec 2009 07:46:09 -0000	1.13
@@ -7,7 +7,7 @@ Summary:        C++ interface for Pango
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From rvokal at fedoraproject.org  Tue Dec 15 08:36:27 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Tue, 15 Dec 2009 08:36:27 +0000 (UTC)
Subject: rpms/wireshark/devel wireshark-1.2.4-enable_lua.patch, NONE,
	1.1 wireshark-1.2.4-filter_null.patch, NONE, 1.1 wireshark.spec,
	1.61, 1.62
Message-ID: <20091215083627.41A1C11C00E7@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27073

Modified Files:
	wireshark.spec 
Added Files:
	wireshark-1.2.4-enable_lua.patch 
	wireshark-1.2.4-filter_null.patch 
Log Message:
enable Lua support

wireshark-1.2.4-enable_lua.patch:
 template-init.lua |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE wireshark-1.2.4-enable_lua.patch ---
diff -up wireshark-1.2.4/epan/wslua/template-init.lua.enable_lua wireshark-1.2.4/epan/wslua/template-init.lua
--- wireshark-1.2.4/epan/wslua/template-init.lua.enable_lua	2009-11-16 21:30:58.000000000 +0100
+++ wireshark-1.2.4/epan/wslua/template-init.lua	2009-12-15 09:33:59.000000000 +0100
@@ -26,7 +26,7 @@
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 -- Lua is disabled by default, comment out the following line to enable Lua support.
-disable_lua = true; do return end;
+-- disable_lua = true; do return end;
 
 
 -- If set and we are running with special privileges this setting
@@ -39,7 +39,7 @@ if running_superuser then
     local disabled_lib = {}
     setmetatable(disabled_lib,{ __index = function() error("this package has been disabled") end } );
 
-    dofile = function() error("dofile has been disabled") end
+--    dofile = function() error("dofile has been disabled") end
     loadfile = function() error("loadfile has been disabled") end
     loadlib = function() error("loadlib has been disabled") end
     require = function() error("require has been disabled") end

wireshark-1.2.4-filter_null.patch:
 filter_autocomplete.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE wireshark-1.2.4-filter_null.patch ---
diff -up wireshark-1.2.4/gtk/filter_autocomplete.c.bckp wireshark-1.2.4/gtk/filter_autocomplete.c
--- wireshark-1.2.4/gtk/filter_autocomplete.c.bckp	2009-11-16 21:30:43.000000000 +0100
+++ wireshark-1.2.4/gtk/filter_autocomplete.c	2009-12-14 15:51:18.000000000 +0100
@@ -776,7 +776,9 @@ filter_autocomplete_handle_backspace(Gtk
   GtkRequisition requisition;
   size_t prefix_len;
   gboolean protocols_only = FALSE;
-
+  
+  if (prefix == NULL) return;
+  
   /* Delete the last character in the prefix string */
   prefix_len = strlen(prefix)-1;
   prefix[prefix_len] = '\0';


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- wireshark.spec	18 Nov 2009 16:30:22 -0000	1.61
+++ wireshark.spec	15 Dec 2009 08:36:27 -0000	1.62
@@ -2,6 +2,7 @@
 #define to 0 for final version
 %define svn_version 0
 %define with_adns 0
+%define with_lua 1
 %if 0%{?rhel} != 0
 %define with_portaudio 0
 %else
@@ -11,7 +12,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.2.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -26,6 +27,9 @@ Patch1:		wireshark-1.0.2-pie.patch
 Patch2:		wireshark-nfsv4-opts.patch
 Patch3:		wireshark-0.99.7-path.patch
 Patch4:		wireshark-1.1.2-nfs41-backchnl-decode.patch
+Patch5:		wireshark-1.2.4-filter_null.patch
+
+Patch10:	wireshark-1.2.4-enable_lua.patch
 
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +50,9 @@ BuildRequires:	adns-devel
 %if %{with_portaudio}
 BuildRequires: portaudio-devel
 %endif
+%if %{with_lua}
+BuildRequires:	lua-devel
+%endif
 
 Obsoletes:	ethereal
 Provides:	ethereal
@@ -91,6 +98,11 @@ Contains wireshark for Gnome 2 and deskt
 %patch2 -p1 
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
+%if %{with_lua}
+%patch10 -p1 -b .enable_lua
+%endif
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -117,9 +129,14 @@ export LDFLAGS="$LDFLAGS -lm -lcrypto"
 %else
    --with-adns=no \
 %endif
+%if %{with_lua}
+   --with-lua \
+%else
+   --with-lua=no \
+%endif
    --with-ssl \
    --disable-warnings-as-errors \
-   --with-plugindir=%{_libdir}/%{name}/plugins/%{version}
+   --with-plugindir=%{_libdir}/%{name}/plugins/%{version} 
 time make %{?_smp_mflags}
 
 %install
@@ -203,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/pam.d/wireshark
 %config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
 %{_datadir}/wireshark
+%if %{with_lua}
+%config(noreplace) %{_datadir}/wireshark/init.lua
+%endif
 
 %files gnome
 %defattr(-,root,root)
@@ -214,6 +234,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-2
+- enable lua support - http://wiki.wireshark.org/Lua
+- attempt to fix filter crash on 64bits
+
 * Wed Nov 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-1
 - upgrade to 1.2.4
 - http://www.wireshark.org/docs/relnotes/wireshark-1.2.4.html



From paragn at fedoraproject.org  Tue Dec 15 08:53:52 2009
From: paragn at fedoraproject.org (paragn)
Date: Tue, 15 Dec 2009 08:53:52 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.346, 1.347 comps-f12.xml.in, 1.213,
	1.214 comps-f13.xml.in, 1.118, 1.119
Message-ID: <20091215085352.9DB1111C00E7@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30095

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
- Added hunspell-si to F-11/F-12/F-13 comps



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- comps-f11.xml.in	8 Dec 2009 13:03:04 -0000	1.346
+++ comps-f11.xml.in	15 Dec 2009 08:53:51 -0000	1.347
@@ -4796,6 +4796,7 @@
       <packagereq type="mandatory">lklug-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-sk</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-sayura</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-si</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- comps-f12.xml.in	8 Dec 2009 13:03:04 -0000	1.213
+++ comps-f12.xml.in	15 Dec 2009 08:53:52 -0000	1.214
@@ -5082,6 +5082,7 @@
       <packagereq type="mandatory">lklug-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-si</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-sayura</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-si</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- comps-f13.xml.in	11 Dec 2009 08:37:14 -0000	1.118
+++ comps-f13.xml.in	15 Dec 2009 08:53:52 -0000	1.119
@@ -5090,6 +5090,7 @@
       <packagereq type="mandatory">lklug-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-si</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-sayura</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-si</packagereq>



From paragn at fedoraproject.org  Tue Dec 15 08:55:03 2009
From: paragn at fedoraproject.org (paragn)
Date: Tue, 15 Dec 2009 08:55:03 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.347,1.348
Message-ID: <20091215085503.325B211C00E7@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30302

Modified Files:
	comps-f11.xml.in 
Log Message:
- oops fix typo for hunspell-si in f11 comps



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -p -r1.347 -r1.348
--- comps-f11.xml.in	15 Dec 2009 08:53:51 -0000	1.347
+++ comps-f11.xml.in	15 Dec 2009 08:55:02 -0000	1.348
@@ -4796,7 +4796,7 @@
       <packagereq type="mandatory">lklug-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
-      <packagereq type="conditional" requires="hunspell">hunspell-sk</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-si</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-sayura</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-si</packagereq>



From pkgdb at fedoraproject.org  Tue Dec 15 09:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 09:07:28 +0000
Subject: [pkgdb] ncmpcpp had acl change status
Message-ID: <20091215090729.312CF28ECD2@bastion3.fedora.phx2.redhat.com>

mnowak has set the commit acl on ncmpcpp (Fedora devel) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Tue Dec 15 09:07:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 09:07:34 +0000
Subject: [pkgdb] ncmpcpp had acl change status
Message-ID: <20091215090734.EF1C728ECD6@bastion3.fedora.phx2.redhat.com>

mnowak has set the commit acl on ncmpcpp (Fedora 11) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Tue Dec 15 09:07:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 09:07:39 +0000
Subject: [pkgdb] ncmpcpp had acl change status
Message-ID: <20091215090741.4E12C28ECE8@bastion3.fedora.phx2.redhat.com>

mnowak has set the commit acl on ncmpcpp (Fedora 12) to Approved for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From paragn at fedoraproject.org  Tue Dec 15 09:32:35 2009
From: paragn at fedoraproject.org (paragn)
Date: Tue, 15 Dec 2009 09:32:35 +0000 (UTC)
Subject: rpms/libspiro/devel libspiro.spec,1.3,1.4
Message-ID: <20091215093235.5B49E11C00E7@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libspiro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3790

Modified Files:
	libspiro.spec 
Log Message:
- Fix rpmlint message



Index: libspiro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libspiro/devel/libspiro.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libspiro.spec	25 Jul 2009 08:41:02 -0000	1.3
+++ libspiro.spec	15 Dec 2009 09:32:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libspiro
 Version:        20071029
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library to simplify the drawing of beautiful curves
 
 Group:          System Environment/Libraries
@@ -50,12 +50,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 %files devel
-%doc README gpl.txt README-RaphLevien
 %defattr(-,root,root,-)
+%doc README gpl.txt README-RaphLevien
 %{_includedir}/*
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec 15 2009 Parag <paragn AT fedoraproject.org> - 20071029-4
+- Fix rpmlint error "libspiro.src:53: E: files-attr-not-set"
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20071029-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From roshansingh at fedoraproject.org  Tue Dec 15 09:57:38 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 09:57:38 +0000 (UTC)
Subject: File artha-0.9.1.tar.gz uploaded to lookaside cache by roshansingh
Message-ID: <20091215095738.77FBF28ECD4@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for artha:

c3fc06df65b4aea21fbf4e26a6d57f19  artha-0.9.1.tar.gz



From roshansingh at fedoraproject.org  Tue Dec 15 09:59:40 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 09:59:40 +0000 (UTC)
Subject: rpms/artha/devel artha.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215095940.7969411C00E7@cvs1.fedora.phx.redhat.com>

Author: roshansingh

Update of /cvs/pkgs/rpms/artha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7847/devel

Modified Files:
	.cvsignore sources 
Added Files:
	artha.spec import.log 
Log Message:
initial import



--- NEW FILE artha.spec ---
Name:		artha
Version:	0.9.1
Release:	3%{?dist}
Summary:	A handy thesaurus based on WordNet
URL:		http://artha.sourceforge.net/
License:	GPLv2+
Group:		Applications/Productivity
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	wordnet-devel, libnotify-devel, desktop-file-utils

%description
Artha is a handy thesaurus based on WordNet.

%prep
%setup -q
chmod -x TODO

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/artha.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%dir %{_datadir}/artha
%{_bindir}/artha
%{_datadir}/applications/artha.desktop
%{_datadir}/artha/gui.ui
%{_datadir}/pixmaps/artha.png
%{_mandir}/man1/artha.1.gz

%changelog
* Tue Dec 2 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-3
- Fixed error with the URL in the spec

* Tue Dec 1 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-2
- Fixed problems with the previous rpm

* Fri Nov 27 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-1
- First rpm release for fedora


--- NEW FILE import.log ---
artha-0_9_1-3_fc11:HEAD:artha-0.9.1-3.fc11.src.rpm:1260871059


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/artha/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:46:10 -0000	1.1
+++ .cvsignore	15 Dec 2009 09:59:40 -0000	1.2
@@ -0,0 +1 @@
+artha-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/artha/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:46:10 -0000	1.1
+++ sources	15 Dec 2009 09:59:40 -0000	1.2
@@ -0,0 +1 @@
+c3fc06df65b4aea21fbf4e26a6d57f19  artha-0.9.1.tar.gz



From roshansingh at fedoraproject.org  Tue Dec 15 10:09:18 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 10:09:18 +0000 (UTC)
Subject: File gscribble-0.0.2.1.tar.gz uploaded to lookaside cache by
	roshansingh
Message-ID: <20091215100918.7021628ECD4@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gscribble:

4222c4ec4eaa8ffb15f5f8e753dea8f2  gscribble-0.0.2.1.tar.gz



From roshansingh at fedoraproject.org  Tue Dec 15 10:17:21 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 10:17:21 +0000 (UTC)
Subject: rpms/gscribble/devel gscribble.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215101721.63C8D11C0092@cvs1.fedora.phx.redhat.com>

Author: roshansingh

Update of /cvs/pkgs/rpms/gscribble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11089/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gscribble.spec import.log 
Log Message:
initial import



--- NEW FILE gscribble.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gscribble
Version:        0.0.2.1
Release:        1%{?dist}
Summary:        A desktop client for blogging

Group:          Applications/Internet
License:        GPLv2+
URL:            https://sourceforge.net/projects/gscribble
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, desktop-file-utils
Requires:       pygtk2

%description
A desktop client for blogging.

%prep
%setup -q
sed -i 's|^#!/usr/bin/env python|#!/usr/bin/python|' gscribble

%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
desktop-file-validate %{buildroot}/%{_datadir}/applications/gscribble.desktop


 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README LICENSE AUTHORS ChangeLog
%{python_sitelib}/libgscribble/
%{python_sitelib}/gscribble-*egg-info
%{_bindir}/gscribble
%{_datadir}/gscribble/
%{_datadir}/applications/gscribble.desktop
%{_datadir}/pixmaps/gscribble.png


%changelog
* Sat Oct 31 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.2.1-1
- New Release of gscribble with fixed version problem

* Tue Sep 17 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.2-1
- New Release of gscribble with proxy support 

* Tue Jul 7 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.1-1
- Removed rpmlinit errors and fixed ownership issues

* Tue Jul 7 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.1-alpha
- First rpm of gscribble


--- NEW FILE import.log ---
gscribble-0_0_2_1-1_fc11:HEAD:gscribble-0.0.2.1-1.fc11.src.rpm:1260871759


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gscribble/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:45:14 -0000	1.1
+++ .cvsignore	15 Dec 2009 10:17:21 -0000	1.2
@@ -0,0 +1 @@
+gscribble-0.0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gscribble/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:45:14 -0000	1.1
+++ sources	15 Dec 2009 10:17:21 -0000	1.2
@@ -0,0 +1 @@
+4222c4ec4eaa8ffb15f5f8e753dea8f2  gscribble-0.0.2.1.tar.gz



From roshansingh at fedoraproject.org  Tue Dec 15 10:19:52 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 10:19:52 +0000 (UTC)
Subject: rpms/gscribble/F-11 gscribble.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215101952.3B78911C0092@cvs1.fedora.phx.redhat.com>

Author: roshansingh

Update of /cvs/pkgs/rpms/gscribble/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11698/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gscribble.spec import.log 
Log Message:
F-11 import



--- NEW FILE gscribble.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gscribble
Version:        0.0.2.1
Release:        1%{?dist}
Summary:        A desktop client for blogging

Group:          Applications/Internet
License:        GPLv2+
URL:            https://sourceforge.net/projects/gscribble
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, desktop-file-utils
Requires:       pygtk2

%description
A desktop client for blogging.

%prep
%setup -q
sed -i 's|^#!/usr/bin/env python|#!/usr/bin/python|' gscribble

%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
desktop-file-validate %{buildroot}/%{_datadir}/applications/gscribble.desktop


 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README LICENSE AUTHORS ChangeLog
%{python_sitelib}/libgscribble/
%{python_sitelib}/gscribble-*egg-info
%{_bindir}/gscribble
%{_datadir}/gscribble/
%{_datadir}/applications/gscribble.desktop
%{_datadir}/pixmaps/gscribble.png


%changelog
* Sat Oct 31 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.2.1-1
- New Release of gscribble with fixed version problem

* Tue Sep 17 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.2-1
- New Release of gscribble with proxy support 

* Tue Jul 7 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.1-1
- Removed rpmlinit errors and fixed ownership issues

* Tue Jul 7 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.1-alpha
- First rpm of gscribble


--- NEW FILE import.log ---
gscribble-0_0_2_1-1_fc11:F-11:gscribble-0.0.2.1-1.fc11.src.rpm:1260872335


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gscribble/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:45:14 -0000	1.1
+++ .cvsignore	15 Dec 2009 10:19:52 -0000	1.2
@@ -0,0 +1 @@
+gscribble-0.0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gscribble/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:45:14 -0000	1.1
+++ sources	15 Dec 2009 10:19:52 -0000	1.2
@@ -0,0 +1 @@
+4222c4ec4eaa8ffb15f5f8e753dea8f2  gscribble-0.0.2.1.tar.gz



From roshansingh at fedoraproject.org  Tue Dec 15 10:22:07 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 10:22:07 +0000 (UTC)
Subject: rpms/gscribble/F-12 gscribble.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215102207.C323F11C0092@cvs1.fedora.phx.redhat.com>

Author: roshansingh

Update of /cvs/pkgs/rpms/gscribble/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12290/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gscribble.spec import.log 
Log Message:
F-12 import



--- NEW FILE gscribble.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gscribble
Version:        0.0.2.1
Release:        1%{?dist}
Summary:        A desktop client for blogging

Group:          Applications/Internet
License:        GPLv2+
URL:            https://sourceforge.net/projects/gscribble
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, desktop-file-utils
Requires:       pygtk2

%description
A desktop client for blogging.

%prep
%setup -q
sed -i 's|^#!/usr/bin/env python|#!/usr/bin/python|' gscribble

%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
desktop-file-validate %{buildroot}/%{_datadir}/applications/gscribble.desktop


 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README LICENSE AUTHORS ChangeLog
%{python_sitelib}/libgscribble/
%{python_sitelib}/gscribble-*egg-info
%{_bindir}/gscribble
%{_datadir}/gscribble/
%{_datadir}/applications/gscribble.desktop
%{_datadir}/pixmaps/gscribble.png


%changelog
* Sat Oct 31 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.2.1-1
- New Release of gscribble with fixed version problem

* Tue Sep 17 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.2-1
- New Release of gscribble with proxy support 

* Tue Jul 7 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.1-1
- Removed rpmlinit errors and fixed ownership issues

* Tue Jul 7 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.0.1-alpha
- First rpm of gscribble


--- NEW FILE import.log ---
gscribble-0_0_2_1-1_fc11:F-12:gscribble-0.0.2.1-1.fc11.src.rpm:1260872436


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gscribble/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:45:14 -0000	1.1
+++ .cvsignore	15 Dec 2009 10:22:07 -0000	1.2
@@ -0,0 +1 @@
+gscribble-0.0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gscribble/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:45:14 -0000	1.1
+++ sources	15 Dec 2009 10:22:07 -0000	1.2
@@ -0,0 +1 @@
+4222c4ec4eaa8ffb15f5f8e753dea8f2  gscribble-0.0.2.1.tar.gz



From stevetraylen at fedoraproject.org  Tue Dec 15 10:54:14 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 15 Dec 2009 10:54:14 +0000 (UTC)
Subject: File activemq-cpp-library-3.1.0-src.tar.gz uploaded to lookaside
	cache by stevetraylen
Message-ID: <20091215105414.D034D28ECDA@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for activemq-cpp:

27ac1feb1520fd0c20ce05ff97bb1a64  activemq-cpp-library-3.1.0-src.tar.gz



From topdog at fedoraproject.org  Tue Dec 15 10:55:50 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 15 Dec 2009 10:55:50 +0000 (UTC)
Subject: rpms/dokuwiki/devel Makefile,1.2,1.3 dokuwiki.spec,1.2,1.3
Message-ID: <20091215105550.7A94911C0092@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18945

Modified Files:
	Makefile dokuwiki.spec 
Log Message:
* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
- Fix versioning




Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	25 Nov 2009 23:12:03 -0000	1.2
+++ Makefile	15 Dec 2009 10:55:49 -0000	1.3
@@ -4,7 +4,7 @@ NAME := dokuwiki
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))


Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/devel/dokuwiki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dokuwiki.spec	9 Dec 2009 12:49:46 -0000	1.2
+++ dokuwiki.spec	15 Dec 2009 10:55:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.1.20091202.rc%{?dist}
+Release:	0.3.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
@@ -152,9 +152,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
+- Fix versioning
+
 * Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
 - Upgrade to new upstream
-- Fix bugzilla bugs #544257, #544268
+- Fix bugzilla bug #544257
 
 * Fri Aug 07 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.2.20090214.b
 - Fixes requested by reviewer



From topdog at fedoraproject.org  Tue Dec 15 10:56:40 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 15 Dec 2009 10:56:40 +0000 (UTC)
Subject: rpms/dokuwiki/EL-5 dokuwiki.spec,1.2,1.3
Message-ID: <20091215105640.0F00D11C0092@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19075/EL-5

Modified Files:
	dokuwiki.spec 
Log Message:
* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
- Fix versioning




Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/EL-5/dokuwiki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dokuwiki.spec	9 Dec 2009 13:17:29 -0000	1.2
+++ dokuwiki.spec	15 Dec 2009 10:56:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.1.20091202.rc%{?dist}
+Release:	0.3.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
@@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
+- Fix versioning
+
 * Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
 - Upgrade to new upstream
 - Fix bugzilla bug #544257



From topdog at fedoraproject.org  Tue Dec 15 10:56:40 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 15 Dec 2009 10:56:40 +0000 (UTC)
Subject: rpms/dokuwiki/F-10 dokuwiki.spec,1.2,1.3
Message-ID: <20091215105640.43B3211C0092@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19075/F-10

Modified Files:
	dokuwiki.spec 
Log Message:
* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
- Fix versioning




Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-10/dokuwiki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dokuwiki.spec	9 Dec 2009 13:12:52 -0000	1.2
+++ dokuwiki.spec	15 Dec 2009 10:56:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.1.20091202.rc%{?dist}
+Release:	0.3.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
@@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
+- Fix versioning
+
 * Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
 - Upgrade to new upstream
 - Fix bugzilla bug #544257



From topdog at fedoraproject.org  Tue Dec 15 10:56:40 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 15 Dec 2009 10:56:40 +0000 (UTC)
Subject: rpms/dokuwiki/F-11 dokuwiki.spec,1.2,1.3
Message-ID: <20091215105640.5F34111C0092@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19075/F-11

Modified Files:
	dokuwiki.spec 
Log Message:
* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
- Fix versioning




Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-11/dokuwiki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dokuwiki.spec	9 Dec 2009 13:09:55 -0000	1.2
+++ dokuwiki.spec	15 Dec 2009 10:56:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.1.20091202.rc%{?dist}
+Release:	0.3.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
@@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
+- Fix versioning
+
 * Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
 - Upgrade to new upstream
 - Fix bugzilla bug #544257



From topdog at fedoraproject.org  Tue Dec 15 10:56:40 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 15 Dec 2009 10:56:40 +0000 (UTC)
Subject: rpms/dokuwiki/F-12 dokuwiki.spec,1.2,1.3
Message-ID: <20091215105640.79CCF11C0092@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/dokuwiki/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19075/F-12

Modified Files:
	dokuwiki.spec 
Log Message:
* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
- Fix versioning




Index: dokuwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dokuwiki/F-12/dokuwiki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dokuwiki.spec	9 Dec 2009 13:07:02 -0000	1.2
+++ dokuwiki.spec	15 Dec 2009 10:56:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.1.20091202.rc%{?dist}
+Release:	0.3.20091202.rc%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
@@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
 %changelog
+* Tue Dec 15 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.3.20091202.rc
+- Fix versioning
+
 * Fri Dec 04 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.1.20091202.rc
 - Upgrade to new upstream
 - Fix bugzilla bug #544257



From sharkcz at fedoraproject.org  Tue Dec 15 10:56:49 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 15 Dec 2009 10:56:49 +0000 (UTC)
Subject: rpms/hercules/devel hercules-force-hfp-unnormalized.patch, NONE,
	1.1 hercules-intltoolize.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 hercules.cnf, 1.2, 1.3 hercules.spec, 1.28, 1.29 sources,
	1.8, 1.9 hercules-3.06-extgui.patch, 1.1,
	NONE hercules-3.06-preproc.patch, 1.1, NONE
Message-ID: <20091215105649.2BF1811C0092@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19200

Modified Files:
	.cvsignore hercules.cnf hercules.spec sources 
Added Files:
	hercules-force-hfp-unnormalized.patch 
	hercules-intltoolize.patch 
Removed Files:
	hercules-3.06-extgui.patch hercules-3.06-preproc.patch 
Log Message:
* Mon Dec 14 2009 Dan Hor?k <dan[at]danny.cz> 3.06-7.20091214svn5544
- updated to svn revision 5544
- added workaround for booting Fedora kernels requiring z9 or better
- spec cleanup
- updated default config


hercules-force-hfp-unnormalized.patch:
 esame.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hercules-force-hfp-unnormalized.patch ---
>From 71661b7ec83f4a4cebb77d7eadfaf2729b0a0196 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 13 Dec 2009 16:58:20 +0100
Subject: [PATCH] forcefully enable the HFP_UNNORMALIZED extension

---
 esame.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/esame.c b/esame.c
index b1803e0..472e0b0 100644
--- a/esame.c
+++ b/esame.c
@@ -5202,6 +5202,9 @@ BYTE *stfl_data;    /* -> STFL data being modified. Depends upon     */
 
         stfl_data[0] |= STFL_0_ESAME_INSTALLED;
 
+	// forcefully report this extension
+        stfl_data[2] |= STFL_2_HFP_UNNORM_EXT;
+
         /* Set whether z/Arch is active based upon CPU mode */
         if (regs->arch_mode == ARCH_900)
             stfl_data[0] |= STFL_0_ESAME_ACTIVE;
-- 
1.6.3.3


hercules-intltoolize.patch:
 configure.ac |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hercules-intltoolize.patch ---
>From 6c072a76206f35323788f4a70b9d8e8570dc25c6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 14 Dec 2009 17:07:37 +0100
Subject: [PATCH] add support for intltoolize

---
 configure.ac |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0eee5c9..85a2886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,9 @@ AC_MSG_NOTICE( [(use of lt_dlopen forced by Hercules Dynamic Loader requirement)
 hc_cv_have_lt_dlopen=yes
 
 
+IT_PROG_INTLTOOL
+GETTEXT_PACKAGE=hercules
+AC_SUBST(GETTEXT_PACKAGE)
 
 AM_GNU_GETTEXT([external])              #
 AM_ICONV
-- 
1.6.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Feb 2009 21:15:35 -0000	1.8
+++ .cvsignore	15 Dec 2009 10:56:46 -0000	1.9
@@ -1 +1 @@
-hercules-3.06.tar.gz
+hercules-svn5544.tar.bz2


Index: hercules.cnf
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.cnf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hercules.cnf	1 Aug 2006 12:21:25 -0000	1.2
+++ hercules.cnf	15 Dec 2009 10:56:48 -0000	1.3
@@ -2,17 +2,15 @@
 # the Hercules ESA/390 emulator
 
 CPUSERIAL 002623        # CPU serial number
-CPUMODEL  3090          # CPU model number: 3090, 7490, 2064
-MAINSIZE  256           # Main storage size in megabytes
+CPUMODEL  2064          # CPU model number: 3090, 7490, 2064
+MAINSIZE  512           # Main storage size in megabytes
 NUMCPU    1             # Number of CPUs
 CNSLPORT  3270          # TCP port number to which consoles connect
 #HTTPPORT 8081          # enable a HTTP server on this port
 OSTAILOR  LINUX         # OS tailoring
 LOADPARM  0120....      # IPL parameter
-IODELAY   0             # modern kernels do not need a delay
-ARCHMODE  ESA/390       # Architecture mode S/370, ESA/390 or ESAME
+ARCHMODE  ESAME         # Architecture mode S/370, ESA/390 or ESAME
 TZOFFSET  +0100         # Central Europe
-MODPATH   @LIBDIR@/hercules
 LDMOD     hdt3088.so hdt3420.so hdt3505.so
 
 # .----------------- Device number
@@ -36,7 +34,7 @@ LDMOD     hdt3088.so hdt3420.so hdt3505.
 #0200 3270
 #0201 3270
 # tape drives
-0580  3420 /etc/hercules/tape.tdf
+#0580 3420 /etc/hercules/tape.tdf
 #0581 3420 /dev/st0
 #0582 3420 ickdsf.ipl
 # networking, channel-to-channel adapter
@@ -44,4 +42,3 @@ LDMOD     hdt3088.so hdt3420.so hdt3505.
 0601  3088 CTCI -n /dev/net/tun -t 1500 192.168.200.3 192.168.200.4
 # networking, LCS adaptor
 #0700 3088 LCS 192.168.200.4 -n /dev/net/tun -m 01:02:03:04:05:06
-


Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- hercules.spec	26 Sep 2009 08:15:43 -0000	1.28
+++ hercules.spec	15 Dec 2009 10:56:48 -0000	1.29
@@ -1,25 +1,29 @@
+%global svnrev 5544
+
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 6%{?dist}
+Release: 7.20091214svn5544%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
-Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
+#Source0: http://www.hercules-390.org/%{name}-%{version}.tar.gz
+Source0: %{name}-svn%{svnrev}.tar.bz2
 Source1: hercules.cnf
 Source2: hercules-run
 Source3: README-rpm
 Source4: generic.prm
 Patch0: %{name}-3.05-make.patch
 Patch1: %{name}-3.06-ltdl.patch
-Patch2: %{name}-3.06-preproc.patch
-Patch3: %{name}-3.06-extgui.patch
+Patch2: %{name}-force-hfp-unnormalized.patch
+Patch3: %{name}-intltoolize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
 BuildRequires: libcap-devel
 BuildRequires: libtool
 BuildRequires: libtool-ltdl-devel
+BuildRequires: intltool
 
 %description
 Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture
@@ -31,17 +35,18 @@ printer-keyboard, 3270 terminal, and 328
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
 # refresh for recent libtool
-rm autoconf/libtool.m4
+rm -f autoconf/libtool.m4
 libtoolize --copy --force
 
 # refresh buildsystem
+intltoolize -f
 aclocal -I m4 -I autoconf
 autoheader
 automake
@@ -50,9 +55,9 @@ autoconf
 # Get the modules in the right place (lib64 on 64bit archs)
 sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
 # Scripts to be looked at, not executed from the docs
-%{__chmod} -x util/*
+chmod -x util/*
 # remove Makefile
-%{__rm} util/Makefile*
+rm util/Makefile*
 
 
 %build
@@ -61,30 +66,32 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
     --enable-dependency-tracking \
     --enable-optimization="%{optflags}"
 
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
-%{__rm} -rf %{buildroot} README.fedora
-%{__make} install DESTDIR=%{buildroot}
+rm -rf %{buildroot} README.fedora
+make install DESTDIR=%{buildroot}
+
 %find_lang %{name}
-# Install our configuration file, substitute @LIBDIR@ for the current value
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/hercules
-%{__cat} %{SOURCE1} | %{__sed} 's|@LIBDIR@|%{_libdir}|g' > \
-    %{buildroot}%{_sysconfdir}/hercules/hercules.cnf
-# Install generic.prm with parameters matching hercules.cnf
-%{__install} -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/hercules/
+
+mkdir -p %{buildroot}%{_sysconfdir}/hercules
+# Install config files
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/hercules/
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/hercules/
+
 # Install our wrapper script (takes care of tunnel networking)
-%{__install} -D -p -m 0755 %{SOURCE2} \
-    %{buildroot}%{_sbindir}/hercules-run
+install -D -p -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}/hercules-run
+
 # Copy our README to be included as doc
-%{__install} -p -m 0644 %{SOURCE3} README-rpm
+install -p -m 0644 %{SOURCE3} README-rpm
+
 # Create empty directory where to store system images
-%{__mkdir_p} %{buildroot}%{_var}/lib/hercules
+mkdir -p %{buildroot}%{_sharedstatedir}/hercules
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
@@ -101,10 +108,16 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 %{_libdir}/*.so
 %exclude %{_libdir}/*.la
 %{_mandir}/man?/*
-%dir %{_var}/lib/hercules/
+%dir %{_sharedstatedir}/hercules/
 
 
 %changelog
+* Mon Dec 14 2009 Dan Hor?k <dan[at]danny.cz> 3.06-7.20091214svn5544
+- updated to svn revision 5544
+- added workaround for booting Fedora kernels requiring z9 or better
+- spec cleanup
+- updated default config
+
 * Sat Sep 26 2009 Dan Hor?k <dan[at]danny.cz> 3.06-6
 - rebuilt to use POSIX capabilities
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Feb 2009 21:15:35 -0000	1.8
+++ sources	15 Dec 2009 10:56:49 -0000	1.9
@@ -1 +1 @@
-3a356b251e2b7fc49ac2b7244d12d50b  hercules-3.06.tar.gz
+4a2ca4b822fadf26287681dadca7d8c8  hercules-svn5544.tar.bz2


--- hercules-3.06-extgui.patch DELETED ---


--- hercules-3.06-preproc.patch DELETED ---



From roshansingh at fedoraproject.org  Tue Dec 15 11:07:35 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 11:07:35 +0000 (UTC)
Subject: rpms/gscribble/devel import.log,1.1,1.2
Message-ID: <20091215110735.0C87B11C0092@cvs1.fedora.phx.redhat.com>

Author: roshansingh

Update of /cvs/pkgs/rpms/gscribble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21060/devel

Modified Files:
	import.log 
Log Message:
imported again



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gscribble/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Dec 2009 10:17:21 -0000	1.1
+++ import.log	15 Dec 2009 11:07:34 -0000	1.2
@@ -1 +1,2 @@
 gscribble-0_0_2_1-1_fc11:HEAD:gscribble-0.0.2.1-1.fc11.src.rpm:1260871759
+gscribble-0_0_2_1-1_fc11:HEAD:gscribble-0.0.2.1-1.fc11.src.rpm:1260875188



From stevetraylen at fedoraproject.org  Tue Dec 15 11:09:15 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 15 Dec 2009 11:09:15 +0000 (UTC)
Subject: File activemq-cpp-library-3.0.1-src.tar.gz uploaded to lookaside
	cache by stevetraylen
Message-ID: <20091215110915.EA0D228ECE8@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for activemq-cpp:

b917d8a27841e9ab0aeeb2297f771447  activemq-cpp-library-3.0.1-src.tar.gz



From roshansingh at fedoraproject.org  Tue Dec 15 11:10:46 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 11:10:46 +0000 (UTC)
Subject: rpms/artha/F-11 artha.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215111046.8920D11C0335@cvs1.fedora.phx.redhat.com>

Author: roshansingh

Update of /cvs/pkgs/rpms/artha/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22079/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	artha.spec import.log 
Log Message:
import F-11



--- NEW FILE artha.spec ---
Name:		artha
Version:	0.9.1
Release:	3%{?dist}
Summary:	A handy thesaurus based on WordNet
URL:		http://artha.sourceforge.net/
License:	GPLv2+
Group:		Applications/Productivity
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	wordnet-devel, libnotify-devel, desktop-file-utils

%description
Artha is a handy thesaurus based on WordNet.

%prep
%setup -q
chmod -x TODO

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/artha.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%dir %{_datadir}/artha
%{_bindir}/artha
%{_datadir}/applications/artha.desktop
%{_datadir}/artha/gui.ui
%{_datadir}/pixmaps/artha.png
%{_mandir}/man1/artha.1.gz

%changelog
* Tue Dec 2 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-3
- Fixed error with the URL in the spec

* Tue Dec 1 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-2
- Fixed problems with the previous rpm

* Fri Nov 27 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-1
- First rpm release for fedora


--- NEW FILE import.log ---
artha-0_9_1-3_fc11:F-11:artha-0.9.1-3.fc11.src.rpm:1260875371


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/artha/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:46:10 -0000	1.1
+++ .cvsignore	15 Dec 2009 11:10:45 -0000	1.2
@@ -0,0 +1 @@
+artha-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/artha/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:46:10 -0000	1.1
+++ sources	15 Dec 2009 11:10:46 -0000	1.2
@@ -0,0 +1 @@
+c3fc06df65b4aea21fbf4e26a6d57f19  artha-0.9.1.tar.gz



From roshansingh at fedoraproject.org  Tue Dec 15 11:13:10 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 11:13:10 +0000 (UTC)
Subject: rpms/artha/F-12 artha.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091215111310.DBFAF11C0092@cvs1.fedora.phx.redhat.com>

Author: roshansingh

Update of /cvs/pkgs/rpms/artha/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22679/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	artha.spec import.log 
Log Message:
import F-12



--- NEW FILE artha.spec ---
Name:		artha
Version:	0.9.1
Release:	3%{?dist}
Summary:	A handy thesaurus based on WordNet
URL:		http://artha.sourceforge.net/
License:	GPLv2+
Group:		Applications/Productivity
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	wordnet-devel, libnotify-devel, desktop-file-utils

%description
Artha is a handy thesaurus based on WordNet.

%prep
%setup -q
chmod -x TODO

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/artha.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%dir %{_datadir}/artha
%{_bindir}/artha
%{_datadir}/applications/artha.desktop
%{_datadir}/artha/gui.ui
%{_datadir}/pixmaps/artha.png
%{_mandir}/man1/artha.1.gz

%changelog
* Tue Dec 2 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-3
- Fixed error with the URL in the spec

* Tue Dec 1 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-2
- Fixed problems with the previous rpm

* Fri Nov 27 2009 Roshan Kumar Singh <singh.roshan08 at gmail.com> 0.9.1-1
- First rpm release for fedora


--- NEW FILE import.log ---
artha-0_9_1-3_fc11:F-12:artha-0.9.1-3.fc11.src.rpm:1260875547


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/artha/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:46:10 -0000	1.1
+++ .cvsignore	15 Dec 2009 11:13:10 -0000	1.2
@@ -0,0 +1 @@
+artha-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/artha/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:46:10 -0000	1.1
+++ sources	15 Dec 2009 11:13:10 -0000	1.2
@@ -0,0 +1 @@
+c3fc06df65b4aea21fbf4e26a6d57f19  artha-0.9.1.tar.gz



From roshansingh at fedoraproject.org  Tue Dec 15 11:14:37 2009
From: roshansingh at fedoraproject.org (Roshan Singh)
Date: Tue, 15 Dec 2009 11:14:37 +0000 (UTC)
Subject: rpms/artha/devel import.log,1.1,1.2
Message-ID: <20091215111437.71DDC11C0092@cvs1.fedora.phx.redhat.com>

Author: roshansingh

Update of /cvs/pkgs/rpms/artha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23061/devel

Modified Files:
	import.log 
Log Message:
import devel



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/artha/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Dec 2009 09:59:40 -0000	1.1
+++ import.log	15 Dec 2009 11:14:36 -0000	1.2
@@ -1 +1,2 @@
 artha-0_9_1-3_fc11:HEAD:artha-0.9.1-3.fc11.src.rpm:1260871059
+artha-0_9_1-3_fc11:HEAD:artha-0.9.1-3.fc11.src.rpm:1260875621



From hadess at fedoraproject.org  Tue Dec 15 11:27:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Dec 2009 11:27:31 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.103,1.104
Message-ID: <20091215112731.57B4F11C0092@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25318

Modified Files:
	gnome-bluetooth.spec 
Log Message:
* Tue Dec 15 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-3
- Enable introspection



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gnome-bluetooth.spec	14 Dec 2009 13:45:20 -0000	1.103
+++ gnome-bluetooth.spec	15 Dec 2009 11:27:29 -0000	1.104
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.29.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -82,7 +82,7 @@ This package contains the Moblin user in
 %patch1 -p1
 
 %build
-%configure --disable-desktop-update --disable-icon-update --enable-introspection=no
+%configure --disable-desktop-update --disable-icon-update
 make %{?_smp_mflags}
 
 %install
@@ -221,6 +221,9 @@ fi
 %{_bindir}/bluetooth-panel
 
 %changelog
+* Tue Dec 15 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-3
+- Enable introspection
+
 * Mon Dec 14 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-2
 - Add patch to fix possible crasher in bluetooth-sendto (#544881)
 



From atkac at fedoraproject.org  Tue Dec 15 11:57:55 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Dec 2009 11:57:55 +0000 (UTC)
Subject: File bind-9.7.0rc1.tar.gz uploaded to lookaside cache by atkac
Message-ID: <20091215115755.D5C4728ECA0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for bind:

4f7e99f8aef6b3d19ef86647c183f502  bind-9.7.0rc1.tar.gz



From atkac at fedoraproject.org  Tue Dec 15 12:31:59 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Dec 2009 12:31:59 +0000 (UTC)
Subject: File config-5.tar.bz2 uploaded to lookaside cache by atkac
Message-ID: <20091215123159.BEB4328ECEB@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for bind:

4c35a2aac8d8054ea2154906bf57fb52  config-5.tar.bz2



From varekova at fedoraproject.org  Tue Dec 15 12:32:53 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 15 Dec 2009 12:32:53 +0000 (UTC)
Subject: rpms/aspell/devel aspell.spec, 1.53, 1.54 aspell-0.50.3-gcc33.patch,
	1.2, NONE
Message-ID: <20091215123253.5363B11C0092@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3739

Modified Files:
	aspell.spec 
Removed Files:
	aspell-0.50.3-gcc33.patch 
Log Message:
- remove obsolete patch



Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- aspell.spec	4 Dec 2009 13:13:38 -0000	1.53
+++ aspell.spec	15 Dec 2009 12:32:52 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Spell checker
 Name: aspell
 Version: 0.60.6
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 12
 # LGPLv2+ .. aspell-0.60.6/misc/po-filter.c, ltmain.sh, modules/speller/default/affix.cpp
 # GPLv2+  .. aspell-0.60.6/misc/po-filter.c, aspell-0.60.6/ltmain.sh
@@ -10,7 +10,6 @@ License: LGPLv2 and LGPLv2+ and GPLv2+ a
 Group: Applications/Text
 URL: http://aspell.net/
 Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz
-Patch1: aspell-0.50.3-gcc33.patch
 Patch3: aspell-0.60.3-install_info.patch
 Patch5: aspell-0.60.5-fileconflict.patch
 Patch7: aspell-0.60.5-pspell_conf.patch
@@ -45,7 +44,6 @@ static libraries and header files needed
 
 %prep
 %setup -q -n aspell-%{version}
-%patch1 -p1 -b .gcc33
 %patch3 -p1 -b .iinfo
 %patch5 -p1 -b .fc
 %patch7 -p1 -b .mlib
@@ -147,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Tue Dec 15 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-11
+- remove obsolete patch
+
 * Fri Dec  4 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12:0.60.6-10
 - fix rpath problem (chrpath)
 


--- aspell-0.50.3-gcc33.patch DELETED ---



From kwizart at fedoraproject.org  Tue Dec 15 12:55:24 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 15 Dec 2009 12:55:24 +0000 (UTC)
Subject: rpms/perl-BDB/F-12 .cvsignore,1.6,1.7 sources,1.7,1.8
Message-ID: <20091215125524.EC7C111C0092@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7765

Modified Files:
	.cvsignore sources 
Log Message:
Update missing source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	31 Aug 2009 15:15:54 -0000	1.6
+++ .cvsignore	15 Dec 2009 12:55:23 -0000	1.7
@@ -1 +1 @@
-BDB-1.84.tar.gz
+BDB-1.86.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	31 Aug 2009 15:15:54 -0000	1.7
+++ sources	15 Dec 2009 12:55:24 -0000	1.8
@@ -1 +1 @@
-64c976f7850ce4accfb615a301467e8c  BDB-1.84.tar.gz
+e64da0463e5305d5cad4bd63f820df45  BDB-1.86.tar.gz



From atkac at fedoraproject.org  Tue Dec 15 12:59:14 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Dec 2009 12:59:14 +0000 (UTC)
Subject: rpms/dnsperf/devel dnsperf.spec,1.13,1.14
Message-ID: <20091215125914.81ED411C0092@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/dnsperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8545

Modified Files:
	dnsperf.spec 
Log Message:
- rebuild against new bind



Index: dnsperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsperf/devel/dnsperf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dnsperf.spec	1 Dec 2009 14:43:55 -0000	1.13
+++ dnsperf.spec	15 Dec 2009 12:59:14 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Benchmarking authorative and recursing DNS servers
 Name: dnsperf
 Version: 1.0.1.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: MIT
 Url: http://www.nominum.com/services/measurement_tools.php
 Source: ftp://ftp.nominum.com/pub/nominum/dnsperf/%{version}/dnsperf-src-%{version}-1.tar.gz
@@ -20,8 +20,7 @@ For more information, see the dnsperf(1)
 %configure  
 
 %build
-# NOTE: -DBIND9 should be in CPPFLAGS but Makefile.in is badly written
-%{__make} CFLAGS="$RPM_OPT_FLAGS -DBIND9" %{?_smp_mflags}
+%{__make} CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -42,6 +41,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Tue Dec 15 2009 Adam Tkac <atkac redhat com> - 1.0.1.0-15
+- rebuild against new bind
+
 * Tue Dec 01 2009 Adam Tkac <atkac redhat com> - 1.0.1.0-14
 - rebuild against new bind
 



From atkac at fedoraproject.org  Tue Dec 15 12:59:44 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Dec 2009 12:59:44 +0000 (UTC)
Subject: rpms/bind-dyndb-ldap/devel bind-dyndb-ldap.spec,1.6,1.7
Message-ID: <20091215125944.0EEE211C0092@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind-dyndb-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8749

Modified Files:
	bind-dyndb-ldap.spec 
Log Message:
- rebuild against new bind



Index: bind-dyndb-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind-dyndb-ldap/devel/bind-dyndb-ldap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bind-dyndb-ldap.spec	10 Dec 2009 22:47:24 -0000	1.6
+++ bind-dyndb-ldap.spec	15 Dec 2009 12:59:43 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           bind-dyndb-ldap
 Version:        0.1.0
-Release:        0.6.a1.20091210git%{?dist}
+Release:        0.7.a1.20091210git%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 Group:          System Environment/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 15 2009 Adam Tkac <atkac redhat com> - 0.1.0-0.7.a1.20091210git
+- rebuild against new bind
+
 * Thu Dec 10 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.6.a1.20091210git
 - update to the latest git snapshot
 - change upstream URL, project moved to fedorahosted



From atkac at fedoraproject.org  Tue Dec 15 13:00:36 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Dec 2009 13:00:36 +0000 (UTC)
Subject: rpms/bind/devel .cvsignore, 1.60, 1.61 bind-9.5-sdb.patch, 1.6,
	1.7 bind.spec, 1.333, 1.334 sources, 1.69,
	1.70 bind97-headers.patch, 1.1, NONE
Message-ID: <20091215130036.8FD5611C02A3@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9022

Modified Files:
	.cvsignore bind-9.5-sdb.patch bind.spec sources 
Removed Files:
	bind97-headers.patch 
Log Message:
- update to 9.7.0rc1
- bind97-headers.patch merged
- update default configuration



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	1 Dec 2009 14:29:42 -0000	1.60
+++ .cvsignore	15 Dec 2009 13:00:35 -0000	1.61
@@ -1,2 +1,2 @@
-config-4.tar.bz2
-bind-9.7.0b3.tar.gz
+bind-9.7.0rc1.tar.gz
+config-5.tar.bz2

bind-9.5-sdb.patch:
 bin/Makefile.in           |    4 +-
 bin/named-sdb/Makefile.in |   20 +++++---------
 bin/named-sdb/main.c      |   62 ++++++++++++++++++++++++++++++++++++++++++++++
 bin/named/Makefile.in     |   14 +++-------
 configure.in              |    3 ++
 5 files changed, 79 insertions(+), 24 deletions(-)

Index: bind-9.5-sdb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-sdb.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bind-9.5-sdb.patch	3 Nov 2009 11:06:15 -0000	1.6
+++ bind-9.5-sdb.patch	15 Dec 2009 13:00:35 -0000	1.7
@@ -1,6 +1,6 @@
-diff -up bind-9.7.0b1/bin/Makefile.in.sdb bind-9.7.0b1/bin/Makefile.in
---- bind-9.7.0b1/bin/Makefile.in.sdb	2009-10-05 14:07:08.000000000 +0200
-+++ bind-9.7.0b1/bin/Makefile.in	2009-10-20 11:01:21.011555584 +0200
+diff -up bind-9.7.0rc1/bin/Makefile.in.sdb bind-9.7.0rc1/bin/Makefile.in
+--- bind-9.7.0rc1/bin/Makefile.in.sdb	2009-10-05 14:07:08.000000000 +0200
++++ bind-9.7.0rc1/bin/Makefile.in	2009-12-15 12:58:11.913941164 +0100
 @@ -19,8 +19,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
@@ -12,15 +12,15 @@ diff -up bind-9.7.0b1/bin/Makefile.in.sd
  TARGETS =
  
  @BIND9_MAKE_RULES@
-diff -up bind-9.7.0b1/bin/named/Makefile.in.sdb bind-9.7.0b1/bin/named/Makefile.in
---- bind-9.7.0b1/bin/named/Makefile.in.sdb	2009-10-20 11:01:20.971545269 +0200
-+++ bind-9.7.0b1/bin/named/Makefile.in	2009-10-20 11:01:35.191543713 +0200
+diff -up bind-9.7.0rc1/bin/named/Makefile.in.sdb bind-9.7.0rc1/bin/named/Makefile.in
+--- bind-9.7.0rc1/bin/named/Makefile.in.sdb	2009-12-15 12:58:11.863950805 +0100
++++ bind-9.7.0rc1/bin/named/Makefile.in	2009-12-15 12:58:57.163938385 +0100
 @@ -45,7 +45,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
  		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
  		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
  
--CDEFINES =      -DBIND9 @USE_DLZ@ @USE_PKCS11@
-+CDEFINES =      -DBIND9 @USE_PKCS11@
+-CDEFINES =      @USE_DLZ@ @USE_PKCS11@
++CDEFINES =      @USE_PKCS11@
  
  CWARNINGS =
  
@@ -64,9 +64,9 @@ diff -up bind-9.7.0b1/bin/named/Makefile
  	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
 -
 - at DLZ_DRIVER_RULES@
-diff -up bind-9.7.0b1/bin/named-sdb/main.c.sdb bind-9.7.0b1/bin/named-sdb/main.c
---- bind-9.7.0b1/bin/named-sdb/main.c.sdb	2009-10-20 11:01:20.991546005 +0200
-+++ bind-9.7.0b1/bin/named-sdb/main.c	2009-10-20 11:01:21.011555584 +0200
+diff -up bind-9.7.0rc1/bin/named-sdb/main.c.sdb bind-9.7.0rc1/bin/named-sdb/main.c
+--- bind-9.7.0rc1/bin/named-sdb/main.c.sdb	2009-12-15 12:58:11.893960333 +0100
++++ bind-9.7.0rc1/bin/named-sdb/main.c	2009-12-15 12:58:11.913941164 +0100
 @@ -75,6 +75,9 @@
   * Include header files for database drivers here.
   */
@@ -157,9 +157,9 @@ diff -up bind-9.7.0b1/bin/named-sdb/main
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "exiting");
  	ns_log_shutdown();
-diff -up bind-9.7.0b1/bin/named-sdb/Makefile.in.sdb bind-9.7.0b1/bin/named-sdb/Makefile.in
---- bind-9.7.0b1/bin/named-sdb/Makefile.in.sdb	2009-10-20 11:01:20.991546005 +0200
-+++ bind-9.7.0b1/bin/named-sdb/Makefile.in	2009-10-20 11:01:21.011555584 +0200
+diff -up bind-9.7.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.7.0rc1/bin/named-sdb/Makefile.in
+--- bind-9.7.0rc1/bin/named-sdb/Makefile.in.sdb	2009-12-15 12:58:11.873941824 +0100
++++ bind-9.7.0rc1/bin/named-sdb/Makefile.in	2009-12-15 12:58:11.913941164 +0100
 @@ -28,10 +28,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
@@ -209,10 +209,10 @@ diff -up bind-9.7.0b1/bin/named-sdb/Make
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb at EXEEXT@ ${DESTDIR}${sbindir}
  
  @DLZ_DRIVER_RULES@
-diff -up bind-9.7.0b1/configure.in.sdb bind-9.7.0b1/configure.in
---- bind-9.7.0b1/configure.in.sdb	2009-10-16 06:16:17.000000000 +0200
-+++ bind-9.7.0b1/configure.in	2009-10-20 11:01:21.011555584 +0200
-@@ -3206,6 +3206,8 @@ AC_CONFIG_FILES([
+diff -up bind-9.7.0rc1/configure.in.sdb bind-9.7.0rc1/configure.in
+--- bind-9.7.0rc1/configure.in.sdb	2009-11-11 09:46:47.000000000 +0100
++++ bind-9.7.0rc1/configure.in	2009-12-15 12:58:11.913941164 +0100
+@@ -3241,6 +3241,8 @@ AC_CONFIG_FILES([
  	bin/confgen/unix/Makefile
  	bin/named/Makefile
  	bin/named/unix/Makefile
@@ -221,7 +221,7 @@ diff -up bind-9.7.0b1/configure.in.sdb b
  	bin/rndc/Makefile
  	bin/dig/Makefile
  	bin/nsupdate/Makefile
-@@ -3227,6 +3229,7 @@ AC_CONFIG_FILES([
+@@ -3262,6 +3264,7 @@ AC_CONFIG_FILES([
  	bin/tests/headerdep_test.sh
  	bin/tools/Makefile
  	bin/dnssec/Makefile


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -p -r1.333 -r1.334
--- bind.spec	1 Dec 2009 14:29:42 -0000	1.333
+++ bind.spec	15 Dec 2009 13:00:35 -0000	1.334
@@ -3,9 +3,8 @@
 #
 
 #%define PATCHVER P1
-#%define PREVER rc1
 #%define VERSION %{version}-%{PATCHVER}
-%define PREVER b3
+%define PREVER rc1
 %define VERSION %{version}%{PREVER}
 
 %{?!SDB:       %define SDB       1}
@@ -21,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.9.%{PREVER}%{?dist}
+Release:  0.10.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
 Patch107:bind97-dist-pkcs11.patch
-Patch108:bind97-headers.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -230,7 +228,6 @@ mkdir m4
 %patch102 -p1 -b .rh452060
 %patch106 -p0 -b .rh490837
 %patch107 -p1 -b .dist-pkcs11
-%patch108 -p1 -b .headers
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -304,7 +301,6 @@ rm -rf ${RPM_BUILD_ROOT}
 
 # We don't want these
 rm -f doc/rfc/fetch
-rm doc/draft/draft-ietf-enum-e164-gstn-np-05.txt
 
 cp  --preserve=timestamps %{SOURCE5} doc/rfc
 gzip -9 doc/rfc/*
@@ -484,33 +480,6 @@ rm -rf ${RPM_BUILD_ROOT}
 :;
 
 %files
-# Hide configuration
-%defattr(0640,root,named,0750)
-%dir %{_sysconfdir}/named
-%dir %{_localstatedir}/named
-%config(noreplace) %verify(not link) %{_sysconfdir}/named.conf
-%config(noreplace) %verify(not link) %{_sysconfdir}/named.rfc1912.zones
-%config %verify(not link) %{_localstatedir}/named/named.ca
-%config %verify(not link) %{_localstatedir}/named/named.localhost
-%config %verify(not link) %{_localstatedir}/named/named.loopback
-%config %verify(not link) %{_localstatedir}/named/named.empty
-%defattr(0660,named,named,0770)
-%dir %{_localstatedir}/named/slaves
-%dir %{_localstatedir}/named/data
-%dir %{_localstatedir}/named/dynamic
-%ghost %{_localstatedir}/log/named.log
-%defattr(0640,root,named,0750)
-%ghost %config(noreplace) %{_sysconfdir}/rndc.key
-# ^- rndc.key now created on first install only if it does not exist
-# %verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.conf
-# ^- Let the named internal default rndc.conf be used -
-#    rndc.conf not required unless it differs from default.
-%ghost %config(noreplace) %{_sysconfdir}/rndc.conf
-# ^- The default rndc.conf which uses rndc.key is in named's default internal config -
-#    so rndc.conf is not necessary.
-%config(noreplace) %{_sysconfdir}/logrotate.d/named
-%defattr(-,named,named,-)
-%dir %{_localstatedir}/run/named
 %defattr(-,root,root,-)
 %{_libdir}/bind
 %config(noreplace) %{_sysconfdir}/sysconfig/named
@@ -519,7 +488,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/arpaname
 %{_sbindir}/ddns-confgen
 %{_sbindir}/genrandom
-%{_sbindir}/journalprint
+%{_sbindir}/named-journalprint
 %{_sbindir}/nsec3hash
 %{_sbindir}/dnssec*
 %{_sbindir}/named-check*
@@ -540,7 +509,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/rndc-confgen.8*
 %{_mandir}/man8/ddns-confgen.8*
 %{_mandir}/man8/genrandom.8*
-%{_mandir}/man8/journalprint.8*
+%{_mandir}/man8/named-journalprint.8*
 %{_mandir}/man8/nsec3hash.8*
 %doc CHANGES COPYRIGHT README named.conf.default
 %doc doc/arm doc/misc doc/draft doc/rfc
@@ -548,6 +517,34 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc Copyright
 %doc rfc1912.txt
 
+# Hide configuration
+%defattr(0640,root,named,0750)
+%dir %{_sysconfdir}/named
+%dir %{_localstatedir}/named
+%config(noreplace) %verify(not link) %{_sysconfdir}/named.conf
+%config(noreplace) %verify(not link) %{_sysconfdir}/named.rfc1912.zones
+%config %verify(not link) %{_localstatedir}/named/named.ca
+%config %verify(not link) %{_localstatedir}/named/named.localhost
+%config %verify(not link) %{_localstatedir}/named/named.loopback
+%config %verify(not link) %{_localstatedir}/named/named.empty
+%defattr(0660,named,named,0770)
+%dir %{_localstatedir}/named/slaves
+%dir %{_localstatedir}/named/data
+%dir %{_localstatedir}/named/dynamic
+%ghost %{_localstatedir}/log/named.log
+%defattr(0640,root,named,0750)
+%ghost %config(noreplace) %{_sysconfdir}/rndc.key
+# ^- rndc.key now created on first install only if it does not exist
+# %verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.conf
+# ^- Let the named internal default rndc.conf be used -
+#    rndc.conf not required unless it differs from default.
+%ghost %config(noreplace) %{_sysconfdir}/rndc.conf
+# ^- The default rndc.conf which uses rndc.key is in named's default internal config -
+#    so rndc.conf is not necessary.
+%config(noreplace) %{_sysconfdir}/logrotate.d/named
+%defattr(-,named,named,-)
+%dir %{_localstatedir}/run/named
+
 %if %{SDB}
 %files sdb
 %defattr(-,root,root,-)
@@ -592,6 +589,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/isc-config.sh
 
 %files chroot
+%defattr(-,root,root,-)
+%ghost %{chroot_prefix}/dev/null
+%ghost %{chroot_prefix}/dev/random
+%ghost %{chroot_prefix}/dev/zero
+%ghost %{chroot_prefix}/etc/localtime
 %defattr(0640,root,named,0750)
 %dir %{chroot_prefix}
 %dir %{chroot_prefix}/dev
@@ -607,16 +609,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{chroot_prefix}/var/run/named
 %dir %{chroot_prefix}/var/tmp
 %dir %{chroot_prefix}/var/log
-%defattr(-,root,root,-)
-%ghost %{chroot_prefix}/dev/null
-%ghost %{chroot_prefix}/dev/random
-%ghost %{chroot_prefix}/dev/zero
-%ghost %{chroot_prefix}/etc/localtime
 
 %if %{PKCS11}
 %files pkcs11
 %defattr(-,root,root,-)
-%doc README.pkcs11 NSEC3-NOTES
+%doc README.pkcs11
 %{_sbindir}/pkcs11-destroy
 %{_sbindir}/pkcs11-keygen
 %{_sbindir}/pkcs11-list
@@ -624,6 +621,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Dec 15 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.10.rc1
+- update to 9.7.0rc1
+- bind97-headers.patch merged
+- update default configuration
+
 * Tue Dec 01 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.9.b3
 - update to 9.7.0b3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	1 Dec 2009 14:29:42 -0000	1.69
+++ sources	15 Dec 2009 13:00:36 -0000	1.70
@@ -1,2 +1,2 @@
-de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
-9d375b157acf123a81f62bd9e4acb531  bind-9.7.0b3.tar.gz
+4f7e99f8aef6b3d19ef86647c183f502  bind-9.7.0rc1.tar.gz
+4c35a2aac8d8054ea2154906bf57fb52  config-5.tar.bz2


--- bind97-headers.patch DELETED ---



From atkac at fedoraproject.org  Tue Dec 15 13:05:29 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Dec 2009 13:05:29 +0000 (UTC)
Subject: rpms/bind/devel bind.spec,1.334,1.335
Message-ID: <20091215130529.3369F11C0092@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9977

Modified Files:
	bind.spec 
Log Message:
- update default configuration - change spec file appropriately.



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- bind.spec	15 Dec 2009 13:00:35 -0000	1.334
+++ bind.spec	15 Dec 2009 13:05:28 -0000	1.335
@@ -37,7 +37,7 @@ Source8:  dnszone.schema
 Source12: README.sdb_pgsql
 Source21: Copyright.caching-nameserver
 Source25: named.conf.sample
-Source28: config-4.tar.bz2
+Source28: config-5.tar.bz2
 Source30: ldap2zone.c
 
 # Common patches



From caolanm at fedoraproject.org  Tue Dec 15 13:07:01 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Dec 2009 13:07:01 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.fwk132.patch, NONE,
	1.1 openoffice.org.spec, 1.1947, 1.1948
Message-ID: <20091215130701.A28E211C0092@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10420/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk132.patch 
Log Message:
Resolves: rhbz#529648 add workspace.fwk132.patch

workspace.fwk132.patch:
 sal/osl/unx/file_misc.cxx   |   99 ++++++++++++++++++--------------------------
 sfx2/source/doc/docfile.cxx |   27 ++++++++----
 sfx2/source/doc/objstor.cxx |   14 +++++-
 3 files changed, 74 insertions(+), 66 deletions(-)

--- NEW FILE workspace.fwk132.patch ---
diff -r a4be016d908d sal/osl/unx/file_misc.cxx
--- a/sal/osl/unx/file_misc.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sal/osl/unx/file_misc.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -29,6 +29,7 @@
 
 #include "osl/diagnose.h"
 #include "osl/thread.h"
+#include <osl/signal.h>
 #include "rtl/alloc.h"
 
 #include "system.h"
@@ -48,6 +49,8 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
+#include <algorithm>
+
 /************************************************************************
  *   ToDo
  *
@@ -1002,7 +1005,6 @@
     int SourceFileFD=0;
     int DestFileFD=0;
     int nRet=0;
-    void* pSourceFile=0;
 
     SourceFileFD=open(pszSourceFileName,O_RDONLY);
     if ( SourceFileFD < 0 )
@@ -1010,9 +1012,8 @@
         nRet=errno;
         return nRet;
     }
-    
+ 
     DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
-		
     if ( DestFileFD < 0 )
     {
         nRet=errno;
@@ -1020,65 +1021,49 @@
         return nRet;
     }
 
-	/* HACK: because memory mapping fails on various 
-	   platforms if the size of the source file is  0 byte */
-	if (0 == nSourceSize)
-	{						
-		close(SourceFileFD);
-		close(DestFileFD);
-		return 0;
-	}
-	
-    /* FIXME doCopy: fall back code for systems not having mmap */
-    /* mmap file -- open dest file -- write once -- fsync it */
-    pSourceFile=mmap(0,nSourceSize,PROT_READ,MAP_PRIVATE,SourceFileFD,0);
-	
-    if ( pSourceFile == MAP_FAILED )
-    {	
-        /* it's important to set nRet before the hack
-           otherwise errno may be changed by lstat */
-        nRet = errno;
+    if (0 == nSourceSize)
+    {						
         close(SourceFileFD);
         close(DestFileFD);
-        
-        return nRet;
+        return 0;
     }
 
-    nRet = write(DestFileFD,pSourceFile,nSourceSize);
-        
-    /* #112584# if 'write' could not write the requested number of bytes
-             we have to fail of course; because it's not exactly specified if 'write'
-            sets errno if less than requested byte could be written we set nRet
-           explicitly to ENOSPC */
-    if ((nRet < 0) || (nRet != sal::static_int_cast< int >(nSourceSize)))
-    {				
-        if (nRet < 0)
+    size_t nWritten = 0;
+    size_t nRemains = nSourceSize;
+   
+    if ( nRemains )
+    {	
+        char pBuffer[32000];
+        size_t nRead = 0;
+
+        do
+        {
+            nRead = 0;
+            nWritten = 0;
+
+            size_t nToRead = std::min( (size_t)32000, nRemains );
+            nRead = read( SourceFileFD, pBuffer, nToRead );
+            if ( (size_t)-1 != nRead )
+                nWritten = write( DestFileFD, pBuffer, nRead );
+
+            if ( (size_t)-1 != nWritten )
+                nRemains -= nWritten;
+        }
+        while( nRemains && (size_t)-1 != nRead && nRead == nWritten );
+    }
+
+    if ( nRemains )
+    {
+        if ( errno )
             nRet = errno;
-        else 
+        else
             nRet = ENOSPC;
-        
-        close(SourceFileFD);
-        close(DestFileFD);
-        munmap((char*)pSourceFile,nSourceSize);
-        return nRet;
     }
-    
-    nRet = munmap((char*)pSourceFile,nSourceSize);
-    if ( nRet < 0 )
-    {				
-        nRet=errno;
-        close(SourceFileFD);
-        close(DestFileFD);
-        return nRet;
-    }
-    
-    close(SourceFileFD);
-    
-    // Removed call to 'fsync' again (#112584#) and instead 
-    // evaluate the return value of 'close' in order to detect 
-    // and report ENOSPC and other erronous conditions on close    
-    if (close(DestFileFD) == -1)
-        return errno;
-    else
-        return 0;
+
+    close( SourceFileFD );
+    if ( close( DestFileFD ) == -1 && nRet == 0 )
+        nRet = errno;
+
+    return nRet;
 }
+
diff -r a4be016d908d sfx2/source/doc/docfile.cxx
--- a/sfx2/source/doc/docfile.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sfx2/source/doc/docfile.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -3433,13 +3433,14 @@
 
     if ( !( nStorOpenMode & STREAM_TRUNC ) )
     {
+        sal_Bool bTransferSuccess = sal_False;
+
         if ( GetContent().is()
           && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
           && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
         {
             // if there is already such a document, we should copy it
             // if it is a file system use OS copy process
-            sal_Bool bTransferSuccess = sal_False;
             try
             {
                 uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
@@ -3460,16 +3461,14 @@
             catch( uno::Exception& )
             {}
 
-            if ( !bTransferSuccess )
+            if ( bTransferSuccess )
             {
-                SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-                return;
+                CloseOutStream();
+                CloseInStream();
             }
-
-            CloseOutStream();
-            CloseInStream();
         }
-        else if ( pInStream )
+
+        if ( !bTransferSuccess && pInStream )
         {
             // the case when there is no URL-access available or this is a remote protocoll
             // but there is an input stream
@@ -3489,13 +3488,25 @@
                     pOutStream->Write( pBuf, nRead );
                 }
 
+                bTransferSuccess = sal_True;
                 delete[] pBuf;
                 CloseInStream();
             }
             CloseOutStream_Impl();
         }
         else
+        {
+            // Quite strange design, but currently it is expected that in this case no transfer happens
+            // TODO/LATER: get rid of this inconsistent part of the call design
+            bTransferSuccess = sal_True;
             CloseInStream();
+        }
+
+        if ( !bTransferSuccess )
+        {
+            SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+            return;
+        }
     }
 
     CloseStorage();
diff -r a4be016d908d sfx2/source/doc/objstor.cxx
--- a/sfx2/source/doc/objstor.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sfx2/source/doc/objstor.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -1872,7 +1872,19 @@
 		{
 			uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY_THROW );
 			::rtl::OUString aBackupURL = rTargetMedium.GetBackup_Impl();
-			if ( aBackupURL.getLength() )
+			if ( !aBackupURL.getLength() )
+            {
+                // the backup could not be created, try to disconnect the storage and close the source SfxMedium
+                // in this case the optimization is not possible, connect storage to a temporary file
+                rTargetMedium.ResetError();
+                xOptStorage->writeAndAttachToStream( uno::Reference< io::XStream >() );
+				rSrcMedium.CanDisposeStorage_Impl( sal_False );
+                rSrcMedium.Close();
+
+                // now try to create the backup
+                rTargetMedium.GetBackup_Impl();
+            }
+            else
 			{
 				// the following call will only compare stream sizes
 				// TODO/LATER: this is a very risky part, since if the URL contents are different from the storage


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1947
retrieving revision 1.1948
diff -u -p -r1.1947 -r1.1948
--- openoffice.org.spec	9 Dec 2009 12:35:29 -0000	1.1947
+++ openoffice.org.spec	15 Dec 2009 13:07:00 -0000	1.1948
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 10
+%define rh_rpm_release 11
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -164,6 +164,7 @@ Patch88: workspace.impress183.patch
 Patch89: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 Patch90: openoffice.org-3.3.0.ooo102645.fix.es.patch
 Patch91: workspace.vcl105.patch
+Patch92: workspace.fwk132.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1686,6 +1687,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch89 -p1 -b .ooo107151.sc.pop-empty-cell.patch
 %patch90 -p0 -b .ooo102645.fix.es.patch
 %patch91 -p0 -b .workspace.vcl105.patch
+%patch92 -p1 -b .workspace.fwk132.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4189,6 +4191,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
+- Resolves: rhbz#529648 add workspace.fwk132.patch
+
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#545783 add workspace.vcl105.patch (caolanm)
 



From caolanm at fedoraproject.org  Tue Dec 15 13:07:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Dec 2009 13:07:02 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.fwk132.patch, NONE,
	1.1 openoffice.org.spec, 1.2098, 1.2099
Message-ID: <20091215130702.B4D3A11C0092@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10420/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk132.patch 
Log Message:
Resolves: rhbz#529648 add workspace.fwk132.patch

workspace.fwk132.patch:
 sal/osl/unx/file_misc.cxx   |   99 ++++++++++++++++++--------------------------
 sfx2/source/doc/docfile.cxx |   27 ++++++++----
 sfx2/source/doc/objstor.cxx |   14 +++++-
 3 files changed, 74 insertions(+), 66 deletions(-)

--- NEW FILE workspace.fwk132.patch ---
diff -r a4be016d908d sal/osl/unx/file_misc.cxx
--- a/sal/osl/unx/file_misc.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sal/osl/unx/file_misc.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -29,6 +29,7 @@
 
 #include "osl/diagnose.h"
 #include "osl/thread.h"
+#include <osl/signal.h>
 #include "rtl/alloc.h"
 
 #include "system.h"
@@ -48,6 +49,8 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
+#include <algorithm>
+
 /************************************************************************
  *   ToDo
  *
@@ -1002,7 +1005,6 @@
     int SourceFileFD=0;
     int DestFileFD=0;
     int nRet=0;
-    void* pSourceFile=0;
 
     SourceFileFD=open(pszSourceFileName,O_RDONLY);
     if ( SourceFileFD < 0 )
@@ -1010,9 +1012,8 @@
         nRet=errno;
         return nRet;
     }
-    
+ 
     DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
-		
     if ( DestFileFD < 0 )
     {
         nRet=errno;
@@ -1020,65 +1021,49 @@
         return nRet;
     }
 
-	/* HACK: because memory mapping fails on various 
-	   platforms if the size of the source file is  0 byte */
-	if (0 == nSourceSize)
-	{						
-		close(SourceFileFD);
-		close(DestFileFD);
-		return 0;
-	}
-	
-    /* FIXME doCopy: fall back code for systems not having mmap */
-    /* mmap file -- open dest file -- write once -- fsync it */
-    pSourceFile=mmap(0,nSourceSize,PROT_READ,MAP_PRIVATE,SourceFileFD,0);
-	
-    if ( pSourceFile == MAP_FAILED )
-    {	
-        /* it's important to set nRet before the hack
-           otherwise errno may be changed by lstat */
-        nRet = errno;
+    if (0 == nSourceSize)
+    {						
         close(SourceFileFD);
         close(DestFileFD);
-        
-        return nRet;
+        return 0;
     }
 
-    nRet = write(DestFileFD,pSourceFile,nSourceSize);
-        
-    /* #112584# if 'write' could not write the requested number of bytes
-             we have to fail of course; because it's not exactly specified if 'write'
-            sets errno if less than requested byte could be written we set nRet
-           explicitly to ENOSPC */
-    if ((nRet < 0) || (nRet != sal::static_int_cast< int >(nSourceSize)))
-    {				
-        if (nRet < 0)
+    size_t nWritten = 0;
+    size_t nRemains = nSourceSize;
+   
+    if ( nRemains )
+    {	
+        char pBuffer[32000];
+        size_t nRead = 0;
+
+        do
+        {
+            nRead = 0;
+            nWritten = 0;
+
+            size_t nToRead = std::min( (size_t)32000, nRemains );
+            nRead = read( SourceFileFD, pBuffer, nToRead );
+            if ( (size_t)-1 != nRead )
+                nWritten = write( DestFileFD, pBuffer, nRead );
+
+            if ( (size_t)-1 != nWritten )
+                nRemains -= nWritten;
+        }
+        while( nRemains && (size_t)-1 != nRead && nRead == nWritten );
+    }
+
+    if ( nRemains )
+    {
+        if ( errno )
             nRet = errno;
-        else 
+        else
             nRet = ENOSPC;
-        
-        close(SourceFileFD);
-        close(DestFileFD);
-        munmap((char*)pSourceFile,nSourceSize);
-        return nRet;
     }
-    
-    nRet = munmap((char*)pSourceFile,nSourceSize);
-    if ( nRet < 0 )
-    {				
-        nRet=errno;
-        close(SourceFileFD);
-        close(DestFileFD);
-        return nRet;
-    }
-    
-    close(SourceFileFD);
-    
-    // Removed call to 'fsync' again (#112584#) and instead 
-    // evaluate the return value of 'close' in order to detect 
-    // and report ENOSPC and other erronous conditions on close    
-    if (close(DestFileFD) == -1)
-        return errno;
-    else
-        return 0;
+
+    close( SourceFileFD );
+    if ( close( DestFileFD ) == -1 && nRet == 0 )
+        nRet = errno;
+
+    return nRet;
 }
+
diff -r a4be016d908d sfx2/source/doc/docfile.cxx
--- a/sfx2/source/doc/docfile.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sfx2/source/doc/docfile.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -3433,13 +3433,14 @@
 
     if ( !( nStorOpenMode & STREAM_TRUNC ) )
     {
+        sal_Bool bTransferSuccess = sal_False;
+
         if ( GetContent().is()
           && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
           && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
         {
             // if there is already such a document, we should copy it
             // if it is a file system use OS copy process
-            sal_Bool bTransferSuccess = sal_False;
             try
             {
                 uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
@@ -3460,16 +3461,14 @@
             catch( uno::Exception& )
             {}
 
-            if ( !bTransferSuccess )
+            if ( bTransferSuccess )
             {
-                SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-                return;
+                CloseOutStream();
+                CloseInStream();
             }
-
-            CloseOutStream();
-            CloseInStream();
         }
-        else if ( pInStream )
+
+        if ( !bTransferSuccess && pInStream )
         {
             // the case when there is no URL-access available or this is a remote protocoll
             // but there is an input stream
@@ -3489,13 +3488,25 @@
                     pOutStream->Write( pBuf, nRead );
                 }
 
+                bTransferSuccess = sal_True;
                 delete[] pBuf;
                 CloseInStream();
             }
             CloseOutStream_Impl();
         }
         else
+        {
+            // Quite strange design, but currently it is expected that in this case no transfer happens
+            // TODO/LATER: get rid of this inconsistent part of the call design
+            bTransferSuccess = sal_True;
             CloseInStream();
+        }
+
+        if ( !bTransferSuccess )
+        {
+            SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+            return;
+        }
     }
 
     CloseStorage();
diff -r a4be016d908d sfx2/source/doc/objstor.cxx
--- a/sfx2/source/doc/objstor.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sfx2/source/doc/objstor.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -1872,7 +1872,19 @@
 		{
 			uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY_THROW );
 			::rtl::OUString aBackupURL = rTargetMedium.GetBackup_Impl();
-			if ( aBackupURL.getLength() )
+			if ( !aBackupURL.getLength() )
+            {
+                // the backup could not be created, try to disconnect the storage and close the source SfxMedium
+                // in this case the optimization is not possible, connect storage to a temporary file
+                rTargetMedium.ResetError();
+                xOptStorage->writeAndAttachToStream( uno::Reference< io::XStream >() );
+				rSrcMedium.CanDisposeStorage_Impl( sal_False );
+                rSrcMedium.Close();
+
+                // now try to create the backup
+                rTargetMedium.GetBackup_Impl();
+            }
+            else
 			{
 				// the following call will only compare stream sizes
 				// TODO/LATER: this is a very risky part, since if the URL contents are different from the storage


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2098
retrieving revision 1.2099
diff -u -p -r1.2098 -r1.2099
--- openoffice.org.spec	9 Dec 2009 12:40:34 -0000	1.2098
+++ openoffice.org.spec	15 Dec 2009 13:07:02 -0000	1.2099
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 7
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -133,6 +133,7 @@ Patch55: openoffice.org-3.3.0.ooo102645.
 Patch56: workspace.vcl108.patch
 Patch57: workspace.pythonssldedux.patch
 Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch59: workspace.fwk132.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1660,6 +1661,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch56 -p0 -b .workspace.vcl108.patch
 %patch57 -p1 -b .workspace.pythonssldedux.patch
 %patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch59 -p1 -b .workspace.fwk132.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4162,6 +4164,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
+- Resolves: rhbz#529648 add workspace.fwk132.patch
+
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.2
 - Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 - Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch



From caolanm at fedoraproject.org  Tue Dec 15 13:07:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Dec 2009 13:07:02 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.fwk132.patch, NONE,
	1.1 openoffice.org.spec, 1.2043, 1.2044
Message-ID: <20091215130702.5F2CB11C0092@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10420/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk132.patch 
Log Message:
Resolves: rhbz#529648 add workspace.fwk132.patch

workspace.fwk132.patch:
 sal/osl/unx/file_misc.cxx   |   99 ++++++++++++++++++--------------------------
 sfx2/source/doc/docfile.cxx |   27 ++++++++----
 sfx2/source/doc/objstor.cxx |   14 +++++-
 3 files changed, 74 insertions(+), 66 deletions(-)

--- NEW FILE workspace.fwk132.patch ---
diff -r a4be016d908d sal/osl/unx/file_misc.cxx
--- a/sal/osl/unx/file_misc.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sal/osl/unx/file_misc.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -29,6 +29,7 @@
 
 #include "osl/diagnose.h"
 #include "osl/thread.h"
+#include <osl/signal.h>
 #include "rtl/alloc.h"
 
 #include "system.h"
@@ -48,6 +49,8 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
+#include <algorithm>
+
 /************************************************************************
  *   ToDo
  *
@@ -1002,7 +1005,6 @@
     int SourceFileFD=0;
     int DestFileFD=0;
     int nRet=0;
-    void* pSourceFile=0;
 
     SourceFileFD=open(pszSourceFileName,O_RDONLY);
     if ( SourceFileFD < 0 )
@@ -1010,9 +1012,8 @@
         nRet=errno;
         return nRet;
     }
-    
+ 
     DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
-		
     if ( DestFileFD < 0 )
     {
         nRet=errno;
@@ -1020,65 +1021,49 @@
         return nRet;
     }
 
-	/* HACK: because memory mapping fails on various 
-	   platforms if the size of the source file is  0 byte */
-	if (0 == nSourceSize)
-	{						
-		close(SourceFileFD);
-		close(DestFileFD);
-		return 0;
-	}
-	
-    /* FIXME doCopy: fall back code for systems not having mmap */
-    /* mmap file -- open dest file -- write once -- fsync it */
-    pSourceFile=mmap(0,nSourceSize,PROT_READ,MAP_PRIVATE,SourceFileFD,0);
-	
-    if ( pSourceFile == MAP_FAILED )
-    {	
-        /* it's important to set nRet before the hack
-           otherwise errno may be changed by lstat */
-        nRet = errno;
+    if (0 == nSourceSize)
+    {						
         close(SourceFileFD);
         close(DestFileFD);
-        
-        return nRet;
+        return 0;
     }
 
-    nRet = write(DestFileFD,pSourceFile,nSourceSize);
-        
-    /* #112584# if 'write' could not write the requested number of bytes
-             we have to fail of course; because it's not exactly specified if 'write'
-            sets errno if less than requested byte could be written we set nRet
-           explicitly to ENOSPC */
-    if ((nRet < 0) || (nRet != sal::static_int_cast< int >(nSourceSize)))
-    {				
-        if (nRet < 0)
+    size_t nWritten = 0;
+    size_t nRemains = nSourceSize;
+   
+    if ( nRemains )
+    {	
+        char pBuffer[32000];
+        size_t nRead = 0;
+
+        do
+        {
+            nRead = 0;
+            nWritten = 0;
+
+            size_t nToRead = std::min( (size_t)32000, nRemains );
+            nRead = read( SourceFileFD, pBuffer, nToRead );
+            if ( (size_t)-1 != nRead )
+                nWritten = write( DestFileFD, pBuffer, nRead );
+
+            if ( (size_t)-1 != nWritten )
+                nRemains -= nWritten;
+        }
+        while( nRemains && (size_t)-1 != nRead && nRead == nWritten );
+    }
+
+    if ( nRemains )
+    {
+        if ( errno )
             nRet = errno;
-        else 
+        else
             nRet = ENOSPC;
-        
-        close(SourceFileFD);
-        close(DestFileFD);
-        munmap((char*)pSourceFile,nSourceSize);
-        return nRet;
     }
-    
-    nRet = munmap((char*)pSourceFile,nSourceSize);
-    if ( nRet < 0 )
-    {				
-        nRet=errno;
-        close(SourceFileFD);
-        close(DestFileFD);
-        return nRet;
-    }
-    
-    close(SourceFileFD);
-    
-    // Removed call to 'fsync' again (#112584#) and instead 
-    // evaluate the return value of 'close' in order to detect 
-    // and report ENOSPC and other erronous conditions on close    
-    if (close(DestFileFD) == -1)
-        return errno;
-    else
-        return 0;
+
+    close( SourceFileFD );
+    if ( close( DestFileFD ) == -1 && nRet == 0 )
+        nRet = errno;
+
+    return nRet;
 }
+
diff -r a4be016d908d sfx2/source/doc/docfile.cxx
--- a/sfx2/source/doc/docfile.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sfx2/source/doc/docfile.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -3433,13 +3433,14 @@
 
     if ( !( nStorOpenMode & STREAM_TRUNC ) )
     {
+        sal_Bool bTransferSuccess = sal_False;
+
         if ( GetContent().is()
           && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
           && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
         {
             // if there is already such a document, we should copy it
             // if it is a file system use OS copy process
-            sal_Bool bTransferSuccess = sal_False;
             try
             {
                 uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
@@ -3460,16 +3461,14 @@
             catch( uno::Exception& )
             {}
 
-            if ( !bTransferSuccess )
+            if ( bTransferSuccess )
             {
-                SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-                return;
+                CloseOutStream();
+                CloseInStream();
             }
-
-            CloseOutStream();
-            CloseInStream();
         }
-        else if ( pInStream )
+
+        if ( !bTransferSuccess && pInStream )
         {
             // the case when there is no URL-access available or this is a remote protocoll
             // but there is an input stream
@@ -3489,13 +3488,25 @@
                     pOutStream->Write( pBuf, nRead );
                 }
 
+                bTransferSuccess = sal_True;
                 delete[] pBuf;
                 CloseInStream();
             }
             CloseOutStream_Impl();
         }
         else
+        {
+            // Quite strange design, but currently it is expected that in this case no transfer happens
+            // TODO/LATER: get rid of this inconsistent part of the call design
+            bTransferSuccess = sal_True;
             CloseInStream();
+        }
+
+        if ( !bTransferSuccess )
+        {
+            SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+            return;
+        }
     }
 
     CloseStorage();
diff -r a4be016d908d sfx2/source/doc/objstor.cxx
--- a/sfx2/source/doc/objstor.cxx	Wed Dec 09 12:25:54 2009 +0100
+++ b/sfx2/source/doc/objstor.cxx	Tue Dec 15 12:55:26 2009 +0000
@@ -1872,7 +1872,19 @@
 		{
 			uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY_THROW );
 			::rtl::OUString aBackupURL = rTargetMedium.GetBackup_Impl();
-			if ( aBackupURL.getLength() )
+			if ( !aBackupURL.getLength() )
+            {
+                // the backup could not be created, try to disconnect the storage and close the source SfxMedium
+                // in this case the optimization is not possible, connect storage to a temporary file
+                rTargetMedium.ResetError();
+                xOptStorage->writeAndAttachToStream( uno::Reference< io::XStream >() );
+				rSrcMedium.CanDisposeStorage_Impl( sal_False );
+                rSrcMedium.Close();
+
+                // now try to create the backup
+                rTargetMedium.GetBackup_Impl();
+            }
+            else
 			{
 				// the following call will only compare stream sizes
 				// TODO/LATER: this is a very risky part, since if the URL contents are different from the storage


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2043
retrieving revision 1.2044
diff -u -p -r1.2043 -r1.2044
--- openoffice.org.spec	9 Dec 2009 11:44:39 -0000	1.2043
+++ openoffice.org.spec	15 Dec 2009 13:07:01 -0000	1.2044
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 21
+%define rh_rpm_release 22
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -179,6 +179,7 @@ Patch102: openoffice.org-3.2.0.ooo107260
 Patch103: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 Patch104: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 Patch105: workspace.vcl105.patch
+Patch106: workspace.fwk132.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1744,6 +1745,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch103 -p1 -b .ooo106502.svx.fixspelltimer.patch
 %patch104 -p0 -b .ooo107552.vcl.sft.patch
 %patch105 -p0 -b .workspace.vcl105.patch
+%patch106 -p1 -b .workspace.fwk132.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4277,6 +4279,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.22
+- Resolves: rhbz#529648 add workspace.fwk132.patch
+
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.21
 - Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 - Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch



From twaugh at fedoraproject.org  Tue Dec 15 13:12:24 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 15 Dec 2009 13:12:24 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec,1.232,1.233
Message-ID: <20091215131224.ED7D911C00E7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11570

Modified Files:
	foomatic.spec 
Log Message:
* Tue Dec 15 2009 Tim Waugh <twaugh at redhat.com> - 4.0.3-8
- Really fixed installation path for perl module (bug #547696).



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- foomatic.spec	4 Dec 2009 09:38:24 -0000	1.232
+++ foomatic.spec	15 Dec 2009 13:12:24 -0000	1.233
@@ -4,7 +4,7 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    7%{?dist}
+Release:    8%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -152,7 +152,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
 %{_bindir}/*
 %{_sbindir}/*
-%{_prefix}/lib*/perl5/vendor_perl/*/Foomatic
+%{_datadir}/perl5/Foomatic
 /usr/lib/cups/backend/*
 /usr/lib/cups/driver/*
 /usr/lib/cups/filter/*
@@ -160,6 +160,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Dec 15 2009 Tim Waugh <twaugh at redhat.com> - 4.0.3-8
+- Really fixed installation path for perl module (bug #547696).
+
 * Fri Dec  4 2009 Tim Waugh <twaugh at redhat.com> - 4.0.3-7
 - Fixed installation path for perl module.
 



From gd at fedoraproject.org  Tue Dec 15 13:17:35 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Tue, 15 Dec 2009 13:17:35 +0000 (UTC)
Subject: File samba-3.5.0pre2.tar.gz uploaded to lookaside cache by gd
Message-ID: <20091215131735.0AE8528EC3E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for samba:

c01f346909810658e92573f6d39e101a  samba-3.5.0pre2.tar.gz



From jmoskovc at fedoraproject.org  Tue Dec 15 13:23:28 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue, 15 Dec 2009 13:23:28 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.13, 1.14 abrt.spec, 1.19, 1.20 sources,
	1.14, 1.15
Message-ID: <20091215132329.093CF11C00E7@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13435

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Nov 2009 20:32:15 -0000	1.13
+++ .cvsignore	15 Dec 2009 13:23:27 -0000	1.14
@@ -1 +1 @@
-abrt-1.0.0.tar.gz
+abrt-1.0.2.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- abrt.spec	22 Nov 2009 20:32:15 -0000	1.19
+++ abrt.spec	15 Dec 2009 13:23:27 -0000	1.20
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 1.0.0
+Version: 1.0.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -26,9 +26,11 @@ BuildRequires: nss-devel
 BuildRequires: polkit-devel
 BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel
 BuildRequires: intltool
+BuildRequires: bison
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{name}-libs = %{version}-%{release}
-Requires(pre): /usr/sbin/groupadd 
+Requires(pre): shadow-utils
+Obsoletes: abrt-plugin-sqlite3
 
 %description
 %{name} is a tool to help users to detect defects in applications and
@@ -56,15 +58,12 @@ Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-python, pygtk2, pygtk2-libglade,
 Requires: gnome-python2-gnomevfs, gnome-python2-gnomekeyring
-# only if gtk2 version < 2.17
+# only if gtk2 version < 2.17:
 #Requires: python-sexy
+# we used to have abrt-applet, now abrt-gui includes it:
 Provides: abrt-applet = %{version}-%{release}
 Obsoletes: abrt-applet < 0.0.5
 Conflicts: abrt-applet < 0.0.5
-Obsoletes: bug-buddy
-Provides: bug-buddy
-#FIXME: upgrade workaround
-Requires: abrt-desktop
 
 %description gui
 GTK+ wizard for convenient bug reporting.
@@ -95,32 +94,16 @@ analyzer plugin.
 %package addon-kerneloops
 Summary: %{name}'s kerneloops addon
 Group: System Environment/Libraries
-Requires: %{name}-plugin-kerneloopsreporter = %{version}-%{release}
+Requires: curl
 Requires: %{name} = %{version}-%{release}
 Obsoletes: kerneloops
 Obsoletes: abrt-plugin-kerneloops
+Obsoletes: abrt-plugin-kerneloopsreporter
 
 %description addon-kerneloops
-This package contains plugins for kernel crashes information collecting.
-
-%package plugin-kerneloopsreporter
-Summary: %{name}'s kerneloops reporter plugin
-Group: System Environment/Libraries
-Requires: curl
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-kerneloopsreporter
-This package contains reporter plugin, that sends, collected by %{name}'s kerneloops
-addon, information about kernel crashes to specified server, e.g. kerneloops.org.
-
-%package plugin-sqlite3
-Summary: %{name}'s SQLite3 database plugin
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-sqlite3
-This package contains SQLite3 database plugin. It is used for storing the data
-required for creating a bug report.
+This package contains plugin for collecting kernel crash information
+and reporter plugin which sends this information to specified server,
+usually to kerneloops.org.
 
 %package plugin-logger
 Summary: %{name}'s logger reporter plugin
@@ -128,7 +111,7 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description plugin-logger
-The simple reporter plugin, which writes a report to a specified file.
+The simple reporter plugin which writes a report to a specified file.
 
 %package plugin-mailx
 Summary: %{name}'s mailx reporter plugin
@@ -137,8 +120,8 @@ Requires: %{name} = %{version}-%{release
 Requires: mailx
 
 %description plugin-mailx
-The simple reporter plugin, which sends a report via mailx to a specified
-email.
+The simple reporter plugin which sends a report via mailx to a specified
+email address.
 
 %package plugin-runapp
 Summary: %{name}'s runapp plugin
@@ -210,13 +193,19 @@ the sockets.
 %package desktop
 Summary: Virtual package to install all necessary packages for usage from desktop environment
 Group: User Interface/Desktops
+# This package gets installed when anything requests bug-buddy -
+# happens when users upgrade Fn to Fn+1;
+# or if user just wants "typical desktop installation".
+# Installing abrt-desktop should result in the abrt which works without
+# any tweaking in abrt.conf (IOW: all plugins mentioned there must be installed)
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla, %{name}-plugin-logger
-#workaround for broken upgrade, remove!
-#Requires: %{name}-gui
 Requires: %{name}-addon-kerneloops
 Requires: %{name}-addon-ccpp, %{name}-addon-python
+Requires: %{name}-gui
+Requires: %{name}-plugin-bugzilla, %{name}-plugin-logger, %{name}-plugin-runapp
 #Requires: %{name}-plugin-firefox
+Obsoletes: bug-buddy
+Provides: bug-buddy
 
 %description desktop
 Virtual package to make easy default instalation on desktop environments.
@@ -259,7 +248,8 @@ desktop-file-install \
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -f --system abrt
+getent group abrt >/dev/null || groupadd -f --system abrt
+exit 0
 
 %post
 /sbin/chkconfig --add %{name}d
@@ -284,21 +274,24 @@ fi
 %doc README COPYING
 %{_sbindir}/%{name}d
 %{_bindir}/%{name}-debuginfo-install
+%{_bindir}/%{name}-backtrace
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf
 %{_initrddir}/%{name}d
-%dir %attr(0775, root, abrt) /var/cache/%{name}
-%dir /var/cache/%{name}-di
+%dir %attr(0775, root, abrt) %{_localstatedir}/cache/%{name}
 %dir /var/run/%{name}
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
 %dir %{_libdir}/%{name}
 %{_mandir}/man8/abrtd.8.gz
 %{_mandir}/man5/%{name}.conf.5.gz
-%{_mandir}/man5/pyhook.conf.5.gz
+#%{_mandir}/man5/pyhook.conf.5.gz
 %{_mandir}/man7/%{name}-plugins.7.gz
 %{_datadir}/polkit-1/actions/org.fedoraproject.abrt.policy
 %{_datadir}/dbus-1/system-services/com.redhat.abrt.service
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/SQLite3.conf
+%{_libdir}/%{name}/libSQLite3.so*
+%{_mandir}/man7/%{name}-SQLite3.7.gz
 
 %files libs
 %defattr(-,root,root,-)
@@ -321,8 +314,9 @@ fi
 %files addon-ccpp
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf
+%dir %{_localstatedir}/cache/%{name}-di
 %{_libdir}/%{name}/libCCpp.so*
-%{_libexecdir}/hookCCpp
+%{_libexecdir}/abrt-hook-ccpp
 
 #%files plugin-firefox
 #%{_libdir}/%{name}/libFirefox.so*
@@ -330,25 +324,14 @@ fi
 %files addon-kerneloops
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsScanner.conf
 %{_bindir}/dumpoops
 %{_libdir}/%{name}/libKerneloops.so*
 %{_libdir}/%{name}/libKerneloopsScanner.so*
 %{_mandir}/man7/%{name}-KerneloopsScanner.7.gz
-
-%files plugin-kerneloopsreporter
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsReporter.conf
 %{_libdir}/%{name}/libKerneloopsReporter.so*
 %{_libdir}/%{name}/KerneloopsReporter.GTKBuilder
 %{_mandir}/man7/%{name}-KerneloopsReporter.7.gz
 
-%files plugin-sqlite3
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/SQLite3.conf
-%{_libdir}/%{name}/libSQLite3.so*
-%{_mandir}/man7/%{name}-SQLite3.7.gz
-
 %files plugin-logger
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf
@@ -401,9 +384,7 @@ fi
 
 %files addon-python
 %defattr(-,root,root,-)
-%attr(2755, root, abrt) %{_bindir}/%{name}-pyhook-helper
-%config(noreplace) %{_sysconfdir}/%{name}/pyhook.conf
-#%{python_sitearch}/ABRTUtils.so
+%attr(2755, root, abrt) %{_libexecdir}/abrt-hook-python
 %{_libdir}/%{name}/libPython.so*
 %{python_site}/*.py*
 
@@ -417,6 +398,46 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Dec 14 2009  Jiri Moskovcak <jmoskovc at redhat.com> 1.0.2-1
+- disabled GPG check again (jmoskovc at redhat.com)
+- abrt-pyhook-helper rename (vda.linux at googlemail.com)
+- abrt-cli: report success/failure of reporting. closes bug 71 (vda.linux at googlemail.com)
+- less logging (vda.linux at googlemail.com)
+- mkde abrt-gui --help and --version behave as expected. closes bug 85 (vda.linux at googlemail.com)
+- dbus lib: fix parsing of 0-element arrays. Fixes bug 95 (vda.linux at googlemail.com)
+- make "abrt-cli --delete randomuuid" report that deletion failed. closes bug 59 (vda.linux at googlemail.com)
+- applet: make animation stop after 1 minute. (closes bug 108) (vda.linux at googlemail.com)
+- show comment and how to reproduce fields, when BT rating > 3 (jmoskovc at redhat.com)
+- Gui: make report status window's text wrap. Fixes bug 82 (vda.linux at googlemail.com)
+- CCpp analyzer: added "info sharedlib" (https://fedorahosted.org/abrt/ticket/90) (vda.linux at googlemail.com)
+- added link to bugzilla new account page to Bugzilla config dialog (jmoskovc at redhat.com)
+- GUI: added log window (jmoskovc at redhat.com)
+
+* Tue Dec  8 2009  Jiri Moskovcak <jmoskovc at redhat.com> 1.0.1-1
+- PyHook: better logic for checking if abrtd is running rhbz#539987 (jmoskovc at redhat.com)
+- re-enabled gpg sign checking (jmoskovc at redhat.com)
+- PyHook: use repr() for displaying variables rhbz#545070 (jmoskovc at redhat.com)
+- kerneloops: fix the linux kernel version identification (aarapov at redhat.com)
+- gui review (rrakus at redhat.com)
+- when we trim the dir, we must delete it from DB too rhbz#541854 (vda.linux at googlemail.com)
+- improved dupe checking (kklic at redhat.com)
+- GUI: handle cases when gui fails to start daemon on demand rhbz#543725 (jmoskovc at redhat.com)
+- Add abrt group only if it is missing; fixes rhbz#543250 (kklic at redhat.com)
+- GUI: more string fixes rhbz#543266 (jmoskovc at redhat.com)
+- abrt.spec: straighten out relations between abrt-desktop and abrt-gui (vda.linux at googlemail.com)
+- refuse to start if some required plugins are missing rhbz#518422 (vda.linux at googlemail.com)
+- GUI: survive gnome-keyring access denial rhbz#543200 (jmoskovc at redhat.com)
+- typo fixes rhbz#543266 (jmoskovc at redhat.com)
+- abrt-debuginfo-install: better fix for incorrect passing double quotes (vda.linux at googlemail.com)
+- APPLET: stop animation when it's not needed rhbz#542157 (jmoskovc at redhat.com)
+- ccpp hook: reanme it, and add "crash storm protection" (see rhbz#542003) (vda.linux at googlemail.com)
+- Hooks/CCpp.cpp: add MakeCompatCore = yes/no directive. Fixes rhbz#541707 (vda.linux at googlemail.com)
+- SPEC: removed sqlite3 package, fixed some update problems (jmoskovc at redhat.com)
+- Kerneloops are reported automaticky now when AutoReportUIDs = root is in Kerneloops.conf (npajkovs at redhat.com)
+- remove word 'detected' from description rhbz#541459 (vda.linux at googlemail.com)
+- src/Hooks/CCpp.cpp: do save abrtd's own coredumps, but carefully... (vda.linux at googlemail.com)
+- CCpp.cpp: quote parameters if needed rhbz#540164 (vda.linux at googlemail.com)
+
 * Fri Nov 20 2009  Jiri Moskovcak <jmoskovc at redhat.com> 1.0.0-1
 - new version
 - comment input wraps words rhbz#531276


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Nov 2009 20:32:15 -0000	1.14
+++ sources	15 Dec 2009 13:23:27 -0000	1.15
@@ -1 +1 @@
-62a8a6a1d7712472133b97b38469683e  abrt-1.0.0.tar.gz
+755f119d24511b613b02270b51d09312  abrt-1.0.2.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 15 13:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:26:44 +0000
Subject: [pkgdb] beagle: krh has given up watchcommits
Message-ID: <20091215132646.47E7128ED05@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on beagle (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beagle



From pkgdb at fedoraproject.org  Tue Dec 15 13:26:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:26:45 +0000
Subject: [pkgdb] beagle: krh has given up watchcommits
Message-ID: <20091215132646.D0EEF28ED07@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on beagle (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beagle



From pkgdb at fedoraproject.org  Tue Dec 15 13:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:26:46 +0000
Subject: [pkgdb] beagle: krh has given up watchcommits
Message-ID: <20091215132647.30F5028ECF5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on beagle (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beagle



From pkgdb at fedoraproject.org  Tue Dec 15 13:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:26:50 +0000
Subject: [pkgdb] beagle: krh has given up watchcommits
Message-ID: <20091215132650.EABB728ECEF@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on beagle (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beagle



From pkgdb at fedoraproject.org  Tue Dec 15 13:26:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:26:51 +0000
Subject: [pkgdb] beagle: krh has given up watchcommits
Message-ID: <20091215132652.9485D28ED04@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on beagle (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beagle



From pkgdb at fedoraproject.org  Tue Dec 15 13:26:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:26:57 +0000
Subject: [pkgdb] beagle: krh has given up watchcommits
Message-ID: <20091215132658.5DB6328ECF5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on beagle (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beagle



From ovasik at fedoraproject.org  Tue Dec 15 13:26:57 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 15 Dec 2009 13:26:57 +0000 (UTC)
Subject: rpms/uucp/devel uucp.spec,1.39,1.40
Message-ID: <20091215132657.D4B2D11C00E7@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/uucp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14220

Modified Files:
	uucp.spec 
Log Message:
Merge Review(#226521) - add _smp_mflags to make, remove implicit target, fix rpmlint warnings, commented patches, fix build root, use buildrequires/requires instead of prereq


Index: uucp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- uucp.spec	27 Jul 2009 06:41:15 -0000	1.39
+++ uucp.spec	15 Dec 2009 13:26:57 -0000	1.40
@@ -7,23 +7,31 @@
 Summary: A set of utilities for operations between systems
 Name: uucp
 Version: 1.07
-Release: 20%{?dist}
+Release: 21%{?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
 Source1: uucp.log
 Source2: uucp.xinetd
+#Make the policy header better readable
 Patch0: uucp-1.07-config.patch
 Patch3: uucp-1.07-sigfpe.patch
+#Use baudboy.h to create per-device lock(s) in /var/lock.
 Patch6: uucp-1.07-baudboy.patch
+#Fix to deny to use address in pipe ports.(thanks joery at dorchain.net)(#60771)
 Patch8: uucp-1.06.1-pipe.patch
+#fix truncation of values on 32b platforms where statvfs64
+#is being called on a large file system (#153259)
 Patch9: uucp-1.07-lfs.patch
+#fix crashes with SIGFPE (#150978) (from Wolfgang Ocker)
 Patch10: uucp-1.07-sigfpe2.patch
-Prereq: fileutils /sbin/install-info
-BuildPrereq: lockdev-devel >= 1.0.0-14
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(post): coreutils
+BuildRequires: lockdev-devel >= 1.0.0-14
 Requires: lockdev >= 1.0.0-14
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tetex, texi2html
 
 %description
@@ -43,7 +51,7 @@ local machines.
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
 %configure --with-newconfigdir=%{_newconfigdir} --with-oldconfigdir=%{_oldconfigdir}
-make all
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -59,18 +67,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_varspooldir
 mkdir -p ${RPM_BUILD_ROOT}%{_varspooldir}/uucppublic
 mkdir -p ${RPM_BUILD_ROOT}%{_oldconfigdir}
 
-mkdir -p ${RPM_BUILD_ROOT}/usr/lib/uucp
-ln -sf ../../sbin/uucico ${RPM_BUILD_ROOT}/usr/lib/uucp/uucico
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/uucp
+ln -sf ../../sbin/uucico ${RPM_BUILD_ROOT}%{_libdir}/uucp/uucico
 
 mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
-install -m 644 $RPM_SOURCE_DIR/uucp.log ${RPM_BUILD_ROOT}/etc/logrotate.d/uucp
+install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}/etc/logrotate.d/uucp
 
 mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
 install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.d/uucp
 
 # Create ghost files
 for n in Log Stats Debug; do
-    touch ${RPM_BUILD_ROOT}%{_varlogdir}/$n
+	touch ${RPM_BUILD_ROOT}%{_varlogdir}/$n
 done
 
 # the following is kind of gross, but it is effective
@@ -111,7 +119,7 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS TODO
 %doc sample contrib uucp.html
 
@@ -130,8 +138,8 @@ fi
 %attr(0755,uucp,uucp)		%{_sbindir}/uuconv
 %attr(0755,root,root)		%{_sbindir}/uusched
 
-%attr(755,uucp,uucp)	%dir	/usr/lib/uucp
-/usr/lib/uucp/uucico
+%attr(755,uucp,uucp)	%dir	%{_libdir}/uucp
+%{_libdir}/uucp/uucico
 
 %{_mandir}/man[18]/*
 %{_infodir}/uucp.info*
@@ -157,6 +165,11 @@ fi
 %config(noreplace)	%{_newconfigdir}/sys
 
 %changelog
+* Tue Dec 15 2009 Ondrej Vasik <ovasik at redhat.com> - 1.07-21
+- Merge Review(#226521) - add _smp_mflags to make, remove implicit
+  target, fix rpmlint warnings, commented patches, fix build root,
+  use buildrequires/requires instead of prereq
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -267,7 +280,7 @@ fi
 
 * Tue Sep  4 2001 Jeff Johnson <jbj at redhat.com>
 - build against lockdev-1.0.0-14, with
--   swap egid and gid for lockdev's access(2) device check (#52029).
+-	swap egid and gid for lockdev's access(2) device check (#52029).
 - add (noreplace) to all config files.
 
 * Tue Aug 28 2001 Jeff Johnson <jbj at redhta.com>
@@ -299,7 +312,7 @@ fi
 - change perms to be root:root for the config files and
   0640,root:uucp for config files containing passwords
 - add patch from #6151 (division by zero, SIGFPE)
-- make %post work also for simple sh-versions
+- make %%post work also for simple sh-versions
 
 * Mon Feb  7 2000 Jeff Johnson <jbj at redhat.com>
 - compress man pages.
@@ -307,7 +320,7 @@ fi
 * Mon Aug 23 1999 Jeff Johnson <jbj at redhat.com>
 - add notifempty/missingok to logrotate config file (#4138).
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 19)
 
 * Tue Dec 22 1998 Bill Nottingham <notting at redhat.com>



From pkgdb at fedoraproject.org  Tue Dec 15 13:27:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:27:02 +0000
Subject: [pkgdb] beagle: krh has given up watchcommits
Message-ID: <20091215132704.4974D28ECF5@bastion3.fedora.phx2.redhat.com>

krh has given up the watchcommits acl on beagle (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beagle



From caolanm at fedoraproject.org  Tue Dec 15 13:27:58 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Dec 2009 13:27:58 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch, NONE,
	1.1 openoffice.org.spec, 1.2044, 1.2045
Message-ID: <20091215132758.E94EB11C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14525/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch 
Log Message:
Resolves: rhbz#547176 add openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch

openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch:
 drviews1.cxx |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch ---
diff -ru sd.orig/source/ui/view/drviews1.cxx sd/source/ui/view/drviews1.cxx
--- sd.orig/source/ui/view/drviews1.cxx	2009-12-15 12:17:56.000000000 +0000
+++ sd/source/ui/view/drviews1.cxx	2009-12-15 12:19:47.000000000 +0000
@@ -157,12 +157,32 @@
     ViewShell::Deactivate(bIsMDIActivate);
 }
 
+namespace
+{
+    class LockUI
+    {
+    private:
+        void Lock(bool bLock);
+        SfxViewFrame *mpFrame;
+    public:
+        LockUI(SfxViewFrame *pFrame) : mpFrame(pFrame) { Lock(true); }
+        ~LockUI() { Lock(false); }
+
+    };
+
+    void LockUI::Lock(bool bLock)
+    {
+        if (!mpFrame)
+            return;
+        mpFrame->Enable( !bLock );
+    }
+}
+
 /*************************************************************************
 |*
 |* Wird gerufen, wenn sich der Selektionszustand der View aendert
 |*
 \************************************************************************/
-
 void DrawViewShell::SelectionHasChanged (void)
 {
 	Invalidate();
@@ -216,6 +236,8 @@
 			// we need to deselect it now
 			if (!pOleObj)
 			{
+                //#i47279# disable frame until after object has completed unload
+                LockUI aUILock(GetViewFrame());
                 pIPClient->DeactivateObject();
 				//HMHmpDrView->ShowMarkHdl();
 			}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2044
retrieving revision 1.2045
diff -u -p -r1.2044 -r1.2045
--- openoffice.org.spec	15 Dec 2009 13:07:01 -0000	1.2044
+++ openoffice.org.spec	15 Dec 2009 13:27:58 -0000	1.2045
@@ -180,6 +180,7 @@ Patch103: openoffice.org-3.2.0.ooo106502
 Patch104: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 Patch105: workspace.vcl105.patch
 Patch106: workspace.fwk132.patch
+Patch107: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1746,6 +1747,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch104 -p0 -b .ooo107552.vcl.sft.patch
 %patch105 -p0 -b .workspace.vcl105.patch
 %patch106 -p1 -b .workspace.fwk132.patch
+%patch107 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4281,6 +4283,8 @@ fi
 %changelog
 * Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.22
 - Resolves: rhbz#529648 add workspace.fwk132.patch
+- Resolves: rhbz#547176 add 
+  openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.21
 - Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch



From caolanm at fedoraproject.org  Tue Dec 15 13:27:59 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Dec 2009 13:27:59 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch, NONE,
	1.1 openoffice.org.spec, 1.2099, 1.2100
Message-ID: <20091215132759.8EA3511C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14525/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch 
Log Message:
Resolves: rhbz#547176 add openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch

openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch:
 drviews1.cxx |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch ---
diff -ru sd.orig/source/ui/view/drviews1.cxx sd/source/ui/view/drviews1.cxx
--- sd.orig/source/ui/view/drviews1.cxx	2009-12-15 12:17:56.000000000 +0000
+++ sd/source/ui/view/drviews1.cxx	2009-12-15 12:19:47.000000000 +0000
@@ -157,12 +157,32 @@
     ViewShell::Deactivate(bIsMDIActivate);
 }
 
+namespace
+{
+    class LockUI
+    {
+    private:
+        void Lock(bool bLock);
+        SfxViewFrame *mpFrame;
+    public:
+        LockUI(SfxViewFrame *pFrame) : mpFrame(pFrame) { Lock(true); }
+        ~LockUI() { Lock(false); }
+
+    };
+
+    void LockUI::Lock(bool bLock)
+    {
+        if (!mpFrame)
+            return;
+        mpFrame->Enable( !bLock );
+    }
+}
+
 /*************************************************************************
 |*
 |* Wird gerufen, wenn sich der Selektionszustand der View aendert
 |*
 \************************************************************************/
-
 void DrawViewShell::SelectionHasChanged (void)
 {
 	Invalidate();
@@ -216,6 +236,8 @@
 			// we need to deselect it now
 			if (!pOleObj)
 			{
+                //#i47279# disable frame until after object has completed unload
+                LockUI aUILock(GetViewFrame());
                 pIPClient->DeactivateObject();
 				//HMHmpDrView->ShowMarkHdl();
 			}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2099
retrieving revision 1.2100
diff -u -p -r1.2099 -r1.2100
--- openoffice.org.spec	15 Dec 2009 13:07:02 -0000	1.2099
+++ openoffice.org.spec	15 Dec 2009 13:27:59 -0000	1.2100
@@ -134,6 +134,7 @@ Patch56: workspace.vcl108.patch
 Patch57: workspace.pythonssldedux.patch
 Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 Patch59: workspace.fwk132.patch
+Patch60: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1662,6 +1663,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch57 -p1 -b .workspace.pythonssldedux.patch
 %patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
 %patch59 -p1 -b .workspace.fwk132.patch
+%patch60 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4166,6 +4168,8 @@ fi
 %changelog
 * Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch
+- Resolves: rhbz#547176 add
+  openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 * Wed Dec 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.2
 - Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch



From hguemar at fedoraproject.org  Tue Dec 15 13:35:10 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 15 Dec 2009 13:35:10 +0000 (UTC)
Subject: File kiwi-1.9.26.tar.gz uploaded to lookaside cache by hguemar
Message-ID: <20091215133510.C151728ECEF@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-kiwi:

036cb5d9007d816bdc7b9fff9fc3215c  kiwi-1.9.26.tar.gz



From corsepiu at fedoraproject.org  Tue Dec 15 13:36:06 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 15 Dec 2009 13:36:06 +0000 (UTC)
Subject: File Params-Validate-0.94.tar.gz uploaded to lookaside cache by
	corsepiu
Message-ID: <20091215133606.0BC0B28ECFE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-Params-Validate:

86da1b8ad762063913f454f81b42a816  Params-Validate-0.94.tar.gz



From kzak at fedoraproject.org  Tue Dec 15 13:39:11 2009
From: kzak at fedoraproject.org (kzak)
Date: Tue, 15 Dec 2009 13:39:11 +0000 (UTC)
Subject: rpms/util-linux-ng/F-12 util-linux-ng-2.16-blkid-ataraid.patch, NONE,
	1.1 util-linux-ng.spec, 1.68, 1.69
Message-ID: <20091215133912.0573811C00E7@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16513

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-blkid-ataraid.patch 
Log Message:
* Tue Dec 15 2009 Karel Zak <kzak at redhat.com> 2.16.2-5
- fix #547245 -  blkid does not recognize Adaptec HostRAID members


util-linux-ng-2.16-blkid-ataraid.patch:
 adaptec_raid.c   |    7 ++++---
 highpoint_raid.c |   15 +++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE util-linux-ng-2.16-blkid-ataraid.patch ---
diff -up util-linux-ng-2.16.2/shlibs/blkid/src/probers/adaptec_raid.c.kzak util-linux-ng-2.16.2/shlibs/blkid/src/probers/adaptec_raid.c
--- util-linux-ng-2.16.2/shlibs/blkid/src/probers/adaptec_raid.c.kzak	2009-11-30 12:43:13.000000000 +0100
+++ util-linux-ng-2.16.2/shlibs/blkid/src/probers/adaptec_raid.c	2009-12-15 14:18:10.000000000 +0100
@@ -16,6 +16,7 @@
 #include "blkidP.h"
 
 struct adaptec_metadata {
+
 	uint32_t	b0idcode;
 	uint8_t		lunsave[8];
 	uint16_t	sdtype;
@@ -63,13 +64,13 @@ struct adaptec_metadata {
 	uint32_t	fwTestMagic;
 	uint32_t	fwTestSeqNum;
 	uint8_t		fwTestRes[8];
-	uint8_t		smagic[4];
+	uint32_t	smagic;
 	uint32_t	raidtbl;
 	uint16_t	raidline;
 	uint8_t		res9[0xF6];
 } __attribute__((packed));
 
-#define AD_SIGNATURE	"DPTM"
+#define AD_SIGNATURE	0x4450544D	/* "DPTM" */
 #define AD_MAGIC	0x37FC4D1E
 
 static int probe_adraid(blkid_probe pr, const struct blkid_idmag *mag)
@@ -87,7 +88,7 @@ static int probe_adraid(blkid_probe pr, 
 					sizeof(struct adaptec_metadata));
 	if (!ad)
 		return -1;
-	if (memcmp(ad->smagic, AD_SIGNATURE, sizeof(AD_SIGNATURE)) != 0)
+	if (ad->smagic != be32_to_cpu(AD_SIGNATURE))
 		return -1;
 	if (ad->b0idcode != be32_to_cpu(AD_MAGIC))
 		return -1;
diff -up util-linux-ng-2.16.2/shlibs/blkid/src/probers/highpoint_raid.c.kzak util-linux-ng-2.16.2/shlibs/blkid/src/probers/highpoint_raid.c
--- util-linux-ng-2.16.2/shlibs/blkid/src/probers/highpoint_raid.c.kzak	2009-11-30 12:37:08.000000000 +0100
+++ util-linux-ng-2.16.2/shlibs/blkid/src/probers/highpoint_raid.c	2009-12-15 14:18:10.000000000 +0100
@@ -45,18 +45,25 @@ static int probe_highpoint45x(blkid_prob
 }
 
 const struct blkid_idinfo highpoint45x_idinfo = {
-	.name		= "highpoint_raid_member",
+	.name		= "hpt45x_raid_member",
 	.usage		= BLKID_USAGE_RAID,
 	.probefunc	= probe_highpoint45x,
 	.magics		= BLKID_NONE_MAGIC
 };
 
 const struct blkid_idinfo highpoint37x_idinfo = {
-	.name		= "highpoint_raid_member",
+	.name		= "hpt37x_raid_member",
 	.usage		= BLKID_USAGE_RAID,
 	.magics		= {
-		{ .magic = "\xf0\x16\x78\x5a", .len = 4, .kboff = 4 },
-		{ .magic = "\xfd\x16\x78\x5a", .len = 4, .kboff = 4 },
+		/*
+		 * Superblok offset:                      4608 bytes  (9 sectors)
+		 * Magic string offset within superblock:   32 bytes
+		 *
+		 * kboff = (4608 + 32) / 1024
+		 * sboff = (4608 + 32) % kboff
+		 */
+		{ .magic = "\xf0\x16\x78\x5a", .len = 4, .kboff = 4, .sboff = 544 },
+		{ .magic = "\xfd\x16\x78\x5a", .len = 4, .kboff = 4, .sboff = 544 },
 		{ NULL }
 	}
 };


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- util-linux-ng.spec	10 Dec 2009 14:37:50 -0000	1.68
+++ util-linux-ng.spec	15 Dec 2009 13:39:10 -0000	1.69
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -111,6 +111,8 @@ Patch8: util-linux-ng-2.15-ipcs-32bit.pa
 Patch9: util-linux-ng-2.16-blkid-crypto.patch
 # 536797 -  ntfs volume labels are not correct in hal
 Patch10: util-linux-ng-2.16-blkid-ntfs.patch
+# 547245 - blkid does not recognize Adaptec HostRAID members
+Patch11: util-linux-ng-2.16-blkid-ataraid.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -207,6 +209,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 unset LINGUAS || :
@@ -717,6 +720,9 @@ fi
 
 
 %changelog
+* Tue Dec 15 2009 Karel Zak <kzak at redhat.com> 2.16.2-5
+- fix #547245 -  blkid does not recognize Adaptec HostRAID members
+
 * Thu Dec 10 2009 Karel Zak <kzak at redhat.com> 2.16.2-4
 - add Requires: libblkid and libuuid (bz#531992 comment #38)
 



From corsepiu at fedoraproject.org  Tue Dec 15 13:39:18 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 15 Dec 2009 13:39:18 +0000 (UTC)
Subject: rpms/perl-Params-Validate/devel .cvsignore, 1.14,
	1.15 perl-Params-Validate.spec, 1.25, 1.26 sources, 1.14, 1.15
Message-ID: <20091215133918.E60AE11C00E7@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16531/devel

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
* Thu Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.94-1
- Upstream update.
- Reflect upstream having reworked author tests to using AUTHOR_TESTING=1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	23 Nov 2009 09:23:16 -0000	1.14
+++ .cvsignore	15 Dec 2009 13:39:18 -0000	1.15
@@ -1 +1 @@
-Params-Validate-0.92.tar.gz
+Params-Validate-0.94.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-Params-Validate.spec	7 Dec 2009 15:29:48 -0000	1.25
+++ perl-Params-Validate.spec	15 Dec 2009 13:39:18 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.92
-Release: 	2%{?dist}
+Version: 	0.94
+Release: 	1%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
@@ -53,11 +53,7 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 rm -rf $RPM_BUILD_ROOT
 
 %check
-%if "%{version}" > "0.92"
-IS_MAINTAINER=1 ./Build test
-%else
-./Build test
-%endif
+AUTHOR_TESTING=1 ./Build test
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +64,10 @@ IS_MAINTAINER=1 ./Build test
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.94-1
+- Upstream update.
+- Reflect upstream having reworked author tests to using AUTHOR_TESTING=1.
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.92-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	23 Nov 2009 09:23:16 -0000	1.14
+++ sources	15 Dec 2009 13:39:18 -0000	1.15
@@ -1 +1 @@
-e221233119dbdca3c610dec93a8f6cf2  Params-Validate-0.92.tar.gz
+86da1b8ad762063913f454f81b42a816  Params-Validate-0.94.tar.gz



From corsepiu at fedoraproject.org  Tue Dec 15 13:39:19 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 15 Dec 2009 13:39:19 +0000 (UTC)
Subject: rpms/perl-Params-Validate/F-11 .cvsignore, 1.14,
	1.15 perl-Params-Validate.spec, 1.23, 1.24 sources, 1.14, 1.15
Message-ID: <20091215133919.6920011C018B@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16531/F-11

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
* Thu Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.94-1
- Upstream update.
- Reflect upstream having reworked author tests to using AUTHOR_TESTING=1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	23 Nov 2009 09:23:16 -0000	1.14
+++ .cvsignore	15 Dec 2009 13:39:19 -0000	1.15
@@ -1 +1 @@
-Params-Validate-0.92.tar.gz
+Params-Validate-0.94.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/F-11/perl-Params-Validate.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Params-Validate.spec	23 Nov 2009 09:23:16 -0000	1.23
+++ perl-Params-Validate.spec	15 Dec 2009 13:39:19 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.92
+Version: 	0.94
 Release: 	1%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -53,11 +53,7 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 rm -rf $RPM_BUILD_ROOT
 
 %check
-%if "%{version}" > "0.92"
-IS_MAINTAINER=1 ./Build test
-%else
-./Build test
-%endif
+AUTHOR_TESTING=1 ./Build test
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +64,10 @@ IS_MAINTAINER=1 ./Build test
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.94-1
+- Upstream update.
+- Reflect upstream having reworked author tests to using AUTHOR_TESTING=1.
+
 * Mon Nov 23 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.92-1
 - Upstream update.
 - Switch to Build.PL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	23 Nov 2009 09:23:16 -0000	1.14
+++ sources	15 Dec 2009 13:39:19 -0000	1.15
@@ -1 +1 @@
-e221233119dbdca3c610dec93a8f6cf2  Params-Validate-0.92.tar.gz
+86da1b8ad762063913f454f81b42a816  Params-Validate-0.94.tar.gz



From corsepiu at fedoraproject.org  Tue Dec 15 13:39:19 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 15 Dec 2009 13:39:19 +0000 (UTC)
Subject: rpms/perl-Params-Validate/F-12 .cvsignore, 1.14,
	1.15 perl-Params-Validate.spec, 1.24, 1.25 sources, 1.14, 1.15
Message-ID: <20091215133919.2BCFF11C00E7@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16531/F-12

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
* Thu Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.94-1
- Upstream update.
- Reflect upstream having reworked author tests to using AUTHOR_TESTING=1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	23 Nov 2009 09:23:16 -0000	1.14
+++ .cvsignore	15 Dec 2009 13:39:18 -0000	1.15
@@ -1 +1 @@
-Params-Validate-0.92.tar.gz
+Params-Validate-0.94.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/F-12/perl-Params-Validate.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-Params-Validate.spec	23 Nov 2009 09:23:16 -0000	1.24
+++ perl-Params-Validate.spec	15 Dec 2009 13:39:19 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.92
+Version: 	0.94
 Release: 	1%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -53,11 +53,7 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 rm -rf $RPM_BUILD_ROOT
 
 %check
-%if "%{version}" > "0.92"
-IS_MAINTAINER=1 ./Build test
-%else
-./Build test
-%endif
+AUTHOR_TESTING=1 ./Build test
 
 %files
 %defattr(-,root,root,-)
@@ -68,6 +64,10 @@ IS_MAINTAINER=1 ./Build test
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.94-1
+- Upstream update.
+- Reflect upstream having reworked author tests to using AUTHOR_TESTING=1.
+
 * Mon Nov 23 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.92-1
 - Upstream update.
 - Switch to Build.PL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	23 Nov 2009 09:23:16 -0000	1.14
+++ sources	15 Dec 2009 13:39:19 -0000	1.15
@@ -1 +1 @@
-e221233119dbdca3c610dec93a8f6cf2  Params-Validate-0.92.tar.gz
+86da1b8ad762063913f454f81b42a816  Params-Validate-0.94.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 15 13:39:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:39:51 +0000
Subject: [pkgdb] bacula: kanarip has given up watchcommits
Message-ID: <20091215133953.5533428ED07@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on bacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:39:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:39:56 +0000
Subject: [pkgdb] bacula: kanarip has given up watchbugzilla
Message-ID: <20091215133958.F0F2B28ED0B@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on bacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:03 +0000
Subject: [pkgdb] bacula: kanarip has given up watchcommits
Message-ID: <20091215134004.1FDE528ED19@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on bacula (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:01 +0000
Subject: [pkgdb] bacula: kanarip has requested approveacls
Message-ID: <20091215134003.9D71828ED0D@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on bacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:01 +0000
Subject: [pkgdb] bacula: kanarip has requested commit
Message-ID: <20091215134006.44F2F28ED1C@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on bacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:07 +0000
Subject: [pkgdb] bacula: kanarip has requested commit
Message-ID: <20091215134009.6B41428ED04@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on bacula (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:06 +0000
Subject: [pkgdb] bacula: kanarip has given up watchbugzilla
Message-ID: <20091215134007.F401728ED28@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on bacula (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:09 +0000
Subject: [pkgdb] bacula: kanarip has given up watchbugzilla
Message-ID: <20091215134010.9C39D28ED3D@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on bacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:14 +0000
Subject: [pkgdb] bacula: kanarip has given up watchcommits
Message-ID: <20091215134016.DB96C28ED59@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on bacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:11 +0000
Subject: [pkgdb] bacula: kanarip has requested approveacls
Message-ID: <20091215134015.2AAFE28ED51@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on bacula (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:16 +0000
Subject: [pkgdb] bacula: kanarip has requested approveacls
Message-ID: <20091215134021.3D5AF28ED28@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on bacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:22 +0000
Subject: [pkgdb] bacula: kanarip has requested commit
Message-ID: <20091215134023.4323128ED5C@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on bacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:31 +0000
Subject: [pkgdb] bacula: kanarip has given up watchbugzilla
Message-ID: <20091215134034.20C8328ED25@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on bacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:39 +0000
Subject: [pkgdb] bacula: kanarip has given up watchcommits
Message-ID: <20091215134042.4166C28ED1C@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on bacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:39 +0000
Subject: [pkgdb] bacula: kanarip has requested approveacls
Message-ID: <20091215134043.6B12F28ED26@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on bacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:43 +0000
Subject: [pkgdb] bacula: kanarip has requested approveacls
Message-ID: <20091215134045.4C16C28ED5E@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:47 +0000
Subject: [pkgdb] bacula: kanarip has requested commit
Message-ID: <20091215134051.24C5C28ED2A@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:42 +0000
Subject: [pkgdb] bacula: kanarip has requested commit
Message-ID: <20091215134046.8697C28ED56@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on bacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:45 +0000
Subject: [pkgdb] bacula: kanarip has given up watchcommits
Message-ID: <20091215134047.1523928ED07@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:40:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:40:50 +0000
Subject: [pkgdb] bacula: kanarip has given up watchbugzilla
Message-ID: <20091215134054.4089D28ED59@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From hguemar at fedoraproject.org  Tue Dec 15 13:41:42 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 15 Dec 2009 13:41:42 +0000 (UTC)
Subject: File kiwi-1.9.26.tar.bz2 uploaded to lookaside cache by hguemar
Message-ID: <20091215134142.8B2A228ED04@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-kiwi:

43c2aab9acf8d95321ee1ccec2c5e4e4  kiwi-1.9.26.tar.bz2



From pkgdb at fedoraproject.org  Tue Dec 15 13:42:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:42:44 +0000
Subject: [pkgdb] webacula: kanarip has given up watchcommits
Message-ID: <20091215134245.E90B728ED04@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on webacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:42:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:42:46 +0000
Subject: [pkgdb] webacula: kanarip has requested approveacls
Message-ID: <20091215134247.7EB0228ED04@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on webacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:42:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:42:48 +0000
Subject: [pkgdb] webacula: kanarip has requested commit
Message-ID: <20091215134250.7C6F128ECF5@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on webacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:42:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:42:48 +0000
Subject: [pkgdb] webacula: kanarip has given up watchbugzilla
Message-ID: <20091215134250.B9A5A28ED0C@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on webacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:42:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:42:51 +0000
Subject: [pkgdb] webacula: kanarip has given up watchbugzilla
Message-ID: <20091215134252.1EFD228ED1E@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on webacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:42:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:42:55 +0000
Subject: [pkgdb] webacula: kanarip has requested approveacls
Message-ID: <20091215134257.31A3128ED06@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on webacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:42:58 +0000
Subject: [pkgdb] webacula: kanarip has requested commit
Message-ID: <20091215134259.574CB28ED06@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on webacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:42:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:42:59 +0000
Subject: [pkgdb] webacula: kanarip has given up watchcommits
Message-ID: <20091215134301.9ECF528ECFE@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on webacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:43:00 +0000
Subject: [pkgdb] webacula: kanarip has given up watchcommits
Message-ID: <20091215134302.2768828ED0C@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on webacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:43:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:43:02 +0000
Subject: [pkgdb] webacula: kanarip has requested commit
Message-ID: <20091215134304.2C79228ED04@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on webacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:43:04 +0000
Subject: [pkgdb] webacula: kanarip has given up watchbugzilla
Message-ID: <20091215134306.43D5728ED25@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on webacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:43:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:43:08 +0000
Subject: [pkgdb] webacula: kanarip has requested approveacls
Message-ID: <20091215134310.4643928ED0C@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on webacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:43:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:43:10 +0000
Subject: [pkgdb] webacula: kanarip has given up watchcommits
Message-ID: <20091215134310.DF31328ED25@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchcommits acl on webacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:43:18 +0000
Subject: [pkgdb] webacula: kanarip has given up watchbugzilla
Message-ID: <20091215134320.7C75528ED05@bastion3.fedora.phx2.redhat.com>

kanarip has given up the watchbugzilla acl on webacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:43:19 +0000
Subject: [pkgdb] webacula: kanarip has requested approveacls
Message-ID: <20091215134321.B209F28ED04@bastion3.fedora.phx2.redhat.com>

kanarip has requested the approveacls acl on webacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Tue Dec 15 13:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 13:43:27 +0000
Subject: [pkgdb] webacula: kanarip has requested commit
Message-ID: <20091215134328.C665028ED04@bastion3.fedora.phx2.redhat.com>

kanarip has requested the commit acl on webacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/webacula



From hguemar at fedoraproject.org  Tue Dec 15 13:49:24 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 15 Dec 2009 13:49:24 +0000 (UTC)
Subject: rpms/python-kiwi/devel kiwi-distutils.patch, NONE, 1.1 .cvsignore, 
	1.15, 1.16 python-kiwi.spec, 1.22, 1.23 sources, 1.15, 1.16
Message-ID: <20091215134924.A2EE111C00E7@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/pkgs/rpms/python-kiwi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18827

Modified Files:
	.cvsignore python-kiwi.spec sources 
Added Files:
	kiwi-distutils.patch 
Log Message:
upstream 1.9.26 and patch fixing installation to site-packages instead of dist-packages

kiwi-distutils.patch:
 dist.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE kiwi-distutils.patch ---
--- kiwi-1.9.26/kiwi/dist.py.orig	2009-12-14 23:37:15.000000000 +0100
+++ kiwi-1.9.26/kiwi/dist.py	2009-12-14 23:41:53.000000000 +0100
@@ -156,14 +156,10 @@ def get_site_packages_dir(*dirs):
 
     @param dirs: directory names to be appended
     """
-    python_version = sys.version_info[:2]
+
     libdir = get_python_lib(plat_specific=False,
                             standard_lib=True, prefix='')
-    if python_version < (2, 6):
-        site = 'site-packages'
-    else:
-        site = 'dist-packages'
-    return os.path.join(libdir, site, *dirs)
+    return os.path.join(libdir, 'site-packages', *dirs)
 
 def listfiles(*dirs):
     """


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Aug 2009 19:27:48 -0000	1.15
+++ .cvsignore	15 Dec 2009 13:49:24 -0000	1.16
@@ -1 +1 @@
-kiwi-1.9.25.tar.bz2
+kiwi-1.9.26.tar.bz2


Index: python-kiwi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/devel/python-kiwi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-kiwi.spec	12 Aug 2009 19:27:48 -0000	1.22
+++ python-kiwi.spec	15 Dec 2009 13:49:24 -0000	1.23
@@ -2,14 +2,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-kiwi
-Version:        1.9.25
-Release:        3%{?dist}
+Version:        1.9.26
+Release:        1%{?dist}
 Summary:        Framework for Python GUI applications
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.async.com.br/projects/kiwi/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-%{version}.tar.bz2
+# fix kiwi custom distutils to conform python packaging guidelines
+Patch0:		kiwi-distutils.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -48,7 +50,7 @@ useful for reference when writing softwa
 %prep
 %setup -q -n kiwi-%{version}
 sed -i -e 's|share/doc/kiwi|share/doc/%{name}-%{version}|' setup.py
-
+%patch0 -p1 -b .distutils
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -94,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.9.26-1
+- Upstream 1.9.26
+- Fix kiwi custom distutils to conform fedora python packaging guidelines.
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.9.25-3
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Aug 2009 19:27:48 -0000	1.15
+++ sources	15 Dec 2009 13:49:24 -0000	1.16
@@ -1 +1 @@
-9cc66b79a5991c28a88d7991f6694dbc  kiwi-1.9.25.tar.bz2
+43c2aab9acf8d95321ee1ccec2c5e4e4  kiwi-1.9.26.tar.bz2



From hadess at fedoraproject.org  Tue Dec 15 13:49:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 15 Dec 2009 13:49:47 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.104,1.105
Message-ID: <20091215134947.D73D711C00E7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18993

Modified Files:
	gnome-bluetooth.spec 
Log Message:
Add missing BRs


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gnome-bluetooth.spec	15 Dec 2009 11:27:29 -0000	1.104
+++ gnome-bluetooth.spec	15 Dec 2009 13:49:47 -0000	1.105
@@ -23,6 +23,9 @@ BuildRequires:	nautilus-sendto-devel
 
 BuildRequires:	intltool desktop-file-utils gettext gtk-doc
 
+BuildRequires:	gir-repository-devel
+BuildRequires:	gobject-introspection-devel
+
 Obsoletes:	bluez-pin
 Provides:	dbus-bluez-pin-helper
 Conflicts:	bluez-gnome <= 1.8



From stevetraylen at fedoraproject.org  Tue Dec 15 13:56:29 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 15 Dec 2009 13:56:29 +0000 (UTC)
Subject: rpms/activemq-cpp/devel .cvsignore, 1.2, 1.3 activemq-cpp.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091215135629.D188111C00E7@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/activemq-cpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20148

Modified Files:
	.cvsignore activemq-cpp.spec sources 
Log Message:
Update 3.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Dec 2009 18:48:49 -0000	1.2
+++ .cvsignore	15 Dec 2009 13:56:29 -0000	1.3
@@ -1 +1 @@
-activemq-cpp-2.2.6-src.tar.gz
+activemq-cpp-library-3.0.1-src.tar.gz


Index: activemq-cpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/devel/activemq-cpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- activemq-cpp.spec	14 Dec 2009 18:48:49 -0000	1.1
+++ activemq-cpp.spec	15 Dec 2009 13:56:29 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           activemq-cpp
-Version:        2.2.6
-Release:        5%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 Summary:        C++ implementation of JMS-like messaging client
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://activemq.apache.org/cms/
-Source0:        http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-%{version}-src.tar.gz
+Source0:        http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{version}-src.tar.gz
 # Some local texmf configuration to increase default pool_size.
 Patch1:         %{name}-local-texmf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,13 +82,13 @@ for your clients to communicate.  
 %{name}-doc contains api documentation.
 
 %prep
-%setup -q
+%setup -q -n activemq-cpp-library-%{version}
 %patch1 -p1
-
+chmod 644 LICENSE.txt
+chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
 
 
 %build
-mkdir config
 ./autogen.sh
 # Build pdf(30MB) rather than default html(400MB). 
 %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
@@ -130,6 +130,9 @@ make %{?_smp_mflags} check
 %doc doc/%{name}.pdf
 
 %changelog
+* Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-1
+- Upstream to 3.0.1
+- Tar ball name change.
 * Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-5
 - Add libuuid-devel as Requires to -devel package.
 * Sat Nov 14 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2009 18:48:49 -0000	1.2
+++ sources	15 Dec 2009 13:56:29 -0000	1.3
@@ -1 +1 @@
-1222f0d6c5f86ef3ed5a558a533c7564  activemq-cpp-2.2.6-src.tar.gz
+b917d8a27841e9ab0aeeb2297f771447  activemq-cpp-library-3.0.1-src.tar.gz



From leigh123linux at fedoraproject.org  Tue Dec 15 13:58:03 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Tue, 15 Dec 2009 13:58:03 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec, 1.57, 1.58 sources, 1.32,
	1.33
Message-ID: <20091215135803.AED2111C00E7@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20526

Modified Files:
	qbittorrent.spec sources 
Log Message:
* Mon Dec 14 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.1-1
- update to 2.0.1
- clean up spec file



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- qbittorrent.spec	10 Dec 2009 20:15:35 -0000	1.57
+++ qbittorrent.spec	15 Dec 2009 13:58:03 -0000	1.58
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -14,7 +14,7 @@ Source0: http://downloads.sf.net/qbittor
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License: GPLv2+
 BuildRequires: qt4-devel
 BuildRequires: desktop-file-utils
@@ -35,7 +35,6 @@ It aims to be as fast as possible and to
 
 %build
 # use ./configure instead of %%configure as it doesn't work
-CFLAGS="%optflags" CXXFLAGS="%optflags" \
 ./configure --prefix=%{_prefix}
 make %{?_smp_mflags}
 
@@ -74,6 +73,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Mon Dec 14 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.1-1
+- update to 2.0.1
+- clean up spec file
+
 * Thu Dec 10 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.0-1
 - update to 2.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	10 Dec 2009 19:56:13 -0000	1.32
+++ sources	15 Dec 2009 13:58:03 -0000	1.33
@@ -1 +1 @@
-5730bc420d830b16dbb5552d44fc60a9  qbittorrent-2.0.0.tar.gz
+2072e200ba861035c874ff1c8392809b  qbittorrent-2.0.1.tar.gz



From ovasik at fedoraproject.org  Tue Dec 15 14:07:19 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 15 Dec 2009 14:07:19 +0000 (UTC)
Subject: rpms/uucp/devel uucp.spec,1.40,1.41
Message-ID: <20091215140719.AE07111C00E7@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/uucp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22068

Modified Files:
	uucp.spec 
Log Message:
 move contrib dir from %%doc dir into /usr/share/uucp/


Index: uucp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- uucp.spec	15 Dec 2009 13:26:57 -0000	1.40
+++ uucp.spec	15 Dec 2009 14:07:19 -0000	1.41
@@ -7,7 +7,7 @@
 Summary: A set of utilities for operations between systems
 Name: uucp
 Version: 1.07
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: Applications/Communications
 Url: http://www.airs.com/ian/uucp.html
@@ -76,6 +76,9 @@ install -m 644 %SOURCE1 ${RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
 install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.d/uucp
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/uucp/contrib
+install -p contrib/* $RPM_BUILD_ROOT/%{_datadir}/uucp/contrib/
+
 # Create ghost files
 for n in Log Stats Debug; do
 	touch ${RPM_BUILD_ROOT}%{_varlogdir}/$n
@@ -121,7 +124,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS TODO
-%doc sample contrib uucp.html
+%doc sample uucp.html
 
 %attr(6555,uucp,uucp)		%{_bindir}/cu
 %attr(4555,uucp,uucp)		%{_bindir}/uucp
@@ -144,6 +147,9 @@ fi
 %{_mandir}/man[18]/*
 %{_infodir}/uucp.info*
 
+%dir %{_datadir}/uucp
+%{_datadir}/uucp/contrib
+
 %attr(0755,uucp,uucp)	%dir	%{_varlogdir}
 %attr(0644,uucp,uucp)	%ghost	%{_varlogdir}/Log
 %attr(0644,uucp,uucp)	%ghost	%{_varlogdir}/Stats
@@ -165,6 +171,9 @@ fi
 %config(noreplace)	%{_newconfigdir}/sys
 
 %changelog
+* Tue Dec 15 2009 Ondrej Vasik <ovasik at redhat.com> - 1.07-22
+- move contrib dir from %%doc dir into /usr/share/uucp/
+
 * Tue Dec 15 2009 Ondrej Vasik <ovasik at redhat.com> - 1.07-21
 - Merge Review(#226521) - add _smp_mflags to make, remove implicit
   target, fix rpmlint warnings, commented patches, fix build root,



From dsommers at fedoraproject.org  Tue Dec 15 14:09:02 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Tue, 15 Dec 2009 14:09:02 +0000 (UTC)
Subject: File python-dmidecode-3.10.8.tar.gz uploaded to lookaside cache by
	dsommers
Message-ID: <20091215140902.0091428ED27@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-dmidecode:

59356791cb6e48d5057f5110eae1a2b0  python-dmidecode-3.10.8.tar.gz



From dsommers at fedoraproject.org  Tue Dec 15 14:09:50 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Tue, 15 Dec 2009 14:09:50 +0000 (UTC)
Subject: rpms/python-dmidecode/devel import.log, 1.2,
	1.3 python-dmidecode.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091215140950.3D39D11C00E7@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22545/devel

Modified Files:
	import.log python-dmidecode.spec sources 
Log Message:
Updated with the correct tar ball



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	14 Dec 2009 13:34:43 -0000	1.2
+++ import.log	15 Dec 2009 14:09:49 -0000	1.3
@@ -1,2 +1,3 @@
 python-dmidecode-3_10_7-3_fc11:HEAD:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737152
 python-dmidecode-3_10_8-1_fc11:HEAD:python-dmidecode-3.10.8-1.fc11.src.rpm:1260797632
+python-dmidecode-3_10_8-1_fc11:HEAD:python-dmidecode-3.10.8-1.fc11.src.rpm:1260886146


Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/python-dmidecode.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-dmidecode.spec	14 Dec 2009 13:34:43 -0000	1.2
+++ python-dmidecode.spec	15 Dec 2009 14:09:50 -0000	1.3
@@ -49,6 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/python-dmidecode/
 
 %changelog
+
+* Thu Dec 15 2009 Nima Talebi <nima at it.net.au> - 3.10.8-1
+- New Upstream release.
+- Big-endian and little-endian approved.
+- Packaged unit-test to tarball.
+- Rewritten unit-test to be able to run as non-root user, where it will not
+  try to read /dev/mem.
+- Added two dmidump data files to the unit-test.
+
 * Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
 - Fixed even more .spec file issues and removed explicit mentioning
   of /usr/share/python-dmidecode/pymap.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Dec 2009 13:34:43 -0000	1.3
+++ sources	15 Dec 2009 14:09:50 -0000	1.4
@@ -1 +1 @@
-a2bc1cf271c908478dbecf119649c075  python-dmidecode-3.10.8.tar.gz
+59356791cb6e48d5057f5110eae1a2b0  python-dmidecode-3.10.8.tar.gz



From pbrobinson at fedoraproject.org  Tue Dec 15 14:15:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 15 Dec 2009 14:15:21 +0000 (UTC)
Subject: rpms/libiphone/devel libiphone.spec,1.19,1.20
Message-ID: <20091215141521.2089811C00E7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23778

Modified Files:
	libiphone.spec 
Log Message:
- Update python bindings


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- libiphone.spec	12 Dec 2009 12:34:22 -0000	1.19
+++ libiphone.spec	15 Dec 2009 14:15:19 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           libiphone
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -52,7 +52,7 @@ Python bindings for libiphone.
 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} V=1
 
 %install
 rm -rf %{buildroot}
@@ -84,9 +84,12 @@ rm -rf %{buildroot}
 
 %files python
 %defattr(-,root,root,-)
-%{python_sitearch}/libiphone/
+%{python_sitearch}/iphone/
 
 %changelog
+* Tue Dec 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.5-2
+- Update python bindings
+
 * Sat Dec 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.5-1
 - Update to 0.9.5 release for new usbmuxd/libplist 1.0.0 final
 



From dsommers at fedoraproject.org  Tue Dec 15 14:22:09 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Tue, 15 Dec 2009 14:22:09 +0000 (UTC)
Subject: rpms/python-dmidecode/devel python-dmidecode.spec,1.3,1.4
Message-ID: <20091215142209.9C3D911C00E7@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24920

Modified Files:
	python-dmidecode.spec 
Log Message:
Changed Release to 2, to get compilation going



Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/devel/python-dmidecode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-dmidecode.spec	15 Dec 2009 14:09:50 -0000	1.3
+++ python-dmidecode.spec	15 Dec 2009 14:22:08 -0000	1.4
@@ -4,7 +4,7 @@
 Summary: Python module to access DMI data
 Name: python-dmidecode
 Version: 3.10.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://projects.autonomy.net.au/python-dmidecode/



From caolanm at fedoraproject.org  Tue Dec 15 14:22:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Dec 2009 14:22:53 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.fwk132.patch,1.1,1.2
Message-ID: <20091215142253.938D311C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25150/F-11

Modified Files:
	workspace.fwk132.patch 
Log Message:
Resolves: rhbz#547176 bah, code moved around a bit

workspace.fwk132.patch:
 file.cxx |   96 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 40 insertions(+), 56 deletions(-)

Index: workspace.fwk132.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.fwk132.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.fwk132.patch	15 Dec 2009 13:07:01 -0000	1.1
+++ workspace.fwk132.patch	15 Dec 2009 14:22:53 -0000	1.2
@@ -1,24 +1,24 @@
 diff -r a4be016d908d sal/osl/unx/file_misc.cxx
---- a/sal/osl/unx/file_misc.cxx	Wed Dec 09 12:25:54 2009 +0100
-+++ b/sal/osl/unx/file_misc.cxx	Tue Dec 15 12:55:26 2009 +0000
-@@ -29,6 +29,7 @@
+--- a/sal/osl/unx/file.cxx	Wed Dec 09 12:25:54 2009 +0100
++++ b/sal/osl/unx/file.cxx	Tue Dec 15 12:55:26 2009 +0000
+@@ -56,6 +56,7 @@
  
- #include "osl/diagnose.h"
- #include "osl/thread.h"
+ #include <sal/types.h>
+ #include <osl/thread.h>
 +#include <osl/signal.h>
- #include "rtl/alloc.h"
+ #include <osl/diagnose.h>
+ #include "file_error_transl.h"
+ #include <osl/time.h>
+@@ -70,6 +71,8 @@
  
- #include "system.h"
-@@ -48,6 +49,8 @@
- #include <sys/stat.h>
  #include <sys/mman.h>
  
 +#include <algorithm>
 +
- /************************************************************************
-  *   ToDo
-  *
-@@ -1002,7 +1005,6 @@
+ #ifdef HAVE_STATFS_H
+ #undef HAVE_STATFS_H
+ #endif
+@@ -2189,7 +2192,6 @@
      int SourceFileFD=0;
      int DestFileFD=0;
      int nRet=0;
@@ -26,18 +26,15 @@ diff -r a4be016d908d sal/osl/unx/file_mi
  
      SourceFileFD=open(pszSourceFileName,O_RDONLY);
      if ( SourceFileFD < 0 )
-@@ -1010,9 +1012,8 @@
-         nRet=errno;
-         return nRet;
+@@ -2199,7 +2201,6 @@
      }
--    
-+ 
+     
      DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
 -		
      if ( DestFileFD < 0 )
      {
          nRet=errno;
-@@ -1020,65 +1021,49 @@
+@@ -2207,67 +2208,50 @@
          return nRet;
      }
  
@@ -79,9 +76,9 @@ diff -r a4be016d908d sal/osl/unx/file_mi
 -        if (nRet < 0)
 +    size_t nWritten = 0;
 +    size_t nRemains = nSourceSize;
-+   
++
 +    if ( nRemains )
-+    {	
++    {
 +        char pBuffer[32000];
 +        size_t nRead = 0;
 +
@@ -113,7 +110,7 @@ diff -r a4be016d908d sal/osl/unx/file_mi
 -        close(DestFileFD);
 -        munmap((char*)pSourceFile,nSourceSize);
 -        return nRet;
-     }
+-    }
 -    
 -    nRet = munmap((char*)pSourceFile,nSourceSize);
 -    if ( nRet < 0 )
@@ -122,7 +119,7 @@ diff -r a4be016d908d sal/osl/unx/file_mi
 -        close(SourceFileFD);
 -        close(DestFileFD);
 -        return nRet;
--    }
+     }
 -    
 -    close(SourceFileFD);
 -    
@@ -140,95 +137,5 @@ diff -r a4be016d908d sal/osl/unx/file_mi
 +
 +    return nRet;
  }
-+
-diff -r a4be016d908d sfx2/source/doc/docfile.cxx
---- a/sfx2/source/doc/docfile.cxx	Wed Dec 09 12:25:54 2009 +0100
-+++ b/sfx2/source/doc/docfile.cxx	Tue Dec 15 12:55:26 2009 +0000
-@@ -3433,13 +3433,14 @@
- 
-     if ( !( nStorOpenMode & STREAM_TRUNC ) )
-     {
-+        sal_Bool bTransferSuccess = sal_False;
-+
-         if ( GetContent().is()
-           && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
-           && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
-         {
-             // if there is already such a document, we should copy it
-             // if it is a file system use OS copy process
--            sal_Bool bTransferSuccess = sal_False;
-             try
-             {
-                 uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
-@@ -3460,16 +3461,14 @@
-             catch( uno::Exception& )
-             {}
- 
--            if ( !bTransferSuccess )
-+            if ( bTransferSuccess )
-             {
--                SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
--                return;
-+                CloseOutStream();
-+                CloseInStream();
-             }
--
--            CloseOutStream();
--            CloseInStream();
-         }
--        else if ( pInStream )
-+
-+        if ( !bTransferSuccess && pInStream )
-         {
-             // the case when there is no URL-access available or this is a remote protocoll
-             // but there is an input stream
-@@ -3489,13 +3488,25 @@
-                     pOutStream->Write( pBuf, nRead );
-                 }
- 
-+                bTransferSuccess = sal_True;
-                 delete[] pBuf;
-                 CloseInStream();
-             }
-             CloseOutStream_Impl();
-         }
-         else
-+        {
-+            // Quite strange design, but currently it is expected that in this case no transfer happens
-+            // TODO/LATER: get rid of this inconsistent part of the call design
-+            bTransferSuccess = sal_True;
-             CloseInStream();
-+        }
-+
-+        if ( !bTransferSuccess )
-+        {
-+            SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-+            return;
-+        }
-     }
  
-     CloseStorage();
-diff -r a4be016d908d sfx2/source/doc/objstor.cxx
---- a/sfx2/source/doc/objstor.cxx	Wed Dec 09 12:25:54 2009 +0100
-+++ b/sfx2/source/doc/objstor.cxx	Tue Dec 15 12:55:26 2009 +0000
-@@ -1872,7 +1872,19 @@
- 		{
- 			uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY_THROW );
- 			::rtl::OUString aBackupURL = rTargetMedium.GetBackup_Impl();
--			if ( aBackupURL.getLength() )
-+			if ( !aBackupURL.getLength() )
-+            {
-+                // the backup could not be created, try to disconnect the storage and close the source SfxMedium
-+                // in this case the optimization is not possible, connect storage to a temporary file
-+                rTargetMedium.ResetError();
-+                xOptStorage->writeAndAttachToStream( uno::Reference< io::XStream >() );
-+				rSrcMedium.CanDisposeStorage_Impl( sal_False );
-+                rSrcMedium.Close();
-+
-+                // now try to create the backup
-+                rTargetMedium.GetBackup_Impl();
-+            }
-+            else
- 			{
- 				// the following call will only compare stream sizes
- 				// TODO/LATER: this is a very risky part, since if the URL contents are different from the storage
+ /*****************************************



From caolanm at fedoraproject.org  Tue Dec 15 14:22:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Dec 2009 14:22:53 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.fwk132.patch,1.1,1.2
Message-ID: <20091215142253.D56B411C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25150/F-12

Modified Files:
	workspace.fwk132.patch 
Log Message:
Resolves: rhbz#547176 bah, code moved around a bit

workspace.fwk132.patch:
 file.cxx |   96 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 40 insertions(+), 56 deletions(-)

Index: workspace.fwk132.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/workspace.fwk132.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.fwk132.patch	15 Dec 2009 13:07:02 -0000	1.1
+++ workspace.fwk132.patch	15 Dec 2009 14:22:53 -0000	1.2
@@ -1,24 +1,24 @@
 diff -r a4be016d908d sal/osl/unx/file_misc.cxx
---- a/sal/osl/unx/file_misc.cxx	Wed Dec 09 12:25:54 2009 +0100
-+++ b/sal/osl/unx/file_misc.cxx	Tue Dec 15 12:55:26 2009 +0000
-@@ -29,6 +29,7 @@
+--- a/sal/osl/unx/file.cxx	Wed Dec 09 12:25:54 2009 +0100
++++ b/sal/osl/unx/file.cxx	Tue Dec 15 12:55:26 2009 +0000
+@@ -56,6 +56,7 @@
  
- #include "osl/diagnose.h"
- #include "osl/thread.h"
+ #include <sal/types.h>
+ #include <osl/thread.h>
 +#include <osl/signal.h>
- #include "rtl/alloc.h"
+ #include <osl/diagnose.h>
+ #include "file_error_transl.h"
+ #include <osl/time.h>
+@@ -70,6 +71,8 @@
  
- #include "system.h"
-@@ -48,6 +49,8 @@
- #include <sys/stat.h>
  #include <sys/mman.h>
  
 +#include <algorithm>
 +
- /************************************************************************
-  *   ToDo
-  *
-@@ -1002,7 +1005,6 @@
+ #ifdef HAVE_STATFS_H
+ #undef HAVE_STATFS_H
+ #endif
+@@ -2189,7 +2192,6 @@
      int SourceFileFD=0;
      int DestFileFD=0;
      int nRet=0;
@@ -26,18 +26,15 @@ diff -r a4be016d908d sal/osl/unx/file_mi
  
      SourceFileFD=open(pszSourceFileName,O_RDONLY);
      if ( SourceFileFD < 0 )
-@@ -1010,9 +1012,8 @@
-         nRet=errno;
-         return nRet;
+@@ -2199,7 +2201,6 @@
      }
--    
-+ 
+     
      DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
 -		
      if ( DestFileFD < 0 )
      {
          nRet=errno;
-@@ -1020,65 +1021,49 @@
+@@ -2207,67 +2208,50 @@
          return nRet;
      }
  
@@ -79,9 +76,9 @@ diff -r a4be016d908d sal/osl/unx/file_mi
 -        if (nRet < 0)
 +    size_t nWritten = 0;
 +    size_t nRemains = nSourceSize;
-+   
++
 +    if ( nRemains )
-+    {	
++    {
 +        char pBuffer[32000];
 +        size_t nRead = 0;
 +
@@ -113,7 +110,7 @@ diff -r a4be016d908d sal/osl/unx/file_mi
 -        close(DestFileFD);
 -        munmap((char*)pSourceFile,nSourceSize);
 -        return nRet;
-     }
+-    }
 -    
 -    nRet = munmap((char*)pSourceFile,nSourceSize);
 -    if ( nRet < 0 )
@@ -122,7 +119,7 @@ diff -r a4be016d908d sal/osl/unx/file_mi
 -        close(SourceFileFD);
 -        close(DestFileFD);
 -        return nRet;
--    }
+     }
 -    
 -    close(SourceFileFD);
 -    
@@ -140,95 +137,5 @@ diff -r a4be016d908d sal/osl/unx/file_mi
 +
 +    return nRet;
  }
-+
-diff -r a4be016d908d sfx2/source/doc/docfile.cxx
---- a/sfx2/source/doc/docfile.cxx	Wed Dec 09 12:25:54 2009 +0100
-+++ b/sfx2/source/doc/docfile.cxx	Tue Dec 15 12:55:26 2009 +0000
-@@ -3433,13 +3433,14 @@
- 
-     if ( !( nStorOpenMode & STREAM_TRUNC ) )
-     {
-+        sal_Bool bTransferSuccess = sal_False;
-+
-         if ( GetContent().is()
-           && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
-           && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
-         {
-             // if there is already such a document, we should copy it
-             // if it is a file system use OS copy process
--            sal_Bool bTransferSuccess = sal_False;
-             try
-             {
-                 uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
-@@ -3460,16 +3461,14 @@
-             catch( uno::Exception& )
-             {}
- 
--            if ( !bTransferSuccess )
-+            if ( bTransferSuccess )
-             {
--                SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
--                return;
-+                CloseOutStream();
-+                CloseInStream();
-             }
--
--            CloseOutStream();
--            CloseInStream();
-         }
--        else if ( pInStream )
-+
-+        if ( !bTransferSuccess && pInStream )
-         {
-             // the case when there is no URL-access available or this is a remote protocoll
-             // but there is an input stream
-@@ -3489,13 +3488,25 @@
-                     pOutStream->Write( pBuf, nRead );
-                 }
- 
-+                bTransferSuccess = sal_True;
-                 delete[] pBuf;
-                 CloseInStream();
-             }
-             CloseOutStream_Impl();
-         }
-         else
-+        {
-+            // Quite strange design, but currently it is expected that in this case no transfer happens
-+            // TODO/LATER: get rid of this inconsistent part of the call design
-+            bTransferSuccess = sal_True;
-             CloseInStream();
-+        }
-+
-+        if ( !bTransferSuccess )
-+        {
-+            SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-+            return;
-+        }
-     }
  
-     CloseStorage();
-diff -r a4be016d908d sfx2/source/doc/objstor.cxx
---- a/sfx2/source/doc/objstor.cxx	Wed Dec 09 12:25:54 2009 +0100
-+++ b/sfx2/source/doc/objstor.cxx	Tue Dec 15 12:55:26 2009 +0000
-@@ -1872,7 +1872,19 @@
- 		{
- 			uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY_THROW );
- 			::rtl::OUString aBackupURL = rTargetMedium.GetBackup_Impl();
--			if ( aBackupURL.getLength() )
-+			if ( !aBackupURL.getLength() )
-+            {
-+                // the backup could not be created, try to disconnect the storage and close the source SfxMedium
-+                // in this case the optimization is not possible, connect storage to a temporary file
-+                rTargetMedium.ResetError();
-+                xOptStorage->writeAndAttachToStream( uno::Reference< io::XStream >() );
-+				rSrcMedium.CanDisposeStorage_Impl( sal_False );
-+                rSrcMedium.Close();
-+
-+                // now try to create the backup
-+                rTargetMedium.GetBackup_Impl();
-+            }
-+            else
- 			{
- 				// the following call will only compare stream sizes
- 				// TODO/LATER: this is a very risky part, since if the URL contents are different from the storage
+ /*****************************************



From dsommers at fedoraproject.org  Tue Dec 15 14:32:27 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Tue, 15 Dec 2009 14:32:27 +0000 (UTC)
Subject: rpms/python-dmidecode/F-11 import.log, 1.2,
	1.3 python-dmidecode.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091215143227.89C3111C00E7@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26826/F-11

Modified Files:
	import.log python-dmidecode.spec sources 
Log Message:
Updated to the correct 3.10.8 version, release set to 2.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	14 Dec 2009 14:16:10 -0000	1.2
+++ import.log	15 Dec 2009 14:32:26 -0000	1.3
@@ -1,2 +1,3 @@
 python-dmidecode-3_10_7-3_fc11:F-11:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737645
 python-dmidecode-3_10_8-1_fc11:F-11:python-dmidecode-3.10.8-1.fc11.src.rpm:1260800116
+python-dmidecode-3_10_8-2_fc13:F-11:python-dmidecode-3.10.8-2.fc13.src.rpm:1260887458


Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/python-dmidecode.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-dmidecode.spec	14 Dec 2009 14:16:10 -0000	1.2
+++ python-dmidecode.spec	15 Dec 2009 14:32:26 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Python module to access DMI data
 Name: python-dmidecode
 Version: 3.10.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://projects.autonomy.net.au/python-dmidecode/
@@ -49,6 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/python-dmidecode/
 
 %changelog
+
+* Thu Dec 15 2009 Nima Talebi <nima at it.net.au> - 3.10.8-1
+- New Upstream release.
+- Big-endian and little-endian approved.
+- Packaged unit-test to tarball.
+- Rewritten unit-test to be able to run as non-root user, where it will not
+  try to read /dev/mem.
+- Added two dmidump data files to the unit-test.
+
 * Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
 - Fixed even more .spec file issues and removed explicit mentioning
   of /usr/share/python-dmidecode/pymap.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Dec 2009 14:16:10 -0000	1.3
+++ sources	15 Dec 2009 14:32:27 -0000	1.4
@@ -1 +1 @@
-a2bc1cf271c908478dbecf119649c075  python-dmidecode-3.10.8.tar.gz
+59356791cb6e48d5057f5110eae1a2b0  python-dmidecode-3.10.8.tar.gz



From mclasen at fedoraproject.org  Tue Dec 15 14:33:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 14:33:29 +0000 (UTC)
Subject: rpms/libgnome/devel libgnome.spec,1.155,1.156
Message-ID: <20091215143329.B657611C00E7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27194

Modified Files:
	libgnome.spec 
Log Message:
Remove a useless static library



Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- libgnome.spec	3 Dec 2009 04:16:21 -0000	1.155
+++ libgnome.spec	15 Dec 2009 14:33:29 -0000	1.156
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.28/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -140,7 +140,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INST
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
 
 rm $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la}
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
     sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
@@ -199,6 +199,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-4
+- Remove a useless static library that trips up some
+  rpmlint-type checks
+
 * Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Rebuild
 



From atkac at fedoraproject.org  Tue Dec 15 14:33:45 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 15 Dec 2009 14:33:45 +0000 (UTC)
Subject: rpms/rsh/devel rsh.spec,1.55,1.56
Message-ID: <20091215143345.EA1D711C00E7@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/rsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27250

Modified Files:
	rsh.spec 
Log Message:
- more merge review related fixes (#226379)



Index: rsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- rsh.spec	30 Nov 2009 14:50:54 -0000	1.55
+++ rsh.spec	15 Dec 2009 14:33:45 -0000	1.56
@@ -1,54 +1,77 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp)
 Name: rsh
 Version: 0.17
-Release: 59%{?dist}
+Release: 60%{?dist}
 License: BSD
 Group: Applications/Internet
 
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl, ncurses-devel, pam-devel, audit-libs-devel >= 1.5
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: perl, ncurses-devel, pam-devel, audit-libs-devel
 
 URL: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit
 Source0 ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-%{version}.tar.gz
 Source1: rexec.pam
 Source2: rlogin.pam
 Source3: rsh.pam
+# Source is no longer publicly available.
 Source4: rexec-1.5.tar.gz
 Source5: rsh-xinetd
 Source6: rlogin-xinetd
 Source7: rexec-xinetd
 
 Patch1: netkit-rsh-0.17-sectty.patch
+# Make rexec installation process working
 Patch2: netkit-rsh-0.17-rexec.patch
 Patch3: netkit-rsh-0.10-stdarg.patch
+# Improve installation process
 Patch4: netkit-rsh-0.16-jbj.patch
+# Link rshd against libpam
 Patch8: netkit-rsh-0.16-jbj4.patch
 Patch9: netkit-rsh-0.16-prompt.patch
 Patch10: netkit-rsh-0.16-rlogin=rsh.patch
+# Improve documentation
 Patch11: netkit-rsh-0.16-nokrb.patch
+# Remove spurious double-reporting of errors
 Patch12: netkit-rsh-0.17-pre20000412-jbj5.patch
+# RH #42880
 Patch13: netkit-rsh-0.17-userandhost.patch
+# Don't strip binaries during installation
 Patch14: netkit-rsh-0.17-strip.patch
+# RH #67362
 Patch15: netkit-rsh-0.17-lfs.patch
+# RH #57392
 Patch16: netkit-rsh-0.17-chdir.patch
+# RH #63806
 Patch17: netkit-rsh-0.17-pam-nologin.patch
+# RH #135643
 Patch19: netkit-rsh-0.17-rexec-netrc.patch
+# RH #68590
 Patch20: netkit-rsh-0.17-pam-sess.patch
+# RH #67361
 Patch21: netkit-rsh-0.17-errno.patch
+# RH #118630
 Patch22: netkit-rsh-0.17-rexec-sig.patch
+# RH #135827
 Patch23: netkit-rsh-0.17-nohost.patch
+# RH #122315
 Patch24: netkit-rsh-0.17-ignchld.patch
+# RH #146464
 Patch25: netkit-rsh-0.17-checkdir.patch
 Patch26: netkit-rsh-0.17-pam-conv.patch
+# RH #174045
 Patch27: netkit-rsh-0.17-rcp-largefile.patch
+# RH #174146
 Patch28: netkit-rsh-0.17-pam-rhost.patch
+# RH #178916
 Patch29: netkit-rsh-0.17-rlogin-linefeed.patch
 Patch30: netkit-rsh-0.17-ipv6.patch
 Patch31: netkit-rsh-0.17-pam_env.patch
 Patch33: netkit-rsh-0.17-dns.patch
 Patch34: netkit-rsh-0.17-nohostcheck-compat.patch
+# RH #448904
 Patch35: netkit-rsh-0.17-audit.patch
 Patch36: netkit-rsh-0.17-longname.patch
+# RH #440867
 Patch37: netkit-rsh-0.17-arg_max.patch
 Patch38: netkit-rsh-0.17-rh448904.patch
 Patch39: netkit-rsh-0.17-rh461903.patch
@@ -65,7 +88,7 @@ machines
 %package server
 Summary: Servers for remote access commands (rsh, rlogin, rcp)
 Group: System Environment/Daemons
-Requires: pam >= 0.59, /etc/pam.d/system-auth, xinetd
+Requires: pam, /etc/pam.d/system-auth, xinetd
 
 %description server
 The rsh-server package contains a set of programs which allow users
@@ -184,6 +207,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Dec 15 2009 Adam Tkac <atkac redhat com> - 0.17-60
+- more merge review related fixes (#226379)
+
 * Mon Nov 30 2009 Adam Tkac <atkac redhat com> - 0.17-59
 - merge review related fixes (#226379)
 - remove unused patches



From mlichvar at fedoraproject.org  Tue Dec 15 14:40:42 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 15 Dec 2009 14:40:42 +0000 (UTC)
Subject: rpms/sendmail/devel sendmail-8.14.3-exitpanic.patch, NONE,
	1.1 sendmail-8.14.3-milterfdleaks.patch, NONE,
	1.1 sendmail-8.14.3-switchfile.patch, NONE, 1.1 sendmail.init,
	1.20, 1.21 sendmail.spec, 1.103, 1.104 Sendmail-sasl1.conf, 1.1, NONE
Message-ID: <20091215144042.676B511C0375@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28393

Modified Files:
	sendmail.init sendmail.spec 
Added Files:
	sendmail-8.14.3-exitpanic.patch 
	sendmail-8.14.3-milterfdleaks.patch 
	sendmail-8.14.3-switchfile.patch 
Removed Files:
	Sendmail-sasl1.conf 
Log Message:
- fix milter file descriptors leaks (#485426)
- skip colon separator when parsing service name in ServiceSwitchFile
- return with non-zero exit code when free space is below MinFreeBlocks
- fix service stop/restart when only smclient is running
- fix submit.cf and helpfile permissions
- more merge review fixes (#226407)


sendmail-8.14.3-exitpanic.patch:
 envelope.c |    8 +++++---
 main.c     |    4 +++-
 sendmail.h |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE sendmail-8.14.3-exitpanic.patch ---
diff -up sendmail-8.14.3/sendmail/envelope.c.exitpanic sendmail-8.14.3/sendmail/envelope.c
--- sendmail-8.14.3/sendmail/envelope.c.exitpanic	2008-03-31 18:32:13.000000000 +0200
+++ sendmail-8.14.3/sendmail/envelope.c	2009-12-15 13:55:52.000000000 +0100
@@ -163,14 +163,14 @@ newenvelope(e, parent, rpool)
 **		split -- if true, split by recipient if message is queued up
 **
 **	Returns:
-**		none.
+**		true if savemail panic'ed.
 **
 **	Side Effects:
 **		housekeeping necessary to dispose of an envelope.
 **		Unlocks this queue file.
 */
 
-void
+bool
 dropenvelope(e, fulldrop, split)
 	register ENVELOPE *e;
 	bool fulldrop;
@@ -209,7 +209,7 @@ dropenvelope(e, fulldrop, split)
 
 	/* we must have an id to remove disk files */
 	if (id == NULL)
-		return;
+		return panic;
 
 	/* if verify-only mode, we can skip most of this */
 	if (OpMode == MD_VERIFY)
@@ -618,6 +618,8 @@ simpledrop:
 	}
 	e->e_id = NULL;
 	e->e_flags &= ~EF_HAS_DF;
+
+	return panic;
 }
 /*
 **  CLEARENVELOPE -- clear an envelope without unlocking
diff -up sendmail-8.14.3/sendmail/main.c.exitpanic sendmail-8.14.3/sendmail/main.c
--- sendmail-8.14.3/sendmail/main.c.exitpanic	2008-03-31 18:32:13.000000000 +0200
+++ sendmail-8.14.3/sendmail/main.c	2009-12-15 13:55:52.000000000 +0100
@@ -2952,7 +2952,9 @@ finis(drop, cleanup, exitstat)
 		{
 			if (CurEnv->e_id != NULL)
 			{
-				dropenvelope(CurEnv, true, false);
+				if (dropenvelope(CurEnv, true, false))
+					/* exit with OS error if savemail panic'ed */
+					exitstat = EX_OSERR;
 				sm_rpool_free(CurEnv->e_rpool);
 				CurEnv->e_rpool = NULL;
 
diff -up sendmail-8.14.3/sendmail/sendmail.h.exitpanic sendmail-8.14.3/sendmail/sendmail.h
--- sendmail-8.14.3/sendmail/sendmail.h.exitpanic	2008-02-16 00:19:58.000000000 +0100
+++ sendmail-8.14.3/sendmail/sendmail.h	2009-12-15 13:55:52.000000000 +0100
@@ -982,7 +982,7 @@ extern ENVELOPE	BlankEnvelope;
 
 /* functions */
 extern void	clearenvelope __P((ENVELOPE *, bool, SM_RPOOL_T *));
-extern void	dropenvelope __P((ENVELOPE *, bool, bool));
+extern bool	dropenvelope __P((ENVELOPE *, bool, bool));
 extern ENVELOPE	*newenvelope __P((ENVELOPE *, ENVELOPE *, SM_RPOOL_T *));
 extern void	clrsessenvelope __P((ENVELOPE *));
 extern void	printenvflags __P((ENVELOPE *));

sendmail-8.14.3-milterfdleaks.patch:
 libmilter/listener.c |   14 ++++++++++++++
 sendmail/milter.c    |   19 +++++++++++++++++++
 2 files changed, 33 insertions(+)

--- NEW FILE sendmail-8.14.3-milterfdleaks.patch ---
Patches by Paul Howarth
https://bugzilla.redhat.com/show_bug.cgi?id=485426

--- sendmail-8.14.3/sendmail/milter.c	2008-09-19 15:51:03.000000000 +0100
+++ sendmail-8.14.3/sendmail/milter.c	2008-09-19 16:37:57.000000000 +0100
@@ -30,6 +30,9 @@
 
 # include <sm/fdset.h>
 
+# include <unistd.h>
+# include <fcntl.h>
+
 static void	milter_connect_timeout __P((int));
 static void	milter_error __P((struct milter *, ENVELOPE *));
 static int	milter_open __P((struct milter *, bool, ENVELOPE *));
@@ -650,6 +653,7 @@
 	SOCKADDR_LEN_T addrlen = 0;
 	int addrno = 0;
 	int save_errno;
+	int fdflags;
 	char *p;
 	char *colon;
 	char *at;
@@ -1186,6 +1190,21 @@
 			   (char *)&nodelay, sizeof(nodelay));
 	}
 # endif /* MILTER_NO_NAGLE && !defined(TCP_CORK) */
+
+	/*
+	** Need to set close-on-exec for sock to prevent it
+	** leaking to the local delivery process
+	*/
+	if ((fdflags = fcntl(sock, F_GETFD, 0)) == -1 ||
+	    fcntl(sock, F_SETFD, fdflags | FD_CLOEXEC) == -1)
+	{
+		save_errno = errno;
+		if (MilterLogLevel > 0)
+			sm_syslog(LOG_WARNING, e->e_id,
+				"Milter (%s): Unable to set close-on-exec on sock (%s)",
+					m->mf_name, sm_errstring(save_errno = errno));
+	}
+
 	return sock;
 }
 
--- sendmail-8.14.3/libmilter/listener.c	2007-04-23 23:22:50.000000000 +0100
+++ sendmail-8.14.3/libmilter/listener.c	2008-06-18 16:36:38.000000000 +0100
@@ -728,6 +728,7 @@
 	int acnt = 0;	/* error count for accept() failures */
 	int scnt = 0;	/* error count for select() failures */
 	int save_errno = 0;
+	int fdflags;
 #if !_FFR_WORKERS_POOL
 	sthread_t thread_id;
 #endif /* !_FFR_WORKERS_POOL */
@@ -807,6 +808,19 @@
 		(void) smutex_unlock(&L_Mutex);
 
 		/*
+		** Need to set close-on-exec for connfd in case a user's
+		** filter starts other applications
+		*/
+		if ((fdflags = fcntl(connfd, F_GETFD, 0)) == -1 ||
+		    fcntl(connfd, F_SETFD, fdflags | FD_CLOEXEC) == -1)
+		{
+			smi_log(SMI_LOG_WARN,
+				"%s: Unable to set close-on-exec on connfd (%s)",
+				smfi->xxfi_name, sm_errstring(errno));
+			/* XXX: continue? */
+		}
+
+		/*
 		**  If remote side closes before accept() finishes,
 		**  sockaddr might not be fully filled in.
 		*/

sendmail-8.14.3-switchfile.patch:
 conf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sendmail-8.14.3-switchfile.patch ---
diff -up sendmail-8.14.3/sendmail/conf.c.switchfile sendmail-8.14.3/sendmail/conf.c
--- sendmail-8.14.3/sendmail/conf.c.switchfile	2008-04-14 04:09:35.000000000 +0200
+++ sendmail-8.14.3/sendmail/conf.c	2009-12-15 13:32:55.000000000 +0100
@@ -968,7 +968,7 @@ switch_map_find(service, maptype, mapret
 				p = strpbrk(buf, "#\n");
 				if (p != NULL)
 					*p = '\0';
-				p = strpbrk(buf, " \t");
+				p = strpbrk(buf, " \t:");
 				if (p != NULL)
 					*p++ = '\0';
 				if (buf[0] == '\0')


Index: sendmail.init
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.init,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sendmail.init	19 Dec 2008 13:23:41 -0000	1.20
+++ sendmail.init	15 Dec 2009 14:40:42 -0000	1.21
@@ -116,7 +116,7 @@ stop() {
     return $RETVAL
 }
 
-status -p /var/run/sendmail.pid >/dev/null && status -p /var/run/sm-client.pid >/dev/null
+status -p /var/run/sendmail.pid >/dev/null || status -p /var/run/sm-client.pid >/dev/null
 running=$?
 
 # See how we were called.


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sendmail.spec	16 Sep 2009 18:48:51 -0000	1.103
+++ sendmail.spec	15 Dec 2009 14:40:42 -0000	1.104
@@ -1,6 +1,5 @@
 # package options
 %define with_tls	yes
-%define with_sasl1	no
 %define with_sasl2	yes
 %define with_milter	yes
 %define with_ldap	yes
@@ -15,11 +14,10 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
-Provides: MTA smtpdaemon server(smtp)
 Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz
 Source1: sendmail.init
 Source2: sendmail.nm-dispatcher
@@ -27,7 +25,6 @@ Source3: sendmail.etc-mail-make
 Source4: sendmail.sysconfig
 Source5: sendmail.etc-mail-Makefile
 Source6: sendmail-redhat.mc
-Source7: Sendmail-sasl1.conf
 Source8: sendmail.pam
 Source9: sendmail-8.12.5-newconfig.readme
 Source11: Sendmail-sasl2.conf
@@ -50,6 +47,9 @@ Patch14: sendmail-8.13.7-vacation.patch
 Patch15: sendmail-8.14.1-noversion.patch
 Patch16: sendmail-8.13.1-localdomain.patch
 Patch17: sendmail-8.14.3-sharedmilter.patch
+Patch18: sendmail-8.14.3-switchfile.patch
+Patch19: sendmail-8.14.3-exitpanic.patch
+Patch20: sendmail-8.14.3-milterfdleaks.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: db4-devel
@@ -57,6 +57,7 @@ BuildRequires: hesiod-devel
 BuildRequires: groff
 BuildRequires: ghostscript
 BuildRequires: m4
+Provides: MTA smtpdaemon server(smtp)
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
 Provides: %{_bindir}/rmail /usr/lib/sendmail
 Provides: %{_sysconfdir}/pam.d/smtp
@@ -65,22 +66,21 @@ Provides: %{_mandir}/man5/aliases.5.gz %
 Requires(pre): shadow-utils
 Requires(preun): %{_sbindir}/alternatives chkconfig
 Requires(post): %{_sbindir}/alternatives chkconfig coreutils
-Requires(postun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(postun): %{_sbindir}/alternatives coreutils
+Requires: initscripts
 Requires: procmail
 Requires: bash >= 2.0
 Requires: setup >= 2.5.31-1
 BuildRequires: setup >= 2.5.31-1
 %if "%{with_tls}" == "yes"
 BuildRequires: openssl-devel
-Requires: openssl
 %endif
-%if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes"
+%if "%{with_sasl2}" == "yes"
 BuildRequires: cyrus-sasl-devel openssl-devel
-Requires: %{_sbindir}/saslauthd openssl
+Requires: %{_sbindir}/saslauthd
 %endif
 %if "%{with_ldap}" == "yes"
 BuildRequires: openldap-devel openssl-devel
-Requires: openldap openssl
 %endif
 
 
@@ -98,13 +98,14 @@ Sendmail, you can install the sendmail-d
 %package doc
 Summary: Documentation about the Sendmail Mail Transport Agent program
 Group: Documentation
+BuildArch: noarch
 Requires: sendmail = %{version}-%{release}
 
 %description doc
 The sendmail-doc package contains documentation about the Sendmail
 Mail Transport Agent (MTA) program, including release notes, the
 Sendmail FAQ, and a few papers written about Sendmail. The papers are
-provided in PostScript(TM) and troff formats.
+provided in PDF and troff formats.
 
 %package devel
 Summary: Extra development include files and development files
@@ -120,6 +121,7 @@ of sendmail.
 Summary: The files needed to reconfigure Sendmail
 Group: System Environment/Daemons
 Requires: sendmail = %{version}-%{release}
+BuildArch: noarch
 Requires: m4
 
 %description cf
@@ -158,7 +160,11 @@ This package includes the milter shared 
 cp devtools/M4/UNIX/{,shared}library.m4
 %patch17 -p1 -b .sharedmilter
 
-for f in RELEASE_NOTES; do
+%patch18 -p1 -b .switchfile
+%patch19 -p1 -b .exitpanic
+%patch20 -p1 -b .milterfdleaks
+
+for f in RELEASE_NOTES contrib/etrn.0; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
 		touch -r ${f}{,_} && mv -f ${f}{_,}
 done
@@ -210,13 +216,6 @@ APPENDDEF(\`conf_sendmail_LIBS', \`-lssl
 EOF
 %endif
 
-%if "%{with_sasl1}" == "yes"
-cat >> redhat.config.m4 << EOF
-APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl
-APPENDDEF(\`confLIBS', \`-lsasl -lcrypto')dnl
-EOF
-%endif
-
 %if "%{with_sasl2}" == "yes"
 cat >> redhat.config.m4 << EOF
 APPENDDEF(\`confENVDEF', \`-DSASL=2')dnl
@@ -288,7 +287,7 @@ Make() {
 		LIBOWN=${nameuser} LIBGRP=${namegroup} \
 		GBINOWN=${nameuser} GBINGRP=${namegroup} \
 		CFOWN=${nameuser} CFGRP=${namegroup} \
-		MSPQOWN=${nameuser}
+		CFMODE=0644 MSPQOWN=${nameuser}
 }
 
 OBJDIR=obj.$(uname -s).$(uname -r).$(uname -m)
@@ -327,6 +326,7 @@ install -p -m 644 libmilter/README %{bui
 install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail-%{version}/README.cf
 install -m 644 %{SOURCE9} %{buildroot}%{_docdir}/sendmail-%{version}/README.redhat
 install -p -m 644 contrib/* %{buildroot}%{_docdir}/sendmail-%{version}/contrib
+sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|' %{buildroot}%{_docdir}/sendmail-%{version}/contrib/*.pl
 
 # install the cf files for the sendmail-cf package.
 cp -ar cf/* %{buildroot}%{sendmailcf}
@@ -375,14 +375,12 @@ install -p -m 755 %{SOURCE2} %{buildroot
 install -p -m 755 %{SOURCE3} %{buildroot}%{maildir}/make
 install -p -m 644 %{SOURCE5} %{buildroot}%{maildir}/Makefile
 
+chmod 644 %{buildroot}%{maildir}/helpfile
+
 # fix permissions to allow debuginfo extraction and stripping
 chmod 755 %{buildroot}%{_sbindir}/{mailstats,makemap,praliases,sendmail,smrsh}
 chmod 755 %{buildroot}%{_bindir}/rmail
 
-%if "%{with_sasl1}" == "yes"
-install -m 755 -d %{buildroot}%{_libdir}/sasl
-install -m 644 %{SOURCE7} %{buildroot}%{_libdir}/sasl/Sendmail.conf
-%endif
 %if "%{with_sasl2}" == "yes"
 install -m 755 -d %{buildroot}%{_libdir}/sasl2
 install -m 644 %{SOURCE11} %{buildroot}%{_libdir}/sasl2/Sendmail.conf
@@ -518,7 +516,7 @@ exit 0
 %ghost %{maildir}/domaintable.db
 %ghost %{maildir}/mailertable.db
 
-%attr(0755,root,root) %{_initrddir}/sendmail
+%{_initrddir}/sendmail
 %config(noreplace) %{_sysconfdir}/sysconfig/sendmail
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.sendmail
 %{_sysconfdir}/NetworkManager/dispatcher.d/10-sendmail
@@ -566,6 +564,14 @@ exit 0
 
 
 %changelog
+* Tue Dec 15 2009 Miroslav Lichvar <mlichvar at redhat.com> 8.14.3-9
+- fix milter file descriptors leaks (#485426)
+- skip colon separator when parsing service name in ServiceSwitchFile
+- return with non-zero exit code when free space is below MinFreeBlocks
+- fix service stop/restart when only smclient is running
+- fix submit.cf and helpfile permissions
+- more merge review fixes (#226407)
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 8.14.3-8
 - Use password-auth common PAM configuration instead of system-auth
 
@@ -970,7 +976,7 @@ exit 0
 
 * Mon Jan 13 2003 Florian La Roche <Florian.LaRoche at redhat.de>
 - do not reject all numeric login names if hesiod support is
-  compiled in.   #80060
+  compiled in. #80060
 - remove reference to non-existing man-pages #74552
 
 * Sun Jan 12 2003 Florian La Roche <Florian.LaRoche at redhat.de>
@@ -1075,7 +1081,7 @@ exit 0
 - add sendmail/SECURITY as docu #61870, #61545
 
 * Wed Mar 20 2002 Florian La Roche <Florian.LaRoche at redhat.de>
-- add libsm.a    #61270
+- add libsm.a #61270
 - change from /etc/sendmail.cf to /etc/mail/sendmail.cf
 - add milter patch
 


--- Sendmail-sasl1.conf DELETED ---



From dsommers at fedoraproject.org  Tue Dec 15 14:43:41 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Tue, 15 Dec 2009 14:43:41 +0000 (UTC)
Subject: rpms/python-dmidecode/F-12 import.log, 1.2,
	1.3 python-dmidecode.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091215144341.5997711C00E7@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29315/F-12

Modified Files:
	import.log python-dmidecode.spec sources 
Log Message:
Updated to the correct 3.10.8 version, release set to 2.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	14 Dec 2009 14:17:45 -0000	1.2
+++ import.log	15 Dec 2009 14:43:41 -0000	1.3
@@ -1,2 +1,3 @@
 python-dmidecode-3_10_7-3_fc11:F-12:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737718
 python-dmidecode-3_10_8-1_fc11:F-12:python-dmidecode-3.10.8-1.fc11.src.rpm:1260800218
+python-dmidecode-3_10_8-2_fc13:F-12:python-dmidecode-3.10.8-2.fc13.src.rpm:1260888119


Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/python-dmidecode.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-dmidecode.spec	14 Dec 2009 14:17:45 -0000	1.2
+++ python-dmidecode.spec	15 Dec 2009 14:43:41 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Python module to access DMI data
 Name: python-dmidecode
 Version: 3.10.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://projects.autonomy.net.au/python-dmidecode/
@@ -49,6 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/python-dmidecode/
 
 %changelog
+
+* Thu Dec 15 2009 Nima Talebi <nima at it.net.au> - 3.10.8-1
+- New Upstream release.
+- Big-endian and little-endian approved.
+- Packaged unit-test to tarball.
+- Rewritten unit-test to be able to run as non-root user, where it will not
+  try to read /dev/mem.
+- Added two dmidump data files to the unit-test.
+
 * Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
 - Fixed even more .spec file issues and removed explicit mentioning
   of /usr/share/python-dmidecode/pymap.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Dec 2009 14:17:45 -0000	1.3
+++ sources	15 Dec 2009 14:43:41 -0000	1.4
@@ -1 +1 @@
-a2bc1cf271c908478dbecf119649c075  python-dmidecode-3.10.8.tar.gz
+59356791cb6e48d5057f5110eae1a2b0  python-dmidecode-3.10.8.tar.gz



From dsommers at fedoraproject.org  Tue Dec 15 14:44:24 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Tue, 15 Dec 2009 14:44:24 +0000 (UTC)
Subject: rpms/python-dmidecode/EL-4 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-dmidecode.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091215144424.9242611C00E7@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29620/EL-4

Modified Files:
	.cvsignore import.log python-dmidecode.spec sources 
Log Message:
Updated to the correct 3.10.8 version, release set to 2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Dec 2009 07:10:33 -0000	1.2
+++ .cvsignore	15 Dec 2009 14:44:24 -0000	1.3
@@ -1 +1 @@
-python-dmidecode-3.10.7.tar.gz
+python-dmidecode-3.10.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Dec 2009 07:10:34 -0000	1.1
+++ import.log	15 Dec 2009 14:44:24 -0000	1.2
@@ -1 +1,2 @@
 python-dmidecode-3_10_7-3_fc11:EL-4:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737799
+python-dmidecode-3_10_8-2_fc13:EL-4:python-dmidecode-3.10.8-2.fc13.src.rpm:1260888245


Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-4/python-dmidecode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-dmidecode.spec	2 Dec 2009 07:10:34 -0000	1.1
+++ python-dmidecode.spec	15 Dec 2009 14:44:24 -0000	1.2
@@ -3,8 +3,8 @@
 
 Summary: Python module to access DMI data
 Name: python-dmidecode
-Version: 3.10.7
-Release: 3%{?dist}
+Version: 3.10.8
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://projects.autonomy.net.au/python-dmidecode/
@@ -25,6 +25,9 @@ as python data structures or as XML data
 
 %build
 make build
+cd unit-tests
+make
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,6 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/python-dmidecode/
 
 %changelog
+
+* Thu Dec 15 2009 Nima Talebi <nima at it.net.au> - 3.10.8-1
+- New Upstream release.
+- Big-endian and little-endian approved.
+- Packaged unit-test to tarball.
+- Rewritten unit-test to be able to run as non-root user, where it will not
+  try to read /dev/mem.
+- Added two dmidump data files to the unit-test.
+
 * Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
 - Fixed even more .spec file issues and removed explicit mentioning
   of /usr/share/python-dmidecode/pymap.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Dec 2009 07:10:34 -0000	1.2
+++ sources	15 Dec 2009 14:44:24 -0000	1.3
@@ -1 +1 @@
-22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz
+59356791cb6e48d5057f5110eae1a2b0  python-dmidecode-3.10.8.tar.gz



From dsommers at fedoraproject.org  Tue Dec 15 14:44:58 2009
From: dsommers at fedoraproject.org (dsommers)
Date: Tue, 15 Dec 2009 14:44:58 +0000 (UTC)
Subject: rpms/python-dmidecode/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-dmidecode.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091215144458.762BD11C00E7@cvs1.fedora.phx.redhat.com>

Author: dsommers

Update of /cvs/pkgs/rpms/python-dmidecode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29985/EL-5

Modified Files:
	.cvsignore import.log python-dmidecode.spec sources 
Log Message:
Updated to the correct 3.10.8 version, release set to 2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Dec 2009 07:11:38 -0000	1.2
+++ .cvsignore	15 Dec 2009 14:44:58 -0000	1.3
@@ -1 +1 @@
-python-dmidecode-3.10.7.tar.gz
+python-dmidecode-3.10.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Dec 2009 07:11:38 -0000	1.1
+++ import.log	15 Dec 2009 14:44:58 -0000	1.2
@@ -1 +1,2 @@
 python-dmidecode-3_10_7-3_fc11:EL-5:python-dmidecode-3.10.7-3.fc11.src.rpm:1259737874
+python-dmidecode-3_10_8-2_fc13:EL-5:python-dmidecode-3.10.8-2.fc13.src.rpm:1260888284


Index: python-dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-5/python-dmidecode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-dmidecode.spec	2 Dec 2009 07:11:38 -0000	1.1
+++ python-dmidecode.spec	15 Dec 2009 14:44:58 -0000	1.2
@@ -3,8 +3,8 @@
 
 Summary: Python module to access DMI data
 Name: python-dmidecode
-Version: 3.10.7
-Release: 3%{?dist}
+Version: 3.10.8
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://projects.autonomy.net.au/python-dmidecode/
@@ -25,6 +25,9 @@ as python data structures or as XML data
 
 %build
 make build
+cd unit-tests
+make
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,6 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/python-dmidecode/
 
 %changelog
+
+* Thu Dec 15 2009 Nima Talebi <nima at it.net.au> - 3.10.8-1
+- New Upstream release.
+- Big-endian and little-endian approved.
+- Packaged unit-test to tarball.
+- Rewritten unit-test to be able to run as non-root user, where it will not
+  try to read /dev/mem.
+- Added two dmidump data files to the unit-test.
+
 * Thu Nov 26 2009 David Sommerseth <davids at redhat.com> - 3.10.7-3
 - Fixed even more .spec file issues and removed explicit mentioning
   of /usr/share/python-dmidecode/pymap.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-dmidecode/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Dec 2009 07:11:38 -0000	1.2
+++ sources	15 Dec 2009 14:44:58 -0000	1.3
@@ -1 +1 @@
-22ee3707930451632307f83e4e33942b  python-dmidecode-3.10.7.tar.gz
+59356791cb6e48d5057f5110eae1a2b0  python-dmidecode-3.10.8.tar.gz



From hguemar at fedoraproject.org  Tue Dec 15 14:45:08 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 15 Dec 2009 14:45:08 +0000 (UTC)
Subject: rpms/python-kiwi/F-12 kiwi-distutils.patch, NONE, 1.1 .cvsignore,
	1.15, 1.16 python-kiwi.spec, 1.22, 1.23 sources, 1.15, 1.16
Message-ID: <20091215144508.D39B411C00E7@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/pkgs/rpms/python-kiwi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30258

Modified Files:
	.cvsignore python-kiwi.spec sources 
Added Files:
	kiwi-distutils.patch 
Log Message:
upstream 1.9.26 and patch fixing installation to site-packages instead of dist-packages

kiwi-distutils.patch:
 dist.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE kiwi-distutils.patch ---
--- kiwi-1.9.26/kiwi/dist.py.orig	2009-12-14 23:37:15.000000000 +0100
+++ kiwi-1.9.26/kiwi/dist.py	2009-12-14 23:41:53.000000000 +0100
@@ -156,14 +156,10 @@ def get_site_packages_dir(*dirs):
 
     @param dirs: directory names to be appended
     """
-    python_version = sys.version_info[:2]
+
     libdir = get_python_lib(plat_specific=False,
                             standard_lib=True, prefix='')
-    if python_version < (2, 6):
-        site = 'site-packages'
-    else:
-        site = 'dist-packages'
-    return os.path.join(libdir, site, *dirs)
+    return os.path.join(libdir, 'site-packages', *dirs)
 
 def listfiles(*dirs):
     """


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Aug 2009 19:27:48 -0000	1.15
+++ .cvsignore	15 Dec 2009 14:45:08 -0000	1.16
@@ -1 +1 @@
-kiwi-1.9.25.tar.bz2
+kiwi-1.9.26.tar.bz2


Index: python-kiwi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-12/python-kiwi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-kiwi.spec	12 Aug 2009 19:27:48 -0000	1.22
+++ python-kiwi.spec	15 Dec 2009 14:45:08 -0000	1.23
@@ -2,14 +2,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-kiwi
-Version:        1.9.25
-Release:        3%{?dist}
+Version:        1.9.26
+Release:        1%{?dist}
 Summary:        Framework for Python GUI applications
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.async.com.br/projects/kiwi/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-%{version}.tar.bz2
+# fix kiwi custom distutils to conform python packaging guidelines
+Patch0:		kiwi-distutils.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -48,7 +50,7 @@ useful for reference when writing softwa
 %prep
 %setup -q -n kiwi-%{version}
 sed -i -e 's|share/doc/kiwi|share/doc/%{name}-%{version}|' setup.py
-
+%patch0 -p1 -b .distutils
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -94,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.9.26-1
+- Upstream 1.9.26
+- Fix kiwi custom distutils to conform fedora python packaging guidelines.
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.9.25-3
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Aug 2009 19:27:48 -0000	1.15
+++ sources	15 Dec 2009 14:45:08 -0000	1.16
@@ -1 +1 @@
-9cc66b79a5991c28a88d7991f6694dbc  kiwi-1.9.25.tar.bz2
+43c2aab9acf8d95321ee1ccec2c5e4e4  kiwi-1.9.26.tar.bz2



From mlichvar at fedoraproject.org  Tue Dec 15 14:46:09 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 15 Dec 2009 14:46:09 +0000 (UTC)
Subject: rpms/sendmail/F-12 sendmail-8.14.3-exitpanic.patch, NONE,
	1.1 sendmail-8.14.3-milterfdleaks.patch, NONE,
	1.1 sendmail-8.14.3-switchfile.patch, NONE, 1.1 sendmail.init,
	1.20, 1.21 sendmail.spec, 1.103, 1.104 Sendmail-sasl1.conf, 1.1, NONE
Message-ID: <20091215144609.5569611C00E7@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/sendmail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30528

Modified Files:
	sendmail.init sendmail.spec 
Added Files:
	sendmail-8.14.3-exitpanic.patch 
	sendmail-8.14.3-milterfdleaks.patch 
	sendmail-8.14.3-switchfile.patch 
Removed Files:
	Sendmail-sasl1.conf 
Log Message:
- fix milter file descriptors leaks (#485426)
- skip colon separator when parsing service name in ServiceSwitchFile
- return with non-zero exit code when free space is below MinFreeBlocks
- fix service stop/restart when only smclient is running
- fix submit.cf and helpfile permissions
- more merge review fixes (#226407)


sendmail-8.14.3-exitpanic.patch:
 envelope.c |    8 +++++---
 main.c     |    4 +++-
 sendmail.h |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE sendmail-8.14.3-exitpanic.patch ---
diff -up sendmail-8.14.3/sendmail/envelope.c.exitpanic sendmail-8.14.3/sendmail/envelope.c
--- sendmail-8.14.3/sendmail/envelope.c.exitpanic	2008-03-31 18:32:13.000000000 +0200
+++ sendmail-8.14.3/sendmail/envelope.c	2009-12-15 13:55:52.000000000 +0100
@@ -163,14 +163,14 @@ newenvelope(e, parent, rpool)
 **		split -- if true, split by recipient if message is queued up
 **
 **	Returns:
-**		none.
+**		true if savemail panic'ed.
 **
 **	Side Effects:
 **		housekeeping necessary to dispose of an envelope.
 **		Unlocks this queue file.
 */
 
-void
+bool
 dropenvelope(e, fulldrop, split)
 	register ENVELOPE *e;
 	bool fulldrop;
@@ -209,7 +209,7 @@ dropenvelope(e, fulldrop, split)
 
 	/* we must have an id to remove disk files */
 	if (id == NULL)
-		return;
+		return panic;
 
 	/* if verify-only mode, we can skip most of this */
 	if (OpMode == MD_VERIFY)
@@ -618,6 +618,8 @@ simpledrop:
 	}
 	e->e_id = NULL;
 	e->e_flags &= ~EF_HAS_DF;
+
+	return panic;
 }
 /*
 **  CLEARENVELOPE -- clear an envelope without unlocking
diff -up sendmail-8.14.3/sendmail/main.c.exitpanic sendmail-8.14.3/sendmail/main.c
--- sendmail-8.14.3/sendmail/main.c.exitpanic	2008-03-31 18:32:13.000000000 +0200
+++ sendmail-8.14.3/sendmail/main.c	2009-12-15 13:55:52.000000000 +0100
@@ -2952,7 +2952,9 @@ finis(drop, cleanup, exitstat)
 		{
 			if (CurEnv->e_id != NULL)
 			{
-				dropenvelope(CurEnv, true, false);
+				if (dropenvelope(CurEnv, true, false))
+					/* exit with OS error if savemail panic'ed */
+					exitstat = EX_OSERR;
 				sm_rpool_free(CurEnv->e_rpool);
 				CurEnv->e_rpool = NULL;
 
diff -up sendmail-8.14.3/sendmail/sendmail.h.exitpanic sendmail-8.14.3/sendmail/sendmail.h
--- sendmail-8.14.3/sendmail/sendmail.h.exitpanic	2008-02-16 00:19:58.000000000 +0100
+++ sendmail-8.14.3/sendmail/sendmail.h	2009-12-15 13:55:52.000000000 +0100
@@ -982,7 +982,7 @@ extern ENVELOPE	BlankEnvelope;
 
 /* functions */
 extern void	clearenvelope __P((ENVELOPE *, bool, SM_RPOOL_T *));
-extern void	dropenvelope __P((ENVELOPE *, bool, bool));
+extern bool	dropenvelope __P((ENVELOPE *, bool, bool));
 extern ENVELOPE	*newenvelope __P((ENVELOPE *, ENVELOPE *, SM_RPOOL_T *));
 extern void	clrsessenvelope __P((ENVELOPE *));
 extern void	printenvflags __P((ENVELOPE *));

sendmail-8.14.3-milterfdleaks.patch:
 libmilter/listener.c |   14 ++++++++++++++
 sendmail/milter.c    |   19 +++++++++++++++++++
 2 files changed, 33 insertions(+)

--- NEW FILE sendmail-8.14.3-milterfdleaks.patch ---
Patches by Paul Howarth
https://bugzilla.redhat.com/show_bug.cgi?id=485426

--- sendmail-8.14.3/sendmail/milter.c	2008-09-19 15:51:03.000000000 +0100
+++ sendmail-8.14.3/sendmail/milter.c	2008-09-19 16:37:57.000000000 +0100
@@ -30,6 +30,9 @@
 
 # include <sm/fdset.h>
 
+# include <unistd.h>
+# include <fcntl.h>
+
 static void	milter_connect_timeout __P((int));
 static void	milter_error __P((struct milter *, ENVELOPE *));
 static int	milter_open __P((struct milter *, bool, ENVELOPE *));
@@ -650,6 +653,7 @@
 	SOCKADDR_LEN_T addrlen = 0;
 	int addrno = 0;
 	int save_errno;
+	int fdflags;
 	char *p;
 	char *colon;
 	char *at;
@@ -1186,6 +1190,21 @@
 			   (char *)&nodelay, sizeof(nodelay));
 	}
 # endif /* MILTER_NO_NAGLE && !defined(TCP_CORK) */
+
+	/*
+	** Need to set close-on-exec for sock to prevent it
+	** leaking to the local delivery process
+	*/
+	if ((fdflags = fcntl(sock, F_GETFD, 0)) == -1 ||
+	    fcntl(sock, F_SETFD, fdflags | FD_CLOEXEC) == -1)
+	{
+		save_errno = errno;
+		if (MilterLogLevel > 0)
+			sm_syslog(LOG_WARNING, e->e_id,
+				"Milter (%s): Unable to set close-on-exec on sock (%s)",
+					m->mf_name, sm_errstring(save_errno = errno));
+	}
+
 	return sock;
 }
 
--- sendmail-8.14.3/libmilter/listener.c	2007-04-23 23:22:50.000000000 +0100
+++ sendmail-8.14.3/libmilter/listener.c	2008-06-18 16:36:38.000000000 +0100
@@ -728,6 +728,7 @@
 	int acnt = 0;	/* error count for accept() failures */
 	int scnt = 0;	/* error count for select() failures */
 	int save_errno = 0;
+	int fdflags;
 #if !_FFR_WORKERS_POOL
 	sthread_t thread_id;
 #endif /* !_FFR_WORKERS_POOL */
@@ -807,6 +808,19 @@
 		(void) smutex_unlock(&L_Mutex);
 
 		/*
+		** Need to set close-on-exec for connfd in case a user's
+		** filter starts other applications
+		*/
+		if ((fdflags = fcntl(connfd, F_GETFD, 0)) == -1 ||
+		    fcntl(connfd, F_SETFD, fdflags | FD_CLOEXEC) == -1)
+		{
+			smi_log(SMI_LOG_WARN,
+				"%s: Unable to set close-on-exec on connfd (%s)",
+				smfi->xxfi_name, sm_errstring(errno));
+			/* XXX: continue? */
+		}
+
+		/*
 		**  If remote side closes before accept() finishes,
 		**  sockaddr might not be fully filled in.
 		*/

sendmail-8.14.3-switchfile.patch:
 conf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sendmail-8.14.3-switchfile.patch ---
diff -up sendmail-8.14.3/sendmail/conf.c.switchfile sendmail-8.14.3/sendmail/conf.c
--- sendmail-8.14.3/sendmail/conf.c.switchfile	2008-04-14 04:09:35.000000000 +0200
+++ sendmail-8.14.3/sendmail/conf.c	2009-12-15 13:32:55.000000000 +0100
@@ -968,7 +968,7 @@ switch_map_find(service, maptype, mapret
 				p = strpbrk(buf, "#\n");
 				if (p != NULL)
 					*p = '\0';
-				p = strpbrk(buf, " \t");
+				p = strpbrk(buf, " \t:");
 				if (p != NULL)
 					*p++ = '\0';
 				if (buf[0] == '\0')


Index: sendmail.init
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/F-12/sendmail.init,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sendmail.init	19 Dec 2008 13:23:41 -0000	1.20
+++ sendmail.init	15 Dec 2009 14:46:09 -0000	1.21
@@ -116,7 +116,7 @@ stop() {
     return $RETVAL
 }
 
-status -p /var/run/sendmail.pid >/dev/null && status -p /var/run/sm-client.pid >/dev/null
+status -p /var/run/sendmail.pid >/dev/null || status -p /var/run/sm-client.pid >/dev/null
 running=$?
 
 # See how we were called.


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/F-12/sendmail.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sendmail.spec	16 Sep 2009 18:48:51 -0000	1.103
+++ sendmail.spec	15 Dec 2009 14:46:09 -0000	1.104
@@ -1,6 +1,5 @@
 # package options
 %define with_tls	yes
-%define with_sasl1	no
 %define with_sasl2	yes
 %define with_milter	yes
 %define with_ldap	yes
@@ -15,11 +14,10 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
-Provides: MTA smtpdaemon server(smtp)
 Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz
 Source1: sendmail.init
 Source2: sendmail.nm-dispatcher
@@ -27,7 +25,6 @@ Source3: sendmail.etc-mail-make
 Source4: sendmail.sysconfig
 Source5: sendmail.etc-mail-Makefile
 Source6: sendmail-redhat.mc
-Source7: Sendmail-sasl1.conf
 Source8: sendmail.pam
 Source9: sendmail-8.12.5-newconfig.readme
 Source11: Sendmail-sasl2.conf
@@ -50,6 +47,9 @@ Patch14: sendmail-8.13.7-vacation.patch
 Patch15: sendmail-8.14.1-noversion.patch
 Patch16: sendmail-8.13.1-localdomain.patch
 Patch17: sendmail-8.14.3-sharedmilter.patch
+Patch18: sendmail-8.14.3-switchfile.patch
+Patch19: sendmail-8.14.3-exitpanic.patch
+Patch20: sendmail-8.14.3-milterfdleaks.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: db4-devel
@@ -57,6 +57,7 @@ BuildRequires: hesiod-devel
 BuildRequires: groff
 BuildRequires: ghostscript
 BuildRequires: m4
+Provides: MTA smtpdaemon server(smtp)
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
 Provides: %{_bindir}/rmail /usr/lib/sendmail
 Provides: %{_sysconfdir}/pam.d/smtp
@@ -65,22 +66,21 @@ Provides: %{_mandir}/man5/aliases.5.gz %
 Requires(pre): shadow-utils
 Requires(preun): %{_sbindir}/alternatives chkconfig
 Requires(post): %{_sbindir}/alternatives chkconfig coreutils
-Requires(postun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(postun): %{_sbindir}/alternatives coreutils
+Requires: initscripts
 Requires: procmail
 Requires: bash >= 2.0
 Requires: setup >= 2.5.31-1
 BuildRequires: setup >= 2.5.31-1
 %if "%{with_tls}" == "yes"
 BuildRequires: openssl-devel
-Requires: openssl
 %endif
-%if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes"
+%if "%{with_sasl2}" == "yes"
 BuildRequires: cyrus-sasl-devel openssl-devel
-Requires: %{_sbindir}/saslauthd openssl
+Requires: %{_sbindir}/saslauthd
 %endif
 %if "%{with_ldap}" == "yes"
 BuildRequires: openldap-devel openssl-devel
-Requires: openldap openssl
 %endif
 
 
@@ -98,13 +98,14 @@ Sendmail, you can install the sendmail-d
 %package doc
 Summary: Documentation about the Sendmail Mail Transport Agent program
 Group: Documentation
+BuildArch: noarch
 Requires: sendmail = %{version}-%{release}
 
 %description doc
 The sendmail-doc package contains documentation about the Sendmail
 Mail Transport Agent (MTA) program, including release notes, the
 Sendmail FAQ, and a few papers written about Sendmail. The papers are
-provided in PostScript(TM) and troff formats.
+provided in PDF and troff formats.
 
 %package devel
 Summary: Extra development include files and development files
@@ -120,6 +121,7 @@ of sendmail.
 Summary: The files needed to reconfigure Sendmail
 Group: System Environment/Daemons
 Requires: sendmail = %{version}-%{release}
+BuildArch: noarch
 Requires: m4
 
 %description cf
@@ -158,7 +160,11 @@ This package includes the milter shared 
 cp devtools/M4/UNIX/{,shared}library.m4
 %patch17 -p1 -b .sharedmilter
 
-for f in RELEASE_NOTES; do
+%patch18 -p1 -b .switchfile
+%patch19 -p1 -b .exitpanic
+%patch20 -p1 -b .milterfdleaks
+
+for f in RELEASE_NOTES contrib/etrn.0; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
 		touch -r ${f}{,_} && mv -f ${f}{_,}
 done
@@ -210,13 +216,6 @@ APPENDDEF(\`conf_sendmail_LIBS', \`-lssl
 EOF
 %endif
 
-%if "%{with_sasl1}" == "yes"
-cat >> redhat.config.m4 << EOF
-APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl
-APPENDDEF(\`confLIBS', \`-lsasl -lcrypto')dnl
-EOF
-%endif
-
 %if "%{with_sasl2}" == "yes"
 cat >> redhat.config.m4 << EOF
 APPENDDEF(\`confENVDEF', \`-DSASL=2')dnl
@@ -288,7 +287,7 @@ Make() {
 		LIBOWN=${nameuser} LIBGRP=${namegroup} \
 		GBINOWN=${nameuser} GBINGRP=${namegroup} \
 		CFOWN=${nameuser} CFGRP=${namegroup} \
-		MSPQOWN=${nameuser}
+		CFMODE=0644 MSPQOWN=${nameuser}
 }
 
 OBJDIR=obj.$(uname -s).$(uname -r).$(uname -m)
@@ -327,6 +326,7 @@ install -p -m 644 libmilter/README %{bui
 install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail-%{version}/README.cf
 install -m 644 %{SOURCE9} %{buildroot}%{_docdir}/sendmail-%{version}/README.redhat
 install -p -m 644 contrib/* %{buildroot}%{_docdir}/sendmail-%{version}/contrib
+sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|' %{buildroot}%{_docdir}/sendmail-%{version}/contrib/*.pl
 
 # install the cf files for the sendmail-cf package.
 cp -ar cf/* %{buildroot}%{sendmailcf}
@@ -375,14 +375,12 @@ install -p -m 755 %{SOURCE2} %{buildroot
 install -p -m 755 %{SOURCE3} %{buildroot}%{maildir}/make
 install -p -m 644 %{SOURCE5} %{buildroot}%{maildir}/Makefile
 
+chmod 644 %{buildroot}%{maildir}/helpfile
+
 # fix permissions to allow debuginfo extraction and stripping
 chmod 755 %{buildroot}%{_sbindir}/{mailstats,makemap,praliases,sendmail,smrsh}
 chmod 755 %{buildroot}%{_bindir}/rmail
 
-%if "%{with_sasl1}" == "yes"
-install -m 755 -d %{buildroot}%{_libdir}/sasl
-install -m 644 %{SOURCE7} %{buildroot}%{_libdir}/sasl/Sendmail.conf
-%endif
 %if "%{with_sasl2}" == "yes"
 install -m 755 -d %{buildroot}%{_libdir}/sasl2
 install -m 644 %{SOURCE11} %{buildroot}%{_libdir}/sasl2/Sendmail.conf
@@ -518,7 +516,7 @@ exit 0
 %ghost %{maildir}/domaintable.db
 %ghost %{maildir}/mailertable.db
 
-%attr(0755,root,root) %{_initrddir}/sendmail
+%{_initrddir}/sendmail
 %config(noreplace) %{_sysconfdir}/sysconfig/sendmail
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.sendmail
 %{_sysconfdir}/NetworkManager/dispatcher.d/10-sendmail
@@ -566,6 +564,14 @@ exit 0
 
 
 %changelog
+* Tue Dec 15 2009 Miroslav Lichvar <mlichvar at redhat.com> 8.14.3-9
+- fix milter file descriptors leaks (#485426)
+- skip colon separator when parsing service name in ServiceSwitchFile
+- return with non-zero exit code when free space is below MinFreeBlocks
+- fix service stop/restart when only smclient is running
+- fix submit.cf and helpfile permissions
+- more merge review fixes (#226407)
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 8.14.3-8
 - Use password-auth common PAM configuration instead of system-auth
 
@@ -970,7 +976,7 @@ exit 0
 
 * Mon Jan 13 2003 Florian La Roche <Florian.LaRoche at redhat.de>
 - do not reject all numeric login names if hesiod support is
-  compiled in.   #80060
+  compiled in. #80060
 - remove reference to non-existing man-pages #74552
 
 * Sun Jan 12 2003 Florian La Roche <Florian.LaRoche at redhat.de>
@@ -1075,7 +1081,7 @@ exit 0
 - add sendmail/SECURITY as docu #61870, #61545
 
 * Wed Mar 20 2002 Florian La Roche <Florian.LaRoche at redhat.de>
-- add libsm.a    #61270
+- add libsm.a #61270
 - change from /etc/sendmail.cf to /etc/mail/sendmail.cf
 - add milter patch
 


--- Sendmail-sasl1.conf DELETED ---



From simo at fedoraproject.org  Tue Dec 15 14:48:02 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 15 Dec 2009 14:48:02 +0000 (UTC)
Subject: File talloc-2.0.1.tar.gz uploaded to lookaside cache by simo
Message-ID: <20091215144802.B0AFB28ED3B@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libtalloc:

c6e736540145ca58cb3dcb42f91cf57b  talloc-2.0.1.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:09 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145212.560D128ECD1@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora devel) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:16 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145217.E490328ECD1@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora EPEL 4) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:19 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145221.3108728ED50@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora 7) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:27 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145230.4D6C328ED4E@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora 3) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:29 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145231.6546028ECCD@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora 4) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:32 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145235.2BDE628ED58@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora 8) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:35 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145238.1DFED28ED5E@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora 9) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:43 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145246.CD9E528ED4D@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora 10) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:46 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145248.3FA3628ED5A@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora 12) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Tue Dec 15 14:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 14:52:52 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20091215145254.5BA4528ECAC@bastion3.fedora.phx2.redhat.com>

ausil has set the watchcommits acl on icu (Fedora 11) to Obsolete for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/icu



From simo at fedoraproject.org  Tue Dec 15 14:55:45 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 15 Dec 2009 14:55:45 +0000 (UTC)
Subject: rpms/libtalloc/devel .cvsignore, 1.4, 1.5 libtalloc.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091215145545.3F62411C00E7@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtalloc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32549

Modified Files:
	.cvsignore libtalloc.spec sources 
Log Message:
* Tue Dec 15 2009 Simo Sorce <ssorce at redhat.com> - 2.0.1-1
- New version from upstream
- Also stop building the compat lib, it is not necessary anymore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Sep 2009 20:04:31 -0000	1.4
+++ .cvsignore	15 Dec 2009 14:55:44 -0000	1.5
@@ -1 +1 @@
-talloc-2.0.0.tar.gz
+talloc-2.0.1.tar.gz


Index: libtalloc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/devel/libtalloc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libtalloc.spec	16 Sep 2009 13:59:21 -0000	1.6
+++ libtalloc.spec	15 Dec 2009 14:55:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name: libtalloc
-Version: 2.0.0
-Release: 0%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 Group: System Environment/Daemons
 Summary: The talloc library
 License: LGPLv3+
@@ -28,7 +28,8 @@ Header files needed to develop programs 
 
 %build
 ./autogen.sh
-%configure --enable-talloc-compat1
+#%configure --enable-talloc-compat1
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -40,7 +41,7 @@ ln -s libtalloc.so.%{version} $RPM_BUILD
 ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
 
 #Compatibility library
-ln -s libtalloc-compat1-2.0.0.so $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
+#ln -s libtalloc-compat1-2.0.0.so $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.a
 rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i
@@ -52,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libtalloc.so.*
-%{_libdir}/libtalloc-compat1-2.0.0.so
+#%{_libdir}/libtalloc-compat1-2.0.0.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -68,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 15 2009 Simo Sorce <ssorce at redhat.com> - 2.0.1-1
+- New version from upstream
+- Also stop building the compat lib, it is not necessary anymore
+
 * Tue Sep  8 2009 Simo Sorce <ssorce at redhat.com> - 2.0.0-0
 - New version from upstream.
 - Build also sover 1 compat library to ease packages migration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtalloc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Sep 2009 20:04:31 -0000	1.5
+++ sources	15 Dec 2009 14:55:45 -0000	1.6
@@ -1 +1 @@
-edbaa660074c806a42a45b2f4569eed4  talloc-2.0.0.tar.gz
+c6e736540145ca58cb3dcb42f91cf57b  talloc-2.0.1.tar.gz



From mccann at fedoraproject.org  Tue Dec 15 14:55:48 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Tue, 15 Dec 2009 14:55:48 +0000 (UTC)
Subject: rpms/gnome-desktop/F-12 gnome-desktop.spec, 1.233,
	1.234 per-monitor-background.patch, 1.2, 1.3
Message-ID: <20091215145548.8A51311C00E7@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/gnome-desktop/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32516

Modified Files:
	gnome-desktop.spec per-monitor-background.patch 
Log Message:
- Better per-monitor backgrounds patch (gnome #147808)




Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/gnome-desktop.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- gnome-desktop.spec	10 Dec 2009 22:42:20 -0000	1.233
+++ gnome-desktop.spec	15 Dec 2009 14:55:47 -0000	1.234
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.28.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Sun Dec 13 2009 Jon McCann <jmccann at redhat.com> - 2.28.1-7
+- Better per-monitor backgrounds patch (gnome #147808)
+
 * Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.28.1-6
 - Update per-monitor backgrounds patch (gnome #147808)
 

per-monitor-background.patch:
 gnome-bg.c            |  535 +++++++++++++++++++++++++++++++-------------------
 libgnomeui/gnome-bg.h |   12 -
 2 files changed, 341 insertions(+), 206 deletions(-)

Index: per-monitor-background.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/per-monitor-background.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- per-monitor-background.patch	10 Dec 2009 22:42:20 -0000	1.2
+++ per-monitor-background.patch	15 Dec 2009 14:55:48 -0000	1.3
@@ -1,19 +1,24 @@
-From 84657b9565dc5a70d709d2746def73efa0c7cf13 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann at redhat.com>
-Date: Sun, 8 Nov 2009 15:56:23 -0500
-Subject: [PATCH] Per monitors backgrounds support
-
-https://bugzilla.gnome.org/show_bug.cgi?id=147808
----
- libgnome-desktop/gnome-bg.c            |  251 ++++++++++++++++++++------------
- libgnome-desktop/libgnomeui/gnome-bg.h |   11 +-
- 2 files changed, 164 insertions(+), 98 deletions(-)
-
 diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
-index a882551..c584147 100644
+index a882551..a539e06 100644
 --- a/libgnome-desktop/gnome-bg.c
 +++ b/libgnome-desktop/gnome-bg.c
-@@ -168,7 +168,9 @@ static gboolean   get_thumb_annotations (GdkPixbuf             *thumb,
+@@ -144,10 +144,11 @@ static GdkPixbuf *pixbuf_scale_to_fit  (GdkPixbuf  *src,
+ static GdkPixbuf *pixbuf_scale_to_min  (GdkPixbuf  *src,
+ 					int         min_width,
+ 					int         min_height);
+-static void       pixbuf_draw_gradient (GdkPixbuf  *pixbuf,
+-					gboolean    horizontal,
+-					GdkColor   *c1,
+-					GdkColor   *c2);
++static void       pixbuf_draw_gradient (GdkPixbuf    *pixbuf,
++					gboolean      horizontal,
++					GdkColor     *c1,
++					GdkColor     *c2,
++					GdkRectangle *rect);
+ static void       pixbuf_tile          (GdkPixbuf  *src,
+ 					GdkPixbuf  *dest);
+ static void       pixbuf_blend         (GdkPixbuf  *src,
+@@ -168,7 +169,9 @@ static gboolean   get_thumb_annotations (GdkPixbuf             *thumb,
  					 int                   *orig_height);
  
  /* Cache */
@@ -24,7 +29,7 @@ index a882551..c584147 100644
  static void       clear_cache          (GnomeBG               *bg);
  static gboolean   is_different         (GnomeBG               *bg,
  					const char            *filename);
-@@ -183,7 +185,11 @@ static SlideShow * get_as_slideshow    (GnomeBG               *bg,
+@@ -183,7 +186,11 @@ static SlideShow * get_as_slideshow    (GnomeBG               *bg,
  					const char 	      *filename);
  static Slide *     get_current_slide   (SlideShow 	      *show,
  		   			double    	      *alpha);
@@ -37,7 +42,129 @@ index a882551..c584147 100644
  
  static void
  color_from_string (const char *string,
-@@ -685,12 +691,13 @@ get_scaled_pixbuf (GnomeBGPlacement placement,
+@@ -613,13 +620,15 @@ gnome_bg_set_filename (GnomeBG     *bg,
+ }
+ 
+ static void
+-draw_color (GnomeBG *bg, GdkPixbuf *dest)
++draw_color_area (GnomeBG *bg,
++		 GdkPixbuf *dest,
++		 GdkRectangle *rect)
+ {
+ 	guint32 pixel;
+ 	
+-	switch (bg->color_type)
+-	{
++	switch (bg->color_type) {
+ 	case GNOME_BG_COLOR_SOLID:
++		/* not really a big deal to ignore the area of interest */
+ 		pixel = ((bg->primary.red >> 8) << 24)      |
+ 			((bg->primary.green >> 8) << 16)    |
+ 			((bg->primary.blue >> 8) << 8)      |
+@@ -629,11 +638,11 @@ draw_color (GnomeBG *bg, GdkPixbuf *dest)
+ 		break;
+ 		
+ 	case GNOME_BG_COLOR_H_GRADIENT:
+-		pixbuf_draw_gradient (dest, TRUE, &(bg->primary), &(bg->secondary));
++		pixbuf_draw_gradient (dest, TRUE, &(bg->primary), &(bg->secondary), rect);
+ 		break;
+ 		
+ 	case GNOME_BG_COLOR_V_GRADIENT:
+-		pixbuf_draw_gradient (dest, FALSE, &(bg->primary), &(bg->secondary));
++		pixbuf_draw_gradient (dest, FALSE, &(bg->primary), &(bg->secondary), rect);
+ 		break;
+ 		
+ 	default:
+@@ -641,14 +650,77 @@ draw_color (GnomeBG *bg, GdkPixbuf *dest)
+ 	}
+ }
+ 
++static void
++draw_color (GnomeBG *bg,
++	    GdkPixbuf *dest,
++	    GdkScreen *screen)
++{
++	GdkRectangle rect;
++	rect.x = 0;
++	rect.y = 0;
++	rect.width = gdk_pixbuf_get_width (dest);
++	rect.height = gdk_pixbuf_get_height (dest);
++	draw_color_area (bg, dest, &rect);
++}
++
++static void
++draw_color_each_monitor (GnomeBG *bg,
++			 GdkPixbuf *dest,
++			 GdkScreen *screen)
++{
++	GdkRectangle rect;
++	gint num_monitors;
++	int monitor;
++
++	num_monitors = gdk_screen_get_n_monitors (screen);
++	for (monitor = 0; monitor < num_monitors; monitor++) {
++		gdk_screen_get_monitor_geometry (screen, monitor, &rect);
++		draw_color_area (bg, dest, &rect);
++	}
++}
++
++static GdkPixbuf *
++pixbuf_clip_to_fit (GdkPixbuf *src,
++		    int        max_width,
++		    int        max_height)
++{
++	int src_width, src_height;
++	int w, h;
++	int src_x, src_y;
++	GdkPixbuf *pixbuf;
++
++	src_width = gdk_pixbuf_get_width (src);
++	src_height = gdk_pixbuf_get_height (src);
++
++	if (src_width < max_width && src_height < max_height)
++		return g_object_ref (src);
++
++	w = MIN(src_width, max_width);
++	h = MIN(src_height, max_height);
++
++	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
++				 gdk_pixbuf_get_has_alpha (src),
++				 8, w, h);
++
++	src_x = (src_width - w) / 2;
++	src_y = (src_height - h) / 2;
++	gdk_pixbuf_copy_area (src,
++			      src_x, src_y,
++			      w, h,
++			      pixbuf,
++			      0, 0);
++	return pixbuf;
++}
++
+ static GdkPixbuf *
+ get_scaled_pixbuf (GnomeBGPlacement placement,
+ 		   GdkPixbuf *pixbuf,
+ 		   int width, int height,
+-		   int *x, int *y, int *w, int *h)
++		   int *x, int *y,
++		   int *w, int *h)
+ {
+ 	GdkPixbuf *new;
+-	
++
+ #if 0
+ 	g_print ("original_width: %d %d\n",
+ 		 gdk_pixbuf_get_width (pixbuf),
+@@ -672,7 +744,7 @@ get_scaled_pixbuf (GnomeBGPlacement placement,
+ 	case GNOME_BG_PLACEMENT_CENTERED:
+ 	case GNOME_BG_PLACEMENT_TILED:
+ 	default:
+-		new = g_object_ref (pixbuf);
++		new = pixbuf_clip_to_fit (pixbuf, width, height);
+ 		break;
+ 	}
+ 	
+@@ -685,20 +757,20 @@ get_scaled_pixbuf (GnomeBGPlacement placement,
  }
  
  static void
@@ -56,7 +183,17 @@ index a882551..c584147 100644
  	int x, y, w, h;
  	GdkPixbuf *scaled;
  	
-@@ -708,7 +715,7 @@ draw_image (GnomeBGPlacement  placement,
+ 	if (!pixbuf)
+ 		return;
+-	
+-	scaled = get_scaled_pixbuf (
+-		placement, pixbuf, dest_width, dest_height, &x, &y, &w, &h);
++
++	scaled = get_scaled_pixbuf (placement, pixbuf, dest_width, dest_height, &x, &y, &w, &h);
+ 
+ 	switch (placement) {
+ 	case GNOME_BG_PLACEMENT_TILED:
+@@ -708,7 +780,7 @@ draw_image (GnomeBGPlacement  placement,
  	case GNOME_BG_PLACEMENT_CENTERED:
  	case GNOME_BG_PLACEMENT_FILL_SCREEN:
  	case GNOME_BG_PLACEMENT_SCALED:
@@ -65,7 +202,7 @@ index a882551..c584147 100644
  		break;
  	default:
  		g_assert_not_reached ();
-@@ -718,51 +725,82 @@ draw_image (GnomeBGPlacement  placement,
+@@ -718,54 +790,97 @@ draw_image (GnomeBGPlacement  placement,
  	g_object_unref (scaled);
  }
  
@@ -85,46 +222,62 @@ index a882551..c584147 100644
 +}
 +
 +static void
++draw_once (GnomeBG   *bg,
++	   GdkPixbuf *dest,
++	   GdkScreen *screen)
++{
++	GdkRectangle rect;
++
++	rect.x = 0;
++	rect.y = 0;
++	rect.width = gdk_pixbuf_get_width (dest);
++	rect.height = gdk_pixbuf_get_height (dest);
++
++	draw_image_area (bg->placement,
++			 get_pixbuf_for_size (bg, gdk_pixbuf_get_width (dest), gdk_pixbuf_get_height (dest)),
++			 dest,
++			 &rect);
++}
++
++static void
 +draw_each_monitor (GnomeBG   *bg,
 +		   GdkPixbuf *dest,
 +		   GdkScreen *screen)
 +{
 +	GdkRectangle rect;
++	gint num_monitors;
++	int monitor;
 +
-+	if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
-+		GdkScreen *screen;
-+
-+		/* don't worry about aligning on every monitor */
-+		screen = gdk_screen_get_default ();
-+		gdk_screen_get_monitor_geometry (screen, 0, &rect);
-+		draw_image (bg->placement,
-+			    get_pixbuf_for_size (bg, rect.width, rect.height),
-+			    dest);
-+	} else {
-+		gint num_monitors;
-+		int monitor;
-+
-+		num_monitors = gdk_screen_get_n_monitors (screen);
-+		for (monitor = 0; monitor < num_monitors; monitor++) {
-+			gdk_screen_get_monitor_geometry (screen, monitor, &rect);
-+			draw_image_area (bg->placement,
-+					 get_pixbuf_for_size (bg, rect.width, rect.height),
-+					 dest, &rect);
-+		}
++	num_monitors = gdk_screen_get_n_monitors (screen);
++	for (monitor = 0; monitor < num_monitors; monitor++) {
++		gdk_screen_get_monitor_geometry (screen, monitor, &rect);
++		draw_image_area (bg->placement,
++				 get_pixbuf_for_size (bg, rect.width, rect.height),
++				 dest, &rect);
 +	}
 +}
 +
  void
 -gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest)
-+gnome_bg_draw (GnomeBG *bg, GdkPixbuf *dest, GdkScreen *screen)
++gnome_bg_draw (GnomeBG *bg,
++	       GdkPixbuf *dest,
++	       GdkScreen *screen,
++	       gboolean is_root)
  {
  	if (!bg)
  		return;
- 	
- 	draw_color (bg, dest);
- 	
+-	
+-	draw_color (bg, dest);
+-	
 -	draw_image (bg->placement, get_pixbuf (bg), dest);
-+	draw_each_monitor (bg, dest, screen);
++
++	if (is_root) {
++		draw_color_each_monitor (bg, dest, screen);
++		draw_each_monitor (bg, dest, screen);
++	} else {
++		draw_color (bg, dest, screen);
++		draw_once (bg, dest, screen);
++	}
  }
  
  gboolean
@@ -173,8 +326,11 @@ index a882551..c584147 100644
 +			  int       *pixmap_height)
  {
  	int dummy;
- 	int pb_width, pb_height;
-@@ -774,8 +812,8 @@ gnome_bg_get_pixmap_size (GnomeBG  *bg,
+-	int pb_width, pb_height;
+ 	
+ 	if (!pixmap_width)
+ 		pixmap_width = &dummy;
+@@ -774,8 +889,8 @@ gnome_bg_get_pixmap_size (GnomeBG  *bg,
  	
  	*pixmap_width = width;
  	*pixmap_height = height;
@@ -185,33 +341,73 @@ index a882551..c584147 100644
  		switch (bg->color_type) {
  		case GNOME_BG_COLOR_SOLID:
  			*pixmap_width = 1;
-@@ -796,11 +834,13 @@ gnome_bg_get_pixmap_size (GnomeBG  *bg,
+@@ -783,44 +898,12 @@ gnome_bg_get_pixmap_size (GnomeBG  *bg,
+ 			break;
+ 			
+ 		case GNOME_BG_COLOR_H_GRADIENT:
+-			*pixmap_width = width;
+-			*pixmap_height = GRADIENT_PIXMAP_TILE_SIZE;
+-			break;
+-			
+ 		case GNOME_BG_COLOR_V_GRADIENT:
+-			*pixmap_width = GRADIENT_PIXMAP_TILE_SIZE;
+-			*pixmap_height = height;
+ 			break;
+ 		}
+ 		
  		return;
  	}
- 	
+-	
 -	pb_width = gdk_pixbuf_get_width (get_pixbuf (bg));
 -	pb_height = gdk_pixbuf_get_height (get_pixbuf (bg));
 -	
- 	if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
+-	if (bg->placement == GNOME_BG_PLACEMENT_TILED) {
 -		if (gdk_pixbuf_get_has_alpha (get_pixbuf (bg)) &&
-+		GdkPixbuf *pixbuf;
-+		pixbuf = get_pixbuf_for_size (bg, width, height);
-+		pb_width = gdk_pixbuf_get_width (pixbuf);
-+		pb_height = gdk_pixbuf_get_height (pixbuf);
-+	
-+		if (gdk_pixbuf_get_has_alpha (pixbuf) &&
- 		    bg->color_type != GNOME_BG_COLOR_SOLID) {
- 			if (bg->color_type == GNOME_BG_COLOR_H_GRADIENT) {
- 				/* FIXME: Should this be
-@@ -860,6 +900,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+-		    bg->color_type != GNOME_BG_COLOR_SOLID) {
+-			if (bg->color_type == GNOME_BG_COLOR_H_GRADIENT) {
+-				/* FIXME: Should this be
+-				 * MAX (GRADIENT_TILE_SIZE, pb_height)?
+-				 */
+-				*pixmap_height = pb_height; 
+-				*pixmap_width = width;
+-			}
+-			else {
+-				/* FIXME: Should this be
+-				 * MAX (GRAIDENT_TILE_SIZE, pb_width? */
+-				*pixmap_width = pb_width;
+-				*pixmap_height = height;
+-			}
+-		}
+-		else {
+-			*pixmap_width = pb_width;
+-			*pixmap_height = pb_height;
+-		}
+-	}
+ }
+ 
+ /**
+@@ -842,7 +925,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+ 			GdkWindow   *window,
+ 			int	     width,
+ 			int	     height,
+-			gboolean     root)
++			gboolean     is_root)
+ {
+ 	int pm_width, pm_height;
+ 	GdkPixmap *pixmap;
+@@ -860,9 +943,10 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
  	bg->last_pixmap_width = width;
  	bg->last_pixmap_height = height;
  
 +	/* has the side effect of loading and caching pixbuf only when in tile mode */
  	gnome_bg_get_pixmap_size (bg, width, height, &pm_width, &pm_height);
  	
- 	if (root) {
-@@ -870,7 +911,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+-	if (root) {
++	if (is_root) {
+ 		pixmap = make_root_pixmap (gdk_drawable_get_screen (window),
+ 					   pm_width, pm_height);
+ 	}
+@@ -870,7 +954,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
  		pixmap = gdk_pixmap_new (window, pm_width, pm_height, -1);
  	}
  	
@@ -220,16 +416,16 @@ index a882551..c584147 100644
  		GdkGC *gc = gdk_gc_new (pixmap);
  		gdk_gc_set_rgb_fg_color (gc, &(bg->primary));
  		
-@@ -883,7 +924,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+@@ -883,7 +967,7 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
  		
  		pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
  					 width, height);
 -		gnome_bg_draw (bg, pixbuf);
-+		gnome_bg_draw (bg, pixbuf, gdk_drawable_get_screen (GDK_DRAWABLE (window)));
++		gnome_bg_draw (bg, pixbuf, gdk_drawable_get_screen (GDK_DRAWABLE (window)), is_root);
  		gdk_draw_pixbuf (pixmap, NULL, pixbuf,
  				 0, 0,
  				 0, 0, width, height,
-@@ -899,10 +940,13 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
+@@ -899,10 +983,13 @@ gnome_bg_create_pixmap (GnomeBG	    *bg,
   * clients know what colors to draw on top with
   */
  gboolean
@@ -244,7 +440,7 @@ index a882551..c584147 100644
  	
  	g_return_val_if_fail (bg != NULL, FALSE);
  	
-@@ -913,9 +957,9 @@ gnome_bg_is_dark (GnomeBG *bg)
+@@ -913,9 +1000,9 @@ gnome_bg_is_dark (GnomeBG *bg)
  		color.green = (bg->primary.green + bg->secondary.green) / 2;
  		color.blue = (bg->primary.blue + bg->secondary.blue) / 2;
  	}
@@ -257,7 +453,7 @@ index a882551..c584147 100644
  		guchar a = (argb >> 24) & 0xff;
  		guchar r = (argb >> 16) & 0xff;
  		guchar g = (argb >>  8) & 0xff;
-@@ -1001,9 +1045,31 @@ get_original_size (const char *filename,
+@@ -1001,9 +1088,31 @@ get_original_size (const char *filename,
  	return result;
  }
  
@@ -289,7 +485,7 @@ index a882551..c584147 100644
  			 int		       *width,
  			 int		       *height)
  {
-@@ -1017,21 +1083,8 @@ gnome_bg_get_image_size (GnomeBG	       *bg,
+@@ -1017,21 +1126,8 @@ gnome_bg_get_image_size (GnomeBG	       *bg,
  	if (!bg->filename)
  		return FALSE;
  	
@@ -312,7 +508,16 @@ index a882551..c584147 100644
  	if (thumb) {
  		if (get_thumb_annotations (thumb, width, height))
  			result = TRUE;
-@@ -1316,7 +1369,7 @@ struct _SlideShow
+@@ -1068,7 +1164,7 @@ gnome_bg_create_thumbnail (GnomeBG               *bg,
+ 	
+ 	result = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, dest_width, dest_height);
+ 	
+-	draw_color (bg, result);
++	draw_color (bg, result, screen);
+ 	
+ 	thumb = create_img_thumbnail (bg, factory, screen, dest_width, dest_height, -1);
+ 	
+@@ -1316,7 +1412,7 @@ struct _SlideShow
  
  	GQueue *slides;
  	
@@ -321,7 +526,7 @@ index a882551..c584147 100644
  
  	/* used during parsing */
  	struct tm start_tm;
-@@ -1356,7 +1409,8 @@ get_current_slide (SlideShow *show,
+@@ -1356,7 +1452,8 @@ get_current_slide (SlideShow *show,
  		Slide *slide = list->data;
  
  		if (elapsed + slide->duration > delta) {
@@ -331,7 +536,7 @@ index a882551..c584147 100644
  			return slide;
  		}
  
-@@ -1512,7 +1566,10 @@ file_cache_add_slide_show (GnomeBG *bg,
+@@ -1512,7 +1609,10 @@ file_cache_add_slide_show (GnomeBG *bg,
  }
  
  static GdkPixbuf *
@@ -343,7 +548,7 @@ index a882551..c584147 100644
  {
  	const FileCacheEntry *ent;
  	if ((ent = file_cache_lookup (bg, PIXBUF, filename))) {
-@@ -1523,14 +1580,14 @@ get_as_pixbuf (GnomeBG *bg, const char *filename)
+@@ -1523,14 +1623,14 @@ get_as_pixbuf (GnomeBG *bg, const char *filename)
  		GdkPixbuf *pixbuf;
  
  		/* If scalable choose maximum size */
@@ -361,7 +566,19 @@ index a882551..c584147 100644
  		else
  			pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
  
-@@ -1784,8 +1841,7 @@ create_img_thumbnail (GnomeBG                      *bg,
+@@ -1763,9 +1863,8 @@ create_img_thumbnail (GnomeBG                      *bg,
+ 		GdkPixbuf *thumb = get_as_thumbnail (bg, factory, bg->filename);
+ 
+ 		if (thumb) {
+-			return scale_thumbnail (
+-				bg->placement, bg->filename,
+-				thumb, screen, dest_width, dest_height);
++			return scale_thumbnail (bg->placement, bg->filename,
++						thumb, screen, dest_width, dest_height);
+ 		}
+ 		else {
+ 			SlideShow *show = get_as_slideshow (bg, bg->filename);
+@@ -1784,36 +1883,29 @@ create_img_thumbnail (GnomeBG                      *bg,
  				if (slide->fixed) {
  					GdkPixbuf *tmp;
  					FileSize *fs;
@@ -369,10 +586,13 @@ index a882551..c584147 100644
 -					fs = slide->file1->data;
 +					fs = find_best_size (slide->file1, dest_width, dest_height);
  					tmp = get_as_thumbnail (bg, factory, fs->file);
- 
- 					thumb = scale_thumbnail (
-@@ -1793,26 +1849,23 @@ create_img_thumbnail (GnomeBG                      *bg,
- 						tmp, screen, dest_width, dest_height);
+-
+-					thumb = scale_thumbnail (
+-						bg->placement, fs->file,
+-						tmp, screen, dest_width, dest_height);
++					if (tmp)
++						thumb = scale_thumbnail (bg->placement, fs->file,
++									 tmp, screen, dest_width, dest_height);
  				}
  				else {
 -					FileSize *fs;
@@ -393,19 +613,22 @@ index a882551..c584147 100644
  						GdkPixbuf *thumb1, *thumb2;
  
 -						fs = slide->file1->data;
- 						thumb1 = scale_thumbnail (
+-						thumb1 = scale_thumbnail (
 -							bg->placement, fs->file,
-+							bg->placement, fs1->file,
- 							p1, screen, dest_width, dest_height);
+-							p1, screen, dest_width, dest_height);
++						thumb1 = scale_thumbnail (bg->placement, fs1->file,
++									  p1, screen, dest_width, dest_height);
  
 -						fs = slide->file2->data;
- 						thumb2 = scale_thumbnail (
+-						thumb2 = scale_thumbnail (
 -							bg->placement, fs->file,
-+							bg->placement, fs2->file,
- 							p2, screen, dest_width, dest_height);
+-							p2, screen, dest_width, dest_height);
++						thumb2 = scale_thumbnail (bg->placement, fs2->file,
++									  p2, screen, dest_width, dest_height);
  
  						thumb = blend (thumb1, thumb2, alpha);
-@@ -1880,18 +1933,26 @@ find_best_size (GSList *sizes, gint width, gint height)
+ 
+@@ -1880,18 +1972,26 @@ find_best_size (GSList *sizes, gint width, gint height)
  }
  
  static GdkPixbuf *
@@ -437,7 +660,7 @@ index a882551..c584147 100644
  		time_until_next_change = G_MAXUINT;
  		if (!bg->pixbuf_cache) {
  			SlideShow *show = get_as_slideshow (bg, bg->filename);
-@@ -1906,16 +1967,16 @@ get_pixbuf (GnomeBG *bg)
+@@ -1906,16 +2006,16 @@ get_pixbuf (GnomeBG *bg)
  				time_until_next_change = (guint)get_slide_timeout (slide);
  				if (slide->fixed) {
  					FileSize *size;
@@ -460,7 +683,188 @@ index a882551..c584147 100644
  
  
  					if (p1 && p2) {
-@@ -2368,14 +2429,14 @@ handle_text (GMarkupParseContext *context,
+@@ -2084,22 +2184,38 @@ pixbuf_scale_to_min (GdkPixbuf *src, int min_width, int min_height)
+ 	double factor;
+ 	int src_width, src_height;
+ 	int new_width, new_height;
+-	
++	GdkPixbuf *dest;
++
+ 	src_width = gdk_pixbuf_get_width (src);
+ 	src_height = gdk_pixbuf_get_height (src);
+-	
++
+ 	factor = MAX (min_width / (double) src_width, min_height / (double) src_height);
+-	
++
+ 	new_width = floor (src_width * factor + 0.5);
+ 	new_height = floor (src_height * factor + 0.5);
+-	
+-	return gdk_pixbuf_scale_simple (src, new_width, new_height, GDK_INTERP_BILINEAR);
++
++	dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
++			       gdk_pixbuf_get_has_alpha (src),
++			       8, min_width, min_height);
++	if (!dest)
++		return NULL;
++
++	/* crop the result */
++	gdk_pixbuf_scale (src, dest,
++			  0, 0,
++			  min_width, min_height,
++			  (new_width - min_width) / -2,
++			  (new_height - min_height) / -2,
++			  factor,
++			  factor,
++			  GDK_INTERP_BILINEAR);
++	return dest;
+ }
+ 
+ static guchar *
+ create_gradient (const GdkColor *primary,
+ 		 const GdkColor *secondary,
+-		 int	          n_pixels)
++		 int	         n_pixels)
+ {
+ 	guchar *result = g_malloc (n_pixels * 3);
+ 	int i;
+@@ -2116,43 +2232,56 @@ create_gradient (const GdkColor *primary,
+ }	
+ 
+ static void
+-pixbuf_draw_gradient (GdkPixbuf *pixbuf,
+-		      gboolean   horizontal,
+-		      GdkColor  *primary,
+-		      GdkColor  *secondary)
+-{
+-	int width  = gdk_pixbuf_get_width (pixbuf);
+-	int height = gdk_pixbuf_get_height (pixbuf);
+-	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+-	guchar *dst = gdk_pixbuf_get_pixels (pixbuf);
+-	guchar *dst_limit = dst + height * rowstride;
+-	
++pixbuf_draw_gradient (GdkPixbuf    *pixbuf,
++		      gboolean      horizontal,
++		      GdkColor     *primary,
++		      GdkColor     *secondary,
++		      GdkRectangle *rect)
++{
++	int width;
++	int height;
++	int rowstride;
++	guchar *dst;
++	guchar *dst_limit;
++	int n_channels = 3;
++
++	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
++	width = rect->width;
++	height = rect->height;
++	dst = gdk_pixbuf_get_pixels (pixbuf) + rect->x * n_channels + rowstride * rect->y;
++	dst_limit = dst + height * rowstride;
++
+ 	if (horizontal) {
+ 		guchar *gradient = create_gradient (primary, secondary, width);
+-		int copy_bytes_per_row = width * 3;
+-		
+-		while (dst < dst_limit) {
+-			memcpy (dst, gradient, copy_bytes_per_row);
+-			dst += rowstride;
++		int copy_bytes_per_row = width * n_channels;
++		int i;
++
++		for (i = 0; i < height; i++) {
++			guchar *d;
++			d = dst + rowstride * i;
++			memcpy (d, gradient, copy_bytes_per_row);
+ 		}
+ 		g_free (gradient);
+ 	} else {
+ 		guchar *gb, *gradient;
+-		
+-		gb = gradient = create_gradient (primary, secondary, height);
+-		while (dst < dst_limit) {
+-			int i;
+-			guchar *d = dst;
+-			guchar r = *gb++;
+-			guchar g = *gb++;
+-			guchar b = *gb++;
+-			for (i = 0; i < width; i++) {
+-				*d++ = r;
+-				*d++ = g;
+-				*d++ = b;
++		int i;
++
++		gradient = create_gradient (primary, secondary, height);
++		for (i = 0; i < height; i++) {
++			int j;
++			guchar *d;
++
++			d = dst + rowstride * i;
++			gb = gradient + n_channels * i;
++			for (j = width; j > 0; j--) {
++				int k;
++
++				for (k = 0; k < n_channels; k++) {
++					*(d++) = gb[k];
++				}
+ 			}
+-			dst += rowstride;
+ 		}
++
+ 		g_free (gradient);
+ 	}
+ }
+@@ -2162,8 +2291,8 @@ pixbuf_blend (GdkPixbuf *src,
+ 	      GdkPixbuf *dest,
+ 	      int	 src_x,
+ 	      int	 src_y,
+-	      int	 width,
+-	      int        height,
++	      int	 src_width,
++	      int        src_height,
+ 	      int	 dest_x,
+ 	      int	 dest_y,
+ 	      double	 alpha)
+@@ -2173,11 +2302,11 @@ pixbuf_blend (GdkPixbuf *src,
+ 	int offset_x = dest_x - src_x;
+ 	int offset_y = dest_y - src_y;
+ 
+-	if (width < 0)
+-		width = gdk_pixbuf_get_width (src);
++	if (src_width < 0)
++		src_width = gdk_pixbuf_get_width (src);
+ 
+-	if (height < 0)
+-		height = gdk_pixbuf_get_height (src);
++	if (src_height < 0)
++		src_height = gdk_pixbuf_get_height (src);
+ 	
+ 	if (dest_x < 0)
+ 		dest_x = 0;
+@@ -2185,17 +2314,17 @@ pixbuf_blend (GdkPixbuf *src,
+ 	if (dest_y < 0)
+ 		dest_y = 0;
+ 	
+-	if (dest_x + width > dest_width) {
+-		width = dest_width - dest_x;
++	if (dest_x + src_width > dest_width) {
++		src_width = dest_width - dest_x;
+ 	}
+ 	
+-	if (dest_y + height > dest_height) {
+-		height = dest_height - dest_y;
++	if (dest_y + src_height > dest_height) {
++		src_height = dest_height - dest_y;
+ 	}
+ 
+ 	gdk_pixbuf_composite (src, dest,
+ 			      dest_x, dest_y,
+-			      width, height,
++			      src_width, src_height,
+ 			      offset_x, offset_y,
+ 			      1, 1, GDK_INTERP_NEAREST,
+ 			      alpha * 0xFF + 0.5);
+@@ -2368,14 +2497,14 @@ handle_text (GMarkupParseContext *context,
  		fs->file = g_strdup (text);
  		slide->file1 = g_slist_prepend (slide->file1, fs);
  		if (slide->file1->next != NULL)
@@ -477,7 +881,7 @@ index a882551..c584147 100644
  	}
  	else if (stack_is (parser, "to", "transition", "background", NULL)) {
  		for (i = 0; text[i]; i++) {
-@@ -2390,13 +2451,13 @@ handle_text (GMarkupParseContext *context,
+@@ -2390,13 +2519,13 @@ handle_text (GMarkupParseContext *context,
  		fs->file = g_strdup (text);
  		slide->file2 = g_slist_prepend (slide->file2, fs);
  		if (slide->file2->next != NULL)
@@ -493,7 +897,7 @@ index a882551..c584147 100644
  	}
  }
  
-@@ -2639,9 +2700,9 @@ get_thumb_annotations (GdkPixbuf *thumb,
+@@ -2639,9 +2768,9 @@ get_thumb_annotations (GdkPixbuf *thumb,
  }
  
  static gboolean
@@ -505,21 +909,31 @@ index a882551..c584147 100644
  }
  
  /*
+@@ -2712,7 +2841,7 @@ gnome_bg_create_frame_thumbnail (GnomeBG			*bg,
+ 
+ 	result = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, dest_width, dest_height);
+ 
+-	draw_color (bg, result);
++	draw_color (bg, result, screen);
+ 
+ 	thumb = create_img_thumbnail (bg, factory, screen, dest_width, dest_height, frame_num + skipped);
+ 
 diff --git a/libgnome-desktop/libgnomeui/gnome-bg.h b/libgnome-desktop/libgnomeui/gnome-bg.h
-index 993173a..ddf9e5c 100644
+index 993173a..6ab2cb0 100644
 --- a/libgnome-desktop/libgnomeui/gnome-bg.h
 +++ b/libgnome-desktop/libgnomeui/gnome-bg.h
-@@ -87,7 +87,8 @@ const gchar *    gnome_bg_get_filename          (GnomeBG               *bg);
+@@ -87,7 +87,9 @@ const gchar *    gnome_bg_get_filename          (GnomeBG               *bg);
  
  /* Drawing and thumbnailing */
  void             gnome_bg_draw                  (GnomeBG               *bg,
 -						 GdkPixbuf             *dest);
 +						 GdkPixbuf             *dest,
-+						 GdkScreen	       *screen);
++						 GdkScreen	       *screen,
++                                                 gboolean               is_root);
  GdkPixmap *      gnome_bg_create_pixmap         (GnomeBG               *bg,
  						 GdkWindow             *window,
  						 int                    width,
-@@ -95,6 +96,8 @@ GdkPixmap *      gnome_bg_create_pixmap         (GnomeBG               *bg,
+@@ -95,6 +97,8 @@ GdkPixmap *      gnome_bg_create_pixmap         (GnomeBG               *bg,
  						 gboolean               root);
  gboolean         gnome_bg_get_image_size        (GnomeBG               *bg,
  						 GnomeDesktopThumbnailFactory *factory,
@@ -528,7 +942,7 @@ index 993173a..ddf9e5c 100644
  						 int                   *width,
  						 int                   *height);
  GdkPixbuf *      gnome_bg_create_thumbnail      (GnomeBG               *bg,
-@@ -102,8 +105,10 @@ GdkPixbuf *      gnome_bg_create_thumbnail      (GnomeBG               *bg,
+@@ -102,8 +106,10 @@ GdkPixbuf *      gnome_bg_create_thumbnail      (GnomeBG               *bg,
  						 GdkScreen             *screen,
  						 int                    dest_width,
  						 int                    dest_height);
@@ -541,25 +955,3 @@ index 993173a..ddf9e5c 100644
  gboolean         gnome_bg_changes_with_time     (GnomeBG               *bg);
  GdkPixbuf *      gnome_bg_create_frame_thumbnail (GnomeBG              *bg,
  						 GnomeDesktopThumbnailFactory *factory,
--- 
-1.6.5.2
-
-diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
-index c584147..f050e70 100644
---- a/libgnome-desktop/gnome-bg.c
-+++ b/libgnome-desktop/gnome-bg.c
-@@ -1843,10 +1843,10 @@ create_img_thumbnail (GnomeBG                      *bg,
- 					FileSize *fs;
- 					fs = find_best_size (slide->file1, dest_width, dest_height);
- 					tmp = get_as_thumbnail (bg, factory, fs->file);
--
--					thumb = scale_thumbnail (
--						bg->placement, fs->file,
--						tmp, screen, dest_width, dest_height);
-+					if (tmp)
-+						thumb = scale_thumbnail (
-+									 bg->placement, fs->file,
-+									 tmp, screen, dest_width, dest_height);
- 				}
- 				else {
- 					FileSize *fs1, *fs2;



From jnovy at fedoraproject.org  Tue Dec 15 14:57:01 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 15 Dec 2009 14:57:01 +0000 (UTC)
Subject: rpms/mc/devel mc-rpmvfs.patch, NONE, 1.1 mc-extensions.patch, 1.16, 
	1.17 mc.spec, 1.152, 1.153
Message-ID: <20091215145701.3024511C00E7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv434

Modified Files:
	mc-extensions.patch mc.spec 
Added Files:
	mc-rpmvfs.patch 
Log Message:
* Tue Dec 15 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.8.pre4
- fix rpmvfs empty directory handling (#529645)
- fix bindings (#532784)


mc-rpmvfs.patch:
 b/vfs/cpio.c     |  283 ++++++++++++++++++++++++++++---------------------------
 b/vfs/direntry.c |   13 +-
 b/vfs/vfs.c      |    3 
 vfs/cpio.c       |    7 -
 4 files changed, 162 insertions(+), 144 deletions(-)

--- NEW FILE mc-rpmvfs.patch ---
commit 698385bdd0bfb485bcc42a634f86a8cd0ffae564
Author: Andrew Borodin <aborodin at vmail.ru>
Date:   Wed Nov 18 16:26:24 2009 +0300

    Ticket #1732: cpio VFS skips empty directories in the root of archive
    
    Initial step: some optimization and type accuracy.
    
    Signed-off-by: Andrew Borodin <aborodin at vmail.ru>

diff --git a/vfs/cpio.c b/vfs/cpio.c
index 5eeef95..8c24573 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -103,7 +103,6 @@ struct defer_inode {
 static int cpio_position;
 
 static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super);
-static int cpio_create_entry(struct vfs_class *me, struct vfs_s_super *super, struct stat *, char *name);
 static ssize_t cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *super);
 static ssize_t cpio_read_oldc_head(struct vfs_class *me, struct vfs_s_super *super);
 static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *super);
@@ -234,8 +233,8 @@ static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super)
 {
     char buf[256];
     int ptr = 0;
-    int top;
-    int tmp;
+    ssize_t top;
+    ssize_t tmp;
 
     top = mc_read (super->u.arch.fd, buf, 256);
     if (top > 0)
@@ -271,6 +270,140 @@ static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super)
 #undef RETURN
 #undef SEEKBACK
 
+static int
+cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super,
+		   struct stat *st, char *name)
+{
+    struct vfs_s_inode *inode = NULL;
+    struct vfs_s_inode *root = super->root;
+    struct vfs_s_entry *entry = NULL;
+    char *tn;
+
+    switch (st->st_mode & S_IFMT) {	/* For case of HP/UX archives */
+    case S_IFCHR:
+    case S_IFBLK:
+#ifdef S_IFSOCK
+    case S_IFSOCK:
+#endif
+#ifdef S_IFIFO
+    case S_IFIFO:
+#endif
+#ifdef S_IFNAM
+    case S_IFNAM:
+#endif
+	if ((st->st_size != 0) && (st->st_rdev == 0x0001)) {
+	    /* FIXME: representation of major/minor differs between */
+	    /* different operating systems. */
+	    st->st_rdev = (unsigned) st->st_size;
+	    st->st_size = 0;
+	}
+	break;
+    default:
+	break;
+    }
+
+    if ((st->st_nlink > 1)
+	     && ((super->u.arch.type == CPIO_NEWC)
+		    || (super->u.arch.type == CPIO_CRC))) {	/* For case of hardlinked files */
+	struct defer_inode i, *l;
+	i.inumber = st->st_ino;
+	i.device = st->st_dev;
+	i.inode = NULL;
+
+	l = cpio_defer_find (super->u.arch.deferred, &i);
+	if (l != NULL) {
+	    inode = l->inode;
+	    if (inode->st.st_size != 0 && st->st_size != 0
+		    && (inode->st.st_size != st->st_size)) {
+		message (D_ERROR, MSG_ERROR,
+			_("Inconsistent hardlinks of\n%s\nin cpio archive\n%s"),
+			name, super->name);
+		inode = NULL;
+	    } else if (inode->st.st_size == 0)
+		inode->st.st_size = st->st_size;
+	}
+    }
+
+    /* remove trailing slashes */
+    for (tn = name + strlen (name) - 1; tn >= name && *tn == PATH_SEP; tn--)
+	*tn = '\0';
+
+    tn = strrchr (name, PATH_SEP);
+    if (tn == NULL)
+	tn = name;
+    else {
+	*tn = '\0';
+	root = vfs_s_find_inode (me, super, name, LINK_FOLLOW, FL_MKDIR);
+	*tn = PATH_SEP;
+	tn++;
+    }
+
+    entry = MEDATA->find_entry (me, root, tn, LINK_FOLLOW, FL_NONE);	/* In case entry is already there */
+
+    if (entry != NULL) {
+	/* This shouldn't happen! (well, it can happen if there is a record for a 
+	   file and than a record for a directory it is in; cpio would die with
+	   'No such file or directory' is such case) */
+
+	if (!S_ISDIR (entry->ino->st.st_mode)) {
+	    /* This can be considered archive inconsistency */
+	    message (D_ERROR, MSG_ERROR,
+		     _("%s contains duplicate entries! Skipping!"),
+		     super->name);
+	} else {
+	    entry->ino->st.st_mode = st->st_mode;
+	    entry->ino->st.st_uid = st->st_uid;
+	    entry->ino->st.st_gid = st->st_gid;
+	    entry->ino->st.st_atime = st->st_atime;
+	    entry->ino->st.st_mtime = st->st_mtime;
+	    entry->ino->st.st_ctime = st->st_ctime;
+	}
+
+	g_free (name);
+    } else {			/* !entry */
+	if (inode == NULL) {
+	    inode = vfs_s_new_inode (me, super, st);
+	    if ((st->st_nlink > 0)
+		     && ((super->u.arch.type == CPIO_NEWC)
+			    || (super->u.arch.type == CPIO_CRC))) {
+		/* For case of hardlinked files */
+		struct defer_inode *i;
+		i = g_new (struct defer_inode, 1);
+		i->inumber = st->st_ino;
+		i->device = st->st_dev;
+		i->inode = inode;
+		i->next = super->u.arch.deferred;
+		super->u.arch.deferred = i;
+	    }
+	}
+
+	if (st->st_size != 0)
+	    inode->data_offset = CPIO_POS (super);
+
+	entry = vfs_s_new_entry (me, tn, inode);
+	vfs_s_insert_entry (me, root, entry);
+
+	g_free (name);
+
+	if (!S_ISLNK (st->st_mode))
+	    CPIO_SEEK_CUR (super, st->st_size);
+	else {
+	    inode->linkname = g_malloc (st->st_size + 1);
+
+	    if (mc_read (super->u.arch.fd, inode->linkname, st->st_size) < st->st_size) {
+		inode->linkname[0] = '\0';
+		return STATUS_EOF;
+	    }
+
+	    inode->linkname[st->st_size] = '\0';	/* Linkname stored without terminating \0 !!! */
+	    CPIO_POS (super) += st->st_size;
+	    cpio_skip_padding (super);
+	}
+    }				/* !entry */
+
+    return STATUS_OK;
+}
+
 #define HEAD_LENGTH (26)
 static ssize_t cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *super)
 {
@@ -278,7 +411,7 @@ static ssize_t cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *supe
 	struct old_cpio_header buf;
 	short shorts[HEAD_LENGTH >> 1];
     } u;
-    int len;
+    ssize_t len;
     char *name;
     struct stat st;
 
@@ -333,7 +466,7 @@ static ssize_t cpio_read_oldc_head(struct vfs_class *me, struct vfs_s_super *sup
 	struct stat st;
 	char buf[HEAD_LENGTH + 1];
     } u;
-    int len;
+    ssize_t len;
     char *name;
 
     if (mc_read (super->u.arch.fd, u.buf, HEAD_LENGTH) != HEAD_LENGTH)
@@ -385,25 +518,28 @@ static ssize_t cpio_read_oldc_head(struct vfs_class *me, struct vfs_s_super *sup
 #undef HEAD_LENGTH
 
 #define HEAD_LENGTH (110)
-static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *super)
+static ssize_t
+cpio_read_crc_head (struct vfs_class *me, struct vfs_s_super *super)
 {
     struct new_cpio_header hd;
     union {
 	struct stat st;
 	char buf[HEAD_LENGTH + 1];
     } u;
-    int len;
+    ssize_t len;
     char *name;
 
     if (mc_read (super->u.arch.fd, u.buf, HEAD_LENGTH) != HEAD_LENGTH)
 	return STATUS_EOF;
+
     CPIO_POS (super) += HEAD_LENGTH;
-    u.buf[HEAD_LENGTH] = 0;
+    u.buf[HEAD_LENGTH] = '\0';
 
     if (sscanf (u.buf, "%6ho%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx",
 	      &hd.c_magic, &hd.c_ino, &hd.c_mode, &hd.c_uid, &hd.c_gid,
 	      &hd.c_nlink,  &hd.c_mtime, &hd.c_filesize,
-	      (unsigned long *)&hd.c_dev, (unsigned long *)&hd.c_devmin, (unsigned long *)&hd.c_rdev, (unsigned long *)&hd.c_rdevmin,
+	      (unsigned long *)&hd.c_dev, (unsigned long *)&hd.c_devmin,
+	      (unsigned long *)&hd.c_rdev, (unsigned long *)&hd.c_rdevmin,
 	      &hd.c_namesize, &hd.c_chksum) < 14) {
 	message (D_ERROR, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
 		   super->name);
@@ -421,8 +557,9 @@ static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *supe
     }
 
     name = g_malloc(hd.c_namesize);
-    if((len = mc_read (super->u.arch.fd, name, hd.c_namesize)) == -1 ||
-       (unsigned long) len < hd.c_namesize) {
+    len = mc_read (super->u.arch.fd, name, hd.c_namesize);
+
+    if ((len == -1) || ((unsigned long) len < hd.c_namesize)) {
 	g_free (name);
 	return STATUS_EOF;
     }
@@ -430,7 +567,7 @@ static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *supe
     CPIO_POS(super) += len;
     cpio_skip_padding(super);
 
-    if(!strcmp("TRAILER!!!", name)) { /* We got to the last record */
+    if (strcmp ("TRAILER!!!", name) == 0) { /* We got to the last record */
 	g_free(name);
 	return STATUS_TRAIL;
     }
@@ -448,128 +585,6 @@ static ssize_t cpio_read_crc_head(struct vfs_class *me, struct vfs_s_super *supe
     return cpio_create_entry (me, super, &u.st, name);
 }
 
-static int
-cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super,
-		   struct stat *st, char *name)
-{
-    struct vfs_s_inode *inode = NULL;
-    struct vfs_s_inode *root = super->root;
-    struct vfs_s_entry *entry = NULL;
-    char *tn;
-
-    switch (st->st_mode & S_IFMT) {	/* For case of HP/UX archives */
-    case S_IFCHR:
-    case S_IFBLK:
-#ifdef S_IFSOCK
-    case S_IFSOCK:
-#endif
-#ifdef S_IFIFO
-    case S_IFIFO:
-#endif
-#ifdef S_IFNAM
-    case S_IFNAM:
-#endif
-	if ((st->st_size != 0) && (st->st_rdev == 0x0001)) {
-	    /* FIXME: representation of major/minor differs between */
-	    /* different operating systems. */
-	    st->st_rdev = (unsigned) st->st_size;
-	    st->st_size = 0;
-	}
-	break;
-    default:
-	break;
-    }
-
-    if ((st->st_nlink > 1) && (super->u.arch.type == CPIO_NEWC || super->u.arch.type == CPIO_CRC)) {	/* For case of hardlinked files */
-	struct defer_inode i, *l;
-	i.inumber = st->st_ino;
-	i.device = st->st_dev;
-	i.inode = NULL;
-	if ((l = cpio_defer_find (super->u.arch.deferred, &i)) != NULL) {
-	    inode = l->inode;
-	    if (inode->st.st_size && st->st_size
-		&& (inode->st.st_size != st->st_size)) {
-		message (D_ERROR, MSG_ERROR,
-			 _
-			 ("Inconsistent hardlinks of\n%s\nin cpio archive\n%s"),
-			 name, super->name);
-		inode = NULL;
-	    } else if (!inode->st.st_size)
-		inode->st.st_size = st->st_size;
-	}
-    }
-
-    for (tn = name + strlen (name) - 1; tn >= name && *tn == PATH_SEP; tn--)
-	*tn = 0;
-    if ((tn = strrchr (name, PATH_SEP))) {
-	*tn = 0;
-	root = vfs_s_find_inode (me, super, name, LINK_FOLLOW, FL_MKDIR);
-	*tn = PATH_SEP;
-	tn++;
-    } else
-	tn = name;
-
-    entry = MEDATA->find_entry (me, root, tn, LINK_FOLLOW, FL_NONE);	/* In case entry is already there */
-
-    if (entry) {		/* This shouldn't happen! (well, it can happen if there is a record for a 
-				   file and than a record for a directory it is in; cpio would die with
-				   'No such file or directory' is such case) */
-
-	if (!S_ISDIR (entry->ino->st.st_mode)) {	/* This can be considered archive inconsistency */
-	    message (D_ERROR, MSG_ERROR,
-		     _("%s contains duplicate entries! Skipping!"),
-		     super->name);
-	} else {
-	    entry->ino->st.st_mode = st->st_mode;
-	    entry->ino->st.st_uid = st->st_uid;
-	    entry->ino->st.st_gid = st->st_gid;
-	    entry->ino->st.st_atime = st->st_atime;
-	    entry->ino->st.st_mtime = st->st_mtime;
-	    entry->ino->st.st_ctime = st->st_ctime;
-	}
-
-    } else {			/* !entry */
-
-	if (!inode) {
-	    inode = vfs_s_new_inode (me, super, st);
-	    if ((st->st_nlink > 0) && (super->u.arch.type == CPIO_NEWC || super->u.arch.type == CPIO_CRC)) {	/* For case of hardlinked files */
-		struct defer_inode *i;
-		i = g_new (struct defer_inode, 1);
-		i->inumber = st->st_ino;
-		i->device = st->st_dev;
-		i->inode = inode;
-		i->next = super->u.arch.deferred;
-		super->u.arch.deferred = i;
-	    }
-	}
-
-	if (st->st_size)
-	    inode->data_offset = CPIO_POS (super);
-
-	entry = vfs_s_new_entry (me, tn, inode);
-	vfs_s_insert_entry (me, root, entry);
-
-	if (S_ISLNK (st->st_mode)) {
-	    inode->linkname = g_malloc (st->st_size + 1);
-	    if (mc_read (super->u.arch.fd, inode->linkname, st->st_size)
-		< st->st_size) {
-		inode->linkname[0] = 0;
-		g_free (name);
-		return STATUS_EOF;
-	    }
-	    inode->linkname[st->st_size] = 0;	/* Linkname stored without terminating \0 !!! */
-	    CPIO_POS (super) += st->st_size;
-	    cpio_skip_padding (super);
-	} else {
-	    CPIO_SEEK_CUR (super, st->st_size);
-	}
-
-    }				/* !entry */
-
-    g_free (name);
-    return STATUS_OK;
-}
-
 /* Need to CPIO_SEEK_CUR to skip the file at the end of add entry!!!! */
 
 static int
diff --git a/vfs/direntry.c b/vfs/direntry.c
index f7a8bfb..80b0b12 100644
--- a/vfs/direntry.c
+++ b/vfs/direntry.c
@@ -400,12 +400,12 @@ vfs_s_find_inode (struct vfs_class *me, const struct vfs_s_super *super,
 		  const char *path, int follow, int flags)
 {
     struct vfs_s_entry *ent;
-    if (!(MEDATA->flags & VFS_S_REMOTE) && (!*path))
+
+    if (((MEDATA->flags & VFS_S_REMOTE) == 0) && (*path == '\0'))
 	return super->root;
+
     ent = (MEDATA->find_entry) (me, super->root, path, follow, flags);
-    if (!ent)
-	return NULL;
-    return ent->ino;
+    return (ent != NULL) ? ent->ino : NULL;
 }
 
 /* Ook, these were functions around directory entries / inodes */
@@ -488,9 +488,8 @@ vfs_s_get_path_mangle (struct vfs_class *me, char *inname,
 
     for (super = MEDATA->supers; super != NULL; super = super->next) {
 	/* 0 == other, 1 == same, return it, 2 == other but stop scanning */
-	int i;
-	if ((i =
-	     MEDATA->archive_same (me, super, archive_name, op, cookie))) {
+	int i = MEDATA->archive_same (me, super, archive_name, op, cookie);
+	if (i != 0) {
 	    if (i == 1)
 		goto return_success;
 	    else
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 7c1de54..f8eb7a1 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -1124,7 +1124,8 @@ static char *
 mc_def_getlocalcopy (const char *filename)
 {
     char *tmp;
-    int fdin, fdout, i;
+    int fdin, fdout;
+    ssize_t i;
     char buffer[8192];
     struct stat mystat;
 
commit f84917a188f6f88cdc0d0d0067beefc13d42f40a
Author: Andrew Borodin <aborodin at vmail.ru>
Date:   Thu Nov 19 10:51:21 2009 +0300

    Fixed skip of empty directories in the root of cpio archive.
    
    Signed-off-by: Andrew Borodin <aborodin at vmail.ru>

diff --git a/vfs/cpio.c b/vfs/cpio.c
index 8c24573..0af9cda 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -331,7 +331,10 @@ cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super,
     tn = strrchr (name, PATH_SEP);
     if (tn == NULL)
 	tn = name;
-    else {
+    else if (tn == name + 1) {
+	/* started with "./" -- directory in the root of archive */
+	tn++;
+    } else {
 	*tn = '\0';
 	root = vfs_s_find_inode (me, super, name, LINK_FOLLOW, FL_MKDIR);
 	*tn = PATH_SEP;
@@ -341,7 +344,7 @@ cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super,
     entry = MEDATA->find_entry (me, root, tn, LINK_FOLLOW, FL_NONE);	/* In case entry is already there */
 
     if (entry != NULL) {
-	/* This shouldn't happen! (well, it can happen if there is a record for a 
+	/* This shouldn't happen! (well, it can happen if there is a record for a
 	   file and than a record for a directory it is in; cpio would die with
 	   'No such file or directory' is such case) */
 

mc-extensions.patch:
 configure.ac   |    2 +-
 misc/mc.ext.in |   51 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 18 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc-extensions.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mc-extensions.patch	1 Sep 2009 05:59:44 -0000	1.16
+++ mc-extensions.patch	15 Dec 2009 14:57:00 -0000	1.17
@@ -1,7 +1,7 @@
-diff -up mc-4.7.0-pre1/configure.ac.extensions mc-4.7.0-pre1/configure.ac
---- mc-4.7.0-pre1/configure.ac.extensions	2009-07-31 18:36:24.000000000 +0200
-+++ mc-4.7.0-pre1/configure.ac	2009-08-05 12:51:08.000000000 +0200
-@@ -67,7 +67,7 @@ AC_PROG_LN_S
+diff -up mc-4.7.0-pre4/configure.ac.extensions mc-4.7.0-pre4/configure.ac
+--- mc-4.7.0-pre4/configure.ac.extensions	2009-10-30 19:44:38.000000000 +0100
++++ mc-4.7.0-pre4/configure.ac	2009-12-10 20:41:43.000000000 +0100
+@@ -69,7 +69,7 @@ AC_PROG_LN_S
  AC_CHECK_TOOL(AR, ar, ar)
  
  dnl Only list browsers here that can be run in background (i.e. with `&')
@@ -10,10 +10,10 @@ diff -up mc-4.7.0-pre1/configure.ac.exte
  
  dnl
  dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
-diff -up mc-4.7.0-pre1/misc/mc.ext.in.extensions mc-4.7.0-pre1/misc/mc.ext.in
---- mc-4.7.0-pre1/misc/mc.ext.in.extensions	2009-06-23 20:55:11.000000000 +0200
-+++ mc-4.7.0-pre1/misc/mc.ext.in	2009-08-05 13:01:48.000000000 +0200
-@@ -221,8 +221,8 @@ regex/\.rpm$
+diff -up mc-4.7.0-pre4/misc/mc.ext.in.extensions mc-4.7.0-pre4/misc/mc.ext.in
+--- mc-4.7.0-pre4/misc/mc.ext.in.extensions	2009-10-29 20:02:37.000000000 +0100
++++ mc-4.7.0-pre4/misc/mc.ext.in	2009-12-10 20:46:47.000000000 +0100
+@@ -226,8 +226,8 @@ regex/\.rpm$
  
  # deb
  regex/\.u?deb$
@@ -24,7 +24,26 @@ diff -up mc-4.7.0-pre1/misc/mc.ext.in.ex
  
  # dpkg
  shell/.debd
-@@ -397,11 +397,16 @@ regex/\.([wW][aA][wW]22)$
+@@ -387,7 +387,7 @@ shell/.ico
+ 	Include=image
+ 
+ include/image
+-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
++	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (eog %f &); fi
+ 	View=%view{ascii} identify %f
+ 	#View=%view{ascii} asciiview %f
+ 
+@@ -395,7 +395,8 @@ include/image
+ ### Sound files ###
+ 
+ regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
+-       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Include=audio
++#       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 
+ regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
+        Open=mikmod %f
+@@ -405,15 +406,22 @@ regex/\.([wW][aA][wW]22)$
         Open=vplay -s 22 %f
  
  regex/\.([mM][pP]3)$
@@ -39,12 +58,19 @@ diff -up mc-4.7.0-pre1/misc/mc.ext.in.ex
  
  regex/\.([oO][gG][gG|aA|vV|xX])$
 -	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
-+	Open=ogg123 %f
++	Include=audio
++#	Open=ogg123 %f
 +#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
  	View=%view{ascii} ogginfo %s
  
  regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
-@@ -414,11 +419,15 @@ regex/\.([wW][mM][aA])$
+-	Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Include=audio
++#	Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 
+ regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
+ 	Open=timidity %f
+@@ -422,11 +430,15 @@ regex/\.([wW][mM][aA])$
  	Open=mplayer -vo null %f
  	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
  
@@ -61,17 +87,31 @@ diff -up mc-4.7.0-pre1/misc/mc.ext.in.ex
  
  
  ### Video ###
-@@ -432,6 +441,9 @@ regex/\.([aA][sS][fFxX])$
- regex/\.([dD][iI][vV][xX])$
- 	Include=video
+@@ -471,12 +486,12 @@ include/video
  
-+regex/\.([mM][kK][vV])$
-+	Include=video
-+
- regex/\.([mM][oO][vV]|[qQ][tT])$
- 	Include=video
+ # Postscript
+ type/^PostScript
+-	Open=(gv %f &)
++	Open=(xdg-open %f &)
+ 	View=%view{ascii} ps2ascii %f
+ 
+ # PDF
+ type/^PDF
+-	Open=(xpdf %f &)
++	Open=(xdg-open %f &)
+ 	#Open=(acroread %f &)
+ 	#Open=(ghostview %f &)
+ 	View=%view{ascii} pdftotext %f -
+@@ -486,7 +501,7 @@ type/^PDF
+ 
+ # html
+ regex/\.([hH][tT][mM][lL]?)$
+-	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
++	Open=(if test -n "$DISPLAY"; then (xdg-open file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
+ 	View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
  
-@@ -496,22 +508,27 @@ shell/.abw
+ # StarOffice 5.2
+@@ -504,22 +519,27 @@ shell/.abw
  
  # Microsoft Word Document
  regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- mc.spec	2 Nov 2009 09:59:40 -0000	1.152
+++ mc.spec	15 Dec 2009 14:57:01 -0000	1.153
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.7.pre4%{?dist}
+Release:	0.8.pre4%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -12,7 +12,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel
 Requires:	dev >= 3.3-3
 
-Patch2:		mc-extensions.patch
+Patch0:		mc-extensions.patch
+Patch1:		mc-rpmvfs.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -23,7 +24,8 @@ specific files.
 
 %prep
 %setup -q -n mc-%{version}-pre4
-%patch2 -p1 -b .extensions
+%patch0 -p1 -b .extensions
+%patch1 -p1 -b .rpmvfs
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -79,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Tue Dec 15 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.8.pre4
+- fix rpmvfs empty directory handling (#529645)
+- fix bindings (#532784)
+
 * Mon Nov 02 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.7.pre4
 - update to 4.7.0-pre4
 



From mclasen at fedoraproject.org  Tue Dec 15 14:58:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 14:58:07 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.280,1.281
Message-ID: <20091215145807.0357511C00E7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32706

Modified Files:
	rhythmbox.spec 
Log Message:
don't ship plugin headers



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- rhythmbox.spec	10 Dec 2009 19:34:44 -0000	1.280
+++ rhythmbox.spec	15 Dec 2009 14:58:06 -0000	1.281
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -130,6 +130,9 @@ rm -rf %{buildroot}/%{_datadir}/gtk-doc/
 rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/libsample-vala.so \
 	%{buildroot}%{_libdir}/rhythmbox/plugins/sample-vala.rb-plugin
 
+# Don't include header files for plugins
+rm -rf %{buildroot}%{_libdir}/rhythmbox/plugins/*/*.h
+
 # save space by linking identical images in translated docs
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
 for f in $helpdir/C/figures/*.png; do
@@ -223,6 +226,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 0.12.6-5
+- Don't include header files for plugins
+
 * Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-4
 - Fix crasher when musicbrainz cannot read a disc (#546188)
 



From stevetraylen at fedoraproject.org  Tue Dec 15 14:58:38 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 15 Dec 2009 14:58:38 +0000 (UTC)
Subject: rpms/activemq-cpp/F-11 activemq-cpp.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091215145838.609FE11C00E7@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/activemq-cpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv840/F-11

Modified Files:
	activemq-cpp.spec sources 
Log Message:
Upstream to 3.0.1



Index: activemq-cpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/F-11/activemq-cpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- activemq-cpp.spec	14 Dec 2009 18:55:18 -0000	1.1
+++ activemq-cpp.spec	15 Dec 2009 14:58:38 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           activemq-cpp
-Version:        2.2.6
-Release:        5%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 Summary:        C++ implementation of JMS-like messaging client
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://activemq.apache.org/cms/
-Source0:        http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-%{version}-src.tar.gz
+Source0:        http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{version}-src.tar.gz
 # Some local texmf configuration to increase default pool_size.
 Patch1:         %{name}-local-texmf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,13 +82,13 @@ for your clients to communicate.  
 %{name}-doc contains api documentation.
 
 %prep
-%setup -q
+%setup -q -n activemq-cpp-library-%{version}
 %patch1 -p1
-
+chmod 644 LICENSE.txt
+chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
 
 
 %build
-mkdir config
 ./autogen.sh
 # Build pdf(30MB) rather than default html(400MB). 
 %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
@@ -130,6 +130,9 @@ make %{?_smp_mflags} check
 %doc doc/%{name}.pdf
 
 %changelog
+* Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-1
+- Upstream to 3.0.1
+- Tar ball name change.
 * Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-5
 - Add libuuid-devel as Requires to -devel package.
 * Sat Nov 14 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2009 18:55:19 -0000	1.2
+++ sources	15 Dec 2009 14:58:38 -0000	1.3
@@ -1 +1 @@
-1222f0d6c5f86ef3ed5a558a533c7564  activemq-cpp-2.2.6-src.tar.gz
+b917d8a27841e9ab0aeeb2297f771447  activemq-cpp-library-3.0.1-src.tar.gz



From stevetraylen at fedoraproject.org  Tue Dec 15 14:58:38 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 15 Dec 2009 14:58:38 +0000 (UTC)
Subject: rpms/activemq-cpp/F-12 activemq-cpp.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091215145838.8253811C00E7@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/activemq-cpp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv840/F-12

Modified Files:
	activemq-cpp.spec sources 
Log Message:
Upstream to 3.0.1



Index: activemq-cpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/F-12/activemq-cpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- activemq-cpp.spec	14 Dec 2009 18:55:19 -0000	1.1
+++ activemq-cpp.spec	15 Dec 2009 14:58:38 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           activemq-cpp
-Version:        2.2.6
-Release:        5%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 Summary:        C++ implementation of JMS-like messaging client
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://activemq.apache.org/cms/
-Source0:        http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-%{version}-src.tar.gz
+Source0:        http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{version}-src.tar.gz
 # Some local texmf configuration to increase default pool_size.
 Patch1:         %{name}-local-texmf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,13 +82,13 @@ for your clients to communicate.  
 %{name}-doc contains api documentation.
 
 %prep
-%setup -q
+%setup -q -n activemq-cpp-library-%{version}
 %patch1 -p1
-
+chmod 644 LICENSE.txt
+chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
 
 
 %build
-mkdir config
 ./autogen.sh
 # Build pdf(30MB) rather than default html(400MB). 
 %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
@@ -130,6 +130,9 @@ make %{?_smp_mflags} check
 %doc doc/%{name}.pdf
 
 %changelog
+* Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-1
+- Upstream to 3.0.1
+- Tar ball name change.
 * Fri Dec 11 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-5
 - Add libuuid-devel as Requires to -devel package.
 * Sat Nov 14 2009 Steve Traylen <steve.traylen at cern.ch> - 2.2.6-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/activemq-cpp/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2009 18:55:19 -0000	1.2
+++ sources	15 Dec 2009 14:58:38 -0000	1.3
@@ -1 +1 @@
-1222f0d6c5f86ef3ed5a558a533c7564  activemq-cpp-2.2.6-src.tar.gz
+b917d8a27841e9ab0aeeb2297f771447  activemq-cpp-library-3.0.1-src.tar.gz



From ajax at fedoraproject.org  Tue Dec 15 15:10:54 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 15 Dec 2009 15:10:54 +0000 (UTC)
Subject: rpms/xorg-x11-util-macros/F-12 sources, 1.15,
	1.16 xorg-x11-util-macros.spec, 1.31, 1.32
Message-ID: <20091215151054.AE74711C0375@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-util-macros/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3280

Modified Files:
	sources xorg-x11-util-macros.spec 
Log Message:
* Mon Dec 14 2009 Adam Jackson <ajax at redhat.com> 1.4.1-1
- util-macros 1.4.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	9 Sep 2009 23:04:09 -0000	1.15
+++ sources	15 Dec 2009 15:10:54 -0000	1.16
@@ -1 +1 @@
-0837fe88af7d692308b25815457a3288  util-macros-1.3.0.tar.bz2
+6c01aac2d7fbefd4f8d80e8320d69c7c  util-macros-1.4.1.tar.bz2


Index: xorg-x11-util-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/F-12/xorg-x11-util-macros.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xorg-x11-util-macros.spec	9 Sep 2009 23:04:09 -0000	1.31
+++ xorg-x11-util-macros.spec	15 Dec 2009 15:10:54 -0000	1.32
@@ -3,7 +3,7 @@
 
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
-Version: 1.3.0
+Version: 1.4.1
 Release: 1%{?dist}
 License: MIT
 Group: Development/System
@@ -38,8 +38,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog
 %{_datadir}/aclocal/xorg-macros.m4
+%{_datadir}/pkgconfig/xorg-macros.pc
+%{_docdir}/util-macros/INSTALL
 
 %changelog
+* Mon Dec 14 2009 Adam Jackson <ajax at redhat.com> 1.4.1-1
+- util-macros 1.4.1
+
 * Thu Sep 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1
 - util-macros 1.3.0
 



From hguemar at fedoraproject.org  Tue Dec 15 15:13:04 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Tue, 15 Dec 2009 15:13:04 +0000 (UTC)
Subject: rpms/python-kiwi/F-11 kiwi-distutils.patch, NONE, 1.1 .cvsignore,
	1.14, 1.15 python-kiwi.spec, 1.20, 1.21 sources, 1.14, 1.15
Message-ID: <20091215151304.B3AB711C00E7@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/pkgs/rpms/python-kiwi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3914

Modified Files:
	.cvsignore python-kiwi.spec sources 
Added Files:
	kiwi-distutils.patch 
Log Message:
upstream 1.9.26 and patch fixing installation to site-packages instead of dist-packages

kiwi-distutils.patch:
 dist.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE kiwi-distutils.patch ---
--- kiwi-1.9.26/kiwi/dist.py.orig	2009-12-14 23:37:15.000000000 +0100
+++ kiwi-1.9.26/kiwi/dist.py	2009-12-14 23:41:53.000000000 +0100
@@ -156,14 +156,10 @@ def get_site_packages_dir(*dirs):
 
     @param dirs: directory names to be appended
     """
-    python_version = sys.version_info[:2]
+
     libdir = get_python_lib(plat_specific=False,
                             standard_lib=True, prefix='')
-    if python_version < (2, 6):
-        site = 'site-packages'
-    else:
-        site = 'dist-packages'
-    return os.path.join(libdir, site, *dirs)
+    return os.path.join(libdir, 'site-packages', *dirs)
 
 def listfiles(*dirs):
     """


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 May 2009 04:34:49 -0000	1.14
+++ .cvsignore	15 Dec 2009 15:13:04 -0000	1.15
@@ -1 +1 @@
-kiwi-1.9.25.tar.gz
+kiwi-1.9.26.tar.bz2


Index: python-kiwi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-11/python-kiwi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-kiwi.spec	8 May 2009 04:34:49 -0000	1.20
+++ python-kiwi.spec	15 Dec 2009 15:13:04 -0000	1.21
@@ -2,14 +2,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-kiwi
-Version:        1.9.25
+Version:        1.9.26
 Release:        1%{?dist}
 Summary:        Framework for Python GUI applications
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.async.com.br/projects/kiwi/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-%{version}.tar.bz2
+# fix kiwi custom distutils to conform python packaging guidelines
+Patch0:		kiwi-distutils.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -48,7 +50,7 @@ useful for reference when writing softwa
 %prep
 %setup -q -n kiwi-%{version}
 sed -i -e 's|share/doc/kiwi|share/doc/%{name}-%{version}|' setup.py
-
+%patch0 -p1 -b .distutils
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -94,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 1.9.26-1
+- Upstream 1.9.26
+- Fix kiwi custom distutils to conform fedora python packaging guidelines.
+
 * Fri May 08 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.25-1
 - Upstream 1.9.25
 - Added Advanced Search in search dialogs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 May 2009 04:34:49 -0000	1.14
+++ sources	15 Dec 2009 15:13:04 -0000	1.15
@@ -1 +1 @@
-bf660040835547f8c92e0f5ea99706c6  kiwi-1.9.25.tar.gz
+43c2aab9acf8d95321ee1ccec2c5e4e4  kiwi-1.9.26.tar.bz2



From tbzatek at fedoraproject.org  Tue Dec 15 15:22:20 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 15 Dec 2009 15:22:20 +0000 (UTC)
Subject: File gvfs-1.4.3.tar.bz2 uploaded to lookaside cache by tbzatek
Message-ID: <20091215152220.61BC428ED46@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gvfs:

2624e5e7d45efd6b742e90bfde24cd20  gvfs-1.4.3.tar.bz2



From tbzatek at fedoraproject.org  Tue Dec 15 15:32:01 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 15 Dec 2009 15:32:01 +0000 (UTC)
Subject: rpms/gvfs/F-12 .cvsignore, 1.50, 1.51 gvfs.spec, 1.175,
	1.176 sources, 1.50,
	1.51 0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch, 
	1.1,
	NONE 0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch, 
	1.1,
	NONE 0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch, 
	1.1, NONE gvfs-1.4.2-handle-null-gdudevices.patch, 1.1,
	NONE gvfs-1.4.2-remove-dead-code.patch, 1.1,
	NONE gvfs-1.4.2-smb-queryfs-win-fix.patch, 1.1,
	NONE gvfs-1.4.2-smb-queryfs.patch, 1.1,
	NONE gvfs-1.4.3-ftp-fixes.patch, 1.1,
	NONE gvfs-1.4.3-metadata-free.patch, 1.1,
	NONE gvfs-1.4.3-smb-queryfs-old-samba.patch, 1.1,
	NONE http-icons.patch, 1.1, NONE
Message-ID: <20091215153201.CCFFA11C00E7@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7732

Modified Files:
	.cvsignore gvfs.spec sources 
Removed Files:
	0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch 
	0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch 
	0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch 
	gvfs-1.4.2-handle-null-gdudevices.patch 
	gvfs-1.4.2-remove-dead-code.patch 
	gvfs-1.4.2-smb-queryfs-win-fix.patch 
	gvfs-1.4.2-smb-queryfs.patch gvfs-1.4.3-ftp-fixes.patch 
	gvfs-1.4.3-metadata-free.patch 
	gvfs-1.4.3-smb-queryfs-old-samba.patch http-icons.patch 
Log Message:
* Tue Dec 15 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.3-1
- Update to 1.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	30 Nov 2009 14:45:56 -0000	1.50
+++ .cvsignore	15 Dec 2009 15:32:00 -0000	1.51
@@ -1 +1 @@
-gvfs-1.4.2.tar.bz2
+gvfs-1.4.3.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- gvfs.spec	8 Dec 2009 19:51:28 -0000	1.175
+++ gvfs.spec	15 Dec 2009 15:32:01 -0000	1.176
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.4.2
-Release: 3%{?dist}
+Version: 1.4.3
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -38,20 +38,9 @@ Patch0: gvfs-archive-integration.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591005
 Patch1: 0001-Add-AFC-backend.patch
 # from upstream
-Patch2: gvfs-1.4.3-smb-queryfs-old-samba.patch
-# from upstream
-Patch3: gvfs-1.4.3-metadata-free.patch
-# from upstream
-Patch4: gvfs-1.4.3-ftp-fixes.patch 
-# from upstream
 Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch
 Patch13: gvfs-1.4.1-http-soup-header-parsing.patch
 
-# from upstream (in master and gnome-2-28 branch already)
-Patch20: 0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch
-Patch21: 0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch
-Patch22: 0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch
-
 
 Obsoletes: gnome-mount <= 0.8
 Obsoletes: gnome-mount-nautilus-properties <= 0.8
@@ -149,14 +138,8 @@ and iPod Touches to applications using g
 %setup -q
 %patch0 -p1 -b .archive-integration
 %patch1 -p1 -b .afc
-%patch2 -p1 -b .samba-queryfs-older
-%patch3 -p1 -b .metadata-free
-%patch4 -p1 -b .ftp-fix
 %patch12 -p1 -b .http-query-info
 %patch13 -p1 -b .http-headers
-%patch20 -p1 -b .udisks-fixes
-%patch21 -p1 -b .handle-new-umount-behavior
-%patch22 -p1 -b .careful-automounting
 
 %build
 
@@ -322,6 +305,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Dec 15 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.3-1
+- Update to 1.4.3
+
 * Tue Dec  8 2009 David Zeuthen <davidz at redhat.com> - 1.4.2-3
 - Backport fixes from git
 - Correct wrong assumptions about how libgdu.so works


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	30 Nov 2009 14:45:56 -0000	1.50
+++ sources	15 Dec 2009 15:32:01 -0000	1.51
@@ -1 +1 @@
-ad845f0472a6cebd1ebb8ef3758d4989  gvfs-1.4.2.tar.bz2
+2624e5e7d45efd6b742e90bfde24cd20  gvfs-1.4.3.tar.bz2


--- 0001-gdu-Stop-assuming-that-drives-have-no-enclosing-pres.patch DELETED ---


--- 0002-gdu-Prefer-using-dev_t-to-device-file-when-comparing.patch DELETED ---


--- 0003-gdu-Be-more-careful-with-automounting-use-a-whitelis.patch DELETED ---


--- gvfs-1.4.2-handle-null-gdudevices.patch DELETED ---


--- gvfs-1.4.2-remove-dead-code.patch DELETED ---


--- gvfs-1.4.2-smb-queryfs-win-fix.patch DELETED ---


--- gvfs-1.4.2-smb-queryfs.patch DELETED ---


--- gvfs-1.4.3-ftp-fixes.patch DELETED ---


--- gvfs-1.4.3-metadata-free.patch DELETED ---


--- gvfs-1.4.3-smb-queryfs-old-samba.patch DELETED ---


--- http-icons.patch DELETED ---



From sandeen at fedoraproject.org  Tue Dec 15 15:52:25 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue, 15 Dec 2009 15:52:25 +0000 (UTC)
Subject: File fio-1.36.tar.bz2 uploaded to lookaside cache by sandeen
Message-ID: <20091215155225.296FF28ECE0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for fio:

39bcdb3864091b8e6bced4b360988c52  fio-1.36.tar.bz2



From caolanm at fedoraproject.org  Tue Dec 15 15:54:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 15 Dec 2009 15:54:38 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch, 1.1, 1.2
Message-ID: <20091215155438.F002B11C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11753

Modified Files:
	openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch 
Log Message:
Resolves: rhbz#547176 defuzz

openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch:
 drviews1.cxx |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

Index: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch	15 Dec 2009 13:27:58 -0000	1.1
+++ openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch	15 Dec 2009 15:54:38 -0000	1.2
@@ -1,7 +1,7 @@
 diff -ru sd.orig/source/ui/view/drviews1.cxx sd/source/ui/view/drviews1.cxx
 --- sd.orig/source/ui/view/drviews1.cxx	2009-12-15 12:17:56.000000000 +0000
 +++ sd/source/ui/view/drviews1.cxx	2009-12-15 12:19:47.000000000 +0000
-@@ -157,12 +157,32 @@
+@@ -157,6 +157,27 @@
      ViewShell::Deactivate(bIsMDIActivate);
  }
  
@@ -29,13 +29,7 @@ diff -ru sd.orig/source/ui/view/drviews1
  /*************************************************************************
  |*
  |* Wird gerufen, wenn sich der Selektionszustand der View aendert
- |*
- \************************************************************************/
--
- void DrawViewShell::SelectionHasChanged (void)
- {
- 	Invalidate();
-@@ -216,6 +236,8 @@
+@@ -218,6 +239,8 @@
  			// we need to deselect it now
  			if (!pOleObj)
  			{



From simo at fedoraproject.org  Tue Dec 15 15:57:25 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 15 Dec 2009 15:57:25 +0000 (UTC)
Subject: File tdb-1.2.0.tar.gz uploaded to lookaside cache by simo
Message-ID: <20091215155725.D896F28ED16@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libtdb:

4115849d2ef431a10bc1f1933eafb9b6  tdb-1.2.0.tar.gz



From tbzatek at fedoraproject.org  Tue Dec 15 15:57:41 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 15 Dec 2009 15:57:41 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec, 1.166,
	1.167 gvfs-1.5.1-afc-remove-unreleased.patch, 1.1, NONE
Message-ID: <20091215155741.3D0CB11C00E7@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12588

Modified Files:
	gvfs.spec 
Removed Files:
	gvfs-1.5.1-afc-remove-unreleased.patch 
Log Message:
* Tue Dec 15 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.5.1-3
- Rebuilt against new libiphone



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- gvfs.spec	30 Nov 2009 16:23:38 -0000	1.166
+++ gvfs.spec	15 Dec 2009 15:57:41 -0000	1.167
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -33,8 +33,6 @@ BuildRequires: automake autoconf
 BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch0: gvfs-archive-integration.patch
-# some AFC code depends on unreleased libiphone additions
-Patch1: gvfs-1.5.1-afc-remove-unreleased.patch
 # from upstream
 Patch2: gvfs-1.5.2-metadata-fix-rotated.patch
 Patch3: gvfs-1.5.2-metadata-fsync-directory.patch
@@ -138,7 +136,6 @@ and iPod Touches to applications using g
 %prep
 %setup -q
 %patch0 -p1 -b .archive-integration
-%patch1 -p1 -b .afc-unreleased
 %patch2 -p1 -b .metadata-rotated
 %patch3 -p1 -b .metadata-dir-fsync
 %patch4 -p1 -b .smb-queryfs-older
@@ -310,6 +307,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Dec 15 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.5.1-3
+- Rebuilt against new libiphone
+
 * Mon Nov 30 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.5.1-2
 - Metadata fixes
 - SMB: Fix free space calculation for older samba servers


--- gvfs-1.5.1-afc-remove-unreleased.patch DELETED ---



From simo at fedoraproject.org  Tue Dec 15 15:58:35 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Tue, 15 Dec 2009 15:58:35 +0000 (UTC)
Subject: rpms/libtdb/devel .cvsignore, 1.3, 1.4 libtdb.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <20091215155835.3D9F211C00E7@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/libtdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12896

Modified Files:
	.cvsignore libtdb.spec sources 
Log Message:
* Tue Dec 15 2009 Simo Sorce <ssorce at redhat.com> - 1.2.0-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtdb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Jun 2009 18:54:00 -0000	1.3
+++ .cvsignore	15 Dec 2009 15:58:35 -0000	1.4
@@ -1 +1 @@
-tdb-1.1.5.tar.gz
+tdb-1.2.0.tar.gz


Index: libtdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtdb/devel/libtdb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libtdb.spec	25 Jul 2009 08:44:20 -0000	1.5
+++ libtdb.spec	15 Dec 2009 15:58:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name: libtdb
-Version: 1.1.5
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 Group: System Environment/Daemons
 Summary: The tdb library
 License: LGPLv3+
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 15 2009 Simo Sorce <ssorce at redhat.com> - 1.2.0-1
+- New upstream release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtdb/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Jun 2009 15:04:54 -0000	1.4
+++ sources	15 Dec 2009 15:58:35 -0000	1.5
@@ -1 +1 @@
-3e9be7c1dbfba0679dc3463d55e3a830  tdb-1.1.5.tar.gz
+4115849d2ef431a10bc1f1933eafb9b6  tdb-1.2.0.tar.gz



From vcrhonek at fedoraproject.org  Tue Dec 15 15:59:36 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 15 Dec 2009 15:59:36 +0000 (UTC)
Subject: rpms/tcsh/F-12 tcsh-6.17.00-printexitvalue.patch, NONE,
	1.1 tcsh.spec, 1.66, 1.67
Message-ID: <20091215155936.431CA11C00E7@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/pkgs/rpms/tcsh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13234

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.17.00-printexitvalue.patch 
Log Message:
Fix tcsh obeys printexitvalue for back-ticks

tcsh-6.17.00-printexitvalue.patch:
 sh.glob.c |    4 ++++
 sh.sem.c  |   18 +++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

--- NEW FILE tcsh-6.17.00-printexitvalue.patch ---
diff -up tcsh-6.17.00/sh.glob.c_old tcsh-6.17.00/sh.glob.c
--- tcsh-6.17.00/sh.glob.c_old	2009-12-15 12:38:48.000000000 +0100
+++ tcsh-6.17.00/sh.glob.c	2009-12-15 12:40:52.000000000 +0100
@@ -882,6 +882,10 @@ backeval(struct blk_buf *bb, struct Strb
 	    alias(&paraml);
 	    t = syntax(paraml.next, &paraml, 0);
 	    cleanup_push(t, syntax_cleanup);
+	    /* The F_BACKQ flag must set so the job output is correct if
+	     * printexitvalue is set.  If it's not set, the job output
+	     * will have "Exit N" appended where N is the exit status. */
+	    t->t_dflg = F_BACKQ;
 	    if (seterr)
 		stderror(ERR_OLD);
 #ifdef SIGTSTP
diff -up tcsh-6.17.00/sh.sem.c_old tcsh-6.17.00/sh.sem.c
--- tcsh-6.17.00/sh.sem.c_old	2009-12-15 12:41:03.000000000 +0100
+++ tcsh-6.17.00/sh.sem.c	2009-12-15 12:57:49.000000000 +0100
@@ -664,31 +664,31 @@ execute(struct command *t, volatile int 
 #endif /* !CLOSE_ON_EXEC */
 	didfds = 0;
 	wanttty = -1;
-	t->t_dspr->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	t->t_dspr->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	execute(t->t_dspr, wanttty, NULL, NULL, do_glob);
 	exitstat();
 
     case NODE_PIPE:
 #ifdef BACKPIPE
 	t->t_dcdr->t_dflg |= F_PIPEIN | (t->t_dflg &
-			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT));
+			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcdr, wanttty, pv, pipeout, do_glob);
 	t->t_dcar->t_dflg |= F_PIPEOUT |
-	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT));
+	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcar, wanttty, pipein, pv, do_glob);
 #else /* !BACKPIPE */
 	t->t_dcar->t_dflg |= F_PIPEOUT |
-	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT));
+	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcar, wanttty, pipein, pv, do_glob);
 	t->t_dcdr->t_dflg |= F_PIPEIN | (t->t_dflg &
-			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT));
+			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcdr, wanttty, pv, pipeout, do_glob);
 #endif /* BACKPIPE */
 	break;
 
     case NODE_LIST:
 	if (t->t_dcar) {
-	    t->t_dcar->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	    t->t_dcar->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcar, wanttty, NULL, NULL, do_glob);
 	    /*
 	     * In strange case of A&B make a new job after A
@@ -699,7 +699,7 @@ execute(struct command *t, volatile int 
 	}
 	if (t->t_dcdr) {
 	    t->t_dcdr->t_dflg |= t->t_dflg &
-		(F_NOFORK | F_NOINTERRUPT);
+		(F_NOFORK | F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcdr, wanttty, NULL, NULL, do_glob);
 	}
 	break;
@@ -707,7 +707,7 @@ execute(struct command *t, volatile int 
     case NODE_OR:
     case NODE_AND:
 	if (t->t_dcar) {
-	    t->t_dcar->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	    t->t_dcar->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcar, wanttty, NULL, NULL, do_glob);
 	    if ((getn(varval(STRstatus)) == 0) !=
 		(t->t_dtyp == NODE_AND)) {
@@ -716,7 +716,7 @@ execute(struct command *t, volatile int 
 	}
 	if (t->t_dcdr) {
 	    t->t_dcdr->t_dflg |= t->t_dflg &
-		(F_NOFORK | F_NOINTERRUPT);
+		(F_NOFORK | F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcdr, wanttty, NULL, NULL, do_glob);
 	}
 	break;


Index: tcsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcsh/F-12/tcsh.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- tcsh.spec	4 Nov 2009 13:51:24 -0000	1.66
+++ tcsh.spec	15 Dec 2009 15:59:36 -0000	1.67
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.17
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
@@ -19,6 +19,7 @@ Patch11: tcsh-6.14.00-order.patch
 Patch12: tcsh-6.15.00-rs-color.patch
 Patch13: tcsh-6.17.00-mh-color.patch
 Patch14: tcsh-6.17.00-glob-automount.patch
+Patch15: tcsh-6.17.00-printexitvalue.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -48,6 +49,7 @@ like syntax.
 %patch12 -p1 -b .rs-color
 %patch13 -p1 -b .mh-color
 %patch14 -p1 -b .glob-automount
+%patch15 -p1 -b .printexitvalue
 
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -121,6 +123,10 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Tue Dec 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-5
+- Fix tcsh obeys printexitvalue for back-ticks
+  Resolves: #546644
+
 * Wed Nov  4 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-4
 - Fix tcsh globbing causing bad automount
 



From mclasen at fedoraproject.org  Tue Dec 15 16:05:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 16:05:03 +0000 (UTC)
Subject: rpms/ConsoleKit/F-12 nodeamon.patch, NONE, 1.1 ConsoleKit.spec, 1.49,
	1.50
Message-ID: <20091215160503.3872A11C00E7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14422

Modified Files:
	ConsoleKit.spec 
Added Files:
	nodeamon.patch 
Log Message:
Don't daemonize when activated


nodeamon.patch:
 org.freedesktop.ConsoleKit.service.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nodeamon.patch ---
diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in
--- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon	2009-12-15 10:56:39.839818556 -0500
+++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in	2009-12-15 10:56:50.177792048 -0500
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.ConsoleKit
-Exec=@sbindir@/console-kit-daemon
+Exec=@sbindir@/console-kit-daemon --no-daemon
 User=root


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/F-12/ConsoleKit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ConsoleKit.spec	29 Sep 2009 15:46:00 -0000	1.49
+++ ConsoleKit.spec	15 Dec 2009 16:05:02 -0000	1.50
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -25,6 +25,9 @@ BuildRequires: zlib-devel
 BuildRequires: xmlto
 BuildRequires: automake, autoconf, libtool
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=25656
+Patch0: nodaemon.patch
+
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -166,6 +169,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 0.4.1-2
+- Don't daemonize when activated on the bus
+
 * Tue Sep 29 2009 Jon McCann <jmccann at redhat.com> 0.4.1-1
 - Update to 0.4.1
 



From sandeen at fedoraproject.org  Tue Dec 15 16:08:15 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue, 15 Dec 2009 16:08:15 +0000 (UTC)
Subject: rpms/fio/devel .cvsignore, 1.14, 1.15 fio.spec, 1.15, 1.16 sources, 
	1.14, 1.15
Message-ID: <20091215160816.07B5B11C00E7@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/fio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15176

Modified Files:
	.cvsignore fio.spec sources 
Log Message:
* Tue Dec 15 2009 Eric Sandeen <sandeen at redhat.com> 1.36-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	5 Nov 2009 16:11:48 -0000	1.14
+++ .cvsignore	15 Dec 2009 16:08:15 -0000	1.15
@@ -1 +1 @@
-fio-1.35.tar.bz2
+fio-1.36.tar.bz2


Index: fio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/fio.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fio.spec	5 Nov 2009 16:11:48 -0000	1.15
+++ fio.spec	15 Dec 2009 16:08:15 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		fio
-Version:	1.35
+Version:	1.36
 Release:	1%{?dist}
 Summary:	Multithreaded IO generation tool
 
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 15 2009 Eric Sandeen <sandeen at redhat.com> 1.36-1
+- New upstream version
+
 * Thu Nov 05 2009 Eric Sandeen <sandeen at redhat.com> 1.35-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fio/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	5 Nov 2009 16:11:49 -0000	1.14
+++ sources	15 Dec 2009 16:08:15 -0000	1.15
@@ -1 +1 @@
-08439cbb6f2532355f7207e41f57ef6b  fio-1.35.tar.bz2
+39bcdb3864091b8e6bced4b360988c52  fio-1.36.tar.bz2



From dwalsh at fedoraproject.org  Tue Dec 15 16:10:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 15 Dec 2009 16:10:14 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-targeted.conf, 1.154,
	1.155 policy-F12.patch, 1.153, 1.154 selinux-policy.spec, 1.981, 1.982
Message-ID: <20091215161015.0334911C0375@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15600

Modified Files:
	modules-targeted.conf policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Dec 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-59
- Dontaudit udp_socket leaks for xauth_t
- Dontaudit rules for iceauth_t
- Let locate read symlinks on noxattr file systems
- Remove wine from unconfined domain if unconfined pp removed
- Add labels for vhostmd
- Add port 546 as a dhcpc port
- Add labeled for /dev/dahdi
- Add certmonger policy
- Allow sysadm to communicate with racoon and zebra
- Allow dbus service dbus_chat with unconfined_t
- Fixes for xguest
- Add dontaudits for abrt
- file contexts for mythtv
- Lots of fixes for asterisk
- Fix file context for certmaster
- Add log dir for dovecot
- Policy for ksmtuned
- File labeling and fixes for mysql and mysql_safe
- New plugin infrstructure for nagios
- Allow nut_upsd_t dac_override
- File context fixes for nx
- Allow oddjob_mkhomedir to create homedir
- Add pcscd_pub interfaces to be used by xdm
- Add stream connect from fenced to corosync
- Fixes for swat
- Allow fsdaemon to manage scsi devices
- Policy for tgtd
- Policy for vhostmd
- Allow ipsec to create tmp files
- Change label on fusermount



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- modules-targeted.conf	9 Dec 2009 19:53:38 -0000	1.154
+++ modules-targeted.conf	15 Dec 2009 16:10:10 -0000	1.155
@@ -233,6 +233,13 @@ certwatch = module
 certmaster = module
 
 # Layer: services
+# Module: certmonger
+#
+# Certificate status monitor and PKI enrollment client
+# 
+certmonger = module
+
+# Layer: services
 # Module: cipe
 #
 # Encrypted tunnel daemon

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |   80 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   43 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   45 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |   14 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  438 +++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  450 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  117 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  448 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   52 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   21 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   51 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.te          |   11 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  190 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  398 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   59 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  283 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  637 ++++++++++-
 policy/modules/services/xserver.te        |  382 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  184 +++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   75 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  186 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   82 +
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1691 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 412 files changed, 21370 insertions(+), 2826 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.153 -r 1.154 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- policy-F12.patch	10 Dec 2009 21:38:24 -0000	1.153
+++ policy-F12.patch	15 Dec 2009 16:10:11 -0000	1.154
@@ -259,7 +259,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/kismet(/.*)?			gen_context(system_u:object_r:kismet_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.32/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-14 07:03:10.000000000 -0500
 @@ -26,6 +26,9 @@
  type kismet_var_run_t;
  files_pid_file(kismet_var_run_t)
@@ -296,6 +296,14 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(kismet_t)
  
+@@ -71,6 +82,7 @@
+ corenet_tcp_sendrecv_all_ports(kismet_t)
+ corenet_tcp_bind_generic_node(kismet_t)
+ corenet_tcp_bind_kismet_port(kismet_t)
++corenet_tcp_connect_gpsd_port(kismet_t)
+ corenet_tcp_connect_kismet_port(kismet_t)
+ corenet_tcp_connect_pulseaudio_port(kismet_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-07 16:23:11.000000000 -0500
@@ -1818,7 +1826,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te	2009-12-15 09:51:23.000000000 -0500
 @@ -42,6 +42,7 @@
  cron_system_entry(tmpreaper_t, tmpreaper_exec_t)
  
@@ -1827,19 +1835,21 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_delete_user_home_content_dirs(tmpreaper_t)
  	userdom_delete_user_home_content_files(tmpreaper_t)
  	userdom_delete_user_home_content_symlinks(tmpreaper_t)
-@@ -52,6 +53,11 @@
+@@ -52,6 +53,13 @@
  ')
  
  optional_policy(`
 +	apache_delete_sys_content_rw(tmpreaper_t)
++	apache_list_cache(tmpreaper_t)
 +	apache_delete_cache(tmpreaper_t)
++	apache_setattr_cache_dirs(tmpreaper_t)
 +')
 +
 +optional_policy(`
  	kismet_manage_log(tmpreaper_t)
  ')
  
-@@ -60,5 +66,9 @@
+@@ -60,5 +68,9 @@
  ')
  
  optional_policy(`
@@ -3360,8 +3370,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.6.32/policy/modules/apps/livecd.te
 --- nsaserefpolicy/policy/modules/apps/livecd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/livecd.te	2009-12-03 13:45:10.000000000 -0500
-@@ -0,0 +1,27 @@
++++ serefpolicy-3.6.32/policy/modules/apps/livecd.te	2009-12-14 06:26:17.000000000 -0500
+@@ -0,0 +1,28 @@
 +policy_module(livecd, 1.0.0)
 +
 +########################################
@@ -3389,6 +3399,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +seutil_domtrans_setfiles_mac(livecd_t)
 +
++allow livecd_t self:passwd { passwd chfn chsh };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.6.32/policy/modules/apps/loadkeys.te
 --- nsaserefpolicy/policy/modules/apps/loadkeys.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/loadkeys.te	2009-12-03 13:45:10.000000000 -0500
@@ -3569,7 +3580,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.6.32/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/mozilla.if	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/mozilla.if	2009-12-15 09:19:26.000000000 -0500
 @@ -45,6 +45,18 @@
  	relabel_dirs_pattern($2, mozilla_home_t, mozilla_home_t)
  	relabel_files_pattern($2, mozilla_home_t, mozilla_home_t)
@@ -5886,6 +5897,17 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	mozilla_dontaudit_manage_user_home_files(seunshare_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-3.6.32/policy/modules/apps/slocate.te
+--- nsaserefpolicy/policy/modules/apps/slocate.te	2009-09-16 10:01:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/slocate.te	2009-12-14 07:21:33.000000000 -0500
+@@ -50,6 +50,7 @@
+ fs_getattr_all_symlinks(locate_t)
+ fs_list_all(locate_t)
+ fs_list_inotifyfs(locate_t)
++fs_read_noxattr_fs_symlinks(locate_t)
+ 
+ # getpwnam
+ auth_use_nsswitch(locate_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.6.32/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/vmware.te	2009-12-03 13:45:10.000000000 -0500
@@ -6419,8 +6441,16 @@ diff -b -B --ignore-all-space --exclude-
  #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.6.32/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.fc	2009-12-03 13:45:10.000000000 -0500
-@@ -47,8 +47,10 @@
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.fc	2009-12-12 07:47:41.000000000 -0500
+@@ -17,6 +17,7 @@
+ /dev/autofs.*		-c	gen_context(system_u:object_r:autofs_device_t,s0)
+ /dev/beep		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/controlD64		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
++/dev/dahdi/.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/dmfm		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/dmmidi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/dsp.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+@@ -47,8 +48,10 @@
  /dev/kmem		-c	gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
  /dev/kmsg		-c	gen_context(system_u:object_r:kmsg_device_t,mls_systemhigh)
  /dev/kqemu		-c	gen_context(system_u:object_r:qemu_device_t,s0)
@@ -6431,7 +6461,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/lircm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/logibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
-@@ -82,6 +84,7 @@
+@@ -82,6 +85,7 @@
  /dev/radio.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  /dev/random		-c	gen_context(system_u:object_r:random_device_t,s0)
  /dev/raw1394.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
@@ -6439,7 +6469,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/(misc/)?rtc[0-9]*	-c	gen_context(system_u:object_r:clock_device_t,s0)
  /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
-@@ -101,7 +104,7 @@
+@@ -101,7 +105,7 @@
  /dev/usbscanner		-c	gen_context(system_u:object_r:scanner_device_t,s0)
  ')
  /dev/vbi.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
@@ -6448,7 +6478,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/vmmon		-c	gen_context(system_u:object_r:vmware_device_t,s0)
  /dev/vmnet.*		-c	gen_context(system_u:object_r:vmware_device_t,s0)
  /dev/video.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
-@@ -138,9 +141,14 @@
+@@ -138,9 +142,14 @@
  /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)
@@ -6463,7 +6493,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/pts(/.*)?			<<none>>
  
  /dev/s(ou)?nd/.*	-c	gen_context(system_u:object_r:sound_device_t,s0)
-@@ -148,6 +156,8 @@
+@@ -148,6 +157,8 @@
  /dev/touchscreen/ucb1x00 -c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/touchscreen/mk712	-c	gen_context(system_u:object_r:mouse_device_t,s0)
  
@@ -6472,7 +6502,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/usb/dc2xx.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
  /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
-@@ -168,6 +178,7 @@
+@@ -168,6 +179,7 @@
  
  ifdef(`distro_redhat',`
  # originally from named.fc
@@ -7313,20 +7343,20 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-10 10:34:27.000000000 -0500
-@@ -110,6 +110,11 @@
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-15 08:48:57.000000000 -0500
+@@ -110,7 +110,11 @@
  ## </param>
  #
  interface(`files_config_file',`
 +	gen_require(`
-+		attribute etcfile;
++		attribute configfile;
 +	')
-+
-+	typeattribute $1 etcfile;
  	files_type($1)
++	typeattribute $1 configfile;
  ')
  
-@@ -928,10 +933,8 @@
+ ########################################
+@@ -928,10 +932,8 @@
  	relabel_lnk_files_pattern($1, { file_type $2 }, { file_type $2 })
[...2658 lines suppressed...]
@@ -34295,7 +34976,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -303,6 +300,7 @@
+@@ -303,6 +298,7 @@
  	manage_sock_files_pattern($2, user_tmp_t, user_tmp_t)
  	manage_fifo_files_pattern($2, user_tmp_t, user_tmp_t)
  	files_tmp_filetrans($2, user_tmp_t, { dir file lnk_file sock_file fifo_file })
@@ -34303,7 +34984,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -322,6 +320,7 @@
+@@ -322,6 +318,7 @@
  	')
  
  	exec_files_pattern($1, user_tmp_t, user_tmp_t)
@@ -34311,7 +34992,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_search_tmp($1)
  ')
  
-@@ -368,46 +367,41 @@
+@@ -368,46 +365,41 @@
  
  #######################################
  ## <summary>
@@ -34378,7 +35059,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -412,7 +406,7 @@
+@@ -412,7 +404,7 @@
  
  #######################################
  ## <summary>
@@ -34387,7 +35068,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="userdomain_prefix">
  ##	<summary>
-@@ -420,35 +414,58 @@
+@@ -420,35 +412,58 @@
  ##	is the prefix for user_t).
  ##	</summary>
  ## </param>
@@ -34431,17 +35112,17 @@ diff -b -B --ignore-all-space --exclude-
 +	dev_read_video_dev($1)
 +	dev_write_video_dev($1)
 +	dev_rw_wireless($1)
-+
-+	miscfiles_dontaudit_write_fonts($1)
-+
-+	optional_policy(`
-+		udev_read_db($1)
-+	')
  
 -	xserver_user_x_domain_template($1, $1_t, user_tmpfs_t)
 -	xserver_xsession_entry_type($1_t)
 -	xserver_dontaudit_write_log($1_t)
 -	xserver_stream_connect_xdm($1_t)
++	miscfiles_dontaudit_write_fonts($1)
++
++	optional_policy(`
++		udev_read_db($1)
++	')
++
 +	optional_policy(`
 +		setroubleshoot_dontaudit_dbus_chat($1)
 +	')
@@ -34465,7 +35146,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -498,7 +515,7 @@
+@@ -498,7 +513,7 @@
  		attribute unpriv_userdomain;
  	')
  
@@ -34474,7 +35155,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +525,213 @@
+@@ -508,182 +523,215 @@
  	# evolution and gnome-session try to create a netlink socket
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
@@ -34539,6 +35220,8 @@ diff -b -B --ignore-all-space --exclude-
 +	fs_read_noxattr_fs_files($1_usertype)
 +	fs_read_noxattr_fs_symlinks($1_usertype)
 +
++	auth_use_nsswitch($1_usertype)
++
 +	logging_send_syslog_msg($1_usertype)
 +	logging_send_audit_msgs($1_usertype)
 +	selinux_get_enforce_mode($1_usertype)
@@ -34609,19 +35292,19 @@ diff -b -B --ignore-all-space --exclude-
 -		# Allow graphical boot to check battery lifespan
 -		apm_stream_connect($1_t)
 +		chrome_role($1_r, $1_usertype)
- 	')
- 
- 	optional_policy(`
--		canna_stream_connect($1_t)
++	')
++
++	optional_policy(`
 +		dbus_system_bus_client($1_usertype)
 +
 +		allow $1_usertype $1_usertype:dbus  send_msg;
 +
 +		optional_policy(`
 +			avahi_dbus_chat($1_usertype)
-+		')
-+
-+		optional_policy(`
+ 	')
+ 
+ 	optional_policy(`
+-		canna_stream_connect($1_t)
 +			bluetooth_dbus_chat($1_usertype)
  	')
  
@@ -34772,9 +35455,7 @@ diff -b -B --ignore-all-space --exclude-
 -	userdom_manage_tmpfs_role($1_r, $1_t)
 +	userdom_manage_tmp_role($1_r, $1_usertype)
 +	userdom_manage_tmpfs_role($1_r, $1_usertype)
- 
--	userdom_exec_user_tmp_files($1_t)
--	userdom_exec_user_home_content_files($1_t)
++
 +	ifelse(`$1',`unconfined',`',`
 +		gen_tunable(allow_$1_exec_content, true)
 +
@@ -34785,7 +35466,9 @@ diff -b -B --ignore-all-space --exclude-
 +		tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
 +                        fs_exec_nfs_files($1_usertype)
 +		')
-+
+ 
+-	userdom_exec_user_tmp_files($1_t)
+-	userdom_exec_user_home_content_files($1_t)
 +		tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',`
 +			fs_exec_cifs_files($1_usertype)
 +		')
@@ -35462,7 +36145,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	temporary files.
  ## </summary>
  ## <param name="domain">
-@@ -2205,30 +2421,49 @@
+@@ -2205,21 +2421,40 @@
  ##	</summary>
  ## </param>
  #
@@ -35486,16 +36169,14 @@ diff -b -B --ignore-all-space --exclude-
  ##	<summary>
 -##	Domain allowed access.
 +##	Domain to not audit.
- ##	</summary>
- ## </param>
- #
--interface(`userdom_read_user_tmp_symlinks',`
++##	</summary>
++## </param>
++#
 +interface(`userdom_dontaudit_manage_user_tmp_files',`
- 	gen_require(`
- 		type user_tmp_t;
- 	')
- 
--	read_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
++	gen_require(`
++		type user_tmp_t;
++	')
++
 +	dontaudit $1 user_tmp_t:file manage_file_perms;
 +')
 +
@@ -35506,18 +36187,9 @@ diff -b -B --ignore-all-space --exclude-
 +## <param name="domain">
 +##	<summary>
 +##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`userdom_read_user_tmp_symlinks',`
-+	gen_require(`
-+		type user_tmp_t;
-+	')
-+
-+	read_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
- 	allow $1 user_tmp_t:dir list_dir_perms;
- 	files_search_tmp($1)
- ')
+ ##	</summary>
+ ## </param>
+ #
 @@ -2276,6 +2511,46 @@
  ########################################
  ## <summary>


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.981
retrieving revision 1.982
diff -u -p -r1.981 -r1.982
--- selinux-policy.spec	10 Dec 2009 21:38:24 -0000	1.981
+++ selinux-policy.spec	15 Dec 2009 16:10:14 -0000	1.982
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 58%{?dist}
+Release: 59%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -181,7 +181,7 @@ FILE_CONTEXT=%{_sysconfdir}/selinux/%1/c
 selinuxenabled; \
 if [ $? = 0  -a "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
-	restorecon -R /var/log /var/run 2> /dev/null; \
+	restorecon -R /root /var/log /var/run /var/lib 2> /dev/null;\
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 
 
@@ -449,6 +449,38 @@ exit 0
 %endif
 
 %changelog
+* Tue Dec 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-59
+- Dontaudit udp_socket leaks for xauth_t
+- Dontaudit rules for iceauth_t
+- Let locate read symlinks on noxattr file systems
+- Remove wine from unconfined domain if unconfined pp removed
+- Add labels for vhostmd
+- Add port 546 as a dhcpc port
+- Add labeled for /dev/dahdi
+- Add certmonger policy
+- Allow sysadm to communicate with racoon and zebra
+- Allow dbus service dbus_chat with unconfined_t
+- Fixes for xguest
+- Add dontaudits for abrt
+- file contexts for mythtv
+- Lots of fixes for asterisk
+- Fix file context for certmaster
+- Add log dir for dovecot
+- Policy for ksmtuned
+- File labeling and fixes for mysql and mysql_safe
+- New plugin infrstructure for nagios
+- Allow nut_upsd_t dac_override
+- File context fixes for nx
+- Allow oddjob_mkhomedir to create homedir
+- Add pcscd_pub interfaces to be used by xdm
+- Add stream connect from fenced to corosync
+- Fixes for swat
+- Allow fsdaemon to manage scsi devices
+- Policy for tgtd
+- Policy for vhostmd
+- Allow ipsec to create tmp files
+- Change label on fusermount
+
 * Thu Dec 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-58
 - Dontaudit udp_socket leaks for xauth_t
 



From steved at fedoraproject.org  Tue Dec 15 16:11:03 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 15 Dec 2009 16:11:03 +0000 (UTC)
Subject: File libevent-1.4.13-stable.tar.gz uploaded to lookaside cache by
	steved
Message-ID: <20091215161103.DE6A728ED1D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libevent:

0b3ea18c634072d12b3c1ee734263664  libevent-1.4.13-stable.tar.gz



From steved at fedoraproject.org  Tue Dec 15 16:12:07 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 15 Dec 2009 16:12:07 +0000 (UTC)
Subject: rpms/libevent/devel .cvsignore, 1.9, 1.10 libevent.spec, 1.22,
	1.23 sources, 1.9, 1.10 libevent-1.4.12-stable-epoll.patch, 1.1, NONE
Message-ID: <20091215161207.5E6C411C00E7@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16075

Modified Files:
	.cvsignore libevent.spec sources 
Removed Files:
	libevent-1.4.12-stable-epoll.patch 
Log Message:
Updated to latest stable upstream version: 1.4.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 Aug 2009 20:33:43 -0000	1.9
+++ .cvsignore	15 Dec 2009 16:12:06 -0000	1.10
@@ -6,3 +6,4 @@ libevent-1.4.4-stable.tar.gz
 libevent-1.4.5-stable.tar.gz
 libevent-1.4.10-stable.tar.gz
 libevent-1.4.12-stable.tar.gz
+libevent-1.4.13-stable.tar.gz


Index: libevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/libevent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libevent.spec	18 Aug 2009 20:45:10 -0000	1.22
+++ libevent.spec	15 Dec 2009 16:12:07 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           libevent
-Version:        1.4.12
+Version:        1.4.13
 Release:        1%{?dist}
 Summary:        Abstract asynchronous event notification library
 
@@ -11,8 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires: doxygen
 
-Patch00: libevent-1.4.12-stable-configure.patch
-Patch01: libevent-1.4.12-stable-epoll.patch
+Patch00: libevent-1.4.13-stable-configure.patch
 
 %description
 The libevent API provides a mechanism to execute a callback function
@@ -38,8 +37,6 @@ you will need to install %{name}-devel.
 
 # 477685 -  libevent-devel multilib conflict
 %patch00 -p1
-# 517918 -  epoll backend allocates too much memory
-%patch01 -p1
 
 %build
 %configure \
@@ -112,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/%{name}-devel-%{version}/sample/*
 
 %changelog
+* Tue Dec 15 2009 Steve Dickson <steved at redhat.com> 1.4.13-1
+- Updated to latest stable upstream version: 1.4.13
+
 * Tue Aug 18 2009 Steve Dickson <steved at redhat.com> 1.4.12-1
 - Updated to latest stable upstream version: 1.4.12
 - API documentation is now installed (bz 487977)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	18 Aug 2009 20:33:43 -0000	1.9
+++ sources	15 Dec 2009 16:12:07 -0000	1.10
@@ -1 +1 @@
-77b0d8b9885496871bb083165b35ba11  libevent-1.4.12-stable.tar.gz
+0b3ea18c634072d12b3c1ee734263664  libevent-1.4.13-stable.tar.gz


--- libevent-1.4.12-stable-epoll.patch DELETED ---



From mlichvar at fedoraproject.org  Tue Dec 15 16:15:41 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 15 Dec 2009 16:15:41 +0000 (UTC)
Subject: File chrony-1.24-pre1.tar.gz uploaded to lookaside cache by mlichvar
Message-ID: <20091215161541.9503628ED26@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for chrony:

e1f0d15bc0830f5f6bf80da2d72eb16a  chrony-1.24-pre1.tar.gz



From kasal at fedoraproject.org  Tue Dec 15 16:17:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 15 Dec 2009 16:17:38 +0000 (UTC)
Subject: rpms/perl-Math-BigInt-GMP/devel perl-Math-BigInt-GMP.spec,1.4,1.5
Message-ID: <20091215161738.EBC4111C0092@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Math-BigInt-GMP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17377

Modified Files:
	perl-Math-BigInt-GMP.spec 
Log Message:
- skip check in distributions with perl-5.8


Index: perl-Math-BigInt-GMP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-BigInt-GMP/devel/perl-Math-BigInt-GMP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Math-BigInt-GMP.spec	7 Dec 2009 03:43:24 -0000	1.4
+++ perl-Math-BigInt-GMP.spec	15 Dec 2009 16:17:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Math-BigInt-GMP
 Version:        1.24
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Math::BigInt::GMP Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -38,7 +38,10 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
+# perl-Math-BigInt 1.87 (delivered with perl-5.10.x) is needed
+%if 0%{?rhel} > 5 || 0%{?fedora} > 8
 make test
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 15 2009 Stepan Kasal <skasal at redhat.com> - 1.24-5
+- skip check in distributions with perl-5.8
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.24-4
 - rebuild against perl 5.10.1
 



From kasal at fedoraproject.org  Tue Dec 15 16:18:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 15 Dec 2009 16:18:42 +0000 (UTC)
Subject: rpms/perl-Math-BigInt-GMP/EL-4 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091215161842.B616811C0092@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Math-BigInt-GMP/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17680

Modified Files:
	.cvsignore sources 
Log Message:
import from rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-BigInt-GMP/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 May 2008 16:22:14 -0000	1.1
+++ .cvsignore	15 Dec 2009 16:18:41 -0000	1.2
@@ -0,0 +1 @@
+Math-BigInt-GMP-1.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-BigInt-GMP/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 May 2008 16:22:14 -0000	1.1
+++ sources	15 Dec 2009 16:18:42 -0000	1.2
@@ -0,0 +1 @@
+de5bb548f9e8e2254565926eec1d15b2  Math-BigInt-GMP-1.24.tar.gz



From kasal at fedoraproject.org  Tue Dec 15 16:19:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 15 Dec 2009 16:19:13 +0000 (UTC)
Subject: rpms/perl-Math-BigInt-GMP/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091215161913.D360111C0092@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Math-BigInt-GMP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17924

Modified Files:
	.cvsignore sources 
Log Message:
import from rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-BigInt-GMP/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 May 2008 16:22:14 -0000	1.1
+++ .cvsignore	15 Dec 2009 16:19:13 -0000	1.2
@@ -0,0 +1 @@
+Math-BigInt-GMP-1.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-BigInt-GMP/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 May 2008 16:22:14 -0000	1.1
+++ sources	15 Dec 2009 16:19:13 -0000	1.2
@@ -0,0 +1 @@
+de5bb548f9e8e2254565926eec1d15b2  Math-BigInt-GMP-1.24.tar.gz



From kasal at fedoraproject.org  Tue Dec 15 16:19:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 15 Dec 2009 16:19:50 +0000 (UTC)
Subject: rpms/perl-Math-BigInt-GMP/EL-4 perl-Math-BigInt-GMP.spec,NONE,1.1
Message-ID: <20091215161950.97C9611C0092@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Math-BigInt-GMP/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18097

Added Files:
	perl-Math-BigInt-GMP.spec 
Log Message:
import from rawhide


--- NEW FILE perl-Math-BigInt-GMP.spec ---
Name:           perl-Math-BigInt-GMP
Version:        1.24
Release:        5%{?dist}
Summary:        Math::BigInt::GMP Perl module
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Math-BigInt-GMP/
Source0:        http://www.cpan.org/authors/id/T/TE/TELS/math/Math-BigInt-GMP-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gmp-devel
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains a replacement (drop-in) module for Math::BigInt's
core, Math::BigInt::Calc.pm. It needs the new versions of Math::BigInt and
Math::BigFloat as they are from Perl 5.7.x onwards.

%prep
%setup -q -n Math-BigInt-GMP-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
# perl-Math-BigInt 1.87 (delivered with perl-5.10.x) is needed
%if 0%{?rhel} > 5 || 0%{?fedora} > 8
make test
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc BUGS CHANGES CREDITS LICENSE README TODO
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Math*
%{_mandir}/man3/*

%changelog
* Tue Dec 15 2009 Stepan Kasal <skasal at redhat.com> - 1.24-5
- skip check in distributions with perl-5.8

* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.24-4
- rebuild against perl 5.10.1

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sun May 18 2008 Steven Pritchard <steve at kspei.com> 1.24-1
- Specfile autogenerated by cpanspec 1.75.
- BR Test::More, Test::Pod, Test::Pod::Coverage, and gmp-devel.



From kasal at fedoraproject.org  Tue Dec 15 16:19:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 15 Dec 2009 16:19:54 +0000 (UTC)
Subject: rpms/perl-Math-BigInt-GMP/EL-5 perl-Math-BigInt-GMP.spec,NONE,1.1
Message-ID: <20091215161954.1135911C0092@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Math-BigInt-GMP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18141

Added Files:
	perl-Math-BigInt-GMP.spec 
Log Message:
import from rawhide


--- NEW FILE perl-Math-BigInt-GMP.spec ---
Name:           perl-Math-BigInt-GMP
Version:        1.24
Release:        5%{?dist}
Summary:        Math::BigInt::GMP Perl module
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Math-BigInt-GMP/
Source0:        http://www.cpan.org/authors/id/T/TE/TELS/math/Math-BigInt-GMP-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gmp-devel
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains a replacement (drop-in) module for Math::BigInt's
core, Math::BigInt::Calc.pm. It needs the new versions of Math::BigInt and
Math::BigFloat as they are from Perl 5.7.x onwards.

%prep
%setup -q -n Math-BigInt-GMP-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
# perl-Math-BigInt 1.87 (delivered with perl-5.10.x) is needed
%if 0%{?rhel} > 5 || 0%{?fedora} > 8
make test
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc BUGS CHANGES CREDITS LICENSE README TODO
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Math*
%{_mandir}/man3/*

%changelog
* Tue Dec 15 2009 Stepan Kasal <skasal at redhat.com> - 1.24-5
- skip check in distributions with perl-5.8

* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.24-4
- rebuild against perl 5.10.1

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sun May 18 2008 Steven Pritchard <steve at kspei.com> 1.24-1
- Specfile autogenerated by cpanspec 1.75.
- BR Test::More, Test::Pod, Test::Pod::Coverage, and gmp-devel.



From vcrhonek at fedoraproject.org  Tue Dec 15 16:19:54 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 15 Dec 2009 16:19:54 +0000 (UTC)
Subject: rpms/tcsh/devel tcsh-6.17.00-printexitvalue.patch, NONE,
	1.1 tcsh.spec, 1.67, 1.68
Message-ID: <20091215161954.9E35811C0092@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/pkgs/rpms/tcsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18130

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.17.00-printexitvalue.patch 
Log Message:
Fix tcsh obeys printexitvalue for back-ticks

tcsh-6.17.00-printexitvalue.patch:
 sh.glob.c |    4 ++++
 sh.sem.c  |   18 +++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

--- NEW FILE tcsh-6.17.00-printexitvalue.patch ---
diff -up tcsh-6.17.00/sh.glob.c_old tcsh-6.17.00/sh.glob.c
--- tcsh-6.17.00/sh.glob.c_old	2009-12-15 12:38:48.000000000 +0100
+++ tcsh-6.17.00/sh.glob.c	2009-12-15 12:40:52.000000000 +0100
@@ -882,6 +882,10 @@ backeval(struct blk_buf *bb, struct Strb
 	    alias(&paraml);
 	    t = syntax(paraml.next, &paraml, 0);
 	    cleanup_push(t, syntax_cleanup);
+	    /* The F_BACKQ flag must set so the job output is correct if
+	     * printexitvalue is set.  If it's not set, the job output
+	     * will have "Exit N" appended where N is the exit status. */
+	    t->t_dflg = F_BACKQ;
 	    if (seterr)
 		stderror(ERR_OLD);
 #ifdef SIGTSTP
diff -up tcsh-6.17.00/sh.sem.c_old tcsh-6.17.00/sh.sem.c
--- tcsh-6.17.00/sh.sem.c_old	2009-12-15 12:41:03.000000000 +0100
+++ tcsh-6.17.00/sh.sem.c	2009-12-15 12:57:49.000000000 +0100
@@ -664,31 +664,31 @@ execute(struct command *t, volatile int 
 #endif /* !CLOSE_ON_EXEC */
 	didfds = 0;
 	wanttty = -1;
-	t->t_dspr->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	t->t_dspr->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	execute(t->t_dspr, wanttty, NULL, NULL, do_glob);
 	exitstat();
 
     case NODE_PIPE:
 #ifdef BACKPIPE
 	t->t_dcdr->t_dflg |= F_PIPEIN | (t->t_dflg &
-			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT));
+			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcdr, wanttty, pv, pipeout, do_glob);
 	t->t_dcar->t_dflg |= F_PIPEOUT |
-	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT));
+	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcar, wanttty, pipein, pv, do_glob);
 #else /* !BACKPIPE */
 	t->t_dcar->t_dflg |= F_PIPEOUT |
-	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT));
+	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcar, wanttty, pipein, pv, do_glob);
 	t->t_dcdr->t_dflg |= F_PIPEIN | (t->t_dflg &
-			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT));
+			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcdr, wanttty, pv, pipeout, do_glob);
 #endif /* BACKPIPE */
 	break;
 
     case NODE_LIST:
 	if (t->t_dcar) {
-	    t->t_dcar->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	    t->t_dcar->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcar, wanttty, NULL, NULL, do_glob);
 	    /*
 	     * In strange case of A&B make a new job after A
@@ -699,7 +699,7 @@ execute(struct command *t, volatile int 
 	}
 	if (t->t_dcdr) {
 	    t->t_dcdr->t_dflg |= t->t_dflg &
-		(F_NOFORK | F_NOINTERRUPT);
+		(F_NOFORK | F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcdr, wanttty, NULL, NULL, do_glob);
 	}
 	break;
@@ -707,7 +707,7 @@ execute(struct command *t, volatile int 
     case NODE_OR:
     case NODE_AND:
 	if (t->t_dcar) {
-	    t->t_dcar->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	    t->t_dcar->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcar, wanttty, NULL, NULL, do_glob);
 	    if ((getn(varval(STRstatus)) == 0) !=
 		(t->t_dtyp == NODE_AND)) {
@@ -716,7 +716,7 @@ execute(struct command *t, volatile int 
 	}
 	if (t->t_dcdr) {
 	    t->t_dcdr->t_dflg |= t->t_dflg &
-		(F_NOFORK | F_NOINTERRUPT);
+		(F_NOFORK | F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcdr, wanttty, NULL, NULL, do_glob);
 	}
 	break;


Index: tcsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- tcsh.spec	4 Nov 2009 13:14:27 -0000	1.67
+++ tcsh.spec	15 Dec 2009 16:19:54 -0000	1.68
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.17
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
@@ -23,6 +23,8 @@ Patch13: tcsh-6.17.00-mh-color.patch
 Patch14: tcsh-6.17.00-glob-automount.patch
 # Accepted by upstream:
 Patch15: tcsh-6.17.00-history.patch
+# Accepted by upstream:
+Patch16: tcsh-6.17.00-printexitvalue.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -53,6 +55,7 @@ like syntax.
 %patch13 -p1 -b .mh-color
 %patch14 -p1 -b .glob-automount
 %patch15 -p1 -b .history
+%patch16 -p1 -b .printexitvalue
 
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -126,6 +129,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Tue Dec 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-6
+- Fix tcsh obeys printexitvalue for back-ticks
+
 * Wed Nov  4 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-5
 - Fix few globbing problems
 



From tbzatek at fedoraproject.org  Tue Dec 15 16:24:34 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 15 Dec 2009 16:24:34 +0000 (UTC)
Subject: File nautilus-2.28.4.tar.bz2 uploaded to lookaside cache by tbzatek
Message-ID: <20091215162434.14C9028ED24@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for nautilus:

28c97e0e5195ae1ad5101e8b703cbf52  nautilus-2.28.4.tar.bz2



From steved at fedoraproject.org  Tue Dec 15 16:28:07 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 15 Dec 2009 16:28:07 +0000 (UTC)
Subject: rpms/libevent/devel libevent-1.4.13-stable-configure.patch, NONE,
	1.1
Message-ID: <20091215162807.8F78B11C0092@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20114

Added Files:
	libevent-1.4.13-stable-configure.patch 
Log Message:
added  libevent-1.4.13-stable-configure.patch 


libevent-1.4.13-stable-configure.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE libevent-1.4.13-stable-configure.patch ---
diff -up libevent-1.4.13-stable/configure.in.orig libevent-1.4.13-stable/configure.in
--- libevent-1.4.13-stable/configure.in.orig	2009-11-17 23:08:06.000000000 -0500
+++ libevent-1.4.13-stable/configure.in	2009-12-15 10:57:20.281740000 -0500
@@ -138,7 +138,6 @@ AC_HEADER_TIME
 dnl Checks for library functions.
 AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop signal sigaction strtoll issetugid geteuid getegid)
 
-AC_CHECK_SIZEOF(long)
 
 if test "x$ac_cv_func_clock_gettime" = "xyes"; then
    AC_DEFINE(DNS_USE_CPU_CLOCK_FOR_ID, 1, [Define if clock_gettime is available in libc])
@@ -317,9 +316,6 @@ AC_CHECK_TYPES([fd_mask], , ,
 #include <select.h>
 #endif])
 
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(short)
 AC_CHECK_TYPES([struct in6_addr], , ,
 [#ifdef WIN32
 #include <winsock2.h>
diff -up libevent-1.4.13-stable/epoll.c.orig libevent-1.4.13-stable/epoll.c



From mlichvar at fedoraproject.org  Tue Dec 15 16:29:32 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 15 Dec 2009 16:29:32 +0000 (UTC)
Subject: rpms/chrony/devel .cvsignore, 1.3, 1.4 chrony.spec, 1.6, 1.7 sources,
	1.3, 1.4 chrony-1.23-cap.patch, 1.1,
	NONE chrony-1.23-editline.patch, 1.1,
	NONE chrony-1.23-gethost.patch, 1.1, NONE chrony-1.23-ppc.patch,
	1.1, NONE chrony-1.23-res.patch, 1.1,
	NONE chrony-1.23-s390.patch, 1.1, NONE
Message-ID: <20091215162932.921FF11C0092@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/chrony/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20470

Modified Files:
	.cvsignore chrony.spec sources 
Removed Files:
	chrony-1.23-cap.patch chrony-1.23-editline.patch 
	chrony-1.23-gethost.patch chrony-1.23-ppc.patch 
	chrony-1.23-res.patch chrony-1.23-s390.patch 
Log Message:
- update to 1.24-pre1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chrony/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2008 12:58:34 -0000	1.3
+++ .cvsignore	15 Dec 2009 16:29:31 -0000	1.4
@@ -1,3 +1 @@
-chrony-1.23.tar.gz
-getdate.y
-chrony-1.23-gitbe42b4.patch
+chrony-1.24-pre1.tar.gz


Index: chrony.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chrony/devel/chrony.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- chrony.spec	24 Jul 2009 18:57:37 -0000	1.6
+++ chrony.spec	15 Dec 2009 16:29:32 -0000	1.7
@@ -1,26 +1,18 @@
+%define prerelease -pre1
 Name:           chrony
-Version:        1.23
-Release:        7.20081106gitbe42b4%{?dist}
+Version:        1.24
+Release:        0.1.pre1%{?dist}
 Summary:        An NTP client/server
 
 Group:          System Environment/Daemons
 License:        GPLv2
-URL:            http://chrony.sunsite.dk
-Source0:        http://chrony.sunsite.dk/download/chrony-%{version}.tar.gz
+URL:            http://chrony.tuxfamily.org
+Source0:        http://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}.tar.gz
 Source1:        chrony.conf
 Source2:        chrony.keys
 Source3:        chronyd.sysconfig
 Source4:        chronyd.init
 Source5:        chrony.logrotate
-# taken from GNU tar-1.13 
-Source6:        getdate.y
-Patch1:         chrony-1.23-gitbe42b4.patch
-Patch2:         chrony-1.23-ppc.patch
-Patch3:         chrony-1.23-gethost.patch
-Patch4:         chrony-1.23-res.patch
-Patch5:         chrony-1.23-cap.patch
-Patch6:         chrony-1.23-s390.patch
-Patch7:         chrony-1.23-editline.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libcap-devel libedit-devel bison texinfo
@@ -37,39 +29,23 @@ systems with dial-up Internet connection
 in permanently connected environments. 
 
 %prep
-%setup -q
-cp -p %{SOURCE6} .
-%patch1 -p1
-%patch2 -p1 -b .ppc
-%patch3 -p1 -b .gethost
-%patch4 -p1 -b .res
-%patch5 -p1 -b .cap
-%patch6 -p1 -b .s390
-%patch7 -p1 -b .editline
+%setup -q -n %{name}-%{version}%{?prerelease}
 
 %build
-bison -o getdate.c getdate.y
-
 export CFLAGS="$RPM_OPT_FLAGS -pie -fpie"
-# configure doesn't support --bindir --sbindir options, install manually
-./configure --enable-linuxcaps --with-editline
-make %{?_smp_mflags} all docs
+%configure --docdir=%{_docdir}
+make %{?_smp_mflags} getdate all docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}
-mkdir -p $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man{1,5,8}}
+make install install-docs DESTDIR=$RPM_BUILD_ROOT
+
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+
 mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig,logrotate.d},%{_initrddir}}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/chrony
 
-install -m 755 chronyc $RPM_BUILD_ROOT%{_bindir}
-install -m 755 chronyd $RPM_BUILD_ROOT%{_sbindir}
-install -m 644 -p -t $RPM_BUILD_ROOT%{_infodir} chrony.info*
-install -m 644 -p -t $RPM_BUILD_ROOT%{_mandir}/man1 chrony*.1
-install -m 644 -p -t $RPM_BUILD_ROOT%{_mandir}/man5 chrony*.5
-install -m 644 -p -t $RPM_BUILD_ROOT%{_mandir}/man8 chrony*.8
-
 install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.conf
 install -m 640 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys
 install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/chronyd
@@ -124,6 +100,9 @@ fi
 %dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
+* Tue Dec 15 2009 Miroslav Lichvar <mlichvar at redhat.com> 1.24-0.1.pre1
+- update to 1.24-pre1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-7.20081106gitbe42b4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chrony/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2008 12:58:34 -0000	1.3
+++ sources	15 Dec 2009 16:29:32 -0000	1.4
@@ -1,3 +1 @@
-ffce77695e55d8efda19ab0b78309c23  chrony-1.23.tar.gz
-ad8091c4b507f7bde3804b8dc1150c56  getdate.y
-c5f94f3fc4c78546b954e050b8027dc5  chrony-1.23-gitbe42b4.patch
+e1f0d15bc0830f5f6bf80da2d72eb16a  chrony-1.24-pre1.tar.gz


--- chrony-1.23-cap.patch DELETED ---


--- chrony-1.23-editline.patch DELETED ---


--- chrony-1.23-gethost.patch DELETED ---


--- chrony-1.23-ppc.patch DELETED ---


--- chrony-1.23-res.patch DELETED ---


--- chrony-1.23-s390.patch DELETED ---



From itamarjp at fedoraproject.org  Tue Dec 15 17:14:26 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue, 15 Dec 2009 17:14:26 +0000 (UTC)
Subject: rpms/usbview/devel import.log,1.1,1.2 usbview.spec,1.1,1.2
Message-ID: <20091215171426.4739111C0092@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/usbview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28407/devel

Modified Files:
	import.log usbview.spec 
Log Message:
fix install icon in EL-5



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 20:55:32 -0000	1.1
+++ import.log	15 Dec 2009 17:14:24 -0000	1.2
@@ -1 +1,2 @@
 usbview-1_1-3_fc13:HEAD:usbview-1.1-3.fc13.src.rpm:1260823919
+usbview-1_1-4_fc13:HEAD:usbview-1.1-4.fc13.src.rpm:1260897167


Index: usbview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/devel/usbview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- usbview.spec	14 Dec 2009 20:55:32 -0000	1.1
+++ usbview.spec	15 Dec 2009 17:14:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        USB topology and device viewer
 
 Group:          Applications/System
@@ -46,6 +46,7 @@ install -Dp -m 0644 %{SOURCE1} $RPM_BUIL
 
 #install desktop file
 desktop-file-install                                    \
+--vendor fedora                                         \
 --add-category="System"                                 \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
 %{SOURCE2}
@@ -60,9 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/usbview
 %{_mandir}/man8/usbview*
 %{_datadir}/pixmaps/%{name}_icon.png
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Dec 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-4
+- include --vendor fedora in desktop-file-install (required for EL-5)
+
 * Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-3
 - increasy usage of macros, fix icon permission
 



From itamarjp at fedoraproject.org  Tue Dec 15 17:21:54 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue, 15 Dec 2009 17:21:54 +0000 (UTC)
Subject: rpms/usbview/EL-5 import.log,1.1,1.2 usbview.spec,1.1,1.2
Message-ID: <20091215172154.B340411C0092@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/usbview/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30106/EL-5

Modified Files:
	import.log usbview.spec 
Log Message:
fix icon install in EL



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 21:05:31 -0000	1.1
+++ import.log	15 Dec 2009 17:21:54 -0000	1.2
@@ -1 +1,2 @@
 usbview-1_1-3_fc13:EL-5:usbview-1.1-3.fc13.src.rpm:1260824579
+usbview-1_1-4_fc13:EL-5:usbview-1.1-4.fc13.src.rpm:1260897543


Index: usbview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/EL-5/usbview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- usbview.spec	14 Dec 2009 21:05:31 -0000	1.1
+++ usbview.spec	15 Dec 2009 17:21:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        USB topology and device viewer
 
 Group:          Applications/System
@@ -46,6 +46,7 @@ install -Dp -m 0644 %{SOURCE1} $RPM_BUIL
 
 #install desktop file
 desktop-file-install                                    \
+--vendor fedora                                         \
 --add-category="System"                                 \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
 %{SOURCE2}
@@ -60,9 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/usbview
 %{_mandir}/man8/usbview*
 %{_datadir}/pixmaps/%{name}_icon.png
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Dec 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-4
+- include --vendor fedora in desktop-file-install (required for EL-5)
+
 * Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-3
 - increasy usage of macros, fix icon permission
 



From belegdol at fedoraproject.org  Tue Dec 15 17:22:01 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Tue, 15 Dec 2009 17:22:01 +0000 (UTC)
Subject: File patch-1-3.gz uploaded to lookaside cache by belegdol
Message-ID: <20091215172201.EE8B128ED6C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for EMBOSS:

4a5f96d849409fdecf39e92380e5381e  patch-1-3.gz



From itamarjp at fedoraproject.org  Tue Dec 15 17:24:41 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue, 15 Dec 2009 17:24:41 +0000 (UTC)
Subject: rpms/usbview/F-12 import.log,1.1,1.2 usbview.spec,1.1,1.2
Message-ID: <20091215172441.E98EF11C0092@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/usbview/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30500/F-12

Modified Files:
	import.log usbview.spec 
Log Message:
fix desktop install



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 20:57:03 -0000	1.1
+++ import.log	15 Dec 2009 17:24:41 -0000	1.2
@@ -1 +1,2 @@
 usbview-1_1-3_fc13:F-12:usbview-1.1-3.fc13.src.rpm:1260824186
+usbview-1_1-4_fc13:F-12:usbview-1.1-4.fc13.src.rpm:1260897794


Index: usbview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/F-12/usbview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- usbview.spec	14 Dec 2009 20:57:03 -0000	1.1
+++ usbview.spec	15 Dec 2009 17:24:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        USB topology and device viewer
 
 Group:          Applications/System
@@ -46,6 +46,7 @@ install -Dp -m 0644 %{SOURCE1} $RPM_BUIL
 
 #install desktop file
 desktop-file-install                                    \
+--vendor fedora                                         \
 --add-category="System"                                 \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
 %{SOURCE2}
@@ -60,9 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/usbview
 %{_mandir}/man8/usbview*
 %{_datadir}/pixmaps/%{name}_icon.png
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Dec 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-4
+- include --vendor fedora in desktop-file-install (required for EL-5)
+
 * Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-3
 - increasy usage of macros, fix icon permission
 



From itamarjp at fedoraproject.org  Tue Dec 15 17:29:00 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue, 15 Dec 2009 17:29:00 +0000 (UTC)
Subject: rpms/usbview/F-11 import.log,1.1,1.2 usbview.spec,1.1,1.2
Message-ID: <20091215172900.154A011C0092@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/usbview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31411/F-11

Modified Files:
	import.log usbview.spec 
Log Message:
fix desktop icon install



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 21:01:55 -0000	1.1
+++ import.log	15 Dec 2009 17:28:59 -0000	1.2
@@ -1 +1,2 @@
 usbview-1_1-3_fc13:F-11:usbview-1.1-3.fc13.src.rpm:1260824304
+usbview-1_1-4_fc13:F-11:usbview-1.1-4.fc13.src.rpm:1260897914


Index: usbview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbview/F-11/usbview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- usbview.spec	14 Dec 2009 21:01:55 -0000	1.1
+++ usbview.spec	15 Dec 2009 17:28:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           usbview
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        USB topology and device viewer
 
 Group:          Applications/System
@@ -46,6 +46,7 @@ install -Dp -m 0644 %{SOURCE1} $RPM_BUIL
 
 #install desktop file
 desktop-file-install                                    \
+--vendor fedora                                         \
 --add-category="System"                                 \
 --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
 %{SOURCE2}
@@ -60,9 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/usbview
 %{_mandir}/man8/usbview*
 %{_datadir}/pixmaps/%{name}_icon.png
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Dec 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-4
+- include --vendor fedora in desktop-file-install (required for EL-5)
+
 * Fri Dec 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1-3
 - increasy usage of macros, fix icon permission
 



From ssp at fedoraproject.org  Tue Dec 15 17:38:34 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Tue, 15 Dec 2009 17:38:34 +0000 (UTC)
Subject: File pixman-0.16.4.tar.bz2 uploaded to lookaside cache by ssp
Message-ID: <20091215173834.05C8428ED23@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for pixman:

70c249a575ed02b7a5daa1bc9f9c6a4e  pixman-0.16.4.tar.bz2



From ssp at fedoraproject.org  Tue Dec 15 17:51:12 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Tue, 15 Dec 2009 17:51:12 +0000 (UTC)
Subject: rpms/pixman/F-12 .cvsignore, 1.29, 1.30 pixman.spec, 1.46,
	1.47 sources, 1.32, 1.33
Message-ID: <20091215175112.F377811C0335@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3143

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
0.16.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	28 Sep 2009 13:52:56 -0000	1.29
+++ .cvsignore	15 Dec 2009 17:51:11 -0000	1.30
@@ -3,3 +3,4 @@ pixman-0.15.20.tar.gz
 pixman-0.15.20.tar.bz2
 pixman-0.16.0.tar.bz2
 pixman-0.16.2.tar.bz2
+pixman-0.16.4.tar.bz2


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/F-12/pixman.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- pixman.spec	11 Dec 2009 19:44:21 -0000	1.46
+++ pixman.spec	15 Dec 2009 17:51:12 -0000	1.47
@@ -2,8 +2,8 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.16.2
-Release:        2%{?dist}
+Version:        0.16.4
+Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Tue Dec 15 2009 Soren Sandmann <ssp at redhat.com> - 0.16.4-1
+- Update to 0.16.4
+
 * Fri Dec 11 2009 Soren Sandmann <ssp at redhat.com> - 0.16.2-2
 - Add patch to disable asserts in stable releases.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/F-12/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	3 Nov 2009 17:01:10 -0000	1.32
+++ sources	15 Dec 2009 17:51:12 -0000	1.33
@@ -1 +1 @@
-0ce7de6d649f1a80d328b05e403730b6  pixman-0.16.2.tar.bz2
+70c249a575ed02b7a5daa1bc9f9c6a4e  pixman-0.16.4.tar.bz2



From toshio at fedoraproject.org  Tue Dec 15 17:52:32 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 15 Dec 2009 17:52:32 +0000 (UTC)
Subject: rpms/python-setuptools/devel .cvsignore, 1.17,
	1.18 python-setuptools.spec, 1.28, 1.29 sources, 1.17, 1.18
Message-ID: <20091215175232.2723D11C0092@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-setuptools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3490

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:

* Mon Dec 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.9-1
- New upstream bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	16 Nov 2009 17:41:53 -0000	1.17
+++ .cvsignore	15 Dec 2009 17:52:31 -0000	1.18
@@ -1 +1 @@
-distribute-0.6.8.tar.gz
+distribute-0.6.9.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- python-setuptools.spec	14 Dec 2009 05:44:12 -0000	1.28
+++ python-setuptools.spec	15 Dec 2009 17:52:31 -0000	1.29
@@ -3,8 +3,8 @@
 %global srcname distribute
 
 Name:           python-setuptools
-Version:        0.6.8
-Release:        2%{?dist}
+Version:        0.6.9
+Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.9-1
+- New upstream bugfix release.
+
 * Sun Dec 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.8-2
 - Test rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	16 Nov 2009 17:41:53 -0000	1.17
+++ sources	15 Dec 2009 17:52:32 -0000	1.18
@@ -1 +1 @@
-c0c6a6b273234cb2cf8c4f82612e375c  distribute-0.6.8.tar.gz
+5b1a2fde063a361aa241f98e0f9e1931  distribute-0.6.9.tar.gz



From ssp at fedoraproject.org  Tue Dec 15 18:00:05 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Tue, 15 Dec 2009 18:00:05 +0000 (UTC)
Subject: rpms/pixman/F-12 pixman.spec,1.47,1.48
Message-ID: <20091215180005.92B0D11C0335@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4663

Modified Files:
	pixman.spec 
Log Message:
Remove patch that was applied upstream


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/F-12/pixman.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- pixman.spec	15 Dec 2009 17:51:12 -0000	1.47
+++ pixman.spec	15 Dec 2009 18:00:05 -0000	1.48
@@ -3,7 +3,7 @@
 
 Name:           pixman
 Version:        0.16.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -15,8 +15,6 @@ URL:            http://cgit.freedesktop.
 Source0:        http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:         0001-region-Enable-or-disable-fatal-errors-and-selfchecks.patch
-
 
 # BuildRequires:  automake autoconf libtool pkgconfig
 
@@ -34,7 +32,6 @@ Development library for pixman.
 
 %prep
 %setup -q
-%patch0 -p1 -b .disable-asserts
 
 %build
 %configure --disable-static
@@ -64,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Tue Dec 15 2009 Soren Sandmann <ssp at redhat.com> - 0.16.4-2
+- Remove assert patch
+
 * Tue Dec 15 2009 Soren Sandmann <ssp at redhat.com> - 0.16.4-1
 - Update to 0.16.4
 



From konradm at fedoraproject.org  Tue Dec 15 18:04:04 2009
From: konradm at fedoraproject.org (konradm)
Date: Tue, 15 Dec 2009 18:04:04 +0000 (UTC)
Subject: File libtorrent-0.12.6.tar.gz uploaded to lookaside cache by konradm
Message-ID: <20091215180404.03A3D28ECF0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libtorrent:

037499ed708aaf72988cee60e5a8d96b  libtorrent-0.12.6.tar.gz



From mclasen at fedoraproject.org  Tue Dec 15 18:04:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 18:04:58 +0000 (UTC)
Subject: rpms/ConsoleKit/devel nodeamon.patch, NONE, 1.1 ConsoleKit.spec,
	1.50, 1.51
Message-ID: <20091215180458.2BB7011C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5530

Modified Files:
	ConsoleKit.spec 
Added Files:
	nodeamon.patch 
Log Message:
don't daemonize when activated


nodeamon.patch:
 org.freedesktop.ConsoleKit.service.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nodeamon.patch ---
diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in
--- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon	2009-12-15 10:56:39.839818556 -0500
+++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in	2009-12-15 10:56:50.177792048 -0500
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.ConsoleKit
-Exec=@sbindir@/console-kit-daemon
+Exec=@sbindir@/console-kit-daemon --no-daemon
 User=root


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ConsoleKit.spec	9 Dec 2009 22:25:37 -0000	1.50
+++ ConsoleKit.spec	15 Dec 2009 18:04:57 -0000	1.51
@@ -6,12 +6,16 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
 Source0: http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-%{version}.tar.bz2
+# Convert to new upstart syntax
 Patch0: ConsoleKit-0.4.1-upstart06.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=25656
+Patch1: nodaemon.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -27,6 +31,7 @@ BuildRequires: zlib-devel
 BuildRequires: xmlto
 BuildRequires: automake, autoconf, libtool
 
+
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -81,8 +86,8 @@ This package contains developer document
 
 %prep
 %setup -q
-%patch0 -p1 
-
+%patch0 -p1 -b .upstart06
+%patch1 -p1 -b .no-daemon
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
 
@@ -169,6 +174,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 0.4.1-3
+- Don't daemonize when activated
+
 * Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> 0.4.1-2
 - Adjust for upstart 0.6
 



From konradm at fedoraproject.org  Tue Dec 15 18:05:00 2009
From: konradm at fedoraproject.org (konradm)
Date: Tue, 15 Dec 2009 18:05:00 +0000 (UTC)
Subject: rpms/libtorrent/devel .cvsignore, 1.12, 1.13 libtorrent.spec, 1.35, 
	1.36 sources, 1.13, 1.14
Message-ID: <20091215180500.21B6411C0092@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/libtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5577

Modified Files:
	.cvsignore libtorrent.spec sources 
Log Message:
* Tue Dec 15 2009 Conrad Meyer <konrad at tylerc.org> - 0.12.6-1
- Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Jul 2009 21:06:53 -0000	1.12
+++ .cvsignore	15 Dec 2009 18:04:59 -0000	1.13
@@ -1 +1 @@
-libtorrent-0.12.5.tar.gz
+libtorrent-0.12.6.tar.gz


Index: libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- libtorrent.spec	21 Aug 2009 14:22:55 -0000	1.35
+++ libtorrent.spec	15 Dec 2009 18:04:59 -0000	1.36
@@ -1,8 +1,8 @@
 Name:          libtorrent
 License:       GPLv2+
 Group:         System Environment/Libraries
-Version:       0.12.5
-Release:       3%{?dist}
+Version:       0.12.6
+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/libtorrent-%{version}.tar.gz
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec 15 2009 Conrad Meyer <konrad at tylerc.org> - 0.12.6-1
+- Bump version.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.12.5-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Jul 2009 21:06:53 -0000	1.13
+++ sources	15 Dec 2009 18:04:59 -0000	1.14
@@ -1 +1 @@
-fe8155d364b220713074423100d4bf29  libtorrent-0.12.5.tar.gz
+037499ed708aaf72988cee60e5a8d96b  libtorrent-0.12.6.tar.gz



From konradm at fedoraproject.org  Tue Dec 15 18:05:49 2009
From: konradm at fedoraproject.org (konradm)
Date: Tue, 15 Dec 2009 18:05:49 +0000 (UTC)
Subject: File rtorrent-0.8.6.tar.gz uploaded to lookaside cache by konradm
Message-ID: <20091215180549.2639628ECF0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for rtorrent:

b804c45c01c40312926bcea6b55bb084  rtorrent-0.8.6.tar.gz



From konradm at fedoraproject.org  Tue Dec 15 18:07:34 2009
From: konradm at fedoraproject.org (konradm)
Date: Tue, 15 Dec 2009 18:07:34 +0000 (UTC)
Subject: rpms/rtorrent/devel .cvsignore, 1.12, 1.13 rtorrent.spec, 1.32,
	1.33 sources, 1.12, 1.13
Message-ID: <20091215180734.2616F11C0092@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/rtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6148

Modified Files:
	.cvsignore rtorrent.spec sources 
Log Message:
* Tue Dec 15 2009 Conrad Meyer <konrad at tylerc.org> - 0.8.6-1
- Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Jul 2009 21:38:08 -0000	1.12
+++ .cvsignore	15 Dec 2009 18:07:33 -0000	1.13
@@ -1 +1 @@
-rtorrent-0.8.5.tar.gz
+rtorrent-0.8.6.tar.gz


Index: rtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- rtorrent.spec	27 Jul 2009 03:18:51 -0000	1.32
+++ rtorrent.spec	15 Dec 2009 18:07:33 -0000	1.33
@@ -2,8 +2,8 @@ Name:          rtorrent
 # OpenSSL exception, see README
 License:       GPLv2+ with exceptions
 Group:         Applications/Internet
-Version:       0.8.5
-Release:       2%{?dist}
+Version:       0.8.6
+Release:       1%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/rtorrent-%{version}.tar.gz
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Tue Dec 15 2009 Conrad Meyer <konrad at tylerc.org> - 0.8.6-1
+- Bump version.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Jul 2009 21:38:08 -0000	1.12
+++ sources	15 Dec 2009 18:07:33 -0000	1.13
@@ -1 +1 @@
-e701095e1824b7e512a17000f4c0a783  rtorrent-0.8.5.tar.gz
+b804c45c01c40312926bcea6b55bb084  rtorrent-0.8.6.tar.gz



From tmraz at fedoraproject.org  Tue Dec 15 18:12:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 15 Dec 2009 18:12:29 +0000 (UTC)
Subject: rpms/openssl/F-12 openssl-1.0.0-beta4-dtls-ipv6.patch, NONE,
	1.1 openssl-1.0.0-beta4-reneg-err.patch, NONE, 1.1 openssl.spec,
	1.147, 1.148
Message-ID: <20091215181229.C497111C0092@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6987

Modified Files:
	openssl.spec 
Added Files:
	openssl-1.0.0-beta4-dtls-ipv6.patch 
	openssl-1.0.0-beta4-reneg-err.patch 
Log Message:
* Mon Nov 23 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.16.beta4
- fix non-fips mingw build (patch by Kalev Lember)
- add IPV6 fix for DTLS


openssl-1.0.0-beta4-dtls-ipv6.patch:
 b_sock.c    |    3 -
 bss_dgram.c |  139 +++++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 84 insertions(+), 58 deletions(-)

--- NEW FILE openssl-1.0.0-beta4-dtls-ipv6.patch ---
diff -up openssl-1.0.0-beta4/crypto/bio/b_sock.c.dtls-ipv6 openssl-1.0.0-beta4/crypto/bio/b_sock.c
--- openssl-1.0.0-beta4/crypto/bio/b_sock.c.dtls-ipv6	2009-11-09 15:09:53.000000000 +0100
+++ openssl-1.0.0-beta4/crypto/bio/b_sock.c	2009-11-23 08:50:45.000000000 +0100
@@ -822,7 +822,8 @@ int BIO_accept(int sock, char **addr)
 	if (sizeof(sa.len.i)!=sizeof(sa.len.s) && sa.len.i==0)
 		{
 		OPENSSL_assert(sa.len.s<=sizeof(sa.from));
-		sa.len.i = (unsigned int)sa.len.s;
+		sa.len.i = (int)sa.len.s;
+		/* use sa.len.i from this point */
 		}
 	if (ret == INVALID_SOCKET)
 		{
diff -up openssl-1.0.0-beta4/crypto/bio/bss_dgram.c.dtls-ipv6 openssl-1.0.0-beta4/crypto/bio/bss_dgram.c
--- openssl-1.0.0-beta4/crypto/bio/bss_dgram.c.dtls-ipv6	2009-10-15 19:41:44.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/bio/bss_dgram.c	2009-11-23 08:50:45.000000000 +0100
@@ -108,11 +108,13 @@ static BIO_METHOD methods_dgramp=
 
 typedef struct bio_dgram_data_st
 	{
+	union {
+		struct sockaddr sa;
+		struct sockaddr_in sa_in;
 #if OPENSSL_USE_IPV6
-	struct sockaddr_storage peer;
-#else
-	struct sockaddr_in peer;
+		struct sockaddr_in6 sa_in6;
 #endif
+	} peer;
 	unsigned int connected;
 	unsigned int _errno;
 	unsigned int mtu;
@@ -278,28 +280,38 @@ static int dgram_read(BIO *b, char *out,
 	int ret=0;
 	bio_dgram_data *data = (bio_dgram_data *)b->ptr;
 
+	struct	{
+	/*
+	 * See commentary in b_sock.c. <appro>
+	 */
+	union	{ size_t s; int i; } len;
+	union	{
+		struct sockaddr sa;
+		struct sockaddr_in sa_in;
 #if OPENSSL_USE_IPV6
-	struct sockaddr_storage peer;
-#else
-	struct sockaddr_in peer;
+		struct sockaddr_in6 sa_in6;
 #endif
-	int peerlen = sizeof(peer);
+		} peer;
+	} sa;
+
+	sa.len.s=0;
+	sa.len.i=sizeof(sa.peer);
 
 	if (out != NULL)
 		{
 		clear_socket_error();
-		memset(&peer, 0x00, peerlen);
-		/* Last arg in recvfrom is signed on some platforms and
-		 * unsigned on others. It is of type socklen_t on some
-		 * but this is not universal. Cast to (void *) to avoid
-		 * compiler warnings.
-		 */
+		memset(&sa.peer, 0x00, sizeof(sa.peer));
 		dgram_adjust_rcv_timeout(b);
-		ret=recvfrom(b->num,out,outl,0,(struct sockaddr *)&peer,(void *)&peerlen);
+		ret=recvfrom(b->num,out,outl,0,&sa.peer.sa,(void *)&sa.len);
+		if (sizeof(sa.len.i)!=sizeof(sa.len.s) && sa.len.i==0)
+			{
+			OPENSSL_assert(sa.len.s<=sizeof(sa.peer));
+			sa.len.i = (int)sa.len.s;
+			}
 		dgram_reset_rcv_timeout(b);
 
 		if ( ! data->connected  && ret >= 0)
-			BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &peer);
+			BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &sa.peer);
 
 		BIO_clear_retry_flags(b);
 		if (ret < 0)
@@ -323,25 +335,10 @@ static int dgram_write(BIO *b, const cha
 	if ( data->connected )
 		ret=writesocket(b->num,in,inl);
 	else
-#if OPENSSL_USE_IPV6
-		if (data->peer.ss_family == AF_INET)
 #if defined(NETWARE_CLIB) && defined(NETWARE_BSDSOCK)
-			ret=sendto(b->num, (char *)in, inl, 0, (const struct sockaddr *)&data->peer, sizeof(struct sockaddr_in));
+		ret=sendto(b->num, (char *)in, inl, 0, &data->peer.sa, sizeof(data->peer));
 #else
-			ret=sendto(b->num, in, inl, 0, (const struct sockaddr *)&data->peer, sizeof(struct sockaddr_in));
-#endif
-		else
-#if defined(NETWARE_CLIB) && defined(NETWARE_BSDSOCK)
-			ret=sendto(b->num, (char *)in, inl, 0, (const struct sockaddr *)&data->peer, sizeof(struct sockaddr_in6));
-#else
-			ret=sendto(b->num, in, inl, 0, (const struct sockaddr *)&data->peer, sizeof(struct sockaddr_in6));
-#endif
-#else
-#if defined(NETWARE_CLIB) && defined(NETWARE_BSDSOCK)
-		ret=sendto(b->num, (char *)in, inl, 0, (const struct sockaddr *)&data->peer, sizeof(struct sockaddr_in));
-#else
-		ret=sendto(b->num, in, inl, 0, (const struct sockaddr *)&data->peer, sizeof(struct sockaddr_in));
-#endif
+		ret=sendto(b->num, in, inl, 0, &data->peer.sa, sizeof(data->peer));
 #endif
 
 	BIO_clear_retry_flags(b);
@@ -428,11 +425,20 @@ static long dgram_ctrl(BIO *b, int cmd, 
 		else
 			{
 #endif
+			switch (to->sa_family)
+				{
+				case AF_INET:
+					memcpy(&data->peer,to,sizeof(data->peer.sa_in));
+					break;
 #if OPENSSL_USE_IPV6
-			memcpy(&(data->peer),to, sizeof(struct sockaddr_storage));
-#else
-			memcpy(&(data->peer),to, sizeof(struct sockaddr_in));
-#endif
+				case AF_INET6:
+					memcpy(&data->peer,to,sizeof(data->peer.sa_in6));
+					break;
+#endif
+				default:
+					memcpy(&data->peer,to,sizeof(data->peer.sa));
+					break;
+				}
 #if 0
 			}
 #endif
@@ -537,41 +543,60 @@ static long dgram_ctrl(BIO *b, int cmd, 
 		if ( to != NULL)
 			{
 			data->connected = 1;
+			switch (to->sa_family)
+				{
+				case AF_INET:
+					memcpy(&data->peer,to,sizeof(data->peer.sa_in));
+					break;
 #if OPENSSL_USE_IPV6
-			memcpy(&(data->peer),to, sizeof(struct sockaddr_storage));
-#else
-			memcpy(&(data->peer),to, sizeof(struct sockaddr_in));
-#endif
+				case AF_INET6:
+					memcpy(&data->peer,to,sizeof(data->peer.sa_in6));
+					break;
+#endif
+				default:
+					memcpy(&data->peer,to,sizeof(data->peer.sa));
+					break;
+				}
 			}
 		else
 			{
 			data->connected = 0;
-#if OPENSSL_USE_IPV6
-			memset(&(data->peer), 0x00, sizeof(struct sockaddr_storage));
-#else
-			memset(&(data->peer), 0x00, sizeof(struct sockaddr_in));
-#endif
+			memset(&(data->peer), 0x00, sizeof(data->peer));
 			}
 		break;
 	case BIO_CTRL_DGRAM_GET_PEER:
 		to = (struct sockaddr *) ptr;
-
+		switch (to->sa_family)
+			{
+			case AF_INET:
+				memcpy(to,&data->peer,(ret=sizeof(data->peer.sa_in)));
+				break;
 #if OPENSSL_USE_IPV6
-		memcpy(to, &(data->peer), sizeof(struct sockaddr_storage));
-		ret = sizeof(struct sockaddr_storage);
-#else
-		memcpy(to, &(data->peer), sizeof(struct sockaddr_in));
-		ret = sizeof(struct sockaddr_in);
-#endif
+			case AF_INET6:
+				memcpy(to,&data->peer,(ret=sizeof(data->peer.sa_in6)));
+				break;
+#endif
+			default:
+				memcpy(to,&data->peer,(ret=sizeof(data->peer.sa)));
+				break;
+			}
 		break;
 	case BIO_CTRL_DGRAM_SET_PEER:
 		to = (struct sockaddr *) ptr;
-
+		switch (to->sa_family)
+			{
+			case AF_INET:
+				memcpy(&data->peer,to,sizeof(data->peer.sa_in));
+				break;
 #if OPENSSL_USE_IPV6
-		memcpy(&(data->peer), to, sizeof(struct sockaddr_storage));
-#else
-		memcpy(&(data->peer), to, sizeof(struct sockaddr_in));
-#endif
+			case AF_INET6:
+				memcpy(&data->peer,to,sizeof(data->peer.sa_in6));
+				break;
+#endif
+			default:
+				memcpy(&data->peer,to,sizeof(data->peer.sa));
+				break;
+			}
 		break;
 	case BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT:
 		memcpy(&(data->next_timeout), ptr, sizeof(struct timeval));

openssl-1.0.0-beta4-reneg-err.patch:
 s23_srvr.c |    5 +++++
 ssl.h      |    3 +++
 ssl_err.c  |    3 +++
 t1_lib.c   |    4 ++++
 4 files changed, 15 insertions(+)

--- NEW FILE openssl-1.0.0-beta4-reneg-err.patch ---
Better error reporting for unsafe renegotiation.
diff -up openssl-1.0.0-beta4/ssl/ssl_err.c.reneg-err openssl-1.0.0-beta4/ssl/ssl_err.c
--- openssl-1.0.0-beta4/ssl/ssl_err.c.reneg-err	2009-11-09 19:45:42.000000000 +0100
+++ openssl-1.0.0-beta4/ssl/ssl_err.c	2009-11-20 17:56:57.000000000 +0100
@@ -226,7 +226,9 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_SSL_LOAD_CLIENT_CA_FILE),	"SSL_load_client_CA_file"},
 {ERR_FUNC(SSL_F_SSL_NEW),	"SSL_new"},
 {ERR_FUNC(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT),	"SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT"},
+{ERR_FUNC(SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT),	"SSL_PARSE_CLIENTHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT),	"SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT"},
+{ERR_FUNC(SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT),	"SSL_PARSE_SERVERHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_SSL_PEEK),	"SSL_peek"},
 {ERR_FUNC(SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT),	"SSL_PREPARE_CLIENTHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT),	"SSL_PREPARE_SERVERHELLO_TLSEXT"},
@@ -526,6 +528,7 @@ static ERR_STRING_DATA SSL_str_reasons[]
 {ERR_REASON(SSL_R_UNKNOWN_REMOTE_ERROR_TYPE),"unknown remote error type"},
 {ERR_REASON(SSL_R_UNKNOWN_SSL_VERSION)   ,"unknown ssl version"},
 {ERR_REASON(SSL_R_UNKNOWN_STATE)         ,"unknown state"},
+{ERR_REASON(SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED),"unsafe legacy renegotiation disabled"},
 {ERR_REASON(SSL_R_UNSUPPORTED_CIPHER)    ,"unsupported cipher"},
 {ERR_REASON(SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM),"unsupported compression algorithm"},
 {ERR_REASON(SSL_R_UNSUPPORTED_DIGEST_TYPE),"unsupported digest type"},
diff -up openssl-1.0.0-beta4/ssl/ssl.h.reneg-err openssl-1.0.0-beta4/ssl/ssl.h
--- openssl-1.0.0-beta4/ssl/ssl.h.reneg-err	2009-11-12 15:17:29.000000000 +0100
+++ openssl-1.0.0-beta4/ssl/ssl.h	2009-11-20 17:56:57.000000000 +0100
@@ -1934,7 +1934,9 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_SSL_LOAD_CLIENT_CA_FILE			 185
 #define SSL_F_SSL_NEW					 186
 #define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT	 300
+#define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT		 302
 #define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT	 301
+#define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT		 303
 #define SSL_F_SSL_PEEK					 270
 #define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT		 281
 #define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT		 282
@@ -2231,6 +2233,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE			 253
 #define SSL_R_UNKNOWN_SSL_VERSION			 254
 #define SSL_R_UNKNOWN_STATE				 255
+#define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED	 338
 #define SSL_R_UNSUPPORTED_CIPHER			 256
 #define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM		 257
 #define SSL_R_UNSUPPORTED_DIGEST_TYPE			 326
diff -up openssl-1.0.0-beta4/ssl/s23_srvr.c.reneg-err openssl-1.0.0-beta4/ssl/s23_srvr.c
--- openssl-1.0.0-beta4/ssl/s23_srvr.c.reneg-err	2009-11-12 15:17:29.000000000 +0100
+++ openssl-1.0.0-beta4/ssl/s23_srvr.c	2009-11-20 17:57:23.000000000 +0100
@@ -497,6 +497,11 @@ int ssl23_get_client_hello(SSL *s)
 		SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
 		goto err;
 #else
+		if (!(s->ctx->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
+			{
+			SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
+			goto err;
+			}
 		/* we are talking sslv2 */
 		/* we need to clean up the SSLv3/TLSv1 setup and put in the
 		 * sslv2 stuff. */
diff -up openssl-1.0.0-beta4/ssl/t1_lib.c.reneg-err openssl-1.0.0-beta4/ssl/t1_lib.c
--- openssl-1.0.0-beta4/ssl/t1_lib.c.reneg-err	2009-11-18 14:04:19.000000000 +0100
+++ openssl-1.0.0-beta4/ssl/t1_lib.c	2009-11-20 17:56:57.000000000 +0100
@@ -636,6 +636,7 @@ int ssl_parse_clienthello_tlsext(SSL *s,
 			{
 			/* We should always see one extension: the renegotiate extension */
 			*al = SSL_AD_ILLEGAL_PARAMETER; /* is this the right alert? */
+			SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
 			return 0;
 			}
 		return 1;
@@ -965,6 +966,7 @@ int ssl_parse_clienthello_tlsext(SSL *s,
  	if (s->new_session && !renegotiate_seen
  		&& !(s->ctx->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
  		{
+		SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
  		*al = SSL_AD_ILLEGAL_PARAMETER; /* is this the right alert? */
  		return 0;
  		}
@@ -993,6 +995,7 @@ int ssl_parse_serverhello_tlsext(SSL *s,
 			{
 			/* We should always see one extension: the renegotiate extension */
 			*al = SSL_AD_ILLEGAL_PARAMETER; /* is this the right alert? */
+			SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
 			return 0;
 			}
 #endif
@@ -1133,6 +1136,7 @@ int ssl_parse_serverhello_tlsext(SSL *s,
 		&& !(s->ctx->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
 		{
 		*al = SSL_AD_ILLEGAL_PARAMETER; /* is this the right alert? */
+		SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
 		return 0;
 		}
 #endif


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-12/openssl.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- openssl.spec	18 Nov 2009 14:03:10 -0000	1.147
+++ openssl.spec	15 Dec 2009 18:12:29 -0000	1.148
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.13.%{beta}%{?dist}
+Release: 0.16.%{beta}%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-%{beta}-usa.tar.bz2
@@ -66,6 +66,8 @@ Patch60: openssl-1.0.0-beta4-reneg.patch
 # This one is not backported but has to be applied after reneg patch
 Patch61: openssl-1.0.0-beta4-client-reneg.patch
 Patch62: openssl-1.0.0-beta4-backports.patch
+Patch63: openssl-1.0.0-beta4-reneg-err.patch
+Patch64: openssl-1.0.0-beta4-dtls-ipv6.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -148,6 +150,8 @@ from other formats to the formats used b
 %patch60 -p1 -b .reneg
 %patch61 -p1 -b .client-reneg
 %patch62 -p1 -b .backports
+%patch63 -p1 -b .reneg-err
+%patch64 -p1 -b .dtls-ipv6
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -181,7 +185,7 @@ sslarch=linux-alpha-gcc
 sslarch="linux-generic32 -DB_ENDIAN"
 %endif
 %ifarch s390x
-sslarch="linux-generic64 -DB_ENDIAN"
+sslarch="linux-s390x"
 %endif
 %ifarch %{arm} sh3 sh4
 sslarch=linux-generic32
@@ -396,6 +400,16 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Nov 23 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.16.beta4
+- fix non-fips mingw build (patch by Kalev Lember)
+- add IPV6 fix for DTLS
+
+* Fri Nov 20 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.15.beta4
+- add better error reporting for the unsafe renegotiation
+
+* Fri Nov 20 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.14.beta4
+- fix build on s390x
+
 * Wed Nov 18 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.13.beta4
 - disable enforcement of the renegotiation extension on the client (#537962)
 - add fixes from the current upstream snapshot



From mclasen at fedoraproject.org  Tue Dec 15 18:37:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 18:37:19 +0000 (UTC)
Subject: rpms/ConsoleKit/F-12 ConsoleKit.spec,1.50,1.51
Message-ID: <20091215183719.DB4F811C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11220

Modified Files:
	ConsoleKit.spec 
Log Message:
apply hte patch



Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/F-12/ConsoleKit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ConsoleKit.spec	15 Dec 2009 16:05:02 -0000	1.50
+++ ConsoleKit.spec	15 Dec 2009 18:37:18 -0000	1.51
@@ -82,6 +82,7 @@ This package contains developer document
 
 %prep
 %setup -q
+%patch0 -p1 -b .nodaemon
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}



From mclasen at fedoraproject.org  Tue Dec 15 18:38:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 18:38:07 +0000 (UTC)
Subject: rpms/ConsoleKit/devel ConsoleKit.spec,1.51,1.52
Message-ID: <20091215183807.96C2411C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11448

Modified Files:
	ConsoleKit.spec 
Log Message:
try again



Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ConsoleKit.spec	15 Dec 2009 18:04:57 -0000	1.51
+++ ConsoleKit.spec	15 Dec 2009 18:38:07 -0000	1.52
@@ -88,6 +88,7 @@ This package contains developer document
 %setup -q
 %patch0 -p1 -b .upstart06
 %patch1 -p1 -b .no-daemon
+
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
 



From mclasen at fedoraproject.org  Tue Dec 15 18:42:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 18:42:20 +0000 (UTC)
Subject: rpms/ConsoleKit/F-12 nodaemon.patch, NONE, 1.1 nodeamon.patch, 1.1,
	NONE
Message-ID: <20091215184220.53A9111C02A3@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12214

Added Files:
	nodaemon.patch 
Removed Files:
	nodeamon.patch 
Log Message:
ae, no ea, you fool


nodaemon.patch:
 org.freedesktop.ConsoleKit.service.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nodaemon.patch ---
diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in
--- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon	2009-12-15 10:56:39.839818556 -0500
+++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in	2009-12-15 10:56:50.177792048 -0500
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.ConsoleKit
-Exec=@sbindir@/console-kit-daemon
+Exec=@sbindir@/console-kit-daemon --no-daemon
 User=root


--- nodeamon.patch DELETED ---



From mclasen at fedoraproject.org  Tue Dec 15 18:44:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 18:44:08 +0000 (UTC)
Subject: rpms/ConsoleKit/devel nodaemon.patch, NONE, 1.1 nodeamon.patch, 1.1,
	NONE
Message-ID: <20091215184408.27B0811C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12582

Added Files:
	nodaemon.patch 
Removed Files:
	nodeamon.patch 
Log Message:
grr


nodaemon.patch:
 org.freedesktop.ConsoleKit.service.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nodaemon.patch ---
diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in
--- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon	2009-12-15 10:56:39.839818556 -0500
+++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in	2009-12-15 10:56:50.177792048 -0500
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.ConsoleKit
-Exec=@sbindir@/console-kit-daemon
+Exec=@sbindir@/console-kit-daemon --no-daemon
 User=root


--- nodeamon.patch DELETED ---



From belegdol at fedoraproject.org  Tue Dec 15 18:49:01 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Tue, 15 Dec 2009 18:49:01 +0000 (UTC)
Subject: rpms/EMBOSS/devel EMBOSS-6.1.0-rebuild.patch, NONE,
	1.1 jemboss.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 EMBOSS.spec,
	1.1, 1.2 README.fixes, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091215184901.5418611C0092@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13542

Modified Files:
	.cvsignore EMBOSS.spec README.fixes sources 
Added Files:
	EMBOSS-6.1.0-rebuild.patch jemboss.desktop 
Log Message:
* Sun Dec 13 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-6
- Added the upstream 1-3 patch
- Fixed bogus Patch3 description
- Jemboss is still disabled, but some improvements have been made
  - Backported patch enabling jemboss rebuild from CVS
  - Added ant and jpackage-utils to BuildRequires
  - Made java-devel dependency versioned
  - Switched to build-jar-repository to fill the dependencies
  - Replaced versioned log4j calls with latest version
  - Renamed EMBOSS-java to jemboss
  - Added a desktop entry for jemboss from Debian


EMBOSS-6.1.0-rebuild.patch:
 Makefile.am |    5 +++++
 Makefile.in |   31 +++++++++++++++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)

--- NEW FILE EMBOSS-6.1.0-rebuild.patch ---
--- jemboss/lib/Makefile.am.rebuild	2009-06-30 10:33:58.000000000 +0200
+++ jemboss/lib/Makefile.am	2009-10-21 07:56:01.000000000 +0200
@@ -1,5 +1,10 @@
 SUBDIRS = axis
 
+all-local:
+if EHAVEANT
+	ant -f ../build.xml package -Demboss.data=../emboss/data -Dname=client -Djar.dir=lib -Dnotformemboss=yes;
+endif
+
 # The install-exec-hook is for the case where a client.jar has
 # been created by the 'ant' packaging for a standalone Jemboss.
 # In that case it needs to be copied to the install dir.
--- jemboss/lib/Makefile.in.rebuild	2009-07-15 01:16:01.000000000 +0200
+++ jemboss/lib/Makefile.in	2009-10-21 07:56:46.000000000 +0200
@@ -507,7 +507,7 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA)
+all-am: Makefile $(DATA) all-local
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
@@ -609,21 +609,24 @@
 	install-am install-exec-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgdataDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-pkgdataDATA
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgdataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-pkgdataDATA
 
 
+all-local:
+ at EHAVEANT_TRUE@	ant -f ../build.xml package -Demboss.data=../emboss/data -Dname=client -Djar.dir=lib -Dnotformemboss=yes;
+
 # The install-exec-hook is for the case where a client.jar has
 # been created by the 'ant' packaging for a standalone Jemboss.
 # In that case it needs to be copied to the install dir.


--- NEW FILE jemboss.desktop ---
[Desktop Entry]
Version=1.0
Terminal=false
Icon=jemboss
Exec=runJemboss.csh
Name=Jemboss
GenericName=GUI for EMBOSS
Comment=Graphical user interface for the European Molecular Biology Open Software Suite.
Type=Application
Categories=Biology;Science;Education;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Oct 2009 22:47:55 -0000	1.2
+++ .cvsignore	15 Dec 2009 18:49:00 -0000	1.3
@@ -1,2 +1,2 @@
 EMBOSS-6.1.0.tar.gz
-patch-1-2.gz
+patch-1-3.gz


Index: EMBOSS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/devel/EMBOSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- EMBOSS.spec	17 Oct 2009 22:47:55 -0000	1.1
+++ EMBOSS.spec	15 Dec 2009 18:49:01 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           EMBOSS
 Version:        6.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The European Molecular Biology Open Software Suite
 
 Group:          Applications/Engineering
@@ -13,22 +13,28 @@ License:        GPLv2+
 URL:            http://emboss.sf.net/
 Source0:        ftp://emboss.open-bio.org/pub/EMBOSS/%{name}-%{version}.tar.gz
 Source1:        README.fixes
+Source2:        jemboss.desktop
 #Upstream patch
-Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-2.gz
+Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-3.gz
 #Use system-wide pcre. Sent upstream.
 Patch1:         %{name}-system-pcre.patch
 #Fedora-specific. Not sent upstream.
 Patch2:         %{name}-fedora.patch
-#Add missing destdir. Sent upstream.
+#Remove extra destdir. Sent upstream.
 Patch3:         %{name}-6.1.0-destdir.patch
+#Patch ensuring jemboss rebuild backported from CVS
+Patch4:         %{name}-6.1.0-rebuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  ant
+BuildRequires:  desktop-file-utils
 BuildRequires:  gd-devel
-#BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils
 BuildRequires:  pam-devel
 BuildRequires:  pcre-devel
-#BuildRequires:  axis classpathx-jaf jakarta-commons-discovery
-#BuildRequires:  jakarta-commons-logging log4j wsdl4j
+BuildRequires:  axis jaf javamail jakarta-commons-discovery jakarta-commons-logging
+BuildRequires:  log4j regexp servlet xerces-j2 wsdl4j
 
 %description
 EMBOSS is a new, free Open Source software analysis package specially
@@ -64,21 +70,23 @@ The %{name}-libs package includes the dy
 necessary for %{name}.
 
 
-#%package java
-#Summary:        Java interface to %{name}
-#Group:          Applications/Engineering
-#Requires:       %{name} = %{version}-%{release}
-#Requires:       axis classpathx-jaf jakarta-commons-discovery
-#Requires:       jakarta-commons-logging log4j wsdl4j
-
-#%description java
-#Jemboss is a Java interface to EMBOSS, developed at
-#the HGMP-RC and in close collaboration with the EMBOSS
-#development team. It is distributed as part of the EMBOSS
-#software.
+%package -n jemboss
+Summary:        Java interface to %{name}
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+Requires:       java >= 1:1.6.0
+Requires:       jpackage-utils    
+Requires:       axis jaf javamail jakarta-commons-discovery jakarta-commons-logging
+Requires:       log4j regexp servlet xerces-j2 wsdl4j
+
+%description -n jemboss
+Jemboss is a Java interface to EMBOSS, developed at
+the HGMP-RC and in close collaboration with the EMBOSS
+development team. It is distributed as part of the EMBOSS
+software.
 
-#Documentation on Jemboss can be found at:
-#http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/
+Documentation on Jemboss can be found at:
+http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/
 
 
 %prep
@@ -87,6 +95,7 @@ necessary for %{name}.
 %patch1 -p1 -b .pcre
 %patch2 -p0 -b .fedora
 %patch3 -p0 -b .destdir
+%patch4 -p0 -b .jemboss-rebuild
 
 #install the patch readme
 install -pm 644 %{SOURCE1} README.fixes
@@ -94,30 +103,29 @@ install -pm 644 %{SOURCE1} README.fixes
 #these files were executable for some reason
 chmod 644 emboss/prettyplot.c emboss/polydot.c emboss/supermatcher.c
 
+#use newer log4j version
+sed -i "s at log4j-1.2.8@log4j-1.2.14@" \
+    jemboss/lib/axis/Makefile.am \
+    jemboss/lib/axis/Makefile.in \
+    jemboss/utils/makeFileManagerJNLP.sh \
+    jemboss/utils/makeJNLP.sh
+
 #use system java libraries
-#pushd jemboss/lib
-#rm activation.jar;
-#ln -s %{_javadir}/activation.jar activation.jar;
-#pushd axis
-#for i in axis-ant axis jaxrpc saaj;
-#do
-#    rm $i.jar;
-#    ln -s %{_javadir}/axis/$i.jar $i.jar;
-#done
-#for i in commons-discovery commons-logging wsdl4j;
-#do
-#    rm $i.jar;
-#    ln -s %{_javadir}/$i.jar $i.jar;
-#done
-#rm log4j-1.2.8.jar
-#ln -s %{_javadir}/log4j.jar log4j-1.2.8.jar
-#popd
-#popd
+rm jemboss/lib/{activation,client,jakarta-regexp-1.2,mail,xerces}.jar
+build-jar-repository -s -p jemboss/lib activation regexp javamail xerces-j2
+mv jemboss/lib/regexp.jar jemboss/lib/jakarta-regexp-1.2.jar
+mv jemboss/lib/javamail.jar jemboss/lib/mail.jar
+mv jemboss/lib/xerces-j2.jar jemboss/lib/xerces.jar
+rm jemboss/lib/axis/*.jar
+build-jar-repository -s -p jemboss/lib/axis axis/axis-ant axis/axis axis/jaxrpc axis/saaj commons-discovery commons-logging log4j-1.2.14 servlet wsdl4j
+for i in axis axis-ant jaxrpc saaj;
+do
+mv jemboss/lib/axis/axis_$i.jar jemboss/lib/axis/$i.jar;
+done
 
 
 %build
 %configure \
-  --without-java \
   --disable-static \
   --with-x \
   --with-auth \
@@ -126,6 +134,9 @@ chmod 644 emboss/prettyplot.c emboss/pol
 %ifarch ppc64 sparc64 x86_64
   --enable-64 \
 %endif
+  --with-java=/usr/lib/jvm/java/include \
+  --with-javaos=/usr/lib/jvm/java/include/linux \
+
 
 %{__make} %{?_smp_mflags}
 
@@ -169,6 +180,11 @@ popd
 #rename conflicting binaries
 mv $RPM_BUILD_ROOT%{_bindir}/chaos $RPM_BUILD_ROOT%{_bindir}/em_chaos
 
+#install the desktop file
+desktop-file-install                                    \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+%{SOURCE2}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -201,15 +217,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 
-#%files java
-#%defattr(-,root,root,-)
-#%doc jemboss/README jemboss/resources jemboss/api
-#%{_bindir}/runJemboss.csh
-#%{_bindir}/jembossctl
-#%{_datadir}/EMBOSS/jemboss
+%files -n jemboss
+%defattr(-,root,root,-)
+%doc jemboss/README jemboss/resources jemboss/api
+%{_bindir}/runJemboss.csh
+%{_bindir}/jembossctl
+%{_datadir}/applications/jemboss.desktop
+%{_datadir}/EMBOSS/jemboss
 
 
 %changelog
+* Sun Dec 13 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-6
+- Added the upstream 1-3 patch
+- Fixed bogus Patch3 description
+- Jemboss is still disabled, but some improvements have been made
+  - Backported patch enabling jemboss rebuild from CVS
+  - Added ant and jpackage-utils to BuildRequires
+  - Made java-devel dependency versioned
+  - Switched to build-jar-repository to fill the dependencies
+  - Replaced versioned log4j calls with latest version
+  - Renamed EMBOSS-java to jemboss
+  - Added a desktop entry for jemboss from Debian
+
 * Sat Oct 17 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-5
 - Added comments explaining the purpose of each patch
 


Index: README.fixes
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/devel/README.fixes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.fixes	17 Oct 2009 22:47:55 -0000	1.1
+++ README.fixes	15 Dec 2009 18:49:01 -0000	1.2
@@ -30,3 +30,79 @@ Fix 2. EMBOSS-6.1.0/ajax/ajmem.h
              This fixes a bug in processing SwissProt complex descriptions.
              Fix definition of AJRESIZE0 macro.
 	     Fix processing of first match in a profile alignment (prophet).
+
+Fix 3. EMBOSS-6.1.0/ajax/ajfeat.c
+       EMBOSS-6.1.0/ajax/ajfeat.h
+       EMBOSS-6.1.0/ajax/ajgraph.c
+       EMBOSS-6.1.0/ajax/ajmath.c
+       EMBOSS-6.1.0/ajax/ajseq.c
+       EMBOSS-6.1.0/ajax/ajseqread.c
+       EMBOSS-6.1.0/ajax/ajseqwrite.c
+       EMBOSS-6.1.0/nucleus/embmisc.c
+       EMBOSS-6.1.0/nucleus/embmisc.h
+       EMBOSS-6.1.0/nucleus/embpat.c
+       EMBOSS-6.1.0/emboss/coderet.c
+       EMBOSS-6.1.0/emboss/extractfeat.c
+       EMBOSS-6.1.0/emboss/notseq.c
+       EMBOSS-6.1.0/emboss/prettyplot.c
+       EMBOSS-6.1.0/emboss/seqmatchall.c
+       EMBOSS-6.1.0/emboss/showfeat.c
+       EMBOSS-6.1.0/emboss/showpep.c
+       EMBOSS-6.1.0/emboss/showseq.c
+       EMBOSS-6.1.0/emboss/twofeat.c
+       EMBOSS-6.1.0/jemboss/utils/install-jemboss-server.sh
+       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/server/AppendToLogFileThread.java
+       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/server/JembossAuthServer.java
+
+02-Dec-2009: Fixes problems with extractfeat. The fix includes cleaner
+             definitions of functions used to match feature tags and
+             feature types which result in minor updates to 6 other
+             applications.
+
+             Extractfeat in previous versions used its own text parser
+             to extract feature data from only a limited set of
+             formats. In release 6.1.0 it was replaced by the standard
+             EMBOSS feature table. With no options set, extractfeat
+             rejected all features (type '*' was needed to extract
+             features). Extractfeat default settings now extract all
+             features from an entry.
+
+             Features on the reverse strand were incorrectly processed
+             (an effect caused by some of the old extractfeat code
+             remaining). Reverse strand features are now correctly
+             parsed, including both "join(complement())" and
+             "complement(join())" syntax in EMBL/GenBank/DDBJ feature
+             tables.
+
+             Fixes an issue in GenBank parsing where the ORIGIN line is absent.
+
+             Fixes scaling errors in prettyplot, especially in mEMBOSS
+             when plotting to a window on screen (the default
+             output). The plplot library does not report the true
+             width and height for several devices. The assumptions in
+             prettyplot depend on reasonable size estimates. Release
+             6.2.0 will have further corrections to plplot device
+             scaling.
+
+	     Fixes the counting of non-coding features in coderet.
+
+	     Fixes a seqmatchall error for short sequences with perfect matches
+
+	     When reverse-complementing sequences, also reverses
+	     the quality scores.
+
+	     Allows '-' in format names in the USA syntax, to allow
+	     fastq-sanger fastq-illumina and fastq-solexa format names
+	     to be used.
+
+	     When reading protein sequences, a sequence with only a
+	     stop is now recognized as empty (zero length) after
+	     processing ambiguity codes and stops.
+
+	     Fixes a problem writing features in PIR format when the
+	     feature table is empty, for example a report file with no hits.
+
+	     Fixes a dependency on 'ant' to install a Jemboss server.
+
+	     Fixes a problem in logging Jemboss info/error messages.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Oct 2009 22:47:55 -0000	1.2
+++ sources	15 Dec 2009 18:49:01 -0000	1.3
@@ -1,2 +1,2 @@
 6c5163c571bc0be94d64420ce0d71824  EMBOSS-6.1.0.tar.gz
-faec6ddd399ef243f4d6ffbcc878b009  patch-1-2.gz
+4a5f96d849409fdecf39e92380e5381e  patch-1-3.gz



From belegdol at fedoraproject.org  Tue Dec 15 19:11:32 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Tue, 15 Dec 2009 19:11:32 +0000 (UTC)
Subject: rpms/EMBOSS/devel EMBOSS.spec,1.2,1.3
Message-ID: <20091215191132.4C84211C0374@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16948

Modified Files:
	EMBOSS.spec 
Log Message:
Disable jemboss


Index: EMBOSS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/devel/EMBOSS.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- EMBOSS.spec	15 Dec 2009 18:49:01 -0000	1.2
+++ EMBOSS.spec	15 Dec 2009 19:11:30 -0000	1.3
@@ -70,23 +70,23 @@ The %{name}-libs package includes the dy
 necessary for %{name}.
 
 
-%package -n jemboss
-Summary:        Java interface to %{name}
-Group:          Applications/Engineering
-Requires:       %{name} = %{version}-%{release}
-Requires:       java >= 1:1.6.0
-Requires:       jpackage-utils    
-Requires:       axis jaf javamail jakarta-commons-discovery jakarta-commons-logging
-Requires:       log4j regexp servlet xerces-j2 wsdl4j
-
-%description -n jemboss
-Jemboss is a Java interface to EMBOSS, developed at
-the HGMP-RC and in close collaboration with the EMBOSS
-development team. It is distributed as part of the EMBOSS
-software.
+#%package -n jemboss
+#Summary:        Java interface to %{name}
+#Group:          Applications/Engineering
+#Requires:       %{name} = %{version}-%{release}
+#Requires:       java >= 1:1.6.0
+#Requires:       jpackage-utils    
+#Requires:       axis jaf javamail jakarta-commons-discovery jakarta-commons-logging
+#Requires:       log4j regexp servlet xerces-j2 wsdl4j
+
+#%description -n jemboss
+#Jemboss is a Java interface to EMBOSS, developed at
+#the HGMP-RC and in close collaboration with the EMBOSS
+#development team. It is distributed as part of the EMBOSS
+#software.
 
-Documentation on Jemboss can be found at:
-http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/
+#Documentation on Jemboss can be found at:
+#http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/
 
 
 %prep
@@ -181,9 +181,9 @@ popd
 mv $RPM_BUILD_ROOT%{_bindir}/chaos $RPM_BUILD_ROOT%{_bindir}/em_chaos
 
 #install the desktop file
-desktop-file-install                                    \
---dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
-%{SOURCE2}
+#desktop-file-install                                    \
+#--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+#%{SOURCE2}
 
 
 %clean
@@ -212,18 +212,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_includedir}/EMBOSS
 
+
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
 
-%files -n jemboss
-%defattr(-,root,root,-)
-%doc jemboss/README jemboss/resources jemboss/api
-%{_bindir}/runJemboss.csh
-%{_bindir}/jembossctl
-%{_datadir}/applications/jemboss.desktop
-%{_datadir}/EMBOSS/jemboss
+#%files -n jemboss
+#%defattr(-,root,root,-)
+#%doc jemboss/README jemboss/resources jemboss/api
+#%{_bindir}/runJemboss.csh
+#%{_bindir}/jembossctl
+#%{_datadir}/applications/jemboss.desktop
+#%{_datadir}/EMBOSS/jemboss
 
 
 %changelog



From kasal at fedoraproject.org  Tue Dec 15 19:15:24 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 15 Dec 2009 19:15:24 +0000 (UTC)
Subject: rpms/bitmap/devel bitmap.spec,1.7,1.8
Message-ID: <20091215191524.95C5111C0092@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/bitmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17672

Modified Files:
	bitmap.spec 
Log Message:
- silence scriptlets


Index: bitmap.spec
===================================================================
RCS file: /cvs/extras/rpms/bitmap/devel/bitmap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bitmap.spec	24 Jul 2009 18:06:49 -0000	1.7
+++ bitmap.spec	15 Dec 2009 19:15:23 -0000	1.8
@@ -1,6 +1,6 @@
 Name: bitmap
 Version: 1.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Bitmap editor and converter utilities for the X Window System
 Group: User Interface/X
 Url: http://www.x.org
@@ -57,12 +57,20 @@ rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+# update the icon cache, if it exists
+if [ -d %{_datadir}/icons/hicolor -a -x %{_bindir}/gtk-update-icon-cache ]
+then
+  touch %{_datadir}/icons/hicolor
+  %{_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 || :
+# update the icon cache, if it exists
+if [ -d %{_datadir}/icons/hicolor -a -x %{_bindir}/gtk-update-icon-cache ]
+then
+  touch %{_datadir}/icons/hicolor
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 
 %files
@@ -79,6 +87,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/*.1*
 
 %changelog
+* Tue Dec 15 2009 Stepan Kasal <skasal at redhat.com> - 1.0.3-7
+- silence scriptlets
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jspaleta at fedoraproject.org  Tue Dec 15 19:27:15 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 15 Dec 2009 19:27:15 +0000 (UTC)
Subject: rpms/gpodder/F-12 gpodder.spec,1.34,1.35 sources,1.25,1.26
Message-ID: <20091215192715.E1F1811C0092@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gpodder/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19814

Modified Files:
	gpodder.spec sources 
Log Message:
* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.1-1
- New upstream release



Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/F-12/gpodder.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gpodder.spec	16 Sep 2009 06:37:38 -0000	1.34
+++ gpodder.spec	15 Dec 2009 19:27:14 -0000	1.35
@@ -2,7 +2,7 @@
 
 
 Name:           gpodder
-Version:        2.0
+Version:        2.1
 Release:        1%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
@@ -74,6 +74,9 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.1-1
+- New upstream release
+
 * Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.0-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	16 Sep 2009 06:37:38 -0000	1.25
+++ sources	15 Dec 2009 19:27:15 -0000	1.26
@@ -1 +1 @@
-288641768cdef679ed2e7976562b200e  gpodder-2.0.tar.gz
+57ed679e3722b7c214956b8d4e13141a  gpodder-2.1.tar.gz



From kasal at fedoraproject.org  Tue Dec 15 19:42:50 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 15 Dec 2009 19:42:50 +0000 (UTC)
Subject: rpms/gg2/devel gg2.spec,1.15,1.16
Message-ID: <20091215194250.0330F11C0092@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/gg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22609

Modified Files:
	gg2.spec 
Log Message:
- replace the perl(DynaLoader) requirement by the standard
  perl(:MODULE_COMPAT_5.10.1)


Index: gg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gg2/devel/gg2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gg2.spec	6 Dec 2009 23:09:27 -0000	1.15
+++ gg2.spec	15 Dec 2009 19:42:49 -0000	1.16
@@ -1,6 +1,6 @@
 Name: gg2
 Version: 2.3.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: GNU Gadu 2 - free talking
 Summary(es): GNU Gadu 2 - charlar libremente
 Summary(pl): GNU Gadu 2 - wolne gadanie
@@ -47,7 +47,7 @@ licencji GNU/GPL.
 Summary: GNU Gadu 2 - free talking (core)
 Summary(pl): GNU Gadu 2 - wolne gadanie (pakiet g??wny)
 Group: Applications/Internet
-Requires: perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description core
 Gadu-Gadu, Tlen.pl and others instant messanger client with
@@ -360,6 +360,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gg2_core.pc
 
 %changelog
+* Tue Dec 15 2009 Stepan Kasal <skasal at redhat.com> - 2.3.0-15
+- replace the perl(DynaLoader) requirement by the standard
+  perl(:MODULE_COMPAT_5.10.1)
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.3.0-14
 - rebuild against perl 5.10.1
 



From pkgdb at fedoraproject.org  Tue Dec 15 20:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 20:07:10 +0000
Subject: [pkgdb] alltray: luceliofreitas has given up watchcommits
Message-ID: <20091215200716.CD00F28ECEA@bastion3.fedora.phx2.redhat.com>

luceliofreitas has given up the watchcommits acl on alltray (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Dec 15 20:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 20:07:25 +0000
Subject: [pkgdb] alltray: luceliofreitas has given up watchbugzilla
Message-ID: <20091215200726.9833528ED28@bastion3.fedora.phx2.redhat.com>

luceliofreitas has given up the watchbugzilla acl on alltray (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From mclasen at fedoraproject.org  Tue Dec 15 20:47:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 20:47:08 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-12 survive-xmm.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.136, 1.137
Message-ID: <20091215204708.5AB7111C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2833

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	survive-xmm.patch 
Log Message:
Survive without XKB


survive-xmm.patch:
 gsd-keyboard-xkb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE survive-xmm.patch ---
diff -up gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c.survive-xmm gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c.survive-xmm	2009-12-15 15:39:28.904208015 -0500
+++ gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c	2009-12-15 15:39:46.554927327 -0500
@@ -236,7 +236,7 @@ apply_xkb_settings (void)
 		GSList *found_node;
 		int     max_groups;
 
-		max_groups = xkl_engine_get_max_num_groups (xkl_engine);
+		max_groups = MAX (xkl_engine_get_max_num_groups (xkl_engine), 1);
 		layouts = gconf_client_get_list (conf_client,
 						 GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
 						 GCONF_VALUE_STRING, NULL);


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- gnome-settings-daemon.spec	12 Nov 2009 14:06:37 -0000	1.136
+++ gnome-settings-daemon.spec	15 Dec 2009 20:47:07 -0000	1.137
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -45,8 +45,10 @@ Patch4: 0001-Fix-bluriness-in-level-bar-
 Patch5: 0001-Avoid-volumes-going-over-100.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=601203
 Patch6: gsd-screen-changed.patch
-# 
+#
 Patch7: iconleak.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604651
+Patch8: survive-xmm.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -73,6 +75,7 @@ developing applications that use %{name}
 %patch5 -p1 -b .too-high-volume
 %patch6 -p1 -b .screen-change
 %patch7 -p1 -b .iconleak
+%patch8 -p1 -b .survive-xmm
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -184,6 +187,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-9
+- Survive when running without XKB (#547780)
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-8
 - Avoid a 'whitespace leak' around the display statusicon (gnome #601696)
 



From jorton at fedoraproject.org  Tue Dec 15 21:07:47 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue, 15 Dec 2009 21:07:47 +0000 (UTC)
Subject: File neon-0.29.1.tar.gz uploaded to lookaside cache by jorton
Message-ID: <20091215210747.1A29728ED1E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for neon:

eb4eac0499cb6fced6e3b11e4b720ebb  neon-0.29.1.tar.gz



From alexlan at fedoraproject.org  Tue Dec 15 21:11:43 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 15 Dec 2009 21:11:43 +0000 (UTC)
Subject: File biopython-1.53.tar.gz uploaded to lookaside cache by alexlan
Message-ID: <20091215211143.4C01E28ED1E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-biopython:

df1004ec64b9b593c0e690c14a20667a  biopython-1.53.tar.gz



From jorton at fedoraproject.org  Tue Dec 15 21:16:57 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue, 15 Dec 2009 21:16:57 +0000 (UTC)
Subject: rpms/neon/devel neon-0.29.1.tar.gz.asc, NONE, 1.1 .cvsignore, 1.19, 
	1.20 neon.spec, 1.55, 1.56 sources, 1.18, 1.19 upstream, 1.12,
	1.13 neon-0.28.6.tar.gz.asc, 1.1, NONE
Message-ID: <20091215211657.7196411C0092@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8169

Modified Files:
	.cvsignore neon.spec sources upstream 
Added Files:
	neon-0.29.1.tar.gz.asc 
Removed Files:
	neon-0.28.6.tar.gz.asc 
Log Message:
* Tue Dec 15 2009 Joe Orton <jorton at redhat.com> - 0.29.1-1
- update to 0.29.1



--- NEW FILE neon-0.29.1.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAksn97cACgkQR/aWnQ5EzwwDmwCfR7zVHAmZXCsR1rHrDbWJ7CIy
THoAnRUC46Ibb/d1cEh7qRIzI6LsllTM
=9HXU
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	13 Sep 2009 18:54:13 -0000	1.19
+++ .cvsignore	15 Dec 2009 21:16:57 -0000	1.20
@@ -1 +1 @@
-neon-0.29.0.tar.gz
+neon-0.29.1.tar.gz


Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- neon.spec	13 Sep 2009 19:34:50 -0000	1.55
+++ neon.spec	15 Dec 2009 21:16:57 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.29.0
-Release: 3%{?dist}
+Version: 0.29.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec 15 2009 Joe Orton <jorton at redhat.com> - 0.29.1-1
+- update to 0.29.1
+
 * Sun Sep 13 2009 Joe Orton <jorton at redhat.com> 0.29.0-3
 - enable libproxy support
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	13 Sep 2009 18:54:13 -0000	1.18
+++ sources	15 Dec 2009 21:16:57 -0000	1.19
@@ -1 +1 @@
-18a3764b70f9317f8b61509fd90d9e7a  neon-0.29.0.tar.gz
+eb4eac0499cb6fced6e3b11e4b720ebb  neon-0.29.1.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/upstream,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- upstream	13 Sep 2009 18:54:13 -0000	1.12
+++ upstream	15 Dec 2009 21:16:57 -0000	1.13
@@ -1 +1 @@
-neon-0.29.0.tar.gz
+neon-0.29.1.tar.gz


--- neon-0.28.6.tar.gz.asc DELETED ---



From mclasen at fedoraproject.org  Tue Dec 15 21:43:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 15 Dec 2009 21:43:27 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel survive-xmm.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.131, 1.132
Message-ID: <20091215214327.EE83C11C0260@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12611

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	survive-xmm.patch 
Log Message:
Survive without XKB


survive-xmm.patch:
 gsd-keyboard-xkb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE survive-xmm.patch ---
diff -up gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c.survive-xmm gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c.survive-xmm	2009-12-15 15:39:28.904208015 -0500
+++ gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c	2009-12-15 15:39:46.554927327 -0500
@@ -236,7 +236,7 @@ apply_xkb_settings (void)
 		GSList *found_node;
 		int     max_groups;
 
-		max_groups = xkl_engine_get_max_num_groups (xkl_engine);
+		max_groups = MAX (xkl_engine_get_max_num_groups (xkl_engine), 1);
 		layouts = gconf_client_get_list (conf_client,
 						 GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
 						 GCONF_VALUE_STRING, NULL);


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- gnome-settings-daemon.spec	12 Nov 2009 14:09:49 -0000	1.131
+++ gnome-settings-daemon.spec	15 Dec 2009 21:43:26 -0000	1.132
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -45,8 +45,10 @@ Patch4: 0001-Fix-bluriness-in-level-bar-
 Patch5: 0001-Avoid-volumes-going-over-100.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=601203
 Patch6: gsd-screen-changed.patch
-# 
+#
 Patch7: iconleak.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604651
+Patch8: survive-xmm.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -73,6 +75,7 @@ developing applications that use %{name}
 %patch5 -p1 -b .too-high-volume
 %patch6 -p1 -b .screen-change
 %patch7 -p1 -b .iconleak
+%patch8 -p1 -b .survive-xmm
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -184,6 +187,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-9
+- Survive when running without XKB (#547780)
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-8
 - Avoid a 'whitespace leak' around the display statusicon (gnome #601696)
 



From petersen at fedoraproject.org  Tue Dec 15 21:50:31 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 15 Dec 2009 21:50:31 +0000 (UTC)
Subject: rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.9,
	1.10 ghc-rpm-macros.spec, 1.11, 1.12
Message-ID: <20091215215031.8B59911C0335@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-rpm-macros/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13553

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
- use ghc_version_override to override ghc_version
- fix pkg .conf filelist match




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ghc-rpm-macros.ghc	11 Dec 2009 18:17:07 -0000	1.9
+++ ghc-rpm-macros.ghc	15 Dec 2009 21:50:31 -0000	1.10
@@ -19,7 +19,7 @@ echo '%defattr(-,root,root,-)' > %1.file
 echo '%dir %{ghcpkgdir}' >> %1.files \
 echo '%attr(755,root,root) %{ghcpkgdir}/libHS%{?pkg_name}%{!?pkg_name:%name}-%{version}-ghc%{ghc_version}.so' >> %1.files \
 echo '%defattr(-,root,root,-)' > %1-devel.files \
-echo '%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{?pkg_name}%{!?pkg_name:%name}-%{version}-*.conf' >> %1-devel.files \
+echo '%{_libdir}/ghc-%{ghc_version}/package.conf.d/%{?pkg_name}%{!?pkg_name:%name}-%{version}*.conf' >> %1-devel.files \
 find ${RPM_BUILD_ROOT}%{ghcpkgdir} -type d | sed 's/^/%dir /' >> %1-devel.files \
 find ${RPM_BUILD_ROOT}%{ghcpkgdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' -o -name 'libHS*.so' \\) >> %1-devel.files \
 echo '%defattr(-,root,root,-)' > %1-prof.files \
@@ -31,7 +31,7 @@ echo '%{ghcdocdir}' >> %1-doc.files \
 
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
-%ghc_version %{!?ghc_version:%(ghc --numeric-version)}%{?ghc_version}
+%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
 
 %ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")
 


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ghc-rpm-macros.spec	11 Dec 2009 18:17:07 -0000	1.11
+++ ghc-rpm-macros.spec	15 Dec 2009 21:50:31 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.3.0
+Version:	0.3.1
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Jens Petersen <petersen at redhat.com> - 0.3.1-1
+- use ghc_version_override to override ghc_version
+- fix pkg .conf filelist match
+
 * Sat Dec 12 2009 Jens Petersen <petersen at redhat.com> - 0.3.0-1
 - major updates for ghc-6.12, package.conf.d, and shared libraries
 - add shared support to cabal_configure, ghc_gen_filelists



From eponyme at fedoraproject.org  Tue Dec 15 22:07:20 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Tue, 15 Dec 2009 22:07:20 +0000 (UTC)
Subject: File mks-svn3482.tar.gz uploaded to lookaside cache by eponyme
Message-ID: <20091215220720.A6A3E28ECD4@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for monkeystudio:

af71e9695a8e0b44a7bc4bf6f02b1c23  mks-svn3482.tar.gz



From eponyme at fedoraproject.org  Tue Dec 15 22:08:56 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Tue, 15 Dec 2009 22:08:56 +0000 (UTC)
Subject: rpms/monkeystudio/devel .cvsignore, 1.2, 1.3 monkeystudio.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091215220856.6A98B11C0092@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/monkeystudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16992

Modified Files:
	.cvsignore monkeystudio.spec sources 
Log Message:
Update to revision 3482


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 19:21:24 -0000	1.2
+++ .cvsignore	15 Dec 2009 22:08:55 -0000	1.3
@@ -1 +1 @@
-mks-svn3243.tar.gz
+mks-svn3482.tar.gz


Index: monkeystudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/devel/monkeystudio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- monkeystudio.spec	14 Sep 2009 19:52:55 -0000	1.3
+++ monkeystudio.spec	15 Dec 2009 22:08:55 -0000	1.4
@@ -1,14 +1,14 @@
-%global alphatag     20090824
-%global svn_revision svn3243
+%global alphatag     20091214
+%global svn_revision svn3482
 
 # Package source is take from upstream svn repository
 # Use this command to generate source tarball :
-# svn export -r 3243 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn3243
-# tar cfz mks-svn3243.tar.gz mks-svn3243 
+# svn export -r 3482 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn3482
+# tar cfz mks-svn3482.tar.gz mks-svn3482
 
 Name:           monkeystudio
 Version:        1.8.4.0
-Release:        0.3.%{alphatag}%{svn_revision}%{?dist}
+Release:        0.4.%{alphatag}%{svn_revision}%{?dist}
 Summary:        Free crossplatform Qt 4 IDE
 
 Group:          Development/Tools
@@ -56,8 +56,7 @@ sed -i -e 's/\.moc/moc/' plugins/plugins
 
 %build
 %{_qt4_qmake} prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1
-# removing %%{?_smp_mflags} because parallel compilation doesn't work on this package
-make 
+make %{?_smp_mflags}
 
 
 %install
@@ -85,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.4.20091214svn3482
+- Update svn checkout
+- Fix #539003
+- Add smp_mflags at build step, as it now works with this package
 * Mon Sep 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.3.20090824svn3243
 - Removed unused licence files
 * Mon Aug 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.2.20090824svn3243


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 19:21:24 -0000	1.2
+++ sources	15 Dec 2009 22:08:55 -0000	1.3
@@ -1 +1 @@
-103e041f523cbbc249e2d127eef221fb  mks-svn3243.tar.gz
+af71e9695a8e0b44a7bc4bf6f02b1c23  mks-svn3482.tar.gz



From alexlan at fedoraproject.org  Tue Dec 15 22:09:35 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 15 Dec 2009 22:09:35 +0000 (UTC)
Subject: rpms/python-biopython/devel .cvsignore, 1.9,
	1.10 python-biopython.spec, 1.18, 1.19 sources, 1.9, 1.10
Message-ID: <20091215220935.9222B11C0092@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17236

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
- Update to upstream 1.53



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Oct 2009 09:45:39 -0000	1.9
+++ .cvsignore	15 Dec 2009 22:09:35 -0000	1.10
@@ -1 +1 @@
-biopython-1.52.tar.gz
+biopython-1.53.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/python-biopython.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- python-biopython.spec	15 Oct 2009 09:45:39 -0000	1.18
+++ python-biopython.spec	15 Dec 2009 22:09:35 -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:             python-biopython
-Version:          1.52
+Version:          1.53
 Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* Tue Dec 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.53-1
+- Update to upstream 1.53
+
 * Thu Oct 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.52-1
 - Update to latest upstream (1.52)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Oct 2009 09:45:39 -0000	1.9
+++ sources	15 Dec 2009 22:09:35 -0000	1.10
@@ -1 +1 @@
-87e31749d431ed8a2d4fa909a42a478f  biopython-1.52.tar.gz
+df1004ec64b9b593c0e690c14a20667a  biopython-1.53.tar.gz



From eponyme at fedoraproject.org  Tue Dec 15 22:10:16 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Tue, 15 Dec 2009 22:10:16 +0000 (UTC)
Subject: rpms/monkeystudio/F-12 .cvsignore, 1.2, 1.3 monkeystudio.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20091215221016.8A6D411C0374@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/monkeystudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17511

Modified Files:
	.cvsignore monkeystudio.spec sources 
Log Message:
Update to revision 3482


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 19:21:24 -0000	1.2
+++ .cvsignore	15 Dec 2009 22:10:16 -0000	1.3
@@ -1 +1 @@
-mks-svn3243.tar.gz
+mks-svn3482.tar.gz


Index: monkeystudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/F-12/monkeystudio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- monkeystudio.spec	14 Sep 2009 19:52:55 -0000	1.3
+++ monkeystudio.spec	15 Dec 2009 22:10:16 -0000	1.4
@@ -1,14 +1,14 @@
-%global alphatag     20090824
-%global svn_revision svn3243
+%global alphatag     20091214
+%global svn_revision svn3482
 
 # Package source is take from upstream svn repository
 # Use this command to generate source tarball :
-# svn export -r 3243 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn3243
-# tar cfz mks-svn3243.tar.gz mks-svn3243 
+# svn export -r 3482 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn3482
+# tar cfz mks-svn3482.tar.gz mks-svn3482
 
 Name:           monkeystudio
 Version:        1.8.4.0
-Release:        0.3.%{alphatag}%{svn_revision}%{?dist}
+Release:        0.4.%{alphatag}%{svn_revision}%{?dist}
 Summary:        Free crossplatform Qt 4 IDE
 
 Group:          Development/Tools
@@ -56,8 +56,7 @@ sed -i -e 's/\.moc/moc/' plugins/plugins
 
 %build
 %{_qt4_qmake} prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1
-# removing %%{?_smp_mflags} because parallel compilation doesn't work on this package
-make 
+make %{?_smp_mflags}
 
 
 %install
@@ -85,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.4.20091214svn3482
+- Update svn checkout
+- Fix #539003
+- Add smp_mflags at build step, as it now works with this package
 * Mon Sep 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.3.20090824svn3243
 - Removed unused licence files
 * Mon Aug 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.2.20090824svn3243


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 19:21:24 -0000	1.2
+++ sources	15 Dec 2009 22:10:16 -0000	1.3
@@ -1 +1 @@
-103e041f523cbbc249e2d127eef221fb  mks-svn3243.tar.gz
+af71e9695a8e0b44a7bc4bf6f02b1c23  mks-svn3482.tar.gz



From jgarzik at fedoraproject.org  Tue Dec 15 22:10:29 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 22:10:29 +0000 (UTC)
Subject: File cld-0.3git.tar.gz uploaded to lookaside cache by jgarzik
Message-ID: <20091215221029.7F7B628ECD4@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for cld:

bb130c86901045427836e01d2687ec96  cld-0.3git.tar.gz



From jgarzik at fedoraproject.org  Tue Dec 15 22:10:48 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 22:10:48 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.26,1.27 sources,1.21,1.22
Message-ID: <20091215221048.E755311C0374@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17665

Modified Files:
	cld.spec sources 
Log Message:
update to upstream commit e9d692a54ab2de96bcd1e55b02938c9d35535b27


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- cld.spec	30 Nov 2009 13:37:48 -0000	1.26
+++ cld.spec	15 Dec 2009 22:10:48 -0000	1.27
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.3
-Release:	0.6.g50fcd615%{?dist}
+Release:	0.7.ge9d692a5%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 50fcd61590984c3c12f5584069da98bc8f4aec0f
+# pulled from upstream git, commit e9d692a54ab2de96bcd1e55b02938c9d35535b27
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Dec 16 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.7.ge9d692a5
+- update to 0.3git commit e9d692a54ab2de96bcd1e55b02938c9d35535b27
+
 * Mon Nov 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.6.g50fcd615
 - update to 0.3git commit 50fcd61590984c3c12f5584069da98bc8f4aec0f
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	30 Nov 2009 13:37:48 -0000	1.21
+++ sources	15 Dec 2009 22:10:48 -0000	1.22
@@ -1 +1 @@
-510e8a5261d6ea0689d682a8685b0111  cld-0.3git.tar.gz
+bb130c86901045427836e01d2687ec96  cld-0.3git.tar.gz



From alexlan at fedoraproject.org  Tue Dec 15 22:11:40 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 15 Dec 2009 22:11:40 +0000 (UTC)
Subject: rpms/python-biopython/F-11 .cvsignore, 1.9,
	1.10 python-biopython.spec, 1.17, 1.18 sources, 1.9, 1.10
Message-ID: <20091215221140.7F04A11C0374@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17919/F-11

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
Update to 1.53



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Oct 2009 09:57:24 -0000	1.9
+++ .cvsignore	15 Dec 2009 22:11:40 -0000	1.10
@@ -1 +1 @@
-biopython-1.52.tar.gz
+biopython-1.53.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/python-biopython.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-biopython.spec	15 Oct 2009 09:57:24 -0000	1.17
+++ python-biopython.spec	15 Dec 2009 22:11:40 -0000	1.18
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             python-biopython
-Version:          1.52
+Version:          1.53
 Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* Tue Dec 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.53-1
+- Update to upstream 1.53
+
 * Thu Oct 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.52-1
 - Update to latest upstream (1.52)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Oct 2009 09:57:24 -0000	1.9
+++ sources	15 Dec 2009 22:11:40 -0000	1.10
@@ -1 +1 @@
-87e31749d431ed8a2d4fa909a42a478f  biopython-1.52.tar.gz
+df1004ec64b9b593c0e690c14a20667a  biopython-1.53.tar.gz



From alexlan at fedoraproject.org  Tue Dec 15 22:11:40 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 15 Dec 2009 22:11:40 +0000 (UTC)
Subject: rpms/python-biopython/F-12 .cvsignore, 1.9,
	1.10 python-biopython.spec, 1.18, 1.19 sources, 1.9, 1.10
Message-ID: <20091215221140.BE79111C0374@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17919/F-12

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
Update to 1.53



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Oct 2009 09:47:52 -0000	1.9
+++ .cvsignore	15 Dec 2009 22:11:40 -0000	1.10
@@ -1 +1 @@
-biopython-1.52.tar.gz
+biopython-1.53.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-12/python-biopython.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- python-biopython.spec	15 Oct 2009 09:47:52 -0000	1.18
+++ python-biopython.spec	15 Dec 2009 22:11:40 -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:             python-biopython
-Version:          1.52
+Version:          1.53
 Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* Tue Dec 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.53-1
+- Update to upstream 1.53
+
 * Thu Oct 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.52-1
 - Update to latest upstream (1.52)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Oct 2009 09:47:52 -0000	1.9
+++ sources	15 Dec 2009 22:11:40 -0000	1.10
@@ -1 +1 @@
-87e31749d431ed8a2d4fa909a42a478f  biopython-1.52.tar.gz
+df1004ec64b9b593c0e690c14a20667a  biopython-1.53.tar.gz



From scop at fedoraproject.org  Tue Dec 15 22:12:10 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 15 Dec 2009 22:12:10 +0000 (UTC)
Subject: rpms/bash-completion/F-12 bash-completion.spec,1.43,1.44
Message-ID: <20091215221210.AD6D511C0092@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18156/F-12

Modified Files:
	bash-completion.spec 
Log Message:
* Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
- Fix autoinstall of completions named other than the package (#546905).
- Use environment-modules upstream completion instead of ours if available.
- Autoinstall mysqladmin completion also on MySQL-client-community.



Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-12/bash-completion.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- bash-completion.spec	17 Nov 2009 22:01:31 -0000	1.43
+++ bash-completion.spec	15 Dec 2009 22:12:10 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -35,7 +35,7 @@ install -pm 644 %{SOURCE3} bash_completi
 rm contrib/cowsay
 # subversion too, but only in >= 1.6.5-2
 # yum-utils (repomanage) too, but only in >= 1.1.24
-# yum planned to be upstreamed soon (probably >= 3.2.26)
+# yum too, but only in >= 3.2.25-2
 
 # Combine to per-package files:
 ( echo ; cat contrib/update-alternatives ) >> contrib/chkconfig
@@ -98,7 +98,10 @@ cd -
 rm -rf $RPM_BUILD_ROOT
 
 
-%global bashcomp_trigger() \
+# Note that this *must* be %%define, not %%global, otherwise the %%{?2}/%%{!?2}
+# conditional is apparently evaluated too early (at spec parse time when arg 2
+# is never defined)?
+%define bashcomp_trigger() \
 %triggerin -- %{?2}%{!?2:%1}\
 [ -e %{_sysconfdir}/bash_completion.d/%1 ] ||\
     ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || :\
@@ -163,14 +166,24 @@ rm -rf $RPM_BUILD_ROOT
 %bashcomp_trigger minicom
 %bashcomp_trigger mkinitrd
 %bashcomp_trigger mock
-%bashcomp_trigger modules environment-modules
+
+%triggerin -- environment-modules
+if [ -e %{_datadir}/Modules/init/bash_completion ] ; then
+    # Upstream completion in environment-modules >= 3.2.7
+    rm -f %{_sysconfdir}/bash_completion.d/modules || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/modules ] ; then
+    ln -s %{_datadir}/%{name}/modules %{_sysconfdir}/bash_completion.d || :
+fi
+%triggerun -- environment-modules
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/modules || :
+
 %bashcomp_trigger monodevelop
 %bashcomp_trigger mplayer
 %bashcomp_trigger msynctool
 %bashcomp_trigger mtx
 %bashcomp_trigger munin-node
 %bashcomp_trigger mutt
-%bashcomp_trigger mysqladmin mysql
+%bashcomp_trigger mysqladmin mysql,MySQL-client-community
 %bashcomp_trigger ncftp
 %bashcomp_trigger net-tools
 %bashcomp_trigger ntpdate
@@ -192,6 +205,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %triggerin -- yum-utils
 if [ -e %{_sysconfdir}/bash_completion.d/yum-utils.bash ] ; then
+    # Upstream completion in yum-utils >= 1.1.24
     rm -f %{_sysconfdir}/bash_completion.d/repomanage || :
 elif [ ! -e %{_sysconfdir}/bash_completion.d/repomanage ] ; then
     ln -s %{_datadir}/%{name}/repomanage %{_sysconfdir}/bash_completion.d || :
@@ -218,6 +232,7 @@ fi
 
 %triggerin -- subversion
 if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
+    # Upstream completion in subversion >= 1.6.5-2
     rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
 elif [ ! -e %{_sysconfdir}/bash_completion.d/_subversion ] ; then
     ln -s %{_datadir}/%{name}/_subversion %{_sysconfdir}/bash_completion.d || :
@@ -247,6 +262,7 @@ fi
 
 %triggerin -- yum
 if [ -e %{_sysconfdir}/bash_completion.d/yum.bash ] ; then
+    # Upstream completion in yum >= 3.2.25-2
     rm -f %{_sysconfdir}/bash_completion.d/_yum || :
 elif [ ! -e %{_sysconfdir}/bash_completion.d/_yum ] ; then
     ln -s %{_datadir}/%{name}/_yum %{_sysconfdir}/bash_completion.d || :
@@ -273,6 +289,11 @@ fi
 
 
 %changelog
+* Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
+- Fix autoinstall of completions named other than the package (#546905).
+- Use environment-modules upstream completion instead of ours if available.
+- Autoinstall mysqladmin completion also on MySQL-client-community.
+
 * Tue Nov 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-3
 - Prepare for smooth coexistence with yum upstream completion.
 



From scop at fedoraproject.org  Tue Dec 15 22:12:10 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 15 Dec 2009 22:12:10 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion.spec,1.46,1.47
Message-ID: <20091215221210.EDD2B11C0092@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18156/devel

Modified Files:
	bash-completion.spec 
Log Message:
* Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
- Fix autoinstall of completions named other than the package (#546905).
- Use environment-modules upstream completion instead of ours if available.
- Autoinstall mysqladmin completion also on MySQL-client-community.



Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- bash-completion.spec	17 Nov 2009 21:59:35 -0000	1.46
+++ bash-completion.spec	15 Dec 2009 22:12:10 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -35,7 +35,7 @@ install -pm 644 %{SOURCE3} bash_completi
 rm contrib/cowsay
 # subversion too, but only in >= 1.6.5-2
 # yum-utils (repomanage) too, but only in >= 1.1.24
-# yum planned to be upstreamed soon (probably >= 3.2.26)
+# yum too, but only in >= 3.2.25-2
 
 # Combine to per-package files:
 ( echo ; cat contrib/update-alternatives ) >> contrib/chkconfig
@@ -98,7 +98,10 @@ cd -
 rm -rf $RPM_BUILD_ROOT
 
 
-%global bashcomp_trigger() \
+# Note that this *must* be %%define, not %%global, otherwise the %%{?2}/%%{!?2}
+# conditional is apparently evaluated too early (at spec parse time when arg 2
+# is never defined)?
+%define bashcomp_trigger() \
 %triggerin -- %{?2}%{!?2:%1}\
 [ -e %{_sysconfdir}/bash_completion.d/%1 ] ||\
     ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || :\
@@ -163,14 +166,24 @@ rm -rf $RPM_BUILD_ROOT
 %bashcomp_trigger minicom
 %bashcomp_trigger mkinitrd
 %bashcomp_trigger mock
-%bashcomp_trigger modules environment-modules
+
+%triggerin -- environment-modules
+if [ -e %{_datadir}/Modules/init/bash_completion ] ; then
+    # Upstream completion in environment-modules >= 3.2.7
+    rm -f %{_sysconfdir}/bash_completion.d/modules || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/modules ] ; then
+    ln -s %{_datadir}/%{name}/modules %{_sysconfdir}/bash_completion.d || :
+fi
+%triggerun -- environment-modules
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/modules || :
+
 %bashcomp_trigger monodevelop
 %bashcomp_trigger mplayer
 %bashcomp_trigger msynctool
 %bashcomp_trigger mtx
 %bashcomp_trigger munin-node
 %bashcomp_trigger mutt
-%bashcomp_trigger mysqladmin mysql
+%bashcomp_trigger mysqladmin mysql,MySQL-client-community
 %bashcomp_trigger ncftp
 %bashcomp_trigger net-tools
 %bashcomp_trigger ntpdate
@@ -192,6 +205,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %triggerin -- yum-utils
 if [ -e %{_sysconfdir}/bash_completion.d/yum-utils.bash ] ; then
+    # Upstream completion in yum-utils >= 1.1.24
     rm -f %{_sysconfdir}/bash_completion.d/repomanage || :
 elif [ ! -e %{_sysconfdir}/bash_completion.d/repomanage ] ; then
     ln -s %{_datadir}/%{name}/repomanage %{_sysconfdir}/bash_completion.d || :
@@ -218,6 +232,7 @@ fi
 
 %triggerin -- subversion
 if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
+    # Upstream completion in subversion >= 1.6.5-2
     rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
 elif [ ! -e %{_sysconfdir}/bash_completion.d/_subversion ] ; then
     ln -s %{_datadir}/%{name}/_subversion %{_sysconfdir}/bash_completion.d || :
@@ -247,6 +262,7 @@ fi
 
 %triggerin -- yum
 if [ -e %{_sysconfdir}/bash_completion.d/yum.bash ] ; then
+    # Upstream completion in yum >= 3.2.25-2
     rm -f %{_sysconfdir}/bash_completion.d/_yum || :
 elif [ ! -e %{_sysconfdir}/bash_completion.d/_yum ] ; then
     ln -s %{_datadir}/%{name}/_yum %{_sysconfdir}/bash_completion.d || :
@@ -273,6 +289,11 @@ fi
 
 
 %changelog
+* Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
+- Fix autoinstall of completions named other than the package (#546905).
+- Use environment-modules upstream completion instead of ours if available.
+- Autoinstall mysqladmin completion also on MySQL-client-community.
+
 * Tue Nov 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-3
 - Prepare for smooth coexistence with yum upstream completion.
 



From eponyme at fedoraproject.org  Tue Dec 15 22:13:24 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Tue, 15 Dec 2009 22:13:24 +0000 (UTC)
Subject: rpms/monkeystudio/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 monkeystudio.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091215221324.43DA011C0092@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/monkeystudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18390/F-11

Modified Files:
	.cvsignore import.log monkeystudio.spec sources 
Log Message:
F-11 first import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 19:21:24 -0000	1.2
+++ .cvsignore	15 Dec 2009 22:13:23 -0000	1.3
@@ -1 +1 @@
-mks-svn3243.tar.gz
+mks-svn3482.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Sep 2009 19:21:24 -0000	1.1
+++ import.log	15 Dec 2009 22:13:23 -0000	1.2
@@ -1 +1,2 @@
 monkeystudio-1_8_4_0-0_2_20090824svn3243_fc11:HEAD:monkeystudio-1.8.4.0-0.2.20090824svn3243.fc11.src.rpm:1252956054
+monkeystudio-1_8_4_0-0_4_20091214svn3482_fc12:F-11:monkeystudio-1.8.4.0-0.4.20091214svn3482.fc12.src.rpm:1260915375


Index: monkeystudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/F-11/monkeystudio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- monkeystudio.spec	14 Sep 2009 19:52:55 -0000	1.3
+++ monkeystudio.spec	15 Dec 2009 22:13:24 -0000	1.4
@@ -1,14 +1,14 @@
-%global alphatag     20090824
-%global svn_revision svn3243
+%global alphatag     20091214
+%global svn_revision svn3482
 
 # Package source is take from upstream svn repository
 # Use this command to generate source tarball :
-# svn export -r 3243 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn3243
-# tar cfz mks-svn3243.tar.gz mks-svn3243 
+# svn export -r 3482 svn://svn.tuxfamily.org/svnroot/monkeystudio/mks/v2/trunk mks-svn3482
+# tar cfz mks-svn3482.tar.gz mks-svn3482
 
 Name:           monkeystudio
 Version:        1.8.4.0
-Release:        0.3.%{alphatag}%{svn_revision}%{?dist}
+Release:        0.4.%{alphatag}%{svn_revision}%{?dist}
 Summary:        Free crossplatform Qt 4 IDE
 
 Group:          Development/Tools
@@ -56,8 +56,7 @@ sed -i -e 's/\.moc/moc/' plugins/plugins
 
 %build
 %{_qt4_qmake} prefix=%{_prefix} plugins=%{_libdir} system_qscintilla=1
-# removing %%{?_smp_mflags} because parallel compilation doesn't work on this package
-make 
+make %{?_smp_mflags}
 
 
 %install
@@ -85,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.4.20091214svn3482
+- Update svn checkout
+- Fix #539003
+- Add smp_mflags at build step, as it now works with this package
 * Mon Sep 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.3.20090824svn3243
 - Removed unused licence files
 * Mon Aug 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8.4.0-0.2.20090824svn3243


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monkeystudio/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 19:21:24 -0000	1.2
+++ sources	15 Dec 2009 22:13:24 -0000	1.3
@@ -1 +1 @@
-103e041f523cbbc249e2d127eef221fb  mks-svn3243.tar.gz
+af71e9695a8e0b44a7bc4bf6f02b1c23  mks-svn3482.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 15 22:14:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 22:14:09 +0000
Subject: [pkgdb] libdiscid had acl change status
Message-ID: <20091215221410.A1D1028ED1C@bastion3.fedora.phx2.redhat.com>

alexlan has set the commit acl on libdiscid (Fedora devel) to Approved for npajkovs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Tue Dec 15 22:14:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 22:14:21 +0000
Subject: [pkgdb] libdiscid had acl change status
Message-ID: <20091215221424.1F90E28ED1E@bastion3.fedora.phx2.redhat.com>

alexlan has set the commit acl on libdiscid (Fedora 11) to Approved for npajkovs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From pkgdb at fedoraproject.org  Tue Dec 15 22:16:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 15 Dec 2009 22:16:15 +0000
Subject: [pkgdb] libdiscid had acl change status
Message-ID: <20091215221617.5362F28ED1C@bastion3.fedora.phx2.redhat.com>

alexlan has set the commit acl on libdiscid (Fedora 12) to Approved for npajkovs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libdiscid



From jgarzik at fedoraproject.org  Tue Dec 15 22:27:56 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 22:27:56 +0000 (UTC)
Subject: File cld-0.3git.tar.gz uploaded to lookaside cache by jgarzik
Message-ID: <20091215222756.CADC428ED18@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for cld:

9a0461a1a2bc1c3c5a5ab8776681cbb9  cld-0.3git.tar.gz



From jgarzik at fedoraproject.org  Tue Dec 15 22:28:09 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 22:28:09 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.27,1.28 sources,1.22,1.23
Message-ID: <20091215222809.C760311C0092@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21138

Modified Files:
	cld.spec sources 
Log Message:
update to upstream commit 4806aa08577e2bf8e90b681b8be3588a647dd67e


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- cld.spec	15 Dec 2009 22:10:48 -0000	1.27
+++ cld.spec	15 Dec 2009 22:28:09 -0000	1.28
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.3
-Release:	0.7.ge9d692a5%{?dist}
+Release:	0.8.g4806aa08%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit e9d692a54ab2de96bcd1e55b02938c9d35535b27
+# pulled from upstream git, commit 4806aa08577e2bf8e90b681b8be3588a647dd67e
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Dec 16 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.8.g4806aa08
+- update to 0.3git commit 4806aa08577e2bf8e90b681b8be3588a647dd67e
+
 * Tue Dec 16 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.7.ge9d692a5
 - update to 0.3git commit e9d692a54ab2de96bcd1e55b02938c9d35535b27
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	15 Dec 2009 22:10:48 -0000	1.22
+++ sources	15 Dec 2009 22:28:09 -0000	1.23
@@ -1 +1 @@
-bb130c86901045427836e01d2687ec96  cld-0.3git.tar.gz
+9a0461a1a2bc1c3c5a5ab8776681cbb9  cld-0.3git.tar.gz



From kevin at fedoraproject.org  Tue Dec 15 22:39:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 15 Dec 2009 22:39:13 +0000 (UTC)
Subject: rpms/xfwm4/devel xfwm4-4.6.1-multi-monitor.patch, NONE,
	1.1 xfwm4.spec, 1.39, 1.40
Message-ID: <20091215223913.7739A11C0092@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23159

Modified Files:
	xfwm4.spec 
Added Files:
	xfwm4-4.6.1-multi-monitor.patch 
Log Message:
Add patch for multi monitor issue (xfce bug #5795)


xfwm4-4.6.1-multi-monitor.patch:
 client.c |   17 ++++++++++-------
 client.h |    4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE xfwm4-4.6.1-multi-monitor.patch ---
>From 455157569524053f1383a1b6fe1fa3f162e6d5cf Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan at xfce.org>
Date: Sat, 10 Oct 2009 18:05:36 +0000
Subject: Keep windows entirely visible on screen change (bug #5795)

---
diff --git a/src/client.c b/src/client.c
index b3181e9..2e6342a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -722,8 +722,7 @@ clientConfigure (Client * c, XWindowChanges * wc, unsigned long mask, unsigned s
          && CONSTRAINED_WINDOW (c)
          && !((c->gravity == StaticGravity) && (c->x == 0) && (c->y == 0)))
     {
-        /* Keep fully visible only on resize */
-        clientConstrainPos (c, (mask & (CWWidth | CWHeight)));
+        clientConstrainPos (c, CFG_KEEP_VISIBLE);
 
         if (c->x != px)
         {
@@ -804,7 +803,7 @@ clientMoveResizeWindow (Client * c, XWindowChanges * wc, unsigned long mask)
 {
     ScreenInfo *screen_info;
     DisplayInfo *display_info;
-    gboolean constrained;
+    unsigned short flags;
 
     g_return_if_fail (c != NULL);
     TRACE ("entering clientMoveResizeWindow");
@@ -843,14 +842,18 @@ clientMoveResizeWindow (Client * c, XWindowChanges * wc, unsigned long mask)
     }
 
     /* Still a move/resize after cleanup? */
-    constrained = FALSE;
+    flags = CFG_REQUEST;
     if (mask & (CWX | CWY | CWWidth | CWHeight))
     {
         if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED))
         {
             clientRemoveMaximizeFlag (c);
         }
-        constrained = TRUE;
+        flags |= CFG_REQUEST;
+    }
+    if (mask & (CWWidth | CWHeight))
+    {
+        flags |= CFG_KEEP_VISIBLE;
     }
     /*
        Let's say that if the client performs a XRaiseWindow, we show the window if focus
@@ -878,7 +881,7 @@ clientMoveResizeWindow (Client * c, XWindowChanges * wc, unsigned long mask)
         }
     }
     /* And finally, configure the window */
-    clientConfigure (c, wc, mask, (constrained ? CFG_CONSTRAINED : 0) | CFG_REQUEST);
+    clientConfigure (c, wc, mask, flags);
 }
 
 void
@@ -3499,7 +3502,7 @@ clientScreenResize(ScreenInfo *screen_info)
         {
              wc.x = c->x;
              wc.y = c->y;
-             clientConfigure (c, &wc, CWX | CWY, CFG_CONSTRAINED | CFG_REQUEST);
+             clientConfigure (c, &wc, CWX | CWY, CFG_CONSTRAINED | CFG_REQUEST | CFG_KEEP_VISIBLE);
         }
     }
 
diff --git a/src/client.h b/src/client.h
index 58e0e51..1c6c032 100644
--- a/src/client.h
+++ b/src/client.h
@@ -64,7 +64,8 @@
 #define CFG_CONSTRAINED                 (1<<0)
 #define CFG_REQUEST                     (1<<1)
 #define CFG_NOTIFY                      (1<<2)
-#define CFG_FORCE_REDRAW                (1<<3)
+#define CFG_KEEP_VISIBLE                (1<<3)
+#define CFG_FORCE_REDRAW                (1<<4)
 
 #define INCLUDE_HIDDEN                  (1<<0)
 #define INCLUDE_SHADED                  (1<<1)
--
cgit v0.8.2.1


Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- xfwm4.spec	20 Sep 2009 13:15:23 -0000	1.39
+++ xfwm4.spec	15 Dec 2009 22:39:12 -0000	1.40
@@ -1,12 +1,13 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
 Version: 4.6.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2
 Patch0: xfwm4-4.6.1-nodoka.patch
 Patch1: xfwm4-4.6.1-focus.patch
+Patch2: xfwm4-4.6.1-multi-monitor.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,6 +33,7 @@ xfwm4 is a window manager compatible wit
 # use Nodoka Theme
 %patch0 -p1 -b .nodoka
 %patch1 -p1 -b .focus
+%patch2 -p1 -b .multiwindow
 
 %build
 %configure  --disable-static
@@ -79,6 +81,9 @@ fi
 %{_libexecdir}/xfce4/xfwm4
 
 %changelog
+* Sun Dec 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-6
+- Add patch for multi monitor issue (xfce bug #5795)
+
 * Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-5
 - Validate *.desktop files
 



From jgarzik at fedoraproject.org  Tue Dec 15 22:54:39 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 22:54:39 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.24,1.25
Message-ID: <20091215225439.47FE711C0092@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25549

Modified Files:
	chunkd.spec 
Log Message:
update to upstream commit 756ea2108509b69d036c658089fa954815f31945


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- chunkd.spec	1 Dec 2009 00:54:43 -0000	1.24
+++ chunkd.spec	15 Dec 2009 22:54:37 -0000	1.25
@@ -1,13 +1,13 @@
 Name:		chunkd
 Version:	0.6
-Release:	0.1.gcf9b95c8%{?dist}
+Release:	0.2.g756ea210%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit cf9b95c883437690793976564936c1ef0b249368
+# pulled from upstream git, commit 756ea2108509b69d036c658089fa954815f31945
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
@@ -99,6 +99,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Dec 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.6-0.2.g756ea210
+- update source to commit 756ea2108509b69d036c658089fa954815f31945
+
 * Mon Nov 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.6-0.1.gcf9b95c8
 - update source to commit cf9b95c883437690793976564936c1ef0b249368
 



From jgarzik at fedoraproject.org  Tue Dec 15 22:55:02 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 22:55:02 +0000 (UTC)
Subject: File chunkd-0.6git.tar.gz uploaded to lookaside cache by jgarzik
Message-ID: <20091215225502.7615F28ED16@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for chunkd:

6cca9eadac865811d6a79f84615a1675  chunkd-0.6git.tar.gz



From jgarzik at fedoraproject.org  Tue Dec 15 22:55:51 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 22:55:51 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.25,1.26 sources,1.17,1.18
Message-ID: <20091215225551.11A8F11C0092@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25860

Modified Files:
	chunkd.spec sources 
Log Message:
really update to upstream commit 756ea2108509b69d036c658089fa954815f31945


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- chunkd.spec	15 Dec 2009 22:54:37 -0000	1.25
+++ chunkd.spec	15 Dec 2009 22:55:50 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.6
-Release:	0.2.g756ea210%{?dist}
+Release:	0.3.g756ea210%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -99,6 +99,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Dec 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.6-0.3.g756ea210
+- really update source to commit 756ea2108509b69d036c658089fa954815f31945
+
 * Tue Dec 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.6-0.2.g756ea210
 - update source to commit 756ea2108509b69d036c658089fa954815f31945
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	1 Dec 2009 00:54:43 -0000	1.17
+++ sources	15 Dec 2009 22:55:50 -0000	1.18
@@ -1 +1 @@
-e59ea0d92bcd9b435de9b5bd3d640439  chunkd-0.6git.tar.gz
+6cca9eadac865811d6a79f84615a1675  chunkd-0.6git.tar.gz



From jorton at fedoraproject.org  Tue Dec 15 22:57:24 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue, 15 Dec 2009 22:57:24 +0000 (UTC)
Subject: File cadaver-0.23.3.tar.gz uploaded to lookaside cache by jorton
Message-ID: <20091215225724.A16DD28ECDB@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for cadaver:

502ecd601e467f8b16056d2acca39a6f  cadaver-0.23.3.tar.gz



From jorton at fedoraproject.org  Tue Dec 15 23:00:23 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue, 15 Dec 2009 23:00:23 +0000 (UTC)
Subject: rpms/cadaver/devel cadaver-0.23.3.tar.gz.asc, NONE, 1.1 .cvsignore, 
	1.12, 1.13 cadaver.spec, 1.36, 1.37 sources, 1.12, 1.13 upstream,
	1.6, 1.7 cadaver-0.23.2.tar.gz.asc, 1.1, NONE
Message-ID: <20091215230023.86F1F11C0092@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/cadaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26707

Modified Files:
	.cvsignore cadaver.spec sources upstream 
Added Files:
	cadaver-0.23.3.tar.gz.asc 
Removed Files:
	cadaver-0.23.2.tar.gz.asc 
Log Message:
* Tue Dec 15 2009 Joe Orton <jorton at redhat.com> - 0.23.3-1
- update to 0.23.3



--- NEW FILE cadaver-0.23.3.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAksoD2sACgkQR/aWnQ5EzwwLUwCbBF34VC/xUpkZVkYHE9ri3wAy
5UAAn3IYL01epLvpq4eUG+dXOuknpIa/
=WY0q
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cadaver/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Feb 2008 10:44:06 -0000	1.12
+++ .cvsignore	15 Dec 2009 23:00:22 -0000	1.13
@@ -1 +1 @@
-cadaver-0.23.2.tar.gz
+cadaver-0.23.3.tar.gz


Index: cadaver.spec
===================================================================
RCS file: /cvs/extras/rpms/cadaver/devel/cadaver.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- cadaver.spec	24 Jul 2009 18:35:52 -0000	1.36
+++ cadaver.spec	15 Dec 2009 23:00:23 -0000	1.37
@@ -1,6 +1,6 @@
 Name: cadaver
-Version: 0.23.2
-Release: 6
+Version: 0.23.3
+Release: 1%{?dist}
 Summary: Command-line WebDAV client
 License: GPLv2+
 Group: Applications/Internet
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Tue Dec 15 2009 Joe Orton <jorton at redhat.com> - 0.23.3-1
+- update to 0.23.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cadaver/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Feb 2008 10:44:06 -0000	1.12
+++ sources	15 Dec 2009 23:00:23 -0000	1.13
@@ -1 +1 @@
-5ac79e41f3b7b4f68bf4003beed5dc26  cadaver-0.23.2.tar.gz
+502ecd601e467f8b16056d2acca39a6f  cadaver-0.23.3.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/cadaver/devel/upstream,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- upstream	11 Feb 2008 10:44:06 -0000	1.6
+++ upstream	15 Dec 2009 23:00:23 -0000	1.7
@@ -1 +1 @@
-cadaver-0.23.2.tar.gz
+cadaver-0.23.3.tar.gz


--- cadaver-0.23.2.tar.gz.asc DELETED ---



From jgarzik at fedoraproject.org  Tue Dec 15 23:09:46 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 23:09:46 +0000 (UTC)
Subject: File tabled-0.5git.tar.gz uploaded to lookaside cache by jgarzik
Message-ID: <20091215230946.976EC28ECEB@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for tabled:

f674910c081dd6ba1b63072244bfd81e  tabled-0.5git.tar.gz



From jgarzik at fedoraproject.org  Tue Dec 15 23:10:57 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 15 Dec 2009 23:10:57 +0000 (UTC)
Subject: rpms/tabled/devel sources,1.15,1.16 tabled.spec,1.24,1.25
Message-ID: <20091215231057.6963A11C0092@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28619

Modified Files:
	sources tabled.spec 
Log Message:
update to upstream commit 93f17fe1396082762447a772287ce9b6b40d389b


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	1 Dec 2009 01:16:37 -0000	1.15
+++ sources	15 Dec 2009 23:10:56 -0000	1.16
@@ -1 +1 @@
-54aa9526bc572e0a858ba62f16a9ae63  tabled-0.5git.tar.gz
+f674910c081dd6ba1b63072244bfd81e  tabled-0.5git.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- tabled.spec	1 Dec 2009 01:16:37 -0000	1.24
+++ tabled.spec	15 Dec 2009 23:10:56 -0000	1.25
@@ -1,13 +1,13 @@
 Name:		tabled
 Version:	0.5
-Release:	0.1.g26571e40%{?dist}
+Release:	0.2.g93f17fe1%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 26571e40570dfb0d0fc69507cbe8386e65252ff8
+# pulled from upstream git, commit 93f17fe1396082762447a772287ce9b6b40d389b
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	tabled-%{version}git.tar.gz
 Source2:	tabled.init
@@ -102,6 +102,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Dec 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.2.g93f17fe1
+- add sources for git commit 93f17fe1396082762447a772287ce9b6b40d389b
+
 * Mon Nov 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.1.g26571e40
 - add sources for git commit 26571e40570dfb0d0fc69507cbe8386e65252ff8
 



From tomspur at fedoraproject.org  Tue Dec 15 23:55:36 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 15 Dec 2009 23:55:36 +0000 (UTC)
Subject: File gbirthday-0.5.5.tar.xz uploaded to lookaside cache by tomspur
Message-ID: <20091215235536.3544028ED04@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gbirthday:

4850a11981b10561452669ed4141b0fe  gbirthday-0.5.5.tar.xz



From tomspur at fedoraproject.org  Tue Dec 15 23:56:42 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 15 Dec 2009 23:56:42 +0000 (UTC)
Subject: rpms/gbirthday/devel gbirthday.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20091215235642.60DEE11C0092@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3584

Modified Files:
	gbirthday.spec sources 
Log Message:
new upstream tarball


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gbirthday.spec	14 Dec 2009 09:45:26 -0000	1.8
+++ gbirthday.spec	15 Dec 2009 23:56:41 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           gbirthday
 Version:        0.5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Wed Dec 16 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-2
+- upstream tarball was corected, still same version
+
 * Mon Dec 14 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Dec 2009 09:45:26 -0000	1.7
+++ sources	15 Dec 2009 23:56:41 -0000	1.8
@@ -1 +1 @@
-716c10163d0a8c31d55dc622a3412104  gbirthday-0.5.5.tar.xz
+4850a11981b10561452669ed4141b0fe  gbirthday-0.5.5.tar.xz



From tomspur at fedoraproject.org  Tue Dec 15 23:57:23 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 15 Dec 2009 23:57:23 +0000 (UTC)
Subject: rpms/gbirthday/F-12 gbirthday.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <20091215235723.CD6A611C0092@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3739

Modified Files:
	gbirthday.spec sources 
Log Message:
new upstream tarball


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/gbirthday.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gbirthday.spec	14 Dec 2009 11:03:12 -0000	1.7
+++ gbirthday.spec	15 Dec 2009 23:57:23 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           gbirthday
 Version:        0.5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Wed Dec 16 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-2
+- upstream tarball was corected, still same version
+
 * Mon Dec 14 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Dec 2009 11:03:12 -0000	1.7
+++ sources	15 Dec 2009 23:57:23 -0000	1.8
@@ -1 +1 @@
-716c10163d0a8c31d55dc622a3412104  gbirthday-0.5.5.tar.xz
+4850a11981b10561452669ed4141b0fe  gbirthday-0.5.5.tar.xz



From tomspur at fedoraproject.org  Wed Dec 16 00:00:11 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 16 Dec 2009 00:00:11 +0000 (UTC)
Subject: rpms/gbirthday/F-11 gbirthday.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <20091216000011.4F4C111C0092@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4164

Modified Files:
	gbirthday.spec sources 
Log Message:
new upstream tarball


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/gbirthday.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gbirthday.spec	14 Dec 2009 11:06:09 -0000	1.6
+++ gbirthday.spec	16 Dec 2009 00:00:11 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           gbirthday
 Version:        0.5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Wed Dec 16 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-2
+- upstream tarball was corected, still same version
+
 * Mon Dec 14 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Dec 2009 11:06:09 -0000	1.7
+++ sources	16 Dec 2009 00:00:11 -0000	1.8
@@ -1 +1 @@
-716c10163d0a8c31d55dc622a3412104  gbirthday-0.5.5.tar.xz
+4850a11981b10561452669ed4141b0fe  gbirthday-0.5.5.tar.xz



From lmacken at fedoraproject.org  Wed Dec 16 00:19:11 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 16 Dec 2009 00:19:11 +0000 (UTC)
Subject: File tgext.crud-0.3.3.tar.gz uploaded to lookaside cache by lmacken
Message-ID: <20091216001911.C08B428ED1D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-tgext-crud:

a3bc65a8b37a03fa8c6f5415b36cfc1a  tgext.crud-0.3.3.tar.gz



From lmacken at fedoraproject.org  Wed Dec 16 00:19:58 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 16 Dec 2009 00:19:58 +0000 (UTC)
Subject: rpms/python-tgext-crud/devel .cvsignore, 1.2,
	1.3 python-tgext-crud.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091216001958.9A03611C0092@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-crud/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7351

Modified Files:
	.cvsignore python-tgext-crud.spec sources 
Log Message:
Update to 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jul 2009 21:26:05 -0000	1.2
+++ .cvsignore	16 Dec 2009 00:19:57 -0000	1.3
@@ -1 +1 @@
-tgext.crud-0.2.4.tar.gz
+tgext.crud-0.3.3.tar.gz


Index: python-tgext-crud.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/devel/python-tgext-crud.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-tgext-crud.spec	26 Jul 2009 23:14:38 -0000	1.2
+++ python-tgext-crud.spec	16 Dec 2009 00:19:57 -0000	1.3
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-tgext-crud
-Version:        0.2.4
-Release:        2%{?dist}
+Version:        0.3.3
+Release:        1%{?dist}
 Summary:        Crud Controller Extension for TG2
 
 Group:          Development/Languages
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Luke Macken <lmacken at redhat.com> - 0.3.3-1
+- Update to 0.3.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jul 2009 21:26:05 -0000	1.2
+++ sources	16 Dec 2009 00:19:57 -0000	1.3
@@ -1 +1 @@
-7dda7f32440bf74c2a9694bebdcf8a55  tgext.crud-0.2.4.tar.gz
+a3bc65a8b37a03fa8c6f5415b36cfc1a  tgext.crud-0.3.3.tar.gz



From rdieter at fedoraproject.org  Wed Dec 16 00:31:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Dec 2009 00:31:39 +0000 (UTC)
Subject: File maxima-5.20.1.tar.gz uploaded to lookaside cache by rdieter
Message-ID: <20091216003139.8D7FF28ED04@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for maxima:

cec78b96cc453e470871063fc16cd52f  maxima-5.20.1.tar.gz



From rdieter at fedoraproject.org  Wed Dec 16 00:33:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 16 Dec 2009 00:33:06 +0000 (UTC)
Subject: rpms/maxima/devel .cvsignore, 1.35, 1.36 maxima.spec, 1.142,
	1.143 sources, 1.33, 1.34
Message-ID: <20091216003306.269F711C0092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9456

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
- maxima-5.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	10 Dec 2009 07:09:58 -0000	1.35
+++ .cvsignore	16 Dec 2009 00:33:05 -0000	1.36
@@ -2,5 +2,4 @@ clog
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.19.2.tar.gz
-maxima-5.20.0.tar.gz
+maxima-5.20.1.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- maxima.spec	10 Dec 2009 07:09:58 -0000	1.142
+++ maxima.spec	16 Dec 2009 00:33:05 -0000	1.143
@@ -1,7 +1,7 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.20.0
+Version: 5.20.1
 
 Release: 1%{?dist} 
 License: GPLv2
@@ -431,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
+- maxima-5.20.1
+
 * Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.0-1
 - maxima-5.20.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	10 Dec 2009 07:09:59 -0000	1.33
+++ sources	16 Dec 2009 00:33:05 -0000	1.34
@@ -1,4 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-46072a976c6980b601295fbc42cade8f  maxima-5.20.0.tar.gz
+cec78b96cc453e470871063fc16cd52f  maxima-5.20.1.tar.gz



From kwright at fedoraproject.org  Wed Dec 16 01:35:15 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 16 Dec 2009 01:35:15 +0000 (UTC)
Subject: File osutil-1.3.1.tar.gz uploaded to lookaside cache by kwright
Message-ID: <20091216013515.1E8F828ED2D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for osutil:

3bbf5eec8347db610e3b927fe7e9c876  osutil-1.3.1.tar.gz



From kwright at fedoraproject.org  Wed Dec 16 01:37:54 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 16 Dec 2009 01:37:54 +0000 (UTC)
Subject: rpms/osutil/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 osutil.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091216013754.72C1D11C0265@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/osutil/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18597/F-11

Modified Files:
	.cvsignore import.log osutil.spec sources 
Log Message:
minor updates to the license and spec file: Removed 'with exceptions' from License.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Nov 2009 21:19:09 -0000	1.2
+++ .cvsignore	16 Dec 2009 01:37:53 -0000	1.3
@@ -1 +1 @@
-osutil-1.3.0.tar.gz
+osutil-1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Nov 2009 21:19:09 -0000	1.1
+++ import.log	16 Dec 2009 01:37:53 -0000	1.2
@@ -1 +1,2 @@
 osutil-1_3_0-3_fc11:F-11:osutil-1.3.0-3.fc11.src.rpm:1257542289
+osutil-1_3_1-1_fc11:F-11:osutil-1.3.1-1.fc11.src.rpm:1260927317


Index: osutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/F-11/osutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- osutil.spec	6 Nov 2009 21:19:09 -0000	1.1
+++ osutil.spec	16 Dec 2009 01:37:53 -0000	1.2
@@ -1,15 +1,14 @@
 Name:           osutil
-Version:        1.3.0
-Release:        3%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Operating System Utilities JNI Package
 URL:            http://pki.fedoraproject.org/
-License:        GPLv2 with exceptions
+License:        GPLv2
 Group:          System Environment/Libraries
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
-BuildRequires:  bash
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
 BuildRequires:  nspr-devel >= 4.6.99
@@ -68,12 +67,18 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/
 
 %changelog
+* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.1-1
+- Removed BuildRequires bash
+- Removed 'with exceptions' from License
+
 * Fri Oct 30 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil
 - Removed LICENSE logic from installation section
 - Take ownership of library directory
+
 * Tue Oct 27 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil
 - Complied with Fedora JNI packaging logic
+
 * Thu Oct 8 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Nov 2009 21:19:09 -0000	1.2
+++ sources	16 Dec 2009 01:37:53 -0000	1.3
@@ -1 +1 @@
-b7aa665877d0bb877c5488a9c2c00425  osutil-1.3.0.tar.gz
+3bbf5eec8347db610e3b927fe7e9c876  osutil-1.3.1.tar.gz



From lmacken at fedoraproject.org  Wed Dec 16 01:52:24 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 16 Dec 2009 01:52:24 +0000 (UTC)
Subject: rpms/python-tgext-crud/F-12 python-tgext-crud.spec,1.2,1.3
Message-ID: <20091216015225.06B1111C0265@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-crud/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20687

Modified Files:
	python-tgext-crud.spec 
Log Message:
Update to 0.3.3


Index: python-tgext-crud.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/F-12/python-tgext-crud.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-tgext-crud.spec	26 Jul 2009 23:14:38 -0000	1.2
+++ python-tgext-crud.spec	16 Dec 2009 01:52:24 -0000	1.3
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-tgext-crud
-Version:        0.2.4
-Release:        2%{?dist}
+Version:        0.3.3
+Release:        1%{?dist}
 Summary:        Crud Controller Extension for TG2
 
 Group:          Development/Languages
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Luke Macken <lmacken at redhat.com> - 0.3.3-1
+- Update to 0.3.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lmacken at fedoraproject.org  Wed Dec 16 01:54:27 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 16 Dec 2009 01:54:27 +0000 (UTC)
Subject: rpms/python-tgext-crud/F-11 python-tgext-crud.spec,1.1,1.2
Message-ID: <20091216015427.3EB4011C0265@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-crud/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21097

Modified Files:
	python-tgext-crud.spec 
Log Message:
Update to 0.3.3


Index: python-tgext-crud.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/F-11/python-tgext-crud.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-tgext-crud.spec	21 Jul 2009 21:52:41 -0000	1.1
+++ python-tgext-crud.spec	16 Dec 2009 01:54:27 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-tgext-crud
-Version:        0.2.4
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        Crud Controller Extension for TG2
 
@@ -46,5 +46,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Luke Macken <lmacken at redhat.com> - 0.3.3-1
+- Update to 0.3.3
+
 * Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-1
 - Initial package



From lmacken at fedoraproject.org  Wed Dec 16 01:54:58 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 16 Dec 2009 01:54:58 +0000 (UTC)
Subject: rpms/python-tgext-crud/F-12 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091216015458.633A211C0265@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-crud/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21215

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jul 2009 21:26:05 -0000	1.2
+++ .cvsignore	16 Dec 2009 01:54:58 -0000	1.3
@@ -1 +1 @@
-tgext.crud-0.2.4.tar.gz
+tgext.crud-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jul 2009 21:26:05 -0000	1.2
+++ sources	16 Dec 2009 01:54:58 -0000	1.3
@@ -1 +1 @@
-7dda7f32440bf74c2a9694bebdcf8a55  tgext.crud-0.2.4.tar.gz
+a3bc65a8b37a03fa8c6f5415b36cfc1a  tgext.crud-0.3.3.tar.gz



From lmacken at fedoraproject.org  Wed Dec 16 01:55:15 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 16 Dec 2009 01:55:15 +0000 (UTC)
Subject: rpms/python-tgext-crud/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091216015515.0FF8E11C0265@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-crud/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21360

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jul 2009 21:52:41 -0000	1.2
+++ .cvsignore	16 Dec 2009 01:55:14 -0000	1.3
@@ -1 +1 @@
-tgext.crud-0.2.4.tar.gz
+tgext.crud-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jul 2009 21:52:42 -0000	1.2
+++ sources	16 Dec 2009 01:55:14 -0000	1.3
@@ -1 +1 @@
-7dda7f32440bf74c2a9694bebdcf8a55  tgext.crud-0.2.4.tar.gz
+a3bc65a8b37a03fa8c6f5415b36cfc1a  tgext.crud-0.3.3.tar.gz



From lmacken at fedoraproject.org  Wed Dec 16 01:58:53 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 16 Dec 2009 01:58:53 +0000 (UTC)
Subject: rpms/python-tgext-crud/EL-5 .cvsignore, 1.2,
	1.3 python-tgext-crud.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091216015853.B09CA11C0265@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-crud/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22050

Modified Files:
	.cvsignore python-tgext-crud.spec sources 
Log Message:
Update to 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jul 2009 21:52:55 -0000	1.2
+++ .cvsignore	16 Dec 2009 01:58:53 -0000	1.3
@@ -1 +1 @@
-tgext.crud-0.2.4.tar.gz
+tgext.crud-0.3.3.tar.gz


Index: python-tgext-crud.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/EL-5/python-tgext-crud.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-tgext-crud.spec	21 Jul 2009 21:52:55 -0000	1.1
+++ python-tgext-crud.spec	16 Dec 2009 01:58:53 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-tgext-crud
-Version:        0.2.4
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        Crud Controller Extension for TG2
 
@@ -46,5 +46,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 14 2009 Luke Macken <lmacken at redhat.com> - 0.3.3-1
+- Update to 0.3.3
+
 * Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-crud/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jul 2009 21:52:55 -0000	1.2
+++ sources	16 Dec 2009 01:58:53 -0000	1.3
@@ -1 +1 @@
-7dda7f32440bf74c2a9694bebdcf8a55  tgext.crud-0.2.4.tar.gz
+a3bc65a8b37a03fa8c6f5415b36cfc1a  tgext.crud-0.3.3.tar.gz



From lutter at fedoraproject.org  Wed Dec 16 02:05:01 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Dec 2009 02:05:01 +0000 (UTC)
Subject: rpms/augeas/EL-4 vim-ftdetect-syntax.patch, NONE, 1.1 augeas.spec, 
	1.24, 1.25
Message-ID: <20091216020501.8FD1E11C0265@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23047/EL-4

Modified Files:
	augeas.spec 
Added Files:
	vim-ftdetect-syntax.patch 
Log Message:
Fix ftdetect file for vim (vim-ftdetect-syntax.patch)

vim-ftdetect-syntax.patch:
 augeas.vim |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE vim-ftdetect-syntax.patch ---
>From 81552d12ea1d6fc19ccb9a7d7e57ff09af74ce60 Mon Sep 17 00:00:00 2001
From: David Lutterkort <lutter at redhat.com>
Date: Mon, 14 Dec 2009 14:38:11 -0800
Subject: [PATCH] * doc/ftdetect/augeas.vim: fix syntax

---
 doc/ftdetect/augeas.vim |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/ftdetect/augeas.vim b/doc/ftdetect/augeas.vim
index 2520eb8..7120691 100644
--- a/doc/ftdetect/augeas.vim
+++ b/doc/ftdetect/augeas.vim
@@ -1 +1 @@
-au BufNewFile?,BufRead? *.aug set filetype=augeas
+au BufNewFile,BufRead *.aug set filetype=augeas
-- 
1.6.5.2



Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/augeas.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- augeas.spec	30 Nov 2009 17:36:07 -0000	1.24
+++ augeas.spec	16 Dec 2009 02:05:01 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+Patch0:         vim-ftdetect-syntax.patch
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -43,6 +45,7 @@ The libraries for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -83,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Dec 15 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-2
+- Fix ftdetect file for vim
+
 * Mon Nov 30 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-1
 - Install vim syntax files
 



From lutter at fedoraproject.org  Wed Dec 16 02:05:01 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Dec 2009 02:05:01 +0000 (UTC)
Subject: rpms/augeas/EL-5 vim-ftdetect-syntax.patch, NONE, 1.1 augeas.spec, 
	1.23, 1.24
Message-ID: <20091216020501.B94D611C0265@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23047/EL-5

Modified Files:
	augeas.spec 
Added Files:
	vim-ftdetect-syntax.patch 
Log Message:
Fix ftdetect file for vim (vim-ftdetect-syntax.patch)

vim-ftdetect-syntax.patch:
 augeas.vim |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE vim-ftdetect-syntax.patch ---
>From 81552d12ea1d6fc19ccb9a7d7e57ff09af74ce60 Mon Sep 17 00:00:00 2001
From: David Lutterkort <lutter at redhat.com>
Date: Mon, 14 Dec 2009 14:38:11 -0800
Subject: [PATCH] * doc/ftdetect/augeas.vim: fix syntax

---
 doc/ftdetect/augeas.vim |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/ftdetect/augeas.vim b/doc/ftdetect/augeas.vim
index 2520eb8..7120691 100644
--- a/doc/ftdetect/augeas.vim
+++ b/doc/ftdetect/augeas.vim
@@ -1 +1 @@
-au BufNewFile?,BufRead? *.aug set filetype=augeas
+au BufNewFile,BufRead *.aug set filetype=augeas
-- 
1.6.5.2



Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/augeas.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- augeas.spec	30 Nov 2009 17:36:07 -0000	1.23
+++ augeas.spec	16 Dec 2009 02:05:01 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+Patch0:         vim-ftdetect-syntax.patch
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -43,6 +45,7 @@ The libraries for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -83,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Dec 15 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-2
+- Fix ftdetect file for vim
+
 * Mon Nov 30 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-1
 - Install vim syntax files
 



From lutter at fedoraproject.org  Wed Dec 16 02:05:01 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Dec 2009 02:05:01 +0000 (UTC)
Subject: rpms/augeas/F-11 vim-ftdetect-syntax.patch, NONE, 1.1 augeas.spec, 
	1.23, 1.24
Message-ID: <20091216020501.E242511C02A3@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23047/F-11

Modified Files:
	augeas.spec 
Added Files:
	vim-ftdetect-syntax.patch 
Log Message:
Fix ftdetect file for vim (vim-ftdetect-syntax.patch)

vim-ftdetect-syntax.patch:
 augeas.vim |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE vim-ftdetect-syntax.patch ---
>From 81552d12ea1d6fc19ccb9a7d7e57ff09af74ce60 Mon Sep 17 00:00:00 2001
From: David Lutterkort <lutter at redhat.com>
Date: Mon, 14 Dec 2009 14:38:11 -0800
Subject: [PATCH] * doc/ftdetect/augeas.vim: fix syntax

---
 doc/ftdetect/augeas.vim |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/ftdetect/augeas.vim b/doc/ftdetect/augeas.vim
index 2520eb8..7120691 100644
--- a/doc/ftdetect/augeas.vim
+++ b/doc/ftdetect/augeas.vim
@@ -1 +1 @@
-au BufNewFile?,BufRead? *.aug set filetype=augeas
+au BufNewFile,BufRead *.aug set filetype=augeas
-- 
1.6.5.2



Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-11/augeas.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- augeas.spec	30 Nov 2009 17:36:08 -0000	1.23
+++ augeas.spec	16 Dec 2009 02:05:01 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+Patch0:         vim-ftdetect-syntax.patch
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -43,6 +45,7 @@ The libraries for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -83,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Dec 15 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-2
+- Fix ftdetect file for vim
+
 * Mon Nov 30 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-1
 - Install vim syntax files
 



From lutter at fedoraproject.org  Wed Dec 16 02:05:02 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Dec 2009 02:05:02 +0000 (UTC)
Subject: rpms/augeas/devel vim-ftdetect-syntax.patch, NONE, 1.1 augeas.spec, 
	1.24, 1.25
Message-ID: <20091216020502.3E7B811C02B9@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23047/devel

Modified Files:
	augeas.spec 
Added Files:
	vim-ftdetect-syntax.patch 
Log Message:
Fix ftdetect file for vim (vim-ftdetect-syntax.patch)

vim-ftdetect-syntax.patch:
 augeas.vim |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE vim-ftdetect-syntax.patch ---
>From 81552d12ea1d6fc19ccb9a7d7e57ff09af74ce60 Mon Sep 17 00:00:00 2001
From: David Lutterkort <lutter at redhat.com>
Date: Mon, 14 Dec 2009 14:38:11 -0800
Subject: [PATCH] * doc/ftdetect/augeas.vim: fix syntax

---
 doc/ftdetect/augeas.vim |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/ftdetect/augeas.vim b/doc/ftdetect/augeas.vim
index 2520eb8..7120691 100644
--- a/doc/ftdetect/augeas.vim
+++ b/doc/ftdetect/augeas.vim
@@ -1 +1 @@
-au BufNewFile?,BufRead? *.aug set filetype=augeas
+au BufNewFile,BufRead *.aug set filetype=augeas
-- 
1.6.5.2



Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- augeas.spec	30 Nov 2009 17:36:09 -0000	1.24
+++ augeas.spec	16 Dec 2009 02:05:02 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+Patch0:         vim-ftdetect-syntax.patch
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -43,6 +45,7 @@ The libraries for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -83,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Dec 15 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-2
+- Fix ftdetect file for vim
+
 * Mon Nov 30 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-1
 - Install vim syntax files
 



From lutter at fedoraproject.org  Wed Dec 16 02:05:02 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 16 Dec 2009 02:05:02 +0000 (UTC)
Subject: rpms/augeas/F-12 vim-ftdetect-syntax.patch, NONE, 1.1 augeas.spec, 
	1.24, 1.25
Message-ID: <20091216020502.173EE11C02A7@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23047/F-12

Modified Files:
	augeas.spec 
Added Files:
	vim-ftdetect-syntax.patch 
Log Message:
Fix ftdetect file for vim (vim-ftdetect-syntax.patch)

vim-ftdetect-syntax.patch:
 augeas.vim |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE vim-ftdetect-syntax.patch ---
>From 81552d12ea1d6fc19ccb9a7d7e57ff09af74ce60 Mon Sep 17 00:00:00 2001
From: David Lutterkort <lutter at redhat.com>
Date: Mon, 14 Dec 2009 14:38:11 -0800
Subject: [PATCH] * doc/ftdetect/augeas.vim: fix syntax

---
 doc/ftdetect/augeas.vim |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/ftdetect/augeas.vim b/doc/ftdetect/augeas.vim
index 2520eb8..7120691 100644
--- a/doc/ftdetect/augeas.vim
+++ b/doc/ftdetect/augeas.vim
@@ -1 +1 @@
-au BufNewFile?,BufRead? *.aug set filetype=augeas
+au BufNewFile,BufRead *.aug set filetype=augeas
-- 
1.6.5.2



Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-12/augeas.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- augeas.spec	30 Nov 2009 17:36:09 -0000	1.24
+++ augeas.spec	16 Dec 2009 02:05:01 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+Patch0:         vim-ftdetect-syntax.patch
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -43,6 +45,7 @@ The libraries for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -83,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Dec 15 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-2
+- Fix ftdetect file for vim
+
 * Mon Nov 30 2009 David Lutterkort <lutter at redhat.com> - 0.6.0-1
 - Install vim syntax files
 



From nalin at fedoraproject.org  Wed Dec 16 02:08:52 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed, 16 Dec 2009 02:08:52 +0000 (UTC)
Subject: File hmaccalc-0.9.12.tar.gz uploaded to lookaside cache by nalin
Message-ID: <20091216020852.6D18728ECFE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for hmaccalc:

bf1e70cac02f6cfa85826b8878a27985  hmaccalc-0.9.12.tar.gz



From nalin at fedoraproject.org  Wed Dec 16 02:09:36 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Wed, 16 Dec 2009 02:09:36 +0000 (UTC)
Subject: rpms/hmaccalc/devel .cvsignore, 1.7, 1.8 hmaccalc.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20091216020936.06F4211C00E7@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/hmaccalc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24532

Modified Files:
	.cvsignore hmaccalc.spec sources 
Log Message:
- fix regression of #512275 -- we looked for prelink, but didn't record
  its location properly



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Sep 2009 18:25:03 -0000	1.7
+++ .cvsignore	16 Dec 2009 02:09:35 -0000	1.8
@@ -4,3 +4,4 @@ hmaccalc-0.9.8.tar.gz
 hmaccalc-0.9.9.tar.gz
 hmaccalc-0.9.10.tar.gz
 hmaccalc-0.9.11.tar.gz
+hmaccalc-0.9.12.tar.gz


Index: hmaccalc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/devel/hmaccalc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- hmaccalc.spec	8 Sep 2009 18:25:03 -0000	1.7
+++ hmaccalc.spec	16 Dec 2009 02:09:35 -0000	1.8
@@ -12,7 +12,7 @@
 	%{nil}
 
 Name:		hmaccalc
-Version:	0.9.11
+Version:	0.9.12
 Release:	1%{?dist}
 Summary:	Tools for computing and checking HMAC values for files
 
@@ -61,6 +61,10 @@ make check
 %{_mandir}/*/*
 
 %changelog
+* Tue Dec 15 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.12-1
+- fix regression of #512275 -- we looked for prelink, but didn't record
+  its location properly
+
 * Tue Sep  8 2009 Nalin Dahyabhai <nalin at redhat.com> 0.9.11-1
 - error out when we previously skipped a check entry because the value to be
   checked is the wrong size


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hmaccalc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Sep 2009 18:25:03 -0000	1.7
+++ sources	16 Dec 2009 02:09:35 -0000	1.8
@@ -1 +1 @@
-a2ce45eb54d6202f41d307ecc53a6036  hmaccalc-0.9.11.tar.gz
+bf1e70cac02f6cfa85826b8878a27985  hmaccalc-0.9.12.tar.gz



From cjb at fedoraproject.org  Wed Dec 16 03:49:39 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Wed, 16 Dec 2009 03:49:39 +0000 (UTC)
Subject: File ohm-0.1.1-1.20091215git.tar.gz uploaded to lookaside cache by
	cjb
Message-ID: <20091216034939.6C7E028ECAC@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ohm:

bf083d4d39359be525b13a800e79db59  ohm-0.1.1-1.20091215git.tar.gz



From cjb at fedoraproject.org  Wed Dec 16 03:51:20 2009
From: cjb at fedoraproject.org (Chris Ball)
Date: Wed, 16 Dec 2009 03:51:20 +0000 (UTC)
Subject: rpms/ohm/F-11 .cvsignore, 1.12, 1.13 ohm.spec, 1.21, 1.22 sources, 
	1.16, 1.17
Message-ID: <20091216035120.E52CB11C00E7@cvs1.fedora.phx.redhat.com>

Author: cjb

Update of /cvs/pkgs/rpms/ohm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9200

Modified Files:
	.cvsignore ohm.spec sources 
Log Message:
Trac #9898: Increase timeout before deep sleep from 5 mins to 10 mins
Block <5 second rtcwakes, in case they cause problems.
Trac #9865: If timeouts.timer_rtcwake is zero, do a non-RTC suspend



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	10 Dec 2009 16:10:27 -0000	1.12
+++ .cvsignore	16 Dec 2009 03:51:20 -0000	1.13
@@ -1 +1 @@
-ohm-0.1.1-1.20091211git.tar.gz
+ohm-0.1.1-1.20091215git.tar.gz


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/ohm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ohm.spec	10 Dec 2009 16:23:33 -0000	1.21
+++ ohm.spec	16 Dec 2009 03:51:20 -0000	1.22
@@ -2,12 +2,12 @@
 %define gtk2_version            2.10.0
 %define dbus_version            0.70
 %define gettext_version         0.14
-%define alphatag                20091211git
+%define alphatag                20091215git
 
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 9.38.%{alphatag}%{?dist}
+Release: 9.39.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -139,6 +139,11 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Dec 15 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.39.20091215git.olpc
+- Trac #9898: Increase timeout before deep sleep from 5 mins to 10 mins
+- Block <5 second rtcwakes, in case they cause problems.
+- Trac #9865: If timeouts.timer_rtcwake is zero, do a non-RTC suspend
+
 * Wed Dec 9 2009 Chris Ball <cjb at laptop.org> - 0.1.1-9.38.20091211git.olpc
 - Trigger a scan on resume from powered down wlan, using iwlist scan. 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	10 Dec 2009 16:23:33 -0000	1.16
+++ sources	16 Dec 2009 03:51:20 -0000	1.17
@@ -1 +1 @@
-5acbb4ed1ed2f20ac5fb7453e6f202f9  ohm-0.1.1-1.20091211git.tar.gz
+bf083d4d39359be525b13a800e79db59  ohm-0.1.1-1.20091215git.tar.gz



From deji at fedoraproject.org  Wed Dec 16 03:58:46 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 16 Dec 2009 03:58:46 +0000 (UTC)
Subject: rpms/scalapack/F-12 scalapack.spec,1.27,1.28
Message-ID: <20091216035846.54BFD11C00E7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/scalapack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10639

Modified Files:
	scalapack.spec 
Log Message:
* Wed Dec 15 2009 Deji Akingunola <dakingun at gmail.com> - 1.7.5-8.1
- mpich2 and openmpi macros can now be sanely removed
- Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1



Index: scalapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scalapack/F-12/scalapack.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- scalapack.spec	9 Dec 2009 19:50:49 -0000	1.27
+++ scalapack.spec	16 Dec 2009 03:58:45 -0000	1.28
@@ -1,20 +1,3 @@
-# These macros will go away soon. Hopefully.
-%global _openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
-
-%global _mpich2_load \
- . /etc/profile.d/modules.sh; \
- module load mpich2-%{__isa_bits}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _mpich2_unload \
- . /etc/profile.d/modules.sh; \
- module unload mpich2-%{__isa_bits};
-
 # The blacs packages should probably provide these.
 %global _blacs_openmpi_load \
  . /etc/profile.d/modules.sh; \
@@ -35,7 +18,7 @@
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
@@ -107,7 +90,7 @@ This package contains common files which
 %package mpich2
 Summary: ScaLAPACK libraries compiled against mpich2
 Group: Development/Libraries
-BuildRequires: blacs-mpich2-devel, mpich2-devel
+BuildRequires: blacs-mpich2-devel, mpich2-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
 # This is a lie, but something needs to obsolete it.
@@ -217,7 +200,7 @@ This package contains static libraries f
 cd %{name}-%{version}/
 sed -i 's!BLACSdir      =.*!BLACSdir      = %{_libdir}!' SLmake.inc
 cd ..
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
   cp -a %{name}-%{version} %{name}-%{version}-$i
   sed -i "s|FOO|$i|g" %{name}-%{version}-$i/SLmake.inc
 done
@@ -318,6 +301,10 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/scalapack-openmpi/libscalapack.a
 
 %changelog
+* Wed Dec 15 2009 Deji Akingunola <dakingun at gmail.com> - 1.7.5-8.1
+- mpich2 and openmpi macros can now be sanely removed
+- Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1
+
 * Wed Dec  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-8
 - drop lam support (Provides/Obsoletes by mpich2, which is a hack, but something's gotta do it)
 - move static libs to static subpackages (resolves bz 545150)



From mclasen at fedoraproject.org  Wed Dec 16 04:07:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 04:07:40 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 polkit-error.patch, NONE, 1.1 gnome-panel.spec,
	1.387, 1.388
Message-ID: <20091216040740.E530511C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3870

Modified Files:
	gnome-panel.spec 
Added Files:
	polkit-error.patch 
Log Message:
handle polkit errors in the clock applet


polkit-error.patch:
 gnome-clock-applet-mechanism.c |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE polkit-error.patch ---
diff -up gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c.polkit-error gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c
--- gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c.polkit-error	2009-12-15 22:43:20.419177854 -0500
+++ gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c	2009-12-15 22:46:08.544926738 -0500
@@ -241,9 +241,16 @@ _check_polkit_for_action (GnomeClockAppl
                                                             action,
                                                             NULL,
                                                             POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
-                                                            NULL, NULL);
+                                                            NULL, &error);
         g_object_unref (subject);
 
+        if (error) {
+                dbus_g_method_return_error (context, error);
+                g_error_free (error);
+
+                return FALSE;
+        }
+
         if (!polkit_authorization_result_get_is_authorized (result)) {
                 error = g_error_new (GNOME_CLOCK_APPLET_MECHANISM_ERROR,
                                      GNOME_CLOCK_APPLET_MECHANISM_ERROR_NOT_PRIVILEGED,
@@ -565,19 +572,28 @@ check_can_do (GnomeClockAppletMechanism 
         const char *sender;
         PolkitSubject *subject;
         PolkitAuthorizationResult *result;
+        GError *error;
 
         /* Check that caller is privileged */
         sender = dbus_g_method_get_sender (context);
         subject = polkit_system_bus_name_new (sender);
 
+        error = NULL;
         result = polkit_authority_check_authorization_sync (mechanism->priv->auth,
                                                             subject,
                                                             action,
                                                             NULL,
                                                             0,
-                                                            NULL, NULL);
+                                                            NULL,
+                                                            &error);
         g_object_unref (subject);
 
+        if (error) {
+                dbus_g_method_return_error (context, error);
+                g_error_free (error);
+                return;
+        }
+
         if (polkit_authorization_result_get_is_authorized (result)) {
                 dbus_g_method_return (context, 2);
         }


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -p -r1.387 -r1.388
--- gnome-panel.spec	8 Dec 2009 20:00:24 -0000	1.387
+++ gnome-panel.spec	16 Dec 2009 04:07:40 -0000	1.388
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -133,6 +133,9 @@ Patch46: resolution-change.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=537798
 Patch47: fix-clock-crash.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604678
+Patch48: polkit-error.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -186,6 +189,7 @@ Panel Applets using the libpanel-applet 
 %patch45 -p1 -b .icon-padding
 %patch46 -p1 -b .resolution-change
 %patch47 -p1 -b .fix-clock-crash
+%patch48 -p1 -b .polkit-error
 
 . %{SOURCE6}
 
@@ -393,6 +397,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-17
+- Handle errors returned from PolicyKit in the clock applet (#547624)
+
 * Tue Dec 08 2009 Ray Strode <rstrode at redhat.com> 2.28.0-16
 - Fix clock crash (bug 537798)
 



From arthurguru at fedoraproject.org  Wed Dec 16 04:08:45 2009
From: arthurguru at fedoraproject.org (Arthur Gouros)
Date: Wed, 16 Dec 2009 04:08:45 +0000 (UTC)
Subject: File xmlfy-1.5.1-src.tar.gz uploaded to lookaside cache by
	arthurguru
Message-ID: <20091216040845.9F70328ECCA@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for xmlfy:

a496795a084e226e6684cb5565de1b5a  xmlfy-1.5.1-src.tar.gz



From arthurguru at fedoraproject.org  Wed Dec 16 04:10:54 2009
From: arthurguru at fedoraproject.org (Arthur Gouros)
Date: Wed, 16 Dec 2009 04:10:54 +0000 (UTC)
Subject: rpms/xmlfy/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20091216041054.9E6D711C00C5@cvs1.fedora.phx.redhat.com>

Author: arthurguru

Update of /cvs/pkgs/rpms/xmlfy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4356

Modified Files:
	.cvsignore sources 
Log Message:
normal point release, consult RELEASE_NOTES for futher information.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmlfy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Sep 2009 11:01:37 -0000	1.3
+++ .cvsignore	16 Dec 2009 04:10:54 -0000	1.4
@@ -1 +1 @@
-xmlfy-1.5.0-src.tar.gz
+xmlfy-1.5.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlfy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Sep 2009 11:01:37 -0000	1.3
+++ sources	16 Dec 2009 04:10:54 -0000	1.4
@@ -1 +1 @@
-16886ed5257063881b91a0f57be12fea  xmlfy-1.5.0-src.tar.gz
+a496795a084e226e6684cb5565de1b5a  xmlfy-1.5.1-src.tar.gz



From mclasen at fedoraproject.org  Wed Dec 16 04:13:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 04:13:51 +0000 (UTC)
Subject: rpms/gnome-panel/devel fix-clock-crash.patch, NONE,
	1.1 polkit-error.patch, NONE, 1.1 resolution-change.patch, NONE,
	1.1 gnome-panel.spec, 1.371, 1.372
Message-ID: <20091216041351.6E09611C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5085

Modified Files:
	gnome-panel.spec 
Added Files:
	fix-clock-crash.patch polkit-error.patch 
	resolution-change.patch 
Log Message:
copy F12 changes


fix-clock-crash.patch:
 clock.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE fix-clock-crash.patch ---
>From 58d7ba0359ab128f30b39ea0518a69ed83a4e329 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 8 Dec 2009 14:48:58 -0500
Subject: [PATCH] Only call e_passwords_shutdown once

It doesn't appear to support being called multiple times
in a row.

It appears there was already an attempt to do this with a
reference counter called clock_numbers:

/* Used to count the number of clock instances. It's there to know when
 * we should free resources that are shared. */
static int clock_numbers = 0;

But the logic was wrong.
---
 applets/clock/clock.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index ddbbc16..c06530a 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -803,8 +803,11 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
 
 #ifdef HAVE_LIBECAL
 	if (clock_numbers > 0) {
-		e_passwords_shutdown ();
 		clock_numbers--;
+
+		if (clock_numbers == 0) {
+			e_passwords_shutdown ();
+		}
 	}
 #endif
 }
@@ -1385,8 +1388,10 @@ static void
 create_clock_widget (ClockData *cd)
 {
 #ifdef HAVE_LIBECAL
+	if (clock_numbers == 0) {
+		e_passwords_init ();
+	}
 	clock_numbers++;
-	e_passwords_init ();
 #endif
 
         /* Main toggle button */
-- 
1.6.5.2


polkit-error.patch:
 gnome-clock-applet-mechanism.c |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE polkit-error.patch ---
diff -up gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c.polkit-error gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c
--- gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c.polkit-error	2009-12-15 22:43:20.419177854 -0500
+++ gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c	2009-12-15 22:46:08.544926738 -0500
@@ -241,9 +241,16 @@ _check_polkit_for_action (GnomeClockAppl
                                                             action,
                                                             NULL,
                                                             POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
-                                                            NULL, NULL);
+                                                            NULL, &error);
         g_object_unref (subject);
 
+        if (error) {
+                dbus_g_method_return_error (context, error);
+                g_error_free (error);
+
+                return FALSE;
+        }
+
         if (!polkit_authorization_result_get_is_authorized (result)) {
                 error = g_error_new (GNOME_CLOCK_APPLET_MECHANISM_ERROR,
                                      GNOME_CLOCK_APPLET_MECHANISM_ERROR_NOT_PRIVILEGED,
@@ -565,19 +572,28 @@ check_can_do (GnomeClockAppletMechanism 
         const char *sender;
         PolkitSubject *subject;
         PolkitAuthorizationResult *result;
+        GError *error;
 
         /* Check that caller is privileged */
         sender = dbus_g_method_get_sender (context);
         subject = polkit_system_bus_name_new (sender);
 
+        error = NULL;
         result = polkit_authority_check_authorization_sync (mechanism->priv->auth,
                                                             subject,
                                                             action,
                                                             NULL,
                                                             0,
-                                                            NULL, NULL);
+                                                            NULL,
+                                                            &error);
         g_object_unref (subject);
 
+        if (error) {
+                dbus_g_method_return_error (context, error);
+                g_error_free (error);
+                return;
+        }
+
         if (polkit_authorization_result_get_is_authorized (result)) {
                 dbus_g_method_return (context, 2);
         }

resolution-change.patch:
 panel-widget.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE resolution-change.patch ---
diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.resolution-change gnome-panel-2.28.0/gnome-panel/panel-widget.c
--- gnome-panel-2.28.0/gnome-panel/panel-widget.c.resolution-change	2009-11-09 22:48:41.992597171 -0500
+++ gnome-panel-2.28.0/gnome-panel/panel-widget.c	2009-11-09 22:37:57.240584835 -0500
@@ -1186,7 +1186,7 @@ panel_widget_right_stick(PanelWidget *pa
 
 	ad = list->data;
 	do { 
-		i = ad->constrained;
+		i = ad->pos;
 		ad->pos = ad->constrained = pos--;
 		ad->cells = 1;
 		prev = list;
@@ -1194,7 +1194,7 @@ panel_widget_right_stick(PanelWidget *pa
 		if(!list)
 			break;
 		ad = list->data;
-	} while(ad->constrained + ad->cells == i);
+	} while(ad->pos + ad->cells == i);
 
 	for (list = prev; list; list = list->next)
 		emit_applet_moved (panel, list->data);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- gnome-panel.spec	2 Nov 2009 04:45:40 -0000	1.371
+++ gnome-panel.spec	16 Dec 2009 04:13:51 -0000	1.372
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 12%{?dist}
+Release: 17%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -127,6 +127,15 @@ Patch44: icon-order.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
 Patch45: icon-padding.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=341441
+Patch46: resolution-change.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=537798
+Patch47: fix-clock-crash.patch
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=604678
+Patch48: polkit-error.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -178,6 +187,9 @@ Panel Applets using the libpanel-applet 
 %patch43 -p1 -b .panel-padding
 %patch44 -p1 -b .icon-order
 %patch45 -p1 -b .icon-padding
+%patch46 -p1 -b .resolution-change
+%patch47 -p1 -b .fix-clock-crash
+%patch48 -p1 -b .polkit-error
 
 . %{SOURCE6}
 
@@ -385,6 +397,12 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-17
+- Handle errors returned from PolicyKit in the clock applet (#547624)
+- Fix clock crash (bug 537798)
+- Improve the behaviour of the panel when screen resolution
+  changes (gnome #341441)
+
 * Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-12
 - Make padding work correctly in non-expanded panels (#529614)
 



From arthurguru at fedoraproject.org  Wed Dec 16 04:17:20 2009
From: arthurguru at fedoraproject.org (Arthur Gouros)
Date: Wed, 16 Dec 2009 04:17:20 +0000 (UTC)
Subject: rpms/xmlfy/devel xmlfy.spec,1.3,1.4
Message-ID: <20091216041720.E54E711C00C5@cvs1.fedora.phx.redhat.com>

Author: arthurguru

Update of /cvs/pkgs/rpms/xmlfy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5819

Modified Files:
	xmlfy.spec 
Log Message:
normal point release, consult RELEASE_NOTES for more information



Index: xmlfy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlfy/devel/xmlfy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmlfy.spec	24 Sep 2009 11:01:37 -0000	1.3
+++ xmlfy.spec	16 Dec 2009 04:17:20 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: Convert text/UTF based output into XML format
 Name: xmlfy
-Version: 1.5.0
+Version: 1.5.1
 Release: 1%{?dist}
 License: BSD
 Group: Applications/Text
@@ -51,6 +51,9 @@ make DESTDIR=%{buildroot} bindir=%{_bind
 rm -rf %{buildroot}
 
 %changelog
+* Wed Dec 16 2009 Arthur Gouros <arthurguru at users.sourceforge.net> 1.5.1-1
+- point release, consult RELEASE_NOTES file for details
+
 * Thu Sep 24 2009 Arthur Gouros <arthurguru at users.sourceforge.net> 1.5.0-1
 - normal release, consult RELEASE_NOTES file for details
 



From deji at fedoraproject.org  Wed Dec 16 04:41:57 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 16 Dec 2009 04:41:57 +0000 (UTC)
Subject: rpms/scalapack/devel scalapack.spec,1.27,1.28
Message-ID: <20091216044157.3F15C11C00C5@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/scalapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10267

Modified Files:
	scalapack.spec 
Log Message:
* Wed Dec 15 2009 Deji Akingunola <dakingun at gmail.com> - 1.7.5-9
- Buildrequire mpich2-devel-static



Index: scalapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- scalapack.spec	9 Dec 2009 19:50:49 -0000	1.27
+++ scalapack.spec	16 Dec 2009 04:41:55 -0000	1.28
@@ -18,7 +18,7 @@
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
@@ -90,7 +90,7 @@ This package contains common files which
 %package mpich2
 Summary: ScaLAPACK libraries compiled against mpich2
 Group: Development/Libraries
-BuildRequires: blacs-mpich2-devel, mpich2-devel
+BuildRequires: blacs-mpich2-devel, mpich2-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
 # This is a lie, but something needs to obsolete it.
@@ -200,7 +200,7 @@ This package contains static libraries f
 cd %{name}-%{version}/
 sed -i 's!BLACSdir      =.*!BLACSdir      = %{_libdir}!' SLmake.inc
 cd ..
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
   cp -a %{name}-%{version} %{name}-%{version}-$i
   sed -i "s|FOO|$i|g" %{name}-%{version}-$i/SLmake.inc
 done
@@ -301,6 +301,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/scalapack-openmpi/libscalapack.a
 
 %changelog
+* Wed Dec 15 2009 Deji Akingunola <dakingun at gmail.com> - 1.7.5-9
+- Buildrequire mpich2-devel-static
+
 * Wed Dec  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-8
 - drop lam support (Provides/Obsoletes by mpich2, which is a hack, but something's gotta do it)
 - move static libs to static subpackages (resolves bz 545150)



From deji at fedoraproject.org  Wed Dec 16 04:45:13 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 16 Dec 2009 04:45:13 +0000 (UTC)
Subject: rpms/blacs/devel blacs.spec,1.34,1.35
Message-ID: <20091216044513.76BDC11C00C5@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/blacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10844

Modified Files:
	blacs.spec 
Log Message:
* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-35
- Buildrequire mpich2-devel-static
- Adjust obsolete versioning



Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- blacs.spec	7 Dec 2009 20:37:10 -0000	1.34
+++ blacs.spec	16 Dec 2009 04:45:13 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 34%{?dist}
+Release: 35%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -50,12 +50,12 @@ This file contains common files which ar
 %package mpich2
 Summary: BLACS libraries compiled against mpich2
 Group: Development/Libraries
-BuildRequires: mpich2-devel
+BuildRequires: mpich2-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
 # This is a dirty lie, but something needs to reap these dead subpackages.
 Provides: blacs-lam = %{version}-%{release}
-Obsoletes: blacs-lam < 1.1-33
+Obsoletes: blacs-lam < 1.1-34
 
 %description mpich2
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -75,7 +75,7 @@ Summary: Development libraries for blacs
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
 Provides: blacs-lam-devel = %{version}-%{release}
-Obsoletes: blacs-lam-devel < 1.1-33
+Obsoletes: blacs-lam-devel < 1.1-34
 
 %description mpich2-devel
 This package contains development libraries for blacs, compiled against mpich2.
@@ -84,7 +84,7 @@ This package contains development librar
 Summary: Static libraries for blacs (mpich2)
 Group: Development/Libraries
 Provides: blacs-lam-static = %{version}-%{release}
-Obsoletes: blacs-lam-static < 1.1-33
+Obsoletes: blacs-lam-static < 1.1-34
 
 %description mpich2-static
 This package contains static libraries for blacs, compiled against mpich2.
@@ -241,6 +241,10 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/blacs-openmpi/*.a
 
 %changelog
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-35
+- Buildrequire mpich2-devel-static
+- Adjust obsolete versioning
+
 * Mon Dec  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-34
 - drop lam subpackages (fixes FTBFS, 539057)
 - blacs-mpich2-* now Provides/Obsoletes blacs-lam-*, this is a dirty lie, but we need something to do it



From tgl at fedoraproject.org  Wed Dec 16 05:19:45 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 16 Dec 2009 05:19:45 +0000 (UTC)
Subject: File postgresql-8.4.2.tar.bz2 uploaded to lookaside cache by tgl
Message-ID: <20091216051945.AA55D28ECDB@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for postgresql:

d738227e2f1f742d2f2d4ab56496c5c6  postgresql-8.4.2.tar.bz2



From tgl at fedoraproject.org  Wed Dec 16 05:21:49 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 16 Dec 2009 05:21:49 +0000 (UTC)
Subject: File postgresql-8.4.2-US.pdf uploaded to lookaside cache by tgl
Message-ID: <20091216052149.09FDA28ED3E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for postgresql:

f01eb7590a297e18a89005d74d693f21  postgresql-8.4.2-US.pdf



From phuang at fedoraproject.org  Wed Dec 16 05:22:16 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 16 Dec 2009 05:22:16 +0000 (UTC)
Subject: File ibus-qt-1.2.0.20091216-Source.tar.gz uploaded to lookaside
	cache by phuang
Message-ID: <20091216052216.F0A6A28ED19@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ibus-qt:

977e97cab3062a2531b5f329a486b193  ibus-qt-1.2.0.20091216-Source.tar.gz



From pkgdb at fedoraproject.org  Wed Dec 16 05:25:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:25:21 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-FormState was added for eseyman
Message-ID: <20091216052522.058A128ED1C@bastion3.fedora.phx2.redhat.com>

kevin has added Package perl-CGI-Application-Plugin-FormState with summary Store Form State without Hidden Fields
kevin has approved Package perl-CGI-Application-Plugin-FormState
kevin has added a Fedora devel branch for perl-CGI-Application-Plugin-FormState with an owner of eseyman
kevin has approved perl-CGI-Application-Plugin-FormState in Fedora devel
kevin has approved Package perl-CGI-Application-Plugin-FormState
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora devel)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-FormState



From pkgdb at fedoraproject.org  Wed Dec 16 05:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:25:44 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-FormState summary updated by
	kevin
Message-ID: <20091216052545.5C90E28ED1D@bastion3.fedora.phx2.redhat.com>

kevin set package perl-CGI-Application-Plugin-FormState summary to Store Form State without Hidden Fields

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-FormState



From pkgdb at fedoraproject.org  Wed Dec 16 05:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:25:44 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-FormState (Fedora,
	devel) updated by kevin
Message-ID: <20091216052548.99C4F28ED2D@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on perl-CGI-Application-Plugin-FormState (Fedora devel) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-FormState (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-FormState



From pkgdb at fedoraproject.org  Wed Dec 16 05:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:25:44 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-FormState (Fedora,
	11) updated by kevin
Message-ID: <20091216052546.BAE5F28ED21@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for perl-CGI-Application-Plugin-FormState
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora 11)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora 11)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-FormState (Fedora 11) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-FormState (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-FormState



From pkgdb at fedoraproject.org  Wed Dec 16 05:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:25:44 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-FormState (Fedora,
	12) updated by kevin
Message-ID: <20091216052550.6DB4328ED28@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for perl-CGI-Application-Plugin-FormState
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora 12)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-FormState (Fedora 12)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-FormState (Fedora 12) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-FormState (Fedora 12) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-FormState



From kevin at fedoraproject.org  Wed Dec 16 05:26:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:26:03 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-FormState/devel - New directory
Message-ID: <20091216052603.395B311C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu18687/rpms/perl-CGI-Application-Plugin-FormState/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/devel added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:26:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:26:03 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-FormState - New directory
Message-ID: <20091216052603.200F011C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu18687/rpms/perl-CGI-Application-Plugin-FormState

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:26:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:26:10 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-FormState Makefile,NONE,1.1
Message-ID: <20091216052610.B342011C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu18687/rpms/perl-CGI-Application-Plugin-FormState

Added Files:
	Makefile 
Log Message:
Setup of module perl-CGI-Application-Plugin-FormState


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CGI-Application-Plugin-FormState
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec 16 05:26:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:26:10 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-FormState/devel .cvsignore, NONE, 
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091216052610.D94B711C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu18687/rpms/perl-CGI-Application-Plugin-FormState/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CGI-Application-Plugin-FormState


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-CGI-Application-Plugin-FormState
# $Id: Makefile,v 1.1 2009/12/16 05:26:10 kevin Exp $
NAME := perl-CGI-Application-Plugin-FormState
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 16 05:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:26:30 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-Config-Simple was added for
	eseyman
Message-ID: <20091216052630.C25E828ED1C@bastion3.fedora.phx2.redhat.com>

kevin has added Package perl-CGI-Application-Plugin-Config-Simple with summary Add Config::Simple support to CGI::Application
kevin has approved Package perl-CGI-Application-Plugin-Config-Simple
kevin has added a Fedora devel branch for perl-CGI-Application-Plugin-Config-Simple with an owner of eseyman
kevin has approved perl-CGI-Application-Plugin-Config-Simple in Fedora devel
kevin has approved Package perl-CGI-Application-Plugin-Config-Simple
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora devel)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-Config-Simple



From pkgdb at fedoraproject.org  Wed Dec 16 05:26:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:26:42 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-Config-Simple summary updated by
	kevin
Message-ID: <20091216052642.DA11928ED1C@bastion3.fedora.phx2.redhat.com>

kevin set package perl-CGI-Application-Plugin-Config-Simple summary to Add Config::Simple support to CGI::Application

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-Config-Simple



From pkgdb at fedoraproject.org  Wed Dec 16 05:26:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:26:42 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-Config-Simple (Fedora,
	11) updated by kevin
Message-ID: <20091216052643.5340A28ED22@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for perl-CGI-Application-Plugin-Config-Simple
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora 11)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora 11)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-Config-Simple (Fedora 11) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-Config-Simple (Fedora 11) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-Config-Simple



From pkgdb at fedoraproject.org  Wed Dec 16 05:26:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:26:42 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-Config-Simple (Fedora,
	12) updated by kevin
Message-ID: <20091216052644.2964328ED1D@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for perl-CGI-Application-Plugin-Config-Simple
kevin has set commit to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora 12)
kevin has set build to Approved for 107427 on perl-CGI-Application-Plugin-Config-Simple (Fedora 12)
kevin approved watchbugzilla on perl-CGI-Application-Plugin-Config-Simple (Fedora 12) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-Config-Simple (Fedora 12) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-Config-Simple



From pkgdb at fedoraproject.org  Wed Dec 16 05:26:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:26:42 +0000
Subject: [pkgdb] perl-CGI-Application-Plugin-Config-Simple (Fedora,
	devel) updated by kevin
Message-ID: <20091216052644.D792428ED1E@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on perl-CGI-Application-Plugin-Config-Simple (Fedora devel) for perl-sig
kevin approved watchcommits on perl-CGI-Application-Plugin-Config-Simple (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CGI-Application-Plugin-Config-Simple



From kevin at fedoraproject.org  Wed Dec 16 05:27:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:27:07 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Config-Simple/devel - New directory
Message-ID: <20091216052707.2A78711C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf19034/rpms/perl-CGI-Application-Plugin-Config-Simple/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/devel added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:27:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:27:07 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Config-Simple - New directory
Message-ID: <20091216052707.1118911C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf19034/rpms/perl-CGI-Application-Plugin-Config-Simple

Log Message:
Directory /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:27:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:27:14 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Config-Simple Makefile,NONE,1.1
Message-ID: <20091216052714.66FC111C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf19034/rpms/perl-CGI-Application-Plugin-Config-Simple

Added Files:
	Makefile 
Log Message:
Setup of module perl-CGI-Application-Plugin-Config-Simple


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CGI-Application-Plugin-Config-Simple
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec 16 05:27:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:27:14 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Config-Simple/devel .cvsignore,
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091216052714.834AB11C02B9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf19034/rpms/perl-CGI-Application-Plugin-Config-Simple/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CGI-Application-Plugin-Config-Simple


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-CGI-Application-Plugin-Config-Simple
# $Id: Makefile,v 1.1 2009/12/16 05:27:14 kevin Exp $
NAME := perl-CGI-Application-Plugin-Config-Simple
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 16 05:28:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:28:29 +0000
Subject: [pkgdb] python-couchdb was added for jspaleta
Message-ID: <20091216052831.2BA3528ED1C@bastion3.fedora.phx2.redhat.com>

kevin has added Package python-couchdb with summary A Python library for working with CouchDB
kevin has approved Package python-couchdb
kevin has added a Fedora devel branch for python-couchdb with an owner of jspaleta
kevin has approved python-couchdb in Fedora devel
kevin has approved Package python-couchdb
kevin has set commit to Approved for 107427 on python-couchdb (Fedora devel)
kevin has set checkout to Approved for 107427 on python-couchdb (Fedora devel)
kevin has set build to Approved for 107427 on python-couchdb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-couchdb



From kevin at fedoraproject.org  Wed Dec 16 05:28:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:28:49 +0000 (UTC)
Subject: rpms/python-couchdb - New directory
Message-ID: <20091216052849.125EA11C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-couchdb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV19480/rpms/python-couchdb

Log Message:
Directory /cvs/pkgs/rpms/python-couchdb added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:28:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:28:49 +0000 (UTC)
Subject: rpms/python-couchdb/devel - New directory
Message-ID: <20091216052849.4CC4511C02BA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV19480/rpms/python-couchdb/devel

Log Message:
Directory /cvs/pkgs/rpms/python-couchdb/devel added to the repository




From pkgdb at fedoraproject.org  Wed Dec 16 05:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:28:51 +0000
Subject: [pkgdb] python-couchdb summary updated by kevin
Message-ID: <20091216052853.4B04628ED1D@bastion3.fedora.phx2.redhat.com>

kevin set package python-couchdb summary to A Python library for working with CouchDB

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-couchdb



From pkgdb at fedoraproject.org  Wed Dec 16 05:28:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:28:52 +0000
Subject: [pkgdb] python-couchdb (Fedora, devel) updated by kevin
Message-ID: <20091216052854.CE73128ED3A@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on python-couchdb (Fedora devel) for sdz
kevin approved watchcommits on python-couchdb (Fedora devel) for sdz
kevin approved commit on python-couchdb (Fedora devel) for sdz
kevin approved build on python-couchdb (Fedora devel) for sdz
kevin approved approveacls on python-couchdb (Fedora devel) for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-couchdb



From pkgdb at fedoraproject.org  Wed Dec 16 05:28:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:28:52 +0000
Subject: [pkgdb] python-couchdb (Fedora, 12) updated by kevin
Message-ID: <20091216052856.AD12428ED22@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for python-couchdb
kevin has set commit to Approved for 107427 on python-couchdb (Fedora 12)
kevin has set checkout to Approved for 107427 on python-couchdb (Fedora 12)
kevin has set build to Approved for 107427 on python-couchdb (Fedora 12)
kevin approved watchbugzilla on python-couchdb (Fedora 12) for sdz
kevin approved watchcommits on python-couchdb (Fedora 12) for sdz
kevin approved commit on python-couchdb (Fedora 12) for sdz
kevin approved build on python-couchdb (Fedora 12) for sdz
kevin approved approveacls on python-couchdb (Fedora 12) for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-couchdb



From kevin at fedoraproject.org  Wed Dec 16 05:28:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:28:56 +0000 (UTC)
Subject: rpms/python-couchdb/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091216052856.9AC2411C02B9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV19480/rpms/python-couchdb/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-couchdb


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-couchdb
# $Id: Makefile,v 1.1 2009/12/16 05:28:56 kevin Exp $
NAME := python-couchdb
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Dec 16 05:28:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:28:56 +0000 (UTC)
Subject: rpms/python-couchdb Makefile,NONE,1.1
Message-ID: <20091216052856.7D38911C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-couchdb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV19480/rpms/python-couchdb

Added Files:
	Makefile 
Log Message:
Setup of module python-couchdb


--- NEW FILE Makefile ---
# Top level Makefile for module python-couchdb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Dec 16 05:30:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:30:10 +0000
Subject: [pkgdb] mod_proxy_html was added for philipp
Message-ID: <20091216053012.570F228ED1D@bastion3.fedora.phx2.redhat.com>

kevin has added Package mod_proxy_html with summary reverse-proxy output filter for HTML
kevin has approved Package mod_proxy_html
kevin has added a Fedora devel branch for mod_proxy_html with an owner of philipp
kevin has approved mod_proxy_html in Fedora devel
kevin has approved Package mod_proxy_html
kevin has set commit to Approved for 107427 on mod_proxy_html (Fedora devel)
kevin has set checkout to Approved for 107427 on mod_proxy_html (Fedora devel)
kevin has set build to Approved for 107427 on mod_proxy_html (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_proxy_html



From pkgdb at fedoraproject.org  Wed Dec 16 05:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:30:36 +0000
Subject: [pkgdb] mod_proxy_html summary updated by kevin
Message-ID: <20091216053037.2305B28ED1D@bastion3.fedora.phx2.redhat.com>

kevin set package mod_proxy_html summary to reverse-proxy output filter for HTML

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_proxy_html



From pkgdb at fedoraproject.org  Wed Dec 16 05:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:30:36 +0000
Subject: [pkgdb] mod_proxy_html (Fedora EPEL, 4) updated by kevin
Message-ID: <20091216053039.E884D28ED46@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 4 branch for mod_proxy_html
kevin has set commit to Approved for 107427 on mod_proxy_html (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on mod_proxy_html (Fedora EPEL 4)
kevin has set build to Approved for 107427 on mod_proxy_html (Fedora EPEL 4)
kevin approved watchbugzilla on mod_proxy_html (Fedora EPEL 4) for s4504kr
kevin approved watchcommits on mod_proxy_html (Fedora EPEL 4) for s4504kr
kevin approved watchbugzilla on mod_proxy_html (Fedora EPEL 4) for limb
kevin approved watchcommits on mod_proxy_html (Fedora EPEL 4) for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_proxy_html



From pkgdb at fedoraproject.org  Wed Dec 16 05:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:30:36 +0000
Subject: [pkgdb] mod_proxy_html (Fedora EPEL, 5) updated by kevin
Message-ID: <20091216053040.C602628ED4D@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for mod_proxy_html
kevin has set commit to Approved for 107427 on mod_proxy_html (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on mod_proxy_html (Fedora EPEL 5)
kevin has set build to Approved for 107427 on mod_proxy_html (Fedora EPEL 5)
kevin approved watchbugzilla on mod_proxy_html (Fedora EPEL 5) for s4504kr
kevin approved watchcommits on mod_proxy_html (Fedora EPEL 5) for s4504kr
kevin approved watchbugzilla on mod_proxy_html (Fedora EPEL 5) for limb
kevin approved watchcommits on mod_proxy_html (Fedora EPEL 5) for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_proxy_html



From pkgdb at fedoraproject.org  Wed Dec 16 05:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:30:36 +0000
Subject: [pkgdb] mod_proxy_html (Fedora, devel) updated by kevin
Message-ID: <20091216053037.D1CB428ED27@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on mod_proxy_html (Fedora devel) for s4504kr
kevin approved watchcommits on mod_proxy_html (Fedora devel) for s4504kr
kevin approved watchbugzilla on mod_proxy_html (Fedora devel) for limb
kevin approved watchcommits on mod_proxy_html (Fedora devel) for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_proxy_html



From pkgdb at fedoraproject.org  Wed Dec 16 05:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:30:36 +0000
Subject: [pkgdb] mod_proxy_html (Fedora, 11) updated by kevin
Message-ID: <20091216053038.DABC828ED3D@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for mod_proxy_html
kevin has set commit to Approved for 107427 on mod_proxy_html (Fedora 11)
kevin has set checkout to Approved for 107427 on mod_proxy_html (Fedora 11)
kevin has set build to Approved for 107427 on mod_proxy_html (Fedora 11)
kevin approved watchbugzilla on mod_proxy_html (Fedora 11) for s4504kr
kevin approved watchcommits on mod_proxy_html (Fedora 11) for s4504kr
kevin approved watchbugzilla on mod_proxy_html (Fedora 11) for limb
kevin approved watchcommits on mod_proxy_html (Fedora 11) for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_proxy_html



From pkgdb at fedoraproject.org  Wed Dec 16 05:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:30:36 +0000
Subject: [pkgdb] mod_proxy_html (Fedora, 12) updated by kevin
Message-ID: <20091216053041.ECA4F28ED2D@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for mod_proxy_html
kevin has set commit to Approved for 107427 on mod_proxy_html (Fedora 12)
kevin has set checkout to Approved for 107427 on mod_proxy_html (Fedora 12)
kevin has set build to Approved for 107427 on mod_proxy_html (Fedora 12)
kevin approved watchbugzilla on mod_proxy_html (Fedora 12) for s4504kr
kevin approved watchcommits on mod_proxy_html (Fedora 12) for s4504kr
kevin approved watchbugzilla on mod_proxy_html (Fedora 12) for limb
kevin approved watchcommits on mod_proxy_html (Fedora 12) for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mod_proxy_html



From kevin at fedoraproject.org  Wed Dec 16 05:30:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:30:48 +0000 (UTC)
Subject: rpms/mod_proxy_html - New directory
Message-ID: <20091216053048.1D8EF11C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_proxy_html
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM19979/rpms/mod_proxy_html

Log Message:
Directory /cvs/pkgs/rpms/mod_proxy_html added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:30:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:30:48 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel - New directory
Message-ID: <20091216053048.3D0FD11C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM19979/rpms/mod_proxy_html/devel

Log Message:
Directory /cvs/pkgs/rpms/mod_proxy_html/devel added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:30:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:30:55 +0000 (UTC)
Subject: rpms/mod_proxy_html Makefile,NONE,1.1
Message-ID: <20091216053055.6D40811C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_proxy_html
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM19979/rpms/mod_proxy_html

Added Files:
	Makefile 
Log Message:
Setup of module mod_proxy_html


--- NEW FILE Makefile ---
# Top level Makefile for module mod_proxy_html
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec 16 05:30:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:30:55 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091216053055.9315611C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM19979/rpms/mod_proxy_html/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mod_proxy_html


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mod_proxy_html
# $Id: Makefile,v 1.1 2009/12/16 05:30:55 kevin Exp $
NAME := mod_proxy_html
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 16 05:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:31:46 +0000
Subject: [pkgdb] pki-native-tools was added for kwright
Message-ID: <20091216053147.7255428ED49@bastion3.fedora.phx2.redhat.com>

kevin has added Package pki-native-tools with summary The Dogtag PKI Native Tools
kevin has approved Package pki-native-tools
kevin has added a Fedora devel branch for pki-native-tools with an owner of kwright
kevin has approved pki-native-tools in Fedora devel
kevin has approved Package pki-native-tools
kevin has set commit to Approved for 107427 on pki-native-tools (Fedora devel)
kevin has set checkout to Approved for 107427 on pki-native-tools (Fedora devel)
kevin has set build to Approved for 107427 on pki-native-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Wed Dec 16 05:32:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:32:01 +0000
Subject: [pkgdb] pki-native-tools summary updated by kevin
Message-ID: <20091216053203.1901428ED5C@bastion3.fedora.phx2.redhat.com>

kevin set package pki-native-tools summary to The Dogtag PKI Native Tools

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Wed Dec 16 05:32:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:32:01 +0000
Subject: [pkgdb] pki-native-tools (Fedora, 11) updated by kevin
Message-ID: <20091216053205.EC3C028ED58@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 11 branch for pki-native-tools
kevin has set commit to Approved for 107427 on pki-native-tools (Fedora 11)
kevin has set checkout to Approved for 107427 on pki-native-tools (Fedora 11)
kevin has set build to Approved for 107427 on pki-native-tools (Fedora 11)
kevin approved watchbugzilla on pki-native-tools (Fedora 11) for ausil
kevin approved watchcommits on pki-native-tools (Fedora 11) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Wed Dec 16 05:32:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:32:01 +0000
Subject: [pkgdb] pki-native-tools (Fedora, 12) updated by kevin
Message-ID: <20091216053207.1B9DC28ED64@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora 12 branch for pki-native-tools
kevin has set commit to Approved for 107427 on pki-native-tools (Fedora 12)
kevin has set checkout to Approved for 107427 on pki-native-tools (Fedora 12)
kevin has set build to Approved for 107427 on pki-native-tools (Fedora 12)
kevin approved watchbugzilla on pki-native-tools (Fedora 12) for ausil
kevin approved watchcommits on pki-native-tools (Fedora 12) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Wed Dec 16 05:32:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:32:01 +0000
Subject: [pkgdb] pki-native-tools (Fedora EPEL, 5) updated by kevin
Message-ID: <20091216053204.7817328ED59@bastion3.fedora.phx2.redhat.com>

kevin added a Fedora EPEL 5 branch for pki-native-tools
kevin has set commit to Approved for 107427 on pki-native-tools (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on pki-native-tools (Fedora EPEL 5)
kevin has set build to Approved for 107427 on pki-native-tools (Fedora EPEL 5)
kevin approved watchbugzilla on pki-native-tools (Fedora EPEL 5) for ausil
kevin approved watchcommits on pki-native-tools (Fedora EPEL 5) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Wed Dec 16 05:32:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 05:32:01 +0000
Subject: [pkgdb] pki-native-tools (Fedora, devel) updated by kevin
Message-ID: <20091216053208.882D228ED3C@bastion3.fedora.phx2.redhat.com>

kevin approved watchbugzilla on pki-native-tools (Fedora devel) for ausil
kevin approved watchcommits on pki-native-tools (Fedora devel) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From kevin at fedoraproject.org  Wed Dec 16 05:32:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:32:17 +0000 (UTC)
Subject: rpms/pki-native-tools - New directory
Message-ID: <20091216053217.12B8611C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pki-native-tools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj20507/rpms/pki-native-tools

Log Message:
Directory /cvs/pkgs/rpms/pki-native-tools added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:32:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:32:17 +0000 (UTC)
Subject: rpms/pki-native-tools/devel - New directory
Message-ID: <20091216053217.2774211C00E9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pki-native-tools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj20507/rpms/pki-native-tools/devel

Log Message:
Directory /cvs/pkgs/rpms/pki-native-tools/devel added to the repository




From kevin at fedoraproject.org  Wed Dec 16 05:32:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:32:24 +0000 (UTC)
Subject: rpms/pki-native-tools Makefile,NONE,1.1
Message-ID: <20091216053224.7F1D911C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pki-native-tools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj20507/rpms/pki-native-tools

Added Files:
	Makefile 
Log Message:
Setup of module pki-native-tools


--- NEW FILE Makefile ---
# Top level Makefile for module pki-native-tools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Dec 16 05:32:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 16 Dec 2009 05:32:24 +0000 (UTC)
Subject: rpms/pki-native-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091216053224.A92F711C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pki-native-tools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj20507/rpms/pki-native-tools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pki-native-tools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pki-native-tools
# $Id: Makefile,v 1.1 2009/12/16 05:32:24 kevin Exp $
NAME := pki-native-tools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tgl at fedoraproject.org  Wed Dec 16 05:34:06 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 16 Dec 2009 05:34:06 +0000 (UTC)
Subject: rpms/postgresql/devel .cvsignore, 1.48,
	1.49 postgresql-ac-version.patch, 1.9, 1.10 postgresql.spec,
	1.122, 1.123 sources, 1.49, 1.50
Message-ID: <20091216053406.2390F11C00C5@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21147

Modified Files:
	.cvsignore postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	9 Sep 2009 15:13:29 -0000	1.48
+++ .cvsignore	16 Dec 2009 05:34:05 -0000	1.49
@@ -1,5 +1,5 @@
-postgresql-8.4.1.tar.bz2
+postgresql-8.4.2.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.4.1-US.pdf
+postgresql-8.4.2-US.pdf

postgresql-ac-version.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql-ac-version.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- postgresql-ac-version.patch	9 Sep 2009 15:13:29 -0000	1.9
+++ postgresql-ac-version.patch	16 Dec 2009 05:34:05 -0000	1.10
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenabl
 Dike out the check.
 
 
-diff -Naur postgresql-8.4.1.orig/configure.in postgresql-8.4.1/configure.in
---- postgresql-8.4.1.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.1/configure.in	2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.2.orig/configure.in postgresql-8.4.2/configure.in
+--- postgresql-8.4.2.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.2/configure.in	2009-09-04 13:03:07.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.4.1], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- postgresql.spec	7 Dec 2009 02:41:35 -0000	1.122
+++ postgresql.spec	16 Dec 2009 05:34:05 -0000	1.123
@@ -56,11 +56,11 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 
-Summary: PostgreSQL client programs and libraries
+Summary: PostgreSQL client programs
 Name: postgresql
 %define majorversion 8.4
-Version: 8.4.1
-Release: 5%{?dist}
+Version: 8.4.2
+Release: 1%{?dist}
 # PostgreSQL calls their license simplified BSD, but the requirements are
 # more similar to other MIT licenses.
 License: MIT
@@ -76,7 +76,7 @@ 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.4.1-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.2-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -90,7 +90,8 @@ Patch6: postgresql-perl-rpath.patch
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
 # for /sbin/ldconfig
-Prereq: glibc initscripts
+Requires(post): glibc initscripts
+Requires(postun): glibc initscripts
 
 %if %python || %plpython
 BuildRequires: python-devel
@@ -141,11 +142,6 @@ BuildRequires: systemtap-sdt-devel
 # main package requires -libs subpackage
 Requires: postgresql-libs = %{version}-%{release}
 
-Obsoletes: postgresql-clients
-Obsoletes: postgresql-perl
-Obsoletes: postgresql-tk
-Obsoletes: rh-postgresql
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -169,8 +165,7 @@ if you're installing the postgresql-serv
 %package libs
 Summary: The shared libraries required for any PostgreSQL clients
 Group: Applications/Databases
-Provides: libpq.so
-Obsoletes: rh-postgresql-libs
+Provides: libpq.so = %{version}-%{release}
 
 %description libs
 The postgresql-libs package provides the essential shared libraries for any 
@@ -181,9 +176,10 @@ PostgreSQL server.
 %package server
 Summary: The programs needed to create and run a PostgreSQL server
 Group: Applications/Databases
-Prereq: /usr/sbin/useradd /sbin/chkconfig 
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-server
+Requires(pre): /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
 
 %description server
 The postgresql-server package includes the programs needed to create
@@ -201,7 +197,6 @@ to install the postgresql package.
 Summary: Extra documentation for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-docs
 
 %description docs
 The postgresql-docs package includes some additional documentation for
@@ -210,10 +205,9 @@ and source files for the PostgreSQL tuto
 
 
 %package contrib
-Summary: Contributed source and binaries distributed with PostgreSQL
+Summary: Contributed modules distributed with PostgreSQL
 Group: Applications/Databases
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-contrib
 
 %description contrib
 The postgresql-contrib package contains contributed packages that are
@@ -224,7 +218,6 @@ included in the PostgreSQL distribution.
 Summary: PostgreSQL development header files and libraries
 Group: Development/Libraries
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-devel
 
 %description devel
 The postgresql-devel package contains the header files and libraries
@@ -238,8 +231,6 @@ develop applications which will interact
 Summary: The Perl procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description plperl
@@ -253,8 +244,6 @@ procedural language for the backend.
 Summary: The Python procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 
 %description plpython
 PostgreSQL is an advanced Object-Relational database management
@@ -267,8 +256,6 @@ procedural language for the backend.
 Summary: The Tcl procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 
 %description pltcl
 PostgreSQL is an advanced Object-Relational database management
@@ -283,7 +270,6 @@ Group: Applications/Databases
 # this is intentionally not a version-specific Requires:
 Requires: libpq.so
 Requires: tcl >= 8.5
-Obsoletes: rh-postgresql-tcl
 
 %description tcl
 PostgreSQL is an advanced Object-Relational database management
@@ -298,7 +284,6 @@ Group: Applications/Databases
 # this is intentionally not a version-specific Requires:
 Requires: libpq.so
 Requires: python mx
-Obsoletes: rh-postgresql-python
 
 %description python
 PostgreSQL is an advanced Object-Relational database management
@@ -312,7 +297,6 @@ database.
 Summary: The test suite distributed with PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-test
 
 %description test
 PostgreSQL is an advanced Object-Relational database management
@@ -603,15 +587,7 @@ cat psql-%{majorversion}.lang >>main.lst
 
 %pre server
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
-
-# If we're upgrading from rh-postgresql, we have to repeat the above actions
-# after rh-postgresql-server is uninstalled, because its postun script runs
-# after our pre script ...
-%triggerpostun -n postgresql-server -- rh-postgresql-server
-groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
 	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
 
 %post server
@@ -631,23 +607,18 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %if %plperl
-%post -p /sbin/ldconfig   plperl
-%postun -p /sbin/ldconfig   plperl
+%post -p /sbin/ldconfig plperl
+%postun -p /sbin/ldconfig plperl
 %endif
 
 %if %plpython
-%post -p /sbin/ldconfig   plpython
-%postun -p /sbin/ldconfig   plpython
+%post -p /sbin/ldconfig plpython
+%postun -p /sbin/ldconfig plpython
 %endif
 
 %if %pltcl
-%post -p /sbin/ldconfig   pltcl
-%postun -p /sbin/ldconfig   pltcl
-%endif
-
-%if %test
-%post test
-chown -R postgres:postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
+%post -p /sbin/ldconfig pltcl
+%postun -p /sbin/ldconfig pltcl
 %endif
 
 %clean
@@ -855,6 +826,17 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 16 2009 Tom Lane <tgl at redhat.com> 8.4.2-1
+- Update to PostgreSQL 8.4.2, for various fixes described at
+  http://www.postgresql.org/docs/8.4/static/release-8-4-2.html
+  including two security issues
+Related: #546321
+Related: #547662
+- Use -N not the obsolete -n in useradd call
+Resolves: #495727
+- Clean up specfile to eliminate rpmlint gripes, mainly by removing
+  no-longer-needed provisions for superseding rh-postgresql
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 8.4.1-5
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	9 Sep 2009 15:13:29 -0000	1.49
+++ sources	16 Dec 2009 05:34:05 -0000	1.50
@@ -1,5 +1,5 @@
-f2015af17bacbbfe140daf0d1067f9c9  postgresql-8.4.1.tar.bz2
+d738227e2f1f742d2f2d4ab56496c5c6  postgresql-8.4.2.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-37ebde274743cc5ed3cf3d49c3f84119  postgresql-8.4.1-US.pdf
+f01eb7590a297e18a89005d74d693f21  postgresql-8.4.2-US.pdf



From phuang at fedoraproject.org  Wed Dec 16 05:39:12 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 16 Dec 2009 05:39:12 +0000 (UTC)
Subject: rpms/ibus-qt/devel .cvsignore, 1.6, 1.7 ibus-qt.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20091216053912.DBFF511C00C5@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22304

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20091216


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Dec 2009 00:31:51 -0000	1.6
+++ .cvsignore	16 Dec 2009 05:39:12 -0000	1.7
@@ -1 +1 @@
-ibus-qt-1.2.0.20091206-Source.tar.gz
+ibus-qt-1.2.0.20091216-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ibus-qt.spec	6 Dec 2009 00:31:51 -0000	1.10
+++ ibus-qt.spec	16 Dec 2009 05:39:12 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       ibus-qt
-Version:    1.2.0.20091206
-Release:    2%{?dist}
+Version:    1.2.0.20091216
+Release:    1%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -12,8 +12,8 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 BuildRequires:  cmake
 BuildRequires:  qt-devel >= 4.5
 BuildRequires:  dbus-devel >= 1.2
-BuildRequires:  ibus-devel >= 1.2
 BuildRequires:  libicu-devel >= 4.0
+BuildRequires:  doxygen >= 1.6
 Requires:   ibus >= 1.2.0.20091014
 
 %description
@@ -27,6 +27,14 @@ Requires:   %{name} = %{version}-%{relea
 %description devel
 The ibus-qt-devel package contains the header files for ibus qt library.
 
+%package devel-docs
+Summary:    Development documents for ibus qt
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description devel-docs
+The ibus-qt-devel-docs package contains developer documentation for ibus qt library.
+
 %prep
 %setup -q -n %{name}-%{version}-Source
 
@@ -64,7 +72,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/libibus-qt.so
 
+%files devel-docs
+%defattr(-,root,root,-)
+%{_datadir}/doc/ibus-qt-docs-1.2.0.20091216/html
+%{_datadir}/man/man3/*
+
 %changelog
+* Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091216-1
+- Update to 1.2.0.20091216.
+
 * Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091206-1
 - Update to 1.2.0.20091206.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Dec 2009 00:31:51 -0000	1.7
+++ sources	16 Dec 2009 05:39:12 -0000	1.8
@@ -1 +1 @@
-450aad990d4dacf554a2f306414f891c  ibus-qt-1.2.0.20091206-Source.tar.gz
+977e97cab3062a2531b5f329a486b193  ibus-qt-1.2.0.20091216-Source.tar.gz



From phuang at fedoraproject.org  Wed Dec 16 05:48:00 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 16 Dec 2009 05:48:00 +0000 (UTC)
Subject: File ibus-1.2.0.20091215.tar.gz uploaded to lookaside cache by
	phuang
Message-ID: <20091216054800.561E028EBFC@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ibus:

caf5ed11233f0e8c4369d44e66b7beb5  ibus-1.2.0.20091215.tar.gz



From phuang at fedoraproject.org  Wed Dec 16 05:49:30 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 16 Dec 2009 05:49:30 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.47, 1.48 ibus.spec, 1.97, 1.98 sources,
	1.53, 1.54
Message-ID: <20091216054930.62BFD11C00C5@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24510

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20091215


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	4 Dec 2009 08:51:50 -0000	1.47
+++ .cvsignore	16 Dec 2009 05:49:29 -0000	1.48
@@ -1 +1 @@
-ibus-1.2.0.20091204.tar.gz
+ibus-1.2.0.20091215.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- ibus.spec	10 Dec 2009 05:33:29 -0000	1.97
+++ ibus.spec	16 Dec 2009 05:49:30 -0000	1.98
@@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20091204
-Release:    2%{?dist}
+Version:    1.2.0.20091215
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -222,6 +222,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Dec 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001215-1
+- Update to 1.2.0.20091215
+
 * Thu Dec 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-2
 - Fix rpmlint warnings and errors.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	4 Dec 2009 08:51:50 -0000	1.53
+++ sources	16 Dec 2009 05:49:30 -0000	1.54
@@ -1 +1 @@
-89b15760649c7edb6326163112a47865  ibus-1.2.0.20091204.tar.gz
+caf5ed11233f0e8c4369d44e66b7beb5  ibus-1.2.0.20091215.tar.gz



From kkofler at fedoraproject.org  Wed Dec 16 05:50:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 05:50:41 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.119,1.120
Message-ID: <20091216055041.E89EB11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24840

Modified Files:
	comps-f13.xml.in 
Log Message:
kde-desktop: Follow the new upstream branding, update description to mention desktop widgets, don't single out the file manager vs. the many other applications.


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- comps-f13.xml.in	15 Dec 2009 08:53:52 -0000	1.119
+++ comps-f13.xml.in	16 Dec 2009 05:50:41 -0000	1.120
@@ -3709,8 +3709,8 @@
   </group>
   <group>
     <id>kde-desktop</id>
-    <_name>KDE (K Desktop Environment)</_name>
-    <_description>KDE is a powerful graphical user interface which includes a panel, desktop, system icons, and a graphical file manager.</_description>
+    <_name>KDE Software Compilation</_name>
+    <_description>The KDE SC includes the KDE Plasma Desktop, a highly-configurable graphical user interface which includes a panel, desktop, system icons and desktop widgets, and many powerful KDE applications.</_description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>



From jgarzik at fedoraproject.org  Wed Dec 16 05:50:50 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 16 Dec 2009 05:50:50 +0000 (UTC)
Subject: File tabled-0.5git.tar.gz uploaded to lookaside cache by jgarzik
Message-ID: <20091216055050.E06C328EBFC@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for tabled:

2ebe329911c8a936c6463fdcaa8aa7bf  tabled-0.5git.tar.gz



From jgarzik at fedoraproject.org  Wed Dec 16 05:51:56 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 16 Dec 2009 05:51:56 +0000 (UTC)
Subject: rpms/tabled/devel sources,1.16,1.17 tabled.spec,1.25,1.26
Message-ID: <20091216055156.D935911C00C5@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25139

Modified Files:
	sources tabled.spec 
Log Message:
update to upstream commit e32562b95234a8c221b8a91e8712878ea05cd6b9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	15 Dec 2009 23:10:56 -0000	1.16
+++ sources	16 Dec 2009 05:51:56 -0000	1.17
@@ -1 +1 @@
-f674910c081dd6ba1b63072244bfd81e  tabled-0.5git.tar.gz
+2ebe329911c8a936c6463fdcaa8aa7bf  tabled-0.5git.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- tabled.spec	15 Dec 2009 23:10:56 -0000	1.25
+++ tabled.spec	16 Dec 2009 05:51:56 -0000	1.26
@@ -1,13 +1,13 @@
 Name:		tabled
 Version:	0.5
-Release:	0.2.g93f17fe1%{?dist}
+Release:	0.3.ge32562b9%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 93f17fe1396082762447a772287ce9b6b40d389b
+# pulled from upstream git, commit e32562b95234a8c221b8a91e8712878ea05cd6b9
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	tabled-%{version}git.tar.gz
 Source2:	tabled.init
@@ -102,6 +102,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Dec 16 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.3.ge32562b9
+- add sources for git commit e32562b95234a8c221b8a91e8712878ea05cd6b9
+
 * Tue Dec 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.2.g93f17fe1
 - add sources for git commit 93f17fe1396082762447a772287ce9b6b40d389b
 



From tgl at fedoraproject.org  Wed Dec 16 05:53:16 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 16 Dec 2009 05:53:16 +0000 (UTC)
Subject: rpms/postgresql/F-12 .cvsignore, 1.48, 1.49 ecpg_config.h, 1.1,
	1.2 pg_config.h, 1.3, 1.4 postgresql-ac-version.patch, 1.9,
	1.10 postgresql.spec, 1.120, 1.121 sources, 1.49, 1.50
Message-ID: <20091216055316.9559711C00C5@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25479

Modified Files:
	.cvsignore ecpg_config.h pg_config.h 
	postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.4.2; sync with recent devel changes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	9 Sep 2009 15:13:29 -0000	1.48
+++ .cvsignore	16 Dec 2009 05:53:16 -0000	1.49
@@ -1,5 +1,5 @@
-postgresql-8.4.1.tar.bz2
+postgresql-8.4.2.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.4.1-US.pdf
+postgresql-8.4.2-US.pdf


Index: ecpg_config.h
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/ecpg_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecpg_config.h	4 Sep 2007 17:26:37 -0000	1.1
+++ ecpg_config.h	16 Dec 2009 05:53:16 -0000	1.2
@@ -22,4 +22,8 @@
 #include "ecpg_config_s390x.h"
 #elif defined(__s390__)
 #include "ecpg_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ecpg_config_sparc64.h"
+#elif defined(__sparc__)
+#include "ecpg_config_sparc.h"
 #endif


Index: pg_config.h
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/pg_config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pg_config.h	13 Feb 2006 15:53:02 -0000	1.3
+++ pg_config.h	16 Dec 2009 05:53:16 -0000	1.4
@@ -22,4 +22,8 @@
 #include "pg_config_s390x.h"
 #elif defined(__s390__)
 #include "pg_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pg_config_sparc64.h"
+#elif defined(__sparc__)
+#include "pg_config_sparc.h"
 #endif

postgresql-ac-version.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/postgresql-ac-version.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- postgresql-ac-version.patch	9 Sep 2009 15:13:29 -0000	1.9
+++ postgresql-ac-version.patch	16 Dec 2009 05:53:16 -0000	1.10
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenabl
 Dike out the check.
 
 
-diff -Naur postgresql-8.4.1.orig/configure.in postgresql-8.4.1/configure.in
---- postgresql-8.4.1.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.1/configure.in	2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.2.orig/configure.in postgresql-8.4.2/configure.in
+--- postgresql-8.4.2.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.2/configure.in	2009-09-04 13:03:07.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.4.1], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/postgresql.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- postgresql.spec	22 Sep 2009 00:45:57 -0000	1.120
+++ postgresql.spec	16 Dec 2009 05:53:16 -0000	1.121
@@ -56,12 +56,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 
-Summary: PostgreSQL client programs and libraries
+Summary: PostgreSQL client programs
 Name: postgresql
 %define majorversion 8.4
-Version: 8.4.1
-Release: 3%{?dist}
-# PG considers their license to be simplified BSD, but it's more nearly MIT
+Version: 8.4.2
+Release: 1%{?dist}
+# PostgreSQL calls their license simplified BSD, but the requirements are
+# more similar to other MIT licenses.
 License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -75,7 +76,7 @@ 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.4.1-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.2-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -89,7 +90,8 @@ Patch6: postgresql-perl-rpath.patch
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
 # for /sbin/ldconfig
-Prereq: glibc initscripts
+Requires(post): glibc initscripts
+Requires(postun): glibc initscripts
 
 %if %python || %plpython
 BuildRequires: python-devel
@@ -140,11 +142,6 @@ BuildRequires: systemtap-sdt-devel
 # main package requires -libs subpackage
 Requires: postgresql-libs = %{version}-%{release}
 
-Obsoletes: postgresql-clients
-Obsoletes: postgresql-perl
-Obsoletes: postgresql-tk
-Obsoletes: rh-postgresql
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -168,8 +165,7 @@ if you're installing the postgresql-serv
 %package libs
 Summary: The shared libraries required for any PostgreSQL clients
 Group: Applications/Databases
-Provides: libpq.so
-Obsoletes: rh-postgresql-libs
+Provides: libpq.so = %{version}-%{release}
 
 %description libs
 The postgresql-libs package provides the essential shared libraries for any 
@@ -180,9 +176,10 @@ PostgreSQL server.
 %package server
 Summary: The programs needed to create and run a PostgreSQL server
 Group: Applications/Databases
-Prereq: /usr/sbin/useradd /sbin/chkconfig 
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-server
+Requires(pre): /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
 
 %description server
 The postgresql-server package includes the programs needed to create
@@ -200,7 +197,6 @@ to install the postgresql package.
 Summary: Extra documentation for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-docs
 
 %description docs
 The postgresql-docs package includes some additional documentation for
@@ -209,10 +205,9 @@ and source files for the PostgreSQL tuto
 
 
 %package contrib
-Summary: Contributed source and binaries distributed with PostgreSQL
+Summary: Contributed modules distributed with PostgreSQL
 Group: Applications/Databases
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-contrib
 
 %description contrib
 The postgresql-contrib package contains contributed packages that are
@@ -223,7 +218,6 @@ included in the PostgreSQL distribution.
 Summary: PostgreSQL development header files and libraries
 Group: Development/Libraries
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-devel
 
 %description devel
 The postgresql-devel package contains the header files and libraries
@@ -237,8 +231,6 @@ develop applications which will interact
 Summary: The Perl procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description plperl
@@ -252,8 +244,6 @@ procedural language for the backend.
 Summary: The Python procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 
 %description plpython
 PostgreSQL is an advanced Object-Relational database management
@@ -266,8 +256,6 @@ procedural language for the backend.
 Summary: The Tcl procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 
 %description pltcl
 PostgreSQL is an advanced Object-Relational database management
@@ -282,7 +270,6 @@ Group: Applications/Databases
 # this is intentionally not a version-specific Requires:
 Requires: libpq.so
 Requires: tcl >= 8.5
-Obsoletes: rh-postgresql-tcl
 
 %description tcl
 PostgreSQL is an advanced Object-Relational database management
@@ -297,7 +284,6 @@ Group: Applications/Databases
 # this is intentionally not a version-specific Requires:
 Requires: libpq.so
 Requires: python mx
-Obsoletes: rh-postgresql-python
 
 %description python
 PostgreSQL is an advanced Object-Relational database management
@@ -311,7 +297,6 @@ database.
 Summary: The test suite distributed with PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-test
 
 %description test
 PostgreSQL is an advanced Object-Relational database management
@@ -478,7 +463,7 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT 
 # multilib header hack; note pg_config.h is installed in two places!
 # we only apply this to known Red Hat multilib arches, per bug #177564
 case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | s390 | s390x)
+  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
     mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
     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
@@ -602,15 +587,7 @@ cat psql-%{majorversion}.lang >>main.lst
 
 %pre server
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
-
-# If we're upgrading from rh-postgresql, we have to repeat the above actions
-# after rh-postgresql-server is uninstalled, because its postun script runs
-# after our pre script ...
-%triggerpostun -n postgresql-server -- rh-postgresql-server
-groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
 	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
 
 %post server
@@ -630,23 +607,18 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %if %plperl
-%post -p /sbin/ldconfig   plperl
-%postun -p /sbin/ldconfig   plperl
+%post -p /sbin/ldconfig plperl
+%postun -p /sbin/ldconfig plperl
 %endif
 
 %if %plpython
-%post -p /sbin/ldconfig   plpython
-%postun -p /sbin/ldconfig   plpython
+%post -p /sbin/ldconfig plpython
+%postun -p /sbin/ldconfig plpython
 %endif
 
 %if %pltcl
-%post -p /sbin/ldconfig   pltcl
-%postun -p /sbin/ldconfig   pltcl
-%endif
-
-%if %test
-%post test
-chown -R postgres:postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
+%post -p /sbin/ldconfig pltcl
+%postun -p /sbin/ldconfig pltcl
 %endif
 
 %clean
@@ -854,6 +826,18 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 16 2009 Tom Lane <tgl at redhat.com> 8.4.2-1
+- Update to PostgreSQL 8.4.2, for various fixes described at
+  http://www.postgresql.org/docs/8.4/static/release-8-4-2.html
+  including two security issues
+Related: #546321
+Related: #547662
+- Use -N not the obsolete -n in useradd call
+Resolves: #495727
+- Clean up specfile to eliminate rpmlint gripes, mainly by removing
+  no-longer-needed provisions for superseding rh-postgresql
+- add sparc/sparc64 to multilib header support
+
 * Mon Sep 21 2009 Tom Lane <tgl at redhat.com> 8.4.1-3
 - Ensure pgstartup.log gets the right ownership/permissions during initdb
 Resolves: #498959


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	9 Sep 2009 15:13:29 -0000	1.49
+++ sources	16 Dec 2009 05:53:16 -0000	1.50
@@ -1,5 +1,5 @@
-f2015af17bacbbfe140daf0d1067f9c9  postgresql-8.4.1.tar.bz2
+d738227e2f1f742d2f2d4ab56496c5c6  postgresql-8.4.2.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-37ebde274743cc5ed3cf3d49c3f84119  postgresql-8.4.1-US.pdf
+f01eb7590a297e18a89005d74d693f21  postgresql-8.4.2-US.pdf



From phuang at fedoraproject.org  Wed Dec 16 06:00:38 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 16 Dec 2009 06:00:38 +0000 (UTC)
Subject: rpms/ibus/F-12 .cvsignore, 1.48, 1.49 ibus.spec, 1.99, 1.100 sources,
	1.55, 1.56
Message-ID: <20091216060038.E5E1511C0335@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26903

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20091215


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	4 Dec 2009 08:50:50 -0000	1.48
+++ .cvsignore	16 Dec 2009 06:00:37 -0000	1.49
@@ -1 +1 @@
-ibus-1.2.0.20091204.tar.gz
+ibus-1.2.0.20091215.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- ibus.spec	10 Dec 2009 05:50:01 -0000	1.99
+++ ibus.spec	16 Dec 2009 06:00:37 -0000	1.100
@@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20091204
-Release:    2%{?dist}
+Version:    1.2.0.20091215
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -222,6 +222,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Dec 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001215-1
+- Update to 1.2.0.20091215
+
 * Thu Dec 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001204-2
 - Fix rpmlint warnings and errors.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	4 Dec 2009 08:50:50 -0000	1.55
+++ sources	16 Dec 2009 06:00:38 -0000	1.56
@@ -1 +1 @@
-89b15760649c7edb6326163112a47865  ibus-1.2.0.20091204.tar.gz
+caf5ed11233f0e8c4369d44e66b7beb5  ibus-1.2.0.20091215.tar.gz



From phuang at fedoraproject.org  Wed Dec 16 06:02:25 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 16 Dec 2009 06:02:25 +0000 (UTC)
Subject: rpms/ibus-qt/F-12 .cvsignore, 1.6, 1.7 ibus-qt.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20091216060225.A432211C00C5@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27302

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20091216


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Dec 2009 00:44:57 -0000	1.6
+++ .cvsignore	16 Dec 2009 06:02:24 -0000	1.7
@@ -1 +1 @@
-ibus-qt-1.2.0.20091206-Source.tar.gz
+ibus-qt-1.2.0.20091216-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/ibus-qt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ibus-qt.spec	6 Dec 2009 00:44:57 -0000	1.9
+++ ibus-qt.spec	16 Dec 2009 06:02:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:       ibus-qt
-Version:    1.2.0.20091206
-Release:    2%{?dist}
+Version:    1.2.0.20091216
+Release:    1%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -12,8 +12,8 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 BuildRequires:  cmake
 BuildRequires:  qt-devel >= 4.5
 BuildRequires:  dbus-devel >= 1.2
-BuildRequires:  ibus-devel >= 1.2
 BuildRequires:  libicu-devel >= 4.0
+BuildRequires:  doxygen >= 1.6
 Requires:   ibus >= 1.2.0.20091014
 
 %description
@@ -27,6 +27,14 @@ Requires:   %{name} = %{version}-%{relea
 %description devel
 The ibus-qt-devel package contains the header files for ibus qt library.
 
+%package devel-docs
+Summary:    Development documents for ibus qt
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description devel-docs
+The ibus-qt-devel-docs package contains developer documentation for ibus qt library.
+
 %prep
 %setup -q -n %{name}-%{version}-Source
 
@@ -64,10 +72,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/libibus-qt.so
 
+%files devel-docs
+%defattr(-,root,root,-)
+%{_datadir}/doc/ibus-qt-docs-1.2.0.20091216/html
+%{_datadir}/man/man3/*
+
 %changelog
+* Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091216-1
+- Update to 1.2.0.20091216.
+
 * Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091206-1
 - Update to 1.2.0.20091206.
 
+* Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0.20091014-2
+- rebuild (for qt-4.6.0-rc1, f13+)
+
 * Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091014-1
 - Update to 1.2.0.20091014.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Dec 2009 00:44:57 -0000	1.7
+++ sources	16 Dec 2009 06:02:25 -0000	1.8
@@ -1 +1 @@
-450aad990d4dacf554a2f306414f891c  ibus-qt-1.2.0.20091206-Source.tar.gz
+977e97cab3062a2531b5f329a486b193  ibus-qt-1.2.0.20091216-Source.tar.gz



From mtasaka at fedoraproject.org  Wed Dec 16 06:50:40 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Dec 2009 06:50:40 +0000 (UTC)
Subject: File jd-2.5.5-svn3235_trunk.tgz uploaded to lookaside cache by
	mtasaka
Message-ID: <20091216065040.B151828ECF5@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for jd:

91811f331788b42ff52ee2b21f591989  jd-2.5.5-svn3235_trunk.tgz



From mtasaka at fedoraproject.org  Wed Dec 16 06:53:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Dec 2009 06:53:17 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.406, 1.407 jd.spec, 1.468, 1.469 sources,
	1.407, 1.408
Message-ID: <20091216065317.66F1411C02B9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4863/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3235



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- .cvsignore	14 Dec 2009 06:04:48 -0000	1.406
+++ .cvsignore	16 Dec 2009 06:53:16 -0000	1.407
@@ -1 +1 @@
-jd-2.5.5-svn3231_trunk.tgz
+jd-2.5.5-svn3235_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- jd.spec	14 Dec 2009 06:04:48 -0000	1.468
+++ jd.spec	16 Dec 2009 06:53:17 -0000	1.469
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3231_trunk
+%define         strtag        svn3235_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Dec 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3231
+* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3235
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -p -r1.407 -r1.408
--- sources	14 Dec 2009 06:04:48 -0000	1.407
+++ sources	16 Dec 2009 06:53:17 -0000	1.408
@@ -1 +1 @@
-e0df6d618e0e4c3b412c6f4ce14ce9c9  jd-2.5.5-svn3231_trunk.tgz
+91811f331788b42ff52ee2b21f591989  jd-2.5.5-svn3235_trunk.tgz



From mtasaka at fedoraproject.org  Wed Dec 16 06:53:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Dec 2009 06:53:17 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.416, 1.417 jd.spec, 1.480, 1.481 sources,
	1.417, 1.418
Message-ID: <20091216065317.6299711C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4863/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3235



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- .cvsignore	14 Dec 2009 06:34:21 -0000	1.416
+++ .cvsignore	16 Dec 2009 06:53:16 -0000	1.417
@@ -1 +1 @@
-jd-2.5.5-svn3231_trunk.tgz
+jd-2.5.5-svn3235_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -p -r1.480 -r1.481
--- jd.spec	14 Dec 2009 06:34:21 -0000	1.480
+++ jd.spec	16 Dec 2009 06:53:16 -0000	1.481
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3231_trunk
+%define         strtag        svn3235_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Dec 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3231
+* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3235
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- sources	14 Dec 2009 06:34:21 -0000	1.417
+++ sources	16 Dec 2009 06:53:16 -0000	1.418
@@ -1 +1 @@
-e0df6d618e0e4c3b412c6f4ce14ce9c9  jd-2.5.5-svn3231_trunk.tgz
+91811f331788b42ff52ee2b21f591989  jd-2.5.5-svn3235_trunk.tgz



From mtasaka at fedoraproject.org  Wed Dec 16 06:53:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Dec 2009 06:53:17 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.416, 1.417 jd.spec, 1.479, 1.480 sources,
	1.417, 1.418
Message-ID: <20091216065317.629AA11C0260@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4863/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3235



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- .cvsignore	14 Dec 2009 06:34:57 -0000	1.416
+++ .cvsignore	16 Dec 2009 06:53:16 -0000	1.417
@@ -1 +1 @@
-jd-2.5.5-svn3231_trunk.tgz
+jd-2.5.5-svn3235_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -p -r1.479 -r1.480
--- jd.spec	14 Dec 2009 06:34:57 -0000	1.479
+++ jd.spec	16 Dec 2009 06:53:16 -0000	1.480
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3231_trunk
+%define         strtag        svn3235_trunk
 %define         repoid        44788
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Dec 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3231
+* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3235
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- sources	14 Dec 2009 06:34:58 -0000	1.417
+++ sources	16 Dec 2009 06:53:16 -0000	1.418
@@ -1 +1 @@
-e0df6d618e0e4c3b412c6f4ce14ce9c9  jd-2.5.5-svn3231_trunk.tgz
+91811f331788b42ff52ee2b21f591989  jd-2.5.5-svn3235_trunk.tgz



From dchen at fedoraproject.org  Wed Dec 16 07:48:17 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Dec 2009 07:48:17 +0000 (UTC)
Subject: rpms/man-pages-ko/devel import.log, 1.4, 1.5 man-pages-ko.spec, 1.23,
	1.24
Message-ID: <20091216074817.4F55611C0092@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-ko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14190/devel

Modified Files:
	import.log man-pages-ko.spec 
Log Message:
Fix path and URL


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	27 Oct 2008 00:16:25 -0000	1.4
+++ import.log	16 Dec 2009 07:48:16 -0000	1.5
@@ -2,3 +2,4 @@ man-pages-ko-20050219-4_fc9:HEAD:man-pag
 man-pages-ko-20050219-5_fc9:HEAD:man-pages-ko-20050219-5.fc9.src.rpm:1221462843
 man-pages-ko-20050219-6_fc9:HEAD:man-pages-ko-20050219-6.fc9.src.rpm:1225065418
 man-pages-ko-20050219-7_fc9:HEAD:man-pages-ko-20050219-7.fc9.src.rpm:1225066558
+man-pages-ko-20050219-10_fc12:HEAD:man-pages-ko-20050219-10.fc12.src.rpm:1260949638


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/devel/man-pages-ko.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- man-pages-ko.spec	25 Jul 2009 11:44:21 -0000	1.23
+++ man-pages-ko.spec	16 Dec 2009 07:48:16 -0000	1.24
@@ -1,13 +1,13 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
 #Vendor: Korean Manpage Project Team.
 URL: http://man.kldp.org/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://kldp.net/frs/download.php/1918/%{name}-%{version}.tar.gz
 Source1: Man_Page_Copyright
 #Source1:http://man.kldp.org/wiki/ManPageCopyright
 Patch0: %{name}-%{version}.patch
@@ -31,7 +31,7 @@ is maintained by Korean Manpage Project 
 %setup -q -c %{name}-%{version}
 %patch0 -p0 -b .bak
 find . -name CVS -exec rm -rf {} \;
-cp ../../SOURCES/Man_Page_Copyright COPYING
+cp %{SOURCE1} COPYING
 
 #conflict with man
 rm -f ./man1/man.1 ./man1/whatis.1 ./man5/man.config.5 
@@ -86,6 +86,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/ko
 
 %changelog
+* Wed Dec 16 2009 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-10
+- Add full URL to source.
+- Fixed the Source1 path.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:20050219-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dchen at fedoraproject.org  Wed Dec 16 07:49:15 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Dec 2009 07:49:15 +0000 (UTC)
Subject: rpms/man-pages-ko/F-12 import.log, 1.4, 1.5 man-pages-ko.spec, 1.23,
	1.24
Message-ID: <20091216074915.52D2A11C0092@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-ko/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14436/F-12

Modified Files:
	import.log man-pages-ko.spec 
Log Message:
Fix path and URL


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	27 Oct 2008 00:16:25 -0000	1.4
+++ import.log	16 Dec 2009 07:49:15 -0000	1.5
@@ -2,3 +2,4 @@ man-pages-ko-20050219-4_fc9:HEAD:man-pag
 man-pages-ko-20050219-5_fc9:HEAD:man-pages-ko-20050219-5.fc9.src.rpm:1221462843
 man-pages-ko-20050219-6_fc9:HEAD:man-pages-ko-20050219-6.fc9.src.rpm:1225065418
 man-pages-ko-20050219-7_fc9:HEAD:man-pages-ko-20050219-7.fc9.src.rpm:1225066558
+man-pages-ko-20050219-10_fc12:F-12:man-pages-ko-20050219-10.fc12.src.rpm:1260949740


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-12/man-pages-ko.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- man-pages-ko.spec	25 Jul 2009 11:44:21 -0000	1.23
+++ man-pages-ko.spec	16 Dec 2009 07:49:15 -0000	1.24
@@ -1,13 +1,13 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
 #Vendor: Korean Manpage Project Team.
 URL: http://man.kldp.org/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://kldp.net/frs/download.php/1918/%{name}-%{version}.tar.gz
 Source1: Man_Page_Copyright
 #Source1:http://man.kldp.org/wiki/ManPageCopyright
 Patch0: %{name}-%{version}.patch
@@ -31,7 +31,7 @@ is maintained by Korean Manpage Project 
 %setup -q -c %{name}-%{version}
 %patch0 -p0 -b .bak
 find . -name CVS -exec rm -rf {} \;
-cp ../../SOURCES/Man_Page_Copyright COPYING
+cp %{SOURCE1} COPYING
 
 #conflict with man
 rm -f ./man1/man.1 ./man1/whatis.1 ./man5/man.config.5 
@@ -86,6 +86,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/ko
 
 %changelog
+* Wed Dec 16 2009 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-10
+- Add full URL to source.
+- Fixed the Source1 path.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:20050219-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dchen at fedoraproject.org  Wed Dec 16 07:50:20 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 16 Dec 2009 07:50:20 +0000 (UTC)
Subject: rpms/man-pages-ko/F-11 import.log, 1.4, 1.5 man-pages-ko.spec, 1.22,
	1.23
Message-ID: <20091216075020.40C0F11C02BB@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-ko/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14707/F-11

Modified Files:
	import.log man-pages-ko.spec 
Log Message:
Fix path and URL


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	27 Oct 2008 00:16:25 -0000	1.4
+++ import.log	16 Dec 2009 07:50:20 -0000	1.5
@@ -2,3 +2,4 @@ man-pages-ko-20050219-4_fc9:HEAD:man-pag
 man-pages-ko-20050219-5_fc9:HEAD:man-pages-ko-20050219-5.fc9.src.rpm:1221462843
 man-pages-ko-20050219-6_fc9:HEAD:man-pages-ko-20050219-6.fc9.src.rpm:1225065418
 man-pages-ko-20050219-7_fc9:HEAD:man-pages-ko-20050219-7.fc9.src.rpm:1225066558
+man-pages-ko-20050219-10_fc12:F-11:man-pages-ko-20050219-10.fc12.src.rpm:1260949802


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-11/man-pages-ko.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- man-pages-ko.spec	25 Feb 2009 23:13:47 -0000	1.22
+++ man-pages-ko.spec	16 Dec 2009 07:50:20 -0000	1.23
@@ -1,13 +1,13 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 8%{?dist}
+Release: 10%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
 #Vendor: Korean Manpage Project Team.
 URL: http://man.kldp.org/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://kldp.net/frs/download.php/1918/%{name}-%{version}.tar.gz
 Source1: Man_Page_Copyright
 #Source1:http://man.kldp.org/wiki/ManPageCopyright
 Patch0: %{name}-%{version}.patch
@@ -31,7 +31,7 @@ is maintained by Korean Manpage Project 
 %setup -q -c %{name}-%{version}
 %patch0 -p0 -b .bak
 find . -name CVS -exec rm -rf {} \;
-cp ../../SOURCES/Man_Page_Copyright COPYING
+cp %{SOURCE1} COPYING
 
 #conflict with man
 rm -f ./man1/man.1 ./man1/whatis.1 ./man5/man.config.5 
@@ -86,6 +86,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/ko
 
 %changelog
+* Wed Dec 16 2009 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-10
+- Add full URL to source.
+- Fixed the Source1 path.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:20050219-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:20050219-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From petersen at fedoraproject.org  Wed Dec 16 07:58:28 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Dec 2009 07:58:28 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.116,1.117
Message-ID: <20091216075828.D914D11C0092@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15961

Modified Files:
	ghc.spec 
Log Message:
require ghc-rpm-macros-0.3.1 and use ghc_version_override


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- ghc.spec	12 Dec 2009 11:34:17 -0000	1.116
+++ ghc.spec	16 Dec 2009 07:58:28 -0000	1.117
@@ -40,7 +40,7 @@ Obsoletes: ghc682, ghc681, haddock09
 # introduced for f11 and can be removed for f13:
 Obsoletes: haddock < %{haddock_version}, ghc-haddock-devel < %{haddock_version}
 Provides: haddock = %{haddock_version}
-BuildRequires: ghc, happy, ghc-rpm-macros >= 0.3.0
+BuildRequires: ghc, happy, ghc-rpm-macros >= 0.3.1
 BuildRequires: gmp-devel, ncurses-devel
 Requires: gcc, gmp-devel
 %if %{with shared}
@@ -211,7 +211,7 @@ cat rpm-lib-dir.files rpm-lib.files > gh
 cat rpm-dev-dir.files rpm-base.files > ghc.files
 
 # subpackage ghc library
-%define ghc_version %{version}
+%define ghc_version_override %{version}
 %ghc_gen_filelists ghc-ghc %{version}
 
 # these are handled as alternatives
@@ -347,13 +347,14 @@ fi
 %endif
 
 %changelog
-* Sat Dec 12 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.3
+* Wed Dec 16 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.3
 - exclude ghc .conf file from package.conf.d in base package
 - use ghc_reindex_haddock
 - add scripts for ghc-ghc-devel and ghc-ghc-doc
 - add doc bcond
 - add ghc-6.12.1-gen_contents_index-haddock-path.patch to adjust haddock path
   since we removed html/ from libraries path
+- require ghc-rpm-macros-0.3.1 and use ghc_version_override
 
 * Sat Dec 12 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.2
 - remove redundant mingw and perl from ghc-tarballs/



From petersen at fedoraproject.org  Wed Dec 16 08:11:43 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Dec 2009 08:11:43 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.117,1.118
Message-ID: <20091216081143.A795911C0092@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17951

Modified Files:
	ghc.spec 
Log Message:
pre became 6.12.1 final


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- ghc.spec	16 Dec 2009 07:58:28 -0000	1.117
+++ ghc.spec	16 Dec 2009 08:11:43 -0000	1.118
@@ -24,7 +24,7 @@
 Name: ghc
 # break of haskell-platform-2009.2.0.2
 Version: 6.12.1
-Release: 0.3%{?dist}
+Release: 1%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -347,7 +347,8 @@ fi
 %endif
 
 %changelog
-* Wed Dec 16 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-0.3
+* Wed Dec 16 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-1
+- pre promoted to 6.12.1 final
 - exclude ghc .conf file from package.conf.d in base package
 - use ghc_reindex_haddock
 - add scripts for ghc-ghc-devel and ghc-ghc-doc



From kkofler at fedoraproject.org  Wed Dec 16 09:05:13 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 09:05:13 +0000 (UTC)
Subject: rpms/arts/devel arts-1.5.10-cpu-overload-quiet.patch, NONE,
	1.1 arts.spec, 1.100, 1.101
Message-ID: <20091216090513.0A5CF11C0092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/arts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25991/devel

Modified Files:
	arts.spec 
Added Files:
	arts-1.5.10-cpu-overload-quiet.patch 
Log Message:
* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-11
- don't pop up a dialog on CPU overload (#361891)

arts-1.5.10-cpu-overload-quiet.patch:
 cpuusage.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE arts-1.5.10-cpu-overload-quiet.patch ---
diff -ur arts-1.5.10/soundserver/cpuusage.cc arts-1.5.10-cpu-overload-quiet/soundserver/cpuusage.cc
--- arts-1.5.10/soundserver/cpuusage.cc	2005-09-10 10:13:31.000000000 +0200
+++ arts-1.5.10-cpu-overload-quiet/soundserver/cpuusage.cc	2009-12-16 09:28:14.000000000 +0100
@@ -24,6 +24,7 @@
 #include "dispatcher.h"
 #include "debug.h"
 
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -121,7 +122,7 @@
 
 		// ok, cancel synthesis due to cpu overload! brutal method
 		if(d->stalled > 15)
-			arts_fatal("cpu overload, aborting");
+			exit(1);
 	}
 
 	// prepare for next checkpoint


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/arts.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- arts.spec	10 Dec 2009 16:18:45 -0000	1.100
+++ arts.spec	16 Dec 2009 09:05:12 -0000	1.101
@@ -10,7 +10,7 @@ Summary: aRts (analog realtime synthesiz
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -24,6 +24,8 @@ Patch5: arts-1.3.1-alsa.patch
 Patch6: arts-1.5.8-glibc.patch
 Patch7: arts-1.5.0-check_tmp_dir.patch
 Patch8: arts-1.5.2-multilib.patch
+# don't pop up a dialog on CPU overload (#361891)
+Patch9: arts-1.5.10-cpu-overload-quiet.patch
 # kde#93359
 Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
@@ -82,6 +84,7 @@ Install %{name}-devel if you intend to w
 %patch6 -p1 -b .glibc
 %patch7 -p1 -b .check_tmp_dir
 %patch8 -p1 -b .multilib
+%patch9 -p1 -b .cpu-overload-quiet
 
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
@@ -193,6 +196,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-11
+- don't pop up a dialog on CPU overload (#361891)
+
 * Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
 - patch autoconfigury to build with autoconf >= 2.64
 



From jreznik at fedoraproject.org  Wed Dec 16 09:06:51 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 09:06:51 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.97,1.98
Message-ID: <20091216090651.AF6D911C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26338

Modified Files:
	kdeaccessibility.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
- Repositioning the KDE Brand (#547361)



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kdeaccessibility.spec	1 Dec 2009 14:30:26 -0000	1.97
+++ kdeaccessibility.spec	16 Dec 2009 09:06:51 -0000	1.98
@@ -1,8 +1,8 @@
-Summary:        K Desktop Environment - Accessibility
+Summary:        KDE Accessibility
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.3.80
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -144,6 +144,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
+- Repositioning the KDE Brand (#547361)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From eseyman at fedoraproject.org  Wed Dec 16 09:08:03 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 16 Dec 2009 09:08:03 +0000 (UTC)
Subject: File CGI-Application-Plugin-FormState-0.12.tar.gz uploaded to
	lookaside cache by eseyman
Message-ID: <20091216090803.5FA8928ED18@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-CGI-Application-Plugin-FormState:

63caf11eee423113e51f11ede9837713  CGI-Application-Plugin-FormState-0.12.tar.gz



From eseyman at fedoraproject.org  Wed Dec 16 09:08:44 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 16 Dec 2009 09:08:44 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-FormState/devel import.log, NONE, 
	1.1 perl-CGI-Application-Plugin-FormState.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216090844.BD2D011C0092@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26800/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-FormState.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-FormState-0_12-1_fc12:HEAD:perl-CGI-Application-Plugin-FormState-0.12-1.fc12.src.rpm:1260954492


--- NEW FILE perl-CGI-Application-Plugin-FormState.spec ---
Name:           perl-CGI-Application-Plugin-FormState
Version:        0.12
Release:        1%{?dist}
Summary:        Store Form State without Hidden Fields
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-FormState/
Source0:        http://www.cpan.org/authors/id/M/MG/MGRAHAM/CGI-Application-Plugin-FormState-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI)
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(CGI::Application::Plugin::Session)
BuildRequires:  perl(CGI::Session)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::FormState provides a temporary storage area
within the user's session for storing form-related data.

%prep
%setup -q -n CGI-Application-Plugin-FormState-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Dec 13 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.12-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:26:10 -0000	1.1
+++ .cvsignore	16 Dec 2009 09:08:44 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-FormState-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:26:10 -0000	1.1
+++ sources	16 Dec 2009 09:08:44 -0000	1.2
@@ -0,0 +1 @@
+63caf11eee423113e51f11ede9837713  CGI-Application-Plugin-FormState-0.12.tar.gz



From eseyman at fedoraproject.org  Wed Dec 16 09:09:55 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 16 Dec 2009 09:09:55 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-FormState/F-12 import.log, NONE,
	1.1 perl-CGI-Application-Plugin-FormState.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216090955.379CF11C0092@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27138/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-FormState.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-FormState-0_12-1_fc12:F-12:perl-CGI-Application-Plugin-FormState-0.12-1.fc12.src.rpm:1260954576


--- NEW FILE perl-CGI-Application-Plugin-FormState.spec ---
Name:           perl-CGI-Application-Plugin-FormState
Version:        0.12
Release:        1%{?dist}
Summary:        Store Form State without Hidden Fields
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-FormState/
Source0:        http://www.cpan.org/authors/id/M/MG/MGRAHAM/CGI-Application-Plugin-FormState-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI)
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(CGI::Application::Plugin::Session)
BuildRequires:  perl(CGI::Session)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::FormState provides a temporary storage area
within the user's session for storing form-related data.

%prep
%setup -q -n CGI-Application-Plugin-FormState-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Dec 13 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.12-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:26:10 -0000	1.1
+++ .cvsignore	16 Dec 2009 09:09:55 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-FormState-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:26:10 -0000	1.1
+++ sources	16 Dec 2009 09:09:55 -0000	1.2
@@ -0,0 +1 @@
+63caf11eee423113e51f11ede9837713  CGI-Application-Plugin-FormState-0.12.tar.gz



From cwickert at fedoraproject.org  Wed Dec 16 09:10:59 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 16 Dec 2009 09:10:59 +0000 (UTC)
Subject: File lxpanel-0.5.4.1.tar.gz uploaded to lookaside cache by cwickert
Message-ID: <20091216091059.30C2528ED0E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for lxpanel:

bdc0db6f692a7e13024cb17f9710bd6e  lxpanel-0.5.4.1.tar.gz



From eseyman at fedoraproject.org  Wed Dec 16 09:12:46 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 16 Dec 2009 09:12:46 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-FormState/F-11 import.log, NONE,
	1.1 perl-CGI-Application-Plugin-FormState.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216091246.A5F9E11C0092@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28002/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-FormState.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-FormState-0_12-1_fc12:F-11:perl-CGI-Application-Plugin-FormState-0.12-1.fc12.src.rpm:1260954636


--- NEW FILE perl-CGI-Application-Plugin-FormState.spec ---
Name:           perl-CGI-Application-Plugin-FormState
Version:        0.12
Release:        1%{?dist}
Summary:        Store Form State without Hidden Fields
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-FormState/
Source0:        http://www.cpan.org/authors/id/M/MG/MGRAHAM/CGI-Application-Plugin-FormState-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI)
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(CGI::Application::Plugin::Session)
BuildRequires:  perl(CGI::Session)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
CGI::Application::Plugin::FormState provides a temporary storage area
within the user's session for storing form-related data.

%prep
%setup -q -n CGI-Application-Plugin-FormState-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Dec 13 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.12-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:26:10 -0000	1.1
+++ .cvsignore	16 Dec 2009 09:12:46 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-FormState-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-FormState/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:26:10 -0000	1.1
+++ sources	16 Dec 2009 09:12:46 -0000	1.2
@@ -0,0 +1 @@
+63caf11eee423113e51f11ede9837713  CGI-Application-Plugin-FormState-0.12.tar.gz



From oget at fedoraproject.org  Wed Dec 16 09:15:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 16 Dec 2009 09:15:10 +0000 (UTC)
Subject: File zita-convolver-2.0.0.tar.bz2 uploaded to lookaside cache by
	oget
Message-ID: <20091216091510.5B32728ED0E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for zita-convolver:

7e4e30fb628aed009fa22e4ed46f556a  zita-convolver-2.0.0.tar.bz2



From cwickert at fedoraproject.org  Wed Dec 16 09:15:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 16 Dec 2009 09:15:21 +0000 (UTC)
Subject: rpms/lxpanel/devel .cvsignore, 1.17, 1.18 lxpanel.spec, 1.27,
	1.28 sources, 1.17, 1.18
Message-ID: <20091216091521.61FD611C0092@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28538

Modified Files:
	.cvsignore lxpanel.spec sources 
Log Message:
* Wed Dec 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4.1-1
- Update to 0.5.4.1
- Remove upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	12 Dec 2009 01:40:32 -0000	1.17
+++ .cvsignore	16 Dec 2009 09:15:21 -0000	1.18
@@ -1 +1 @@
-lxpanel-0.5.4.tar.gz
+lxpanel-0.5.4.1.tar.gz


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- lxpanel.spec	12 Dec 2009 01:27:18 -0000	1.27
+++ lxpanel.spec	16 Dec 2009 09:15:21 -0000	1.28
@@ -1,10 +1,8 @@
 # Review Request:
 # https://bugzilla.redhat.com/show_bug.cgi?id=219930
 
-#define _default_patch_fuzz 0
-
 Name:           lxpanel
-Version:        0.5.4
+Version:        0.5.4.1
 Release:        1%{?dist}
 Summary:        A lightweight X11 desktop panel
 
@@ -14,11 +12,6 @@ URL:            http://lxde.sourceforge.
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 Patch0:         lxpanel-0.5.4-default.patch
 Patch1:         lxpanel-0.3.8.1-nm-connection-editor.patch
-# http://lxde.svn.sourceforge.net/viewvc/lxde/trunk/lxpanel/po/ca.po?view=patch&r1=2189&r2=2188&pathrev=2189
-# without this build will fail due to an invalid po file
-Patch2:         lxpanel-0.5.4-fix-ca.po.patch
-# without this one configure will break, because cpufreq plugin is no in the tarball
-Patch3:         lxpanel-0.5.4-remove-cpufreq-from-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  docbook-utils
@@ -54,8 +47,6 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -b .default
 %patch1 -p1 -b .system-config-network
-%patch2 -p2 -b .hosed
-%patch3 -p1 -b .cpufreq
 
 
 %build
@@ -87,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
+* Wed Dec 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4.1-1
+- Update to 0.5.4.1
+- Remove upstreamed patches
+
 * Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-1
 - Update to 0.5.4
 - Restore toggle functionality of the show deskop plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	12 Dec 2009 01:40:32 -0000	1.17
+++ sources	16 Dec 2009 09:15:21 -0000	1.18
@@ -1 +1 @@
-48ee6b2904a65eb57087befa85ebd4b7  lxpanel-0.5.4.tar.gz
+bdc0db6f692a7e13024cb17f9710bd6e  lxpanel-0.5.4.1.tar.gz



From oget at fedoraproject.org  Wed Dec 16 09:16:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 16 Dec 2009 09:16:06 +0000 (UTC)
Subject: rpms/zita-convolver/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zita-convolver.spec, 1.2, 1.3
Message-ID: <20091216091606.E491411C0092@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zita-convolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28793

Modified Files:
	.cvsignore sources zita-convolver.spec 
Log Message:
* Wed Dec 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.0-1
- updated to 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2009 06:00:07 -0000	1.2
+++ .cvsignore	16 Dec 2009 09:16:06 -0000	1.3
@@ -1 +1 @@
-zita-convolver-1.0.0.tar.bz2
+zita-convolver-2.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 May 2009 06:00:07 -0000	1.2
+++ sources	16 Dec 2009 09:16:06 -0000	1.3
@@ -1 +1 @@
-892ef99cf39b6a8e87639efdcd96dbd5  zita-convolver-1.0.0.tar.bz2
+7e4e30fb628aed009fa22e4ed46f556a  zita-convolver-2.0.0.tar.bz2


Index: zita-convolver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/devel/zita-convolver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zita-convolver.spec	27 Jul 2009 09:03:52 -0000	1.2
+++ zita-convolver.spec	16 Dec 2009 09:16:06 -0000	1.3
@@ -1,9 +1,9 @@
-%global libmajor 1
+%global libmajor 2
 
 Summary:       Convolution engine library
 Name:          zita-convolver
-Version:       1.0.0
-Release:       3%{?dist}
+Version:       2.0.0
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         System Environment/Libraries
 URL:           http://www.kokkinizita.net/linuxaudio/
@@ -29,13 +29,17 @@ contains libraries and header files for 
 %setup -q
 
 # No need to call ldconfig during packaging
-sed -i '\|/sbin/ldconfig|d' libs/Makefile
+sed -i '\|ldconfig|d' libs/Makefile
 
 # Preserve timestamps
-sed -i 's|/install|/install -p|' libs/Makefile
+sed -i 's|install |install -p |' libs/Makefile
 
 # Force Fedora's optflags
 sed -i 's|-O3|%{optflags}|' libs/Makefile
+sed -i '/-march=i686/d' libs/Makefile
+%ifnarch %ix86 x86_64
+sed -i '/-msse/d' libs/Makefile
+%endif
 
 %build
 make -C libs PREFIX=%{_prefix} %{?_smp_mflags}
@@ -64,6 +68,9 @@ rm -rf %{buildroot}
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Wed Dec 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.0-1
+- updated to 2.0.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Dec 16 09:16:58 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 16 Dec 2009 09:16:58 +0000 (UTC)
Subject: rpms/zita-convolver/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zita-convolver.spec, 1.2, 1.3
Message-ID: <20091216091658.8655811C0092@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zita-convolver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29052

Modified Files:
	.cvsignore sources zita-convolver.spec 
Log Message:
* Wed Dec 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.0-1
- updated to 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2009 06:00:07 -0000	1.2
+++ .cvsignore	16 Dec 2009 09:16:58 -0000	1.3
@@ -1 +1 @@
-zita-convolver-1.0.0.tar.bz2
+zita-convolver-2.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 May 2009 06:00:07 -0000	1.2
+++ sources	16 Dec 2009 09:16:58 -0000	1.3
@@ -1 +1 @@
-892ef99cf39b6a8e87639efdcd96dbd5  zita-convolver-1.0.0.tar.bz2
+7e4e30fb628aed009fa22e4ed46f556a  zita-convolver-2.0.0.tar.bz2


Index: zita-convolver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/F-12/zita-convolver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zita-convolver.spec	27 Jul 2009 09:03:52 -0000	1.2
+++ zita-convolver.spec	16 Dec 2009 09:16:58 -0000	1.3
@@ -1,9 +1,9 @@
-%global libmajor 1
+%global libmajor 2
 
 Summary:       Convolution engine library
 Name:          zita-convolver
-Version:       1.0.0
-Release:       3%{?dist}
+Version:       2.0.0
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         System Environment/Libraries
 URL:           http://www.kokkinizita.net/linuxaudio/
@@ -29,13 +29,17 @@ contains libraries and header files for 
 %setup -q
 
 # No need to call ldconfig during packaging
-sed -i '\|/sbin/ldconfig|d' libs/Makefile
+sed -i '\|ldconfig|d' libs/Makefile
 
 # Preserve timestamps
-sed -i 's|/install|/install -p|' libs/Makefile
+sed -i 's|install |install -p |' libs/Makefile
 
 # Force Fedora's optflags
 sed -i 's|-O3|%{optflags}|' libs/Makefile
+sed -i '/-march=i686/d' libs/Makefile
+%ifnarch %ix86 x86_64
+sed -i '/-msse/d' libs/Makefile
+%endif
 
 %build
 make -C libs PREFIX=%{_prefix} %{?_smp_mflags}
@@ -64,6 +68,9 @@ rm -rf %{buildroot}
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Wed Dec 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.0-1
+- updated to 2.0.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Dec 16 09:17:39 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 16 Dec 2009 09:17:39 +0000 (UTC)
Subject: rpms/zita-convolver/F-11 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zita-convolver.spec, 1.1, 1.2
Message-ID: <20091216091739.2685F11C0092@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zita-convolver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29323

Modified Files:
	.cvsignore sources zita-convolver.spec 
Log Message:
* Wed Dec 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.0-1
- updated to 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2009 06:01:38 -0000	1.2
+++ .cvsignore	16 Dec 2009 09:17:39 -0000	1.3
@@ -1 +1 @@
-zita-convolver-1.0.0.tar.bz2
+zita-convolver-2.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 May 2009 06:01:38 -0000	1.2
+++ sources	16 Dec 2009 09:17:39 -0000	1.3
@@ -1 +1 @@
-892ef99cf39b6a8e87639efdcd96dbd5  zita-convolver-1.0.0.tar.bz2
+7e4e30fb628aed009fa22e4ed46f556a  zita-convolver-2.0.0.tar.bz2


Index: zita-convolver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zita-convolver/F-11/zita-convolver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zita-convolver.spec	13 May 2009 06:01:38 -0000	1.1
+++ zita-convolver.spec	16 Dec 2009 09:17:39 -0000	1.2
@@ -1,9 +1,9 @@
-%global libmajor 1
+%global libmajor 2
 
 Summary:       Convolution engine library
 Name:          zita-convolver
-Version:       1.0.0
-Release:       2%{?dist}
+Version:       2.0.0
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         System Environment/Libraries
 URL:           http://www.kokkinizita.net/linuxaudio/
@@ -29,13 +29,17 @@ contains libraries and header files for 
 %setup -q
 
 # No need to call ldconfig during packaging
-sed -i '\|/sbin/ldconfig|d' libs/Makefile
+sed -i '\|ldconfig|d' libs/Makefile
 
 # Preserve timestamps
-sed -i 's|/install|/install -p|' libs/Makefile
+sed -i 's|install |install -p |' libs/Makefile
 
 # Force Fedora's optflags
 sed -i 's|-O3|%{optflags}|' libs/Makefile
+sed -i '/-march=i686/d' libs/Makefile
+%ifnarch %ix86 x86_64
+sed -i '/-msse/d' libs/Makefile
+%endif
 
 %build
 make -C libs PREFIX=%{_prefix} %{?_smp_mflags}
@@ -64,6 +68,12 @@ rm -rf %{buildroot}
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Wed Dec 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.0.0-1
+- updated to 2.0.0
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.0.0-2
 - prepare package for Fedora submission (SPEC file from PlanetCCRMA)
 



From kkofler at fedoraproject.org  Wed Dec 16 09:28:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 09:28:25 +0000 (UTC)
Subject: rpms/arts/F-11 arts-1.5.10-cpu-overload-quiet.patch, NONE,
	1.1 arts-acinclude.patch, NONE, 1.1 arts.spec, 1.94, 1.95
Message-ID: <20091216092825.B03DD11C0092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/arts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31121/F-11

Modified Files:
	arts.spec 
Added Files:
	arts-1.5.10-cpu-overload-quiet.patch arts-acinclude.patch 
Log Message:
Sync from devel:

* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-11
- don't pop up a dialog on CPU overload (#361891)

* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
- patch autoconfigury to build with autoconf >= 2.64

arts-1.5.10-cpu-overload-quiet.patch:
 cpuusage.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE arts-1.5.10-cpu-overload-quiet.patch ---
diff -ur arts-1.5.10/soundserver/cpuusage.cc arts-1.5.10-cpu-overload-quiet/soundserver/cpuusage.cc
--- arts-1.5.10/soundserver/cpuusage.cc	2005-09-10 10:13:31.000000000 +0200
+++ arts-1.5.10-cpu-overload-quiet/soundserver/cpuusage.cc	2009-12-16 09:28:14.000000000 +0100
@@ -24,6 +24,7 @@
 #include "dispatcher.h"
 #include "debug.h"
 
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -121,7 +122,7 @@
 
 		// ok, cancel synthesis due to cpu overload! brutal method
 		if(d->stalled > 15)
-			arts_fatal("cpu overload, aborting");
+			exit(1);
 	}
 
 	// prepare for next checkpoint

arts-acinclude.patch:
 acinclude.m4.in |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE arts-acinclude.patch ---
2009-12-10  Stepan Kasal  <skasal at redhat.com>

The change of implementation of AC_REQUIRE in 2.64 caused a regression
in the arts project.
This can be fixed by shuffling some macro calls.

I suppose that most of this patch will not be needed with a future
release of Autoconf.
But the last chunk of this patch is a real bug in this source and
should go upstream.

--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
@@ -3081,8 +3081,18 @@
 fi
 ])
 
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
+[ 
+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+  CFLAGS=" $CFLAGS"
+  AC_PROG_CC
+  CXXFLAGS=" $CXXFLAGS"
+  AC_PROG_CXX
+])
+
 AC_DEFUN([AC_CHECK_COMPILERS],
 [
+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
   AC_ARG_ENABLE(debug,
 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
@@ -3141,11 +3151,6 @@
     [kde_use_profiling="no"]
   )
 
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
   AC_PROG_CPP
 
   if test "$GCC" = "yes"; then
@@ -3174,10 +3179,6 @@
      LDFLAGS=""
   fi
 
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
   KDE_CHECK_FOR_BAD_COMPILER
 
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
@@ -3503,8 +3504,8 @@
 AC_REQUIRE([AC_LIBTOOL_DLOPEN])
 AC_REQUIRE([KDE_CHECK_LIB64])
 
-AC_OBJEXT
-AC_EXEEXT
+AC_REQUIRE([AC_OBJEXT])
+AC_REQUIRE([AC_EXEEXT])
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-11/arts.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- arts.spec	7 Dec 2009 14:54:20 -0000	1.94
+++ arts.spec	16 Dec 2009 09:28:25 -0000	1.95
@@ -10,7 +10,7 @@ Summary: aRts (analog realtime synthesiz
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 9%{?dist}
+Release: 11%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -24,6 +24,8 @@ Patch5: arts-1.3.1-alsa.patch
 Patch6: arts-1.5.8-glibc.patch
 Patch7: arts-1.5.0-check_tmp_dir.patch
 Patch8: arts-1.5.2-multilib.patch
+# don't pop up a dialog on CPU overload (#361891)
+Patch9: arts-1.5.10-cpu-overload-quiet.patch
 # kde#93359
 Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
@@ -33,6 +35,9 @@ Patch51: kde-3.5-libtool-shlibext.patch
 # CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
 Patch200: libltdl-CVE-2009-3736.patch
 
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: arts-acinclude.patch
+
 # used in artsdsp
 Requires: which
 
@@ -79,12 +84,17 @@ Install %{name}-devel if you intend to w
 %patch6 -p1 -b .glibc
 %patch7 -p1 -b .check_tmp_dir
 %patch8 -p1 -b .multilib
+%patch9 -p1 -b .cpu-overload-quiet
 
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
 
 %patch200 -p1 -b .CVE-2009-3736
 
+%patch300 -p1 -b .acinclude
+
+%build
+
 %if %{make_cvs}
 # hack/fix for newer automake
   sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
@@ -92,7 +102,6 @@ Install %{name}-devel if you intend to w
 %endif
 
 
-%build
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
@@ -187,6 +196,12 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-11
+- don't pop up a dialog on CPU overload (#361891)
+
+* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
+- patch autoconfigury to build with autoconf >= 2.64
+
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
 - fix url
 - fix security issues in libltdl (CVE-2009-3736)



From kkofler at fedoraproject.org  Wed Dec 16 09:28:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 09:28:25 +0000 (UTC)
Subject: rpms/arts/F-12 arts-1.5.10-cpu-overload-quiet.patch, NONE,
	1.1 arts-acinclude.patch, NONE, 1.1 arts.spec, 1.100, 1.101
Message-ID: <20091216092825.D4D2211C0092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/arts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31121/F-12

Modified Files:
	arts.spec 
Added Files:
	arts-1.5.10-cpu-overload-quiet.patch arts-acinclude.patch 
Log Message:
Sync from devel:

* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-11
- don't pop up a dialog on CPU overload (#361891)

* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
- patch autoconfigury to build with autoconf >= 2.64

arts-1.5.10-cpu-overload-quiet.patch:
 cpuusage.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE arts-1.5.10-cpu-overload-quiet.patch ---
diff -ur arts-1.5.10/soundserver/cpuusage.cc arts-1.5.10-cpu-overload-quiet/soundserver/cpuusage.cc
--- arts-1.5.10/soundserver/cpuusage.cc	2005-09-10 10:13:31.000000000 +0200
+++ arts-1.5.10-cpu-overload-quiet/soundserver/cpuusage.cc	2009-12-16 09:28:14.000000000 +0100
@@ -24,6 +24,7 @@
 #include "dispatcher.h"
 #include "debug.h"
 
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -121,7 +122,7 @@
 
 		// ok, cancel synthesis due to cpu overload! brutal method
 		if(d->stalled > 15)
-			arts_fatal("cpu overload, aborting");
+			exit(1);
 	}
 
 	// prepare for next checkpoint

arts-acinclude.patch:
 acinclude.m4.in |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE arts-acinclude.patch ---
2009-12-10  Stepan Kasal  <skasal at redhat.com>

The change of implementation of AC_REQUIRE in 2.64 caused a regression
in the arts project.
This can be fixed by shuffling some macro calls.

I suppose that most of this patch will not be needed with a future
release of Autoconf.
But the last chunk of this patch is a real bug in this source and
should go upstream.

--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
@@ -3081,8 +3081,18 @@
 fi
 ])
 
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
+[ 
+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+  CFLAGS=" $CFLAGS"
+  AC_PROG_CC
+  CXXFLAGS=" $CXXFLAGS"
+  AC_PROG_CXX
+])
+
 AC_DEFUN([AC_CHECK_COMPILERS],
 [
+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
   AC_ARG_ENABLE(debug,
 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
@@ -3141,11 +3151,6 @@
     [kde_use_profiling="no"]
   )
 
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
   AC_PROG_CPP
 
   if test "$GCC" = "yes"; then
@@ -3174,10 +3179,6 @@
      LDFLAGS=""
   fi
 
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
   KDE_CHECK_FOR_BAD_COMPILER
 
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
@@ -3503,8 +3504,8 @@
 AC_REQUIRE([AC_LIBTOOL_DLOPEN])
 AC_REQUIRE([KDE_CHECK_LIB64])
 
-AC_OBJEXT
-AC_EXEEXT
+AC_REQUIRE([AC_OBJEXT])
+AC_REQUIRE([AC_EXEEXT])
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-12/arts.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- arts.spec	7 Dec 2009 14:50:51 -0000	1.100
+++ arts.spec	16 Dec 2009 09:28:25 -0000	1.101
@@ -10,7 +10,7 @@ Summary: aRts (analog realtime synthesiz
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 9%{?dist}
+Release: 11%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -24,6 +24,8 @@ Patch5: arts-1.3.1-alsa.patch
 Patch6: arts-1.5.8-glibc.patch
 Patch7: arts-1.5.0-check_tmp_dir.patch
 Patch8: arts-1.5.2-multilib.patch
+# don't pop up a dialog on CPU overload (#361891)
+Patch9: arts-1.5.10-cpu-overload-quiet.patch
 # kde#93359
 Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
@@ -33,6 +35,9 @@ Patch51: kde-3.5-libtool-shlibext.patch
 # CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
 Patch200: libltdl-CVE-2009-3736.patch
 
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: arts-acinclude.patch
+
 # used in artsdsp
 Requires: which
 
@@ -79,12 +84,17 @@ Install %{name}-devel if you intend to w
 %patch6 -p1 -b .glibc
 %patch7 -p1 -b .check_tmp_dir
 %patch8 -p1 -b .multilib
+%patch9 -p1 -b .cpu-overload-quiet
 
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
 
 %patch200 -p1 -b .CVE-2009-3736
 
+%patch300 -p1 -b .acinclude
+
+%build
+
 %if %{make_cvs}
 # hack/fix for newer automake
   sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
@@ -92,7 +102,6 @@ Install %{name}-devel if you intend to w
 %endif
 
 
-%build
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
@@ -187,6 +196,12 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-11
+- don't pop up a dialog on CPU overload (#361891)
+
+* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
+- patch autoconfigury to build with autoconf >= 2.64
+
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
 - fix url
 - fix security issues in libltdl (CVE-2009-3736)



From cwickert at fedoraproject.org  Wed Dec 16 09:30:45 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 16 Dec 2009 09:30:45 +0000 (UTC)
Subject: rpms/lxpanel/devel lxpanel-0.5.4-fix-ca.po.patch, 1.1,
	NONE lxpanel-0.5.4-remove-cpufreq-from-configure.patch, 1.1, NONE
Message-ID: <20091216093045.4B11511C02B9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31740

Removed Files:
	lxpanel-0.5.4-fix-ca.po.patch 
	lxpanel-0.5.4-remove-cpufreq-from-configure.patch 
Log Message:
remove obsolete patches


--- lxpanel-0.5.4-fix-ca.po.patch DELETED ---


--- lxpanel-0.5.4-remove-cpufreq-from-configure.patch DELETED ---



From eseyman at fedoraproject.org  Wed Dec 16 09:32:15 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 16 Dec 2009 09:32:15 +0000 (UTC)
Subject: File CGI-Application-Plugin-Config-Simple-1.01.tar.gz uploaded to
	lookaside cache by eseyman
Message-ID: <20091216093215.4B3EF28ECE8@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-CGI-Application-Plugin-Config-Simple:

6d2aeb258474871f13fcaf66e918a386  CGI-Application-Plugin-Config-Simple-1.01.tar.gz



From eseyman at fedoraproject.org  Wed Dec 16 09:33:42 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 16 Dec 2009 09:33:42 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Config-Simple/devel import.log,
	NONE, 1.1 perl-CGI-Application-Plugin-Config-Simple.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216093342.D796A11C0092@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32292/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-Config-Simple.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-Config-Simple-1_01-1_fc12:HEAD:perl-CGI-Application-Plugin-Config-Simple-1.01-1.fc12.src.rpm:1260955944


--- NEW FILE perl-CGI-Application-Plugin-Config-Simple.spec ---
Name:           perl-CGI-Application-Plugin-Config-Simple
Version:        1.01
Release:        1%{?dist}
Summary:        Add Config::Simple support to CGI::Application
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-Config-Simple/
Source0:        http://www.cpan.org/authors/id/W/WO/WONKO/CGI-Application-Plugin-Config-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(Config::Simple)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module acts as a plugin for Config::Simple to be easily used inside of
a CGI::Application module. It does not provide every method available from
Config::Simple but rather easy access to your configuration variables. It
does however provide direct access to the underlying Config::General object
created if you want to use it's full power.

%prep
%setup -q -n CGI-Application-Plugin-Config-Simple-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
# t/main.t greps for 'Permission denied.'
LANG=C ./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Dec 13 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.01-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:27:14 -0000	1.1
+++ .cvsignore	16 Dec 2009 09:33:42 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-Config-Simple-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:27:14 -0000	1.1
+++ sources	16 Dec 2009 09:33:42 -0000	1.2
@@ -0,0 +1 @@
+6d2aeb258474871f13fcaf66e918a386  CGI-Application-Plugin-Config-Simple-1.01.tar.gz



From stevetraylen at fedoraproject.org  Wed Dec 16 09:39:54 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 16 Dec 2009 09:39:54 +0000 (UTC)
Subject: rpms/torque/EL-4 pbs-config-multilib, NONE, 1.1 sources, 1.10,
	1.11 torque.spec, 1.12, 1.13 torque-2.1.0-remove-rpath.path, 1.1,
	NONE torque-2.1.0p0-mom_sync_jobs-fixes.patch, 1.1,
	NONE torque-2.1.0p0-sched-offbyone.patch, 1.1,
	NONE torque-2.1.2-pam-getpwnam.patch, 1.1, NONE
Message-ID: <20091216093954.3375E11C0092@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/torque/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv818

Modified Files:
	sources torque.spec 
Added Files:
	pbs-config-multilib 
Removed Files:
	torque-2.1.0-remove-rpath.path 
	torque-2.1.0p0-mom_sync_jobs-fixes.patch 
	torque-2.1.0p0-sched-offbyone.patch 
	torque-2.1.2-pam-getpwnam.patch 
Log Message:
Update to 2.3.8



--- NEW FILE pbs-config-multilib ---
#! /bin/sh
 
package="pbs"
version="2.3.8"
 
prefix="/usr"
exec_prefix="/usr"
bindir="/usr/bin"
sbindir="/usr/sbin"
libexecdir="/usr/libexec"
datadir="/usr/share"
sysconfdir="/etc"
sharedstatedir="/usr/com"
localstatedir="/var"
infodir="/usr/share/info"
mandir="/usr/share/man"
includedir="/usr/include/torque"
libs="-ltorque"
 
if test "$#" -eq 0; then
   cat <<EOF
Usage: $package-config OPTIONS
Options:
  --prefix=DIR) : \$prefix
  --package) : \$package
  --version) : \$version
  --cflags) : -I\$includedir
  --libs) : \$libs
  --help) print all the options (not just these)
EOF
fi
 
o=""
h=""
for i in "$@"; do
  case $i in
  --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;
  --prefix)    o="$o $prefix" ;;
  --package)   o="$o $package" ;;
  --version)   o="$o $version" ;;
  --cflags) if test "_$includedir" != "_/usr/include"
          then o="$o -I$includedir" ; fi
  ;;
  --libs)                  o="$o $libs" ;;
  --exec_prefix|--eprefix) o="$o $exec_prefix" ;;
  --bindir)                o="$o $bindir" ;;
  --sbindir)               o="$o $sbindir" ;;
  --libexecdir)            o="$o $libexecdir" ;;
  --datadir)               o="$o $datadir" ;;
  --datainc)               o="$o -I$datadir" ;;
  --datalib)               o="$o -L$datadir" ;;
  --sysconfdir)            o="$o $sysconfdir" ;;
  --sharedstatedir)        o="$o $sharedstatedir" ;;
  --localstatedir)         o="$o $localstatedir" ;;
  --infodir)               o="$o $infodir" ;;
  --mandir)                o="$o $mandir" ;;
  --includedir)            o="$o $includedir" ;;
  --data)                  o="$o -I$datadir/$package" ;;
  --pkgdatadir)            o="$o $datadir/$package" ;;
  --pkgdatainc)            o="$o -I$datadir/$package" ;;
  --pkgdatalib)            o="$o -L$datadir/$package" ;;
  --pkglibinc)             o="$o -I$libinc/$package" ;;
  --pkglibadd)             o="$o -L$libadd/$package" ;;
  --pkgincludedir)         o="$o $includedir/$package" ;;
  --help) h="1" ;;
  -?//*|-?/*//*|-?./*//*|//*|/*//*|./*//*) 
       v=`echo $i | sed -e s://:\$:g`
       v=`eval "echo $v"` 
       o="$o $v" ;; 
  esac
done
 
o=`eval "echo $o"`
o=`eval "echo $o"`
eval "echo $o"
 
if test ! -z "$h" ; then 
cat <<EOF
  --prefix=xxx)      (what is that for anyway?)
  --prefix)         \$prefix        $prefix
  --package)        \$package       $package
  --version)        \$version       $version
  --cflags)         -I\$includedir    unless it is /usr/include
  --libs)           -l\$PACKAGE \$LIBS
  --exec_prefix) or... 
  --eprefix)        \$exec_prefix   $exec_prefix
  --bindir)         \$bindir        $bindir
  --sbindir)        \$sbindir       $sbindir
  --libexecdir)     \$libexecdir    $libexecdir
  --datadir)        \$datadir       $datadir
  --sysconfdir)     \$sysconfdir    $sysconfdir
  --sharedstatedir) \$sharedstatedir$sharedstatedir
  --localstatedir)  \$localstatedir $localstatedir
  --infodir)        \$infodir       $infodir
  --mandir)         \$mandir        $mandir
  --data)           -I\$datadir/\$package
  --pkgdatadir)     \$datadir/\$package
  --pkgincludedir)  \$includedir/\$package
  --help)           generated by ac_create_generic_config.m4
  -I//varname and other inc-targets like --pkgdatainc supported
  -L//varname and other lib-targets, e.g. --pkgdatalib or --libadd
EOF
fi


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	25 Oct 2006 01:07:18 -0000	1.10
+++ sources	16 Dec 2009 09:39:53 -0000	1.11
@@ -1 +1 @@
-abfeb1a3a5aa53f725f975c2b5d98e1e  torque-2.1.6.tar.gz
+3497ff80e900c1249279d96341cb9d00  torque-2.3.8.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torque/EL-4/torque.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- torque.spec	25 Oct 2006 01:07:18 -0000	1.12
+++ torque.spec	16 Dec 2009 09:39:54 -0000	1.13
@@ -1,7 +1,7 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.1.6
+%define version 2.3.8
 #%%define snap 200604251602
 %define release 1
 
@@ -91,13 +91,15 @@ Source3: xpbsmon.desktop
 Source4: xpbs.png
 Source5: xpbsmon.png
 Source6: README-localhost
-Patch1: torque-2.1.0-remove-rpath.path
-License: Freely redistributable (See PBS_License.txt)
+Source7: pbs-config-multilib
+License: OpenPBS
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: pbs
 BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
+Requires(posttrans): /usr/sbin/alternatives
+Requires(preun): /usr/sbin/alternatives
 Conflicts: pbspro, openpbs, openpbs-oscar
 Obsoletes: torque-localhost
 
@@ -120,28 +122,31 @@ This package holds just a few shared fil
 
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
-%patch1 -p1
 
-%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
+%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
 
 
 %build
-%configure --includedir=%{_includedir}/torque \
+%configure  --disable-gcc-warnings \
+  --includedir=%{_includedir}/torque \
   --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
+  --with-sendmail=/usr/sbin/sendmail \
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
+%__cp -vf pbs-config-multilib pbs-config
 %__make %{?_smp_mflags}
  
 
 
 %install
 %__rm -rf "$RPM_BUILD_ROOT"
-%__make DESTDIR=$RPM_BUILD_ROOT install
+%__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 # remove files we don't need
 %__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
 %__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex
-%{__rm} -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
+%__rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
+touch -r pbs-config-multilib $RPM_BUILD_ROOT/%{_bindir}/pbs-config
 
 # install initscripts
 %__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
@@ -172,6 +177,15 @@ desktop-file-install --vendor fedora    
 %endif
 
 
+# alternatives stuff
+for bin in qalter qdel qhold qrls qselect qstat qsub
+do
+    mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-torque
+    mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 \
+       $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-torque.1
+done
+
+
 %clean
 %__rm -rf "$RPM_BUILD_ROOT"
 
@@ -181,16 +195,16 @@ if %__grep -q "PBS services" /etc/servic
    : PBS services already installed
 else
    cat<<-__EOF__>>/etc/services
-	# Standard PBS services
-	pbs           15001/tcp           # pbs server (pbs_server)
-	pbs           15001/udp           # pbs server (pbs_server)
-	pbs_mom       15002/tcp           # mom to/from server
-	pbs_mom       15002/udp           # mom to/from server
-	pbs_resmom    15003/tcp           # mom resource management requests
-	pbs_resmom    15003/udp           # mom resource management requests
-	pbs_sched     15004/tcp           # scheduler
-	pbs_sched     15004/udp           # scheduler
-	__EOF__
+# Standard PBS services
+pbs           15001/tcp           # pbs server (pbs_server)
+pbs           15001/udp           # pbs server (pbs_server)
+pbs_mom       15002/tcp           # mom to/from server
+pbs_mom       15002/udp           # mom to/from server
+pbs_resmom    15003/tcp           # mom resource management requests
+pbs_resmom    15003/udp           # mom resource management requests
+pbs_sched     15004/tcp           # scheduler
+pbs_sched     15004/udp           # scheduler
+__EOF__
 fi
 
 
@@ -217,6 +231,13 @@ This package holds the documentation fil
 %defattr(-, root, root)
 %doc doc/admin_guide.ps
 %{_mandir}/man*/*
+%exclude %{_mandir}/man1/qsub-torque.1.gz
+%exclude %{_mandir}/man1/qalter-torque.1.gz
+%exclude %{_mandir}/man1/qdel-torque.1.gz
+%exclude %{_mandir}/man1/qhold-torque.1.gz
+%exclude %{_mandir}/man1/qrls-torque.1.gz
+%exclude %{_mandir}/man1/qselect-torque.1.gz
+%exclude %{_mandir}/man1/qstat-torque.1.gz
 
 
 %package scheduler
@@ -231,6 +252,7 @@ This package holds the fifo C scheduler.
 %files scheduler
 %defattr(-, root, root)
 %attr(0755, root, root) %{_sbindir}/pbs_sched
+%attr(0755, root, root) %{_sbindir}/qschedd
 %{_initrddir}/pbs_sched
 %dir %{torquehomedir}/sched_priv
 %config(noreplace) %{torquehomedir}/sched_priv/*
@@ -258,6 +280,7 @@ This package holds the server.
 %files server
 %defattr(-, root, root)
 %attr(0755, root, root) %{_sbindir}/pbs_server
+%attr(0755, root, root) %{_sbindir}/qserverd
 %attr(0755, root, root) %{_sbindir}/momctl
 %{_initrddir}/pbs_server
 %{torquehomedir}/server_logs
@@ -285,6 +308,8 @@ This package holds the execute daemon re
 %files mom
 %defattr(-, root, root)
 %attr(0755, root, root) %{_sbindir}/pbs_mom
+%attr(0755, root, root) %{_sbindir}/qnoded
+%attr(0755, root, root) %{_bindir}/pbs_track
 %{_initrddir}/pbs_mom
 %if %{use_rcp}
 %attr(4755 root root) %{_sbindir}/pbs_rcp
@@ -313,6 +338,34 @@ Provides: pbs-client
 %shared_description
 This package holds the command-line client programs.
 
+%posttrans client
+/usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \
+        --slave %{_mandir}/man1/qsub.1.gz qsub-man \
+                %{_mandir}/man1/qsub-torque.1.gz \
+        --slave %{_bindir}/qalter qalter %{_bindir}/qalter-torque \
+        --slave %{_mandir}/man1/qalter.1.gz qalter-man \
+                %{_mandir}/man1/qalter-torque.1.gz \
+        --slave %{_bindir}/qdel qdel %{_bindir}/qdel-torque \
+        --slave %{_mandir}/man1/qdel.1.gz qdel-man \
+                %{_mandir}/man1/qdel-torque.1.gz \
+        --slave %{_bindir}/qhold qhold %{_bindir}/qhold-torque \
+        --slave %{_mandir}/man1/qhold.1.gz qhold-man \
+                %{_mandir}/man1/qhold-torque.1.gz \
+        --slave %{_bindir}/qrls qrls %{_bindir}/qrls-torque \
+        --slave %{_mandir}/man1/qrls.1.gz qrls-man \
+                %{_mandir}/man1/qrls-torque.1.gz \
+        --slave %{_bindir}/qselect qselect %{_bindir}/qselect-torque \
+        --slave %{_mandir}/man1/qselect.1.gz qselect-man \
+                %{_mandir}/man1/qselect-torque.1.gz \
+        --slave %{_bindir}/qstat qstat %{_bindir}/qstat-torque \
+        --slave %{_mandir}/man1/qstat.1.gz qstat-man \
+                %{_mandir}/man1/qstat-torque.1.gz
+
+%preun client
+if [ $1 -eq 0 ]; then
+  /usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
+fi
+
 %files client
 %defattr(-, root, root)
 %{_bindir}/q*
@@ -323,12 +376,21 @@ This package holds the command-line clie
 %{_bindir}/pbsnodes
 %{_bindir}/printjob
 %{_bindir}/printtracking
+%{_bindir}/printserverdb
 %{_bindir}/tracejob
 %attr(4755 root root) %{_sbindir}/pbs_iff
 %{_sbindir}/pbs_demux
 %if %use_tcl
 %{_bindir}/pbs_tclsh
 %endif
+%{_mandir}/man1/qsub-torque.1.gz
+%{_mandir}/man1/qalter-torque.1.gz
+%{_mandir}/man1/qdel-torque.1.gz
+%{_mandir}/man1/qhold-torque.1.gz
+%{_mandir}/man1/qrls-torque.1.gz
+%{_mandir}/man1/qselect-torque.1.gz
+%{_mandir}/man1/qstat-torque.1.gz
+
 
 %package gui
 Group: Applications/System
@@ -403,6 +465,66 @@ A simple PAM module to authorize users o
 
 
 %changelog
+* Thu Dec 3 2009 Steve Traylen <steve.traylen at cern.ch> - 2.3.8-1
+- Updated to upstream 2.3.8
+- First EPEL build.
+- Add new commands to package.
+   /usr/bin/pbs_track
+   /usr/bin/printserverdb
+   /usr/sbin/qnoded
+   /usr/sbin/qschedd
+   /usr/sbin/qserverd
+- Remove torque-2.1.10-NI_MAXSERV.patch as not needed any more.
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Apr 16 2008 Garrick Staples <garrick at usc.edu> 2.1.10-6
+- add alternatives system
+
+* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 2.1.10-5
+- fix missing NI_MAXSERV on fedora9
+
+* Thu Jan  3 2008 Garrick Staples <garrick at usc.edu> 2.1.10-4
+- correct pbs-config build typo
+
+* Thu Jan  3 2008 Garrick Staples <garrick at usc.edu> 2.1.10-3
+- rebuild because tcl was bumped
+
+* Thu Dec 13 2007 Garrick Staples <garrick at usc.edu> 2.1.10-2
+- fix multilib conflicts
+
+* Wed Dec 12 2007 Garrick Staples <garrick at usc.edu> 2.1.10-1
+- bump to 2.1.10
+
+* Wed Oct  3 2007 Garrick Staples <garrick at usc.edu> 2.1.9-1
+- bump to 2.1.9
+
+* Fri Aug 31 2007 Garrick Staples <garrick at usc.edu> 2.1.8-3
+- correct License tag
+
+* Wed Aug 15 2007 Garrick Staples <garrick at usc.edu> 2.1.8-2
+- correct errors in desktop entry files
+
+* Tue Mar 13 2007 Garrick Staples <garrick at usc.edu> 2.1.8-1
+- bump to 2.1.8
+- ensure daemons have the correct path to sendmail
+- don't need rpath configure patch anymore
+
+* Wed Feb 14 2007 Garrick Staples <garrick at usc.edu> 2.1.6-5
+- rebuilding because tcl8.5 was downgraded to tcl8.4
+
+* Tue Feb  6 2007 Garrick Staples <garrick at usc.edu> 2.1.6-4
+- rebuilding with new tcl
+
+* Sat Feb  3 2007 Garrick Staples <garrick at usc.edu> 2.1.6-3
+- trying to resolve tcl8.5 buildindex issue
+
+* Fri Feb  2 2007 Garrick Staples <garrick at usc.edu> 2.1.6-2
+- rebuild for tcl8.5
+
 * Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
 - fixes more regressions from Friday
 


--- torque-2.1.0-remove-rpath.path DELETED ---


--- torque-2.1.0p0-mom_sync_jobs-fixes.patch DELETED ---


--- torque-2.1.0p0-sched-offbyone.patch DELETED ---


--- torque-2.1.2-pam-getpwnam.patch DELETED ---



From eseyman at fedoraproject.org  Wed Dec 16 09:40:34 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 16 Dec 2009 09:40:34 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Config-Simple/F-12 import.log, NONE,
	1.1 perl-CGI-Application-Plugin-Config-Simple.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216094034.3798D11C0345@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1051/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-Config-Simple.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-Config-Simple-1_01-1_fc12:F-12:perl-CGI-Application-Plugin-Config-Simple-1.01-1.fc12.src.rpm:1260956069


--- NEW FILE perl-CGI-Application-Plugin-Config-Simple.spec ---
Name:           perl-CGI-Application-Plugin-Config-Simple
Version:        1.01
Release:        1%{?dist}
Summary:        Add Config::Simple support to CGI::Application
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-Config-Simple/
Source0:        http://www.cpan.org/authors/id/W/WO/WONKO/CGI-Application-Plugin-Config-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(Config::Simple)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module acts as a plugin for Config::Simple to be easily used inside of
a CGI::Application module. It does not provide every method available from
Config::Simple but rather easy access to your configuration variables. It
does however provide direct access to the underlying Config::General object
created if you want to use it's full power.

%prep
%setup -q -n CGI-Application-Plugin-Config-Simple-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
# t/main.t greps for 'Permission denied.'
LANG=C ./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Dec 13 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.01-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:27:14 -0000	1.1
+++ .cvsignore	16 Dec 2009 09:40:34 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-Config-Simple-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:27:14 -0000	1.1
+++ sources	16 Dec 2009 09:40:34 -0000	1.2
@@ -0,0 +1 @@
+6d2aeb258474871f13fcaf66e918a386  CGI-Application-Plugin-Config-Simple-1.01.tar.gz



From eseyman at fedoraproject.org  Wed Dec 16 09:44:36 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 16 Dec 2009 09:44:36 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-Config-Simple/F-11 import.log, NONE,
	1.1 perl-CGI-Application-Plugin-Config-Simple.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216094436.07C7011C0092@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2496/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-CGI-Application-Plugin-Config-Simple.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-CGI-Application-Plugin-Config-Simple-1_01-1_fc12:F-11:perl-CGI-Application-Plugin-Config-Simple-1.01-1.fc12.src.rpm:1260956545


--- NEW FILE perl-CGI-Application-Plugin-Config-Simple.spec ---
Name:           perl-CGI-Application-Plugin-Config-Simple
Version:        1.01
Release:        1%{?dist}
Summary:        Add Config::Simple support to CGI::Application
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CGI-Application-Plugin-Config-Simple/
Source0:        http://www.cpan.org/authors/id/W/WO/WONKO/CGI-Application-Plugin-Config-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CGI::Application)
BuildRequires:  perl(Config::Simple)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module acts as a plugin for Config::Simple to be easily used inside of
a CGI::Application module. It does not provide every method available from
Config::Simple but rather easy access to your configuration variables. It
does however provide direct access to the underlying Config::General object
created if you want to use it's full power.

%prep
%setup -q -n CGI-Application-Plugin-Config-Simple-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
# t/main.t greps for 'Permission denied.'
LANG=C ./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Dec 13 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.01-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:27:14 -0000	1.1
+++ .cvsignore	16 Dec 2009 09:44:35 -0000	1.2
@@ -0,0 +1 @@
+CGI-Application-Plugin-Config-Simple-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-Config-Simple/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:27:14 -0000	1.1
+++ sources	16 Dec 2009 09:44:35 -0000	1.2
@@ -0,0 +1 @@
+6d2aeb258474871f13fcaf66e918a386  CGI-Application-Plugin-Config-Simple-1.01.tar.gz



From pkgdb at fedoraproject.org  Wed Dec 16 09:46:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 09:46:37 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091216094638.D05DC28ECCF@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora devel is now owned by mkasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Wed Dec 16 09:47:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 09:47:09 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091216094711.41F1A28ED16@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora 11 is now owned by mkasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Wed Dec 16 09:47:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 09:47:26 +0000
Subject: [pkgdb] evince ownership updated
Message-ID: <20091216094727.06DE328ED27@bastion3.fedora.phx2.redhat.com>

Package evince in Fedora 12 is now owned by mkasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/evince



From petersen at fedoraproject.org  Wed Dec 16 10:00:18 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 16 Dec 2009 10:00:18 +0000 (UTC)
Subject: rpms/ghc-zlib/devel ghc-zlib.spec,1.15,1.16
Message-ID: <20091216100019.004EE11C02B9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4982

Modified Files:
	ghc-zlib.spec 
Log Message:
- build for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1
- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache




Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/ghc-zlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ghc-zlib.spec	16 Sep 2009 09:31:12 -0000	1.15
+++ ghc-zlib.spec	16 Dec 2009 10:00:18 -0000	1.16
@@ -2,6 +2,7 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -9,17 +10,16 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        0.5.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Haskell compression and decompression library binding
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
-Source0:         http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -41,10 +41,13 @@ full zlib feature set.
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-Requires:       zlib-devel
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
+Requires:       zlib-devel
 
 %description devel
 This package contains the development files for %{name}
@@ -87,13 +90,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -102,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -111,10 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -125,6 +125,13 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
@@ -143,6 +150,11 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-11
+- build for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+- use cabal_pkg_conf to generate package.conf.d file and use ghc-pkg recache
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -157,7 +169,7 @@ fi
 - add devel subpackage
 - use ix86 macro for archs and add alpha
 - use global rather than define
-- make devel own docdir for now
+- make devel subpackage own docdir for now
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From kklic at fedoraproject.org  Wed Dec 16 10:33:57 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 10:33:57 +0000 (UTC)
Subject: rpms/logwatch/F-12 logwatch-7.3.6-iptables.patch, NONE,
	1.1 logwatch.spec, 1.118, 1.119
Message-ID: <20091216103357.597C411C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10568

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-iptables.patch 
Log Message:
802.1q subinterface support in iptables

logwatch-7.3.6-iptables.patch:
 iptables |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-iptables.patch ---
diff -up logwatch-7.3.6/scripts/services/iptables.iptables logwatch-7.3.6/scripts/services/iptables
--- logwatch-7.3.6/scripts/services/iptables.iptables	2007-02-16 04:27:05.000000000 +0100
+++ logwatch-7.3.6/scripts/services/iptables	2009-12-02 16:20:20.446263041 +0100
@@ -120,7 +120,7 @@ while (defined($ThisLine = <STDIN>)) {
       $ipt2{$actionType}{$if}{$toport}{$proto}{$fromip}{$toip}{"$chain,$if"}++;   
    }
    # IPTABLES
-   elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=(\w*).*?OUT=(\w*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) {
+   elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=([\w\.]*).*?OUT=([\w\.]*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) {
 
       # get a destination port number  (or icmp type) if there is one
       if (! ( ($toport) = ( $rest =~ /TYPE=(\w+)/ ) ) ) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/F-12/logwatch.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- logwatch.spec	11 Aug 2009 11:56:43 -0000	1.118
+++ logwatch.spec	16 Dec 2009 10:33:57 -0000	1.119
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 48%{?dist}
+Release: 49%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -54,6 +54,7 @@ Patch54: logwatch-7.3.6-exim2.patch
 Patch55: logwatch-7.3.6-removeservice.patch
 Patch56: logwatch-7.3.6-cron_conf.patch
 Patch57: logwatch-7.3.6-named5.patch
+Patch58: logwatch-7.3.6-iptables.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -115,6 +116,7 @@ of the package on many systems.
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -238,6 +240,9 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-49
+- Add 802.1q subinterface support to iptables report (#507743)
+
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-48
 - parse a few unmatched entries in named script (#513853)
 



From kklic at fedoraproject.org  Wed Dec 16 10:35:50 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 10:35:50 +0000 (UTC)
Subject: rpms/logwatch/devel logwatch-7.3.6-iptables.patch, NONE,
	1.1 logwatch.spec, 1.118, 1.119
Message-ID: <20091216103550.F2B2511C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10893

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-iptables.patch 
Log Message:
802.1q subinterface support in iptables

logwatch-7.3.6-iptables.patch:
 iptables |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-iptables.patch ---
diff -up logwatch-7.3.6/scripts/services/iptables.iptables logwatch-7.3.6/scripts/services/iptables
--- logwatch-7.3.6/scripts/services/iptables.iptables	2007-02-16 04:27:05.000000000 +0100
+++ logwatch-7.3.6/scripts/services/iptables	2009-12-02 16:20:20.446263041 +0100
@@ -120,7 +120,7 @@ while (defined($ThisLine = <STDIN>)) {
       $ipt2{$actionType}{$if}{$toport}{$proto}{$fromip}{$toip}{"$chain,$if"}++;   
    }
    # IPTABLES
-   elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=(\w*).*?OUT=(\w*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) {
+   elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=([\w\.]*).*?OUT=([\w\.]*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) {
 
       # get a destination port number  (or icmp type) if there is one
       if (! ( ($toport) = ( $rest =~ /TYPE=(\w+)/ ) ) ) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- logwatch.spec	11 Aug 2009 11:56:43 -0000	1.118
+++ logwatch.spec	16 Dec 2009 10:35:50 -0000	1.119
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 48%{?dist}
+Release: 49%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -54,6 +54,7 @@ Patch54: logwatch-7.3.6-exim2.patch
 Patch55: logwatch-7.3.6-removeservice.patch
 Patch56: logwatch-7.3.6-cron_conf.patch
 Patch57: logwatch-7.3.6-named5.patch
+Patch58: logwatch-7.3.6-iptables.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -115,6 +116,7 @@ of the package on many systems.
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -238,6 +240,9 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-49
+- Add 802.1q subinterface support to iptables report (#507743)
+
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-48
 - parse a few unmatched entries in named script (#513853)
 



From kklic at fedoraproject.org  Wed Dec 16 10:44:36 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 10:44:36 +0000 (UTC)
Subject: rpms/logwatch/F-11 logwatch-7.3.6-iptables.patch, NONE,
	1.1 logwatch.spec, 1.114, 1.115
Message-ID: <20091216104436.2923311C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12471

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-iptables.patch 
Log Message:
802.1q subinterface support in iptables

logwatch-7.3.6-iptables.patch:
 iptables |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-iptables.patch ---
diff -up logwatch-7.3.6/scripts/services/iptables.iptables logwatch-7.3.6/scripts/services/iptables
--- logwatch-7.3.6/scripts/services/iptables.iptables	2007-02-16 04:27:05.000000000 +0100
+++ logwatch-7.3.6/scripts/services/iptables	2009-12-02 16:20:20.446263041 +0100
@@ -120,7 +120,7 @@ while (defined($ThisLine = <STDIN>)) {
       $ipt2{$actionType}{$if}{$toport}{$proto}{$fromip}{$toip}{"$chain,$if"}++;   
    }
    # IPTABLES
-   elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=(\w*).*?OUT=(\w*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) {
+   elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=([\w\.]*).*?OUT=([\w\.]*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) {
 
       # get a destination port number  (or icmp type) if there is one
       if (! ( ($toport) = ( $rest =~ /TYPE=(\w+)/ ) ) ) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/F-11/logwatch.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- logwatch.spec	11 Aug 2009 12:47:55 -0000	1.114
+++ logwatch.spec	16 Dec 2009 10:44:35 -0000	1.115
@@ -53,6 +53,7 @@ Patch53: logwatch-7.3.6-sshd2.patch
 Patch54: logwatch-7.3.6-exim2.patch
 Patch55: logwatch-7.3.6-removeservice.patch
 Patch56: logwatch-7.3.6-named5.patch
+Patch57: logwatch-7.3.6-iptables.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +114,7 @@ of the package on many systems.
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
+%patch57 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -224,6 +226,9 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-45
+- Add 802.1q subinterface support to iptables report (#507743)
+
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-44
 - parse a few unmatched entries in named script (#513853)
 



From jreznik at fedoraproject.org  Wed Dec 16 11:10:30 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 11:10:30 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.408,1.409
Message-ID: <20091216111030.AB51B11C0345@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16181

Modified Files:
	kdebase.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-4
- Repositioning the KDE Brand (#547361)



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- kdebase.spec	9 Dec 2009 23:51:57 -0000	1.408
+++ kdebase.spec	16 Dec 2009 11:10:30 -0000	1.409
@@ -1,8 +1,8 @@
 Name: kdebase
-Summary: K Desktop Environment 4 - Core Files
+Summary: KDE Core Files
 Epoch: 6
 Version: 4.3.80
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -73,7 +73,7 @@ BuildRequires: glib2-devel
 Requires: kdebase-runtime
 
 %description
-Core runtime requirements and applications for the K Desktop Environment 4.
+Core runtime requirements and applications for KDE 4.
 
 %package -n kde-plasma-folderview
 Summary: FolderView plasma applet
@@ -229,6 +229,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-4
+- Repositioning the KDE Brand (#547361)
+
 * Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - rebuild against Nepomuk-enabled kdelibs
 



From jreznik at fedoraproject.org  Wed Dec 16 11:13:16 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 11:13:16 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.157,1.158
Message-ID: <20091216111316.BF4ED11C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16699

Modified Files:
	kdegames.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-3
- Repositioning the KDE Brand (#547361)



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- kdegames.spec	12 Dec 2009 00:15:14 -0000	1.157
+++ kdegames.spec	16 Dec 2009 11:13:16 -0000	1.158
@@ -1,8 +1,8 @@
 Name:    kdegames
-Summary: K Desktop Environment 4 - Games
+Summary: KDE Games
 Epoch:   6
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -54,7 +54,7 @@ Requires(preun): ggz-client-libs
 %endif
 
 %description
-Games for the K Desktop Environment 4, including:
+Games for KDE 4, including:
 * bomber
 * bovo
 * granatier
@@ -255,6 +255,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-3
+- Repositioning the KDE Brand (#547361)
+
 * Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
 - fix liblogine and libloscript to link (upstream patches)
 - update description to list new games



From jreznik at fedoraproject.org  Wed Dec 16 11:17:13 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 11:17:13 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.551,1.552
Message-ID: <20091216111713.28F1D11C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17460

Modified Files:
	kdelibs.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-5
- Repositioning the KDE Brand (#547361)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -p -r1.551 -r1.552
--- kdelibs.spec	9 Dec 2009 22:21:00 -0000	1.551
+++ kdelibs.spec	16 Dec 2009 11:17:12 -0000	1.552
@@ -2,9 +2,9 @@
 %define soprano_ver 2.3.70
 %define strigi_ver 0.7
 
-Summary: K Desktop Environment 4 - Libraries
+Summary: KDE Libraries
 Version: 4.3.80
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -145,7 +145,7 @@ Provides: kdelibs-experimental = %{versi
 Obsoletes: kdelibs-experimental < 4.3.75 
 
 %description
-Libraries for the K Desktop Environment 4.
+Libraries for the KDE 4.
 
 %package common
 Group: System Environment/Libraries
@@ -415,6 +415,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-5
+- Repositioning the KDE Brand (#547361)
+
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-4
 - BR: attica-devel shared-desktop-ontologies-devel
 - phonon_ver 4.3.80



From jreznik at fedoraproject.org  Wed Dec 16 11:19:04 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 11:19:04 +0000 (UTC)
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.163,1.164
Message-ID: <20091216111904.D437511C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17776

Modified Files:
	kdemultimedia.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
- Repositioning the KDE Brand (#547361)



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- kdemultimedia.spec	2 Dec 2009 14:44:38 -0000	1.163
+++ kdemultimedia.spec	16 Dec 2009 11:19:04 -0000	1.164
@@ -2,8 +2,8 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.3.80
-Release: 1%{?dist}
-Summary: K Desktop Environment - Multimedia applications
+Release: 2%{?dist}
+Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
 # see also: http://techbase.kde.org/Policies/Licensing_Policy
@@ -172,6 +172,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
+- Repositioning the KDE Brand (#547361)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From kklic at fedoraproject.org  Wed Dec 16 11:20:03 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 11:20:03 +0000 (UTC)
Subject: rpms/logwatch/devel logwatch-7.3.6-lost-connection.patch, NONE,
	1.1 logwatch.spec, 1.119, 1.120
Message-ID: <20091216112003.C83A711C02CA@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18025

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-lost-connection.patch 
Log Message:
Fixed error in the RE that matches lost connection lines in postfix script

logwatch-7.3.6-lost-connection.patch:
 postfix |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-lost-connection.patch ---
diff -up logwatch-7.3.6/scripts/services/postfix.lost-connection logwatch-7.3.6/scripts/services/postfix
--- logwatch-7.3.6/scripts/services/postfix.lost-connection	2009-12-16 12:06:01.208255271 +0100
+++ logwatch-7.3.6/scripts/services/postfix	2009-12-16 12:06:17.115378576 +0100
@@ -1536,7 +1536,7 @@ while ( <> ) {
    # end of $re_QID section
 
    # see also ConnectionLost in $re_QID section
-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
+   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (?:\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
       unless ($hostip =~ /unknown/) {
          #TD lost connection after DATA (0 bytes) from mail.example.com[192.168.0.1]    
          #TD lost connection after CONNECT from mail.example.com[192.168.0.1] 


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- logwatch.spec	16 Dec 2009 10:35:50 -0000	1.119
+++ logwatch.spec	16 Dec 2009 11:20:03 -0000	1.120
@@ -54,7 +54,10 @@ Patch54: logwatch-7.3.6-exim2.patch
 Patch55: logwatch-7.3.6-removeservice.patch
 Patch56: logwatch-7.3.6-cron_conf.patch
 Patch57: logwatch-7.3.6-named5.patch
+# Sent to upstream.
 Patch58: logwatch-7.3.6-iptables.patch
+# Not sent to upstream.
+Patch59: logwatch-7.3.6-lost-connection.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -117,6 +120,7 @@ of the package on many systems.
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
+%patch59 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -241,7 +245,8 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-49
-- Add 802.1q subinterface support to iptables report (#507743)
+- Add 802.1q subinterface support to iptables report; iptables.patch (#507743)
+- Fixed error in the RE that matches "lost connection" lines in postfix script; lost-connection.patch (#525903)
 
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-48
 - parse a few unmatched entries in named script (#513853)



From jreznik at fedoraproject.org  Wed Dec 16 11:21:52 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 11:21:52 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.207,1.208
Message-ID: <20091216112152.E565411C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18328

Modified Files:
	kdeutils.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-3
- Repositioning the KDE Brand (#547361)



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- kdeutils.spec	11 Dec 2009 15:45:13 -0000	1.207
+++ kdeutils.spec	16 Dec 2009 11:21:52 -0000	1.208
@@ -5,8 +5,8 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.3.80
-Release:        2%{?dist}
-Summary:        K Desktop Environment - Utilities
+Release:        3%{?dist}
+Summary:        KDE Utilities
 
 Group:          Applications/System
 # FIXME/TODO: Check license
@@ -55,7 +55,7 @@ Obsoletes: kdeutils < 6:4.3.0-2
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description
-Utilities for the K Desktop Environment.
+Utilities for KDE 4.
 Includes:
   * ark: tar/gzip archive manager
   * kcalc: scientific calculator
@@ -218,6 +218,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-3
+- Repositioning the KDE Brand (#547361)
+
 * Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
 - BR: xz-devel
 



From kklic at fedoraproject.org  Wed Dec 16 11:22:56 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 11:22:56 +0000 (UTC)
Subject: rpms/logwatch/F-12 logwatch-7.3.6-lost-connection.patch, NONE,
	1.1 logwatch.spec, 1.119, 1.120
Message-ID: <20091216112256.7158211C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18597

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-lost-connection.patch 
Log Message:
Fixed error in the RE that matches lost connection lines in postfix script

logwatch-7.3.6-lost-connection.patch:
 postfix |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-lost-connection.patch ---
diff -up logwatch-7.3.6/scripts/services/postfix.lost-connection logwatch-7.3.6/scripts/services/postfix
--- logwatch-7.3.6/scripts/services/postfix.lost-connection	2009-12-16 12:06:01.208255271 +0100
+++ logwatch-7.3.6/scripts/services/postfix	2009-12-16 12:06:17.115378576 +0100
@@ -1536,7 +1536,7 @@ while ( <> ) {
    # end of $re_QID section
 
    # see also ConnectionLost in $re_QID section
-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
+   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (?:\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
       unless ($hostip =~ /unknown/) {
          #TD lost connection after DATA (0 bytes) from mail.example.com[192.168.0.1]    
          #TD lost connection after CONNECT from mail.example.com[192.168.0.1] 


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/F-12/logwatch.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- logwatch.spec	16 Dec 2009 10:33:57 -0000	1.119
+++ logwatch.spec	16 Dec 2009 11:22:56 -0000	1.120
@@ -55,6 +55,8 @@ Patch55: logwatch-7.3.6-removeservice.pa
 Patch56: logwatch-7.3.6-cron_conf.patch
 Patch57: logwatch-7.3.6-named5.patch
 Patch58: logwatch-7.3.6-iptables.patch
+# Not sent to upstream.
+Patch59: logwatch-7.3.6-lost-connection.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -117,6 +119,7 @@ of the package on many systems.
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
+%patch59 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -242,6 +245,7 @@ rm -rf %{buildroot}
 %changelog
 * Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-49
 - Add 802.1q subinterface support to iptables report (#507743)
+- Fixed error in the RE that matches "lost connection" lines in postfix script; lost-connection.patch (#525903)
 
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-48
 - parse a few unmatched entries in named script (#513853)



From jreznik at fedoraproject.org  Wed Dec 16 11:24:10 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 11:24:10 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.219,1.220
Message-ID: <20091216112410.2448211C02B9@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18729

Modified Files:
	kdegraphics.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
- Repositioning the KDE Brand (#547361)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- kdegraphics.spec	2 Dec 2009 13:14:26 -0000	1.219
+++ kdegraphics.spec	16 Dec 2009 11:24:09 -0000	1.220
@@ -4,10 +4,10 @@
 %define sane 1
 %endif
 
-Summary:        K Desktop Environment - Graphics Applications
+Summary:        KDE Graphics Applications
 Epoch:          7
 Version:        4.3.80
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -234,6 +234,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
+- Repositioning the KDE Brand (#547361)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From hadess at fedoraproject.org  Wed Dec 16 11:24:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 16 Dec 2009 11:24:42 +0000 (UTC)
Subject: File gst-rtsp-0.10.5.tar.bz2 uploaded to lookaside cache by hadess
Message-ID: <20091216112442.0ABF228ED1E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gstreamer-rtsp:

caca55e2ff497c0a327df3bc65a4a662  gst-rtsp-0.10.5.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec 16 11:24:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:24:49 +0000
Subject: [pkgdb] bacula: dnovotny has given up watchbugzilla
Message-ID: <20091216112450.5514F28ED19@bastion3.fedora.phx2.redhat.com>

dnovotny has given up the watchbugzilla acl on bacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:24:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:24:53 +0000
Subject: [pkgdb] bacula: dnovotny has requested commit
Message-ID: <20091216112455.1870728ED24@bastion3.fedora.phx2.redhat.com>

dnovotny has requested the commit acl on bacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:24:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:24:55 +0000
Subject: [pkgdb] bacula: dnovotny has given up watchcommits
Message-ID: <20091216112458.86ACB28ED24@bastion3.fedora.phx2.redhat.com>

dnovotny has given up the watchcommits acl on bacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From hadess at fedoraproject.org  Wed Dec 16 11:24:58 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 16 Dec 2009 11:24:58 +0000 (UTC)
Subject: rpms/gstreamer-rtsp/devel .cvsignore, 1.4, 1.5 gstreamer-rtsp.spec, 
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091216112458.B76D411C0092@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-rtsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19012

Modified Files:
	.cvsignore gstreamer-rtsp.spec sources 
Log Message:
* Wed Dec 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.5-1
- Update to 0.10.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Aug 2009 14:53:48 -0000	1.4
+++ .cvsignore	16 Dec 2009 11:24:58 -0000	1.5
@@ -1 +1 @@
-gst-rtsp-0.10.4.tar.bz2
+gst-rtsp-0.10.5.tar.bz2


Index: gstreamer-rtsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/devel/gstreamer-rtsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gstreamer-rtsp.spec	8 Aug 2009 14:53:49 -0000	1.4
+++ gstreamer-rtsp.spec	16 Dec 2009 11:24:58 -0000	1.5
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gstreamer-rtsp
-Version:	0.10.4
+Version:	0.10.5
 Release:	1%{?dist}
 Summary:	GStreamer RTSP server library
 
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/gst-rtsp-server-0.10.vapi
 
 %changelog
+* Wed Dec 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.5-1
+- Update to 0.10.5
+
 * Sat Aug  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.4-1
 - Update to 0.10.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Aug 2009 14:53:49 -0000	1.4
+++ sources	16 Dec 2009 11:24:58 -0000	1.5
@@ -1 +1 @@
-8daaca1299aeb42c6aac47b30291005b  gst-rtsp-0.10.4.tar.bz2
+caca55e2ff497c0a327df3bc65a4a662  gst-rtsp-0.10.5.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec 16 11:24:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:24:57 +0000
Subject: [pkgdb] bacula: dnovotny has requested approveacls
Message-ID: <20091216112501.1006528ED42@bastion3.fedora.phx2.redhat.com>

dnovotny has requested the approveacls acl on bacula (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:25:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:25:13 +0000
Subject: [pkgdb] bacula: dnovotny has given up watchcommits
Message-ID: <20091216112514.DE43C28ED3D@bastion3.fedora.phx2.redhat.com>

dnovotny has given up the watchcommits acl on bacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:25:16 +0000
Subject: [pkgdb] bacula: dnovotny has given up watchbugzilla
Message-ID: <20091216112519.7060728ED4B@bastion3.fedora.phx2.redhat.com>

dnovotny has given up the watchbugzilla acl on bacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:25:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:25:17 +0000
Subject: [pkgdb] bacula: dnovotny has requested approveacls
Message-ID: <20091216112520.1B51228ECF5@bastion3.fedora.phx2.redhat.com>

dnovotny has requested the approveacls acl on bacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:25:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:25:19 +0000
Subject: [pkgdb] bacula: dnovotny has requested commit
Message-ID: <20091216112523.E01C928ED19@bastion3.fedora.phx2.redhat.com>

dnovotny has requested the commit acl on bacula (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:25:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:25:21 +0000
Subject: [pkgdb] bacula: dnovotny has given up watchbugzilla
Message-ID: <20091216112523.E467928ED3E@bastion3.fedora.phx2.redhat.com>

dnovotny has given up the watchbugzilla acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:25:24 +0000
Subject: [pkgdb] bacula: dnovotny has requested approveacls
Message-ID: <20091216112526.8928828ED1C@bastion3.fedora.phx2.redhat.com>

dnovotny has requested the approveacls acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:25:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:25:34 +0000
Subject: [pkgdb] bacula: dnovotny has given up watchcommits
Message-ID: <20091216112535.74C0F28ED40@bastion3.fedora.phx2.redhat.com>

dnovotny has given up the watchcommits acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Dec 16 11:25:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 11:25:40 +0000
Subject: [pkgdb] bacula: dnovotny has requested commit
Message-ID: <20091216112545.3798928ED5F@bastion3.fedora.phx2.redhat.com>

dnovotny has requested the commit acl on bacula (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From kklic at fedoraproject.org  Wed Dec 16 11:25:51 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 11:25:51 +0000 (UTC)
Subject: rpms/logwatch/F-11 logwatch-7.3.6-lost-connection.patch, NONE,
	1.1 logwatch.spec, 1.115, 1.116
Message-ID: <20091216112551.83AF911C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19254

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-lost-connection.patch 
Log Message:
Fixed error in the RE that matches lost connection lines in postfix script

logwatch-7.3.6-lost-connection.patch:
 postfix |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-lost-connection.patch ---
diff -up logwatch-7.3.6/scripts/services/postfix.lost-connection logwatch-7.3.6/scripts/services/postfix
--- logwatch-7.3.6/scripts/services/postfix.lost-connection	2009-12-16 12:06:01.208255271 +0100
+++ logwatch-7.3.6/scripts/services/postfix	2009-12-16 12:06:17.115378576 +0100
@@ -1536,7 +1536,7 @@ while ( <> ) {
    # end of $re_QID section
 
    # see also ConnectionLost in $re_QID section
-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
+   elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (?:\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
       unless ($hostip =~ /unknown/) {
          #TD lost connection after DATA (0 bytes) from mail.example.com[192.168.0.1]    
          #TD lost connection after CONNECT from mail.example.com[192.168.0.1] 


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/F-11/logwatch.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- logwatch.spec	16 Dec 2009 10:44:35 -0000	1.115
+++ logwatch.spec	16 Dec 2009 11:25:51 -0000	1.116
@@ -54,6 +54,8 @@ Patch54: logwatch-7.3.6-exim2.patch
 Patch55: logwatch-7.3.6-removeservice.patch
 Patch56: logwatch-7.3.6-named5.patch
 Patch57: logwatch-7.3.6-iptables.patch
+# Not sent to upstream.
+Patch58: logwatch-7.3.6-lost-connection.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -115,6 +117,7 @@ of the package on many systems.
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -228,6 +231,7 @@ rm -rf %{buildroot}
 %changelog
 * Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-45
 - Add 802.1q subinterface support to iptables report (#507743)
+- Fixed error in the RE that matches "lost connection" lines in postfix script; lost-connection.patch (#525903)
 
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-44
 - parse a few unmatched entries in named script (#513853)



From jreznik at fedoraproject.org  Wed Dec 16 11:48:08 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 11:48:08 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.219,1.220
Message-ID: <20091216114808.321FE11C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22845

Modified Files:
	kdenetwork.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-4
- Repositioning the KDE Brand (#547361)



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- kdenetwork.spec	11 Dec 2009 15:50:40 -0000	1.219
+++ kdenetwork.spec	16 Dec 2009 11:48:06 -0000	1.220
@@ -1,8 +1,8 @@
-Summary: K Desktop Environment - Network Applications
+Summary: KDE Network Applications
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -190,6 +190,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
+- Repositioning the KDE Brand (#547361)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 - reenable webkitpart support



From jreznik at fedoraproject.org  Wed Dec 16 11:53:11 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 11:53:11 +0000 (UTC)
Subject: rpms/kdetoys/devel kdetoys.spec,1.63,1.64
Message-ID: <20091216115311.593F511C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23597

Modified Files:
	kdetoys.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
- Repositioning the KDE Brand (#547361)



Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- kdetoys.spec	2 Dec 2009 14:38:25 -0000	1.63
+++ kdetoys.spec	16 Dec 2009 11:53:11 -0000	1.64
@@ -1,8 +1,8 @@
 Name:           kdetoys
-Summary:        K Desktop Environment - Toys and Amusements
+Summary:        KDE Toys and Amusements
 Epoch:          7
 Version:        4.3.80
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
@@ -82,6 +82,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
+- Repositioning the KDE Brand (#547361)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From xhorak at fedoraproject.org  Wed Dec 16 12:12:02 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 12:12:02 +0000 (UTC)
Subject: File xulrunner-1.9.0.16-source.tar.bz2 uploaded to lookaside cache
	by xhorak
Message-ID: <20091216121202.6BF7528ECEF@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for xulrunner:

ef6228e076412d5b0c37966294d659cd  xulrunner-1.9.0.16-source.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 12:14:18 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 12:14:18 +0000 (UTC)
Subject: File xulrunner-1.9.1.6.source.tar.bz2 uploaded to lookaside cache by
	xhorak
Message-ID: <20091216121418.132AC28ECEF@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for xulrunner:

54d73156dfedc6e4981f2a3c46817f9a  xulrunner-1.9.1.6.source.tar.bz2



From ovasik at fedoraproject.org  Wed Dec 16 12:17:59 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 16 Dec 2009 12:17:59 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-6.10-configuration.patch, 1.25,
	1.26 coreutils-DIR_COLORS.256color, 1.10, 1.11 coreutils.spec,
	1.291, 1.292
Message-ID: <20091216121759.2779011C0092@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27370

Modified Files:
	coreutils-6.10-configuration.patch 
	coreutils-DIR_COLORS.256color coreutils.spec 
Log Message:
fix DIR_COLORS.256color file

coreutils-6.10-configuration.patch:
 coreutils-6.11/tests/test-lib.sh         |    4 ++--
 coreutils-7.1/src/ls.c                   |    8 ++++----
 coreutils-8.1/tests/touch/no-dereference |    2 ++
 coreutils-8.2/gnulib-tests/gnulib.mk     |   24 ++++++++++++------------
 4 files changed, 20 insertions(+), 18 deletions(-)

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- coreutils-6.10-configuration.patch	11 Dec 2009 17:07:21 -0000	1.25
+++ coreutils-6.10-configuration.patch	16 Dec 2009 12:17:58 -0000	1.26
@@ -1,32 +1,3 @@
-diff -urNp coreutils-7.2-orig/gnulib-tests/gnulib.mk coreutils-7.2/gnulib-tests/gnulib.mk
---- coreutils-7.2-orig/gnulib-tests/gnulib.mk	2009-03-31 14:28:30.000000000 +0200
-+++ coreutils-7.2/gnulib-tests/gnulib.mk	2009-04-01 12:37:00.000000000 +0200
-@@ -606,9 +606,9 @@ EXTRA_DIST += test-mbsstr1.c test-mbsstr
- 
- ## begin gnulib module memchr-tests
- 
--TESTS += test-memchr
--check_PROGRAMS += test-memchr
--EXTRA_DIST += test-memchr.c zerosize-ptr.h
-+#TESTS += test-memchr
-+#check_PROGRAMS += test-memchr
-+#EXTRA_DIST += test-memchr.c zerosize-ptr.h
- 
- ## end   gnulib module memchr-tests
- 
-@@ -910,9 +910,9 @@ EXTRA_DIST += test-strtod.c
- 
- ## begin gnulib module strverscmp-tests
- 
--TESTS += test-strverscmp
--check_PROGRAMS += test-strverscmp
--EXTRA_DIST += test-strverscmp.c
-+#TESTS += test-strverscmp
-+#check_PROGRAMS += test-strverscmp
-+#EXTRA_DIST += test-strverscmp.c
- 
- ## end   gnulib module strverscmp-tests
- 
 diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.sh
 --- coreutils-6.11-orig/tests/test-lib.sh	2008-04-19 23:34:23.000000000 +0200
 +++ coreutils-6.11/tests/test-lib.sh	2008-04-24 14:18:59.000000000 +0200


Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- coreutils-DIR_COLORS.256color	27 Nov 2009 13:24:09 -0000	1.10
+++ coreutils-DIR_COLORS.256color	16 Dec 2009 12:17:58 -0000	1.11
@@ -52,17 +52,17 @@ EIGHTBIT 1
 #NORMAL 00	# global default, no color code at all
 #FILE 00	# normal file, use no color at all
 RESET 0 # reset to "normal" color
-DIR 01;38;5;27	# directory
-LINK 01;38;5;51	# symbolic link (If you set this to 'target' instead of a
+DIR 38;5;27	# directory
+LINK 38;5;51	# symbolic link (If you set this to 'target' instead of a
 		# numerical value, the color is as for the file pointed to.)
 MULTIHARDLINK 44;38;5;15 # regular file with more than one link
 FIFO 40;38;5;11	# pipe
-SOCK 01;38;5;13	# socket
-DOOR 01;38;5;5	# door
-BLK 01;48;5;232;38;5;11	# block device driver
-CHR 01;48;5;232;38;5;3	# character device driver
-ORPHAN 01;48;5;232;38;5;9  # symlink to nonexistent file, or non-stat'able file
-MISSING 01;05;48;5;232;38;5;15 # ... and the files they point to
+SOCK 38;5;13	# socket
+DOOR 38;5;5	# door
+BLK 48;5;232;38;5;11	# block device driver
+CHR 48;5;232;38;5;3	# character device driver
+ORPHAN 48;5;232;38;5;9  # symlink to nonexistent file, or non-stat'able file
+MISSING 05;48;5;232;38;5;15 # ... and the files they point to
 SETUID 48;5;196;38;5;15	# file that is setuid (u+s)
 SETGID 48;5;11;38;5;16	# file that is setgid (g+s)
 CAPABILITY 48;5;196;38;5;226	# file with capability
@@ -71,117 +71,117 @@ OTHER_WRITABLE 48;5;10;38;5;21 # dir tha
 STICKY 48;5;21;38;5;15	# dir with the sticky bit set (+t) and not other-writable
 
 # This is for files with execute permission:
-EXEC 01;38;5;34
+EXEC 38;5;34
 
 # List any file extensions like '.gz' or '.tar' that you would like ls
 # to colorize below. Put the extension, a space, and the color init string.
 # (and any comments you want to add after a '#')
 # executables (bright green)
-#.cmd 01;38;5;34
-#.exe 01;38;5;34
-#.com 01;38;5;34
-#.btm 01;38;5;34
-#.bat 01;38;5;34
-#.sh  01;38;5;34
-#.csh 01;38;5;34
+#.cmd 38;5;34
+#.exe 38;5;34
+#.com 38;5;34
+#.btm 38;5;34
+#.bat 38;5;34
+#.sh  38;5;34
+#.csh 38;5;34
  # archives or compressed (bright red)
-.tar 01;38;5;9
-.tgz 01;38;5;9
-.arj 01;38;5;9
-.taz 01;38;5;9
-.lzh 01;38;5;9
-.lzma 01;38;5;9
-.tlz 01;38;5;9
-.txz 01;38;5;9
-.zip 01;38;5;9
-.z   01;38;5;9
-.Z   01;38;5;9
-.dz  01;38;5;9
-.gz  01;38;5;9
-.lz  01;38;5;9
-.xz  01;38;5;9
-.bz2 01;38;5;9
-.tbz 01;38;5;9
-.tbz2 01;38;5;9
-.bz  01;38;5;9
-.tz  01;38;5;9
-.deb 01;38;5;9
-.rpm 01;38;5;9
-.jar 01;38;5;9
-.rar 01;38;5;9
-.ace 01;38;5;9
-.zoo 01;38;5;9
-.cpio 01;38;5;9
-.7z  01;38;5;9
-.rz  01;38;5;9
+.tar 38;5;9
+.tgz 38;5;9
+.arj 38;5;9
+.taz 38;5;9
+.lzh 38;5;9
+.lzma 38;5;9
+.tlz 38;5;9
+.txz 38;5;9
+.zip 38;5;9
+.z   38;5;9
+.Z   38;5;9
+.dz  38;5;9
+.gz  38;5;9
+.lz  38;5;9
+.xz  38;5;9
+.bz2 38;5;9
+.tbz 38;5;9
+.tbz2 38;5;9
+.bz  38;5;9
+.tz  38;5;9
+.deb 38;5;9
+.rpm 38;5;9
+.jar 38;5;9
+.rar 38;5;9
+.ace 38;5;9
+.zoo 38;5;9
+.cpio 38;5;9
+.7z  38;5;9
+.rz  38;5;9
 
 # image formats (magenta)
-.jpg 01;38;5;13
-.jpeg 01;38;5;13
-.gif 01;38;5;13
-.bmp 01;38;5;13
-.pbm 01;38;5;13
-.pgm 01;38;5;13
-.ppm 01;38;5;13
-.tga 01;38;5;13
-.xbm 01;38;5;13
-.xpm 01;38;5;13
-.tif 01;38;5;13
-.tiff 01;38;5;13
-.png 01;38;5;13
-.svg 01;38;5;13
-.svgz 01;38;5;13
-.mng 01;38;5;13
-.pcx 01;38;5;13
-.mov 01;38;5;13
-.mpg 01;38;5;13
-.mpeg 01;38;5;13
-.m2v 01;38;5;13
-.mkv 01;38;5;13
-.ogm 01;38;5;13
-.mp4 01;38;5;13
-.m4v 01;38;5;13
-.mp4v 01;38;5;13
-.vob 01;38;5;13
-.qt  01;38;5;13
-.nuv 01;38;5;13
-.wmv 01;38;5;13
-.asf 01;38;5;13
-.rm  01;38;5;13
-.rmvb 01;38;5;13
-.flc 01;38;5;13
-.avi 01;38;5;13
-.fli 01;38;5;13
-.flv 01;38;5;13
-.gl 01;38;5;13
-.dl 01;38;5;13
-.xcf 01;38;5;13
-.xwd 01;38;5;13
-.yuv 01;38;5;13
-.cgm 01;38;5;13
-.emf 01;38;5;13
+.jpg 38;5;13
+.jpeg 38;5;13
+.gif 38;5;13
+.bmp 38;5;13
+.pbm 38;5;13
+.pgm 38;5;13
+.ppm 38;5;13
+.tga 38;5;13
+.xbm 38;5;13
+.xpm 38;5;13
+.tif 38;5;13
+.tiff 38;5;13
+.png 38;5;13
+.svg 38;5;13
+.svgz 38;5;13
+.mng 38;5;13
+.pcx 38;5;13
+.mov 38;5;13
+.mpg 38;5;13
+.mpeg 38;5;13
+.m2v 38;5;13
+.mkv 38;5;13
+.ogm 38;5;13
+.mp4 38;5;13
+.m4v 38;5;13
+.mp4v 38;5;13
+.vob 38;5;13
+.qt  38;5;13
+.nuv 38;5;13
+.wmv 38;5;13
+.asf 38;5;13
+.rm  38;5;13
+.rmvb 38;5;13
+.flc 38;5;13
+.avi 38;5;13
+.fli 38;5;13
+.flv 38;5;13
+.gl 38;5;13
+.dl 38;5;13
+.xcf 38;5;13
+.xwd 38;5;13
+.yuv 38;5;13
+.cgm 38;5;13
+.emf 38;5;13
 
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axv 01;38;5;13
-.anx 01;38;5;13
-.ogv 01;38;5;13
-.ogx 01;38;5;13
+.axv 38;5;13
+.anx 38;5;13
+.ogv 38;5;13
+.ogx 38;5;13
 
 # audio formats (cyan)
-.aac 01;38;5;45
-.au 01;38;5;45
-.flac 01;38;5;45
-.mid 01;38;5;45
-.midi 01;38;5;45
-.mka 01;38;5;45
-.mp3 01;38;5;45
-.mpc 01;38;5;45
-.ogg 01;38;5;45
-.ra 01;38;5;45
-.wav 01;38;5;45
+.aac 38;5;45
+.au 38;5;45
+.flac 38;5;45
+.mid 38;5;45
+.midi 38;5;45
+.mka 38;5;45
+.mp3 38;5;45
+.mpc 38;5;45
+.ogg 38;5;45
+.ra 38;5;45
+.wav 38;5;45
 
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axa 01;38;5;45
-.oga 01;38;5;45
-.spx 01;38;5;45
-.xspf 01;38;5;45
+.axa 38;5;45
+.oga 38;5;45
+.spx 38;5;45
+.xspf 38;5;45


Index: coreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- coreutils.spec	11 Dec 2009 17:07:21 -0000	1.291
+++ coreutils.spec	16 Dec 2009 12:17:58 -0000	1.292
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -326,6 +326,9 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Wed Dec 16 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-2
+- fix DIR_COLORS.256color file
+
 * Fri Dec 11 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-1
 - new upstream release 8.2
 - removed applied patches, temporarily do not run dup_cloexec()



From sagarun at fedoraproject.org  Wed Dec 16 12:20:06 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed, 16 Dec 2009 12:20:06 +0000 (UTC)
Subject: rpms/emacs-spice-mode/devel emacs-spice-mode.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20091216122006.2546711C02CA@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-spice-mode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27796/devel

Modified Files:
	emacs-spice-mode.spec import.log 
Log Message:
Bugfix update: Fixed broken dependencies in ppc64



Index: emacs-spice-mode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/devel/emacs-spice-mode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- emacs-spice-mode.spec	14 Dec 2009 17:36:04 -0000	1.1
+++ emacs-spice-mode.spec	16 Dec 2009 12:20:05 -0000	1.2
@@ -13,7 +13,7 @@
 
 Name:		emacs-%{pkg}
 Version:	1.2.25
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SPICE Mode for GNU Emacs
 
 Group:		Applications/Editors
@@ -27,6 +27,7 @@ Patch0:		emacs-spice-mode-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
+ExcludeArch:	ppc64
 BuildRequires:	emacs emacs-el
 Requires:	emacs >= %{emacs_version} gnucap gwave
 		
@@ -72,6 +73,9 @@ emacs -batch -f batch-byte-compile %{pkg
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Dec 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-3
+- Exculded ppc64 which caused broken dependencies
+
 * Mon Dec 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-2
 - More file extenstions are handled by spice-mode
 - Default simulator is now Gnucap


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 17:36:04 -0000	1.1
+++ import.log	16 Dec 2009 12:20:06 -0000	1.2
@@ -1 +1,2 @@
 emacs-spice-mode-1_2_25-2_fc12:HEAD:emacs-spice-mode-1.2.25-2.fc12.src.rpm:1260812088
+emacs-spice-mode-1_2_25-3_fc12:HEAD:emacs-spice-mode-1.2.25-3.fc12.src.rpm:1260965942



From sagarun at fedoraproject.org  Wed Dec 16 12:22:10 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed, 16 Dec 2009 12:22:10 +0000 (UTC)
Subject: rpms/emacs-spice-mode/F-11 emacs-spice-mode.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20091216122210.64A0C11C0092@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-spice-mode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28205/F-11

Modified Files:
	emacs-spice-mode.spec import.log 
Log Message:
Bugfix update: Fixed broken dependencies in ppc64



Index: emacs-spice-mode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/F-11/emacs-spice-mode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- emacs-spice-mode.spec	14 Dec 2009 17:39:04 -0000	1.1
+++ emacs-spice-mode.spec	16 Dec 2009 12:22:10 -0000	1.2
@@ -13,7 +13,7 @@
 
 Name:		emacs-%{pkg}
 Version:	1.2.25
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SPICE Mode for GNU Emacs
 
 Group:		Applications/Editors
@@ -27,6 +27,7 @@ Patch0:		emacs-spice-mode-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
+ExcludeArch:	ppc64
 BuildRequires:	emacs emacs-el
 Requires:	emacs >= %{emacs_version} gnucap gwave
 		
@@ -72,6 +73,9 @@ emacs -batch -f batch-byte-compile %{pkg
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Dec 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-3
+- Exculded ppc64 which caused broken dependencies
+
 * Mon Dec 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-2
 - More file extenstions are handled by spice-mode
 - Default simulator is now Gnucap


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 17:39:04 -0000	1.1
+++ import.log	16 Dec 2009 12:22:10 -0000	1.2
@@ -1 +1,2 @@
 emacs-spice-mode-1_2_25-2_fc12:F-11:emacs-spice-mode-1.2.25-2.fc12.src.rpm:1260812286
+emacs-spice-mode-1_2_25-3_fc12:F-11:emacs-spice-mode-1.2.25-3.fc12.src.rpm:1260966050



From sagarun at fedoraproject.org  Wed Dec 16 12:24:04 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed, 16 Dec 2009 12:24:04 +0000 (UTC)
Subject: rpms/emacs-spice-mode/F-12 emacs-spice-mode.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20091216122404.A71A711C0092@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-spice-mode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28626/F-12

Modified Files:
	emacs-spice-mode.spec import.log 
Log Message:
Bugfix update: Fixed broken dependencies in ppc64



Index: emacs-spice-mode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/F-12/emacs-spice-mode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- emacs-spice-mode.spec	14 Dec 2009 17:41:51 -0000	1.1
+++ emacs-spice-mode.spec	16 Dec 2009 12:24:04 -0000	1.2
@@ -13,7 +13,7 @@
 
 Name:		emacs-%{pkg}
 Version:	1.2.25
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SPICE Mode for GNU Emacs
 
 Group:		Applications/Editors
@@ -27,6 +27,7 @@ Patch0:		emacs-spice-mode-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
+ExcludeArch:	ppc64
 BuildRequires:	emacs emacs-el
 Requires:	emacs >= %{emacs_version} gnucap gwave
 		
@@ -72,6 +73,9 @@ emacs -batch -f batch-byte-compile %{pkg
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Dec 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-3
+- Exculded ppc64 which caused broken dependencies
+
 * Mon Dec 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-2
 - More file extenstions are handled by spice-mode
 - Default simulator is now Gnucap


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 17:41:51 -0000	1.1
+++ import.log	16 Dec 2009 12:24:04 -0000	1.2
@@ -1 +1,2 @@
 emacs-spice-mode-1_2_25-2_fc12:F-12:emacs-spice-mode-1.2.25-2.fc12.src.rpm:1260812407
+emacs-spice-mode-1_2_25-3_fc12:F-12:emacs-spice-mode-1.2.25-3.fc12.src.rpm:1260966182



From sagarun at fedoraproject.org  Wed Dec 16 12:25:37 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed, 16 Dec 2009 12:25:37 +0000 (UTC)
Subject: rpms/emacs-spice-mode/EL-5 emacs-spice-mode.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20091216122537.B543611C0092@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-spice-mode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29001/EL-5

Modified Files:
	emacs-spice-mode.spec import.log 
Log Message:
Bugfix update: Fixed broken dependencies in ppc64



Index: emacs-spice-mode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/EL-5/emacs-spice-mode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- emacs-spice-mode.spec	14 Dec 2009 17:45:29 -0000	1.1
+++ emacs-spice-mode.spec	16 Dec 2009 12:25:37 -0000	1.2
@@ -13,7 +13,7 @@
 
 Name:		emacs-%{pkg}
 Version:	1.2.25
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SPICE Mode for GNU Emacs
 
 Group:		Applications/Editors
@@ -27,6 +27,7 @@ Patch0:		emacs-spice-mode-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
+ExcludeArch:	ppc64
 BuildRequires:	emacs emacs-el
 Requires:	emacs >= %{emacs_version} gnucap gwave
 		
@@ -72,6 +73,9 @@ emacs -batch -f batch-byte-compile %{pkg
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Dec 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-3
+- Exculded ppc64 which caused broken dependencies
+
 * Mon Dec 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 1.2.25-2
 - More file extenstions are handled by spice-mode
 - Default simulator is now Gnucap


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-spice-mode/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 17:45:29 -0000	1.1
+++ import.log	16 Dec 2009 12:25:37 -0000	1.2
@@ -1 +1,2 @@
 emacs-spice-mode-1_2_25-2_fc12:EL-5:emacs-spice-mode-1.2.25-2.fc12.src.rpm:1260812577
+emacs-spice-mode-1_2_25-3_fc12:EL-5:emacs-spice-mode-1.2.25-3.fc12.src.rpm:1260966266



From rjones at fedoraproject.org  Wed Dec 16 12:29:07 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 16 Dec 2009 12:29:07 +0000 (UTC)
Subject: File libguestfs-1.0.80.tar.gz uploaded to lookaside cache by rjones
Message-ID: <20091216122907.EC2B628ED0C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libguestfs:

54ba1464b12c2b070ea9ec50307cb3ab  libguestfs-1.0.80.tar.gz



From jakub at fedoraproject.org  Wed Dec 16 12:29:55 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 16 Dec 2009 12:29:55 +0000 (UTC)
Subject: File prelink-20091216.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091216122955.9CCB228ECDB@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for prelink:

de582b0d05391a68d953a6fc4abb6de2  prelink-20091216.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 12:32:24 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 12:32:24 +0000 (UTC)
Subject: rpms/xulrunner/F-12 .cvsignore, 1.73, 1.74 sources, 1.77,
	1.78 xulrunner.spec, 1.178, 1.179
Message-ID: <20091216123224.EE04E11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30404

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	5 Nov 2009 09:13:43 -0000	1.73
+++ .cvsignore	16 Dec 2009 12:32:24 -0000	1.74
@@ -3,3 +3,4 @@ xulrunner-1.9.1.2-source.tar.bz2
 xulrunner-1.9.1.3-source.tar.bz2
 xulrunner-1.9.1.4-source.tar.bz2
 xulrunner-1.9.1.5-source.tar.bz2
+xulrunner-1.9.1.6.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	19 Nov 2009 13:58:43 -0000	1.77
+++ sources	16 Dec 2009 12:32:24 -0000	1.78
@@ -1 +1 @@
-b3d92dfb40584141dc1068efc9bdfccc  xulrunner-1.9.1.5-source.tar.bz2
+54d73156dfedc6e4981f2a3c46817f9a  xulrunner-1.9.1.6.source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/xulrunner.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- xulrunner.spec	5 Nov 2009 09:13:43 -0000	1.178
+++ xulrunner.spec	16 Dec 2009 12:32:24 -0000	1.179
@@ -3,7 +3,7 @@
 %define nss_version 3.12.3.99
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
-%define sqlite_version 3.6.14
+%define sqlite_version 3.6.16
 %define tarballdir mozilla-1.9.1
 
 %define version_internal  1.9.1
@@ -11,7 +11,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.5
+Version:        1.9.1.6
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -455,6 +455,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.6-1
+- Update to 1.9.1.6
+
 * Thu Nov  5 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.5-1
 - Update to 1.9.1.5
 



From xhorak at fedoraproject.org  Wed Dec 16 12:32:40 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 12:32:40 +0000 (UTC)
Subject: rpms/xulrunner/F-11 .cvsignore, 1.71, 1.72 sources, 1.76,
	1.77 xulrunner.spec, 1.169, 1.170
Message-ID: <20091216123240.4303A11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30456

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	5 Nov 2009 09:08:03 -0000	1.71
+++ .cvsignore	16 Dec 2009 12:32:40 -0000	1.72
@@ -2,3 +2,4 @@ xulrunner-1.9.1-source.tar.bz2
 xulrunner-1.9.1.3-source.tar.bz2
 xulrunner-1.9.1.4-source.tar.bz2
 xulrunner-1.9.1.5-source.tar.bz2
+xulrunner-1.9.1.6.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	5 Nov 2009 09:08:03 -0000	1.76
+++ sources	16 Dec 2009 12:32:40 -0000	1.77
@@ -1 +1 @@
-b3d92dfb40584141dc1068efc9bdfccc  xulrunner-1.9.1.5-source.tar.bz2
+54d73156dfedc6e4981f2a3c46817f9a  xulrunner-1.9.1.6.source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/xulrunner.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- xulrunner.spec	5 Nov 2009 09:08:03 -0000	1.169
+++ xulrunner.spec	16 Dec 2009 12:32:40 -0000	1.170
@@ -11,7 +11,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.5
+Version:        1.9.1.6
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -58,7 +58,7 @@ BuildRequires:  freetype-devel >= %{free
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
-#Temporary removed, required 3.6.16 which is not in F11 repo yet: BuildRequires:  sqlite-devel >= %{sqlite_version} 
+BuildRequires:  sqlite-devel >= %{sqlite_version} 
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
 
@@ -452,6 +452,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.6-1
+- Update to 1.9.1.6
+
 * Thu Nov  5 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.5-1
 - Update to 1.9.1.5
 



From xhorak at fedoraproject.org  Wed Dec 16 12:32:59 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 12:32:59 +0000 (UTC)
Subject: rpms/xulrunner/F-10 .cvsignore, 1.74, 1.75 sources, 1.77,
	1.78 xulrunner.spec, 1.151, 1.152
Message-ID: <20091216123259.1A8EE11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30538

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.0.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	27 Oct 2009 07:40:54 -0000	1.74
+++ .cvsignore	16 Dec 2009 12:32:58 -0000	1.75
@@ -3,3 +3,4 @@ xulrunner-1.9.0.12-source.tar.bz2
 xulrunner-1.9.0.13-source.tar.bz2
 xulrunner-1.9.0.14-source.tar.bz2
 xulrunner-1.9.0.15-source.tar.bz2
+xulrunner-1.9.0.16-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	27 Oct 2009 07:40:54 -0000	1.77
+++ sources	16 Dec 2009 12:32:58 -0000	1.78
@@ -1 +1 @@
-7f6c1106600d769f3fb822669f9dcca2  xulrunner-1.9.0.15-source.tar.bz2
+ef6228e076412d5b0c37966294d659cd  xulrunner-1.9.0.16-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/xulrunner.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- xulrunner.spec	27 Oct 2009 07:40:55 -0000	1.151
+++ xulrunner.spec	16 Dec 2009 12:32:59 -0000	1.152
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.15
+Version:        1.9.0.16
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -423,6 +423,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.16-1
+- Update to 1.9.0.16
+
 * Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.15-1
 - Update to 1.9.0.15
 



From jreznik at fedoraproject.org  Wed Dec 16 12:32:59 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 12:32:59 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.173,1.174
Message-ID: <20091216123259.4A31111C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30517

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-4
- Repositioning the KDE Brand (#547361)



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- kdebase-runtime.spec	10 Dec 2009 00:25:17 -0000	1.173
+++ kdebase-runtime.spec	16 Dec 2009 12:32:59 -0000	1.174
@@ -3,9 +3,9 @@
 %endif
 
 Name:          kdebase-runtime
-Summary:       K Desktop Environment - Runtime
+Summary:       KDE Runtime
 Version:       4.3.80
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -79,7 +79,7 @@ BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 %description
-Core runtime for the K Desktop Environment 4.
+Core runtime for the KDE 4.
 
 
 %package libs
@@ -231,6 +231,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-4
+- Repositioning the KDE Brand (#547361)
+
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
 - BR: attica-devel shared-desktop-ontologies-devel
 



From rjones at fedoraproject.org  Wed Dec 16 12:33:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 16 Dec 2009 12:33:47 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.57, 1.58 libguestfs.spec, 1.113,
	1.114 sources, 1.57, 1.58
Message-ID: <20091216123347.2F13B11C0092@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30829

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-1
- New upstream release 1.0.80.
- New Polish translations (RHBZ#502533).
- Give a meaningful error if no usable kernels are found (RHBZ#539746).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	18 Nov 2009 15:00:06 -0000	1.57
+++ .cvsignore	16 Dec 2009 12:33:47 -0000	1.58
@@ -1 +1 @@
-libguestfs-1.0.79.tar.gz
+libguestfs-1.0.80.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- libguestfs.spec	6 Dec 2009 23:12:34 -0000	1.113
+++ libguestfs.spec	16 Dec 2009 12:33:47 -0000	1.114
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.79
-Release:     3%{?dist}
+Version:     1.0.80
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -596,6 +596,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-1
+- New upstream release 1.0.80.
+- New Polish translations (RHBZ#502533).
+- Give a meaningful error if no usable kernels are found (RHBZ#539746).
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.0.79-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	18 Nov 2009 15:00:06 -0000	1.57
+++ sources	16 Dec 2009 12:33:47 -0000	1.58
@@ -1 +1 @@
-292f818a0e8ad9b193f133c2ad92d9ff  libguestfs-1.0.79.tar.gz
+54ba1464b12c2b070ea9ec50307cb3ab  libguestfs-1.0.80.tar.gz



From jreznik at fedoraproject.org  Wed Dec 16 12:35:24 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 12:35:24 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.328,1.329
Message-ID: <20091216123524.2EB9011C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31186

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-5
- Repositioning the KDE Brand (#547361)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- kdebase-workspace.spec	11 Dec 2009 19:29:58 -0000	1.328
+++ kdebase-workspace.spec	16 Dec 2009 12:35:23 -0000	1.329
@@ -4,10 +4,10 @@
 
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Summary: K Desktop Environment - Workspace
+Summary: KDE Workspace
 Name: kdebase-workspace
 Version: 4.3.80
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -615,6 +615,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-5
+- Repositioning the KDE Brand (#547361)
+
 * Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-4
 - SELinux is preventing access to a leaked .xsession-errors-:0 file descriptor (#542312)
 



From jakub at fedoraproject.org  Wed Dec 16 12:38:57 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 16 Dec 2009 12:38:57 +0000 (UTC)
Subject: rpms/prelink/F-12 .cvsignore, 1.40, 1.41 prelink.spec, 1.59,
	1.60 sources, 1.43, 1.44
Message-ID: <20091216123857.24CD511C0092@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/prelink/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31861

Modified Files:
	.cvsignore prelink.spec sources 
Log Message:
0.4.2-5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/prelink/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	4 Nov 2009 09:23:59 -0000	1.40
+++ .cvsignore	16 Dec 2009 12:38:56 -0000	1.41
@@ -1 +1 @@
-prelink-20091104.tar.bz2
+prelink-20091216.tar.bz2


Index: prelink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelink/F-12/prelink.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- prelink.spec	4 Nov 2009 09:23:59 -0000	1.59
+++ prelink.spec	16 Dec 2009 12:38:56 -0000	1.60
@@ -1,10 +1,10 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-%define date 20091104
+%define date 20091216
 Source: http://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
 Source2: prelink.conf
 Source3: prelink.cron
@@ -85,6 +85,10 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
+* Wed Dec 16 2009 Jakub Jelinek <jakub at redhat.com> 0.4.2-5
+- change textrel tests, so that even if getenforce exists, but
+  fails, textrel tests aren't run
+
 * Wed Nov  4 2009 Jakub Jelinek <jakub at redhat.com> 0.4.2-4
 - add support for STT_GNU_IFUNC on ppc/ppc64, R_PPC_IRELATIVE and
   R_PPC64_{IRELATIVE,JMP_IREL}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/prelink/F-12/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	4 Nov 2009 09:23:59 -0000	1.43
+++ sources	16 Dec 2009 12:38:56 -0000	1.44
@@ -1 +1 @@
-ed9a1ba2960bad7e266497e308f863ae  prelink-20091104.tar.bz2
+de582b0d05391a68d953a6fc4abb6de2  prelink-20091216.tar.bz2



From jreznik at fedoraproject.org  Wed Dec 16 12:46:52 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 12:46:52 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.109,1.110
Message-ID: <20091216124652.200A611C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv827

Modified Files:
	kdepimlibs.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
- Repositioning the KDE Brand (#547361)



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- kdepimlibs.spec	4 Dec 2009 16:32:47 -0000	1.109
+++ kdepimlibs.spec	16 Dec 2009 12:46:51 -0000	1.110
@@ -4,8 +4,8 @@
 
 Name: kdepimlibs
 Version: 4.3.80
-Release: 1%{?dist}
-Summary: K Desktop Environment 4 - PIM Libraries
+Release: 2%{?dist}
+Summary: KDE PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -41,7 +41,7 @@ Conflicts: kdepim < 6:4.2.90
 
 %description
 Personal Information Management (PIM) libraries for the
-K Desktop Environment 4.
+KDE 4.
 
 %package devel
 Group:    Development/Libraries
@@ -198,6 +198,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
+- Repositioning the KDE Brand (#547361)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 



From jreznik at fedoraproject.org  Wed Dec 16 12:50:00 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 12:50:00 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.252,1.253
Message-ID: <20091216125000.903BC11C0092@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1427

Modified Files:
	kdepim.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-6
- Repositioning the KDE Brand (#547361)



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -r1.252 -r1.253
--- kdepim.spec	11 Dec 2009 15:39:27 -0000	1.252
+++ kdepim.spec	16 Dec 2009 12:50:00 -0000	1.253
@@ -1,8 +1,8 @@
 Name:    kdepim
-Summary: PIM (Personal Information Manager) applications
+Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.80
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -211,6 +211,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-6
+- Repositioning the KDE Brand (#547361)
+
 * Fri Dec 11 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.3.80-5
 - KPilot is no longer part of kdepim
   (see http://bertjan.broeksemaatjes.nl/node/50)



From xhorak at fedoraproject.org  Wed Dec 16 12:58:12 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 12:58:12 +0000 (UTC)
Subject: rpms/xulrunner/F-11 xulrunner.spec,1.170,1.171
Message-ID: <20091216125812.EE60B11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3610

Modified Files:
	xulrunner.spec 
Log Message:
Fix source filename


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/xulrunner.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- xulrunner.spec	16 Dec 2009 12:32:40 -0000	1.170
+++ xulrunner.spec	16 Dec 2009 12:58:12 -0000	1.171
@@ -16,7 +16,7 @@ Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}-source.tar.bz2
+Source0:        xulrunner-%{version}.source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in



From dwalsh at fedoraproject.org  Wed Dec 16 12:58:41 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 12:58:41 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.41,
	1.42 modules-mls.conf, 1.61, 1.62 modules-targeted.conf, 1.150,
	1.151 policy-F13.patch, 1.11, 1.12
Message-ID: <20091216125841.8C6A811C0092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3695

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	policy-F13.patch 
Log Message:
* Fri Dec 11 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-2
- Add tgtd policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- modules-minimum.conf	11 Dec 2009 20:18:54 -0000	1.41
+++ modules-minimum.conf	16 Dec 2009 12:58:40 -0000	1.42
@@ -1576,6 +1576,13 @@ tgtd = module
 # 
 udev = base
 
+# Layer: services
+# Module: udisks
+#
+# Policy for udisk
+# 
+udisks = base
+
 # Layer: system
 # Module: userdomain
 #


Index: modules-mls.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- modules-mls.conf	11 Dec 2009 20:18:54 -0000	1.61
+++ modules-mls.conf	16 Dec 2009 12:58:41 -0000	1.62
@@ -1386,6 +1386,13 @@ tgtd = module
 # 
 udev = base
 
+# Layer: services
+# Module: udisks
+#
+# Policy for udisk
+# 
+udisks = base
+
 # Layer: system
 # Module: userdomain
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- modules-targeted.conf	11 Dec 2009 20:18:54 -0000	1.150
+++ modules-targeted.conf	16 Dec 2009 12:58:41 -0000	1.151
@@ -1576,6 +1576,13 @@ tgtd = module
 # 
 udev = base
 
+# Layer: services
+# Module: udisks
+#
+# Policy for udisk
+# 
+udisks = base
+
 # Layer: system
 # Module: userdomain
 #

policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   11 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   79 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  111 +
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  447 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  117 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  429 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |   21 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  190 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  398 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/u                 |    6 
 policy/modules/services/udisks.fc         |    5 
 policy/modules/services/udisks.if         |  192 +++
 policy/modules/services/udisks.te         |   66 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  281 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  643 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   56 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1683 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 391 files changed, 19944 insertions(+), 2974 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.11 -r 1.12 policy-F13.patchIndex: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- policy-F13.patch	11 Dec 2009 20:18:54 -0000	1.11
+++ policy-F13.patch	16 Dec 2009 12:58:41 -0000	1.12
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.4/Makefile	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/Makefile	2009-12-15 14:56:49.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -12,7 +12,7 @@ diff -b -B --ignore-all-space --exclude-
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/global_tunables	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/global_tunables	2009-12-15 14:56:49.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -50,7 +50,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-15 14:56:49.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -62,7 +62,7 @@ diff -b -B --ignore-all-space --exclude-
  init_use_fds(alsa_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-15 14:56:49.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -82,7 +82,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-15 14:56:49.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -94,7 +94,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-15 14:56:49.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -106,7 +106,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-15 14:56:49.000000000 -0500
 @@ -10,7 +10,6 @@
  type consoletype_exec_t;
  application_executable_file(consoletype_exec_t)
@@ -125,7 +125,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-15 14:56:49.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
@@ -133,7 +133,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-15 14:56:49.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -177,7 +177,7 @@ diff -b -B --ignore-all-space --exclude-
 +dev_read_raw_memory(dmesg_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-15 14:56:49.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -202,7 +202,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-11-25 15:15:48.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-15 14:56:49.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -policy_module(kismet, 1.4.1)
@@ -269,7 +269,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.4/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/logrotate.te	2009-12-07 16:22:38.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/logrotate.te	2009-12-15 14:56:49.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -349,7 +349,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.7.4/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/logwatch.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/logwatch.te	2009-12-15 14:56:49.000000000 -0500
 @@ -93,6 +93,13 @@
  sysnet_exec_ifconfig(logwatch_t)
  
@@ -372,7 +372,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.7.4/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/mrtg.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/mrtg.te	2009-12-15 14:56:49.000000000 -0500
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -383,7 +383,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.4/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/netutils.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/netutils.te	2009-12-15 14:56:49.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -402,7 +402,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.7.4/policy/modules/admin/ntop.fc
 --- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/ntop.fc	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/ntop.fc	2009-12-15 14:56:49.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
 +
@@ -411,7 +411,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.7.4/policy/modules/admin/ntop.if
 --- nsaserefpolicy/policy/modules/admin/ntop.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/ntop.if	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/ntop.if	2009-12-15 14:56:49.000000000 -0500
 @@ -0,0 +1,158 @@
 +
 +## <summary>policy for ntop</summary>
@@ -573,7 +573,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.te serefpolicy-3.7.4/policy/modules/admin/ntop.te
 --- nsaserefpolicy/policy/modules/admin/ntop.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/ntop.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/ntop.te	2009-12-15 14:56:49.000000000 -0500
 @@ -0,0 +1,40 @@
 +policy_module(ntop,1.0.0)
 +
@@ -617,7 +617,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.7.4/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/portage.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/portage.te	2009-12-15 14:56:49.000000000 -0500
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -629,7 +629,7 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-3.7.4/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/prelink.fc	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/prelink.fc	2009-12-15 14:56:49.000000000 -0500
 @@ -1,3 +1,4 @@
 +/etc/cron\.daily/prelink	--      gen_context(system_u:object_r:prelink_cron_system_exec_t,s0)
  
@@ -637,7 +637,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.7.4/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/prelink.if	2009-12-10 15:16:44.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/prelink.if	2009-12-15 14:56:49.000000000 -0500
 @@ -21,6 +21,25 @@
  
  ########################################
@@ -680,7 +680,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.7.4/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-11-17 10:54:26.000000000 -0500
[...5371 lines suppressed...]
++	')
++
++	can_exec($1, fusermount_exec_t)
++')
++
++########################################
++## <summary>
++##	dontaudit Execute fusermount.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`mount_dontaudit_exec_fusermount',`
++	gen_require(`
++		type fusermount_exec_t;
++	')
++
++	dontaudit $1 fusermount_exec_t:file exec_file_perms;
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.7.4/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/mount.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/mount.te	2009-12-15 14:56:49.000000000 -0500
 @@ -18,8 +18,15 @@
  init_system_domain(mount_t, mount_exec_t)
  role system_r types mount_t;
@@ -30210,7 +30852,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.7.4/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/raid.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/raid.te	2009-12-15 14:56:49.000000000 -0500
 @@ -51,11 +51,13 @@
  dev_dontaudit_getattr_generic_chr_files(mdadm_t)
  dev_dontaudit_getattr_generic_blk_files(mdadm_t)
@@ -30227,7 +30869,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_dontaudit_list_tmpfs(mdadm_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.7.4/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.fc	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.fc	2009-12-15 14:56:49.000000000 -0500
 @@ -6,13 +6,13 @@
  /etc/selinux(/.*)?			gen_context(system_u:object_r:selinux_config_t,s0)
  /etc/selinux/([^/]*/)?contexts(/.*)?	gen_context(system_u:object_r:default_context_t,s0)
@@ -30269,7 +30911,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.7.4/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.if	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.if	2009-12-15 14:56:49.000000000 -0500
 @@ -351,6 +351,27 @@
  
  ########################################
@@ -30627,7 +31269,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.7.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.te	2009-12-15 14:56:49.000000000 -0500
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -31005,7 +31647,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.7.4/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.fc	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.fc	2009-12-15 14:56:49.000000000 -0500
 @@ -11,15 +11,20 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -31043,7 +31685,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.7.4/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.if	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.if	2009-12-15 16:39:30.000000000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -31220,7 +31862,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.7.4/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.te	2009-12-15 14:56:49.000000000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -31444,7 +32086,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.7.4/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/udev.if	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/udev.if	2009-12-15 14:56:49.000000000 -0500
 @@ -186,6 +186,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -31455,7 +32097,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.7.4/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/udev.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/udev.te	2009-12-15 14:56:49.000000000 -0500
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -31505,7 +32147,7 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.7.4/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/unconfined.fc	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/unconfined.fc	2009-12-15 14:56:49.000000000 -0500
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -31525,7 +32167,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.7.4/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/unconfined.if	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/unconfined.if	2009-12-15 14:56:49.000000000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -32031,7 +32673,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.7.4/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/unconfined.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/unconfined.te	2009-12-15 14:56:49.000000000 -0500
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -32263,7 +32905,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.7.4/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.fc	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.fc	2009-12-15 14:56:49.000000000 -0500
 @@ -1,4 +1,9 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -32277,7 +32919,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.7.4/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.if	2009-12-10 15:29:06.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.if	2009-12-15 14:56:49.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -34638,7 +35280,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-15 14:56:49.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -34729,7 +35371,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-09 13:28:05.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-15 14:56:49.000000000 -0500
 @@ -180,6 +180,25 @@
  
  ########################################
@@ -34758,7 +35400,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-09 12:33:13.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-15 14:56:49.000000000 -0500
 @@ -85,6 +85,7 @@
  type xenconsoled_t;
  type xenconsoled_exec_t;
@@ -34799,7 +35441,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_search_mnt(xend_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-05 06:20:51.000000000 -0500
++++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-15 14:56:49.000000000 -0500
 @@ -199,12 +199,14 @@
  #
  define(`getattr_file_perms',`{ getattr }')
@@ -34844,7 +35486,7 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/users	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.4/policy/users	2009-12-15 14:56:49.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #



From dwalsh at fedoraproject.org  Wed Dec 16 13:03:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 13:03:07 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.45,
	1.46 policy-F12.patch, 1.154, 1.155 selinux-policy.spec, 1.982, 1.983
Message-ID: <20091216130307.C95EA11C0092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4645

Modified Files:
	modules-minimum.conf policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Dec 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-59
- Dontaudit udp_socket leaks for xauth_t
- Dontaudit rules for iceauth_t
- Let locate read symlinks on noxattr file systems
- Remove wine from unconfined domain if unconfined pp removed
- Add labels for vhostmd
- Add port 546 as a dhcpc port
- Add labeled for /dev/dahdi
- Add certmonger policy
- Allow sysadm to communicate with racoon and zebra
- Allow dbus service dbus_chat with unconfined_t
- Fixes for xguest
- Add dontaudits for abrt
- file contexts for mythtv
- Lots of fixes for asterisk
- Fix file context for certmaster
- Add log dir for dovecot
- Policy for ksmtuned
- File labeling and fixes for mysql and mysql_safe
- New plugin infrstructure for nagios
- Allow nut_upsd_t dac_override
- File context fixes for nx
- Allow oddjob_mkhomedir to create homedir
- Add pcscd_pub interfaces to be used by xdm
- Add stream connect from fenced to corosync
- Fixes for swat
- Allow fsdaemon to manage scsi devices
- Policy for tgtd
- Policy for vhostmd
- Allow ipsec to create tmp files
- Change label on fusermount



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- modules-minimum.conf	9 Dec 2009 19:53:38 -0000	1.45
+++ modules-minimum.conf	16 Dec 2009 13:03:07 -0000	1.46
@@ -233,6 +233,13 @@ certwatch = module
 certmaster = module
 
 # Layer: services
+# Module: certmonger
+#
+# Certificate status monitor and PKI enrollment client
+# 
+certmonger = module
+
+# Layer: services
 # Module: cipe
 #
 # Encrypted tunnel daemon

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   45 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   49 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  438 +++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  447 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  117 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  448 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   52 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   21 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   51 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.te          |   23 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  190 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  398 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   59 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  283 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  637 ++++++++++-
 policy/modules/services/xserver.te        |  382 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  184 +++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   78 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  186 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   82 +
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1691 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 412 files changed, 21403 insertions(+), 2828 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- policy-F12.patch	15 Dec 2009 16:10:11 -0000	1.154
+++ policy-F12.patch	16 Dec 2009 13:03:07 -0000	1.155
@@ -2211,7 +2211,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.te serefpolicy-3.6.32/policy/modules/apps/chrome.te
 --- nsaserefpolicy/policy/modules/apps/chrome.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/chrome.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.te	2009-12-15 15:31:21.000000000 -0500
 @@ -0,0 +1,78 @@
 +policy_module(chrome,1.0.0)
 +
@@ -2351,8 +2351,8 @@ diff -b -B --ignore-all-space --exclude-
 +/opt/Komodo-Edit-5/lib/mozilla/komodo-bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.if serefpolicy-3.6.32/policy/modules/apps/execmem.if
 --- nsaserefpolicy/policy/modules/apps/execmem.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/execmem.if	2009-12-03 13:45:10.000000000 -0500
-@@ -0,0 +1,80 @@
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.if	2009-12-15 15:25:07.000000000 -0500
+@@ -0,0 +1,104 @@
 +## <summary>execmem domain</summary>
 +
 +########################################
@@ -2433,6 +2433,30 @@ diff -b -B --ignore-all-space --exclude-
 +		xserver_role($2, $1_execmem_t)
 +	')
 +')
++
++########################################
++## <summary>
++##	Execute a execmem_exec file
++##	in the specified domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="target_domain">
++##	<summary>
++##	The type of the new process.
++##	</summary>
++## </param>
++#
++interface(`execmem_domtrans',`
++	gen_require(`
++		type execmem_exec_t;
++	')
++
++	domtrans_pattern($1, execmem_exec_t, $2)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.te serefpolicy-3.6.32/policy/modules/apps/execmem.te
 --- nsaserefpolicy/policy/modules/apps/execmem.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/apps/execmem.te	2009-12-03 13:45:10.000000000 -0500
@@ -5852,8 +5876,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.te serefpolicy-3.6.32/policy/modules/apps/seunshare.te
 --- nsaserefpolicy/policy/modules/apps/seunshare.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/seunshare.te	2009-12-03 13:45:10.000000000 -0500
-@@ -0,0 +1,43 @@
++++ serefpolicy-3.6.32/policy/modules/apps/seunshare.te	2009-12-15 15:30:08.000000000 -0500
+@@ -0,0 +1,42 @@
 +policy_module(seunshare,1.0.0)
 +
 +########################################
@@ -5871,10 +5895,9 @@ diff -b -B --ignore-all-space --exclude-
 +# seunshare local policy
 +#
 +
-+allow seunshare_t self:process { fork setexec signal };
-+allow seunshare_t self:capability { setuid dac_override setpcap sys_admin };
-+allow seunshare_t self:process { getcap setcap };
++allow seunshare_t self:process { fork setexec signal getcap setcap };
 +
++allow seunshare_t self:capability { setuid dac_override setpcap sys_admin };
 +allow seunshare_t self:fifo_file rw_file_perms;
 +allow seunshare_t self:unix_stream_socket create_stream_socket_perms;
 +
@@ -6126,7 +6149,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-12-06 11:18:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-12-15 15:09:33.000000000 -0500
 @@ -1,4 +1,4 @@
 -
 +c
@@ -6286,7 +6309,14 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-12-09 09:43:30.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-12-15 15:01:52.000000000 -0500
+@@ -1,5 +1,5 @@
+ 
+-policy_module(corenetwork, 1.12.1)
++policy_module(corenetwork, 1.13.0)
+ 
+ ########################################
+ #
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -6358,7 +6388,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(memcache, tcp,11211,s0, udp,11211,s0)
  network_port(mmcc, tcp,5050,s0, udp,5050,s0)
  network_port(monopd, tcp,1234,s0)
-@@ -138,21 +148,29 @@
+@@ -138,24 +148,33 @@
  network_port(mysqld, tcp,1186,s0, tcp,3306,s0)
  portcon tcp 63132-63163 gen_context(system_u:object_r:mysqld_port_t, s0)
  network_port(nessus, tcp,1241,s0)
@@ -6389,7 +6419,11 @@ diff -b -B --ignore-all-space --exclude-
  network_port(printer, tcp,515,s0)
  network_port(ptal, tcp,5703,s0)
  network_port(pulseaudio, tcp,4713,s0)
-@@ -171,29 +189,37 @@
++network_port(puppet, tcp, 8140, s0)
+ network_port(pxe, udp,4011,s0)
+ network_port(pyzor, udp,24441,s0)
+ network_port(radacct, udp,1646,s0, udp,1813,s0)
+@@ -171,29 +190,37 @@
  network_port(rsync, tcp,873,s0, udp,873,s0)
  network_port(rwho, udp,513,s0)
  network_port(sap, tcp,9875,s0, udp,9875,s0)
@@ -6430,7 +6464,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
  network_port(xfs, tcp,7100,s0)
-@@ -222,6 +248,8 @@
+@@ -222,6 +249,8 @@
  type node_t, node_type;
  sid node gen_context(system_u:object_r:node_t,s0 - mls_systemhigh)
  
@@ -6441,27 +6475,49 @@ diff -b -B --ignore-all-space --exclude-
  #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.6.32/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.fc	2009-12-12 07:47:41.000000000 -0500
-@@ -17,6 +17,7 @@
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.fc	2009-12-15 15:08:19.000000000 -0500
+@@ -16,13 +16,16 @@
+ /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/autofs.*		-c	gen_context(system_u:object_r:autofs_device_t,s0)
  /dev/beep		-c	gen_context(system_u:object_r:sound_device_t,s0)
++/dev/btrfs-control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
  /dev/controlD64		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
 +/dev/dahdi/.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/dmfm		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/dmmidi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/dsp.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
-@@ -47,8 +48,10 @@
+ /dev/efirtc		-c	gen_context(system_u:object_r:clock_device_t,s0)
+ /dev/elographics/e2201	-c	gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/em8300.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
++/dev/etherd/.+		-c	gen_context(system_u:object_r:lvm_control_t,s0)
+ /dev/event.*		-c	gen_context(system_u:object_r:event_device_t,s0)
+ /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)
+@@ -47,8 +50,10 @@
  /dev/kmem		-c	gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
  /dev/kmsg		-c	gen_context(system_u:object_r:kmsg_device_t,mls_systemhigh)
  /dev/kqemu		-c	gen_context(system_u:object_r:qemu_device_t,s0)
 +/dev/ksm		-c	gen_context(system_u:object_r:ksm_device_t,s0)
  /dev/kvm		-c	gen_context(system_u:object_r:kvm_device_t,s0)
  /dev/lik.*		-c	gen_context(system_u:object_r:event_device_t,s0)
-+/dev/lirc[0-9]+        -c      gen_context(system_u:object_r:lirc_device_t,s0)
++/dev/lirc[0-9]+	-c	gen_context(system_u:object_r:lirc_device_t,s0)
  /dev/lircm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/logibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
-@@ -82,6 +85,7 @@
+@@ -61,10 +66,12 @@
+ /dev/midi.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/mixer.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/mmetfgrab		-c	gen_context(system_u:object_r:scanner_device_t,s0)
++/dev/modem		-c	gen_context(system_u:object_r:modem_device_t,s0)
+ /dev/mpu401.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/msr.*		-c	gen_context(system_u:object_r:cpu_device_t,s0)
+ /dev/network_latency	-c	gen_context(system_u:object_r:netcontrol_device_t,s0)
+ /dev/network_throughput	-c	gen_context(system_u:object_r:netcontrol_device_t,s0)
++/dev/noz.* 		-c	gen_context(system_u:object_r:modem_device_t,s0)
+ /dev/null		-c	gen_context(system_u:object_r:null_device_t,s0)
+ /dev/nvidia.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
+ /dev/nvram		-c	gen_context(system_u:object_r:nvram_device_t,mls_systemhigh)
+@@ -82,6 +89,7 @@
  /dev/radio.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  /dev/random		-c	gen_context(system_u:object_r:random_device_t,s0)
  /dev/raw1394.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
@@ -6469,44 +6525,21 @@ diff -b -B --ignore-all-space --exclude-
  /dev/(misc/)?rtc[0-9]*	-c	gen_context(system_u:object_r:clock_device_t,s0)
  /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
-@@ -101,7 +105,7 @@
+@@ -101,7 +109,8 @@
  /dev/usbscanner		-c	gen_context(system_u:object_r:scanner_device_t,s0)
  ')
  /dev/vbi.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
 -/dev/vboxadd.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
 +/dev/vbox.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
++/dev/vga_arbiter	-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
  /dev/vmmon		-c	gen_context(system_u:object_r:vmware_device_t,s0)
  /dev/vmnet.*		-c	gen_context(system_u:object_r:vmware_device_t,s0)
  /dev/video.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
-@@ -138,9 +142,14 @@
- /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)
-+/dev/btrfs-control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
-+/dev/etherd/.+		-c	gen_context(system_u:object_r:lvm_control_t,s0)
- 
-+/dev/modem -c	gen_context(system_u:object_r:modem_device_t,s0)
- /dev/mvideo/.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
- 
-+/dev/noz.* 		-c	gen_context(system_u:object_r:modem_device_t,s0)
-+
- /dev/pts(/.*)?			<<none>>
- 
- /dev/s(ou)?nd/.*	-c	gen_context(system_u:object_r:sound_device_t,s0)
-@@ -148,6 +157,8 @@
- /dev/touchscreen/ucb1x00 -c	gen_context(system_u:object_r:mouse_device_t,s0)
- /dev/touchscreen/mk712	-c	gen_context(system_u:object_r:mouse_device_t,s0)
- 
-+/dev/vga_arbiter	-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
-+
- /dev/usb/dc2xx.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
- /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
- /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
-@@ -168,6 +179,7 @@
+@@ -168,6 +176,7 @@
  
  ifdef(`distro_redhat',`
  # originally from named.fc
-+/var/named/chroot/dev -d	gen_context(system_u:object_r:device_t,s0)
++/var/named/chroot/dev	-d	gen_context(system_u:object_r:device_t,s0)
  /var/named/chroot/dev/null -c	gen_context(system_u:object_r:null_device_t,s0)
  /var/named/chroot/dev/random -c	gen_context(system_u:object_r:random_device_t,s0)
  /var/named/chroot/dev/zero -c	gen_context(system_u:object_r:zero_device_t,s0)
@@ -8872,7 +8905,7 @@ diff -b -B --ignore-all-space --exclude-
 +gen_user(guest_u, user, guest_r, s0, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.6.32/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/staff.te	2009-12-06 10:20:16.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/roles/staff.te	2009-12-15 15:29:13.000000000 -0500
 @@ -10,161 +10,121 @@
  
  userdom_unpriv_user_template(staff)
@@ -8934,111 +8967,111 @@ diff -b -B --ignore-all-space --exclude-
 -
 -optional_policy(`
 -	gift_role(staff_r, staff_t)
-+	sudo_role_template(staff, staff_r, staff_t)
++	auditadm_role_change(staff_r)
  ')
  
  optional_policy(`
 -	gnome_role(staff_r, staff_t)
-+	auditadm_role_change(staff_r)
++	kerneloops_manage_tmp_files(staff_t)
  ')
  
  optional_policy(`
 -	gpg_role(staff_r, staff_t)
-+	firewallgui_dbus_chat(staff_t)
++	logadm_role_change(staff_r)
  ')
  
  optional_policy(`
 -	irc_role(staff_r, staff_t)
-+	logadm_role_change(staff_r)
++	postgresql_role(staff_r, staff_t)
  ')
  
  optional_policy(`
 -	java_role(staff_r, staff_t)
-+	kerneloops_manage_tmp_files(staff_t)
++	rtkit_daemon_system_domain(staff_t)
  ')
  
  optional_policy(`
 -	lockdev_role(staff_r, staff_t)
-+	postgresql_role(staff_r, staff_t)
++	secadm_role_change(staff_r)
  ')
  
  optional_policy(`
 -	lpd_role(staff_r, staff_t)
-+	rtkit_daemon_system_domain(staff_t)
++	ssh_role_template(staff, staff_r, staff_t)
  ')
  
  optional_policy(`
 -	mozilla_role(staff_r, staff_t)
-+	secadm_role_change(staff_r)
++	sudo_role_template(staff, staff_r, staff_t)
  ')
  
  optional_policy(`
 -	mplayer_role(staff_r, staff_t)
-+	ssh_role_template(staff, staff_r, staff_t)
++	sysadm_role_change(staff_r)
  ')
  
  optional_policy(`
 -	mta_role(staff_r, staff_t)
-+	sysadm_role_change(staff_r)
++	usernetctl_run(staff_t, staff_r)
  ')
  
  optional_policy(`
 -	oident_manage_user_content(staff_t)
 -	oident_relabel_user_content(staff_t)
-+	usernetctl_run(staff_t, staff_r)
- ')
- 
- optional_policy(`
--	pyzor_role(staff_r, staff_t)
 +	unconfined_role_change(staff_r)
  ')
  
  optional_policy(`
--	razor_role(staff_r, staff_t)
+-	pyzor_role(staff_r, staff_t)
 +	webadm_role_change(staff_r)
  ')
  
 -optional_policy(`
--	rssh_role(staff_r, staff_t)
+-	razor_role(staff_r, staff_t)
 -')
 +domain_read_all_domains_state(staff_t)
 +domain_getattr_all_domains(staff_t)
 +domain_obj_id_change_exemption(staff_t)
  
 -optional_policy(`
--	screen_role_template(staff, staff_r, staff_t)
+-	rssh_role(staff_r, staff_t)
 -')
 +files_read_kernel_modules(staff_t)
  
 -optional_policy(`
--	secadm_role_change(staff_r)
+-	screen_role_template(staff, staff_r, staff_t)
 -')
 +kernel_read_fs_sysctls(staff_t)
  
 -optional_policy(`
--	spamassassin_role(staff_r, staff_t)
+-	secadm_role_change(staff_r)
 -')
 +modutils_read_module_config(staff_t)
 +modutils_read_module_deps(staff_t)
  
 -optional_policy(`
--	ssh_role_template(staff, staff_r, staff_t)
+-	spamassassin_role(staff_r, staff_t)
 -')
 +miscfiles_read_hwdata(staff_t)
  
 -optional_policy(`
--	su_role_template(staff, staff_r, staff_t)
+-	ssh_role_template(staff, staff_r, staff_t)
 -')
 +term_use_unallocated_ttys(staff_t)
  
  optional_policy(`
+-	su_role_template(staff, staff_r, staff_t)
++	gnomeclock_dbus_chat(staff_t)
+ ')
+ 
+ optional_policy(`
 -	sudo_role_template(staff, staff_r, staff_t)
 -')
 -
 -optional_policy(`
 -	sysadm_role_change(staff_r)
 -	userdom_dontaudit_use_user_terminals(staff_t)
-+	gnomeclock_dbus_chat(staff_t)
++	firewallgui_dbus_chat(staff_t)
  ')
  
  optional_policy(`
@@ -9404,7 +9437,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.6.32/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.if	2009-12-08 16:42:21.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.if	2009-12-15 15:24:39.000000000 -0500
 @@ -0,0 +1,667 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -9994,10 +10027,10 @@ diff -b -B --ignore-all-space --exclude-
 +interface(`unconfined_execmem_domtrans',`
 +
 +	gen_require(`
-+		type unconfined_execmem_t, execmem_exec_t;
++		type unconfined_execmem_t;
 +	')
 +
-+	domtrans_pattern($1, execmem_exec_t, unconfined_execmem_t)
++	execmem_domtrans($1, unconfined_execmem_t)
 +')
 +
 +########################################
@@ -10075,8 +10108,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-10 15:25:20.000000000 -0500
-@@ -0,0 +1,450 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-15 15:26:13.000000000 -0500
+@@ -0,0 +1,447 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -10407,6 +10440,7 @@ diff -b -B --ignore-all-space --exclude-
 +	rpm_run(unconfined_t, unconfined_r)
 +	# Allow SELinux aware applications to request rpm_script execution
 +	rpm_transition_script(unconfined_t)
++	rpm_dbus_chat(unconfined_t)
 +')
 +
 +optional_policy(`
@@ -10515,10 +10549,6 @@ diff -b -B --ignore-all-space --exclude-
 +rpm_transition_script(unconfined_notrans_t)
 +domain_ptrace_all_domains(unconfined_notrans_t)
 +
-+optional_policy(`
-+	rtkit_daemon_system_domain(unconfined_notrans_t)
-+')
-+
 +########################################
 +#
 +# Unconfined mount local policy
@@ -10680,8 +10710,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.6.32/policy/modules/roles/xguest.te
 --- nsaserefpolicy/policy/modules/roles/xguest.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-12-03 17:50:59.000000000 -0500
-@@ -35,12 +35,34 @@
++++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-12-15 15:16:29.000000000 -0500
+@@ -35,6 +35,23 @@
  #
  # Local policy
  #
@@ -10698,8 +10728,6 @@ diff -b -B --ignore-all-space --exclude-
 +		storage_raw_read_removable_device(xguest_t)
 +	')
 +')
-+storage_rw_fuse(xguest_t)
-+
 +# Dontaudit fusermount
 +mount_dontaudit_exec_fusermount(xguest_t)
 +
@@ -10707,16 +10735,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow mounting of file systems
  optional_policy(`
- 	tunable_policy(`xguest_mount_media',`
- 		kernel_read_fs_sysctls(xguest_t)
- 
-+		# allow fusermount
-+		allow xguest_t self:capability sys_admin;
-+
- 		files_dontaudit_getattr_boot_dirs(xguest_t)
- 		files_search_mnt(xguest_t)
- 
-@@ -49,10 +71,9 @@
+@@ -49,10 +66,9 @@
  		fs_manage_noxattr_fs_dirs(xguest_t)
  		fs_getattr_noxattr_fs(xguest_t)
  		fs_read_noxattr_fs_symlinks(xguest_t)
@@ -10728,7 +10747,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -67,17 +88,60 @@
+@@ -67,17 +83,60 @@
  ')
  
  optional_policy(`
@@ -10778,9 +10797,10 @@ diff -b -B --ignore-all-space --exclude-
 +		corenet_tcp_connect_speech_port(xguest_usertype)
 +		corenet_tcp_sendrecv_transproxy_port(xguest_usertype)
 +		corenet_tcp_connect_transproxy_port(xguest_usertype)
-+	')
  	')
-+
+ ')
+ 
+-#gen_user(xguest_u,, xguest_r, s0, s0)
 +optional_policy(`
 +	gen_require(`
 +		type mozilla_t;
@@ -10788,9 +10808,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	allow xguest_t mozilla_t:process transition;
 +	role xguest_r types mozilla_t;
- ')
- 
--#gen_user(xguest_u,, xguest_r, s0, s0)
++')
++
 +gen_user(xguest_u, user, xguest_r, s0, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.fc serefpolicy-3.6.32/policy/modules/services/abrt.fc
 --- nsaserefpolicy/policy/modules/services/abrt.fc	2009-09-16 10:01:19.000000000 -0400
@@ -17488,13 +17507,15 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.te serefpolicy-3.6.32/policy/modules/services/memcached.te
 --- nsaserefpolicy/policy/modules/services/memcached.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/memcached.te	2009-12-03 13:45:11.000000000 -0500
-@@ -44,6 +44,8 @@
++++ serefpolicy-3.6.32/policy/modules/services/memcached.te	2009-12-15 14:43:27.000000000 -0500
+@@ -44,6 +44,10 @@
  
  files_read_etc_files(memcached_t)
  
 +kernel_read_system_state(memcached_t)
 +
++auth_use_nsswitch(memcached_t)
++
  miscfiles_read_localization(memcached_t)
  
  sysnet_dns_name_resolve(memcached_t)
@@ -17767,8 +17788,34 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.6.32/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/mysql.te	2009-12-11 15:50:04.000000000 -0500
-@@ -136,10 +136,19 @@
++++ serefpolicy-3.6.32/policy/modules/services/mysql.te	2009-12-15 16:12:15.000000000 -0500
+@@ -1,6 +1,13 @@
+ 
+ policy_module(mysql, 1.11.0)
+ 
++## <desc>
++## <p>
++## Allow mysqld to connect to all ports
++## </p>
++## </desc>
++gen_tunable(mysql_connect_any, false)
++
+ ########################################
+ #
+ # Declarations
+@@ -109,6 +116,11 @@
+ # for /root/.my.cnf - should not be needed:
+ userdom_read_user_home_content_files(mysqld_t)
+ 
++tunable_policy(`mysql_connect_any',`
++	corenet_tcp_connect_all_ports(mysqld_t)
++	corenet_sendrecv_all_client_packets(mysqld_t)
++')
++
+ ifdef(`distro_redhat',`
+ 	# because Fedora has the sock_file in the database directory
+ 	type_transition mysqld_t mysqld_db_t:sock_file mysqld_var_run_t;
+@@ -136,10 +148,19 @@
  
  domtrans_pattern(mysqld_safe_t, mysqld_exec_t, mysqld_t)
  
@@ -17788,7 +17835,7 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_list_sysfs(mysqld_safe_t)
  
-@@ -152,7 +161,7 @@
+@@ -152,7 +173,7 @@
  
  miscfiles_read_localization(mysqld_safe_t) 
  
@@ -28019,7 +28066,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-15 10:07:56.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-15 14:58:12.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -29704,7 +29751,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.32/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/init.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/init.te	2009-12-15 16:44:06.000000000 -0500
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -29743,16 +29790,17 @@ diff -b -B --ignore-all-space --exclude-
  # is ~sys_module really needed? observed: 
  # sys_boot
  # sys_tty_config
-@@ -101,7 +116,7 @@
+@@ -101,7 +116,8 @@
  # Re-exec itself
  can_exec(init_t, init_exec_t)
  
 -allow init_t initrc_t:unix_stream_socket connectto;
 +allow init_t initrc_t:unix_stream_socket { connectto rw_stream_socket_perms };
++allow initrc_t init_t:unix_stream_socket { connectto rw_stream_socket_perms };
  
  # For /var/run/shutdown.pid.
  allow init_t init_var_run_t:file manage_file_perms;
-@@ -140,6 +155,7 @@
+@@ -140,6 +156,7 @@
  files_dontaudit_rw_root_files(init_t)
  files_dontaudit_rw_root_chr_files(init_t)
  
@@ -29760,7 +29808,7 @@ diff -b -B --ignore-all-space --exclude-
  # cjp: this may be related to /dev/log
  fs_write_ramfs_sockets(init_t)
  
-@@ -167,6 +183,8 @@
+@@ -167,6 +184,8 @@
  
  miscfiles_read_localization(init_t)
  
@@ -29769,7 +29817,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_gentoo',`
  	allow init_t self:process { getcap setcap };
  ')
-@@ -189,6 +207,18 @@
+@@ -189,6 +208,18 @@
  ')
  
  optional_policy(`
@@ -29788,7 +29836,7 @@ diff -b -B --ignore-all-space --exclude-
  	nscd_socket_use(init_t)
  ')
  
-@@ -202,9 +232,10 @@
+@@ -202,9 +233,10 @@
  #
  
  allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched };
@@ -29800,7 +29848,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow IPC with self
  allow initrc_t self:unix_dgram_socket create_socket_perms;
-@@ -217,7 +248,8 @@
+@@ -217,7 +249,8 @@
  term_create_pty(initrc_t, initrc_devpts_t)
  
  # Going to single user mode
@@ -29810,7 +29858,7 @@ diff -b -B --ignore-all-space --exclude-
  
  can_exec(initrc_t, init_script_file_type)
  
-@@ -230,10 +262,16 @@
+@@ -230,10 +263,16 @@
  
  allow initrc_t initrc_var_run_t:file manage_file_perms;
  files_pid_filetrans(initrc_t, initrc_var_run_t, file)
@@ -29829,7 +29877,7 @@ diff -b -B --ignore-all-space --exclude-
  files_tmp_filetrans(initrc_t, initrc_tmp_t, { file dir })
  
  init_write_initctl(initrc_t)
-@@ -246,13 +284,19 @@
+@@ -246,13 +285,19 @@
  kernel_clear_ring_buffer(initrc_t)
  kernel_get_sysvipc_info(initrc_t)
  kernel_read_all_sysctls(initrc_t)
@@ -29851,7 +29899,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(initrc_t)
  corenet_all_recvfrom_netlabel(initrc_t)
-@@ -272,16 +316,63 @@
+@@ -272,16 +317,63 @@
  dev_rw_sysfs(initrc_t)
  dev_list_usbfs(initrc_t)
  dev_read_framebuffer(initrc_t)
@@ -29916,7 +29964,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_kill_all_domains(initrc_t)
  domain_signal_all_domains(initrc_t)
-@@ -291,7 +382,7 @@
+@@ -291,7 +383,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -29925,7 +29973,7 @@ diff -b -B --ignore-all-space --exclude-
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -306,14 +397,15 @@
+@@ -306,14 +398,15 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -29943,7 +29991,7 @@ diff -b -B --ignore-all-space --exclude-
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -324,48 +416,16 @@
+@@ -324,48 +417,16 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
@@ -29996,7 +30044,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -374,19 +434,22 @@
+@@ -374,19 +435,22 @@
  
  miscfiles_read_localization(initrc_t)
  # slapd needs to read cert files from its initscript
@@ -30020,7 +30068,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_debian',`
  	dev_setattr_generic_dirs(initrc_t)
  
-@@ -422,16 +485,12 @@
+@@ -422,16 +486,12 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -30038,7 +30086,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		arpwatch_manage_data_files(initrc_t)
-@@ -450,11 +509,9 @@
+@@ -450,11 +510,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -30051,7 +30099,7 @@ diff -b -B --ignore-all-space --exclude-
  	# These seem to be from the initrd
  	# during device initialization:
  	dev_create_generic_dirs(initrc_t)
-@@ -464,6 +521,7 @@
+@@ -464,6 +522,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -30059,7 +30107,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -492,11 +550,17 @@
+@@ -492,15 +551,22 @@
  	optional_policy(`
  		bind_manage_config_dirs(initrc_t)
  		bind_write_config(initrc_t)
@@ -30077,7 +30125,12 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -515,6 +579,33 @@
+ 		sysnet_rw_dhcp_config(initrc_t)
++		sysnet_manage_config(initrc_t)
+ 	')
+ 
+ 	optional_policy(`
+@@ -515,6 +581,33 @@
  	')
  ')
  
@@ -30111,7 +30164,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -567,10 +658,19 @@
+@@ -567,10 +660,19 @@
  	dbus_connect_system_bus(initrc_t)
  	dbus_system_bus_client(initrc_t)
  	dbus_read_config(initrc_t)
@@ -30131,7 +30184,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -590,6 +690,10 @@
+@@ -590,6 +692,10 @@
  ')
  
  optional_policy(`
@@ -30142,7 +30195,7 @@ diff -b -B --ignore-all-space --exclude-
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -646,20 +750,20 @@
+@@ -646,20 +752,20 @@
  ')
  
  optional_policy(`
@@ -30169,7 +30222,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -668,6 +772,7 @@
+@@ -668,6 +774,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -30177,7 +30230,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -696,7 +801,6 @@
+@@ -696,7 +803,6 @@
  ')
  
  optional_policy(`
@@ -30185,7 +30238,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -718,8 +822,6 @@
+@@ -718,8 +824,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -30194,7 +30247,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -732,13 +834,16 @@
+@@ -732,13 +836,16 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -30211,7 +30264,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -747,6 +852,7 @@
+@@ -747,6 +854,7 @@
  
  optional_policy(`
  	udev_rw_db(initrc_t)
@@ -30219,7 +30272,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -754,6 +860,15 @@
+@@ -754,6 +862,15 @@
  ')
  
  optional_policy(`
@@ -30235,7 +30288,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -764,6 +879,21 @@
+@@ -764,6 +881,21 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -30257,7 +30310,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -789,3 +919,31 @@
+@@ -789,3 +921,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -30370,7 +30423,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.32/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-12-10 11:41:15.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-12-15 15:50:05.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -30418,12 +30471,12 @@ diff -b -B --ignore-all-space --exclude-
  type setkey_t;
  type setkey_exec_t;
  init_system_domain(setkey_t, setkey_exec_t)
-@@ -53,21 +72,23 @@
+@@ -53,23 +72,29 @@
  # ipsec Local policy
  #
  
 -allow ipsec_t self:capability { net_admin dac_override dac_read_search };
-+allow ipsec_t self:capability { net_admin dac_override dac_read_search sys_nice };
++allow ipsec_t self:capability { dac_override dac_read_search net_admin setpcap sys_nice };
  dontaudit ipsec_t self:capability sys_tty_config;
 -allow ipsec_t self:process { signal setsched };
 +allow ipsec_t self:process { getcap setcap getsched signal setsched };
@@ -30441,11 +30494,17 @@ diff -b -B --ignore-all-space --exclude-
  
  allow ipsec_t ipsec_key_file_t:dir list_dir_perms;
 -read_files_pattern(ipsec_t, ipsec_key_file_t, ipsec_key_file_t)
-+manage_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t)
++manage_files_pattern(ipsec_t, ipsec_key_file_t, ipsec_key_file_t)
  read_lnk_files_pattern(ipsec_t, ipsec_key_file_t, ipsec_key_file_t)
  
++manage_dirs_pattern(ipsec_t, ipsec_tmp_t, ipsec_tmp_t)
++manage_files_pattern(ipsec_t, ipsec_tmp_t, ipsec_tmp_t)
++files_tmp_filetrans(ipsec_t, ipsec_tmp_t, { dir file }) 
++
  manage_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t)
-@@ -82,16 +103,17 @@
+ manage_sock_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t)
+ files_pid_filetrans(ipsec_t, ipsec_var_run_t, { file sock_file })
+@@ -82,16 +107,17 @@
  # so try flipping back into the ipsec_mgmt_t domain
  corecmd_shell_domtrans(ipsec_t, ipsec_mgmt_t)
  allow ipsec_mgmt_t ipsec_t:fd use;
@@ -30465,7 +30524,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_getattr_core_if(ipsec_t)
  kernel_getattr_message_if(ipsec_t)
  
-@@ -120,7 +142,9 @@
+@@ -120,7 +146,9 @@
  
  domain_use_interactive_fds(ipsec_t)
  
@@ -30475,11 +30534,13 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(ipsec_t)
  fs_search_auto_mountpoints(ipsec_t)
-@@ -154,16 +178,19 @@
+@@ -153,17 +181,20 @@
+ # ipsec_mgmt Local policy
  #
  
- allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
+-allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
 -allow ipsec_mgmt_t self:process { signal setrlimit };
++allow ipsec_mgmt_t self:capability { dac_override dac_read_search net_admin setpcap };
 +allow ipsec_mgmt_t self:process { signal setrlimit ptrace };
  allow ipsec_mgmt_t self:unix_stream_socket create_stream_socket_perms;
  allow ipsec_mgmt_t self:tcp_socket create_stream_socket_perms;
@@ -30497,17 +30558,6 @@ diff -b -B --ignore-all-space --exclude-
  allow ipsec_mgmt_t ipsec_mgmt_var_run_t:file manage_file_perms;
  files_pid_filetrans(ipsec_mgmt_t, ipsec_mgmt_var_run_t, file)
  
-@@ -188,6 +215,10 @@
- manage_lnk_files_pattern(ipsec_mgmt_t, ipsec_key_file_t, ipsec_key_file_t)
- files_etc_filetrans(ipsec_mgmt_t, ipsec_key_file_t, file)
- 
-+manage_dirs_pattern(ipsec_t, ipsec_tmp_t, ipsec_tmp_t)
-+manage_files_pattern(ipsec_t, ipsec_tmp_t, ipsec_tmp_t)
-+files_tmp_filetrans(ipsec_t, ipsec_tmp_t, { dir file }) 
-+
- # whack needs to connect to pluto
- stream_connect_pattern(ipsec_mgmt_t, ipsec_var_run_t, ipsec_var_run_t, ipsec_t)
- 
 @@ -241,6 +272,7 @@
  init_use_script_ptys(ipsec_mgmt_t)
  init_exec_script_files(ipsec_mgmt_t)
@@ -30530,21 +30580,22 @@ diff -b -B --ignore-all-space --exclude-
  
  # manage pid file
  manage_files_pattern(racoon_t, ipsec_var_run_t, ipsec_var_run_t)
-@@ -297,6 +336,13 @@
+@@ -296,6 +335,14 @@
+ 
  kernel_read_system_state(racoon_t)
  kernel_read_network_state(racoon_t)
- 
++kernel_request_load_module(racoon_t)
++
 +can_exec(racoon_t, racoon_exec_t)
 +
 +corecmd_exec_shell(racoon_t)
 +corecmd_exec_bin(racoon_t)
 +
 +sysnet_exec_ifconfig(racoon_t)
-+
+ 
  corenet_all_recvfrom_unlabeled(racoon_t)
  corenet_tcp_sendrecv_all_if(racoon_t)
- corenet_udp_sendrecv_all_if(racoon_t)
-@@ -314,6 +360,8 @@
+@@ -314,6 +361,8 @@
  
  files_read_etc_files(racoon_t)
  
@@ -30553,7 +30604,7 @@ diff -b -B --ignore-all-space --exclude-
  # allow racoon to use avc_has_perm to check context on proposed SA
  selinux_compute_access_vector(racoon_t)
  
-@@ -328,6 +376,14 @@
+@@ -328,6 +377,14 @@
  
  miscfiles_read_localization(racoon_t)
  
@@ -30568,7 +30619,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Setkey local policy
-@@ -341,12 +397,15 @@
+@@ -341,12 +398,15 @@
  read_files_pattern(setkey_t, ipsec_conf_file_t, ipsec_conf_file_t)
  read_lnk_files_pattern(setkey_t, ipsec_conf_file_t, ipsec_conf_file_t)
  
@@ -30584,7 +30635,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # allow setkey to set the context for ipsec SAs and policy.
  ipsec_setcontext_default_spd(setkey_t)
-@@ -358,3 +417,5 @@
+@@ -358,3 +418,5 @@
  seutil_read_config(setkey_t)
  
  userdom_use_user_terminals(setkey_t)
@@ -32140,7 +32191,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.6.32/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/mount.if	2009-12-03 17:54:50.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/mount.if	2009-12-15 15:15:35.000000000 -0500
 @@ -20,6 +20,60 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -p -r1.982 -r1.983
--- selinux-policy.spec	15 Dec 2009 16:10:14 -0000	1.982
+++ selinux-policy.spec	16 Dec 2009 13:03:07 -0000	1.983
@@ -181,7 +181,7 @@ FILE_CONTEXT=%{_sysconfdir}/selinux/%1/c
 selinuxenabled; \
 if [ $? = 0  -a "${SELINUXTYPE}" = %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
-	restorecon -R /root /var/log /var/run /var/lib 2> /dev/null;\
+	restorecon -R /root /var/log /var/run /var/lib 2> /dev/null; \
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 
 



From dwalsh at fedoraproject.org  Wed Dec 16 13:05:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 13:05:31 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.941,1.942
Message-ID: <20091216130531.6842C11C0092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5063

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri Dec 11 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-2
- Add tgtd policy



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -p -r1.941 -r1.942
--- selinux-policy.spec	11 Dec 2009 20:18:55 -0000	1.941
+++ selinux-policy.spec	16 Dec 2009 13:05:31 -0000	1.942
@@ -15,7 +15,7 @@
 %endif
 %define POLICYVER 24
 %define libsepolver 2.0.41-1
-%define POLICYCOREUTILSVER 2.0.78-3
+%define POLICYCOREUTILSVER 2.0.78-1
 %define CHECKPOLICYVER 2.0.21-1
 Summary: SELinux policy configuration
 Name: selinux-policy



From xhorak at fedoraproject.org  Wed Dec 16 13:05:43 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 13:05:43 +0000 (UTC)
Subject: rpms/xulrunner/F-12 xulrunner.spec,1.179,1.180
Message-ID: <20091216130543.11BD211C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5131

Modified Files:
	xulrunner.spec 
Log Message:
Fix source filename


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/xulrunner.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- xulrunner.spec	16 Dec 2009 12:32:24 -0000	1.179
+++ xulrunner.spec	16 Dec 2009 13:05:42 -0000	1.180
@@ -16,7 +16,7 @@ Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        %{name}-%{version}-source.tar.bz2
+Source0:        %{name}-%{version}.source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in



From allisson at fedoraproject.org  Wed Dec 16 13:10:57 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 16 Dec 2009 13:10:57 +0000 (UTC)
Subject: File rcairo-1.8.1.tar.gz uploaded to lookaside cache by allisson
Message-ID: <20091216131057.9C18B28ECE8@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ruby-cairo:

14efc24f0cbe281b32882d64f1b0d4b9  rcairo-1.8.1.tar.gz



From allisson at fedoraproject.org  Wed Dec 16 13:12:14 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 16 Dec 2009 13:12:14 +0000 (UTC)
Subject: rpms/ruby-cairo/F-11 .cvsignore, 1.7, 1.8 import.log, 1.3,
	1.4 ruby-cairo.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20091216131214.BBCFA11C0092@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-cairo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6175/F-11

Modified Files:
	.cvsignore import.log ruby-cairo.spec sources 
Log Message:

- Update to 1.8.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Oct 2008 19:01:49 -0000	1.7
+++ .cvsignore	16 Dec 2009 13:12:14 -0000	1.8
@@ -1 +1 @@
-rcairo-1.8.0.tar.gz
+rcairo-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	23 Jan 2009 14:24:29 -0000	1.3
+++ import.log	16 Dec 2009 13:12:14 -0000	1.4
@@ -1,3 +1,4 @@
 ruby-cairo-1_7_0-1_fc9:HEAD:ruby-cairo-1.7.0-1.fc9.src.rpm:1220967755
 ruby-cairo-1_8_0-1_fc9:HEAD:ruby-cairo-1.8.0-1.fc9.src.rpm:1223319656
 ruby-cairo-1_8_0-2_fc10:HEAD:ruby-cairo-1.8.0-2.fc10.src.rpm:1232720501
+ruby-cairo-1_8_1-1_fc12:F-11:ruby-cairo-1.8.1-1.fc12.src.rpm:1260969032


Index: ruby-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/F-11/ruby-cairo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ruby-cairo.spec	25 Feb 2009 21:21:08 -0000	1.9
+++ ruby-cairo.spec	16 Dec 2009 13:12:14 -0000	1.10
@@ -2,8 +2,8 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-cairo
-Version:        1.8.0
-Release:        3%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Ruby bindings for cairo
 
 Group:          System Environment/Libraries
@@ -81,10 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Allisson Azevedo <allisson at gmail.com> 1.8.1-1
+- Update to 1.8.1.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 1.8.0-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Oct 2008 19:01:49 -0000	1.7
+++ sources	16 Dec 2009 13:12:14 -0000	1.8
@@ -1 +1 @@
-7ea9f0b174d379c6a0374f534c2a4e85  rcairo-1.8.0.tar.gz
+14efc24f0cbe281b32882d64f1b0d4b9  rcairo-1.8.1.tar.gz



From xhorak at fedoraproject.org  Wed Dec 16 13:17:02 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 13:17:02 +0000 (UTC)
Subject: rpms/xulrunner/F-11 xulrunner.spec,1.171,1.172
Message-ID: <20091216131702.26EDF11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7180

Modified Files:
	xulrunner.spec 
Log Message:
Fix build - sqlite


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/xulrunner.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- xulrunner.spec	16 Dec 2009 12:58:12 -0000	1.171
+++ xulrunner.spec	16 Dec 2009 13:17:01 -0000	1.172
@@ -58,7 +58,7 @@ BuildRequires:  freetype-devel >= %{free
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
-BuildRequires:  sqlite-devel >= %{sqlite_version} 
+#sqlite >= 3.6.16 still missing in F11: BuildRequires:  sqlite-devel >= %{sqlite_version} 
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
 



From dwalsh at fedoraproject.org  Wed Dec 16 13:22:01 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 13:22:01 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-po.patch, 1.58,
	1.59 policycoreutils-rhat.patch, 1.459,
	1.460 policycoreutils-sepolgen.patch, 1.30,
	1.31 policycoreutils.spec, 1.663, 1.664
Message-ID: <20091216132201.A7D5311C0092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8095

Modified Files:
	policycoreutils-po.patch policycoreutils-rhat.patch 
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-5
- If restorecond running as a user has no files to watch then it should exit.  (NFS Homedirs)


policycoreutils-po.patch:
 Makefile            |   27 
 POTFILES            |   28 
 POTFILES.in         |    2 
 af.po               | 2499 +++++++++++++++++++++++++---
 am.po               | 2499 +++++++++++++++++++++++++---
 ar.po               | 2499 +++++++++++++++++++++++++---
 as.po               | 3775 +++++++++++++++++++++++++-----------------
 be.po               | 2499 +++++++++++++++++++++++++---
 bg.po               | 3670 ++++++++++++++++++++++++-----------------
 bn.po               | 2499 +++++++++++++++++++++++++---
 bn_IN.po            | 4080 ++++++++++++++++++++++++++-------------------
 bs.po               | 2591 ++++++++++++++++++++++++++---
 ca.po               | 3027 +++++++++++++++++++++++++++++-----
 cs.po               | 2926 +++++++++++++++++++++++++++-----
 cy.po               | 2499 +++++++++++++++++++++++++---
 da.po               | 3206 ++++++++++++++++++++++++++++++------
 de.po               | 3983 +++++++++++++++++++++++++-------------------
 el.po               | 2830 ++++++++++++++++++++++++++++---
 en_GB.po            | 2590 ++++++++++++++++++++++++++---
 es.po               | 4095 ++++++++++++++++++++++++++--------------------
 et.po               | 2497 +++++++++++++++++++++++++---
 eu_ES.po            | 2499 +++++++++++++++++++++++++---
 fa.po               | 2499 +++++++++++++++++++++++++---
 fi.po               | 3254 +++++++++++++++++++++++++++++++-----
 fr.po               | 3923 ++++++++++++++++++++++++++------------------
 gl.po               | 2497 +++++++++++++++++++++++++---
 gu.po               | 4160 ++++++++++++++++++++++++++--------------------
 he.po               | 2499 +++++++++++++++++++++++++---
 hi.po               | 4175 ++++++++++++++++++++++++++--------------------
 hr.po               | 3105 +++++++++++++++++++++++-----------
 hu.po               | 3052 +++++++++++++++++++++++++++++-----
 hy.po               | 2499 +++++++++++++++++++++++++---
 id.po               | 2497 +++++++++++++++++++++++++---
 is.po               | 2499 +++++++++++++++++++++++++---
 it.po               | 4196 ++++++++++++++++++++++++++---------------------
 ja.po               | 4183 ++++++++++++++++++++++++++---------------------
 ka.po               | 2499 +++++++++++++++++++++++++---
 kn.po               | 4621 ++++++++++++++++++++++++++++++++--------------------
 ko.po               | 2991 +++++++++++++++++++++++++++------
 ku.po               | 2499 +++++++++++++++++++++++++---
 lo.po               | 2499 +++++++++++++++++++++++++---
 lt.po               | 2499 +++++++++++++++++++++++++---
 lv.po               | 2499 +++++++++++++++++++++++++---
 mai.po              | 3527 +++++++++++++++++++++++++++++++++++++++
 mk.po               | 2593 ++++++++++++++++++++++++++---
 ml.po               | 4276 +++++++++++++++++++++++++++---------------------
 mr.po               | 4219 +++++++++++++++++++++++++++--------------------
 ms.po               | 2574 +++++++++++++++++++++++++---
 my.po               | 2499 +++++++++++++++++++++++++---
 nb.po               | 2539 +++++++++++++++++++++++++---
 nl.po               | 3028 +++++++++++++++++++++++++++-------
 nn.po               | 2499 +++++++++++++++++++++++++---
 no.po               | 1272 --------------
 nso.po              | 2499 +++++++++++++++++++++++++---
 or.po               | 4031 ++++++++++++++++++++++++++-------------------
 pa.po               | 4101 ++++++++++++++++++++++++++--------------------
 pl.po               | 4116 ++++++++++++++++++++++++++--------------------
 policycoreutils.pot | 2499 +++++++++++++++++++++++++---
 pt.po               | 4467 ++++++++++++++++++++++++++++----------------------
 pt_BR.po            | 4543 +++++++++++++++++++++++++++++----------------------
 ro.po               | 2499 +++++++++++++++++++++++++---
 ru.po               | 3508 ++++++++++++++++++++++++++-------------
 si.po               | 2499 +++++++++++++++++++++++++---
 sk.po               | 2592 ++++++++++++++++++++++++++---
 sl.po               | 2499 +++++++++++++++++++++++++---
 sq.po               | 2499 +++++++++++++++++++++++++---
 sr.po               | 4211 ++++++++++++++++++++++++++---------------------
 sr at latin.po         | 4221 +++++++++++++++++++++++++++--------------------
 sv.po               | 3267 +++++++++++++++++++++++++-----------
 ta.po               | 3588 ++++++++++++++++++++++++++--------------
 te.po               | 4060 ++++++++++++++++++++++++++-------------------
 th.po               | 2499 +++++++++++++++++++++++++---
 tr.po               | 2499 +++++++++++++++++++++++++---
 uk.po               | 2592 ++++++++++++++++++++++++++---
 ur.po               | 2499 +++++++++++++++++++++++++---
 vi.po               | 2499 +++++++++++++++++++++++++---
 zh_CN.po            | 3954 +++++++++++++++++++++++++-------------------
 zh_TW.po            | 4234 ++++++++++++++++++++++++++---------------------
 zu.po               | 2499 +++++++++++++++++++++++++---
 79 files changed, 177766 insertions(+), 58199 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.58 -r 1.59 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- policycoreutils-po.patch	15 Oct 2009 21:46:15 -0000	1.58
+++ policycoreutils-po.patch	16 Dec 2009 13:21:49 -0000	1.59
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.74/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.78/po/af.po
 --- nsapolicycoreutils/po/af.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/af.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/af.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3112,9 +3112,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.74/po/am.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.78/po/am.po
 --- nsapolicycoreutils/po/am.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/am.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/am.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -6226,9 +6226,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.74/po/ar.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.78/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/ar.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/ar.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -9340,9 +9340,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.74/po/as.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.78/po/as.po
 --- nsapolicycoreutils/po/as.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/as.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/as.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,23 +1,23 @@
 -# translation of as.po to Assamese
 +# translation of policycoreutils.HEAD.po to Assamese
@@ -14080,9 +14080,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "MLS/\n"
 -#~ "MCS Level"
 -#~ msgstr "????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.74/po/be.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.78/po/be.po
 --- nsapolicycoreutils/po/be.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/be.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/be.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -17194,9 +17194,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.74/po/bg.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.78/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/bg.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/bg.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -21859,9 +21859,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "??????? ????????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.74/po/bn_IN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.78/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/bn_IN.po	2009-10-15 10:54:35.000000000 -0400
++++ policycoreutils-2.0.78/po/bn_IN.po	2009-12-08 17:05:49.000000000 -0500
 @@ -9,10 +9,10 @@
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD\n"
@@ -26709,9 +26709,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "Enforcing\n"
 -#~ "Permissive\n"
 -#~ "Disabled\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.74/po/bn.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.78/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/bn.po	2009-10-15 10:54:35.000000000 -0400
++++ policycoreutils-2.0.78/po/bn.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -29823,9 +29823,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.74/po/bs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.78/po/bs.po
 --- nsapolicycoreutils/po/bs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/bs.po	2009-10-15 10:54:35.000000000 -0400
++++ policycoreutils-2.0.78/po/bs.po	2009-12-08 17:05:49.000000000 -0500
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: bs\n"
@@ -33057,9 +33057,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "Zahtijeva vrijednost"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.74/po/ca.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.78/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/ca.po	2009-10-15 10:54:35.000000000 -0400
++++ policycoreutils-2.0.78/po/ca.po	2009-12-08 17:05:49.000000000 -0500
 @@ -5,6 +5,8 @@
  #
  # Josep Puigdemont Casamaj? <josep.puigdemont at gmail.com>, 2006.
@@ -36727,9 +36727,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr "Error en les opcions: %s "
 +#~ msgid "Sensitvity Level"
 +#~ msgstr "Nivell de sensibilitat"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.74/po/cs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.78/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/cs.po	2009-10-15 10:54:36.000000000 -0400
++++ policycoreutils-2.0.78/po/cs.po	2009-12-08 17:05:49.000000000 -0500
 @@ -9,7 +9,7 @@
  msgstr ""
  "Project-Id-Version: cs\n"
@@ -40451,9 +40451,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgid "<b>Device number:</b>"
  #~ msgstr "<b>??slo za??zen?:</b>"
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.74/po/cy.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.78/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/cy.po	2009-10-15 10:54:36.000000000 -0400
++++ policycoreutils-2.0.78/po/cy.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -43565,9 +43565,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.74/po/da.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.78/po/da.po
 --- nsapolicycoreutils/po/da.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/da.po	2009-10-15 10:54:36.000000000 -0400
++++ policycoreutils-2.0.78/po/da.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,24 +1,25 @@
 -# translation of da.po to
 -# Danish messages for policycoreutils.
@@ -47545,9 +47545,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ "skal du k?re \n"
  #~ "\n"
  #~ "semodule -i %s.pp\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.74/po/de.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.78/po/de.po
 --- nsapolicycoreutils/po/de.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/de.po	2009-10-15 10:54:36.000000000 -0400
++++ policycoreutils-2.0.78/po/de.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,28 +1,30 @@
 -# translation of policycoreutils.HEAD.de.po to German
 +# translation of policycoreutils.HEAD.de.po to
@@ -52652,150 +52652,147 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgid "SELinux user '%s' is required"
 -#~ msgstr "SELinux-Benutzer '%s' wird ben?tigt"
 +#~ msgstr "Sensitivit?tsstufe"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-2.0.74/po/el.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-2.0.78/po/el.po
 --- nsapolicycoreutils/po/el.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/el.po	2009-10-15 10:54:36.000000000 -0400
-@@ -8,7 +8,7 @@
++++ policycoreutils-2.0.78/po/el.po	2009-12-16 08:18:26.000000000 -0500
+@@ -8,15 +8,15 @@
  msgstr ""
  "Project-Id-Version: el\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2009-06-24 10:53-0400\n"
-+"POT-Creation-Date: 2009-10-15 10:54-0400\n"
- "PO-Revision-Date: 2006-09-18 14:49+0100\n"
- "Last-Translator: Dimitris Glezos <dimitris at glezos.com>\n"
+-"PO-Revision-Date: 2006-09-18 14:49+0100\n"
+-"Last-Translator: Dimitris Glezos <dimitris at glezos.com>\n"
++"POT-Creation-Date: 2009-01-21 17:13-0500\n"
++"PO-Revision-Date: 2009-10-22 01:32+0200\n"
++"Last-Translator: nikosCharonitakis <nikosx at gmail.com>\n"
  "Language-Team: Greek <fedora-trans-el at redhat.com>\n"
-@@ -80,11 +80,11 @@
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
[...4125 lines suppressed...]
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.74/po/si.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.78/po/si.po
 --- nsapolicycoreutils/po/si.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/si.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/si.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -228140,9 +228491,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.74/po/sk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.78/po/sk.po
 --- nsapolicycoreutils/po/sk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sk.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/sk.po	2009-12-08 17:05:49.000000000 -0500
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -231375,9 +231726,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "Po?aduje hodnotu"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.74/po/sl.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.78/po/sl.po
 --- nsapolicycoreutils/po/sl.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sl.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/sl.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -234489,9 +234840,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.74/po/sq.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.78/po/sq.po
 --- nsapolicycoreutils/po/sq.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sq.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/sq.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -237603,9 +237954,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.74/po/sr at latin.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.78/po/sr at latin.po
 --- nsapolicycoreutils/po/sr at latin.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sr at latin.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/sr at latin.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian(Latin) translations for policycoreutils
@@ -242583,9 +242934,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "Primoravanje\n"
 -#~ "Dopu?tanje\n"
 -#~ "Isklju?eno\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.74/po/sr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.78/po/sr.po
 --- nsapolicycoreutils/po/sr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sr.po	2009-10-15 10:54:46.000000000 -0400
++++ policycoreutils-2.0.78/po/sr.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian translations for policycoreutils
@@ -247555,9 +247906,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "???????????\n"
 -#~ "?????????\n"
 -#~ "?????????\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.74/po/sv.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.78/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sv.po	2009-10-15 10:54:46.000000000 -0400
++++ policycoreutils-2.0.78/po/sv.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,16 +1,18 @@
  # Swedish messages for policycoreutils.
 -# Copyright ? 2001-2008 Free Software Foundation, Inc.
@@ -251747,9 +252098,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr "Flaggfel: %s "
 +#~ msgid "Sensitvity Level"
 +#~ msgstr "K?nslighetsniv?"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.74/po/ta.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.78/po/ta.po
 --- nsapolicycoreutils/po/ta.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/ta.po	2009-10-15 10:54:46.000000000 -0400
++++ policycoreutils-2.0.78/po/ta.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,28 +1,23 @@
 -# translation of ta.po to Tamil
 +# translation of policycoreutils.HEAD.ta.po to Tamil
@@ -256147,9 +256498,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr ""
 -#~ "MLS/\n"
 -#~ "MCS ????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.74/po/te.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.78/po/te.po
 --- nsapolicycoreutils/po/te.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/te.po	2009-10-15 10:54:46.000000000 -0400
++++ policycoreutils-2.0.78/po/te.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,14 +1,14 @@
 -# translation of new_policycoreutils.HEAD.te.po to Telugu
 +# translation of policycoreutils.HEAD.te.po to Telugu
@@ -260993,9 +261344,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "???????\n"
 -#~ "????????\n"
 -#~ "????????\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.74/po/th.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.78/po/th.po
 --- nsapolicycoreutils/po/th.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/th.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/th.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -264107,9 +264458,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.74/po/tr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.78/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/tr.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/tr.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -267221,9 +267572,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.74/po/uk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.78/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/uk.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/uk.po	2009-12-08 17:05:49.000000000 -0500
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -270456,9 +270807,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "???????? ??????? ????????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.74/po/ur.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.78/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/ur.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/ur.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -273570,9 +273921,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.74/po/vi.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.78/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/vi.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/vi.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -276684,9 +277035,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.74/po/zh_CN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.78/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/zh_CN.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/zh_CN.po	2009-12-08 17:05:49.000000000 -0500
 @@ -3,13 +3,13 @@
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
  #
@@ -281417,9 +281768,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -
 -#~ msgid "SELinux user '%s' is required"
 -#~ msgstr "SELinux ?? '%s' ????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.74/po/zh_TW.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.78/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/zh_TW.po	2009-10-15 10:54:48.000000000 -0400
++++ policycoreutils-2.0.78/po/zh_TW.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,19 +1,19 @@
 -# translation of policycoreutils.HEAD.po to Traditional Chinese
 +# translation of policycoreutils.HEAD.po to
@@ -286413,9 +286764,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr ""
 -#~ "tcp\n"
 -#~ "udp"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.74/po/zu.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.78/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/zu.po	2009-10-15 10:54:48.000000000 -0400
++++ policycoreutils-2.0.78/po/zu.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   59 +--
 restorecond/Makefile                        |   24 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.8                   |   15 
 restorecond/restorecond.c                   |  429 +++++-----------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 +
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  239 +++++++++++++++
 restorecond/watch.c                         |  260 ++++++++++++++++
 sandbox/Makefile                            |   31 ++
 sandbox/deliverables/README                 |   32 ++
 sandbox/deliverables/basicwrapper           |    4 
 sandbox/deliverables/run-in-sandbox.py      |   49 +++
 sandbox/deliverables/sandbox                |  216 ++++++++++++++
 sandbox/sandbox                             |  272 +++++++++++++++++
 sandbox/sandbox.8                           |   39 ++
 sandbox/sandboxX.sh                         |   16 +
 sandbox/seunshare.c                         |  265 +++++++++++++++++
 semanage/semanage                           |  122 ++++++-
 semanage/seobject.py                        |  397 ++++++++++++++++++++-----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 +++
 setfiles/restore.c                          |   73 ++++
 setfiles/restore.h                          |    3 
 setfiles/restorecon.8                       |    7 
 setfiles/setfiles.8                         |    3 
 setfiles/setfiles.c                         |   73 ----
 31 files changed, 2149 insertions(+), 581 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -p -r1.459 -r1.460
--- policycoreutils-rhat.patch	9 Dec 2009 21:33:50 -0000	1.459
+++ policycoreutils-rhat.patch	16 Dec 2009 13:21:58 -0000	1.460
@@ -140,7 +140,7 @@ diff --exclude-from=exclude --exclude=se
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.78/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/Makefile	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/Makefile	2009-12-16 08:16:15.000000000 -0500
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -189,14 +189,14 @@ diff --exclude-from=exclude --exclude=se
  	/sbin/restorecon $(SBINDIR)/restorecond 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service	2009-12-16 08:16:16.000000000 -0500
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.78/restorecond/restorecond.8
 --- nsapolicycoreutils/restorecond/restorecond.8	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.8	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.8	2009-12-16 08:16:16.000000000 -0500
 @@ -3,7 +3,7 @@
  restorecond \- daemon that watches for file creation and then sets the default SELinux file context
  
@@ -233,7 +233,7 @@ diff --exclude-from=exclude --exclude=se
  .BR restorecon (8),
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.78/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.c	2009-12-09 16:29:18.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.c	2009-12-16 08:16:17.000000000 -0500
 @@ -30,9 +30,11 @@
   * and makes sure that there security context matches the systems defaults
   *
@@ -670,7 +670,7 @@ diff --exclude-from=exclude --exclude=se
  
  	/* Register sighandlers */
  	sa.sa_flags = 0;
-@@ -467,38 +174,59 @@
+@@ -467,38 +174,60 @@
  
  	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
  
@@ -679,6 +679,7 @@ diff --exclude-from=exclude --exclude=se
 -		exitApp("inotify_init");
 -
 -	while ((opt = getopt(argc, argv, "dv")) > 0) {
++	exclude_non_seclabel_mounts();
 +	atexit( done );
 +	while ((opt = getopt(argc, argv, "df:uv")) > 0) {
  		switch (opt) {
@@ -741,7 +742,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.78/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.conf	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.conf	2009-12-16 08:16:18.000000000 -0500
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -754,7 +755,7 @@ diff --exclude-from=exclude --exclude=se
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.78/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/restorecond.desktop	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.desktop	2009-12-16 08:16:19.000000000 -0500
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -765,8 +766,8 @@ diff --exclude-from=exclude --exclude=se
 +StartupNotify=false
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.78/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.h	2009-12-08 17:05:49.000000000 -0500
-@@ -24,7 +24,21 @@
++++ policycoreutils-2.0.78/restorecond/restorecond.h	2009-12-16 08:16:20.000000000 -0500
+@@ -24,7 +24,22 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
  
@@ -788,11 +789,12 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_add(int inotify_fd, const char *path);
 +extern int watch_list_find(int wd, const char *file);
 +extern void watch_list_free(int fd);
++extern int watch_list_isempty();
  
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.78/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.init	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.init	2009-12-16 08:16:21.000000000 -0500
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -814,14 +816,14 @@ diff --exclude-from=exclude --exclude=se
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.78/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/restorecond_user.conf	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond_user.conf	2009-12-16 08:16:22.000000000 -0500
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.78/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/user.c	2009-12-08 17:05:49.000000000 -0500
-@@ -0,0 +1,237 @@
++++ policycoreutils-2.0.78/restorecond/user.c	2009-12-16 08:16:24.000000000 -0500
+@@ -0,0 +1,239 @@
 +/*
 + * restorecond
 + *
@@ -1046,6 +1048,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +    read_config(master_fd, watch_file);
 +    
++    if (watch_list_isempty()) return 0;
++
 +    set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
 +    
 +    GIOChannel *c = g_io_channel_unix_new(master_fd);
@@ -1061,8 +1065,8 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.78/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/watch.c	2009-12-09 16:31:48.000000000 -0500
-@@ -0,0 +1,254 @@
++++ policycoreutils-2.0.78/restorecond/watch.c	2009-12-16 08:16:27.000000000 -0500
+@@ -0,0 +1,260 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
 +#include <errno.h>
@@ -1099,6 +1103,9 @@ diff --exclude-from=exclude --exclude=se
 +};
 +struct watchList *firstDir = NULL;
 +
++int watch_list_isempty() {
++	return firstDir == NULL;
++}
 +
 +void watch_list_add(int fd, const char *path)
 +{
@@ -1112,6 +1119,8 @@ diff --exclude-from=exclude --exclude=se
 +	char *dir = dirname(x);
 +	ptr = firstDir;
 +
++	if (exclude(path)) return;
++
 +	globbuf.gl_offs = 1;
 +	if (glob(path, 
 +		 GLOB_TILDE | GLOB_PERIOD,
@@ -1226,6 +1235,8 @@ diff --exclude-from=exclude --exclude=se
 +{
 +	char buf[BUF_LEN];
 +	int len, i = 0;
++	if (firstDir == NULL) return 0;
++
 +	len = read(fd, buf, BUF_LEN);
 +	if (len < 0) {
 +		if (terminate == 0) {
@@ -1316,7 +1327,6 @@ diff --exclude-from=exclude --exclude=se
 +	if (master_wd == -1)
 +		exitApp("Error watching config file.");
 +}
-+
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.78/sandbox/deliverables/basicwrapper
 --- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.78/sandbox/deliverables/basicwrapper	2009-12-08 17:05:49.000000000 -0500
@@ -1671,10 +1681,10 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.78/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandbox	2009-12-08 17:05:49.000000000 -0500
-@@ -0,0 +1,253 @@
++++ policycoreutils-2.0.78/sandbox/sandbox	2009-12-14 09:35:48.000000000 -0500
+@@ -0,0 +1,272 @@
 +#!/usr/bin/python -E
-+import os, sys, getopt, socket, random, fcntl, shutil
++import os, sys, getopt, socket, random, fcntl, shutil, re
 +import selinux
 +import signal
 +
@@ -1779,17 +1789,25 @@ diff --exclude-from=exclude --exclude=se
 +              copyfile(f,homedir, newhomedir)
 +              copyfile(f,"/tmp", newtmpdir)
 +
-+def savefile(new, orig):
-+       import gtk
-+       dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
-+                               gtk.BUTTONS_YES_NO,
-+                               _("Do you want to save changes to '%s' (Y/N): ") % orig)
-+       dlg.set_title(_("Sandbox Message"))
-+       dlg.set_position(gtk.WIN_POS_MOUSE)
-+       dlg.show_all()
-+       rc = dlg.run()
-+       dlg.destroy()
-+       if rc == gtk.RESPONSE_YES:
++def savefile(new, orig, X_ind):
++       copy = False
++       if(X_ind):
++              import gtk
++              dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
++                                      gtk.BUTTONS_YES_NO,
++                                      _("Do you want to save changes to '%s' (Y/N): ") % orig)
++              dlg.set_title(_("Sandbox Message"))
++              dlg.set_position(gtk.WIN_POS_MOUSE)
++              dlg.show_all()
++              rc = dlg.run()
++              dlg.destroy()
++              if rc == gtk.RESPONSE_YES:
++                     copy = True
++       else:
++              ans = raw_input(_("Do you want to save changes to '%s' (y/N): ") % orig)
++              if(re.match(_("[yY]"),ans)):
++                     copy = True
++       if(copy):
 +              shutil.copy2(new,orig)
 +
 +if __name__ == '__main__':
@@ -1801,19 +1819,21 @@ diff --exclude-from=exclude --exclude=se
 +
 +    def usage(message = ""):
 +        text = _("""
-+sandbox [-h] [-I includefile ] [[-i file ] ...] [ -t type ] command
++sandbox [-h] [-X] [-M][-I includefile ] [[-i file ] ...] [ -t type ] command
 +""")
 +        error_exit("%s\n%s" % (message, text))
 +
 +    setype = DEFAULT_TYPE
 +    X_ind = False
++    home_and_temp = False
 +    level=None
 +    try:
-+           gopts, cmds = getopt.getopt(sys.argv[1:], "l:i:ht:XI:", 
++           gopts, cmds = getopt.getopt(sys.argv[1:], "l:i:ht:XI:M", 
 +                                       ["help",
 +                                        "include=", 
 +                                        "includefile=", 
 +                                        "type=",
++                                        "mount",
 +                                        "level="
 +                                        ])
 +           for o, a in gopts:
@@ -1842,6 +1862,9 @@ diff --exclude-from=exclude --exclude=se
 +                         if DEFAULT_TYPE == setype:
 +                                setype = DEFAULT_X_TYPE
 +                         X_ind = True
++                         home_and_temp = True
++                  if o == "-M" or o == "--mount":
++                         home_and_temp = True
 +
 +                  if o == "-h" or o == "--help":
 +                         usage(_("Usage"));
@@ -1862,9 +1885,9 @@ diff --exclude-from=exclude --exclude=se
 +           try:
 +                  newhomedir = None
 +                  newtmpdir = None
-+                  if X_ind:
++                  if home_and_temp:
 +                         if not os.path.exists("/usr/sbin/seunshare"):
-+                                raise ValueError("""/usr/sbin/seunshare required for sandbox -X, to install you need to execute 
++                                raise ValueError("""/usr/sbin/seunshare required for sandbox -M, to install you need to execute 
 +#yum install /usr/sbin/seunshare""")
 +                         import warnings
 +                         warnings.simplefilter("ignore")
@@ -1891,21 +1914,27 @@ diff --exclude-from=exclude --exclude=se
 +""" % " ".join(paths))
 +                         fd.close()
 +                         os.chmod(execfile, 0700)
-+                         
-+                         cmds =  ("/usr/sbin/seunshare -t %s -h %s -- %s /usr/share/sandbox/sandboxX.sh" % (newtmpdir, newhomedir, execcon)).split()
-+                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                         if X_ind:
++                                cmds =  ("/usr/sbin/seunshare -t %s -h %s -- %s /usr/share/sandbox/sandboxX.sh" % (newtmpdir, newhomedir, execcon)).split()
++                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                         else:
++                                cmds =  ("/usr/sbin/seunshare -t %s -h %s -- %s " % (newtmpdir, newhomedir, execcon)).split()+cmds
++                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                                selinux.setexeccon(execcon)
++                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                                selinux.setexeccon(None)
 +                         for i in paths:
 +                                if i not in X_FILES:
 +                                       continue
 +                                (dest, mtime) = X_FILES[i]
 +                                if os.path.getmtime(dest) > mtime:
-+                                       savefile(dest, i)
++                                       savefile(dest, i, X_ind)
 +                  else:
 +                         selinux.setexeccon(execcon)
 +                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
 +                         selinux.setexeccon(None)
 +           finally:
-+                  if X_ind:
++                  if home_and_temp:
 +                         if newhomedir:
 +                                shutil.rmtree(newhomedir)
 +                         if newtmpdir:
@@ -1928,30 +1957,43 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.78/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandbox.8	2009-12-08 17:05:49.000000000 -0500
-@@ -0,0 +1,26 @@
++++ policycoreutils-2.0.78/sandbox/sandbox.8	2009-12-14 09:37:40.000000000 -0500
+@@ -0,0 +1,39 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
 +sandbox \- Run cmd under an SELinux sandbox
 +.SH SYNOPSIS
 +.B sandbox
-+[-X] [[-i file ]...] [ -t type ] cmd
++[-M] [-X] [-I includefile ] [[-i file ]...] [ -t type ] cmd
 +.br
 +.SH DESCRIPTION
 +.PP
-+Run application within a tightly confined SELinux domain,   The default sandbox allows the application to only read and write stdin and stdout along with files handled to it by the shell.  
-+Additionaly a -X qualifier allows you to run sandboxed X applications.  These apps will start up their own X Server and create a temporary homedir and /tmp.  The default policy does not allow any capabilities or network access.  Also prevents all access to the users other processes and files.  Any file specified on the command line will be copied into the sandbox.
++Run the 
++.I cmd 
++application within a tightly confined SELinux domain.  The default sandbox domain only allows applications the ability to read and write stdin, stdout and any other file descriptors handed to it. It is not allowed to open any other files.  
++
++If you have the 
++.I policycoreutils-sandbox 
++package installed, you can use the -X option.
++.B sandbox -X
++allows you to run sandboxed X applications.  These applications will start up their own X Server and create a temporary homedir and /tmp.  The default policy does not allow any capabilities or network access.  It also prevents all access to the users other processes and files.  Any file specified on the command line will be copied into the sandbox.
 +.PP
 +.TP
 +\fB\-t type\fR
 +Use alternate sandbox type, defaults to sandbox_t or sandbox_x_t for -X.
 +.TP
 +\fB\-i file\fR
-+Copy this file into the temporary sandbox homedir. Command can be repeated.
++Copy this file into the temporary sandbox appriate. Command can be repeated.
++.TP
++\fB\-I inputfile\fR
++Copy all files listed in inputfile into the appropriate temporary sandbox direcories. 
 +.TP
 +\fB\-X\fR
 +Create an X based Sandbox for gui apps, temporary files for $HOME and /tmp, seconday Xserver, defaults to sandbox_x_t
 +.TP
++\fB\-M\fR
++Create a Sandbox with temporary files for $HOME and /tmp, defaults to sandbox_t
++.TP
 +.SH "SEE ALSO"
 +.TP
 +runcon(1)
@@ -3360,8 +3402,24 @@ diff --exclude-from=exclude --exclude=se
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.78/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.78/setfiles/restore.c	2009-12-08 17:05:49.000000000 -0500
-@@ -303,6 +303,12 @@
++++ policycoreutils-2.0.78/setfiles/restore.c	2009-12-16 08:14:21.000000000 -0500
+@@ -31,7 +31,6 @@
+ 
+ 
+ static file_spec_t *fl_head;
+-static int exclude(const char *file);
+ static int filespec_add(ino_t ino, const security_context_t con, const char *file);
+ static int only_changed_user(const char *a, const char *b);
+ struct restore_opts *r_opts = NULL;
+@@ -53,7 +52,6 @@
+ 		}
+ 	}
+ 	return;
+-
+ }
+ 
+ void restore_init(struct restore_opts *opts)
+@@ -303,6 +301,12 @@
  	FTS *fts_handle;
  	FTSENT *ftsent;
  
@@ -3374,7 +3432,7 @@ diff --exclude-from=exclude --exclude=se
  	fts_handle = fts_open((char **)namelist, r_opts->fts_flags, NULL);
  	if (fts_handle  == NULL) {
  		fprintf(stderr,
-@@ -374,6 +380,7 @@
+@@ -374,6 +378,7 @@
  	} else {
  		rc = lstat(name, &sb);
  		if (rc < 0) {
@@ -3382,9 +3440,86 @@ diff --exclude-from=exclude --exclude=se
  			fprintf(stderr, "%s:  lstat(%s) failed:  %s\n",
  				r_opts->progname, name,	strerror(errno));
  			return -1;
+@@ -409,7 +414,7 @@
+ 	}
+ }
+ 
+-static int exclude(const char *file)
++int exclude(const char *file)
+ {
+ 	int i = 0;
+ 	for (i = 0; i < excludeCtr; i++) {
+@@ -602,5 +607,67 @@
+ 	return -1;
+ }
+ 
++#include <sys/utsname.h>
++/*
++   Search /proc/mounts for all file systems that do not support extended
++   attributes and add them to the exclude directory table.  File systems
++   that support security labels have the seclabel option.
++*/
++void exclude_non_seclabel_mounts()
++{
++	struct utsname uts;
++	FILE *fp;
++	size_t len;
++	ssize_t num;
++	int index = 0, found = 0;
++	char *mount_info[4];
++	char *buf = NULL, *item;
++
++	/* Check to see if the kernel supports seclabel */
++	if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") < 0)
++		return;
++	if (is_selinux_enabled() <= 0)
++		return;
++
++	fp = fopen("/proc/mounts", "r");
++	if (!fp)
++		return;
+ 
++	while ((num = getline(&buf, &len, fp)) != -1) {
++		found = 0;
++		index = 0;
++		item = strtok(buf, " ");
++		while (item != NULL) {
++			mount_info[index] = item;
++			if (index == 3)
++				break;
++			index++;
++			item = strtok(NULL, " ");
++		}
++		if (index < 3) {
++			fprintf(stderr,
++				"/proc/mounts record \"%s\" has incorrect format.\n",
++				buf);
++			continue;
++		}
++
++		/* remove pre-existing entry */
++		remove_exclude(mount_info[1]);
++
++		item = strtok(mount_info[3], ",");
++		while (item != NULL) {
++			if (strcmp(item, "seclabel") == 0) {
++				found = 1;
++				break;
++			}
++			item = strtok(NULL, ",");
++		}
++
++		/* exclude mount points without the seclabel option */
++		if (!found)
++			add_exclude(mount_info[1]);
++	}
++
++	free(buf);
++}
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.78/setfiles/restorecon.8
 --- nsapolicycoreutils/setfiles/restorecon.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.78/setfiles/restorecon.8	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/restorecon.8	2009-12-16 08:14:22.000000000 -0500
 @@ -4,10 +4,10 @@
  
  .SH "SYNOPSIS"
@@ -3410,7 +3545,7 @@ diff --exclude-from=exclude --exclude=se
  show changes in file labels.
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.78/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.78/setfiles/restore.h	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/restore.h	2009-12-16 08:14:23.000000000 -0500
 @@ -27,6 +27,7 @@
  	int hard_links;
  	int verbose;
@@ -3419,10 +3554,19 @@ diff --exclude-from=exclude --exclude=se
  	char *rootpath;
  	int rootpathlen;
  	char *progname;
-Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.78/setfiles/restore.o differ
+@@ -44,7 +45,9 @@
+ void restore_init(struct restore_opts *opts);
+ void restore_finish();
+ int add_exclude(const char *directory);
++int exclude(const char *path);
+ void remove_exclude(const char *directory);
+ int process_one_realpath(char *name, int recurse);
++void exclude_non_seclabel_mounts();
+ 
+ #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.78/setfiles/setfiles.8
 --- nsapolicycoreutils/setfiles/setfiles.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.78/setfiles/setfiles.8	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/setfiles.8	2009-12-16 08:14:25.000000000 -0500
 @@ -31,6 +31,9 @@
  .TP
  .B \-n
@@ -3435,8 +3579,16 @@ diff --exclude-from=exclude --exclude=se
  suppress non-error output.
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.78/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.78/setfiles/setfiles.c	2009-12-09 16:28:55.000000000 -0500
-@@ -25,7 +25,6 @@
++++ policycoreutils-2.0.78/setfiles/setfiles.c	2009-12-16 08:14:26.000000000 -0500
+@@ -5,7 +5,6 @@
+ #include <ctype.h>
+ #include <regex.h>
+ #include <sys/vfs.h>
+-#include <sys/utsname.h>
+ #define __USE_XOPEN_EXTENDED 1	/* nftw */
+ #include <libgen.h>
+ #ifdef USE_AUDIT
+@@ -25,7 +24,6 @@
  static int warn_no_match = 0;
  static int null_terminated = 0;
  static int errors;
@@ -3444,7 +3596,7 @@ diff --exclude-from=exclude --exclude=se
  static struct restore_opts r_opts;
  
  #define STAT_BLOCK_SIZE 1
-@@ -44,13 +43,13 @@
+@@ -44,13 +42,13 @@
  {
  	if (iamrestorecon) {
  		fprintf(stderr,
@@ -3460,7 +3612,77 @@ diff --exclude-from=exclude --exclude=se
  			name);
  	}
  	exit(1);
-@@ -335,7 +334,7 @@
+@@ -138,69 +136,6 @@
+ #endif
+ }
+ 
+-/*
+-   Search /proc/mounts for all file systems that do not support extended
+-   attributes and add them to the exclude directory table.  File systems
+-   that support security labels have the seclabel option.
+-*/
+-static void exclude_non_seclabel_mounts()
+-{
+-	struct utsname uts;
+-	FILE *fp;
+-	size_t len;
+-	ssize_t num;
+-	int index = 0, found = 0;
+-	char *mount_info[4];
+-	char *buf = NULL, *item;
+-
+-	/* Check to see if the kernel supports seclabel */
+-	if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") < 0)
+-		return;
+-	if (is_selinux_enabled() <= 0)
+-		return;
+-
+-	fp = fopen("/proc/mounts", "r");
+-	if (!fp)
+-		return;
+-
+-	while ((num = getline(&buf, &len, fp)) != -1) {
+-		found = 0;
+-		index = 0;
+-		item = strtok(buf, " ");
+-		while (item != NULL) {
+-			mount_info[index] = item;
+-			if (index == 3)
+-				break;
+-			index++;
+-			item = strtok(NULL, " ");
+-		}
+-		if (index < 3) {
+-			fprintf(stderr,
+-				"/proc/mounts record \"%s\" has incorrect format.\n",
+-				buf);
+-			continue;
+-		}
+-
+-		/* remove pre-existing entry */
+-		remove_exclude(mount_info[1]);
+-
+-		item = strtok(mount_info[3], ",");
+-		while (item != NULL) {
+-			if (strcmp(item, "seclabel") == 0) {
+-				found = 1;
+-				break;
+-			}
+-			item = strtok(NULL, ",");
+-		}
+-
+-		/* exclude mount points without the seclabel option */
+-		if (!found)
+-			add_exclude(mount_info[1]);
+-	}
+-
+-	free(buf);
+-}
+-
+ int main(int argc, char **argv)
+ {
+ 	struct stat sb;
+@@ -335,7 +270,7 @@
  			r_opts.debug = 1;
  			break;
  		case 'i':
@@ -3469,7 +3691,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'l':
  			r_opts.logging = 1;
-@@ -371,7 +370,7 @@
+@@ -371,7 +306,7 @@
  				break;
  			}
  			if (optind + 1 >= argc) {

policycoreutils-sepolgen.patch:
 access.py    |   15 ++++++++-----
 audit.py     |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 policygen.py |   31 ++++++++++++++++++++++++++-
 refparser.py |    2 -
 refpolicy.py |    9 +++++--
 5 files changed, 108 insertions(+), 16 deletions(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- policycoreutils-sepolgen.patch	9 Dec 2009 21:33:51 -0000	1.30
+++ policycoreutils-sepolgen.patch	16 Dec 2009 13:22:00 -0000	1.31
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py
 --- nsasepolgen/src/sepolgen/access.py	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py	2009-12-08 17:02:52.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py	2009-12-08 17:05:49.000000000 -0500
 @@ -32,6 +32,7 @@
  """
  
@@ -56,7 +56,7 @@ diff --exclude-from=exclude -N -u -r nsa
          if audit_msg:
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py
 --- nsasepolgen/src/sepolgen/audit.py	2009-12-01 15:46:50.000000000 -0500
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py	2009-12-08 17:02:17.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py	2009-12-08 17:05:49.000000000 -0500
 @@ -23,6 +23,27 @@
  
  # Convenience functions
@@ -194,7 +194,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py
 --- nsasepolgen/src/sepolgen/policygen.py	2008-09-12 11:48:15.000000000 -0400
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py	2009-12-08 17:03:16.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py	2009-12-16 08:20:45.000000000 -0500
 @@ -29,6 +29,8 @@
  import access
  import interfaces
@@ -213,13 +213,15 @@ diff --exclude-from=exclude -N -u -r nsa
      def set_gen_refpol(self, if_set=None, perm_maps=None):
          """Set whether reference policy interfaces are generated.
  
-@@ -144,8 +146,32 @@
+@@ -144,8 +146,35 @@
      def __add_allow_rules(self, avs):
          for av in avs:
              rule = refpolicy.AVRule(av)
 +            rule.comment = ""
              if self.explain:
                  rule.comment = refpolicy.Comment(explain_access(av, verbosity=self.explain))
++            if av.type == audit2why.ALLOW:
++                rule.comment += "#!!!! This avc is allowed in the current policy\n" 
 +            if av.type == audit2why.DONTAUDIT:
 +                rule.comment += "#!!!! This avc has a dontaudit rule in the current policy\n" 
 +            if av.type == audit2why.BOOLEAN:
@@ -231,24 +233,25 @@ diff --exclude-from=exclude -N -u -r nsa
 +            if av.type == audit2why.CONSTRAINT:
 +                rule.comment += "#!!!! This avc is a constraint violation.  You will need to add an attribute to either the source or target type to make it work.\n" 
 +            if av.type == audit2why.TERULE:
-+                if "open" in av.perms and "write" in av.perms:
-+                    if not self.domains:
-+                        self.domains = seinfo(ATTRIBUTE, name="domain")[0]["types"]
-+                    types=[]
-+                    for i in map(lambda x: x[TCONTEXT], sesearch([ALLOW], {SCONTEXT: av.src_type, CLASS: av.obj_class, PERMS: av.perms})):
-+                        if i not in self.domains:
-+                            types.append(i)
-+                    if len(types) == 1:
-+                        rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following type:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
-+                    elif len(types) >= 1:
-+                        rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following types:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
++                if "write" in av.perms:
++                    if "dir" in av.obj_class or "open" in av.perms:
++                        if not self.domains:
++                            self.domains = seinfo(ATTRIBUTE, name="domain")[0]["types"]
++                        types=[]
++                        for i in map(lambda x: x[TCONTEXT], sesearch([ALLOW], {SCONTEXT: av.src_type, CLASS: av.obj_class, PERMS: av.perms})):
++                            if i not in self.domains:
++                                types.append(i)
++                        if len(types) == 1:
++                            rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following type:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
++                        elif len(types) >= 1:
++                            rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following types:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
 +                            
              self.module.children.append(rule)
  
  
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2009-10-29 15:21:39.000000000 -0400
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py	2009-12-08 17:01:22.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py	2009-12-08 17:05:49.000000000 -0500
 @@ -973,7 +973,7 @@
  def list_headers(root):
      modules = []
@@ -260,7 +263,7 @@ diff --exclude-from=exclude -N -u -r nsa
          for name in filenames:
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refpolicy.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py
 --- nsasepolgen/src/sepolgen/refpolicy.py	2009-10-29 15:21:39.000000000 -0400
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py	2009-12-08 17:02:00.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py	2009-12-08 17:05:49.000000000 -0500
 @@ -398,6 +398,7 @@
          return "attribute %s;" % self.name
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -p -r1.663 -r1.664
--- policycoreutils.spec	9 Dec 2009 21:33:51 -0000	1.663
+++ policycoreutils.spec	16 Dec 2009 13:22:00 -0000	1.664
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -131,6 +131,7 @@ The policycoreutils-python package conta
 %{_mandir}/man1/audit2why.1*
 %{_mandir}/man8/chcat.8*
 %{_mandir}/ru/man8/chcat.8*
+%{_mandir}/man8/sandbox.8*
 %{_mandir}/man8/semanage.8*
 %{_mandir}/ru/man8/semanage.8*
 
@@ -152,7 +153,6 @@ The policycoreutils-python package conta
 
 %files sandbox
 %{_sysconfdir}/rc.d/init.d/sandbox
-%{_mandir}/man8/sandbox.8*
 %{_sbindir}/seunshare
 %{_datadir}/sandbox/sandboxX.sh
 
@@ -296,6 +296,12 @@ fi
 exit 0
 
 %changelog
+* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-5
+- If restorecond running as a user has no files to watch then it should exit.  (NFS Homedirs)
+
+* Thu Dec 10 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-4
+- Move sandbox man page to base package
+
 * Tue Dec 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-3
 - Fix audit2allow to report constraints, dontaudits, types, booleans
 



From allisson at fedoraproject.org  Wed Dec 16 13:23:34 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 16 Dec 2009 13:23:34 +0000 (UTC)
Subject: rpms/ruby-cairo/F-12 .cvsignore, 1.7, 1.8 import.log, 1.3,
	1.4 ruby-cairo.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091216132334.42D1A11C0092@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-cairo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8505/F-12

Modified Files:
	.cvsignore import.log ruby-cairo.spec sources 
Log Message:

- Update to 1.8.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Oct 2008 19:01:49 -0000	1.7
+++ .cvsignore	16 Dec 2009 13:23:34 -0000	1.8
@@ -1 +1 @@
-rcairo-1.8.0.tar.gz
+rcairo-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	23 Jan 2009 14:24:29 -0000	1.3
+++ import.log	16 Dec 2009 13:23:34 -0000	1.4
@@ -1,3 +1,4 @@
 ruby-cairo-1_7_0-1_fc9:HEAD:ruby-cairo-1.7.0-1.fc9.src.rpm:1220967755
 ruby-cairo-1_8_0-1_fc9:HEAD:ruby-cairo-1.8.0-1.fc9.src.rpm:1223319656
 ruby-cairo-1_8_0-2_fc10:HEAD:ruby-cairo-1.8.0-2.fc10.src.rpm:1232720501
+ruby-cairo-1_8_1-1_fc12:F-12:ruby-cairo-1.8.1-1.fc12.src.rpm:1260969715


Index: ruby-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/F-12/ruby-cairo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ruby-cairo.spec	27 Jul 2009 03:21:17 -0000	1.10
+++ ruby-cairo.spec	16 Dec 2009 13:23:34 -0000	1.11
@@ -1,9 +1,9 @@
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-cairo
-Version:        1.8.0
-Release:        4%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Ruby bindings for cairo
 
 Group:          System Environment/Libraries
@@ -81,13 +81,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Allisson Azevedo <allisson at gmail.com> 1.8.1-1
+- Update to 1.8.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 1.8.0-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Oct 2008 19:01:49 -0000	1.7
+++ sources	16 Dec 2009 13:23:34 -0000	1.8
@@ -1 +1 @@
-7ea9f0b174d379c6a0374f534c2a4e85  rcairo-1.8.0.tar.gz
+14efc24f0cbe281b32882d64f1b0d4b9  rcairo-1.8.1.tar.gz



From tbzatek at fedoraproject.org  Wed Dec 16 13:28:48 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 16 Dec 2009 13:28:48 +0000 (UTC)
Subject: rpms/nautilus/F-12 .cvsignore, 1.103, 1.104 nautilus.spec, 1.297,
	1.298 sources, 1.108,
	1.109 nautilus-2.28.0-revert-bg-fade-break.patch, 1.1,
	NONE nautilus-2.29.xx-nautilus-directory-leak.patch, 1.1, NONE
Message-ID: <20091216132848.D574111C0092@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9617

Modified Files:
	.cvsignore nautilus.spec sources 
Removed Files:
	nautilus-2.28.0-revert-bg-fade-break.patch 
	nautilus-2.29.xx-nautilus-directory-leak.patch 
Log Message:
* Wed Dec 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.4-1
- Update to 2.28.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	30 Nov 2009 13:32:55 -0000	1.103
+++ .cvsignore	16 Dec 2009 13:28:48 -0000	1.104
@@ -1 +1 @@
-nautilus-2.28.2.tar.bz2
+nautilus-2.28.4.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/nautilus.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- nautilus.spec	10 Dec 2009 23:24:36 -0000	1.297
+++ nautilus.spec	16 Dec 2009 13:28:48 -0000	1.298
@@ -14,8 +14,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.28.2
-Release:	3%{?dist}
+Version: 	2.28.4
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -82,17 +82,11 @@ Patch6:		nautilus-2.28.1-dynamic-search.
 Patch7:		rtl-fix.patch
 #Patch8:	nautilus-2.22.1-hide-white-screen.patch
 
-# from upstream
-Patch9:		nautilus-2.29.xx-nautilus-directory-leak.patch
-
 Patch10:        nautilus-gvfs-desktop-key-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# Need to file upstream and investigate a real fix
-Patch18:	nautilus-2.28.0-revert-bg-fade-break.patch
-
 # https://bugzilla.gnome.org/show_bug.cgi?id=147808
 Patch20:	nautilus-monitor-change.patch
 
@@ -130,10 +124,8 @@ for developing nautilus extensions.
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
-%patch9 -p1 -b .memleaks
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
-%patch18 -p1 -b .revert-bg-fade-break
 %patch20 -p1 -b .nautilus-monitor-change
 
 %build
@@ -270,6 +262,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.4-1
+- Update to 2.28.4
+
 * Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.28.2-3
 - Update the monitor changes patch (gnome #147808)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- sources	30 Nov 2009 13:32:55 -0000	1.108
+++ sources	16 Dec 2009 13:28:48 -0000	1.109
@@ -1 +1 @@
-872ac5a2b875a85473266aa540926596  nautilus-2.28.2.tar.bz2
+28c97e0e5195ae1ad5101e8b703cbf52  nautilus-2.28.4.tar.bz2


--- nautilus-2.28.0-revert-bg-fade-break.patch DELETED ---


--- nautilus-2.29.xx-nautilus-directory-leak.patch DELETED ---



From dwalsh at fedoraproject.org  Wed Dec 16 13:30:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 13:30:14 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.155,1.156
Message-ID: <20091216133014.8A40711C0345@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9962

Modified Files:
	policy-F12.patch 
Log Message:
* Tue Dec 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-59
- Dontaudit udp_socket leaks for xauth_t
- Dontaudit rules for iceauth_t
- Let locate read symlinks on noxattr file systems
- Remove wine from unconfined domain if unconfined pp removed
- Add labels for vhostmd
- Add port 546 as a dhcpc port
- Add labeled for /dev/dahdi
- Add certmonger policy
- Allow sysadm to communicate with racoon and zebra
- Allow dbus service dbus_chat with unconfined_t
- Fixes for xguest
- Add dontaudits for abrt
- file contexts for mythtv
- Lots of fixes for asterisk
- Fix file context for certmaster
- Add log dir for dovecot
- Policy for ksmtuned
- File labeling and fixes for mysql and mysql_safe
- New plugin infrstructure for nagios
- Allow nut_upsd_t dac_override
- File context fixes for nx
- Allow oddjob_mkhomedir to create homedir
- Add pcscd_pub interfaces to be used by xdm
- Add stream connect from fenced to corosync
- Fixes for swat
- Allow fsdaemon to manage scsi devices
- Policy for tgtd
- Policy for vhostmd
- Allow ipsec to create tmp files
- Change label on fusermount


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   78 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   45 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   49 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  438 +++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  256 ++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  447 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  117 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  448 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   52 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   21 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   51 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.te          |   23 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  398 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   59 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  283 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  637 ++++++++++-
 policy/modules/services/xserver.te        |  382 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  184 +++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   78 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   22 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  186 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   82 +
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1691 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 412 files changed, 21406 insertions(+), 2828 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- policy-F12.patch	16 Dec 2009 13:03:07 -0000	1.155
+++ policy-F12.patch	16 Dec 2009 13:30:14 -0000	1.156
@@ -18065,7 +18065,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.6.32/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/nagios.te	2009-12-15 10:06:29.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/nagios.te	2009-12-16 08:29:46.000000000 -0500
 @@ -6,17 +6,23 @@
  # Declarations
  #
@@ -18104,7 +18104,7 @@ diff -b -B --ignore-all-space --exclude-
  type nrpe_t;
  type nrpe_exec_t;
  init_daemon_domain(nrpe_t, nrpe_exec_t)
-@@ -33,6 +42,31 @@
+@@ -33,6 +42,34 @@
  type nrpe_etc_t;
  files_config_file(nrpe_etc_t)
  
@@ -18127,7 +18127,10 @@ diff -b -B --ignore-all-space --exclude-
 +files_tmp_file(nagios_system_plugin_tmp_t)
 +
 +nagios_plugin_template(unconfined)
-+unconfined_domain(nagios_unconfined_plugin_t)
++
++optional_policy(`
++	unconfined_domain(nagios_unconfined_plugin_t)
++')
 +
 +permissive nagios_checkdisk_plugin_t;
 +permissive nagios_services_plugin_t;
@@ -18136,7 +18139,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Nagios local policy
-@@ -45,6 +79,9 @@
+@@ -45,6 +82,9 @@
  allow nagios_t self:tcp_socket create_stream_socket_perms;
  allow nagios_t self:udp_socket create_socket_perms;
  
@@ -18146,7 +18149,7 @@ diff -b -B --ignore-all-space --exclude-
  read_files_pattern(nagios_t, nagios_etc_t, nagios_etc_t)
  read_lnk_files_pattern(nagios_t, nagios_etc_t, nagios_etc_t)
  allow nagios_t nagios_etc_t:dir list_dir_perms;
-@@ -60,6 +97,8 @@
+@@ -60,6 +100,8 @@
  manage_files_pattern(nagios_t, nagios_var_run_t, nagios_var_run_t)
  files_pid_filetrans(nagios_t, nagios_var_run_t, file)
  
@@ -18155,7 +18158,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(nagios_t)
  kernel_read_kernel_sysctls(nagios_t)
  
-@@ -86,6 +125,7 @@
+@@ -86,6 +128,7 @@
  files_read_etc_files(nagios_t)
  files_read_etc_runtime_files(nagios_t)
  files_read_kernel_symbol_table(nagios_t)
@@ -18163,7 +18166,7 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(nagios_t)
  fs_search_auto_mountpoints(nagios_t)
-@@ -127,52 +167,59 @@
+@@ -127,52 +170,59 @@
  #
  # Nagios CGI local policy
  #
@@ -18173,46 +18176,46 @@ diff -b -B --ignore-all-space --exclude-
  
 -allow nagios_cgi_t self:process signal_perms;
 -allow nagios_cgi_t self:fifo_file rw_fifo_file_perms;
--
++allow httpd_nagios_script_t self:process signal_perms;
+ 
 -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;
++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_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)
-+read_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
-+read_lnk_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
++files_search_spool(httpd_nagios_script_t)
++rw_fifo_files_pattern(httpd_nagios_script_t, nagios_spool_t, nagios_spool_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)
-+files_search_spool(httpd_nagios_script_t)
-+rw_fifo_files_pattern(httpd_nagios_script_t, nagios_spool_t, nagios_spool_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)
- 
--logging_send_syslog_msg(nagios_cgi_t)
--logging_search_logs(nagios_cgi_t)
 +files_read_etc_runtime_files(httpd_nagios_script_t)
 +files_read_kernel_symbol_table(httpd_nagios_script_t)
  
+-logging_send_syslog_msg(nagios_cgi_t)
+-logging_search_logs(nagios_cgi_t)
+-
 -miscfiles_read_localization(nagios_cgi_t)
 -
 -optional_policy(`
@@ -18230,10 +18233,10 @@ diff -b -B --ignore-all-space --exclude-
  allow nrpe_t self:process { setpgid signal_perms };
  allow nrpe_t self:fifo_file rw_fifo_file_perms;
 +allow nrpe_t self:tcp_socket create_stream_socket_perms;
-+
-+domtrans_pattern(nrpe_t, nagios_checkdisk_plugin_exec_t, nagios_checkdisk_plugin_t)
  
 -allow nrpe_t nrpe_etc_t:file read_file_perms;
++domtrans_pattern(nrpe_t, nagios_checkdisk_plugin_exec_t, nagios_checkdisk_plugin_t)
++
 +read_files_pattern(nrpe_t, nagios_etc_t, nagios_etc_t)
  files_search_etc(nrpe_t)
  
@@ -18248,7 +18251,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(nrpe_t)
  kernel_read_kernel_sysctls(nrpe_t)
  
-@@ -183,15 +230,19 @@
+@@ -183,15 +233,19 @@
  dev_read_urand(nrpe_t)
  
  domain_use_interactive_fds(nrpe_t)
@@ -18268,7 +18271,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_dontaudit_use_unpriv_user_fds(nrpe_t)
  
  optional_policy(`
-@@ -209,3 +260,84 @@
+@@ -209,3 +263,84 @@
  optional_policy(`
  	udev_read_db(nrpe_t)
  ')



From dwalsh at fedoraproject.org  Wed Dec 16 13:30:39 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 13:30:39 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.12,1.13
Message-ID: <20091216133039.8E1A411C02A7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10147

Modified Files:
	policy-F13.patch 
Log Message:
* Fri Dec 11 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-2
- Add tgtd policy


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   11 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   79 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  111 +
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  447 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  117 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  429 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |   21 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  398 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/u                 |    6 
 policy/modules/services/udisks.fc         |    5 
 policy/modules/services/udisks.if         |  192 +++
 policy/modules/services/udisks.te         |   66 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  281 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  643 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   56 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1683 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 391 files changed, 19946 insertions(+), 2974 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- policy-F13.patch	16 Dec 2009 12:58:41 -0000	1.12
+++ policy-F13.patch	16 Dec 2009 13:30:38 -0000	1.13
@@ -16719,7 +16719,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.7.4/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nagios.te	2009-12-15 15:35:42.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nagios.te	2009-12-16 08:29:49.000000000 -0500
 @@ -6,17 +6,23 @@
  # Declarations
  #
@@ -16758,7 +16758,7 @@ diff -b -B --ignore-all-space --exclude-
  type nrpe_t;
  type nrpe_exec_t;
  init_daemon_domain(nrpe_t, nrpe_exec_t)
-@@ -33,6 +42,31 @@
+@@ -33,6 +42,33 @@
  type nrpe_etc_t;
  files_config_file(nrpe_etc_t)
  
@@ -16781,7 +16781,9 @@ diff -b -B --ignore-all-space --exclude-
 +files_tmp_file(nagios_system_plugin_tmp_t)
 +
 +nagios_plugin_template(unconfined)
-+unconfined_domain(nagios_unconfined_plugin_t)
++optional_policy(`
++	unconfined_domain(nagios_unconfined_plugin_t)
++')
 +
 +permissive nagios_checkdisk_plugin_t;
 +permissive nagios_services_plugin_t;
@@ -16790,7 +16792,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Nagios local policy
-@@ -45,6 +79,9 @@
+@@ -45,6 +81,9 @@
  allow nagios_t self:tcp_socket create_stream_socket_perms;
  allow nagios_t self:udp_socket create_socket_perms;
  
@@ -16800,7 +16802,7 @@ diff -b -B --ignore-all-space --exclude-
  read_files_pattern(nagios_t, nagios_etc_t, nagios_etc_t)
  read_lnk_files_pattern(nagios_t, nagios_etc_t, nagios_etc_t)
  allow nagios_t nagios_etc_t:dir list_dir_perms;
-@@ -60,6 +97,8 @@
+@@ -60,6 +99,8 @@
  manage_files_pattern(nagios_t, nagios_var_run_t, nagios_var_run_t)
  files_pid_filetrans(nagios_t, nagios_var_run_t, file)
  
@@ -16809,7 +16811,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(nagios_t)
  kernel_read_kernel_sysctls(nagios_t)
  
-@@ -86,6 +125,7 @@
+@@ -86,6 +127,7 @@
  files_read_etc_files(nagios_t)
  files_read_etc_runtime_files(nagios_t)
  files_read_kernel_symbol_table(nagios_t)
@@ -16817,7 +16819,7 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(nagios_t)
  fs_search_auto_mountpoints(nagios_t)
-@@ -127,52 +167,59 @@
+@@ -127,52 +169,59 @@
  #
  # Nagios CGI local policy
  #
@@ -16902,7 +16904,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(nrpe_t)
  kernel_read_kernel_sysctls(nrpe_t)
  
-@@ -183,15 +230,19 @@
+@@ -183,15 +232,19 @@
  dev_read_urand(nrpe_t)
  
  domain_use_interactive_fds(nrpe_t)
@@ -16922,7 +16924,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_dontaudit_use_unpriv_user_fds(nrpe_t)
  
  optional_policy(`
-@@ -209,3 +260,84 @@
+@@ -209,3 +262,84 @@
  optional_policy(`
  	udev_read_db(nrpe_t)
  ')



From allisson at fedoraproject.org  Wed Dec 16 13:31:56 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 16 Dec 2009 13:31:56 +0000 (UTC)
Subject: rpms/ruby-cairo/devel .cvsignore, 1.7, 1.8 import.log, 1.3,
	1.4 ruby-cairo.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091216133156.E341E11C0092@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10545/devel

Modified Files:
	.cvsignore import.log ruby-cairo.spec sources 
Log Message:

- Update to 1.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Oct 2008 19:01:49 -0000	1.7
+++ .cvsignore	16 Dec 2009 13:31:56 -0000	1.8
@@ -1 +1 @@
-rcairo-1.8.0.tar.gz
+rcairo-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	23 Jan 2009 14:24:29 -0000	1.3
+++ import.log	16 Dec 2009 13:31:56 -0000	1.4
@@ -1,3 +1,4 @@
 ruby-cairo-1_7_0-1_fc9:HEAD:ruby-cairo-1.7.0-1.fc9.src.rpm:1220967755
 ruby-cairo-1_8_0-1_fc9:HEAD:ruby-cairo-1.8.0-1.fc9.src.rpm:1223319656
 ruby-cairo-1_8_0-2_fc10:HEAD:ruby-cairo-1.8.0-2.fc10.src.rpm:1232720501
+ruby-cairo-1_8_1-1_fc12:HEAD:ruby-cairo-1.8.1-1.fc12.src.rpm:1260970237


Index: ruby-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/ruby-cairo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ruby-cairo.spec	27 Jul 2009 03:21:17 -0000	1.10
+++ ruby-cairo.spec	16 Dec 2009 13:31:56 -0000	1.11
@@ -1,9 +1,9 @@
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-cairo
-Version:        1.8.0
-Release:        4%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Ruby bindings for cairo
 
 Group:          System Environment/Libraries
@@ -81,13 +81,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Allisson Azevedo <allisson at gmail.com> 1.8.1-1
+- Update to 1.8.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 1.8.0-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Oct 2008 19:01:49 -0000	1.7
+++ sources	16 Dec 2009 13:31:56 -0000	1.8
@@ -1 +1 @@
-7ea9f0b174d379c6a0374f534c2a4e85  rcairo-1.8.0.tar.gz
+14efc24f0cbe281b32882d64f1b0d4b9  rcairo-1.8.1.tar.gz



From kaigai at fedoraproject.org  Wed Dec 16 13:37:02 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Wed, 16 Dec 2009 13:37:02 +0000 (UTC)
Subject: File postgresql-8.4.2.tar.bz2 uploaded to lookaside cache by kaigai
Message-ID: <20091216133702.AE10728ECE8@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for sepostgresql:

d738227e2f1f742d2f2d4ab56496c5c6  postgresql-8.4.2.tar.bz2



From kaigai at fedoraproject.org  Wed Dec 16 13:38:53 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Wed, 16 Dec 2009 13:38:53 +0000 (UTC)
Subject: rpms/sepostgresql/F-12 .cvsignore, 1.16, 1.17 sepostgresql-8.4.patch,
	1.3, 1.4 sepostgresql.spec, 1.44, 1.45 sources, 1.13, 1.14
Message-ID: <20091216133853.8B6A511C0092@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11778

Modified Files:
	.cvsignore sepostgresql-8.4.patch sepostgresql.spec sources 
Log Message:
upgrade base version 8.4.1->8.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	11 Sep 2009 10:40:19 -0000	1.16
+++ .cvsignore	16 Dec 2009 13:38:53 -0000	1.17
@@ -1 +1 @@
-postgresql-8.4.1.tar.bz2
+postgresql-8.4.2.tar.bz2

sepostgresql-8.4.patch:
 configure                                                          |  113 
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   15 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |   12 
 src/backend/access/heap/tuptoaster.c                               |   12 
 src/backend/access/transam/xact.c                                  |   26 
 src/backend/bootstrap/bootparse.y                                  |   11 
 src/backend/bootstrap/bootstrap.c                                  |   20 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   25 
 src/backend/catalog/catalog.c                                      |    6 
 src/backend/catalog/dependency.c                                   |   35 
 src/backend/catalog/heap.c                                         |   89 
 src/backend/catalog/index.c                                        |    6 
 src/backend/catalog/namespace.c                                    |   33 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_conversion.c                                |    4 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_operator.c                                  |   17 
 src/backend/catalog/pg_proc.c                                      |   14 
 src/backend/catalog/pg_security.c                                  |  637 ++
 src/backend/catalog/pg_shdepend.c                                  |    6 
 src/backend/catalog/pg_type.c                                      |   20 
 src/backend/catalog/toasting.c                                     |   10 
 src/backend/commands/aggregatecmds.c                               |    4 
 src/backend/commands/alter.c                                       |   29 
 src/backend/commands/cluster.c                                     |   11 
 src/backend/commands/conversioncmds.c                              |   12 
 src/backend/commands/copy.c                                        |  268 
 src/backend/commands/dbcommands.c                                  |   95 
 src/backend/commands/foreigncmds.c                                 |   23 
 src/backend/commands/functioncmds.c                                |   92 
 src/backend/commands/indexcmds.c                                   |    4 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/opclasscmds.c                                 |   44 
 src/backend/commands/operatorcmds.c                                |    3 
 src/backend/commands/proclang.c                                    |   21 
 src/backend/commands/schemacmds.c                                  |   65 
 src/backend/commands/sequence.c                                    |   16 
 src/backend/commands/tablecmds.c                                   |  248 
 src/backend/commands/trigger.c                                     |    9 
 src/backend/commands/tsearchcmds.c                                 |   54 
 src/backend/commands/typecmds.c                                    |   13 
 src/backend/commands/view.c                                        |    4 
 src/backend/executor/execJunk.c                                    |    5 
 src/backend/executor/execMain.c                                    |  140 
 src/backend/executor/execQual.c                                    |    3 
 src/backend/executor/execScan.c                                    |   24 
 src/backend/executor/execTuples.c                                  |   14 
 src/backend/executor/execUtils.c                                   |    6 
 src/backend/executor/functions.c                                   |    6 
 src/backend/executor/nodeAgg.c                                     |    4 
 src/backend/executor/nodeMergejoin.c                               |    2 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/nodeWindowAgg.c                               |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   68 
 src/backend/nodes/copyfuncs.c                                      |   22 
 src/backend/nodes/equalfuncs.c                                     |   19 
 src/backend/nodes/outfuncs.c                                       |    4 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/util/clauses.c                               |    3 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   46 
 src/backend/parser/gram.y                                          |  106 
 src/backend/parser/parse_target.c                                  |   63 
 src/backend/parser/parse_utilcmd.c                                 |    3 
 src/backend/postmaster/autovacuum.c                                |    2 
 src/backend/postmaster/postmaster.c                                |   51 
 src/backend/rewrite/rewriteDefine.c                                |    4 
 src/backend/rewrite/rewriteRemove.c                                |    4 
 src/backend/security/Makefile                                      |   13 
 src/backend/security/rowlevel.c                                    |  121 
 src/backend/security/sepgsql/Makefile                              |   16 
 src/backend/security/sepgsql/avc.c                                 |  881 +++
 src/backend/security/sepgsql/bridge.c                              | 2876 ++++++++++
 src/backend/security/sepgsql/checker.c                             |  424 +
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               |  239 
 src/backend/security/sepgsql/label.c                               | 1140 +++
 src/backend/security/sepgsql/misc.c                                |  304 +
 src/backend/security/sepgsql/perms.c                               |  597 ++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  123 
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  118 
 src/backend/tcop/fastpath.c                                        |    3 
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    6 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/tid.c                                        |    4 
 src/backend/utils/adt/trigfuncs.c                                  |    4 
 src/backend/utils/cache/plancache.c                                |    9 
 src/backend/utils/cache/relcache.c                                 |   22 
 src/backend/utils/cache/syscache.c                                 |   26 
 src/backend/utils/fmgr/dfmgr.c                                     |    7 
 src/backend/utils/fmgr/fmgr.c                                      |    2 
 src/backend/utils/init/postinit.c                                  |    9 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    4 
 src/backend/utils/misc/superuser.c                                 |   10 
 src/bin/initdb/initdb.c                                            |   13 
 src/bin/pg_dump/pg_dump.c                                          |  150 
 src/bin/pg_dump/pg_dump.h                                          |    2 
 src/bin/pg_dump/pg_dumpall.c                                       |   72 
 src/include/access/htup.h                                          |   32 
 src/include/access/sysattr.h                                       |   14 
 src/include/access/tupdesc.h                                       |    1 
 src/include/bootstrap/bootstrap.h                                  |    3 
 src/include/catalog/dependency.h                                   |    3 
 src/include/catalog/heap.h                                         |   11 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_conversion_fn.h                             |    2 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   21 
 src/include/catalog/pg_proc_fn.h                                   |    3 
 src/include/catalog/pg_security.h                                  |  101 
 src/include/catalog/toasting.h                                     |    3 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   18 
 src/include/nodes/plannodes.h                                      |    7 
 src/include/nodes/relation.h                                       |    9 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   44 
 src/include/security/sepgsql.h                                     |  777 ++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/storage/proc.h                                         |    4 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |    2 
 src/test/regress/GNUmakefile                                       |    8 
 src/test/regress/expected/sanity_check.out                         |    3 
 src/test/regress/pg_regress.c                                      |    9 
 150 files changed, 10633 insertions(+), 3 deletions(-), 677 modifications(!)

Index: sepostgresql-8.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-12/sepostgresql-8.4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sepostgresql-8.4.patch	8 Dec 2009 05:59:39 -0000	1.3
+++ sepostgresql-8.4.patch	16 Dec 2009 13:38:53 -0000	1.4
@@ -1,6 +1,6 @@
 diff -Nrpc base/configure sepgsql/configure
-*** base/configure	Sun Sep  6 19:40:49 2009
---- sepgsql/configure	Sun Sep  6 19:53:10 2009
+*** base/configure	Tue Dec 15 17:16:51 2009
+--- sepgsql/configure	Tue Dec 15 17:30:25 2009
 *************** with_libxml
 *** 710,715 ****
 --- 710,716 ----
@@ -189,8 +189,8 @@ diff -Nrpc base/configure sepgsql/config
     elif $ac_last_try; then
       { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 diff -Nrpc base/configure.in sepgsql/configure.in
-*** base/configure.in	Sun Sep  6 19:40:49 2009
---- sepgsql/configure.in	Sun Sep  6 19:53:10 2009
+*** base/configure.in	Tue Dec 15 17:16:51 2009
+--- sepgsql/configure.in	Tue Dec 15 17:30:25 2009
 *************** PGAC_ARG_BOOL(with, zlib, yes,
 *** 764,769 ****
 --- 764,782 ----
@@ -227,8 +227,8 @@ diff -Nrpc base/src/Makefile.global.in s
   enable_thread_safety	= @enable_thread_safety@
   
 diff -Nrpc base/src/backend/Makefile sepgsql/src/backend/Makefile
-*** base/src/backend/Makefile	Sat Jan  3 13:01:35 2009
---- sepgsql/src/backend/Makefile	Wed Jul 15 19:35:52 2009
+*** base/src/backend/Makefile	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/Makefile	Tue Dec 15 17:30:25 2009
 *************** include $(top_builddir)/src/Makefile.glo
 *** 16,22 ****
   
@@ -247,8 +247,8 @@ diff -Nrpc base/src/backend/Makefile sep
   include $(srcdir)/common.mk
   
 *************** LIBS := $(filter-out -lpgport, $(LIBS)) 
-*** 34,39 ****
---- 34,44 ----
+*** 40,45 ****
+--- 40,50 ----
   # The backend doesn't need everything that's in LIBS, however
   LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
   
@@ -498,8 +498,8 @@ diff -Nrpc base/src/backend/access/heap/
   
   		/*
 diff -Nrpc base/src/backend/access/transam/xact.c sepgsql/src/backend/access/transam/xact.c
-*** base/src/backend/access/transam/xact.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/access/transam/xact.c	Sun Sep  6 19:31:39 2009
+*** base/src/backend/access/transam/xact.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/access/transam/xact.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 36,41 ****
 --- 36,43 ----
@@ -515,7 +515,7 @@ diff -Nrpc base/src/backend/access/trans
 *** 140,145 ****
 --- 142,148 ----
   	Oid			prevUser;		/* previous CurrentUserId setting */
-  	bool		prevSecDefCxt;	/* previous SecurityDefinerContext setting */
+  	int			prevSecContext;	/* previous SecurityRestrictionContext */
   	bool		prevXactReadOnly;		/* entry-time xact r/o state */
 + 	int			prevRowlv;		/* previous Row-level control behavior */
   	struct TransactionStateData *parent;		/* back link to parent */
@@ -525,7 +525,7 @@ diff -Nrpc base/src/backend/access/trans
 *** 168,173 ****
 --- 171,177 ----
   	InvalidOid,					/* previous CurrentUserId setting */
-  	false,						/* previous SecurityDefinerContext setting */
+  	0,							/* previous SecurityRestrictionContext */
   	false,						/* entry-time xact r/o state */
 + 	ROWLV_FILTER_MODE,			/* previous Row-level control behavior */
   	NULL						/* link to parent state block */
@@ -536,15 +536,15 @@ diff -Nrpc base/src/backend/access/trans
 --- 1528,1534 ----
   	s->nChildXids = 0;
   	s->maxChildXids = 0;
-  	GetUserIdAndContext(&s->prevUser, &s->prevSecDefCxt);
+  	GetUserIdAndSecContext(&s->prevUser, &s->prevSecContext);
 + 	s->prevRowlv = rowlvGetPerformingMode();
-  	/* SecurityDefinerContext should never be set outside a transaction */
-  	Assert(!s->prevSecDefCxt);
+  	/* SecurityRestrictionContext should never be set outside a transaction */
+  	Assert(s->prevSecContext == 0);
   
 *************** AbortTransaction(void)
-*** 2030,2035 ****
---- 2035,2050 ----
-  	SetUserIdAndContext(s->prevUser, s->prevSecDefCxt);
+*** 2031,2036 ****
+--- 2036,2051 ----
+  	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
   
   	/*
 + 	 * Reset behavior of row-level access controls
@@ -561,9 +561,9 @@ diff -Nrpc base/src/backend/access/trans
   	 */
   	AfterTriggerEndXact(false);
 *************** AbortSubTransaction(void)
-*** 3873,3878 ****
---- 3888,3903 ----
-  	SetUserIdAndContext(s->prevUser, s->prevSecDefCxt);
+*** 3874,3879 ****
+--- 3889,3904 ----
+  	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
   
   	/*
 + 	 * Reset behavior of row-level access controls
@@ -580,10 +580,10 @@ diff -Nrpc base/src/backend/access/trans
   	 * ResourceOwner...
   	 */
 *************** PushTransaction(void)
-*** 4014,4019 ****
---- 4039,4045 ----
+*** 4015,4020 ****
+--- 4040,4046 ----
   	s->blockState = TBLOCK_SUBBEGIN;
-  	GetUserIdAndContext(&s->prevUser, &s->prevSecDefCxt);
+  	GetUserIdAndSecContext(&s->prevUser, &s->prevSecContext);
   	s->prevXactReadOnly = XactReadOnly;
 + 	s->prevRowlv = rowlvGetPerformingMode();
   
@@ -920,8 +920,8 @@ diff -Nrpc base/src/backend/catalog/cata
   		relationId == PgShdescriptionToastIndex)
   		return true;
 diff -Nrpc base/src/backend/catalog/dependency.c sepgsql/src/backend/catalog/dependency.c
-*** base/src/backend/catalog/dependency.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/catalog/dependency.c	Thu Sep 17 23:44:07 2009
+*** base/src/backend/catalog/dependency.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/catalog/dependency.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 63,68 ****
 --- 63,69 ----
@@ -1045,7 +1045,7 @@ diff -Nrpc base/src/backend/catalog/depe
   
   	/* And clean up */
 *************** reportDependentObjects(const ObjectAddre
-*** 942,954 ****
+*** 943,955 ****
    * depRel is the already-open pg_depend relation.
    */
   static void
@@ -1059,7 +1059,7 @@ diff -Nrpc base/src/backend/catalog/depe
   	/*
   	 * First remove any pg_depend records that link from this object to
   	 * others.	(Any records linking to this object should be gone already.)
---- 957,973 ----
+--- 958,974 ----
    * depRel is the already-open pg_depend relation.
    */
   static void
@@ -1435,8 +1435,8 @@ diff -Nrpc base/src/backend/catalog/heap
   
   
 diff -Nrpc base/src/backend/catalog/index.c sepgsql/src/backend/catalog/index.c
-*** base/src/backend/catalog/index.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/catalog/index.c	Fri Sep 18 17:02:48 2009
+*** base/src/backend/catalog/index.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/catalog/index.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 48,53 ****
 --- 48,54 ----
@@ -1448,7 +1448,7 @@ diff -Nrpc base/src/backend/catalog/inde
   #include "storage/lmgr.h"
   #include "storage/procarray.h"
 *************** AppendAttributeTuples(Relation indexRela
-*** 351,357 ****
+*** 352,358 ****
   		Assert(indexTupDesc->attrs[i]->attnum == i + 1);
   		Assert(indexTupDesc->attrs[i]->attcacheoff == -1);
   
@@ -1456,7 +1456,7 @@ diff -Nrpc base/src/backend/catalog/inde
   	}
   
   	CatalogCloseIndexes(indstate);
---- 352,359 ----
+--- 353,360 ----
   		Assert(indexTupDesc->attrs[i]->attnum == i + 1);
   		Assert(indexTupDesc->attrs[i]->attcacheoff == -1);
   
@@ -1466,7 +1466,7 @@ diff -Nrpc base/src/backend/catalog/inde
   
   	CatalogCloseIndexes(indstate);
 *************** index_create(Oid heapRelationId,
-*** 652,658 ****
+*** 653,659 ****
   	 */
   	InsertPgClassTuple(pg_class, indexRelation,
   					   RelationGetRelid(indexRelation),
@@ -1474,7 +1474,7 @@ diff -Nrpc base/src/backend/catalog/inde
   
   	/* done with pg_class */
   	heap_close(pg_class, RowExclusiveLock);
---- 654,660 ----
+--- 655,661 ----
   	 */
   	InsertPgClassTuple(pg_class, indexRelation,
   					   RelationGetRelid(indexRelation),
@@ -1861,8 +1861,8 @@ diff -Nrpc base/src/backend/catalog/pg_o
   		operatorObjectId = simple_heap_insert(pg_operator_desc, tup);
   	}
 diff -Nrpc base/src/backend/catalog/pg_proc.c sepgsql/src/backend/catalog/pg_proc.c
-*** base/src/backend/catalog/pg_proc.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/catalog/pg_proc.c	Fri Sep 18 17:39:46 2009
+*** base/src/backend/catalog/pg_proc.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/catalog/pg_proc.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 29,34 ****
 --- 29,35 ----
@@ -1892,8 +1892,8 @@ diff -Nrpc base/src/backend/catalog/pg_p
   	Oid			retval;
   	int			parameterCount;
 *************** ProcedureCreate(const char *procedureNam
-*** 96,101 ****
---- 98,104 ----
+*** 97,102 ****
+--- 99,105 ----
   	Datum		values[Natts_pg_proc];
   	bool		replaces[Natts_pg_proc];
   	Oid			relid;
@@ -1902,8 +1902,8 @@ diff -Nrpc base/src/backend/catalog/pg_p
   	TupleDesc	tupDesc;
   	bool		is_update;
 *************** ProcedureCreate(const char *procedureNam
-*** 343,348 ****
---- 346,356 ----
+*** 344,349 ****
+--- 347,357 ----
   							ObjectIdGetDatum(procNamespace),
   							0);
   
@@ -1916,8 +1916,8 @@ diff -Nrpc base/src/backend/catalog/pg_p
   	{
   		/* There is one; okay to replace it? */
 *************** ProcedureCreate(const char *procedureNam
-*** 477,482 ****
---- 485,492 ----
+*** 481,486 ****
+--- 489,496 ----
   
   		/* Okay, do it... */
   		tup = heap_modify_tuple(oldtup, tupDesc, values, nulls, replaces);
@@ -1927,8 +1927,8 @@ diff -Nrpc base/src/backend/catalog/pg_p
   
   		ReleaseSysCache(oldtup);
 *************** ProcedureCreate(const char *procedureNam
-*** 486,491 ****
---- 496,503 ----
+*** 490,495 ****
+--- 500,507 ----
   	{
   		/* Creating a new procedure */
   		tup = heap_form_tuple(tupDesc, values, nulls);
@@ -4690,8 +4690,8 @@ diff -Nrpc base/src/backend/commands/pro
   		memset(repl_repl, false, sizeof(repl_repl));
   
 diff -Nrpc base/src/backend/commands/schemacmds.c sepgsql/src/backend/commands/schemacmds.c
-*** base/src/backend/commands/schemacmds.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/commands/schemacmds.c	Thu Sep 17 17:04:16 2009
+*** base/src/backend/commands/schemacmds.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/commands/schemacmds.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 25,30 ****
 --- 25,31 ----
@@ -4709,7 +4709,7 @@ diff -Nrpc base/src/backend/commands/sch
   	Oid			owner_uid;
   	Oid			saved_uid;
 + 	Oid			nspsecid;
-  	bool		saved_secdefcxt;
+  	int			save_sec_context;
   	AclResult	aclresult;
   
 *************** CreateSchemaCommand(CreateSchemaStmt *st
@@ -4726,16 +4726,16 @@ diff -Nrpc base/src/backend/commands/sch
   	if (!allowSystemTableMods && IsReservedName(schemaName))
   		ereport(ERROR,
 *************** CreateSchemaCommand(CreateSchemaStmt *st
-*** 94,100 ****
-  		SetUserIdAndContext(owner_uid, true);
+*** 95,101 ****
+  							   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
   
   	/* Create the schema's namespace */
 ! 	namespaceId = NamespaceCreate(schemaName, owner_uid);
   
   	/* Advance cmd counter to make the namespace visible */
   	CommandCounterIncrement();
---- 100,106 ----
-  		SetUserIdAndContext(owner_uid, true);
+--- 101,107 ----
+  							   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
   
   	/* Create the schema's namespace */
 ! 	namespaceId = NamespaceCreate(schemaName, owner_uid, nspsecid);
@@ -4743,7 +4743,7 @@ diff -Nrpc base/src/backend/commands/sch
   	/* Advance cmd counter to make the namespace visible */
   	CommandCounterIncrement();
 *************** RenameSchema(const char *oldname, const 
-*** 267,274 ****
+*** 268,275 ****
   				 errmsg("schema \"%s\" does not exist", oldname)));
   
   	/* make sure the new name doesn't exist */
@@ -4752,7 +4752,7 @@ diff -Nrpc base/src/backend/commands/sch
   										CStringGetDatum(newname),
   										0, 0, 0)))
   		ereport(ERROR,
---- 273,279 ----
+--- 274,280 ----
   				 errmsg("schema \"%s\" does not exist", oldname)));
   
   	/* make sure the new name doesn't exist */
@@ -4761,8 +4761,8 @@ diff -Nrpc base/src/backend/commands/sch
   										0, 0, 0)))
   		ereport(ERROR,
 *************** RenameSchema(const char *oldname, const 
-*** 286,291 ****
---- 291,299 ----
+*** 287,292 ****
+--- 292,300 ----
   		aclcheck_error(aclresult, ACL_KIND_DATABASE,
   					   get_database_name(MyDatabaseId));
   
@@ -4773,8 +4773,8 @@ diff -Nrpc base/src/backend/commands/sch
   		ereport(ERROR,
   				(errcode(ERRCODE_RESERVED_NAME),
 *************** AlterSchemaOwner_internal(HeapTuple tup,
-*** 397,402 ****
---- 405,413 ----
+*** 398,403 ****
+--- 406,414 ----
   			aclcheck_error(aclresult, ACL_KIND_DATABASE,
   						   get_database_name(MyDatabaseId));
   
@@ -4785,8 +4785,8 @@ diff -Nrpc base/src/backend/commands/sch
   		memset(repl_repl, false, sizeof(repl_repl));
   
 *************** AlterSchemaOwner_internal(HeapTuple tup,
-*** 431,433 ****
---- 442,492 ----
+*** 432,434 ****
+--- 443,493 ----
   	}
   
   }
@@ -4921,8 +4921,8 @@ diff -Nrpc base/src/backend/commands/seq
   	seq = read_info(elm, seqrel, &buf);
   
 diff -Nrpc base/src/backend/commands/tablecmds.c sepgsql/src/backend/commands/tablecmds.c
-*** base/src/backend/commands/tablecmds.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/commands/tablecmds.c	Thu Oct  8 09:29:32 2009
+*** base/src/backend/commands/tablecmds.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/commands/tablecmds.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 62,67 ****
 --- 62,68 ----
@@ -4963,8 +4963,8 @@ diff -Nrpc base/src/backend/commands/tab
   	AttrNumber	attnum;
   	static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
 *************** DefineRelation(CreateStmt *stmt, char re
-*** 444,449 ****
---- 446,461 ----
+*** 454,459 ****
+--- 456,471 ----
   	localHasOids = interpretOidsOption(stmt->options);
   	descriptor->tdhasoid = (localHasOids || parentOidCount > 0);
   
@@ -4982,7 +4982,7 @@ diff -Nrpc base/src/backend/commands/tab
   	 * Find columns with default values and prepare for insertion of the
   	 * defaults.  Pre-cooked (that is, inherited) defaults go into a list of
 *************** DefineRelation(CreateStmt *stmt, char re
-*** 513,519 ****
+*** 523,529 ****
   										  parentOidCount,
   										  stmt->oncommit,
   										  reloptions,
@@ -4990,7 +4990,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	StoreCatalogInheritance(relationId, inheritOids);
   
---- 525,532 ----
+--- 535,542 ----
   										  parentOidCount,
   										  stmt->oncommit,
   										  reloptions,
@@ -5000,8 +5000,8 @@ diff -Nrpc base/src/backend/commands/tab
   	StoreCatalogInheritance(relationId, inheritOids);
   
 *************** ExecuteTruncate(TruncateStmt *stmt)
-*** 887,892 ****
---- 900,907 ----
+*** 897,902 ****
+--- 910,917 ----
   				if (!pg_class_ownercheck(seq_relid, GetUserId()))
   					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   								   RelationGetRelationName(seq_rel));
@@ -5011,8 +5011,8 @@ diff -Nrpc base/src/backend/commands/tab
   				seq_relids = lappend_oid(seq_relids, seq_relid);
   
 *************** truncate_check_rel(Relation rel)
-*** 1042,1047 ****
---- 1057,1065 ----
+*** 1052,1057 ****
+--- 1067,1075 ----
   				 errmsg("permission denied: \"%s\" is a system catalog",
   						RelationGetRelationName(rel))));
   
@@ -5023,8 +5023,8 @@ diff -Nrpc base/src/backend/commands/tab
   	 * We can never allow truncation of shared or nailed-in-cache relations,
   	 * because we can't support changing their relfilenode values.
 *************** MergeAttributes(List *schema, List *supe
-*** 1216,1221 ****
---- 1234,1241 ----
+*** 1226,1231 ****
+--- 1244,1251 ----
   		if (!pg_class_ownercheck(RelationGetRelid(relation), GetUserId()))
   			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   						   RelationGetRelationName(relation));
@@ -5034,8 +5034,8 @@ diff -Nrpc base/src/backend/commands/tab
   		/*
   		 * Reject duplications in the list of parents.
 *************** renameatt(Oid myrelid,
-*** 1921,1926 ****
---- 1941,1949 ----
+*** 1931,1936 ****
+--- 1951,1959 ----
   				 errmsg("cannot rename system column \"%s\"",
   						oldattname)));
   
@@ -5046,8 +5046,8 @@ diff -Nrpc base/src/backend/commands/tab
   	 * if the attribute is inherited, forbid the renaming, unless we are
   	 * already inside a recursive rename.
 *************** RenameRelation(Oid myrelid, const char *
-*** 2026,2031 ****
---- 2049,2057 ----
+*** 2036,2041 ****
+--- 2059,2067 ----
   	Oid			namespaceId;
   	char		relkind;
   
@@ -5058,7 +5058,7 @@ diff -Nrpc base/src/backend/commands/tab
   	 * Grab an exclusive lock on the target table, index, sequence or view,
   	 * which we will NOT release until end of transaction.
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2359,2372 ****
+*** 2369,2382 ****
   	switch (cmd->subtype)
   	{
   		case AT_AddColumn:		/* ADD COLUMN */
@@ -5073,7 +5073,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Performs own recursion */
   			ATPrepAddColumn(wqueue, rel, recurse, cmd);
   			pass = AT_PASS_ADD_COL;
---- 2385,2398 ----
+--- 2395,2408 ----
   	switch (cmd->subtype)
   	{
   		case AT_AddColumn:		/* ADD COLUMN */
@@ -5089,7 +5089,7 @@ diff -Nrpc base/src/backend/commands/tab
   			ATPrepAddColumn(wqueue, rel, recurse, cmd);
   			pass = AT_PASS_ADD_COL;
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2379,2397 ****
+*** 2389,2407 ****
   			 * substitutes default values into INSERTs before it expands
   			 * rules.
   			 */
@@ -5109,7 +5109,7 @@ diff -Nrpc base/src/backend/commands/tab
   			ATSimpleRecursion(wqueue, rel, cmd, recurse);
   			/* No command-specific prep needed */
   			pass = AT_PASS_ADD_CONSTR;
---- 2405,2423 ----
+--- 2415,2433 ----
   			 * substitutes default values into INSERTs before it expands
   			 * rules.
   			 */
@@ -5130,7 +5130,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed */
   			pass = AT_PASS_ADD_CONSTR;
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2403,2415 ****
+*** 2413,2425 ****
   			pass = AT_PASS_COL_ATTRS;
   			break;
   		case AT_SetStorage:		/* ALTER COLUMN STORAGE */
@@ -5144,7 +5144,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Recursion occurs during execution phase */
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
---- 2429,2441 ----
+--- 2439,2451 ----
   			pass = AT_PASS_COL_ATTRS;
   			break;
   		case AT_SetStorage:		/* ALTER COLUMN STORAGE */
@@ -5159,7 +5159,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2417,2429 ****
+*** 2427,2439 ****
   			pass = AT_PASS_DROP;
   			break;
   		case AT_AddIndex:		/* ADD INDEX */
@@ -5173,7 +5173,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Recursion occurs during execution phase */
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
---- 2443,2455 ----
+--- 2453,2465 ----
   			pass = AT_PASS_DROP;
   			break;
   		case AT_AddIndex:		/* ADD INDEX */
@@ -5188,7 +5188,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2431,2437 ****
+*** 2441,2447 ****
   			pass = AT_PASS_ADD_CONSTR;
   			break;
   		case AT_DropConstraint:	/* DROP CONSTRAINT */
@@ -5196,7 +5196,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Recursion occurs during execution phase */
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
---- 2457,2463 ----
+--- 2467,2473 ----
   			pass = AT_PASS_ADD_CONSTR;
   			break;
   		case AT_DropConstraint:	/* DROP CONSTRAINT */
@@ -5205,7 +5205,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2439,2445 ****
+*** 2449,2455 ****
   			pass = AT_PASS_DROP;
   			break;
   		case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
@@ -5213,7 +5213,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Performs own recursion */
   			ATPrepAlterColumnType(wqueue, tab, rel, recurse, recursing, cmd);
   			pass = AT_PASS_ALTER_TYPE;
---- 2465,2471 ----
+--- 2475,2481 ----
   			pass = AT_PASS_DROP;
   			break;
   		case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
@@ -5222,7 +5222,7 @@ diff -Nrpc base/src/backend/commands/tab
   			ATPrepAlterColumnType(wqueue, tab, rel, recurse, recursing, cmd);
   			pass = AT_PASS_ALTER_TYPE;
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2451,2470 ****
+*** 2461,2480 ****
   			break;
   		case AT_ClusterOn:		/* CLUSTER ON */
   		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
@@ -5243,7 +5243,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Performs own recursion */
   			if (rel->rd_rel->relhasoids)
   			{
---- 2477,2496 ----
+--- 2487,2506 ----
   			break;
   		case AT_ClusterOn:		/* CLUSTER ON */
   		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
@@ -5265,7 +5265,7 @@ diff -Nrpc base/src/backend/commands/tab
   			if (rel->rd_rel->relhasoids)
   			{
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2478,2491 ****
+*** 2488,2501 ****
   			pass = AT_PASS_DROP;
   			break;
   		case AT_SetTableSpace:	/* SET TABLESPACE */
@@ -5280,7 +5280,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* This command never recurses */
   			/* No command-specific prep needed */
   			pass = AT_PASS_MISC;
---- 2504,2517 ----
+--- 2514,2527 ----
   			pass = AT_PASS_DROP;
   			break;
   		case AT_SetTableSpace:	/* SET TABLESPACE */
@@ -5296,7 +5296,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed */
   			pass = AT_PASS_MISC;
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2504,2510 ****
+*** 2514,2520 ****
   		case AT_DisableRule:
   		case AT_AddInherit:		/* INHERIT / NO INHERIT */
   		case AT_DropInherit:
@@ -5304,7 +5304,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* These commands never recurse */
   			/* No command-specific prep needed */
   			pass = AT_PASS_MISC;
---- 2530,2536 ----
+--- 2540,2546 ----
   		case AT_DisableRule:
   		case AT_AddInherit:		/* INHERIT / NO INHERIT */
   		case AT_DropInherit:
@@ -5313,7 +5313,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed */
   			pass = AT_PASS_MISC;
 *************** ATRewriteTables(List **wqueue)
-*** 2850,2857 ****
+*** 2860,2867 ****
   			/*
   			 * The new relation is local to our transaction and we know
   			 * nothing depends on it, so DROP_RESTRICT should be OK.
@@ -5322,7 +5322,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* performDeletion does CommandCounterIncrement at end */
   
   			/*
---- 2876,2884 ----
+--- 2886,2894 ----
   			/*
   			 * The new relation is local to our transaction and we know
   			 * nothing depends on it, so DROP_RESTRICT should be OK.
@@ -5333,8 +5333,8 @@ diff -Nrpc base/src/backend/commands/tab
   
   			/*
 *************** ATRewriteTable(AlteredTableInfo *tab, Oi
-*** 3076,3086 ****
---- 3103,3116 ----
+*** 3086,3096 ****
+--- 3113,3126 ----
   			if (newrel)
   			{
   				Oid			tupOid = InvalidOid;
@@ -5350,8 +5350,8 @@ diff -Nrpc base/src/backend/commands/tab
   				/* Set dropped attributes to null in new tuple */
   				foreach(lc, dropped_attrs)
 *************** ATRewriteTable(AlteredTableInfo *tab, Oi
-*** 3112,3117 ****
---- 3142,3150 ----
+*** 3122,3127 ****
+--- 3152,3160 ----
   				/* Preserve OID, if any */
   				if (newTupDesc->tdhasoid)
   					HeapTupleSetOid(tuple, tupOid);
@@ -5362,7 +5362,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   			/* Now check any constraints on the possibly-changed tuple */
 *************** ATGetQueueEntry(List **wqueue, Relation 
-*** 3213,3219 ****
+*** 3223,3229 ****
    * - Ensure that it is not a system table
    */
   static void
@@ -5370,7 +5370,7 @@ diff -Nrpc base/src/backend/commands/tab
   {
   	if (rel->rd_rel->relkind != RELKIND_RELATION)
   	{
---- 3246,3252 ----
+--- 3256,3262 ----
    * - Ensure that it is not a system table
    */
   static void
@@ -5379,8 +5379,8 @@ diff -Nrpc base/src/backend/commands/tab
   	if (rel->rd_rel->relkind != RELKIND_RELATION)
   	{
 *************** ATSimplePermissions(Relation rel, bool a
-*** 3237,3242 ****
---- 3270,3281 ----
+*** 3247,3252 ****
+--- 3280,3291 ----
   		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   					   RelationGetRelationName(rel));
   
@@ -5394,7 +5394,7 @@ diff -Nrpc base/src/backend/commands/tab
   		ereport(ERROR,
   				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 *************** ATSimplePermissions(Relation rel, bool a
-*** 3252,3258 ****
+*** 3262,3268 ****
    * - Ensure that it is not a system table
    */
   static void
@@ -5402,7 +5402,7 @@ diff -Nrpc base/src/backend/commands/tab
   {
   	if (rel->rd_rel->relkind != RELKIND_RELATION &&
   		rel->rd_rel->relkind != RELKIND_INDEX)
---- 3291,3297 ----
+--- 3301,3307 ----
    * - Ensure that it is not a system table
    */
   static void
@@ -5411,8 +5411,8 @@ diff -Nrpc base/src/backend/commands/tab
   	if (rel->rd_rel->relkind != RELKIND_RELATION &&
   		rel->rd_rel->relkind != RELKIND_INDEX)
 *************** ATSimplePermissionsRelationOrIndex(Relat
-*** 3266,3271 ****
---- 3305,3316 ----
+*** 3276,3281 ****
+--- 3315,3326 ----
   		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   					   RelationGetRelationName(rel));
   
@@ -5426,8 +5426,8 @@ diff -Nrpc base/src/backend/commands/tab
   		ereport(ERROR,
   				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 *************** ATExecAddColumn(AlteredTableInfo *tab, R
-*** 3509,3514 ****
---- 3554,3560 ----
+*** 3519,3524 ****
+--- 3564,3570 ----
   	HeapTuple	typeTuple;
   	Oid			typeOid;
   	int32		typmod;
@@ -5436,8 +5436,8 @@ diff -Nrpc base/src/backend/commands/tab
   	Expr	   *defval;
   
 *************** ATExecAddColumn(AlteredTableInfo *tab, R
-*** 3546,3551 ****
---- 3592,3600 ----
+*** 3556,3561 ****
+--- 3602,3610 ----
   				 errmsg("child table \"%s\" has a conflicting \"%s\" column",
   						RelationGetRelationName(rel), colDef->colname)));
   
@@ -5448,8 +5448,8 @@ diff -Nrpc base/src/backend/commands/tab
   			childatt->attinhcount++;
   			simple_heap_update(attrdesc, &tuple->t_self, tuple);
 *************** ATExecAddColumn(AlteredTableInfo *tab, R
-*** 3585,3590 ****
---- 3634,3642 ----
+*** 3595,3600 ****
+--- 3644,3652 ----
   				 errmsg("column \"%s\" of relation \"%s\" already exists",
   						colDef->colname, RelationGetRelationName(rel))));
   
@@ -5460,7 +5460,7 @@ diff -Nrpc base/src/backend/commands/tab
   	if (isOid)
   		newattnum = ObjectIdAttributeNumber;
 *************** ATExecAddColumn(AlteredTableInfo *tab, R
-*** 3627,3633 ****
+*** 3637,3643 ****
   
   	ReleaseSysCache(typeTuple);
   
@@ -5468,7 +5468,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	heap_close(attrdesc, RowExclusiveLock);
   
---- 3679,3685 ----
+--- 3689,3695 ----
   
   	ReleaseSysCache(typeTuple);
   
@@ -5477,8 +5477,8 @@ diff -Nrpc base/src/backend/commands/tab
   	heap_close(attrdesc, RowExclusiveLock);
   
 *************** ATPrepSetStatistics(Relation rel, const 
-*** 4016,4021 ****
---- 4068,4075 ----
+*** 4026,4031 ****
+--- 4078,4085 ----
   	if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
   		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   					   RelationGetRelationName(rel));
@@ -5488,7 +5488,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   static void
 *************** ATExecDropColumn(List **wqueue, Relation
-*** 4171,4177 ****
+*** 4181,4187 ****
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5496,7 +5496,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	/*
   	 * get the number of the attribute
---- 4225,4231 ----
+--- 4235,4241 ----
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5505,7 +5505,7 @@ diff -Nrpc base/src/backend/commands/tab
   	/*
   	 * get the number of the attribute
 *************** ATAddCheckConstraint(List **wqueue, Alte
-*** 4473,4479 ****
+*** 4483,4489 ****
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5513,7 +5513,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	/*
   	 * Call AddRelationNewConstraints to do the work, making sure it works on
---- 4527,4533 ----
+--- 4537,4543 ----
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5522,7 +5522,7 @@ diff -Nrpc base/src/backend/commands/tab
   	/*
   	 * Call AddRelationNewConstraints to do the work, making sure it works on
 *************** checkFkeyPermissions(Relation rel, int16
-*** 5102,5108 ****
+*** 5112,5118 ****
   	aclresult = pg_class_aclcheck(RelationGetRelid(rel), roleid,
   								  ACL_REFERENCES);
   	if (aclresult == ACLCHECK_OK)
@@ -5530,7 +5530,7 @@ diff -Nrpc base/src/backend/commands/tab
   	/* Else we must have REFERENCES on each column */
   	for (i = 0; i < natts; i++)
   	{
---- 5156,5162 ----
+--- 5166,5172 ----
   	aclresult = pg_class_aclcheck(RelationGetRelid(rel), roleid,
   								  ACL_REFERENCES);
   	if (aclresult == ACLCHECK_OK)
@@ -5539,8 +5539,8 @@ diff -Nrpc base/src/backend/commands/tab
   	for (i = 0; i < natts; i++)
   	{
 *************** checkFkeyPermissions(Relation rel, int16
-*** 5112,5117 ****
---- 5166,5174 ----
+*** 5122,5127 ****
+--- 5176,5184 ----
   			aclcheck_error(aclresult, ACL_KIND_CLASS,
   						   RelationGetRelationName(rel));
   	}
@@ -5551,7 +5551,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   /*
 *************** ATExecDropConstraint(Relation rel, const
-*** 5375,5381 ****
+*** 5385,5391 ****
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5559,7 +5559,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
   
---- 5432,5438 ----
+--- 5442,5448 ----
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5568,8 +5568,8 @@ diff -Nrpc base/src/backend/commands/tab
   	conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
   
 *************** ATExecChangeOwner(Oid relationOid, Oid n
-*** 6308,6313 ****
---- 6365,6372 ----
+*** 6318,6323 ****
+--- 6375,6382 ----
   					aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
   								   get_namespace_name(namespaceOid));
   			}
@@ -5579,7 +5579,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   		memset(repl_null, false, sizeof(repl_null));
 *************** ATExecAddInherit(Relation child_rel, Ran
-*** 6912,6918 ****
+*** 6922,6928 ****
   	 * Must be owner of both parent and child -- child was checked by
   	 * ATSimplePermissions call in ATPrepCmd
   	 */
@@ -5587,7 +5587,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	/* Permanent rels cannot inherit from temporary ones */
   	if (parent_rel->rd_istemp && !child_rel->rd_istemp)
---- 6971,6977 ----
+--- 6981,6987 ----
   	 * Must be owner of both parent and child -- child was checked by
   	 * ATSimplePermissions call in ATPrepCmd
   	 */
@@ -5596,8 +5596,8 @@ diff -Nrpc base/src/backend/commands/tab
   	/* Permanent rels cannot inherit from temporary ones */
   	if (parent_rel->rd_istemp && !child_rel->rd_istemp)
 *************** AlterTableNamespace(RangeVar *relation, 
-*** 7570,7575 ****
---- 7629,7637 ----
+*** 7580,7585 ****
+--- 7639,7647 ----
   						RelationGetRelationName(rel),
   						newschema)));
   
@@ -5608,8 +5608,8 @@ diff -Nrpc base/src/backend/commands/tab
   	if (isAnyTempNamespace(nspOid) || isAnyTempNamespace(oldNspOid))
   		ereport(ERROR,
 *************** AlterSeqNamespaces(Relation classRel, Re
-*** 7762,7767 ****
---- 7824,7957 ----
+*** 7772,7777 ****
+--- 7834,7967 ----
   	relation_close(depRel, AccessShareLock);
   }
   
@@ -5745,8 +5745,8 @@ diff -Nrpc base/src/backend/commands/tab
   /*
    * This code supports
 diff -Nrpc base/src/backend/commands/trigger.c sepgsql/src/backend/commands/trigger.c
-*** base/src/backend/commands/trigger.c	Fri Jun 19 13:40:37 2009
---- sepgsql/src/backend/commands/trigger.c	Thu Sep 17 22:10:19 2009
+*** base/src/backend/commands/trigger.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/commands/trigger.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 33,38 ****
 --- 33,39 ----
@@ -6187,8 +6187,8 @@ diff -Nrpc base/src/backend/executor/exe
   	/*
   	 * Use the given slot, or make a new slot if we weren't given one.
 diff -Nrpc base/src/backend/executor/execMain.c sepgsql/src/backend/executor/execMain.c
-*** base/src/backend/executor/execMain.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/executor/execMain.c	Thu Oct  8 09:29:32 2009
+*** base/src/backend/executor/execMain.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/executor/execMain.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 39,44 ****
 --- 39,45 ----
@@ -6487,8 +6487,8 @@ diff -Nrpc base/src/backend/executor/exe
   	Oid			intoRelationId;
   	TupleDesc	tupdesc;
 *************** OpenIntoRel(QueryDesc *queryDesc)
-*** 2871,2876 ****
---- 2982,2995 ----
+*** 2886,2891 ****
+--- 2997,3010 ----
   		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
   					   get_namespace_name(namespaceId));
   
@@ -6504,7 +6504,7 @@ diff -Nrpc base/src/backend/executor/exe
   	 * Select tablespace to use.  If not specified, use default tablespace
   	 * (which may in turn default to database's default).
 *************** OpenIntoRel(QueryDesc *queryDesc)
-*** 2929,2935 ****
+*** 2944,2950 ****
   											  0,
   											  into->onCommit,
   											  reloptions,
@@ -6512,7 +6512,7 @@ diff -Nrpc base/src/backend/executor/exe
   
   	FreeTupleDesc(tupdesc);
   
---- 3048,3055 ----
+--- 3063,3070 ----
   											  0,
   											  into->onCommit,
   											  reloptions,
@@ -6522,8 +6522,8 @@ diff -Nrpc base/src/backend/executor/exe
   	FreeTupleDesc(tupdesc);
   
 *************** intorel_receive(TupleTableSlot *slot, De
-*** 3054,3059 ****
---- 3174,3183 ----
+*** 3069,3074 ****
+--- 3189,3198 ----
   	if (myState->rel->rd_rel->relhasoids)
   		HeapTupleSetOid(tuple, InvalidOid);
   
@@ -7003,8 +7003,8 @@ diff -Nrpc base/src/backend/executor/nod
   	}
   
 diff -Nrpc base/src/backend/executor/spi.c sepgsql/src/backend/executor/spi.c
-*** base/src/backend/executor/spi.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/executor/spi.c	Tue Sep  8 23:55:48 2009
+*** base/src/backend/executor/spi.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/executor/spi.c	Tue Dec 15 17:30:25 2009
 *************** SPI_modifytuple(Relation rel, HeapTuple 
 *** 705,710 ****
 --- 705,712 ----
@@ -7160,8 +7160,8 @@ diff -Nrpc base/src/backend/libpq/be-fss
    *		 prepares large objects for transaction commit
    */
 diff -Nrpc base/src/backend/nodes/copyfuncs.c sepgsql/src/backend/nodes/copyfuncs.c
-*** base/src/backend/nodes/copyfuncs.c	Fri Jun 19 13:40:37 2009
---- sepgsql/src/backend/nodes/copyfuncs.c	Wed Jul 15 19:39:56 2009
+*** base/src/backend/nodes/copyfuncs.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/nodes/copyfuncs.c	Tue Dec 15 17:30:25 2009
 *************** CopyScanFields(Scan *from, Scan *newnode
 *** 259,264 ****
 --- 259,265 ----
@@ -7176,7 +7176,7 @@ diff -Nrpc base/src/backend/nodes/copyfu
 *** 2075,2080 ****
 --- 2076,2082 ----
   	COPY_NODE_FIELD(raw_default);
-  	COPY_STRING_FIELD(cooked_default);
+  	COPY_NODE_FIELD(cooked_default);
   	COPY_NODE_FIELD(constraints);
 + 	COPY_NODE_FIELD(secLabel);
   
@@ -7239,8 +7239,8 @@ diff -Nrpc base/src/backend/nodes/copyfu
   			retval = _copyRuleStmt(from);
   			break;
 diff -Nrpc base/src/backend/nodes/equalfuncs.c sepgsql/src/backend/nodes/equalfuncs.c
-*** base/src/backend/nodes/equalfuncs.c	Fri Jun 19 13:40:37 2009
---- sepgsql/src/backend/nodes/equalfuncs.c	Wed Jul 15 19:37:35 2009
+*** base/src/backend/nodes/equalfuncs.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/nodes/equalfuncs.c	Tue Dec 15 17:30:25 2009
 *************** _equalCreateStmt(CreateStmt *a, CreateSt
 *** 1078,1083 ****
 --- 1078,1084 ----
@@ -7287,7 +7287,7 @@ diff -Nrpc base/src/backend/nodes/equalf
 *** 2054,2059 ****
 --- 2069,2075 ----
   	COMPARE_NODE_FIELD(raw_default);
-  	COMPARE_STRING_FIELD(cooked_default);
+  	COMPARE_NODE_FIELD(cooked_default);
   	COMPARE_NODE_FIELD(constraints);
 + 	COMPARE_NODE_FIELD(secLabel);
   
@@ -7306,8 +7306,8 @@ diff -Nrpc base/src/backend/nodes/equalf
   			retval = _equalRuleStmt(a, b);
   			break;
 diff -Nrpc base/src/backend/nodes/outfuncs.c sepgsql/src/backend/nodes/outfuncs.c
-*** base/src/backend/nodes/outfuncs.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/nodes/outfuncs.c	Wed Jul 15 19:39:56 2009
+*** base/src/backend/nodes/outfuncs.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/nodes/outfuncs.c	Tue Dec 15 17:30:25 2009
 *************** _outScanInfo(StringInfo str, Scan *node)
 *** 285,290 ****
 --- 285,291 ----
@@ -7342,7 +7342,7 @@ diff -Nrpc base/src/backend/nodes/outfun
 *** 1839,1844 ****
 --- 1842,1848 ----
   	WRITE_NODE_FIELD(raw_default);
-  	WRITE_STRING_FIELD(cooked_default);
+  	WRITE_NODE_FIELD(cooked_default);
   	WRITE_NODE_FIELD(constraints);
 + 	WRITE_NODE_FIELD(secLabel);
   }
@@ -7420,8 +7420,8 @@ diff -Nrpc base/src/backend/optimizer/ut
   	/* Check type of rtable entry */
   	switch (rte->rtekind)
 diff -Nrpc base/src/backend/parser/analyze.c sepgsql/src/backend/parser/analyze.c
-*** base/src/backend/parser/analyze.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/parser/analyze.c	Sun Sep  6 19:53:10 2009
+*** base/src/backend/parser/analyze.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/parser/analyze.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 25,30 ****
 --- 25,31 ----
@@ -7433,7 +7433,7 @@ diff -Nrpc base/src/backend/parser/analy
   #include "nodes/makefuncs.h"
   #include "nodes/nodeFuncs.h"
 *************** transformInsertStmt(ParseState *pstate, 
-*** 653,659 ****
+*** 660,666 ****
   		tle = makeTargetEntry(expr,
   							  attr_num,
   							  col->name,
@@ -7441,7 +7441,7 @@ diff -Nrpc base/src/backend/parser/analy
   		qry->targetList = lappend(qry->targetList, tle);
   
   		rte->modifiedCols = bms_add_member(rte->modifiedCols,
---- 654,660 ----
+--- 661,667 ----
   		tle = makeTargetEntry(expr,
   							  attr_num,
   							  col->name,
@@ -7450,8 +7450,8 @@ diff -Nrpc base/src/backend/parser/analy
   
   		rte->modifiedCols = bms_add_member(rte->modifiedCols,
 *************** transformInsertRow(ParseState *pstate, L
-*** 768,773 ****
---- 769,816 ----
+*** 775,780 ****
+--- 776,823 ----
   	return result;
   }
   
@@ -7501,8 +7501,8 @@ diff -Nrpc base/src/backend/parser/analy
   /*
    * transformSelectStmt -
 *************** transformSelectStmt(ParseState *pstate, 
-*** 872,877 ****
---- 915,921 ----
+*** 879,884 ****
+--- 922,928 ----
   	if (stmt->intoClause)
   	{
   		qry->intoClause = stmt->intoClause;
@@ -7971,8 +7971,8 @@ diff -Nrpc base/src/backend/parser/parse
   			/*
   			 * Check for duplicates, but only of whole columns --- we allow
 diff -Nrpc base/src/backend/parser/parse_utilcmd.c sepgsql/src/backend/parser/parse_utilcmd.c
-*** base/src/backend/parser/parse_utilcmd.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/parser/parse_utilcmd.c	Fri Sep 18 14:51:00 2009
+*** base/src/backend/parser/parse_utilcmd.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/parser/parse_utilcmd.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 49,54 ****
 --- 49,55 ----
@@ -8015,8 +8015,8 @@ diff -Nrpc base/src/backend/postmaster/a
   				else
   				{
 diff -Nrpc base/src/backend/postmaster/postmaster.c sepgsql/src/backend/postmaster/postmaster.c
-*** base/src/backend/postmaster/postmaster.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/postmaster/postmaster.c	Tue Dec  8 14:04:25 2009
+*** base/src/backend/postmaster/postmaster.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/postmaster/postmaster.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 108,113 ****
 --- 108,114 ----
@@ -8070,8 +8070,8 @@ diff -Nrpc base/src/backend/postmaster/p
   		if (avlauncher_needs_signal)
   		{
 *************** SIGHUP_handler(SIGNAL_ARGS)
-*** 2053,2058 ****
---- 2061,2068 ----
+*** 2055,2060 ****
+--- 2063,2070 ----
   			signal_child(SysLoggerPID, SIGHUP);
   		if (PgStatPID != 0)
   			signal_child(PgStatPID, SIGHUP);
@@ -8081,8 +8081,8 @@ diff -Nrpc base/src/backend/postmaster/p
   		/* Reload authentication config files too */
   		if (!load_hba())
 *************** pmdie(SIGNAL_ARGS)
-*** 2113,2118 ****
---- 2123,2131 ----
+*** 2115,2120 ****
+--- 2125,2133 ----
   				/* and the walwriter too */
   				if (WalWriterPID != 0)
   					signal_child(WalWriterPID, SIGTERM);
@@ -8093,8 +8093,8 @@ diff -Nrpc base/src/backend/postmaster/p
   			}
   
 *************** pmdie(SIGNAL_ARGS)
-*** 2160,2165 ****
---- 2173,2181 ----
+*** 2162,2167 ****
+--- 2175,2183 ----
   				/* and the walwriter too */
   				if (WalWriterPID != 0)
   					signal_child(WalWriterPID, SIGTERM);
@@ -8105,8 +8105,8 @@ diff -Nrpc base/src/backend/postmaster/p
   			}
   
 *************** pmdie(SIGNAL_ARGS)
-*** 2193,2198 ****
---- 2209,2216 ----
+*** 2195,2200 ****
+--- 2211,2218 ----
   				signal_child(PgArchPID, SIGQUIT);
   			if (PgStatPID != 0)
   				signal_child(PgStatPID, SIGQUIT);
@@ -8116,8 +8116,8 @@ diff -Nrpc base/src/backend/postmaster/p
   			break;
   	}
 *************** reaper(SIGNAL_ARGS)
-*** 2455,2460 ****
---- 2473,2488 ----
+*** 2457,2462 ****
+--- 2475,2490 ----
   			continue;
   		}
   
@@ -8135,8 +8135,8 @@ diff -Nrpc base/src/backend/postmaster/p
   		 * Else do standard backend child cleanup.
   		 */
 *************** HandleChildCrash(int pid, int exitstatus
-*** 2646,2651 ****
---- 2674,2691 ----
+*** 2648,2653 ****
+--- 2676,2693 ----
   		signal_child(AutoVacPID, (SendStop ? SIGSTOP : SIGQUIT));
   	}
   
@@ -8156,7 +8156,7 @@ diff -Nrpc base/src/backend/postmaster/p
   	 * Force a power-cycle of the pgarch process too.  (This isn't absolutely
   	 * necessary, but it seems like a good idea for robustness, and it
 *************** PostmasterStateMachine(void)
-*** 2778,2784 ****
+*** 2780,2786 ****
   			StartupPID == 0 &&
   			(BgWriterPID == 0 || !FatalError) &&
   			WalWriterPID == 0 &&
@@ -8164,7 +8164,7 @@ diff -Nrpc base/src/backend/postmaster/p
   		{
   			if (FatalError)
   			{
---- 2818,2825 ----
+--- 2820,2827 ----
   			StartupPID == 0 &&
   			(BgWriterPID == 0 || !FatalError) &&
   			WalWriterPID == 0 &&
@@ -8174,8 +8174,8 @@ diff -Nrpc base/src/backend/postmaster/p
   			if (FatalError)
   			{
 *************** StartChildProcess(AuxProcType type)
-*** 4321,4326 ****
---- 4362,4373 ----
+*** 4323,4328 ****
+--- 4364,4375 ----
   				ereport(LOG,
   						(errmsg("could not fork WAL writer process: %m")));
   				break;
@@ -8408,10 +8408,10 @@ diff -Nrpc base/src/backend/security/sep
 + include $(top_srcdir)/src/backend/common.mk
 diff -Nrpc base/src/backend/security/sepgsql/avc.c sepgsql/src/backend/security/sepgsql/avc.c
 *** base/src/backend/security/sepgsql/avc.c	Thu Jan  1 09:00:00 1970
---- sepgsql/src/backend/security/sepgsql/avc.c	Tue Dec  8 14:16:15 2009
+--- sepgsql/src/backend/security/sepgsql/avc.c	Thu Dec 10 10:36:18 2009
 ***************
 *** 0 ****
---- 1,880 ----
+--- 1,881 ----
 + /*
 +  * src/backend/security/sepgsql/avc.c
 +  *	  SE-PostgreSQL userspace access vector cache
@@ -8454,7 +8454,7 @@ diff -Nrpc base/src/backend/security/sep
 +  * postmaster can receives the notification messages from the kernel
 +  * space, and invalidate the current version of avc.
 +  */
-+ static MemoryContext AvcMemCtx;
++ static MemoryContext AvcMemCtx = NULL;
 + 
 + #define AVC_HASH_NUM_SLOTS		256
 + #define AVC_HASH_NUM_NODES		180
@@ -8554,11 +8554,12 @@ diff -Nrpc base/src/backend/security/sep
 +  * It invalidate access vector cache. It has to be called on errors,
 +  * because avc entries for newly created context is uncertain whether
 +  * it is still valid, or not.
++  * If error happens before avc initialization, we simply skip it.
 +  */
 + void
 + sepgsqlAvcReset(void)
 + {
-+ 	if (!sepgsqlIsEnabled())
++ 	if (!sepgsqlIsEnabled() || !AvcMemCtx)
 + 		return;
 + 
 + 	MemoryContextReset(AvcMemCtx);
@@ -15175,11 +15176,11 @@ diff -Nrpc base/src/backend/security/sep
 + 	allow sepgsql_database_type     user_home_t : db_database { load_module };
 + ')
 diff -Nrpc base/src/backend/storage/file/fd.c sepgsql/src/backend/storage/file/fd.c
-*** base/src/backend/storage/file/fd.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/storage/file/fd.c	Wed Jul 15 19:48:58 2009
+*** base/src/backend/storage/file/fd.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/storage/file/fd.c	Tue Dec 15 17:30:25 2009
 *************** FileTruncate(File file, off_t offset)
-*** 1319,1324 ****
---- 1319,1331 ----
+*** 1329,1334 ****
+--- 1329,1341 ----
   	return returnCode;
   }
   
@@ -15496,8 +15497,8 @@ diff -Nrpc base/src/backend/tcop/pquery.
   
   				/*
 diff -Nrpc base/src/backend/tcop/utility.c sepgsql/src/backend/tcop/utility.c
-*** base/src/backend/tcop/utility.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/tcop/utility.c	Wed Jul 15 21:17:18 2009
+*** base/src/backend/tcop/utility.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/tcop/utility.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 50,55 ****
 --- 50,56 ----
@@ -15519,8 +15520,8 @@ diff -Nrpc base/src/backend/tcop/utility
   		case T_AlterTableStmt:
   		case T_RenameStmt:
 *************** ProcessUtility(Node *parsetree,
-*** 612,617 ****
---- 614,623 ----
+*** 634,639 ****
+--- 636,645 ----
   			ExecAlterOwnerStmt((AlterOwnerStmt *) parsetree);
   			break;
   
@@ -15532,8 +15533,8 @@ diff -Nrpc base/src/backend/tcop/utility
   			{
   				List	   *stmts;
 *************** ProcessUtility(Node *parsetree,
-*** 893,898 ****
---- 899,905 ----
+*** 917,922 ****
+--- 923,929 ----
   				LoadStmt   *stmt = (LoadStmt *) parsetree;
   
   				closeAllVfds(); /* probably not necessary... */
@@ -15542,8 +15543,8 @@ diff -Nrpc base/src/backend/tcop/utility
   				load_file(stmt->filename, !superuser());
   			}
 *************** CreateCommandTag(Node *parsetree)
-*** 1635,1640 ****
---- 1642,1672 ----
+*** 1661,1666 ****
+--- 1668,1698 ----
   			}
   			break;
   
@@ -15576,8 +15577,8 @@ diff -Nrpc base/src/backend/tcop/utility
   			switch (((AlterTableStmt *) parsetree)->relkind)
   			{
 *************** GetCommandLogLevel(Node *parsetree)
-*** 2213,2218 ****
---- 2245,2254 ----
+*** 2239,2244 ****
+--- 2271,2280 ----
   			lev = LOGSTMT_DDL;
   			break;
   
@@ -15625,8 +15626,8 @@ diff -Nrpc base/src/backend/utils/adt/ge
   	if (stat(filename, &fst) < 0)
   		ereport(ERROR,
 diff -Nrpc base/src/backend/utils/adt/ri_triggers.c sepgsql/src/backend/utils/adt/ri_triggers.c
-*** base/src/backend/utils/adt/ri_triggers.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/utils/adt/ri_triggers.c	Wed Jul 15 19:39:56 2009
+*** base/src/backend/utils/adt/ri_triggers.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/utils/adt/ri_triggers.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 39,44 ****
 --- 39,45 ----
@@ -15674,20 +15675,20 @@ diff -Nrpc base/src/backend/utils/adt/ri
   	if (spi_result != SPI_OK_SELECT)
   		elog(ERROR, "SPI_execute_snapshot returned %d", spi_result);
 *************** ri_PerformCheck(RI_QueryKey *qkey, SPIPl
-*** 3264,3269 ****
---- 3274,3280 ----
+*** 3265,3270 ****
+--- 3275,3281 ----
   	int			spi_result;
   	Oid			save_userid;
-  	bool		save_secdefcxt;
+  	int			save_sec_context;
 + 	int			save_rowlv, temp_rowlv;
   	Datum		vals[RI_MAX_NUMKEYS * 2];
   	char		nulls[RI_MAX_NUMKEYS * 2];
   
 *************** ri_PerformCheck(RI_QueryKey *qkey, SPIPl
-*** 3346,3357 ****
---- 3357,3375 ----
-  	GetUserIdAndContext(&save_userid, &save_secdefcxt);
-  	SetUserIdAndContext(RelationGetForm(query_rel)->relowner, true);
+*** 3348,3359 ****
+--- 3359,3377 ----
+  	SetUserIdAndSecContext(RelationGetForm(query_rel)->relowner,
+  						   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
   
 + 	/* Switch Row-level stuff behavior on FK checks, if necessary */
 + 	temp_rowlv = (detectNewRows ? ROWLV_ABORT_MODE : ROWLV_FILTER_MODE);
@@ -15702,8 +15703,8 @@ diff -Nrpc base/src/backend/utils/adt/ri
 + 	/* Restore Row-level stuff behavior */
 + 	rowlvSetPerformingMode(save_rowlv);
 + 
-  	/* Restore UID */
-  	SetUserIdAndContext(save_userid, save_secdefcxt);
+  	/* Restore UID and security context */
+  	SetUserIdAndSecContext(save_userid, save_sec_context);
   
 diff -Nrpc base/src/backend/utils/adt/tid.c sepgsql/src/backend/utils/adt/tid.c
 *** base/src/backend/utils/adt/tid.c	Sat Jan  3 13:01:35 2009
@@ -15807,8 +15808,8 @@ diff -Nrpc base/src/backend/utils/cache/
   			/* other cases shouldn't happen, but return NULL */
   			break;
 diff -Nrpc base/src/backend/utils/cache/relcache.c sepgsql/src/backend/utils/cache/relcache.c
-*** base/src/backend/utils/cache/relcache.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/utils/cache/relcache.c	Wed Sep  9 13:14:37 2009
+*** base/src/backend/utils/cache/relcache.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/utils/cache/relcache.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 47,52 ****
 --- 47,53 ----
@@ -15833,8 +15834,8 @@ diff -Nrpc base/src/backend/utils/cache/
   	 * initialize the relation lock manager information
   	 */
 *************** formrdesc(const char *relationName, Oid 
-*** 1458,1463 ****
---- 1463,1473 ----
+*** 1460,1465 ****
+--- 1465,1475 ----
   	RelationGetRelid(relation) = relation->rd_att->attrs[0]->attrelid;
   	relation->rd_rel->relfilenode = RelationGetRelid(relation);
   
@@ -15847,8 +15848,8 @@ diff -Nrpc base/src/backend/utils/cache/
   	 * initialize the relation lock manager information
   	 */
 *************** BuildHardcodedDescriptor(int natts, Form
-*** 2699,2704 ****
---- 2709,2721 ----
+*** 2749,2754 ****
+--- 2759,2771 ----
   	result = CreateTemplateTupleDesc(natts, hasoids);
   	result->tdtypeid = RECORDOID;		/* not right, but we don't care */
   	result->tdtypmod = -1;
@@ -15863,8 +15864,8 @@ diff -Nrpc base/src/backend/utils/cache/
   	for (i = 0; i < natts; i++)
   	{
 *************** load_relcache_init_file(void)
-*** 3453,3458 ****
---- 3470,3480 ----
+*** 3503,3508 ****
+--- 3520,3530 ----
   			rel->rd_options = NULL;
   		}
   
@@ -15970,8 +15971,8 @@ diff -Nrpc base/src/backend/utils/fmgr/d
   	internal_unload_library(fullname);
   
 diff -Nrpc base/src/backend/utils/fmgr/fmgr.c sepgsql/src/backend/utils/fmgr/fmgr.c
-*** base/src/backend/utils/fmgr/fmgr.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/utils/fmgr/fmgr.c	Thu Sep 17 17:04:16 2009
+*** base/src/backend/utils/fmgr/fmgr.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/utils/fmgr/fmgr.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 24,29 ****
 --- 24,30 ----
@@ -16047,8 +16048,8 @@ diff -Nrpc base/src/backend/utils/init/p
   	 * Figure out our postgres user id, and see if we are a superuser.
   	 *
 diff -Nrpc base/src/backend/utils/misc/guc.c sepgsql/src/backend/utils/misc/guc.c
-*** base/src/backend/utils/misc/guc.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/utils/misc/guc.c	Sun Sep  6 19:53:10 2009
+*** base/src/backend/utils/misc/guc.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/utils/misc/guc.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 56,61 ****
 --- 56,62 ----
@@ -16178,8 +16179,8 @@ diff -Nrpc base/src/backend/utils/misc/s
   }
   
 diff -Nrpc base/src/bin/initdb/initdb.c sepgsql/src/bin/initdb/initdb.c
-*** base/src/bin/initdb/initdb.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/bin/initdb/initdb.c	Wed Jul 15 19:35:52 2009
+*** base/src/bin/initdb/initdb.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/bin/initdb/initdb.c	Tue Dec 15 17:30:25 2009
 *************** static bool debug = false;
 *** 87,92 ****
 --- 87,93 ----
@@ -16239,8 +16240,8 @@ diff -Nrpc base/src/bin/initdb/initdb.c 
   				show_setting = true;
   				break;
 diff -Nrpc base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
-*** base/src/bin/pg_dump/pg_dump.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/bin/pg_dump/pg_dump.c	Tue Sep  8 17:13:41 2009
+*** base/src/bin/pg_dump/pg_dump.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/bin/pg_dump/pg_dump.c	Tue Dec 15 17:30:25 2009
 *************** static int	disable_dollar_quoting = 0;
 *** 112,117 ****
 --- 112,119 ----
@@ -16967,8 +16968,8 @@ diff -Nrpc base/src/bin/pg_dump/pg_dump.
   
   		/*
 *************** fmtCopyColumnList(const TableInfo *ti)
-*** 11508,11513 ****
---- 11595,11607 ----
+*** 11510,11515 ****
+--- 11597,11609 ----
   
   	appendPQExpBuffer(q, "(");
   	needComma = false;
@@ -17914,21 +17915,21 @@ diff -Nrpc base/src/include/nodes/nodes.
   	/*
   	 * TAGS FOR PARSE TREE NODES (parsenodes.h)
 diff -Nrpc base/src/include/nodes/parsenodes.h sepgsql/src/include/nodes/parsenodes.h
-*** base/src/include/nodes/parsenodes.h	Fri Jun 19 13:40:37 2009
---- sepgsql/src/include/nodes/parsenodes.h	Wed Jul 15 19:37:35 2009
+*** base/src/include/nodes/parsenodes.h	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/include/nodes/parsenodes.h	Tue Dec 15 17:30:25 2009
 *************** typedef struct ColumnDef
-*** 464,469 ****
---- 464,470 ----
+*** 463,468 ****
+--- 463,469 ----
   	Node	   *raw_default;	/* default value (untransformed parse tree) */
-  	char	   *cooked_default; /* nodeToString representation */
+  	Node	   *cooked_default; /* default value (transformed expr tree) */
   	List	   *constraints;	/* other constraints on column */
 + 	Node	   *secLabel;		/* security label of column */
   } ColumnDef;
   
   /*
 *************** typedef struct CreateSchemaStmt
-*** 1070,1075 ****
---- 1071,1077 ----
+*** 1069,1074 ****
+--- 1070,1076 ----
   	NodeTag		type;
   	char	   *schemaname;		/* the name of the schema to create */
   	char	   *authid;			/* the owner of the created schema */
@@ -17937,8 +17938,8 @@ diff -Nrpc base/src/include/nodes/parsen
   } CreateSchemaStmt;
   
 *************** typedef struct CreateStmt
-*** 1335,1340 ****
---- 1337,1343 ----
+*** 1334,1339 ****
+--- 1336,1342 ----
   	List	   *options;		/* options from WITH clause */
   	OnCommitAction oncommit;	/* what do we do at COMMIT? */
   	char	   *tablespacename; /* table space to use, or NULL */
@@ -17947,8 +17948,8 @@ diff -Nrpc base/src/include/nodes/parsen
   
   /* ----------
 *************** typedef struct CreateSeqStmt
-*** 1639,1644 ****
---- 1642,1648 ----
+*** 1638,1643 ****
+--- 1641,1647 ----
   	NodeTag		type;
   	RangeVar   *sequence;		/* the sequence to create */
   	List	   *options;
@@ -17957,8 +17958,8 @@ diff -Nrpc base/src/include/nodes/parsen
   
   typedef struct AlterSeqStmt
 *************** typedef struct AlterOwnerStmt
-*** 1993,1998 ****
---- 1997,2016 ----
+*** 1992,1997 ****
+--- 1996,2015 ----
   	char	   *newowner;		/* the new owner */
   } AlterOwnerStmt;
   
@@ -19046,8 +19047,8 @@ diff -Nrpc base/src/test/regress/expecte
   --
   -- another sanity check: every system catalog that has OIDs should have
 diff -Nrpc base/src/test/regress/pg_regress.c sepgsql/src/test/regress/pg_regress.c
-*** base/src/test/regress/pg_regress.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/test/regress/pg_regress.c	Tue Dec  1 17:11:40 2009
+*** base/src/test/regress/pg_regress.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/test/regress/pg_regress.c	Tue Dec 15 17:30:25 2009
 *************** static _stringlist *schedulelist = NULL;
 *** 82,87 ****
 --- 82,88 ----


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-12/sepostgresql.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sepostgresql.spec	8 Dec 2009 05:59:39 -0000	1.44
+++ sepostgresql.spec	16 Dec 2009 13:38:53 -0000	1.45
@@ -11,8 +11,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.4.1
-Release: 2464%{?dist}
+Version: 8.4.2
+Release: 2487%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -192,6 +192,9 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Wed Dec 16 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.2-2487
+- upgrade base version 8.4.1->8.4.2
+
 * Fri Dec 8 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2464
 - rework: backport features from v8.5devel tree
 - fixbug: selinux netlink receiver process didn't have correct ps display


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Sep 2009 10:40:20 -0000	1.13
+++ sources	16 Dec 2009 13:38:53 -0000	1.14
@@ -1 +1 @@
-f2015af17bacbbfe140daf0d1067f9c9  postgresql-8.4.1.tar.bz2
+d738227e2f1f742d2f2d4ab56496c5c6  postgresql-8.4.2.tar.bz2



From anttix at fedoraproject.org  Wed Dec 16 13:48:47 2009
From: anttix at fedoraproject.org (Antti Andreimann)
Date: Wed, 16 Dec 2009 13:48:47 +0000 (UTC)
Subject: File xerces-c-3.0.1.tar.gz uploaded to lookaside cache by anttix
Message-ID: <20091216134847.733AE28ECEF@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mingw32-xerces-c:

293c03f59bf8e956020d73f5b122094c  xerces-c-3.0.1.tar.gz



From anttix at fedoraproject.org  Wed Dec 16 13:51:14 2009
From: anttix at fedoraproject.org (Antti Andreimann)
Date: Wed, 16 Dec 2009 13:51:14 +0000 (UTC)
Subject: rpms/mingw32-xerces-c/devel import.log, NONE,
	1.1 mingw32-xerces-c.spec, NONE,
	1.1 xerces-c-3.0.1-CVE-2009-1885.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216135114.53E7211C02B9@cvs1.fedora.phx.redhat.com>

Author: anttix

Update of /cvs/pkgs/rpms/mingw32-xerces-c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13938/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-xerces-c.spec 
	xerces-c-3.0.1-CVE-2009-1885.patch 
Log Message:
Initial import (#523224)



--- NEW FILE import.log ---
mingw32-xerces-c-3_0_1-1_fc12:HEAD:mingw32-xerces-c-3.0.1-1.fc12.src.rpm:1260971296


--- NEW FILE mingw32-xerces-c.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}

Name:           mingw32-xerces-c
Version:        3.0.1
Release:        1%{?dist}
Summary:        MingGW Windows validating XML parser

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://xml.apache.org/xerces-c/
Source0:        http://www.apache.org/dist/xerces/c/3/sources/xerces-c-%{version}.tar.gz
Patch0:         xerces-c-3.0.1-CVE-2009-1885.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 53
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils

Requires:       pkgconfig

%description
Xerces-C is a validating XML parser written in a portable subset of
C++. Xerces-C makes it easy to give your application the ability to
read and write XML data. A shared library is provided for parsing,
generating, manipulating, and validating XML documents. Xerces-C is
faithful to the XML 1.0 recommendation and associated standards (DOM
1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).


%{_mingw32_debug_package}


%prep
%setup -q -n xerces-c-%{version}
%patch0 -p0 -b .CVE-2009-1885


%build
%{_mingw32_configure} LDFLAGS=-no-undefined \
    --disable-static \
    --disable-pretty-make
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_mingw32_includedir}/xercesc/
%{_mingw32_bindir}/libxerces-c-3-0.dll
%{_mingw32_libdir}/libxerces-c.dll.a
%{_mingw32_libdir}/libxerces-c.la
%{_mingw32_libdir}/pkgconfig/xerces-c.pc


%changelog
* Mon Sep 14 2009 Antti Andreimann <Antti.Andreimann at mail.ee> - 3.0.1-1
- Initial RPM release.

xerces-c-3.0.1-CVE-2009-1885.patch:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 291 insertions(+), 274 deletions(-)

--- NEW FILE xerces-c-3.0.1-CVE-2009-1885.patch ---
--- src/xercesc/validators/DTD/DTDScanner.cpp
+++ src/xercesc/validators/DTD/DTDScanner.cpp
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1041,338 +1042,354 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    XMLSize_t curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
+    }
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
+    {
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
+
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+        (
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
+            , fGrammarPoolMemoryManager
+        );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
+
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
+        {
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
+            {
+                delete tmpNode;
+            }
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+        }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
-     else
+
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
+
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
         {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
             return 0;
         }
 
         //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
         //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
         {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
             (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
+                curType
+                , curNode
+                , 0
+                , true
+                , true
                 , fGrammarPoolMemoryManager
             );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
+            curNode = headNode;
         }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            decl->getElementName()
-            , fGrammarPoolMemoryManager
-        );
-
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
-
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+         else if (opCh == chPipe)
         {
-            if (gotSpaces)
-            {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
-            }
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
             fReaderMgr->getNextChar();
-            curNode = tmpNode;
         }
-    }
-
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
-
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
-
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
+                {
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
                 {
-                    if (!curNode->getSecond())
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                 else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                     else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
+
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
-                        decl->setCreateReason(XMLElementDecl::InContentModel);
-                        decl->setExternalElemDeclaration(isReadingExternalEntity());
-                        fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
+
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-xerces-c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:27:57 -0000	1.1
+++ .cvsignore	16 Dec 2009 13:51:13 -0000	1.2
@@ -0,0 +1 @@
+xerces-c-3.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-xerces-c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:27:57 -0000	1.1
+++ sources	16 Dec 2009 13:51:14 -0000	1.2
@@ -0,0 +1 @@
+293c03f59bf8e956020d73f5b122094c  xerces-c-3.0.1.tar.gz



From anttix at fedoraproject.org  Wed Dec 16 13:52:47 2009
From: anttix at fedoraproject.org (Antti Andreimann)
Date: Wed, 16 Dec 2009 13:52:47 +0000 (UTC)
Subject: rpms/mingw32-xerces-c/F-12 import.log, NONE,
	1.1 mingw32-xerces-c.spec, 
	NONE, 1.1 xerces-c-3.0.1-CVE-2009-1885.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216135247.3F50D11C0092@cvs1.fedora.phx.redhat.com>

Author: anttix

Update of /cvs/pkgs/rpms/mingw32-xerces-c/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14358/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-xerces-c.spec 
	xerces-c-3.0.1-CVE-2009-1885.patch 
Log Message:
Initial import (#523224)



--- NEW FILE import.log ---
mingw32-xerces-c-3_0_1-1_fc12:F-12:mingw32-xerces-c-3.0.1-1.fc12.src.rpm:1260971492


--- NEW FILE mingw32-xerces-c.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}

Name:           mingw32-xerces-c
Version:        3.0.1
Release:        1%{?dist}
Summary:        MingGW Windows validating XML parser

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://xml.apache.org/xerces-c/
Source0:        http://www.apache.org/dist/xerces/c/3/sources/xerces-c-%{version}.tar.gz
Patch0:         xerces-c-3.0.1-CVE-2009-1885.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 53
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils

Requires:       pkgconfig

%description
Xerces-C is a validating XML parser written in a portable subset of
C++. Xerces-C makes it easy to give your application the ability to
read and write XML data. A shared library is provided for parsing,
generating, manipulating, and validating XML documents. Xerces-C is
faithful to the XML 1.0 recommendation and associated standards (DOM
1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).


%{_mingw32_debug_package}


%prep
%setup -q -n xerces-c-%{version}
%patch0 -p0 -b .CVE-2009-1885


%build
%{_mingw32_configure} LDFLAGS=-no-undefined \
    --disable-static \
    --disable-pretty-make
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_mingw32_includedir}/xercesc/
%{_mingw32_bindir}/libxerces-c-3-0.dll
%{_mingw32_libdir}/libxerces-c.dll.a
%{_mingw32_libdir}/libxerces-c.la
%{_mingw32_libdir}/pkgconfig/xerces-c.pc


%changelog
* Mon Sep 14 2009 Antti Andreimann <Antti.Andreimann at mail.ee> - 3.0.1-1
- Initial RPM release.

xerces-c-3.0.1-CVE-2009-1885.patch:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 291 insertions(+), 274 deletions(-)

--- NEW FILE xerces-c-3.0.1-CVE-2009-1885.patch ---
--- src/xercesc/validators/DTD/DTDScanner.cpp
+++ src/xercesc/validators/DTD/DTDScanner.cpp
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1041,338 +1042,354 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    XMLSize_t curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
+    }
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
+    {
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
+
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+        (
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
+            , fGrammarPoolMemoryManager
+        );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
+
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
+        {
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
+            {
+                delete tmpNode;
+            }
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+        }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
-     else
+
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
+
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
         {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
             return 0;
         }
 
         //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
         //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
         {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
             (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
+                curType
+                , curNode
+                , 0
+                , true
+                , true
                 , fGrammarPoolMemoryManager
             );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
+            curNode = headNode;
         }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            decl->getElementName()
-            , fGrammarPoolMemoryManager
-        );
-
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
-
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+         else if (opCh == chPipe)
         {
-            if (gotSpaces)
-            {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
-            }
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
             fReaderMgr->getNextChar();
-            curNode = tmpNode;
         }
-    }
-
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
-
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
-
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
+                {
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
                 {
-                    if (!curNode->getSecond())
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                 else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                     else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
+
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
-                        decl->setCreateReason(XMLElementDecl::InContentModel);
-                        decl->setExternalElemDeclaration(isReadingExternalEntity());
-                        fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
+
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-xerces-c/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:27:57 -0000	1.1
+++ .cvsignore	16 Dec 2009 13:52:46 -0000	1.2
@@ -0,0 +1 @@
+xerces-c-3.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-xerces-c/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:27:57 -0000	1.1
+++ sources	16 Dec 2009 13:52:47 -0000	1.2
@@ -0,0 +1 @@
+293c03f59bf8e956020d73f5b122094c  xerces-c-3.0.1.tar.gz



From kaigai at fedoraproject.org  Wed Dec 16 13:54:47 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Wed, 16 Dec 2009 13:54:47 +0000 (UTC)
Subject: rpms/sepostgresql/devel .cvsignore, 1.16,
	1.17 sepostgresql-8.4.patch, 
	1.3, 1.4 sepostgresql.spec, 1.43, 1.44 sources, 1.13, 1.14
Message-ID: <20091216135447.9866B11C0092@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14793

Modified Files:
	.cvsignore sepostgresql-8.4.patch sepostgresql.spec sources 
Log Message:
upgrade base version 8.4.1->8.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	11 Sep 2009 10:40:19 -0000	1.16
+++ .cvsignore	16 Dec 2009 13:54:47 -0000	1.17
@@ -1 +1 @@
-postgresql-8.4.1.tar.bz2
+postgresql-8.4.2.tar.bz2

sepostgresql-8.4.patch:
 configure                                                          |  113 
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   15 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |   12 
 src/backend/access/heap/tuptoaster.c                               |   12 
 src/backend/access/transam/xact.c                                  |   26 
 src/backend/bootstrap/bootparse.y                                  |   11 
 src/backend/bootstrap/bootstrap.c                                  |   20 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   25 
 src/backend/catalog/catalog.c                                      |    6 
 src/backend/catalog/dependency.c                                   |   35 
 src/backend/catalog/heap.c                                         |   89 
 src/backend/catalog/index.c                                        |    6 
 src/backend/catalog/namespace.c                                    |   33 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_conversion.c                                |    4 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_operator.c                                  |   17 
 src/backend/catalog/pg_proc.c                                      |   14 
 src/backend/catalog/pg_security.c                                  |  637 ++
 src/backend/catalog/pg_shdepend.c                                  |    6 
 src/backend/catalog/pg_type.c                                      |   20 
 src/backend/catalog/toasting.c                                     |   10 
 src/backend/commands/aggregatecmds.c                               |    4 
 src/backend/commands/alter.c                                       |   29 
 src/backend/commands/cluster.c                                     |   11 
 src/backend/commands/conversioncmds.c                              |   12 
 src/backend/commands/copy.c                                        |  268 
 src/backend/commands/dbcommands.c                                  |   95 
 src/backend/commands/foreigncmds.c                                 |   23 
 src/backend/commands/functioncmds.c                                |   92 
 src/backend/commands/indexcmds.c                                   |    4 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/opclasscmds.c                                 |   44 
 src/backend/commands/operatorcmds.c                                |    3 
 src/backend/commands/proclang.c                                    |   21 
 src/backend/commands/schemacmds.c                                  |   65 
 src/backend/commands/sequence.c                                    |   16 
 src/backend/commands/tablecmds.c                                   |  248 
 src/backend/commands/trigger.c                                     |    9 
 src/backend/commands/tsearchcmds.c                                 |   54 
 src/backend/commands/typecmds.c                                    |   13 
 src/backend/commands/view.c                                        |    4 
 src/backend/executor/execJunk.c                                    |    5 
 src/backend/executor/execMain.c                                    |  140 
 src/backend/executor/execQual.c                                    |    3 
 src/backend/executor/execScan.c                                    |   24 
 src/backend/executor/execTuples.c                                  |   14 
 src/backend/executor/execUtils.c                                   |    6 
 src/backend/executor/functions.c                                   |    6 
 src/backend/executor/nodeAgg.c                                     |    4 
 src/backend/executor/nodeMergejoin.c                               |    2 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/nodeWindowAgg.c                               |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   68 
 src/backend/nodes/copyfuncs.c                                      |   22 
 src/backend/nodes/equalfuncs.c                                     |   19 
 src/backend/nodes/outfuncs.c                                       |    4 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/util/clauses.c                               |    3 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   46 
 src/backend/parser/gram.y                                          |  106 
 src/backend/parser/parse_target.c                                  |   63 
 src/backend/parser/parse_utilcmd.c                                 |    3 
 src/backend/postmaster/autovacuum.c                                |    2 
 src/backend/postmaster/postmaster.c                                |   51 
 src/backend/rewrite/rewriteDefine.c                                |    4 
 src/backend/rewrite/rewriteRemove.c                                |    4 
 src/backend/security/Makefile                                      |   13 
 src/backend/security/rowlevel.c                                    |  121 
 src/backend/security/sepgsql/Makefile                              |   16 
 src/backend/security/sepgsql/avc.c                                 |  881 +++
 src/backend/security/sepgsql/bridge.c                              | 2876 ++++++++++
 src/backend/security/sepgsql/checker.c                             |  424 +
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               |  239 
 src/backend/security/sepgsql/label.c                               | 1140 +++
 src/backend/security/sepgsql/misc.c                                |  304 +
 src/backend/security/sepgsql/perms.c                               |  597 ++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  123 
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  118 
 src/backend/tcop/fastpath.c                                        |    3 
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    6 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/tid.c                                        |    4 
 src/backend/utils/adt/trigfuncs.c                                  |    4 
 src/backend/utils/cache/plancache.c                                |    9 
 src/backend/utils/cache/relcache.c                                 |   22 
 src/backend/utils/cache/syscache.c                                 |   26 
 src/backend/utils/fmgr/dfmgr.c                                     |    7 
 src/backend/utils/fmgr/fmgr.c                                      |    2 
 src/backend/utils/init/postinit.c                                  |    9 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    4 
 src/backend/utils/misc/superuser.c                                 |   10 
 src/bin/initdb/initdb.c                                            |   13 
 src/bin/pg_dump/pg_dump.c                                          |  150 
 src/bin/pg_dump/pg_dump.h                                          |    2 
 src/bin/pg_dump/pg_dumpall.c                                       |   72 
 src/include/access/htup.h                                          |   32 
 src/include/access/sysattr.h                                       |   14 
 src/include/access/tupdesc.h                                       |    1 
 src/include/bootstrap/bootstrap.h                                  |    3 
 src/include/catalog/dependency.h                                   |    3 
 src/include/catalog/heap.h                                         |   11 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_conversion_fn.h                             |    2 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   21 
 src/include/catalog/pg_proc_fn.h                                   |    3 
 src/include/catalog/pg_security.h                                  |  101 
 src/include/catalog/toasting.h                                     |    3 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   18 
 src/include/nodes/plannodes.h                                      |    7 
 src/include/nodes/relation.h                                       |    9 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   44 
 src/include/security/sepgsql.h                                     |  777 ++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/storage/proc.h                                         |    4 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |    2 
 src/test/regress/GNUmakefile                                       |    8 
 src/test/regress/expected/sanity_check.out                         |    3 
 src/test/regress/pg_regress.c                                      |    9 
 150 files changed, 10633 insertions(+), 3 deletions(-), 677 modifications(!)

Index: sepostgresql-8.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-8.4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sepostgresql-8.4.patch	8 Dec 2009 06:00:14 -0000	1.3
+++ sepostgresql-8.4.patch	16 Dec 2009 13:54:47 -0000	1.4
@@ -1,6 +1,6 @@
 diff -Nrpc base/configure sepgsql/configure
-*** base/configure	Sun Sep  6 19:40:49 2009
---- sepgsql/configure	Sun Sep  6 19:53:10 2009
+*** base/configure	Tue Dec 15 17:16:51 2009
+--- sepgsql/configure	Tue Dec 15 17:30:25 2009
 *************** with_libxml
 *** 710,715 ****
 --- 710,716 ----
@@ -189,8 +189,8 @@ diff -Nrpc base/configure sepgsql/config
     elif $ac_last_try; then
       { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 diff -Nrpc base/configure.in sepgsql/configure.in
-*** base/configure.in	Sun Sep  6 19:40:49 2009
---- sepgsql/configure.in	Sun Sep  6 19:53:10 2009
+*** base/configure.in	Tue Dec 15 17:16:51 2009
+--- sepgsql/configure.in	Tue Dec 15 17:30:25 2009
 *************** PGAC_ARG_BOOL(with, zlib, yes,
 *** 764,769 ****
 --- 764,782 ----
@@ -227,8 +227,8 @@ diff -Nrpc base/src/Makefile.global.in s
   enable_thread_safety	= @enable_thread_safety@
   
 diff -Nrpc base/src/backend/Makefile sepgsql/src/backend/Makefile
-*** base/src/backend/Makefile	Sat Jan  3 13:01:35 2009
---- sepgsql/src/backend/Makefile	Wed Jul 15 19:35:52 2009
+*** base/src/backend/Makefile	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/Makefile	Tue Dec 15 17:30:25 2009
 *************** include $(top_builddir)/src/Makefile.glo
 *** 16,22 ****
   
@@ -247,8 +247,8 @@ diff -Nrpc base/src/backend/Makefile sep
   include $(srcdir)/common.mk
   
 *************** LIBS := $(filter-out -lpgport, $(LIBS)) 
-*** 34,39 ****
---- 34,44 ----
+*** 40,45 ****
+--- 40,50 ----
   # The backend doesn't need everything that's in LIBS, however
   LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
   
@@ -498,8 +498,8 @@ diff -Nrpc base/src/backend/access/heap/
   
   		/*
 diff -Nrpc base/src/backend/access/transam/xact.c sepgsql/src/backend/access/transam/xact.c
-*** base/src/backend/access/transam/xact.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/access/transam/xact.c	Sun Sep  6 19:31:39 2009
+*** base/src/backend/access/transam/xact.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/access/transam/xact.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 36,41 ****
 --- 36,43 ----
@@ -515,7 +515,7 @@ diff -Nrpc base/src/backend/access/trans
 *** 140,145 ****
 --- 142,148 ----
   	Oid			prevUser;		/* previous CurrentUserId setting */
-  	bool		prevSecDefCxt;	/* previous SecurityDefinerContext setting */
+  	int			prevSecContext;	/* previous SecurityRestrictionContext */
   	bool		prevXactReadOnly;		/* entry-time xact r/o state */
 + 	int			prevRowlv;		/* previous Row-level control behavior */
   	struct TransactionStateData *parent;		/* back link to parent */
@@ -525,7 +525,7 @@ diff -Nrpc base/src/backend/access/trans
 *** 168,173 ****
 --- 171,177 ----
   	InvalidOid,					/* previous CurrentUserId setting */
-  	false,						/* previous SecurityDefinerContext setting */
+  	0,							/* previous SecurityRestrictionContext */
   	false,						/* entry-time xact r/o state */
 + 	ROWLV_FILTER_MODE,			/* previous Row-level control behavior */
   	NULL						/* link to parent state block */
@@ -536,15 +536,15 @@ diff -Nrpc base/src/backend/access/trans
 --- 1528,1534 ----
   	s->nChildXids = 0;
   	s->maxChildXids = 0;
-  	GetUserIdAndContext(&s->prevUser, &s->prevSecDefCxt);
+  	GetUserIdAndSecContext(&s->prevUser, &s->prevSecContext);
 + 	s->prevRowlv = rowlvGetPerformingMode();
-  	/* SecurityDefinerContext should never be set outside a transaction */
-  	Assert(!s->prevSecDefCxt);
+  	/* SecurityRestrictionContext should never be set outside a transaction */
+  	Assert(s->prevSecContext == 0);
   
 *************** AbortTransaction(void)
-*** 2030,2035 ****
---- 2035,2050 ----
-  	SetUserIdAndContext(s->prevUser, s->prevSecDefCxt);
+*** 2031,2036 ****
+--- 2036,2051 ----
+  	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
   
   	/*
 + 	 * Reset behavior of row-level access controls
@@ -561,9 +561,9 @@ diff -Nrpc base/src/backend/access/trans
   	 */
   	AfterTriggerEndXact(false);
 *************** AbortSubTransaction(void)
-*** 3873,3878 ****
---- 3888,3903 ----
-  	SetUserIdAndContext(s->prevUser, s->prevSecDefCxt);
+*** 3874,3879 ****
+--- 3889,3904 ----
+  	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
   
   	/*
 + 	 * Reset behavior of row-level access controls
@@ -580,10 +580,10 @@ diff -Nrpc base/src/backend/access/trans
   	 * ResourceOwner...
   	 */
 *************** PushTransaction(void)
-*** 4014,4019 ****
---- 4039,4045 ----
+*** 4015,4020 ****
+--- 4040,4046 ----
   	s->blockState = TBLOCK_SUBBEGIN;
-  	GetUserIdAndContext(&s->prevUser, &s->prevSecDefCxt);
+  	GetUserIdAndSecContext(&s->prevUser, &s->prevSecContext);
   	s->prevXactReadOnly = XactReadOnly;
 + 	s->prevRowlv = rowlvGetPerformingMode();
   
@@ -920,8 +920,8 @@ diff -Nrpc base/src/backend/catalog/cata
   		relationId == PgShdescriptionToastIndex)
   		return true;
 diff -Nrpc base/src/backend/catalog/dependency.c sepgsql/src/backend/catalog/dependency.c
-*** base/src/backend/catalog/dependency.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/catalog/dependency.c	Thu Sep 17 23:44:07 2009
+*** base/src/backend/catalog/dependency.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/catalog/dependency.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 63,68 ****
 --- 63,69 ----
@@ -1045,7 +1045,7 @@ diff -Nrpc base/src/backend/catalog/depe
   
   	/* And clean up */
 *************** reportDependentObjects(const ObjectAddre
-*** 942,954 ****
+*** 943,955 ****
    * depRel is the already-open pg_depend relation.
    */
   static void
@@ -1059,7 +1059,7 @@ diff -Nrpc base/src/backend/catalog/depe
   	/*
   	 * First remove any pg_depend records that link from this object to
   	 * others.	(Any records linking to this object should be gone already.)
---- 957,973 ----
+--- 958,974 ----
    * depRel is the already-open pg_depend relation.
    */
   static void
@@ -1435,8 +1435,8 @@ diff -Nrpc base/src/backend/catalog/heap
   
   
 diff -Nrpc base/src/backend/catalog/index.c sepgsql/src/backend/catalog/index.c
-*** base/src/backend/catalog/index.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/catalog/index.c	Fri Sep 18 17:02:48 2009
+*** base/src/backend/catalog/index.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/catalog/index.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 48,53 ****
 --- 48,54 ----
@@ -1448,7 +1448,7 @@ diff -Nrpc base/src/backend/catalog/inde
   #include "storage/lmgr.h"
   #include "storage/procarray.h"
 *************** AppendAttributeTuples(Relation indexRela
-*** 351,357 ****
+*** 352,358 ****
   		Assert(indexTupDesc->attrs[i]->attnum == i + 1);
   		Assert(indexTupDesc->attrs[i]->attcacheoff == -1);
   
@@ -1456,7 +1456,7 @@ diff -Nrpc base/src/backend/catalog/inde
   	}
   
   	CatalogCloseIndexes(indstate);
---- 352,359 ----
+--- 353,360 ----
   		Assert(indexTupDesc->attrs[i]->attnum == i + 1);
   		Assert(indexTupDesc->attrs[i]->attcacheoff == -1);
   
@@ -1466,7 +1466,7 @@ diff -Nrpc base/src/backend/catalog/inde
   
   	CatalogCloseIndexes(indstate);
 *************** index_create(Oid heapRelationId,
-*** 652,658 ****
+*** 653,659 ****
   	 */
   	InsertPgClassTuple(pg_class, indexRelation,
   					   RelationGetRelid(indexRelation),
@@ -1474,7 +1474,7 @@ diff -Nrpc base/src/backend/catalog/inde
   
   	/* done with pg_class */
   	heap_close(pg_class, RowExclusiveLock);
---- 654,660 ----
+--- 655,661 ----
   	 */
   	InsertPgClassTuple(pg_class, indexRelation,
   					   RelationGetRelid(indexRelation),
@@ -1861,8 +1861,8 @@ diff -Nrpc base/src/backend/catalog/pg_o
   		operatorObjectId = simple_heap_insert(pg_operator_desc, tup);
   	}
 diff -Nrpc base/src/backend/catalog/pg_proc.c sepgsql/src/backend/catalog/pg_proc.c
-*** base/src/backend/catalog/pg_proc.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/catalog/pg_proc.c	Fri Sep 18 17:39:46 2009
+*** base/src/backend/catalog/pg_proc.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/catalog/pg_proc.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 29,34 ****
 --- 29,35 ----
@@ -1892,8 +1892,8 @@ diff -Nrpc base/src/backend/catalog/pg_p
   	Oid			retval;
   	int			parameterCount;
 *************** ProcedureCreate(const char *procedureNam
-*** 96,101 ****
---- 98,104 ----
+*** 97,102 ****
+--- 99,105 ----
   	Datum		values[Natts_pg_proc];
   	bool		replaces[Natts_pg_proc];
   	Oid			relid;
@@ -1902,8 +1902,8 @@ diff -Nrpc base/src/backend/catalog/pg_p
   	TupleDesc	tupDesc;
   	bool		is_update;
 *************** ProcedureCreate(const char *procedureNam
-*** 343,348 ****
---- 346,356 ----
+*** 344,349 ****
+--- 347,357 ----
   							ObjectIdGetDatum(procNamespace),
   							0);
   
@@ -1916,8 +1916,8 @@ diff -Nrpc base/src/backend/catalog/pg_p
   	{
   		/* There is one; okay to replace it? */
 *************** ProcedureCreate(const char *procedureNam
-*** 477,482 ****
---- 485,492 ----
+*** 481,486 ****
+--- 489,496 ----
   
   		/* Okay, do it... */
   		tup = heap_modify_tuple(oldtup, tupDesc, values, nulls, replaces);
@@ -1927,8 +1927,8 @@ diff -Nrpc base/src/backend/catalog/pg_p
   
   		ReleaseSysCache(oldtup);
 *************** ProcedureCreate(const char *procedureNam
-*** 486,491 ****
---- 496,503 ----
+*** 490,495 ****
+--- 500,507 ----
   	{
   		/* Creating a new procedure */
   		tup = heap_form_tuple(tupDesc, values, nulls);
@@ -4690,8 +4690,8 @@ diff -Nrpc base/src/backend/commands/pro
   		memset(repl_repl, false, sizeof(repl_repl));
   
 diff -Nrpc base/src/backend/commands/schemacmds.c sepgsql/src/backend/commands/schemacmds.c
-*** base/src/backend/commands/schemacmds.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/commands/schemacmds.c	Thu Sep 17 17:04:16 2009
+*** base/src/backend/commands/schemacmds.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/commands/schemacmds.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 25,30 ****
 --- 25,31 ----
@@ -4709,7 +4709,7 @@ diff -Nrpc base/src/backend/commands/sch
   	Oid			owner_uid;
   	Oid			saved_uid;
 + 	Oid			nspsecid;
-  	bool		saved_secdefcxt;
+  	int			save_sec_context;
   	AclResult	aclresult;
   
 *************** CreateSchemaCommand(CreateSchemaStmt *st
@@ -4726,16 +4726,16 @@ diff -Nrpc base/src/backend/commands/sch
   	if (!allowSystemTableMods && IsReservedName(schemaName))
   		ereport(ERROR,
 *************** CreateSchemaCommand(CreateSchemaStmt *st
-*** 94,100 ****
-  		SetUserIdAndContext(owner_uid, true);
+*** 95,101 ****
+  							   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
   
   	/* Create the schema's namespace */
 ! 	namespaceId = NamespaceCreate(schemaName, owner_uid);
   
   	/* Advance cmd counter to make the namespace visible */
   	CommandCounterIncrement();
---- 100,106 ----
-  		SetUserIdAndContext(owner_uid, true);
+--- 101,107 ----
+  							   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
   
   	/* Create the schema's namespace */
 ! 	namespaceId = NamespaceCreate(schemaName, owner_uid, nspsecid);
@@ -4743,7 +4743,7 @@ diff -Nrpc base/src/backend/commands/sch
   	/* Advance cmd counter to make the namespace visible */
   	CommandCounterIncrement();
 *************** RenameSchema(const char *oldname, const 
-*** 267,274 ****
+*** 268,275 ****
   				 errmsg("schema \"%s\" does not exist", oldname)));
   
   	/* make sure the new name doesn't exist */
@@ -4752,7 +4752,7 @@ diff -Nrpc base/src/backend/commands/sch
   										CStringGetDatum(newname),
   										0, 0, 0)))
   		ereport(ERROR,
---- 273,279 ----
+--- 274,280 ----
   				 errmsg("schema \"%s\" does not exist", oldname)));
   
   	/* make sure the new name doesn't exist */
@@ -4761,8 +4761,8 @@ diff -Nrpc base/src/backend/commands/sch
   										0, 0, 0)))
   		ereport(ERROR,
 *************** RenameSchema(const char *oldname, const 
-*** 286,291 ****
---- 291,299 ----
+*** 287,292 ****
+--- 292,300 ----
   		aclcheck_error(aclresult, ACL_KIND_DATABASE,
   					   get_database_name(MyDatabaseId));
   
@@ -4773,8 +4773,8 @@ diff -Nrpc base/src/backend/commands/sch
   		ereport(ERROR,
   				(errcode(ERRCODE_RESERVED_NAME),
 *************** AlterSchemaOwner_internal(HeapTuple tup,
-*** 397,402 ****
---- 405,413 ----
+*** 398,403 ****
+--- 406,414 ----
   			aclcheck_error(aclresult, ACL_KIND_DATABASE,
   						   get_database_name(MyDatabaseId));
   
@@ -4785,8 +4785,8 @@ diff -Nrpc base/src/backend/commands/sch
   		memset(repl_repl, false, sizeof(repl_repl));
   
 *************** AlterSchemaOwner_internal(HeapTuple tup,
-*** 431,433 ****
---- 442,492 ----
+*** 432,434 ****
+--- 443,493 ----
   	}
   
   }
@@ -4921,8 +4921,8 @@ diff -Nrpc base/src/backend/commands/seq
   	seq = read_info(elm, seqrel, &buf);
   
 diff -Nrpc base/src/backend/commands/tablecmds.c sepgsql/src/backend/commands/tablecmds.c
-*** base/src/backend/commands/tablecmds.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/commands/tablecmds.c	Thu Oct  8 09:29:32 2009
+*** base/src/backend/commands/tablecmds.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/commands/tablecmds.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 62,67 ****
 --- 62,68 ----
@@ -4963,8 +4963,8 @@ diff -Nrpc base/src/backend/commands/tab
   	AttrNumber	attnum;
   	static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
 *************** DefineRelation(CreateStmt *stmt, char re
-*** 444,449 ****
---- 446,461 ----
+*** 454,459 ****
+--- 456,471 ----
   	localHasOids = interpretOidsOption(stmt->options);
   	descriptor->tdhasoid = (localHasOids || parentOidCount > 0);
   
@@ -4982,7 +4982,7 @@ diff -Nrpc base/src/backend/commands/tab
   	 * Find columns with default values and prepare for insertion of the
   	 * defaults.  Pre-cooked (that is, inherited) defaults go into a list of
 *************** DefineRelation(CreateStmt *stmt, char re
-*** 513,519 ****
+*** 523,529 ****
   										  parentOidCount,
   										  stmt->oncommit,
   										  reloptions,
@@ -4990,7 +4990,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	StoreCatalogInheritance(relationId, inheritOids);
   
---- 525,532 ----
+--- 535,542 ----
   										  parentOidCount,
   										  stmt->oncommit,
   										  reloptions,
@@ -5000,8 +5000,8 @@ diff -Nrpc base/src/backend/commands/tab
   	StoreCatalogInheritance(relationId, inheritOids);
   
 *************** ExecuteTruncate(TruncateStmt *stmt)
-*** 887,892 ****
---- 900,907 ----
+*** 897,902 ****
+--- 910,917 ----
   				if (!pg_class_ownercheck(seq_relid, GetUserId()))
   					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   								   RelationGetRelationName(seq_rel));
@@ -5011,8 +5011,8 @@ diff -Nrpc base/src/backend/commands/tab
   				seq_relids = lappend_oid(seq_relids, seq_relid);
   
 *************** truncate_check_rel(Relation rel)
-*** 1042,1047 ****
---- 1057,1065 ----
+*** 1052,1057 ****
+--- 1067,1075 ----
   				 errmsg("permission denied: \"%s\" is a system catalog",
   						RelationGetRelationName(rel))));
   
@@ -5023,8 +5023,8 @@ diff -Nrpc base/src/backend/commands/tab
   	 * We can never allow truncation of shared or nailed-in-cache relations,
   	 * because we can't support changing their relfilenode values.
 *************** MergeAttributes(List *schema, List *supe
-*** 1216,1221 ****
---- 1234,1241 ----
+*** 1226,1231 ****
+--- 1244,1251 ----
   		if (!pg_class_ownercheck(RelationGetRelid(relation), GetUserId()))
   			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   						   RelationGetRelationName(relation));
@@ -5034,8 +5034,8 @@ diff -Nrpc base/src/backend/commands/tab
   		/*
   		 * Reject duplications in the list of parents.
 *************** renameatt(Oid myrelid,
-*** 1921,1926 ****
---- 1941,1949 ----
+*** 1931,1936 ****
+--- 1951,1959 ----
   				 errmsg("cannot rename system column \"%s\"",
   						oldattname)));
   
@@ -5046,8 +5046,8 @@ diff -Nrpc base/src/backend/commands/tab
   	 * if the attribute is inherited, forbid the renaming, unless we are
   	 * already inside a recursive rename.
 *************** RenameRelation(Oid myrelid, const char *
-*** 2026,2031 ****
---- 2049,2057 ----
+*** 2036,2041 ****
+--- 2059,2067 ----
   	Oid			namespaceId;
   	char		relkind;
   
@@ -5058,7 +5058,7 @@ diff -Nrpc base/src/backend/commands/tab
   	 * Grab an exclusive lock on the target table, index, sequence or view,
   	 * which we will NOT release until end of transaction.
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2359,2372 ****
+*** 2369,2382 ****
   	switch (cmd->subtype)
   	{
   		case AT_AddColumn:		/* ADD COLUMN */
@@ -5073,7 +5073,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Performs own recursion */
   			ATPrepAddColumn(wqueue, rel, recurse, cmd);
   			pass = AT_PASS_ADD_COL;
---- 2385,2398 ----
+--- 2395,2408 ----
   	switch (cmd->subtype)
   	{
   		case AT_AddColumn:		/* ADD COLUMN */
@@ -5089,7 +5089,7 @@ diff -Nrpc base/src/backend/commands/tab
   			ATPrepAddColumn(wqueue, rel, recurse, cmd);
   			pass = AT_PASS_ADD_COL;
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2379,2397 ****
+*** 2389,2407 ****
   			 * substitutes default values into INSERTs before it expands
   			 * rules.
   			 */
@@ -5109,7 +5109,7 @@ diff -Nrpc base/src/backend/commands/tab
   			ATSimpleRecursion(wqueue, rel, cmd, recurse);
   			/* No command-specific prep needed */
   			pass = AT_PASS_ADD_CONSTR;
---- 2405,2423 ----
+--- 2415,2433 ----
   			 * substitutes default values into INSERTs before it expands
   			 * rules.
   			 */
@@ -5130,7 +5130,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed */
   			pass = AT_PASS_ADD_CONSTR;
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2403,2415 ****
+*** 2413,2425 ****
   			pass = AT_PASS_COL_ATTRS;
   			break;
   		case AT_SetStorage:		/* ALTER COLUMN STORAGE */
@@ -5144,7 +5144,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Recursion occurs during execution phase */
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
---- 2429,2441 ----
+--- 2439,2451 ----
   			pass = AT_PASS_COL_ATTRS;
   			break;
   		case AT_SetStorage:		/* ALTER COLUMN STORAGE */
@@ -5159,7 +5159,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2417,2429 ****
+*** 2427,2439 ****
   			pass = AT_PASS_DROP;
   			break;
   		case AT_AddIndex:		/* ADD INDEX */
@@ -5173,7 +5173,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Recursion occurs during execution phase */
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
---- 2443,2455 ----
+--- 2453,2465 ----
   			pass = AT_PASS_DROP;
   			break;
   		case AT_AddIndex:		/* ADD INDEX */
@@ -5188,7 +5188,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2431,2437 ****
+*** 2441,2447 ****
   			pass = AT_PASS_ADD_CONSTR;
   			break;
   		case AT_DropConstraint:	/* DROP CONSTRAINT */
@@ -5196,7 +5196,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Recursion occurs during execution phase */
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
---- 2457,2463 ----
+--- 2467,2473 ----
   			pass = AT_PASS_ADD_CONSTR;
   			break;
   		case AT_DropConstraint:	/* DROP CONSTRAINT */
@@ -5205,7 +5205,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed except saving recurse flag */
   			if (recurse)
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2439,2445 ****
+*** 2449,2455 ****
   			pass = AT_PASS_DROP;
   			break;
   		case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
@@ -5213,7 +5213,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Performs own recursion */
   			ATPrepAlterColumnType(wqueue, tab, rel, recurse, recursing, cmd);
   			pass = AT_PASS_ALTER_TYPE;
---- 2465,2471 ----
+--- 2475,2481 ----
   			pass = AT_PASS_DROP;
   			break;
   		case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
@@ -5222,7 +5222,7 @@ diff -Nrpc base/src/backend/commands/tab
   			ATPrepAlterColumnType(wqueue, tab, rel, recurse, recursing, cmd);
   			pass = AT_PASS_ALTER_TYPE;
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2451,2470 ****
+*** 2461,2480 ****
   			break;
   		case AT_ClusterOn:		/* CLUSTER ON */
   		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
@@ -5243,7 +5243,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* Performs own recursion */
   			if (rel->rd_rel->relhasoids)
   			{
---- 2477,2496 ----
+--- 2487,2506 ----
   			break;
   		case AT_ClusterOn:		/* CLUSTER ON */
   		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
@@ -5265,7 +5265,7 @@ diff -Nrpc base/src/backend/commands/tab
   			if (rel->rd_rel->relhasoids)
   			{
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2478,2491 ****
+*** 2488,2501 ****
   			pass = AT_PASS_DROP;
   			break;
   		case AT_SetTableSpace:	/* SET TABLESPACE */
@@ -5280,7 +5280,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* This command never recurses */
   			/* No command-specific prep needed */
   			pass = AT_PASS_MISC;
---- 2504,2517 ----
+--- 2514,2527 ----
   			pass = AT_PASS_DROP;
   			break;
   		case AT_SetTableSpace:	/* SET TABLESPACE */
@@ -5296,7 +5296,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed */
   			pass = AT_PASS_MISC;
 *************** ATPrepCmd(List **wqueue, Relation rel, A
-*** 2504,2510 ****
+*** 2514,2520 ****
   		case AT_DisableRule:
   		case AT_AddInherit:		/* INHERIT / NO INHERIT */
   		case AT_DropInherit:
@@ -5304,7 +5304,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* These commands never recurse */
   			/* No command-specific prep needed */
   			pass = AT_PASS_MISC;
---- 2530,2536 ----
+--- 2540,2546 ----
   		case AT_DisableRule:
   		case AT_AddInherit:		/* INHERIT / NO INHERIT */
   		case AT_DropInherit:
@@ -5313,7 +5313,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* No command-specific prep needed */
   			pass = AT_PASS_MISC;
 *************** ATRewriteTables(List **wqueue)
-*** 2850,2857 ****
+*** 2860,2867 ****
   			/*
   			 * The new relation is local to our transaction and we know
   			 * nothing depends on it, so DROP_RESTRICT should be OK.
@@ -5322,7 +5322,7 @@ diff -Nrpc base/src/backend/commands/tab
   			/* performDeletion does CommandCounterIncrement at end */
   
   			/*
---- 2876,2884 ----
+--- 2886,2894 ----
   			/*
   			 * The new relation is local to our transaction and we know
   			 * nothing depends on it, so DROP_RESTRICT should be OK.
@@ -5333,8 +5333,8 @@ diff -Nrpc base/src/backend/commands/tab
   
   			/*
 *************** ATRewriteTable(AlteredTableInfo *tab, Oi
-*** 3076,3086 ****
---- 3103,3116 ----
+*** 3086,3096 ****
+--- 3113,3126 ----
   			if (newrel)
   			{
   				Oid			tupOid = InvalidOid;
@@ -5350,8 +5350,8 @@ diff -Nrpc base/src/backend/commands/tab
   				/* Set dropped attributes to null in new tuple */
   				foreach(lc, dropped_attrs)
 *************** ATRewriteTable(AlteredTableInfo *tab, Oi
-*** 3112,3117 ****
---- 3142,3150 ----
+*** 3122,3127 ****
+--- 3152,3160 ----
   				/* Preserve OID, if any */
   				if (newTupDesc->tdhasoid)
   					HeapTupleSetOid(tuple, tupOid);
@@ -5362,7 +5362,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   			/* Now check any constraints on the possibly-changed tuple */
 *************** ATGetQueueEntry(List **wqueue, Relation 
-*** 3213,3219 ****
+*** 3223,3229 ****
    * - Ensure that it is not a system table
    */
   static void
@@ -5370,7 +5370,7 @@ diff -Nrpc base/src/backend/commands/tab
   {
   	if (rel->rd_rel->relkind != RELKIND_RELATION)
   	{
---- 3246,3252 ----
+--- 3256,3262 ----
    * - Ensure that it is not a system table
    */
   static void
@@ -5379,8 +5379,8 @@ diff -Nrpc base/src/backend/commands/tab
   	if (rel->rd_rel->relkind != RELKIND_RELATION)
   	{
 *************** ATSimplePermissions(Relation rel, bool a
-*** 3237,3242 ****
---- 3270,3281 ----
+*** 3247,3252 ****
+--- 3280,3291 ----
   		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   					   RelationGetRelationName(rel));
   
@@ -5394,7 +5394,7 @@ diff -Nrpc base/src/backend/commands/tab
   		ereport(ERROR,
   				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 *************** ATSimplePermissions(Relation rel, bool a
-*** 3252,3258 ****
+*** 3262,3268 ****
    * - Ensure that it is not a system table
    */
   static void
@@ -5402,7 +5402,7 @@ diff -Nrpc base/src/backend/commands/tab
   {
   	if (rel->rd_rel->relkind != RELKIND_RELATION &&
   		rel->rd_rel->relkind != RELKIND_INDEX)
---- 3291,3297 ----
+--- 3301,3307 ----
    * - Ensure that it is not a system table
    */
   static void
@@ -5411,8 +5411,8 @@ diff -Nrpc base/src/backend/commands/tab
   	if (rel->rd_rel->relkind != RELKIND_RELATION &&
   		rel->rd_rel->relkind != RELKIND_INDEX)
 *************** ATSimplePermissionsRelationOrIndex(Relat
-*** 3266,3271 ****
---- 3305,3316 ----
+*** 3276,3281 ****
+--- 3315,3326 ----
   		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   					   RelationGetRelationName(rel));
   
@@ -5426,8 +5426,8 @@ diff -Nrpc base/src/backend/commands/tab
   		ereport(ERROR,
   				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 *************** ATExecAddColumn(AlteredTableInfo *tab, R
-*** 3509,3514 ****
---- 3554,3560 ----
+*** 3519,3524 ****
+--- 3564,3570 ----
   	HeapTuple	typeTuple;
   	Oid			typeOid;
   	int32		typmod;
@@ -5436,8 +5436,8 @@ diff -Nrpc base/src/backend/commands/tab
   	Expr	   *defval;
   
 *************** ATExecAddColumn(AlteredTableInfo *tab, R
-*** 3546,3551 ****
---- 3592,3600 ----
+*** 3556,3561 ****
+--- 3602,3610 ----
   				 errmsg("child table \"%s\" has a conflicting \"%s\" column",
   						RelationGetRelationName(rel), colDef->colname)));
   
@@ -5448,8 +5448,8 @@ diff -Nrpc base/src/backend/commands/tab
   			childatt->attinhcount++;
   			simple_heap_update(attrdesc, &tuple->t_self, tuple);
 *************** ATExecAddColumn(AlteredTableInfo *tab, R
-*** 3585,3590 ****
---- 3634,3642 ----
+*** 3595,3600 ****
+--- 3644,3652 ----
   				 errmsg("column \"%s\" of relation \"%s\" already exists",
   						colDef->colname, RelationGetRelationName(rel))));
   
@@ -5460,7 +5460,7 @@ diff -Nrpc base/src/backend/commands/tab
   	if (isOid)
   		newattnum = ObjectIdAttributeNumber;
 *************** ATExecAddColumn(AlteredTableInfo *tab, R
-*** 3627,3633 ****
+*** 3637,3643 ****
   
   	ReleaseSysCache(typeTuple);
   
@@ -5468,7 +5468,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	heap_close(attrdesc, RowExclusiveLock);
   
---- 3679,3685 ----
+--- 3689,3695 ----
   
   	ReleaseSysCache(typeTuple);
   
@@ -5477,8 +5477,8 @@ diff -Nrpc base/src/backend/commands/tab
   	heap_close(attrdesc, RowExclusiveLock);
   
 *************** ATPrepSetStatistics(Relation rel, const 
-*** 4016,4021 ****
---- 4068,4075 ----
+*** 4026,4031 ****
+--- 4078,4085 ----
   	if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
   		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
   					   RelationGetRelationName(rel));
@@ -5488,7 +5488,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   static void
 *************** ATExecDropColumn(List **wqueue, Relation
-*** 4171,4177 ****
+*** 4181,4187 ****
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5496,7 +5496,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	/*
   	 * get the number of the attribute
---- 4225,4231 ----
+--- 4235,4241 ----
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5505,7 +5505,7 @@ diff -Nrpc base/src/backend/commands/tab
   	/*
   	 * get the number of the attribute
 *************** ATAddCheckConstraint(List **wqueue, Alte
-*** 4473,4479 ****
+*** 4483,4489 ****
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5513,7 +5513,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	/*
   	 * Call AddRelationNewConstraints to do the work, making sure it works on
---- 4527,4533 ----
+--- 4537,4543 ----
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5522,7 +5522,7 @@ diff -Nrpc base/src/backend/commands/tab
   	/*
   	 * Call AddRelationNewConstraints to do the work, making sure it works on
 *************** checkFkeyPermissions(Relation rel, int16
-*** 5102,5108 ****
+*** 5112,5118 ****
   	aclresult = pg_class_aclcheck(RelationGetRelid(rel), roleid,
   								  ACL_REFERENCES);
   	if (aclresult == ACLCHECK_OK)
@@ -5530,7 +5530,7 @@ diff -Nrpc base/src/backend/commands/tab
   	/* Else we must have REFERENCES on each column */
   	for (i = 0; i < natts; i++)
   	{
---- 5156,5162 ----
+--- 5166,5172 ----
   	aclresult = pg_class_aclcheck(RelationGetRelid(rel), roleid,
   								  ACL_REFERENCES);
   	if (aclresult == ACLCHECK_OK)
@@ -5539,8 +5539,8 @@ diff -Nrpc base/src/backend/commands/tab
   	for (i = 0; i < natts; i++)
   	{
 *************** checkFkeyPermissions(Relation rel, int16
-*** 5112,5117 ****
---- 5166,5174 ----
+*** 5122,5127 ****
+--- 5176,5184 ----
   			aclcheck_error(aclresult, ACL_KIND_CLASS,
   						   RelationGetRelationName(rel));
   	}
@@ -5551,7 +5551,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   /*
 *************** ATExecDropConstraint(Relation rel, const
-*** 5375,5381 ****
+*** 5385,5391 ****
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5559,7 +5559,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
   
---- 5432,5438 ----
+--- 5442,5448 ----
   
   	/* At top level, permission check was done in ATPrepCmd, else do it */
   	if (recursing)
@@ -5568,8 +5568,8 @@ diff -Nrpc base/src/backend/commands/tab
   	conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
   
 *************** ATExecChangeOwner(Oid relationOid, Oid n
-*** 6308,6313 ****
---- 6365,6372 ----
+*** 6318,6323 ****
+--- 6375,6382 ----
   					aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
   								   get_namespace_name(namespaceOid));
   			}
@@ -5579,7 +5579,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   		memset(repl_null, false, sizeof(repl_null));
 *************** ATExecAddInherit(Relation child_rel, Ran
-*** 6912,6918 ****
+*** 6922,6928 ****
   	 * Must be owner of both parent and child -- child was checked by
   	 * ATSimplePermissions call in ATPrepCmd
   	 */
@@ -5587,7 +5587,7 @@ diff -Nrpc base/src/backend/commands/tab
   
   	/* Permanent rels cannot inherit from temporary ones */
   	if (parent_rel->rd_istemp && !child_rel->rd_istemp)
---- 6971,6977 ----
+--- 6981,6987 ----
   	 * Must be owner of both parent and child -- child was checked by
   	 * ATSimplePermissions call in ATPrepCmd
   	 */
@@ -5596,8 +5596,8 @@ diff -Nrpc base/src/backend/commands/tab
   	/* Permanent rels cannot inherit from temporary ones */
   	if (parent_rel->rd_istemp && !child_rel->rd_istemp)
 *************** AlterTableNamespace(RangeVar *relation, 
-*** 7570,7575 ****
---- 7629,7637 ----
+*** 7580,7585 ****
+--- 7639,7647 ----
   						RelationGetRelationName(rel),
   						newschema)));
   
@@ -5608,8 +5608,8 @@ diff -Nrpc base/src/backend/commands/tab
   	if (isAnyTempNamespace(nspOid) || isAnyTempNamespace(oldNspOid))
   		ereport(ERROR,
 *************** AlterSeqNamespaces(Relation classRel, Re
-*** 7762,7767 ****
---- 7824,7957 ----
+*** 7772,7777 ****
+--- 7834,7967 ----
   	relation_close(depRel, AccessShareLock);
   }
   
@@ -5745,8 +5745,8 @@ diff -Nrpc base/src/backend/commands/tab
   /*
    * This code supports
 diff -Nrpc base/src/backend/commands/trigger.c sepgsql/src/backend/commands/trigger.c
-*** base/src/backend/commands/trigger.c	Fri Jun 19 13:40:37 2009
---- sepgsql/src/backend/commands/trigger.c	Thu Sep 17 22:10:19 2009
+*** base/src/backend/commands/trigger.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/commands/trigger.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 33,38 ****
 --- 33,39 ----
@@ -6187,8 +6187,8 @@ diff -Nrpc base/src/backend/executor/exe
   	/*
   	 * Use the given slot, or make a new slot if we weren't given one.
 diff -Nrpc base/src/backend/executor/execMain.c sepgsql/src/backend/executor/execMain.c
-*** base/src/backend/executor/execMain.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/executor/execMain.c	Thu Oct  8 09:29:32 2009
+*** base/src/backend/executor/execMain.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/executor/execMain.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 39,44 ****
 --- 39,45 ----
@@ -6487,8 +6487,8 @@ diff -Nrpc base/src/backend/executor/exe
   	Oid			intoRelationId;
   	TupleDesc	tupdesc;
 *************** OpenIntoRel(QueryDesc *queryDesc)
-*** 2871,2876 ****
---- 2982,2995 ----
+*** 2886,2891 ****
+--- 2997,3010 ----
   		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
   					   get_namespace_name(namespaceId));
   
@@ -6504,7 +6504,7 @@ diff -Nrpc base/src/backend/executor/exe
   	 * Select tablespace to use.  If not specified, use default tablespace
   	 * (which may in turn default to database's default).
 *************** OpenIntoRel(QueryDesc *queryDesc)
-*** 2929,2935 ****
+*** 2944,2950 ****
   											  0,
   											  into->onCommit,
   											  reloptions,
@@ -6512,7 +6512,7 @@ diff -Nrpc base/src/backend/executor/exe
   
   	FreeTupleDesc(tupdesc);
   
---- 3048,3055 ----
+--- 3063,3070 ----
   											  0,
   											  into->onCommit,
   											  reloptions,
@@ -6522,8 +6522,8 @@ diff -Nrpc base/src/backend/executor/exe
   	FreeTupleDesc(tupdesc);
   
 *************** intorel_receive(TupleTableSlot *slot, De
-*** 3054,3059 ****
---- 3174,3183 ----
+*** 3069,3074 ****
+--- 3189,3198 ----
   	if (myState->rel->rd_rel->relhasoids)
   		HeapTupleSetOid(tuple, InvalidOid);
   
@@ -7003,8 +7003,8 @@ diff -Nrpc base/src/backend/executor/nod
   	}
   
 diff -Nrpc base/src/backend/executor/spi.c sepgsql/src/backend/executor/spi.c
-*** base/src/backend/executor/spi.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/executor/spi.c	Tue Sep  8 23:55:48 2009
+*** base/src/backend/executor/spi.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/executor/spi.c	Tue Dec 15 17:30:25 2009
 *************** SPI_modifytuple(Relation rel, HeapTuple 
 *** 705,710 ****
 --- 705,712 ----
@@ -7160,8 +7160,8 @@ diff -Nrpc base/src/backend/libpq/be-fss
    *		 prepares large objects for transaction commit
    */
 diff -Nrpc base/src/backend/nodes/copyfuncs.c sepgsql/src/backend/nodes/copyfuncs.c
-*** base/src/backend/nodes/copyfuncs.c	Fri Jun 19 13:40:37 2009
---- sepgsql/src/backend/nodes/copyfuncs.c	Wed Jul 15 19:39:56 2009
+*** base/src/backend/nodes/copyfuncs.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/nodes/copyfuncs.c	Tue Dec 15 17:30:25 2009
 *************** CopyScanFields(Scan *from, Scan *newnode
 *** 259,264 ****
 --- 259,265 ----
@@ -7176,7 +7176,7 @@ diff -Nrpc base/src/backend/nodes/copyfu
 *** 2075,2080 ****
 --- 2076,2082 ----
   	COPY_NODE_FIELD(raw_default);
-  	COPY_STRING_FIELD(cooked_default);
+  	COPY_NODE_FIELD(cooked_default);
   	COPY_NODE_FIELD(constraints);
 + 	COPY_NODE_FIELD(secLabel);
   
@@ -7239,8 +7239,8 @@ diff -Nrpc base/src/backend/nodes/copyfu
   			retval = _copyRuleStmt(from);
   			break;
 diff -Nrpc base/src/backend/nodes/equalfuncs.c sepgsql/src/backend/nodes/equalfuncs.c
-*** base/src/backend/nodes/equalfuncs.c	Fri Jun 19 13:40:37 2009
---- sepgsql/src/backend/nodes/equalfuncs.c	Wed Jul 15 19:37:35 2009
+*** base/src/backend/nodes/equalfuncs.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/nodes/equalfuncs.c	Tue Dec 15 17:30:25 2009
 *************** _equalCreateStmt(CreateStmt *a, CreateSt
 *** 1078,1083 ****
 --- 1078,1084 ----
@@ -7287,7 +7287,7 @@ diff -Nrpc base/src/backend/nodes/equalf
 *** 2054,2059 ****
 --- 2069,2075 ----
   	COMPARE_NODE_FIELD(raw_default);
-  	COMPARE_STRING_FIELD(cooked_default);
+  	COMPARE_NODE_FIELD(cooked_default);
   	COMPARE_NODE_FIELD(constraints);
 + 	COMPARE_NODE_FIELD(secLabel);
   
@@ -7306,8 +7306,8 @@ diff -Nrpc base/src/backend/nodes/equalf
   			retval = _equalRuleStmt(a, b);
   			break;
 diff -Nrpc base/src/backend/nodes/outfuncs.c sepgsql/src/backend/nodes/outfuncs.c
-*** base/src/backend/nodes/outfuncs.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/nodes/outfuncs.c	Wed Jul 15 19:39:56 2009
+*** base/src/backend/nodes/outfuncs.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/nodes/outfuncs.c	Tue Dec 15 17:30:25 2009
 *************** _outScanInfo(StringInfo str, Scan *node)
 *** 285,290 ****
 --- 285,291 ----
@@ -7342,7 +7342,7 @@ diff -Nrpc base/src/backend/nodes/outfun
 *** 1839,1844 ****
 --- 1842,1848 ----
   	WRITE_NODE_FIELD(raw_default);
-  	WRITE_STRING_FIELD(cooked_default);
+  	WRITE_NODE_FIELD(cooked_default);
   	WRITE_NODE_FIELD(constraints);
 + 	WRITE_NODE_FIELD(secLabel);
   }
@@ -7420,8 +7420,8 @@ diff -Nrpc base/src/backend/optimizer/ut
   	/* Check type of rtable entry */
   	switch (rte->rtekind)
 diff -Nrpc base/src/backend/parser/analyze.c sepgsql/src/backend/parser/analyze.c
-*** base/src/backend/parser/analyze.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/parser/analyze.c	Sun Sep  6 19:53:10 2009
+*** base/src/backend/parser/analyze.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/parser/analyze.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 25,30 ****
 --- 25,31 ----
@@ -7433,7 +7433,7 @@ diff -Nrpc base/src/backend/parser/analy
   #include "nodes/makefuncs.h"
   #include "nodes/nodeFuncs.h"
 *************** transformInsertStmt(ParseState *pstate, 
-*** 653,659 ****
+*** 660,666 ****
   		tle = makeTargetEntry(expr,
   							  attr_num,
   							  col->name,
@@ -7441,7 +7441,7 @@ diff -Nrpc base/src/backend/parser/analy
   		qry->targetList = lappend(qry->targetList, tle);
   
   		rte->modifiedCols = bms_add_member(rte->modifiedCols,
---- 654,660 ----
+--- 661,667 ----
   		tle = makeTargetEntry(expr,
   							  attr_num,
   							  col->name,
@@ -7450,8 +7450,8 @@ diff -Nrpc base/src/backend/parser/analy
   
   		rte->modifiedCols = bms_add_member(rte->modifiedCols,
 *************** transformInsertRow(ParseState *pstate, L
-*** 768,773 ****
---- 769,816 ----
+*** 775,780 ****
+--- 776,823 ----
   	return result;
   }
   
@@ -7501,8 +7501,8 @@ diff -Nrpc base/src/backend/parser/analy
   /*
    * transformSelectStmt -
 *************** transformSelectStmt(ParseState *pstate, 
-*** 872,877 ****
---- 915,921 ----
+*** 879,884 ****
+--- 922,928 ----
   	if (stmt->intoClause)
   	{
   		qry->intoClause = stmt->intoClause;
@@ -7971,8 +7971,8 @@ diff -Nrpc base/src/backend/parser/parse
   			/*
   			 * Check for duplicates, but only of whole columns --- we allow
 diff -Nrpc base/src/backend/parser/parse_utilcmd.c sepgsql/src/backend/parser/parse_utilcmd.c
-*** base/src/backend/parser/parse_utilcmd.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/parser/parse_utilcmd.c	Fri Sep 18 14:51:00 2009
+*** base/src/backend/parser/parse_utilcmd.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/parser/parse_utilcmd.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 49,54 ****
 --- 49,55 ----
@@ -8015,8 +8015,8 @@ diff -Nrpc base/src/backend/postmaster/a
   				else
   				{
 diff -Nrpc base/src/backend/postmaster/postmaster.c sepgsql/src/backend/postmaster/postmaster.c
-*** base/src/backend/postmaster/postmaster.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/postmaster/postmaster.c	Tue Dec  8 14:04:25 2009
+*** base/src/backend/postmaster/postmaster.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/postmaster/postmaster.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 108,113 ****
 --- 108,114 ----
@@ -8070,8 +8070,8 @@ diff -Nrpc base/src/backend/postmaster/p
   		if (avlauncher_needs_signal)
   		{
 *************** SIGHUP_handler(SIGNAL_ARGS)
-*** 2053,2058 ****
---- 2061,2068 ----
+*** 2055,2060 ****
+--- 2063,2070 ----
   			signal_child(SysLoggerPID, SIGHUP);
   		if (PgStatPID != 0)
   			signal_child(PgStatPID, SIGHUP);
@@ -8081,8 +8081,8 @@ diff -Nrpc base/src/backend/postmaster/p
   		/* Reload authentication config files too */
   		if (!load_hba())
 *************** pmdie(SIGNAL_ARGS)
-*** 2113,2118 ****
---- 2123,2131 ----
+*** 2115,2120 ****
+--- 2125,2133 ----
   				/* and the walwriter too */
   				if (WalWriterPID != 0)
   					signal_child(WalWriterPID, SIGTERM);
@@ -8093,8 +8093,8 @@ diff -Nrpc base/src/backend/postmaster/p
   			}
   
 *************** pmdie(SIGNAL_ARGS)
-*** 2160,2165 ****
---- 2173,2181 ----
+*** 2162,2167 ****
+--- 2175,2183 ----
   				/* and the walwriter too */
   				if (WalWriterPID != 0)
   					signal_child(WalWriterPID, SIGTERM);
@@ -8105,8 +8105,8 @@ diff -Nrpc base/src/backend/postmaster/p
   			}
   
 *************** pmdie(SIGNAL_ARGS)
-*** 2193,2198 ****
---- 2209,2216 ----
+*** 2195,2200 ****
+--- 2211,2218 ----
   				signal_child(PgArchPID, SIGQUIT);
   			if (PgStatPID != 0)
   				signal_child(PgStatPID, SIGQUIT);
@@ -8116,8 +8116,8 @@ diff -Nrpc base/src/backend/postmaster/p
   			break;
   	}
 *************** reaper(SIGNAL_ARGS)
-*** 2455,2460 ****
---- 2473,2488 ----
+*** 2457,2462 ****
+--- 2475,2490 ----
   			continue;
   		}
   
@@ -8135,8 +8135,8 @@ diff -Nrpc base/src/backend/postmaster/p
   		 * Else do standard backend child cleanup.
   		 */
 *************** HandleChildCrash(int pid, int exitstatus
-*** 2646,2651 ****
---- 2674,2691 ----
+*** 2648,2653 ****
+--- 2676,2693 ----
   		signal_child(AutoVacPID, (SendStop ? SIGSTOP : SIGQUIT));
   	}
   
@@ -8156,7 +8156,7 @@ diff -Nrpc base/src/backend/postmaster/p
   	 * Force a power-cycle of the pgarch process too.  (This isn't absolutely
   	 * necessary, but it seems like a good idea for robustness, and it
 *************** PostmasterStateMachine(void)
-*** 2778,2784 ****
+*** 2780,2786 ****
   			StartupPID == 0 &&
   			(BgWriterPID == 0 || !FatalError) &&
   			WalWriterPID == 0 &&
@@ -8164,7 +8164,7 @@ diff -Nrpc base/src/backend/postmaster/p
   		{
   			if (FatalError)
   			{
---- 2818,2825 ----
+--- 2820,2827 ----
   			StartupPID == 0 &&
   			(BgWriterPID == 0 || !FatalError) &&
   			WalWriterPID == 0 &&
@@ -8174,8 +8174,8 @@ diff -Nrpc base/src/backend/postmaster/p
   			if (FatalError)
   			{
 *************** StartChildProcess(AuxProcType type)
-*** 4321,4326 ****
---- 4362,4373 ----
+*** 4323,4328 ****
+--- 4364,4375 ----
   				ereport(LOG,
   						(errmsg("could not fork WAL writer process: %m")));
   				break;
@@ -8408,10 +8408,10 @@ diff -Nrpc base/src/backend/security/sep
 + include $(top_srcdir)/src/backend/common.mk
 diff -Nrpc base/src/backend/security/sepgsql/avc.c sepgsql/src/backend/security/sepgsql/avc.c
 *** base/src/backend/security/sepgsql/avc.c	Thu Jan  1 09:00:00 1970
---- sepgsql/src/backend/security/sepgsql/avc.c	Tue Dec  8 14:16:15 2009
+--- sepgsql/src/backend/security/sepgsql/avc.c	Thu Dec 10 10:36:18 2009
 ***************
 *** 0 ****
---- 1,880 ----
+--- 1,881 ----
 + /*
 +  * src/backend/security/sepgsql/avc.c
 +  *	  SE-PostgreSQL userspace access vector cache
@@ -8454,7 +8454,7 @@ diff -Nrpc base/src/backend/security/sep
 +  * postmaster can receives the notification messages from the kernel
 +  * space, and invalidate the current version of avc.
 +  */
-+ static MemoryContext AvcMemCtx;
++ static MemoryContext AvcMemCtx = NULL;
 + 
 + #define AVC_HASH_NUM_SLOTS		256
 + #define AVC_HASH_NUM_NODES		180
@@ -8554,11 +8554,12 @@ diff -Nrpc base/src/backend/security/sep
 +  * It invalidate access vector cache. It has to be called on errors,
 +  * because avc entries for newly created context is uncertain whether
 +  * it is still valid, or not.
++  * If error happens before avc initialization, we simply skip it.
 +  */
 + void
 + sepgsqlAvcReset(void)
 + {
-+ 	if (!sepgsqlIsEnabled())
++ 	if (!sepgsqlIsEnabled() || !AvcMemCtx)
 + 		return;
 + 
 + 	MemoryContextReset(AvcMemCtx);
@@ -15175,11 +15176,11 @@ diff -Nrpc base/src/backend/security/sep
 + 	allow sepgsql_database_type     user_home_t : db_database { load_module };
 + ')
 diff -Nrpc base/src/backend/storage/file/fd.c sepgsql/src/backend/storage/file/fd.c
-*** base/src/backend/storage/file/fd.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/storage/file/fd.c	Wed Jul 15 19:48:58 2009
+*** base/src/backend/storage/file/fd.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/storage/file/fd.c	Tue Dec 15 17:30:25 2009
 *************** FileTruncate(File file, off_t offset)
-*** 1319,1324 ****
---- 1319,1331 ----
+*** 1329,1334 ****
+--- 1329,1341 ----
   	return returnCode;
   }
   
@@ -15496,8 +15497,8 @@ diff -Nrpc base/src/backend/tcop/pquery.
   
   				/*
 diff -Nrpc base/src/backend/tcop/utility.c sepgsql/src/backend/tcop/utility.c
-*** base/src/backend/tcop/utility.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/tcop/utility.c	Wed Jul 15 21:17:18 2009
+*** base/src/backend/tcop/utility.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/tcop/utility.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 50,55 ****
 --- 50,56 ----
@@ -15519,8 +15520,8 @@ diff -Nrpc base/src/backend/tcop/utility
   		case T_AlterTableStmt:
   		case T_RenameStmt:
 *************** ProcessUtility(Node *parsetree,
-*** 612,617 ****
---- 614,623 ----
+*** 634,639 ****
+--- 636,645 ----
   			ExecAlterOwnerStmt((AlterOwnerStmt *) parsetree);
   			break;
   
@@ -15532,8 +15533,8 @@ diff -Nrpc base/src/backend/tcop/utility
   			{
   				List	   *stmts;
 *************** ProcessUtility(Node *parsetree,
-*** 893,898 ****
---- 899,905 ----
+*** 917,922 ****
+--- 923,929 ----
   				LoadStmt   *stmt = (LoadStmt *) parsetree;
   
   				closeAllVfds(); /* probably not necessary... */
@@ -15542,8 +15543,8 @@ diff -Nrpc base/src/backend/tcop/utility
   				load_file(stmt->filename, !superuser());
   			}
 *************** CreateCommandTag(Node *parsetree)
-*** 1635,1640 ****
---- 1642,1672 ----
+*** 1661,1666 ****
+--- 1668,1698 ----
   			}
   			break;
   
@@ -15576,8 +15577,8 @@ diff -Nrpc base/src/backend/tcop/utility
   			switch (((AlterTableStmt *) parsetree)->relkind)
   			{
 *************** GetCommandLogLevel(Node *parsetree)
-*** 2213,2218 ****
---- 2245,2254 ----
+*** 2239,2244 ****
+--- 2271,2280 ----
   			lev = LOGSTMT_DDL;
   			break;
   
@@ -15625,8 +15626,8 @@ diff -Nrpc base/src/backend/utils/adt/ge
   	if (stat(filename, &fst) < 0)
   		ereport(ERROR,
 diff -Nrpc base/src/backend/utils/adt/ri_triggers.c sepgsql/src/backend/utils/adt/ri_triggers.c
-*** base/src/backend/utils/adt/ri_triggers.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/utils/adt/ri_triggers.c	Wed Jul 15 19:39:56 2009
+*** base/src/backend/utils/adt/ri_triggers.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/utils/adt/ri_triggers.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 39,44 ****
 --- 39,45 ----
@@ -15674,20 +15675,20 @@ diff -Nrpc base/src/backend/utils/adt/ri
   	if (spi_result != SPI_OK_SELECT)
   		elog(ERROR, "SPI_execute_snapshot returned %d", spi_result);
 *************** ri_PerformCheck(RI_QueryKey *qkey, SPIPl
-*** 3264,3269 ****
---- 3274,3280 ----
+*** 3265,3270 ****
+--- 3275,3281 ----
   	int			spi_result;
   	Oid			save_userid;
-  	bool		save_secdefcxt;
+  	int			save_sec_context;
 + 	int			save_rowlv, temp_rowlv;
   	Datum		vals[RI_MAX_NUMKEYS * 2];
   	char		nulls[RI_MAX_NUMKEYS * 2];
   
 *************** ri_PerformCheck(RI_QueryKey *qkey, SPIPl
-*** 3346,3357 ****
---- 3357,3375 ----
-  	GetUserIdAndContext(&save_userid, &save_secdefcxt);
-  	SetUserIdAndContext(RelationGetForm(query_rel)->relowner, true);
+*** 3348,3359 ****
+--- 3359,3377 ----
+  	SetUserIdAndSecContext(RelationGetForm(query_rel)->relowner,
+  						   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
   
 + 	/* Switch Row-level stuff behavior on FK checks, if necessary */
 + 	temp_rowlv = (detectNewRows ? ROWLV_ABORT_MODE : ROWLV_FILTER_MODE);
@@ -15702,8 +15703,8 @@ diff -Nrpc base/src/backend/utils/adt/ri
 + 	/* Restore Row-level stuff behavior */
 + 	rowlvSetPerformingMode(save_rowlv);
 + 
-  	/* Restore UID */
-  	SetUserIdAndContext(save_userid, save_secdefcxt);
+  	/* Restore UID and security context */
+  	SetUserIdAndSecContext(save_userid, save_sec_context);
   
 diff -Nrpc base/src/backend/utils/adt/tid.c sepgsql/src/backend/utils/adt/tid.c
 *** base/src/backend/utils/adt/tid.c	Sat Jan  3 13:01:35 2009
@@ -15807,8 +15808,8 @@ diff -Nrpc base/src/backend/utils/cache/
   			/* other cases shouldn't happen, but return NULL */
   			break;
 diff -Nrpc base/src/backend/utils/cache/relcache.c sepgsql/src/backend/utils/cache/relcache.c
-*** base/src/backend/utils/cache/relcache.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/utils/cache/relcache.c	Wed Sep  9 13:14:37 2009
+*** base/src/backend/utils/cache/relcache.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/utils/cache/relcache.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 47,52 ****
 --- 47,53 ----
@@ -15833,8 +15834,8 @@ diff -Nrpc base/src/backend/utils/cache/
   	 * initialize the relation lock manager information
   	 */
 *************** formrdesc(const char *relationName, Oid 
-*** 1458,1463 ****
---- 1463,1473 ----
+*** 1460,1465 ****
+--- 1465,1475 ----
   	RelationGetRelid(relation) = relation->rd_att->attrs[0]->attrelid;
   	relation->rd_rel->relfilenode = RelationGetRelid(relation);
   
@@ -15847,8 +15848,8 @@ diff -Nrpc base/src/backend/utils/cache/
   	 * initialize the relation lock manager information
   	 */
 *************** BuildHardcodedDescriptor(int natts, Form
-*** 2699,2704 ****
---- 2709,2721 ----
+*** 2749,2754 ****
+--- 2759,2771 ----
   	result = CreateTemplateTupleDesc(natts, hasoids);
   	result->tdtypeid = RECORDOID;		/* not right, but we don't care */
   	result->tdtypmod = -1;
@@ -15863,8 +15864,8 @@ diff -Nrpc base/src/backend/utils/cache/
   	for (i = 0; i < natts; i++)
   	{
 *************** load_relcache_init_file(void)
-*** 3453,3458 ****
---- 3470,3480 ----
+*** 3503,3508 ****
+--- 3520,3530 ----
   			rel->rd_options = NULL;
   		}
   
@@ -15970,8 +15971,8 @@ diff -Nrpc base/src/backend/utils/fmgr/d
   	internal_unload_library(fullname);
   
 diff -Nrpc base/src/backend/utils/fmgr/fmgr.c sepgsql/src/backend/utils/fmgr/fmgr.c
-*** base/src/backend/utils/fmgr/fmgr.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/utils/fmgr/fmgr.c	Thu Sep 17 17:04:16 2009
+*** base/src/backend/utils/fmgr/fmgr.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/utils/fmgr/fmgr.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 24,29 ****
 --- 24,30 ----
@@ -16047,8 +16048,8 @@ diff -Nrpc base/src/backend/utils/init/p
   	 * Figure out our postgres user id, and see if we are a superuser.
   	 *
 diff -Nrpc base/src/backend/utils/misc/guc.c sepgsql/src/backend/utils/misc/guc.c
-*** base/src/backend/utils/misc/guc.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/utils/misc/guc.c	Sun Sep  6 19:53:10 2009
+*** base/src/backend/utils/misc/guc.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/backend/utils/misc/guc.c	Tue Dec 15 17:30:25 2009
 ***************
 *** 56,61 ****
 --- 56,62 ----
@@ -16178,8 +16179,8 @@ diff -Nrpc base/src/backend/utils/misc/s
   }
   
 diff -Nrpc base/src/bin/initdb/initdb.c sepgsql/src/bin/initdb/initdb.c
-*** base/src/bin/initdb/initdb.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/bin/initdb/initdb.c	Wed Jul 15 19:35:52 2009
+*** base/src/bin/initdb/initdb.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/bin/initdb/initdb.c	Tue Dec 15 17:30:25 2009
 *************** static bool debug = false;
 *** 87,92 ****
 --- 87,93 ----
@@ -16239,8 +16240,8 @@ diff -Nrpc base/src/bin/initdb/initdb.c 
   				show_setting = true;
   				break;
 diff -Nrpc base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
-*** base/src/bin/pg_dump/pg_dump.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/bin/pg_dump/pg_dump.c	Tue Sep  8 17:13:41 2009
+*** base/src/bin/pg_dump/pg_dump.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/bin/pg_dump/pg_dump.c	Tue Dec 15 17:30:25 2009
 *************** static int	disable_dollar_quoting = 0;
 *** 112,117 ****
 --- 112,119 ----
@@ -16967,8 +16968,8 @@ diff -Nrpc base/src/bin/pg_dump/pg_dump.
   
   		/*
 *************** fmtCopyColumnList(const TableInfo *ti)
-*** 11508,11513 ****
---- 11595,11607 ----
+*** 11510,11515 ****
+--- 11597,11609 ----
   
   	appendPQExpBuffer(q, "(");
   	needComma = false;
@@ -17914,21 +17915,21 @@ diff -Nrpc base/src/include/nodes/nodes.
   	/*
   	 * TAGS FOR PARSE TREE NODES (parsenodes.h)
 diff -Nrpc base/src/include/nodes/parsenodes.h sepgsql/src/include/nodes/parsenodes.h
-*** base/src/include/nodes/parsenodes.h	Fri Jun 19 13:40:37 2009
---- sepgsql/src/include/nodes/parsenodes.h	Wed Jul 15 19:37:35 2009
+*** base/src/include/nodes/parsenodes.h	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/include/nodes/parsenodes.h	Tue Dec 15 17:30:25 2009
 *************** typedef struct ColumnDef
-*** 464,469 ****
---- 464,470 ----
+*** 463,468 ****
+--- 463,469 ----
   	Node	   *raw_default;	/* default value (untransformed parse tree) */
-  	char	   *cooked_default; /* nodeToString representation */
+  	Node	   *cooked_default; /* default value (transformed expr tree) */
   	List	   *constraints;	/* other constraints on column */
 + 	Node	   *secLabel;		/* security label of column */
   } ColumnDef;
   
   /*
 *************** typedef struct CreateSchemaStmt
-*** 1070,1075 ****
---- 1071,1077 ----
+*** 1069,1074 ****
+--- 1070,1076 ----
   	NodeTag		type;
   	char	   *schemaname;		/* the name of the schema to create */
   	char	   *authid;			/* the owner of the created schema */
@@ -17937,8 +17938,8 @@ diff -Nrpc base/src/include/nodes/parsen
   } CreateSchemaStmt;
   
 *************** typedef struct CreateStmt
-*** 1335,1340 ****
---- 1337,1343 ----
+*** 1334,1339 ****
+--- 1336,1342 ----
   	List	   *options;		/* options from WITH clause */
   	OnCommitAction oncommit;	/* what do we do at COMMIT? */
   	char	   *tablespacename; /* table space to use, or NULL */
@@ -17947,8 +17948,8 @@ diff -Nrpc base/src/include/nodes/parsen
   
   /* ----------
 *************** typedef struct CreateSeqStmt
-*** 1639,1644 ****
---- 1642,1648 ----
+*** 1638,1643 ****
+--- 1641,1647 ----
   	NodeTag		type;
   	RangeVar   *sequence;		/* the sequence to create */
   	List	   *options;
@@ -17957,8 +17958,8 @@ diff -Nrpc base/src/include/nodes/parsen
   
   typedef struct AlterSeqStmt
 *************** typedef struct AlterOwnerStmt
-*** 1993,1998 ****
---- 1997,2016 ----
+*** 1992,1997 ****
+--- 1996,2015 ----
   	char	   *newowner;		/* the new owner */
   } AlterOwnerStmt;
   
@@ -19046,8 +19047,8 @@ diff -Nrpc base/src/test/regress/expecte
   --
   -- another sanity check: every system catalog that has OIDs should have
 diff -Nrpc base/src/test/regress/pg_regress.c sepgsql/src/test/regress/pg_regress.c
-*** base/src/test/regress/pg_regress.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/test/regress/pg_regress.c	Tue Dec  1 17:11:40 2009
+*** base/src/test/regress/pg_regress.c	Tue Dec 15 17:16:51 2009
+--- sepgsql/src/test/regress/pg_regress.c	Tue Dec 15 17:30:25 2009
 *************** static _stringlist *schedulelist = NULL;
 *** 82,87 ****
 --- 82,88 ----


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sepostgresql.spec	8 Dec 2009 06:00:14 -0000	1.43
+++ sepostgresql.spec	16 Dec 2009 13:54:47 -0000	1.44
@@ -11,8 +11,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.4.1
-Release: 2464%{?dist}
+Version: 8.4.2
+Release: 2487%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -192,6 +192,9 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Wed Dec 16 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.2-2487
+- upgrade base version 8.4.1->8.4.2
+
 * Fri Dec 8 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2464
 - rework: backport features from v8.5devel tree
 - fixbug: selinux netlink receiver process didn't have correct ps display


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Sep 2009 10:40:20 -0000	1.13
+++ sources	16 Dec 2009 13:54:47 -0000	1.14
@@ -1 +1 @@
-f2015af17bacbbfe140daf0d1067f9c9  postgresql-8.4.1.tar.bz2
+d738227e2f1f742d2f2d4ab56496c5c6  postgresql-8.4.2.tar.bz2



From tbzatek at fedoraproject.org  Wed Dec 16 14:02:00 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 16 Dec 2009 14:02:00 +0000 (UTC)
Subject: File gnome-keyring-2.28.2.tar.bz2 uploaded to lookaside cache by
	tbzatek
Message-ID: <20091216140200.B8F9A28ED3B@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gnome-keyring:

97ea6823e88b39284187764c1ca95a59  gnome-keyring-2.28.2.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 14:04:41 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 14:04:41 +0000 (UTC)
Subject: rpms/xulrunner/F-12 mozilla-libnotify.patch,1.3,1.4
Message-ID: <20091216140441.D960811C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16725

Modified Files:
	mozilla-libnotify.patch 
Log Message:
Fixed libnotify patch

mozilla-libnotify.patch:
 config/autoconf.mk.in                             |    4 
 config/system-headers                             |    1 
 configure.in                                      |   34 ++
 js/src/config/system-headers                      |    1 
 toolkit/components/alerts/src/Makefile.in         |    2 
 toolkit/components/alerts/src/nsAlertsService.cpp |   12 
 toolkit/components/build/nsToolkitCompsCID.h      |   11 
 toolkit/system/gnome/Makefile.in                  |   18 +
 toolkit/system/gnome/nsAlertsIconListener.cpp     |  326 ++++++++++++++++++++++
 toolkit/system/gnome/nsAlertsIconListener.h       |   85 +++++
 toolkit/system/gnome/nsAlertsService.cpp          |   73 ++++
 toolkit/system/gnome/nsAlertsService.h            |   59 +++
 toolkit/system/gnome/nsGnomeModule.cpp            |   17 +
 13 files changed, 641 insertions(+), 2 deletions(-)

Index: mozilla-libnotify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/mozilla-libnotify.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mozilla-libnotify.patch	27 Oct 2009 08:42:30 -0000	1.3
+++ mozilla-libnotify.patch	16 Dec 2009 14:04:41 -0000	1.4
@@ -29,7 +29,7 @@ diff -up mozilla-1.9.1/configure.in.libn
 @@ -132,6 +132,7 @@ LIBGNOME_VERSION=2.0
  STARTUP_NOTIFICATION_VERSION=0.8
  DBUS_VERSION=0.60
- SQLITE_VERSION=3.6.16
+ SQLITE_VERSION=3.6.16.1
 +LIBNOTIFY_VERSION=0.4
  
  MSMANIFEST_TOOL=



From pkgdb at fedoraproject.org  Wed Dec 16 14:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 14:04:57 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091216140458.8154B28ED3E@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora devel is now owned by mkasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Wed Dec 16 14:05:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 14:05:16 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091216140517.67DF528ED3E@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora 11 is now owned by mkasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Wed Dec 16 14:05:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 14:05:30 +0000
Subject: [pkgdb] poppler ownership updated
Message-ID: <20091216140531.CF5B728ED4F@bastion3.fedora.phx2.redhat.com>

Package poppler in Fedora 12 is now owned by mkasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poppler



From tbzatek at fedoraproject.org  Wed Dec 16 14:05:44 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 16 Dec 2009 14:05:44 +0000 (UTC)
Subject: rpms/gnome-keyring/F-12 .cvsignore, 1.67, 1.68 gnome-keyring.spec, 
	1.135, 1.136 sources, 1.67, 1.68
Message-ID: <20091216140544.8895811C0092@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-keyring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17062

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
* Wed Dec 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-1
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/F-12/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	19 Oct 2009 09:38:54 -0000	1.67
+++ .cvsignore	16 Dec 2009 14:05:44 -0000	1.68
@@ -1 +1 @@
-gnome-keyring-2.28.1.tar.bz2
+gnome-keyring-2.28.2.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/F-12/gnome-keyring.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- gnome-keyring.spec	19 Oct 2009 16:14:11 -0000	1.135
+++ gnome-keyring.spec	16 Dec 2009 14:05:44 -0000	1.136
@@ -7,8 +7,8 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.28.1
-Release: 2%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
@@ -151,6 +151,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+
 * Mon Oct 19 2009 Ray Strode <rstrode at redhat.com> 2.28.1-2
 - Don't start keyring daemon if pam password is empty
   Patch from Dan Walsh. (bug 529709)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/F-12/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	19 Oct 2009 09:38:54 -0000	1.67
+++ sources	16 Dec 2009 14:05:44 -0000	1.68
@@ -1 +1 @@
-1139f46c99a1b0c01009ed2eae3f4a0a  gnome-keyring-2.28.1.tar.bz2
+97ea6823e88b39284187764c1ca95a59  gnome-keyring-2.28.2.tar.bz2



From npajkovs at fedoraproject.org  Wed Dec 16 14:32:25 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Wed, 16 Dec 2009 14:32:25 +0000 (UTC)
Subject: rpms/inn/devel inn.spec,1.72,1.73
Message-ID: <20091216143225.E3CBB11C0092@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21963

Modified Files:
	inn.spec 
Log Message:
change license and erase one rm -f


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- inn.spec	11 Dec 2009 16:48:14 -0000	1.72
+++ inn.spec	16 Dec 2009 14:32:25 -0000	1.73
@@ -3,7 +3,7 @@ Name: inn
 Version: 2.5.1
 Release: 2%{?dist}
 #see LICENSE file for details
-License: GPL+ and BSD and MIT and Public Domain
+License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
 URL: https://www.isc.org/software/INN/
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -53,6 +53,7 @@ newsgate or tin.
 Summary: The INN (InterNetNews) library
 Group: Development/Libraries
 Requires: inn = %{version}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 The inn-devel package contains the INN (InterNetNews) library, which
@@ -179,12 +180,12 @@ PATH=\$PATH:%{_libexecdir}/news
 export PATH
 EOF
 
-# we get this from cleanfeed
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/news/filter/filter_innd.pl
-
 #Fix perms in sample directory to avoid bogus dependencies
 find samples -name "*.in" -exec chmod a-x {} \;
 
+# we get this from cleanfeed
+rm -f $RPM_BUILD_ROOT%{_libexecdir}/news/filter/filter_innd.pl
+
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -sf %{_libexecdir}/news/inews $RPM_BUILD_ROOT%{_bindir}/inews
 ln -sf %{_libexecdir}/news/rnews $RPM_BUILD_ROOT%{_bindir}/rnews
@@ -198,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT/usr/doc/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -f files.list files.main files.devel files.inews
 
 %post
 /sbin/chkconfig --add innd



From akurtakov at fedoraproject.org  Wed Dec 16 14:35:34 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 16 Dec 2009 14:35:34 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-junit-dropins.patch, NONE,
	1.1 eclipse.spec, 1.696, 1.697
Message-ID: <20091216143534.9164A11C0092@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22584/devel

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-junit-dropins.patch 
Log Message:
Fix o.e.jdt.junit issue with dropins.

eclipse-junit-dropins.patch:
 P2Utils.java |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

--- NEW FILE eclipse-junit-dropins.patch ---
--- plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
+++ plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
@@ -90,6 +90,21 @@ class P2Utils {
 		try {
 			URL bundlesTxt= new URL(bundlesLocationURL.getProtocol(), bundlesLocationURL.getHost(), new File(bundlesLocationURL.getFile(), bundleInfoPath).getAbsolutePath());
 			BundleInfo bundles[]= getBundlesFromFile(bundlesLocationURL, bundlesTxt);
+			if (useConfigArea) {
+				// the config area may have relative URLs that should be
+				// resolved to the install location.
+				URL installLocationURL = Platform.getInstallLocation().getURL();
+				BundleInfo installBundles[]= getBundlesFromFile(installLocationURL, bundlesTxt);
+				if (bundles == null || bundles.length == 0) {
+					bundles = installBundles;
+				}
+				else if (installBundles != null && installBundles.length > 0) {
+					BundleInfo mergedBundles[] = new BundleInfo[bundles.length + installBundles.length];
+					System.arraycopy(bundles, 0, mergedBundles, 0, bundles.length);
+					System.arraycopy(installBundles, 0, mergedBundles, bundles.length, installBundles.length);
+					bundles = mergedBundles;
+				}
+			}
 			if (bundles == null || bundles.length == 0) {
 				return null;
 			}


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -p -r1.696 -r1.697
--- eclipse.spec	4 Dec 2009 08:23:09 -0000	1.696
+++ eclipse.spec	16 Dec 2009 14:35:34 -0000	1.697
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        24%{?dist}
+Release:        25%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -47,6 +47,7 @@ Source28:       %{name}-mv-Platform.sh
 Patch0:        %{name}-target-platform-template.patch
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 Patch1:        %{name}-swt-ppc64-version.patch
+Patch2:        %{name}-junit-dropins.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant ant-nodeps
@@ -387,6 +388,7 @@ fi
 %patch0 -p0
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 %patch1
+%patch2
 popd
 
 %build
@@ -1095,6 +1097,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Dec 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-25
+- Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).
+
 * Fri Dec 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-24
 - Replace gecko BR/Rs with xulrunner.
 - Drop xulrunner-devel-unstable now that it's merged in xulrunner-devel.



From akurtakov at fedoraproject.org  Wed Dec 16 14:40:45 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 16 Dec 2009 14:40:45 +0000 (UTC)
Subject: rpms/eclipse/F-12 eclipse-junit-dropins.patch, NONE,
	1.1 eclipse.spec, 1.676, 1.677
Message-ID: <20091216144045.8995611C02CA@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23609/F-12

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-junit-dropins.patch 
Log Message:
Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).

eclipse-junit-dropins.patch:
 P2Utils.java |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

--- NEW FILE eclipse-junit-dropins.patch ---
--- plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
+++ plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
@@ -90,6 +90,21 @@ class P2Utils {
 		try {
 			URL bundlesTxt= new URL(bundlesLocationURL.getProtocol(), bundlesLocationURL.getHost(), new File(bundlesLocationURL.getFile(), bundleInfoPath).getAbsolutePath());
 			BundleInfo bundles[]= getBundlesFromFile(bundlesLocationURL, bundlesTxt);
+			if (useConfigArea) {
+				// the config area may have relative URLs that should be
+				// resolved to the install location.
+				URL installLocationURL = Platform.getInstallLocation().getURL();
+				BundleInfo installBundles[]= getBundlesFromFile(installLocationURL, bundlesTxt);
+				if (bundles == null || bundles.length == 0) {
+					bundles = installBundles;
+				}
+				else if (installBundles != null && installBundles.length > 0) {
+					BundleInfo mergedBundles[] = new BundleInfo[bundles.length + installBundles.length];
+					System.arraycopy(bundles, 0, mergedBundles, 0, bundles.length);
+					System.arraycopy(installBundles, 0, mergedBundles, bundles.length, installBundles.length);
+					bundles = mergedBundles;
+				}
+			}
 			if (bundles == null || bundles.length == 0) {
 				return null;
 			}


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse.spec,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -p -r1.676 -r1.677
--- eclipse.spec	17 Nov 2009 12:34:31 -0000	1.676
+++ eclipse.spec	16 Dec 2009 14:40:44 -0000	1.677
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        20%{?dist}
+Release:        21%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -47,6 +47,7 @@ Source28:       %{name}-mv-Platform.sh
 Patch0:        %{name}-target-platform-template.patch
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 Patch1:        %{name}-swt-ppc64-version.patch
+Patch2:        %{name}-junit-dropins.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -388,6 +389,7 @@ fi
 %patch0 -p0
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 %patch1
+%patch2
 popd
 
 %build
@@ -1104,6 +1106,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Dec 16 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-21
+- Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).
+
 * Tue Nov 17 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-20
 - Fix ppc64 swt jar version.
 



From caolanm at fedoraproject.org  Wed Dec 16 14:43:17 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 16 Dec 2009 14:43:17 +0000 (UTC)
Subject: File hunspell-ht-0.06.oxt uploaded to lookaside cache by caolanm
Message-ID: <20091216144317.31ADE28ED3A@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for hunspell-ht:

2ad7f1441d6d35aa018e4424fd9d48c1  hunspell-ht-0.06.oxt



From caolanm at fedoraproject.org  Wed Dec 16 14:43:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 16 Dec 2009 14:43:51 +0000 (UTC)
Subject: rpms/hunspell-ht/devel .cvsignore, 1.3, 1.4 hunspell-ht.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <20091216144351.0332311C0092@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24347

Modified Files:
	.cvsignore hunspell-ht.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ht/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Dec 2009 11:20:19 -0000	1.3
+++ .cvsignore	16 Dec 2009 14:43:50 -0000	1.4
@@ -1 +1 @@
-hunspell-ht-0.05.oxt
+hunspell-ht-0.06.oxt


Index: hunspell-ht.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ht/devel/hunspell-ht.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hunspell-ht.spec	10 Dec 2009 11:20:19 -0000	1.3
+++ hunspell-ht.spec	16 Dec 2009 14:43:50 -0000	1.4
@@ -1,9 +1,9 @@
 Name: hunspell-ht
 Summary: Haitian Creole hunspell dictionaries
-Version: 0.05
+Version: 0.06
 Release: 1%{?dist}
 Group: Applications/Text
-Source: http://extensions.services.openoffice.org/files/3247/2/%{name}-%{version}.oxt
+Source: http://extensions.services.openoffice.org/files/3247/3/%{name}-%{version}.oxt
 URL: http://kok.logipam.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Dec 16 2009 Caolan McNamara <caolanm at redhat.com> - 0.06-1
+- latest version
+
 * Thu Dec 10 2009 Caolan McNamara <caolanm at redhat.com> - 0.05-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ht/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Dec 2009 11:20:19 -0000	1.3
+++ sources	16 Dec 2009 14:43:50 -0000	1.4
@@ -1 +1 @@
-4136daafe3c748bbc1813bfa9b3d3f40  hunspell-ht-0.05.oxt
+2ad7f1441d6d35aa018e4424fd9d48c1  hunspell-ht-0.06.oxt



From npajkovs at fedoraproject.org  Wed Dec 16 14:47:11 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Wed, 16 Dec 2009 14:47:11 +0000 (UTC)
Subject: rpms/inn/devel inn.spec, 1.73, 1.74 inn-2.4.1.perl.patch, 1.1,
	NONE inn-2.4.5-dynlib.patch, 1.2, NONE
Message-ID: <20091216144711.9733B11C0092@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25330

Modified Files:
	inn.spec 
Removed Files:
	inn-2.4.1.perl.patch inn-2.4.5-dynlib.patch 
Log Message:
drop patches


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- inn.spec	16 Dec 2009 14:32:25 -0000	1.73
+++ inn.spec	16 Dec 2009 14:47:11 -0000	1.74
@@ -14,13 +14,11 @@ Source7: inn-cron-nntpsend
 Source8: innd.init
 Source10: inn-faq.tar.gz
 Patch1:  inn-2.4.3.rh.patch
-Patch2: inn-2.4.1.perl.patch
 Patch4: inn-2.5.1.pie.patch
 Patch6: inn-2.4.1.posix.patch
 Patch7: inn-2.4.3.warn.patch
 Patch8: inn-2.4.2-makedbz.patch
 Patch10: inn-2.5.1-nologinshell.patch
-Patch11: inn-2.4.5-dynlib.patch
 Patch13: inn-2.5.0-chown.patch
 Patch14: inn-redhat_build.patch
 Patch15: inn-shared.patch
@@ -94,13 +92,11 @@ exit 0
 %prep
 %setup -q
 %patch1 -p1 -b .rh
-#%patch2 -p1 -b .perl
 %patch4 -p1 -b .pie
 %patch6 -p1 -b .posix
 %patch7 -p1 -b .warn
 %patch8 -p1 -b .makedbz
 %patch10 -p1 -b .nologin
-#%patch11 -p1 -b .dynlib
 %patch13 -p1 -b .chown
 %patch14 -p1 -b .redhat_build
 %patch15 -p1 -b .shared
@@ -511,6 +507,11 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Dec 16 2009 Nikola Pajkovsky <npajkovs at redhta.com> - 2.5.1-3
+- rebuild 
+- chage licence and remove on rm -f
+- drop patches inn-2.4.1.perl.patch and inn-2.4.5-dynlib.patch
+
 * Fri Dec 11 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 2.5.1-2
 - #225901 - Merge Review: inn
 


--- inn-2.4.1.perl.patch DELETED ---


--- inn-2.4.5-dynlib.patch DELETED ---



From xhorak at fedoraproject.org  Wed Dec 16 14:55:10 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 14:55:10 +0000 (UTC)
Subject: rpms/epiphany/F-11 epiphany.spec,1.236,1.237
Message-ID: <20091216145510.3FBF011C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26979

Modified Files:
	epiphany.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-7
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-11/epiphany.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- epiphany.spec	5 Nov 2009 18:44:34 -0000	1.236
+++ epiphany.spec	16 Dec 2009 14:55:10 -0000	1.237
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.1.5
+%define gecko_ver 1.9.1.6
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.18.0
 %define gtk2_devel_ver 2.15.1
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.26.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 %define major_version 2.26
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-7
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-6
 - Rebuild against newer gecko
 



From npajkovs at fedoraproject.org  Wed Dec 16 14:55:32 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Wed, 16 Dec 2009 14:55:32 +0000 (UTC)
Subject: rpms/inn/devel inn.spec,1.74,1.75
Message-ID: <20091216145532.7249A11C0092@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27146

Modified Files:
	inn.spec 
Log Message:
forgot release +1


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- inn.spec	16 Dec 2009 14:47:11 -0000	1.74
+++ inn.spec	16 Dec 2009 14:55:32 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons



From xhorak at fedoraproject.org  Wed Dec 16 14:56:03 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 14:56:03 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-11 pcmanx-gtk2.spec,1.17,1.18
Message-ID: <20091216145603.DECBB11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/pcmanx-gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27324

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-11
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-11/pcmanx-gtk2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pcmanx-gtk2.spec	5 Nov 2009 18:45:35 -0000	1.17
+++ pcmanx-gtk2.spec	16 Dec 2009 14:56:03 -0000	1.18
@@ -2,12 +2,12 @@
 # We hardcode this here because everytime xulrunner increments
 # it tends to break things that depend on it.
 %define xulmajorver 1.9
-%define xulver 1.9.1.5
+%define xulver 1.9.1.6
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   10%{?dist}
+Release:   11%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-11
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-10
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 14:59:54 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 14:59:54 +0000 (UTC)
Subject: rpms/blam/F-11 blam.spec,1.34,1.35
Message-ID: <20091216145954.21C6E11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28282

Modified Files:
	blam.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-17
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-11/blam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- blam.spec	5 Nov 2009 18:46:20 -0000	1.34
+++ blam.spec	16 Dec 2009 14:59:53 -0000	1.35
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.1.5
+%define	gecko_version		1.9.1.6
 
 Name:		blam
 Version:	1.8.5
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-17
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-16
 - Rebuild against newer gecko
 



From mlichvar at fedoraproject.org  Wed Dec 16 15:00:05 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 16 Dec 2009 15:00:05 +0000 (UTC)
Subject: File mutt-1.5.20-20091214hg736b6a.tar.bz2 uploaded to lookaside
	cache by mlichvar
Message-ID: <20091216150005.8C0A828ECD2@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mutt:

82c95ad3b133538de3e11de4f4062b78  mutt-1.5.20-20091214hg736b6a.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 15:00:45 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:00:45 +0000 (UTC)
Subject: rpms/chmsee/F-11 chmsee.spec,1.39,1.40
Message-ID: <20091216150045.211F311C02CA@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/chmsee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28699

Modified Files:
	chmsee.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-14
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/chmsee.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- chmsee.spec	5 Nov 2009 18:48:21 -0000	1.39
+++ chmsee.spec	16 Dec 2009 15:00:44 -0000	1.40
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary(zh_CN):	CHM ??????, ?? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-14
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-13
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 15:09:53 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:09:53 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse.spec,1.637,1.638
Message-ID: <20091216150953.1234811C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30350

Modified Files:
	eclipse.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1:3.4.2-19
- Rebuild against newer gecko



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -p -r1.637 -r1.638
--- eclipse.spec	5 Nov 2009 18:49:31 -0000	1.637
+++ eclipse.spec	16 Dec 2009 15:09:52 -0000	1.638
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        18%{?dist}
+Release:        19%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1512,6 +1512,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1:3.4.2-19
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 1:3.4.2-18
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 15:10:43 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:10:43 +0000 (UTC)
Subject: rpms/evolution-rss/F-11 evolution-rss.spec,1.37,1.38
Message-ID: <20091216151043.DDBD011C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/evolution-rss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30639

Modified Files:
	evolution-rss.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-9
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/evolution-rss.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- evolution-rss.spec	23 Nov 2009 21:35:33 -0000	1.37
+++ evolution-rss.spec	16 Dec 2009 15:10:43 -0000	1.38
@@ -1,7 +1,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	8%{?dist}
+Release:	9%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -90,6 +90,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-9
+- Rebuild against newer gecko
+
 * Mon Nov 23 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-8
 - drop patch2 as it is not valid for f11's evo version
 



From xhorak at fedoraproject.org  Wed Dec 16 15:12:50 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:12:50 +0000 (UTC)
Subject: rpms/galeon/F-11 galeon.spec,1.70,1.71
Message-ID: <20091216151250.AC83811C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/galeon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31098

Modified Files:
	galeon.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-19
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- galeon.spec	5 Nov 2009 18:52:35 -0000	1.70
+++ galeon.spec	16 Dec 2009 15:12:50 -0000	1.71
@@ -1,9 +1,9 @@
-%define gecko_ver 1.9.1.5
+%define gecko_ver 1.9.1.6
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	18%{?dist}
+Release:	19%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -133,6 +133,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-19
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-18
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 15:13:59 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:13:59 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-11 gnome-python2-extras.spec,1.56,1.57
Message-ID: <20091216151359.2BC4F11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-python2-extras/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31479

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-10
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-11/gnome-python2-extras.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gnome-python2-extras.spec	5 Nov 2009 18:53:35 -0000	1.56
+++ gnome-python2-extras.spec	16 Dec 2009 15:13:58 -0000	1.57
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.1.5
+%define gecko_version 1.9.1.6
 %define gtkspell_version 2.0.7
 %define libgda_version 3.99.9
 %define libgdl_version 2.24.0
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-10
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-9
 - Rebuild against newer gecko
 



From mlichvar at fedoraproject.org  Wed Dec 16 15:14:14 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 16 Dec 2009 15:14:14 +0000 (UTC)
Subject: rpms/mutt/devel .cvsignore, 1.20, 1.21 mutt.spec, 1.64, 1.65 sources,
	1.20, 1.21
Message-ID: <20091216151414.0D7F711C0092@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31433

Modified Files:
	.cvsignore mutt.spec sources 
Log Message:
- update to hg snapshot 20091214hg736b6a



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	18 Sep 2009 12:30:22 -0000	1.20
+++ .cvsignore	16 Dec 2009 15:14:13 -0000	1.21
@@ -1 +1 @@
-mutt-1.5.20-20090827hg605559.tar.bz2
+mutt-1.5.20-20091214hg736b6a.tar.bz2


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- mutt.spec	18 Sep 2009 12:30:23 -0000	1.64
+++ mutt.spec	16 Dec 2009 15:14:13 -0000	1.65
@@ -16,14 +16,14 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.20
-Release: 1.20090827hg605559%{?dist}
+Release: 2.20091214hg736b6a%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
 License: GPLv2+ and Public Domain
 Group: Applications/Internet
 # hg snapshot created from http://dev.mutt.org/hg/mutt
-Source: mutt-1.5.20-20090827hg605559.tar.bz2
+Source: mutt-1.5.20-20091214hg736b6a.tar.bz2
 #Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
 Source1: mutt_ldap_query
 Patch2: mutt-1.5.13-nodotlock.patch
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Dec 16 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.20-2.20091214hg736b6a
+- update to hg snapshot 20091214hg736b6a
+
 * Fri Sep 18 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.20-1.20090827hg605559
 - update to post 1.5.20 hg snapshot (#515148)
 - use hunspell by default (#510358)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Sep 2009 12:30:23 -0000	1.20
+++ sources	16 Dec 2009 15:14:13 -0000	1.21
@@ -1 +1 @@
-a459f1139a9fff840222268aa1bc17a0  mutt-1.5.20-20090827hg605559.tar.bz2
+82c95ad3b133538de3e11de4f4062b78  mutt-1.5.20-20091214hg736b6a.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec 16 15:17:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:17:26 +0000
Subject: [pkgdb] emerald: jwilson has given up watchbugzilla
Message-ID: <20091216151727.657E328ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:17:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:17:33 +0000
Subject: [pkgdb] emerald: jwilson has given up watchbugzilla
Message-ID: <20091216151734.1CFDA28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:17:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:17:35 +0000
Subject: [pkgdb] emerald: jwilson has given up watchbugzilla
Message-ID: <20091216151736.36C3728ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:17:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:17:37 +0000
Subject: [pkgdb] emerald: jwilson has given up watchbugzilla
Message-ID: <20091216151739.31CCC28ED0C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:17:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:17:40 +0000
Subject: [pkgdb] emerald: jwilson has given up watchbugzilla
Message-ID: <20091216151741.AAC6228ED0C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:17:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:17:42 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up watchbugzilla
Message-ID: <20091216151742.5F70128ED38@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald-themes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 15:17:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:17:46 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up watchbugzilla
Message-ID: <20091216151746.E920628ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald-themes (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 15:17:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:17:47 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up watchbugzilla
Message-ID: <20091216151749.5873F28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald-themes (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:01 +0000
Subject: [pkgdb] emerald: jwilson has given up commit
Message-ID: <20091216151902.2F10328ED0C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:03 +0000
Subject: [pkgdb] emerald: jwilson has given up commit
Message-ID: <20091216151905.0E69228ED0C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:05 +0000
Subject: [pkgdb] emerald: jwilson has given up commit
Message-ID: <20091216151907.4241728ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:12 +0000
Subject: [pkgdb] emerald: jwilson has given up commit
Message-ID: <20091216151913.5349D28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:08 +0000
Subject: [pkgdb] emerald: jwilson has given up commit
Message-ID: <20091216151910.3789128ED0C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:30 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchbugzilla
Message-ID: <20091216151931.0B0FE28ECD4@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on zabbix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:35 +0000
Subject: [pkgdb] zabbix: jwilson has given up commit
Message-ID: <20091216151937.62CAA28ED46@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on zabbix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:37 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchcommits
Message-ID: <20091216151939.8887828ED55@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on zabbix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:39 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchbugzilla
Message-ID: <20091216151941.1DC7B28ECCD@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on zabbix (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:39 +0000
Subject: [pkgdb] zabbix: jwilson has given up approveacls
Message-ID: <20091216151942.2262C28ED4E@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on zabbix (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:50 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchcommits
Message-ID: <20091216151952.229CD28ED66@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on zabbix (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:42 +0000
Subject: [pkgdb] zabbix: jwilson has given up commit
Message-ID: <20091216151944.845D728ED55@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on zabbix (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:43 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchcommits
Message-ID: <20091216151945.8675428ED21@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on zabbix (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:46 +0000
Subject: [pkgdb] zabbix: jwilson has given up approveacls
Message-ID: <20091216151949.049C028ED6F@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on zabbix (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:59 +0000
Subject: [pkgdb] zabbix: jwilson has given up commit
Message-ID: <20091216152001.EBE1D28ED63@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on zabbix (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:55 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchcommits
Message-ID: <20091216151956.D8E3928ED8D@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on zabbix (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:47 +0000
Subject: [pkgdb] zabbix: jwilson has given up approveacls
Message-ID: <20091216151950.C663F28ED7C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on zabbix (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:48 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchbugzilla
Message-ID: <20091216151949.3EED728ECCD@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on zabbix (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:46 +0000
Subject: [pkgdb] zabbix: jwilson has given up commit
Message-ID: <20091216151947.4BDDE28ED69@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on zabbix (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:51 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchbugzilla
Message-ID: <20091216151954.1663928ED81@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on zabbix (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:51 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchcommits
Message-ID: <20091216151954.0803B28ED46@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on zabbix (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:52 +0000
Subject: [pkgdb] zabbix: jwilson has given up approveacls
Message-ID: <20091216151954.5712728ED42@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on zabbix (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:54 +0000
Subject: [pkgdb] zabbix: jwilson has given up commit
Message-ID: <20091216151956.E77DC28ED8F@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on zabbix (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:57 +0000
Subject: [pkgdb] zabbix: jwilson has given up approveacls
Message-ID: <20091216151958.B963528ECCD@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on zabbix (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From xhorak at fedoraproject.org  Wed Dec 16 15:19:50 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:19:50 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-11 gnome-web-photo.spec,1.28,1.29
Message-ID: <20091216151950.7578811C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-web-photo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv401

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.7-9
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/F-11/gnome-web-photo.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gnome-web-photo.spec	5 Nov 2009 18:55:33 -0000	1.28
+++ gnome-web-photo.spec	16 Dec 2009 15:19:50 -0000	1.29
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.5
+%define gecko_version 1.9.1.6
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.7-9
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.7-8
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Wed Dec 16 15:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:19:56 +0000
Subject: [pkgdb] zabbix: jwilson has given up watchbugzilla
Message-ID: <20091216151959.2E3DC28ED93@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on zabbix (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:44 +0000
Subject: [pkgdb] powerman: jwilson has given up watchbugzilla
Message-ID: <20091216152045.D5D2F28ECCD@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on powerman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:47 +0000
Subject: [pkgdb] powerman: jwilson has given up commit
Message-ID: <20091216152047.5D50528ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on powerman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:49 +0000
Subject: [pkgdb] powerman: jwilson has given up watchbugzilla
Message-ID: <20091216152050.0644728ECD4@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on powerman (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From xhorak at fedoraproject.org  Wed Dec 16 15:20:40 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:20:40 +0000 (UTC)
Subject: rpms/google-gadgets/F-11 google-gadgets.spec,1.22,1.23
Message-ID: <20091216152040.D9C6F11C02CA@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/google-gadgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv661

Modified Files:
	google-gadgets.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.11.1-4
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- google-gadgets.spec	5 Nov 2009 18:56:21 -0000	1.22
+++ google-gadgets.spec	16 Dec 2009 15:20:40 -0000	1.23
@@ -4,7 +4,7 @@
 Name:           google-gadgets
 Version:        0.11.1
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -204,6 +204,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.11.1-4
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.11.1-3
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:51 +0000
Subject: [pkgdb] powerman: jwilson has given up watchbugzilla
Message-ID: <20091216152052.4213828ECD4@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on powerman (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:53 +0000
Subject: [pkgdb] powerman: jwilson has given up commit
Message-ID: <20091216152054.AA40C28ECCD@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on powerman (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:54 +0000
Subject: [pkgdb] powerman: jwilson has given up watchbugzilla
Message-ID: <20091216152055.2FC1B28ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on powerman (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:54 +0000
Subject: [pkgdb] powerman: jwilson has given up commit
Message-ID: <20091216152055.ACA6128ECD4@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on powerman (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:56 +0000
Subject: [pkgdb] powerman: jwilson has given up watchbugzilla
Message-ID: <20091216152056.E4C5F28ED38@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on powerman (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:59 +0000
Subject: [pkgdb] powerman: jwilson has given up commit
Message-ID: <20091216152100.4D8AB28ED0C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on powerman (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:20:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:20:59 +0000
Subject: [pkgdb] powerman: jwilson has given up commit
Message-ID: <20091216152100.CFE7728ECE0@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on powerman (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/powerman



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:10 +0000
Subject: [pkgdb] numpy: jwilson has given up watchbugzilla
Message-ID: <20091216152111.5390728ECD4@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on numpy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:15 +0000
Subject: [pkgdb] numpy: jwilson has given up commit
Message-ID: <20091216152117.011A328ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on numpy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:14 +0000
Subject: [pkgdb] numpy: jwilson has given up commit
Message-ID: <20091216152117.F2A0E28ECE0@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on numpy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:18 +0000
Subject: [pkgdb] numpy: jwilson has given up watchbugzilla
Message-ID: <20091216152121.837CA28ED49@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on numpy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:17 +0000
Subject: [pkgdb] numpy: jwilson has given up commit
Message-ID: <20091216152119.BB5A328ED4F@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on numpy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:23 +0000
Subject: [pkgdb] numpy: jwilson has given up commit
Message-ID: <20091216152126.4B33428ECD4@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on numpy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:21 +0000
Subject: [pkgdb] numpy: jwilson has given up watchbugzilla
Message-ID: <20091216152123.28CCB28ED5B@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on numpy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:22 +0000
Subject: [pkgdb] numpy: jwilson has given up commit
Message-ID: <20091216152127.A1D5A28ED42@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on numpy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:23 +0000
Subject: [pkgdb] numpy: jwilson has given up watchbugzilla
Message-ID: <20091216152127.B99A828ED4F@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on numpy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From pkgdb at fedoraproject.org  Wed Dec 16 15:21:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 15:21:20 +0000
Subject: [pkgdb] numpy: jwilson has given up watchbugzilla
Message-ID: <20091216152124.4B43D28ED65@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on numpy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/numpy



From mlichvar at fedoraproject.org  Wed Dec 16 15:23:09 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 16 Dec 2009 15:23:09 +0000 (UTC)
Subject: rpms/mutt/F-12 .cvsignore, 1.20, 1.21 mutt.spec, 1.64, 1.65 sources,
	1.20, 1.21
Message-ID: <20091216152309.59A1111C0092@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1197

Modified Files:
	.cvsignore mutt.spec sources 
Log Message:
- update to hg snapshot 20091214hg736b6a



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	18 Sep 2009 12:30:22 -0000	1.20
+++ .cvsignore	16 Dec 2009 15:23:09 -0000	1.21
@@ -1 +1 @@
-mutt-1.5.20-20090827hg605559.tar.bz2
+mutt-1.5.20-20091214hg736b6a.tar.bz2


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-12/mutt.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- mutt.spec	18 Sep 2009 12:30:23 -0000	1.64
+++ mutt.spec	16 Dec 2009 15:23:09 -0000	1.65
@@ -16,14 +16,14 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.20
-Release: 1.20090827hg605559%{?dist}
+Release: 2.20091214hg736b6a%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
 License: GPLv2+ and Public Domain
 Group: Applications/Internet
 # hg snapshot created from http://dev.mutt.org/hg/mutt
-Source: mutt-1.5.20-20090827hg605559.tar.bz2
+Source: mutt-1.5.20-20091214hg736b6a.tar.bz2
 #Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
 Source1: mutt_ldap_query
 Patch2: mutt-1.5.13-nodotlock.patch
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Dec 16 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.20-2.20091214hg736b6a
+- update to hg snapshot 20091214hg736b6a
+
 * Fri Sep 18 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.20-1.20090827hg605559
 - update to post 1.5.20 hg snapshot (#515148)
 - use hunspell by default (#510358)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Sep 2009 12:30:23 -0000	1.20
+++ sources	16 Dec 2009 15:23:09 -0000	1.21
@@ -1 +1 @@
-a459f1139a9fff840222268aa1bc17a0  mutt-1.5.20-20090827hg605559.tar.bz2
+82c95ad3b133538de3e11de4f4062b78  mutt-1.5.20-20091214hg736b6a.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 15:24:20 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:24:20 +0000 (UTC)
Subject: rpms/hulahop/F-11 hulahop.spec,1.18,1.19
Message-ID: <20091216152420.5BF7011C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/hulahop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1537

Modified Files:
	hulahop.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.4.9-11
- Rebuild against newer gecko



Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/F-11/hulahop.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- hulahop.spec	5 Nov 2009 18:57:10 -0000	1.18
+++ hulahop.spec	16 Dec 2009 15:24:20 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name: hulahop
 Version: 0.4.9
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.4.9-11
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.4.9-10
 - Rebuild against newer gecko
 



From rjones at fedoraproject.org  Wed Dec 16 15:25:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 16 Dec 2009 15:25:41 +0000 (UTC)
Subject: rpms/ocaml/devel ocaml.spec, 1.63, 1.64 ocaml-find-provides.sh, 1.2,
	NONE ocaml-find-requires.sh, 1.5, NONE
Message-ID: <20091216152541.1BDDA11C0092@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1874

Modified Files:
	ocaml.spec 
Removed Files:
	ocaml-find-provides.sh ocaml-find-requires.sh 
Log Message:
* Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-7
- Remove ocaml-find-{requires,provides}.sh from this package.  These are
  now in upstream RPM 4.8 (RHBZ#545116).
- define -> global in a few places.



Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- ocaml.spec	5 Nov 2009 06:01:51 -0000	1.63
+++ ocaml.spec	16 Dec 2009 15:25:40 -0000	1.64
@@ -1,8 +1,8 @@
-%define _default_patch_fuzz 2
+%global _default_patch_fuzz 2
 
 Name:           ocaml
 Version:        3.11.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -15,8 +15,6 @@ Source0:        http://caml.inria.fr/dis
 Source1:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.html.tar.gz
 Source2:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.pdf
 Source3:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.info.tar.gz
-Source4:        ocaml-find-requires.sh
-Source5:        ocaml-find-provides.sh
 
 # Useful utilities from Debian, and sent upstream.
 # http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git;a=tree;f=debian/ocamlbyteinfo;hb=HEAD
@@ -54,12 +52,12 @@ BuildRequires:  chrpath
 Requires:       gcc
 Requires:       ncurses-devel
 Requires:       gdbm-devel
+Requires:       rpm-build >= 4.8.0
 Provides:       ocaml(compiler) = %{version}
 ExclusiveArch:  alpha armv4l %{ix86} ia64 x86_64 ppc sparc sparcv9 ppc64
 
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE4} -c -f %{buildroot}%{_bindir}/ocamlobjinfo
-%define __find_provides %{SOURCE5} -f %{buildroot}%{_bindir}/ocamlobjinfo
+%global __ocaml_requires %{_rpmconfigdir}/ocaml-find-requires.sh -c -f %{buildroot}%{_bindir}/ocamlobjinfo
+%global __ocaml_provides %{_rpmconfigdir}/ocaml-find-provides.sh -f %{buildroot}%{_bindir}/ocamlobjinfo
 
 
 %description
@@ -251,11 +249,6 @@ perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_
 
 cp tools/objinfo $RPM_BUILD_ROOT%{_bindir}/ocamlobjinfo
 
-# install rpmbuild helper files
-mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/
-install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm/
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm/
-
 echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
 # Remove rpaths from stublibs .so files.
@@ -346,7 +339,6 @@ fi
 %{_libdir}/ocaml/threads/*.cmi
 %{_libdir}/ocaml/threads/*.cma
 %{_libdir}/ocaml/fedora-ocaml-release
-%attr(755,root,root) %{_prefix}/lib/rpm/*
 %exclude %{_libdir}/ocaml/graphicsX11.cmi
 %exclude %{_libdir}/ocaml/stublibs/dlllabltk.so
 %exclude %{_libdir}/ocaml/stublibs/dlltkanim.so
@@ -451,6 +443,11 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-7
+- Remove ocaml-find-{requires,provides}.sh from this package.  These are
+  now in upstream RPM 4.8 (RHBZ#545116).
+- define -> global in a few places.
+
 * Thu Nov 05 2009 Dennis Gilmore <dennis at ausil.us> - 3.11.1-6
 - include sparcv9 in the arch list
 


--- ocaml-find-provides.sh DELETED ---


--- ocaml-find-requires.sh DELETED ---



From xhorak at fedoraproject.org  Wed Dec 16 15:28:12 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:28:12 +0000 (UTC)
Subject: rpms/kazehakase/F-11 kazehakase.spec,1.92,1.93
Message-ID: <20091216152812.3E58411C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2412

Modified Files:
	kazehakase.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.5.8-3.1
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- kazehakase.spec	5 Nov 2009 19:00:33 -0000	1.92
+++ kazehakase.spec	16 Dec 2009 15:28:12 -0000	1.93
@@ -18,7 +18,7 @@
 %define		min_webkit_EVR	1.1.1
 
 %if 0%{?fedora} >= 11
-%define		Geckover	1.9.1.5
+%define		Geckover	1.9.1.6
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
 %define		Geckover	1.9
@@ -38,7 +38,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define		fedorarel	3
+%define		fedorarel	4
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -354,6 +354,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.5.8-3.1
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.5.8-3
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 15:28:58 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:28:58 +0000 (UTC)
Subject: rpms/Miro/F-11 Miro.spec,1.62,1.63
Message-ID: <20091216152858.A6EFF11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2679

Modified Files:
	Miro.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-7
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-11/Miro.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- Miro.spec	5 Nov 2009 19:01:21 -0000	1.62
+++ Miro.spec	16 Dec 2009 15:28:58 -0000	1.63
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.1.5
+%define gecko_ver 1.9.1.6
 
 Name:           Miro
 Version:        2.5.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-7
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-6
 - Rebuild against newer gecko
 



From rjones at fedoraproject.org  Wed Dec 16 15:37:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 16 Dec 2009 15:37:05 +0000 (UTC)
Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.24,1.25
Message-ID: <20091216153705.6EFFE11C0092@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4152

Modified Files:
	ocaml-findlib.spec 
Log Message:
Update to use RPM dependency generator.


Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ocaml-findlib.spec	4 Oct 2009 20:39:27 -0000	1.24
+++ ocaml-findlib.spec	16 Dec 2009 15:37:05 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           ocaml-findlib
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -20,9 +20,7 @@ BuildRequires:  ocaml-ocamldoc
 BuildRequires:  m4, ncurses-devel
 BuildRequires:  gawk
 
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%global __ocaml_requires %{_rpmconfigdir}/ocaml-find-requires.sh -i Asttypes -i Parsetree
 
 %description
 Objective CAML package manager and build helper.
@@ -110,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.5-2
+- Update to use RPM dependency generator.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.5-1
 - New upstream version 1.2.5.
 



From xhorak at fedoraproject.org  Wed Dec 16 15:41:22 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:41:22 +0000 (UTC)
Subject: rpms/monodevelop/F-11 monodevelop-2.spec,1.21,1.22
Message-ID: <20091216154122.B33D211C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/monodevelop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4835

Modified Files:
	monodevelop-2.spec 
Log Message:
* Thu Nov 05 2009 Jan Horak <jhorak at redhat.com>
- Rebuild against newer gecko



Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-11/monodevelop-2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- monodevelop-2.spec	5 Nov 2009 19:09:27 -0000	1.21
+++ monodevelop-2.spec	16 Dec 2009 15:41:22 -0000	1.22
@@ -10,7 +10,7 @@
 
 Name:           monodevelop
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -158,7 +158,10 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
-* Thu Nov 05 2009 Jan Horak <jhorak at redhat.com>
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.0-8
+- Rebuild against newer gecko
+
+* Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.0-7
 - Rebuild against newer gecko
 
 * Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.0-6



From kklic at fedoraproject.org  Wed Dec 16 15:41:22 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 15:41:22 +0000 (UTC)
Subject: rpms/logwatch/devel logwatch-7.3.6-audit4.patch, NONE,
	1.1 logwatch-7.3.6-dhcpd.patch, NONE,
	1.1 logwatch-7.3.6-dovecot2.patch, NONE,
	1.1 logwatch-7.3.6-named6.patch, NONE,
	1.1 logwatch-7.3.6-openvpn4.patch, NONE,
	1.1 logwatch-7.3.6-pam_unix4.patch, NONE,
	1.1 logwatch-7.3.6-secure3.patch, NONE, 1.1 logwatch.spec, 1.120,
	1.121
Message-ID: <20091216154122.66FC811C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4803

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-audit4.patch logwatch-7.3.6-dhcpd.patch 
	logwatch-7.3.6-dovecot2.patch logwatch-7.3.6-named6.patch 
	logwatch-7.3.6-openvpn4.patch logwatch-7.3.6-pam_unix4.patch 
	logwatch-7.3.6-secure3.patch 
Log Message:
added patches from F10 parsing several unmatched entries

logwatch-7.3.6-audit4.patch:
 audit |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3.6-audit4.patch ---
diff -up logwatch-7.3.6/scripts/services/audit.pom logwatch-7.3.6/scripts/services/audit
--- logwatch-7.3.6/scripts/services/audit.pom	2009-10-12 12:42:39.000000000 +0200
+++ logwatch-7.3.6/scripts/services/audit	2009-10-12 12:47:19.000000000 +0200
@@ -70,7 +70,7 @@ while ($ThisLine = <STDIN>) {
     chomp($ThisLine);
     if (( $ThisLine =~ /initializing netlink socket \(disabled\)/) or 
 	( $ThisLine =~ /audit_pid=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
-	( $ThisLine =~ /(arch=[0-9]+ )?syscall=[0-9]+ (success=(no|yes) )?exit=[0-9-]+( a[0-3]=[0-9a-f]+)* items=[0-9]+ pid=[0-9]+ (loginuid=[0-9-]+ )?(auid=[0-9]+ )?uid=[0-9]+ gid=[0-9]+ euid=[0-9]+ suid=[0-9]+ fsuid=[0-9]+ egid=[0-9]+ sgid=[0-9]+ fsgid=[0-9]+/) or
+	( $ThisLine =~ /(arch=[0-9]+ )?syscall=[0-9]+ (success=(no|yes) )?exit=[0-9-]+( a[0-3]=[0-9a-f]+)* items=[0-9]+ (ppid=[0-9]+ )?pid=[0-9]+ (loginuid=[0-9-]+ )?(auid=[0-9]+ )?uid=[0-9]+ gid=[0-9]+ euid=[0-9]+ suid=[0-9]+ fsuid=[0-9]+ egid=[0-9]+ sgid=[0-9]+ fsgid=[0-9]+/) or
 	( $ThisLine =~ /Audit daemon rotating log files/) or
 	( $ThisLine =~ /audit_backlog_limit=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
 	( $ThisLine =~ /SELinux:  unrecognized netlink message type=[0-9]+ for sclass=[0-9]+/) or
@@ -83,7 +83,8 @@ while ($ThisLine = <STDIN>) {
 	( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): (selinux=[0-9]+|auid=[0-9]+|prom=[0-9]+|old_prom=[0-9]+|dev=[^ ]+| )+$/) or
         ( $ThisLine =~ /auditd[ ]+S [0-9A-F]+  [0-9]+  [0-9]+[ ]+[0-9]([ ]*[0-9]+[ ]*|[ ]*)[0-9]+  [0-9]+ \(NOTLB\)/) or
         ( $ThisLine =~ /Started dispatcher: \/sbin\/audispd pid: [0-9]+/) or
-        ( $ThisLine =~ /audit\([0-9.]*:[0-9]*\): bool=.* val=.* old_val=.* auid=[0-9]*/)
+        ( $ThisLine =~ /audit\([0-9.]*:[0-9]*\): bool=.* val=.* old_val=.* auid=[0-9]*/) or
+        ( $ThisLine =~ /item=[0-9] name="\S*" inode=[0-9]+ dev=\S* mode=[0-9]* ouid=[0-9]* ogid=[0-9]* rdev=[0-9:]* obj=\S*/)
     ) { 
 	# Ignore these entries
     } elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) {

logwatch-7.3.6-dhcpd.patch:
 dhcpd |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE logwatch-7.3.6-dhcpd.patch ---
diff -up logwatch-7.3.6/scripts/services/dhcpd.p logwatch-7.3.6/scripts/services/dhcpd
--- logwatch-7.3.6/scripts/services/dhcpd.p	2006-10-20 23:12:27.000000000 +0200
+++ logwatch-7.3.6/scripts/services/dhcpd	2009-11-03 14:15:43.000000000 +0100
@@ -127,6 +127,10 @@ while (my $line = <STDIN>) {
       if ($Detail >= 3) {
          $data{'Warnings'}{$line}++;
       }
+   } elsif ($line =~ s/uid lease ([\d.]*) for client ([^ ]*) is duplicate on ([^ ]*)/uid lease $1 for client $2 is duplicate/) {
+      if ($Detail >= 3) {
+         $data{'Duplicate lease'}{$line}++;
+      }
    } else {
       $data{'Unknown Entries'}{$line}++;
    }

logwatch-7.3.6-dovecot2.patch:
 dovecot |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE logwatch-7.3.6-dovecot2.patch ---
diff -up logwatch-7.3.6/scripts/services/dovecot.pom logwatch-7.3.6/scripts/services/dovecot
--- logwatch-7.3.6/scripts/services/dovecot.pom	2009-10-12 12:48:21.000000000 +0200
+++ logwatch-7.3.6/scripts/services/dovecot	2009-10-12 13:19:04.000000000 +0200
@@ -103,6 +103,8 @@ while (defined($ThisLine = <STDIN>)) {
       $Disconnected{"no reason"}++;
    } elsif (($Reason) = ($ThisLine =~ /Disconnected: (.*) \[/) ) {
       $Disconnected{$Reason}++;
+   } elsif (($Reason) = ($ThisLine =~ /Disconnected \((.*)\):/) ) {
+      $Disconnected{$Reason}++;
    } elsif (($Reason, $Host) = ($ThisLine =~ /TLS initialization failed/) ) {
       $TLSInitFail++;
    } elsif (($Host) = ($ThisLine =~ /Aborted login \[(.*)\]/)) {
@@ -135,6 +137,9 @@ while (defined($ThisLine = <STDIN>)) {
    } elsif (($Error) = ($ThisLine =~ /child \d* \(login\) returned error (.*)/)) {      
    # dovecot: child 23747 (login) returned error 89
       $ChildErr{$Error}++;
+   } elsif (($Name) = ($ThisLine =~ /dovecot: IMAP\((.*)\): .*(.*) failed: Disk quota exceeded/)) {
+   # dovecot: IMAP(podracka): mkdir(/home/LF/KLINIKY/podracka/mail/.imap/saved-messages) failed: Disk quota exceeded
+      $DiskQuotaExceed{$Name}++;
    } else {
       # Report any unmatched entries...
       chomp($ThisLine);
@@ -261,6 +266,13 @@ if ($TLSInitFail > 0) {
    print "\n\nTLS Initialization failed $TLSInitFail Time(s)";
 }
 
+if (keys %DiskQuotaExceed) {
+   print "\n\nDisk quota exceeded:";
+   foreach my $Name (sort keys %DiskQuotaExceed) {
+      print "\n   disk quota for user '". $Name . "' exceeded: ". $DiskQuotaExceed{$Name} ." Time(s)";
+   }
+}
+
 if (keys %OtherList) {
    print "\n\n**Unmatched Entries**\n";
    foreach $line (sort {$a cmp $b} keys %OtherList) {

logwatch-7.3.6-named6.patch:
 named |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-named6.patch ---
diff -up logwatch-7.3.6/scripts/services/named.named6 logwatch-7.3.6/scripts/services/named
--- logwatch-7.3.6/scripts/services/named.named6	2009-12-16 15:04:47.000000000 +0100
+++ logwatch-7.3.6/scripts/services/named	2009-12-16 15:08:25.836379108 +0100
@@ -190,7 +190,10 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /using default UDP\/IPv[46] port range: \[[0-9]*, [0-9]*\]/) or
       ($ThisLine =~ /adjusted limit on open files from [0-9]* to [0-9]*/) or
       ($ThisLine =~ /using up to [0-9]* sockets/) or
-      ($ThisLine =~ /built with/)
+      ($ThisLine =~ /built with/) or
+      ($ThisLine =~ /'.*': TTL differs in rdataset, adjusting [0-9]* -> [0-9]*/) or
+      ($ThisLine =~ /max open files \([0-9]*\) is smaller than max sockets \([0-9]*\)/) or
+      ($ThisLine =~ /clients-per-query decreased to .*/)
       # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s)
    ) {
       # Don't care about these...

logwatch-7.3.6-openvpn4.patch:
 openvpn |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-openvpn4.patch ---
diff -up logwatch-7.3.6/scripts/services/openvpn.pom logwatch-7.3.6/scripts/services/openvpn
--- logwatch-7.3.6/scripts/services/openvpn.pom	2009-10-12 14:51:50.000000000 +0200
+++ logwatch-7.3.6/scripts/services/openvpn	2009-10-12 14:51:25.000000000 +0200
@@ -71,7 +71,7 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /^TLS: soft reset/) or
       ($ThisLine =~ /^TLS: tls_process: killed expiring key$/) or
       ($ThisLine =~ /^TLS: move_session: dest=.* src=.* reinit_src=[0-9]*/) or
-      ($ThisLine =~ /^TLS: tls_multi_process: untrusted session promoted to trusted/) or
+      ($ThisLine =~ /^TLS: tls_multi_process: untrusted session promoted to (semi-)?trusted/) or
       ($ThisLine =~ /^TLS: new session incoming connection from .*/) or
       ($ThisLine =~ /^TUN\/TAP device \w+ opened/) or
       ($ThisLine =~ /^UDPv4 link /) or
@@ -81,6 +81,11 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /TUN\/TAP TX queue length set to [0-9]*/) or
       ($ThisLine =~ /Socket Buffers: R=\[[0-9]+->[0-9]+\] S=\[[0-9]+->[0-9]+\]/) or
       ($ThisLine =~ /OpenVPN .* built on [A-Z][a-z]{2} [ 12]?[0-9] [0-9]{4}/) or
+      ($ThisLine =~ /CRL CHECK OK: \/.*\//) or
+      ($ThisLine =~ /TLS: tls_multi_process: killed expiring key/) or
+      ($ThisLine =~ /read UDPv4 \[.*\]: No route to host \(code=[0-9]*\)/) or
+      ($ThisLine =~ /TLS Error: TLS object -> incoming plaintext read error/) or
+      ($ThisLine =~ /TLS ERROR: received control packet with stale session-id=.*/) or
       ($ThisLine =~ /Authenticate\/Decrypt packet error: bad packet ID \(may be a replay\): \[ #.* \] -- see the man page entry for --no-replay and --replay-window for more info or silence this warning with --mute-replay-warnings/)
    ) {
       # Don't care about these...

logwatch-7.3.6-pam_unix4.patch:
 pam_unix |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

--- NEW FILE logwatch-7.3.6-pam_unix4.patch ---
diff -up logwatch-7.3.6/scripts/services/pam_unix.pom logwatch-7.3.6/scripts/services/pam_unix
--- logwatch-7.3.6/scripts/services/pam_unix.pom	2009-10-12 14:55:08.000000000 +0200
+++ logwatch-7.3.6/scripts/services/pam_unix	2009-10-12 15:06:46.000000000 +0200
@@ -204,6 +204,8 @@ while ($line = <STDIN>) {
    } elsif ($service eq 'dovecot') {
       if ($line =~ s/^authentication failure; .*user=(.+)$/$1/) {
 		   $data{$service}{'Authentication Failures'}{$line}++;
+           } elsif ($line =~ /check pass; user unknown/) {
+                   $data{$service}{'Invalid Users'}{'Unknown Account'}++;
 	   } else {
 		   $data{$service}{'Unknown Entries'}{$line}++;
 	   }
@@ -225,11 +227,13 @@ while ($line = <STDIN>) {
       } else {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
-   } elsif ($service eq 'pure-ftpd') {
+   } elsif (($service eq 'pure-ftpd') || ($service eq 'vsftpd')){
       if ($line =~ s/^session opened for user (.+)/$1/) {
          $data{$service}{'Sessions Opened'}{$line}++;
       } elsif ($line =~ s/^check pass; (.+)/$1/) {
          $data{$service}{'Password Failures'}{$line}++;
+      } elsif ($line =~ s/^authentication failure; .*user=(.+)$/$1/) {
+         $data{$service}{'Authentication Failures'}{$line}++;
       } else {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
@@ -255,7 +259,7 @@ while ($line = <STDIN>) {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
    } elsif (($service eq 'samba') or ($service eq 'smbd')) {
-      if ($line =~ s/^session opened for user ([a-zA-Z\d]+) by (.+)/$1/) {
+      if ($line =~ s/^session opened for user (\S+) by (.+)/$1/) {
          ($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
       } elsif ($line =~ s/^session closed for user (.+)/$1/) {
          ($Detail >= 8) && $data{$service}{'Sessions Closed'}{$line}++;
@@ -297,7 +301,16 @@ while ($line = <STDIN>) {
       } else {
            $data{$service}{'Unknown Entries'}{$line}++;
       }
-
+   } elsif ($service eq 'smtp') {
+     if ($line =~ s/^authentication failure; logname=(\S*) uid=(\d+).*user=(\S*)$/$1($2) -> $3/) {
+        $data{$service}{'Authentication Failures'}{$line}++;
+     } elsif ($line =~ /authentication failure; logname= uid=0 euid=0 tty= ruser= rhost=/) {
+              # ignore this line
+     } elsif ($line =~ /check pass; user unknown/) {
+              $data{$service}{'Invalid Users'}{'Unknown Account'}++;
+     } else  {
+        $data{$service}{'Unknown Entries'}{$line}++;
+     }
    } else {
          $data{$service}{'Unknown Entries'}{$line}++;
    }

logwatch-7.3.6-secure3.patch:
 secure |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE logwatch-7.3.6-secure3.patch ---
diff -up logwatch-7.3.6/scripts/services/secure.pom logwatch-7.3.6/scripts/services/secure
--- logwatch-7.3.6/scripts/services/secure.pom	2009-10-12 11:33:15.000000000 +0200
+++ logwatch-7.3.6/scripts/services/secure	2009-10-12 12:38:29.000000000 +0200
@@ -435,6 +435,9 @@ while (defined($ThisLine = <STDIN>)) {
    } elsif ( ($User) = ($ThisLine =~ /useradd.*failed adding user `(.*)', data deleted/) ) {# failed adding user/)) {# (.*), data deleted/)) { 
       # useradd: failed adding user `rpcuser', data deleted 
       $FailedAddUsers{$User}++;
+   } elsif (($User,$Reason) = ($ThisLine =~ /dovecot-auth: pam_userdb\(dovecot:auth\): user `(.*)' denied access \((.*)\)/)) {
+      # dovecot-auth: pam_userdb(dovecot:auth): user `bobok' denied access (incorrect password)
+      $DeniedAccess{"$User,$Reason"}++;
    } else {
       # Unmatched entries...
       $ThisLine =~ s/\[\d+\]:/:/;
@@ -535,6 +538,7 @@ if (keys %UnknownUser) {
 if ($pwd_file_unknown > 0) {
    print "\nUsers unknown in password database (pwd_file): $pwd_file_unknown\n";
 }
+
 if ($pwd_file_too_short > 0) {
    print "\nPassword too short or NULL (pwd_file): $pwd_file_too_short Time(s)\n";
 }
@@ -594,6 +598,14 @@ if (keys %{$FailedSaver}) {
    }
 }
 
+if (keys %DeniedAccess) {
+   print "\ndovecot-auth: Denied access\n";
+   foreach (keys %DeniedAccess) {
+      ($User,$Reason) = split ",";
+      print "   for user " . $User . " (reason: " . $Reason . ") :" . $DeniedAccess{"$User,$Reason"} . " Time(s)\n";
+   }
+}
+
 if (keys %NoIP) {
    print "\nCouldn't get client IPs for connections to:\n";
    foreach $ThisOne (sort {$a cmp $b} keys %NoIP) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- logwatch.spec	16 Dec 2009 11:20:03 -0000	1.120
+++ logwatch.spec	16 Dec 2009 15:41:22 -0000	1.121
@@ -58,6 +58,13 @@ Patch57: logwatch-7.3.6-named5.patch
 Patch58: logwatch-7.3.6-iptables.patch
 # Not sent to upstream.
 Patch59: logwatch-7.3.6-lost-connection.patch
+Patch60: logwatch-7.3.6-secure3.patch
+Patch61: logwatch-7.3.6-audit4.patch
+Patch62: logwatch-7.3.6-dovecot2.patch
+Patch63: logwatch-7.3.6-openvpn4.patch
+Patch64: logwatch-7.3.6-pam_unix4.patch
+Patch65: logwatch-7.3.6-dhcpd.patch
+Patch66: logwatch-7.3.6-named6.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -121,6 +128,13 @@ of the package on many systems.
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -247,6 +261,10 @@ rm -rf %{buildroot}
 * Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-49
 - Add 802.1q subinterface support to iptables report; iptables.patch (#507743)
 - Fixed error in the RE that matches "lost connection" lines in postfix script; lost-connection.patch (#525903)
+- Added patches parsing several unmatched entries (from F-10);
+  audit4.patch modified to make ppid optional; 
+  openvpn4.patch modified to make "semi-" optional;
+  pam_unix4.patch modified (user name matched by \S+)
 
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-48
 - parse a few unmatched entries in named script (#513853)



From xhorak at fedoraproject.org  Wed Dec 16 15:42:22 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:42:22 +0000 (UTC)
Subject: rpms/mozvoikko/F-11 mozvoikko.spec,1.16,1.17
Message-ID: <20091216154222.E094E11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5213

Modified Files:
	mozvoikko.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.10.rc1
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-11/mozvoikko.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mozvoikko.spec	5 Nov 2009 19:04:41 -0000	1.16
+++ mozvoikko.spec	16 Dec 2009 15:42:22 -0000	1.17
@@ -5,7 +5,7 @@
 # update this package to 1.0.
 
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.5
+%define gecko_ver 1.9.1.6
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -18,7 +18,7 @@
 
 Name:           mozvoikko
 Version:        0.9.7
-Release:        0.9.rc1%{?dist}
+Release:        0.10.rc1%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.10.rc1
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.9.rc1
 - Rebuild against newer gecko
 



From tgl at fedoraproject.org  Wed Dec 16 15:43:46 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 16 Dec 2009 15:43:46 +0000 (UTC)
Subject: File postgresql-8.3.9.tar.bz2 uploaded to lookaside cache by tgl
Message-ID: <20091216154346.2B0CE28ECEF@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for postgresql:

e120b001354851b5df26cbee8c2786d5  postgresql-8.3.9.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 15:43:52 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:43:52 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11 ruby-gnome2.spec,1.51,1.52
Message-ID: <20091216154352.704D211C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/ruby-gnome2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5588

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.19.3-4.1
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/F-11/ruby-gnome2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ruby-gnome2.spec	5 Nov 2009 19:06:35 -0000	1.51
+++ ruby-gnome2.spec	16 Dec 2009 15:43:52 -0000	1.52
@@ -8,7 +8,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                4
+%define         mainrel                5
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -1097,6 +1097,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.19.3-5
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.19.3-4
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 15:44:48 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:44:48 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-11 perl-Gtk2-MozEmbed.spec,1.10,1.11
Message-ID: <20091216154448.9C91B11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5868

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.8
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-11/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Gtk2-MozEmbed.spec	5 Nov 2009 19:07:21 -0000	1.10
+++ perl-Gtk2-MozEmbed.spec	16 Dec 2009 15:44:48 -0000	1.11
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.5
+%define gecko_version 1.9.1.6
 %else
 %define gecko_version 1.9.0.6
 %endif
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}.7
+Release:       %{specfilever}%{?dist}.8
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.8
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.7
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 15:45:38 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:45:38 +0000 (UTC)
Subject: rpms/yelp/F-11 yelp.spec,1.163,1.164
Message-ID: <20091216154538.3ACF211C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/yelp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6119

Modified Files:
	yelp.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-10
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-11/yelp.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- yelp.spec	5 Nov 2009 19:10:26 -0000	1.163
+++ yelp.spec	16 Dec 2009 15:45:37 -0000	1.164
@@ -11,7 +11,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9.1.5
+%define gecko_version 1.9.1.6
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -19,7 +19,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Version: 2.26.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.26/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -148,6 +148,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-10
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-9
 - Rebuild against newer gecko
 



From tgl at fedoraproject.org  Wed Dec 16 15:46:27 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 16 Dec 2009 15:46:27 +0000 (UTC)
Subject: File postgresql-8.3.9-US.pdf uploaded to lookaside cache by tgl
Message-ID: <20091216154627.9258628ED19@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for postgresql:

f20bcf385ebc49fd4d8e4a2f12d19561  postgresql-8.3.9-US.pdf



From kklic at fedoraproject.org  Wed Dec 16 15:50:06 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 15:50:06 +0000 (UTC)
Subject: rpms/logwatch/F-12 logwatch-7.3.6-audit4.patch, NONE,
	1.1 logwatch-7.3.6-dhcpd.patch, NONE,
	1.1 logwatch-7.3.6-dovecot2.patch, NONE,
	1.1 logwatch-7.3.6-named6.patch, NONE,
	1.1 logwatch-7.3.6-openvpn4.patch, NONE,
	1.1 logwatch-7.3.6-pam_unix4.patch, NONE,
	1.1 logwatch-7.3.6-secure3.patch, NONE, 1.1 logwatch.spec, 1.120,
	1.121
Message-ID: <20091216155006.6B25111C02CA@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7214

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-audit4.patch logwatch-7.3.6-dhcpd.patch 
	logwatch-7.3.6-dovecot2.patch logwatch-7.3.6-named6.patch 
	logwatch-7.3.6-openvpn4.patch logwatch-7.3.6-pam_unix4.patch 
	logwatch-7.3.6-secure3.patch 
Log Message:
added patches from F10 parsing several unmatched entries

logwatch-7.3.6-audit4.patch:
 audit |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3.6-audit4.patch ---
diff -up logwatch-7.3.6/scripts/services/audit.pom logwatch-7.3.6/scripts/services/audit
--- logwatch-7.3.6/scripts/services/audit.pom	2009-10-12 12:42:39.000000000 +0200
+++ logwatch-7.3.6/scripts/services/audit	2009-10-12 12:47:19.000000000 +0200
@@ -70,7 +70,7 @@ while ($ThisLine = <STDIN>) {
     chomp($ThisLine);
     if (( $ThisLine =~ /initializing netlink socket \(disabled\)/) or 
 	( $ThisLine =~ /audit_pid=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
-	( $ThisLine =~ /(arch=[0-9]+ )?syscall=[0-9]+ (success=(no|yes) )?exit=[0-9-]+( a[0-3]=[0-9a-f]+)* items=[0-9]+ pid=[0-9]+ (loginuid=[0-9-]+ )?(auid=[0-9]+ )?uid=[0-9]+ gid=[0-9]+ euid=[0-9]+ suid=[0-9]+ fsuid=[0-9]+ egid=[0-9]+ sgid=[0-9]+ fsgid=[0-9]+/) or
+	( $ThisLine =~ /(arch=[0-9]+ )?syscall=[0-9]+ (success=(no|yes) )?exit=[0-9-]+( a[0-3]=[0-9a-f]+)* items=[0-9]+ (ppid=[0-9]+ )?pid=[0-9]+ (loginuid=[0-9-]+ )?(auid=[0-9]+ )?uid=[0-9]+ gid=[0-9]+ euid=[0-9]+ suid=[0-9]+ fsuid=[0-9]+ egid=[0-9]+ sgid=[0-9]+ fsgid=[0-9]+/) or
 	( $ThisLine =~ /Audit daemon rotating log files/) or
 	( $ThisLine =~ /audit_backlog_limit=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
 	( $ThisLine =~ /SELinux:  unrecognized netlink message type=[0-9]+ for sclass=[0-9]+/) or
@@ -83,7 +83,8 @@ while ($ThisLine = <STDIN>) {
 	( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): (selinux=[0-9]+|auid=[0-9]+|prom=[0-9]+|old_prom=[0-9]+|dev=[^ ]+| )+$/) or
         ( $ThisLine =~ /auditd[ ]+S [0-9A-F]+  [0-9]+  [0-9]+[ ]+[0-9]([ ]*[0-9]+[ ]*|[ ]*)[0-9]+  [0-9]+ \(NOTLB\)/) or
         ( $ThisLine =~ /Started dispatcher: \/sbin\/audispd pid: [0-9]+/) or
-        ( $ThisLine =~ /audit\([0-9.]*:[0-9]*\): bool=.* val=.* old_val=.* auid=[0-9]*/)
+        ( $ThisLine =~ /audit\([0-9.]*:[0-9]*\): bool=.* val=.* old_val=.* auid=[0-9]*/) or
+        ( $ThisLine =~ /item=[0-9] name="\S*" inode=[0-9]+ dev=\S* mode=[0-9]* ouid=[0-9]* ogid=[0-9]* rdev=[0-9:]* obj=\S*/)
     ) { 
 	# Ignore these entries
     } elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) {

logwatch-7.3.6-dhcpd.patch:
 dhcpd |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE logwatch-7.3.6-dhcpd.patch ---
diff -up logwatch-7.3.6/scripts/services/dhcpd.p logwatch-7.3.6/scripts/services/dhcpd
--- logwatch-7.3.6/scripts/services/dhcpd.p	2006-10-20 23:12:27.000000000 +0200
+++ logwatch-7.3.6/scripts/services/dhcpd	2009-11-03 14:15:43.000000000 +0100
@@ -127,6 +127,10 @@ while (my $line = <STDIN>) {
       if ($Detail >= 3) {
          $data{'Warnings'}{$line}++;
       }
+   } elsif ($line =~ s/uid lease ([\d.]*) for client ([^ ]*) is duplicate on ([^ ]*)/uid lease $1 for client $2 is duplicate/) {
+      if ($Detail >= 3) {
+         $data{'Duplicate lease'}{$line}++;
+      }
    } else {
       $data{'Unknown Entries'}{$line}++;
    }

logwatch-7.3.6-dovecot2.patch:
 dovecot |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE logwatch-7.3.6-dovecot2.patch ---
diff -up logwatch-7.3.6/scripts/services/dovecot.pom logwatch-7.3.6/scripts/services/dovecot
--- logwatch-7.3.6/scripts/services/dovecot.pom	2009-10-12 12:48:21.000000000 +0200
+++ logwatch-7.3.6/scripts/services/dovecot	2009-10-12 13:19:04.000000000 +0200
@@ -103,6 +103,8 @@ while (defined($ThisLine = <STDIN>)) {
       $Disconnected{"no reason"}++;
    } elsif (($Reason) = ($ThisLine =~ /Disconnected: (.*) \[/) ) {
       $Disconnected{$Reason}++;
+   } elsif (($Reason) = ($ThisLine =~ /Disconnected \((.*)\):/) ) {
+      $Disconnected{$Reason}++;
    } elsif (($Reason, $Host) = ($ThisLine =~ /TLS initialization failed/) ) {
       $TLSInitFail++;
    } elsif (($Host) = ($ThisLine =~ /Aborted login \[(.*)\]/)) {
@@ -135,6 +137,9 @@ while (defined($ThisLine = <STDIN>)) {
    } elsif (($Error) = ($ThisLine =~ /child \d* \(login\) returned error (.*)/)) {      
    # dovecot: child 23747 (login) returned error 89
       $ChildErr{$Error}++;
+   } elsif (($Name) = ($ThisLine =~ /dovecot: IMAP\((.*)\): .*(.*) failed: Disk quota exceeded/)) {
+   # dovecot: IMAP(podracka): mkdir(/home/LF/KLINIKY/podracka/mail/.imap/saved-messages) failed: Disk quota exceeded
+      $DiskQuotaExceed{$Name}++;
    } else {
       # Report any unmatched entries...
       chomp($ThisLine);
@@ -261,6 +266,13 @@ if ($TLSInitFail > 0) {
    print "\n\nTLS Initialization failed $TLSInitFail Time(s)";
 }
 
+if (keys %DiskQuotaExceed) {
+   print "\n\nDisk quota exceeded:";
+   foreach my $Name (sort keys %DiskQuotaExceed) {
+      print "\n   disk quota for user '". $Name . "' exceeded: ". $DiskQuotaExceed{$Name} ." Time(s)";
+   }
+}
+
 if (keys %OtherList) {
    print "\n\n**Unmatched Entries**\n";
    foreach $line (sort {$a cmp $b} keys %OtherList) {

logwatch-7.3.6-named6.patch:
 named |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-named6.patch ---
diff -up logwatch-7.3.6/scripts/services/named.named6 logwatch-7.3.6/scripts/services/named
--- logwatch-7.3.6/scripts/services/named.named6	2009-12-16 15:04:47.000000000 +0100
+++ logwatch-7.3.6/scripts/services/named	2009-12-16 15:08:25.836379108 +0100
@@ -190,7 +190,10 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /using default UDP\/IPv[46] port range: \[[0-9]*, [0-9]*\]/) or
       ($ThisLine =~ /adjusted limit on open files from [0-9]* to [0-9]*/) or
       ($ThisLine =~ /using up to [0-9]* sockets/) or
-      ($ThisLine =~ /built with/)
+      ($ThisLine =~ /built with/) or
+      ($ThisLine =~ /'.*': TTL differs in rdataset, adjusting [0-9]* -> [0-9]*/) or
+      ($ThisLine =~ /max open files \([0-9]*\) is smaller than max sockets \([0-9]*\)/) or
+      ($ThisLine =~ /clients-per-query decreased to .*/)
       # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s)
    ) {
       # Don't care about these...

logwatch-7.3.6-openvpn4.patch:
 openvpn |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-openvpn4.patch ---
diff -up logwatch-7.3.6/scripts/services/openvpn.pom logwatch-7.3.6/scripts/services/openvpn
--- logwatch-7.3.6/scripts/services/openvpn.pom	2009-10-12 14:51:50.000000000 +0200
+++ logwatch-7.3.6/scripts/services/openvpn	2009-10-12 14:51:25.000000000 +0200
@@ -71,7 +71,7 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /^TLS: soft reset/) or
       ($ThisLine =~ /^TLS: tls_process: killed expiring key$/) or
       ($ThisLine =~ /^TLS: move_session: dest=.* src=.* reinit_src=[0-9]*/) or
-      ($ThisLine =~ /^TLS: tls_multi_process: untrusted session promoted to trusted/) or
+      ($ThisLine =~ /^TLS: tls_multi_process: untrusted session promoted to (semi-)?trusted/) or
       ($ThisLine =~ /^TLS: new session incoming connection from .*/) or
       ($ThisLine =~ /^TUN\/TAP device \w+ opened/) or
       ($ThisLine =~ /^UDPv4 link /) or
@@ -81,6 +81,11 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /TUN\/TAP TX queue length set to [0-9]*/) or
       ($ThisLine =~ /Socket Buffers: R=\[[0-9]+->[0-9]+\] S=\[[0-9]+->[0-9]+\]/) or
       ($ThisLine =~ /OpenVPN .* built on [A-Z][a-z]{2} [ 12]?[0-9] [0-9]{4}/) or
+      ($ThisLine =~ /CRL CHECK OK: \/.*\//) or
+      ($ThisLine =~ /TLS: tls_multi_process: killed expiring key/) or
+      ($ThisLine =~ /read UDPv4 \[.*\]: No route to host \(code=[0-9]*\)/) or
+      ($ThisLine =~ /TLS Error: TLS object -> incoming plaintext read error/) or
+      ($ThisLine =~ /TLS ERROR: received control packet with stale session-id=.*/) or
       ($ThisLine =~ /Authenticate\/Decrypt packet error: bad packet ID \(may be a replay\): \[ #.* \] -- see the man page entry for --no-replay and --replay-window for more info or silence this warning with --mute-replay-warnings/)
    ) {
       # Don't care about these...

logwatch-7.3.6-pam_unix4.patch:
 pam_unix |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

--- NEW FILE logwatch-7.3.6-pam_unix4.patch ---
diff -up logwatch-7.3.6/scripts/services/pam_unix.pom logwatch-7.3.6/scripts/services/pam_unix
--- logwatch-7.3.6/scripts/services/pam_unix.pom	2009-10-12 14:55:08.000000000 +0200
+++ logwatch-7.3.6/scripts/services/pam_unix	2009-10-12 15:06:46.000000000 +0200
@@ -204,6 +204,8 @@ while ($line = <STDIN>) {
    } elsif ($service eq 'dovecot') {
       if ($line =~ s/^authentication failure; .*user=(.+)$/$1/) {
 		   $data{$service}{'Authentication Failures'}{$line}++;
+           } elsif ($line =~ /check pass; user unknown/) {
+                   $data{$service}{'Invalid Users'}{'Unknown Account'}++;
 	   } else {
 		   $data{$service}{'Unknown Entries'}{$line}++;
 	   }
@@ -225,11 +227,13 @@ while ($line = <STDIN>) {
       } else {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
-   } elsif ($service eq 'pure-ftpd') {
+   } elsif (($service eq 'pure-ftpd') || ($service eq 'vsftpd')){
       if ($line =~ s/^session opened for user (.+)/$1/) {
          $data{$service}{'Sessions Opened'}{$line}++;
       } elsif ($line =~ s/^check pass; (.+)/$1/) {
          $data{$service}{'Password Failures'}{$line}++;
+      } elsif ($line =~ s/^authentication failure; .*user=(.+)$/$1/) {
+         $data{$service}{'Authentication Failures'}{$line}++;
       } else {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
@@ -255,7 +259,7 @@ while ($line = <STDIN>) {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
    } elsif (($service eq 'samba') or ($service eq 'smbd')) {
-      if ($line =~ s/^session opened for user ([a-zA-Z\d]+) by (.+)/$1/) {
+      if ($line =~ s/^session opened for user (\S+) by (.+)/$1/) {
          ($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
       } elsif ($line =~ s/^session closed for user (.+)/$1/) {
          ($Detail >= 8) && $data{$service}{'Sessions Closed'}{$line}++;
@@ -297,7 +301,16 @@ while ($line = <STDIN>) {
       } else {
            $data{$service}{'Unknown Entries'}{$line}++;
       }
-
+   } elsif ($service eq 'smtp') {
+     if ($line =~ s/^authentication failure; logname=(\S*) uid=(\d+).*user=(\S*)$/$1($2) -> $3/) {
+        $data{$service}{'Authentication Failures'}{$line}++;
+     } elsif ($line =~ /authentication failure; logname= uid=0 euid=0 tty= ruser= rhost=/) {
+              # ignore this line
+     } elsif ($line =~ /check pass; user unknown/) {
+              $data{$service}{'Invalid Users'}{'Unknown Account'}++;
+     } else  {
+        $data{$service}{'Unknown Entries'}{$line}++;
+     }
    } else {
          $data{$service}{'Unknown Entries'}{$line}++;
    }

logwatch-7.3.6-secure3.patch:
 secure |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE logwatch-7.3.6-secure3.patch ---
diff -up logwatch-7.3.6/scripts/services/secure.pom logwatch-7.3.6/scripts/services/secure
--- logwatch-7.3.6/scripts/services/secure.pom	2009-10-12 11:33:15.000000000 +0200
+++ logwatch-7.3.6/scripts/services/secure	2009-10-12 12:38:29.000000000 +0200
@@ -435,6 +435,9 @@ while (defined($ThisLine = <STDIN>)) {
    } elsif ( ($User) = ($ThisLine =~ /useradd.*failed adding user `(.*)', data deleted/) ) {# failed adding user/)) {# (.*), data deleted/)) { 
       # useradd: failed adding user `rpcuser', data deleted 
       $FailedAddUsers{$User}++;
+   } elsif (($User,$Reason) = ($ThisLine =~ /dovecot-auth: pam_userdb\(dovecot:auth\): user `(.*)' denied access \((.*)\)/)) {
+      # dovecot-auth: pam_userdb(dovecot:auth): user `bobok' denied access (incorrect password)
+      $DeniedAccess{"$User,$Reason"}++;
    } else {
       # Unmatched entries...
       $ThisLine =~ s/\[\d+\]:/:/;
@@ -535,6 +538,7 @@ if (keys %UnknownUser) {
 if ($pwd_file_unknown > 0) {
    print "\nUsers unknown in password database (pwd_file): $pwd_file_unknown\n";
 }
+
 if ($pwd_file_too_short > 0) {
    print "\nPassword too short or NULL (pwd_file): $pwd_file_too_short Time(s)\n";
 }
@@ -594,6 +598,14 @@ if (keys %{$FailedSaver}) {
    }
 }
 
+if (keys %DeniedAccess) {
+   print "\ndovecot-auth: Denied access\n";
+   foreach (keys %DeniedAccess) {
+      ($User,$Reason) = split ",";
+      print "   for user " . $User . " (reason: " . $Reason . ") :" . $DeniedAccess{"$User,$Reason"} . " Time(s)\n";
+   }
+}
+
 if (keys %NoIP) {
    print "\nCouldn't get client IPs for connections to:\n";
    foreach $ThisOne (sort {$a cmp $b} keys %NoIP) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/F-12/logwatch.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- logwatch.spec	16 Dec 2009 11:22:56 -0000	1.120
+++ logwatch.spec	16 Dec 2009 15:50:06 -0000	1.121
@@ -54,9 +54,17 @@ Patch54: logwatch-7.3.6-exim2.patch
 Patch55: logwatch-7.3.6-removeservice.patch
 Patch56: logwatch-7.3.6-cron_conf.patch
 Patch57: logwatch-7.3.6-named5.patch
+# Sent to upstream.
 Patch58: logwatch-7.3.6-iptables.patch
 # Not sent to upstream.
 Patch59: logwatch-7.3.6-lost-connection.patch
+Patch60: logwatch-7.3.6-secure3.patch
+Patch61: logwatch-7.3.6-audit4.patch
+Patch62: logwatch-7.3.6-dovecot2.patch
+Patch63: logwatch-7.3.6-openvpn4.patch
+Patch64: logwatch-7.3.6-pam_unix4.patch
+Patch65: logwatch-7.3.6-dhcpd.patch
+Patch66: logwatch-7.3.6-named6.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -120,6 +128,13 @@ of the package on many systems.
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -244,8 +259,12 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-49
-- Add 802.1q subinterface support to iptables report (#507743)
+- Add 802.1q subinterface support to iptables report; iptables.patch (#507743)
 - Fixed error in the RE that matches "lost connection" lines in postfix script; lost-connection.patch (#525903)
+- Added patches parsing several unmatched entries (from F-10);
+  audit4.patch modified to make ppid optional; 
+  openvpn4.patch modified to make "semi-" optional;
+  pam_unix4.patch modified (user name matched by \S+)
 
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-48
 - parse a few unmatched entries in named script (#513853)



From tgl at fedoraproject.org  Wed Dec 16 15:54:32 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 16 Dec 2009 15:54:32 +0000 (UTC)
Subject: rpms/postgresql/F-11 .cvsignore, 1.47,
	1.48 postgresql-ac-version.patch, 1.8, 1.9 postgresql.spec,
	1.113, 1.114 sources, 1.48, 1.49
Message-ID: <20091216155432.5D3A511C0092@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8276

Modified Files:
	.cvsignore postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.3.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	9 Sep 2009 15:57:29 -0000	1.47
+++ .cvsignore	16 Dec 2009 15:54:31 -0000	1.48
@@ -1,5 +1,5 @@
-postgresql-8.3.8.tar.bz2
+postgresql-8.3.9.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.3.8-US.pdf
+postgresql-8.3.9-US.pdf

postgresql-ac-version.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/postgresql-ac-version.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- postgresql-ac-version.patch	9 Sep 2009 15:57:29 -0000	1.8
+++ postgresql-ac-version.patch	16 Dec 2009 15:54:31 -0000	1.9
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenabl
 Dike out the check.
 
 
-diff -Naur postgresql-8.3.8.orig/configure.in postgresql-8.3.8/configure.in
---- postgresql-8.3.8.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.8/configure.in	2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.3.9.orig/configure.in postgresql-8.3.9/configure.in
+--- postgresql-8.3.9.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.9/configure.in	2008-09-25 10:26:10.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.3.8], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.9], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/postgresql.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- postgresql.spec	22 Sep 2009 01:15:12 -0000	1.113
+++ postgresql.spec	16 Dec 2009 15:54:32 -0000	1.114
@@ -83,8 +83,8 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.3.8
-Release: 2%{?dist}
+Version: 8.3.9
+Release: 1%{?dist}
 # PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
@@ -99,7 +99,7 @@ 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.3.8-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.9-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -874,6 +874,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 16 2009 Tom Lane <tgl at redhat.com> 8.3.9-1
+- Update to PostgreSQL 8.3.9, for various fixes described at
+  http://www.postgresql.org/docs/8.3/static/release-8-3-9.html
+  including two security issues
+Related: #546321
+Related: #547662
+
 * Mon Sep 21 2009 Tom Lane <tgl at redhat.com> 8.3.8-2
 - Ensure pgstartup.log gets the right ownership/permissions during initdb
 Resolves: #498959


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	9 Sep 2009 15:57:29 -0000	1.48
+++ sources	16 Dec 2009 15:54:32 -0000	1.49
@@ -1,5 +1,5 @@
-aac683d03f765dc58a3a0e5eaa1927bf  postgresql-8.3.8.tar.bz2
+e120b001354851b5df26cbee8c2786d5  postgresql-8.3.9.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-721628037ec3c47e7c11bd90959578ad  postgresql-8.3.8-US.pdf
+f20bcf385ebc49fd4d8e4a2f12d19561  postgresql-8.3.9-US.pdf



From xhorak at fedoraproject.org  Wed Dec 16 15:54:40 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:54:40 +0000 (UTC)
Subject: File firefox-3.5.6.source.tar.bz2 uploaded to lookaside cache by
	xhorak
Message-ID: <20091216155440.2787A28ECEE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for firefox:

54d73156dfedc6e4981f2a3c46817f9a  firefox-3.5.6.source.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 15:54:58 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 15:54:58 +0000 (UTC)
Subject: File firefox-langpacks-3.5.6-20091216.tar.bz2 uploaded to lookaside
	cache by xhorak
Message-ID: <20091216155458.09B0928ECEB@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for firefox:

96c8808f055742576ddfb75358e80439  firefox-langpacks-3.5.6-20091216.tar.bz2



From rjones at fedoraproject.org  Wed Dec 16 16:02:32 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 16 Dec 2009 16:02:32 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.114,1.115
Message-ID: <20091216160232.BCF5711C0092@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9737

Modified Files:
	libguestfs.spec 
Log Message:
New tool: virt-list-filesystems


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- libguestfs.spec	16 Dec 2009 12:33:47 -0000	1.114
+++ libguestfs.spec	16 Dec 2009 16:02:31 -0000	1.115
@@ -209,6 +209,9 @@ version of the OS, the kernel version, w
 whether the virtual machine is fully virtualized (FV) or
 para-virtualized (PV), what applications are installed and more.
 
+Virt-list-filesystems can be used to list out the filesystems in a
+virtual machine image (for shell scripts etc).
+
 Virt-ls is a command line tool to list out files in a virtual machine.
 
 Virt-rescue provides a rescue shell for making interactive,
@@ -521,6 +524,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-edit.1*
 %{_bindir}/virt-inspector
 %{_mandir}/man1/virt-inspector.1*
+%{_bindir}/virt-list-filesystems
+%{_mandir}/man1/virt-list-filesystems.1*
 %{_bindir}/virt-ls
 %{_mandir}/man1/virt-ls.1*
 %{_bindir}/virt-rescue
@@ -600,6 +605,7 @@ rm -rf $RPM_BUILD_ROOT
 - New upstream release 1.0.80.
 - New Polish translations (RHBZ#502533).
 - Give a meaningful error if no usable kernels are found (RHBZ#539746).
+- New tool: virt-list-filesystems
 
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.0.79-3
 - rebuild against perl 5.10.1



From kklic at fedoraproject.org  Wed Dec 16 16:03:34 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 16:03:34 +0000 (UTC)
Subject: rpms/logwatch/F-11 logwatch-7.3.6-audit4.patch, NONE,
	1.1 logwatch-7.3.6-dhcpd.patch, NONE,
	1.1 logwatch-7.3.6-dovecot2.patch, NONE,
	1.1 logwatch-7.3.6-named6.patch, NONE,
	1.1 logwatch-7.3.6-openvpn4.patch, NONE,
	1.1 logwatch-7.3.6-pam_unix4.patch, NONE,
	1.1 logwatch-7.3.6-secure3.patch, NONE, 1.1 logwatch.spec, 1.116,
	1.117
Message-ID: <20091216160334.9AF4E11C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9951

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-audit4.patch logwatch-7.3.6-dhcpd.patch 
	logwatch-7.3.6-dovecot2.patch logwatch-7.3.6-named6.patch 
	logwatch-7.3.6-openvpn4.patch logwatch-7.3.6-pam_unix4.patch 
	logwatch-7.3.6-secure3.patch 
Log Message:
added patches from F10 parsing several unmatched entries

logwatch-7.3.6-audit4.patch:
 audit |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3.6-audit4.patch ---
diff -up logwatch-7.3.6/scripts/services/audit.pom logwatch-7.3.6/scripts/services/audit
--- logwatch-7.3.6/scripts/services/audit.pom	2009-10-12 12:42:39.000000000 +0200
+++ logwatch-7.3.6/scripts/services/audit	2009-10-12 12:47:19.000000000 +0200
@@ -70,7 +70,7 @@ while ($ThisLine = <STDIN>) {
     chomp($ThisLine);
     if (( $ThisLine =~ /initializing netlink socket \(disabled\)/) or 
 	( $ThisLine =~ /audit_pid=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
-	( $ThisLine =~ /(arch=[0-9]+ )?syscall=[0-9]+ (success=(no|yes) )?exit=[0-9-]+( a[0-3]=[0-9a-f]+)* items=[0-9]+ pid=[0-9]+ (loginuid=[0-9-]+ )?(auid=[0-9]+ )?uid=[0-9]+ gid=[0-9]+ euid=[0-9]+ suid=[0-9]+ fsuid=[0-9]+ egid=[0-9]+ sgid=[0-9]+ fsgid=[0-9]+/) or
+	( $ThisLine =~ /(arch=[0-9]+ )?syscall=[0-9]+ (success=(no|yes) )?exit=[0-9-]+( a[0-3]=[0-9a-f]+)* items=[0-9]+ (ppid=[0-9]+ )?pid=[0-9]+ (loginuid=[0-9-]+ )?(auid=[0-9]+ )?uid=[0-9]+ gid=[0-9]+ euid=[0-9]+ suid=[0-9]+ fsuid=[0-9]+ egid=[0-9]+ sgid=[0-9]+ fsgid=[0-9]+/) or
 	( $ThisLine =~ /Audit daemon rotating log files/) or
 	( $ThisLine =~ /audit_backlog_limit=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or
 	( $ThisLine =~ /SELinux:  unrecognized netlink message type=[0-9]+ for sclass=[0-9]+/) or
@@ -83,7 +83,8 @@ while ($ThisLine = <STDIN>) {
 	( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): (selinux=[0-9]+|auid=[0-9]+|prom=[0-9]+|old_prom=[0-9]+|dev=[^ ]+| )+$/) or
         ( $ThisLine =~ /auditd[ ]+S [0-9A-F]+  [0-9]+  [0-9]+[ ]+[0-9]([ ]*[0-9]+[ ]*|[ ]*)[0-9]+  [0-9]+ \(NOTLB\)/) or
         ( $ThisLine =~ /Started dispatcher: \/sbin\/audispd pid: [0-9]+/) or
-        ( $ThisLine =~ /audit\([0-9.]*:[0-9]*\): bool=.* val=.* old_val=.* auid=[0-9]*/)
+        ( $ThisLine =~ /audit\([0-9.]*:[0-9]*\): bool=.* val=.* old_val=.* auid=[0-9]*/) or
+        ( $ThisLine =~ /item=[0-9] name="\S*" inode=[0-9]+ dev=\S* mode=[0-9]* ouid=[0-9]* ogid=[0-9]* rdev=[0-9:]* obj=\S*/)
     ) { 
 	# Ignore these entries
     } elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) {

logwatch-7.3.6-dhcpd.patch:
 dhcpd |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE logwatch-7.3.6-dhcpd.patch ---
diff -up logwatch-7.3.6/scripts/services/dhcpd.p logwatch-7.3.6/scripts/services/dhcpd
--- logwatch-7.3.6/scripts/services/dhcpd.p	2006-10-20 23:12:27.000000000 +0200
+++ logwatch-7.3.6/scripts/services/dhcpd	2009-11-03 14:15:43.000000000 +0100
@@ -127,6 +127,10 @@ while (my $line = <STDIN>) {
       if ($Detail >= 3) {
          $data{'Warnings'}{$line}++;
       }
+   } elsif ($line =~ s/uid lease ([\d.]*) for client ([^ ]*) is duplicate on ([^ ]*)/uid lease $1 for client $2 is duplicate/) {
+      if ($Detail >= 3) {
+         $data{'Duplicate lease'}{$line}++;
+      }
    } else {
       $data{'Unknown Entries'}{$line}++;
    }

logwatch-7.3.6-dovecot2.patch:
 dovecot |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE logwatch-7.3.6-dovecot2.patch ---
diff -up logwatch-7.3.6/scripts/services/dovecot.pom logwatch-7.3.6/scripts/services/dovecot
--- logwatch-7.3.6/scripts/services/dovecot.pom	2009-10-12 12:48:21.000000000 +0200
+++ logwatch-7.3.6/scripts/services/dovecot	2009-10-12 13:19:04.000000000 +0200
@@ -103,6 +103,8 @@ while (defined($ThisLine = <STDIN>)) {
       $Disconnected{"no reason"}++;
    } elsif (($Reason) = ($ThisLine =~ /Disconnected: (.*) \[/) ) {
       $Disconnected{$Reason}++;
+   } elsif (($Reason) = ($ThisLine =~ /Disconnected \((.*)\):/) ) {
+      $Disconnected{$Reason}++;
    } elsif (($Reason, $Host) = ($ThisLine =~ /TLS initialization failed/) ) {
       $TLSInitFail++;
    } elsif (($Host) = ($ThisLine =~ /Aborted login \[(.*)\]/)) {
@@ -135,6 +137,9 @@ while (defined($ThisLine = <STDIN>)) {
    } elsif (($Error) = ($ThisLine =~ /child \d* \(login\) returned error (.*)/)) {      
    # dovecot: child 23747 (login) returned error 89
       $ChildErr{$Error}++;
+   } elsif (($Name) = ($ThisLine =~ /dovecot: IMAP\((.*)\): .*(.*) failed: Disk quota exceeded/)) {
+   # dovecot: IMAP(podracka): mkdir(/home/LF/KLINIKY/podracka/mail/.imap/saved-messages) failed: Disk quota exceeded
+      $DiskQuotaExceed{$Name}++;
    } else {
       # Report any unmatched entries...
       chomp($ThisLine);
@@ -261,6 +266,13 @@ if ($TLSInitFail > 0) {
    print "\n\nTLS Initialization failed $TLSInitFail Time(s)";
 }
 
+if (keys %DiskQuotaExceed) {
+   print "\n\nDisk quota exceeded:";
+   foreach my $Name (sort keys %DiskQuotaExceed) {
+      print "\n   disk quota for user '". $Name . "' exceeded: ". $DiskQuotaExceed{$Name} ." Time(s)";
+   }
+}
+
 if (keys %OtherList) {
    print "\n\n**Unmatched Entries**\n";
    foreach $line (sort {$a cmp $b} keys %OtherList) {

logwatch-7.3.6-named6.patch:
 named |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-named6.patch ---
diff -up logwatch-7.3.6/scripts/services/named.named6 logwatch-7.3.6/scripts/services/named
--- logwatch-7.3.6/scripts/services/named.named6	2009-12-16 15:04:47.000000000 +0100
+++ logwatch-7.3.6/scripts/services/named	2009-12-16 15:08:25.836379108 +0100
@@ -190,7 +190,10 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /using default UDP\/IPv[46] port range: \[[0-9]*, [0-9]*\]/) or
       ($ThisLine =~ /adjusted limit on open files from [0-9]* to [0-9]*/) or
       ($ThisLine =~ /using up to [0-9]* sockets/) or
-      ($ThisLine =~ /built with/)
+      ($ThisLine =~ /built with/) or
+      ($ThisLine =~ /'.*': TTL differs in rdataset, adjusting [0-9]* -> [0-9]*/) or
+      ($ThisLine =~ /max open files \([0-9]*\) is smaller than max sockets \([0-9]*\)/) or
+      ($ThisLine =~ /clients-per-query decreased to .*/)
       # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s)
    ) {
       # Don't care about these...

logwatch-7.3.6-openvpn4.patch:
 openvpn |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-openvpn4.patch ---
diff -up logwatch-7.3.6/scripts/services/openvpn.pom logwatch-7.3.6/scripts/services/openvpn
--- logwatch-7.3.6/scripts/services/openvpn.pom	2009-10-12 14:51:50.000000000 +0200
+++ logwatch-7.3.6/scripts/services/openvpn	2009-10-12 14:51:25.000000000 +0200
@@ -71,7 +71,7 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /^TLS: soft reset/) or
       ($ThisLine =~ /^TLS: tls_process: killed expiring key$/) or
       ($ThisLine =~ /^TLS: move_session: dest=.* src=.* reinit_src=[0-9]*/) or
-      ($ThisLine =~ /^TLS: tls_multi_process: untrusted session promoted to trusted/) or
+      ($ThisLine =~ /^TLS: tls_multi_process: untrusted session promoted to (semi-)?trusted/) or
       ($ThisLine =~ /^TLS: new session incoming connection from .*/) or
       ($ThisLine =~ /^TUN\/TAP device \w+ opened/) or
       ($ThisLine =~ /^UDPv4 link /) or
@@ -81,6 +81,11 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /TUN\/TAP TX queue length set to [0-9]*/) or
       ($ThisLine =~ /Socket Buffers: R=\[[0-9]+->[0-9]+\] S=\[[0-9]+->[0-9]+\]/) or
       ($ThisLine =~ /OpenVPN .* built on [A-Z][a-z]{2} [ 12]?[0-9] [0-9]{4}/) or
+      ($ThisLine =~ /CRL CHECK OK: \/.*\//) or
+      ($ThisLine =~ /TLS: tls_multi_process: killed expiring key/) or
+      ($ThisLine =~ /read UDPv4 \[.*\]: No route to host \(code=[0-9]*\)/) or
+      ($ThisLine =~ /TLS Error: TLS object -> incoming plaintext read error/) or
+      ($ThisLine =~ /TLS ERROR: received control packet with stale session-id=.*/) or
       ($ThisLine =~ /Authenticate\/Decrypt packet error: bad packet ID \(may be a replay\): \[ #.* \] -- see the man page entry for --no-replay and --replay-window for more info or silence this warning with --mute-replay-warnings/)
    ) {
       # Don't care about these...

logwatch-7.3.6-pam_unix4.patch:
 pam_unix |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

--- NEW FILE logwatch-7.3.6-pam_unix4.patch ---
diff -up logwatch-7.3.6/scripts/services/pam_unix.pom logwatch-7.3.6/scripts/services/pam_unix
--- logwatch-7.3.6/scripts/services/pam_unix.pom	2009-10-12 14:55:08.000000000 +0200
+++ logwatch-7.3.6/scripts/services/pam_unix	2009-10-12 15:06:46.000000000 +0200
@@ -204,6 +204,8 @@ while ($line = <STDIN>) {
    } elsif ($service eq 'dovecot') {
       if ($line =~ s/^authentication failure; .*user=(.+)$/$1/) {
 		   $data{$service}{'Authentication Failures'}{$line}++;
+           } elsif ($line =~ /check pass; user unknown/) {
+                   $data{$service}{'Invalid Users'}{'Unknown Account'}++;
 	   } else {
 		   $data{$service}{'Unknown Entries'}{$line}++;
 	   }
@@ -225,11 +227,13 @@ while ($line = <STDIN>) {
       } else {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
-   } elsif ($service eq 'pure-ftpd') {
+   } elsif (($service eq 'pure-ftpd') || ($service eq 'vsftpd')){
       if ($line =~ s/^session opened for user (.+)/$1/) {
          $data{$service}{'Sessions Opened'}{$line}++;
       } elsif ($line =~ s/^check pass; (.+)/$1/) {
          $data{$service}{'Password Failures'}{$line}++;
+      } elsif ($line =~ s/^authentication failure; .*user=(.+)$/$1/) {
+         $data{$service}{'Authentication Failures'}{$line}++;
       } else {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
@@ -255,7 +259,7 @@ while ($line = <STDIN>) {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
    } elsif (($service eq 'samba') or ($service eq 'smbd')) {
-      if ($line =~ s/^session opened for user ([a-zA-Z\d]+) by (.+)/$1/) {
+      if ($line =~ s/^session opened for user (\S+) by (.+)/$1/) {
          ($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
       } elsif ($line =~ s/^session closed for user (.+)/$1/) {
          ($Detail >= 8) && $data{$service}{'Sessions Closed'}{$line}++;
@@ -297,7 +301,16 @@ while ($line = <STDIN>) {
       } else {
            $data{$service}{'Unknown Entries'}{$line}++;
       }
-
+   } elsif ($service eq 'smtp') {
+     if ($line =~ s/^authentication failure; logname=(\S*) uid=(\d+).*user=(\S*)$/$1($2) -> $3/) {
+        $data{$service}{'Authentication Failures'}{$line}++;
+     } elsif ($line =~ /authentication failure; logname= uid=0 euid=0 tty= ruser= rhost=/) {
+              # ignore this line
+     } elsif ($line =~ /check pass; user unknown/) {
+              $data{$service}{'Invalid Users'}{'Unknown Account'}++;
+     } else  {
+        $data{$service}{'Unknown Entries'}{$line}++;
+     }
    } else {
          $data{$service}{'Unknown Entries'}{$line}++;
    }

logwatch-7.3.6-secure3.patch:
 secure |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE logwatch-7.3.6-secure3.patch ---
diff -up logwatch-7.3.6/scripts/services/secure.pom logwatch-7.3.6/scripts/services/secure
--- logwatch-7.3.6/scripts/services/secure.pom	2009-10-12 11:33:15.000000000 +0200
+++ logwatch-7.3.6/scripts/services/secure	2009-10-12 12:38:29.000000000 +0200
@@ -435,6 +435,9 @@ while (defined($ThisLine = <STDIN>)) {
    } elsif ( ($User) = ($ThisLine =~ /useradd.*failed adding user `(.*)', data deleted/) ) {# failed adding user/)) {# (.*), data deleted/)) { 
       # useradd: failed adding user `rpcuser', data deleted 
       $FailedAddUsers{$User}++;
+   } elsif (($User,$Reason) = ($ThisLine =~ /dovecot-auth: pam_userdb\(dovecot:auth\): user `(.*)' denied access \((.*)\)/)) {
+      # dovecot-auth: pam_userdb(dovecot:auth): user `bobok' denied access (incorrect password)
+      $DeniedAccess{"$User,$Reason"}++;
    } else {
       # Unmatched entries...
       $ThisLine =~ s/\[\d+\]:/:/;
@@ -535,6 +538,7 @@ if (keys %UnknownUser) {
 if ($pwd_file_unknown > 0) {
    print "\nUsers unknown in password database (pwd_file): $pwd_file_unknown\n";
 }
+
 if ($pwd_file_too_short > 0) {
    print "\nPassword too short or NULL (pwd_file): $pwd_file_too_short Time(s)\n";
 }
@@ -594,6 +598,14 @@ if (keys %{$FailedSaver}) {
    }
 }
 
+if (keys %DeniedAccess) {
+   print "\ndovecot-auth: Denied access\n";
+   foreach (keys %DeniedAccess) {
+      ($User,$Reason) = split ",";
+      print "   for user " . $User . " (reason: " . $Reason . ") :" . $DeniedAccess{"$User,$Reason"} . " Time(s)\n";
+   }
+}
+
 if (keys %NoIP) {
    print "\nCouldn't get client IPs for connections to:\n";
    foreach $ThisOne (sort {$a cmp $b} keys %NoIP) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/F-11/logwatch.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- logwatch.spec	16 Dec 2009 11:25:51 -0000	1.116
+++ logwatch.spec	16 Dec 2009 16:03:34 -0000	1.117
@@ -56,6 +56,13 @@ Patch56: logwatch-7.3.6-named5.patch
 Patch57: logwatch-7.3.6-iptables.patch
 # Not sent to upstream.
 Patch58: logwatch-7.3.6-lost-connection.patch
+Patch59: logwatch-7.3.6-secure3.patch
+Patch60: logwatch-7.3.6-audit4.patch
+Patch61: logwatch-7.3.6-dovecot2.patch
+Patch62: logwatch-7.3.6-openvpn4.patch
+Patch63: logwatch-7.3.6-pam_unix4.patch
+Patch64: logwatch-7.3.6-dhcpd.patch
+Patch65: logwatch-7.3.6-named6.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -118,6 +125,13 @@ of the package on many systems.
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
+%patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -232,6 +246,10 @@ rm -rf %{buildroot}
 * Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-45
 - Add 802.1q subinterface support to iptables report (#507743)
 - Fixed error in the RE that matches "lost connection" lines in postfix script; lost-connection.patch (#525903)
+- Added patches parsing several unmatched entries (from F-10);
+  audit4.patch modified to make ppid optional; 
+  openvpn4.patch modified to make "semi-" optional;
+  pam_unix4.patch modified (user name matched by \S+)
 
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-44
 - parse a few unmatched entries in named script (#513853)



From kklic at fedoraproject.org  Wed Dec 16 16:05:15 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 16:05:15 +0000 (UTC)
Subject: rpms/logwatch/F-11 logwatch.spec,1.117,1.118
Message-ID: <20091216160515.ABE1911C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10439

Modified Files:
	logwatch.spec 
Log Message:
version += 1


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/F-11/logwatch.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- logwatch.spec	16 Dec 2009 16:03:34 -0000	1.117
+++ logwatch.spec	16 Dec 2009 16:05:15 -0000	1.118
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 44%{?dist}
+Release: 45%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/



From kkofler at fedoraproject.org  Wed Dec 16 16:05:24 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 16:05:24 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.552,1.553
Message-ID: <20091216160524.3BDD611C0092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10477/devel

Modified Files:
	kdelibs.spec 
Log Message:
s/the KDE/KDE/


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -p -r1.552 -r1.553
--- kdelibs.spec	16 Dec 2009 11:17:12 -0000	1.552
+++ kdelibs.spec	16 Dec 2009 16:05:23 -0000	1.553
@@ -145,7 +145,7 @@ Provides: kdelibs-experimental = %{versi
 Obsoletes: kdelibs-experimental < 4.3.75 
 
 %description
-Libraries for the KDE 4.
+Libraries for KDE 4.
 
 %package common
 Group: System Environment/Libraries



From kkofler at fedoraproject.org  Wed Dec 16 16:06:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 16:06:58 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.174,1.175
Message-ID: <20091216160658.05E0A11C0092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10855/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
s/the KDE/KDE/


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- kdebase-runtime.spec	16 Dec 2009 12:32:59 -0000	1.174
+++ kdebase-runtime.spec	16 Dec 2009 16:06:57 -0000	1.175
@@ -79,7 +79,7 @@ BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 %description
-Core runtime for the KDE 4.
+Core runtime for KDE 4.
 
 
 %package libs



From kklic at fedoraproject.org  Wed Dec 16 16:08:42 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Wed, 16 Dec 2009 16:08:42 +0000 (UTC)
Subject: rpms/logwatch/F-11 logwatch.spec,1.118,1.119
Message-ID: <20091216160842.716AB11C0092@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/logwatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11154

Modified Files:
	logwatch.spec 
Log Message:
Another release version increase


Index: logwatch.spec
===================================================================
RCS file: /cvs/extras/rpms/logwatch/F-11/logwatch.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- logwatch.spec	16 Dec 2009 16:05:15 -0000	1.118
+++ logwatch.spec	16 Dec 2009 16:08:42 -0000	1.119
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 45%{?dist}
+Release: 46%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -243,6 +243,9 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Wed Dec 16 2009 Karel Klic <kklic at redhat.com> 7.3.6-46
+- Release number increased
+
 * Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-45
 - Add 802.1q subinterface support to iptables report (#507743)
 - Fixed error in the RE that matches "lost connection" lines in postfix script; lost-connection.patch (#525903)



From kkofler at fedoraproject.org  Wed Dec 16 16:08:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 16:08:46 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.110,1.111
Message-ID: <20091216160846.9F4C011C0092@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11198/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
s/the KDE/KDE/


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- kdepimlibs.spec	16 Dec 2009 12:46:51 -0000	1.110
+++ kdepimlibs.spec	16 Dec 2009 16:08:46 -0000	1.111
@@ -40,8 +40,7 @@ BuildRequires: qt4-doc
 Conflicts: kdepim < 6:4.2.90
 
 %description
-Personal Information Management (PIM) libraries for the
-KDE 4.
+Personal Information Management (PIM) libraries for KDE 4.
 
 %package devel
 Group:    Development/Libraries



From xhorak at fedoraproject.org  Wed Dec 16 16:09:21 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:09:21 +0000 (UTC)
Subject: rpms/firefox/F-11 .cvsignore, 1.103, 1.104 firefox.spec, 1.340,
	1.341 sources, 1.116, 1.117
Message-ID: <20091216160921.AB04611C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11379

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	5 Nov 2009 15:12:28 -0000	1.103
+++ .cvsignore	16 Dec 2009 16:09:21 -0000	1.104
@@ -4,3 +4,5 @@ firefox-3.5.4-source.tar.bz2
 firefox-langpacks-3.5.4-20091026.tar.bz2
 firefox-3.5.5-source.tar.bz2
 firefox-langpacks-3.5.5-20091105.tar.bz2
+firefox-3.5.6.source.tar.bz2
+firefox-langpacks-3.5.6-20091216.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- firefox.spec	5 Nov 2009 15:12:29 -0000	1.340
+++ firefox.spec	16 Dec 2009 16:09:21 -0000	1.341
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.5
+%define xulrunner_version 1.9.1.6
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,7 +18,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.5
+Version:        3.5.6
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -30,7 +30,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20091105.tar.bz2
+Source2:        firefox-langpacks-%{version}-20091216.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -341,6 +341,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 3.5.6-1
+- Update to 3.5.6
+
 * Thu Nov  5 2009 Jan Horak <jhorak at redhat.com> - 3.5.5-1
 - Update to 3.5.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- sources	5 Nov 2009 15:12:29 -0000	1.116
+++ sources	16 Dec 2009 16:09:21 -0000	1.117
@@ -1,2 +1,2 @@
-b3d92dfb40584141dc1068efc9bdfccc  firefox-3.5.5-source.tar.bz2
-d3e23da5bac91f377db7f9b46866a665  firefox-langpacks-3.5.5-20091105.tar.bz2
+54d73156dfedc6e4981f2a3c46817f9a  firefox-3.5.6.source.tar.bz2
+96c8808f055742576ddfb75358e80439  firefox-langpacks-3.5.6-20091216.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 16:10:18 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:10:18 +0000 (UTC)
Subject: rpms/firefox/F-12 .cvsignore, 1.102, 1.103 firefox.spec, 1.340,
	1.341 sources, 1.115, 1.116
Message-ID: <20091216161018.4955D11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11618

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-12/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	5 Nov 2009 10:25:36 -0000	1.102
+++ .cvsignore	16 Dec 2009 16:10:18 -0000	1.103
@@ -10,3 +10,5 @@ firefox-3.5.4-source.tar.bz2
 firefox-langpacks-3.5.4-20091026.tar.bz2
 firefox-3.5.5-source.tar.bz2
 firefox-langpacks-3.5.5-20091105.tar.bz2
+firefox-3.5.6.source.tar.bz2
+firefox-langpacks-3.5.6-20091216.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-12/firefox.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- firefox.spec	5 Nov 2009 10:25:36 -0000	1.340
+++ firefox.spec	16 Dec 2009 16:10:18 -0000	1.341
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.5-1
+%define xulrunner_version 1.9.1.6-1
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,7 +18,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.5
+Version:        3.5.6
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -30,7 +30,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20091105.tar.bz2
+Source2:        firefox-langpacks-%{version}-20091216.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -330,6 +330,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 3.5.6-1
+- Update to 3.5.6
+
 * Thu Nov  5 2009 Jan Horak <jhorak at redhat.com> - 3.5.5-1
 - Update to 3.5.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-12/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	5 Nov 2009 10:25:36 -0000	1.115
+++ sources	16 Dec 2009 16:10:18 -0000	1.116
@@ -1,2 +1,2 @@
-b3d92dfb40584141dc1068efc9bdfccc  firefox-3.5.5-source.tar.bz2
-d3e23da5bac91f377db7f9b46866a665  firefox-langpacks-3.5.5-20091105.tar.bz2
+54d73156dfedc6e4981f2a3c46817f9a  firefox-3.5.6.source.tar.bz2
+96c8808f055742576ddfb75358e80439  firefox-langpacks-3.5.6-20091216.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 16:12:20 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:12:20 +0000 (UTC)
Subject: rpms/firefox/F-11 firefox.spec,1.341,1.342
Message-ID: <20091216161220.6A59311C0260@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12091

Modified Files:
	firefox.spec 
Log Message:
Fix source filename


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -p -r1.341 -r1.342
--- firefox.spec	16 Dec 2009 16:09:21 -0000	1.341
+++ firefox.spec	16 Dec 2009 16:12:20 -0000	1.342
@@ -24,7 +24,7 @@ URL:            http://www.mozilla.org/p
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball firefox-%{internal_version}-source.tar.bz2
+%define tarball firefox-%{internal_version}.source.tar.bz2
 %else
 %define tarball firefox-3.1b4-source.tar.bz2
 %endif



From xhorak at fedoraproject.org  Wed Dec 16 16:13:02 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:13:02 +0000 (UTC)
Subject: rpms/firefox/F-12 firefox.spec,1.341,1.342
Message-ID: <20091216161302.DCC4C11C0260@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12268

Modified Files:
	firefox.spec 
Log Message:
Update to 3.5.6


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-12/firefox.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -p -r1.341 -r1.342
--- firefox.spec	16 Dec 2009 16:10:18 -0000	1.341
+++ firefox.spec	16 Dec 2009 16:13:02 -0000	1.342
@@ -24,7 +24,7 @@ URL:            http://www.mozilla.org/p
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball firefox-%{internal_version}-source.tar.bz2
+%define tarball firefox-%{internal_version}.source.tar.bz2
 %else
 %define tarball firefox-3.1b4-source.tar.bz2
 %endif



From xhorak at fedoraproject.org  Wed Dec 16 16:14:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:14:11 +0000 (UTC)
Subject: rpms/blam/F-12 blam.spec,1.37,1.38
Message-ID: <20091216161411.A3D2C11C0260@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12540

Modified Files:
	blam.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-21
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-12/blam.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- blam.spec	5 Nov 2009 18:35:42 -0000	1.37
+++ blam.spec	16 Dec 2009 16:14:11 -0000	1.38
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.1.5
+%define	gecko_version		1.9.1.6
 
 Name:		blam
 Version:	1.8.5
-Release:	20%{?dist}
+Release:	21%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-21
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-20
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 16:14:58 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:14:58 +0000 (UTC)
Subject: rpms/mozvoikko/F-12 mozvoikko.spec,1.20,1.21
Message-ID: <20091216161458.8774611C0260@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12764

Modified Files:
	mozvoikko.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.0-7
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-12/mozvoikko.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mozvoikko.spec	5 Nov 2009 18:36:35 -0000	1.20
+++ mozvoikko.spec	16 Dec 2009 16:14:58 -0000	1.21
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.5
+%define gecko_ver 1.9.1.6
 # These come from install.rdf
 %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %global firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -11,7 +11,7 @@
 
 Name:           mozvoikko
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.0-7
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 1.0-6
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 16:15:53 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:15:53 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-12 gnome-web-photo.spec,1.31,1.32
Message-ID: <20091216161553.218C511C0260@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-web-photo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13087

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.9-4
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/F-12/gnome-web-photo.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gnome-web-photo.spec	5 Nov 2009 18:37:30 -0000	1.31
+++ gnome-web-photo.spec	16 Dec 2009 16:15:52 -0000	1.32
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.5
+%define gecko_version 1.9.1.6
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://download.gnome.org/sources/gnome-web-photo/%{version}/
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.9-4
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.9-3
 - Rebuild against newer gecko
 



From mlichvar at fedoraproject.org  Wed Dec 16 16:16:49 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 16 Dec 2009 16:16:49 +0000 (UTC)
Subject: File libpcap-1.0.0-20091201git117cb5.tar.bz2 uploaded to lookaside
	cache by mlichvar
Message-ID: <20091216161649.63E8F28ECE9@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libpcap:

1027fee551d72e0f0c9e310de5ac0242  libpcap-1.0.0-20091201git117cb5.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 16:17:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:17:11 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-12 perl-Gtk2-MozEmbed.spec,1.11,1.12
Message-ID: <20091216161711.556A611C0260@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13403

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.10
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-12/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Gtk2-MozEmbed.spec	5 Nov 2009 18:38:34 -0000	1.11
+++ perl-Gtk2-MozEmbed.spec	16 Dec 2009 16:17:10 -0000	1.12
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.5
+%define gecko_version 1.9.1.6
 %else
 %define gecko_version 1.9.0.6
 %endif
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}.9
+Release:       %{specfilever}%{?dist}.10
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.10
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.9
 - Rebuild against newer gecko
 



From jima at fedoraproject.org  Wed Dec 16 16:17:58 2009
From: jima at fedoraproject.org (Patrick Laughton)
Date: Wed, 16 Dec 2009 16:17:58 +0000 (UTC)
Subject: File graphviz-2.26.0.tar.gz uploaded to lookaside cache by jima
Message-ID: <20091216161758.ED65F28ED4B@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for graphviz:

0609b42cb9ef913b7af13e43c4d716c9  graphviz-2.26.0.tar.gz



From limb at fedoraproject.org  Wed Dec 16 16:19:49 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Dec 2009 16:19:49 +0000 (UTC)
Subject: rpms/nexuiz/devel nexuiz-2.5.2-watercrash.patch, NONE,
	1.1 nexuiz.spec, 1.36, 1.37
Message-ID: <20091216161949.825C511C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14273

Modified Files:
	nexuiz.spec 
Added Files:
	nexuiz-2.5.2-watercrash.patch 
Log Message:
Crash fix.


nexuiz-2.5.2-watercrash.patch:
 gl_rmain.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE nexuiz-2.5.2-watercrash.patch ---
--- gl_rmain.c	(revision 9279)
+++ gl_rmain.c	(revision 9280)
@@ -3709,14 +3709,14 @@
 		r_waterstate.textureheight = textureheight;
 	}
 
-	// when doing a reduced render (HDR) we want to use a smaller area
-	r_waterstate.waterwidth = (int)bound(1, r_refdef.view.width * r_water_resolutionmultiplier.value, r_refdef.view.width);
-	r_waterstate.waterheight = (int)bound(1, r_refdef.view.height * r_water_resolutionmultiplier.value, r_refdef.view.height);
-
 	if (r_waterstate.waterwidth)
 	{
 		r_waterstate.enabled = true;
 
+		// when doing a reduced render (HDR) we want to use a smaller area
+		r_waterstate.waterwidth = (int)bound(1, r_refdef.view.width * r_water_resolutionmultiplier.value, r_refdef.view.width);
+		r_waterstate.waterheight = (int)bound(1, r_refdef.view.height * r_water_resolutionmultiplier.value, r_refdef.view.height);
+
 		// set up variables that will be used in shader setup
 		r_waterstate.screenscale[0] = 0.5f * (float)r_waterstate.waterwidth / (float)r_waterstate.texturewidth;
 		r_waterstate.screenscale[1] = 0.5f * (float)r_waterstate.waterheight / (float)r_waterstate.textureheight;


Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- nexuiz.spec	13 Oct 2009 15:35:41 -0000	1.36
+++ nexuiz.spec	16 Dec 2009 16:19:49 -0000	1.37
@@ -3,7 +3,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -15,6 +15,7 @@ Source1: %{name}.desktop
 Source10: darkplaces-quake.sh
 Source11: darkplaces-quake.autodlrc
 Source12: darkplaces-quake.desktop
+Patch0: nexuiz-2.5.2-watercrash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # For the .ico extraction
 BuildRequires: ImageMagick, file
@@ -92,6 +93,7 @@ DarkPlaces server required for hosting m
 %{__sed} -i 's/\r//' darkplaces.txt
 %{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc
 
+%patch0 -p0
 
 %build
 export DP_FS_BASEDIR=%{_datadir}/nexuiz
@@ -217,6 +219,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Dec 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.5.2-2
+- patch to fix crash, BZ 540742.
+
 * Mon Oct 12 2009 Jon Ciesla <limb at jcomserv.net> - 2.5.2-1
 - Update to 2.5.2, BZ 528356.
 - Derive icon from .xpm instead of .ico to satisfy new ImageMagick.



From xhorak at fedoraproject.org  Wed Dec 16 16:19:51 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:19:51 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-12 gnome-python2-extras.spec,1.64,1.65
Message-ID: <20091216161951.6A3CF11C00C5@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-python2-extras/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14293

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-14.3
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-12/gnome-python2-extras.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnome-python2-extras.spec	6 Nov 2009 20:53:14 -0000	1.64
+++ gnome-python2-extras.spec	16 Dec 2009 16:19:51 -0000	1.65
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.1.5
+%define gecko_version 1.9.1.6
 %define gtkspell_version 2.0.7
 %define libgda_version 3.99.9
 %define libgdl_version 2.24.0
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 13%{?dist}.3
+Release: 14%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: Additional PyGNOME Python extension modules
@@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-14
+- Rebuild against newer gecko
+
 * Fri Nov 06 2009 Jesse Keating <jkeating at redhat.com> - 2.25.3-13.3
 - Rebuild (again) against newer gecko
 



From mlichvar at fedoraproject.org  Wed Dec 16 16:20:00 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 16 Dec 2009 16:20:00 +0000 (UTC)
Subject: rpms/libpcap/devel .cvsignore, 1.7, 1.8 libpcap.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20091216162000.4679C11C00C5@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/libpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14347

Modified Files:
	.cvsignore libpcap.spec sources 
Log Message:
- update to snapshot 20091201git117cb5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Sep 2009 16:13:38 -0000	1.7
+++ .cvsignore	16 Dec 2009 16:19:59 -0000	1.8
@@ -1 +1 @@
-libpcap-1.0.0-20090922gite154e2.tar.bz2
+libpcap-1.0.0-20091201git117cb5.tar.bz2


Index: libpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/libpcap.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libpcap.spec	17 Oct 2009 15:02:17 -0000	1.14
+++ libpcap.spec	16 Dec 2009 16:20:00 -0000	1.15
@@ -1,7 +1,7 @@
 Name: libpcap
 Epoch: 14
 Version: 1.0.0
-Release: 4.20090922gite154e2%{?dist}
+Release: 5.20091201git117cb5%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
@@ -10,7 +10,7 @@ BuildRequires: glibc-kernheaders >= 2.2.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 # git snapshot from git://bpf.tcpdump.org/libpcap
-Source: libpcap-1.0.0-20090922gite154e2.tar.bz2
+Source: libpcap-1.0.0-20091201git117cb5.tar.bz2
 Patch1: libpcap-man.patch
 Patch2: libpcap-multilib.patch
 Patch3: libpcap-s390.patch
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/pcap*.5*
 
 %changelog
+* Wed Dec 16 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:1.0.0-5.20091201git117cb5
+- update to snapshot 20091201git117cb5
+
 * Sat Oct 17 2009 Dennis Gilmore <dennis at ausil.us> 14:1.0.0-4.20090922gite154e2
 - use -fPIC on sparc arches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Sep 2009 16:13:38 -0000	1.7
+++ sources	16 Dec 2009 16:20:00 -0000	1.8
@@ -1 +1 @@
-e7921eaa6eb247b696c1d6640c39f86c  libpcap-1.0.0-20090922gite154e2.tar.bz2
+1027fee551d72e0f0c9e310de5ac0242  libpcap-1.0.0-20091201git117cb5.tar.bz2



From xhorak at fedoraproject.org  Wed Dec 16 16:20:51 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:20:51 +0000 (UTC)
Subject: rpms/Miro/F-12 Miro.spec,1.65,1.66
Message-ID: <20091216162051.4D9EA11C00C5@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14786

Modified Files:
	Miro.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-7
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-12/Miro.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- Miro.spec	5 Nov 2009 18:41:46 -0000	1.65
+++ Miro.spec	16 Dec 2009 16:20:50 -0000	1.66
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.1.5
+%define gecko_ver 1.9.1.6
 
 Name:           Miro
 Version:        2.5.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-7
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-6
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Wed Dec 16 16:21:37 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 16:21:37 +0000 (UTC)
Subject: rpms/galeon/F-12 galeon.spec,1.68,1.69
Message-ID: <20091216162137.9FE7C11C00C5@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/galeon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15049

Modified Files:
	galeon.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-19
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-12/galeon.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- galeon.spec	5 Nov 2009 18:42:57 -0000	1.68
+++ galeon.spec	16 Dec 2009 16:21:37 -0000	1.69
@@ -1,9 +1,9 @@
-%define gecko_ver 1.9.1.5
+%define gecko_ver 1.9.1.6
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	18%{?dist}
+Release:	19%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -133,6 +133,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-19
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-18
 - Rebuild against newer gecko
 



From mlichvar at fedoraproject.org  Wed Dec 16 16:23:53 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 16 Dec 2009 16:23:53 +0000 (UTC)
Subject: rpms/libpcap/F-12 .cvsignore, 1.7, 1.8 libpcap.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20091216162353.7039F11C00C5@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/libpcap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15516

Modified Files:
	.cvsignore libpcap.spec sources 
Log Message:
- update to snapshot 20091201git117cb5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Sep 2009 16:13:38 -0000	1.7
+++ .cvsignore	16 Dec 2009 16:23:53 -0000	1.8
@@ -1 +1 @@
-libpcap-1.0.0-20090922gite154e2.tar.bz2
+libpcap-1.0.0-20091201git117cb5.tar.bz2


Index: libpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/F-12/libpcap.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libpcap.spec	17 Oct 2009 14:54:25 -0000	1.14
+++ libpcap.spec	16 Dec 2009 16:23:53 -0000	1.15
@@ -1,7 +1,7 @@
 Name: libpcap
 Epoch: 14
 Version: 1.0.0
-Release: 4.20090922gite154e2%{?dist}
+Release: 5.20091201git117cb5%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
@@ -10,7 +10,7 @@ BuildRequires: glibc-kernheaders >= 2.2.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 # git snapshot from git://bpf.tcpdump.org/libpcap
-Source: libpcap-1.0.0-20090922gite154e2.tar.bz2
+Source: libpcap-1.0.0-20091201git117cb5.tar.bz2
 Patch1: libpcap-man.patch
 Patch2: libpcap-multilib.patch
 Patch3: libpcap-s390.patch
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/pcap*.5*
 
 %changelog
+* Wed Dec 16 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:1.0.0-5.20091201git117cb5
+- update to snapshot 20091201git117cb5
+
 * Sat Oct 17 2009 Dennis Gilmore <dennis at ausil.us> 14:1.0.0-4.20090922gite154e2
 - use -fPIC on sparc arches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Sep 2009 16:13:38 -0000	1.7
+++ sources	16 Dec 2009 16:23:53 -0000	1.8
@@ -1 +1 @@
-e7921eaa6eb247b696c1d6640c39f86c  libpcap-1.0.0-20090922gite154e2.tar.bz2
+1027fee551d72e0f0c9e310de5ac0242  libpcap-1.0.0-20091201git117cb5.tar.bz2



From kkofler at fedoraproject.org  Wed Dec 16 16:30:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 16:30:59 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.218,1.219
Message-ID: <20091216163059.D162A11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16766/devel

Modified Files:
	kdeedu.spec 
Log Message:
* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
- reenable ocaml-facile support (#546628)


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- kdeedu.spec	11 Dec 2009 15:12:47 -0000	1.218
+++ kdeedu.spec	16 Dec 2009 16:30:59 -0000	1.219
@@ -1,19 +1,13 @@
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
 %ifarch alpha %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
-%if 0%{?fedora} > 12
-# re-enable when fixed:
-# https://bugzilla.redhat.com/show_bug.cgi?id=545116
-%define with_facile 0
-%else
 %define with_facile 1
 %endif
-%endif
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -534,8 +528,12 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
+* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
+- reenable ocaml-facile support (#546628)
+
+* Tue Dec 01 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
+- temporarily disable ocaml-facile support due to #545116 (see #546628)
 
 * Sun Nov 22 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot



From limb at fedoraproject.org  Wed Dec 16 16:43:34 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 16 Dec 2009 16:43:34 +0000 (UTC)
Subject: rpms/nexuiz/F-12 nexuiz-2.5.2-watercrash.patch, NONE,
	1.1 nexuiz.spec, 1.35, 1.36
Message-ID: <20091216164334.ECED711C00C5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18775

Modified Files:
	nexuiz.spec 
Added Files:
	nexuiz-2.5.2-watercrash.patch 
Log Message:
Crash fix.


nexuiz-2.5.2-watercrash.patch:
 gl_rmain.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE nexuiz-2.5.2-watercrash.patch ---
--- gl_rmain.c	(revision 9279)
+++ gl_rmain.c	(revision 9280)
@@ -3709,14 +3709,14 @@
 		r_waterstate.textureheight = textureheight;
 	}
 
-	// when doing a reduced render (HDR) we want to use a smaller area
-	r_waterstate.waterwidth = (int)bound(1, r_refdef.view.width * r_water_resolutionmultiplier.value, r_refdef.view.width);
-	r_waterstate.waterheight = (int)bound(1, r_refdef.view.height * r_water_resolutionmultiplier.value, r_refdef.view.height);
-
 	if (r_waterstate.waterwidth)
 	{
 		r_waterstate.enabled = true;
 
+		// when doing a reduced render (HDR) we want to use a smaller area
+		r_waterstate.waterwidth = (int)bound(1, r_refdef.view.width * r_water_resolutionmultiplier.value, r_refdef.view.width);
+		r_waterstate.waterheight = (int)bound(1, r_refdef.view.height * r_water_resolutionmultiplier.value, r_refdef.view.height);
+
 		// set up variables that will be used in shader setup
 		r_waterstate.screenscale[0] = 0.5f * (float)r_waterstate.waterwidth / (float)r_waterstate.texturewidth;
 		r_waterstate.screenscale[1] = 0.5f * (float)r_waterstate.waterheight / (float)r_waterstate.textureheight;


Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/F-12/nexuiz.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nexuiz.spec	4 Dec 2009 15:33:54 -0000	1.35
+++ nexuiz.spec	16 Dec 2009 16:43:34 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -15,6 +15,7 @@ Source1: %{name}.desktop
 Source10: darkplaces-quake.sh
 Source11: darkplaces-quake.autodlrc
 Source12: darkplaces-quake.desktop
+Patch0: nexuiz-2.5.2-watercrash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # For the .ico extraction
 BuildRequires: ImageMagick, file
@@ -92,6 +93,7 @@ DarkPlaces server required for hosting m
 %{__sed} -i 's/\r//' darkplaces.txt
 %{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc
 
+%patch0 -p0
 
 %build
 export DP_FS_BASEDIR=%{_datadir}/nexuiz
@@ -217,6 +219,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Dec 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.5.2-2
+- patch to fix crash, BZ 540742.
+
 * Mon Oct 12 2009 Jon Ciesla <limb at jcomserv.net> - 2.5.2-1
 - Update to 2.5.2, BZ 528356.
 - Derive icon from .xpm instead of .ico to satisfy new ImageMagick.



From jreznik at fedoraproject.org  Wed Dec 16 16:45:07 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 16:45:07 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase3.spec,1.88,1.89
Message-ID: <20091216164507.0620811C00C5@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19085

Modified Files:
	kdebase3.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-15
- Repositioning the KDE Brand (#547361)



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kdebase3.spec	4 Sep 2009 22:45:44 -0000	1.88
+++ kdebase3.spec	16 Dec 2009 16:45:06 -0000	1.89
@@ -11,10 +11,10 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 Name: kdebase3
-Summary: K Desktop Environment 3 - core files
+Summary: KDE 3 core files
 Obsoletes: kdebase < 6:%{version}-%{release}
 Provides: kdebase = 6:%{version}-%{release}
 
@@ -157,7 +157,7 @@ BuildRequires: OpenEXR-devel
 BuildRequires: gtk2-devel
 
 %description
-Core runtime files for the K Desktop Environment 3, for compatibility with KDE 3
+Core runtime files for the KDE 3, for compatibility with KDE 3
 applications.
 
 # FIXME/TODO: Is kdebase3-devel really useful?
@@ -758,6 +758,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-15
+- Repositioning the KDE Brand (#547361)
+
 * Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-14
 - openssl-1.0 build fixes
 



From jreznik at fedoraproject.org  Wed Dec 16 16:49:18 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 16:49:18 +0000 (UTC)
Subject: rpms/kdegames3/devel kdegames3.spec,1.13,1.14
Message-ID: <20091216164918.1326B11C00C5@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdegames3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20065

Modified Files:
	kdegames3.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-15
- Repositioning the KDE Brand (#547361)



Index: kdegames3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/devel/kdegames3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kdegames3.spec	25 Jul 2009 04:27:47 -0000	1.13
+++ kdegames3.spec	16 Dec 2009 16:49:17 -0000	1.14
@@ -7,9 +7,9 @@
 %define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
 
 Name:    kdegames3
-Summary: K Desktop Environment 3 - Games not ported to KDE 4
+Summary: KDE 3 Games not ported to KDE 4
 Version: 3.5.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -32,7 +32,7 @@ BuildRequires: automake libtool
 %endif
 
 %description
-Games and gaming libraries for the K Desktop Environment which have not been
+Games and gaming libraries for the KDE which have not been
 ported to KDE 4 yet.
 Included with this package are: atlantik, kasteroids, kbackgammon, kboxpush,
 kenolaba, kfouleggs, klickety, kpoker, ksirtet, ksmiletris, ksnake.
@@ -189,6 +189,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-7
+- Repositioning the KDE Brand (#547361)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpepple at fedoraproject.org  Wed Dec 16 16:53:05 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 16 Dec 2009 16:53:05 +0000 (UTC)
Subject: rpms/empathy/F-12 .cvsignore, 1.43, 1.44 empathy.spec, 1.89,
	1.90 sources, 1.43, 1.44
Message-ID: <20091216165305.4E21011C00C5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20705

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Mon Dec 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.2-1
- Update to 2.28.2.
- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.2.news



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	18 Nov 2009 19:34:26 -0000	1.43
+++ .cvsignore	16 Dec 2009 16:53:05 -0000	1.44
@@ -1 +1 @@
-empathy-2.28.1.2.tar.bz2
+empathy-2.28.2.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- empathy.spec	18 Nov 2009 19:34:26 -0000	1.89
+++ empathy.spec	16 Dec 2009 16:53:05 -0000	1.90
@@ -13,7 +13,7 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.28.1.2
+Version:	2.28.2
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -237,6 +237,10 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Dec 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.2-1
+- Update to 2.28.2.
+- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.2.news
+
 * Wed Nov 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.2-1
 - Update to 2.18.1.2.
 - Drop refcount-fix patch.  Fixed upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	18 Nov 2009 19:34:26 -0000	1.43
+++ sources	16 Dec 2009 16:53:05 -0000	1.44
@@ -1 +1 @@
-4852ca8423896b6ccb5f7de4d6064607  empathy-2.28.1.2.tar.bz2
+8d578d82d1e51dc8c83642b81c0fb65a  empathy-2.28.2.tar.bz2



From jreznik at fedoraproject.org  Wed Dec 16 17:00:51 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 16 Dec 2009 17:00:51 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.80,1.81
Message-ID: <20091216170051.AA26A11C00C5@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21912

Modified Files:
	kdelibs3.spec 
Log Message:
* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-22
- Repositioning the KDE Brand (#547361)



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- kdelibs3.spec	11 Dec 2009 12:15:10 -0000	1.80
+++ kdelibs3.spec	16 Dec 2009 17:00:51 -0000	1.81
@@ -25,9 +25,9 @@
 # yet either). Maybe the conditional should be dropped entirely? -- Kevin
 %define include_crystalsvg 1
 
-Summary: K Desktop Environment 3 - Libraries
+Summary: KDE 3 Libraries
 Version: 3.5.10
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -181,7 +181,7 @@ Requires: crystalsvg-icon-theme
 
 
 %description
-Libraries for the K Desktop Environment 3:
+Libraries for the KDE 3:
 KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
 kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
 kspell (spelling checker), jscript (javascript), kab (addressbook),
@@ -585,6 +585,9 @@ touch --no-create %{_datadir}/icons/crys
 
 
 %changelog
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-22
+- Repositioning the KDE Brand (#547361)
+
 * Mon Dec 07 2009 Than Ngo <than at redhat.com> - 3.5.10-21
 - fix security issues in libltdl bundle within kdelibs CVE-2009-3736
 - backport upstream patches



From kkofler at fedoraproject.org  Wed Dec 16 17:05:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 17:05:12 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase3.spec,1.89,1.90
Message-ID: <20091216170512.04FC611C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22792/devel

Modified Files:
	kdebase3.spec 
Log Message:
s/the KDE/KDE/


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- kdebase3.spec	16 Dec 2009 16:45:06 -0000	1.89
+++ kdebase3.spec	16 Dec 2009 17:05:11 -0000	1.90
@@ -157,8 +157,7 @@ BuildRequires: OpenEXR-devel
 BuildRequires: gtk2-devel
 
 %description
-Core runtime files for the KDE 3, for compatibility with KDE 3
-applications.
+Core runtime files for KDE 3, for compatibility with KDE 3 applications.
 
 # FIXME/TODO: Is kdebase3-devel really useful?
 %package devel



From rjones at fedoraproject.org  Wed Dec 16 17:05:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 16 Dec 2009 17:05:33 +0000 (UTC)
Subject: rpms/ocaml/devel ocaml.spec,1.64,1.65
Message-ID: <20091216170533.C2A4611C00C5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22908

Modified Files:
	ocaml.spec 
Log Message:
Use __ocaml_requires_opts / __ocaml_provides_opts.


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- ocaml.spec	16 Dec 2009 15:25:40 -0000	1.64
+++ ocaml.spec	16 Dec 2009 17:05:33 -0000	1.65
@@ -2,7 +2,7 @@
 
 Name:           ocaml
 Version:        3.11.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -56,8 +56,8 @@ Requires:       rpm-build >= 4.8.0
 Provides:       ocaml(compiler) = %{version}
 ExclusiveArch:  alpha armv4l %{ix86} ia64 x86_64 ppc sparc sparcv9 ppc64
 
-%global __ocaml_requires %{_rpmconfigdir}/ocaml-find-requires.sh -c -f %{buildroot}%{_bindir}/ocamlobjinfo
-%global __ocaml_provides %{_rpmconfigdir}/ocaml-find-provides.sh -f %{buildroot}%{_bindir}/ocamlobjinfo
+%global __ocaml_requires_opts -c -f %{buildroot}%{_bindir}/ocamlobjinfo
+%global __ocaml_provides_opts -f %{buildroot}%{_bindir}/ocamlobjinfo
 
 
 %description
@@ -443,6 +443,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-8
+- Use __ocaml_requires_opts / __ocaml_provides_opts.
+
 * Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-7
 - Remove ocaml-find-{requires,provides}.sh from this package.  These are
   now in upstream RPM 4.8 (RHBZ#545116).



From rjones at fedoraproject.org  Wed Dec 16 17:05:57 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 16 Dec 2009 17:05:57 +0000 (UTC)
Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.25,1.26
Message-ID: <20091216170557.6479011C00C5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23008

Modified Files:
	ocaml-findlib.spec 
Log Message:
Use __ocaml_requires_opts / __ocaml_provides_opts.


Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ocaml-findlib.spec	16 Dec 2009 15:37:05 -0000	1.25
+++ ocaml-findlib.spec	16 Dec 2009 17:05:57 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:           ocaml-findlib
 Version:        1.2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -20,7 +20,7 @@ BuildRequires:  ocaml-ocamldoc
 BuildRequires:  m4, ncurses-devel
 BuildRequires:  gawk
 
-%global __ocaml_requires %{_rpmconfigdir}/ocaml-find-requires.sh -i Asttypes -i Parsetree
+%global __ocaml_requires_opts -i Asttypes -i Parsetree
 
 %description
 Objective CAML package manager and build helper.
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.5-3
+- Use __ocaml_requires_opts / __ocaml_provides_opts.
+
 * Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.5-2
 - Update to use RPM dependency generator.
 



From kkofler at fedoraproject.org  Wed Dec 16 17:07:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 17:07:25 +0000 (UTC)
Subject: rpms/kdegames3/devel kdegames3.spec,1.14,1.15
Message-ID: <20091216170725.DF47811C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23471/devel

Modified Files:
	kdegames3.spec 
Log Message:
s/the KDE/KDE/


Index: kdegames3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/devel/kdegames3.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kdegames3.spec	16 Dec 2009 16:49:17 -0000	1.14
+++ kdegames3.spec	16 Dec 2009 17:07:25 -0000	1.15
@@ -32,8 +32,7 @@ BuildRequires: automake libtool
 %endif
 
 %description
-Games and gaming libraries for the KDE which have not been
-ported to KDE 4 yet.
+Games and gaming libraries for KDE which have not been ported to KDE 4 yet.
 Included with this package are: atlantik, kasteroids, kbackgammon, kboxpush,
 kenolaba, kfouleggs, klickety, kpoker, ksirtet, ksmiletris, ksnake.
 



From kkofler at fedoraproject.org  Wed Dec 16 17:08:42 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 16 Dec 2009 17:08:42 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.81,1.82
Message-ID: <20091216170842.CB4E511C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23685/devel

Modified Files:
	kdelibs3.spec 
Log Message:
s/the KDE/KDE/


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- kdelibs3.spec	16 Dec 2009 17:00:51 -0000	1.81
+++ kdelibs3.spec	16 Dec 2009 17:08:42 -0000	1.82
@@ -181,7 +181,7 @@ Requires: crystalsvg-icon-theme
 
 
 %description
-Libraries for the KDE 3:
+Libraries for KDE 3:
 KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
 kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
 kspell (spelling checker), jscript (javascript), kab (addressbook),



From rjones at fedoraproject.org  Wed Dec 16 17:29:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 16 Dec 2009 17:29:59 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.115,1.116
Message-ID: <20091216172959.208A111C00C5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26961

Modified Files:
	libguestfs.spec 
Log Message:
Disable tests because of RHBZ#548121.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- libguestfs.spec	16 Dec 2009 16:02:31 -0000	1.115
+++ libguestfs.spec	16 Dec 2009 17:29:58 -0000	1.116
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.80
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -382,10 +382,11 @@ export LIBGUESTFS_DEBUG=1
 #                                 (FIXED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
 # 516543   ?            F-12   qemu-kvm segfaults when run inside a VM (FIXED)
+# 548121   all          F-13   udevsettle command is broken
 
-%ifarch x86_64
-make check
-%endif
+#%ifarch x86_64  # reenable if we fix 548121
+#make check
+#%endif
 
 
 %install
@@ -601,6 +602,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-2
+- Disable tests because of RHBZ#548121.
+
 * Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-1
 - New upstream release 1.0.80.
 - New Polish translations (RHBZ#502533).



From gd at fedoraproject.org  Wed Dec 16 17:36:08 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed, 16 Dec 2009 17:36:08 +0000 (UTC)
Subject: rpms/samba/devel samba-3.5.0pre2-build.patch, NONE, 1.1 .cvsignore, 
	1.68, 1.69 samba.spec, 1.202, 1.203 sources, 1.72, 1.73
Message-ID: <20091216173608.DDAA511C00C5@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28030

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.5.0pre2-build.patch 
Log Message:
Update to 3.5.0pre2
Remove umount.cifs

Guenther


samba-3.5.0pre2-build.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.5.0pre2-build.patch ---
--- source3/configure.in.orig	2009-12-15 14:36:46.000000000 +0100
+++ source3/configure.in	2009-12-15 14:36:52.000000000 +0100
@@ -1885,7 +1885,7 @@
 
 if test "x$enable_external_libtalloc" != xno
 then
-	PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.1,
+	PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.0,
 		[ enable_external_libtalloc=yes ],
 		[if test x$enable_external_libtalloc = xyes; then
 			AC_MSG_ERROR([Unable to find libtalloc])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	29 Oct 2009 14:49:54 -0000	1.68
+++ .cvsignore	16 Dec 2009 17:36:08 -0000	1.69
@@ -1 +1 @@
-samba-3.4.3.tar.gz
+samba-3.5.0pre2.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- samba.spec	25 Nov 2009 14:54:48 -0000	1.202
+++ samba.spec	16 Dec 2009 17:36:08 -0000	1.203
@@ -1,9 +1,9 @@
-%define main_release 49
-%define samba_version 3.4.3
-%define tdb_version 1.1.3
-%define talloc_version 1.3.0
-#%define pre_release rc1
-%define pre_release %nil
+%define main_release 50
+%define samba_version 3.5.0
+%define tdb_version 1.1.7
+%define talloc_version 2.0.0
+#%define pre_release %nil
+%define pre_release pre2
 
 %define samba_release %{main_release}%{pre_release}%{?dist}
 
@@ -17,7 +17,7 @@ License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
-Source: http://www.samba.org/samba/ftp/%{name}-%{samba_version}%{pre_release}.tar.gz
+Source: http://www.samba.org/samba/%{name}-%{samba_version}%{pre_release}.tar.gz
 
 # Red Hat specific replacement-files
 Source1: samba.log
@@ -45,6 +45,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
+Patch201: samba-3.5.0pre2-build.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -202,6 +203,7 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
+%patch201 -p0 -b .build
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -255,10 +257,10 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DL
     --with-swatdir=%{_datadir}/swat \
     --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
     --with-cifsupcall \
-    --with-cluster-support \
+    --with-cluster-support=auto \
     --with-libtalloc=no \
     --enable-external-libtalloc=yes \
-    --with-libtdb=no \
+    --with-libtdb=no
 #    --enable-external-libtdb=yes \
 #    --with-aio-support \
 
@@ -363,7 +365,6 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 $RPM_BUILD_ROOT/usr/sbin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 $RPM_BUILD_ROOT/usr/sbin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 
 install -m 755 %samba_source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
@@ -381,6 +382,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tes
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmount.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/umount.cifs.8*
 
 # why are these getting installed in the wrong place?
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
@@ -509,7 +511,6 @@ exit 0
 %files client
 %defattr(-,root,root)
 /sbin/mount.cifs
-/sbin/umount.cifs
 %{_sbindir}/cifs.upcall
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
@@ -533,7 +534,6 @@ exit 0
 %{_mandir}/man1/sharesec.1*
 %{_mandir}/man8/smbspool.8*
 %{_mandir}/man8/mount.cifs.8*
-%{_mandir}/man8/umount.cifs.8*
 %{_mandir}/man8/cifs.upcall.8*
 
 %files common
@@ -587,6 +587,7 @@ exit 0
 %{_mandir}/man8/smbpasswd.8*
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/net.8*
+%{_datadir}/locale/*/LC_MESSAGES/net.mo
 
 %doc README COPYING Manifest
 %doc WHATSNEW.txt Roadmap
@@ -622,6 +623,7 @@ exit 0
 %files winbind-devel
 %defattr(-,root,root)
 %{_includedir}/wbclient.h
+%{_includedir}/wbc_async.h
 %{_libdir}/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 
@@ -647,6 +649,7 @@ exit 0
 %{_mandir}/man7/libsmbclient.7*
 
 %files domainjoin-gui
+%defattr(-,root,root)
 %{_sbindir}/netdomjoin-gui
 %dir %{_datadir}/pixmaps/samba
 %{_datadir}/pixmaps/samba/samba.ico
@@ -654,6 +657,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Tue Dec 15 2009 Guenther Deschner <gdeschner at redhat.com> - 3.5.0pre2-50
+- Update to 3.5.0pre2
+- Remove umount.cifs
+
 * Wed Nov 25 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-49
 - Various updates to inline documentation in default smb.conf file
 - resolves: #483703


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	29 Oct 2009 14:49:54 -0000	1.72
+++ sources	16 Dec 2009 17:36:08 -0000	1.73
@@ -1 +1 @@
-322379680c12057f57685652a35a6b05  samba-3.4.3.tar.gz
+c01f346909810658e92573f6d39e101a  samba-3.5.0pre2.tar.gz



From nphilipp at fedoraproject.org  Wed Dec 16 17:57:25 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 16 Dec 2009 17:57:25 +0000 (UTC)
Subject: rpms/python-slip/F-11 .cvsignore, 1.14, 1.15 python-slip.spec, 1.15,
	1.16 sources, 1.15, 1.16
Message-ID: <20091216175725.6538B11C00C5@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31524

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
update to 0.2.7 (#512046)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	15 Oct 2008 14:59:43 -0000	1.14
+++ .cvsignore	16 Dec 2009 17:57:25 -0000	1.15
@@ -1 +1 @@
-python-slip-0.1.15.tar.bz2
+python-slip-0.2.7.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/F-11/python-slip.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-slip.spec	26 Feb 2009 23:31:24 -0000	1.15
+++ python-slip.spec	16 Dec 2009 17:57:25 -0000	1.16
@@ -3,32 +3,39 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.1.15
-Release:    3%{?dist}
+Version:    0.2.7
+Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
 Group:      System Environment/Libraries
 License:    GPLv2+
-URL:        http://nphilipp.fedorapeople.org/python-slip/
-Source0:    http://nphilipp.fedorapeople.org/python-slip/%{name}-%{version}.tar.bz2
+URL:        http://fedorahosted.org/python-slip
+Source0:    http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 BuildRequires:  python
 BuildRequires:  python-devel
 
+Requires: libselinux-python
+
 %description
 The Simple Library for Python packages contain miscellaneous code for
 convenience, extension and workaround purposes.
 
-This package provides the "slip" base module.
+This package provides the "slip" and the "slip.util" modules.
 
 %package dbus
 Summary:    Convenience functions for dbus services
 Group:      System Environment/Libraries
 Requires:   %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:   dbus-python >= 0.80
+%if 0%{?fedora}%{?rhel} && 0%{?fedora} < 12 && 0%{?rhel} < 6
 Requires:   PolicyKit >= 0.8-3
+%else
+Conflicts:  PolicyKit < 0.8-3
+Requires:   polkit >= 0.94
+%endif
 
 %description dbus
 The Simple Library for Python packages contain miscellaneous code for
@@ -67,7 +74,7 @@ rm -rf %buildroot
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING doc/dbus
 %dir %{python_sitelib}/slip/
 %{python_sitelib}/slip/__init__.py*
 %{python_sitelib}/slip/util
@@ -85,11 +92,39 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Sep 29 2009 Nils Philippsen <nils at redhat.com> - 0.2.7-1
+- fix persistent service objects
+
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 0.2.6-1
+- ship all slip.dbus modules (#525790)
+
+* Thu Sep 24 2009 Nils Philippsen <nils at redhat.com> - 0.2.5-1
+- make polkit checks in dbus services non-blocking
+
+* Mon Sep 14 2009 Nils Philippsen <nils at redhat.com>
+- improve example documentation
+
+* Tue Sep 08 2009 Nils Philippsen <nils at redhat.com> - 0.2.4-1
+- fix dbus example
+
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> - 0.2.3-1
+- add issamefile(), linkfile(), linkorcopyfile() to slip.util.files
+
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> - 0.2.2-1
+- add slip.util.files
+
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.2.1-1
+- ship slip.gtk.tools
+
+* Mon Aug 24 2009 Nils Philippsen <nils at redhat.com> - 0.2.0-1
+- use PolicyKit version 1.0 if possible (#518996)
+- update and ship dbus README
+
+* Fri Aug 21 2009 Nils Philippsen <nils at redhat.com>
+- require polkit >= 0.94 from F-12 on
 
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.15-2
-- Rebuild for Python 2.6
+* Thu Nov 27 2008 Nils Philippsen <nphilipp at redhat.com
+- use fedorahosted.org URLs
 
 * Tue Oct 14 2008 Nils Philippsen <nphilipp at redhat.com> - 0.1.15
 - add slip.dbus.polkit.AreAuthorizationsObtainable()


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	15 Oct 2008 14:59:43 -0000	1.15
+++ sources	16 Dec 2009 17:57:25 -0000	1.16
@@ -1 +1 @@
-38acbefd625956ff74cac2eb7597d95a  python-slip-0.1.15.tar.bz2
+088f992c6c31f1497fb2c83484fbfb8b  python-slip-0.2.7.tar.bz2



From nphilipp at fedoraproject.org  Wed Dec 16 17:59:13 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 16 Dec 2009 17:59:13 +0000 (UTC)
Subject: rpms/system-config-date/F-11 .cvsignore, 1.97, 1.98 sources, 1.107, 
	1.108 system-config-date.spec, 1.114, 1.115
Message-ID: <20091216175913.73B0D11C00C5@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31887

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
update to 1.9.53 (#512046)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-11/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- .cvsignore	20 Apr 2009 08:45:41 -0000	1.97
+++ .cvsignore	16 Dec 2009 17:59:13 -0000	1.98
@@ -1 +1 @@
-system-config-date-1.9.38.tar.bz2
+system-config-date-1.9.53.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-11/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- sources	20 Apr 2009 08:45:41 -0000	1.107
+++ sources	16 Dec 2009 17:59:13 -0000	1.108
@@ -1 +1 @@
-5cd5649425b0ba8db9ec278c137b16dc  system-config-date-1.9.38.tar.bz2
+3659e166608c8d6703de23f8ca6af9f0  system-config-date-1.9.53.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-11/system-config-date.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- system-config-date.spec	4 Jun 2009 17:11:23 -0000	1.114
+++ system-config-date.spec	16 Dec 2009 17:59:13 -0000	1.115
@@ -1,3 +1,6 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
+%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
+
 # Command line configurables
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
@@ -14,27 +17,34 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.38
-Release: 1%{?dist}.1
+Version: 1.9.53
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 Obsoletes: timetool < 3.0
 Obsoletes: dateconfig < 1.2
 Obsoletes: timeconfig < 3.2.10
 Obsoletes: redhat-config-date < 1.5.26
+# Until version 1.9.34, system-config-date contained online documentation.
+# From version 1.9.35 on, online documentation is split off into its own
+# package system-config-date-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-date < 1.9.35
-Conflicts: system-config-date < 1.9.35
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python
+BuildRequires: python-devel
 
+Requires: libselinux-python
 Requires: ntp
 Requires: python >= 2.0
+Requires: python-slip >= 0.2.3
+Requires: pygtk2 >= 2.12.0
 Requires: pygtk2-libglade
 Requires: gnome-python2-canvas
 %if 0%{?with_console_util:1}
@@ -43,7 +53,6 @@ Requires: usermode-gtk >= 1.94
 Requires: usermode-gtk >= 1.36
 %endif
 Requires: chkconfig
-Requires: rhpl
 %if 0%{?with_newt_python:1}
 Requires: newt-python
 %else
@@ -64,7 +73,14 @@ synchronize the time of the system with 
 %setup -q
 
 %build
-make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags}
+make \
+%if 0%{?fedora} > 0
+    POOL_NTP_ORG_VENDOR=fedora \
+%endif
+%if 0%{?rhel} > 0
+    POOL_NTP_ORG_VENDOR=rhel \
+%endif
+    %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,9 +111,6 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/system-config-date
-%{_bindir}/system-config-time
-%{_bindir}/dateconfig
-%{_sbindir}/timeconfig
 %{_datadir}/system-config-date
 %{_datadir}/applications/system-config-date.desktop
 %{_datadir}/system-config-date/pixmaps/system-config-date.png
@@ -107,15 +120,75 @@ fi
 %{_mandir}/ja/man8/system-config-date*
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-date
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-date
-%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-time
-%config(noreplace) %{_sysconfdir}/pam.d/system-config-time
-%config(noreplace) %{_sysconfdir}/security/console.apps/dateconfig
-%config(noreplace) %{_sysconfdir}/pam.d/dateconfig
-%config(noreplace) %{_sysconfdir}/ntp/ntpservers
+%{python_sitelib}/scdate
+%{python_sitelib}/scdate-%{version}-py%{python_version}.egg-info
+#%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
-* Thu Jun  4 2009 Dan Horak <dan[at]danny.cz> - 1.9.38-1.1
-- anaconda is not required for build
+* Tue Oct 20 2009 Nils Philippsen <nils at redhat.com> - 1.9.53-1
+- make translating time zones more robust (#525921)
+
+* Thu Oct 01 2009 Nils Philippsen <nils at redhat.com> - 1.9.52-1
+- pull in fixed Malayalam translations (#526636)
+
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 1.9.51-1
+- deal better with untranslated time zones (#524823)
+
+* Mon Sep 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.50-1
+- pick up new translations
+
+* Mon Sep 14 2009 Nils Philippsen <nils at redhat.com> - 1.9.49-1
+- pick up updated translations
+
+* Mon Sep 07 2009 Nils Philippsen <nils at redhat.com> - 1.9.48-1
+- use string object methods instead of string module
+- get rid of timeconfig and compat program names
+- move backend code into scdate.core module
+
+* Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.47-1
+- import gettext from each module again (#520799)
+
+* Wed Sep 02 2009 Nils Philippsen <nils at redhat.com> - 1.9.46-1
+- use new gtk tooltip API
+
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com>
+- use slip.util.files.linkorcopyfile() (#512046)
+- initialize gettext correctly in all places
+
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.45-1
+- initialize gettext correctly
+
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.44-1
+- don't unnecessarily initialize gettext
+
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.43-1
+- use str instead of unicode as N_ implementation
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.42-1
+- provide missing N_()
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.41-1
+- use gettext instead of rhpl
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.40-1
+- explain obsoleting old versions
+
+* Wed Jul 29 2009 Nils Philippsen <nils at redhat.com>
+- improve manual and NTP settings (#507619)
+- improve frames and expander (#507623)
+- display current date and time always
+- fix explanation labels on "Date and Time" page
+- fix non-zero page size deprecation warnings
+
+* Thu Jul 09 2009 Nils Philippsen <nils at redhat.com> - 1.9.39-1
+- use POOL_NTP_ORG_VENDOR in Makefile to set default NTP servers (#510309)
+
+* Thu Jun 04 2009 Nils Philippsen <nils at redhat.com>
+- don't BR: anaconda
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- require libselinux-python
+- use simplified source URL
 
 * Mon Apr 20 2009 Nils Philippsen <nils at redhat.com> - 1.9.38-1
 - restore SELinux context of /etc/localtime (#490323, patch by Daniel Walsh)



From jnovy at fedoraproject.org  Wed Dec 16 18:35:47 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 16 Dec 2009 18:35:47 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-security-scripts.patch, 1.1,
	1.2 netpbm.spec, 1.150, 1.151 netpbm-pamtosvg.patch, 1.1, NONE
Message-ID: <20091216183547.C924311C00C5@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5143

Modified Files:
	netpbm-security-scripts.patch netpbm.spec 
Removed Files:
	netpbm-pamtosvg.patch 
Log Message:
* Fri Dec 14 2009 Jindrich Novy <jnovy at redhat.com> 10.47.06-1
- update to 10.47.06 - fixes the dumb pamtosvg mistake in 10.47.05
- pnmmargin won't create leftovers in /tmp (#547888)


netpbm-security-scripts.patch:
 converter/other/anytopnm |   13 +++-
 editor/pamstretch-gen    |    4 -
 editor/pnmmargin         |   20 ++----
 editor/ppmfade           |  137 ++++++++++++++++++++++++-----------------------
 editor/ppmquantall       |    8 --
 editor/ppmshadow         |    7 +-
 6 files changed, 95 insertions(+), 94 deletions(-)

Index: netpbm-security-scripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-security-scripts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netpbm-security-scripts.patch	21 Oct 2009 15:11:20 -0000	1.1
+++ netpbm-security-scripts.patch	16 Dec 2009 18:35:47 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up netpbm-10.47.04/converter/other/anytopnm.security2 netpbm-10.47.04/converter/other/anytopnm
---- netpbm-10.47.04/converter/other/anytopnm.security2	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/anytopnm	2009-10-21 14:51:49.000000000 +0200
+diff -up netpbm-10.47.06/converter/other/anytopnm.security-scripts netpbm-10.47.06/converter/other/anytopnm
+--- netpbm-10.47.06/converter/other/anytopnm.security-scripts	2009-12-13 20:27:05.000000000 +0100
++++ netpbm-10.47.06/converter/other/anytopnm	2009-12-16 18:59:17.000000000 +0100
 @@ -510,10 +510,7 @@ else
      inputFile="-"
  fi
@@ -31,9 +31,9 @@ diff -up netpbm-10.47.04/converter/other
 +fi
 +
  exit 0
-diff -up netpbm-10.47.04/editor/pamstretch-gen.security2 netpbm-10.47.04/editor/pamstretch-gen
---- netpbm-10.47.04/editor/pamstretch-gen.security2	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pamstretch-gen	2009-10-21 14:53:28.000000000 +0200
+diff -up netpbm-10.47.06/editor/pamstretch-gen.security-scripts netpbm-10.47.06/editor/pamstretch-gen
+--- netpbm-10.47.06/editor/pamstretch-gen.security-scripts	2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/pamstretch-gen	2009-12-16 18:59:17.000000000 +0100
 @@ -31,9 +31,7 @@ if [ "$1" = "" ]; then
    exit 1
  fi
@@ -45,9 +45,9 @@ diff -up netpbm-10.47.04/editor/pamstret
  trap 'rm -rf $tempdir' 0 1 3 15
  
  tempfile=$tempdir/pnmig
-diff -up netpbm-10.47.04/editor/pnmmargin.security2 netpbm-10.47.04/editor/pnmmargin
---- netpbm-10.47.04/editor/pnmmargin.security2	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmmargin	2009-10-21 14:55:40.000000000 +0200
+diff -up netpbm-10.47.06/editor/pnmmargin.security-scripts netpbm-10.47.06/editor/pnmmargin
+--- netpbm-10.47.06/editor/pnmmargin.security-scripts	2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/pnmmargin	2009-12-16 19:04:05.000000000 +0100
 @@ -11,15 +11,11 @@
  # documentation.  This software is provided "as is" without express or
  # implied warranty.
@@ -69,59 +69,26 @@ diff -up netpbm-10.47.04/editor/pnmmargi
  
  color="-gofigure"
  plainopt=""
-@@ -43,6 +39,9 @@ while true ; do
- 	shift
- 	if [ ! ${1-""} ] ; then
-        	    echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+            if [ -d "$tmpdir" ]; then
-+                rm -rf "$tmpdir"
-+            fi
- 	    exit 1
- 	fi
- 	color="$1"
-@@ -50,6 +49,9 @@ while true ; do
- 	;;
- 	-* )
- 	echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+        if [ -d "$tmpdir" ]; then
-+            rm -rf "$tmpdir"
-+        fi
- 	exit 1
- 	;;
- 	* )
-@@ -60,6 +62,9 @@ done
- 
- if [ ! ${1-""} ] ; then
-     echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+    if [ -d "$tmpdir" ]; then
-+        rm -rf "$tmpdir"
-+    fi
-     exit 1
- fi
- size="$1"
-@@ -67,6 +72,9 @@ shift
- 
- if [ ${2-""} ] ; then
-     echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+    if [ -d "$tmpdir" ]; then
-+        rm -rf "$tmpdir"
-+    fi
-     exit 1
- fi
- 
-@@ -103,6 +111,6 @@ else
+@@ -90,6 +86,7 @@ else
+         -white | -black )
+         pnmpad $plainopt $color \
+             -left=$size -right=$size -top=$size -bottom=$size $tmp1
++	rm -rf "$tmpdir"
+         exit
+         ;;
+         * )
+@@ -102,7 +99,4 @@ else
+     pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
      pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3
  fi
- 
 -
 -
 -
-+if [ -d "$tmpdir" ]; then
-+    rm -rf "$tmpdir"
-+fi
-diff -up netpbm-10.47.04/editor/ppmfade.security2 netpbm-10.47.04/editor/ppmfade
---- netpbm-10.47.04/editor/ppmfade.security2	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/ppmfade	2009-10-21 15:03:01.000000000 +0200
+-
++rm -rf "$tmpdir"
+diff -up netpbm-10.47.06/editor/ppmfade.security-scripts netpbm-10.47.06/editor/ppmfade
+--- netpbm-10.47.06/editor/ppmfade.security-scripts	2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/ppmfade	2009-12-16 18:59:17.000000000 +0100
 @@ -14,6 +14,7 @@
  #
  #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -385,9 +352,9 @@ diff -up netpbm-10.47.04/editor/ppmfade.
 +system("rm $tmpdir/junk*$$.ppm");
  
  exit(0);
-diff -up netpbm-10.47.04/editor/ppmquantall.security2 netpbm-10.47.04/editor/ppmquantall
---- netpbm-10.47.04/editor/ppmquantall.security2	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/ppmquantall	2009-10-21 14:52:38.000000000 +0200
+diff -up netpbm-10.47.06/editor/ppmquantall.security-scripts netpbm-10.47.06/editor/ppmquantall
+--- netpbm-10.47.06/editor/ppmquantall.security-scripts	2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/ppmquantall	2009-12-16 18:59:17.000000000 +0100
 @@ -70,12 +70,8 @@ for i in ${files[@]}; do
      heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
  done
@@ -403,9 +370,9 @@ diff -up netpbm-10.47.04/editor/ppmquant
  
  pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all
  if [ $? != 0 ]; then
-diff -up netpbm-10.47.04/editor/ppmshadow.security2 netpbm-10.47.04/editor/ppmshadow
---- netpbm-10.47.04/editor/ppmshadow.security2	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/ppmshadow	2009-10-21 14:51:02.000000000 +0200
+diff -up netpbm-10.47.06/editor/ppmshadow.security-scripts netpbm-10.47.06/editor/ppmshadow
+--- netpbm-10.47.06/editor/ppmshadow.security-scripts	2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/ppmshadow	2009-12-16 18:59:17.000000000 +0100
 @@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
  
  


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- netpbm.spec	10 Dec 2009 09:25:05 -0000	1.150
+++ netpbm.spec	16 Dec 2009 18:35:47 -0000	1.151
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.47.05
+Version: 10.47.06
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -28,7 +28,6 @@ Patch14: netpbm-pnmtofiasco-stdin.patch
 Patch15: netpbm-svgtopam.patch
 Patch16: netpbm-ppmpat-segfault.patch
 Patch17: netpbm-pnmsmooth-segfault.patch
-Patch18: netpbm-pamtosvg.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -87,7 +86,6 @@ netpbm-progs.  You'll also need to insta
 %patch15 -p1 -b .svgtopam
 %patch16 -p1 -b .ppmpat-segfault
 %patch17 -p1 -b .pnmsmooth-segfault
-%patch18 -p1 -b .pamtosvg
 
 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
@@ -216,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Fri Dec 14 2009 Jindrich Novy <jnovy at redhat.com> 10.47.06-1
+- update to 10.47.06 - fixes the dumb pamtosvg mistake in 10.47.05
+- pnmmargin won't create leftovers in /tmp (#547888)
+
 * Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 10.47.05-1
 - update to 10.47.05
 - fixes pnmtofiasco, fiascotopnm, pamtosvg, pamtouil and ppmrainbow


--- netpbm-pamtosvg.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Dec 16 18:55:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Dec 2009 18:55:01 +0000 (UTC)
Subject: File alexandria_0.6.5+0.6.6alpha.orig.tar.gz uploaded to lookaside
	cache by mtasaka
Message-ID: <20091216185501.CB46328ED3A@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for alexandria:

3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz



From mtasaka at fedoraproject.org  Wed Dec 16 18:58:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Dec 2009 18:58:41 +0000 (UTC)
Subject: rpms/alexandria/F-11 alexandria-0.6.6alpha1-installprefix.patch,
	NONE, 
	1.1 .cvsignore, 1.10, 1.11 alexandria.spec, 1.40, 1.41 sources,
	1.10, 1.11 alexandria-0.6.4.1-use-2args-bindtextdomain.patch,
	1.1, NONE alexandria-0.6.5-WorldCat-results.patch, 1.1,
	NONE alexandria-0.6.5-crash-in-turkish.patch, 1.2,
	NONE alexandria-0.6.5-deastore-author-missing.patch, 1.1,
	NONE alexandria-0.6.5-glib_convert-syntax.patch, 1.2,
	NONE alexandria-0.6.5-search-result-sanity-check.patch, 1.2, NONE
Message-ID: <20091216185841.6A48211C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9429/F-11

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.6alpha1-installprefix.patch 
Removed Files:
	alexandria-0.6.4.1-use-2args-bindtextdomain.patch 
	alexandria-0.6.5-WorldCat-results.patch 
	alexandria-0.6.5-crash-in-turkish.patch 
	alexandria-0.6.5-deastore-author-missing.patch 
	alexandria-0.6.5-glib_convert-syntax.patch 
	alexandria-0.6.5-search-result-sanity-check.patch 
Log Message:
* Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
- Try 0.6.6 alpha


alexandria-0.6.6alpha1-installprefix.patch:
 Rakefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE alexandria-0.6.6alpha1-installprefix.patch ---
--- alexandria-0.6.5+0.6.6alpha/Rakefile.prefix	2009-12-17 02:21:21.000000000 +0900
+++ alexandria-0.6.5+0.6.6alpha/Rakefile	2009-12-17 02:30:48.000000000 +0900
@@ -19,8 +19,9 @@
 
 stage_dir = ENV['DESTDIR'] || 'tmp'
 
+INSTALL_PREFIX = ENV['install_prefix']
 PROJECT='alexandria'
-PREFIX='/usr'
+PREFIX="#{INSTALL_PREFIX}/usr"
 SHARE = "#{PREFIX}/share"
 
 DATA_VERSION = '0.6.3'
@@ -41,7 +42,7 @@
 debinstall = FileInstallTask.new(:debian_install, stage_dir, true) do |i|
 
   i.install_exe('bin', 'bin/*', "#{PREFIX}/bin")
-  i.install('lib', 'lib/**/*.rb', i.rubylib)
+  i.install('lib', 'lib/**/*.rb', "#{INSTALL_PREFIX}" + i.rubylib)
 
   share_files = ['data/alexandria/**/*', 'data/gnome/**/*.*',
                  'data/locale/**/*.mo', 'data/omf/**/*.omf', 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 Aug 2009 22:13:59 -0000	1.10
+++ .cvsignore	16 Dec 2009 18:58:41 -0000	1.11
@@ -1 +1 @@
-alexandria-0.6.5.tar.gz
+alexandria_0.6.5+0.6.6alpha.orig.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- alexandria.spec	8 Sep 2009 03:33:30 -0000	1.40
+++ alexandria.spec	16 Dec 2009 18:58:41 -0000	1.41
@@ -2,42 +2,31 @@
 %define		rubyabi		1.8
 %define		repoid		62178
 
-%define		majorver	0.6.5
-%undefine		minorver	
+%define		prevver	0.6.5
+%define		majorver	0.6.6
+%define		minorver	alpha
 
-%define		fedorarel	7
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
 
 Name:		alexandria
 Version:	%{majorver}
-Release:	%{rel}%{?dist}.1
+Release:	%{rel}%{?dist}
 Summary:	Book collection manager
 
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
-Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
+#Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
+Source0:	https://launchpad.net/~alexandria-team/+archive/ppa/+files/%{name}_%{prevver}+%{version}%{?minorver}.orig.tar.gz
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Clarify the usage of GLib.convert 
-# ref: alexandria-Bugs-26968
-Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
-# Add some sanity check for search results
-# ref: alexandria-Bugs-27000
-Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
-# Fix for DeaStore search engine where search result does not
-# contain Author item
-# ref: alexandria-Bugs-27000
-Patch5:		alexandria-0.6.5-deastore-author-missing.patch
-# Alexandria crashes in tr_TR.UTF-8 on startup
-# RH bug 520170, alexandria-Bugs-27015
-Patch6:		alexandria-0.6.5-crash-in-turkish.patch
-# Fix for parsing WorldCat search result
-# ref: alexandria-Bugs-27028
-Patch7:		alexandria-0.6.5-WorldCat-results.patch
+# Add install_prefix
+# Will ask upstream
+Patch10:	alexandria-0.6.6alpha1-installprefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -86,23 +75,19 @@ Requires(preun):	GConf2
 Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
-%setup -q -n %{name}-%{majorver}%{?minorver}
+#%%setup -q -n %{name}-%{majorver}%{?minorver}
+%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-%patch3 -p0 -b .glib
-%patch4 -p0 -b .sanity
-%patch5 -p0 -b .deastore
-%patch6 -p0 -b .tr_TR
-%patch7 -p0 -b .worldcat
+%patch10 -p1 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
-	-e "s|\(b.display_version = \).*$|\1'%{version}-%{release}'|" \
+	-e "s|\(DISPLAY_VERSION = \).*$|\1'%{version}-%{release}'|" \
 	Rakefile
 
 %build
 rake build
 
-
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -114,10 +99,11 @@ rake build
 %{__ln_s} -f /bin/true tmpbin/gtk-update-icon-cache
 
 export PATH="$(pwd)/tmpbin:$PATH"
+export RUBYLIBDIR=%{ruby_sitelib}
 #export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-export PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
-rake install
+rake install \
+	install_prefix=$RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
@@ -134,12 +120,11 @@ for s in 64 128 ; do
 		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
 done
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
-%{__install} -c -p -m 0644 schemas/%{name}.schemas \
-	$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
-
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/locale/
-%{__cp} -pr data/locale/* $RPM_BUILD_ROOT%{_datadir}/locale/
+# Move gconf files to where Fedora uses
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
+%{__mv} \
+	$RPM_BUILD_ROOT%{_datadir}/gconf/ \
+	$RPM_BUILD_ROOT%{_sysconfdir}/
 
 # Clean up documents
 %{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir}
@@ -148,6 +133,9 @@ done
 # Removing for Fedora
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/
 
+# Cleanups
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %clean
@@ -219,6 +207,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
+- Try 0.6.6 alpha
+
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Wrong patch of sanity check patch applied on F-10/11, fixing...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 Aug 2009 22:13:59 -0000	1.10
+++ sources	16 Dec 2009 18:58:41 -0000	1.11
@@ -1 +1 @@
-9c8655f361e6a0c6f8cdc97f36bd2d0f  alexandria-0.6.5.tar.gz
+3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz


--- alexandria-0.6.4.1-use-2args-bindtextdomain.patch DELETED ---


--- alexandria-0.6.5-WorldCat-results.patch DELETED ---


--- alexandria-0.6.5-crash-in-turkish.patch DELETED ---


--- alexandria-0.6.5-deastore-author-missing.patch DELETED ---


--- alexandria-0.6.5-glib_convert-syntax.patch DELETED ---


--- alexandria-0.6.5-search-result-sanity-check.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Dec 16 18:58:42 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Dec 2009 18:58:42 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria-0.6.6alpha1-installprefix.patch,
	NONE, 
	1.1 .cvsignore, 1.10, 1.11 alexandria.spec, 1.43, 1.44 sources,
	1.10, 1.11 alexandria-0.6.4.1-use-2args-bindtextdomain.patch,
	1.1, NONE alexandria-0.6.5-WorldCat-results.patch, 1.1,
	NONE alexandria-0.6.5-crash-in-turkish.patch, 1.2,
	NONE alexandria-0.6.5-deastore-author-missing.patch, 1.1,
	NONE alexandria-0.6.5-glib_convert-syntax.patch, 1.2,
	NONE alexandria-0.6.5-search-result-sanity-check.patch, 1.2, NONE
Message-ID: <20091216185842.09ABE11C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9429/devel

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.6alpha1-installprefix.patch 
Removed Files:
	alexandria-0.6.4.1-use-2args-bindtextdomain.patch 
	alexandria-0.6.5-WorldCat-results.patch 
	alexandria-0.6.5-crash-in-turkish.patch 
	alexandria-0.6.5-deastore-author-missing.patch 
	alexandria-0.6.5-glib_convert-syntax.patch 
	alexandria-0.6.5-search-result-sanity-check.patch 
Log Message:
* Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
- Try 0.6.6 alpha


alexandria-0.6.6alpha1-installprefix.patch:
 Rakefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE alexandria-0.6.6alpha1-installprefix.patch ---
--- alexandria-0.6.5+0.6.6alpha/Rakefile.prefix	2009-12-17 02:21:21.000000000 +0900
+++ alexandria-0.6.5+0.6.6alpha/Rakefile	2009-12-17 02:30:48.000000000 +0900
@@ -19,8 +19,9 @@
 
 stage_dir = ENV['DESTDIR'] || 'tmp'
 
+INSTALL_PREFIX = ENV['install_prefix']
 PROJECT='alexandria'
-PREFIX='/usr'
+PREFIX="#{INSTALL_PREFIX}/usr"
 SHARE = "#{PREFIX}/share"
 
 DATA_VERSION = '0.6.3'
@@ -41,7 +42,7 @@
 debinstall = FileInstallTask.new(:debian_install, stage_dir, true) do |i|
 
   i.install_exe('bin', 'bin/*', "#{PREFIX}/bin")
-  i.install('lib', 'lib/**/*.rb', i.rubylib)
+  i.install('lib', 'lib/**/*.rb', "#{INSTALL_PREFIX}" + i.rubylib)
 
   share_files = ['data/alexandria/**/*', 'data/gnome/**/*.*',
                  'data/locale/**/*.mo', 'data/omf/**/*.omf', 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 Aug 2009 22:13:59 -0000	1.10
+++ .cvsignore	16 Dec 2009 18:58:41 -0000	1.11
@@ -1 +1 @@
-alexandria-0.6.5.tar.gz
+alexandria_0.6.5+0.6.6alpha.orig.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- alexandria.spec	2 Sep 2009 05:01:53 -0000	1.43
+++ alexandria.spec	16 Dec 2009 18:58:41 -0000	1.44
@@ -2,10 +2,11 @@
 %define		rubyabi		1.8
 %define		repoid		62178
 
-%define		majorver	0.6.5
-%undefine		minorver	
+%define		prevver	0.6.5
+%define		majorver	0.6.6
+%define		minorver	alpha
 
-%define		fedorarel	7
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -18,26 +19,14 @@ Summary:	Book collection manager
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
-Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
+#Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
+Source0:	https://launchpad.net/~alexandria-team/+archive/ppa/+files/%{name}_%{prevver}+%{version}%{?minorver}.orig.tar.gz
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Clarify the usage of GLib.convert 
-# ref: alexandria-Bugs-26968
-Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
-# Add some sanity check for search results
-# ref: alexandria-Bugs-27000
-Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
-# Fix for DeaStore search engine where search result does not
-# contain Author item
-# ref: alexandria-Bugs-27000
-Patch5:		alexandria-0.6.5-deastore-author-missing.patch
-# Alexandria crashes in tr_TR.UTF-8 on startup
-# RH bug 520170, alexandria-Bugs-27015
-Patch6:		alexandria-0.6.5-crash-in-turkish.patch
-# Fix for parsing WorldCat search result
-# ref: alexandria-Bugs-27028
-Patch7:		alexandria-0.6.5-WorldCat-results.patch
+# Add install_prefix
+# Will ask upstream
+Patch10:	alexandria-0.6.6alpha1-installprefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -86,23 +75,19 @@ Requires(preun):	GConf2
 Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
-%setup -q -n %{name}-%{majorver}%{?minorver}
+#%%setup -q -n %{name}-%{majorver}%{?minorver}
+%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-%patch3 -p0 -b .glib
-%patch4 -p0 -b .sanity
-%patch5 -p0 -b .deastore
-%patch6 -p0 -b .tr_TR
-%patch7 -p0 -b .worldcat
+%patch10 -p1 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
-	-e "s|\(b.display_version = \).*$|\1'%{version}-%{release}'|" \
+	-e "s|\(DISPLAY_VERSION = \).*$|\1'%{version}-%{release}'|" \
 	Rakefile
 
 %build
 rake build
 
-
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -114,10 +99,11 @@ rake build
 %{__ln_s} -f /bin/true tmpbin/gtk-update-icon-cache
 
 export PATH="$(pwd)/tmpbin:$PATH"
+export RUBYLIBDIR=%{ruby_sitelib}
 #export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-export PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
-rake install
+rake install \
+	install_prefix=$RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
@@ -134,12 +120,11 @@ for s in 64 128 ; do
 		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
 done
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
-%{__install} -c -p -m 0644 schemas/%{name}.schemas \
-	$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
-
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/locale/
-%{__cp} -pr data/locale/* $RPM_BUILD_ROOT%{_datadir}/locale/
+# Move gconf files to where Fedora uses
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
+%{__mv} \
+	$RPM_BUILD_ROOT%{_datadir}/gconf/ \
+	$RPM_BUILD_ROOT%{_sysconfdir}/
 
 # Clean up documents
 %{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir}
@@ -148,6 +133,9 @@ done
 # Removing for Fedora
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/
 
+# Cleanups
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %clean
@@ -219,6 +207,12 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
+- Try 0.6.6 alpha
+
+* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Wrong patch of sanity check patch applied on F-10/11, fixing...
+
 * Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-7
 - Fix for parsing WorldCat provider search result (alexandria-Bugs-27028)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 Aug 2009 22:14:00 -0000	1.10
+++ sources	16 Dec 2009 18:58:41 -0000	1.11
@@ -1 +1 @@
-9c8655f361e6a0c6f8cdc97f36bd2d0f  alexandria-0.6.5.tar.gz
+3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz


--- alexandria-0.6.4.1-use-2args-bindtextdomain.patch DELETED ---


--- alexandria-0.6.5-WorldCat-results.patch DELETED ---


--- alexandria-0.6.5-crash-in-turkish.patch DELETED ---


--- alexandria-0.6.5-deastore-author-missing.patch DELETED ---


--- alexandria-0.6.5-glib_convert-syntax.patch DELETED ---


--- alexandria-0.6.5-search-result-sanity-check.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Dec 16 18:58:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 16 Dec 2009 18:58:41 +0000 (UTC)
Subject: rpms/alexandria/F-12 alexandria-0.6.6alpha1-installprefix.patch,
	NONE, 
	1.1 .cvsignore, 1.10, 1.11 alexandria.spec, 1.43, 1.44 sources,
	1.10, 1.11 alexandria-0.6.4.1-use-2args-bindtextdomain.patch,
	1.1, NONE alexandria-0.6.5-WorldCat-results.patch, 1.1,
	NONE alexandria-0.6.5-crash-in-turkish.patch, 1.2,
	NONE alexandria-0.6.5-deastore-author-missing.patch, 1.1,
	NONE alexandria-0.6.5-glib_convert-syntax.patch, 1.2,
	NONE alexandria-0.6.5-search-result-sanity-check.patch, 1.2, NONE
Message-ID: <20091216185841.A28FF11C00C5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9429/F-12

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.6alpha1-installprefix.patch 
Removed Files:
	alexandria-0.6.4.1-use-2args-bindtextdomain.patch 
	alexandria-0.6.5-WorldCat-results.patch 
	alexandria-0.6.5-crash-in-turkish.patch 
	alexandria-0.6.5-deastore-author-missing.patch 
	alexandria-0.6.5-glib_convert-syntax.patch 
	alexandria-0.6.5-search-result-sanity-check.patch 
Log Message:
* Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
- Try 0.6.6 alpha


alexandria-0.6.6alpha1-installprefix.patch:
 Rakefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE alexandria-0.6.6alpha1-installprefix.patch ---
--- alexandria-0.6.5+0.6.6alpha/Rakefile.prefix	2009-12-17 02:21:21.000000000 +0900
+++ alexandria-0.6.5+0.6.6alpha/Rakefile	2009-12-17 02:30:48.000000000 +0900
@@ -19,8 +19,9 @@
 
 stage_dir = ENV['DESTDIR'] || 'tmp'
 
+INSTALL_PREFIX = ENV['install_prefix']
 PROJECT='alexandria'
-PREFIX='/usr'
+PREFIX="#{INSTALL_PREFIX}/usr"
 SHARE = "#{PREFIX}/share"
 
 DATA_VERSION = '0.6.3'
@@ -41,7 +42,7 @@
 debinstall = FileInstallTask.new(:debian_install, stage_dir, true) do |i|
 
   i.install_exe('bin', 'bin/*', "#{PREFIX}/bin")
-  i.install('lib', 'lib/**/*.rb', i.rubylib)
+  i.install('lib', 'lib/**/*.rb', "#{INSTALL_PREFIX}" + i.rubylib)
 
   share_files = ['data/alexandria/**/*', 'data/gnome/**/*.*',
                  'data/locale/**/*.mo', 'data/omf/**/*.omf', 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 Aug 2009 22:13:59 -0000	1.10
+++ .cvsignore	16 Dec 2009 18:58:41 -0000	1.11
@@ -1 +1 @@
-alexandria-0.6.5.tar.gz
+alexandria_0.6.5+0.6.6alpha.orig.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/alexandria.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- alexandria.spec	2 Sep 2009 05:01:53 -0000	1.43
+++ alexandria.spec	16 Dec 2009 18:58:41 -0000	1.44
@@ -2,10 +2,11 @@
 %define		rubyabi		1.8
 %define		repoid		62178
 
-%define		majorver	0.6.5
-%undefine		minorver	
+%define		prevver	0.6.5
+%define		majorver	0.6.6
+%define		minorver	alpha
 
-%define		fedorarel	7
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -18,26 +19,14 @@ Summary:	Book collection manager
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
-Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
+#Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
+Source0:	https://launchpad.net/~alexandria-team/+archive/ppa/+files/%{name}_%{prevver}+%{version}%{?minorver}.orig.tar.gz
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Clarify the usage of GLib.convert 
-# ref: alexandria-Bugs-26968
-Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
-# Add some sanity check for search results
-# ref: alexandria-Bugs-27000
-Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
-# Fix for DeaStore search engine where search result does not
-# contain Author item
-# ref: alexandria-Bugs-27000
-Patch5:		alexandria-0.6.5-deastore-author-missing.patch
-# Alexandria crashes in tr_TR.UTF-8 on startup
-# RH bug 520170, alexandria-Bugs-27015
-Patch6:		alexandria-0.6.5-crash-in-turkish.patch
-# Fix for parsing WorldCat search result
-# ref: alexandria-Bugs-27028
-Patch7:		alexandria-0.6.5-WorldCat-results.patch
+# Add install_prefix
+# Will ask upstream
+Patch10:	alexandria-0.6.6alpha1-installprefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -86,23 +75,19 @@ Requires(preun):	GConf2
 Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
-%setup -q -n %{name}-%{majorver}%{?minorver}
+#%%setup -q -n %{name}-%{majorver}%{?minorver}
+%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-%patch3 -p0 -b .glib
-%patch4 -p0 -b .sanity
-%patch5 -p0 -b .deastore
-%patch6 -p0 -b .tr_TR
-%patch7 -p0 -b .worldcat
+%patch10 -p1 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
-	-e "s|\(b.display_version = \).*$|\1'%{version}-%{release}'|" \
+	-e "s|\(DISPLAY_VERSION = \).*$|\1'%{version}-%{release}'|" \
 	Rakefile
 
 %build
 rake build
 
-
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -114,10 +99,11 @@ rake build
 %{__ln_s} -f /bin/true tmpbin/gtk-update-icon-cache
 
 export PATH="$(pwd)/tmpbin:$PATH"
+export RUBYLIBDIR=%{ruby_sitelib}
 #export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-export PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
-rake install
+rake install \
+	install_prefix=$RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
@@ -134,12 +120,11 @@ for s in 64 128 ; do
 		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
 done
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
-%{__install} -c -p -m 0644 schemas/%{name}.schemas \
-	$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
-
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/locale/
-%{__cp} -pr data/locale/* $RPM_BUILD_ROOT%{_datadir}/locale/
+# Move gconf files to where Fedora uses
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
+%{__mv} \
+	$RPM_BUILD_ROOT%{_datadir}/gconf/ \
+	$RPM_BUILD_ROOT%{_sysconfdir}/
 
 # Clean up documents
 %{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir}
@@ -148,6 +133,9 @@ done
 # Removing for Fedora
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/
 
+# Cleanups
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %clean
@@ -219,6 +207,12 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
+- Try 0.6.6 alpha
+
+* Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Wrong patch of sanity check patch applied on F-10/11, fixing...
+
 * Wed Sep  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-7
 - Fix for parsing WorldCat provider search result (alexandria-Bugs-27028)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 Aug 2009 22:14:00 -0000	1.10
+++ sources	16 Dec 2009 18:58:41 -0000	1.11
@@ -1 +1 @@
-9c8655f361e6a0c6f8cdc97f36bd2d0f  alexandria-0.6.5.tar.gz
+3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz


--- alexandria-0.6.4.1-use-2args-bindtextdomain.patch DELETED ---


--- alexandria-0.6.5-WorldCat-results.patch DELETED ---


--- alexandria-0.6.5-crash-in-turkish.patch DELETED ---


--- alexandria-0.6.5-deastore-author-missing.patch DELETED ---


--- alexandria-0.6.5-glib_convert-syntax.patch DELETED ---


--- alexandria-0.6.5-search-result-sanity-check.patch DELETED ---



From kwright at fedoraproject.org  Wed Dec 16 18:59:34 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 16 Dec 2009 18:59:34 +0000 (UTC)
Subject: File pki-native-tools-1.3.0.tar.gz uploaded to lookaside cache by
	kwright
Message-ID: <20091216185934.2FF3F28ED21@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for pki-native-tools:

c3df617e17f9b09b82d0d4d96bba295c  pki-native-tools-1.3.0.tar.gz



From kwright at fedoraproject.org  Wed Dec 16 19:01:24 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 16 Dec 2009 19:01:24 +0000 (UTC)
Subject: rpms/pki-native-tools/F-11 import.log, NONE,
	1.1 pki-native-tools.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216190124.149D211C00C5@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-native-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10226/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-native-tools.spec 
Log Message:
new dogtag package: see rhbz #522895



--- NEW FILE import.log ---
pki-native-tools-1_3_0-4_fc11:F-11:pki-native-tools-1.3.0-4.fc11.src.rpm:1260989978


--- NEW FILE pki-native-tools.spec ---
Name:           pki-native-tools
Version:        1.3.0
Release:        4%{?dist}
Summary:        Dogtag Certificate System - Native Tools
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cyrus-sasl-devel
BuildRequires:  mozldap-devel
BuildRequires:  nspr-devel >= 4.6.99
BuildRequires:  nss-devel >= 3.12.3.99
BuildRequires:  svrcore-devel

Requires:       mozldap-tools
Requires:       nss >= 3.12.3.99
Requires:       nss-tools >= 3.12.3.99

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

These platform-dependent PKI executables are used to help make
Dogtag Certificate System into a more complete and robust PKI solution.

%prep

%setup -q -n %{name}-%{version}

%build
%configure \
%ifarch ppc64 s390x sparc64 x86_64
    --enable-64bit \
%endif
    --libdir=%{_libdir}
make

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

## rearrange files to be in the desired native packaging layout
mkdir -p %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}/opt/conf/*      %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}/opt/samples/*   %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}%{_libexecdir}/* %{buildroot}%{_libdir}/pki/native-tools

# create wrappers
for wrapper in bulkissuance p7tool revoker setpin sslget tkstool
do
    sed -e "s|\[PKI_PRODUCT\]|pki|g"            \
        -e "s|\[PKI_SUBSYSTEM\]|native-tools|g" \
        -e "s|\[PKI_COMMAND\]|${wrapper}|g" \
        %{buildroot}/opt/templates/pki_subsystem_command_wrapper > %{buildroot}%{_bindir}/${wrapper} ;
done

## remove unwanted files
rm -rf %{buildroot}/opt
rm -rf %{buildroot}%{_libexecdir}
rm -rf %{buildroot}%{_datadir}/pki

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE doc/README
%{_bindir}/*
%{_libdir}/pki

%changelog
* Fri Dec 11 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- fixed several issues with the spec file:
- Removed BuildRequires bash, Requires perl
- Removed 'with exceptions' from License

* Tue Nov 10 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- Moved contents of 'setup_package' to spec file

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- Prepended directory path in front of setup_package

* Mon Oct 12 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-native-tools/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:32:24 -0000	1.1
+++ .cvsignore	16 Dec 2009 19:01:23 -0000	1.2
@@ -0,0 +1 @@
+pki-native-tools-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-native-tools/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:32:24 -0000	1.1
+++ sources	16 Dec 2009 19:01:23 -0000	1.2
@@ -0,0 +1 @@
+c3df617e17f9b09b82d0d4d96bba295c  pki-native-tools-1.3.0.tar.gz



From wtogami at fedoraproject.org  Wed Dec 16 19:05:11 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 16 Dec 2009 19:05:11 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.135,1.136
Message-ID: <20091216190511.C6EB311C00C5@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11143

Modified Files:
	spamassassin.spec 
Log Message:
bump



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- spamassassin.spec	3 Dec 2009 21:13:34 -0000	1.135
+++ spamassassin.spec	16 Dec 2009 19:05:11 -0000	1.136
@@ -16,6 +16,10 @@
 %define fedora 6
 %define dist .el5
 %endif
+%if 0%{?rhel} == 6
+%define fedora 12
+%define dist .el6
+%endif
 
 # Define variables to use in conditionals
 %define option_ssl 0
@@ -44,7 +48,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename beta1
-Release: 0.21.%{prename}%{?dist}
+Release: 0.22.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/



From notting at fedoraproject.org  Wed Dec 16 19:08:42 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 16 Dec 2009 19:08:42 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.120,1.121
Message-ID: <20091216190842.C0FAC11C00C5@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12033

Modified Files:
	comps-f13.xml.in 
Log Message:
move applets to default, not mandatory



Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- comps-f13.xml.in	16 Dec 2009 05:50:41 -0000	1.120
+++ comps-f13.xml.in	16 Dec 2009 19:08:42 -0000	1.121
@@ -2539,7 +2539,6 @@
     <packagelist>
       <packagereq type="mandatory">control-center</packagereq>
       <packagereq type="mandatory">fedora-gnome-theme</packagereq>
-      <packagereq type="mandatory">gnome-applets</packagereq>
       <packagereq type="mandatory">gnome-panel</packagereq>
       <packagereq type="mandatory">gnome-session</packagereq>
       <packagereq type="mandatory">gnome-terminal</packagereq>
@@ -2562,6 +2561,7 @@
       <packagereq type="default">gdm-plugin-fingerprint</packagereq>
       <packagereq type="default">gdm-user-switch-applet</packagereq>
       <packagereq type="default">gedit</packagereq>
+      <packagereq type="default">gnome-applets</packagereq>
       <packagereq type="default">gnome-backgrounds</packagereq>
       <packagereq type="default">gnome-bluetooth</packagereq>
       <packagereq type="default">gnome-disk-utility</packagereq>



From kwright at fedoraproject.org  Wed Dec 16 19:23:02 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 16 Dec 2009 19:23:02 +0000 (UTC)
Subject: rpms/pki-native-tools/F-12 import.log, NONE,
	1.1 pki-native-tools.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216192302.92BDC11C00C5@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-native-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15472/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-native-tools.spec 
Log Message:
new dogtag package: see rhbz #522895



--- NEW FILE import.log ---
pki-native-tools-1_3_0-4_fc12:F-12:pki-native-tools-1.3.0-4.fc12.src.rpm:1260991350


--- NEW FILE pki-native-tools.spec ---
Name:           pki-native-tools
Version:        1.3.0
Release:        4%{?dist}
Summary:        Dogtag Certificate System - Native Tools
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cyrus-sasl-devel
BuildRequires:  mozldap-devel
BuildRequires:  nspr-devel >= 4.6.99
BuildRequires:  nss-devel >= 3.12.3.99
BuildRequires:  svrcore-devel

Requires:       mozldap-tools
Requires:       nss >= 3.12.3.99
Requires:       nss-tools >= 3.12.3.99

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

These platform-dependent PKI executables are used to help make
Dogtag Certificate System into a more complete and robust PKI solution.

%prep

%setup -q -n %{name}-%{version}

%build
%configure \
%ifarch ppc64 s390x sparc64 x86_64
    --enable-64bit \
%endif
    --libdir=%{_libdir}
make

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

## rearrange files to be in the desired native packaging layout
mkdir -p %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}/opt/conf/*      %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}/opt/samples/*   %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}%{_libexecdir}/* %{buildroot}%{_libdir}/pki/native-tools

# create wrappers
for wrapper in bulkissuance p7tool revoker setpin sslget tkstool
do
    sed -e "s|\[PKI_PRODUCT\]|pki|g"            \
        -e "s|\[PKI_SUBSYSTEM\]|native-tools|g" \
        -e "s|\[PKI_COMMAND\]|${wrapper}|g" \
        %{buildroot}/opt/templates/pki_subsystem_command_wrapper > %{buildroot}%{_bindir}/${wrapper} ;
done

## remove unwanted files
rm -rf %{buildroot}/opt
rm -rf %{buildroot}%{_libexecdir}
rm -rf %{buildroot}%{_datadir}/pki

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE doc/README
%{_bindir}/*
%{_libdir}/pki

%changelog
* Fri Dec 11 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- fixed several issues with the spec file:
- Removed BuildRequires bash, Requires perl
- Removed 'with exceptions' from License

* Tue Nov 10 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- Moved contents of 'setup_package' to spec file

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- Prepended directory path in front of setup_package

* Mon Oct 12 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-native-tools/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:32:24 -0000	1.1
+++ .cvsignore	16 Dec 2009 19:23:02 -0000	1.2
@@ -0,0 +1 @@
+pki-native-tools-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-native-tools/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:32:24 -0000	1.1
+++ sources	16 Dec 2009 19:23:02 -0000	1.2
@@ -0,0 +1 @@
+c3df617e17f9b09b82d0d4d96bba295c  pki-native-tools-1.3.0.tar.gz



From kwright at fedoraproject.org  Wed Dec 16 19:30:33 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 16 Dec 2009 19:30:33 +0000 (UTC)
Subject: rpms/pki-native-tools/EL-5 import.log, NONE,
	1.1 pki-native-tools.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216193033.AEF7111C00C5@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-native-tools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17392/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-native-tools.spec 
Log Message:
new dogtag package: see rhbz #522895



--- NEW FILE import.log ---
pki-native-tools-1_3_0-4_el5:EL-5:pki-native-tools-1.3.0-4.el5.src.rpm:1260991786


--- NEW FILE pki-native-tools.spec ---
Name:           pki-native-tools
Version:        1.3.0
Release:        4%{?dist}
Summary:        Dogtag Certificate System - Native Tools
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cyrus-sasl-devel
BuildRequires:  mozldap-devel
BuildRequires:  nspr-devel >= 4.6.99
BuildRequires:  nss-devel >= 3.12.3.99
BuildRequires:  svrcore-devel

Requires:       mozldap-tools
Requires:       nss >= 3.12.3.99
Requires:       nss-tools >= 3.12.3.99

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

These platform-dependent PKI executables are used to help make
Dogtag Certificate System into a more complete and robust PKI solution.

%prep

%setup -q -n %{name}-%{version}

%build
%configure \
%ifarch ppc64 s390x sparc64 x86_64
    --enable-64bit \
%endif
    --libdir=%{_libdir}
make

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

## rearrange files to be in the desired native packaging layout
mkdir -p %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}/opt/conf/*      %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}/opt/samples/*   %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}%{_libexecdir}/* %{buildroot}%{_libdir}/pki/native-tools

# create wrappers
for wrapper in bulkissuance p7tool revoker setpin sslget tkstool
do
    sed -e "s|\[PKI_PRODUCT\]|pki|g"            \
        -e "s|\[PKI_SUBSYSTEM\]|native-tools|g" \
        -e "s|\[PKI_COMMAND\]|${wrapper}|g" \
        %{buildroot}/opt/templates/pki_subsystem_command_wrapper > %{buildroot}%{_bindir}/${wrapper} ;
done

## remove unwanted files
rm -rf %{buildroot}/opt
rm -rf %{buildroot}%{_libexecdir}
rm -rf %{buildroot}%{_datadir}/pki

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE doc/README
%{_bindir}/*
%{_libdir}/pki

%changelog
* Fri Dec 11 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- fixed several issues with the spec file:
- Removed BuildRequires bash, Requires perl
- Removed 'with exceptions' from License

* Tue Nov 10 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- Moved contents of 'setup_package' to spec file

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- Prepended directory path in front of setup_package

* Mon Oct 12 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-native-tools/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:32:24 -0000	1.1
+++ .cvsignore	16 Dec 2009 19:30:33 -0000	1.2
@@ -0,0 +1 @@
+pki-native-tools-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-native-tools/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:32:24 -0000	1.1
+++ sources	16 Dec 2009 19:30:33 -0000	1.2
@@ -0,0 +1 @@
+c3df617e17f9b09b82d0d4d96bba295c  pki-native-tools-1.3.0.tar.gz



From maxamillion at fedoraproject.org  Wed Dec 16 19:31:10 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 19:31:10 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.31,1.32
Message-ID: <20091216193110.8168611C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17587

Modified Files:
	midori.spec 
Log Message:
Update to latest upstream (0.2.2)




Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/devel/midori.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- midori.spec	2 Dec 2009 23:07:02 -0000	1.31
+++ midori.spec	16 Dec 2009 19:31:10 -0000	1.32
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.2.1
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -103,15 +103,11 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.2-1
+- Update to new upstream release (0.2.2)
+
 * Wed Dec 02 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.1-1
-- Update to new upstream release (0.2.1): Fix Mouse Gestures to work after 
-  activation, Explicitly link to X11 to support gold, Implement various Hildon 
-  specific features, Hide the navigationbar in fullscreen, Implement permanent 
-  storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
-  Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
-  Introduce the Tab History List extension, Load icons laziy at startup to speed 
-  up startup, Introduce a Web Cache extension, Refactor and tweak the 
-  Preferences dialogue, Implement combos to choose external applications
+- Update to new upstream release (0.2.1)
 
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1
 - Update to new upstream release (0.2.0): Drag-scroll on touchscreen devices,



From maxamillion at fedoraproject.org  Wed Dec 16 19:31:51 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 19:31:51 +0000 (UTC)
Subject: File midori-0.2.2.tar.bz2 uploaded to lookaside cache by maxamillion
Message-ID: <20091216193151.9B94C28ECEF@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for midori:

14f81a7a10f80a173da1b5e88713400b  midori-0.2.2.tar.bz2



From maxamillion at fedoraproject.org  Wed Dec 16 19:32:18 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 19:32:18 +0000 (UTC)
Subject: rpms/midori/devel .cvsignore,1.16,1.17 sources,1.16,1.17
Message-ID: <20091216193218.F270211C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18008

Modified Files:
	.cvsignore sources 
Log Message:
New sources




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/midori/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Dec 2009 22:43:17 -0000	1.16
+++ .cvsignore	16 Dec 2009 19:32:18 -0000	1.17
@@ -1 +1 @@
-midori-0.2.1.tar.bz2
+midori-0.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/midori/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Dec 2009 22:43:17 -0000	1.16
+++ sources	16 Dec 2009 19:32:18 -0000	1.17
@@ -1 +1 @@
-3cee94c9a22316504a3ba99bc92e0245  midori-0.2.1.tar.bz2
+14f81a7a10f80a173da1b5e88713400b  midori-0.2.2.tar.bz2



From maxamillion at fedoraproject.org  Wed Dec 16 19:39:13 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 19:39:13 +0000 (UTC)
Subject: rpms/midori/F-12 midori.spec,1.30,1.31
Message-ID: <20091216193913.6AD5F11C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20016

Modified Files:
	midori.spec 
Log Message:
Update to latest upstream (0.2.2)




Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/F-12/midori.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- midori.spec	2 Dec 2009 23:06:18 -0000	1.30
+++ midori.spec	16 Dec 2009 19:39:13 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.2.1
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -103,15 +103,11 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.2-1
+- Update to new upstream release (0.2.2)
+
 * Wed Dec 02 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.1-1
-- Update to new upstream release (0.2.1): Fix Mouse Gestures to work after 
-  activation, Explicitly link to X11 to support gold, Implement various Hildon 
-  specific features, Hide the navigationbar in fullscreen, Implement permanent 
-  storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
-  Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
-  Introduce the Tab History List extension, Load icons laziy at startup to speed  
-  up startup, Introduce a Web Cache extension, Refactor and tweak the 
-  Preferences dialogue, Implement combos to choose external applications
+- Update to new upstream release (0.2.1)
 
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1
 - Update to new upstream release (0.2.0): Drag-scroll on touchscreen devices,



From maxamillion at fedoraproject.org  Wed Dec 16 19:39:54 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 19:39:54 +0000 (UTC)
Subject: rpms/midori/F-12 .cvsignore,1.16,1.17 sources,1.16,1.17
Message-ID: <20091216193954.571A211C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20208

Modified Files:
	.cvsignore sources 
Log Message:
New sources (0.2.2)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/midori/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Dec 2009 22:57:09 -0000	1.16
+++ .cvsignore	16 Dec 2009 19:39:54 -0000	1.17
@@ -1 +1 @@
-midori-0.2.1.tar.bz2
+midori-0.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/midori/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Dec 2009 22:57:09 -0000	1.16
+++ sources	16 Dec 2009 19:39:54 -0000	1.17
@@ -1 +1 @@
-3cee94c9a22316504a3ba99bc92e0245  midori-0.2.1.tar.bz2
+14f81a7a10f80a173da1b5e88713400b  midori-0.2.2.tar.bz2



From chkr at fedoraproject.org  Wed Dec 16 19:42:28 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Dec 2009 19:42:28 +0000 (UTC)
Subject: File podsleuth-20091216.tar.bz2 uploaded to lookaside cache by chkr
Message-ID: <20091216194228.A5D5828ED1C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for podsleuth:

bd906c27fb0d4b623a25d25a05c200e8  podsleuth-20091216.tar.bz2



From maxamillion at fedoraproject.org  Wed Dec 16 20:02:32 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 20:02:32 +0000 (UTC)
Subject: rpms/midori/F-11 midori.spec,1.29,1.30
Message-ID: <20091216200232.3B7CA11C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25618

Modified Files:
	midori.spec 
Log Message:
Update to latest upstream (0.2.2)




Index: midori.spec
===================================================================
RCS file: /cvs/extras/rpms/midori/F-11/midori.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- midori.spec	10 Dec 2009 15:01:50 -0000	1.29
+++ midori.spec	16 Dec 2009 20:02:32 -0000	1.30
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.2.1
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -103,15 +103,11 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.2-1
+- Update to new upstream release (0.2.2)
+
 * Wed Dec 02 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.2.1-1
-- Update to new upstream release (0.2.1): Fix Mouse Gestures to work after 
-  activation, Explicitly link to X11 to support gold, Implement various Hildon 
-  specific features, Hide the navigationbar in fullscreen, Implement permanent 
-  storage of form history, Support keyboard shortcuts like Ctrl+Tab or "a", 
-  Handle SIGHUP, SIGINT, SIGTERM and SIGQUIT, Make creation of new windows fast,
-  Introduce the Tab History List extension, Load icons laziy at startup to speed 
-  up startup, Introduce a Web Cache extension, Refactor and tweak the 
-  Preferences dialogue, Implement combos to choose external applications
+- Update to new upstream release (0.2.1) 
 
 * Tue Oct 20 2009 Peter Gordon <peter at thecodergeek.com> - 0.2.0-1
 - Update to new upstream release (0.2.0): Drag-scroll on touchscreen devices,



From maxamillion at fedoraproject.org  Wed Dec 16 20:03:50 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 20:03:50 +0000 (UTC)
Subject: rpms/midori/F-11 .cvsignore,1.16,1.17 sources,1.16,1.17
Message-ID: <20091216200350.099AA11C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25957

Modified Files:
	.cvsignore sources 
Log Message:
New sources (0.2.2)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/midori/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	10 Dec 2009 15:01:50 -0000	1.16
+++ .cvsignore	16 Dec 2009 20:03:49 -0000	1.17
@@ -1 +1 @@
-midori-0.2.1.tar.bz2
+midori-0.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/midori/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	10 Dec 2009 15:01:50 -0000	1.16
+++ sources	16 Dec 2009 20:03:49 -0000	1.17
@@ -1 +1 @@
-3cee94c9a22316504a3ba99bc92e0245  midori-0.2.1.tar.bz2
+14f81a7a10f80a173da1b5e88713400b  midori-0.2.2.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:16 +0000
Subject: [pkgdb] libnet: jwilson has given up watchbugzilla
Message-ID: <20091216200417.4752C28ED3A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on libnet (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:15 +0000
Subject: [pkgdb] libnet: jwilson has given up watchbugzilla
Message-ID: <20091216200417.E2FB728ED40@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on libnet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:18 +0000
Subject: [pkgdb] libnet: jwilson has given up watchcommits
Message-ID: <20091216200419.B10AA28ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on libnet (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:22 +0000
Subject: [pkgdb] libnet: jwilson has given up commit
Message-ID: <20091216200423.A565E28ED4D@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on libnet (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:20 +0000
Subject: [pkgdb] libnet: jwilson has given up watchcommits
Message-ID: <20091216200422.9BFD728ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on libnet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:25 +0000
Subject: [pkgdb] libnet: jwilson has given up commit
Message-ID: <20091216200427.4D7EC28ED23@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on libnet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:25 +0000
Subject: [pkgdb] libnet: jwilson has given up approveacls
Message-ID: <20091216200428.0371328ED51@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on libnet (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:27 +0000
Subject: [pkgdb] libnet: jwilson has given up approveacls
Message-ID: <20091216200429.D8AED28ED3A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on libnet (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnet



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:59 +0000
Subject: [pkgdb] ganglia: jwilson has given up commit
Message-ID: <20091216200500.8D67128ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on ganglia (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:04:58 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchbugzilla
Message-ID: <20091216200459.0271B28ED59@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on ganglia (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:01 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchcommits
Message-ID: <20091216200503.1008F28ED21@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on ganglia (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:02 +0000
Subject: [pkgdb] ganglia: jwilson has given up approveacls
Message-ID: <20091216200503.AD23C28ED5C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on ganglia (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:15 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchbugzilla
Message-ID: <20091216200516.484BF28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on ganglia (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:16 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchbugzilla
Message-ID: <20091216200516.C555128ED3D@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on ganglia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:17 +0000
Subject: [pkgdb] ganglia: jwilson has given up commit
Message-ID: <20091216200519.0025E28ED50@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on ganglia (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:21 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchcommits
Message-ID: <20091216200522.E622E28ED5A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on ganglia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:21 +0000
Subject: [pkgdb] ganglia: jwilson has given up approveacls
Message-ID: <20091216200522.821EF28ED59@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on ganglia (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:18 +0000
Subject: [pkgdb] ganglia: jwilson has given up commit
Message-ID: <20091216200519.8789A28ED4B@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on ganglia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:24 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchcommits
Message-ID: <20091216200525.B01E328ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on ganglia (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:25 +0000
Subject: [pkgdb] ganglia: jwilson has given up approveacls
Message-ID: <20091216200527.2618228ED61@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on ganglia (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:29 +0000
Subject: [pkgdb] ganglia: jwilson has given up commit
Message-ID: <20091216200530.3F42428ED3A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on ganglia (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:29 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchbugzilla
Message-ID: <20091216200530.95FC228ED6C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on ganglia (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:27 +0000
Subject: [pkgdb] ganglia: jwilson has given up commit
Message-ID: <20091216200529.DB4E628ED64@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on ganglia (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:32 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchbugzilla
Message-ID: <20091216200533.3089B28ED3D@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on ganglia (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:31 +0000
Subject: [pkgdb] ganglia: jwilson has given up watchcommits
Message-ID: <20091216200533.0FFA928ED51@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on ganglia (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:05:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:05:32 +0000
Subject: [pkgdb] ganglia: jwilson has given up approveacls
Message-ID: <20091216200533.C7C2E28ED73@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on ganglia (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ganglia



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:21 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up commit
Message-ID: <20091216200621.EBC2B28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald-themes (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:26 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up watchbugzilla
Message-ID: <20091216200626.D0D0D28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald-themes (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:30 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up watchbugzilla
Message-ID: <20091216200631.8FE5828ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on emerald-themes (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:30 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up commit
Message-ID: <20091216200632.5BD8028ED3D@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald-themes (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:35 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up commit
Message-ID: <20091216200635.B911928ECFE@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald-themes (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:35 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up commit
Message-ID: <20091216200636.8501028ECFE@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald-themes (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:38 +0000
Subject: [pkgdb] emerald-themes: jwilson has given up commit
Message-ID: <20091216200640.9F4F028ED46@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on emerald-themes (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emerald-themes



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:56 +0000
Subject: [pkgdb] conman: jwilson has given up watchbugzilla
Message-ID: <20091216200658.116C128ECFE@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on conman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:06:55 +0000
Subject: [pkgdb] conman: jwilson has given up commit
Message-ID: <20091216200657.1553928ED5A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on conman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:07:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:07:04 +0000
Subject: [pkgdb] conman: jwilson has given up commit
Message-ID: <20091216200704.E4B3928ED61@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on conman (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:07:08 +0000
Subject: [pkgdb] conman: jwilson has given up watchbugzilla
Message-ID: <20091216200709.C77CD28ED55@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on conman (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:07:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:07:05 +0000
Subject: [pkgdb] conman: jwilson has given up watchbugzilla
Message-ID: <20091216200708.5B35E28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on conman (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:07:10 +0000
Subject: [pkgdb] conman: jwilson has given up watchbugzilla
Message-ID: <20091216200712.25D0A28ED27@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on conman (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:07:10 +0000
Subject: [pkgdb] conman: jwilson has given up watchbugzilla
Message-ID: <20091216200711.C0E3528ED7E@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on conman (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:07:08 +0000
Subject: [pkgdb] conman: jwilson has given up commit
Message-ID: <20091216200708.A114328ED44@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on conman (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:07:18 +0000
Subject: [pkgdb] conman: jwilson has given up commit
Message-ID: <20091216200719.ED05328ED50@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on conman (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:07:16 +0000
Subject: [pkgdb] conman: jwilson has given up commit
Message-ID: <20091216200718.3391A28ED5A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on conman (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/conman



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:43 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up watchbugzilla
Message-ID: <20091216200844.A8FF328ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on connect-proxy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:47 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up watchbugzilla
Message-ID: <20091216200848.2314D28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on connect-proxy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:48 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up commit
Message-ID: <20091216200849.90DF628ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on connect-proxy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:50 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up watchbugzilla
Message-ID: <20091216200850.C528D28ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on connect-proxy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:51 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up commit
Message-ID: <20091216200853.2D43B28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on connect-proxy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:54 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up watchbugzilla
Message-ID: <20091216200855.0324728ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on connect-proxy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:55 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up commit
Message-ID: <20091216200855.BE09E28ED23@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on connect-proxy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:58 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up commit
Message-ID: <20091216200858.E8EF128ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on connect-proxy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:08:58 +0000
Subject: [pkgdb] connect-proxy: jwilson has given up watchbugzilla
Message-ID: <20091216200900.15F9B28ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on connect-proxy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/connect-proxy



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:23 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201025.0824828ED46@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:27 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201029.8D20628ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:24 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201024.C015A28ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:29 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201031.2173828ED50@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:28 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201029.01BCE28ED64@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:31 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201032.0E76028ED46@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:33 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201034.75F4228ED4C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:35 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201037.42F3928ED55@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:34 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201035.34BCB28ED5C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:36 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201037.D2F8828ED50@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:38 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201039.5B9AE28ED64@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:41 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201042.B43E328ED56@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:44 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201045.45F1128ED69@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:46 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201046.E126528ED62@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:20 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201021.7D76628ED3A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:39 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201041.068CB28ED5F@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:43 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201045.2672128ED3E@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:42 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201043.9062B28ED68@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:45 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201046.4FE2528ED6B@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:50 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201050.DF89128ED56@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:51 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201051.E8A9D28ED23@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:54 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201055.189D128ED4B@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:46 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201047.DA00C28ED73@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:56 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201056.9D5F028ED5B@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:53 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201054.A93EB28ED6F@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:10:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:10:54 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201056.175E128ED62@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:00 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201101.0A67B28ED4C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:08 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201109.424EC28ED21@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:02 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201103.793FA28ED5F@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:05 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201106.CE61728ED69@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:07 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201109.25A3C28ED23@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:03 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201105.5CB4028ED55@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:08 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201109.BA18328ED58@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:13 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201115.124FB28ED66@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:13 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201113.EBB7F28ED21@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:19 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201121.B4CD928ED5B@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:21 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201122.21D0D28ED5A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:17 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201119.303A228ED3E@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:11 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201111.A382728ED40@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:14 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201116.38FC528ED64@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:19 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201122.3E1A628ED27@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:24 +0000
Subject: [pkgdb] fping: jwilson has given up watchbugzilla
Message-ID: <20091216201125.6B17E28ED7C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on fping (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:22 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201123.9C2CA28ED70@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:28 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201129.85A2028ED3A@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:26 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201128.0F8A928ED51@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:26 +0000
Subject: [pkgdb] fping: jwilson has given up commit
Message-ID: <20091216201127.0D7FC28ED7E@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on fping (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:23 +0000
Subject: [pkgdb] fping: jwilson has given up approveacls
Message-ID: <20091216201123.F188528ED65@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on fping (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:11:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:11:23 +0000
Subject: [pkgdb] fping: jwilson has given up watchcommits
Message-ID: <20091216201125.31DC128ED4D@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on fping (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fping



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:08 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchcommits
Message-ID: <20091216201209.3992A28ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on rrdtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:09 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchbugzilla
Message-ID: <20091216201210.E3CF228ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on rrdtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:11 +0000
Subject: [pkgdb] rrdtool: jwilson has given up commit
Message-ID: <20091216201212.BD42228ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on rrdtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:15 +0000
Subject: [pkgdb] rrdtool: jwilson has given up approveacls
Message-ID: <20091216201215.855E228ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on rrdtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:20 +0000
Subject: [pkgdb] rrdtool ownership updated
Message-ID: <20091216201221.10FEA28ECF3@bastion3.fedora.phx2.redhat.com>

Package rrdtool in Fedora 1 was orphaned by jwilson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:22 +0000
Subject: [pkgdb] rrdtool ownership updated
Message-ID: <20091216201222.8D2D428ECF3@bastion3.fedora.phx2.redhat.com>

Package rrdtool in Fedora 2 was orphaned by jwilson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:25 +0000
Subject: [pkgdb] rrdtool ownership updated
Message-ID: <20091216201225.7907928ECF3@bastion3.fedora.phx2.redhat.com>

Package rrdtool in Fedora 4 was orphaned by jwilson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:25 +0000
Subject: [pkgdb] rrdtool ownership updated
Message-ID: <20091216201226.3019428ED1C@bastion3.fedora.phx2.redhat.com>

Package rrdtool in Fedora 3 was orphaned by jwilson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:27 +0000
Subject: [pkgdb] rrdtool ownership updated
Message-ID: <20091216201228.17C9228ECF3@bastion3.fedora.phx2.redhat.com>

Package rrdtool in Fedora 6 was orphaned by jwilson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:28 +0000
Subject: [pkgdb] rrdtool ownership updated
Message-ID: <20091216201228.CF4D928ED1C@bastion3.fedora.phx2.redhat.com>

Package rrdtool in Fedora 5 was orphaned by jwilson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:30 +0000
Subject: [pkgdb] rrdtool ownership updated
Message-ID: <20091216201231.0864328ECF3@bastion3.fedora.phx2.redhat.com>

Package rrdtool in Red Hat Linux 8 was orphaned by jwilson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:33 +0000
Subject: [pkgdb] rrdtool ownership updated
Message-ID: <20091216201233.D8E7F28ECF3@bastion3.fedora.phx2.redhat.com>

Package rrdtool in Red Hat Linux 9 was orphaned by jwilson

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:35 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchbugzilla
Message-ID: <20091216201236.4228F28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on rrdtool (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:48 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchcommits
Message-ID: <20091216201253.A5A9828ED23@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on rrdtool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:38 +0000
Subject: [pkgdb] rrdtool: jwilson has given up commit
Message-ID: <20091216201238.CE25B28ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on rrdtool (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:38 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchcommits
Message-ID: <20091216201240.3789728ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on rrdtool (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:40 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchcommits
Message-ID: <20091216201240.7B56628ED23@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on rrdtool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:41 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchbugzilla
Message-ID: <20091216201242.8D8DB28ED21@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on rrdtool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:42 +0000
Subject: [pkgdb] rrdtool: jwilson has given up commit
Message-ID: <20091216201244.58B9728ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on rrdtool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:45 +0000
Subject: [pkgdb] rrdtool: jwilson has given up approveacls
Message-ID: <20091216201246.2B67328ECF3@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on rrdtool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:49 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchbugzilla
Message-ID: <20091216201250.3638C28ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on rrdtool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:49 +0000
Subject: [pkgdb] rrdtool: jwilson has given up approveacls
Message-ID: <20091216201250.50D6828ED23@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on rrdtool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:51 +0000
Subject: [pkgdb] rrdtool: jwilson has given up commit
Message-ID: <20091216201252.9142428ED1C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on rrdtool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:51 +0000
Subject: [pkgdb] rrdtool: jwilson has given up commit
Message-ID: <20091216201252.867B828ED19@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on rrdtool (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:53 +0000
Subject: [pkgdb] rrdtool: jwilson has given up approveacls
Message-ID: <20091216201254.482A128ED4B@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on rrdtool (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:54 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchbugzilla
Message-ID: <20091216201254.C694028ED49@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on rrdtool (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:56 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchcommits
Message-ID: <20091216201256.D2BF528ED3D@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on rrdtool (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:57 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchbugzilla
Message-ID: <20091216201259.4EF0B28ED49@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchbugzilla acl on rrdtool (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:55 +0000
Subject: [pkgdb] rrdtool: jwilson has given up watchcommits
Message-ID: <20091216201257.BE17C28ED4C@bastion3.fedora.phx2.redhat.com>

jwilson has given up the watchcommits acl on rrdtool (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:58 +0000
Subject: [pkgdb] rrdtool: jwilson has given up approveacls
Message-ID: <20091216201258.D823228ED40@bastion3.fedora.phx2.redhat.com>

jwilson has given up the approveacls acl on rrdtool (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From chkr at fedoraproject.org  Wed Dec 16 20:13:04 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Dec 2009 20:13:04 +0000 (UTC)
Subject: rpms/podsleuth/devel podsleuth-0.6.6-libdir.patch, NONE,
	1.1 podsleuth-make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.6,
	1.7 podsleuth.spec, 1.15, 1.16 sources, 1.6,
	1.7 podsleuth-0.6.2-libdir.patch, 1.1, NONE podsleuth.conf, 1.1, NONE
Message-ID: <20091216201304.3EF1711C00C5@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27970

Modified Files:
	.cvsignore podsleuth.spec sources 
Added Files:
	podsleuth-0.6.6-libdir.patch podsleuth-make-git-snapshot.sh 
Removed Files:
	podsleuth-0.6.2-libdir.patch podsleuth.conf 
Log Message:
* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.6-0.1.20091216git
- Update to git snapshot (20091216) for DeviceKit-disks integration
  (BZ 495240)
- Update libdir patch
- Use upstream's dbus policy file


podsleuth-0.6.6-libdir.patch:
 PodSleuth.Hal/Makefile.am      |    2 +-
 PodSleuth.Hal/hal-podsleuth.in |    2 +-
 PodSleuth.Hal/podsleuth.in     |    2 +-
 PodSleuth/Makefile.am          |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE podsleuth-0.6.6-libdir.patch ---
diff -uNr podsleuth-20091216.old/src/PodSleuth/Makefile.am podsleuth-20091216/src/PodSleuth/Makefile.am
--- podsleuth-20091216.old/src/PodSleuth/Makefile.am	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth/Makefile.am	2009-12-16 20:19:21.000000000 +0100
@@ -9,7 +9,7 @@
 ASSEMBLY_REF = -r:System.Xml -r:Mono.Posix
 ASSEMBLY_RES = data/ipod-model-table
 
-sleuthdir = $(prefix)/lib/podsleuth
+sleuthdir = $(libdir)/podsleuth
 sleuth_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
 
 ASSEMBLY_EXPANDED_RES = $(foreach res,$(ASSEMBLY_RES), $(top_srcdir)/$(res))
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/hal-podsleuth.in podsleuth-20091216/src/PodSleuth.Hal/hal-podsleuth.in
--- podsleuth-20091216.old/src/PodSleuth.Hal/hal-podsleuth.in	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/hal-podsleuth.in	2009-12-16 20:18:35.000000000 +0100
@@ -2,7 +2,7 @@
 
 MONO=mono
 MONO_ARGS="--debug"
-MONO_EXEC="@prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe"
+MONO_EXEC="@libdir@/@PACKAGE@/PodSleuth.Hal.exe"
 
 if [ "$1" = "--update" ]; then
 	MONO_EXEC_ARGS="--update"
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/Makefile.am podsleuth-20091216/src/PodSleuth.Hal/Makefile.am
--- podsleuth-20091216.old/src/PodSleuth.Hal/Makefile.am	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/Makefile.am	2009-12-16 20:19:03.000000000 +0100
@@ -11,7 +11,7 @@
 	$(GTKSHARP_LIBS) \
 	$(NDESK_DBUS_LIBS)
 
-sleuthdir = $(prefix)/lib/podsleuth
+sleuthdir = $(libdir)/podsleuth
 haldir = $(HALCALLOUTSDIR)
 hal_SCRIPTS = hal-podsleuth
 bin_SCRIPTS = podsleuth
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/podsleuth.in podsleuth-20091216/src/PodSleuth.Hal/podsleuth.in
--- podsleuth-20091216.old/src/PodSleuth.Hal/podsleuth.in	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/podsleuth.in	2009-12-16 20:18:18.000000000 +0100
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-mono @prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe $@
+mono @libdir@/@PACKAGE@/PodSleuth.Hal.exe $@
 


--- NEW FILE podsleuth-make-git-snapshot.sh ---
#!/bin/sh

# Usage: ./podsleuth-make-git-snapshot.sh [COMMIT] [DATE]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local podsleuth repo to reduce clone time.

if [ -z $2 ]; then
  DATE=`date +%Y%m%d`
else
  DATE=$2
fi

DIRNAME="podsleuth-$DATE"

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
        git://git.gnome.org/podsleuth $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
        | bzip2 > $DIRNAME.tar.bz2

rm -rf $DIRNAME



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Oct 2009 23:32:28 -0000	1.6
+++ .cvsignore	16 Dec 2009 20:13:04 -0000	1.7
@@ -1 +1 @@
-podsleuth-0.6.5.tar.bz2
+podsleuth-20091216.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/podsleuth.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- podsleuth.spec	12 Nov 2009 22:43:22 -0000	1.15
+++ podsleuth.spec	16 Dec 2009 20:13:04 -0000	1.16
@@ -1,15 +1,21 @@
 %define		debug_package %{nil}
 
+%global gitdate 20091216
+%global gitcommit 49fc3d67a9ce098855204e961131a21946a95d01
+
 Name:		podsleuth
-Version:	0.6.5
-Release:	3%{?dist}
+Version:	0.6.6
+#Release:	3%{?dist}
+Release:	0.1.%{gitdate}git%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
 URL:		http://banshee-project.org/
-Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Source1:	podsleuth.conf
-Patch1:		podsleuth-0.6.2-libdir.patch
+# based on libdrm's make-git-snapshot.sh 
+# sh podsleuth-make-git-snapshot.sh <gitcommit> <gitdate>
+Source0: %{name}-%{gitdate}.tar.bz2
+#Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch1:		podsleuth-0.6.6-libdir.patch
 Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
@@ -43,11 +49,13 @@ Development files for podsleuth.
 
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{name}-%{gitdate}
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
 
 %build
+./autogen.sh
 %configure --with-hal-callouts-dir=%{_libexecdir}
 
 # Breaks when smp flag is set
@@ -58,9 +66,6 @@ make
 %{__rm} -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
-install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/dbus-1/system.d
-
 mkdir -p %{buildroot}%{_localstatedir}/cache/podsleuth
 touch %{buildroot}%{_localstatedir}/cache/podsleuth/ipod-model-table
 
@@ -84,6 +89,12 @@ touch %{buildroot}%{_localstatedir}/cach
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.6-0.1.20091216git
+- Update to git snapshot (20091216) for DeviceKit-disks integration
+  (BZ 495240)
+- Update libdir patch
+- Use upstream's dbus policy file
+
 * Thu Nov 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-3
 - Add dbus policy file to allow users at the console to re-scan
   the iPod data and to update the iPod database (BZ 533397)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Oct 2009 23:32:28 -0000	1.6
+++ sources	16 Dec 2009 20:13:04 -0000	1.7
@@ -1 +1 @@
-5cbe9c3bb199912e15f65314b4f46ca8  podsleuth-0.6.5.tar.bz2
+bd906c27fb0d4b623a25d25a05c200e8  podsleuth-20091216.tar.bz2


--- podsleuth-0.6.2-libdir.patch DELETED ---


--- podsleuth.conf DELETED ---



From pkgdb at fedoraproject.org  Wed Dec 16 20:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 16 Dec 2009 20:12:59 +0000
Subject: [pkgdb] rrdtool: jwilson has given up commit
Message-ID: <20091216201301.719B028ED23@bastion3.fedora.phx2.redhat.com>

jwilson has given up the commit acl on rrdtool (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rrdtool



From mclasen at fedoraproject.org  Wed Dec 16 20:18:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 20:18:08 +0000 (UTC)
Subject: File brasero-2.28.3.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091216201808.B04C928ED19@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for brasero:

6ef5cc07325f1869577a85d15ac67eb3  brasero-2.28.3.tar.bz2



From mclasen at fedoraproject.org  Wed Dec 16 20:19:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 20:19:10 +0000 (UTC)
Subject: File evince-2.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091216201910.BC7F428ECF3@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for evince:

f8b9a1ee6fe8cd0a1b7a51ad4db96e59  evince-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Wed Dec 16 20:20:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 20:20:11 +0000 (UTC)
Subject: rpms/brasero/F-12 .cvsignore, 1.31, 1.32 brasero.spec, 1.71,
	1.72 sources, 1.31, 1.32
Message-ID: <20091216202011.B3F1511C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29795

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
2.28.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	20 Oct 2009 16:51:38 -0000	1.31
+++ .cvsignore	16 Dec 2009 20:20:11 -0000	1.32
@@ -1 +1 @@
-brasero-2.28.2.tar.bz2
+brasero-2.28.3.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/brasero.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- brasero.spec	2 Dec 2009 22:13:18 -0000	1.71
+++ brasero.spec	16 Dec 2009 20:20:11 -0000	1.72
@@ -5,8 +5,8 @@
 %endif
 
 Name:      brasero
-Version:   2.28.2
-Release:   4%{?dist}
+Version:   2.28.3
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -216,6 +216,10 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> 2.28.3-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/brasero/2.28/brasero-2.28.3.news
+
 * Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-4
 - Make the libbeagle dep more automatic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	20 Oct 2009 16:51:38 -0000	1.31
+++ sources	16 Dec 2009 20:20:11 -0000	1.32
@@ -1 +1 @@
-7a6ab4befeadbc2ad21bd1195a840097  brasero-2.28.2.tar.bz2
+6ef5cc07325f1869577a85d15ac67eb3  brasero-2.28.3.tar.bz2



From mclasen at fedoraproject.org  Wed Dec 16 20:21:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 20:21:57 +0000 (UTC)
Subject: rpms/brasero/F-12 brasero.spec,1.72,1.73
Message-ID: <20091216202157.92C0C11C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30671

Modified Files:
	brasero.spec 
Log Message:
drop upstreamed patch



Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/brasero.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- brasero.spec	16 Dec 2009 20:20:11 -0000	1.72
+++ brasero.spec	16 Dec 2009 20:21:57 -0000	1.73
@@ -13,9 +13,6 @@ License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.28/%{name}-%{version}.tar.bz2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=599620
-Patch0: last_unsaved.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.15.6
@@ -98,7 +95,6 @@ developing brasero applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .last_unsaved
 
 %build
 %configure \



From chkr at fedoraproject.org  Wed Dec 16 20:25:49 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Dec 2009 20:25:49 +0000 (UTC)
Subject: rpms/podsleuth/devel podsleuth.spec,1.16,1.17
Message-ID: <20091216202549.B3B3A11C00C5@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31341

Modified Files:
	podsleuth.spec 
Log Message:
add auto* tools as BR for snapshot builds



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/podsleuth.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- podsleuth.spec	16 Dec 2009 20:13:04 -0000	1.16
+++ podsleuth.spec	16 Dec 2009 20:25:49 -0000	1.17
@@ -22,6 +22,8 @@ BuildRequires:	mono-devel
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
+# Snapshots only
+BuildRequires: autoconf automake libtool
 Requires:	sg3_utils-libs
 Requires:	dbus
 



From maxamillion at fedoraproject.org  Wed Dec 16 20:27:19 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 20:27:19 +0000 (UTC)
Subject: rpms/pybackpack/devel pybackpack.spec,1.11,1.12
Message-ID: <20091216202719.0A66411C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32005

Modified Files:
	pybackpack.spec 
Log Message:
New upstream release, bugfix BZ# 538193




Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- pybackpack.spec	4 Aug 2009 13:29:20 -0000	1.11
+++ pybackpack.spec	16 Dec 2009 20:27:18 -0000	1.12
@@ -3,8 +3,8 @@
 
 Summary: User oriented backup and restore application
 Name: pybackpack
-Version: 0.5.6
-Release: 5%{?dist}
+Version: 0.5.7
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -18,6 +18,10 @@ Requires: pygtk2 >= %{pygtk2_version}
 #upstream to resolve the dep, upstream suggested to simply not require for
 #now as it won't break anything, but simply won't support backup to cd
 #Requires: gnome-python2-nautilus-cd-burner
+
+#This obsoletes gnome-python2-nautilus-cd-burner
+Requires: gnome-python2-brasero
+
 Requires: rdiff-backup >= 1.0
 BuildArch:      noarch
 
@@ -61,8 +65,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Tue Aug 04 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.5.6-5
+* Wed Dec 16 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-1
+- New release from upstream fixing cdburn bug (BZ# 538193)
+
+* Tue Aug 04 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.6-5
 - Removing gnome-python2-nautilus-cd-burner as a dependency
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Wed Dec 16 20:28:32 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 20:28:32 +0000 (UTC)
Subject: File pybackpack-0.5.7.tar.gz uploaded to lookaside cache by
	maxamillion
Message-ID: <20091216202832.0D35D28ED1C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for pybackpack:

0dc6cff60391a9f9b7caa5bd219e8a7e  pybackpack-0.5.7.tar.gz



From maxamillion at fedoraproject.org  Wed Dec 16 20:28:51 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 20:28:51 +0000 (UTC)
Subject: rpms/pybackpack/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20091216202851.D746211C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32501

Modified Files:
	.cvsignore sources 
Log Message:
new sources (0.5.7)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Sep 2008 20:14:32 -0000	1.5
+++ .cvsignore	16 Dec 2009 20:28:51 -0000	1.6
@@ -1 +1 @@
-pybackpack-0.5.6.tar.gz
+pybackpack-0.5.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Sep 2008 20:14:33 -0000	1.5
+++ sources	16 Dec 2009 20:28:51 -0000	1.6
@@ -1 +1 @@
-63d787dd207b150e0c258f7fe50f0477  pybackpack-0.5.6.tar.gz
+0dc6cff60391a9f9b7caa5bd219e8a7e  pybackpack-0.5.7.tar.gz



From philipp at fedoraproject.org  Wed Dec 16 20:29:03 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 20:29:03 +0000 (UTC)
Subject: File mod_proxy_html-3.1.2.tar.bz2 uploaded to lookaside cache by
	philipp
Message-ID: <20091216202903.59F0828ED3E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mod_proxy_html:

d6497b48d2bffc4150472472004618c3  mod_proxy_html-3.1.2.tar.bz2



From mclasen at fedoraproject.org  Wed Dec 16 20:32:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 20:32:42 +0000 (UTC)
Subject: rpms/evince/F-12 .cvsignore, 1.68, 1.69 evince.spec, 1.174,
	1.175 sources, 1.67, 1.68
Message-ID: <20091216203242.7ABE711C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1050

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	20 Oct 2009 16:04:33 -0000	1.68
+++ .cvsignore	16 Dec 2009 20:32:42 -0000	1.69
@@ -1 +1 @@
-evince-2.28.1.tar.bz2
+evince-2.28.2.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/evince.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- evince.spec	29 Oct 2009 14:25:39 -0000	1.174
+++ evince.spec	16 Dec 2009 20:32:42 -0000	1.175
@@ -5,25 +5,18 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.28.1
-Release:	5%{?dist}
+Version:	2.28.2
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
 Group:		Applications/Publishing
 URL:		http://projects.gnome.org/evince/
 Source0:	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
-Patch0:		evince-pdf-print-revert.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=455759
-# Patch1:		duplex-copies.patch
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=596888
 Patch1:         0001-Provide-some-indication-that-search-is-not-available.patch
 Patch2:		evince-thumbnail-allocation.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=599726
-Patch3:		seriesid-clash.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=531430
-Patch4:		evince-aspect-ratio.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,12 +105,8 @@ This package contains a backend to let e
 
 %prep
 %setup -q
-%patch0 -p0 -b .pdf-print-revert
-# %patch1 -p0 -b .duplex-copies
 %patch1 -p1 -b .search-not-available
 %patch2 -p0 -b .thumbnail-allocation
-%patch3 -p1 -b .seriesid
-%patch4 -p0 -b .aspect-ratio
 
 %build
 %configure --disable-static --disable-scrollkeeper \
@@ -272,6 +261,10 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/evince/2.28/evince-2.28.2.news
+
 * Thu Oct 29 2009 Marek Kasik <mkasik at redhat.com> - 2.28.1-5
 - Add backported patch evince-aspect-ratio.patch (#531430).
 - Preserve aspect ratio of scaled pages and set page orientation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	20 Oct 2009 16:04:33 -0000	1.67
+++ sources	16 Dec 2009 20:32:42 -0000	1.68
@@ -1 +1 @@
-3f0bf750825f5455d307ec21a27d1f3e  evince-2.28.1.tar.bz2
+f8b9a1ee6fe8cd0a1b7a51ad4db96e59  evince-2.28.2.tar.bz2



From maxamillion at fedoraproject.org  Wed Dec 16 20:36:53 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 20:36:53 +0000 (UTC)
Subject: rpms/pybackpack/F-12 pybackpack.spec,1.11,1.12
Message-ID: <20091216203653.CE52F11C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2117

Modified Files:
	pybackpack.spec 
Log Message:
Update to latest upstream, bug fix (BZ# 538193)




Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/F-12/pybackpack.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- pybackpack.spec	4 Aug 2009 13:29:20 -0000	1.11
+++ pybackpack.spec	16 Dec 2009 20:36:53 -0000	1.12
@@ -3,8 +3,8 @@
 
 Summary: User oriented backup and restore application
 Name: pybackpack
-Version: 0.5.6
-Release: 5%{?dist}
+Version: 0.5.7
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -18,6 +18,10 @@ Requires: pygtk2 >= %{pygtk2_version}
 #upstream to resolve the dep, upstream suggested to simply not require for
 #now as it won't break anything, but simply won't support backup to cd
 #Requires: gnome-python2-nautilus-cd-burner
+
+#This obsoletes gnome-python2-nautilus-cd-burner
+Requires: gnome-python2-brasero
+
 Requires: rdiff-backup >= 1.0
 BuildArch:      noarch
 
@@ -61,8 +65,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Tue Aug 04 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.5.6-5
+* Wed Dec 16 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-1
+- New release from upstream fixing cdburn bug (BZ# 538193)
+
+* Tue Aug 04 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.6-5
 - Removing gnome-python2-nautilus-cd-burner as a dependency
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Wed Dec 16 20:37:40 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Wed, 16 Dec 2009 20:37:40 +0000 (UTC)
Subject: rpms/pybackpack/F-12 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20091216203740.6EA0611C00C5@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2401

Modified Files:
	.cvsignore sources 
Log Message:
New Sources (0.5.7)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Sep 2008 20:14:32 -0000	1.5
+++ .cvsignore	16 Dec 2009 20:37:40 -0000	1.6
@@ -1 +1 @@
-pybackpack-0.5.6.tar.gz
+pybackpack-0.5.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Sep 2008 20:14:33 -0000	1.5
+++ sources	16 Dec 2009 20:37:40 -0000	1.6
@@ -1 +1 @@
-63d787dd207b150e0c258f7fe50f0477  pybackpack-0.5.6.tar.gz
+0dc6cff60391a9f9b7caa5bd219e8a7e  pybackpack-0.5.7.tar.gz



From ajax at fedoraproject.org  Wed Dec 16 20:37:39 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 16 Dec 2009 20:37:39 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-edid-9340d8cf.patch, NONE, 1.1 kernel.spec,
	1.1955, 1.1956 drm-conservative-fallback-modes.patch, 1.1,
	NONE drm-default-mode.patch, 1.1,
	NONE drm-edid-header-fixup.patch, 1.1, NONE drm-edid-retry.patch,
	1.2, NONE
Message-ID: <20091216203739.DFA4D11C00C5@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2478

Modified Files:
	kernel.spec 
Added Files:
	drm-edid-9340d8cf.patch 
Removed Files:
	drm-conservative-fallback-modes.patch drm-default-mode.patch 
	drm-edid-header-fixup.patch drm-edid-retry.patch 
Log Message:
* Wed Dec 16 2009 Adam Jackson <ajax at redhat.com>
- drm-edid-9340d8cf.patch: Sync DRM EDID with Linus master.
- drm-conservative-fallback-modes.patch, drm-edid-retry.patch,
  drm-edid-header-fixup.patch, drm-default-mode.patch: Drop, merged into
  the above.


drm-edid-9340d8cf.patch:
 drivers/gpu/drm/drm_edid.c  |  334 +++++++++++++++++++++++++++-----------------
 drivers/gpu/drm/drm_modes.c |   28 +++
 include/drm/drm_crtc.h      |    7 
 include/drm/drm_edid.h      |    9 +
 4 files changed, 249 insertions(+), 129 deletions(-)

--- NEW FILE drm-edid-9340d8cf.patch ---
>From 79766d79dbe27a7eb0543db95202318a6f1491d0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 16 Dec 2009 15:12:41 -0500
Subject: [PATCH] drm/modes: Sync with Linus.

1bd049f Merge branch 'drm-core-next' into drm-linus
9340d8c drm/edid: Decode 3-byte CVT codes from EDID 1.4
2dbdc52 drm/edid: Add new detailed block types from EDID 1.4
07a5e63 drm/edid: Add DMT modes to the pool if the monitor is GTF-capable
7ac96a9 drm/modes: Add drm_mode_hsync()
9cf0097 drm/edid: Unify detailed block parsing between base and extension blocks
7064fef drm: work around EDIDs with bad htotal/vtotal values
862b89c drm/edid: Fix up partially corrupted headers
47ee4cc drm/edid: Retry EDID fetch up to four times
f985ded drm/modes: Limit fallback modes to 60Hz
---
 drivers/gpu/drm/drm_edid.c  |  334 +++++++++++++++++++++++++++----------------
 drivers/gpu/drm/drm_modes.c |   28 ++++-
 include/drm/drm_crtc.h      |    7 +-
 include/drm/drm_edid.h      |    8 +
 4 files changed, 249 insertions(+), 128 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 6ce18a2..4270ba6 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -123,18 +123,20 @@ static const u8 edid_header[] = {
  */
 static bool edid_is_valid(struct edid *edid)
 {
-	int i;
+	int i, score = 0;
 	u8 csum = 0;
 	u8 *raw_edid = (u8 *)edid;
 
-	if (memcmp(edid->header, edid_header, sizeof(edid_header)))
-		goto bad;
-	if (edid->version != 1) {
-		DRM_ERROR("EDID has major version %d, instead of 1\n", edid->version);
+	for (i = 0; i < sizeof(edid_header); i++)
+		if (raw_edid[i] == edid_header[i])
+			score++;
+
+	if (score == 8) ;
+	else if (score >= 6) {
+		DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");
+		memcpy(raw_edid, edid_header, sizeof(edid_header));
+	} else
 		goto bad;
-	}
-	if (edid->revision > 4)
-		DRM_DEBUG("EDID minor > 4, assuming backward compatibility\n");
 
 	for (i = 0; i < EDID_LENGTH; i++)
 		csum += raw_edid[i];
@@ -143,6 +145,14 @@ static bool edid_is_valid(struct edid *edid)
 		goto bad;
 	}
 
+	if (edid->version != 1) {
+		DRM_ERROR("EDID has major version %d, instead of 1\n", edid->version);
+		goto bad;
+	}
+
+	if (edid->revision > 4)
+		DRM_DEBUG("EDID minor > 4, assuming backward compatibility\n");
+
 	return 1;
 
 bad:
@@ -481,16 +491,17 @@ static struct drm_display_mode drm_dmt_modes[] = {
 		   3048, 3536, 0, 1600, 1603, 1609, 1682, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
 };
+static const int drm_num_dmt_modes =
+	sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode);
 
 static struct drm_display_mode *drm_find_dmt(struct drm_device *dev,
 			int hsize, int vsize, int fresh)
 {
-	int i, count;
+	int i;
 	struct drm_display_mode *ptr, *mode;
 
-	count = sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode);
 	mode = NULL;
-	for (i = 0; i < count; i++) {
+	for (i = 0; i < drm_num_dmt_modes; i++) {
 		ptr = &drm_dmt_modes[i];
 		if (hsize == ptr->hdisplay &&
 			vsize == ptr->vdisplay &&
@@ -659,6 +670,12 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 	if (mode->vsync_end > mode->vtotal)
 		mode->vtotal = mode->vsync_end + 1;
 
+	/* Some EDIDs have bogus h/vtotal values */
+	if (mode->hsync_end > mode->htotal)
+		mode->htotal = mode->hsync_end + 1;
+	if (mode->vsync_end > mode->vtotal)
+		mode->vtotal = mode->vsync_end + 1;
+
 	drm_mode_set_name(mode);
 
 	if (pt->misc & DRM_EDID_PT_INTERLACED)
@@ -825,8 +842,165 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
 	return modes;
 }
 
+/*
+ * XXX fix this for:
+ * - GTF secondary curve formula
+ * - EDID 1.4 range offsets
+ * - CVT extended bits
+ */
+static bool
+mode_in_range(struct drm_display_mode *mode, struct detailed_timing *timing)
+{
+	struct detailed_data_monitor_range *range;
+	int hsync, vrefresh;
+
+	range = &timing->data.other_data.data.range;
+
+	hsync = drm_mode_hsync(mode);
+	vrefresh = drm_mode_vrefresh(mode);
+
+	if (hsync < range->min_hfreq_khz || hsync > range->max_hfreq_khz)
+		return false;
+
+	if (vrefresh < range->min_vfreq || vrefresh > range->max_vfreq)
+		return false;
+
+	if (range->pixel_clock_mhz && range->pixel_clock_mhz != 0xff) {
+		/* be forgiving since it's in units of 10MHz */
+		int max_clock = range->pixel_clock_mhz * 10 + 9;
+		max_clock *= 1000;
+		if (mode->clock > max_clock)
+			return false;
+	}
+
+	return true;
+}
+
+/*
+ * XXX If drm_dmt_modes ever regrows the CVT-R modes (and it will) this will
+ * need to account for them.
+ */
+static int drm_gtf_modes_for_range(struct drm_connector *connector,
+				   struct detailed_timing *timing)
+{
+	int i, modes = 0;
+	struct drm_display_mode *newmode;
+	struct drm_device *dev = connector->dev;
+
+	for (i = 0; i < drm_num_dmt_modes; i++) {
+		if (mode_in_range(drm_dmt_modes + i, timing)) {
+			newmode = drm_mode_duplicate(dev, &drm_dmt_modes[i]);
+			if (newmode) {
+				drm_mode_probed_add(connector, newmode);
+				modes++;
+			}
+		}
+	}
+
+	return modes;
+}
+
+static int drm_cvt_modes(struct drm_connector *connector,
+			 struct detailed_timing *timing)
+{
+	int i, j, modes = 0;
+	struct drm_display_mode *newmode;
+	struct drm_device *dev = connector->dev;
+	struct cvt_timing *cvt;
+	const int rates[] = { 60, 85, 75, 60, 50 };
+
+	for (i = 0; i < 4; i++) {
+		int width, height;
+		cvt = &(timing->data.other_data.data.cvt[i]);
+
+		height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 8) + 1) * 2;
+		switch (cvt->code[1] & 0xc0) {
+		case 0x00:
+			width = height * 4 / 3;
+			break;
+		case 0x40:
+			width = height * 16 / 9;
+			break;
+		case 0x80:
+			width = height * 16 / 10;
+			break;
+		case 0xc0:
+			width = height * 15 / 9;
+			break;
+		}
+
+		for (j = 1; j < 5; j++) {
+			if (cvt->code[2] & (1 << j)) {
+				newmode = drm_cvt_mode(dev, width, height,
+						       rates[j], j == 0,
+						       false, false);
+				if (newmode) {
+					drm_mode_probed_add(connector, newmode);
+					modes++;
+				}
+			}
+		}
+	}
+
+	return modes;
+}
+
+static int add_detailed_modes(struct drm_connector *connector,
+			      struct detailed_timing *timing,
+			      struct edid *edid, u32 quirks, int preferred)
+{
+	int i, modes = 0;
+	struct detailed_non_pixel *data = &timing->data.other_data;
+	int timing_level = standard_timing_level(edid);
+	int gtf = (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF);
+	struct drm_display_mode *newmode;
+	struct drm_device *dev = connector->dev;
+
+	if (timing->pixel_clock) {
+		newmode = drm_mode_detailed(dev, edid, timing, quirks);
+		if (!newmode)
+			return 0;
+
+		if (preferred)
+			newmode->type |= DRM_MODE_TYPE_PREFERRED;
+
+		drm_mode_probed_add(connector, newmode);
+		return 1;
+	}
+
+	/* other timing types */
+	switch (data->type) {
+	case EDID_DETAIL_MONITOR_RANGE:
+		if (gtf)
+			modes += drm_gtf_modes_for_range(connector, timing);
+		break;
+	case EDID_DETAIL_STD_MODES:
+		/* Six modes per detailed section */
+		for (i = 0; i < 6; i++) {
+			struct std_timing *std;
+			struct drm_display_mode *newmode;
+
+			std = &data->data.timings[i];
+			newmode = drm_mode_std(dev, std, edid->revision,
+					       timing_level);
+			if (newmode) {
+				drm_mode_probed_add(connector, newmode);
+				modes++;
+			}
+		}
+		break;
+	case EDID_DETAIL_CVT_3BYTE:
+		modes += drm_cvt_modes(connector, timing);
+		break;
+	default:
+		break;
+	}
+
+	return modes;
+}
+
 /**
- * add_detailed_modes - get detailed mode info from EDID data
+ * add_detailed_info - get detailed mode info from EDID data
  * @connector: attached connector
  * @edid: EDID block to scan
  * @quirks: quirks to apply
@@ -837,67 +1011,24 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
 static int add_detailed_info(struct drm_connector *connector,
 			     struct edid *edid, u32 quirks)
 {
-	struct drm_device *dev = connector->dev;
-	int i, j, modes = 0;
-	int timing_level;
-
-	timing_level = standard_timing_level(edid);
+	int i, modes = 0;
 
 	for (i = 0; i < EDID_DETAILED_TIMINGS; i++) {
 		struct detailed_timing *timing = &edid->detailed_timings[i];
-		struct detailed_non_pixel *data = &timing->data.other_data;
-		struct drm_display_mode *newmode;
+		int preferred = (i == 0) && (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING);
 
-		/* X server check is version 1.1 or higher */
-		if (edid->version == 1 && edid->revision >= 1 &&
-		    !timing->pixel_clock) {
-			/* Other timing or info */
-			switch (data->type) {
-			case EDID_DETAIL_MONITOR_SERIAL:
-				break;
-			case EDID_DETAIL_MONITOR_STRING:
-				break;
-			case EDID_DETAIL_MONITOR_RANGE:
-				/* Get monitor range data */
-				break;
-			case EDID_DETAIL_MONITOR_NAME:
-				break;
-			case EDID_DETAIL_MONITOR_CPDATA:
-				break;
-			case EDID_DETAIL_STD_MODES:
-				for (j = 0; j < 6; i++) {
-					struct std_timing *std;
-					struct drm_display_mode *newmode;
-
-					std = &data->data.timings[j];
-					newmode = drm_mode_std(dev, std,
-							       edid->revision,
-							       timing_level);
-					if (newmode) {
-						drm_mode_probed_add(connector, newmode);
-						modes++;
-					}
-				}
-				break;
-			default:
-				break;
-			}
-		} else {
-			newmode = drm_mode_detailed(dev, edid, timing, quirks);
-			if (!newmode)
-				continue;
-
-			/* First detailed mode is preferred */
-			if (i == 0 && (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING))
-				newmode->type |= DRM_MODE_TYPE_PREFERRED;
-			drm_mode_probed_add(connector, newmode);
+		/* In 1.0, only timings are allowed */
+		if (!timing->pixel_clock && edid->version == 1 &&
+			edid->revision == 0)
+			continue;
 
-			modes++;
-		}
+		modes += add_detailed_modes(connector, timing, edid, quirks,
+					    preferred);
 	}
 
 	return modes;
 }
+
 /**
  * add_detailed_mode_eedid - get detailed mode info from addtional timing
  * 			EDID block
@@ -911,12 +1042,9 @@ static int add_detailed_info(struct drm_connector *connector,
 static int add_detailed_info_eedid(struct drm_connector *connector,
 			     struct edid *edid, u32 quirks)
 {
-	struct drm_device *dev = connector->dev;
-	int i, j, modes = 0;
+	int i, modes = 0;
 	char *edid_ext = NULL;
 	struct detailed_timing *timing;
-	struct detailed_non_pixel *data;
-	struct drm_display_mode *newmode;
 	int edid_ext_num;
 	int start_offset, end_offset;
 	int timing_level;
@@ -967,51 +1095,7 @@ static int add_detailed_info_eedid(struct drm_connector *connector,
 	for (i = start_offset; i < end_offset;
 			i += sizeof(struct detailed_timing)) {
 		timing = (struct detailed_timing *)(edid_ext + i);
-		data = &timing->data.other_data;
-		/* Detailed mode timing */
-		if (timing->pixel_clock) {
-			newmode = drm_mode_detailed(dev, edid, timing, quirks);
-			if (!newmode)
-				continue;
-
-			drm_mode_probed_add(connector, newmode);
-
-			modes++;
-			continue;
-		}
-
-		/* Other timing or info */
-		switch (data->type) {
-		case EDID_DETAIL_MONITOR_SERIAL:
-			break;
-		case EDID_DETAIL_MONITOR_STRING:
-			break;
-		case EDID_DETAIL_MONITOR_RANGE:
-			/* Get monitor range data */
-			break;
-		case EDID_DETAIL_MONITOR_NAME:
-			break;
-		case EDID_DETAIL_MONITOR_CPDATA:
-			break;
-		case EDID_DETAIL_STD_MODES:
-			/* Five modes per detailed section */
-			for (j = 0; j < 5; i++) {
-				struct std_timing *std;
-				struct drm_display_mode *newmode;
-
-				std = &data->data.timings[j];
-				newmode = drm_mode_std(dev, std,
-						       edid->revision,
-						       timing_level);
-				if (newmode) {
-					drm_mode_probed_add(connector, newmode);
-					modes++;
-				}
-			}
-			break;
-		default:
-			break;
-		}
+		modes += add_detailed_modes(connector, timing, edid, quirks, 0);
 	}
 
 	return modes;
@@ -1057,19 +1141,19 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
 			     struct i2c_adapter *adapter,
 			     char *buf, int len)
 {
-	int ret;
+	int i;
 
-	ret = drm_do_probe_ddc_edid(adapter, buf, len);
-	if (ret != 0) {
-		goto end;
-	}
-	if (!edid_is_valid((struct edid *)buf)) {
-		dev_warn(&connector->dev->pdev->dev, "%s: EDID invalid.\n",
-			 drm_get_connector_name(connector));
-		ret = -1;
+	for (i = 0; i < 4; i++) {
+		if (drm_do_probe_ddc_edid(adapter, buf, len))
+			return -1;
+		if (edid_is_valid((struct edid *)buf))
+			return 0;
 	}
-end:
-	return ret;
+
+	/* repeated checksum failures; warn, but carry on */
+	dev_warn(&connector->dev->pdev->dev, "%s: EDID invalid.\n",
+		 drm_get_connector_name(connector));
+	return -1;
 }
 
 /**
@@ -1287,6 +1371,8 @@ int drm_add_modes_noedid(struct drm_connector *connector,
 					ptr->vdisplay > vdisplay)
 				continue;
 		}
+		if (drm_mode_vrefresh(ptr) > 61)
+			continue;
 		mode = drm_mode_duplicate(dev, ptr);
 		if (mode) {
 			drm_mode_probed_add(connector, mode);
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 51f6772..6d81a02 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -553,6 +553,32 @@ int drm_mode_height(struct drm_display_mode *mode)
 }
 EXPORT_SYMBOL(drm_mode_height);
 
+/** drm_mode_hsync - get the hsync of a mode
+ * @mode: mode
+ *
+ * LOCKING:
+ * None.
+ *
+ * Return @modes's hsync rate in kHz, rounded to the nearest int.
+ */
+int drm_mode_hsync(struct drm_display_mode *mode)
+{
+	unsigned int calc_val;
+
+	if (mode->hsync)
+		return mode->hsync;
+
+	if (mode->htotal < 0)
+		return 0;
+
+	calc_val = (mode->clock * 1000) / mode->htotal; /* hsync in Hz */
+	calc_val += 500;				/* round to 1000Hz */
+	calc_val /= 1000;				/* truncate to kHz */
+
+	return calc_val;
+}
+EXPORT_SYMBOL(drm_mode_hsync);
+
 /**
  * drm_mode_vrefresh - get the vrefresh of a mode
  * @mode: mode
@@ -560,7 +586,7 @@ EXPORT_SYMBOL(drm_mode_height);
  * LOCKING:
  * None.
  *
- * Return @mode's vrefresh rate or calculate it if necessary.
+ * Return @mode's vrefresh rate in Hz or calculate it if necessary.
  *
  * FIXME: why is this needed?  shouldn't vrefresh be set already?
  *
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index b69347b..3a43ab8 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -123,7 +123,7 @@ struct drm_display_mode {
 	int type;
 
 	/* Proposed mode values */
-	int clock;
+	int clock;		/* in kHz */
 	int hdisplay;
 	int hsync_start;
 	int hsync_end;
@@ -164,8 +164,8 @@ struct drm_display_mode {
 	int *private;
 	int private_flags;
 
-	int vrefresh;
-	float hsync;
+	int vrefresh;		/* in Hz */
+	int hsync;		/* in kHz */
 };
 
 enum drm_connector_status {
@@ -667,6 +667,7 @@ extern void drm_mode_validate_size(struct drm_device *dev,
 extern void drm_mode_prune_invalid(struct drm_device *dev,
 				   struct list_head *mode_list, bool verbose);
 extern void drm_mode_sort(struct list_head *mode_list);
+extern int drm_mode_hsync(struct drm_display_mode *mode);
 extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 7d6c9a2..d33c3e0 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -106,6 +106,10 @@ struct detailed_data_color_point {
 	u8 wpindex2[3];
 } __attribute__((packed));
 
+struct cvt_timing {
+	u8 code[3];
+} __attribute__((packed));
+
 struct detailed_non_pixel {
 	u8 pad1;
 	u8 type; /* ff=serial, fe=string, fd=monitor range, fc=monitor name
@@ -117,9 +121,13 @@ struct detailed_non_pixel {
 		struct detailed_data_monitor_range range;
 		struct detailed_data_wpindex color;
 		struct std_timing timings[5];
+		struct cvt_timing cvt[4];
 	} data;
 } __attribute__((packed));
 
+#define EDID_DETAIL_EST_TIMINGS 0xf7
+#define EDID_DETAIL_CVT_3BYTE 0xf8
+#define EDID_DETAIL_COLOR_MGMT_DATA 0xf9
 #define EDID_DETAIL_STD_MODES 0xfa
 #define EDID_DETAIL_MONITOR_CPDATA 0xfb
 #define EDID_DETAIL_MONITOR_NAME 0xfc
-- 
1.6.5.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1955
retrieving revision 1.1956
diff -u -p -r1.1955 -r1.1956
--- kernel.spec	14 Dec 2009 20:25:12 -0000	1.1955
+++ kernel.spec	16 Dec 2009 20:37:39 -0000	1.1956
@@ -712,18 +712,16 @@ Patch1586: linux-2.6-virtio_blk-add-supp
 # nouveau + drm fixes
 Patch1810: kms-offb-handoff.patch
 Patch1812: drm-next-b390f944.patch
-Patch1813: drm-radeon-pm.patch
-Patch1814: drm-nouveau.patch
-Patch1818: drm-i915-resume-force-mode.patch
+Patch1813: drm-edid-9340d8cf.patch
+
+Patch1820: drm-radeon-pm.patch
+Patch1821: drm-nouveau.patch
+Patch1822: drm-i915-resume-force-mode.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
 Patch1827: drm-i915-fix-tvmode-oops.patch
-Patch1831: drm-conservative-fallback-modes.patch
-Patch1832: drm-edid-retry.patch
-Patch1834: drm-edid-header-fixup.patch
-Patch1835: drm-default-mode.patch
 Patch1837: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 Patch1839: drm-radeon-misc-fixes.patch
 Patch1840: drm-radeon-rv410-test-fix.patch
@@ -1421,12 +1419,9 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 # Nouveau DRM + drm fixes
 ApplyPatch kms-offb-handoff.patch
 ApplyPatch drm-next-b390f944.patch
+ApplyPatch drm-edid-9340d8cf.patch
 ApplyPatch drm-radeon-misc-fixes.patch
 ApplyPatch drm-radeon-rv410-test-fix.patch
-ApplyPatch drm-conservative-fallback-modes.patch
-ApplyPatch drm-edid-retry.patch
-ApplyPatch drm-edid-header-fixup.patch
-ApplyPatch drm-default-mode.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2148,6 +2143,12 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 16 2009 Adam Jackson <ajax at redhat.com>
+- drm-edid-9340d8cf.patch: Sync DRM EDID with Linus master.
+- drm-conservative-fallback-modes.patch, drm-edid-retry.patch,
+  drm-edid-header-fixup.patch, drm-default-mode.patch: Drop, merged into
+  the above.
+
 * Mon Dec 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.8-169
 - 2.6.31.8
 


--- drm-conservative-fallback-modes.patch DELETED ---


--- drm-default-mode.patch DELETED ---


--- drm-edid-header-fixup.patch DELETED ---


--- drm-edid-retry.patch DELETED ---



From yaneti at fedoraproject.org  Wed Dec 16 20:38:05 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Wed, 16 Dec 2009 20:38:05 +0000 (UTC)
Subject: File POE-Component-Server-Bayeux-0.04.tar.gz uploaded to lookaside
	cache by yaneti
Message-ID: <20091216203805.5FFD928ED21@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-POE-Component-Server-Bayeux:

4ec3ccb5cc2ee3ca62b1b6ef9c48c107  POE-Component-Server-Bayeux-0.04.tar.gz



From philipp at fedoraproject.org  Wed Dec 16 20:38:33 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 20:38:33 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel import.log, NONE, 1.1 mod_proxy_html.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216203833.D09CE11C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv509/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_proxy_html.spec 
Log Message:
Initial commit.




--- NEW FILE import.log ---
mod_proxy_html-3_1_2-1_fc11:HEAD:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260995348


--- NEW FILE mod_proxy_html.spec ---
Summary: Output filter to rewrite HTML links in a proxy situation
Name: mod_proxy_html
Version: 3.1.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://apache.webthing.com/mod_proxy_html/
Source: http://apache.webthing.com/mod_proxy_html/mod_proxy_html-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
BuildRequires: libxml2-devel httpd-devel

%description
mod_proxy_html is an output filter to rewrite HTML links in a proxy situation,
to ensure that links work for users outside the proxy. It serves the same
purpose as Apache's ProxyPassReverse directive does for HTTP headers, and is
an essential component of a reverse proxy.

%define modulesdir %{_libdir}/httpd/modules
%define confdir %{_sysconfdir}/httpd/conf

%prep
%setup -q -n %{name}


%build
%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c


%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}/%{modulesdir}
%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
%{__sed} -i \
	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
%ifarch x86_64
	-e 's@/usr/lib/@%{_libdir}/@' \
%endif
	%{buildroot}/%{confdir}.d/proxy_html.conf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root)
%{modulesdir}/mod_proxy_html.so
%config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
%doc COPYING README


%changelog
* Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
- Version bump to 3.1.2

* Fri Sep 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-9
- Put back BuildRequires...

* Tue Sep  7 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-8
- Not being enabled by default (uncomment the "LoadModule" line from the
  config).

* Tue Sep  2 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-7
- Fixed "Source:" to point to numbered version of tarball.  Thanks Nick!

* Tue Aug 12 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-6
- Fixed BuildRequires: and BuildRoot: as per code review comments.

* Sun Jul 13 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-5
- Fixed gcc warning on missing braces/ambiguous "else".

* Thu Jul 10 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-4
- Fixed conditional edit of path to libs in .conf file based on architecture
  type.

* Mon Jun 30 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-3
- Added "--with xml" for those wanting implicit load of libxml2 via ld.so
  instead of via explicit "LoadFile" in configs.

* Sat Jun 28 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-2
- Merged with comments from reviewers (especially Ray).

* Wed Jun 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:30:55 -0000	1.1
+++ .cvsignore	16 Dec 2009 20:38:33 -0000	1.2
@@ -0,0 +1 @@
+mod_proxy_html-3.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:30:55 -0000	1.1
+++ sources	16 Dec 2009 20:38:33 -0000	1.2
@@ -0,0 +1 @@
+d6497b48d2bffc4150472472004618c3  mod_proxy_html-3.1.2.tar.bz2



From yaneti at fedoraproject.org  Wed Dec 16 20:39:07 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Wed, 16 Dec 2009 20:39:07 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-Bayeux/devel .cvsignore, 1.3,
	1.4 perl-POE-Component-Server-Bayeux.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091216203907.BFF1111C00C5@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/perl-POE-Component-Server-Bayeux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3055

Modified Files:
	.cvsignore perl-POE-Component-Server-Bayeux.spec sources 
Log Message:
- New upstream release (bugfix)
  http://cpansearch.perl.org/src/EWATERS/POE-Component-Server-Bayeux-0.04/Changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-Bayeux/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 08:06:45 -0000	1.3
+++ .cvsignore	16 Dec 2009 20:39:07 -0000	1.4
@@ -1 +1 @@
-POE-Component-Server-Bayeux-0.03.tar.gz
+POE-Component-Server-Bayeux-0.04.tar.gz


Index: perl-POE-Component-Server-Bayeux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-Bayeux/devel/perl-POE-Component-Server-Bayeux.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-POE-Component-Server-Bayeux.spec	7 Dec 2009 08:32:48 -0000	1.4
+++ perl-POE-Component-Server-Bayeux.spec	16 Dec 2009 20:39:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-Bayeux
-Version:        0.03
-Release:        2%{?dist}
+Version:        0.04
+Release:        1%{?dist}
 Summary:        Bayeux/cometd server implementation in POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -63,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec 16 2009 Yanko Kaneti <yaneti at declera.com> - 0.04-1
+- New upstream release (bugfix)
+  http://cpansearch.perl.org/src/EWATERS/POE-Component-Server-Bayeux-0.04/Changes
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.03-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-Bayeux/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Oct 2009 08:06:46 -0000	1.3
+++ sources	16 Dec 2009 20:39:07 -0000	1.4
@@ -1 +1 @@
-6ccc6b158e4b0f57cf46252fac5341a9  POE-Component-Server-Bayeux-0.03.tar.gz
+4ec3ccb5cc2ee3ca62b1b6ef9c48c107  POE-Component-Server-Bayeux-0.04.tar.gz



From philipp at fedoraproject.org  Wed Dec 16 20:39:55 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 20:39:55 +0000 (UTC)
Subject: rpms/mod_proxy_html/F-11 import.log, NONE, 1.1 mod_proxy_html.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216203955.2513E11C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3370/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_proxy_html.spec 
Log Message:
Initial commit.




--- NEW FILE import.log ---
mod_proxy_html-3_1_2-1_fc11:F-11:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260995953


--- NEW FILE mod_proxy_html.spec ---
Summary: Output filter to rewrite HTML links in a proxy situation
Name: mod_proxy_html
Version: 3.1.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://apache.webthing.com/mod_proxy_html/
Source: http://apache.webthing.com/mod_proxy_html/mod_proxy_html-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
BuildRequires: libxml2-devel httpd-devel

%description
mod_proxy_html is an output filter to rewrite HTML links in a proxy situation,
to ensure that links work for users outside the proxy. It serves the same
purpose as Apache's ProxyPassReverse directive does for HTTP headers, and is
an essential component of a reverse proxy.

%define modulesdir %{_libdir}/httpd/modules
%define confdir %{_sysconfdir}/httpd/conf

%prep
%setup -q -n %{name}


%build
%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c


%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}/%{modulesdir}
%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
%{__sed} -i \
	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
%ifarch x86_64
	-e 's@/usr/lib/@%{_libdir}/@' \
%endif
	%{buildroot}/%{confdir}.d/proxy_html.conf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root)
%{modulesdir}/mod_proxy_html.so
%config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
%doc COPYING README


%changelog
* Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
- Version bump to 3.1.2

* Fri Sep 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-9
- Put back BuildRequires...

* Tue Sep  7 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-8
- Not being enabled by default (uncomment the "LoadModule" line from the
  config).

* Tue Sep  2 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-7
- Fixed "Source:" to point to numbered version of tarball.  Thanks Nick!

* Tue Aug 12 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-6
- Fixed BuildRequires: and BuildRoot: as per code review comments.

* Sun Jul 13 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-5
- Fixed gcc warning on missing braces/ambiguous "else".

* Thu Jul 10 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-4
- Fixed conditional edit of path to libs in .conf file based on architecture
  type.

* Mon Jun 30 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-3
- Added "--with xml" for those wanting implicit load of libxml2 via ld.so
  instead of via explicit "LoadFile" in configs.

* Sat Jun 28 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-2
- Merged with comments from reviewers (especially Ray).

* Wed Jun 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:30:55 -0000	1.1
+++ .cvsignore	16 Dec 2009 20:39:55 -0000	1.2
@@ -0,0 +1 @@
+mod_proxy_html-3.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:30:55 -0000	1.1
+++ sources	16 Dec 2009 20:39:55 -0000	1.2
@@ -0,0 +1 @@
+d6497b48d2bffc4150472472004618c3  mod_proxy_html-3.1.2.tar.bz2



From philipp at fedoraproject.org  Wed Dec 16 20:41:20 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 20:41:20 +0000 (UTC)
Subject: rpms/mod_proxy_html/F-12 import.log, NONE, 1.1 mod_proxy_html.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216204120.818E711C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3956/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_proxy_html.spec 
Log Message:
Initial commit.




--- NEW FILE import.log ---
mod_proxy_html-3_1_2-1_fc11:F-12:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260996022


--- NEW FILE mod_proxy_html.spec ---
Summary: Output filter to rewrite HTML links in a proxy situation
Name: mod_proxy_html
Version: 3.1.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://apache.webthing.com/mod_proxy_html/
Source: http://apache.webthing.com/mod_proxy_html/mod_proxy_html-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
BuildRequires: libxml2-devel httpd-devel

%description
mod_proxy_html is an output filter to rewrite HTML links in a proxy situation,
to ensure that links work for users outside the proxy. It serves the same
purpose as Apache's ProxyPassReverse directive does for HTTP headers, and is
an essential component of a reverse proxy.

%define modulesdir %{_libdir}/httpd/modules
%define confdir %{_sysconfdir}/httpd/conf

%prep
%setup -q -n %{name}


%build
%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c


%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}/%{modulesdir}
%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
%{__sed} -i \
	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
%ifarch x86_64
	-e 's@/usr/lib/@%{_libdir}/@' \
%endif
	%{buildroot}/%{confdir}.d/proxy_html.conf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root)
%{modulesdir}/mod_proxy_html.so
%config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
%doc COPYING README


%changelog
* Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
- Version bump to 3.1.2

* Fri Sep 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-9
- Put back BuildRequires...

* Tue Sep  7 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-8
- Not being enabled by default (uncomment the "LoadModule" line from the
  config).

* Tue Sep  2 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-7
- Fixed "Source:" to point to numbered version of tarball.  Thanks Nick!

* Tue Aug 12 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-6
- Fixed BuildRequires: and BuildRoot: as per code review comments.

* Sun Jul 13 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-5
- Fixed gcc warning on missing braces/ambiguous "else".

* Thu Jul 10 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-4
- Fixed conditional edit of path to libs in .conf file based on architecture
  type.

* Mon Jun 30 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-3
- Added "--with xml" for those wanting implicit load of libxml2 via ld.so
  instead of via explicit "LoadFile" in configs.

* Sat Jun 28 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-2
- Merged with comments from reviewers (especially Ray).

* Wed Jun 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:30:55 -0000	1.1
+++ .cvsignore	16 Dec 2009 20:41:20 -0000	1.2
@@ -0,0 +1 @@
+mod_proxy_html-3.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:30:55 -0000	1.1
+++ sources	16 Dec 2009 20:41:20 -0000	1.2
@@ -0,0 +1 @@
+d6497b48d2bffc4150472472004618c3  mod_proxy_html-3.1.2.tar.bz2



From ovasik at fedoraproject.org  Wed Dec 16 21:00:11 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 16 Dec 2009 21:00:11 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-colorls.sh, 1.13, 1.14 coreutils.spec,
	1.292, 1.293 coreutils-4.5.3-sysinfo.patch, 1.7, NONE
Message-ID: <20091216210011.9DC4D11C00C5@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8346

Modified Files:
	coreutils-colorls.sh coreutils.spec 
Removed Files:
	coreutils-4.5.3-sysinfo.patch 
Log Message:
use grep instead of deprecated egrep in colorls.sh script, remove unnecessary versioned requires/conflicts, remove non-upstream hack for uname -p


Index: coreutils-colorls.sh
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils-colorls.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- coreutils-colorls.sh	19 Mar 2009 14:56:49 -0000	1.13
+++ coreutils-colorls.sh	16 Dec 2009 21:00:11 -0000	1.14
@@ -32,7 +32,7 @@ if [ -z "$USER_LS_COLORS" ]; then
 
   eval `dircolors --sh "$COLORS" 2>/dev/null`
   [ -z "$LS_COLORS" ] && return
-  egrep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
+  grep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
 fi
 
 alias ll='ls -l --color=auto' 2>/dev/null


Index: coreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- coreutils.spec	16 Dec 2009 12:17:58 -0000	1.292
+++ coreutils.spec	16 Dec 2009 21:00:11 -0000	1.293
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -32,7 +32,6 @@ Patch704: sh-utils-1.16-paths.patch
 # it here indefinitely.
 Patch706: coreutils-pam.patch
 Patch713: coreutils-4.5.3-langinfo.patch
-Patch715: coreutils-4.5.3-sysinfo.patch
 
 # (sb) lin18nux/lsb compliance
 Patch800: coreutils-i18n.patch
@@ -49,35 +48,29 @@ Patch916: coreutils-getfacl-exit-code.pa
 Patch950: coreutils-selinux.patch
 Patch951: coreutils-selinuxmanpages.patch
 
-BuildRequires: libselinux-devel >= 1.25.6-1
+BuildRequires: libselinux-devel
 BuildRequires: libacl-devel
 BuildRequires: gettext bison
-BuildRequires: texinfo >= 4.3
-BuildRequires: autoconf >= 2.58
-BuildRequires: automake >= 1.10.1
+BuildRequires: texinfo
+BuildRequires: autoconf
+BuildRequires: automake
 %{?!nopam:BuildRequires: pam-devel}
-BuildRequires: libcap-devel >= 2.0.6
+BuildRequires: libcap-devel
 BuildRequires: libattr-devel
 BuildRequires: attr
 BuildRequires: strace
 
-Requires(post): libselinux >= 1.25.6-1
+Requires(post): libselinux
 Requires:       libattr
-#util-linux-ng requirement is here only to prevent /bin/arch conflict
-#(could be removed after F-11/F-12 split, no idea how to solve it better)
-Requires:				util-linux-ng >= 2.14
 Requires(pre): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
 Requires(post): grep
-%{?!nopam:Requires: pam >= 0.66-12}
-Requires(post): libcap >= 2.0.6
+%{?!nopam:Requires: pam }
+Requires(post): libcap
 Requires:       ncurses
 Requires: %{name}-libs = %{version}-%{release}
 
-# Require a C library that doesn't put LC_TIME files in our way.
-Conflicts: glibc < 2.2
-
 Provides: fileutils = %{version}-%{release}
 Provides: sh-utils = %{version}-%{release}
 Provides: stat = %{version}-%{release}
@@ -89,8 +82,6 @@ Obsoletes: fileutils <= 4.1.9
 Obsoletes: sh-utils <= 2.0.12
 Obsoletes: stat <= 3.3
 Obsoletes: textutils <= 2.0.21
-# readlink(1) moved here from tetex.
-Conflicts: tetex < 1.0.7-66
 
 %description
 These are the GNU core utilities.  This package is the combination of
@@ -119,7 +110,6 @@ Libraries for coreutils package.
 %patch704 -p1 -b .paths
 %patch706 -p1 -b .pam
 %patch713 -p1 -b .langinfo
-%patch715 -p1 -b .sysinfo
 # li18nux/lsb
 %patch800 -p1 -b .i18n
 
@@ -326,6 +316,12 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Wed Dec 16 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-3
+- use grep instead of deprecated egrep in colorls.sh script
+  (#548174)
+- remove unnecessary versioned requires
+- remove non-upstream hack for uname -p
+
 * Wed Dec 16 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-2
 - fix DIR_COLORS.256color file
 


--- coreutils-4.5.3-sysinfo.patch DELETED ---



From kaitlin at fedoraproject.org  Wed Dec 16 21:08:42 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Wed, 16 Dec 2009 21:08:42 +0000 (UTC)
Subject: rpms/libvirt-cim/devel remove_net_name.patch, NONE,
	1.1 xen_migration_uri.patch, NONE, 1.1 libvirt-cim.spec, 1.31, 1.32
Message-ID: <20091216210842.42C9711C00C5@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10111

Modified Files:
	libvirt-cim.spec 
Added Files:
	remove_net_name.patch xen_migration_uri.patch 
Log Message:
Add xen uri and removal of net->name patches.  Also update spec file
for 0.5.8-2 related changes.



remove_net_name.patch:
 libxkutil/device_parsing.c                |    5 ++---
 libxkutil/device_parsing.h                |    1 -
 libxkutil/xmlgen.c                        |    7 +------
 src/Virt_RASD.c                           |    6 +++---
 src/Virt_VirtualSystemManagementService.c |    5 ++---
 5 files changed, 8 insertions(+), 16 deletions(-)

--- NEW FILE remove_net_name.patch ---
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1260387726 28800
# Node ID 54c432d2bec6493cbbd3fa7c5a28b2e461014f68
# Parent  3e7b324f52e408cffa7f4fcc35296173f308c921
Revert net->name to net->source

For Xen guests, a network device is turned into a bridge device.  However,
the network resource still belongs to the virtual network pool.  This change
makes sure the bridge name is written to the source field of the net struct so
that look ups in Virt_DevicePool.c work properly.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 3e7b324f52e4 -r 54c432d2bec6 libxkutil/device_parsing.c
--- a/libxkutil/device_parsing.c	Thu Dec 03 18:20:29 2009 -0800
+++ b/libxkutil/device_parsing.c	Wed Dec 09 11:42:06 2009 -0800
@@ -304,8 +304,8 @@
                         if (ndev->mac == NULL)
                                 goto err;
                 } else if (XSTREQ(child->name, "source")) {
-                        ndev->name = get_attr_value(child, "bridge");
-                        if (ndev->name != NULL)
+                        ndev->source = get_attr_value(child, "bridge");
+                        if (ndev->source != NULL)
                                 continue;
                         ndev->source = get_attr_value(child, "network");
                         if (ndev->source != NULL)
@@ -659,7 +659,6 @@
                 DUP_FIELD(dev, _dev, dev.net.mac);
                 DUP_FIELD(dev, _dev, dev.net.type);
                 DUP_FIELD(dev, _dev, dev.net.source);
-                DUP_FIELD(dev, _dev, dev.net.name);
                 DUP_FIELD(dev, _dev, dev.net.model);
         } else if (dev->type == CIM_RES_TYPE_DISK) {
                 DUP_FIELD(dev, _dev, dev.disk.type);
diff -r 3e7b324f52e4 -r 54c432d2bec6 libxkutil/device_parsing.h
--- a/libxkutil/device_parsing.h	Thu Dec 03 18:20:29 2009 -0800
+++ b/libxkutil/device_parsing.h	Wed Dec 09 11:42:06 2009 -0800
@@ -50,7 +50,6 @@
         char *mac;
         char *source;
         char *model;
-        char *name;
 };
 
 struct mem_device {
diff -r 3e7b324f52e4 -r 54c432d2bec6 libxkutil/xmlgen.c
--- a/libxkutil/xmlgen.c	Thu Dec 03 18:20:29 2009 -0800
+++ b/libxkutil/xmlgen.c	Wed Dec 09 11:42:06 2009 -0800
@@ -165,12 +165,7 @@
 {
         xmlNodePtr tmp;
 
-        if ((STREQC(src_type, "bridge")) && (dev->name != NULL)) {
-                tmp = xmlNewChild(nic, NULL, BAD_CAST "source", NULL);
-                if (tmp == NULL) 
-                        return XML_ERROR;
-                xmlNewProp(tmp, BAD_CAST src_type, BAD_CAST dev->name);
-        } else if ((STREQC(src_type, "network")) && (dev->source != NULL)) {
+        if (dev->source != NULL) {
                 tmp = xmlNewChild(nic, NULL, BAD_CAST "source", NULL);
                 if (tmp == NULL) 
                         return XML_ERROR;
diff -r 3e7b324f52e4 -r 54c432d2bec6 src/Virt_RASD.c
--- a/src/Virt_RASD.c	Thu Dec 03 18:20:29 2009 -0800
+++ b/src/Virt_RASD.c	Wed Dec 09 11:42:06 2009 -0800
@@ -435,11 +435,11 @@
                               (CMPIValue *)dev->dev.net.mac,
                               CMPI_chars);
 
-                if ((dev->dev.net.name != NULL) && 
-                     (STREQ(dev->dev.net.type, "bridge")))
+                if ((dev->dev.net.source != NULL) 
+                   && (STREQ(dev->dev.net.type, "bridge")))
                         CMSetProperty(inst,
                                       "NetworkName",
-                                      (CMPIValue *)dev->dev.net.name,
+                                      (CMPIValue *)dev->dev.net.source,
                                       CMPI_chars);
 
                 if (dev->dev.net.model != NULL)
diff -r 3e7b324f52e4 -r 54c432d2bec6 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Thu Dec 03 18:20:29 2009 -0800
+++ b/src/Virt_VirtualSystemManagementService.c	Wed Dec 09 11:42:06 2009 -0800
@@ -720,15 +720,15 @@
         dev->id = strdup(dev->dev.net.mac);
 
         free(dev->dev.net.type);
-        free(dev->dev.net.name);
         if (cu_get_str_prop(inst, "NetworkType", &val) != CMPI_RC_OK) 
                 return "No Network Type specified";
 
+        free(dev->dev.net.source);
         if (STREQC(val, BRIDGE_TYPE)) {
                 dev->dev.net.type = strdup(BRIDGE_TYPE);
                 if (cu_get_str_prop(inst, "NetworkName", &val) == CMPI_RC_OK) 
                         if (strlen(val) > 0)
-                                dev->dev.net.name = strdup(val);
+                                dev->dev.net.source = strdup(val);
                         else
                                 return "Bridge name is empty";
                 else 
@@ -741,7 +741,6 @@
                 if (val == NULL)
                         return "No NetworkPool specified no default available";
 
-                free(dev->dev.net.source);
                 network = name_from_pool_id(val);
                 if (network == NULL) {
                         msg = "PoolID specified is not formatted properly";

xen_migration_uri.patch:
 Virt_VSMigrationService.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE xen_migration_uri.patch ---
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1259882291 28800
# Node ID 3ceede4c5d356eb61b759a09f9a2751793247c1d
# Parent  282660c5e43aba6b284a9909144b9df14dc95f5b
Xen version 3.3.0 doesn't accept system in the migration URI

This change has been tested with Xen version 3.1.0. Also tests against KVM
to check for regressions.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 282660c5e43a -r 3ceede4c5d35 src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c	Wed Dec 02 12:48:47 2009 -0800
+++ b/src/Virt_VSMigrationService.c	Thu Dec 03 15:18:11 2009 -0800
@@ -186,7 +186,12 @@
                 goto out;
         }
 
-        rc = asprintf(&uri, "%s+%s://%s/system", prefix, tport, dest);
+        if (STREQC(prefix, "xen"))
+                rc = asprintf(&uri, "%s+%s://%s", prefix, tport, dest);
+        else {
+                rc = asprintf(&uri, "%s+%s://%s/system", prefix, tport, dest);
+        }
+
         if (rc == -1) {
                 uri = NULL;
                 goto out;


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libvirt-cim.spec	7 Dec 2009 17:48:32 -0000	1.31
+++ libvirt-cim.spec	16 Dec 2009 21:08:42 -0000	1.32
@@ -3,18 +3,20 @@
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
 Version: 0.5.8
-Release: 2%{?dist}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/CIM/
+Requires: libxml2 >= 2.6.0
+Requires: libvirt >= 0.3.2
 Requires: unzip
-Requires: tog-pegasus 
+Requires: tog-pegasus
 BuildRequires: libcmpiutil >= 0.4
 BuildRequires: tog-pegasus-devel
 BuildRequires: libvirt-devel >= 0.3.2
-BuildRequires: libuuid-devel 
+BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 BuildRequires: libcmpiutil-devel
 BuildConflicts: sblim-cmpi-devel
@@ -89,25 +91,25 @@ rm -fr $RPM_BUILD_ROOT
         -n root/interop \
         -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
-        -n root/PG_InterOp \
-        -r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} -v >/dev/null 2>&1 || true
+	-n root/PG_InterOp \
+	-r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} -v >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
-        -n root/cimv2\
-        -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
+	-n root/cimv2 \
+	-r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
 
 %preun
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
 	-n root/virt \
 	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
-        -n root/interop \
-        -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
+	-n root/interop \
+	-r %{INTEROP_REG} -m %{INTEROP_MOF} >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
-        -n root/PG_InterOp \
-        -r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} >/dev/null 2>&1 || true
+	-n root/PG_InterOp \
+	-r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
-        -n root/cimv2 \
-        -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
+	-n root/cimv2 \
+	-r %{CIMV2_REG} -m %{CIMV2_MOF} >/dev/null 2>&1 || true
 
 %postun -p /sbin/ldconfig
 
@@ -135,6 +137,8 @@ rm -fr $RPM_BUILD_ROOT
 - Remove additional reg call of root/virt from postinstall 
 - Do not use /etc directly.  Use sysconfigdir instead
 - Remove additional DESTDIR definition
+- Fix Xen migration URI to not include 'system'
+- Change net->name to net->source
 
 * Wed Dec 02 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.8-1
 - Updated to latest upstream source



From dwalsh at fedoraproject.org  Wed Dec 16 21:11:12 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 21:11:12 +0000 (UTC)
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.59,
	1.60 libsemanage.spec, 1.191, 1.192
Message-ID: <20091216211112.42F5811C00C5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10866

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.43-2
- Rebuild all c programs with -fPIC


libsemanage-rhat.patch:
 include/semanage/modules.h |    5 +
 src/Makefile               |    2 
 src/direct_api.c           |  119 +++++++++++++++++++++++++++++++++++++++++++--
 src/genhomedircon.c        |    7 ++
 src/libsemanage.map        |    3 +
 src/module_internal.h      |    1 
 src/modules.c              |   41 +++++++++++++++
 src/modules.h              |    1 
 src/policy.h               |    6 ++
 src/semanage.conf          |    2 
 src/semanage_store.c       |   60 ++++++++++++++++++----
 src/semanage_store.h       |    2 
 12 files changed, 232 insertions(+), 17 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- libsemanage-rhat.patch	18 Nov 2009 22:19:05 -0000	1.59
+++ libsemanage-rhat.patch	16 Dec 2009 21:11:11 -0000	1.60
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.41/include/semanage/modules.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.43/include/semanage/modules.h
 --- nsalibsemanage/include/semanage/modules.h	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.41/include/semanage/modules.h	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/include/semanage/modules.h	2009-12-16 16:07:43.000000000 -0500
 @@ -40,10 +40,12 @@
  				 char *module_data, size_t data_len);
  int semanage_module_install_base_file(semanage_handle_t *,
@@ -22,9 +22,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +int semanage_module_get_enabled(semanage_module_info_t *);
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.41/src/direct_api.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.43/src/direct_api.c
 --- nsalibsemanage/src/direct_api.c	2009-09-17 08:59:43.000000000 -0400
-+++ libsemanage-2.0.41/src/direct_api.c	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/direct_api.c	2009-12-16 16:07:43.000000000 -0500
 @@ -66,6 +66,8 @@
  static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data,
  					size_t data_len);
@@ -196,9 +196,9 @@ diff --exclude-from=exclude -N -u -r nsa
  			(*num_modules)++;
  		} else {
  			/* file was not a module, so don't report it */
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.41/src/genhomedircon.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.43/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2009-09-17 08:59:43.000000000 -0400
-+++ libsemanage-2.0.41/src/genhomedircon.c	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/genhomedircon.c	2009-12-16 16:07:43.000000000 -0500
 @@ -310,6 +310,10 @@
  		}
  		if (strcmp(pwbuf->pw_dir, "/") == 0)
@@ -220,9 +220,9 @@ diff --exclude-from=exclude -N -u -r nsa
  		if (push_user_entry(&head, name, seuname,
  				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
  			*errors = STATUS_ERR;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.41/src/libsemanage.map
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.43/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2009-10-29 15:21:39.000000000 -0400
-+++ libsemanage-2.0.41/src/libsemanage.map	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/libsemanage.map	2009-12-16 16:07:43.000000000 -0500
 @@ -6,10 +6,13 @@
  	  semanage_module_install; semanage_module_install_file;
  	  semanage_module_upgrade; semanage_module_upgrade_file;
@@ -237,9 +237,21 @@ diff --exclude-from=exclude -N -u -r nsa
  	  semanage_reload_policy; semanage_set_reload; semanage_set_rebuild;
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.41/src/module_internal.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0.43/src/Makefile
+--- nsalibsemanage/src/Makefile	2009-12-01 15:46:50.000000000 -0500
++++ libsemanage-2.0.43/src/Makefile	2009-12-16 16:07:47.000000000 -0500
+@@ -47,7 +47,7 @@
+ LOBJS= $(patsubst %.c,%.lo,$(SRCS)) conf-scan.lo conf-parse.lo
+ CFLAGS ?= -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter
+ 
+-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE 
++override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -fPIC
+ 
+ SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
+ 
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.43/src/module_internal.h
 --- nsalibsemanage/src/module_internal.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.41/src/module_internal.h	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/module_internal.h	2009-12-16 16:07:43.000000000 -0500
 @@ -6,6 +6,7 @@
  
  hidden_proto(semanage_module_get_name)
@@ -248,9 +260,9 @@ diff --exclude-from=exclude -N -u -r nsa
      hidden_proto(semanage_module_info_datum_destroy)
      hidden_proto(semanage_module_list_nth)
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.41/src/modules.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.43/src/modules.c
 --- nsalibsemanage/src/modules.c	2009-09-17 08:59:43.000000000 -0400
-+++ libsemanage-2.0.41/src/modules.c	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/modules.c	2009-12-16 16:07:43.000000000 -0500
 @@ -154,6 +154,40 @@
  	return sh->funcs->install_base_file(sh, module_name);
  }
@@ -306,9 +318,9 @@ diff --exclude-from=exclude -N -u -r nsa
  const char *semanage_module_get_version(semanage_module_info_t * modinfo)
  {
  	return modinfo->version;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.41/src/modules.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.43/src/modules.h
 --- nsalibsemanage/src/modules.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.41/src/modules.h	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/modules.h	2009-12-16 16:07:43.000000000 -0500
 @@ -26,6 +26,7 @@
  struct semanage_module_info {
  	char *name;		/* Key */
@@ -317,9 +329,9 @@ diff --exclude-from=exclude -N -u -r nsa
  };
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.41/src/policy.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.43/src/policy.h
 --- nsalibsemanage/src/policy.h	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.41/src/policy.h	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/policy.h	2009-12-16 16:07:43.000000000 -0500
 @@ -58,6 +58,12 @@
  	/* Upgrade a policy module */
  	int (*upgrade_file) (struct semanage_handle *, const char *);
@@ -333,18 +345,18 @@ diff --exclude-from=exclude -N -u -r nsa
  	/* Remove a policy module */
  	int (*remove) (struct semanage_handle *, char *);
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.41/src/semanage.conf
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.43/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.41/src/semanage.conf	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/semanage.conf	2009-12-16 16:07:43.000000000 -0500
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
  #policy-version = 19
 -
 +expand-check=0
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.41/src/semanage_store.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.43/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2009-10-29 15:21:39.000000000 -0400
-+++ libsemanage-2.0.41/src/semanage_store.c	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/semanage_store.c	2009-12-16 16:07:43.000000000 -0500
 @@ -57,6 +57,8 @@
  
  #include "debug.h"
@@ -447,9 +459,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	    -1 || semanage_load_module(sh, base_filename, base) == -1) {
  		goto cleanup;
  	}
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.41/src/semanage_store.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.43/src/semanage_store.h
 --- nsalibsemanage/src/semanage_store.h	2009-07-07 15:32:32.000000000 -0400
-+++ libsemanage-2.0.41/src/semanage_store.h	2009-11-12 11:01:10.000000000 -0500
++++ libsemanage-2.0.43/src/semanage_store.h	2009-12-16 16:07:43.000000000 -0500
 @@ -128,4 +128,6 @@
  		     size_t buf_len,
  		     char **sorted_buf, size_t * sorted_buf_len);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- libsemanage.spec	1 Dec 2009 22:47:17 -0000	1.191
+++ libsemanage.spec	16 Dec 2009 21:11:12 -0000	1.192
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.43
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -66,6 +66,7 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_lib} 
 mkdir -p ${RPM_BUILD_ROOT}/%{_libdir} 
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir} 
 make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" install install-pywrap
+ln -sf  /%{_lib}/libsemanage.so.1 ${RPM_BUILD_ROOT}/%{_libdir}/libsemanage.so
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -92,6 +93,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.43-2
+- Rebuild all c programs with -fPIC
+
 * Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.43-1
 - Update to upstream
 	* Move libsemanage.so to /usr/lib



From philipp at fedoraproject.org  Wed Dec 16 21:17:27 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 21:17:27 +0000 (UTC)
Subject: rpms/mod_proxy_html/EL-4 import.log, NONE, 1.1 mod_proxy_html.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216211727.9087011C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12517/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_proxy_html.spec 
Log Message:
Initial commit.




--- NEW FILE import.log ---
mod_proxy_html-3_1_2-1_fc11:EL-4:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260998177


--- NEW FILE mod_proxy_html.spec ---
Summary: Output filter to rewrite HTML links in a proxy situation
Name: mod_proxy_html
Version: 3.1.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://apache.webthing.com/mod_proxy_html/
Source: http://apache.webthing.com/mod_proxy_html/mod_proxy_html-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
BuildRequires: libxml2-devel httpd-devel

%description
mod_proxy_html is an output filter to rewrite HTML links in a proxy situation,
to ensure that links work for users outside the proxy. It serves the same
purpose as Apache's ProxyPassReverse directive does for HTTP headers, and is
an essential component of a reverse proxy.

%define modulesdir %{_libdir}/httpd/modules
%define confdir %{_sysconfdir}/httpd/conf

%prep
%setup -q -n %{name}


%build
%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c


%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}/%{modulesdir}
%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
%{__sed} -i \
	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
%ifarch x86_64
	-e 's@/usr/lib/@%{_libdir}/@' \
%endif
	%{buildroot}/%{confdir}.d/proxy_html.conf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root)
%{modulesdir}/mod_proxy_html.so
%config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
%doc COPYING README


%changelog
* Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
- Version bump to 3.1.2

* Fri Sep 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-9
- Put back BuildRequires...

* Tue Sep  7 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-8
- Not being enabled by default (uncomment the "LoadModule" line from the
  config).

* Tue Sep  2 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-7
- Fixed "Source:" to point to numbered version of tarball.  Thanks Nick!

* Tue Aug 12 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-6
- Fixed BuildRequires: and BuildRoot: as per code review comments.

* Sun Jul 13 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-5
- Fixed gcc warning on missing braces/ambiguous "else".

* Thu Jul 10 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-4
- Fixed conditional edit of path to libs in .conf file based on architecture
  type.

* Mon Jun 30 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-3
- Added "--with xml" for those wanting implicit load of libxml2 via ld.so
  instead of via explicit "LoadFile" in configs.

* Sat Jun 28 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-2
- Merged with comments from reviewers (especially Ray).

* Wed Jun 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:30:55 -0000	1.1
+++ .cvsignore	16 Dec 2009 21:17:27 -0000	1.2
@@ -0,0 +1 @@
+mod_proxy_html-3.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:30:55 -0000	1.1
+++ sources	16 Dec 2009 21:17:27 -0000	1.2
@@ -0,0 +1 @@
+d6497b48d2bffc4150472472004618c3  mod_proxy_html-3.1.2.tar.bz2



From dwalsh at fedoraproject.org  Wed Dec 16 21:18:04 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 21:18:04 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.664,1.665
Message-ID: <20091216211804.F3F3F11C00C5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12824

Modified Files:
	policycoreutils.spec 
Log Message:
* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-5
- If restorecond running as a user has no files to watch then it should exit.  (NFS Homedirs)



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.664
retrieving revision 1.665
diff -u -p -r1.664 -r1.665
--- policycoreutils.spec	16 Dec 2009 13:22:00 -0000	1.664
+++ policycoreutils.spec	16 Dec 2009 21:18:04 -0000	1.665
@@ -1,7 +1,7 @@
 %define	libauditver	1.4.2-1
-%define	libsepolver	2.0.19-1
-%define	libsemanagever	2.0.36-2
-%define	libselinuxver	2.0.46-5
+%define	libsepolver	2.0.41-1
+%define	libsemanagever	2.0.43-2
+%define	libselinuxver	2.0.90-1
 %define	sepolgenver	1.0.19
 Summary: SELinux policy core utilities
 Name:	 policycoreutils



From xhorak at fedoraproject.org  Wed Dec 16 21:18:07 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 16 Dec 2009 21:18:07 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-11 epiphany-extensions.spec,1.66,1.67
Message-ID: <20091216211807.98F9311C00C5@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany-extensions/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12855

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.26.1-9
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-11/epiphany-extensions.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- epiphany-extensions.spec	5 Nov 2009 19:45:19 -0000	1.66
+++ epiphany-extensions.spec	16 Dec 2009 21:18:07 -0000	1.67
@@ -1,11 +1,11 @@
 %global ephy_major          2.26
 %global ephy_api_version    2.26
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.1.5
+%global gecko_version       1.9.1.6
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -112,6 +112,9 @@ scrollkeeper-update -q ||:
 %{_sysconfdir}/gconf/schemas/epilicious.schemas
 
 %changelog
+* Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.26.1-9
+- Rebuild against newer gecko
+
 * Thu Nov 05 2009 Jan Horak <jhorak at redhat.com> - 2.26.1-8
 - Rebuild against newer gecko
 



From mclasen at fedoraproject.org  Wed Dec 16 21:18:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 21:18:38 +0000 (UTC)
Subject: File gedit-2.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091216211838.E3FA628ED1C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gedit:

562b2e15cf4d3cef068caf7a25843ccd  gedit-2.28.2.tar.bz2



From philipp at fedoraproject.org  Wed Dec 16 21:18:44 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 21:18:44 +0000 (UTC)
Subject: rpms/mod_proxy_html/EL-5 import.log, NONE, 1.1 mod_proxy_html.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091216211844.AE60711C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13310/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_proxy_html.spec 
Log Message:
Initial commit.




--- NEW FILE import.log ---
mod_proxy_html-3_1_2-1_fc11:EL-5:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260998290


--- NEW FILE mod_proxy_html.spec ---
Summary: Output filter to rewrite HTML links in a proxy situation
Name: mod_proxy_html
Version: 3.1.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://apache.webthing.com/mod_proxy_html/
Source: http://apache.webthing.com/mod_proxy_html/mod_proxy_html-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
BuildRequires: libxml2-devel httpd-devel

%description
mod_proxy_html is an output filter to rewrite HTML links in a proxy situation,
to ensure that links work for users outside the proxy. It serves the same
purpose as Apache's ProxyPassReverse directive does for HTTP headers, and is
an essential component of a reverse proxy.

%define modulesdir %{_libdir}/httpd/modules
%define confdir %{_sysconfdir}/httpd/conf

%prep
%setup -q -n %{name}


%build
%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c


%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}/%{modulesdir}
%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
%{__sed} -i \
	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
%ifarch x86_64
	-e 's@/usr/lib/@%{_libdir}/@' \
%endif
	%{buildroot}/%{confdir}.d/proxy_html.conf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root)
%{modulesdir}/mod_proxy_html.so
%config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
%doc COPYING README


%changelog
* Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
- Version bump to 3.1.2

* Fri Sep 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-9
- Put back BuildRequires...

* Tue Sep  7 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-8
- Not being enabled by default (uncomment the "LoadModule" line from the
  config).

* Tue Sep  2 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-7
- Fixed "Source:" to point to numbered version of tarball.  Thanks Nick!

* Tue Aug 12 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-6
- Fixed BuildRequires: and BuildRoot: as per code review comments.

* Sun Jul 13 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-5
- Fixed gcc warning on missing braces/ambiguous "else".

* Thu Jul 10 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-4
- Fixed conditional edit of path to libs in .conf file based on architecture
  type.

* Mon Jun 30 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-3
- Added "--with xml" for those wanting implicit load of libxml2 via ld.so
  instead of via explicit "LoadFile" in configs.

* Sat Jun 28 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-2
- Merged with comments from reviewers (especially Ray).

* Wed Jun 18 2008 Philip Prindeville <http://www.redfish-solutions.com> 3.0.1-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:30:55 -0000	1.1
+++ .cvsignore	16 Dec 2009 21:18:44 -0000	1.2
@@ -0,0 +1 @@
+mod_proxy_html-3.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:30:55 -0000	1.1
+++ sources	16 Dec 2009 21:18:44 -0000	1.2
@@ -0,0 +1 @@
+d6497b48d2bffc4150472472004618c3  mod_proxy_html-3.1.2.tar.bz2



From philipp at fedoraproject.org  Wed Dec 16 21:19:26 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 21:19:26 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel import.log,1.1,1.2
Message-ID: <20091216211926.8656311C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13664/devel

Modified Files:
	import.log 
Log Message:
Initial import (#452636).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Dec 2009 20:38:33 -0000	1.1
+++ import.log	16 Dec 2009 21:19:26 -0000	1.2
@@ -1 +1,2 @@
 mod_proxy_html-3_1_2-1_fc11:HEAD:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260995348
+mod_proxy_html-3_1_2-1_fc11:HEAD:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260998354



From mclasen at fedoraproject.org  Wed Dec 16 21:22:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 21:22:57 +0000 (UTC)
Subject: rpms/gedit/F-12 .cvsignore, 1.97, 1.98 gedit.spec, 1.205,
	1.206 sources, 1.99, 1.100
Message-ID: <20091216212257.B8A3411C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14749

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-12/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- .cvsignore	24 Sep 2009 01:47:04 -0000	1.97
+++ .cvsignore	16 Dec 2009 21:22:57 -0000	1.98
@@ -1 +1 @@
-gedit-2.28.0.tar.bz2
+gedit-2.28.2.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-12/gedit.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- gedit.spec	24 Sep 2009 01:47:04 -0000	1.205
+++ gedit.spec	16 Dec 2009 21:22:57 -0000	1.206
@@ -17,7 +17,7 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.28.0
+Version: 	2.28.2
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -230,6 +230,10 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.2-1
+- Update to 2.28.2
+- See http://ftp.acc.umu.se/pub/GNOME/sources/gedit/2.28/gedit-2.28.2.news
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-12/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- sources	24 Sep 2009 01:47:04 -0000	1.99
+++ sources	16 Dec 2009 21:22:57 -0000	1.100
@@ -1 +1 @@
-d5e8f9f2806c9662693f292b155dd238  gedit-2.28.0.tar.bz2
+562b2e15cf4d3cef068caf7a25843ccd  gedit-2.28.2.tar.bz2



From philipp at fedoraproject.org  Wed Dec 16 21:34:48 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 21:34:48 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel import.log, 1.2, 1.3 mod_proxy_html.spec, 
	1.1, 1.2
Message-ID: <20091216213448.973BE11C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17074/devel

Modified Files:
	import.log mod_proxy_html.spec 
Log Message:
Initial import (#452636).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	16 Dec 2009 21:19:26 -0000	1.2
+++ import.log	16 Dec 2009 21:34:48 -0000	1.3
@@ -1,2 +1,3 @@
 mod_proxy_html-3_1_2-1_fc11:HEAD:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260995348
 mod_proxy_html-3_1_2-1_fc11:HEAD:mod_proxy_html-3.1.2-1.fc11.src.rpm:1260998354
+mod_proxy_html-3_1_2-2_fc11:HEAD:mod_proxy_html-3.1.2-2.fc11.src.rpm:1260998871


Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/mod_proxy_html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mod_proxy_html.spec	16 Dec 2009 20:38:33 -0000	1.1
+++ mod_proxy_html.spec	16 Dec 2009 21:34:48 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -53,6 +53,9 @@ install -m 644 -D proxy_html.conf %{buil
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
+- Initial commit.
+
 * Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
 - Version bump to 3.1.2
 



From maxx at fedoraproject.org  Wed Dec 16 21:49:50 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed, 16 Dec 2009 21:49:50 +0000 (UTC)
Subject: File hamster-applet-2.28.2.tar.bz2 uploaded to lookaside cache by
	maxx
Message-ID: <20091216214950.D8E6F28ED21@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for hamster-applet:

8268f2fff714fcc49b63da66d4e89ba5  hamster-applet-2.28.2.tar.bz2



From maxx at fedoraproject.org  Wed Dec 16 21:50:52 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed, 16 Dec 2009 21:50:52 +0000 (UTC)
Subject: rpms/hamster-applet/F-12 .cvsignore, 1.24, 1.25 hamster-applet.spec,
	1.33, 1.34 sources, 1.24, 1.25
Message-ID: <20091216215052.EE77E11C00C5@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/hamster-applet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20931

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Wed Dec 16 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.2-1
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	20 Oct 2009 17:03:09 -0000	1.24
+++ .cvsignore	16 Dec 2009 21:50:52 -0000	1.25
@@ -1 +1 @@
-hamster-applet-2.28.1.tar.bz2
+hamster-applet-2.28.2.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/F-12/hamster-applet.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- hamster-applet.spec	20 Oct 2009 17:03:09 -0000	1.33
+++ hamster-applet.spec	16 Dec 2009 21:50:52 -0000	1.34
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           hamster-applet
-Version:        2.28.1
+Version:        2.28.2
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
 Group:          Development/Languages
 License:        GPLv3+
 URL:            http://code.google.com/p/projecthamster/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/2.27/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/2.28/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel pygtk2-devel pygobject2-devel gnome-python2-devel
@@ -98,6 +98,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.2-1
+- Update to latest upstream release
+
+* Sun Nov 22 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.1-2
+- Updated source location
+
 * Tue Oct 20 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.1-1
 - Update to latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	20 Oct 2009 17:03:09 -0000	1.24
+++ sources	16 Dec 2009 21:50:52 -0000	1.25
@@ -1 +1 @@
-f4c68e02b487b9e0d284e63a411d8cdd  hamster-applet-2.28.1.tar.bz2
+8268f2fff714fcc49b63da66d4e89ba5  hamster-applet-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Wed Dec 16 21:50:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 21:50:59 +0000 (UTC)
Subject: File libgnomekbd-2.28.2.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091216215059.61B0C28ED42@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libgnomekbd:

28dce813a6c76439a2136fbd2394a058  libgnomekbd-2.28.2.tar.bz2



From philipp at fedoraproject.org  Wed Dec 16 21:55:02 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 21:55:02 +0000 (UTC)
Subject: rpms/mod_proxy_html/F-11 mod_proxy_html-3.1.2.tar.bz2,NONE,1.1
Message-ID: <20091216215503.0106311C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22186

Added Files:
	mod_proxy_html-3.1.2.tar.bz2 
Log Message:
Bump to 3.1.2-2




--- NEW FILE mod_proxy_html-3.1.2.tar.bz2 ---
BZh91AY&SY?
???N??v???YV????8???[jPU
????H?B?p?}}??^}?s7a???%Z???d??V??<????????????&?m?$??Z'mI??wjt+`U?J?$[?
4@?4
*yM?mMHi?6?
S??"b??b??=M2yM?G?? 
4?T??????4???S~?=G?=LOQ??
?????????w???wG??Fu?$Ri"/??r?N?
? 0RE
R????????c)eR?dQ[j?
J????0?^????M??????d
v???m???6J??1????+4a?Z?a3YDCc,??&%R1s???{&/??H??9?H?Mc??????@Z2?#?~?k???~a???F
????[?.O?1?W\l????4??*`??Y??U??%R?????w????E%$??hC????u??c?}??
??#?h0s??2
K??p??A??4?T7?????2?Sv*?T??q<??4r???<??S???rF???~>m????n?O?T??ZUf??.?)0?D,D??S??\??I?S~????p??	)'@?.??U???t???q??J??I ?2????K9??/j???	Z&q2?V*???u??[?h??yn?????Z?q?])?p???v?? ?V
zb?k6????k6Om?U?g?a?
Xo?g+?$CXe??*????q?|???????;auoCYC???o??P(??4???Z2$]?????^Q=	????p"M=???`}???&?k!?@	.???c???c21`??0?gm?!]?????QE??B???\8fkSf????????QEE?Fp??d?
?$O???d??????(?????????(?I?????0???!??.??????8??
????????k??k?C????-?~??7|`T??R<z??!K-?	????`?1?|">????????????k?o?F/pVw`???=???UaA??H? ol,???????R?E??????@?|C????Wuk?!??	?:>??????w7???p??($?E???<?{<[f?TJ?+:<9?8y??o???a,????"f????4m??ma??????\|%r{FJF-?]??{?^/???g8??JzZ`?/??#B??D?????b+*?,A|l?u?#iD??,*???????"+?*????t	 ???=??"? 

?i?^)???$QdP?EDH??$X$?X?
@!?
???$D$DF????B?}I?!	?Ruy??W???-?9????.v6?f6?\????@o??O??YK'?&2g??8J?;?A
?R??2?Ly-d???_???)&?	???9??F???\zwq{???_??m&?^??:s|????}]???o[+[O`????
c%?w???hE?u?]3????J?2??Z?b?D,#???????a}8????? ?????????^??,hq?D)??6C??g>6J8??????)?M??z??(? ??9FV9	?d?'?*=??[
?? {
?|?Im>??-??u???~????-??.???@????(O9qN??3<[??J???????4???.??(???|2g??t???c?[??9?Om?6s.?$????????????p?>),??]1?o?Y[????????????_u?U<?$)d?GH?}#?~?
o;r6????9}?712???q??:???@?Ma????rp???*?0??T=????!K,?6?o?<u8???^?=`??#?s???*A	C?*oK?
Z???b???a?????~?????<?5???7???T$	???v???]%n??V?Q?w??S?d$??@?
n]??tR+??a????o?????5?????????1G??U_???W???E??
{?????u??L?U??Pfm?QV?~???97T???[??Pw???<O?0x?W?-??^uF?o`D?`???c???H???y???????????Pb?c???Z??91}%?????X$????;]A?[?M?
G?L????dT??u?!??eC:??????E??????1Ddw???o????Nv?m?g???&?-i??7x?????????H}??ykKDqc??????3?$_
?\?e?????H????o??F /?????x?m??J?????D???????E?}??S???vJ???S?\S?C0E9*(_F^??O&???6?F?LA,>?h4?C??Y?t?????+????^???????|??S?	]????(
6???vI?????
c??"???32??C?%??s???????/??^Da1?\???'?3k?
?1??6,8?,??????Ov??ie??r??-??????2P?W?????#?T?n??n6?????`?K%?\2??
?;?1???C{v?]?E6??????w>?f?EK0????M????K??g
???l2?u??^??????L@??????????>??N?i???`ly'?n??a{@???????k?V???X????d.?<m
 ?????qC??f?I?X?????+?X????~W??VV????L?aHG?7\??a???WFU??6??|bF?=3?FjF?1*n??{???????????u???"??sFiqK?-?Tz?j?U?????ro??cc????]c
??q+????p"l,`??T"J?t???HJ??,d	e??k??3??|;??\? ??AH"("?9? ?E??????70??z?lLr?v?dGv?t?^@??U	Mv??x?Y???*????s?t??!???BT>?$=??6?t??Z?:?!Z?l?(??`??0UAu?G?=??????%h?ekc?:???K?EGNIj?q4?+??
???T?;a?rDh?$hU<|?6?q??6~?]?v???O????j?A*?D
"&5Xb]??D??@???????????xM????/?a?!?y_?v?!v????NR??????u?-/????????S;???a?xZ;^??k.?_??"???&Q{?e]?.@??l??
?a^??S??J??????F?wA???M?????D??
????????????
Kn?|???h???)5??aa?$K?????}?^?"k?[FR??}`1?](?_
?;5????_y?J?????t?0?
m?_????C????????;yk?
???<??I#F@	
?
?v?a)??N??n???(??[,?_??Hp?nY????vy?>k????i??T????8?3?V???:W6?e????ke???y???_1h?
?
[Kn0??rC??????9??9e???r>????;v?P$*p?.??????t?s???;-?>?o??Hn9??jg?[??,???X|??
8qB%???????_???g?i|^
z????????
???R??u?
?rM5f?E?`!??^????z??l@????u?F?j2vo&?mx???YY\??
??07???????g??m*?B?{A????G6-?Ad
?7?=O?ce????0B?0??+????UL??F?#?S<*?C4??????:??]a??H?????%??t?Y??M,b?u?Xu?)???"?????f??8???0?O???)???o?_??6S*Naa	?<<???V_??vc??x`A?5???Q?r?/[W?2??~G????F??M/?S<p????????L??/]|??=D?
((?_???l0r??H,'%?v=??T?*??c???WD?C?R-????L??0S;@?????????Qx?E?S<???,?q?G??,?w??
I?ww??2????????9??.i??S?5?????o4?W*=???????????F/??;?6????~??????.???T6UiT0p(!*
?{???C #EU)(>?

d??B
????|???
??7????????{???.W????:?X?????????M????????@??????????nB?
H?{?wd
B????@>?{p??r???0?.?lagx]3?s??)???y??????????????
???n?dY^??5????*??????????~???MW*J$??*???[	??F(????E'?b%.?V??.IkS???????EP??lF?iO?i???v#b??????j?1?P}?a?uq??r?}???.? ?*?n?mJ????<?N?w??T?^n?R??0/OR?z}?9?:???u?}X???@?^??V???F??TP??
?KG67??K:k\?n?x????????Wx????W??c?????????M?Q????S?#]??D????J_+?E~?Z?ev??u???ep??;??]??
U?U???54?|kR??}??K?y??????? g^O????3? x?
?#?	??-???JXg?
Ax??g??0s~t.c{?w???S????\???i
A?$cC-?$?b?/li'?$??xe??|#?kq?-`????G?;?M?S?0????o-??
d?a?EmtG0?v?"-a??|?U?eh?|?
?J!??8??????
?O-????f?F}eR?FU???a}=??s??
????m????t?3?.??{??0Q?,???<mT%?? UAC(??(


E??x$??|	RE?????^]>????????~hJ4?=b ??v???$S????C?D]?????
 $???0?!%b??????|?'????
Q????????An?XQ6??^?
t?v?m]}^?/L???|?*?????6c(th???b?.?6?)?h??{?????f??
?Y???>*???????O?O???VO?4?)??????v?h??6?8???a{"?LR??????)"%Cq
p"?##-R?O_???i?????????&?|?u/?O????}?G??|w?~???}??}?(??q?P
?^e'q???i???f?+?3?q\??????Y
??@v`
?>??J??O?????oA????? n???O?amEB?E???V(4
??
p	???8~?g?'?b??'U?R?(??~l?Q?%???R?W
rC?Cn?C?k[?$?>??F?p?Y?T?8?Q?e?F?B	??q5?o?????i?@??,r07J?	DPP?'Z???O?m????=?Pnv?????/ft7?????`0?????`???0}??x??
x???)?/C(??????G?KFI?6Hj????y[??/??!??#z?z{????H~??
?@?=?jk?????B??????????? ??>q?Hz?y? ??2??a ??5iBQ&O?^??V-????4
?k?:??k??x?>???}?;?@?2e}?g*i???/u????????#\??=??X?,???????sp????>4?,??+??-???N?V?b???U?^~mZkA!c?i
<E?2???m??(?s??{????F?^????z??$?M?I?eq?L?Tr??m??kz???=pL?n??[?`.??t
iv??[1?{????(?A??1???#9?"?N}3@?%p;?!Q???,
???????|?8?7B]?)\?l?.Eo??F?????
&?8???????Z?Sd?(?KD??G.X?????/(???d<f]???8??S???????|?`?m/:?l
1Foe?????<??~?_????I??
9??w?????????`?K?"\??B?@??E~7???XB??k??E???l?
??O?
I?S???_:?|?*Ac h?=????g?A??g?	#??????H?????_?V??p?5????l?=???PI)?!???c??(????y??????q????~??,.?tMbf??<G '?Ai|%?x$?#?!?S??eRIw?}?d???]??)?EU>?>??u??[??0M??S?k;?+?F??M??7????+??i?E???????:?o?[tY??W????s????K_?a?^zF?????q???(0?
xY	????o??XS8?
F:??NhY?f??.?S?l~?:???D??t?2	?E'~?bL?:?Q?,?:???!
	??@?A??
(?KmU???zy?5]????@???*0?t?????]???JK?5D?L?e??|wh??H@

??s6m~B!dn?F??J@???7??r8(??7??_??????}6O?h? O?H???H???of?4???7?mwH?"?8~?3t
?-
?tr?L22???M_???~g>x?n5????p??Q?;?!Z?>????????:??????a???-??+???$?tT??/i?c]G????????l?/-????????-??hq+?~O???9?????????$?1{xi?:?0??,u?~??*??IG??????~.p????-!H?+uzES?7'?????
E?????????x?W/a`?+??L??|?4:???s=	?gLwr?{???z?U|]z????r|>_?????~?^???mZ?~???]]????1?c!+f????FI^?L?S1c5?@????p?	?B???\F?`@???[?<{g??*'???P??~??????G4??uo?y??\p??)??w;???V??Oc?@????A?
???????^J?/g??????1??c???al+??<g?"???_tG?????_??"?"r???{??	?;?{[??y?O$?9????9??{????0s?2????g?H?r?Y-q;.h??;??o?'??6???UH?v?????2?8f4A?nWO0?????PQ? ?fh?bc?}}????g_???X?Y?M?
 w}?i?-/???=?n??C??&u??a-<,
?@?E?
T?U)????m??????@???4r\@o??WK?yn????????D1?????#`O?????,?????Cg?4'?{?^H?)???NF??????0?H??{?)ePZ}vJ?[?.???<??{?]?X???(?T/0P?`Peii?????y????R????H???{????????Lf???E??o??????l????w?????'?b?????rC??/??\8HD?H??I??j$?[*AU???Db??'??B?P!0d?Sl??
`,??"0??:?%8?`_?AC?kxs?@?}=V~?W\?C???V??2?m????
?A??_l}??S???x?O`???@?|????Q?OVGM??1'??
w????8P?+
UIa? H??<?;?c??d?`?????/
????^????)????o
f?@???r??z?>?=??q
+D?+??/???X?Va??!??#/;
?2M??f?}3
??jD.?#???wS9?p?>??c?
???G???~?7???
?n???]N
?Xp&???Ln?????Q????9P???/?w?#?^??64M???f???????I?!???F+????2?4??y?vd?#?9?\KaY??F?d?]???HO
}?3C?]p?I`d?ZU({-?-x?2?????nt????
???=????	?zA#CT?o@????.A
???????o?xD?dL??????@0 r?	v????Z???!?
1,_?A-P?w??2#i?<<?
?=??E?r?Z?X?}??-???g?J?O??|7???-(`?d???h??H??Dnm?>b?P?L???)?I??#?7}?????4???3??????Lhu"v???
?????'?,??q??m{?Q?>L????v?MQx?????8.?B{?-P?O????
D??????>8?????=?QE(??)R4)????
?Cu)?F?jh?????q$d????`jdQ??2?
@??{???A?.??/p??????}?m:yq?uL`?D???Df??:???x????R_O???????M?????E?P?COz%?$$?4v7???@????``?3?????,??????W??
??gP??1?QYG??+GV,?a=????????????/??P???????T S??-?Z%????1iwO8???n2K?xk?%?B?.?
???]l??<???(?C??W??_Q???
?O'?{????)????}{.?U?5???cL?H?q??X??!?=f?g?j???
?t-???
?a?D?u?*?&?r??/ \?#J?????z???N???????f=
??4??!??P?.r?*4??7?U?????:q??????!#?j??????z?!"???o8
????Q??????7???>??q??,??e?????I!$?$?a?s5??z_y???y?@?=????7????r???K?p?0J?a?n??\	????!??C???????h?oQ.?M???????>?a??3??9?4????49?$5??7???8??m?d?5?ep??.-UU??7????..}q???RO????????dC??%%?s??!EH???)/X?????"?3t?kj?CR???Y??_ ?s$??/??,4?? ???
???K
5???[I???H?f??,?<H%
A??u??P??????(?jX?Z
q^p?;fI?a??:????????????)?????`C/#9???????????q?????? &???? #?a?pt?<?5???`???????@???lc?i??;????!????Ml?????fH??Q??b?_w-?
4U7 at H????d??|[p???q?5?_P?c+DD?
/??"N}????q?kLH?i?@$???????z??@9&^?"F???!???gYXa????G?x??x+RD?l??w?OQ?z??Hi?&DU?P*?Q
?u??x??????8??i??s????8??&01??$B4??
?B
&U]h??!? ?Rz?????;N??????S??r?
H??L* N????v?.?[r????!?m?HH?W,i{a?~ `3??!????????????6G.63u???0????X??=??p?
?>~!,Qd?w?:?u?????W}f?q{H47q?d?;{c??H>????v?I*?;??"H'Z
QGC}???3???LtZ?Dy??`?cldfZb?1?????l?'??H[?)$?D??????L?A???L at Ps?A?D$C?_?~?????-9?g??I?$??;U???
?k?
.A??
Px!?y?X????-<?
??j??,
t??U?"??????K?V?H?P????????Q?jb???%N??!G?5e?g?;~
?`?
hhj at RH???,z?&o?
]??j|??????LC-v???8??7?L??I|74F?\??A'?2ZD?1K???}VY??Og?!C??(?(?s?????????y?-LD(??,A?rL?????1??u?p?????z=??e0i4???p???<?5 W?t3?2??::AT?~?\?p?e+a??O?
?fa?M?????bla|xc?
???? d?
G????^?9?@iV$??x?,?????R?Z?L?5?8?m???'I????B?kyB?	p????R?c%?0<????X%?D}?p&}??5'???6?C?`!!?Y?/??Yy????Q?????i
??2(?????,E(??r!?w?v??|8eB?Qy5|a
?\?e at P????P?????l??MbRZ?!????????K?CX?/?%?????F?I?oe?????0F??z????
HS?H??T%Y???????\?vd

@?Zv??zJ??)`?kZ=?`???f?g????? ?I??3VGE?R
?'r7????PL_$9K?=]???K1??_;qH,???\????
	??,??Do,?
?@?F????JI???????#a??c?c:K?i??xW?S???nB??sVd?$?Xrs??I??s??e??????????oT?[UPz??N0???4t	??u'4???%?E???*?Vr??6!U????vV??bY?n?m?)z.?r9?wR??T??4??K?`S??cxX
5y3!
?0C???j???0??J??%???5?K???qJ at L[h?FNR??c?cWkvT??Y?r????????8
???S`??(MdC5?h:? ????+x???D!?k???=??p?
?!$?6??dg-!?2??7H
?a?????J@
y?e?o G??D?
???Xy?j???h???<??
?l?$ C???t?`\???U??YB?????W"jS?$???x5?iSQXx?"?y
"?X?v2
/??c???BC??'???j?8!??????????c\?~??EJ??
n??h
????G????Z~?S~=T??????l
?&|?G ?H??
??Nw@?????o???
?4;??~r??YC???F@?*??:dXN&?????]?#?X|T??2G?P3?	??-??6AMN,
??@!???l2?*?E
????{c????Y?
dw)RX??O^????m.???9${#y#zX?Gg??	
?=?????H?! ??R?2O?z?x?JhC??_~?L#?T????6>???1??C?HT?v???:?K????a?b)???
?R?
?a????[?Fc??????]??H??????z??
?????
XUf????"*?+?;M at 7?>??.&F? ?9????p?A7l????`r?MC??Hr?##?"l???	R?8??H??3??
*Z????a?P!?bs
?}??????G+?N?JD??H??
?vJ0??2";,1P/Hd\??(?|@$??&HJS?t)????
?[?\qA?g?x????C?M?5
?????????Z???+
??-$P??w?a3'
68}?s?I?????J?%An
??b???p?j~?l??@?$??A?-??@?
? 1? E  H?J?????????y??
7??	??
Q???TRE?
?c?dz?P??e@da?n??A1?!????(?(?????d?
???K17?GuV?U?K_?z?I?:?R???v???p????r$>??????w??k'x*)N;??Q?C
fg??q?f??%u?Mr?$:????S??[qYDL???????H?]fT?\??T]kF?0??????V"k5?Ze??Kb2??]?yHw?????M????,$?u?D;:??D???h=?g??>????A???LQE??i?L??3?U?	??]????

???r\?"dzo7???3B??5??dr?Q??'.??3??????M???"??k?'<?ix0????(??q????`GB?kA??D?je?????????w?????L7??<5X?;]d???R??X2????m?f?ES???oN??WV?????M<???????v"
~????-
?V1 at U$`S???? ?x?????z??<?????,?k* 0c?h???V'????5???'d??;}??.o?R?t~F?????~=!a???O???0X???O'??pH??s9j?????
X????? ??w=?????
??P???5n???oj3@??%,?6?????v?J???.?F??/??8i?pQ=BC??????*???
r?%6`
*??R?T):??#??o}???????+s?????????mG?\@??????J[?-b?h?????^?????h\???8=???+?
'l5b??'???G?v=]?D?@??t?qK?G?2`?%3 at B%!?L?? ??C??-???=DT4?<S?^????Ex??????E6???m????4??to? w?M???K?9?A? f???	vJ??W5???~%H*???n
???%iD5D??.???	S(Im??+?e)???14?l?	??????1?)?<bU,??r?O???P????????t?s?"????????	?y?z?????0??mT??S	??yi<DE>?q?0?$N??;?8??"*??ua??#?}?OP5??<?4j?[}_"?4Vp?l?G?f?2H?PX??????/?`=M?????O?????\s?4x?m??!^K?V??_?
7P??`?337??wp?#&???R??j?,????9???wB???$??="hgr?t???f*?66Q?uj??T?Hf??(?}?)?!????wCuid?C(,?v?sL?.?$?r????,????c0??0?U?I??B?fJ?l)r+	?????Y???Q??I?IbA??Z?LP()E???#II$5*H?j?i/??
??Z????!O*?3?}{??ug?A???&?
???%ADD?
?DN????<'C'?Y???EY?+!^???j.l]%)T??
?P???:n?&?"?A`???Af?&(6?)aV1???
???ILS!?FI?bky?K6?1?v?????)"?'
??????a;zu?o??I??4?p=?W{??A???L?4+!+
d?C????VO????????t?.???h??(?&?#?F?_?;M??b????d_m????`?S???
t???Dr?W??,?????n[?????P?H?b?AH?????
?t???[	??????p???I)?>???)??*s????p	0?+?)?]?ZA[@?%?(??N??????PT???:?p??????vP7LT???y??
????S?+??W?Q6eu-???FM?&3x??KG?#!??=4?f?2?l$????R
??dW???%G???]???{3]??x??D?!???4???%?mi?I??????y?_??~I?	?Mz?7??????ujC?u?'?	?"??
????H?4w?:?????<??n?8@
???????8??k??4????X???k?f?ty$??
??R?
?}2T????t2-c?O6K???n:????5?`?+{cVv?k?O^	?l?q
d???.??r?t???Uk?Q at D??2?~,S??u7?0
??vk&[}??2?J???1V
????x|Y?v?5????g:??hX????(??? U?c\(? ?!=???<?>1???E??N<??$?$&??????y>b???dPyx"??
#S?????7??w??d??8?i4??|???1v?K?X?jF?N?}????z?9??Y?????
B1c%???P9?U??????l????	?X???A??X*?????!? m????????}???
???x]]a 2=?
??`??'?.??RH?\?C?B????Ja???|??l????0xT?????nC?8???$????
 ?O?!?khF?ID;??5??o?F??aN???????t|?~2??j??
?(WZ\?1??nX)???
?)Dx?YB???D?|?(?Q?ib1Qa??EI??Z?J?O?I?????c????6????`??SL
	\???lh???f?2?!?E??3????????Z?" 16?6?ee-?K)v??,?D??x??8?Iq F
?l????o!??j?9@?
??BDS???v??G
??-??????.;?Yc)]j???\M?Y?-S???hC???????G?	????????w+??~PjN?q???'l!??x?M??}g?5??????H?
$???s??z?????9G????=?@d??F??h???o????????[N????????l??eI?v??B?]?=cg??cQ?z???a?@	??\?K??|?X?C??1??????_?9?S??????L????4l?FJ6??,\0?.
??WV,?L??h?Wl????F??I 0???????d?2?ZJB?id????e?2RJ?O?Oy	;??{*?a-EU???]?@???$?G??@V^g???????????n
?????%?
G
7?4u?,?b?;??2???oE??1^?g[??<??yp??Qh???P???O8.?%?B?i?ls?EK?(;
?j??????f?Mn?h?:?<(zU)??z???TY?pR??)?????v???V0W??7?m?????<4U at Oyv??Bk
?[z??d.Ou?????
??Z!??u?????
?>??3???	
u????&?F?T????? ???.aMx?7?i??R???m?3??"???>I??????;8FL@?????u?I??=QA??????jYS???Y?"/
T??HSh?"[F?R????$2?A?Xl"??????g??W?YN?L??p???4aVV?pCy?,H20?$????.?q????A?!??E??????$?~?~?????n??????????$?x?P??t?"W?0m
T??5I$h?5?S\???La? ?????6?U?8?[:??-?'^?_l?rs<%Q?DM ??
??1????????u??e?X)???LB???????Y???`
?
M?????	??K????r??????'????,@????\?'?"A
?|??{?0!??U.\J?h@?%???"2A??d??h??.u??-.??o??#X?????r? j@?Jp??g~r????(?a3 ???2NR???5?
q?3P?
?#H?Hk?A?P?1 at qt????HM?s??f-s???O??'????V???;m
?.E?\???y???????L?Xeb_h??p.?;he)???VlY????
&??Q1r??i?a??n??????/C?&j????o?R?+f???:&?7
???@8??S???:??q'D?Y&8J&?????i??^q???M;ZomjRH98KT\???&
?Uaz?t?L?e))??3V?C
??Rw ?.????)0`??f$-:Ld?lam ??YE?
??o???P?2t7???,?+??H?i?4??*?[??I?(??k???%?rE??)?k5QI???Qi??????e?Dxf??E???IK?????????=?)T????%?u6AA|j? ??Bt[?a?4t!???6?L2'???wA)-O?4??V?X?@????&?$???"?0H?
d???I!????#
?4
?B???????:?Z????<g^y???t??!?1?v?6?~#??>?&?G??,?c??[6z????H_AO?~?m????o#>7?dw???>V??????P?m??f??zO?T??:?=?V?eOFw????8??;?e??Y???nI
 ?2???H?z??:????J?q|??
?#? E'???L?(???*??????M?+????D?C??h?z\??`u?)?|.?????p
?=???`z???
l}??}x`}???O?C????m`?k???E?? ??Q??a7&??"??/W{?j?8?O???j(?U#_`?J^rF?"?/??ZP??>???
???6??f???7??L??(2
g6A????%R*9\``3??$???V?a?(?4?E?b?L??I?xm??&?????w??g??_?i*??q??6@>?$??J sD;d????x??{?	??>P<?N??????dFq	E??(??D>y?~??R,D?a?)??(Q?I?P-?:?BI??./WotF?*?X???a.\??v?`????N$)?	x



From philipp at fedoraproject.org  Wed Dec 16 21:55:23 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 21:55:23 +0000 (UTC)
Subject: rpms/mod_proxy_html/F-12 mod_proxy_html-3.1.2.tar.bz2,NONE,1.1
Message-ID: <20091216215523.6C38311C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22319

Added Files:
	mod_proxy_html-3.1.2.tar.bz2 
Log Message:
Bump to 3.1.2-2




--- NEW FILE mod_proxy_html-3.1.2.tar.bz2 ---
BZh91AY&SY?
???N??v???YV????8???[jPU
????H?B?p?}}??^}?s7a???%Z???d??V??<????????????&?m?$??Z'mI??wjt+`U?J?$[?
4@?4
*yM?mMHi?6?
S??"b??b??=M2yM?G?? 
4?T??????4???S~?=G?=LOQ??
?????????w???wG??Fu?$Ri"/??r?N?
? 0RE
R????????c)eR?dQ[j?
J????0?^????M??????d
v???m???6J??1????+4a?Z?a3YDCc,??&%R1s???{&/??H??9?H?Mc??????@Z2?#?~?k???~a???F
????[?.O?1?W\l????4??*`??Y??U??%R?????w????E%$??hC????u??c?}??
??#?h0s??2
K??p??A??4?T7?????2?Sv*?T??q<??4r???<??S???rF???~>m????n?O?T??ZUf??.?)0?D,D??S??\??I?S~????p??	)'@?.??U???t???q??J??I ?2????K9??/j???	Z&q2?V*???u??[?h??yn?????Z?q?])?p???v?? ?V
zb?k6????k6Om?U?g?a?
Xo?g+?$CXe??*????q?|???????;auoCYC???o??P(??4???Z2$]?????^Q=	????p"M=???`}???&?k!?@	.???c???c21`??0?gm?!]?????QE??B???\8fkSf????????QEE?Fp??d?
?$O???d??????(?????????(?I?????0???!??.??????8??
????????k??k?C????-?~??7|`T??R<z??!K-?	????`?1?|">????????????k?o?F/pVw`???=???UaA??H? ol,???????R?E??????@?|C????Wuk?!??	?:>??????w7???p??($?E???<?{<[f?TJ?+:<9?8y??o???a,????"f????4m??ma??????\|%r{FJF-?]??{?^/???g8??JzZ`?/??#B??D?????b+*?,A|l?u?#iD??,*???????"+?*????t	 ???=??"? 

?i?^)???$QdP?EDH??$X$?X?
@!?
???$D$DF????B?}I?!	?Ruy??W???-?9????.v6?f6?\????@o??O??YK'?&2g??8J?;?A
?R??2?Ly-d???_???)&?	???9??F???\zwq{???_??m&?^??:s|????}]???o[+[O`????
c%?w???hE?u?]3????J?2??Z?b?D,#???????a}8????? ?????????^??,hq?D)??6C??g>6J8??????)?M??z??(? ??9FV9	?d?'?*=??[
?? {
?|?Im>??-??u???~????-??.???@????(O9qN??3<[??J???????4???.??(???|2g??t???c?[??9?Om?6s.?$????????????p?>),??]1?o?Y[????????????_u?U<?$)d?GH?}#?~?
o;r6????9}?712???q??:???@?Ma????rp???*?0??T=????!K,?6?o?<u8???^?=`??#?s???*A	C?*oK?
Z???b???a?????~?????<?5???7???T$	???v???]%n??V?Q?w??S?d$??@?
n]??tR+??a????o?????5?????????1G??U_???W???E??
{?????u??L?U??Pfm?QV?~???97T???[??Pw???<O?0x?W?-??^uF?o`D?`???c???H???y???????????Pb?c???Z??91}%?????X$????;]A?[?M?
G?L????dT??u?!??eC:??????E??????1Ddw???o????Nv?m?g???&?-i??7x?????????H}??ykKDqc??????3?$_
?\?e?????H????o??F /?????x?m??J?????D???????E?}??S???vJ???S?\S?C0E9*(_F^??O&???6?F?LA,>?h4?C??Y?t?????+????^???????|??S?	]????(
6???vI?????
c??"???32??C?%??s???????/??^Da1?\???'?3k?
?1??6,8?,??????Ov??ie??r??-??????2P?W?????#?T?n??n6?????`?K%?\2??
?;?1???C{v?]?E6??????w>?f?EK0????M????K??g
???l2?u??^??????L@??????????>??N?i???`ly'?n??a{@???????k?V???X????d.?<m
 ?????qC??f?I?X?????+?X????~W??VV????L?aHG?7\??a???WFU??6??|bF?=3?FjF?1*n??{???????????u???"??sFiqK?-?Tz?j?U?????ro??cc????]c
??q+????p"l,`??T"J?t???HJ??,d	e??k??3??|;??\? ??AH"("?9? ?E??????70??z?lLr?v?dGv?t?^@??U	Mv??x?Y???*????s?t??!???BT>?$=??6?t??Z?:?!Z?l?(??`??0UAu?G?=??????%h?ekc?:???K?EGNIj?q4?+??
???T?;a?rDh?$hU<|?6?q??6~?]?v???O????j?A*?D
"&5Xb]??D??@???????????xM????/?a?!?y_?v?!v????NR??????u?-/????????S;???a?xZ;^??k.?_??"???&Q{?e]?.@??l??
?a^??S??J??????F?wA???M?????D??
????????????
Kn?|???h???)5??aa?$K?????}?^?"k?[FR??}`1?](?_
?;5????_y?J?????t?0?
m?_????C????????;yk?
???<??I#F@	
?
?v?a)??N??n???(??[,?_??Hp?nY????vy?>k????i??T????8?3?V???:W6?e????ke???y???_1h?
?
[Kn0??rC??????9??9e???r>????;v?P$*p?.??????t?s???;-?>?o??Hn9??jg?[??,???X|??
8qB%???????_???g?i|^
z????????
???R??u?
?rM5f?E?`!??^????z??l@????u?F?j2vo&?mx???YY\??
??07???????g??m*?B?{A????G6-?Ad
?7?=O?ce????0B?0??+????UL??F?#?S<*?C4??????:??]a??H?????%??t?Y??M,b?u?Xu?)???"?????f??8???0?O???)???o?_??6S*Naa	?<<???V_??vc??x`A?5???Q?r?/[W?2??~G????F??M/?S<p????????L??/]|??=D?
((?_???l0r??H,'%?v=??T?*??c???WD?C?R-????L??0S;@?????????Qx?E?S<???,?q?G??,?w??
I?ww??2????????9??.i??S?5?????o4?W*=???????????F/??;?6????~??????.???T6UiT0p(!*
?{???C #EU)(>?

d??B
????|???
??7????????{???.W????:?X?????????M????????@??????????nB?
H?{?wd
B????@>?{p??r???0?.?lagx]3?s??)???y??????????????
???n?dY^??5????*??????????~???MW*J$??*???[	??F(????E'?b%.?V??.IkS???????EP??lF?iO?i???v#b??????j?1?P}?a?uq??r?}???.? ?*?n?mJ????<?N?w??T?^n?R??0/OR?z}?9?:???u?}X???@?^??V???F??TP??
?KG67??K:k\?n?x????????Wx????W??c?????????M?Q????S?#]??D????J_+?E~?Z?ev??u???ep??;??]??
U?U???54?|kR??}??K?y??????? g^O????3? x?
?#?	??-???JXg?
Ax??g??0s~t.c{?w???S????\???i
A?$cC-?$?b?/li'?$??xe??|#?kq?-`????G?;?M?S?0????o-??
d?a?EmtG0?v?"-a??|?U?eh?|?
?J!??8??????
?O-????f?F}eR?FU???a}=??s??
????m????t?3?.??{??0Q?,???<mT%?? UAC(??(


E??x$??|	RE?????^]>????????~hJ4?=b ??v???$S????C?D]?????
 $???0?!%b??????|?'????
Q????????An?XQ6??^?
t?v?m]}^?/L???|?*?????6c(th???b?.?6?)?h??{?????f??
?Y???>*???????O?O???VO?4?)??????v?h??6?8???a{"?LR??????)"%Cq
p"?##-R?O_???i?????????&?|?u/?O????}?G??|w?~???}??}?(??q?P
?^e'q???i???f?+?3?q\??????Y
??@v`
?>??J??O?????oA????? n???O?amEB?E???V(4
??
p	???8~?g?'?b??'U?R?(??~l?Q?%???R?W
rC?Cn?C?k[?$?>??F?p?Y?T?8?Q?e?F?B	??q5?o?????i?@??,r07J?	DPP?'Z???O?m????=?Pnv?????/ft7?????`0?????`???0}??x??
x???)?/C(??????G?KFI?6Hj????y[??/??!??#z?z{????H~??
?@?=?jk?????B??????????? ??>q?Hz?y? ??2??a ??5iBQ&O?^??V-????4
?k?:??k??x?>???}?;?@?2e}?g*i???/u????????#\??=??X?,???????sp????>4?,??+??-???N?V?b???U?^~mZkA!c?i
<E?2???m??(?s??{????F?^????z??$?M?I?eq?L?Tr??m??kz???=pL?n??[?`.??t
iv??[1?{????(?A??1???#9?"?N}3@?%p;?!Q???,
???????|?8?7B]?)\?l?.Eo??F?????
&?8???????Z?Sd?(?KD??G.X?????/(???d<f]???8??S???????|?`?m/:?l
1Foe?????<??~?_????I??
9??w?????????`?K?"\??B?@??E~7???XB??k??E???l?
??O?
I?S???_:?|?*Ac h?=????g?A??g?	#??????H?????_?V??p?5????l?=???PI)?!???c??(????y??????q????~??,.?tMbf??<G '?Ai|%?x$?#?!?S??eRIw?}?d???]??)?EU>?>??u??[??0M??S?k;?+?F??M??7????+??i?E???????:?o?[tY??W????s????K_?a?^zF?????q???(0?
xY	????o??XS8?
F:??NhY?f??.?S?l~?:???D??t?2	?E'~?bL?:?Q?,?:???!
	??@?A??
(?KmU???zy?5]????@???*0?t?????]???JK?5D?L?e??|wh??H@

??s6m~B!dn?F??J@???7??r8(??7??_??????}6O?h? O?H???H???of?4???7?mwH?"?8~?3t
?-
?tr?L22???M_???~g>x?n5????p??Q?;?!Z?>????????:??????a???-??+???$?tT??/i?c]G????????l?/-????????-??hq+?~O???9?????????$?1{xi?:?0??,u?~??*??IG??????~.p????-!H?+uzES?7'?????
E?????????x?W/a`?+??L??|?4:???s=	?gLwr?{???z?U|]z????r|>_?????~?^???mZ?~???]]????1?c!+f????FI^?L?S1c5?@????p?	?B???\F?`@???[?<{g??*'???P??~??????G4??uo?y??\p??)??w;???V??Oc?@????A?
???????^J?/g??????1??c???al+??<g?"???_tG?????_??"?"r???{??	?;?{[??y?O$?9????9??{????0s?2????g?H?r?Y-q;.h??;??o?'??6???UH?v?????2?8f4A?nWO0?????PQ? ?fh?bc?}}????g_???X?Y?M?
 w}?i?-/???=?n??C??&u??a-<,
?@?E?
T?U)????m??????@???4r\@o??WK?yn????????D1?????#`O?????,?????Cg?4'?{?^H?)???NF??????0?H??{?)ePZ}vJ?[?.???<??{?]?X???(?T/0P?`Peii?????y????R????H???{????????Lf???E??o??????l????w?????'?b?????rC??/??\8HD?H??I??j$?[*AU???Db??'??B?P!0d?Sl??
`,??"0??:?%8?`_?AC?kxs?@?}=V~?W\?C???V??2?m????
?A??_l}??S???x?O`???@?|????Q?OVGM??1'??
w????8P?+
UIa? H??<?;?c??d?`?????/
????^????)????o
f?@???r??z?>?=??q
+D?+??/???X?Va??!??#/;
?2M??f?}3
??jD.?#???wS9?p?>??c?
???G???~?7???
?n???]N
?Xp&???Ln?????Q????9P???/?w?#?^??64M???f???????I?!???F+????2?4??y?vd?#?9?\KaY??F?d?]???HO
}?3C?]p?I`d?ZU({-?-x?2?????nt????
???=????	?zA#CT?o@????.A
???????o?xD?dL??????@0 r?	v????Z???!?
1,_?A-P?w??2#i?<<?
?=??E?r?Z?X?}??-???g?J?O??|7???-(`?d???h??H??Dnm?>b?P?L???)?I??#?7}?????4???3??????Lhu"v???
?????'?,??q??m{?Q?>L????v?MQx?????8.?B{?-P?O????
D??????>8?????=?QE(??)R4)????
?Cu)?F?jh?????q$d????`jdQ??2?
@??{???A?.??/p??????}?m:yq?uL`?D???Df??:???x????R_O???????M?????E?P?COz%?$$?4v7???@????``?3?????,??????W??
??gP??1?QYG??+GV,?a=????????????/??P???????T S??-?Z%????1iwO8???n2K?xk?%?B?.?
???]l??<???(?C??W??_Q???
?O'?{????)????}{.?U?5???cL?H?q??X??!?=f?g?j???
?t-???
?a?D?u?*?&?r??/ \?#J?????z???N???????f=
??4??!??P?.r?*4??7?U?????:q??????!#?j??????z?!"???o8
????Q??????7???>??q??,??e?????I!$?$?a?s5??z_y???y?@?=????7????r???K?p?0J?a?n??\	????!??C???????h?oQ.?M???????>?a??3??9?4????49?$5??7???8??m?d?5?ep??.-UU??7????..}q???RO????????dC??%%?s??!EH???)/X?????"?3t?kj?CR???Y??_ ?s$??/??,4?? ???
???K
5???[I???H?f??,?<H%
A??u??P??????(?jX?Z
q^p?;fI?a??:????????????)?????`C/#9???????????q?????? &???? #?a?pt?<?5???`???????@???lc?i??;????!????Ml?????fH??Q??b?_w-?
4U7 at H????d??|[p???q?5?_P?c+DD?
/??"N}????q?kLH?i?@$???????z??@9&^?"F???!???gYXa????G?x??x+RD?l??w?OQ?z??Hi?&DU?P*?Q
?u??x??????8??i??s????8??&01??$B4??
?B
&U]h??!? ?Rz?????;N??????S??r?
H??L* N????v?.?[r????!?m?HH?W,i{a?~ `3??!????????????6G.63u???0????X??=??p?
?>~!,Qd?w?:?u?????W}f?q{H47q?d?;{c??H>????v?I*?;??"H'Z
QGC}???3???LtZ?Dy??`?cldfZb?1?????l?'??H[?)$?D??????L?A???L at Ps?A?D$C?_?~?????-9?g??I?$??;U???
?k?
.A??
Px!?y?X????-<?
??j??,
t??U?"??????K?V?H?P????????Q?jb???%N??!G?5e?g?;~
?`?
hhj at RH???,z?&o?
]??j|??????LC-v???8??7?L??I|74F?\??A'?2ZD?1K???}VY??Og?!C??(?(?s?????????y?-LD(??,A?rL?????1??u?p?????z=??e0i4???p???<?5 W?t3?2??::AT?~?\?p?e+a??O?
?fa?M?????bla|xc?
???? d?
G????^?9?@iV$??x?,?????R?Z?L?5?8?m???'I????B?kyB?	p????R?c%?0<????X%?D}?p&}??5'???6?C?`!!?Y?/??Yy????Q?????i
??2(?????,E(??r!?w?v??|8eB?Qy5|a
?\?e at P????P?????l??MbRZ?!????????K?CX?/?%?????F?I?oe?????0F??z????
HS?H??T%Y???????\?vd

@?Zv??zJ??)`?kZ=?`???f?g????? ?I??3VGE?R
?'r7????PL_$9K?=]???K1??_;qH,???\????
	??,??Do,?
?@?F????JI???????#a??c?c:K?i??xW?S???nB??sVd?$?Xrs??I??s??e??????????oT?[UPz??N0???4t	??u'4???%?E???*?Vr??6!U????vV??bY?n?m?)z.?r9?wR??T??4??K?`S??cxX
5y3!
?0C???j???0??J??%???5?K???qJ at L[h?FNR??c?cWkvT??Y?r????????8
???S`??(MdC5?h:? ????+x???D!?k???=??p?
?!$?6??dg-!?2??7H
?a?????J@
y?e?o G??D?
???Xy?j???h???<??
?l?$ C???t?`\???U??YB?????W"jS?$???x5?iSQXx?"?y
"?X?v2
/??c???BC??'???j?8!??????????c\?~??EJ??
n??h
????G????Z~?S~=T??????l
?&|?G ?H??
??Nw@?????o???
?4;??~r??YC???F@?*??:dXN&?????]?#?X|T??2G?P3?	??-??6AMN,
??@!???l2?*?E
????{c????Y?
dw)RX??O^????m.???9${#y#zX?Gg??	
?=?????H?! ??R?2O?z?x?JhC??_~?L#?T????6>???1??C?HT?v???:?K????a?b)???
?R?
?a????[?Fc??????]??H??????z??
?????
XUf????"*?+?;M at 7?>??.&F? ?9????p?A7l????`r?MC??Hr?##?"l???	R?8??H??3??
*Z????a?P!?bs
?}??????G+?N?JD??H??
?vJ0??2";,1P/Hd\??(?|@$??&HJS?t)????
?[?\qA?g?x????C?M?5
?????????Z???+
??-$P??w?a3'
68}?s?I?????J?%An
??b???p?j~?l??@?$??A?-??@?
? 1? E  H?J?????????y??
7??	??
Q???TRE?
?c?dz?P??e@da?n??A1?!????(?(?????d?
???K17?GuV?U?K_?z?I?:?R???v???p????r$>??????w??k'x*)N;??Q?C
fg??q?f??%u?Mr?$:????S??[qYDL???????H?]fT?\??T]kF?0??????V"k5?Ze??Kb2??]?yHw?????M????,$?u?D;:??D???h=?g??>????A???LQE??i?L??3?U?	??]????

???r\?"dzo7???3B??5??dr?Q??'.??3??????M???"??k?'<?ix0????(??q????`GB?kA??D?je?????????w?????L7??<5X?;]d???R??X2????m?f?ES???oN??WV?????M<???????v"
~????-
?V1 at U$`S???? ?x?????z??<?????,?k* 0c?h???V'????5???'d??;}??.o?R?t~F?????~=!a???O???0X???O'??pH??s9j?????
X????? ??w=?????
??P???5n???oj3@??%,?6?????v?J???.?F??/??8i?pQ=BC??????*???
r?%6`
*??R?T):??#??o}???????+s?????????mG?\@??????J[?-b?h?????^?????h\???8=???+?
'l5b??'???G?v=]?D?@??t?qK?G?2`?%3 at B%!?L?? ??C??-???=DT4?<S?^????Ex??????E6???m????4??to? w?M???K?9?A? f???	vJ??W5???~%H*???n
???%iD5D??.???	S(Im??+?e)???14?l?	??????1?)?<bU,??r?O???P????????t?s?"????????	?y?z?????0??mT??S	??yi<DE>?q?0?$N??;?8??"*??ua??#?}?OP5??<?4j?[}_"?4Vp?l?G?f?2H?PX??????/?`=M?????O?????\s?4x?m??!^K?V??_?
7P??`?337??wp?#&???R??j?,????9???wB???$??="hgr?t???f*?66Q?uj??T?Hf??(?}?)?!????wCuid?C(,?v?sL?.?$?r????,????c0??0?U?I??B?fJ?l)r+	?????Y???Q??I?IbA??Z?LP()E???#II$5*H?j?i/??
??Z????!O*?3?}{??ug?A???&?
???%ADD?
?DN????<'C'?Y???EY?+!^???j.l]%)T??
?P???:n?&?"?A`???Af?&(6?)aV1???
???ILS!?FI?bky?K6?1?v?????)"?'
??????a;zu?o??I??4?p=?W{??A???L?4+!+
d?C????VO????????t?.???h??(?&?#?F?_?;M??b????d_m????`?S???
t???Dr?W??,?????n[?????P?H?b?AH?????
?t???[	??????p???I)?>???)??*s????p	0?+?)?]?ZA[@?%?(??N??????PT???:?p??????vP7LT???y??
????S?+??W?Q6eu-???FM?&3x??KG?#!??=4?f?2?l$????R
??dW???%G???]???{3]??x??D?!???4???%?mi?I??????y?_??~I?	?Mz?7??????ujC?u?'?	?"??
????H?4w?:?????<??n?8@
???????8??k??4????X???k?f?ty$??
??R?
?}2T????t2-c?O6K???n:????5?`?+{cVv?k?O^	?l?q
d???.??r?t???Uk?Q at D??2?~,S??u7?0
??vk&[}??2?J???1V
????x|Y?v?5????g:??hX????(??? U?c\(? ?!=???<?>1???E??N<??$?$&??????y>b???dPyx"??
#S?????7??w??d??8?i4??|???1v?K?X?jF?N?}????z?9??Y?????
B1c%???P9?U??????l????	?X???A??X*?????!? m????????}???
???x]]a 2=?
??`??'?.??RH?\?C?B????Ja???|??l????0xT?????nC?8???$????
 ?O?!?khF?ID;??5??o?F??aN???????t|?~2??j??
?(WZ\?1??nX)???
?)Dx?YB???D?|?(?Q?ib1Qa??EI??Z?J?O?I?????c????6????`??SL
	\???lh???f?2?!?E??3????????Z?" 16?6?ee-?K)v??,?D??x??8?Iq F
?l????o!??j?9@?
??BDS???v??G
??-??????.;?Yc)]j???\M?Y?-S???hC???????G?	????????w+??~PjN?q???'l!??x?M??}g?5??????H?
$???s??z?????9G????=?@d??F??h???o????????[N????????l??eI?v??B?]?=cg??cQ?z???a?@	??\?K??|?X?C??1??????_?9?S??????L????4l?FJ6??,\0?.
??WV,?L??h?Wl????F??I 0???????d?2?ZJB?id????e?2RJ?O?Oy	;??{*?a-EU???]?@???$?G??@V^g???????????n
?????%?
G
7?4u?,?b?;??2???oE??1^?g[??<??yp??Qh???P???O8.?%?B?i?ls?EK?(;
?j??????f?Mn?h?:?<(zU)??z???TY?pR??)?????v???V0W??7?m?????<4U at Oyv??Bk
?[z??d.Ou?????
??Z!??u?????
?>??3???	
u????&?F?T????? ???.aMx?7?i??R???m?3??"???>I??????;8FL@?????u?I??=QA??????jYS???Y?"/
T??HSh?"[F?R????$2?A?Xl"??????g??W?YN?L??p???4aVV?pCy?,H20?$????.?q????A?!??E??????$?~?~?????n??????????$?x?P??t?"W?0m
T??5I$h?5?S\???La? ?????6?U?8?[:??-?'^?_l?rs<%Q?DM ??
??1????????u??e?X)???LB???????Y???`
?
M?????	??K????r??????'????,@????\?'?"A
?|??{?0!??U.\J?h@?%???"2A??d??h??.u??-.??o??#X?????r? j@?Jp??g~r????(?a3 ???2NR???5?
q?3P?
?#H?Hk?A?P?1 at qt????HM?s??f-s???O??'????V???;m
?.E?\???y???????L?Xeb_h??p.?;he)???VlY????
&??Q1r??i?a??n??????/C?&j????o?R?+f???:&?7
???@8??S???:??q'D?Y&8J&?????i??^q???M;ZomjRH98KT\???&
?Uaz?t?L?e))??3V?C
??Rw ?.????)0`??f$-:Ld?lam ??YE?
??o???P?2t7???,?+??H?i?4??*?[??I?(??k???%?rE??)?k5QI???Qi??????e?Dxf??E???IK?????????=?)T????%?u6AA|j? ??Bt[?a?4t!???6?L2'???wA)-O?4??V?X?@????&?$???"?0H?
d???I!????#
?4
?B???????:?Z????<g^y???t??!?1?v?6?~#??>?&?G??,?c??[6z????H_AO?~?m????o#>7?dw???>V??????P?m??f??zO?T??:?=?V?eOFw????8??;?e??Y???nI
 ?2???H?z??:????J?q|??
?#? E'???L?(???*??????M?+????D?C??h?z\??`u?)?|.?????p
?=???`z???
l}??}x`}???O?C????m`?k???E?? ??Q??a7&??"??/W{?j?8?O???j(?U#_`?J^rF?"?/??ZP??>???
???6??f???7??L??(2
g6A????%R*9\``3??$???V?a?(?4?E?b?L??I?xm??&?????w??g??_?i*??q??6@>?$??J sD;d????x??{?	??>P<?N??????dFq	E??(??D>y?~??R,D?a?)??(Q?I?P-?:?BI??./WotF?*?X???a.\??v?`????N$)?	x



From philipp at fedoraproject.org  Wed Dec 16 21:58:18 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 21:58:18 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel mod_proxy_html.spec,1.2,1.3
Message-ID: <20091216215818.08E6111C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23059

Modified Files:
	mod_proxy_html.spec 
Log Message:
Bump to 3.1.2-3




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/mod_proxy_html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_proxy_html.spec	16 Dec 2009 21:34:48 -0000	1.2
+++ mod_proxy_html.spec	16 Dec 2009 21:58:17 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/



From philipp at fedoraproject.org  Wed Dec 16 22:03:40 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 22:03:40 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel mod_proxy_html.spec,1.3,1.4
Message-ID: <20091216220340.64FC111C00C5@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24377

Modified Files:
	mod_proxy_html.spec 
Log Message:
Bump to 3.1.2-4




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/mod_proxy_html.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mod_proxy_html.spec	16 Dec 2009 21:58:17 -0000	1.3
+++ mod_proxy_html.spec	16 Dec 2009 22:03:40 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/



From roland at fedoraproject.org  Wed Dec 16 22:09:43 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 16 Dec 2009 22:09:43 +0000 (UTC)
Subject: rpms/kernel/devel/scripts pull-upstreams.sh,1.6,1.7
Message-ID: <20091216220943.40CAB11C00C5@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25951/scripts

Modified Files:
	pull-upstreams.sh 
Log Message:
utrace update, now testing the utrace-based ptrace!


Index: pull-upstreams.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/pull-upstreams.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pull-upstreams.sh	8 Jan 2009 04:42:24 -0000	1.6
+++ pull-upstreams.sh	16 Dec 2009 22:09:42 -0000	1.7
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-url=http://people.redhat.com/roland/utrace/${1:-2.6-current}
+utrace_base=2.6.32
+
+url=http://people.redhat.com/roland/utrace/${1:-$utrace_base}
 
 wget -q -O /dev/stdout $url/series | grep 'patch$' |
 while read i



From roland at fedoraproject.org  Wed Dec 16 22:09:43 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 16 Dec 2009 22:09:43 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-utrace-ptrace.patch, NONE,
	1.1 kernel.spec, 1.1872, 1.1873 linux-2.6-tracehook.patch, 1.9,
	1.10 linux-2.6-utrace.patch, 1.118, 1.119
Message-ID: <20091216220943.44A3F11C02A3@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25951

Modified Files:
	kernel.spec linux-2.6-tracehook.patch linux-2.6-utrace.patch 
Added Files:
	linux-2.6-utrace-ptrace.patch 
Log Message:
utrace update, now testing the utrace-based ptrace!

linux-2.6-utrace-ptrace.patch:
 include/linux/ptrace.h |    2 
 kernel/Makefile        |    1 
 kernel/ptrace-utrace.c | 1080 +++++++++++++++++++++++++++++++++++++++++++++++++
 kernel/ptrace.c        |  597 +++++++++++++--------------
 kernel/utrace.c        |   16 
 5 files changed, 1391 insertions(+), 305 deletions(-)

--- NEW FILE linux-2.6-utrace-ptrace.patch ---
utrace: ptrace cooperation

This adds the CONFIG_UTRACE_PTRACE option under CONFIG_UTRACE.
When set, parts of ptrace are replaced so it uses the utrace
facilities for noticing events, stopping and resuming threads.

This makes ptrace play nicely with other utrace-based things
tracing the same threads.  It also makes all ptrace uses rely on
some of the utrace code working right, even when you are not
using any other utrace-based things.  So it's experimental and
not real well proven yet.  But it's recommended if you enable
CONFIG_UTRACE and want to try new utrace things.

Signed-off-by: Roland McGrath <roland at redhat.com>
---
 include/linux/ptrace.h |    2 +-
 kernel/Makefile        |    1 +
 kernel/ptrace-utrace.c | 1080 ++++++++++++++++++++++++++++++++++++++++++++++++
 kernel/ptrace.c        |  572 +++++++++++++-------------
 kernel/utrace.c        |   16 +
 5 files changed, 1378 insertions(+), 293 deletions(-)

diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 4802e2a..03f8fc7 100644  
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -79,7 +79,7 @@
 #include <linux/compiler.h>		/* For unlikely.  */
 #include <linux/sched.h>		/* For struct task_struct.  */
 
-
+extern void ptrace_notify_stop(struct task_struct *tracee);
 extern long arch_ptrace(struct task_struct *child, long request, long addr, long data);
 extern int ptrace_traceme(void);
 extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
diff --git a/kernel/Makefile b/kernel/Makefile
index 263bb19..42cb1ec 100644  
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -69,6 +69,7 @@ obj-$(CONFIG_RESOURCE_COUNTERS) += res_c
 obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
 obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
 obj-$(CONFIG_UTRACE) += utrace.o
+obj-$(CONFIG_UTRACE) += ptrace-utrace.o
 obj-$(CONFIG_AUDIT) += audit.o auditfilter.o audit_watch.o
 obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
 obj-$(CONFIG_GCOV_KERNEL) += gcov/
diff --git a/kernel/ptrace-utrace.c b/kernel/ptrace-utrace.c
new file mode 100644
index ...ea419ee 100644  
--- /dev/null
+++ b/kernel/ptrace-utrace.c
@@ -0,0 +1,1080 @@
+/*
+ * linux/kernel/ptrace.c
+ *
+ * (C) Copyright 1999 Linus Torvalds
+ *
+ * Common interfaces for "ptrace()" which we do not want
+ * to continually duplicate across every architecture.
+ */
+
+#include <linux/capability.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/mm.h>
+#include <linux/highmem.h>
+#include <linux/pagemap.h>
+#include <linux/smp_lock.h>
+#include <linux/ptrace.h>
+#include <linux/utrace.h>
+#include <linux/security.h>
+#include <linux/signal.h>
+#include <linux/audit.h>
+#include <linux/pid_namespace.h>
+#include <linux/syscalls.h>
+#include <linux/uaccess.h>
+
+/*
+ * ptrace a task: make the debugger its new parent and
+ * move it to the ptrace list.
+ *
+ * Must be called with the tasklist lock write-held.
+ */
+void __ptrace_link(struct task_struct *child, struct task_struct *new_parent)
+{
+	BUG_ON(!list_empty(&child->ptrace_entry));
+	list_add(&child->ptrace_entry, &new_parent->ptraced);
+	child->parent = new_parent;
+}
+
+/*
+ * unptrace a task: move it back to its original parent and
+ * remove it from the ptrace list.
+ *
+ * Must be called with the tasklist lock write-held.
+ */
+void __ptrace_unlink(struct task_struct *child)
+{
+	BUG_ON(!child->ptrace);
+
+	child->ptrace = 0;
+	child->parent = child->real_parent;
+	list_del_init(&child->ptrace_entry);
+
+	arch_ptrace_untrace(child);
+}
+
+struct ptrace_context {
+	int				options;
+
+	int				signr;
+	siginfo_t			*siginfo;
+
+	int				stop_code;
+	unsigned long			eventmsg;
+
+	enum utrace_resume_action	resume;
+};
+
+#define PT_UTRACED			0x00001000
+
+#define PTRACE_O_SYSEMU			0x100
+
+#define PTRACE_EVENT_SYSCALL		(1 << 16)
+#define PTRACE_EVENT_SIGTRAP		(2 << 16)
+#define PTRACE_EVENT_SIGNAL		(3 << 16)
+/* events visible to user-space */
+#define PTRACE_EVENT_MASK		0xFFFF
+
+static inline bool ptrace_event_pending(struct ptrace_context *ctx)
+{
+	return ctx->stop_code != 0;
+}
+
+static inline int get_stop_event(struct ptrace_context *ctx)
+{
+	return ctx->stop_code >> 8;
+}
+
+static inline void set_stop_code(struct ptrace_context *ctx, int event)
+{
+	ctx->stop_code = (event << 8) | SIGTRAP;
+}
+
+static inline struct ptrace_context *
+ptrace_context(struct utrace_engine *engine)
+{
+	return engine->data;
+}
+
+static const struct utrace_engine_ops ptrace_utrace_ops; /* forward decl */
+
+static struct utrace_engine *ptrace_lookup_engine(struct task_struct *tracee)
+{
+	return utrace_attach_task(tracee, UTRACE_ATTACH_MATCH_OPS,
+					&ptrace_utrace_ops, NULL);
+}
+
+static struct utrace_engine *
+ptrace_reuse_engine(struct task_struct *tracee)
+{
+	struct utrace_engine *engine;
+	struct ptrace_context *ctx;
+	int err = -EPERM;
+
+	engine = ptrace_lookup_engine(tracee);
+	if (IS_ERR(engine))
+		return engine;
+
+	ctx = ptrace_context(engine);
+	if (unlikely(ctx->resume == UTRACE_DETACH)) {
+		/*
+		 * Try to reuse this self-detaching engine.
+		 * The only caller which can hit this case is ptrace_attach(),
+		 * it holds ->cred_guard_mutex.
+		 */
+		ctx->options = 0;
+		ctx->eventmsg = 0;
+
+		/* make sure we don't get unwanted reports */
+		err = utrace_set_events(tracee, engine, UTRACE_EVENT(QUIESCE));
+		if (!err || err == -EINPROGRESS) {
+			ctx->resume = UTRACE_RESUME;
+			/* synchronize with ptrace_report_signal() */
+			err = utrace_barrier(tracee, engine);
+		}
+		WARN_ON(!err != (engine->ops == &ptrace_utrace_ops));
+
+		if (!err)
+			return engine;
+	}
+
+	utrace_engine_put(engine);
+	return ERR_PTR(err);
+}
+
+static struct utrace_engine *
+ptrace_attach_engine(struct task_struct *tracee)
+{
+	struct utrace_engine *engine;
+	struct ptrace_context *ctx;
+
+	if (unlikely(task_utrace_flags(tracee))) {
+		engine = ptrace_reuse_engine(tracee);
+		if (!IS_ERR(engine) || IS_ERR(engine) == -EPERM)
+			return engine;
+	}
+
+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+	if (unlikely(!ctx))
+		return ERR_PTR(-ENOMEM);
+
+	ctx->resume = UTRACE_RESUME;
+
+	engine = utrace_attach_task(tracee, UTRACE_ATTACH_CREATE |
+						UTRACE_ATTACH_EXCLUSIVE |
+						UTRACE_ATTACH_MATCH_OPS,
+						&ptrace_utrace_ops, ctx);
+	if (unlikely(IS_ERR(engine))) {
+		if (engine != ERR_PTR(-ESRCH) &&
+		    engine != ERR_PTR(-ERESTARTNOINTR))
+			engine = ERR_PTR(-EPERM);
+		kfree(ctx);
+	}
+
+	return engine;
+}
+
+static inline int ptrace_set_events(struct task_struct *target,
+					struct utrace_engine *engine,
+					unsigned long options)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+	/*
+	 * We need QUIESCE for resume handling, CLONE to check
+	 * for CLONE_PTRACE, other events are always reported.
+	 */
+	unsigned long events = UTRACE_EVENT(QUIESCE) | UTRACE_EVENT(CLONE) |
+			       UTRACE_EVENT(EXEC) | UTRACE_EVENT_SIGNAL_ALL;
+
+	ctx->options = options;
+	if (options & PTRACE_O_TRACEEXIT)
+		events |= UTRACE_EVENT(EXIT);
+
+	return utrace_set_events(target, engine, events);
+}
+
+/*
+ * Attach a utrace engine for ptrace and set up its event mask.
+ * Returns error code or 0 on success.
+ */
+static int ptrace_attach_task(struct task_struct *tracee, int options)
+{
+	struct utrace_engine *engine;
+	int err;
+
+	engine = ptrace_attach_engine(tracee);
+	if (IS_ERR(engine))
+		return PTR_ERR(engine);
+	/*
+	 * It can fail only if the tracee is dead, the caller
+	 * must notice this before setting PT_UTRACED.
+	 */
+	err = ptrace_set_events(tracee, engine, options);
+	WARN_ON(err && !tracee->exit_state);
+	utrace_engine_put(engine);
+	return 0;
+}
+
+static int ptrace_wake_up(struct task_struct *tracee,
+				struct utrace_engine *engine,
+				enum utrace_resume_action action,
+				bool force_wakeup)
+{
+	if (force_wakeup) {
+		unsigned long flags;
+		/*
+		 * Preserve the compatibility bug. Historically ptrace
+		 * wakes up the tracee even if it should not. Clear
+		 * SIGNAL_STOP_STOPPED for utrace_wakeup().
+		 */
+		if (lock_task_sighand(tracee, &flags)) {
+			tracee->signal->flags &= ~SIGNAL_STOP_STOPPED;
+			unlock_task_sighand(tracee, &flags);
+		}
+	}
+
+	if (action != UTRACE_REPORT)
+		ptrace_context(engine)->stop_code = 0;
+
+	return utrace_control(tracee, engine, action);
+}
+
+static void ptrace_detach_task(struct task_struct *tracee, int sig)
+{
+	/*
+	 * If true, the caller is PTRACE_DETACH, otherwise
+	 * the tracer detaches implicitly during exit.
+	 */
+	bool voluntary = (sig >= 0);
+	struct utrace_engine *engine = ptrace_lookup_engine(tracee);
+	enum utrace_resume_action action = UTRACE_DETACH;
+
+	if (unlikely(IS_ERR(engine)))
+		return;
+
+	if (sig) {
+		struct ptrace_context *ctx = ptrace_context(engine);
+
+		switch (get_stop_event(ctx)) {
+		case PTRACE_EVENT_SYSCALL:
+			if (voluntary)
+				send_sig_info(sig, SEND_SIG_PRIV, tracee);
+			break;
+
+		case PTRACE_EVENT_SIGNAL:
+			if (voluntary)
+				ctx->signr = sig;
+			ctx->resume = UTRACE_DETACH;
+			action = UTRACE_RESUME;
+			break;
+		}
+	}
+
+	ptrace_wake_up(tracee, engine, action, voluntary);
+	utrace_engine_put(engine);
+}
+
+static void ptrace_abort_attach(struct task_struct *tracee)
+{
+	ptrace_detach_task(tracee, 0);
+}
+
+static u32 ptrace_report_exit(u32 action, struct utrace_engine *engine,
+			      long orig_code, long *code)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+
+	WARN_ON(ptrace_event_pending(ctx) &&
+		!signal_group_exit(current->signal));
+
+	set_stop_code(ctx, PTRACE_EVENT_EXIT);
+	ctx->eventmsg = *code;
+
+	return UTRACE_STOP;
+}
+
+static void ptrace_clone_attach(struct task_struct *child,
+				int options)
+{
+	struct task_struct *parent = current;
+	struct task_struct *tracer;
+	bool abort = true;
+
+	if (unlikely(ptrace_attach_task(child, options))) {
+		WARN_ON(1);
+		return;
+	}
+
+	write_lock_irq(&tasklist_lock);
+	tracer = parent->parent;
+	if (!(tracer->flags & PF_EXITING) && parent->ptrace) {
+		child->ptrace = parent->ptrace;
+		__ptrace_link(child, tracer);
+		abort = false;
+	}
+	write_unlock_irq(&tasklist_lock);
+	if (unlikely(abort)) {
+		ptrace_abort_attach(child);
+		return;
+	}
+
+	sigaddset(&child->pending.signal, SIGSTOP);
+	set_tsk_thread_flag(child, TIF_SIGPENDING);
+}
+
+static u32 ptrace_report_clone(u32 action, struct utrace_engine *engine,
+			       unsigned long clone_flags,
+			       struct task_struct *child)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+	int event = 0;
+
+	WARN_ON(ptrace_event_pending(ctx));
+
+	if (clone_flags & CLONE_UNTRACED) {
+		/* no events reported */
+	} else if (clone_flags & CLONE_VFORK) {
+		if (ctx->options & PTRACE_O_TRACEVFORK)
+			event = PTRACE_EVENT_VFORK;
+		else if (ctx->options & PTRACE_O_TRACEVFORKDONE)
+			event = PTRACE_EVENT_VFORK_DONE;
+	} else if ((clone_flags & CSIGNAL) != SIGCHLD) {
+		if (ctx->options & PTRACE_O_TRACECLONE)
+			event = PTRACE_EVENT_CLONE;
+	} else if (ctx->options & PTRACE_O_TRACEFORK) {
+		event = PTRACE_EVENT_FORK;
+	}
+	/*
+	 * Any of these reports implies auto-attaching the new child.
+	 * So does CLONE_PTRACE, even with no event to report.
+	 */
+	if ((event && event != PTRACE_EVENT_VFORK_DONE) ||
+				(clone_flags & CLONE_PTRACE))
+		ptrace_clone_attach(child, ctx->options);
+
+	if (!event)
+		return UTRACE_RESUME;
+
+	set_stop_code(ctx, event);
+	ctx->eventmsg = child->pid;
+	/*
+	 * We shouldn't stop now, inside the do_fork() path.
+	 * We will stop later, before return to user-mode.
+	 */
+	if (event == PTRACE_EVENT_VFORK_DONE)
+		return UTRACE_REPORT;
+	else
+		return UTRACE_STOP;
+}
+
+static inline void set_syscall_code(struct ptrace_context *ctx)
+{
+	set_stop_code(ctx, PTRACE_EVENT_SYSCALL);
+	if (ctx->options & PTRACE_O_TRACESYSGOOD)
+		ctx->stop_code |= 0x80;
+}
+
+static u32 ptrace_report_syscall_entry(u32 action, struct utrace_engine *engine,
+				       struct pt_regs *regs)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+
+	if (action & UTRACE_SYSCALL_RESUMED) {
+		/*
+		 * We already reported the first time.
+		 * Nothing more to do now.
+		 */
+		if (unlikely(ctx->options & PTRACE_O_SYSEMU))
+			return UTRACE_SYSCALL_ABORT | UTRACE_REPORT;
+		return utrace_syscall_action(action) | UTRACE_RESUME;
+	}
+
+	WARN_ON(ptrace_event_pending(ctx));
+
+	set_syscall_code(ctx);
+
+	if (unlikely(ctx->options & PTRACE_O_SYSEMU))
+		return UTRACE_SYSCALL_ABORT | UTRACE_REPORT;
+	/*
+	 * Stop now to report.  We will get another callback after
+	 * we resume, with the UTRACE_SYSCALL_RESUMED flag set.
+	 */
+	return UTRACE_SYSCALL_RUN | UTRACE_STOP;
+}
+
+static u32 ptrace_report_syscall_exit(u32 action, struct utrace_engine *engine,
+				      struct pt_regs *regs)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+
+	if (ptrace_event_pending(ctx))
+		return UTRACE_STOP;
+
+	if (ctx->resume != UTRACE_RESUME) {
+		WARN_ON(ctx->resume != UTRACE_BLOCKSTEP &&
+			ctx->resume != UTRACE_SINGLESTEP);
+		ctx->resume = UTRACE_RESUME;
+
+		ctx->signr = SIGTRAP;
+		return UTRACE_INTERRUPT;
+	}
+
+	set_syscall_code(ctx);
+	return UTRACE_STOP;
+}
+
+static u32 ptrace_report_exec(u32 action, struct utrace_engine *engine,
+			      const struct linux_binfmt *fmt,
+			      const struct linux_binprm *bprm,
+			      struct pt_regs *regs)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+
+	WARN_ON(ptrace_event_pending(ctx));
+
+	if (!(ctx->options & PTRACE_O_TRACEEXEC)) {
+		/*
+		 * Old-fashioned ptrace'd exec just posts a plain signal.
+		 */
+		send_sig(SIGTRAP, current, 0);
+		return UTRACE_RESUME;
+	}
+
+	set_stop_code(ctx, PTRACE_EVENT_EXEC);
+	return UTRACE_STOP;
+}
+
+static enum utrace_signal_action resume_signal(struct ptrace_context *ctx,
+					       struct k_sigaction *return_ka)
+{
+	siginfo_t *info = ctx->siginfo;
+	int signr = ctx->signr;
+
+	ctx->siginfo = NULL;
+	ctx->signr = 0;
+
+	/* Did the debugger cancel the sig? */
+	if (!signr)
+		return UTRACE_SIGNAL_IGN;
+	/*
+	 * Update the siginfo structure if the signal has changed.
+	 * If the debugger wanted something specific in the siginfo
+	 * then it should have updated *info via PTRACE_SETSIGINFO.
+	 */
+	if (info->si_signo != signr) {
+		info->si_signo = signr;
+		info->si_errno = 0;
+		info->si_code = SI_USER;
+		info->si_pid = task_pid_vnr(current->parent);
+		info->si_uid = task_uid(current->parent);
+	}
+
+	/* If the (new) signal is now blocked, requeue it. */
+	if (sigismember(&current->blocked, signr)) {
+		send_sig_info(signr, info, current);
+		return UTRACE_SIGNAL_IGN;
+	}
+
+	spin_lock_irq(&current->sighand->siglock);
+	*return_ka = current->sighand->action[signr - 1];
+	spin_unlock_irq(&current->sighand->siglock);
+
+	return UTRACE_SIGNAL_DELIVER;
+}
+
+static u32 ptrace_report_signal(u32 action, struct utrace_engine *engine,
+				struct pt_regs *regs,
+				siginfo_t *info,
+				const struct k_sigaction *orig_ka,
+				struct k_sigaction *return_ka)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+	enum utrace_resume_action resume = ctx->resume;
+
+	if (ptrace_event_pending(ctx)) {
+		action = utrace_signal_action(action);
+		WARN_ON(action != UTRACE_SIGNAL_REPORT);
+		return action | UTRACE_STOP;
+	}
+
+	switch (utrace_signal_action(action)) {
+	case UTRACE_SIGNAL_HANDLER:
+		if (WARN_ON(ctx->siginfo))
+			ctx->siginfo = NULL;
+
+		if (resume != UTRACE_RESUME) {
+			WARN_ON(resume != UTRACE_BLOCKSTEP &&
+				resume != UTRACE_SINGLESTEP);
+
+			set_stop_code(ctx, PTRACE_EVENT_SIGTRAP);
+			return UTRACE_STOP | UTRACE_SIGNAL_IGN;
+		}
+
+	case UTRACE_SIGNAL_REPORT:
+		if (!ctx->siginfo) {
+			if (ctx->signr) {
+				/* set by ptrace_resume(SYSCALL_EXIT) */
+				WARN_ON(ctx->signr != SIGTRAP);
+				user_single_step_siginfo(current, regs, info);
+				force_sig_info(SIGTRAP, info, current);
+			}
+
+			return resume | UTRACE_SIGNAL_IGN;
+		}
+
+		if (WARN_ON(ctx->siginfo != info))
+			return resume | UTRACE_SIGNAL_IGN;
+
+		return resume | resume_signal(ctx, return_ka);
+
+	default:
+		break;
+	}
+
+	WARN_ON(ctx->siginfo);
+	ctx->siginfo = info;
+	/*
+	 * ctx->siginfo points to the caller's stack.
+	 * Make sure the subsequent UTRACE_SIGNAL_REPORT clears
+	 * ->siginfo before return from get_signal_to_deliver().
+	 */
+	if (utrace_control(current, engine, UTRACE_INTERRUPT))
+		WARN_ON(1);
+
+	ctx->signr = info->si_signo;
+	ctx->stop_code = (PTRACE_EVENT_SIGNAL << 8) | ctx->signr;
+
+	return UTRACE_STOP | UTRACE_SIGNAL_IGN;
+}
+
+static u32 ptrace_report_quiesce(u32 action, struct utrace_engine *engine,
+				 unsigned long event)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+
+	if (ptrace_event_pending(ctx))
+		return UTRACE_STOP;
+
+	return event ? UTRACE_RESUME : ctx->resume;
+}
+
+static void ptrace_release(void *data)
+{
+	kfree(data);
+}
+
+static const struct utrace_engine_ops ptrace_utrace_ops = {
+	.report_signal = ptrace_report_signal,
+	.report_quiesce = ptrace_report_quiesce,
+	.report_exec = ptrace_report_exec,
+	.report_exit = ptrace_report_exit,
+	.report_clone = ptrace_report_clone,
+	.report_syscall_entry = ptrace_report_syscall_entry,
+	.report_syscall_exit = ptrace_report_syscall_exit,
+	.release = ptrace_release,
+};
+
+int ptrace_check_attach(struct task_struct *child, int kill)
+{
+	struct utrace_engine *engine;
+	struct utrace_examiner exam;
+	int ret = -ESRCH;
+
+	engine = ptrace_lookup_engine(child);
+	if (IS_ERR(engine))
+		return ret;
+
+	if (child->parent != current)
+		goto out;
+
+	if (unlikely(kill))
+		ret = 0;
+
+	if (!task_is_stopped_or_traced(child))
+		goto out;
+	/*
+	 * Make sure our engine has already stopped the child.
+	 * Then wait for it to be off the CPU.
+	 */
+	if (!utrace_control(child, engine, UTRACE_STOP) &&
+	    !utrace_prepare_examine(child, engine, &exam))
+		ret = 0;
+out:
+	utrace_engine_put(engine);
+	return ret;
+}
+
+int ptrace_attach(struct task_struct *task)
+{
+	int retval;
+
+	audit_ptrace(task);
+
+	retval = -EPERM;
+	if (unlikely(task->flags & PF_KTHREAD))
+		goto out;
+	if (same_thread_group(task, current))
+		goto out;
+
+	/*
+	 * Protect exec's credential calculations against our interference;
+	 * interference; SUID, SGID and LSM creds get determined differently
+	 * under ptrace.
+	 */
+	retval = -ERESTARTNOINTR;
+	if (mutex_lock_interruptible(&task->cred_guard_mutex))
+		goto out;
+
+	task_lock(task);
+	retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
+	task_unlock(task);
+	if (retval)
+		goto unlock_creds;
+
+	retval = ptrace_attach_task(task, 0);
+	if (unlikely(retval))
+		goto unlock_creds;
+
+	write_lock_irq(&tasklist_lock);
+	retval = -EPERM;
+	if (unlikely(task->exit_state))
+		goto unlock_tasklist;
+
+	BUG_ON(task->ptrace);
+	task->ptrace = PT_UTRACED;
+	if (capable(CAP_SYS_PTRACE))
+		task->ptrace |= PT_PTRACE_CAP;
+
+	__ptrace_link(task, current);
+	send_sig_info(SIGSTOP, SEND_SIG_FORCED, task);
+
+	retval = 0;
+unlock_tasklist:
+	write_unlock_irq(&tasklist_lock);
+unlock_creds:
+	mutex_unlock(&task->cred_guard_mutex);
+out:
+	return retval;
+}
+
+/*
+ * Performs checks and sets PT_UTRACED.
+ * Should be used by all ptrace implementations for PTRACE_TRACEME.
+ */
+int ptrace_traceme(void)
+{
+	bool detach = true;
+	int ret = ptrace_attach_task(current, 0);
+
+	if (unlikely(ret))
+		return ret;
+
+	ret = -EPERM;
+	write_lock_irq(&tasklist_lock);
+	BUG_ON(current->ptrace);
+	ret = security_ptrace_traceme(current->parent);
+	/*
+	 * Check PF_EXITING to ensure ->real_parent has not passed
+	 * exit_ptrace(). Otherwise we don't report the error but
+	 * pretend ->real_parent untraces us right after return.
+	 */
+	if (!ret && !(current->real_parent->flags & PF_EXITING)) {
+		current->ptrace = PT_UTRACED;
+		__ptrace_link(current, current->real_parent);
+		detach = false;
+	}
+	write_unlock_irq(&tasklist_lock);
+
+	if (detach)
+		ptrace_abort_attach(current);
+	return ret;
+}
+
+static void ptrace_do_detach(struct task_struct *tracee, unsigned int data)
+{
+	bool detach, release;
+
+	write_lock_irq(&tasklist_lock);
+	/*
+	 * This tracee can be already killed. Make sure de_thread() or
+	 * our sub-thread doing do_wait() didn't do release_task() yet.
+	 */
+	detach = tracee->ptrace != 0;
+	release = false;
+	if (likely(detach))
+		release = __ptrace_detach(current, tracee);
+	write_unlock_irq(&tasklist_lock);
+
+	if (unlikely(release))
+		release_task(tracee);
+	else if (likely(detach))
+		ptrace_detach_task(tracee, data);
+}
+
+int ptrace_detach(struct task_struct *child, unsigned int data)
+{
+	if (!valid_signal(data))
+		return -EIO;
+
+	ptrace_do_detach(child, data);
+
+	return 0;
+}
+
+/*
+ * Detach all tasks we were using ptrace on.
+ */
+void exit_ptrace(struct task_struct *tracer)
+{
+	for (;;) {
+		struct task_struct *tracee = NULL;
+
+		read_lock(&tasklist_lock);
+		if (!list_empty(&tracer->ptraced)) {
+			tracee = list_first_entry(&tracer->ptraced,
+					struct task_struct, ptrace_entry);
+			get_task_struct(tracee);
+		}
+		read_unlock(&tasklist_lock);
+		if (!tracee)
+			break;
+
+		ptrace_do_detach(tracee, -1);
+		put_task_struct(tracee);
+	}
+}
+
+static int ptrace_set_options(struct task_struct *tracee,
+				struct utrace_engine *engine, long data)
+{
+	BUILD_BUG_ON(PTRACE_O_MASK & PTRACE_O_SYSEMU);
+
+	ptrace_set_events(tracee, engine, data & PTRACE_O_MASK);
+	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
+}
+
+static int ptrace_rw_siginfo(struct task_struct *tracee,
+				struct ptrace_context *ctx,
+				siginfo_t *info, bool write)
+{
+	unsigned long flags;
+	int err;
+
+	switch (get_stop_event(ctx)) {
+	case 0: /* jctl stop */
+		return -EINVAL;
+
+	case PTRACE_EVENT_SIGNAL:
+		err = -ESRCH;
+		if (lock_task_sighand(tracee, &flags)) {
+			if (likely(task_is_traced(tracee))) {
+				if (write)
+					*ctx->siginfo = *info;
+				else
+					*info = *ctx->siginfo;
+				err = 0;
+			}
+			unlock_task_sighand(tracee, &flags);
+		}
+
+		return err;
+
+	default:
+		if (!write) {
+			memset(info, 0, sizeof(*info));
+			info->si_signo = SIGTRAP;
+			info->si_code = ctx->stop_code & PTRACE_EVENT_MASK;
+			info->si_pid = task_pid_vnr(tracee);
+			info->si_uid = task_uid(tracee);
+		}
+
+		return 0;
+	}
+}
+
+static void do_ptrace_notify_stop(struct ptrace_context *ctx,
+					struct task_struct *tracee)
+{
+	/*
+	 * This can race with SIGKILL, but we borrow this race from
+	 * the old ptrace implementation. ->exit_code is only needed
+	 * for wait_task_stopped()->task_stopped_code(), we should
+	 * change it to use ptrace_context.
+	 */
+	tracee->exit_code = ctx->stop_code & PTRACE_EVENT_MASK;
+	WARN_ON(!tracee->exit_code);
+
+	read_lock(&tasklist_lock);
+	/*
+	 * Don't want to allow preemption here, because
+	 * sys_ptrace() needs this task to be inactive.
+	 */
+	preempt_disable();
+	/*
+	 * It can be killed and then released by our subthread,
+	 * or ptrace_attach() has not completed yet.
+	 */
+	if (task_ptrace(tracee))
+		do_notify_parent_cldstop(tracee, CLD_TRAPPED);
+	read_unlock(&tasklist_lock);
+	preempt_enable_no_resched();
+}
+
+void ptrace_notify_stop(struct task_struct *tracee)
+{
+	struct utrace_engine *engine = ptrace_lookup_engine(tracee);
+
+	if (IS_ERR(engine))
+		return;
+
+	do_ptrace_notify_stop(ptrace_context(engine), tracee);
+	utrace_engine_put(engine);
+}
+
+static int ptrace_resume_action(struct task_struct *tracee,
+				struct utrace_engine *engine, long request)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+	unsigned long events;
+	int action;
+
+	ctx->options &= ~PTRACE_O_SYSEMU;
+	events = engine->flags & ~UTRACE_EVENT_SYSCALL;
+	action = UTRACE_RESUME;
+
+	switch (request) {
+#ifdef PTRACE_SINGLEBLOCK
+	case PTRACE_SINGLEBLOCK:
+		if (unlikely(!arch_has_block_step()))
+			return -EIO;
+		action = UTRACE_BLOCKSTEP;
+		events |= UTRACE_EVENT(SYSCALL_EXIT);
+		break;
+#endif
+
+#ifdef PTRACE_SINGLESTEP
+	case PTRACE_SINGLESTEP:
+		if (unlikely(!arch_has_single_step()))
+			return -EIO;
+		action = UTRACE_SINGLESTEP;
+		events |= UTRACE_EVENT(SYSCALL_EXIT);
+		break;
+#endif
+
+#ifdef PTRACE_SYSEMU
+	case PTRACE_SYSEMU_SINGLESTEP:
+		if (unlikely(!arch_has_single_step()))
+			return -EIO;
+		action = UTRACE_SINGLESTEP;
+	case PTRACE_SYSEMU:
+		ctx->options |= PTRACE_O_SYSEMU;
+		events |= UTRACE_EVENT(SYSCALL_ENTRY);
+		break;
+#endif
+
+	case PTRACE_SYSCALL:
+		events |= UTRACE_EVENT_SYSCALL;
+		break;
+
+	case PTRACE_CONT:
+		break;
+	default:
+		return -EIO;
+	}
+
+	if (events != engine->flags &&
+	    utrace_set_events(tracee, engine, events))
+		return -ESRCH;
+
+	return action;
+}
+
+static int ptrace_resume(struct task_struct *tracee,
+				struct utrace_engine *engine,
+				long request, long data)
+{
+	struct ptrace_context *ctx = ptrace_context(engine);
+	int action;
+
+	if (!valid_signal(data))
+		return -EIO;
+
+	action = ptrace_resume_action(tracee, engine, request);
+	if (action < 0)
+		return action;
+
+	switch (get_stop_event(ctx)) {
+	case PTRACE_EVENT_VFORK:
+		if (ctx->options & PTRACE_O_TRACEVFORKDONE) {
+			set_stop_code(ctx, PTRACE_EVENT_VFORK_DONE);
+			action = UTRACE_REPORT;
+		}
+		break;
+
+	case PTRACE_EVENT_EXEC:
+	case PTRACE_EVENT_FORK:
+	case PTRACE_EVENT_CLONE:
+	case PTRACE_EVENT_VFORK_DONE:
+		if (request == PTRACE_SYSCALL) {
+			set_syscall_code(ctx);
+			do_ptrace_notify_stop(ctx, tracee);
+			return 0;
+		}
+
+		if (action != UTRACE_RESUME) {
+			/*
+			 * single-stepping. UTRACE_SIGNAL_REPORT will
+			 * synthesize a trap to follow the syscall insn.
+			*/
+			ctx->signr = SIGTRAP;
+			action = UTRACE_INTERRUPT;
+		}
+		break;
+
+	case PTRACE_EVENT_SYSCALL:
+		if (data)
+			send_sig_info(data, SEND_SIG_PRIV, tracee);
+		break;
+
+	case PTRACE_EVENT_SIGNAL:
+		ctx->signr = data;
+		break;
+	}
+
+	ctx->resume = action;
+	ptrace_wake_up(tracee, engine, action, true);
+	return 0;
+}
+
+int ptrace_request(struct task_struct *child, long request,
+		   long addr, long data)
+{
+	struct utrace_engine *engine = ptrace_lookup_engine(child);
+	siginfo_t siginfo;
+	int ret;
+
+	if (unlikely(IS_ERR(engine)))
+		return -ESRCH;
+
+	switch (request) {
+	case PTRACE_PEEKTEXT:
+	case PTRACE_PEEKDATA:
+		ret = generic_ptrace_peekdata(child, addr, data);
+		break;
+	case PTRACE_POKETEXT:
+	case PTRACE_POKEDATA:
+		ret = generic_ptrace_pokedata(child, addr, data);
+		break;
+
+#ifdef PTRACE_OLDSETOPTIONS
+	case PTRACE_OLDSETOPTIONS:
+#endif
+	case PTRACE_SETOPTIONS:
+		ret = ptrace_set_options(child, engine, data);
+		break;
+	case PTRACE_GETEVENTMSG:
+		ret = put_user(ptrace_context(engine)->eventmsg,
+				(unsigned long __user *) data);
+		break;
+
+	case PTRACE_GETSIGINFO:
+		ret = ptrace_rw_siginfo(child, ptrace_context(engine),
+					&siginfo, false);
+		if (!ret)
+			ret = copy_siginfo_to_user((siginfo_t __user *) data,
+						   &siginfo);
+		break;
+
+	case PTRACE_SETSIGINFO:
+		if (copy_from_user(&siginfo, (siginfo_t __user *) data,
+				   sizeof siginfo))
+			ret = -EFAULT;
+		else
+			ret = ptrace_rw_siginfo(child, ptrace_context(engine),
+						&siginfo, true);
+		break;
+
+	case PTRACE_DETACH:	 /* detach a process that was attached. */
+		ret = ptrace_detach(child, data);
+		break;
+
+	case PTRACE_KILL:
+		/* Ugly historical behaviour. */
+		if (task_is_traced(child))
+			ptrace_resume(child, engine, PTRACE_CONT, SIGKILL);
+		ret = 0;
+		break;
+
+	default:
+		ret = ptrace_resume(child, engine, request, data);
+		break;
+	}
+
+	utrace_engine_put(engine);
+	return ret;
+}
+
+#if defined CONFIG_COMPAT
+#include <linux/compat.h>
+
+int compat_ptrace_request(struct task_struct *child, compat_long_t request,
+			  compat_ulong_t addr, compat_ulong_t data)
+{
+	struct utrace_engine *engine = ptrace_lookup_engine(child);
+	compat_ulong_t __user *datap = compat_ptr(data);
+	compat_ulong_t word;
+	siginfo_t siginfo;
+	int ret;
+
+	if (unlikely(IS_ERR(engine)))
+		return -ESRCH;
+
+	switch (request) {
+	case PTRACE_PEEKTEXT:
+	case PTRACE_PEEKDATA:
+		ret = access_process_vm(child, addr, &word, sizeof(word), 0);
+		if (ret != sizeof(word))
+			ret = -EIO;
+		else
+			ret = put_user(word, datap);
+		break;
+
+	case PTRACE_POKETEXT:
+	case PTRACE_POKEDATA:
+		ret = access_process_vm(child, addr, &data, sizeof(data), 1);
+		ret = (ret != sizeof(data) ? -EIO : 0);
+		break;
+
+	case PTRACE_GETEVENTMSG:
+		ret = put_user((compat_ulong_t)ptrace_context(engine)->eventmsg,
+				datap);
+		break;
+
+	case PTRACE_GETSIGINFO:
+		ret = ptrace_rw_siginfo(child, ptrace_context(engine),
+					&siginfo, false);
+		if (!ret)
+			ret = copy_siginfo_to_user32(
+				(struct compat_siginfo __user *) datap,
+				&siginfo);
+		break;
+
+	case PTRACE_SETSIGINFO:
+		memset(&siginfo, 0, sizeof siginfo);
+		if (copy_siginfo_from_user32(
+			    &siginfo, (struct compat_siginfo __user *) datap))
+			ret = -EFAULT;
+		else
+			ret = ptrace_rw_siginfo(child, ptrace_context(engine),
+						&siginfo, true);
+		break;
+
+	default:
+		ret = ptrace_request(child, request, addr, data);
+	}
+
+	utrace_engine_put(engine);
+	return ret;
+}
+#endif	/* CONFIG_COMPAT */
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index a408bf7..4e87441 100644  
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -16,7 +16,6 @@
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/ptrace.h>
-#include <linux/utrace.h>
 #include <linux/security.h>
 #include <linux/signal.h>
 #include <linux/audit.h>
@@ -24,7 +23,286 @@
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
 
+int __ptrace_may_access(struct task_struct *task, unsigned int mode)
+{
+	const struct cred *cred = current_cred(), *tcred;
+
+	/* 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;
+	rcu_read_lock();
+	tcred = __task_cred(task);
+	if ((cred->uid != tcred->euid ||
+	     cred->uid != tcred->suid ||
+	     cred->uid != tcred->uid  ||
+	     cred->gid != tcred->egid ||
+	     cred->gid != tcred->sgid ||
+	     cred->gid != tcred->gid) &&
+	    !capable(CAP_SYS_PTRACE)) {
+		rcu_read_unlock();
+		return -EPERM;
+	}
+	rcu_read_unlock();
+	smp_rmb();
+	if (task->mm)
+		dumpable = get_dumpable(task->mm);
+	if (!dumpable && !capable(CAP_SYS_PTRACE))
+		return -EPERM;
+
+	return security_ptrace_access_check(task, mode);
+}
+
+bool ptrace_may_access(struct task_struct *task, unsigned int mode)
+{
+	int err;
+	task_lock(task);
+	err = __ptrace_may_access(task, mode);
+	task_unlock(task);
+	return !err;
+}
+
+/*
+ * Called with irqs disabled, returns true if childs should reap themselves.
+ */
+static int ignoring_children(struct sighand_struct *sigh)
+{
+	int ret;
+	spin_lock(&sigh->siglock);
+	ret = (sigh->action[SIGCHLD-1].sa.sa_handler == SIG_IGN) ||
+	      (sigh->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT);
+	spin_unlock(&sigh->siglock);
+	return ret;
+}
+
+/*
+ * Called with tasklist_lock held for writing.
+ * Unlink a traced task, and clean it up if it was a traced zombie.
+ * Return true if it needs to be reaped with release_task().
+ * (We can't call release_task() here because we already hold tasklist_lock.)
+ *
+ * If it's a zombie, our attachedness prevented normal parent notification
+ * or self-reaping.  Do notification now if it would have happened earlier.
+ * If it should reap itself, return true.
+ *
+ * If it's our own child, there is no notification to do. But if our normal
+ * children self-reap, then this child was prevented by ptrace and we must
+ * reap it now, in that case we must also wake up sub-threads sleeping in
+ * do_wait().
+ */
+bool __ptrace_detach(struct task_struct *tracer, struct task_struct *p)
+{
+	__ptrace_unlink(p);
+
+	if (p->exit_state == EXIT_ZOMBIE) {
+		if (!task_detached(p) && thread_group_empty(p)) {
+			if (!same_thread_group(p->real_parent, tracer))
+				do_notify_parent(p, p->exit_signal);
+			else if (ignoring_children(tracer->sighand)) {
+				__wake_up_parent(p, tracer);
+				p->exit_signal = -1;
+			}
+		}
+		if (task_detached(p)) {
+			/* Mark it as in the process of being reaped. */
+			p->exit_state = EXIT_DEAD;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
+{
+	int copied = 0;
+
+	while (len > 0) {
+		char buf[128];
+		int this_len, retval;
+
+		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
+		retval = access_process_vm(tsk, src, buf, this_len, 0);
+		if (!retval) {
+			if (copied)
+				break;
+			return -EIO;
+		}
+		if (copy_to_user(dst, buf, retval))
+			return -EFAULT;
+		copied += retval;
+		src += retval;
+		dst += retval;
+		len -= retval;
+	}
+	return copied;
+}
+
+int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len)
+{
+	int copied = 0;
+
+	while (len > 0) {
+		char buf[128];
+		int this_len, retval;
+
+		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
+		if (copy_from_user(buf, src, this_len))
+			return -EFAULT;
+		retval = access_process_vm(tsk, dst, buf, this_len, 1);
+		if (!retval) {
+			if (copied)
+				break;
+			return -EIO;
+		}
+		copied += retval;
+		src += retval;
+		dst += retval;
+		len -= retval;
+	}
+	return copied;
+}
+
+static struct task_struct *ptrace_get_task_struct(pid_t pid)
+{
+	struct task_struct *child;
+
+	rcu_read_lock();
+	child = find_task_by_vpid(pid);
+	if (child)
+		get_task_struct(child);
+	rcu_read_unlock();
+
+	if (!child)
+		return ERR_PTR(-ESRCH);
+	return child;
+}
+
+#ifndef arch_ptrace_attach
+#define arch_ptrace_attach(child)	do { } while (0)
+#endif
 
+SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
+{
+	struct task_struct *child;
+	long ret;
+
+	/*
+	 * This lock_kernel fixes a subtle race with suid exec
+	 */
+	lock_kernel();
+	if (request == PTRACE_TRACEME) {
+		ret = ptrace_traceme();
+		if (!ret)
+			arch_ptrace_attach(current);
+		goto out;
+	}
+
+	child = ptrace_get_task_struct(pid);
+	if (IS_ERR(child)) {
+		ret = PTR_ERR(child);
+		goto out;
+	}
+
+	if (request == PTRACE_ATTACH) {
+		ret = ptrace_attach(child);
+		/*
+		 * Some architectures need to do book-keeping after
+		 * a ptrace attach.
+		 */
+		if (!ret)
+			arch_ptrace_attach(child);
+		goto out_put_task_struct;
+	}
+
+	ret = ptrace_check_attach(child, request == PTRACE_KILL);
+	if (ret < 0)
+		goto out_put_task_struct;
+
+	ret = arch_ptrace(child, request, addr, data);
+
+ out_put_task_struct:
+	put_task_struct(child);
+ out:
+	unlock_kernel();
+	return ret;
+}
+
+int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data)
+{
+	unsigned long tmp;
+	int copied;
+
+	copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
+	if (copied != sizeof(tmp))
+		return -EIO;
+	return put_user(tmp, (unsigned long __user *)data);
+}
+
+int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
+{
+	int copied;
+
+	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
+	return (copied == sizeof(data)) ? 0 : -EIO;
+}
+
+#if defined CONFIG_COMPAT
+#include <linux/compat.h>
+
+asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
+				  compat_long_t addr, compat_long_t data)
+{
+	struct task_struct *child;
+	long ret;
+
+	/*
+	 * This lock_kernel fixes a subtle race with suid exec
+	 */
+	lock_kernel();
+	if (request == PTRACE_TRACEME) {
+		ret = ptrace_traceme();
+		goto out;
+	}
+
+	child = ptrace_get_task_struct(pid);
+	if (IS_ERR(child)) {
+		ret = PTR_ERR(child);
+		goto out;
+	}
+
+	if (request == PTRACE_ATTACH) {
+		ret = ptrace_attach(child);
+		/*
+		 * Some architectures need to do book-keeping after
+		 * a ptrace attach.
+		 */
+		if (!ret)
+			arch_ptrace_attach(child);
+		goto out_put_task_struct;
+	}
+
+	ret = ptrace_check_attach(child, request == PTRACE_KILL);
+	if (!ret)
+		ret = compat_arch_ptrace(child, request, addr, data);
+
+ out_put_task_struct:
+	put_task_struct(child);
+ out:
+	unlock_kernel();
+	return ret;
+}
+#endif	/* CONFIG_COMPAT */
+
+#ifndef CONFIG_UTRACE
 /*
  * ptrace a task: make the debugger its new parent and
  * move it to the ptrace list.
@@ -101,76 +379,21 @@ int ptrace_check_attach(struct task_stru
 		/*
 		 * child->sighand can't be NULL, release_task()
 		 * does ptrace_unlink() before __exit_signal().
-		 */
-		spin_lock_irq(&child->sighand->siglock);
-		if (task_is_stopped(child))
-			child->state = TASK_TRACED;
-		else if (!task_is_traced(child) && !kill)
-			ret = -ESRCH;
-		spin_unlock_irq(&child->sighand->siglock);
-	}
-	read_unlock(&tasklist_lock);
-
-	if (!ret && !kill)
-		ret = wait_task_inactive(child, TASK_TRACED) ? 0 : -ESRCH;
-
-	/* All systems go.. */
-	return ret;
-}
-
-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
-{
-	const struct cred *cred = current_cred(), *tcred;
-
-	/* 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;
-	rcu_read_lock();
-	tcred = __task_cred(task);
-	if ((cred->uid != tcred->euid ||
-	     cred->uid != tcred->suid ||
-	     cred->uid != tcred->uid  ||
-	     cred->gid != tcred->egid ||
-	     cred->gid != tcred->sgid ||
-	     cred->gid != tcred->gid) &&
-	    !capable(CAP_SYS_PTRACE)) {
-		rcu_read_unlock();
-		return -EPERM;
-	}
-	rcu_read_unlock();
-	smp_rmb();
-	if (task->mm)
-		dumpable = get_dumpable(task->mm);
-	if (!dumpable && !capable(CAP_SYS_PTRACE))
-		return -EPERM;
-
-	return security_ptrace_access_check(task, mode);
-}
+		 */
+		spin_lock_irq(&child->sighand->siglock);
+		if (task_is_stopped(child))
+			child->state = TASK_TRACED;
+		else if (!task_is_traced(child) && !kill)
+			ret = -ESRCH;
+		spin_unlock_irq(&child->sighand->siglock);
+	}
+	read_unlock(&tasklist_lock);
 
-bool ptrace_may_access(struct task_struct *task, unsigned int mode)
-{
-	int err;
-	task_lock(task);
-	err = __ptrace_may_access(task, mode);
-	task_unlock(task);
-	return !err;
-}
+	if (!ret && !kill)
+		ret = wait_task_inactive(child, TASK_TRACED) ? 0 : -ESRCH;
 
-/*
- * For experimental use of utrace, exclude ptrace on the same task.
- */
-static inline bool exclude_ptrace(struct task_struct *task)
-{
-	return unlikely(!!task_utrace_flags(task));
+	/* All systems go.. */
+	return ret;
 }
 
 int ptrace_attach(struct task_struct *task)
@@ -196,8 +419,6 @@ int ptrace_attach(struct task_struct *ta
 
 	task_lock(task);
 	retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
-	if (!retval && exclude_ptrace(task))
-		retval = -EBUSY;
 	task_unlock(task);
 	if (retval)
 		goto unlock_creds;
@@ -235,9 +456,6 @@ int ptrace_traceme(void)
 {
 	int ret = -EPERM;
 
-	if (exclude_ptrace(current)) /* XXX locking */
-		return -EBUSY;
-
 	write_lock_irq(&tasklist_lock);
 	/* Are we already being traced? */
 	if (!current->ptrace) {
@@ -257,57 +475,6 @@ int ptrace_traceme(void)
 	return ret;
 }
 
-/*
- * Called with irqs disabled, returns true if childs should reap themselves.
- */
-static int ignoring_children(struct sighand_struct *sigh)
-{
-	int ret;
-	spin_lock(&sigh->siglock);
-	ret = (sigh->action[SIGCHLD-1].sa.sa_handler == SIG_IGN) ||
-	      (sigh->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT);
-	spin_unlock(&sigh->siglock);
-	return ret;
-}
-
-/*
- * Called with tasklist_lock held for writing.
- * Unlink a traced task, and clean it up if it was a traced zombie.
- * Return true if it needs to be reaped with release_task().
- * (We can't call release_task() here because we already hold tasklist_lock.)
- *
- * If it's a zombie, our attachedness prevented normal parent notification
- * or self-reaping.  Do notification now if it would have happened earlier.
- * If it should reap itself, return true.
- *
- * If it's our own child, there is no notification to do. But if our normal
- * children self-reap, then this child was prevented by ptrace and we must
- * reap it now, in that case we must also wake up sub-threads sleeping in
- * do_wait().
- */
-bool __ptrace_detach(struct task_struct *tracer, struct task_struct *p)
-{
-	__ptrace_unlink(p);
-
-	if (p->exit_state == EXIT_ZOMBIE) {
-		if (!task_detached(p) && thread_group_empty(p)) {
-			if (!same_thread_group(p->real_parent, tracer))
-				do_notify_parent(p, p->exit_signal);
-			else if (ignoring_children(tracer->sighand)) {
-				__wake_up_parent(p, tracer);
-				p->exit_signal = -1;
-			}
-		}
-		if (task_detached(p)) {
-			/* Mark it as in the process of being reaped. */
-			p->exit_state = EXIT_DEAD;
-			return true;
-		}
-	}
-
-	return false;
-}
-
 int ptrace_detach(struct task_struct *child, unsigned int data)
 {
 	bool dead = false;
@@ -361,56 +528,6 @@ void exit_ptrace(struct task_struct *tra
 	}
 }
 
-int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
-{
-	int copied = 0;
-
-	while (len > 0) {
-		char buf[128];
-		int this_len, retval;
-
-		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
-		retval = access_process_vm(tsk, src, buf, this_len, 0);
-		if (!retval) {
-			if (copied)
-				break;
-			return -EIO;
-		}
-		if (copy_to_user(dst, buf, retval))
-			return -EFAULT;
-		copied += retval;
-		src += retval;
-		dst += retval;
-		len -= retval;
-	}
-	return copied;
-}
-
-int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len)
-{
-	int copied = 0;
-
-	while (len > 0) {
-		char buf[128];
-		int this_len, retval;
-
-		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
-		if (copy_from_user(buf, src, this_len))
-			return -EFAULT;
-		retval = access_process_vm(tsk, dst, buf, this_len, 1);
-		if (!retval) {
-			if (copied)
-				break;
-			return -EIO;
-		}
-		copied += retval;
-		src += retval;
-		dst += retval;
-		len -= retval;
-	}
-	return copied;
-}
-
 static int ptrace_setoptions(struct task_struct *child, long data)
 {
 	child->ptrace &= ~PT_TRACE_MASK;
@@ -594,93 +710,7 @@ int ptrace_request(struct task_struct *c
 	return ret;
 }
 
-static struct task_struct *ptrace_get_task_struct(pid_t pid)
-{
-	struct task_struct *child;
-
-	rcu_read_lock();
-	child = find_task_by_vpid(pid);
-	if (child)
-		get_task_struct(child);
-	rcu_read_unlock();
-
-	if (!child)
-		return ERR_PTR(-ESRCH);
-	return child;
-}
-
-#ifndef arch_ptrace_attach
-#define arch_ptrace_attach(child)	do { } while (0)
-#endif
-
-SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
-{
-	struct task_struct *child;
-	long ret;
-
-	/*
-	 * This lock_kernel fixes a subtle race with suid exec
-	 */
-	lock_kernel();
-	if (request == PTRACE_TRACEME) {
-		ret = ptrace_traceme();
-		if (!ret)
-			arch_ptrace_attach(current);
-		goto out;
-	}
-
-	child = ptrace_get_task_struct(pid);
-	if (IS_ERR(child)) {
-		ret = PTR_ERR(child);
-		goto out;
-	}
-
-	if (request == PTRACE_ATTACH) {
-		ret = ptrace_attach(child);
-		/*
-		 * Some architectures need to do book-keeping after
-		 * a ptrace attach.
-		 */
-		if (!ret)
-			arch_ptrace_attach(child);
-		goto out_put_task_struct;
-	}
-
-	ret = ptrace_check_attach(child, request == PTRACE_KILL);
-	if (ret < 0)
-		goto out_put_task_struct;
-
-	ret = arch_ptrace(child, request, addr, data);
-
- out_put_task_struct:
-	put_task_struct(child);
- out:
-	unlock_kernel();
-	return ret;
-}
-
-int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data)
-{
-	unsigned long tmp;
-	int copied;
-
-	copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
-	if (copied != sizeof(tmp))
-		return -EIO;
-	return put_user(tmp, (unsigned long __user *)data);
-}
-
-int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
-{
-	int copied;
-
-	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
-	return (copied == sizeof(data)) ? 0 : -EIO;
-}
-
 #if defined CONFIG_COMPAT
-#include <linux/compat.h>
-
 int compat_ptrace_request(struct task_struct *child, compat_long_t request,
 			  compat_ulong_t addr, compat_ulong_t data)
 {
@@ -732,47 +762,5 @@ int compat_ptrace_request(struct task_st
 
 	return ret;
 }
-
-asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
-				  compat_long_t addr, compat_long_t data)
-{
-	struct task_struct *child;
-	long ret;
-
-	/*
-	 * This lock_kernel fixes a subtle race with suid exec
-	 */
-	lock_kernel();
-	if (request == PTRACE_TRACEME) {
-		ret = ptrace_traceme();
-		goto out;
-	}
-
-	child = ptrace_get_task_struct(pid);
-	if (IS_ERR(child)) {
-		ret = PTR_ERR(child);
-		goto out;
-	}
-
-	if (request == PTRACE_ATTACH) {
-		ret = ptrace_attach(child);
-		/*
-		 * Some architectures need to do book-keeping after
-		 * a ptrace attach.
-		 */
-		if (!ret)
-			arch_ptrace_attach(child);
-		goto out_put_task_struct;
-	}
-
-	ret = ptrace_check_attach(child, request == PTRACE_KILL);
-	if (!ret)
-		ret = compat_arch_ptrace(child, request, addr, data);
-
- out_put_task_struct:
-	put_task_struct(child);
- out:
-	unlock_kernel();
-	return ret;
-}
 #endif	/* CONFIG_COMPAT */
+#endif	/* CONFIG_UTRACE */
diff --git a/kernel/utrace.c b/kernel/utrace.c
index cb62fcd..9353cc5 100644  
--- a/kernel/utrace.c
+++ b/kernel/utrace.c
@@ -811,6 +811,22 @@ relock:
 	spin_unlock_irq(&task->sighand->siglock);
 	spin_unlock(&utrace->lock);
 
+	/*
+	 * If ptrace is among the reasons for this stop, do its
+	 * notification now.  This could not just be done in
+	 * ptrace's own event report callbacks because it has to
+	 * be done after we are in TASK_TRACED.  This makes the
+	 * synchronization with ptrace_do_wait() work right.
+	 *
+	 * It's only because of the bad old overloading of the do_wait()
+	 * logic for handling ptrace stops that we need this special case
+	 * here.  One day we will clean up ptrace so it does not need to
+	 * work this way.  New things that are designed sensibly don't need
+	 * a wakeup that synchronizes with tasklist_lock and ->state, so
+	 * the proper utrace API does not try to support this weirdness.
+	 */
+	ptrace_notify_stop(task);
+
 	schedule();
 
 	utrace_finish_stop();


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1872
retrieving revision 1.1873
diff -u -p -r1.1872 -r1.1873
--- kernel.spec	14 Dec 2009 20:16:53 -0000	1.1872
+++ kernel.spec	16 Dec 2009 22:09:41 -0000	1.1873
@@ -617,6 +617,7 @@ Patch20: linux-2.6-hotfixes.patch
 
 Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
+Patch23: linux-2.6-utrace-ptrace.patch
 
 # More workaround for BIOS brokenness, fix intel_iommu=igfx_off oops
 Patch100: linux-2.6-iommu-updates.patch
@@ -1147,8 +1148,9 @@ ApplyOptionalPatch linux-2.6-upstream-re
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
-#ApplyPatch linux-2.6-tracehook.patch # merged
+ApplyPatch linux-2.6-tracehook.patch
 ApplyPatch linux-2.6-utrace.patch
+ApplyPatch linux-2.6-utrace-ptrace.patch
 
 # Architecture patches
 # x86(-64)
@@ -2001,6 +2003,9 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 16 2009 Roland McGrath <roland at redhat.com> 2.6.32.1-10
+- utrace update, now testing the utrace-based ptrace!
+
 * Mon Dec 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.1-9
 - 2.6.32.1
 - ext4 patches and more...
@@ -2064,7 +2069,7 @@ fi
   +CONFIG_SLOW_WORK_PROC=y
 
 * Mon Nov 30 2009 Kyle McMartin <kyle at redhat.com>
-- drm-i915-fix-sync-to-vbl-when-vga-is-off.patch: add, (rhbz#541670) 
+- drm-i915-fix-sync-to-vbl-when-vga-is-off.patch: add, (rhbz#541670)
 
 * Sun Nov 29 2009 Kyle McMartin <kyle at redhat.com>
 - linux-2.6-sysrq-c.patch: drop, was made consistent upstream.

linux-2.6-tracehook.patch:
 arch/powerpc/include/asm/ptrace.h |    2 +
 arch/powerpc/kernel/traps.c       |    9 ++++++
 arch/x86/include/asm/ptrace.h     |    2 +
 arch/x86/kernel/ptrace.c          |   51 ++++++++++++++++++++------------------
 include/linux/ptrace.h            |   24 +++++++++++------
 include/linux/sched.h             |    1 
 include/linux/tracehook.h         |   15 ++++++++---
 kernel/ptrace.c                   |    2 -
 kernel/signal.c                   |   13 ++++-----
 9 files changed, 76 insertions(+), 43 deletions(-)

Index: linux-2.6-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- linux-2.6-tracehook.patch	8 Apr 2009 01:31:58 -0000	1.9
+++ linux-2.6-tracehook.patch	16 Dec 2009 22:09:41 -0000	1.10
@@ -1,194 +1,336 @@
-signals: tracehook_notify_jctl change
+From: Oleg Nesterov <oleg at redhat.com>
 
-This changes tracehook_notify_jctl() so it's called with the siglock held,
-and changes its argument and return value definition.  These clean-ups make
-it a better fit for what new tracing hooks need to check.
+[PATCH] signals: check ->group_stop_count after tracehook_get_signal()
 
-Tracing needs the siglock here, held from the time TASK_STOPPED was set,
-to avoid potential SIGCONT races if it wants to allow any blocking in its
-tracing hooks.
+Move the call to do_signal_stop() down, after tracehook call.
+This makes ->group_stop_count condition visible to tracers before
+do_signal_stop() will participate in this group-stop.
 
-This also folds the finish_stop() function into its caller do_signal_stop().
-The function is short, called only once and only unconditionally.  It aids
-readability to fold it in.
+Currently the patch has no effect, tracehook_get_signal() always
+returns 0.
 
+Signed-off-by: Oleg Nesterov <oleg at redhat.com>
 Signed-off-by: Roland McGrath <roland at redhat.com>
 ---
- include/linux/tracehook.h |   25 ++++++++++------
- kernel/signal.c           |   69 +++++++++++++++++++++++----------------------
- 2 files changed, 51 insertions(+), 43 deletions(-)
+ arch/powerpc/include/asm/ptrace.h |    2 +
+ arch/powerpc/kernel/traps.c       |    9 ++++++
+ arch/x86/include/asm/ptrace.h     |    2 +
+ arch/x86/kernel/ptrace.c          |   51 ++++++++++++++++++++----------------
+ include/linux/ptrace.h            |   24 +++++++++++------
+ include/linux/sched.h             |    1 +
+ include/linux/tracehook.h         |   15 ++++++++---
+ kernel/ptrace.c                   |    2 +-
+ kernel/signal.c                   |   13 ++++-----
+ 9 files changed, 76 insertions(+), 43 deletions(-)
 
-diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index c7aa154..4ec4821 100644  
---- a/include/linux/tracehook.h
-+++ b/include/linux/tracehook.h
-@@ -1,7 +1,7 @@
- /*
-  * Tracing hooks
-  *
-- * Copyright (C) 2008 Red Hat, Inc.  All rights reserved.
-+ * Copyright (C) 2008-2009 Red Hat, Inc.  All rights reserved.
-  *
-  * This copyrighted material is made available to anyone wishing to use,
-  * modify, copy, or redistribute it subject to the terms and conditions
-@@ -464,22 +464,29 @@ static inline int tracehook_get_signal(s
+diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
+index 8c34149..cbd759e 100644  
+--- a/arch/powerpc/include/asm/ptrace.h
++++ b/arch/powerpc/include/asm/ptrace.h
+@@ -140,6 +140,8 @@ extern void user_enable_single_step(stru
+ extern void user_enable_block_step(struct task_struct *);
+ extern void user_disable_single_step(struct task_struct *);
  
- /**
-  * tracehook_notify_jctl - report about job control stop/continue
-- * @notify:		nonzero if this is the last thread in the group to stop
-+ * @notify:		zero, %CLD_STOPPED or %CLD_CONTINUED
-  * @why:		%CLD_STOPPED or %CLD_CONTINUED
-  *
-  * This is called when we might call do_notify_parent_cldstop().
-- * It's called when about to stop for job control; we are already in
-- * %TASK_STOPPED state, about to call schedule().  It's also called when
-- * a delayed %CLD_STOPPED or %CLD_CONTINUED report is ready to be made.
-  *
-- * Return nonzero to generate a %SIGCHLD with @why, which is
-- * normal if @notify is nonzero.
-+ * @notify is zero if we would not ordinarily send a %SIGCHLD,
-+ * or is the %CLD_STOPPED or %CLD_CONTINUED .si_code for %SIGCHLD.
-  *
-- * Called with no locks held.
-+ * @why is %CLD_STOPPED when about to stop for job control;
-+ * we are already in %TASK_STOPPED state, about to call schedule().
-+ * It might also be that we have just exited (check %PF_EXITING),
-+ * but need to report that a group-wide stop is complete.
-+ *
-+ * @why is %CLD_CONTINUED when waking up after job control stop and
-+ * ready to make a delayed @notify report.
-+ *
-+ * Return the %CLD_* value for %SIGCHLD, or zero to generate no signal.
-+ *
-+ * Called with the siglock held.
-  */
- static inline int tracehook_notify_jctl(int notify, int why)
++#define ARCH_HAS_USER_SINGLE_STEP_INFO
++
+ #endif /* __ASSEMBLY__ */
+ 
+ #endif /* __KERNEL__ */
+diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
+index 6f0ae1a..83b57ac 100644  
+--- a/arch/powerpc/kernel/traps.c
++++ b/arch/powerpc/kernel/traps.c
+@@ -174,6 +174,15 @@ int die(const char *str, struct pt_regs 
+ 	return 0;
+ }
+ 
++void user_single_step_siginfo(struct task_struct *tsk,
++				struct pt_regs *regs, siginfo_t *info)
++{
++	memset(info, 0, sizeof(*info));
++	info->si_signo = SIGTRAP;
++	info->si_code = TRAP_TRACE;
++	info->si_addr = (void __user *)regs->nip;
++}
++
+ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
  {
--	return notify || (current->ptrace & PT_PTRACED);
-+	return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
+ 	siginfo_t info;
+diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
+index 0f0d908..7a88a82 100644  
+--- a/arch/x86/include/asm/ptrace.h
++++ b/arch/x86/include/asm/ptrace.h
+@@ -230,6 +230,8 @@ extern void user_enable_block_step(struc
+ #define arch_has_block_step()	(boot_cpu_data.x86 >= 6)
+ #endif
+ 
++#define ARCH_HAS_USER_SINGLE_STEP_INFO
++
+ struct user_desc;
+ extern int do_get_thread_area(struct task_struct *p, int idx,
+ 			      struct user_desc __user *info);
+diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
+index 7b058a2..ea35dee 100644  
+--- a/arch/x86/kernel/ptrace.c
++++ b/arch/x86/kernel/ptrace.c
+@@ -1437,21 +1437,33 @@ const struct user_regset_view *task_user
+ #endif
  }
  
- #define DEATH_REAP			-1
-diff --git a/kernel/signal.c b/kernel/signal.c
-index d803473..424eff2 100644  
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -702,7 +702,7 @@ static int prepare_signal(int sig, struc
+-void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
+-					 int error_code, int si_code)
++static void fill_sigtrap_info(struct task_struct *tsk,
++				struct pt_regs *regs,
++				int error_code, int si_code,
++				struct siginfo *info)
+ {
+-	struct siginfo info;
+-
+ 	tsk->thread.trap_no = 1;
+ 	tsk->thread.error_code = error_code;
  
- 		if (why) {
- 			/*
--			 * The first thread which returns from finish_stop()
-+			 * The first thread which returns from do_signal_stop()
- 			 * will take ->siglock, notice SIGNAL_CLD_MASK, and
- 			 * notify its parent. See get_signal_to_deliver().
- 			 */
-@@ -1665,29 +1665,6 @@ void ptrace_notify(int exit_code)
- 	spin_unlock_irq(&current->sighand->siglock);
+-	memset(&info, 0, sizeof(info));
+-	info.si_signo = SIGTRAP;
+-	info.si_code = si_code;
++	memset(info, 0, sizeof(*info));
++	info->si_signo = SIGTRAP;
++	info->si_code = si_code;
++	info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
++}
+ 
+-	/* User-mode ip? */
+-	info.si_addr = user_mode_vm(regs) ? (void __user *) regs->ip : NULL;
++void user_single_step_siginfo(struct task_struct *tsk,
++				struct pt_regs *regs,
++				struct siginfo *info)
++{
++	fill_sigtrap_info(tsk, regs, 0, TRAP_BRKPT, info);
++}
++
++void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
++					 int error_code, int si_code)
++{
++	struct siginfo info;
+ 
++	fill_sigtrap_info(tsk, regs, error_code, si_code, &info);
+ 	/* Send us the fake SIGTRAP */
+ 	force_sig_info(SIGTRAP, &info, tsk);
  }
+@@ -1516,29 +1528,22 @@ asmregparm long syscall_trace_enter(stru
  
--static void
--finish_stop(int stop_count)
--{
--	/*
--	 * If there are no other threads in the group, or if there is
--	 * a group stop in progress and we are the last to stop,
--	 * report to the parent.  When ptraced, every thread reports itself.
+ asmregparm void syscall_trace_leave(struct pt_regs *regs)
+ {
++	bool step;
++
+ 	if (unlikely(current->audit_context))
+ 		audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
+ 
+ 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
+ 		trace_sys_exit(regs, regs->ax);
+ 
+-	if (test_thread_flag(TIF_SYSCALL_TRACE))
+-		tracehook_report_syscall_exit(regs, 0);
+-
+ 	/*
+ 	 * If TIF_SYSCALL_EMU is set, we only get here because of
+ 	 * TIF_SINGLESTEP (i.e. this is PTRACE_SYSEMU_SINGLESTEP).
+ 	 * We already reported this syscall instruction in
+-	 * syscall_trace_enter(), so don't do any more now.
 -	 */
--	if (tracehook_notify_jctl(stop_count == 0, CLD_STOPPED)) {
--		read_lock(&tasklist_lock);
--		do_notify_parent_cldstop(current, CLD_STOPPED);
--		read_unlock(&tasklist_lock);
--	}
+-	if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))
+-		return;
 -
--	do {
--		schedule();
--	} while (try_to_freeze());
 -	/*
--	 * Now we don't run again until continued.
--	 */
--	current->exit_code = 0;
+-	 * If we are single-stepping, synthesize a trap to follow the
+-	 * system call instruction.
++	 * syscall_trace_enter().
+ 	 */
+-	if (test_thread_flag(TIF_SINGLESTEP) &&
+-	    tracehook_consider_fatal_signal(current, SIGTRAP))
+-		send_sigtrap(current, regs, 0, TRAP_BRKPT);
++	step = unlikely(test_thread_flag(TIF_SINGLESTEP)) &&
++			!test_thread_flag(TIF_SYSCALL_EMU);
++	if (step || test_thread_flag(TIF_SYSCALL_TRACE))
++		tracehook_report_syscall_exit(regs, step);
+ }
+diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
+index 7456d7d..4802e2a 100644  
+--- a/include/linux/ptrace.h
++++ b/include/linux/ptrace.h
+@@ -85,6 +85,7 @@ extern int ptrace_traceme(void);
+ extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
+ extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len);
+ extern int ptrace_attach(struct task_struct *tsk);
++extern bool __ptrace_detach(struct task_struct *tracer, struct task_struct *tracee);
+ extern int ptrace_detach(struct task_struct *, unsigned int);
+ extern void ptrace_disable(struct task_struct *);
+ extern int ptrace_check_attach(struct task_struct *task, int kill);
+@@ -105,12 +106,7 @@ static inline int ptrace_reparented(stru
+ {
+ 	return child->real_parent != child->parent;
+ }
+-static inline void ptrace_link(struct task_struct *child,
+-			       struct task_struct *new_parent)
+-{
+-	if (unlikely(child->ptrace))
+-		__ptrace_link(child, new_parent);
 -}
--
- /*
-  * This performs the stopping for SIGSTOP and other stop signals.
-  * We have to stop all threads in the thread group.
-@@ -1698,6 +1675,7 @@ static int do_signal_stop(int signr)
- {
- 	struct signal_struct *sig = current->signal;
- 	int stop_count;
-+	int notify;
++
+ static inline void ptrace_unlink(struct task_struct *child)
+ {
+ 	if (unlikely(child->ptrace))
+@@ -169,9 +165,9 @@ static inline void ptrace_init_task(stru
+ 	INIT_LIST_HEAD(&child->ptraced);
+ 	child->parent = child->real_parent;
+ 	child->ptrace = 0;
+-	if (unlikely(ptrace)) {
++	if (unlikely(ptrace) && (current->ptrace & PT_PTRACED)) {
+ 		child->ptrace = current->ptrace;
+-		ptrace_link(child, current->parent);
++		__ptrace_link(child, current->parent);
+ 	}
+ }
  
- 	if (sig->group_stop_count > 0) {
- 		/*
-@@ -1737,8 +1715,30 @@ static int do_signal_stop(int signr)
- 	current->exit_code = sig->group_exit_code;
- 	__set_current_state(TASK_STOPPED);
- 
-+	/*
-+	 * If there are no other threads in the group, or if there is
-+	 * a group stop in progress and we are the last to stop,
-+	 * report to the parent.  When ptraced, every thread reports itself.
-+	 */
-+	notify = tracehook_notify_jctl(stop_count == 0 ? CLD_STOPPED : 0,
-+				       CLD_STOPPED);
-+
- 	spin_unlock_irq(&current->sighand->siglock);
--	finish_stop(stop_count);
-+
-+	if (notify) {
-+		read_lock(&tasklist_lock);
-+		do_notify_parent_cldstop(current, notify);
-+		read_unlock(&tasklist_lock);
+@@ -278,6 +274,18 @@ static inline void user_enable_block_ste
+ }
+ #endif	/* arch_has_block_step */
+ 
++#ifdef ARCH_HAS_USER_SINGLE_STEP_INFO
++extern void user_single_step_siginfo(struct task_struct *tsk,
++				struct pt_regs *regs, siginfo_t *info);
++#else
++static inline void user_single_step_siginfo(struct task_struct *tsk,
++				struct pt_regs *regs, siginfo_t *info)
++{
++	memset(info, 0, sizeof(*info));
++	info->si_signo = SIGTRAP;
++}
++#endif
++
+ #ifndef arch_ptrace_stop_needed
+ /**
+  * arch_ptrace_stop_needed - Decide whether arch_ptrace_stop() should be called
+diff --git a/include/linux/sched.h b/include/linux/sched.h
+index 75e6e60..6c8928b 100644  
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -2060,6 +2060,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 int do_notify_parent(struct task_struct *, int);
++extern void do_notify_parent_cldstop(struct task_struct *, int);
+ extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent);
+ extern void force_sig(int, struct task_struct *);
+ extern void force_sig_specific(int, struct task_struct *);
+diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
+index 1eb44a9..c78b2f4 100644  
+--- a/include/linux/tracehook.h
++++ b/include/linux/tracehook.h
+@@ -134,6 +134,13 @@ static inline __must_check int tracehook
+  */
+ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
+ {
++	if (step && (task_ptrace(current) & PT_PTRACED)) {
++		siginfo_t info;
++		user_single_step_siginfo(current, regs, &info);
++		force_sig_info(SIGTRAP, &info, current);
++		return;
 +	}
 +
-+	do {
-+		schedule();
-+	} while (try_to_freeze());
-+	/*
-+	 * Now we don't run again until continued.
-+	 */
-+	current->exit_code = 0;
-+
- 	return 1;
- }
- 
-@@ -1807,14 +1807,15 @@ relock:
- 		int why = (signal->flags & SIGNAL_STOP_CONTINUED)
- 				? CLD_CONTINUED : CLD_STOPPED;
- 		signal->flags &= ~SIGNAL_CLD_MASK;
--		spin_unlock_irq(&sighand->siglock);
+ 	ptrace_report_syscall(regs);
+ }
  
--		if (unlikely(!tracehook_notify_jctl(1, why)))
--			goto relock;
-+		why = tracehook_notify_jctl(why, CLD_CONTINUED);
-+		spin_unlock_irq(&sighand->siglock);
+@@ -149,7 +156,7 @@ static inline int tracehook_unsafe_exec(
+ {
+ 	int unsafe = 0;
+ 	int ptrace = task_ptrace(task);
+-	if (ptrace & PT_PTRACED) {
++	if (ptrace) {
+ 		if (ptrace & PT_PTRACE_CAP)
+ 			unsafe |= LSM_UNSAFE_PTRACE_CAP;
+ 		else
+@@ -171,7 +178,7 @@ static inline int tracehook_unsafe_exec(
+  */
+ static inline struct task_struct *tracehook_tracer_task(struct task_struct *tsk)
+ {
+-	if (task_ptrace(tsk) & PT_PTRACED)
++	if (task_ptrace(tsk))
+ 		return rcu_dereference(tsk->parent);
+ 	return NULL;
+ }
+@@ -379,7 +386,7 @@ static inline void tracehook_signal_hand
+ 					    const struct k_sigaction *ka,
+ 					    struct pt_regs *regs, int stepping)
+ {
+-	if (stepping)
++	if (stepping && (task_ptrace(current) & PT_PTRACED))
+ 		ptrace_notify(SIGTRAP);
+ }
  
--		read_lock(&tasklist_lock);
--		do_notify_parent_cldstop(current->group_leader, why);
--		read_unlock(&tasklist_lock);
-+		if (why) {
-+			read_lock(&tasklist_lock);
-+			do_notify_parent_cldstop(current->group_leader, why);
-+			read_unlock(&tasklist_lock);
-+		}
- 		goto relock;
- 	}
+@@ -485,7 +492,7 @@ static inline int tracehook_get_signal(s
+  */
+ static inline int tracehook_notify_jctl(int notify, int why)
+ {
+-	return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
++	return notify ?: task_ptrace(current) ? why : 0;
+ }
  
-@@ -1979,14 +1980,14 @@ void exit_signals(struct task_struct *ts
- 	if (unlikely(tsk->signal->group_stop_count) &&
- 			!--tsk->signal->group_stop_count) {
- 		tsk->signal->flags = SIGNAL_STOP_STOPPED;
--		group_stop = 1;
-+		group_stop = tracehook_notify_jctl(CLD_STOPPED, CLD_STOPPED);
- 	}
- out:
- 	spin_unlock_irq(&tsk->sighand->siglock);
+ /**
+diff --git a/kernel/ptrace.c b/kernel/ptrace.c
+index 23bd09c..b7c1d32 100644  
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
+@@ -271,7 +271,7 @@ static int ignoring_children(struct sigh
+  * reap it now, in that case we must also wake up sub-threads sleeping in
+  * do_wait().
+  */
+-static bool __ptrace_detach(struct task_struct *tracer, struct task_struct *p)
++bool __ptrace_detach(struct task_struct *tracer, struct task_struct *p)
+ {
+ 	__ptrace_unlink(p);
  
--	if (unlikely(group_stop) && tracehook_notify_jctl(1, CLD_STOPPED)) {
-+	if (unlikely(group_stop)) {
- 		read_lock(&tasklist_lock);
--		do_notify_parent_cldstop(tsk, CLD_STOPPED);
-+		do_notify_parent_cldstop(tsk, group_stop);
- 		read_unlock(&tasklist_lock);
- 	}
+diff --git a/kernel/signal.c b/kernel/signal.c
+index 6705320..9908335 100644  
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -1461,7 +1461,7 @@ int do_notify_parent(struct task_struct 
+ 	return ret;
  }
+ 
+-static void do_notify_parent_cldstop(struct task_struct *tsk, int why)
++void do_notify_parent_cldstop(struct task_struct *tsk, int why)
+ {
+ 	struct siginfo info;
+ 	unsigned long flags;
+@@ -1731,7 +1731,7 @@ static int do_signal_stop(int signr)
+ static int ptrace_signal(int signr, siginfo_t *info,
+ 			 struct pt_regs *regs, void *cookie)
+ {
+-	if (!task_ptrace(current))
++	if (!(task_ptrace(current) & PT_PTRACED))
+ 		return signr;
+ 
+ 	ptrace_signal_deliver(regs, cookie);
+@@ -1807,11 +1807,6 @@ relock:
+ 
+ 	for (;;) {
+ 		struct k_sigaction *ka;
+-
+-		if (unlikely(signal->group_stop_count > 0) &&
+-		    do_signal_stop(0))
+-			goto relock;
+-
+ 		/*
+ 		 * Tracing can induce an artifical signal and choose sigaction.
+ 		 * The return value in @signr determines the default action,
+@@ -1823,6 +1818,10 @@ relock:
+ 		if (unlikely(signr != 0))
+ 			ka = return_ka;
+ 		else {
++			if (unlikely(signal->group_stop_count > 0) &&
++			    do_signal_stop(0))
++				goto relock;
++
+ 			signr = dequeue_signal(current, &current->blocked,
+ 					       info);
+ 

linux-2.6-utrace.patch:
 Documentation/DocBook/Makefile    |    2 
 Documentation/DocBook/utrace.tmpl |  590 +++++++++
 fs/proc/array.c                   |    3 
 include/linux/sched.h             |    5 
 include/linux/tracehook.h         |   87 +
 include/linux/utrace.h            |  694 ++++++++++
 init/Kconfig                      |    9 
 kernel/Makefile                   |    1 
 kernel/fork.c                     |    3 
 kernel/ptrace.c                   |   14 
 kernel/utrace.c                   | 2424 ++++++++++++++++++++++++++++++++++++++
 11 files changed, 3830 insertions(+), 2 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.118 -r 1.119 linux-2.6-utrace.patchIndex: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- linux-2.6-utrace.patch	28 Sep 2009 05:09:49 -0000	1.118
+++ linux-2.6-utrace.patch	16 Dec 2009 22:09:42 -0000	1.119
@@ -1,5 +1,45 @@
+utrace core
+
+This adds the utrace facility, a new modular interface in the kernel for
+implementing user thread tracing and debugging.  This fits on top of the
+tracehook_* layer, so the new code is well-isolated.
+
+The new interface is in <linux/utrace.h> and the DocBook utrace book
+describes it.  It allows for multiple separate tracing engines to work in
+parallel without interfering with each other.  Higher-level tracing
+facilities can be implemented as loadable kernel modules using this layer.
+
+The new facility is made optional under CONFIG_UTRACE.
+When this is not enabled, no new code is added.
+It can only be enabled on machines that have all the
+prerequisites and select CONFIG_HAVE_ARCH_TRACEHOOK.
+
+In this initial version, utrace and ptrace do not play together at all.
+If ptrace is attached to a thread, the attach calls in the utrace kernel
+API return -EBUSY.  If utrace is attached to a thread, the PTRACE_ATTACH
+or PTRACE_TRACEME request will return EBUSY to userland.  The old ptrace
+code is otherwise unchanged and nothing using ptrace should be affected
+by this patch as long as utrace is not used at the same time.  In the
+future we can clean up the ptrace implementation and rework it to use
+the utrace API.
+
+Signed-off-by: Roland McGrath <roland at redhat.com>
+---
+ Documentation/DocBook/Makefile    |    2 +-
+ Documentation/DocBook/utrace.tmpl |  590 +++++++++
+ fs/proc/array.c                   |    3 +
+ include/linux/sched.h             |    5 +
+ include/linux/tracehook.h         |   87 ++-
+ include/linux/utrace.h            |  694 +++++++++++
+ init/Kconfig                      |    9 +
+ kernel/Makefile                   |    1 +
+ kernel/fork.c                     |    3 +
+ kernel/ptrace.c                   |   14 +
+ kernel/utrace.c                   | 2424 +++++++++++++++++++++++++++++++++++++
+ 11 files changed, 3830 insertions(+), 2 deletions(-)
+
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index ab8300f..95f59e4 100644
+index ab8300f..95f59e4 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
 @@ -9,7 +9,7 @@
@@ -13,7 +53,7 @@ index ab8300f..95f59e4 100644
  	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
-index 0000000..6cc58a1
+index ...e149f49 100644  
 --- /dev/null
 +++ b/Documentation/DocBook/utrace.tmpl
 @@ -0,0 +1,590 @@
@@ -472,7 +512,7 @@ index 0000000..6cc58a1
 +  <function>utrace_finish_examine</function> surrounding the calls to
 +  <structname>struct user_regset</structname> functions or direct examination
 +  of task data structures.  <function>utrace_prepare_examine</function> returns
-+  an error if the task is not properly stopped and not dead.  After a
++  an error if the task is not properly stopped, or is dead.  After a
 +  successful examination, the paired <function>utrace_finish_examine</function>
 +  call returns an error if the task ever woke up during the examination.  If
 +  so, any data gathered may be scrambled and should be discarded.  This means
@@ -608,18 +648,18 @@ index 0000000..6cc58a1
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 07f77a7..882dc90 100644
+index 822c2d5..9069c91 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
-@@ -83,6 +83,7 @@
+@@ -82,6 +82,7 @@
+ #include <linux/pid_namespace.h>
  #include <linux/ptrace.h>
  #include <linux/tracehook.h>
- #include <linux/swapops.h>
 +#include <linux/utrace.h>
+ #include <linux/swapops.h>
  
  #include <asm/pgtable.h>
- #include <asm/processor.h>
-@@ -189,6 +190,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
+@@ -189,6 +190,8 @@ static inline void task_state(struct seq
  		cred->uid, cred->euid, cred->suid, cred->fsuid,
  		cred->gid, cred->egid, cred->sgid, cred->fsgid);
  
@@ -628,36 +668,16 @@ index 07f77a7..882dc90 100644
  	task_lock(p);
  	if (p->files)
  		fdt = files_fdtable(p->files);
-diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index 21a6f5d..a598a6b 100644
---- a/include/linux/init_task.h
-+++ b/include/linux/init_task.h
-@@ -177,6 +177,7 @@ extern struct cred init_cred;
- 		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\
- 	},								\
- 	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
-+	INIT_UTRACE(tsk)						\
- 	INIT_IDS							\
- 	INIT_PERF_EVENTS(tsk)						\
- 	INIT_TRACE_IRQFLAGS						\
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 75e6e60..94ca5c5 100644
+index 6c8928b..139d300 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -61,6 +61,7 @@ struct sched_param {
- #include <linux/errno.h>
- #include <linux/nodemask.h>
- #include <linux/mm_types.h>
-+#include <linux/utrace_struct.h>
- 
- #include <asm/system.h>
- #include <asm/page.h>
-@@ -1393,6 +1394,11 @@ struct task_struct {
+@@ -1393,6 +1393,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
 +#ifdef CONFIG_UTRACE
-+	struct utrace utrace;
++	struct utrace *utrace;
 +	unsigned long utrace_flags;
 +#endif
 +
@@ -665,7 +685,7 @@ index 75e6e60..94ca5c5 100644
     	u32 parent_exec_id;
     	u32 self_exec_id;
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 1eb44a9..17c103e 100644
+index c78b2f4..0f5a48c 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -685,7 +705,7 @@ index 1eb44a9..17c103e 100644
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
+@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall
  static inline __must_check int tracehook_report_syscall_entry(
  	struct pt_regs *regs)
  {
@@ -695,16 +715,17 @@ index 1eb44a9..17c103e 100644
  	ptrace_report_syscall(regs);
  	return 0;
  }
-@@ -134,6 +140,8 @@ static inline __must_check int tracehook_report_syscall_entry(
+@@ -134,6 +140,9 @@ static inline __must_check int tracehook
   */
  static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
  {
 +	if (task_utrace_flags(current) & UTRACE_EVENT(SYSCALL_EXIT))
 +		utrace_report_syscall_exit(regs);
- 	ptrace_report_syscall(regs);
- }
- 
-@@ -194,6 +202,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
++
+ 	if (step && (task_ptrace(current) & PT_PTRACED)) {
+ 		siginfo_t info;
+ 		user_single_step_siginfo(current, regs, &info);
+@@ -201,6 +210,8 @@ static inline void tracehook_report_exec
  					 struct linux_binprm *bprm,
  					 struct pt_regs *regs)
  {
@@ -713,7 +734,7 @@ index 1eb44a9..17c103e 100644
  	if (!ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXEC, 0) &&
  	    unlikely(task_ptrace(current) & PT_PTRACED))
  		send_sig(SIGTRAP, current, 0);
-@@ -211,6 +221,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
+@@ -218,10 +229,37 @@ static inline void tracehook_report_exec
   */
  static inline void tracehook_report_exit(long *exit_code)
  {
@@ -722,15 +743,36 @@ index 1eb44a9..17c103e 100644
  	ptrace_event(PT_TRACE_EXIT, PTRACE_EVENT_EXIT, *exit_code);
  }
  
-@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clone(unsigned clone_flags)
- static inline void tracehook_finish_clone(struct task_struct *child,
- 					  unsigned long clone_flags, int trace)
- {
-+	utrace_init_task(child);
- 	ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace);
- }
- 
-@@ -278,6 +291,8 @@ static inline void tracehook_report_clone(struct pt_regs *regs,
[...2806 lines suppressed...]
++	utrace = task_utrace_struct(task);
++	if (utrace->resume < UTRACE_RESUME ||
++	    utrace->pending_attach || utrace->signal_handler) {
++		enum utrace_resume_action resume;
++
 +		/*
 +		 * We've been asked for an explicit report before we
 +		 * even check for pending signals.
@@ -3660,19 +3704,14 @@ index 0000000..74b5fc5
 +
 +		splice_attaching(utrace);
 +
-+		if (unlikely(!utrace->interrupt) && unlikely(!utrace->report))
-+			report.result = UTRACE_SIGNAL_IGN;
-+		else if (utrace->signal_handler)
-+			report.result = UTRACE_SIGNAL_HANDLER;
-+		else
-+			report.result = UTRACE_SIGNAL_REPORT;
++		report.result = utrace->signal_handler ?
++			UTRACE_SIGNAL_HANDLER : UTRACE_SIGNAL_REPORT;
++		utrace->signal_handler = 0;
 +
-+		/*
-+		 * We are now making the report and it's on the
-+		 * interrupt path, so clear the flags asking for those.
-+		 */
-+		utrace->interrupt = utrace->report = utrace->signal_handler = 0;
-+		utrace->stopped = 0;
++		resume = utrace->resume;
++		utrace->resume = UTRACE_RESUME;
++
++		spin_unlock(&utrace->lock);
 +
 +		/*
 +		 * Make sure signal_pending() only returns true
@@ -3684,13 +3723,21 @@ index 0000000..74b5fc5
 +			spin_unlock_irq(&task->sighand->siglock);
 +		}
 +
-+		spin_unlock(&utrace->lock);
-+
-+		if (unlikely(report.result == UTRACE_SIGNAL_IGN))
++		if (resume > UTRACE_REPORT) {
++			/*
++			 * We only got here to process utrace->resume.
++			 * Despite no callbacks, this report is not spurious.
++			 */
++			report.action = resume;
++			report.spurious = false;
++			finish_resume_report(task, utrace, &report);
++			return -1;
++		} else if (!(task->utrace_flags & UTRACE_EVENT(QUIESCE))) {
 +			/*
 +			 * We only got here to clear utrace->signal_handler.
 +			 */
 +			return -1;
++		}
 +
 +		/*
 +		 * Do a reporting pass for no signal, just for EVENT(QUIESCE).
@@ -3701,22 +3748,15 @@ index 0000000..74b5fc5
 +		event = 0;
 +		ka = NULL;
 +		memset(return_ka, 0, sizeof *return_ka);
-+	} else if ((task->utrace_flags & UTRACE_EVENT_SIGNAL_ALL) == 0 &&
-+		   !utrace->stopped) {
++	} else if (!(task->utrace_flags & UTRACE_EVENT_SIGNAL_ALL) ||
++		   unlikely(task->signal->group_stop_count)) {
 +		/*
-+		 * If no engine is interested in intercepting signals,
-+		 * let the caller just dequeue them normally.
++		 * If no engine is interested in intercepting signals or
++		 * we must stop, let the caller just dequeue them normally
++		 * or participate in group-stop.
 +		 */
 +		return 0;
 +	} else {
-+		if (unlikely(utrace->stopped)) {
-+			spin_unlock_irq(&task->sighand->siglock);
-+			spin_lock(&utrace->lock);
-+			utrace->stopped = 0;
-+			spin_unlock(&utrace->lock);
-+			spin_lock_irq(&task->sighand->siglock);
-+		}
-+
 +		/*
 +		 * Steal the next signal so we can let tracing engines
 +		 * examine it.  From the signal number and sigaction,
@@ -3801,11 +3841,11 @@ index 0000000..74b5fc5
 +
 +		if (ops->report_signal)
 +			ret = (*ops->report_signal)(
-+				report.result | report.action, engine, task,
++				report.result | report.action, engine,
 +				regs, info, ka, return_ka);
 +		else
 +			ret = (report.result | (*ops->report_quiesce)(
-+				       report.action, engine, task, event));
++				       report.action, engine, event));
 +
 +		/*
 +		 * Avoid a tight loop reporting again and again if some
@@ -3820,7 +3860,7 @@ index 0000000..74b5fc5
 +			break;
 +		}
 +
-+		finish_callback(utrace, &report, engine, ret);
++		finish_callback(task, utrace, &report, engine, ret);
 +	}
 +
 +	/*
@@ -3867,7 +3907,7 @@ index 0000000..74b5fc5
 +			 */
 +			if (report.action != UTRACE_RESUME)
 +				report.action = UTRACE_INTERRUPT;
-+			finish_report(&report, task, utrace);
++			finish_report(task, utrace, &report, true);
 +
 +			if (unlikely(report.result & UTRACE_SIGNAL_HOLD))
 +				push_back_signal(task, info);
@@ -3900,9 +3940,9 @@ index 0000000..74b5fc5
 +		 * as in utrace_resume(), above.  After we've dealt with that,
 +		 * our caller will relock and come back through here.
 +		 */
-+		finish_resume_report(&report, task, utrace);
++		finish_resume_report(task, utrace, &report);
 +
-+		if (unlikely(report.killed)) {
++		if (unlikely(fatal_signal_pending(task))) {
 +			/*
 +			 * The only reason we woke up now was because of a
 +			 * SIGKILL.  Don't do normal dequeuing in case it
@@ -3932,12 +3972,25 @@ index 0000000..74b5fc5
 +
 +	/*
 +	 * Complete the bookkeeping after the report.
-+	 * This sets utrace->report if UTRACE_STOP was used.
++	 * This sets utrace->resume if UTRACE_STOP was used.
 +	 */
-+	finish_report(&report, task, utrace);
++	finish_report(task, utrace, &report, true);
 +
 +	return_ka->sa.sa_handler = SIG_DFL;
 +
++	/*
++	 * If this signal is fatal, si_signo gets through as exit_code.
++	 * We can't allow a completely bogus value there or else core
++	 * kernel code can freak out.  (If an engine wants to control
++	 * the exit_code value exactly, it can do so in report_exit.)
++	 * We'll produce a big complaint in dmesg, but won't crash.
++	 * That's nicer for debugging your utrace engine.
++	 */
++	if (unlikely(info->si_signo & 0x80)) {
++		WARN(1, "utrace engine left bogus si_signo value!");
++		info->si_signo = SIGTRAP;
++	}
++
 +	if (unlikely(report.result & UTRACE_SIGNAL_HOLD))
 +		push_back_signal(task, info);
 +	else
@@ -3963,11 +4016,13 @@ index 0000000..74b5fc5
 +	spin_lock(&utrace->lock);
 +
 +	utrace->signal_handler = 1;
-+	if (stepping) {
-+		utrace->interrupt = 1;
-+		set_tsk_thread_flag(task, TIF_SIGPENDING);
-+	} else {
-+		set_tsk_thread_flag(task, TIF_NOTIFY_RESUME);
++	if (utrace->resume > UTRACE_INTERRUPT) {
++		if (stepping) {
++			utrace->resume = UTRACE_INTERRUPT;
++			set_tsk_thread_flag(task, TIF_SIGPENDING);
++		} else if (utrace->resume == UTRACE_RESUME) {
++			set_tsk_thread_flag(task, TIF_NOTIFY_RESUME);
++		}
 +	}
 +
 +	spin_unlock(&utrace->lock);
@@ -3983,7 +4038,7 @@ index 0000000..74b5fc5
 + * &struct user_regset calls, or direct access to thread-synchronous fields.
 + *
 + * When @target is current, this call is superfluous.  When @target is
-+ * another thread, it must held stopped via %UTRACE_STOP by @engine.
++ * another thread, it must be held stopped via %UTRACE_STOP by @engine.
 + *
 + * This call may block the caller until @target stays stopped, so it must
 + * be called only after the caller is sure @target is about to unschedule.
@@ -4094,10 +4149,5 @@ index 0000000..74b5fc5
 + */
 +void task_utrace_proc_status(struct seq_file *m, struct task_struct *p)
 +{
-+	struct utrace *utrace = &p->utrace;
-+	seq_printf(m, "Utrace:\t%lx%s%s%s\n",
-+		   p->utrace_flags,
-+		   utrace->stopped ? " (stopped)" : "",
-+		   utrace->report ? " (report)" : "",
-+		   utrace->interrupt ? " (interrupt)" : "");
++	seq_printf(m, "Utrace:\t%lx\n", p->utrace_flags);
 +}



From clumens at fedoraproject.org  Wed Dec 16 22:15:29 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 16 Dec 2009 22:15:29 +0000 (UTC)
Subject: File anaconda-13.11.tar.bz2 uploaded to lookaside cache by clumens
Message-ID: <20091216221529.48E9E28ED46@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for anaconda:

10d8c89908a431be4497d27befbbc4ae  anaconda-13.11.tar.bz2



From clumens at fedoraproject.org  Wed Dec 16 22:15:45 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 16 Dec 2009 22:15:45 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.685, 1.686 anaconda.spec, 1.835, 
	1.836 sources, 1.819, 1.820
Message-ID: <20091216221545.551E611C0092@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27164

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -p -r1.685 -r1.686
--- .cvsignore	9 Dec 2009 21:47:26 -0000	1.685
+++ .cvsignore	16 Dec 2009 22:15:44 -0000	1.686
@@ -1,3 +1,4 @@
 anaconda-13.8.tar.bz2
 anaconda-13.9.tar.bz2
 anaconda-13.10.tar.bz2
+anaconda-13.11.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -p -r1.835 -r1.836
--- anaconda.spec	9 Dec 2009 21:47:26 -0000	1.835
+++ anaconda.spec	16 Dec 2009 22:15:44 -0000	1.836
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.10
+Version: 13.11
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -217,6 +217,77 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Dec 16 2009 Chris Lumens <clumens at redhat.com> - 13.11-1
+- Clean up setting paths on preupgrade (jvonau). (clumens)
+- And call freetmp, too. (Jerry)
+- Add a method to remove /tmp/install.img on low memory conditions (jvonau).
+  (clumens)
+- Make sure /mnt/stage2 is mounted before trying to unmount. (Jerry)
+- Skip the mediaDevice check before attempting to mount the install.img.
+  (Jerry)
+- Remove install.img from /boot during preupgrade. (Jerry)
+- Add __str__ methods to the DeviceFormat classes. (dlehman)
+- Expand PartitionDevice.__str__ to include partition geometry and flags.
+  (dlehman)
+- Hide biosraid member devices that contain MDRaidMember formats. (dlehman)
+- Move disklabel handling into handleUdevDeviceFormat with the others.
+  (dlehman)
+- DiskDevice.__init__ expects an "exists" parameter, so add it. (clumens)
+- Fix multipath filtering. (clumens)
+- Log error messages before displaying dialogs. (clumens)
+- Include error messages when logging selinux context get/set failures.
+  (dlehman)
+- Catch failures to set selinux contexts so it doesn't cause a crash.
+  (dlehman)
+- Fix typo logging failure to get default file context. (dlehman)
+- Use DiskLabel.alignment instead of getDiskAlignment. (dlehman)
+- Add an alignment property to DiskLabel. (dlehman)
+- iscsi.py: Do not translate log messages (hdegoede)
+- Make iscsi,etc startup use the iscsi,etc Singletons (hdegoede)
+- kickstart: Move onlining of fcoe/iscsi/zfcp devices to parse phase
+  (hdegoede)
+- Make the fcoe, iscsi and zfcp classes singletons (hdegoede)
+- Remove call to no longer existing isys DriveDict method (hdegoede)
+- Use the correct yum configuration file when searching for the -logos
+  package (kanarip)
+- Fix two missing closing parens in previous commits. (clumens)
+- Add an interface to select the fancy filtering UI vs. the regular one.
+  (clumens)
+- Add a step to prompt for the cleardisks UI. (clumens)
+- Add a dialog to configure advanced storage devices. (clumens)
+- Add an early user interface for filtering storage devices. (clumens)
+- Rework the upgrade vs. install screen a bit to make it look nicer.
+  (clumens)
+- Add the updated and simplified parttype screen. (clumens)
+- Add a method to determine whether a device is a CCISS RAID device.
+  (clumens)
+- Move identifyMultipaths from DeviceTree to devicelibs. (clumens)
+- Add a method to return a device's WWID. (clumens)
+- Add a method to get the bus/interconnect from udev and store it on
+  devices. (clumens)
+- Add a vendor getting udev method, though udev doesn't always know it.
+  (clumens)
+- Add the serial number to all DiskDevices and subclasses. (clumens)
+- Put less space between rows and allow text to be longer before wrapping.
+  (clumens)
+- Allow InstallInterfaces to modify the installation steps. (clumens)
+- Default /boot to 500 MB. (clumens)
+- Some iscsi cleanups (hdegoede)
+- Bring auto discovered drives online before parsing the ks file (hdegoede)
+- Make a better effort at tearing down everything before action processing.
+  (dlehman)
+- Tighten restrictions on the type of disklabel on x86 and EFI boot disks.
+  (dlehman)
+- Use string instead of parted.diskType for disklabel types. (dlehman)
+- A couple of cleanups to warnings about formatting preexisting devices.
+  (dlehman)
+- Rework udev_settle timeout handling (#544177) (hdegoede)
+- Remove smp.c from the Makefile.am, too. (clumens)
+- Nothing has a kernel-smp anymore so none of this code is useful. (clumens)
+- Get rid of the goofy nested try statements. (clumens)
+- update reIPL messages (hamzy)
+- Change btrfs command line option (josef)
+
 * Wed Dec 09 2009 Chris Lumens <clumens at redhat.com> - 13.10-1
 - Kickstart support for unpartitioned disks. (dlehman)
 - Skip disklabel handling for biosraid and multipath members. (dlehman)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -p -r1.819 -r1.820
--- sources	9 Dec 2009 21:47:26 -0000	1.819
+++ sources	16 Dec 2009 22:15:45 -0000	1.820
@@ -1 +1 @@
-6816f57f0f8a3222fa65363c9b23b1fd  anaconda-13.10.tar.bz2
+10d8c89908a431be4497d27befbbc4ae  anaconda-13.11.tar.bz2



From sailer at fedoraproject.org  Wed Dec 16 22:26:48 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 16 Dec 2009 22:26:48 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl-shgrt.spec, NONE, 1.1 ghdl-svn133.patch, NONE, 
	1.1 ghdl.spec, 1.59, 1.60
Message-ID: <20091216222648.9C6C111C0092@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28996

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-shgrt.spec ghdl-svn133.patch 
Log Message:
update to svn133



--- NEW FILE ghdl-shgrt.spec ---
# This does not work yet.
# There is a wild calling orgy between grt and e~xx.o going on
# grt calls into e~xx.o for __ghdl_ELABORATE and various std__*
# but grt.ver unglobals all except VPI symbols

%global gccver 4.3.4
%global ghdlver 0.28
%global ghdlsvnver 133

Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
Release: 0.%{ghdlsvnver}svn.0%{?dist}
License: GPLv2+
Group: Development/Languages
URL: http://ghdl.free.fr/
# HOWTO create source files from ghdl SVN at https://gna.org/projects/ghdl/
# check out the SVN repo
# cd translate/gcc/
# ./dist.sh sources
Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
Patch100: ghdl-svn%{ghdlsvnver}.patch
Patch103: ghdl-noruntime.patch
Patch104: ghdl-svn110-libgnat44.patch
Patch105: ghdl-grtadac.patch
# Both following patches have been sent to upstream mailing list:
# From: Thomas Sailer <t.sailer at alumni.ethz.ch>
# To: ghdl-discuss at gna.org
# Date: Thu, 02 Apr 2009 15:36:00 +0200
# https://gna.org/bugs/index.php?13390
Patch106: ghdl-ppc64abort.patch
# https://gna.org/bugs/index.php?13389
Patch107: ieee-mathreal.patch
Patch110: grt-so.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires: gcc
# (Build)Requires from fc gcc41 package
%global multilib_64_archs sparc64 ppc64 s390x x86_64
%ifarch s390x
%global multilib_32_arch s390
%endif
%ifarch sparc64
%global multilib_32_arch sparc
%endif
%ifarch ppc64
%global multilib_32_arch ppc
%endif
%ifarch x86_64
%global multilib_32_arch i386
%endif
# Need binutils with -pie support >= 2.14.90.0.4-4
# Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
# Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
# Need binutils which support .weakref >= 2.16.91.0.3-1
BuildRequires: binutils >= 2.16.91.0.3-1
BuildRequires: zlib-devel, gettext, bison, flex, texinfo, gawk
# Make sure pthread.h doesn't contain __thread tokens
# Make sure glibc supports stack protector
BuildRequires: glibc-devel >= 2.3.90-2
%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
# Make sure glibc supports TFmode long double
BuildRequires: glibc >= 2.3.90-35
%endif
# Ada requires Ada to build
BuildRequires: gcc-gnat >= 4.3, libgnat >= 4.3
# GCC build requirements
BuildRequires: gmp-devel >= 4.1, mpfr-devel >= 2.3.0
# Need .eh_frame ld optimizations
# Need proper visibility support
# Need -pie support
# Need --as-needed/--no-as-needed support
# On ppc64, need omit dot symbols support and --non-overlapping-opd
# Need binutils that owns /usr/bin/c++filt
# Need binutils that support .weakref
Requires: binutils >= 2.16.91.0.3-1
# Make sure gdb will understand DW_FORM_strp
Conflicts: gdb < 5.1-2
Requires: glibc-devel >= 2.2.90-12
%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
# Make sure glibc supports TFmode long double
Requires: glibc >= 2.3.90-35
%endif

Requires: ghdl-devel = %{version}-%{release}

# Make sure we don't use clashing namespaces
%global _vendor fedora_ghdl

%global _gnu %{nil}
%ifarch sparc
%global gcc_target_platform sparc64-%{_vendor}-%{_target_os}
%endif
%ifarch ppc
%global gcc_target_platform ppc64-%{_vendor}-%{_target_os}
%endif
%ifnarch sparc ppc
%global gcc_target_platform %{_target_platform}
%endif

# do not strip libgrt.a -- makes debugging tedious otherwise
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's#/usr/lib/rpm/redhat/brp-strip-static-archive .*##g')

%global all_x86 %{ix86} x86_64

%description
GHDL is a VHDL simulator, using the GCC technology. VHDL is a language
standardized by the IEEE, intended for developing electronic systems. GHDL
implements the VHDL language according to the IEEE 1076-1987 or the IEEE
1076-1993 standard. It compiles VHDL files and creates a binary that simulates
(or executes) your design. GHDL does not do synthesis: it cannot translate your
design into a netlist.

Since GHDL is a compiler (i.e., it generates object files), you can call
functions or procedures written in a foreign language, such as C, C++, or
Ada95.

%package devel
Summary: GHDL libraries
Group: Development/Libraries
# rhbz #316311
Requires: zlib-devel, libgnat >= 4.3
Obsoletes: ghdl-grt

%description devel
This package contains the runtime libraries needed to link ghdl-compiled
object files into simulator executables. This package also contains sources
and precompiled binaries for standard VHDL packages.

%ifarch %{all_x86}
%package libs
Summary: GHDL runtime libraries
Group: Development/Libraries

%description libs
This package contains the runtime libraries needed to run ghdl-compiled
simulator executables. grt contains the simulator kernel that tracks
signal updates and schedules processes.
%endif

%ifarch x86_64
%package libs32
Summary: GHDL 32bit runtime libraries
Group: Development/Libraries

%description libs32
This package contains the runtime libraries needed to run ghdl-compiled
simulator executables. grt contains the simulator kernel that tracks
signal updates and schedules processes. This package is needed to compile
32bit executables with ghdl -m32.
%endif



%prep
%setup -q -n gcc-%{gccver} -T -b 0 -a 100
pushd ghdl-%{ghdlver}
%patch100 -p1
%patch103 -p0 -b .noruntime
%patch107 -p0 -b .ieeemathreal
%patch110 -p0 -b .grtso
%{__mv} vhdl ../gcc/
popd
#patch102 -p1 -b .makeinfo
%patch104 -p0 -b .libgnat44
%patch105 -p1 -b .grtadac
%patch106 -p0 -b .ppc64abort

%build
%{__rm} -fr obj-%{gcc_target_platform}
%{__mkdir} obj-%{gcc_target_platform}
pushd obj-%{gcc_target_platform}

# Flag settings cribbed from gcc package
OPT_FLAGS=$(echo %{optflags} | %{__sed} \
        -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g' \
        -e 's/-m64//g;s/-m32//g;s/-m31//g' \
%ifarch sparc sparc64
        -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g' \
%endif
        -e 's/[[:blank:]]\+/ /g')

# These compiler flags in rawhide seem to break the build, so get rid of them
OPT_FLAGS=$(echo $OPT_FLAGS | %{__sed} \
%ifarch i386 i486 i586 i686
        -e 's/-mtune=atom/-mtune=pentium4/g' \
%endif
%ifarch x86_64
        -e 's/-mtune=generic/-mtune=nocona/g' \
%endif
        -e 's/-fstack-protector//g ' \
        -e 's/--param=ssp-buffer-size=[0-9]*//g')

# gcc -m32 fails, so we disable multilibbing.
# so far multilib isn't very valuable, as the VHDL libraries aren't multilibbed
# either; Bug 174731
export CFLAGS="$OPT_FLAGS"
export XCFLAGS="$OPT_FLAGS"
export TCFLAGS="$OPT_FLAGS"
#configure --enable-languages=vhdl
../configure \
        --program-prefix=%{?_program_prefix} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
        --bindir=%{_bindir} \
        --sbindir=%{_sbindir} \
        --sysconfdir=%{_sysconfdir} \
        --datadir=%{_datadir} \
        --includedir=%{_includedir} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libexecdir} \
        --localstatedir=%{_localstatedir} \
        --sharedstatedir=%{_sharedstatedir} \
        --mandir=%{_mandir} \
        --infodir=%{_infodir} \
        --with-bugurl=http://bugzilla.redhat.com/bugzilla \
        --enable-languages=vhdl \
        %{!?_without_mock:--disable-multilib} \
        --enable-shared \
        --enable-threads=posix \
        --enable-checking=release \
        --with-system-zlib \
        --enable-__cxa_atexit \
        --disable-libunwind-exceptions \
        --disable-libgcj \
%ifarch sparc
        --host=%{gcc_target_platform} \
        --build=%{gcc_target_platform} \
        --target=%{gcc_target_platform} \
        --with-cpu=v7
%endif
%ifarch ppc
        --host=%{gcc_target_platform} \
        --build=%{gcc_target_platform} \
        --target=%{gcc_target_platform} \
        --with-cpu=default32
%endif
%ifnarch sparc ppc
        --host=%{gcc_target_platform} \
        --build=%{gcc_target_platform}
%endif

# Parallel make doesn't work, so not using %{?_smp_mflags}
#{__make} all-host
%{__make}

popd

%install
%{__rm} -rf %{buildroot}
%{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install-host

%ifarch %{all_x86}
pushd obj-%{gcc_target_platform}/gcc/vhdl
make grt-clean
make GRT_ADD_FLAGS="-g -O2 -fPIC" GNATVER=4.4 grt-so
%{__install} -d %{buildroot}%{_libdir}
%{__install} libghdlgrt.so* %{buildroot}%{_libdir}
pushd %{buildroot}%{_libdir}
%{__ln_s} libghdlgrt.so* libghdlgrt.so
popd
pushd %{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib
%{__sed} -e 's,@/libgrt.a,-lghdlgrt,g' < grt.lst > grt.lst.1
%{__mv} grt.lst.1 grt.lst
popd
popd

%ifarch x86_64
pushd obj-%{gcc_target_platform}/gcc/vhdl
make grt-clean
make GRT_ADD_FLAGS="-g -O2 -fPIC -m32" GNATVER=4.4 GRT_TARGET_OBJS="i386.o linux.o times.o" grt-so
%{__install} -d %{buildroot}%{_exec_prefix}/lib
%{__install} libghdlgrt.so* %{buildroot}%{_exec_prefix}/lib
pushd %{buildroot}%{_exec_prefix}/lib
%{__ln_s} libghdlgrt.so* libghdlgrt.so
popd
popd
%endif
%endif

%ifarch x86_64
pushd obj-%{gcc_target_platform}/gcc/vhdl
P32=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/32/
%{__install} -d ${P32}
make ghdllibs-clean
%if %{!?_without_mock:0}%{?_without_mock:1}
make grt-clean
make GRT_FLAGS="-m32 -O -g" GRT_TARGET_OBJS="i386.o linux.o times.o" ghdllib
make grt.lst
%{__sed} -e 's,@/libgrt.a,-lghdlgrt,g' < grt.lst > grt.lst.1
%{__install} -m 644 libgrt.a ${P32}/libgrt.a
%{__install} -m 644 grt.lst.1 ${P32}/grt.lst
%{__install} -m 644 grt.ver ${P32}/grt.ver
%endif
PDIR=`pwd`
pushd ${P32}/../..
%{__install} -d lib/32/v93
%{__install} -d lib/32/v87
%{__make} -f ${PDIR}/Makefile REL_DIR=../../../.. \
         LIBSRC_DIR="src" LIB93_DIR=lib/32/v93 LIB87_DIR=lib/32/v87 \
         ANALYZE="${PDIR}/../ghdl -a -m32 --GHDL1=${PDIR}/../ghdl1 --ieee=none" \
         std.v93 std.v87 ieee.v93 ieee.v87 synopsys.v93 synopsys.v87 mentor.v93
popd
../ghdl1 -m32 --std=87 -quiet -o std_standard.s --compile-standard
../xgcc -m32 -c -o std_standard.o std_standard.s
%{__mv} std_standard.o ${P32}/v87/std/std_standard.o
../ghdl1 -m32 --std=93 -quiet -o std_standard.s --compile-standard
../xgcc -m32 -c -o std_standard.o std_standard.s
%{__mv} std_standard.o ${P32}/v93/std/std_standard.o
popd
%endif

# Add additional libraries to link
(
echo "-lm"
%ifarch x86_64
echo "-ldl"
%endif
) >> %{buildroot}%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/grt.lst

# Remove files not to be packaged
pushd %{buildroot}
%{__rm} -f \
        .%{_bindir}/{cpp,gcc,gccbug,gcov} \
        .%{_bindir}/%{gcc_target_platform}-gcc{,-%{gccver}} \
        .%{_includedir}/mf-runtime.h \
        .%{_libdir}/libiberty* \
        .%{_infodir}/dir \
        .%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
        .%{_datadir}/locale/*/LC_MESSAGES/{gcc,cpplib}.mo \
        .%{_mandir}/man1/{cpp,gcc,gcov}.1* \
        .%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7* \
        .%{_exec_prefix}/lib/libgcc_s.* \
        .%{_exec_prefix}/lib/libmudflap.* \
        .%{_exec_prefix}/lib/libmudflapth.* \
        .%{_libdir}/32/libiberty.a
# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
%{__rm} -f \
        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}

# Remove directory hierarchies not to be packaged
%{__rm} -rf \
        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/{include,install-tools} \
        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/install-tools

popd

# copy v08 libraries from v93 for now
P64=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/
%{__cp} -rv ${P64}v93 ${P64}v08
%{__mv} ${P64}v08/std/std-obj93.cf ${P64}v08/std/std-obj08.cf
%{__mv} ${P64}v08/ieee/ieee-obj93.cf ${P64}v08/ieee/ieee-obj08.cf
%{__mv} ${P64}v08/mentor/ieee-obj93.cf ${P64}v08/mentor/ieee-obj08.cf
%{__mv} ${P64}v08/synopsys/ieee-obj93.cf ${P64}v08/synopsys/ieee-obj08.cf
%ifarch x86_64
%{__cp} -rv ${P32}v93 ${P32}v08
%{__mv} ${P32}v08/std/std-obj93.cf ${P32}v08/std/std-obj08.cf
%{__mv} ${P32}v08/ieee/ieee-obj93.cf ${P32}v08/ieee/ieee-obj08.cf
%{__mv} ${P32}v08/mentor/ieee-obj93.cf ${P32}v08/mentor/ieee-obj08.cf
%{__mv} ${P32}v08/synopsys/ieee-obj93.cf ${P32}v08/synopsys/ieee-obj08.cf
%endif

%clean
%{__rm} -rf %{buildroot}

%post
[ -f %{_infodir}/ghdl.info.gz ] && \
        /sbin/install-info %{_infodir}/ghdl.info.gz %{_infodir}/dir || :

%preun
[ -f %{_infodir}/ghdl.info.gz ] && [ $1 = 0 ] && \
        /sbin/install-info --delete %{_infodir}/ghdl.info.gz %{_infodir}/dir || :

%files
%defattr(-,root,root,-)
%doc ghdl-%{ghdlver}/COPYING
%{_bindir}/ghdl
%{_infodir}/ghdl.info.gz
# Need to own directory %{_libexecdir}/gcc even though we only want the
# %{gcc_target_platform}/%{gccver} subdirectory
%{_libexecdir}/gcc/
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
# Need to own directory %{_libdir}/gcc even though we only want the
# %{gcc_target_platform}/%{gccver} subdirectory
%{_libdir}/gcc/
%ifarch %{all_x86}
%{_libdir}/libghdlgrt.so
%endif
%ifarch x86_64
%{_exec_prefix}/lib/libghdlgrt.so
%endif

%ifarch %{all_x86}
%files libs
%defattr(-,root,root,-)
%{_libdir}/libghdlgrt.so.*
%endif

%ifarch x86_64
%files libs32
%defattr(-,root,root,-)
%{_exec_prefix}/lib/libghdlgrt.so.*
%endif


%changelog
* Wed Dec 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.0
- update to svn133
- drop upstreamed patches

* Mon Dec 14 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.2
- Process Timeout Chain bugfix
- --trace-signals memory leak fix

* Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.1
- copy v08 libraries instead of symlink

* Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
- update to 0.28/svn131
- symlink v08 libraries to v93 for now

* Wed Sep 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.130svn.0
- update to 0.28/svn130

* Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.126svn.0
- update to svn126

* Sun Jul 26 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.8
- this gcc does not understand -mtune=atom

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-0.110svn.7.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue May 26 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.7
- fix bug in std.textio.read (string)

* Wed Apr  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.6
- actually add the patch

* Wed Apr  1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.5
- make ieee.math_real more standards compliant

* Sun Mar 15 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.4
- gnat version is now 4.4

* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-0.110svn.3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Fri Feb 13 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.3
- prevent ppc64 abort due to unknown language type

* Fri Feb 13 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.2
- rebuild with ppc64

* Thu Oct  9 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.1
- rebuild

* Tue Oct  7 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.0
- update to svn110

* Tue Oct  7 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.105svn.0
- update to svn105

* Mon Jun  2 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.26-0.98svn.0
- update to svn98

* Fri May 16 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.26-0.94svn.7
- update to svn94

* Sun Jan  6 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.7
- disable Pragma No_Run_Time; it does not seem to make much sense and causes
  problems with gcc-4.3

* Mon Oct  8 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.6
- ghdl-grt requires zlib-devel (rhbz 316311)
- make it build with makeinfo >= 4.10

* Fri Aug 24 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.5
- excludearch ppc64

* Fri Aug 24 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.4
- fix BR

* Fri Aug 24 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.3
- fix license tag

* Fri Jan  5 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.2
- do not try to set user/group during install

* Fri Jan  5 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.1
- back out hunks that cause build failures
- un-exclude ppc

* Mon Nov 20 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.0
- update to svn89

* Fri Oct  6 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.73svn.0
- update to svn73

* Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.1
- bump release

* Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.0
- update to svn71

* Sun Aug 27 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.61svn.0
- update to svn61

* Sun Aug  6 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.24-0.60svn.0
- update to svn60

* Tue Jul 11 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.24-0.59svn.2
- rebuild

* Mon Jul 10 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.24-0.59svn.1
- add missing manpage

* Mon Jul 10 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.24-0.59svn.0
- update to svn59

* Sun Jun 25 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.23-0.58svn.0
- update to svn58

* Tue Jun 20 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.23-0.57svn.0
- update to svn57

* Fri Mar 24 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.50svn.1
- do not require /lib/libc.so.* on x86_64, this does not work under mock

* Wed Mar 22 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.50svn.0
- update to svn50, to fix x86_64 breakage
- move grt (ghdl runtime library) into separate package, to allow parallel
  install of i386 and x86_64 grt on x86_64 machines, thus making -m32 work
- back to using FSF gcc as base compiler sources, using core gcc sources
  causes segfaults during library compile on x86_64

* Sun Mar 19 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.49svn.1
- use core gcc as base compiler sources

* Thu Mar 16 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.49svn.0
- update to svn49, using gcc 4.1.0

* Mon Mar  6 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.40svn.0
- update to svn40, to fix an array bounds checking bug apparently
  introduced in svn39

* Thu Feb 16 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.39svn.0
- update to svn39, to fix some constant bugs

* Wed Feb 14 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.38svn.1
- rebuild with new compiler for FC5

* Wed Dec 21 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.38svn.0
- update to svn38, to fix a ghw output bug

* Sun Dec 18 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-1
- update to 0.21

* Thu Dec 15 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.35svn.1
- update to svn35 for more x86_64 "Ada cannot portably call C vararg functions"
  fixes
- first stab at -m32 library building

* Sat Dec 10 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.33svn.1
- update to svn33, to fix x86_64 issues (real'image, -m32)
- rpmbuild option --without mock enables multilib builds

* Mon Dec  5 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.24svn.3
- disable multilib and remove exclude of x86_64

* Thu Dec  1 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.24svn.2
- Exclude ppc because gcc-gnat is missing
- Exclude x86_64 because of mock build issues

* Fri Nov 25 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.24svn.1
- update to SVN rev 24
- remove additional files to fix x86_64 build

* Tue Nov 22 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.23svn.1
- update to SVN rev 23

* Mon Nov 14 2005 Paul Howarth <paul at city-fan.org> - 0.21-0.21.1
- spec file cosmetic cleanups
- incorporate some architecture tweaks from gcc package
- remove files we don't want packaged so that we can turn the unpackaged file
  check back on
- use fedora_ghdl as the machine vendor name to avoid namespace clashes with
  other packages
- own {%%{_libdir},%%{_libexecdir}}/gcc directories since this package does not
  depend on gcc
- add buildreq texinfo, needed to make info file
- don't include README, which is aimed at building ghdl rather than using it
- remove install-tools and munged header files, not needed for ghdl
- only run install-info if the info file is installed
- patch ghdl.texi to include info dir entry

* Fri Nov 11 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.21
- update to 0.21pre, svn rev 21
- incorporate changes from Paul Howarth

* Sat Mar 12 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.18-1
- update to 0.18

* Sat Feb 26 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.17-1
- update to 0.17

* Tue Feb  8 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.16-1
- Initial build.


ghdl-svn133.patch:
 errorout.adb           |    6 
 ghdldrv/ghdllocal.adb  |    2 
 grt/grt-processes.adb  |  448 ++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads  |   31 +--
 grt/grt-rtis_utils.adb |    1 
 grt/grt-signals.adb    |   31 +--
 grt/grt-signals.ads    |   33 ++-
 grt/grt-types.ads      |    4 
 grt/grt-unithread.adb  |    9 
 grt/grt-unithread.ads  |    6 
 ortho-lang.c           |    2 
 version.ads            |    4 
 12 files changed, 346 insertions(+), 231 deletions(-)

--- NEW FILE ghdl-svn133.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-12-16 14:31:15.000000000 +0100
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-12-16 14:31:12.000000000 +0100
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-12-16 14:31:13.000000000 +0100
@@ -36,27 +36,30 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
-   type Process_Id_Array_Acc is access Process_Id_Array;
+   type Process_Acc_Array is array (Natural range <>) of Process_Acc;
+   type Process_Acc_Array_Acc is access Process_Acc_Array;
 
-   Resume_Process_Table : Process_Id_Array_Acc;
+   Resume_Process_Table : Process_Acc_Array_Acc;
    Last_Resume_Process : Natural := 0;
-   Postponed_Resume_Process_Table : Process_Id_Array_Acc;
+   Postponed_Resume_Process_Table : Process_Acc_Array_Acc;
    Last_Postponed_Resume_Process : Natural := 0;
 
    --  Number of postponed processes.
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within non-sensitized processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,66 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+         --  Be sure a second call won't corrupt the chain.
+         Proc.Timeout_Chain_Prev := null;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+         Proc.Timeout_Chain_Next := null;
+      end if;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +342,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +440,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +456,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +465,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +480,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +498,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +507,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +515,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +525,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +548,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -502,12 +625,12 @@
    Run_Failure : constant Integer := -1;
 
    Mt_Last : Natural;
-   Mt_Table : Process_Id_Array_Acc;
+   Mt_Table : Process_Acc_Array_Acc;
    Mt_Index : aliased Natural;
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,41 +639,36 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
    function Run_Processes (Postponed : Boolean) return Integer
    is
-      Table : Process_Id_Array_Acc;
+      Table : Process_Acc_Array_Acc;
       Last : Natural;
    begin
       if Options.Flag_Stats then
@@ -571,15 +689,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +704,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +758,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +813,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
@@ -810,9 +922,9 @@
 
       --  Allocate processes arrays.
       Resume_Process_Table :=
-        new Process_Id_Array (1 .. Nbr_Non_Postponed_Processes);
+        new Process_Acc_Array (1 .. Nbr_Non_Postponed_Processes);
       Postponed_Resume_Process_Table :=
-        new Process_Id_Array (1 .. Nbr_Postponed_Processes);
+        new Process_Acc_Array (1 .. Nbr_Postponed_Processes);
 
       Status := Run_Through_Longjump (Initialization_Phase'Access);
       if Status /= Run_Resumed then
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-12-16 14:31:13.000000000 +0100
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -146,6 +142,8 @@
 
       --  Non-sensitized process being awaked by a wait timeout.  This state
       --  is transcient.
+      --  This is necessary so that the process will exit immediately from the
+      --  wait statements without checking if the wait condition is true.
       State_Timeout,
 
       --  Non-sensitized process waiting until end.
@@ -178,8 +176,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-rtis_utils.adb ghdl-0.29dev/vhdl/grt/grt-rtis_utils.adb
--- ghdl-0.28/vhdl/grt/grt-rtis_utils.adb	2008-12-31 05:41:58.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-rtis_utils.adb	2009-12-16 14:31:13.000000000 +0100
@@ -502,6 +502,7 @@
    begin
       Rtis_Utils.Get_Value (Name, Value, Type_Rti);
       Put (Stream, Name);
+      Free (Name);
    end Disp_Value;
 
    procedure Get_Enum_Value
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-12-16 14:31:13.000000000 +0100
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-12-16 14:31:13.000000000 +0100
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-12-16 14:31:13.000000000 +0100
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-12-16 14:31:13.000000000 +0100
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-12-16 14:31:13.000000000 +0100
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/ortho-lang.c ghdl-0.29dev/vhdl/ortho-lang.c
--- ghdl-0.28/vhdl/ortho-lang.c	2008-08-28 05:29:25.000000000 +0200
+++ ghdl-0.29dev/vhdl/ortho-lang.c	2009-12-16 14:31:14.000000000 +0100
@@ -385,7 +385,7 @@
     filename = in_fnames[0];
 
   linemap_add (line_table, LC_ENTER, 0, filename ? filename :"*no-file*", 1);
-  input_location = linemap_line_start (line_table, 0, 252);
+  input_location = linemap_line_start (line_table, 1, 252);
 
   if (!lang_parse_file (filename))
     errorcount++;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-12-16 14:31:15.000000000 +0100
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- ghdl.spec	14 Dec 2009 09:33:26 -0000	1.59
+++ ghdl.spec	16 Dec 2009 22:26:47 -0000	1.60
@@ -1,11 +1,11 @@
 %global gccver 4.3.4
 %global ghdlver 0.28
-%global ghdlsvnver 131
+%global ghdlsvnver 133
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.2%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,10 +27,6 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
-# https://gna.org/bugs/index.php?14930
-Patch108: grt-processtimeoutchain.patch
-# https://gna.org/bugs/index.php?14931
-Patch109: grt-dispmemleak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -136,8 +132,6 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
-%patch108 -p0 -b .processtimeoutchain
-%patch109 -p0 -b .dispmemleak
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -335,6 +329,9 @@ P64=%{buildroot}/%{_libdir}/gcc/%{gcc_ta
 
 
 %changelog
+* Wed Dec 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.0
+- update to svn133, drop upstreamed patches
+
 * Mon Dec 14 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.2
 - Process Timeout Chain bugfix
 - --trace-signals memory leak fix



From philipp at fedoraproject.org  Wed Dec 16 22:29:08 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 22:29:08 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel mod_proxy_html.spec,1.4,1.5
Message-ID: <20091216222908.C1CF211C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29368

Modified Files:
	mod_proxy_html.spec 
Log Message:
Bump to 3.1.2-5




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/mod_proxy_html.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mod_proxy_html.spec	16 Dec 2009 22:03:40 -0000	1.4
+++ mod_proxy_html.spec	16 Dec 2009 22:29:08 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/



From philipp at fedoraproject.org  Wed Dec 16 22:30:37 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 22:30:37 +0000 (UTC)
Subject: rpms/mod_proxy_html/F-11 mod_proxy_html.spec,1.1,1.2
Message-ID: <20091216223037.09E1F11C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29639

Modified Files:
	mod_proxy_html.spec 
Log Message:
Bump to 3.1.2-5




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/F-11/mod_proxy_html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mod_proxy_html.spec	16 Dec 2009 20:39:55 -0000	1.1
+++ mod_proxy_html.spec	16 Dec 2009 22:30:36 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 1%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -53,6 +53,9 @@ install -m 644 -D proxy_html.conf %{buil
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
+- Initial commit.
+
 * Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
 - Version bump to 3.1.2
 



From philipp at fedoraproject.org  Wed Dec 16 22:31:27 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 22:31:27 +0000 (UTC)
Subject: rpms/mod_proxy_html/F-12 mod_proxy_html.spec,1.1,1.2
Message-ID: <20091216223127.AC68D11C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29909

Modified Files:
	mod_proxy_html.spec 
Log Message:
Bump to 3.1.2-5




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/F-12/mod_proxy_html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mod_proxy_html.spec	16 Dec 2009 20:41:20 -0000	1.1
+++ mod_proxy_html.spec	16 Dec 2009 22:31:27 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 1%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -53,6 +53,9 @@ install -m 644 -D proxy_html.conf %{buil
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
+- Initial commit.
+
 * Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
 - Version bump to 3.1.2
 



From philipp at fedoraproject.org  Wed Dec 16 22:36:17 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 22:36:17 +0000 (UTC)
Subject: rpms/mod_proxy_html/EL-4 mod_proxy_html.spec,1.1,1.2
Message-ID: <20091216223617.B7F1F11C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30772

Modified Files:
	mod_proxy_html.spec 
Log Message:
Bump to 3.1.2-5




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-4/mod_proxy_html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mod_proxy_html.spec	16 Dec 2009 21:17:27 -0000	1.1
+++ mod_proxy_html.spec	16 Dec 2009 22:36:17 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 1%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -53,6 +53,9 @@ install -m 644 -D proxy_html.conf %{buil
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
+- Initial commit.
+
 * Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
 - Version bump to 3.1.2
 



From philipp at fedoraproject.org  Wed Dec 16 22:38:33 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 22:38:33 +0000 (UTC)
Subject: rpms/mod_proxy_html/EL-5 mod_proxy_html.spec,1.1,1.2
Message-ID: <20091216223833.CF2F911C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31250

Modified Files:
	mod_proxy_html.spec 
Log Message:
Bump to 3.1.2-5




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-5/mod_proxy_html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mod_proxy_html.spec	16 Dec 2009 21:18:44 -0000	1.1
+++ mod_proxy_html.spec	16 Dec 2009 22:38:33 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 1%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -53,6 +53,9 @@ install -m 644 -D proxy_html.conf %{buil
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
+- Initial commit.
+
 * Wed Dec 09 2009 Philip Prindeville <http://www.redfish-solutions.com> 3.1.2-1
 - Version bump to 3.1.2
 



From cwickert at fedoraproject.org  Wed Dec 16 22:49:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 16 Dec 2009 22:49:55 +0000 (UTC)
Subject: rpms/lxmusic/devel
	lxmusic-0.4.0-check-for-valid-playlist-positions.patch, NONE,
	1.1 lxmusic-0.4.0-invalidate-cur_track_iter.patch, NONE,
	1.1 lxmusic-0.4.0-remove-cur_track_iter.patch, NONE,
	1.1 lxmusic.spec, 1.5, 1.6
Message-ID: <20091216224955.599A211C0092@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv629

Modified Files:
	lxmusic.spec 
Added Files:
	lxmusic-0.4.0-check-for-valid-playlist-positions.patch 
	lxmusic-0.4.0-invalidate-cur_track_iter.patch 
	lxmusic-0.4.0-remove-cur_track_iter.patch 
Log Message:
* Wed Dec 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
- Fix crash when emptying large playlists (#539729)


lxmusic-0.4.0-check-for-valid-playlist-positions.patch:
 lxmusic.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lxmusic-0.4.0-check-for-valid-playlist-positions.patch ---
--- trunk/lxmusic/src/lxmusic.c	2009/12/11 21:38:41	2190
+++ trunk/lxmusic/src/lxmusic.c	2009/12/11 22:01:10	2191
@@ -1813,9 +1813,9 @@
         {
 	    xmmsv_t *pos_val;
 	    
-            if( xmmsv_dict_get( val, "position", &pos_val ) ) 
+            if( xmmsv_dict_get( val, "position", &pos_val ) && xmmsv_get_int( pos_val, &pos ) && (pos >= 0 ) ) 
             {
-		xmmsv_get_int( pos_val, &pos );
+		;
                 /* mark currently played song in the playlist with bold font. */
                 GtkTreePath* path = gtk_tree_path_new_from_indices( pos, -1 );
                 GtkTreeIter it;

lxmusic-0.4.0-invalidate-cur_track_iter.patch:
 lxmusic.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE lxmusic-0.4.0-invalidate-cur_track_iter.patch ---
--- trunk/lxmusic/src/lxmusic.c	2009/12/11 04:00:56	2189
+++ trunk/lxmusic/src/lxmusic.c	2009/12/11 21:38:41	2190
@@ -1613,14 +1613,20 @@
                 GtkTreeIter it;
 		xmmsv_get_int( int_value, &pos );
                 path = gtk_tree_path_new_from_indices( pos, -1 );
-                if( gtk_tree_model_get_iter( (GtkTreeModel*)list_store, &it, path ) )
+                if( gtk_tree_model_get_iter( (GtkTreeModel*)list_store, &it, path ) ) 
+		{
                     gtk_list_store_remove( list_store, &it );
+		    /* invalidate currently played track */
+		    if ( it.stamp == cur_track_iter.stamp ) 
+			cur_track_iter.stamp = 0;
+		}
                 gtk_tree_path_free( path );
 	    }
             break;
         case XMMS_PLAYLIST_CHANGED_CLEAR:
         {
             gtk_list_store_clear( list_store );
+	    cur_track_iter.stamp = 0;
             break;
         }
         case XMMS_PLAYLIST_CHANGED_MOVE:

lxmusic-0.4.0-remove-cur_track_iter.patch:
 lxmusic.c |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 14 deletions(-)

--- NEW FILE lxmusic-0.4.0-remove-cur_track_iter.patch ---
--- trunk/lxmusic/src/lxmusic.c	2009/12/13 05:21:24	2194
+++ trunk/lxmusic/src/lxmusic.c	2009/12/13 21:08:32	2195
@@ -107,7 +107,6 @@
 static uint32_t play_time = 0;
 static int32_t cur_track_duration = 0;
 static int32_t cur_track_id = 0;
-static GtkTreeIter cur_track_iter = {0};
 
 static int repeat_mode = REPEAT_NONE;
 
@@ -130,7 +129,10 @@
 static int win_xpos = 0;
 static int win_ypos = 0;
 
-void on_play_btn_clicked(GtkButton* btn, gpointer user_data);
+void 			on_locate_cur_track	(GtkAction* act, gpointer user_data);
+void 			on_play_btn_clicked	(GtkButton* btn, gpointer user_data);
+
+static GtkTreeIter	get_current_track_iter	();
 
 static void load_config()
 {
@@ -1211,7 +1213,7 @@
                         COL_TITLE, title,
                         COL_LEN, time_buf, -1 );
 
-    current_track_updated = ut->it.user_data == cur_track_iter.user_data;
+    current_track_updated = ut->id == cur_track_id;
     if ( current_track_updated ) 
     {
 	/* send desktop notification if current track was updated */  
@@ -1416,8 +1418,8 @@
         g_free(cur_playlist);
         cur_playlist = g_strdup(name);
 
-        cur_track_iter.stamp = 0; /* invalidate the GtkTreeIter of currenyly played track. */
-        cur_track_id = -1;
+	/* invalidate currenyly played track id. */
+        cur_track_id = 0;
 
         /* update the menu */
         if( cur_playlist )
@@ -1617,8 +1619,10 @@
 		{
                     gtk_list_store_remove( list_store, &it );
 		    /* invalidate currently played track */
-		    if ( it.stamp == cur_track_iter.stamp ) 
-			cur_track_iter.stamp = 0;
+		    xmmsv_dict_get( value, "id", &int_value );
+		    xmmsv_get_int( int_value, &id );
+		    if ( id == cur_track_id ) 
+			cur_track_id = 0;
 		}
                 gtk_tree_path_free( path );
 	    }
@@ -1626,7 +1630,7 @@
         case XMMS_PLAYLIST_CHANGED_CLEAR:
         {
             gtk_list_store_clear( list_store );
-	    cur_track_iter.stamp = 0;
+	    cur_track_id = 0;
             break;
         }
         case XMMS_PLAYLIST_CHANGED_MOVE:
@@ -1811,21 +1815,24 @@
 	xmmsv_get_string( name_val, &name );
         if( name && cur_playlist && !strcmp(cur_playlist, name) )
         {
-	    xmmsv_t *pos_val;
-	    
+	    xmmsv_t *pos_val, *int_value;
+
             if( xmmsv_dict_get( val, "position", &pos_val ) && xmmsv_get_int( pos_val, &pos ) && (pos >= 0 ) ) 
             {
-		;
                 /* mark currently played song in the playlist with bold font. */
                 GtkTreePath* path = gtk_tree_path_new_from_indices( pos, -1 );
                 GtkTreeIter it;
                 if( gtk_tree_model_get_iter( GTK_TREE_MODEL(list_store), &it, path ) )
                 {
+		    GtkTreeIter cur_track_iter = get_current_track_iter();
+		    /* prev. current track */
                     if( cur_track_iter.stamp )
                         gtk_list_store_set(list_store, &cur_track_iter, COL_WEIGHT, PANGO_WEIGHT_NORMAL, -1);
-		    
                     gtk_list_store_set(list_store, &it, COL_WEIGHT, PANGO_WEIGHT_BOLD, -1);
-                    cur_track_iter = it;
+
+		    /* update id of currently played track */
+		    xmmsv_dict_get( val, "id", &int_value );
+		    xmmsv_get_int( int_value, &cur_track_id );
                 }
 		/* scroll to currently played song */
 		gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(playlist_view), path, NULL, FALSE, 0.0, 0.0 );
@@ -1836,9 +1843,9 @@
     return TRUE;
 }
 
-
 void on_locate_cur_track(GtkAction* act, gpointer user_data)
 {
+    GtkTreeIter cur_track_iter = get_current_track_iter();
     if( cur_track_iter.stamp )
     {
         GtkTreeModelFilter* mf;
@@ -1860,6 +1867,24 @@
     }
 }
 
+static GtkTreeIter get_current_track_iter() 
+{
+    GtkTreeIter it, found_it = {0};
+    int count=0;
+    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(list_store), &it )) 
+    {
+	do {
+	    count++;
+	    gint weight;
+	    gtk_tree_model_get (GTK_TREE_MODEL(list_store), 
+				&it, COL_WEIGHT, &weight, -1);
+	    if (weight == PANGO_WEIGHT_BOLD) 
+		found_it = it;
+	} while (!found_it.stamp && gtk_tree_model_iter_next( GTK_TREE_MODEL(list_store), &it ));
+    }
+    return found_it;
+}
+
 static void get_channel_volumes( const char *key, xmmsv_t *value, void *user_data)
 {
     GSList** volumes = (GSList**)user_data;


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/lxmusic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lxmusic.spec	4 Sep 2009 22:48:41 -0000	1.5
+++ lxmusic.spec	16 Dec 2009 22:49:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lxmusic
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
@@ -8,6 +8,13 @@ License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
 Patch0:         lxmusic-0.3.0-no-tools-menu.patch
+# Fixes for https://bugzilla.redhat.com/show_bug.cgi?id=539729
+# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2190
+Patch1:         lxmusic-0.4.0-invalidate-cur_track_iter.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2191
+Patch2:         lxmusic-0.4.0-check-for-valid-playlist-positions.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2195
+Patch3:         lxmusic-0.5.4-remove-cur_track_iter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.6
@@ -23,6 +30,9 @@ player of LXDE (Lightweight X11 Desktop 
 %prep
 %setup -q
 %patch0 -p1 -b .no-tools
+%patch1 -p2 -b .cur_track_iter
+%patch2 -p2 -b .playlist-positions
+%patch3 -p2 -b .cur_track_iter2
 
 
 %build
@@ -54,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
+- Fix crash when emptying large playlists (#539729)
+
 * Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0
 



From cwickert at fedoraproject.org  Wed Dec 16 22:53:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 16 Dec 2009 22:53:44 +0000 (UTC)
Subject: rpms/lxmusic/devel lxmusic.spec,1.6,1.7
Message-ID: <20091216225344.CCD9B11C0092@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1475

Modified Files:
	lxmusic.spec 
Log Message:
fix name of patch


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/lxmusic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lxmusic.spec	16 Dec 2009 22:49:54 -0000	1.6
+++ lxmusic.spec	16 Dec 2009 22:53:44 -0000	1.7
@@ -14,7 +14,7 @@ Patch1:         lxmusic-0.4.0-invalidate
 # http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2191
 Patch2:         lxmusic-0.4.0-check-for-valid-playlist-positions.patch
 # http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2195
-Patch3:         lxmusic-0.5.4-remove-cur_track_iter.patch
+Patch3:         lxmusic-0.4.0-remove-cur_track_iter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.6



From dwalsh at fedoraproject.org  Wed Dec 16 23:01:01 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 16 Dec 2009 23:01:01 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch, 1.13,
	1.14 selinux-policy.spec, 1.942, 1.943
Message-ID: <20091216230101.D154011C0092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2892

Modified Files:
	policy-F13.patch selinux-policy.spec 
Log Message:
* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-3
- Fixes for abrt calls


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   11 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   79 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  190 +++
 policy/modules/apps/sandbox.te            |  336 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  447 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  117 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  429 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |   23 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  398 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/u                 |    6 
 policy/modules/services/udisks.fc         |    5 
 policy/modules/services/udisks.if         |  192 +++
 policy/modules/services/udisks.te         |   66 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  281 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  643 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   56 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1683 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 391 files changed, 19999 insertions(+), 2980 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- policy-F13.patch	16 Dec 2009 13:30:38 -0000	1.13
+++ policy-F13.patch	16 Dec 2009 23:01:00 -0000	1.14
@@ -2767,7 +2767,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.7.4/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/gnome.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/gnome.te	2009-12-16 16:57:25.000000000 -0500
 @@ -7,18 +7,30 @@
  #
  
@@ -2801,8 +2801,12 @@ diff -b -B --ignore-all-space --exclude-
  files_tmp_file(gconf_tmp_t)
  ubac_constrained(gconf_tmp_t)
  
-@@ -32,8 +44,17 @@
- type gnome_home_t;
+@@ -29,11 +41,20 @@
+ application_domain(gconfd_t, gconfd_exec_t)
+ ubac_constrained(gconfd_t)
+ 
+-type gnome_home_t;
++type gnome_home_t, gnome_home_type;
  typealias gnome_home_t alias { user_gnome_home_t staff_gnome_home_t sysadm_gnome_home_t };
  typealias gnome_home_t alias { auditadm_gnome_home_t secadm_gnome_home_t };
 +typealias gnome_home_t alias unconfined_gnome_home_t;
@@ -4969,8 +4973,8 @@ diff -b -B --ignore-all-space --exclude-
 +# No types are sandbox_exec_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.7.4/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sandbox.if	2009-12-15 14:56:49.000000000 -0500
-@@ -0,0 +1,188 @@
++++ serefpolicy-3.7.4/policy/modules/apps/sandbox.if	2009-12-16 16:50:01.000000000 -0500
+@@ -0,0 +1,190 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -5018,9 +5022,10 @@ diff -b -B --ignore-all-space --exclude-
 +	allow sandbox_x_domain $1:process { sigchld signal };
 +	allow sandbox_x_domain sandbox_x_domain:process signal;
 +	# Dontaudit leaked file descriptors
-+	dontaudit sandbox_x_domain $1:fifo_file rw_fifo_file_perms;
++	dontaudit sandbox_x_domain $1:fifo_file { read write };
 +	dontaudit sandbox_x_domain $1:tcp_socket rw_socket_perms;
 +	dontaudit sandbox_x_domain $1:udp_socket rw_socket_perms;
++	dontaudit sandbox_x_domain $1:unix_stream_socket { read write };
 +	
 +	manage_files_pattern($1, sandbox_file_type, sandbox_file_type);
 +	manage_dirs_pattern($1, sandbox_file_type, sandbox_file_type);
@@ -5104,6 +5109,7 @@ diff -b -B --ignore-all-space --exclude-
 +	type $1_client_tmpfs_t;
 +	files_tmpfs_file($1_client_tmpfs_t)
 +
++	term_search_ptys($1_t)
 +	allow $1_client_t sandbox_devpts_t:chr_file { rw_term_perms setattr };
 +	term_create_pty($1_client_t,sandbox_devpts_t)
 +
@@ -5161,8 +5167,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.7.4/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sandbox.te	2009-12-15 14:56:49.000000000 -0500
-@@ -0,0 +1,331 @@
++++ serefpolicy-3.7.4/policy/modules/apps/sandbox.te	2009-12-16 17:45:36.000000000 -0500
+@@ -0,0 +1,336 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -5195,6 +5201,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +# sandbox xserver policy
 +#
++allow sandbox_xserver_t self:process execmem;
 +allow sandbox_xserver_t self:fifo_file manage_fifo_file_perms;
 +allow sandbox_xserver_t self:shm create_shm_perms;
 +allow sandbox_xserver_t self:tcp_socket create_stream_socket_perms;
@@ -5222,6 +5229,8 @@ diff -b -B --ignore-all-space --exclude-
 +corenet_sendrecv_xserver_server_packets(sandbox_xserver_t)
 +corenet_sendrecv_all_client_packets(sandbox_xserver_t)
 +
++dev_rwx_zero(sandbox_xserver_t)
++
 +files_read_etc_files(sandbox_xserver_t)
 +files_read_usr_files(sandbox_xserver_t)
 +files_search_home(sandbox_xserver_t)
@@ -5242,6 +5251,7 @@ diff -b -B --ignore-all-space --exclude-
 +logging_send_syslog_msg(sandbox_xserver_t)
 +logging_send_audit_msgs(sandbox_xserver_t)
 +
++userdom_read_user_home_content_symlinks(sandbox_xserver_t)
 +userdom_use_user_terminals(sandbox_xserver_t)
 +
 +xserver_entry_type(sandbox_xserver_t)
@@ -5322,7 +5332,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +auth_dontaudit_read_login_records(sandbox_x_domain)
 +auth_dontaudit_write_login_records(sandbox_x_domain)
-+auth_use_nsswitch(sandbox_x_domain)
++#auth_use_nsswitch(sandbox_x_domain)
 +auth_search_pam_console_data(sandbox_x_domain)
 +
 +init_read_utmp(sandbox_x_domain)
@@ -5349,6 +5359,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +userdom_dontaudit_use_user_terminals(sandbox_x_domain)
++userdom_read_user_home_content_symlinks(sandbox_x_domain)
 +
 +#============= sandbox_x_t ==============
 +files_search_home(sandbox_x_t)
@@ -5367,7 +5378,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +corenet_tcp_connect_ipp_port(sandbox_x_client_t)
 +
-+auth_use_nsswitch(sandbox_x_client_t)
++#auth_use_nsswitch(sandbox_x_client_t)
 +
 +dbus_system_bus_client(sandbox_x_client_t)
 +dbus_read_config(sandbox_x_client_t)
@@ -5425,7 +5436,7 @@ diff -b -B --ignore-all-space --exclude-
 +corenet_dontaudit_tcp_bind_generic_port(sandbox_web_client_t)
 +corenet_tcp_connect_speech_port(sandbox_web_client_t)
 +
-+auth_use_nsswitch(sandbox_web_client_t)
++#auth_use_nsswitch(sandbox_web_client_t)
 +
 +dbus_system_bus_client(sandbox_web_client_t)
 +dbus_read_config(sandbox_web_client_t)
@@ -5468,7 +5479,7 @@ diff -b -B --ignore-all-space --exclude-
 +corenet_tcp_connect_all_ports(sandbox_net_client_t)
 +corenet_sendrecv_all_client_packets(sandbox_net_client_t)
 +
-+auth_use_nsswitch(sandbox_net_client_t)
++#auth_use_nsswitch(sandbox_net_client_t)
 +
 +dbus_system_bus_client(sandbox_net_client_t)
 +dbus_read_config(sandbox_net_client_t)
@@ -6496,7 +6507,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.7.4/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/kernel/domain.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/domain.te	2009-12-16 16:43:03.000000000 -0500
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -6567,7 +6578,7 @@ diff -b -B --ignore-all-space --exclude-
  # Act upon any other process.
  allow unconfined_domain_type domain:process ~{ transition dyntransition execmem execstack execheap };
  
-@@ -153,3 +174,71 @@
+@@ -153,3 +174,73 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -6592,8 +6603,10 @@ diff -b -B --ignore-all-space --exclude-
 +# these seem questionable:
 +
 +optional_policy(`
-+	abrt_signull(domain)
 +	abrt_domtrans_helper(domain)
++	abrt_read_pid_files(domain)
++	abrt_read_state(domain)
++	abrt_signull(domain)
 +')
 +
 +optional_policy(`
@@ -7518,7 +7531,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.7.4/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/terminal.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/terminal.if	2009-12-16 11:17:07.000000000 -0500
 @@ -273,9 +273,11 @@
  interface(`term_dontaudit_use_console',`
  	gen_require(`
@@ -9530,7 +9543,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/abrt(/.*)?			gen_context(system_u:object_r:abrt_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.if serefpolicy-3.7.4/policy/modules/services/abrt.if
 --- nsaserefpolicy/policy/modules/services/abrt.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/abrt.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/abrt.if	2009-12-16 16:47:43.000000000 -0500
 @@ -19,6 +19,24 @@
  	domtrans_pattern($1, abrt_exec_t, abrt_t)
  ')
@@ -9589,10 +9602,47 @@ diff -b -B --ignore-all-space --exclude-
  ######################################
  ## <summary>
  ##	Read abrt logs.
-@@ -75,6 +119,64 @@
+@@ -75,6 +119,101 @@
  	read_files_pattern($1, abrt_var_log_t, abrt_var_log_t)
  ')
  
++######################################
++## <summary>
++##	Read abrt PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`abrt_read_pid_files',`
++	gen_require(`
++		type abrt_var_run_t;
++	')
++
++	files_search_pids($1)
++	read_files_pattern($1, abrt_var_run_t, abrt_var_run_t)
++')
++
++########################################
++## <summary>
++##	Allow the domain to read abrt state files in /proc.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to allow access.
++##	</summary>
++## </param>
++#
++interface(`abrt_read_state',`
++	gen_require(`
++		type abrt_t;
++	')
++
++	ps_process_pattern($1, abrt_t)
++')
++
 +########################################
 +## <summary>
 +##	Send and receive messages from
@@ -11910,7 +11960,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.7.4/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/avahi.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/avahi.te	2009-12-16 13:33:02.000000000 -0500
 @@ -24,7 +24,7 @@
  # Local policy
  #
@@ -11928,8 +11978,14 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(avahi_t, avahi_var_lib_t, avahi_var_lib_t)
  manage_files_pattern(avahi_t, avahi_var_lib_t, avahi_var_lib_t)
-@@ -47,6 +48,9 @@
- kernel_read_proc_symlinks(avahi_t)
+@@ -42,11 +43,13 @@
+ allow avahi_t avahi_var_run_t:dir setattr;
+ files_pid_filetrans(avahi_t, avahi_var_run_t, file)
+ 
++kernel_read_system_state(avahi_t)
+ kernel_read_kernel_sysctls(avahi_t)
+-kernel_list_proc(avahi_t)
+-kernel_read_proc_symlinks(avahi_t)
  kernel_read_network_state(avahi_t)
  
 +corecmd_exec_bin(avahi_t)
@@ -11938,7 +11994,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(avahi_t)
  corenet_all_recvfrom_netlabel(avahi_t)
  corenet_tcp_sendrecv_generic_if(avahi_t)
-@@ -85,6 +89,10 @@
+@@ -85,6 +88,10 @@
  miscfiles_read_localization(avahi_t)
  miscfiles_read_certs(avahi_t)
  
@@ -12058,7 +12114,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.7.4/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/bluetooth.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/bluetooth.te	2009-12-16 17:05:48.000000000 -0500
 @@ -54,9 +54,9 @@
  # Bluetooth services local policy
  #
@@ -12079,15 +12135,16 @@ diff -b -B --ignore-all-space --exclude-
  
  read_files_pattern(bluetooth_t, bluetooth_conf_t, bluetooth_conf_t)
  
-@@ -94,6 +95,7 @@
+@@ -94,6 +95,8 @@
  kernel_read_kernel_sysctls(bluetooth_t)
  kernel_read_system_state(bluetooth_t)
  kernel_read_network_state(bluetooth_t)
 +kernel_request_load_module(bluetooth_t)
++kernel_search_debugfs(bluetooth_t)
  
  corenet_all_recvfrom_unlabeled(bluetooth_t)
  corenet_all_recvfrom_netlabel(bluetooth_t)
-@@ -111,6 +113,7 @@
+@@ -111,6 +114,7 @@
  dev_rw_generic_usb_dev(bluetooth_t)
  dev_read_urand(bluetooth_t)
  dev_rw_input_dev(bluetooth_t)
@@ -12095,7 +12152,7 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(bluetooth_t)
  fs_search_auto_mountpoints(bluetooth_t)
-@@ -154,6 +157,10 @@
+@@ -154,6 +158,10 @@
  	')
  
  	optional_policy(`
@@ -13291,8 +13348,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.te serefpolicy-3.7.4/policy/modules/services/corosync.te
 --- nsaserefpolicy/policy/modules/services/corosync.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/corosync.te	2009-12-15 14:56:49.000000000 -0500
-@@ -0,0 +1,109 @@
++++ serefpolicy-3.7.4/policy/modules/services/corosync.te	2009-12-16 13:52:21.000000000 -0500
+@@ -0,0 +1,110 @@
 +
 +policy_module(corosync,1.0.0)
 +
@@ -13380,6 +13437,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +miscfiles_read_localization(corosync_t)
 +
++init_read_script_state(corosync_t)
 +init_rw_script_tmp_files(corosync_t)
 +
 +logging_send_syslog_msg(corosync_t)
@@ -16444,7 +16502,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.7.4/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/mysql.te	2009-12-15 16:12:11.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/mysql.te	2009-12-16 14:02:23.000000000 -0500
 @@ -1,6 +1,13 @@
  
  policy_module(mysql, 1.11.0)
@@ -16471,7 +16529,13 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_redhat',`
  	# because Fedora has the sock_file in the database directory
  	type_transition mysqld_t mysqld_db_t:sock_file mysqld_var_run_t;
-@@ -136,10 +148,17 @@
+@@ -131,15 +143,22 @@
+ # Local mysqld_safe policy
+ #
+ 
+-allow mysqld_safe_t self:capability { dac_override fowner chown };
++allow mysqld_safe_t self:capability { kill dac_override fowner chown };
+ allow mysqld_safe_t self:fifo_file rw_fifo_file_perms;
  
  domtrans_pattern(mysqld_safe_t, mysqld_exec_t, mysqld_t)
  
@@ -18309,7 +18373,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.7.4/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/openvpn.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/openvpn.te	2009-12-16 14:04:12.000000000 -0500
 @@ -41,7 +41,7 @@
  # openvpn local policy
  #
@@ -18328,6 +18392,15 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(openvpn_t)
  
  miscfiles_read_localization(openvpn_t)
+@@ -107,7 +109,7 @@
+ 
+ sysnet_dns_name_resolve(openvpn_t)
+ sysnet_exec_ifconfig(openvpn_t)
+-sysnet_write_config(openvpn_t)
++sysnet_manage_config(openvpn_t)
+ sysnet_etc_filetrans_config(openvpn_t)
+ 
+ userdom_use_user_terminals(openvpn_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.if serefpolicy-3.7.4/policy/modules/services/pcscd.if
 --- nsaserefpolicy/policy/modules/services/pcscd.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.4/policy/modules/services/pcscd.if	2009-12-15 14:56:49.000000000 -0500
@@ -24225,7 +24298,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.7.4/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/sssd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/sssd.te	2009-12-16 11:14:38.000000000 -0500
 @@ -16,6 +16,9 @@
  type sssd_var_lib_t;
  files_type(sssd_var_lib_t)
@@ -24236,15 +24309,17 @@ diff -b -B --ignore-all-space --exclude-
  type sssd_var_run_t;
  files_pid_file(sssd_var_run_t)
  
-@@ -23,7 +26,7 @@
+@@ -23,8 +26,8 @@
  #
  # sssd local policy
  #
 -allow sssd_t self:capability { sys_nice setuid };
-+allow sssd_t self:capability { sys_nice setgid setuid };
- allow sssd_t self:process { setsched signal getsched };
+-allow sssd_t self:process { setsched signal getsched };
++allow sssd_t self:capability { kill sys_nice setgid setuid };
++allow sssd_t self:process { setsched sigkill signal getsched };
  allow sssd_t self:fifo_file rw_file_perms;
  allow sssd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ 
 @@ -33,16 +36,24 @@
  manage_sock_files_pattern(sssd_t, sssd_var_lib_t, sssd_var_lib_t)
  files_var_lib_filetrans(sssd_t, sssd_var_lib_t, { file dir } )


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.942
retrieving revision 1.943
diff -u -p -r1.942 -r1.943
--- selinux-policy.spec	16 Dec 2009 13:05:31 -0000	1.942
+++ selinux-policy.spec	16 Dec 2009 23:01:00 -0000	1.943
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.7.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-3
+- Fixes for abrt calls
+
 * Fri Dec 11 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-2
 - Add tgtd policy
 



From cwickert at fedoraproject.org  Wed Dec 16 23:01:38 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 16 Dec 2009 23:01:38 +0000 (UTC)
Subject: rpms/lxmusic/F-12
	lxmusic-0.4.0-check-for-valid-playlist-positions.patch, NONE,
	1.1 lxmusic-0.4.0-invalidate-cur_track_iter.patch, NONE,
	1.1 lxmusic-0.4.0-remove-cur_track_iter.patch, NONE,
	1.1 lxmusic.spec, 1.5, 1.6
Message-ID: <20091216230138.12F6211C0092@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3096/F-12

Modified Files:
	lxmusic.spec 
Added Files:
	lxmusic-0.4.0-check-for-valid-playlist-positions.patch 
	lxmusic-0.4.0-invalidate-cur_track_iter.patch 
	lxmusic-0.4.0-remove-cur_track_iter.patch 
Log Message:
* Wed Dec 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
- Fix crash when emptying large playlists (#539729)


lxmusic-0.4.0-check-for-valid-playlist-positions.patch:
 lxmusic.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lxmusic-0.4.0-check-for-valid-playlist-positions.patch ---
--- trunk/lxmusic/src/lxmusic.c	2009/12/11 21:38:41	2190
+++ trunk/lxmusic/src/lxmusic.c	2009/12/11 22:01:10	2191
@@ -1813,9 +1813,9 @@
         {
 	    xmmsv_t *pos_val;
 	    
-            if( xmmsv_dict_get( val, "position", &pos_val ) ) 
+            if( xmmsv_dict_get( val, "position", &pos_val ) && xmmsv_get_int( pos_val, &pos ) && (pos >= 0 ) ) 
             {
-		xmmsv_get_int( pos_val, &pos );
+		;
                 /* mark currently played song in the playlist with bold font. */
                 GtkTreePath* path = gtk_tree_path_new_from_indices( pos, -1 );
                 GtkTreeIter it;

lxmusic-0.4.0-invalidate-cur_track_iter.patch:
 lxmusic.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE lxmusic-0.4.0-invalidate-cur_track_iter.patch ---
--- trunk/lxmusic/src/lxmusic.c	2009/12/11 04:00:56	2189
+++ trunk/lxmusic/src/lxmusic.c	2009/12/11 21:38:41	2190
@@ -1613,14 +1613,20 @@
                 GtkTreeIter it;
 		xmmsv_get_int( int_value, &pos );
                 path = gtk_tree_path_new_from_indices( pos, -1 );
-                if( gtk_tree_model_get_iter( (GtkTreeModel*)list_store, &it, path ) )
+                if( gtk_tree_model_get_iter( (GtkTreeModel*)list_store, &it, path ) ) 
+		{
                     gtk_list_store_remove( list_store, &it );
+		    /* invalidate currently played track */
+		    if ( it.stamp == cur_track_iter.stamp ) 
+			cur_track_iter.stamp = 0;
+		}
                 gtk_tree_path_free( path );
 	    }
             break;
         case XMMS_PLAYLIST_CHANGED_CLEAR:
         {
             gtk_list_store_clear( list_store );
+	    cur_track_iter.stamp = 0;
             break;
         }
         case XMMS_PLAYLIST_CHANGED_MOVE:

lxmusic-0.4.0-remove-cur_track_iter.patch:
 lxmusic.c |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 14 deletions(-)

--- NEW FILE lxmusic-0.4.0-remove-cur_track_iter.patch ---
--- trunk/lxmusic/src/lxmusic.c	2009/12/13 05:21:24	2194
+++ trunk/lxmusic/src/lxmusic.c	2009/12/13 21:08:32	2195
@@ -107,7 +107,6 @@
 static uint32_t play_time = 0;
 static int32_t cur_track_duration = 0;
 static int32_t cur_track_id = 0;
-static GtkTreeIter cur_track_iter = {0};
 
 static int repeat_mode = REPEAT_NONE;
 
@@ -130,7 +129,10 @@
 static int win_xpos = 0;
 static int win_ypos = 0;
 
-void on_play_btn_clicked(GtkButton* btn, gpointer user_data);
+void 			on_locate_cur_track	(GtkAction* act, gpointer user_data);
+void 			on_play_btn_clicked	(GtkButton* btn, gpointer user_data);
+
+static GtkTreeIter	get_current_track_iter	();
 
 static void load_config()
 {
@@ -1211,7 +1213,7 @@
                         COL_TITLE, title,
                         COL_LEN, time_buf, -1 );
 
-    current_track_updated = ut->it.user_data == cur_track_iter.user_data;
+    current_track_updated = ut->id == cur_track_id;
     if ( current_track_updated ) 
     {
 	/* send desktop notification if current track was updated */  
@@ -1416,8 +1418,8 @@
         g_free(cur_playlist);
         cur_playlist = g_strdup(name);
 
-        cur_track_iter.stamp = 0; /* invalidate the GtkTreeIter of currenyly played track. */
-        cur_track_id = -1;
+	/* invalidate currenyly played track id. */
+        cur_track_id = 0;
 
         /* update the menu */
         if( cur_playlist )
@@ -1617,8 +1619,10 @@
 		{
                     gtk_list_store_remove( list_store, &it );
 		    /* invalidate currently played track */
-		    if ( it.stamp == cur_track_iter.stamp ) 
-			cur_track_iter.stamp = 0;
+		    xmmsv_dict_get( value, "id", &int_value );
+		    xmmsv_get_int( int_value, &id );
+		    if ( id == cur_track_id ) 
+			cur_track_id = 0;
 		}
                 gtk_tree_path_free( path );
 	    }
@@ -1626,7 +1630,7 @@
         case XMMS_PLAYLIST_CHANGED_CLEAR:
         {
             gtk_list_store_clear( list_store );
-	    cur_track_iter.stamp = 0;
+	    cur_track_id = 0;
             break;
         }
         case XMMS_PLAYLIST_CHANGED_MOVE:
@@ -1811,21 +1815,24 @@
 	xmmsv_get_string( name_val, &name );
         if( name && cur_playlist && !strcmp(cur_playlist, name) )
         {
-	    xmmsv_t *pos_val;
-	    
+	    xmmsv_t *pos_val, *int_value;
+
             if( xmmsv_dict_get( val, "position", &pos_val ) && xmmsv_get_int( pos_val, &pos ) && (pos >= 0 ) ) 
             {
-		;
                 /* mark currently played song in the playlist with bold font. */
                 GtkTreePath* path = gtk_tree_path_new_from_indices( pos, -1 );
                 GtkTreeIter it;
                 if( gtk_tree_model_get_iter( GTK_TREE_MODEL(list_store), &it, path ) )
                 {
+		    GtkTreeIter cur_track_iter = get_current_track_iter();
+		    /* prev. current track */
                     if( cur_track_iter.stamp )
                         gtk_list_store_set(list_store, &cur_track_iter, COL_WEIGHT, PANGO_WEIGHT_NORMAL, -1);
-		    
                     gtk_list_store_set(list_store, &it, COL_WEIGHT, PANGO_WEIGHT_BOLD, -1);
-                    cur_track_iter = it;
+
+		    /* update id of currently played track */
+		    xmmsv_dict_get( val, "id", &int_value );
+		    xmmsv_get_int( int_value, &cur_track_id );
                 }
 		/* scroll to currently played song */
 		gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(playlist_view), path, NULL, FALSE, 0.0, 0.0 );
@@ -1836,9 +1843,9 @@
     return TRUE;
 }
 
-
 void on_locate_cur_track(GtkAction* act, gpointer user_data)
 {
+    GtkTreeIter cur_track_iter = get_current_track_iter();
     if( cur_track_iter.stamp )
     {
         GtkTreeModelFilter* mf;
@@ -1860,6 +1867,24 @@
     }
 }
 
+static GtkTreeIter get_current_track_iter() 
+{
+    GtkTreeIter it, found_it = {0};
+    int count=0;
+    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(list_store), &it )) 
+    {
+	do {
+	    count++;
+	    gint weight;
+	    gtk_tree_model_get (GTK_TREE_MODEL(list_store), 
+				&it, COL_WEIGHT, &weight, -1);
+	    if (weight == PANGO_WEIGHT_BOLD) 
+		found_it = it;
+	} while (!found_it.stamp && gtk_tree_model_iter_next( GTK_TREE_MODEL(list_store), &it ));
+    }
+    return found_it;
+}
+
 static void get_channel_volumes( const char *key, xmmsv_t *value, void *user_data)
 {
     GSList** volumes = (GSList**)user_data;


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-12/lxmusic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lxmusic.spec	4 Sep 2009 22:48:41 -0000	1.5
+++ lxmusic.spec	16 Dec 2009 23:01:37 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lxmusic
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
@@ -8,6 +8,13 @@ License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
 Patch0:         lxmusic-0.3.0-no-tools-menu.patch
+# Fixes for https://bugzilla.redhat.com/show_bug.cgi?id=539729
+# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2190
+Patch1:         lxmusic-0.4.0-invalidate-cur_track_iter.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2191
+Patch2:         lxmusic-0.4.0-check-for-valid-playlist-positions.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2195
+Patch3:         lxmusic-0.4.0-remove-cur_track_iter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.6
@@ -23,6 +30,9 @@ player of LXDE (Lightweight X11 Desktop 
 %prep
 %setup -q
 %patch0 -p1 -b .no-tools
+%patch1 -p2 -b .cur_track_iter
+%patch2 -p2 -b .playlist-positions
+%patch3 -p2 -b .cur_track_iter2
 
 
 %build
@@ -54,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
+- Fix crash when emptying large playlists (#539729)
+
 * Sat Sep 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0
 



From chkr at fedoraproject.org  Wed Dec 16 23:04:36 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Dec 2009 23:04:36 +0000 (UTC)
Subject: File banshee-20091216.tar.bz2 uploaded to lookaside cache by chkr
Message-ID: <20091216230436.371EF28ED1C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for banshee:

ec079910af580ddbe9910856ca7b8f24  banshee-20091216.tar.bz2



From sailer at fedoraproject.org  Wed Dec 16 23:11:11 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 16 Dec 2009 23:11:11 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl-shgrt, NONE, 1.1 grt-so.patch, NONE,
	1.1 ghdl-shgrt.spec, 1.1, NONE ghdl-svn131.patch, 1.1,
	NONE grt-dispmemleak.patch, 1.1,
	NONE grt-processtimeoutchain.patch, 1.1, NONE
Message-ID: <20091216231111.3652C11C0092@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5169

Added Files:
	ghdl-shgrt grt-so.patch 
Removed Files:
	ghdl-shgrt.spec ghdl-svn131.patch grt-dispmemleak.patch 
	grt-processtimeoutchain.patch 
Log Message:
remove unneeded patches



--- NEW FILE ghdl-shgrt ---
# This does not work yet.
# There is a wild calling orgy between grt and e~xx.o going on
# grt calls into e~xx.o for __ghdl_ELABORATE and various std__*
# but grt.ver unglobals all except VPI symbols

%global gccver 4.3.4
%global ghdlver 0.28
%global ghdlsvnver 133

Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
Release: 0.%{ghdlsvnver}svn.0%{?dist}
License: GPLv2+
Group: Development/Languages
URL: http://ghdl.free.fr/
# HOWTO create source files from ghdl SVN at https://gna.org/projects/ghdl/
# check out the SVN repo
# cd translate/gcc/
# ./dist.sh sources
Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
Patch100: ghdl-svn%{ghdlsvnver}.patch
Patch103: ghdl-noruntime.patch
Patch104: ghdl-svn110-libgnat44.patch
Patch105: ghdl-grtadac.patch
# Both following patches have been sent to upstream mailing list:
# From: Thomas Sailer <t.sailer at alumni.ethz.ch>
# To: ghdl-discuss at gna.org
# Date: Thu, 02 Apr 2009 15:36:00 +0200
# https://gna.org/bugs/index.php?13390
Patch106: ghdl-ppc64abort.patch
# https://gna.org/bugs/index.php?13389
Patch107: ieee-mathreal.patch
Patch110: grt-so.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires: gcc
# (Build)Requires from fc gcc41 package
%global multilib_64_archs sparc64 ppc64 s390x x86_64
%ifarch s390x
%global multilib_32_arch s390
%endif
%ifarch sparc64
%global multilib_32_arch sparc
%endif
%ifarch ppc64
%global multilib_32_arch ppc
%endif
%ifarch x86_64
%global multilib_32_arch i386
%endif
# Need binutils with -pie support >= 2.14.90.0.4-4
# Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
# Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
# Need binutils which support .weakref >= 2.16.91.0.3-1
BuildRequires: binutils >= 2.16.91.0.3-1
BuildRequires: zlib-devel, gettext, bison, flex, texinfo, gawk
# Make sure pthread.h doesn't contain __thread tokens
# Make sure glibc supports stack protector
BuildRequires: glibc-devel >= 2.3.90-2
%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
# Make sure glibc supports TFmode long double
BuildRequires: glibc >= 2.3.90-35
%endif
# Ada requires Ada to build
BuildRequires: gcc-gnat >= 4.3, libgnat >= 4.3
# GCC build requirements
BuildRequires: gmp-devel >= 4.1, mpfr-devel >= 2.3.0
# Need .eh_frame ld optimizations
# Need proper visibility support
# Need -pie support
# Need --as-needed/--no-as-needed support
# On ppc64, need omit dot symbols support and --non-overlapping-opd
# Need binutils that owns /usr/bin/c++filt
# Need binutils that support .weakref
Requires: binutils >= 2.16.91.0.3-1
# Make sure gdb will understand DW_FORM_strp
Conflicts: gdb < 5.1-2
Requires: glibc-devel >= 2.2.90-12
%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
# Make sure glibc supports TFmode long double
Requires: glibc >= 2.3.90-35
%endif

Requires: ghdl-devel = %{version}-%{release}

# Make sure we don't use clashing namespaces
%global _vendor fedora_ghdl

%global _gnu %{nil}
%ifarch sparc
%global gcc_target_platform sparc64-%{_vendor}-%{_target_os}
%endif
%ifarch ppc
%global gcc_target_platform ppc64-%{_vendor}-%{_target_os}
%endif
%ifnarch sparc ppc
%global gcc_target_platform %{_target_platform}
%endif

# do not strip libgrt.a -- makes debugging tedious otherwise
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's#/usr/lib/rpm/redhat/brp-strip-static-archive .*##g')

%global all_x86 %{ix86} x86_64

%description
GHDL is a VHDL simulator, using the GCC technology. VHDL is a language
standardized by the IEEE, intended for developing electronic systems. GHDL
implements the VHDL language according to the IEEE 1076-1987 or the IEEE
1076-1993 standard. It compiles VHDL files and creates a binary that simulates
(or executes) your design. GHDL does not do synthesis: it cannot translate your
design into a netlist.

Since GHDL is a compiler (i.e., it generates object files), you can call
functions or procedures written in a foreign language, such as C, C++, or
Ada95.

%package devel
Summary: GHDL libraries
Group: Development/Libraries
# rhbz #316311
Requires: zlib-devel, libgnat >= 4.3
Obsoletes: ghdl-grt

%description devel
This package contains the runtime libraries needed to link ghdl-compiled
object files into simulator executables. This package also contains sources
and precompiled binaries for standard VHDL packages.

%ifarch %{all_x86}
%package libs
Summary: GHDL runtime libraries
Group: Development/Libraries

%description libs
This package contains the runtime libraries needed to run ghdl-compiled
simulator executables. grt contains the simulator kernel that tracks
signal updates and schedules processes.
%endif

%ifarch x86_64
%package libs32
Summary: GHDL 32bit runtime libraries
Group: Development/Libraries

%description libs32
This package contains the runtime libraries needed to run ghdl-compiled
simulator executables. grt contains the simulator kernel that tracks
signal updates and schedules processes. This package is needed to compile
32bit executables with ghdl -m32.
%endif



%prep
%setup -q -n gcc-%{gccver} -T -b 0 -a 100
pushd ghdl-%{ghdlver}
%patch100 -p1
%patch103 -p0 -b .noruntime
%patch107 -p0 -b .ieeemathreal
%patch110 -p0 -b .grtso
%{__mv} vhdl ../gcc/
popd
#patch102 -p1 -b .makeinfo
%patch104 -p0 -b .libgnat44
%patch105 -p1 -b .grtadac
%patch106 -p0 -b .ppc64abort

%build
%{__rm} -fr obj-%{gcc_target_platform}
%{__mkdir} obj-%{gcc_target_platform}
pushd obj-%{gcc_target_platform}

# Flag settings cribbed from gcc package
OPT_FLAGS=$(echo %{optflags} | %{__sed} \
        -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g' \
        -e 's/-m64//g;s/-m32//g;s/-m31//g' \
%ifarch sparc sparc64
        -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g' \
%endif
        -e 's/[[:blank:]]\+/ /g')

# These compiler flags in rawhide seem to break the build, so get rid of them
OPT_FLAGS=$(echo $OPT_FLAGS | %{__sed} \
%ifarch i386 i486 i586 i686
        -e 's/-mtune=atom/-mtune=pentium4/g' \
%endif
%ifarch x86_64
        -e 's/-mtune=generic/-mtune=nocona/g' \
%endif
        -e 's/-fstack-protector//g ' \
        -e 's/--param=ssp-buffer-size=[0-9]*//g')

# gcc -m32 fails, so we disable multilibbing.
# so far multilib isn't very valuable, as the VHDL libraries aren't multilibbed
# either; Bug 174731
export CFLAGS="$OPT_FLAGS"
export XCFLAGS="$OPT_FLAGS"
export TCFLAGS="$OPT_FLAGS"
#configure --enable-languages=vhdl
../configure \
        --program-prefix=%{?_program_prefix} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
        --bindir=%{_bindir} \
        --sbindir=%{_sbindir} \
        --sysconfdir=%{_sysconfdir} \
        --datadir=%{_datadir} \
        --includedir=%{_includedir} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libexecdir} \
        --localstatedir=%{_localstatedir} \
        --sharedstatedir=%{_sharedstatedir} \
        --mandir=%{_mandir} \
        --infodir=%{_infodir} \
        --with-bugurl=http://bugzilla.redhat.com/bugzilla \
        --enable-languages=vhdl \
        %{!?_without_mock:--disable-multilib} \
        --enable-shared \
        --enable-threads=posix \
        --enable-checking=release \
        --with-system-zlib \
        --enable-__cxa_atexit \
        --disable-libunwind-exceptions \
        --disable-libgcj \
%ifarch sparc
        --host=%{gcc_target_platform} \
        --build=%{gcc_target_platform} \
        --target=%{gcc_target_platform} \
        --with-cpu=v7
%endif
%ifarch ppc
        --host=%{gcc_target_platform} \
        --build=%{gcc_target_platform} \
        --target=%{gcc_target_platform} \
        --with-cpu=default32
%endif
%ifnarch sparc ppc
        --host=%{gcc_target_platform} \
        --build=%{gcc_target_platform}
%endif

# Parallel make doesn't work, so not using %{?_smp_mflags}
#{__make} all-host
%{__make}

popd

%install
%{__rm} -rf %{buildroot}
%{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install-host

%ifarch %{all_x86}
pushd obj-%{gcc_target_platform}/gcc/vhdl
make grt-clean
make GRT_ADD_FLAGS="-g -O2 -fPIC" GNATVER=4.4 grt-so
%{__install} -d %{buildroot}%{_libdir}
%{__install} libghdlgrt.so* %{buildroot}%{_libdir}
pushd %{buildroot}%{_libdir}
%{__ln_s} libghdlgrt.so* libghdlgrt.so
popd
pushd %{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib
%{__sed} -e 's,@/libgrt.a,-lghdlgrt,g' < grt.lst > grt.lst.1
%{__mv} grt.lst.1 grt.lst
popd
popd

%ifarch x86_64
pushd obj-%{gcc_target_platform}/gcc/vhdl
make grt-clean
make GRT_ADD_FLAGS="-g -O2 -fPIC -m32" GNATVER=4.4 GRT_TARGET_OBJS="i386.o linux.o times.o" grt-so
%{__install} -d %{buildroot}%{_exec_prefix}/lib
%{__install} libghdlgrt.so* %{buildroot}%{_exec_prefix}/lib
pushd %{buildroot}%{_exec_prefix}/lib
%{__ln_s} libghdlgrt.so* libghdlgrt.so
popd
popd
%endif
%endif

%ifarch x86_64
pushd obj-%{gcc_target_platform}/gcc/vhdl
P32=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/32/
%{__install} -d ${P32}
make ghdllibs-clean
%if %{!?_without_mock:0}%{?_without_mock:1}
make grt-clean
make GRT_FLAGS="-m32 -O -g" GRT_TARGET_OBJS="i386.o linux.o times.o" ghdllib
make grt.lst
%{__sed} -e 's,@/libgrt.a,-lghdlgrt,g' < grt.lst > grt.lst.1
%{__install} -m 644 libgrt.a ${P32}/libgrt.a
%{__install} -m 644 grt.lst.1 ${P32}/grt.lst
%{__install} -m 644 grt.ver ${P32}/grt.ver
%endif
PDIR=`pwd`
pushd ${P32}/../..
%{__install} -d lib/32/v93
%{__install} -d lib/32/v87
%{__make} -f ${PDIR}/Makefile REL_DIR=../../../.. \
         LIBSRC_DIR="src" LIB93_DIR=lib/32/v93 LIB87_DIR=lib/32/v87 \
         ANALYZE="${PDIR}/../ghdl -a -m32 --GHDL1=${PDIR}/../ghdl1 --ieee=none" \
         std.v93 std.v87 ieee.v93 ieee.v87 synopsys.v93 synopsys.v87 mentor.v93
popd
../ghdl1 -m32 --std=87 -quiet -o std_standard.s --compile-standard
../xgcc -m32 -c -o std_standard.o std_standard.s
%{__mv} std_standard.o ${P32}/v87/std/std_standard.o
../ghdl1 -m32 --std=93 -quiet -o std_standard.s --compile-standard
../xgcc -m32 -c -o std_standard.o std_standard.s
%{__mv} std_standard.o ${P32}/v93/std/std_standard.o
popd
%endif

# Add additional libraries to link
(
echo "-lm"
%ifarch x86_64
echo "-ldl"
%endif
) >> %{buildroot}%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/grt.lst

# Remove files not to be packaged
pushd %{buildroot}
%{__rm} -f \
        .%{_bindir}/{cpp,gcc,gccbug,gcov} \
        .%{_bindir}/%{gcc_target_platform}-gcc{,-%{gccver}} \
        .%{_includedir}/mf-runtime.h \
        .%{_libdir}/libiberty* \
        .%{_infodir}/dir \
        .%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
        .%{_datadir}/locale/*/LC_MESSAGES/{gcc,cpplib}.mo \
        .%{_mandir}/man1/{cpp,gcc,gcov}.1* \
        .%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7* \
        .%{_exec_prefix}/lib/libgcc_s.* \
        .%{_exec_prefix}/lib/libmudflap.* \
        .%{_exec_prefix}/lib/libmudflapth.* \
        .%{_libdir}/32/libiberty.a
# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
%{__rm} -f \
        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}

# Remove directory hierarchies not to be packaged
%{__rm} -rf \
        .%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/{include,install-tools} \
        .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/install-tools

popd

# copy v08 libraries from v93 for now
P64=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/
%{__cp} -rv ${P64}v93 ${P64}v08
%{__mv} ${P64}v08/std/std-obj93.cf ${P64}v08/std/std-obj08.cf
%{__mv} ${P64}v08/ieee/ieee-obj93.cf ${P64}v08/ieee/ieee-obj08.cf
%{__mv} ${P64}v08/mentor/ieee-obj93.cf ${P64}v08/mentor/ieee-obj08.cf
%{__mv} ${P64}v08/synopsys/ieee-obj93.cf ${P64}v08/synopsys/ieee-obj08.cf
%ifarch x86_64
%{__cp} -rv ${P32}v93 ${P32}v08
%{__mv} ${P32}v08/std/std-obj93.cf ${P32}v08/std/std-obj08.cf
%{__mv} ${P32}v08/ieee/ieee-obj93.cf ${P32}v08/ieee/ieee-obj08.cf
%{__mv} ${P32}v08/mentor/ieee-obj93.cf ${P32}v08/mentor/ieee-obj08.cf
%{__mv} ${P32}v08/synopsys/ieee-obj93.cf ${P32}v08/synopsys/ieee-obj08.cf
%endif

%clean
%{__rm} -rf %{buildroot}

%post
[ -f %{_infodir}/ghdl.info.gz ] && \
        /sbin/install-info %{_infodir}/ghdl.info.gz %{_infodir}/dir || :

%preun
[ -f %{_infodir}/ghdl.info.gz ] && [ $1 = 0 ] && \
        /sbin/install-info --delete %{_infodir}/ghdl.info.gz %{_infodir}/dir || :

%files
%defattr(-,root,root,-)
%doc ghdl-%{ghdlver}/COPYING
%{_bindir}/ghdl
%{_infodir}/ghdl.info.gz
# Need to own directory %{_libexecdir}/gcc even though we only want the
# %{gcc_target_platform}/%{gccver} subdirectory
%{_libexecdir}/gcc/
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
# Need to own directory %{_libdir}/gcc even though we only want the
# %{gcc_target_platform}/%{gccver} subdirectory
%{_libdir}/gcc/
%ifarch %{all_x86}
%{_libdir}/libghdlgrt.so
%endif
%ifarch x86_64
%{_exec_prefix}/lib/libghdlgrt.so
%endif

%ifarch %{all_x86}
%files libs
%defattr(-,root,root,-)
%{_libdir}/libghdlgrt.so.*
%endif

%ifarch x86_64
%files libs32
%defattr(-,root,root,-)
%{_exec_prefix}/lib/libghdlgrt.so.*
%endif


%changelog
* Wed Dec 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.0
- update to svn133
- drop upstreamed patches

* Mon Dec 14 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.2
- Process Timeout Chain bugfix
- --trace-signals memory leak fix

* Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.1
- copy v08 libraries instead of symlink

* Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.0
- update to 0.28/svn131
- symlink v08 libraries to v93 for now

* Wed Sep 23 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.130svn.0
- update to 0.28/svn130

* Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.126svn.0
- update to svn126

* Sun Jul 26 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.8
- this gcc does not understand -mtune=atom

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-0.110svn.7.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue May 26 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.7
- fix bug in std.textio.read (string)

* Wed Apr  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.6
- actually add the patch

* Wed Apr  1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.5
- make ieee.math_real more standards compliant

* Sun Mar 15 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.4
- gnat version is now 4.4

* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-0.110svn.3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Fri Feb 13 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.3
- prevent ppc64 abort due to unknown language type

* Fri Feb 13 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.2
- rebuild with ppc64

* Thu Oct  9 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.1
- rebuild

* Tue Oct  7 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.110svn.0
- update to svn110

* Tue Oct  7 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.27-0.105svn.0
- update to svn105

* Mon Jun  2 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.26-0.98svn.0
- update to svn98

* Fri May 16 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.26-0.94svn.7
- update to svn94

* Sun Jan  6 2008 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.7
- disable Pragma No_Run_Time; it does not seem to make much sense and causes
  problems with gcc-4.3

* Mon Oct  8 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.6
- ghdl-grt requires zlib-devel (rhbz 316311)
- make it build with makeinfo >= 4.10

* Fri Aug 24 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.5
- excludearch ppc64

* Fri Aug 24 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.4
- fix BR

* Fri Aug 24 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.3
- fix license tag

* Fri Jan  5 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.2
- do not try to set user/group during install

* Fri Jan  5 2007 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.1
- back out hunks that cause build failures
- un-exclude ppc

* Mon Nov 20 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.89svn.0
- update to svn89

* Fri Oct  6 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.73svn.0
- update to svn73

* Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.1
- bump release

* Thu Oct  5 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.71svn.0
- update to svn71

* Sun Aug 27 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.25-0.61svn.0
- update to svn61

* Sun Aug  6 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.24-0.60svn.0
- update to svn60

* Tue Jul 11 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.24-0.59svn.2
- rebuild

* Mon Jul 10 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.24-0.59svn.1
- add missing manpage

* Mon Jul 10 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.24-0.59svn.0
- update to svn59

* Sun Jun 25 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.23-0.58svn.0
- update to svn58

* Tue Jun 20 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.23-0.57svn.0
- update to svn57

* Fri Mar 24 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.50svn.1
- do not require /lib/libc.so.* on x86_64, this does not work under mock

* Wed Mar 22 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.50svn.0
- update to svn50, to fix x86_64 breakage
- move grt (ghdl runtime library) into separate package, to allow parallel
  install of i386 and x86_64 grt on x86_64 machines, thus making -m32 work
- back to using FSF gcc as base compiler sources, using core gcc sources
  causes segfaults during library compile on x86_64

* Sun Mar 19 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.49svn.1
- use core gcc as base compiler sources

* Thu Mar 16 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.49svn.0
- update to svn49, using gcc 4.1.0

* Mon Mar  6 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.40svn.0
- update to svn40, to fix an array bounds checking bug apparently
  introduced in svn39

* Thu Feb 16 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.39svn.0
- update to svn39, to fix some constant bugs

* Wed Feb 14 2006 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.38svn.1
- rebuild with new compiler for FC5

* Wed Dec 21 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.22-0.38svn.0
- update to svn38, to fix a ghw output bug

* Sun Dec 18 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-1
- update to 0.21

* Thu Dec 15 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.35svn.1
- update to svn35 for more x86_64 "Ada cannot portably call C vararg functions"
  fixes
- first stab at -m32 library building

* Sat Dec 10 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.33svn.1
- update to svn33, to fix x86_64 issues (real'image, -m32)
- rpmbuild option --without mock enables multilib builds

* Mon Dec  5 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.24svn.3
- disable multilib and remove exclude of x86_64

* Thu Dec  1 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.24svn.2
- Exclude ppc because gcc-gnat is missing
- Exclude x86_64 because of mock build issues

* Fri Nov 25 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.24svn.1
- update to SVN rev 24
- remove additional files to fix x86_64 build

* Tue Nov 22 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.23svn.1
- update to SVN rev 23

* Mon Nov 14 2005 Paul Howarth <paul at city-fan.org> - 0.21-0.21.1
- spec file cosmetic cleanups
- incorporate some architecture tweaks from gcc package
- remove files we don't want packaged so that we can turn the unpackaged file
  check back on
- use fedora_ghdl as the machine vendor name to avoid namespace clashes with
  other packages
- own {%%{_libdir},%%{_libexecdir}}/gcc directories since this package does not
  depend on gcc
- add buildreq texinfo, needed to make info file
- don't include README, which is aimed at building ghdl rather than using it
- remove install-tools and munged header files, not needed for ghdl
- only run install-info if the info file is installed
- patch ghdl.texi to include info dir entry

* Fri Nov 11 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.21-0.21
- update to 0.21pre, svn rev 21
- incorporate changes from Paul Howarth

* Sat Mar 12 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.18-1
- update to 0.18

* Sat Feb 26 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.17-1
- update to 0.17

* Tue Feb  8 2005 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.16-1
- Initial build.


grt-so.patch:
 Makefile.in        |   17 +++++++++++++++++
 grt/config/amd64.S |    3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE grt-so.patch ---
--- vhdl/Makefile.in.grtso	2009-09-20 04:09:28.000000000 +0200
+++ vhdl/Makefile.in	2009-12-14 16:13:46.000000000 +0100
@@ -462,6 +462,15 @@
 
 GRT_ELF_OPTS:=-Wl,--version-script=@/grt.ver -Wl,--export-dynamic
 
+GRT_ADD_FLAGS?=
+
+GRT_FLAGS:=$(GRT_FLAGS) $(GRT_ADD_FLAGS)
+
+GRT_SO_MAJOR?=1
+GRT_SO_MINOR?=0
+GRT_SO_PL?=0
+GNATVER?=4.4
+
 # Set target files.
 ifeq ($(filter-out i%86 linux,$(arch) $(osys)),)
   GRT_TARGET_OBJS=i386.o linux.o times.o
@@ -531,6 +540,14 @@
 	 run-bind.o main.o
 	$(GRT_RANLIB) $@
 
+grt-so: libghdlgrt$(soext).$(GRT_SO_MAJOR).$(GRT_SO_MINOR).$(GRT_SO_PL)
+
+libghdlgrt$(soext).$(GRT_SO_MAJOR).$(GRT_SO_MINOR).$(GRT_SO_PL): \
+	$(GRT_ADD_OBJS) run-bind.o main.o grt-files # grt-arch.ads
+	$(CC) -shared -Wl,-soname,libghdlgrt$(soext).$(GRT_SO_MAJOR) \
+	 $(GRT_FLAGS)  -Wl,-Bsymbolic -o $@ `sed -e "/^-/d" < grt-files` \
+	 $(GRT_ADD_OBJS) run-bind.o main.o -lgnat-$(GNATVER) -lc
+
 run-bind.adb: grt-force
 	gnatmake -c $(GNATFLAGS) -aI$(GRTSRCDIR) $(GRT_PRAGMA_FLAG) \
 	  ghdl_main $(GRT_ADAFLAGS) -cargs $(GRT_FLAGS)
--- vhdl/grt/config/amd64.S.orig	2005-10-31 22:56:04.000000000 +0100
+++ vhdl/grt/config/amd64.S	2009-12-14 18:22:24.000000000 +0100
@@ -62,7 +62,8 @@
 	mov	-16(%rbp), %rsi
 	mov	%rsi, -16(%rax)
 	/* The return function.  Must be 8 mod 16.  */
-	movq	$grt_stack_loop, -24(%rax)
+	leaq	grt_stack_loop(%rip), %rsi
+	movq	%rsi, -24(%rax)
 	/* The context.  */
 	mov	%rbp, -32(%rax)
 	mov	%rbx, -40(%rax)


--- ghdl-shgrt.spec DELETED ---


--- ghdl-svn131.patch DELETED ---


--- grt-dispmemleak.patch DELETED ---


--- grt-processtimeoutchain.patch DELETED ---



From chkr at fedoraproject.org  Wed Dec 16 23:14:52 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Dec 2009 23:14:52 +0000 (UTC)
Subject: rpms/banshee/devel banshee-20091216-last.fm.patch, NONE,
	1.1 .cvsignore, 1.31, 1.32 banshee.spec, 1.88, 1.89 sources,
	1.31, 1.32
Message-ID: <20091216231452.85A4711C0092@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6215

Modified Files:
	.cvsignore banshee.spec sources 
Added Files:
	banshee-20091216-last.fm.patch 
Log Message:
* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 1.5.3-0.1.20091216git
- Update to latest snapshot to pick up DeviceKit-disks integration
  to fix iPod support (BZ 495240)
- Add a minor patch to fix the last.fm integration


banshee-20091216-last.fm.patch:
 LastfmSource.cs |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE banshee-20091216-last.fm.patch ---
diff -uNr banshee-20091216.old/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs banshee-20091216/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
--- banshee-20091216.old/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	2009-12-16 20:20:03.000000000 +0100
+++ banshee-20091216/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	2009-12-16 23:55:14.000000000 +0100
@@ -106,7 +106,9 @@
             Properties.Set<LastfmColumnController> ("TrackView.ColumnController", new LastfmColumnController ());
 
             // FIXME this is temporary until we split the GUI part from the non-GUI part
-            Properties.Set<ISourceContents> ("Nereid.SourceContents", new LazyLoadSourceContents<LastfmSourceContents> ());
+            // LastfmSourceContents must not be initialized lazily in order to get
+            // DataCore.UserAgent/CachePath correctly set by the static constructor
+            Properties.Set<ISourceContents> ("Nereid.SourceContents", new LastfmSourceContents ());
             Properties.Set<bool> ("Nereid.SourceContents.HeaderVisible", false);
 
             actions = new LastfmActions (this);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	23 Nov 2009 03:03:50 -0000	1.31
+++ .cvsignore	16 Dec 2009 23:14:52 -0000	1.32
@@ -1 +1 @@
-banshee-1-1.5.2.tar.bz2
+banshee-20091216.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- banshee.spec	23 Nov 2009 03:03:50 -0000	1.88
+++ banshee.spec	16 Dec 2009 23:14:52 -0000	1.89
@@ -1,13 +1,13 @@
 %global mono_shared %{_builddir}/%{?buildsubdir}
-%global mainver 1.5.2
+%global mainver 1.5.3
 
-#global gitdate 20091118
-#global gitcommit af591d1e5442ddad935d701a6bddeb86a7627024
+%global gitdate 20091216
+%global gitcommit 8e29a44269cd4b2a27822e62815f5bc6e22dfb58
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-#Release: 0.1.%{gitdate}git%{?dist}
-Release: 1%{?dist}
+Release: 0.1.%{gitdate}git%{?dist}
+#Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -16,13 +16,17 @@ URL:     http://banshee-project.org/
 
 # based on libdrm's make-git-snapshot.sh 
 # sh banshee-make-git-snapshot.sh <gitcommit> <gitdate>
-#Source0: %{name}-%{gitdate}.tar.bz2
-Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.bz2
+#Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
 Source2: %{name}-make-git-snapshot.sh
 
 # for snapshots only: don't run configure at the end of autogen.sh
-#Patch0:  %{name}-noconf.patch
+Patch0:  %{name}-noconf.patch
+
+# fix broken last.fm integration
+# https://bugzilla.gnome.org/show_bug.cgi?id=604783
+Patch1: %{name}-20091216-last.fm.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -85,7 +89,7 @@ BuildRequires: autoconf automake libtool
 
 
 
-Requires:      podsleuth
+Requires:      podsleuth >= 0.6.6
 Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
 
@@ -136,16 +140,17 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-1-%{version}
-#setup -q -n %{name}-%{gitdate}
+#%setup -q -n %{name}-1-%{version}
+%setup -q -n %{name}-%{gitdate}
 # Snapshots only
-#patch0 -p1 -b .noconf
+%patch0 -p1 -b .noconf
+%patch1 -p1 -b .lastfm-fix
 cp -p %{SOURCE1} .
 
 %build
 export MONO_SHARED_DIR=%mono_shared
 # Snapshots only
-#./autogen.sh
+./autogen.sh
 %configure  --disable-docs --enable-mtp --enable-ipod --enable-podcast \
 %ifnarch %ix86 x86_64 sparc
             --disable-boo \
@@ -198,7 +203,7 @@ fi
 %files -f %{name}-1.lang
 %defattr(-,root,root,-)
 # ChangeLog not in snapshot
-%doc ChangeLog
+# %doc ChangeLog
 %doc COPYING AUTHORS README README.Fedora NEWS
 %{_bindir}/banshee-1
 %{_bindir}/muinshee
@@ -227,6 +232,11 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 1.5.3-0.1.20091216git
+- Update to latest snapshot to pick up DeviceKit-disks integration
+  to fix iPod support (BZ 495240)
+- Add a minor patch to fix the last.fm integration
+
 * Mon Nov 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.2-1
 - Update to final 1.5.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	23 Nov 2009 03:03:50 -0000	1.31
+++ sources	16 Dec 2009 23:14:52 -0000	1.32
@@ -1 +1 @@
-679042321ac3e809a48304f084ce7cf9  banshee-1-1.5.2.tar.bz2
+ec079910af580ddbe9910856ca7b8f24  banshee-20091216.tar.bz2



From philipp at fedoraproject.org  Wed Dec 16 23:26:50 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 23:26:50 +0000 (UTC)
Subject: rpms/mod_proxy_html/devel mod_proxy_html.spec,1.5,1.6
Message-ID: <20091216232650.1DCED11C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8524

Modified Files:
	mod_proxy_html.spec 
Log Message:
Include mod_xml2enc.so in package.




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/devel/mod_proxy_html.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mod_proxy_html.spec	16 Dec 2009 22:29:08 -0000	1.5
+++ mod_proxy_html.spec	16 Dec 2009 23:26:49 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -25,16 +25,19 @@ an essential component of a reverse prox
 
 %build
 %{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c
+%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_xml2enc.c
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{modulesdir}
 %{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
+%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_xml2enc mod_xml2enc.la
 install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
 %{__sed} -i \
 	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
-	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*proxy_html_module		*modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*xml2enc_module		*modules/mod_xml2enc\.so\)$@\1@' \
 %ifarch x86_64
 	-e 's@/usr/lib/@%{_libdir}/@' \
 %endif
@@ -48,11 +51,15 @@ install -m 644 -D proxy_html.conf %{buil
 %files
 %defattr(-,root,root)
 %{modulesdir}/mod_proxy_html.so
+%{modulesdir}/mod_xml2enc.so
 %config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
 %doc COPYING README
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-6
+- Include mod_xml2enc.  Fix sed script to properly uncomment LoadModule lines.
+
 * Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
 - Initial commit.
 



From mclasen at fedoraproject.org  Wed Dec 16 23:31:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 23:31:28 +0000 (UTC)
Subject: rpms/libgnomekbd/F-12 .cvsignore, 1.23, 1.24 libgnomekbd.spec, 1.54,
	1.55 sources, 1.23, 1.24
Message-ID: <20091216233128.7B79F11C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9586

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	24 Sep 2009 00:09:20 -0000	1.23
+++ .cvsignore	16 Dec 2009 23:31:28 -0000	1.24
@@ -1 +1 @@
-libgnomekbd-2.28.0.tar.bz2
+libgnomekbd-2.28.2.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-12/libgnomekbd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- libgnomekbd.spec	3 Dec 2009 14:11:58 -0000	1.54
+++ libgnomekbd.spec	16 Dec 2009 23:31:28 -0000	1.55
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:        2.28.0
-Release:        4%{?dist}
+Version:        2.28.2
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -135,6 +135,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/libgnomekbd/2.28/libgnomekbd-2.28.2.news
+
 * Thu Dec 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
 - Remove debug in patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	24 Sep 2009 00:09:20 -0000	1.23
+++ sources	16 Dec 2009 23:31:28 -0000	1.24
@@ -1 +1 @@
-b0989c4a2dbe2b5dd892d14195674f2b  libgnomekbd-2.28.0.tar.bz2
+28dce813a6c76439a2136fbd2394a058  libgnomekbd-2.28.2.tar.bz2



From philipp at fedoraproject.org  Wed Dec 16 23:33:16 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 23:33:16 +0000 (UTC)
Subject: rpms/mod_proxy_html/F-12 mod_proxy_html.spec,1.2,1.3
Message-ID: <20091216233316.E42CE11C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9980

Modified Files:
	mod_proxy_html.spec 
Log Message:
Include xml2enc.so




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/F-12/mod_proxy_html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_proxy_html.spec	16 Dec 2009 22:31:27 -0000	1.2
+++ mod_proxy_html.spec	16 Dec 2009 23:33:16 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -25,16 +25,19 @@ an essential component of a reverse prox
 
 %build
 %{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c
+%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_xml2enc.c
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{modulesdir}
 %{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
+%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_xml2enc mod_xml2enc.la
 install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
 %{__sed} -i \
 	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
-	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*proxy_html_module		*modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*xml2enc_module		*modules/mod_xml2enc\.so\)$@\1@' \
 %ifarch x86_64
 	-e 's@/usr/lib/@%{_libdir}/@' \
 %endif
@@ -48,11 +51,15 @@ install -m 644 -D proxy_html.conf %{buil
 %files
 %defattr(-,root,root)
 %{modulesdir}/mod_proxy_html.so
+%{modulesdir}/mod_xml2enc.so
 %config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
 %doc COPYING README
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-6
+- Include mod_xml2enc.  Fix sed script to properly uncomment LoadModule lines.
+
 * Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
 - Initial commit.
 



From philipp at fedoraproject.org  Wed Dec 16 23:40:53 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 23:40:53 +0000 (UTC)
Subject: rpms/mod_proxy_html/F-11 mod_proxy_html.spec,1.2,1.3
Message-ID: <20091216234053.62D7311C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11676

Modified Files:
	mod_proxy_html.spec 
Log Message:
Include xml2enc.so




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/F-11/mod_proxy_html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_proxy_html.spec	16 Dec 2009 22:30:36 -0000	1.2
+++ mod_proxy_html.spec	16 Dec 2009 23:40:52 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -25,16 +25,19 @@ an essential component of a reverse prox
 
 %build
 %{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c
+%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_xml2enc.c
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{modulesdir}
 %{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
+%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_xml2enc mod_xml2enc.la
 install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
 %{__sed} -i \
 	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
-	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*proxy_html_module		*modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*xml2enc_module		*modules/mod_xml2enc\.so\)$@\1@' \
 %ifarch x86_64
 	-e 's@/usr/lib/@%{_libdir}/@' \
 %endif
@@ -48,11 +51,15 @@ install -m 644 -D proxy_html.conf %{buil
 %files
 %defattr(-,root,root)
 %{modulesdir}/mod_proxy_html.so
+%{modulesdir}/mod_xml2enc.so
 %config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
 %doc COPYING README
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-6
+- Include mod_xml2enc.  Fix sed script to properly uncomment LoadModule lines.
+
 * Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
 - Initial commit.
 



From philipp at fedoraproject.org  Wed Dec 16 23:43:12 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 23:43:12 +0000 (UTC)
Subject: rpms/mod_proxy_html/EL-4 mod_proxy_html.spec,1.2,1.3
Message-ID: <20091216234312.D3DA611C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12363

Modified Files:
	mod_proxy_html.spec 
Log Message:
Include xml2enc.so




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-4/mod_proxy_html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_proxy_html.spec	16 Dec 2009 22:36:17 -0000	1.2
+++ mod_proxy_html.spec	16 Dec 2009 23:43:12 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -25,16 +25,19 @@ an essential component of a reverse prox
 
 %build
 %{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c
+%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_xml2enc.c
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{modulesdir}
 %{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
+%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_xml2enc mod_xml2enc.la
 install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
 %{__sed} -i \
 	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
-	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*proxy_html_module		*modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*xml2enc_module		*modules/mod_xml2enc\.so\)$@\1@' \
 %ifarch x86_64
 	-e 's@/usr/lib/@%{_libdir}/@' \
 %endif
@@ -48,11 +51,15 @@ install -m 644 -D proxy_html.conf %{buil
 %files
 %defattr(-,root,root)
 %{modulesdir}/mod_proxy_html.so
+%{modulesdir}/mod_xml2enc.so
 %config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
 %doc COPYING README
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-6
+- Include mod_xml2enc.  Fix sed script to properly uncomment LoadModule lines.
+
 * Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
 - Initial commit.
 



From philipp at fedoraproject.org  Wed Dec 16 23:46:07 2009
From: philipp at fedoraproject.org (Philip Prindeville)
Date: Wed, 16 Dec 2009 23:46:07 +0000 (UTC)
Subject: rpms/mod_proxy_html/EL-5 mod_proxy_html.spec,1.2,1.3
Message-ID: <20091216234607.273AA11C0092@cvs1.fedora.phx.redhat.com>

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12963

Modified Files:
	mod_proxy_html.spec 
Log Message:
Include xml2enc.so




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-5/mod_proxy_html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_proxy_html.spec	16 Dec 2009 22:38:33 -0000	1.2
+++ mod_proxy_html.spec	16 Dec 2009 23:46:07 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -25,16 +25,19 @@ an essential component of a reverse prox
 
 %build
 %{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c
+%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_xml2enc.c
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{modulesdir}
 %{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
+%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_xml2enc mod_xml2enc.la
 install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
 %{__sed} -i \
 	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
-	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*proxy_html_module		*modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*xml2enc_module		*modules/mod_xml2enc\.so\)$@\1@' \
 %ifarch x86_64
 	-e 's@/usr/lib/@%{_libdir}/@' \
 %endif
@@ -48,11 +51,15 @@ install -m 644 -D proxy_html.conf %{buil
 %files
 %defattr(-,root,root)
 %{modulesdir}/mod_proxy_html.so
+%{modulesdir}/mod_xml2enc.so
 %config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
 %doc COPYING README
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-6
+- Include mod_xml2enc.  Fix sed script to properly uncomment LoadModule lines.
+
 * Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
 - Initial commit.
 



From mclasen at fedoraproject.org  Wed Dec 16 23:46:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 16 Dec 2009 23:46:56 +0000 (UTC)
Subject: rpms/libgnomekbd/F-12 libgnomekbd.spec,1.55,1.56
Message-ID: <20091216234656.24F6311C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13204

Modified Files:
	libgnomekbd.spec 
Log Message:
drop upstream patches



Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-12/libgnomekbd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libgnomekbd.spec	16 Dec 2009 23:31:28 -0000	1.55
+++ libgnomekbd.spec	16 Dec 2009 23:46:56 -0000	1.56
@@ -27,10 +27,6 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-# upstream fixes
-Patch0: 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch
-Patch1: 0002-Improved-indicator-background-handling.patch
-
 %description
 The libgnomekbd package contains a GNOME library which manages
 keyboard configuration and offers various widgets related to
@@ -63,8 +59,6 @@ of the keyboard indicator applet.
 
 %prep
 %setup -q
-%patch0 -p1 -b .multiple-keys
-%patch1 -p1 -b .indicator-background
 
 %build
 %configure --disable-static --enable-compile-warnings=no



From chkr at fedoraproject.org  Wed Dec 16 23:47:50 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Dec 2009 23:47:50 +0000 (UTC)
Subject: rpms/banshee/F-12 banshee-20091216-last.fm.patch, NONE,
	1.1 .cvsignore, 
	1.31, 1.32 banshee.spec, 1.87, 1.88 sources, 1.31, 1.32
Message-ID: <20091216234750.DEB8D11C0092@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/banshee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13460

Modified Files:
	.cvsignore banshee.spec sources 
Added Files:
	banshee-20091216-last.fm.patch 
Log Message:
* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 1.5.3-0.1.20091216git
- Update to latest snapshot to pick up DeviceKit-disks integration
  to fix iPod support (BZ 495240)
- Add a minor patch to fix the last.fm integration


banshee-20091216-last.fm.patch:
 LastfmSource.cs |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE banshee-20091216-last.fm.patch ---
diff -uNr banshee-20091216.old/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs banshee-20091216/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
--- banshee-20091216.old/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	2009-12-16 20:20:03.000000000 +0100
+++ banshee-20091216/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	2009-12-16 23:55:14.000000000 +0100
@@ -106,7 +106,9 @@
             Properties.Set<LastfmColumnController> ("TrackView.ColumnController", new LastfmColumnController ());
 
             // FIXME this is temporary until we split the GUI part from the non-GUI part
-            Properties.Set<ISourceContents> ("Nereid.SourceContents", new LazyLoadSourceContents<LastfmSourceContents> ());
+            // LastfmSourceContents must not be initialized lazily in order to get
+            // DataCore.UserAgent/CachePath correctly set by the static constructor
+            Properties.Set<ISourceContents> ("Nereid.SourceContents", new LastfmSourceContents ());
             Properties.Set<bool> ("Nereid.SourceContents.HeaderVisible", false);
 
             actions = new LastfmActions (this);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	24 Nov 2009 20:45:16 -0000	1.31
+++ .cvsignore	16 Dec 2009 23:47:50 -0000	1.32
@@ -1 +1 @@
-banshee-1-1.5.2.tar.bz2
+banshee-20091216.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/banshee.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- banshee.spec	24 Nov 2009 20:45:16 -0000	1.87
+++ banshee.spec	16 Dec 2009 23:47:50 -0000	1.88
@@ -1,13 +1,13 @@
 %global mono_shared %{_builddir}/%{?buildsubdir}
-%global mainver 1.5.2
+%global mainver 1.5.3
 
-#global gitdate 20091118
-#global gitcommit af591d1e5442ddad935d701a6bddeb86a7627024
+%global gitdate 20091216
+%global gitcommit 8e29a44269cd4b2a27822e62815f5bc6e22dfb58
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-#Release: 0.1.%{gitdate}git%{?dist}
-Release: 1%{?dist}
+Release: 0.1.%{gitdate}git%{?dist}
+#Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -16,13 +16,17 @@ URL:     http://banshee-project.org/
 
 # based on libdrm's make-git-snapshot.sh 
 # sh banshee-make-git-snapshot.sh <gitcommit> <gitdate>
-#Source0: %{name}-%{gitdate}.tar.bz2
-Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.bz2
+#Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
 Source2: %{name}-make-git-snapshot.sh
 
 # for snapshots only: don't run configure at the end of autogen.sh
-#Patch0:  %{name}-noconf.patch
+Patch0:  %{name}-noconf.patch
+
+# fix broken last.fm integration
+# https://bugzilla.gnome.org/show_bug.cgi?id=604783
+Patch1: %{name}-20091216-last.fm.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -85,7 +89,7 @@ BuildRequires: autoconf automake libtool
 
 
 
-Requires:      podsleuth
+Requires:      podsleuth >= 0.6.6
 Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
 
@@ -136,16 +140,17 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-1-%{version}
-#setup -q -n %{name}-%{gitdate}
+#%setup -q -n %{name}-1-%{version}
+%setup -q -n %{name}-%{gitdate}
 # Snapshots only
-#patch0 -p1 -b .noconf
+%patch0 -p1 -b .noconf
+%patch1 -p1 -b .lastfm-fix
 cp -p %{SOURCE1} .
 
 %build
 export MONO_SHARED_DIR=%mono_shared
 # Snapshots only
-#./autogen.sh
+./autogen.sh
 %configure  --disable-docs --enable-mtp --enable-ipod --enable-podcast \
 %ifnarch %ix86 x86_64 sparc
             --disable-boo \
@@ -198,7 +203,7 @@ fi
 %files -f %{name}-1.lang
 %defattr(-,root,root,-)
 # ChangeLog not in snapshot
-%doc ChangeLog
+# %doc ChangeLog
 %doc COPYING AUTHORS README README.Fedora NEWS
 %{_bindir}/banshee-1
 %{_bindir}/muinshee
@@ -227,6 +232,11 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 1.5.3-0.1.20091216git
+- Update to latest snapshot to pick up DeviceKit-disks integration
+  to fix iPod support (BZ 495240)
+- Add a minor patch to fix the last.fm integration
+
 * Tue Nov 24 2009 Christian Krause <chkr at fedoraproject.org> - 1.5.2-1
 - Update to final 1.5.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	24 Nov 2009 20:45:17 -0000	1.31
+++ sources	16 Dec 2009 23:47:50 -0000	1.32
@@ -1 +1 @@
-679042321ac3e809a48304f084ce7cf9  banshee-1-1.5.2.tar.bz2
+ec079910af580ddbe9910856ca7b8f24  banshee-20091216.tar.bz2



From chkr at fedoraproject.org  Wed Dec 16 23:57:26 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 16 Dec 2009 23:57:26 +0000 (UTC)
Subject: rpms/podsleuth/F-12 podsleuth-0.6.6-libdir.patch, NONE,
	1.1 podsleuth-make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.6,
	1.7 podsleuth.spec, 1.14, 1.15 sources, 1.6, 1.7
Message-ID: <20091216235726.4D27211C0092@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15566

Modified Files:
	.cvsignore podsleuth.spec sources 
Added Files:
	podsleuth-0.6.6-libdir.patch podsleuth-make-git-snapshot.sh 
Log Message:
* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.6-0.1.20091216git
- Update to git snapshot (20091216) for DeviceKit-disks integration
  (BZ 495240)
- Update libdir patch
- Use upstream's dbus policy file


podsleuth-0.6.6-libdir.patch:
 PodSleuth.Hal/Makefile.am      |    2 +-
 PodSleuth.Hal/hal-podsleuth.in |    2 +-
 PodSleuth.Hal/podsleuth.in     |    2 +-
 PodSleuth/Makefile.am          |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE podsleuth-0.6.6-libdir.patch ---
diff -uNr podsleuth-20091216.old/src/PodSleuth/Makefile.am podsleuth-20091216/src/PodSleuth/Makefile.am
--- podsleuth-20091216.old/src/PodSleuth/Makefile.am	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth/Makefile.am	2009-12-16 20:19:21.000000000 +0100
@@ -9,7 +9,7 @@
 ASSEMBLY_REF = -r:System.Xml -r:Mono.Posix
 ASSEMBLY_RES = data/ipod-model-table
 
-sleuthdir = $(prefix)/lib/podsleuth
+sleuthdir = $(libdir)/podsleuth
 sleuth_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
 
 ASSEMBLY_EXPANDED_RES = $(foreach res,$(ASSEMBLY_RES), $(top_srcdir)/$(res))
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/hal-podsleuth.in podsleuth-20091216/src/PodSleuth.Hal/hal-podsleuth.in
--- podsleuth-20091216.old/src/PodSleuth.Hal/hal-podsleuth.in	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/hal-podsleuth.in	2009-12-16 20:18:35.000000000 +0100
@@ -2,7 +2,7 @@
 
 MONO=mono
 MONO_ARGS="--debug"
-MONO_EXEC="@prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe"
+MONO_EXEC="@libdir@/@PACKAGE@/PodSleuth.Hal.exe"
 
 if [ "$1" = "--update" ]; then
 	MONO_EXEC_ARGS="--update"
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/Makefile.am podsleuth-20091216/src/PodSleuth.Hal/Makefile.am
--- podsleuth-20091216.old/src/PodSleuth.Hal/Makefile.am	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/Makefile.am	2009-12-16 20:19:03.000000000 +0100
@@ -11,7 +11,7 @@
 	$(GTKSHARP_LIBS) \
 	$(NDESK_DBUS_LIBS)
 
-sleuthdir = $(prefix)/lib/podsleuth
+sleuthdir = $(libdir)/podsleuth
 haldir = $(HALCALLOUTSDIR)
 hal_SCRIPTS = hal-podsleuth
 bin_SCRIPTS = podsleuth
diff -uNr podsleuth-20091216.old/src/PodSleuth.Hal/podsleuth.in podsleuth-20091216/src/PodSleuth.Hal/podsleuth.in
--- podsleuth-20091216.old/src/PodSleuth.Hal/podsleuth.in	2009-12-09 04:34:17.000000000 +0100
+++ podsleuth-20091216/src/PodSleuth.Hal/podsleuth.in	2009-12-16 20:18:18.000000000 +0100
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-mono @prefix@/lib/@PACKAGE@/PodSleuth.Hal.exe $@
+mono @libdir@/@PACKAGE@/PodSleuth.Hal.exe $@
 


--- NEW FILE podsleuth-make-git-snapshot.sh ---
#!/bin/sh

# Usage: ./podsleuth-make-git-snapshot.sh [COMMIT] [DATE]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local podsleuth repo to reduce clone time.

if [ -z $2 ]; then
  DATE=`date +%Y%m%d`
else
  DATE=$2
fi

DIRNAME="podsleuth-$DATE"

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
        git://git.gnome.org/podsleuth $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
        | bzip2 > $DIRNAME.tar.bz2

rm -rf $DIRNAME



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Oct 2009 22:34:06 -0000	1.6
+++ .cvsignore	16 Dec 2009 23:57:26 -0000	1.7
@@ -1 +1 @@
-podsleuth-0.6.5.tar.bz2
+podsleuth-20091216.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/podsleuth.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- podsleuth.spec	12 Nov 2009 22:51:53 -0000	1.14
+++ podsleuth.spec	16 Dec 2009 23:57:26 -0000	1.15
@@ -1,21 +1,29 @@
 %define		debug_package %{nil}
 
+%global gitdate 20091216
+%global gitcommit 49fc3d67a9ce098855204e961131a21946a95d01
+
 Name:		podsleuth
-Version:	0.6.5
-Release:	2%{?dist}
+Version:	0.6.6
+#Release:	2%{?dist}
+Release:       0.1.%{gitdate}git%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
 URL:		http://banshee-project.org/
-Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Source1:	podsleuth.conf
-Patch1:		podsleuth-0.6.2-libdir.patch
+# based on libdrm's make-git-snapshot.sh 
+# sh podsleuth-make-git-snapshot.sh <gitcommit> <gitdate>
+Source0: %{name}-%{gitdate}.tar.bz2
+#Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch1:		podsleuth-0.6.6-libdir.patch
 Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
+# Snapshots only
+BuildRequires: autoconf automake libtool
 Requires:	sg3_utils-libs
 Requires:	dbus
 
@@ -43,11 +51,13 @@ Development files for podsleuth.
 
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{name}-%{gitdate}
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
 
 %build
+./autogen.sh
 %configure --with-hal-callouts-dir=%{_libexecdir}
 
 # Breaks when smp flag is set
@@ -58,9 +68,6 @@ make
 %{__rm} -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
-install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/dbus-1/system.d
-
 mkdir -p %{buildroot}%{_localstatedir}/cache/podsleuth
 touch %{buildroot}%{_localstatedir}/cache/podsleuth/ipod-model-table
 
@@ -84,6 +91,12 @@ touch %{buildroot}%{_localstatedir}/cach
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Dec 16 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.6-0.1.20091216git
+- Update to git snapshot (20091216) for DeviceKit-disks integration
+  (BZ 495240)
+- Update libdir patch
+- Use upstream's dbus policy file
+
 * Thu Nov 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-2
 - Add dbus policy file to allow users at the console to re-scan
   the iPod data and to update the iPod database (BZ 533397)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Oct 2009 22:34:06 -0000	1.6
+++ sources	16 Dec 2009 23:57:26 -0000	1.7
@@ -1 +1 @@
-5cbe9c3bb199912e15f65314b4f46ca8  podsleuth-0.6.5.tar.bz2
+bd906c27fb0d4b623a25d25a05c200e8  podsleuth-20091216.tar.bz2



From airlied at fedoraproject.org  Thu Dec 17 00:02:16 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 17 Dec 2009 00:02:16 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xserver-1.7.3-exa-master.patch, NONE,
	1.1 xorg-x11-server.spec, 1.510, 1.511
Message-ID: <20091217000216.5ED2411C0092@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16543

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.3-exa-master.patch 
Log Message:
* Wed Dec 17 2009 Dave Airlie <airlied at redhat.com> 1.7.3-3
- backport EXA fixes from master, should fix xfig crashes X server


xserver-1.7.3-exa-master.patch:
 exa.c                   |  215 +++++++++++++++++-------------------------------
 exa.h                   |    6 -
 exa_accel.c             |   60 +++++++++----
 exa_classic.c           |   22 +++-
 exa_driver.c            |   19 +++-
 exa_glyphs.c            |   54 ++++++------
 exa_migration_classic.c |   40 ++++----
 exa_migration_mixed.c   |   70 ++++++++++++---
 exa_mixed.c             |   67 ++++++++++++--
 exa_offscreen.c         |   37 +-------
 exa_priv.h              |   31 ++++--
 exa_render.c            |    6 -
 exa_unaccel.c           |   77 +++++++++--------
 13 files changed, 384 insertions(+), 320 deletions(-)

--- NEW FILE xserver-1.7.3-exa-master.patch ---
>From 9f493b930ef99253ba7e37dc280daff6738b6401 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 6 Nov 2009 10:29:49 +1000
Subject: exa master

produced with git diff xserver-1.7.3..master exa/

diff --git a/exa/exa.c b/exa/exa.c
index e264d44..b3c5bff 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -233,19 +233,19 @@ exaPixmapIsPinned (PixmapPtr pPix)
 }
 
 /**
- * exaPixmapIsOffscreen() is used to determine if a pixmap is in offscreen
+ * exaPixmapHasGpuCopy() is used to determine if a pixmap is in offscreen
  * memory, meaning that acceleration could probably be done to it, and that it
  * will need to be wrapped by PrepareAccess()/FinishAccess() when accessing it
  * with the CPU.
  *
  * Note that except for UploadToScreen()/DownloadFromScreen() (which explicitly
  * deal with moving pixmaps in and out of system memory), EXA will give drivers
- * pixmaps as arguments for which exaPixmapIsOffscreen() is TRUE.
+ * pixmaps as arguments for which exaPixmapHasGpuCopy() is TRUE.
  *
  * @return TRUE if the given drawable is in framebuffer memory.
  */
 Bool
-exaPixmapIsOffscreen(PixmapPtr pPixmap)
+exaPixmapHasGpuCopy(PixmapPtr pPixmap)
 {
     ScreenPtr	pScreen = pPixmap->drawable.pScreen;
     ExaScreenPriv(pScreen);
@@ -253,16 +253,16 @@ exaPixmapIsOffscreen(PixmapPtr pPixmap)
     if (!(pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS))
 	return FALSE;
 
-    return (*pExaScr->pixmap_is_offscreen)(pPixmap);
+    return (*pExaScr->pixmap_has_gpu_copy)(pPixmap);
 }
 
 /**
- * exaDrawableIsOffscreen() is a convenience wrapper for exaPixmapIsOffscreen().
+ * exaDrawableIsOffscreen() is a convenience wrapper for exaPixmapHasGpuCopy().
  */
 Bool
 exaDrawableIsOffscreen (DrawablePtr pDrawable)
 {
-    return exaPixmapIsOffscreen (exaGetDrawablePixmap (pDrawable));
+    return exaPixmapHasGpuCopy (exaGetDrawablePixmap (pDrawable));
 }
 
 /**
@@ -276,14 +276,14 @@ exaGetOffscreenPixmap (DrawablePtr pDrawable, int *xp, int *yp)
 
     exaGetDrawableDeltas (pDrawable, pPixmap, xp, yp);
 
-    if (exaPixmapIsOffscreen (pPixmap))
+    if (exaPixmapHasGpuCopy (pPixmap))
 	return pPixmap;
     else
 	return NULL;
 }
 
 /**
- * Returns TRUE if pixmap can be accessed offscreen.
+ * Returns TRUE if the pixmap GPU copy is being accessed.
  */
 Bool
 ExaDoPrepareAccess(PixmapPtr pPixmap, int index)
@@ -291,7 +291,7 @@ ExaDoPrepareAccess(PixmapPtr pPixmap, int index)
     ScreenPtr pScreen = pPixmap->drawable.pScreen;
     ExaScreenPriv (pScreen);
     ExaPixmapPriv(pPixmap);
-    Bool offscreen;
+    Bool has_gpu_copy, ret;
     int i;
 
     if (!(pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS))
@@ -304,7 +304,7 @@ ExaDoPrepareAccess(PixmapPtr pPixmap, int index)
     for (i = 0; i < EXA_NUM_PREPARE_INDICES; i++) {
 	if (pExaScr->access[i].pixmap == pPixmap) {
 	    pExaScr->access[i].count++;
-	    return TRUE;
+	    return pExaScr->access[i].retval;
 	}
     }
 
@@ -321,31 +321,35 @@ ExaDoPrepareAccess(PixmapPtr pPixmap, int index)
 			     pPixmap->devPrivate.ptr));
     }
 
-    offscreen = exaPixmapIsOffscreen(pPixmap);
+    has_gpu_copy = exaPixmapHasGpuCopy(pPixmap);
 
-    if (offscreen && pExaPixmap->fb_ptr)
+    if (has_gpu_copy && pExaPixmap->fb_ptr) {
 	pPixmap->devPrivate.ptr = pExaPixmap->fb_ptr;
-    else
+	ret = TRUE;
+    } else {
 	pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr;
+	ret = FALSE;
+    }
 
     /* Store so we can handle repeated / nested calls. */
     pExaScr->access[index].pixmap = pPixmap;
     pExaScr->access[index].count = 1;
 
-    if (!offscreen)
-	return FALSE;
+    if (!has_gpu_copy)
+	goto out;
 
     exaWaitSync (pScreen);
 
     if (pExaScr->info->PrepareAccess == NULL)
-	return TRUE;
+	goto out;
 
     if (index >= EXA_PREPARE_AUX_DEST &&
 	!(pExaScr->info->flags & EXA_SUPPORTS_PREPARE_AUX)) {
 	if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
 	    FatalError("Unsupported AUX indices used on a pinned pixmap.\n");
 	exaMoveOutPixmap (pPixmap);
-	return FALSE;
+	ret = FALSE;
+	goto out;
     }
 
     if (!(*pExaScr->info->PrepareAccess) (pPixmap, index)) {
@@ -353,11 +357,15 @@ ExaDoPrepareAccess(PixmapPtr pPixmap, int index)
 	    !(pExaScr->info->flags & EXA_MIXED_PIXMAPS))
 	    FatalError("Driver failed PrepareAccess on a pinned pixmap.\n");
 	exaMoveOutPixmap (pPixmap);
-
-	return FALSE;
+	ret = FALSE;
+	goto out;
     }
 
-    return TRUE;
+    ret = TRUE;
+
+out:
+    pExaScr->access[index].retval = ret;
+    return ret;
 }
 
 /**
@@ -420,7 +428,7 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
     if (pExaScr->finish_access)
 	pExaScr->finish_access(pPixmap, index);
 
-    if (!pExaScr->info->FinishAccess || !exaPixmapIsOffscreen(pPixmap))
+    if (!pExaScr->info->FinishAccess || !exaPixmapHasGpuCopy(pPixmap))
 	return;
 
     if (i >= EXA_PREPARE_AUX_DEST &&
@@ -480,57 +488,6 @@ const GCFuncs exaGCFuncs = {
     exaCopyClip
 };
 
-/*
- * This wrapper exists to allow fbValidateGC to work.
- * Note that we no longer assume newly created pixmaps to be in normal ram.
- * This assumption is certainly not garuanteed with driver allocated pixmaps.
- */
-static PixmapPtr
-exaCreatePixmapWithPrepare(ScreenPtr pScreen, int w, int h, int depth,
-		unsigned usage_hint)
-{
-    PixmapPtr pPixmap;
-    ExaScreenPriv(pScreen);
-
-    /* This swaps between this function and the real upper layer function.
-     * Normally this would swap to the fb layer pointer, this is a very special case.
-     */
-    swap(pExaScr, pScreen, CreatePixmap);
-    pPixmap = pScreen->CreatePixmap(pScreen, w, h, depth, usage_hint);
-    swap(pExaScr, pScreen, CreatePixmap);
-
-    if (!pPixmap)
-	return NULL;
-
-    /* Note the usage of ExaDoPrepareAccess, this allowed because:
-     * The pixmap is new, so not offscreen in the classic exa case.
-     * For EXA_HANDLES_PIXMAPS the driver will handle whatever is needed.
-     * We want to signal that the pixmaps will be used as destination.
-     */
-    ExaDoPrepareAccess(pPixmap, EXA_PREPARE_AUX_DEST);
-
-    return pPixmap;
-}
-
-static Bool
-exaDestroyPixmapWithFinish(PixmapPtr pPixmap)
-{
[...1610 lines suppressed...]
+    EXA_PRE_FALLBACK_GC(pGC);
     EXA_FALLBACK(("to %p (%c) width %d, count %d\n", pDrawable,
 		  exaDrawableLocation(pDrawable), pGC->lineWidth, nsegInit));
 
@@ -222,14 +221,14 @@ ExaCheckPolySegment (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->PolySegment (pDrawable, pGC, nsegInit, pSegInit);
     exaFinishAccessGC (pGC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
-    EXA_GC_EPILOGUE(pGC);
+    EXA_POST_FALLBACK_GC(pGC);
 }
 
 void
 ExaCheckPolyArc (DrawablePtr pDrawable, GCPtr pGC,
 		int narcs, xArc *pArcs)
 {
-    EXA_GC_PROLOGUE(pGC);
+    EXA_PRE_FALLBACK_GC(pGC);
     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));
 
     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
@@ -237,14 +236,14 @@ ExaCheckPolyArc (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->PolyArc (pDrawable, pGC, narcs, pArcs);
     exaFinishAccessGC (pGC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
-    EXA_GC_EPILOGUE(pGC);
+    EXA_POST_FALLBACK_GC(pGC);
 }
 
 void
 ExaCheckPolyFillRect (DrawablePtr pDrawable, GCPtr pGC,
 		     int nrect, xRectangle *prect)
 {
-    EXA_GC_PROLOGUE(pGC);
+    EXA_PRE_FALLBACK_GC(pGC);
     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));
 
     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
@@ -252,7 +251,7 @@ ExaCheckPolyFillRect (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->PolyFillRect (pDrawable, pGC, nrect, prect);
     exaFinishAccessGC (pGC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
-    EXA_GC_EPILOGUE(pGC);
+    EXA_POST_FALLBACK_GC(pGC);
 }
 
 void
@@ -260,7 +259,7 @@ ExaCheckImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC,
 		      int x, int y, unsigned int nglyph,
 		      CharInfoPtr *ppci, pointer pglyphBase)
 {
-    EXA_GC_PROLOGUE(pGC);
+    EXA_PRE_FALLBACK_GC(pGC);
     EXA_FALLBACK(("to %p (%c)\n", pDrawable,
 		  exaDrawableLocation(pDrawable)));
     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
@@ -268,7 +267,7 @@ ExaCheckImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->ImageGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
     exaFinishAccessGC (pGC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
-    EXA_GC_EPILOGUE(pGC);
+    EXA_POST_FALLBACK_GC(pGC);
 }
 
 void
@@ -276,7 +275,7 @@ ExaCheckPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC,
 		     int x, int y, unsigned int nglyph,
 		     CharInfoPtr *ppci, pointer pglyphBase)
 {
-    EXA_GC_PROLOGUE(pGC);
+    EXA_PRE_FALLBACK_GC(pGC);
     EXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,
 		  exaDrawableLocation(pDrawable), pGC->fillStyle, pGC->alu));
     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
@@ -284,7 +283,7 @@ ExaCheckPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->PolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
     exaFinishAccessGC (pGC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
-    EXA_GC_EPILOGUE(pGC);
+    EXA_POST_FALLBACK_GC(pGC);
 }
 
 void
@@ -292,7 +291,7 @@ ExaCheckPushPixels (GCPtr pGC, PixmapPtr pBitmap,
 		   DrawablePtr pDrawable,
 		   int w, int h, int x, int y)
 {
-    EXA_GC_PROLOGUE(pGC);
+    EXA_PRE_FALLBACK_GC(pGC);
     EXA_FALLBACK(("from %p to %p (%c,%c)\n", pBitmap, pDrawable,
 		  exaDrawableLocation(&pBitmap->drawable),
 		  exaDrawableLocation(pDrawable)));
@@ -303,7 +302,7 @@ ExaCheckPushPixels (GCPtr pGC, PixmapPtr pBitmap,
     exaFinishAccessGC (pGC);
     exaFinishAccess (&pBitmap->drawable, EXA_PREPARE_SRC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
-    EXA_GC_EPILOGUE(pGC);
+    EXA_POST_FALLBACK_GC(pGC);
 }
 
 void
@@ -311,7 +310,7 @@ ExaCheckCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
     DrawablePtr pDrawable = &pWin->drawable;
     ScreenPtr pScreen = pDrawable->pScreen;
-    ExaScreenPriv(pScreen);
+    EXA_PRE_FALLBACK(pScreen);
     EXA_FALLBACK(("from %p\n", pWin));
 
     /* being both src and dest, src is safest. */
@@ -320,6 +319,7 @@ ExaCheckCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     pScreen->CopyWindow (pWin, ptOldOrg, prgnSrc);
     swap(pExaScr, pScreen, CopyWindow);
     exaFinishAccess (pDrawable, EXA_PREPARE_SRC);
+    EXA_POST_FALLBACK(pScreen);
 }
 
 void
@@ -328,8 +328,7 @@ ExaCheckGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
 {
     ScreenPtr pScreen = pDrawable->pScreen;
     PixmapPtr pPix = exaGetDrawablePixmap (pDrawable);
-    ExaScreenPriv(pScreen);
-
+    EXA_PRE_FALLBACK(pScreen);
     EXA_FALLBACK(("from %p (%c)\n", pDrawable,
 		  exaDrawableLocation(pDrawable)));
 
@@ -355,6 +354,7 @@ ExaCheckGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
     pScreen->GetImage (pDrawable, x, y, w, h, format, planeMask, d);
     swap(pExaScr, pScreen, GetImage);
     exaFinishAccess (pDrawable, EXA_PREPARE_SRC);
+    EXA_POST_FALLBACK(pScreen);
 }
 
 void
@@ -366,14 +366,15 @@ ExaCheckGetSpans (DrawablePtr pDrawable,
 		 char *pdstStart)
 {
     ScreenPtr pScreen = pDrawable->pScreen;
-    ExaScreenPriv(pScreen);
 
+    EXA_PRE_FALLBACK(pScreen);
     EXA_FALLBACK(("from %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));
     exaPrepareAccess (pDrawable, EXA_PREPARE_SRC);
     swap(pExaScr, pScreen, GetSpans);
     pScreen->GetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
     swap(pExaScr, pScreen, GetSpans);
     exaFinishAccess (pDrawable, EXA_PREPARE_SRC);
+    EXA_POST_FALLBACK(pScreen);
 }
 
 void
@@ -394,9 +395,9 @@ ExaCheckComposite (CARD8      op,
 #ifdef RENDER
     PictureScreenPtr	ps = GetPictureScreen(pScreen);
 #endif /* RENDER */
-    ExaScreenPriv(pScreen);
     RegionRec region;
     int xoff, yoff;
+    EXA_PRE_FALLBACK(pScreen);
 
     REGION_NULL(pScreen, &region);
 
@@ -413,7 +414,9 @@ ExaCheckComposite (CARD8      op,
 	PixmapPtr pDstPix;
 
 	if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,
-				       xSrc, ySrc, xMask, yMask, xDst, yDst,
+				       xSrc, ySrc, xMask, yMask,
+				       xDst + pDst->pDrawable->x,
+				       yDst + pDst->pDrawable->y,
 				       width, height))
 	    goto skip;
 
@@ -471,6 +474,7 @@ skip:
 	exaFinishAccess(pMask->alphaMap->pDrawable, EXA_PREPARE_AUX_MASK);
 
     REGION_UNINIT(pScreen, &region);
+    EXA_POST_FALLBACK(pScreen);
 }
 
 void
@@ -484,7 +488,7 @@ ExaCheckAddTraps (PicturePtr	pPicture,
 #ifdef RENDER
     PictureScreenPtr	ps = GetPictureScreen(pScreen);
 #endif /* RENDER */
-    ExaScreenPriv(pScreen);
+    EXA_PRE_FALLBACK(pScreen);
 
     EXA_FALLBACK(("to pict %p (%c)\n",
 		  exaDrawableLocation(pPicture->pDrawable)));
@@ -495,6 +499,7 @@ ExaCheckAddTraps (PicturePtr	pPicture,
     swap(pExaScr, ps, AddTraps);
 #endif /* RENDER */
     exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+    EXA_POST_FALLBACK(pScreen);
 }
 
 /**


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- xorg-x11-server.spec	14 Dec 2009 18:26:31 -0000	1.510
+++ xorg-x11-server.spec	17 Dec 2009 00:02:15 -0000	1.511
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.3
-Release:   2%{dist}
+Release:   3%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -75,12 +75,14 @@ Patch6044: xserver-1.6.99-hush-prereleas
 Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 
 Patch6047: xserver-1.7.0-glx-versioning.patch
-Patch6048: xserver-1.7.0-exa-fix-mixed.patch
+#Patch6048: xserver-1.7.0-exa-fix-mixed.patch
 Patch6049: xserver-1.7.1-multilib.patch
 Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
 Patch6052: xserver-1.7.1-libcrypto.patch
 Patch6066: xserver-1.7.1-glx14-swrast.patch
 
+Patch6067: xserver-1.7.3-exa-master.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -507,6 +509,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Dec 17 2009 Dave Airlie <airlied at redhat.com> 1.7.3-3
+- backport EXA fixes from master, should fix xfig crashes X server
+
 * Mon Dec 14 2009 Adam Jackson <ajax at redhat.com> 1.7.3-2
 - xserver-1.7.1-sigaction.patch: Drop, exacerbates a race that leads to weird
   behaviour like spontaneously repeating keys.



From phuang at fedoraproject.org  Thu Dec 17 00:03:40 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 17 Dec 2009 00:03:40 +0000 (UTC)
Subject: File ibus-m17n-1.2.0.20091217.tar.gz uploaded to lookaside cache by
	phuang
Message-ID: <20091217000340.D152A28ED3C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ibus-m17n:

9bcccb93c3385bda01172f846b716048  ibus-m17n-1.2.0.20091217.tar.gz



From phuang at fedoraproject.org  Thu Dec 17 00:04:59 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 17 Dec 2009 00:04:59 +0000 (UTC)
Subject: rpms/ibus-m17n/devel .cvsignore, 1.12, 1.13 ibus-m17n-iok.patch, 1.2,
	1.3 ibus-m17n.spec, 1.20, 1.21 sources, 1.12, 1.13
Message-ID: <20091217000459.F09BC11C0092@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17265

Modified Files:
	.cvsignore ibus-m17n-iok.patch ibus-m17n.spec sources 
Log Message:
Update 1.2.0.20091217


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Nov 2009 05:57:02 -0000	1.12
+++ .cvsignore	17 Dec 2009 00:04:59 -0000	1.13
@@ -1 +1 @@
-ibus-m17n-1.2.0.20091120.tar.gz
+ibus-m17n-1.2.0.20091217.tar.gz

ibus-m17n-iok.patch:
 engine.c |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 7 deletions(-)

Index: ibus-m17n-iok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/ibus-m17n-iok.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-m17n-iok.patch	20 Nov 2009 05:57:02 -0000	1.2
+++ ibus-m17n-iok.patch	17 Dec 2009 00:04:59 -0000	1.3
@@ -1,5 +1,5 @@
 diff --git a/src/engine.c b/src/engine.c
-index d6ac852..6427a55 100644
+index 8dc5c46..1f602a1 100644
 --- a/src/engine.c
 +++ b/src/engine.c
 @@ -17,6 +17,8 @@ struct _IBusM17NEngine {
@@ -50,42 +50,36 @@ index d6ac852..6427a55 100644
  
      m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type,
                                                         n_construct_params,
-@@ -166,6 +184,14 @@ ibus_m17n_engine_constructor (GType                   type,
+@@ -166,6 +184,15 @@ ibus_m17n_engine_constructor (GType                   type,
  
      engine_name = ibus_engine_get_name ((IBusEngine *) m17n);
      g_assert (engine_name);
 +    m17n->keymap_name =  g_strdup (engine_name);
 +
-+    strv = g_strsplit (engine_name, ":", 2);
-+    g_assert (g_strv_length (strv) == 2);
++    strv = g_strsplit (engine_name, ":", 3);
++    g_assert (g_strv_length (strv) == 3);
++    g_assert (g_strcmp0 (strv[0], "m17n") == 0);
 +
 +    /* show iok icon for inscript */
-+    if(strcmp (strv[1], "inscript") == 0 || strcmp (strv[1] , "inscript2") == 0)
-+        ibus_property_set_visible (m17n->show_iok_prop,TRUE);
++    if(strcmp (strv[2], "inscript") == 0 || strcmp (strv[2] , "inscript2") == 0)
++        ibus_property_set_visible (m17n->show_iok_prop, TRUE);
  
      if (im_table == NULL) {
          im_table = g_hash_table_new_full (g_str_hash,
-@@ -176,18 +202,7 @@ ibus_m17n_engine_constructor (GType                   type,
- 
-     im = (MInputMethod *) g_hash_table_lookup (im_table, engine_name);
+@@ -178,12 +205,6 @@ ibus_m17n_engine_constructor (GType                   type,
      if (im == NULL) {
--        gchar *lang;
--        gchar *name;
+         gchar *lang;
+         gchar *name;
 -        gchar **strv;
 -
--        strv = g_strsplit (engine_name, ":", 2);
--
--        g_assert (g_strv_length (strv) == 2);
+-        strv = g_strsplit (engine_name, ":", 3);
 -
--        lang = strv[0];
--        name = strv[1];
--
--        im = minput_open_im (msymbol (lang), msymbol (name), NULL);
-+        im = minput_open_im (msymbol (strv[0]), msymbol (strv[1]), NULL);
-         if (im != NULL) {
-             mplist_put (im->driver.callback_list, Minput_preedit_start, ibus_m17n_engine_callback);
-             mplist_put (im->driver.callback_list, Minput_preedit_draw, ibus_m17n_engine_callback);
-@@ -207,9 +222,9 @@ ibus_m17n_engine_constructor (GType                   type,
+-        g_assert (g_strv_length (strv) == 3);
+-        g_assert (g_strcmp0 (strv[0], "m17n") == 0);
+ 
+         lang = strv[1];
+         name = strv[2];
+@@ -208,9 +229,9 @@ ibus_m17n_engine_constructor (GType                   type,
              g_hash_table_insert (im_table, g_strdup (engine_name), im);
          }
  
@@ -96,7 +90,7 @@ index d6ac852..6427a55 100644
      if (im == NULL) {
          g_warning ("Can not find m17n keymap %s", engine_name);
          g_object_unref (m17n);
-@@ -231,6 +246,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
+@@ -232,6 +253,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
          m17n->prop_list = NULL;
      }
  
@@ -104,7 +98,7 @@ index d6ac852..6427a55 100644
      if (m17n->status_prop) {
          g_object_unref (m17n->status_prop);
          m17n->status_prop = NULL;
-@@ -383,6 +399,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
+@@ -384,6 +406,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
      IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
  
      ibus_engine_register_properties (engine, m17n->prop_list);
@@ -112,7 +106,7 @@ index d6ac852..6427a55 100644
      ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
  
      parent_class->focus_in (engine);
-@@ -468,6 +485,19 @@ ibus_m17n_engine_property_activate (IBusEngine  *engine,
+@@ -469,6 +492,20 @@ ibus_m17n_engine_property_activate (IBusEngine  *engine,
                                      const gchar *prop_name,
                                      guint        prop_state)
  {
@@ -121,10 +115,11 @@ index d6ac852..6427a55 100644
 +
 +    IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
 +
-+    strv = g_strsplit (m17n->keymap_name, ":", 2);
-+    g_assert (g_strv_length (strv) == 2);
++    strv = g_strsplit (m17n->keymap_name, ":", 3);
++    g_assert (g_strv_length (strv) == 3);
++    g_assert (g_strcmp0 (strv[0], "m17n") == 0);
 +
-+    sprintf (cmd, "/usr/bin/iok -n %s", strv[0]);
++    sprintf (cmd, "/usr/bin/iok -n %s", strv[1]);
 +    g_debug ("keymap name = %s,prop_name=%s, prop_state=%d", m17n->keymap_name, prop_name, prop_state);
 +    g_strfreev (strv);
 +


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/ibus-m17n.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-m17n.spec	25 Nov 2009 05:40:26 -0000	1.20
+++ ibus-m17n.spec	17 Dec 2009 00:04:59 -0000	1.21
@@ -1,7 +1,7 @@
 %define require_ibus_version 1.2.0
 
 Name:       ibus-m17n
-Version:    1.2.0.20091120
+Version:    1.2.0.20091217
 Release:    1%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
@@ -52,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Thu Dec 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091217-1
+- Update to 1.2.0.20091217.
+- Update iok patch.
+
 * Fri Nov 20 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091120-1
 - Update to 1.2.0.20091120.
 - Fix bug 530976


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Nov 2009 05:57:02 -0000	1.12
+++ sources	17 Dec 2009 00:04:59 -0000	1.13
@@ -1 +1 @@
-49314ce44f3e8a1d2714ca6fdae79cb8  ibus-m17n-1.2.0.20091120.tar.gz
+9bcccb93c3385bda01172f846b716048  ibus-m17n-1.2.0.20091217.tar.gz



From jspaleta at fedoraproject.org  Thu Dec 17 00:08:33 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Thu, 17 Dec 2009 00:08:33 +0000 (UTC)
Subject: File CouchDB-0.6.1.tar.gz uploaded to lookaside cache by jspaleta
Message-ID: <20091217000833.72B2528ED1C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-couchdb:

a5f11977d8c7e26d8dbc9c5f56a9bf6b  CouchDB-0.6.1.tar.gz



From jspaleta at fedoraproject.org  Thu Dec 17 00:09:58 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Thu, 17 Dec 2009 00:09:58 +0000 (UTC)
Subject: rpms/python-couchdb/devel import.log, NONE,
	1.1 python-couchdb-shebang.patch, NONE, 1.1 python-couchdb.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091217000958.2AB9A11C0092@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/python-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18135/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-couchdb-shebang.patch python-couchdb.spec 
Log Message:

 ----------------------------------------------------------------------
 Initial python-couchdb import 
 Modified Files:
 	devel/.cvsignore devel/sources 
 Added Files:
 	devel/import.log devel/python-couchdb-shebang.patch 
 	devel/python-couchdb.spec 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
python-couchdb-0_6_1-1_fc10:HEAD:python-couchdb-0.6.1-1.fc10.src.rpm:1261008503

python-couchdb-shebang.patch:
 tests/couch_tests.py             |    1 -
 tools/dump.py                    |    1 -
 tools/load.py                    |    1 -
 tools/replication_helper.py      |    1 -
 tools/replication_helper_test.py |    1 -
 view.py                          |    1 -
 6 files changed, 6 deletions(-)

--- NEW FILE python-couchdb-shebang.patch ---
diff -u -r CouchDB-0.6.1/couchdb/tests/couch_tests.py CouchDB-0.6.1-new/couchdb/tests/couch_tests.py
--- CouchDB-0.6.1/couchdb/tests/couch_tests.py	2009-12-14 03:16:29.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tests/couch_tests.py	2009-12-15 13:58:38.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2008 Christopher Lenz
diff -u -r CouchDB-0.6.1/couchdb/tools/dump.py CouchDB-0.6.1-new/couchdb/tools/dump.py
--- CouchDB-0.6.1/couchdb/tools/dump.py	2009-12-14 03:16:29.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tools/dump.py	2009-12-15 13:56:13.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2009 Christopher Lenz
diff -u -r CouchDB-0.6.1/couchdb/tools/load.py CouchDB-0.6.1-new/couchdb/tools/load.py
--- CouchDB-0.6.1/couchdb/tools/load.py	2009-12-08 09:38:52.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tools/load.py	2009-12-15 13:56:19.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2009 Christopher Lenz
diff -u -r CouchDB-0.6.1/couchdb/tools/replication_helper.py CouchDB-0.6.1-new/couchdb/tools/replication_helper.py
--- CouchDB-0.6.1/couchdb/tools/replication_helper.py	2009-12-08 09:38:52.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tools/replication_helper.py	2009-12-15 13:56:42.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright 2008 Jan Lehnardt <jan at apache.org>
diff -u -r CouchDB-0.6.1/couchdb/tools/replication_helper_test.py CouchDB-0.6.1-new/couchdb/tools/replication_helper_test.py
--- CouchDB-0.6.1/couchdb/tools/replication_helper_test.py	2009-12-08 09:38:52.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tools/replication_helper_test.py	2009-12-15 13:58:48.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright 2008 Jan lehnardt <jan at apache.org>
diff -u -r CouchDB-0.6.1/couchdb/view.py CouchDB-0.6.1-new/couchdb/view.py
--- CouchDB-0.6.1/couchdb/view.py	2009-12-14 03:16:29.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/view.py	2009-12-15 13:56:25.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2008 Christopher Lenz


--- NEW FILE python-couchdb.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-couchdb
Version:        0.6.1
Release:        1%{?dist}
Summary:        A Python library for working with CouchDB

Group:          Development/Languages
License:        BSD
URL:            http://code.google.com/p/couchdb-python/
Source0:        http://pypi.python.org/packages/source/C/CouchDB/CouchDB-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:         python-couchdb-shebang.patch

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       couchdb
Requires:       python-httplib2
Requires:       python-simplejson

%package devel
Summary:        The  API reference files for CouchDB 
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description
Providing a convenient high level interface for the CouchDB server.

%description devel
CouchDB python binding API reference documentation for use in development. 


%prep
%setup -q -n CouchDB-%{version}
%patch0 -p1


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

# calm rpmlint down
find  $RPM_BUILD_ROOT/%{python_sitelib}/couchdb -name \*.py -print0 | xargs --null chmod 0644


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog.txt COPYING README.txt 
%{_bindir}/couchdb-dump
%{_bindir}/couchdb-load
%{_bindir}/couchdb-replicate
%{_bindir}/couchpy
%{python_sitelib}/CouchDB-%{version}-py2.5.egg-info
%{python_sitelib}/couchdb

%files devel
%defattr(-,root,root,-)
%doc doc/api doc/index.html

%changelog
* Tue Dec 15 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.1-1
- New upstream version

* Mon Dec 14 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6-2
- Specfile cleanup based on review feedback

* Wed Nov 25 2009 Sebastian Dziallas <sebastian at when.com> - 0.6-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-couchdb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:28:56 -0000	1.1
+++ .cvsignore	17 Dec 2009 00:09:57 -0000	1.2
@@ -0,0 +1 @@
+CouchDB-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-couchdb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:28:56 -0000	1.1
+++ sources	17 Dec 2009 00:09:57 -0000	1.2
@@ -0,0 +1 @@
+a5f11977d8c7e26d8dbc9c5f56a9bf6b  CouchDB-0.6.1.tar.gz



From mclasen at fedoraproject.org  Thu Dec 17 00:10:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:10:59 +0000 (UTC)
Subject: File mousetweaks-2.28.2.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091217001059.1D94128ED58@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mousetweaks:

c8f8a2a57f02133adb6069f74bbd0004  mousetweaks-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 00:13:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:13:45 +0000 (UTC)
Subject: rpms/mousetweaks/F-12 .cvsignore, 1.30, 1.31 mousetweaks.spec, 1.37,
	1.38 sources, 1.30, 1.31
Message-ID: <20091217001345.65DEA11C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18963

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/F-12/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	20 Oct 2009 01:52:53 -0000	1.30
+++ .cvsignore	17 Dec 2009 00:13:45 -0000	1.31
@@ -1 +1 @@
-mousetweaks-2.28.1.tar.bz2
+mousetweaks-2.28.2.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/F-12/mousetweaks.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- mousetweaks.spec	20 Oct 2009 01:52:53 -0000	1.37
+++ mousetweaks.spec	17 Dec 2009 00:13:45 -0000	1.38
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.28.1
+Version:	2.28.2
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -108,6 +108,10 @@ fi
 %doc %{_mandir}/man1/*
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/mousetweaks/2.28/mousetweaks-2.28.2.news
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	20 Oct 2009 01:52:53 -0000	1.30
+++ sources	17 Dec 2009 00:13:45 -0000	1.31
@@ -1 +1 @@
-a6d786f4df2be96202d76c4c0e6ba43c  mousetweaks-2.28.1.tar.bz2
+c8f8a2a57f02133adb6069f74bbd0004  mousetweaks-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 00:15:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:15:37 +0000 (UTC)
Subject: File gucharmap-2.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091217001537.1133428ECE0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gucharmap:

d4ff2195141ca71aebfeb766e18d9607  gucharmap-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 00:17:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:17:40 +0000 (UTC)
Subject: rpms/gucharmap/F-12 .cvsignore, 1.25, 1.26 gucharmap.spec, 1.45,
	1.46 sources, 1.25, 1.26
Message-ID: <20091217001740.88E4E11C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19879

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	19 Oct 2009 20:50:27 -0000	1.25
+++ .cvsignore	17 Dec 2009 00:17:40 -0000	1.26
@@ -1 +1 @@
-gucharmap-2.28.1.tar.bz2
+gucharmap-2.28.2.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-12/gucharmap.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- gucharmap.spec	19 Oct 2009 20:50:27 -0000	1.45
+++ gucharmap.spec	17 Dec 2009 00:17:40 -0000	1.46
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.28.1
+Version:        2.28.2
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	19 Oct 2009 20:50:27 -0000	1.25
+++ sources	17 Dec 2009 00:17:40 -0000	1.26
@@ -1 +1 @@
-409a08462fab85daa5523e950a794561  gucharmap-2.28.1.tar.bz2
+d4ff2195141ca71aebfeb766e18d9607  gucharmap-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 00:21:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:21:23 +0000 (UTC)
Subject: File gnome-terminal-2.28.2.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091217002123.8AA1D28ECE0@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gnome-terminal:

aa053ff38932cf032c70ab6522603053  gnome-terminal-2.28.2.tar.bz2



From praveenp at fedoraproject.org  Thu Dec 17 00:23:05 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 17 Dec 2009 00:23:05 +0000 (UTC)
Subject: rpms/openwsman/F-12 openwsman-randfile.patch, NONE,
	1.1 openwsman-initscript.patch, 1.2, 1.3 openwsman.spec, 1.6, 1.7
Message-ID: <20091217002305.1643E11C0092@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20949

Modified Files:
	openwsman-initscript.patch openwsman.spec 
Added Files:
	openwsman-randfile.patch 
Log Message:
Changed the random file and some init script changes to not start the 
server by default


openwsman-randfile.patch:
 ssleay.cnf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openwsman-randfile.patch ---
diff -up ./etc/ssleay.cnf.new ./etc/ssleay.cnf
--- ./etc/ssleay.cnf.new	2009-12-16 17:04:15.000000000 -0600
+++ ./etc/ssleay.cnf	2009-12-16 17:04:55.000000000 -0600
@@ -2,7 +2,7 @@
 # SSLeay example configuration file.
 #
 
-RANDFILE                = $ENV::HOME/.rnd
+RANDFILE                = /dev/random
 
 [ req ]
 default_bits            = 1024

openwsman-initscript.patch:
 openwsmand.sh.in |   71 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 18 deletions(-)

Index: openwsman-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/openwsman-initscript.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openwsman-initscript.patch	11 Dec 2009 21:58:26 -0000	1.2
+++ openwsman-initscript.patch	17 Dec 2009 00:23:04 -0000	1.3
@@ -1,16 +1,24 @@
-diff -up ./etc/init/openwsmand.sh.in.org ./etc/init/openwsmand.sh.in
---- ./etc/init/openwsmand.sh.in.org	2009-12-11 13:04:10.000000000 -0600
-+++ ./etc/init/openwsmand.sh.in	2009-12-11 13:14:14.000000000 -0600
-@@ -5,7 +5,7 @@
+diff -up ./etc/init/openwsmand.sh.in.new ./etc/init/openwsmand.sh.in
+--- ./etc/init/openwsmand.sh.in.new	2009-12-16 18:16:06.000000000 -0600
++++ ./etc/init/openwsmand.sh.in	2009-12-16 18:16:18.000000000 -0600
+@@ -4,21 +4,21 @@
+ # Provides: openwsmand
  # Required-Start: $remote_fs
  # Required-Stop: $network
- # Default-Start: 2 3 4 5
+-# Default-Start: 2 3 4 5
 -# Default-Stop: 0 1 6 
-+# Default-Stop:  0 1 6
++# Default-Start:
++# Default-Stop:
  # Short-Description: Openwsman Daemon
  # Description: openwsmand
  #       Start/Stop the Openwsman Daemon
-@@ -18,7 +18,7 @@
+ ### END INIT INFO
+ #
+ #
+-# chkconfig: 2345 36 64
++# chkconfig: - 36 64
+ # description: Openwsman Daemon
+ # processname: openwsmand
  
  NAME=openwsmand
  DAEMON=/usr/sbin/$NAME


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/openwsman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openwsman.spec	11 Dec 2009 21:58:27 -0000	1.6
+++ openwsman.spec	17 Dec 2009 00:23:04 -0000	1.7
@@ -30,7 +30,7 @@ BuildRequires:  perl-devel pkgconfig ope
 BuildRequires:  libtool
 Requires:       net-tools
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
@@ -40,6 +40,7 @@ Source1:        %{name}.rpmlintrc
 Patch0:         %{name}-pam-auth.patch
 Patch1:         %{name}-initscript.patch
 Patch2:         perl-bindings.patch
+Patch3:         %{name}-randfile.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 
 %description
@@ -121,6 +122,9 @@ License:        BSD
 Group:          System Environment/Daemons
 Requires:       net-tools
 Requires:       openwsman-client
+Requires(post):       chkconfig
+Requires(preun):      chkconfig
+Requires(postun):     initscripts
 Summary:        Openwsman Server and service libraries
 
 %description server
@@ -192,6 +196,7 @@ Authors:
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 sh autoconfiscate.sh
@@ -310,6 +315,10 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
+* Wed Dec 16 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-3
+- Changed the random file used by openssl to generate a certificate while
+- starting the openwsman-server service
+
 * Wed Dec  9 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
 - Re-wrote the spec file to break the openwmsman pkg into lib, client
 - and server components following the upstream spec file.



From mclasen at fedoraproject.org  Thu Dec 17 00:23:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:23:09 +0000 (UTC)
Subject: rpms/gnome-terminal/F-12 .cvsignore, 1.65, 1.66 gnome-terminal.spec,
	1.132, 1.133 sources, 1.66, 1.67
Message-ID: <20091217002309.9809811C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21037

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-12/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	19 Oct 2009 20:55:22 -0000	1.65
+++ .cvsignore	17 Dec 2009 00:23:09 -0000	1.66
@@ -1 +1 @@
-gnome-terminal-2.28.1.tar.bz2
+gnome-terminal-2.28.2.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-12/gnome-terminal.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- gnome-terminal.spec	19 Oct 2009 21:05:12 -0000	1.132
+++ gnome-terminal.spec	17 Dec 2009 00:23:09 -0000	1.133
@@ -10,7 +10,7 @@
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.28.1
+Version: 2.28.2
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -136,6 +136,9 @@ scrollkeeper-update -q
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1, translation updates
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-12/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	19 Oct 2009 20:55:22 -0000	1.66
+++ sources	17 Dec 2009 00:23:09 -0000	1.67
@@ -1 +1 @@
-d0eea9c1fe86260bb302c5650259a2ed  gnome-terminal-2.28.1.tar.bz2
+aa053ff38932cf032c70ab6522603053  gnome-terminal-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 00:39:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:39:12 +0000 (UTC)
Subject: File orca-2.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091217003912.2D69228ED16@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for orca:

ae4c3eae0800d46a74c2b66f4f3681f9  orca-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 00:41:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:41:13 +0000 (UTC)
Subject: rpms/orca/F-12 .cvsignore, 1.60, 1.61 orca.spec, 1.99, 1.100 sources,
	1.61, 1.62
Message-ID: <20091217004113.C642211C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24200

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-12/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	20 Oct 2009 02:35:46 -0000	1.60
+++ .cvsignore	17 Dec 2009 00:41:13 -0000	1.61
@@ -1 +1 @@
-orca-2.28.1.tar.bz2
+orca-2.28.2.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-12/orca.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- orca.spec	20 Oct 2009 02:35:46 -0000	1.99
+++ orca.spec	17 Dec 2009 00:41:13 -0000	1.100
@@ -17,7 +17,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.28.1
+Version:	2.28.2
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
@@ -108,6 +108,10 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/orca/2.28/orca-2.28.2.news
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-12/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	20 Oct 2009 02:35:46 -0000	1.61
+++ sources	17 Dec 2009 00:41:13 -0000	1.62
@@ -1 +1 @@
-f1f8682b66fc0c122d344ddd9a4787ad  orca-2.28.1.tar.bz2
+ae4c3eae0800d46a74c2b66f4f3681f9  orca-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 00:49:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:49:21 +0000 (UTC)
Subject: File pango-1.26.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091217004921.B2E7E28ECF3@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for pango:

f30212b8833af3ce5c82121dc309e3d0  pango-1.26.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 00:51:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 00:51:58 +0000 (UTC)
Subject: rpms/pango/F-12 .cvsignore, 1.98, 1.99 pango.spec, 1.180,
	1.181 sources, 1.99, 1.100
Message-ID: <20091217005158.93BB611C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pango/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25879

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.26.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/F-12/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	3 Dec 2009 21:12:00 -0000	1.98
+++ .cvsignore	17 Dec 2009 00:51:58 -0000	1.99
@@ -1 +1 @@
-pango-1.26.1.tar.bz2
+pango-1.26.2.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/F-12/pango.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- pango.spec	3 Dec 2009 21:12:00 -0000	1.180
+++ pango.spec	17 Dec 2009 00:51:58 -0000	1.181
@@ -8,11 +8,11 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.26.1
+Version: 1.26.2
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/pango/1.26/pango-%{version}.tar.bz2
 URL: http://www.pango.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -228,6 +228,10 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 1.26.2-1
+- Update to 1.26.2
+- See http://download.gnome.org/sources/pango/1.26/pango-1.26.2.news
+
 * Thu Dec  3 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.26.1-1
 - 1.26.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/F-12/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- sources	3 Dec 2009 21:12:00 -0000	1.99
+++ sources	17 Dec 2009 00:51:58 -0000	1.100
@@ -1 +1 @@
-2cbc1f26639e335905f7d31c0da53fce  pango-1.26.1.tar.bz2
+f30212b8833af3ce5c82121dc309e3d0  pango-1.26.2.tar.bz2



From bpepple at fedoraproject.org  Thu Dec 17 00:56:10 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 17 Dec 2009 00:56:10 +0000 (UTC)
Subject: rpms/libnice/devel libnice.spec,1.11,1.12
Message-ID: <20091217005610.AA63511C0092@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/libnice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27189

Modified Files:
	libnice.spec 
Log Message:
* Wed Dec 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.10-2
- Rebuild for new gupnp-igd.



Index: libnice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/libnice.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libnice.spec	10 Nov 2009 00:32:44 -0000	1.11
+++ libnice.spec	17 Dec 2009 00:56:10 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libnice
 Version:        0.0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GLib ICE implementation
 
 Group:          System Environment/Libraries
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.10-2
+- Rebuild for new gupnp-igd.
+
 * Mon Nov  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.10-1
 - Update to 0.0.10.
 



From jspaleta at fedoraproject.org  Thu Dec 17 00:57:02 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Thu, 17 Dec 2009 00:57:02 +0000 (UTC)
Subject: rpms/python-couchdb/devel python-couchdb.spec,1.1,1.2
Message-ID: <20091217005702.C2A4311C0092@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/python-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27406

Modified Files:
	python-couchdb.spec 
Log Message:
* Wed Dec 16 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.1-2
- Brown paper bag packaging fixes for the Fedora build system



Index: python-couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-couchdb/devel/python-couchdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-couchdb.spec	17 Dec 2009 00:09:57 -0000	1.1
+++ python-couchdb.spec	17 Dec 2009 00:57:02 -0000	1.2
@@ -1,9 +1,10 @@
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define python_version %(%{__python} -c "import sys ; print sys.version[:3] ")
 
 Name:           python-couchdb
 Version:        0.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python library for working with CouchDB
 
 Group:          Development/Languages
@@ -14,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch0:         python-couchdb-shebang.patch
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-setuptools python-devel
 Requires:       couchdb
 Requires:       python-httplib2
 Requires:       python-simplejson
@@ -60,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/couchdb-load
 %{_bindir}/couchdb-replicate
 %{_bindir}/couchpy
-%{python_sitelib}/CouchDB-%{version}-py2.5.egg-info
+%{python_sitelib}/CouchDB-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/couchdb
 
 %files devel
@@ -68,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/api doc/index.html
 
 %changelog
+* Wed Dec 16 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.1-2
+- Brown paper bag packaging fixes for the Fedora build system
+
 * Tue Dec 15 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.1-1
 - New upstream version
 



From tgl at fedoraproject.org  Thu Dec 17 00:57:51 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 17 Dec 2009 00:57:51 +0000 (UTC)
Subject: rpms/libtiff/devel libtiff-jpeg-scanline.patch, NONE,
	1.1 libtiff.spec, 1.58, 1.59
Message-ID: <20091217005751.0EEE911C0092@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libtiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27627

Modified Files:
	libtiff.spec 
Added Files:
	libtiff-jpeg-scanline.patch 
Log Message:
Apply partial fix for bug #460322

libtiff-jpeg-scanline.patch:
 tif_jpeg.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE libtiff-jpeg-scanline.patch ---
Upstream patch that partially fixes bug #460322.  The tiffcmp case is
still there, but this is a step forward anyhow, so going with it for now.


diff -Naur tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c
--- tiff-3.9.2.orig/libtiff/tif_jpeg.c	2009-08-30 12:21:46.000000000 -0400
+++ tiff-3.9.2/libtiff/tif_jpeg.c	2009-12-05 16:48:56.000000000 -0500
@@ -1613,7 +1613,11 @@
 	 * Must recalculate cached tile size in case sampling state changed.
 	 * Should we really be doing this now if image size isn't set? 
 	 */
-	tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+        if( tif->tif_tilesize > 0 )
+            tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+
+        if(tif->tif_scanlinesize > 0 )
+            tif->tif_scanlinesize = TIFFScanlineSize(tif); 
 }
 
 static int
@@ -1741,13 +1745,21 @@
 			return;
     }
     else
-	{
+    {
         if( !TIFFFillStrip( tif, 0 ) )
             return;
     }
 
     TIFFSetField( tif, TIFFTAG_YCBCRSUBSAMPLING, 
                   (uint16) sp->h_sampling, (uint16) sp->v_sampling );
+
+    /*
+    ** We want to clear the loaded strip so the application has time
+    ** to set JPEGCOLORMODE or other behavior modifiers.  This essentially
+    ** undoes the JPEGPreDecode triggers by TIFFFileStrip().  (#1936)
+    */
+    tif->tif_curstrip = -1;
+
 #endif /* CHECK_JPEG_YCBCR_SUBSAMPLING */
 }
 


Index: libtiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/devel/libtiff.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- libtiff.spec	3 Dec 2009 18:42:07 -0000	1.58
+++ libtiff.spec	17 Dec 2009 00:57:50 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
 Version: 3.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: libtiff
 Group: System Environment/Libraries
@@ -11,6 +11,7 @@ Source: ftp://ftp.remotesensing.org/pub/
 Patch1: libtiff-acversion.patch
 Patch2: libtiff-mantypo.patch
 Patch3: libtiff-CVE-2009-2347.patch
+Patch4: libtiff-jpeg-scanline.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel libjpeg-devel
@@ -66,6 +67,7 @@ image files using the libtiff library.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Use build system's libtool.m4, not the one in the package.
 rm -f libtool.m4
@@ -177,6 +179,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Dec 16 2009 Tom Lane <tgl at redhat.com> 3.9.2-2
+- Apply Warmerdam's partial fix for bug #460322 ... better than nothing.
+Related: #460322
+
 * Thu Dec  3 2009 Tom Lane <tgl at redhat.com> 3.9.2-1
 - Update to libtiff 3.9.2; stop carrying a lot of old patches
 Resolves: #520734



From jspaleta at fedoraproject.org  Thu Dec 17 01:02:26 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Thu, 17 Dec 2009 01:02:26 +0000 (UTC)
Subject: rpms/python-couchdb/F-12 python-couchdb-shebang.patch, NONE,
	1.1 python-couchdb.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091217010226.0E82211C0092@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/python-couchdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28453

Modified Files:
	sources 
Added Files:
	python-couchdb-shebang.patch python-couchdb.spec 
Log Message:
* Wed Dec 16 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.1-2
- Brown paper bag packaging fixes for the Fedora build system


python-couchdb-shebang.patch:
 tests/couch_tests.py             |    1 -
 tools/dump.py                    |    1 -
 tools/load.py                    |    1 -
 tools/replication_helper.py      |    1 -
 tools/replication_helper_test.py |    1 -
 view.py                          |    1 -
 6 files changed, 6 deletions(-)

--- NEW FILE python-couchdb-shebang.patch ---
diff -u -r CouchDB-0.6.1/couchdb/tests/couch_tests.py CouchDB-0.6.1-new/couchdb/tests/couch_tests.py
--- CouchDB-0.6.1/couchdb/tests/couch_tests.py	2009-12-14 03:16:29.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tests/couch_tests.py	2009-12-15 13:58:38.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2008 Christopher Lenz
diff -u -r CouchDB-0.6.1/couchdb/tools/dump.py CouchDB-0.6.1-new/couchdb/tools/dump.py
--- CouchDB-0.6.1/couchdb/tools/dump.py	2009-12-14 03:16:29.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tools/dump.py	2009-12-15 13:56:13.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2009 Christopher Lenz
diff -u -r CouchDB-0.6.1/couchdb/tools/load.py CouchDB-0.6.1-new/couchdb/tools/load.py
--- CouchDB-0.6.1/couchdb/tools/load.py	2009-12-08 09:38:52.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tools/load.py	2009-12-15 13:56:19.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2009 Christopher Lenz
diff -u -r CouchDB-0.6.1/couchdb/tools/replication_helper.py CouchDB-0.6.1-new/couchdb/tools/replication_helper.py
--- CouchDB-0.6.1/couchdb/tools/replication_helper.py	2009-12-08 09:38:52.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tools/replication_helper.py	2009-12-15 13:56:42.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright 2008 Jan Lehnardt <jan at apache.org>
diff -u -r CouchDB-0.6.1/couchdb/tools/replication_helper_test.py CouchDB-0.6.1-new/couchdb/tools/replication_helper_test.py
--- CouchDB-0.6.1/couchdb/tools/replication_helper_test.py	2009-12-08 09:38:52.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/tools/replication_helper_test.py	2009-12-15 13:58:48.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright 2008 Jan lehnardt <jan at apache.org>
diff -u -r CouchDB-0.6.1/couchdb/view.py CouchDB-0.6.1-new/couchdb/view.py
--- CouchDB-0.6.1/couchdb/view.py	2009-12-14 03:16:29.000000000 -0900
+++ CouchDB-0.6.1-new/couchdb/view.py	2009-12-15 13:56:25.000000000 -0900
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2008 Christopher Lenz


--- NEW FILE python-couchdb.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define python_version %(%{__python} -c "import sys ; print sys.version[:3] ")

Name:           python-couchdb
Version:        0.6.1
Release:        2%{?dist}
Summary:        A Python library for working with CouchDB

Group:          Development/Languages
License:        BSD
URL:            http://code.google.com/p/couchdb-python/
Source0:        http://pypi.python.org/packages/source/C/CouchDB/CouchDB-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:         python-couchdb-shebang.patch

BuildArch:      noarch
BuildRequires:  python-setuptools python-devel
Requires:       couchdb
Requires:       python-httplib2
Requires:       python-simplejson

%package devel
Summary:        The  API reference files for CouchDB 
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description
Providing a convenient high level interface for the CouchDB server.

%description devel
CouchDB python binding API reference documentation for use in development. 


%prep
%setup -q -n CouchDB-%{version}
%patch0 -p1


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

# calm rpmlint down
find  $RPM_BUILD_ROOT/%{python_sitelib}/couchdb -name \*.py -print0 | xargs --null chmod 0644


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog.txt COPYING README.txt 
%{_bindir}/couchdb-dump
%{_bindir}/couchdb-load
%{_bindir}/couchdb-replicate
%{_bindir}/couchpy
%{python_sitelib}/CouchDB-%{version}-py%{python_version}.egg-info
%{python_sitelib}/couchdb

%files devel
%defattr(-,root,root,-)
%doc doc/api doc/index.html

%changelog
* Wed Dec 16 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.1-2
- Brown paper bag packaging fixes for the Fedora build system

* Tue Dec 15 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.1-1
- New upstream version

* Mon Dec 14 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6-2
- Specfile cleanup based on review feedback

* Wed Nov 25 2009 Sebastian Dziallas <sebastian at when.com> - 0.6-1
- initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-couchdb/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:28:56 -0000	1.1
+++ sources	17 Dec 2009 01:02:25 -0000	1.2
@@ -0,0 +1 @@
+a5f11977d8c7e26d8dbc9c5f56a9bf6b  CouchDB-0.6.1.tar.gz



From tgl at fedoraproject.org  Thu Dec 17 01:19:26 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 17 Dec 2009 01:19:26 +0000 (UTC)
Subject: rpms/libtiff/F-12 libtiff-CVE-2009-2347.patch, NONE,
	1.1 libtiff-acversion.patch, NONE,
	1.1 libtiff-jpeg-scanline.patch, NONE, 1.1 libtiff-mantypo.patch,
	NONE, 1.1 .cvsignore, 1.8, 1.9 libtiff.spec, 1.56, 1.57 sources,
	1.8, 1.9 libtiff-3.7.2-persample.patch, 1.1,
	NONE libtiff-3.8.2-CVE-2006-2193.patch, 1.1,
	NONE libtiff-3.8.2-CVE-2009-2347.patch, 1.1,
	NONE libtiff-3.8.2-lzw-bugs.patch, 1.2,
	NONE libtiff-3.8.2-mantypo.patch, 1.1,
	NONE libtiff-3.8.2-ormandy.patch, 1.1,
	NONE libtiff-v3.6.1-64bit.patch, 1.1,
	NONE tiffsplit-overflow.patch, 1.1, NONE
Message-ID: <20091217011926.97CB611C00C5@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libtiff/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31030

Modified Files:
	.cvsignore libtiff.spec sources 
Added Files:
	libtiff-CVE-2009-2347.patch libtiff-acversion.patch 
	libtiff-jpeg-scanline.patch libtiff-mantypo.patch 
Removed Files:
	libtiff-3.7.2-persample.patch 
	libtiff-3.8.2-CVE-2006-2193.patch 
	libtiff-3.8.2-CVE-2009-2347.patch libtiff-3.8.2-lzw-bugs.patch 
	libtiff-3.8.2-mantypo.patch libtiff-3.8.2-ormandy.patch 
	libtiff-v3.6.1-64bit.patch tiffsplit-overflow.patch 
Log Message:
Update to libtiff 3.9.2

libtiff-CVE-2009-2347.patch:
 tiff2rgba.c |   35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

--- NEW FILE libtiff-CVE-2009-2347.patch ---
This is a portion of the patch we were carrying for CVE-2009-2347 in 3.8.2.
Unfortunately the upstream fix in 3.9.2 is incomplete, so we still need this
part.  Reported upstream at
http://bugzilla.maptools.org/show_bug.cgi?id=2079


diff -Naur tiff-3.9.2.orig/tools/tiff2rgba.c tiff-3.9.2/tools/tiff2rgba.c
--- tiff-3.9.2.orig/tools/tiff2rgba.c	2009-08-20 16:23:53.000000000 -0400
+++ tiff-3.9.2/tools/tiff2rgba.c	2009-12-03 12:19:07.000000000 -0500
@@ -125,6 +125,17 @@
     return (0);
 }
 
+static tsize_t
+multiply(tsize_t m1, tsize_t m2)
+{
+    tsize_t prod = m1 * m2;
+
+    if (m1 && prod / m1 != m2)
+        prod = 0;		/* overflow */
+
+    return prod;
+}
+
 static int
 cvt_by_tile( TIFF *in, TIFF *out )
 
@@ -134,6 +145,7 @@
     uint32  tile_width, tile_height;
     uint32  row, col;
     uint32  *wrk_line;
+    tsize_t raster_size;
     int	    ok = 1;
 
     TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
@@ -151,7 +163,14 @@
     /*
      * Allocate tile buffer
      */
-    raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof (uint32));
+    raster_size = multiply(multiply(tile_width, tile_height), sizeof (uint32));
+    if (!raster_size) {
+	TIFFError(TIFFFileName(in),
+		  "Can't allocate buffer for raster of size %lux%lu",
+		  (unsigned long) tile_width, (unsigned long) tile_height);
+	return (0);
+    }
+    raster = (uint32*)_TIFFmalloc(raster_size);
     if (raster == 0) {
         TIFFError(TIFFFileName(in), "No space for raster buffer");
         return (0);
@@ -159,7 +178,7 @@
 
     /*
      * Allocate a scanline buffer for swapping during the vertical
-     * mirroring pass.
+     * mirroring pass.  (Request can't overflow given prior checks.)
      */
     wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32));
     if (!wrk_line) {
@@ -236,6 +255,7 @@
     uint32  width, height;		/* image width & height */
     uint32  row;
     uint32  *wrk_line;
+    tsize_t raster_size;
     int	    ok = 1;
 
     TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
@@ -251,7 +271,14 @@
     /*
      * Allocate strip buffer
      */
-    raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32));
+    raster_size = multiply(multiply(width, rowsperstrip), sizeof (uint32));
+    if (!raster_size) {
+	TIFFError(TIFFFileName(in),
+		  "Can't allocate buffer for raster of size %lux%lu",
+		  (unsigned long) width, (unsigned long) rowsperstrip);
+	return (0);
+    }
+    raster = (uint32*)_TIFFmalloc(raster_size);
     if (raster == 0) {
         TIFFError(TIFFFileName(in), "No space for raster buffer");
         return (0);
@@ -259,7 +286,7 @@
 
     /*
      * Allocate a scanline buffer for swapping during the vertical
-     * mirroring pass.
+     * mirroring pass.  (Request can't overflow given prior checks.)
      */
     wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32));
     if (!wrk_line) {

libtiff-acversion.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libtiff-acversion.patch ---
This patch is needed for building the package as of F-11.  It can be
dropped whenever autoconf 2.63 is no longer used on any live branch.


diff -Naur tiff-3.9.2.orig/configure.ac tiff-3.9.2/configure.ac
--- tiff-3.9.2.orig/configure.ac	2009-11-04 12:11:20.000000000 -0500
+++ tiff-3.9.2/configure.ac	2009-12-03 12:52:41.000000000 -0500
@@ -24,7 +24,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.64)
+AC_PREREQ(2.63)
 AC_INIT([LibTIFF Software],[3.9.2],[tiff at lists.maptools.org],[tiff])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(m4)

libtiff-jpeg-scanline.patch:
 tif_jpeg.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE libtiff-jpeg-scanline.patch ---
Upstream patch that partially fixes bug #460322.  The tiffcmp case is
still there, but this is a step forward anyhow, so going with it for now.


diff -Naur tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c
--- tiff-3.9.2.orig/libtiff/tif_jpeg.c	2009-08-30 12:21:46.000000000 -0400
+++ tiff-3.9.2/libtiff/tif_jpeg.c	2009-12-05 16:48:56.000000000 -0500
@@ -1613,7 +1613,11 @@
 	 * Must recalculate cached tile size in case sampling state changed.
 	 * Should we really be doing this now if image size isn't set? 
 	 */
-	tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+        if( tif->tif_tilesize > 0 )
+            tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+
+        if(tif->tif_scanlinesize > 0 )
+            tif->tif_scanlinesize = TIFFScanlineSize(tif); 
 }
 
 static int
@@ -1741,13 +1745,21 @@
 			return;
     }
     else
-	{
+    {
         if( !TIFFFillStrip( tif, 0 ) )
             return;
     }
 
     TIFFSetField( tif, TIFFTAG_YCBCRSUBSAMPLING, 
                   (uint16) sp->h_sampling, (uint16) sp->v_sampling );
+
+    /*
+    ** We want to clear the loaded strip so the application has time
+    ** to set JPEGCOLORMODE or other behavior modifiers.  This essentially
+    ** undoes the JPEGPreDecode triggers by TIFFFileStrip().  (#1936)
+    */
+    tif->tif_curstrip = -1;
+
 #endif /* CHECK_JPEG_YCBCR_SUBSAMPLING */
 }
 

libtiff-mantypo.patch:
 tiffset.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libtiff-mantypo.patch ---
Minor typo, reported upstream at
http://bugzilla.maptools.org/show_bug.cgi?id=2129
This patch should not be needed as of libtiff 4.0.


diff -Naur tiff-3.9.2.orig/man/tiffset.1 tiff-3.9.2/man/tiffset.1
--- tiff-3.9.2.orig/man/tiffset.1	2006-04-20 08:17:19.000000000 -0400
+++ tiff-3.9.2/man/tiffset.1	2009-12-03 12:11:58.000000000 -0500
@@ -60,7 +60,7 @@
 ``Anonymous'':
 .RS
 .nf
-tiffset \-s 305 Anonymous a.tif
+tiffset \-s 315 Anonymous a.tif
 .fi
 .RE
 .PP


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Apr 2006 18:43:45 -0000	1.8
+++ .cvsignore	17 Dec 2009 01:19:26 -0000	1.9
@@ -1 +1 @@
-tiff-3.8.2.tar.gz
+tiff-3.9.2.tar.gz


Index: libtiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/F-12/libtiff.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- libtiff.spec	25 Jul 2009 08:45:40 -0000	1.56
+++ libtiff.spec	17 Dec 2009 01:19:26 -0000	1.57
@@ -1,21 +1,22 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
-Version: 3.8.2
-Release: 15%{?dist}
+Version: 3.9.2
+Release: 2%{?dist}
+
 License: libtiff
 Group: System Environment/Libraries
 URL: http://www.remotesensing.org/libtiff/
 
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
-Patch0: tiffsplit-overflow.patch
-Patch1: libtiff-3.8.2-ormandy.patch
-Patch2: libtiff-3.8.2-CVE-2006-2193.patch
-Patch3: libtiff-3.8.2-mantypo.patch
-Patch4: libtiff-3.8.2-lzw-bugs.patch
-Patch5: libtiff-3.8.2-CVE-2009-2347.patch
+Patch1: libtiff-acversion.patch
+Patch2: libtiff-mantypo.patch
+Patch3: libtiff-CVE-2009-2347.patch
+Patch4: libtiff-jpeg-scanline.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel libjpeg-devel
+BuildRequires: libtool automake autoconf
+
 %define LIBVER %(echo %{version} | cut -f 1-2 -d .)
 
 %description
@@ -54,12 +55,19 @@ necessary for some boot packages.
 %prep
 %setup -q -n tiff-%{version}
 
-%patch0 -p1 -b .overflow
-%patch1 -p1 -b .ormandy
-%patch2 -p1 -b .CVE-2006-2193
-%patch3 -p1 -b .mantypo
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
+
+# Use build system's libtool.m4, not the one in the package.
+rm -f libtool.m4
+
+libtoolize --force  --copy
+aclocal -I . -I m4
+automake --add-missing --copy
+autoconf
+autoheader
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -71,7 +79,7 @@ LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH ma
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 # remove what we didn't want installed
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -93,10 +101,10 @@ rm -f html/man/tiffsv.1.html
 # multilib header hack
 # we only apply this to known Red Hat multilib arches, per bug #233091
 case `uname -i` in
-  i386 | ppc | s390)
+  i386 | ppc | s390 | sparc )
     wordsize="32"
     ;;
-  x86_64 | ppc64 | s390x)
+  x86_64 | ppc64 | s390x | sparc64 )
     wordsize="64"
     ;;
   *)
@@ -159,6 +167,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Dec 16 2009 Tom Lane <tgl at redhat.com> 3.9.2-2
+- Update to libtiff 3.9.2; stop carrying a lot of old patches
+Resolves: #520734
+Resolves: #543289
+- Apply Warmerdam's partial fix for bug #460322 ... better than nothing.
+Related: #460322
+- Use build system's libtool instead of what package contains;
+  among other cleanup this gets rid of unwanted rpath specs in executables
+Related: #226049
+- add sparc/sparc64 to multilib header support
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.2-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Apr 2006 18:43:45 -0000	1.8
+++ sources	17 Dec 2009 01:19:26 -0000	1.9
@@ -1 +1 @@
-fbb6f446ea4ed18955e2714934e5b698  tiff-3.8.2.tar.gz
+93e56e421679c591de7552db13384cb8  tiff-3.9.2.tar.gz


--- libtiff-3.7.2-persample.patch DELETED ---


--- libtiff-3.8.2-CVE-2006-2193.patch DELETED ---


--- libtiff-3.8.2-CVE-2009-2347.patch DELETED ---


--- libtiff-3.8.2-lzw-bugs.patch DELETED ---


--- libtiff-3.8.2-mantypo.patch DELETED ---


--- libtiff-3.8.2-ormandy.patch DELETED ---


--- libtiff-v3.6.1-64bit.patch DELETED ---


--- tiffsplit-overflow.patch DELETED ---



From kkofler at fedoraproject.org  Thu Dec 17 01:23:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 17 Dec 2009 01:23:31 +0000 (UTC)
Subject: rpms/ocaml-facile/devel ocaml-facile.spec,1.11,1.12
Message-ID: <20091217012331.A1C8A11C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/ocaml-facile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31800/devel

Modified Files:
	ocaml-facile.spec 
Log Message:
* Thu Dec 17 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1-11
- Use RPM's builtin OCaml dependency generator on F13+


Index: ocaml-facile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-facile/devel/ocaml-facile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-facile.spec	25 Jul 2009 19:56:27 -0000	1.11
+++ ocaml-facile.spec	17 Dec 2009 01:23:31 -0000	1.12
@@ -9,7 +9,7 @@ ExcludeArch: ppc64
 
 Name:          ocaml-facile
 Version:       1.1
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       OCaml library for constraint programming
 Summary(fr):   Librairie OCaml de programmation par contraintes
 
@@ -27,9 +27,11 @@ ExcludeArch:    sparc64 s390 s390x
 BuildRequires: ocaml >= 3.02
 BuildRequires: ocaml-findlib-devel
 
+%if 0%{?fedora} < 13
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%endif
 
 %description
 FaCiLe is a constraint programming library on integer and integer set finite
@@ -113,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/facile/*.mli
 
 %changelog
+* Thu Dec 17 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1-11
+- Use RPM's builtin OCaml dependency generator on F13+
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Dec 17 01:26:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 01:26:36 +0000 (UTC)
Subject: File file-roller-2.28.2.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091217012636.B738C28ED0B@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for file-roller:

fce19505b34e4adf78149d3595fb8fe4  file-roller-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 01:29:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 01:29:15 +0000 (UTC)
Subject: rpms/file-roller/F-12 .cvsignore, 1.94, 1.95 file-roller.spec, 1.161,
	1.162 sources, 1.94, 1.95
Message-ID: <20091217012915.6A6FA11C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv464

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- .cvsignore	19 Oct 2009 22:26:19 -0000	1.94
+++ .cvsignore	17 Dec 2009 01:29:15 -0000	1.95
@@ -1 +1 @@
-file-roller-2.28.1.tar.bz2
+file-roller-2.28.2.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- file-roller.spec	14 Dec 2009 13:35:37 -0000	1.161
+++ file-roller.spec	17 Dec 2009 01:29:15 -0000	1.162
@@ -10,8 +10,8 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.28.1
-Release: 	3%{?dist}
+Version:	2.28.2
+Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -20,9 +20,6 @@ Source:		http://download.gnome.org/sourc
 # https://bugzilla.gnome.org/show_bug.cgi?id=590606
 Patch0:		sticky-dnd.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=604535
-Patch1:         property-get.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -57,7 +54,6 @@ such as tar or zip files.
 %prep
 %setup -q
 %patch0 -p1 -b .sticky-dnd
-%patch1 -p1 -b .property-get
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -134,6 +130,10 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/file-roller/2.28/file-roller-2.28.2.news
+
 * Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-3
 - Fix a wrong use of gdk_property_get (#538535)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	19 Oct 2009 22:26:19 -0000	1.94
+++ sources	17 Dec 2009 01:29:15 -0000	1.95
@@ -1 +1 @@
-fcba40a9aa04386dec961a2f776777c5  file-roller-2.28.1.tar.bz2
+fce19505b34e4adf78149d3595fb8fe4  file-roller-2.28.2.tar.bz2



From tomspur at fedoraproject.org  Thu Dec 17 01:32:44 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Thu, 17 Dec 2009 01:32:44 +0000 (UTC)
Subject: rpms/gbirthday/devel gbirthday-ebook.patch, NONE, 1.1 gbirthday.spec,
	1.9, 1.10
Message-ID: <20091217013244.B01CB11C00C5@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1261

Modified Files:
	gbirthday.spec 
Added Files:
	gbirthday-ebook.patch 
Log Message:
add patch for checking for nonetype, bug #548007

gbirthday-ebook.patch:
 Changelog                  |    3 +++
 src/gbirthday/databases.py |    2 ++
 2 files changed, 5 insertions(+)

--- NEW FILE gbirthday-ebook.patch ---
commit 644ac8f5e838fe29ac6c0cf56f1bc53f5f7da12e
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Wed Dec 16 13:43:02 2009 +0100

    Without evolution addressbook, continue, without crashing
    
    Signed-off-by: Thomas Spura <tomspur at fedoraproject.org>

diff --git a/Changelog b/Changelog
index 42f8b07..8c587dc 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+0.5.6
+	Without evolution addressbook, don't crash (fedora bug #548007)
+
 0.5.5
 	On double click, don't blink anymore.
 	Don't show 'don't blink', when not blinking atm
diff --git a/src/gbirthday/databases.py b/src/gbirthday/databases.py
index 8f62869..0a42ac4 100644
--- a/src/gbirthday/databases.py
+++ b/src/gbirthday/databases.py
@@ -236,6 +236,8 @@ class Evolution(DataBase):
 
         for title, book in evolution.ebook.list_addressbooks():
             ebook = evolution.ebook.open_addressbook(book)
+            if not ebook:
+                continue
             for contact in ebook.get_all_contacts():
                 # contact.props.birth_date{.year, .month, .day} non-existing
                 # -> using vcard


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gbirthday.spec	15 Dec 2009 23:56:41 -0000	1.9
+++ gbirthday.spec	17 Dec 2009 01:32:44 -0000	1.10
@@ -2,12 +2,13 @@
 
 Name:           gbirthday
 Version:        0.5.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://gbirthday.sourceforge.net
 Source:         http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.xz
+Patch0:         %{name}-ebook.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,6 +32,7 @@ your contacs' birthday on next days.
 
 %prep
 %setup -q -c %{name}-%{version}
+%patch0 -p1
 
 %build
 
@@ -60,6 +62,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Tue Dec 17 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-3
+- add ebook.patch, applied from upstream git repo, fixes bug #548007
+
 * Wed Dec 16 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-2
 - upstream tarball was corected, still same version
 



From tomspur at fedoraproject.org  Thu Dec 17 01:33:43 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Thu, 17 Dec 2009 01:33:43 +0000 (UTC)
Subject: rpms/gbirthday/F-12 gbirthday.spec,1.8,1.9
Message-ID: <20091217013343.C83E511C00C5@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1482

Modified Files:
	gbirthday.spec 
Log Message:
add patch for checking for nonetype, bug #548007


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/gbirthday.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gbirthday.spec	15 Dec 2009 23:57:23 -0000	1.8
+++ gbirthday.spec	17 Dec 2009 01:33:43 -0000	1.9
@@ -2,12 +2,13 @@
 
 Name:           gbirthday
 Version:        0.5.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://gbirthday.sourceforge.net
 Source:         http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.xz
+Patch0:         %{name}-ebook.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,6 +32,7 @@ your contacs' birthday on next days.
 
 %prep
 %setup -q -c %{name}-%{version}
+%patch0 -p1
 
 %build
 
@@ -60,6 +62,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Tue Dec 17 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-3
+- add ebook.patch, applied from upstream git repo, fixes bug #548007
+
 * Wed Dec 16 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-2
 - upstream tarball was corected, still same version
 



From tomspur at fedoraproject.org  Thu Dec 17 01:40:05 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Thu, 17 Dec 2009 01:40:05 +0000 (UTC)
Subject: rpms/gbirthday/F-12 gbirthday-ebook.patch,NONE,1.1
Message-ID: <20091217014005.AEC9711C00C5@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2675

Added Files:
	gbirthday-ebook.patch 
Log Message:
adding ebook.patch

gbirthday-ebook.patch:
 Changelog                  |    3 +++
 src/gbirthday/databases.py |    2 ++
 2 files changed, 5 insertions(+)

--- NEW FILE gbirthday-ebook.patch ---
commit 644ac8f5e838fe29ac6c0cf56f1bc53f5f7da12e
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Wed Dec 16 13:43:02 2009 +0100

    Without evolution addressbook, continue, without crashing
    
    Signed-off-by: Thomas Spura <tomspur at fedoraproject.org>

diff --git a/Changelog b/Changelog
index 42f8b07..8c587dc 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+0.5.6
+	Without evolution addressbook, don't crash (fedora bug #548007)
+
 0.5.5
 	On double click, don't blink anymore.
 	Don't show 'don't blink', when not blinking atm
diff --git a/src/gbirthday/databases.py b/src/gbirthday/databases.py
index 8f62869..0a42ac4 100644
--- a/src/gbirthday/databases.py
+++ b/src/gbirthday/databases.py
@@ -236,6 +236,8 @@ class Evolution(DataBase):
 
         for title, book in evolution.ebook.list_addressbooks():
             ebook = evolution.ebook.open_addressbook(book)
+            if not ebook:
+                continue
             for contact in ebook.get_all_contacts():
                 # contact.props.birth_date{.year, .month, .day} non-existing
                 # -> using vcard



From jkeating at fedoraproject.org  Thu Dec 17 01:46:12 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 17 Dec 2009 01:46:12 +0000 (UTC)
Subject: comps Makefile,1.13,1.14
Message-ID: <20091217014612.2CB9711C00C5@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3829

Modified Files:
	Makefile 
Log Message:
Use F13 comps for rawhide.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/comps/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Makefile	9 Jun 2009 14:17:25 -0000	1.13
+++ Makefile	17 Dec 2009 01:46:12 -0000	1.14
@@ -21,5 +21,5 @@ validate: $(XMLFILES) comps.rng
 	fi
 
 # Add an easy alias to generate a rawhide comps file
-comps-rawhide: comps-f12.xml
-	@mv comps-f12.xml comps-rawhide.xml
+comps-rawhide: comps-f13.xml
+	@mv comps-f13.xml comps-rawhide.xml



From dcbw at fedoraproject.org  Thu Dec 17 01:46:21 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 17 Dec 2009 01:46:21 +0000 (UTC)
Subject: File ModemManager-0.2.997.git20091216.tar.bz2 uploaded to lookaside
	cache by dcbw
Message-ID: <20091217014621.C131428EC92@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ModemManager:

2237287e0e02b2548e4b7d22e0e33697  ModemManager-0.2.997.git20091216.tar.bz2



From dcbw at fedoraproject.org  Thu Dec 17 01:46:49 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 17 Dec 2009 01:46:49 +0000 (UTC)
Subject: rpms/ModemManager/devel .cvsignore, 1.6, 1.7 ModemManager.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <20091217014649.6313C11C00C5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4038

Modified Files:
	.cvsignore ModemManager.spec sources 
Log Message:
* Wed Dec 16 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-3.git20091216
- sierra: ensure CDMA device is powered up when trying to use it
- cdma: better signal quality parsing (fixes ex Huawei EC168C)
- zte: handle unsolicited messages better during probing




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Dec 2009 19:38:21 -0000	1.6
+++ .cvsignore	17 Dec 2009 01:46:49 -0000	1.7
@@ -3,3 +3,4 @@ ModemManager-0.2-20090826.tar.bz2
 ModemManager-0.2-20091105.tar.bz2
 ModemManager-0.2.997.tar.bz2
 ModemManager-0.2.997.git20091214.tar.bz2
+ModemManager-0.2.997.git20091216.tar.bz2


Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/ModemManager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ModemManager.spec	14 Dec 2009 19:40:06 -0000	1.8
+++ ModemManager.spec	17 Dec 2009 01:46:49 -0000	1.9
@@ -1,9 +1,9 @@
-%define snapshot .git20091214
+%define snapshot .git20091216
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
 Version: 0.2.997
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
@@ -62,9 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Wed Dec 16 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-3.git20091216
+- sierra: ensure CDMA device is powered up when trying to use it
+- cdma: better signal quality parsing (fixes ex Huawei EC168C)
+- zte: handle unsolicited messages better during probing
+
 * Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-2.git20091214
 - cdma: fix signal strength reporting on some devices
 - cdma: better registration state detection when dialing (ex Sierra 5275)
+- option: always use the correct tty for dialing commands
 
 * Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1
 - core: fix reconnect after manual disconnect (rh #541314)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Dec 2009 19:38:21 -0000	1.7
+++ sources	17 Dec 2009 01:46:49 -0000	1.8
@@ -1 +1 @@
-c97f2415a223ff2b34bef4c62d43aaaf  ModemManager-0.2.997.git20091214.tar.bz2
+2237287e0e02b2548e4b7d22e0e33697  ModemManager-0.2.997.git20091216.tar.bz2



From dcbw at fedoraproject.org  Thu Dec 17 01:47:39 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 17 Dec 2009 01:47:39 +0000 (UTC)
Subject: rpms/ModemManager/F-12 ModemManager.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <20091217014739.E24B511C00C5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4291

Modified Files:
	ModemManager.spec sources 
Log Message:
* Wed Dec 16 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-3.git20091216
- sierra: ensure CDMA device is powered up when trying to use it
- cdma: better signal quality parsing (fixes ex Huawei EC168C)
- zte: handle unsolicited messages better during probing




Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/ModemManager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ModemManager.spec	14 Dec 2009 19:42:15 -0000	1.7
+++ ModemManager.spec	17 Dec 2009 01:47:39 -0000	1.8
@@ -1,9 +1,9 @@
-%define snapshot .git20091214
+%define snapshot .git20091216
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
 Version: 0.2.997
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
@@ -62,9 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Wed Dec 16 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-3.git20091216
+- sierra: ensure CDMA device is powered up when trying to use it
+- cdma: better signal quality parsing (fixes ex Huawei EC168C)
+- zte: handle unsolicited messages better during probing
+
 * Mon Dec 14 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-2.git20091214
 - cdma: fix signal strength reporting on some devices
 - cdma: better registration state detection when dialing (ex Sierra 5275)
+- option: always use the correct tty for dialing commands
 
 * Mon Dec  7 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-1
 - core: fix reconnect after manual disconnect (rh #541314)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Dec 2009 19:42:15 -0000	1.6
+++ sources	17 Dec 2009 01:47:39 -0000	1.7
@@ -1 +1 @@
-c97f2415a223ff2b34bef4c62d43aaaf  ModemManager-0.2.997.git20091214.tar.bz2
+2237287e0e02b2548e4b7d22e0e33697  ModemManager-0.2.997.git20091216.tar.bz2



From hno at fedoraproject.org  Thu Dec 17 01:50:26 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 17 Dec 2009 01:50:26 +0000 (UTC)
Subject: File bzr-2.0.3.tar.gz uploaded to lookaside cache by hno
Message-ID: <20091217015026.D831A28ED40@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for bzr:

60758e61b3fd3686966d7ab0ea17fa64  bzr-2.0.3.tar.gz



From hno at fedoraproject.org  Thu Dec 17 01:50:30 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 17 Dec 2009 01:50:30 +0000 (UTC)
Subject: File bzr-2.0.3.tar.gz.sig uploaded to lookaside cache by hno
Message-ID: <20091217015030.6558328ED42@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for bzr:

019cc196384507983e712084cd1b89e9  bzr-2.0.3.tar.gz.sig



From hno at fedoraproject.org  Thu Dec 17 01:50:56 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 17 Dec 2009 01:50:56 +0000 (UTC)
Subject: rpms/bzr/F-12 .cvsignore, 1.56, 1.57 bzr.spec, 1.76, 1.77 sources, 
	1.56, 1.57
Message-ID: <20091217015056.B599311C00C5@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5022

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
2.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-12/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	11 Nov 2009 13:07:10 -0000	1.56
+++ .cvsignore	17 Dec 2009 01:50:56 -0000	1.57
@@ -1,2 +1,2 @@
-bzr-2.0.2.tar.gz
-bzr-2.0.2.tar.gz.sig
+bzr-2.0.3.tar.gz
+bzr-2.0.3.tar.gz.sig


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-12/bzr.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- bzr.spec	11 Nov 2009 13:07:10 -0000	1.76
+++ bzr.spec	17 Dec 2009 01:50:56 -0000	1.77
@@ -7,7 +7,7 @@
 #   bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %).
 #   release: rpm subrelease (0.N for rc candidates, N for stable releases)
 %define bzrmajor 2.0
-%define bzrminor .2
+%define bzrminor .3
 #define bzrrc rc2
 %define release 1
 
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Dec 17 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.3-1
+- Update to 2.0.3 bugfix release
+
 * Wed Nov 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.2-1
 - Update to 2.0.2 bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-12/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	11 Nov 2009 13:07:10 -0000	1.56
+++ sources	17 Dec 2009 01:50:56 -0000	1.57
@@ -1,2 +1,2 @@
-845743611ef6f1ece8e7bf9824c0bb95  bzr-2.0.2.tar.gz
-fa35a94920e0fea24443f255c6cd0ed7  bzr-2.0.2.tar.gz.sig
+60758e61b3fd3686966d7ab0ea17fa64  bzr-2.0.3.tar.gz
+019cc196384507983e712084cd1b89e9  bzr-2.0.3.tar.gz.sig



From hno at fedoraproject.org  Thu Dec 17 01:52:40 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 17 Dec 2009 01:52:40 +0000 (UTC)
Subject: File bzr-2.1.0b4.tar.gz uploaded to lookaside cache by hno
Message-ID: <20091217015240.A63F528EC92@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for bzr:

8d1d27d33b53bf16bf5346263f2d4a40  bzr-2.1.0b4.tar.gz



From hno at fedoraproject.org  Thu Dec 17 01:52:43 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 17 Dec 2009 01:52:43 +0000 (UTC)
Subject: File bzr-2.1.0b4.tar.gz.sig uploaded to lookaside cache by hno
Message-ID: <20091217015243.6869B28EC92@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for bzr:

a1c940d1d72beeb41602e0b02757311a  bzr-2.1.0b4.tar.gz.sig



From hno at fedoraproject.org  Thu Dec 17 01:53:41 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 17 Dec 2009 01:53:41 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.56, 1.57 bzr.spec, 1.78, 1.79 sources, 
	1.56, 1.57
Message-ID: <20091217015341.8904311C00C5@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5567

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
2.1.0b4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	11 Nov 2009 08:04:41 -0000	1.56
+++ .cvsignore	17 Dec 2009 01:53:41 -0000	1.57
@@ -1,2 +1,2 @@
-bzr-2.1.0b2.tar.gz
-bzr-2.1.0b2.tar.gz.sig
+bzr-2.1.0b4.tar.gz
+bzr-2.1.0b4.tar.gz.sig


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- bzr.spec	13 Nov 2009 02:02:09 -0000	1.78
+++ bzr.spec	17 Dec 2009 01:53:41 -0000	1.79
@@ -8,8 +8,8 @@
 #   release: rpm subrelease (0.N for rc candidates, N for stable releases)
 %define bzrmajor 2.1
 %define bzrminor .0
-%define bzrrc b2
-%define release 0.3
+%define bzrrc b4
+%define release 0.4
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*.egg-info
 
 %changelog
+* Thu Dec 17 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.1.0-0.4.b4
+- Update to 2.1.0b4
+
 * Wed Oct 28 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.1.0-0.1.b1
 - Highlights for this release include support for `bzr+ssh://host/~/homedir`
   style urls, finer control over the plugin search path via extended


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	11 Nov 2009 08:04:41 -0000	1.56
+++ sources	17 Dec 2009 01:53:41 -0000	1.57
@@ -1,2 +1,2 @@
-e4dc34206222f3e4ff795f52daab13e3  bzr-2.1.0b2.tar.gz
-ed963e4b84ffe30ebdc3c2baf3f53913  bzr-2.1.0b2.tar.gz.sig
+8d1d27d33b53bf16bf5346263f2d4a40  bzr-2.1.0b4.tar.gz
+a1c940d1d72beeb41602e0b02757311a  bzr-2.1.0b4.tar.gz.sig



From mclasen at fedoraproject.org  Thu Dec 17 02:10:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 02:10:10 +0000 (UTC)
Subject: rpms/file-roller/F-12 file-roller.spec,1.162,1.163
Message-ID: <20091217021010.0A22D11C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8626

Modified Files:
	file-roller.spec 
Log Message:
Drop upstreamed patch



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- file-roller.spec	17 Dec 2009 01:29:15 -0000	1.162
+++ file-roller.spec	17 Dec 2009 02:10:09 -0000	1.163
@@ -17,9 +17,6 @@ Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
 Source:		http://download.gnome.org/sources/file-roller/2.28/file-roller-%{version}.tar.bz2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=590606
-Patch0:		sticky-dnd.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -53,7 +50,6 @@ such as tar or zip files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .sticky-dnd
 
 %build
 %configure --disable-scrollkeeper --disable-static



From bpepple at fedoraproject.org  Thu Dec 17 02:24:15 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 17 Dec 2009 02:24:15 +0000 (UTC)
Subject: rpms/farsight2/devel farsight2.spec,1.19,1.20
Message-ID: <20091217022415.9E76011C00C5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11246

Modified Files:
	farsight2.spec 
Log Message:
* Wed Dec 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.16-2
- Rebuild for new gupnp-igd.



Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- farsight2.spec	6 Oct 2009 22:06:42 -0000	1.19
+++ farsight2.spec	17 Dec 2009 02:24:15 -0000	1.20
@@ -7,7 +7,7 @@
 
 Name:           farsight2
 Version:        0.0.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.16-2
+- Rebuild for new gupnp-igd.
+
 * Tue Oct  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.16-1
 - Update to 0.0.16.
 



From mclasen at fedoraproject.org  Thu Dec 17 02:48:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 02:48:09 +0000 (UTC)
Subject: File gcalctool-5.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091217024809.CAA3328ECFE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gcalctool:

5c7ad2f95f2f0756f8261073dde342da  gcalctool-5.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 02:51:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 02:51:43 +0000 (UTC)
Subject: rpms/gcalctool/F-12 .cvsignore, 1.69, 1.70 gcalctool.spec, 1.100,
	1.101 sources, 1.70, 1.71
Message-ID: <20091217025143.7C06311C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15402

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/F-12/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	19 Oct 2009 20:44:35 -0000	1.69
+++ .cvsignore	17 Dec 2009 02:51:43 -0000	1.70
@@ -1 +1 @@
-gcalctool-5.28.1.tar.bz2
+gcalctool-5.28.2.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/F-12/gcalctool.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gcalctool.spec	19 Oct 2009 20:44:36 -0000	1.100
+++ gcalctool.spec	17 Dec 2009 02:51:43 -0000	1.101
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.28.1
+Version:        5.28.2
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 5.28.2-1
+- Update to 5.28.2
+- See http://download.gnome.org/sources/gcalctool/5.28/gcalctool-5.28.2.news
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 5.28.1-1
 - Update to 5.28.1, misc bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/F-12/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	19 Oct 2009 20:44:37 -0000	1.70
+++ sources	17 Dec 2009 02:51:43 -0000	1.71
@@ -1 +1 @@
-c75cdccfa3a1dc7052dbec33f83809fe  gcalctool-5.28.1.tar.bz2
+5c7ad2f95f2f0756f8261073dde342da  gcalctool-5.28.2.tar.bz2



From shishz at fedoraproject.org  Thu Dec 17 02:52:45 2009
From: shishz at fedoraproject.org (Zing Zing Shishak)
Date: Thu, 17 Dec 2009 02:52:45 +0000 (UTC)
Subject: rpms/snownews/F-11 snownews-1.5.12-ncursesw.patch, NONE,
	1.1 snownews.spec, 1.19, 1.20
Message-ID: <20091217025245.27FC211C00C5@cvs1.fedora.phx.redhat.com>

Author: shishz

Update of /cvs/pkgs/rpms/snownews/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15649

Modified Files:
	snownews.spec 
Added Files:
	snownews-1.5.12-ncursesw.patch 
Log Message:
* Mon Dec 14 2009 Zing <zing at fastmail.fm> - 1.5.12-2
- Bring back link with ncursesw, set -DUTF_8 for xmlUTF8Strlen #546431
  mistakenly dropped when charset patch went upstream


snownews-1.5.12-ncursesw.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE snownews-1.5.12-ncursesw.patch ---
--- snownews-1.5.12/configure.orig	2009-12-14 14:55:02.059524232 -0500
+++ snownews-1.5.12/configure	2009-12-14 14:55:18.154460825 -0500
@@ -13,7 +13,7 @@ chomp($xmlldflags);
 
 my $prefix = "/usr/local";
 my $cflags = "-Wall -Wno-format-y2k -O2 -DLOCALEPATH=\"\\\"\$(LOCALEPATH)\\\"\" -DOS=\\\"$os\\\" $xmlcflags \$(EXTRA_CFLAGS) ";
-my $ldflags = "-lncurses -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
+my $ldflags = "-lncursesw -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
 
 my $use_nls = 1;
 parse_cmdl_line();


Index: snownews.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/F-11/snownews.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- snownews.spec	8 Oct 2009 23:29:29 -0000	1.19
+++ snownews.spec	17 Dec 2009 02:52:45 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		snownews
 Version: 	1.5.12
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPLv2
@@ -9,6 +9,7 @@ Source0: 	http://home.kcore.de/~kiza/sof
 Patch0:		snownews-1.5.10-nocheck.patch
 Patch1:		snownews-1.5.10-nostrip.patch
 Patch2:		snownews-1.5.12-manpage.patch
+Patch3:		snownews-1.5.12-ncursesw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
@@ -28,10 +29,11 @@ with any version of libxml2.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 ./configure --prefix=%{_prefix}
-EXTRA_CFLAGS="$RPM_OPT_FLAGS -fpie" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
+EXTRA_CFLAGS="$RPM_OPT_FLAGS -fPIE -DUTF_8" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man1/*
 
 %changelog
+* Mon Dec 14 2009 Zing <zing at fastmail.fm> - 1.5.12-2
+- Bring back link with ncursesw, set -DUTF_8 for xmlUTF8Strlen #546431
+  mistakenly dropped when charset patch went upstream
+
 * Thu Oct  8 2009 Zing <zing at fastmail.fm> - 1.5.12-1
 - Bug fixes + openssl added as a requirement
 - Corrected two crashes when using mark unread and open URL on



From kwright at fedoraproject.org  Thu Dec 17 02:58:03 2009
From: kwright at fedoraproject.org (kwright)
Date: Thu, 17 Dec 2009 02:58:03 +0000 (UTC)
Subject: File pki-util-1.3.0.tar.gz uploaded to lookaside cache by kwright
Message-ID: <20091217025803.17B5328ECFE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for pki-util:

b103c5125e1ad36414300c53cef4a7a1  pki-util-1.3.0.tar.gz



From kwright at fedoraproject.org  Thu Dec 17 02:59:41 2009
From: kwright at fedoraproject.org (kwright)
Date: Thu, 17 Dec 2009 02:59:41 +0000 (UTC)
Subject: rpms/pki-util/F-11 import.log, NONE, 1.1 pki-util.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091217025941.2030A11C00C5@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-util/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16969/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-util.spec 
Log Message:
newpackage for dogtag: 521989



--- NEW FILE import.log ---
pki-util-1_3_0-4_fc11:F-11:pki-util-1.3.0-4.fc11.src.rpm:1261018687


--- NEW FILE pki-util.spec ---
Name:           pki-util
Version:        1.3.0
Release:        4%{?dist}
Summary:        Dogtag Certificate System - PKI Utility Framework
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils
BuildRequires:  jss >= 4.2.6
BuildRequires:  ldapjdk
BuildRequires:  osutil
BuildRequires:  xerces-j2

Requires:       java >= 1:1.6.0
Requires:       jpackage-utils
Requires:       jss >= 4.2.6
Requires:       ldapjdk

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag PKI Utility Framework is required by the following four
Dogtag PKI subsystems:

    the Dogtag Certificate Authority,
    the Dogtag Data Recovery Manager,
    the Dogtag Online Certificate Status Protocol Manager, and
    the Dogtag Token Key Service.

%package javadoc
Summary:    Dogtag Certificate System - PKI Utility Framework Javadocs
Group:      Documentation

Requires:   %{name} = %{version}-%{release}

%description javadoc
Dogtag Certificate System - PKI Utility Framework Javadocs

This documentation pertains exclusively to version %{version} of
the Dogtag PKI Utility Framework.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="pki" \
    -Dproduct="util" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}
cd %{buildroot}%{_javadir}/pki
mv cmsutil.jar cmsutil-%{version}.jar
ln -s cmsutil-%{version}.jar cmsutil.jar
mv nsutil.jar nsutil-%{version}.jar
ln -s nsutil-%{version}.jar nsutil.jar

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/pki/

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
- Removed 'with exceptions' from License

* Tue Nov 24 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #521989 - packaging for Fedora Dogtag
- Use "_javadir" macro when appropriate

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #521989 - packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #521989 - packaging for Fedora Dogtag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-util/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:41:47 -0000	1.1
+++ .cvsignore	17 Dec 2009 02:59:40 -0000	1.2
@@ -0,0 +1 @@
+pki-util-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-util/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:41:47 -0000	1.1
+++ sources	17 Dec 2009 02:59:40 -0000	1.2
@@ -0,0 +1 @@
+b103c5125e1ad36414300c53cef4a7a1  pki-util-1.3.0.tar.gz



From bskeggs at fedoraproject.org  Thu Dec 17 03:03:25 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 17 Dec 2009 03:03:25 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.71, 1.72 kernel.spec, 1.1956, 
	1.1957
Message-ID: <20091217030325.9451811C00C5@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17811

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Thu Dec 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.8-171
- drm-nouveau.patch: add support for GF7100 (NV63)



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   56 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  531 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   30 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 6050 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  289 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  663 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  478 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  468 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  812 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   54 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  155 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  157 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1270 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  380 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   47 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  976 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1080 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  455 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  257 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  702 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  583 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  196 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  321 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  865 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1002 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  528 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  316 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  271 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  208 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  260 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  892 
 drivers/gpu/drm/nouveau/nv17_gpio.c         |   92 
 drivers/gpu/drm/nouveau/nv17_tv.c           |  681 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  780 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  314 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2915 +++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  769 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  156 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  304 
 drivers/gpu/drm/nouveau/nv50_display.c      |  998 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  273 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  494 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  470 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |26832 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  509 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  269 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  220 
 85 files changed, 64713 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- drm-nouveau.patch	7 Dec 2009 06:11:38 -0000	1.71
+++ drm-nouveau.patch	17 Dec 2009 03:03:24 -0000	1.72
@@ -30035,10 +30035,10 @@ index 0000000..b4f19cc
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
 new file mode 100644
-index 0000000..76c6f21
+index 0000000..b946e43
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv40_graph.c
-@@ -0,0 +1,2240 @@
+@@ -0,0 +1,2915 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -31480,6 +31480,655 @@ index 0000000..76c6f21
 +		nv_wo32(dev, ctx, i/4, 0x3f800000);
 +}
 +
++static void
++nv63_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
++{
++	int i;
++
++	nv_wo32(dev, ctx, 0x00000/4, ctx->im_pramin->start);
++	nv_wo32(dev, ctx, 0x00020/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x00024/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00174/4, 0x00040000);
++	nv_wo32(dev, ctx, 0x00184/4, 0x55555555);
++	nv_wo32(dev, ctx, 0x00188/4, 0x55555555);
++	nv_wo32(dev, ctx, 0x0018c/4, 0x55555555);
++	nv_wo32(dev, ctx, 0x00190/4, 0x55555555);
++	nv_wo32(dev, ctx, 0x001b4/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x001b8/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x001d8/4, 0x20010001);
++	nv_wo32(dev, ctx, 0x001dc/4, 0x0f73ef00);
++	nv_wo32(dev, ctx, 0x001e4/4, 0x02008821);
++	nv_wo32(dev, ctx, 0x00214/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00218/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x0021c/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00220/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00224/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00228/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x0022c/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00230/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00234/4, 0x00000040);
++	nv_wo32(dev, ctx, 0x00238/4, 0x00000040);
++	nv_wo32(dev, ctx, 0x0023c/4, 0x00000040);
++	nv_wo32(dev, ctx, 0x00244/4, 0x00000040);
++	nv_wo32(dev, ctx, 0x00390/4, 0x0b0b0b0c);
++	nv_wo32(dev, ctx, 0x003bc/4, 0x00001010);
++	nv_wo32(dev, ctx, 0x003c8/4, 0x00000111);
++	nv_wo32(dev, ctx, 0x003cc/4, 0x00080060);
++	nv_wo32(dev, ctx, 0x003e8/4, 0x00000080);
++	nv_wo32(dev, ctx, 0x003ec/4, 0xffff0000);
++	nv_wo32(dev, ctx, 0x003f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00404/4, 0x46400000);
++	nv_wo32(dev, ctx, 0x00414/4, 0xffff0000);
++	nv_wo32(dev, ctx, 0x00420/4, 0x0fff0000);
++	nv_wo32(dev, ctx, 0x00424/4, 0x0fff0000);
++	nv_wo32(dev, ctx, 0x0042c/4, 0x00011100);
++	nv_wo32(dev, ctx, 0x00448/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x0044c/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00450/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00454/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00458/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x0045c/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00460/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00464/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00468/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x0046c/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00470/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00474/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00478/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x0047c/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00480/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00484/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00490/4, 0x4b7fffff);
++	nv_wo32(dev, ctx, 0x004b8/4, 0x30201000);
++	nv_wo32(dev, ctx, 0x004bc/4, 0x70605040);
++	nv_wo32(dev, ctx, 0x004c0/4, 0xb8a89888);
++	nv_wo32(dev, ctx, 0x004c4/4, 0xf8e8d8c8);
++	nv_wo32(dev, ctx, 0x004d8/4, 0x40100000);
++	nv_wo32(dev, ctx, 0x004f4/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x00528/4, 0x435185d6);
++	nv_wo32(dev, ctx, 0x0052c/4, 0x2155b699);
++	nv_wo32(dev, ctx, 0x00530/4, 0xfedcba98);
++	nv_wo32(dev, ctx, 0x00534/4, 0x00000098);
++	nv_wo32(dev, ctx, 0x00544/4, 0xffffffff);
++	nv_wo32(dev, ctx, 0x00548/4, 0x00ff7000);
++	nv_wo32(dev, ctx, 0x0054c/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x0055c/4, 0x00ff0000);
++	nv_wo32(dev, ctx, 0x00598/4, 0x00ffff00);
++	nv_wo32(dev, ctx, 0x005dc/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005e0/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005e4/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005e8/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005ec/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005f0/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005f4/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005f8/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005fc/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00600/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00604/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00608/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x0060c/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00610/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00614/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00618/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x0061c/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00620/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00624/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00628/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x0062c/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00630/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00634/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00638/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x0063c/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00640/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00644/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00648/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x0064c/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00650/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00654/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00658/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x0069c/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006a0/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006a4/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006a8/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006ac/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006b0/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006b4/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006b8/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006bc/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006c0/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006c4/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006c8/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006cc/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006d0/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006d4/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006d8/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006dc/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006e0/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006e4/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006e8/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006ec/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006f0/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006f4/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006f8/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006fc/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00700/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00704/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00708/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x0070c/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00710/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00714/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00718/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x0071c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00720/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00724/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00728/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0072c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00730/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00734/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00738/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0073c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00740/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00744/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00748/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0074c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00750/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00754/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00758/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0079c/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007a0/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007a4/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007a8/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007ac/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007b0/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007b4/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007b8/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007bc/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007c0/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007c4/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007c8/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007cc/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007d0/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007d4/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007d8/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x0082c/4, 0x0001bc80);
++	nv_wo32(dev, ctx, 0x00830/4, 0x0001bc80);
++	nv_wo32(dev, ctx, 0x00834/4, 0x0001bc80);
++	nv_wo32(dev, ctx, 0x00838/4, 0x0001bc80);
++	nv_wo32(dev, ctx, 0x0083c/4, 0x00000202);
++	nv_wo32(dev, ctx, 0x00840/4, 0x00000202);
++	nv_wo32(dev, ctx, 0x00844/4, 0x00000202);
++	nv_wo32(dev, ctx, 0x00848/4, 0x00000202);
++	nv_wo32(dev, ctx, 0x0085c/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x00860/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x00864/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x00868/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x0087c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00880/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00884/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00888/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0089c/4, 0x00000002);
++	nv_wo32(dev, ctx, 0x008b0/4, 0x00000020);
++	nv_wo32(dev, ctx, 0x008b4/4, 0x030c30c3);
++	nv_wo32(dev, ctx, 0x008b8/4, 0x00011001);
++	nv_wo32(dev, ctx, 0x008c4/4, 0x3e020200);
++	nv_wo32(dev, ctx, 0x008c8/4, 0x00ffffff);
++	nv_wo32(dev, ctx, 0x008cc/4, 0x0c103f00);
++	nv_wo32(dev, ctx, 0x008d8/4, 0x00040000);
++	nv_wo32(dev, ctx, 0x00910/4, 0x00008100);
++	nv_wo32(dev, ctx, 0x0099c/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x009e0/4, 0x00001001);
++	nv_wo32(dev, ctx, 0x009e8/4, 0x00000003);
++	nv_wo32(dev, ctx, 0x009ec/4, 0x00888001);
++	nv_wo32(dev, ctx, 0x00a50/4, 0x00000005);
++	nv_wo32(dev, ctx, 0x00a5c/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x00a78/4, 0x00005555);
++	nv_wo32(dev, ctx, 0x00a7c/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00a84/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00f48/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f50/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f58/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f60/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f68/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f70/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f78/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f80/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f88/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f90/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f98/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fa0/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fa8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fb0/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fb8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fc0/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x02d08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02db0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02dc8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02de0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02df8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e10/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e28/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e40/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e58/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e70/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e88/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02ea0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02eb8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02ed0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02ee8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02fa8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02fc0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02fd8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02ff0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03008/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03020/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03038/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03050/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03068/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03080/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03098/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x030b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x030c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x030e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x030f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03110/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03128/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03140/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03158/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03170/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03188/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x031a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x031b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x031d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x031e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03200/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03218/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03230/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03248/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03260/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03278/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03290/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x032a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x032c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x032d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x032f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03308/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03320/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03338/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03350/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03368/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03380/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03398/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x033b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x033c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x033e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x033f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03410/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03428/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03440/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03458/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03470/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03488/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x034a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x034b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x034d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x034e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03500/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03518/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03530/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03548/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03560/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03578/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03590/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x035a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x035c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x035d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x035f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03608/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03620/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03638/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03650/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03668/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03680/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03698/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x036b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x036c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x036e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x036f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03710/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03728/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03740/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03758/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03770/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03788/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x037a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x037b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x037d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x037e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03800/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03818/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03830/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03848/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03860/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03878/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03890/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x038a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x038c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x038d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x038f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03908/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03920/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03938/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03950/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03968/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03980/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03998/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x039b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x039c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x039e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x039f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a10/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a28/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a40/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a58/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a70/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a88/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03aa0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ab8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ad0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ae8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ba8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03bc0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03bd8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03bf0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03cb0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03cc8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ce0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03cf8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d10/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d28/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d40/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d58/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d70/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d88/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03da0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03db8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03dd0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03de8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ea8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ec0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ed8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ef0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03fb0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03fc8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03fe0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ff8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04010/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04028/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04040/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04058/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04070/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04088/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x040a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x040b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x040d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x040e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04100/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04118/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04130/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04148/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04160/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04178/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04190/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x041a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x041c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x041d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x041f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04208/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04220/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04238/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04250/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04268/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04280/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04298/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x042b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x042c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x042e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x042f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04310/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04328/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04340/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04358/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04370/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04388/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x043a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x043b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x043d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x043e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04400/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04418/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04430/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04448/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04460/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04478/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04490/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x044a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x044c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x044d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x044f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04508/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04520/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04538/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04550/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04568/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04580/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04598/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x045b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x045c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x045e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x045f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04610/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04628/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04640/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04658/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04670/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04688/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x046a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x046b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x046d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x046e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04700/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04718/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04730/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04748/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04760/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04778/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04790/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x047a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x047c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x047d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x047f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04808/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04820/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04838/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04850/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04868/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04880/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04898/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x048b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x048c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x048e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x048f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04910/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04928/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04940/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04958/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04970/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04988/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x049a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x049b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x049d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x049e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04aa8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ac0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ad8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04af0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04bb0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04bc8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04be0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04bf8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c10/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c28/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c40/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c58/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c70/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c88/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ca0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04cb8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04cd0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ce8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04da8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04dc0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04dd8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04df0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04eb0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ec8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ee0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ef8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04f08/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f18/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f28/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f38/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f48/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f58/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f68/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f78/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f88/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f98/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fa8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fb8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fc8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fd8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fe8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04ff8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05008/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05018/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05028/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05038/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05048/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05058/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05068/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05078/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05088/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05098/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050a8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050b8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050c8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050d8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050e8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050f8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05108/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05118/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05128/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05138/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05148/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05158/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05168/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05178/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05188/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05198/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051a8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051b8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051c8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051d8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051e8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051f8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05208/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05218/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05228/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05238/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05248/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05258/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05268/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05278/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05288/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05298/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052a8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052b8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052c8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052d8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052e8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052f8/4, 0x3f800000);
++}
++
 +struct nouveau_channel *
 +nv40_graph_channel(struct drm_device *dev)
 +{
@@ -31552,6 +32201,9 @@ index 0000000..76c6f21
 +	case 0x4e:
 +		ctx_init = nv4e_graph_context_init;
 +		break;
++	case 0x63:
++		ctx_init = nv63_graph_context_init;
++		break;
 +	default:
 +		ctx_init = nv40_graph_context_init;
 +		break;
@@ -32000,6 +32652,26 @@ index 0000000..76c6f21
 +	~0
 +};
 +
++static uint32_t nv63_ctxprog[] = {
++	0x00401164, 0x00401105, 0x00400565, 0x00400706, 0x00406068, 0x00500060,
++	0x00600007, 0x00500060, 0x00700000, 0x00910880, 0x00901ffe, 0x01940000,
++	0x00200020, 0x0060000b, 0x00500069, 0x0060000c, 0x00401268, 0x00700080,
++	0x00200008, 0x0060000a, 0x00104029, 0x001e8051, 0x001040c5, 0x00128100,
++	0x00128120, 0x0014c140, 0x00118158, 0x0011415f, 0x0010c1c4, 0x001041c9,
++	0x0010c1dc, 0x00150210, 0x0012c225, 0x00108238, 0x0010823e, 0x0010427e,
++	0x00200049, 0x00100280, 0x00110400, 0x00105401, 0x00104d10, 0x00500060,
++	0x00405de6, 0x00148653, 0x00104668, 0x0010c66d, 0x00120682, 0x0011068b,
++	0x00168691, 0x001046ae, 0x001046b0, 0x001206b4, 0x001046c4, 0x001146c6,
++	0x001646cc, 0x001046e5, 0x001206e6, 0x001246f0, 0x002000c0, 0x00100700,
++	0x0010c3d7, 0x001043e1, 0x00500060, 0x00104800, 0x00108901, 0x00104910,
++	0x00124920, 0x0017c940, 0x00140965, 0x00144a00, 0x00104a11, 0x00108a14,
++	0x00110b00, 0x00110b04, 0x00120b08, 0x00134b2c, 0x0010cd00, 0x0010cd04,
++	0x00104d08, 0x00104d80, 0x00104e00, 0x00104f06, 0x0012d600, 0x00105c00,
++	0x00300000, 0x00200080, 0x00405800, 0x00200084, 0x00800001, 0x00200332,
++	0x0060000a, 0x00201320, 0x00800029, 0x00400200, 0x00406005, 0x00600009,
++	0x00700005, 0x00700006, 0x0060000e, ~0
++};
++
 +/*
 + * G70		0x47
 + * G71		0x49
@@ -32059,6 +32731,9 @@ index 0000000..76c6f21
 +	case 0x4e:
 +		ctxprog = nv4e_ctxprog;
 +		break;
++	case 0x63:
++		ctxprog = nv63_ctxprog;
++		break;
 +	default:
 +		NV_ERROR(dev, "Context program for 0x%02x unavailable\n",
 +			 dev_priv->chipset);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1956
retrieving revision 1.1957
diff -u -p -r1.1956 -r1.1957
--- kernel.spec	16 Dec 2009 20:37:39 -0000	1.1956
+++ kernel.spec	17 Dec 2009 03:03:25 -0000	1.1957
@@ -2143,6 +2143,9 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.8-171
+- drm-nouveau.patch: add support for GF7100 (NV63)
+
 * Wed Dec 16 2009 Adam Jackson <ajax at redhat.com>
 - drm-edid-9340d8cf.patch: Sync DRM EDID with Linus master.
 - drm-conservative-fallback-modes.patch, drm-edid-retry.patch,



From bpepple at fedoraproject.org  Thu Dec 17 03:06:45 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 17 Dec 2009 03:06:45 +0000 (UTC)
Subject: rpms/amsn/devel amsn.spec,1.27,1.28
Message-ID: <20091217030645.0B75811C00C5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/amsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18516

Modified Files:
	amsn.spec 
Log Message:
* Wed Dec 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.98.1-4
- Rebuild for new gupnp-igd.



Index: amsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/devel/amsn.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- amsn.spec	5 Dec 2009 09:17:29 -0000	1.27
+++ amsn.spec	17 Dec 2009 03:06:44 -0000	1.28
@@ -3,7 +3,7 @@
 
 Name:           amsn
 Version:        0.98.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.98.1-4
+- Rebuild for new gupnp-igd.
+
 * Sat Dec 05 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-3
 - add requires on tcl-snack, it is needed for voice-clip support
 - since we need snack anyway, use it for all audio and drop requirement on alsa-utils



From mclasen at fedoraproject.org  Thu Dec 17 03:08:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 03:08:24 +0000 (UTC)
Subject: File epiphany-2.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091217030824.B8EA128ED3E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for epiphany:

cf32404bfe6f0cb4d3f01d0c33c08def  epiphany-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 03:11:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 03:11:33 +0000 (UTC)
Subject: rpms/epiphany/F-12 .cvsignore, 1.89, 1.90 epiphany.spec, 1.247,
	1.248 sources, 1.92, 1.93
Message-ID: <20091217031133.A92B511C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19310

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-12/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	19 Oct 2009 21:38:43 -0000	1.89
+++ .cvsignore	17 Dec 2009 03:11:33 -0000	1.90
@@ -1 +1 @@
-epiphany-2.28.1.tar.bz2
+epiphany-2.28.2.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-12/epiphany.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- epiphany.spec	19 Oct 2009 21:38:43 -0000	1.247
+++ epiphany.spec	17 Dec 2009 03:11:33 -0000	1.248
@@ -7,9 +7,9 @@
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.28.1
+Version: 2.28.2
 Release: 1%{?dist}
-%define major_version 2.27
+%define major_version 2.28
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
@@ -245,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/epiphany/2.28/epiphany-2.28.2.news
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 - See http://mail.gnome.org/archives/ftp-release-list/2009-October/msg00049.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-12/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	19 Oct 2009 21:38:43 -0000	1.92
+++ sources	17 Dec 2009 03:11:33 -0000	1.93
@@ -1 +1 @@
-7a8b885a4894d2a9e979b8cb8898db1e  epiphany-2.28.1.tar.bz2
+cf32404bfe6f0cb4d3f01d0c33c08def  epiphany-2.28.2.tar.bz2



From kevin at fedoraproject.org  Thu Dec 17 03:14:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 17 Dec 2009 03:14:36 +0000 (UTC)
Subject: rpms/xchat/devel xchat-2.8.6-change-page-activity.patch, NONE,
	1.1 xchat.spec, 1.108, 1.109
Message-ID: <20091217031436.2EC3A11C00C5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19892

Modified Files:
	xchat.spec 
Added Files:
	xchat-2.8.6-change-page-activity.patch 
Log Message:
Add patch to allow switching to next channel with activity


xchat-2.8.6-change-page-activity.patch:
 common/inbound.c |    5 ++
 common/xchat.c   |  129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/xchat.h   |   13 +++++
 common/xchatc.h  |    3 +
 fe-gtk/fe-gtk.c  |    1 
 fe-gtk/fkeys.c   |   41 +++++++++++++++++
 fe-gtk/maingui.c |    2 
 7 files changed, 193 insertions(+), 1 deletion(-)

--- NEW FILE xchat-2.8.6-change-page-activity.patch ---
diff -paur xchat2.orig/src/common/inbound.c xchat2/src/common/inbound.c
--- xchat2.orig/src/common/inbound.c	2008-07-20 17:31:44.898468115 +0200
+++ xchat2/src/common/inbound.c	2008-07-19 19:57:09.799906780 +0200
@@ -297,7 +297,10 @@ is_hilight (char *from, char *text, sess
 	{
 		g_free (text);
 		if (sess != current_tab)
+		{
 			sess->nick_said = TRUE;
+			lastact_update(sess);
+		}
 		fe_set_hilight (sess);
 		return 1;
 	}
@@ -344,6 +347,7 @@ inbound_action (session *sess, char *cha
 			sess->msg_said = TRUE;
 			sess->new_data = FALSE;
 		}
+		lastact_update(sess);
 	}
 
 	user = userlist_find (sess, from);
@@ -395,6 +399,7 @@ inbound_chanmsg (server *serv, session *
 	{
 		sess->msg_said = TRUE;
 		sess->new_data = FALSE;
+		lastact_update(sess);
 	}
 
 	user = userlist_find (sess, from);
diff -paur xchat2.orig/src/common/xchat.c xchat2/src/common/xchat.c
--- xchat2.orig/src/common/xchat.c	2008-07-20 17:31:44.900468825 +0200
+++ xchat2/src/common/xchat.c	2008-07-20 17:33:57.089468218 +0200
@@ -71,6 +71,23 @@ GSList *usermenu_list = 0;
 GSList *urlhandler_list = 0;
 GSList *tabmenu_list = 0;
 
+/*
+ * This array contains 5 double linked lists, one for each priority in the
+ * "interesting session" queue ("channel" stands for everything but
+ * SESS_DIALOG):
+ *
+ * [0] queries with hilight
+ * [1] queries
+ * [2] channels with hilight
+ * [3] channels with dialogue
+ * [4] channels with other data
+ *
+ * Each time activity happens the corresponding session is put at the
+ * beginning of one of the lists.  The aim is to be able to switch to the
+ * session with the most important/recent activity.
+ */
+GList *sess_list_by_lastact[5] = {NULL, NULL, NULL, NULL, NULL};
+
 static int in_xchat_exit = FALSE;
 int xchat_is_quitting = FALSE;
 /* command-line args */
@@ -93,6 +110,105 @@ struct xchatprefs prefs;
 SSL_CTX *ctx = NULL;
 #endif
 
+/*
+ * Update the priority queue of the "interesting sessions"
+ * (sess_list_by_lastact).
+ */
+void
+lastact_update(session *sess)
+{
+	int newidx;
+
+	/* Find the priority (for the order see before) */
+	if (sess->type == SESS_DIALOG)
+	{
+		if (sess->nick_said)
+			newidx = LACT_QUERY_HI;
+		else if (sess->msg_said)
+			newidx = LACT_QUERY;
+		else if (sess->new_data)
+			newidx = LACT_QUERY;
+		else
+			newidx = LACT_NONE;
+	}
+	else
+	{
+		if (sess->nick_said)
+			newidx = LACT_CHAN_HI;
+		else if (sess->msg_said)
+			newidx = LACT_CHAN;
+		else if (sess->new_data)
+			newidx = LACT_CHAN_DATA;
+		else
+			newidx = LACT_NONE;
+	}
+
+	/* Check if this update is a no-op */
+	if (sess->lastact_idx == newidx && 
+			((newidx != LACT_NONE && sess->lastact_elem == sess_list_by_lastact[newidx]) ||
+			 (newidx == LACT_NONE)))
+		return;
+
+	/* Remove from the old position (and, if no new position, return */
+	else if (sess->lastact_idx != LACT_NONE && sess->lastact_elem)
+	{
+		sess_list_by_lastact[sess->lastact_idx] = g_list_remove_link(
+				sess_list_by_lastact[sess->lastact_idx],
+				sess->lastact_elem);
+		if (newidx == LACT_NONE)
+		{
+			sess->lastact_idx = newidx;
+			return;
+		}
+	}
+
+	/* No previous position, allocate new */
+	else if (!sess->lastact_elem)
+		sess->lastact_elem = g_list_prepend(sess->lastact_elem, sess);
+
+	sess->lastact_idx = newidx;
+	sess_list_by_lastact[newidx] = g_list_concat(
+			sess->lastact_elem, sess_list_by_lastact[newidx]);
+}
+
+/*
+ * Extract the first session from the priority queue of sessions with recent
+ * activity. Return NULL if no such session can be found.
+ *
+ * If filter is specified, skip a session if filter(session) returns 0. This
+ * can be used for UI-specific needs, e.g. in fe-gtk we want to filter out
+ * detached sessions.
+ */
+session *
+lastact_getfirst(int (*filter) (session *sess))
+{
+	int i;
+	session *sess = NULL;
+	GList *curitem;
+
+	/* 5 is the number of priority classes LACT_ */
+	for (i = 0; i < 5 && !sess; i++)
+	{
+		curitem = sess_list_by_lastact[i];
+		while (curitem && !sess)
+		{
+			sess = g_list_nth_data(curitem, 0);
+			if (!sess || (filter && !filter(sess)))
+			{
+				sess = NULL;
+				curitem = g_list_next(curitem);
+			}
+		}
+
+		if (sess)
+		{
+			sess_list_by_lastact[i] = g_list_remove_link(sess_list_by_lastact[i], curitem);
+			sess->lastact_idx = LACT_NONE;
+		}
+	}
+	
+	return sess;
+}
 
 int
 is_session (session * sess)
@@ -362,6 +478,9 @@ session_new (server *serv, char *from, i
 
 	sess_list = g_slist_prepend (sess_list, sess);
 
+	sess->lastact_elem = NULL;
+	sess->lastact_idx = LACT_NONE;
+
 	fe_new_window (sess, focus);
 
 	return sess;
@@ -533,6 +652,16 @@ session_free (session *killsess)
 			current_sess = sess_list->data;
 	}
 
+	if (killsess->lastact_elem)
+	{
+		if (killsess->lastact_idx != LACT_NONE)
+			sess_list_by_lastact[killsess->lastact_idx] = g_list_delete_link(
+					sess_list_by_lastact[killsess->lastact_idx],
+					killsess->lastact_elem);
+		else
+			g_list_free_1(killsess->lastact_elem);
+	}
+
 	free (killsess);
 
 	if (!sess_list && !in_xchat_exit)
diff -paur xchat2.orig/src/common/xchat.h xchat2/src/common/xchat.h
--- xchat2.orig/src/common/xchat.h	2008-07-20 17:31:44.901467675 +0200
+++ xchat2/src/common/xchat.h	2008-07-20 17:33:28.240467970 +0200
@@ -320,6 +320,15 @@ struct xchatprefs
 #define SET_ON 1
 #define SET_DEFAULT 2 /* use global setting */
 
+/* Priorities in the "interesting sessions" priority queue
+ * (see xchat.c:sess_list_by_lastact) */
+#define LACT_NONE		-1		/* no queues */
+#define LACT_QUERY_HI	0		/* query with hilight */
+#define LACT_QUERY		1		/* query with messages */
+#define LACT_CHAN_HI	2		/* channel with hilight */
+#define LACT_CHAN		3		/* channel with messages */
+#define LACT_CHAN_DATA	4		/* channel with other data */
+
 typedef struct session
 {
 	/* Per-Channel Alerts */
@@ -369,6 +378,10 @@ typedef struct session
 
 	int type;					/* SESS_* */
 
+	GList *lastact_elem;	/* our GList element in sess_list_by_lastact */
+	int lastact_idx;		/* the sess_list_by_lastact[] index of the list we're in.
+							 * For valid values, see defines of LACT_*. */
+
 	int new_data:1;			/* new data avail? (purple tab) */
 	int nick_said:1;		/* your nick mentioned? (blue tab) */
 	int msg_said:1;			/* new msg available? (red tab) */
diff -paur xchat2.orig/src/common/xchatc.h xchat2/src/common/xchatc.h
--- xchat2.orig/src/common/xchatc.h	2008-07-20 17:31:44.901467675 +0200
+++ xchat2/src/common/xchatc.h	2008-07-20 11:43:36.673967630 +0200
@@ -25,10 +25,13 @@ extern GSList *ignore_list;
 extern GSList *usermenu_list;
 extern GSList *urlhandler_list;
 extern GSList *tabmenu_list;
+extern GList *sess_list_by_lastact[];
 
 session * find_channel (server *serv, char *chan);
 session * find_dialog (server *serv, char *nick);
 session * new_ircwindow (server *serv, char *name, int type, int focus);
+void lastact_update (session * sess);
+session * lastact_getfirst (int (*filter) (session *sess));
 int is_session (session * sess);
 void session_free (session *killsess);
 void lag_check (void);
diff -paur xchat2.orig/src/fe-gtk/fe-gtk.c xchat2/src/fe-gtk/fe-gtk.c
--- xchat2.orig/src/fe-gtk/fe-gtk.c	2008-07-20 17:31:44.958466232 +0200
+++ xchat2/src/fe-gtk/fe-gtk.c	2008-07-19 19:58:57.431961788 +0200
@@ -603,6 +603,7 @@ fe_print_text (struct session *sess, cha
 		 sess->gui->is_tab && !sess->nick_said && stamp == 0)
 	{
 		sess->new_data = TRUE;
+		lastact_update(sess);
 		if (sess->msg_said)
 			fe_set_tab_color (sess, 2);
 		else
diff -paur xchat2.orig/src/fe-gtk/fkeys.c xchat2/src/fe-gtk/fkeys.c
--- xchat2.orig/src/fe-gtk/fkeys.c	2008-07-20 17:31:44.960465847 +0200
+++ xchat2/src/fe-gtk/fkeys.c	2008-07-20 12:20:50.186930065 +0200
@@ -158,7 +158,7 @@ static const struct key_action key_actio
 	{key_action_handle_command, "Run Command",
 	 N_("The \002Run Command\002 action runs the data in Data 1 as if it has been typed into the entry box where you pressed the key sequence. Thus it can contain text (which will be sent to the channel/person), commands or user commands. When run all \002\\n\002 characters in Data 1 are used to deliminate seperate commands so it is possible to run more than one command. If you want a \002\\\002 in the actual text run then enter \002\\\\\002")},
 	{key_action_page_switch, "Change Page",
-	 N_("The \002Change Page\002 command switches between pages in the notebook. Set Data 1 to the page you want to switch to. If Data 2 is set to anything then the switch will be relative to the current position")},
+	 N_("The \002Change Page\002 command switches between pages in the notebook. Set Data 1 to the page you want to switch to. If Data 2 is set to anything then the switch will be relative to the current position. Set Data 1 to auto to switch to the page with the most recent and important activity (queries first, then channels with hilight, channels with dialogue, channels with other data)")},
 	{key_action_insert, "Insert in Buffer",
 	 N_("The \002Insert in Buffer\002 command will insert the contents of Data 1 into the entry where the key sequence was pressed at the current cursor position")},
 	{key_action_scroll_page, "Scroll Page",
@@ -402,6 +402,7 @@ key_load_defaults ()
 		"A\n3\nChange Page\nD1:3\nD2!\n\n"\
 		"A\n2\nChange Page\nD1:2\nD2!\n\n"\
 		"A\n1\nChange Page\nD1:1\nD2!\n\n"\
+		"A\ngrave\nChange Page\nD1:auto\nD2!\n\n"\
 		"C\no\nInsert in Buffer\nD1:\nD2!\n\n"\
 		"C\nb\nInsert in Buffer\nD1:\nD2!\n\n"\
 		"C\nk\nInsert in Buffer\nD1:\nD2!\n\n"\
@@ -1196,6 +1197,20 @@ key_action_handle_command (GtkWidget * w
 	return 0;
 }
 
+/*
+ * Check if the given session is inside the main window. This predicate
+ * is passed to lastact_pop as a way to filter out detached sessions.
+ * XXX: Consider moving this in a different file?
+ */
+static int
+session_check_is_tab(session *sess)
+{
+	if (!sess || !sess->gui)
+		return FALSE;
+
+	return (sess->gui->is_tab);
+}
+
 static int
 key_action_page_switch (GtkWidget * wid, GdkEventKey * evt, char *d1,
 								char *d2, struct session *sess)
@@ -1209,6 +1224,30 @@ key_action_page_switch (GtkWidget * wid,
 	if (!len)
 		return 1;
 
+	if (strcasecmp(d1, "auto") == 0)
+	{
+		/* Auto switch makes no sense in detached sessions */
+		if (!sess->gui->is_tab)
+			return 1;
+
+		/* Obtain a session with recent activity */
+		session *newsess = lastact_getfirst(session_check_is_tab);
+
+		if (newsess)
+		{
+			/*
+			 * Only sessions in the current window should be considered (i.e.
+			 * we don't want to move the focus on a different window). This
+			 * call could, in theory, do this, but we checked before that
+			 * newsess->gui->is_tab and sess->gui->is_tab.
+			 */
+			mg_bring_tofront_sess(newsess);
+			return 0;
+		}
+		else
+			return 1;
+	}
+
 	for (i = 0; i < len; i++)
 	{
 		if (d1[i] < '0' || d1[i] > '9')
diff -paur xchat2.orig/src/fe-gtk/maingui.c xchat2/src/fe-gtk/maingui.c
--- xchat2.orig/src/fe-gtk/maingui.c	2008-07-20 17:31:44.964469466 +0200
+++ xchat2/src/fe-gtk/maingui.c	2008-07-19 19:58:58.255909127 +0200
@@ -359,6 +359,7 @@ fe_set_tab_color (struct session *sess, 
 				
 			break;
 		}
+		lastact_update(sess);
 	}
 }
 
@@ -643,6 +644,7 @@ mg_focus (session *sess)
 		sess->nick_said = FALSE;
 		sess->msg_said = FALSE;
 		sess->new_data = FALSE;
+		lastact_update(sess);
 		/* when called via mg_changui_new, is_tab might be true, but
 			sess->res->tab is still NULL. */
 		if (sess->res->tab)


Index: xchat.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- xchat.spec	7 Dec 2009 00:22:13 -0000	1.108
+++ xchat.spec	17 Dec 2009 03:14:36 -0000	1.109
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   14%{?dist}
+Release:   15%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -28,6 +28,9 @@ Patch40: xchat-2.8.4-shm-pixmaps.patch
 Patch41: xchat-2.8.6-default-utf8.patch
 # fix literal underscore in "C_onnect" button (#512034, Edward Sheldrake)
 Patch42: xchat-2.8.6-connect-mnemonic.patch
+# patch to add ability to change to tab with most recent activity
+# See http://sourceforge.net/tracker/?func=detail&aid=2022871&group_id=239&atid=350239
+Patch50: xchat-2.8.6-change-page-activity.patch
 
 BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
@@ -76,6 +79,7 @@ This package contains the X-Chat plugin 
 %patch40 -p1 -b .shm-pixmaps
 %patch41 -p1 -b .default-utf8
 %patch42 -p1 -b .connect-mnemonic
+%patch50 -p1 -b .active-channel-switch
 
 sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
 
@@ -165,6 +169,9 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Dec 16 2009 Kevin Fenzi <kevin at tummy.com> - 1:2.8.6-15
+- Add patch to allow switching to next channel with activity. 
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1:2.8.6-14
 - rebuild against perl 5.10.1
 



From mclasen at fedoraproject.org  Thu Dec 17 03:16:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 03:16:47 +0000 (UTC)
Subject: File libsoup-2.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091217031647.AED2D28ED44@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libsoup:

31d7ad416005eed4b78f07ac01b6b9f0  libsoup-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 03:19:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 03:19:08 +0000 (UTC)
Subject: rpms/libsoup/F-12 .cvsignore, 1.58, 1.59 libsoup.spec, 1.104,
	1.105 sources, 1.58, 1.59
Message-ID: <20091217031908.DBC2911C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20895

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-12/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	20 Oct 2009 01:30:19 -0000	1.58
+++ .cvsignore	17 Dec 2009 03:19:08 -0000	1.59
@@ -1 +1 @@
-libsoup-2.28.1.tar.bz2
+libsoup-2.28.2.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-12/libsoup.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- libsoup.spec	5 Nov 2009 16:42:11 -0000	1.104
+++ libsoup.spec	17 Dec 2009 03:19:08 -0000	1.105
@@ -3,8 +3,8 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.28.1
-Release: 2%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
@@ -89,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhatcom>  2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/libsoup/2.28/libsoup-2.28.2.news
+
 * Thu Nov 05 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
 - Fix hangs when playing hi-def YouTube videos
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-12/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	20 Oct 2009 01:30:19 -0000	1.58
+++ sources	17 Dec 2009 03:19:08 -0000	1.59
@@ -1 +1 @@
-6c303cae11bde065497992d2444cc96a  libsoup-2.28.1.tar.bz2
+31d7ad416005eed4b78f07ac01b6b9f0  libsoup-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 03:27:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 03:27:43 +0000 (UTC)
Subject: File eog-2.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091217032743.7227528ED23@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for eog:

ee5fd7f3cdd37467cb86052a858757c3  eog-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 03:30:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 03:30:18 +0000 (UTC)
Subject: rpms/libsoup/F-12 libsoup.spec,1.105,1.106
Message-ID: <20091217033018.44E4E11C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22891

Modified Files:
	libsoup.spec 
Log Message:
Drop upstreamed patch



Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-12/libsoup.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- libsoup.spec	17 Dec 2009 03:19:08 -0000	1.105
+++ libsoup.spec	17 Dec 2009 03:30:17 -0000	1.106
@@ -12,9 +12,6 @@ URL: http://live.gnome.org/LibSoup
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Source: http://download.gnome.org/sources/libsoup/2.28/libsoup-%{version}.tar.bz2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=600830
-Patch0: 0001-Don-t-change-HEAD-to-GET-on-303-redirect.patch
-
 ### Build Dependencies ###
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -51,7 +48,6 @@ you to develop applications that use the
 
 %prep
 %setup -q
-%patch0 -p1 -b .youtube
 
 %build
 %configure



From mclasen at fedoraproject.org  Thu Dec 17 03:49:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 03:49:41 +0000 (UTC)
Subject: rpms/eog/F-12 .cvsignore, 1.91, 1.92 eog.spec, 1.154, 1.155 sources,
	1.91, 1.92
Message-ID: <20091217034941.7175211C00C5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22743

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-12/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- .cvsignore	20 Oct 2009 02:42:39 -0000	1.91
+++ .cvsignore	17 Dec 2009 03:49:41 -0000	1.92
@@ -1 +1 @@
-eog-2.28.1.tar.bz2
+eog-2.28.2.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-12/eog.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- eog.spec	20 Oct 2009 02:42:39 -0000	1.154
+++ eog.spec	17 Dec 2009 03:49:41 -0000	1.155
@@ -11,7 +11,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.28.1
+Version: 2.28.2
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.28/%{name}-%{version}.tar.bz2
@@ -170,6 +170,10 @@ fi
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/eog/2.28/eog-2.28.2.news
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-12/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	20 Oct 2009 02:42:39 -0000	1.91
+++ sources	17 Dec 2009 03:49:41 -0000	1.92
@@ -1 +1 @@
-efb488a22cbb0ca70f4b6a0f2d8aa83e  eog-2.28.1.tar.bz2
+ee5fd7f3cdd37467cb86052a858757c3  eog-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 04:21:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 04:21:23 +0000 (UTC)
Subject: File gdm-2.28.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091217042123.E505828ECA5@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gdm:

9607c6bac31c9d8bd3446e66a4576c2e  gdm-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 04:48:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 04:48:08 +0000 (UTC)
Subject: rpms/gdm/F-12 .cvsignore, 1.80, 1.81 gdm-multistack.patch, 1.11,
	1.12 gdm.spec, 1.522, 1.523 sources, 1.115,
	1.116 gdm-2.27.4-multistack.patch, 1.3, NONE
Message-ID: <20091217044808.ACE1811C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25145

Modified Files:
	.cvsignore gdm-multistack.patch gdm.spec sources 
Removed Files:
	gdm-2.27.4-multistack.patch 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	20 Oct 2009 12:09:53 -0000	1.80
+++ .cvsignore	17 Dec 2009 04:48:05 -0000	1.81
@@ -1 +1 @@
-gdm-2.28.1.tar.bz2
+gdm-2.28.2.tar.bz2

gdm-multistack.patch:
 b/common/gdm-marshal.list                                            |    1 
 b/configure.ac                                                       |   45 
 b/daemon/gdm-factory-slave.c                                         |   13 
 b/daemon/gdm-greeter-server.c                                        |    2 
 b/daemon/gdm-greeter-server.h                                        |    5 
 b/daemon/gdm-product-slave.c                                         |   47 
 b/daemon/gdm-session-direct.c                                        |   14 
 b/daemon/gdm-session-private.h                                       |    3 
 b/daemon/gdm-session-relay.c                                         |   29 
 b/daemon/gdm-session-worker-job.c                                    |   11 
 b/daemon/gdm-session-worker-job.h                                    |    2 
 b/daemon/gdm-session-worker.c                                        |   27 
 b/daemon/gdm-session-worker.h                                        |    2 
 b/daemon/gdm-session.c                                               |   20 
 b/daemon/gdm-session.h                                               |    9 
 b/daemon/gdm-simple-slave.c                                          |    3 
 b/daemon/test-session.c                                              |   14 
 b/gui/simple-greeter/Makefile.am                                     |    4 
 b/gui/simple-greeter/gdm-chooser-widget.c                            |   32 
 b/gui/simple-greeter/gdm-chooser-widget.h                            |    3 
 b/gui/simple-greeter/gdm-greeter-client.c                            |   18 
 b/gui/simple-greeter/gdm-greeter-client.h                            |    4 
 b/gui/simple-greeter/gdm-greeter-login-window.c                      |   91 
 b/gui/simple-greeter/gdm-greeter-login-window.glade                  |   39 
 b/gui/simple-greeter/gdm-greeter-login-window.h                      |   11 
 b/gui/simple-greeter/gdm-greeter-plugin.c                            |  255 +
 b/gui/simple-greeter/gdm-greeter-plugin.h                            |   61 
 b/gui/simple-greeter/gdm-greeter-session.c                           |    5 
 b/gui/simple-greeter/gdm-plugin-manager.c                            |  478 +++
 b/gui/simple-greeter/gdm-plugin-manager.h                            |   66 
 b/gui/simple-greeter/gdm-task-list.c                                 |  198 +
 b/gui/simple-greeter/gdm-task-list.h                                 |   65 
 b/gui/simple-greeter/gdm-user-chooser-widget.c                       |    2 
 b/gui/simple-greeter/libgdmsimplegreeter/Makefile.am                 |   46 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c          |  147 +
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h          |   87 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c     |   93 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h     |   55 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c                  |  117 
 b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                  |   62 
 b/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in      |   11 
 b/gui/simple-greeter/plugins/Makefile.am                             |    1 
 b/gui/simple-greeter/plugins/fingerprint/Makefile.am                 |   56 
 b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c |  299 ++
 b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h |   56 
 b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint.pam         |   17 
 b/gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am     |    5 
 b/gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am     |    5 
 b/gui/simple-greeter/plugins/fingerprint/icons/Makefile.am           |    1 
 b/gui/simple-greeter/plugins/fingerprint/page.ui                     |   56 
 b/gui/simple-greeter/plugins/fingerprint/plugin.c                    |   41 
 b/gui/simple-greeter/plugins/password/Makefile.am                    |   53 
 b/gui/simple-greeter/plugins/password/gdm-password-extension.c       |  314 ++
 b/gui/simple-greeter/plugins/password/gdm-password-extension.h       |   56 
 b/gui/simple-greeter/plugins/password/gdm-password.pam               |   19 
 b/gui/simple-greeter/plugins/password/page.ui                        |   56 
 b/gui/simple-greeter/plugins/password/plugin.c                       |   40 
 b/gui/simple-greeter/plugins/smartcard/Makefile.am                   |   77 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c     |  418 ++
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h     |   56 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c       | 1394 ++++++++++
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h       |   86 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c        |  167 +
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c               |  558 ++++
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h               |   94 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.pam             |   18 
 b/gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile.am       |    5 
 b/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am       |    5 
 b/gui/simple-greeter/plugins/smartcard/icons/Makefile.am             |    1 
 b/gui/simple-greeter/plugins/smartcard/page.ui                       |   56 
 b/gui/simple-greeter/plugins/smartcard/plugin.c                      |   40 
 b/po/POTFILES.in                                                     |    2 
 configure.ac                                                         |   15 
 daemon/gdm-factory-slave.c                                           |  103 
 daemon/gdm-greeter-server.c                                          |  195 +
 daemon/gdm-greeter-server.h                                          |   21 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          | 1137 +++++---
 daemon/gdm-session-private.h                                         |   31 
 daemon/gdm-session-relay.c                                           |  223 +
 daemon/gdm-session-worker-job.c                                      |   73 
 daemon/gdm-session-worker-job.h                                      |    6 
 daemon/gdm-session-worker.c                                          |   61 
 daemon/gdm-session.c                                                 |  250 +
 daemon/gdm-session.h                                                 |   62 
 daemon/gdm-simple-slave.c                                            |  241 +
 daemon/test-session.c                                                |   22 
 gui/simple-greeter/Makefile.am                                       |   15 
 gui/simple-greeter/gdm-chooser-widget.c                              |    9 
 gui/simple-greeter/gdm-chooser-widget.h                              |    3 
 gui/simple-greeter/gdm-greeter-client.c                              |  229 +
 gui/simple-greeter/gdm-greeter-client.h                              |   21 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1158 ++++++--
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  144 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   24 
 gui/simple-greeter/gdm-greeter-session.c                             |  148 -
 gui/simple-greeter/gdm-task-list.c                                   |  268 +
 gui/simple-greeter/gdm-task-list.h                                   |   40 
 gui/simple-greeter/gdm-user-chooser-widget.c                         |   32 
 gui/simple-greeter/libgdmsimplegreeter/Makefile.am                   |    2 
 gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c            |   51 
 gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h            |   13 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.c                    |   12 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    5 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   54 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |   15 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   62 
 po/POTFILES.in                                                       |    2 
 109 files changed, 9964 insertions(+), 1299 deletions(-)

Index: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gdm-multistack.patch	6 Nov 2009 18:45:32 -0000	1.11
+++ gdm-multistack.patch	17 Dec 2009 04:48:06 -0000	1.12
@@ -209,82 +209,6 @@ index d42eb37..5ad1c92 100644
 1.6.5.2
 
 
-From 98b3621d59550909f9d837e94d3cb15d20730f30 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Wed, 13 May 2009 13:43:33 -0400
-Subject: [PATCH 12/82] Don't send auth-failed when worker dies
-
-Authentication hasn't failed, it just got aborted before it
-could.  This prevents a crash that happens when switching
-runlevels while the login screen is up.
----
- daemon/gdm-session-direct.c |   12 ++----------
- 1 files changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index b6abae4..8eadf4d 100644
---- a/daemon/gdm-session-direct.c
-+++ b/daemon/gdm-session-direct.c
-@@ -78,7 +78,6 @@ struct _GdmSessionDirectPrivate
- 
-         GdmSessionWorkerJob *job;
-         GPid                 session_pid;
--        guint32              is_authenticated : 1;
-         guint32              is_running : 1;
- 
-         /* object lifetime scope */
-@@ -335,7 +334,6 @@ gdm_session_direct_handle_authenticated (GdmSessionDirect *session,
-         dbus_connection_send (connection, reply, NULL);
-         dbus_message_unref (reply);
- 
--        session->priv->is_authenticated = TRUE;
-         _gdm_session_authenticated (GDM_SESSION (session));
- 
-         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -363,7 +361,6 @@ gdm_session_direct_handle_authentication_failed (GdmSessionDirect *session,
- 
-         g_debug ("GdmSessionDirect: Emitting 'authentication-failed' signal");
- 
--        session->priv->is_authenticated = FALSE;
-         _gdm_session_authentication_failed (GDM_SESSION (session), text);
- 
-         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -1552,9 +1549,7 @@ worker_exited (GdmSessionWorkerJob *job,
- {
-         g_debug ("GdmSessionDirect: Worker job exited: %d", code);
- 
--        if (!session->priv->is_authenticated) {
--                _gdm_session_authentication_failed (GDM_SESSION (session), NULL);
--        } else if (session->priv->is_running) {
-+        if (session->priv->is_running) {
-                 _gdm_session_session_exited (GDM_SESSION (session), code);
-         }
- }
-@@ -1566,9 +1561,7 @@ worker_died (GdmSessionWorkerJob *job,
- {
-         g_debug ("GdmSessionDirect: Worker job died: %d", signum);
- 
--        if (!session->priv->is_authenticated) {
--                _gdm_session_authentication_failed (GDM_SESSION (session), NULL);
--        } else if (session->priv->is_running) {
-+        if (session->priv->is_running) {
-                 _gdm_session_session_died (GDM_SESSION (session), signum);
-         }
- }
-@@ -2037,7 +2030,6 @@ gdm_session_direct_close (GdmSession *session)
-         g_hash_table_remove_all (impl->priv->environment);
- 
-         impl->priv->session_pid = -1;
--        impl->priv->is_authenticated = FALSE;
-         impl->priv->is_running = FALSE;
- }
- 
--- 
-1.6.5.2
-
-
-
-
 From c3d7aa8a30e643ee6068220abd3209b6bbdc6c1a Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 23 Oct 2009 17:40:36 -0400


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -p -r1.522 -r1.523
--- gdm.spec	1 Dec 2009 16:04:53 -0000	1.522
+++ gdm.spec	17 Dec 2009 04:48:07 -0000	1.523
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.28.1
-Release: 25%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -109,8 +109,6 @@ Patch25: fix-run-dir-permissions.patch
 Patch26: make-user-list-animation-smoother.patch
 Patch27: 0001-Don-t-show-lock-screen-option-if-locked-down.patch
 Patch28: hide-search-entry.patch
-# http://bugzilla.redhat.com/539737
-Patch29: dont-crash-with-invalid-utf8.patch
 
 Patch96: gdm-multistack.patch
 Patch100: gdm-2.28.1-eviction-notice.patch
@@ -167,7 +165,6 @@ The GDM fingerprint plugin provides func
 %patch26 -p1 -b .make-user-list-animation-smoother
 %patch27 -p1 -b .dont-show-lock-screen-if-locked-down
 %patch28 -p1 -b .hide-search-entry
-%patch29 -p1 -b .dont-crash-with-invalid-utf8
 
 %patch96 -p1 -b .multistack
 %patch100 -p1 -b .eviction-notice
@@ -426,6 +423,10 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/gdm/2.28/gdm-2.28.2.news
+
 * Tue Dec 01 2009 Ray Strode <rstrode at redhat.com> 2.28.1-25
 - Don't crash if /etc/passwd contains invalid utf8 (bug 539737)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	20 Oct 2009 12:09:53 -0000	1.115
+++ sources	17 Dec 2009 04:48:07 -0000	1.116
@@ -1 +1 @@
-917dc80f5ef6adcdc15193de238476db  gdm-2.28.1.tar.bz2
+9607c6bac31c9d8bd3446e66a4576c2e  gdm-2.28.2.tar.bz2


--- gdm-2.27.4-multistack.patch DELETED ---



From mclasen at fedoraproject.org  Thu Dec 17 04:52:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 04:52:43 +0000 (UTC)
Subject: File gnome-games-2.28.2.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091217045243.3503B28ECA5@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gnome-games:

6dcd006d4393524c1e4f39ca0310ac8d  gnome-games-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 04:54:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 04:54:17 +0000 (UTC)
Subject: rpms/gnome-games/F-12 .cvsignore, 1.106, 1.107 gnome-games.spec,
	1.232, 1.233 sources, 1.111, 1.112
Message-ID: <20091217045417.6E97011C0092@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26119

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-12/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	20 Oct 2009 02:20:33 -0000	1.106
+++ .cvsignore	17 Dec 2009 04:54:17 -0000	1.107
@@ -1 +1 @@
-gnome-games-2.28.1.tar.bz2
+gnome-games-2.28.2.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-12/gnome-games.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- gnome-games.spec	20 Oct 2009 02:20:33 -0000	1.232
+++ gnome-games.spec	17 Dec 2009 04:54:17 -0000	1.233
@@ -45,7 +45,7 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.28.1
+Version: 2.28.2
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -502,6 +502,10 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/gnome-games/2.28/gnome-games-2.28.2.news
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-12/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	20 Oct 2009 02:20:33 -0000	1.111
+++ sources	17 Dec 2009 04:54:17 -0000	1.112
@@ -1 +1 @@
-c67497debd70aa8847874616660dae48  gnome-games-2.28.1.tar.bz2
+6dcd006d4393524c1e4f39ca0310ac8d  gnome-games-2.28.2.tar.bz2



From phuang at fedoraproject.org  Thu Dec 17 05:51:01 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 17 Dec 2009 05:51:01 +0000 (UTC)
Subject: File ibus-qt-1.2.0.20091217-Source.tar.gz uploaded to lookaside
	cache by phuang
Message-ID: <20091217055101.EDA8628ED2D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ibus-qt:

087fec04205e4439d8b8f5cf4e4967c6  ibus-qt-1.2.0.20091217-Source.tar.gz



From phuang at fedoraproject.org  Thu Dec 17 05:55:40 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 17 Dec 2009 05:55:40 +0000 (UTC)
Subject: rpms/ibus-qt/devel .cvsignore, 1.7, 1.8 ibus-qt.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20091217055540.2FFD311C0092@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2441

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20091217


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Dec 2009 05:39:12 -0000	1.7
+++ .cvsignore	17 Dec 2009 05:55:38 -0000	1.8
@@ -1 +1 @@
-ibus-qt-1.2.0.20091216-Source.tar.gz
+ibus-qt-1.2.0.20091217-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ibus-qt.spec	16 Dec 2009 05:39:12 -0000	1.11
+++ ibus-qt.spec	17 Dec 2009 05:55:38 -0000	1.12
@@ -1,5 +1,5 @@
 Name:       ibus-qt
-Version:    1.2.0.20091216
+Version:    1.2.0.20091217
 Release:    1%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
@@ -27,13 +27,13 @@ Requires:   %{name} = %{version}-%{relea
 %description devel
 The ibus-qt-devel package contains the header files for ibus qt library.
 
-%package devel-docs
+%package docs
 Summary:    Development documents for ibus qt
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
-%description devel-docs
-The ibus-qt-devel-docs package contains developer documentation for ibus qt library.
+%description docs
+The ibus-qt-docs package contains developer documentation for ibus qt library.
 
 %prep
 %setup -q -n %{name}-%{version}-Source
@@ -47,6 +47,7 @@ make \
     C_DEFINES="$RPM_OPT_FLAGS" \
     CXX_DEFINES="$RPM_OPT_FLAGS" \
     %{?_smp_mflags}
+make docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,14 +73,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/libibus-qt.so
 
-%files devel-docs
+%files docs
 %defattr(-,root,root,-)
-%{_datadir}/doc/ibus-qt-docs-1.2.0.20091216/html
-%{_datadir}/man/man3/*
+%doc docs/html
 
 %changelog
-* Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091216-1
-- Update to 1.2.0.20091216.
+* Thu Dec 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091217-1
+- Update to 1.2.0.20091217.
 
 * Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091206-1
 - Update to 1.2.0.20091206.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	16 Dec 2009 05:39:12 -0000	1.8
+++ sources	17 Dec 2009 05:55:38 -0000	1.9
@@ -1 +1 @@
-977e97cab3062a2531b5f329a486b193  ibus-qt-1.2.0.20091216-Source.tar.gz
+087fec04205e4439d8b8f5cf4e4967c6  ibus-qt-1.2.0.20091217-Source.tar.gz



From phuang at fedoraproject.org  Thu Dec 17 06:04:50 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 17 Dec 2009 06:04:50 +0000 (UTC)
Subject: rpms/ibus-qt/F-12 .cvsignore, 1.7, 1.8 ibus-qt.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20091217060450.69F8A11C0092@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3982

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20091217


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Dec 2009 06:02:24 -0000	1.7
+++ .cvsignore	17 Dec 2009 06:04:49 -0000	1.8
@@ -1 +1 @@
-ibus-qt-1.2.0.20091216-Source.tar.gz
+ibus-qt-1.2.0.20091217-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/ibus-qt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ibus-qt.spec	16 Dec 2009 06:02:25 -0000	1.10
+++ ibus-qt.spec	17 Dec 2009 06:04:49 -0000	1.11
@@ -1,5 +1,5 @@
 Name:       ibus-qt
-Version:    1.2.0.20091216
+Version:    1.2.0.20091217
 Release:    1%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
@@ -27,13 +27,13 @@ Requires:   %{name} = %{version}-%{relea
 %description devel
 The ibus-qt-devel package contains the header files for ibus qt library.
 
-%package devel-docs
+%package docs
 Summary:    Development documents for ibus qt
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
-%description devel-docs
-The ibus-qt-devel-docs package contains developer documentation for ibus qt library.
+%description docs
+The ibus-qt-docs package contains developer documentation for ibus qt library.
 
 %prep
 %setup -q -n %{name}-%{version}-Source
@@ -47,6 +47,7 @@ make \
     C_DEFINES="$RPM_OPT_FLAGS" \
     CXX_DEFINES="$RPM_OPT_FLAGS" \
     %{?_smp_mflags}
+make docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,14 +73,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/libibus-qt.so
 
-%files devel-docs
+%files docs
 %defattr(-,root,root,-)
-%{_datadir}/doc/ibus-qt-docs-1.2.0.20091216/html
-%{_datadir}/man/man3/*
+%doc docs/html
 
 %changelog
-* Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091216-1
-- Update to 1.2.0.20091216.
+* Thu Dec 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091217-1
+- Update to 1.2.0.20091217.
 
 * Sun Dec 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091206-1
 - Update to 1.2.0.20091206.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	16 Dec 2009 06:02:25 -0000	1.8
+++ sources	17 Dec 2009 06:04:49 -0000	1.9
@@ -1 +1 @@
-977e97cab3062a2531b5f329a486b193  ibus-qt-1.2.0.20091216-Source.tar.gz
+087fec04205e4439d8b8f5cf4e4967c6  ibus-qt-1.2.0.20091217-Source.tar.gz



From lucilanga at fedoraproject.org  Thu Dec 17 06:06:22 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Thu, 17 Dec 2009 06:06:22 +0000 (UTC)
Subject: File PDF-Create-1.04.tar.gz uploaded to lookaside cache by lucilanga
Message-ID: <20091217060622.BEC3228ECA8@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-PDF-Create:

786a508cfb10a6e2cd6344fa70f99692  PDF-Create-1.04.tar.gz



From cchance at fedoraproject.org  Thu Dec 17 06:25:36 2009
From: cchance at fedoraproject.org (cchance)
Date: Thu, 17 Dec 2009 06:25:36 +0000 (UTC)
Subject: rpms/stardict/F-12 stardict.spec,1.66,1.67
Message-ID: <20091217062536.2D72411C0092@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/stardict/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6988

Modified Files:
	stardict.spec 
Log Message:
* Thu Dec 17 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-19
- Resolves: rhbz#475904: Disabled espeak for instance as espeak has problems when it is built with pulseaudio.




Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-12/stardict.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- stardict.spec	27 Jul 2009 04:49:25 -0000	1.66
+++ stardict.spec	17 Dec 2009 06:25:34 -0000	1.67
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	18%{?dist}
+Release:	19%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -53,7 +53,7 @@ find src/sigc++* -name \*.h -or -name \*
 %{__aclocal}
 %{__autoconf}
 %{__libtoolize}
-%configure --disable-schemas-install --disable-festival
+%configure --disable-schemas-install --disable-festival --disable-espeak
 make -k %{_smp_mflags}
 
 %install
@@ -107,6 +107,9 @@ if which scrollkeeper-update>/dev/null 2
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Thu Dec 17 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-19
+- Resolves: rhbz#475904: Disabled espeak for instance as espeak has problems when it is built with pulseaudio.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cchance at fedoraproject.org  Thu Dec 17 06:27:29 2009
From: cchance at fedoraproject.org (cchance)
Date: Thu, 17 Dec 2009 06:27:29 +0000 (UTC)
Subject: rpms/stardict/devel stardict.spec,1.66,1.67
Message-ID: <20091217062729.4F25011C0092@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7392

Modified Files:
	stardict.spec 
Log Message:
* Thu Dec 17 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-19
- Resolves: rhbz#475904: Disabled espeak for instance as espeak has problems when it is built with pulseaudio.




Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- stardict.spec	27 Jul 2009 04:49:25 -0000	1.66
+++ stardict.spec	17 Dec 2009 06:27:29 -0000	1.67
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	18%{?dist}
+Release:	19%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -26,8 +26,8 @@ Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
 BuildRequires: autoconf, automake, libtool
-BuildRequires: desktop-file-utils, enchant-devel, espeak-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
-#BuildRequires: festival-devel, speech-tools-devel
+BuildRequires: desktop-file-utils, enchant-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
+#BuildRequires: festival-devel, speech-tools-devel, espeak-devel
 
 %description
 StarDict is a Cross-Platform and international dictionary written in Gtk2.
@@ -53,7 +53,7 @@ find src/sigc++* -name \*.h -or -name \*
 %{__aclocal}
 %{__autoconf}
 %{__libtoolize}
-%configure --disable-schemas-install --disable-festival
+%configure --disable-schemas-install --disable-festival --disable-espeak
 make -k %{_smp_mflags}
 
 %install
@@ -107,6 +107,9 @@ if which scrollkeeper-update>/dev/null 2
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Thu Dec 17 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-19
+- Resolves: rhbz#475904: Disabled espeak for instance as espeak has problems when it is built with pulseaudio.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pmatilai at fedoraproject.org  Thu Dec 17 06:54:52 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu, 17 Dec 2009 06:54:52 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.90-spec-allow-unexpanded-macros.patch, NONE, 
	1.1 rpm.spec, 1.373, 1.374
Message-ID: <20091217065452.6BF1A11C0092@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12235

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.90-spec-allow-unexpanded-macros.patch 
Log Message:
- permit unexpanded macros when parsing spec (#547997)


rpm-4.7.90-spec-allow-unexpanded-macros.patch:
 parsePreamble.c |    4 ++--
 parseReqs.c     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.7.90-spec-allow-unexpanded-macros.patch ---
commit 507f21f6bb4bf7029a0bca255cfe4aae3361f358
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Thu Dec 17 08:43:31 2009 +0200

    Permit unexpanded macros to slip through spec tag sanity checks (RhBug:547997)
    - For now, let %{} characters through our valid character set checks
      on specs. This isn't right really, but unexpanded, unrelated macros
      in spec can now cause failure to parse out buildrequires which would
      allow those macros to be expanded. This needs a better fix.

diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 82744fd..b5f1780 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -517,13 +517,13 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTag tag,
     switch (tag) {
     case RPMTAG_NAME:
 	SINGLE_TOKEN_ONLY;
-	if (rpmCharCheck(spec, field, strlen(field), ".-_+") != RPMRC_OK) return RPMRC_FAIL;
+	if (rpmCharCheck(spec, field, strlen(field), ".-_+%{}") != RPMRC_OK) return RPMRC_FAIL;
 	headerPutString(pkg->header, tag, field);
 	break;
     case RPMTAG_VERSION:
     case RPMTAG_RELEASE:
 	SINGLE_TOKEN_ONLY;
-	if (rpmCharCheck(spec, field, strlen(field), "._+") != RPMRC_OK) return RPMRC_FAIL;
+	if (rpmCharCheck(spec, field, strlen(field), "._+%{}") != RPMRC_OK) return RPMRC_FAIL;
 	headerPutString(pkg->header, tag, field);
 	break;
     case RPMTAG_URL:
diff --git a/build/parseReqs.c b/build/parseReqs.c
index 1a657a6..d12aca3 100644
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -168,7 +168,7 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTag tagN,
 	    }
 	    EVR = xmalloc((ve-v) + 1);
 	    rstrlcpy(EVR, v, (ve-v) + 1);
-	    if (rpmCharCheck(spec, EVR, ve-v, ".-_+:")) goto exit;
+	    if (rpmCharCheck(spec, EVR, ve-v, ".-_+:%{}")) goto exit;
 	    re = ve;	/* ==> next token after EVR string starts here */
 	} else
 	    EVR = NULL;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- rpm.spec	9 Dec 2009 13:16:52 -0000	1.373
+++ rpm.spec	17 Dec 2009 06:54:51 -0000	1.374
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.3
+Release: 0.%{snapver}.4
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -39,6 +39,7 @@ Patch3: rpm-4.7.90-fedora-specspo.patch
 # Patches already in upstream
 Patch200: rpm-4.7.90-python-bytecompile.patch
 Patch201: rpm-4.7.90-python-refcounts.patch
+Patch202: rpm-4.7.90-spec-allow-unexpanded-macros.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -185,6 +186,7 @@ packages on a system.
 
 %patch200 -p1 -b .python-bytecompile
 %patch201 -p1 -b .python-refcounts
+%patch202 -p1 -b .spec-unexpanded-macros
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -399,6 +401,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Dec 17 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.4
+- permit unexpanded macros when parsing spec (#547997)
+
 * Wed Dec 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.3
 - fix a bunch of python refcount-errors causing major memory leaks
 



From jnovy at fedoraproject.org  Thu Dec 17 07:39:52 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 17 Dec 2009 07:39:52 +0000 (UTC)
Subject: File netpbm-10.47.06.tar.xz uploaded to lookaside cache by jnovy
Message-ID: <20091217073952.0CCBB28ECA5@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for netpbm:

97501b0316de8257d904d16347ba7730  netpbm-10.47.06.tar.xz



From jnovy at fedoraproject.org  Thu Dec 17 07:40:50 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 17 Dec 2009 07:40:50 +0000 (UTC)
Subject: rpms/netpbm/devel .cvsignore,1.61,1.62 sources,1.65,1.66
Message-ID: <20091217074050.955DB11C0092@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19899

Modified Files:
	.cvsignore sources 
Log Message:
- upload new source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	10 Dec 2009 09:25:05 -0000	1.61
+++ .cvsignore	17 Dec 2009 07:40:49 -0000	1.62
@@ -1 +1 @@
-netpbm-10.47.05.tar.xz
+netpbm-10.47.06.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	10 Dec 2009 09:25:05 -0000	1.65
+++ sources	17 Dec 2009 07:40:49 -0000	1.66
@@ -1 +1 @@
-b3076d696dff3673d66412d111356141  netpbm-10.47.05.tar.xz
+97501b0316de8257d904d16347ba7730  netpbm-10.47.06.tar.xz



From akurtakov at fedoraproject.org  Thu Dec 17 07:44:27 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 17 Dec 2009 07:44:27 +0000 (UTC)
Subject: rpms/jna/F-12 jna.spec,1.18,1.19
Message-ID: <20091217074427.6705211C0092@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jna/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20490/F-12

Modified Files:
	jna.spec 
Log Message:
- Comment rhel ExclusiveArchs - not correct applies on Fedora.


Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/F-12/jna.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- jna.spec	23 Nov 2009 19:58:03 -0000	1.18
+++ jna.spec	17 Dec 2009 07:44:27 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -28,9 +28,9 @@ BuildRequires:  libX11-devel libXt-devel
 # inside jars.
 Requires:       java >= 1:1.6.0 jpackage-utils libffi
 # for ExcludeArch see bug: 468831
-%if 0%{?rhel} < 6
-ExcludeArch: ppc ppc64
-%endif
+#%if 0%{?rhel} < 6
+#ExcludeArch: ppc ppc64
+#%endif
 
 
 %description
@@ -128,6 +128,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.4-2
+- Comment rhel ExclusiveArchs - not correct applies on Fedora.
+
 * Sat Nov 14 2009 Levente Farkas <lfarkas at lfarkas.org> - 3.2.4-1
 - Rebase on upstream 3.2.4
 



From pingou at fedoraproject.org  Thu Dec 17 08:39:25 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:39:25 +0000 (UTC)
Subject: File Biobase_2.6.1.tar.gz uploaded to lookaside cache by pingou
Message-ID: <20091217083925.1129B28ED2D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for R-Biobase:

9024452c229c4262257126969a338c3e  Biobase_2.6.1.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:40:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:40:12 +0000 (UTC)
Subject: rpms/R-Biobase/F-11 R-Biobase.spec,1.13,1.14 sources,1.10,1.11
Message-ID: <20091217084013.0D89111C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28935/F-11

Modified Files:
	R-Biobase.spec sources 
Log Message:
Update to 2.6.1


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-11/R-Biobase.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- R-Biobase.spec	21 Nov 2009 11:06:48 -0000	1.13
+++ R-Biobase.spec	17 Dec 2009 08:40:12 -0000	1.14
@@ -3,7 +3,7 @@
 %define Rversion  2.10.0
 
 Name:             R-%{packname}
-Version:          2.6.0 
+Version:          2.6.1 
 Release:          1%{?dist}
 Summary:          Base functions for Bioconductor
 
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.6.1-1
+- Update to 2.6.1
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 2.6.0-1
 - Update to 2.6.0
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Nov 2009 11:06:49 -0000	1.10
+++ sources	17 Dec 2009 08:40:12 -0000	1.11
@@ -1 +1 @@
-b4e6216ae1bd8cdf35a887c2e0f9a80b  Biobase_2.6.0.tar.gz
+9024452c229c4262257126969a338c3e  Biobase_2.6.1.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:40:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:40:12 +0000 (UTC)
Subject: rpms/R-Biobase/devel .cvsignore, 1.10, 1.11 R-Biobase.spec, 1.15,
	1.16 sources, 1.10, 1.11
Message-ID: <20091217084013.1427511C02B9@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28935/devel

Modified Files:
	.cvsignore R-Biobase.spec sources 
Log Message:
Update to 2.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Nov 2009 11:06:50 -0000	1.10
+++ .cvsignore	17 Dec 2009 08:40:12 -0000	1.11
@@ -1 +1 @@
-Biobase_2.6.0.tar.gz
+Biobase_2.6.1.tar.gz


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/R-Biobase.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- R-Biobase.spec	21 Nov 2009 11:06:50 -0000	1.15
+++ R-Biobase.spec	17 Dec 2009 08:40:12 -0000	1.16
@@ -3,7 +3,7 @@
 %define Rversion  2.10.0
 
 Name:             R-%{packname}
-Version:          2.6.0 
+Version:          2.6.1 
 Release:          1%{?dist}
 Summary:          Base functions for Bioconductor
 
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.6.1-1
+- Update to 2.6.1
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 2.6.0-1
 - Update to 2.6.0
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Nov 2009 11:06:50 -0000	1.10
+++ sources	17 Dec 2009 08:40:12 -0000	1.11
@@ -1 +1 @@
-b4e6216ae1bd8cdf35a887c2e0f9a80b  Biobase_2.6.0.tar.gz
+9024452c229c4262257126969a338c3e  Biobase_2.6.1.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:40:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:40:12 +0000 (UTC)
Subject: rpms/R-Biobase/F-12 R-Biobase.spec,1.14,1.15 sources,1.10,1.11
Message-ID: <20091217084013.101CE11C00EF@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28935/F-12

Modified Files:
	R-Biobase.spec sources 
Log Message:
Update to 2.6.1


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-12/R-Biobase.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- R-Biobase.spec	21 Nov 2009 11:06:49 -0000	1.14
+++ R-Biobase.spec	17 Dec 2009 08:40:12 -0000	1.15
@@ -3,7 +3,7 @@
 %define Rversion  2.10.0
 
 Name:             R-%{packname}
-Version:          2.6.0 
+Version:          2.6.1 
 Release:          1%{?dist}
 Summary:          Base functions for Bioconductor
 
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.6.1-1
+- Update to 2.6.1
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 2.6.0-1
 - Update to 2.6.0
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Nov 2009 11:06:49 -0000	1.10
+++ sources	17 Dec 2009 08:40:12 -0000	1.11
@@ -1 +1 @@
-b4e6216ae1bd8cdf35a887c2e0f9a80b  Biobase_2.6.0.tar.gz
+9024452c229c4262257126969a338c3e  Biobase_2.6.1.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:42:14 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:42:14 +0000 (UTC)
Subject: File Biostrings_2.14.9.tar.gz uploaded to lookaside cache by pingou
Message-ID: <20091217084214.934DD28ED40@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for R-Biostrings:

4da5ecc7c99aee2398bc5960a4f69d63  Biostrings_2.14.9.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:43:11 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:43:11 +0000 (UTC)
Subject: rpms/R-Biostrings/F-11 R-Biostrings.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20091217084311.2C6C711C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29528/F-11

Modified Files:
	R-Biostrings.spec sources 
Log Message:
Update to 2.17.9


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-11/R-Biostrings.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-Biostrings.spec	4 Dec 2009 17:41:32 -0000	1.8
+++ R-Biostrings.spec	17 Dec 2009 08:43:10 -0000	1.9
@@ -4,8 +4,8 @@
 %global IRange    1.4.3
 
 Name:             R-%{packname}
-Version:          2.14.7
-Release:          2%{?dist}
+Version:          2.14.9
+Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-1
+- Update to 2.14.9
+
 * Fri Dec 04 2009 pingou <pingou at pingoured.fr> 2.14.7-2
 - Remove the folder R-ex
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Nov 2009 11:12:22 -0000	1.7
+++ sources	17 Dec 2009 08:43:10 -0000	1.8
@@ -1 +1 @@
-b0ef7a0cedf5ecdffe282cce1617a445  Biostrings_2.14.7.tar.gz
+4da5ecc7c99aee2398bc5960a4f69d63  Biostrings_2.14.9.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:43:11 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:43:11 +0000 (UTC)
Subject: rpms/R-Biostrings/F-12 R-Biostrings.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <20091217084311.473C011C00EF@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29528/F-12

Modified Files:
	R-Biostrings.spec sources 
Log Message:
Update to 2.17.9


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-12/R-Biostrings.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- R-Biostrings.spec	4 Dec 2009 17:41:32 -0000	1.9
+++ R-Biostrings.spec	17 Dec 2009 08:43:11 -0000	1.10
@@ -4,8 +4,8 @@
 %global IRange    1.4.3
 
 Name:             R-%{packname}
-Version:          2.14.7
-Release:          2%{?dist}
+Version:          2.14.9
+Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-1
+- Update to 2.14.9
+
 * Fri Dec 04 2009 pingou <pingou at pingoured.fr> 2.14.7-2
 - Remove the folder R-ex
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Nov 2009 11:12:23 -0000	1.7
+++ sources	17 Dec 2009 08:43:11 -0000	1.8
@@ -1 +1 @@
-b0ef7a0cedf5ecdffe282cce1617a445  Biostrings_2.14.7.tar.gz
+4da5ecc7c99aee2398bc5960a4f69d63  Biostrings_2.14.9.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:43:11 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:43:11 +0000 (UTC)
Subject: rpms/R-Biostrings/devel .cvsignore, 1.7, 1.8 R-Biostrings.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20091217084311.7633711C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29528/devel

Modified Files:
	.cvsignore R-Biostrings.spec sources 
Log Message:
Update to 2.17.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 Nov 2009 11:12:23 -0000	1.7
+++ .cvsignore	17 Dec 2009 08:43:11 -0000	1.8
@@ -1 +1 @@
-Biostrings_2.14.7.tar.gz
+Biostrings_2.14.9.tar.gz


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/R-Biostrings.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- R-Biostrings.spec	4 Dec 2009 17:41:32 -0000	1.9
+++ R-Biostrings.spec	17 Dec 2009 08:43:11 -0000	1.10
@@ -4,8 +4,8 @@
 %global IRange    1.4.3
 
 Name:             R-%{packname}
-Version:          2.14.7
-Release:          2%{?dist}
+Version:          2.14.9
+Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-1
+- Update to 2.14.9
+
 * Fri Dec 04 2009 pingou <pingou at pingoured.fr> 2.14.7-2
 - Remove the folder R-ex
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Nov 2009 11:12:23 -0000	1.7
+++ sources	17 Dec 2009 08:43:11 -0000	1.8
@@ -1 +1 @@
-b0ef7a0cedf5ecdffe282cce1617a445  Biostrings_2.14.7.tar.gz
+4da5ecc7c99aee2398bc5960a4f69d63  Biostrings_2.14.9.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:44:48 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:44:48 +0000 (UTC)
Subject: File IRanges_1.4.9.tar.gz uploaded to lookaside cache by pingou
Message-ID: <20091217084448.28F5E28ED27@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for R-IRanges:

20ea4041da3e481e0bb1fd52b7c3509d  IRanges_1.4.9.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:45:41 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:45:41 +0000 (UTC)
Subject: rpms/R-IRanges/F-11 R-IRanges.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20091217084541.98B6011C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30043/F-11

Modified Files:
	R-IRanges.spec sources 
Log Message:
Update to 1.4.9


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-11/R-IRanges.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-IRanges.spec	21 Nov 2009 11:39:31 -0000	1.5
+++ R-IRanges.spec	17 Dec 2009 08:45:41 -0000	1.6
@@ -3,7 +3,7 @@
 %global Rvers     2.10.0
 
 Name:             R-%{packname}
-Version:          1.4.7
+Version:          1.4.9
 Release:          1%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 1.4.9-1
+- Update to 1.4.9
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 1.4.7-1
 - Update to 1.4.7
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Nov 2009 11:39:31 -0000	1.5
+++ sources	17 Dec 2009 08:45:41 -0000	1.6
@@ -1 +1 @@
-4358c9ab6c9c4d7e1099e9fde5299f78  IRanges_1.4.7.tar.gz
+20ea4041da3e481e0bb1fd52b7c3509d  IRanges_1.4.9.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:45:41 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:45:41 +0000 (UTC)
Subject: rpms/R-IRanges/devel .cvsignore, 1.5, 1.6 R-IRanges.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091217084541.D0A0211C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30043/devel

Modified Files:
	.cvsignore R-IRanges.spec sources 
Log Message:
Update to 1.4.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Nov 2009 11:39:31 -0000	1.5
+++ .cvsignore	17 Dec 2009 08:45:41 -0000	1.6
@@ -1 +1 @@
-IRanges_1.4.7.tar.gz
+IRanges_1.4.9.tar.gz


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/R-IRanges.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-IRanges.spec	21 Nov 2009 11:39:31 -0000	1.6
+++ R-IRanges.spec	17 Dec 2009 08:45:41 -0000	1.7
@@ -3,7 +3,7 @@
 %global Rvers     2.10.0
 
 Name:             R-%{packname}
-Version:          1.4.7
+Version:          1.4.9
 Release:          1%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 1.4.9-1
+- Update to 1.4.9
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 1.4.7-1
 - Update to 1.4.7
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Nov 2009 11:39:31 -0000	1.5
+++ sources	17 Dec 2009 08:45:41 -0000	1.6
@@ -1 +1 @@
-4358c9ab6c9c4d7e1099e9fde5299f78  IRanges_1.4.7.tar.gz
+20ea4041da3e481e0bb1fd52b7c3509d  IRanges_1.4.9.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:45:41 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:45:41 +0000 (UTC)
Subject: rpms/R-IRanges/F-12 R-IRanges.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20091217084541.AD79D11C00EF@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-IRanges/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30043/F-12

Modified Files:
	R-IRanges.spec sources 
Log Message:
Update to 1.4.9


Index: R-IRanges.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-12/R-IRanges.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-IRanges.spec	21 Nov 2009 11:39:31 -0000	1.6
+++ R-IRanges.spec	17 Dec 2009 08:45:41 -0000	1.7
@@ -3,7 +3,7 @@
 %global Rvers     2.10.0
 
 Name:             R-%{packname}
-Version:          1.4.7
+Version:          1.4.9
 Release:          1%{?dist}
 Summary:          Low-level containers for storing sets of integer ranges
 
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 1.4.9-1
+- Update to 1.4.9
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 1.4.7-1
 - Update to 1.4.7
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-IRanges/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Nov 2009 11:39:31 -0000	1.5
+++ sources	17 Dec 2009 08:45:41 -0000	1.6
@@ -1 +1 @@
-4358c9ab6c9c4d7e1099e9fde5299f78  IRanges_1.4.7.tar.gz
+20ea4041da3e481e0bb1fd52b7c3509d  IRanges_1.4.9.tar.gz



From stransky at fedoraproject.org  Thu Dec 17 08:47:08 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu, 17 Dec 2009 08:47:08 +0000 (UTC)
Subject: rpms/xulrunner/devel mozilla-jemalloc-526152.patch, NONE,
	1.1 xulrunner.spec, 1.186, 1.187
Message-ID: <20091217084708.6E07311C0092@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30361

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-jemalloc-526152.patch 
Log Message:
fix for mozbz#526152

mozilla-jemalloc-526152.patch:
 jemalloc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mozilla-jemalloc-526152.patch ---
From: David Mandelin <dmandelin at mozilla.com>

diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -5792,24 +5792,24 @@ __attribute__((noinline))
 #else
 inline
 #endif
 void *
 memalign(size_t alignment, size_t size)
 {
 	void *ret;
 
-	assert(((alignment - 1) & alignment) == 0 && alignment >=
-	    sizeof(void *));
+	assert(((alignment - 1) & alignment) == 0);
 
 	if (malloc_init()) {
 		ret = NULL;
 		goto RETURN;
 	}
 
+	alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
 	ret = ipalloc(alignment, size);
 
 RETURN:
 #ifdef MALLOC_XMALLOC
 	if (opt_xmalloc && ret == NULL) {
 		_malloc_message(_getprogname(),
 		": (malloc) Error in memalign(): out of memory\n", "", "");
 		abort();


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- xulrunner.spec	3 Dec 2009 09:22:40 -0000	1.186
+++ xulrunner.spec	17 Dec 2009 08:47:08 -0000	1.187
@@ -17,7 +17,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.2.1
-Release:        0.6.%{?pretag}%{?dist}
+Release:        0.7.%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -33,6 +33,7 @@ Patch0:         xulrunner-version.patch
 Patch1:         mozilla-build.patch
 Patch3:         mozilla-jemalloc.patch
 Patch4:         mozilla-about-firefox-version.patch
+Patch5:         mozilla-jemalloc-526152.patch
 Patch7:         xulrunner-1.9.2.1-build.patch
 Patch8:         mozilla-plugin.patch
 
@@ -128,6 +129,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch1  -p1 -b .build
 %patch3  -p1 -b .jemalloc
 %patch4  -p1 -b .about-firefox-version
+%patch5  -p1 -b .jemalloc-526152
 %patch7  -p2 -b .del
 %patch8  -p1 -b .plugin
 
@@ -404,6 +406,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Dec 17 2009 Martin Stransky <stransky at redhat.com> 1.9.2.1-0.7.b4
+- Added fix for mozbz#543585 - jemalloc alignment assertion 
+  and abort on Linux
+
 * Thu Dec 3 2009 Martin Stransky <stransky at redhat.com> 1.9.2.1-0.6.b4
 - Added fix for #543585 - mozilla-plugin.pc contains incorrect CFLAGS
 



From pingou at fedoraproject.org  Thu Dec 17 08:47:31 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:47:31 +0000 (UTC)
Subject: File RUnit_0.4.25.tar.gz uploaded to lookaside cache by pingou
Message-ID: <20091217084731.97D8728ED27@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for R-RUnit:

f1fc0539f2df832d459d79cc59dd7c3e  RUnit_0.4.25.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:50:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:50:12 +0000 (UTC)
Subject: rpms/R-RUnit/F-11 R-RUnit.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20091217085012.31E8911C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31064/F-11

Modified Files:
	R-RUnit.spec sources 
Log Message:
Update to 0.4.25


Index: R-RUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-11/R-RUnit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-RUnit.spec	21 Nov 2009 13:34:16 -0000	1.4
+++ R-RUnit.spec	17 Dec 2009 08:50:11 -0000	1.5
@@ -2,8 +2,8 @@
 %global Rvers     2.10.0
 
 Name:             R-%{packname}
-Version:          0.4.22
-Release:          3%{?dist}
+Version:          0.4.25
+Release:          1%{?dist}
 Summary:          R Unit test framework
 
 Group:            Applications/Engineering 
@@ -64,8 +64,12 @@ rm -rf %{buildroot}
 %{_datadir}/R/library/%{packname}/Meta
 %{_datadir}/R/library/%{packname}/INDEX
 %{_datadir}/R/library/%{packname}/NAMESPACE
+%{_datadir}/R/library/%{packname}/unitTests
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 0.4.25-1
+- Update to 0.4.25
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 0.4.22-3
 - Rebuild for R-2.10.0
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 07:38:19 -0000	1.3
+++ sources	17 Dec 2009 08:50:11 -0000	1.4
@@ -1 +1 @@
-fe2301658802d39bbfb76a3a6c06fd2f  RUnit_0.4.22.tar.gz
+f1fc0539f2df832d459d79cc59dd7c3e  RUnit_0.4.25.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:50:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:50:12 +0000 (UTC)
Subject: rpms/R-RUnit/F-12 R-RUnit.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20091217085012.650B211C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31064/F-12

Modified Files:
	R-RUnit.spec sources 
Log Message:
Update to 0.4.25


Index: R-RUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-12/R-RUnit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-RUnit.spec	21 Nov 2009 13:34:17 -0000	1.5
+++ R-RUnit.spec	17 Dec 2009 08:50:12 -0000	1.6
@@ -2,8 +2,8 @@
 %global Rvers     2.10.0
 
 Name:             R-%{packname}
-Version:          0.4.22
-Release:          3%{?dist}
+Version:          0.4.25
+Release:          1%{?dist}
 Summary:          R Unit test framework
 
 Group:            Applications/Engineering 
@@ -64,8 +64,12 @@ rm -rf %{buildroot}
 %{_datadir}/R/library/%{packname}/Meta
 %{_datadir}/R/library/%{packname}/INDEX
 %{_datadir}/R/library/%{packname}/NAMESPACE
+%{_datadir}/R/library/%{packname}/unitTests
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 0.4.25-1
+- Update to 0.4.25
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 0.4.22-3
 - Rebuild for R-2.10.0
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 07:38:20 -0000	1.3
+++ sources	17 Dec 2009 08:50:12 -0000	1.4
@@ -1 +1 @@
-fe2301658802d39bbfb76a3a6c06fd2f  RUnit_0.4.22.tar.gz
+f1fc0539f2df832d459d79cc59dd7c3e  RUnit_0.4.25.tar.gz



From pingou at fedoraproject.org  Thu Dec 17 08:50:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 08:50:12 +0000 (UTC)
Subject: rpms/R-RUnit/devel .cvsignore, 1.3, 1.4 R-RUnit.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20091217085012.A501511C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-RUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31064/devel

Modified Files:
	.cvsignore R-RUnit.spec sources 
Log Message:
Update to 0.4.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 07:38:20 -0000	1.3
+++ .cvsignore	17 Dec 2009 08:50:12 -0000	1.4
@@ -1 +1 @@
-RUnit_0.4.22.tar.gz
+RUnit_0.4.25.tar.gz


Index: R-RUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/devel/R-RUnit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-RUnit.spec	21 Nov 2009 13:34:17 -0000	1.5
+++ R-RUnit.spec	17 Dec 2009 08:50:12 -0000	1.6
@@ -2,8 +2,8 @@
 %global Rvers     2.10.0
 
 Name:             R-%{packname}
-Version:          0.4.22
-Release:          3%{?dist}
+Version:          0.4.25
+Release:          1%{?dist}
 Summary:          R Unit test framework
 
 Group:            Applications/Engineering 
@@ -64,8 +64,12 @@ rm -rf %{buildroot}
 %{_datadir}/R/library/%{packname}/Meta
 %{_datadir}/R/library/%{packname}/INDEX
 %{_datadir}/R/library/%{packname}/NAMESPACE
+%{_datadir}/R/library/%{packname}/unitTests
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 0.4.25-1
+- Update to 0.4.25
+
 * Sat Nov 21 2009 pingou <pingou at pingoured.fr> 0.4.22-3
 - Rebuild for R-2.10.0
 - Remove %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-RUnit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 07:38:20 -0000	1.3
+++ sources	17 Dec 2009 08:50:12 -0000	1.4
@@ -1 +1 @@
-fe2301658802d39bbfb76a3a6c06fd2f  RUnit_0.4.22.tar.gz
+f1fc0539f2df832d459d79cc59dd7c3e  RUnit_0.4.25.tar.gz



From jskala at fedoraproject.org  Thu Dec 17 08:50:48 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu, 17 Dec 2009 08:50:48 +0000 (UTC)
Subject: File vsftpd-2.2.2.tar.gz uploaded to lookaside cache by jskala
Message-ID: <20091217085048.066BE28ECBE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for vsftpd:

6d6bc136af14c23f8fef6f1a51f55418  vsftpd-2.2.2.tar.gz



From ovasik at fedoraproject.org  Thu Dec 17 08:55:22 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 17 Dec 2009 08:55:22 +0000 (UTC)
Subject: File setup-2.8.12.tar.bz2 uploaded to lookaside cache by ovasik
Message-ID: <20091217085522.9318328ED24@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for setup:

825a9c9dd6cc45333c8e20d5a4460168  setup-2.8.12.tar.bz2



From lfarkas at fedoraproject.org  Thu Dec 17 08:55:45 2009
From: lfarkas at fedoraproject.org (Levente Farkas)
Date: Thu, 17 Dec 2009 08:55:45 +0000 (UTC)
Subject: rpms/jna/F-12 jna.spec,1.19,1.20
Message-ID: <20091217085545.0C2F811C0092@cvs1.fedora.phx.redhat.com>

Author: lfarkas

Update of /cvs/pkgs/rpms/jna/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32760/F-12

Modified Files:
	jna.spec 
Log Message:
fix ExclusiveArch



Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/F-12/jna.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- jna.spec	17 Dec 2009 07:44:27 -0000	1.19
+++ jna.spec	17 Dec 2009 08:55:44 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -28,9 +28,9 @@ BuildRequires:  libX11-devel libXt-devel
 # inside jars.
 Requires:       java >= 1:1.6.0 jpackage-utils libffi
 # for ExcludeArch see bug: 468831
-#%if 0%{?rhel} < 6
-#ExcludeArch: ppc ppc64
-#%endif
+%if 0%{?rhel} < 6 && 0%{?fedora} < 10
+ExcludeArch: ppc ppc64
+%endif
 
 
 %description
@@ -128,6 +128,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Levente Farkas <lfarkas at lfarkas.org> - 3.2.4-3
+- add proper ExclusiveArch
+
 * Thu Dec 17 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.4-2
 - Comment rhel ExclusiveArchs - not correct applies on Fedora.
 



From lfarkas at fedoraproject.org  Thu Dec 17 08:55:44 2009
From: lfarkas at fedoraproject.org (Levente Farkas)
Date: Thu, 17 Dec 2009 08:55:44 +0000 (UTC)
Subject: rpms/jna/EL-5 jna.spec,1.2,1.3
Message-ID: <20091217085544.BB47811C0092@cvs1.fedora.phx.redhat.com>

Author: lfarkas

Update of /cvs/pkgs/rpms/jna/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32760/EL-5

Modified Files:
	jna.spec 
Log Message:
fix ExclusiveArch



Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/EL-5/jna.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jna.spec	23 Nov 2009 18:36:40 -0000	1.2
+++ jna.spec	17 Dec 2009 08:55:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.2.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -28,7 +28,7 @@ BuildRequires:  libX11-devel libXt-devel
 # inside jars.
 Requires:       java >= 1:1.6.0 jpackage-utils libffi
 # for ExcludeArch see bug: 468831
-%if 0%{?rhel} < 6
+%if 0%{?rhel} < 6 && 0%{?fedora} < 10
 ExcludeArch: ppc ppc64
 %endif
 
@@ -128,6 +128,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Levente Farkas <lfarkas at lfarkas.org> - 3.2.4-3
+- add proper ExclusiveArch
+
+* Thu Dec 17 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.4-2
+- Comment rhel ExclusiveArchs - not correct applies on Fedora.
+
 * Sat Nov 14 2009 Levente Farkas <lfarkas at lfarkas.org> - 3.2.4-1
 - Rebase on upstream 3.2.4
 



From lfarkas at fedoraproject.org  Thu Dec 17 08:55:45 2009
From: lfarkas at fedoraproject.org (Levente Farkas)
Date: Thu, 17 Dec 2009 08:55:45 +0000 (UTC)
Subject: rpms/jna/devel jna.spec,1.20,1.21
Message-ID: <20091217085545.293AE11C0092@cvs1.fedora.phx.redhat.com>

Author: lfarkas

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32760/devel

Modified Files:
	jna.spec 
Log Message:
fix ExclusiveArch



Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- jna.spec	23 Nov 2009 18:32:41 -0000	1.20
+++ jna.spec	17 Dec 2009 08:55:45 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.2.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -28,7 +28,7 @@ BuildRequires:  libX11-devel libXt-devel
 # inside jars.
 Requires:       java >= 1:1.6.0 jpackage-utils libffi
 # for ExcludeArch see bug: 468831
-%if 0%{?rhel} < 6
+%if 0%{?rhel} < 6 && 0%{?fedora} < 10
 ExcludeArch: ppc ppc64
 %endif
 
@@ -128,6 +128,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Levente Farkas <lfarkas at lfarkas.org> - 3.2.4-3
+- add proper ExclusiveArch
+
+* Thu Dec 17 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.4-2
+- Comment rhel ExclusiveArchs - not correct applies on Fedora.
+
 * Sat Nov 14 2009 Levente Farkas <lfarkas at lfarkas.org> - 3.2.4-1
 - Rebase on upstream 3.2.4
 



From lfarkas at fedoraproject.org  Thu Dec 17 08:55:44 2009
From: lfarkas at fedoraproject.org (Levente Farkas)
Date: Thu, 17 Dec 2009 08:55:44 +0000 (UTC)
Subject: rpms/jna/F-11 jna.spec,1.17,1.18
Message-ID: <20091217085544.D382811C00EF@cvs1.fedora.phx.redhat.com>

Author: lfarkas

Update of /cvs/pkgs/rpms/jna/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32760/F-11

Modified Files:
	jna.spec 
Log Message:
fix ExclusiveArch



Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/F-11/jna.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- jna.spec	23 Nov 2009 19:24:14 -0000	1.17
+++ jna.spec	17 Dec 2009 08:55:44 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.2.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -28,7 +28,7 @@ BuildRequires:  libX11-devel libXt-devel
 # inside jars.
 Requires:       java >= 1:1.6.0 jpackage-utils libffi
 # for ExcludeArch see bug: 468831
-%if 0%{?rhel} < 6
+%if 0%{?rhel} < 6 && 0%{?fedora} < 10
 ExcludeArch: ppc ppc64
 %endif
 
@@ -128,6 +128,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Levente Farkas <lfarkas at lfarkas.org> - 3.2.4-3
+- add proper ExclusiveArch
+
+* Thu Dec 17 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.4-2
+- Comment rhel ExclusiveArchs - not correct applies on Fedora.
+
 * Sat Nov 14 2009 Levente Farkas <lfarkas at lfarkas.org> - 3.2.4-1
 - Rebase on upstream 3.2.4
 



From corsepiu at fedoraproject.org  Thu Dec 17 09:03:48 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu, 17 Dec 2009 09:03:48 +0000 (UTC)
Subject: File Test-Script-1.07.tar.gz uploaded to lookaside cache by corsepiu
Message-ID: <20091217090348.80D0028ED24@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-Test-Script:

f6b5baa6403cd24dac7f023e0ea22384  Test-Script-1.07.tar.gz



From jskala at fedoraproject.org  Thu Dec 17 09:09:05 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu, 17 Dec 2009 09:09:05 +0000 (UTC)
Subject: rpms/vsftpd/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 vsftpd-2.1.1-daemonize_plus.patch, 1.4, 1.5 vsftpd.spec,
	1.102, 1.103
Message-ID: <20091217090905.9063A11C0092@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3591

Modified Files:
	.cvsignore sources vsftpd-2.1.1-daemonize_plus.patch 
	vsftpd.spec 
Log Message:
* Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	24 Aug 2009 15:01:45 -0000	1.21
+++ .cvsignore	17 Dec 2009 09:09:05 -0000	1.22
@@ -1 +1 @@
-vsftpd-2.2.0.tar.gz
+vsftpd-2.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	24 Aug 2009 15:01:45 -0000	1.21
+++ sources	17 Dec 2009 09:09:05 -0000	1.22
@@ -1 +1 @@
-e4eb190af270ae65d57a84274a38ec31  vsftpd-2.2.0.tar.gz
+6d6bc136af14c23f8fef6f1a51f55418  vsftpd-2.2.2.tar.gz

vsftpd-2.1.1-daemonize_plus.patch:
 standalone.c |   38 +++++++++++++++++++++++++++++++++++++-
 sysutil.c    |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sysutil.h    |    7 ++++++-
 3 files changed, 102 insertions(+), 2 deletions(-)

Index: vsftpd-2.1.1-daemonize_plus.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.1-daemonize_plus.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vsftpd-2.1.1-daemonize_plus.patch	2 Jun 2009 09:06:56 -0000	1.4
+++ vsftpd-2.1.1-daemonize_plus.patch	17 Dec 2009 09:09:05 -0000	1.5
@@ -176,7 +176,7 @@ diff -up vsftpd-2.1.1/sysutil.h.daemoniz
  /* Process creation/exit/process handling */
  unsigned int vsf_sysutil_getpid(void);
 +unsigned int vsf_sysutil_getppid(void);
- void vsf_sysutil_clear_pid_cache(void);
+ void vsf_sysutil_post_fork(void);
  int vsf_sysutil_fork(void);
  int vsf_sysutil_fork_failok(void);
 @@ -182,6 +184,9 @@ int vsf_sysutil_wait_exited_normally(


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- vsftpd.spec	23 Nov 2009 13:37:04 -0000	1.102
+++ vsftpd.spec	17 Dec 2009 09:09:05 -0000	1.103
@@ -1,8 +1,8 @@
 %{!?tcp_wrappers:%define tcp_wrappers 1}
 
 Name: vsftpd
-Version: 2.2.0
-Release: 6%{?dist}
+Version: 2.2.2
+Release: 1%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-1
+- update to latest upstream
+
 * Mon Nov 23 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-6
 - added lost default values of vsftpd.conf (rh patch)
 



From faucamp at fedoraproject.org  Thu Dec 17 09:09:19 2009
From: faucamp at fedoraproject.org (Francois Aucamp)
Date: Thu, 17 Dec 2009 09:09:19 +0000 (UTC)
Subject: File espeak-1.42.04-source.zip uploaded to lookaside cache by
	faucamp
Message-ID: <20091217090919.A5E9B28ECCD@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for espeak:

a4cbbe5f2e2a37ccc0aa1a687a6e4c11  espeak-1.42.04-source.zip



From rvokal at fedoraproject.org  Thu Dec 17 09:17:07 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Thu, 17 Dec 2009 09:17:07 +0000 (UTC)
Subject: rpms/wireshark/devel wireshark-1.2.4-disable_warning_dialog.patch, 
	NONE, 1.1 wireshark.spec, 1.62, 1.63
Message-ID: <20091217091707.53C3711C0092@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5804

Modified Files:
	wireshark.spec 
Added Files:
	wireshark-1.2.4-disable_warning_dialog.patch 
Log Message:
remove warning dialog, split -devel package

wireshark-1.2.4-disable_warning_dialog.patch:
 main.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE wireshark-1.2.4-disable_warning_dialog.patch ---
diff -up wireshark-1.2.4/gtk/main.c.dialog wireshark-1.2.4/gtk/main.c
--- wireshark-1.2.4/gtk/main.c.dialog	2009-11-16 21:30:43.000000000 +0100
+++ wireshark-1.2.4/gtk/main.c	2009-12-16 10:53:52.000000000 +0100
@@ -1227,11 +1227,12 @@ set_display_filename(capture_file *cf)
 
 GtkWidget           *close_dlg = NULL;
 
-static void
+/*static void
 priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
 {
     recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
 }
+*/
 
 #ifdef _WIN32
 static void
@@ -2559,7 +2560,7 @@ main(int argc, char *argv[])
   main_load_window_geometry(top_level);
 
   /* Tell the user not to run as root. */
-  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
+/*  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
     cur_user = get_cur_username();
     cur_group = get_cur_groupname();
     priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
@@ -2570,6 +2571,7 @@ main(int argc, char *argv[])
     simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
     simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
   }
+*/
 
 #ifdef _WIN32
   /* Warn the user if npf.sys isn't loaded. */


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- wireshark.spec	15 Dec 2009 08:36:27 -0000	1.62
+++ wireshark.spec	17 Dec 2009 09:17:07 -0000	1.63
@@ -12,7 +12,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.2.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -28,8 +28,8 @@ Patch2:		wireshark-nfsv4-opts.patch
 Patch3:		wireshark-0.99.7-path.patch
 Patch4:		wireshark-1.1.2-nfs41-backchnl-decode.patch
 Patch5:		wireshark-1.2.4-filter_null.patch
-
-Patch10:	wireshark-1.2.4-enable_lua.patch
+Patch6:		wireshark-1.2.4-enable_lua.patch
+Patch7:		wireshark-1.2.4-disable_warning_dialog.patch
 
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +53,6 @@ BuildRequires: portaudio-devel
 %if %{with_lua}
 BuildRequires:	lua-devel
 %endif
-
 Obsoletes:	ethereal
 Provides:	ethereal
 
@@ -75,6 +74,11 @@ Requires:	portaudio
 Obsoletes:	ethereal-gnome
 Provides:	ethereal-gnome
 
+%package devel
+Summary:        Development headers and libraries for wireshark
+Group:		Development/Libraries
+Requires:       %{name} = %{version} glibc-devel glib2-devel
+
 
 %description
 Wireshark is a network traffic analyzer for Unix-ish operating systems.
@@ -87,6 +91,11 @@ separately to GTK+ package.
 %description gnome
 Contains wireshark for Gnome 2 and desktop integration file
 
+%description devel
+The wireshark-devel package contains the header files, developer
+documentation, and libraries required for development of wireshark scripts
+and plugins.
+
 
 %prep
 %if %{svn_version}
@@ -101,9 +110,11 @@ Contains wireshark for Gnome 2 and deskt
 %patch5 -p1
 
 %if %{with_lua}
-%patch10 -p1 -b .enable_lua
+%patch6 -p1 -b .enable_lua
 %endif
 
+%patch7 -p1 -b .dialog
+
 %build
 %ifarch s390 s390x sparcv9 sparc64
 export PIECFLAGS="-fPIE"
@@ -150,9 +161,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 #symlink tshark to tethereal
 ln -s tshark $RPM_BUILD_ROOT%{_sbindir}/tethereal
 
-#empty?!
-rm -f $RPM_BUILD_ROOT%{_sbindir}/idl2wrs
-
 # install support files for usermode, gnome and kde
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wireshark
@@ -177,6 +185,56 @@ desktop-file-install --vendor fedora    
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 image/wsicon48.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/wireshark.png
 
+#install devel files
+install -d -m 0755  $RPM_BUILD_ROOT/%{_includedir}/wireshark
+IDIR="${RPM_BUILD_ROOT}%{_includedir}/wireshark"
+mkdir -p "${IDIR}/epan"
+mkdir -p "${IDIR}/epan/ftypes"
+mkdir -p "${IDIR}/epan/dfilter"
+mkdir -p "${IDIR}/wiretap"
+install -m 644 color.h			"${IDIR}/"
+install -m 644 epan/packet.h		"${IDIR}/epan/"
+install -m 644 epan/prefs.h		"${IDIR}/epan/"
+install -m 644 epan/proto.h		"${IDIR}/epan/"
+install -m 644 epan/tvbuff.h		"${IDIR}/epan/"
+install -m 644 epan/pint.h		"${IDIR}/epan/"
+install -m 644 epan/to_str.h		"${IDIR}/epan/"
+install -m 644 epan/value_string.h	"${IDIR}/epan/"
+install -m 644 epan/column_info.h	"${IDIR}/epan/"
+install -m 644 epan/frame_data.h	"${IDIR}/epan/"
+install -m 644 epan/packet_info.h	"${IDIR}/epan/"
+install -m 644 epan/column-utils.h	"${IDIR}/epan/"
+install -m 644 epan/epan.h		"${IDIR}/epan/"
+install -m 644 epan/range.h		"${IDIR}/epan/"
+install -m 644 epan/gnuc_format_check.h	"${IDIR}/epan/"
+install -m 644 epan/ipv4.h		"${IDIR}/epan"
+install -m 644 epan/nstime.h		"${IDIR}/epan/"
+install -m 644 epan/ipv6-utils.h	"${IDIR}/epan/"
+install -m 644 epan/guid-utils.h	"${IDIR}/epan/"
+install -m 644 epan/exceptions.h	"${IDIR}/epan/"
+install -m 644 epan/address.h		"${IDIR}/epan/"
+install -m 644 epan/slab.h		"${IDIR}/epan/"
+install -m 644 epan/except.h		"${IDIR}/epan/"
+install -m 644 epan/ftypes/ftypes.h	"${IDIR}/epan/ftypes/"
+install -m 644 epan/dfilter/dfilter.h	"${IDIR}/epan/dfilter/"
+install -m 644 epan/dfilter/drange.h	"${IDIR}/epan/dfilter/"
+install -m 644 wiretap/wtap.h		"${IDIR}/wiretap/"
+
+#	Create pkg-config control file.
+mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig"
+cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/wireshark.pc" <<- "EOF"
+	prefix=%{_prefix}
+	exec_prefix=%{_prefix}
+	libdir=%{_libdir}
+	includedir=%{_includedir}
+
+	Name:		%{name}
+	Description:	Network Traffic Analyzer
+	Version:	%{version}
+	Requires:	glib-2.0
+	Libs:		-L${libdir} -lwireshark -lwiretap
+	Cflags:		-DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -I${includedir}/wireshark -I${includedir}/wireshark/epan
+EOF
 
 # Remove .la files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la
@@ -206,23 +264,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/tethereal
 %{_sbindir}/rawshark
 %{python_sitelib}/*
-%{_libdir}/lib*
+%{_libdir}/lib*.so.*
+%{_libdir}/wireshark/plugins
 %{_mandir}/man1/editcap.*
 %{_mandir}/man1/tshark.*
-%{_mandir}/man1/idl2wrs.*
 %{_mandir}/man1/mergecap.*
 %{_mandir}/man1/text2pcap.*
 %{_mandir}/man1/capinfos.*
 %{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/wireshark-filter.*
 %{_mandir}/man1/rawshark.*
-%{_libdir}/wireshark
+#%{_libdir}/wireshark
 %config(noreplace) %{_sysconfdir}/pam.d/wireshark
 %config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
 %{_datadir}/wireshark
-%if %{with_lua}
-%config(noreplace) %{_datadir}/wireshark/init.lua
-%endif
 
 %files gnome
 %defattr(-,root,root)
@@ -232,8 +287,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/wireshark
 %{_mandir}/man1/wireshark.*
 
+%files devel
+%defattr(-,root,root)
+%doc doc/README.*
+%{_includedir}/wireshark
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_mandir}/man1/idl2wrs.*
+%{_sbindir}/idl2wrs
+%if %{with_lua}
+%config(noreplace) %{_datadir}/wireshark/init.lua
+%endif
 
 %changelog
+* Thu Dec 17 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-3
+- split -devel package (#547899, #203642, #218451)
+- removing root warning dialog (#543709)
+
 * Mon Dec 14 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-2
 - enable lua support - http://wiki.wireshark.org/Lua
 - attempt to fix filter crash on 64bits



From ovasik at fedoraproject.org  Thu Dec 17 09:19:05 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 17 Dec 2009 09:19:05 +0000 (UTC)
Subject: rpms/setup/devel .cvsignore, 1.69, 1.70 setup.spec, 1.87,
	1.88 sources, 1.70, 1.71
Message-ID: <20091217091905.B35AE11C0092@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6321

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
speed up pathmunge inside bashrc (#544652), do not use deprecated egrep in profile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setup/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	3 Dec 2009 09:37:22 -0000	1.69
+++ .cvsignore	17 Dec 2009 09:19:05 -0000	1.70
@@ -1 +1 @@
-setup-2.8.11.tar.bz2
+setup-2.8.12.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setup/devel/setup.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- setup.spec	3 Dec 2009 09:37:22 -0000	1.87
+++ setup.spec	17 Dec 2009 09:19:05 -0000	1.88
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.11
+Version: 2.8.12
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -89,6 +89,10 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Dec 17 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.12-1
+- speed up pathmunge inside bashrc (#544652)
+- do not use deprecated egrep in profile
+
 * Thu Dec 03 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.11-1
 - don't have HISTCONTROL ignorespace by default (#520632),
   but do not override it when it is already set


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setup/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	3 Dec 2009 09:37:22 -0000	1.70
+++ sources	17 Dec 2009 09:19:05 -0000	1.71
@@ -1 +1 @@
-c781588ef86fa5adb2c87925f5f8b480  setup-2.8.11.tar.bz2
+825a9c9dd6cc45333c8e20d5a4460168  setup-2.8.12.tar.bz2



From faucamp at fedoraproject.org  Thu Dec 17 09:20:36 2009
From: faucamp at fedoraproject.org (Francois Aucamp)
Date: Thu, 17 Dec 2009 09:20:36 +0000 (UTC)
Subject: rpms/espeak/devel .cvsignore, 1.16, 1.17 espeak.spec, 1.23,
	1.24 sources, 1.16, 1.17
Message-ID: <20091217092036.A286F11C0092@cvs1.fedora.phx.redhat.com>

Author: faucamp

Update of /cvs/pkgs/rpms/espeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6612

Modified Files:
	.cvsignore espeak.spec sources 
Log Message:
* Thu Dec 17 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.42.04-1
- Update to version 1.42.04
- Revert: build against PortAudio instead of native PulseAudio (RHBZ #512190, #532674)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	22 Jun 2009 11:21:06 -0000	1.16
+++ .cvsignore	17 Dec 2009 09:20:36 -0000	1.17
@@ -1 +1 @@
-espeak-1.40.02-source.zip
+espeak-1.42.04-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/espeak.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- espeak.spec	24 Jul 2009 22:18:34 -0000	1.23
+++ espeak.spec	17 Dec 2009 09:20:36 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           espeak
-Version:        1.40.02
-Release:        3%{?dist}
+Version:        1.42.04
+Release:        1%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
@@ -10,10 +10,11 @@ Source0:        http://kent.dl.sourcefor
 Source1:        espeak.1
 Patch0:         espeak-1.23-makefile_nostaticlibs.patch
 Patch1:         espeak-1.40.02-gcc_no_libstdc++.patch
-Patch2:         espeak-1.40.02-pulseaudio.patch
+#Removed for now; see RHBZ#481651
+#Patch2:         espeak-1.40.02-pulseaudio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  portaudio-devel gcc-c++
 
 
 %description
@@ -43,16 +44,21 @@ Development files for eSpeak, a software
 %setup -q -n espeak-%{version}-source
 %patch0 -p1 -b .nostaticlibs
 %patch1 -p1 -b .gcc_no_libstdc++
-%patch2 -p1 -b .pulseaudio
+
+#%patch2 -p1 -b .pulseaudio
 # Fix file permissions
 find . -type f -exec chmod 0644 {} ";"
 # Prepare documentation
+rm -rf docs/images/.svn
 mv docs html
 sed -i 's/\r//' License.txt
+# Compile against portaudio v19 (see ReadMe)
+cp -f src/portaudio19.h src/portaudio.h
 # Don't use the included binary voice dictionaries; we compile these from source
 rm -f espeak-data/*_dict
 
 
+
 %build
 # Compile espeak
 cd src
@@ -100,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 17 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.42.04-1
+- Update to version 1.42.04
+- Revert: build against PortAudio instead of native PulseAudio (RHBZ #512190, #532674)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.40.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	22 Jun 2009 11:21:07 -0000	1.16
+++ sources	17 Dec 2009 09:20:36 -0000	1.17
@@ -1 +1 @@
-708954b44c526e8174df8b88a6382738  espeak-1.40.02-source.zip
+a4cbbe5f2e2a37ccc0aa1a687a6e4c11  espeak-1.42.04-source.zip



From caolanm at fedoraproject.org  Thu Dec 17 09:22:57 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 09:22:57 +0000 (UTC)
Subject: File OOO320_m8.tar.bz2 uploaded to lookaside cache by caolanm
Message-ID: <20091217092257.D853428ECBE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for openoffice.org:

d86bdbcfc5b23bc0572f62770ec1ef74  OOO320_m8.tar.bz2



From caolanm at fedoraproject.org  Thu Dec 17 09:24:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 09:24:02 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.237,
	1.238 openoffice.org.spec, 1.2100, 1.2101 sources, 1.384, 1.385
Message-ID: <20091217092402.899C611C0092@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7518

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- .cvsignore	3 Dec 2009 20:51:41 -0000	1.237
+++ .cvsignore	17 Dec 2009 09:24:02 -0000	1.238
@@ -7,4 +7,4 @@ redhat-registry.tar.gz
 redhat-langpacks.tar.gz
 openoffice.org-javafilter.desktop
 acor_ga-IE.dat
-OOO320_m7.tar.bz2
+OOO320_m8.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2100
retrieving revision 1.2101
diff -u -p -r1.2100 -r1.2101
--- openoffice.org.spec	15 Dec 2009 13:27:59 -0000	1.2100
+++ openoffice.org.spec	17 Dec 2009 09:24:02 -0000	1.2101
@@ -1,6 +1,6 @@
 %define oootag OOO320
-%define ooomilestone 7
-%define rh_rpm_release 3
+%define ooomilestone 8
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4166,6 +4166,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-8.1
+- latest milestone
+
 * Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch
 - Resolves: rhbz#547176 add


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- sources	3 Dec 2009 20:51:42 -0000	1.384
+++ sources	17 Dec 2009 09:24:02 -0000	1.385
@@ -7,4 +7,4 @@ ffa417a9556cdb16028c83718d758bc7  redhat
 39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 ef64057ee7e48ca472e80dd87f3dd426  acor_ga-IE.dat
-c8304a4d0d4f0add0d1df87edba7a88d  OOO320_m7.tar.bz2
+d86bdbcfc5b23bc0572f62770ec1ef74  OOO320_m8.tar.bz2



From caolanm at fedoraproject.org  Thu Dec 17 09:28:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 09:28:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2101,
	1.2102 openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch,
	1.1, NONE workspace.fwk132.patch, 1.1, NONE
Message-ID: <20091217092840.74D1511C0092@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8663

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch 
	workspace.fwk132.patch 
Log Message:
latest version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2101
retrieving revision 1.2102
diff -u -p -r1.2101 -r1.2102
--- openoffice.org.spec	17 Dec 2009 09:24:02 -0000	1.2101
+++ openoffice.org.spec	17 Dec 2009 09:28:40 -0000	1.2102
@@ -103,38 +103,36 @@ Patch25: openoffice.org-3.1.0.oooXXXXX.s
 Patch26: ooo-build.ooo2497.filter.svg.patch
 Patch27: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch28: workspace.slideshow1.patch
-Patch29: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch30: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch31: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch32: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch33: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch34: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch35: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch36: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch37: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch38: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch39: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch40: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch41: workspace.vcl106.patch
-Patch42: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch43: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch44: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
-Patch45: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch46: workspace.gsminhibit.patch
-Patch47: workspace.vcl107.patch
-Patch48: workspace.hb33patches1.patch
-Patch49: workspace.ause109.patch
-Patch50: workspace.cmcfixes67.patch
-Patch51: workspace.srb1.patch
-Patch52: workspace.impress184.patch
-Patch53: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch54: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
-Patch55: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch56: workspace.vcl108.patch
-Patch57: workspace.pythonssldedux.patch
-Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch59: workspace.fwk132.patch
-Patch60: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch29: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch30: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch31: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch32: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch33: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch34: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch35: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch36: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch37: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch38: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch39: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch40: workspace.vcl106.patch
+Patch41: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch42: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch43: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch44: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch45: workspace.gsminhibit.patch
+Patch46: workspace.vcl107.patch
+Patch47: workspace.hb33patches1.patch
+Patch48: workspace.ause109.patch
+Patch49: workspace.cmcfixes67.patch
+Patch50: workspace.srb1.patch
+Patch51: workspace.impress184.patch
+Patch52: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
+Patch53: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
+Patch54: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch55: workspace.vcl108.patch
+Patch56: workspace.pythonssldedux.patch
+Patch57: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch58: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,38 +1630,36 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch26 -p1 -b .ooo2497.filter.svg.patch
 %patch27 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch28 -p2 -b .workspace.slideshow1.patch
-%patch29 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch30 -p0 -b .ooo101274.opening-a-directory.patch
-%patch31 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch32 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch33 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch34 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch35 -p0 -b .ooo102142.sd.resleak.patch
-%patch36 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch37 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch38 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch39 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch40 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch41 -p0 -b .workspace.vcl106.patch
-%patch42 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch43 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch44 -p0 -b .ooo105988.svx.a11ycrash.patch
-%patch45 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch46 -p1 -b .workspace.gsminhibit.patch
-%patch47 -p1 -b .workspace.vcl107.patch
-%patch48 -p0 -b .workspace.hb33patches1.patch
-%patch49 -p0 -b .workspace.ause109.patch
-%patch50 -p1 -b .workspace.cmcfixes67.patch
-%patch51 -p1 -b .workspace.srb1.patch
-%patch52 -p0 -b .workspace.impress184.patch
-%patch53 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch54 -p1 -b .ooo107151.sc.pop-empty-cell.patch
-%patch55 -p0 -b .ooo102645.fix.es.patch
-%patch56 -p0 -b .workspace.vcl108.patch
-%patch57 -p1 -b .workspace.pythonssldedux.patch
-%patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch59 -p1 -b .workspace.fwk132.patch
-%patch60 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch29 -p0 -b .ooo101274.opening-a-directory.patch
+%patch30 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch31 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch32 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch33 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch34 -p0 -b .ooo102142.sd.resleak.patch
+%patch35 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch36 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch37 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch38 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch39 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch40 -p0 -b .workspace.vcl106.patch
+%patch41 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch42 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch43 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch44 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch45 -p1 -b .workspace.gsminhibit.patch
+%patch46 -p1 -b .workspace.vcl107.patch
+%patch47 -p0 -b .workspace.hb33patches1.patch
+%patch48 -p0 -b .workspace.ause109.patch
+%patch49 -p1 -b .workspace.cmcfixes67.patch
+%patch50 -p1 -b .workspace.srb1.patch
+%patch51 -p0 -b .workspace.impress184.patch
+%patch52 -p0 -b .ooo107137.canvas.fixcolorspace.patch
+%patch53 -p1 -b .ooo107151.sc.pop-empty-cell.patch
+%patch54 -p0 -b .ooo102645.fix.es.patch
+%patch55 -p0 -b .workspace.vcl108.patch
+%patch56 -p1 -b .workspace.pythonssldedux.patch
+%patch57 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch58 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4168,6 +4164,8 @@ fi
 %changelog
 * Thu Dec 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-8.1
 - latest milestone
+- drop integrated openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+- drop integrated workspace.fwk132.patch
 
 * Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch


--- openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch DELETED ---


--- workspace.fwk132.patch DELETED ---



From xhorak at fedoraproject.org  Thu Dec 17 09:28:51 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu, 17 Dec 2009 09:28:51 +0000 (UTC)
Subject: File seamonkey-2.0.1.source.tar.bz2 uploaded to lookaside cache by
	xhorak
Message-ID: <20091217092851.20B2028ECD4@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for seamonkey:

100c67f5dc351af5b9efb02bb375db50  seamonkey-2.0.1.source.tar.bz2



From xhorak at fedoraproject.org  Thu Dec 17 09:29:17 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu, 17 Dec 2009 09:29:17 +0000 (UTC)
Subject: File seamonkey-langpacks-2.0.1-20091217.tar.bz2 uploaded to
	lookaside cache by xhorak
Message-ID: <20091217092917.BF0B428ECCF@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for seamonkey:

d2c0e3b2e2e78a66cda1c566eb8ec660  seamonkey-langpacks-2.0.1-20091217.tar.bz2



From xhorak at fedoraproject.org  Thu Dec 17 09:31:55 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu, 17 Dec 2009 09:31:55 +0000 (UTC)
Subject: rpms/seamonkey/F-12 .cvsignore, 1.29, 1.30 seamonkey.spec, 1.67,
	1.68 sources, 1.32, 1.33
Message-ID: <20091217093155.D2ECC11C0092@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/seamonkey/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9556

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
Update to 2.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	19 Oct 2009 09:12:15 -0000	1.29
+++ .cvsignore	17 Dec 2009 09:31:55 -0000	1.30
@@ -7,3 +7,4 @@ seamonkey-2.0rc1.source.tar.bz2
 seamonkey-langpacks-2.0-20091013.tar.bz2
 seamonkey-2.0rc2.source.tar.bz2
 seamonkey-langpacks-2.0-20091019.tar.bz2
+seamonkey-langpacks-2.0.1-20091217.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/seamonkey.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- seamonkey.spec	27 Oct 2009 14:56:08 -0000	1.67
+++ seamonkey.spec	17 Dec 2009 09:31:55 -0000	1.68
@@ -17,14 +17,14 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.0
-Release:        7%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
 
 Source0:        seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
-Source1:        seamonkey-langpacks-%{version}-20091027.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20091217.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -342,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Thu Dec 17 2009 Jan Horak <jhorak at redhat.com> - 2.0.1-1
+- Update to 2.0.1
+
 * Tue Oct 27 2009 Martin Stransky <stransky at redhat.com> 2.0-7
 - Update to 2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Oct 2009 14:56:08 -0000	1.32
+++ sources	17 Dec 2009 09:31:55 -0000	1.33
@@ -1,2 +1,2 @@
-494608587e3ba4e4cc2e754d95154435  seamonkey-2.0.source.tar.bz2
-91386d040b662051e096ad4441172899  seamonkey-langpacks-2.0-20091027.tar.bz2
+100c67f5dc351af5b9efb02bb375db50  seamonkey-2.0.1.source.tar.bz2
+d2c0e3b2e2e78a66cda1c566eb8ec660  seamonkey-langpacks-2.0.1-20091217.tar.bz2



From pingou at fedoraproject.org  Thu Dec 17 09:31:56 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 09:31:56 +0000 (UTC)
Subject: rpms/R-Biostrings/F-11 R-Biostrings.spec,1.9,1.10
Message-ID: <20091217093156.AD96C11C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9513/F-11

Modified Files:
	R-Biostrings.spec 
Log Message:
Fix build by fixing dependencies


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-11/R-Biostrings.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- R-Biostrings.spec	17 Dec 2009 08:43:10 -0000	1.9
+++ R-Biostrings.spec	17 Dec 2009 09:31:56 -0000	1.10
@@ -1,11 +1,11 @@
 %global packname  Biostrings
 %global BioC      2.5
 %global Rvers     2.10.0
-%global IRange    1.4.3
+%global IRange    1.4.8
 
 Name:             R-%{packname}
 Version:          2.14.9
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-2
+- Update dependancy to IRanges 1.4.8
+
 * Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-1
 - Update to 2.14.9
 



From pingou at fedoraproject.org  Thu Dec 17 09:31:56 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 09:31:56 +0000 (UTC)
Subject: rpms/R-Biostrings/F-12 R-Biostrings.spec,1.10,1.11
Message-ID: <20091217093156.C141A11C00EF@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9513/F-12

Modified Files:
	R-Biostrings.spec 
Log Message:
Fix build by fixing dependencies


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-12/R-Biostrings.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- R-Biostrings.spec	17 Dec 2009 08:43:11 -0000	1.10
+++ R-Biostrings.spec	17 Dec 2009 09:31:56 -0000	1.11
@@ -1,11 +1,11 @@
 %global packname  Biostrings
 %global BioC      2.5
 %global Rvers     2.10.0
-%global IRange    1.4.3
+%global IRange    1.4.8
 
 Name:             R-%{packname}
 Version:          2.14.9
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-2
+- Update dependancy to IRanges 1.4.8
+
 * Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-1
 - Update to 2.14.9
 



From pingou at fedoraproject.org  Thu Dec 17 09:31:56 2009
From: pingou at fedoraproject.org (pingou)
Date: Thu, 17 Dec 2009 09:31:56 +0000 (UTC)
Subject: rpms/R-Biostrings/devel R-Biostrings.spec,1.10,1.11
Message-ID: <20091217093156.EFA9511C0092@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9513/devel

Modified Files:
	R-Biostrings.spec 
Log Message:
Fix build by fixing dependencies


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/R-Biostrings.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- R-Biostrings.spec	17 Dec 2009 08:43:11 -0000	1.10
+++ R-Biostrings.spec	17 Dec 2009 09:31:56 -0000	1.11
@@ -1,11 +1,11 @@
 %global packname  Biostrings
 %global BioC      2.5
 %global Rvers     2.10.0
-%global IRange    1.4.3
+%global IRange    1.4.8
 
 Name:             R-%{packname}
 Version:          2.14.9
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-2
+- Update dependancy to IRanges 1.4.8
+
 * Thu Dec 17 2009 pingou <pingou at pingoured.fr> 2.14.9-1
 - Update to 2.14.9
 



From stransky at fedoraproject.org  Thu Dec 17 09:42:00 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu, 17 Dec 2009 09:42:00 +0000 (UTC)
Subject: rpms/firefox/devel mozilla-jemalloc-526152.patch, NONE,
	1.1 firefox.spec, 1.348, 1.349
Message-ID: <20091217094200.7994311C0092@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12073

Modified Files:
	firefox.spec 
Added Files:
	mozilla-jemalloc-526152.patch 
Log Message:
Added fix for mozbz#526152 - jemalloc fix

mozilla-jemalloc-526152.patch:
 jemalloc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mozilla-jemalloc-526152.patch ---
From: David Mandelin <dmandelin at mozilla.com>

diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -5792,24 +5792,24 @@ __attribute__((noinline))
 #else
 inline
 #endif
 void *
 memalign(size_t alignment, size_t size)
 {
 	void *ret;
 
-	assert(((alignment - 1) & alignment) == 0 && alignment >=
-	    sizeof(void *));
+	assert(((alignment - 1) & alignment) == 0);
 
 	if (malloc_init()) {
 		ret = NULL;
 		goto RETURN;
 	}
 
+	alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
 	ret = ipalloc(alignment, size);
 
 RETURN:
 #ifdef MALLOC_XMALLOC
 	if (opt_xmalloc && ret == NULL) {
 		_malloc_message(_getprogname(),
 		": (malloc) Error in memalign(): out of memory\n", "", "");
 		abort();


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -p -r1.348 -r1.349
--- firefox.spec	27 Nov 2009 11:02:06 -0000	1.348
+++ firefox.spec	17 Dec 2009 09:42:00 -0000	1.349
@@ -20,7 +20,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.6.1
-Release:        0.5.%{?prever}%{?dist}
+Release:        0.6.%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -40,6 +40,7 @@ Source100:      find-external-requires
 
 #Build patches
 Patch0:         firefox-version.patch
+Patch1:         mozilla-jemalloc-526152.patch
 
 # Upstream patches
 
@@ -85,6 +86,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{int
     
 
 # For branding specific patches.
+%patch1 -p1 -b .526152
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -344,6 +346,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Nov 27 2009 Martin Stransky <stransky at redhat.com> - 3.6.1-0.6.b4
+- Added fix for mozbz#526152 - jemalloc fix
+
 * Wed Nov 27 2009 Martin Stransky <stransky at redhat.com> - 3.6.1-0.5.b4
 - Update to 3.6.1 Beta 4
 



From pkgdb at fedoraproject.org  Thu Dec 17 09:55:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:55:04 +0000
Subject: [pkgdb] elinks had acl change status
Message-ID: <20091217095505.F007428ED42@bastion3.fedora.phx2.redhat.com>

ovasik has set the approveacls acl on elinks (Fedora devel) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:55:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:55:13 +0000
Subject: [pkgdb] elinks had acl change status
Message-ID: <20091217095514.B265A28ED40@bastion3.fedora.phx2.redhat.com>

ovasik has set the approveacls acl on elinks (Fedora 12) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:55:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:55:25 +0000
Subject: [pkgdb] elinks had acl change status
Message-ID: <20091217095527.95FF528ED04@bastion3.fedora.phx2.redhat.com>

ovasik has set the approveacls acl on elinks (Fedora 11) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:55:32 +0000
Subject: [pkgdb] elinks ownership updated
Message-ID: <20091217095533.2DD3728ED40@bastion3.fedora.phx2.redhat.com>

Package elinks in Fedora 11 is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:55:33 +0000
Subject: [pkgdb] elinks ownership updated
Message-ID: <20091217095536.024C528ED27@bastion3.fedora.phx2.redhat.com>

Package elinks in Fedora 12 is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:55:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:55:38 +0000
Subject: [pkgdb] elinks ownership updated
Message-ID: <20091217095541.50EE828ED27@bastion3.fedora.phx2.redhat.com>

Package elinks in Fedora devel is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:23 +0000
Subject: [pkgdb] elinks: ovasik has given up watchcommits
Message-ID: <20091217095624.3D84E28EC0B@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchcommits acl on elinks (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:25 +0000
Subject: [pkgdb] elinks: ovasik has given up watchbugzilla
Message-ID: <20091217095627.7EBDF28EC0B@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on elinks (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:29 +0000
Subject: [pkgdb] elinks: ovasik has requested commit
Message-ID: <20091217095631.7EC6328EC75@bastion3.fedora.phx2.redhat.com>

ovasik has requested the commit acl on elinks (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:33 +0000
Subject: [pkgdb] elinks: ovasik has given up watchcommits
Message-ID: <20091217095634.0AA6028ECEB@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchcommits acl on elinks (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:37 +0000
Subject: [pkgdb] elinks: ovasik has given up watchbugzilla
Message-ID: <20091217095638.9DA2C28ECF3@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on elinks (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:38 +0000
Subject: [pkgdb] elinks: ovasik has requested commit
Message-ID: <20091217095640.E018928ECCF@bastion3.fedora.phx2.redhat.com>

ovasik has requested the commit acl on elinks (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:42 +0000
Subject: [pkgdb] elinks: ovasik has given up watchcommits
Message-ID: <20091217095644.849F228ECCF@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchcommits acl on elinks (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:44 +0000
Subject: [pkgdb] elinks: ovasik has requested commit
Message-ID: <20091217095646.0653728ECEB@bastion3.fedora.phx2.redhat.com>

ovasik has requested the commit acl on elinks (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:56:46 +0000
Subject: [pkgdb] elinks: ovasik has given up watchbugzilla
Message-ID: <20091217095647.47AF128ED19@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on elinks (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From plautrba at fedoraproject.org  Thu Dec 17 09:56:57 2009
From: plautrba at fedoraproject.org (Petr Lautrbach)
Date: Thu, 17 Dec 2009 09:56:57 +0000 (UTC)
Subject: rpms/upstart/devel upstart-audit-events.patch, 1.2, 1.3 upstart.spec,
	1.40, 1.41
Message-ID: <20091217095658.16CE111C0092@cvs1.fedora.phx.redhat.com>

Author: plautrba

Update of /cvs/pkgs/rpms/upstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15425

Modified Files:
	upstart-audit-events.patch upstart.spec 
Log Message:
audit events patch rebased for 0.6 (#470661)


upstart-audit-events.patch:
 Makefile.in |    5 +++++
 reboot.c    |   26 +++++++++++++++++++++++++-
 sysv.c      |   44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)

Index: upstart-audit-events.patch
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart-audit-events.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- upstart-audit-events.patch	27 Apr 2009 20:07:46 -0000	1.2
+++ upstart-audit-events.patch	17 Dec 2009 09:56:57 -0000	1.3
@@ -1,36 +1,92 @@
-diff -urp upstart-0.3.9.orig/compat/sysv/reboot.c upstart-0.3.9/compat/sysv/reboot.c
---- upstart-0.3.9.orig/compat/sysv/reboot.c	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/compat/sysv/reboot.c	2008-11-05 08:16:22.000000000 -0500
-@@ -37,6 +37,9 @@
- #include <string.h>
- #include <unistd.h>
- #include <utmp.h>
+diff --git a/util/Makefile.in b/util/Makefile.in
+index 26025ce..f7b61a3 100644
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -376,6 +376,7 @@ reboot_SOURCES = \
+ reboot_LDFLAGS = -static
+ reboot_LDADD = \
+ 	../nih/libnih.la \
++	-laudit \
+ 	$(LTLIBINTL)
+ 
+ runlevel_SOURCES = \
+@@ -399,6 +400,7 @@ shutdown_LDFLAGS = -static
+ shutdown_LDADD = \
+ 	../nih/libnih.la \
+ 	../nih-dbus/libnih-dbus.la \
++	-laudit \
+ 	$(LTLIBINTL) \
+ 	$(DBUS_LIBS)
+ 
+@@ -414,6 +416,7 @@ telinit_LDFLAGS = -static
+ telinit_LDADD = \
+ 	../nih/libnih.la \
+ 	../nih-dbus/libnih-dbus.la \
++	-laudit \
+ 	$(LTLIBINTL) \
+ 	$(DBUS_LIBS)
+ 
+@@ -477,6 +480,7 @@ test_sysv_LDADD = \
+ 	sysv.o utmp.o \
+ 	../nih/libnih.la \
+ 	../nih-dbus/libnih-dbus.la \
++	-laudit \
+ 	$(LTLIBINTL) \
+ 	$(DBUS_LIBS)
+ 
+@@ -489,6 +493,7 @@ test_telinit_LDADD = \
+ 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
+ 	../nih/libnih.la \
+ 	../nih-dbus/libnih-dbus.la \
++	-laudit \
+ 	$(DBUS_LIBS)
+ 
+ all: $(BUILT_SOURCES)
+diff --git a/util/reboot.c b/util/reboot.c
+index dda2935..eef9ed2 100644
+--- a/util/reboot.c
++++ b/util/reboot.c
+@@ -36,6 +36,10 @@
+ #include <nih/logging.h>
+ #include <nih/error.h>
+ 
 +#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
++
+ #include "utmp.h"
  
- #include <linux/if.h>
- #include <linux/hdreg.h>
-@@ -87,6 +90,7 @@ enum {
- /* Prototypes for static functions */
- static void down_drives     (void);
- static void down_interfaces (void);
-+static void send_audit_event(void);
  
+@@ -96,7 +100,6 @@ static int poweroff = FALSE;
+  **/
+ static int exit_only = FALSE;
  
+-
  /**
-@@ -277,6 +281,7 @@ main (int   argc,
- 	 */
+  * options:
+  *
+@@ -119,6 +122,7 @@ static NihOption options[] = {
+ 	NIH_OPTION_LAST
+ };
+ 
++static void send_audit_event(void);
+ 
+ int
+ main (int   argc,
+@@ -216,6 +220,8 @@ main (int   argc,
+ 	/* Re-enable Control-Alt-Delete in case it breaks */
  	reboot (RB_ENABLE_CAD);
- 	kill (1, SIGTSTP);
+ 
 +	send_audit_event ();
++
+ 	/* Do the syscall */
+ 	switch (mode) {
+ 	case REBOOT:
+@@ -237,3 +243,21 @@ main (int   argc,
  
- 	/* Sync the disks */
- 	chdir ("/");
-@@ -315,6 +320,23 @@ main (int   argc,
  	return 0;
  }
- 
++
 +/**
 + * send_audit_event
 + *
@@ -40,57 +96,48 @@ diff -urp upstart-0.3.9.orig/compat/sysv
 +send_audit_event (void)
 +{
 +#if 1 /* HAVE_LIBAUDIT */
-+        int fd = audit_open ();
-+        if (fd < 0)
-+                return;
-+        audit_log_user_message (fd, AUDIT_SYSTEM_SHUTDOWN, "init",
-+                NULL, NULL, NULL, 1);
-+        close (fd);
++	int fd = audit_open ();
++	if (fd < 0)
++		return;
++	audit_log_user_message (fd, AUDIT_SYSTEM_SHUTDOWN, "init",
++		NULL, NULL, NULL, 1);
++	close (fd);
 +#endif
 +}
+diff --git a/util/sysv.c b/util/sysv.c
+index fbca39f..32b5540 100644
+--- a/util/sysv.c
++++ b/util/sysv.c
+@@ -36,6 +36,9 @@
+ #include <nih/logging.h>
+ #include <nih/error.h>
  
- /**
-  * down_drives:
-diff -urp upstart-0.3.9.orig/compat/sysv/runlevel.c upstart-0.3.9/compat/sysv/runlevel.c
---- upstart-0.3.9.orig/compat/sysv/runlevel.c	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/compat/sysv/runlevel.c	2008-11-05 08:22:17.000000000 -0500
-@@ -33,6 +33,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#if 1 /* HAVE_LIBAUDIT */
++#include <unistd.h>
 +#include <libaudit.h>
-+#endif
++
+ #include "dbus/upstart.h"
  
- #include <nih/macros.h>
- #include <nih/alloc.h>
-@@ -44,6 +47,7 @@
+ #include "utmp.h"
+@@ -54,6 +57,7 @@
  
  /* Prototypes for static functions */
- static void store (short type, pid_t pid, const char *user);
+ static void error_handler (NihError **err, NihDBusMessage *message);
 +static void send_audit_event (int old, int level);
  
  
  /**
-@@ -109,6 +113,7 @@ main (int   argc,
- 	/* Store the reboot time? */
- 	if (reboot) {
- 		store (BOOT_TIME, 0, "reboot");
-+		send_audit_event (0, 0);
- 		exit (0);
- 	}
- 
-@@ -143,6 +148,7 @@ main (int   argc,
- 		prev = cur;
- 		if (! prev)
- 			prev = 'N';
-+		send_audit_event (prev, set[0]);
- 
- 		cur = set[0];
- 	}
-@@ -203,3 +209,35 @@ store (short       type,
- 	/* Write wtmp entry */
- 	updwtmp (WTMP_FILE, &utmp);
+@@ -161,6 +165,8 @@ sysv_change_runlevel (int           runlevel,
+ 				 runlevel, prevlevel) < 0)
+ 		nih_free (nih_error_get ());
+ 
++	send_audit_event(prevlevel, runlevel);
++
+ 	/* Make the EmitEvent call, we don't wait for the event to finish
+ 	 * because sysvinit never did.
+ 	 */
+@@ -199,3 +205,41 @@ error_handler (NihError **     err,
+ {
+ 	*err = nih_error_steal ();
  }
 +
 +/**
@@ -98,7 +145,7 @@ diff -urp upstart-0.3.9.orig/compat/sysv
 + * @old: current run level
 + * @level: new run level
 + *
-+ * Send system runlevel change audit event. If level is 0, then 
++ * Send system runlevel change audit event. If level is 0, then
 + * we consider this to be a reboot event.
 + **/
 +static void
@@ -110,90 +157,23 @@ diff -urp upstart-0.3.9.orig/compat/sysv
 +        if (fd < 0)
 +                return;
 +
-+	if (level) {
-+		char buf[64];
++	/* first runlevel change after boot */
++	if (old == 'N')
++		audit_log_user_message (fd, AUDIT_SYSTEM_BOOT, "init",
++			NULL, NULL, NULL, 1);
 +
-+	        snprintf (buf, sizeof (buf),
-+			"old-level=%c new-level=%c", old, level);
-+        	audit_log_user_message (fd, AUDIT_SYSTEM_RUNLEVEL, buf,
-+                	NULL, NULL, NULL, 1);
-+	} else
-+        	audit_log_user_message (fd, AUDIT_SYSTEM_BOOT, "init",
-+                	NULL, NULL, NULL, 1);
-+        close (fd);
-+#endif
-+}
++	char buf[64];
 +
-diff -urp upstart-0.3.9.orig/compat/sysv/shutdown.c upstart-0.3.9/compat/sysv/shutdown.c
---- upstart-0.3.9.orig/compat/sysv/shutdown.c	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/compat/sysv/shutdown.c	2008-11-05 08:16:22.000000000 -0500
-@@ -38,6 +38,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#if 1 /* HAVE_LIBAUDIT */
-+#include <libaudit.h>
-+#endif
- 
- #include <nih/macros.h>
- #include <nih/alloc.h>
-@@ -452,6 +455,23 @@ runlevel_setter (NihOption  *option,
- 	return 0;
- }
- 
-+/**
-+ * send_audit_event
-+ *
-+ * Send system shutdown audit event
-+ **/
-+static void
-+send_audit_event (void)
-+{
-+#if 1 /* HAVE_LIBAUDIT */
-+	int fd = audit_open ();
-+	if (fd < 0)
-+		return;
-+	audit_log_user_message (fd, AUDIT_SYSTEM_SHUTDOWN, "init",
++	snprintf (buf, sizeof (buf),
++		"old-level=%c new-level=%c", old, level);
++	audit_log_user_message (fd, AUDIT_SYSTEM_RUNLEVEL, buf,
 +		NULL, NULL, NULL, 1);
++
++	/* shutdown or reboot */
++	if (level == '0' || level == '6')
++		audit_log_user_message (fd, AUDIT_SYSTEM_SHUTDOWN, "init",
++			NULL, NULL, NULL, 1);
++
 +	close (fd);
 +#endif
 +}
- 
- /**
-  * shutdown_now:
-@@ -496,6 +516,7 @@ shutdown_now (void)
- 	NIH_MUST (message = upstart_message_new (NULL, UPSTART_INIT_DAEMON,
- 						 UPSTART_EVENT_EMIT,
- 						 "runlevel", args, env));
-+	send_audit_event ();
- 
- 	/* Send the message */
- 	if (nih_io_message_send (message, sock) < 0) {
-@@ -513,7 +534,6 @@ shutdown_now (void)
- 		nih_fatal (_("Unable to send message: %s"), err->message);
- 		exit (1);
- 	}
--
- 	unlink (ETC_NOLOGIN);
- 	nih_main_unlink_pidfile ();
- 
-diff -up upstart-0.3.9/compat/sysv/Makefile.in.foo upstart-0.3.9/compat/sysv/Makefile.in
---- upstart-0.3.9/compat/sysv/Makefile.in.foo	2009-04-27 15:53:35.000000000 -0400
-+++ upstart-0.3.9/compat/sysv/Makefile.in	2009-04-27 15:53:55.000000000 -0400
-@@ -280,13 +280,13 @@ EXTRA_DIST = $(manpages)
- @COMPAT_SYSV_TRUE at man_MANS = $(manpages)
- reboot_SOURCES = reboot.c
- reboot_LDFLAGS = -static
--reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
-+reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
- runlevel_SOURCES = runlevel.c
- runlevel_LDFLAGS = -static
--runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
-+runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) -laudit
- shutdown_SOURCES = shutdown.c
- shutdown_LDFLAGS = -static
--shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
-+shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
- telinit_SOURCES = telinit.c
- telinit_LDFLAGS = -static
- telinit_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)


Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- upstart.spec	3 Dec 2009 20:00:00 -0000	1.40
+++ upstart.spec	17 Dec 2009 09:56:57 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.6.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ Source0:        http://upstart.ubuntu.co
 # remove tests which fail in koji
 Patch0:         upstart-remove-tests.patch
 Patch1:		upstart-telinit.patch
+Patch2:		upstart-audit-events.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -25,6 +26,7 @@ during shutdown and supervising them whi
 %setup -q
 %patch0 -p1 -b .tests
 %patch1 -p1 -b .u
+%patch2 -p1 -b .audit
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib}
@@ -103,6 +105,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Wed Dec 16 2009 Petr Lautrbach <plautrba at redhat.com> 0.6.3-4
+- audit events patch rebased for 0.6 (#470661)
+
 * Thu Dec  3 2009 Bill Nottingham <notting at redhat.com> 0.6.3-3
 - make 'telinit u' a no-op, temporarily
 



From pkgdb at fedoraproject.org  Thu Dec 17 09:58:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:58:20 +0000
Subject: [pkgdb] elinks had acl change status
Message-ID: <20091217095822.29C7728ED40@bastion3.fedora.phx2.redhat.com>

kdudka has set the commit acl on elinks (Fedora 11) to Approved for ovasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:58:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:58:23 +0000
Subject: [pkgdb] elinks had acl change status
Message-ID: <20091217095824.74F9E28ED40@bastion3.fedora.phx2.redhat.com>

kdudka has set the commit acl on elinks (Fedora 12) to Approved for ovasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From pkgdb at fedoraproject.org  Thu Dec 17 09:58:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 09:58:30 +0000
Subject: [pkgdb] elinks had acl change status
Message-ID: <20091217095832.1B7EE28ED27@bastion3.fedora.phx2.redhat.com>

kdudka has set the commit acl on elinks (Fedora devel) to Approved for ovasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/elinks



From faucamp at fedoraproject.org  Thu Dec 17 10:00:30 2009
From: faucamp at fedoraproject.org (Francois Aucamp)
Date: Thu, 17 Dec 2009 10:00:30 +0000 (UTC)
Subject: rpms/espeak/F-12 .cvsignore, 1.16, 1.17 espeak.spec, 1.23,
	1.24 sources, 1.16, 1.17
Message-ID: <20091217100030.5F6E511C0092@cvs1.fedora.phx.redhat.com>

Author: faucamp

Update of /cvs/pkgs/rpms/espeak/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16228

Modified Files:
	.cvsignore espeak.spec sources 
Log Message:
* Thu Dec 17 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.42.04-1
- Update to version 1.42.04
- Revert: build against PortAudio instead of native PulseAudio (RHBZ #512190, #532674)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	22 Jun 2009 11:21:06 -0000	1.16
+++ .cvsignore	17 Dec 2009 10:00:29 -0000	1.17
@@ -1 +1 @@
-espeak-1.40.02-source.zip
+espeak-1.42.04-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-12/espeak.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- espeak.spec	24 Jul 2009 22:18:34 -0000	1.23
+++ espeak.spec	17 Dec 2009 10:00:30 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           espeak
-Version:        1.40.02
-Release:        3%{?dist}
+Version:        1.42.04
+Release:        1%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
@@ -10,10 +10,11 @@ Source0:        http://kent.dl.sourcefor
 Source1:        espeak.1
 Patch0:         espeak-1.23-makefile_nostaticlibs.patch
 Patch1:         espeak-1.40.02-gcc_no_libstdc++.patch
-Patch2:         espeak-1.40.02-pulseaudio.patch
+#Removed for now; see RHBZ#481651
+#Patch2:         espeak-1.40.02-pulseaudio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  portaudio-devel gcc-c++
 
 
 %description
@@ -43,16 +44,21 @@ Development files for eSpeak, a software
 %setup -q -n espeak-%{version}-source
 %patch0 -p1 -b .nostaticlibs
 %patch1 -p1 -b .gcc_no_libstdc++
-%patch2 -p1 -b .pulseaudio
+
+#%patch2 -p1 -b .pulseaudio
 # Fix file permissions
 find . -type f -exec chmod 0644 {} ";"
 # Prepare documentation
+rm -rf docs/images/.svn
 mv docs html
 sed -i 's/\r//' License.txt
+# Compile against portaudio v19 (see ReadMe)
+cp -f src/portaudio19.h src/portaudio.h
 # Don't use the included binary voice dictionaries; we compile these from source
 rm -f espeak-data/*_dict
 
 
+
 %build
 # Compile espeak
 cd src
@@ -100,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 17 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.42.04-1
+- Update to version 1.42.04
+- Revert: build against PortAudio instead of native PulseAudio (RHBZ #512190, #532674)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.40.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	22 Jun 2009 11:21:07 -0000	1.16
+++ sources	17 Dec 2009 10:00:30 -0000	1.17
@@ -1 +1 @@
-708954b44c526e8174df8b88a6382738  espeak-1.40.02-source.zip
+a4cbbe5f2e2a37ccc0aa1a687a6e4c11  espeak-1.42.04-source.zip



From pkgdb at fedoraproject.org  Thu Dec 17 10:01:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:01:09 +0000
Subject: [pkgdb] xmltoman: ovasik has given up watchcommits
Message-ID: <20091217100110.CA8C928ECCF@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchcommits acl on xmltoman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmltoman



From pkgdb at fedoraproject.org  Thu Dec 17 10:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:01:18 +0000
Subject: [pkgdb] xmltoman: ovasik has given up watchbugzilla
Message-ID: <20091217100119.B373D28ED27@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on xmltoman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmltoman



From pkgdb at fedoraproject.org  Thu Dec 17 10:01:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:01:26 +0000
Subject: [pkgdb] xmltoman: ovasik has given up watchcommits
Message-ID: <20091217100127.B5C3A28ED44@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchcommits acl on xmltoman (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmltoman



From corsepiu at fedoraproject.org  Thu Dec 17 10:01:39 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu, 17 Dec 2009 10:01:39 +0000 (UTC)
Subject: rpms/perl-Test-Script/F-11 .cvsignore, 1.4,
	1.5 perl-Test-Script.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20091217100139.042DB11C0092@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16525/F-11

Modified Files:
	.cvsignore perl-Test-Script.spec sources 
Log Message:
* Tue Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.07-1
- Upstream update.
- Reflect Source0-URL having changed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Sep 2009 12:19:47 -0000	1.4
+++ .cvsignore	17 Dec 2009 10:01:38 -0000	1.5
@@ -1 +1 @@
-Test-Script-1.06.tar.gz
+Test-Script-1.07.tar.gz


Index: perl-Test-Script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-11/perl-Test-Script.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Test-Script.spec	28 Sep 2009 12:19:47 -0000	1.6
+++ perl-Test-Script.spec	17 Dec 2009 10:01:38 -0000	1.7
@@ -1,11 +1,11 @@
 Name:           perl-Test-Script
-Version:        1.06
+Version:        1.07
 Release:        1%{?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
+Source0:        http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-Script-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.07-1
+- Upstream update.
+- Reflect Source0-URL having changed.
+
 * Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
 - Upstream update.
 - BR: perl(Probe::Perl)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Sep 2009 12:19:47 -0000	1.4
+++ sources	17 Dec 2009 10:01:38 -0000	1.5
@@ -1 +1 @@
-43e8f1429472da66a853be819b11a5b9  Test-Script-1.06.tar.gz
+f6b5baa6403cd24dac7f023e0ea22384  Test-Script-1.07.tar.gz



From corsepiu at fedoraproject.org  Thu Dec 17 10:01:38 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu, 17 Dec 2009 10:01:38 +0000 (UTC)
Subject: rpms/perl-Test-Script/devel .cvsignore, 1.4,
	1.5 perl-Test-Script.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091217100138.CDED511C0092@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16525/devel

Modified Files:
	.cvsignore perl-Test-Script.spec sources 
Log Message:
* Tue Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.07-1
- Upstream update.
- Reflect Source0-URL having changed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Sep 2009 09:18:42 -0000	1.4
+++ .cvsignore	17 Dec 2009 10:01:38 -0000	1.5
@@ -1 +1 @@
-Test-Script-1.06.tar.gz
+Test-Script-1.07.tar.gz


Index: perl-Test-Script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/perl-Test-Script.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Test-Script.spec	4 Dec 2009 02:13:48 -0000	1.8
+++ perl-Test-Script.spec	17 Dec 2009 10:01:38 -0000	1.9
@@ -1,11 +1,11 @@
 Name:           perl-Test-Script
-Version:        1.06
-Release:        2%{?dist}
+Version:        1.07
+Release:        1%{?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
+Source0:        http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-Script-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.07-1
+- Upstream update.
+- Reflect Source0-URL having changed.
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.06-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Sep 2009 09:18:43 -0000	1.4
+++ sources	17 Dec 2009 10:01:38 -0000	1.5
@@ -1 +1 @@
-43e8f1429472da66a853be819b11a5b9  Test-Script-1.06.tar.gz
+f6b5baa6403cd24dac7f023e0ea22384  Test-Script-1.07.tar.gz



From corsepiu at fedoraproject.org  Thu Dec 17 10:01:39 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu, 17 Dec 2009 10:01:39 +0000 (UTC)
Subject: rpms/perl-Test-Script/F-12 .cvsignore, 1.4,
	1.5 perl-Test-Script.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20091217100139.3FCBD11C0092@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16525/F-12

Modified Files:
	.cvsignore perl-Test-Script.spec sources 
Log Message:
* Tue Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.07-1
- Upstream update.
- Reflect Source0-URL having changed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Sep 2009 09:18:42 -0000	1.4
+++ .cvsignore	17 Dec 2009 10:01:39 -0000	1.5
@@ -1 +1 @@
-Test-Script-1.06.tar.gz
+Test-Script-1.07.tar.gz


Index: perl-Test-Script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-12/perl-Test-Script.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Test-Script.spec	28 Sep 2009 09:18:43 -0000	1.7
+++ perl-Test-Script.spec	17 Dec 2009 10:01:39 -0000	1.8
@@ -1,11 +1,11 @@
 Name:           perl-Test-Script
-Version:        1.06
+Version:        1.07
 Release:        1%{?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
+Source0:        http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-Script-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 15 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.07-1
+- Upstream update.
+- Reflect Source0-URL having changed.
+
 * Mon Sep 28 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.06-1
 - Upstream update.
 - BR: perl(Probe::Perl)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Sep 2009 09:18:43 -0000	1.4
+++ sources	17 Dec 2009 10:01:39 -0000	1.5
@@ -1 +1 @@
-43e8f1429472da66a853be819b11a5b9  Test-Script-1.06.tar.gz
+f6b5baa6403cd24dac7f023e0ea22384  Test-Script-1.07.tar.gz



From pkgdb at fedoraproject.org  Thu Dec 17 10:01:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:01:38 +0000
Subject: [pkgdb] xmltoman: ovasik has given up watchbugzilla
Message-ID: <20091217100140.96DB628ECEB@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on xmltoman (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmltoman



From pkgdb at fedoraproject.org  Thu Dec 17 10:01:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:01:42 +0000
Subject: [pkgdb] xmltoman: ovasik has given up watchbugzilla
Message-ID: <20091217100144.673C628ED46@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on xmltoman (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmltoman



From pkgdb at fedoraproject.org  Thu Dec 17 10:01:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:01:49 +0000
Subject: [pkgdb] xmltoman: ovasik has given up watchcommits
Message-ID: <20091217100151.CAA4528ECEB@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchcommits acl on xmltoman (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmltoman



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:08 +0000
Subject: [pkgdb] libnice: kdudka has requested commit
Message-ID: <20091217100509.6C84428ED19@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on libnice (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:16 +0000
Subject: [pkgdb] libnice: kdudka has given up watchbugzilla
Message-ID: <20091217100516.C048028ED19@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on libnice (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:19 +0000
Subject: [pkgdb] libnice: kdudka has given up watchbugzilla
Message-ID: <20091217100520.1ECB228ED19@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on libnice (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:20 +0000
Subject: [pkgdb] libnice: kdudka has given up watchbugzilla
Message-ID: <20091217100522.4EAE828ED19@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on libnice (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:26 +0000
Subject: [pkgdb] libnice: kdudka has given up watchcommits
Message-ID: <20091217100527.835AD28ECEB@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on libnice (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:31 +0000
Subject: [pkgdb] libnice: kdudka has given up watchcommits
Message-ID: <20091217100532.72D1B28ECEB@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on libnice (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:36 +0000
Subject: [pkgdb] libnice: kdudka has given up watchcommits
Message-ID: <20091217100537.0B69628ECEB@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on libnice (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:38 +0000
Subject: [pkgdb] libnice: kdudka has requested commit
Message-ID: <20091217100539.B162828ECEB@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on libnice (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:05:41 +0000
Subject: [pkgdb] libnice: kdudka has requested commit
Message-ID: <20091217100542.A07C628ECEB@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on libnice (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnice



From pkgdb at fedoraproject.org  Thu Dec 17 10:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:07:36 +0000
Subject: [pkgdb] unicap: kdudka has given up watchbugzilla
Message-ID: <20091217100737.E693128ED40@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on unicap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:07:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:07:39 +0000
Subject: [pkgdb] unicap: kdudka has requested commit
Message-ID: <20091217100740.DE54528ED4C@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on unicap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:07:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:07:39 +0000
Subject: [pkgdb] unicap: kdudka has given up watchcommits
Message-ID: <20091217100742.0199A28ED50@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on unicap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:08:00 +0000
Subject: [pkgdb] unicap: kdudka has given up watchcommits
Message-ID: <20091217100804.42A1728ED40@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on unicap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:08:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:08:02 +0000
Subject: [pkgdb] unicap: kdudka has given up watchbugzilla
Message-ID: <20091217100804.5DDD528ED58@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on unicap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:08:05 +0000
Subject: [pkgdb] unicap: kdudka has given up watchcommits
Message-ID: <20091217100808.EB37328ED6B@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on unicap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:08:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:08:07 +0000
Subject: [pkgdb] unicap: kdudka has requested commit
Message-ID: <20091217100809.7C47928ED60@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on unicap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:08:15 +0000
Subject: [pkgdb] unicap: kdudka has given up watchbugzilla
Message-ID: <20091217100815.E9A5428ED4B@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on unicap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:08:16 +0000
Subject: [pkgdb] unicap: kdudka has requested commit
Message-ID: <20091217100818.5CC2928ED19@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on unicap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From caolanm at fedoraproject.org  Thu Dec 17 10:29:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 10:29:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2102,
	1.2103 openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch, 1.4, NONE
Message-ID: <20091217102948.1937811C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22386

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 
Log Message:
drop unnecessary openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2102
retrieving revision 1.2103
diff -u -p -r1.2102 -r1.2103
--- openoffice.org.spec	17 Dec 2009 09:28:40 -0000	1.2102
+++ openoffice.org.spec	17 Dec 2009 10:29:47 -0000	1.2103
@@ -90,49 +90,48 @@ Patch12: ooo-build.ooo68717.gstreamer.vi
 Patch13: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
 Patch14: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch15: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch16: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch17: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch18: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch19: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch20: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch21: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch22: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch23: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch24: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch25: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch26: ooo-build.ooo2497.filter.svg.patch
-Patch27: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch28: workspace.slideshow1.patch
-Patch29: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch30: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch31: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch32: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch33: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch34: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch35: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch36: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch37: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch38: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch39: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch40: workspace.vcl106.patch
-Patch41: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch42: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch43: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
-Patch44: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch45: workspace.gsminhibit.patch
-Patch46: workspace.vcl107.patch
-Patch47: workspace.hb33patches1.patch
-Patch48: workspace.ause109.patch
-Patch49: workspace.cmcfixes67.patch
-Patch50: workspace.srb1.patch
-Patch51: workspace.impress184.patch
-Patch52: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch53: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
-Patch54: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch55: workspace.vcl108.patch
-Patch56: workspace.pythonssldedux.patch
-Patch57: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch58: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch16: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch17: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch18: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch19: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch20: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch21: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch22: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch23: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch24: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch25: ooo-build.ooo2497.filter.svg.patch
+Patch26: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch27: workspace.slideshow1.patch
+Patch28: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch29: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch30: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch31: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch32: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch33: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch34: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch35: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch36: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch37: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch38: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch39: workspace.vcl106.patch
+Patch40: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch41: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch42: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch43: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch44: workspace.gsminhibit.patch
+Patch45: workspace.vcl107.patch
+Patch46: workspace.hb33patches1.patch
+Patch47: workspace.ause109.patch
+Patch48: workspace.cmcfixes67.patch
+Patch49: workspace.srb1.patch
+Patch50: workspace.impress184.patch
+Patch51: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
+Patch52: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
+Patch53: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch54: workspace.vcl108.patch
+Patch55: workspace.pythonssldedux.patch
+Patch56: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch57: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -169,7 +168,10 @@ Requires: liberation-sans-fonts, liberat
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: hunspell-en, hyphen-en, hyphen >= 2.4, autocorr-en
 Requires: saxon, lucene
-PreReq: gtk2 >= 2.9.4
+Requires(pre):    gtk2 >= 2.9.4
+Requires(post):   gtk2 >= 2.9.4
+Requires(preun):  gtk2 >= 2.9.4
+Requires(postun): gtk2 >= 2.9.4
 Obsoletes: openoffice.org < 1.9.0
 Obsoletes: openoffice.org-libs < 1.9.0
 Obsoletes: openoffice.org-i18n < 1.9.0
@@ -1617,49 +1619,48 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch13 -p1 -b .ooo7065.sw.titlepagedialog.patch
 %patch14 -p1 -b .ooo76649.httpencoding.patch
 %patch15 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch16 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch17 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch18 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch19 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch20 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch21 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch22 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch23 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch24 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch25 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch26 -p1 -b .ooo2497.filter.svg.patch
-%patch27 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch28 -p2 -b .workspace.slideshow1.patch
-%patch29 -p0 -b .ooo101274.opening-a-directory.patch
-%patch30 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch31 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch32 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch33 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch34 -p0 -b .ooo102142.sd.resleak.patch
-%patch35 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch36 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch37 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch38 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch39 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch40 -p0 -b .workspace.vcl106.patch
-%patch41 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch42 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch43 -p0 -b .ooo105988.svx.a11ycrash.patch
-%patch44 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch45 -p1 -b .workspace.gsminhibit.patch
-%patch46 -p1 -b .workspace.vcl107.patch
-%patch47 -p0 -b .workspace.hb33patches1.patch
-%patch48 -p0 -b .workspace.ause109.patch
-%patch49 -p1 -b .workspace.cmcfixes67.patch
-%patch50 -p1 -b .workspace.srb1.patch
-%patch51 -p0 -b .workspace.impress184.patch
-%patch52 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch53 -p1 -b .ooo107151.sc.pop-empty-cell.patch
-%patch54 -p0 -b .ooo102645.fix.es.patch
-%patch55 -p0 -b .workspace.vcl108.patch
-%patch56 -p1 -b .workspace.pythonssldedux.patch
-%patch57 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch58 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch16 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch17 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch18 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch19 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch20 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch21 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch22 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch23 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch24 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch25 -p1 -b .ooo2497.filter.svg.patch
+%patch26 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch27 -p2 -b .workspace.slideshow1.patch
+%patch28 -p0 -b .ooo101274.opening-a-directory.patch
+%patch29 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch30 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch31 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch32 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch33 -p0 -b .ooo102142.sd.resleak.patch
+%patch34 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch35 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch36 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch37 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch38 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch39 -p0 -b .workspace.vcl106.patch
+%patch40 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch41 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch42 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch43 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch44 -p1 -b .workspace.gsminhibit.patch
+%patch45 -p1 -b .workspace.vcl107.patch
+%patch46 -p0 -b .workspace.hb33patches1.patch
+%patch47 -p0 -b .workspace.ause109.patch
+%patch48 -p1 -b .workspace.cmcfixes67.patch
+%patch49 -p1 -b .workspace.srb1.patch
+%patch50 -p0 -b .workspace.impress184.patch
+%patch51 -p0 -b .ooo107137.canvas.fixcolorspace.patch
+%patch52 -p1 -b .ooo107151.sc.pop-empty-cell.patch
+%patch53 -p0 -b .ooo102645.fix.es.patch
+%patch54 -p0 -b .workspace.vcl108.patch
+%patch55 -p1 -b .workspace.pythonssldedux.patch
+%patch56 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch57 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4166,6 +4167,7 @@ fi
 - latest milestone
 - drop integrated openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - drop integrated workspace.fwk132.patch
+- drop unnecessary openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 
 * Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch


--- openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch DELETED ---



From caolanm at fedoraproject.org  Thu Dec 17 10:32:34 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 10:32:34 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2103,
	1.2104 openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch, 1.1, NONE
Message-ID: <20091217103234.6003211C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23007

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch 
Log Message:
drop integrated openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2103
retrieving revision 1.2104
diff -u -p -r1.2103 -r1.2104
--- openoffice.org.spec	17 Dec 2009 10:29:47 -0000	1.2103
+++ openoffice.org.spec	17 Dec 2009 10:32:34 -0000	1.2104
@@ -116,22 +116,21 @@ Patch38: openoffice.org-3.1.1.oooXXXXXX.
 Patch39: workspace.vcl106.patch
 Patch40: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 Patch41: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch42: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
-Patch43: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch44: workspace.gsminhibit.patch
-Patch45: workspace.vcl107.patch
-Patch46: workspace.hb33patches1.patch
-Patch47: workspace.ause109.patch
-Patch48: workspace.cmcfixes67.patch
-Patch49: workspace.srb1.patch
-Patch50: workspace.impress184.patch
-Patch51: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch52: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
-Patch53: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch54: workspace.vcl108.patch
-Patch55: workspace.pythonssldedux.patch
-Patch56: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch57: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch42: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch43: workspace.gsminhibit.patch
+Patch44: workspace.vcl107.patch
+Patch45: workspace.hb33patches1.patch
+Patch46: workspace.ause109.patch
+Patch47: workspace.cmcfixes67.patch
+Patch48: workspace.srb1.patch
+Patch49: workspace.impress184.patch
+Patch50: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
+Patch51: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
+Patch52: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch53: workspace.vcl108.patch
+Patch54: workspace.pythonssldedux.patch
+Patch55: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch56: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1645,22 +1644,21 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch39 -p0 -b .workspace.vcl106.patch
 %patch40 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch41 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch42 -p0 -b .ooo105988.svx.a11ycrash.patch
-%patch43 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch44 -p1 -b .workspace.gsminhibit.patch
-%patch45 -p1 -b .workspace.vcl107.patch
-%patch46 -p0 -b .workspace.hb33patches1.patch
-%patch47 -p0 -b .workspace.ause109.patch
-%patch48 -p1 -b .workspace.cmcfixes67.patch
-%patch49 -p1 -b .workspace.srb1.patch
-%patch50 -p0 -b .workspace.impress184.patch
-%patch51 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch52 -p1 -b .ooo107151.sc.pop-empty-cell.patch
-%patch53 -p0 -b .ooo102645.fix.es.patch
-%patch54 -p0 -b .workspace.vcl108.patch
-%patch55 -p1 -b .workspace.pythonssldedux.patch
-%patch56 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch57 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch42 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch43 -p1 -b .workspace.gsminhibit.patch
+%patch44 -p1 -b .workspace.vcl107.patch
+%patch45 -p0 -b .workspace.hb33patches1.patch
+%patch46 -p0 -b .workspace.ause109.patch
+%patch47 -p1 -b .workspace.cmcfixes67.patch
+%patch48 -p1 -b .workspace.srb1.patch
+%patch49 -p0 -b .workspace.impress184.patch
+%patch50 -p0 -b .ooo107137.canvas.fixcolorspace.patch
+%patch51 -p1 -b .ooo107151.sc.pop-empty-cell.patch
+%patch52 -p0 -b .ooo102645.fix.es.patch
+%patch53 -p0 -b .workspace.vcl108.patch
+%patch54 -p1 -b .workspace.pythonssldedux.patch
+%patch55 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch56 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4168,6 +4166,7 @@ fi
 - drop integrated openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - drop integrated workspace.fwk132.patch
 - drop unnecessary openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+- drop integrated openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 
 * Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch


--- openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch DELETED ---



From caolanm at fedoraproject.org  Thu Dec 17 10:40:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 10:40:54 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2104,
	1.2105 workspace.cmcfixes67.patch, 1.2,
	1.3 workspace.vcl108.patch, 1.3, 1.4
Message-ID: <20091217104054.986E211C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24835

Modified Files:
	openoffice.org.spec workspace.cmcfixes67.patch 
	workspace.vcl108.patch 
Log Message:
drop integrated openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2104
retrieving revision 1.2105
diff -u -p -r1.2104 -r1.2105
--- openoffice.org.spec	17 Dec 2009 10:32:34 -0000	1.2104
+++ openoffice.org.spec	17 Dec 2009 10:40:54 -0000	1.2105
@@ -125,12 +125,11 @@ Patch47: workspace.cmcfixes67.patch
 Patch48: workspace.srb1.patch
 Patch49: workspace.impress184.patch
 Patch50: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch51: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
-Patch52: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch53: workspace.vcl108.patch
-Patch54: workspace.pythonssldedux.patch
-Patch55: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch56: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch51: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch52: workspace.vcl108.patch
+Patch53: workspace.pythonssldedux.patch
+Patch54: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch55: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1653,12 +1652,11 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch48 -p1 -b .workspace.srb1.patch
 %patch49 -p0 -b .workspace.impress184.patch
 %patch50 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch51 -p1 -b .ooo107151.sc.pop-empty-cell.patch
-%patch52 -p0 -b .ooo102645.fix.es.patch
-%patch53 -p0 -b .workspace.vcl108.patch
-%patch54 -p1 -b .workspace.pythonssldedux.patch
-%patch55 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch56 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch51 -p0 -b .ooo102645.fix.es.patch
+%patch52 -p0 -b .workspace.vcl108.patch
+%patch53 -p1 -b .workspace.pythonssldedux.patch
+%patch54 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch55 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4167,6 +4165,7 @@ fi
 - drop integrated workspace.fwk132.patch
 - drop unnecessary openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 - drop integrated openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+- drop integrated openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 
 * Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch

workspace.cmcfixes67.patch:
 a/transex3/source/help/MANIFEST.MF           |    2 
 configure.in                                 |  112 ++++++++++++++++-----------
 transex3/source/help/makefile.mk             |   19 ----
 ucb/source/ucp/gio/gio_mount.cxx             |    2 
 xmlhelp/source/com/sun/star/help/MANIFEST.MF |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |   13 ---
 6 files changed, 74 insertions(+), 75 deletions(-)

Index: workspace.cmcfixes67.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes67.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.cmcfixes67.patch	26 Nov 2009 17:10:56 -0000	1.2
+++ workspace.cmcfixes67.patch	17 Dec 2009 10:40:54 -0000	1.3
@@ -225,7 +225,7 @@ diff -r dd90334f8680 xmlhelp/source/com/
 diff -r dd90334f8680 xmlhelp/source/com/sun/star/help/makefile.mk
 --- a/xmlhelp/source/com/sun/star/help/makefile.mk	Mon Nov 16 21:01:44 2009 +0100
 +++ b/xmlhelp/source/com/sun/star/help/makefile.mk	Tue Nov 24 13:21:57 2009 +0000
-@@ -76,14 +76,15 @@
+@@ -77,14 +77,15 @@
  JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar 
  .IF "$(SYSTEM_LUCENE)" == "YES"
  XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
@@ -243,7 +243,7 @@ diff -r dd90334f8680 xmlhelp/source/com/
   
  # --- Targets ------------------------------------------------------
  
-@@ -93,15 +94,8 @@
+@@ -94,7 +95,6 @@
  
  .IF "$(JARTARGETN)"!=""
  $(JARTARGETN) : $(ADDFILES)
@@ -251,11 +251,16 @@ diff -r dd90334f8680 xmlhelp/source/com/
  .ENDIF
  
  $(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class 
- 	$(MKDIRHIER) $(@:d)	
+@@ -102,11 +102,6 @@
  	$(COPY) $< $@
--
--
+ 
+ 
 -fix_system_lucene:
 -	@echo "Fix Java Class-Path entry for Lucene libraries from system."
 -	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
 -	-i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
+-.ELSE
+ all:
+-        @echo java disabled
++	@echo java disabled
+ .ENDIF

workspace.vcl108.patch:
 source/fontsubset/sft.cxx           |   20 +++++++
 unx/source/dtrans/X11_selection.cxx |   92 ++++++++++++++++++++++++++++++++----
 unx/source/dtrans/X11_selection.hxx |   18 ++++++-
 util/makefile.mk                    |    1 
 4 files changed, 117 insertions(+), 14 deletions(-)

Index: workspace.vcl108.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl108.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.vcl108.patch	9 Dec 2009 12:40:34 -0000	1.3
+++ workspace.vcl108.patch	17 Dec 2009 10:40:54 -0000	1.4
@@ -212,33 +212,6 @@ diff -ru vcl/util/makefile.mk vcl/util/m
              $(CPPUHELPERLIB) \
              $(CPPULIB) \
              $(SALLIB)
-diff -ru vcl/source/gdi/pdfwriter_impl.hxx vcl/source/gdi/pdfwriter_impl.hxx
---- vcl/source/gdi/pdfwriter_impl.hxx	2009-12-01 15:26:48.000000000 +0000
-+++ vcl/source/gdi/pdfwriter_impl.hxx	2009-12-01 15:30:18.000000000 +0000
-@@ -679,6 +679,7 @@
-                 m_aOverlineColor( COL_TRANSPARENT ),
-                 m_nAntiAlias( 1 ),
-                 m_nLayoutMode( 0 ),
-+                m_aDigitLanguage( 0 ),
-                 m_nTransparentPercent( 0 ),
-                 m_nFlags( 0xffff ),
-                 m_nUpdateFlags( 0xffff )
-@@ -693,6 +694,7 @@
-                 m_aClipRegion( rState.m_aClipRegion ),
-                 m_nAntiAlias( rState.m_nAntiAlias ),
-                 m_nLayoutMode( rState.m_nLayoutMode ),
-+                m_aDigitLanguage( rState.m_aDigitLanguage ),
-                 m_nTransparentPercent( rState.m_nTransparentPercent ),
-                 m_nFlags( rState.m_nFlags ),
-                 m_nUpdateFlags( rState.m_nUpdateFlags )
-@@ -710,6 +712,7 @@
-             m_aClipRegion			= rState.m_aClipRegion;
-             m_nAntiAlias			= rState.m_nAntiAlias;
-             m_nLayoutMode			= rState.m_nLayoutMode;
-+            m_aDigitLanguage        = rState.m_aDigitLanguage;
-             m_nTransparentPercent	= rState.m_nTransparentPercent;
-             m_nFlags				= rState.m_nFlags;
-             m_nUpdateFlags          = rState.m_nUpdateFlags;
 --- vcl/source/fontsubset/sft.cxx	2009-12-09 10:16:54.000000000 +0000
 +++ vcl/source/fontsubset/sft.cxx	2009-12-09 10:17:54.000000000 +0000
 @@ -1094,6 +1094,14 @@



From pkgdb at fedoraproject.org  Thu Dec 17 10:52:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:52:24 +0000
Subject: [pkgdb] unicap: kdudka has requested commit
Message-ID: <20091217105225.5795828ED49@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on unicap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:52:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:52:28 +0000
Subject: [pkgdb] unicap: kdudka has given up watchcommits
Message-ID: <20091217105229.A11C628ED4E@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on unicap (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:52:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:52:28 +0000
Subject: [pkgdb] unicap: kdudka has given up watchcommits
Message-ID: <20091217105231.2051B28ECDA@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on unicap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:52:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:52:35 +0000
Subject: [pkgdb] unicap: kdudka has given up watchbugzilla
Message-ID: <20091217105236.3A2A228ED4F@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on unicap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:52:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:52:34 +0000
Subject: [pkgdb] unicap: kdudka has given up watchbugzilla
Message-ID: <20091217105236.EF73C28ED4D@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on unicap (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 10:52:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 10:52:36 +0000
Subject: [pkgdb] unicap: kdudka has requested commit
Message-ID: <20091217105239.1F55C28ECDA@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on unicap (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From mschwendt at fedoraproject.org  Thu Dec 17 11:06:05 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 17 Dec 2009 11:06:05 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12
	audacious-plugins-2.1-pulseaudio-no-drain.patch, NONE,
	1.1 audacious-plugins-2.1-sid-playfix.patch, NONE,
	1.1 audacious-plugins.spec, 1.72, 1.73
Message-ID: <20091217110605.A346E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29509

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-pulseaudio-no-drain.patch 
	audacious-plugins-2.1-sid-playfix.patch 
Log Message:
* Wed Dec 16 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-25
- Patch SID plugin to remove old cruft and fix playback.
- Don't drain in pulse_audio output plugin (2.2 doesn't do this anymore
  either, but does it cause loud clicks'n'pops instead? Test this also
  with 2.2).


audacious-plugins-2.1-pulseaudio-no-drain.patch:
 pulse_audio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.1-pulseaudio-no-drain.patch ---
diff -Nur audacious-plugins-fedora-2.1-prep/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.1/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-2.1-prep/src/pulse_audio/pulse_audio.c	2009-12-16 19:20:21.000000000 +0100
+++ audacious-plugins-fedora-2.1/src/pulse_audio/pulse_audio.c	2009-12-16 19:21:58.000000000 +0100
@@ -509,7 +509,7 @@
 
 static void pulse_close(void)
 {
-    drain();
+    /* drain(); */
 
     connected = 0;
 

audacious-plugins-2.1-sid-playfix.patch:
 xmms-sid.c |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

--- NEW FILE audacious-plugins-2.1-sid-playfix.patch ---
diff -Nur audacious-plugins-fedora-2.1-orig/src/sid/xmms-sid.c audacious-plugins-fedora-2.1-sid/src/sid/xmms-sid.c
--- audacious-plugins-fedora-2.1-orig/src/sid/xmms-sid.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-sid/src/sid/xmms-sid.c	2009-12-17 11:56:03.000000000 +0100
@@ -43,7 +43,6 @@
  */
 xs_status_t xs_status;
 XS_MUTEX(xs_status);
-static XS_THREAD_T xs_decode_thread;
 
 static void xs_get_song_tuple_info(Tuple *pResult, xs_tuneinfo_t *pInfo, gint subTune);
 
@@ -74,7 +73,7 @@
  */
 void xs_reinit(void)
 {
-    XSDEBUG("xs_reinit() thread = %p\n", g_thread_self());
+    XSDEBUG("xs_reinit()\n");
 
     /* Stop playing, if we are */
     XS_MUTEX_LOCK(xs_status);
@@ -247,8 +246,6 @@
     XSDEBUG("load ok\n");
 
     /* Set general status information */
-    pb->playing = TRUE;
-    xs_status.isPlaying = TRUE;
     pb->error = FALSE;
     pb->eof = FALSE;
     tmpTune = xs_status.tuneInfo;
@@ -261,9 +258,6 @@
     XSDEBUG("subtune #%i selected (#%d wanted), initializing...\n", xs_status.currSong, subTune);
 
 
-    /* We are ready */
-    xs_decode_thread = g_thread_self();
-    XSDEBUG("playing thread = %p\n", xs_decode_thread);
 
 
     /* Allocate audio buffer */
@@ -315,7 +309,8 @@
     }
 
     audioOpen = TRUE;
-
+    xs_status.isPlaying = TRUE;
+    pb->playing = TRUE;
     pb->set_pb_ready(pb);
 
     /* Set song information for current subtune */
@@ -366,16 +361,11 @@
                 &xs_status, audioBuffer, XS_AUDIOBUF_SIZE);
         }
 
+        XS_MUTEX_UNLOCK(xs_status);
         /* I <3 visualice/haujobb */
         pb->pass_audio(pb, xs_status.audioFormat, xs_status.audioChannels,
             audioGot, audioBuffer, NULL);
         
-        XS_MUTEX_UNLOCK(xs_status);
-
-        /* Wait a little */
-        while (pb->playing && pb->output->buffer_free() < audioGot)
-            g_usleep(500);
-
         /* Check if we have played enough */
         XS_MUTEX_LOCK(xs_status);
         if (xs_cfg.playMaxTimeEnable) {
@@ -428,9 +418,6 @@
     xs_status.isPlaying = FALSE;
     pb->eof = TRUE;
     XS_MUTEX_UNLOCK(xs_status);
-
-    /* Exit the playing thread */
-    XSDEBUG("exiting thread, bye.\n");
 }
 
 
@@ -457,7 +444,6 @@
         pb->playing = FALSE;
         xs_status.isPlaying = FALSE;
         XS_MUTEX_UNLOCK(xs_status);
-        XS_THREAD_JOIN(xs_decode_thread);
     } else {
         XS_MUTEX_UNLOCK(xs_status);
     }


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- audacious-plugins.spec	30 Nov 2009 13:47:48 -0000	1.72
+++ audacious-plugins.spec	17 Dec 2009 11:06:05 -0000	1.73
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 24%{?dist}
+Release: 25%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -41,6 +41,11 @@ Patch14: audacious-plugins-2.1-sndstretc
 Patch15: audacious-plugins-2.1-icecast.patch
 # merged upstream
 Patch16: audacious-plugins-2.1-jack.patch
+# as in 2.2
+Patch17: audacious-plugins-2.1-pulseaudio-no-drain.patch
+#
+Patch18: audacious-plugins-2.1-sid-playfix.patch
+
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -176,6 +181,8 @@ vortex compressed files.
 %patch14 -p1 -b .sndstretch-dialog
 %patch15 -p1 -b .icecast
 %patch16 -p1 -b .jack
+%patch17 -p1 -b .no-drain
+%patch18 -p1 -b .sid-playfix
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -259,6 +266,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 16 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-25
+- Patch SID plugin to remove old cruft and fix playback.
+- Don't drain in pulse_audio output plugin (2.2 doesn't do this anymore
+  either, but does it cause loud clicks'n'pops instead? Test this also
+  with 2.2).
+
 * Mon Nov 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-24
 - Merge some of the default volume level changes that went into the
   pulse_audio output plugin in 2.2.



From pkgdb at fedoraproject.org  Thu Dec 17 11:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:18:22 +0000
Subject: [pkgdb] acl ownership updated
Message-ID: <20091217111824.104E328ED50@bastion3.fedora.phx2.redhat.com>

Package acl in Fedora 7 is now owned by steved

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:18:21 +0000
Subject: [pkgdb] acl ownership updated
Message-ID: <20091217111824.2A61228ED4E@bastion3.fedora.phx2.redhat.com>

Package acl in Fedora devel is now owned by steved

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:18:26 +0000
Subject: [pkgdb] acl ownership updated
Message-ID: <20091217111827.303E928ED4E@bastion3.fedora.phx2.redhat.com>

Package acl in Fedora 9 is now owned by steved

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:18:26 +0000
Subject: [pkgdb] acl ownership updated
Message-ID: <20091217111828.A70A428ECE9@bastion3.fedora.phx2.redhat.com>

Package acl in Fedora 8 is now owned by steved

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:21:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:21:07 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112107.ED22328ED04@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora devel was orphaned by jmoskovc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:21:09 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112111.5EEEC28ECEE@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora 7 was orphaned by jmoskovc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:21:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:21:13 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112115.6E12B28ECDA@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora 11 was orphaned by jmoskovc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:21:12 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112113.78F5728ED04@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora 10 was orphaned by jmoskovc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:21:14 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112115.8BE9328ED51@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora 12 was orphaned by jmoskovc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:21:10 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112112.9AC3A28ED66@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora 8 was orphaned by jmoskovc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:21:12 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112115.D120928ECEE@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora 9 was orphaned by jmoskovc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From ingvar at fedoraproject.org  Thu Dec 17 11:23:41 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 17 Dec 2009 11:23:41 +0000 (UTC)
Subject: File munin-1.4.2.tar.gz uploaded to lookaside cache by ingvar
Message-ID: <20091217112341.726CD28ECDA@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for munin:

656f0b25af119841b610cac9682d7e54  munin-1.4.2.tar.gz



From pkgdb at fedoraproject.org  Thu Dec 17 11:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:26:50 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112651.E34C828ECF3@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora devel is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:26:56 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112657.66AA528ECF3@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora 11 is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:27:03 +0000
Subject: [pkgdb] lynx ownership updated
Message-ID: <20091217112704.D641D28ECF3@bastion3.fedora.phx2.redhat.com>

Package lynx in Fedora 12 is now owned by kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lynx



From pkgdb at fedoraproject.org  Thu Dec 17 11:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:28:37 +0000
Subject: [pkgdb] libproxy: jskala has given up watchcommits
Message-ID: <20091217112838.DE5FC28ECEE@bastion3.fedora.phx2.redhat.com>

jskala has given up the watchcommits acl on libproxy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:28:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:28:42 +0000
Subject: [pkgdb] libproxy: jskala has requested commit
Message-ID: <20091217112844.00CA628ED49@bastion3.fedora.phx2.redhat.com>

jskala has requested the commit acl on libproxy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:28:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:28:52 +0000
Subject: [pkgdb] libproxy: jskala has given up watchbugzilla
Message-ID: <20091217112853.D06A328ED4C@bastion3.fedora.phx2.redhat.com>

jskala has given up the watchbugzilla acl on libproxy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:28:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:28:54 +0000
Subject: [pkgdb] acl: kdudka has given up watchbugzilla
Message-ID: <20091217112856.8EF8828ECEE@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on acl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:28:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:28:58 +0000
Subject: [pkgdb] acl: kdudka has given up watchcommits
Message-ID: <20091217112900.568AC28ECEE@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on acl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:03 +0000
Subject: [pkgdb] libproxy: jskala has given up watchbugzilla
Message-ID: <20091217112905.F307928ECEE@bastion3.fedora.phx2.redhat.com>

jskala has given up the watchbugzilla acl on libproxy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:04 +0000
Subject: [pkgdb] acl: kdudka has requested commit
Message-ID: <20091217112906.D074E28ED04@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on acl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:08 +0000
Subject: [pkgdb] libproxy: jskala has given up watchcommits
Message-ID: <20091217112910.5FC8E28ED49@bastion3.fedora.phx2.redhat.com>

jskala has given up the watchcommits acl on libproxy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:14 +0000
Subject: [pkgdb] acl: kdudka has given up watchbugzilla
Message-ID: <20091217112915.795F928ECF3@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on acl (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:13 +0000
Subject: [pkgdb] libproxy: jskala has requested commit
Message-ID: <20091217112915.5EBCC28ECEE@bastion3.fedora.phx2.redhat.com>

jskala has requested the commit acl on libproxy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:17 +0000
Subject: [pkgdb] acl: kdudka has requested commit
Message-ID: <20091217112918.B02AE28ED4E@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on acl (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:20 +0000
Subject: [pkgdb] libproxy: jskala has given up watchcommits
Message-ID: <20091217112921.B325A28ED4D@bastion3.fedora.phx2.redhat.com>

jskala has given up the watchcommits acl on libproxy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:19 +0000
Subject: [pkgdb] acl: kdudka has given up watchcommits
Message-ID: <20091217112922.5622E28ED50@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on acl (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:23 +0000
Subject: [pkgdb] acl: kdudka has requested commit
Message-ID: <20091217112925.152AA28ED4C@bastion3.fedora.phx2.redhat.com>

kdudka has requested the commit acl on acl (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:26 +0000
Subject: [pkgdb] libproxy: jskala has requested commit
Message-ID: <20091217112928.351D328ECEE@bastion3.fedora.phx2.redhat.com>

jskala has requested the commit acl on libproxy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:30 +0000
Subject: [pkgdb] acl: kdudka has given up watchcommits
Message-ID: <20091217112931.B060128ED50@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchcommits acl on acl (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:33 +0000
Subject: [pkgdb] libproxy: jskala has given up watchbugzilla
Message-ID: <20091217112936.4E53328ED4C@bastion3.fedora.phx2.redhat.com>

jskala has given up the watchbugzilla acl on libproxy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:29:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:29:37 +0000
Subject: [pkgdb] acl: kdudka has given up watchbugzilla
Message-ID: <20091217112939.97AAD28ECF3@bastion3.fedora.phx2.redhat.com>

kdudka has given up the watchbugzilla acl on acl (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From ingvar at fedoraproject.org  Thu Dec 17 11:31:26 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 17 Dec 2009 11:31:26 +0000 (UTC)
Subject: rpms/munin/devel munin-1.4.2-fontfix.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 munin.spec, 1.31, 1.32 sources, 1.6, 1.7
Message-ID: <20091217113126.D9CEF11C00E6@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2138

Modified Files:
	.cvsignore munin.spec sources 
Added Files:
	munin-1.4.2-fontfix.patch 
Log Message:
- New upstream release
- Removed upstream packaged fonts
- Added a patch that makes rrdtool use the system bitstream vera fonts on
  rhel < 6 and fedora < 11


munin-1.4.2-fontfix.patch:
 GraphOld.pm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE munin-1.4.2-fontfix.patch ---
diff -aur ../munin-1.4.2.orig/master/lib/Munin/Master/GraphOld.pm ./master/lib/Munin/Master/GraphOld.pm
--- ../munin-1.4.2.orig/master/lib/Munin/Master/GraphOld.pm	2009-12-16 15:53:28.000000000 +0100
+++ ./master/lib/Munin/Master/GraphOld.pm	2009-12-17 11:22:44.753518725 +0100
@@ -1299,9 +1299,9 @@
 	# The RRD 1.2 documentation says you can identify font family
 	# names but I never got that to work, but full font path worked
 	return (
-		'--font', "LEGEND:7:$libdir/DejaVuSansMono.ttf",
-		'--font', "UNIT:7:$libdir/DejaVuSans.ttf",
-		'--font', "AXIS:7:$libdir/DejaVuSans.ttf",
+		'--font', "LEGEND:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
+		'--font', "UNIT:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
+		'--font', "AXIS:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
 	       );
     } elsif ($RRDs::VERSION >= 1.3) {
 	# RRD 1.3 and up


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Dec 2009 20:24:07 -0000	1.6
+++ .cvsignore	17 Dec 2009 11:31:26 -0000	1.7
@@ -1 +1 @@
-munin-1.4.1.tar.gz
+munin-1.4.2.tar.gz


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- munin.spec	11 Dec 2009 13:53:39 -0000	1.31
+++ munin.spec	17 Dec 2009 11:31:26 -0000	1.32
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   1.4.1
-Release:   3%{?dist}
+Version:   1.4.2
+Release:   1%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
 
 Patch1: munin-1.4.0-config.patch
-Patch2: munin-1.4.1-fontfix.patch
+Patch2: munin-1.4.2-fontfix.patch
 
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
@@ -121,7 +121,9 @@ java-plugins for munin-node. 
 %prep
 %setup -q
 %patch1 -p1
+%if 0%{?rhel} < 6 && 0%{?fedora} < 11
 %patch2 -p0
+%endif
 
 %build
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
@@ -184,13 +186,9 @@ install -m 0644 %{SOURCE4} %{buildroot}/
 # install config for postfix under fedora
 install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
 
-# Use font from bitstream-vera-fonts-sans-mono
-rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-%if 0%{?rhel} > 5 || 0%{?fedora} > 6
-ln -s /usr/share/fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-%else
-ln -s /usr/share/fonts/bitstream-vera/VeraMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-%endif 
+# Use system font
+rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSansMono.ttf
+rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSans.ttf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -234,7 +232,6 @@ exit 0
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
-%{_datadir}/munin/VeraMono.ttf
 %{perl_vendorlib}/Munin/Master
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -289,6 +286,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Dec 17 2009 Ingvar Hagelund <ingvar at linpro.no> - 1.4.2-1
+- New upstream release
+- Removed upstream packaged fonts
+- Added a patch that makes rrdtool use the system bitstream vera fonts on 
+  rhel < 6 and fedora < 11
+
 * Fri Dec 11 2009 Ingvar Hagelund <ingvar at linpro.no> - 1.4.1-3
 - More correct fedora and el versions for previous font path fix
 - Added a patch that fixes a quoting bug in GraphOld.pm, fixing fonts on el4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Dec 2009 20:24:07 -0000	1.6
+++ sources	17 Dec 2009 11:31:26 -0000	1.7
@@ -1 +1 @@
-04086f23b657e05e4e5e5a8fa6082f16  munin-1.4.1.tar.gz
+656f0b25af119841b610cac9682d7e54  munin-1.4.2.tar.gz



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:40 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113441.48B8E28ED04@bastion3.fedora.phx2.redhat.com>

ovasik has set the watchbugzilla acl on quota (Fedora devel) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:44 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113446.3711328ECF3@bastion3.fedora.phx2.redhat.com>

ovasik has set the watchcommits acl on quota (Fedora devel) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:45 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113448.2553F28ECF3@bastion3.fedora.phx2.redhat.com>

ovasik has set the commit acl on quota (Fedora devel) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:48 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113449.503E428ED4E@bastion3.fedora.phx2.redhat.com>

ovasik has set the watchcommits acl on quota (Fedora 12) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:51 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113451.CE41928ED50@bastion3.fedora.phx2.redhat.com>

ovasik has set the commit acl on quota (Fedora 12) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:49 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113452.049A728ECF3@bastion3.fedora.phx2.redhat.com>

ovasik has set the watchbugzilla acl on quota (Fedora 12) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:53 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113454.C4C0228ECF3@bastion3.fedora.phx2.redhat.com>

ovasik has set the watchbugzilla acl on quota (Fedora 11) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:56 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113458.7033C28ED4D@bastion3.fedora.phx2.redhat.com>

ovasik has set the watchcommits acl on quota (Fedora 11) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:34:58 +0000
Subject: [pkgdb] quota had acl change status
Message-ID: <20091217113501.47B6428ED49@bastion3.fedora.phx2.redhat.com>

ovasik has set the commit acl on quota (Fedora 11) to Obsolete for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:35:01 +0000
Subject: [pkgdb] quota ownership updated
Message-ID: <20091217113502.DEF9C28ED50@bastion3.fedora.phx2.redhat.com>

Package quota in Fedora 11 was orphaned by ovasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:35:03 +0000
Subject: [pkgdb] quota ownership updated
Message-ID: <20091217113504.B252828ED5C@bastion3.fedora.phx2.redhat.com>

Package quota in Fedora 12 was orphaned by ovasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:35:01 +0000
Subject: [pkgdb] libproxy had acl change status
Message-ID: <20091217113504.5E02128ED5B@bastion3.fedora.phx2.redhat.com>

kwizart has set the commit acl on libproxy (Fedora devel) to Approved for jskala

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:35:05 +0000
Subject: [pkgdb] quota ownership updated
Message-ID: <20091217113506.A11EF28ED61@bastion3.fedora.phx2.redhat.com>

Package quota in Fedora devel was orphaned by ovasik

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:35:05 +0000
Subject: [pkgdb] libproxy had acl change status
Message-ID: <20091217113508.0CA8328ED64@bastion3.fedora.phx2.redhat.com>

kwizart has set the commit acl on libproxy (Fedora 11) to Approved for jskala

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:35:08 +0000
Subject: [pkgdb] libproxy had acl change status
Message-ID: <20091217113510.0167428ED04@bastion3.fedora.phx2.redhat.com>

kwizart has set the commit acl on libproxy (Fedora 12) to Approved for jskala

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libproxy



From pkgdb at fedoraproject.org  Thu Dec 17 11:37:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:37:04 +0000
Subject: [pkgdb] quota ownership updated
Message-ID: <20091217113705.E5E8A28ECE0@bastion3.fedora.phx2.redhat.com>

Package quota in Fedora devel is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:37:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:37:14 +0000
Subject: [pkgdb] quota ownership updated
Message-ID: <20091217113714.D665B28ECBE@bastion3.fedora.phx2.redhat.com>

Package quota in Fedora 11 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:37:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:37:22 +0000
Subject: [pkgdb] quota ownership updated
Message-ID: <20091217113724.687E528ECE0@bastion3.fedora.phx2.redhat.com>

Package quota in Fedora 12 is now owned by dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:38:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:38:24 +0000
Subject: [pkgdb] quota: ovasik has given up watchbugzilla
Message-ID: <20091217113826.10E1A28ECE0@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on quota (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:38:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:38:32 +0000
Subject: [pkgdb] quota: ovasik has given up watchcommits
Message-ID: <20091217113833.5089F28ECEF@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchcommits acl on quota (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:38:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:38:37 +0000
Subject: [pkgdb] quota: ovasik has given up watchcommits
Message-ID: <20091217113838.7420C28ECE0@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchcommits acl on quota (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:38:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:38:44 +0000
Subject: [pkgdb] quota: ovasik has given up watchbugzilla
Message-ID: <20091217113846.EB16B28ECF3@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on quota (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From pkgdb at fedoraproject.org  Thu Dec 17 11:38:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 11:38:46 +0000
Subject: [pkgdb] quota: ovasik has given up watchbugzilla
Message-ID: <20091217113848.F1B7D28ECA5@bastion3.fedora.phx2.redhat.com>

ovasik has given up the watchbugzilla acl on quota (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quota



From plautrba at fedoraproject.org  Thu Dec 17 11:55:59 2009
From: plautrba at fedoraproject.org (Petr Lautrbach)
Date: Thu, 17 Dec 2009 11:55:59 +0000 (UTC)
Subject: rpms/upstart/devel upstart-remove-tests.patch,1.1,1.2
Message-ID: <20091217115559.EA32311C00E6@cvs1.fedora.phx.redhat.com>

Author: plautrba

Update of /cvs/pkgs/rpms/upstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6406

Modified Files:
	upstart-remove-tests.patch 
Log Message:
Removed another tests failing in koji


upstart-remove-tests.patch:
 nih-dbus/tests/test_dbus_connection.c |    1 
 nih/tests/test_child.c                |  180 ----------------------------------
 nih/tests/test_string.c               |    2 
 3 files changed, 183 deletions(-)

Index: upstart-remove-tests.patch
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart-remove-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- upstart-remove-tests.patch	1 Dec 2009 11:53:24 -0000	1.1
+++ upstart-remove-tests.patch	17 Dec 2009 11:55:59 -0000	1.2
@@ -1,7 +1,6 @@
-diff --git a/nih-dbus/tests/test_dbus_connection.c b/nih-dbus/tests/test_dbus_connection.c
-index 68074b2..498f4e5 100644
---- a/nih-dbus/tests/test_dbus_connection.c
-+++ b/nih-dbus/tests/test_dbus_connection.c
+diff -up upstart-0.6.3/nih-dbus/tests/test_dbus_connection.c.tests upstart-0.6.3/nih-dbus/tests/test_dbus_connection.c
+--- upstart-0.6.3/nih-dbus/tests/test_dbus_connection.c.tests	2009-12-14 15:51:25.323430105 +0100
++++ upstart-0.6.3/nih-dbus/tests/test_dbus_connection.c	2009-12-14 15:51:25.323430105 +0100
 @@ -1521,7 +1521,6 @@ main (int   argc,
  	nih_error_init ();
  
@@ -10,10 +9,9 @@ index 68074b2..498f4e5 100644
  	test_setup ();
  	test_server ();
  
-diff --git a/nih/tests/test_child.c b/nih/tests/test_child.c
-index 4c8c760..5ec8501 100644
---- a/nih/tests/test_child.c
-+++ b/nih/tests/test_child.c
+diff -up upstart-0.6.3/nih/tests/test_child.c.tests upstart-0.6.3/nih/tests/test_child.c
+--- upstart-0.6.3/nih/tests/test_child.c.tests	2009-12-14 15:51:25.910710749 +0100
++++ upstart-0.6.3/nih/tests/test_child.c	2009-12-14 15:51:25.888145178 +0100
 @@ -328,186 +328,6 @@ test_poll (void)
  	nih_free (watch);
  
@@ -201,3 +199,15 @@ index 4c8c760..5ec8501 100644
  	/* Check that we can watch for events from any process, which
  	 * shouldn't be freed when the child dies.
  	 */
+diff -up upstart-0.6.3/nih/tests/test_string.c.tests upstart-0.6.3/nih/tests/test_string.c
+--- upstart-0.6.3/nih/tests/test_string.c.tests	2009-12-17 12:34:43.357844975 +0100
++++ upstart-0.6.3/nih/tests/test_string.c	2009-12-17 12:38:41.911484010 +0100
+@@ -1511,8 +1511,6 @@ main (int   argc,
+ 	test_array_copy ();
+ 	test_array_append ();
+ 	test_str_wrap ();
+-	test_str_screen_width ();
+-	test_str_screen_wrap ();
+ 
+ 	return 0;
+ }



From jussilehtola at fedoraproject.org  Thu Dec 17 12:19:13 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 17 Dec 2009 12:19:13 +0000 (UTC)
Subject: rpms/PyQuante/devel PyQuante.spec,1.2,1.3
Message-ID: <20091217121913.CA04811C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/PyQuante/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11738

Modified Files:
	PyQuante.spec 
Log Message:
Fix FTBFS.


Index: PyQuante.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQuante/devel/PyQuante.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- PyQuante.spec	24 Jul 2009 16:02:40 -0000	1.2
+++ PyQuante.spec	17 Dec 2009 12:19:13 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		PyQuante
 Version:	1.6.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Python Quantum Chemistry
 Group:		Applications/Engineering
 License:	BSD
@@ -10,7 +10,8 @@ URL:		http://pyquante.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/pyquante/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	python-setuptools-devel
+BuildRequires:	python-devel
+BuildRequires:	python-setuptools
 BuildRequires:	numpy
 Requires:	numpy
 
@@ -48,6 +49,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Thu Dec 17 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.6.3-3
+- Fix FTBFS on Fedora 13.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jreznik at fedoraproject.org  Thu Dec 17 12:34:50 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu, 17 Dec 2009 12:34:50 +0000 (UTC)
Subject: rpms/kdemultimedia/F-11 kdemultimedia-4.3.2-kscd_doc.patch, NONE,
	1.1
Message-ID: <20091217123450.E837B11C00E6@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdemultimedia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15097

Added Files:
	kdemultimedia-4.3.2-kscd_doc.patch 
Log Message:
Add missing kscd patch


kdemultimedia-4.3.2-kscd_doc.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdemultimedia-4.3.2-kscd_doc.patch ---
diff -up kdemultimedia-4.3.2/doc/CMakeLists.txt.me kdemultimedia-4.3.2/doc/CMakeLists.txt
--- kdemultimedia-4.3.2/doc/CMakeLists.txt.me	2009-11-10 18:08:31.000000000 +0100
+++ kdemultimedia-4.3.2/doc/CMakeLists.txt	2009-11-10 18:09:03.000000000 +0100
@@ -5,5 +5,7 @@ add_subdirectory(kioslave)
 add_subdirectory(kmix)
 add_subdirectory(dragonplayer)
 if (NOT APPLE)
-  add_subdirectory(kscd)
+  if(MUSICBRAINZ_FOUND)
+     add_subdirectory(kscd)
+  endif(MUSICBRAINZ_FOUND)
 endif (NOT APPLE)



From pkgdb at fedoraproject.org  Thu Dec 17 12:36:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:36:35 +0000
Subject: [pkgdb] python-cheetah: rnovacek has given up watchcommits
Message-ID: <20091217123636.A8CD428ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-cheetah (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:36:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:36:38 +0000
Subject: [pkgdb] python-cheetah: rnovacek has requested commit
Message-ID: <20091217123641.9A21828ED88@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-cheetah (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:36:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:36:37 +0000
Subject: [pkgdb] python-cheetah: rnovacek has given up watchbugzilla
Message-ID: <20091217123640.D1DE528ED61@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-cheetah (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:36:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:36:44 +0000
Subject: [pkgdb] python-cheetah: rnovacek has given up watchbugzilla
Message-ID: <20091217123646.605B928ED58@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-cheetah (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:36:54 +0000
Subject: [pkgdb] python-cheetah: rnovacek has given up watchcommits
Message-ID: <20091217123656.9D4FC28ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-cheetah (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:37:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:37:00 +0000
Subject: [pkgdb] python-cheetah: rnovacek has requested commit
Message-ID: <20091217123702.152F328ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-cheetah (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:37:15 +0000
Subject: [pkgdb] python-cheetah: rnovacek has given up watchcommits
Message-ID: <20091217123716.89DA228ED4B@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-cheetah (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:37:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:37:22 +0000
Subject: [pkgdb] python-cheetah: rnovacek has requested commit
Message-ID: <20091217123723.6DBB428ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-cheetah (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:37:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:37:32 +0000
Subject: [pkgdb] python-cheetah: rnovacek has given up watchbugzilla
Message-ID: <20091217123734.4772428ED53@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-cheetah (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cheetah



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:08 +0000
Subject: [pkgdb] python-enchant: rnovacek has given up watchbugzilla
Message-ID: <20091217123909.E8F3F28ED42@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-enchant (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:14 +0000
Subject: [pkgdb] python-enchant: rnovacek has given up watchcommits
Message-ID: <20091217123915.A084728ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-enchant (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:14 +0000
Subject: [pkgdb] python-enchant: rnovacek has requested commit
Message-ID: <20091217123917.183AA28ED42@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-enchant (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:22 +0000
Subject: [pkgdb] python-enchant: rnovacek has given up watchbugzilla
Message-ID: <20091217123923.8ACAE28ED42@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-enchant (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:25 +0000
Subject: [pkgdb] python-enchant: rnovacek has requested commit
Message-ID: <20091217123927.EF3D028ED4B@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-enchant (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:28 +0000
Subject: [pkgdb] python-enchant: rnovacek has given up watchcommits
Message-ID: <20091217123929.2C1D728ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-enchant (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:37 +0000
Subject: [pkgdb] python-enchant: rnovacek has given up watchcommits
Message-ID: <20091217123938.77E9928ED42@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-enchant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:42 +0000
Subject: [pkgdb] python-enchant: rnovacek has requested commit
Message-ID: <20091217123944.56D7C28ED55@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-enchant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:39:48 +0000
Subject: [pkgdb] python-enchant: rnovacek has given up watchbugzilla
Message-ID: <20091217123950.641C128ED42@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-enchant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Thu Dec 17 12:42:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:42:21 +0000
Subject: [pkgdb] python-markdown: rnovacek has given up watchbugzilla
Message-ID: <20091217124222.2D9D728ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-markdown (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:42:26 +0000
Subject: [pkgdb] python-markdown: rnovacek has given up watchcommits
Message-ID: <20091217124228.AC6D428ED42@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-markdown (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:42:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:42:32 +0000
Subject: [pkgdb] python-markdown: rnovacek has requested commit
Message-ID: <20091217124234.D368928ED42@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-markdown (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:42:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:42:39 +0000
Subject: [pkgdb] python-markdown: rnovacek has given up watchbugzilla
Message-ID: <20091217124240.9B12528ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-markdown (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:42:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:42:42 +0000
Subject: [pkgdb] python-markdown: rnovacek has given up watchcommits
Message-ID: <20091217124243.20EF128ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-markdown (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:42:45 +0000
Subject: [pkgdb] python-markdown: rnovacek has requested commit
Message-ID: <20091217124246.C30B228ED53@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-markdown (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:42:58 +0000
Subject: [pkgdb] python-markdown: rnovacek has given up watchbugzilla
Message-ID: <20091217124300.59F1228ECD2@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-markdown (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:43:04 +0000
Subject: [pkgdb] python-markdown: rnovacek has given up watchcommits
Message-ID: <20091217124307.194A528ECD2@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-markdown (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:43:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:43:08 +0000
Subject: [pkgdb] python-markdown: rnovacek has requested commit
Message-ID: <20091217124309.C96BE28ED4B@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-markdown (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:11 +0000
Subject: [pkgdb] python-memcached: rnovacek has given up watchbugzilla
Message-ID: <20091217124412.4063928ECD2@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-memcached (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:16 +0000
Subject: [pkgdb] python-memcached: rnovacek has given up watchcommits
Message-ID: <20091217124418.A6C4F28ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-memcached (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:21 +0000
Subject: [pkgdb] python-memcached: rnovacek has requested commit
Message-ID: <20091217124425.7007C28ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-memcached (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:31 +0000
Subject: [pkgdb] python-memcached: rnovacek has given up watchbugzilla
Message-ID: <20091217124432.9518628ED4F@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-memcached (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:37 +0000
Subject: [pkgdb] python-memcached: rnovacek has requested commit
Message-ID: <20091217124438.3632728ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-memcached (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:36 +0000
Subject: [pkgdb] python-memcached: rnovacek has given up watchcommits
Message-ID: <20091217124438.9F1BE28ED58@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-memcached (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:43 +0000
Subject: [pkgdb] python-memcached: rnovacek has given up watchbugzilla
Message-ID: <20091217124444.BF04428ECD2@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-memcached (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:47 +0000
Subject: [pkgdb] python-memcached: rnovacek has given up watchcommits
Message-ID: <20091217124449.CCF5A28ECD2@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-memcached (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From pkgdb at fedoraproject.org  Thu Dec 17 12:44:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:44:54 +0000
Subject: [pkgdb] python-memcached: rnovacek has requested commit
Message-ID: <20091217124456.69A7F28ED51@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-memcached (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-memcached



From tmraz at fedoraproject.org  Thu Dec 17 12:45:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 17 Dec 2009 12:45:51 +0000 (UTC)
Subject: rpms/libassuan/devel libassuan.spec,1.31,1.32
Message-ID: <20091217124551.7D79E11C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libassuan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17572

Modified Files:
	libassuan.spec 
Log Message:
* Thu Dec 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.5-3
- Fix license tag - the documentation is GPLv3+



Index: libassuan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libassuan.spec	25 Jul 2009 05:20:03 -0000	1.31
+++ libassuan.spec	17 Dec 2009 12:45:51 -0000	1.32
@@ -2,9 +2,10 @@
 Name:    libassuan
 Summary: GnuPG IPC library
 Version: 1.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
-License: LGPLv2+
+# The library is LGPLv2+, the documentation GPLv3+
+License: LGPLv2+ and GPLv3+
 Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
@@ -81,7 +82,7 @@ rm -rf %{buildroot}
 
 %files devel 
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING.LIB NEWS README THANKS TODO
+%doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README THANKS TODO
 %{_bindir}/libassuan-config
 %{_includedir}/*
 %{_libdir}/lib*.a
@@ -90,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.5-3
+- Fix license tag - the documentation is GPLv3+
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Dec 17 12:46:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:46:19 +0000
Subject: [pkgdb] python-mutagen: rnovacek has given up watchbugzilla
Message-ID: <20091217124620.CFAF328ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-mutagen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:46:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:46:26 +0000
Subject: [pkgdb] python-mutagen: rnovacek has given up watchcommits
Message-ID: <20091217124628.D0F7E28ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-mutagen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:46:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:46:31 +0000
Subject: [pkgdb] python-mutagen: rnovacek has requested commit
Message-ID: <20091217124633.3960628ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-mutagen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:46:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:46:45 +0000
Subject: [pkgdb] python-mutagen: rnovacek has requested commit
Message-ID: <20091217124646.A158E28ED55@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-mutagen (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:46:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:46:48 +0000
Subject: [pkgdb] python-mutagen: rnovacek has given up watchcommits
Message-ID: <20091217124649.F357428ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-mutagen (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:46:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:46:55 +0000
Subject: [pkgdb] python-mutagen: rnovacek has given up watchcommits
Message-ID: <20091217124657.72C9828ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-mutagen (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:46:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:46:59 +0000
Subject: [pkgdb] python-mutagen: rnovacek has given up watchbugzilla
Message-ID: <20091217124700.5311828ED55@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-mutagen (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:47:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:47:04 +0000
Subject: [pkgdb] python-mutagen: rnovacek has requested commit
Message-ID: <20091217124705.9B5F528ED55@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-mutagen (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:47:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:47:07 +0000
Subject: [pkgdb] python-mutagen: rnovacek has given up watchbugzilla
Message-ID: <20091217124709.6473128ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-mutagen (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 12:48:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:48:24 +0000
Subject: [pkgdb] python-paramiko: rnovacek has given up watchcommits
Message-ID: <20091217124826.4CB0F28ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-paramiko (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:48:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:48:35 +0000
Subject: [pkgdb] python-paramiko: rnovacek has requested commit
Message-ID: <20091217124838.E07B328ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-paramiko (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:48:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:48:44 +0000
Subject: [pkgdb] python-paramiko: rnovacek has given up watchbugzilla
Message-ID: <20091217124847.9D99B28ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-paramiko (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:49:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:49:01 +0000
Subject: [pkgdb] python-paramiko: rnovacek has given up watchbugzilla
Message-ID: <20091217124902.E11E528ED53@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-paramiko (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:49:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:49:03 +0000
Subject: [pkgdb] python-paramiko: rnovacek has given up watchcommits
Message-ID: <20091217124905.7B25128ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-paramiko (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:49:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:49:15 +0000
Subject: [pkgdb] python-paramiko: rnovacek has requested commit
Message-ID: <20091217124919.6264628ED51@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-paramiko (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:49:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:49:21 +0000
Subject: [pkgdb] python-paramiko: rnovacek has given up watchcommits
Message-ID: <20091217124923.306D428ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-paramiko (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:49:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:49:24 +0000
Subject: [pkgdb] python-paramiko: rnovacek has requested commit
Message-ID: <20091217124927.B564D28ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-paramiko (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:49:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:49:28 +0000
Subject: [pkgdb] python-paramiko: rnovacek has given up watchbugzilla
Message-ID: <20091217124930.6EBB528ED53@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-paramiko (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-paramiko



From pkgdb at fedoraproject.org  Thu Dec 17 12:50:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:50:37 +0000
Subject: [pkgdb] python-psyco: rnovacek has given up watchcommits
Message-ID: <20091217125038.C519828ED53@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-psyco (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:50:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:50:41 +0000
Subject: [pkgdb] python-psyco: rnovacek has requested commit
Message-ID: <20091217125043.8AF4528ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-psyco (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:50:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:50:40 +0000
Subject: [pkgdb] python-psyco: rnovacek has given up watchbugzilla
Message-ID: <20091217125043.3345628ED5A@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-psyco (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:50:59 +0000
Subject: [pkgdb] python-psyco: rnovacek has given up watchcommits
Message-ID: <20091217125100.5C1CC28ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-psyco (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:51:02 +0000
Subject: [pkgdb] python-psyco: rnovacek has given up watchbugzilla
Message-ID: <20091217125104.49C7028ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-psyco (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:51:02 +0000
Subject: [pkgdb] python-psyco: rnovacek has requested commit
Message-ID: <20091217125104.6E5AC28ED51@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-psyco (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:51:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:51:06 +0000
Subject: [pkgdb] python-psyco: rnovacek has given up watchcommits
Message-ID: <20091217125108.93A3228ED49@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-psyco (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:51:12 +0000
Subject: [pkgdb] python-psyco: rnovacek has requested commit
Message-ID: <20091217125113.9270528ED58@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-psyco (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:51:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:51:11 +0000
Subject: [pkgdb] python-psyco: rnovacek has given up watchbugzilla
Message-ID: <20091217125113.CBACA28ED59@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-psyco (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 12:51:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:51:52 +0000
Subject: [pkgdb] python-sexy: rnovacek has given up watchcommits
Message-ID: <20091217125152.BDB7928ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-sexy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:51:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:51:54 +0000
Subject: [pkgdb] python-sexy: rnovacek has given up watchbugzilla
Message-ID: <20091217125155.A0EBB28ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-sexy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:51:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:51:55 +0000
Subject: [pkgdb] python-sexy: rnovacek has requested commit
Message-ID: <20091217125157.1C8A128ED51@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-sexy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:52:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:52:04 +0000
Subject: [pkgdb] python-sexy: rnovacek has given up watchbugzilla
Message-ID: <20091217125204.C2B4B28ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-sexy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:52:09 +0000
Subject: [pkgdb] python-sexy: rnovacek has given up watchcommits
Message-ID: <20091217125210.1643928ED4C@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-sexy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:52:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:52:13 +0000
Subject: [pkgdb] python-sexy: rnovacek has given up watchcommits
Message-ID: <20091217125214.043F128ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchcommits acl on python-sexy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:52:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:52:17 +0000
Subject: [pkgdb] python-sexy: rnovacek has given up watchbugzilla
Message-ID: <20091217125217.A5E2728ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has given up the watchbugzilla acl on python-sexy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:52:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:52:18 +0000
Subject: [pkgdb] python-sexy: rnovacek has requested commit
Message-ID: <20091217125219.4996428ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-sexy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:52:20 +0000
Subject: [pkgdb] python-sexy: rnovacek has requested commit
Message-ID: <20091217125221.D20A228ED4E@bastion3.fedora.phx2.redhat.com>

rnovacek has requested the commit acl on python-sexy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From pkgdb at fedoraproject.org  Thu Dec 17 12:56:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:56:52 +0000
Subject: [pkgdb] hspell: varekova has given up watchcommits
Message-ID: <20091217125653.701C728ED53@bastion3.fedora.phx2.redhat.com>

varekova has given up the watchcommits acl on hspell (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hspell



From pkgdb at fedoraproject.org  Thu Dec 17 12:56:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:56:54 +0000
Subject: [pkgdb] hspell: varekova has requested approveacls
Message-ID: <20091217125655.6430228ED53@bastion3.fedora.phx2.redhat.com>

varekova has requested the approveacls acl on hspell (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hspell



From pkgdb at fedoraproject.org  Thu Dec 17 12:57:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:57:02 +0000
Subject: [pkgdb] hspell: varekova has requested commit
Message-ID: <20091217125704.BC51B28ED53@bastion3.fedora.phx2.redhat.com>

varekova has requested the commit acl on hspell (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hspell



From pkgdb at fedoraproject.org  Thu Dec 17 12:57:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 12:57:14 +0000
Subject: [pkgdb] hspell: varekova has given up watchbugzilla
Message-ID: <20091217125715.2427F28ED59@bastion3.fedora.phx2.redhat.com>

varekova has given up the watchbugzilla acl on hspell (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hspell



From atkac at fedoraproject.org  Thu Dec 17 12:59:15 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu, 17 Dec 2009 12:59:15 +0000 (UTC)
Subject: rpms/rsh/devel rsh.spec,1.56,1.57
Message-ID: <20091217125916.044DE11C00E6@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/rsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20408

Modified Files:
	rsh.spec 
Log Message:
- include README and BUGS files as documentation (#226379)



Index: rsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- rsh.spec	15 Dec 2009 14:33:45 -0000	1.56
+++ rsh.spec	17 Dec 2009 12:59:15 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp)
 Name: rsh
 Version: 0.17
-Release: 60%{?dist}
+Release: 61%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -189,6 +189,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root,-)
+%doc README BUGS
 %attr(4755,root,root)	%{_bindir}/rcp
 %{_bindir}/rexec
 %attr(4755,root,root)	%{_bindir}/rlogin
@@ -207,6 +208,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Thu Dec 17 2009 Adam Tkac <atkac redhat com> - 0.17-61
+- include README and BUGS files as documentation (#226379)
+
 * Tue Dec 15 2009 Adam Tkac <atkac redhat com> - 0.17-60
 - more merge review related fixes (#226379)
 



From xhorak at fedoraproject.org  Thu Dec 17 12:59:54 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu, 17 Dec 2009 12:59:54 +0000 (UTC)
Subject: rpms/seamonkey/devel .cvsignore, 1.27, 1.28 seamonkey.spec, 1.68,
	1.69 sources, 1.32, 1.33
Message-ID: <20091217125954.F22F611C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20702

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
Update to 2.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	23 Sep 2009 09:08:48 -0000	1.27
+++ .cvsignore	17 Dec 2009 12:59:54 -0000	1.28
@@ -3,3 +3,4 @@ seamonkey-2.0b1-source.tar.bz2
 seamonkey-langpacks-2.0b1-20090724.tar.bz2
 seamonkey-2.0b2.source.tar.bz2
 seamonkey-langpacks-2.0b2-20090923.tar.bz2
+seamonkey-langpacks-2.0.1-20091217.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- seamonkey.spec	27 Oct 2009 15:04:34 -0000	1.68
+++ seamonkey.spec	17 Dec 2009 12:59:54 -0000	1.69
@@ -17,14 +17,14 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.0
-Release:        7%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
 
 Source0:        seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
-Source1:        seamonkey-langpacks-%{version}-20091027.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20091217.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -342,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Thu Dec 17 2009 Jan Horak <jhorak at redhat.com> - 2.0.1-1
+- Update to 2.0.1
+
 * Tue Oct 27 2009 Martin Stransky <stransky at redhat.com> 2.0-7
 - Update to 2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Oct 2009 15:04:34 -0000	1.32
+++ sources	17 Dec 2009 12:59:54 -0000	1.33
@@ -1,2 +1,2 @@
-494608587e3ba4e4cc2e754d95154435  seamonkey-2.0.source.tar.bz2
-91386d040b662051e096ad4441172899  seamonkey-langpacks-2.0-20091027.tar.bz2
+100c67f5dc351af5b9efb02bb375db50  seamonkey-2.0.1.source.tar.bz2
+d2c0e3b2e2e78a66cda1c566eb8ec660  seamonkey-langpacks-2.0.1-20091217.tar.bz2



From thm at fedoraproject.org  Thu Dec 17 13:05:02 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 17 Dec 2009 13:05:02 +0000 (UTC)
Subject: File Markdown-2.0.3.tar.gz uploaded to lookaside cache by thm
Message-ID: <20091217130502.CBF2628ED59@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-markdown:

751e8055be2433dfd1a82e0fb1b12f13  Markdown-2.0.3.tar.gz



From thm at fedoraproject.org  Thu Dec 17 13:05:31 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 17 Dec 2009 13:05:31 +0000 (UTC)
Subject: rpms/python-markdown/devel .cvsignore, 1.4, 1.5 import.log, 1.4,
	1.5 python-markdown.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20091217130531.CF40711C00E6@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22254/devel

Modified Files:
	.cvsignore import.log python-markdown.spec sources 
Log Message:
Update to 2.0.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jul 2009 12:32:06 -0000	1.4
+++ .cvsignore	17 Dec 2009 13:05:31 -0000	1.5
@@ -1 +1 @@
-Markdown-2.0.1.tar.gz
+Markdown-2.0.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	27 Aug 2009 18:01:39 -0000	1.4
+++ import.log	17 Dec 2009 13:05:31 -0000	1.5
@@ -2,3 +2,4 @@ python-markdown-1_7-1_fc9:HEAD:python-ma
 python-markdown-2_0-1_fc10:HEAD:python-markdown-2.0-1.fc10.src.rpm:1240905362
 python-markdown-2_0_1-1_fc11:HEAD:python-markdown-2.0.1-1.fc11.src.rpm:1247315493
 python-markdown-2_0_1-3_fc11:HEAD:python-markdown-2.0.1-3.fc11.src.rpm:1251396032
+python-markdown-2_0_3-1_fc12:HEAD:python-markdown-2.0.3-1.fc12.src.rpm:1261055107


Index: python-markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/python-markdown.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-markdown.spec	27 Aug 2009 18:01:39 -0000	1.7
+++ python-markdown.spec	17 Dec 2009 13:05:31 -0000	1.8
@@ -3,8 +3,8 @@
 %define srcname Markdown
 
 Name:           python-markdown
-Version:        2.0.1
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
 License:        BSD
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0.3-1
+- Update to 2.0.3.
+
 * Thu Aug 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0.1-3
 - Add requirement on python-elementtree, which was a separate package
   before Python 2.5.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jul 2009 12:32:07 -0000	1.4
+++ sources	17 Dec 2009 13:05:31 -0000	1.5
@@ -1 +1 @@
-bfdb2171faeb410d6099653da90b9bf7  Markdown-2.0.1.tar.gz
+751e8055be2433dfd1a82e0fb1b12f13  Markdown-2.0.3.tar.gz



From thm at fedoraproject.org  Thu Dec 17 13:13:07 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 17 Dec 2009 13:13:07 +0000 (UTC)
Subject: rpms/python-markdown/F-12 .cvsignore, 1.4, 1.5 import.log, 1.4,
	1.5 python-markdown.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20091217131307.A18FA11C00E6@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24070/F-12

Modified Files:
	.cvsignore import.log python-markdown.spec sources 
Log Message:
Update to 2.0.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jul 2009 12:32:06 -0000	1.4
+++ .cvsignore	17 Dec 2009 13:13:07 -0000	1.5
@@ -1 +1 @@
-Markdown-2.0.1.tar.gz
+Markdown-2.0.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	27 Aug 2009 18:01:39 -0000	1.4
+++ import.log	17 Dec 2009 13:13:07 -0000	1.5
@@ -2,3 +2,4 @@ python-markdown-1_7-1_fc9:HEAD:python-ma
 python-markdown-2_0-1_fc10:HEAD:python-markdown-2.0-1.fc10.src.rpm:1240905362
 python-markdown-2_0_1-1_fc11:HEAD:python-markdown-2.0.1-1.fc11.src.rpm:1247315493
 python-markdown-2_0_1-3_fc11:HEAD:python-markdown-2.0.1-3.fc11.src.rpm:1251396032
+python-markdown-2_0_3-1_fc12:F-12:python-markdown-2.0.3-1.fc12.src.rpm:1261055494


Index: python-markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/F-12/python-markdown.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-markdown.spec	27 Aug 2009 18:01:39 -0000	1.7
+++ python-markdown.spec	17 Dec 2009 13:13:07 -0000	1.8
@@ -3,8 +3,8 @@
 %define srcname Markdown
 
 Name:           python-markdown
-Version:        2.0.1
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
 License:        BSD
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0.3-1
+- Update to 2.0.3.
+
 * Thu Aug 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0.1-3
 - Add requirement on python-elementtree, which was a separate package
   before Python 2.5.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jul 2009 12:32:07 -0000	1.4
+++ sources	17 Dec 2009 13:13:07 -0000	1.5
@@ -1 +1 @@
-bfdb2171faeb410d6099653da90b9bf7  Markdown-2.0.1.tar.gz
+751e8055be2433dfd1a82e0fb1b12f13  Markdown-2.0.3.tar.gz



From jskala at fedoraproject.org  Thu Dec 17 13:14:17 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu, 17 Dec 2009 13:14:17 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd-2.1.0-configuration.patch, 1.3,
	1.4 vsftpd-2.1.1-daemonize_plus.patch, 1.5, 1.6 vsftpd.spec,
	1.103, 1.104
Message-ID: <20091217131417.38DB411C00E6@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24466

Modified Files:
	vsftpd-2.1.0-configuration.patch 
	vsftpd-2.1.1-daemonize_plus.patch vsftpd.spec 
Log Message:
* Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-2
- corrected two patches due to fuzz 0


vsftpd-2.1.0-configuration.patch:
 EXAMPLE/INTERNET_SITE/README         |    6 +++---
 EXAMPLE/INTERNET_SITE_NOINETD/README |    4 ++--
 EXAMPLE/PER_IP_CONFIG/README         |    4 ++--
 EXAMPLE/VIRTUAL_USERS/README         |   14 +++++++-------
 FAQ                                  |    8 ++++----
 INSTALL                              |   10 +++++-----
 README                               |    5 +++++
 defs.h                               |    2 +-
 tunables.c                           |   10 +++++-----
 vsftpd.8                             |   10 +++++-----
 vsftpd.conf                          |   18 +++++++++++-------
 vsftpd.conf.5                        |   22 +++++++++++-----------
 12 files changed, 61 insertions(+), 52 deletions(-)

Index: vsftpd-2.1.0-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.0-configuration.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vsftpd-2.1.0-configuration.patch	23 Nov 2009 13:37:04 -0000	1.3
+++ vsftpd-2.1.0-configuration.patch	17 Dec 2009 13:14:16 -0000	1.4
@@ -433,7 +433,7 @@ diff -up vsftpd-2.2.0/vsftpd.conf.config
  # You may activate the "-R" option to the builtin ls. This is disabled by
  # default to avoid remote users being able to cause excessive I/O on large
 @@ -112,3 +112,7 @@ listen=YES
- # sockets, you must run two copies of vsftpd whith two configuration files.
+ # sockets, you must run two copies of vsftpd with two configuration files.
  # Make sure, that one of the listen options is commented !!
  #listen_ipv6=YES
 +

vsftpd-2.1.1-daemonize_plus.patch:
 standalone.c |   38 +++++++++++++++++++++++++++++++++++++-
 sysutil.c    |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sysutil.h    |    7 ++++++-
 3 files changed, 102 insertions(+), 2 deletions(-)

Index: vsftpd-2.1.1-daemonize_plus.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.1-daemonize_plus.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vsftpd-2.1.1-daemonize_plus.patch	17 Dec 2009 09:09:05 -0000	1.5
+++ vsftpd-2.1.1-daemonize_plus.patch	17 Dec 2009 13:14:17 -0000	1.6
@@ -105,8 +105,8 @@ diff -up vsftpd-2.1.1/sysutil.c.daemoniz
  vsf_sysutil_fork(void)
  {
 @@ -2807,3 +2816,53 @@ vsf_sysutil_set_no_fds()
- {
-   s_current_pid = -1;
+     s_sig_details[i].pending = 0;
+   }
  }
 +
 +static struct sigaction sigalr, sigusr1;


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- vsftpd.spec	17 Dec 2009 09:09:05 -0000	1.103
+++ vsftpd.spec	17 Dec 2009 13:14:17 -0000	1.104
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-2
+- corrected two patches due to fuzz 0
+
 * Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-1
 - update to latest upstream
 



From rdieter at fedoraproject.org  Thu Dec 17 13:15:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 13:15:25 +0000 (UTC)
Subject: rpms/libassuan/devel libassuan-1.0.5-multilib.patch, NONE,
	1.1 libassuan.spec, 1.32, 1.33 libassuan-1.0.4-multilib.patch,
	1.1, NONE
Message-ID: <20091217131525.131E711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libassuan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24887

Modified Files:
	libassuan.spec 
Added Files:
	libassuan-1.0.5-multilib.patch 
Removed Files:
	libassuan-1.0.4-multilib.patch 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-4
- better versioning for Obsoletes
- better (upstreamable) multilib patch


libassuan-1.0.5-multilib.patch:
 libassuan-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libassuan-1.0.5-multilib.patch ---
diff -up libassuan-1.0.5/src/libassuan-config.in.multilib libassuan-1.0.5/src/libassuan-config.in
--- libassuan-1.0.5/src/libassuan-config.in.multilib	2006-10-09 05:41:47.000000000 -0500
+++ libassuan-1.0.5/src/libassuan-config.in	2009-12-17 07:11:30.688919319 -0600
@@ -132,7 +132,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-    if test "@libdir@" != "/usr/lib" ; then
+    if test "@libdir@" != "/usr/lib" -a "@libdir@" != "/usr/lib32" -a "@libdir@" != "/usr/lib64" ; then
       libdirs="-L at libdir@"
       for i in $lib $extralibs ; do
 	if test "$i" = "-L at libdir@" ; then


Index: libassuan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libassuan.spec	17 Dec 2009 12:45:51 -0000	1.32
+++ libassuan.spec	17 Dec 2009 13:15:24 -0000	1.33
@@ -2,7 +2,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # The library is LGPLv2+, the documentation GPLv3+
 License: LGPLv2+ and GPLv3+
@@ -12,7 +12,7 @@ URL:     http://www.gnupg.org/
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:  libassuan-1.0.4-multilib.patch
+Patch1:  libassuan-1.0.5-multilib.patch
 
 # -debuginfo useless for (only) static libs
 %define debug_package   %{nil}
@@ -30,8 +30,8 @@ Group: Development/Libraries
 Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Obsoletes: %{name}-static < %{version}-%{release}
-Provides:  %{name}-static = %{version}-%{release}
+Obsoletes: libassuan-static < 1.0.3 
+Provides:  libassuan-static = %{version}-%{release}
 %description devel 
 This is the IPC static library used by GnuPG 2, GPGME and a few other
 packages.
@@ -91,6 +91,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-4
+- better versioning for Obsoletes
+- better (upstreamable) multilib patch
+
 * Thu Dec 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.5-3
 - Fix license tag - the documentation is GPLv3+
 


--- libassuan-1.0.4-multilib.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Dec 17 13:23:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 13:23:35 +0000
Subject: [pkgdb] python-sexy had acl change status
Message-ID: <20091217132336.B5E0928ED1C@bastion3.fedora.phx2.redhat.com>

hguemar has set the commit acl on python-sexy (Fedora devel) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-sexy



From dwalsh at fedoraproject.org  Thu Dec 17 13:24:24 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Dec 2009 13:24:24 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.665,1.666
Message-ID: <20091217132424.4168E11C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27090

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-6
- Add setools-libs-python to requires for gui



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.665
retrieving revision 1.666
diff -u -p -r1.665 -r1.666
--- policycoreutils.spec	16 Dec 2009 21:18:04 -0000	1.665
+++ policycoreutils.spec	17 Dec 2009 13:24:23 -0000	1.666
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -189,7 +189,7 @@ Group: System Environment/Base
 Requires: policycoreutils-python = %{version}-%{release} 
 Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: usermode-gtk 
-Requires: setools-console
+Requires: setools-console setools-libs-python
 Requires: selinux-policy
 Requires: python >= 2.6
 BuildRequires: desktop-file-utils
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-6
+- Add setools-libs-python to requires for gui
+
 * Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-5
 - If restorecond running as a user has no files to watch then it should exit.  (NFS Homedirs)
 



From thm at fedoraproject.org  Thu Dec 17 13:34:22 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 17 Dec 2009 13:34:22 +0000 (UTC)
Subject: rpms/python-markdown/EL-5 .cvsignore, 1.4, 1.5 import.log, 1.4,
	1.5 python-markdown.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20091217133422.D904011C00E6@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29266/EL-5

Modified Files:
	.cvsignore import.log python-markdown.spec sources 
Log Message:
Update to 2.0.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jul 2009 12:32:06 -0000	1.4
+++ .cvsignore	17 Dec 2009 13:34:22 -0000	1.5
@@ -1 +1 @@
-Markdown-2.0.1.tar.gz
+Markdown-2.0.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	27 Aug 2009 18:07:45 -0000	1.4
+++ import.log	17 Dec 2009 13:34:22 -0000	1.5
@@ -2,3 +2,4 @@ python-markdown-1_7-1_fc9:HEAD:python-ma
 python-markdown-2_0-1_fc10:HEAD:python-markdown-2.0-1.fc10.src.rpm:1240905362
 python-markdown-2_0_1-1_fc11:HEAD:python-markdown-2.0.1-1.fc11.src.rpm:1247315493
 python-markdown-2_0_1-3_fc11:EL-5:python-markdown-2.0.1-3.fc11.src.rpm:1251396419
+python-markdown-2_0_3-1_fc12:EL-5:python-markdown-2.0.3-1.fc12.src.rpm:1261056821


Index: python-markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/EL-5/python-markdown.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-markdown.spec	27 Aug 2009 18:07:45 -0000	1.7
+++ python-markdown.spec	17 Dec 2009 13:34:22 -0000	1.8
@@ -3,8 +3,8 @@
 %define srcname Markdown
 
 Name:           python-markdown
-Version:        2.0.1
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
 License:        BSD
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0.3-1
+- Update to 2.0.3.
+
 * Thu Aug 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0.1-3
 - Add requirement on python-elementtree, which was a separate package
   before Python 2.5.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jul 2009 12:32:07 -0000	1.4
+++ sources	17 Dec 2009 13:34:22 -0000	1.5
@@ -1 +1 @@
-bfdb2171faeb410d6099653da90b9bf7  Markdown-2.0.1.tar.gz
+751e8055be2433dfd1a82e0fb1b12f13  Markdown-2.0.3.tar.gz



From rdieter at fedoraproject.org  Thu Dec 17 13:36:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 13:36:14 +0000 (UTC)
Subject: rpms/libksba/devel libksba-1.0.6-multilib.patch, NONE,
	1.1 libksba.spec, 1.36, 1.37 libksba-1.0.3-multilib.patch, 1.1, NONE
Message-ID: <20091217133614.6B21C11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libksba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29989

Modified Files:
	libksba.spec 
Added Files:
	libksba-1.0.6-multilib.patch 
Removed Files:
	libksba-1.0.3-multilib.patch 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.6-4
- better (upstreamable) multilib patch
- tighten %files a bit


libksba-1.0.6-multilib.patch:
 ksba-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libksba-1.0.6-multilib.patch ---
diff -up libksba-1.0.6/src/ksba-config.in.multilib libksba-1.0.6/src/ksba-config.in
--- libksba-1.0.6/src/ksba-config.in.multilib	2006-08-31 03:05:24.000000000 -0500
+++ libksba-1.0.6/src/ksba-config.in	2009-12-17 07:17:28.312946199 -0600
@@ -116,7 +116,7 @@ fi
 
 if test "$echo_libs" = "yes"; then
     libdirs=""
-    if test "@libdir@" != "/usr/lib" ; then
+    if test "@libdir@" != "/usr/lib" -a "@libdir@" != "/usr/lib32" -a "@libdir@" != "/usr/lib64" ; then
       libdirs="-L at libdir@"
     fi
     tmp=""


Index: libksba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libksba.spec	10 Aug 2009 09:17:28 -0000	1.36
+++ libksba.spec	17 Dec 2009 13:36:14 -0000	1.37
@@ -2,7 +2,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 1.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv3
 Group:   System Environment/Libraries
@@ -11,8 +11,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libk
 Source1: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# quick-n-dirty hack to ksba-config, TODO: consider using pkgconfig instead
-Patch1: libksba-1.0.3-multilib.patch
+Patch1: libksba-1.0.6-multilib.patch
 
 BuildRequires: gawk
 # >= 1.4 preferred
@@ -86,12 +85,16 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/ksba-config
 %{_libdir}/libksba.so
-%{_includedir}/*
-%{_datadir}/aclocal/*
-%{_infodir}/*
+%{_includedir}/ksba.h
+%{_datadir}/aclocal/ksba.m4
+%{_infodir}/ksba.info*
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.6-4
+- better (upstreamable) multilib patch
+- tighten %%files a bit
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.6-3
 - Convert specfile to UTF-8.
 


--- libksba-1.0.3-multilib.patch DELETED ---



From npajkovs at fedoraproject.org  Thu Dec 17 13:43:26 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Thu, 17 Dec 2009 13:43:26 +0000 (UTC)
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.75,1.76
Message-ID: <20091217134326.CDBC811C00E6@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/lm_sensors/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31480

Modified Files:
	lm_sensors.spec 
Log Message:
Resovles: #226101 - Merge Review: lm_sensors


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- lm_sensors.spec	10 Nov 2009 22:58:02 -0000	1.75
+++ lm_sensors.spec	17 Dec 2009 13:43:26 -0000	1.76
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 3.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.lm-sensors.org/
 Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2
 Source1: lm_sensors.sysconfig
@@ -27,7 +27,7 @@ access and hardware monitoring.
 
 
 %package libs
-Summary: lm_sensors core libraries
+Summary: Lm_sensors core libraries
 Group: System Environment/Libraries
 
 %description libs
@@ -121,10 +121,10 @@ if [ -f /var/lock/subsys/sensors ]; then
 fi
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add lm_sensors
 
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %preun
 if [ $1 = 0 ]; then
@@ -143,7 +143,7 @@ fi
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGES CONTRIBUTORS COPYING doc README*
 %doc prog/init/fancontrol.init prog/init/README.initscripts
 %config(noreplace) %{_sysconfdir}/sensors3.conf
@@ -158,11 +158,11 @@ fi
 %exclude %{_mandir}/man8/sensord.8.gz
 
 %files libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/sensors
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Thu Dec 17 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 3.1.1-7
+- Resovles: #226101 - Merge Review: lm_sensors
+
 * Tue Nov 10 2009 Dennis Gilmore <dennis at ausil.us> - 3.1.1-6
 - remove Excludearch s390 s390x
 



From limb at fedoraproject.org  Thu Dec 17 13:59:58 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Dec 2009 13:59:58 +0000 (UTC)
Subject: File drupal-6.15.tar.gz uploaded to lookaside cache by limb
Message-ID: <20091217135958.3D55328ED0C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for drupal:

43c60bde08d6ea67682a998c2804c357  drupal-6.15.tar.gz



From limb at fedoraproject.org  Thu Dec 17 14:01:12 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Dec 2009 14:01:12 +0000 (UTC)
Subject: rpms/drupal/devel .cvsignore, 1.22, 1.23 drupal.spec, 1.28,
	1.29 sources, 1.23, 1.24
Message-ID: <20091217140112.DD31C11C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2508

Modified Files:
	.cvsignore drupal.spec sources 
Log Message:
6.15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	16 Sep 2009 20:23:43 -0000	1.22
+++ .cvsignore	17 Dec 2009 14:01:12 -0000	1.23
@@ -1 +1 @@
-drupal-6.14.tar.gz
+drupal-6.15.tar.gz


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- drupal.spec	16 Sep 2009 20:23:43 -0000	1.28
+++ drupal.spec	17 Dec 2009 14:01:12 -0000	1.29
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.14
+Version:  6.15
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 6.15-1
+- Update to 6.15, SA-CORE-2009-009.
+
 * Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.14-1
 - Update to 6.14, SA-CORE-2009-008.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	16 Sep 2009 20:23:43 -0000	1.23
+++ sources	17 Dec 2009 14:01:12 -0000	1.24
@@ -1 +1 @@
-014bb453a8d0adb0233c763e40d63859  drupal-6.14.tar.gz
+43c60bde08d6ea67682a998c2804c357  drupal-6.15.tar.gz



From palango at fedoraproject.org  Thu Dec 17 14:08:56 2009
From: palango at fedoraproject.org (palango)
Date: Thu, 17 Dec 2009 14:08:56 +0000 (UTC)
Subject: File webkit-sharp-0.3.tar.bz2 uploaded to lookaside cache by palango
Message-ID: <20091217140856.BE50F28ED1C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for webkit-sharp:

21482f9d5eafb0ef4acc6e790482f934  webkit-sharp-0.3.tar.bz2



From limb at fedoraproject.org  Thu Dec 17 14:09:16 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Dec 2009 14:09:16 +0000 (UTC)
Subject: rpms/drupal/F-11 drupal.spec,1.27,1.28 sources,1.23,1.24
Message-ID: <20091217140916.C6F1411C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4749/F-11

Modified Files:
	drupal.spec sources 
Log Message:
6.15.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-11/drupal.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- drupal.spec	16 Sep 2009 20:27:03 -0000	1.27
+++ drupal.spec	17 Dec 2009 14:09:16 -0000	1.28
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.14
+Version:  6.15
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 6.15-1
+- Update to 6.15, SA-CORE-2009-009.
+
 * Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.14-1
 - Update to 6.14, SA-CORE-2009-008.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	16 Sep 2009 20:27:03 -0000	1.23
+++ sources	17 Dec 2009 14:09:16 -0000	1.24
@@ -1 +1 @@
-014bb453a8d0adb0233c763e40d63859  drupal-6.14.tar.gz
+43c60bde08d6ea67682a998c2804c357  drupal-6.15.tar.gz



From limb at fedoraproject.org  Thu Dec 17 14:09:16 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Dec 2009 14:09:16 +0000 (UTC)
Subject: rpms/drupal/F-10 drupal.spec,1.26,1.27 sources,1.22,1.23
Message-ID: <20091217140916.A00B611C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4749/F-10

Modified Files:
	drupal.spec sources 
Log Message:
6.15.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/drupal.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- drupal.spec	16 Sep 2009 20:27:03 -0000	1.26
+++ drupal.spec	17 Dec 2009 14:09:16 -0000	1.27
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.14
+Version:  6.15
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 6.15-1
+- Update to 6.15, SA-CORE-2009-009.
+
 * Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.14-1
 - Update to 6.14, SA-CORE-2009-008.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	16 Sep 2009 20:27:03 -0000	1.22
+++ sources	17 Dec 2009 14:09:16 -0000	1.23
@@ -1 +1 @@
-014bb453a8d0adb0233c763e40d63859  drupal-6.14.tar.gz
+43c60bde08d6ea67682a998c2804c357  drupal-6.15.tar.gz



From limb at fedoraproject.org  Thu Dec 17 14:09:17 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Dec 2009 14:09:17 +0000 (UTC)
Subject: rpms/drupal/F-12 drupal.spec,1.28,1.29 sources,1.23,1.24
Message-ID: <20091217140917.4151611C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4749/F-12

Modified Files:
	drupal.spec sources 
Log Message:
6.15.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-12/drupal.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- drupal.spec	16 Sep 2009 20:23:43 -0000	1.28
+++ drupal.spec	17 Dec 2009 14:09:16 -0000	1.29
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.14
+Version:  6.15
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 6.15-1
+- Update to 6.15, SA-CORE-2009-009.
+
 * Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.14-1
 - Update to 6.14, SA-CORE-2009-008.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	16 Sep 2009 20:23:43 -0000	1.23
+++ sources	17 Dec 2009 14:09:17 -0000	1.24
@@ -1 +1 @@
-014bb453a8d0adb0233c763e40d63859  drupal-6.14.tar.gz
+43c60bde08d6ea67682a998c2804c357  drupal-6.15.tar.gz



From palango at fedoraproject.org  Thu Dec 17 14:10:49 2009
From: palango at fedoraproject.org (palango)
Date: Thu, 17 Dec 2009 14:10:49 +0000 (UTC)
Subject: rpms/webkit-sharp/devel webkit-sharp-0.3-libdir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 webkit-sharp.spec,
	1.6, 1.7 webkit-dllmap-fix.patch, 1.1,
	NONE webkit-sharp-libdir.patch, 1.1, NONE
Message-ID: <20091217141049.75E3C11C00E6@cvs1.fedora.phx.redhat.com>

Author: palango

Update of /cvs/pkgs/rpms/webkit-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5140

Modified Files:
	.cvsignore sources webkit-sharp.spec 
Added Files:
	webkit-sharp-0.3-libdir.patch 
Removed Files:
	webkit-dllmap-fix.patch webkit-sharp-libdir.patch 
Log Message:
Update to version 0.3


webkit-sharp-0.3-libdir.patch:
 configure       |    2 +-
 configure.ac    |    2 +-
 doc/Makefile.am |    2 +-
 doc/Makefile.in |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE webkit-sharp-0.3-libdir.patch ---
# SourceFucker.pl: Fix hardcoded references to libdir
diff -uraN webkit-sharp-0.3.orig/configure webkit-sharp-0.3/configure
--- webkit-sharp-0.3.orig/configure	2009-10-21 21:54:34.000000000 +0200
+++ webkit-sharp-0.3/configure	2009-12-17 14:45:29.025582798 +0100
@@ -3266,7 +3266,7 @@
    { (exit 1); exit 1; }; }
 fi
 
-GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(prefix)/lib'
+GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(libdir)'
 
 
 
diff -uraN webkit-sharp-0.3.orig/configure.ac webkit-sharp-0.3/configure.ac
--- webkit-sharp-0.3.orig/configure.ac	2009-10-21 21:54:23.000000000 +0200
+++ webkit-sharp-0.3/configure.ac	2009-12-17 14:45:28.830582747 +0100
@@ -76,7 +76,7 @@
 	AC_MSG_ERROR([No gacutil tool found])
 fi
 
-GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(prefix)/lib'
+GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(libdir)'
                                      
 AC_SUBST(RUNTIME)
 AC_SUBST(CSC)
diff -uraN webkit-sharp-0.3.orig/doc/Makefile.am webkit-sharp-0.3/doc/Makefile.am
--- webkit-sharp-0.3.orig/doc/Makefile.am	2009-10-21 21:54:23.000000000 +0200
+++ webkit-sharp-0.3/doc/Makefile.am	2009-12-17 14:45:28.796583031 +0100
@@ -1,6 +1,6 @@
 if ENABLE_MONODOC
 TARGETS = $(ASSEMBLY_NAME)-docs.source $(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree
-docsdir = $(prefix)/lib/monodoc/sources
+docsdir = $(libdir)/monodoc/sources
 docs_DATA = $(TARGETS)
 else
 TARGETS = 
diff -uraN webkit-sharp-0.3.orig/doc/Makefile.in webkit-sharp-0.3/doc/Makefile.in
--- webkit-sharp-0.3.orig/doc/Makefile.in	2009-10-21 21:54:35.000000000 +0200
+++ webkit-sharp-0.3/doc/Makefile.in	2009-12-17 14:45:28.795583126 +0100
@@ -186,7 +186,7 @@
 @ENABLE_MONODOC_FALSE at TARGETS = 
 @ENABLE_MONODOC_TRUE at TARGETS = $(ASSEMBLY_NAME)-docs.source $(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree
 @ENABLE_MONODOC_FALSE at docsdir = $(datadir)
- at ENABLE_MONODOC_TRUE@docsdir = $(prefix)/lib/monodoc/sources
+ at ENABLE_MONODOC_TRUE@docsdir = $(libdir)/monodoc/sources
 @ENABLE_MONODOC_FALSE at docs_DATA = 
 @ENABLE_MONODOC_TRUE at docs_DATA = $(TARGETS)
 ASSEMBLIES = ../sources/$(ASSEMBLY_NAME).dll


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkit-sharp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Feb 2009 00:43:23 -0000	1.2
+++ .cvsignore	17 Dec 2009 14:10:49 -0000	1.3
@@ -1 +1 @@
-webkit-sharp-0.2.tar.bz2
+webkit-sharp-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkit-sharp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Feb 2009 00:43:23 -0000	1.2
+++ sources	17 Dec 2009 14:10:49 -0000	1.3
@@ -1 +1 @@
-8041fba941b7299e432380c86b6dddf8  webkit-sharp-0.2.tar.bz2
+21482f9d5eafb0ef4acc6e790482f934  webkit-sharp-0.3.tar.bz2


Index: webkit-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkit-sharp/devel/webkit-sharp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- webkit-sharp.spec	26 Oct 2009 18:25:48 -0000	1.6
+++ webkit-sharp.spec	17 Dec 2009 14:10:49 -0000	1.7
@@ -1,15 +1,14 @@
 %define		debug_package %{nil}
 
 Name:		webkit-sharp
-Version:	0.2
-Release:	6%{?dist}
+Version:	0.3
+Release:	1%{?dist}
 Summary:	.NET bindings for WebKit
 Group:		Development/Languages
 License:	MIT
 URL:		http://ftp.novell.com/pub/mono/sources/webkit-sharp/
 Source0:	http://ftp.novell.com/pub/mono/sources/webkit-sharp/%{name}-%{version}.tar.bz2
-Patch0:		webkit-sharp-libdir.patch
-Patch1:		webkit-dllmap-fix.patch
+Patch0:		webkit-sharp-0.3-libdir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	webkitgtk
 BuildRequires:	webkitgtk-devel
@@ -36,9 +35,7 @@ Development files for WebKit-sharp
 %setup -q
 
 # patch for libdir madness
-%patch0 -p1 -b webkit-sharp-libdir.patch
-#patch for updated webkit version
-%patch1 -p1 -b webkit-dllmap-fix.patch
+%patch0 -p1 -b .libdir
 
 %build
 %configure
@@ -63,6 +60,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/monodoc/sources/webkit-sharp*
 
 %changelog
+* Thu Dec 17 2009 Paul Lange <palango at gmx.de> - 0.3-1
+- Update to version 0.3
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.2-6
 - build for sparcv9 s390 s390x
 


--- webkit-dllmap-fix.patch DELETED ---


--- webkit-sharp-libdir.patch DELETED ---



From akurtakov at fedoraproject.org  Thu Dec 17 14:12:46 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 17 Dec 2009 14:12:46 +0000 (UTC)
Subject: File org.eclipse.mylyn-R_3_3_1-fetched-src.tar.bz2 uploaded to
	lookaside cache by akurtakov
Message-ID: <20091217141246.BEFA628ED46@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for eclipse-mylyn:

50eb19f39a9b5afb48a85fe705e2b13e  org.eclipse.mylyn-R_3_3_1-fetched-src.tar.bz2



From akurtakov at fedoraproject.org  Thu Dec 17 14:15:54 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 17 Dec 2009 14:15:54 +0000 (UTC)
Subject: rpms/eclipse-mylyn/devel fetch-mylyn.sh, 1.12,
	1.13 eclipse-mylyn.spec, 1.45, 1.46 .cvsignore, 1.11,
	1.12 eclipse-mylyn-addfedoracustomizations.patch, 1.10,
	1.11 sources, 1.14, 1.15
Message-ID: <20091217141554.1E3B511C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7314/devel

Modified Files:
	fetch-mylyn.sh eclipse-mylyn.spec .cvsignore 
	eclipse-mylyn-addfedoracustomizations.patch sources 
Log Message:
Update to 3.3.1.


Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fetch-mylyn.sh	27 Oct 2009 09:25:54 -0000	1.12
+++ fetch-mylyn.sh	17 Dec 2009 14:15:53 -0000	1.13
@@ -74,7 +74,7 @@ org.eclipse.mylyn.cdt-feature \
 org.eclipse.mylyn.cdt.ui \
 ; do
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools \
-export -r R_3_3_0 org.eclipse.mylyn/$f;
+export -r R_3_3_1_e_3_5 org.eclipse.mylyn/$f;
 done
 
-tar cjf org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2 org.eclipse.mylyn
+tar cjf org.eclipse.mylyn-R_3_3_1-fetched-src.tar.bz2 org.eclipse.mylyn


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- eclipse-mylyn.spec	22 Nov 2009 12:47:50 -0000	1.45
+++ eclipse-mylyn.spec	17 Dec 2009 14:15:53 -0000	1.46
@@ -2,7 +2,7 @@
 %define install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
 # http://download.eclipse.org/tools/mylyn/update/e3.5/
-%define qualifier           v20091015-0501-e3x
+%define qualifier           v20091215-0000-e3x
 
 # Prevent brp-java-repack-jars from being run.  Spaces in the paths of
 # the help content are broken by it.
@@ -10,14 +10,14 @@
 
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
-Version: 3.3.0
-Release: 4%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
 # mkdir temp && cd temp
 # sh fetch-mylyn.sh
-Source0: org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2
+Source0: org.eclipse.mylyn-R_3_3_1-fetched-src.tar.bz2
 Source1: fetch-mylyn.sh
 Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.3.zip
 
@@ -337,6 +337,9 @@ rm -rf %{buildroot}
 # FIXME:  add the doc files back
 
 %changelog
+* Thu Dec 17 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.1-1
+- Update to 3.3.1 version.
+
 * Sun Nov 22 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-4
 - Fix build with newer common-codec.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Oct 2009 09:25:54 -0000	1.11
+++ .cvsignore	17 Dec 2009 14:15:53 -0000	1.12
@@ -2,3 +2,4 @@ fedoraeclipse-mylynbugzilla-0.0.3.zip
 org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2
 org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2
 org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2
+org.eclipse.mylyn-R_3_3_1-fetched-src.tar.bz2

eclipse-mylyn-addfedoracustomizations.patch:
 feature.xml |    7 +++++++
 1 file changed, 7 insertions(+)

Index: eclipse-mylyn-addfedoracustomizations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-addfedoracustomizations.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- eclipse-mylyn-addfedoracustomizations.patch	27 Oct 2009 09:25:54 -0000	1.10
+++ eclipse-mylyn-addfedoracustomizations.patch	17 Dec 2009 14:15:53 -0000	1.11
@@ -8,7 +8,7 @@ diff -u -r1.386.2.1 feature.xml
 --- feature.xml	11 Apr 2009 02:13:56 -0000	1.386.2.1
 +++ feature.xml	22 Apr 2009 14:16:52 -0000
 @@ -55,4 +55,11 @@
-          version="3.3.0.qualifier"
+          version="3.3.1.qualifier"
           unpack="false"/>
  
 +   <plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Oct 2009 09:25:54 -0000	1.14
+++ sources	17 Dec 2009 14:15:53 -0000	1.15
@@ -1,2 +1,2 @@
 ccf62375bb3dfe3d0d3bab4323765c5f  fedoraeclipse-mylynbugzilla-0.0.3.zip
-7aea92d0c52b84556723afbaafeb4837  org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2
+50eb19f39a9b5afb48a85fe705e2b13e  org.eclipse.mylyn-R_3_3_1-fetched-src.tar.bz2



From dnovotny at fedoraproject.org  Thu Dec 17 14:26:55 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 17 Dec 2009 14:26:55 +0000 (UTC)
Subject: rpms/logrotate/devel logrotate-3.7.8-readonly.patch, NONE,
	1.1 logrotate.spec, 1.82, 1.83
Message-ID: <20091217142656.097F411C00E6@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/logrotate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10324

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.8-readonly.patch 
Log Message:
fix #545919


logrotate-3.7.8-readonly.patch:
 logrotate.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logrotate-3.7.8-readonly.patch ---
--- logrotate-3.7.8/logrotate.c.readonly	2009-12-09 09:09:10.000000000 -0800
+++ logrotate-3.7.8/logrotate.c	2009-12-09 09:21:37.000000000 -0800
@@ -432,7 +432,7 @@ static int copyTruncate(char *currLog, c
     message(MESS_DEBUG, "copying %s to %s\n", currLog, saveLog);
 
     if (!debug) {
-	if ((fdcurr = open(currLog, O_RDWR)) < 0) {
+	if ((fdcurr = open(currLog, (flags & LOG_FLAG_COPY) ? O_RDONLY : O_RDWR)) < 0) {
 	    message(MESS_ERROR, "error opening %s: %s\n", currLog,
 		    strerror(errno));
 	    return 1;


Index: logrotate.spec
===================================================================
RCS file: /cvs/extras/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- logrotate.spec	29 Sep 2009 13:34:11 -0000	1.82
+++ logrotate.spec	17 Dec 2009 14:26:55 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
@@ -9,6 +9,7 @@ Patch1: logrotate-3.7.7-curdir2.patch
 Patch2: logrotate-3.7.7-toolarge.patch
 Patch3: logrotate-3.7.8-devnull.patch
 Patch4: logrotate-3.7.8-man5.patch
+Patch5: logrotate-3.7.8-readonly.patch
 
 Requires: coreutils >= 5.92 libsepol libselinux popt
 BuildRequires: libselinux-devel popt-devel
@@ -31,6 +32,7 @@ log files on your system.
 %patch2 -p1 -b .toolarge
 %patch3 -p1 -b .devnull
 %patch4 -p1 -b .man5
+%patch5 -p1 -b .readonly
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Wed Dec 09 2009 Henrique Martins <bugzilla-redhat-2009 at martins.cc> 3.7.8-6
+- fix #545919 (rotate non-writable files when copy is set)
+
 * Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 3.7.8-5
 - fix #525659 (man page for logrotate.conf)
 



From tmraz at fedoraproject.org  Thu Dec 17 14:29:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 17 Dec 2009 14:29:19 +0000 (UTC)
Subject: File Linux-PAM-1.1.1.tar.bz2 uploaded to lookaside cache by tmraz
Message-ID: <20091217142919.8090C28ECEE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for pam:

9b3d952b173d5b9836cbc7e8de108bee  Linux-PAM-1.1.1.tar.bz2



From tmraz at fedoraproject.org  Thu Dec 17 14:29:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 17 Dec 2009 14:29:39 +0000 (UTC)
Subject: rpms/pam/devel Linux-PAM-1.1.1.tar.bz2.sign, NONE, 1.1 .cvsignore, 
	1.56, 1.57 pam.spec, 1.206, 1.207 sources, 1.58,
	1.59 Linux-PAM-1.1.0.tar.bz2.sign, 1.1,
	NONE pam-1.1.0-cracklib-authtok.patch, 1.2,
	NONE pam-1.1.0-xauth-context.patch, 1.1, NONE
Message-ID: <20091217142939.C127D11C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11030

Modified Files:
	.cvsignore pam.spec sources 
Added Files:
	Linux-PAM-1.1.1.tar.bz2.sign 
Removed Files:
	Linux-PAM-1.1.0.tar.bz2.sign pam-1.1.0-cracklib-authtok.patch 
	pam-1.1.0-xauth-context.patch 
Log Message:
* Thu Dec 17 2009 Tomas Mraz <tmraz at redhat.com> 1.1.1-1
- new upstream version with minor changes



--- NEW FILE Linux-PAM-1.1.1.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLKOWYyGugalF9Dw4RAqYlAJ9st1NRPyZjWFD+Pl+7ifeiDcDTAwCfeyt7
l6BKIgA/0NQzw+md5nFXVy4=
=Kxq6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	24 Jun 2009 07:09:20 -0000	1.56
+++ .cvsignore	17 Dec 2009 14:29:39 -0000	1.57
@@ -1,4 +1,4 @@
 *.src.rpm
 *.tar.bz2
 pam-redhat-0.99.10-1.tar.bz2
-Linux-PAM-1.1.0.tar.bz2
+Linux-PAM-1.1.1.tar.bz2


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- pam.spec	2 Nov 2009 07:56:12 -0000	1.206
+++ pam.spec	17 Dec 2009 14:29:39 -0000	1.207
@@ -2,8 +2,8 @@
 
 Summary: An extensible library which provides authentication for applications
 Name: pam
-Version: 1.1.0
-Release: 7%{?dist}
+Version: 1.1.1
+Release: 1%{?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+,
 License: BSD and GPLv2+
@@ -23,10 +23,8 @@ Source13: config-util.5
 Source14: 90-nproc.conf
 Patch1:  pam-1.0.90-redhat-modules.patch
 Patch2:  pam-1.0.91-std-noclose.patch
-Patch3:  pam-1.1.0-cracklib-authtok.patch
 Patch4:  pam-1.1.0-console-nochmod.patch
 Patch5:  pam-1.1.0-notally.patch
-Patch6:  pam-1.1.0-xauth-context.patch
 Patch7:  pam-1.1.0-console-fixes.patch
 
 %define _sbindir /sbin
@@ -90,10 +88,8 @@ mv pam-redhat-%{pam_redhat_version}/* mo
 
 %patch1 -p1 -b .redhat-modules
 %patch2 -p1 -b .std-noclose
-%patch3 -p1 -b .authtok
 %patch4 -p1 -b .nochmod
 %patch5 -p1 -b .notally
-%patch6 -p1 -b .xauth-context
 %patch7 -p1 -b .console-fixes
 
 libtoolize -f
@@ -180,7 +176,7 @@ install -m755 -d $RPM_BUILD_ROOT/lib/sec
 for dir in modules/pam_* ; do
 if [ -d ${dir} ] ; then
 %if ! %{WITH_SELINUX}
-        [ ${dir} = "modules/pam_selinux" ] && continue
+	[ ${dir} = "modules/pam_selinux" ] && continue
 %endif
 	[ ${dir} = "modules/pam_tally" ] && continue
 	if ! ls -1 $RPM_BUILD_ROOT%{_moduledir}/`basename ${dir}`*.so ; then
@@ -327,6 +323,9 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Thu Dec 17 2009 Tomas Mraz <tmraz at redhat.com> 1.1.1-1
+- new upstream version with minor changes
+
 * Mon Nov  2 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-7
 - pam_console: fix memory corruption when executing handlers (patch by
   Stas Sergeev) and a few more fixes in the handler execution code (#532302)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	24 Jun 2009 07:09:21 -0000	1.58
+++ sources	17 Dec 2009 14:29:39 -0000	1.59
@@ -1,2 +1,2 @@
 c115640346a987356f6b76ec1d425185  pam-redhat-0.99.10-1.tar.bz2
-9cda791c827dfcd9f2888caf0a64cc4a  Linux-PAM-1.1.0.tar.bz2
+9b3d952b173d5b9836cbc7e8de108bee  Linux-PAM-1.1.1.tar.bz2


--- Linux-PAM-1.1.0.tar.bz2.sign DELETED ---


--- pam-1.1.0-cracklib-authtok.patch DELETED ---


--- pam-1.1.0-xauth-context.patch DELETED ---



From corsepiu at fedoraproject.org  Thu Dec 17 14:36:29 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu, 17 Dec 2009 14:36:29 +0000 (UTC)
Subject: File File-Find-Rule-0.32.tar.gz uploaded to lookaside cache by
	corsepiu
Message-ID: <20091217143629.36D1428ED4D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-File-Find-Rule:

1b43810c6b8fd4ee5cee8046e1e05ff4  File-Find-Rule-0.32.tar.gz



From corsepiu at fedoraproject.org  Thu Dec 17 14:38:11 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu, 17 Dec 2009 14:38:11 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule/devel .cvsignore, 1.4,
	1.5 perl-File-Find-Rule.spec, 1.13, 1.14 sources, 1.4, 1.5
Message-ID: <20091217143811.99D4311C00E6@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12924/devel

Modified Files:
	.cvsignore perl-File-Find-Rule.spec sources 
Log Message:
* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.32-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jun 2006 01:18:14 -0000	1.4
+++ .cvsignore	17 Dec 2009 14:38:11 -0000	1.5
@@ -1 +1 @@
-File-Find-Rule-0.30.tar.gz
+File-Find-Rule-0.32.tar.gz


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.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-File-Find-Rule.spec	7 Dec 2009 02:21:53 -0000	1.13
+++ perl-File-Find-Rule.spec	17 Dec 2009 14:38:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name: 		perl-File-Find-Rule
-Version: 	0.30
-Release: 	9%{?dist}
+Version: 	0.32
+Release: 	1%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -50,6 +50,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.32-1
+- Upstream update.
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.30-9
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jun 2006 01:18:14 -0000	1.4
+++ sources	17 Dec 2009 14:38:11 -0000	1.5
@@ -1 +1 @@
-1acbafde554fda561d3830821085d3a9  File-Find-Rule-0.30.tar.gz
+1b43810c6b8fd4ee5cee8046e1e05ff4  File-Find-Rule-0.32.tar.gz



From corsepiu at fedoraproject.org  Thu Dec 17 14:38:11 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu, 17 Dec 2009 14:38:11 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule/F-12 .cvsignore, 1.4,
	1.5 perl-File-Find-Rule.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <20091217143811.EB2B711C00E6@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12924/F-12

Modified Files:
	.cvsignore perl-File-Find-Rule.spec sources 
Log Message:
* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.32-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jun 2006 01:18:14 -0000	1.4
+++ .cvsignore	17 Dec 2009 14:38:11 -0000	1.5
@@ -1 +1 @@
-File-Find-Rule-0.30.tar.gz
+File-Find-Rule-0.32.tar.gz


Index: perl-File-Find-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/F-12/perl-File-Find-Rule.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-File-Find-Rule.spec	26 Jul 2009 05:59:20 -0000	1.12
+++ perl-File-Find-Rule.spec	17 Dec 2009 14:38:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name: 		perl-File-Find-Rule
-Version: 	0.30
-Release: 	8%{?dist}
+Version: 	0.32
+Release: 	1%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -50,6 +50,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.32-1
+- Upstream update.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jun 2006 01:18:14 -0000	1.4
+++ sources	17 Dec 2009 14:38:11 -0000	1.5
@@ -1 +1 @@
-1acbafde554fda561d3830821085d3a9  File-Find-Rule-0.30.tar.gz
+1b43810c6b8fd4ee5cee8046e1e05ff4  File-Find-Rule-0.32.tar.gz



From corsepiu at fedoraproject.org  Thu Dec 17 14:38:11 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu, 17 Dec 2009 14:38:11 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule/F-11 .cvsignore, 1.4,
	1.5 perl-File-Find-Rule.spec, 1.11, 1.12 sources, 1.4, 1.5
Message-ID: <20091217143811.B868C11C018B@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12924/F-11

Modified Files:
	.cvsignore perl-File-Find-Rule.spec sources 
Log Message:
* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.32-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jun 2006 01:18:14 -0000	1.4
+++ .cvsignore	17 Dec 2009 14:38:11 -0000	1.5
@@ -1 +1 @@
-File-Find-Rule-0.30.tar.gz
+File-Find-Rule-0.32.tar.gz


Index: perl-File-Find-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/F-11/perl-File-Find-Rule.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-File-Find-Rule.spec	26 Feb 2009 16:09:42 -0000	1.11
+++ perl-File-Find-Rule.spec	17 Dec 2009 14:38:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		perl-File-Find-Rule
-Version: 	0.30
-Release: 	7%{?dist}
+Version: 	0.32
+Release: 	1%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -50,6 +50,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 14 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.32-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jun 2006 01:18:14 -0000	1.4
+++ sources	17 Dec 2009 14:38:11 -0000	1.5
@@ -1 +1 @@
-1acbafde554fda561d3830821085d3a9  File-Find-Rule-0.30.tar.gz
+1b43810c6b8fd4ee5cee8046e1e05ff4  File-Find-Rule-0.32.tar.gz



From limb at fedoraproject.org  Thu Dec 17 14:38:41 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Dec 2009 14:38:41 +0000 (UTC)
Subject: File drupal-5.21.tar.gz uploaded to lookaside cache by limb
Message-ID: <20091217143841.E918328ED64@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for drupal:

1efb86c2457f02cd40a976e1382d03bb  drupal-5.21.tar.gz



From dwalsh at fedoraproject.org  Thu Dec 17 14:39:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Dec 2009 14:39:32 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-po.patch, 1.58,
	1.59 policycoreutils-rhat.patch, 1.455,
	1.456 policycoreutils-sepolgen.patch, 1.29,
	1.30 policycoreutils.spec, 1.658, 1.659
Message-ID: <20091217143932.362DE11C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13424

Modified Files:
	policycoreutils-po.patch policycoreutils-rhat.patch 
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-6
- Add setools-libs-python to requires for gui


policycoreutils-po.patch:
 Makefile            |   27 
 POTFILES            |   28 
 POTFILES.in         |    2 
 af.po               | 2499 +++++++++++++++++++++++++---
 am.po               | 2499 +++++++++++++++++++++++++---
 ar.po               | 2499 +++++++++++++++++++++++++---
 as.po               | 3775 +++++++++++++++++++++++++-----------------
 be.po               | 2499 +++++++++++++++++++++++++---
 bg.po               | 3670 ++++++++++++++++++++++++-----------------
 bn.po               | 2499 +++++++++++++++++++++++++---
 bn_IN.po            | 4080 ++++++++++++++++++++++++++-------------------
 bs.po               | 2591 ++++++++++++++++++++++++++---
 ca.po               | 3027 +++++++++++++++++++++++++++++-----
 cs.po               | 2926 +++++++++++++++++++++++++++-----
 cy.po               | 2499 +++++++++++++++++++++++++---
 da.po               | 3206 ++++++++++++++++++++++++++++++------
 de.po               | 3983 +++++++++++++++++++++++++-------------------
 el.po               | 2830 ++++++++++++++++++++++++++++---
 en_GB.po            | 2590 ++++++++++++++++++++++++++---
 es.po               | 4095 ++++++++++++++++++++++++++--------------------
 et.po               | 2497 +++++++++++++++++++++++++---
 eu_ES.po            | 2499 +++++++++++++++++++++++++---
 fa.po               | 2499 +++++++++++++++++++++++++---
 fi.po               | 3254 +++++++++++++++++++++++++++++++-----
 fr.po               | 3923 ++++++++++++++++++++++++++------------------
 gl.po               | 2497 +++++++++++++++++++++++++---
 gu.po               | 4160 ++++++++++++++++++++++++++--------------------
 he.po               | 2499 +++++++++++++++++++++++++---
 hi.po               | 4175 ++++++++++++++++++++++++++--------------------
 hr.po               | 3105 +++++++++++++++++++++++-----------
 hu.po               | 3052 +++++++++++++++++++++++++++++-----
 hy.po               | 2499 +++++++++++++++++++++++++---
 id.po               | 2497 +++++++++++++++++++++++++---
 is.po               | 2499 +++++++++++++++++++++++++---
 it.po               | 4196 ++++++++++++++++++++++++++---------------------
 ja.po               | 4183 ++++++++++++++++++++++++++---------------------
 ka.po               | 2499 +++++++++++++++++++++++++---
 kn.po               | 4621 ++++++++++++++++++++++++++++++++--------------------
 ko.po               | 2991 +++++++++++++++++++++++++++------
 ku.po               | 2499 +++++++++++++++++++++++++---
 lo.po               | 2499 +++++++++++++++++++++++++---
 lt.po               | 2499 +++++++++++++++++++++++++---
 lv.po               | 2499 +++++++++++++++++++++++++---
 mai.po              | 3527 +++++++++++++++++++++++++++++++++++++++
 mk.po               | 2593 ++++++++++++++++++++++++++---
 ml.po               | 4276 +++++++++++++++++++++++++++---------------------
 mr.po               | 4219 +++++++++++++++++++++++++++--------------------
 ms.po               | 2574 +++++++++++++++++++++++++---
 my.po               | 2499 +++++++++++++++++++++++++---
 nb.po               | 2539 +++++++++++++++++++++++++---
 nl.po               | 3028 +++++++++++++++++++++++++++-------
 nn.po               | 2499 +++++++++++++++++++++++++---
 no.po               | 1272 --------------
 nso.po              | 2499 +++++++++++++++++++++++++---
 or.po               | 4031 ++++++++++++++++++++++++++-------------------
 pa.po               | 4101 ++++++++++++++++++++++++++--------------------
 pl.po               | 4116 ++++++++++++++++++++++++++--------------------
 policycoreutils.pot | 2499 +++++++++++++++++++++++++---
 pt.po               | 4467 ++++++++++++++++++++++++++++----------------------
 pt_BR.po            | 4543 +++++++++++++++++++++++++++++----------------------
 ro.po               | 2499 +++++++++++++++++++++++++---
 ru.po               | 3508 ++++++++++++++++++++++++++-------------
 si.po               | 2499 +++++++++++++++++++++++++---
 sk.po               | 2592 ++++++++++++++++++++++++++---
 sl.po               | 2499 +++++++++++++++++++++++++---
 sq.po               | 2499 +++++++++++++++++++++++++---
 sr.po               | 4211 ++++++++++++++++++++++++++---------------------
 sr at latin.po         | 4221 +++++++++++++++++++++++++++--------------------
 sv.po               | 3267 +++++++++++++++++++++++++-----------
 ta.po               | 3588 ++++++++++++++++++++++++++--------------
 te.po               | 4060 ++++++++++++++++++++++++++-------------------
 th.po               | 2499 +++++++++++++++++++++++++---
 tr.po               | 2499 +++++++++++++++++++++++++---
 uk.po               | 2592 ++++++++++++++++++++++++++---
 ur.po               | 2499 +++++++++++++++++++++++++---
 vi.po               | 2499 +++++++++++++++++++++++++---
 zh_CN.po            | 3954 +++++++++++++++++++++++++-------------------
 zh_TW.po            | 4234 ++++++++++++++++++++++++++---------------------
 zu.po               | 2499 +++++++++++++++++++++++++---
 79 files changed, 177766 insertions(+), 58199 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.58 -r 1.59 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-po.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- policycoreutils-po.patch	16 Oct 2009 13:37:53 -0000	1.58
+++ policycoreutils-po.patch	17 Dec 2009 14:39:22 -0000	1.59
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.74/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.78/po/af.po
 --- nsapolicycoreutils/po/af.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/af.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/af.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3112,9 +3112,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.74/po/am.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.78/po/am.po
 --- nsapolicycoreutils/po/am.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/am.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/am.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -6226,9 +6226,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.74/po/ar.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.78/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/ar.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/ar.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -9340,9 +9340,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.74/po/as.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.78/po/as.po
 --- nsapolicycoreutils/po/as.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/as.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/as.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,23 +1,23 @@
 -# translation of as.po to Assamese
 +# translation of policycoreutils.HEAD.po to Assamese
@@ -14080,9 +14080,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "MLS/\n"
 -#~ "MCS Level"
 -#~ msgstr "????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.74/po/be.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.78/po/be.po
 --- nsapolicycoreutils/po/be.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/be.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/be.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -17194,9 +17194,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.74/po/bg.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.78/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/bg.po	2009-10-15 10:54:34.000000000 -0400
++++ policycoreutils-2.0.78/po/bg.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -21859,9 +21859,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "??????? ????????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.74/po/bn_IN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.78/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/bn_IN.po	2009-10-15 10:54:35.000000000 -0400
++++ policycoreutils-2.0.78/po/bn_IN.po	2009-12-08 17:05:49.000000000 -0500
 @@ -9,10 +9,10 @@
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD\n"
@@ -26709,9 +26709,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "Enforcing\n"
 -#~ "Permissive\n"
 -#~ "Disabled\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.74/po/bn.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.78/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/bn.po	2009-10-15 10:54:35.000000000 -0400
++++ policycoreutils-2.0.78/po/bn.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -29823,9 +29823,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.74/po/bs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.78/po/bs.po
 --- nsapolicycoreutils/po/bs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/bs.po	2009-10-15 10:54:35.000000000 -0400
++++ policycoreutils-2.0.78/po/bs.po	2009-12-08 17:05:49.000000000 -0500
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: bs\n"
@@ -33057,9 +33057,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "Zahtijeva vrijednost"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.74/po/ca.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.78/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/ca.po	2009-10-15 10:54:35.000000000 -0400
++++ policycoreutils-2.0.78/po/ca.po	2009-12-08 17:05:49.000000000 -0500
 @@ -5,6 +5,8 @@
  #
  # Josep Puigdemont Casamaj? <josep.puigdemont at gmail.com>, 2006.
@@ -36727,9 +36727,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr "Error en les opcions: %s "
 +#~ msgid "Sensitvity Level"
 +#~ msgstr "Nivell de sensibilitat"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.74/po/cs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.78/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/cs.po	2009-10-15 10:54:36.000000000 -0400
++++ policycoreutils-2.0.78/po/cs.po	2009-12-08 17:05:49.000000000 -0500
 @@ -9,7 +9,7 @@
  msgstr ""
  "Project-Id-Version: cs\n"
@@ -40451,9 +40451,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ msgid "<b>Device number:</b>"
  #~ msgstr "<b>??slo za??zen?:</b>"
  
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.74/po/cy.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.78/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/cy.po	2009-10-15 10:54:36.000000000 -0400
++++ policycoreutils-2.0.78/po/cy.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -43565,9 +43565,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.74/po/da.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.78/po/da.po
 --- nsapolicycoreutils/po/da.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/da.po	2009-10-15 10:54:36.000000000 -0400
++++ policycoreutils-2.0.78/po/da.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,24 +1,25 @@
 -# translation of da.po to
 -# Danish messages for policycoreutils.
@@ -47545,9 +47545,9 @@ diff --exclude-from=exclude -N -u -r nsa
  #~ "skal du k?re \n"
  #~ "\n"
  #~ "semodule -i %s.pp\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.74/po/de.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.78/po/de.po
 --- nsapolicycoreutils/po/de.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/de.po	2009-10-15 10:54:36.000000000 -0400
++++ policycoreutils-2.0.78/po/de.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,28 +1,30 @@
 -# translation of policycoreutils.HEAD.de.po to German
 +# translation of policycoreutils.HEAD.de.po to
@@ -52652,150 +52652,147 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgid "SELinux user '%s' is required"
 -#~ msgstr "SELinux-Benutzer '%s' wird ben?tigt"
 +#~ msgstr "Sensitivit?tsstufe"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-2.0.74/po/el.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-2.0.78/po/el.po
 --- nsapolicycoreutils/po/el.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/el.po	2009-10-15 10:54:36.000000000 -0400
-@@ -8,7 +8,7 @@
++++ policycoreutils-2.0.78/po/el.po	2009-12-16 08:18:26.000000000 -0500
+@@ -8,15 +8,15 @@
  msgstr ""
  "Project-Id-Version: el\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2009-06-24 10:53-0400\n"
-+"POT-Creation-Date: 2009-10-15 10:54-0400\n"
- "PO-Revision-Date: 2006-09-18 14:49+0100\n"
- "Last-Translator: Dimitris Glezos <dimitris at glezos.com>\n"
+-"PO-Revision-Date: 2006-09-18 14:49+0100\n"
+-"Last-Translator: Dimitris Glezos <dimitris at glezos.com>\n"
++"POT-Creation-Date: 2009-01-21 17:13-0500\n"
++"PO-Revision-Date: 2009-10-22 01:32+0200\n"
++"Last-Translator: nikosCharonitakis <nikosx at gmail.com>\n"
  "Language-Team: Greek <fedora-trans-el at redhat.com>\n"
-@@ -80,11 +80,11 @@
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
[...4125 lines suppressed...]
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.74/po/si.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.78/po/si.po
 --- nsapolicycoreutils/po/si.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/si.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/si.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -228140,9 +228491,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.74/po/sk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.78/po/sk.po
 --- nsapolicycoreutils/po/sk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sk.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/sk.po	2009-12-08 17:05:49.000000000 -0500
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -231375,9 +231726,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "Po?aduje hodnotu"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.74/po/sl.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.78/po/sl.po
 --- nsapolicycoreutils/po/sl.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sl.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/sl.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -234489,9 +234840,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.74/po/sq.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.78/po/sq.po
 --- nsapolicycoreutils/po/sq.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sq.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/sq.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -237603,9 +237954,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.74/po/sr at latin.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.78/po/sr at latin.po
 --- nsapolicycoreutils/po/sr at latin.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sr at latin.po	2009-10-15 10:54:45.000000000 -0400
++++ policycoreutils-2.0.78/po/sr at latin.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian(Latin) translations for policycoreutils
@@ -242583,9 +242934,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "Primoravanje\n"
 -#~ "Dopu?tanje\n"
 -#~ "Isklju?eno\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.74/po/sr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.78/po/sr.po
 --- nsapolicycoreutils/po/sr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sr.po	2009-10-15 10:54:46.000000000 -0400
++++ policycoreutils-2.0.78/po/sr.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian translations for policycoreutils
@@ -247555,9 +247906,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "???????????\n"
 -#~ "?????????\n"
 -#~ "?????????\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.74/po/sv.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.78/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/sv.po	2009-10-15 10:54:46.000000000 -0400
++++ policycoreutils-2.0.78/po/sv.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,16 +1,18 @@
  # Swedish messages for policycoreutils.
 -# Copyright ? 2001-2008 Free Software Foundation, Inc.
@@ -251747,9 +252098,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr "Flaggfel: %s "
 +#~ msgid "Sensitvity Level"
 +#~ msgstr "K?nslighetsniv?"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.74/po/ta.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.78/po/ta.po
 --- nsapolicycoreutils/po/ta.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/ta.po	2009-10-15 10:54:46.000000000 -0400
++++ policycoreutils-2.0.78/po/ta.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,28 +1,23 @@
 -# translation of ta.po to Tamil
 +# translation of policycoreutils.HEAD.ta.po to Tamil
@@ -256147,9 +256498,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr ""
 -#~ "MLS/\n"
 -#~ "MCS ????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.74/po/te.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.78/po/te.po
 --- nsapolicycoreutils/po/te.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/te.po	2009-10-15 10:54:46.000000000 -0400
++++ policycoreutils-2.0.78/po/te.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,14 +1,14 @@
 -# translation of new_policycoreutils.HEAD.te.po to Telugu
 +# translation of policycoreutils.HEAD.te.po to Telugu
@@ -260993,9 +261344,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ "???????\n"
 -#~ "????????\n"
 -#~ "????????\n"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.74/po/th.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.78/po/th.po
 --- nsapolicycoreutils/po/th.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/th.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/th.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -264107,9 +264458,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.74/po/tr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.78/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/tr.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/tr.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -267221,9 +267572,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.74/po/uk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.78/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/uk.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/uk.po	2009-12-08 17:05:49.000000000 -0500
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -270456,9 +270807,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #~ msgid "Requires value"
  #~ msgstr "???????? ??????? ????????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.74/po/ur.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.78/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/ur.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/ur.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -273570,9 +273921,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.74/po/vi.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.78/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/vi.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/vi.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -276684,9 +277035,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.74/po/zh_CN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.78/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/zh_CN.po	2009-10-15 10:54:47.000000000 -0400
++++ policycoreutils-2.0.78/po/zh_CN.po	2009-12-08 17:05:49.000000000 -0500
 @@ -3,13 +3,13 @@
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
  #
@@ -281417,9 +281768,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -
 -#~ msgid "SELinux user '%s' is required"
 -#~ msgstr "SELinux ?? '%s' ????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.74/po/zh_TW.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.78/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/zh_TW.po	2009-10-15 10:54:48.000000000 -0400
++++ policycoreutils-2.0.78/po/zh_TW.po	2009-12-08 17:05:49.000000000 -0500
 @@ -1,19 +1,19 @@
 -# translation of policycoreutils.HEAD.po to Traditional Chinese
 +# translation of policycoreutils.HEAD.po to
@@ -286413,9 +286764,9 @@ diff --exclude-from=exclude -N -u -r nsa
 -#~ msgstr ""
 -#~ "tcp\n"
 -#~ "udp"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.74/po/zu.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.78/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/zu.po	2009-10-15 10:54:48.000000000 -0400
++++ policycoreutils-2.0.78/po/zu.po	2009-12-08 17:05:49.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   59 +--
 restorecond/Makefile                        |   24 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.8                   |   15 
 restorecond/restorecond.c                   |  429 +++++-----------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 +
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  239 +++++++++++++++
 restorecond/watch.c                         |  260 ++++++++++++++++
 sandbox/Makefile                            |   31 ++
 sandbox/deliverables/README                 |   32 ++
 sandbox/deliverables/basicwrapper           |    4 
 sandbox/deliverables/run-in-sandbox.py      |   49 +++
 sandbox/deliverables/sandbox                |  216 ++++++++++++++
 sandbox/sandbox                             |  272 +++++++++++++++++
 sandbox/sandbox.8                           |   39 ++
 sandbox/sandboxX.sh                         |   16 +
 sandbox/seunshare.c                         |  265 +++++++++++++++++
 semanage/semanage                           |  122 ++++++-
 semanage/seobject.py                        |  397 ++++++++++++++++++++-----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 +++
 setfiles/restore.c                          |   73 ++++
 setfiles/restore.h                          |    3 
 setfiles/restorecon.8                       |    7 
 setfiles/setfiles.8                         |    3 
 setfiles/setfiles.c                         |   73 ----
 31 files changed, 2149 insertions(+), 581 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -p -r1.455 -r1.456
--- policycoreutils-rhat.patch	9 Dec 2009 21:34:45 -0000	1.455
+++ policycoreutils-rhat.patch	17 Dec 2009 14:39:29 -0000	1.456
@@ -140,7 +140,7 @@ diff --exclude-from=exclude --exclude=se
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.78/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/Makefile	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/Makefile	2009-12-16 08:16:15.000000000 -0500
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -189,14 +189,14 @@ diff --exclude-from=exclude --exclude=se
  	/sbin/restorecon $(SBINDIR)/restorecond 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/org.selinux.Restorecond.service	2009-12-16 08:16:16.000000000 -0500
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.78/restorecond/restorecond.8
 --- nsapolicycoreutils/restorecond/restorecond.8	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.8	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.8	2009-12-16 08:16:16.000000000 -0500
 @@ -3,7 +3,7 @@
  restorecond \- daemon that watches for file creation and then sets the default SELinux file context
  
@@ -233,7 +233,7 @@ diff --exclude-from=exclude --exclude=se
  .BR restorecon (8),
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.78/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.c	2009-12-09 16:29:18.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.c	2009-12-16 08:16:17.000000000 -0500
 @@ -30,9 +30,11 @@
   * and makes sure that there security context matches the systems defaults
   *
@@ -670,7 +670,7 @@ diff --exclude-from=exclude --exclude=se
  
  	/* Register sighandlers */
  	sa.sa_flags = 0;
-@@ -467,38 +174,59 @@
+@@ -467,38 +174,60 @@
  
  	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
  
@@ -679,6 +679,7 @@ diff --exclude-from=exclude --exclude=se
 -		exitApp("inotify_init");
 -
 -	while ((opt = getopt(argc, argv, "dv")) > 0) {
++	exclude_non_seclabel_mounts();
 +	atexit( done );
 +	while ((opt = getopt(argc, argv, "df:uv")) > 0) {
  		switch (opt) {
@@ -741,7 +742,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.78/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.conf	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.conf	2009-12-16 08:16:18.000000000 -0500
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -754,7 +755,7 @@ diff --exclude-from=exclude --exclude=se
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.78/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/restorecond.desktop	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.desktop	2009-12-16 08:16:19.000000000 -0500
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -765,8 +766,8 @@ diff --exclude-from=exclude --exclude=se
 +StartupNotify=false
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.78/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.h	2009-12-08 17:05:49.000000000 -0500
-@@ -24,7 +24,21 @@
++++ policycoreutils-2.0.78/restorecond/restorecond.h	2009-12-16 08:16:20.000000000 -0500
+@@ -24,7 +24,22 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
  
@@ -788,11 +789,12 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_add(int inotify_fd, const char *path);
 +extern int watch_list_find(int wd, const char *file);
 +extern void watch_list_free(int fd);
++extern int watch_list_isempty();
  
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.78/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.78/restorecond/restorecond.init	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond.init	2009-12-16 08:16:21.000000000 -0500
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -814,14 +816,14 @@ diff --exclude-from=exclude --exclude=se
 -
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.78/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/restorecond_user.conf	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/restorecond/restorecond_user.conf	2009-12-16 08:16:22.000000000 -0500
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.78/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/user.c	2009-12-08 17:05:49.000000000 -0500
-@@ -0,0 +1,237 @@
++++ policycoreutils-2.0.78/restorecond/user.c	2009-12-16 08:16:24.000000000 -0500
+@@ -0,0 +1,239 @@
 +/*
 + * restorecond
 + *
@@ -1046,6 +1048,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +    read_config(master_fd, watch_file);
 +    
++    if (watch_list_isempty()) return 0;
++
 +    set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
 +    
 +    GIOChannel *c = g_io_channel_unix_new(master_fd);
@@ -1061,8 +1065,8 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.78/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/restorecond/watch.c	2009-12-09 16:31:48.000000000 -0500
-@@ -0,0 +1,254 @@
++++ policycoreutils-2.0.78/restorecond/watch.c	2009-12-16 08:16:27.000000000 -0500
+@@ -0,0 +1,260 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
 +#include <errno.h>
@@ -1099,6 +1103,9 @@ diff --exclude-from=exclude --exclude=se
 +};
 +struct watchList *firstDir = NULL;
 +
++int watch_list_isempty() {
++	return firstDir == NULL;
++}
 +
 +void watch_list_add(int fd, const char *path)
 +{
@@ -1112,6 +1119,8 @@ diff --exclude-from=exclude --exclude=se
 +	char *dir = dirname(x);
 +	ptr = firstDir;
 +
++	if (exclude(path)) return;
++
 +	globbuf.gl_offs = 1;
 +	if (glob(path, 
 +		 GLOB_TILDE | GLOB_PERIOD,
@@ -1226,6 +1235,8 @@ diff --exclude-from=exclude --exclude=se
 +{
 +	char buf[BUF_LEN];
 +	int len, i = 0;
++	if (firstDir == NULL) return 0;
++
 +	len = read(fd, buf, BUF_LEN);
 +	if (len < 0) {
 +		if (terminate == 0) {
@@ -1316,7 +1327,6 @@ diff --exclude-from=exclude --exclude=se
 +	if (master_wd == -1)
 +		exitApp("Error watching config file.");
 +}
-+
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.78/sandbox/deliverables/basicwrapper
 --- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.78/sandbox/deliverables/basicwrapper	2009-12-08 17:05:49.000000000 -0500
@@ -1671,10 +1681,10 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.78/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandbox	2009-12-08 17:05:49.000000000 -0500
-@@ -0,0 +1,253 @@
++++ policycoreutils-2.0.78/sandbox/sandbox	2009-12-14 09:35:48.000000000 -0500
+@@ -0,0 +1,272 @@
 +#!/usr/bin/python -E
-+import os, sys, getopt, socket, random, fcntl, shutil
++import os, sys, getopt, socket, random, fcntl, shutil, re
 +import selinux
 +import signal
 +
@@ -1779,17 +1789,25 @@ diff --exclude-from=exclude --exclude=se
 +              copyfile(f,homedir, newhomedir)
 +              copyfile(f,"/tmp", newtmpdir)
 +
-+def savefile(new, orig):
-+       import gtk
-+       dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
-+                               gtk.BUTTONS_YES_NO,
-+                               _("Do you want to save changes to '%s' (Y/N): ") % orig)
-+       dlg.set_title(_("Sandbox Message"))
-+       dlg.set_position(gtk.WIN_POS_MOUSE)
-+       dlg.show_all()
-+       rc = dlg.run()
-+       dlg.destroy()
-+       if rc == gtk.RESPONSE_YES:
++def savefile(new, orig, X_ind):
++       copy = False
++       if(X_ind):
++              import gtk
++              dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
++                                      gtk.BUTTONS_YES_NO,
++                                      _("Do you want to save changes to '%s' (Y/N): ") % orig)
++              dlg.set_title(_("Sandbox Message"))
++              dlg.set_position(gtk.WIN_POS_MOUSE)
++              dlg.show_all()
++              rc = dlg.run()
++              dlg.destroy()
++              if rc == gtk.RESPONSE_YES:
++                     copy = True
++       else:
++              ans = raw_input(_("Do you want to save changes to '%s' (y/N): ") % orig)
++              if(re.match(_("[yY]"),ans)):
++                     copy = True
++       if(copy):
 +              shutil.copy2(new,orig)
 +
 +if __name__ == '__main__':
@@ -1801,19 +1819,21 @@ diff --exclude-from=exclude --exclude=se
 +
 +    def usage(message = ""):
 +        text = _("""
-+sandbox [-h] [-I includefile ] [[-i file ] ...] [ -t type ] command
++sandbox [-h] [-X] [-M][-I includefile ] [[-i file ] ...] [ -t type ] command
 +""")
 +        error_exit("%s\n%s" % (message, text))
 +
 +    setype = DEFAULT_TYPE
 +    X_ind = False
++    home_and_temp = False
 +    level=None
 +    try:
-+           gopts, cmds = getopt.getopt(sys.argv[1:], "l:i:ht:XI:", 
++           gopts, cmds = getopt.getopt(sys.argv[1:], "l:i:ht:XI:M", 
 +                                       ["help",
 +                                        "include=", 
 +                                        "includefile=", 
 +                                        "type=",
++                                        "mount",
 +                                        "level="
 +                                        ])
 +           for o, a in gopts:
@@ -1842,6 +1862,9 @@ diff --exclude-from=exclude --exclude=se
 +                         if DEFAULT_TYPE == setype:
 +                                setype = DEFAULT_X_TYPE
 +                         X_ind = True
++                         home_and_temp = True
++                  if o == "-M" or o == "--mount":
++                         home_and_temp = True
 +
 +                  if o == "-h" or o == "--help":
 +                         usage(_("Usage"));
@@ -1862,9 +1885,9 @@ diff --exclude-from=exclude --exclude=se
 +           try:
 +                  newhomedir = None
 +                  newtmpdir = None
-+                  if X_ind:
++                  if home_and_temp:
 +                         if not os.path.exists("/usr/sbin/seunshare"):
-+                                raise ValueError("""/usr/sbin/seunshare required for sandbox -X, to install you need to execute 
++                                raise ValueError("""/usr/sbin/seunshare required for sandbox -M, to install you need to execute 
 +#yum install /usr/sbin/seunshare""")
 +                         import warnings
 +                         warnings.simplefilter("ignore")
@@ -1891,21 +1914,27 @@ diff --exclude-from=exclude --exclude=se
 +""" % " ".join(paths))
 +                         fd.close()
 +                         os.chmod(execfile, 0700)
-+                         
-+                         cmds =  ("/usr/sbin/seunshare -t %s -h %s -- %s /usr/share/sandbox/sandboxX.sh" % (newtmpdir, newhomedir, execcon)).split()
-+                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                         if X_ind:
++                                cmds =  ("/usr/sbin/seunshare -t %s -h %s -- %s /usr/share/sandbox/sandboxX.sh" % (newtmpdir, newhomedir, execcon)).split()
++                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                         else:
++                                cmds =  ("/usr/sbin/seunshare -t %s -h %s -- %s " % (newtmpdir, newhomedir, execcon)).split()+cmds
++                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                                selinux.setexeccon(execcon)
++                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                                selinux.setexeccon(None)
 +                         for i in paths:
 +                                if i not in X_FILES:
 +                                       continue
 +                                (dest, mtime) = X_FILES[i]
 +                                if os.path.getmtime(dest) > mtime:
-+                                       savefile(dest, i)
++                                       savefile(dest, i, X_ind)
 +                  else:
 +                         selinux.setexeccon(execcon)
 +                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
 +                         selinux.setexeccon(None)
 +           finally:
-+                  if X_ind:
++                  if home_and_temp:
 +                         if newhomedir:
 +                                shutil.rmtree(newhomedir)
 +                         if newtmpdir:
@@ -1928,30 +1957,43 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.78/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandbox.8	2009-12-08 17:05:49.000000000 -0500
-@@ -0,0 +1,26 @@
++++ policycoreutils-2.0.78/sandbox/sandbox.8	2009-12-14 09:37:40.000000000 -0500
+@@ -0,0 +1,39 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
 +sandbox \- Run cmd under an SELinux sandbox
 +.SH SYNOPSIS
 +.B sandbox
-+[-X] [[-i file ]...] [ -t type ] cmd
++[-M] [-X] [-I includefile ] [[-i file ]...] [ -t type ] cmd
 +.br
 +.SH DESCRIPTION
 +.PP
-+Run application within a tightly confined SELinux domain,   The default sandbox allows the application to only read and write stdin and stdout along with files handled to it by the shell.  
-+Additionaly a -X qualifier allows you to run sandboxed X applications.  These apps will start up their own X Server and create a temporary homedir and /tmp.  The default policy does not allow any capabilities or network access.  Also prevents all access to the users other processes and files.  Any file specified on the command line will be copied into the sandbox.
++Run the 
++.I cmd 
++application within a tightly confined SELinux domain.  The default sandbox domain only allows applications the ability to read and write stdin, stdout and any other file descriptors handed to it. It is not allowed to open any other files.  
++
++If you have the 
++.I policycoreutils-sandbox 
++package installed, you can use the -X option.
++.B sandbox -X
++allows you to run sandboxed X applications.  These applications will start up their own X Server and create a temporary homedir and /tmp.  The default policy does not allow any capabilities or network access.  It also prevents all access to the users other processes and files.  Any file specified on the command line will be copied into the sandbox.
 +.PP
 +.TP
 +\fB\-t type\fR
 +Use alternate sandbox type, defaults to sandbox_t or sandbox_x_t for -X.
 +.TP
 +\fB\-i file\fR
-+Copy this file into the temporary sandbox homedir. Command can be repeated.
++Copy this file into the temporary sandbox appriate. Command can be repeated.
++.TP
++\fB\-I inputfile\fR
++Copy all files listed in inputfile into the appropriate temporary sandbox direcories. 
 +.TP
 +\fB\-X\fR
 +Create an X based Sandbox for gui apps, temporary files for $HOME and /tmp, seconday Xserver, defaults to sandbox_x_t
 +.TP
++\fB\-M\fR
++Create a Sandbox with temporary files for $HOME and /tmp, defaults to sandbox_t
++.TP
 +.SH "SEE ALSO"
 +.TP
 +runcon(1)
@@ -3360,8 +3402,24 @@ diff --exclude-from=exclude --exclude=se
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.78/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.78/setfiles/restore.c	2009-12-08 17:05:49.000000000 -0500
-@@ -303,6 +303,12 @@
++++ policycoreutils-2.0.78/setfiles/restore.c	2009-12-16 08:14:21.000000000 -0500
+@@ -31,7 +31,6 @@
+ 
+ 
+ static file_spec_t *fl_head;
+-static int exclude(const char *file);
+ static int filespec_add(ino_t ino, const security_context_t con, const char *file);
+ static int only_changed_user(const char *a, const char *b);
+ struct restore_opts *r_opts = NULL;
+@@ -53,7 +52,6 @@
+ 		}
+ 	}
+ 	return;
+-
+ }
+ 
+ void restore_init(struct restore_opts *opts)
+@@ -303,6 +301,12 @@
  	FTS *fts_handle;
  	FTSENT *ftsent;
  
@@ -3374,7 +3432,7 @@ diff --exclude-from=exclude --exclude=se
  	fts_handle = fts_open((char **)namelist, r_opts->fts_flags, NULL);
  	if (fts_handle  == NULL) {
  		fprintf(stderr,
-@@ -374,6 +380,7 @@
+@@ -374,6 +378,7 @@
  	} else {
  		rc = lstat(name, &sb);
  		if (rc < 0) {
@@ -3382,9 +3440,86 @@ diff --exclude-from=exclude --exclude=se
  			fprintf(stderr, "%s:  lstat(%s) failed:  %s\n",
  				r_opts->progname, name,	strerror(errno));
  			return -1;
+@@ -409,7 +414,7 @@
+ 	}
+ }
+ 
+-static int exclude(const char *file)
++int exclude(const char *file)
+ {
+ 	int i = 0;
+ 	for (i = 0; i < excludeCtr; i++) {
+@@ -602,5 +607,67 @@
+ 	return -1;
+ }
+ 
++#include <sys/utsname.h>
++/*
++   Search /proc/mounts for all file systems that do not support extended
++   attributes and add them to the exclude directory table.  File systems
++   that support security labels have the seclabel option.
++*/
++void exclude_non_seclabel_mounts()
++{
++	struct utsname uts;
++	FILE *fp;
++	size_t len;
++	ssize_t num;
++	int index = 0, found = 0;
++	char *mount_info[4];
++	char *buf = NULL, *item;
++
++	/* Check to see if the kernel supports seclabel */
++	if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") < 0)
++		return;
++	if (is_selinux_enabled() <= 0)
++		return;
++
++	fp = fopen("/proc/mounts", "r");
++	if (!fp)
++		return;
+ 
++	while ((num = getline(&buf, &len, fp)) != -1) {
++		found = 0;
++		index = 0;
++		item = strtok(buf, " ");
++		while (item != NULL) {
++			mount_info[index] = item;
++			if (index == 3)
++				break;
++			index++;
++			item = strtok(NULL, " ");
++		}
++		if (index < 3) {
++			fprintf(stderr,
++				"/proc/mounts record \"%s\" has incorrect format.\n",
++				buf);
++			continue;
++		}
++
++		/* remove pre-existing entry */
++		remove_exclude(mount_info[1]);
++
++		item = strtok(mount_info[3], ",");
++		while (item != NULL) {
++			if (strcmp(item, "seclabel") == 0) {
++				found = 1;
++				break;
++			}
++			item = strtok(NULL, ",");
++		}
++
++		/* exclude mount points without the seclabel option */
++		if (!found)
++			add_exclude(mount_info[1]);
++	}
++
++	free(buf);
++}
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.78/setfiles/restorecon.8
 --- nsapolicycoreutils/setfiles/restorecon.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.78/setfiles/restorecon.8	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/restorecon.8	2009-12-16 08:14:22.000000000 -0500
 @@ -4,10 +4,10 @@
  
  .SH "SYNOPSIS"
@@ -3410,7 +3545,7 @@ diff --exclude-from=exclude --exclude=se
  show changes in file labels.
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.78/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.78/setfiles/restore.h	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/restore.h	2009-12-16 08:14:23.000000000 -0500
 @@ -27,6 +27,7 @@
  	int hard_links;
  	int verbose;
@@ -3419,10 +3554,19 @@ diff --exclude-from=exclude --exclude=se
  	char *rootpath;
  	int rootpathlen;
  	char *progname;
-Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.78/setfiles/restore.o differ
+@@ -44,7 +45,9 @@
+ void restore_init(struct restore_opts *opts);
+ void restore_finish();
+ int add_exclude(const char *directory);
++int exclude(const char *path);
+ void remove_exclude(const char *directory);
+ int process_one_realpath(char *name, int recurse);
++void exclude_non_seclabel_mounts();
+ 
+ #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.78/setfiles/setfiles.8
 --- nsapolicycoreutils/setfiles/setfiles.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.78/setfiles/setfiles.8	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/setfiles/setfiles.8	2009-12-16 08:14:25.000000000 -0500
 @@ -31,6 +31,9 @@
  .TP
  .B \-n
@@ -3435,8 +3579,16 @@ diff --exclude-from=exclude --exclude=se
  suppress non-error output.
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.78/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-11-03 09:21:40.000000000 -0500
-+++ policycoreutils-2.0.78/setfiles/setfiles.c	2009-12-09 16:28:55.000000000 -0500
-@@ -25,7 +25,6 @@
++++ policycoreutils-2.0.78/setfiles/setfiles.c	2009-12-16 08:14:26.000000000 -0500
+@@ -5,7 +5,6 @@
+ #include <ctype.h>
+ #include <regex.h>
+ #include <sys/vfs.h>
+-#include <sys/utsname.h>
+ #define __USE_XOPEN_EXTENDED 1	/* nftw */
+ #include <libgen.h>
+ #ifdef USE_AUDIT
+@@ -25,7 +24,6 @@
  static int warn_no_match = 0;
  static int null_terminated = 0;
  static int errors;
@@ -3444,7 +3596,7 @@ diff --exclude-from=exclude --exclude=se
  static struct restore_opts r_opts;
  
  #define STAT_BLOCK_SIZE 1
-@@ -44,13 +43,13 @@
+@@ -44,13 +42,13 @@
  {
  	if (iamrestorecon) {
  		fprintf(stderr,
@@ -3460,7 +3612,77 @@ diff --exclude-from=exclude --exclude=se
  			name);
  	}
  	exit(1);
-@@ -335,7 +334,7 @@
+@@ -138,69 +136,6 @@
+ #endif
+ }
+ 
+-/*
+-   Search /proc/mounts for all file systems that do not support extended
+-   attributes and add them to the exclude directory table.  File systems
+-   that support security labels have the seclabel option.
+-*/
+-static void exclude_non_seclabel_mounts()
+-{
+-	struct utsname uts;
+-	FILE *fp;
+-	size_t len;
+-	ssize_t num;
+-	int index = 0, found = 0;
+-	char *mount_info[4];
+-	char *buf = NULL, *item;
+-
+-	/* Check to see if the kernel supports seclabel */
+-	if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") < 0)
+-		return;
+-	if (is_selinux_enabled() <= 0)
+-		return;
+-
+-	fp = fopen("/proc/mounts", "r");
+-	if (!fp)
+-		return;
+-
+-	while ((num = getline(&buf, &len, fp)) != -1) {
+-		found = 0;
+-		index = 0;
+-		item = strtok(buf, " ");
+-		while (item != NULL) {
+-			mount_info[index] = item;
+-			if (index == 3)
+-				break;
+-			index++;
+-			item = strtok(NULL, " ");
+-		}
+-		if (index < 3) {
+-			fprintf(stderr,
+-				"/proc/mounts record \"%s\" has incorrect format.\n",
+-				buf);
+-			continue;
+-		}
+-
+-		/* remove pre-existing entry */
+-		remove_exclude(mount_info[1]);
+-
+-		item = strtok(mount_info[3], ",");
+-		while (item != NULL) {
+-			if (strcmp(item, "seclabel") == 0) {
+-				found = 1;
+-				break;
+-			}
+-			item = strtok(NULL, ",");
+-		}
+-
+-		/* exclude mount points without the seclabel option */
+-		if (!found)
+-			add_exclude(mount_info[1]);
+-	}
+-
+-	free(buf);
+-}
+-
+ int main(int argc, char **argv)
+ {
+ 	struct stat sb;
+@@ -335,7 +270,7 @@
  			r_opts.debug = 1;
  			break;
  		case 'i':
@@ -3469,7 +3691,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'l':
  			r_opts.logging = 1;
-@@ -371,7 +370,7 @@
+@@ -371,7 +306,7 @@
  				break;
  			}
  			if (optind + 1 >= argc) {

policycoreutils-sepolgen.patch:
 access.py    |   15 ++++++++-----
 audit.py     |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 policygen.py |   31 ++++++++++++++++++++++++++-
 refparser.py |    2 -
 refpolicy.py |    9 +++++--
 5 files changed, 108 insertions(+), 16 deletions(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-sepolgen.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- policycoreutils-sepolgen.patch	9 Dec 2009 21:34:46 -0000	1.29
+++ policycoreutils-sepolgen.patch	17 Dec 2009 14:39:30 -0000	1.30
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py
 --- nsasepolgen/src/sepolgen/access.py	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py	2009-12-08 17:02:52.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/access.py	2009-12-08 17:05:49.000000000 -0500
 @@ -32,6 +32,7 @@
  """
  
@@ -56,7 +56,7 @@ diff --exclude-from=exclude -N -u -r nsa
          if audit_msg:
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py
 --- nsasepolgen/src/sepolgen/audit.py	2009-12-01 15:46:50.000000000 -0500
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py	2009-12-08 17:02:17.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/audit.py	2009-12-08 17:05:49.000000000 -0500
 @@ -23,6 +23,27 @@
  
  # Convenience functions
@@ -194,7 +194,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py
 --- nsasepolgen/src/sepolgen/policygen.py	2008-09-12 11:48:15.000000000 -0400
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py	2009-12-08 17:03:16.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/policygen.py	2009-12-16 08:20:45.000000000 -0500
 @@ -29,6 +29,8 @@
  import access
  import interfaces
@@ -213,13 +213,15 @@ diff --exclude-from=exclude -N -u -r nsa
      def set_gen_refpol(self, if_set=None, perm_maps=None):
          """Set whether reference policy interfaces are generated.
  
-@@ -144,8 +146,32 @@
+@@ -144,8 +146,35 @@
      def __add_allow_rules(self, avs):
          for av in avs:
              rule = refpolicy.AVRule(av)
 +            rule.comment = ""
              if self.explain:
                  rule.comment = refpolicy.Comment(explain_access(av, verbosity=self.explain))
++            if av.type == audit2why.ALLOW:
++                rule.comment += "#!!!! This avc is allowed in the current policy\n" 
 +            if av.type == audit2why.DONTAUDIT:
 +                rule.comment += "#!!!! This avc has a dontaudit rule in the current policy\n" 
 +            if av.type == audit2why.BOOLEAN:
@@ -231,24 +233,25 @@ diff --exclude-from=exclude -N -u -r nsa
 +            if av.type == audit2why.CONSTRAINT:
 +                rule.comment += "#!!!! This avc is a constraint violation.  You will need to add an attribute to either the source or target type to make it work.\n" 
 +            if av.type == audit2why.TERULE:
-+                if "open" in av.perms and "write" in av.perms:
-+                    if not self.domains:
-+                        self.domains = seinfo(ATTRIBUTE, name="domain")[0]["types"]
-+                    types=[]
-+                    for i in map(lambda x: x[TCONTEXT], sesearch([ALLOW], {SCONTEXT: av.src_type, CLASS: av.obj_class, PERMS: av.perms})):
-+                        if i not in self.domains:
-+                            types.append(i)
-+                    if len(types) == 1:
-+                        rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following type:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
-+                    elif len(types) >= 1:
-+                        rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following types:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
++                if "write" in av.perms:
++                    if "dir" in av.obj_class or "open" in av.perms:
++                        if not self.domains:
++                            self.domains = seinfo(ATTRIBUTE, name="domain")[0]["types"]
++                        types=[]
++                        for i in map(lambda x: x[TCONTEXT], sesearch([ALLOW], {SCONTEXT: av.src_type, CLASS: av.obj_class, PERMS: av.perms})):
++                            if i not in self.domains:
++                                types.append(i)
++                        if len(types) == 1:
++                            rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following type:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
++                        elif len(types) >= 1:
++                            rule.comment += "#!!!! The source type '%s' can write to a '%s' of the following types:\n# %s\n" % ( av.src_type, av.obj_class, ", ".join(types))
 +                            
              self.module.children.append(rule)
  
  
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2009-10-29 15:21:39.000000000 -0400
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py	2009-12-08 17:01:22.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refparser.py	2009-12-08 17:05:49.000000000 -0500
 @@ -973,7 +973,7 @@
  def list_headers(root):
      modules = []
@@ -260,7 +263,7 @@ diff --exclude-from=exclude -N -u -r nsa
          for name in filenames:
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refpolicy.py policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py
 --- nsasepolgen/src/sepolgen/refpolicy.py	2009-10-29 15:21:39.000000000 -0400
-+++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py	2009-12-08 17:02:00.000000000 -0500
++++ policycoreutils-2.0.78/sepolgen-1.0.19/src/sepolgen/refpolicy.py	2009-12-08 17:05:49.000000000 -0500
 @@ -398,6 +398,7 @@
          return "attribute %s;" % self.name
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -p -r1.658 -r1.659
--- policycoreutils.spec	9 Dec 2009 21:34:46 -0000	1.658
+++ policycoreutils.spec	17 Dec 2009 14:39:30 -0000	1.659
@@ -1,12 +1,12 @@
 %define	libauditver	1.4.2-1
-%define	libsepolver	2.0.19-1
-%define	libsemanagever	2.0.36-2
-%define	libselinuxver	2.0.46-5
+%define	libsepolver	2.0.41-1
+%define	libsemanagever	2.0.43-2
+%define	libselinuxver	2.0.90-1
 %define	sepolgenver	1.0.19
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78
-Release: 3%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -131,6 +131,7 @@ The policycoreutils-python package conta
 %{_mandir}/man1/audit2why.1*
 %{_mandir}/man8/chcat.8*
 %{_mandir}/ru/man8/chcat.8*
+%{_mandir}/man8/sandbox.8*
 %{_mandir}/man8/semanage.8*
 %{_mandir}/ru/man8/semanage.8*
 
@@ -152,7 +153,6 @@ The policycoreutils-python package conta
 
 %files sandbox
 %{_sysconfdir}/rc.d/init.d/sandbox
-%{_mandir}/man8/sandbox.8*
 %{_sbindir}/seunshare
 %{_datadir}/sandbox/sandboxX.sh
 
@@ -189,7 +189,7 @@ Group: System Environment/Base
 Requires: policycoreutils-python = %{version}-%{release} 
 Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: usermode-gtk 
-Requires: setools-console
+Requires: setools-console setools-libs-python
 Requires: selinux-policy
 Requires: python >= 2.6
 BuildRequires: desktop-file-utils
@@ -296,6 +296,15 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-6
+- Add setools-libs-python to requires for gui
+
+* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-5
+- If restorecond running as a user has no files to watch then it should exit.  (NFS Homedirs)
+
+* Thu Dec 10 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-4
+- Move sandbox man page to base package
+
 * Tue Dec 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-3
 - Fix audit2allow to report constraints, dontaudits, types, booleans
 



From limb at fedoraproject.org  Thu Dec 17 14:39:59 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Dec 2009 14:39:59 +0000 (UTC)
Subject: rpms/drupal/EL-5 .cvsignore, 1.6, 1.7 drupal.spec, 1.18,
	1.19 sources, 1.18, 1.19
Message-ID: <20091217143959.5D43F11C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13717

Modified Files:
	.cvsignore drupal.spec sources 
Log Message:
5.21.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	16 Sep 2009 20:29:34 -0000	1.6
+++ .cvsignore	17 Dec 2009 14:39:59 -0000	1.7
@@ -1 +1 @@
-drupal-5.20.tar.gz
+drupal-5.21.tar.gz


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/drupal.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- drupal.spec	16 Sep 2009 20:29:34 -0000	1.18
+++ drupal.spec	17 Dec 2009 14:39:59 -0000	1.19
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  5.20
+Version:  5.21
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 5.21-1
+- Update to 5.21, SA-CORE-2009-009.
+
 * Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 5.20-1
 - Update to 5.20, SA-CORE-2009-008.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	16 Sep 2009 20:29:34 -0000	1.18
+++ sources	17 Dec 2009 14:39:59 -0000	1.19
@@ -1 +1 @@
-c042fdb1e995808efc398437ea7c5de4  drupal-5.20.tar.gz
+1efb86c2457f02cd40a976e1382d03bb  drupal-5.21.tar.gz



From limb at fedoraproject.org  Thu Dec 17 14:42:42 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 17 Dec 2009 14:42:42 +0000 (UTC)
Subject: rpms/drupal/EL-4 drupal.spec,1.18,1.19 sources,1.18,1.19
Message-ID: <20091217144242.CCA7C11C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14487

Modified Files:
	drupal.spec sources 
Log Message:
5.21.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-4/drupal.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- drupal.spec	16 Sep 2009 20:29:34 -0000	1.18
+++ drupal.spec	17 Dec 2009 14:42:42 -0000	1.19
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  5.20
+Version:  5.21
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 5.21-1
+- Update to 5.21, SA-CORE-2009-009.
+
 * Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 5.20-1
 - Update to 5.20, SA-CORE-2009-008.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	16 Sep 2009 20:29:34 -0000	1.18
+++ sources	17 Dec 2009 14:42:42 -0000	1.19
@@ -1 +1 @@
-c042fdb1e995808efc398437ea7c5de4  drupal-5.20.tar.gz
+1efb86c2457f02cd40a976e1382d03bb  drupal-5.21.tar.gz



From toshio at fedoraproject.org  Thu Dec 17 14:49:31 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 17 Dec 2009 14:49:31 +0000 (UTC)
Subject: rpms/parted/F-10 test,NONE,1.1
Message-ID: <20091217144931.8C5DF11C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/parted/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15906

Added Files:
	test 
Log Message:
Just a test that commit and up work.



--- NEW FILE test ---



From toshio at fedoraproject.org  Thu Dec 17 14:52:17 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 17 Dec 2009 14:52:17 +0000 (UTC)
Subject: rpms/parted/F-10 test,1.1,NONE
Message-ID: <20091217145217.1F31911C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/parted/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16648

Removed Files:
	test 
Log Message:
And another test for cvs up



--- test DELETED ---



From nucleo at fedoraproject.org  Thu Dec 17 14:55:13 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Thu, 17 Dec 2009 14:55:13 +0000 (UTC)
Subject: rpms/cryptopp/F-12 cryptopp-5.6.1-autotools.patch, NONE,
	1.1 cryptopp-5.6.1-s390.patch, NONE, 1.1 cryptopp.pc, NONE,
	1.1 .cvsignore, 1.4, 1.5 cryptopp.spec, 1.7, 1.8 sources, 1.4,
	1.5 cryptopp-5.6.0-autotools.patch, 1.1,
	NONE cryptopp-5.6.0-gcc4.3.patch, 1.1,
	NONE cryptopp-5.6.0-nomars.patch, 1.1,
	NONE cryptopp-5.6.0-s390.patch, 1.1,
	NONE cryptopp-remove-patented-code.sh, 1.1, NONE
Message-ID: <20091217145513.3850911C00E6@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/cryptopp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17297

Modified Files:
	.cvsignore cryptopp.spec sources 
Added Files:
	cryptopp-5.6.1-autotools.patch cryptopp-5.6.1-s390.patch 
	cryptopp.pc 
Removed Files:
	cryptopp-5.6.0-autotools.patch cryptopp-5.6.0-gcc4.3.patch 
	cryptopp-5.6.0-nomars.patch cryptopp-5.6.0-s390.patch 
	cryptopp-remove-patented-code.sh 
Log Message:
Update to svn r479

cryptopp-5.6.1-autotools.patch:
 Makefile.am  |  290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |   13 ++
 2 files changed, 303 insertions(+)

--- NEW FILE cryptopp-5.6.1-autotools.patch ---
--- cryptopp-5.6.1/configure.ac	1969-12-31 19:00:00.000000000 -0500
+++ cryptopp-5.6.1/configure.ac	2005-08-02 14:02:30.000000000 -0400
@@ -0,0 +1,13 @@
+AC_INIT([cryptopp], [5.5.2], [cryptopp-users at googlegroups.com])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR(configure.ac)
+AC_CONFIG_HEADER([local.h])
+AM_MAINTAINER_MODE
+
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+
+AC_C_BIGENDIAN
+
+AC_OUTPUT(Makefile)
--- cryptopp-5.6.1/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ cryptopp-5.6.1/Makefile.am	2005-08-02 14:02:30.000000000 -0400
@@ -0,0 +1,290 @@
+AUTOMAKE_OPTIONS = foreign
+lib_LTLIBRARIES = libcryptopp.la
+libcryptopp_la_LIBADD = -lpthread
+libcryptopp_la_LDFLAGS = -version-info 6:0:0
+libcryptopp_la_SOURCES =  \
+	3way.cpp \
+	adler32.cpp \
+	algebra.cpp \
+	algparam.cpp \
+	arc4.cpp \
+	asn.cpp \
+	authenc.cpp \
+	base32.cpp \
+	base64.cpp \
+	basecode.cpp \
+	bfinit.cpp \
+	blowfish.cpp \
+	blumshub.cpp \
+	camellia.cpp \
+	cast.cpp \
+	casts.cpp \
+	cbcmac.cpp \
+	ccm.cpp \
+	channels.cpp \
+	cmac.cpp \
+	cpu.cpp \
+	crc.cpp \
+	cryptlib.cpp \
+	default.cpp \
+	des.cpp \
+	dessp.cpp \
+	dh.cpp \
+	dh2.cpp \
+	dll.cpp \
+	dsa.cpp \
+	eax.cpp \
+	ec2n.cpp \
+	eccrypto.cpp \
+	ecp.cpp \
+	elgamal.cpp \
+	emsa2.cpp \
+	eprecomp.cpp \
+	esign.cpp \
+	files.cpp \
+	filters.cpp \
+	fips140.cpp \
+	fipstest.cpp \
+	gcm.cpp \
+	gf256.cpp \
+	gf2_32.cpp \
+	gf2n.cpp \
+	gfpcrypt.cpp \
+	gost.cpp \
+	gzip.cpp \
+	hex.cpp \
+	hmac.cpp \
+	hrtimer.cpp \
+	ida.cpp \
+	idea.cpp \
+	integer.cpp \
+	iterhash.cpp \
+	luc.cpp \
+	md2.cpp \
+	md4.cpp \
+	md5.cpp \
+	misc.cpp \
+	modes.cpp \
+	mqueue.cpp \
+	mqv.cpp \
+	nbtheory.cpp \
+	network.cpp \
+	oaep.cpp \
+	osrng.cpp \
+	panama.cpp \
+	pch.cpp \
+	pkcspad.cpp \
+	polynomi.cpp \
+	pssr.cpp \
+	pubkey.cpp \
+	queue.cpp \
+	rabin.cpp \
+	randpool.cpp \
+	rc2.cpp \
+	rc5.cpp \
+	rc6.cpp \
+	rdtables.cpp \
+	rijndael.cpp \
+	ripemd.cpp \
+	rng.cpp \
+	rsa.cpp \
+	rw.cpp \
+	safer.cpp \
+	salsa.cpp \
+	seal.cpp \
+	seed.cpp \
+	serpent.cpp \
+	sha.cpp \
+	shacal2.cpp \
+	shark.cpp \
+	sharkbox.cpp \
+	simple.cpp \
+	skipjack.cpp \
+	socketft.cpp \
+	sosemanuk.cpp \
+	square.cpp \
+	squaretb.cpp \
+	strciphr.cpp \
+	tea.cpp \
+	tftables.cpp \
+	tiger.cpp \
+	tigertab.cpp \
+	trdlocal.cpp \
+	ttmac.cpp \
+	twofish.cpp \
+	vmac.cpp \
+	wait.cpp \
+	wake.cpp \
+	whrlpool.cpp \
+	winpipes.cpp \
+	xtr.cpp \
+	xtrcrypt.cpp \
+	zdeflate.cpp \
+	zinflate.cpp \
+	zlib.cpp \
+	mars.cpp \
+	marss.cpp
+
+pkginclude_HEADERS = \
+	3way.h \
+	adler32.h \
+	aes.h \
+	algebra.h \
+	algparam.h \
+	arc4.h \
+	argnames.h \
+	asn.h \
+	authenc.h \
+	base32.h \
+	base64.h \
+	basecode.h \
+	bench.h \
+	blowfish.h \
+	blumshub.h \
+	camellia.h \
+	cast.h \
+	cbcmac.h \
+	ccm.h \
+	channels.h \
+	cmac.h \
+	config.h \
+	cpu.h \
+	crc.h \
+	cryptlib.h \
+	default.h \
+	des.h \
+	dh2.h \
+	dh.h \
+	dll.h \
+	dmac.h \
+	dsa.h \
+	eax.h \
+	ec2n.h \
+	eccrypto.h \
+	ecp.h \
+	elgamal.h \
+	emsa2.h \
+	eprecomp.h \
+	esign.h \
+	factory.h \
+	files.h \
+	filters.h \
+	fips140.h \
+	fltrimpl.h \
+	gcm.h \
+	gf2_32.h \
+	gf256.h \
+	gf2n.h \
+	gfpcrypt.h \
+	gost.h \
+	gzip.h \
+	hex.h \
+	hmac.h \
+	hrtimer.h \
+	ida.h \
+	idea.h \
+	integer.h \
+	iterhash.h \
+	lubyrack.h \
+	luc.h \
+	md2.h \
+	md4.h \
+	md5.h \
+	mdc.h \
+	misc.h \
+	modarith.h \
+	modes.h \
+	modexppc.h \
+	mqueue.h \
+	mqv.h \
+	nbtheory.h \
+	network.h \
+	nr.h \
+	oaep.h \
+	oids.h \
+	osrng.h \
+	panama.h \
+	pch.h \
+	pkcspad.h \
+	polynomi.h \
+	pssr.h \
+	pubkey.h \
+	pwdbased.h \
+	queue.h \
+	rabin.h \
+	randpool.h \
+	rc2.h \
+	rc5.h \
+	rc6.h \
+	rijndael.h \
+	ripemd.h \
+	rng.h \
+	rsa.h \
+	rw.h \
+	safer.h \
+	salsa.h \
+	seal.h \
+	secblock.h \
+	seckey.h \
+	seed.h \
+	serpent.h \
+	shacal2.h \
+	sha.h \
+	shark.h \
+	simple.h \
+	skipjack.h \
+	smartptr.h \
+	socketft.h \
+	sosemanuk.h \
+	square.h \
+	stdcpp.h \
+	strciphr.h \
+	tea.h \
+	tiger.h \
+	trdlocal.h \
+	trunhash.h \
+	ttmac.h \
+	twofish.h \
+	vmac.h \
+	wait.h \
+	wake.h \
+	whrlpool.h \
+	winpipes.h \
+	words.h \
+	xtrcrypt.h \
+	xtr.h \
+	zdeflate.h \
+	zinflate.h \
+	zlib.h \
+	mars.h
+
+
+noinst_HEADERS = \
+	local.h \
+	resource.h \
+	serpentp.h
+	validate.h
+
+bin_PROGRAMS = cryptest
+cryptest_SOURCES = \
+	bench.cpp \
+	bench2.cpp \
+	test.cpp \
+	validat1.cpp \
+	validat2.cpp \
+	validat3.cpp \
+	datatest.cpp \
+	regtest.cpp \
+	fipsalgt.cpp \
+	dlltest.cpp
+	
+nodist_cryptest_SOURCES = adhoc.cpp
+CLEANFILES = adhoc.cpp
+cryptest_LDADD = $(lib_LTLIBRARIES)
+
+adhoc.cpp: Makefile
+	if test -f adhoc.cpp; then      \
+	  touch adhoc.cpp;              \
+	else                            \
+	  cp adhoc.cpp.proto adhoc.cpp; \
+	fi

cryptopp-5.6.1-s390.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cryptopp-5.6.1-s390.patch ---
--- cryptopp-5.6.1/config.h	2009-09-04 13:37:59.000000000 +0300
+++ cryptopp-5.6.1/config.h	2009-11-26 03:47:15.000000000 +0200
@@ -4,7 +4,7 @@
 // ***************** Important Settings ********************
 
 // define this if running on a big-endian CPU
-#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))
+#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__s390__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))
 #	define IS_BIG_ENDIAN
 #endif
 
@@ -127,7 +127,7 @@
 	typedef word64 word;
 #else
 	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE
-	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
+	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) || defined(__s390x__)
 		#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
 			// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
 			// mode(TI) division broken on amd64 with GCC earlier than GCC 3.4


--- NEW FILE cryptopp.pc ---
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib 
includedir=${prefix}/include 

Name: Crypto++
Description: General purpose cryptographic shared library
URL: http://www.cryptopp.com
Version: 5.6.1
Requires:
Libs: -lcryptopp
Cflags:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Oct 2009 11:15:33 -0000	1.4
+++ .cvsignore	17 Dec 2009 14:55:12 -0000	1.5
@@ -1,2 +1 @@
-cryptopp560.zip
-cryptopp.pc
+cryptopp-5.6.1.svn479.tar.bz2


Index: cryptopp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/F-12/cryptopp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cryptopp.spec	30 Oct 2009 11:15:33 -0000	1.7
+++ cryptopp.spec	17 Dec 2009 14:55:13 -0000	1.8
@@ -1,34 +1,30 @@
 Name:           cryptopp
-Version:        5.6.0
-Release:        4%{?dist}
+Version:        5.6.1
+Release:        0.1.svn479%{?dist}
 Summary:        Public domain C++ class library of cryptographic schemes
 License:        Public Domain
 Group:          System Environment/Libraries
 URL:            http://www.cryptopp.com/
-Source0:        http://www.cryptopp.com/cryptopp560.zip
-# Used to purge the source from patented code, see http://www.cryptopp.com/License.txt
-Source10:       cryptopp-remove-patented-code.sh
-Source2:        cryptopp.pc
-Patch0:         cryptopp-5.6.0-autotools.patch
-Patch1:         cryptopp-5.6.0-gcc4.3.patch
-# Don't try to build the patented code
-Patch2:         cryptopp-5.6.0-nomars.patch
-# Add support for s390/s390x
-Patch3:         cryptopp-5.6.0-s390.patch
+#Source0:        http://www.cryptopp.com/cryptopp560.zip
+
+# The source for this package was pulled from upstream's vcs.
+# Use the following commands to generate the tarball:
+#  svn export -r 479 https://cryptopp.svn.sourceforge.net/svnroot/cryptopp/trunk/c5 cryptopp
+#  tar -cjf cryptopp-5.6.1.svn479.tar.bz2 cryptopp
+Source0:        cryptopp-5.6.1.svn479.tar.bz2
+Source1:        cryptopp.pc
+Patch0:         cryptopp-5.6.1-autotools.patch
+Patch1:         cryptopp-5.6.1-s390.patch
 BuildRequires:  doxygen, autoconf, libtool
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Crypto++ Library is a free C++ class library of cryptographic schemes. 
+Crypto++ Library is a free C++ class library of cryptographic schemes.
 See http://www.cryptopp.com/ for a list of supported algorithms.
 
-One purpose of Crypto++ is to act as a repository of public domain 
-(not copyrighted) source code. Although the library is copyrighted as a 
-compilation, the individual files in it (except for a few exceptions listed
-in the license) are in the public domain.
-
-The MARS implementation may be subjected to patents, therefore it has been
-removed from this package.
+One purpose of Crypto++ is to act as a repository of public domain
+(not copyrighted) source code. Although the library is copyrighted as a
+compilation, the individual files in it are in the public domain.
 
 
 %package devel
@@ -54,6 +50,7 @@ This package contains documentation for 
 %package progs
 Summary:        Programs for manipulating %{name} routines
 Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
 
 %description progs
 Crypto++ Library is a free C++ class library of cryptographic schemes.
@@ -62,14 +59,12 @@ This package contains programs for manip
 
 %prep
 
-cp %{SOURCE2} . 
+cp %{SOURCE1} .
 
-%setup -q -c
-%patch2 -p1 -b .nomars
+%setup -q -n %{name}
 rm -f GNUmakefile
 %patch0 -p1
-%patch1 -p1 -b .gcc4.3
-%patch3 -p1 -b .s390
+%patch1 -p1 -b .s390
 autoreconf --verbose --force --install
 perl -pi -e 's/\r$//g' License.txt Readme.txt
 
@@ -86,7 +81,7 @@ doxygen
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pkgconfig/cryptopp.pc
+install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/cryptopp.pc
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c "
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -112,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cryptopp
 %defattr(-,root,root,0755)
 %{_libdir}/*.so
-%{_datadir}/pkgconfig/cryptopp.pc
+%{_libdir}/pkgconfig/cryptopp.pc
 
 %files doc
 %defattr(0644,root,root,0755)
@@ -124,6 +119,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 5.6.1-0.1.svn479
+- svn r479. MARS placed in the public domain by Wei Dai
+- Fixes rhbz#539227
+
+* Fri Oct 30 2009 Rahul Sundaram <sundaram at fedoraproject.org> 5.6.0-5
+- Fix source
+
 * Wed Oct 28 2009 Rahul Sundaram <sundaram at fedoraproject.org> 5.6.0-4
 - Add pkgconfig file. Fixes rhbz#512761
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Oct 2009 11:15:34 -0000	1.4
+++ sources	17 Dec 2009 14:55:13 -0000	1.5
@@ -1,2 +1 @@
-84c4217a27f05303cdb1dc2af7182dba  cryptopp560.zip
-2827f76ed490b65d233a3d89c87d3c65  cryptopp.pc
+caedd2488d642f839a1d5169a28b0d01  cryptopp-5.6.1.svn479.tar.bz2


--- cryptopp-5.6.0-autotools.patch DELETED ---


--- cryptopp-5.6.0-gcc4.3.patch DELETED ---


--- cryptopp-5.6.0-nomars.patch DELETED ---


--- cryptopp-5.6.0-s390.patch DELETED ---


--- cryptopp-remove-patented-code.sh DELETED ---



From ovasik at fedoraproject.org  Thu Dec 17 15:01:06 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 17 Dec 2009 15:01:06 +0000 (UTC)
Subject: rpms/docbook-dtds/devel docbook-dtds.spec,1.34,1.35
Message-ID: <20091217150106.31B4811C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/docbook-dtds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18679

Modified Files:
	docbook-dtds.spec 
Log Message:
Related: rhbz#543948 - comment patches, License Copyright only


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- docbook-dtds.spec	27 Oct 2009 14:34:00 -0000	1.34
+++ docbook-dtds.spec	17 Dec 2009 15:01:06 -0000	1.35
@@ -3,12 +3,12 @@
 
 Name: docbook-dtds
 Version: 1.0
-Release: 49%{?dist}
+Release: 50%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
 
-License: Freely redistributable without restriction
+License: Copyright only
 URL: http://www.oasis-open.org/docbook/
 
 Obsoletes: docbook-dtd30-sgml < %{version}-%{release}
@@ -63,14 +63,19 @@ Source9: http://www.docbook.org/sgml/4.4
 Source10: http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
 Source11: http://www.docbook.org/sgml/4.5/docbook-4.5.zip
 Source12: http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
+#fix old catalog files
 Patch0: docbook-dtd30-sgml-1.0.catalog.patch
 Patch1: docbook-dtd31-sgml-1.0.catalog.patch
 Patch2: docbook-dtd40-sgml-1.0.catalog.patch
 Patch3: docbook-dtd41-sgml-1.0.catalog.patch
 Patch4: docbook-dtd42-sgml-1.0.catalog.patch
+#fix euro sign in 4.2 dtds
 Patch5: docbook-4.2-euro.patch
+#Fix ISO entities in 4.3/4.4/4.5 SGML
 Patch6: docbook-dtds-ents.patch
+#Use system rewrite for web URL's in sgml catalogs to prevent reading from the network(#478680)
 Patch7: docbook-sgml-systemrewrite.patch
+#use XML at the end of public identificators of XML 4.1.2 ISO entities
 Patch8: docbook-dtd412-entities.patch
 BuildRequires: unzip
 
@@ -403,6 +408,10 @@ do
 done
 
 %changelog
+* Thu Dec 17 2009 Ondrej Vasik <ovasik at redhat.com> - 1.0-50
+- comment patches
+- License: Copyright only
+
 * Tue Oct 27 2009 Ondrej Vasik <ovasik at redhat.com> - 1.0-49
 - do not obsolete self
 



From pjones at fedoraproject.org  Thu Dec 17 15:06:55 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu, 17 Dec 2009 15:06:55 +0000 (UTC)
Subject: rpms/syslinux/devel syslinux.spec,1.63,1.64
Message-ID: <20091217150655.5F26F11C00E6@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20332

Modified Files:
	syslinux.spec 
Log Message:
* Thu Dec 17 2009 Peter Jones <pjones at redhat.com> - 3.83-2
- Split out -devel



Index: syslinux.spec
===================================================================
RCS file: /cvs/extras/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- syslinux.spec	29 Oct 2009 14:16:39 -0000	1.63
+++ syslinux.spec	17 Dec 2009 15:06:55 -0000	1.64
@@ -2,7 +2,7 @@ Summary: Simple kernel loader which boot
 Name: syslinux
 Version: 3.83
 %define tarball_version 3.83
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/
@@ -31,6 +31,13 @@ filesystems, Linux ext2/ext3 filesystems
 (PXELINUX), or ISO 9660 CD-ROMs (ISOLINUX).  It also includes a tool,
 MEMDISK, which loads legacy operating systems from these media.
 
+%package devel
+Summary: Headers and libraries for syslinux development.
+Group: Development/Libraries
+
+%description devel
+Headers and libraries for syslinux development.
+
 %prep
 %setup -q -n syslinux-%{tarball_version}
 %patch0 -p1 -b .nostrip
@@ -82,9 +89,16 @@ rm -rf %{buildroot}
 %{_datadir}/syslinux/*.bin
 %{_datadir}/syslinux/*.0
 %{_datadir}/syslinux/memdisk
+
+%files devel
+%defattr(-,root,root)
+%dir %{_datadir}/syslinux/com32
 %{_datadir}/syslinux/com32
 
 %changelog
+* Thu Dec 17 2009 Peter Jones <pjones at redhat.com> - 3.83-2
+- Split out -devel
+
 * Thu Oct 29 2009 Peter Jones <pjones at redhat.com> - 3.83-1
 - update to 3.83
 



From nucleo at fedoraproject.org  Thu Dec 17 15:14:22 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Thu, 17 Dec 2009 15:14:22 +0000 (UTC)
Subject: rpms/cryptopp/F-11 cryptopp-5.6.1-autotools.patch, NONE,
	1.1 cryptopp-5.6.1-s390.patch, NONE, 1.1 cryptopp.pc, NONE,
	1.1 .cvsignore, 1.3, 1.4 cryptopp.spec, 1.5, 1.6 sources, 1.3,
	1.4 cryptopp-5.6.0-autotools.patch, 1.1,
	NONE cryptopp-5.6.0-gcc4.3.patch, 1.1,
	NONE cryptopp-5.6.0-nomars.patch, 1.1,
	NONE cryptopp-5.6.0-s390.patch, 1.1,
	NONE cryptopp-remove-patented-code.sh, 1.1, NONE
Message-ID: <20091217151422.77DA411C00E6@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/cryptopp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22020

Modified Files:
	.cvsignore cryptopp.spec sources 
Added Files:
	cryptopp-5.6.1-autotools.patch cryptopp-5.6.1-s390.patch 
	cryptopp.pc 
Removed Files:
	cryptopp-5.6.0-autotools.patch cryptopp-5.6.0-gcc4.3.patch 
	cryptopp-5.6.0-nomars.patch cryptopp-5.6.0-s390.patch 
	cryptopp-remove-patented-code.sh 
Log Message:
Update to svn r479

cryptopp-5.6.1-autotools.patch:
 Makefile.am  |  290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |   13 ++
 2 files changed, 303 insertions(+)

--- NEW FILE cryptopp-5.6.1-autotools.patch ---
--- cryptopp-5.6.1/configure.ac	1969-12-31 19:00:00.000000000 -0500
+++ cryptopp-5.6.1/configure.ac	2005-08-02 14:02:30.000000000 -0400
@@ -0,0 +1,13 @@
+AC_INIT([cryptopp], [5.5.2], [cryptopp-users at googlegroups.com])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR(configure.ac)
+AC_CONFIG_HEADER([local.h])
+AM_MAINTAINER_MODE
+
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+
+AC_C_BIGENDIAN
+
+AC_OUTPUT(Makefile)
--- cryptopp-5.6.1/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ cryptopp-5.6.1/Makefile.am	2005-08-02 14:02:30.000000000 -0400
@@ -0,0 +1,290 @@
+AUTOMAKE_OPTIONS = foreign
+lib_LTLIBRARIES = libcryptopp.la
+libcryptopp_la_LIBADD = -lpthread
+libcryptopp_la_LDFLAGS = -version-info 6:0:0
+libcryptopp_la_SOURCES =  \
+	3way.cpp \
+	adler32.cpp \
+	algebra.cpp \
+	algparam.cpp \
+	arc4.cpp \
+	asn.cpp \
+	authenc.cpp \
+	base32.cpp \
+	base64.cpp \
+	basecode.cpp \
+	bfinit.cpp \
+	blowfish.cpp \
+	blumshub.cpp \
+	camellia.cpp \
+	cast.cpp \
+	casts.cpp \
+	cbcmac.cpp \
+	ccm.cpp \
+	channels.cpp \
+	cmac.cpp \
+	cpu.cpp \
+	crc.cpp \
+	cryptlib.cpp \
+	default.cpp \
+	des.cpp \
+	dessp.cpp \
+	dh.cpp \
+	dh2.cpp \
+	dll.cpp \
+	dsa.cpp \
+	eax.cpp \
+	ec2n.cpp \
+	eccrypto.cpp \
+	ecp.cpp \
+	elgamal.cpp \
+	emsa2.cpp \
+	eprecomp.cpp \
+	esign.cpp \
+	files.cpp \
+	filters.cpp \
+	fips140.cpp \
+	fipstest.cpp \
+	gcm.cpp \
+	gf256.cpp \
+	gf2_32.cpp \
+	gf2n.cpp \
+	gfpcrypt.cpp \
+	gost.cpp \
+	gzip.cpp \
+	hex.cpp \
+	hmac.cpp \
+	hrtimer.cpp \
+	ida.cpp \
+	idea.cpp \
+	integer.cpp \
+	iterhash.cpp \
+	luc.cpp \
+	md2.cpp \
+	md4.cpp \
+	md5.cpp \
+	misc.cpp \
+	modes.cpp \
+	mqueue.cpp \
+	mqv.cpp \
+	nbtheory.cpp \
+	network.cpp \
+	oaep.cpp \
+	osrng.cpp \
+	panama.cpp \
+	pch.cpp \
+	pkcspad.cpp \
+	polynomi.cpp \
+	pssr.cpp \
+	pubkey.cpp \
+	queue.cpp \
+	rabin.cpp \
+	randpool.cpp \
+	rc2.cpp \
+	rc5.cpp \
+	rc6.cpp \
+	rdtables.cpp \
+	rijndael.cpp \
+	ripemd.cpp \
+	rng.cpp \
+	rsa.cpp \
+	rw.cpp \
+	safer.cpp \
+	salsa.cpp \
+	seal.cpp \
+	seed.cpp \
+	serpent.cpp \
+	sha.cpp \
+	shacal2.cpp \
+	shark.cpp \
+	sharkbox.cpp \
+	simple.cpp \
+	skipjack.cpp \
+	socketft.cpp \
+	sosemanuk.cpp \
+	square.cpp \
+	squaretb.cpp \
+	strciphr.cpp \
+	tea.cpp \
+	tftables.cpp \
+	tiger.cpp \
+	tigertab.cpp \
+	trdlocal.cpp \
+	ttmac.cpp \
+	twofish.cpp \
+	vmac.cpp \
+	wait.cpp \
+	wake.cpp \
+	whrlpool.cpp \
+	winpipes.cpp \
+	xtr.cpp \
+	xtrcrypt.cpp \
+	zdeflate.cpp \
+	zinflate.cpp \
+	zlib.cpp \
+	mars.cpp \
+	marss.cpp
+
+pkginclude_HEADERS = \
+	3way.h \
+	adler32.h \
+	aes.h \
+	algebra.h \
+	algparam.h \
+	arc4.h \
+	argnames.h \
+	asn.h \
+	authenc.h \
+	base32.h \
+	base64.h \
+	basecode.h \
+	bench.h \
+	blowfish.h \
+	blumshub.h \
+	camellia.h \
+	cast.h \
+	cbcmac.h \
+	ccm.h \
+	channels.h \
+	cmac.h \
+	config.h \
+	cpu.h \
+	crc.h \
+	cryptlib.h \
+	default.h \
+	des.h \
+	dh2.h \
+	dh.h \
+	dll.h \
+	dmac.h \
+	dsa.h \
+	eax.h \
+	ec2n.h \
+	eccrypto.h \
+	ecp.h \
+	elgamal.h \
+	emsa2.h \
+	eprecomp.h \
+	esign.h \
+	factory.h \
+	files.h \
+	filters.h \
+	fips140.h \
+	fltrimpl.h \
+	gcm.h \
+	gf2_32.h \
+	gf256.h \
+	gf2n.h \
+	gfpcrypt.h \
+	gost.h \
+	gzip.h \
+	hex.h \
+	hmac.h \
+	hrtimer.h \
+	ida.h \
+	idea.h \
+	integer.h \
+	iterhash.h \
+	lubyrack.h \
+	luc.h \
+	md2.h \
+	md4.h \
+	md5.h \
+	mdc.h \
+	misc.h \
+	modarith.h \
+	modes.h \
+	modexppc.h \
+	mqueue.h \
+	mqv.h \
+	nbtheory.h \
+	network.h \
+	nr.h \
+	oaep.h \
+	oids.h \
+	osrng.h \
+	panama.h \
+	pch.h \
+	pkcspad.h \
+	polynomi.h \
+	pssr.h \
+	pubkey.h \
+	pwdbased.h \
+	queue.h \
+	rabin.h \
+	randpool.h \
+	rc2.h \
+	rc5.h \
+	rc6.h \
+	rijndael.h \
+	ripemd.h \
+	rng.h \
+	rsa.h \
+	rw.h \
+	safer.h \
+	salsa.h \
+	seal.h \
+	secblock.h \
+	seckey.h \
+	seed.h \
+	serpent.h \
+	shacal2.h \
+	sha.h \
+	shark.h \
+	simple.h \
+	skipjack.h \
+	smartptr.h \
+	socketft.h \
+	sosemanuk.h \
+	square.h \
+	stdcpp.h \
+	strciphr.h \
+	tea.h \
+	tiger.h \
+	trdlocal.h \
+	trunhash.h \
+	ttmac.h \
+	twofish.h \
+	vmac.h \
+	wait.h \
+	wake.h \
+	whrlpool.h \
+	winpipes.h \
+	words.h \
+	xtrcrypt.h \
+	xtr.h \
+	zdeflate.h \
+	zinflate.h \
+	zlib.h \
+	mars.h
+
+
+noinst_HEADERS = \
+	local.h \
+	resource.h \
+	serpentp.h
+	validate.h
+
+bin_PROGRAMS = cryptest
+cryptest_SOURCES = \
+	bench.cpp \
+	bench2.cpp \
+	test.cpp \
+	validat1.cpp \
+	validat2.cpp \
+	validat3.cpp \
+	datatest.cpp \
+	regtest.cpp \
+	fipsalgt.cpp \
+	dlltest.cpp
+	
+nodist_cryptest_SOURCES = adhoc.cpp
+CLEANFILES = adhoc.cpp
+cryptest_LDADD = $(lib_LTLIBRARIES)
+
+adhoc.cpp: Makefile
+	if test -f adhoc.cpp; then      \
+	  touch adhoc.cpp;              \
+	else                            \
+	  cp adhoc.cpp.proto adhoc.cpp; \
+	fi

cryptopp-5.6.1-s390.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cryptopp-5.6.1-s390.patch ---
--- cryptopp-5.6.1/config.h	2009-09-04 13:37:59.000000000 +0300
+++ cryptopp-5.6.1/config.h	2009-11-26 03:47:15.000000000 +0200
@@ -4,7 +4,7 @@
 // ***************** Important Settings ********************
 
 // define this if running on a big-endian CPU
-#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))
+#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__s390__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))
 #	define IS_BIG_ENDIAN
 #endif
 
@@ -127,7 +127,7 @@
 	typedef word64 word;
 #else
 	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE
-	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
+	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) || defined(__s390x__)
 		#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
 			// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
 			// mode(TI) division broken on amd64 with GCC earlier than GCC 3.4


--- NEW FILE cryptopp.pc ---
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib 
includedir=${prefix}/include 

Name: Crypto++
Description: General purpose cryptographic shared library
URL: http://www.cryptopp.com
Version: 5.6.1
Requires:
Libs: -lcryptopp
Cflags:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Mar 2009 10:03:24 -0000	1.3
+++ .cvsignore	17 Dec 2009 15:14:20 -0000	1.4
@@ -1 +1 @@
-cryptopp560.zip
+cryptopp-5.6.1.svn479.tar.bz2


Index: cryptopp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/F-11/cryptopp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cryptopp.spec	9 Jun 2009 06:14:00 -0000	1.5
+++ cryptopp.spec	17 Dec 2009 15:14:21 -0000	1.6
@@ -1,40 +1,37 @@
 Name:           cryptopp
-Version:        5.6.0
-Release:        2%{?dist}
+Version:        5.6.1
+Release:        0.1.svn479%{?dist}
 Summary:        Public domain C++ class library of cryptographic schemes
 License:        Public Domain
 Group:          System Environment/Libraries
 URL:            http://www.cryptopp.com/
-Source0:        http://www.cryptopp.com/cryptopp560.zip
-# Used to purge the source from patented code, see http://www.cryptopp.com/License.txt
-Source10:       cryptopp-remove-patented-code.sh
-Patch0:         cryptopp-5.6.0-autotools.patch
-Patch1:         cryptopp-5.6.0-gcc4.3.patch
-# Don't try to build the patented code
-Patch2:         cryptopp-5.6.0-nomars.patch
-# Add support for s390/s390x
-Patch3:         cryptopp-5.6.0-s390.patch
+#Source0:        http://www.cryptopp.com/cryptopp560.zip
+
+# The source for this package was pulled from upstream's vcs.
+# Use the following commands to generate the tarball:
+#  svn export -r 479 https://cryptopp.svn.sourceforge.net/svnroot/cryptopp/trunk/c5 cryptopp
+#  tar -cjf cryptopp-5.6.1.svn479.tar.bz2 cryptopp
+Source0:        cryptopp-5.6.1.svn479.tar.bz2
+Source1:        cryptopp.pc
+Patch0:         cryptopp-5.6.1-autotools.patch
+Patch1:         cryptopp-5.6.1-s390.patch
 BuildRequires:  doxygen, autoconf, libtool
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Crypto++ Library is a free C++ class library of cryptographic schemes. 
+Crypto++ Library is a free C++ class library of cryptographic schemes.
 See http://www.cryptopp.com/ for a list of supported algorithms.
 
-One purpose of Crypto++ is to act as a repository of public domain 
-(not copyrighted) source code. Although the library is copyrighted as a 
-compilation, the individual files in it (except for a few exceptions listed
-in the license) are in the public domain.
-
-The MARS implementation may be subjected to patents, therefore it has been
-removed from this package.
+One purpose of Crypto++ is to act as a repository of public domain
+(not copyrighted) source code. Although the library is copyrighted as a
+compilation, the individual files in it are in the public domain.
 
 
 %package devel
 Summary:        Header files and development documentation for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-
+Requires:       pkgconfig
 %description devel
 Crypto++ Library is a free C++ class library of cryptographic schemes.
 
@@ -53,6 +50,7 @@ This package contains documentation for 
 %package progs
 Summary:        Programs for manipulating %{name} routines
 Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
 
 %description progs
 Crypto++ Library is a free C++ class library of cryptographic schemes.
@@ -60,12 +58,13 @@ Crypto++ Library is a free C++ class lib
 This package contains programs for manipulating %{name} routines.
 
 %prep
-%setup -q -c
-%patch2 -p1 -b .nomars
+
+cp %{SOURCE1} .
+
+%setup -q -n %{name}
 rm -f GNUmakefile
 %patch0 -p1
-%patch1 -p1 -b .gcc4.3
-%patch3 -p1 -b .s390
+%patch1 -p1 -b .s390
 autoreconf --verbose --force --install
 perl -pi -e 's/\r$//g' License.txt Readme.txt
 
@@ -81,10 +80,11 @@ doxygen
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/cryptopp.pc
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c "
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-
 %check
 ./cryptest v 2>&1 | tee cryptest.log
 grep -qs '^FAILED' cryptest.log && exit 1 || :
@@ -107,6 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cryptopp
 %defattr(-,root,root,0755)
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/cryptopp.pc
 
 %files doc
 %defattr(0644,root,root,0755)
@@ -118,6 +119,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 5.6.1-0.1.svn479
+- svn r479. MARS placed in the public domain by Wei Dai
+- Fixes rhbz#539227
+
+* Fri Oct 30 2009 Rahul Sundaram <sundaram at fedoraproject.org> 5.6.0-5
+- Fix source
+
+* Wed Oct 28 2009 Rahul Sundaram <sundaram at fedoraproject.org> 5.6.0-4
+- Add pkgconfig file. Fixes rhbz#512761
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun  9 2009 Dan Horak <dan[at]dannu.cz> 5.6.0-2
 - add support for s390/s390x
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptopp/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Mar 2009 10:03:25 -0000	1.3
+++ sources	17 Dec 2009 15:14:21 -0000	1.4
@@ -1 +1 @@
-84c4217a27f05303cdb1dc2af7182dba  cryptopp560.zip
+caedd2488d642f839a1d5169a28b0d01  cryptopp-5.6.1.svn479.tar.bz2


--- cryptopp-5.6.0-autotools.patch DELETED ---


--- cryptopp-5.6.0-gcc4.3.patch DELETED ---


--- cryptopp-5.6.0-nomars.patch DELETED ---


--- cryptopp-5.6.0-s390.patch DELETED ---


--- cryptopp-remove-patented-code.sh DELETED ---



From pkgdb at fedoraproject.org  Thu Dec 17 15:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 15:32:19 +0000
Subject: [pkgdb] acl had acl change status
Message-ID: <20091217153220.8721F28ED50@bastion3.fedora.phx2.redhat.com>

steved has set the commit acl on acl (Fedora devel) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 15:32:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 15:32:38 +0000
Subject: [pkgdb] acl had acl change status
Message-ID: <20091217153241.62A4D28ED58@bastion3.fedora.phx2.redhat.com>

steved has set the commit acl on acl (Fedora 11) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Thu Dec 17 15:32:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 15:32:40 +0000
Subject: [pkgdb] acl had acl change status
Message-ID: <20091217153242.26CEA28ED55@bastion3.fedora.phx2.redhat.com>

steved has set the commit acl on acl (Fedora 12) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/acl



From mclasen at fedoraproject.org  Thu Dec 17 15:33:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 15:33:39 +0000 (UTC)
Subject: File gnome-desktop-2.28.2.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091217153339.7D9AB28ED53@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gnome-desktop:

036423159a3240a258cc3892573f0e0f  gnome-desktop-2.28.2.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 17 15:37:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 15:37:30 +0000 (UTC)
Subject: rpms/gnome-desktop/F-12 .cvsignore, 1.91, 1.92 gnome-desktop.spec, 
	1.234, 1.235 sources, 1.91, 1.92
Message-ID: <20091217153731.0032D11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27942

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- .cvsignore	22 Oct 2009 14:31:16 -0000	1.91
+++ .cvsignore	17 Dec 2009 15:37:29 -0000	1.92
@@ -1 +1 @@
-gnome-desktop-2.28.1.tar.bz2
+gnome-desktop-2.28.2.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/gnome-desktop.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- gnome-desktop.spec	15 Dec 2009 14:55:47 -0000	1.234
+++ gnome-desktop.spec	17 Dec 2009 15:37:29 -0000	1.235
@@ -11,8 +11,8 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.28.1
-Release: 7%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -134,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Dec 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
+- Update to 2.28.2
+- See http://download.gnome.org/sources/gnome-desktop/2.28/gnome-desktop-2.28.2.news
+
 * Sun Dec 13 2009 Jon McCann <jmccann at redhat.com> - 2.28.1-7
 - Better per-monitor backgrounds patch (gnome #147808)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	22 Oct 2009 14:31:16 -0000	1.91
+++ sources	17 Dec 2009 15:37:29 -0000	1.92
@@ -1 +1 @@
-6870b71b564dc902af65ddee176e603f  gnome-desktop-2.28.1.tar.bz2
+036423159a3240a258cc3892573f0e0f  gnome-desktop-2.28.2.tar.bz2



From theinric at fedoraproject.org  Thu Dec 17 15:43:08 2009
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Thu, 17 Dec 2009 15:43:08 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog.spec,1.65,1.66
Message-ID: <20091217154308.97EB611C00E6@cvs1.fedora.phx.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29291

Modified Files:
	rsyslog.spec 
Log Message:
change exec-prefix to /




Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- rsyslog.spec	9 Dec 2009 21:54:55 -0000	1.65
+++ rsyslog.spec	17 Dec 2009 15:43:08 -0000	1.66
@@ -1,9 +1,9 @@
-%define	sbindir	/sbin
+%define _exec_prefix /
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 4.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -93,8 +93,7 @@ libtoolize && aclocal && autoconf && aut
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
-%configure	--sbindir=%{sbindir} \
-		--disable-static \
+%configure	--disable-static \
 		--disable-testbench \
 		--enable-mysql \
 		--enable-pgsql \
@@ -169,7 +168,7 @@ fi	
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %{_initrddir}/rsyslog
-%{sbindir}/rsyslogd
+%{_sbindir}/rsyslogd
 %{_mandir}/*/*
 
 %files mysql
@@ -198,6 +197,9 @@ fi	
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Thu Dec 17 2009 Tomas Heinrich <theinric at redhat.com> 4.4.2-3
+- change exec-prefix to /
+
 * Wed Dec 09 2009 Robert Scheck <robert at fedoraproject.org> 4.4.2-2
 - run libtoolize to avoid errors due mismatching libtool version
 



From mtasaka at fedoraproject.org  Thu Dec 17 15:58:40 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 17 Dec 2009 15:58:40 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria-0.6.6alpha-rake-prefix.patch, NONE,
	1.1 alexandria.spec, 1.44,
	1.45 alexandria-0.6.6alpha1-installprefix.patch, 1.1, NONE
Message-ID: <20091217155840.DD28311C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32044

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.6alpha-rake-prefix.patch 
Removed Files:
	alexandria-0.6.6alpha1-installprefix.patch 
Log Message:
* Fri Dec 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.2.alpha
- Use "rake install_package_staging" as explained by the upstream
  (in alexandria-Bugs-27578)
- Kill the creation of 64/128 icons as scalable svg is already installed


alexandria-0.6.6alpha-rake-prefix.patch:
 Rakefile                     |   70 ++++++++++++-------
 util/rake/fileinstall.rb     |  156 ++++++++++++++++++++++++++++++-------------
 util/rake/gettextgenerate.rb |    2 
 util/rake/omfgenerate.rb     |    2 
 4 files changed, 159 insertions(+), 71 deletions(-)

--- NEW FILE alexandria-0.6.6alpha-rake-prefix.patch ---
Index: Rakefile
===================================================================
--- Rakefile	(revision 1111)
+++ Rakefile	(revision 1116)
@@ -1,4 +1,28 @@
 # -*- ruby -*-
+#--
+# Copyright (C) 2009 Cathal Mc Ginley
+#
+# This file is part of the Alexandria build system.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
 
 begin
   require 'rake'
@@ -38,46 +62,44 @@
   o.generate_omf('data/omf/alexandria', 'data/omf/alexandria/*.in') 
 end
 
-debinstall = FileInstallTask.new(:debian_install, stage_dir, true) do |i|
+def install_common(install_task)
+  install_task.install_exe('bin', 'bin/*', "#{PREFIX}/bin")
+  install_task.install('lib', 'lib/**/*.rb', install_task.rubylib)
 
-  i.install_exe('bin', 'bin/*', "#{PREFIX}/bin")
-  i.install('lib', 'lib/**/*.rb', i.rubylib)
-
   share_files = ['data/alexandria/**/*', 'data/gnome/**/*.*',
                  'data/locale/**/*.mo', 'data/omf/**/*.omf', 
                  'data/sounds/**/*.wav'] #, 'data/menu/*']
-  i.install('data', share_files, SHARE)
+  install_task.install('data', share_files, SHARE)
 
   icon_files = ['data/app-icon/**/*.png', 'data/app-icon/scalable/*.svg']
-  i.install_icons(icon_files, "#{SHARE}/icons")
-  i.install('data/app-icon/32x32', 'data/app-icon/32x32/*.xpm', "#{SHARE}/pixmaps")
+  install_task.install_icons(icon_files, "#{SHARE}/icons")
+  install_task.install('data/app-icon/32x32', 'data/app-icon/32x32/*.xpm', "#{SHARE}/pixmaps")
 
-  i.install('','schemas/alexandria.schemas', "#{SHARE}/gconf")
-  i.install('', 'alexandria.desktop', "#{SHARE}/applications")
-  i.install('doc','doc/alexandria.1', "#{SHARE}/man/man1")
+  install_task.install('','schemas/alexandria.schemas', "#{SHARE}/gconf")
+  install_task.install('', 'alexandria.desktop', "#{SHARE}/applications")
+  install_task.install('doc','doc/alexandria.1', "#{SHARE}/man/man1")
 
+end
 
+debinstall = FileInstallTask.new(:package_staging, stage_dir, true) do |i|
+  install_common(i)
+
 end
 
-debinstall.similar(:install_files) do |j|
+task :debian_install => :install_package_staging
+
+packageinstall = FileInstallTask.new(:package) do |j|
+  install_common(j)
+
   docs = ['README', 'NEWS', 'INSTALL', 'COPYING', 'TODO']
   devel_docs = ['doc/AUTHORS', 'doc/BUGS', 'doc/FAQ', 
                 'doc/cuecat_support.rdoc']
   j.install('', docs, "#{SHARE}/doc/#{PROJECT}") 
   j.install('doc', devel_docs, "#{SHARE}/doc/#{PROJECT}")
 
-  j.uninstall_empty_dirs(["#{SHARE}/**/#{PROJECT}",
-                          "#{j.rubylib}/#{PROJECT}"
+  j.uninstall_empty_dirs(["#{SHARE}/**/#{PROJECT}/",
+                          "#{j.rubylib}/#{PROJECT}/"
                          ])
-=begin
-  j.uninstall_empty_dirs(["#{SHARE}/sounds/#{PROJECT}",
-                          "#{SHARE}/gnome/help/#{PROJECT}",
-                          "#{SHARE}/omf/#{PROJECT}",
-                          "#{SHARE}/doc/#{PROJECT}",
-                          "#{SHARE}/#{PROJECT}",
-                          "#{j.rubylib}/#{PROJECT}"
-                         ])
-=end
 end
 
 
@@ -296,7 +318,7 @@
 task :post_install => [:scrollkeeper, :gconf, :update_icon_cache]
 
 desc "Install Alexandria"
-task :install => [:pre_install, :install_files, :post_install]
+task :install => [:pre_install, :install_package, :post_install]
 
 desc "Uninstall Alexandria"
-task :uninstall => [:un_install_files, :un_install_files_empty_dirs]
+task :uninstall => [:uninstall_package] # TODO gconf etc...
Index: util/rake/gettextgenerate.rb
===================================================================
--- util/rake/gettextgenerate.rb	(revision 1111)
+++ util/rake/gettextgenerate.rb	(revision 1116)
@@ -2,7 +2,7 @@
 #--
 # Copyright (C) 2009 Cathal Mc Ginley
 #
-# This file is part of the Palatina build system.
+# This file is part of the Alexandria build system.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
Index: util/rake/fileinstall.rb
===================================================================
--- util/rake/fileinstall.rb	(revision 1111)
+++ util/rake/fileinstall.rb	(revision 1116)
@@ -2,7 +2,7 @@
 #--
 # Copyright (C) 2009 Cathal Mc Ginley
 #
-# This file is part of the Palatina build system.
+# This file is part of the Alexandria build system.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -58,21 +58,17 @@
   # Debian, set +dirname+ to 'debian/packagename' and
   # +install_to_rubylibdir+ to true so that files are stage-installed
   # to 'debian/packagename/usr/lib/ruby/1.8'
-  def initialize(taskname=nil, dirname=nil, install_to_rubylibdir=false)
+  def initialize(taskname, dirname=nil, install_to_rubylibdir=false)
     @taskname = taskname
     @install_to_rubylibdir = install_to_rubylibdir
     calculate_ruby_dir
     @stage_dir = dirname # || @prefix
     @file_groups = []
+    @dirs_to_remove_globs
     if block_given?
       yield self
     end
-    if taskname
-      # taskname will be nil for newly cloned tasked (c.f. #similar)
-      # so we don't make the new task yet...
-      make_tasks
-    end
-
+    make_tasks
   end
 
   protected
@@ -80,47 +76,71 @@
   # Creates the install and uninstall tasks based on the contents
   # of the @file_groups list
   def make_tasks
+    tasknames = {}
+    tasknames[:install] = "install_#{@taskname}".intern
+    tasknames[:uninstall] = "uninstall_#{@taskname}".intern
+    tasknames[:uninstall_files] = "uninstall_#{@taskname}_files".intern
+    tasknames[:uninstall_dirs] = "uninstall_#{@taskname}_dirs".intern
+
+    # INSTALL TASK
+
     description = "Install package files"
     if @stage_dir
       description += " to staging directory"
     end
     desc description
-    task @taskname do
+    task tasknames[:install] do
       @file_groups.each {|g| g.install(@stage_dir) }
     end    
 
+    # UNINSTALL TASKS
+
+    task tasknames[:uninstall_files] do
+      @file_groups.each {|g| g.uninstall(@stage_dir) }
+    end    
+
+    task tasknames[:uninstall_dirs] => tasknames[:uninstall_files] do
+      all_dirs = Set.new
+      @file_groups.each {|g| g.get_installation_dirs(@stage_dir, all_dirs) }
+      
+
+      #all_dirs.sort.each {|dir| puts dir }
+      to_delete = Set.new
+      @dirs_to_remove_globs.each do |glob|
+        regex = glob2regex(glob)
+        all_dirs.each do |dir|
+          unless dir =~ /\/$/
+            dir += '/'
+          end
+          if regex =~ dir            
+            #puts "SHOULD DELETE #{dir} #{$1} ; "             
+            to_delete << $1
+          end
+        end
+      end
+      to_delete.each do |dirname|
+        dir = dirname
+        if @stage_dir
+          dir = File.join(@stage_dir, dirname)
+        end
+        delete_empty(dir)
+      end
+    end
+
     uninstall_description = "Uninstall package files"
     if @stage_dir
-      description += " from staging directory"
-    end
-    
-    #desc uninstall_description
-    task "un_#{@taskname}".intern do
-      @dirs = Set.new
-      @file_groups.each {|g| g.uninstall(@stage_dir, @dirs) }
-    end    
+      uninstall_description += " from staging directory"
+    end   
+    desc uninstall_description
+    task tasknames[:uninstall] => [tasknames[:uninstall_files], 
+                                   tasknames[:uninstall_dirs]]
+
   end
+  
 
-  attr_accessor :file_groups, :stage_dir, :taskname
 
   public
 
-
-  # Makes a copy of this install task, with the same file groups
-  # already set, but to which more file groups can be added without
-  # interference.
-  def similar(taskname, dirname=nil, install_to_rubylibdir=false)
-    newtask = self.dup
-    newtask.taskname = taskname
-    newtask.stage_dir = dirname
-    if block_given?
-      yield newtask 
-    end   
-    newtask.make_tasks
-    newtask
-  end
-    
-  
   # Include the files specified in the +file_glob+ to be installed in
   # +dest_dir+, but noting that the prefix +src_dir+ is to be
   # disregarded in the installation.
@@ -151,7 +171,9 @@
         icon_dir = icon_file.dirname
         icon_size = Pathname.new(icon_dir).basename
         icon_dest_dir = "#{dest_dir}/#{theme}/#{icon_size}/#{icon_type}"
-        @file_groups << FileGroup.new(icon_dir, f, icon_dest_dir)
+        group = FileGroup.new(icon_dir, f, icon_dest_dir)
+        group.description = "icons"
+        @file_groups << group
       end
     end
   end
@@ -159,12 +181,7 @@
   # Specify which directories should be deleted by the uninstall task
   # if they are empty (or only contain more empty directories).
   def uninstall_empty_dirs(dir_globs)
-    task "un_#{@taskname}_empty_dirs".intern => "un_#{@taskname}".intern do
-      puts "TODO implement uninstall_empty_dirs"
-      #FileList.new(dir_globs).each do |f|
-      #  puts f
-      #end
-    end
+    @dirs_to_remove_globs = dir_globs
   end
 
   private
@@ -190,14 +207,53 @@
     end
   end
 
+  def glob2regex(pathglob)
+    if pathglob =~ /\*\*$/
+      pathglob += "/"
+    end
+    real_parts = pathglob.split("**/")
+    real_parts.each do |part|
+      part.gsub!(".", "\\.")
+      part.gsub!("*", "[^\\/]*")
+      part.gsub!("?", "[^\\/]")
+      #puts part
+    end
+    pattern = real_parts.join("([^\/]+\/)*")
+    return /(#{pattern})/
+  end
 
+  # For each of the directories named in the list +dirs+, delete the
+  # tree if is empty except for further empty directories.
+  def delete_empty(dirs)
+    dirs.each do |d|
+      p = Pathname.new(d)
+      if p.exist?
+        delete_if_empty(p.realpath)
+      end
+    end
+  end
+
+  
+  # Delete the directory at the given Pathname +p+ if all its children
+  # can be similarly deleted, and if it is then empty.
+  def delete_if_empty(p)
+    p.children.each do |c|
+      delete_if_empty(c)
+    end
+    if p.children.empty?
+      p.delete # TODO optional verbose output here
+    end
+  end
+
   class FileGroup
     attr_reader :mode
+    attr_accessor :description
     def initialize(src_dir, file_glob, dest_dir, mode=0644)
       @src_dir = src_dir
       @file_glob = file_glob
       @dest_dir = dest_dir
       @mode = mode
+      @description = "files"
     end
     def to_s
       "FileGroup[#{@src_dir}]"
@@ -224,27 +280,37 @@
     end
 
     def install(base_dir)
+      puts "Installing #{@description} to #{@dest_dir}"
       files.each do |f|
         dest = self.dest_dir(f, base_dir)
         FileUtils.mkdir_p(dest) unless test(?d, dest)
         if test(?f, f)
-          FileUtils::Verbose.install(f, dest, :mode => self.mode)
+          FileUtils.install(f, dest, :mode => self.mode)
         end
       end
     end
 
-    def uninstall(base_dir, dirs)
+    def uninstall(base_dir)
       files.each do |f|
         dest = self.dest_dir(f, base_dir)
         filename = File.basename(f)
         file = File.join(dest, filename)
         if test(?f, file)
-          FileUtils::Verbose.rm_f(file) #, :noop => true)
-          dirs << File.dirname(file)
+          FileUtils.rm_f(file) #, :noop => true)
         end
       end
     end
 
+    def get_installation_dirs(base_dir, all_dirs_set)
+      files.each do |f|
+        dest = self.dest_dir(f, base_dir)
+        filename = File.basename(f)
+        file = File.join(dest, filename)
+        all_dirs_set << File.dirname(file)
+      end
+    end
+      
+
   end # class FileGroup
 
 end # class FileInstallTask
Index: util/rake/omfgenerate.rb
===================================================================
--- util/rake/omfgenerate.rb	(revision 1111)
+++ util/rake/omfgenerate.rb	(revision 1116)
@@ -2,7 +2,7 @@
 #--
 # Copyright (C) 2009 Cathal Mc Ginley
 #
-# This file is part of the Palatina build system.
+# This file is part of the Alexandria build system.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- alexandria.spec	16 Dec 2009 18:58:41 -0000	1.44
+++ alexandria.spec	17 Dec 2009 15:58:40 -0000	1.45
@@ -6,7 +6,7 @@
 %define		majorver	0.6.6
 %define		minorver	alpha
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -24,9 +24,8 @@ Source0:	https://launchpad.net/~alexandr
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Add install_prefix
-# Will ask upstream
-Patch10:	alexandria-0.6.6alpha1-installprefix.patch
+# ref: aleandria-Bugs-27578
+Patch10:	alexandria-0.6.6alpha-rake-prefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -37,8 +36,6 @@ BuildRequires:	gettext
 BuildRequires:	intltool
 BuildRequires:	scrollkeeper
 
-BuildRequires:	ImageMagick
-
 Requires:	ruby
 Requires:	ruby(abi) = %{rubyabi}
 
@@ -78,7 +75,7 @@ Alexandria is a GNOME application to hel
 #%%setup -q -n %{name}-%{majorver}%{?minorver}
 %setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-%patch10 -p1 -b .prefix
+%patch10 -p0 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -91,44 +88,22 @@ rake build
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# disable scrollkeeper
-%{__rm} -rf tmpbin
-%{__mkdir} tmpbin
-%{__ln_s} -f /bin/true tmpbin/scrollkeeper-update
-%{__ln_s} -f /bin/true tmpbin/gconftool-2
-%{__ln_s} -f /bin/true tmpbin/gtk-update-icon-cache
-
-export PATH="$(pwd)/tmpbin:$PATH"
-export RUBYLIBDIR=%{ruby_sitelib}
-#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-rake install \
-	install_prefix=$RPM_BUILD_ROOT
+rake install_package_staging \
+	DESTDIR=$RPM_BUILD_ROOT \
+	RUBYLIBDIR=%{ruby_sitelib}
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
 	--vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# create 64x64, 128x128 icon
-for s in 64 128 ; do
-	%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/
-	convert -scale ${s}x${s} \
-		data/alexandria/icons/%{name}.png \
-		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
-done
-
 # Move gconf files to where Fedora uses
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mv} \
 	$RPM_BUILD_ROOT%{_datadir}/gconf/ \
 	$RPM_BUILD_ROOT%{_sysconfdir}/
 
-# Clean up documents
-%{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir}
-
 # %%{_datadir}/menu seems to be used for debian
 # Removing for Fedora
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/
@@ -207,6 +182,11 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Fri Dec 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.2.alpha
+- Use "rake install_package_staging" as explained by the upstream
+  (in alexandria-Bugs-27578)
+- Kill the creation of 64/128 icons as scalable svg is already installed
+
 * Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
 - Try 0.6.6 alpha
 


--- alexandria-0.6.6alpha1-installprefix.patch DELETED ---



From dwalsh at fedoraproject.org  Thu Dec 17 16:18:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Dec 2009 16:18:15 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils.spec,1.659,1.660
Message-ID: <20091217161815.9DF8611C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3095

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-6
- Add setools-libs-python to requires for gui



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -p -r1.659 -r1.660
--- policycoreutils.spec	17 Dec 2009 14:39:30 -0000	1.659
+++ policycoreutils.spec	17 Dec 2009 16:18:13 -0000	1.660
@@ -1,8 +1,9 @@
 %define	libauditver	1.4.2-1
-%define	libsepolver	2.0.41-1
-%define	libsemanagever	2.0.43-2
-%define	libselinuxver	2.0.90-1
+%define	libsepolver	2.0.38-1
+%define	libsemanagever	2.0.39-2
+%define	libselinuxver	2.0.87-1
 %define	sepolgenver	1.0.19
+
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78



From jussilehtola at fedoraproject.org  Thu Dec 17 16:25:35 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 17 Dec 2009 16:25:35 +0000 (UTC)
Subject: File sources uploaded to lookaside cache by jussilehtola
Message-ID: <20091217162535.CB97C28ED56@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for xine-ui:

d67c2f16bfb6970474ccea7d8aa8428a  sources



From jussilehtola at fedoraproject.org  Thu Dec 17 16:25:42 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 17 Dec 2009 16:25:42 +0000 (UTC)
Subject: File xine-ui-0.99.6-20091217.tar.bz2 uploaded to lookaside cache by
	jussilehtola
Message-ID: <20091217162542.831CD28ED3E@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for xine-ui:

75373e8aca45446c3708180596186ad8  xine-ui-0.99.6-20091217.tar.bz2



From jwilson at fedoraproject.org  Thu Dec 17 16:29:33 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 17 Dec 2009 16:29:33 +0000 (UTC)
Subject: rpms/kernel/devel lirc-2.6.32.patch, NONE, 1.1 config-generic, 1.341,
	1.342 kernel.spec, 1.1873, 1.1874 lirc-2.6.31.patch, 1.5, NONE
Message-ID: <20091217162933.3C60711C00E6@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5192

Modified Files:
	config-generic kernel.spec 
Added Files:
	lirc-2.6.32.patch 
Removed Files:
	lirc-2.6.31.patch 
Log Message:
* Thu Dec 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.32.1-11
- Split off onboard decode imon devices into pure input driver,
  leaving lirc_imon for the ancient imon devices only
- Fix NULL ptr deref in lirc_serial (#543886)
- Assorted lirc_mceusb fixups suggested by Mauro
- Dropped compat ioctls from lirc_dev, main ioctls should now be
  compatible between 32-bit and 64-bit (also at Mauro's suggestion)


lirc-2.6.32.patch:
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  116 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc_bt829.c       |  383 ++++++
 drivers/input/lirc/lirc_dev.c         |  737 +++++++++++
 drivers/input/lirc/lirc_dev.h         |  194 +++
 drivers/input/lirc/lirc_ene0100.c     |  646 ++++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  538 ++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 1054 +++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 +++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  540 ++++++++
 drivers/input/lirc/lirc_mceusb.c      | 1216 +++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 +++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1317 +++++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
 drivers/input/lirc/lirc_zilog.c       | 1396 ++++++++++++++++++++++
 drivers/input/misc/Kconfig            |   11 
 drivers/input/misc/Makefile           |    1 
 drivers/input/misc/imon.c             | 2102 ++++++++++++++++++++++++++++++++++
 drivers/input/misc/imon.h             |  210 +++
 include/linux/lirc.h                  |  100 +
 29 files changed, 16553 insertions(+)

--- NEW FILE lirc-2.6.32.patch ---
 drivers/input/Kconfig                 |    2 +
 drivers/input/Makefile                |    2 +
 drivers/input/lirc/Kconfig            |  116 ++
 drivers/input/lirc/Makefile           |   21 +
 drivers/input/lirc/lirc_bt829.c       |  383 ++++++
 drivers/input/lirc/lirc_dev.c         |  737 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  194 +++
 drivers/input/lirc/lirc_ene0100.c     |  646 ++++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 +++
 drivers/input/lirc/lirc_i2c.c         |  538 +++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++++
 drivers/input/lirc/lirc_imon.c        | 1054 +++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 ++
 drivers/input/lirc/lirc_ite8709.c     |  540 +++++++++
 drivers/input/lirc/lirc_mceusb.c      | 1216 +++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 +++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 +
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1317 +++++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++++
 drivers/input/lirc/lirc_zilog.c       | 1396 ++++++++++++++++++++++
 drivers/input/misc/Kconfig            |   11 +
 drivers/input/misc/Makefile           |    1 +
 drivers/input/misc/imon.c             | 2102 +++++++++++++++++++++++++++++++++
 drivers/input/misc/imon.h             |  210 ++++
 include/linux/lirc.h                  |  100 ++
 29 files changed, 16553 insertions(+), 0 deletions(-)

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 07c2cd4..ebc8743 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -183,6 +183,8 @@ source "drivers/input/tablet/Kconfig"
 
 source "drivers/input/touchscreen/Kconfig"
 
+source "drivers/input/lirc/Kconfig"
+
 source "drivers/input/misc/Kconfig"
 
 endif
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 7ad212d..cb119e7 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -26,3 +26,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
 obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
 
 obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
+
+obj-$(CONFIG_INPUT_LIRC)       += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
index 0000000..86fc063
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,116 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig INPUT_LIRC
+	tristate "Linux Infrared Remote Control IR receiver/transmitter drivers"
+	help
+	  Say Y here, and all supported Linux Infrared Remote Control IR and
+	  RF receiver and transmitter drivers will be displayed. When paired
+	  with a remote control and the lirc daemon, the receiver drivers
+	  allow control of your Linux system via remote control.
+
+if INPUT_LIRC
+
+config LIRC_BT829
+        tristate "BT829 based hardware"
+	depends on INPUT_LIRC
+	help
+	  Driver for the IR interface on BT829-based hardware
+
+config LIRC_ENE0100
+	tristate "ENE KB3924/ENE0100 CIR Port Reciever"
+	depends on INPUT_LIRC
+	help
+	  This is a driver for CIR port handled by ENE KB3924 embedded
+	  controller found on some notebooks.
+	  It appears on PNP list as ENE0100.
+
+config LIRC_I2C
+	tristate "I2C Based IR Receivers"
+	depends on INPUT_LIRC
+	help
+	  Driver for I2C-based IR receivers, such as those commonly
+	  found onboard Hauppauge PVR-150/250/350 video capture cards
+
+config LIRC_IGORPLUGUSB
+	tristate "Igor Cesko's USB IR Receiver"
+	depends on INPUT_LIRC && USB
+	help
+	  Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+	tristate "Legacy SoundGraph iMON Receiver and Display"
+	depends on INPUT_LIRC
+	help
+	  Driver for the original SoundGraph iMON IR Receiver and Display
+
+	  Current generation iMON devices use the input layer imon driver.
+
+config LIRC_IT87
+	tristate "ITE IT87XX CIR Port Receiver"
+	depends on INPUT_LIRC
+	help
+	  Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+	tristate "ITE8709 CIR Port Receiver"
+	depends on INPUT_LIRC && PNP
+	help
+	  Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+	tristate "Windows Media Center Ed. USB IR Transceiver"
+	depends on INPUT_LIRC && USB
+	help
+	  Driver for Windows Media Center Ed. USB IR Transceivers
+
+config LIRC_PARALLEL
+	tristate "Homebrew Parallel Port Receiver"
+	depends on INPUT_LIRC && !SMP
+	help
+	  Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+	tristate "Sasem USB IR Remote"
+	depends on INPUT_LIRC
+	help
+	  Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+	tristate "Homebrew Serial Port Receiver"
+	depends on INPUT_LIRC
+	help
+	  Driver for Homebrew Serial Port Receivers
+
+config LIRC_SERIAL_TRANSMITTER
+	bool "Serial Port Transmitter"
+	default y
+	depends on LIRC_SERIAL
+	help
+	  Serial Port Transmitter support
+
+config LIRC_SIR
+	tristate "Built-in SIR IrDA port"
+	depends on INPUT_LIRC
+	help
+	  Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+	tristate "Streamzap PC Receiver"
+	depends on INPUT_LIRC
+	help
+	  Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+	tristate "Technotrend USB IR Receiver"
+	depends on INPUT_LIRC && USB
+	help
+	  Driver for the Technotrend USB IR Receiver
+
+config LIRC_ZILOG
+	tristate "Zilog/Hauppauge IR Transmitter"
+	depends on INPUT_LIRC
+	help
+	  Driver for the Zilog/Hauppauge IR Transmitter, found on
+	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
+endif
diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
new file mode 100644
index 0000000..9122e87
--- /dev/null
+++ b/drivers/input/lirc/Makefile
@@ -0,0 +1,21 @@
+# Makefile for the lirc drivers.
+#
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_INPUT_LIRC)	+= lirc_dev.o
+obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
+obj-$(CONFIG_LIRC_ENE0100)	+= lirc_ene0100.o
+obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
+obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
+obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
+obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
+obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
+obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
+obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
+obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
+obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
[...16374 lines suppressed...]
+
+static const struct {
+	u32 hw_code;
+	u16 keycode;
+} imon_mce_key_table[] = {
+	/* keys sorted mostly by frequency of use to optimize lookups */
+	{ 0x800f8415, KEY_REWIND },
+	{ 0x800f8414, KEY_FASTFORWARD },
+	{ 0x800f841b, KEY_PREVIOUS },
+	{ 0x800f841a, KEY_NEXT },
+
+	{ 0x800f8416, KEY_PLAY },
+	{ 0x800f8418, KEY_PAUSE },
+	{ 0x800f8418, KEY_PAUSE },
+	{ 0x800f8419, KEY_STOP },
+	{ 0x800f8417, KEY_RECORD },
+
+	{ 0x02000052, KEY_UP },
+	{ 0x02000051, KEY_DOWN },
+	{ 0x02000050, KEY_LEFT },
+	{ 0x0200004f, KEY_RIGHT },
+
+	{ 0x02000028, KEY_ENTER },
+/* the OK and Enter buttons decode to the same value
+	{ 0x02000028, KEY_OK }, */
+	{ 0x0200002a, KEY_EXIT },
+	{ 0x02000029, KEY_DELETE },
+
+	{ 0x800f840e, KEY_MUTE },
+	{ 0x800f8410, KEY_VOLUMEUP },
+	{ 0x800f8411, KEY_VOLUMEDOWN },
+	{ 0x800f8412, KEY_CHANNELUP },
+	{ 0x800f8413, KEY_CHANNELDOWN },
+
+	{ 0x0200001e, KEY_NUMERIC_1 },
+	{ 0x0200001f, KEY_NUMERIC_2 },
+	{ 0x02000020, KEY_NUMERIC_3 },
+	{ 0x02000021, KEY_NUMERIC_4 },
+	{ 0x02000022, KEY_NUMERIC_5 },
+	{ 0x02000023, KEY_NUMERIC_6 },
+	{ 0x02000024, KEY_NUMERIC_7 },
+	{ 0x02000025, KEY_NUMERIC_8 },
+	{ 0x02000026, KEY_NUMERIC_9 },
+	{ 0x02000027, KEY_NUMERIC_0 },
+
+	{ 0x02200025, KEY_NUMERIC_STAR },
+	{ 0x02200020, KEY_NUMERIC_POUND },
+
+	{ 0x800f8446, KEY_TV },
+	{ 0x800f8447, KEY_AUDIO },
+	{ 0x800f8448, KEY_PVR }, /* RecordedTV */
+	{ 0x800f8449, KEY_CAMERA },
+	{ 0x800f844a, KEY_VIDEO },
+	{ 0x800f8424, KEY_DVD },
+	{ 0x800f8425, KEY_TUNER }, /* LiveTV */
+
+	{ 0x800f845b, KEY_RED },
+	{ 0x800f845c, KEY_GREEN },
+	{ 0x800f845d, KEY_YELLOW },
+	{ 0x800f845e, KEY_BLUE },
+
+	{ 0x800f840f, KEY_INFO },
+	{ 0x800f8426, KEY_EPG }, /* Guide */
+	{ 0x800f845a, KEY_SUBTITLE }, /* Caption */
+
+	{ 0x800f840c, KEY_POWER },
+	{ 0x800f840d, KEY_PROG1 }, /* Windows MCE button */
+
+};
+
+static const struct {
+	u64 hw_code;
+	u16 keycode;
+} imon_panel_key_table[] = {
+	{ 0x000000000f000fee, KEY_PROG1 }, /* Go */
+	{ 0x000000001f000fee, KEY_AUDIO },
+	{ 0x0000000020000fee, KEY_VIDEO },
+	{ 0x0000000021000fee, KEY_CAMERA },
+	{ 0x0000000027000fee, KEY_DVD },
+/* the TV key on my panel is broken, doesn't work under any OS
+	{ 0x0000000000000fee, KEY_TV }, */
+	{ 0x0000000005000fee, KEY_PREVIOUS },
+	{ 0x0000000007000fee, KEY_REWIND },
+	{ 0x0000000004000fee, KEY_STOP },
+	{ 0x000000003c000fee, KEY_PLAYPAUSE },
+	{ 0x0000000008000fee, KEY_FASTFORWARD },
+	{ 0x0000000006000fee, KEY_NEXT },
+	{ 0x0000000100000fee, KEY_RIGHT },
+	{ 0x0000010000000fee, KEY_LEFT },
+	{ 0x000000003d000fee, KEY_SELECT },
+	{ 0x0001000000000fee, KEY_VOLUMEUP },
+	{ 0x0100000000000fee, KEY_VOLUMEDOWN },
+	{ 0x0000000001000fee, KEY_MUTE },
+};
diff --git a/include/linux/lirc.h b/include/linux/lirc.h
new file mode 100644
index 0000000..c7b25a8
--- /dev/null
+++ b/include/linux/lirc.h
@@ -0,0 +1,100 @@
+/*
+ * lirc.h - linux infrared remote control header file
+ * last modified 2007/09/27
+ */
+
+#ifndef _LINUX_LIRC_H
+#define _LINUX_LIRC_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define PULSE_BIT  0x01000000
+#define PULSE_MASK 0x00FFFFFF
+
+/*** lirc compatible hardware features ***/
+
+#define LIRC_MODE2SEND(x) (x)
+#define LIRC_SEND2MODE(x) (x)
+#define LIRC_MODE2REC(x) ((x) << 16)
+#define LIRC_REC2MODE(x) ((x) >> 16)
+
+#define LIRC_MODE_RAW                  0x00000001
+#define LIRC_MODE_PULSE                0x00000002
+#define LIRC_MODE_MODE2                0x00000004
+#define LIRC_MODE_CODE                 0x00000008
+#define LIRC_MODE_LIRCCODE             0x00000010
+#define LIRC_MODE_STRING               0x00000020
+
+
+#define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
+#define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
+#define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
+#define LIRC_CAN_SEND_CODE             LIRC_MODE2SEND(LIRC_MODE_CODE)
+#define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
+#define LIRC_CAN_SEND_STRING           LIRC_MODE2SEND(LIRC_MODE_STRING)
+
+#define LIRC_CAN_SEND_MASK             0x0000003f
+
+#define LIRC_CAN_SET_SEND_CARRIER      0x00000100
+#define LIRC_CAN_SET_SEND_DUTY_CYCLE   0x00000200
+#define LIRC_CAN_SET_TRANSMITTER_MASK  0x00000400
+
+#define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
+#define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
+#define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
+#define LIRC_CAN_REC_CODE              LIRC_MODE2REC(LIRC_MODE_CODE)
+#define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
+#define LIRC_CAN_REC_STRING            LIRC_MODE2REC(LIRC_MODE_STRING)
+
+#define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
+
+#define LIRC_CAN_SET_REC_CARRIER       (LIRC_CAN_SET_SEND_CARRIER << 16)
+#define LIRC_CAN_SET_REC_DUTY_CYCLE    (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
+
+#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
+#define LIRC_CAN_SET_REC_CARRIER_RANGE    0x80000000
+#define LIRC_CAN_GET_REC_RESOLUTION       0x20000000
+
+#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
+#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
+
+#define LIRC_CAN_NOTIFY_DECODE            0x01000000
+
+/*** IOCTL commands for lirc driver ***/
+
+#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, uint64_t)
+
+#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, uint64_t)
+#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, uint64_t)
+#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, uint32_t)
+#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, uint32_t)
+#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, uint32_t)
+#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, uint32_t)
+#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, uint32_t)
+
+/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
+#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, uint64_t)
+
+#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, uint64_t)
+#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, uint64_t)
+/* Note: these can reset the according pulse_width */
+#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, uint32_t)
+#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, uint32_t)
+#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, uint32_t)
+#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, uint32_t)
+#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, uint32_t)
+
+/*
+ * to set a range use
+ * LIRC_SET_REC_DUTY_CYCLE_RANGE/LIRC_SET_REC_CARRIER_RANGE with the
+ * lower bound first and later
+ * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
+ */
+
+#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, uint32_t)
+#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, uint32_t)
+
+#define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
+
+#endif


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -p -r1.341 -r1.342
--- config-generic	3 Dec 2009 06:05:05 -0000	1.341
+++ config-generic	17 Dec 2009 16:29:32 -0000	1.342
@@ -1926,6 +1926,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_IMON=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1873
retrieving revision 1.1874
diff -u -p -r1.1873 -r1.1874
--- kernel.spec	16 Dec 2009 22:09:41 -0000	1.1873
+++ kernel.spec	17 Dec 2009 16:29:32 -0000	1.1874
@@ -677,7 +677,7 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
-Patch1515: lirc-2.6.31.patch
+Patch1515: lirc-2.6.32.patch
 Patch1517: hdpvr-ir-enable.patch
 
 # virt + ksm patches
@@ -1298,7 +1298,7 @@ ApplyPatch linux-2.6-crash-driver.patch
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
 # http://www.lirc.org/
-ApplyPatch lirc-2.6.31.patch
+ApplyPatch lirc-2.6.32.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
 
@@ -2003,6 +2003,14 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.32.1-11
+- Split off onboard decode imon devices into pure input driver,
+  leaving lirc_imon for the ancient imon devices only
+- Fix NULL ptr deref in lirc_serial (#543886)
+- Assorted lirc_mceusb fixups suggested by Mauro
+- Dropped compat ioctls from lirc_dev, main ioctls should now be
+  compatible between 32-bit and 64-bit (also at Mauro's suggestion)
+
 * Wed Dec 16 2009 Roland McGrath <roland at redhat.com> 2.6.32.1-10
 - utrace update, now testing the utrace-based ptrace!
 


--- lirc-2.6.31.patch DELETED ---



From rdieter at fedoraproject.org  Thu Dec 17 16:29:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 16:29:43 +0000 (UTC)
Subject: rpms/pulseaudio/F-12 pulseaudio.spec,1.105,1.106
Message-ID: <20091217162943.2FC8911C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/pulseaudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5342

Modified Files:
	pulseaudio.spec 
Log Message:
* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.21-2
- module-device-manager, kde autostart bits missing (#541419)



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-12/pulseaudio.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- pulseaudio.spec	23 Nov 2009 04:44:03 -0000	1.105
+++ pulseaudio.spec	17 Dec 2009 16:29:43 -0000	1.106
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -218,9 +218,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{ver
 rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{version}/modules/module-detect.so
 rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{version}/modules/module-pipe-sink.so
 rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{version}/modules/module-pipe-source.so
-rm $RPM_BUILD_ROOT%{_libdir}/pulse-%{version}/modules/module-device-manager.so
-rm $RPM_BUILD_ROOT%{_bindir}/start-pulseaudio-kde
-rm $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
 # preserve time stamps, for multilib's sake
 touch -r src/daemon/daemon.conf.in $RPM_BUILD_ROOT%{_sysconfdir}/pulse/daemon.conf
 touch -r src/daemon/default.pa.in $RPM_BUILD_ROOT%{_sysconfdir}/pulse/default.pa
@@ -285,6 +282,7 @@ exit 0
 %{_libdir}/pulse-%{version}/modules/module-cli-protocol-unix.so
 %{_libdir}/pulse-%{version}/modules/module-cli.so
 %{_libdir}/pulse-%{version}/modules/module-combine.so
+%{_libdir}/pulse-%{version}/modules/module-device-manager.so
 %{_libdir}/pulse-%{version}/modules/module-loopback.so
 %{_libdir}/pulse-%{version}/modules/module-esound-compat-spawnfd.so
 %{_libdir}/pulse-%{version}/modules/module-esound-compat-spawnpid.so
@@ -347,6 +345,8 @@ exit 0
 %files module-x11
 %defattr(-,root,root)
 %config %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
+%config %{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
+%{_bindir}/start-pulseaudio-kde
 %{_bindir}/start-pulseaudio-x11
 %{_libdir}/pulse-%{version}/modules/module-x11-bell.so
 %{_libdir}/pulse-%{version}/modules/module-x11-publish.so
@@ -439,6 +439,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.21-2
+- module-device-manager, kde autostart bits missing (#541419)
+
 * Mon Nov 23 2009 Lennart Poettering <lpoetter at redhat.com> - 0.9.21-1
 - New release
 



From akurtakov at fedoraproject.org  Thu Dec 17 16:39:39 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 17 Dec 2009 16:39:39 +0000 (UTC)
Subject: File birt-source-2_5_1.zip uploaded to lookaside cache by akurtakov
Message-ID: <20091217163939.D475728ED27@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for eclipse-birt:

bde8d1e09bb1f05f8e3caacec17db405  birt-source-2_5_1.zip



From akurtakov at fedoraproject.org  Thu Dec 17 16:47:30 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 17 Dec 2009 16:47:30 +0000 (UTC)
Subject: rpms/eclipse-birt/devel .cvsignore, 1.5, 1.6 eclipse-birt.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091217164730.BC8DF11C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-birt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8923/devel

Modified Files:
	.cvsignore eclipse-birt.spec sources 
Log Message:
Update to 2.5.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-birt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Aug 2009 21:16:02 -0000	1.5
+++ .cvsignore	17 Dec 2009 16:47:30 -0000	1.6
@@ -2,3 +2,4 @@ birt-source-2_3_1.zip
 birt-source-2_3_2.zip
 birt-source-2.5M7.zip
 birt-source-2_5_0.zip
+birt-source-2_5_1.zip


Index: eclipse-birt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-birt/devel/eclipse-birt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- eclipse-birt.spec	11 Aug 2009 21:16:02 -0000	1.7
+++ eclipse-birt.spec	17 Dec 2009 16:47:30 -0000	1.8
@@ -3,14 +3,14 @@
 %global rhinoqualifier        v20090608
 
 Name:      eclipse-birt
-Version:   2.5  
+Version:   2.5.1
 Release:   1%{?dist}
 Summary:   Eclipse-based reporting system
 Group:     System Environment/Libraries
 License:   EPL
 URL:       http://www.eclipse.org/birt/
 
-Source0:   http://mirrors.xmission.com/eclipse/birt/downloads/drops/R-R1-2_5_0-200906180630/birt-source-2_5_0.zip
+Source0:   http://download.eclipse.org/birt/downloads/drops/R-R1-2_5_1-200909220630/birt-source-2_5_1.zip
 # smil in Fedora is merged in xml-commons-apis-ext.jar, reflecting upstream changes
 Patch0:    birt-remove-smil.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 %doc features/org.eclipse.birt/epl-v10.html
 
 %changelog
+* Thu Dec 17 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5.1-1
+- Update to 2.5.1.
+
 * Wed Aug 12 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-1
 - Update to 2.5.0 final.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-birt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Aug 2009 21:16:02 -0000	1.5
+++ sources	17 Dec 2009 16:47:30 -0000	1.6
@@ -1 +1 @@
-4ac20c9fccfe9bb6b9ca3bead1bb3964  birt-source-2_5_0.zip
+bde8d1e09bb1f05f8e3caacec17db405  birt-source-2_5_1.zip



From mjg59 at fedoraproject.org  Thu Dec 17 16:49:39 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Thu, 17 Dec 2009 16:49:39 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-autoload-wmi.patch, NONE,
	1.1 linux-2.6-enable-btusb-autosuspend.patch, NONE,
	1.1 linux-2.6-fix-btusb-autosuspend.patch, NONE, 1.1 kernel.spec,
	1.1874, 1.1875 linux-2.6-driver-level-usb-autosuspend.diff, 1.1, 1.2
Message-ID: <20091217164939.A333911C00E6@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9424

Modified Files:
	kernel.spec linux-2.6-driver-level-usb-autosuspend.diff 
Added Files:
	linux-2.6-autoload-wmi.patch 
	linux-2.6-enable-btusb-autosuspend.patch 
	linux-2.6-fix-btusb-autosuspend.patch 
Log Message:
* Thu Dec 17 2009 Matthew Garrett <mjg at redhat.com> 2.6.32.1-12
- linux-2.6-driver-level-usb-autosuspend.diff: fix so it works properly...
- linux-2.6-fix-btusb-autosuspend.patch: avoid bluetooth connection drops
- linux-2.6-enable-btusb-autosuspend.patch: and default it to on
- linux-2.6-autoload-wmi.patch: autoload WMI drivers


linux-2.6-autoload-wmi.patch:
 wmi.c |  177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 173 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-autoload-wmi.patch ---
WMI provides interface-specific GUIDs that are exported from modules as
modalises, but the core currently generates no events to trigger module
loading. This patch adds support for registering devices for each WMI GUID
and generating the appropriate uevent.

Based heavily on a patch by Carlos Corbacho (<carlos at strangeworlds.co.uk>).

Signed-off-by: Matthew Garrett <mjg at redhat.com>
---
 drivers/platform/x86/wmi.c |  175 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 173 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 177f8d7..e425a86 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/device.h>
 #include <linux/list.h>
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
@@ -65,6 +66,7 @@ struct wmi_block {
 	acpi_handle handle;
 	wmi_notify_handler handler;
 	void *handler_data;
+	struct device *dev;
 };
 
 static struct wmi_block wmi_blocks;
@@ -195,6 +197,34 @@ static bool wmi_parse_guid(const u8 *src, u8 *dest)
 	return true;
 }
 
+/*
+ * Convert a raw GUID to the ACII string representation
+ */
+static int wmi_gtoa(const char *in, char *out)
+{
+	int i;
+
+	for (i = 3; i >= 0; i--)
+		out += sprintf(out, "%02X", in[i] & 0xFF);
+
+	out += sprintf(out, "-");
+	out += sprintf(out, "%02X", in[5] & 0xFF);
+	out += sprintf(out, "%02X", in[4] & 0xFF);
+	out += sprintf(out, "-");
+	out += sprintf(out, "%02X", in[7] & 0xFF);
+	out += sprintf(out, "%02X", in[6] & 0xFF);
+	out += sprintf(out, "-");
+	out += sprintf(out, "%02X", in[8] & 0xFF);
+	out += sprintf(out, "%02X", in[9] & 0xFF);
+	out += sprintf(out, "-");
+
+	for (i = 10; i <= 15; i++)
+		out += sprintf(out, "%02X", in[i] & 0xFF);
+
+	out = '\0';
+	return 0;
+}
+
 static bool find_guid(const char *guid_string, struct wmi_block **out)
 {
 	char tmp[16], guid_input[16];
@@ -555,6 +585,138 @@ bool wmi_has_guid(const char *guid_string)
 EXPORT_SYMBOL_GPL(wmi_has_guid);
 
 /*
+ * sysfs interface
+ */
+static ssize_t show_modalias(struct device *dev, struct device_attribute *attr,
+			     char *buf)
+{
+	char guid_string[37];
+	struct wmi_block *wblock;
+
+	wblock = dev_get_drvdata(dev);
+	if (!wblock)
+		return -ENOMEM;
+
+	wmi_gtoa(wblock->gblock.guid, guid_string);
+
+	return sprintf(buf, "wmi:%s\n", guid_string);
+}
+static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);
+
+static int wmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+	char guid_string[37];
+
+	struct wmi_block *wblock;
+
+	if (add_uevent_var(env, "MODALIAS="))
+		return -ENOMEM;
+
+	wblock = dev_get_drvdata(dev);
+	if (!wblock)
+		return -ENOMEM;
+
+	wmi_gtoa(wblock->gblock.guid, guid_string);
+
+	strcpy(&env->buf[env->buflen - 1], "wmi:");
+	memcpy(&env->buf[env->buflen - 1 + 4], guid_string, 36);
+	env->buflen += 40;
+
+	return 0;
+}
+
+static void wmi_dev_free(struct device *dev)
+{
+	kfree(dev);
+}
+
+static struct class wmi_class = {
+	.name = "wmi",
+	.dev_release = wmi_dev_free,
+	.dev_uevent = wmi_dev_uevent,
+};
+
+static int wmi_create_devs(void)
+{
+	int result;
+	char guid_string[37];
+	struct guid_block *gblock;
+	struct wmi_block *wblock;
+	struct list_head *p;
+	struct device *guid_dev;
+
+	/* Create devices for all the GUIDs */
+	list_for_each(p, &wmi_blocks.list) {
+		wblock = list_entry(p, struct wmi_block, list);
+
+		guid_dev = kzalloc(sizeof(struct device), GFP_KERNEL);
+		if (!guid_dev)
+			return -ENOMEM;
+
+		wblock->dev = guid_dev;
+
+		guid_dev->class = &wmi_class;
+		dev_set_drvdata(guid_dev, wblock);
+
+		gblock = &wblock->gblock;
+
+		wmi_gtoa(gblock->guid, guid_string);
+		dev_set_name(guid_dev, guid_string);
+
+		result = device_register(guid_dev);
+		if (result)
+			return result;
+
+		result = device_create_file(guid_dev, &dev_attr_modalias);
+		if (result)
+			return result;
+	}
+
+	return 0;
+}
+
+static void wmi_remove_devs(void)
+{
+	struct guid_block *gblock;
+	struct wmi_block *wblock;
+	struct list_head *p;
+	struct device *guid_dev;
+
+	/* Delete devices for all the GUIDs */
+	list_for_each(p, &wmi_blocks.list) {
+		wblock = list_entry(p, struct wmi_block, list);
+
+		guid_dev = wblock->dev;
+		gblock = &wblock->gblock;
+
+		device_remove_file(guid_dev, &dev_attr_modalias);
+
+		device_unregister(guid_dev);
+	}
+}
+
+static void wmi_class_exit(void)
+{
+	wmi_remove_devs();
+	class_unregister(&wmi_class);
+}
+
+static int wmi_class_init(void)
+{
+	int ret;
+
+	ret = class_register(&wmi_class);
+	if (ret)
+		return ret;
+
+	ret = wmi_create_devs();
+	if (ret)
+		wmi_class_exit();
+
+	return ret;
+}
+
+/*
  * Parse the _WDG method for the GUID data blocks
  */
 static __init acpi_status parse_wdg(acpi_handle handle)
@@ -709,10 +871,17 @@ static int __init acpi_wmi_init(void)
 
 	if (result < 0) {
 		printk(KERN_INFO PREFIX "Error loading mapper\n");
-	} else {
-		printk(KERN_INFO PREFIX "Mapper loaded\n");
+		return -ENODEV;
+	}
+
+	result = wmi_class_init();
+	if (result) {
+		acpi_bus_unregister_driver(&acpi_wmi_driver);
+		return result;
 	}
 
+	printk(KERN_INFO PREFIX "Mapper loaded\n");
+
 	return result;
 }
 
@@ -721,6 +890,8 @@ static void __exit acpi_wmi_exit(void)
 	struct list_head *p, *tmp;
 	struct wmi_block *wblock;
 
+	wmi_class_exit();
+
 	acpi_bus_unregister_driver(&acpi_wmi_driver);
 
 	list_for_each_safe(p, tmp, &wmi_blocks.list) {
-- 
1.6.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


linux-2.6-enable-btusb-autosuspend.patch:
 btusb.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE linux-2.6-enable-btusb-autosuspend.patch ---
commit 8e962bd41a2cbf7f0e55191a757b87f793a725a8
Author: Matthew Garrett <mjg at redhat.com>
Date:   Tue Jun 9 20:47:51 2009 +0100

    btusb: Enable autosuspend by default

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 44bc8bb..4c33417 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1020,6 +1020,7 @@ static int btusb_probe(struct usb_interface *intf,
 	}
 
 	usb_set_intfdata(intf, data);
+	usb_device_autosuspend_enable(data->udev);
 
 	return 0;
 }

linux-2.6-fix-btusb-autosuspend.patch:
 btusb.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE linux-2.6-fix-btusb-autosuspend.patch ---
commit ae69717118e1f14ed8737459f8c4baca1cb9c404
Author: Matthew Garrett <mjg at redhat.com>
Date:   Wed Dec 16 14:31:30 2009 -0500

    Fix btusb autosuspend

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 4c33417..ec54dd6 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -307,6 +307,7 @@ static void btusb_bulk_complete(struct urb *urb)
 		return;
 
 	usb_anchor_urb(urb, &data->bulk_anchor);
+	usb_mark_last_busy(data->udev);
 
 	err = usb_submit_urb(urb, GFP_ATOMIC);
 	if (err < 0) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1874
retrieving revision 1.1875
diff -u -p -r1.1874 -r1.1875
--- kernel.spec	17 Dec 2009 16:29:32 -0000	1.1874
+++ kernel.spec	17 Dec 2009 16:49:39 -0000	1.1875
@@ -636,9 +636,12 @@ Patch260: linux-2.6-debug-nmi-timeout.pa
 Patch270: linux-2.6-debug-taint-vm.patch
 Patch280: linux-2.6-debug-spinlock-taint.patch
 Patch300: linux-2.6-driver-level-usb-autosuspend.diff
-Patch301: linux-2.6-fix-usb-serial-autosuspend.diff
-Patch302: linux-2.6-qcserial-autosuspend.diff
+Patch303: linux-2.6-enable-btusb-autosuspend.patch
 Patch304: linux-2.6-usb-uvc-autosuspend.diff
+Patch305: linux-2.6-fix-btusb-autosuspend.patch
+
+Patch310: linux-2.6-autoload-wmi.patch
+
 Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch
 Patch360: linux-2.6-debug-always-inline-kzalloc.patch
 Patch380: linux-2.6-defaults-pci_no_msi.patch
@@ -1205,9 +1208,12 @@ ApplyPatch linux-2.6-nfs4-callback-hidde
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
-#ApplyPatch linux-2.6-fix-usb-serial-autosuspend.diff
-ApplyPatch linux-2.6-qcserial-autosuspend.diff
+ApplyPatch linux-2.6-enable-btusb-autosuspend.patch
 ApplyPatch linux-2.6-usb-uvc-autosuspend.diff
+ApplyPatch linux-2.6-fix-btusb-autosuspend.patch
+
+# WMI
+ApplyPatch linux-2.6-autoload-wmi.patch
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -2003,6 +2009,12 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 17 2009 Matthew Garrett <mjg at redhat.com> 2.6.32.1-12
+- linux-2.6-driver-level-usb-autosuspend.diff: fix so it works properly...
+- linux-2.6-fix-btusb-autosuspend.patch: avoid bluetooth connection drops
+- linux-2.6-enable-btusb-autosuspend.patch: and default it to on
+- linux-2.6-autoload-wmi.patch: autoload WMI drivers
+
 * Thu Dec 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.32.1-11
 - Split off onboard decode imon devices into pure input driver,
   leaving lirc_imon for the ancient imon devices only

linux-2.6-driver-level-usb-autosuspend.diff:
 drivers/usb/core/driver.c |   16 ++++++++++++++++
 include/linux/usb.h       |    4 ++++
 2 files changed, 20 insertions(+)

Index: linux-2.6-driver-level-usb-autosuspend.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-driver-level-usb-autosuspend.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-driver-level-usb-autosuspend.diff	18 Jul 2009 22:50:13 -0000	1.1
+++ linux-2.6-driver-level-usb-autosuspend.diff	17 Dec 2009 16:49:39 -0000	1.2
@@ -1,6 +1,6 @@
-commit 0f592e33934bf6108e33e34f00b425f98ee833ef
+commit 7d0d20a25c6f477fb198b85510c78156d7d7c5af
 Author: Matthew Garrett <mjg at redhat.com>
-Date:   Wed Jul 8 19:04:23 2009 +0100
+Date:   Tue Jun 9 20:11:47 2009 +0100
 
     usb: Allow drivers to enable USB autosuspend on a per-device basis
     
@@ -12,10 +12,10 @@ Date:   Wed Jul 8 19:04:23 2009 +0100
     Signed-off-by: Matthew Garrett <mjg at redhat.com>
 
 diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
-index 69e5773..6e81caa 100644
+index 4f86447..f7caf00 100644
 --- a/drivers/usb/core/driver.c
 +++ b/drivers/usb/core/driver.c
-@@ -1560,6 +1560,21 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)
+@@ -1575,6 +1575,22 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)
  EXPORT_SYMBOL_GPL(usb_autopm_put_interface_async);
  
  /**
@@ -30,6 +30,7 @@ index 69e5773..6e81caa 100644
 +{
 +	udev->autosuspend_disabled = 0;
 +	udev->autoresume_disabled = 0;
++	usb_external_suspend_device(udev, PMSG_USER_SUSPEND);
 +}
 +EXPORT_SYMBOL_GPL(usb_device_autosuspend_enable);
 +
@@ -38,7 +39,7 @@ index 69e5773..6e81caa 100644
   * @intf: the usb_interface whose counter should be incremented
   *
 diff --git a/include/linux/usb.h b/include/linux/usb.h
-index b1e3c2f..61bddbe 100644
+index a34fa89..0c22c64 100644
 --- a/include/linux/usb.h
 +++ b/include/linux/usb.h
 @@ -543,6 +543,7 @@ extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);



From jussilehtola at fedoraproject.org  Thu Dec 17 16:59:36 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 17 Dec 2009 16:59:36 +0000 (UTC)
Subject: rpms/xine-ui/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xine-ui.spec, 1.9, 1.10
Message-ID: <20091217165936.1D83011C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11060

Modified Files:
	.cvsignore sources xine-ui.spec 
Log Message:
Switch to 0.99.6 series snapshot.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Jul 2009 23:22:34 -0000	1.3
+++ .cvsignore	17 Dec 2009 16:59:35 -0000	1.4
@@ -1,4 +1,3 @@
-xine-ui-0.99.5.tar.gz
 Antares.tar.gz
 Bambino-Black.tar.gz
 Bambino-Blue.tar.gz
@@ -7,25 +6,27 @@ Bambino-Orange.tar.gz
 Bambino-Pink.tar.gz
 Bambino-Purple.tar.gz
 Bambino-White.tar.gz
+blackslim2.tar.gz
 Bluton.tar.gz
+caramel.tar.gz
 CelomaChrome.tar.gz
 CelomaGold.tar.gz
 CelomaMdk.tar.gz
 Centori.tar.gz
-Crystal.tar.gz
-Galaxy.tar.gz
-Keramic.tar.gz
-KeramicRH8.tar.gz
-OMS_legacy.tar.gz
-Polaris.tar.gz
-Sunset.tar.gz
-blackslim2.tar.gz
-caramel.tar.gz
 cloudy.tar.gz
 concept.tar.gz
+Crystal.tar.gz
+Galaxy.tar.gz
 gudgreen.tar.gz
+KeramicRH8.tar.gz
+Keramic.tar.gz
 lcd.tar.gz
 mp2k.tar.gz
 mplayer.tar.gz
+OMS_legacy.tar.gz
 pitt.tar.gz
+Polaris.tar.gz
+sources
+Sunset.tar.gz
 xinium.tar.gz
+xine-ui-0.99.6-20091217.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Jul 2009 23:22:34 -0000	1.3
+++ sources	17 Dec 2009 16:59:35 -0000	1.4
@@ -1,4 +1,3 @@
-e643cd1fcad4d98a5ae4eb877ce5087b  xine-ui-0.99.5.tar.gz
 ad74c35558588f5d4234449a076b4105  Antares.tar.gz
 61cbcf4cb3f1443a17e96c0a73eeb3a8  Bambino-Black.tar.gz
 56f21a3ffddf0f0980336a5d9cdff179  Bambino-Blue.tar.gz
@@ -7,25 +6,27 @@ dacd886be4fd9c13dd96fa3b96f3e7f8  Bambin
 424b4dd516569c92af7d96c10daa46d3  Bambino-Pink.tar.gz
 2e6438459244104e46d89a66e5a1f961  Bambino-Purple.tar.gz
 3e8bc6f6958e8d732b88f2e227f3c879  Bambino-White.tar.gz
+454bdc7321fc18f0db811db722c2e93c  blackslim2.tar.gz
 070fd8e3582b6f9e302b595c81dd87e4  Bluton.tar.gz
+1ff0ea8d7c73c4f3b32c13a408af3be1  caramel.tar.gz
 159b45f013183aea3038f9133f61cf89  CelomaChrome.tar.gz
 5ac74cb407b59b3487031a0564698e1f  CelomaGold.tar.gz
 dadb7b21b8e7e0c40ad7237c4f98906f  CelomaMdk.tar.gz
 06f2b0f6ceb9456bc26fae65f4f89a53  Centori.tar.gz
-eb511cd1217bc0c0bd3fa016698adebc  Crystal.tar.gz
-c7825e925434374a074c4acc46bcdd4f  Galaxy.tar.gz
-0154a3eecbeb995865ead852fd5f6bb2  Keramic.tar.gz
-bff16e879b75bd5a442c0c5c7dc22bcb  KeramicRH8.tar.gz
-54b3e28494e1d89e041ceace7db32049  OMS_legacy.tar.gz
-b92dfe59cb5f7bbc495ed0be50c1c132  Polaris.tar.gz
-8702d138eb61b7149118f91121fe846a  Sunset.tar.gz
-454bdc7321fc18f0db811db722c2e93c  blackslim2.tar.gz
-1ff0ea8d7c73c4f3b32c13a408af3be1  caramel.tar.gz
 432e0d5135be09e03a69f363d3da94a0  cloudy.tar.gz
 34d18380c1077cdf43a04797b2e06734  concept.tar.gz
+eb511cd1217bc0c0bd3fa016698adebc  Crystal.tar.gz
+c7825e925434374a074c4acc46bcdd4f  Galaxy.tar.gz
 d809f2f3cce0eae966296e01ede8df00  gudgreen.tar.gz
+bff16e879b75bd5a442c0c5c7dc22bcb  KeramicRH8.tar.gz
+0154a3eecbeb995865ead852fd5f6bb2  Keramic.tar.gz
 f16d6a1a39b32473a901d9132c405196  lcd.tar.gz
 841924c042ca70700a9d201bc7686e59  mp2k.tar.gz
 3023e8dd6c12902c32b3d99e51fd0c1e  mplayer.tar.gz
+54b3e28494e1d89e041ceace7db32049  OMS_legacy.tar.gz
 7dd4e9e50e0145142982b0537c36f50a  pitt.tar.gz
+b92dfe59cb5f7bbc495ed0be50c1c132  Polaris.tar.gz
+d67c2f16bfb6970474ccea7d8aa8428a  sources
+8702d138eb61b7149118f91121fe846a  Sunset.tar.gz
 9ebf98f4434a9fc119f0282806ba9c32  xinium.tar.gz
+75373e8aca45446c3708180596186ad8  xine-ui-0.99.6-20091217.tar.bz2


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/xine-ui.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xine-ui.spec	3 Sep 2009 14:07:55 -0000	1.9
+++ xine-ui.spec	17 Dec 2009 16:59:35 -0000	1.10
@@ -1,13 +1,28 @@
 # TODO, sometime: nvtvsimple
 
+# hg version
+%global hgdate 20091217
+
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
-Version:        0.99.5
-Release:        16%{?dist}
+Version:        0.99.6
+Release:        0.1.%{hgdate}hg%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
-Source0:        http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz
+
+#Source0:        http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz
+
+#Use source from hg for now to fix a few bugs
+#This tarball has been created with
+# hg clone http://hg.debian.org/hg/xine-lib/xine-ui/ xine-ui-0.99.6
+# find xine-ui-0.99.6 -name .hg* -exec rm -rf {} \;
+# find xine-ui-0.99.6 -name .cvs* -exec rm -rf {} \;
+# tar jcf xine-ui-0.99.6-20091217.tar.bz2 xine-ui-0.99.6/
+Source0:	xine-ui-%{version}-%{hgdate}.tar.bz2
+BuildRequires:	autoconf
+BuildRequires:	automake
+
 # Patch to enable linking to shared library version of lirc
 Patch0:         xine-ui-0.99.5-shared-lirc.patch
 # Patch to use UTF-8 documentation, BZ #512598
@@ -110,7 +125,7 @@ This package contains extra skins for xi
 
 # Backup time stamp
 touch -r m4/_xine.m4 m4/_xine.m4.stamp
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 # and restore it
 touch -r m4/_xine.m4.stamp m4/_xine.m4
@@ -122,10 +137,10 @@ if [ -n "$libx11so" -a -f "$libx11so" ] 
     sed -i -e "s/\"libX11\\.so\"/\"$(basename $libx11so)\"/" src/aaui/main.c
 fi
 
-touch -r configure.ac configure.ac.stamp
-sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \
-    config.h.in configure.ac configure
-touch -r configure.ac.stamp configure.ac
+#touch -r configure.ac configure.ac.stamp
+#sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \
+#    config.h.in configure.ac configure
+#touch -r configure.ac.stamp configure.ac
 
 for f in doc/man/{de,es,fr}/*.1* doc/README?{cs,de,es,fi,fr,it} ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && \
@@ -150,7 +165,10 @@ find fedoraskins/ -type d -name "CVS" -e
 find fedoraskins/ -type d -name ".xvpics" -exec rm -rf {} \; || :
 
 %build
-%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version}
+./autogen.sh noconfig
+export LIRC_CFLAGS="-llirc_client"
+export LIRC_LIBS="-llirc_client"
+#%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version}
 # Set documentation directory
 make %{?_smp_mflags}
 
@@ -180,12 +198,14 @@ rm -rf %{buildroot}
 %post
 # Mime type
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 # Icon cache
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 # Mime type
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 # Icon cache
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -214,6 +234,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/xine/oxine/
 %{_datadir}/xine/visuals/
 
+%{_datadir}/mime/packages/xine-ui.xml
 %{_datadir}/applications/*xine.desktop
 %{_datadir}/icons/hicolor/*x*/apps/xine.png
 %{_datadir}/pixmaps/xine.xpm
@@ -231,6 +252,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/xine/skins/xine_splash.png
 
 %changelog
+* Thu Dec 17 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.6-0.1.20091217hg
+- Switch to development branch by suggestion of upstream to fix some bugs.
+
 * Thu Sep 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-16
 - Move xine-ui_logo.mpv to main package from -skins.
 



From pkgdb at fedoraproject.org  Thu Dec 17 17:18:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 17:18:28 +0000
Subject: [pkgdb] python-psyco had acl change status
Message-ID: <20091217171831.AD17028ED6D@bastion3.fedora.phx2.redhat.com>

konradm has set the commit acl on python-psyco (Fedora 12) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 17:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 17:18:23 +0000
Subject: [pkgdb] python-psyco had acl change status
Message-ID: <20091217171825.4D44A28ED5B@bastion3.fedora.phx2.redhat.com>

konradm has set the commit acl on python-psyco (Fedora 11) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From pkgdb at fedoraproject.org  Thu Dec 17 17:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 17:18:34 +0000
Subject: [pkgdb] python-psyco had acl change status
Message-ID: <20091217171836.12C5628ED6D@bastion3.fedora.phx2.redhat.com>

konradm has set the commit acl on python-psyco (Fedora devel) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-psyco



From gd at fedoraproject.org  Thu Dec 17 17:28:16 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 17 Dec 2009 17:28:16 +0000 (UTC)
Subject: rpms/samba/devel samba.spec, 1.203,
	1.204 samba-3.5.0pre2-build.patch, 1.1, NONE
Message-ID: <20091217172816.3127711C00E6@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15644

Modified Files:
	samba.spec 
Removed Files:
	samba-3.5.0pre2-build.patch 
Log Message:
talloc 2.0.1 is in rawhide now, so use it. no need for the build patch anymore.

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- samba.spec	16 Dec 2009 17:36:08 -0000	1.203
+++ samba.spec	17 Dec 2009 17:28:15 -0000	1.204
@@ -1,7 +1,7 @@
 %define main_release 50
 %define samba_version 3.5.0
 %define tdb_version 1.1.7
-%define talloc_version 2.0.0
+%define talloc_version 2.0.1
 #%define pre_release %nil
 %define pre_release pre2
 
@@ -45,7 +45,6 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
-Patch201: samba-3.5.0pre2-build.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -203,7 +202,6 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
-%patch201 -p0 -b .build
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION


--- samba-3.5.0pre2-build.patch DELETED ---



From nickc at fedoraproject.org  Thu Dec 17 17:41:35 2009
From: nickc at fedoraproject.org (Nicholas Clifton)
Date: Thu, 17 Dec 2009 17:41:35 +0000 (UTC)
Subject: rpms/binutils/devel
	binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch, NONE,
	1.1 binutils.spec, 1.185, 1.186
Message-ID: <20091217174135.78F6B11C00E6@cvs1.fedora.phx.redhat.com>

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18165

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch 
Log Message:
Apply patch for PR 11088.  (BZ 544149)


binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch:
 bfd/ChangeLog         |   22 +++++++++
 bfd/elf32-ppc.c       |  111 +++++++++++++++++++++++++++++---------------------
 bfd/elf64-ppc.c       |    4 -
 include/elf/ChangeLog |   10 +++-
 include/elf/ppc.h     |    7 +--
 5 files changed, 100 insertions(+), 54 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch ---
diff -rup ../binutils-2.20.51.0.2.original/bfd/ChangeLog bfd/ChangeLog
--- ../binutils-2.20.51.0.2.original/bfd/ChangeLog	2009-12-17 16:08:07.000000000 +0000
+++ bfd/ChangeLog	2009-12-17 16:27:06.000000000 +0000
@@ -1,3 +1,25 @@
+2009-12-17  Alan Modra  <amodra at bigpond.net.au>
+
+	PR ld/11088
+	* elf64-ppc.c (ppc64_elf_gc_sweep_hook): Don't abort if symbol
+	hiding has nulled out plt.plist.
+
+	PR ld/11088
+	* elf32-ppc.c (update_plt_info): Clear sec here when addend is
+	less than 32768..
+	(ppc_elf_check_relocs): ..rather than doing so here.  Ignore new
+	relax relocs.
+	(ppc_elf_gc_sweep_hook): Don't segfault when symbol hiding has
+	removed plt_entry records.
+	(ppc_elf_tls_setup): Handle PIE calls to __tls_get_addr correctly.
+	(ppc_elf_tls_optimize): Likewise.  Also dec __tls_get_addr refcount
+	when optimizing code using new tlsgd and tlsld marker relocs.
+	(ppc_elf_relax_section): Differentiate relaxed PLTREL24 relocs
+	from ADDR24 relocs using plt or glink.  Don't clear the addend
+	for R_PPC_RELAX_PLTREL24.
+	(ppc_elf_relocate_section): Correctly handle addends on relaxed
+	PLTREL24 relocs.
+
 2009-10-09  Tristan Gingold  <gingold at adacore.com>
 
 	* mach-o.c (bfd_mach_o_section_get_entry_size): Moved.
diff -rup ../binutils-2.20.51.0.2.original/bfd/elf32-ppc.c bfd/elf32-ppc.c
--- ../binutils-2.20.51.0.2.original/bfd/elf32-ppc.c	2009-12-17 16:08:07.000000000 +0000
+++ bfd/elf32-ppc.c	2009-12-17 16:23:22.000000000 +0000
@@ -3323,6 +3323,8 @@ update_plt_info (bfd *abfd, struct plt_e
 {
   struct plt_entry *ent;
 
+  if (addend < 32768)
+    sec = NULL;
   for (ent = *plist; ent != NULL; ent = ent->next)
     if (ent->sec == sec && ent->addend == addend)
       break;
@@ -3508,8 +3510,7 @@ ppc_elf_check_relocs (bfd *abfd,
 		      if (info->shared)
 			addend = rel->r_addend;
 		    }
-		  if (!update_plt_info (abfd, ifunc,
-					addend < 32768 ? NULL : got2, addend))
+		  if (!update_plt_info (abfd, ifunc, got2, addend))
 		    return FALSE;
 		}
 	    }
@@ -3748,8 +3749,7 @@ ppc_elf_check_relocs (bfd *abfd,
 		    addend = rel->r_addend;
 		}
 	      h->needs_plt = 1;
-	      if (!update_plt_info (abfd, &h->plt.plist,
-				    addend < 32768 ? NULL : got2, addend))
+	      if (!update_plt_info (abfd, &h->plt.plist, got2, addend))
 		return FALSE;
 	    }
 	  break;
@@ -3780,10 +3780,9 @@ ppc_elf_check_relocs (bfd *abfd,
 	case R_PPC_EMB_MRKREF:
 	case R_PPC_NONE:
 	case R_PPC_max:
-	case R_PPC_RELAX32:
-	case R_PPC_RELAX32PC:
-	case R_PPC_RELAX32_PLT:
-	case R_PPC_RELAX32PC_PLT:
+	case R_PPC_RELAX:
+	case R_PPC_RELAX_PLT:
+	case R_PPC_RELAX_PLTREL24:
 	  break;
 
 	  /* These should only appear in dynamic objects.  */
@@ -4486,7 +4485,7 @@ ppc_elf_gc_sweep_hook (bfd *abfd,
 		  struct plt_entry *ent;
 
 		  ent = find_plt_ent (&h->plt.plist, NULL, 0);
-		  if (ent->plt.refcount > 0)
+		  if (ent != NULL && ent->plt.refcount > 0)
 		    ent->plt.refcount -= 1;
 		}
 	    }
@@ -4582,9 +4581,11 @@ ppc_elf_tls_setup (bfd *obfd,
 		       && tga->root.type == bfd_link_hash_undefweak)))
 	    {
 	      struct plt_entry *ent;
-	      ent = find_plt_ent (&tga->plt.plist, NULL, 0);
-	      if (ent != NULL
-		  && ent->plt.refcount > 0)
+
+	      for (ent = tga->plt.plist; ent != NULL; ent = ent->next)
+		if (ent->plt.refcount > 0)
+		  break;
+	      if (ent != NULL)
 		{
 		  tga->root.type = bfd_link_hash_indirect;
 		  tga->root.u.i.link = &opt->root;
@@ -4669,6 +4670,7 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
       {
 	Elf_Internal_Sym *locsyms = NULL;
 	Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd);
+	asection *got2 = bfd_get_section_by_name (ibfd, ".got2");
 
 	for (sec = ibfd->sections; sec != NULL; sec = sec->next)
 	  if (sec->has_tls_reloc && !bfd_is_abs_section (sec->output_section))
@@ -4762,6 +4764,13 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
 		      else
 			continue;
 
+		    case R_PPC_TLSGD:
+		    case R_PPC_TLSLD:
+		      expecting_tls_get_addr = 2;
+		      tls_set = 0;
+		      tls_clear = 0;
+		      break;
+
 		    default:
 		      continue;
 		    }
@@ -4769,7 +4778,8 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
 		  if (pass == 0)
 		    {
 		      if (!expecting_tls_get_addr
-			  || !sec->has_tls_get_addr_call)
+			  || (expecting_tls_get_addr == 1
+			      && !sec->has_tls_get_addr_call))
 			continue;
 
 		      if (rel + 1 < relend
@@ -4785,6 +4795,23 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
 		      break;
 		    }
 
+		  if (expecting_tls_get_addr)
+		    {
+		      struct plt_entry *ent;
+		      bfd_vma addend = 0;
+
+		      if (info->shared
+			  && ELF32_R_TYPE (rel[1].r_info) == R_PPC_PLTREL24)
+			addend = rel[1].r_addend;
+		      ent = find_plt_ent (&htab->tls_get_addr->plt.plist,
+					  got2, addend);
+		      if (ent != NULL && ent->plt.refcount > 0)
+			ent->plt.refcount -= 1;
+
+		      if (expecting_tls_get_addr == 2)
+			continue;
+		    }
+
 		  if (h != NULL)
 		    {
 		      tls_mask = &ppc_elf_hash_entry (h)->tls_mask;
@@ -4829,16 +4856,6 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
 			*got_count -= 1;
 		    }
 
-		  if (expecting_tls_get_addr)
-		    {
-		      struct plt_entry *ent;
-
-		      ent = find_plt_ent (&htab->tls_get_addr->plt.plist,
-					  NULL, 0);
-		      if (ent != NULL && ent->plt.refcount > 0)
-			ent->plt.refcount -= 1;
-		    }
-
 		  *tls_mask |= tls_set;
 		  *tls_mask &= ~tls_clear;
 		}
@@ -6239,28 +6256,29 @@ ppc_elf_relax_section (bfd *abfd,
 	    {
 	      size = 4 * ARRAY_SIZE (shared_stub_entry);
 	      insn_offset = 12;
-	      stub_rtype = R_PPC_RELAX32PC;
 	    }
 	  else
 	    {
 	      size = 4 * ARRAY_SIZE (stub_entry);
 	      insn_offset = 0;
-	      stub_rtype = R_PPC_RELAX32;
 	    }
 
-	  if (R_PPC_RELAX32_PLT - R_PPC_RELAX32
-	      != R_PPC_RELAX32PC_PLT - R_PPC_RELAX32PC)
-	    abort ();
+	  stub_rtype = R_PPC_RELAX;
 	  if (tsec == htab->plt
 	      || tsec == htab->glink)
-	    stub_rtype += R_PPC_RELAX32_PLT - R_PPC_RELAX32;
+	    {
+	      stub_rtype = R_PPC_RELAX_PLT;
+	      if (r_type == R_PPC_PLTREL24)
+		stub_rtype = R_PPC_RELAX_PLTREL24;
+	    }
 
 	  /* Hijack the old relocation.  Since we need two
 	     relocations for this use a "composite" reloc.  */
 	  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
 				       stub_rtype);
 	  irel->r_offset = trampoff + insn_offset;
-	  if (r_type == R_PPC_PLTREL24)
+	  if (r_type == R_PPC_PLTREL24
+	      && stub_rtype != R_PPC_RELAX_PLTREL24)
 	    irel->r_addend = 0;
 
 	  /* Record the fixup so we don't do it again this section.  */
@@ -6430,7 +6448,7 @@ ppc_elf_relax_section (bfd *abfd,
     {
       /* Convert the internal relax relocs to external form.  */
       for (irel = internal_relocs; irel < irelend; irel++)
-	if (ELF32_R_TYPE (irel->r_info) == R_PPC_RELAX32)
+	if (ELF32_R_TYPE (irel->r_info) == R_PPC_RELAX)
 	  {
 	    unsigned long r_symndx = ELF32_R_SYM (irel->r_info);
 
@@ -7655,12 +7673,20 @@ ppc_elf_relocate_section (bfd *output_bf
 	    }
 	  break;
 
-	case R_PPC_RELAX32PC_PLT:
-	case R_PPC_RELAX32_PLT:
+	case R_PPC_RELAX_PLT:
+	case R_PPC_RELAX_PLTREL24:
 	  if (h != NULL)
 	    {
-	      struct plt_entry *ent = find_plt_ent (&h->plt.plist, got2,
-						    info->shared ? addend : 0);
+	      struct plt_entry *ent;
+	      bfd_vma got2_addend = 0;
+
+	      if (r_type == R_PPC_RELAX_PLTREL24)
+		{
+		  if (info->shared)
+		    got2_addend = addend;
+		  addend = 0;
+		}
+	      ent = find_plt_ent (&h->plt.plist, got2, got2_addend);
 	      if (htab->plt_type == PLT_NEW)
 		relocation = (htab->glink->output_section->vma
 			      + htab->glink->output_offset
@@ -7670,18 +7696,13 @@ ppc_elf_relocate_section (bfd *output_bf
 			      + htab->plt->output_offset
 			      + ent->plt.offset);
 	    }
-	  if (r_type == R_PPC_RELAX32_PLT)
-	    goto relax32;
-	  /* Fall thru */
-
-	case R_PPC_RELAX32PC:
-	  relocation -= (input_section->output_section->vma
-			 + input_section->output_offset
-			 + rel->r_offset - 4);
 	  /* Fall thru */
 
-	case R_PPC_RELAX32:
-	relax32:
+	case R_PPC_RELAX:
+	  if (info->shared)
+	    relocation -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   + rel->r_offset - 4);
 	  {
 	    unsigned long t0;
 	    unsigned long t1;
diff -rup ../binutils-2.20.51.0.2.original/bfd/elf64-ppc.c bfd/elf64-ppc.c
--- ../binutils-2.20.51.0.2.original/bfd/elf64-ppc.c	2009-12-17 16:08:07.000000000 +0000
+++ bfd/elf64-ppc.c	2009-12-17 16:10:41.000000000 +0000
@@ -5866,9 +5866,7 @@ ppc64_elf_gc_sweep_hook (bfd *abfd, stru
 	      for (ent = h->plt.plist; ent != NULL; ent = ent->next)
 		if (ent->addend == rel->r_addend)
 		  break;
-	      if (ent == NULL)
-		abort ();
-	      if (ent->plt.refcount > 0)
+	      if (ent != NULL && ent->plt.refcount > 0)
 		ent->plt.refcount -= 1;
 	    }
 	  break;
diff -rup ../binutils-2.20.51.0.2.original/include/elf/ChangeLog include/elf/ChangeLog
--- ../binutils-2.20.51.0.2.original/include/elf/ChangeLog	2009-12-17 16:07:45.000000000 +0000
+++ include/elf/ChangeLog	2009-12-17 16:12:12.000000000 +0000
@@ -1,3 +1,9 @@
+2009-12-17  Alan Modra  <amodra at bigpond.net.au>
+
+	* ppc.h (R_PPC_RELAX32, R_PPC_RELAX32PC, R_PPC_RELAX32_PLT,
+	R_PPC_RELAX32PC_PLT): Delete.
+	(R_PPC_RELAX, R_PPC_RELAX_PLT, R_PPC_RELAX_PLTREL24): Define.
+
 2009-09-29  DJ Delorie  <dj at redhat.com>
 
 	* rx.h: New file.
@@ -34,11 +40,11 @@
 	R_push, R_const, R_add, R_sub, R_mult, R_div, R_mod, R_lshift,
 	R_rshift, R_and, R_or, R_xor, R_land, R_lor, R_len, R_neg, R_comp,
 	R_page, R_hwpage, R_addr, R_pltpc, R_got.
-	
+
 2009-08-09  Michael Eager <eager at eagercon.com>
 
 	* elf/common.h: Define EM_resnnn reserved values. Add EM_AVR32,
-	EM_STM8, EM_TILE64, EM_TILEPRO.  Change EM_MICROBLAZE. 
+	EM_STM8, EM_TILE64, EM_TILEPRO.  Change EM_MICROBLAZE.
 
 2009-08-06  Michael Eager <eager at eagercon.com>
 
diff -rup ../binutils-2.20.51.0.2.original/include/elf/ppc.h include/elf/ppc.h
--- ../binutils-2.20.51.0.2.original/include/elf/ppc.h	2009-12-17 16:07:45.000000000 +0000
+++ include/elf/ppc.h	2009-12-17 16:12:51.000000000 +0000
@@ -73,10 +73,9 @@ START_RELOC_NUMBERS (elf_ppc_reloc_type)
 
 #ifndef RELOC_MACROS_GEN_FUNC
 /* Fake relocations for branch stubs, only used internally by ld.  */
-  RELOC_NUMBER (R_PPC_RELAX32,		 48)
-  RELOC_NUMBER (R_PPC_RELAX32PC,	 49)
-  RELOC_NUMBER (R_PPC_RELAX32_PLT,	 50)
-  RELOC_NUMBER (R_PPC_RELAX32PC_PLT,	 51)
+  RELOC_NUMBER (R_PPC_RELAX,		 48)
+  RELOC_NUMBER (R_PPC_RELAX_PLT,	 49)
+  RELOC_NUMBER (R_PPC_RELAX_PLTREL24,	 50)
 #endif
 
   /* Relocs added to support TLS.  */


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- binutils.spec	9 Dec 2009 12:07:11 -0000	1.185
+++ binutils.spec	17 Dec 2009 17:41:35 -0000	1.186
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.20.51.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -35,6 +35,7 @@ Patch09: binutils-2.20.51.0.2-ifunc-ld-s
 Patch10: binutils-2.20.51.0.2-lwp.patch
 Patch11: binutils-2.20.51.0.2-enable-gold.patch
 Patch12: binutils-2.20.51.0.2-gas-expr.patch
+Patch13: binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch
 
 %define gold_arches %ix86 x86_64
 
@@ -128,6 +129,7 @@ to consider using libelf instead of BFD.
 %patch10 -p0 -b .lwp~
 %patch11 -p0 -b .enable-gold~
 %patch12 -p0 -b .gas-expr~
+%patch13 -p0 -b .hidden-plt~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -425,6 +427,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Thu Dec  17 2009 Nick Clifton <nickc at redhat.com> - 2.20.51.0.2-10
+- Apply patch for PR 11088.  (BZ 544149)
+
 * Wed Dec  9 2009 Nick Clifton <nickc at redhat.com> - 2.20.51.0.2-9
 - Apply patch for PR 10856.  (BZ 544358)
 



From gd at fedoraproject.org  Thu Dec 17 17:47:57 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 17 Dec 2009 17:47:57 +0000 (UTC)
Subject: rpms/samba/devel samba-3.2.5-inotify.patch,1.2,1.3
Message-ID: <20091217174757.8D76311C00E6@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19339

Modified Files:
	samba-3.2.5-inotify.patch 
Log Message:
Fix inotify.patch.

Guenther


samba-3.2.5-inotify.patch:
 notify_inotify.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Index: samba-3.2.5-inotify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba-3.2.5-inotify.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- samba-3.2.5-inotify.patch	30 Apr 2009 12:51:27 -0000	1.2
+++ samba-3.2.5-inotify.patch	17 Dec 2009 17:47:57 -0000	1.3
@@ -1,7 +1,6 @@
-=== modified file 'source/smbd/notify_inotify.c'
---- source3/smbd/notify_inotify.c	2007-03-09 12:07:58 +0000
-+++ source3/smbd/notify_inotify.c	2007-04-10 16:27:47 +0000
-@@ -66,6 +66,7 @@
+--- source3/smbd/notify_inotify.c.inotify	2009-12-15 09:25:26.000000000 +0100
++++ source3/smbd/notify_inotify.c	2009-12-17 18:42:06.000000000 +0100
+@@ -75,6 +75,7 @@
  	struct sys_notify_context *ctx;
  	int fd;
  	struct inotify_watch_context *watches;
@@ -9,13 +8,12 @@
  };
  
  struct inotify_watch_context {
-@@ -229,8 +230,16 @@
+@@ -239,8 +240,15 @@
  	  filenames, and thus can't know how much to allocate
  	  otherwise
  	*/
 -	if (ioctl(in->fd, FIONREAD, &bufsize) != 0 || 
 -	    bufsize == 0) {
-+
 +	if ((ioctl(in->fd, FIONREAD, &bufsize) != 0) && (errno == EACCES)) {
 +		/*
 +		 * Workaround for broken system (SELinux policy bug fixed since long but it is always better not to loop on EACCES)
@@ -26,9 +24,9 @@
 +	}
 +	if (bufsize == 0) {
  		DEBUG(0,("No data on inotify fd?!\n"));
+ 		TALLOC_FREE(fde);
  		return;
- 	}
-@@ -281,6 +290,7 @@
+@@ -297,6 +305,7 @@
  	}
  	in->ctx = ctx;
  	in->watches = NULL;
@@ -36,7 +34,7 @@
  
  	ctx->private_data = in;
  	talloc_set_destructor(in, inotify_destructor);
-@@ -375,6 +385,10 @@
+@@ -391,6 +400,10 @@
  
  	in = talloc_get_type(ctx->private_data, struct inotify_private);
  
@@ -47,4 +45,3 @@
  	mask = inotify_map(e);
  	if (mask == 0) {
  		/* this filter can't be handled by inotify */
-



From gd at fedoraproject.org  Thu Dec 17 17:50:25 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 17 Dec 2009 17:50:25 +0000 (UTC)
Subject: rpms/samba/devel samba.spec,1.204,1.205
Message-ID: <20091217175025.992E311C00E6@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19903

Modified Files:
	samba.spec 
Log Message:
Increase main_release to 51.

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- samba.spec	17 Dec 2009 17:28:15 -0000	1.204
+++ samba.spec	17 Dec 2009 17:50:25 -0000	1.205
@@ -1,4 +1,4 @@
-%define main_release 50
+%define main_release 51
 %define samba_version 3.5.0
 %define tdb_version 1.1.7
 %define talloc_version 2.0.1
@@ -655,7 +655,7 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
-* Tue Dec 15 2009 Guenther Deschner <gdeschner at redhat.com> - 3.5.0pre2-50
+* Tue Dec 15 2009 Guenther Deschner <gdeschner at redhat.com> - 3.5.0pre2-51
 - Update to 3.5.0pre2
 - Remove umount.cifs
 



From carllibpst at fedoraproject.org  Thu Dec 17 17:52:17 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Thu, 17 Dec 2009 17:52:17 +0000 (UTC)
Subject: File libpst-0.6.45.tar.gz uploaded to lookaside cache by carllibpst
Message-ID: <20091217175217.A01BC28ECE9@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libpst:

c77174cd4566f4701a12948cbc7777a3  libpst-0.6.45.tar.gz



From carllibpst at fedoraproject.org  Thu Dec 17 17:52:26 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Thu, 17 Dec 2009 17:52:26 +0000 (UTC)
Subject: rpms/libpst/devel .cvsignore, 1.27, 1.28 libpst.spec, 1.27,
	1.28 sources, 1.27, 1.28
Message-ID: <20091217175226.C17E411C00E6@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20384

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.45


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	20 Sep 2009 18:46:26 -0000	1.27
+++ .cvsignore	17 Dec 2009 17:52:26 -0000	1.28
@@ -1 +1 @@
-libpst-0.6.44.tar.gz
+libpst-0.6.45.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/libpst.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libpst.spec	20 Sep 2009 18:38:02 -0000	1.27
+++ libpst.spec	17 Dec 2009 17:52:26 -0000	1.28
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.44
+Version:            0.6.45
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -146,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 18 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.45-1
+- patch from Hugo DesRosiers to export categories and notes into vcards.
+
 * Sun Sep 20 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.44-1
 - patch from Lee Ayres to add file name extensions in separate mode.
 - allow mixed items types in a folder in separate mode.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	20 Sep 2009 18:46:26 -0000	1.27
+++ sources	17 Dec 2009 17:52:26 -0000	1.28
@@ -1 +1 @@
-07d6952b05fc05c83d9be2fa006c67c0  libpst-0.6.44.tar.gz
+c77174cd4566f4701a12948cbc7777a3  libpst-0.6.45.tar.gz



From caolanm at fedoraproject.org  Thu Dec 17 18:09:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 18:09:18 +0000 (UTC)
Subject: File OOo2-thes_es_ES.tar.bz2 uploaded to lookaside cache by caolanm
Message-ID: <20091217180918.9E5B528ED27@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mythes-es:

4ab43514b74a495b40e85a05ad9da031  OOo2-thes_es_ES.tar.bz2



From caolanm at fedoraproject.org  Thu Dec 17 18:09:47 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 18:09:47 +0000 (UTC)
Subject: rpms/mythes-es/devel mythes-es.spec,1.11,1.12 sources,1.9,1.10
Message-ID: <20091217180947.0601E11C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-es/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23344

Modified Files:
	mythes-es.spec sources 
Log Message:
latest version


Index: mythes-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/mythes-es.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mythes-es.spec	17 Nov 2009 11:35:46 -0000	1.11
+++ mythes-es.spec	17 Dec 2009 18:09:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name: mythes-es
 Summary: Spanish thesaurus
-%define upstreamid 20091117
+%define upstreamid 20091217
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://openthes-es.berlios.de/download/OOo2-thes_es_ES.tar.bz2
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Thu Dec 17 2009 Caol?n McNamara <caolanm at redhat.com> - 0.20091217-1
+- latest version
+
 * Tue Nov 17 2009 Caol?n McNamara <caolanm at redhat.com> - 0.20091117-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Nov 2009 11:35:47 -0000	1.9
+++ sources	17 Dec 2009 18:09:46 -0000	1.10
@@ -1 +1 @@
-886dbc101575d1d87fc72aae64f90e03  OOo2-thes_es_ES.tar.bz2
+4ab43514b74a495b40e85a05ad9da031  OOo2-thes_es_ES.tar.bz2



From caolanm at fedoraproject.org  Thu Dec 17 18:11:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 18:11:25 +0000 (UTC)
Subject: File thes_sl_SI_v2.zip uploaded to lookaside cache by caolanm
Message-ID: <20091217181125.17DB228ED27@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mythes-sl:

9d90f0827e5a0a90b6d5bac380acb503  thes_sl_SI_v2.zip



From caolanm at fedoraproject.org  Thu Dec 17 18:11:58 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 18:11:58 +0000 (UTC)
Subject: rpms/mythes-sl/devel mythes-sl.spec,1.12,1.13 sources,1.9,1.10
Message-ID: <20091217181158.CEC5F11C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23834

Modified Files:
	mythes-sl.spec sources 
Log Message:
latest version


Index: mythes-sl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sl/devel/mythes-sl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mythes-sl.spec	17 Nov 2009 11:54:51 -0000	1.12
+++ mythes-sl.spec	17 Dec 2009 18:11:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name: mythes-sl
 Summary: Slovenian thesaurus
-%define upstreamid 20091117
+%define upstreamid 20091217
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://193.2.66.133:85/download/thes_sl_SI_v2.zip
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Thu Dec 17 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091217-1
+- latest version
+
 * Tue Nov 17 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091117-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sl/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Nov 2009 11:54:51 -0000	1.9
+++ sources	17 Dec 2009 18:11:58 -0000	1.10
@@ -1 +1 @@
-1d89b94b512387e88b82a516baf70707  thes_sl_SI_v2.zip
+9d90f0827e5a0a90b6d5bac380acb503  thes_sl_SI_v2.zip



From caolanm at fedoraproject.org  Thu Dec 17 18:12:44 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 18:12:44 +0000 (UTC)
Subject: File sjp-myspell-pl-20091217.zip uploaded to lookaside cache by
	caolanm
Message-ID: <20091217181244.176F028ED56@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for hunspell-pl:

de39490cad78006cc22a5660e57bd356  sjp-myspell-pl-20091217.zip



From caolanm at fedoraproject.org  Thu Dec 17 18:13:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 17 Dec 2009 18:13:30 +0000 (UTC)
Subject: rpms/hunspell-pl/devel .cvsignore, 1.46, 1.47 hunspell-pl.spec, 1.51,
	1.52 sources, 1.46, 1.47
Message-ID: <20091217181330.7AE9B11C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24290

Modified Files:
	.cvsignore hunspell-pl.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	17 Nov 2009 11:45:38 -0000	1.46
+++ .cvsignore	17 Dec 2009 18:13:30 -0000	1.47
@@ -1 +1 @@
-sjp-myspell-pl-20091117.zip
+sjp-myspell-pl-20091217.zip


Index: hunspell-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- hunspell-pl.spec	17 Nov 2009 11:45:38 -0000	1.51
+++ hunspell-pl.spec	17 Dec 2009 18:13:30 -0000	1.52
@@ -1,6 +1,6 @@
 Name: hunspell-pl
 Summary: Polish hunspell dictionaries
-%define upstreamid 20091117
+%define upstreamid 20091217
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://sjp.pl/slownik/ort/sjp-myspell-pl-%{upstreamid}.zip
@@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Dec 17 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091217-1
+- latest version
+
 * Tue Nov 17 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091117-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	17 Nov 2009 11:45:38 -0000	1.46
+++ sources	17 Dec 2009 18:13:30 -0000	1.47
@@ -1 +1 @@
-58f060b54c674168916d9623ea482c54  sjp-myspell-pl-20091117.zip
+de39490cad78006cc22a5660e57bd356  sjp-myspell-pl-20091217.zip



From jussilehtola at fedoraproject.org  Thu Dec 17 18:16:41 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 17 Dec 2009 18:16:41 +0000 (UTC)
Subject: rpms/xine-ui/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20091217181641.BDFE211C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24917

Modified Files:
	.cvsignore sources 
Log Message:
Whoops, drop the 'sources' file from the commit.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Dec 2009 16:59:35 -0000	1.4
+++ .cvsignore	17 Dec 2009 18:16:41 -0000	1.5
@@ -26,7 +26,6 @@ mplayer.tar.gz
 OMS_legacy.tar.gz
 pitt.tar.gz
 Polaris.tar.gz
-sources
 Sunset.tar.gz
 xinium.tar.gz
 xine-ui-0.99.6-20091217.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Dec 2009 16:59:35 -0000	1.4
+++ sources	17 Dec 2009 18:16:41 -0000	1.5
@@ -26,7 +26,6 @@ f16d6a1a39b32473a901d9132c405196  lcd.ta
 54b3e28494e1d89e041ceace7db32049  OMS_legacy.tar.gz
 7dd4e9e50e0145142982b0537c36f50a  pitt.tar.gz
 b92dfe59cb5f7bbc495ed0be50c1c132  Polaris.tar.gz
-d67c2f16bfb6970474ccea7d8aa8428a  sources
 8702d138eb61b7149118f91121fe846a  Sunset.tar.gz
 9ebf98f4434a9fc119f0282806ba9c32  xinium.tar.gz
 75373e8aca45446c3708180596186ad8  xine-ui-0.99.6-20091217.tar.bz2



From berrange at fedoraproject.org  Thu Dec 17 18:29:38 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 17 Dec 2009 18:29:38 +0000 (UTC)
Subject: rpms/gtk-vnc/F-12 gtk-vnc-0.3.10-gcrypt-threading.patch, NONE,
	1.1 gtk-vnc.spec, 1.42, 1.43
Message-ID: <20091217182938.6C03911C00E6@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27340

Modified Files:
	gtk-vnc.spec 
Added Files:
	gtk-vnc-0.3.10-gcrypt-threading.patch 
Log Message:
Fix gcrypt threading initialization (rhbz #537489)

gtk-vnc-0.3.10-gcrypt-threading.patch:
 gvnc.c |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

--- NEW FILE gtk-vnc-0.3.10-gcrypt-threading.patch ---
commit 90225c7981ae7a1586e6dbf136ba34b0e1ec8cae
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Thu Dec 17 18:23:19 2009 +0000

    Initialize gcrypt threading callbacks
    
    If GTK has threading enabled, we must be sure to enable gcrypt
    threading callbacks too for safety

diff --git a/src/gvnc.c b/src/gvnc.c
index 307bbfe..c42fd6e 100644
--- a/src/gvnc.c
+++ b/src/gvnc.c
@@ -781,6 +781,47 @@ static void gvnc_debug_gnutls_log(int level, const char* str) {
 }
 #endif
 
+
+static int gvnc_tls_mutex_init (void **priv)
+{                                                                             \
+    GMutex *lock = NULL;
+    lock = g_mutex_new();
+    *priv = lock;
+    return 0;
+}
+
+static int gvnc_tls_mutex_destroy(void **priv)
+{
+    GMutex *lock = *priv;
+    g_mutex_free(lock);
+    return 0;
+}
+
+static int gvnc_tls_mutex_lock(void **priv)
+{
+    GMutex *lock = *priv;
+    g_mutex_lock(lock);
+    return 0;
+}
+
+static int gvnc_tls_mutex_unlock(void **priv)
+{
+    GMutex *lock = *priv;
+    g_mutex_unlock(lock);
+    return 0;
+}
+
+static struct gcry_thread_cbs gvnc_thread_impl = {
+    (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
+    NULL,
+    gvnc_tls_mutex_init,
+    gvnc_tls_mutex_destroy,
+    gvnc_tls_mutex_lock,
+    gvnc_tls_mutex_unlock,
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
+};
+
+
 static gboolean gvnc_tls_initialize(void)
 {
 	static int tlsinitialized = 0;
@@ -788,6 +829,11 @@ static gboolean gvnc_tls_initialize(void)
 	if (tlsinitialized)
 		return TRUE;
 
+	if (g_thread_supported()) {
+		gcry_control(GCRYCTL_SET_THREAD_CBS, &gvnc_thread_impl);
+		gcry_check_version(NULL);
+	}
+
 	if (gnutls_global_init () < 0)
 		return FALSE;
 


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/gtk-vnc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gtk-vnc.spec	21 Oct 2009 01:27:39 -0000	1.42
+++ gtk-vnc.spec	17 Dec 2009 18:29:38 -0000	1.43
@@ -7,11 +7,11 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.3.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
-
+Patch1: %{name}-%{version}-gcrypt-threading.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://live.gnome.org/gtk-vnc
 BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@@ -69,6 +69,7 @@ browsers.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %if %{with_plugin}
@@ -124,6 +125,9 @@ rm -fr %{buildroot}
 %endif
 
 %changelog
+* Thu Dec 17 2009 Daniel P. Berrange <berrange at redhat.com> - 0.3.10-2
+- Fix gcrypt threading initialization (rhbz #537489)
+
 * Tue Oct 20 2009 Matthias Clasen <mclaesn at redhat.com> - 0.3.10-1
 - Update to 0.3.10
 



From berrange at fedoraproject.org  Thu Dec 17 18:30:10 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 17 Dec 2009 18:30:10 +0000 (UTC)
Subject: rpms/gtk-vnc/F-12 gtk-vnc-0.3.8-relative-mouse.patch, 1.1,
	NONE gtk-vnc-0.3.8-sasl-auth-tunnel.patch, 1.1,
	NONE gtk-vnc-0.3.8-sasl-auth.patch, 1.1,
	NONE gtk-vnc-0.3.8-ungrab-2.patch, 1.1,
	NONE gtk-vnc-0.3.8-ungrab.patch, 1.1,
	NONE gtk-vnc-resize-refresh.patch, 1.1, NONE
Message-ID: <20091217183010.827EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27464

Removed Files:
	gtk-vnc-0.3.8-relative-mouse.patch 
	gtk-vnc-0.3.8-sasl-auth-tunnel.patch 
	gtk-vnc-0.3.8-sasl-auth.patch gtk-vnc-0.3.8-ungrab-2.patch 
	gtk-vnc-0.3.8-ungrab.patch gtk-vnc-resize-refresh.patch 
Log Message:
Kill obsolete patches


--- gtk-vnc-0.3.8-relative-mouse.patch DELETED ---


--- gtk-vnc-0.3.8-sasl-auth-tunnel.patch DELETED ---


--- gtk-vnc-0.3.8-sasl-auth.patch DELETED ---


--- gtk-vnc-0.3.8-ungrab-2.patch DELETED ---


--- gtk-vnc-0.3.8-ungrab.patch DELETED ---


--- gtk-vnc-resize-refresh.patch DELETED ---



From berrange at fedoraproject.org  Thu Dec 17 18:30:57 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 17 Dec 2009 18:30:57 +0000 (UTC)
Subject: rpms/gtk-vnc/F-12 .cvsignore,1.12,1.13
Message-ID: <20091217183057.DB7A711C00E6@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27632

Modified Files:
	.cvsignore 
Log Message:
Ignore more autogenerated junk


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Oct 2009 00:08:50 -0000	1.12
+++ .cvsignore	17 Dec 2009 18:30:57 -0000	1.13
@@ -1 +1,5 @@
 gtk-vnc-0.3.10.tar.bz2
+.build*.log
+*.rpm
+i386
+x86_64



From rjones at fedoraproject.org  Thu Dec 17 18:50:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 17 Dec 2009 18:50:31 +0000 (UTC)
Subject: rpms/ocaml-omake/devel ocaml-omake.spec,1.9,1.10
Message-ID: <20091217185031.A4DA511C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-omake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30938

Modified Files:
	ocaml-omake.spec 
Log Message:
- Add 'Provides: omake' (RHBZ#548536).
- Remove OCaml from the summary, since omake is not an OCaml-specific tool.



Index: ocaml-omake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-omake/devel/ocaml-omake.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-omake.spec	25 Jul 2009 20:01:23 -0000	1.9
+++ ocaml-omake.spec	17 Dec 2009 18:50:31 -0000	1.10
@@ -2,8 +2,8 @@
 
 Name:           ocaml-omake
 Version:        0.9.8.5
-Release:        9%{?dist}
-Summary:        OCaml build system with automated dependency analysis
+Release:        10%{?dist}
+Summary:        Build system with automated dependency analysis
 
 Group:          Development/Tools
 License:        LGPLv2+ with exceptions and GPLv2+ and BSD
@@ -16,6 +16,9 @@ Patch0:         ocaml-omake-debian-stdin
 Patch1:         ocaml-omake-0.9.8.5-no-sync.patch
 Patch2:         ocaml-omake-0.9.8.5-free-buffer.patch
 
+# omake can be used on non-OCaml projects (RHBZ#548536).
+Provides:       omake
+
 BuildRequires:  ocaml >= 3.10.2-2
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  gamin-devel
@@ -89,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 17 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.8.5-10
+- Add 'Provides: omake' (RHBZ#548536).
+- Remove OCaml from the summary, since omake is not an OCaml-specific tool.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Dec 17 18:53:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 18:53:05 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider/F-12 crash.patch, NONE,
	1.1 notification-daemon-engine-slider.spec, 1.3, 1.4
Message-ID: <20091217185305.71A7011C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31511

Modified Files:
	notification-daemon-engine-slider.spec 
Added Files:
	crash.patch 
Log Message:
Fix a sporadic crash.


crash.patch:
 theme.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE crash.patch ---
diff -up notification-daemon-engine-slider-0.2.0/src/theme.c.crash notification-daemon-engine-slider-0.2.0/src/theme.c
--- notification-daemon-engine-slider-0.2.0/src/theme.c.crash	2009-12-17 13:44:21.348123579 -0500
+++ notification-daemon-engine-slider-0.2.0/src/theme.c	2009-12-17 13:48:52.487096848 -0500
@@ -186,6 +186,11 @@ update_shape (WindowData *windata)
         GdkBitmap *mask;
         cairo_t   *cr;
 
+        if (windata->width == 0 || windata->height == 0) {
+                windata->width = MAX (windata->win->allocation.width, 1);
+                windata->height = MAX (windata->win->allocation.height, 1);
+        }
+
         if (windata->composited) {
                 gtk_widget_shape_combine_mask (windata->win, NULL, 0, 0);
                 return;
@@ -228,9 +233,9 @@ paint_window (GtkWidget     *widget,
         cairo_surface_t *surface;
         cairo_t         *cr;
 
-        if (windata->width == 0) {
-                windata->width = windata->win->allocation.width;
-                windata->height = windata->win->allocation.height;
+        if (windata->width == 0 || windata->height == 0) {
+                windata->width = MAX (windata->win->allocation.width, 1);
+                windata->height = MAX (windata->win->allocation.height, 1);
         }
 
         context = gdk_cairo_create (widget->window);


Index: notification-daemon-engine-slider.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/F-12/notification-daemon-engine-slider.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- notification-daemon-engine-slider.spec	28 Sep 2009 20:00:54 -0000	1.3
+++ notification-daemon-engine-slider.spec	17 Dec 2009 18:53:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           notification-daemon-engine-slider
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Slider theme engine for the notification daemon
 
 Group:          System Environment/Libraries
@@ -12,12 +12,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  gtk2-devel >= 2.17.1
 Requires:       notification-daemon
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=548504
+Patch0:		crash.patch
+
 %description
 The Slider theme engine for the notification daemon.
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .crash
 
 %build
 %configure
@@ -42,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/notification-daemon-1.0/engines/libslider.so
 
 %changelog
+* Thu Dec 17 2009 Matthias Clasen <mclasen at redhat.com> - 0.2.0-2
+- Fix a sporadic crash (#548504)
+
 * Mon Sep 28 2009 Jon McCann <jmccann at redhat.com> - 0.2.0-1
 - Update to 0.2.0
 



From jussilehtola at fedoraproject.org  Thu Dec 17 18:59:19 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 17 Dec 2009 18:59:19 +0000 (UTC)
Subject: rpms/xine-ui/F-12 sources,1.3,1.4 xine-ui.spec,1.9,1.10
Message-ID: <20091217185919.F038B11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32561

Modified Files:
	sources xine-ui.spec 
Log Message:
Switch to 0.99.6 series snapshot.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Jul 2009 23:22:34 -0000	1.3
+++ sources	17 Dec 2009 18:59:19 -0000	1.4
@@ -1,4 +1,3 @@
-e643cd1fcad4d98a5ae4eb877ce5087b  xine-ui-0.99.5.tar.gz
 ad74c35558588f5d4234449a076b4105  Antares.tar.gz
 61cbcf4cb3f1443a17e96c0a73eeb3a8  Bambino-Black.tar.gz
 56f21a3ffddf0f0980336a5d9cdff179  Bambino-Blue.tar.gz
@@ -7,25 +6,26 @@ dacd886be4fd9c13dd96fa3b96f3e7f8  Bambin
 424b4dd516569c92af7d96c10daa46d3  Bambino-Pink.tar.gz
 2e6438459244104e46d89a66e5a1f961  Bambino-Purple.tar.gz
 3e8bc6f6958e8d732b88f2e227f3c879  Bambino-White.tar.gz
+454bdc7321fc18f0db811db722c2e93c  blackslim2.tar.gz
 070fd8e3582b6f9e302b595c81dd87e4  Bluton.tar.gz
+1ff0ea8d7c73c4f3b32c13a408af3be1  caramel.tar.gz
 159b45f013183aea3038f9133f61cf89  CelomaChrome.tar.gz
 5ac74cb407b59b3487031a0564698e1f  CelomaGold.tar.gz
 dadb7b21b8e7e0c40ad7237c4f98906f  CelomaMdk.tar.gz
 06f2b0f6ceb9456bc26fae65f4f89a53  Centori.tar.gz
-eb511cd1217bc0c0bd3fa016698adebc  Crystal.tar.gz
-c7825e925434374a074c4acc46bcdd4f  Galaxy.tar.gz
-0154a3eecbeb995865ead852fd5f6bb2  Keramic.tar.gz
-bff16e879b75bd5a442c0c5c7dc22bcb  KeramicRH8.tar.gz
-54b3e28494e1d89e041ceace7db32049  OMS_legacy.tar.gz
-b92dfe59cb5f7bbc495ed0be50c1c132  Polaris.tar.gz
-8702d138eb61b7149118f91121fe846a  Sunset.tar.gz
-454bdc7321fc18f0db811db722c2e93c  blackslim2.tar.gz
-1ff0ea8d7c73c4f3b32c13a408af3be1  caramel.tar.gz
 432e0d5135be09e03a69f363d3da94a0  cloudy.tar.gz
 34d18380c1077cdf43a04797b2e06734  concept.tar.gz
+eb511cd1217bc0c0bd3fa016698adebc  Crystal.tar.gz
+c7825e925434374a074c4acc46bcdd4f  Galaxy.tar.gz
 d809f2f3cce0eae966296e01ede8df00  gudgreen.tar.gz
+bff16e879b75bd5a442c0c5c7dc22bcb  KeramicRH8.tar.gz
+0154a3eecbeb995865ead852fd5f6bb2  Keramic.tar.gz
 f16d6a1a39b32473a901d9132c405196  lcd.tar.gz
 841924c042ca70700a9d201bc7686e59  mp2k.tar.gz
 3023e8dd6c12902c32b3d99e51fd0c1e  mplayer.tar.gz
+54b3e28494e1d89e041ceace7db32049  OMS_legacy.tar.gz
 7dd4e9e50e0145142982b0537c36f50a  pitt.tar.gz
+b92dfe59cb5f7bbc495ed0be50c1c132  Polaris.tar.gz
+8702d138eb61b7149118f91121fe846a  Sunset.tar.gz
 9ebf98f4434a9fc119f0282806ba9c32  xinium.tar.gz
+75373e8aca45446c3708180596186ad8  xine-ui-0.99.6-20091217.tar.bz2


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/F-12/xine-ui.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xine-ui.spec	3 Sep 2009 14:07:55 -0000	1.9
+++ xine-ui.spec	17 Dec 2009 18:59:19 -0000	1.10
@@ -1,13 +1,28 @@
 # TODO, sometime: nvtvsimple
 
+# hg version
+%global hgdate 20091217
+
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
-Version:        0.99.5
-Release:        16%{?dist}
+Version:        0.99.6
+Release:        0.1.%{hgdate}hg%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
-Source0:        http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz
+
+#Source0:        http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz
+
+#Use source from hg for now to fix a few bugs
+#This tarball has been created with
+# hg clone http://hg.debian.org/hg/xine-lib/xine-ui/ xine-ui-0.99.6
+# find xine-ui-0.99.6 -name .hg* -exec rm -rf {} \;
+# find xine-ui-0.99.6 -name .cvs* -exec rm -rf {} \;
+# tar jcf xine-ui-0.99.6-20091217.tar.bz2 xine-ui-0.99.6/
+Source0:	xine-ui-%{version}-%{hgdate}.tar.bz2
+BuildRequires:	autoconf
+BuildRequires:	automake
+
 # Patch to enable linking to shared library version of lirc
 Patch0:         xine-ui-0.99.5-shared-lirc.patch
 # Patch to use UTF-8 documentation, BZ #512598
@@ -110,7 +125,7 @@ This package contains extra skins for xi
 
 # Backup time stamp
 touch -r m4/_xine.m4 m4/_xine.m4.stamp
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 # and restore it
 touch -r m4/_xine.m4.stamp m4/_xine.m4
@@ -122,10 +137,10 @@ if [ -n "$libx11so" -a -f "$libx11so" ] 
     sed -i -e "s/\"libX11\\.so\"/\"$(basename $libx11so)\"/" src/aaui/main.c
 fi
 
-touch -r configure.ac configure.ac.stamp
-sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \
-    config.h.in configure.ac configure
-touch -r configure.ac.stamp configure.ac
+#touch -r configure.ac configure.ac.stamp
+#sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \
+#    config.h.in configure.ac configure
+#touch -r configure.ac.stamp configure.ac
 
 for f in doc/man/{de,es,fr}/*.1* doc/README?{cs,de,es,fi,fr,it} ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && \
@@ -150,7 +165,10 @@ find fedoraskins/ -type d -name "CVS" -e
 find fedoraskins/ -type d -name ".xvpics" -exec rm -rf {} \; || :
 
 %build
-%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version}
+./autogen.sh noconfig
+export LIRC_CFLAGS="-llirc_client"
+export LIRC_LIBS="-llirc_client"
+#%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version}
 # Set documentation directory
 make %{?_smp_mflags}
 
@@ -180,12 +198,14 @@ rm -rf %{buildroot}
 %post
 # Mime type
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 # Icon cache
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 # Mime type
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 # Icon cache
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -214,6 +234,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/xine/oxine/
 %{_datadir}/xine/visuals/
 
+%{_datadir}/mime/packages/xine-ui.xml
 %{_datadir}/applications/*xine.desktop
 %{_datadir}/icons/hicolor/*x*/apps/xine.png
 %{_datadir}/pixmaps/xine.xpm
@@ -231,6 +252,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/xine/skins/xine_splash.png
 
 %changelog
+* Thu Dec 17 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.6-0.1.20091217hg
+- Switch to development branch by suggestion of upstream to fix some bugs.
+
 * Thu Sep 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-16
 - Move xine-ui_logo.mpv to main package from -skins.
 



From mschwendt at fedoraproject.org  Thu Dec 17 19:02:58 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 17 Dec 2009 19:02:58 +0000 (UTC)
Subject: rpms/libsidplay/devel libsidplay-post59fixes.patch, NONE,
	1.1 libsidplay.spec, 1.26, 1.27
Message-ID: <20091217190258.B0F6C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/libsidplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv879

Modified Files:
	libsidplay.spec 
Added Files:
	libsidplay-post59fixes.patch 
Log Message:
* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
- apply minor patch to avoid uninitialised values


libsidplay-post59fixes.patch:
 eeconfig.cpp |    2 +-
 sidtune.cpp  |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libsidplay-post59fixes.patch ---
diff -Nur libsidplay-1.36.57-orig/src/eeconfig.cpp libsidplay-1.36.57/src/eeconfig.cpp
--- libsidplay-1.36.57-orig/src/eeconfig.cpp	2001-11-19 20:27:56.000000000 +0100
+++ libsidplay-1.36.57/src/eeconfig.cpp	2009-12-17 19:42:58.000000000 +0100
@@ -51,8 +51,8 @@
 		initMixerEngine();
 		setDefaultVoiceVolumes();
 		setDefaultFilterStrength();
-		reset();
 		isReady = true;
+		reset();
 	}
 	else
 	{
diff -Nur libsidplay-1.36.57-orig/src/sidtune.cpp libsidplay-1.36.57/src/sidtune.cpp
--- libsidplay-1.36.57-orig/src/sidtune.cpp	2002-09-13 00:46:12.000000000 +0200
+++ libsidplay-1.36.57/src/sidtune.cpp	2009-12-17 19:42:58.000000000 +0100
@@ -529,6 +529,8 @@
 	cachePtr = 0;
 	cacheLen = 0;
 
+	isSlashedFileName = false;
+
 	fileBuf = ( fileBuf2 = 0 );
 	fileOffset = 0;
 	fileNameExtensions = defaultFileNameExt;


Index: libsidplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libsidplay.spec	25 Jul 2009 08:37:22 -0000	1.26
+++ libsidplay.spec	17 Dec 2009 19:02:58 -0000	1.27
@@ -1,9 +1,10 @@
 Name: libsidplay
 Summary: SID chip music module playing library
 Version: 1.36.57
-Release: 20
+Release: 21%{?dist}
 Source: http://home.arcor.de/ms2002sep/bak/%{name}-%{version}.tgz
-Patch: libsidplay-post57fixes.patch
+Patch0: libsidplay-post57fixes.patch
+Patch1: libsidplay-post59fixes.patch
 Patch2: libsidplay-1.36.57-opts.patch
 Patch3: libsidplay-1.36.57-gcc43.patch
 Group: System Environment/Libraries
@@ -35,14 +36,15 @@ Developers should consider switching to 
 
 %prep
 %setup -q
-%patch -p1 -b .post57fixes
+%patch0 -p1 -b .post57fixes
+%patch1 -p1 -b .post59fixes
 %patch2 -p1 -b .opts
 %patch3 -p1 -b .gcc43
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS" %configure \
   --disable-static
-make
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -57,19 +59,22 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libsidplay.so.*
 %exclude %{_libdir}/*.la
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS DEVELOPER src/*.txt
 %{_libdir}/libsidplay.so
 #%{_libdir}/libsidplay.a
-%{_includedir}/sidplay
+%{_includedir}/sidplay/
 
 %changelog
+* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
+- apply minor patch to avoid uninitialised values
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.36.57-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Thu Dec 17 19:04:38 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 17 Dec 2009 19:04:38 +0000 (UTC)
Subject: rpms/libsidplay/F-12 libsidplay-post59fixes.patch, NONE,
	1.1 libsidplay.spec, 1.26, 1.27
Message-ID: <20091217190438.8FA7111C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/libsidplay/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1288/F-12

Modified Files:
	libsidplay.spec 
Added Files:
	libsidplay-post59fixes.patch 
Log Message:
* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
- apply minor patch to avoid uninitialised values


libsidplay-post59fixes.patch:
 eeconfig.cpp |    2 +-
 sidtune.cpp  |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libsidplay-post59fixes.patch ---
diff -Nur libsidplay-1.36.57-orig/src/eeconfig.cpp libsidplay-1.36.57/src/eeconfig.cpp
--- libsidplay-1.36.57-orig/src/eeconfig.cpp	2001-11-19 20:27:56.000000000 +0100
+++ libsidplay-1.36.57/src/eeconfig.cpp	2009-12-17 19:42:58.000000000 +0100
@@ -51,8 +51,8 @@
 		initMixerEngine();
 		setDefaultVoiceVolumes();
 		setDefaultFilterStrength();
-		reset();
 		isReady = true;
+		reset();
 	}
 	else
 	{
diff -Nur libsidplay-1.36.57-orig/src/sidtune.cpp libsidplay-1.36.57/src/sidtune.cpp
--- libsidplay-1.36.57-orig/src/sidtune.cpp	2002-09-13 00:46:12.000000000 +0200
+++ libsidplay-1.36.57/src/sidtune.cpp	2009-12-17 19:42:58.000000000 +0100
@@ -529,6 +529,8 @@
 	cachePtr = 0;
 	cacheLen = 0;
 
+	isSlashedFileName = false;
+
 	fileBuf = ( fileBuf2 = 0 );
 	fileOffset = 0;
 	fileNameExtensions = defaultFileNameExt;


Index: libsidplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsidplay/F-12/libsidplay.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libsidplay.spec	25 Jul 2009 08:37:22 -0000	1.26
+++ libsidplay.spec	17 Dec 2009 19:04:38 -0000	1.27
@@ -1,9 +1,10 @@
 Name: libsidplay
 Summary: SID chip music module playing library
 Version: 1.36.57
-Release: 20
+Release: 21%{?dist}
 Source: http://home.arcor.de/ms2002sep/bak/%{name}-%{version}.tgz
-Patch: libsidplay-post57fixes.patch
+Patch0: libsidplay-post57fixes.patch
+Patch1: libsidplay-post59fixes.patch
 Patch2: libsidplay-1.36.57-opts.patch
 Patch3: libsidplay-1.36.57-gcc43.patch
 Group: System Environment/Libraries
@@ -35,14 +36,15 @@ Developers should consider switching to 
 
 %prep
 %setup -q
-%patch -p1 -b .post57fixes
+%patch0 -p1 -b .post57fixes
+%patch1 -p1 -b .post59fixes
 %patch2 -p1 -b .opts
 %patch3 -p1 -b .gcc43
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS" %configure \
   --disable-static
-make
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -57,19 +59,22 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libsidplay.so.*
 %exclude %{_libdir}/*.la
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS DEVELOPER src/*.txt
 %{_libdir}/libsidplay.so
 #%{_libdir}/libsidplay.a
-%{_includedir}/sidplay
+%{_includedir}/sidplay/
 
 %changelog
+* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
+- apply minor patch to avoid uninitialised values
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.36.57-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Thu Dec 17 19:04:38 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 17 Dec 2009 19:04:38 +0000 (UTC)
Subject: rpms/libsidplay/F-11 libsidplay-post59fixes.patch, NONE,
	1.1 libsidplay.spec, 1.25, 1.26
Message-ID: <20091217190438.D19A111C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/libsidplay/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1288/F-11

Modified Files:
	libsidplay.spec 
Added Files:
	libsidplay-post59fixes.patch 
Log Message:
* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
- apply minor patch to avoid uninitialised values


libsidplay-post59fixes.patch:
 eeconfig.cpp |    2 +-
 sidtune.cpp  |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libsidplay-post59fixes.patch ---
diff -Nur libsidplay-1.36.57-orig/src/eeconfig.cpp libsidplay-1.36.57/src/eeconfig.cpp
--- libsidplay-1.36.57-orig/src/eeconfig.cpp	2001-11-19 20:27:56.000000000 +0100
+++ libsidplay-1.36.57/src/eeconfig.cpp	2009-12-17 19:42:58.000000000 +0100
@@ -51,8 +51,8 @@
 		initMixerEngine();
 		setDefaultVoiceVolumes();
 		setDefaultFilterStrength();
-		reset();
 		isReady = true;
+		reset();
 	}
 	else
 	{
diff -Nur libsidplay-1.36.57-orig/src/sidtune.cpp libsidplay-1.36.57/src/sidtune.cpp
--- libsidplay-1.36.57-orig/src/sidtune.cpp	2002-09-13 00:46:12.000000000 +0200
+++ libsidplay-1.36.57/src/sidtune.cpp	2009-12-17 19:42:58.000000000 +0100
@@ -529,6 +529,8 @@
 	cachePtr = 0;
 	cacheLen = 0;
 
+	isSlashedFileName = false;
+
 	fileBuf = ( fileBuf2 = 0 );
 	fileOffset = 0;
 	fileNameExtensions = defaultFileNameExt;


Index: libsidplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsidplay/F-11/libsidplay.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libsidplay.spec	25 Feb 2009 18:06:16 -0000	1.25
+++ libsidplay.spec	17 Dec 2009 19:04:38 -0000	1.26
@@ -1,9 +1,10 @@
 Name: libsidplay
 Summary: SID chip music module playing library
 Version: 1.36.57
-Release: 19
+Release: 21%{?dist}
 Source: http://home.arcor.de/ms2002sep/bak/%{name}-%{version}.tgz
-Patch: libsidplay-post57fixes.patch
+Patch0: libsidplay-post57fixes.patch
+Patch1: libsidplay-post59fixes.patch
 Patch2: libsidplay-1.36.57-opts.patch
 Patch3: libsidplay-1.36.57-gcc43.patch
 Group: System Environment/Libraries
@@ -35,14 +36,15 @@ Developers should consider switching to 
 
 %prep
 %setup -q
-%patch -p1 -b .post57fixes
+%patch0 -p1 -b .post57fixes
+%patch1 -p1 -b .post59fixes
 %patch2 -p1 -b .opts
 %patch3 -p1 -b .gcc43
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS" %configure \
   --disable-static
-make
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -57,19 +59,25 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libsidplay.so.*
 %exclude %{_libdir}/*.la
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS DEVELOPER src/*.txt
 %{_libdir}/libsidplay.so
 #%{_libdir}/libsidplay.a
-%{_includedir}/sidplay
+%{_includedir}/sidplay/
 
 %changelog
+* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
+- apply minor patch to avoid uninitialised values
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.36.57-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.36.57-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Thu Dec 17 19:09:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 19:09:06 +0000 (UTC)
Subject: File xdg-utils-20091217cvs.tgz uploaded to lookaside cache by
	rdieter
Message-ID: <20091217190906.F0E9F28ECA8@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for xdg-utils:

4b6e7d7187c6bbea0789b34ddb3c2ca1  xdg-utils-20091217cvs.tgz



From rdieter at fedoraproject.org  Thu Dec 17 19:14:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 19:14:13 +0000 (UTC)
Subject: File xdg-utils-20091217cvs.tgz uploaded to lookaside cache by
	rdieter
Message-ID: <20091217191413.C91E628ECA8@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for xdg-utils:

fa58fe2fe1bf638cb9a1b6b162746a87  xdg-utils-20091217cvs.tgz



From rdieter at fedoraproject.org  Thu Dec 17 19:15:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 19:15:47 +0000 (UTC)
Subject: rpms/xdg-utils/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 xdg-utils.spec, 1.26, 1.27
Message-ID: <20091217191547.4BA4011C0092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3654

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-16.20091217cvs
- xdg-mime: line 531: kde-config: command not found (#545702)
- xdg-email calls gconftool which doesn't exist (#548529)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Oct 2009 17:25:28 -0000	1.14
+++ .cvsignore	17 Dec 2009 19:15:46 -0000	1.15
@@ -1 +1 @@
-xdg-utils-20091016cvs.tgz
+xdg-utils-20091217cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	16 Oct 2009 17:25:28 -0000	1.14
+++ sources	17 Dec 2009 19:15:47 -0000	1.15
@@ -1 +1 @@
-4a60deb7a09f57959b335e0d5acaf15c  xdg-utils-20091016cvs.tgz
+fa58fe2fe1bf638cb9a1b6b162746a87  xdg-utils-20091217cvs.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xdg-utils.spec	30 Nov 2009 15:30:37 -0000	1.26
+++ xdg-utils.spec	17 Dec 2009 19:15:47 -0000	1.27
@@ -3,12 +3,12 @@
 %define obsoletes_htmlview 1
 %endif
 
-%define cvs 20091016cvs
+%define cvs 20091217cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 15.%{cvs}%{?dist}
+Release: 16.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -126,6 +126,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-16.20091217cvs
+- xdg-mime: line 531: kde-config: command not found (#545702)
+- xdg-email calls gconftool which doesn't exist (#548529)
+
 * Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-15.20091016cvs
 - add Obsoletes: htmlview (#541179, f13+)
 



From rdieter at fedoraproject.org  Thu Dec 17 19:18:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 19:18:25 +0000 (UTC)
Subject: rpms/xdg-utils/F-12 .cvsignore, 1.14, 1.15 sources, 1.13,
	1.14 xdg-utils.spec, 1.25, 1.26
Message-ID: <20091217191825.82EAD11C0092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4206

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-16.20091217cvs
- xdg-mime: line 531: kde-config: command not found (#545702)
- xdg-email calls gconftool which doesn't exist (#548529)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Oct 2009 17:26:47 -0000	1.14
+++ .cvsignore	17 Dec 2009 19:18:25 -0000	1.15
@@ -1 +1 @@
-xdg-utils-20091016cvs.tgz
+xdg-utils-20091217cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	16 Oct 2009 17:26:47 -0000	1.13
+++ sources	17 Dec 2009 19:18:25 -0000	1.14
@@ -1 +1 @@
-4a60deb7a09f57959b335e0d5acaf15c  xdg-utils-20091016cvs.tgz
+fa58fe2fe1bf638cb9a1b6b162746a87  xdg-utils-20091217cvs.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/xdg-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xdg-utils.spec	16 Oct 2009 17:26:47 -0000	1.25
+++ xdg-utils.spec	17 Dec 2009 19:18:25 -0000	1.26
@@ -1,10 +1,14 @@
 
-%define cvs 20091016cvs
+%if 0%{?fedora} > 12
+%define obsoletes_htmlview 1
+%endif
+
+%define cvs 20091217cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 14.%{cvs}%{?dist}
+Release: 16.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -18,6 +22,8 @@ Group:   System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+Source10: htmlview.sh
+
 Patch1: xdg-utils-1.0.2-htmlview.patch
 
 ## upstreamable patches
@@ -44,6 +50,11 @@ Requires: desktop-file-utils
 #Requires(hint): perl-File-MimeInfo 
 Requires: which
 
+%if 0%{?obsoletes_htmlview}
+Obsoletes: htmlview <= 4.0.0
+## nothing should be depending on this 
+#Provides:  htmlview = 4.0.1
+%endif
 
 %description
 The %{name} package is a set of simple scripts that provide basic
@@ -71,7 +82,9 @@ The following scripts are provided at th
 #setup -q -n %{name}-%{version}%{?beta}
 %setup -q -n %{name}
 
+%if ! 0%{?obsoletes_htmlview}
 %patch1 -p1 -b .htmlview
+%endif
 #patch50 -p1 -b .CVE-2009-0068-1
 
 %if ! 0%{?cvs:1}
@@ -93,10 +106,17 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
+%if 0%{?obsoletes_htmlview}
+install -m755 -p %{SOURCE10} %{buildroot}%{_bindir}/htmlview
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE README TODO
+%if 0%{?obsoletes_htmlview}
+%{_bindir}/htmlview
+%endif
 %{_bindir}/xdg-*
 %{_mandir}/man1/xdg-*
 
@@ -106,6 +126,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-16.20091217cvs
+- xdg-mime: line 531: kde-config: command not found (#545702)
+- xdg-email calls gconftool which doesn't exist (#548529)
+
+* Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-15.20091016cvs
+- add Obsoletes: htmlview (#541179, f13+)
+
 * Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-14.20091016cvs
 - prefer gvfs-open over gnome-open (#529287)
 - DE=gnome, if org.gnome.SessionManager exists on dbus (#529287)



From rdieter at fedoraproject.org  Thu Dec 17 19:18:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 19:18:54 +0000 (UTC)
Subject: rpms/xdg-utils/F-12 htmlview.sh,NONE,1.1
Message-ID: <20091217191854.1416811C0092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4389

Added Files:
	htmlview.sh 
Log Message:
import



--- NEW FILE htmlview.sh ---
#!/bin/sh

if [ $# -gt 0 ]; then
 exec /usr/bin/xdg-open "$@"
else
 exec /usr/bin/xdg-open http://start.fedoraproject.org/
fi




From lucilanga at fedoraproject.org  Thu Dec 17 19:20:02 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Thu, 17 Dec 2009 19:20:02 +0000 (UTC)
Subject: rpms/perl-PDF-Create/devel LICENSE, NONE, 1.1 perl-PDF-Create.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091217192002.702BC11C0092@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/perl-PDF-Create/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4648

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE perl-PDF-Create.spec 
Log Message:
initial import


--- NEW FILE LICENSE ---
The main package does not specify a license.
However author states this:

"I had a look and have decided to use the perl license. The next
release will have
this set in the META.yml file."

Markus Baertschi


--- NEW FILE perl-PDF-Create.spec ---
Name:           perl-PDF-Create
Version:        1.04
Release:        2%{?dist}
Summary:        Create PDF files
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PDF-Create/
Source0:        http://www.cpan.org/authors/id/M/MA/MARKUSB/PDF-Create-%{version}.tar.gz
Source1:        LICENSE
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
This module allows you to create PDF documents using a large number of
primitives, and emit the result as a PDF file or stream. PDF stands for
Portable Document Format.

Documents can have several pages, a table of content, an information section
and many other PDF elements. More functionalities will be added as needs arise.

Documents are constructed on the fly so the memory footprint is not tied to the
size of the pages but only to their number.

%prep
%setup -q -n PDF-Create-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
chmod -x pdf-logo.gif pdf-logo.jpg
cp -p %{SOURCE1} %{_builddir}/PDF-Create-%{version}/

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE pdf-logo.gif pdf-logo.jpg README TODO
%{perl_vendorlib}/PDF
%{_mandir}/man3/*.3*

%changelog
* Thu Dec 17 2009 Lucian Langa <cooly at gnome.eu.org> - 1.04-2
- add license clarification

* Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 1.04-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-Create/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:46:38 -0000	1.1
+++ .cvsignore	17 Dec 2009 19:20:02 -0000	1.2
@@ -0,0 +1 @@
+PDF-Create-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-Create/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:46:38 -0000	1.1
+++ sources	17 Dec 2009 19:20:02 -0000	1.2
@@ -0,0 +1 @@
+786a508cfb10a6e2cd6344fa70f99692  PDF-Create-1.04.tar.gz



From rdieter at fedoraproject.org  Thu Dec 17 19:27:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 19:27:18 +0000 (UTC)
Subject: rpms/xdg-utils/F-11 htmlview.sh, NONE, 1.1 .cvsignore, 1.11,
	1.12 sources, 1.10, 1.11 xdg-utils.spec, 1.21, 1.22
Message-ID: <20091217192718.5602711C0092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6045

Modified Files:
	.cvsignore sources xdg-utils.spec 
Added Files:
	htmlview.sh 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-16.20091217cvs
- xdg-mime: line 531: kde-config: command not found (#545702)
- xdg-email calls gconftool which doesn't exist (#548529)



--- NEW FILE htmlview.sh ---
#!/bin/sh

if [ $# -gt 0 ]; then
 exec /usr/bin/xdg-open "$@"
else
 exec /usr/bin/xdg-open http://start.fedoraproject.org/
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Nov 2009 15:53:52 -0000	1.11
+++ .cvsignore	17 Dec 2009 19:27:17 -0000	1.12
@@ -1 +1 @@
-xdg-utils-20091016cvs.tgz
+xdg-utils-20091217cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Nov 2009 15:53:52 -0000	1.10
+++ sources	17 Dec 2009 19:27:18 -0000	1.11
@@ -1 +1 @@
-4a60deb7a09f57959b335e0d5acaf15c  xdg-utils-20091016cvs.tgz
+fa58fe2fe1bf638cb9a1b6b162746a87  xdg-utils-20091217cvs.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-11/xdg-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xdg-utils.spec	12 Nov 2009 15:53:52 -0000	1.21
+++ xdg-utils.spec	17 Dec 2009 19:27:18 -0000	1.22
@@ -1,10 +1,14 @@
 
-%define cvs 20091016cvs
+%if 0%{?fedora} > 12
+%define obsoletes_htmlview 1
+%endif
+
+%define cvs 20091217cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 14.%{cvs}%{?dist}
+Release: 16.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -18,6 +22,8 @@ Group:   System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+Source10: htmlview.sh
+
 Patch1: xdg-utils-1.0.2-htmlview.patch
 
 ## upstreamable patches
@@ -44,6 +50,11 @@ Requires: desktop-file-utils
 #Requires(hint): perl-File-MimeInfo 
 Requires: which
 
+%if 0%{?obsoletes_htmlview}
+Obsoletes: htmlview <= 4.0.0
+## nothing should be depending on this 
+#Provides:  htmlview = 4.0.1
+%endif
 
 %description
 The %{name} package is a set of simple scripts that provide basic
@@ -71,7 +82,9 @@ The following scripts are provided at th
 #setup -q -n %{name}-%{version}%{?beta}
 %setup -q -n %{name}
 
+%if ! 0%{?obsoletes_htmlview}
 %patch1 -p1 -b .htmlview
+%endif
 #patch50 -p1 -b .CVE-2009-0068-1
 
 %if ! 0%{?cvs:1}
@@ -93,10 +106,17 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
+%if 0%{?obsoletes_htmlview}
+install -m755 -p %{SOURCE10} %{buildroot}%{_bindir}/htmlview
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE README TODO
+%if 0%{?obsoletes_htmlview}
+%{_bindir}/htmlview
+%endif
 %{_bindir}/xdg-*
 %{_mandir}/man1/xdg-*
 
@@ -106,6 +126,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-16.20091217cvs
+- xdg-mime: line 531: kde-config: command not found (#545702)
+- xdg-email calls gconftool which doesn't exist (#548529)
+
+* Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-15.20091016cvs
+- add Obsoletes: htmlview (#541179, f13+)
+
 * Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-14.20091016cvs
 - prefer gvfs-open over gnome-open (#529287)
 - DE=gnome, if org.gnome.SessionManager exists on dbus (#529287)



From lucilanga at fedoraproject.org  Thu Dec 17 19:31:13 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Thu, 17 Dec 2009 19:31:13 +0000 (UTC)
Subject: rpms/perl-PDF-Create/F-12 LICENSE, NONE, 1.1 perl-PDF-Create.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091217193113.B8AC011C0092@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/perl-PDF-Create/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6877

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE perl-PDF-Create.spec 
Log Message:
initial import


--- NEW FILE LICENSE ---
The main package does not specify a license.
However author states this:

"I had a look and have decided to use the perl license. The next
release will have
this set in the META.yml file."

Markus Baertschi


--- NEW FILE perl-PDF-Create.spec ---
Name:           perl-PDF-Create
Version:        1.04
Release:        2%{?dist}
Summary:        Create PDF files
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PDF-Create/
Source0:        http://www.cpan.org/authors/id/M/MA/MARKUSB/PDF-Create-%{version}.tar.gz
Source1:        LICENSE
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
This module allows you to create PDF documents using a large number of
primitives, and emit the result as a PDF file or stream. PDF stands for
Portable Document Format.

Documents can have several pages, a table of content, an information section
and many other PDF elements. More functionalities will be added as needs arise.

Documents are constructed on the fly so the memory footprint is not tied to the
size of the pages but only to their number.

%prep
%setup -q -n PDF-Create-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
chmod -x pdf-logo.gif pdf-logo.jpg
cp -p %{SOURCE1} %{_builddir}/PDF-Create-%{version}/

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE pdf-logo.gif pdf-logo.jpg README TODO
%{perl_vendorlib}/PDF
%{_mandir}/man3/*.3*

%changelog
* Thu Dec 17 2009 Lucian Langa <cooly at gnome.eu.org> - 1.04-2
- add license clarification

* Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 1.04-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-Create/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:46:38 -0000	1.1
+++ .cvsignore	17 Dec 2009 19:31:13 -0000	1.2
@@ -0,0 +1 @@
+PDF-Create-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-Create/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:46:38 -0000	1.1
+++ sources	17 Dec 2009 19:31:13 -0000	1.2
@@ -0,0 +1 @@
+786a508cfb10a6e2cd6344fa70f99692  PDF-Create-1.04.tar.gz



From dwalsh at fedoraproject.org  Thu Dec 17 19:34:19 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Dec 2009 19:34:19 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.42,
	1.43 modules-mls.conf, 1.62, 1.63 modules-targeted.conf, 1.151,
	1.152 nsadiff, 1.27, 1.28 policy-F13.patch, 1.14, 1.15
Message-ID: <20091217193419.28DB811C0092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7518

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	nsadiff policy-F13.patch 
Log Message:
* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-3
- Fixes for abrt calls



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- modules-minimum.conf	16 Dec 2009 12:58:40 -0000	1.42
+++ modules-minimum.conf	17 Dec 2009 19:34:18 -0000	1.43
@@ -1576,13 +1576,6 @@ tgtd = module
 # 
 udev = base
 
-# Layer: services
-# Module: udisks
-#
-# Policy for udisk
-# 
-udisks = base
-
 # Layer: system
 # Module: userdomain
 #


Index: modules-mls.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- modules-mls.conf	16 Dec 2009 12:58:41 -0000	1.62
+++ modules-mls.conf	17 Dec 2009 19:34:18 -0000	1.63
@@ -1386,13 +1386,6 @@ tgtd = module
 # 
 udev = base
 
-# Layer: services
-# Module: udisks
-#
-# Policy for udisk
-# 
-udisks = base
-
 # Layer: system
 # Module: userdomain
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- modules-targeted.conf	16 Dec 2009 12:58:41 -0000	1.151
+++ modules-targeted.conf	17 Dec 2009 19:34:18 -0000	1.152
@@ -1576,13 +1576,6 @@ tgtd = module
 # 
 udev = base
 
-# Layer: services
-# Module: udisks
-#
-# Policy for udisk
-# 
-udisks = base
-
 # Layer: system
 # Module: userdomain
 #


Index: nsadiff
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nsadiff	10 Dec 2009 18:56:22 -0000	1.27
+++ nsadiff	17 Dec 2009 19:34:18 -0000	1.28
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.4 > /tmp/diff
+diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.4 > /tmp/diff

policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   11 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   79 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  190 +++
 policy/modules/apps/sandbox.te            |  335 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   46 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  117 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  429 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   39 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   23 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |   23 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  398 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  282 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  643 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  191 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   56 +
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1679 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 387 files changed, 19695 insertions(+), 2973 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.14 -r 1.15 policy-F13.patchIndex: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- policy-F13.patch	16 Dec 2009 23:01:00 -0000	1.14
+++ policy-F13.patch	17 Dec 2009 19:34:18 -0000	1.15
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.4/Makefile	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/Makefile	2009-12-17 14:26:48.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -10,9 +10,9 @@ diff -b -B --ignore-all-space --exclude-
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/global_tunables	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/global_tunables	2009-12-17 14:26:48.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -48,9 +48,9 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(mmap_low_allowed, false)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-17 14:26:48.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -60,9 +60,9 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(alsa_t)
  
  init_use_fds(alsa_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-17 14:26:48.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -80,9 +80,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-17 14:26:48.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -92,9 +92,9 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_network_state(brctl_t)
  kernel_read_sysctl(brctl_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-17 14:26:48.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -104,9 +104,9 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	apache_exec_modules(certwatch_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-17 14:26:48.000000000 -0500
 @@ -10,7 +10,6 @@
  type consoletype_exec_t;
  application_executable_file(consoletype_exec_t)
@@ -123,17 +123,17 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-17 14:26:48.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -175,9 +175,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +#mcelog needs
 +dev_read_raw_memory(dmesg_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-17 14:26:48.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -200,9 +200,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-11-25 15:15:48.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-17 14:26:48.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -policy_module(kismet, 1.4.1)
@@ -267,9 +267,9 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(kismet_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.4/policy/modules/admin/logrotate.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.4/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/logrotate.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/logrotate.te	2009-12-17 14:26:48.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -347,9 +347,9 @@ diff -b -B --ignore-all-space --exclude-
  	slrnpull_manage_spool(logrotate_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.7.4/policy/modules/admin/logwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.7.4/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/logwatch.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/logwatch.te	2009-12-17 14:26:48.000000000 -0500
 @@ -93,6 +93,13 @@
  sysnet_exec_ifconfig(logwatch_t)
  
@@ -370,9 +370,9 @@ diff -b -B --ignore-all-space --exclude-
  	samba_read_log(logwatch_t)
 +	samba_read_share_files(logwatch_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.7.4/policy/modules/admin/mrtg.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.7.4/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/mrtg.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/mrtg.te	2009-12-17 14:26:48.000000000 -0500
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -381,9 +381,9 @@ diff -b -B --ignore-all-space --exclude-
  
  netutils_domtrans_ping(mrtg_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.4/policy/modules/admin/netutils.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.4/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/netutils.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/netutils.te	2009-12-17 14:26:48.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -400,18 +400,18 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(netutils_t)
  userdom_use_all_users_fds(netutils_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.7.4/policy/modules/admin/ntop.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.7.4/policy/modules/admin/ntop.fc
 --- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/ntop.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/ntop.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
 +
 +/usr/sbin/ntop		--	gen_context(system_u:object_r:ntop_exec_t,s0)
 +
 +/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.7.4/policy/modules/admin/ntop.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.7.4/policy/modules/admin/ntop.if
[...5410 lines suppressed...]
  
--	dontaudit $1 user_tmp_t:file manage_file_perms;
-+	dontaudit $1 user_tmp_t:file write;
+-	manage_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
++	manage_chr_files_pattern($1, user_tmp_t, user_tmp_t)
+ 	files_search_tmp($1)
  ')
  
  ########################################
  ## <summary>
--##	Read user temporary symbolic links.
-+##	Do not audit attempts to manage users
-+##	temporary files.
+ ##	Create, read, write, and delete user
+-##	temporary named pipes.
++##	temporary blk files.
  ## </summary>
  ## <param name="domain">
  ##	<summary>
--##	Domain allowed access.
-+##	Domain to not audit.
+@@ -2304,19 +2530,19 @@
  ##	</summary>
  ## </param>
  #
--interface(`userdom_read_user_tmp_symlinks',`
-+interface(`userdom_dontaudit_manage_user_tmp_files',`
+-interface(`userdom_manage_user_tmp_pipes',`
++interface(`userdom_manage_user_tmp_blk_files',`
  	gen_require(`
  		type user_tmp_t;
  	')
  
--	read_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
--	allow $1 user_tmp_t:dir list_dir_perms;
--	files_search_tmp($1)
-+	dontaudit $1 user_tmp_t:file manage_file_perms;
+-	manage_fifo_files_pattern($1, user_tmp_t, user_tmp_t)
++	manage_blk_files_pattern($1, user_tmp_t, user_tmp_t)
+ 	files_search_tmp($1)
  ')
  
  ########################################
  ## <summary>
--##	Create, read, write, and delete user
-+##	Read user temporary symbolic links.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`userdom_read_user_tmp_symlinks',`
+ ##	Create, read, write, and delete user
+-##	temporary named sockets.
++##	temporary symbolic links.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2324,7 +2550,47 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_manage_user_tmp_sockets',`
++interface(`userdom_manage_user_tmp_symlinks',`
 +	gen_require(`
 +		type user_tmp_t;
 +	')
 +
-+	read_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
-+	allow $1 user_tmp_t:dir list_dir_perms;
++	manage_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
 +	files_search_tmp($1)
 +')
 +
 +########################################
 +## <summary>
 +##	Create, read, write, and delete user
- ##	temporary directories.
- ## </summary>
- ## <param name="domain">
-@@ -2276,6 +2502,46 @@
- ########################################
- ## <summary>
- ##	Create, read, write, and delete user
-+##	temporary chr files.
++##	temporary named pipes.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -34510,19 +34140,19 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_user_tmp_chr_files',`
++interface(`userdom_manage_user_tmp_pipes',`
 +	gen_require(`
 +		type user_tmp_t;
 +	')
 +
-+	manage_chr_files_pattern($1, user_tmp_t, user_tmp_t)
++	manage_fifo_files_pattern($1, user_tmp_t, user_tmp_t)
 +	files_search_tmp($1)
 +')
 +
 +########################################
 +## <summary>
 +##	Create, read, write, and delete user
-+##	temporary blk files.
++##	temporary named sockets.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -34530,21 +34160,10 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_user_tmp_blk_files',`
-+	gen_require(`
-+		type user_tmp_t;
-+	')
-+
-+	manage_blk_files_pattern($1, user_tmp_t, user_tmp_t)
-+	files_search_tmp($1)
-+')
-+
-+########################################
-+## <summary>
-+##	Create, read, write, and delete user
- ##	temporary symbolic links.
- ## </summary>
- ## <param name="domain">
++interface(`userdom_manage_user_tmp_sockets',`
+ 	gen_require(`
+ 		type user_tmp_t;
+ 	')
 @@ -2391,7 +2657,7 @@
  
  ########################################
@@ -35355,9 +34974,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	dontaudit $1 admin_home_t:file getattr;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-17 14:26:49.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35446,9 +35065,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-17 14:26:49.000000000 -0500
 @@ -180,6 +180,25 @@
  
  ########################################
@@ -35475,9 +35094,9 @@ diff -b -B --ignore-all-space --exclude-
  ##	Connect to xend over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-17 14:26:49.000000000 -0500
 @@ -85,6 +85,7 @@
  type xenconsoled_t;
  type xenconsoled_exec_t;
@@ -35516,9 +35135,9 @@ diff -b -B --ignore-all-space --exclude-
  	#Should have a boolean wrapping these
  	fs_list_auto_mountpoints(xend_t)
  	files_search_mnt(xend_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-17 14:26:49.000000000 -0500
 @@ -199,12 +199,14 @@
  #
  define(`getattr_file_perms',`{ getattr }')
@@ -35561,9 +35180,9 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_dbus_perms', `{ acquire_svc send_msg } ')
 +define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ')
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/users	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/users	2009-12-17 14:26:49.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #



From kalev at fedoraproject.org  Thu Dec 17 19:34:50 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 17 Dec 2009 19:34:50 +0000 (UTC)
Subject: rpms/mingw32-gcc/devel mingw32-gcc.spec,1.10,1.11
Message-ID: <20091217193450.C766111C0092@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7679

Modified Files:
	mingw32-gcc.spec 
Log Message:
Enable libgomp support.



Index: mingw32-gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/mingw32-gcc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-gcc.spec	22 Nov 2009 22:13:04 -0000	1.10
+++ mingw32-gcc.spec	17 Dec 2009 19:34:50 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name:           mingw32-gcc
 Version:        4.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows cross-compiler (GCC) for C
 
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@@ -47,6 +47,7 @@ BuildRequires:  mingw32-filesystem >= 49
 BuildRequires:  mingw32-binutils >= 2.19.51.0.14
 BuildRequires:  mingw32-runtime
 BuildRequires:  mingw32-w32api
+BuildRequires:  mingw32-pthreads
 BuildRequires:  gmp-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  libgomp
@@ -59,10 +60,14 @@ Requires:       mingw32-binutils >= 2.19
 Requires:       mingw32-runtime
 Requires:       mingw32-w32api
 Requires:       mingw32-cpp
+# libgomp dll is linked with pthreads, but since we don't run the
+# automatic dependency scripts, it doesn't get picked up automatically.
+Requires:       mingw32-pthreads
 
 # We don't run the automatic dependency scripts which would
 # normally detect and provide the following DLL:
 Provides:       mingw32(libgcc_s_sjlj-1.dll)
+Provides:       mingw32(libgomp-1.dll)
 
 
 %description
@@ -163,6 +168,7 @@ CC="%{__cc} ${RPM_OPT_FLAGS}" \
   --with-gnu-as --with-gnu-ld --verbose \
   --without-newlib \
   --disable-multilib \
+  --enable-libgomp \
   --with-system-zlib \
   --disable-nls --without-included-gettext \
   --disable-win32-registry \
@@ -196,6 +202,9 @@ ln -sf ..%{_prefix}/bin/i686-pc-mingw32-
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/libgcc_s_sjlj-1.dll \
   $RPM_BUILD_ROOT%{_mingw32_bindir}
+# Same goes for this DLL under _libdir.
+mv $RPM_BUILD_ROOT%{_libdir}/gcc/i686-pc-mingw32/bin/libgomp-1.dll \
+  $RPM_BUILD_ROOT%{_mingw32_bindir}
 
 # Don't want the *.la files.
 find $RPM_BUILD_ROOT -name '*.la' -delete
@@ -223,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgcc_eh.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgcc_s.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgcov.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgomp.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgomp.dll.a
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgomp.spec
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp_nonshared.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libssp.dll.a
@@ -240,6 +252,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/install-tools
 %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/install-tools/*
 %{_mingw32_bindir}/libgcc_s_sjlj-1.dll
+%{_mingw32_bindir}/libgomp-1.dll
 %{_mandir}/man1/i686-pc-mingw32-gcc.1*
 %{_mandir}/man1/i686-pc-mingw32-gcov.1*
 
@@ -284,10 +297,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/i686-pc-mingw32-gfortran.1*
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgfortran.a
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgfortranbegin.a
+%dir %{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude/omp_lib.f90
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude/omp_lib.h
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude/omp_lib.mod
+%{_libdir}/gcc/i686-pc-mingw32/%{version}/finclude/omp_lib_kinds.mod
 %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/f951
 
 
 %changelog
+* Thu Dec 17 2009 Chris Bagwell <chris at cnpbagwell.com> - 4.4.2-2
+- Enable libgomp support.
+
 * Sun Nov 22 2009 Kalev Lember <kalev at smartlink.ee> - 4.4.2-1
 - Update to gcc 4.4.2 20091114 svn 154179, which includes
   VTA backport from 4.5 branch.



From pkgdb at fedoraproject.org  Thu Dec 17 19:35:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 19:35:35 +0000
Subject: [pkgdb] unicap had acl change status
Message-ID: <20091217193538.5744A28ED67@bastion3.fedora.phx2.redhat.com>

robert has set the commit acl on unicap (Fedora devel) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 19:35:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 19:35:42 +0000
Subject: [pkgdb] unicap had acl change status
Message-ID: <20091217193543.4952B28ED67@bastion3.fedora.phx2.redhat.com>

robert has set the commit acl on unicap (Fedora EPEL 4) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 19:35:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 19:35:44 +0000
Subject: [pkgdb] unicap had acl change status
Message-ID: <20091217193546.A4C8028ED67@bastion3.fedora.phx2.redhat.com>

robert has set the commit acl on unicap (Fedora EPEL 5) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 19:35:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 19:35:53 +0000
Subject: [pkgdb] unicap had acl change status
Message-ID: <20091217193555.B550A28ED6F@bastion3.fedora.phx2.redhat.com>

robert has set the commit acl on unicap (Fedora 12) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From pkgdb at fedoraproject.org  Thu Dec 17 19:35:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 19:35:53 +0000
Subject: [pkgdb] unicap had acl change status
Message-ID: <20091217193556.6EFA828ED73@bastion3.fedora.phx2.redhat.com>

robert has set the commit acl on unicap (Fedora 11) to Approved for kdudka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/unicap



From dwalsh at fedoraproject.org  Thu Dec 17 19:36:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Dec 2009 19:36:23 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.943,1.944
Message-ID: <20091217193623.0A3AC11C0092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8057

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-4
- Rename udisks-daemon back to devicekit_disk_t policy



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.943
retrieving revision 1.944
diff -u -p -r1.943 -r1.944
--- selinux-policy.spec	16 Dec 2009 23:01:00 -0000	1.943
+++ selinux-policy.spec	17 Dec 2009 19:36:22 -0000	1.944
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.7.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-4
+- Rename udisks-daemon back to devicekit_disk_t policy
+
 * Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-3
 - Fixes for abrt calls
 



From tgl at fedoraproject.org  Thu Dec 17 19:38:27 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 17 Dec 2009 19:38:27 +0000 (UTC)
Subject: rpms/mysql/devel mysql.init,1.26,1.27 mysql.spec,1.134,1.135
Message-ID: <20091217193827.39D9C11C0092@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8476

Modified Files:
	mysql.init mysql.spec 
Log Message:
Stop waiting during "service mysqld start" if mysqld_safe exits


Index: mysql.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.init,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mysql.init	10 Nov 2009 20:04:18 -0000	1.26
+++ mysql.init	17 Dec 2009 19:38:26 -0000	1.27
@@ -72,29 +72,34 @@ start(){
 	/usr/bin/mysqld_safe   --datadir="$datadir" --socket="$socketfile" \
 		--pid-file="$mypidfile" \
 		--user=mysql >/dev/null 2>&1 &
-	ret=$?
-	# Spin for a maximum of N seconds waiting for the server to come up.
+	safe_pid=$!
+	# Spin for a maximum of N seconds waiting for the server to come up;
+	# exit the loop immediately if mysqld_safe process disappears.
 	# Rather than assuming we know a valid username, accept an "access
 	# denied" response as meaning the server is functioning.
+	ret=0
+	STARTTIMEOUT=120
+	while [ $STARTTIMEOUT -gt 0 ]; do
+	    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
+	    echo "$RESPONSE" | grep -q "Access denied for user" && break
+	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
+		echo "MySQL Daemon failed to start."
+		ret=1
+		break
+	    fi
+	    sleep 1
+	    let STARTTIMEOUT=${STARTTIMEOUT}-1
+	done
+	if [ $STARTTIMEOUT -eq 0 ]; then
+	    echo "Timeout error occurred trying to start MySQL Daemon."
+	    ret=1
+	fi
 	if [ $ret -eq 0 ]; then
-	    STARTTIMEOUT=60
-	    while [ $STARTTIMEOUT -gt 0 ]; do
-		RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
-		echo "$RESPONSE" | grep -q "Access denied for user" && break
-		sleep 1
-		let STARTTIMEOUT=${STARTTIMEOUT}-1
-	    done
-	    if [ $STARTTIMEOUT -eq 0 ]; then
-                    echo "Timeout error occurred trying to start MySQL Daemon."
-                    action $"Starting $prog: " /bin/false
-                    ret=1
-            else
-                    action $"Starting $prog: " /bin/true
-            fi
+	    action $"Starting $prog: " /bin/true
+	    touch /var/lock/subsys/mysqld
 	else
-    	    action $"Starting $prog: " /bin/false
+	    action $"Starting $prog: " /bin/false
 	fi
-	[ $ret -eq 0 ] && touch /var/lock/subsys/mysqld
 	return $ret
 }
 


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- mysql.spec	24 Nov 2009 05:04:04 -0000	1.134
+++ mysql.spec	17 Dec 2009 19:38:27 -0000	1.135
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.41
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -649,9 +649,15 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Dec 17 2009 Tom Lane <tgl at redhat.com> 5.1.41-2
+- Stop waiting during "service mysqld start" if mysqld_safe exits
+Resolves: #544095
+
 * Mon Nov 23 2009 Tom Lane <tgl at redhat.com> 5.1.41-1
 - Update to MySQL 5.1.41, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html
+  including fixes for CVE-2009-4019
+Related: #540906
 - Don't set old_passwords=1; we aren't being bug-compatible with 3.23 anymore
 Resolves: #540735
 



From dwalsh at fedoraproject.org  Thu Dec 17 19:38:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 17 Dec 2009 19:38:47 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils.spec,1.660,1.661
Message-ID: <20091217193847.9F31B11C0092@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8591

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-6
- Add setools-libs-python to requires for gui



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.660
retrieving revision 1.661
diff -u -p -r1.660 -r1.661
--- policycoreutils.spec	17 Dec 2009 16:18:13 -0000	1.660
+++ policycoreutils.spec	17 Dec 2009 19:38:47 -0000	1.661
@@ -1,6 +1,6 @@
 %define	libauditver	1.4.2-1
 %define	libsepolver	2.0.38-1
-%define	libsemanagever	2.0.39-2
+%define	libsemanagever	2.0.39-1
 %define	libselinuxver	2.0.87-1
 %define	sepolgenver	1.0.19
 



From lucilanga at fedoraproject.org  Thu Dec 17 19:39:04 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Thu, 17 Dec 2009 19:39:04 +0000 (UTC)
Subject: rpms/perl-PDF-Create/F-11 LICENSE, NONE, 1.1 perl-PDF-Create.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091217193904.8F64211C0092@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/perl-PDF-Create/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8817

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE perl-PDF-Create.spec 
Log Message:
initial import


--- NEW FILE LICENSE ---
The main package does not specify a license.
However author states this:

"I had a look and have decided to use the perl license. The next
release will have
this set in the META.yml file."

Markus Baertschi


--- NEW FILE perl-PDF-Create.spec ---
Name:           perl-PDF-Create
Version:        1.04
Release:        2%{?dist}
Summary:        Create PDF files
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PDF-Create/
Source0:        http://www.cpan.org/authors/id/M/MA/MARKUSB/PDF-Create-%{version}.tar.gz
Source1:        LICENSE
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
This module allows you to create PDF documents using a large number of
primitives, and emit the result as a PDF file or stream. PDF stands for
Portable Document Format.

Documents can have several pages, a table of content, an information section
and many other PDF elements. More functionalities will be added as needs arise.

Documents are constructed on the fly so the memory footprint is not tied to the
size of the pages but only to their number.

%prep
%setup -q -n PDF-Create-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
chmod -x pdf-logo.gif pdf-logo.jpg
cp -p %{SOURCE1} %{_builddir}/PDF-Create-%{version}/

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE pdf-logo.gif pdf-logo.jpg README TODO
%{perl_vendorlib}/PDF
%{_mandir}/man3/*.3*

%changelog
* Thu Dec 17 2009 Lucian Langa <cooly at gnome.eu.org> - 1.04-2
- add license clarification

* Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 1.04-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-Create/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Dec 2009 17:46:38 -0000	1.1
+++ .cvsignore	17 Dec 2009 19:39:04 -0000	1.2
@@ -0,0 +1 @@
+PDF-Create-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDF-Create/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Dec 2009 17:46:38 -0000	1.1
+++ sources	17 Dec 2009 19:39:04 -0000	1.2
@@ -0,0 +1 @@
+786a508cfb10a6e2cd6344fa70f99692  PDF-Create-1.04.tar.gz



From mclasen at fedoraproject.org  Thu Dec 17 19:50:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 17 Dec 2009 19:50:54 +0000 (UTC)
Subject: rpms/notification-daemon-engine-slider/devel crash.patch, NONE,
	1.1 notification-daemon-engine-slider.spec, 1.3, 1.4
Message-ID: <20091217195054.4217211C0380@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10938

Modified Files:
	notification-daemon-engine-slider.spec 
Added Files:
	crash.patch 
Log Message:
Fix a sporadic crash.


crash.patch:
 theme.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE crash.patch ---
diff -up notification-daemon-engine-slider-0.2.0/src/theme.c.crash notification-daemon-engine-slider-0.2.0/src/theme.c
--- notification-daemon-engine-slider-0.2.0/src/theme.c.crash	2009-12-17 13:44:21.348123579 -0500
+++ notification-daemon-engine-slider-0.2.0/src/theme.c	2009-12-17 13:48:52.487096848 -0500
@@ -186,6 +186,11 @@ update_shape (WindowData *windata)
         GdkBitmap *mask;
         cairo_t   *cr;
 
+        if (windata->width == 0 || windata->height == 0) {
+                windata->width = MAX (windata->win->allocation.width, 1);
+                windata->height = MAX (windata->win->allocation.height, 1);
+        }
+
         if (windata->composited) {
                 gtk_widget_shape_combine_mask (windata->win, NULL, 0, 0);
                 return;
@@ -228,9 +233,9 @@ paint_window (GtkWidget     *widget,
         cairo_surface_t *surface;
         cairo_t         *cr;
 
-        if (windata->width == 0) {
-                windata->width = windata->win->allocation.width;
-                windata->height = windata->win->allocation.height;
+        if (windata->width == 0 || windata->height == 0) {
+                windata->width = MAX (windata->win->allocation.width, 1);
+                windata->height = MAX (windata->win->allocation.height, 1);
         }
 
         context = gdk_cairo_create (widget->window);


Index: notification-daemon-engine-slider.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/devel/notification-daemon-engine-slider.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- notification-daemon-engine-slider.spec	28 Sep 2009 20:00:54 -0000	1.3
+++ notification-daemon-engine-slider.spec	17 Dec 2009 19:50:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           notification-daemon-engine-slider
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Slider theme engine for the notification daemon
 
 Group:          System Environment/Libraries
@@ -12,12 +12,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  gtk2-devel >= 2.17.1
 Requires:       notification-daemon
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=548504
+Patch0:		crash.patch
+
 %description
 The Slider theme engine for the notification daemon.
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .crash
 
 %build
 %configure
@@ -42,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/notification-daemon-1.0/engines/libslider.so
 
 %changelog
+* Thu Dec 17 2009 Matthias Clasen <mclasen at redhat.com> - 0.2.0-2
+- Fix a sporadic crash (#548504)
+
 * Mon Sep 28 2009 Jon McCann <jmccann at redhat.com> - 0.2.0-1
 - Update to 0.2.0
 



From tgl at fedoraproject.org  Thu Dec 17 19:57:13 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 17 Dec 2009 19:57:13 +0000 (UTC)
Subject: rpms/mysql/F-12 .cvsignore, 1.43, 1.44 mysql-plugin-bug.patch, 1.13,
	1.14 mysql.init, 1.26, 1.27 mysql.spec, 1.133, 1.134 sources,
	1.43, 1.44
Message-ID: <20091217195713.E8FE211C0092@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12260

Modified Files:
	.cvsignore mysql-plugin-bug.patch mysql.init mysql.spec 
	sources 
Log Message:
Update to MySQL 5.1.41


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	10 Nov 2009 22:30:30 -0000	1.43
+++ .cvsignore	17 Dec 2009 19:57:13 -0000	1.44
@@ -1 +1 @@
-mysql-5.1.40.tar.gz
+mysql-5.1.41.tar.gz

mysql-plugin-bug.patch:
 disabled.def |    3 +++
 1 file changed, 3 insertions(+)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/mysql-plugin-bug.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mysql-plugin-bug.patch	10 Nov 2009 22:30:31 -0000	1.13
+++ mysql-plugin-bug.patch	17 Dec 2009 19:57:13 -0000	1.14
@@ -11,13 +11,13 @@ platform-dependent results, with the "ex
 wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
 
 
-diff -Naur mysql-5.1.40.orig/mysql-test/t/disabled.def mysql-5.1.40/mysql-test/t/disabled.def
---- mysql-5.1.40.orig/mysql-test/t/disabled.def	2009-10-06 14:21:05.000000000 -0400
-+++ mysql-5.1.40/mysql-test/t/disabled.def	2009-11-10 13:01:50.000000000 -0500
-@@ -14,3 +14,6 @@
- query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
- partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+diff -Naur mysql-5.1.41.orig/mysql-test/t/disabled.def mysql-5.1.41/mysql-test/t/disabled.def
+--- mysql-5.1.41.orig/mysql-test/t/disabled.def	2009-11-04 14:00:39.000000000 -0500
++++ mysql-5.1.41/mysql-test/t/disabled.def	2009-11-23 22:04:14.000000000 -0500
+@@ -15,3 +15,6 @@
  partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+ innodb-autoinc           : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with results difference
+ rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2
 +#
 +plugin_load         : gives wrong answer on PPC64
 +outfile_loaddata    : gives different results on different platforms


Index: mysql.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/mysql.init,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mysql.init	10 Nov 2009 22:30:31 -0000	1.26
+++ mysql.init	17 Dec 2009 19:57:13 -0000	1.27
@@ -72,29 +72,34 @@ start(){
 	/usr/bin/mysqld_safe   --datadir="$datadir" --socket="$socketfile" \
 		--pid-file="$mypidfile" \
 		--user=mysql >/dev/null 2>&1 &
-	ret=$?
-	# Spin for a maximum of N seconds waiting for the server to come up.
+	safe_pid=$!
+	# Spin for a maximum of N seconds waiting for the server to come up;
+	# exit the loop immediately if mysqld_safe process disappears.
 	# Rather than assuming we know a valid username, accept an "access
 	# denied" response as meaning the server is functioning.
+	ret=0
+	STARTTIMEOUT=120
+	while [ $STARTTIMEOUT -gt 0 ]; do
+	    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
+	    echo "$RESPONSE" | grep -q "Access denied for user" && break
+	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
+		echo "MySQL Daemon failed to start."
+		ret=1
+		break
+	    fi
+	    sleep 1
+	    let STARTTIMEOUT=${STARTTIMEOUT}-1
+	done
+	if [ $STARTTIMEOUT -eq 0 ]; then
+	    echo "Timeout error occurred trying to start MySQL Daemon."
+	    ret=1
+	fi
 	if [ $ret -eq 0 ]; then
-	    STARTTIMEOUT=60
-	    while [ $STARTTIMEOUT -gt 0 ]; do
-		RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
-		echo "$RESPONSE" | grep -q "Access denied for user" && break
-		sleep 1
-		let STARTTIMEOUT=${STARTTIMEOUT}-1
-	    done
-	    if [ $STARTTIMEOUT -eq 0 ]; then
-                    echo "Timeout error occurred trying to start MySQL Daemon."
-                    action $"Starting $prog: " /bin/false
-                    ret=1
-            else
-                    action $"Starting $prog: " /bin/true
-            fi
+	    action $"Starting $prog: " /bin/true
+	    touch /var/lock/subsys/mysqld
 	else
-    	    action $"Starting $prog: " /bin/false
+	    action $"Starting $prog: " /bin/false
 	fi
-	[ $ret -eq 0 ] && touch /var/lock/subsys/mysqld
 	return $ret
 }
 


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/mysql.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- mysql.spec	10 Nov 2009 22:30:31 -0000	1.133
+++ mysql.spec	17 Dec 2009 19:57:13 -0000	1.134
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.1.40
-Release: 1%{?dist}
+Version: 5.1.41
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -649,6 +649,14 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Dec 17 2009 Tom Lane <tgl at redhat.com> 5.1.41-2
+- Update to MySQL 5.1.41, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html
+  including fixes for CVE-2009-4019
+Related: #540906
+- Stop waiting during "service mysqld start" if mysqld_safe exits
+Resolves: #544095
+
 * Tue Nov 10 2009 Tom Lane <tgl at redhat.com> 5.1.40-1
 - Update to MySQL 5.1.40, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	10 Nov 2009 22:30:31 -0000	1.43
+++ sources	17 Dec 2009 19:57:13 -0000	1.44
@@ -1 +1 @@
-32e7373c16271606007374396e6742ad  mysql-5.1.40.tar.gz
+b5d39e8789174753f3c782959729e68c  mysql-5.1.41.tar.gz



From tgl at fedoraproject.org  Thu Dec 17 20:01:48 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 17 Dec 2009 20:01:48 +0000 (UTC)
Subject: rpms/mysql/F-11 .cvsignore, 1.43, 1.44 mysql-plugin-bug.patch, 1.11,
	1.12 mysql.init, 1.26, 1.27 mysql.spec, 1.124, 1.125 sources,
	1.43, 1.44
Message-ID: <20091217200148.5B01E11C0092@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13056

Modified Files:
	.cvsignore mysql-plugin-bug.patch mysql.init mysql.spec 
	sources 
Log Message:
Update to MySQL 5.1.41


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	11 Nov 2009 01:01:04 -0000	1.43
+++ .cvsignore	17 Dec 2009 20:01:47 -0000	1.44
@@ -1 +1 @@
-mysql-5.1.40.tar.gz
+mysql-5.1.41.tar.gz

mysql-plugin-bug.patch:
 disabled.def |    3 +++
 1 file changed, 3 insertions(+)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql-plugin-bug.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mysql-plugin-bug.patch	11 Nov 2009 01:01:05 -0000	1.11
+++ mysql-plugin-bug.patch	17 Dec 2009 20:01:47 -0000	1.12
@@ -11,13 +11,13 @@ platform-dependent results, with the "ex
 wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
 
 
-diff -Naur mysql-5.1.40.orig/mysql-test/t/disabled.def mysql-5.1.40/mysql-test/t/disabled.def
---- mysql-5.1.40.orig/mysql-test/t/disabled.def	2009-10-06 14:21:05.000000000 -0400
-+++ mysql-5.1.40/mysql-test/t/disabled.def	2009-11-10 13:01:50.000000000 -0500
-@@ -14,3 +14,6 @@
- query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
- partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+diff -Naur mysql-5.1.41.orig/mysql-test/t/disabled.def mysql-5.1.41/mysql-test/t/disabled.def
+--- mysql-5.1.41.orig/mysql-test/t/disabled.def	2009-11-04 14:00:39.000000000 -0500
++++ mysql-5.1.41/mysql-test/t/disabled.def	2009-11-23 22:04:14.000000000 -0500
+@@ -15,3 +15,6 @@
  partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+ innodb-autoinc           : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with results difference
+ rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2
 +#
 +plugin_load         : gives wrong answer on PPC64
 +outfile_loaddata    : gives different results on different platforms


Index: mysql.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql.init,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mysql.init	11 Nov 2009 01:01:05 -0000	1.26
+++ mysql.init	17 Dec 2009 20:01:47 -0000	1.27
@@ -72,29 +72,34 @@ start(){
 	/usr/bin/mysqld_safe   --datadir="$datadir" --socket="$socketfile" \
 		--pid-file="$mypidfile" \
 		--user=mysql >/dev/null 2>&1 &
-	ret=$?
-	# Spin for a maximum of N seconds waiting for the server to come up.
+	safe_pid=$!
+	# Spin for a maximum of N seconds waiting for the server to come up;
+	# exit the loop immediately if mysqld_safe process disappears.
 	# Rather than assuming we know a valid username, accept an "access
 	# denied" response as meaning the server is functioning.
+	ret=0
+	STARTTIMEOUT=120
+	while [ $STARTTIMEOUT -gt 0 ]; do
+	    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
+	    echo "$RESPONSE" | grep -q "Access denied for user" && break
+	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
+		echo "MySQL Daemon failed to start."
+		ret=1
+		break
+	    fi
+	    sleep 1
+	    let STARTTIMEOUT=${STARTTIMEOUT}-1
+	done
+	if [ $STARTTIMEOUT -eq 0 ]; then
+	    echo "Timeout error occurred trying to start MySQL Daemon."
+	    ret=1
+	fi
 	if [ $ret -eq 0 ]; then
-	    STARTTIMEOUT=60
-	    while [ $STARTTIMEOUT -gt 0 ]; do
-		RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
-		echo "$RESPONSE" | grep -q "Access denied for user" && break
-		sleep 1
-		let STARTTIMEOUT=${STARTTIMEOUT}-1
-	    done
-	    if [ $STARTTIMEOUT -eq 0 ]; then
-                    echo "Timeout error occurred trying to start MySQL Daemon."
-                    action $"Starting $prog: " /bin/false
-                    ret=1
-            else
-                    action $"Starting $prog: " /bin/true
-            fi
+	    action $"Starting $prog: " /bin/true
+	    touch /var/lock/subsys/mysqld
 	else
-    	    action $"Starting $prog: " /bin/false
+	    action $"Starting $prog: " /bin/false
 	fi
-	[ $ret -eq 0 ] && touch /var/lock/subsys/mysqld
 	return $ret
 }
 


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- mysql.spec	11 Nov 2009 01:01:05 -0000	1.124
+++ mysql.spec	17 Dec 2009 20:01:48 -0000	1.125
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.1.40
-Release: 1%{?dist}
+Version: 5.1.41
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -649,6 +649,14 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Dec 17 2009 Tom Lane <tgl at redhat.com> 5.1.41-2
+- Update to MySQL 5.1.41, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html
+  including fixes for CVE-2009-4019
+Related: #540906
+- Stop waiting during "service mysqld start" if mysqld_safe exits
+Resolves: #544095
+
 * Tue Nov 10 2009 Tom Lane <tgl at redhat.com> 5.1.40-1
 - Update to MySQL 5.1.40, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	11 Nov 2009 01:01:05 -0000	1.43
+++ sources	17 Dec 2009 20:01:48 -0000	1.44
@@ -1 +1 @@
-32e7373c16271606007374396e6742ad  mysql-5.1.40.tar.gz
+b5d39e8789174753f3c782959729e68c  mysql-5.1.41.tar.gz



From jakub at fedoraproject.org  Thu Dec 17 20:05:20 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 17 Dec 2009 20:05:20 +0000 (UTC)
Subject: File gcc-4.4.2-20091217.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091217200520.0DFB028ED6D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gcc:

1bac2d18babfc08d9c27d488ffd75cc4  gcc-4.4.2-20091217.tar.bz2



From deji at fedoraproject.org  Thu Dec 17 20:07:15 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 17 Dec 2009 20:07:15 +0000 (UTC)
Subject: rpms/mpich2/devel mpich2.spec,1.17,1.18
Message-ID: <20091217200715.52ACD11C0092@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14142

Modified Files:
	mpich2.spec 
Log Message:
* Wed Dec 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.2.1-4
- add the m_option macro to replace hardcoding -m{__isa_bits}
  and define it correctly for s390, where __isa_bits is 32, but
  the option to pass to gcc et all is -m31.



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mpich2.spec	10 Dec 2009 17:37:48 -0000	1.17
+++ mpich2.spec	17 Dec 2009 20:07:15 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -70,6 +70,12 @@ Contains documentations, examples and ma
 #%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags} -I%{_fmoddir}}
 %{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
 
+%ifarch s390
+%global m_option -m31
+%else
+%global m_option -m%{__isa_bits}
+%endif
+
 %ifarch %{ix86} x86_64
 %global selected_channels ch3:nemesis
 %else
@@ -105,20 +111,20 @@ Contains documentations, examples and ma
 	--with-java=%{_sysconfdir}/alternatives/java_sdk	\
 	F90=%{opt_fc}						\
 	F77=%{opt_f77}						\
-	CFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"			\
-	CXXFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"		\
-	F90FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"		\
-	FFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"			\
+	CFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	CXXFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	F90FLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	FFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
 	LDFLAGS='-Wl,-z,noexecstack'				\
 	MPICH2LIB_CFLAGS="%{?opt_cc_cflags}"			\
 	MPICH2LIB_CXXFLAGS="%{optflags}"			\
 	MPICH2LIB_F90FLAGS="%{?opt_fc_fflags}"			\
 	MPICH2LIB_FFLAGS="%{?opt_f77_fflags}"	
 #	MPICH2LIB_LDFLAGS='-Wl,-z,noexecstack'			\
-#	MPICH2_MPICC_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPICXX_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPIF90_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPIF77_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"
+#	MPICH2_MPICC_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPICXX_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPIF90_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPIF77_FLAGS="%{m_option} -O2 %{?XFLAGS}"
 
 #	F90FLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}"	\
 #make %{?_smp_mflags} doesn't work
@@ -160,8 +166,8 @@ chmod -x %{buildroot}%{_libdir}/pkgconfi
 
 # Install the module file
 mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
-cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
-sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
+sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 
 # Install the RPM macro
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -277,10 +283,9 @@ fi
 %{_libdir}/%{name}/bin/mpirun
 %{_libdir}/%{name}/bin/mpich2version
 %config %{_sysconfdir}/%{name}-%{_arch}/
-%config %{_sysconfdir}/rpm/macros.%{name}
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
-%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 %exclude %{_bindir}/mpif*
 %exclude %{_bindir}/mpic*
 %ghost %{_bindir}/mpiexec
@@ -309,6 +314,7 @@ fi
 %{_libdir}/%{name}/lib/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
 %{_datadir}/%{name}/examples*/Makefile-%{_arch}
+%config %{_sysconfdir}/rpm/macros.%{name}
 
 %files doc
 %defattr(-,root,root,-)
@@ -321,8 +327,15 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
-* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
+* Wed Dec 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.2.1-4
+- add the m_option macro to replace hardcoding -m{__isa_bits}
+  and define it correctly for s390, where __isa_bits is 32, but
+  the option to pass to gcc et all is -m31.
+
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-4
 - Remove the *.a libs that have the shared version
+- Place the rpm macro in the -devel subpackage
+- Move the module file around (again!) to /etc/modufiles/.
 
 * Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
 - More fixes the mpich2.module patch.



From jakub at fedoraproject.org  Thu Dec 17 20:07:54 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 17 Dec 2009 20:07:54 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-rh546017.patch, NONE, 1.1 .cvsignore, 1.316,
	1.317 gcc.spec, 1.99, 1.100 sources, 1.323,
	1.324 gcc44-pr41183.patch, 1.1, NONE
Message-ID: <20091217200754.7580411C0092@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14351

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-rh546017.patch 
Removed Files:
	gcc44-pr41183.patch 
Log Message:
4.4.2-18

gcc44-rh546017.patch:
 dwarf2out.c                             |   32 +++++++++++++++++++++-----------
 testsuite/g++.dg/debug/dwarf2/const1.C  |    8 ++++----
 testsuite/gcc.dg/debug/dwarf2/const-1.c |    8 ++++----
 3 files changed, 29 insertions(+), 19 deletions(-)

--- NEW FILE gcc44-rh546017.patch ---
2009-12-15  Jakub Jelinek  <jakub at redhat.com>

	* dwarf2out.c (loc_descriptor): For SYMBOL_REFs and LABEL_REFs
	use DW_OP_addr+DW_OP_stack_value instead of DW_OP_implicit_value.
	(add_const_value_attribute): For CONST_STRING, SYMBOL_REFs and
	LABEL_REFs use DW_OP_addr+DW_OP_stack_value DW_AT_location instead of
	DW_AT_const_value.

	* gcc.dg/debug/dwarf2/const-1.c: Don't expect DW_AT_const_value,
	but instead DW_AT_location with DW_OP_addr+DW_OP_stack_value.  Add
	-gno-strict-dwarf -fno-merge-debug-strings to dg-options.
	* g++.dg/debug/dwarf2/const1.C: Likewise.

--- gcc/dwarf2out.c.jj	2009-12-14 17:55:28.000000000 +0100
+++ gcc/dwarf2out.c	2009-12-14 22:33:32.000000000 +0100
@@ -13775,10 +13775,10 @@ loc_descriptor (rtx rtl, enum machine_mo
       if (mode != VOIDmode && GET_MODE_SIZE (mode) == DWARF2_ADDR_SIZE
 	  && (dwarf_version >= 4 || !dwarf_strict))
 	{
-	  loc_result = new_loc_descr (DW_OP_implicit_value,
-				      DWARF2_ADDR_SIZE, 0);
-	  loc_result->dw_loc_oprnd2.val_class = dw_val_class_addr;
-	  loc_result->dw_loc_oprnd2.v.val_addr = rtl;
+	  loc_result = new_loc_descr (DW_OP_addr, 0, 0);
+	  loc_result->dw_loc_oprnd1.val_class = dw_val_class_addr;
+	  loc_result->dw_loc_oprnd1.v.val_addr = rtl;
+	  add_loc_descr (&loc_result, new_loc_descr (DW_OP_stack_value, 0, 0));
 	  VEC_safe_push (rtx, gc, used_rtx_array, rtl);
 	}
       break;
@@ -15223,10 +15223,20 @@ add_const_value_attribute (dw_die_ref di
       return true;
 
     case CONST_STRING:
-      resolve_one_addr (&rtl, NULL);
-      add_AT_addr (die, DW_AT_const_value, rtl);
-      VEC_safe_push (rtx, gc, used_rtx_array, rtl);
-      return true;
+      if (dwarf_version >= 4 || !dwarf_strict)
+	{
+	  dw_loc_descr_ref loc_result;
+	  resolve_one_addr (&rtl, NULL);
+	rtl_addr:
+	  loc_result = new_loc_descr (DW_OP_addr, 0, 0);
+	  loc_result->dw_loc_oprnd1.val_class = dw_val_class_addr;
+	  loc_result->dw_loc_oprnd1.v.val_addr = rtl;
+	  add_loc_descr (&loc_result, new_loc_descr (DW_OP_stack_value, 0, 0));
+	  add_AT_loc (die, DW_AT_location, loc_result);
+	  VEC_safe_push (rtx, gc, used_rtx_array, rtl);
+	  return true;
+	}
+      return false;
 
     case CONST:
       if (CONSTANT_P (XEXP (rtl, 0)))
@@ -15236,9 +15246,9 @@ add_const_value_attribute (dw_die_ref di
       if (!const_ok_for_output (rtl))
 	return false;
     case LABEL_REF:
-      add_AT_addr (die, DW_AT_const_value, rtl);
-      VEC_safe_push (rtx, gc, used_rtx_array, rtl);
-      return true;
+      if (dwarf_version >= 4 || !dwarf_strict)
+	goto rtl_addr;
+      return false;
 
     case PLUS:
       /* In cases where an inlined instance of an inline function is passed
--- gcc/testsuite/gcc.dg/debug/dwarf2/const-1.c.jj	2009-09-30 12:19:16.000000000 +0200
+++ gcc/testsuite/gcc.dg/debug/dwarf2/const-1.c	2009-12-15 10:57:48.000000000 +0100
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
-/* { dg-options "-O -gdwarf-2 -dA" } */
+/* { dg-options "-O -gdwarf-2 -dA -gno-strict-dwarf -fno-merge-debug-strings" } */
 /* { dg-require-visibility "" } */
-/* { dg-final { scan-assembler "DW_AT_const_value" } } */
+/* { dg-final { scan-assembler "DW_AT_location\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*DW_OP_addr\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*fnx\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*DW_OP_stack_value" } } */
 
-extern void x() __attribute__((visibility("hidden")));
-static void (*f)() = x;
+extern void fnx() __attribute__((visibility("hidden")));
+static void (*f)() = fnx;
--- gcc/testsuite/g++.dg/debug/dwarf2/const1.C.jj	2009-09-30 12:19:16.000000000 +0200
+++ gcc/testsuite/g++.dg/debug/dwarf2/const1.C	2009-12-15 11:02:24.000000000 +0100
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
-/* { dg-options "-O -gdwarf-2 -dA" } */
+/* { dg-options "-O -gdwarf-2 -dA -gno-strict-dwarf -fno-merge-debug-strings" } */
 /* { dg-require-visibility "" } */
-/* { dg-final { scan-assembler "DW_AT_const_value" } } */
+/* { dg-final { scan-assembler "DW_AT_location\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*DW_OP_addr\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*fnx\[^\\r\\n\]*\[\\r\\n\]*\[^\\r\\n\]*DW_OP_stack_value" } } */
 
-extern void x () __attribute__((visibility ("hidden")));
-void (* const f) () = x;
+extern void fnx () __attribute__((visibility ("hidden")));
+void (* const f) () = fnx;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- .cvsignore	14 Dec 2009 20:54:26 -0000	1.316
+++ .cvsignore	17 Dec 2009 20:07:54 -0000	1.317
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091214.tar.bz2
+gcc-4.4.2-20091217.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gcc.spec	14 Dec 2009 20:54:26 -0000	1.99
+++ gcc.spec	17 Dec 2009 20:07:54 -0000	1.100
@@ -1,9 +1,9 @@
-%global DATE 20091214
-%global SVNREV 155239
+%global DATE 20091217
+%global SVNREV 155325
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 17
+%global gcc_release 18
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,7 +161,7 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
-Patch20: gcc44-pr41183.patch
+Patch20: gcc44-rh546017.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -467,7 +467,7 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
-%patch20 -p0 -b .pr41183~
+%patch20 -p0 -b .rh546017~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1853,6 +1853,17 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Dec 17 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-18
+- update from gcc-4_4-branch
+  - PRs c++/42387
+- another C++ virtual dtors fix (PR c++/42386)
+- VTA mode and COND_EXEC fixes (PR debug/41679)
+- fix ICE in chrec_convert_1 (#547775)
+- fix debuginfo for optimized out TLS vars
+- use DW_AT_location with DW_OP_addr + DW_OP_stack_value instead of
+  DW_AT_const_value with address in it, use DW_OP_addr + DW_OP_stack_value
+  instead of DW_OP_implicit_value with address (#546017)
+
 * Mon Dec 14 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-17
 - propagate TREE_NOTHROW/TREE_READONLY/DECL_PURE_P from ipa-pure-const and
   EH opt to all same body aliases (#547286)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- sources	14 Dec 2009 20:54:26 -0000	1.323
+++ sources	17 Dec 2009 20:07:54 -0000	1.324
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-d7c6ca8b8bb6d3748d413614aba9dce2  gcc-4.4.2-20091214.tar.bz2
+1bac2d18babfc08d9c27d488ffd75cc4  gcc-4.4.2-20091217.tar.bz2


--- gcc44-pr41183.patch DELETED ---



From cdamian at fedoraproject.org  Thu Dec 17 20:15:35 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu, 17 Dec 2009 20:15:35 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/devel php-phpunit-File-Iterator.spec,
	1.1, 1.2
Message-ID: <20091217201535.4641E11C0092@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15908

Modified Files:
	php-phpunit-File-Iterator.spec 
Log Message:
upstream 1.1.1


Index: php-phpunit-File-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel/php-phpunit-File-Iterator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-File-Iterator.spec	3 Dec 2009 07:24:20 -0000	1.1
+++ php-phpunit-File-Iterator.spec	17 Dec 2009 20:15:35 -0000	1.2
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-File-Iterator
-Version:        1.1.0
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        FilterIterator implementation that filters files based on a list of suffixes
 
 Group:          Development/Libraries
@@ -75,6 +75,9 @@ fi
 %{pear_phpdir}/File
 
 %changelog
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-1
+- upstream 1.1.1
+
 * Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4
 - own pear directories
 



From jortel at fedoraproject.org  Thu Dec 17 20:20:57 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu, 17 Dec 2009 20:20:57 +0000 (UTC)
Subject: File python-suds-0.3.8.tar.gz uploaded to lookaside cache by jortel
Message-ID: <20091217202057.9880128ED49@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-suds:

74122f391f73e91dfee5b5435aa51a38  python-suds-0.3.8.tar.gz



From deji at fedoraproject.org  Thu Dec 17 20:21:21 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 17 Dec 2009 20:21:21 +0000 (UTC)
Subject: File tokyocabinet-1.4.41.tar.gz uploaded to lookaside cache by deji
Message-ID: <20091217202121.729F028ED49@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for tokyocabinet:

f5cbcb55286df6bbdedd165f33fdfb5d  tokyocabinet-1.4.41.tar.gz



From deji at fedoraproject.org  Thu Dec 17 20:21:50 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 17 Dec 2009 20:21:50 +0000 (UTC)
Subject: rpms/tokyocabinet/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 tokyocabinet-fedora.patch, 1.7, 1.8 tokyocabinet.spec, 1.16, 1.17
Message-ID: <20091217202150.701B111C02CA@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17501

Modified Files:
	.cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec 
Log Message:
* Thu Dec 17 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.41-1
- Update to 1.4.41



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	30 Sep 2009 16:17:55 -0000	1.14
+++ .cvsignore	17 Dec 2009 20:21:49 -0000	1.15
@@ -1 +1 @@
-tokyocabinet-1.4.33.tar.gz
+tokyocabinet-1.4.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	30 Sep 2009 16:17:55 -0000	1.14
+++ sources	17 Dec 2009 20:21:50 -0000	1.15
@@ -1 +1 @@
-d81c3b04921d189f843c64d56b81a8d4  tokyocabinet-1.4.33.tar.gz
+f5cbcb55286df6bbdedd165f33fdfb5d  tokyocabinet-1.4.41.tar.gz

tokyocabinet-fedora.patch:
 Makefile.in        |    4 ++--
 configure.in       |   17 +++--------------
 tokyocabinet.pc.in |    2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet-fedora.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tokyocabinet-fedora.patch	30 Sep 2009 16:17:55 -0000	1.7
+++ tokyocabinet-fedora.patch	17 Dec 2009 20:21:50 -0000	1.8
@@ -1,5 +1,5 @@
---- configure.in	2009-08-31 05:36:58.000000000 -0400
-+++ configure.in.new	2009-09-30 12:02:41.608745987 -0400
+--- configure.in	2009-12-06 21:43:11.000000000 -0500
++++ configure.in.new	2009-12-17 15:13:58.794592478 -0500
 @@ -31,26 +31,15 @@
  MYPCFILES="tokyocabinet.pc"
  
@@ -30,8 +30,8 @@
  #================================================================
  # Options
  #================================================================
---- Makefile.in	2009-08-04 03:37:52.000000000 -0400
-+++ Makefile.in.new	2009-09-30 12:11:36.134746916 -0400
+--- Makefile.in	2009-10-13 08:33:20.000000000 -0400
++++ Makefile.in.new	2009-12-17 15:15:07.257604314 -0500
 @@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
@@ -44,7 +44,7 @@
  
  
 --- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
-+++ tokyocabinet.pc.in.new	2009-09-30 12:12:02.046746604 -0400
++++ tokyocabinet.pc.in.new	2009-12-17 15:15:29.626591709 -0500
 @@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- tokyocabinet.spec	30 Sep 2009 16:17:55 -0000	1.16
+++ tokyocabinet.spec	17 Dec 2009 20:21:50 -0000	1.17
@@ -1,6 +1,6 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.4.33
+Version:	1.4.41
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %doc doc/*
 
 %changelog
+* Thu Dec 17 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.41-1
+- Update to 1.4.41
+
 * Wed Sep 30 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.33-1
 - Update to 1.4.33
 



From jortel at fedoraproject.org  Thu Dec 17 20:23:05 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu, 17 Dec 2009 20:23:05 +0000 (UTC)
Subject: rpms/python-suds/devel .cvsignore, 1.8, 1.9 python-suds.spec, 1.13, 
	1.14 sources, 1.11, 1.12
Message-ID: <20091217202305.BB86111C0092@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17997

Modified Files:
	.cvsignore python-suds.spec sources 
Log Message:
release suds version 0.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Oct 2009 16:28:03 -0000	1.8
+++ .cvsignore	17 Dec 2009 20:23:05 -0000	1.9
@@ -5,3 +5,4 @@ python-suds-0.3.4.tar.gz
 python-suds-0.3.5.tar.gz
 python-suds-0.3.6.tar.gz
 python-suds-0.3.7.tar.gz
+python-suds-0.3.8.tar.gz


Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/python-suds.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-suds.spec	19 Oct 2009 16:28:03 -0000	1.13
+++ python-suds.spec	17 Dec 2009 20:23:05 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.7
+Version: 0.3.8
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -55,6 +55,21 @@ rm -rf $RPM_BUILD_ROOT
 %doc README LICENSE
 
 %changelog
+* Wed Dec 9 2009 jortel <jortel at redhat.com> - 0.3.8-1
+- Includeds Windows NTLM Transport.
+- Add missing self.messages in Client.clone().
+- Changed default behavior for WSDL PartElement to be optional.
+- Add support for services/ports defined without <address/> element in WSDL.
+- Fix sax.attribute.Element.attrib() to find by name only when ns is not specified; renamed to Element.getAttribute().
+- Update HttpTransport to pass timeout parameter to urllib2 open() methods when supported by urllib2.
+- Add null class to pass explicit NULL values for parameters and optional elements.
+- Soap encoded array (soap-enc:Array) enhancement for rpc/encoded.
+  Arrays passed as python arrays - works like document/literal now.
+  No more using the factory to create the Array.
+  Automatically includes arrayType attribute.  Eg: soap-enc:arrayType="Array[2]".
+  Reintroduced ability to pass complex (objects) using python dict instead of suds object via factory.
+- Fixed tickets: #84, #261, #262, #263, #265, #266, #278, #280, #282.
+
 * Thu Oct 16 2009 jortel <jortel at redhat.com> - 0.3.7-1
 - Better soap header support
 - Added new transport HttpAuthenticated for active (not passive) basic authentication.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	19 Oct 2009 16:28:03 -0000	1.11
+++ sources	17 Dec 2009 20:23:05 -0000	1.12
@@ -5,3 +5,4 @@ a4544f1eaaeb3ca0e78180160909ab01  python
 2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz
 320b2f8816aca6445b31441eb201e95b  python-suds-0.3.6.tar.gz
 687a1287e5e86da42d1b161f29d58886  python-suds-0.3.7.tar.gz
+74122f391f73e91dfee5b5435aa51a38  python-suds-0.3.8.tar.gz



From deji at fedoraproject.org  Thu Dec 17 20:26:15 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 17 Dec 2009 20:26:15 +0000 (UTC)
Subject: rpms/mpich2/devel mpich2.spec,1.18,1.19
Message-ID: <20091217202615.758FD11C0092@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18644

Modified Files:
	mpich2.spec 
Log Message:
Fix an oversight with the last commit



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mpich2.spec	17 Dec 2009 20:07:15 -0000	1.18
+++ mpich2.spec	17 Dec 2009 20:26:15 -0000	1.19
@@ -165,7 +165,7 @@ chmod -x %{buildroot}%{_libdir}/pkgconfi
 #mv  %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
 
 # Install the module file
-mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
+mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
 cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 



From jortel at fedoraproject.org  Thu Dec 17 20:36:27 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu, 17 Dec 2009 20:36:27 +0000 (UTC)
Subject: rpms/python-suds push.sh,1.4,1.5
Message-ID: <20091217203627.64D6F11C0092@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20914

Modified Files:
	push.sh 
Log Message:
release suds version 0.3.8.



Index: push.sh
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/push.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- push.sh	15 Jul 2009 15:37:19 -0000	1.4
+++ push.sh	17 Dec 2009 20:36:27 -0000	1.5
@@ -1,4 +1,4 @@
-branches="F-10 F-11 EL-4 EL-5"
+branches="F-11 F-12 EL-5"
 files="devel/python-suds.spec devel/sources"
 
 echo "Update the branches"



From jortel at fedoraproject.org  Thu Dec 17 20:36:27 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu, 17 Dec 2009 20:36:27 +0000 (UTC)
Subject: rpms/python-suds/EL-5 python-suds.spec,1.7,1.8 sources,1.8,1.9
Message-ID: <20091217203627.8EC9E11C0092@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20914/EL-5

Modified Files:
	python-suds.spec sources 
Log Message:
release suds version 0.3.8.



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-5/python-suds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-suds.spec	19 Oct 2009 16:42:01 -0000	1.7
+++ python-suds.spec	17 Dec 2009 20:36:27 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.7
+Version: 0.3.8
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -55,6 +55,21 @@ rm -rf $RPM_BUILD_ROOT
 %doc README LICENSE
 
 %changelog
+* Wed Dec 9 2009 jortel <jortel at redhat.com> - 0.3.8-1
+- Includeds Windows NTLM Transport.
+- Add missing self.messages in Client.clone().
+- Changed default behavior for WSDL PartElement to be optional.
+- Add support for services/ports defined without <address/> element in WSDL.
+- Fix sax.attribute.Element.attrib() to find by name only when ns is not specified; renamed to Element.getAttribute().
+- Update HttpTransport to pass timeout parameter to urllib2 open() methods when supported by urllib2.
+- Add null class to pass explicit NULL values for parameters and optional elements.
+- Soap encoded array (soap-enc:Array) enhancement for rpc/encoded.
+  Arrays passed as python arrays - works like document/literal now.
+  No more using the factory to create the Array.
+  Automatically includes arrayType attribute.  Eg: soap-enc:arrayType="Array[2]".
+  Reintroduced ability to pass complex (objects) using python dict instead of suds object via factory.
+- Fixed tickets: #84, #261, #262, #263, #265, #266, #278, #280, #282.
+
 * Thu Oct 16 2009 jortel <jortel at redhat.com> - 0.3.7-1
 - Better soap header support
 - Added new transport HttpAuthenticated for active (not passive) basic authentication.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Oct 2009 16:42:01 -0000	1.8
+++ sources	17 Dec 2009 20:36:27 -0000	1.9
@@ -5,3 +5,4 @@ a4544f1eaaeb3ca0e78180160909ab01  python
 2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz
 320b2f8816aca6445b31441eb201e95b  python-suds-0.3.6.tar.gz
 687a1287e5e86da42d1b161f29d58886  python-suds-0.3.7.tar.gz
+74122f391f73e91dfee5b5435aa51a38  python-suds-0.3.8.tar.gz



From jortel at fedoraproject.org  Thu Dec 17 20:36:27 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu, 17 Dec 2009 20:36:27 +0000 (UTC)
Subject: rpms/python-suds/F-11 python-suds.spec,1.12,1.13 sources,1.11,1.12
Message-ID: <20091217203627.B87B311C0092@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20914/F-11

Modified Files:
	python-suds.spec sources 
Log Message:
release suds version 0.3.8.



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-11/python-suds.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-suds.spec	19 Oct 2009 16:42:03 -0000	1.12
+++ python-suds.spec	17 Dec 2009 20:36:27 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.7
+Version: 0.3.8
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -55,6 +55,21 @@ rm -rf $RPM_BUILD_ROOT
 %doc README LICENSE
 
 %changelog
+* Wed Dec 9 2009 jortel <jortel at redhat.com> - 0.3.8-1
+- Includeds Windows NTLM Transport.
+- Add missing self.messages in Client.clone().
+- Changed default behavior for WSDL PartElement to be optional.
+- Add support for services/ports defined without <address/> element in WSDL.
+- Fix sax.attribute.Element.attrib() to find by name only when ns is not specified; renamed to Element.getAttribute().
+- Update HttpTransport to pass timeout parameter to urllib2 open() methods when supported by urllib2.
+- Add null class to pass explicit NULL values for parameters and optional elements.
+- Soap encoded array (soap-enc:Array) enhancement for rpc/encoded.
+  Arrays passed as python arrays - works like document/literal now.
+  No more using the factory to create the Array.
+  Automatically includes arrayType attribute.  Eg: soap-enc:arrayType="Array[2]".
+  Reintroduced ability to pass complex (objects) using python dict instead of suds object via factory.
+- Fixed tickets: #84, #261, #262, #263, #265, #266, #278, #280, #282.
+
 * Thu Oct 16 2009 jortel <jortel at redhat.com> - 0.3.7-1
 - Better soap header support
 - Added new transport HttpAuthenticated for active (not passive) basic authentication.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	19 Oct 2009 16:42:03 -0000	1.11
+++ sources	17 Dec 2009 20:36:27 -0000	1.12
@@ -5,3 +5,4 @@ a4544f1eaaeb3ca0e78180160909ab01  python
 2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz
 320b2f8816aca6445b31441eb201e95b  python-suds-0.3.6.tar.gz
 687a1287e5e86da42d1b161f29d58886  python-suds-0.3.7.tar.gz
+74122f391f73e91dfee5b5435aa51a38  python-suds-0.3.8.tar.gz



From jortel at fedoraproject.org  Thu Dec 17 20:36:27 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Thu, 17 Dec 2009 20:36:27 +0000 (UTC)
Subject: rpms/python-suds/F-12 python-suds.spec,1.12,1.13 sources,1.10,1.11
Message-ID: <20091217203627.EEB0011C0092@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20914/F-12

Modified Files:
	python-suds.spec sources 
Log Message:
release suds version 0.3.8.



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-12/python-suds.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-suds.spec	26 Jul 2009 23:10:43 -0000	1.12
+++ python-suds.spec	17 Dec 2009 20:36:27 -0000	1.13
@@ -2,8 +2,8 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.6
-Release: 2%{?dist}
+Version: 0.3.8
+Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
 Group: Development/Libraries
@@ -41,16 +41,49 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{python_sitelib}/suds/bindings
 %dir %{python_sitelib}/suds/sax
 %dir %{python_sitelib}/suds/xsd
+%dir %{python_sitelib}/suds/mx
+%dir %{python_sitelib}/suds/umx
 %dir %{python_sitelib}/suds/transport
 %{python_sitelib}/suds/*.py*
 %{python_sitelib}/suds/bindings/*.py*
 %{python_sitelib}/suds/sax/*.py*
 %{python_sitelib}/suds/xsd/*.py*
+%{python_sitelib}/suds/mx/*.py*
+%{python_sitelib}/suds/umx/*.py*
 %{python_sitelib}/suds/transport/*.py*
 
 %doc README LICENSE
 
 %changelog
+* Wed Dec 9 2009 jortel <jortel at redhat.com> - 0.3.8-1
+- Includeds Windows NTLM Transport.
+- Add missing self.messages in Client.clone().
+- Changed default behavior for WSDL PartElement to be optional.
+- Add support for services/ports defined without <address/> element in WSDL.
+- Fix sax.attribute.Element.attrib() to find by name only when ns is not specified; renamed to Element.getAttribute().
+- Update HttpTransport to pass timeout parameter to urllib2 open() methods when supported by urllib2.
+- Add null class to pass explicit NULL values for parameters and optional elements.
+- Soap encoded array (soap-enc:Array) enhancement for rpc/encoded.
+  Arrays passed as python arrays - works like document/literal now.
+  No more using the factory to create the Array.
+  Automatically includes arrayType attribute.  Eg: soap-enc:arrayType="Array[2]".
+  Reintroduced ability to pass complex (objects) using python dict instead of suds object via factory.
+- Fixed tickets: #84, #261, #262, #263, #265, #266, #278, #280, #282.
+
+* Thu Oct 16 2009 jortel <jortel at redhat.com> - 0.3.7-1
+- Better soap header support
+- Added new transport HttpAuthenticated for active (not passive) basic authentication.
+- New options (prefixes, timeout, retxml)
+- WSDL processing enhancements.
+- Expanded builtin XSD type support.
+- Fixed <xs:iniclude/>
+- Better XML date/datetime conversion.
+- Client.clone() method added for lightweight copy of client object.
+- XSD processing fixes/enhancements.
+- Better <simpleType/> by <xs:restriction/> support.
+- Performance enhancements. 
+- Fixed tickets: #65, #232, #233, #235, #241, #242, #244, #247, #254, #254, #256, #257, #258
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Jun 2009 17:49:56 -0000	1.10
+++ sources	17 Dec 2009 20:36:27 -0000	1.11
@@ -4,3 +4,5 @@ a4544f1eaaeb3ca0e78180160909ab01  python
 3c704119a5a27542ea5347fc13433b89  python-suds-0.3.4.tar.gz
 2fc4bbbb2351b24e707eac8434d5cb73  python-suds-0.3.5.tar.gz
 320b2f8816aca6445b31441eb201e95b  python-suds-0.3.6.tar.gz
+687a1287e5e86da42d1b161f29d58886  python-suds-0.3.7.tar.gz
+74122f391f73e91dfee5b5435aa51a38  python-suds-0.3.8.tar.gz



From cdamian at fedoraproject.org  Thu Dec 17 20:38:46 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu, 17 Dec 2009 20:38:46 +0000 (UTC)
Subject: File File_Iterator-1.1.1.tgz uploaded to lookaside cache by cdamian
Message-ID: <20091217203846.0C00F28ED49@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for php-phpunit-File-Iterator:

b161a25641bbfde84227fd3b951742d7  File_Iterator-1.1.1.tgz



From cdamian at fedoraproject.org  Thu Dec 17 20:39:34 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu, 17 Dec 2009 20:39:34 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/devel .cvsignore, 1.2,
	1.3 php-phpunit-File-Iterator.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091217203934.2EC4111C0092@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21953

Modified Files:
	.cvsignore php-phpunit-File-Iterator.spec sources 
Log Message:
upstream 1.1.1 (with tgz this time), also reduced php requirement


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Dec 2009 07:24:19 -0000	1.2
+++ .cvsignore	17 Dec 2009 20:39:33 -0000	1.3
@@ -1 +1 @@
-File_Iterator-1.1.0.tgz
+File_Iterator-1.1.1.tgz


Index: php-phpunit-File-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel/php-phpunit-File-Iterator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-phpunit-File-Iterator.spec	17 Dec 2009 20:15:35 -0000	1.2
+++ php-phpunit-File-Iterator.spec	17 Dec 2009 20:39:34 -0000	1.3
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.7.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
-Requires:       php-common >= 5.2.0
+Requires:       php-common >= 5.1.4
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -76,6 +76,9 @@ fi
 
 %changelog
 * Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-1
+- version 1.1.1 lowered the php requirement
+
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-1
 - upstream 1.1.1
 
 * Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Dec 2009 07:24:20 -0000	1.2
+++ sources	17 Dec 2009 20:39:34 -0000	1.3
@@ -1 +1 @@
-8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz
+b161a25641bbfde84227fd3b951742d7  File_Iterator-1.1.1.tgz



From cdamian at fedoraproject.org  Thu Dec 17 20:40:56 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu, 17 Dec 2009 20:40:56 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/devel php-phpunit-File-Iterator.spec,
	1.3, 1.4
Message-ID: <20091217204056.4910211C00EB@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22451

Modified Files:
	php-phpunit-File-Iterator.spec 
Log Message:
increase release


Index: php-phpunit-File-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/devel/php-phpunit-File-Iterator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-phpunit-File-Iterator.spec	17 Dec 2009 20:39:34 -0000	1.3
+++ php-phpunit-File-Iterator.spec	17 Dec 2009 20:40:56 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           php-phpunit-File-Iterator
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FilterIterator implementation that filters files based on a list of suffixes
 
 Group:          Development/Libraries
@@ -75,7 +75,7 @@ fi
 %{pear_phpdir}/File
 
 %changelog
-* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-1
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-2
 - version 1.1.1 lowered the php requirement
 
 * Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-1



From pkgdb at fedoraproject.org  Thu Dec 17 20:40:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:40:58 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204101.697D928ED49@bastion3.fedora.phx2.redhat.com>

silas has set the commit acl on python-mutagen (Fedora devel) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:11 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204112.91CCA28ED3D@bastion3.fedora.phx2.redhat.com>

silas has set the commit acl on python-mutagen (Fedora 9) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:14 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204115.CD93D28ED3D@bastion3.fedora.phx2.redhat.com>

silas has set the watchbugzilla acl on python-mutagen (Fedora 9) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:17 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204118.F266828ED68@bastion3.fedora.phx2.redhat.com>

silas has set the commit acl on python-mutagen (Fedora 10) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:16 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204119.22F8428ED21@bastion3.fedora.phx2.redhat.com>

silas has set the watchcommits acl on python-mutagen (Fedora 9) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:20 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204121.C512C28ED3D@bastion3.fedora.phx2.redhat.com>

silas has set the watchbugzilla acl on python-mutagen (Fedora 10) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:19 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204121.E8A2628ED68@bastion3.fedora.phx2.redhat.com>

silas has set the approveacls acl on python-mutagen (Fedora 10) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:12 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204115.62A3D28ED49@bastion3.fedora.phx2.redhat.com>

silas has set the approveacls acl on python-mutagen (Fedora 9) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:21 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204124.A13A828ED51@bastion3.fedora.phx2.redhat.com>

silas has set the watchcommits acl on python-mutagen (Fedora 10) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:26 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204127.7ADD728ED6D@bastion3.fedora.phx2.redhat.com>

silas has set the commit acl on python-mutagen (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:27 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204129.A0DE728ED49@bastion3.fedora.phx2.redhat.com>

silas has set the approveacls acl on python-mutagen (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:31 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204132.876C428ED21@bastion3.fedora.phx2.redhat.com>

silas has set the watchbugzilla acl on python-mutagen (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:30 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204133.6238B28ED49@bastion3.fedora.phx2.redhat.com>

silas has set the watchcommits acl on python-mutagen (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:34 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204135.C2A9528ED51@bastion3.fedora.phx2.redhat.com>

silas has set the commit acl on python-mutagen (Fedora 11) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:35 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204137.2C7F628ED3D@bastion3.fedora.phx2.redhat.com>

silas has set the approveacls acl on python-mutagen (Fedora 11) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:38 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204139.6BBDF28ED66@bastion3.fedora.phx2.redhat.com>

silas has set the approveacls acl on python-mutagen (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:41 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204143.7CF0C28ED85@bastion3.fedora.phx2.redhat.com>

silas has set the watchcommits acl on python-mutagen (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:43 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204146.1F8E428ED93@bastion3.fedora.phx2.redhat.com>

silas has set the commit acl on python-mutagen (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:47 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204150.7975828ED21@bastion3.fedora.phx2.redhat.com>

silas has set the watchbugzilla acl on python-mutagen (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:48 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204150.D819E28ED3D@bastion3.fedora.phx2.redhat.com>

silas has set the commit acl on python-mutagen (Fedora 12) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:41:49 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204152.5639E28ED58@bastion3.fedora.phx2.redhat.com>

silas has set the approveacls acl on python-mutagen (Fedora 12) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Dec 17 20:42:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 17 Dec 2009 20:42:25 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091217204227.57EE728ED68@bastion3.fedora.phx2.redhat.com>

silas has set the approveacls acl on python-mutagen (Fedora devel) to Approved for rnovacek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-mutagen



From sgrubb at fedoraproject.org  Thu Dec 17 20:42:32 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu, 17 Dec 2009 20:42:32 +0000 (UTC)
Subject: File libpreludedb-0.9.15.3.tar.gz uploaded to lookaside cache by
	sgrubb
Message-ID: <20091217204232.21BA328ED3D@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for libpreludedb:

70a78a092b32449e326ae3b28e57e9b3  libpreludedb-0.9.15.3.tar.gz



From sgrubb at fedoraproject.org  Thu Dec 17 20:46:11 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu, 17 Dec 2009 20:46:11 +0000 (UTC)
Subject: rpms/libpreludedb/devel .cvsignore, 1.7, 1.8 libpreludedb.spec, 1.26,
	1.27 sources, 1.8, 1.9 libpreludedb-x86_64-sqlite3.patch, 1.7, NONE
Message-ID: <20091217204611.A918D11C0092@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libpreludedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23492

Modified Files:
	.cvsignore libpreludedb.spec sources 
Removed Files:
	libpreludedb-x86_64-sqlite3.patch 
Log Message:
* Thu Dec 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.15.3-1
- new upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Jul 2009 14:37:48 -0000	1.7
+++ .cvsignore	17 Dec 2009 20:46:11 -0000	1.8
@@ -3,3 +3,4 @@ libpreludedb-0.9.14.1.tar.gz
 libpreludedb-0.9.15.tar.gz
 libpreludedb-0.9.15.1.tar.gz
 libpreludedb-0.9.15.2.tar.gz
+libpreludedb-0.9.15.3.tar.gz


Index: libpreludedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/libpreludedb.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libpreludedb.spec	7 Dec 2009 18:19:12 -0000	1.26
+++ libpreludedb.spec	17 Dec 2009 20:46:11 -0000	1.27
@@ -2,15 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		libpreludedb		           
-Version:	0.9.15.1 
-Release:	6%{?dist}
+Version:	0.9.15.3 
+Release:	1%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://prelude-ids.org/
 Source0:	http://prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:		%{name}-x86_64-sqlite3.patch	
 
 BuildRequires:  libprelude, libprelude-devel, mysql-devel, postgresql-devel, python-devel, sqlite-devel, perl-devel
 
@@ -77,7 +76,6 @@ Perl bindings for libpreludedb.
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -165,6 +163,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.15.3-1
+- new upstream bugfix release
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9.15.1-6
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Aug 2009 15:55:08 -0000	1.8
+++ sources	17 Dec 2009 20:46:11 -0000	1.9
@@ -1 +1 @@
-792b6ce058e4b9db44279409dbc662a3  libpreludedb-0.9.15.1.tar.gz
+70a78a092b32449e326ae3b28e57e9b3  libpreludedb-0.9.15.3.tar.gz


--- libpreludedb-x86_64-sqlite3.patch DELETED ---



From sgrubb at fedoraproject.org  Thu Dec 17 20:53:41 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Thu, 17 Dec 2009 20:53:41 +0000 (UTC)
Subject: rpms/libpreludedb/F-12 libpreludedb.spec, 1.25, 1.26 sources, 1.8, 
	1.9 libpreludedb-x86_64-sqlite3.patch, 1.7, NONE
Message-ID: <20091217205341.32D6611C0092@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libpreludedb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24804

Modified Files:
	libpreludedb.spec sources 
Removed Files:
	libpreludedb-x86_64-sqlite3.patch 
Log Message:
* Thu Dec 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.15.3-1
- new upstream bugfix release



Index: libpreludedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/F-12/libpreludedb.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libpreludedb.spec	25 Aug 2009 15:59:49 -0000	1.25
+++ libpreludedb.spec	17 Dec 2009 20:53:41 -0000	1.26
@@ -2,15 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		libpreludedb		           
-Version:	0.9.15.1 
-Release:	5%{?dist}
+Version:	0.9.15.3 
+Release:	1%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://prelude-ids.org/
 Source0:	http://prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:		%{name}-x86_64-sqlite3.patch	
 
 BuildRequires:  libprelude, libprelude-devel, mysql-devel, postgresql-devel, python-devel, sqlite-devel, perl-devel
 
@@ -77,8 +76,6 @@ Perl bindings for libpreludedb.
 
 %prep
 %setup -q
-%patch1 -p1
-
 
 %build
 %configure	--with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \
@@ -91,7 +88,6 @@ sed -i.rpath -e 's|^sys_lib_dlsearch_pat
 
 make %{?_smp_mflags}
 
-
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
@@ -165,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Steve Grubb <sgrubb at redhat.com> 0.9.15.3-1
+- new upstream bugfix release
+
 * Tue Aug 25 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.15.1-5
 - rebuild for new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Aug 2009 15:55:08 -0000	1.8
+++ sources	17 Dec 2009 20:53:41 -0000	1.9
@@ -1 +1 @@
-792b6ce058e4b9db44279409dbc662a3  libpreludedb-0.9.15.1.tar.gz
+70a78a092b32449e326ae3b28e57e9b3  libpreludedb-0.9.15.3.tar.gz


--- libpreludedb-x86_64-sqlite3.patch DELETED ---



From szpak at fedoraproject.org  Thu Dec 17 21:20:49 2009
From: szpak at fedoraproject.org (Marcin Zajaczkowski)
Date: Thu, 17 Dec 2009 21:20:49 +0000 (UTC)
Subject: File asunder-1.9.1.tar.bz2 uploaded to lookaside cache by szpak
Message-ID: <20091217212049.9F45528ED49@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for asunder:

91e1939978e4379f1328d8ededf4bb06  asunder-1.9.1.tar.bz2



From szpak at fedoraproject.org  Thu Dec 17 21:21:29 2009
From: szpak at fedoraproject.org (Marcin Zajaczkowski)
Date: Thu, 17 Dec 2009 21:21:29 +0000 (UTC)
Subject: rpms/asunder/devel .cvsignore, 1.8, 1.9 asunder.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20091217212129.59D9D11C0092@cvs1.fedora.phx.redhat.com>

Author: szpak

Update of /cvs/pkgs/rpms/asunder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29590

Modified Files:
	.cvsignore asunder.spec sources 
Log Message:
Update to 1.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Sep 2009 20:30:34 -0000	1.8
+++ .cvsignore	17 Dec 2009 21:21:29 -0000	1.9
@@ -1 +1 @@
-asunder-1.9.tar.bz2
+asunder-1.9.1.tar.bz2


Index: asunder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/devel/asunder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- asunder.spec	23 Sep 2009 06:49:06 -0000	1.10
+++ asunder.spec	17 Dec 2009 21:21:29 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		asunder
 Summary:	A graphical Audio CD ripper and encoder
-Version:	1.9
-Release:	2%{?dist}
+Version:	1.9.1
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/File
 URL:		http://littlesvr.ca/asunder
@@ -68,6 +68,9 @@ rm -fr %{buildroot}
 #%{_mandir}/man1/asunder.1*
 
 %changelog
+* Thu Dec 10 2009 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.9.1-1
+- updated to 1.9.1
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.9-2
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asunder/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Sep 2009 20:30:35 -0000	1.8
+++ sources	17 Dec 2009 21:21:29 -0000	1.9
@@ -1 +1 @@
-7cc2969abc9ffe7c077aab1adf37e9e0  asunder-1.9.tar.bz2
+91e1939978e4379f1328d8ededf4bb06  asunder-1.9.1.tar.bz2



From rdieter at fedoraproject.org  Thu Dec 17 21:24:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 21:24:50 +0000 (UTC)
Subject: File ktorrent-3.3.2.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091217212450.C27E628ED66@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for ktorrent:

b8387bcafe176ead086da785b5bf1eca  ktorrent-3.3.2.tar.bz2



From rdieter at fedoraproject.org  Thu Dec 17 21:27:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 17 Dec 2009 21:27:03 +0000 (UTC)
Subject: rpms/ktorrent/devel .cvsignore, 1.36, 1.37 ktorrent.spec, 1.110,
	1.111 sources, 1.36, 1.37
Message-ID: <20091217212703.53C5611C0092@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30692

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.2-1
- ktorrent-3.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	23 Nov 2009 20:32:42 -0000	1.36
+++ .cvsignore	17 Dec 2009 21:27:03 -0000	1.37
@@ -1 +1 @@
-ktorrent-3.3.1.tar.bz2
+ktorrent-3.3.2.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- ktorrent.spec	23 Nov 2009 20:32:42 -0000	1.110
+++ ktorrent.spec	17 Dec 2009 21:27:03 -0000	1.111
@@ -2,7 +2,7 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.3.1
+Version:        3.3.2
 Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.2-1
+- ktorrent-3.3.2
+
 * Mon Nov 23 2009 Roland Wolters <wolters.liste at gmx.net> - 3.3.1-1
 - ktorrent-3.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	23 Nov 2009 20:32:43 -0000	1.36
+++ sources	17 Dec 2009 21:27:03 -0000	1.37
@@ -1 +1 @@
-6a76e0b3a7ed14966c8096f63fde6e29  ktorrent-3.3.1.tar.bz2
+b8387bcafe176ead086da785b5bf1eca  ktorrent-3.3.2.tar.bz2



From mschwendt at fedoraproject.org  Thu Dec 17 22:13:47 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 17 Dec 2009 22:13:47 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12
	audacious-plugins-2.1-neon-request.patch, 
	NONE, 1.1 audacious-plugins.spec, 1.73, 1.74
Message-ID: <20091217221347.EDEB711C0092@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6413

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-neon-request.patch 
Log Message:
* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-26
- Avoid that neon's ne_request_destroy() is called with a NULL ptr.


audacious-plugins-2.1-neon-request.patch:
 neon.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.1-neon-request.patch ---
diff -Nur audacious-plugins-fedora-2.1-prep/src/neon/neon.c audacious-plugins-fedora-2.1-neon/src/neon/neon.c
--- audacious-plugins-fedora-2.1-prep/src/neon/neon.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-neon/src/neon/neon.c	2009-12-17 23:06:01.000000000 +0100
@@ -1345,7 +1345,9 @@
         kill_reader(h);
     }
 
-    ne_request_destroy(h->request);
+    if (NULL != h->request) {
+        ne_request_destroy(h->request);
+    }
     ne_session_destroy(h->session);
     reset_rb(&h->rb);
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- audacious-plugins.spec	17 Dec 2009 11:06:05 -0000	1.73
+++ audacious-plugins.spec	17 Dec 2009 22:13:47 -0000	1.74
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 25%{?dist}
+Release: 26%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -45,6 +45,8 @@ Patch16: audacious-plugins-2.1-jack.patc
 Patch17: audacious-plugins-2.1-pulseaudio-no-drain.patch
 #
 Patch18: audacious-plugins-2.1-sid-playfix.patch
+#
+Patch19: audacious-plugins-2.1-neon-request.patch
 
 
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -183,6 +185,7 @@ vortex compressed files.
 %patch16 -p1 -b .jack
 %patch17 -p1 -b .no-drain
 %patch18 -p1 -b .sid-playfix
+%patch19 -p1 -b .neon-request
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -266,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-26
+- Avoid that neon's ne_request_destroy() is called with a NULL ptr.
+
 * Wed Dec 16 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-25
 - Patch SID plugin to remove old cruft and fix playback.
 - Don't drain in pulse_audio output plugin (2.2 doesn't do this anymore



From tibbs at fedoraproject.org  Thu Dec 17 22:30:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 17 Dec 2009 22:30:32 +0000 (UTC)
Subject: status-report-scripts review-stats.py,1.6,1.7
Message-ID: <20091217223032.348D311C0264@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8705

Modified Files:
	review-stats.py 
Log Message:
Hoist out all of the duplicated row entry generation code.



Index: review-stats.py
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-stats.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- review-stats.py	24 Nov 2009 22:10:41 -0000	1.6
+++ review-stats.py	17 Dec 2009 22:30:29 -0000	1.7
@@ -1,5 +1,5 @@
 #!/usr/bin/python -t
-VERSION = "2.1"
+VERSION = "2.2"
 
 # $Id$
 # Note: This script presently lives in internal git and external cvs.  External
@@ -207,6 +207,17 @@
     return 0
 
 
+# The data from a standard row in a bug list
+def std_row(bug, rowclass):
+    return {'id': bug.bug_id,
+            'alias': to_unicode(bug.alias),
+            'assignee': nobody(to_unicode(bug.assigned_to)),
+            'class': rowclass,
+            'lastchange': bug.changeddate,
+            'status': bug.bug_status,
+            'summary': to_unicode(bug.short_desc),
+            }
+
 # Report generators
 def report_hidden(bugs, bugdata, loader, tmpdir, subs):
     data = deepcopy(subs)
@@ -222,14 +233,7 @@
             elif data['count'] % 2 == 1:
                 rowclass = 'bz_row_odd'
 
-            data['bugs'].append({'id': i.bug_id,
-                    'alias': to_unicode(i.alias),
-                    'assignee': nobody(to_unicode(i.assigned_to)),
-                    'class': rowclass,
-                    'lastchange': i.changeddate,
-                    'status': i.bug_status,
-                    'summary': to_unicode(i.short_desc),
-                    })
+            data['bugs'].append(std_row(i, rowclass))
             data['count'] +=1
 
     write_html(loader, 'plain.html', data, tmpdir, 'HIDDEN.html')
@@ -250,14 +254,7 @@
             if data['count'] % 2 == 1:
                 rowclass = 'bz_row_odd'
 
-            data['bugs'].append({'id': i.bug_id,
-                    'alias': to_unicode(i.alias),
-                    'assignee': nobody(to_unicode(i.assigned_to)),
-                    'class': rowclass,
-                    'lastchange': i.changeddate,
-                    'status': i.bug_status,
-                    'summary': to_unicode(i.short_desc),
-                    })
+            data['bugs'].append(std_row(i, rowclass))
             data['count'] +=1
 
     write_html(loader, 'plain.html', data, tmpdir, 'MERGE.html')
@@ -282,14 +279,7 @@
                 curmonth = yrmonth(i.opendate)
                 curcount = 0
 
-            data['months'][-1]['bugs'].append({'id': i.bug_id,
-                    'alias': to_unicode(i.alias),
-                    'assignee': nobody(to_unicode(i.assigned_to)),
-                    'class': rowclass,
-                    'lastchange': i.changeddate,
-                    'status': i.bug_status,
-                    'summary': to_unicode(i.short_desc),
-                    })
+            data['months'][-1]['bugs'].append(std_row(i, rowclass))
             data['count'] +=1
             curcount +=1
 
@@ -320,14 +310,7 @@
                 curmonth = yrmonth(i.opendate)
                 curcount = 0
 
-            data['months'][-1]['bugs'].append({'id': i.bug_id,
-                    'alias': to_unicode(i.alias),
-                    'assignee': nobody(to_unicode(i.assigned_to)),
-                    'class': rowclass,
-                    'lastchange': i.changeddate,
-                    'status': i.bug_status,
-                    'summary': to_unicode(i.short_desc),
-                    })
+            data['months'][-1]['bugs'].append(std_row(i, rowclass))
             data['count'] +=1
             curcount +=1
 



From deji at fedoraproject.org  Thu Dec 17 22:51:15 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 17 Dec 2009 22:51:15 +0000 (UTC)
Subject: rpms/pytc/devel pytc.spec,1.4,1.5
Message-ID: <20091217225115.DCB3311C0380@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/pytc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11974

Modified Files:
	pytc.spec 
Log Message:
* Thu Dec 17 2009 Deji Akingunola <dakingun at gmail.com> - 0.8-4
- Rebuild for tokyocabinet new release soname bump



Index: pytc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytc/devel/pytc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pytc.spec	26 Jul 2009 20:00:01 -0000	1.4
+++ pytc.spec	17 Dec 2009 22:51:15 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           pytc
 Version:        0.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tokyo Cabinet Python bindings
 
 Group:          Development/Languages
@@ -40,6 +40,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}-%{version}-*.egg-info
 
 %changelog
+* Thu Dec 17 2009 Deji Akingunola <dakingun at gmail.com> - 0.8-4
+- Rebuild for tokyocabinet new release soname bump
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From deji at fedoraproject.org  Thu Dec 17 22:54:27 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 17 Dec 2009 22:54:27 +0000 (UTC)
Subject: rpms/mutt/devel mutt.spec,1.65,1.66
Message-ID: <20091217225427.AD06B11C0092@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12462

Modified Files:
	mutt.spec 
Log Message:
* Thu Dec 17 2009 Deji Akingunola <dakingun at gmail.com> - 5:1.5.20-2.20091214hg736b6a.1
- Rebuild for tokyocabinet new release soname bump



Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- mutt.spec	16 Dec 2009 15:14:13 -0000	1.65
+++ mutt.spec	17 Dec 2009 22:54:27 -0000	1.66
@@ -16,7 +16,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.20
-Release: 2.20091214hg736b6a%{?dist}
+Release: 2.20091214hg736b6a%{?dist}.1
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Thu Dec 17 2009 Deji Akingunola <dakingun at gmail.com> - 5:1.5.20-2.20091214hg736b6a.1
+- Rebuild for tokyocabinet new release soname bump
+
 * Wed Dec 16 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.20-2.20091214hg736b6a
 - update to hg snapshot 20091214hg736b6a
 



From cwickert at fedoraproject.org  Thu Dec 17 22:56:13 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Dec 2009 22:56:13 +0000 (UTC)
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.33,1.34
Message-ID: <20091217225613.93EDD11C0092@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12791

Modified Files:
	xfce4-session.spec 
Log Message:
* Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-5
- Remove libtool archives of splash engines



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xfce4-session.spec	11 Nov 2009 18:42:16 -0000	1.33
+++ xfce4-session.spec	17 Dec 2009 22:56:13 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-session-%{version}.tar.bz2
@@ -62,7 +62,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
 %clean
@@ -117,6 +117,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libexecdir}/balou-*
 
 %changelog
+* Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-5
+- Remove libtool archives of splash engines
+
 * Wed Nov 11 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-4
 - Don't own /usr/share/themes (fixes #534107)
 



From toshio at fedoraproject.org  Thu Dec 17 23:05:38 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 17 Dec 2009 23:05:38 +0000 (UTC)
Subject: rpms/TurboGears/F-11 TurboGears.spec, 1.48,
	1.49 turbogears-sqlcreate.patch, 1.2, 1.3
Message-ID: <20091217230538.683A711C018B@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14159/F-11

Modified Files:
	TurboGears.spec turbogears-sqlcreate.patch 
Log Message:

* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
- Update sql create patch for traceback when used in development mode RHBZ#548594



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- TurboGears.spec	1 Dec 2009 15:55:53 -0000	1.48
+++ TurboGears.spec	17 Dec 2009 23:05:38 -0000	1.49
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
+- Update sql create patch for traceback when used in development mode RHBZ#548594
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
 - Update to 1.0.9 bugfix release.
 - Paginate fix is in upstream.

turbogears-sqlcreate.patch:
 base.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/turbogears-sqlcreate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- turbogears-sqlcreate.patch	1 Dec 2009 15:55:53 -0000	1.2
+++ turbogears-sqlcreate.patch	17 Dec 2009 23:05:38 -0000	1.3
@@ -2,15 +2,20 @@ Index: TurboGears-1.0.9/turbogears/comma
 ===================================================================
 --- TurboGears-1.0.9.orig/turbogears/command/base.py
 +++ TurboGears-1.0.9/turbogears/command/base.py
-@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
+@@ -127,11 +127,20 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
 +                    # Turn the egg directory name into a package name
                      eggname = eggname[0].replace(".egg-info", "")
 +                    pkgname = '-'.join(eggname.split('-')[:-2])
-+                    pkgversion = eggname.split('-')[-2]
-+                    pkgname = '%s == %s' % (pkgname, pkgversion)
++                    try:
++                        # Add the version info with proper syntax if it exists
++                        pkgversion = eggname.split('-')[-2]
++                    except IndexError:
++                        pkgname = eggname
++                    else:
++                        pkgname = '%s == %s' % (pkgname, pkgversion)
                      if not "." in sys.path:
                          sys.path.append(".")
                          pkg_resources.working_set.add_entry(".")



From toshio at fedoraproject.org  Thu Dec 17 23:05:38 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 17 Dec 2009 23:05:38 +0000 (UTC)
Subject: rpms/TurboGears/devel TurboGears.spec, 1.51,
	1.52 turbogears-sqlcreate.patch, 1.2, 1.3
Message-ID: <20091217230538.B198711C0092@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14159/devel

Modified Files:
	TurboGears.spec turbogears-sqlcreate.patch 
Log Message:

* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
- Update sql create patch for traceback when used in development mode RHBZ#548594



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- TurboGears.spec	1 Dec 2009 02:27:26 -0000	1.51
+++ TurboGears.spec	17 Dec 2009 23:05:38 -0000	1.52
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
+- Update sql create patch for traceback when used in development mode RHBZ#548594
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
 - Update to 1.0.9 bugfix release.
 - Paginate fix is in upstream.

turbogears-sqlcreate.patch:
 base.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/turbogears-sqlcreate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- turbogears-sqlcreate.patch	1 Dec 2009 02:27:26 -0000	1.2
+++ turbogears-sqlcreate.patch	17 Dec 2009 23:05:38 -0000	1.3
@@ -2,15 +2,20 @@ Index: TurboGears-1.0.9/turbogears/comma
 ===================================================================
 --- TurboGears-1.0.9.orig/turbogears/command/base.py
 +++ TurboGears-1.0.9/turbogears/command/base.py
-@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
+@@ -127,11 +127,20 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
 +                    # Turn the egg directory name into a package name
                      eggname = eggname[0].replace(".egg-info", "")
 +                    pkgname = '-'.join(eggname.split('-')[:-2])
-+                    pkgversion = eggname.split('-')[-2]
-+                    pkgname = '%s == %s' % (pkgname, pkgversion)
++                    try:
++                        # Add the version info with proper syntax if it exists
++                        pkgversion = eggname.split('-')[-2]
++                    except IndexError:
++                        pkgname = eggname
++                    else:
++                        pkgname = '%s == %s' % (pkgname, pkgversion)
                      if not "." in sys.path:
                          sys.path.append(".")
                          pkg_resources.working_set.add_entry(".")



From toshio at fedoraproject.org  Thu Dec 17 23:05:38 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 17 Dec 2009 23:05:38 +0000 (UTC)
Subject: rpms/TurboGears/F-12 TurboGears.spec, 1.51,
	1.52 turbogears-sqlcreate.patch, 1.2, 1.3
Message-ID: <20091217230538.8243611C02CA@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14159/F-12

Modified Files:
	TurboGears.spec turbogears-sqlcreate.patch 
Log Message:

* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
- Update sql create patch for traceback when used in development mode RHBZ#548594



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-12/TurboGears.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- TurboGears.spec	1 Dec 2009 15:55:53 -0000	1.51
+++ TurboGears.spec	17 Dec 2009 23:05:38 -0000	1.52
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
+- Update sql create patch for traceback when used in development mode RHBZ#548594
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
 - Update to 1.0.9 bugfix release.
 - Paginate fix is in upstream.

turbogears-sqlcreate.patch:
 base.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-12/turbogears-sqlcreate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- turbogears-sqlcreate.patch	1 Dec 2009 15:55:53 -0000	1.2
+++ turbogears-sqlcreate.patch	17 Dec 2009 23:05:38 -0000	1.3
@@ -2,15 +2,20 @@ Index: TurboGears-1.0.9/turbogears/comma
 ===================================================================
 --- TurboGears-1.0.9.orig/turbogears/command/base.py
 +++ TurboGears-1.0.9/turbogears/command/base.py
-@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
+@@ -127,11 +127,20 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
 +                    # Turn the egg directory name into a package name
                      eggname = eggname[0].replace(".egg-info", "")
 +                    pkgname = '-'.join(eggname.split('-')[:-2])
-+                    pkgversion = eggname.split('-')[-2]
-+                    pkgname = '%s == %s' % (pkgname, pkgversion)
++                    try:
++                        # Add the version info with proper syntax if it exists
++                        pkgversion = eggname.split('-')[-2]
++                    except IndexError:
++                        pkgname = eggname
++                    else:
++                        pkgname = '%s == %s' % (pkgname, pkgversion)
                      if not "." in sys.path:
                          sys.path.append(".")
                          pkg_resources.working_set.add_entry(".")



From toshio at fedoraproject.org  Thu Dec 17 23:05:38 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 17 Dec 2009 23:05:38 +0000 (UTC)
Subject: rpms/TurboGears/EL-5 TurboGears.spec, 1.29,
	1.30 turbogears-sqlcreate.patch, 1.2, 1.3
Message-ID: <20091217230538.6103111C0092@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14159/EL-5

Modified Files:
	TurboGears.spec turbogears-sqlcreate.patch 
Log Message:

* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
- Update sql create patch for traceback when used in development mode RHBZ#548594



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- TurboGears.spec	1 Dec 2009 15:52:49 -0000	1.29
+++ TurboGears.spec	17 Dec 2009 23:05:37 -0000	1.30
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Dec 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-2
+- Update sql create patch for traceback when used in development mode RHBZ#548594
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
 - Update to 1.0.9 bugfix release.
 - Paginate fix is in upstream.

turbogears-sqlcreate.patch:
 base.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/turbogears-sqlcreate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- turbogears-sqlcreate.patch	1 Dec 2009 15:52:49 -0000	1.2
+++ turbogears-sqlcreate.patch	17 Dec 2009 23:05:37 -0000	1.3
@@ -2,15 +2,20 @@ Index: TurboGears-1.0.9/turbogears/comma
 ===================================================================
 --- TurboGears-1.0.9.orig/turbogears/command/base.py
 +++ TurboGears-1.0.9/turbogears/command/base.py
-@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
+@@ -127,11 +127,20 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
 +                    # Turn the egg directory name into a package name
                      eggname = eggname[0].replace(".egg-info", "")
 +                    pkgname = '-'.join(eggname.split('-')[:-2])
-+                    pkgversion = eggname.split('-')[-2]
-+                    pkgname = '%s == %s' % (pkgname, pkgversion)
++                    try:
++                        # Add the version info with proper syntax if it exists
++                        pkgversion = eggname.split('-')[-2]
++                    except IndexError:
++                        pkgname = eggname
++                    else:
++                        pkgname = '%s == %s' % (pkgname, pkgversion)
                      if not "." in sys.path:
                          sys.path.append(".")
                          pkg_resources.working_set.add_entry(".")



From otaylor at fedoraproject.org  Thu Dec 17 23:14:54 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu, 17 Dec 2009 23:14:54 +0000 (UTC)
Subject: rpms/metacity/F-12 metacity-2.28-IceCloseConnection.patch, NONE,
	1.1 fresh-tooltips.patch, 1.3, 1.4 metacity.spec, 1.215, 1.216
Message-ID: <20091217231454.5766D11C0092@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15824

Modified Files:
	fresh-tooltips.patch metacity.spec 
Added Files:
	metacity-2.28-IceCloseConnection.patch 
Log Message:
* Thu Dec 17 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-13
- Fix crash in in tooltip on_style_set() (rhbz 546509)
- Fix Crash in SmcSetProperties() on exit (rhbz 539905, gnome 604867)


metacity-2.28-IceCloseConnection.patch:
 session.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE metacity-2.28-IceCloseConnection.patch ---
>From 3fd59d1e7e1a23202f58536fb7a995aa5951664b Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Thu, 17 Dec 2009 16:20:18 -0500
Subject: [PATCH] Don't call IceCloseConnection() behind libSM's back

The ICE connection is opened by libSM; we can't just close it when
we get an IOError on the ICE connection; instead call SmcCloseConnection()
and mark the connection as closed. This will prevent a segfault if we
exit out of the metacity main loop and get to meta_finalize().

https://bugzilla.gnome.org/show_bug.cgi?id=604867
---
 src/core/session.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/core/session.c b/src/core/session.c
index 96d8d71..0a12649 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -84,6 +84,7 @@ static char*       load_state         (const char *previous_save_file);
 static void        regenerate_save_file (void);
 static const char* full_save_file       (void);
 static void        warn_about_lame_clients_and_finish_interact (gboolean shutdown);
+static void        disconnect         (void);
 
 /* This is called when data is available on an ICE connection.  */
 static gboolean
@@ -106,7 +107,12 @@ process_ice_messages (GIOChannel *channel,
       IcePointer context = IceGetConnectionContext (connection);
 #endif
       
-      /* We were disconnected */
+      /* We were disconnected; close our connection to the
+       * session manager, this will result in the ICE connection
+       * being cleaned up, since it is owned by libSM.
+       */
+      disconnect ();
+      meta_quit (META_EXIT_SUCCESS);
       IceSetShutdownNegotiation (connection, False);
       IceCloseConnection (connection);
 
-- 
1.6.5.2


fresh-tooltips.patch:
 fixedtip.c |  260 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 243 insertions(+), 17 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/extras/rpms/metacity/F-12/fresh-tooltips.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fresh-tooltips.patch	28 Oct 2009 19:40:01 -0000	1.3
+++ fresh-tooltips.patch	17 Dec 2009 23:14:53 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui/fixedtip.c
---- metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips	2009-10-28 12:32:09.098105658 -0400
-+++ metacity-2.28.0/src/ui/fixedtip.c	2009-10-28 15:33:52.419756065 -0400
+--- metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips	2009-12-17 18:06:26.000000000 -0500
++++ metacity-2.28.0/src/ui/fixedtip.c	2009-12-17 18:08:23.000000000 -0500
 @@ -50,33 +50,237 @@ static int screen_right_edge = 0;
   */
  static int screen_bottom_edge = 0;
@@ -299,8 +299,8 @@ diff -up metacity-2.28.0/src/ui/fixedtip
        g_signal_connect (tip, "destroy",
  			G_CALLBACK (gtk_widget_destroyed), &tip);
 +
-+      g_signal_connect_swapped (tip, "style-set",
-+                                G_CALLBACK (on_style_set), NULL);
++      g_signal_connect (tip, "style-set",
++                        G_CALLBACK (on_style_set), NULL);
      }
  
    gtk_label_set_markup (GTK_LABEL (label), markup_text);


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- metacity.spec	10 Dec 2009 23:19:38 -0000	1.215
+++ metacity.spec	17 Dec 2009 23:14:54 -0000	1.216
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -52,6 +52,8 @@ Patch23: metacity-2.28-visual-bell.patch
 Patch24: metacity-2.28-empty-keybindings.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=604319
 Patch25: metacity-2.28-xioerror-unknown-display.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604867
+Patch26: metacity-2.28-IceCloseConnection.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -134,6 +136,7 @@ API. This package exists purely for tech
 %patch23 -p1 -b .visual-bell
 %patch24 -p1 -b .empty-keybindings
 %patch25 -p1 -b .xioerror-unknown-display
+%patch26 -p1 -b .IceCloseConnection
 
 # force regeneration
 rm src/metacity.schemas
@@ -241,21 +244,25 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Dec 17 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-13
+- Fix crash in in tooltip on_style_set() (rhbz 546509)
+- Fix Crash in SmcSetProperties() on exit (rhbz 539905, gnome 604867)
+
 * Thu Dec 10 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-12
 - Require gnome-themes rather than nodoka-metacity-theme (rhbz 532455, Stijn Hoop)
 - Add patches for GNOME bugs
    445447 - Application-induced window raise fails when raise_on_click off (rhbz 526045)
    530702 - compiz doesn't start if metacity compositor is enabled (rhbz 537791)
-   559816 - Doesn't update keybindings being disabled/cleared (rhbz 532282)
+   559816 - Doesn't update keybindings being disabled/cleared (rhbz 473224)
    567528 - Cannot raise windows from applications in Tcl/Tk and Java (rhbz 503522)
    577576 - Failed to read saved session file warning on new sessions (rhbz 493245)
-   598231 - When Chromium rings the bell, metacity quits(rhbz 532282)
+   598231 - When Chromium rings the bell, metacity quits (rhbz 532282)
    598995 - Don't focus ancestor window on a different workspace (rhbz 237158)
    599097 - For mouse and sloppy focus, return to "mouse mode" on motion (rhbz 530261)
    599248 - Add no_focus_windows preference to list windows that shouldn't be focused (rhbz 530262)
    599261 - Add a new_windows_always_on_top preference (rhbz 530263)
    599262 - Add XFCE Terminal as a terminal
-   604319 - XIOError unknown display (rhbz 537845)
+   604319 - Handle XError and XIOError for unknown displays (rhbz 537845)
 
 * Thu Nov 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-11
 - Fix a problem with the previous change



From cwickert at fedoraproject.org  Thu Dec 17 23:17:35 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Dec 2009 23:17:35 +0000 (UTC)
Subject: File exo-0.3.106.tar.bz2 uploaded to lookaside cache by cwickert
Message-ID: <20091217231735.B426E28ED49@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for exo:

927905f89252fa397e50d7a4fbf3c9a7  exo-0.3.106.tar.bz2



From alexlan at fedoraproject.org  Thu Dec 17 23:26:13 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 17 Dec 2009 23:26:13 +0000 (UTC)
Subject: File miro-2.5.4.tar.gz uploaded to lookaside cache by alexlan
Message-ID: <20091217232613.A879C28ED4B@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for Miro:

d0ae2bf0463201c6b6dc7367f1fa8b3c  miro-2.5.4.tar.gz



From cwickert at fedoraproject.org  Thu Dec 17 23:32:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 17 Dec 2009 23:32:34 +0000 (UTC)
Subject: rpms/exo/devel .cvsignore, 1.15, 1.16 exo.spec, 1.44, 1.45 sources, 
	1.15, 1.16 exo-0.3.105-fix-low-transfer-rates.patch, 1.1, NONE
Message-ID: <20091217233234.DE72111C0092@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18686

Modified Files:
	.cvsignore exo.spec sources 
Removed Files:
	exo-0.3.105-fix-low-transfer-rates.patch 
Log Message:
* Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.106-1
- Update to 0.3.106
- Remove upstreamed sync patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Oct 2009 00:51:44 -0000	1.15
+++ .cvsignore	17 Dec 2009 23:32:33 -0000	1.16
@@ -1 +1 @@
-exo-0.3.105.tar.bz2
+exo-0.3.106.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- exo.spec	19 Oct 2009 01:00:49 -0000	1.44
+++ exo.spec	17 Dec 2009 23:32:34 -0000	1.45
@@ -2,7 +2,7 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.105
+Version: 0.3.106
 Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
@@ -10,8 +10,6 @@ License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
 Source0: http://archive.xfce.org/src/xfce/exo/0.3/%{name}-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
-# http://git.xfce.org/xfce/exo/patch/?id=7aad4f152380e1d2edffdc9a2eb15554f042fbad
-Patch1: exo-0.3.105-fix-low-transfer-rates.patch
 # to not bring https://bugzilla.redhat.com/show_bug.cgi?id=508823 back
 Patch2: exo-0.3.105-mount-utf8.patch
 Group: System Environment/Libraries
@@ -57,7 +55,6 @@ Python libraries and header files for th
 %setup -q
 
 %patch0 -p1 -b .x86_64-build
-%patch1 -p1 -b .sync
 %patch2 -p1 -b .utf8
 
 %build
@@ -142,6 +139,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.106-1
+- Update to 0.3.106
+- Remove upstreamed sync patch
+
 * Mon Oct 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.105-1
 - Update to 0.3.105
 - Tweak mount.rc to use UTF-8 (to not bring back #508823 again)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Oct 2009 00:51:45 -0000	1.15
+++ sources	17 Dec 2009 23:32:34 -0000	1.16
@@ -1 +1 @@
-ba87f84894498bf23ae39d849c55f98c  exo-0.3.105.tar.bz2
+927905f89252fa397e50d7a4fbf3c9a7  exo-0.3.106.tar.bz2


--- exo-0.3.105-fix-low-transfer-rates.patch DELETED ---



From otaylor at fedoraproject.org  Thu Dec 17 23:35:49 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu, 17 Dec 2009 23:35:49 +0000 (UTC)
Subject: rpms/metacity/devel metacity-2.28-IceCloseConnection.patch, NONE,
	1.1 fresh-tooltips.patch, 1.1, 1.2 metacity.spec, 1.206, 1.207
Message-ID: <20091217233549.2234C11C0092@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19210

Modified Files:
	fresh-tooltips.patch metacity.spec 
Added Files:
	metacity-2.28-IceCloseConnection.patch 
Log Message:
* Thu Dec 17 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-13
- Fix crash in in tooltip on_style_set() (rhbz 546509)
- Fix Crash in SmcSetProperties() on exit (rhbz 539905, gnome 604867)


metacity-2.28-IceCloseConnection.patch:
 session.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE metacity-2.28-IceCloseConnection.patch ---
>From 3fd59d1e7e1a23202f58536fb7a995aa5951664b Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Thu, 17 Dec 2009 16:20:18 -0500
Subject: [PATCH] Don't call IceCloseConnection() behind libSM's back

The ICE connection is opened by libSM; we can't just close it when
we get an IOError on the ICE connection; instead call SmcCloseConnection()
and mark the connection as closed. This will prevent a segfault if we
exit out of the metacity main loop and get to meta_finalize().

https://bugzilla.gnome.org/show_bug.cgi?id=604867
---
 src/core/session.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/core/session.c b/src/core/session.c
index 96d8d71..0a12649 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -84,6 +84,7 @@ static char*       load_state         (const char *previous_save_file);
 static void        regenerate_save_file (void);
 static const char* full_save_file       (void);
 static void        warn_about_lame_clients_and_finish_interact (gboolean shutdown);
+static void        disconnect         (void);
 
 /* This is called when data is available on an ICE connection.  */
 static gboolean
@@ -106,7 +107,12 @@ process_ice_messages (GIOChannel *channel,
       IcePointer context = IceGetConnectionContext (connection);
 #endif
       
-      /* We were disconnected */
+      /* We were disconnected; close our connection to the
+       * session manager, this will result in the ICE connection
+       * being cleaned up, since it is owned by libSM.
+       */
+      disconnect ();
+      meta_quit (META_EXIT_SUCCESS);
       IceSetShutdownNegotiation (connection, False);
       IceCloseConnection (connection);
 
-- 
1.6.5.2


fresh-tooltips.patch:
 fixedtip.c |  260 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 243 insertions(+), 17 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/fresh-tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fresh-tooltips.patch	25 Nov 2009 03:18:14 -0000	1.1
+++ fresh-tooltips.patch	17 Dec 2009 23:35:48 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips metacity-2.28.0/src/ui/fixedtip.c
---- metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips	2009-10-28 12:32:09.098105658 -0400
-+++ metacity-2.28.0/src/ui/fixedtip.c	2009-10-28 15:33:52.419756065 -0400
+--- metacity-2.28.0/src/ui/fixedtip.c.fresh-tooltips	2009-12-17 18:06:26.000000000 -0500
++++ metacity-2.28.0/src/ui/fixedtip.c	2009-12-17 18:08:23.000000000 -0500
 @@ -50,33 +50,237 @@ static int screen_right_edge = 0;
   */
  static int screen_bottom_edge = 0;
@@ -299,8 +299,8 @@ diff -up metacity-2.28.0/src/ui/fixedtip
        g_signal_connect (tip, "destroy",
  			G_CALLBACK (gtk_widget_destroyed), &tip);
 +
-+      g_signal_connect_swapped (tip, "style-set",
-+                                G_CALLBACK (on_style_set), NULL);
++      g_signal_connect (tip, "style-set",
++                        G_CALLBACK (on_style_set), NULL);
      }
  
    gtk_label_set_markup (GTK_LABEL (label), markup_text);


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- metacity.spec	10 Dec 2009 23:33:00 -0000	1.206
+++ metacity.spec	17 Dec 2009 23:35:48 -0000	1.207
@@ -3,7 +3,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -52,6 +52,8 @@ Patch23: metacity-2.28-visual-bell.patch
 Patch24: metacity-2.28-empty-keybindings.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=604319
 Patch25: metacity-2.28-xioerror-unknown-display.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604867
+Patch26: metacity-2.28-IceCloseConnection.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -134,6 +136,7 @@ API. This package exists purely for tech
 %patch23 -p1 -b .visual-bell
 %patch24 -p1 -b .empty-keybindings
 %patch25 -p1 -b .xioerror-unknown-display
+%patch26 -p1 -b .IceCloseConnection
 
 # force regeneration
 rm src/metacity.schemas
@@ -241,21 +244,25 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Dec 17 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-13
+- Fix crash in in tooltip on_style_set() (rhbz 546509)
+- Fix Crash in SmcSetProperties() on exit (rhbz 539905, gnome 604867)
+
 * Thu Dec 10 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-12
 - Require gnome-themes rather than nodoka-metacity-theme (rhbz 532455, Stijn Hoop)
 - Add patches for GNOME bugs
    445447 - Application-induced window raise fails when raise_on_click off (rhbz 526045)
    530702 - compiz doesn't start if metacity compositor is enabled (rhbz 537791)
-   559816 - Doesn't update keybindings being disabled/cleared (rhbz 532282)
+   559816 - Doesn't update keybindings being disabled/cleared (rhbz 473224)
    567528 - Cannot raise windows from applications in Tcl/Tk and Java (rhbz 503522)
    577576 - Failed to read saved session file warning on new sessions (rhbz 493245)
-   598231 - When Chromium rings the bell, metacity quits(rhbz 532282)
+   598231 - When Chromium rings the bell, metacity quits (rhbz 532282)
    598995 - Don't focus ancestor window on a different workspace (rhbz 237158)
    599097 - For mouse and sloppy focus, return to "mouse mode" on motion (rhbz 530261)
    599248 - Add no_focus_windows preference to list windows that shouldn't be focused (rhbz 530262)
    599261 - Add a new_windows_always_on_top preference (rhbz 530263)
    599262 - Add XFCE Terminal as a terminal
-   604319 - XIOError unknown display (rhbz 537845)
+   604319 - Handle XError and XIOError for unknown displays (rhbz 537845)
 
 * Thu Nov 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-11
 - Fix a problem with the previous change



From otaylor at fedoraproject.org  Thu Dec 17 23:36:33 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu, 17 Dec 2009 23:36:33 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.207,1.208
Message-ID: <20091217233633.A20B711C0092@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19369

Modified Files:
	metacity.spec 
Log Message:
Fix releases in changelog to correspond to devel-branch packages


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- metacity.spec	17 Dec 2009 23:35:48 -0000	1.207
+++ metacity.spec	17 Dec 2009 23:36:33 -0000	1.208
@@ -244,11 +244,11 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
-* Thu Dec 17 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-13
+* Thu Dec 17 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-14
 - Fix crash in in tooltip on_style_set() (rhbz 546509)
 - Fix Crash in SmcSetProperties() on exit (rhbz 539905, gnome 604867)
 
-* Thu Dec 10 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-12
+* Thu Dec 10 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-13
 - Require gnome-themes rather than nodoka-metacity-theme (rhbz 532455, Stijn Hoop)
 - Add patches for GNOME bugs
    445447 - Application-induced window raise fails when raise_on_click off (rhbz 526045)



From alexlan at fedoraproject.org  Thu Dec 17 23:41:16 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 17 Dec 2009 23:41:16 +0000 (UTC)
Subject: rpms/Miro/devel .cvsignore, 1.21, 1.22 Miro.spec, 1.67, 1.68 sources,
	1.21, 1.22
Message-ID: <20091217234116.9079A11C0380@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20082

Modified Files:
	.cvsignore Miro.spec sources 
Log Message:
- Update to upstream 2.5.4.
- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
  (#544047, #545681, #546141, #528036, #540207, #544889, #547062)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	28 Oct 2009 23:28:06 -0000	1.21
+++ .cvsignore	17 Dec 2009 23:41:15 -0000	1.22
@@ -1 +1 @@
-miro-2.5.3.tar.gz
+miro-2.5.4.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- Miro.spec	26 Nov 2009 02:46:14 -0000	1.67
+++ Miro.spec	17 Dec 2009 23:41:16 -0000	1.68
@@ -4,8 +4,8 @@
 %define gecko_ver 1.9.2.1
 
 Name:           Miro
-Version:        2.5.3
-Release:        3%{?dist}
+Version:        2.5.4
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,11 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Thu Dec 17 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.4-1
+- Update to upstream 2.5.4.
+- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
+  (#544047, #545681, #546141, #528036, #540207, #544889, #547062)
+
 * Wed Nov 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.3-3
 - Update to new gecko-libs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	28 Oct 2009 23:28:07 -0000	1.21
+++ sources	17 Dec 2009 23:41:16 -0000	1.22
@@ -1 +1 @@
-de3ada44e9904f2b046a6503b1a47a6d  miro-2.5.3.tar.gz
+d0ae2bf0463201c6b6dc7367f1fa8b3c  miro-2.5.4.tar.gz



From alexlan at fedoraproject.org  Thu Dec 17 23:49:31 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 17 Dec 2009 23:49:31 +0000 (UTC)
Subject: rpms/Miro/F-12 .cvsignore, 1.20, 1.21 Miro.spec, 1.66, 1.67 sources,
	1.20, 1.21
Message-ID: <20091217234931.8928811C0092@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/Miro/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21585

Modified Files:
	.cvsignore Miro.spec sources 
Log Message:
- Update to upstream 2.5.4.
- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
  (#544047, #545681, #546141, #528036, #540207, #544889, #547062)
- Tarball renamed Miro -> miro



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Aug 2009 05:55:02 -0000	1.20
+++ .cvsignore	17 Dec 2009 23:49:31 -0000	1.21
@@ -1 +1 @@
-Miro-2.5.2.tar.gz
+miro-2.5.4.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-12/Miro.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- Miro.spec	16 Dec 2009 16:20:50 -0000	1.66
+++ Miro.spec	17 Dec 2009 23:49:31 -0000	1.67
@@ -4,14 +4,14 @@
 %define gecko_ver 1.9.1.6
 
 Name:           Miro
-Version:        2.5.2
-Release:        7%{?dist}
+Version:        2.5.4
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.getmiro.com/
-Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
+Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-%{version}.tar.gz
 Patch0:         %{name}-2.5.2-fhs.patch
 Patch1:         %{name}-2.0-videodir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +41,7 @@ that there are some bugs, but we're movi
 releasing bug fixes on a regular basis.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n miro-%{version}
 # Intentionally not using -b .<descr> :
 # Otherwise, the unpatched files get re-added into Miro
 # (and '.' breaks Python imports)
@@ -94,6 +94,12 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Thu Dec 17 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.4-1
+- Update to upstream 2.5.4.
+- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
+  (#544047, #545681, #546141, #528036, #540207, #544889, #547062)
+- Tarball renamed Miro -> miro
+
 * Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-7
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Aug 2009 05:55:03 -0000	1.20
+++ sources	17 Dec 2009 23:49:31 -0000	1.21
@@ -1 +1 @@
-e4e6a6979949c001ab06e813db7da06f  Miro-2.5.2.tar.gz
+d0ae2bf0463201c6b6dc7367f1fa8b3c  miro-2.5.4.tar.gz



From alexlan at fedoraproject.org  Thu Dec 17 23:52:47 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 17 Dec 2009 23:52:47 +0000 (UTC)
Subject: rpms/Miro/F-11 .cvsignore, 1.20, 1.21 Miro.spec, 1.63, 1.64 sources,
	1.20, 1.21
Message-ID: <20091217235247.C2B5611C0092@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/Miro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22162

Modified Files:
	.cvsignore Miro.spec sources 
Log Message:
- Update to upstream 2.5.4.
- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
  (#544047, #545681, #546141, #528036, #540207, #544889, #547062)
- Tarball renamed Miro -> miro



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	19 Aug 2009 07:26:02 -0000	1.20
+++ .cvsignore	17 Dec 2009 23:52:47 -0000	1.21
@@ -1 +1 @@
-Miro-2.5.2.tar.gz
+miro-2.5.4.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/Miro.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- Miro.spec	16 Dec 2009 15:28:58 -0000	1.63
+++ Miro.spec	17 Dec 2009 23:52:47 -0000	1.64
@@ -4,14 +4,14 @@
 %define gecko_ver 1.9.1.6
 
 Name:           Miro
-Version:        2.5.2
-Release:        7%{?dist}
+Version:        2.5.4
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.getmiro.com/
-Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
+Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-%{version}.tar.gz
 Patch0:         %{name}-2.5.2-fhs.patch
 Patch1:         %{name}-2.0-videodir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +41,7 @@ that there are some bugs, but we're movi
 releasing bug fixes on a regular basis.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n miro-%{version}
 # Intentionally not using -b .<descr> :
 # Otherwise, the unpatched files get re-added into Miro
 # (and '.' breaks Python imports)
@@ -94,6 +94,12 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Thu Dec 17 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.4-1
+- Update to upstream 2.5.4.
+- Hopefully fixes a whole slew of crashes (#540301, #540535, #540543)
+  (#544047, #545681, #546141, #528036, #540207, #544889, #547062)
+- Tarball renamed Miro -> miro
+
 * Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-7
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	19 Aug 2009 07:26:02 -0000	1.20
+++ sources	17 Dec 2009 23:52:47 -0000	1.21
@@ -1 +1 @@
-e4e6a6979949c001ab06e813db7da06f  Miro-2.5.2.tar.gz
+d0ae2bf0463201c6b6dc7367f1fa8b3c  miro-2.5.4.tar.gz



From rmeggins at fedoraproject.org  Fri Dec 18 00:20:23 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 00:20:23 +0000 (UTC)
Subject: File 389-ds-base-1.2.5.rc3.tar.bz2 uploaded to lookaside cache by
	rmeggins
Message-ID: <20091218002023.0271828ED83@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for 389-ds-base:

394658aaeda80bdc4bf46ca12b92a752  389-ds-base-1.2.5.rc3.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 00:23:06 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 00:23:06 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 .cvsignore, 1.7, 1.8 389-ds-base-git-local.sh,
	1.4, 1.5 389-ds-base-git.sh, 1.5, 1.6 389-ds-base.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <20091218002306.8D81A11C0092@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26790

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
updated to 1.2.5.rc3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Dec 2009 23:29:23 -0000	1.7
+++ .cvsignore	18 Dec 2009 00:23:06 -0000	1.8
@@ -1 +1 @@
-389-ds-base-1.2.5.rc2.tar.bz2
+389-ds-base-1.2.5.rc3.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base-git-local.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base-git-local.sh	7 Dec 2009 23:29:23 -0000	1.4
+++ 389-ds-base-git-local.sh	18 Dec 2009 00:23:06 -0000	1.5
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc2
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base-git.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-ds-base-git.sh	7 Dec 2009 23:29:23 -0000	1.5
+++ 389-ds-base-git.sh	18 Dec 2009 00:23:06 -0000	1.6
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc2
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- 389-ds-base.spec	7 Dec 2009 23:29:23 -0000	1.9
+++ 389-ds-base.spec	18 Dec 2009 00:23:06 -0000	1.10
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc2
+%global prerel .rc3
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.5
-Release:          %{?relprefix}3%{?prerel}%{?dist}
+Release:          %{?relprefix}4%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -269,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec 17 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.4.rc3
+- 1.2.5.rc3 release
+
 * Mon Dec  7 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.3.rc2
 - 1.2.5.rc2 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	7 Dec 2009 23:29:23 -0000	1.9
+++ sources	18 Dec 2009 00:23:06 -0000	1.10
@@ -1 +1 @@
-aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2
+394658aaeda80bdc4bf46ca12b92a752  389-ds-base-1.2.5.rc3.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 00:23:18 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 00:23:18 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 .cvsignore, 1.7, 1.8 389-ds-base-git-local.sh,
	1.4, 1.5 389-ds-base-git.sh, 1.5, 1.6 389-ds-base.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <20091218002318.3B27711C0092@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26839

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
updated to 1.2.5.rc3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Dec 2009 23:29:23 -0000	1.7
+++ .cvsignore	18 Dec 2009 00:23:17 -0000	1.8
@@ -1 +1 @@
-389-ds-base-1.2.5.rc2.tar.bz2
+389-ds-base-1.2.5.rc3.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base-git-local.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base-git-local.sh	7 Dec 2009 23:29:24 -0000	1.4
+++ 389-ds-base-git-local.sh	18 Dec 2009 00:23:17 -0000	1.5
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc2
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base-git.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-ds-base-git.sh	7 Dec 2009 23:29:24 -0000	1.5
+++ 389-ds-base-git.sh	18 Dec 2009 00:23:17 -0000	1.6
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc2
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- 389-ds-base.spec	7 Dec 2009 23:29:24 -0000	1.9
+++ 389-ds-base.spec	18 Dec 2009 00:23:17 -0000	1.10
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc2
+%global prerel .rc3
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.5
-Release:          %{?relprefix}3%{?prerel}%{?dist}
+Release:          %{?relprefix}4%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -269,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec 17 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.4.rc3
+- 1.2.5.rc3 release
+
 * Mon Dec  7 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.3.rc2
 - 1.2.5.rc2 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	7 Dec 2009 23:29:24 -0000	1.9
+++ sources	18 Dec 2009 00:23:18 -0000	1.10
@@ -1 +1 @@
-aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2
+394658aaeda80bdc4bf46ca12b92a752  389-ds-base-1.2.5.rc3.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 00:23:42 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 00:23:42 +0000 (UTC)
Subject: rpms/389-ds-base/F-12 .cvsignore, 1.7, 1.8 389-ds-base-git-local.sh,
	1.4, 1.5 389-ds-base-git.sh, 1.5, 1.6 389-ds-base.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20091218002342.31A6411C0092@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26912

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
updated to 1.2.5.rc3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Dec 2009 23:29:24 -0000	1.7
+++ .cvsignore	18 Dec 2009 00:23:41 -0000	1.8
@@ -1 +1 @@
-389-ds-base-1.2.5.rc2.tar.bz2
+389-ds-base-1.2.5.rc3.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base-git-local.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base-git-local.sh	7 Dec 2009 23:29:24 -0000	1.4
+++ 389-ds-base-git-local.sh	18 Dec 2009 00:23:41 -0000	1.5
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc2
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base-git.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-ds-base-git.sh	7 Dec 2009 23:29:24 -0000	1.5
+++ 389-ds-base-git.sh	18 Dec 2009 00:23:42 -0000	1.6
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc2
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- 389-ds-base.spec	7 Dec 2009 23:29:24 -0000	1.12
+++ 389-ds-base.spec	18 Dec 2009 00:23:42 -0000	1.13
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc2
+%global prerel .rc3
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.5
-Release:          %{?relprefix}3%{?prerel}%{?dist}
+Release:          %{?relprefix}4%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -269,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec 17 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.4.rc3
+- 1.2.5.rc3 release
+
 * Mon Dec  7 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.3.rc2
 - 1.2.5.rc2 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	7 Dec 2009 23:29:24 -0000	1.9
+++ sources	18 Dec 2009 00:23:42 -0000	1.10
@@ -1 +1 @@
-aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2
+394658aaeda80bdc4bf46ca12b92a752  389-ds-base-1.2.5.rc3.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 00:23:51 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 00:23:51 +0000 (UTC)
Subject: rpms/389-ds-base/devel .cvsignore, 1.7, 1.8 389-ds-base-git-local.sh,
	1.4, 1.5 389-ds-base-git.sh, 1.5, 1.6 389-ds-base.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20091218002351.BDC2911C0092@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26948

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
updated to 1.2.5.rc3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Dec 2009 23:29:24 -0000	1.7
+++ .cvsignore	18 Dec 2009 00:23:51 -0000	1.8
@@ -1 +1 @@
-389-ds-base-1.2.5.rc2.tar.bz2
+389-ds-base-1.2.5.rc3.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base-git-local.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base-git-local.sh	7 Dec 2009 23:29:24 -0000	1.4
+++ 389-ds-base-git-local.sh	18 Dec 2009 00:23:51 -0000	1.5
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc2
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base-git.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-ds-base-git.sh	7 Dec 2009 23:29:24 -0000	1.5
+++ 389-ds-base-git.sh	18 Dec 2009 00:23:51 -0000	1.6
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.5.rc2
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- 389-ds-base.spec	7 Dec 2009 23:29:24 -0000	1.12
+++ 389-ds-base.spec	18 Dec 2009 00:23:51 -0000	1.13
@@ -1,14 +1,14 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc2
+%global prerel .rc3
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.5
-Release:          %{?relprefix}3%{?prerel}%{?dist}
+Release:          %{?relprefix}4%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -269,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec 17 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.4.rc3
+- 1.2.5.rc3 release
+
 * Mon Dec  7 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.3.rc2
 - 1.2.5.rc2 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	7 Dec 2009 23:29:24 -0000	1.9
+++ sources	18 Dec 2009 00:23:51 -0000	1.10
@@ -1 +1 @@
-aed7a2ac75a35cfaa8abeb35a49b2ac9  389-ds-base-1.2.5.rc2.tar.bz2
+394658aaeda80bdc4bf46ca12b92a752  389-ds-base-1.2.5.rc3.tar.bz2



From cwickert at fedoraproject.org  Fri Dec 18 00:24:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 18 Dec 2009 00:24:17 +0000 (UTC)
Subject: rpms/exo/devel exo.spec,1.45,1.46
Message-ID: <20091218002417.957EC11C0092@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27172

Modified Files:
	exo.spec 
Log Message:
* Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.106-2
- Remove libtool archive from python-exo package



Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- exo.spec	17 Dec 2009 23:32:34 -0000	1.45
+++ exo.spec	18 Dec 2009 00:24:17 -0000	1.46
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.106
-Release: 1%{?dist}
+Release: 2%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
@@ -66,9 +66,7 @@ make 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
-rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-mount
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-desktop-item-edit
@@ -139,6 +137,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.106-2
+- Remove libtool archive from python-exo package
+
 * Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.106-1
 - Update to 0.3.106
 - Remove upstreamed sync patch



From hoangelos at fedoraproject.org  Fri Dec 18 02:30:09 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 02:30:09 +0000 (UTC)
Subject: File pip-0.6.1.tar.gz uploaded to lookaside cache by hoangelos
Message-ID: <20091218023009.3E5BA28ED6B@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for python-pip:

7560e3055c66afb99ac4a7892389a237  pip-0.6.1.tar.gz



From hoangelos at fedoraproject.org  Fri Dec 18 02:39:42 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 02:39:42 +0000 (UTC)
Subject: rpms/python-pip/devel .cvsignore, 1.2, 1.3 python-pip.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091218023942.58CB611C0092@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14396

Modified Files:
	.cvsignore python-pip.spec sources 
Log Message:
Updating to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 00:51:47 -0000	1.2
+++ .cvsignore	18 Dec 2009 02:39:41 -0000	1.3
@@ -1 +1 @@
-pip-0.4.tar.gz
+pip-0.6.1.tar.gz


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/devel/python-pip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-pip.spec	26 Oct 2009 00:51:48 -0000	1.1
+++ python-pip.spec	18 Dec 2009 02:39:41 -0000	1.2
@@ -3,7 +3,7 @@
 %global srcname pip
 
 Name:           python-%{srcname}
-Version:        0.4
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 00:51:48 -0000	1.2
+++ sources	18 Dec 2009 02:39:41 -0000	1.3
@@ -1 +1 @@
-b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz
+7560e3055c66afb99ac4a7892389a237  pip-0.6.1.tar.gz



From hoangelos at fedoraproject.org  Fri Dec 18 02:58:39 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 02:58:39 +0000 (UTC)
Subject: rpms/python-pip/F-11 .cvsignore, 1.2, 1.3 python-pip.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091218025839.5786911C0092@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17311

Modified Files:
	.cvsignore python-pip.spec sources 
Log Message:
Updating to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 00:56:10 -0000	1.2
+++ .cvsignore	18 Dec 2009 02:58:38 -0000	1.3
@@ -1 +1 @@
-pip-0.4.tar.gz
+pip-0.6.1.tar.gz


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/python-pip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-pip.spec	26 Oct 2009 00:56:11 -0000	1.1
+++ python-pip.spec	18 Dec 2009 02:58:39 -0000	1.2
@@ -3,7 +3,7 @@
 %global srcname pip
 
 Name:           python-%{srcname}
-Version:        0.4
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 
@@ -49,3 +49,5 @@ pip is meant to improve on easy_install.
 %changelog
 * Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
 - Initial package
+* Mon Dec 17 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-1
+- upgrade to 0.6.1 of pip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 00:56:11 -0000	1.2
+++ sources	18 Dec 2009 02:58:39 -0000	1.3
@@ -1 +1 @@
-b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz
+7560e3055c66afb99ac4a7892389a237  pip-0.6.1.tar.gz



From hoangelos at fedoraproject.org  Fri Dec 18 03:00:24 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 03:00:24 +0000 (UTC)
Subject: rpms/python-pip/F-11 python-pip.spec,1.2,1.3
Message-ID: <20091218030024.9055211C0496@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17633

Modified Files:
	python-pip.spec 
Log Message:
Updating to 0.6.1


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/python-pip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-pip.spec	18 Dec 2009 02:58:39 -0000	1.2
+++ python-pip.spec	18 Dec 2009 03:00:24 -0000	1.3
@@ -47,7 +47,7 @@ pip is meant to improve on easy_install.
 %{python_sitelib}/pip*
 
 %changelog
-* Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
-- Initial package
 * Mon Dec 17 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-1
 - upgrade to 0.6.1 of pip
+* Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
+- Initial package



From hoangelos at fedoraproject.org  Fri Dec 18 03:06:49 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 03:06:49 +0000 (UTC)
Subject: rpms/python-pip/F-11 python-pip.spec,1.3,1.4
Message-ID: <20091218030649.BE7FC11C0092@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18769

Modified Files:
	python-pip.spec 
Log Message:
Updating to 0.6.1


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/python-pip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-pip.spec	18 Dec 2009 03:00:24 -0000	1.3
+++ python-pip.spec	18 Dec 2009 03:06:49 -0000	1.4
@@ -51,3 +51,4 @@ pip is meant to improve on easy_install.
 - upgrade to 0.6.1 of pip
 * Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
 - Initial package
+



From dmalcolm at fedoraproject.org  Fri Dec 18 03:20:51 2009
From: dmalcolm at fedoraproject.org (dmalcolm)
Date: Fri, 18 Dec 2009 03:20:51 +0000 (UTC)
Subject: rpms/python/devel disable-pymalloc-on-valgrind-py26.patch, NONE,
	1.1 python-2.6-update-bsddb3-4.8.patch, NONE,
	1.1 python-2.6.4-setup-db48.patch, NONE, 1.1 python.spec, 1.155, 1.156
Message-ID: <20091218032052.010E711C0092@cvs1.fedora.phx.redhat.com>

Author: dmalcolm

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21054

Modified Files:
	python.spec 
Added Files:
	disable-pymalloc-on-valgrind-py26.patch 
	python-2.6-update-bsddb3-4.8.patch 
	python-2.6.4-setup-db48.patch 
Log Message:
* Wed Dec 16 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-4
- automatically disable arena allocator when run under valgrind (upstream
issue 2422; patch 52)
- add patch from Josh Boyer containing diff against upstream PyBSDDB to make
the bsddb module compile against db-4.8 (patch 53, #544275); bump the necessary
version of db4-devel to 4.8
- patch setup.py so that it searches for db-4.8, and enable debug output for
said search; make Setup.dist use db-4.8 (patch 54)


disable-pymalloc-on-valgrind-py26.patch:
 Misc/NEWS          |    5 +++++
 Objects/obmalloc.c |   35 +++++++++++++++++++++++++++++++++++
 configure.in       |   13 +++++++++++++
 pyconfig.h.in      |    3 +++
 4 files changed, 56 insertions(+)

--- NEW FILE disable-pymalloc-on-valgrind-py26.patch ---
Index: configure.in
===================================================================
--- configure.in	(revision 61828)
+++ configure.in	(working copy)
@@ -2232,6 +2232,19 @@ then
 fi
 AC_MSG_RESULT($with_pymalloc)
 
+# Check for Valgrind support
+AC_MSG_CHECKING([for --with-valgrind])
+AC_ARG_WITH([valgrind],
+  AC_HELP_STRING([--with-valgrind], [Enable Valgrind support]),,
+  with_valgrind=no)
+AC_MSG_RESULT([$with_valgrind])
+if test "$with_valgrind" != no; then
+    AC_CHECK_HEADER([valgrind/valgrind.h],
+      [AC_DEFINE([WITH_VALGRIND], 1, [Define if you want pymalloc to be disabled when running under valgrind])],
+      [AC_MSG_ERROR([Valgrind support requested but headers not available])]
+    )
+fi
+
 # Check for --with-wctype-functions
 AC_MSG_CHECKING(for --with-wctype-functions)
 AC_ARG_WITH(wctype-functions, 
Index: Objects/obmalloc.c
===================================================================
--- Objects/obmalloc.c	(revision 61828)
+++ Objects/obmalloc.c	(working copy)
@@ -2,6 +2,21 @@
 
 #ifdef WITH_PYMALLOC
 
+#ifdef WITH_VALGRIND
+#include <valgrind/valgrind.h>
+
+/* If we're using GCC, use __builtin_expect() to reduce overhead of
+   the valgrind checks */
+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
+#  define UNLIKELY(value) __builtin_expect((value), 0)
+#else
+#  define UNLIKELY(value) (value)
+#endif
+
+/* -1 indicates that we haven't checked that we're running on valgrind yet. */
+static int running_on_valgrind = -1;
+#endif
+
 /* An object allocator for Python.
 
    Here is an introduction to the layers of the Python memory architecture,
@@ -726,6 +741,13 @@ PyObject_Malloc(size_t nbytes)
 	poolp next;
 	uint size;
 
+#ifdef WITH_VALGRIND
+	if (UNLIKELY(running_on_valgrind == -1))
+		running_on_valgrind = RUNNING_ON_VALGRIND;
+	if (UNLIKELY(running_on_valgrind))
+		goto redirect;
+#endif
+
 	/*
 	 * This implicitly redirects malloc(0).
 	 */
@@ -916,6 +938,11 @@ PyObject_Free(void *p)
 	if (p == NULL)	/* free(NULL) has no effect */
 		return;
 
+#ifdef WITH_VALGRIND
+	if (UNLIKELY(running_on_valgrind > 0))
+		goto redirect;
+#endif
+
 	pool = POOL_ADDR(p);
 	if (Py_ADDRESS_IN_RANGE(p, pool)) {
 		/* We allocated this address. */
@@ -1110,6 +1137,7 @@ PyObject_Free(void *p)
 		return;
 	}
 
+redirect:
 	/* We didn't allocate this address. */
 	free(p);
 }
@@ -1130,6 +1158,12 @@ PyObject_Realloc(void *p, size_t nbytes)
 	if (p == NULL)
 		return PyObject_Malloc(nbytes);
 
+#ifdef WITH_VALGRIND
+	/* Treat running_on_valgrind == -1 the same as 0 */
+	if (UNLIKELY(running_on_valgrind > 0))
+		goto redirect;
+#endif
+
 	pool = POOL_ADDR(p);
 	if (Py_ADDRESS_IN_RANGE(p, pool)) {
 		/* We're in charge of this block */
@@ -1157,6 +1191,7 @@ PyObject_Realloc(void *p, size_t nbytes)
 		}
 		return bp;
 	}
+ redirect:
 	/* We're not managing this block.  If nbytes <=
 	 * SMALL_REQUEST_THRESHOLD, it's tempting to try to take over this
 	 * block.  However, if we do, we need to copy the valid data from
Index: Misc/NEWS
===================================================================
--- Misc/NEWS	(revision 61828)
+++ Misc/NEWS	(working copy)
@@ -60,6 +60,11 @@ Core and builtins
 
 - Issue #2143: Fix embedded readline() hang on SSL socket EOF.
 
+- Issue #2422: When compiled with the ``--with-valgrind`` option, the
+  pymalloc allocator will be automatically disabled when running under
+  Valgrind.  This gives improved memory leak detection when running
+  under Valgrind, while taking advantage of pymalloc at other times.
+
 Library
 -------
 
Index: pyconfig.h.in
===================================================================
--- pyconfig.h.in	(revision 61828)
+++ pyconfig.h.in	(working copy)
@@ -958,6 +958,9 @@
 /* Define to profile with the Pentium timestamp counter */
 #undef WITH_TSC
 
+/* Define if you want pymalloc to be disabled when running under valgrind */
+#undef WITH_VALGRIND
+
 
  /* Define to 1 if your processor stores words with the most significant byte
     first (like Motorola and SPARC, unlike Intel and VAX). 

python-2.6-update-bsddb3-4.8.patch:
 Lib/bsddb/__init__.py                           |   14 
 Lib/bsddb/dbobj.py                              |   21 
 Lib/bsddb/dbtables.py                           |    9 
 Lib/bsddb/dbutils.py                            |    2 
 Lib/bsddb/test/test_all.py                      |   44 
 Lib/bsddb/test/test_associate.py                |   66 -
 Lib/bsddb/test/test_basics.py                   |  163 ++
 Lib/bsddb/test/test_compare.py                  |   22 
 Lib/bsddb/test/test_compat.py                   |    2 
 Lib/bsddb/test/test_dbenv.py                    |  148 ++
 Lib/bsddb/test/test_dbtables.py                 |   16 
 Lib/bsddb/test/test_distributed_transactions.py |    6 
 Lib/bsddb/test/test_early_close.py              |   13 
 Lib/bsddb/test/test_fileid.py                   |   63 +
 Lib/bsddb/test/test_lock.py                     |   15 
 Lib/bsddb/test/test_pickle.py                   |   12 
 Lib/bsddb/test/test_recno.py                    |    2 
 Lib/bsddb/test/test_replication.py              |   25 
 Lib/bsddb/test/test_sequence.py                 |    8 
 Lib/bsddb/test_support.py                       |   54 
 Modules/_bsddb.c                                | 1426 ++++++++++++++++++++----
 Modules/bsddb.h                                 |   13 
 22 files changed, 1815 insertions(+), 329 deletions(-)

--- NEW FILE python-2.6-update-bsddb3-4.8.patch ---
diff -Nupr Python-2.6.4.orig/Lib/bsddb/dbobj.py Python-2.6.4/Lib/bsddb/dbobj.py
--- Python-2.6.4.orig/Lib/bsddb/dbobj.py	2008-07-23 07:38:42.000000000 -0400
+++ Python-2.6.4/Lib/bsddb/dbobj.py	2009-12-04 07:36:00.000000000 -0500
@@ -110,15 +110,17 @@ class DBEnv:
     def log_stat(self, *args, **kwargs):
         return apply(self._cobj.log_stat, args, kwargs)
 
-    if db.version() >= (4,1):
-        def dbremove(self, *args, **kwargs):
-            return apply(self._cobj.dbremove, args, kwargs)
-        def dbrename(self, *args, **kwargs):
-            return apply(self._cobj.dbrename, args, kwargs)
-        def set_encrypt(self, *args, **kwargs):
-            return apply(self._cobj.set_encrypt, args, kwargs)
+    def dbremove(self, *args, **kwargs):
+        return apply(self._cobj.dbremove, args, kwargs)
+    def dbrename(self, *args, **kwargs):
+        return apply(self._cobj.dbrename, args, kwargs)
+    def set_encrypt(self, *args, **kwargs):
+        return apply(self._cobj.set_encrypt, args, kwargs)
 
     if db.version() >= (4,4):
+        def fileid_reset(self, *args, **kwargs):
+            return self._cobj.fileid_reset(*args, **kwargs)
+
         def lsn_reset(self, *args, **kwargs):
             return apply(self._cobj.lsn_reset, args, kwargs)
 
@@ -229,9 +231,8 @@ class DB(MutableMapping):
     def set_get_returns_none(self, *args, **kwargs):
         return apply(self._cobj.set_get_returns_none, args, kwargs)
 
-    if db.version() >= (4,1):
-        def set_encrypt(self, *args, **kwargs):
-            return apply(self._cobj.set_encrypt, args, kwargs)
+    def set_encrypt(self, *args, **kwargs):
+        return apply(self._cobj.set_encrypt, args, kwargs)
 
 
 class DBSequence:
diff -Nupr Python-2.6.4.orig/Lib/bsddb/dbtables.py Python-2.6.4/Lib/bsddb/dbtables.py
--- Python-2.6.4.orig/Lib/bsddb/dbtables.py	2008-08-31 10:00:51.000000000 -0400
+++ Python-2.6.4/Lib/bsddb/dbtables.py	2009-12-04 07:36:00.000000000 -0500
@@ -15,7 +15,7 @@
 # This provides a simple database table interface built on top of
 # the Python Berkeley DB 3 interface.
 #
-_cvsid = '$Id: dbtables.py 66088 2008-08-31 14:00:51Z jesus.cea $'
+_cvsid = '$Id: dbtables.py 58758 2007-11-01 21:15:36Z gregory.p.smith $'
 
 import re
 import sys
@@ -659,6 +659,13 @@ class bsdTableDB :
             a = atuple[1]
             b = btuple[1]
             if type(a) is type(b):
+
+                # Needed for python 3. "cmp" vanished in 3.0.1
+                def cmp(a, b) :
+                    if a==b : return 0
+                    if a<b : return -1
+                    return 1
+
                 if isinstance(a, PrefixCond) and isinstance(b, PrefixCond):
                     # longest prefix first
                     return cmp(len(b.prefix), len(a.prefix))
diff -Nupr Python-2.6.4.orig/Lib/bsddb/dbutils.py Python-2.6.4/Lib/bsddb/dbutils.py
--- Python-2.6.4.orig/Lib/bsddb/dbutils.py	2008-08-31 10:00:51.000000000 -0400
+++ Python-2.6.4/Lib/bsddb/dbutils.py	2009-12-04 07:36:00.000000000 -0500
@@ -61,7 +61,7 @@ def DeadlockWrap(function, *_args, **_kw
     """
     sleeptime = _deadlock_MinSleepTime
     max_retries = _kwargs.get('max_retries', -1)
-    if _kwargs.has_key('max_retries'):
+    if 'max_retries' in _kwargs:
         del _kwargs['max_retries']
     while True:
         try:
diff -Nupr Python-2.6.4.orig/Lib/bsddb/__init__.py Python-2.6.4/Lib/bsddb/__init__.py
--- Python-2.6.4.orig/Lib/bsddb/__init__.py	2008-09-05 14:33:51.000000000 -0400
+++ Python-2.6.4/Lib/bsddb/__init__.py	2009-12-04 07:36:00.000000000 -0500
@@ -33,7 +33,7 @@
 #----------------------------------------------------------------------
 
 
-"""Support for Berkeley DB 4.0 through 4.7 with a simple interface.
+"""Support for Berkeley DB 4.1 through 4.8 with a simple interface.
 
 For the full featured object oriented interface use the bsddb.db module
 instead.  It mirrors the Oracle Berkeley DB C API.
@@ -42,12 +42,6 @@ instead.  It mirrors the Oracle Berkeley
 import sys
 absolute_import = (sys.version_info[0] >= 3)
 
-if sys.py3kwarning:
-    import warnings
-    warnings.warnpy3k("in 3.x, bsddb has been removed; "
-                      "please use the pybsddb project instead",
-                      DeprecationWarning, 2)
-
 try:
     if __name__ == 'bsddb3':
         # import _pybsddb binary as it should be the more recent version from
@@ -442,8 +436,10 @@ def _checkflag(flag, file):
 # Berkeley DB was too.
 
 try:
-    import thread
-    del thread
+    # 2to3 automatically changes "import thread" to "import _thread"
+    import thread as T
+    del T
+
 except ImportError:
     db.DB_THREAD = 0
 
diff -Nupr Python-2.6.4.orig/Lib/bsddb/test/test_all.py Python-2.6.4/Lib/bsddb/test/test_all.py
--- Python-2.6.4.orig/Lib/bsddb/test/test_all.py	2008-09-03 18:07:11.000000000 -0400
+++ Python-2.6.4/Lib/bsddb/test/test_all.py	2009-12-04 07:36:00.000000000 -0500
@@ -203,6 +203,16 @@ if sys.version_info[0] >= 3 :
                 k = bytes(k, charset)
             return self._db.has_key(k, txn=txn)
 
+        def set_re_delim(self, c) :
+            if isinstance(c, str) :  # We can use a numeric value byte too
+                c = bytes(c, charset)
+            return self._db.set_re_delim(c)
+
+        def set_re_pad(self, c) :
+            if isinstance(c, str) :  # We can use a numeric value byte too
+               c = bytes(c, charset)
+            return self._db.set_re_pad(c)
+
         def put(self, key, value, txn=None, flags=0, dlen=-1, doff=-1) :
             if isinstance(key, str) :
                 key = bytes(key, charset)
@@ -221,6 +231,11 @@ if sys.version_info[0] >= 3 :
                 key = bytes(key, charset)
             return self._db.get_size(key)
 
+        def exists(self, key, *args, **kwargs) :
+            if isinstance(key, str) :
+                key = bytes(key, charset)
+            return self._db.exists(key, *args, **kwargs)
+
         def get(self, key, default="MagicCookie", txn=None, flags=0, dlen=-1, doff=-1) :
             if isinstance(key, str) :
                 key = bytes(key, charset)
@@ -288,13 +303,21 @@ if sys.version_info[0] >= 3 :
                         key = key.decode(charset)
                     data = data.decode(charset)
                     key = self._callback(key, data)
-                    if (key != bsddb._db.DB_DONOTINDEX) and isinstance(key,
-                            str) :
-                        key = bytes(key, charset)
+                    if (key != bsddb._db.DB_DONOTINDEX) :
+                        if isinstance(key, str) :
+                            key = bytes(key, charset)
+                        elif isinstance(key, list) :
+                            key2 = []
+                            for i in key :
+                                if isinstance(i, str) :
+                                    i = bytes(i, charset)
+                                key2.append(i)
+                            key = key2
                     return key
 
             return self._db.associate(secondarydb._db,
-                    associate_callback(callback).callback, flags=flags, txn=txn)
+                    associate_callback(callback).callback, flags=flags,
+                    txn=txn)
 
         def cursor(self, txn=None, flags=0) :
             return cursor_py3k(self._db, txn=txn, flags=flags)
@@ -310,6 +333,12 @@ if sys.version_info[0] >= 3 :
         def __getattr__(self, v) :
             return getattr(self._dbenv, v)
 
+        def get_data_dirs(self) :
+            # Have to use a list comprehension and not
+            # generators, because we are supporting Python 2.3.
+            return tuple(
+                [i.decode(charset) for i in self._dbenv.get_data_dirs()])
+
     class DBSequence_py3k(object) :
         def __init__(self, db, *args, **kwargs) :
             self._db=db
@@ -332,7 +361,10 @@ if sys.version_info[0] >= 3 :
 
     bsddb._db.DBEnv_orig = bsddb._db.DBEnv
     bsddb._db.DB_orig = bsddb._db.DB
-    bsddb._db.DBSequence_orig = bsddb._db.DBSequence
+    if bsddb.db.version() <= (4, 3) :
+        bsddb._db.DBSequence_orig = None
+    else :
+        bsddb._db.DBSequence_orig = bsddb._db.DBSequence
 
     def do_proxy_db_py3k(flag) :
         flag2 = do_proxy_db_py3k.flag
[...3047 lines suppressed...]
     ADD_INT(d, DB_DONOTINDEX);
 
-#if (DBVER >= 41)
-    _addIntToDict(d, "DB_INCOMPLETE", 0);
-#else
-    ADD_INT(d, DB_INCOMPLETE);
-#endif
     ADD_INT(d, DB_KEYEMPTY);
     ADD_INT(d, DB_KEYEXIST);
     ADD_INT(d, DB_LOCK_DEADLOCK);
@@ -7309,14 +8260,15 @@ PyMODINIT_FUNC  PyInit__bsddb(void)    /
     ADD_INT(d, DB_PANIC_ENVIRONMENT);
     ADD_INT(d, DB_NOPANIC);
 
-#if (DBVER >= 41)
     ADD_INT(d, DB_OVERWRITE);
-#endif
 
-#ifdef DB_REGISTER
+#if (DBVER >= 44)
     ADD_INT(d, DB_REGISTER);
 #endif
 
+    ADD_INT(d, DB_EID_INVALID);
+    ADD_INT(d, DB_EID_BROADCAST);
+
 #if (DBVER >= 42)
     ADD_INT(d, DB_TIME_NOTGRANTED);
     ADD_INT(d, DB_TXN_NOT_DURABLE);
@@ -7389,6 +8341,32 @@ PyMODINIT_FUNC  PyInit__bsddb(void)    /
 
     ADD_INT(d, DB_REP_MASTER);
     ADD_INT(d, DB_REP_CLIENT);
+
+    ADD_INT(d, DB_REP_PERMANENT);
+
+#if (DBVER >= 44)
+    ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
+    ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
+    ADD_INT(d, DB_REP_CONF_BULK);
+    ADD_INT(d, DB_REP_CONF_NOWAIT);
+    ADD_INT(d, DB_REP_ANYWHERE);
+    ADD_INT(d, DB_REP_REREQUEST);
+#endif
+
+#if (DBVER >= 42)
+    ADD_INT(d, DB_REP_NOBUFFER);
+#endif
+
+#if (DBVER >= 46)
+    ADD_INT(d, DB_REP_LEASE_EXPIRED);
+    ADD_INT(d, DB_IGNORE_LEASE);
+#endif
+
+#if (DBVER >= 47)
+    ADD_INT(d, DB_REP_CONF_LEASE);
+    ADD_INT(d, DB_REPMGR_CONF_2SITE_STRICT);
+#endif
+
 #if (DBVER >= 45)
     ADD_INT(d, DB_REP_ELECTION);
 
@@ -7400,6 +8378,11 @@ PyMODINIT_FUNC  PyInit__bsddb(void)    /
 #if (DBVER >= 46)
     ADD_INT(d, DB_REP_CHECKPOINT_DELAY);
     ADD_INT(d, DB_REP_FULL_ELECTION_TIMEOUT);
+    ADD_INT(d, DB_REP_LEASE_TIMEOUT);
+#endif
+#if (DBVER >= 47)
+    ADD_INT(d, DB_REP_HEARTBEAT_MONITOR);
+    ADD_INT(d, DB_REP_HEARTBEAT_SEND);
 #endif
 
 #if (DBVER >= 45)
@@ -7412,7 +8395,6 @@ PyMODINIT_FUNC  PyInit__bsddb(void)    /
     ADD_INT(d, DB_REPMGR_ACKS_QUORUM);
     ADD_INT(d, DB_REPMGR_CONNECTED);
     ADD_INT(d, DB_REPMGR_DISCONNECTED);
-    ADD_INT(d, DB_STAT_CLEAR);
     ADD_INT(d, DB_STAT_ALL);
 #endif
 
@@ -7428,12 +8410,16 @@ PyMODINIT_FUNC  PyInit__bsddb(void)    /
     ADD_INT(d, DB_DSYNC_LOG);
 #endif
 
-#if (DBVER >= 41)
     ADD_INT(d, DB_ENCRYPT_AES);
     ADD_INT(d, DB_AUTO_COMMIT);
-#else
-    /* allow Berkeley DB 4.1 aware apps to run on older versions */
-    _addIntToDict(d, "DB_AUTO_COMMIT", 0);
+    ADD_INT(d, DB_PRIORITY_VERY_LOW);
+    ADD_INT(d, DB_PRIORITY_LOW);
+    ADD_INT(d, DB_PRIORITY_DEFAULT);
+    ADD_INT(d, DB_PRIORITY_HIGH);
+    ADD_INT(d, DB_PRIORITY_VERY_HIGH);
+
+#if (DBVER >= 46)
+    ADD_INT(d, DB_PRIORITY_UNCHANGED);
 #endif
 
     ADD_INT(d, EINVAL);
@@ -7497,10 +8483,6 @@ PyMODINIT_FUNC  PyInit__bsddb(void)    /
     }
 #endif
 
-
-#if !INCOMPLETE_IS_WARNING
-    MAKE_EX(DBIncompleteError);
-#endif
     MAKE_EX(DBCursorClosedError);
     MAKE_EX(DBKeyEmptyError);
     MAKE_EX(DBKeyExistError);
@@ -7528,9 +8510,16 @@ PyMODINIT_FUNC  PyInit__bsddb(void)    /
 #if (DBVER >= 42)
     MAKE_EX(DBRepHandleDeadError);
 #endif
+#if (DBVER >= 44)
+    MAKE_EX(DBRepLockoutError);
+#endif
 
     MAKE_EX(DBRepUnavailError);
 
+#if (DBVER >= 46)
+    MAKE_EX(DBRepLeaseExpiredError);
+#endif
+
 #undef MAKE_EX
 
     /* Initiliase the C API structure and add it to the module */
@@ -7544,7 +8533,24 @@ PyMODINIT_FUNC  PyInit__bsddb(void)    /
 #endif
     bsddb_api.makeDBError     = makeDBError;
 
+    /*
+    ** Capsules exist from Python 3.1, but I
+    ** don't want to break the API compatibility
+    ** for already published Python versions.
+    */
+#if (PY_VERSION_HEX < 0x03020000)
     py_api = PyCObject_FromVoidPtr((void*)&bsddb_api, NULL);
+#else
+    {
+        char py_api_name[250];
+
+        strcpy(py_api_name, _bsddbModuleName);
+        strcat(py_api_name, ".api");
+
+        py_api = PyCapsule_New((void*)&bsddb_api, py_api_name, NULL);
+    }
+#endif
+
     PyDict_SetItemString(d, "api", py_api);
     Py_DECREF(py_api);
 
diff -Nupr Python-2.6.4.orig/Modules/bsddb.h Python-2.6.4/Modules/bsddb.h
--- Python-2.6.4.orig/Modules/bsddb.h	2008-09-28 19:24:19.000000000 -0400
+++ Python-2.6.4/Modules/bsddb.h	2009-12-04 07:34:56.000000000 -0500
@@ -105,7 +105,7 @@
 #error "eek! DBVER can't handle minor versions > 9"
 #endif
 
-#define PY_BSDDB_VERSION "4.7.3"
+#define PY_BSDDB_VERSION "4.8.1"
 
 /* Python object definitions */
 
@@ -220,6 +220,7 @@ typedef struct DBSequenceObject {
 /* To access the structure from an external module, use code like the
    following (error checking missed out for clarity):
 
+     // If you are using Python 3.2:
      BSDDB_api* bsddb_api;
      PyObject*  mod;
      PyObject*  cobj;
@@ -231,6 +232,15 @@ typedef struct DBSequenceObject {
      Py_DECREF(cobj);
      Py_DECREF(mod);
 
+
+     // If you are using Python 3.2 or up:
+     BSDDB_api* bsddb_api;
+
+     // Use "bsddb3._pybsddb.api" if you're using
+     // the standalone pybsddb add-on.
+     bsddb_api = (void **)PyCapsule_Import("bsddb._bsddb.api", 1);
+
+
    The structure's members must not be changed.
 */
 
@@ -247,7 +257,6 @@ typedef struct {
 
     /* Functions */
     int (*makeDBError)(int err);
-
 } BSDDB_api;
 
 

python-2.6.4-setup-db48.patch:
 Modules/Setup.dist |    2 +-
 setup.py           |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE python-2.6.4-setup-db48.patch ---
diff -up Python-2.6.4/Modules/Setup.dist.setup-db48 Python-2.6.4/Modules/Setup.dist
--- Python-2.6.4/Modules/Setup.dist.setup-db48	2009-12-17 22:05:07.000020150 -0500
+++ Python-2.6.4/Modules/Setup.dist	2009-12-17 22:05:12.545015367 -0500
@@ -411,7 +411,7 @@ gdbm gdbmmodule.c -lgdbm
 #
 # Edit the variables DB and DBLIBVERto point to the db top directory
 # and the subdirectory of PORT where you built it.
-DBLIBVER=4.7
+DBLIBVER=4.8
 DBINC=/usr/include/db4
 DBLIB=/usr/lib
 _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
diff -up Python-2.6.4/setup.py.setup-db48 Python-2.6.4/setup.py
--- Python-2.6.4/setup.py.setup-db48	2009-12-17 22:03:58.048015993 -0500
+++ Python-2.6.4/setup.py	2009-12-17 22:03:58.169016398 -0500
@@ -705,9 +705,9 @@ class PyBuildExt(build_ext):
         # a release.  Most open source OSes come with one or more
         # versions of BerkeleyDB already installed.
 
-        max_db_ver = (4, 7)
+        max_db_ver = (4, 8)
         min_db_ver = (3, 3)
-        db_setup_debug = False   # verbose debug prints from this script?
+        db_setup_debug = True   # verbose debug prints from this script?
 
         def allow_db_ver(db_ver):
             """Returns a boolean if the given BerkeleyDB version is acceptable.


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- python.spec	12 Nov 2009 19:36:14 -0000	1.155
+++ python.spec	18 Dec 2009 03:20:50 -0000	1.156
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -49,13 +49,24 @@ Patch16: python-2.6-rpath.patch
 # Fix distutils to follow the Fedora/RHEL/CentOS policies of having .pyo files
 Patch51: python-2.6-distutils_rpm.patch
 
+# Automatically disable arena allocator when run under valgrind:
+# From http://bugs.python.org/issue2422
+#   http://bugs.python.org/file9872/disable-pymalloc-on-valgrind-py26.patch
+# with the "configure" part removed; appears to be identical to the version committed to 2.7
+Patch52: disable-pymalloc-on-valgrind-py26.patch
+
+
+# Patch generated by jwboyer at gmail.com to compile against db-4.8, using upstream
+# http://www.jcea.es/programacion/pybsddb.htm
+# See https://bugzilla.redhat.com/show_bug.cgi?id=544275
+Patch53: python-2.6-update-bsddb3-4.8.patch
+# ...and a further patch to setup.py so that it searches for 4.8:
+Patch54: python-2.6.4-setup-db48.patch
+
 # upstreamed
 
 #Patch50: python-2.5-disable-egginfo.patch
 
-# new db version
-#Patch60: python-2.5.2-db47.patch
-
 # lib64 patches
 Patch101: python-2.3.4-lib64-regex.patch
 Patch102: python-2.6-lib64.patch
@@ -93,8 +104,9 @@ BuildRequires: libGL-devel tk tix gcc-c+
 BuildRequires: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
 BuildRequires: tix-devel bzip2-devel sqlite-devel
 BuildRequires: autoconf
-BuildRequires: db4-devel >= 4.7
+BuildRequires: db4-devel >= 4.8
 BuildRequires: libffi-devel
+BuildRequires: valgrind-devel
 
 URL: http://www.python.org/
 
@@ -211,7 +223,6 @@ code that uses more than just unittest a
 
 # Try not disabling egg-infos, bz#414711
 #patch50 -p1 -b .egginfo
-#%%patch60 -p1 -b .db47
 
 %if "%{_lib}" == "lib64"
 %patch101 -p1 -b .lib64-regex
@@ -227,6 +238,9 @@ code that uses more than just unittest a
 %patch16 -p1 -b .rpath
 
 %patch51 -p1 -b .brprpm
+%patch52 -p0 -b .valgrind
+%patch53 -p1 -b .db48
+%patch54 -p1 -b .setup-db48
 
 %ifarch alpha ia64
 # 64bit, but not lib64 arches need this too...
@@ -256,9 +270,9 @@ if pkg-config openssl ; then
 fi
 # Force CC
 export CC=gcc
-# For patch 4, need to get a newer configure generated out of configure.in
+# For patches 4 and 52, need to get a newer configure generated out of configure.in
 autoconf
-%configure --enable-ipv6 --enable-unicode=%{unicode} --enable-shared --with-system-ffi
+%configure --enable-ipv6 --enable-unicode=%{unicode} --enable-shared --with-system-ffi --with-valgrind
 
 make OPT="$CFLAGS" %{?_smp_mflags}
 LD_LIBRARY_PATH=$topdir $topdir/python Tools/scripts/pathfix.py -i "%{_bindir}/env python%{pybasever}" .
@@ -550,6 +564,15 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Wed Dec 16 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-4
+- automatically disable arena allocator when run under valgrind (upstream
+issue 2422; patch 52)
+- add patch from Josh Boyer containing diff against upstream PyBSDDB to make
+the bsddb module compile against db-4.8 (patch 53, #544275); bump the necessary
+version of db4-devel to 4.8
+- patch setup.py so that it searches for db-4.8, and enable debug output for
+said search; make Setup.dist use db-4.8 (patch 54)
+
 * Thu Nov 12 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-3
 - fixup the build when __python_ver is set (Zach Sadecki; bug 533989); use
 pybasever in the files section



From petersen at fedoraproject.org  Fri Dec 18 04:17:46 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 18 Dec 2009 04:17:46 +0000 (UTC)
Subject: rpms/m17n-db/devel m17n-db.spec,1.101,1.102
Message-ID: <20091218041746.913CF11C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/m17n-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19936

Modified Files:
	m17n-db.spec 
Log Message:
- add common-cjk option to mk_pkg for zh and ko
- use mk_pkg for zh, el, ka, ug dropping old obsoletes
- bring back ja-anthy and en-ispell
- cleanup trailing whitespace




Index: m17n-db.spec
===================================================================
RCS file: /cvs/extras/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- m17n-db.spec	29 Jul 2009 03:53:47 -0000	1.101
+++ m17n-db.spec	18 Dec 2009 04:17:45 -0000	1.102
@@ -1,7 +1,7 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.5.5
-Release:    1%{?dist}
+Release:    2%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
@@ -25,7 +25,7 @@ for many languages.
 %package datafiles
 Summary:  Multilingualization datafiles for m17n-lib
 Group:    System Environment/Libraries
-Requires: %{name} = %{version}-%{release} 
+Requires: %{name} = %{version}-%{release}
 
 %description datafiles
 m17n-db datafiles not needed for using the input maps.
@@ -44,67 +44,28 @@ m17n-db development files
 %package common-cjk
 Summary:  Common m17n-db files for CJK input
 Group:    System Environment/Libraries
-Requires: %{name} = %{version}-%{release} 
+Requires: %{name} = %{version}-%{release}
 
 %description common-cjk
 m17n-db common files for Chinese, Japanese and Korean input maps.
 
 
-%package chinese
-Summary:  Chinese m17n-db input maps
-Group:    System Environment/Libraries
-Requires: %{name}-common-cjk
-Obsoletes: %{name}-bopomofo < 1.3.3-13.fc6
-Obsoletes: ibus-m17n-chinese < 0.1.1.20081013-3
-
-%description chinese
-m17n-db Chinese input map.
-
-
 %package generic
 Summary:  Generic m17n-db input maps
 Group:    System Environment/Libraries
-Requires: %{name} = %{version}-%{release} 
+Requires: %{name} = %{version}-%{release}
 
 %description generic
 This package contains generic m17n-db input maps.
 
 
-%package greek
-Summary:  Greek m17n-db input maps
-Group:    System Environment/Libraries
-Requires: %{name} = %{version}-%{release} 
-Obsoletes: ibus-m17n-greek < 0.1.1.20081013-3
-
-%description greek
-m17n-db Greek input table.
-
-
-%package gregorian
-Summary:  Gregorian m17n-db input maps
-Group:    System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: m17n-db-georgian <= 1.4.0
-Obsoletes: ibus-m17n-gregorian < 0.1.1.20081013-3
-
-%description gregorian
-m17n-db Gregorian input table.
-
-%package uyghur
-Summary:  Uyghur m17n-db input maps
-Group:    System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: m17n-db-Uyghur <= 1.4.0
-Obsoletes: ibus-m17n-uyghur < 0.1.1.20081013-3
-
-%description uyghur
-m17n-db uyghur input table.
-
+# mk_pkg (name lang [icons] [cjk])
 %define mk_pkg() \
 %package %1\
 Summary:    m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
 Group:      System Environment/Libraries\
 Requires:   %{name} = %{version}-%{release}\
+%{?4:Requires: %{name}-common-cjk}\
 Obsoletes:  ibus-m17n-%1 < 0.1.1.20081013-3\
 \
 %description %1\
@@ -117,8 +78,9 @@ This package contains m17n-db input maps
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
 %{nil}\
-%endif\
+%endif
 
+# mk_pkg_uses_contrib (name lang [icons])
 %define mk_pkg_uses_contrib() \
 %package %1\
 Summary:    m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
@@ -137,7 +99,7 @@ This package contains m17n-db input maps
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
 %{nil}\
-%endif\
+%endif
 
 %mk_pkg amharic am 1
 %mk_pkg arabic ar 1
@@ -145,19 +107,24 @@ This package contains m17n-db input maps
 %mk_pkg_uses_contrib assamese as 1
 %mk_pkg_uses_contrib bengali bn 1
 %mk_pkg cham cmc 1
+%mk_pkg chinese zh 1 1
+%{_datadir}/m17n/icons/bopo-*.png
 %mk_pkg croatian hr 1
 %mk_pkg danish da 0
 %mk_pkg dhivehi dv 1
 %mk_pkg farsi fa 1
 %mk_pkg french fr 0
+%mk_pkg gregorian ka 1
+%mk_pkg greek el 1
+%{_datadir}/m17n/grc-*.mim
 %mk_pkg_uses_contrib gujarati gu 1
 %mk_pkg hebrew he 1
 %mk_pkg_uses_contrib hindi hi 1
 %mk_pkg japanese ja 1
 %mk_pkg_uses_contrib kannada kn 1
-%mk_pkg kazakh kk 1 
-%mk_pkg khmer km 1 
-%mk_pkg korean ko 1
+%mk_pkg kazakh kk 1
+%mk_pkg khmer km 1
+%mk_pkg korean ko 1 1
 %mk_pkg lao lo 1
 %mk_pkg latin latn 1
 %mk_pkg_uses_contrib malayalam ml 1
@@ -175,11 +142,12 @@ This package contains m17n-db input maps
 %mk_pkg_uses_contrib telugu te 1
 %mk_pkg thai th 1
 %mk_pkg tibetan bo 1
+%mk_pkg uyghur ug 0
 %mk_pkg_uses_contrib vietnamese vi 1
 
 
 %prep
-%setup -q 
+%setup -q
 pushd MIM
 %patch1 -p1 -b .1
 %patch2 -p0 -b .2
@@ -198,9 +166,6 @@ make
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# don't need ispell or anthy
-rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png}
-rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png}
 # don't ship unijoy map for now
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,icons/bn-unijoy.png}
 
@@ -244,36 +209,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_datadir}/m17n/cjk-*.mim
 
-%files chinese
-%defattr(-,root,root)
-%{_datadir}/m17n/zh-*.mim
-%{_datadir}/m17n/icons/zh-*.png
-%{_datadir}/m17n/icons/bopo-*.png
-
 %files generic
 %defattr(-,root,root)
+%{_datadir}/m17n/ispell.mim
+%{_datadir}/m17n/icons/en-ispell.png
 %{_datadir}/m17n/rfc1345.mim
 %{_datadir}/m17n/icons/rfc1345.png
 %{_datadir}/m17n/unicode.mim
 %{_datadir}/m17n/icons/unicode.png
 
-%files greek
-%defattr(-,root,root)
-%{_datadir}/m17n/el-*.mim
-%{_datadir}/m17n/grc-*.mim
-%{_datadir}/m17n/icons/el-*.png
-
-%files gregorian
-%defattr(-,root,root)
-%{_datadir}/m17n/ka*.mim
-%{_datadir}/m17n/icons/ka*.png
-
-%files uyghur
-%defattr(-,root,root)
-%dir %{_datadir}/m17n
-%{_datadir}/m17n/ug-*.mim
-
 %changelog
+* Fri Dec 18 2009 Jens Petersen <petersen at redhat.com> - 1.5.5-2
+- add common-cjk option to mk_pkg for zh and ko
+- use mk_pkg for zh, el, ka, ug
+- bring back ja-anthy and en-ispell
+- cleanup trailing whitespace
+
 * Wed Jul 29 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
 - update to new upstream release 1.5.5
 
@@ -326,12 +277,12 @@ rm -rf $RPM_BUILD_ROOT
 - Added Obsoletes to m17n-db-uyghur
 - Added Provides to m17n-db-gregorian, m17n-db-gregorian, m17n-db-chinese
 
-* Mon Aug 13 2007 Parag Nemade <pnemade at redhat.com> 
+* Mon Aug 13 2007 Parag Nemade <pnemade at redhat.com>
 - update License tag
 
 * Wed Jul 25 2007 Parag Nemade <pnemade at redhat.com> - 1.4.0-4
 - Added m17n-db as Requires for mk_pkg() macro generating packages.
-- Added m17b-db and m17n-contrib-lang as Requires 
+- Added m17b-db and m17n-contrib-lang as Requires
   for mk_pkg_uses_contrib() macro generating packages.
 
 * Wed Jul 25 2007 Jens Petersen <petersen at redhat.com> - 1.4.0-3
@@ -437,7 +388,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added 09CE mapped to z in as-inscript (213372)
 
 * Mon Nov 1 2006 Mayank Jain <majain at redhat.com>
-- Imported m17n-db-indic-0.4.29.tar.gz from RHEL-5 package, changes happened from .28 version are 
+- Imported m17n-db-indic-0.4.29.tar.gz from RHEL-5 package, changes happened from .28 version are
 - Added few more key combinations for ta-typewriter keymap - bug 209088
 - Added ZWJ for hi-inscript and hi-phonetic keymaps - bug 211576
 - Corrected kn-kgp and kn-inscript keymaps for keymapping of X - bug 209963



From tagoh at fedoraproject.org  Fri Dec 18 05:44:47 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 18 Dec 2009 05:44:47 +0000 (UTC)
Subject: rpms/uim/devel uim.spec,1.75,1.76 uim-1.4.2-emacs23.patch,1.1,NONE
Message-ID: <20091218054447.2345811C00E6@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3423

Modified Files:
	uim.spec 
Removed Files:
	uim-1.4.2-emacs23.patch 
Log Message:
* Fri Dec 18 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.7-1
- New upstream release.
  - Fix a crash in firefox. (#543813)
- uim-1.4.2-emacs23.patch: removed. it's not needed anymore.


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- uim.spec	31 Aug 2009 13:29:14 -0000	1.75
+++ uim.spec	18 Dec 2009 05:44:46 -0000	1.76
@@ -2,8 +2,8 @@
 %define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.5.6
-Release:	2%{?dist}
+Version:	1.5.7
+Release:	1%{?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+
@@ -27,7 +27,6 @@ BuildRequires:	emacs libtool automake au
 Source0:	http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
-Patch0:		uim-1.4.2-emacs23.patch
 
 
 Summary:	A multilingual input method library
@@ -212,7 +211,6 @@ many languages using the input table map
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .emacs23
 
 
 %build
@@ -277,6 +275,7 @@ ln -sf %{_localstatedir}/lib/uim/loader.
 # https://fedoraproject.org/wiki/packagingDrafts/UsingAlternatives
 touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinputrc
 %find_lang %{name}
+%find_lang %{name}-chardict-qt
 
 find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
@@ -441,7 +440,7 @@ fi
 %doc AUTHORS COPYING ChangeLog* NEWS README
 %{_libdir}/qt-3.*/plugins/inputmethods
 
-%files qt-common
+%files qt-common -f %{name}-chardict-qt.lang
 %defattr (-, root, root, -)
 %doc AUTHORS COPYING ChangeLog* NEWS README
 # BSD and LGPLv2+
@@ -513,6 +512,11 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Dec 18 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.7-1
+- New upstream release.
+  - Fix a crash in firefox. (#543813)
+- uim-1.4.2-emacs23.patch: removed. it's not needed anymore.
+
 * Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.6-2
 - F-12: Rebuild against new eb
 


--- uim-1.4.2-emacs23.patch DELETED ---



From tagoh at fedoraproject.org  Fri Dec 18 05:47:31 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 18 Dec 2009 05:47:31 +0000 (UTC)
Subject: File uim-1.5.7.tar.bz2 uploaded to lookaside cache by tagoh
Message-ID: <20091218054731.5CC6E28EDBA@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for uim:

b84a43fb92d7ceb4bd801a76120c2a71  uim-1.5.7.tar.bz2



From tagoh at fedoraproject.org  Fri Dec 18 05:47:56 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 18 Dec 2009 05:47:56 +0000 (UTC)
Subject: rpms/uim/devel .cvsignore,1.25,1.26 sources,1.24,1.25
Message-ID: <20091218054756.D707611C00E6@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4041

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	14 Aug 2009 08:48:45 -0000	1.25
+++ .cvsignore	18 Dec 2009 05:47:56 -0000	1.26
@@ -25,3 +25,4 @@ uim-1.5.2.tar.bz2
 uim-1.5.3.tar.bz2
 uim-1.5.5.tar.bz2
 uim-1.5.6.tar.bz2
+uim-1.5.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Aug 2009 08:48:45 -0000	1.24
+++ sources	18 Dec 2009 05:47:56 -0000	1.25
@@ -1 +1 @@
-2bd5a9095d6354a2a23c908b0d6e7861  uim-1.5.6.tar.bz2
+b84a43fb92d7ceb4bd801a76120c2a71  uim-1.5.7.tar.bz2



From tagoh at fedoraproject.org  Fri Dec 18 06:15:33 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 18 Dec 2009 06:15:33 +0000 (UTC)
Subject: rpms/uim/F-12 .cvsignore, 1.25, 1.26 sources, 1.24, 1.25 uim.spec, 
	1.75, 1.76 uim-1.4.2-emacs23.patch, 1.1, NONE
Message-ID: <20091218061533.C8AC111C00E6@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8475

Modified Files:
	.cvsignore sources uim.spec 
Removed Files:
	uim-1.4.2-emacs23.patch 
Log Message:
* Fri Dec 18 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.7-1
- New upstream release.
  - Fix a crash in firefox. (#543813)
- uim-1.4.2-emacs23.patch: removed. it's not needed anymore.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	14 Aug 2009 08:48:45 -0000	1.25
+++ .cvsignore	18 Dec 2009 06:15:32 -0000	1.26
@@ -25,3 +25,4 @@ uim-1.5.2.tar.bz2
 uim-1.5.3.tar.bz2
 uim-1.5.5.tar.bz2
 uim-1.5.6.tar.bz2
+uim-1.5.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Aug 2009 08:48:45 -0000	1.24
+++ sources	18 Dec 2009 06:15:32 -0000	1.25
@@ -1 +1 @@
-2bd5a9095d6354a2a23c908b0d6e7861  uim-1.5.6.tar.bz2
+b84a43fb92d7ceb4bd801a76120c2a71  uim-1.5.7.tar.bz2


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-12/uim.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- uim.spec	31 Aug 2009 13:29:14 -0000	1.75
+++ uim.spec	18 Dec 2009 06:15:32 -0000	1.76
@@ -2,8 +2,8 @@
 %define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.5.6
-Release:	2%{?dist}
+Version:	1.5.7
+Release:	1%{?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+
@@ -27,7 +27,6 @@ BuildRequires:	emacs libtool automake au
 Source0:	http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
-Patch0:		uim-1.4.2-emacs23.patch
 
 
 Summary:	A multilingual input method library
@@ -212,7 +211,6 @@ many languages using the input table map
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .emacs23
 
 
 %build
@@ -277,6 +275,7 @@ ln -sf %{_localstatedir}/lib/uim/loader.
 # https://fedoraproject.org/wiki/packagingDrafts/UsingAlternatives
 touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinputrc
 %find_lang %{name}
+%find_lang %{name}-chardict-qt
 
 find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
@@ -441,7 +440,7 @@ fi
 %doc AUTHORS COPYING ChangeLog* NEWS README
 %{_libdir}/qt-3.*/plugins/inputmethods
 
-%files qt-common
+%files qt-common -f %{name}-chardict-qt.lang
 %defattr (-, root, root, -)
 %doc AUTHORS COPYING ChangeLog* NEWS README
 # BSD and LGPLv2+
@@ -513,6 +512,11 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Dec 18 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.7-1
+- New upstream release.
+  - Fix a crash in firefox. (#543813)
+- uim-1.4.2-emacs23.patch: removed. it's not needed anymore.
+
 * Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.6-2
 - F-12: Rebuild against new eb
 


--- uim-1.4.2-emacs23.patch DELETED ---



From tagoh at fedoraproject.org  Fri Dec 18 06:43:39 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 18 Dec 2009 06:43:39 +0000 (UTC)
Subject: rpms/uim/F-11 .cvsignore, 1.25, 1.26 sources, 1.24, 1.25 uim.spec, 
	1.73, 1.74 uim-1.4.2-emacs23.patch, 1.1, NONE
Message-ID: <20091218064339.7103711C00E6@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13161

Modified Files:
	.cvsignore sources uim.spec 
Removed Files:
	uim-1.4.2-emacs23.patch 
Log Message:
* Fri Dec 18 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.7-1
- New upstream release.
  - Fix a crash in firefox. (#543813)
- uim-1.4.2-emacs23.patch: removed. it's not needed anymore.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	19 Aug 2009 11:37:43 -0000	1.25
+++ .cvsignore	18 Dec 2009 06:43:38 -0000	1.26
@@ -25,3 +25,4 @@ uim-1.5.2.tar.bz2
 uim-1.5.3.tar.bz2
 uim-1.5.5.tar.bz2
 uim-1.5.6.tar.bz2
+uim-1.5.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	19 Aug 2009 11:37:43 -0000	1.24
+++ sources	18 Dec 2009 06:43:38 -0000	1.25
@@ -1 +1 @@
-2bd5a9095d6354a2a23c908b0d6e7861  uim-1.5.6.tar.bz2
+b84a43fb92d7ceb4bd801a76120c2a71  uim-1.5.7.tar.bz2


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-11/uim.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- uim.spec	19 Aug 2009 11:37:43 -0000	1.73
+++ uim.spec	18 Dec 2009 06:43:38 -0000	1.74
@@ -2,7 +2,7 @@
 %define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.5.6
+Version:	1.5.7
 Release:	1%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
@@ -27,7 +27,6 @@ BuildRequires:	emacs libtool automake au
 Source0:	http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
-Patch0:		uim-1.4.2-emacs23.patch
 
 
 Summary:	A multilingual input method library
@@ -212,7 +211,6 @@ many languages using the input table map
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .emacs23
 
 
 %build
@@ -277,6 +275,7 @@ ln -sf %{_localstatedir}/lib/uim/loader.
 # https://fedoraproject.org/wiki/packagingDrafts/UsingAlternatives
 touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinputrc
 %find_lang %{name}
+%find_lang %{name}-chardict-qt
 
 find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
@@ -441,7 +440,7 @@ fi
 %doc AUTHORS COPYING ChangeLog* NEWS README
 %{_libdir}/qt-3.*/plugins/inputmethods
 
-%files qt-common
+%files qt-common -f %{name}-chardict-qt.lang
 %defattr (-, root, root, -)
 %doc AUTHORS COPYING ChangeLog* NEWS README
 # BSD and LGPLv2+
@@ -513,6 +512,14 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Dec 18 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.7-1
+- New upstream release.
+  - Fix a crash in firefox. (#543813)
+- uim-1.4.2-emacs23.patch: removed. it's not needed anymore.
+
+* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.6-2
+- F-12: Rebuild against new eb
+
 * Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.6-1
 - New upstream release.
 - Remove patches because it has been applied in this release.


--- uim-1.4.2-emacs23.patch DELETED ---



From whot at fedoraproject.org  Fri Dec 18 07:29:01 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 18 Dec 2009 07:29:01 +0000 (UTC)
Subject: rpms/xkeyboard-config/F-12
	0001-added-Backspace-mapping-to-Sun-kbds.patch, NONE,
	1.1 xkeyboard-config.spec, 1.42, 1.43
Message-ID: <20091218072901.CDC6F11C00E6@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21152

Modified Files:
	xkeyboard-config.spec 
Added Files:
	0001-added-Backspace-mapping-to-Sun-kbds.patch 
Log Message:
* Fri Dec 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.7-2
- Add backspace mapping to sun keyboard model (#527983)


0001-added-Backspace-mapping-to-Sun-kbds.patch:
 us |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0001-added-Backspace-mapping-to-Sun-kbds.patch ---
>From c954ef1dac2e1614572e3db02de07ebf0e974a95 Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Tue, 20 Oct 2009 12:47:45 +0100
Subject: [PATCH] added Backspace mapping to Sun kbds

https://bugs.freedesktop.org/show_bug.cgi?id=24554
---
 symbols/sun_vndr/us |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us
index 41670f0..23fa50a 100644
--- a/symbols/sun_vndr/us
+++ b/symbols/sun_vndr/us
@@ -89,6 +89,8 @@ xkb_symbols "sunbasic" {
     key <NMLK> { [ Num_Lock, Pointer_EnableKeys	] };
     key <SPCE> { [ space                        ] };
 
+    key <BKSP> {         [       BackSpace ] };
+
     // By default, we use the same symbols as other XKB implementations
     // for greater compatibility & AccessX MouseKeys support, but it is 
     // different than the traditional Sun key mappings that date back to the
-- 
1.6.5.2



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-12/xkeyboard-config.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xkeyboard-config.spec	30 Nov 2009 22:44:38 -0000	1.42
+++ xkeyboard-config.spec	18 Dec 2009 07:29:00 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -12,6 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 
+Patch01: 0001-added-Backspace-mapping-to-Sun-kbds.patch
+
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -52,7 +54,7 @@ fi
 git add .
 git commit -a -q -m "%{version} baseline."
 
-#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
+git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
 
 %build
 %configure \
@@ -92,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Fri Dec 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.7-2
+- Add backspace mapping to sun keyboard model (#527983)
+
 * Tue Dec 01 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.7-1
 - xkeyboard-config 1.7
 - drop patches already upstream



From cdamian at fedoraproject.org  Fri Dec 18 07:36:33 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Fri, 18 Dec 2009 07:36:33 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/F-12 php-phpunit-File-Iterator.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091218073633.7231611C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22604

Modified Files:
	php-phpunit-File-Iterator.spec sources 
Log Message:
upstream 1.1.1


Index: php-phpunit-File-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-12/php-phpunit-File-Iterator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-File-Iterator.spec	3 Dec 2009 07:30:43 -0000	1.1
+++ php-phpunit-File-Iterator.spec	18 Dec 2009 07:36:33 -0000	1.2
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-File-Iterator
-Version:        1.1.0
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        2%{?dist}
 Summary:        FilterIterator implementation that filters files based on a list of suffixes
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.7.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
-Requires:       php-common >= 5.2.0
+Requires:       php-common >= 5.1.4
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -75,6 +75,12 @@ fi
 %{pear_phpdir}/File
 
 %changelog
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-2
+- version 1.1.1 lowered the php requirement
+
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-1
+- upstream 1.1.1
+
 * Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4
 - own pear directories
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Dec 2009 07:30:44 -0000	1.2
+++ sources	18 Dec 2009 07:36:33 -0000	1.3
@@ -1 +1 @@
-8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz
+b161a25641bbfde84227fd3b951742d7  File_Iterator-1.1.1.tgz



From cdamian at fedoraproject.org  Fri Dec 18 07:44:16 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Fri, 18 Dec 2009 07:44:16 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/EL-5 .cvsignore, 1.2,
	1.3 php-phpunit-File-Iterator.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091218074416.0A8FF11C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24180

Modified Files:
	.cvsignore php-phpunit-File-Iterator.spec sources 
Log Message:
upstream 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Dec 2009 07:26:04 -0000	1.2
+++ .cvsignore	18 Dec 2009 07:44:15 -0000	1.3
@@ -1 +1 @@
-File_Iterator-1.1.0.tgz
+File_Iterator-1.1.1.tgz


Index: php-phpunit-File-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5/php-phpunit-File-Iterator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-phpunit-File-Iterator.spec	3 Dec 2009 18:09:18 -0000	1.2
+++ php-phpunit-File-Iterator.spec	18 Dec 2009 07:44:15 -0000	1.3
@@ -75,6 +75,12 @@ fi
 %{pear_phpdir}/File
 
 %changelog
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-2
+- version 1.1.1 lowered the php requirement
+
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-1
+- upstream 1.1.1
+
 * Thu Dec 3 2009 Christof Damian <christof at damian.net> 1.1.0-5
 - allow older pear version, works for the install anyway
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Dec 2009 07:26:04 -0000	1.2
+++ sources	18 Dec 2009 07:44:15 -0000	1.3
@@ -1 +1 @@
-8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz
+b161a25641bbfde84227fd3b951742d7  File_Iterator-1.1.1.tgz



From cdamian at fedoraproject.org  Fri Dec 18 07:44:18 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Fri, 18 Dec 2009 07:44:18 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/F-11 .cvsignore, 1.2,
	1.3 php-phpunit-File-Iterator.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091218074418.4D63511C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24196

Modified Files:
	.cvsignore php-phpunit-File-Iterator.spec sources 
Log Message:
upstream 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Dec 2009 07:29:04 -0000	1.2
+++ .cvsignore	18 Dec 2009 07:44:18 -0000	1.3
@@ -1 +1 @@
-File_Iterator-1.1.0.tgz
+File_Iterator-1.1.1.tgz


Index: php-phpunit-File-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-11/php-phpunit-File-Iterator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-File-Iterator.spec	3 Dec 2009 07:29:04 -0000	1.1
+++ php-phpunit-File-Iterator.spec	18 Dec 2009 07:44:18 -0000	1.2
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-File-Iterator
-Version:        1.1.0
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        2%{?dist}
 Summary:        FilterIterator implementation that filters files based on a list of suffixes
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.7.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
-Requires:       php-common >= 5.2.0
+Requires:       php-common >= 5.1.4
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -75,6 +75,12 @@ fi
 %{pear_phpdir}/File
 
 %changelog
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-2
+- version 1.1.1 lowered the php requirement
+
+* Thu Dec 17 2009 Christof Damian <christof at damian.net> 1.1.1-1
+- upstream 1.1.1
+
 * Mon Nov 30 2009 Christof Damian <christof at damian.net> 1.1.0-4
 - own pear directories
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Dec 2009 07:29:04 -0000	1.2
+++ sources	18 Dec 2009 07:44:18 -0000	1.3
@@ -1 +1 @@
-8bd52abf03f3c8f86d296b4ee5d3d39d  File_Iterator-1.1.0.tgz
+b161a25641bbfde84227fd3b951742d7  File_Iterator-1.1.1.tgz



From cdamian at fedoraproject.org  Fri Dec 18 07:46:26 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Fri, 18 Dec 2009 07:46:26 +0000 (UTC)
Subject: rpms/php-phpunit-File-Iterator/EL-5 php-phpunit-File-Iterator.spec, 
	1.3, 1.4
Message-ID: <20091218074626.8604011C00E6@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24814

Modified Files:
	php-phpunit-File-Iterator.spec 
Log Message:
upstream 1.1.1


Index: php-phpunit-File-Iterator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-File-Iterator/EL-5/php-phpunit-File-Iterator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-phpunit-File-Iterator.spec	18 Dec 2009 07:44:15 -0000	1.3
+++ php-phpunit-File-Iterator.spec	18 Dec 2009 07:46:26 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-File-Iterator
-Version:        1.1.0
-Release:        5%{?dist}
+Version:        1.1.1
+Release:        2%{?dist}
 Summary:        FilterIterator implementation that filters files based on a list of suffixes
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9
 BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
-Requires:       php-common >= 5.2.0
+Requires:       php-common >= 5.1.4
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 



From varekova at fedoraproject.org  Fri Dec 18 08:00:20 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 18 Dec 2009 08:00:20 +0000 (UTC)
Subject: rpms/mailx/devel mailx.spec,1.36,1.37
Message-ID: <20091218080020.BD7CE11C0374@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/mailx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27589

Modified Files:
	mailx.spec 
Log Message:
- fix license tag



Index: mailx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- mailx.spec	12 Dec 2009 12:11:52 -0000	1.36
+++ mailx.spec	18 Dec 2009 08:00:20 -0000	1.37
@@ -4,9 +4,11 @@
 Summary: Enhanced implementation of the mailx command
 Name: mailx
 Version: 12.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: 	Applications/Internet
-License: BSD with advertising
+# mailx-12.4/nsserr.c, mailx-12.4/nss.c  have MPLv1.1 license 
+# other files are BSD 
+License: BSD with advertising and MPLv1.1
 URL: http://heirloom.sourceforge.net/mailx.html
 Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -132,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12.4-5
+- fix license tag
+
 * Sat Dec 12 2009 Robert Scheck <robert at fedoraproject.org> - 12.4-4
 - Make OpenSSL support working again if NSS flag is disabled
 



From pbrobinson at fedoraproject.org  Fri Dec 18 08:46:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 08:46:02 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel sugar-toolkit.spec,1.60,1.61
Message-ID: <20091218084602.61B0111C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3905

Modified Files:
	sugar-toolkit.spec 
Log Message:
- Remove libtool archives


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sugar-toolkit.spec	1 Dec 2009 14:22:33 -0000	1.60
+++ sugar-toolkit.spec	18 Dec 2009 08:46:02 -0000	1.61
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.87.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -53,10 +53,15 @@ make
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-%find_lang %name
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ 	 
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.sugar
 
+%find_lang %name
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
 %clean
 rm -rf %{buildroot}
 
@@ -68,6 +73,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.87.1-2
+- Remove libtool archives
+
 * Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
 - New upstream release
 



From ovasik at fedoraproject.org  Fri Dec 18 09:01:08 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Dec 2009 09:01:08 +0000 (UTC)
Subject: rpms/linuxdoc-tools/devel linuxdoc-tools.spec,1.38,1.39
Message-ID: <20091218090108.90B9511C0374@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/linuxdoc-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6840

Modified Files:
	linuxdoc-tools.spec 
Log Message:
License Copyright only


Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- linuxdoc-tools.spec	12 Nov 2009 11:16:25 -0000	1.38
+++ linuxdoc-tools.spec	18 Dec 2009 09:01:08 -0000	1.39
@@ -3,8 +3,8 @@
 Summary: A text formatting package based on SGML
 Name: linuxdoc-tools
 Version: 0.9.66
-Release: 1%{?dist}
-License: Freely redistributable without restriction
+Release: 2%{?dist}
+License: Copyright only
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
 Patch0: linuxdoc-tools-0.9.13-letter.patch
@@ -96,6 +96,9 @@ exit 0
 %{_mandir}/*/*
 
 %changelog
+* Fri Dec 18 2009 Ondrej Vasik <ovasik at redhat.com> 0.9.66-2
+- License Copyright only
+
 * Thu Nov 12 2009 Ondrej Vasik <ovasik at redhat.com> 0.9.66-1
 - new upstream version 0.9.66
 



From ovasik at fedoraproject.org  Fri Dec 18 09:07:20 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Dec 2009 09:07:20 +0000 (UTC)
Subject: rpms/linuxdoc-tools/devel linuxdoc-tools.spec,1.39,1.40
Message-ID: <20091218090720.1729F11C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/linuxdoc-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7910

Modified Files:
	linuxdoc-tools.spec 
Log Message:
do not obsolete self


Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- linuxdoc-tools.spec	18 Dec 2009 09:01:08 -0000	1.39
+++ linuxdoc-tools.spec	18 Dec 2009 09:07:19 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: A text formatting package based on SGML
 Name: linuxdoc-tools
 Version: 0.9.66
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Copyright only
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
@@ -17,10 +17,10 @@ Requires: jade gawk groff
 %if %{tetex}
 Requires: tex(latex)
 %endif
-Obsoletes: sgml-tools <= %{version}
-Obsoletes: linuxdoc-sgml <= %{version}
-Provides: sgml-tools = %{version}
-Provides: linuxdoc-sgml = %{version}
+Obsoletes: sgml-tools < %{version}-%{release}
+Obsoletes: linuxdoc-sgml < %{version}-%{release}
+Provides: sgml-tools = %{version}-%{release}
+Provides: linuxdoc-sgml = %{version}-%{release}
 
 %description
 Linuxdoc-tools is a text formatting suite based on SGML (Standard
@@ -96,6 +96,9 @@ exit 0
 %{_mandir}/*/*
 
 %changelog
+* Fri Dec 18 2009 Ondrej Vasik <ovasik at redhat.com> 0.9.66-3
+- do not obsolete self
+
 * Fri Dec 18 2009 Ondrej Vasik <ovasik at redhat.com> 0.9.66-2
 - License Copyright only
 



From iarnell at fedoraproject.org  Fri Dec 18 09:10:00 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 18 Dec 2009 09:10:00 +0000 (UTC)
Subject: File Catalyst-Controller-HTML-FormFu-0.06001.tar.gz uploaded to
	lookaside cache by iarnell
Message-ID: <20091218091000.A11EB28ECE4@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-Catalyst-Controller-HTML-FormFu:

7905bc317fe2bcd749074beb824e03f3  Catalyst-Controller-HTML-FormFu-0.06001.tar.gz



From iarnell at fedoraproject.org  Fri Dec 18 09:11:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 18 Dec 2009 09:11:11 +0000 (UTC)
Subject: rpms/perl-Catalyst-Controller-HTML-FormFu/devel .cvsignore, 1.6,
	1.7 perl-Catalyst-Controller-HTML-FormFu.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20091218091111.AB51811C0374@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8653

Modified Files:
	.cvsignore perl-Catalyst-Controller-HTML-FormFu.spec sources 
Log Message:
* Fri Dec 18 2009 Iain Arnell <iarnell at gmail.com> 0.06001-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Dec 2009 04:23:49 -0000	1.6
+++ .cvsignore	18 Dec 2009 09:11:11 -0000	1.7
@@ -1 +1 @@
-Catalyst-Controller-HTML-FormFu-0.06000.tar.gz
+Catalyst-Controller-HTML-FormFu-0.06001.tar.gz


Index: perl-Catalyst-Controller-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/perl-Catalyst-Controller-HTML-FormFu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Catalyst-Controller-HTML-FormFu.spec	9 Dec 2009 04:23:49 -0000	1.8
+++ perl-Catalyst-Controller-HTML-FormFu.spec	18 Dec 2009 09:11:11 -0000	1.9
@@ -1,11 +1,11 @@
 Name:           perl-Catalyst-Controller-HTML-FormFu
-Version:        0.06000
+Version:        0.06001
 Release:        1%{?dist}
 Summary:        HTML::FormFu controller for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Controller-HTML-FormFu/
-Source0:        http://www.cpan.org/modules/by-module/Catalyst/Catalyst-Controller-HTML-FormFu-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Catalyst-Controller-HTML-FormFu-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Catalyst::Action::RenderView)
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec 18 2009 Iain Arnell <iarnell at gmail.com> 0.06001-1
+- update to latest upstream version
+
 * Wed Dec 09 2009 Iain Arnell <iarnell at gmail.com> 0.06000-1
 - update to latest upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Dec 2009 04:23:49 -0000	1.6
+++ sources	18 Dec 2009 09:11:11 -0000	1.7
@@ -1 +1 @@
-bc8453285e9710101e3108c47d2d3ee5  Catalyst-Controller-HTML-FormFu-0.06000.tar.gz
+7905bc317fe2bcd749074beb824e03f3  Catalyst-Controller-HTML-FormFu-0.06001.tar.gz



From madko at fedoraproject.org  Fri Dec 18 09:14:10 2009
From: madko at fedoraproject.org (madko)
Date: Fri, 18 Dec 2009 09:14:10 +0000 (UTC)
Subject: rpms/purple-msn-pecan/F-12
	purple-msn-pecan-handle_malformed_data.patch, 1.1,
	1.2 purple-msn-pecan.spec, 1.7, 1.8
Message-ID: <20091218091410.D442211C00E6@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9242

Modified Files:
	purple-msn-pecan-handle_malformed_data.patch 
	purple-msn-pecan.spec 
Log Message:
Previously included patch was incomplete


purple-msn-pecan-handle_malformed_data.patch:
 pn_oim.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: purple-msn-pecan-handle_malformed_data.patch
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-12/purple-msn-pecan-handle_malformed_data.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- purple-msn-pecan-handle_malformed_data.patch	14 Dec 2009 16:19:32 -0000	1.1
+++ purple-msn-pecan-handle_malformed_data.patch	18 Dec 2009 09:14:10 -0000	1.2
@@ -1,10 +1,11 @@
 diff -Naur msn-pecan-0.1.0-rc1.orig/pn_oim.c msn-pecan-0.1.0-rc1/pn_oim.c
 --- msn-pecan-0.1.0-rc1.orig/pn_oim.c	2009-07-19 13:10:53.000000000 +0200
-+++ msn-pecan-0.1.0-rc1/pn_oim.c	2009-12-14 15:29:24.000000000 +0100
-@@ -466,6 +466,8 @@
++++ msn-pecan-0.1.0-rc1/pn_oim.c	2009-12-18 10:11:11.000000000 +0100
+@@ -465,7 +465,8 @@
+         gchar *end;
          cur += 2;
          end = strstr (cur, "\r\n\r\n");
-         *end = '\0';
+-        *end = '\0';
 +	if (end)
 +		*end = '\0';
          message = (gchar *) purple_base64_decode (cur, NULL);


Index: purple-msn-pecan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-12/purple-msn-pecan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- purple-msn-pecan.spec	14 Dec 2009 16:19:32 -0000	1.7
+++ purple-msn-pecan.spec	18 Dec 2009 09:14:10 -0000	1.8
@@ -1,7 +1,7 @@
 %define		realname msn-pecan
 Name:		purple-%{realname}
 Version:	0.1.0
-Release:	0.2.rc1%{?dist}
+Release:	0.3.rc1%{?dist}
 Summary:	Alternative MSN protocol plugin for libpurple 
 
 Group:		Applications/Internet 
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.3.rc1
+- patch to handle malformed data was not complete (bz #547836)
+
 * Mon Dec 14 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.2.rc1
 - Add Simone Contini's patch to handle malformed data in process_body_receive (bz #547078)
 



From pbrobinson at fedoraproject.org  Fri Dec 18 09:16:18 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 09:16:18 +0000 (UTC)
Subject: rpms/sugar-datastore/devel sugar-datastore.spec,1.24,1.25
Message-ID: <20091218091618.4E2F111C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9696

Modified Files:
	sugar-datastore.spec 
Log Message:
- Remove libtool archives


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sugar-datastore.spec	1 Dec 2009 21:27:46 -0000	1.24
+++ sugar-datastore.spec	18 Dec 2009 09:16:18 -0000	1.25
@@ -5,7 +5,7 @@
 
 Name: sugar-datastore
 Version: 0.87.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
 Summary: Sugar Datastore
@@ -44,6 +44,9 @@ make
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#Remove libtool archives.
+rm $RPM_BUILD_ROOT%{python_sitelib}/carquinyol/metadatareader.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -55,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.87.1-2
+- Remove libtool archives
+
 * Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
 - New upstream release
 



From iarnell at fedoraproject.org  Fri Dec 18 09:16:31 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 18 Dec 2009 09:16:31 +0000 (UTC)
Subject: File Lingua-Flags-0.07.tar.gz uploaded to lookaside cache by iarnell
Message-ID: <20091218091631.D643628ED93@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for perl-Lingua-Flags:

578db1b27d3d1b76c79c1aefbc4018e8  Lingua-Flags-0.07.tar.gz



From iarnell at fedoraproject.org  Fri Dec 18 09:17:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 18 Dec 2009 09:17:10 +0000 (UTC)
Subject: rpms/perl-Lingua-Flags/devel .cvsignore, 1.2,
	1.3 perl-Lingua-Flags.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091218091710.429DA11C00E6@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Lingua-Flags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10076

Modified Files:
	.cvsignore perl-Lingua-Flags.spec sources 
Log Message:
* Fri Dec 18 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-Flags/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 May 2009 03:09:50 -0000	1.2
+++ .cvsignore	18 Dec 2009 09:17:09 -0000	1.3
@@ -1 +1 @@
-Lingua-Flags-0.05.tar.gz
+Lingua-Flags-0.07.tar.gz


Index: perl-Lingua-Flags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-Flags/devel/perl-Lingua-Flags.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Lingua-Flags.spec	7 Dec 2009 07:24:14 -0000	1.3
+++ perl-Lingua-Flags.spec	18 Dec 2009 09:17:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Lingua-Flags
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Provide small flag icons
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec 18 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
+- update to latest upstream version
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lingua-Flags/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 May 2009 03:09:50 -0000	1.2
+++ sources	18 Dec 2009 09:17:10 -0000	1.3
@@ -1 +1 @@
-ad47a00457b857b33152f25d4b0ce023  Lingua-Flags-0.05.tar.gz
+578db1b27d3d1b76c79c1aefbc4018e8  Lingua-Flags-0.07.tar.gz



From rvokal at fedoraproject.org  Fri Dec 18 09:17:46 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 18 Dec 2009 09:17:46 +0000 (UTC)
Subject: File wireshark-1.2.5.tar.bz2 uploaded to lookaside cache by rvokal
Message-ID: <20091218091746.1970D28EDC2@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for wireshark:

38010265a76f25553498304dcf15a92c  wireshark-1.2.5.tar.bz2



From emaldonado at fedoraproject.org  Fri Dec 18 09:23:48 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 09:23:48 +0000 (UTC)
Subject: rpms/nss/devel 540387.patch,NONE,1.1
Message-ID: <20091218092348.2906111C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11339

Added Files:
	540387.patch 
Log Message:
Fix segmentation fault when listing keys or certs in the database - rhbz #540387

540387.patch:
 pk11pars.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE 540387.patch ---
diff --git a/mozilla/security/nss/lib/pk11wrap/pk11pars.c b/mozilla/security/nss/lib/pk11wrap/pk11pars.c
index c36cd25..5855084 100644
--- a/mozilla/security/nss/lib/pk11wrap/pk11pars.c
+++ b/mozilla/security/nss/lib/pk11wrap/pk11pars.c
@@ -1134,6 +1134,12 @@ SECMOD_LoadModule(char *modulespec,SECMODModule *parent, PRBool recurse)
 
 	    for (; *index; index++) {
 		SECMODModule *child;
+		if (0 == PORT_Strcmp(*index, modulespec)) {
+		    /* avoid trivial infinite recursion */
+		    PORT_SetError(SEC_ERROR_NO_MODULE);
+		    rv = SECFailure;
+		    break;
+		}
 		child = SECMOD_LoadModule(*index,module,PR_TRUE);
 		if (!child) break;
 		if (child->isCritical && !child->loaded) {



From emaldonado at fedoraproject.org  Fri Dec 18 09:25:16 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 09:25:16 +0000 (UTC)
Subject: rpms/nss/devel 546221.patch,NONE,1.1
Message-ID: <20091218092516.826A911C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11597

Added Files:
	546221.patch 
Log Message:
Fix nsssysinit to enable applications to use the system database (#546221)

546221.patch:
 nsssysinit.c |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

--- NEW FILE 546221.patch ---
--- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-17 23:52:17.543895890 -0800
+++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-17 23:54:48.488895967 -0800
@@ -37,8 +37,6 @@
 #include "prio.h"
 #include "prprf.h"
 
-
-
 /*
  * The following provides a default example for operating systems to set up
  * and manage applications loading NSS on their OS globally.
@@ -54,6 +52,8 @@
 #ifdef XP_UNIX
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <stdio.h>
+#include <stdarg.h>
 
 static int 
 testdir(char *dir)
@@ -208,8 +208,8 @@ askpw=any timeout=30 ] }  ";
 static char **
 get_list(char *filename, char *stripped_parameters)
 {
-    char **module_list = PORT_ZNewArray(char *, 4);
-    char *userdb;
+    char **module_list = PORT_ZNewArray(char *, 5);
+    char *userdb, *sysdb;
     int isFIPS = getFIPSMode();
     const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
     int next = 0;
@@ -219,13 +219,20 @@ get_list(char *filename, char *stripped_
 	return NULL;
     }
 
+    sysdb = getSystemDB();
     userdb  = getUserDB();
+
+    if (sysdb && !strcmp(filename, sysdb))
+	    filename = NULL;
+    if (userdb && !strcmp(filename, userdb))
+	    filename = NULL;
+
     if (userdb != NULL) {
 	/* return a list of databases to open. First the user Database */
 	module_list[next++] = PR_smprintf(
 	    "library= "
 	    "module=\"NSS User database\" "
-	    "parameters=\"configdir='sql:%s' %s\" "
+	    "parameters=\"configdir='sql:%s' %s tokenDescription='NSS user database'\" "
         "NSS=\"%sflags=internal%s\"",
         userdb, stripped_parameters, nssflags,
         isFIPS ? ",FIPS" : "");
@@ -251,6 +258,7 @@ get_list(char *filename, char *stripped_
     module_list[next] = 0;
 
     PORT_Free(userdb);
+    PORT_Free(sysdb);
 
     return module_list;
 }



From emaldonado at fedoraproject.org  Fri Dec 18 09:26:37 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 09:26:37 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.129,1.130
Message-ID: <20091218092637.36CDD11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12017

Modified Files:
	nss.spec 
Log Message:
sysinit requires coreutils for post install scriplet (#547067)


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- nss.spec	12 Dec 2009 06:48:43 -0000	1.129
+++ nss.spec	18 Dec 2009 09:26:37 -0000	1.130
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.5
+Release:          1%{?dist}.6
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -37,13 +37,15 @@ Source6:          blank-cert9.db
 Source7:          blank-key4.db
 Source8:          system-pkcs11.txt
 Source9:          setup-nsssysinit.sh
-Source12:         %{name}-pem-20090907.tar.bz2
+Source12:         %{name}-pem-20091210.tar.bz2
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           533125-ammend.patch
 Patch8:           nss-sysinit.patch
 Patch9:           nsssysinit.patch
+Patch10:          546221.patch
+Patch11:          540387.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -73,6 +75,7 @@ Summary:          System NSS Initilizati
 Group:            System Environment/Base
 Provides:         nss-system-init
 Requires:         nss = %{version}-%{release}
+Requires(post):   coreutils
 
 %description sysinit
 Default Operating System module that manages applications loading
@@ -109,9 +112,11 @@ low level services.
 
 %patch2 -p0
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .533125-ammend
+%patch7 -p0 -b .533125
 %patch8 -p0 -b .sysinit
-%patch9 -p0 -b .nsssysinit
+%patch9 -p0 -b .545779
+%patch10 -p1 -b .546221
+%patch11 -p1 -b .540387
 
 %build
 
@@ -473,6 +478,11 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Dec 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.6
+- Fix nsssysinit to enable applications to use the system database (#546221)
+- Fix spec so sysinit requires coreutils for post install scriplet (#547067)
+- Fix segmentation fault when listing keys or certs in the database (#540387)
+
 * Thu Dec 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.5
 - Fix nsssysinit to set the default flags on the crypto module (#545779)
 - Remove redundant header from the pem module



From rvokal at fedoraproject.org  Fri Dec 18 09:27:49 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 18 Dec 2009 09:27:49 +0000 (UTC)
Subject: rpms/wireshark/devel .cvsignore, 1.30, 1.31 sources, 1.30,
	1.31 wireshark.spec, 1.63, 1.64
Message-ID: <20091218092749.C1B3711C00E6@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12343

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	18 Nov 2009 16:30:21 -0000	1.30
+++ .cvsignore	18 Dec 2009 09:27:49 -0000	1.31
@@ -1 +1 @@
-wireshark-1.2.4.tar.bz2
+wireshark-1.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	18 Nov 2009 16:30:21 -0000	1.30
+++ sources	18 Dec 2009 09:27:49 -0000	1.31
@@ -1 +1 @@
-ae4533da7d0e54c236e1eed966c42163  wireshark-1.2.4.tar.bz2
+38010265a76f25553498304dcf15a92c  wireshark-1.2.5.tar.bz2


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- wireshark.spec	17 Dec 2009 09:17:07 -0000	1.63
+++ wireshark.spec	18 Dec 2009 09:27:49 -0000	1.64
@@ -11,8 +11,8 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.4
-Release: 	3%{?dist}
+Version:	1.2.5
+Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -300,6 +300,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.5-1
+- upgrade to 1.2.5
+- fixes security vulnaribilities, see http://www.wireshark.org/security/wnpa-sec-2009-09.html 
+
 * Thu Dec 17 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-3
 - split -devel package (#547899, #203642, #218451)
 - removing root warning dialog (#543709)



From caolanm at fedoraproject.org  Fri Dec 18 09:27:50 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 18 Dec 2009 09:27:50 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.ooo32gsl03.patch, NONE,
	1.1 openoffice.org.spec, 1.2045, 1.2046
Message-ID: <20091218092750.5C87B11C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12331

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.ooo32gsl03.patch 
Log Message:
Resolves: rhbz#548512 workspace.ooo32gsl03.patch

workspace.ooo32gsl03.patch:
 mediawindowbase_impl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE workspace.ooo32gsl03.patch ---
diff -ru avmedia/source/viewer/mediawindowbase_impl.cxx avmedia/source/viewer/mediawindowbase_impl.cxx
--- avmedia/source/viewer/mediawindowbase_impl.cxx	2009-12-18 09:23:43.000000000 +0000
+++ avmedia/source/viewer/mediawindowbase_impl.cxx	2009-12-18 09:24:14.000000000 +0000
@@ -147,9 +147,9 @@
     if( isPlaying() )
     {
         if( bStop )
-            mxPlayer->start();
-        else
             mxPlayer->stop();
+        else
+            mxPlayer->start();
     }
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2045
retrieving revision 1.2046
diff -u -p -r1.2045 -r1.2046
--- openoffice.org.spec	15 Dec 2009 13:27:58 -0000	1.2045
+++ openoffice.org.spec	18 Dec 2009 09:27:49 -0000	1.2046
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 22
+%define rh_rpm_release 23
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -181,6 +181,7 @@ Patch104: openoffice.org-3.2.0.ooo107552
 Patch105: workspace.vcl105.patch
 Patch106: workspace.fwk132.patch
 Patch107: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch108: workspace.ooo32gsl03.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1748,6 +1749,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch105 -p0 -b .workspace.vcl105.patch
 %patch106 -p1 -b .workspace.fwk132.patch
 %patch107 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch108 -p0 -b .workspace.ooo32gsl03.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4281,6 +4283,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Dec 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.23
+- Resolves: rhbz#548512 workspace.ooo32gsl03.patch
+
 * Tue Dec 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.22
 - Resolves: rhbz#529648 add workspace.fwk132.patch
 - Resolves: rhbz#547176 add 



From iarnell at fedoraproject.org  Fri Dec 18 09:28:50 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 18 Dec 2009 09:28:50 +0000 (UTC)
Subject: rpms/perl-HTML-FormFu/devel perl-HTML-FormFu.spec,1.12,1.13
Message-ID: <20091218092850.9C39E11C00E6@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-HTML-FormFu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12707

Modified Files:
	perl-HTML-FormFu.spec 
Log Message:
* Fri Dec 18 2009 Iain Arnell <iarnell at gmail.com> 0.05004-2
- fix silly typo in requires filtering



Index: perl-HTML-FormFu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-FormFu/devel/perl-HTML-FormFu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-HTML-FormFu.spec	9 Dec 2009 04:13:58 -0000	1.12
+++ perl-HTML-FormFu.spec	18 Dec 2009 09:28:50 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-HTML-FormFu
 Version:        0.05004
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTML Form Creation, Rendering and Validation Framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -59,7 +59,7 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 
 %{?perl_default_filter:
 %filter_from_provides /perl(unicode/d
-%filter_from_requires /perl(Catalyst/d; /perl(default/d; perl(model_config)/d;
+%filter_from_requires /perl(Catalyst/d; /perl(default/d; /perl(model_config)/d;
 %perl_default_filter
 }
 
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec 18 2009 Iain Arnell <iarnell at gmail.com> 0.05004-2
+- fix silly typo in requires filtering
+
 * Tue Dec 08 2009 Iain Arnell <iarnell at gmail.com> 0.05004-1
 - update to latest upstream version
 - use perl_default_filter



From pbrobinson at fedoraproject.org  Fri Dec 18 09:28:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 09:28:55 +0000 (UTC)
Subject: rpms/sugar-base/devel sugar-base.spec,1.25,1.26
Message-ID: <20091218092855.934DD11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12761

Modified Files:
	sugar-base.spec 
Log Message:
- Remove libtool archives


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sugar-base.spec	1 Dec 2009 14:25:41 -0000	1.25
+++ sugar-base.spec	18 Dec 2009 09:28:55 -0000	1.26
@@ -3,7 +3,7 @@
 Summary: Base Sugar library
 Name: sugar-base
 Version: 0.87.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
@@ -38,6 +38,9 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %find_lang %name
 
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
 %clean
 rm -rf %{buildroot}
 
@@ -47,6 +50,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.87.1-2
+- Remove libtool archives
+
 * Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
 - New upstream release
 



From ovasik at fedoraproject.org  Fri Dec 18 09:37:43 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Dec 2009 09:37:43 +0000 (UTC)
Subject: rpms/linuxdoc-tools/devel linuxdoc-tools.spec,1.40,1.41
Message-ID: <20091218093743.3BD0011C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/linuxdoc-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14410

Modified Files:
	linuxdoc-tools.spec 
Log Message:
fix perl5 dir paths


Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- linuxdoc-tools.spec	18 Dec 2009 09:07:19 -0000	1.40
+++ linuxdoc-tools.spec	18 Dec 2009 09:37:43 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: A text formatting package based on SGML
 Name: linuxdoc-tools
 Version: 0.9.66
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Copyright only
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
@@ -88,14 +88,17 @@ exit 0
 %{_datadir}/%{name}
 %{_datadir}/entity-map
 %{_datadir}/texmf/tex/latex/misc/*.sty
-%dir %{_prefix}/lib*/perl5/vendor_perl/*/Text
-%{_prefix}/lib*/perl5/vendor_perl/*/Text/EntityMap.pm
-%dir %{_prefix}/lib*/perl5/vendor_perl/*/LinuxDocTools
-%{_prefix}/lib*/perl5/vendor_perl/*/LinuxDocTools.pm
-%{_prefix}/lib*/perl5/vendor_perl/*/LinuxDocTools/*.pm
+%dir %{_datadir}/perl5/Text
+%{_datadir}/perl5/Text/EntityMap.pm
+%dir %{_datadir}/perl5/LinuxDocTools
+%{_datadir}/perl5/LinuxDocTools.pm
+%{_datadir}/perl5/LinuxDocTools/*.pm
 %{_mandir}/*/*
 
 %changelog
+* Fri Dec 18 2009 Ondrej Vasik <ovasik at redhat.com> 0.9.66-4
+- fix perl5 dir paths
+
 * Fri Dec 18 2009 Ondrej Vasik <ovasik at redhat.com> 0.9.66-3
 - do not obsolete self
 



From jwrdegoede at fedoraproject.org  Fri Dec 18 09:42:14 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 18 Dec 2009 09:42:14 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0-align-default-rh361951.patch, NONE, 
	1.1 parted-1.9.0-diskflags.patch, NONE,
	1.1 parted-1.9.0-entiredisk-rh533328.patch, NONE,
	1.1 parted-1.9.0-lo-as-file-rh546622.patch, NONE,
	1.1 parted-1.9.0-new-lvm-rh525095.patch, NONE,
	1.1 parted-1.9.0-partition-limits-rh533417.patch, NONE,
	1.1 parted-1.9.0-ru-rh543029.patch, NONE,
	1.1 parted-1.9.0-ui-align-rh361951.patch, NONE, 1.1 parted.spec,
	1.157, 1.158
Message-ID: <20091218094214.CAF9F11C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15298

Modified Files:
	parted.spec 
Added Files:
	parted-1.9.0-align-default-rh361951.patch 
	parted-1.9.0-diskflags.patch 
	parted-1.9.0-entiredisk-rh533328.patch 
	parted-1.9.0-lo-as-file-rh546622.patch 
	parted-1.9.0-new-lvm-rh525095.patch 
	parted-1.9.0-partition-limits-rh533417.patch 
	parted-1.9.0-ru-rh543029.patch 
	parted-1.9.0-ui-align-rh361951.patch 
Log Message:
* Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-24
- Allow partitioning of loopback devices (#546622)
- Add libparted function to query maximum partition length and start
  addresses for a given disk (#533417)
- Add per disk flags functions from upstream, this is the way upstream
  has implemented the disable cylinder alignment functionality
- Add --align cmdline option to specify how to align new partitions
  see the parted man page for details (#361951)
- Make the default alignment for new partitions optimal (#361951)
- When cylinder alignment is disabled, allow use of the last (incomplete)
  cylinder of the disk (#533328)
- Don't crash when printing partition tables in Russian (#543029)
- Make parted work correctly with new lvm (#525095)


parted-1.9.0-align-default-rh361951.patch:
 parted.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE parted-1.9.0-align-default-rh361951.patch ---
--- parted-1.9.0/parted/parted.c~	2009-12-15 18:44:00.000000000 +0100
+++ parted-1.9.0/parted/parted.c	2009-12-15 19:20:14.000000000 +0100
@@ -133,7 +133,7 @@ int     pretend_input_tty = 0;
 int     opt_machine_mode = 0;
 int     disk_is_modified = 0;
 int     is_toggle_mode = 0;
-int     alignment = ALIGNMENT_CYLINDER;
+int     alignment = ALIGNMENT_OPTIMAL;
 
 static const char* number_msg = N_(
 "NUMBER is the partition number used by Linux.  On MS-DOS disk labels, the "

parted-1.9.0-diskflags.patch:
 include/parted/disk.h  |   33 +++++++++++++
 libparted/disk.c       |  124 +++++++++++++++++++++++++++++++++++++++++++++++++
 libparted/labels/dos.c |   67 ++++++++++++++++++++++++--
 libparted/labels/sun.c |   57 ++++++++++++++++++++--
 4 files changed, 271 insertions(+), 10 deletions(-)

--- NEW FILE parted-1.9.0-diskflags.patch ---
diff -up parted-1.9.0/include/parted/disk.h.diskflags parted-1.9.0/include/parted/disk.h
--- parted-1.9.0/include/parted/disk.h.diskflags	2009-12-15 11:07:11.000000000 +0100
+++ parted-1.9.0/include/parted/disk.h	2009-12-15 11:08:29.000000000 +0100
@@ -27,6 +27,20 @@
 #define PED_DISK_H_INCLUDED
 
 /**
+ * Disk flags
+ */
+enum _PedDiskFlag {
+        /* This flag (which defaults to true) controls if disk types for
+           which cylinder alignment is optional do cylinder alignment when a
+           new partition gets added.
+           This flag is available for msdos and sun disklabels (for sun labels
+           it only controls the aligning of the end of the partition) */
+        PED_DISK_CYLINDER_ALIGNMENT=1,
+};
+#define PED_DISK_FIRST_FLAG             PED_DISK_CYLINDER_ALIGNMENT
+#define PED_DISK_LAST_FLAG              PED_DISK_CYLINDER_ALIGNMENT
+
+/**
  * Partition types
  */
 enum _PedPartitionType {
@@ -72,6 +86,7 @@ struct _PedDiskOps;
 struct _PedDiskType;
 struct _PedDiskArchOps;
 
+typedef enum _PedDiskFlag               PedDiskFlag;
 typedef enum _PedPartitionType          PedPartitionType;
 typedef enum _PedPartitionFlag          PedPartitionFlag;
 typedef enum _PedDiskTypeFeature        PedDiskTypeFeature;
@@ -180,6 +195,16 @@ struct _PedDiskOps {
         void (*free) (PedDisk* disk);
         int (*read) (PedDisk* disk);
         int (*write) (const PedDisk* disk);
+        int (*disk_set_flag) (
+                PedDisk *disk,
+                PedDiskFlag flag,
+                int state);
+        int (*disk_get_flag) (
+                const PedDisk *disk,
+                PedDiskFlag flag);
+        int (*disk_is_flag_available) (
+                const PedDisk *disk,
+                PedDiskFlag flag);
         /** \todo add label guessing op here */
 
         /* partition operations */
@@ -304,6 +329,14 @@ extern const char* ped_partition_flag_ge
 extern PedPartitionFlag ped_partition_flag_get_by_name (const char* name);
 extern PedPartitionFlag ped_partition_flag_next (PedPartitionFlag flag);
 
+extern int ped_disk_set_flag(PedDisk *disk, PedDiskFlag flag, int state);
+extern int ped_disk_get_flag(const PedDisk *disk, PedDiskFlag flag);
+extern int ped_disk_is_flag_available(const PedDisk *disk, PedDiskFlag flag);
+
+extern const char *ped_disk_flag_get_name(PedDiskFlag flag);
+extern PedDiskFlag ped_disk_flag_get_by_name(const char *name);
+extern PedDiskFlag ped_disk_flag_next(PedDiskFlag flag);
+
 /** @} */
 
 /**
diff -up parted-1.9.0/libparted/disk.c.diskflags parted-1.9.0/libparted/disk.c
--- parted-1.9.0/libparted/disk.c.diskflags	2009-12-15 11:07:11.000000000 +0100
+++ parted-1.9.0/libparted/disk.c	2009-12-15 11:08:29.000000000 +0100
@@ -773,6 +773,130 @@ ped_disk_max_partition_start_sector (con
 }
 
 /**
+ * Set the state (\c 1 or \c 0) of a flag on a disk.
+ *
+ * \note It is an error to call this on an unavailable flag -- use
+ * ped_disk_is_flag_available() to determine which flags are available
+ * for a given disk label.
+ *
+ * \throws PED_EXCEPTION_ERROR if the requested flag is not available for this
+ *      label.
+ */
+int
+ped_disk_set_flag(PedDisk *disk, PedDiskFlag flag, int state)
+{
+        PED_ASSERT (disk != NULL, return 0);
+
+        PedDiskOps *ops = disk->type->ops;
+
+        if (!ped_disk_is_flag_available(disk, flag)) {
+                ped_exception_throw (
+                        PED_EXCEPTION_ERROR,
+                        PED_EXCEPTION_CANCEL,
+                        "The flag '%s' is not available for %s disk labels.",
+                        ped_disk_flag_get_name(flag),
+                        disk->type->name);
+                return 0;
+        }
+
+        return ops->disk_set_flag(disk, flag, state);
+}
+
+/**
+ * Get the state (\c 1 or \c 0) of a flag on a disk.
+ */
+int
+ped_disk_get_flag(const PedDisk *disk, PedDiskFlag flag)
+{
+        PED_ASSERT (disk != NULL, return 0);
+
+        PedDiskOps *ops = disk->type->ops;
+
+        if (!ped_disk_is_flag_available(disk, flag))
+                return 0;
+
+        return ops->disk_get_flag(disk, flag);
+}
+
+/**
+ * Check whether a given flag is available on a disk.
+ *
+ * \return \c 1 if the flag is available.
+ */
+int
+ped_disk_is_flag_available(const PedDisk *disk, PedDiskFlag flag)
+{
+        PED_ASSERT (disk != NULL, return 0);
+
+        PedDiskOps *ops = disk->type->ops;
+
+        if (!ops->disk_is_flag_available)
+                return 0;
+
+        return ops->disk_is_flag_available(disk, flag);
+}
+
+/**
+ * Returns a name for a \p flag, e.g. PED_DISK_CYLINDER_ALIGNMENT will return
+ * "cylinder_alignment".
+ *
+ * \note The returned string will be in English.  However,
+ * translations are provided, so the caller can call
+ * dgettext("parted", RESULT) on the result.
+ */
+const char *
+ped_disk_flag_get_name(PedDiskFlag flag)
+{
+        switch (flag) {
+        case PED_DISK_CYLINDER_ALIGNMENT:
+                return N_("cylinder_alignment");
+
+        default:
+                ped_exception_throw (
+                        PED_EXCEPTION_BUG,
+                        PED_EXCEPTION_CANCEL,
+                        _("Unknown disk flag, %d."),
+                        flag);
+                return NULL;
+        }
+}
+
+/**
+ * Returns the flag associated with \p name.
+ *
+ * \p name can be the English
+ * string, or the translation for the native language.
+ */
+PedDiskFlag
+ped_disk_flag_get_by_name(const char *name)
+{
+        PedDiskFlag flag;
+
+        for (flag = ped_disk_flag_next(0); flag;
+             flag = ped_disk_flag_next(flag)) {
+                const char *flag_name = ped_disk_flag_get_name(flag);
+                if (strcasecmp(name, flag_name) == 0
+                    || strcasecmp(name, _(flag_name)) == 0)
+                        return flag;
+        }
+
+        return 0;
+}
+
+/**
+ * Iterates through all disk flags.
+ *
+ * ped_disk_flag_next(0) returns the first flag
+ *
+ * \return the next flag, or 0 if there are no more flags
+ */
+PedDiskFlag
+ped_disk_flag_next(PedDiskFlag flag)
+{
+        return (flag + 1) % (PED_DISK_LAST_FLAG + 1);
+}
+
+/**
  * \internal We turned a really nasty bureaucracy problem into an elegant maths
  * problem :-)  Basically, there are some constraints to a partition's
  * geometry:
diff -up parted-1.9.0/libparted/labels/dos.c.diskflags parted-1.9.0/libparted/labels/dos.c
--- parted-1.9.0/libparted/labels/dos.c.diskflags	2009-12-15 11:07:11.000000000 +0100
+++ parted-1.9.0/libparted/labels/dos.c	2009-12-15 11:12:46.000000000 +0100
@@ -140,6 +140,10 @@ typedef struct {
 } OrigState;
 
 typedef struct {
+        int             cylinder_alignment;
+} DosDiskData;
+
+typedef struct {
 	unsigned char	system;
 	int		boot;
 	int		hidden;
@@ -243,8 +247,16 @@ msdos_alloc (const PedDevice* dev)
 	PED_ASSERT (dev != NULL, return NULL);
 
 	disk = _ped_disk_alloc ((PedDevice*)dev, &msdos_disk_type);
-	if (disk)
-		disk->disk_specific = NULL;
+        if (disk) {
+		DosDiskData *disk_specific = ped_malloc(sizeof *disk_specific);
+                if (!disk_specific) {
+                        free (disk);
+                        return NULL;
+                }
+                disk_specific->cylinder_alignment = 1;
+                disk->disk_specific = disk_specific;
+        }
+
 	return disk;
 }
 
@@ -256,7 +268,10 @@ msdos_duplicate (const PedDisk* disk)
 	new_disk = ped_disk_new_fresh (disk->dev, &msdos_disk_type);
 	if (!new_disk)
 		return NULL;
-	new_disk->disk_specific = NULL;
+
+        memcpy(new_disk->disk_specific, disk->disk_specific,
+               sizeof(DosDiskData));
+
 	return new_disk;
 }
 
@@ -265,7 +280,45 @@ msdos_free (PedDisk* disk)
 {
 	PED_ASSERT (disk != NULL, return);
 
+	DosDiskData *disk_specific = disk->disk_specific;
 	_ped_disk_free (disk);
+	free(disk_specific);
+}
+
+static int
+msdos_disk_set_flag (PedDisk *disk, PedDiskFlag flag, int state)
+{
+        DosDiskData *disk_specific = disk->disk_specific;
+        switch (flag) {
+        case PED_DISK_CYLINDER_ALIGNMENT:
+                disk_specific->cylinder_alignment = !!state;
+                return 1;
+        default:
+                return 0;
+        }
+}
+
+static int
+msdos_disk_get_flag (const PedDisk *disk, PedDiskFlag flag)
+{
+        DosDiskData *disk_specific = disk->disk_specific;
+        switch (flag) {
+        case PED_DISK_CYLINDER_ALIGNMENT:
+                return disk_specific->cylinder_alignment;
+        default:
+                return 0;
+        }
+}
+
+static int
+msdos_disk_is_flag_available (const PedDisk *disk, PedDiskFlag flag)
+{
+        switch (flag) {
+        case PED_DISK_CYLINDER_ALIGNMENT:
+               return 1;
+        default:
+               return 0;
+        }
 }
 
 #ifndef DISCOVER_ONLY
@@ -2029,7 +2083,9 @@ msdos_partition_align (PedPartition* par
 
 	partition_probe_bios_geometry (part, &bios_geom);
 
-	if (ped_disk_align_to_cylinders_on())
+	DosDiskData *disk_specific = part->disk->disk_specific;
+	if (ped_disk_align_to_cylinders_on() &&
+	    disk_specific->cylinder_alignment)
 		if (_align (part, &bios_geom, constraint))
 			return 1;
 	if (_align_no_geom (part, constraint))
@@ -2324,6 +2380,10 @@ static PedDiskOps msdos_disk_ops = {
 	write:			NULL,
 #endif
 
+	disk_set_flag:          msdos_disk_set_flag,
+	disk_get_flag:          msdos_disk_get_flag,
+	disk_is_flag_available: msdos_disk_is_flag_available,
+
 	partition_new:		msdos_partition_new,
 	partition_duplicate:	msdos_partition_duplicate,
 	partition_destroy:	msdos_partition_destroy,
diff -up parted-1.9.0/libparted/labels/sun.c.diskflags parted-1.9.0/libparted/labels/sun.c
--- parted-1.9.0/libparted/labels/sun.c.diskflags	2009-12-15 11:07:11.000000000 +0100
+++ parted-1.9.0/libparted/labels/sun.c	2009-12-15 11:13:44.000000000 +0100
@@ -94,6 +94,7 @@ struct _SunPartitionData {
 struct _SunDiskData {
 	PedSector		length; /* This is based on cyl - alt-cyl */
 	SunRawLabel		raw_label;
+	int                     cylinder_alignment;
 };
 
 static PedDiskType sun_disk_type;
@@ -190,6 +191,7 @@ sun_alloc (const PedDevice* dev)
 
 	bios_geom->cylinders = dev->length / cyl_size;
 	sun_specific->length = bios_geom->cylinders * cyl_size;
+        sun_specific->cylinder_alignment = 1;
 
 	label = &sun_specific->raw_label;
 	memset(label, 0, sizeof(SunRawLabel));
@@ -252,6 +254,42 @@ sun_free (PedDisk *disk)
 }
 
 static int
+sun_disk_set_flag (PedDisk *disk, PedDiskFlag flag, int state)
+{
+        SunDiskData *disk_specific = disk->disk_specific;
+        switch (flag) {
+        case PED_DISK_CYLINDER_ALIGNMENT:
+                disk_specific->cylinder_alignment = !!state;
+                return 1;
+        default:
+                return 0;
+        }
+}
+
+static int
+sun_disk_get_flag (const PedDisk *disk, PedDiskFlag flag)
+{
+        SunDiskData *disk_specific = disk->disk_specific;
+        switch (flag) {
+        case PED_DISK_CYLINDER_ALIGNMENT:
+                return disk_specific->cylinder_alignment;
+        default:
+                return 0;
+        }
+}
+
+static int
+sun_disk_is_flag_available (const PedDisk *disk, PedDiskFlag flag)
+{
+        switch (flag) {
+        case PED_DISK_CYLINDER_ALIGNMENT:
+               return 1;
+        default:
+               return 0;
+        }
+}
+
+static int
 _check_geometry_sanity (PedDisk* disk, SunRawLabel* label)
 {
 	PedDevice*	dev = disk->dev;
@@ -738,12 +776,15 @@ sun_partition_align (PedPartition* part,
 {
         PED_ASSERT (part != NULL, return 0);
 
-	if (_ped_partition_attempt_align (part, constraint,
-					  _get_strict_constraint (part->disk)))
-	       	return 1;
-	if (_ped_partition_attempt_align (part, constraint,
-					  _get_lax_constraint (part->disk)))
-	       	return 1;
+        SunDiskData *disk_specific = part->disk->disk_specific;
+
+        if (disk_specific->cylinder_alignment &&
+            _ped_partition_attempt_align (part, constraint,
+                                          _get_strict_constraint (part->disk)))
+                return 1;
+        if (_ped_partition_attempt_align (part, constraint,
+                                          _get_lax_constraint (part->disk)))
+                return 1;
 
 #ifndef DISCOVER_ONLY
 	ped_exception_throw (
@@ -862,6 +903,10 @@ static PedDiskOps sun_disk_ops = {
 	write:			NULL,
 #endif
 
+	disk_set_flag:          sun_disk_set_flag,
+	disk_get_flag:          sun_disk_get_flag,
+	disk_is_flag_available: sun_disk_is_flag_available,
+
 	partition_new:		sun_partition_new,
 	partition_duplicate:	sun_partition_duplicate,
 	partition_destroy:	sun_partition_destroy,

parted-1.9.0-entiredisk-rh533328.patch:
 disk.c       |   13 ++++++++++++-
 labels/dos.c |    5 ++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE parted-1.9.0-entiredisk-rh533328.patch ---
diff -up parted-1.9.0/libparted/disk.c.entiredisk parted-1.9.0/libparted/disk.c
--- parted-1.9.0/libparted/disk.c.entiredisk	2009-12-15 19:22:01.000000000 +0100
+++ parted-1.9.0/libparted/disk.c	2009-12-15 20:19:30.000000000 +0100
@@ -785,10 +785,15 @@ ped_disk_max_partition_start_sector (con
 int
 ped_disk_set_flag(PedDisk *disk, PedDiskFlag flag, int state)
 {
+        int ret;
+
         PED_ASSERT (disk != NULL, return 0);
 
         PedDiskOps *ops = disk->type->ops;
 
+        if (!_disk_push_update_mode(disk))
+                return 0;
+
         if (!ped_disk_is_flag_available(disk, flag)) {
                 ped_exception_throw (
                         PED_EXCEPTION_ERROR,
@@ -796,10 +801,16 @@ ped_disk_set_flag(PedDisk *disk, PedDisk
                         "The flag '%s' is not available for %s disk labels.",
                         ped_disk_flag_get_name(flag),
                         disk->type->name);
+                _disk_pop_update_mode(disk);
                 return 0;
         }
 
-        return ops->disk_set_flag(disk, flag, state);
+        ret = ops->disk_set_flag(disk, flag, state);
+
+        if (!_disk_pop_update_mode (disk))
+                return 0;
+
+        return ret;
 }
 
 /**
diff -up parted-1.9.0/libparted/labels/dos.c.entiredisk parted-1.9.0/libparted/labels/dos.c
--- parted-1.9.0/libparted/labels/dos.c.entiredisk	2009-12-15 19:22:01.000000000 +0100
+++ parted-1.9.0/libparted/labels/dos.c	2009-12-15 20:19:38.000000000 +0100
@@ -2242,7 +2242,10 @@ add_startend_metadata (PedDisk* disk)
 	else
 		init_end = PED_MIN (dev->bios_geom.sectors - 1, init_end - 1);
 
-	if (!get_end_last_nonfree_part(disk, &final_start))
+        DosDiskData *disk_specific = disk->disk_specific;
+        if (!disk_specific->cylinder_alignment)
+                final_start = dev->length - 1;
+        else if (!get_end_last_nonfree_part(disk, &final_start))
 		final_start = ped_round_down_to (dev->length, cyl_size);
 	else
 		final_start = PED_MAX (final_start + 1,

parted-1.9.0-lo-as-file-rh546622.patch:
 linux.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE parted-1.9.0-lo-as-file-rh546622.patch ---
diff -up parted-1.9.0/libparted/arch/linux.c.orig parted-1.9.0/libparted/arch/linux.c
--- parted-1.9.0/libparted/arch/linux.c.orig	2009-12-14 22:44:18.000000000 +0100
+++ parted-1.9.0/libparted/arch/linux.c	2009-12-15 10:25:38.000000000 +0100
@@ -259,6 +259,7 @@ struct blkdev_ioctl_param {
 #define SX8_MAJOR2              161
 #define XVD_MAJOR               202
 #define SDMMC_MAJOR             179
+#define LOOP_MAJOR              7
 
 #define SCSI_BLK_MAJOR(M) (                                             \
                 (M) == SCSI_DISK0_MAJOR                                 \
@@ -561,6 +562,8 @@ _device_probe_type (PedDevice* dev)
                 dev->type = PED_DEVICE_SDMMC;
         } else if (_is_virtblk_major(dev_major)) {
                 dev->type = PED_DEVICE_VIRTBLK;
+        } else if (dev_major == LOOP_MAJOR) {
+                dev->type = PED_DEVICE_FILE;
         } else {
                 dev->type = PED_DEVICE_UNKNOWN;
         }

parted-1.9.0-new-lvm-rh525095.patch:
 linux.c |   53 ++++++++++++++++++++++++++++-------------------------
 linux.h |    2 ++
 2 files changed, 30 insertions(+), 25 deletions(-)

--- NEW FILE parted-1.9.0-new-lvm-rh525095.patch ---
--- parted-1.9.0.orig/libparted/arch/linux.c	2009-12-18 09:35:22.000000000 +0100
+++ parted-1.9.0/libparted/arch/linux.c	2009-12-18 09:57:37.000000000 +0100
@@ -430,7 +430,8 @@
         if (!(dmt = dm_task_create(DM_DEVICE_TABLE)))
                 return r;
 
-        if (!dm_task_set_name(dmt, dev->path))
+        if (!dm_task_set_major_minor(dmt, arch_specific->major,
+                                     arch_specific->minor, 0))
                 goto bad;
 
         dm_task_no_open_count(dmt);
@@ -513,6 +514,7 @@
         struct stat             dev_stat;
         int                     dev_major;
         int                     dev_minor;
+        LinuxSpecific*          arch_specific = LINUX_SPECIFIC (dev);
 
         if (!_device_stat (dev, &dev_stat))
                 return 0;
@@ -522,8 +524,8 @@
                 return 1;
         }
 
-        dev_major = major (dev_stat.st_rdev);
-        dev_minor = minor (dev_stat.st_rdev);
+        arch_specific->major = dev_major = major (dev_stat.st_rdev);
+        arch_specific->minor = dev_minor = minor (dev_stat.st_rdev);
 
         if (SCSI_BLK_MAJOR (dev_major) && (dev_minor % 0x10 == 0)) {
                 dev->type = PED_DEVICE_SCSI;
@@ -2305,22 +2307,20 @@
 static int
 _dm_remove_parts (PedDevice* dev)
 {
-        struct stat             dev_stat;
         struct dm_task*         task = NULL;
         struct dm_info*         info = alloca(sizeof *info);
         struct dm_names*        names = NULL;
         unsigned int            next = 0;
         int                     rc;
-
-        if (!_device_stat (dev, &dev_stat))
-                goto err;
+        LinuxSpecific*          arch_specific = LINUX_SPECIFIC (dev);
 
         task = dm_task_create(DM_DEVICE_LIST);
         if (!task)
                 goto err;
 
-        dm_task_set_major (task, major (dev_stat.st_rdev));
-        dm_task_set_minor (task, minor (dev_stat.st_rdev));
+        if (!dm_task_set_major_minor (task, arch_specific->major,
+                                      arch_specific->minor, 0))
+                goto err;
 
         rc = dm_task_run(task);
         if (rc < 0)
@@ -2365,33 +2365,36 @@
 static int
 _dm_add_partition (PedDisk* disk, PedPartition* part)
 {
-        struct stat     dev_stat;
         struct dm_task* task = NULL;
         int             rc;
         char*           vol_name = NULL;
-        char*           dev_name = NULL;
+        const char     *dev_name = NULL;
         char*           params = NULL;
+        LinuxSpecific*  arch_specific = LINUX_SPECIFIC (disk->dev);
 
-        dev_name = _device_get_part_path (disk->dev, part->num);
-        if (!dev_name)
-                return 0;
+        /* Get map name from devicemapper */
+        task = dm_task_create (DM_DEVICE_INFO);
+        if (!task)
+                goto err;
 
-        vol_name = strrchr (dev_name, '/');
-        if (vol_name && *vol_name && *(++vol_name))
-                vol_name = strdup (vol_name);
-        else
-                vol_name = strdup (dev_name);
-        if (!vol_name)
-                return 0;
+        if (!dm_task_set_major_minor (task, arch_specific->major,
+                                      arch_specific->minor, 0))
+                goto err;
 
-        if (!_device_stat (disk->dev, &dev_stat))
+        rc = dm_task_run(task);
+        if (rc < 0)
                 goto err;
 
-        if (asprintf (&params, "%d:%d %lld", major (dev_stat.st_rdev),
-                      minor (dev_stat.st_rdev), part->geom.start) == -1)
+        dev_name = dm_task_get_name (task);
+
+        if (asprintf (&vol_name, "%sp%d", dev_name, part->num) == -1)
                 goto err;
 
-        if (!params)
+        dm_task_destroy (task);
+        task = NULL;
+
+        if (asprintf (&params, "%d:%d %lld", arch_specific->major,
+                      arch_specific->minor, part->geom.start) == -1)
                 goto err;
 
         task = dm_task_create (DM_DEVICE_CREATE);
--- parted-1.9.0.orig/libparted/arch/linux.h	2009-12-18 09:35:22.000000000 +0100
+++ parted-1.9.0/libparted/arch/linux.h	2009-12-18 09:44:26.000000000 +0100
@@ -28,6 +28,8 @@
 
 struct _LinuxSpecific {
 	int	fd;
+	int	major;
+	int	minor;
 	char*	dmtype;         /**< device map target type */
 #if defined(__s390__) || defined(__s390x__)
 	unsigned int real_sector_size;

parted-1.9.0-partition-limits-rh533417.patch:
 include/parted/disk.h           |    3 
 libparted/disk.c                |   34 ++++++++
 libparted/labels/pt-limit.c     |  164 ++++++++++++++++++++++++++++++++++++++++
 libparted/labels/pt-limit.gperf |   26 ++++++
 4 files changed, 227 insertions(+)

--- NEW FILE parted-1.9.0-partition-limits-rh533417.patch ---
--- parted-1.9.0.orig/include/parted/disk.h	2009-12-15 10:32:24.000000000 +0100
+++ parted-1.9.0/include/parted/disk.h	2009-12-15 10:59:26.000000000 +0100
@@ -266,6 +266,9 @@
                                                        int* supported);
 extern PedAlignment *ped_disk_get_partition_alignment(const PedDisk *disk);
 
+extern PedSector ped_disk_max_partition_length (const PedDisk *disk);
+extern PedSector ped_disk_max_partition_start_sector (const PedDisk *disk);
+
 extern int ped_disk_align_to_cylinders_on();
 extern int ped_disk_align_to_cylinders_toggle();
 /** @} */
--- parted-1.9.0.orig/libparted/disk.c	2009-12-15 10:32:24.000000000 +0100
+++ parted-1.9.0/libparted/disk.c	2009-12-15 10:55:16.000000000 +0100
@@ -738,6 +738,40 @@
 	return disk->type->ops->get_max_primary_partition_count (disk);
 }
 
+#include "labels/pt-limit.c"
+
+/**
+ * Return the maximum representable length (in sectors) of a
+ * partition on disk \disk.
+ */
+PedSector
+ped_disk_max_partition_length (const PedDisk* disk)
+{
+  const char *pt_type = disk->type->name;
+  struct partition_limit const *pt_lim
+    = pt_limit_lookup (pt_type, strlen (pt_type));
+  if (pt_lim == NULL)
+    return 0;
+
+  return pt_lim->max_length;
+}
+
+/**
+ * Return the maximum representable start sector of a
+ * partition on disk \disk.
+ */
+PedSector
+ped_disk_max_partition_start_sector (const PedDisk* disk)
+{
+  const char *pt_type = disk->type->name;
+  struct partition_limit const *pt_lim
+    = pt_limit_lookup (pt_type, strlen (pt_type));
+  if (pt_lim == NULL)
+    return 0;
+
+  return pt_lim->max_start_sector;
+}
+
 /**
  * \internal We turned a really nasty bureaucracy problem into an elegant maths
  * problem :-)  Basically, there are some constraints to a partition's
--- parted-1.9.0.orig/libparted/labels/pt-limit.c	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.9.0/libparted/labels/pt-limit.c	2009-12-15 10:40:46.000000000 +0100
@@ -0,0 +1,164 @@
+/* ANSI-C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -C -N pt_limit_lookup -n -t -s 6 -k '*' --language=ANSI-C pt-limit.gperf  */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf at gnu.org>."
+#endif
+
+#line 1 "pt-limit.gperf"
+struct partition_limit
+{
+  char const *name;
+  uint64_t max_start_sector;
+  uint64_t max_length;
+};
+
+#define TOTAL_KEYWORDS 10
+#define MIN_WORD_LENGTH 3
+#define MAX_WORD_LENGTH 5
+#define MIN_HASH_VALUE 0
+#define MAX_HASH_VALUE 45
+/* maximum key range = 46, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (register const char *str, register unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 10,  5, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46,  0, 30, 30,
+      10, 46, 46,  5, 10, 15, 46, 46,  5,  5,
+       0,  0,  0, 46, 46,  0,  5,  0, 10, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+      46, 46, 46, 46, 46, 46
+    };
+  register int hval = 0;
+
+  switch (len)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[4]];
+      /*FALLTHROUGH*/
+      case 4:
+        hval += asso_values[(unsigned char)str[3]];
+      /*FALLTHROUGH*/
+      case 3:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+        hval += asso_values[(unsigned char)str[1]];
+      /*FALLTHROUGH*/
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval;
+}
+
+#ifdef __GNUC__
+__inline
+static
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct partition_limit *
+pt_limit_lookup (register const char *str, register unsigned int len)
+{
+  static const struct partition_limit wordlist[] =
+    {
+#line 18 "pt-limit.gperf"
+      {"sun",128ULL*UINT32_MAX,UINT32_MAX},
+      {""}, {""}, {""}, {""},
+#line 22 "pt-limit.gperf"
+      {"loop",UINT32_MAX,UINT32_MAX},
+      {""}, {""}, {""}, {""},
+#line 10 "pt-limit.gperf"
+      {"gpt",UINT64_MAX,UINT64_MAX},
+      {""}, {""}, {""}, {""},
+#line 12 "pt-limit.gperf"
+      {"msdos",UINT32_MAX,UINT32_MAX},
+      {""}, {""}, {""}, {""},
+#line 8 "pt-limit.gperf"
+      {"dasd",UINT32_MAX,UINT32_MAX},
+      {""}, {""}, {""}, {""},
+#line 26 "pt-limit.gperf"
+      {"amiga",UINT32_MAX,UINT32_MAX},
+      {""}, {""}, {""}, {""},
+#line 9 "pt-limit.gperf"
+      {"dvh",UINT32_MAX,UINT32_MAX},
+      {""}, {""}, {""}, {""},
+#line 11 "pt-limit.gperf"
+      {"mac",UINT32_MAX,UINT32_MAX},
+      {""}, {""}, {""}, {""},
+#line 20 "pt-limit.gperf"
+      {"bsd",UINT32_MAX,UINT32_MAX},
+      {""}, {""}, {""}, {""},
+#line 23 "pt-limit.gperf"
+      {"pc98",UINT32_MAX,UINT32_MAX}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].name;
+
+          if (*str == *s && !strcmp (str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
--- parted-1.9.0.orig/libparted/labels/pt-limit.gperf	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.9.0/libparted/labels/pt-limit.gperf	2009-12-15 10:57:05.000000000 +0100
@@ -0,0 +1,26 @@
+struct partition_limit
+{
+  char const *name;
+  uint64_t max_start_sector;
+  uint64_t max_length;
+};
+%%
+dasd,UINT32_MAX,UINT32_MAX
+dvh,UINT32_MAX,UINT32_MAX
+gpt,UINT64_MAX,UINT64_MAX
+mac,UINT32_MAX,UINT32_MAX
+msdos,UINT32_MAX,UINT32_MAX
+#
+# Sun partitions are cylinder-aligned, and it looks like there are 128 sectors
+# in a cylinder.  FIXME verify.  Possibly compute sectors-per-cylinder, given
+# u_int16_t	ntrks;		/* Tracks per cylinder */
+# u_int16_t	nsect;		/* Sectors per track */
+sun,128ULL*UINT32_MAX,UINT32_MAX
+#
+bsd,UINT32_MAX,UINT32_MAX
+# aix,UINT32_MAX,UINT32_MAX
+loop,UINT32_MAX,UINT32_MAX
+pc98,UINT32_MAX,UINT32_MAX
+#
+# FIXME: not verified.  looks like these are cylinder aligned, too
+amiga,UINT32_MAX,UINT32_MAX

parted-1.9.0-ru-rh543029.patch:
 parted.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE parted-1.9.0-ru-rh543029.patch ---
diff -up parted-1.9.0/parted/parted.c.ru parted-1.9.0/parted/parted.c
--- parted-1.9.0/parted/parted.c.ru	2009-12-17 10:32:41.000000000 +0100
+++ parted-1.9.0/parted/parted.c	2009-12-17 10:32:01.000000000 +0100
@@ -1227,7 +1227,7 @@ partition_print_flags (PedPartition* par
                         ped_realloc (&_res, strlen (res) + 1
                                                    + strlen (name));
                         res = _res;
-                        strncat (res, name, 21);
+                        strcat (res, name);
                 }
         }
 

parted-1.9.0-ui-align-rh361951.patch:
 doc/C/parted.8  |   20 ++++
 doc/parted.texi |    5 +
 lib/argmatch.c  |  274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/argmatch.h  |  102 ++++++++++++++++++++
 lib/gnulib.mk   |    9 +
 parted/parted.c |   57 ++++++++++-
 6 files changed, 462 insertions(+), 5 deletions(-)

--- NEW FILE parted-1.9.0-ui-align-rh361951.patch ---
diff -up parted-1.9.0/doc/C/parted.8.align parted-1.9.0/doc/C/parted.8
--- parted-1.9.0/doc/C/parted.8.align	2009-12-15 18:42:25.000000000 +0100
+++ parted-1.9.0/doc/C/parted.8	2009-12-15 18:42:29.000000000 +0100
@@ -30,6 +30,26 @@ never prompts for user intervention
 .TP
 .B -v, --version
 displays the version
+.TP
+.B -a \fIalignment-type\fP, --align \fIalignment-type\fP
+Set alignment for newly created partitions, valid alignment types are:
+.RS
+.IP none
+Use the minimum alignment allowed by the disk type.
+.IP cylinder
+Align partitions to cylinders.
+.IP minimal
+Use minimum alignment as given by the disk topology information. This and
+the opt value will use layout information provided by the disk to align the
+logical partition table addresses to actual physical blocks on the disks.
+The min value is the minimum aligment needed to align the partition properly to
+physical blocks, which avoids performance degradation.
+.IP optimal
+Use optimum alignment as given by the disk topology information. This
+aligns to a multiple of the physical block size in a way that guarantees
+optimal performance.
+.RE
+
 .SH COMMANDS
 .TP
 .B [device]
diff -up parted-1.9.0/doc/parted.texi.align parted-1.9.0/doc/parted.texi
--- parted-1.9.0/doc/parted.texi.align	2009-12-15 18:42:25.000000000 +0100
+++ parted-1.9.0/doc/parted.texi	2009-12-15 18:42:29.000000000 +0100
@@ -496,6 +496,11 @@ display a help message
 @itemx --script
 never prompt the user
 
+ at item -a alignment-type
+ at itemx --align alignment-type
+Set alignment for newly created partitions, valid alignment types are:
+none, cylinder, minimal and optimal.
+
 @item -v
 @itemx --version
 display the version
diff -up parted-1.9.0/lib/argmatch.c.align parted-1.9.0/lib/argmatch.c
--- parted-1.9.0/lib/argmatch.c.align	2009-12-15 18:42:25.000000000 +0100
+++ parted-1.9.0/lib/argmatch.c	2009-12-15 18:43:16.000000000 +0100
@@ -0,0 +1,274 @@
+/* argmatch.c -- find a match for a string in an array
+
+   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by David MacKenzie <djm at ai.mit.edu>
+   Modified by Akim Demaille <demaille at inf.enst.fr> */
+
+#include <config.h>
+
+/* Specification.  */
+#include "argmatch.h"
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+#include "error.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
+/* When reporting an invalid argument, show nonprinting characters
+   by using the quoting style ARGMATCH_QUOTING_STYLE.  Do not use
+   literal_quoting_style.  */
+#ifndef ARGMATCH_QUOTING_STYLE
+# define ARGMATCH_QUOTING_STYLE locale_quoting_style
+#endif
+
+/* Non failing version of argmatch call this function after failing. */
+#ifndef ARGMATCH_DIE
+# include "exitfail.h"
+# define ARGMATCH_DIE exit (exit_failure)
+#endif
+
+#ifdef ARGMATCH_DIE_DECL
+ARGMATCH_DIE_DECL;
+#endif
+
+static void
+__argmatch_die (void)
+{
+  ARGMATCH_DIE;
+}
+
+/* Used by XARGMATCH and XARGCASEMATCH.  See description in argmatch.h.
+   Default to __argmatch_die, but allow caller to change this at run-time. */
+argmatch_exit_fn argmatch_die = __argmatch_die;
+
+

+/* If ARG is an unambiguous match for an element of the
+   NULL-terminated array ARGLIST, return the index in ARGLIST
+   of the matched element, else -1 if it does not match any element
+   or -2 if it is ambiguous (is a prefix of more than one element).
+
+   If VALLIST is none null, use it to resolve ambiguities limited to
+   synonyms, i.e., for
+     "yes", "yop" -> 0
+     "no", "nope" -> 1
+   "y" is a valid argument, for `0', and "n" for `1'.  */
+
+ptrdiff_t
+argmatch (const char *arg, const char *const *arglist,
+          const char *vallist, size_t valsize)
+{
+  size_t i;                     /* Temporary index in ARGLIST.  */
+  size_t arglen;                /* Length of ARG.  */
+  ptrdiff_t matchind = -1;      /* Index of first nonexact match.  */
+  bool ambiguous = false;       /* If true, multiple nonexact match(es).  */
+
+  arglen = strlen (arg);
+
+  /* Test all elements for either exact match or abbreviated matches.  */
+  for (i = 0; arglist[i]; i++)
+    {
+      if (!strncmp (arglist[i], arg, arglen))
+        {
+          if (strlen (arglist[i]) == arglen)
+            /* Exact match found.  */
+            return i;
+          else if (matchind == -1)
+            /* First nonexact match found.  */
+            matchind = i;
+          else
+            {
+              /* Second nonexact match found.  */
+              if (vallist == NULL
+                  || memcmp (vallist + valsize * matchind,
+                             vallist + valsize * i, valsize))
+                {
+                  /* There is a real ambiguity, or we could not
+                     disambiguate. */
+                  ambiguous = true;
+                }
+            }
+        }
+    }
+  if (ambiguous)
+    return -2;
+  else
+    return matchind;
+}
+
+/* Error reporting for argmatch.
+   CONTEXT is a description of the type of entity that was being matched.
+   VALUE is the invalid value that was given.
+   PROBLEM is the return value from argmatch.  */
+
+void
+argmatch_invalid (const char *context, const char *value, ptrdiff_t problem)
+{
+  char const *format = (problem == -1
+                        ? _("invalid argument %s for %s")
+                        : _("ambiguous argument %s for %s"));
+
+  error (0, 0, format, value, context);
+}
+
+/* List the valid arguments for argmatch.
+   ARGLIST is the same as in argmatch.
+   VALLIST is a pointer to an array of values.
+   VALSIZE is the size of the elements of VALLIST */
+void
+argmatch_valid (const char *const *arglist,
+                const char *vallist, size_t valsize)
+{
+  size_t i;
+  const char *last_val = NULL;
+
+  /* We try to put synonyms on the same line.  The assumption is that
+     synonyms follow each other */
+  fprintf (stderr, _("Valid arguments are:"));
+  for (i = 0; arglist[i]; i++)
+    if ((i == 0)
+        || memcmp (last_val, vallist + valsize * i, valsize))
+      {
+        fprintf (stderr, "\n  - `%s'", arglist[i]);
+        last_val = vallist + valsize * i;
+      }
+    else
+      {
+        fprintf (stderr, ", `%s'", arglist[i]);
+      }
+  putc ('\n', stderr);
+}
+
+/* Never failing versions of the previous functions.
+
+   CONTEXT is the context for which argmatch is called (e.g.,
+   "--version-control", or "$VERSION_CONTROL" etc.).  Upon failure,
+   calls the (supposed never to return) function EXIT_FN. */
+
+ptrdiff_t
+__xargmatch_internal (const char *context,
+                      const char *arg, const char *const *arglist,
+                      const char *vallist, size_t valsize,
+                      argmatch_exit_fn exit_fn)
+{
+  ptrdiff_t res = argmatch (arg, arglist, vallist, valsize);
+  if (res >= 0)
+    /* Success. */
+    return res;
+
+  /* We failed.  Explain why. */
+  argmatch_invalid (context, arg, res);
+  argmatch_valid (arglist, vallist, valsize);
+  (*exit_fn) ();
+
+  return -1; /* To please the compilers. */
+}
+
+/* Look for VALUE in VALLIST, an array of objects of size VALSIZE and
+   return the first corresponding argument in ARGLIST */
+const char *
+argmatch_to_argument (const char *value,
+                      const char *const *arglist,
+                      const char *vallist, size_t valsize)
+{
+  size_t i;
+
+  for (i = 0; arglist[i]; i++)
+    if (!memcmp (value, vallist + valsize * i, valsize))
+      return arglist[i];
+  return NULL;
+}
+
+#ifdef TEST
+/*
+ * Based on "getversion.c" by David MacKenzie <djm at gnu.ai.mit.edu>
+ */
+char *program_name;
+
+/* When to make backup files.  */
+enum backup_type
+{
+  /* Never make backups.  */
+  no_backups,
+
+  /* Make simple backups of every file.  */
+  simple_backups,
+
+  /* Make numbered backups of files that already have numbered backups,
+     and simple backups of the others.  */
+  numbered_existing_backups,
+
+  /* Make numbered backups of every file.  */
+  numbered_backups
+};
+
+/* Two tables describing arguments (keys) and their corresponding
+   values */
+static const char *const backup_args[] =
+{
+  "no", "none", "off",
+  "simple", "never",
+  "existing", "nil",
+  "numbered", "t",
+  0
+};
+
+static const enum backup_type backup_vals[] =
+{
+  no_backups, no_backups, no_backups,
+  simple_backups, simple_backups,
+  numbered_existing_backups, numbered_existing_backups,
+  numbered_backups, numbered_backups
+};
+
+int
+main (int argc, const char *const *argv)
+{
+  const char *cp;
+  enum backup_type backup_type = no_backups;
+
+  program_name = (char *) argv[0];
+
+  if (argc > 2)
+    {
+      fprintf (stderr, "Usage: %s [VERSION_CONTROL]\n", program_name);
+      exit (1);
+    }
+
+  if ((cp = getenv ("VERSION_CONTROL")))
+    backup_type = XARGMATCH ("$VERSION_CONTROL", cp,
+                             backup_args, backup_vals);
+
+  if (argc == 2)
+    backup_type = XARGMATCH (program_name, argv[1],
+                             backup_args, backup_vals);
+
+  printf ("The version control is `%s'\n",
+          ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
+
+  return 0;
+}
+#endif
diff -up parted-1.9.0/lib/argmatch.h.align parted-1.9.0/lib/argmatch.h
--- parted-1.9.0/lib/argmatch.h.align	2009-12-15 18:42:25.000000000 +0100
+++ parted-1.9.0/lib/argmatch.h	2009-12-15 18:42:29.000000000 +0100
@@ -0,0 +1,102 @@
+/* argmatch.h -- definitions and prototypes for argmatch.c
+
+   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2004, 2005 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by David MacKenzie <djm at ai.mit.edu>
+   Modified by Akim Demaille <demaille at inf.enst.fr> */
+
+#ifndef ARGMATCH_H_
+# define ARGMATCH_H_ 1
+
+# include <stddef.h>
+
+# include "verify.h"
+
+# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
+
+/* Assert there are as many real arguments as there are values
+   (argument list ends with a NULL guard).  */
+
+# define ARGMATCH_VERIFY(Arglist, Vallist) \
+    verify (ARRAY_CARDINALITY (Arglist) == ARRAY_CARDINALITY (Vallist) + 1)
+
+/* Return the index of the element of ARGLIST (NULL terminated) that
+   matches with ARG.  If VALLIST is not NULL, then use it to resolve
+   false ambiguities (i.e., different matches of ARG but corresponding
+   to the same values in VALLIST).  */
+
+ptrdiff_t argmatch (char const *arg, char const *const *arglist,
+                    char const *vallist, size_t valsize);
+
+# define ARGMATCH(Arg, Arglist, Vallist) \
+  argmatch (Arg, Arglist, (char const *) (Vallist), sizeof *(Vallist))
+
+/* xargmatch calls this function when it fails.  This function should not
+   return.  By default, this is a function that calls ARGMATCH_DIE which
+   in turn defaults to `exit (exit_failure)'.  */
+typedef void (*argmatch_exit_fn) (void);
+extern argmatch_exit_fn argmatch_die;
+
+/* Report on stderr why argmatch failed.  Report correct values. */
+
+void argmatch_invalid (char const *context, char const *value,
+                       ptrdiff_t problem);
+
+/* Left for compatibility with the old name invalid_arg */
+
+# define invalid_arg(Context, Value, Problem) \
+  argmatch_invalid (Context, Value, Problem)
+
+
+
+/* Report on stderr the list of possible arguments.  */
+
+void argmatch_valid (char const *const *arglist,
+                     char const *vallist, size_t valsize);
+
+# define ARGMATCH_VALID(Arglist, Vallist) \
+  argmatch_valid (Arglist, (char const *) (Vallist), sizeof *(Vallist))
+
+
+
+/* Same as argmatch, but upon failure, reports a explanation on the
+   failure, and exits using the function EXIT_FN. */
+
+ptrdiff_t __xargmatch_internal (char const *context,
+                                char const *arg, char const *const *arglist,
+                                char const *vallist, size_t valsize,
+                                argmatch_exit_fn exit_fn);
+
+/* Programmer friendly interface to __xargmatch_internal. */
+
+# define XARGMATCH(Context, Arg, Arglist, Vallist)              \
+  ((Vallist) [__xargmatch_internal (Context, Arg, Arglist,      \
+                                    (char const *) (Vallist),   \
+                                    sizeof *(Vallist),          \
+                                    argmatch_die)])
+
+/* Convert a value into a corresponding argument. */
+
+char const *argmatch_to_argument (char const *value,
+                                  char const *const *arglist,
+                                  char const *vallist, size_t valsize);
+
+# define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist)                  \
+  argmatch_to_argument (Value, Arglist,                                 \
+                        (char const *) (Vallist), sizeof *(Vallist))
+
+#endif /* ARGMATCH_H_ */
diff -up parted-1.9.0/lib/gnulib.mk.align parted-1.9.0/lib/gnulib.mk
--- parted-1.9.0/lib/gnulib.mk.align	2009-12-15 18:42:25.000000000 +0100
+++ parted-1.9.0/lib/gnulib.mk	2009-12-15 18:42:29.000000000 +0100
@@ -72,6 +72,15 @@ EXTRA_DIST += $(top_srcdir)/build-aux/an
 
 ## end   gnulib module announce-gen
 
+## begin gnulib module argmatch
+
+
+EXTRA_DIST += argmatch.c argmatch.h
+
+libgnulib_la_SOURCES += argmatch.c
+
+## end   gnulib module argmatch
+
 ## begin gnulib module btowc
 
 
diff -up parted-1.9.0/parted/parted.c.align parted-1.9.0/parted/parted.c
--- parted-1.9.0/parted/parted.c.align	2009-12-15 18:42:25.000000000 +0100
+++ parted-1.9.0/parted/parted.c	2009-12-15 18:42:29.000000000 +0100
@@ -19,6 +19,7 @@
 #include <config.h>
 #include <stdbool.h>
 
+#include "argmatch.h"
 #include "closeout.h"
 #include "configmake.h"
 #include "version-etc.h"
@@ -74,6 +75,31 @@ enum
   PRETEND_INPUT_TTY = CHAR_MAX + 1,
 };
 
+enum
+{
+        ALIGNMENT_NONE = 2,
+        ALIGNMENT_CYLINDER,
+        ALIGNMENT_MINIMAL,
+        ALIGNMENT_OPTIMAL
+};
+
+static char const *const align_args[] =
+{
+  "none",
+  "cylinder",
+  "minimal",
+  "optimal",
+  NULL
+};
+
+static int const align_types[] =
+{
+  ALIGNMENT_NONE,
+  ALIGNMENT_CYLINDER,
+  ALIGNMENT_MINIMAL,
+  ALIGNMENT_OPTIMAL
+};
+ARGMATCH_VERIFY (align_args, align_types);
 
 typedef struct {
         time_t  last_update;
@@ -87,6 +113,7 @@ static struct option const options[] = {
         {"machine",     0, NULL, 'm'},
         {"script",      0, NULL, 's'},
         {"version",     0, NULL, 'v'},
+        {"align",       required_argument, NULL, 'a'},
         {"-pretend-input-tty", 0, NULL, PRETEND_INPUT_TTY},
         {NULL,          0, NULL, 0}
 };
@@ -97,6 +124,7 @@ static const char *const options_help []
         {"machine",     N_("displays machine parseable output")},
         {"script",      N_("never prompts for user intervention")},
         {"version",     N_("displays the version")},
+        {"align=[none|cyl|min|opt]", N_("alignment for new partitions")},
         {NULL,          NULL}
 };
 
@@ -105,6 +133,7 @@ int     pretend_input_tty = 0;
 int     opt_machine_mode = 0;
 int     disk_is_modified = 0;
 int     is_toggle_mode = 0;
+int     alignment = ALIGNMENT_CYLINDER;
 
 static const char* number_msg = N_(
 "NUMBER is the partition number used by Linux.  On MS-DOS disk labels, the "
@@ -569,7 +598,7 @@ print_options_help ()
         int             i;
 
         for (i=0; options_help [i][0]; i++) {
-                printf ("  -%c, --%-23.23s %s\n",
+                printf ("  -%c, --%-25.25s %s\n",
                         options_help [i][0][0],
                         options_help [i][0],
                         _(options_help [i][1]));
@@ -700,6 +729,11 @@ do_mkpart (PedDevice** dev)
         if (!disk)
                 goto error;
 
+        if (ped_disk_is_flag_available(disk, PED_DISK_CYLINDER_ALIGNMENT))
+                if (!ped_disk_set_flag(disk, PED_DISK_CYLINDER_ALIGNMENT,
+                                       alignment == ALIGNMENT_CYLINDER))
+                        goto error_destroy_disk;
+
         if (!ped_disk_type_check_feature (disk->type, PED_DISK_TYPE_EXTENDED)) {
                 part_type = PED_PARTITION_NORMAL;
         } else {
@@ -752,7 +786,14 @@ do_mkpart (PedDevice** dev)
                         range_end);
         PED_ASSERT (user_constraint != NULL, return 0);
 
-        dev_constraint = ped_device_get_constraint (*dev);
+        if (alignment == ALIGNMENT_OPTIMAL)
+                dev_constraint =
+                        ped_device_get_optimal_aligned_constraint(*dev);
+        else if (alignment == ALIGNMENT_MINIMAL)
+                dev_constraint =
+                        ped_device_get_minimal_aligned_constraint(*dev);
+        else
+                dev_constraint = ped_device_get_constraint(*dev);
         PED_ASSERT (dev_constraint != NULL, return 0);
 
         final_constraint = ped_constraint_intersect (user_constraint,
@@ -2364,7 +2405,7 @@ int     opt, help = 0, list = 0, version
 
 while (1)
 {
-        opt = getopt_long (*argc_ptr, *argv_ptr, "hlmsv",
+        opt = getopt_long (*argc_ptr, *argv_ptr, "hlmsva:",
                            options, NULL);
         if (opt == -1)
                 break;
@@ -2375,16 +2416,22 @@ while (1)
                 case 'm': opt_machine_mode = 1; break;
                 case 's': opt_script_mode = 1; break;
                 case 'v': version = 1; break;
+                case 'a':
+                  alignment = XARGMATCH ("--align", optarg,
+                                         align_args, align_types);
+                  break;
                 case PRETEND_INPUT_TTY:
                   pretend_input_tty = 1;
                   break;
-                default:  wrong = 1; break;
+                default:
+                  wrong = 1;
+                  break;
         }
 }
 
 if (wrong == 1) {
         fprintf (stderr,
-                 _("Usage: %s [-hlmsv] [DEVICE [COMMAND [PARAMETERS]]...]\n"),
+                 _("Usage: %s [-hlmsv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n"),
                  program_name);
         return 0;
 }


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- parted.spec	11 Nov 2009 21:08:51 -0000	1.157
+++ parted.spec	18 Dec 2009 09:42:14 -0000	1.158
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -28,6 +28,14 @@ Patch17:  %{name}-1.9.0-gpt-big-endian.p
 Patch18:  %{name}-1.9.0-export-alignment-info.patch
 Patch19:  %{name}-1.9.0-dasd-fixes.patch
 Patch20:  %{name}-1.9.0-dasd-533808.patch
+Patch21:  %{name}-1.9.0-lo-as-file-rh546622.patch
+Patch22:  %{name}-1.9.0-partition-limits-rh533417.patch
+Patch23:  %{name}-1.9.0-diskflags.patch
+Patch24:  %{name}-1.9.0-ui-align-rh361951.patch
+Patch25:  %{name}-1.9.0-align-default-rh361951.patch
+Patch26:  %{name}-1.9.0-entiredisk-rh533328.patch
+Patch27:  %{name}-1.9.0-ru-rh543029.patch
+Patch28:  %{name}-1.9.0-new-lvm-rh525095.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -84,6 +92,14 @@ Parted library, you need to install this
 %patch18 -p1 -b .export-align
 %patch19 -p1 -b .dasd
 %patch20 -p1 -b .dasd2
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
 aclocal --force -I m4
 autoconf --force
 autoheader --force
@@ -149,6 +165,20 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-24
+- Allow partitioning of loopback devices (#546622)
+- Add libparted function to query maximum partition length and start
+  addresses for a given disk (#533417)
+- Add per disk flags functions from upstream, this is the way upstream
+  has implemented the disable cylinder alignment functionality
+- Add --align cmdline option to specify how to align new partitions
+  see the parted man page for details (#361951)
+- Make the default alignment for new partitions optimal (#361951)
+- When cylinder alignment is disabled, allow use of the last (incomplete)
+  cylinder of the disk (#533328)
+- Don't crash when printing partition tables in Russian (#543029)
+- Make parted work correctly with new lvm (#525095)
+
 * Wed Nov 11 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-23
 - Fix parted not building on s390
 



From jnovy at fedoraproject.org  Fri Dec 18 09:44:02 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 18 Dec 2009 09:44:02 +0000 (UTC)
Subject: rpms/libgphoto2/devel libgphoto2.spec,1.25,1.26
Message-ID: <20091218094402.15EB011C00E6@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15646

Modified Files:
	libgphoto2.spec 
Log Message:
* Fri Dec 18 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-3
- remove circular symlink in /usr/include/gphoto2 (#460807)



Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libgphoto2.spec	23 Oct 2009 14:14:05 -0000	1.25
+++ libgphoto2.spec	18 Dec 2009 09:44:01 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -119,6 +119,9 @@ mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.
 $RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
 popd
 
+# remove circular symlink in /usr/include/gphoto2 (#460807)
+rm -f %{buildroot}%{_includedir}/gphoto2/gphoto2
+
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
 rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -162,6 +165,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec 18 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-3
+- remove circular symlink in /usr/include/gphoto2 (#460807)
+
 * Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-2
 - return the dual-mode device to kernel once we don't use it (#530545)
 



From jnovy at fedoraproject.org  Fri Dec 18 09:46:47 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 18 Dec 2009 09:46:47 +0000 (UTC)
Subject: rpms/libgphoto2/F-12 libgphoto2.spec,1.25,1.26
Message-ID: <20091218094647.6FF3611C00E6@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16189

Modified Files:
	libgphoto2.spec 
Log Message:
* Fri Dec 18 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-3
- remove circular symlink in /usr/include/gphoto2 (#460807)



Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/F-12/libgphoto2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libgphoto2.spec	26 Oct 2009 12:04:12 -0000	1.25
+++ libgphoto2.spec	18 Dec 2009 09:46:47 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -119,6 +119,9 @@ mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.
 $RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
 popd
 
+# remove circular symlink in /usr/include/gphoto2 (#460807)
+rm -f %{buildroot}%{_includedir}/gphoto2/gphoto2
+
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
 rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -162,6 +165,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec 18 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-3
+- remove circular symlink in /usr/include/gphoto2 (#460807)
+
 * Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-2
 - return the dual-mode device to kernel once we don't use it (#530545)
 



From jkratoch at fedoraproject.org  Fri Dec 18 09:48:51 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri, 18 Dec 2009 09:48:51 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-archer-pie-addons-keep-disabled.patch, NONE,
	1.1 gdb-rhel5-fortran44.patch, NONE,
	1.1 gdb-6.3-ia64-sigtramp-frame-20050708.patch, 1.4,
	1.5 gdb-6.7-testsuite-stable-results.patch, 1.8,
	1.9 gdb-7.0-upstream.patch, 1.2, 1.3 gdb-archer-pie-addons.patch,
	1.1, 1.2 gdb-orphanripper.c, 1.3, 1.4 gdb.spec, 1.401,
	1.402 gdb-6.3-bz182116-exec-from-pthread.patch, 1.2,
	NONE gdb-6.3-ia64-corefile-fix-20050127.patch, 1.2,
	NONE gdb-6.3-sepcrc-20050402.patch, 1.4,
	NONE gdb-6.3-test-sepcrc-20050402.patch, 1.3, NONE
Message-ID: <20091218094851.23F5F11C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16506

Modified Files:
	gdb-6.3-ia64-sigtramp-frame-20050708.patch 
	gdb-6.7-testsuite-stable-results.patch gdb-7.0-upstream.patch 
	gdb-archer-pie-addons.patch gdb-orphanripper.c gdb.spec 
Added Files:
	gdb-archer-pie-addons-keep-disabled.patch 
	gdb-rhel5-fortran44.patch 
Removed Files:
	gdb-6.3-bz182116-exec-from-pthread.patch 
	gdb-6.3-ia64-corefile-fix-20050127.patch 
	gdb-6.3-sepcrc-20050402.patch 
	gdb-6.3-test-sepcrc-20050402.patch 
Log Message:
* Fri Dec 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-11.fc12
- [pie] Fix general ppc64 regression due to a function descriptors bug.
- [pie] Fix also keeping breakpoints disabled in PIE mode.
- Import upstream <tab>-completion crash fix.
- Drop some unused patches from the repository.
- More RHEL-5 build compatibility updates.
  - Use gfortran44 when running the testsuite on RHEL-5.
  - Disable python there due to insufficient ppc multilib.
- Fix orphanripper hangs and thus enable it again.


gdb-archer-pie-addons-keep-disabled.patch:
 breakpoint.c |   43 +++++++++++++++++++++++++++++++++++++++++++
 breakpoint.h |    3 +++
 objfiles.c   |   20 +++++++++++++++-----
 3 files changed, 61 insertions(+), 5 deletions(-)

--- NEW FILE gdb-archer-pie-addons-keep-disabled.patch ---
--- ./gdb/breakpoint.c	2009-12-18 00:13:49.000000000 +0100
+++ ./gdb/breakpoint.c	2009-12-18 00:13:16.000000000 +0100
@@ -8563,6 +8563,49 @@ update_breakpoint_locations (struct brea
   update_global_location_list (1);
 }
 
+void
+breakpoints_relocate (struct objfile *objfile, struct section_offsets *delta)
+{
+  struct bp_location *bl, **blp_tmp;
+  int changed = 0;
+
+  gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
+
+  ALL_BP_LOCATIONS (bl, blp_tmp)
+    {
+      struct obj_section *osect;
+
+      /* BL->SECTION can be correctly NULL for breakpoints with multiple
+         locations expanded through symtab.  */
+
+      ALL_OBJFILE_OSECTIONS (objfile, osect)
+	{
+	  CORE_ADDR relocated_address;
+	  CORE_ADDR delta_offset;
+
+	  delta_offset = ANOFFSET (delta, osect->the_bfd_section->index);
+	  if (delta_offset == 0)
+	    continue;
+	  relocated_address = bl->address + delta_offset;
+
+	  if (obj_section_addr (osect) <= relocated_address
+	      && relocated_address < obj_section_endaddr (osect))
+	    {
+	      if (bl->inserted)
+		remove_breakpoint (bl, mark_uninserted);
+
+	      bl->address += delta_offset;
+	      bl->requested_address += delta_offset;
+
+	      changed = 1;
+	    }
+	}
+    }
+
+  if (changed)
+    qsort (bp_location, bp_location_count, sizeof (*bp_location),
+	   bp_location_compare_for_qsort);
+}
 
 /* Reset a breakpoint given it's struct breakpoint * BINT.
    The value we return ends up being the return value from catch_errors.
--- ./gdb/breakpoint.h	2009-12-18 00:13:48.000000000 +0100
+++ ./gdb/breakpoint.h	2009-12-17 22:11:10.000000000 +0100
@@ -970,4 +970,7 @@ extern struct breakpoint *get_tracepoint
    is newly allocated; the caller should free when done with it.  */
 extern VEC(breakpoint_p) *all_tracepoints (void);
 
+extern void breakpoints_relocate (struct objfile *objfile,
+				  struct section_offsets *delta);
+
 #endif /* !defined (BREAKPOINT_H) */
--- ./gdb/objfiles.c	2009-12-18 00:13:48.000000000 +0100
+++ ./gdb/objfiles.c	2009-12-17 23:19:22.000000000 +0100
@@ -546,7 +546,7 @@ free_all_objfiles (void)
 /* Relocate OBJFILE to NEW_OFFSETS.  There should be OBJFILE->NUM_SECTIONS
    entries in new_offsets.  SEPARATE_DEBUG_OBJFILE is not touched here.  */
 
-static void
+static int
 objfile_relocate1 (struct objfile *objfile, struct section_offsets *new_offsets)
 {
   struct obj_section *s;
@@ -565,7 +565,7 @@ objfile_relocate1 (struct objfile *objfi
 	  something_changed = 1;
       }
     if (!something_changed)
-      return;
+      return 0;
   }
 
   /* OK, get all the symtabs.  */
@@ -706,6 +706,13 @@ objfile_relocate1 (struct objfile *objfi
       exec_set_section_address (bfd_get_filename (objfile->obfd), idx,
 				obj_section_addr (s));
     }
+
+  /* Final call of breakpoint_re_set can keep breakpoint locations disabled if
+     their addresses match.  */
+  if (objfile->separate_debug_objfile_backlink == NULL)
+    breakpoints_relocate (objfile, delta);
+
+  return 1;
 }
 
 /* Relocate OBJFILE to NEW_OFFSETS.  There should be OBJFILE->NUM_SECTIONS
@@ -720,7 +727,9 @@ objfile_relocate1 (struct objfile *objfi
 void
 objfile_relocate (struct objfile *objfile, struct section_offsets *new_offsets)
 {
-  objfile_relocate1 (objfile, new_offsets);
+  int changed = 0;
+
+  changed |= objfile_relocate1 (objfile, new_offsets);
 
   if (objfile->separate_debug_objfile != NULL)
     {
@@ -747,11 +756,12 @@ objfile_relocate (struct objfile *objfil
 					     objfile_addrs);
       do_cleanups (my_cleanups);
 
-      objfile_relocate1 (debug_objfile, new_debug_offsets);
+      changed |= objfile_relocate1 (debug_objfile, new_debug_offsets);
     }
 
   /* Relocate breakpoints as necessary, after things are relocated. */
-  breakpoint_re_set ();
+  if (changed)
+    breakpoint_re_set ();
 }
 

 /* Return non-zero if OBJFILE has partial symbols.  */

gdb-rhel5-fortran44.patch:
 common-block.exp   |   20 +++++++++++++++++++-
 dwarf-stride.exp   |   20 +++++++++++++++++++-
 dynamic.exp        |   20 +++++++++++++++++++-
 library-module.exp |   26 ++++++++++++++++++++++----
 module.exp         |   20 +++++++++++++++++++-
 string.exp         |   20 +++++++++++++++++++-
 6 files changed, 117 insertions(+), 9 deletions(-)

--- NEW FILE gdb-rhel5-fortran44.patch ---
Some functionality is available on RHEL-5.4+ only with gfortran44 as the
default gfortran binary is from gcc-4.1.

--- ./gdb/testsuite/gdb.fortran/common-block.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/common-block.exp	2009-12-15 05:21:00.000000000 +0100
@@ -20,7 +20,25 @@ set testfile "common-block"
 set srcfile ${testfile}.f90
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if  { $err != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- ./gdb/testsuite/gdb.fortran/dwarf-stride.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/dwarf-stride.exp	2009-12-15 05:20:07.000000000 +0100
@@ -27,7 +27,25 @@
 set testfile dwarf-stride
 set srcfile ${testfile}.f90
 
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f77}] } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler 
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+} 
+set_board_info f77compiler gfortran44
+
+set err [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f77}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if $err {
     return -1
 }
 
--- ./gdb/testsuite/gdb.fortran/dynamic.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/dynamic.exp	2009-12-15 05:17:21.000000000 +0100
@@ -25,7 +25,25 @@ set testfile "dynamic"
 set srcfile ${testfile}.f90
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if  { $err != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- ./gdb/testsuite/gdb.fortran/library-module.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/library-module.exp	2009-12-15 05:22:37.000000000 +0100
@@ -25,16 +25,34 @@ if [get_compiler_info not-used] {
    return -1
 }
 
-if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $objdir/$subdir/$libfile {debug f77}] != "" } {
-    untested "Couldn't compile ${srclibfile}"
-    return -1
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
 }
+set_board_info f77compiler gfortran44
 
 # prepare_for_testing cannot be used as linking with $libfile cannot be passed
 # just for the linking phase (and not the source compilation phase).  And any
 # warnings on ignored $libfile abort the process.
 
-if  { [gdb_compile [list $srcdir/$subdir/$srcfile $objdir/$subdir/$libfile] $objdir/$subdir/$binfile executable {debug f77}] != "" } {
+set err1 [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $objdir/$subdir/$libfile {debug f77}]
+set err2 [gdb_compile [list $srcdir/$subdir/$srcfile $objdir/$subdir/$libfile] $objdir/$subdir/$binfile executable {debug f77}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if  { $err1 != "" } {
+    untested "Couldn't compile ${srclibfile}"
+    return -1
+}
+if  { $err2 != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- ./gdb/testsuite/gdb.fortran/module.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/module.exp	2009-12-15 05:28:49.000000000 +0100
@@ -16,7 +16,25 @@
 set testfile "module"
 set srcfile ${testfile}.f90
 
-if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f77}] } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [prepare_for_testing $testfile.exp $testfile $srcfile {debug f77}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if $err {
     return -1
 }
 
--- ./gdb/testsuite/gdb.fortran/string.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/string.exp	2009-12-15 05:18:13.000000000 +0100
@@ -23,7 +23,25 @@ set testfile "string"
 set srcfile ${testfile}.f90
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if { $err != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }

gdb-6.3-ia64-sigtramp-frame-20050708.patch:
 ia64-tdep.c |  125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 124 insertions(+), 1 deletion(-)

Index: gdb-6.3-ia64-sigtramp-frame-20050708.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.3-ia64-sigtramp-frame-20050708.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-6.3-ia64-sigtramp-frame-20050708.patch	14 Dec 2008 14:05:14 -0000	1.4
+++ gdb-6.3-ia64-sigtramp-frame-20050708.patch	18 Dec 2009 09:48:50 -0000	1.5
@@ -29,7 +29,7 @@ Index: gdb-6.8.50.20081128/gdb/ia64-tdep
 +      ULONGEST unatN_val;
 +      ULONGEST unat;
 +      read_memory (cache->saved_regs[IA64_UNAT_REGNUM], (char *) &unat,
-+		   register_size (current_gdbarch, IA64_UNAT_REGNUM));
++		   register_size (target_gdbarch, IA64_UNAT_REGNUM));
 +      unatN_val = (unat & (1LL << (regnum - IA64_NAT0_REGNUM))) != 0;
 +      return frame_unwind_got_constant (this_frame, regnum, unatN_val);
 +    }
@@ -45,9 +45,9 @@ Index: gdb-6.8.50.20081128/gdb/ia64-tdep
 +      CORE_ADDR gr_addr = 0, nat_addr = 0;
 +
 +      read_memory (cache->saved_regs[IA64_BSP_REGNUM], (char *) &bsp,
-+		   register_size (current_gdbarch, IA64_BSP_REGNUM));
++		   register_size (target_gdbarch, IA64_BSP_REGNUM));
 +      read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
-+		   register_size (current_gdbarch, IA64_CFM_REGNUM));
++		   register_size (target_gdbarch, IA64_CFM_REGNUM));
 +
 +      /* The bsp points at the end of the register frame so we
 +	 subtract the size of frame from it to get start of register frame.  */
@@ -71,10 +71,10 @@ Index: gdb-6.8.50.20081128/gdb/ia64-tdep
 +	      nat_addr = cache->saved_regs[IA64_RNAT_REGNUM];
 +	      if (nat_addr != 0)
 +		read_memory (nat_addr, (char *) &nat_collection,
-+			     register_size (current_gdbarch, IA64_RNAT_REGNUM));
++			     register_size (target_gdbarch, IA64_RNAT_REGNUM));
 +	    }
 +	  else
-+	    nat_collection = read_memory_integer (nat_addr, 8);
++	    nat_collection = read_memory_integer (nat_addr, 8, BFD_ENDIAN_LITTLE);
 +	  if (nat_addr != 0)
 +	    {
 +	      nat_bit = (gr_addr >> 3) & 0x3f;
@@ -97,9 +97,9 @@ Index: gdb-6.8.50.20081128/gdb/ia64-tdep
 +      ULONGEST bof;
 +
 +      read_memory (cache->saved_regs[IA64_BSP_REGNUM], (char *) &bsp,
-+		   register_size (current_gdbarch, IA64_BSP_REGNUM));
++		   register_size (target_gdbarch, IA64_BSP_REGNUM));
 +      read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
-+		   register_size (current_gdbarch, IA64_CFM_REGNUM));
++		   register_size (target_gdbarch, IA64_CFM_REGNUM));
 +
 +      /* The bsp points at the end of the register frame so we
 +	 subtract the size of frame from it to get beginning of frame.  */
@@ -133,9 +133,9 @@ Index: gdb-6.8.50.20081128/gdb/ia64-tdep
 +	  ULONGEST cfm;
 +	  ULONGEST prN_val;
 +	  read_memory (pr_addr, (char *) &pr,
-+		       register_size (current_gdbarch, IA64_PR_REGNUM));
++		       register_size (target_gdbarch, IA64_PR_REGNUM));
 +	  read_memory (cache->saved_regs[IA64_CFM_REGNUM], (char *) &cfm,
-+		       register_size (current_gdbarch, IA64_CFM_REGNUM));
++		       register_size (target_gdbarch, IA64_CFM_REGNUM));
 +
 +	  /* Get the register rename base for this frame and adjust the
 +	   * register name to take rotation into account. */

gdb-6.7-testsuite-stable-results.patch:
 ./gdb/testsuite/gdb.base/fileio.c                |   33 ++++++++++++++++
 ./gdb/testsuite/gdb.base/fileio.exp              |   10 ++---
 gdb/testsuite/gdb.threads/watchthreads-reorder.c |   46 ++++++++---------------
 3 files changed, 55 insertions(+), 34 deletions(-)

Index: gdb-6.7-testsuite-stable-results.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.7-testsuite-stable-results.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gdb-6.7-testsuite-stable-results.patch	30 Sep 2009 21:02:25 -0000	1.8
+++ gdb-6.7-testsuite-stable-results.patch	18 Dec 2009 09:48:50 -0000	1.9
@@ -102,3 +102,154 @@ frames-invalid can happen asynchronously
  
  set timeout $oldtimeout
  return 0
+
+
+
+http://sourceware.org/ml/gdb-patches/2009-12/msg00234.html
+Subject: [patch] testsuite: Fix a race by me - watchthreads-reorder.exp
+
+Hi,
+
+there is a bug explainable by man pthread_cond_signal:
+	The [...] pthread_cond_signal() functions shall have no effect if
+	there are no threads currently blocked on cond.
+
+meaning a race for the testcase.
+	+FAIL: gdb.threads/watchthreads-reorder.exp: reorder1: continue a (timeout)
+
+One can reproduce the race on CVS HEAD by:
+#	--- a/gdb/testsuite/gdb.threads/watchthreads-reorder.c
+#	+++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.c
+#	@@ -89,6 +89,7 @@ thread1_func (void *unused)
+#	   int i;
+#	   volatile int rwatch_store;
+#	 
+#	+sleep(1);
+#	   thread1_tid = gettid ();
+#	   i = pthread_cond_signal (&thread1_tid_cond);
+#	   assert (i == 0);
+#	@@ -317,6 +318,7 @@ main (int argc, char **argv)
+#	 
+#	   if (thread1_tid == 0)
+#	     {
+#	+sleep(2);
+#	       i = pthread_cond_wait (&thread1_tid_cond, &thread1_tid_mutex);
+#	       assert (i == 0);
+#	 
+
+Fixed; gdbstop_mutex got removed as it became redundant there.
+
+Going to check it in as obvious in several days (code is by me + it is just
+a testcase).
+
+
+Sorry,
+Jan
+
+
+gdb/testsuite/
+2009-12-17  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* gdb.threads/watchthreads-reorder.c (gdbstop_mutex): Remove.
+	(thread1_func): Protect thread1_tid_cond by thread1_tid_mutex.  Remove
+	gdbstop_mutex handling.
+	(thread2_func): Protect thread2_tid_cond by thread2_tid_mutex.  Remove
+	gdbstop_mutex handling.
+	(main): Move thread1_tid_mutex and thread2_tid_mutex locks before
+	pthread_create.  Remove gdbstop_mutex handling.  New comment.  Remove
+	pthread_cond_wait conditionalizations.
+
+--- a/gdb/testsuite/gdb.threads/watchthreads-reorder.c
++++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.c
+@@ -34,8 +34,6 @@
+    otherwise.  */
+ #define TIMEOUT (gettid () == getpid() ? 10 : 15)
+ 
+-static pthread_mutex_t gdbstop_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
+-
+ static pid_t thread1_tid;
+ static pthread_cond_t thread1_tid_cond = PTHREAD_COND_INITIALIZER;
+ static pthread_mutex_t thread1_tid_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
+@@ -90,12 +88,11 @@ thread1_func (void *unused)
+   volatile int rwatch_store;
+ 
+   thread1_tid = gettid ();
++
++  timed_mutex_lock (&thread1_tid_mutex);
+   i = pthread_cond_signal (&thread1_tid_cond);
+   assert (i == 0);
+-
+-  /* Be sure GDB is already stopped before continuing.  */
+-  timed_mutex_lock (&gdbstop_mutex);
+-  i = pthread_mutex_unlock (&gdbstop_mutex);
++  i = pthread_mutex_unlock (&thread1_tid_mutex);
+   assert (i == 0);
+ 
+   rwatch_store = thread1_rwatch;
+@@ -115,12 +112,11 @@ thread2_func (void *unused)
+   volatile int rwatch_store;
+ 
+   thread2_tid = gettid ();
++
++  timed_mutex_lock (&thread2_tid_mutex);
+   i = pthread_cond_signal (&thread2_tid_cond);
+   assert (i == 0);
+-
+-  /* Be sure GDB is already stopped before continuing.  */
+-  timed_mutex_lock (&gdbstop_mutex);
+-  i = pthread_mutex_unlock (&gdbstop_mutex);
++  i = pthread_mutex_unlock (&thread2_tid_mutex);
+   assert (i == 0);
+ 
+   rwatch_store = thread2_rwatch;
+@@ -267,7 +263,8 @@ main (int argc, char **argv)
+ 
+   setbuf (stdout, NULL);
+ 
+-  timed_mutex_lock (&gdbstop_mutex);
++  timed_mutex_lock (&thread1_tid_mutex);
++  timed_mutex_lock (&thread2_tid_mutex);
+ 
+   timed_mutex_lock (&terminate_mutex);
+ 
+@@ -306,30 +303,21 @@ main (int argc, char **argv)
+       state_wait (tracer, "T (stopped)");
+     }
+ 
+-  timed_mutex_lock (&thread1_tid_mutex);
+-  timed_mutex_lock (&thread2_tid_mutex);
+-
+-  /* Let the threads start.  */
+-  i = pthread_mutex_unlock (&gdbstop_mutex);
+-  assert (i == 0);
++  /* Threads are now waiting at timed_mutex_lock (thread1_tid_mutex) and so
++     they could not trigger the watchpoints before GDB gets unstopped later.
++     Threads get resumed at pthread_cond_wait below.  */
+ 
+   printf ("Waiting till the threads initialize their TIDs.\n");
+ 
+-  if (thread1_tid == 0)
+-    {
+-      i = pthread_cond_wait (&thread1_tid_cond, &thread1_tid_mutex);
+-      assert (i == 0);
++  i = pthread_cond_wait (&thread1_tid_cond, &thread1_tid_mutex);
++  assert (i == 0);
+ 
+-      assert (thread1_tid > 0);
+-    }
++  assert (thread1_tid > 0);
+ 
+-  if (thread2_tid == 0)
+-    {
+-      i = pthread_cond_wait (&thread2_tid_cond, &thread2_tid_mutex);
+-      assert (i == 0);
++  i = pthread_cond_wait (&thread2_tid_cond, &thread2_tid_mutex);
++  assert (i == 0);
+ 
+-      assert (thread2_tid > 0);
+-    }
++  assert (thread2_tid > 0);
+ 
+   printf ("Thread 1 TID = %lu, thread 2 TID = %lu, PID = %lu.\n",
+ 	  (unsigned long) thread1_tid, (unsigned long) thread2_tid,
+

gdb-7.0-upstream.patch:
 ./gdb/amd64fbsd-nat.c                |    3 +
 ./gdb/dwarf2-frame.c                 |    8 ++++
 ./gdb/elfread.c                      |    3 +
 ./gdb/objfiles.c                     |   16 ++++++++
 ./gdb/score-tdep.c                   |   52 ---------------------------
 ./gdb/score-tdep.h                   |   66 -----------------------------------
 gdb/dbxread.c                        |   10 ++++-
 gdb/testsuite/gdb.base/bigcore.exp   |    6 +--
 gdb/testsuite/gdb.base/foll-fork.c   |    3 +
 gdb/testsuite/gdb.base/foll-fork.exp |    3 +
 gdb/testsuite/gdb.base/structs.c     |    6 +++
 gdb/testsuite/gdb.base/structs.exp   |   65 ++++++++++++++++++++++------------
 src/gdb/completer.c                  |    4 +-
 13 files changed, 96 insertions(+), 149 deletions(-)

Index: gdb-7.0-upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-7.0-upstream.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-7.0-upstream.patch	7 Dec 2009 18:39:26 -0000	1.2
+++ gdb-7.0-upstream.patch	18 Dec 2009 09:48:50 -0000	1.3
@@ -625,3 +625,39 @@ gdb/
        complaint (&symfile_complaints, _("bad string table offset in symbol %d"),
  		 symnum);
 
+
+
+http://sourceware.org/ml/gdb-patches/2009-11/msg00422.html
+http://sourceware.org/ml/gdb-cvs/2009-11/msg00169.html
+
+### src/gdb/ChangeLog	2009/11/19 22:42:48	1.11094
+### src/gdb/ChangeLog	2009/11/19 22:44:32	1.11095
+## -1,3 +1,8 @@
++2009-11-19  Joel Brobecker  <brobecker at adacore.com>
++
++	* completer.c (complete_line_internal): Make sure the command
++	completer is not NULL before calling it.
++
+ 2009-11-19  Jerome Guitton  <guitton at adacore.com>
+ 
+ 	* ada-lang.c (packed_array_type): Rename to...
+--- src/gdb/completer.c	2009/03/25 10:50:56	1.34
++++ src/gdb/completer.c	2009/11/19 22:44:34	1.35
+@@ -676,7 +676,7 @@
+ 			   p--)
+ 			;
+ 		    }
+-		  if (reason != handle_brkchars)
++		  if (reason != handle_brkchars && c->completer != NULL)
+ 		    list = (*c->completer) (c, p, word);
+ 		}
+ 	    }
+@@ -747,7 +747,7 @@
+ 		       p--)
+ 		    ;
+ 		}
+-	      if (reason != handle_brkchars)
++	      if (reason != handle_brkchars && c->completer != NULL)
+ 		list = (*c->completer) (c, p, word);
+ 	    }
+ 	}

gdb-archer-pie-addons.patch:
 dwarf2read.c |   17 +++++++++++++----
 exec.c       |   20 ++++++++++++++++++--
 gdbtypes.h   |    3 +++
 jv-lang.c    |    6 ++++--
 solib-svr4.c |   12 +++++++++---
 solib.c      |   13 +++++++++++++
 solib.h      |    2 ++
 solist.h     |    3 +++
 symfile.c    |   35 ++++++++++++++++++++++++++++-------
 value.c      |    6 ++++--
 10 files changed, 97 insertions(+), 20 deletions(-)

Index: gdb-archer-pie-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-archer-pie-addons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-archer-pie-addons.patch	7 Dec 2009 18:39:26 -0000	1.1
+++ gdb-archer-pie-addons.patch	18 Dec 2009 09:48:50 -0000	1.2
@@ -146,9 +146,20 @@
        if (accflags & 0x8000)	/* FIELD_UNRESOLVED_FLAG */
 --- a/gdb/solib-svr4.c
 +++ b/gdb/solib-svr4.c
-@@ -1621,7 +1621,10 @@ svr4_exec_displacement (void)
+@@ -1672,15 +1672,20 @@ static CORE_ADDR
+ svr4_exec_displacement (void)
+ {
+   int found;
++  /* ENTRY_POINT is a possible function descriptor - before
++     a call to gdbarch_convert_from_func_ptr_addr.  */
+   CORE_ADDR entry_point;
+ 
+   if (exec_bfd == NULL)
+     return 0;
+ 
    if (target_auxv_search (&current_target, AT_ENTRY, &entry_point) == 1)
-     return entry_point - exec_entry_point (exec_bfd, &current_target);
+-    return entry_point - exec_entry_point (exec_bfd, &current_target);
++    return entry_point - bfd_get_start_address (exec_bfd);
  
 -  return svr4_static_exec_displacement ();
 +  if (!ptid_equal (inferior_ptid, null_ptid))


Index: gdb-orphanripper.c
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-orphanripper.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdb-orphanripper.c	31 Jul 2009 08:36:06 -0000	1.3
+++ gdb-orphanripper.c	18 Dec 2009 09:48:50 -0000	1.4
@@ -276,12 +276,16 @@ static int spawn (char **argv, int timeo
 
   assert (signal_chld_hit != 0);
 
+  /* Do not unset O_NONBLOCK as a stale child (the whole purpose of this
+     program) having open its output pty would block us in read_out.  */
+#if 0
   i = fcntl (amaster, F_SETFL, O_RDONLY /* !O_NONBLOCK */);
   if (i != 0)
     {
       perror ("fcntl (amaster, F_SETFL, O_RDONLY /* !O_NONBLOCK */)");
       exit (EXIT_FAILURE);
     }
+#endif
 
   while (read_out (amaster));
 


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- gdb.spec	14 Dec 2009 18:54:51 -0000	1.401
+++ gdb.spec	18 Dec 2009 09:48:50 -0000	1.402
@@ -8,12 +8,15 @@
 %if 0%{!?dist:1}
 %define rhel 5
 %define dist .el5
+%endif
+# RHEL-5 Brew does not set it.
+%if "%{dist}" == ".el5"
 %define el5 1
-%define gnat_version 4.1
-%define gcj_version 7rh
-%else
-%define gnat_version 4.4
-%define gcj_version 10
+%endif
+# RHEL-5 ppc* python .so files are shipped only as ppc but gdb is ppc64 there.
+# Brew builds it fine as its ppc64 buildroot has full ppc64 package set.
+%if 0%{?el5:1}
+%define _without_python 1
 %endif
 
 Summary: A GNU source-level debugger for C, C++, Java and other languages
@@ -106,6 +109,7 @@ Patch118: gdb-6.3-gstack-20050411.patch
 Patch122: gdb-6.3-test-pie-20050107.patch
 Patch124: gdb-archer-pie.patch
 Patch389: gdb-archer-pie-addons.patch
+Patch394: gdb-archer-pie-addons-keep-disabled.patch
 
 # Get selftest working with sep-debug-info
 Patch125: gdb-6.3-test-self-20050110.patch
@@ -396,6 +400,9 @@ Patch391: gdb-x86_64-i386-syscall-restar
 # Fix stepping with OMP parallel Fortran sections (BZ 533176).
 Patch392: gdb-bz533176-fortran-omp-step.patch
 
+# Use gfortran44 when running the testsuite on RHEL-5.
+Patch393: gdb-rhel5-fortran44.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -411,14 +418,28 @@ BuildRequires: python-devel
 BuildRequires: libstdc++
 %endif	# 0%{!?_without_python:1}
 
+%if 0%{!?el5:1}
+%define gnat_version 4.4
+%define gcj_version 10
+%else
+%define gnat_version 4.1
+%define gcj_version 7rh
+%endif
+
 %if 0%{?_with_testsuite:1}
 BuildRequires: sharutils dejagnu
 # gcc-objc++ is not covered by the GDB testsuite.
-BuildRequires: gcc gcc-c++ gcc-gfortran gcc-java gcc-objc glibc-static
-# Prelink is broken on sparcv9/sparc64
+BuildRequires: gcc gcc-c++ gcc-gfortran gcc-java gcc-objc
+%if 0%{!?el5:1}
+BuildRequires: glibc-static
+%endif
+# Copied from prelink-0.4.2-3.fc13.
+%ifarch %{ix86} alpha sparc sparcv9 sparc64 s390 s390x x86_64 ppc ppc64
+# Prelink is broken on sparcv9/sparc64.
 %ifnarch sparcv9 sparc64
 BuildRequires: prelink
 %endif
+%endif
 %if 0%{!?rhel:1}
 BuildRequires: fpc
 %endif
@@ -427,7 +448,7 @@ BuildRequires: gcc44 gcc44-gfortran
 %endif
 # Ensure the devel libraries are installed for both multilib arches.
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
-# Copied from gcc-4.1.2-32
+# Copied from gcc-4.1.2-32.
 %ifarch %{ix86} x86_64 ia64 ppc alpha
 BuildRequires: gcc-gnat
 %ifarch %{multilib_64_archs} ppc
@@ -449,8 +470,13 @@ BuildRequires: %{_exec_prefix}/lib64/lib
 %endif
 
 %ifarch ia64
+%if 0%{!?el5:1}
 BuildRequires: libunwind-devel >= 0.99-0.1.frysk20070405cvs
 Requires: libunwind >= 0.99-0.1.frysk20070405cvs
+%else
+BuildRequires: libunwind >= 0.96-3
+Requires: libunwind >= 0.96-3
+%endif
 %endif
 
 Requires(post): /sbin/install-info
@@ -606,6 +632,12 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch390 -p1
 %patch391 -p1
 %patch392 -p1
+# Always verify its applicability.
+%patch393 -p1
+%if 0%{!?el5:1}
+%patch393 -p1 -R
+%endif
+%patch394 -p1
 
 find -name "*.orig" | xargs rm -f
 ! find -name "*.rej"	# Should not happen.
@@ -719,7 +751,7 @@ echo ====================TESTSUITE DISAB
 %else
 echo ====================TESTING=========================
 cd gdb
-gcc -o ./orphanripper %{SOURCE2} -Wall -lutil
+gcc -o ./orphanripper %{SOURCE2} -Wall -lutil -ggdb2
 # Need to use a single --ignore option, second use overrides first.
 # No `%{?_smp_mflags}' here as it may race.
 # WARNING: can't generate a core file - core tests suppressed - check ulimit
@@ -776,8 +808,7 @@ gcc -o ./orphanripper %{SOURCE2} -Wall -
   CHECK="$(echo $CHECK|sed 's#check//unix/[^ ]*#& &/-fPIE/-pie#g')"
 %endif	# 0%{!?_with_upstream:1}
 
-  # FIXME: Temporary F12 disable: ./orphanripper
-  make %{?_smp_mflags} -k $CHECK || :
+  ./orphanripper make %{?_smp_mflags} -k $CHECK || :
 )
 for t in sum log
 do
@@ -911,6 +942,16 @@ fi
 %endif
 
 %changelog
+* Fri Dec 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-11.fc12
+- [pie] Fix general ppc64 regression due to a function descriptors bug.
+- [pie] Fix also keeping breakpoints disabled in PIE mode.
+- Import upstream <tab>-completion crash fix.
+- Drop some unused patches from the repository.
+- More RHEL-5 build compatibility updates.
+  - Use gfortran44 when running the testsuite on RHEL-5.
+  - Disable python there due to insufficient ppc multilib.
+- Fix orphanripper hangs and thus enable it again.
+
 * Mon Dec 14 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-10.fc12
 - Make gdb-6.3-rh-testversion-20041202.patch to accept both RHEL and Fedora GDB.
 - Adjust BuildRequires for Fedora-12, RHEL-6 and RHEL-5 builds.


--- gdb-6.3-bz182116-exec-from-pthread.patch DELETED ---


--- gdb-6.3-ia64-corefile-fix-20050127.patch DELETED ---


--- gdb-6.3-sepcrc-20050402.patch DELETED ---


--- gdb-6.3-test-sepcrc-20050402.patch DELETED ---



From jkratoch at fedoraproject.org  Fri Dec 18 09:51:52 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri, 18 Dec 2009 09:51:52 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb.spec,1.402,1.403
Message-ID: <20091218095152.5E50211C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17037

Modified Files:
	gdb.spec 
Log Message:
Fixup %{release}.



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- gdb.spec	18 Dec 2009 09:48:50 -0000	1.402
+++ gdb.spec	18 Dec 2009 09:51:52 -0000	1.403
@@ -29,7 +29,7 @@ Version: 7.0
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 10%{?_with_upstream:.upstream}%{dist}
+Release: 11%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+
 Group: Development/Debuggers



From tbzatek at fedoraproject.org  Fri Dec 18 09:55:17 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 18 Dec 2009 09:55:17 +0000 (UTC)
Subject: File nautilus-2.29.1.tar.bz2 uploaded to lookaside cache by tbzatek
Message-ID: <20091218095517.54DED28EDE7@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for nautilus:

d3bb9044b7900bb19a9cbbe0631246bd  nautilus-2.29.1.tar.bz2



From roland at fedoraproject.org  Fri Dec 18 09:56:48 2009
From: roland at fedoraproject.org (roland)
Date: Fri, 18 Dec 2009 09:56:48 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1875,
	1.1876 linux-2.6-utrace-ptrace.patch, 1.1,
	1.2 linux-2.6-utrace.patch, 1.119, 1.120
Message-ID: <20091218095648.2F1FF11C00E6@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18373

Modified Files:
	kernel.spec linux-2.6-utrace-ptrace.patch 
	linux-2.6-utrace.patch 
Log Message:
minor utrace update


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1875
retrieving revision 1.1876
diff -u -p -r1.1875 -r1.1876
--- kernel.spec	17 Dec 2009 16:49:39 -0000	1.1875
+++ kernel.spec	18 Dec 2009 09:56:47 -0000	1.1876
@@ -2009,6 +2009,9 @@ fi
 # and build.
 
 %changelog
+* Fri Dec 18 2009 Roland McGrath <roland at redhat.com> - 2.6.32.1-13
+- minor utrace update
+
 * Thu Dec 17 2009 Matthew Garrett <mjg at redhat.com> 2.6.32.1-12
 - linux-2.6-driver-level-usb-autosuspend.diff: fix so it works properly...
 - linux-2.6-fix-btusb-autosuspend.patch: avoid bluetooth connection drops

linux-2.6-utrace-ptrace.patch:
 include/linux/ptrace.h |    2 
 kernel/Makefile        |    1 
 kernel/ptrace-utrace.c | 1080 +++++++++++++++++++++++++++++++++++++++++++++++++
 kernel/ptrace.c        |  597 +++++++++++++--------------
 kernel/utrace.c        |   16 
 5 files changed, 1391 insertions(+), 305 deletions(-)

Index: linux-2.6-utrace-ptrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-utrace-ptrace.patch	16 Dec 2009 22:09:42 -0000	1.1
+++ linux-2.6-utrace-ptrace.patch	18 Dec 2009 09:56:47 -0000	1.2
@@ -1798,7 +1798,7 @@ index a408bf7..4e87441 100644  
  #endif	/* CONFIG_COMPAT */
 +#endif	/* CONFIG_UTRACE */
 diff --git a/kernel/utrace.c b/kernel/utrace.c
-index cb62fcd..9353cc5 100644  
+index 84d965d..ead1f13 100644  
 --- a/kernel/utrace.c
 +++ b/kernel/utrace.c
 @@ -811,6 +811,22 @@ relock:

linux-2.6-utrace.patch:
 Documentation/DocBook/Makefile    |    2 
 Documentation/DocBook/utrace.tmpl |  590 +++++++++
 fs/proc/array.c                   |    3 
 include/linux/sched.h             |    5 
 include/linux/tracehook.h         |   87 +
 include/linux/utrace.h            |  694 ++++++++++
 init/Kconfig                      |    9 
 kernel/Makefile                   |    1 
 kernel/fork.c                     |    3 
 kernel/ptrace.c                   |   14 
 kernel/utrace.c                   | 2427 ++++++++++++++++++++++++++++++++++++++
 11 files changed, 3833 insertions(+), 2 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- linux-2.6-utrace.patch	16 Dec 2009 22:09:42 -0000	1.119
+++ linux-2.6-utrace.patch	18 Dec 2009 09:56:47 -0000	1.120
@@ -35,8 +35,8 @@ Signed-off-by: Roland McGrath <roland at re
  kernel/Makefile                   |    1 +
  kernel/fork.c                     |    3 +
  kernel/ptrace.c                   |   14 +
- kernel/utrace.c                   | 2424 +++++++++++++++++++++++++++++++++++++
- 11 files changed, 3830 insertions(+), 2 deletions(-)
+ kernel/utrace.c                   | 2427 +++++++++++++++++++++++++++++++++++++
+ 11 files changed, 3833 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index ab8300f..95f59e4 100644  
@@ -685,7 +685,7 @@ index 6c8928b..139d300 100644  
     	u32 parent_exec_id;
     	u32 self_exec_id;
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index c78b2f4..0f5a48c 100644  
+index c78b2f4..71fa250 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -911,12 +911,12 @@ index c78b2f4..0f5a48c 100644  
  {
 +	struct task_struct *task = current;
 +	/*
-+	 * If we race with attach which sets nonzero ->utrace_flags,
-+	 * make sure we do not read ->utrace_flags before the caller
-+	 * clears TIF_NOTIFY_RESUME. This pairs with the implicit mb()
-+	 * before setting TIF_NOTIFY_RESUME in set_notify_resume().
++	 * Prevent the following store/load from getting ahead of the
++	 * caller which clears TIF_NOTIFY_RESUME. This pairs with the
++	 * implicit mb() before setting TIF_NOTIFY_RESUME in
++	 * set_notify_resume().
 +	 */
-+	smp_rmb();
++	smp_mb();
 +	if (task_utrace_flags(task))
 +		utrace_resume(task, regs);
  }
@@ -1623,12 +1623,12 @@ index ...c3036c8 100644  
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index eb4b337..0832ea2 100644  
+index eb4b337..140e636 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -295,6 +295,15 @@ config AUDIT
- 	  logging of avc messages output).  Does not do system-call
- 	  auditing without CONFIG_AUDITSYSCALL.
+@@ -310,6 +310,15 @@ config AUDIT_TREE
+ 	depends on AUDITSYSCALL
+ 	select INOTIFY
  
 +config UTRACE
 +	bool "Infrastructure for tracing and debugging user processes"
@@ -1639,9 +1639,9 @@ index eb4b337..0832ea2 100644  
 +	  kernel interface exported to kernel modules, to track events in
 +	  user threads, extract and change user thread state.
 +
- config AUDITSYSCALL
- 	bool "Enable system-call auditing support"
- 	depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH)
+ menu "RCU Subsystem"
+ 
+ choice
 diff --git a/kernel/Makefile b/kernel/Makefile
 index d7c13d2..263bb19 100644  
 --- a/kernel/Makefile
@@ -1723,10 +1723,10 @@ index b7c1d32..a408bf7 100644  
  	if (!current->ptrace) {
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...cb62fcd 100644  
+index ...84d965d 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2424 @@
+@@ -0,0 +1,2427 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2575,35 +2575,38 @@ index ...cb62fcd 100644  
 +
 +	spin_lock(&utrace->lock);
 +
-+	/*
-+	 * If the target will do some final callbacks but hasn't
-+	 * finished them yet, we know because it clears these event
-+	 * bits after it's done.  Instead of cleaning up here and
-+	 * requiring utrace_report_death() to cope with it, we delay
-+	 * the REAP report and the teardown until after the target
-+	 * finishes its death reports.
-+	 */
-+	if (reap && (target->utrace_flags & _UTRACE_DEATH_EVENTS)) {
++	if (reap) {
++		/*
++		 * If the target will do some final callbacks but hasn't
++		 * finished them yet, we know because it clears these event
++		 * bits after it's done.  Instead of cleaning up here and
++		 * requiring utrace_report_death() to cope with it, we
++		 * delay the REAP report and the teardown until after the
++		 * target finishes its death reports.
++		 */
 +		utrace->reap = 1;
-+		spin_unlock(&utrace->lock);
-+		return;
-+	}
-+
-+	/*
-+	 * After we unlock with this flag clear, any competing
-+	 * utrace_control/utrace_set_events calls know that we've
-+	 * finished our callbacks and any detach bookkeeping.
-+	 */
-+	utrace->death = 0;
 +
-+	if (!reap && !utrace->reap) {
++		if (target->utrace_flags & _UTRACE_DEATH_EVENTS) {
++			spin_unlock(&utrace->lock);
++			return;
++		}
++	} else {
 +		/*
-+		 * We're just dead, not reaped yet.
-+		 * This will reset @target->utrace_flags so the later
-+		 * call with @reap set won't hit the check above.
++		 * After we unlock with this flag clear, any competing
++		 * utrace_control/utrace_set_events calls know that we've
++		 * finished our callbacks and any detach bookkeeping.
 +		 */
-+		utrace_reset(target, utrace);
-+		return;
++		utrace->death = 0;
++
++		if (!utrace->reap) {
++			/*
++			 * We're just dead, not reaped yet.  This will
++			 * reset @target->utrace_flags so the later call
++			 * with @reap set won't hit the check above.
++			 */
++			utrace_reset(target, utrace);
++			return;
++		}
 +	}
 +
 +	/*



From pbrobinson at fedoraproject.org  Fri Dec 18 10:13:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 10:13:57 +0000 (UTC)
Subject: File moblin-panel-status-0.0.11.tar.bz2 uploaded to lookaside cache
	by pbrobinson
Message-ID: <20091218101357.5BFB528EDEE@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for moblin-panel-status:

5b899cff0682a5e1f7821e7a33f4b965  moblin-panel-status-0.0.11.tar.bz2



From pbrobinson at fedoraproject.org  Fri Dec 18 10:14:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 10:14:39 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel .cvsignore, 1.7,
	1.8 moblin-panel-status.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20091218101439.D19ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21259

Modified Files:
	.cvsignore moblin-panel-status.spec sources 
Log Message:
- New upstream 0.0.11 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Nov 2009 22:00:44 -0000	1.7
+++ .cvsignore	18 Dec 2009 10:14:39 -0000	1.8
@@ -1 +1 @@
-moblin-panel-status-0.0.10.tar.bz2
+moblin-panel-status-0.0.11.tar.bz2


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/moblin-panel-status.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- moblin-panel-status.spec	17 Nov 2009 22:00:44 -0000	1.9
+++ moblin-panel-status.spec	18 Dec 2009 10:14:39 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           moblin-panel-status
-Version:        0.0.10
+Version:        0.0.11
 Release:        1%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.11-1
+- New upstream 0.0.11 release
+
 * Tue Nov 17 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.10-1
 - New upstream 0.0.10 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Nov 2009 22:00:44 -0000	1.7
+++ sources	18 Dec 2009 10:14:39 -0000	1.8
@@ -1 +1 @@
-08502cc655947a39e8993dbc39776d76  moblin-panel-status-0.0.10.tar.bz2
+5b899cff0682a5e1f7821e7a33f4b965  moblin-panel-status-0.0.11.tar.bz2



From pbrobinson at fedoraproject.org  Fri Dec 18 10:22:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 10:22:56 +0000 (UTC)
Subject: File moblin-panel-people-0.0.11.tar.bz2 uploaded to lookaside cache
	by pbrobinson
Message-ID: <20091218102256.B9FD028EDBC@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for moblin-panel-people:

513900edf0832f0e37a91b0eac167c8a  moblin-panel-people-0.0.11.tar.bz2



From pbrobinson at fedoraproject.org  Fri Dec 18 10:24:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 10:24:37 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel .cvsignore, 1.9,
	1.10 moblin-panel-people.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20091218102437.839E011C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22886

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.11 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Nov 2009 21:50:19 -0000	1.9
+++ .cvsignore	18 Dec 2009 10:24:37 -0000	1.10
@@ -1 +1 @@
-moblin-panel-people-0.0.10.tar.bz2
+moblin-panel-people-0.0.11.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- moblin-panel-people.spec	17 Nov 2009 21:50:19 -0000	1.11
+++ moblin-panel-people.spec	18 Dec 2009 10:24:37 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.10
+Version:        0.0.11
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.11-1
+- New upstream 0.0.11 release
+
 * Tue Nov 17 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.10-1
 - New upstream 0.0.10 release, update licence to changed upstream license
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Nov 2009 21:50:20 -0000	1.9
+++ sources	18 Dec 2009 10:24:37 -0000	1.10
@@ -1 +1 @@
-6980bc5119f138b99b2aa771e95cdf01  moblin-panel-people-0.0.10.tar.bz2
+513900edf0832f0e37a91b0eac167c8a  moblin-panel-people-0.0.11.tar.bz2



From pbrobinson at fedoraproject.org  Fri Dec 18 10:25:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 10:25:53 +0000 (UTC)
Subject: File moblin-panel-pasteboard-0.0.3.tar.bz2 uploaded to lookaside
	cache by pbrobinson
Message-ID: <20091218102553.B5AF728EDF1@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for moblin-panel-pasteboard:

7c2f271731c40926e5ddd79679d61140  moblin-panel-pasteboard-0.0.3.tar.bz2



From pbrobinson at fedoraproject.org  Fri Dec 18 10:27:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 18 Dec 2009 10:27:11 +0000 (UTC)
Subject: rpms/moblin-panel-pasteboard/devel .cvsignore, 1.3,
	1.4 moblin-panel-pasteboard.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091218102711.8D42811C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-pasteboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23637

Modified Files:
	.cvsignore moblin-panel-pasteboard.spec sources 
Log Message:
- New upstream 0.0.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-pasteboard/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Sep 2009 16:22:26 -0000	1.3
+++ .cvsignore	18 Dec 2009 10:27:11 -0000	1.4
@@ -1 +1 @@
-moblin-panel-pasteboard-0.0.2.tar.bz2
+moblin-panel-pasteboard-0.0.3.tar.bz2


Index: moblin-panel-pasteboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-pasteboard/devel/moblin-panel-pasteboard.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-panel-pasteboard.spec	18 Sep 2009 16:22:26 -0000	1.2
+++ moblin-panel-pasteboard.spec	18 Dec 2009 10:27:11 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           moblin-panel-pasteboard
-Version:        0.0.2
+Version:        0.0.3
 Release:        1%{?dist}
 Summary:        Moblin Panel for Paste Board
 
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
+- New upstream 0.0.3 release
+
 * Fri Sep 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-1
 - New upstream 0.0.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-pasteboard/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Sep 2009 16:22:26 -0000	1.3
+++ sources	18 Dec 2009 10:27:11 -0000	1.4
@@ -1 +1 @@
-5e343743b20bae965cb2bdf3de1987b2  moblin-panel-pasteboard-0.0.2.tar.bz2
+7c2f271731c40926e5ddd79679d61140  moblin-panel-pasteboard-0.0.3.tar.bz2



From jwrdegoede at fedoraproject.org  Fri Dec 18 10:29:01 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 18 Dec 2009 10:29:01 +0000 (UTC)
Subject: rpms/parted/F-12 parted-1.9.0-lo-as-file-rh546622.patch, NONE,
	1.1 parted-1.9.0-ru-rh543029.patch, NONE, 1.1 parted.spec, 1.150,
	1.151
Message-ID: <20091218102901.99A2D11C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/parted/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24001

Modified Files:
	parted.spec 
Added Files:
	parted-1.9.0-lo-as-file-rh546622.patch 
	parted-1.9.0-ru-rh543029.patch 
Log Message:
* Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17.1
- Allow partitioning of loopback devices (#546622)
- Don't crash when printing partition tables in Russian (#543029)


parted-1.9.0-lo-as-file-rh546622.patch:
 linux.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE parted-1.9.0-lo-as-file-rh546622.patch ---
diff -up parted-1.9.0/libparted/arch/linux.c.orig parted-1.9.0/libparted/arch/linux.c
--- parted-1.9.0/libparted/arch/linux.c.orig	2009-12-14 22:44:18.000000000 +0100
+++ parted-1.9.0/libparted/arch/linux.c	2009-12-15 10:25:38.000000000 +0100
@@ -259,6 +259,7 @@ struct blkdev_ioctl_param {
 #define SX8_MAJOR2              161
 #define XVD_MAJOR               202
 #define SDMMC_MAJOR             179
+#define LOOP_MAJOR              7
 
 #define SCSI_BLK_MAJOR(M) (                                             \
                 (M) == SCSI_DISK0_MAJOR                                 \
@@ -561,6 +562,8 @@ _device_probe_type (PedDevice* dev)
                 dev->type = PED_DEVICE_SDMMC;
         } else if (_is_virtblk_major(dev_major)) {
                 dev->type = PED_DEVICE_VIRTBLK;
+        } else if (dev_major == LOOP_MAJOR) {
+                dev->type = PED_DEVICE_FILE;
         } else {
                 dev->type = PED_DEVICE_UNKNOWN;
         }

parted-1.9.0-ru-rh543029.patch:
 parted.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE parted-1.9.0-ru-rh543029.patch ---
diff -up parted-1.9.0/parted/parted.c.ru parted-1.9.0/parted/parted.c
--- parted-1.9.0/parted/parted.c.ru	2009-12-17 10:32:41.000000000 +0100
+++ parted-1.9.0/parted/parted.c	2009-12-17 10:32:01.000000000 +0100
@@ -1227,7 +1227,7 @@ partition_print_flags (PedPartition* par
                         ped_realloc (&_res, strlen (res) + 1
                                                    + strlen (name));
                         res = _res;
-                        strncat (res, name, 21);
+                        strcat (res, name);
                 }
         }
 


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/F-12/parted.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- parted.spec	8 Oct 2009 09:14:57 -0000	1.150
+++ parted.spec	18 Dec 2009 10:29:01 -0000	1.151
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 17%{?dist}
+Release: 17.1%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -27,6 +27,8 @@ Patch14:  %{name}-1.9.0-commit-without-c
 Patch15:  %{name}-1.9.0-dont-touch-part-nodes.patch
 Patch16:  %{name}-1.9.0-ped_partition_is_busy-no-exception.patch
 Patch17:  %{name}-1.9.0-gpt-big-endian.patch
+Patch18:  %{name}-1.9.0-lo-as-file-rh546622.patch
+Patch19:  %{name}-1.9.0-ru-rh543029.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -81,6 +83,8 @@ Parted library, you need to install this
 %patch15 -p1 -b .dont-touch-part-nodes
 %patch16 -p1 -b .ped_partition_is_busy
 %patch17 -p1 -b .gpt-big-endian
+%patch18 -p1
+%patch19 -p1
 
 
 %build
@@ -142,6 +146,10 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17.1
+- Allow partitioning of loopback devices (#546622)
+- Don't crash when printing partition tables in Russian (#543029)
+
 * Thu Oct  8 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17
 - Only change the partition type to 82 when setting the swap flag on dos
   labels, not when resetting it



From rvokal at fedoraproject.org  Fri Dec 18 10:38:24 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 18 Dec 2009 10:38:24 +0000 (UTC)
Subject: rpms/wireshark/F-12 wireshark-1.2.4-disable_warning_dialog.patch,
	NONE, 1.1 wireshark-1.2.4-enable_lua.patch, NONE,
	1.1 wireshark-1.2.4-filter_null.patch, NONE, 1.1 wireshark.spec,
	1.60, 1.61
Message-ID: <20091218103824.64B4D11C00E6@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25601

Modified Files:
	wireshark.spec 
Added Files:
	wireshark-1.2.4-disable_warning_dialog.patch 
	wireshark-1.2.4-enable_lua.patch 
	wireshark-1.2.4-filter_null.patch 
Log Message:
upgrade to 1.2.5, add -devel support and Lua support

wireshark-1.2.4-disable_warning_dialog.patch:
 main.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE wireshark-1.2.4-disable_warning_dialog.patch ---
diff -up wireshark-1.2.4/gtk/main.c.dialog wireshark-1.2.4/gtk/main.c
--- wireshark-1.2.4/gtk/main.c.dialog	2009-11-16 21:30:43.000000000 +0100
+++ wireshark-1.2.4/gtk/main.c	2009-12-16 10:53:52.000000000 +0100
@@ -1227,11 +1227,12 @@ set_display_filename(capture_file *cf)
 
 GtkWidget           *close_dlg = NULL;
 
-static void
+/*static void
 priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
 {
     recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
 }
+*/
 
 #ifdef _WIN32
 static void
@@ -2559,7 +2560,7 @@ main(int argc, char *argv[])
   main_load_window_geometry(top_level);
 
   /* Tell the user not to run as root. */
-  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
+/*  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
     cur_user = get_cur_username();
     cur_group = get_cur_groupname();
     priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
@@ -2570,6 +2571,7 @@ main(int argc, char *argv[])
     simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
     simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
   }
+*/
 
 #ifdef _WIN32
   /* Warn the user if npf.sys isn't loaded. */

wireshark-1.2.4-enable_lua.patch:
 template-init.lua |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE wireshark-1.2.4-enable_lua.patch ---
diff -up wireshark-1.2.4/epan/wslua/template-init.lua.enable_lua wireshark-1.2.4/epan/wslua/template-init.lua
--- wireshark-1.2.4/epan/wslua/template-init.lua.enable_lua	2009-11-16 21:30:58.000000000 +0100
+++ wireshark-1.2.4/epan/wslua/template-init.lua	2009-12-15 09:33:59.000000000 +0100
@@ -26,7 +26,7 @@
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 -- Lua is disabled by default, comment out the following line to enable Lua support.
-disable_lua = true; do return end;
+-- disable_lua = true; do return end;
 
 
 -- If set and we are running with special privileges this setting
@@ -39,7 +39,7 @@ if running_superuser then
     local disabled_lib = {}
     setmetatable(disabled_lib,{ __index = function() error("this package has been disabled") end } );
 
-    dofile = function() error("dofile has been disabled") end
+--    dofile = function() error("dofile has been disabled") end
     loadfile = function() error("loadfile has been disabled") end
     loadlib = function() error("loadlib has been disabled") end
     require = function() error("require has been disabled") end

wireshark-1.2.4-filter_null.patch:
 filter_autocomplete.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE wireshark-1.2.4-filter_null.patch ---
diff -up wireshark-1.2.4/gtk/filter_autocomplete.c.bckp wireshark-1.2.4/gtk/filter_autocomplete.c
--- wireshark-1.2.4/gtk/filter_autocomplete.c.bckp	2009-11-16 21:30:43.000000000 +0100
+++ wireshark-1.2.4/gtk/filter_autocomplete.c	2009-12-14 15:51:18.000000000 +0100
@@ -776,7 +776,9 @@ filter_autocomplete_handle_backspace(Gtk
   GtkRequisition requisition;
   size_t prefix_len;
   gboolean protocols_only = FALSE;
-
+  
+  if (prefix == NULL) return;
+  
   /* Delete the last character in the prefix string */
   prefix_len = strlen(prefix)-1;
   prefix[prefix_len] = '\0';


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-12/wireshark.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- wireshark.spec	30 Nov 2009 13:38:57 -0000	1.60
+++ wireshark.spec	18 Dec 2009 10:38:24 -0000	1.61
@@ -2,6 +2,7 @@
 #define to 0 for final version
 %define svn_version 0
 %define with_adns 0
+%define with_lua 1
 %if 0%{?rhel} != 0
 %define with_portaudio 0
 %else
@@ -10,7 +11,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.4
+Version:	1.2.5
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -26,6 +27,9 @@ Patch1:		wireshark-1.0.2-pie.patch
 Patch2:		wireshark-nfsv4-opts.patch
 Patch3:		wireshark-0.99.7-path.patch
 Patch4:		wireshark-1.1.2-nfs41-backchnl-decode.patch
+Patch5:		wireshark-1.2.4-filter_null.patch
+Patch6:		wireshark-1.2.4-enable_lua.patch
+Patch7:		wireshark-1.2.4-disable_warning_dialog.patch
 
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +50,9 @@ BuildRequires:	adns-devel
 %if %{with_portaudio}
 BuildRequires: portaudio-devel
 %endif
-
+%if %{with_lua}
+BuildRequires:	lua-devel
+%endif
 Obsoletes:	ethereal
 Provides:	ethereal
 
@@ -68,6 +74,11 @@ Requires:	portaudio
 Obsoletes:	ethereal-gnome
 Provides:	ethereal-gnome
 
+%package devel
+Summary:        Development headers and libraries for wireshark
+Group:		Development/Libraries
+Requires:       %{name} = %{version} glibc-devel glib2-devel
+
 
 %description
 Wireshark is a network traffic analyzer for Unix-ish operating systems.
@@ -80,6 +91,11 @@ separately to GTK+ package.
 %description gnome
 Contains wireshark for Gnome 2 and desktop integration file
 
+%description devel
+The wireshark-devel package contains the header files, developer
+documentation, and libraries required for development of wireshark scripts
+and plugins.
+
 
 %prep
 %if %{svn_version}
@@ -91,6 +107,13 @@ Contains wireshark for Gnome 2 and deskt
 %patch2 -p1 
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
+%if %{with_lua}
+%patch6 -p1 -b .enable_lua
+%endif
+
+%patch7 -p1 -b .dialog
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -117,9 +140,14 @@ export LDFLAGS="$LDFLAGS -lm -lcrypto"
 %else
    --with-adns=no \
 %endif
+%if %{with_lua}
+   --with-lua \
+%else
+   --with-lua=no \
+%endif
    --with-ssl \
    --disable-warnings-as-errors \
-   --with-plugindir=%{_libdir}/%{name}/plugins/%{version}
+   --with-plugindir=%{_libdir}/%{name}/plugins/%{version} 
 time make %{?_smp_mflags}
 
 %install
@@ -133,9 +161,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 #symlink tshark to tethereal
 ln -s tshark $RPM_BUILD_ROOT%{_sbindir}/tethereal
 
-#empty?!
-rm -f $RPM_BUILD_ROOT%{_sbindir}/idl2wrs
-
 # install support files for usermode, gnome and kde
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wireshark
@@ -160,6 +185,56 @@ desktop-file-install --vendor fedora    
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 image/wsicon48.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/wireshark.png
 
+#install devel files
+install -d -m 0755  $RPM_BUILD_ROOT/%{_includedir}/wireshark
+IDIR="${RPM_BUILD_ROOT}%{_includedir}/wireshark"
+mkdir -p "${IDIR}/epan"
+mkdir -p "${IDIR}/epan/ftypes"
+mkdir -p "${IDIR}/epan/dfilter"
+mkdir -p "${IDIR}/wiretap"
+install -m 644 color.h			"${IDIR}/"
+install -m 644 epan/packet.h		"${IDIR}/epan/"
+install -m 644 epan/prefs.h		"${IDIR}/epan/"
+install -m 644 epan/proto.h		"${IDIR}/epan/"
+install -m 644 epan/tvbuff.h		"${IDIR}/epan/"
+install -m 644 epan/pint.h		"${IDIR}/epan/"
+install -m 644 epan/to_str.h		"${IDIR}/epan/"
+install -m 644 epan/value_string.h	"${IDIR}/epan/"
+install -m 644 epan/column_info.h	"${IDIR}/epan/"
+install -m 644 epan/frame_data.h	"${IDIR}/epan/"
+install -m 644 epan/packet_info.h	"${IDIR}/epan/"
+install -m 644 epan/column-utils.h	"${IDIR}/epan/"
+install -m 644 epan/epan.h		"${IDIR}/epan/"
+install -m 644 epan/range.h		"${IDIR}/epan/"
+install -m 644 epan/gnuc_format_check.h	"${IDIR}/epan/"
+install -m 644 epan/ipv4.h		"${IDIR}/epan"
+install -m 644 epan/nstime.h		"${IDIR}/epan/"
+install -m 644 epan/ipv6-utils.h	"${IDIR}/epan/"
+install -m 644 epan/guid-utils.h	"${IDIR}/epan/"
+install -m 644 epan/exceptions.h	"${IDIR}/epan/"
+install -m 644 epan/address.h		"${IDIR}/epan/"
+install -m 644 epan/slab.h		"${IDIR}/epan/"
+install -m 644 epan/except.h		"${IDIR}/epan/"
+install -m 644 epan/ftypes/ftypes.h	"${IDIR}/epan/ftypes/"
+install -m 644 epan/dfilter/dfilter.h	"${IDIR}/epan/dfilter/"
+install -m 644 epan/dfilter/drange.h	"${IDIR}/epan/dfilter/"
+install -m 644 wiretap/wtap.h		"${IDIR}/wiretap/"
+
+#	Create pkg-config control file.
+mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig"
+cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/wireshark.pc" <<- "EOF"
+	prefix=%{_prefix}
+	exec_prefix=%{_prefix}
+	libdir=%{_libdir}
+	includedir=%{_includedir}
+
+	Name:		%{name}
+	Description:	Network Traffic Analyzer
+	Version:	%{version}
+	Requires:	glib-2.0
+	Libs:		-L${libdir} -lwireshark -lwiretap
+	Cflags:		-DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -I${includedir}/wireshark -I${includedir}/wireshark/epan
+EOF
 
 # Remove .la files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la
@@ -189,17 +264,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/tethereal
 %{_sbindir}/rawshark
 %{python_sitelib}/*
-%{_libdir}/lib*
+%{_libdir}/lib*.so.*
+%{_libdir}/wireshark/plugins
 %{_mandir}/man1/editcap.*
 %{_mandir}/man1/tshark.*
-%{_mandir}/man1/idl2wrs.*
 %{_mandir}/man1/mergecap.*
 %{_mandir}/man1/text2pcap.*
 %{_mandir}/man1/capinfos.*
 %{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/wireshark-filter.*
 %{_mandir}/man1/rawshark.*
-%{_libdir}/wireshark
+#%{_libdir}/wireshark
 %config(noreplace) %{_sysconfdir}/pam.d/wireshark
 %config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
 %{_datadir}/wireshark
@@ -212,12 +287,35 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/wireshark
 %{_mandir}/man1/wireshark.*
 
+%files devel
+%defattr(-,root,root)
+%doc doc/README.*
+%{_includedir}/wireshark
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_mandir}/man1/idl2wrs.*
+%{_sbindir}/idl2wrs
+%if %{with_lua}
+%config(noreplace) %{_datadir}/wireshark/init.lua
+%endif
 
 %changelog
-* Mon Nov 30 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-1
+* Fri Dec 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.5-1
+- upgrade to 1.2.5
+- fixes security vulnaribilities, see http://www.wireshark.org/security/wnpa-sec-2009-09.html 
+- split -devel package (#547899, #203642, #218451)
+- removing root warning dialog (#543709)
+- enable lua support - http://wiki.wireshark.org/Lua
+- attempt to fix filter crash on 64bits
+
+* Wed Nov 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-1
 - upgrade to 1.2.4
 - http://www.wireshark.org/docs/relnotes/wireshark-1.2.4.html
 
+* Fri Oct 30 2009 Radek Vokal <rvokal at redhat.com> - 1.2.3-1
+- upgrade to 1.2.3
+- http://www.wireshark.org/docs/relnotes/wireshark-1.2.3.html
+
 * Mon Sep 21 2009 Radek Vokal <rvokal at redhat.com> - 1.2.2-1
 - upgrade to 1.2.2
 - http://www.wireshark.org/docs/relnotes/wireshark-1.2.2.html



From itamarjp at fedoraproject.org  Fri Dec 18 10:39:16 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 18 Dec 2009 10:39:16 +0000 (UTC)
Subject: rpms/purple-msn-pecan/devel
	purple-msn-pecan-handle_malformed_data.patch, NONE,
	1.1 import.log, 1.1, 1.2 purple-msn-pecan.spec, 1.6,
	1.7 purple-msn-pecan-0.0.18_ru-po.patch, 1.1, NONE
Message-ID: <20091218103916.6341A11C00E6@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/purple-msn-pecan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25748/devel

Modified Files:
	import.log purple-msn-pecan.spec 
Added Files:
	purple-msn-pecan-handle_malformed_data.patch 
Removed Files:
	purple-msn-pecan-0.0.18_ru-po.patch 
Log Message:
update devel branch


purple-msn-pecan-handle_malformed_data.patch:
 pn_oim.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE purple-msn-pecan-handle_malformed_data.patch ---
diff -Naur msn-pecan-0.1.0-rc1.orig/pn_oim.c msn-pecan-0.1.0-rc1/pn_oim.c
--- msn-pecan-0.1.0-rc1.orig/pn_oim.c	2009-07-19 13:10:53.000000000 +0200
+++ msn-pecan-0.1.0-rc1/pn_oim.c	2009-12-18 10:11:11.000000000 +0100
@@ -465,7 +465,8 @@
         gchar *end;
         cur += 2;
         end = strstr (cur, "\r\n\r\n");
-        *end = '\0';
+	if (end)
+		*end = '\0';
         message = (gchar *) purple_base64_decode (cur, NULL);
     }
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Jan 2009 19:05:09 -0000	1.1
+++ import.log	18 Dec 2009 10:39:16 -0000	1.2
@@ -1 +1,2 @@
 purple-msn-pecan-0_0_17-4_fc10:HEAD:purple-msn-pecan-0.0.17-4.fc10.src.rpm:1233079153
+purple-msn-pecan-0_1_0-0_3_rc1_fc12:HEAD:purple-msn-pecan-0.1.0-0.3.rc1.fc12.src.rpm:1261132677


Index: purple-msn-pecan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/purple-msn-pecan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- purple-msn-pecan.spec	11 Aug 2009 12:45:07 -0000	1.6
+++ purple-msn-pecan.spec	18 Dec 2009 10:39:16 -0000	1.7
@@ -1,13 +1,17 @@
 %define		realname msn-pecan
 Name:		purple-%{realname}
 Version:	0.1.0
-Release:	0.1.rc1%{?dist}
+Release:	0.3.rc1%{?dist}
 Summary:	Alternative MSN protocol plugin for libpurple 
 
 Group:		Applications/Internet 
 License:	GPLv2+
 URL:		http://code.google.com/p/msn-pecan/ 
 Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}-rc1.tar.bz2
+
+# Upstream has applied this patch see http://groups.google.com/group/msn-pecan/browse_thread/thread/3df8df31f2faa25b?pli=1
+Patch0:		purple-msn-pecan-handle_malformed_data.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel 
@@ -40,7 +44,7 @@ Other features:
 
 %prep
 %setup -q -n %{realname}-%{version}-rc1
-
+%patch0 -p1 -b malformed_data.rej
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes
@@ -70,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.3.rc1
+- patch to handle malformed data was not complete (bz #547836)
+
+* Mon Dec 14 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.2.rc1
+- Add Simone Contini's patch to handle malformed data in process_body_receive (bz #547078)
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.1.0-0.1.rc1
 - Update to 0.1.0-rc1.
 


--- purple-msn-pecan-0.0.18_ru-po.patch DELETED ---



From than at fedoraproject.org  Fri Dec 18 10:53:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 18 Dec 2009 10:53:39 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs-4.4-sonnet.patch, NONE, 1.1 kdelibs.spec, 
	1.534, 1.535
Message-ID: <20091218105339.AE5B611C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28014

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.4-sonnet.patch 
Log Message:
- fix bz#531211, backport sonnet patch, fix rendering issue in indic, asian, arabic
  languages


kdelibs-4.4-sonnet.patch:
 filter.cpp |  212 +++++++++++++++++++++++++------------------------------------
 filter_p.h |    7 --
 2 files changed, 92 insertions(+), 127 deletions(-)

--- NEW FILE kdelibs-4.4-sonnet.patch ---
--- kdelibs/kdecore/sonnet/filter_p.h	2009/10/01 20:06:45	1030189
+++ kdelibs/kdecore/sonnet/filter_p.h	2009/11/29 23:10:00	1056377
@@ -22,6 +22,7 @@
 #ifndef SONNET_FILTER_P_H
 #define SONNET_FILTER_P_H
 
+#include <QtCore/QTextBoundaryFinder>
 #include <QtCore/QString>
 #include <kdecore_export.h>
 
@@ -89,7 +90,6 @@
         void restart();
 
         virtual Word nextWord() const;
-        virtual Word previousWord() const;
         virtual Word wordAtPosition( unsigned int pos ) const;
 
         virtual void setCurrentPosition( int );
@@ -103,13 +103,12 @@
     protected:
         bool trySkipLinks() const;
         bool ignore( const QString& word ) const;
-        QChar skipToLetter( int &fromPosition ) const;
         bool shouldBeSkipped( bool wordWasUppercase, bool wordWasRunTogether,
                               const QString& foundWord ) const;
 
     protected:
-        QString      m_buffer;
-        mutable int m_currentPosition;
+        QString m_buffer;
+        mutable QTextBoundaryFinder m_finder;
 
     private:
         class Private;
--- kdelibs/kdecore/sonnet/filter.cpp	2009/06/22 10:01:33	985167
+++ kdelibs/kdecore/sonnet/filter.cpp	2009/11/29 23:10:00	1056377
@@ -52,8 +52,7 @@
 }
 
 Filter::Filter()
-    : m_currentPosition(0),
-      d(new Private)
+    : d(new Private)
 {
     d->settings = 0;
 }
@@ -75,13 +74,13 @@
 
 void Filter::restart()
 {
-    m_currentPosition = 0;
+    m_finder.toStart();
 }
 
 void Filter::setBuffer( const QString& buffer )
 {
-    m_buffer          = buffer;
-    m_currentPosition = 0;
+    m_buffer = buffer;
+    m_finder = QTextBoundaryFinder(QTextBoundaryFinder::Word, m_buffer);
 }
 
 QString Filter::buffer() const
@@ -91,135 +90,110 @@
 
 bool Filter::atEnd() const
 {
-    return m_currentPosition >= m_buffer.length();
+    return m_finder.position() >= m_buffer.length();
 }
 
-Word Filter::nextWord() const
+static inline bool
+isSpaceOrPunct(const QString &str)
 {
-    QChar currentChar = skipToLetter( m_currentPosition );
-
-    if ( m_currentPosition >= m_buffer.length() || currentChar.isNull() ) {
-        return Filter::end();
-    }
+    return (str.length() <= 1 && (str[0].isSpace() || str[0].isPunct()));
+}
 
-    bool allUppercase = currentChar.category() & QChar::Letter_Uppercase;
-    bool runTogether = false;
+static bool
+finderNextWord(QTextBoundaryFinder &finder, QString &word, int &bufferStart)
+{
+    QTextBoundaryFinder::BoundaryReasons boundary = finder.boundaryReasons();
+    int start = finder.position(), end = finder.position();
+    bool inWord = (boundary & QTextBoundaryFinder::StartWord) != 0;
 
-    QString foundWord;
-    int start = m_currentPosition;
+    while (finder.toNextBoundary() > 0) {
+        boundary = finder.boundaryReasons();
 
-    // Loop through the chars of the word, until the current char is not a letter
-    // anymore.
-    // Include apostrophes in the word, but not when it is the first character,
-    // as it might be used as 'quotes'.
-    // This way, we'll pass contractions like "I've" to the spellchecker, and
-    // only the word inside apostrophe-quotes, without the apostrophes.
-    while ( currentChar.isLetter() ||
-            ( currentChar == '\'' && start != m_currentPosition ) ) {
-        if ( currentChar.category() & QChar::Letter_Lowercase )
-            allUppercase = false;
-
-	/* FIXME: this does not work for Hebrew for example
-        //we consider run-together words as mixed-case words
-        if ( !allUppercase &&
-             currentChar.category() & QChar::Letter_Uppercase )
-            runTogether = true;
-	*/
-
-        foundWord += currentChar;
-        //Test if currentPosition exists, otherwise go out
-        if( (m_currentPosition + 1) >= m_buffer.length()) {
-
-            // Remove apostrophes at the end of the word, it probably comes from
-            // quoting with apostrophes.
-            if ( foundWord.endsWith( '\'' ) )
-                foundWord.chop( 1 );
-
-            if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) ) {
-                ++m_currentPosition;
-                return nextWord();
-            }
-            else {
-                ++m_currentPosition;
-                return Word( foundWord, start );
+        if ((boundary & QTextBoundaryFinder::EndWord) && inWord) {
+            end = finder.position();
+            QString str = finder.string().mid(start, end - start);
+            if (!isSpaceOrPunct(str)) {
+                word = str;
+                bufferStart = start;
+#if 0
+                qDebug()<< "Word at " << start<< " word = '"
+                        <<  str << "', len = " << str.length();
+#endif
+                return true;
             }
+            inWord = false;
+        }
+        if ((boundary & QTextBoundaryFinder::StartWord)) {
+            start = finder.position();
+            inWord = true;
         }
-        ++m_currentPosition;
-        currentChar = m_buffer.at( m_currentPosition );
     }
+    return false;
+}
 
-    // Remove apostrophes at the end of the word, it probably comes from
-    // quoting with apostrophes.
-    if ( foundWord.endsWith( '\'' ) )
-        foundWord.chop( 1 );
-
-    if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) )
-        return nextWord();
-    return Word( foundWord, start );
+static bool finderWordAt(QTextBoundaryFinder &finder,
+                         int at,
+                         QString &word, int &bufferStart)
+{
+    int oldPosition = finder.position();
+
+    finder.setPosition(at);
+    if (!finder.isAtBoundary() || (finder.boundaryReasons() & QTextBoundaryFinder::EndWord)) {
+        if (finder.toPreviousBoundary() <= 0) {
+            /* QTextBoundaryIterator doesn't consider start of the string
+             * a boundary so we need to rewind to the beginning to catch
+             * the first word */
+            if (at > 0 && finder.string().length() > 0) {
+                finder.toStart();
+            } else
+                return false;
+        }
+    }
+    bool ret = finderNextWord(finder, word, bufferStart);
+    finder.setPosition(oldPosition);
+    return ret;
 }
 
-Word Filter::previousWord() const
+Word Filter::nextWord() const
 {
-    while ( !m_buffer.at( m_currentPosition ).isLetter() &&
-            m_currentPosition != 0) {
-        --m_currentPosition;
-    }
+    QString foundWord;
+    int start;
+    bool allUppercase = false;
+    bool runTogether = false;
 
-    if ( m_currentPosition == 0 ) {
+    if (!finderNextWord(m_finder, foundWord, start))
         return Filter::end();
-    }
-
-    QString foundWord;
-    int start = m_currentPosition;
-    while ( m_buffer.at( start ).isLetter() ) {
-        foundWord.prepend( m_buffer.at( m_currentPosition ) );
-        --start;
-    }
 
+    if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) )
+        return nextWord();
     return Word( foundWord, start );
 }
 
 Word Filter::wordAtPosition( unsigned int pos ) const
 {
-    if ( (int)pos > m_buffer.length() )
-        return Filter::end();
-
-    int currentPosition = pos - 1;
     QString foundWord;
-    while ( currentPosition >= 0 &&
-            m_buffer.at( currentPosition ).isLetter() ) {
-        foundWord.prepend( m_buffer.at( currentPosition ) );
-        --currentPosition;
-    }
-
-    // currentPosition == 0 means the first char is not letter
-    // currentPosition == -1 means we reached the beginning
-    int start = (currentPosition < 0) ? 0 : ++currentPosition;
-    currentPosition = pos ;
-    if ( currentPosition < m_buffer.length() && m_buffer.at( currentPosition ).isLetter() ) {
-        while ( m_buffer.at( currentPosition ).isLetter() ) {
-            foundWord.append( m_buffer.at( currentPosition ) );
-            ++currentPosition;
-        }
-    }
-
+    int start;
+    if (!finderWordAt(m_finder, pos, foundWord, start))
+        return Filter::end();
     return Word( foundWord, start );
 }
 
 
 void Filter::setCurrentPosition( int i )
 {
-    m_currentPosition = i;
+    QString word;
+    int pos;
 
-    //go back to the last word so that next word returns something
-    //useful
-    while ( m_buffer.at( m_currentPosition ).isLetter() && m_currentPosition > 0 )
-        --m_currentPosition;
+    //to make sure we're at an reasonable word boundary
+    if (!finderWordAt(m_finder, i, word, pos)) {
+        return;
+    }
+    m_finder.setPosition(pos);
 }
 
 int Filter::currentPosition() const
 {
-    return m_currentPosition;
+    return m_finder.position();
 }
 
 void Filter::replace( const Word& w, const QString& newWord)
@@ -227,8 +201,10 @@
     int oldLen = w.word.length();
 
     //start spell checkin from the just correct word
-    m_currentPosition = w.start;
     m_buffer = m_buffer.replace( w.start, oldLen, newWord );
+    m_finder = QTextBoundaryFinder(QTextBoundaryFinder::Word,
+                                     m_buffer);
+    m_finder.setPosition(w.start);
 }
 
 QString Filter::context() const
@@ -236,12 +212,12 @@
     int len = 60;
     //we don't want the expression underneath casted to an unsigned int
     //which would cause it to always evaluate to false
-    int signedPosition = m_currentPosition;
+    int signedPosition = m_finder.position();
     bool begin = (signedPosition - len/2)<=0;
 
 
     QString buffer = m_buffer;
-    Word word = wordAtPosition( m_currentPosition );
+    Word word = wordAtPosition( m_finder.position() );
     buffer = buffer.replace( word.start, word.word.length(),
                              QString( "<b>%1</b>" ).arg( word.word ) );
 
@@ -251,7 +227,7 @@
                   .arg( buffer.mid(  0, len ) );
     else
         context = QString( "...%1..." )
-                  .arg( buffer.mid(  m_currentPosition - 20, len ) );
+                  .arg( buffer.mid(  m_finder.position() - 20, len ) );
 
     context.replace( '\n', ' ' );
 
@@ -260,24 +236,27 @@
 
 bool Filter::trySkipLinks() const
 {
-    QChar currentChar = m_buffer.at( m_currentPosition );
+    QChar currentChar = m_buffer.at( m_finder.position() );
+    int currentPosition = m_finder.position();
 
     int length = m_buffer.length();
     //URL - if so skip
     if ( currentChar == ':'
-         && (m_currentPosition+1 < length)
-         && (m_buffer.at( ++m_currentPosition ) == '/' || ( m_currentPosition + 1 ) >= length ) ) {
+         && (currentPosition+1 < length)
+         && (m_buffer.at( ++currentPosition ) == '/' || ( currentPosition + 1 ) >= length ) ) {
         //in both cases url is considered finished at the first whitespace occurrence
         //TODO hey, "http://en.wikipedia.org/wiki/Main Page" --Nick Shaforostoff
-        while ( !m_buffer.at( m_currentPosition++ ).isSpace() && m_currentPosition < length )
+        while ( !m_buffer.at( currentPosition++ ).isSpace() && currentPosition < length )
             ;
+        m_finder.setPosition(currentPosition);
         return true;
     }
 
     //Email - if so skip
     if ( currentChar == '@') {
-        while ( ++m_currentPosition < length && !m_buffer.at( m_currentPosition ).isSpace() )
+        while ( ++currentPosition < length && !m_buffer.at( currentPosition ).isSpace() )
             ;
+        m_finder.setPosition(currentPosition);
         return true;
     }
 
@@ -289,19 +268,6 @@
     return d->settings && d->settings->ignore( word );
 }
 
-QChar Filter::skipToLetter( int &fromPosition ) const
-{
-    //if( m_buffer.isEmpty())
-    if (fromPosition>=m_buffer.size())
-        return QChar();
-    QChar currentChar = m_buffer.at( fromPosition );
-    while ( !currentChar.isLetter() &&
-            (int)++fromPosition < m_buffer.length() ) {
-        currentChar = m_buffer.at( fromPosition );
-    }
-    return currentChar;
-}
-
 bool Filter::shouldBeSkipped( bool wordWasUppercase, bool wordWasRunTogether,
                              const QString& foundWord ) const
 {


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -p -r1.534 -r1.535
--- kdelibs.spec	9 Dec 2009 14:43:12 -0000	1.534
+++ kdelibs.spec	18 Dec 2009 10:53:39 -0000	1.535
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -86,6 +86,10 @@ Patch50: http://bazaar.launchpad.net/~ku
 # http://websvn.kde.org/?view=revision&revision=1027234
 # add adFilteredBy API required for konq-plugins-4.3.3 to build
 Patch100: kdelibs-4.3.3-adFilteredBy.patch
+# 4.4 trunk
+# http://websvn.kde.org/?view=revision&revision=1056377
+# sonnet was broken with indic, asian, arabic
+Patch101: kdelibs-4.4-sonnet.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -211,6 +215,7 @@ format for easy browsing.
 %patch50 -p1 -b .kaction_qt_keys
 # 4.4
 %patch100 -p0 -b .adFilteredBy
+%patch101 -p1 -b .sonnet
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -403,6 +408,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 4.3.4-3
+- fix bz#531211, backport sonnet patch, fix rendering issue in indic, asian, arabic 
+  languages
+
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
 - add workaound for low-mem systems
 



From lennart at fedoraproject.org  Fri Dec 18 10:57:27 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 18 Dec 2009 10:57:27 +0000 (UTC)
Subject: File rtkit-0.5.tar.gz uploaded to lookaside cache by lennart
Message-ID: <20091218105727.70C6A28EDBC@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for rtkit:

40ddb80715e89a79fe6ce24f5ce3b782  rtkit-0.5.tar.gz



From jpopelka at fedoraproject.org  Fri Dec 18 10:57:47 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri, 18 Dec 2009 10:57:47 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-selection-browse.patch, NONE,
	1.1 system-config-printer.spec, 1.326, 1.327
Message-ID: <20091218105747.6F91511C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29247

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-selection-browse.patch 
Log Message:
* Fri Dec 18 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-9
- Prevent traceback when no downloadable driver selected (#548449).


system-config-printer-selection-browse.patch:
 system-config-printer.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-selection-browse.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.selection-browse system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.selection-browse	2009-12-16 16:54:39.000000000 +0100
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-18 11:46:36.000000000 +0100
@@ -646,6 +646,7 @@ class GUI(GtkGUI, monitor.Watcher):
         # setup some lists
         m = gtk.SELECTION_MULTIPLE
         s = gtk.SELECTION_SINGLE
+        b = gtk.SELECTION_BROWSE
         for name, treeview, selection_mode in (
             (_("Members of this class"), self.tvClassMembers, m),
             (_("Others"), self.tvClassNotMembers, m),
@@ -656,7 +657,7 @@ class GUI(GtkGUI, monitor.Watcher):
             (_("Makes"), np.tvNPMakes,s),
             (_("Models"), np.tvNPModels,s),
             (_("Drivers"), np.tvNPDrivers,s),
-            (_("Downloadable Drivers"), np.tvNPDownloadableDrivers,s),
+            (_("Downloadable Drivers"), np.tvNPDownloadableDrivers, b),
             (_("Users"), self.tvPUsers, m),
             ):
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- system-config-printer.spec	14 Dec 2009 17:10:02 -0000	1.326
+++ system-config-printer.spec	18 Dec 2009 10:57:47 -0000	1.327
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -23,6 +23,7 @@ Patch5: system-config-printer-troublesho
 Patch6: system-config-printer-lpd-uri.patch
 Patch7: system-config-printer-short-lived-states.patch
 Patch8: system-config-printer-troubleshooter-debugcancel.patch
+Patch9: system-config-printer-selection-browse.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -90,6 +91,7 @@ printers.
 %patch6 -p1 -b .lpd-uri
 %patch7 -p1 -b .short-lived-states
 %patch8 -p1 -b .troubleshooter-debugcancel
+%patch9 -p1 -b .selection-browse
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -202,6 +204,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Dec 18 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-9
+- Prevent traceback when no downloadable driver selected (#548449).
+
 * Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-8
 - Prevent traceback when cancel button in troubleshooter pressed (#546821).
 



From jpopelka at fedoraproject.org  Fri Dec 18 10:57:57 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri, 18 Dec 2009 10:57:57 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-selection-browse.patch, NONE,
	1.1 system-config-printer.spec, 1.322, 1.323
Message-ID: <20091218105757.7C7E611C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29291

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-selection-browse.patch 
Log Message:
* Fri Dec 18 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-9
- Prevent traceback when no downloadable driver selected (#548449).


system-config-printer-selection-browse.patch:
 system-config-printer.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-selection-browse.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.selection-browse system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.selection-browse	2009-12-16 16:54:39.000000000 +0100
+++ system-config-printer-1.1.15/system-config-printer.py	2009-12-18 11:46:36.000000000 +0100
@@ -646,6 +646,7 @@ class GUI(GtkGUI, monitor.Watcher):
         # setup some lists
         m = gtk.SELECTION_MULTIPLE
         s = gtk.SELECTION_SINGLE
+        b = gtk.SELECTION_BROWSE
         for name, treeview, selection_mode in (
             (_("Members of this class"), self.tvClassMembers, m),
             (_("Others"), self.tvClassNotMembers, m),
@@ -656,7 +657,7 @@ class GUI(GtkGUI, monitor.Watcher):
             (_("Makes"), np.tvNPMakes,s),
             (_("Models"), np.tvNPModels,s),
             (_("Drivers"), np.tvNPDrivers,s),
-            (_("Downloadable Drivers"), np.tvNPDownloadableDrivers,s),
+            (_("Downloadable Drivers"), np.tvNPDownloadableDrivers, b),
             (_("Users"), self.tvPUsers, m),
             ):
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- system-config-printer.spec	14 Dec 2009 17:10:11 -0000	1.322
+++ system-config-printer.spec	18 Dec 2009 10:57:57 -0000	1.323
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -23,6 +23,7 @@ Patch5: system-config-printer-troublesho
 Patch6: system-config-printer-lpd-uri.patch
 Patch7: system-config-printer-short-lived-states.patch
 Patch8: system-config-printer-troubleshooter-debugcancel.patch
+Patch9: system-config-printer-selection-browse.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -90,6 +91,7 @@ printers.
 %patch6 -p1 -b .lpd-uri
 %patch7 -p1 -b .short-lived-states
 %patch8 -p1 -b .troubleshooter-debugcancel
+%patch9 -p1 -b .selection-browse
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -202,6 +204,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Dec 18 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-9
+- Prevent traceback when no downloadable driver selected (#548449).
+
 * Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-8
 - Prevent traceback when cancel button in troubleshooter pressed (#546821).
 



From lennart at fedoraproject.org  Fri Dec 18 10:58:01 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 18 Dec 2009 10:58:01 +0000 (UTC)
Subject: rpms/rtkit/devel .cvsignore, 1.4, 1.5 rtkit.spec, 1.4, 1.5 sources, 
	1.4, 1.5
Message-ID: <20091218105801.976B811C00E6@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/rtkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29313

Modified Files:
	.cvsignore rtkit.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtkit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Aug 2009 01:48:49 -0000	1.4
+++ .cvsignore	18 Dec 2009 10:58:01 -0000	1.5
@@ -1 +1 @@
-rtkit-0.4.tar.gz
+rtkit-0.5.tar.gz


Index: rtkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtkit/devel/rtkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rtkit.spec	5 Aug 2009 01:48:49 -0000	1.4
+++ rtkit.spec	18 Dec 2009 10:58:01 -0000	1.5
@@ -1,5 +1,5 @@
 Name:          rtkit
-Version:       0.4
+Version:       0.5
 Release:       1%{?dist}
 Summary:       Realtime Policy and Watchdog Daemon
 Group:         System Environment/Base
@@ -57,6 +57,12 @@ dbus-send --system --type=method_call --
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.RealtimeKit1.conf
 
 %changelog
+* Fri Dec 18 2009 Lennart Poettering <lpoetter at redhat.com> - 0.5-1
+- New release
+- By default don't demote unknown threads
+- Make messages less cute
+- Fixes 530582
+
 * Wed Aug 5 2009 Lennart Poettering <lpoetter at redhat.com> - 0.4-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtkit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Aug 2009 01:48:49 -0000	1.4
+++ sources	18 Dec 2009 10:58:01 -0000	1.5
@@ -1 +1 @@
-8494a0ef3f8fa6be7cf3edf234fbe50a  rtkit-0.4.tar.gz
+40ddb80715e89a79fe6ce24f5ce3b782  rtkit-0.5.tar.gz



From tbzatek at fedoraproject.org  Fri Dec 18 11:00:42 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 18 Dec 2009 11:00:42 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.102,
	1.103 nautilus-gvfs-desktop-key-2.patch, 1.3, 1.4 nautilus.spec,
	1.296, 1.297 sources, 1.108,
	1.109 nautilus-2.28.0-revert-bg-fade-break.patch, 1.1,
	NONE nautilus-2.29.xx-nautilus-directory-leak.patch, 1.1,
	NONE nautilus-monitor-change.patch, 1.2, NONE
Message-ID: <20091218110042.AF47611C0374@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29979

Modified Files:
	.cvsignore nautilus-gvfs-desktop-key-2.patch nautilus.spec 
	sources 
Removed Files:
	nautilus-2.28.0-revert-bg-fade-break.patch 
	nautilus-2.29.xx-nautilus-directory-leak.patch 
	nautilus-monitor-change.patch 
Log Message:
* Fri Dec 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.1-1
- Update to 2.29.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	2 Nov 2009 16:33:11 -0000	1.102
+++ .cvsignore	18 Dec 2009 11:00:42 -0000	1.103
@@ -1 +1 @@
-nautilus-2.28.1.tar.bz2
+nautilus-2.29.1.tar.bz2

nautilus-gvfs-desktop-key-2.patch:
 data/nautilus-autorun-software.desktop.in              |    1 +
 data/nautilus-autorun-software.desktop.in.in           |    1 +
 data/nautilus-browser.desktop.in                       |    1 +
 data/nautilus-browser.desktop.in.in                    |    1 +
 data/nautilus-computer.desktop.in                      |    1 +
 data/nautilus-computer.desktop.in.in                   |    1 +
 data/nautilus-file-management-properties.desktop.in    |    1 +
 data/nautilus-file-management-properties.desktop.in.in |    1 +
 data/nautilus-folder-handler.desktop.in                |    1 +
 data/nautilus-folder-handler.desktop.in.in             |    1 +
 data/nautilus-home.desktop.in                          |    1 +
 data/nautilus-home.desktop.in.in                       |    1 +
 data/nautilus.desktop                                  |    1 +
 data/nautilus.desktop.in                               |    1 +
 data/nautilus.desktop.in.in                            |    1 +
 src/network-scheme.desktop.in                          |    1 +
 16 files changed, 16 insertions(+)

Index: nautilus-gvfs-desktop-key-2.patch
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus-gvfs-desktop-key-2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nautilus-gvfs-desktop-key-2.patch	5 May 2009 12:17:42 -0000	1.3
+++ nautilus-gvfs-desktop-key-2.patch	18 Dec 2009 11:00:42 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in
---- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-autorun-software.desktop.in
+--- nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.desktop-key	2009-12-17 17:18:10.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-autorun-software.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=Autorun Prompt
  TryExec=nautilus-autorun-software
  Exec=nautilus-autorun-software %u
@@ -9,10 +9,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=application-x-executable
  NoDisplay=true
  Terminal=false
-diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in
---- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=Autorun Prompt
  TryExec=nautilus-autorun-software
  Exec=nautilus-autorun-software %u
@@ -20,10 +20,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=application-x-executable
  NoDisplay=true
  Terminal=false
-diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in.in
---- nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key	2008-10-02 14:26:49.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-browser.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=File Browser
+diff -up nautilus-2.29.1/data/nautilus-browser.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-browser.desktop.in
+--- nautilus-2.29.1/data/nautilus-browser.desktop.in.desktop-key	2009-12-17 17:18:10.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-browser.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=File Browser
  _Comment=Browse the file system with the file manager
  TryExec=nautilus
  Exec=nautilus --no-desktop --browser %U
@@ -31,10 +31,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=system-file-manager
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in
---- nautilus-2.25.91/data/nautilus-browser.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-browser.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=File Browser
+diff -up nautilus-2.29.1/data/nautilus-browser.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-browser.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-browser.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-browser.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=File Browser
  _Comment=Browse the file system with the file manager
  TryExec=nautilus
  Exec=nautilus --no-desktop --browser %U
@@ -42,10 +42,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=system-file-manager
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in.in
---- nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-computer.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Computer
+diff -up nautilus-2.29.1/data/nautilus-computer.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-computer.desktop.in
+--- nautilus-2.29.1/data/nautilus-computer.desktop.in.desktop-key	2009-12-17 17:18:09.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-computer.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Computer
  _Comment=Browse all local and remote disks and folders accessible from this computer
  TryExec=nautilus
  Exec=nautilus --no-desktop computer:
@@ -53,10 +53,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=computer
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in
---- nautilus-2.25.91/data/nautilus-computer.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-computer.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Computer
+diff -up nautilus-2.29.1/data/nautilus-computer.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-computer.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-computer.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-computer.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Computer
  _Comment=Browse all local and remote disks and folders accessible from this computer
  TryExec=nautilus
  Exec=nautilus --no-desktop computer:
@@ -64,43 +64,43 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=computer
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus.desktop.in.in.key nautilus-2.25.91/data/nautilus.desktop.in.in
---- nautilus-2.25.91/data/nautilus.desktop.in.in.key	2009-02-02 13:28:32.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -2,6 +2,7 @@
- Encoding=UTF-8
- _Name=File Manager
+diff -up nautilus-2.29.1/data/nautilus.desktop.desktop-key nautilus-2.29.1/data/nautilus.desktop
+--- nautilus-2.29.1/data/nautilus.desktop.desktop-key	2009-12-17 17:18:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus.desktop	2009-12-18 11:08:58.000000000 +0100
+@@ -100,6 +100,7 @@ Name[zh_HK]=??????
+ Name[zh_TW]=??????
+ Name[zu]=Mphathi Hele
  Exec=nautilus
 +X-Gnome-Vfs-System=gio
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus.desktop.in.key nautilus-2.25.91/data/nautilus.desktop.in
---- nautilus-2.25.91/data/nautilus.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -2,6 +2,7 @@
- Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus.desktop.in.desktop-key nautilus-2.29.1/data/nautilus.desktop.in
+--- nautilus-2.29.1/data/nautilus.desktop.in.desktop-key	2009-12-17 17:18:09.000000000 +0100
++++ nautilus-2.29.1/data/nautilus.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
  _Name=File Manager
  Exec=nautilus
 +X-Gnome-Vfs-System=gio
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus.desktop.key nautilus-2.25.91/data/nautilus.desktop
---- nautilus-2.25.91/data/nautilus.desktop.key	2009-02-16 14:56:33.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus.desktop	2009-02-16 17:24:49.000000000 +0100
-@@ -97,6 +97,7 @@ Name[zh_HK]=??????
- Name[zh_TW]=??????
- Name[zu]=Mphathi Hele
+diff -up nautilus-2.29.1/data/nautilus.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus.desktop.in.in
+--- nautilus-2.29.1/data/nautilus.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ _Name=File Manager
  Exec=nautilus
 +X-Gnome-Vfs-System=gio
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in
---- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in
+--- nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.desktop-key	2009-12-17 17:18:09.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=File Management
  _Comment=Change the behaviour and appearance of file manager windows
  Exec=nautilus-file-management-properties
@@ -108,10 +108,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in
---- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=File Management
  _Comment=Change the behaviour and appearance of file manager windows
  Exec=nautilus-file-management-properties
@@ -119,10 +119,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=system-file-manager
  Terminal=false
  Type=Application
-diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in
---- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-folder-handler.desktop.in
+--- nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.desktop-key	2009-12-17 17:18:10.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-folder-handler.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=Open Folder
  TryExec=nautilus
  Exec=nautilus --no-desktop %U
@@ -130,10 +130,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  NoDisplay=true
  Terminal=false
  Icon=folder-open
-diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in
---- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -3,6 +3,7 @@ Encoding=UTF-8
+diff -up nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -2,6 +2,7 @@
  _Name=Open Folder
  TryExec=nautilus
  Exec=nautilus --no-desktop %U
@@ -141,10 +141,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  NoDisplay=true
  Terminal=false
  Icon=folder-open
-diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.in.key nautilus-2.25.91/data/nautilus-home.desktop.in.in
---- nautilus-2.25.91/data/nautilus-home.desktop.in.in.key	2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91/data/nautilus-home.desktop.in.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Home Folder
+diff -up nautilus-2.29.1/data/nautilus-home.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-home.desktop.in
+--- nautilus-2.29.1/data/nautilus-home.desktop.in.desktop-key	2009-12-17 17:18:09.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-home.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Home Folder
  _Comment=Open your personal folder
  TryExec=nautilus
  Exec=nautilus --no-desktop
@@ -152,10 +152,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=user-home
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.key nautilus-2.25.91/data/nautilus-home.desktop.in
---- nautilus-2.25.91/data/nautilus-home.desktop.in.key	2009-02-16 14:56:30.000000000 +0100
-+++ nautilus-2.25.91/data/nautilus-home.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Home Folder
+diff -up nautilus-2.29.1/data/nautilus-home.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-home.desktop.in.in
+--- nautilus-2.29.1/data/nautilus-home.desktop.in.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/data/nautilus-home.desktop.in.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Home Folder
  _Comment=Open your personal folder
  TryExec=nautilus
  Exec=nautilus --no-desktop
@@ -163,10 +163,10 @@ diff -up nautilus-2.25.91/data/nautilus-
  Icon=user-home
  Terminal=false
  StartupNotify=true
-diff -up nautilus-2.25.91/src/network-scheme.desktop.in.key nautilus-2.25.91/src/network-scheme.desktop.in
---- nautilus-2.25.91/src/network-scheme.desktop.in.key	2008-09-14 14:14:22.000000000 +0200
-+++ nautilus-2.25.91/src/network-scheme.desktop.in	2009-02-16 17:24:49.000000000 +0100
-@@ -4,6 +4,7 @@ _Name=Network
+diff -up nautilus-2.29.1/src/network-scheme.desktop.in.desktop-key nautilus-2.29.1/src/network-scheme.desktop.in
+--- nautilus-2.29.1/src/network-scheme.desktop.in.desktop-key	2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.29.1/src/network-scheme.desktop.in	2009-12-18 11:08:58.000000000 +0100
+@@ -3,6 +3,7 @@ _Name=Network
  _Comment=Browse bookmarked and local network locations
  TryExec=nautilus
  Exec=nautilus --no-desktop network:


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- nautilus.spec	10 Dec 2009 23:54:49 -0000	1.296
+++ nautilus.spec	18 Dec 2009 11:00:42 -0000	1.297
@@ -4,7 +4,7 @@
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define desktop_file_utils_version 0.7
-%define gnome_desktop_version 2.29.3-2
+%define gnome_desktop_version 2.29.4
 %define redhat_menus_version 0.25
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12
@@ -14,11 +14,11 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.28.2
-Release:	3%{?dist}
+Version: 	2.29.1
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
-Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
 
 URL: 		http://projects.gnome.org/nautilus/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,6 @@ Requires:       libexif >= %{libexif_ver
 %ifnarch s390 s390x
 Requires: 	eject
 %endif
-PreReq:    scrollkeeper >= 0.1.4
 
 BuildRequires:	glib2-devel >= %{glib2_version}
 BuildRequires:	pango-devel >= %{pango_version}
@@ -60,6 +59,9 @@ Requires(pre): GConf2 >= %{gconf_version
 Requires(preun): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
 Requires:	gnome-desktop >= %{gnome_desktop_version}
+Requires(pre):    scrollkeeper
+Requires(post):   scrollkeeper
+Requires(postun): scrollkeeper
 
 Obsoletes:      nautilus-extras
 Obsoletes:      nautilus-suggested
@@ -82,19 +84,11 @@ Patch6:		nautilus-2.28.1-dynamic-search.
 Patch7:		rtl-fix.patch
 #Patch8:	nautilus-2.22.1-hide-white-screen.patch
 
-# from upstream
-Patch9:		nautilus-2.29.xx-nautilus-directory-leak.patch
-
 Patch10:        nautilus-gvfs-desktop-key-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# Need to file upstream and investigate a real fix
-Patch18:	nautilus-2.28.0-revert-bg-fade-break.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=147808
-Patch20:	nautilus-monitor-change.patch
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -130,11 +124,8 @@ for developing nautilus extensions.
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
-%patch9 -p1 -b .memleaks
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
-%patch18 -p1 -b .revert-bg-fade-break
-%patch20 -p1 -b .nautilus-monitor-change
 
 %build
 
@@ -270,6 +261,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.1-1
+- Update to 2.29.1
+
 * Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.28.2-3
 - Update the monitor changes patch (gnome #147808)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- sources	1 Dec 2009 11:10:02 -0000	1.108
+++ sources	18 Dec 2009 11:00:42 -0000	1.109
@@ -1 +1 @@
-872ac5a2b875a85473266aa540926596  nautilus-2.28.2.tar.bz2
+d3bb9044b7900bb19a9cbbe0631246bd  nautilus-2.29.1.tar.bz2


--- nautilus-2.28.0-revert-bg-fade-break.patch DELETED ---


--- nautilus-2.29.xx-nautilus-directory-leak.patch DELETED ---


--- nautilus-monitor-change.patch DELETED ---



From cwickert at fedoraproject.org  Fri Dec 18 11:09:10 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 18 Dec 2009 11:09:10 +0000 (UTC)
Subject: File rednotebook-0.9.0.tar.gz uploaded to lookaside cache by
	cwickert
Message-ID: <20091218110910.BED8928EDDD@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for rednotebook:

6ad198671f5a8654732ac18668c2366e  rednotebook-0.9.0.tar.gz



From ovasik at fedoraproject.org  Fri Dec 18 11:25:01 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Dec 2009 11:25:01 +0000 (UTC)
Subject: rpms/tar/devel tar.spec,1.91,1.92
Message-ID: <20091218112501.6A85111C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1702

Modified Files:
	tar.spec 
Log Message:
remove Prereq


Index: tar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tar/devel/tar.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- tar.spec	8 Dec 2009 13:20:35 -0000	1.91
+++ tar.spec	18 Dec 2009 11:25:01 -0000	1.92
@@ -32,7 +32,7 @@ Patch7: tar-1.22-fortifysourcessigabrt.p
 Patch8: tar-1.22-xheaderleak.patch
 #fix segfault in code_ns_fraction() with corrupted metadata (#531441)
 Patch9: tar-1.22-nsfraction.patch
-Prereq: info
+Requires: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk rsh
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info



From corsepiu at fedoraproject.org  Fri Dec 18 11:25:38 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri, 18 Dec 2009 11:25:38 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.245,1.246
Message-ID: <20091218112538.B749D11C00E6@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1835

Modified Files:
	perl.spec 
Log Message:
* Fri Dec 19 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 4:5.10.1-105
- exclude Parse-CPAN-Meta.



Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- perl.spec	7 Dec 2009 21:39:28 -0000	1.245
+++ perl.spec	18 Dec 2009 11:25:38 -0000	1.246
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        104%{?dist}
+Release:        105%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1243,6 +1243,12 @@ make test
 %exclude %{_mandir}/man3/CPAN.*
 %exclude %{_mandir}/man3/CPAN:*
 
+# Parse-CPAN-Meta
+%exclude %dir %{privlib}/Parse/
+%exclude %dir %{privlib}/Parse/CPAN/
+%exclude %{privlib}/Parse/CPAN/Meta.pm
+%exclude %{_mandir}/man3/Parse::CPAN::Meta.3*
+
 # CPANPLUS
 %exclude %{_bindir}/cpan2dist
 %exclude %{_bindir}/cpanp
@@ -1794,6 +1800,9 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Fri Dec 19 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 4:5.10.1-105
+- exclude Parse-CPAN-Meta.
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.1-104
 - do not pack Bzip2 manpages either (#544582)
 



From corsepiu at fedoraproject.org  Fri Dec 18 11:57:45 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri, 18 Dec 2009 11:57:45 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.246,1.247
Message-ID: <20091218115745.323C411C00E6@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7239

Modified Files:
	perl.spec 
Log Message:
* Fri Dec 19 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 4:5.10.1-106
- exclude "parent".



Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- perl.spec	18 Dec 2009 11:25:38 -0000	1.246
+++ perl.spec	18 Dec 2009 11:57:43 -0000	1.247
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        105%{?dist}
+Release:        106%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1433,6 +1433,10 @@ make test
 %exclude %{privlib}/Params/
 %exclude %{_mandir}/man3/Params::Check*
 
+# parent
+%exclude %{privlib}/parent.pm
+%exclude %{_mandir}/man3/parent.3*
+
 # Pod-Escapes
 %exclude %{privlib}/Pod/Escapes.pm
 %exclude %{_mandir}/man3/Pod::Escapes.*
@@ -1800,6 +1804,9 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Fri Dec 19 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 4:5.10.1-106
+- exclude "parent".
+
 * Fri Dec 19 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 4:5.10.1-105
 - exclude Parse-CPAN-Meta.
 



From heffer at fedoraproject.org  Fri Dec 18 12:03:05 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 18 Dec 2009 12:03:05 +0000 (UTC)
Subject: File openttd-0.7.5-RC1-source.tar.bz2 uploaded to lookaside cache by
	heffer
Message-ID: <20091218120305.007FB28ED91@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for openttd:

fc34260584312c4d4644919afb500a71  openttd-0.7.5-RC1-source.tar.bz2



From varekova at fedoraproject.org  Fri Dec 18 12:03:39 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 18 Dec 2009 12:03:39 +0000 (UTC)
Subject: rpms/pilot-link/devel pilot-link.spec,1.90,1.91
Message-ID: <20091218120339.7595011C00E6@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8471

Modified Files:
	pilot-link.spec 
Log Message:
 - fix source and license  tag 



Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- pilot-link.spec	7 Dec 2009 03:02:59 -0000	1.90
+++ pilot-link.spec	18 Dec 2009 12:03:38 -0000	1.91
@@ -2,14 +2,15 @@
 
 Name: pilot-link
 Version: 0.12.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 2
-License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
+# libpisock/md5.c, include/pi-md5, ..  have Public Domain license
+License: GPLv2 and GPLv2+ and LGPLv2+ and TCL and Public Domain
 Group: Applications/Communications
 Summary: File transfer utilities between Linux and PalmPilots
 URL: http://www.pilot-link.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: pilot-link-%{version}.tar.bz2
+Source0: http://downloads.pilot-link.org/%{name}-%{version}.tar.bz2
 Source3: blacklist-visor
 Source4: README.fedora
 Source5: 60-pilot.perms
@@ -185,6 +186,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Ivana Hutarova Varekova <varekova at redhat.com> 2:0.12.4-6
+- fix source tag, add Public Domain license
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2:0.12.4-5
 - rebuild against perl 5.10.1
 



From heffer at fedoraproject.org  Fri Dec 18 12:08:08 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 18 Dec 2009 12:08:08 +0000 (UTC)
Subject: rpms/openttd/devel .cvsignore, 1.5, 1.6 openttd.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091218120808.DBCD011C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9413

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Thu Dec 17 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.5-0.1.rc1
- bump to 0.7.5-RC1
- omitting 0.7.4 because it has a bug



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Oct 2009 10:02:18 -0000	1.5
+++ .cvsignore	18 Dec 2009 12:08:07 -0000	1.6
@@ -1 +1 @@
-openttd-0.7.3-source.tar.bz2
+openttd-0.7.5-RC1-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/openttd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openttd.spec	10 Oct 2009 10:02:18 -0000	1.7
+++ openttd.spec	18 Dec 2009 12:08:08 -0000	1.8
@@ -1,9 +1,9 @@
 # If we have a prerelease version we can define it here
-#define prever RC2
+%define prever RC1
 
 Name:           openttd
-Version:        0.7.3
-Release:        1%{?dist}
+Version:        0.7.5
+Release:        0.1.rc1%{?dist}
 Summary:        Transport system simulation game
 
 Group:          Amusements/Games
@@ -116,6 +116,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 17 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.5-0.1.rc1
+- bump to 0.7.5-RC1
+- omitting 0.7.4 because it has a bug
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
 - New upstream release 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Oct 2009 10:02:18 -0000	1.5
+++ sources	18 Dec 2009 12:08:08 -0000	1.6
@@ -1 +1 @@
-fe8a006b8bd94fd86a9d8c2a04fe7558  openttd-0.7.3-source.tar.bz2
+fc34260584312c4d4644919afb500a71  openttd-0.7.5-RC1-source.tar.bz2



From heffer at fedoraproject.org  Fri Dec 18 12:19:20 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 18 Dec 2009 12:19:20 +0000 (UTC)
Subject: rpms/openttd/F-12 .cvsignore, 1.5, 1.6 openttd.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091218121920.9077811C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11168

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Thu Dec 17 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.5-0.1.rc1
- bump to 0.7.5-RC1
- omitting 0.7.4 because it has a bug



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Oct 2009 10:09:21 -0000	1.5
+++ .cvsignore	18 Dec 2009 12:19:20 -0000	1.6
@@ -1 +1 @@
-openttd-0.7.3-source.tar.bz2
+openttd-0.7.5-RC1-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-12/openttd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openttd.spec	10 Oct 2009 10:09:21 -0000	1.7
+++ openttd.spec	18 Dec 2009 12:19:20 -0000	1.8
@@ -1,9 +1,9 @@
 # If we have a prerelease version we can define it here
-#define prever RC2
+%define prever RC1
 
 Name:           openttd
-Version:        0.7.3
-Release:        1%{?dist}
+Version:        0.7.5
+Release:        0.1.rc1%{?dist}
 Summary:        Transport system simulation game
 
 Group:          Amusements/Games
@@ -116,6 +116,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 17 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.5-0.1.rc1
+- bump to 0.7.5-RC1
+- omitting 0.7.4 because it has a bug
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
 - New upstream release 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Oct 2009 10:09:21 -0000	1.5
+++ sources	18 Dec 2009 12:19:20 -0000	1.6
@@ -1 +1 @@
-fe8a006b8bd94fd86a9d8c2a04fe7558  openttd-0.7.3-source.tar.bz2
+fc34260584312c4d4644919afb500a71  openttd-0.7.5-RC1-source.tar.bz2



From ovasik at fedoraproject.org  Fri Dec 18 12:21:12 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Dec 2009 12:21:12 +0000 (UTC)
Subject: rpms/openjade/devel openjade.spec,1.50,1.51
Message-ID: <20091218122112.7775011C0374@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/openjade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11551

Modified Files:
	openjade.spec 
Log Message:
comment patches


Index: openjade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- openjade.spec	10 Dec 2009 13:19:08 -0000	1.50
+++ openjade.spec	18 Dec 2009 12:21:12 -0000	1.51
@@ -5,9 +5,13 @@ Release: 36%{?dist}
 Requires: sgml-common
 URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
+#fix build on ppc64
 Patch0: openjade-ppc64.patch
+#do not link against -lnsl
 Patch1: openjade-1.3.1-nsl.patch
+#Fix dependent libs for libogrove (bug #198232).
 Patch2: openjade-deplibs.patch
+#do not require OpenSP libosp.la file for build(#485114)
 Patch3: openjade-nola.patch
 License: BSD
 Group: Applications/Text



From heffer at fedoraproject.org  Fri Dec 18 12:23:33 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 18 Dec 2009 12:23:33 +0000 (UTC)
Subject: rpms/openttd/F-11 .cvsignore, 1.5, 1.6 openttd.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091218122333.B59EB11C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11924

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Thu Dec 17 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.5-0.1.rc1
- bump to 0.7.5-RC1
- omitting 0.7.4 because it has a bug



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Oct 2009 10:12:58 -0000	1.5
+++ .cvsignore	18 Dec 2009 12:23:33 -0000	1.6
@@ -1 +1 @@
-openttd-0.7.3-source.tar.bz2
+openttd-0.7.5-RC1-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/openttd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openttd.spec	10 Oct 2009 10:12:58 -0000	1.6
+++ openttd.spec	18 Dec 2009 12:23:33 -0000	1.7
@@ -1,9 +1,9 @@
 # If we have a prerelease version we can define it here
-#define prever RC2
+%define prever RC1
 
 Name:           openttd
-Version:        0.7.3
-Release:        1%{?dist}
+Version:        0.7.5
+Release:        0.1.rc1%{?dist}
 Summary:        Transport system simulation game
 
 Group:          Amusements/Games
@@ -116,6 +116,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 17 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.5-0.1.rc1
+- bump to 0.7.5-RC1
+- omitting 0.7.4 because it has a bug
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
 - New upstream release 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Oct 2009 10:12:58 -0000	1.5
+++ sources	18 Dec 2009 12:23:33 -0000	1.6
@@ -1 +1 @@
-fe8a006b8bd94fd86a9d8c2a04fe7558  openttd-0.7.3-source.tar.bz2
+fc34260584312c4d4644919afb500a71  openttd-0.7.5-RC1-source.tar.bz2



From varekova at fedoraproject.org  Fri Dec 18 12:27:58 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 18 Dec 2009 12:27:58 +0000 (UTC)
Subject: File mpfr-2.4.2.tar.bz2 uploaded to lookaside cache by varekova
Message-ID: <20091218122758.778CC28EDE2@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for mpfr:

89e59fe665e2b3ad44a6789f40b059a0  mpfr-2.4.2.tar.bz2



From varekova at fedoraproject.org  Fri Dec 18 12:32:21 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 18 Dec 2009 12:32:21 +0000 (UTC)
Subject: rpms/mpfr/devel .cvsignore, 1.8, 1.9 mpfr.spec, 1.17, 1.18 sources, 
	1.8, 1.9
Message-ID: <20091218123221.5C91D11C00E6@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/mpfr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13806

Modified Files:
	.cvsignore mpfr.spec sources 
Log Message:
- update to 2.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Aug 2009 17:41:51 -0000	1.8
+++ .cvsignore	18 Dec 2009 12:32:21 -0000	1.9
@@ -1 +1 @@
-mpfr-2.4.1.tar.lzma
+mpfr-2.4.2.tar.bz2


Index: mpfr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/mpfr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mpfr.spec	13 Nov 2009 12:15:13 -0000	1.17
+++ mpfr.spec	18 Dec 2009 12:32:21 -0000	1.18
@@ -1,9 +1,9 @@
 Summary: A C library for multiple-precision floating-point computations
 Name: mpfr
-Version: 2.4.1
-Release: 5%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 URL: http://www.mpfr.org/
-Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.lzma
+Source0: http://www.mpfr.org/mpfr-current/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and GPLv2+ and GFDL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.a
 cd ..
+mkdir $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
+mv $RPM_BUILD_ROOT/%{_docdir}/%{name}/ $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
 
 
 %check
@@ -88,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/mpfr.info*
 
 %changelog
+* Fri Dec 18 2009 Ivana Hutarova Varekova <varekova at redhat.com> 2.4.2-1
+- update to 2.4.2
+
 * Fri Nov 13 2009 Ivana Varekova <varekova at redhat.com> 2.4.1-5
 - fix 537328 - mpfr-devel should "Requires: gmp-devel"
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Aug 2009 17:41:51 -0000	1.8
+++ sources	18 Dec 2009 12:32:21 -0000	1.9
@@ -1 +1 @@
-22402995cf2496d8faea42c8da02ce1f  mpfr-2.4.1.tar.lzma
+89e59fe665e2b3ad44a6789f40b059a0  mpfr-2.4.2.tar.bz2



From cwickert at fedoraproject.org  Fri Dec 18 12:33:23 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 18 Dec 2009 12:33:23 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.24, 1.25 rednotebook.spec, 1.27,
	1.28 sources, 1.24, 1.25
Message-ID: <20091218123323.341F311C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14073

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Dec 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
- Update to 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	18 Nov 2009 19:51:34 -0000	1.24
+++ .cvsignore	18 Dec 2009 12:33:22 -0000	1.25
@@ -1 +1 @@
-rednotebook-0.8.9.tar.gz
+rednotebook-0.9.0.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- rednotebook.spec	19 Nov 2009 17:22:32 -0000	1.27
+++ rednotebook.spec	18 Dec 2009 12:33:23 -0000	1.28
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.9
-Release:        2%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
@@ -73,6 +73,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Dec 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
+- Update to 0.9.0
+
 * Thu Nov 19 2009 Fabian Affolter <fabian at bernewireless.net> - 0.8.9-2
 - Updated the URL after a request from the upstream maintainer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	18 Nov 2009 19:51:34 -0000	1.24
+++ sources	18 Dec 2009 12:33:23 -0000	1.25
@@ -1 +1 @@
-61a709b1806eef5948926c114a8b5ab7  rednotebook-0.8.9.tar.gz
+6ad198671f5a8654732ac18668c2366e  rednotebook-0.9.0.tar.gz



From cwickert at fedoraproject.org  Fri Dec 18 12:39:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 18 Dec 2009 12:39:49 +0000 (UTC)
Subject: rpms/rednotebook/F-12 .cvsignore, 1.21, 1.22 rednotebook.spec, 1.25,
	1.26 sources, 1.22, 1.23
Message-ID: <20091218123949.892D511C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15255/F-12

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Dec 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
- Update to 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	17 Sep 2009 13:46:01 -0000	1.21
+++ .cvsignore	18 Dec 2009 12:39:49 -0000	1.22
@@ -1 +1 @@
-rednotebook-0.8.6.1.tar.gz
+rednotebook-0.9.0.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-12/rednotebook.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- rednotebook.spec	19 Nov 2009 17:22:32 -0000	1.25
+++ rednotebook.spec	18 Dec 2009 12:39:49 -0000	1.26
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.9
-Release:        2%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
@@ -73,6 +73,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Dec 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
+- Update to 0.9.0
+
 * Thu Nov 19 2009 Fabian Affolter <fabian at bernewireless.net> - 0.8.9-2
 - Updated the URL after a request from the upstream maintainer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	18 Nov 2009 20:15:01 -0000	1.22
+++ sources	18 Dec 2009 12:39:49 -0000	1.23
@@ -1 +1 @@
-61a709b1806eef5948926c114a8b5ab7  rednotebook-0.8.9.tar.gz
+6ad198671f5a8654732ac18668c2366e  rednotebook-0.9.0.tar.gz



From cwickert at fedoraproject.org  Fri Dec 18 12:39:49 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 18 Dec 2009 12:39:49 +0000 (UTC)
Subject: rpms/rednotebook/F-11 .cvsignore, 1.16, 1.17 rednotebook.spec, 1.23,
	1.24 sources, 1.20, 1.21
Message-ID: <20091218123949.B22BE11C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15255/F-11

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Dec 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
- Update to 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	17 Sep 2009 13:46:02 -0000	1.16
+++ .cvsignore	18 Dec 2009 12:39:49 -0000	1.17
@@ -1 +1 @@
-rednotebook-0.8.6.1.tar.gz
+rednotebook-0.9.0.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/rednotebook.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- rednotebook.spec	19 Nov 2009 17:22:31 -0000	1.23
+++ rednotebook.spec	18 Dec 2009 12:39:49 -0000	1.24
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.9
-Release:        2%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
@@ -73,6 +73,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Dec 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-1
+- Update to 0.9.0
+
 * Thu Nov 19 2009 Fabian Affolter <fabian at bernewireless.net> - 0.8.9-2
 - Updated the URL after a request from the upstream maintainer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Nov 2009 20:15:00 -0000	1.20
+++ sources	18 Dec 2009 12:39:49 -0000	1.21
@@ -1 +1 @@
-61a709b1806eef5948926c114a8b5ab7  rednotebook-0.8.9.tar.gz
+6ad198671f5a8654732ac18668c2366e  rednotebook-0.9.0.tar.gz



From heffer at fedoraproject.org  Fri Dec 18 12:47:28 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 18 Dec 2009 12:47:28 +0000 (UTC)
Subject: File nforenum-r2275.tar.xz uploaded to lookaside cache by heffer
Message-ID: <20091218124728.DF7DA28EDE2@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for nforenum:

bf3c9d256fdb05d521923d03e3025f11  nforenum-r2275.tar.xz



From heffer at fedoraproject.org  Fri Dec 18 12:48:08 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 18 Dec 2009 12:48:08 +0000 (UTC)
Subject: rpms/nforenum/devel .cvsignore, 1.2, 1.3 nforenum.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091218124808.9D9F811C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/nforenum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16665

Modified Files:
	.cvsignore nforenum.spec sources 
Log Message:
* Fri Dec 18 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.3.r2275
- new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Sep 2009 13:12:26 -0000	1.2
+++ .cvsignore	18 Dec 2009 12:48:08 -0000	1.3
@@ -1 +1 @@
-nforenum-r2184.tar.xz
+nforenum-r2275.tar.xz


Index: nforenum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/devel/nforenum.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nforenum.spec	6 Sep 2009 13:12:26 -0000	1.1
+++ nforenum.spec	18 Dec 2009 12:48:08 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           nforenum
 Version:        3.4.7
-Release:        0.2.r2184%{?dist}
+Release:        0.3.r2275%{?dist}
 Summary:        A format correcter and linter for the NFO language
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://users.tt-forums.net/dalestan/nforenum/
-# svn export -r2184 svn://svn.ttdpatch.net/misc/nforenum/
-# tar --xz -cf nforenum-r2184.tar.xz nforenum
-Source0:        nforenum-r2184.tar.xz
+# svn export -r2275 svn://svn.ttdpatch.net/misc/nforenum/
+# tar --xz -cf nforenum-r2275.tar.xz nforenum
+Source0:        nforenum-r2275.tar.xz
 # fix some header includes and a const char* cast
 Patch0:         nforenum-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.3.r2275
+- new snapshot
+
 * Sun Sep 06 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.2.r2184
 - incorporated changes as suggested in #519118
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Sep 2009 13:12:26 -0000	1.2
+++ sources	18 Dec 2009 12:48:08 -0000	1.3
@@ -1 +1 @@
-d0b4614ba67556e1e7d8240da6aa1a7a  nforenum-r2184.tar.xz
+bf3c9d256fdb05d521923d03e3025f11  nforenum-r2275.tar.xz



From heffer at fedoraproject.org  Fri Dec 18 12:52:52 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 18 Dec 2009 12:52:52 +0000 (UTC)
Subject: rpms/nforenum/F-12 .cvsignore, 1.2, 1.3 nforenum.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091218125252.728D311C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/nforenum/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17502

Modified Files:
	.cvsignore nforenum.spec sources 
Log Message:
* Fri Dec 18 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.3.r2275
- new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Sep 2009 13:12:26 -0000	1.2
+++ .cvsignore	18 Dec 2009 12:52:51 -0000	1.3
@@ -1 +1 @@
-nforenum-r2184.tar.xz
+nforenum-r2275.tar.xz


Index: nforenum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-12/nforenum.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nforenum.spec	6 Sep 2009 13:12:26 -0000	1.1
+++ nforenum.spec	18 Dec 2009 12:52:51 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           nforenum
 Version:        3.4.7
-Release:        0.2.r2184%{?dist}
+Release:        0.3.r2275%{?dist}
 Summary:        A format correcter and linter for the NFO language
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://users.tt-forums.net/dalestan/nforenum/
-# svn export -r2184 svn://svn.ttdpatch.net/misc/nforenum/
-# tar --xz -cf nforenum-r2184.tar.xz nforenum
-Source0:        nforenum-r2184.tar.xz
+# svn export -r2275 svn://svn.ttdpatch.net/misc/nforenum/
+# tar --xz -cf nforenum-r2275.tar.xz nforenum
+Source0:        nforenum-r2275.tar.xz
 # fix some header includes and a const char* cast
 Patch0:         nforenum-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.3.r2275
+- new snapshot
+
 * Sun Sep 06 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.2.r2184
 - incorporated changes as suggested in #519118
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Sep 2009 13:12:26 -0000	1.2
+++ sources	18 Dec 2009 12:52:52 -0000	1.3
@@ -1 +1 @@
-d0b4614ba67556e1e7d8240da6aa1a7a  nforenum-r2184.tar.xz
+bf3c9d256fdb05d521923d03e3025f11  nforenum-r2275.tar.xz



From heffer at fedoraproject.org  Fri Dec 18 12:54:30 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Fri, 18 Dec 2009 12:54:30 +0000 (UTC)
Subject: rpms/nforenum/F-11 .cvsignore, 1.2, 1.3 nforenum.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091218125430.3C9D811C00E6@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/nforenum/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17839

Modified Files:
	.cvsignore nforenum.spec sources 
Log Message:
* Fri Dec 18 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.3.r2275
- new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Sep 2009 13:06:53 -0000	1.2
+++ .cvsignore	18 Dec 2009 12:54:30 -0000	1.3
@@ -1 +1 @@
-nforenum-r2184.tar.xz
+nforenum-r2275.tar.xz


Index: nforenum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-11/nforenum.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nforenum.spec	6 Sep 2009 13:06:53 -0000	1.1
+++ nforenum.spec	18 Dec 2009 12:54:30 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           nforenum
 Version:        3.4.7
-Release:        0.2.r2184%{?dist}
+Release:        0.3.r2275%{?dist}
 Summary:        A format correcter and linter for the NFO language
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://users.tt-forums.net/dalestan/nforenum/
-# svn export -r2184 svn://svn.ttdpatch.net/misc/nforenum/
-# tar --xz -cf nforenum-r2184.tar.xz nforenum
-Source0:        nforenum-r2184.tar.xz
+# svn export -r2275 svn://svn.ttdpatch.net/misc/nforenum/
+# tar --xz -cf nforenum-r2275.tar.xz nforenum
+Source0:        nforenum-r2275.tar.xz
 # fix some header includes and a const char* cast
 Patch0:         nforenum-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.3.r2275
+- new snapshot
+
 * Sun Sep 06 2009 Felix Kaechele <heffer at fedoraproject.org> - 3.4.7-0.2.r2184
 - incorporated changes as suggested in #519118
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nforenum/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Sep 2009 13:06:53 -0000	1.2
+++ sources	18 Dec 2009 12:54:30 -0000	1.3
@@ -1 +1 @@
-d0b4614ba67556e1e7d8240da6aa1a7a  nforenum-r2184.tar.xz
+bf3c9d256fdb05d521923d03e3025f11  nforenum-r2275.tar.xz



From rvokal at fedoraproject.org  Fri Dec 18 13:15:22 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 18 Dec 2009 13:15:22 +0000 (UTC)
Subject: rpms/wireshark/F-12 .cvsignore,1.29,1.30 sources,1.29,1.30
Message-ID: <20091218131522.CF8C311C00E6@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21551

Modified Files:
	.cvsignore sources 
Log Message:
fix sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	30 Nov 2009 13:38:57 -0000	1.29
+++ .cvsignore	18 Dec 2009 13:15:21 -0000	1.30
@@ -1 +1 @@
-wireshark-1.2.4.tar.bz2
+wireshark-1.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	30 Nov 2009 13:38:57 -0000	1.29
+++ sources	18 Dec 2009 13:15:21 -0000	1.30
@@ -1 +1 @@
-ae4533da7d0e54c236e1eed966c42163  wireshark-1.2.4.tar.bz2
+38010265a76f25553498304dcf15a92c  wireshark-1.2.5.tar.bz2



From rvokal at fedoraproject.org  Fri Dec 18 13:16:25 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 18 Dec 2009 13:16:25 +0000 (UTC)
Subject: rpms/wireshark/F-12 wireshark.spec,1.61,1.62
Message-ID: <20091218131625.28FF511C00E6@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21827

Modified Files:
	wireshark.spec 
Log Message:
release++


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-12/wireshark.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- wireshark.spec	18 Dec 2009 10:38:24 -0000	1.61
+++ wireshark.spec	18 Dec 2009 13:16:24 -0000	1.62
@@ -12,7 +12,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.2.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -300,7 +300,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Fri Dec 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.5-1
+* Fri Dec 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.5-2
 - upgrade to 1.2.5
 - fixes security vulnaribilities, see http://www.wireshark.org/security/wnpa-sec-2009-09.html 
 - split -devel package (#547899, #203642, #218451)



From than at fedoraproject.org  Fri Dec 18 13:24:36 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 18 Dec 2009 13:24:36 +0000 (UTC)
Subject: rpms/doxygen/F-12 doxygen.spec,1.71,1.72
Message-ID: <20091218132436.4247711C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22527

Modified Files:
	doxygen.spec 
Log Message:
- bz#225709, merged review



Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-12/doxygen.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- doxygen.spec	11 Dec 2009 14:29:33 -0000	1.71
+++ doxygen.spec	18 Dec 2009 13:24:35 -0000	1.72
@@ -1,12 +1,9 @@
 %define _default_patch_fuzz 2
 
-%define qt_version 4.4
-%{!?with_qt:%define with_qt 1}
-
 Summary: A documentation system for C/C++
 Name: doxygen
 Version: 1.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
@@ -34,17 +31,15 @@ documentation is extracted directly from
 also be configured to extract the code structure from undocumented
 source files.
 
-%if %{with_qt}
 %package doxywizard
-Summary: A GUI for creating and editing configuration files.
+Summary: A GUI for creating and editing configuration files
 Group: User Interface/X
 Requires: %{name} = %{epoch}:%{version}
-BuildRequires: qt-devel => %{qt_version}
+BuildRequires: qt-devel => 4.4
 
 %description doxywizard
 Doxywizard is a GUI for creating and editing configuration files that
 are used by doxygen.
-%endif
 
 %prep
 %setup -q
@@ -58,9 +53,7 @@ unset QTDIR
 ./configure \
    --prefix %{_prefix} \
    --shared \
-%if %{with_qt}
    --with-doxywizard \
-%endif
    --release
 
 # workaround for "Error: operand out of range", language.cpp needs to be splitted
@@ -77,17 +70,16 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-%if !%{with_qt}
-  rm -rf %{buildroot}%{_mandir}/man1/doxywizard*
-%endif
-
 # convert into utf-8
 iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
-touch -r LANGUAGE.HOWTO.new && mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
+touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new
+mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
 
 # drop -x bit
 find examples -type f | xargs chmod -x
 
+sed -i -e "s|#!perl|#! /usr/bin/perl|" examples/tag/html/installdox
+
 %clean
 rm -rf %{buildroot}
 
@@ -100,14 +92,15 @@ rm -rf %{buildroot}
 %{_mandir}/man1/doxygen.1*
 %{_mandir}/man1/doxytag.1*
 
-%if %{with_qt}
 %files doxywizard
 %defattr(-,root,root)
 %{_bindir}/doxywizard
 %{_mandir}/man1/doxywizard*
-%endif
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 1:1.6.1-3
+- bz#225709, merged review
+
 * Fri Dec 11 2009 Than Ngo <than at redhat.com> - 1:1.6.1-2
 - bz#225709, merged review 
 



From rdieter at fedoraproject.org  Fri Dec 18 13:25:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 13:25:19 +0000 (UTC)
Subject: rpms/kdelibs/F-12 .cvsignore,1.82,1.83
Message-ID: <20091218132519.4646611C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23356

Modified Files:
	.cvsignore 
Log Message:
drop old stuff



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-12/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	1 Dec 2009 13:19:32 -0000	1.82
+++ .cvsignore	18 Dec 2009 13:25:19 -0000	1.83
@@ -1,2 +1 @@
-kdelibs-4.3.3.tar.bz2
 kdelibs-4.3.4.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 13:25:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 13:25:42 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.4-sonnet.patch, NONE, 1.1 .cvsignore,
	1.77, 1.78 kdelibs.spec, 1.507, 1.508
Message-ID: <20091218132542.88F0711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23544

Modified Files:
	.cvsignore kdelibs.spec 
Added Files:
	kdelibs-4.4-sonnet.patch 
Log Message:
* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 4.3.4-3
- fix bz#531211, backport sonnet patch, fix rendering issue in indic, asian, arabic 
  languages


kdelibs-4.4-sonnet.patch:
 filter.cpp |  212 +++++++++++++++++++++++++------------------------------------
 filter_p.h |    7 --
 2 files changed, 92 insertions(+), 127 deletions(-)

--- NEW FILE kdelibs-4.4-sonnet.patch ---
--- kdelibs/kdecore/sonnet/filter_p.h	2009/10/01 20:06:45	1030189
+++ kdelibs/kdecore/sonnet/filter_p.h	2009/11/29 23:10:00	1056377
@@ -22,6 +22,7 @@
 #ifndef SONNET_FILTER_P_H
 #define SONNET_FILTER_P_H
 
+#include <QtCore/QTextBoundaryFinder>
 #include <QtCore/QString>
 #include <kdecore_export.h>
 
@@ -89,7 +90,6 @@
         void restart();
 
         virtual Word nextWord() const;
-        virtual Word previousWord() const;
         virtual Word wordAtPosition( unsigned int pos ) const;
 
         virtual void setCurrentPosition( int );
@@ -103,13 +103,12 @@
     protected:
         bool trySkipLinks() const;
         bool ignore( const QString& word ) const;
-        QChar skipToLetter( int &fromPosition ) const;
         bool shouldBeSkipped( bool wordWasUppercase, bool wordWasRunTogether,
                               const QString& foundWord ) const;
 
     protected:
-        QString      m_buffer;
-        mutable int m_currentPosition;
+        QString m_buffer;
+        mutable QTextBoundaryFinder m_finder;
 
     private:
         class Private;
--- kdelibs/kdecore/sonnet/filter.cpp	2009/06/22 10:01:33	985167
+++ kdelibs/kdecore/sonnet/filter.cpp	2009/11/29 23:10:00	1056377
@@ -52,8 +52,7 @@
 }
 
 Filter::Filter()
-    : m_currentPosition(0),
-      d(new Private)
+    : d(new Private)
 {
     d->settings = 0;
 }
@@ -75,13 +74,13 @@
 
 void Filter::restart()
 {
-    m_currentPosition = 0;
+    m_finder.toStart();
 }
 
 void Filter::setBuffer( const QString& buffer )
 {
-    m_buffer          = buffer;
-    m_currentPosition = 0;
+    m_buffer = buffer;
+    m_finder = QTextBoundaryFinder(QTextBoundaryFinder::Word, m_buffer);
 }
 
 QString Filter::buffer() const
@@ -91,135 +90,110 @@
 
 bool Filter::atEnd() const
 {
-    return m_currentPosition >= m_buffer.length();
+    return m_finder.position() >= m_buffer.length();
 }
 
-Word Filter::nextWord() const
+static inline bool
+isSpaceOrPunct(const QString &str)
 {
-    QChar currentChar = skipToLetter( m_currentPosition );
-
-    if ( m_currentPosition >= m_buffer.length() || currentChar.isNull() ) {
-        return Filter::end();
-    }
+    return (str.length() <= 1 && (str[0].isSpace() || str[0].isPunct()));
+}
 
-    bool allUppercase = currentChar.category() & QChar::Letter_Uppercase;
-    bool runTogether = false;
+static bool
+finderNextWord(QTextBoundaryFinder &finder, QString &word, int &bufferStart)
+{
+    QTextBoundaryFinder::BoundaryReasons boundary = finder.boundaryReasons();
+    int start = finder.position(), end = finder.position();
+    bool inWord = (boundary & QTextBoundaryFinder::StartWord) != 0;
 
-    QString foundWord;
-    int start = m_currentPosition;
+    while (finder.toNextBoundary() > 0) {
+        boundary = finder.boundaryReasons();
 
-    // Loop through the chars of the word, until the current char is not a letter
-    // anymore.
-    // Include apostrophes in the word, but not when it is the first character,
-    // as it might be used as 'quotes'.
-    // This way, we'll pass contractions like "I've" to the spellchecker, and
-    // only the word inside apostrophe-quotes, without the apostrophes.
-    while ( currentChar.isLetter() ||
-            ( currentChar == '\'' && start != m_currentPosition ) ) {
-        if ( currentChar.category() & QChar::Letter_Lowercase )
-            allUppercase = false;
-
-	/* FIXME: this does not work for Hebrew for example
-        //we consider run-together words as mixed-case words
-        if ( !allUppercase &&
-             currentChar.category() & QChar::Letter_Uppercase )
-            runTogether = true;
-	*/
-
-        foundWord += currentChar;
-        //Test if currentPosition exists, otherwise go out
-        if( (m_currentPosition + 1) >= m_buffer.length()) {
-
-            // Remove apostrophes at the end of the word, it probably comes from
-            // quoting with apostrophes.
-            if ( foundWord.endsWith( '\'' ) )
-                foundWord.chop( 1 );
-
-            if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) ) {
-                ++m_currentPosition;
-                return nextWord();
-            }
-            else {
-                ++m_currentPosition;
-                return Word( foundWord, start );
+        if ((boundary & QTextBoundaryFinder::EndWord) && inWord) {
+            end = finder.position();
+            QString str = finder.string().mid(start, end - start);
+            if (!isSpaceOrPunct(str)) {
+                word = str;
+                bufferStart = start;
+#if 0
+                qDebug()<< "Word at " << start<< " word = '"
+                        <<  str << "', len = " << str.length();
+#endif
+                return true;
             }
+            inWord = false;
+        }
+        if ((boundary & QTextBoundaryFinder::StartWord)) {
+            start = finder.position();
+            inWord = true;
         }
-        ++m_currentPosition;
-        currentChar = m_buffer.at( m_currentPosition );
     }
+    return false;
+}
 
-    // Remove apostrophes at the end of the word, it probably comes from
-    // quoting with apostrophes.
-    if ( foundWord.endsWith( '\'' ) )
-        foundWord.chop( 1 );
-
-    if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) )
-        return nextWord();
-    return Word( foundWord, start );
+static bool finderWordAt(QTextBoundaryFinder &finder,
+                         int at,
+                         QString &word, int &bufferStart)
+{
+    int oldPosition = finder.position();
+
+    finder.setPosition(at);
+    if (!finder.isAtBoundary() || (finder.boundaryReasons() & QTextBoundaryFinder::EndWord)) {
+        if (finder.toPreviousBoundary() <= 0) {
+            /* QTextBoundaryIterator doesn't consider start of the string
+             * a boundary so we need to rewind to the beginning to catch
+             * the first word */
+            if (at > 0 && finder.string().length() > 0) {
+                finder.toStart();
+            } else
+                return false;
+        }
+    }
+    bool ret = finderNextWord(finder, word, bufferStart);
+    finder.setPosition(oldPosition);
+    return ret;
 }
 
-Word Filter::previousWord() const
+Word Filter::nextWord() const
 {
-    while ( !m_buffer.at( m_currentPosition ).isLetter() &&
-            m_currentPosition != 0) {
-        --m_currentPosition;
-    }
+    QString foundWord;
+    int start;
+    bool allUppercase = false;
+    bool runTogether = false;
 
-    if ( m_currentPosition == 0 ) {
+    if (!finderNextWord(m_finder, foundWord, start))
         return Filter::end();
-    }
-
-    QString foundWord;
-    int start = m_currentPosition;
-    while ( m_buffer.at( start ).isLetter() ) {
-        foundWord.prepend( m_buffer.at( m_currentPosition ) );
-        --start;
-    }
 
+    if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) )
+        return nextWord();
     return Word( foundWord, start );
 }
 
 Word Filter::wordAtPosition( unsigned int pos ) const
 {
-    if ( (int)pos > m_buffer.length() )
-        return Filter::end();
-
-    int currentPosition = pos - 1;
     QString foundWord;
-    while ( currentPosition >= 0 &&
-            m_buffer.at( currentPosition ).isLetter() ) {
-        foundWord.prepend( m_buffer.at( currentPosition ) );
-        --currentPosition;
-    }
-
-    // currentPosition == 0 means the first char is not letter
-    // currentPosition == -1 means we reached the beginning
-    int start = (currentPosition < 0) ? 0 : ++currentPosition;
-    currentPosition = pos ;
-    if ( currentPosition < m_buffer.length() && m_buffer.at( currentPosition ).isLetter() ) {
-        while ( m_buffer.at( currentPosition ).isLetter() ) {
-            foundWord.append( m_buffer.at( currentPosition ) );
-            ++currentPosition;
-        }
-    }
-
+    int start;
+    if (!finderWordAt(m_finder, pos, foundWord, start))
+        return Filter::end();
     return Word( foundWord, start );
 }
 
 
 void Filter::setCurrentPosition( int i )
 {
-    m_currentPosition = i;
+    QString word;
+    int pos;
 
-    //go back to the last word so that next word returns something
-    //useful
-    while ( m_buffer.at( m_currentPosition ).isLetter() && m_currentPosition > 0 )
-        --m_currentPosition;
+    //to make sure we're at an reasonable word boundary
+    if (!finderWordAt(m_finder, i, word, pos)) {
+        return;
+    }
+    m_finder.setPosition(pos);
 }
 
 int Filter::currentPosition() const
 {
-    return m_currentPosition;
+    return m_finder.position();
 }
 
 void Filter::replace( const Word& w, const QString& newWord)
@@ -227,8 +201,10 @@
     int oldLen = w.word.length();
 
     //start spell checkin from the just correct word
-    m_currentPosition = w.start;
     m_buffer = m_buffer.replace( w.start, oldLen, newWord );
+    m_finder = QTextBoundaryFinder(QTextBoundaryFinder::Word,
+                                     m_buffer);
+    m_finder.setPosition(w.start);
 }
 
 QString Filter::context() const
@@ -236,12 +212,12 @@
     int len = 60;
     //we don't want the expression underneath casted to an unsigned int
     //which would cause it to always evaluate to false
-    int signedPosition = m_currentPosition;
+    int signedPosition = m_finder.position();
     bool begin = (signedPosition - len/2)<=0;
 
 
     QString buffer = m_buffer;
-    Word word = wordAtPosition( m_currentPosition );
+    Word word = wordAtPosition( m_finder.position() );
     buffer = buffer.replace( word.start, word.word.length(),
                              QString( "<b>%1</b>" ).arg( word.word ) );
 
@@ -251,7 +227,7 @@
                   .arg( buffer.mid(  0, len ) );
     else
         context = QString( "...%1..." )
-                  .arg( buffer.mid(  m_currentPosition - 20, len ) );
+                  .arg( buffer.mid(  m_finder.position() - 20, len ) );
 
     context.replace( '\n', ' ' );
 
@@ -260,24 +236,27 @@
 
 bool Filter::trySkipLinks() const
 {
-    QChar currentChar = m_buffer.at( m_currentPosition );
+    QChar currentChar = m_buffer.at( m_finder.position() );
+    int currentPosition = m_finder.position();
 
     int length = m_buffer.length();
     //URL - if so skip
     if ( currentChar == ':'
-         && (m_currentPosition+1 < length)
-         && (m_buffer.at( ++m_currentPosition ) == '/' || ( m_currentPosition + 1 ) >= length ) ) {
+         && (currentPosition+1 < length)
+         && (m_buffer.at( ++currentPosition ) == '/' || ( currentPosition + 1 ) >= length ) ) {
         //in both cases url is considered finished at the first whitespace occurrence
         //TODO hey, "http://en.wikipedia.org/wiki/Main Page" --Nick Shaforostoff
-        while ( !m_buffer.at( m_currentPosition++ ).isSpace() && m_currentPosition < length )
+        while ( !m_buffer.at( currentPosition++ ).isSpace() && currentPosition < length )
             ;
+        m_finder.setPosition(currentPosition);
         return true;
     }
 
     //Email - if so skip
     if ( currentChar == '@') {
-        while ( ++m_currentPosition < length && !m_buffer.at( m_currentPosition ).isSpace() )
+        while ( ++currentPosition < length && !m_buffer.at( currentPosition ).isSpace() )
             ;
+        m_finder.setPosition(currentPosition);
         return true;
     }
 
@@ -289,19 +268,6 @@
     return d->settings && d->settings->ignore( word );
 }
 
-QChar Filter::skipToLetter( int &fromPosition ) const
-{
-    //if( m_buffer.isEmpty())
-    if (fromPosition>=m_buffer.size())
-        return QChar();
-    QChar currentChar = m_buffer.at( fromPosition );
-    while ( !currentChar.isLetter() &&
-            (int)++fromPosition < m_buffer.length() ) {
-        currentChar = m_buffer.at( fromPosition );
-    }
-    return currentChar;
-}
-
 bool Filter::shouldBeSkipped( bool wordWasUppercase, bool wordWasRunTogether,
                              const QString& foundWord ) const
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	9 Nov 2009 13:48:31 -0000	1.77
+++ .cvsignore	18 Dec 2009 13:25:42 -0000	1.78
@@ -1 +1 @@
-kdelibs-4.3.3.tar.bz2
+kdelibs-4.3.4.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -p -r1.507 -r1.508
--- kdelibs.spec	9 Dec 2009 14:44:09 -0000	1.507
+++ kdelibs.spec	18 Dec 2009 13:25:42 -0000	1.508
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -86,6 +86,10 @@ Patch50: http://bazaar.launchpad.net/~ku
 # http://websvn.kde.org/?view=revision&revision=1027234
 # add adFilteredBy API required for konq-plugins-4.3.3 to build
 Patch100: kdelibs-4.3.3-adFilteredBy.patch
+# 4.4 trunk
+# http://websvn.kde.org/?view=revision&revision=1056377
+# sonnet was broken with indic, asian, arabic
+Patch101: kdelibs-4.4-sonnet.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -211,6 +215,7 @@ format for easy browsing.
 %patch50 -p1 -b .kaction_qt_keys
 # 4.4
 %patch100 -p0 -b .adFilteredBy
+%patch101 -p1 -b .sonnet
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -403,6 +408,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 4.3.4-3
+- fix bz#531211, backport sonnet patch, fix rendering issue in indic, asian, arabic 
+  languages
+
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.4-2
+- add workaound for low-mem systems
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 



From hoangelos at fedoraproject.org  Fri Dec 18 13:27:57 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 13:27:57 +0000 (UTC)
Subject: rpms/python-pip/F-11 python-pip.spec,1.4,1.5
Message-ID: <20091218132757.C159A11C00E6@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24104

Modified Files:
	python-pip.spec 
Log Message:
Updating to 0.6.1-2


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/python-pip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-pip.spec	18 Dec 2009 03:06:49 -0000	1.4
+++ python-pip.spec	18 Dec 2009 13:27:57 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        0.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 
 Group:          Development/Libraries
@@ -47,6 +47,8 @@ pip is meant to improve on easy_install.
 %{python_sitelib}/pip*
 
 %changelog
++ Tue Dec 18 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-2
+- fix spec file 
 * Mon Dec 17 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-1
 - upgrade to 0.6.1 of pip
 * Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1



From hoangelos at fedoraproject.org  Fri Dec 18 13:30:59 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 13:30:59 +0000 (UTC)
Subject: rpms/python-pip/F-11 python-pip.spec,1.5,1.6
Message-ID: <20091218133059.ABB8511C0374@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24846

Modified Files:
	python-pip.spec 
Log Message:
Updating to 0.6.1-2


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/python-pip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-pip.spec	18 Dec 2009 13:27:57 -0000	1.5
+++ python-pip.spec	18 Dec 2009 13:30:59 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        0.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 
 Group:          Development/Libraries
@@ -47,7 +47,7 @@ pip is meant to improve on easy_install.
 %{python_sitelib}/pip*
 
 %changelog
-+ Tue Dec 18 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-2
+* Tue Dec 18 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-2
 - fix spec file 
 * Mon Dec 17 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-1
 - upgrade to 0.6.1 of pip



From tomspur at fedoraproject.org  Fri Dec 18 13:35:21 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 18 Dec 2009 13:35:21 +0000 (UTC)
Subject: File gbirthday-0.5.6.tar.xz uploaded to lookaside cache by tomspur
Message-ID: <20091218133521.9800628ED4F@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for gbirthday:

345717bccd0bcbb1c3679cfa04beb5b5  gbirthday-0.5.6.tar.xz



From tomspur at fedoraproject.org  Fri Dec 18 13:35:56 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 18 Dec 2009 13:35:56 +0000 (UTC)
Subject: rpms/gbirthday/devel .cvsignore, 1.7, 1.8 gbirthday.spec, 1.10,
	1.11 sources, 1.8, 1.9 gbirthday-ebook.patch, 1.1, NONE
Message-ID: <20091218133556.259E211C00E6@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25895

Modified Files:
	.cvsignore gbirthday.spec sources 
Removed Files:
	gbirthday-ebook.patch 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	14 Dec 2009 09:45:26 -0000	1.7
+++ .cvsignore	18 Dec 2009 13:35:55 -0000	1.8
@@ -1 +1 @@
-gbirthday-0.5.5.tar.xz
+gbirthday-0.5.6.tar.xz


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gbirthday.spec	17 Dec 2009 01:32:44 -0000	1.10
+++ gbirthday.spec	18 Dec 2009 13:35:55 -0000	1.11
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gbirthday
-Version:        0.5.5
-Release:        3%{?dist}
+Version:        0.5.6
+Release:        1%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://gbirthday.sourceforge.net
 Source:         http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.xz
-Patch0:         %{name}-ebook.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -32,7 +31,6 @@ your contacs' birthday on next days.
 
 %prep
 %setup -q -c %{name}-%{version}
-%patch0 -p1
 
 %build
 
@@ -62,6 +60,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Fri Dec 18 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.6-1
+- new version
+- delete ebook.patch again
+
 * Tue Dec 17 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-3
 - add ebook.patch, applied from upstream git repo, fixes bug #548007
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	15 Dec 2009 23:56:41 -0000	1.8
+++ sources	18 Dec 2009 13:35:56 -0000	1.9
@@ -1 +1 @@
-4850a11981b10561452669ed4141b0fe  gbirthday-0.5.5.tar.xz
+345717bccd0bcbb1c3679cfa04beb5b5  gbirthday-0.5.6.tar.xz


--- gbirthday-ebook.patch DELETED ---



From tomspur at fedoraproject.org  Fri Dec 18 13:40:55 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 18 Dec 2009 13:40:55 +0000 (UTC)
Subject: rpms/gbirthday/F-12 gbirthday.spec, 1.9, 1.10 sources, 1.8,
	1.9 gbirthday-ebook.patch, 1.1, NONE
Message-ID: <20091218134055.BDA5811C00E6@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26765

Modified Files:
	gbirthday.spec sources 
Removed Files:
	gbirthday-ebook.patch 
Log Message:
new version


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/gbirthday.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gbirthday.spec	17 Dec 2009 01:33:43 -0000	1.9
+++ gbirthday.spec	18 Dec 2009 13:40:55 -0000	1.10
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gbirthday
-Version:        0.5.5
-Release:        3%{?dist}
+Version:        0.5.6
+Release:        1%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://gbirthday.sourceforge.net
 Source:         http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.xz
-Patch0:         %{name}-ebook.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -32,7 +31,6 @@ your contacs' birthday on next days.
 
 %prep
 %setup -q -c %{name}-%{version}
-%patch0 -p1
 
 %build
 
@@ -62,6 +60,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Fri Dec 18 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.6-1
+- new version
+- delete ebook.patch again
+
 * Tue Dec 17 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-3
 - add ebook.patch, applied from upstream git repo, fixes bug #548007
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	15 Dec 2009 23:57:23 -0000	1.8
+++ sources	18 Dec 2009 13:40:55 -0000	1.9
@@ -1 +1 @@
-4850a11981b10561452669ed4141b0fe  gbirthday-0.5.5.tar.xz
+345717bccd0bcbb1c3679cfa04beb5b5  gbirthday-0.5.6.tar.xz


--- gbirthday-ebook.patch DELETED ---



From nhorman at fedoraproject.org  Fri Dec 18 13:42:04 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri, 18 Dec 2009 13:42:04 +0000 (UTC)
Subject: rpms/cscope/F-12 cscope-15.6-argv-adjust.patch, NONE,
	1.1 cscope-15.6-linemode-options-readd.patch, NONE,
	1.1 cscope.spec, 1.40, 1.41
Message-ID: <20091218134204.E030811C00E6@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/pkgs/rpms/cscope/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27061

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.6-argv-adjust.patch 
	cscope-15.6-linemode-options-readd.patch 
Log Message:
Resoves: bz546993 bz547023

cscope-15.6-argv-adjust.patch:
 main.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

--- NEW FILE cscope-15.6-argv-adjust.patch ---
diff -up cscope-15.6/src/main.c.orig cscope-15.6/src/main.c
--- cscope-15.6/src/main.c.orig	2009-12-18 08:28:46.000000000 -0500
+++ cscope-15.6/src/main.c	2009-12-18 08:29:15.000000000 -0500
@@ -145,17 +145,15 @@ struct option lopts[] = {
 char ** parse_options(int *argc, char **argv)
 {
 	int opt;
-	int optind;
+	int longind;
 	char path[PATHLEN + 1];     /* file path */
 	char *s;
-	int args_handled = 1;
 	int argcc = *argc;
 	
 
 	while ((opt = getopt_long(argcc, argv,
 	       "hVbcCdeF:f:I:i:kLl0:1:2:3:4:5:6:7:8:9:P:p:qRs:TUuv",
-	       lopts, &optind)) != -1) {
-		args_handled++;
+	       lopts, &longind)) != -1) {
 		switch(opt) {
 
 		case '?':
@@ -248,8 +246,8 @@ char ** parse_options(int *argc, char **
  	 * args.  Its ugly, but we need to do it so that the rest
  	 * of the main routine doesn't get all confused
  	 */
-	*argc = *argc - args_handled;
-	return &argv[*argc];
+	*argc = *argc - optind;
+	return &argv[optind];
 }
 #endif
 

cscope-15.6-linemode-options-readd.patch:
 main.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

--- NEW FILE cscope-15.6-linemode-options-readd.patch ---
diff -up cscope-15.6/src/main.c.orig cscope-15.6/src/main.c
--- cscope-15.6/src/main.c.orig	2009-12-18 08:32:02.000000000 -0500
+++ cscope-15.6/src/main.c	2009-12-18 08:32:20.000000000 -0500
@@ -160,6 +160,25 @@ char ** parse_options(int *argc, char **
 			usage();
 			myexit(1);
 			break;
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			/* The input fields numbers for line mode operation */
+			field = opt - '0';
+			if (strlen(optarg) > PATHLEN) {
+				    postfatal("\
+					cscope: pattern too long, cannot be > \
+					%d characters\n", PATLEN);
+			}
+			strcpy(Pattern, optarg);	
+			break;
 		case 'b':	/* only build the cross-reference */
 			buildonly = YES;
 			linemode  = YES;


Index: cscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cscope/F-12/cscope.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- cscope.spec	9 Dec 2009 20:38:08 -0000	1.40
+++ cscope.spec	18 Dec 2009 13:42:04 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.6.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -20,6 +20,8 @@ Patch3:cscope-15.6-sigwinch-linemode.pat
 Patch4:cscope-15.6-qrebuild.patch
 Patch5:cscope-15.6-incdir-overflow.patch
 Patch6:cscope-15.6-invalid-opt.patch
+Patch7:cscope-15.6-argv-adjust.patch
+Patch8:cscope-15.6-linemode-options-readd.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -37,9 +39,11 @@ matches for use in file editing.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
-export CFLAGS="-g -O2 -D_GNU_SOURCE"
+export CFLAGS="%{optflags} -D_GNU_SOURCE"
 %configure
 make
 
@@ -86,7 +90,11 @@ rm -f %{xemacs_lisp_path}/xcscope.el
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
-* Wed Dec 09 2009 Neil Horman <nhorman at redhat.com>
+* Fri Dec 18 2009 Neil Horman <nhorman at redhat.com> 15.6-7
+- Fixed adjustment of argv that led to bad commandline behavior (bz 547023)
+- Added missing linemode operations to parse_options (bz 546993)
+
+* Wed Dec 09 2009 Neil Horman <nhorman at redhat.com> 15.6-6
 - Fixed broken parsing of invalid options (bz 545816)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.6-5



From hoangelos at fedoraproject.org  Fri Dec 18 13:45:01 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 13:45:01 +0000 (UTC)
Subject: rpms/python-pip/devel python-pip.spec,1.2,1.3
Message-ID: <20091218134501.7245C11C00E6@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27701

Modified Files:
	python-pip.spec 
Log Message:
Updating to 0.6.1-3


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/devel/python-pip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-pip.spec	18 Dec 2009 02:39:41 -0000	1.2
+++ python-pip.spec	18 Dec 2009 13:45:01 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        0.6.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 
 Group:          Development/Libraries
@@ -47,5 +47,10 @@ pip is meant to improve on easy_install.
 %{python_sitelib}/pip*
 
 %changelog
+* Tue Dec 18 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-2
+- fix spec file 
+* Mon Dec 17 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-1
+- upgrade to 0.6.1 of pip
 * Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
 - Initial package
+



From awjb at fedoraproject.org  Fri Dec 18 13:47:54 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 18 Dec 2009 13:47:54 +0000 (UTC)
Subject: File wine-1.1.34-fe.tar.bz2 uploaded to lookaside cache by awjb
Message-ID: <20091218134754.39AF328ED1C@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for wine:

445c7d6e6ec1423e9f311eb1b467e5da  wine-1.1.34-fe.tar.bz2



From ovasik at fedoraproject.org  Fri Dec 18 13:48:06 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Dec 2009 13:48:06 +0000 (UTC)
Subject: rpms/docbook-style-xsl/devel docbook-style-xsl.spec,1.64,1.65
Message-ID: <20091218134806.7617811C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/docbook-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28417

Modified Files:
	docbook-style-xsl.spec 
Log Message:
comment patches purpose,  License Copyright only


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- docbook-style-xsl.spec	24 Jul 2009 20:26:13 -0000	1.64
+++ docbook-style-xsl.spec	18 Dec 2009 13:48:06 -0000	1.65
@@ -1,11 +1,11 @@
 Name: docbook-style-xsl
 Version: 1.75.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
 
-License: Freely redistributable without restriction
+License: Copyright only
 URL: http://docbook.sourceforge.net/projects/xsl/
 
 Provides: docbook-xsl = %{version}
@@ -25,10 +25,15 @@ Source0: http://downloads.sourceforge.ne
 Source1: %{name}.Makefile
 Source2: http://downloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2
 
+#Avoid proportional-column-width for passivetex (bug #176766).
 Patch1: docbook-xsl-pagesetup.patch
+#Hard-code the margin-left work around to expect passivetex (bug #113456).
 Patch2: docbook-xsl-marginleft.patch
+#fix of #161619 - adjustColumnWidths now available
 Patch3: docbook-xsl-newmethods.patch
+#change a few non-constant expressions to constant - needed for passivetex(#366441)
 Patch4: docbook-xsl-non-constant-expressions.patch
+#added fixes for passivetex extension and list-item-body(#161371)
 Patch5: docbook-xsl-list-item-body.patch
 
 
@@ -117,6 +122,10 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Fri Dec 18 2009 Ondrej Vasik <ovasik at redhat.com> 1.75.3-5
+- comment patches purpose
+- License Copyright only
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.75.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hoangelos at fedoraproject.org  Fri Dec 18 13:49:14 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 13:49:14 +0000 (UTC)
Subject: rpms/python-pip/F-12 .cvsignore, 1.2, 1.3 python-pip.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091218134914.36FF911C00E6@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28747

Modified Files:
	.cvsignore python-pip.spec sources 
Log Message:
Updating to 0.6.1-3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 01:27:21 -0000	1.2
+++ .cvsignore	18 Dec 2009 13:49:14 -0000	1.3
@@ -1 +1 @@
-pip-0.4.tar.gz
+pip-0.6.1.tar.gz


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-12/python-pip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-pip.spec	26 Oct 2009 01:27:23 -0000	1.1
+++ python-pip.spec	18 Dec 2009 13:49:14 -0000	1.2
@@ -3,8 +3,8 @@
 %global srcname pip
 
 Name:           python-%{srcname}
-Version:        0.4
-Release:        1%{?dist}
+Version:        0.6.1
+Release:        3%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 
 Group:          Development/Libraries
@@ -47,5 +47,10 @@ pip is meant to improve on easy_install.
 %{python_sitelib}/pip*
 
 %changelog
+* Tue Dec 18 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-2
+- fix spec file 
+* Mon Dec 17 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-1
+- upgrade to 0.6.1 of pip
 * Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
 - Initial package
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 01:27:23 -0000	1.2
+++ sources	18 Dec 2009 13:49:14 -0000	1.3
@@ -1 +1 @@
-b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz
+7560e3055c66afb99ac4a7892389a237  pip-0.6.1.tar.gz



From hoangelos at fedoraproject.org  Fri Dec 18 13:50:58 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 13:50:58 +0000 (UTC)
Subject: rpms/python-pip/EL-4 .cvsignore, 1.2, 1.3 python-pip.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091218135058.EA4BB11C0345@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29139

Modified Files:
	.cvsignore python-pip.spec sources 
Log Message:
Updating to 0.6.1-3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 02:52:31 -0000	1.2
+++ .cvsignore	18 Dec 2009 13:50:58 -0000	1.3
@@ -1 +1 @@
-pip-0.4.tar.gz
+pip-0.6.1.tar.gz


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-4/python-pip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-pip.spec	26 Oct 2009 02:52:31 -0000	1.1
+++ python-pip.spec	18 Dec 2009 13:50:58 -0000	1.2
@@ -3,8 +3,8 @@
 %global srcname pip
 
 Name:           python-%{srcname}
-Version:        0.4
-Release:        1%{?dist}
+Version:        0.6.1
+Release:        3%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 
 Group:          Development/Libraries
@@ -47,5 +47,10 @@ pip is meant to improve on easy_install.
 %{python_sitelib}/pip*
 
 %changelog
+* Tue Dec 18 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-2
+- fix spec file 
+* Mon Dec 17 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-1
+- upgrade to 0.6.1 of pip
 * Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
 - Initial package
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 02:52:31 -0000	1.2
+++ sources	18 Dec 2009 13:50:58 -0000	1.3
@@ -1 +1 @@
-b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz
+7560e3055c66afb99ac4a7892389a237  pip-0.6.1.tar.gz



From hoangelos at fedoraproject.org  Fri Dec 18 13:52:35 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 13:52:35 +0000 (UTC)
Subject: rpms/python-pip/EL-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091218135235.ACB4411C00E6@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29538

Modified Files:
	.cvsignore sources 
Log Message:
Updating to 0.6.1-3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 02:54:37 -0000	1.2
+++ .cvsignore	18 Dec 2009 13:52:35 -0000	1.3
@@ -1 +1 @@
-pip-0.4.tar.gz
+pip-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 02:54:37 -0000	1.2
+++ sources	18 Dec 2009 13:52:35 -0000	1.3
@@ -1 +1 @@
-b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz
+7560e3055c66afb99ac4a7892389a237  pip-0.6.1.tar.gz



From hoangelos at fedoraproject.org  Fri Dec 18 13:53:25 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Fri, 18 Dec 2009 13:53:25 +0000 (UTC)
Subject: rpms/python-pip/EL-5 python-pip.spec,1.1,1.2
Message-ID: <20091218135325.A08B811C00E6@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29688

Modified Files:
	python-pip.spec 
Log Message:
Updating to 0.6.1-3


Index: python-pip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-5/python-pip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-pip.spec	26 Oct 2009 02:54:37 -0000	1.1
+++ python-pip.spec	18 Dec 2009 13:53:25 -0000	1.2
@@ -3,8 +3,8 @@
 %global srcname pip
 
 Name:           python-%{srcname}
-Version:        0.4
-Release:        1%{?dist}
+Version:        0.6.1
+Release:        3%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 
 Group:          Development/Libraries
@@ -47,5 +47,10 @@ pip is meant to improve on easy_install.
 %{python_sitelib}/pip*
 
 %changelog
+* Tue Dec 18 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-2
+- fix spec file 
+* Mon Dec 17 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.6.1-1
+- upgrade to 0.6.1 of pip
 * Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
 - Initial package
+



From ovasik at fedoraproject.org  Fri Dec 18 13:53:35 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 18 Dec 2009 13:53:35 +0000 (UTC)
Subject: rpms/docbook-style-dsssl/devel docbook-style-dsssl.spec,1.21,1.22
Message-ID: <20091218135335.C738711C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/docbook-style-dsssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29726

Modified Files:
	docbook-style-dsssl.spec 
Log Message:
License Copyright only


Index: docbook-style-dsssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-style-dsssl/devel/docbook-style-dsssl.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- docbook-style-dsssl.spec	28 Aug 2009 09:47:06 -0000	1.21
+++ docbook-style-dsssl.spec	18 Dec 2009 13:53:35 -0000	1.22
@@ -1,11 +1,11 @@
 Name: docbook-style-dsssl
 Version: 1.79
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's modular stylesheets for DocBook
 
-License: Freely redistributable without restriction
+License: Copyright only
 URL: http://docbook.sourceforge.net/
 
 %define openjadever 1.3.2
@@ -88,6 +88,9 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 18 2009 Ondrej Vasik <ovasik at redhat.com> - 1.79-9
+- License Copyright only
+
 * Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 1.79-8
 - ship manpage for collateindex.pl
 - preserve attributes and timestamps in Makefile



From jwrdegoede at fedoraproject.org  Fri Dec 18 13:59:32 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 18 Dec 2009 13:59:32 +0000 (UTC)
Subject: rpms/quake3/devel quake3.spec,1.13,1.14 urbanterror.sh,1.3,1.4
Message-ID: <20091218135932.2379711C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/quake3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30987

Modified Files:
	quake3.spec urbanterror.sh 
Log Message:
* Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.36-5
- Modify Urban Terror launch script to allow downloading of maps by default



Index: quake3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quake3/devel/quake3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- quake3.spec	4 Nov 2009 11:23:53 -0000	1.13
+++ quake3.spec	18 Dec 2009 13:59:31 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           quake3
 Version:        1.36
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -270,6 +270,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.36-5
+- Modify Urban Terror launch script to allow downloading of maps by default
+
 * Wed Nov  4 2009 Hans de Goede <hdegoede at redhat.com> 1.36-4
 - Fix bots not working on Intel 64 bit CPU's (#526338)
 


Index: urbanterror.sh
===================================================================
RCS file: /cvs/pkgs/rpms/quake3/devel/urbanterror.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- urbanterror.sh	11 Jan 2008 16:26:10 -0000	1.3
+++ urbanterror.sh	18 Dec 2009 13:59:31 -0000	1.4
@@ -26,4 +26,4 @@ if [ ! -f ~/.q3a/q3ut4/zpak000.pk3 ]; th
   fi
 fi
 
-exec quake3 +set fs_game q3ut4 +set com_hunkMegs 256 "$@"
+exec quake3 +set fs_game q3ut4 +set com_hunkMegs 256 +set cl_allowdownload 1 "$@"



From jwrdegoede at fedoraproject.org  Fri Dec 18 14:00:37 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 18 Dec 2009 14:00:37 +0000 (UTC)
Subject: rpms/quake3/F-12 quake3.spec,1.13,1.14 urbanterror.sh,1.3,1.4
Message-ID: <20091218140037.2E7F411C0345@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/quake3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31460

Modified Files:
	quake3.spec urbanterror.sh 
Log Message:
* Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.36-5
- Modify Urban Terror launch script to allow downloading of maps by default



Index: quake3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quake3/F-12/quake3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- quake3.spec	4 Nov 2009 12:12:45 -0000	1.13
+++ quake3.spec	18 Dec 2009 14:00:36 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           quake3
 Version:        1.36
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -270,6 +270,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.36-5
+- Modify Urban Terror launch script to allow downloading of maps by default
+
 * Wed Nov  4 2009 Hans de Goede <hdegoede at redhat.com> 1.36-4
 - Fix bots not working on Intel 64 bit CPU's (#526338)
 


Index: urbanterror.sh
===================================================================
RCS file: /cvs/pkgs/rpms/quake3/F-12/urbanterror.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- urbanterror.sh	11 Jan 2008 16:26:10 -0000	1.3
+++ urbanterror.sh	18 Dec 2009 14:00:37 -0000	1.4
@@ -26,4 +26,4 @@ if [ ! -f ~/.q3a/q3ut4/zpak000.pk3 ]; th
   fi
 fi
 
-exec quake3 +set fs_game q3ut4 +set com_hunkMegs 256 "$@"
+exec quake3 +set fs_game q3ut4 +set com_hunkMegs 256 +set cl_allowdownload 1 "$@"



From rdieter at fedoraproject.org  Fri Dec 18 14:14:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 14:14:01 +0000 (UTC)
Subject: File kdelibs-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218141401.C92B328ECA3@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for kdelibs:

b5deca5371719875d10ef63a37c7c2b8  kdelibs-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 14:18:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 14:18:08 +0000 (UTC)
Subject: File oxygen-icons-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218141808.632EA28ECD1@bastion3.fedora.phx2.redhat.com>

A file has been added to the lookaside cache for oxygen-icon-theme:

842503731c13bb3af227a40d4a8e2c29  oxygen-icons-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 14:19:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 14:19:51 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/devel .cvsignore, 1.15,
	1.16 oxygen-icon-theme.spec, 1.13, 1.14 sources, 1.13, 1.14
Message-ID: <20091218141951.8391E11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/oxygen-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2387

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- 4.3.85 (4.4 beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	2 Dec 2009 15:10:46 -0000	1.15
+++ .cvsignore	18 Dec 2009 14:19:51 -0000	1.16
@@ -1 +1 @@
-oxygen-icons-4.3.80.tar.bz2
+oxygen-icons-4.3.85.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/oxygen-icon-theme.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- oxygen-icon-theme.spec	2 Dec 2009 15:10:47 -0000	1.13
+++ oxygen-icon-theme.spec	18 Dec 2009 14:19:51 -0000	1.14
@@ -1,6 +1,6 @@
 Name:          oxygen-icon-theme
 Summary:       Oxygen icon theme
-Version:       4.3.80
+Version:       4.3.85
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +66,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- 4.3.85 (4.4 beta2)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Dec 2009 15:10:47 -0000	1.13
+++ sources	18 Dec 2009 14:19:51 -0000	1.14
@@ -1 +1 @@
-97a391478720b670a97ad7d18054f1b6  oxygen-icons-4.3.80.tar.bz2
+842503731c13bb3af227a40d4a8e2c29  oxygen-icons-4.3.85.tar.bz2



From than at fedoraproject.org  Fri Dec 18 14:21:29 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 18 Dec 2009 14:21:29 +0000 (UTC)
Subject: rpms/doxygen/devel doxygen.spec,1.70,1.71
Message-ID: <20091218142129.4A89411C0345@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2996

Modified Files:
	doxygen.spec 
Log Message:
bz#225709, merged review




Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- doxygen.spec	25 Aug 2009 12:57:26 -0000	1.70
+++ doxygen.spec	18 Dec 2009 14:21:29 -0000	1.71
@@ -1,12 +1,9 @@
 %define _default_patch_fuzz 2
 
-%define qt_version 4.4
-%{!?with_qt:%define with_qt 1}
-
-Summary: A documentation system for C/C++.
+Summary: A documentation system for C/C++
 Name: doxygen
 Version: 1.6.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
@@ -34,17 +31,15 @@ documentation is extracted directly from
 also be configured to extract the code structure from undocumented
 source files.
 
-%if %{with_qt}
 %package doxywizard
-Summary: A GUI for creating and editing configuration files.
+Summary: A GUI for creating and editing configuration files
 Group: User Interface/X
 Requires: %{name} = %{epoch}:%{version}
-BuildRequires: qt-devel => %{qt_version}
+BuildRequires: qt-devel => 4.4
 
 %description doxywizard
 Doxywizard is a GUI for creating and editing configuration files that
 are used by doxygen.
-%endif
 
 %prep
 %setup -q
@@ -58,9 +53,7 @@ unset QTDIR
 ./configure \
    --prefix %{_prefix} \
    --shared \
-%if %{with_qt}
    --with-doxywizard \
-%endif
    --release
 
 # workaround for "Error: operand out of range", language.cpp needs to be splitted
@@ -77,9 +70,15 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-%if !%{with_qt}
-  rm -rf %{buildroot}%{_mandir}/man1/doxywizard*
-%endif
+# convert into utf-8
+iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
+touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new
+mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
+
+# drop -x bit
+find examples -type f | xargs chmod -x
+
+sed -i -e "s|#!perl|#! /usr/bin/perl|" examples/tag/html/installdox
 
 %clean
 rm -rf %{buildroot}
@@ -93,14 +92,18 @@ rm -rf %{buildroot}
 %{_mandir}/man1/doxygen.1*
 %{_mandir}/man1/doxytag.1*
 
-%if %{with_qt}
 %files doxywizard
 %defattr(-,root,root)
 %{_bindir}/doxywizard
 %{_mandir}/man1/doxywizard*
-%endif
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 1:1.6.1-3
+- bz#225709, merged review
+
+* Fri Dec 11 2009 Than Ngo <than at redhat.com> - 1:1.6.1-2
+- bz#225709, merged review 
+
 * Tue Aug 25 2009 Than Ngo <than at redhat.com> - 1.6.1-1
 - 1.6.1
 



From rdieter at fedoraproject.org  Fri Dec 18 14:29:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 14:29:01 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore, 1.84, 1.85 kdelibs.spec, 1.553,
	1.554 sources, 1.100,
	1.101 kdelibs-4.3.80-fix-kauth-polkitqt-1.patch, 1.1,
	NONE kubuntu_80_kaction_qt_keys.diff, 1.1, NONE
Message-ID: <20091218142901.DB84511C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4341

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.80-fix-kauth-polkitqt-1.patch 
	kubuntu_80_kaction_qt_keys.diff 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- 4.3.85 (4.4 beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	2 Dec 2009 13:21:54 -0000	1.84
+++ .cvsignore	18 Dec 2009 14:29:01 -0000	1.85
@@ -1 +1 @@
-kdelibs-4.3.80.tar.bz2
+kdelibs-4.3.85.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -p -r1.553 -r1.554
--- kdelibs.spec	16 Dec 2009 16:05:23 -0000	1.553
+++ kdelibs.spec	18 Dec 2009 14:29:01 -0000	1.554
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: KDE Libraries
-Version: 4.3.80
-Release: 5%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -80,15 +80,12 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
 
 # upstream
-# kubuntu working to upstream this
-Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff
-# Another backported typo fix, this one for KAuth PolkitQt-1
-Patch101: kdelibs-4.3.80-fix-kauth-polkitqt-1.patch
 
 # security fix
+## Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
-BuildRequires: qt4-devel >= 4.5.0
+BuildRequires: qt4-devel >= 4.6.0
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig
@@ -216,15 +213,12 @@ format for easy browsing.
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
 %endif
 
-# Kubuntu patch
-%patch50 -p1 -b .kaction_qt_keys
-
 # upstream patches
-%patch101 -p0 -b .kauth-polkitqt-1
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
 
+
 %build
 
 # add release version
@@ -415,6 +409,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- 4.3.85 (4.4 beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-5
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources	4 Dec 2009 15:20:31 -0000	1.100
+++ sources	18 Dec 2009 14:29:01 -0000	1.101
@@ -1 +1 @@
-3d4fe702be4a85c02e56e80a8f06ae76  kdelibs-4.3.80.tar.bz2
+b5deca5371719875d10ef63a37c7c2b8  kdelibs-4.3.85.tar.bz2


--- kdelibs-4.3.80-fix-kauth-polkitqt-1.patch DELETED ---


--- kubuntu_80_kaction_qt_keys.diff DELETED ---



From rdieter at fedoraproject.org  Fri Dec 18 14:41:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 14:41:20 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.85-parallel_devel.patch, NONE,
	1.1 kdelibs.spec, 1.554,
	1.555 kdelibs-4.3.75-parallel_devel.patch, 1.1, NONE
Message-ID: <20091218144120.A297B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6639

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.85-parallel_devel.patch 
Removed Files:
	kdelibs-4.3.75-parallel_devel.patch 
Log Message:
rebase parallel_devel patch


kdelibs-4.3.85-parallel_devel.patch:
 cmake/modules/FindKDE4Internal.cmake        |   35 +++++++++++++++-------------
 doc/api/doxygen-preprocess-kcfg.sh          |    4 +--
 kdecore/kconfig_compiler/CMakeLists.txt     |    6 ++--
 kdecore/kconfig_compiler/checkkcfg.pl       |    4 +--
 kdeui/tests/kconfig_compiler/CMakeLists.txt |    2 -
 kdewidgets/CMakeLists.txt                   |   12 ++++-----
 6 files changed, 33 insertions(+), 30 deletions(-)

--- NEW FILE kdelibs-4.3.85-parallel_devel.patch ---
diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 06:09:13.000000000 -0500
+++ kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl	2009-12-18 08:39:50.000000000 -0600
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
 
 $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 -up kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-10-26 04:15:46.000000000 -0500
+++ kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt	2009-12-18 08:39:50.000000000 -0600
@@ -4,13 +4,13 @@
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI ${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} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### install files ###############
diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-12-17 10:33:38.000000000 -0600
+++ kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake	2009-12-18 08:39:50.000000000 -0600
@@ -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, deprecated, use AUTOMOC4_EXECUTABLE instead
 #  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:
@@ -138,7 +138,7 @@
 #    relative path to the file.
 #
 #  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)
@@ -421,25 +421,25 @@ if (_kdeBootStrapping)
    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_MEINPROC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
       set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE  ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen )
-      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${CMAKE_EXECUTABLE_SUFFIX}.shell )
+      set(KDE4_KCFGC_EXECUTABLE             ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4${CMAKE_EXECUTABLE_SUFFIX}.shell )
       set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE  ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen${CMAKE_EXECUTABLE_SUFFIX}.shell )
       set(KDE4_MEINPROC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4${CMAKE_EXECUTABLE_SUFFIX}.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE    ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets${CMAKE_EXECUTABLE_SUFFIX}.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE    ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4${CMAKE_EXECUTABLE_SUFFIX}.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_KAUTH_POLICY_GEN_EXECUTABLE_DEP kauth-policy-gen)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -487,7 +487,8 @@ else (_kdeBootStrapping)
 
    # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
    # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
-   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+   link_directories("${KDE4_LIB_DIR}")
    set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
 
 
@@ -503,10 +504,10 @@ else (_kdeBootStrapping)
    get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
    list(GET _importedConfigurations 0 _firstConfig)
 
-   get_target_property(KDE4_KCFGC_EXECUTABLE             ${KDE4_TARGET_PREFIX}kconfig_compiler    LOCATION_${_firstConfig})
+   get_target_property(KDE4_KCFGC_EXECUTABLE             ${KDE4_TARGET_PREFIX}kconfig_compiler4    LOCATION_${_firstConfig})
    get_target_property(KDE4_MEINPROC_EXECUTABLE          ${KDE4_TARGET_PREFIX}meinproc4           LOCATION_${_firstConfig})
    get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE  ${KDE4_TARGET_PREFIX}kauth-policy-gen    LOCATION_${_firstConfig})
-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE    ${KDE4_TARGET_PREFIX}makekdewidgets      LOCATION_${_firstConfig})
+   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE    ${KDE4_TARGET_PREFIX}makekdewidgets4      LOCATION_${_firstConfig})
 
    # 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)
@@ -830,7 +831,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
 set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
                               "${KDE4_BIN_INSTALL_DIR}" )
 
-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}" )
 
 # under Windows dlls may be also installed in bin/
@@ -849,6 +851,7 @@ endif(WIN32)
 # CMake generators if no build type is set.
 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE RelWithDebInfo)
+   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
 endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
 
 
@@ -1224,9 +1227,9 @@ macro (KDE4_PRINT_RESULTS)
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found the 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(AUTOMOC4_EXECUTABLE)
@@ -1245,7 +1248,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
    endif (NOT KDE4_INSTALLED_VERSION_OK)
 
    if (NOT KDE4_KCFGC_EXECUTABLE)
-     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
    endif (NOT KDE4_KCFGC_EXECUTABLE)
 
    message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.3.85/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdewidgets/CMakeLists.txt
--- kdelibs-4.3.85/kdewidgets/CMakeLists.txt.parallel_devel	2009-09-23 14:23:44.000000000 -0500
+++ kdelibs-4.3.85/kdewidgets/CMakeLists.txt	2009-12-18 08:39:50.000000000 -0600
@@ -14,24 +14,24 @@ include_directories( 
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS makekdewidgets  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS makekdewidgets4  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### 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
@@ -66,7 +66,7 @@ if (QT_QT3SUPPORT_FOUND)
 
    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
      COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
-     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
+     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
 
    set(kde3supportwidgets_PART_SRCS
       classpreviews.cpp
diff -up kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-08-12 05:00:20.000000000 -0500
+++ kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-12-18 08:39:50.000000000 -0600
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
    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 -up kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 06:07:26.000000000 -0500
+++ kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh	2009-12-18 08:39:50.000000000 -0600
@@ -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
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -p -r1.554 -r1.555
--- kdelibs.spec	18 Dec 2009 14:29:01 -0000	1.554
+++ kdelibs.spec	18 Dec 2009 14:41:20 -0000	1.555
@@ -48,7 +48,7 @@ Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.3.75-parallel_devel.patch
+Patch0: kdelibs-4.3.85-parallel_devel.patch
 # fix kde#149705
 Patch2: kdelibs-4.2.85-kde149705.patch
 # Hunspell support for K3Spell


--- kdelibs-4.3.75-parallel_devel.patch DELETED ---



From nickc at fedoraproject.org  Fri Dec 18 14:53:14 2009
From: nickc at fedoraproject.org (Nicholas Clifton)
Date: Fri, 18 Dec 2009 14:53:14 +0000 (UTC)
Subject: rpms/binutils/devel
	binutils-2.20.51.0.2-ppc-hidden-plt-relocs.patch, 
	NONE, 1.1 binutils.spec, 1.186,
	1.187 binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch, 1.1, NONE
Message-ID: <20091218145314.86E0511C00E6@cvs1.fedora.phx.redhat.com>

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8642

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.20.51.0.2-ppc-hidden-plt-relocs.patch 
Removed Files:
	binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch 
Log Message:
Fix ppc hidden plt patch.


binutils-2.20.51.0.2-ppc-hidden-plt-relocs.patch:
 bfd/ChangeLog     |   22 ++++++++++
 bfd/elf32-ppc.c   |  113 ++++++++++++++++++++++++++++++++----------------------
 bfd/elf64-ppc.c   |    4 -
 include/elf/ppc.h |    7 +--
 4 files changed, 93 insertions(+), 53 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-ppc-hidden-plt-relocs.patch ---
diff -rup ../binutils-2.20.51.0.2.original/bfd/ChangeLog ./bfd/ChangeLog
--- ../binutils-2.20.51.0.2.original/bfd/ChangeLog	2009-12-17 16:08:07.000000000 +0000
+++ ./bfd/ChangeLog	2009-12-17 17:20:30.000000000 +0000
@@ -1,3 +1,25 @@
+2009-12-17  Alan Modra  <amodra at bigpond.net.au>
+
+	PR ld/11088
+	* elf64-ppc.c (ppc64_elf_gc_sweep_hook): Don't abort if symbol
+	hiding has nulled out plt.plist.
+
+	PR ld/11088
+	* elf32-ppc.c (update_plt_info): Clear sec here when addend is
+	less than 32768..
+	(ppc_elf_check_relocs): ..rather than doing so here.  Ignore new
+	relax relocs.
+	(ppc_elf_gc_sweep_hook): Don't segfault when symbol hiding has
+	removed plt_entry records.
+	(ppc_elf_tls_setup): Handle PIE calls to __tls_get_addr correctly.
+	(ppc_elf_tls_optimize): Likewise.  Also dec __tls_get_addr refcount
+	when optimizing code using new tlsgd and tlsld marker relocs.
+	(ppc_elf_relax_section): Differentiate relaxed PLTREL24 relocs
+	from ADDR24 relocs using plt or glink.  Don't clear the addend
+	for R_PPC_RELAX_PLTREL24.
+	(ppc_elf_relocate_section): Correctly handle addends on relaxed
+	PLTREL24 relocs.
+
 2009-10-09  Tristan Gingold  <gingold at adacore.com>
 
 	* mach-o.c (bfd_mach_o_section_get_entry_size): Moved.
diff -rup ../binutils-2.20.51.0.2.original/bfd/elf32-ppc.c ./bfd/elf32-ppc.c
--- ../binutils-2.20.51.0.2.original/bfd/elf32-ppc.c	2009-12-17 16:08:07.000000000 +0000
+++ ./bfd/elf32-ppc.c	2009-12-18 13:54:26.000000000 +0000
@@ -3323,6 +3323,8 @@ update_plt_info (bfd *abfd, struct plt_e
 {
   struct plt_entry *ent;
 
+  if (addend < 32768)
+    sec = NULL;
   for (ent = *plist; ent != NULL; ent = ent->next)
     if (ent->sec == sec && ent->addend == addend)
       break;
@@ -3508,8 +3510,7 @@ ppc_elf_check_relocs (bfd *abfd,
 		      if (info->shared)
 			addend = rel->r_addend;
 		    }
-		  if (!update_plt_info (abfd, ifunc,
-					addend < 32768 ? NULL : got2, addend))
+		  if (!update_plt_info (abfd, ifunc, got2, addend))
 		    return FALSE;
 		}
 	    }
@@ -3748,8 +3749,7 @@ ppc_elf_check_relocs (bfd *abfd,
 		    addend = rel->r_addend;
 		}
 	      h->needs_plt = 1;
-	      if (!update_plt_info (abfd, &h->plt.plist,
-				    addend < 32768 ? NULL : got2, addend))
+	      if (!update_plt_info (abfd, &h->plt.plist, got2, addend))
 		return FALSE;
 	    }
 	  break;
@@ -3780,10 +3780,9 @@ ppc_elf_check_relocs (bfd *abfd,
 	case R_PPC_EMB_MRKREF:
 	case R_PPC_NONE:
 	case R_PPC_max:
-	case R_PPC_RELAX32:
-	case R_PPC_RELAX32PC:
-	case R_PPC_RELAX32_PLT:
-	case R_PPC_RELAX32PC_PLT:
+	case R_PPC_RELAX:
+	case R_PPC_RELAX_PLT:
+	case R_PPC_RELAX_PLTREL24:
 	  break;
 
 	  /* These should only appear in dynamic objects.  */
@@ -4486,7 +4485,7 @@ ppc_elf_gc_sweep_hook (bfd *abfd,
 		  struct plt_entry *ent;
 
 		  ent = find_plt_ent (&h->plt.plist, NULL, 0);
-		  if (ent->plt.refcount > 0)
+		  if (ent != NULL && ent->plt.refcount > 0)
 		    ent->plt.refcount -= 1;
 		}
 	    }
@@ -4534,7 +4533,7 @@ ppc_elf_gc_sweep_hook (bfd *abfd,
 	      if (r_type == R_PPC_PLTREL24 && info->shared)
 		addend = rel->r_addend;
 	      ent = find_plt_ent (&h->plt.plist, got2, addend);
-	      if (ent->plt.refcount > 0)
+	      if (ent != NULL && ent->plt.refcount > 0)
 		ent->plt.refcount -= 1;
 	    }
 	  break;
@@ -4582,9 +4581,11 @@ ppc_elf_tls_setup (bfd *obfd,
 		       && tga->root.type == bfd_link_hash_undefweak)))
 	    {
 	      struct plt_entry *ent;
-	      ent = find_plt_ent (&tga->plt.plist, NULL, 0);
-	      if (ent != NULL
-		  && ent->plt.refcount > 0)
+
+	      for (ent = tga->plt.plist; ent != NULL; ent = ent->next)
+		if (ent->plt.refcount > 0)
+		  break;
+	      if (ent != NULL)
 		{
 		  tga->root.type = bfd_link_hash_indirect;
 		  tga->root.u.i.link = &opt->root;
@@ -4669,6 +4670,7 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
       {
 	Elf_Internal_Sym *locsyms = NULL;
 	Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd);
+	asection *got2 = bfd_get_section_by_name (ibfd, ".got2");
 
 	for (sec = ibfd->sections; sec != NULL; sec = sec->next)
 	  if (sec->has_tls_reloc && !bfd_is_abs_section (sec->output_section))
@@ -4762,6 +4764,13 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
 		      else
 			continue;
 
+		    case R_PPC_TLSGD:
+		    case R_PPC_TLSLD:
+		      expecting_tls_get_addr = 2;
+		      tls_set = 0;
+		      tls_clear = 0;
+		      break;
+
 		    default:
 		      continue;
 		    }
@@ -4769,7 +4778,8 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
 		  if (pass == 0)
 		    {
 		      if (!expecting_tls_get_addr
-			  || !sec->has_tls_get_addr_call)
+			  || (expecting_tls_get_addr == 1
+			      && !sec->has_tls_get_addr_call))
 			continue;
 
 		      if (rel + 1 < relend
@@ -4785,6 +4795,23 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
 		      break;
 		    }
 
+		  if (expecting_tls_get_addr)
+		    {
+		      struct plt_entry *ent;
+		      bfd_vma addend = 0;
+
+		      if (info->shared
+			  && ELF32_R_TYPE (rel[1].r_info) == R_PPC_PLTREL24)
+			addend = rel[1].r_addend;
+		      ent = find_plt_ent (&htab->tls_get_addr->plt.plist,
+					  got2, addend);
+		      if (ent != NULL && ent->plt.refcount > 0)
+			ent->plt.refcount -= 1;
+
+		      if (expecting_tls_get_addr == 2)
+			continue;
+		    }
+
 		  if (h != NULL)
 		    {
 		      tls_mask = &ppc_elf_hash_entry (h)->tls_mask;
@@ -4829,16 +4856,6 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUT
 			*got_count -= 1;
 		    }
 
-		  if (expecting_tls_get_addr)
-		    {
-		      struct plt_entry *ent;
-
-		      ent = find_plt_ent (&htab->tls_get_addr->plt.plist,
-					  NULL, 0);
-		      if (ent != NULL && ent->plt.refcount > 0)
-			ent->plt.refcount -= 1;
-		    }
-
 		  *tls_mask |= tls_set;
 		  *tls_mask &= ~tls_clear;
 		}
@@ -6239,28 +6256,29 @@ ppc_elf_relax_section (bfd *abfd,
 	    {
 	      size = 4 * ARRAY_SIZE (shared_stub_entry);
 	      insn_offset = 12;
-	      stub_rtype = R_PPC_RELAX32PC;
 	    }
 	  else
 	    {
 	      size = 4 * ARRAY_SIZE (stub_entry);
 	      insn_offset = 0;
-	      stub_rtype = R_PPC_RELAX32;
 	    }
 
-	  if (R_PPC_RELAX32_PLT - R_PPC_RELAX32
-	      != R_PPC_RELAX32PC_PLT - R_PPC_RELAX32PC)
-	    abort ();
+	  stub_rtype = R_PPC_RELAX;
 	  if (tsec == htab->plt
 	      || tsec == htab->glink)
-	    stub_rtype += R_PPC_RELAX32_PLT - R_PPC_RELAX32;
+	    {
+	      stub_rtype = R_PPC_RELAX_PLT;
+	      if (r_type == R_PPC_PLTREL24)
+		stub_rtype = R_PPC_RELAX_PLTREL24;
+	    }
 
 	  /* Hijack the old relocation.  Since we need two
 	     relocations for this use a "composite" reloc.  */
 	  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
 				       stub_rtype);
 	  irel->r_offset = trampoff + insn_offset;
-	  if (r_type == R_PPC_PLTREL24)
+	  if (r_type == R_PPC_PLTREL24
+	      && stub_rtype != R_PPC_RELAX_PLTREL24)
 	    irel->r_addend = 0;
 
 	  /* Record the fixup so we don't do it again this section.  */
@@ -6430,7 +6448,7 @@ ppc_elf_relax_section (bfd *abfd,
     {
       /* Convert the internal relax relocs to external form.  */
       for (irel = internal_relocs; irel < irelend; irel++)
-	if (ELF32_R_TYPE (irel->r_info) == R_PPC_RELAX32)
+	if (ELF32_R_TYPE (irel->r_info) == R_PPC_RELAX)
 	  {
 	    unsigned long r_symndx = ELF32_R_SYM (irel->r_info);
 
@@ -7655,12 +7673,20 @@ ppc_elf_relocate_section (bfd *output_bf
 	    }
 	  break;
 
-	case R_PPC_RELAX32PC_PLT:
-	case R_PPC_RELAX32_PLT:
+	case R_PPC_RELAX_PLT:
+	case R_PPC_RELAX_PLTREL24:
 	  if (h != NULL)
 	    {
-	      struct plt_entry *ent = find_plt_ent (&h->plt.plist, got2,
-						    info->shared ? addend : 0);
+	      struct plt_entry *ent;
+	      bfd_vma got2_addend = 0;
+
+	      if (r_type == R_PPC_RELAX_PLTREL24)
+		{
+		  if (info->shared)
+		    got2_addend = addend;
+		  addend = 0;
+		}
+	      ent = find_plt_ent (&h->plt.plist, got2, got2_addend);
 	      if (htab->plt_type == PLT_NEW)
 		relocation = (htab->glink->output_section->vma
 			      + htab->glink->output_offset
@@ -7670,18 +7696,13 @@ ppc_elf_relocate_section (bfd *output_bf
 			      + htab->plt->output_offset
 			      + ent->plt.offset);
 	    }
-	  if (r_type == R_PPC_RELAX32_PLT)
-	    goto relax32;
 	  /* Fall thru */
 
-	case R_PPC_RELAX32PC:
-	  relocation -= (input_section->output_section->vma
-			 + input_section->output_offset
-			 + rel->r_offset - 4);
-	  /* Fall thru */
-
-	case R_PPC_RELAX32:
-	relax32:
+	case R_PPC_RELAX:
+	  if (info->shared)
+	    relocation -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   + rel->r_offset - 4);
 	  {
 	    unsigned long t0;
 	    unsigned long t1;
diff -rup ../binutils-2.20.51.0.2.original/bfd/elf64-ppc.c ./bfd/elf64-ppc.c
--- ../binutils-2.20.51.0.2.original/bfd/elf64-ppc.c	2009-12-17 16:08:07.000000000 +0000
+++ ./bfd/elf64-ppc.c	2009-12-17 17:20:30.000000000 +0000
@@ -5866,9 +5866,7 @@ ppc64_elf_gc_sweep_hook (bfd *abfd, stru
 	      for (ent = h->plt.plist; ent != NULL; ent = ent->next)
 		if (ent->addend == rel->r_addend)
 		  break;
-	      if (ent == NULL)
-		abort ();
-	      if (ent->plt.refcount > 0)
+	      if (ent != NULL && ent->plt.refcount > 0)
 		ent->plt.refcount -= 1;
 	    }
 	  break;
diff -rup ../binutils-2.20.51.0.2.original/include/elf/ppc.h ./include/elf/ppc.h
--- ../binutils-2.20.51.0.2.original/include/elf/ppc.h	2009-12-17 16:07:45.000000000 +0000
+++ ./include/elf/ppc.h	2009-12-17 17:20:30.000000000 +0000
@@ -73,10 +73,9 @@ START_RELOC_NUMBERS (elf_ppc_reloc_type)
 
 #ifndef RELOC_MACROS_GEN_FUNC
 /* Fake relocations for branch stubs, only used internally by ld.  */
-  RELOC_NUMBER (R_PPC_RELAX32,		 48)
-  RELOC_NUMBER (R_PPC_RELAX32PC,	 49)
-  RELOC_NUMBER (R_PPC_RELAX32_PLT,	 50)
-  RELOC_NUMBER (R_PPC_RELAX32PC_PLT,	 51)
+  RELOC_NUMBER (R_PPC_RELAX,		 48)
+  RELOC_NUMBER (R_PPC_RELAX_PLT,	 49)
+  RELOC_NUMBER (R_PPC_RELAX_PLTREL24,	 50)
 #endif
 
   /* Relocs added to support TLS.  */


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- binutils.spec	17 Dec 2009 17:41:35 -0000	1.186
+++ binutils.spec	18 Dec 2009 14:53:13 -0000	1.187
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.20.51.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -35,7 +35,7 @@ Patch09: binutils-2.20.51.0.2-ifunc-ld-s
 Patch10: binutils-2.20.51.0.2-lwp.patch
 Patch11: binutils-2.20.51.0.2-enable-gold.patch
 Patch12: binutils-2.20.51.0.2-gas-expr.patch
-Patch13: binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch
+Patch13: binutils-2.20.51.0.2-ppc-hidden-plt-relocs.patch
 
 %define gold_arches %ix86 x86_64
 
@@ -427,6 +427,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Fri Dec  18 2009 Nick Clifton <nickc at redhat.com> - 2.20.51.0.2-11
+- Add missing part of PR 11088 patch.
+
 * Thu Dec  17 2009 Nick Clifton <nickc at redhat.com> - 2.20.51.0.2-10
 - Apply patch for PR 11088.  (BZ 544149)
 


--- binutils-2.20.51.0.2-ppc64-hidden-plt-relocs.patch DELETED ---



From rdieter at fedoraproject.org  Fri Dec 18 14:53:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 14:53:27 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.85-parallel_devel.patch,1.1,1.2
Message-ID: <20091218145327.624E711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8739

Modified Files:
	kdelibs-4.3.85-parallel_devel.patch 
Log Message:
drop hunk from kdelibs-4.1.70-cmake.patch


kdelibs-4.3.85-parallel_devel.patch:
 cmake/modules/FindKDE4Internal.cmake        |   34 ++++++++++++++--------------
 doc/api/doxygen-preprocess-kcfg.sh          |    4 +--
 kdecore/kconfig_compiler/CMakeLists.txt     |    6 ++--
 kdecore/kconfig_compiler/checkkcfg.pl       |    4 +--
 kdeui/tests/kconfig_compiler/CMakeLists.txt |    2 -
 kdewidgets/CMakeLists.txt                   |   12 ++++-----
 6 files changed, 32 insertions(+), 30 deletions(-)

Index: kdelibs-4.3.85-parallel_devel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.3.85-parallel_devel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-4.3.85-parallel_devel.patch	18 Dec 2009 14:41:20 -0000	1.1
+++ kdelibs-4.3.85-parallel_devel.patch	18 Dec 2009 14:53:27 -0000	1.2
@@ -126,14 +126,6 @@ diff -up kdelibs-4.3.85/cmake/modules/Fi
                                "${KDE4_LIB_INSTALL_DIR}" )
  
  # under Windows dlls may be also installed in bin/
-@@ -849,6 +851,7 @@ endif(WIN32)
- # CMake generators if no build type is set.
- if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE RelWithDebInfo)
-+   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
- endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
- 
- 
 @@ -1224,9 +1227,9 @@ macro (KDE4_PRINT_RESULTS)
     endif (NOT _kdeBootStrapping)
  



From rdieter at fedoraproject.org  Fri Dec 18 14:57:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 14:57:05 +0000 (UTC)
Subject: File kdepimlibs-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218145705.52A8028ED27@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdepimlibs:

b93ec318798eaa7ccceb622310b66211  kdepimlibs-4.3.85.tar.bz2



From deji at fedoraproject.org  Fri Dec 18 14:57:20 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 18 Dec 2009 14:57:20 +0000 (UTC)
Subject: rpms/scotch/F-12 scotch.spec,1.1,1.2
Message-ID: <20091218145721.06D2511C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/scotch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9739

Modified Files:
	scotch.spec 
Log Message:
* Fri Dec 18 2009 Deji Akingunola <dakingun at gmail.com> - 5.1.7-3
- Rebuild for mpich2 soname bump.



Index: scotch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scotch/F-12/scotch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scotch.spec	6 Nov 2009 23:20:45 -0000	1.1
+++ scotch.spec	18 Dec 2009 14:57:20 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Graph, mesh and hypergraph partitioning library
 Name:		scotch
 Version:	5.1.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	CeCILL-C
 Group:		Development/Libraries
 URL:		http://www.labri.fr/perso/pelegrin/scotch/
@@ -119,6 +119,9 @@ rm -rf %{buildroot}
 %{_libdir}/lib*scotch*.a
 
 %changelog
+* Fri Dec 18 2009 Deji Akingunola <dakingun at gmail.com> - 5.1.7-3
+- Rebuild for mpich2 soname bump.
+
 * Wed Nov 04 2009 Deji Akingunola <dakingun at gmail.com> - 5.1.7-2
 - Fix the Source url
 



From pkgdb at fedoraproject.org  Fri Dec 18 15:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:06:36 +0000
Subject: [pkgdb] dmidecode: prarit has requested approveacls
Message-ID: <20091218150637.DE99028ECE0@bastion.fedoraproject.org>

prarit has requested the approveacls acl on dmidecode (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Fri Dec 18 15:06:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:06:51 +0000
Subject: [pkgdb] dmidecode: prarit has requested approveacls
Message-ID: <20091218150654.572F828ECE0@bastion.fedoraproject.org>

prarit has requested the approveacls acl on dmidecode (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Fri Dec 18 15:07:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:07:49 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091218150752.0E3E828ECE9@bastion.fedoraproject.org>

aarapov has set the commit acl on dmidecode (Fedora 11) to Approved for prarit

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Fri Dec 18 15:07:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:07:53 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091218150755.5BC1428ECE9@bastion.fedoraproject.org>

aarapov has set the commit acl on dmidecode (Fedora 12) to Approved for prarit

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Fri Dec 18 15:08:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:08:23 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091218150825.7349828ED4B@bastion.fedoraproject.org>

aarapov has set the approveacls acl on dmidecode (Fedora 11) to Obsolete for prarit

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Fri Dec 18 15:08:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:08:24 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091218150826.00D0128ED4E@bastion.fedoraproject.org>

aarapov has set the approveacls acl on dmidecode (Fedora 12) to Approved for prarit

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From pkgdb at fedoraproject.org  Fri Dec 18 15:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:08:31 +0000
Subject: [pkgdb] dmidecode had acl change status
Message-ID: <20091218150833.D6AE528ECE0@bastion.fedoraproject.org>

aarapov has set the approveacls acl on dmidecode (Fedora 12) to Obsolete for prarit

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmidecode



From rdieter at fedoraproject.org  Fri Dec 18 15:08:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 15:08:45 +0000 (UTC)
Subject: File attica-0.1.1.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218150845.6FCCD28ECE0@bastion.fedoraproject.org>

A file has been added to the lookaside cache for attica:

4011ebc19fe6b12b8de9f10ccc341125  attica-0.1.1.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 15:09:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 15:09:51 +0000 (UTC)
Subject: rpms/attica/devel .cvsignore, 1.2, 1.3 attica.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091218150951.EE24B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/attica/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12040

Modified Files:
	.cvsignore attica.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-1
- attica-0.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/attica/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Dec 2009 21:11:14 -0000	1.2
+++ .cvsignore	18 Dec 2009 15:09:51 -0000	1.3
@@ -1 +1 @@
-attica-0.1.0.tar.bz2
+attica-0.1.1.tar.bz2


Index: attica.spec
===================================================================
RCS file: /cvs/pkgs/rpms/attica/devel/attica.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- attica.spec	9 Dec 2009 21:18:23 -0000	1.2
+++ attica.spec	18 Dec 2009 15:09:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           attica
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        Implementation of the Open Collaboration Services API
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-1
+- attica-0.1.1
+
 * Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
 - upstream tarball
 - %files: tighten up a bit, track sonames


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/attica/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Dec 2009 21:18:23 -0000	1.3
+++ sources	18 Dec 2009 15:09:51 -0000	1.4
@@ -1 +1 @@
-ff8d6ba041125b1ace0048741855b89d  attica-0.1.0.tar.bz2
+4011ebc19fe6b12b8de9f10ccc341125  attica-0.1.1.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 15:11:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 15:11:55 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.555,1.556
Message-ID: <20091218151155.F0CC311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12582

Modified Files:
	kdelibs.spec 
Log Message:
try newer attica



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -p -r1.555 -r1.556
--- kdelibs.spec	18 Dec 2009 14:41:20 -0000	1.555
+++ kdelibs.spec	18 Dec 2009 15:11:55 -0000	1.556
@@ -92,7 +92,7 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
-BuildRequires: attica-devel
+BuildRequires: attica-devel >= 0.1.1
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bison flex



From prarit at fedoraproject.org  Fri Dec 18 15:14:20 2009
From: prarit at fedoraproject.org (Prarit Bhargava)
Date: Fri, 18 Dec 2009 15:14:20 +0000 (UTC)
Subject: rpms/dmidecode/F-12 dmidecode.spec,1.39,1.40
Message-ID: <20091218151420.1064511C00E6@cvs1.fedora.phx.redhat.com>

Author: prarit

Update of /cvs/pkgs/rpms/dmidecode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13151

Modified Files:
	dmidecode.spec 
Log Message:
Fix rpmlint errors in specfile (BZ 225698)



Index: dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmidecode/F-12/dmidecode.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- dmidecode.spec	28 Aug 2009 20:41:44 -0000	1.39
+++ dmidecode.spec	18 Dec 2009 15:14:19 -0000	1.40
@@ -2,20 +2,19 @@ Summary:        Tool to analyse BIOS DMI
 Name:           dmidecode
 Version:        2.10
 Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
-Epoch:		1
+Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
-Source0:	dmidecode-%{version}.tar.bz2
+Source0:        dmidecode-%{version}.tar.bz2
 Patch0:         dmidecode-add-hewlett-packard-to-dmioem.patch
 Patch1:         dmidecode-recognize-more-memory.patch
 Patch2:         dmidecode-add-socket-lga1366.patch
 Patch3:         dmidecode-warn-on-unsupported-smbios-version.patch
 Patch4:         dmidecode-smbios-2.6.1-updates.patch
-URL:		http://www.nongnu.org/dmidecode/
+URL:            http://www.nongnu.org/dmidecode/
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
-BuildPreReq: 	/usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
-ExclusiveArch:	%{ix86} x86_64 ia64
-Obsoletes:	kernel-utils
+BuildRequires:  /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
+ExclusiveArch:  %{ix86} x86_64 ia64
 
 %description
 dmidecode reports information about x86 & ia64 hardware as described in the
@@ -58,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 18 2009 Prarit Bhargava <prarit at redhat.com> - 1:2.1.0-1.40
+- Fix rpmlint errors in specfile
+
 * Fri Aug 28 2009 Jarod Wilson <jarod at redhat.com> - 1:2.10-1.39
 - Fix cache associativity mapping (was missing some commas)
 



From mclasen at fedoraproject.org  Fri Dec 18 15:14:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 15:14:20 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12 spam.patch, NONE,
	1.1 gnome-power-manager.spec, 1.184, 1.185
Message-ID: <20091218151420.D917E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13139

Modified Files:
	gnome-power-manager.spec 
Added Files:
	spam.patch 
Log Message:
Avoid warning messages at startup


spam.patch:
 gsd-media-keys-window.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE spam.patch ---
diff -up gnome-power-manager-2.28.2/src/gsd-media-keys-window.c.spam gnome-power-manager-2.28.2/src/gsd-media-keys-window.c
--- gnome-power-manager-2.28.2/src/gsd-media-keys-window.c.spam	2009-12-18 10:04:22.303109410 -0500
+++ gnome-power-manager-2.28.2/src/gsd-media-keys-window.c	2009-12-18 10:03:58.135359461 -0500
@@ -133,6 +133,9 @@ add_hide_timeout (GsdMediaKeysWindow *wi
 static void
 update_window (GsdMediaKeysWindow *window)
 {
+        if (!gtk_widget_is_drawable (GTK_WIDGET (window)))
+                return;
+
         remove_hide_timeout (window);
         add_hide_timeout (window);
 


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- gnome-power-manager.spec	7 Dec 2009 17:11:51 -0000	1.184
+++ gnome-power-manager.spec	18 Dec 2009 15:14:20 -0000	1.185
@@ -5,12 +5,12 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.28.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz
-#Source:   http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-power-manager/2.28/gnome-power-manager-%{version}.tar.gz
+#Source:   http://download.gnome.org/sources/gnome-power-manager/2.28/%{name}-%{version}-%{?alphatag}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
@@ -26,6 +26,9 @@ Patch2: 0002-Make-the-left-and-right-but
 BuildRequires: autoconf automake libtool
 Patch3: 0001-Use-gnome-settings-daemon-popup-code.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604918
+Patch4: spam.patch
+
 BuildRequires: libwnck-devel
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -76,6 +79,7 @@ Extra GNOME power management application
 %patch1 -p1 -b .remove-help
 %patch2 -p1 -b .uni-menu
 %patch3 -p1 -b .osd
+%patch4 -p1 -b .spam
 autoreconf -i
 
 %build
@@ -196,6 +200,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Fri Dec 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-2
+- Avoid warning messages at startup
+
 * Mon Dec 07 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-1
 - Update to 2.28.2
 - Translation updates



From rstrode at fedoraproject.org  Fri Dec 18 15:16:44 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 18 Dec 2009 15:16:44 +0000 (UTC)
Subject: rpms/dbus/F-12 fix-daemon-activation.patch, NONE,
	1.1 fix-reload-leak.patch, NONE, 1.1 fix-reload-race.patch, NONE,
	1.1 keep-pending-activations.patch, NONE, 1.1 dbus.spec, 1.179, 1.180
Message-ID: <20091218151644.DBB2711C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13738

Modified Files:
	dbus.spec 
Added Files:
	fix-daemon-activation.patch fix-reload-leak.patch 
	fix-reload-race.patch keep-pending-activations.patch 
Log Message:
- Fix activation of daemons (#545267)
- Fix reload memleak (fdo #24697)
- Don't forget about pending activations on reload (fdo #24350)
- Fix reload race (fdo #21597)


fix-daemon-activation.patch:
 bus/activation.c                                                                          |   83 ++++++----
 configure.in                                                                              |    1 
 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteForkingEchoService.service.in |    3 
 test/name-test/Makefile.am                                                                |    2 
 test/name-test/run-test.sh                                                                |    6 
 test/name-test/test-activation-forking.py                                                 |   60 +++++++
 test/test-service.c                                                                       |   33 +++
 7 files changed, 155 insertions(+), 33 deletions(-)

--- NEW FILE fix-daemon-activation.patch ---
>From 949a64b127a32a3e5a4ce4278773f18e290c44c2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters at verbum.org>
Date: Mon, 14 Dec 2009 23:12:24 +0000
Subject: Ignore exit code zero from activated services

A variety of system components have migrated from legacy init into DBus
service activation.  Many of these system components "daemonize", which
involves forking.  The DBus activation system treated an exit as an
activation failure, assuming that the child process which grabbed the
DBus name didn't run first.

While we're in here, also differentiate in this code path between the
servicehelper (system) versus direct activation (session) paths.  In
the session activation path our error message mentioned a helper
process which was confusing, since none was involved.

Based on a patch and debugging research from Ray Strode <rstrode at redhat.com>
---
diff --git a/bus/activation.c b/bus/activation.c
index 782ffed..00caac2 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -1212,8 +1212,8 @@ pending_activation_failed (BusPendingActivation *pending_activation,
  * Depending on the exit code of the helper, set the error accordingly
  */
 static void
-handle_activation_exit_error (int        exit_code,
-                              DBusError *error)
+handle_servicehelper_exit_error (int        exit_code,
+                                 DBusError *error)
 {
   switch (exit_code)
     {
@@ -1268,13 +1268,24 @@ babysitter_watch_callback (DBusWatch     *watch,
   BusPendingActivation *pending_activation = data;
   dbus_bool_t retval;
   DBusBabysitter *babysitter;
+  dbus_bool_t uses_servicehelper;
 
   babysitter = pending_activation->babysitter;
-  
+
   _dbus_babysitter_ref (babysitter);
-  
+
   retval = dbus_watch_handle (watch, condition);
 
+  /* There are two major cases here; are we the system bus or the session?  Here this
+   * is distinguished by whether or not we use a setuid helper launcher.  With the launch helper,
+   * some process exit codes are meaningful, processed by handle_servicehelper_exit_error.
+   *
+   * In both cases though, just ignore when a process exits with status 0; it's possible for
+   * a program to (misguidedly) "daemonize", and that appears to us as an exit.  This closes a race
+   * condition between this code and the child process claiming the bus name.
+   */
+  uses_servicehelper = bus_context_get_servicehelper (pending_activation->activation->context) != NULL;
+
   /* FIXME this is broken in the same way that
    * connection watches used to be; there should be
    * a separate callback for status change, instead
@@ -1284,43 +1295,59 @@ babysitter_watch_callback (DBusWatch     *watch,
    * Fixing this lets us move dbus_watch_handle
    * calls into dbus-mainloop.c
    */
-  
   if (_dbus_babysitter_get_child_exited (babysitter))
     {
       DBusError error;
       DBusHashIter iter;
-      
+      dbus_bool_t activation_failed;
+      int exit_code = 0;
+
       dbus_error_init (&error);
+
       _dbus_babysitter_set_child_exit_error (babysitter, &error);
 
-      /* refine the error code if we got an exit code */
-      if (dbus_error_has_name (&error, DBUS_ERROR_SPAWN_CHILD_EXITED))
-      	{
-          int exit_code = 0;
-          if (_dbus_babysitter_get_child_exit_status (babysitter, &exit_code))
+      /* Explicitly check for SPAWN_CHILD_EXITED to avoid overwriting an
+       * exec error */
+      if (dbus_error_has_name (&error, DBUS_ERROR_SPAWN_CHILD_EXITED)
+          && _dbus_babysitter_get_child_exit_status (babysitter, &exit_code))
+        {
+          activation_failed = exit_code != 0;
+
+          dbus_error_free(&error);
+
+          if (activation_failed)
             {
-              dbus_error_free (&error);
-              handle_activation_exit_error (exit_code, &error);
+              if (uses_servicehelper)
+                handle_servicehelper_exit_error (exit_code, &error);
+              else
+                _dbus_babysitter_set_child_exit_error (babysitter, &error);
             }
-      	}
-
-      /* Destroy all pending activations with the same exec */
-      _dbus_hash_iter_init (pending_activation->activation->pending_activations,
-                            &iter);
-      while (_dbus_hash_iter_next (&iter))
+        }
+      else
         {
-          BusPendingActivation *p = _dbus_hash_iter_get_value (&iter);
-         
-          if (p != pending_activation && strcmp (p->exec, pending_activation->exec) == 0)
-            pending_activation_failed (p, &error);
+          activation_failed = TRUE;
         }
-      
-      /* Destroys the pending activation */
-      pending_activation_failed (pending_activation, &error);
 
-      dbus_error_free (&error);
+      if (activation_failed)
+        {
+          /* Destroy all pending activations with the same exec */
+          _dbus_hash_iter_init (pending_activation->activation->pending_activations,
+                                &iter);
+          while (_dbus_hash_iter_next (&iter))
+            {
+              BusPendingActivation *p = _dbus_hash_iter_get_value (&iter);
+
+              if (p != pending_activation && strcmp (p->exec, pending_activation->exec) == 0)
+                pending_activation_failed (p, &error);
+            }
+
+          /* Destroys the pending activation */
+          pending_activation_failed (pending_activation, &error);
+
+          dbus_error_free (&error);
+        }
     }
-  
+
   _dbus_babysitter_unref (babysitter);
 
   return retval;
diff --git a/configure.in b/configure.in
index 7ef6632..1f2c896 100644
--- a/configure.in
+++ b/configure.in
@@ -1499,6 +1499,7 @@ test/data/valid-config-files-system/debug-allow-all-pass.conf
 test/data/valid-config-files-system/debug-allow-all-fail.conf
 test/data/valid-service-files/org.freedesktop.DBus.TestSuite.PrivServer.service
 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service
+test/data/valid-service-files/org.freedesktop.DBus.TestSuiteForkingEchoService.service
 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service
 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service
 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service
diff --git a/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteForkingEchoService.service.in b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteForkingEchoService.service.in
new file mode 100644
index 0000000..49fcac3
--- a/dev/null
+++ b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteForkingEchoService.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteForkingEchoService
+Exec=@TEST_SERVICE_BINARY@ org.freedesktop.DBus.TestSuiteForkingEchoService fork
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index 1c73b87..d8e72d1 100644
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -10,7 +10,7 @@ else
 TESTS=
 endif
 
-EXTRA_DIST=run-test.sh run-test-systemserver.sh test-wait-for-echo.py
+EXTRA_DIST=run-test.sh run-test-systemserver.sh test-wait-for-echo.py test-activation-forking.py
 
 if DBUS_BUILD_TESTS
 
diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh
index fba4558..4eb2425 100755
--- a/test/name-test/run-test.sh
+++ b/test/name-test/run-test.sh
@@ -50,3 +50,9 @@ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-
 
 echo "running test-shutdown"
 ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-shutdown || die "test-shutdown failed"
+
+echo "running test activation forking"
+if ! python $DBUS_TOP_SRCDIR/test/name-test/test-activation-forking.py; then
+  echo "Failed test-activation-forking"
+  exit 1
+fi
diff --git a/test/name-test/test-activation-forking.py b/test/name-test/test-activation-forking.py
new file mode 100644
index 0000000..0d82075
--- a/dev/null
+++ b/test/name-test/test-activation-forking.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+
+import os,sys
+
+try:
+    import gobject
+    import dbus
+    import dbus.mainloop.glib
+except:
+    print "Failed import, aborting test"
+    sys.exit(0)
+
+dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+loop = gobject.MainLoop()
+
+exitcode = 0
+
+bus = dbus.SessionBus()
+bus_iface = dbus.Interface(bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus'), 'org.freedesktop.DBus')
+
+o = bus.get_object('org.freedesktop.DBus.TestSuiteForkingEchoService', '/org/freedesktop/TestSuite')
+i = dbus.Interface(o, 'org.freedesktop.TestSuite')
+
+# Start it up
+reply = i.Echo("hello world")
+print "TestSuiteForkingEchoService initial reply OK"
+
+def ignore(*args, **kwargs):
+    pass
+
+# Now monitor for exits, when that happens, start it up again.
+# The goal here is to try to hit any race conditions in activation.
+counter = 0
+def on_forking_echo_owner_changed(name, old, new):
+    global counter
+    global o
+    global i
+    if counter > 10:
+        print "Activated 10 times OK, TestSuiteForkingEchoService pass"
+        loop.quit()
+        return
+    counter += 1
+    if new == '':
+        o = bus.get_object('org.freedesktop.DBus.TestSuiteForkingEchoService', '/org/freedesktop/TestSuite')
+        i = dbus.Interface(o, 'org.freedesktop.TestSuite')
+        i.Echo("counter %r" % counter)
+        i.Exit(reply_handler=ignore, error_handler=ignore)
+
+bus_iface.connect_to_signal('NameOwnerChanged', on_forking_echo_owner_changed, arg0='org.freedesktop.DBus.TestSuiteForkingEchoService')
+
+i.Exit(reply_handler=ignore, error_handler=ignore)
+
+def check_counter():
+    if counter == 0:
+        print "Failed to get NameOwnerChanged for TestSuiteForkingEchoService"
+        sys.exit(1)
+gobject.timeout_add(15000, check_counter)
+
+loop.run()
+sys.exit(0)
diff --git a/test/test-service.c b/test/test-service.c
index c9f5839..a57bf9c 100644
--- a/test/test-service.c
+++ b/test/test-service.c
@@ -398,7 +398,33 @@ main (int    argc,
   DBusError error;
   int result;
   DBusConnection *connection;
-  
+  const char *name;
+  dbus_bool_t do_fork;
+
+  if (argc != 3)
+    {
+      name = "org.freedesktop.DBus.TestSuiteEchoService";
+      do_fork = FALSE;
+    }
+  else
+    {
+      name = argv[1];
+      do_fork = strcmp (argv[2], "fork") == 0;
+    }
+
+  /* The bare minimum for simulating a program "daemonizing"; the intent
+   * is to test services which move from being legacy init scripts to
+   * activated services.
+   * https://bugzilla.redhat.com/show_bug.cgi?id=545267
+   */
+  if (do_fork)
+    {
+      pid_t pid = fork ();
+      if (pid != 0)
+        exit (0);
+      sleep (1);
+    }
+
   dbus_error_init (&error);
   connection = dbus_bus_get (DBUS_BUS_STARTER, &error);
   if (connection == NULL)
@@ -433,8 +459,8 @@ main (int    argc,
     if (d != (void*) 0xdeadbeef)
       die ("dbus_connection_get_object_path_data() doesn't seem to work right\n");
   }
-  
-  result = dbus_bus_request_name (connection, "org.freedesktop.DBus.TestSuiteEchoService",
+
+  result = dbus_bus_request_name (connection, name,
                                   0, &error);
   if (dbus_error_is_set (&error))
     {
--
cgit v0.8.3-6-g21f6

fix-reload-leak.patch:
 bus.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE fix-reload-leak.patch ---
diff -up dbus-1.2.16/bus/bus.c.policy-leak dbus-1.2.16/bus/bus.c
--- dbus-1.2.16/bus/bus.c.policy-leak   2009-12-17 19:18:50.966795963 -0500
+++ dbus-1.2.16/bus/bus.c       2009-12-17 19:17:36.023796405 -0500
@@ -438,6 +438,8 @@ process_config_every_time (BusContext   
   /* get our limits and timeout lengths */
   bus_config_parser_get_limits (parser, &context->limits);

+  if (context->policy)
+    bus_policy_unref (context->policy);
   context->policy = bus_config_parser_steal_policy (parser);
   _dbus_assert (context->policy != NULL);


fix-reload-race.patch:
 bus.c               |    9 ---
 dir-watch-inotify.c |  134 ++++++++++++++++++++++++++++++++++++++++++++--------
 dir-watch.h         |    2 
 3 files changed, 117 insertions(+), 28 deletions(-)

--- NEW FILE fix-reload-race.patch ---
--- dbus-1.2.16/bus/dir-watch-inotify.c	2009-07-14 13:06:31.000000000 -0400
+++ hacked/bus/dir-watch-inotify.c	2009-12-18 00:46:05.524818800 -0500
@@ -34,6 +34,7 @@
 #include <errno.h>
 
 #include <dbus/dbus-internals.h>
+#include <dbus/dbus-list.h>
 #include <dbus/dbus-watch.h>
 #include "dir-watch.h"
 
@@ -43,6 +44,7 @@
 
 /* use a static array to avoid handling OOM */
 static int wds[MAX_DIRS_TO_WATCH];
+static char *dirs[MAX_DIRS_TO_WATCH];
 static int num_wds = 0;
 static int inotify_fd = -1;
 static DBusWatch *watch = NULL;
@@ -90,12 +92,10 @@
   return TRUE;
 }
 
-void
-bus_watch_directory (const char *dir, BusContext *context)
+static int
+_init_inotify (BusContext *context)
 {
-  int wd;
-
-  _dbus_assert (dir != NULL);
+  int ret = 0;
 
   if (inotify_fd == -1) {
 #ifdef HAVE_INOTIFY_INIT1
@@ -112,22 +112,38 @@
      watch = _dbus_watch_new (inotify_fd, DBUS_WATCH_READABLE, TRUE,
                               _handle_inotify_watch, NULL, NULL);
 
-	if (watch == NULL)
-          {
-            _dbus_warn ("Unable to create inotify watch\n");
-	    goto out;
-	  }
-
-	if (!_dbus_loop_add_watch (loop, watch, _inotify_watch_callback,
-                                   NULL, NULL))
-          {
-            _dbus_warn ("Unable to add reload watch to main loop");
-	    _dbus_watch_unref (watch);
-	    watch = NULL;
-            goto out;
-	  }
+     if (watch == NULL)
+       {
+         _dbus_warn ("Unable to create inotify watch\n");
+         goto out;
+       }
+
+     if (!_dbus_loop_add_watch (loop, watch, _inotify_watch_callback,
+                                NULL, NULL))
+       {
+         _dbus_warn ("Unable to add reload watch to main loop");
+	 _dbus_watch_unref (watch);
+	 watch = NULL;
+         goto out;
+       }
   }
 
+  ret = 1;
+
+out:
+  return ret;
+}
+
+void
+bus_watch_directory (const char *dir, BusContext *context)
+{
+  int wd;
+
+  _dbus_assert (dir != NULL);
+
+  if (!_init_inotify (context))
+    goto out;
+
   if (num_wds >= MAX_DIRS_TO_WATCH )
     {
       _dbus_warn ("Cannot watch config directory '%s'. Already watching %d directories\n", dir, MAX_DIRS_TO_WATCH);
@@ -141,6 +157,7 @@
       goto out;
     }
 
+  dirs[num_wds] = strdup (dir);
   wds[num_wds++] = wd;
   _dbus_verbose ("Added watch on config directory '%s'\n", dir);
 
@@ -148,7 +165,84 @@
   ;
 }
 
-void 
+void
+bus_set_watched_dirs (BusContext *context, DBusList **directories)
+{
+  static int new_wds[MAX_DIRS_TO_WATCH];
+  static char *new_dirs[MAX_DIRS_TO_WATCH];
+  DBusList *link;
+  int i, j, wd;
+
+  if (!_init_inotify (context))
+    goto out;
+
+  for (i = 0; i < MAX_DIRS_TO_WATCH; i++)
+    {
+      new_wds[i] = -1;
+      new_dirs[i] = NULL;
+    }
+
+  i = 0;
+  link = _dbus_list_get_first_link (directories);
+  while (link != NULL)
+    {
+      new_dirs[i++] = (char *)link->data;
+      link = _dbus_list_get_next_link (directories, link);
+    }
+
+  for (i = 0; new_dirs[i]; i++)
+    {
+      for (j = 0; j < num_wds; j++)
+        {
+          if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
+            {
+              new_wds[i] = wds[j];
+              new_dirs[i] = dirs[j];
+              wds[j] = -1;
+              dirs[j] = NULL;
+              break;
+            }
+        }
+    }
+
+  for (j = 0; j < num_wds; j++)
+    {
+      if (wds[j] != -1)
+        {
+          inotify_rm_watch (inotify_fd, wds[j]);
+          dbus_free (dirs[j]);
+          wds[j] = -1;
+          dirs[j] = NULL;
+        }
+    }
+
+  for (i = 0; new_dirs[i]; i++)
+    {
+      if (new_wds[i] == -1)
+        {
+          wd = inotify_add_watch (inotify_fd, new_dirs[i], IN_CLOSE_WRITE | IN_DELETE | IN_MOVED_TO | IN_MOVED_FROM);
+          if (wd < 0)
+            {
+              _dbus_warn ("Cannot setup inotify for '%s'; error '%s'\n", new_dirs[i], _dbus_strerror (errno));
+              goto out;
+            }
+          new_wds[i] = wd;
+          new_dirs[i] = strdup (new_dirs[i]);
+        }
+    }
+
+  num_wds = i;
+
+  for (i = 0; i < MAX_DIRS_TO_WATCH; i++)
+    {
+      wds[i] = new_wds[i];
+      dirs[i] = new_dirs[i];
+    }
+
+ out:;
+}
+
+void
 bus_drop_all_directory_watches (void)
 {
   int ret;
--- dbus-1.2.16/bus/dir-watch.h	2009-07-14 13:06:31.000000000 -0400
+++ hacked/bus/dir-watch.h	2009-12-18 00:45:47.437818936 -0500
@@ -32,4 +32,6 @@
 /* drop all the watches previously set up by bus_config_watch_directory (OS dependent, may be a NOP) */
 void bus_drop_all_directory_watches (void);
 
+void bus_set_watched_dirs (BusContext *context, DBusList **dirs);
+
 #endif /* DIR_WATCH_H */
--- dbus-1.2.16/bus/bus.c	2009-07-14 13:06:31.000000000 -0400
+++ hacked/bus/bus.c	2009-12-18 00:51:30.348481884 -0500
@@ -516,11 +516,6 @@
 
   context->activation = new_activation;
 
-  /* Drop existing conf-dir watches (if applicable) */
-
-  if (is_reload)
-    bus_drop_all_directory_watches ();
-
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
   retval = TRUE;
 
@@ -551,9 +546,7 @@
   _dbus_hash_table_unref (service_context_table);
 
   /* Watch all conf directories */
-  _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
-		      (DBusForeachFunction) bus_watch_directory,
-		      context);
+  bus_set_watched_dirs (context, bus_config_parser_get_conf_dirs (parser));
 
   return TRUE;
 }

keep-pending-activations.patch:
 activation.c |   95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 activation.h |    4 ++
 bus.c        |   14 +++-----
 3 files changed, 105 insertions(+), 8 deletions(-)

--- NEW FILE keep-pending-activations.patch ---
diff -u -r dbus-1.2.16/bus/activation.c hacked/bus/activation.c
--- dbus-1.2.16/bus/activation.c	2009-07-14 13:06:31.000000000 -0400
+++ hacked/bus/activation.c	2009-12-17 21:36:56.447546354 -0500
@@ -736,6 +736,101 @@
 }
 
 BusActivation*
+bus_activation_reload (BusActivation     *activation,
+                       const DBusString  *address,
+                       DBusList         **directories,
+                       DBusError         *error)
+{
+  DBusList      *link;
+  char          *dir;
+
+  dbus_free (activation->server_address);
+  if (!_dbus_string_copy_data (address, &activation->server_address))
+    {
+      BUS_SET_OOM (error);
+      goto failed;
+    }
+
+  _dbus_hash_table_unref (activation->entries);
+  activation->entries = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
+                                             (DBusFreeFunction)bus_activation_entry_unref);
+  if (activation->entries == NULL)
+    {
+      BUS_SET_OOM (error);
+      goto failed;
+    }
+
+  _dbus_hash_table_unref (activation->directories);
+  activation->directories = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
+                                                  (DBusFreeFunction)bus_service_directory_unref);
+
+  if (activation->directories == NULL)
+    {
+      BUS_SET_OOM (error);
+      goto failed;
+    }
+
+  link = _dbus_list_get_first_link (directories);
+  while (link != NULL)
+    {
+      BusServiceDirectory *s_dir;
+
+      dir = _dbus_strdup ((const char *) link->data);
+      if (!dir)
+        {
+          BUS_SET_OOM (error);
+          goto failed;
+        }
+
+      s_dir = dbus_new0 (BusServiceDirectory, 1);
+      if (!s_dir)
+        {
+          dbus_free (dir);
+          BUS_SET_OOM (error);
+          goto failed;
+        }
+
+      s_dir->refcount = 1;
+      s_dir->dir_c = dir;
+
+      s_dir->entries = _dbus_hash_table_new (DBUS_HASH_STRING, NULL,
+                                             (DBusFreeFunction)bus_activation_entry_unref);
+
+      if (!s_dir->entries)
+        {
+          bus_service_directory_unref (s_dir);
+          BUS_SET_OOM (error);
+          goto failed;
+        }
+
+      if (!_dbus_hash_table_insert_string (activation->directories, s_dir->dir_c, s_dir))
+        {
+          bus_service_directory_unref (s_dir);
+          BUS_SET_OOM (error);
+          goto failed;
+        }
+
+      /* only fail on OOM, it is ok if we can't read the directory */
+      if (!update_directory (activation, s_dir, error))
+        {
+          if (dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY))
+            goto failed;
+          else
+            dbus_error_free (error);
+        }
+
+      link = _dbus_list_get_next_link (directories, link);
+    }
+
+  return activation;
+
+ failed:
+  if (activation)
+    bus_activation_unref (activation);
+  return NULL;
+}
+
+BusActivation*
 bus_activation_new (BusContext        *context,
                     const DBusString  *address,
                     DBusList         **directories,
diff -u -r dbus-1.2.16/bus/activation.h hacked/bus/activation.h
--- dbus-1.2.16/bus/activation.h	2009-07-14 13:06:31.000000000 -0400
+++ hacked/bus/activation.h	2009-12-17 20:02:53.347545761 -0500
@@ -32,6 +32,10 @@
 						const DBusString  *address,
 						DBusList         **directories,
 						DBusError         *error);
+BusActivation* bus_activation_reload           (BusActivation     *activation,
+						const DBusString  *address,
+						DBusList         **directories,
+						DBusError         *error);
 BusActivation* bus_activation_ref              (BusActivation     *activation);
 void           bus_activation_unref            (BusActivation     *activation);
 
diff -u -r dbus-1.2.16/bus/bus.c hacked/bus/bus.c
--- dbus-1.2.16/bus/bus.c	2009-07-14 13:06:31.000000000 -0400
+++ hacked/bus/bus.c	2009-12-17 20:04:08.006546566 -0500
@@ -503,19 +503,17 @@
     }
   
   /* Create activation subsystem */
-  new_activation = bus_activation_new (context, &full_address,
-                                       dirs, error);
-  if (new_activation == NULL)
+  if (context->activation)
+    bus_activation_reload (context->activation, &full_address, dirs, error);
+  else
+    context->activation = bus_activation_new (context, &full_address, dirs, error);
+
+  if (context->activation == NULL)
     {
       _DBUS_ASSERT_ERROR_IS_SET (error);
       goto failed;
     }
 
-  if (is_reload)
-    bus_activation_unref (context->activation);
-
-  context->activation = new_activation;
-
   /* Drop existing conf-dir watches (if applicable) */
 


Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- dbus.spec	7 Oct 2009 22:59:33 -0000	1.179
+++ dbus.spec	18 Dec 2009 15:16:44 -0000	1.180
@@ -9,7 +9,7 @@ Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
 Version: 1.2.16
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -49,6 +49,20 @@ Patch2: fix-timeout-accounting.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=518541
 Patch3: dbus-1.2.16-capability.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=545267
+# http://bugs.freedesktop.org/25642
+Patch4: fix-reload-leak.patch
+
+# http://bugs.freedesktop.org/25697
+Patch5: fix-daemon-activation.patch
+
+# http://bugs.freedesktop.org/24350
+Patch6: keep-pending-activations.patch
+
+# http://bugs.freedesktop.org/21597
+Patch7: fix-reload-race.patch
+
+
 %description
 D-BUS is a system for sending messages between applications. It is
 used both for the system-wide message bus service, and as a
@@ -104,6 +118,10 @@ in this separate package so server syste
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .fix-timeout-accounting
 %patch3 -p1 -b .capability
+%patch4 -p1 -b .fix-reload-leak
+%patch5 -p1 -b .fix-daemon-activation
+%patch6 -p1 -b .keep-pending-activations
+%patch7 -p1 -b .fix-reload-race
 
 autoreconf -f -i
 
@@ -240,6 +258,12 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Dec 18 2009 Ray Strode <rstrode at redhat.com> - 1:1.2.16-9
+- Fix activation of daemons (#545267)
+- Fix reload memleak (fdo #24697)
+- Don't forget about pending activations on reload (fdo #24350)
+- Fix reload race (fdo #21597)
+
 * Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 1:1.2.16-8
 - Drop capabilities (#518541)
 



From awjb at fedoraproject.org  Fri Dec 18 15:17:24 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 18 Dec 2009 15:17:24 +0000 (UTC)
Subject: rpms/wine/F-12
	0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch,
	NONE, 1.1 wine-x86_64-prefix.patch, NONE,
	1.1 winepulse-0.33.patch, NONE, 1.1 .cvsignore, 1.81,
	1.82 sources, 1.82, 1.83 wine.spec, 1.115,
	1.116 winepulse-0.32.patch, 1.1, NONE
Message-ID: <20091218151724.483C211C00E6@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13895

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch 
	wine-x86_64-prefix.patch winepulse-0.33.patch 
Removed Files:
	winepulse-0.32.patch 
Log Message:
- version upgrade
- bugfixes


0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch:
 net.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE 0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch ---
>From eb0fcfd1534b8bd92f8008ae8c9beb5deb5ad353 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Fri, 4 Dec 2009 16:41:53 -0800
Subject: [PATCH] Use sk_ functions rather than accessing an OpenSSL stack type directly

---
 dlls/winhttp/net.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index 3ed3b1b..4a3cc90 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -124,6 +124,8 @@ MAKE_FUNCPTR( CRYPTO_set_locking_callback );
 MAKE_FUNCPTR( ERR_get_error );
 MAKE_FUNCPTR( ERR_error_string );
 MAKE_FUNCPTR( i2d_X509 );
+MAKE_FUNCPTR( sk_value );
+MAKE_FUNCPTR( sk_num );
 #undef MAKE_FUNCPTR
 
 static CRITICAL_SECTION *ssl_locks;
@@ -339,11 +341,11 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx )
             PCCERT_CONTEXT endCert = NULL;
 
             ret = TRUE;
-            for (i = 0; ret && i < ctx->chain->num; i++)
+            for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++)
             {
                 PCCERT_CONTEXT context;
 
-                cert = (X509 *)ctx->chain->data[i];
+                cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i);
                 if ((context = X509_to_cert_context( cert )))
                 {
                     if (i == 0)
@@ -441,6 +443,8 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
     LOAD_FUNCPTR( ERR_get_error );
     LOAD_FUNCPTR( ERR_error_string );
     LOAD_FUNCPTR( i2d_X509 );
+    LOAD_FUNCPTR( sk_value );
+    LOAD_FUNCPTR( sk_num );
 #undef LOAD_FUNCPTR
 
     pSSL_library_init();
-- 
1.5.2.2

wine-x86_64-prefix.patch:
 config.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE wine-x86_64-prefix.patch ---
--- libs/wine/config.c.orig	2009-11-26 23:36:37.000000000 +0100
+++ libs/wine/config.c	2009-11-26 23:37:36.000000000 +0100
@@ -35,9 +35,9 @@
 #endif
 #include "wine/library.h"
 
-static const char server_config_dir[] = "/.wine";        /* config dir relative to $HOME */
-static const char server_root_prefix[] = "/tmp/.wine-";  /* prefix for server root dir */
-static const char server_dir_prefix[] = "/server-";      /* prefix for server dir */
+static const char server_config_dir[] = "/.wine-x86_64";        /* config dir relative to $HOME */
+static const char server_root_prefix[] = "/tmp/.wine-x86_64-";  /* prefix for server root dir */
+static const char server_dir_prefix[] = "/server-x86_64-";      /* prefix for server dir */
 
 static char *bindir;
 static char *dlldir;

winepulse-0.33.patch:
 Makefile.in        |   15 
 pulse.c            |  788 ++++++++++++++++++++++++++++++++++++++++
 wavein.c           |  595 ++++++++++++++++++++++++++++++
 waveout.c          | 1040 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  196 +++++++++
 6 files changed, 2637 insertions(+)

--- NEW FILE winepulse-0.33.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..c99c1da
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winepulse.drv
+IMPORTS   = winmm user32 kernel32
+EXTRALIBS = @PULSELIBS@
+
+C_SRCS = waveout.c \
+         wavein.c \
+         pulse.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
new file mode 100644
index 0000000..3dcb086
--- /dev/null
+++ b/dlls/winepulse.drv/pulse.c
@@ -0,0 +1,788 @@
+/*
+ * Wine Driver for PulseAudio
+ * http://pulseaudio.org/
+ *
+ * Copyright    2009 Arthur Taylor <theycallhimart at gmail.com>
+ *
+ * Contains code from other wine sound drivers.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "mmddk.h"
+#include "ks.h"
+#include "ksguid.h"
+#include "ksmedia.h"
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <poll.h>
+
+#ifdef HAVE_PULSEAUDIO
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/library.h"
+
+#include <winepulse.h>
+#include <pulse/pulseaudio.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wave);
+
+/* These strings used only for tracing */
+const char * PULSE_getCmdString(enum win_wm_message msg) {
+    static char unknown[32];
+#define MSG_TO_STR(x) case x: return #x
+    switch(msg) {
+    MSG_TO_STR(WINE_WM_PAUSING);
+    MSG_TO_STR(WINE_WM_RESTARTING);
+    MSG_TO_STR(WINE_WM_RESETTING);
+    MSG_TO_STR(WINE_WM_HEADER);
+    MSG_TO_STR(WINE_WM_BREAKLOOP);
+    MSG_TO_STR(WINE_WM_CLOSING);
+    MSG_TO_STR(WINE_WM_STARTING);
+    MSG_TO_STR(WINE_WM_STOPPING);
+    MSG_TO_STR(WINE_WM_XRUN);
+    MSG_TO_STR(WINE_WM_FEED);
+    }
+#undef MSG_TO_STR
+    sprintf(unknown, "UNKNOWN(0x%08x)", msg);
+    return unknown;
+}
+
+/*======================================================================*
+ *          Ring Buffer Functions - copied from winealsa.drv            *
+ *======================================================================*/
+
+/* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */
+#define USE_PIPE_SYNC
+
+#ifdef USE_PIPE_SYNC
+#define INIT_OMR(omr) do { if (pipe(omr->msg_pipe) < 0) { omr->msg_pipe[0] = omr->msg_pipe[1] = -1; } } while (0)
+#define CLOSE_OMR(omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0)
+#define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0)
+#define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0)
+#define RESET_OMR(omr) do { } while (0)
+#define WAIT_OMR(omr, sleep) \
+  do { struct pollfd pfd; pfd.fd = (omr)->msg_pipe[0]; \
+       pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0)
+#else
+#define INIT_OMR(omr) do { omr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); } while (0)
+#define CLOSE_OMR(omr) do { CloseHandle(omr->msg_event); } while (0)
+#define SIGNAL_OMR(omr) do { SetEvent((omr)->msg_event); } while (0)
+#define CLEAR_OMR(omr) do { } while (0)
+#define RESET_OMR(omr) do { ResetEvent((omr)->msg_event); } while (0)
+#define WAIT_OMR(omr, sleep) \
+  do { WaitForSingleObject((omr)->msg_event, sleep); } while (0)
+#endif
+
+#define PULSE_RING_BUFFER_INCREMENT      64
+
+/******************************************************************
+ *                  PULSE_InitRingMessage
+ *
+ * Initialize the ring of messages for passing between driver's caller
+ * and playback/record thread
+ */
+int PULSE_InitRingMessage(PULSE_MSG_RING* omr)
+{
+    omr->msg_toget = 0;
+    omr->msg_tosave = 0;
+    INIT_OMR(omr);
+    omr->ring_buffer_size = PULSE_RING_BUFFER_INCREMENT;
+    omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(PULSE_MSG));
+
+    InitializeCriticalSection(&omr->msg_crst);
+    omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PULSE_MSG_RING.msg_crst");
+    return 0;
+}
+
+/******************************************************************
+ *                  PULSE_DestroyRingMessage
+ *
+ */
+int PULSE_DestroyRingMessage(PULSE_MSG_RING* omr)
+{
+    CLOSE_OMR(omr);
+    HeapFree(GetProcessHeap(),0,omr->messages);
+    omr->messages = NULL;
+    omr->ring_buffer_size = PULSE_RING_BUFFER_INCREMENT;
+    omr->msg_crst.DebugInfo->Spare[0] = 0;
+    DeleteCriticalSection(&omr->msg_crst);
+    return 0;
+}
+/******************************************************************
+ *                  PULSE_ResetRingMessage
+ *
+ */
+void PULSE_ResetRingMessage(PULSE_MSG_RING* omr)
+{
+    RESET_OMR(omr);
+}
+
+/******************************************************************
+ *                  PULSE_WaitRingMessage
+ *
+ */
+void PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep)
+{
+    WAIT_OMR(omr, sleep);
+}
+
+/******************************************************************
+ *                  PULSE_AddRingMessage
+ *
+ * Inserts a new message into the ring (should be called from DriverProc derived routines)
+ */
+int PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait)
+{
+    HANDLE      hEvent = INVALID_HANDLE_VALUE;
+
+    EnterCriticalSection(&omr->msg_crst);
+    if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)))
+    {
+        int old_ring_buffer_size = omr->ring_buffer_size;
+        omr->ring_buffer_size += PULSE_RING_BUFFER_INCREMENT;
+        omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(PULSE_MSG));
+        /* Now we need to rearrange the ring buffer so that the new
+           buffers just allocated are in between omr->msg_tosave and
+           omr->msg_toget.
+        */
[...2274 lines suppressed...]
index 0000000..0aa7e86
--- /dev/null
+++ b/dlls/winepulse.drv/winepulse.h
@@ -0,0 +1,196 @@
+/* Definitions for PulseAudio Wine Driver
+ *
+ * Copyright    2009 Arthur Taylor <theycallhimart at gmail.com>
+ *
+ * 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
+ */
+
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
+#if defined(HAVE_PULSEAUDIO) && !defined(__WINEPULSE_H)
+#define __WINEPULSE_H
+
+#include "mmreg.h"
+#include "dsound.h"
+#include "dsdriver.h"
+
+#include "ks.h"
+#include "ksmedia.h"
+#include "ksguid.h"
+
+#include <pulse/pulseaudio.h>
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * |  state  |  function   |     event     |            new state            |
+ * +---------+-------------+---------------+---------------------------------+
+ * |         | open()      |               | STOPPED                         |
+ * | PAUSED  | write()     |               | PAUSED                          |
+ * | STOPPED | write()     | <thrd create> | PLAYING                         |
+ * | PLAYING | write()     | HEADER        | PLAYING                         |
+ * | (other) | write()     | <error>       |                                 |
+ * | (any)   | pause()     | PAUSING       | PAUSED                          |
+ * | PAUSED  | restart()   | RESTARTING    | PLAYING (if no thrd => STOPPED) |
+ * | (any)   | reset()     | RESETTING     | STOPPED                         |
+ * | (any)   | close()     | CLOSING       | CLOSED                          |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING         1
+#define WINE_WS_PAUSED          2
+#define WINE_WS_STOPPED         3
+#define WINE_WS_CLOSED          4
+#define WINE_WS_FAILED          5
+
+#define PULSE_ALL_FORMATS \
+        WAVE_FORMAT_1M08 |      /* Mono     11025Hz 8-bit  */\
+        WAVE_FORMAT_1M16 |      /* Mono     11025Hz 16-bit */\
+        WAVE_FORMAT_1S08 |      /* Stereo   11025Hz 8-bit  */\
+        WAVE_FORMAT_1S16 |      /* Stereo   11025Hz 16-bit */\
+        WAVE_FORMAT_2M08 |      /* Mono     22050Hz 8-bit  */\
+        WAVE_FORMAT_2M16 |      /* Mono     22050Hz 16-bit */\
+        WAVE_FORMAT_2S08 |      /* Stereo   22050Hz 8-bit  */\
+        WAVE_FORMAT_2S16 |      /* Stereo   22050Hz 16-bit */\
+        WAVE_FORMAT_4M08 |      /* Mono     44100Hz 8-bit  */\
+        WAVE_FORMAT_4M16 |      /* Mono     44100Hz 16-bit */\
+        WAVE_FORMAT_4S08 |      /* Stereo   44100Hz 8-bit  */\
+        WAVE_FORMAT_4S16 |      /* Stereo   44100Hz 16-bit */\
+        WAVE_FORMAT_48M08 |     /* Mono     48000Hz 8-bit  */\
+        WAVE_FORMAT_48S08 |     /* Stereo   48000Hz 8-bit  */\
+        WAVE_FORMAT_48M16 |     /* Mono     48000Hz 16-bit */\
+        WAVE_FORMAT_48S16 |     /* Stereo   48000Hz 16-bit */\
+        WAVE_FORMAT_96M08 |     /* Mono     96000Hz 8-bit  */\
+        WAVE_FORMAT_96S08 |     /* Stereo   96000Hz 8-bit  */\
+        WAVE_FORMAT_96M16 |     /* Mono     96000Hz 16-bit */\
+        WAVE_FORMAT_96S16       /* Stereo   96000Hz 16-bit */
+
+/* events to be sent to device */
+enum win_wm_message {
+    WINE_WM_PAUSING = WM_USER + 1, WINE_WM_RESTARTING, WINE_WM_RESETTING, WINE_WM_HEADER,
+    WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING, WINE_WM_XRUN, WINE_WM_FEED
+};
+
+typedef struct {
+    enum win_wm_message msg;    /* message identifier */
+    DWORD               param;  /* parameter for this message */
+    HANDLE              hEvent; /* if message is synchronous, handle of event for synchro */
+} PULSE_MSG;
+
+/* implement an in-process message ring for better performance
+ * (compared to passing thru the server)
+ * this ring will be used by the input (resp output) record (resp playback) routine
+ */
+typedef struct {
+    PULSE_MSG                   * messages;
+    int                         ring_buffer_size;
+    int                         msg_tosave;
+    int                         msg_toget;
+/* Either pipe or event is used, but that is defined in pulse.c,
+ * since this is a global header we define both here */
+    int                         msg_pipe[2];
+    HANDLE                      msg_event;
+    CRITICAL_SECTION            msg_crst;
+} PULSE_MSG_RING;
+
+typedef struct WINE_WAVEDEV WINE_WAVEDEV;
+typedef struct WINE_WAVEINST WINE_WAVEINST;
+
+/* Per-playback/record device */
+struct WINE_WAVEDEV {
+    char                interface_name[MAXPNAMELEN * 2];
+    char                *device_name;
+    pa_cvolume          volume;
+
+    union {
+        WAVEOUTCAPSW    out;
+        WAVEINCAPSW     in;
+    } caps;
+    
+    /* DirectSound stuff */
+    DSDRIVERDESC                ds_desc;
+    DSDRIVERCAPS                ds_caps;
+};
+
+/* Per-playback/record instance */
+struct WINE_WAVEINST {
+    INT                 state;              /* one of the WINE_WS_ manifest constants */
+    WAVEOPENDESC        waveDesc;
+    WORD                wFlags;
+
+    /* PulseAudio specific data */
+    pa_stream           *stream;            /* The PulseAudio stream */
+    const pa_timing_info *timing_info;      /* The timing info structure for the stream */
+    pa_sample_spec      sample_spec;        /* Sample spec of this stream / device */
+    pa_cvolume          volume;             /* Software volume of the stream */
+    pa_buffer_attr      buffer_attr;        /* Buffer attribute, may not be used */
+
+    /* waveIn / waveOut wavaHdr */
+    LPWAVEHDR           lpQueuePtr;         /* Start of queued WAVEHDRs (waiting to be notified) */
+    LPWAVEHDR           lpPlayPtr;          /* Start of not yet fully written buffers */
+    DWORD               dwPartialOffset;    /* Offset of not yet written bytes in lpPlayPtr */
+    LPWAVEHDR           lpLoopPtr;          /* Pointer of first buffer in loop, if any */
+    DWORD               dwLoops;            /* Private copy of loop counter */
+    DWORD               dwLastReset;        /* When the last reset occured, as pa stream time doesn't reset */
+
+    /* waveIn specific */
+    const void          *buffer;            /* Pointer to the latest data fragment for recording streams */
+    DWORD               buffer_length;      /* How large the latest data fragment is */
+    DWORD               buffer_read_offset; /* How far into latest data fragment we last read */
+
+    /* Thread communication and synchronization stuff */
+    HANDLE              hStartUpEvent;
+    HANDLE              hThread;
+    DWORD               dwThreadID;
+    PULSE_MSG_RING      msgRing;
+};
+
+/* We establish one context per instance, so make it global to the lib */
+pa_context              *PULSE_context;   /* Connection Context */
+pa_threaded_mainloop    *PULSE_ml;        /* PA Runtime information */
+
+/* WaveIn / WaveOut devices */
+WINE_WAVEDEV *WOutDev;
+WINE_WAVEDEV *WInDev;
+DWORD PULSE_WodNumDevs;
+DWORD PULSE_WidNumDevs;
+
+/* pulse.c: PulseAudio Async Callbacks */
+void    PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void    PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamSuspendedCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamMovedCallback(pa_stream *s, void *userdata);
+void    PULSE_ContextSuccessCallback(pa_context *c, int success, void *userdata);
+
+/* pulse.c: General Functions */
+void    PULSE_WaitForOperation(pa_operation *o);
+BOOL    PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+HRESULT PULSE_UsecToMMTime(pa_usec_t time, LPMMTIME lpTime, const pa_sample_spec *ss);
+
+/* pulse.c: Message Ring */
+int     PULSE_InitRingMessage(PULSE_MSG_RING* omr);
+int     PULSE_DestroyRingMessage(PULSE_MSG_RING* omr);
+void    PULSE_ResetRingMessage(PULSE_MSG_RING* omr);
+void    PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep);
+int     PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait);
+int     PULSE_RetrieveRingMessage(PULSE_MSG_RING* omr, enum win_wm_message *msg, DWORD *param, HANDLE *hEvent);
+
+/* pulse.c: Tracing */
+const char * PULSE_getCmdString(enum win_wm_message msg);
+#endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	30 Oct 2009 15:22:28 -0000	1.81
+++ .cvsignore	18 Dec 2009 15:17:23 -0000	1.82
@@ -1 +1 @@
-wine-1.1.32-fe.tar.bz2
+wine-1.1.34-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	30 Oct 2009 15:20:17 -0000	1.82
+++ sources	18 Dec 2009 15:17:23 -0000	1.83
@@ -1 +1 @@
-b598afe820bde7c33f5bd0ab62fb7dce  wine-1.1.32-fe.tar.bz2
+445c7d6e6ec1423e9f311eb1b467e5da  wine-1.1.34-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/wine.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- wine.spec	30 Oct 2009 14:57:27 -0000	1.115
+++ wine.spec	18 Dec 2009 15:17:23 -0000	1.116
@@ -1,6 +1,6 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.32
+Version:	1.1.34
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -48,14 +48,20 @@ Source300:      wine-mime-msi.desktop
 # see http://bugs.winehq.org/show_bug.cgi?id=10495
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse-0.32-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.32.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.33.patch
 Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
 Patch1:         wine-rpath.patch
 
+# upstream bugs
+# fix build with newer ssl
+# http://www.winehq.org/pipermail/wine-patches/2009-December/082268.html
+Patch500: 0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch
+
 # bugfix patches
-# none
+# #533806
+Patch600:       wine-x86_64-prefix.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -148,7 +154,6 @@ wine-* sub packages.
 Summary:        Wine core package
 Group:		Applications/Emulators
 Requires:       wine-fonts = %{version}-%{release}
-Requires:       %{_bindir}/xmessage
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes:      wine <= 0.9.15-1%{?dist}
@@ -162,10 +167,12 @@ Requires:       freetype(x86-32)
 Requires:       nss-mdns(x86-32)
 # require Xrender isa on x86_64 (#510947)
 Requires:       libXrender(x86-32)
+Requires:       gnutls(x86-32)
 %endif
 %ifarch x86_64
 Requires:       nss-mdns(x86-64)
 Requires:       freetype(x86-64)
+Requires:       gnutls(x86-64)
 %endif
 
 %description core
@@ -314,6 +321,11 @@ This package adds an openal driver for w
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
+%patch500 -p1
+
+%ifarch x86_64
+%patch600
+%endif
 
 autoreconf
 
@@ -354,7 +366,6 @@ mv %{buildroot}%{_bindir}/wine{,32}
 mv %{buildroot}%{_bindir}/wine{,64}
 %endif
 
-
 mkdir -p %{buildroot}%{_sysconfdir}/wine
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
@@ -561,6 +572,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/expand.exe.so
 %{_libdir}/wine/extrac32.exe.so
 %{_libdir}/wine/winhlp32.exe.so
+%{_libdir}/wine/mshta.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
 %{_libdir}/wine/ntoskrnl.exe.so
@@ -594,6 +606,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/authz.dll.so
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
+%{_libdir}/wine/avrt.dll.so
 %{_libdir}/wine/bcrypt.dll.so
 %{_libdir}/wine/browseui.dll.so
 %{_libdir}/wine/cabinet.dll.so
@@ -654,6 +667,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/faultrep.dll.so
 %{_libdir}/wine/fltlib.dll.so
 %{_libdir}/wine/fusion.dll.so
+%{_libdir}/wine/fwpuclnt.dll.so
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
 %{_libdir}/wine/glu32.dll.so
@@ -810,6 +824,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/vdmdbg.dll.so
 %{_libdir}/wine/version.dll.so
 %{_libdir}/wine/wbemprox.dll.so
+%{_libdir}/wine/wiaservc.dll.so
 %{_libdir}/wine/windowscodecs.dll.so
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winecoreaudio.drv.so
@@ -832,6 +847,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
 %{_libdir}/wine/wuapi.dll.so
+%{_libdir}/wine/wuaueng.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
 %{_libdir}/wine/wineps.drv.so
@@ -1046,6 +1062,18 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/openal32.dll.so
 
 %changelog
+* Fri Dec 18 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.34-1
+- version upgrade (#546749)
+
+* Mon Nov 16 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.33-1
+- version upgrade
+- winepulse update (.33)
+- require gnutls (#538694)
+- use separate WINEPREFIX on x86_64 per default (workaround for #533806)
+- drop explicit xmessage require (#537610)
+
 * Tue Oct 27 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.32-1
 - version upgrade (#531358)


--- winepulse-0.32.patch DELETED ---



From mclasen at fedoraproject.org  Fri Dec 18 15:17:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 15:17:39 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel spam.patch, NONE,
	1.1 gnome-power-manager.spec, 1.178, 1.179
Message-ID: <20091218151739.B912811C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14104

Modified Files:
	gnome-power-manager.spec 
Added Files:
	spam.patch 
Log Message:
Avoid warning messages at startup


spam.patch:
 gsd-media-keys-window.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE spam.patch ---
diff -up gnome-power-manager-2.28.2/src/gsd-media-keys-window.c.spam gnome-power-manager-2.28.2/src/gsd-media-keys-window.c
--- gnome-power-manager-2.28.2/src/gsd-media-keys-window.c.spam	2009-12-18 10:04:22.303109410 -0500
+++ gnome-power-manager-2.28.2/src/gsd-media-keys-window.c	2009-12-18 10:03:58.135359461 -0500
@@ -133,6 +133,9 @@ add_hide_timeout (GsdMediaKeysWindow *wi
 static void
 update_window (GsdMediaKeysWindow *window)
 {
+        if (!gtk_widget_is_drawable (GTK_WIDGET (window)))
+                return;
+
         remove_hide_timeout (window);
         add_hide_timeout (window);
 


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- gnome-power-manager.spec	8 Dec 2009 11:16:59 -0000	1.178
+++ gnome-power-manager.spec	18 Dec 2009 15:17:39 -0000	1.179
@@ -4,7 +4,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.29.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -42,6 +42,9 @@ Requires(post): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604918
+Patch0: spam.patch
+
 %description
 GNOME Power Manager uses the information and facilities provided by HAL
 displaying icons and handling user callbacks in an interactive GNOME session.
@@ -59,6 +62,7 @@ Extra GNOME power management application
 %prep
 %setup -q
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%patch0 -p1 -b .spam
 
 %build
 %configure \
@@ -178,6 +182,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Fri Dec 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.1-2
+- Avoid warning messages at startup
+
 * Tue Dec 08 2009 Richard Hughes  <rhughes at redhat.com> - 2.29.1-1
 - Update to 2.29.1
 - Remove upstreamed patches



From rstrode at fedoraproject.org  Fri Dec 18 15:22:16 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 18 Dec 2009 15:22:16 +0000 (UTC)
Subject: rpms/dbus/F-12 dbus.spec,1.180,1.181
Message-ID: <20091218152216.710F211C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15073

Modified Files:
	dbus.spec 
Log Message:
Be more liberal with patch fuzz



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- dbus.spec	18 Dec 2009 15:16:44 -0000	1.180
+++ dbus.spec	18 Dec 2009 15:22:16 -0000	1.181
@@ -4,6 +4,7 @@
 %define libselinux_version      1.15.2
 
 %define dbus_user_uid           81
+%define _default_path_fuzz      999
 
 Summary: D-BUS message bus
 Name: dbus



From rstrode at fedoraproject.org  Fri Dec 18 15:27:03 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 18 Dec 2009 15:27:03 +0000 (UTC)
Subject: rpms/dbus/F-12 dbus.spec,1.181,1.182
Message-ID: <20091218152703.9D2F011C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15834

Modified Files:
	dbus.spec 
Log Message:
Be more liberal about patch fuzz, not "path" fuzz



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- dbus.spec	18 Dec 2009 15:22:16 -0000	1.181
+++ dbus.spec	18 Dec 2009 15:27:03 -0000	1.182
@@ -4,7 +4,7 @@
 %define libselinux_version      1.15.2
 
 %define dbus_user_uid           81
-%define _default_path_fuzz      999
+%define _default_patch_fuzz     999
 
 Summary: D-BUS message bus
 Name: dbus



From deji at fedoraproject.org  Fri Dec 18 15:27:38 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 18 Dec 2009 15:27:38 +0000 (UTC)
Subject: rpms/mpich2/devel mpich2.spec,1.19,1.20
Message-ID: <20091218152738.87A4711C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15964

Modified Files:
	mpich2.spec 
Log Message:
Remove the unwanted *.a libs properly



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mpich2.spec	17 Dec 2009 20:26:15 -0000	1.19
+++ mpich2.spec	18 Dec 2009 15:27:38 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -187,7 +187,7 @@ done
 rm -rf %{buildroot}%{_sbindir}/mpe*
 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-rm -f %{_libdir}/%{name}/lib/lib*mpich*.a
+rm %{buildroot}%{_libdir}/%{name}/lib/lib*mpich*.a
 
 %clean
 rm -rf %{buildroot}
@@ -327,6 +327,9 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Fri Dec 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-5
+- Properly remove the lib*mpich2*.a files
+
 * Wed Dec 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.2.1-4
 - add the m_option macro to replace hardcoding -m{__isa_bits}
   and define it correctly for s390, where __isa_bits is 32, but



From deji at fedoraproject.org  Fri Dec 18 15:28:02 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 18 Dec 2009 15:28:02 +0000 (UTC)
Subject: rpms/babl/devel babl.spec,1.17,1.18
Message-ID: <20091218152802.4CACF11C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/babl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16221

Modified Files:
	babl.spec 
Log Message:
* Fri Dec 18 2009 Deji Akingunola <dakingun at gmail.com> - 0.1.0-5
- Remove the *.la files



Index: babl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/babl/devel/babl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- babl.spec	13 Aug 2009 13:43:37 -0000	1.17
+++ babl.spec	18 Dec 2009 15:28:02 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	A dynamic, any to any, pixel format conversion library
 Name:		babl
 Version:	0.1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 # The gggl codes contained in this package are under the GPL, with exceptions allowing their use under libraries covered under the LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
@@ -47,7 +47,7 @@ mkdir -p babl_docs babl_docs/html
 cp -pr docs/graphics docs/*.html docs/babl.css babl_docs/html
 rm -rf babl_docs/html/graphics/Makefile*
 
-rm -rf %{buildroot}%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 # fix timestamps for multilib
 touch -m --reference=docs/Makefile.am babl_docs/html{,/graphics}/*
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Dec 18 2009 Deji Akingunola <dakingun at gmail.com> - 0.1.0-5
+- Remove the *.la files
+
 * Thu Aug 13 2009 Nils Philippsen <nils at redhat.com>
 - explain patch status
 



From aarapov at fedoraproject.org  Fri Dec 18 15:41:15 2009
From: aarapov at fedoraproject.org (Anton Arapov)
Date: Fri, 18 Dec 2009 15:41:15 +0000 (UTC)
Subject: rpms/dmidecode/devel dmidecode.spec,1.39,1.40
Message-ID: <20091218154116.0308A11C00E6@cvs1.fedora.phx.redhat.com>

Author: aarapov

Update of /cvs/pkgs/rpms/dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18594

Modified Files:
	dmidecode.spec 
Log Message:
* Fri Dec 18 2009 Prarit Bhargava <prarit at redhat.com> - 1:2.1.0-1.40
- Fix rpmlint errors in specfile



Index: dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmidecode/devel/dmidecode.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- dmidecode.spec	28 Aug 2009 20:41:44 -0000	1.39
+++ dmidecode.spec	18 Dec 2009 15:41:14 -0000	1.40
@@ -2,20 +2,19 @@ Summary:        Tool to analyse BIOS DMI
 Name:           dmidecode
 Version:        2.10
 Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
-Epoch:		1
+Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
-Source0:	dmidecode-%{version}.tar.bz2
+Source0:        dmidecode-%{version}.tar.bz2
 Patch0:         dmidecode-add-hewlett-packard-to-dmioem.patch
 Patch1:         dmidecode-recognize-more-memory.patch
 Patch2:         dmidecode-add-socket-lga1366.patch
 Patch3:         dmidecode-warn-on-unsupported-smbios-version.patch
 Patch4:         dmidecode-smbios-2.6.1-updates.patch
-URL:		http://www.nongnu.org/dmidecode/
+URL:            http://www.nongnu.org/dmidecode/
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
-BuildPreReq: 	/usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
-ExclusiveArch:	%{ix86} x86_64 ia64
-Obsoletes:	kernel-utils
+BuildRequires:  /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
+ExclusiveArch:  %{ix86} x86_64 ia64
 
 %description
 dmidecode reports information about x86 & ia64 hardware as described in the
@@ -58,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 18 2009 Prarit Bhargava <prarit at redhat.com> - 1:2.1.0-1.40
+- Fix rpmlint errors in specfile
+
 * Fri Aug 28 2009 Jarod Wilson <jarod at redhat.com> - 1:2.10-1.39
 - Fix cache associativity mapping (was missing some commas)
 



From mclasen at fedoraproject.org  Fri Dec 18 15:45:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 15:45:31 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-12 osd-spam.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.137, 1.138
Message-ID: <20091218154531.8AC0911C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19378

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	osd-spam.patch 
Log Message:
Avoid warning messages from the OSD code


osd-spam.patch:
 gsd-media-keys-window.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE osd-spam.patch ---
diff -up gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c.spam gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c
--- gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c.spam	2009-12-18 10:32:07.722360259 -0500
+++ gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c	2009-12-18 10:33:00.923109059 -0500
@@ -134,6 +134,9 @@ add_hide_timeout (GsdMediaKeysWindow *wi
 static void
 update_window (GsdMediaKeysWindow *window)
 {
+        if (!gtk_widget_is_drawable (GTK_WIDGET (window)))
+                return;
+
         remove_hide_timeout (window);
         add_hide_timeout (window);
 


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- gnome-settings-daemon.spec	15 Dec 2009 20:47:07 -0000	1.137
+++ gnome-settings-daemon.spec	18 Dec 2009 15:45:30 -0000	1.138
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -50,6 +50,9 @@ Patch7: iconleak.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=604651
 Patch8: survive-xmm.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604918
+Patch9: osd-spam.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -76,6 +79,7 @@ developing applications that use %{name}
 %patch6 -p1 -b .screen-change
 %patch7 -p1 -b .iconleak
 %patch8 -p1 -b .survive-xmm
+%patch9 -p1 -b .osd-spam
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -187,6 +191,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Dec 18 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-10
+- Avoid warning messages from the OSD code
+
 * Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-9
 - Survive when running without XKB (#547780)
 



From rdieter at fedoraproject.org  Fri Dec 18 15:46:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 15:46:47 +0000 (UTC)
Subject: File kdebase-runtime-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218154647.3AE4F28ECE8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdebase-runtime:

e1b01e1e6b572c2b526caa572d5d7558  kdebase-runtime-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 15:51:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 15:51:12 +0000 (UTC)
Subject: File kdebase-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218155112.B3DFC28ECE4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdebase:

52f2e4ef6cb3ebb0fe73f32417194027  kdebase-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 15:53:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 15:53:20 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore, 1.98, 1.99 kdebase.spec, 1.409,
	1.410 sources, 1.119, 1.120
Message-ID: <20091218155320.ECF5011C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20811

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	1 Dec 2009 14:26:36 -0000	1.98
+++ .cvsignore	18 Dec 2009 15:53:20 -0000	1.99
@@ -1 +1 @@
-kdebase-4.3.80.tar.bz2
+kdebase-4.3.85.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- kdebase.spec	16 Dec 2009 11:10:30 -0000	1.409
+++ kdebase.spec	18 Dec 2009 15:53:20 -0000	1.410
@@ -1,15 +1,15 @@
-Name: kdebase
+
+Name:    kdebase
 Summary: KDE Core Files
-Epoch: 6
-Version: 4.3.80
-Release: 4%{?dist}
+Epoch:   6
+Version: 4.3.85
+Release: 1%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
@@ -229,6 +229,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-4
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- sources	1 Dec 2009 14:26:36 -0000	1.119
+++ sources	18 Dec 2009 15:53:20 -0000	1.120
@@ -1 +1 @@
-83af816034448c0b21667457efe1a455  kdebase-4.3.80.tar.bz2
+52f2e4ef6cb3ebb0fe73f32417194027  kdebase-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 15:54:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 15:54:07 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.43,
	1.44 kdebase-runtime.spec, 1.175, 1.176 sources, 1.43, 1.44
Message-ID: <20091218155407.4A9F611C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20982

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	1 Dec 2009 15:05:08 -0000	1.43
+++ .cvsignore	18 Dec 2009 15:54:06 -0000	1.44
@@ -1 +1 @@
-kdebase-runtime-4.3.80.tar.bz2
+kdebase-runtime-4.3.85.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- kdebase-runtime.spec	16 Dec 2009 16:06:57 -0000	1.175
+++ kdebase-runtime.spec	18 Dec 2009 15:54:07 -0000	1.176
@@ -1,11 +1,12 @@
+
 %if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       KDE Runtime
-Version:       4.3.80
-Release:       4%{?dist}
+Version:       4.3.85
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -231,6 +232,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-4
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	1 Dec 2009 15:05:08 -0000	1.43
+++ sources	18 Dec 2009 15:54:07 -0000	1.44
@@ -1 +1 @@
-a7e0ce1a6c1c58821566502e6c5dd58c  kdebase-runtime-4.3.80.tar.bz2
+e1b01e1e6b572c2b526caa572d5d7558  kdebase-runtime-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 15:56:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 15:56:26 +0000 (UTC)
Subject: File kdebase-workspace-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218155626.7819C28ECE4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdebase-workspace:

b727b668858a4ddbe4649643f62ebd4a  kdebase-workspace-4.3.85.tar.bz2



From pkgdb at fedoraproject.org  Fri Dec 18 15:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:58:12 +0000
Subject: [pkgdb] tetex-perltex ownership updated
Message-ID: <20091218155814.4054628ED44@bastion.fedoraproject.org>

Package tetex-perltex in Fedora devel was orphaned by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-perltex



From pkgdb at fedoraproject.org  Fri Dec 18 15:58:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 15:58:13 +0000
Subject: [pkgdb] tetex-perltex (un)retirement
Message-ID: <20091218155816.192C028ED58@bastion.fedoraproject.org>

Package tetex-perltex in Fedora devel has been retired by spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tetex-perltex



From spot at fedoraproject.org  Fri Dec 18 15:59:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 18 Dec 2009 15:59:45 +0000 (UTC)
Subject: rpms/tetex-perltex/devel dead.package, NONE, 1.1 sources, 1.5,
	NONE tetex-perltex.spec, 1.8, NONE
Message-ID: <20091218155945.54E6111C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-perltex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21986

Added Files:
	dead.package 
Removed Files:
	sources tetex-perltex.spec 
Log Message:
retired, obsoleted by texlive-texmf


--- NEW FILE dead.package ---
Obsoleted by texlive-texmf.


--- sources DELETED ---


--- tetex-perltex.spec DELETED ---



From rdieter at fedoraproject.org  Fri Dec 18 16:04:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:04:38 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.85-brightness_keys.patch, NONE,
	1.1 .cvsignore, 1.43, 1.44 kdebase-workspace.spec, 1.329,
	1.330 sources, 1.51,
	1.52 kdebase-workspace-4.3.80-brightness-keys.patch, 1.1,
	NONE kdebase-workspace-4.3.80-cmake-targets.patch, 1.1, NONE
Message-ID: <20091218160438.5D64B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23057

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.3.85-brightness_keys.patch 
Removed Files:
	kdebase-workspace-4.3.80-brightness-keys.patch 
	kdebase-workspace-4.3.80-cmake-targets.patch 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)


kdebase-workspace-4.3.85-brightness_keys.patch:
 libs/solid/control/powermanager.cpp        |   11 +++-
 plasma/generic/applets/battery/battery.cpp |   74 ++++++++++++++++++++++++----
 plasma/generic/applets/battery/battery.h   |   10 +++
 powerdevil/daemon/PowerDevilDaemon.cpp     |   75 +++++++++++++++++++++++++----
 powerdevil/daemon/PowerDevilDaemon.h       |    6 ++
 powerdevil/daemon/org.kde.PowerDevil.xml   |    8 +++
 6 files changed, 161 insertions(+), 23 deletions(-)

--- NEW FILE kdebase-workspace-4.3.85-brightness_keys.patch ---
diff -up kdebase-workspace-4.3.85/libs/solid/control/powermanager.cpp.brightness_keys kdebase-workspace-4.3.85/libs/solid/control/powermanager.cpp
--- kdebase-workspace-4.3.85/libs/solid/control/powermanager.cpp.brightness_keys	2009-12-17 10:35:15.000000000 -0600
+++ kdebase-workspace-4.3.85/libs/solid/control/powermanager.cpp	2009-12-18 10:00:30.638575226 -0600
@@ -25,6 +25,8 @@
 #include "ifaces/powermanager.h"
 #include <kdebug.h>
 #include <kglobal.h>
+#include <QDBusInterface>
+#include <QDBusPendingCall>
 #include <QX11Info>
 
 K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager)
@@ -160,7 +162,8 @@ bool Solid::Control::PowerManager::setBr
 #ifdef Q_WS_WIN
             return false;
 #else
-            return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 );
+            if ( xrandr_brightlight( QX11Info::display(), brightness ) < 0 )
+                return false;
 #endif
         }
         else
@@ -170,8 +173,12 @@ bool Solid::Control::PowerManager::setBr
                 SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(), setBrightness(brightness, device));
             }
             //TODO - This should be done better, it will return true even if one of the calls returns false. SOLID_CALL does not allow us to get the return value.
-            return true;
         }
+
+        QDBusConnection dbus(QDBusConnection::sessionBus());
+        QDBusInterface iface("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil", dbus);
+        iface.asyncCall("notifyOfBrightnessChange", (int) Solid::Control::PowerManager::brightness());
+        return true;
     }
     else
     {
diff -up kdebase-workspace-4.3.85/plasma/generic/applets/battery/battery.cpp.brightness_keys kdebase-workspace-4.3.85/plasma/generic/applets/battery/battery.cpp
--- kdebase-workspace-4.3.85/plasma/generic/applets/battery/battery.cpp.brightness_keys	2009-12-18 10:00:30.608565397 -0600
+++ kdebase-workspace-4.3.85/plasma/generic/applets/battery/battery.cpp	2009-12-18 10:02:00.157566459 -0600
@@ -24,7 +24,9 @@
 #include <QApplication>
 #include <QDBusConnection>
 #include <QDBusInterface>
+#include <QDesktopWidget>
 #include <QPainter>
+#include <QProgressBar>
 #include <QStyleOptionGraphicsItem>
 #include <QFont>
 #include <QGraphicsSceneHoverEvent>
@@ -33,7 +35,9 @@
 #include <QDBusPendingCall>
 #include <QLabel>
 #include <QPropertyAnimation>
+#include <QTimer>
 
+#include <KApplication>
 #include <KDebug>
 #include <KIcon>
 #include <KSharedConfig>
@@ -86,7 +90,8 @@ Battery::Battery(QObject *parent, const 
       m_labelAlpha(0),
       m_labelAnimation(0),
       m_acAlpha(0),
-      m_acAnimation(0)
+      m_acAnimation(0),
+      m_brightnessDisplay(0)
 {
     //kDebug() << "Loading applet battery";
     setAcceptsHoverEvents(true);
@@ -318,6 +323,7 @@ void Battery::hoverLeaveEvent(QGraphicsS
 
 Battery::~Battery()
 {
+    delete m_brightnessDisplay;
 }
 
 void Battery::suspend()
@@ -338,13 +344,17 @@ void Battery::hibernate()
 
 void Battery::brightnessChanged(const int brightness)
 {
-    Solid::Control::PowerManager::setBrightness(brightness);
+    if (!m_ignoreBrightnessChange) {
+        Solid::Control::PowerManager::setBrightness(brightness);
+    }
 }
 
-void Battery::updateSlider(const float brightness)
+void Battery::updateSlider(int brightness)
 {
-    if (m_brightnessSlider->value() != (int)brightness) {
-        m_brightnessSlider->setValue((int) brightness);
+    if (m_brightnessSlider->value() != brightness) {
+        m_ignoreBrightnessChange = true;
+        m_brightnessSlider->setValue(brightness);
+        m_ignoreBrightnessChange = false;
     }
 }
 
@@ -367,6 +377,7 @@ void Battery::initExtenderItem(Plasma::E
     // as the battery applet is also embedded into the battery's extender.
     if (!m_isEmbedded && item->name() == "powermanagement") {
         int row = 0;
+        m_ignoreBrightnessChange = false;
 
         QGraphicsWidget *controls = new QGraphicsWidget(item);
         controls->setMinimumWidth(360);
@@ -431,16 +442,12 @@ void Battery::initExtenderItem(Plasma::E
 
         m_brightnessSlider = new Plasma::Slider(controls);
         m_brightnessSlider->setRange(0, 100);
-        m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
+        updateSlider(Solid::Control::PowerManager::brightness());
         m_brightnessSlider->nativeWidget()->setTickInterval(10);
         m_brightnessSlider->setOrientation(Qt::Horizontal);
         connect(m_brightnessSlider, SIGNAL(valueChanged(int)),
                 this, SLOT(brightnessChanged(int)));
 
-        Solid::Control::PowerManager::Notifier *notifier = Solid::Control::PowerManager::notifier();
-
-        connect(notifier, SIGNAL(brightnessChanged(float)),
-                this, SLOT(updateSlider(float)));
         m_controlsLayout->addItem(m_brightnessSlider, row, 1);
         row++;
 
@@ -530,6 +537,21 @@ void Battery::initExtenderItem(Plasma::E
         item->setWidget(controls);
         item->setTitle(i18n("Power Management"));
 
+        m_brightnessDisplay = new QProgressBar();
+        m_brightnessDisplay->setWindowFlags(Qt::X11BypassWindowManagerHint);
+        QDesktopWidget* desktop = KApplication::kApplication()->desktop();
+        //Getting QRect of the screen where cursor is positioned
+        QRect rect = desktop->screenGeometry(QCursor::pos());
+        int width = (rect.width()/2) - (m_brightnessDisplay->width()/2);
+        int height = (rect.height()/2) - (m_brightnessDisplay->height()/2);
+        width += rect.x();
+        height += rect.y();
+        m_brightnessDisplay->move(width, height);
+        m_brightnessDisplayTimer = new QTimer(this);
+        connect(m_brightnessDisplayTimer, SIGNAL(timeout()), this, SLOT(hideOSD()));
+        QDBusConnection::sessionBus().connect("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil",
+                                              "brightnessChanged", this, SLOT(showBrightnessOSD(int,bool)));
+
         setupFonts();
     }
 }
@@ -656,7 +678,7 @@ void Battery::updateStatus()
     }
 
     if (m_brightnessSlider) {
-        m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
+        updateSlider(Solid::Control::PowerManager::brightness());
     }
 }
 
@@ -995,4 +1017,34 @@ qreal Battery::acAlpha()
     return m_acAlpha;
 }
 
+void Battery::showBrightnessOSD(int brightness, bool byFnKey)
+{
+    if (byFnKey) {
+        m_brightnessDisplay->setValue(brightness);
+        m_brightnessDisplay->show();
+
+        //FIXME, how to get this to work before it is displayed for the first time?
+        QDesktopWidget* desktop = KApplication::kApplication()->desktop();
+        //Getting QRect of the screen where cursor is positioned
+        QRect rect = desktop->screenGeometry(QCursor::pos());
+        int width = (rect.width()/2) - (m_brightnessDisplay->width()/2);
+        int height = (rect.height()/2) - (m_brightnessDisplay->height()/2);
+        width += rect.x();
+        height += rect.y();
+        m_brightnessDisplay->move(width, height);
+
+        m_brightnessDisplayTimer->setInterval(2000);
+        m_brightnessDisplayTimer->start();
+
+        if (m_extenderVisible && m_brightnessSlider) {
+            updateSlider(brightness);
+        }
+    }
+}
+
+void Battery::hideOSD()
+{
+    m_brightnessDisplay->hide();
+}
+
 #include "battery.moc"
diff -up kdebase-workspace-4.3.85/plasma/generic/applets/battery/battery.h.brightness_keys kdebase-workspace-4.3.85/plasma/generic/applets/battery/battery.h
--- kdebase-workspace-4.3.85/plasma/generic/applets/battery/battery.h.brightness_keys	2009-11-30 18:31:24.000000000 -0600
+++ kdebase-workspace-4.3.85/plasma/generic/applets/battery/battery.h	2009-12-18 10:00:30.640576179 -0600
@@ -39,6 +39,8 @@ namespace Plasma
     class Slider;
 }
 
+class QProgressBar;
+
 class Battery : public Plasma::PopupApplet
 {
     Q_OBJECT
@@ -83,7 +85,7 @@ class Battery : public Plasma::PopupAppl
         void sourceAdded(const QString &source);
         void sourceRemoved(const QString &source);
         void brightnessChanged(const int brightness);
-        void updateSlider(const float brightness);
+        void updateSlider(int brightness);
         void setFullBrightness();
         void openConfig();
         void setProfile(const QString &profile);
@@ -91,6 +93,8 @@ class Battery : public Plasma::PopupAppl
         void hibernate();
         void updateBattery();
         void setupFonts();
+        void showBrightnessOSD(int brightness, bool byFnKey);
+        void hideOSD();
 
     private:
         void connectSources();
@@ -171,6 +175,10 @@ class Battery : public Plasma::PopupAppl
         QPropertyAnimation *m_labelAnimation;
         qreal m_acAlpha;
         QPropertyAnimation *m_acAnimation;
+
+        bool m_ignoreBrightnessChange;
+        QProgressBar* m_brightnessDisplay;
+        QTimer* m_brightnessDisplayTimer;
 };
 
 K_EXPORT_PLASMA_APPLET(battery, Battery)
diff -up kdebase-workspace-4.3.85/powerdevil/daemon/org.kde.PowerDevil.xml.brightness_keys kdebase-workspace-4.3.85/powerdevil/daemon/org.kde.PowerDevil.xml
--- kdebase-workspace-4.3.85/powerdevil/daemon/org.kde.PowerDevil.xml.brightness_keys	2009-09-04 06:30:55.000000000 -0500
+++ kdebase-workspace-4.3.85/powerdevil/daemon/org.kde.PowerDevil.xml	2009-12-18 10:00:30.640576179 -0600
@@ -42,6 +42,10 @@
       <arg type="as" direction="out" />
     </method>
     
+    <method name="notifyOfBrightnessChange">
+      <arg type="i" direction="in" />
+    </method>
+    
     <signal name="lidClosed">
       <arg type="i" direction="out" />
       <arg type="s" direction="out" />
@@ -56,5 +60,9 @@
     </signal>
      <signal name="DPMSconfigUpdated">
     </signal>
+    <signal name="brightnessChanged">
+      <arg type="i" direction="out" />
+      <arg type="b" direction="out" />
+    </signal>
   </interface>
 </node>
diff -up kdebase-workspace-4.3.85/powerdevil/daemon/PowerDevilDaemon.cpp.brightness_keys kdebase-workspace-4.3.85/powerdevil/daemon/PowerDevilDaemon.cpp
--- kdebase-workspace-4.3.85/powerdevil/daemon/PowerDevilDaemon.cpp.brightness_keys	2009-12-10 17:14:04.000000000 -0600
+++ kdebase-workspace-4.3.85/powerdevil/daemon/PowerDevilDaemon.cpp	2009-12-18 10:00:30.642567355 -0600
@@ -26,6 +26,8 @@
 
 #include <kdemacros.h>
 #include <KAboutData>
+#include <KAction>
+#include <KActionCollection>
 #include <KPluginFactory>
 #include <KNotification>
 #include <KIcon>
@@ -93,6 +95,7 @@ public:
             : notifier(Solid::Control::PowerManager::notifier())
             , currentConfig(0)
             , status(PowerDevilDaemon::NoAction)
+            , brightnessInHardware(false)
             , ckSessionInterface(0) {}
 
     Solid::Control::PowerManager::Notifier *notifier;
@@ -119,7 +122,9 @@ public:
 
     int batteryPercent;
     int brightness;
+    int cachedBrightness;
     bool isPlugged;
+    bool brightnessInHardware;
 
     // ConsoleKit stuff
     QDBusInterface *ckSessionInterface;
@@ -174,6 +179,18 @@ PowerDevilDaemon::PowerDevilDaemon(QObje
     d->ksmServerIface = new OrgKdeKSMServerInterfaceInterface("org.kde.ksmserver", "/KSMServer",
                                                               QDBusConnection::sessionBus(), this);
 
+    QDBusInterface halManager("org.freedesktop.Hal",
+            "/org/freedesktop/Hal/Manager", "org.freedesktop.Hal.Manager",
+            QDBusConnection::systemBus());
+    QStringList panelDevices = halManager.call("FindDeviceByCapability",
+             "laptop_panel").arguments().at(0).toStringList();
+    if (!panelDevices.empty()) {
+        QDBusInterface deviceInterface("org.freedesktop.Hal", panelDevices.at(0), "org.freedesktop.Hal.Device",
+                QDBusConnection::systemBus());
+        d->brightnessInHardware = deviceInterface.call("GetPropertyBoolean",
+                "laptop_panel.brightness_in_hardware").arguments().at(0).toBool();
+    }
+
     /*  Not needed anymore; I am not sure if we will need that in a future, so I leave it here
      *  just in case.
      *
@@ -198,6 +215,17 @@ PowerDevilDaemon::PowerDevilDaemon(QObje
     QDBusConnection::sessionBus().registerService("org.kde.powerdevil");
     // All systems up Houston, let's go!
     refreshStatus();
+
+    d->cachedBrightness = (int) Solid::Control::PowerManager::brightness();
+    KActionCollection* actionCollection = new KActionCollection( this );
+
+    KAction* globalAction = static_cast< KAction* >( actionCollection->addAction( "Increase Screen Brightness" ));
+    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessUp));
+    connect(globalAction, SIGNAL(triggered(bool)), SLOT(increaseBrightness()));
+
+    globalAction = static_cast< KAction* >( actionCollection->addAction( "Decrease Screen Brightness" ));
+    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessDown));
+    connect(globalAction, SIGNAL(triggered(bool)), SLOT(decreaseBrightness()));
 }
 
 PowerDevilDaemon::~PowerDevilDaemon()
@@ -661,24 +689,40 @@ void PowerDevilDaemon::buttonPressed(int
     }
 }
 
-void PowerDevilDaemon::decreaseBrightness()
+void PowerDevilDaemon::incDecBrightness(bool increase)
 {
     if (!checkIfCurrentSessionActive()) {
         return;
     }
 
-    int currentBrightness = qMax(0, (int)(Solid::Control::PowerManager::brightness() - 10));
-    Solid::Control::PowerManager::setBrightness(currentBrightness);
+    int currentBrightness = (int) Solid::Control::PowerManager::brightness();
+    if ((currentBrightness == d->cachedBrightness) && !d->brightnessInHardware)
+    {
+        int newBrightness;
+        if (increase) {
+            newBrightness = qMin(100, currentBrightness + 10);
+        }
+        else {
+            newBrightness = qMax(0, currentBrightness - 10);
+        }
+
+        Solid::Control::PowerManager::setBrightness(newBrightness);
+        currentBrightness = (int) Solid::Control::PowerManager::brightness();
+    }
+
+    if (!d->brightnessInHardware) {
+        emitBrightnessChanged(currentBrightness, true);
+    }
 }
 
-void PowerDevilDaemon::increaseBrightness()
+void PowerDevilDaemon::decreaseBrightness()
 {
-    if (!checkIfCurrentSessionActive()) {
-        return;
-    }
+    incDecBrightness(false);
+}
 
-    int currentBrightness = qMin(100, (int)(Solid::Control::PowerManager::brightness() + 10));
-    Solid::Control::PowerManager::setBrightness(currentBrightness);
+void PowerDevilDaemon::increaseBrightness()
+{
+    incDecBrightness(true);
 }
 
 void PowerDevilDaemon::shutdownNotification(bool automated)
@@ -1463,4 +1507,17 @@ void PowerDevilDaemon::setUpConsoleKit()
                                          SLOT(refreshStatus()));
 }
 
+void PowerDevilDaemon::notifyOfBrightnessChange(int brightness)
+{
+    emitBrightnessChanged(brightness, false);
+}
+
+void PowerDevilDaemon::emitBrightnessChanged(int brightness, bool byFnKey)
+{
+    if ((d->cachedBrightness != brightness) || byFnKey) {
+        d->cachedBrightness = brightness;
+        emit brightnessChanged(brightness, byFnKey);
+    }
+}
+
 #include "PowerDevilDaemon.moc"
diff -up kdebase-workspace-4.3.85/powerdevil/daemon/PowerDevilDaemon.h.brightness_keys kdebase-workspace-4.3.85/powerdevil/daemon/PowerDevilDaemon.h
--- kdebase-workspace-4.3.85/powerdevil/daemon/PowerDevilDaemon.h.brightness_keys	2009-11-30 18:30:27.000000000 -0600
+++ kdebase-workspace-4.3.85/powerdevil/daemon/PowerDevilDaemon.h	2009-12-18 10:00:30.643567133 -0600
@@ -61,10 +61,13 @@ public Q_SLOTS:
 
     SuspensionLockHandler *lockHandler();
 
+    void notifyOfBrightnessChange(int brightness);
+
 private Q_SLOTS:
     void acAdapterStateChanged(int state, bool forced = false);
     void batteryChargePercentChanged(int percent, const QString &udi);
 
+    void incDecBrightness(bool increase);
     void decreaseBrightness();
     void increaseBrightness();
 
@@ -106,6 +109,7 @@ Q_SIGNALS:
     void stateChanged(int, bool);
     void profileChanged(const QString &, const QStringList &);
     void DPMSconfigUpdated();
+    void brightnessChanged(int brightness, bool byFnKey);
 
 private:
     void lockScreen();
@@ -127,6 +131,8 @@ private:
 
     bool checkIfCurrentSessionActive();
 
+    void emitBrightnessChanged(int brightness, bool byFnKey);
+
 public:
     enum IdleAction {
         None = 0,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	1 Dec 2009 15:23:46 -0000	1.43
+++ .cvsignore	18 Dec 2009 16:04:37 -0000	1.44
@@ -1 +1 @@
-kdebase-workspace-4.3.80.tar.bz2
+kdebase-workspace-4.3.85.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -p -r1.329 -r1.330
--- kdebase-workspace.spec	16 Dec 2009 12:35:23 -0000	1.329
+++ kdebase-workspace.spec	18 Dec 2009 16:04:38 -0000	1.330
@@ -1,3 +1,4 @@
+
 %if 0%{?fedora} && 0%{?fedora} < 12
 %define with_polkit_09 1
 %endif
@@ -5,14 +6,14 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: KDE Workspace
-Name: kdebase-workspace
-Version: 4.3.80
-Release: 5%{?dist}
+Name:    kdebase-workspace
+Version: 4.3.85
+Release: 1%{?dist}
 
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
-Group: User Interface/Desktops
-URL: http://www.kde.org/
+Group:   User Interface/Desktops
+URL:     http://www.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdebase-workspace-4.3.75-redhat-startkde.patch
@@ -36,7 +37,6 @@ Patch16: kdebase-workspace-4.3.75-batter
 # default Leave submenu
 Patch17: kdebase-workspace-4.3.75-classicmenu-logout.patch
 # Fix the version
-Patch18: kdebase-workspace-4.3.80-cmake-targets.patch
 Patch19: kdebase-workspace-4.3.3-kdm_plymouth.patch
 Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
 
@@ -46,7 +46,7 @@ Patch50: kdebase-workspace-4.3.3-kde#171
 # kubuntu working to upstream this
 # FIXME: Not upstreamed yet --Ben (4.3.80)
 #Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/annotate/head%3A/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff
-Patch51: kdebase-workspace-4.3.80-brightness-keys.patch
+Patch51: kdebase-workspace-4.3.85-brightness_keys.patch
 
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
@@ -273,7 +273,6 @@ Requires: akonadi
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
-%patch18 -p1 -b .cmake-targets
 %patch19 -p1 -b .kdm_plymouth
 %patch20 -p1 -b .xsession_errors_O_APPEND
 
@@ -615,6 +614,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-5
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	1 Dec 2009 15:23:46 -0000	1.51
+++ sources	18 Dec 2009 16:04:38 -0000	1.52
@@ -1 +1 @@
-68177b5c0dd8ab4bebe682393871f82c  kdebase-workspace-4.3.80.tar.bz2
+b727b668858a4ddbe4649643f62ebd4a  kdebase-workspace-4.3.85.tar.bz2


--- kdebase-workspace-4.3.80-brightness-keys.patch DELETED ---


--- kdebase-workspace-4.3.80-cmake-targets.patch DELETED ---



From than at fedoraproject.org  Fri Dec 18 16:08:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 18 Dec 2009 16:08:54 +0000 (UTC)
Subject: rpms/doxygen/devel doxygen.spec,1.71,1.72
Message-ID: <20091218160854.B56DB11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23737

Modified Files:
	doxygen.spec 
Log Message:
- drop _default_patch_fuzz



Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- doxygen.spec	18 Dec 2009 14:21:29 -0000	1.71
+++ doxygen.spec	18 Dec 2009 16:08:54 -0000	1.72
@@ -1,9 +1,7 @@
-%define _default_patch_fuzz 2
-
 Summary: A documentation system for C/C++
 Name: doxygen
 Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
@@ -98,6 +96,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/doxywizard*
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 1:1.6.1-4
+- drop _default_patch_fuzz
+
 * Fri Dec 18 2009 Than Ngo <than at redhat.com> - 1:1.6.1-3
 - bz#225709, merged review
 



From mtasaka at fedoraproject.org  Fri Dec 18 16:09:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 18 Dec 2009 16:09:27 +0000 (UTC)
Subject: File marc-0.3.3.gem uploaded to lookaside cache by mtasaka
Message-ID: <20091218160927.8038728ED24@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rubygem-marc:

15ecaf3858ab36d5cd43d00344bad64f  marc-0.3.3.gem



From mtasaka at fedoraproject.org  Fri Dec 18 16:10:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 18 Dec 2009 16:10:21 +0000 (UTC)
Subject: rpms/rubygem-marc/F-11 .cvsignore, 1.3, 1.4 rubygem-marc.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20091218161021.144FA11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-marc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24216/F-11

Modified Files:
	.cvsignore rubygem-marc.spec sources 
Log Message:
* Sat Dec 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.3-1
- 0.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Dec 2009 06:52:46 -0000	1.3
+++ .cvsignore	18 Dec 2009 16:10:20 -0000	1.4
@@ -1 +1 @@
-marc-0.3.1.gem
+marc-0.3.3.gem


Index: rubygem-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-11/rubygem-marc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-marc.spec	15 Dec 2009 06:52:47 -0000	1.2
+++ rubygem-marc.spec	18 Dec 2009 16:10:20 -0000	1.3
@@ -7,7 +7,7 @@
 %global		rubyabi		1.8
 
 Name:		rubygem-%{gemname}
-Version:	0.3.1
+Version:	0.3.3
 Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
@@ -162,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.3-1
+- 0.3.3
+
 * Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
 - 0.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Dec 2009 06:52:47 -0000	1.3
+++ sources	18 Dec 2009 16:10:20 -0000	1.4
@@ -1 +1 @@
-295f344ef93e06603da719becb5c0462  marc-0.3.1.gem
+15ecaf3858ab36d5cd43d00344bad64f  marc-0.3.3.gem



From mtasaka at fedoraproject.org  Fri Dec 18 16:10:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 18 Dec 2009 16:10:21 +0000 (UTC)
Subject: rpms/rubygem-marc/F-12 .cvsignore, 1.3, 1.4 rubygem-marc.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20091218161021.5410F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-marc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24216/F-12

Modified Files:
	.cvsignore rubygem-marc.spec sources 
Log Message:
* Sat Dec 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.3-1
- 0.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Dec 2009 06:52:47 -0000	1.3
+++ .cvsignore	18 Dec 2009 16:10:21 -0000	1.4
@@ -1 +1 @@
-marc-0.3.1.gem
+marc-0.3.3.gem


Index: rubygem-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-12/rubygem-marc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-marc.spec	15 Dec 2009 06:52:47 -0000	1.2
+++ rubygem-marc.spec	18 Dec 2009 16:10:21 -0000	1.3
@@ -7,7 +7,7 @@
 %global		rubyabi		1.8
 
 Name:		rubygem-%{gemname}
-Version:	0.3.1
+Version:	0.3.3
 Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
@@ -162,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.3-1
+- 0.3.3
+
 * Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
 - 0.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Dec 2009 06:52:47 -0000	1.3
+++ sources	18 Dec 2009 16:10:21 -0000	1.4
@@ -1 +1 @@
-295f344ef93e06603da719becb5c0462  marc-0.3.1.gem
+15ecaf3858ab36d5cd43d00344bad64f  marc-0.3.3.gem



From mtasaka at fedoraproject.org  Fri Dec 18 16:10:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 18 Dec 2009 16:10:21 +0000 (UTC)
Subject: rpms/rubygem-marc/devel .cvsignore, 1.3, 1.4 rubygem-marc.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091218161021.8272E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-marc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24216/devel

Modified Files:
	.cvsignore rubygem-marc.spec sources 
Log Message:
* Sat Dec 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.3-1
- 0.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Dec 2009 06:52:47 -0000	1.3
+++ .cvsignore	18 Dec 2009 16:10:21 -0000	1.4
@@ -1 +1 @@
-marc-0.3.1.gem
+marc-0.3.3.gem


Index: rubygem-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/devel/rubygem-marc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-marc.spec	15 Dec 2009 06:52:47 -0000	1.2
+++ rubygem-marc.spec	18 Dec 2009 16:10:21 -0000	1.3
@@ -7,7 +7,7 @@
 %global		rubyabi		1.8
 
 Name:		rubygem-%{gemname}
-Version:	0.3.1
+Version:	0.3.3
 Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
@@ -162,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.3-1
+- 0.3.3
+
 * Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.1-1
 - 0.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-marc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Dec 2009 06:52:47 -0000	1.3
+++ sources	18 Dec 2009 16:10:21 -0000	1.4
@@ -1 +1 @@
-295f344ef93e06603da719becb5c0462  marc-0.3.1.gem
+15ecaf3858ab36d5cd43d00344bad64f  marc-0.3.3.gem



From than at fedoraproject.org  Fri Dec 18 16:13:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 18 Dec 2009 16:13:49 +0000 (UTC)
Subject: rpms/doxygen/F-12 doxygen.spec,1.72,1.73
Message-ID: <20091218161349.47B3911C00E7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23945

Modified Files:
	doxygen.spec 
Log Message:
- drop _default_patch_fuzz



Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-12/doxygen.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- doxygen.spec	18 Dec 2009 13:24:35 -0000	1.72
+++ doxygen.spec	18 Dec 2009 16:13:48 -0000	1.73
@@ -1,9 +1,7 @@
-%define _default_patch_fuzz 2
-
 Summary: A documentation system for C/C++
 Name: doxygen
 Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
@@ -98,6 +96,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/doxywizard*
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 1:1.6.1-4
+- drop _default_patch_fuzz
+
 * Fri Dec 18 2009 Than Ngo <than at redhat.com> - 1:1.6.1-3
 - bz#225709, merged review
 



From leigh123linux at fedoraproject.org  Fri Dec 18 16:16:13 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 18 Dec 2009 16:16:13 +0000 (UTC)
Subject: File qbittorrent-2.0.2.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091218161613.30C4828ED23@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qbittorrent:

94dfa2a217ea3b0829e2366558246563  qbittorrent-2.0.2.tar.gz



From leigh123linux at fedoraproject.org  Fri Dec 18 16:19:42 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 18 Dec 2009 16:19:42 +0000 (UTC)
Subject: rpms/qbittorrent/devel gcc.patch, NONE, 1.1 .cvsignore, 1.32,
	1.33 qbittorrent.spec, 1.58, 1.59 sources, 1.33, 1.34
Message-ID: <20091218161942.D395611C00E7@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26031

Modified Files:
	.cvsignore qbittorrent.spec sources 
Added Files:
	gcc.patch 
Log Message:
* Fri Dec 18 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-1
- update to 2.0.2
- add gcc patch to fix #548491


gcc.patch:
 src.pro |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gcc.patch ---
diff -up qbittorrent-2.0.2/src/src.pro.no_var_tracking qbittorrent-2.0.1/src/src.pro
--- qbittorrent-2.0.2/src/src.pro.no_var_tracking       2009-12-12 16:57:56.000000000 -0600
+++ qbittorrent-2.0.2/src/src.pro       2009-12-17 09:16:48.422765515 -0600
@@ -11,6 +11,7 @@ TARGET = qbittorrent
 CONFIG += qt \
     thread
 
+QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
 # Update this VERSION for each release
 DEFINES += VERSION=\\\"v2.0.2\\\"
 DEFINES += VERSION_MAJOR=2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	10 Dec 2009 19:56:13 -0000	1.32
+++ .cvsignore	18 Dec 2009 16:19:42 -0000	1.33
@@ -1 +1 @@
-qbittorrent-2.0.0.tar.gz
+qbittorrent-2.0.2.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- qbittorrent.spec	15 Dec 2009 13:58:03 -0000	1.58
+++ qbittorrent.spec	18 Dec 2009 16:19:42 -0000	1.59
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -11,6 +11,8 @@ Release: 1%{?dist}
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 #Source0:  %{name}-%{svn_rev}svn.tar.gz
 Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
+# https://bugzilla.redhat.com/show_bug.cgi?id=548491
+Patch1:  gcc.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
@@ -32,6 +34,7 @@ It aims to be as fast as possible and to
 
 %prep
 %setup -q
+%patch1 -p1 -b .gcc
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -73,6 +76,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Fri Dec 18 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-1
+- update to 2.0.2
+- add gcc patch to fix #548491
+
 * Mon Dec 14 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.1-1
 - update to 2.0.1
 - clean up spec file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	15 Dec 2009 13:58:03 -0000	1.33
+++ sources	18 Dec 2009 16:19:42 -0000	1.34
@@ -1 +1 @@
-2072e200ba861035c874ff1c8392809b  qbittorrent-2.0.1.tar.gz
+94dfa2a217ea3b0829e2366558246563  qbittorrent-2.0.2.tar.gz



From rstrode at fedoraproject.org  Fri Dec 18 16:20:14 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 18 Dec 2009 16:20:14 +0000 (UTC)
Subject: rpms/nautilus/F-12
	nautilus-2.28.1-tracker-0.7-failed-connection.patch, 1.1,
	NONE nautilus-2.28.2-infopanel-selection-crash.patch, 1.1,
	NONE nautilus-2.28.2-listview-unfreeze-after-rename.patch, 1.1,
	NONE nautilus-2.5.7-rhconfig.patch, 1.1, NONE
Message-ID: <20091218162014.30AE111C00E7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/nautilus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26237

Removed Files:
	nautilus-2.28.1-tracker-0.7-failed-connection.patch 
	nautilus-2.28.2-infopanel-selection-crash.patch 
	nautilus-2.28.2-listview-unfreeze-after-rename.patch 
	nautilus-2.5.7-rhconfig.patch 
Log Message:
drop unused patches



--- nautilus-2.28.1-tracker-0.7-failed-connection.patch DELETED ---


--- nautilus-2.28.2-infopanel-selection-crash.patch DELETED ---


--- nautilus-2.28.2-listview-unfreeze-after-rename.patch DELETED ---


--- nautilus-2.5.7-rhconfig.patch DELETED ---



From mclasen at fedoraproject.org  Fri Dec 18 16:21:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 16:21:09 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel osd-spam.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.132, 1.133
Message-ID: <20091218162109.519B411C00E7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26068

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	osd-spam.patch 
Log Message:
avoid warning messages at startup


osd-spam.patch:
 gsd-media-keys-window.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE osd-spam.patch ---
diff -up gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c.spam gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c
--- gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c.spam	2009-12-18 10:32:07.722360259 -0500
+++ gnome-settings-daemon-2.28.1/plugins/media-keys/gsd-media-keys-window.c	2009-12-18 10:33:00.923109059 -0500
@@ -134,6 +134,9 @@ add_hide_timeout (GsdMediaKeysWindow *wi
 static void
 update_window (GsdMediaKeysWindow *window)
 {
+        if (!gtk_widget_is_drawable (GTK_WIDGET (window)))
+                return;
+
         remove_hide_timeout (window);
         add_hide_timeout (window);
 


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- gnome-settings-daemon.spec	15 Dec 2009 21:43:26 -0000	1.132
+++ gnome-settings-daemon.spec	18 Dec 2009 16:21:09 -0000	1.133
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -50,6 +50,9 @@ Patch7: iconleak.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=604651
 Patch8: survive-xmm.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604918
+Patch9: osd-spam.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -76,6 +79,7 @@ developing applications that use %{name}
 %patch6 -p1 -b .screen-change
 %patch7 -p1 -b .iconleak
 %patch8 -p1 -b .survive-xmm
+%patch9 -p1 -b .osd-spam
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -187,6 +191,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Dec 18 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-10
+- Avoid warning messages from the OSD code
+
 * Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-9
 - Survive when running without XKB (#547780)
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:22:49 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:22:49 +0000 (UTC)
Subject: File 389-admin-1.1.10.a1.tar.bz2 uploaded to lookaside cache by
	rmeggins
Message-ID: <20091218162249.191C628ED24@bastion.fedoraproject.org>

A file has been added to the lookaside cache for 389-admin:

b0fb7b83b06513cbe9b31c6195ea5202  389-admin-1.1.10.a1.tar.bz2



From leigh123linux at fedoraproject.org  Fri Dec 18 16:23:27 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 18 Dec 2009 16:23:27 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 gcc.patch, NONE, 1.1 qbittorrent.spec, 1.43, 
	1.44 sources, 1.21, 1.22
Message-ID: <20091218162327.3657211C00E7@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26887

Modified Files:
	qbittorrent.spec sources 
Added Files:
	gcc.patch 
Log Message:
* Fri Dec 18 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-1
- update to 2.0.2
- add gcc patch to fix #548491


gcc.patch:
 src.pro |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gcc.patch ---
diff -up qbittorrent-2.0.2/src/src.pro.no_var_tracking qbittorrent-2.0.1/src/src.pro
--- qbittorrent-2.0.2/src/src.pro.no_var_tracking       2009-12-12 16:57:56.000000000 -0600
+++ qbittorrent-2.0.2/src/src.pro       2009-12-17 09:16:48.422765515 -0600
@@ -11,6 +11,7 @@ TARGET = qbittorrent
 CONFIG += qt \
     thread
 
+QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
 # Update this VERSION for each release
 DEFINES += VERSION=\\\"v2.0.2\\\"
 DEFINES += VERSION_MAJOR=2




Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- qbittorrent.spec	14 Dec 2009 10:06:00 -0000	1.43
+++ qbittorrent.spec	18 Dec 2009 16:23:26 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -11,6 +11,8 @@ Release: 1%{?dist}
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 #Source0:  %{name}-%{svn_rev}svn.tar.gz
 Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
+# https://bugzilla.redhat.com/show_bug.cgi?id=548491
+Patch1:  gcc.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
@@ -30,6 +32,7 @@ It aims to be as fast as possible and to
 
 %prep
 %setup -q
+%patch1 -p1 -b .gcc
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -71,6 +74,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Fri Dec 18 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-1
+- update to 2.0.2
+- add gcc patch to fix #548491
+
 * Mon Dec 14 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.1-1
 - update to 2.0.1
 - clean up spec file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	14 Dec 2009 10:06:00 -0000	1.21
+++ sources	18 Dec 2009 16:23:26 -0000	1.22
@@ -1 +1 @@
-2072e200ba861035c874ff1c8392809b  qbittorrent-2.0.1.tar.gz
+94dfa2a217ea3b0829e2366558246563  qbittorrent-2.0.2.tar.gz



From rmeggins at fedoraproject.org  Fri Dec 18 16:24:24 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:24:24 +0000 (UTC)
Subject: rpms/389-admin/F-11 .cvsignore, 1.3, 1.4 389-admin-git-local.sh, 1.1,
	1.2 389-admin-git.sh, 1.1, 1.2 389-admin.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <20091218162424.60B9011C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27148

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
this is the 1.1.10.a1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 15:50:26 -0000	1.3
+++ .cvsignore	18 Dec 2009 16:24:23 -0000	1.4
@@ -1 +1 @@
-389-admin-1.1.9.tar.bz2
+389-admin-1.1.10.a1.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin-git-local.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git-local.sh	7 Oct 2009 15:50:26 -0000	1.1
+++ 389-admin-git-local.sh	18 Dec 2009 16:24:24 -0000	1.2
@@ -1,18 +1,15 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=389-admin-1.1.9
-CVSTAG=three89Admin_1_1_9
-VERSION=1.1.9
+VERSION=1.1.10.a1
 PKGNAME=389-admin
+TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
-CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 echo you must be in the admin server git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {echo bye ; exit 1 }
 if [ -z "$1" ] ; then
 	dir=.
 else
 	dir="$1"
 fi
-git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME )
-rm -rf $dir/$SRCNAME
+git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin-git.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git.sh	23 Jun 2009 02:39:41 -0000	1.1
+++ 389-admin-git.sh	18 Dec 2009 16:24:24 -0000	1.2
@@ -1,22 +1,16 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=HEAD
-VERSION=1.1.7
+VERSION=1.1.10.a1
 PKGNAME=389-admin
-export URL=git://git.fedorahosted.org/git/389/admin.git
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
+TAG=${PKGNAME}-${VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz"
 
-git clone $URL
-cd admin.git
-git archive --prefix=$SRCNAME/ $TAG | bzip2 > $SRCNAME.tar.bz2
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME adminserver
-#cd $SRCNAME
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd
-#cd ..
+wget -O $SRCNAME.tar.gz "$URL"
 
-#tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-cd ..
-rm -rf admin.git
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.6
+++ 389-admin.spec	18 Dec 2009 16:24:24 -0000	1.7
@@ -1,9 +1,13 @@
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .a1
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.9
-Release:          1%{?dist}
+Version:          1.1.10
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -34,7 +38,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-admin-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Patch1:           f11-httpd.patch
@@ -46,7 +50,7 @@ be used through a web browser.  It provi
 and CGI utilities used by the console.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 %patch1
 
 %build
@@ -153,6 +157,9 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Thu Oct  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a1-1
+- the 1.1.10.a1 release
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
 - the 1.1.9 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Oct 2009 15:50:27 -0000	1.5
+++ sources	18 Dec 2009 16:24:24 -0000	1.6
@@ -1 +1 @@
-1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2
+b0fb7b83b06513cbe9b31c6195ea5202  389-admin-1.1.10.a1.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 16:24:38 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:24:38 +0000 (UTC)
Subject: rpms/389-admin/F-12 .cvsignore, 1.3, 1.4 389-admin-git-local.sh, 1.1,
	1.2 389-admin-git.sh, 1.1, 1.2 389-admin.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20091218162438.1C11911C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27200

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
this is the 1.1.10.a1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 15:50:27 -0000	1.3
+++ .cvsignore	18 Dec 2009 16:24:37 -0000	1.4
@@ -1 +1 @@
-389-admin-1.1.9.tar.bz2
+389-admin-1.1.10.a1.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin-git-local.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git-local.sh	7 Oct 2009 15:50:27 -0000	1.1
+++ 389-admin-git-local.sh	18 Dec 2009 16:24:37 -0000	1.2
@@ -1,18 +1,15 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=389-admin-1.1.9
-CVSTAG=three89Admin_1_1_9
-VERSION=1.1.9
+VERSION=1.1.10.a1
 PKGNAME=389-admin
+TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
-CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 echo you must be in the admin server git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {echo bye ; exit 1 }
 if [ -z "$1" ] ; then
 	dir=.
 else
 	dir="$1"
 fi
-git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME )
-rm -rf $dir/$SRCNAME
+git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin-git.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git.sh	23 Jun 2009 02:36:44 -0000	1.1
+++ 389-admin-git.sh	18 Dec 2009 16:24:37 -0000	1.2
@@ -1,22 +1,16 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=HEAD
-VERSION=1.1.7
+VERSION=1.1.10.a1
 PKGNAME=389-admin
-export URL=git://git.fedorahosted.org/git/389/admin.git
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
+TAG=${PKGNAME}-${VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz"
 
-git clone $URL
-cd admin.git
-git archive --prefix=$SRCNAME/ $TAG | bzip2 > $SRCNAME.tar.bz2
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME adminserver
-#cd $SRCNAME
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd
-#cd ..
+wget -O $SRCNAME.tar.gz "$URL"
 
-#tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-cd ..
-rm -rf admin.git
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.8
+++ 389-admin.spec	18 Dec 2009 16:24:37 -0000	1.9
@@ -1,9 +1,13 @@
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .a1
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.9
-Release:          1%{?dist}
+Version:          1.1.10
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -34,7 +38,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-admin-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Patch1:           f11-httpd.patch
@@ -46,7 +50,7 @@ be used through a web browser.  It provi
 and CGI utilities used by the console.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 %patch1
 
 %build
@@ -153,6 +157,9 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Thu Oct  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a1-1
+- the 1.1.10.a1 release
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
 - the 1.1.9 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Oct 2009 15:50:27 -0000	1.6
+++ sources	18 Dec 2009 16:24:37 -0000	1.7
@@ -1 +1 @@
-1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2
+b0fb7b83b06513cbe9b31c6195ea5202  389-admin-1.1.10.a1.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 16:24:47 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:24:47 +0000 (UTC)
Subject: rpms/389-admin/devel .cvsignore, 1.3, 1.4 389-admin-git-local.sh,
	1.1, 
	1.2 389-admin-git.sh, 1.1, 1.2 389-admin.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20091218162447.C1D0311C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27273

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
this is the 1.1.10.a1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 15:50:27 -0000	1.3
+++ .cvsignore	18 Dec 2009 16:24:47 -0000	1.4
@@ -1 +1 @@
-389-admin-1.1.9.tar.bz2
+389-admin-1.1.10.a1.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin-git-local.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git-local.sh	7 Oct 2009 15:50:27 -0000	1.1
+++ 389-admin-git-local.sh	18 Dec 2009 16:24:47 -0000	1.2
@@ -1,18 +1,15 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=389-admin-1.1.9
-CVSTAG=three89Admin_1_1_9
-VERSION=1.1.9
+VERSION=1.1.10.a1
 PKGNAME=389-admin
+TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
-CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 echo you must be in the admin server git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {echo bye ; exit 1 }
 if [ -z "$1" ] ; then
 	dir=.
 else
 	dir="$1"
 fi
-git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME )
-rm -rf $dir/$SRCNAME
+git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin-git.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git.sh	23 Jun 2009 02:36:44 -0000	1.1
+++ 389-admin-git.sh	18 Dec 2009 16:24:47 -0000	1.2
@@ -1,22 +1,16 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=HEAD
-VERSION=1.1.7
+VERSION=1.1.10.a1
 PKGNAME=389-admin
-export URL=git://git.fedorahosted.org/git/389/admin.git
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
+TAG=${PKGNAME}-${VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz"
 
-git clone $URL
-cd admin.git
-git archive --prefix=$SRCNAME/ $TAG | bzip2 > $SRCNAME.tar.bz2
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME adminserver
-#cd $SRCNAME
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd
-#cd ..
+wget -O $SRCNAME.tar.gz "$URL"
 
-#tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-cd ..
-rm -rf admin.git
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.8
+++ 389-admin.spec	18 Dec 2009 16:24:47 -0000	1.9
@@ -1,9 +1,13 @@
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .a1
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.9
-Release:          1%{?dist}
+Version:          1.1.10
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -34,7 +38,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-admin-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Patch1:           f11-httpd.patch
@@ -46,7 +50,7 @@ be used through a web browser.  It provi
 and CGI utilities used by the console.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 %patch1
 
 %build
@@ -153,6 +157,9 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Thu Oct  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a1-1
+- the 1.1.10.a1 release
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
 - the 1.1.9 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Oct 2009 15:50:27 -0000	1.6
+++ sources	18 Dec 2009 16:24:47 -0000	1.7
@@ -1 +1 @@
-1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2
+b0fb7b83b06513cbe9b31c6195ea5202  389-admin-1.1.10.a1.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 16:27:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:27:30 +0000 (UTC)
Subject: File kdeartwork-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218162730.6D99028ED24@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdeartwork:

4543535365696fadf3b086f8c1d963a0  kdeartwork-4.3.85.tar.bz2



From pkgdb at fedoraproject.org  Fri Dec 18 16:31:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 16:31:39 +0000
Subject: [pkgdb] gnome-commander had acl change status
Message-ID: <20091218163141.6356328ED3B@bastion.fedoraproject.org>

mtasaka has set the watchbugzilla acl on gnome-commander (Fedora devel) to Approved for epiotr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-commander



From rdieter at fedoraproject.org  Fri Dec 18 16:36:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:36:49 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore, 1.48, 1.49 kdepimlibs.spec, 1.111,
	1.112 sources, 1.46, 1.47
Message-ID: <20091218163649.215D511C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29872

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- 4.3.85 (4.4 beta2)
- tighten deps



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	2 Dec 2009 13:54:42 -0000	1.48
+++ .cvsignore	18 Dec 2009 16:36:48 -0000	1.49
@@ -1 +1 @@
-kdepimlibs-4.3.80.tar.bz2
+kdepimlibs-4.3.85.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- kdepimlibs.spec	16 Dec 2009 16:08:46 -0000	1.111
+++ kdepimlibs.spec	18 Dec 2009 16:36:48 -0000	1.112
@@ -1,10 +1,11 @@
+
 %define apidocs 1
 %define akonadi_subpkg 1
-%define akonadi_version 1.2.61
+%define akonadi_version 1.2.80
 
 Name: kdepimlibs
-Version: 4.3.80
-Release: 2%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 Summary: KDE PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -16,10 +17,11 @@ Source0: ftp://ftp.kde.org/pub/kde/unsta
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
-Provides: %{name}-akonadi%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-akonadi < %{version}-%{release}
+Provides:  %{name}-akonadi = %{version}-%{release}
 Requires: akonadi%{?_isa} >= %{akonadi_version}
 %endif
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 
 BuildRequires: akonadi-devel >= %{akonadi_version}
 BuildRequires: boost-devel
@@ -47,7 +49,7 @@ Group:    Development/Libraries
 Summary:  Development files for %{name}
 Requires: %{name} = %{version}-%{release}
 %if 0%{?akonadi_subpkg}
-Requires: %{name}-akonadi = %{version}-%{release}
+Requires: %{name}-akonadi%{?_isa} = %{version}-%{release}
 %endif
 Obsoletes: kdepimlibs4-devel < %{version}-%{release}
 Provides:  kdepimlibs4-devel = %{version}-%{release}
@@ -56,7 +58,7 @@ Requires: boost-devel
 # FIXME/HACK, bogus dep -- Rex
 # Is this still needed now that we have "reduced link interfaces"? I think
 # users of libkcal no longer try to link in libical.so now. -- Kevin
-Requires: libical-devel
+#Requires: libical-devel
 
 %description devel
 Header files for developing applications using %{name}.
@@ -66,7 +68,7 @@ Summary: Akonadi runtime support for %{n
 Group: System Environment/Libraries
 # when pkg split occurrs, not sure if this is really needed, but... -- Rex
 #Obsoletes: kdepimlibs < 4.2.0-3
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: akonadi%{?_isa} >= %{akonadi_version}
 %description akonadi
 %{summary}.
@@ -182,11 +184,7 @@ rm -rf %{buildroot}
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/lib*.so
-%if "%{?_cmake_version}" > "2.6.2"
 %{_kde4_libdir}/cmake/KdepimLibs*
-%else
-%{_kde4_libdir}/KdepimLibs*
-%endif
 %{_kde4_libdir}/gpgmepp/
 
 %if 0%{?apidocs}
@@ -197,6 +195,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- 4.3.85 (4.4 beta2)
+- tighten deps
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	2 Dec 2009 13:54:42 -0000	1.46
+++ sources	18 Dec 2009 16:36:48 -0000	1.47
@@ -1 +1 @@
-e7dee79a6ca9393ef9fdbcdd0614e611  kdepimlibs-4.3.80.tar.bz2
+b93ec318798eaa7ccceb622310b66211  kdepimlibs-4.3.85.tar.bz2



From maxamillion at fedoraproject.org  Fri Dec 18 16:36:49 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 18 Dec 2009 16:36:49 +0000 (UTC)
Subject: rpms/pybackpack/devel pybackpack-backupset-0.5.7.patch, NONE,
	1.1 import.log, 1.2, 1.3 pybackpack.spec, 1.12, 1.13
Message-ID: <20091218163649.2438E11C00EB@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29775/devel

Modified Files:
	import.log pybackpack.spec 
Added Files:
	pybackpack-backupset-0.5.7.patch 
Log Message:
Patch to fix 538193



pybackpack-backupset-0.5.7.patch:
 seteditor.glade |   25 +------------------------
 seteditor.py    |   40 +++++++++-------------------------------
 2 files changed, 10 insertions(+), 55 deletions(-)

--- NEW FILE pybackpack-backupset-0.5.7.patch ---
Index: pybackpack/seteditor.py
===================================================================
--- pybackpack/seteditor.py (revision 237)
+++ pybackpack/seteditor.py (working copy)
@@ -4,11 +4,9 @@
 import gtk.glade
 import gobject
 try:
-        import nautilusburn
+        import braseromedia
 except ImportError:
         pass
-else:
-        pass
 
 import backupsets
 import dialogs
@@ -48,6 +46,7 @@
         self.widgets.get_widget('cmb_dst_type').set_active(0)
         self.widgets.get_widget('notebook').set_current_page(0)
 
+        self.drive_sel = None
         self.find_cd_burners()
 
     def _new_column(self):
@@ -145,15 +144,7 @@
                 self.widgets.get_widget('entry_ssh_host').set_text(host)
                 self.widgets.get_widget('entry_ssh_path').set_text(path)
             elif buset.dest[:7] == "cdrw://":
-                device = buset.dest.replace("cdrw://", "")
                 self.widgets.get_widget('cmb_dst_type').set_active(1)
-                found = False
-                for row in self.widgets.get_widget('cmb_dst_burner').get_model():
-                    if row[1].get_device() == device:
-                        self.widgets.get_widget('cmb_dst_burner').set_active_iter(row.iter)
-                        found = True
-                if not found:
-                    self.widgets.get_widget('cmb_dst_burner').set_active(0)
             else:
                 self.widgets.get_widget('cmb_dst_type').set_active(0)
                 self.widgets.get_widget('entry_new_set_def_dest').set_text(buset.dest)
@@ -240,9 +231,9 @@
             self.widgets.get_widget('druid_summary_dest').set_text("sftp://%s@%s%s" % (user, host, path))
 
         elif self.widgets.get_widget('cmb_dst_type').get_active() == 1: # CD burner
-            if self.widgets.get_widget('cmb_dst_burner').get_active() == -1:
+            if self.drive_sel is None:
                 return True
-            dest = self.widgets.get_widget('cmb_dst_burner').get_model()[self.widgets.get_widget('cmb_dst_burner').get_active()][1].get_device()
+            dest = self.drive_sel.get_active().get_block_device()
             self.widgets.get_widget('druid_summary_dest').set_text("cdrw://%s" % dest)
             self.widgets.get_widget('chk_removable_device').set_active(True)
         self.widgets.get_widget('druid_page_3').set_title(_("Add Files/Folders to '%s'") % self.widgets.get_widget('entry_new_set_name').get_text())
@@ -284,9 +275,6 @@
     def filechosen_new_set_default_dest(self, filename):
         self.widgets.get_widget('entry_new_set_def_dest').set_text(filename)
 
-    def on_button_refresh_cd_burners_clicked(self, widget):
-        self.find_cd_burners()
-
     def on_druid_page_finish_prepare(self, widget, event):
         event.set_buttons_sensitive(False, False, False, False)
                 
@@ -365,26 +353,16 @@
 
         """ Populate a combo box with the names of available CD/DVD drives """
         try:
-            nautilusburn
+            braseromedia
         except NameError:
             error_string = _("No CD burners available, because you do not have the python module \
-nautilusburn.")
+braseromedia.")
             self.widgets.get_widget('lbl_cd_burner').set_text(error_string)
-            self.widgets.get_widget('cmb_dst_burner').set_sensitive(False)
         else:
-            sel = nautilusburn.DriveSelection()
-            self.widgets.get_widget('cmb_dst_burner').set_model(sel.get_model())
+            self.drive_sel = braseromedia.DriveSelection()
+            self.widgets.get_widget('hbox30').add(self.drive_sel)
+            self.drive_sel.show()
 
-            if len(sel.get_model()) == 0:
-                error_string = _("No CD burners were detected on your system.")
-                self.widgets.get_widget('lbl_cd_burner').set_text(error_string)
-                self.widgets.get_widget('cmb_dst_burner').set_sensitive(False)
-            else:
-                msg_string = _("Select which CD burner to use:")
-                self.widgets.get_widget('lbl_cd_burner').set_text(msg_string)
-                self.widgets.get_widget('cmb_dst_burner').set_active(0)
-                self.widgets.get_widget('cmb_dst_burner').set_sensitive(True)
-
     def on_hiddenfiles_toggled(self, event):
         fc = self.widgets.get_widget('filechooserwidget1')
         fc.set_show_hidden(event.get_active())
Index: pybackpack/seteditor.glade
===================================================================
--- pybackpack/seteditor.glade  (revision 237)
+++ pybackpack/seteditor.glade  (working copy)
@@ -438,31 +438,8 @@
                                               <widget class="GtkHBox" id="hbox30">
                                                 <property name="visible">True</property>
                                                 <child>
-                                                  <widget class="GtkComboBox" id="cmb_dst_burner">
-                                                    <property name="visible">True</property>
-                                                    <property name="items" translatable="yes"></property>
-                                                  </widget>
+                           <placeholder/>
                                                 </child>
-                                                <child>
-                                                  <widget class="GtkButton" id="button2_refresh_cd_burners">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="focus_on_click">False</property>
-                                                    <property name="response_id">0</property>
-                                                    <signal name="clicked" handler="on_button_refresh_cd_burners_clicked"/>
-                                                    <child>
-                                                      <widget class="GtkImage" id="image26">
-                                                        <property name="visible">True</property>
-                                                        <property name="stock">gtk-refresh</property>
-                                                      </widget>
-                                                    </child>
-                                                  </widget>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
                                               </widget>
                                               <packing>
                                                 <property name="fill">False</property>



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	26 Sep 2008 20:14:33 -0000	1.2
+++ import.log	18 Dec 2009 16:36:48 -0000	1.3
@@ -1,2 +1,3 @@
 pybackpack-0_5_5-1_fc9:HEAD:pybackpack-0.5.5-1.fc9.src.rpm:1221005806
 pybackpack-0_5_6-1_fc9:HEAD:pybackpack-0.5.6-1.fc9.src.rpm:1222459966
+pybackpack-0_5_7-2_fc12:HEAD:pybackpack-0.5.7-2.fc12.src.rpm:1261154163


Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pybackpack.spec	16 Dec 2009 20:27:18 -0000	1.12
+++ pybackpack.spec	18 Dec 2009 16:36:48 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: User oriented backup and restore application
 Name: pybackpack
 Version: 0.5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -25,12 +25,16 @@ Requires: gnome-python2-brasero
 Requires: rdiff-backup >= 1.0
 BuildArch:      noarch
 
+Patch0: pybackpack-backupset-0.5.7.patch
+
 %description
 A GTK+ tool written in Python to backup files.
 
 %prep
 %setup -q
 
+%patch0 -p0
+
 %build
 python setup.py build
 %install



From maxamillion at fedoraproject.org  Fri Dec 18 16:38:22 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 18 Dec 2009 16:38:22 +0000 (UTC)
Subject: rpms/pybackpack/devel pybackpack.spec,1.13,1.14
Message-ID: <20091218163822.73DF011C00E7@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30330

Modified Files:
	pybackpack.spec 
Log Message:
Forgot to add a changelog entry




Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pybackpack.spec	18 Dec 2009 16:36:48 -0000	1.13
+++ pybackpack.spec	18 Dec 2009 16:38:22 -0000	1.14
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec 18 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-2
+- Patch to supplement upstream release as a proposed solution to BZ 538193
+
 * Wed Dec 16 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-1
 - New release from upstream fixing cdburn bug (BZ# 538193)
 



From rdieter at fedoraproject.org  Fri Dec 18 16:40:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:40:38 +0000 (UTC)
Subject: File kdeaccessibility-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218164038.3B8C428ECE0@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdeaccessibility:

47486bbc8a35ed82fcce45f2f62ce6e8  kdeaccessibility-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 16:41:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:41:15 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.51,
	1.52 kdeaccessibility.spec, 1.98, 1.99 sources, 1.51, 1.52
Message-ID: <20091218164115.DE04211C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30953

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	1 Dec 2009 13:13:05 -0000	1.51
+++ .cvsignore	18 Dec 2009 16:41:15 -0000	1.52
@@ -1 +1 @@
-kdeaccessibility-4.3.80.tar.bz2
+kdeaccessibility-4.3.85.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- kdeaccessibility.spec	16 Dec 2009 09:06:51 -0000	1.98
+++ kdeaccessibility.spec	18 Dec 2009 16:41:15 -0000	1.99
@@ -1,8 +1,9 @@
+
 Summary:        KDE Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.80
-Release:        2%{?dist}
+Version:        4.3.85
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -144,6 +145,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	1 Dec 2009 13:13:06 -0000	1.51
+++ sources	18 Dec 2009 16:41:15 -0000	1.52
@@ -1 +1 @@
-e551da9e742bb0230dca51df2b1e78ce  kdeaccessibility-4.3.80.tar.bz2
+47486bbc8a35ed82fcce45f2f62ce6e8  kdeaccessibility-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 16:41:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:41:49 +0000 (UTC)
Subject: File kdeadmin-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218164149.8CE6928ECEB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdeadmin:

39c79bf70d04ebfa6d64329d068f7320  kdeadmin-4.3.85.tar.bz2



From ausil at fedoraproject.org  Fri Dec 18 16:43:26 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 18 Dec 2009 16:43:26 +0000 (UTC)
Subject: rpms/mock/EL-5
	0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch,
	NONE, 1.1 mock.spec, 1.42, 1.43
Message-ID: <20091218164326.D64BA11C00E7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mock/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31257

Modified Files:
	mock.spec 
Added Files:
	0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch 
Log Message:
make the /dev/ptmx node rather than symlink as ther symlink is broken on EL-5 resulting in unbuildable gcc gdb and freinds


0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch:
 backend.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch ---
>From 8e42cf66e3350adf829687ea284b74116931aab9 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Fri, 18 Dec 2009 10:32:51 -0600
Subject: [PATCH] EL-5 doesnt have a /dev/pts/ptmx node  it only has the actual /dev/ptmx one
 So lets make the node in the chroot.  as gcc, gdb and freinds are unbuildibale without it

---
 py/mock/backend.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/py/mock/backend.py b/py/mock/backend.py
index ef4d90b..97cd8e9 100644
--- a/py/mock/backend.py
+++ b/py/mock/backend.py
@@ -311,6 +311,7 @@ class Root(object):
             (stat.S_IFCHR | 0444, os.makedev(1, 9), "dev/urandom"),
             (stat.S_IFCHR | 0666, os.makedev(5, 0), "dev/tty"),
             (stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console"),
+            (stat.S_IFCHR | 0600, os.makedev(5, 2), "dev/ptmx"),
         )
         for i in devFiles:
             # create node
@@ -324,7 +325,6 @@ class Root(object):
         os.symlink("/proc/self/fd/0", self.makeChrootPath("dev/stdin"))
         os.symlink("/proc/self/fd/1", self.makeChrootPath("dev/stdout"))
         os.symlink("/proc/self/fd/2", self.makeChrootPath("dev/stderr"))
-        os.symlink("/dev/pts/ptmx", self.makeChrootPath("dev/ptmx"))
         os.umask(prevMask)
 
         # mount/umount
-- 
1.6.5.2



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- mock.spec	26 Nov 2009 05:20:52 -0000	1.42
+++ mock.spec	18 Dec 2009 16:43:26 -0000	1.43
@@ -11,10 +11,11 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
+Patch0: 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch
 URL: http://fedoraproject.org/wiki/Projects/Mock
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -27,6 +28,7 @@ Mock takes a srpm and builds it in a chr
 
 %prep
 %setup -q
+%patch0 -p1 
 %if "%{?dist}" == ".fc8"
 pushd etc/mock
 sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
@@ -97,6 +99,10 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Fri Dec 18 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1.1
+- patch to create /dev/ptmx rather than symlink it the symlink
+- is broken on EL-5
+
 * Wed Nov 25 2009 Clark Williams <williams at redhat.com>- 1.0.1-1
 - Patch from Paul Howarth to fix intermittent problems generating
   root cache tarball (BZ# 540997)



From rdieter at fedoraproject.org  Fri Dec 18 16:43:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:43:37 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore, 1.72, 1.73 kdeadmin.spec, 1.155,
	1.156 sources, 1.72, 1.73
Message-ID: <20091218164337.04FB111C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31456

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	1 Dec 2009 13:18:56 -0000	1.72
+++ .cvsignore	18 Dec 2009 16:43:36 -0000	1.73
@@ -1 +1 @@
-kdeadmin-4.3.80.tar.bz2
+kdeadmin-4.3.85.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kdeadmin.spec	14 Dec 2009 14:24:14 -0000	1.155
+++ kdeadmin.spec	18 Dec 2009 16:43:36 -0000	1.156
@@ -1,3 +1,4 @@
+
 %if 0%{?fedora}
 %define system_config_printer_kde 1
 %endif
@@ -7,8 +8,8 @@
 Name:           kdeadmin
 Summary:        KDE Administrative tools
 Epoch:          7
-Version:        4.3.80
-Release:        3%{?dist}
+Version:        4.3.85
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -65,11 +66,12 @@ a CUPS print server.
 
 
 %prep
-%setup -q -n kdeadmin-%{version}%{?alphatag}
+%setup -q -n kdeadmin-%{version}
 %patch0 -p1 -b .printing
 
 # upstream patches
 
+
 %build
 
 %if ! 0%{?system_config_printer_kde}
@@ -128,6 +130,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 fi
 %endif
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
@@ -171,6 +174,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Mon Dec 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
 - Repositioning the KDE Brand (#547361)
 - omit kpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	1 Dec 2009 13:18:56 -0000	1.72
+++ sources	18 Dec 2009 16:43:36 -0000	1.73
@@ -1 +1 @@
-47eedddda68a60f77dafbc3717e256c5  kdeadmin-4.3.80.tar.bz2
+39c79bf70d04ebfa6d64329d068f7320  kdeadmin-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 16:45:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:45:27 +0000 (UTC)
Subject: File kdebindings-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218164527.355EF28ECE0@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdebindings:

6c25d465c2544a199273975686ea8285  kdebindings-4.3.85.tar.bz2



From maxamillion at fedoraproject.org  Fri Dec 18 16:45:38 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 18 Dec 2009 16:45:38 +0000 (UTC)
Subject: rpms/pybackpack/F-12 pybackpack-backupset-0.5.7.patch, NONE,
	1.1 import.log, 1.2, 1.3 pybackpack.spec, 1.12, 1.13
Message-ID: <20091218164538.2E87111C00E7@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31888/F-12

Modified Files:
	import.log pybackpack.spec 
Added Files:
	pybackpack-backupset-0.5.7.patch 
Log Message:
Patch for BZ 538193



pybackpack-backupset-0.5.7.patch:
 seteditor.glade |   25 +------------------------
 seteditor.py    |   40 +++++++++-------------------------------
 2 files changed, 10 insertions(+), 55 deletions(-)

--- NEW FILE pybackpack-backupset-0.5.7.patch ---
Index: pybackpack/seteditor.py
===================================================================
--- pybackpack/seteditor.py (revision 237)
+++ pybackpack/seteditor.py (working copy)
@@ -4,11 +4,9 @@
 import gtk.glade
 import gobject
 try:
-        import nautilusburn
+        import braseromedia
 except ImportError:
         pass
-else:
-        pass
 
 import backupsets
 import dialogs
@@ -48,6 +46,7 @@
         self.widgets.get_widget('cmb_dst_type').set_active(0)
         self.widgets.get_widget('notebook').set_current_page(0)
 
+        self.drive_sel = None
         self.find_cd_burners()
 
     def _new_column(self):
@@ -145,15 +144,7 @@
                 self.widgets.get_widget('entry_ssh_host').set_text(host)
                 self.widgets.get_widget('entry_ssh_path').set_text(path)
             elif buset.dest[:7] == "cdrw://":
-                device = buset.dest.replace("cdrw://", "")
                 self.widgets.get_widget('cmb_dst_type').set_active(1)
-                found = False
-                for row in self.widgets.get_widget('cmb_dst_burner').get_model():
-                    if row[1].get_device() == device:
-                        self.widgets.get_widget('cmb_dst_burner').set_active_iter(row.iter)
-                        found = True
-                if not found:
-                    self.widgets.get_widget('cmb_dst_burner').set_active(0)
             else:
                 self.widgets.get_widget('cmb_dst_type').set_active(0)
                 self.widgets.get_widget('entry_new_set_def_dest').set_text(buset.dest)
@@ -240,9 +231,9 @@
             self.widgets.get_widget('druid_summary_dest').set_text("sftp://%s@%s%s" % (user, host, path))
 
         elif self.widgets.get_widget('cmb_dst_type').get_active() == 1: # CD burner
-            if self.widgets.get_widget('cmb_dst_burner').get_active() == -1:
+            if self.drive_sel is None:
                 return True
-            dest = self.widgets.get_widget('cmb_dst_burner').get_model()[self.widgets.get_widget('cmb_dst_burner').get_active()][1].get_device()
+            dest = self.drive_sel.get_active().get_block_device()
             self.widgets.get_widget('druid_summary_dest').set_text("cdrw://%s" % dest)
             self.widgets.get_widget('chk_removable_device').set_active(True)
         self.widgets.get_widget('druid_page_3').set_title(_("Add Files/Folders to '%s'") % self.widgets.get_widget('entry_new_set_name').get_text())
@@ -284,9 +275,6 @@
     def filechosen_new_set_default_dest(self, filename):
         self.widgets.get_widget('entry_new_set_def_dest').set_text(filename)
 
-    def on_button_refresh_cd_burners_clicked(self, widget):
-        self.find_cd_burners()
-
     def on_druid_page_finish_prepare(self, widget, event):
         event.set_buttons_sensitive(False, False, False, False)
                 
@@ -365,26 +353,16 @@
 
         """ Populate a combo box with the names of available CD/DVD drives """
         try:
-            nautilusburn
+            braseromedia
         except NameError:
             error_string = _("No CD burners available, because you do not have the python module \
-nautilusburn.")
+braseromedia.")
             self.widgets.get_widget('lbl_cd_burner').set_text(error_string)
-            self.widgets.get_widget('cmb_dst_burner').set_sensitive(False)
         else:
-            sel = nautilusburn.DriveSelection()
-            self.widgets.get_widget('cmb_dst_burner').set_model(sel.get_model())
+            self.drive_sel = braseromedia.DriveSelection()
+            self.widgets.get_widget('hbox30').add(self.drive_sel)
+            self.drive_sel.show()
 
-            if len(sel.get_model()) == 0:
-                error_string = _("No CD burners were detected on your system.")
-                self.widgets.get_widget('lbl_cd_burner').set_text(error_string)
-                self.widgets.get_widget('cmb_dst_burner').set_sensitive(False)
-            else:
-                msg_string = _("Select which CD burner to use:")
-                self.widgets.get_widget('lbl_cd_burner').set_text(msg_string)
-                self.widgets.get_widget('cmb_dst_burner').set_active(0)
-                self.widgets.get_widget('cmb_dst_burner').set_sensitive(True)
-
     def on_hiddenfiles_toggled(self, event):
         fc = self.widgets.get_widget('filechooserwidget1')
         fc.set_show_hidden(event.get_active())
Index: pybackpack/seteditor.glade
===================================================================
--- pybackpack/seteditor.glade  (revision 237)
+++ pybackpack/seteditor.glade  (working copy)
@@ -438,31 +438,8 @@
                                               <widget class="GtkHBox" id="hbox30">
                                                 <property name="visible">True</property>
                                                 <child>
-                                                  <widget class="GtkComboBox" id="cmb_dst_burner">
-                                                    <property name="visible">True</property>
-                                                    <property name="items" translatable="yes"></property>
-                                                  </widget>
+                           <placeholder/>
                                                 </child>
-                                                <child>
-                                                  <widget class="GtkButton" id="button2_refresh_cd_burners">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="focus_on_click">False</property>
-                                                    <property name="response_id">0</property>
-                                                    <signal name="clicked" handler="on_button_refresh_cd_burners_clicked"/>
-                                                    <child>
-                                                      <widget class="GtkImage" id="image26">
-                                                        <property name="visible">True</property>
-                                                        <property name="stock">gtk-refresh</property>
-                                                      </widget>
-                                                    </child>
-                                                  </widget>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
                                               </widget>
                                               <packing>
                                                 <property name="fill">False</property>



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	26 Sep 2008 20:14:33 -0000	1.2
+++ import.log	18 Dec 2009 16:45:37 -0000	1.3
@@ -1,2 +1,3 @@
 pybackpack-0_5_5-1_fc9:HEAD:pybackpack-0.5.5-1.fc9.src.rpm:1221005806
 pybackpack-0_5_6-1_fc9:HEAD:pybackpack-0.5.6-1.fc9.src.rpm:1222459966
+pybackpack-0_5_7-2_fc12:F-12:pybackpack-0.5.7-2.fc12.src.rpm:1261154717


Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/F-12/pybackpack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pybackpack.spec	16 Dec 2009 20:36:53 -0000	1.12
+++ pybackpack.spec	18 Dec 2009 16:45:38 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: User oriented backup and restore application
 Name: pybackpack
 Version: 0.5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -25,12 +25,16 @@ Requires: gnome-python2-brasero
 Requires: rdiff-backup >= 1.0
 BuildArch:      noarch
 
+Patch0: pybackpack-backupset-0.5.7.patch
+
 %description
 A GTK+ tool written in Python to backup files.
 
 %prep
 %setup -q
 
+%patch0 -p0
+
 %build
 python setup.py build
 %install



From rmeggins at fedoraproject.org  Fri Dec 18 16:47:50 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:47:50 +0000 (UTC)
Subject: rpms/389-admin-console/F-11 389-admin-console.spec,1.1,1.2
Message-ID: <20091218164750.92E0F11C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin-console/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32512/F-11

Modified Files:
	389-admin-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin-console/F-11/389-admin-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-console.spec	17 Jul 2009 17:23:50 -0000	1.1
+++ 389-admin-console.spec	18 Dec 2009 16:47:50 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name: 389-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: 389 Admin Server Management Console
 
 Group: Applications/System
@@ -23,6 +23,10 @@ BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-ds-admin-console = %{version}-%{release}
 Obsoletes: fedora-ds-admin-console < 1.1.4-1
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
+
 
 %description
 A Java based remote management console used for Managing 389
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.4-2
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Tue Jul 14 2009 Rich Megginson <rmeggins at redhat.com> 1.1.4-1
 - relicense source files under GPLv2
 - create doc sub package



From rmeggins at fedoraproject.org  Fri Dec 18 16:47:50 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:47:50 +0000 (UTC)
Subject: rpms/389-admin-console/F-12 389-admin-console.spec,1.2,1.3
Message-ID: <20091218164750.D5BD611C00EB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin-console/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32512/F-12

Modified Files:
	389-admin-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin-console/F-12/389-admin-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-admin-console.spec	24 Jul 2009 14:57:02 -0000	1.2
+++ 389-admin-console.spec	18 Dec 2009 16:47:50 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: 389-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: 389 Admin Server Management Console
 
 Group: Applications/System
@@ -23,6 +23,10 @@ BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-ds-admin-console = %{version}-%{release}
 Obsoletes: fedora-ds-admin-console < 1.1.4-1
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
+
 
 %description
 A Java based remote management console used for Managing 389
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.4-3
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:47:51 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:47:51 +0000 (UTC)
Subject: rpms/389-admin-console/devel 389-admin-console.spec,1.2,1.3
Message-ID: <20091218164751.0277111C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32512/devel

Modified Files:
	389-admin-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-admin-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin-console/devel/389-admin-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-admin-console.spec	24 Jul 2009 14:57:02 -0000	1.2
+++ 389-admin-console.spec	18 Dec 2009 16:47:50 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: 389-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: 389 Admin Server Management Console
 
 Group: Applications/System
@@ -23,6 +23,10 @@ BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-ds-admin-console = %{version}-%{release}
 Obsoletes: fedora-ds-admin-console < 1.1.4-1
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
+
 
 %description
 A Java based remote management console used for Managing 389
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.4-3
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:08 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:08 +0000 (UTC)
Subject: rpms/389-ds-console/F-11 389-ds-console.spec,1.2,1.3
Message-ID: <20091218164808.B15FD11C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-console/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32616/F-11

Modified Files:
	389-ds-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/F-11/389-ds-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-console.spec	12 Aug 2009 20:10:36 -0000	1.2
+++ 389-ds-console.spec	18 Dec 2009 16:48:08 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: 389-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: 389 Directory Server Management Console
 
 Group: Applications/System
@@ -23,6 +23,10 @@ BuildRequires: idm-console-framework >= 
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-ds-console = %{version}-%{release}
 Obsoletes: fedora-ds-console < 1.2.0-3
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
+
 
 %description
 A Java based remote management console used for managing 389
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-5
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-4
 - final rebuild for 1.2.0 release
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:09 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:09 +0000 (UTC)
Subject: rpms/389-ds-console/devel 389-ds-console.spec,1.3,1.4
Message-ID: <20091218164809.20F3311C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32616/devel

Modified Files:
	389-ds-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/devel/389-ds-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-console.spec	12 Aug 2009 20:10:36 -0000	1.3
+++ 389-ds-console.spec	18 Dec 2009 16:48:08 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name: 389-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: 389 Directory Server Management Console
 
 Group: Applications/System
@@ -23,6 +23,10 @@ BuildRequires: idm-console-framework >= 
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-ds-console = %{version}-%{release}
 Obsoletes: fedora-ds-console < 1.2.0-3
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
+
 
 %description
 A Java based remote management console used for managing 389
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-6
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-5
 - final rebuild for 1.2.0 release
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:08 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:08 +0000 (UTC)
Subject: rpms/389-ds-console/F-12 389-ds-console.spec,1.3,1.4
Message-ID: <20091218164808.E297111C00EB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-console/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32616/F-12

Modified Files:
	389-ds-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/F-12/389-ds-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-console.spec	12 Aug 2009 20:10:36 -0000	1.3
+++ 389-ds-console.spec	18 Dec 2009 16:48:08 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name: 389-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: 389 Directory Server Management Console
 
 Group: Applications/System
@@ -23,6 +23,10 @@ BuildRequires: idm-console-framework >= 
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-ds-console = %{version}-%{release}
 Obsoletes: fedora-ds-console < 1.2.0-3
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
+
 
 %description
 A Java based remote management console used for managing 389
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.0-6
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-5
 - final rebuild for 1.2.0 release
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:26 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:26 +0000 (UTC)
Subject: rpms/389-console/F-12 389-console.spec,1.4,1.5
Message-ID: <20091218164826.2E84F11C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32698/F-12

Modified Files:
	389-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-12/389-console.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-console.spec	30 Sep 2009 14:29:29 -0000	1.4
+++ 389-console.spec	18 Dec 2009 16:48:26 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -23,6 +23,9 @@ BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-idm-console = %{version}-%{release}
 Obsoletes: fedora-idm-console < 1.1.3-2
+%if 0%{?rhel} < 6                                                        
+ExcludeArch: ppc                                                         
+%endif    
 
 %description
 A Java based remote management console used for managing 389
@@ -64,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-6
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Wed Sep 30 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-5
 - bug 521523 - add the "which" package to the Requires
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:25 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:25 +0000 (UTC)
Subject: rpms/389-console/F-11 389-console.spec,1.3,1.4
Message-ID: <20091218164825.EDB9111C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32698/F-11

Modified Files:
	389-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-11/389-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-console.spec	30 Sep 2009 14:29:29 -0000	1.3
+++ 389-console.spec	18 Dec 2009 16:48:25 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -23,6 +23,9 @@ BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-idm-console = %{version}-%{release}
 Obsoletes: fedora-idm-console < 1.1.3-2
+%if 0%{?rhel} < 6                                                        
+ExcludeArch: ppc                                                         
+%endif    
 
 %description
 A Java based remote management console used for managing 389
@@ -64,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-5
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Wed Sep 30 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-4
 - bug 521523 - add the "which" package to the Requires
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:26 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:26 +0000 (UTC)
Subject: rpms/389-console/devel 389-console.spec,1.4,1.5
Message-ID: <20091218164826.6B49C11C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32698/devel

Modified Files:
	389-console.spec 
Log Message:
exclude platforms that do not support openjdk


Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/devel/389-console.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-console.spec	30 Sep 2009 14:29:29 -0000	1.4
+++ 389-console.spec	18 Dec 2009 16:48:26 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -23,6 +23,9 @@ BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-idm-console = %{version}-%{release}
 Obsoletes: fedora-idm-console < 1.1.3-2
+%if 0%{?rhel} < 6                                                        
+ExcludeArch: ppc                                                         
+%endif    
 
 %description
 A Java based remote management console used for managing 389
@@ -64,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-6
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Wed Sep 30 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-5
 - bug 521523 - add the "which" package to the Requires
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:43 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:43 +0000 (UTC)
Subject: rpms/idm-console-framework/F-11 idm-console-framework.spec,1.5,1.6
Message-ID: <20091218164843.BA60211C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/idm-console-framework/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv314/F-11

Modified Files:
	idm-console-framework.spec 
Log Message:
exclude platforms that do not support openjdk


Index: idm-console-framework.spec
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/F-11/idm-console-framework.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- idm-console-framework.spec	31 Mar 2009 20:58:28 -0000	1.5
+++ idm-console-framework.spec	18 Dec 2009 16:48:43 -0000	1.6
@@ -3,16 +3,16 @@
 
 Name: idm-console-framework
 Version: %{major_version}.%{minor_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Identity Management Console Framework
 
 Group: System Environment/Libraries
 License: LGPLv2
-URL: http://directory.fedoraproject.org
+URL: http://port389.org
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
 Requires: ldapjdk
 Requires: jss >= 4.2
 # Urge use of OpenJDK for runtime
@@ -21,6 +21,9 @@ BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
 BuildRequires: jss >=  4.2 
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
 
 %description
 A Java Management Console framework used for remote server management.
@@ -76,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/idm-console-nmclf_en.jar
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-2
+- Excluding PPC for EPEL builds as there is not openjdk there
+- change url to port389.org
+
 * Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-1
 - this is the 1.1.3 release
 - use the epoch with the java-devel version



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:44 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:44 +0000 (UTC)
Subject: rpms/idm-console-framework/F-12 idm-console-framework.spec,1.6,1.7
Message-ID: <20091218164844.0481911C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/idm-console-framework/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv314/F-12

Modified Files:
	idm-console-framework.spec 
Log Message:
exclude platforms that do not support openjdk


Index: idm-console-framework.spec
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/F-12/idm-console-framework.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- idm-console-framework.spec	25 Jul 2009 03:09:32 -0000	1.6
+++ idm-console-framework.spec	18 Dec 2009 16:48:43 -0000	1.7
@@ -3,16 +3,16 @@
 
 Name: idm-console-framework
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Identity Management Console Framework
 
 Group: System Environment/Libraries
 License: LGPLv2
-URL: http://directory.fedoraproject.org
+URL: http://port389.org
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
 Requires: ldapjdk
 Requires: jss >= 4.2
 # Urge use of OpenJDK for runtime
@@ -21,6 +21,9 @@ BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
 BuildRequires: jss >=  4.2 
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
 
 %description
 A Java Management Console framework used for remote server management.
@@ -76,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/idm-console-nmclf_en.jar
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-3
+- Excluding PPC for EPEL builds as there is not openjdk there
+- change url to port389.org
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rmeggins at fedoraproject.org  Fri Dec 18 16:48:44 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 16:48:44 +0000 (UTC)
Subject: rpms/idm-console-framework/devel idm-console-framework.spec, 1.6,
	1.7
Message-ID: <20091218164844.2363D11C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/idm-console-framework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv314/devel

Modified Files:
	idm-console-framework.spec 
Log Message:
exclude platforms that do not support openjdk


Index: idm-console-framework.spec
===================================================================
RCS file: /cvs/extras/rpms/idm-console-framework/devel/idm-console-framework.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- idm-console-framework.spec	25 Jul 2009 03:09:32 -0000	1.6
+++ idm-console-framework.spec	18 Dec 2009 16:48:44 -0000	1.7
@@ -3,16 +3,16 @@
 
 Name: idm-console-framework
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Identity Management Console Framework
 
 Group: System Environment/Libraries
 License: LGPLv2
-URL: http://directory.fedoraproject.org
+URL: http://port389.org
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
 Requires: ldapjdk
 Requires: jss >= 4.2
 # Urge use of OpenJDK for runtime
@@ -21,6 +21,9 @@ BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
 BuildRequires: jss >=  4.2 
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
 
 %description
 A Java Management Console framework used for remote server management.
@@ -76,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/idm-console-nmclf_en.jar
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-3
+- Excluding PPC for EPEL builds as there is not openjdk there
+- change url to port389.org
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Fri Dec 18 16:51:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:51:36 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.85-qyoto_no_examples.patch, 
	NONE, 1.1 .cvsignore, 1.68, 1.69 kdebindings.spec, 1.274,
	1.275 sources, 1.76, 1.77 kdebindings-4.3.80-pykdeui-trunk.patch,
	1.2, NONE kdebindings-qyoto-examples.patch, 1.1, NONE
Message-ID: <20091218165136.7D80711C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv961

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-4.3.85-qyoto_no_examples.patch 
Removed Files:
	kdebindings-4.3.80-pykdeui-trunk.patch 
	kdebindings-qyoto-examples.patch 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)


kdebindings-4.3.85-qyoto_no_examples.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebindings-4.3.85-qyoto_no_examples.patch ---
diff -up kdebindings-4.3.85/csharp/plasma/CMakeLists.txt.examples kdebindings-4.3.85/csharp/plasma/CMakeLists.txt
--- kdebindings-4.3.85/csharp/plasma/CMakeLists.txt.examples	2009-12-14 04:43:50.000000000 -0600
+++ kdebindings-4.3.85/csharp/plasma/CMakeLists.txt	2009-12-18 10:48:06.780312525 -0600
@@ -41,4 +41,4 @@ install(FILES ${LIBRARY_OUTPUT_PATH}/Pla
 install(FILES plasma-scriptengine-kimono-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES plasma-scriptengine-kimono-dataengine.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
-add_subdirectory( examples )
+# add_subdirectory( examples )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	1 Dec 2009 15:50:22 -0000	1.68
+++ .cvsignore	18 Dec 2009 16:51:36 -0000	1.69
@@ -1 +1 @@
-kdebindings-4.3.80.tar.bz2
+kdebindings-4.3.85.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- kdebindings.spec	12 Dec 2009 03:33:41 -0000	1.274
+++ kdebindings.spec	18 Dec 2009 16:51:36 -0000	1.275
@@ -1,3 +1,4 @@
+
 # define to enable these optional bits
 ## arch'es matching mono's ExclusiveArch set
 %if 0%{?fedora} > 11
@@ -28,6 +29,7 @@
 %define java 0
 %endif
 
+%define akonadi_version 1.2.80
 %define pykde4_akonadi 1
 %define pyqt4_version 4.6.1
 
@@ -51,8 +53,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.80
-Release: 3%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -63,7 +65,7 @@ Source0: ftp://ftp.kde.org/pub/kde/unsta
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # patch to disable examples (trouble with them installing to the buildroot)
-Patch0:  kdebindings-qyoto-examples.patch
+Patch0:  kdebindings-4.3.85-qyoto_no_examples.patch
 # fix build with CMAKE_SKIP_RPATH - also needs sed line below
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
@@ -78,10 +80,8 @@ Patch2:  kdebindings-4.3.80-fix-build.pa
 ## upstream patches
 # fix the PyKDE4 kdeui bindings to build
 # http://websvn.kde.org/?view=revision&revision=1060018
-Patch100: kdebindings-4.3.80-pykdeui-trunk.patch
-
 
-BuildRequires:  akonadi-devel >= 1.1.0
+BuildRequires:  akonadi-devel >= %{akonadi_version} 
 BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
 BuildRequires:  kdegraphics-devel >= %{version}
@@ -284,11 +284,11 @@ Falcon plugin for the Kross archtecture 
 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
-%patch0
-%patch2 -p1 -b .fix-build
+%patch0 -p1 -b .qyoto_no_examples
+## please please "just work" -- Rex
+#patch2 -p1 -b .fix-build
 
 # upstream patches
-%patch100 -p0 -b .pykdeui-trunk
 
 # do the no-rpath hack last, after the upstream backports (if any)
 %patch1 -p1 -b .no-rpath
@@ -555,6 +555,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
 - fix the PyKDE4 Akonadi, kdeui and Phonon bindings to build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	4 Dec 2009 15:30:19 -0000	1.76
+++ sources	18 Dec 2009 16:51:36 -0000	1.77
@@ -1 +1 @@
-3fd12db9000aa2c11e8812182d7a0820  kdebindings-4.3.80.tar.bz2
+6c25d465c2544a199273975686ea8285  kdebindings-4.3.85.tar.bz2


--- kdebindings-4.3.80-pykdeui-trunk.patch DELETED ---


--- kdebindings-qyoto-examples.patch DELETED ---



From rdieter at fedoraproject.org  Fri Dec 18 16:53:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:53:31 +0000 (UTC)
Subject: File kdeedu-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218165331.9194028ED38@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdeedu:

855f81b8a597803da8f88574d36bd328  kdeedu-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 16:54:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:54:54 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore, 1.75, 1.76 kdeedu.spec, 1.219,
	1.220 sources, 1.75, 1.76
Message-ID: <20091218165454.AD95811C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1638

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	2 Dec 2009 11:59:14 -0000	1.75
+++ .cvsignore	18 Dec 2009 16:54:54 -0000	1.76
@@ -1 +1 @@
-kdeedu-4.3.80.tar.bz2
+kdeedu-4.3.85.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- kdeedu.spec	16 Dec 2009 16:30:59 -0000	1.219
+++ kdeedu.spec	18 Dec 2009 16:54:54 -0000	1.220
@@ -1,3 +1,4 @@
+
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
 %ifarch alpha %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
@@ -6,15 +7,14 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.80
-Release: 2%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
 Patch2: kdeedu-4.3.75-desktop-fix.patch
@@ -528,6 +528,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
 - reenable ocaml-facile support (#546628)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	2 Dec 2009 11:59:14 -0000	1.75
+++ sources	18 Dec 2009 16:54:54 -0000	1.76
@@ -1 +1 @@
-0ed77c40ad2b7fe30977e81f3e52ea35  kdeedu-4.3.80.tar.bz2
+855f81b8a597803da8f88574d36bd328  kdeedu-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 16:57:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 16:57:08 +0000 (UTC)
Subject: File kdegames-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218165708.1577728ECEB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdegames:

2601a6d3ba33ea001cd7486d8c9da452  kdegames-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:05:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:05:08 +0000 (UTC)
Subject: File kdegraphics-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218170508.B5D2828ED38@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdegraphics:

a7dc36aa0e75504086844682fa65bb8b  kdegraphics-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:06:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:06:11 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.85-fix_liblogine_link.patch, NONE, 
	1.1 .cvsignore, 1.77, 1.78 kdegames.spec, 1.158, 1.159 sources,
	1.79, 1.80 kdegames-4.3.80-fix-liblogine-link.patch, 1.1,
	NONE kdegames-4.3.80-fix-libloscript-link.patch, 1.1, NONE
Message-ID: <20091218170611.294BB11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3699

Modified Files:
	.cvsignore kdegames.spec sources 
Added Files:
	kdegames-4.3.85-fix_liblogine_link.patch 
Removed Files:
	kdegames-4.3.80-fix-liblogine-link.patch 
	kdegames-4.3.80-fix-libloscript-link.patch 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)

what I have so far anyway, as usual, trademarks needs a bit of extra love


kdegames-4.3.85-fix_liblogine_link.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdegames-4.3.85-fix_liblogine_link.patch ---
diff -up kdegames-4.3.85/ksudoku/engine/CMakeLists.txt.fix-liblogine-link kdegames-4.3.85/ksudoku/engine/CMakeLists.txt
--- kdegames-4.3.85/ksudoku/engine/CMakeLists.txt.fix-liblogine-link	2009-12-14 04:44:53.000000000 -0600
+++ kdegames-4.3.85/ksudoku/engine/CMakeLists.txt	2009-12-18 11:02:09.608327595 -0600
@@ -23,6 +23,8 @@ kde4_add_library(logine STATIC ${liblogi
 
 target_link_libraries(logine
 	${QT_QTCORE_LIBRARY}
+	${QT_QTCORE_LIBRARY}
+	${QT_QTSCRIPT_LIBRARY}
 )
 
 add_subdirectory(script)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	2 Dec 2009 13:07:56 -0000	1.77
+++ .cvsignore	18 Dec 2009 17:06:10 -0000	1.78
@@ -1 +1 @@
-kdegames-4.3.80.tar.bz2
+kdegames-4.3.85.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- kdegames.spec	16 Dec 2009 11:13:16 -0000	1.158
+++ kdegames.spec	18 Dec 2009 17:06:10 -0000	1.159
@@ -1,8 +1,9 @@
+
 Name:    kdegames
 Summary: KDE Games
 Epoch:   6
-Version: 4.3.80
-Release: 3%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -22,10 +23,7 @@ Patch0: kdegames-4.3.80-trademarks.patch
 # upstream patches from 4.4 trunk
 # fix liblogine to link (Nicolas L?cureuil):
 # http://websvn.kde.org/?view=revision&revision=1058294
-Patch100: kdegames-4.3.80-fix-liblogine-link.patch
-# make liblogine and libloscript static, fixes libloscript to link (Funda Wang)
-# http://websvn.kde.org/?view=revision&revision=1058759
-Patch101: kdegames-4.3.80-fix-libloscript-link.patch
+Patch100: kdegames-4.3.85-fix_liblogine_link.patch
 
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
@@ -115,9 +113,8 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
-%patch0 -p1 -b .trademarks
-%patch100 -p0 -b .fix-liblogine-link
-%patch101 -p0 -b .fix-libloscript-link
+#patch0 -p1 -b .trademarks
+%patch100 -p1 -b .fix-liblogine-link
 
 %build
 # trademarks issue in RHEL
@@ -255,6 +252,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-3
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	2 Dec 2009 13:07:56 -0000	1.79
+++ sources	18 Dec 2009 17:06:11 -0000	1.80
@@ -1 +1 @@
-94099f4e1917f4a68b2be679e2c0a17d  kdegames-4.3.80.tar.bz2
+2601a6d3ba33ea001cd7486d8c9da452  kdegames-4.3.85.tar.bz2


--- kdegames-4.3.80-fix-liblogine-link.patch DELETED ---


--- kdegames-4.3.80-fix-libloscript-link.patch DELETED ---



From rdieter at fedoraproject.org  Fri Dec 18 17:07:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:07:13 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore, 1.72, 1.73 kdegraphics.spec,
	1.220, 1.221 sources, 1.76, 1.77
Message-ID: <20091218170713.088D611C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3939

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	2 Dec 2009 13:14:26 -0000	1.72
+++ .cvsignore	18 Dec 2009 17:07:12 -0000	1.73
@@ -1 +1 @@
-kdegraphics-4.3.80.tar.bz2
+kdegraphics-4.3.85.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- kdegraphics.spec	16 Dec 2009 11:24:09 -0000	1.220
+++ kdegraphics.spec	18 Dec 2009 17:07:12 -0000	1.221
@@ -1,3 +1,4 @@
+
 %ifnarch s390 s390x
 %define gphoto 1
 ## sane implies gphoto support (via -devel deps)
@@ -6,8 +7,8 @@
 
 Summary:        KDE Graphics Applications
 Epoch:          7
-Version:        4.3.80
-Release:        2%{?dist}
+Version:        4.3.85
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -234,6 +235,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	2 Dec 2009 13:14:26 -0000	1.76
+++ sources	18 Dec 2009 17:07:12 -0000	1.77
@@ -1 +1 @@
-a18906933f28235ebe77b52df576bfc7  kdegraphics-4.3.80.tar.bz2
+a7dc36aa0e75504086844682fa65bb8b  kdegraphics-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:08:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:08:12 +0000 (UTC)
Subject: File kdepim-runtime-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218170812.B152528ED38@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdepim-runtime:

23f26c523b8b6d8a273e337ce2703a4c  kdepim-runtime-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:08:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:08:48 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel .cvsignore, 1.10, 1.11 kdepim-runtime.spec,
	1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20091218170848.B43CD11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4297

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Dec 2009 13:49:30 -0000	1.10
+++ .cvsignore	18 Dec 2009 17:08:48 -0000	1.11
@@ -1 +1 @@
-kdepim-runtime-4.3.80.tar.bz2
+kdepim-runtime-4.3.85.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kdepim-runtime.spec	11 Dec 2009 15:25:20 -0000	1.16
+++ kdepim-runtime.spec	18 Dec 2009 17:08:48 -0000	1.17
@@ -1,10 +1,10 @@
 
 %define akonadi_version 1.2.80
 
-Name: kdepim-runtime
+Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.80
-Release: 4%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -131,6 +131,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.80-4
 - BR: shared-desktop-ontologies
 - tighten some deps


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Dec 2009 15:36:33 -0000	1.11
+++ sources	18 Dec 2009 17:08:48 -0000	1.12
@@ -1 +1 @@
-c86fcb4f0378069fea24bce05b6e2853  kdepim-runtime-4.3.80.tar.bz2
+23f26c523b8b6d8a273e337ce2703a4c  kdepim-runtime-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:09:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:09:29 +0000 (UTC)
Subject: File kdepim-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218170929.DCEE828ED38@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdepim:

6fa073c3db2937f397dcfc1cdbf7c5b8  kdepim-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:11:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:11:01 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore, 1.74, 1.75 kdepim.spec, 1.253,
	1.254 sources, 1.81, 1.82 kdepim-4.3.80-qt-4.6-crash.patch, 1.1, NONE
Message-ID: <20091218171101.5463311C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4756

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.3.80-qt-4.6-crash.patch 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	2 Dec 2009 13:45:36 -0000	1.74
+++ .cvsignore	18 Dec 2009 17:11:01 -0000	1.75
@@ -1 +1 @@
-kdepim-4.3.80.tar.bz2
+kdepim-4.3.85.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- kdepim.spec	16 Dec 2009 12:50:00 -0000	1.253
+++ kdepim.spec	18 Dec 2009 17:11:01 -0000	1.254
@@ -1,8 +1,9 @@
+
 Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.80
-Release: 6%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -20,7 +21,6 @@ Patch3:  kdepim-4.3.75-desktop-fixes.pat
 # upstream patches (4.4 branch):
 
 # upstream patches (trunk)
-Patch200: kdepim-4.3.80-qt-4.6-crash.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -96,7 +96,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch2 -p1 -b .kmail_globalsettings_no_var_tracking
 %patch3 -p1 -b .desktop-fixes
 
-%patch200 -p1 -b .qt4.6-crash
 
 %build
 mkdir -p %{_target_platform}
@@ -211,6 +210,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-6
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	4 Dec 2009 15:32:04 -0000	1.81
+++ sources	18 Dec 2009 17:11:01 -0000	1.82
@@ -1 +1 @@
-938c4686506d3dd4729774b20a7234e4  kdepim-4.3.80.tar.bz2
+6fa073c3db2937f397dcfc1cdbf7c5b8  kdepim-4.3.85.tar.bz2


--- kdepim-4.3.80-qt-4.6-crash.patch DELETED ---



From rdieter at fedoraproject.org  Fri Dec 18 17:11:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:11:58 +0000 (UTC)
Subject: File kdemultimedia-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218171158.EE18D28ED38@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdemultimedia:

51513ace90d3c2d1e400e24157586be2  kdemultimedia-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:12:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:12:40 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore, 1.74, 1.75 kdemultimedia.spec, 
	1.164, 1.165 sources, 1.74, 1.75
Message-ID: <20091218171240.46B7511C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5138

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	2 Dec 2009 13:23:51 -0000	1.74
+++ .cvsignore	18 Dec 2009 17:12:39 -0000	1.75
@@ -1 +1 @@
-kdemultimedia-4.3.80.tar.bz2
+kdemultimedia-4.3.85.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- kdemultimedia.spec	16 Dec 2009 11:19:04 -0000	1.164
+++ kdemultimedia.spec	18 Dec 2009 17:12:40 -0000	1.165
@@ -1,8 +1,8 @@
 
-Name: kdemultimedia
-Epoch: 6
-Version: 4.3.80
-Release: 2%{?dist}
+Name:    kdemultimedia
+Epoch:   6
+Version: 4.3.85
+Release: 1%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -172,6 +172,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	2 Dec 2009 13:23:51 -0000	1.74
+++ sources	18 Dec 2009 17:12:40 -0000	1.75
@@ -1 +1 @@
-1c7dd773cf3d961b7da4018cb9c546e0  kdemultimedia-4.3.80.tar.bz2
+51513ace90d3c2d1e400e24157586be2  kdemultimedia-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:13:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:13:19 +0000 (UTC)
Subject: File kdenetwork-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218171319.0212228ECF0@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdenetwork:

e67b465a242a15d2fbb375890afd978e  kdenetwork-4.3.85.tar.bz2



From dyfet at fedoraproject.org  Fri Dec 18 17:14:48 2009
From: dyfet at fedoraproject.org (David Sugar)
Date: Fri, 18 Dec 2009 17:14:48 +0000 (UTC)
Subject: File ucommon-2.0.7.tar.gz uploaded to lookaside cache by dyfet
Message-ID: <20091218171448.896CD28ECD4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ucommon:

4d3b7fe57d0e4f2f9bd3c6d053723038  ucommon-2.0.7.tar.gz



From rdieter at fedoraproject.org  Fri Dec 18 17:15:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:15:05 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore, 1.79, 1.80 kdenetwork.spec, 1.220,
	1.221 sources, 1.86, 1.87
Message-ID: <20091218171505.C9AFD11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5725

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	11 Dec 2009 15:34:19 -0000	1.79
+++ .cvsignore	18 Dec 2009 17:15:05 -0000	1.80
@@ -1,2 +1,2 @@
+kdenetwork-4.3.85.tar.bz2
 krdc-icons.tar.bz2
-kdenetwork-4.3.80.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- kdenetwork.spec	16 Dec 2009 11:48:06 -0000	1.220
+++ kdenetwork.spec	18 Dec 2009 17:15:05 -0000	1.221
@@ -1,8 +1,9 @@
+
 Summary: KDE Network Applications
-Name: kdenetwork
-Epoch: 7
-Version: 4.3.80
-Release: 2%{?dist}
+Name:    kdenetwork
+Epoch:   7
+Version: 4.3.85
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -190,6 +191,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	11 Dec 2009 15:34:19 -0000	1.86
+++ sources	18 Dec 2009 17:15:05 -0000	1.87
@@ -1,2 +1,2 @@
+e67b465a242a15d2fbb375890afd978e  kdenetwork-4.3.85.tar.bz2
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-87f2d595ba44cec7853e0fad75ad2ff3  kdenetwork-4.3.80.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:15:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:15:57 +0000 (UTC)
Subject: File kdeplasma-addons-4.3.85.tar.bz2 uploaded to lookaside cache by
	rdieter
Message-ID: <20091218171557.CB3D428ECD4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdeplasma-addons:

0d08bbda16ac25baf56e1d7b9f9146d8  kdeplasma-addons-4.3.85.tar.bz2



From dyfet at fedoraproject.org  Fri Dec 18 17:16:26 2009
From: dyfet at fedoraproject.org (David Sugar)
Date: Fri, 18 Dec 2009 17:16:26 +0000 (UTC)
Subject: rpms/ucommon/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 ucommon.spec, 1.2, 1.3
Message-ID: <20091218171626.E903F11C00E7@cvs1.fedora.phx.redhat.com>

Author: dyfet

Update of /cvs/pkgs/rpms/ucommon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6011

Modified Files:
	.cvsignore sources ucommon.spec 
Log Message:
New upstream release, 2.0.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ucommon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2009 12:19:07 -0000	1.2
+++ .cvsignore	18 Dec 2009 17:16:26 -0000	1.3
@@ -1 +1 @@
-ucommon-2.0.5.tar.gz
+ucommon-2.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ucommon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 May 2009 12:19:07 -0000	1.2
+++ sources	18 Dec 2009 17:16:26 -0000	1.3
@@ -1 +1 @@
-fd17f1892268dca6033fd13268e71e7c  ucommon-2.0.5.tar.gz
+4d3b7fe57d0e4f2f9bd3c6d053723038  ucommon-2.0.7.tar.gz


Index: ucommon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucommon/devel/ucommon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ucommon.spec	27 Jul 2009 06:26:48 -0000	1.2
+++ ucommon.spec	18 Dec 2009 17:16:26 -0000	1.3
@@ -10,8 +10,8 @@
 
 Name: ucommon
 Summary: Portable C++ runtime for threads and sockets
-Version: 2.0.5
-Release: 5%{?dist}
+Version: 2.0.7
+Release: 1%{?dist}
 License: LGPLv3+
 URL: http://www.gnu.org/software/commoncpp
 Source0: http://www.gnutelephony.org/dist/tarballs/ucommon-%{version}.tar.gz
@@ -76,6 +76,7 @@ html browsable.
 %{_includedir}/ucommon/
 %{_libdir}/pkgconfig/*.pc
 %{_bindir}/ucommon-config
+%{_mandir}/man1/ucommon-config.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -86,15 +87,15 @@ html browsable.
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 18 2009 - David Sugar <dyfet at gnutelephony.org> - 2.0.7-1
+- fixed install script handling upstream and fixed pedantic gcc 4.4 issues.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue May 05 2009 - David Sugar <dyfet at gnutelephony.org> - 1.0.5-4
+* Tue May 05 2009 - David Sugar <dyfet at gnutelephony.org> - 2.0.5-4
 - removed static libraries, fixed other build issues (#498736)
 
-* Sun May 03 2009 - David Sugar <dyfet at gnutelephony.org> - 1.0.5-3
+* Sun May 03 2009 - David Sugar <dyfet at gnutelephony.org> - 2.0.5-3
 - spec file further revised for redhat/fedora (#498736)
 
-* Sat May 02 2009 - David Sugar <dyfet at gnutelephony.org> - 1.0.5-2
-- spec file prepared for redhat/fedora submission (#498736)
-



From rdieter at fedoraproject.org  Fri Dec 18 17:16:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:16:31 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.25,
	1.26 kdeplasma-addons.spec, 1.75, 1.76 sources, 1.24, 1.25
Message-ID: <20091218171631.B05C711C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6138

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	2 Dec 2009 14:05:30 -0000	1.25
+++ .cvsignore	18 Dec 2009 17:16:31 -0000	1.26
@@ -1 +1 @@
-kdeplasma-addons-4.3.80.tar.bz2
+kdeplasma-addons-4.3.85.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- kdeplasma-addons.spec	11 Dec 2009 22:41:02 -0000	1.75
+++ kdeplasma-addons.spec	18 Dec 2009 17:16:31 -0000	1.76
@@ -1,5 +1,6 @@
+
 Name:           kdeplasma-addons
-Version:        4.3.80
+Version:        4.3.85
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -160,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	2 Dec 2009 14:05:30 -0000	1.24
+++ sources	18 Dec 2009 17:16:31 -0000	1.25
@@ -1 +1 @@
-c33ed42e020c14ce23156bfaf5312f81  kdeplasma-addons-4.3.80.tar.bz2
+0d08bbda16ac25baf56e1d7b9f9146d8  kdeplasma-addons-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:17:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:17:21 +0000 (UTC)
Subject: File kdesdk-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218171721.2073728ECD4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdesdk:

78f6bed6675c860875ab9f18fad7f0ed  kdesdk-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:17:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:17:52 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore, 1.69, 1.70 kdesdk.spec, 1.156,
	1.157 sources, 1.69, 1.70
Message-ID: <20091218171752.337E411C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6599

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	2 Dec 2009 14:11:27 -0000	1.69
+++ .cvsignore	18 Dec 2009 17:17:51 -0000	1.70
@@ -1 +1 @@
-kdesdk-4.3.80.tar.bz2
+kdesdk-4.3.85.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- kdesdk.spec	2 Dec 2009 14:11:27 -0000	1.156
+++ kdesdk.spec	18 Dec 2009 17:17:52 -0000	1.157
@@ -1,5 +1,6 @@
+
 Name:           kdesdk
-Version:        4.3.80
+Version:        4.3.85
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -29,8 +30,8 @@ BuildRequires:  libical-devel
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
 
-Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: kdepimlibs%{?_isa} >= %{version}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # lokalize
 Requires: kross(python)
 
@@ -38,7 +39,9 @@ Requires: kross(python)
 Requires(hint): %{name}-utils = %{version}-%{release}
 
 Provides:      kaider = %{version}-%{release}
-Obsoletes:     kaider < %{version}-%{release}
+Obsoletes:     kaider < 4.1 
+
+Provides:      kate = %{version}-%{release}
 
 %description
 A collection of applications and tools used by developers, including:
@@ -60,7 +63,7 @@ Group:   System Environment/Libraries
 %package devel
 Summary:  Developer files for %{name}
 Group:    Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdepimlibs-devel
 %description devel
 Files for developing applications using %{name}.
@@ -227,6 +230,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	2 Dec 2009 14:11:27 -0000	1.69
+++ sources	18 Dec 2009 17:17:52 -0000	1.70
@@ -1 +1 @@
-c9f9065c5c348ac2ed17ed0fb676e248  kdesdk-4.3.80.tar.bz2
+78f6bed6675c860875ab9f18fad7f0ed  kdesdk-4.3.85.tar.bz2



From mhlavink at fedoraproject.org  Fri Dec 18 17:23:10 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Dec 2009 17:23:10 +0000 (UTC)
Subject: File dovecot-1.2.9.tar.gz uploaded to lookaside cache by mhlavink
Message-ID: <20091218172310.B8BC028ED42@bastion.fedoraproject.org>

A file has been added to the lookaside cache for dovecot:

036ff97fb248dae3bd4b796a0644634f  dovecot-1.2.9.tar.gz



From mhlavink at fedoraproject.org  Fri Dec 18 17:23:16 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Dec 2009 17:23:16 +0000 (UTC)
Subject: File dovecot-1.2.8-managesieve-0.11.9.diff.gz uploaded to lookaside
	cache by mhlavink
Message-ID: <20091218172316.202D428ED42@bastion.fedoraproject.org>

A file has been added to the lookaside cache for dovecot:

4e3d658b2040f1319e7ec5f389aa94ff  dovecot-1.2.8-managesieve-0.11.9.diff.gz



From rdieter at fedoraproject.org  Fri Dec 18 17:23:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:23:44 +0000 (UTC)
Subject: File kdetoys-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218172344.348CE28ED49@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdetoys:

7c43d6b53dae5321c0081688bcda7065  kdetoys-4.3.85.tar.bz2



From mhlavink at fedoraproject.org  Fri Dec 18 17:23:47 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 18 Dec 2009 17:23:47 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.64, 1.65 dovecot.spec, 1.153,
	1.154 sources, 1.68, 1.69
Message-ID: <20091218172347.4A50D11C00E7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7653

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
updated to 1.2.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	20 Nov 2009 08:21:13 -0000	1.64
+++ .cvsignore	18 Dec 2009 17:23:47 -0000	1.65
@@ -1,4 +1,4 @@
-dovecot-1.2.8.tar.gz
+dovecot-1.2.9.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.7-managesieve-0.11.9.diff.gz
+dovecot-1.2.8-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.13.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- dovecot.spec	25 Nov 2009 16:24:36 -0000	1.153
+++ dovecot.spec	18 Dec 2009 17:23:47 -0000	1.154
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.8
-Release: 4%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -15,7 +15,7 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define ver4mansieve 1.2.7
+%define ver4mansieve 1.2.8
 %define sieve_version 0.1.13
 %define sieve_name dovecot-1.2-sieve
 %define managesieve_version 0.11.9
@@ -462,6 +462,20 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.9-1
+- updated to 1.2.9
+- maildir: When saving, filenames now always contain ,S=<size>.
+  Previously this was done only when quota plugin was loaded. It's
+  required for zlib plugin and may be useful for other things too.
+- maildir: v1.2.7 and v1.2.8 caused assert-crashes in
+  maildir_uidlist_records_drop_expunges()
+- maildir_copy_preserve_filename=yes could have caused crashes.
+- Maildir++ quota: % limits weren't updated when limits were read
+  from maildirsize.
+- virtual: v1.2.8 didn't fully fix the "lots of mailboxes" bug
+- virtual: Fixed updating virtual mailbox based on flag changes.
+- fts-squat: Fixed searching multi-byte characters.
+
 * Wed Nov 25 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.8-4
 - spec cleanup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	20 Nov 2009 08:21:13 -0000	1.68
+++ sources	18 Dec 2009 17:23:47 -0000	1.69
@@ -1,4 +1,4 @@
-c6d6c061413d299ccea7b55c3e4faa0a  dovecot-1.2.8.tar.gz
+036ff97fb248dae3bd4b796a0644634f  dovecot-1.2.9.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-e67d5fe0c362b0b9cfcec54ae1ee0240  dovecot-1.2.7-managesieve-0.11.9.diff.gz
+4e3d658b2040f1319e7ec5f389aa94ff  dovecot-1.2.8-managesieve-0.11.9.diff.gz
 6151ab50e24abc0384358b1618c8048f  dovecot-1.2-sieve-0.1.13.tar.gz



From rdieter at fedoraproject.org  Fri Dec 18 17:24:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:24:46 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore, 1.46, 1.47 kdetoys.spec, 1.64,
	1.65 sources, 1.42, 1.43
Message-ID: <20091218172446.2DBCF11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7929

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	2 Dec 2009 14:38:25 -0000	1.46
+++ .cvsignore	18 Dec 2009 17:24:45 -0000	1.47
@@ -1 +1 @@
-kdetoys-4.3.80.tar.bz2
+kdetoys-4.3.85.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- kdetoys.spec	16 Dec 2009 11:53:11 -0000	1.64
+++ kdetoys.spec	18 Dec 2009 17:24:46 -0000	1.65
@@ -1,8 +1,9 @@
+
 Name:           kdetoys
 Summary:        KDE Toys and Amusements
 Epoch:          7
-Version:        4.3.80
-Release:        2%{?dist}
+Version:        4.3.85
+Release:        1%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
@@ -82,6 +83,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	2 Dec 2009 14:38:25 -0000	1.42
+++ sources	18 Dec 2009 17:24:46 -0000	1.43
@@ -1 +1 @@
-3b6b6f6d066e6612e04085ad15c350a5  kdetoys-4.3.80.tar.bz2
+7c43d6b53dae5321c0081688bcda7065  kdetoys-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:25:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:25:26 +0000 (UTC)
Subject: File kdeutils-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091218172526.0C81F28ED91@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdeutils:

059424fb23af5bda086f52595f45afb1  kdeutils-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:26:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:26:41 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore, 1.74, 1.75 kdeutils.spec, 1.208,
	1.209 sources, 1.73, 1.74
Message-ID: <20091218172641.2BC4911C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8323

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	2 Dec 2009 14:47:28 -0000	1.74
+++ .cvsignore	18 Dec 2009 17:26:40 -0000	1.75
@@ -1 +1 @@
-kdeutils-4.3.80.tar.bz2
+kdeutils-4.3.85.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- kdeutils.spec	16 Dec 2009 11:21:52 -0000	1.208
+++ kdeutils.spec	18 Dec 2009 17:26:40 -0000	1.209
@@ -1,11 +1,12 @@
+
 %if 0%{?fedora}
 %define printer_applet 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.80
-Release:        3%{?dist}
+Version:        4.3.85
+Release:        1%{?dist}
 Summary:        KDE Utilities
 
 Group:          Applications/System
@@ -218,6 +219,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-3
 - Repositioning the KDE Brand (#547361)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	2 Dec 2009 14:47:28 -0000	1.73
+++ sources	18 Dec 2009 17:26:41 -0000	1.74
@@ -1 +1 @@
-a471e2dd438af142cee5c98302987f33  kdeutils-4.3.80.tar.bz2
+059424fb23af5bda086f52595f45afb1  kdeutils-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:45:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:45:15 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.221,1.222
Message-ID: <20091218174515.3A0C011C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11820

Modified Files:
	kdenetwork.spec 
Log Message:
drop BR: kdelibs-experimental



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- kdenetwork.spec	18 Dec 2009 17:15:05 -0000	1.221
+++ kdenetwork.spec	18 Dec 2009 17:45:14 -0000	1.222
@@ -32,7 +32,6 @@ BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
 BuildRequires: gpgme-devel
-BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libidn-devel
 BuildRequires: libmsn-devel >= 4.0-0.4.beta2



From rdieter at fedoraproject.org  Fri Dec 18 17:47:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:47:10 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.209,1.210
Message-ID: <20091218174710.9F75811C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12435

Modified Files:
	kdeutils.spec 
Log Message:
drop BR: kdelibs-experimental-devel



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- kdeutils.spec	18 Dec 2009 17:26:40 -0000	1.209
+++ kdeutils.spec	18 Dec 2009 17:47:10 -0000	1.210
@@ -26,7 +26,6 @@ Patch1:         kdeutils-4.2.85-pykde4.p
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdebase-workspace-devel >= %{version}
-BuildRequires:  kdelibs-experimental-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel



From rmeggins at fedoraproject.org  Fri Dec 18 17:49:23 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 17:49:23 +0000 (UTC)
Subject: File 389-admin-1.1.10.a2.tar.bz2 uploaded to lookaside cache by
	rmeggins
Message-ID: <20091218174923.F010B28ECE8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for 389-admin:

092b48ed6503f37d58b19acda13c5cb9  389-admin-1.1.10.a2.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 17:52:10 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 17:52:10 +0000 (UTC)
Subject: rpms/389-admin/F-11 .cvsignore, 1.4, 1.5 389-admin-git-local.sh, 1.2,
	1.3 389-admin-git.sh, 1.2, 1.3 389-admin.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <20091218175210.2AECA11C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13445

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
bump version to 1.1.10.a2 - fix genrb path problem


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	18 Dec 2009 16:24:23 -0000	1.4
+++ .cvsignore	18 Dec 2009 17:52:09 -0000	1.5
@@ -1 +1 @@
-389-admin-1.1.10.a1.tar.bz2
+389-admin-1.1.10.a2.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-admin-git-local.sh	18 Dec 2009 16:24:24 -0000	1.2
+++ 389-admin-git-local.sh	18 Dec 2009 17:52:09 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.10.a1
+VERSION=1.1.10.a2
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin-git.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-admin-git.sh	18 Dec 2009 16:24:24 -0000	1.2
+++ 389-admin-git.sh	18 Dec 2009 17:52:09 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.10.a1
+VERSION=1.1.10.a2
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 389-admin.spec	18 Dec 2009 16:24:24 -0000	1.7
+++ 389-admin.spec	18 Dec 2009 17:52:09 -0000	1.8
@@ -1,13 +1,13 @@
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .a1
+%global prerel .a2
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.10
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -157,6 +157,10 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a2-0.2
+- the 1.1.10.a2 release
+- fix problem with genrb path on F-12 and later
+
 * Thu Oct  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a1-1
 - the 1.1.10.a1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Dec 2009 16:24:24 -0000	1.6
+++ sources	18 Dec 2009 17:52:09 -0000	1.7
@@ -1 +1 @@
-b0fb7b83b06513cbe9b31c6195ea5202  389-admin-1.1.10.a1.tar.bz2
+092b48ed6503f37d58b19acda13c5cb9  389-admin-1.1.10.a2.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:55:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:55:04 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.85-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.159, 1.160 kdegames-4.3.80-trademarks.patch,
	1.1, NONE
Message-ID: <20091218175504.F076A11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13980

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.85-trademarks.patch 
Removed Files:
	kdegames-4.3.80-trademarks.patch 
Log Message:
rebase trademarks.patch


kdegames-4.3.85-trademarks.patch:
 README                               |   12 +++-
 doc/kbattleship/index.docbook        |   37 +++++++-------
 doc/ktron/index.docbook              |   11 ++--
 kbattleship/src/kbattleship.desktop  |   91 +++++++++++++++++------------------
 kbattleship/src/kbattleship.protocol |   56 ++++++++++-----------
 kbattleship/src/main.cpp             |    6 +-
 kbattleship/src/message.cpp          |    2 
 kbattleship/src/playfield.cpp        |    2 
 ktron/general.ui                     |    4 -
 ktron/ktron.desktop                  |   88 ++-------------------------------
 ktron/main.cpp                       |    5 +
 ktron/player.cpp                     |    2 
 ktron/snakepart.cpp                  |    4 -
 13 files changed, 127 insertions(+), 193 deletions(-)

--- NEW FILE kdegames-4.3.85-trademarks.patch ---
diff -up kdegames-4.3.85/doc/kbattleship/index.docbook.trademarks kdegames-4.3.85/doc/kbattleship/index.docbook
--- kdegames-4.3.85/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
+++ kdegames-4.3.85/doc/kbattleship/index.docbook	2009-12-18 11:49:50.451320813 -0600
@@ -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 "&kbattleship;">
+  <!ENTITY kappname "<application>KSinkShips</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kbattleship; Handbook</title>
+<title>The &kappname; Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,16 +57,17 @@
 
 <abstract>
 <para>
-&kbattleship; is a network-enabled implementation of the famous <quote>Battle Ship</quote> game for &kde;.</para>
+&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>kbattleship</keyword>
+<keyword>ksinkships</keyword>
 <keyword>game</keyword>
-<keyword>battleship</keyword>
-<keyword>battle</keyword>
+<keyword>sinkships</keyword>
+<keyword>sink</keyword>
+<keyword>ships</keyword>
 </keywordset>
 
 </bookinfo>
@@ -76,7 +77,7 @@
 <note><title>Gametype:</title><para>Strategy, Board</para></note><!-- Game genre. Use as many as necessary. Available game types are: Arcade, Board, Card, Dice, Toys, Logic, Strategy.-->
 <note><title>Number of possible players:</title><para>Two</para></note><!--Number of possible players. It can be: One, Two,..., Multiplayer-->
 <para>
-&kbattleship; is a Battle Ship game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
+&kappname; is a ship sinking game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others
 ships in turns without knowing where they are placed. The first player to destroy all ships wins the game.
 </para>
 </chapter>
@@ -85,14 +86,14 @@ ships in turns without knowing where the
 <title>How to Play</title>
 <note><title>Objective:</title><para>Sink all of the opponent?s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
 <para>
-If you want to play &kbattleship;, you will need two players, either play
+If you want to play &kappname;, you will need two players, either play
 against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
 
 <para>
 To start a network game, one player has to host the game by selecting <guilabel>Host network game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Host Game...</guimenuitem></menuchoice>.
 A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally,
-&kbattleship; will suggest your full name, but you can enter any string
+&kappname; will suggest your full name, but you can enter any string
 you want. The predefined port should be ok. However, if you encounter
 problems, you can choose any other free port above 1024.
 </para>
@@ -186,10 +187,10 @@ The first player to destroy all their op
 <title>Multiplayer support</title>
 
 <para>
-&kbattleship; can be played online on any GGZ Gaming Zone site. You can
+&kappname; can be played online on any GGZ Gaming Zone site. You can
 find other players there, and compete against them. Just enter one
-of the available Battleship rooms with any GGZ core client, such as
-kggz, and &kbattleship; will be offered to you as your favourite
+of the available rooms with any GGZ core client, such as
+kggz, and &kappname; will be offered to you as your favourite
 game client. If a GGZ core client is installed, you can try
 out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
 </para>
@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
 <para>
 Remember that when playing online, the opponent might be either a
 human player or a computer player. The latter one might behave
-differently from the computer player included in &kbattleship;.
+differently from the computer player included in &kappname;.
 </para>
 
 </sect1>
@@ -314,7 +315,7 @@ differently from the computer player inc
 </term>
 <listitem>
 <para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
 </para>
 </listitem>
 </varlistentry>
@@ -394,7 +395,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -408,7 +409,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
 </para>
 </listitem>
 </varlistentry>
@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
 </question>
 <answer>
 <para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
 </para>
 </answer>
 </qandaentry>
@@ -474,7 +475,7 @@ No, the theme is not changeable.
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
 
 <itemizedlist>
 <title>Authors</title>
diff -up kdegames-4.3.85/doc/ktron/index.docbook.trademarks kdegames-4.3.85/doc/ktron/index.docbook
--- kdegames-4.3.85/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
+++ kdegames-4.3.85/doc/ktron/index.docbook	2009-12-18 11:49:50.451320813 -0600
@@ -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">
@@ -61,7 +61,7 @@
 
 <abstract>
 <para>
-&kappname; is a simple <quote>Tron</quote> clone for &kde;, which you can
+&kappname; is a simple snake duel game for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -69,11 +69,12 @@ play alone or against a friend.
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 <keyword>KSnake</keyword>
 <keyword>snake</keyword>
+<keyword>duel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -81,7 +82,7 @@ play alone or against a friend.
 <title>Introduction</title>
 
 <para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
 &kappname; against the computer or a friend.
 The aim of the game is to live longer than your opponent. To do that,
diff -up kdegames-4.3.85/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.85/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.85/kbattleship/src/kbattleship.desktop.trademarks	2009-11-13 04:56:47.000000000 -0600
+++ kdegames-4.3.85/kbattleship/src/kbattleship.desktop	2009-12-18 11:49:50.452322755 -0600
@@ -1,64 +1,64 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
+Name[af]=KSinkShips
 Name[be]=?????? ???
 Name[bn]=??-??????????
-Name[br]=KBattleship
-Name[ca]=KBattleship
+Name[br]=KSinkShips
+Name[ca]=KSinkShips
 Name[cs]=Lod?
-Name[cy]=KBattleship
-Name[da]=KBattleship
-Name[de]=KBattleship
-Name[el]=KBattleship
-Name[en_GB]=KBattleship
-Name[eo]=KBattleship
-Name[es]=KBattleship
-Name[et]=KBattleship
-Name[eu]=KBattleship
+Name[cy]=KSinkShips
+Name[da]=KSinkShips
+Name[de]=KSinkShips
+Name[el]=KSinkShips
+Name[en_GB]=KSinkShips
+Name[eo]=KSinkShips
+Name[es]=KSinkShips
+Name[et]=KSinkShips
+Name[eu]=KSinkShips
 Name[fa]=???? ???????
-Name[fi]=KBattleship
-Name[fr]=KBattleship
-Name[ga]=KBattleship
-Name[gl]=KBattleship
-Name[he]=KBattleship
+Name[fi]=KSinkShips
+Name[fr]=KSinkShips
+Name[ga]=KSinkShips
+Name[gl]=KSinkShips
+Name[he]=KSinkShips
 Name[hne]=??-???????
 Name[hr]=KPotapanje brodova
-Name[hu]=KBattleship
+Name[hu]=KSinkShips
 Name[is]=KSj?orrusta
-Name[it]=KBattleship
-Name[ja]=KBattleship
-Name[km]=KBattleship
-Name[ko]=KBattleship
-Name[lt]=KBattleship
-Name[lv]=KBattleship
-Name[mk]=KBattleship
-Name[nb]=KBattleship
+Name[it]=KSinkShips
+Name[ja]=KSinkShips
+Name[km]=KSinkShips
+Name[ko]=KSinkShips
+Name[lt]=KSinkShips
+Name[lv]=KSinkShips
+Name[mk]=KSinkShips
+Name[nb]=KSinkShips
 Name[nds]=Scheep versenken
 Name[ne]=????? ?????????
-Name[nl]=KBattleship
-Name[nn]=KBattleship
+Name[nl]=KSinkShips
+Name[nn]=KSinkShips
 Name[pa]=??-???? ?????
-Name[pl]=KBattleship
-Name[pt]=KBattleship
-Name[pt_BR]=KBattleship
+Name[pl]=KSinkShips
+Name[pt]=KSinkShips
+Name[pt_BR]=KSinkShips
 Name[ro]=B?t?lie naval?
-Name[ru]=KBattleship
-Name[se]=KBattleship
-Name[sk]=KBattleship
-Name[sl]=KBattleship
+Name[ru]=KSinkShips
+Name[se]=KSinkShips
+Name[sk]=KSinkShips
+Name[sl]=KSinkShips
 Name[sr]=????????????
 Name[sr at latin]=K?podmornice
-Name[sv]=Kbattleship
+Name[sv]=KSinkShips
 Name[ta]=??????????????
 Name[tg]=K????? ???????
-Name[tr]=KBattleship
+Name[tr]=KSinkShips
 Name[uk]=???????? ???
-Name[vi]=KBattleship
-Name[wa]=KBattleship
-Name[xh]=KBattleship
-Name[x-test]=xxKBattleshipxx
-Name[zh_CN]=KBattleship
-Name[zh_TW]=KBattleship ??
+Name[vi]=KSinkShips
+Name[wa]=KSinkShips
+Name[xh]=KSinkShips
+Name[x-test]=xxKSinkShipsxx
+Name[zh_CN]=KSinkShips
+Name[zh_TW]=KSinkShips ??
 Exec=kbattleship -caption "%c" %U
 MimeType=inode/vnd.kde.service.kbattleship;
 Icon=kbattleship
@@ -81,7 +81,6 @@ GenericName[eu]=Ontzi-guda jokoa
 GenericName[fa]=???? ??? ???????
 GenericName[fi]=Meritaistelupeli
 GenericName[fr]=Jeu de bataille navale
-GenericName[ga]=Cluiche cos?il le "Battleship"
 GenericName[gl]=Xogo de batalla naval
 GenericName[he]=???? ??????
 GenericName[hne]=??????? ???
@@ -115,7 +114,7 @@ GenericName[ta]=????????
 GenericName[tr]=Amiral Batt? Oyunu
 GenericName[uk]=??? ? ???????? ???
 GenericName[wa]=Djeu di batreye di bateas
-GenericName[x-test]=xxBattleship Gamexx
+GenericName[x-test]=xxShip Sinking Gamexx
 GenericName[zh_CN]=??????
 GenericName[zh_TW]=????
 Terminal=false
diff -up kdegames-4.3.85/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.85/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.85/kbattleship/src/kbattleship.protocol.trademarks	2009-12-17 10:36:26.000000000 -0600
+++ kdegames-4.3.85/kbattleship/src/kbattleship.protocol	2009-12-18 11:53:26.169327140 -0600
@@ -5,37 +5,37 @@ input=none
 output=none
 
 Icon=kbattleship
-Description=A protocol for the game KBattleship
-Description[ca]=Un protocol pel joc KBattleship
-Description[da]=En protokol for spillet KBattleship
-Description[de]=Ein Protokoll f?r das KBattleship-Spiel.
-Description[el]=??? ?????????? ??? ?? ???????? KBattleship
-Description[en_GB]=A protocol for the game KBattleship
-Description[es]=Protocolo para el juego KBattleship
-Description[et]=KBattleshipi protokoll
-Description[eu]=KBattleship jokoaren protokoloa
-Description[fr]=Un protocole pour le jeu KBattleship
-Description[ga]=Pr?tacal le haghaidh an chluiche KBattleship
-Description[gl]=Un protocolo para o xogo KBattleship
-Description[hu]=Protokoll a KBattleship j?t?khoz
-Description[it]=Un protocollo per KBattleship
-Description[lv]=Protokols sp?lei KBattleship
-Description[nb]=En protokoll for KBattleship-spillet
-Description[nds]=En Protokoll f?r dat Speel "KBattleship"
-Description[nl]=Een protocol voor het spel KBattleship
-Description[nn]=Protokoll for KBattleship
-Description[pl]=Protok?? gry KBattleship
-Description[pt]=Um protocolo para o jogo KBattleship
-Description[pt_BR]=Um protocolo para o jogo KBattleship
-Description[ru]=???????? ??? ???? KBattleship
-Description[sl]=Protokol za igro KBattleship
+Description=A protocol for the game KSinkShips
+Description[ca]=Un protocol pel joc KSinkShips
+Description[da]=En protokol for spillet KSinkShips
+Description[de]=Ein Protokoll f?r das KSinkShips-Spiel.
+Description[el]=??? ?????????? ??? ?? ???????? KSinkShips
+Description[en_GB]=A protocol for the game KSinkShips
+Description[es]=Protocolo para el juego KSinkShips
+Description[et]=KSinkShipsi protokoll
+Description[eu]=KSinkShips jokoaren protokoloa
+Description[fr]=Un protocole pour le jeu KSinkShips
+Description[ga]=Pr?tacal le haghaidh an chluiche KSinkShips
+Description[gl]=Un protocolo para o xogo KSinkShips
+Description[hu]=Protokoll a KSinkShips j?t?khoz
+Description[it]=Un protocollo per KSinkShips
+Description[lv]=Protokols sp?lei KSinkShips
+Description[nb]=En protokoll for KSinkShips-spillet
+Description[nds]=En Protokoll f?r dat Speel "KSinkShips"
+Description[nl]=Een protocol voor het spel KSinkShips
+Description[nn]=Protokoll for KSinkShips
+Description[pl]=Protok?? gry KSinkShips
+Description[pt]=Um protocolo para o jogo KSinkShips
+Description[pt_BR]=Um protocolo para o jogo KSinkShips
+Description[ru]=???????? ??? ???? KSinkShips
+Description[sl]=Protokol za igro KSinkShips
 Description[sr]=???????? ?? ????????????
 Description[sr at latin]=Protokol za K?podmornice
 Description[sv]=Ett protokoll f?r spelet S?nka fartyg
-Description[uk]=???????? ??? ??? KBattleship
-Description[x-test]=xxA protocol for the game KBattleshipxx
-Description[zh_CN]=KBattleship ??????
-Description[zh_TW]=KBattleship ???????
+Description[uk]=???????? ??? ??? KSinkShips
+Description[x-test]=xxA protocol for the game KSinkShipsxx
+Description[zh_CN]=KSinkShips ??????
+Description[zh_TW]=KSinkShips ???????
 
 helper=true
 Class=:internet
diff -up kdegames-4.3.85/kbattleship/src/main.cpp.trademarks kdegames-4.3.85/kbattleship/src/main.cpp
--- kdegames-4.3.85/kbattleship/src/main.cpp.trademarks	2009-08-12 04:59:08.000000000 -0500
+++ kdegames-4.3.85/kbattleship/src/main.cpp	2009-12-18 11:49:50.453322674 -0600
@@ -21,8 +21,8 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
-        ki18n("The KDE Battleship clone"), KAboutData::License_GPL, 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
+        ki18n("The KDE sinking ships game"), KAboutData::License_GPL, 
         ki18n("(c) 2000-2005  Nikolas Zimmermann, Daniel Molkentin\n"
               "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" );
     
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup"));
+    options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup"));
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KApplication app;
     KGlobal::locale()->insertCatalog("libkdegames");
diff -up kdegames-4.3.85/kbattleship/src/message.cpp.trademarks kdegames-4.3.85/kbattleship/src/message.cpp
--- kdegames-4.3.85/kbattleship/src/message.cpp.trademarks	2009-01-16 09:08:44.000000000 -0600
+++ kdegames-4.3.85/kbattleship/src/message.cpp	2009-12-18 11:49:50.453322674 -0600
@@ -24,7 +24,7 @@ HeaderMessage::HeaderMessage()
 : m_protocol_version("0.1.0")
 , m_client_name("KBattleship")
 , m_client_version("4.0")
-, m_client_description("The KDE Battleship clone")
+, m_client_description("The KDE sinking ships game")
 {
 }
 
diff -up kdegames-4.3.85/kbattleship/src/playfield.cpp.trademarks kdegames-4.3.85/kbattleship/src/playfield.cpp
--- kdegames-4.3.85/kbattleship/src/playfield.cpp.trademarks	2009-03-18 04:57:42.000000000 -0500
+++ kdegames-4.3.85/kbattleship/src/playfield.cpp	2009-12-18 11:49:50.453322674 -0600
@@ -251,7 +251,7 @@ void PlayField::restartRequested()
 void PlayField::setCompatibility(int level)
 {
     if (level == Entity::COMPAT_KBS3) {
-        KMessageBox::information(this, i18n("Your opponent is using a pre-KDE4 version of KBattleship. Note that, according to the rules enforced by old clients, ships cannot be placed adjacent to one another."));
+        KMessageBox::information(this, i18n("Your opponent is using a pre-KDE4 version of KSinkShips. Note that, according to the rules enforced by old clients, ships cannot be placed adjacent to one another."));
     }
 }
 
diff -up kdegames-4.3.85/ktron/general.ui.trademarks kdegames-4.3.85/ktron/general.ui
--- kdegames-4.3.85/ktron/general.ui.trademarks	2009-05-06 05:13:13.000000000 -0500
+++ kdegames-4.3.85/ktron/general.ui	2009-12-18 11:49:50.454322731 -0600
@@ -39,12 +39,12 @@
           <widget class="KComboBox" name="kcfg_GameType">
            <item>
             <property name="text">
-             <string>KTron: Player vs Computer</string>
+             <string>KSnakeDuel: Player vs Computer</string>
             </property>
            </item>
            <item>
             <property name="text">
-             <string>KTron: Player vs Player</string>
+             <string>KSnakeDuel: Player vs Player</string>
             </property>
            </item>
            <item>
diff -up kdegames-4.3.85/ktron/ktron.desktop.trademarks kdegames-4.3.85/ktron/ktron.desktop
--- kdegames-4.3.85/ktron/ktron.desktop.trademarks	2009-12-14 04:45:02.000000000 -0600
+++ kdegames-4.3.85/ktron/ktron.desktop	2009-12-18 11:51:32.899313156 -0600
@@ -3,88 +3,14 @@ Type=Application
 Exec=ktron -caption "%c" %i
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[ca]=Joc similar al Tron
-GenericName[cs]=Hra typu Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=?Tron?-Spiel
-GenericName[el]=???????? ???????? ?? ?? Tron
-GenericName[en_GB]=Tron-like Game
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Troni moodi m?ng
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[ga]=Cluiche Cos?il le Tron
-GenericName[gl]=Xogo similar ao Tron
-GenericName[hu]=Tron-szer? j?t?k
-GenericName[it]=Un gioco simile a Tron
-GenericName[ja]=Tron ???????
-GenericName[lv]=Tron l?dz?ga sp?le
-GenericName[nds]=Tron-liek Speel
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra podobna do Tron
-GenericName[pt]=Jogo Semelhante ao Tron
-GenericName[pt_BR]=Jogo semelhante ao Tron
-GenericName[ru]=???? ? ????? ??????
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=???? ????? ?? ????
-GenericName[sr at latin]=Igra nalik na tron
-GenericName[sv]=Tron-liknande spel
-GenericName[uk]=???, ????? ?? Tron
-GenericName[x-test]=xxTron-like Gamexx
-GenericName[zh_CN]=?? Tron ???
-GenericName[zh_TW]=?? Tron ??
+GenericName=Snake Duel Game
+GenericName[de]=Schlangenduell-Spiel
+GenericName[fr]=Jeu de duel de serpents
+GenericName[it]=Gioco di duello di serpenti
+GenericName[x-test]=xxSnake Duel Gamexx
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[bn]=??-????
-Name[br]=KTron
-Name[ca]=KTron
-Name[cs]=KTron
-Name[cy]=KTron
-Name[da]=KTron
-Name[de]=KTron
-Name[el]=KTron
-Name[en_GB]=KTron
-Name[es]=KTron
-Name[et]=KTron
-Name[eu]=KTron
-Name[fr]=KTron
-Name[ga]=KTron
-Name[gl]=KTron
-Name[he]=KTron
-Name[hr]=KTron
-Name[hu]=KTron
-Name[is]=KTron
-Name[it]=KTron
-Name[ja]=KTron
-Name[lv]=KTron
-Name[mk]=KTron
-Name[nds]=KTron
-Name[nl]=KTron
-Name[nn]=KTron
-Name[pl]=KTron
-Name[pt]=KTron
-Name[pt_BR]=KTron
-Name[ro]=KTron
-Name[ru]=????
-Name[si]=KTron
-Name[sk]=KTron
-Name[sl]=KTron
-Name[sr]=??????
-Name[sr at latin]=K?tron
-Name[sv]=Ktron
-Name[ta]=K??????
-Name[tg]=K????
-Name[tr]=KTron
-Name[uk]=KTron
-Name[vi]=KTron
-Name[wa]=KTron
-Name[xh]=KTron
-Name[x-test]=xxKTronxx
-Name[zh_CN]=KTron
-Name[zh_TW]=KTron
+Name=KSnakeDuel
+Name[x-test]=xxKSnakeDuelxx
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -up kdegames-4.3.85/ktron/main.cpp.trademarks kdegames-4.3.85/ktron/main.cpp
--- kdegames-4.3.85/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
+++ kdegames-4.3.85/ktron/main.cpp	2009-12-18 11:49:50.454322731 -0600
@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", 0, ki18n("KTron"), 
+  KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
   KCmdLineArgs::init( argc, argv, &aboutData );
 
   KCmdLineOptions options;
-  options.add("ktron", ki18n("Start in KTron mode"));
+  // This is the default anyway, why does this need an option? -- Kevin Kofler
+  // options.add("ktron", ki18n("Start in KTron mode"));
   options.add("snake", ki18n("Start in KSnake mode"));
   KCmdLineArgs::addCmdLineOptions(options);
 
diff -up kdegames-4.3.85/ktron/player.cpp.trademarks kdegames-4.3.85/ktron/player.cpp
--- kdegames-4.3.85/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
+++ kdegames-4.3.85/ktron/player.cpp	2009-12-18 11:49:50.455322858 -0600
@@ -92,7 +92,7 @@ QString Player::getName()
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -up kdegames-4.3.85/ktron/snakepart.cpp.trademarks kdegames-4.3.85/ktron/snakepart.cpp
--- kdegames-4.3.85/ktron/snakepart.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
+++ kdegames-4.3.85/ktron/snakepart.cpp	2009-12-18 11:49:50.455322858 -0600
@@ -120,11 +120,11 @@ QString SnakePart::decodePart()
 	// Player
 	if (getPlayerNumber() == 0)
 	{
-		name = "tron1-";
+		name = "snake1-";
 	}
 	else if (getPlayerNumber() == 1)
 	{
-		name = "tron2-";
+		name = "snake2-";
 	}
 
 	// Heads (or tails)
diff -up kdegames-4.3.85/README.trademarks kdegames-4.3.85/README
--- kdegames-4.3.85/README.trademarks	2009-11-02 06:00:47.000000000 -0600
+++ kdegames-4.3.85/README	2009-12-18 11:49:50.455322858 -0600
@@ -28,9 +28,6 @@ This is a compilation of more than 20 va
     Play backgammon against a local human player, via a game server or
     against GNU Backgammon (not included)
 
-* kbattleship
-    Sink battleship of your opponents, with built-in game server.
-
 * kblackbox
     Find the balls hidden in the black box by shooting laser beams!
 
@@ -73,6 +70,15 @@ This is a compilation of more than 20 va
 * kshisen
     Patience game where you take away all pieces.
 
+* ksinkships
+    Sink ships of your opponents, with built-in game server.
+
+* ksnake
+    Don't bite yourself, eat apples!
+
+* ksnakeduel
+    Like ksnake, but without fruits.
+
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- kdegames.spec	18 Dec 2009 17:06:10 -0000	1.159
+++ kdegames.spec	18 Dec 2009 17:55:04 -0000	1.160
@@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # In ktron.desktop, just remove all the translations containing "Tron" or
 # "KTron". Use my translations of GenericName for de, fr, it, feel free to add
 # more, but don't use "Tron" in them! -- Kevin
-Patch0: kdegames-4.3.80-trademarks.patch
+Patch0: kdegames-4.3.85-trademarks.patch
 
 # upstream patches from 4.4 trunk
 # fix liblogine to link (Nicolas L?cureuil):
@@ -113,7 +113,7 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
-#patch0 -p1 -b .trademarks
+%patch0 -p1 -b .trademarks
 %patch100 -p1 -b .fix-liblogine-link
 
 %build


--- kdegames-4.3.80-trademarks.patch DELETED ---



From mclasen at fedoraproject.org  Fri Dec 18 17:55:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 17:55:43 +0000 (UTC)
Subject: rpms/shotwell/devel shotwell.spec,1.11,1.12
Message-ID: <20091218175543.4100D11C00E7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14151

Modified Files:
	shotwell.spec 
Log Message:
update to 0.4.0 prerelease



Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- shotwell.spec	12 Nov 2009 16:19:05 -0000	1.11
+++ shotwell.spec	18 Dec 2009 17:55:43 -0000	1.12
@@ -1,6 +1,8 @@
+%define alphatag 20091218svn
+
 Name:           shotwell
-Version:        0.3.2
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        0.1.%{alphatag}%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -8,7 +10,9 @@ Group:          Applications/Multimedia
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
-Source0:        http://www.yorba.org/download/shotwell/0.3/shotwell-%{version}.tar.bz2
+#Source0:        http://www.yorba.org/download/shotwell/0.3/shotwell-%{version}.tar.bz2
+# svn co svn://svn.yorba.org/shotwell/branches/shotwell-0.4, make dist
+Source:         shotwell-0.4.0+branch.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,11 +37,11 @@ environment. It allows you to import pho
 them, and share them with others.
 
 %prep
-%setup -q
-%patch0 -p1 -b .prefixly-correct
+%setup -q -n shotwell-0.4.0+branch
+#%patch0 -p1 -b .prefixly-correct
 
 %build
-./configure --prefix=/usr
+./configure --prefix=/usr --disable-schemas-install
 sed -i -e 's/\\n/\n/g' configure.mk
 sed -i -e 's/^CFLAGS=.*$/CFLAGS=%{optflags}/' Makefile
 make %{?_smp_mflags}
@@ -97,6 +101,7 @@ gtk-update-icon-cache --quiet %{_datadir
 
 
 %changelog
+* Fri Dec 18 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-0.1.20091218svn
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.2-1
 - Update to 0.3.2
 



From rmeggins at fedoraproject.org  Fri Dec 18 17:55:44 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 17:55:44 +0000 (UTC)
Subject: rpms/389-admin/F-12 .cvsignore, 1.4, 1.5 389-admin-git-local.sh, 1.2,
	1.3 389-admin-git.sh, 1.2, 1.3 389-admin.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <20091218175544.7E8C611C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14268

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
bump version to 1.1.10.a2 - fix genrb path problem


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	18 Dec 2009 16:24:37 -0000	1.4
+++ .cvsignore	18 Dec 2009 17:55:44 -0000	1.5
@@ -1 +1 @@
-389-admin-1.1.10.a1.tar.bz2
+389-admin-1.1.10.a2.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-admin-git-local.sh	18 Dec 2009 16:24:37 -0000	1.2
+++ 389-admin-git-local.sh	18 Dec 2009 17:55:44 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.10.a1
+VERSION=1.1.10.a2
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin-git.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-admin-git.sh	18 Dec 2009 16:24:37 -0000	1.2
+++ 389-admin-git.sh	18 Dec 2009 17:55:44 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.10.a1
+VERSION=1.1.10.a2
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- 389-admin.spec	18 Dec 2009 16:24:37 -0000	1.9
+++ 389-admin.spec	18 Dec 2009 17:55:44 -0000	1.10
@@ -1,13 +1,13 @@
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .a1
+%global prerel .a2
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.10
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -157,6 +157,10 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a2-0.2
+- the 1.1.10.a2 release
+- fix problem with genrb path on F-12 and later
+
 * Thu Oct  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a1-1
 - the 1.1.10.a1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Dec 2009 16:24:37 -0000	1.7
+++ sources	18 Dec 2009 17:55:44 -0000	1.8
@@ -1 +1 @@
-b0fb7b83b06513cbe9b31c6195ea5202  389-admin-1.1.10.a1.tar.bz2
+092b48ed6503f37d58b19acda13c5cb9  389-admin-1.1.10.a2.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 17:55:58 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 17:55:58 +0000 (UTC)
Subject: rpms/389-admin/devel .cvsignore, 1.4, 1.5 389-admin-git-local.sh,
	1.2, 
	1.3 389-admin-git.sh, 1.2, 1.3 389-admin.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <20091218175558.905A111C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14419

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
bump version to 1.1.10.a2 - fix genrb path problem


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	18 Dec 2009 16:24:47 -0000	1.4
+++ .cvsignore	18 Dec 2009 17:55:58 -0000	1.5
@@ -1 +1 @@
-389-admin-1.1.10.a1.tar.bz2
+389-admin-1.1.10.a2.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-admin-git-local.sh	18 Dec 2009 16:24:47 -0000	1.2
+++ 389-admin-git-local.sh	18 Dec 2009 17:55:58 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.10.a1
+VERSION=1.1.10.a2
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin-git.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-admin-git.sh	18 Dec 2009 16:24:47 -0000	1.2
+++ 389-admin-git.sh	18 Dec 2009 17:55:58 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.10.a1
+VERSION=1.1.10.a2
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- 389-admin.spec	18 Dec 2009 16:24:47 -0000	1.9
+++ 389-admin.spec	18 Dec 2009 17:55:58 -0000	1.10
@@ -1,13 +1,13 @@
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .a1
+%global prerel .a2
 # also need the relprefix field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.10
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -157,6 +157,10 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a2-0.2
+- the 1.1.10.a2 release
+- fix problem with genrb path on F-12 and later
+
 * Thu Oct  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a1-1
 - the 1.1.10.a1 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Dec 2009 16:24:47 -0000	1.7
+++ sources	18 Dec 2009 17:55:58 -0000	1.8
@@ -1 +1 @@
-b0fb7b83b06513cbe9b31c6195ea5202  389-admin-1.1.10.a1.tar.bz2
+092b48ed6503f37d58b19acda13c5cb9  389-admin-1.1.10.a2.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 17:57:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 17:57:41 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.220,1.221
Message-ID: <20091218175741.157ED11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14852

Modified Files:
	kdeedu.spec 
Log Message:
BR: attica-devel



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- kdeedu.spec	18 Dec 2009 16:54:54 -0000	1.220
+++ kdeedu.spec	18 Dec 2009 17:57:40 -0000	1.221
@@ -23,6 +23,7 @@ Patch2: kdeedu-4.3.75-desktop-fix.patch
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
 
+BuildRequires: attica-devel
 # Kig can optionally use Boost.Python for Python scripting
 BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.



From mclasen at fedoraproject.org  Fri Dec 18 17:59:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 17:59:28 +0000 (UTC)
Subject: File shotwell-0.4.0+branch.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091218175928.8396928ECE8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for shotwell:

04a137ae4b30f394ca38c9651555a474  shotwell-0.4.0+branch.tar.bz2



From mclasen at fedoraproject.org  Fri Dec 18 17:59:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 17:59:46 +0000 (UTC)
Subject: rpms/shotwell/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20091218175946.0568011C00E7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15288

Modified Files:
	.cvsignore sources 
Log Message:
new sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Nov 2009 14:40:15 -0000	1.4
+++ .cvsignore	18 Dec 2009 17:59:45 -0000	1.5
@@ -1 +1 @@
-shotwell-0.3.2.tar.bz2
+shotwell-0.4.0+branch.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Nov 2009 14:40:15 -0000	1.4
+++ sources	18 Dec 2009 17:59:45 -0000	1.5
@@ -1 +1 @@
-9415fcceb9663de6815dd805f45c0905  shotwell-0.3.2.tar.bz2
+04a137ae4b30f394ca38c9651555a474  shotwell-0.4.0+branch.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 18:07:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 18:07:15 +0000 (UTC)
Subject: rpms/attica/F-12 .cvsignore, 1.2, 1.3 attica.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091218180715.4FF3411C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/attica/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17035

Modified Files:
	.cvsignore attica.spec sources 
Log Message:
* Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
- upstream tarball
- %files: tighten up a bit, track sonames



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Dec 2009 09:08:55 -0000	1.2
+++ .cvsignore	18 Dec 2009 18:07:15 -0000	1.3
@@ -1 +1 @@
-attica-0.1.0.tar.bz2
+attica-0.1.1.tar.bz2


Index: attica.spec
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-12/attica.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- attica.spec	11 Dec 2009 09:09:52 -0000	1.1
+++ attica.spec	18 Dec 2009 18:07:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           attica
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        Implementation of the Open Collaboration Services API
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-1
+- attica-0.1.1
+
 * Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
 - upstream tarball
 - %files: tighten up a bit, track sonames


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Dec 2009 09:08:55 -0000	1.2
+++ sources	18 Dec 2009 18:07:15 -0000	1.3
@@ -1 +1 @@
-ff8d6ba041125b1ace0048741855b89d  attica-0.1.0.tar.bz2
+4011ebc19fe6b12b8de9f10ccc341125  attica-0.1.1.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 18 18:07:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 18:07:38 +0000 (UTC)
Subject: rpms/attica/F-11 .cvsignore, 1.2, 1.3 attica.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091218180738.076FA11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/attica/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17201

Modified Files:
	.cvsignore attica.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-1
- attica-0.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Dec 2009 09:08:48 -0000	1.2
+++ .cvsignore	18 Dec 2009 18:07:37 -0000	1.3
@@ -1 +1 @@
-attica-0.1.0.tar.bz2
+attica-0.1.1.tar.bz2


Index: attica.spec
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-11/attica.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- attica.spec	11 Dec 2009 09:09:48 -0000	1.1
+++ attica.spec	18 Dec 2009 18:07:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           attica
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        Implementation of the Open Collaboration Services API
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.1-1
+- attica-0.1.1
+
 * Wed Dec  9 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-3
 - upstream tarball
 - %files: tighten up a bit, track sonames


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/attica/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Dec 2009 09:08:48 -0000	1.2
+++ sources	18 Dec 2009 18:07:37 -0000	1.3
@@ -1 +1 @@
-ff8d6ba041125b1ace0048741855b89d  attica-0.1.0.tar.bz2
+4011ebc19fe6b12b8de9f10ccc341125  attica-0.1.1.tar.bz2



From pkgdb at fedoraproject.org  Fri Dec 18 18:11:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 18:11:37 +0000
Subject: [pkgdb] 389-ds-base (Fedora EPEL, 5) updated by ausil
Message-ID: <20091218181139.8448628ECCF@bastion.fedoraproject.org>

ausil approved watchbugzilla on 389-ds-base (Fedora EPEL 5) for rmeggins
ausil approved watchcommits on 389-ds-base (Fedora EPEL 5) for rmeggins
ausil approved commit on 389-ds-base (Fedora EPEL 5) for rmeggins
ausil approved build on 389-ds-base (Fedora EPEL 5) for rmeggins
ausil approved approveacls on 389-ds-base (Fedora EPEL 5) for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/389-ds-base



From pkgdb at fedoraproject.org  Fri Dec 18 18:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 18:11:56 +0000
Subject: [pkgdb] 389-admin (Fedora EPEL, 5) updated by ausil
Message-ID: <20091218181157.CC0A828EC8A@bastion.fedoraproject.org>

ausil approved watchbugzilla on 389-admin (Fedora EPEL 5) for rmeggins
ausil approved watchcommits on 389-admin (Fedora EPEL 5) for rmeggins
ausil approved commit on 389-admin (Fedora EPEL 5) for rmeggins
ausil approved build on 389-admin (Fedora EPEL 5) for rmeggins
ausil approved approveacls on 389-admin (Fedora EPEL 5) for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/389-admin



From rdieter at fedoraproject.org  Fri Dec 18 18:15:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 18:15:31 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore, 1.70, 1.71 kdeartwork.spec, 1.125,
	1.126 sources, 1.70, 1.71
Message-ID: <20091218181531.1A09A11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19211

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	1 Dec 2009 14:00:26 -0000	1.70
+++ .cvsignore	18 Dec 2009 18:15:30 -0000	1.71
@@ -1 +1 @@
-kdeartwork-4.3.80.tar.bz2
+kdeartwork-4.3.85.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- kdeartwork.spec	1 Dec 2009 14:27:26 -0000	1.125
+++ kdeartwork.spec	18 Dec 2009 18:15:30 -0000	1.126
@@ -1,5 +1,6 @@
+
 Name:           kdeartwork
-Version:        4.3.80
+Version:        4.3.85
 Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
@@ -214,6 +215,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Tue Dec  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	1 Dec 2009 14:00:26 -0000	1.70
+++ sources	18 Dec 2009 18:15:30 -0000	1.71
@@ -1 +1 @@
-7b5c22f34a4c7c4f73e8fb7e35d2de4b  kdeartwork-4.3.80.tar.bz2
+4543535365696fadf3b086f8c1d963a0  kdeartwork-4.3.85.tar.bz2



From mclasen at fedoraproject.org  Fri Dec 18 18:15:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 18:15:56 +0000 (UTC)
Subject: rpms/shotwell/devel shotwell.spec,1.12,1.13
Message-ID: <20091218181556.9741B11C00E7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19313

Modified Files:
	shotwell.spec 
Log Message:
fix BRs



Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- shotwell.spec	18 Dec 2009 17:55:43 -0000	1.12
+++ shotwell.spec	18 Dec 2009 18:15:56 -0000	1.13
@@ -26,6 +26,7 @@ BuildRequires:  dbus-glib-devel
 BuildRequires:  unique-devel
 BuildRequires:  libexif-devel
 BuildRequires:  libgphoto2-devel
+BuildRequires:  webkit-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 



From rdieter at fedoraproject.org  Fri Dec 18 18:22:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 18:22:50 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.330,1.331
Message-ID: <20091218182250.A62FC11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20939

Modified Files:
	kdebase-workspace.spec 
Log Message:
%%files: move gui_plugins



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -r1.330 -r1.331
--- kdebase-workspace.spec	18 Dec 2009 16:04:38 -0000	1.330
+++ kdebase-workspace.spec	18 Dec 2009 18:22:50 -0000	1.331
@@ -520,10 +520,10 @@ fi
 %if 0%{?with_polkit_09}
 %exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %endif
-%{_qt4_plugindir}/gui_platform/libkde.so
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
+%{_kde4_libdir}/kde4/plugins/gui_platform/libkde.so
 
 %files devel
 %defattr(-,root,root,-)



From mclasen at fedoraproject.org  Fri Dec 18 18:23:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 18 Dec 2009 18:23:28 +0000 (UTC)
Subject: rpms/shotwell/devel shotwell.spec,1.13,1.14
Message-ID: <20091218182328.EB63811C00E7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21222

Modified Files:
	shotwell.spec 
Log Message:
try again



Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- shotwell.spec	18 Dec 2009 18:15:56 -0000	1.13
+++ shotwell.spec	18 Dec 2009 18:23:28 -0000	1.14
@@ -26,7 +26,7 @@ BuildRequires:  dbus-glib-devel
 BuildRequires:  unique-devel
 BuildRequires:  libexif-devel
 BuildRequires:  libgphoto2-devel
-BuildRequires:  webkit-devel
+BuildRequires:  webkitgtk-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 



From rdieter at fedoraproject.org  Fri Dec 18 18:25:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 18:25:39 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.254,1.255
Message-ID: <20091218182539.5D49111C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21671

Modified Files:
	kdepim.spec 
Log Message:
unpackaged files



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -p -r1.254 -r1.255
--- kdepim.spec	18 Dec 2009 17:11:01 -0000	1.254
+++ kdepim.spec	18 Dec 2009 18:25:39 -0000	1.255
@@ -166,6 +166,7 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/akonadi/agents/*.desktop
 %{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so
+%{_kde4_appsdir}/akonadiconsole/
 %{_kde4_appsdir}/akregator/
 %{_kde4_appsdir}/blogilo/
 %{_kde4_appsdir}/kaddressbook/



From rmeggins at fedoraproject.org  Fri Dec 18 18:37:52 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 18:37:52 +0000 (UTC)
Subject: rpms/389-ds-base/EL-5 .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh,
	1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20091218183752.0B5D611C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24332

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 18:00:01 -0000	1.5
+++ .cvsignore	18 Dec 2009 18:37:51 -0000	1.6
@@ -1,2 +1 @@
-389-ds-base-1.2.3.tar.bz2
-389-ds-base-1.2.4.tar.bz2
+389-ds-base-1.2.5.rc3.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-5/389-ds-base-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git-local.sh	29 Oct 2009 18:00:01 -0000	1.2
+++ 389-ds-base-git-local.sh	18 Dec 2009 18:37:51 -0000	1.3
@@ -2,9 +2,9 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
+TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-5/389-ds-base-git.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git.sh	29 Oct 2009 18:00:01 -0000	1.3
+++ 389-ds-base-git.sh	18 Dec 2009 18:37:51 -0000	1.4
@@ -2,15 +2,15 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
-#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
-#SRCNAME=$PKGNAME-$VERSION-$DATE
+TAG=${TAG:-$PKGNAME-$VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
 SRCNAME=$PKGNAME-$VERSION
 
-cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME ldapserver
+wget -O $SRCNAME.tar.gz "$URL"
 
-tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-rm -rf $SRCNAME
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-5/389-ds-base.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 389-ds-base.spec	29 Oct 2009 18:00:01 -0000	1.10
+++ 389-ds-base.spec	18 Dec 2009 18:37:51 -0000	1.11
@@ -1,10 +1,14 @@
 
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .rc3
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.4
-Release:          1%{?dist}
+Version:          1.2.5
+Release:          %{?relprefix}4%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -61,7 +65,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-ds-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Source2:          %{name}-devel.README
@@ -82,7 +86,7 @@ Obsoletes:        fedora-ds-base-devel <
 Development Libraries and headers for the 389 Directory Server base package.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 cp %{SOURCE2} README.devel
 
 %build
@@ -265,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec 17 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.4.rc3
+- 1.2.5.rc3 release
+
 * Thu Oct 29 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.4-1
 - 1.2.4 release
 - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Oct 2009 22:51:24 -0000	1.7
+++ sources	18 Dec 2009 18:37:51 -0000	1.8
@@ -1 +1 @@
-fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2
+394658aaeda80bdc4bf46ca12b92a752  389-ds-base-1.2.5.rc3.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 18:38:19 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 18:38:19 +0000 (UTC)
Subject: rpms/389-admin/EL-5 .cvsignore, 1.3, 1.4 389-admin-git-local.sh, 1.1,
	1.2 389-admin-git.sh, 1.1, 1.2 389-admin.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20091218183819.4F39D11C00E7@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24562

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
this is the 1.1.10.a2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 15:50:27 -0000	1.3
+++ .cvsignore	18 Dec 2009 18:38:19 -0000	1.4
@@ -1 +1 @@
-389-admin-1.1.9.tar.bz2
+389-admin-1.1.10.a2.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-5/389-admin-git-local.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git-local.sh	7 Oct 2009 15:50:27 -0000	1.1
+++ 389-admin-git-local.sh	18 Dec 2009 18:38:19 -0000	1.2
@@ -1,18 +1,15 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=389-admin-1.1.9
-CVSTAG=three89Admin_1_1_9
-VERSION=1.1.9
+VERSION=1.1.10.a2
 PKGNAME=389-admin
+TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
-CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 echo you must be in the admin server git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {echo bye ; exit 1 }
 if [ -z "$1" ] ; then
 	dir=.
 else
 	dir="$1"
 fi
-git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME )
-rm -rf $dir/$SRCNAME
+git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-5/389-admin-git.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git.sh	23 Jun 2009 02:36:44 -0000	1.1
+++ 389-admin-git.sh	18 Dec 2009 18:38:19 -0000	1.2
@@ -1,22 +1,16 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=HEAD
-VERSION=1.1.7
+VERSION=1.1.10.a2
 PKGNAME=389-admin
-export URL=git://git.fedorahosted.org/git/389/admin.git
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
+TAG=${PKGNAME}-${VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz"
 
-git clone $URL
-cd admin.git
-git archive --prefix=$SRCNAME/ $TAG | bzip2 > $SRCNAME.tar.bz2
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME adminserver
-#cd $SRCNAME
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd
-#cd ..
+wget -O $SRCNAME.tar.gz "$URL"
 
-#tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-cd ..
-rm -rf admin.git
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-5/389-admin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.8
+++ 389-admin.spec	18 Dec 2009 18:38:19 -0000	1.9
@@ -1,9 +1,13 @@
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .a2
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.9
-Release:          1%{?dist}
+Version:          1.1.10
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -34,7 +38,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-admin-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Patch1:           f11-httpd.patch
@@ -46,7 +50,7 @@ be used through a web browser.  It provi
 and CGI utilities used by the console.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 %patch1
 
 %build
@@ -153,6 +157,13 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a2-0.2
+- the 1.1.10.a2 release
+- fix problem with genrb path on F-12 and later
+
+* Thu Oct  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a1-1
+- the 1.1.10.a1 release
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
 - the 1.1.9 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Oct 2009 15:50:27 -0000	1.6
+++ sources	18 Dec 2009 18:38:19 -0000	1.7
@@ -1 +1 @@
-1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2
+092b48ed6503f37d58b19acda13c5cb9  389-admin-1.1.10.a2.tar.bz2



From remi at fedoraproject.org  Fri Dec 18 18:52:45 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 18 Dec 2009 18:52:45 +0000 (UTC)
Subject: rpms/php-channel-phpunit/devel channel.xml, 1.1,
	1.2 php-channel-phpunit.spec, 1.4, 1.5
Message-ID: <20091218185245.3233611C00E7@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-channel-phpunit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27234

Modified Files:
	channel.xml php-channel-phpunit.spec 
Log Message:
update to new channel.xml for URL, fix #542417


Index: channel.xml
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/devel/channel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- channel.xml	29 Dec 2006 17:38:13 -0000	1.1
+++ channel.xml	18 Dec 2009 18:52:44 -0000	1.2
@@ -1,16 +1,16 @@
-<?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.phpunit.de</name>
- <summary>PHPUnit channel server</summary>
- <suggestedalias>phpunit</suggestedalias>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://pear.phpunit.de/Chiara_PEAR_Server_REST/</baseurl>
-    <baseurl type="REST1.1">http://pear.phpunit.de/Chiara_PEAR_Server_REST/</baseurl>
-   </rest>
-  </primary>
- </servers>
+<?xml version="1.0" encoding="UTF-8" ?>
+<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/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+  <name>pear.phpunit.de</name>
+  <summary>PHPUnit PEAR Channel</summary>
+  <suggestedalias>phpunit</suggestedalias>
+  <servers>
+    <primary>
+      <rest>
+        <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+      </rest>
+    </primary>
+  </servers>
 </channel>
\ No newline at end of file


Index: php-channel-phpunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/devel/php-channel-phpunit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-channel-phpunit.spec	26 Jul 2009 17:59:26 -0000	1.4
+++ php-channel-phpunit.spec	18 Dec 2009 18:52:45 -0000	1.5
@@ -1,8 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:           php-channel-phpunit
-Version:        1.0
-Release:        4%{?dist}
+# Use REST version
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Adds phpunit channel to PEAR
 
 Group:          Development/Languages
@@ -32,7 +33,7 @@ from this channel to be installed.
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpunit.de.xml
+install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/%{name}.xml
 
 
 %clean
@@ -41,9 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ $1 -eq  1 ] ; then
-   %{__pear} channel-add %{pear_xmldir}/pear.phpunit.de.xml > /dev/null || :
+   %{__pear} channel-add %{pear_xmldir}/%{name}.xml > /dev/null || :
 else
-   %{__pear} channel-update %{pear_xmldir}/pear.phpunit.de.xml > /dev/null ||:
+   %{__pear} channel-update %{pear_xmldir}/%{name}.xml > /dev/null ||:
 fi
 
 
@@ -55,10 +56,14 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/*
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-1
+- update for REST 1.3 and new URL (#542417)
+- rename pear.phpunit.de.xml to php-channel-phpunit.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From remi at fedoraproject.org  Fri Dec 18 18:58:22 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 18 Dec 2009 18:58:22 +0000 (UTC)
Subject: rpms/php-channel-phpunit/F-12 channel.xml, 1.1,
	1.2 php-channel-phpunit.spec, 1.4, 1.5
Message-ID: <20091218185822.6F41511C00E7@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-channel-phpunit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28416

Modified Files:
	channel.xml php-channel-phpunit.spec 
Log Message:
update to new channel.xml for URL, fix #542417


Index: channel.xml
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/F-12/channel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- channel.xml	29 Dec 2006 17:38:13 -0000	1.1
+++ channel.xml	18 Dec 2009 18:58:22 -0000	1.2
@@ -1,16 +1,16 @@
-<?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.phpunit.de</name>
- <summary>PHPUnit channel server</summary>
- <suggestedalias>phpunit</suggestedalias>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://pear.phpunit.de/Chiara_PEAR_Server_REST/</baseurl>
-    <baseurl type="REST1.1">http://pear.phpunit.de/Chiara_PEAR_Server_REST/</baseurl>
-   </rest>
-  </primary>
- </servers>
+<?xml version="1.0" encoding="UTF-8" ?>
+<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/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+  <name>pear.phpunit.de</name>
+  <summary>PHPUnit PEAR Channel</summary>
+  <suggestedalias>phpunit</suggestedalias>
+  <servers>
+    <primary>
+      <rest>
+        <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+      </rest>
+    </primary>
+  </servers>
 </channel>
\ No newline at end of file


Index: php-channel-phpunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/F-12/php-channel-phpunit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-channel-phpunit.spec	26 Jul 2009 17:59:26 -0000	1.4
+++ php-channel-phpunit.spec	18 Dec 2009 18:58:22 -0000	1.5
@@ -1,8 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:           php-channel-phpunit
-Version:        1.0
-Release:        4%{?dist}
+# Use REST version
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Adds phpunit channel to PEAR
 
 Group:          Development/Languages
@@ -32,7 +33,7 @@ from this channel to be installed.
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpunit.de.xml
+install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/%{name}.xml
 
 
 %clean
@@ -41,9 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ $1 -eq  1 ] ; then
-   %{__pear} channel-add %{pear_xmldir}/pear.phpunit.de.xml > /dev/null || :
+   %{__pear} channel-add %{pear_xmldir}/%{name}.xml > /dev/null || :
 else
-   %{__pear} channel-update %{pear_xmldir}/pear.phpunit.de.xml > /dev/null ||:
+   %{__pear} channel-update %{pear_xmldir}/%{name}.xml > /dev/null ||:
 fi
 
 
@@ -55,10 +56,14 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/*
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-1
+- update for REST 1.3 and new URL (#542417)
+- rename pear.phpunit.de.xml to php-channel-phpunit.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From remi at fedoraproject.org  Fri Dec 18 19:05:18 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 18 Dec 2009 19:05:18 +0000 (UTC)
Subject: rpms/php-channel-phpunit/F-11 channel.xml, 1.1,
	1.2 php-channel-phpunit.spec, 1.3, 1.4
Message-ID: <20091218190518.D90C511C00E7@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-channel-phpunit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29796

Modified Files:
	channel.xml php-channel-phpunit.spec 
Log Message:
update to new channel.xml for URL, fix #542417


Index: channel.xml
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/F-11/channel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- channel.xml	29 Dec 2006 17:38:13 -0000	1.1
+++ channel.xml	18 Dec 2009 19:05:18 -0000	1.2
@@ -1,16 +1,16 @@
-<?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.phpunit.de</name>
- <summary>PHPUnit channel server</summary>
- <suggestedalias>phpunit</suggestedalias>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://pear.phpunit.de/Chiara_PEAR_Server_REST/</baseurl>
-    <baseurl type="REST1.1">http://pear.phpunit.de/Chiara_PEAR_Server_REST/</baseurl>
-   </rest>
-  </primary>
- </servers>
+<?xml version="1.0" encoding="UTF-8" ?>
+<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/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+  <name>pear.phpunit.de</name>
+  <summary>PHPUnit PEAR Channel</summary>
+  <suggestedalias>phpunit</suggestedalias>
+  <servers>
+    <primary>
+      <rest>
+        <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+      </rest>
+    </primary>
+  </servers>
 </channel>
\ No newline at end of file


Index: php-channel-phpunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/F-11/php-channel-phpunit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-channel-phpunit.spec	26 Feb 2009 20:30:11 -0000	1.3
+++ php-channel-phpunit.spec	18 Dec 2009 19:05:18 -0000	1.4
@@ -1,8 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:           php-channel-phpunit
-Version:        1.0
-Release:        3%{?dist}
+# Use REST version
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Adds phpunit channel to PEAR
 
 Group:          Development/Languages
@@ -32,7 +33,7 @@ from this channel to be installed.
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpunit.de.xml
+install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/%{name}.xml
 
 
 %clean
@@ -41,9 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ $1 -eq  1 ] ; then
-   %{__pear} channel-add %{pear_xmldir}/pear.phpunit.de.xml > /dev/null || :
+   %{__pear} channel-add %{pear_xmldir}/%{name}.xml > /dev/null || :
 else
-   %{__pear} channel-update %{pear_xmldir}/pear.phpunit.de.xml > /dev/null ||:
+   %{__pear} channel-update %{pear_xmldir}/%{name}.xml > /dev/null ||:
 fi
 
 
@@ -55,10 +56,14 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/*
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-1
+- update for REST 1.3 and new URL (#542417)
+- rename pear.phpunit.de.xml to php-channel-phpunit.xml
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pwouters at fedoraproject.org  Fri Dec 18 19:16:17 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 18 Dec 2009 19:16:17 +0000 (UTC)
Subject: File unbound-1.4.1.tar.gz uploaded to lookaside cache by pwouters
Message-ID: <20091218191617.0B91728ED3D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for unbound:

1e03ef9618e4bca02005bd99bc6af75c  unbound-1.4.1.tar.gz



From than at fedoraproject.org  Fri Dec 18 19:21:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 18 Dec 2009 19:21:51 +0000 (UTC)
Subject: rpms/kde-i18n/F-12 kde-i18n.spec,1.101,1.102
Message-ID: <20091218192151.B590A11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-i18n/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv998

Modified Files:
	kde-i18n.spec 
Log Message:
add missing %defattr




Index: kde-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/F-12/kde-i18n.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- kde-i18n.spec	13 Nov 2009 13:43:05 -0000	1.101
+++ kde-i18n.spec	18 Dec 2009 19:21:51 -0000	1.102
@@ -7,7 +7,7 @@ Summary: Internationalization support fo
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -1331,6 +1331,7 @@ rm -rf %{buildroot}
 
 %if 0%{?flags}
 %files flags
+%defattr(-,root,root,-)
 %{_datadir}/locale/*/*.png
 %endif
 
@@ -1772,6 +1773,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 3.5.10-11
+- add missing %defattr
+
 * Fri Nov 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:3.5.10-10
 - remove Fedora<=9 conditionals, also fixes the specfile for EL6 (#537392)
 



From than at fedoraproject.org  Fri Dec 18 19:22:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 18 Dec 2009 19:22:21 +0000 (UTC)
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.101,1.102
Message-ID: <20091218192221.457FE11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-i18n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1158

Modified Files:
	kde-i18n.spec 
Log Message:
add missing %defattr




Index: kde-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- kde-i18n.spec	13 Nov 2009 13:43:05 -0000	1.101
+++ kde-i18n.spec	18 Dec 2009 19:22:21 -0000	1.102
@@ -7,7 +7,7 @@ Summary: Internationalization support fo
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -1331,6 +1331,7 @@ rm -rf %{buildroot}
 
 %if 0%{?flags}
 %files flags
+%defattr(-,root,root,-)
 %{_datadir}/locale/*/*.png
 %endif
 
@@ -1772,6 +1773,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 3.5.10-11
+- add missing %defattr
+
 * Fri Nov 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:3.5.10-10
 - remove Fedora<=9 conditionals, also fixes the specfile for EL6 (#537392)
 



From than at fedoraproject.org  Fri Dec 18 19:23:11 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 18 Dec 2009 19:23:11 +0000 (UTC)
Subject: rpms/kde-i18n/F-11 kde-i18n.spec,1.96,1.97
Message-ID: <20091218192311.D1BF711C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-i18n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1362

Modified Files:
	kde-i18n.spec 
Log Message:
add missing %defattr




Index: kde-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/F-11/kde-i18n.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kde-i18n.spec	5 Aug 2009 15:48:34 -0000	1.96
+++ kde-i18n.spec	18 Dec 2009 19:23:11 -0000	1.97
@@ -7,7 +7,7 @@ Summary: Internationalization support fo
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 9%{?dist}
+Release: 11%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -698,643 +698,640 @@ done
    rm -f %{buildroot}%{_datadir}/locale/*/flag.png
 %endif
 
-%if 0%{?fedora} >= 9
-   # remove .mo and entry.desktop files which conflict with KDE 4 kde-l10n
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/amor.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ark.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiocd_encoder_lame.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiocd_encoder_vorbis.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiorename_plugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/blinken.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/bovo.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/cervisia.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/cvsservice.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/display.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/dolphin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/drkonqi.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/filetypes.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/gwenview.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/htmlsearch.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/imagerename_plugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/irkick.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/joystick.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/juk.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_dir.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_file.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_ldapkio.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_net.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabcformat_binary.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaccess.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalgebra.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalzium.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kanagram.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kappfinder.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kate.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateexternaltoolsplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefilebrowserplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefiletemplates.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefindinfilesplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katehelloworld.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katehtmltools.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateinsertcommand.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katekjswrapper.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katekonsoleplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katemailfilesplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katemake.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateopenheader.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katepart4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katepybrowse.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katequickdocumentswitcherplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katesnippets.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katesymbolviewer.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katetabbarextension.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katetextfilter.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katexmlcheck.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katexmltools.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katomic.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbattleship.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kblackbox.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kblankscrn.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbounce.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbruch.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbstateapplet.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbugbuster.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcachegrind.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcalc.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcertpart.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcharselect.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcharselectapplet.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_krfb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_kwindesktop.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_phonon.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_phononxine.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_solid.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaccess.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaccessibility.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaudiocd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmbackground.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmbell.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcddb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcgi.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcolors.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcomponentchooser.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcrypto.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcss.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmenergy.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmfonts.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmhtmlsearch.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmicons.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminfo.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminit.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminput.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmioslaveinfo.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkamera.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkclock.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkded.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkdnssd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkeyboard.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkeys.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkio.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkonq.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkonqhtml.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkurifilt.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkvaio.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwallet.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwincompositing.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwindecoration.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwinrules.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwm.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlaunch.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlirc.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlocale.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmnic.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmnotify.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmperformance.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsamba.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmscreensaver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmshell.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsmartcard.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsmserver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmstyle.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmtaskbar.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmthinkpad.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmusb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmview1394.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmxinerama.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcolorchooser.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcron.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdat.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kde-menu.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdebugdialog.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelibs4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelibs_colors4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelirc.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepasswd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdeqt.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdessh.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdesu.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdesud.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdf.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdialog.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdmconfig.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdmgreet.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/keditbookmarks.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfifteenapplet.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_avi.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_dds.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_drgeo.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_dvi.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_exr.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_flac.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_kig.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mp3.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mpc.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mpeg.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_ogg.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_pnm.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_raw.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_rgb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_rpm.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_sid.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_theora.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_tiff.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_torrent.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_wav.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_xps.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfileaudiopreview4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfileshare.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfindpart.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfloppy.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfmclient.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfontinst.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfourinline.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgamma.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgeography.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kget.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgoldrunner.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgpg.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgreet_classic.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgreet_winbind.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khangman.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khelpcenter.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khotkeys.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khotnewstuff.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khtmlkttsd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kig.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kinetd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kinfocenter.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_archive.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_audiocd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_finger.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_fish.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_floppy.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_help4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_imap4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_jabberdisco.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_ldap.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_man.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_mbox.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_nfs.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_nntp.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_pop3.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_remote.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_settings.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_sftp.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_sieve.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_smb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_smtp.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_svn.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_thumbnail.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_trash.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_zeroconf.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kioclient.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kioexec.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiriki.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiten.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kjots.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kjumpingcube.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klaptopdaemon.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klettres.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klines.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klipper.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klock.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmag.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmahjongg.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmenuedit.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_asus.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_delli8k.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_generic.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_kvaio.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_powerbook.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_thinkpad.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilod.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmimetypefinder.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmines.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmix.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmoon.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmousetool.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmouth.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmplot.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetattach.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetwalk.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetworkconf.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knotify4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolf.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolourpaint4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kompare.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqueror.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konquest.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konsole.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kopete.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpackage.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpartsaver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpasswdserver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpat.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpercentage.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kppp.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kppplogview.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kquitapp.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krandr.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krdb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krdc.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kreadconfig.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_bugzilla.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kreversi.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krfb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kruler.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_bookmarksrunner.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_calculatorrunner.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_locationsrunner.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_searchrunner.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_webshortcutsrunner.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolourpaint.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksame.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksayit.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscanplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscreensaver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kshisen.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kshorturifilter.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksim.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksmserver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksnapshot.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kspaceduel.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksplashthemes.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksquares.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstars.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstart.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstartperf.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_config.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_keramik_config.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_phase_config.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksudoku.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksysguard.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksystraycmd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksysv.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kteatime.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktexteditor_plugins.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kthememanager.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktimer.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktip.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktouch.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktraderclient.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktron.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kttsd.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktuberling.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kturtle.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktux.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuiserver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuiviewer.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kurifilter.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuser.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwalletmanager.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kweather.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_art_clients.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_clients.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_effects.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_lib.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwordquiz.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kworldclock.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwrite.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwriteconfig.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kxkb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kxsconfig.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libKTTSD.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkblog.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcal.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcddb.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcompactdisc.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdeedu.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdegames.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkldap.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkmahjongg.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkmime.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkonq.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpimidentities.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpimutils.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkresources.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkscreensaver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libktnef.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkworkspace.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkxmlrpcclient.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libmailtransport.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libphonon.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libplasma.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libtaskmanager.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/lskat.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/marble.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nepomukcoreservices.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nepomukserver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nsplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/oktetapart.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_chm.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_djvu.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_dvi.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_fictionbook.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_ghostview.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_kimgio.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_ooo.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_plucker.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_poppler.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_tiff.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_xps.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/parley.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/phonon-xine.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/phonon_kde.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_battery.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_clock.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_desktop.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_devicenotifier.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_dig_clock.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_kget.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_knewsticker.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_launcher.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_pager.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_skapplet.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_tasks.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_engine_dict.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasmaengineexplorer.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/processcore.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/processui.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/secpolicy.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/solidcontrol.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/solidshell.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/soliduiserver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/spy.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/strigila_diff.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/superkaramba.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/svgpart.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/sweeper.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/systemsettings.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/timezones4.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/umbrello.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/useraccount.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
-
-   # keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
-   # rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfilereplace.mo
-   # rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kimagemapeditor.mo
-   # rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klinkstatus.mo
-
-   # remove docs which conflict with KDE 4 kde-l10n
-   rm -rf %{buildroot}%{_docdir}/HTML/*/amor
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ark
-   rm -rf %{buildroot}%{_docdir}/HTML/*/blinken
-   rm -rf %{buildroot}%{_docdir}/HTML/*/bovo
-   rm -rf %{buildroot}%{_docdir}/HTML/*/cervisia
-   rm -rf %{buildroot}%{_docdir}/HTML/*/common
-   rm -rf %{buildroot}%{_docdir}/HTML/*/dolphin
-   rm -rf %{buildroot}%{_docdir}/HTML/*/gwenview
-   rm -rf %{buildroot}%{_docdir}/HTML/*/irkick
-   rm -rf %{buildroot}%{_docdir}/HTML/*/juk
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kalgebra
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kalzium
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kamera
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kanagram
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kapptemplate
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kate
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kate-plugins
-   rm -rf %{buildroot}%{_docdir}/HTML/*/katomic
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kbattleship
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kblackbox
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kbounce
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kbruch
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kbugbuster
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kcachegrind
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kcalc
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kcharselect
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kcmlirc
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kcontrol
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kcron
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdat
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdebugdialog
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdesvn-build
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdf
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kdm
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kfind
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kfloppy
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kfourinline
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kgamma
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kgeography
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kget
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kgoldrunner
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kgpg
-   rm -rf %{buildroot}%{_docdir}/HTML/*/khangman
-   rm -rf %{buildroot}%{_docdir}/HTML/*/khelpcenter
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kig
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kinfocenter
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kiriki
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kioslave
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kiten
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kjots
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kjumpingcube
-   rm -rf %{buildroot}%{_docdir}/HTML/*/klettres
-   rm -rf %{buildroot}%{_docdir}/HTML/*/klines
-   rm -rf %{buildroot}%{_docdir}/HTML/*/klipper
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmag
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmahjongg
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmenuedit
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmines
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmix
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmoon
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmousetool
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmouth
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmplot
-   rm -rf %{buildroot}%{_docdir}/HTML/*/knetattach
-   rm -rf %{buildroot}%{_docdir}/HTML/*/knetwalk
-   rm -rf %{buildroot}%{_docdir}/HTML/*/knetworkconf
-   rm -rf %{buildroot}%{_docdir}/HTML/*/knewsticker
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kolf
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kolourpaint
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kompare
-   rm -rf %{buildroot}%{_docdir}/HTML/*/konqueror
-   rm -rf %{buildroot}%{_docdir}/HTML/*/konquest
-   rm -rf %{buildroot}%{_docdir}/HTML/*/konsole
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kopete
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kpackage
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kpat
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kpercentage
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kppp
-   rm -rf %{buildroot}%{_docdir}/HTML/*/krdc
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kreversi
-   rm -rf %{buildroot}%{_docdir}/HTML/*/krfb
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kruler
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ksame
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kscd
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kshisen
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ksim
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ksnapshot
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kspaceduel
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ksquares
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kstars
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ksudoku
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ksysguard
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ksysv
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kteatime
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ktimer
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ktouch
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ktron
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kttsd
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ktuberling
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kturtle
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kuser
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kwallet
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kweather
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kwordquiz
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kworldclock
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kwrite
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kxkb
-   rm -rf %{buildroot}%{_docdir}/HTML/*/lskat
-   rm -rf %{buildroot}%{_docdir}/HTML/*/marble
-   rm -rf %{buildroot}%{_docdir}/HTML/*/okular
-   rm -rf %{buildroot}%{_docdir}/HTML/*/parley
-   rm -rf %{buildroot}%{_docdir}/HTML/*/plasma
-   rm -rf %{buildroot}%{_docdir}/HTML/*/sonnet
-   rm -rf %{buildroot}%{_docdir}/HTML/*/superkaramba
-   rm -rf %{buildroot}%{_docdir}/HTML/*/umbrello
-
-   # keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
-   # rm -rf %{buildroot}%{_docdir}/HTML/*/kfilereplace
-   # rm -rf %{buildroot}%{_docdir}/HTML/*/kimagemapeditor
-   # rm -rf %{buildroot}%{_docdir}/HTML/*/klinkreplace
-   # rm -rf %{buildroot}%{_docdir}/HTML/*/xsldbg
-
-   # remove .mo files which conflict with KDE 4 extragear
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcoloredit.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiconedit.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaudiocreator.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmid.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/akregator_konqplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/autorefresh.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/babelfish.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/crashesplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/dirfilterplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/domtreeviewer.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/fsview.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/imgalleryplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khtmlsettingsplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_mediaplayer.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_metabar.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_news.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/mf_konqplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/minitoolsplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/rellinks.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/searchbarplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uachangerplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/validatorsplugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/webarchiver.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksig.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpovmodeler.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuickshow.mo
-
-   # remove docs which conflict with KDE 4 extragear
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kcoloredit
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kiconedit
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kaudiocreator
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmid
-   rm -rf %{buildroot}%{_docdir}/HTML/*/konq-plugins
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ksig
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kpovmodeler
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kuickshow
-
-   # remove obsolete KDE 3 application data translations
-   rm -rf %{buildroot}%{_datadir}/apps
-
-%if 0%{?fedora} >= 10
-   # on F10+, also get rid of kdepim stuff
-   rm -rf %{buildroot}%{_docdir}/HTML/*/akregator
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kaddressbook
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kalarm
-   rm -rf %{buildroot}%{_docdir}/HTML/*/karm
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kleopatra
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kmail
-   rm -rf %{buildroot}%{_docdir}/HTML/*/knode
-   rm -rf %{buildroot}%{_docdir}/HTML/*/knotes
-   rm -rf %{buildroot}%{_docdir}/HTML/*/konsolekalendar
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kontact
-   rm -rf %{buildroot}%{_docdir}/HTML/*/korganizer
-   rm -rf %{buildroot}%{_docdir}/HTML/*/korn
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kpilot
-   rm -rf %{buildroot}%{_docdir}/HTML/*/ktnef
-   rm -rf %{buildroot}%{_docdir}/HTML/*/kwatchgnupg
-   rm -rf %{buildroot}%{_docdir}/HTML/*/multisynk
-
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/akregator.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_slox.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaddressbook.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalarm.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkabconfig.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkontactnt.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimresources.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimwizards.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_vcf.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_groupwise.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kitchensync.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kleopatra.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_calendar_plugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_vcard_plugin.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmailcvt.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knode.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knotes.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konsolekalendar.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kontact.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korganizer.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korn.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpilot.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_birthday.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_featureplan.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupware.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupwise.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_kolab.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_remote.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_scalix.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_tvanytime.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_xmlrpc.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktnef.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwatchgnupg.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdepim.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkholidays.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkleopatra.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpgp.mo
-   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libksieve.mo
-%endif
-%endif
+# remove .mo and entry.desktop files which conflict with KDE 4 kde-l10n
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/amor.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ark.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiocd_encoder_lame.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiocd_encoder_vorbis.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/audiorename_plugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/blinken.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/bovo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/cervisia.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/cvsservice.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/display.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/dolphin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/drkonqi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/filetypes.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/gwenview.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/htmlsearch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/imagerename_plugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/irkick.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/joystick.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/juk.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_dir.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_file.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_ldapkio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_net.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabcformat_binary.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaccess.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalgebra.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalzium.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kanagram.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kappfinder.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kate.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateexternaltoolsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefilebrowserplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefiletemplates.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katefindinfilesplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katehelloworld.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katehtmltools.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateinsertcommand.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katekjswrapper.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katekonsoleplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katemailfilesplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katemake.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kateopenheader.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katepart4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katepybrowse.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katequickdocumentswitcherplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katesnippets.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katesymbolviewer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katetabbarextension.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katetextfilter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katexmlcheck.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katexmltools.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/katomic.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbattleship.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kblackbox.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kblankscrn.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbounce.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbruch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbstateapplet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kbugbuster.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcachegrind.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcalc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcertpart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcharselect.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcharselectapplet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_krfb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_kwindesktop.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_phonon.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_phononxine.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcm_solid.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaccess.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaccessibility.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmaudiocd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmbackground.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmbell.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcddb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcgi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcolors.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcomponentchooser.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcrypto.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmcss.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmenergy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmfonts.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmhtmlsearch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmicons.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminfo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcminput.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmioslaveinfo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkamera.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkclock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkded.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkdnssd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkeyboard.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkeys.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkonq.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkonqhtml.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkurifilt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkvaio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwallet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwincompositing.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwindecoration.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwinrules.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkwm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlaunch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlirc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmlocale.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmnic.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmnotify.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmperformance.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsamba.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmscreensaver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmshell.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsmartcard.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmsmserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmstyle.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmtaskbar.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmthinkpad.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmusb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmview1394.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmxinerama.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcolorchooser.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcron.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdat.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kde-menu.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdebugdialog.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelibs4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelibs_colors4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdelirc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepasswd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdeqt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdessh.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdesu.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdesud.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdialog.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdmconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdmgreet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/keditbookmarks.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfifteenapplet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_avi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_dds.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_drgeo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_dvi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_exr.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_flac.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_kig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mp3.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mpc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_mpeg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_ogg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_pnm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_raw.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_rgb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_rpm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_sid.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_theora.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_tiff.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_torrent.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_wav.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_xps.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfileaudiopreview4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfileshare.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfindpart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfloppy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfmclient.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfontinst.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfourinline.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgamma.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgeography.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kget.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgoldrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgpg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgreet_classic.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kgreet_winbind.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khangman.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khelpcenter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khotkeys.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khotnewstuff.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khtmlkttsd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kinetd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kinfocenter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_archive.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_audiocd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_finger.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_fish.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_floppy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_help4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_imap4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_jabberdisco.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_ldap.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_man.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_mbox.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_nfs.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_nntp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_pop3.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_remote.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_settings.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_sftp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_sieve.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_smb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_smtp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_svn.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_thumbnail.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_trash.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_zeroconf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kioclient.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kioexec.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiriki.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiten.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kjots.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kjumpingcube.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klaptopdaemon.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klettres.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klines.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klipper.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmag.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmahjongg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmenuedit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_asus.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_delli8k.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_generic.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_kvaio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_powerbook.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilo_thinkpad.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmilod.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmimetypefinder.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmines.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmix.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmoon.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmousetool.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmouth.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmplot.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetattach.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetwalk.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetworkconf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knotify4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolourpaint4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kompare.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqueror.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konquest.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konsole.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kopete.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpackage.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpartsaver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpasswdserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpat.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpercentage.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kppp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kppplogview.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kquitapp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krandr.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krdb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krdc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kreadconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_bugzilla.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kreversi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krfb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kruler.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_bookmarksrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_calculatorrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_locationsrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_searchrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/krunner_webshortcutsrunner.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kolourpaint.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksame.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksayit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscanplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kscreensaver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kshisen.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kshorturifilter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksim.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksmserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksnapshot.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kspaceduel.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksplashthemes.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksquares.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstars.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstartperf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_config.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_keramik_config.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kstyle_phase_config.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksudoku.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksysguard.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksystraycmd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksysv.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kteatime.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktexteditor_plugins.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kthememanager.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktimer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktip.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktouch.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktraderclient.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktron.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kttsd.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktuberling.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kturtle.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktux.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuiserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuiviewer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kurifilter.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuser.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwalletmanager.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kweather.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_art_clients.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_clients.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_effects.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwin_lib.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwordquiz.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kworldclock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwrite.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwriteconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kxkb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kxsconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libKTTSD.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkblog.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcal.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcddb.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkcompactdisc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdeedu.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdegames.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkldap.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkmahjongg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkmime.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkonq.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpimidentities.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpimutils.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkresources.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkscreensaver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libktnef.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkworkspace.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkxmlrpcclient.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libmailtransport.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libphonon.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libplasma.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libtaskmanager.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/lskat.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/marble.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nepomukcoreservices.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nepomukserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/oktetapart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_chm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_djvu.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_dvi.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_fictionbook.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_ghostview.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_kimgio.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_ooo.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_plucker.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_poppler.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_tiff.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/okular_xps.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/parley.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/phonon-xine.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/phonon_kde.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_battery.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_clock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_desktop.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_devicenotifier.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_dig_clock.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_kget.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_knewsticker.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_launcher.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_pager.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_skapplet.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_applet_tasks.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasma_engine_dict.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/plasmaengineexplorer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/processcore.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/processui.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/secpolicy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/solidcontrol.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/solidshell.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/soliduiserver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/spy.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/strigila_diff.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/superkaramba.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/svgpart.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/sweeper.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/systemsettings.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/timezones4.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/umbrello.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/useraccount.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
+
+# keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
+# rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfilereplace.mo
+# rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kimagemapeditor.mo
+# rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klinkstatus.mo
+
+# remove docs which conflict with KDE 4 kde-l10n
+rm -rf %{buildroot}%{_docdir}/HTML/*/amor
+rm -rf %{buildroot}%{_docdir}/HTML/*/ark
+rm -rf %{buildroot}%{_docdir}/HTML/*/blinken
+rm -rf %{buildroot}%{_docdir}/HTML/*/bovo
+rm -rf %{buildroot}%{_docdir}/HTML/*/cervisia
+rm -rf %{buildroot}%{_docdir}/HTML/*/common
+rm -rf %{buildroot}%{_docdir}/HTML/*/dolphin
+rm -rf %{buildroot}%{_docdir}/HTML/*/gwenview
+rm -rf %{buildroot}%{_docdir}/HTML/*/irkick
+rm -rf %{buildroot}%{_docdir}/HTML/*/juk
+rm -rf %{buildroot}%{_docdir}/HTML/*/kalgebra
+rm -rf %{buildroot}%{_docdir}/HTML/*/kalzium
+rm -rf %{buildroot}%{_docdir}/HTML/*/kamera
+rm -rf %{buildroot}%{_docdir}/HTML/*/kanagram
+rm -rf %{buildroot}%{_docdir}/HTML/*/kapptemplate
+rm -rf %{buildroot}%{_docdir}/HTML/*/kate
+rm -rf %{buildroot}%{_docdir}/HTML/*/kate-plugins
+rm -rf %{buildroot}%{_docdir}/HTML/*/katomic
+rm -rf %{buildroot}%{_docdir}/HTML/*/kbattleship
+rm -rf %{buildroot}%{_docdir}/HTML/*/kblackbox
+rm -rf %{buildroot}%{_docdir}/HTML/*/kbounce
+rm -rf %{buildroot}%{_docdir}/HTML/*/kbruch
+rm -rf %{buildroot}%{_docdir}/HTML/*/kbugbuster
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcachegrind
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcalc
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcharselect
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcmlirc
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcontrol
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcron
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdat
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdebugdialog
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdesu
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdesvn-build
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdf
+rm -rf %{buildroot}%{_docdir}/HTML/*/kdm
+rm -rf %{buildroot}%{_docdir}/HTML/*/kfind
+rm -rf %{buildroot}%{_docdir}/HTML/*/kfloppy
+rm -rf %{buildroot}%{_docdir}/HTML/*/kfourinline
+rm -rf %{buildroot}%{_docdir}/HTML/*/kgamma
+rm -rf %{buildroot}%{_docdir}/HTML/*/kgeography
+rm -rf %{buildroot}%{_docdir}/HTML/*/kget
+rm -rf %{buildroot}%{_docdir}/HTML/*/kgoldrunner
+rm -rf %{buildroot}%{_docdir}/HTML/*/kgpg
+rm -rf %{buildroot}%{_docdir}/HTML/*/khangman
+rm -rf %{buildroot}%{_docdir}/HTML/*/khelpcenter
+rm -rf %{buildroot}%{_docdir}/HTML/*/kig
+rm -rf %{buildroot}%{_docdir}/HTML/*/kinfocenter
+rm -rf %{buildroot}%{_docdir}/HTML/*/kiriki
+rm -rf %{buildroot}%{_docdir}/HTML/*/kioslave
+rm -rf %{buildroot}%{_docdir}/HTML/*/kiten
+rm -rf %{buildroot}%{_docdir}/HTML/*/kjots
+rm -rf %{buildroot}%{_docdir}/HTML/*/kjumpingcube
+rm -rf %{buildroot}%{_docdir}/HTML/*/klettres
+rm -rf %{buildroot}%{_docdir}/HTML/*/klines
+rm -rf %{buildroot}%{_docdir}/HTML/*/klipper
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmag
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmahjongg
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmenuedit
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmines
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmix
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmoon
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmousetool
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmouth
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmplot
+rm -rf %{buildroot}%{_docdir}/HTML/*/knetattach
+rm -rf %{buildroot}%{_docdir}/HTML/*/knetwalk
+rm -rf %{buildroot}%{_docdir}/HTML/*/knetworkconf
+rm -rf %{buildroot}%{_docdir}/HTML/*/knewsticker
+rm -rf %{buildroot}%{_docdir}/HTML/*/kolf
+rm -rf %{buildroot}%{_docdir}/HTML/*/kolourpaint
+rm -rf %{buildroot}%{_docdir}/HTML/*/kompare
+rm -rf %{buildroot}%{_docdir}/HTML/*/konqueror
+rm -rf %{buildroot}%{_docdir}/HTML/*/konquest
+rm -rf %{buildroot}%{_docdir}/HTML/*/konsole
+rm -rf %{buildroot}%{_docdir}/HTML/*/kopete
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpackage
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpat
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpercentage
+rm -rf %{buildroot}%{_docdir}/HTML/*/kppp
+rm -rf %{buildroot}%{_docdir}/HTML/*/krdc
+rm -rf %{buildroot}%{_docdir}/HTML/*/kreversi
+rm -rf %{buildroot}%{_docdir}/HTML/*/krfb
+rm -rf %{buildroot}%{_docdir}/HTML/*/kruler
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksame
+rm -rf %{buildroot}%{_docdir}/HTML/*/kscd
+rm -rf %{buildroot}%{_docdir}/HTML/*/kshisen
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksim
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksnapshot
+rm -rf %{buildroot}%{_docdir}/HTML/*/kspaceduel
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksquares
+rm -rf %{buildroot}%{_docdir}/HTML/*/kstars
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksudoku
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksysguard
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksysv
+rm -rf %{buildroot}%{_docdir}/HTML/*/kteatime
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktimer
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktouch
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktron
+rm -rf %{buildroot}%{_docdir}/HTML/*/kttsd
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktuberling
+rm -rf %{buildroot}%{_docdir}/HTML/*/kturtle
+rm -rf %{buildroot}%{_docdir}/HTML/*/kuser
+rm -rf %{buildroot}%{_docdir}/HTML/*/kwallet
+rm -rf %{buildroot}%{_docdir}/HTML/*/kweather
+rm -rf %{buildroot}%{_docdir}/HTML/*/kwordquiz
+rm -rf %{buildroot}%{_docdir}/HTML/*/kworldclock
+rm -rf %{buildroot}%{_docdir}/HTML/*/kwrite
+rm -rf %{buildroot}%{_docdir}/HTML/*/kxkb
+rm -rf %{buildroot}%{_docdir}/HTML/*/lskat
+rm -rf %{buildroot}%{_docdir}/HTML/*/marble
+rm -rf %{buildroot}%{_docdir}/HTML/*/okular
+rm -rf %{buildroot}%{_docdir}/HTML/*/parley
+rm -rf %{buildroot}%{_docdir}/HTML/*/plasma
+rm -rf %{buildroot}%{_docdir}/HTML/*/sonnet
+rm -rf %{buildroot}%{_docdir}/HTML/*/superkaramba
+rm -rf %{buildroot}%{_docdir}/HTML/*/umbrello
+
+# keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
+# rm -rf %{buildroot}%{_docdir}/HTML/*/kfilereplace
+# rm -rf %{buildroot}%{_docdir}/HTML/*/kimagemapeditor
+# rm -rf %{buildroot}%{_docdir}/HTML/*/klinkreplace
+# rm -rf %{buildroot}%{_docdir}/HTML/*/xsldbg
+
+# remove .mo files which conflict with KDE 4 extragear
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcoloredit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kiconedit.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaudiocreator.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmid.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/akregator_konqplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/autorefresh.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/babelfish.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/crashesplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/dirfilterplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/domtreeviewer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/fsview.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/imgalleryplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/khtmlsettingsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_mediaplayer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_metabar.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konqsidebar_news.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/mf_konqplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/minitoolsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/rellinks.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/searchbarplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uachangerplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/validatorsplugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/webarchiver.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpovmodeler.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuickshow.mo
+
+# remove docs which conflict with KDE 4 extragear
+rm -rf %{buildroot}%{_docdir}/HTML/*/kcoloredit
+rm -rf %{buildroot}%{_docdir}/HTML/*/kiconedit
+rm -rf %{buildroot}%{_docdir}/HTML/*/kaudiocreator
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmid
+rm -rf %{buildroot}%{_docdir}/HTML/*/konq-plugins
+rm -rf %{buildroot}%{_docdir}/HTML/*/ksig
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpovmodeler
+rm -rf %{buildroot}%{_docdir}/HTML/*/kuickshow
+
+# remove obsolete KDE 3 application data translations
+rm -rf %{buildroot}%{_datadir}/apps
+
+# on F10+, also get rid of kdepim stuff
+rm -rf %{buildroot}%{_docdir}/HTML/*/akregator
+rm -rf %{buildroot}%{_docdir}/HTML/*/kaddressbook
+rm -rf %{buildroot}%{_docdir}/HTML/*/kalarm
+rm -rf %{buildroot}%{_docdir}/HTML/*/karm
+rm -rf %{buildroot}%{_docdir}/HTML/*/kleopatra
+rm -rf %{buildroot}%{_docdir}/HTML/*/kmail
+rm -rf %{buildroot}%{_docdir}/HTML/*/knode
+rm -rf %{buildroot}%{_docdir}/HTML/*/knotes
+rm -rf %{buildroot}%{_docdir}/HTML/*/konsolekalendar
+rm -rf %{buildroot}%{_docdir}/HTML/*/kontact
+rm -rf %{buildroot}%{_docdir}/HTML/*/korganizer
+rm -rf %{buildroot}%{_docdir}/HTML/*/korn
+rm -rf %{buildroot}%{_docdir}/HTML/*/kpilot
+rm -rf %{buildroot}%{_docdir}/HTML/*/ktnef
+rm -rf %{buildroot}%{_docdir}/HTML/*/kwatchgnupg
+rm -rf %{buildroot}%{_docdir}/HTML/*/multisynk
+
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/akregator.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_slox.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaddressbook.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalarm.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkabconfig.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkontactnt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimresources.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimwizards.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_vcf.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_groupwise.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kitchensync.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kleopatra.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_calendar_plugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_vcard_plugin.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmailcvt.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knode.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knotes.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konsolekalendar.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kontact.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korganizer.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korn.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpilot.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_birthday.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_featureplan.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupware.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupwise.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_kolab.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_remote.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_scalix.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_tvanytime.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_xmlrpc.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktnef.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwatchgnupg.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdepim.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkholidays.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkleopatra.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpgp.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libksieve.mo
 
 %clean
 rm -rf %{buildroot}
 
 %if 0%{?flags}
 %files flags
+%defattr(-,root,root,-)
 %{_datadir}/locale/*/*.png
 %endif
 
@@ -1369,9 +1366,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 %lang(bg) %{_datadir}/locale/bg/charset
-%if 0%{?fedora} < 9
-%lang(bg) %{_datadir}/apps/khangman/data/bg
-%endif
 
 %files Bengali
 %defattr(-,root,root,-)
@@ -1404,26 +1398,12 @@ rm -rf %{buildroot}
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/locale/ca/charset
 %lang(ca) %{_docdir}/HTML/ca/
-%if 0%{?fedora} < 9
-%lang(ca) %{_datadir}/apps/khangman/ca.txt
-%lang(ca) %{_datadir}/apps/khangman/data/ca
-%lang(ca) %{_datadir}/apps/katepart/syntax/logohighlightstyle.ca.xml
-%lang(ca) %{_datadir}/apps/kturtle/data/*.ca.xml
-%lang(ca) %{_datadir}/apps/kturtle/examples/ca
-%lang(ca) %{_datadir}/apps/kanagram/data/ca
-%lang(ca) %{_datadir}/apps/klatin/data/vocabs/ca
-%endif
 
 %files Czech
 %defattr(-,root,root,-)
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
 %lang(cs) %{_datadir}/locale/cs/charset
 %lang(cs) %{_docdir}/HTML/cs/
-%if 0%{?fedora} < 9
-%lang(cs) %{_datadir}/apps/khangman/data/cs
-%lang(cs) %{_datadir}/apps/khangman/cs.txt
-%lang(cs) %{_datadir}/apps/klettres/cs
-%endif
 
 %if %{buildall}
 %files Welsh
@@ -1438,28 +1418,12 @@ rm -rf %{buildroot}
 %lang(da) %{_datadir}/locale/da/charset
 %lang(da) %{_datadir}/locale/da/da.compendium
 %lang(da) %{_docdir}/HTML/da/
-%if 0%{?fedora} < 9
-%lang(da) %{_datadir}/apps/ktuberling/sounds/da/*
-%lang(da) %{_datadir}/apps/khangman/data/da
-%lang(da) %{_datadir}/apps/khangman/da.txt
-%lang(da) %{_datadir}/apps/klettres/da
-%endif
 
 %files German
 %defattr(-,root,root,-)
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
 %lang(de) %{_datadir}/locale/de/charset
 %lang(de) %{_docdir}/HTML/de/
-%if 0%{?fedora} < 9
-%lang(de) %{_datadir}/apps/klettres/de
-%lang(de) %{_datadir}/apps/ktuberling/sounds/de/*
-%lang(de) %{_datadir}/apps/khangman/data/de
-%lang(de) %{_datadir}/apps/khangman/de.txt
-%lang(de) %{_datadir}/apps/kanagram/data/de
-%lang(de) %{_datadir}/apps/katepart/syntax/logohighlightstyle.de_DE.xml
-%lang(de) %{_datadir}/apps/kturtle/data/*.de_DE.xml
-%lang(de) %{_datadir}/apps/kturtle/examples/de_DE
-%endif
 
 %files Greek
 %defattr(-,root,root,-)
@@ -1471,12 +1435,6 @@ rm -rf %{buildroot}
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/locale/en_GB/charset
 %lang(en_GB) %{_docdir}/HTML/en_GB/
-%if 0%{?fedora} < 9
-%lang(en_GB) %{_datadir}/apps/katepart/syntax/logohighlightstyle.en_GB.xml
-%lang(en_GB) %{_datadir}/apps/kturtle/data/*.en_GB.xml
-%lang(en_GB) %{_datadir}/apps/kturtle/examples/en_GB
-%lang(en_GB) %{_datadir}/apps/klettres/en_GB
-%endif
 
 %if %{buildall}
 %files Esperanto
@@ -1490,26 +1448,12 @@ rm -rf %{buildroot}
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
 %lang(es) %{_datadir}/locale/es/charset
 %lang(es) %{_docdir}/HTML/es/
-%if 0%{?fedora} < 9
-%lang(es) %{_datadir}/apps/ktuberling/sounds/es/*
-%lang(es) %{_datadir}/apps/khangman/data/es
-%lang(es) %{_datadir}/apps/khangman/es.txt
-%lang(es) %{_datadir}/apps/katepart/syntax/logohighlightstyle.es.xml
-%lang(es) %{_datadir}/apps/kturtle/data/*.es.xml
-%lang(es) %{_datadir}/apps/kturtle/examples/es
-%lang(es) %{_datadir}/apps/klettres/es
-%endif
 
 %files Estonian
 %defattr(-,root,root,-)
 %lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
 %lang(et) %{_datadir}/locale/et/charset
 %lang(et) %{_docdir}/HTML/et/
-%if 0%{?fedora} < 9
-%lang(et) %{_datadir}/apps/kanagram/data/et
-%lang(et) %{_datadir}/apps/khangman/data/et
-%lang(et) %{_datadir}/apps/khangman/et.txt
-%endif
 
 %if %{buildall}
 %files Basque
@@ -1530,10 +1474,6 @@ rm -rf %{buildroot}
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
 %lang(fi) %{_datadir}/locale/fi/charset
 %lang(fi) %{_docdir}/HTML/fi/
-%if 0%{?fedora} < 9
-%lang(fi) %{_datadir}/apps/khangman/data/fi
-%lang(fi) %{_datadir}/apps/khangman/fi.txt
-%endif
 
 %if %{buildall}
 %files Faroese
@@ -1549,15 +1489,6 @@ rm -rf %{buildroot}
 %lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt
 %lang(fr) %{_datadir}/locale/fr/relecture_*
 %lang(fr) %{_docdir}/HTML/fr/
-%if 0%{?fedora} < 9
-%lang(fr) %{_datadir}/apps/ktuberling/sounds/fr/*
-%lang(fr) %{_datadir}/apps/khangman/data/fr
-%lang(fr) %{_datadir}/apps/khangman/fr.txt
-%lang(fr) %{_datadir}/apps/kanagram/data/fr
-%lang(fr) %{_datadir}/apps/katepart/syntax/logohighlightstyle.fr_FR.xml
-%lang(fr) %{_datadir}/apps/kturtle/data/*.fr_FR.xml
-%lang(fr) %{_datadir}/apps/kturtle/examples/fr_FR
-%endif
 
 %if %{buildall}
 %files Frisian
@@ -1583,9 +1514,6 @@ rm -rf %{buildroot}
 %lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 %lang(he) %{_datadir}/locale/he/charset
 %lang(he) %{_docdir}/HTML/he/
-%if 0%{?fedora} < 9
-%lang(he) %{_datadir}/apps/klettres/he
-%endif
 
 %files Hindi
 %defattr(-,root,root,-)
@@ -1605,10 +1533,6 @@ rm -rf %{buildroot}
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(hu) %{_datadir}/locale/hu/charset
 %lang(hu) %{_docdir}/HTML/hu/
-%if 0%{?fedora} < 9
-%lang(hu) %{_datadir}/apps/khangman/data/hu
-%lang(hu) %{_datadir}/apps/khangman/hu.txt
-%endif
 
 %if %{buildall}
 %files Indonesian
@@ -1628,16 +1552,6 @@ rm -rf %{buildroot}
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %{_datadir}/locale/it/charset
 %lang(it) %{_docdir}/HTML/it/
-%if 0%{?fedora} < 9
-%lang(it) %{_datadir}/apps/kanagram/data/it/*
-%lang(it) %{_datadir}/apps/ktuberling/sounds/it/*
-%lang(it) %{_datadir}/apps/khangman/data/it
-%lang(it) %{_datadir}/apps/klettres/it
-%lang(it) %{_datadir}/apps/katepart/syntax/logohighlightstyle.it.xml
-%lang(it) %{_datadir}/apps/klatin/data/vocabs/it
-%lang(it) %{_datadir}/apps/kturtle/data/*.it.xml
-%lang(it) %{_datadir}/apps/kturtle/examples/it
-%endif
 
 %files Japanese
 %defattr(-,root,root,-)
@@ -1705,14 +1619,6 @@ rm -rf %{buildroot}
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
 %lang(nl) %{_datadir}/locale/nl/charset
 %lang(nl) %{_docdir}/HTML/nl/
-%if 0%{?fedora} < 9
-%lang(nl) %{_datadir}/apps/ktuberling/sounds/nl/*
-%lang(nl) %{_datadir}/apps/khangman/data/nl
-%lang(nl) %{_datadir}/apps/klettres/nl
-%lang(nl) %{_datadir}/apps/katepart/syntax/logohighlightstyle.nl.xml
-%lang(nl) %{_datadir}/apps/kturtle/data/*.nl.xml
-%lang(nl) %{_datadir}/apps/kturtle/examples/nl
-%endif
 
 %files Norwegian
 %defattr(-,root,root,-)
@@ -1720,20 +1626,12 @@ rm -rf %{buildroot}
 %lang(nb) %{_datadir}/locale/nb/charset
 %lang(nb) %{_datadir}/locale/nb/README
 #%lang(nb) %{_docdir}/HTML/nb/
-#%if 0%{?fedora} < 9
-#%lang(nb) %{_datadir}/apps/khangman/data/nb
-#%lang(nb) %{_datadir}/apps/khangman/nb.txt
-#%endif
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root,-)
 %lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
 %lang(nn) %{_datadir}/locale/nn/charset
 #%lang(nn) %{_docdir}/HTML/nn/
-%if 0%{?fedora} < 9
-%lang(nn) %{_datadir}/apps/khangman/data/nn
-%lang(nn) %{_datadir}/apps/khangman/nn.txt
-%endif
 
 %if %{buildall}
 %files Occitan
@@ -1752,114 +1650,54 @@ rm -rf %{buildroot}
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
 %lang(pl) %{_datadir}/locale/pl/charset
 %lang(pl) %{_docdir}/HTML/pl/
-%if 0%{?fedora} < 9
-%lang(pl) %{_datadir}/apps/katepart/syntax/logohighlightstyle.pl.xml
-%lang(pl) %{_datadir}/apps/khangman/data/pl
-%lang(pl) %{_datadir}/apps/khangman/pl.txt
-%lang(pl) %{_datadir}/apps/kturtle/data/logokeywords.pl.xml
-%lang(pl) %{_datadir}/apps/kturtle/examples/pl
-%endif
 
 %files Portuguese
 %defattr(-,root,root,-)
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %{_datadir}/locale/pt/charset
 %lang(pt) %{_docdir}/HTML/pt/
-%if 0%{?fedora} < 9
-%lang(pt) %{_datadir}/apps/ktuberling/sounds/pt/*
-%lang(pt) %{_datadir}/apps/khangman/data/pt
-%lang(pt) %{_datadir}/apps/khangman/pt.txt
-%endif
 
 %files Brazil
 %defattr(-,root,root,-)
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
 %lang(pt_BR) %{_datadir}/locale/pt_BR/charset
 %lang(pt_BR) %{_docdir}/HTML/pt_BR/
-%if 0%{?fedora} < 9
-%lang(pt_BR) %{_datadir}/apps/khangman/data/pt_BR
-%lang(pt_BR) %{_datadir}/apps/khangman/pt_BR.txt
-%lang(pt_BR) %{_datadir}/apps/klettres/pt_BR
-%lang(pt_BR) %{_datadir}/apps/katepart/syntax/logohighlightstyle.pt_BR.xml
-%lang(pt_BR) %{_datadir}/apps/kturtle/data/*.pt_BR.xml
-%lang(pt_BR) %{_datadir}/apps/kturtle/examples/pt_BR
-%endif
 
 %files Romanian
 %defattr(-,root,root,-)
 %lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
 %lang(ro) %{_datadir}/locale/ro/charset
 %lang(ro) %{_docdir}/HTML/ro/
-%if 0%{?fedora} < 9
-%lang(ro) %{_datadir}/apps/ktuberling/sounds/ro/*
-%endif
 
 %files Russian
 %defattr(-,root,root,-)
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %{_datadir}/locale/ru/charset
 %lang(ru) %{_docdir}/HTML/ru/
-%if 0%{?fedora} < 9
-%lang(ru) %{_datadir}/apps/kanagram/data/ru
-%lang(ru) %{_datadir}/apps/khangman/data/ru
-%lang(ru) %{_datadir}/apps/katepart/syntax/*.ru.xml
-%lang(ru) %{_datadir}/apps/kturtle/data/*.ru.xml
-%lang(ru) %{_datadir}/apps/kturtle/examples/ru
-%endif
 
 %files Slovak
 %defattr(-,root,root,-)
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
 %lang(sk) %{_datadir}/locale/sk/charset
 %lang(sk) %{_docdir}/HTML/sk/
-%if 0%{?fedora} < 9
-%lang(sk) %{_datadir}/apps/ktuberling/sounds/sk/*
-%lang(sk) %{_datadir}/apps/kturtle/data/logokeywords.sk.xml
-%lang(sk) %{_datadir}/apps/kturtle/examples/sk
-%lang(sk) %{_datadir}/apps/klettres/sk
-%lang(sk) %{_datadir}/apps/katepart/syntax/logohighlightstyle.sk.xml
-%endif
 
 %files Slovenian
 %defattr(-,root,root,-)
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
 %lang(sl) %{_datadir}/locale/sl/charset
 %lang(sl) %{_docdir}/HTML/sl/
-%if 0%{?fedora} < 9
-%lang(sl) %{_datadir}/apps/ktuberling/sounds/sl/*
-%lang(sl) %{_datadir}/apps/khangman/data/sl
-%lang(sl) %{_datadir}/apps/khangman/sl.txt
-%lang(sl) %{_datadir}/apps/katepart/syntax/logohighlightstyle.sl.xml
-%lang(sl) %{_datadir}/apps/kturtle/data/*.sl.xml
-%lang(sl) %{_datadir}/apps/kturtle/examples/sl
-%endif
 
 %files Serbian
 %defattr(-,root,root,-)
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
 %lang(sr) %{_datadir}/locale/sr/charset
 %lang(sr) %{_docdir}/HTML/sr/
-%if 0%{?fedora} < 9
-%lang(sr) %{_datadir}/apps/khangman/data/sr
-%lang(sr) %{_datadir}/apps/katepart/syntax/logohighlightstyle.sr.xml
-%lang(sr) %{_datadir}/apps/kturtle/data/*.sr.xml
-%lang(sr) %{_datadir}/apps/kturtle/examples/sr
-%lang(sr) %{_datadir}/apps/ktuberling/sounds/sr
-%endif
 
 %files Swedish
 %defattr(-,root,root,-)
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/locale/sv/charset
 %lang(sv) %{_docdir}/HTML/sv/
-%if 0%{?fedora} < 9
-%lang(sv) %{_datadir}/apps/ktuberling/sounds/sv/*
-%lang(sv) %{_datadir}/apps/khangman/data/sv
-%lang(sv) %{_datadir}/apps/khangman/sv.txt
-%lang(sv) %{_datadir}/apps/katepart/syntax/logohighlightstyle.sv.xml
-%lang(sv) %{_datadir}/apps/kturtle/data/*.sv.xml
-%lang(sv) %{_datadir}/apps/kturtle/examples/sv
-%endif
 
 %files Tamil
 %defattr(-,root,root,-)
@@ -1885,10 +1723,6 @@ rm -rf %{buildroot}
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
 %lang(tr) %{_datadir}/locale/tr/charset
 %lang(tr) %{_docdir}/HTML/tr/
-%if 0%{?fedora} < 9
-%lang(tr) %{_datadir}/apps/khangman/data/tr
-%lang(tr) %{_datadir}/apps/khangman/tr.txt
-%endif
 
 %files Ukrainian
 %defattr(-,root,root,-)
@@ -1939,6 +1773,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Than Ngo <than at redhat.com> - 3.5.10-11
+- add missing %defattr
+
+* Fri Nov 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:3.5.10-10
+- remove Fedora<=9 conditionals, also fixes the specfile for EL6 (#537392)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From linville at fedoraproject.org  Fri Dec 18 19:25:24 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri, 18 Dec 2009 19:25:24 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.24,1.25 setregdomain,1.2,1.3
Message-ID: <20091218192524.341D811C00E6@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1810

Modified Files:
	crda.spec setregdomain 
Log Message:
Specify patch to iw in setregdomain


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- crda.spec	2 Dec 2009 21:46:57 -0000	1.24
+++ crda.spec	18 Dec 2009 19:25:23 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Fri Dec 18 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-2
+- Specify patch to iw in setregdomain
+
 * Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
 - Update wireless-regdb to version 2009.11.25 
 


Index: setregdomain
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/setregdomain,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- setregdomain	31 Mar 2009 17:37:13 -0000	1.2
+++ setregdomain	18 Dec 2009 19:25:23 -0000	1.3
@@ -9,7 +9,7 @@ then
 	. $REGDOMAIN
 	if [ -n "$COUNTRY" ]
 	then
-		iw reg set $COUNTRY
+		/sbin/iw reg set $COUNTRY
 		exit
 	fi
 fi
@@ -39,4 +39,4 @@ then
 	exit
 fi
 
-iw reg set $COUNTRY
+/sbin/iw reg set $COUNTRY



From rjones at fedoraproject.org  Fri Dec 18 19:30:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 18 Dec 2009 19:30:31 +0000 (UTC)
Subject: rpms/libguestfs/devel
	libguestfs-1.0.80-daemon-Work-around-udevsettle-issue-RHBZ-548121.patch,
	NONE, 1.1 libguestfs.spec, 1.116, 1.117
Message-ID: <20091218193031.837FF11C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2634

Modified Files:
	libguestfs.spec 
Added Files:
	libguestfs-1.0.80-daemon-Work-around-udevsettle-issue-RHBZ-548121.patch 
Log Message:
- Work around udevsettle command problem (RHBZ#548121).
- Enable tests.


libguestfs-1.0.80-daemon-Work-around-udevsettle-issue-RHBZ-548121.patch:
 guestfsd.c |   31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

--- NEW FILE libguestfs-1.0.80-daemon-Work-around-udevsettle-issue-RHBZ-548121.patch ---
>From 5c6147ecc7ee3cf657edb1e19ad5ab4e973424e0 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Fri, 18 Dec 2009 19:20:37 +0000
Subject: [PATCH] daemon: Work around udevsettle issue (RHBZ#548121).

---
 daemon/guestfsd.c |   30 +++++++++---------------------
 1 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index 520a4a4..0fc0128 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -1038,31 +1038,19 @@ device_name_translation (char *device, const char *func)
  * involved.  eg. You can create or remove some device, but the /dev
  * device node won't appear until some time later.  This means that
  * you get an error if you run one command followed by another.
+ *
  * Use 'udevadm settle' after certain commands, but don't be too
  * fussed if it fails.
+ *
+ * 'udevsettle' was the old name for this command (RHEL 5).  This was
+ * deprecated in favour of 'udevadm settle'.  The old 'udevsettle'
+ * command was left as a symlink.  Then in Fedora 13 the old symlink
+ * remained but it stopped working (RHBZ#548121), so we have to be
+ * careful not to assume that we can use 'udevsettle' if it exists.
  */
 void
 udev_settle (void)
 {
-  static int which_prog = 0;
-
-  if (which_prog == 0) {
-    if (access ("/sbin/udevsettle", X_OK) == 0)
-      which_prog = 2;
-    else if (access ("/sbin/udevadm", X_OK) == 0)
-      which_prog = 1;
-    else
-      which_prog = 3;
-  }
-
-  switch (which_prog) {
-  case 1:
-    command (NULL, NULL, "/sbin/udevadm", "settle", NULL);
-    break;
-  case 2:
-    command (NULL, NULL, "/sbin/udevsettle", NULL);
-    break;
-  default:
-    ;
-  }
+  (void) command (NULL, NULL, "/sbin/udevadm", "settle", NULL);
+  (void) command (NULL, NULL, "/sbin/udevsettle", NULL);
 }
-- 
1.6.5.2



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- libguestfs.spec	16 Dec 2009 17:29:58 -0000	1.116
+++ libguestfs.spec	18 Dec 2009 19:30:31 -0000	1.117
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.80
-Release:     2%{?dist}
+Release:     3%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -15,6 +15,9 @@ BuildRoot:   %{_tmppath}/%{name}-%{versi
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:      libguestfs-1.0.79-no-fuse-test.patch
 
+# Work around udevsettle command broken in Fedora 13 (RHBZ#548121).
+Patch1:      libguestfs-1.0.80-daemon-Work-around-udevsettle-issue-RHBZ-548121.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -328,6 +331,7 @@ Requires:    jpackage-utils
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -382,11 +386,11 @@ export LIBGUESTFS_DEBUG=1
 #                                 (FIXED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
 # 516543   ?            F-12   qemu-kvm segfaults when run inside a VM (FIXED)
-# 548121   all          F-13   udevsettle command is broken
+# 548121   all          F-13   udevsettle command is broken (WORKAROUND)
 
-#%ifarch x86_64  # reenable if we fix 548121
-#make check
-#%endif
+%ifarch x86_64
+make check
+%endif
 
 
 %install
@@ -602,6 +606,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-3
+- Work around udevsettle command problem (RHBZ#548121).
+- Enable tests.
+
 * Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-2
 - Disable tests because of RHBZ#548121.
 



From linville at fedoraproject.org  Fri Dec 18 19:31:37 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri, 18 Dec 2009 19:31:37 +0000 (UTC)
Subject: rpms/crda/F-11 crda.spec,1.22,1.23 setregdomain,1.2,1.3
Message-ID: <20091218193137.A55EB11C00E6@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2906

Modified Files:
	crda.spec setregdomain 
Log Message:



Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/crda.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- crda.spec	2 Dec 2009 21:56:44 -0000	1.22
+++ crda.spec	18 Dec 2009 19:31:37 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Fri Dec 18 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-2
+- Specify patch to iw in setregdomain
+
 * Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
 - Update wireless-regdb to version 2009.11.25 
 


Index: setregdomain
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/setregdomain,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- setregdomain	31 Mar 2009 17:37:13 -0000	1.2
+++ setregdomain	18 Dec 2009 19:31:37 -0000	1.3
@@ -9,7 +9,7 @@ then
 	. $REGDOMAIN
 	if [ -n "$COUNTRY" ]
 	then
-		iw reg set $COUNTRY
+		/sbin/iw reg set $COUNTRY
 		exit
 	fi
 fi
@@ -39,4 +39,4 @@ then
 	exit
 fi
 
-iw reg set $COUNTRY
+/sbin/iw reg set $COUNTRY



From linville at fedoraproject.org  Fri Dec 18 19:33:13 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri, 18 Dec 2009 19:33:13 +0000 (UTC)
Subject: rpms/crda/F-12 crda.spec,1.24,1.25 setregdomain,1.2,1.3
Message-ID: <20091218193313.1996911C00E6@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3262

Modified Files:
	crda.spec setregdomain 
Log Message:
Specify patch to iw in setregdomain


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-12/crda.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- crda.spec	2 Dec 2009 21:51:21 -0000	1.24
+++ crda.spec	18 Dec 2009 19:33:12 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Fri Dec 18 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-2
+- Specify patch to iw in setregdomain
+
 * Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
 - Update wireless-regdb to version 2009.11.25 
 


Index: setregdomain
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-12/setregdomain,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- setregdomain	31 Mar 2009 17:37:13 -0000	1.2
+++ setregdomain	18 Dec 2009 19:33:12 -0000	1.3
@@ -9,7 +9,7 @@ then
 	. $REGDOMAIN
 	if [ -n "$COUNTRY" ]
 	then
-		iw reg set $COUNTRY
+		/sbin/iw reg set $COUNTRY
 		exit
 	fi
 fi
@@ -39,4 +39,4 @@ then
 	exit
 fi
 
-iw reg set $COUNTRY
+/sbin/iw reg set $COUNTRY



From emaldonado at fedoraproject.org  Fri Dec 18 19:36:23 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 19:36:23 +0000 (UTC)
Subject: rpms/nss/devel 546221.patch,1.1,1.2 nss.spec,1.130,1.131
Message-ID: <20091218193623.EBFCB11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4138

Modified Files:
	546221.patch nss.spec 
Log Message:
Fix a misconstructed patch for #546221

546221.patch:
 nsssysinit.c |   44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

Index: 546221.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/546221.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 546221.patch	18 Dec 2009 09:25:16 -0000	1.1
+++ 546221.patch	18 Dec 2009 19:36:22 -0000	1.2
@@ -1,15 +1,7 @@
---- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-17 23:52:17.543895890 -0800
-+++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-17 23:54:48.488895967 -0800
-@@ -37,8 +37,6 @@
- #include "prio.h"
- #include "prprf.h"
- 
--
--
- /*
-  * The following provides a default example for operating systems to set up
-  * and manage applications loading NSS on their OS globally.
-@@ -54,6 +52,8 @@
+diff -up nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221 nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c
+--- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-18 10:48:35.969726219 -0800
++++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-18 10:51:05.866851066 -0800
+@@ -54,6 +54,8 @@
  #ifdef XP_UNIX
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -18,7 +10,7 @@
  
  static int 
  testdir(char *dir)
-@@ -208,8 +208,8 @@ askpw=any timeout=30 ] }  ";
+@@ -208,8 +210,8 @@ askpw=any timeout=30 ] }  ";
  static char **
  get_list(char *filename, char *stripped_parameters)
  {
@@ -29,12 +21,13 @@
      int isFIPS = getFIPSMode();
      const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
      int next = 0;
-@@ -219,13 +219,20 @@ get_list(char *filename, char *stripped_
+@@ -219,17 +221,25 @@ get_list(char *filename, char *stripped_
  	return NULL;
      }
  
-+    sysdb = getSystemDB();
-     userdb  = getUserDB();
+-    userdb  = getUserDB();
++    userdb = getSystemDB();
++    userdb = getUserDB();
 +
 +    if (sysdb && !strcmp(filename, sysdb))
 +	    filename = NULL;
@@ -51,7 +44,45 @@
          "NSS=\"%sflags=internal%s\"",
          userdb, stripped_parameters, nssflags,
          isFIPS ? ",FIPS" : "");
-@@ -251,6 +258,7 @@ get_list(char *filename, char *stripped_
+ 
++/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
+ 	/* now open the user's defined PKCS #11 modules */
+ 	/* skip the local user DB entry */
+ 	module_list[next++] = PR_smprintf(
+@@ -238,19 +248,35 @@ get_list(char *filename, char *stripped_
+ 	    "parameters=\"configdir='sql:%s' %s\" "
+ 	    "NSS=\"flags=internal,moduleDBOnly,defaultModDB,skipFirst\"", 
+ 		userdb, stripped_parameters);
++/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
+    }
+ 
++    if (filename && 0 /* This doesn't actually work. If we register
++			 both this and the sysdb (in either order)
++			 then only one of them actually shows up */) {
++	    module_list[next++] = PR_smprintf(
++	      "library= "
++	      "module=\"NSS database\" "
++	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
++	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
++	    fprintf(stderr, "%s\n\n", module_list[next-1]);
++    }
++
+     /* now the system database (always read only) */
+-    module_list[next++] = PR_smprintf(
+-	"library= "
+-	"module=\"NSS system database\" "
+-	"parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
+-    "NSS=\"%sflags=internal,critical\"",filename, nssDefaultFlags);
++    if (sysdb) {
++	    module_list[next++] = PR_smprintf(
++	      "library= "
++	      "module=\"NSS system database\" "
++	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
++	      "NSS=\"%sflags=internal,critical\"",sysdb, nssflags);
++	    fprintf(stderr, "%s\n\n", module_list[next-1]);
++    }
+ 
+     /* that was the last module */
      module_list[next] = 0;
  
      PORT_Free(userdb);


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- nss.spec	18 Dec 2009 09:26:37 -0000	1.130
+++ nss.spec	18 Dec 2009 19:36:23 -0000	1.131
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.6
+Release:          1%{?dist}.7
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -43,9 +43,9 @@ Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           533125-ammend.patch
 Patch8:           nss-sysinit.patch
-Patch9:           nsssysinit.patch
-Patch10:          546221.patch
-Patch11:          540387.patch
+Patch9:           540387.patch
+Patch10:          nsssysinit.patch
+Patch11:          546221.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -114,9 +114,9 @@ low level services.
 %patch6 -p0 -b .libpem
 %patch7 -p0 -b .533125
 %patch8 -p0 -b .sysinit
-%patch9 -p0 -b .545779
-%patch10 -p1 -b .546221
-%patch11 -p1 -b .540387
+%patch9 -p1 -b .540387
+%patch10 -p0 -b .nsssyinit
+%patch11 -p1 -b .546221
 
 %build
 
@@ -478,6 +478,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Fri Dec 18 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-2.7
+- Fix a misconstructed patch
+
 * Thu Dec 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.6
 - Fix nsssysinit to enable applications to use the system database (#546221)
 - Fix spec so sysinit requires coreutils for post install scriplet (#547067)



From llaumgui at fedoraproject.org  Fri Dec 18 19:37:46 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:37:46 +0000 (UTC)
Subject: rpms/php-phpunit-phploc/F-11 php-phpunit-phploc.spec,1.3,1.4
Message-ID: <20091218193746.AFDAB11C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-phploc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4483/F-11

Modified Files:
	php-phpunit-phploc.spec 
Log Message:
/usr/share/pear/PHPLOC wasn't owned


Index: php-phpunit-phploc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/F-11/php-phpunit-phploc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-phpunit-phploc.spec	14 Dec 2009 19:50:06 -0000	1.3
+++ php-phpunit-phploc.spec	18 Dec 2009 19:37:46 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           php-phpunit-phploc
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
 Group:          Development/Libraries
@@ -76,20 +76,19 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/Text.php
-%{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/XML.php
-%{pear_phpdir}/PHPLOC/TextUI/Command.php
-%{pear_phpdir}/PHPLOC/TextUI/Getopt.php
-%{pear_phpdir}/PHPLOC/Analyser.php
+%{pear_phpdir}/PHPLOC
 %{_bindir}/phploc
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.0-2
+- /usr/share/pear/PHPLOC wasn't owned
+
 * Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.4.0-1
 - upstream 1.4.0
 
 * Sat Nov 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-2
-- F-(10|11) / EL-5 compatibility
+- F-(10|11) compatibility
 
 * Tue Oct 13 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-1
 - Initial packaging



From llaumgui at fedoraproject.org  Fri Dec 18 19:37:46 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:37:46 +0000 (UTC)
Subject: rpms/php-phpunit-phploc/F-12 php-phpunit-phploc.spec,1.3,1.4
Message-ID: <20091218193746.CBAE811C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-phploc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4483/F-12

Modified Files:
	php-phpunit-phploc.spec 
Log Message:
/usr/share/pear/PHPLOC wasn't owned


Index: php-phpunit-phploc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/F-12/php-phpunit-phploc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-phpunit-phploc.spec	14 Dec 2009 19:19:34 -0000	1.3
+++ php-phpunit-phploc.spec	18 Dec 2009 19:37:46 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           php-phpunit-phploc
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
 Group:          Development/Libraries
@@ -76,20 +76,19 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/Text.php
-%{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/XML.php
-%{pear_phpdir}/PHPLOC/TextUI/Command.php
-%{pear_phpdir}/PHPLOC/TextUI/Getopt.php
-%{pear_phpdir}/PHPLOC/Analyser.php
+%{pear_phpdir}/PHPLOC
 %{_bindir}/phploc
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.0-2
+- /usr/share/pear/PHPLOC wasn't owned
+
 * Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.4.0-1
 - upstream 1.4.0
 
 * Sat Nov 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-2
-- F-(10|11) / EL-5 compatibility
+- F-(10|11) compatibility
 
 * Tue Oct 13 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-1
 - Initial packaging



From llaumgui at fedoraproject.org  Fri Dec 18 19:37:46 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:37:46 +0000 (UTC)
Subject: rpms/php-phpunit-phploc/devel php-phpunit-phploc.spec,1.3,1.4
Message-ID: <20091218193746.E65F911C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-phploc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4483/devel

Modified Files:
	php-phpunit-phploc.spec 
Log Message:
/usr/share/pear/PHPLOC wasn't owned


Index: php-phpunit-phploc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phploc/devel/php-phpunit-phploc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-phpunit-phploc.spec	14 Dec 2009 07:14:02 -0000	1.3
+++ php-phpunit-phploc.spec	18 Dec 2009 19:37:46 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           php-phpunit-phploc
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
 Group:          Development/Libraries
@@ -76,20 +76,19 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/Text.php
-%{pear_phpdir}/PHPLOC/TextUI/ResultPrinter/XML.php
-%{pear_phpdir}/PHPLOC/TextUI/Command.php
-%{pear_phpdir}/PHPLOC/TextUI/Getopt.php
-%{pear_phpdir}/PHPLOC/Analyser.php
+%{pear_phpdir}/PHPLOC
 %{_bindir}/phploc
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.0-2
+- /usr/share/pear/PHPLOC wasn't owned
+
 * Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.4.0-1
 - upstream 1.4.0
 
 * Sat Nov 7 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-2
-- F-(10|11) / EL-5 compatibility
+- F-(10|11) compatibility
 
 * Tue Oct 13 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.0-1
 - Initial packaging



From remi at fedoraproject.org  Fri Dec 18 19:37:52 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 18 Dec 2009 19:37:52 +0000 (UTC)
Subject: rpms/php-channel-phpunit/devel php-channel-phpunit.spec,1.5,1.6
Message-ID: <20091218193752.8A8B111C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-channel-phpunit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4549

Modified Files:
	php-channel-phpunit.spec 
Log Message:
missing Requires for post/postun


Index: php-channel-phpunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/devel/php-channel-phpunit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-channel-phpunit.spec	18 Dec 2009 18:52:45 -0000	1.5
+++ php-channel-phpunit.spec	18 Dec 2009 19:37:52 -0000	1.6
@@ -3,7 +3,7 @@
 Name:           php-channel-phpunit
 # Use REST version
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Adds phpunit channel to PEAR
 
 Group:          Development/Languages
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php >= 5.1.4 php-pear(PEAR)
+Requires(post): %{__pear}
+Requires(postun): %{__pear}
 Provides:       php-channel(pear.phpunit.de)
 
 %description
@@ -60,6 +62,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-2
+- missing Requires for post/postun
+
 * Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-1
 - update for REST 1.3 and new URL (#542417)
 - rename pear.phpunit.de.xml to php-channel-phpunit.xml



From remi at fedoraproject.org  Fri Dec 18 19:40:18 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 18 Dec 2009 19:40:18 +0000 (UTC)
Subject: rpms/php-channel-phpunit/F-12 php-channel-phpunit.spec,1.5,1.6
Message-ID: <20091218194018.67F0311C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-channel-phpunit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5145

Modified Files:
	php-channel-phpunit.spec 
Log Message:
missing Requires for post/postun


Index: php-channel-phpunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/F-12/php-channel-phpunit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-channel-phpunit.spec	18 Dec 2009 18:58:22 -0000	1.5
+++ php-channel-phpunit.spec	18 Dec 2009 19:40:18 -0000	1.6
@@ -3,7 +3,7 @@
 Name:           php-channel-phpunit
 # Use REST version
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Adds phpunit channel to PEAR
 
 Group:          Development/Languages
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php >= 5.1.4 php-pear(PEAR)
+Requires(post): %{__pear}
+Requires(postun): %{__pear}
 Provides:       php-channel(pear.phpunit.de)
 
 %description
@@ -60,6 +62,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-2
+- missing Requires for post/postun
+
 * Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-1
 - update for REST 1.3 and new URL (#542417)
 - rename pear.phpunit.de.xml to php-channel-phpunit.xml



From remi at fedoraproject.org  Fri Dec 18 19:41:29 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 18 Dec 2009 19:41:29 +0000 (UTC)
Subject: rpms/php-channel-phpunit/F-11 php-channel-phpunit.spec,1.4,1.5
Message-ID: <20091218194129.268AB11C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-channel-phpunit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5442

Modified Files:
	php-channel-phpunit.spec 
Log Message:
missing Requires for post/postun


Index: php-channel-phpunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/F-11/php-channel-phpunit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-channel-phpunit.spec	18 Dec 2009 19:05:18 -0000	1.4
+++ php-channel-phpunit.spec	18 Dec 2009 19:41:28 -0000	1.5
@@ -3,7 +3,7 @@
 Name:           php-channel-phpunit
 # Use REST version
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Adds phpunit channel to PEAR
 
 Group:          Development/Languages
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php >= 5.1.4 php-pear(PEAR)
+Requires(post): %{__pear}
+Requires(postun): %{__pear}
 Provides:       php-channel(pear.phpunit.de)
 
 %description
@@ -60,6 +62,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-2
+- missing Requires for post/postun
+
 * Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-1
 - update for REST 1.3 and new URL (#542417)
 - rename pear.phpunit.de.xml to php-channel-phpunit.xml



From llaumgui at fedoraproject.org  Fri Dec 18 19:43:41 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:43:41 +0000 (UTC)
Subject: rpms/php-phpunit-phpcpd/F-11 php-phpunit-phpcpd.spec,1.2,1.3
Message-ID: <20091218194341.5E14F11C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-phpcpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5940/F-11

Modified Files:
	php-phpunit-phpcpd.spec 
Log Message:
/usr/share/pear/PHPCPD wasn't owned


Index: php-phpunit-phpcpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/F-11/php-phpunit-phpcpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-phpunit-phpcpd.spec	14 Dec 2009 18:03:41 -0000	1.2
+++ php-phpunit-phpcpd.spec	18 Dec 2009 19:43:41 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           php-phpunit-phpcpd
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Copy/Paste Detector (CPD) for PHP code
 
 Group:          Development/Libraries
@@ -76,18 +76,14 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/PHPCPD/Log/XML/PMD.php
-%{pear_phpdir}/PHPCPD/Log/XML.php
-%{pear_phpdir}/PHPCPD/TextUI/Command.php
-%{pear_phpdir}/PHPCPD/TextUI/Getopt.php
-%{pear_phpdir}/PHPCPD/TextUI/ResultPrinter.php
-%{pear_phpdir}/PHPCPD/Clone.php
-%{pear_phpdir}/PHPCPD/CloneMap.php
-%{pear_phpdir}/PHPCPD/Detector.php
+%{pear_phpdir}/PHPCPD
 %{_bindir}/phpcpd
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.2-2
+- /usr/share/pear/PHPCPD wasn't owned
+
 * Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.2.2-1
 - upstream 1.2.2
 



From llaumgui at fedoraproject.org  Fri Dec 18 19:43:41 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:43:41 +0000 (UTC)
Subject: rpms/php-phpunit-phpcpd/F-12 php-phpunit-phpcpd.spec,1.2,1.3
Message-ID: <20091218194341.8FEE111C0260@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-phpcpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5940/F-12

Modified Files:
	php-phpunit-phpcpd.spec 
Log Message:
/usr/share/pear/PHPCPD wasn't owned


Index: php-phpunit-phpcpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/F-12/php-phpunit-phpcpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-phpunit-phpcpd.spec	14 Dec 2009 18:50:22 -0000	1.2
+++ php-phpunit-phpcpd.spec	18 Dec 2009 19:43:41 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           php-phpunit-phpcpd
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Copy/Paste Detector (CPD) for PHP code
 
 Group:          Development/Libraries
@@ -76,18 +76,14 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/PHPCPD/Log/XML/PMD.php
-%{pear_phpdir}/PHPCPD/Log/XML.php
-%{pear_phpdir}/PHPCPD/TextUI/Command.php
-%{pear_phpdir}/PHPCPD/TextUI/Getopt.php
-%{pear_phpdir}/PHPCPD/TextUI/ResultPrinter.php
-%{pear_phpdir}/PHPCPD/Clone.php
-%{pear_phpdir}/PHPCPD/CloneMap.php
-%{pear_phpdir}/PHPCPD/Detector.php
+%{pear_phpdir}/PHPCPD
 %{_bindir}/phpcpd
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.2-2
+- /usr/share/pear/PHPCPD wasn't owned
+
 * Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.2.2-1
 - upstream 1.2.2
 



From llaumgui at fedoraproject.org  Fri Dec 18 19:43:41 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:43:41 +0000 (UTC)
Subject: rpms/php-phpunit-phpcpd/devel php-phpunit-phpcpd.spec,1.2,1.3
Message-ID: <20091218194341.B41F111C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-phpcpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5940/devel

Modified Files:
	php-phpunit-phpcpd.spec 
Log Message:
/usr/share/pear/PHPCPD wasn't owned


Index: php-phpunit-phpcpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-phpcpd/devel/php-phpunit-phpcpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-phpunit-phpcpd.spec	14 Dec 2009 07:22:13 -0000	1.2
+++ php-phpunit-phpcpd.spec	18 Dec 2009 19:43:41 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           php-phpunit-phpcpd
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Copy/Paste Detector (CPD) for PHP code
 
 Group:          Development/Libraries
@@ -76,18 +76,14 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/PHPCPD/Log/XML/PMD.php
-%{pear_phpdir}/PHPCPD/Log/XML.php
-%{pear_phpdir}/PHPCPD/TextUI/Command.php
-%{pear_phpdir}/PHPCPD/TextUI/Getopt.php
-%{pear_phpdir}/PHPCPD/TextUI/ResultPrinter.php
-%{pear_phpdir}/PHPCPD/Clone.php
-%{pear_phpdir}/PHPCPD/CloneMap.php
-%{pear_phpdir}/PHPCPD/Detector.php
+%{pear_phpdir}/PHPCPD
 %{_bindir}/phpcpd
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.2-2
+- /usr/share/pear/PHPCPD wasn't owned
+
 * Sat Dec 12 2009 Christof Damian <christof at damian.net> - 1.2.2-1
 - upstream 1.2.2
 



From rdieter at fedoraproject.org  Fri Dec 18 19:46:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 19:46:08 +0000 (UTC)
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.165,1.166
Message-ID: <20091218194608.2692911C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6667

Modified Files:
	kdemultimedia.spec 
Log Message:
drop kdelibs-experimental



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- kdemultimedia.spec	18 Dec 2009 17:12:40 -0000	1.165
+++ kdemultimedia.spec	18 Dec 2009 19:46:07 -0000	1.166
@@ -25,7 +25,6 @@ BuildRequires: cdparanoia-devel cdparano
 BuildRequires: flac-devel
 BuildRequires: glib2-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel
 BuildRequires: libtheora-devel
 BuildRequires: libvorbis-devel
 # KMix PulseAudio integration is not anywhere near shippable.



From llaumgui at fedoraproject.org  Fri Dec 18 19:55:18 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:55:18 +0000 (UTC)
Subject: File bytekit-1.1.1.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091218195518.5619228ECA3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-phpunit-bytekit:

dec667472af72b36c7fd3dcfe7c43364  bytekit-1.1.1.tgz



From llaumgui at fedoraproject.org  Fri Dec 18 19:56:38 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:56:38 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit/devel .cvsignore, 1.2,
	1.3 php-phpunit-bytekit.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091218195638.73C4811C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-bytekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8975/devel

Modified Files:
	.cvsignore php-phpunit-bytekit.spec sources 
Log Message:
Upstream 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Dec 2009 08:39:57 -0000	1.2
+++ .cvsignore	18 Dec 2009 19:56:38 -0000	1.3
@@ -1 +1 @@
-bytekit-1.0.0.tgz
+bytekit-1.1.1.tgz


Index: php-phpunit-bytekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/devel/php-phpunit-bytekit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-bytekit.spec	12 Dec 2009 08:39:57 -0000	1.1
+++ php-phpunit-bytekit.spec	18 Dec 2009 19:56:38 -0000	1.2
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-bytekit
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A command-line tool built on the PHP Bytekit extension
 
 Group:          Development/Libraries
@@ -17,6 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -76,23 +77,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/Bytekit/Scanner/Rule/DisallowedOpcodes.php
-%{pear_phpdir}/Bytekit/Scanner/Rule/DirectOutput.php
-%{pear_phpdir}/Bytekit/Scanner/Rule.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Graph.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Text.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/Text.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/XML.php
-%{pear_phpdir}/Bytekit/TextUI/Command.php
-%{pear_phpdir}/Bytekit/TextUI/Getopt.php
-%{pear_phpdir}/Bytekit/Util/FilterIterator.php
-%{pear_phpdir}/Bytekit/Disassembler.php
-%{pear_phpdir}/Bytekit/Functions.php
-%{pear_phpdir}/Bytekit/Scanner.php
+%{pear_phpdir}/Bytekit
 %{_bindir}/bytekit
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.1-1
+- upstream 1.1.1
+- /usr/share/pear/Bytekit wasn't owned
+
 * Thu Nov 26 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-2
 - F-(10|11)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Dec 2009 08:39:57 -0000	1.2
+++ sources	18 Dec 2009 19:56:38 -0000	1.3
@@ -1 +1 @@
-833f1cd7f385cb8b39c88102a5ba3911  bytekit-1.0.0.tgz
+dec667472af72b36c7fd3dcfe7c43364  bytekit-1.1.1.tgz



From pkgdb at fedoraproject.org  Fri Dec 18 19:59:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 19:59:21 +0000
Subject: [pkgdb] 389-admin (Fedora EPEL, 4) updated by ausil
Message-ID: <20091218195924.0DC8A28ED50@bastion.fedoraproject.org>

ausil approved watchbugzilla on 389-admin (Fedora EPEL 4) for rmeggins
ausil approved watchcommits on 389-admin (Fedora EPEL 4) for rmeggins
ausil approved commit on 389-admin (Fedora EPEL 4) for rmeggins
ausil approved build on 389-admin (Fedora EPEL 4) for rmeggins
ausil approved approveacls on 389-admin (Fedora EPEL 4) for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/389-admin



From pkgdb at fedoraproject.org  Fri Dec 18 20:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 18 Dec 2009 20:00:37 +0000
Subject: [pkgdb] 389-ds-base (Fedora EPEL, 4) updated by ausil
Message-ID: <20091218200039.03A0828ED5F@bastion.fedoraproject.org>

ausil approved watchbugzilla on 389-ds-base (Fedora EPEL 4) for rmeggins
ausil approved watchcommits on 389-ds-base (Fedora EPEL 4) for rmeggins
ausil approved commit on 389-ds-base (Fedora EPEL 4) for rmeggins
ausil approved build on 389-ds-base (Fedora EPEL 4) for rmeggins
ausil approved approveacls on 389-ds-base (Fedora EPEL 4) for rmeggins

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/389-ds-base



From rdieter at fedoraproject.org  Fri Dec 18 20:02:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 20:02:43 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.210,1.211
Message-ID: <20091218200243.53D2811C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10225

Modified Files:
	kdeutils.spec 
Log Message:
fix %files



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- kdeutils.spec	18 Dec 2009 17:47:10 -0000	1.210
+++ kdeutils.spec	18 Dec 2009 20:02:43 -0000	1.211
@@ -201,7 +201,6 @@ fi
 %{_kde4_configdir}/*
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/designer/*.so
 %{_mandir}/man1/*
 
 %files libs



From linville at fedoraproject.org  Fri Dec 18 20:04:59 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri, 18 Dec 2009 20:04:59 +0000 (UTC)
Subject: rpms/iw/devel iw.spec,1.19,1.20
Message-ID: <20091218200459.523D211C00E6@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10987

Modified Files:
	iw.spec 
Log Message:
BuildRequires kernels-headers instead of kernel-devel


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- iw.spec	2 Dec 2009 21:48:02 -0000	1.19
+++ iw.spec	18 Dec 2009 20:04:59 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           iw
 Version:        0.9.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -9,7 +9,7 @@ URL:            http://www.linuxwireless
 Source0:        http://wireless.kernel.org/download/iw/iw-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kernel-devel >= 2.6.24 
+BuildRequires: kernel-headers >= 2.6.24 
 BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Wed Dec 18 2009 John W. Linville <linville at redhat.com> 0.9.18-2
+- BuildRequires kernels-headers instead of kernel-devel
+
 * Wed Dec  2 2009 John W. Linville <linville at redhat.com> 0.9.18-1
 - Update to 0.9.18
 



From rdieter at fedoraproject.org  Fri Dec 18 20:05:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 20:05:39 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel
	kdeplasma-addons-4.3.85-krunner_contacts_not_enabledbydefault.patch, 
	NONE, 1.1 kdeplasma-addons.spec, 1.76, 1.77
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch,
	1.1, NONE
Message-ID: <20091218200539.4F7B011C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11218

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.85-krunner_contacts_not_enabledbydefault.patch 
Removed Files:
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch 
Log Message:
rebase patch


kdeplasma-addons-4.3.85-krunner_contacts_not_enabledbydefault.patch:
 plasma-runner-contacts.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdeplasma-addons-4.3.85-krunner_contacts_not_enabledbydefault.patch ---
diff -up kdeplasma-addons-4.3.85/runners/contacts/plasma-runner-contacts.desktop.krunner_contacts_not_enabledbydefault kdeplasma-addons-4.3.85/runners/contacts/plasma-runner-contacts.desktop
--- kdeplasma-addons-4.3.85/runners/contacts/plasma-runner-contacts.desktop.krunner_contacts_not_enabledbydefault	2009-12-14 04:55:29.000000000 -0600
+++ kdeplasma-addons-4.3.85/runners/contacts/plasma-runner-contacts.desktop	2009-12-18 14:05:01.572312688 -0600
@@ -102,5 +102,5 @@ X-KDE-PluginInfo-Email=tpr at iki.fi
 X-KDE-PluginInfo-Name=kabccontacts
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-KDE-PluginInfo-EnabledByDefault=false
 X-Plasma-AdvertiseSingleRunnerQueryMode=true


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- kdeplasma-addons.spec	18 Dec 2009 17:16:31 -0000	1.76
+++ kdeplasma-addons.spec	18 Dec 2009 20:05:39 -0000	1.77
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ## upstreamable patches
 # disable contacts krunner that induces mostly needless kres-migrator and
 # akonadi launch on first login
-Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
+Patch51: kdeplasma-addons-4.3.85-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
 


--- kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch DELETED ---



From rmeggins at fedoraproject.org  Fri Dec 18 20:13:10 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 20:13:10 +0000 (UTC)
Subject: rpms/389-ds-base/EL-4 .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh,
	1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20091218201310.0769711C00E6@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12647

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 18:00:01 -0000	1.5
+++ .cvsignore	18 Dec 2009 20:13:09 -0000	1.6
@@ -1,2 +1 @@
-389-ds-base-1.2.3.tar.bz2
-389-ds-base-1.2.4.tar.bz2
+389-ds-base-1.2.5.rc3.tar.bz2


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-4/389-ds-base-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git-local.sh	29 Oct 2009 18:00:01 -0000	1.2
+++ 389-ds-base-git-local.sh	18 Dec 2009 20:13:09 -0000	1.3
@@ -2,9 +2,9 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
+TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-4/389-ds-base-git.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git.sh	29 Oct 2009 18:00:01 -0000	1.3
+++ 389-ds-base-git.sh	18 Dec 2009 20:13:09 -0000	1.4
@@ -2,15 +2,15 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.4
+VERSION=1.2.5.rc3
 PKGNAME=389-ds-base
-TAG=$PKGNAME-$VERSION
-#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
-#SRCNAME=$PKGNAME-$VERSION-$DATE
+TAG=${TAG:-$PKGNAME-$VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
 SRCNAME=$PKGNAME-$VERSION
 
-cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME ldapserver
+wget -O $SRCNAME.tar.gz "$URL"
 
-tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-rm -rf $SRCNAME
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-4/389-ds-base.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 389-ds-base.spec	29 Oct 2009 18:00:01 -0000	1.10
+++ 389-ds-base.spec	18 Dec 2009 20:13:09 -0000	1.11
@@ -1,10 +1,14 @@
 
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .rc3
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.4
-Release:          1%{?dist}
+Version:          1.2.5
+Release:          %{?relprefix}4%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -61,7 +65,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-ds-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Source2:          %{name}-devel.README
@@ -82,7 +86,7 @@ Obsoletes:        fedora-ds-base-devel <
 Development Libraries and headers for the 389 Directory Server base package.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 cp %{SOURCE2} README.devel
 
 %build
@@ -265,6 +269,9 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Dec 17 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.4.rc3
+- 1.2.5.rc3 release
+
 * Thu Oct 29 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.4-1
 - 1.2.4 release
 - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Oct 2009 22:51:24 -0000	1.7
+++ sources	18 Dec 2009 20:13:09 -0000	1.8
@@ -1 +1 @@
-fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2
+394658aaeda80bdc4bf46ca12b92a752  389-ds-base-1.2.5.rc3.tar.bz2



From rmeggins at fedoraproject.org  Fri Dec 18 20:13:36 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 18 Dec 2009 20:13:36 +0000 (UTC)
Subject: rpms/389-admin/EL-4 .cvsignore, 1.3, 1.4 389-admin-git-local.sh, 1.1,
	1.2 389-admin-git.sh, 1.1, 1.2 389-admin.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20091218201336.75B0811C00E6@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12794

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
this is the 1.1.10.a2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 15:50:27 -0000	1.3
+++ .cvsignore	18 Dec 2009 20:13:36 -0000	1.4
@@ -1 +1 @@
-389-admin-1.1.9.tar.bz2
+389-admin-1.1.10.a2.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-4/389-admin-git-local.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git-local.sh	7 Oct 2009 15:50:27 -0000	1.1
+++ 389-admin-git-local.sh	18 Dec 2009 20:13:36 -0000	1.2
@@ -1,18 +1,15 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=389-admin-1.1.9
-CVSTAG=three89Admin_1_1_9
-VERSION=1.1.9
+VERSION=1.1.10.a2
 PKGNAME=389-admin
+TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
-CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 echo you must be in the admin server git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {echo bye ; exit 1 }
 if [ -z "$1" ] ; then
 	dir=.
 else
 	dir="$1"
 fi
-git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME )
-rm -rf $dir/$SRCNAME
+git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-4/389-admin-git.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-admin-git.sh	23 Jun 2009 02:36:44 -0000	1.1
+++ 389-admin-git.sh	18 Dec 2009 20:13:36 -0000	1.2
@@ -1,22 +1,16 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-TAG=HEAD
-VERSION=1.1.7
+VERSION=1.1.10.a2
 PKGNAME=389-admin
-export URL=git://git.fedorahosted.org/git/389/admin.git
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
+TAG=${PKGNAME}-${VERSION}
+URL="http://git.fedorahosted.org/git/?p=389/admin.git;a=snapshot;h=$TAG;sf=tgz"
 
-git clone $URL
-cd admin.git
-git archive --prefix=$SRCNAME/ $TAG | bzip2 > $SRCNAME.tar.bz2
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME adminserver
-#cd $SRCNAME
-#cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd
-#cd ..
+wget -O $SRCNAME.tar.gz "$URL"
 
-#tar -cjf $SRCNAME.tar.bz2 $SRCNAME
+echo convert tgz format to tar.bz2 format
 
-cd ..
-rm -rf admin.git
+gunzip $PKGNAME-$VERSION.tar.gz
+bzip2 $PKGNAME-$VERSION.tar


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-4/389-admin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.8
+++ 389-admin.spec	18 Dec 2009 20:13:36 -0000	1.9
@@ -1,9 +1,13 @@
-%define pkgname   dirsrv
+%global pkgname   dirsrv
+# for a pre-release, define the prerel field - comment out for official release
+%global prerel .a2
+# also need the relprefix field for a pre-release - also comment out for official release
+%global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.9
-Release:          1%{?dist}
+Version:          1.1.10
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -34,7 +38,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source0:          http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-admin-git.sh should be used to generate the source tarball from git
 Source1:          %{name}-git.sh
 Patch1:           f11-httpd.patch
@@ -46,7 +50,7 @@ be used through a web browser.  It provi
 and CGI utilities used by the console.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel}
 %patch1
 
 %build
@@ -153,6 +157,13 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a2-0.2
+- the 1.1.10.a2 release
+- fix problem with genrb path on F-12 and later
+
+* Thu Oct  8 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a1-1
+- the 1.1.10.a1 release
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
 - the 1.1.9 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Oct 2009 15:50:27 -0000	1.6
+++ sources	18 Dec 2009 20:13:36 -0000	1.7
@@ -1 +1 @@
-1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2
+092b48ed6503f37d58b19acda13c5cb9  389-admin-1.1.10.a2.tar.bz2



From llaumgui at fedoraproject.org  Fri Dec 18 19:56:38 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:56:38 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit/F-12 .cvsignore, 1.2,
	1.3 php-phpunit-bytekit.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091218195638.4635311C0260@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-bytekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8975/F-12

Modified Files:
	.cvsignore php-phpunit-bytekit.spec sources 
Log Message:
Upstream 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Dec 2009 08:43:04 -0000	1.2
+++ .cvsignore	18 Dec 2009 19:56:38 -0000	1.3
@@ -1 +1 @@
-bytekit-1.0.0.tgz
+bytekit-1.1.1.tgz


Index: php-phpunit-bytekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-12/php-phpunit-bytekit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-bytekit.spec	12 Dec 2009 08:43:04 -0000	1.1
+++ php-phpunit-bytekit.spec	18 Dec 2009 19:56:38 -0000	1.2
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-bytekit
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A command-line tool built on the PHP Bytekit extension
 
 Group:          Development/Libraries
@@ -17,6 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -76,23 +77,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/Bytekit/Scanner/Rule/DisallowedOpcodes.php
-%{pear_phpdir}/Bytekit/Scanner/Rule/DirectOutput.php
-%{pear_phpdir}/Bytekit/Scanner/Rule.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Graph.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Text.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/Text.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/XML.php
-%{pear_phpdir}/Bytekit/TextUI/Command.php
-%{pear_phpdir}/Bytekit/TextUI/Getopt.php
-%{pear_phpdir}/Bytekit/Util/FilterIterator.php
-%{pear_phpdir}/Bytekit/Disassembler.php
-%{pear_phpdir}/Bytekit/Functions.php
-%{pear_phpdir}/Bytekit/Scanner.php
+%{pear_phpdir}/Bytekit
 %{_bindir}/bytekit
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.1-1
+- upstream 1.1.1
+- /usr/share/pear/Bytekit wasn't owned
+
 * Thu Nov 26 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-2
 - F-(10|11)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Dec 2009 08:43:04 -0000	1.2
+++ sources	18 Dec 2009 19:56:38 -0000	1.3
@@ -1 +1 @@
-833f1cd7f385cb8b39c88102a5ba3911  bytekit-1.0.0.tgz
+dec667472af72b36c7fd3dcfe7c43364  bytekit-1.1.1.tgz



From llaumgui at fedoraproject.org  Fri Dec 18 19:56:38 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Fri, 18 Dec 2009 19:56:38 +0000 (UTC)
Subject: rpms/php-phpunit-bytekit/F-11 .cvsignore, 1.2,
	1.3 php-phpunit-bytekit.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091218195638.29D1D11C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-phpunit-bytekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8975/F-11

Modified Files:
	.cvsignore php-phpunit-bytekit.spec sources 
Log Message:
Upstream 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Dec 2009 08:45:30 -0000	1.2
+++ .cvsignore	18 Dec 2009 19:56:37 -0000	1.3
@@ -1 +1 @@
-bytekit-1.0.0.tgz
+bytekit-1.1.1.tgz


Index: php-phpunit-bytekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-11/php-phpunit-bytekit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-phpunit-bytekit.spec	12 Dec 2009 08:45:30 -0000	1.1
+++ php-phpunit-bytekit.spec	18 Dec 2009 19:56:37 -0000	1.2
@@ -3,8 +3,8 @@
 %define channel pear.phpunit.de
 
 Name:           php-phpunit-bytekit
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A command-line tool built on the PHP Bytekit extension
 
 Group:          Development/Libraries
@@ -17,6 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-channel(%{channel})
+Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -76,23 +77,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/Bytekit/Scanner/Rule/DisallowedOpcodes.php
-%{pear_phpdir}/Bytekit/Scanner/Rule/DirectOutput.php
-%{pear_phpdir}/Bytekit/Scanner/Rule.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Graph.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Disassembler/Text.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/Text.php
-%{pear_phpdir}/Bytekit/TextUI/ResultFormatter/Scanner/XML.php
-%{pear_phpdir}/Bytekit/TextUI/Command.php
-%{pear_phpdir}/Bytekit/TextUI/Getopt.php
-%{pear_phpdir}/Bytekit/Util/FilterIterator.php
-%{pear_phpdir}/Bytekit/Disassembler.php
-%{pear_phpdir}/Bytekit/Functions.php
-%{pear_phpdir}/Bytekit/Scanner.php
+%{pear_phpdir}/Bytekit
 %{_bindir}/bytekit
 
 
 %changelog
+* Fri Dec 18 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.1-1
+- upstream 1.1.1
+- /usr/share/pear/Bytekit wasn't owned
+
 * Thu Nov 26 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.0-2
 - F-(10|11)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-phpunit-bytekit/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Dec 2009 08:45:30 -0000	1.2
+++ sources	18 Dec 2009 19:56:37 -0000	1.3
@@ -1 +1 @@
-833f1cd7f385cb8b39c88102a5ba3911  bytekit-1.0.0.tgz
+dec667472af72b36c7fd3dcfe7c43364  bytekit-1.1.1.tgz



From jima at fedoraproject.org  Fri Dec 18 20:18:11 2009
From: jima at fedoraproject.org (Patrick Laughton)
Date: Fri, 18 Dec 2009 20:18:11 +0000 (UTC)
Subject: rpms/graphviz/devel graphviz-sparc64.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 graphviz.spec, 1.58, 1.59 sources, 1.13, 1.14
Message-ID: <20091218201811.ED5DC11C02CA@cvs1.fedora.phx.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/graphviz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13644

Modified Files:
	.cvsignore graphviz.spec sources 
Added Files:
	graphviz-sparc64.patch 
Log Message:

newer upstream version, various bugfixes


graphviz-sparc64.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE graphviz-sparc64.patch ---
--- graphviz-2.26.0/configure.sparc64	2009-12-10 17:30:43.000000000 -0600
+++ graphviz-2.26.0/configure	2009-12-18 11:31:30.000000000 -0600
@@ -2834,7 +2834,7 @@
 case "${host_os}" in
   *linux* )
     case "${host_cpu}" in
-      powerpc64 | s390x | x86_64 )
+      powerpc64 | s390x | x86_64 | sparc64 )
         LIBPOSTFIX="64"
         ;;
     esac


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/graphviz/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	24 Nov 2008 22:27:17 -0000	1.13
+++ .cvsignore	18 Dec 2009 20:18:11 -0000	1.14
@@ -1 +1 @@
-graphviz-2.20.3.tar.gz
+graphviz-2.26.0.tar.gz


Index: graphviz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- graphviz.spec	25 Jul 2009 01:24:35 -0000	1.58
+++ graphviz.spec	18 Dec 2009 20:18:11 -0000	1.59
@@ -3,14 +3,13 @@
 
 Name:			graphviz
 Summary:		Graph Visualization Tools
-Version:		2.20.3
-Release:		5%{?dist}.1
+Version:		2.26.0
+Release:		1%{?dist}
 Group:			Applications/Multimedia
 License:		CPL
 URL:			http://www.graphviz.org/
 Source0:		http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
-Patch0:			graphviz-2.20.3-configure-php.patch
-Patch1:			graphviz-2.20.3-gv.i.patch
+Patch0:			graphviz-sparc64.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
 BuildRequires:		/bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
@@ -18,7 +17,7 @@ BuildRequires:		fontconfig-devel, libtoo
 BuildRequires:		libXaw-devel, libSM-devel, libXext-devel, java-devel, php-devel
 BuildRequires:		cairo-devel >= 1.1.10, pango-devel, gmp-devel, lua-devel, gtk2-devel, libgnomeui-devel
 BuildRequires:		gd-devel, perl-devel, DevIL-devel, R-devel, swig >= 1.3.33
-%ifnarch ppc64 s390 s390x sparc64
+%ifnarch ppc64 s390 s390x sparc64 %{arm}
 BuildRequires:		mono-core, ocaml
 %endif
 Requires:		urw-fonts
@@ -26,7 +25,7 @@ Requires(post):		/sbin/ldconfig
 Requires(postun):	/sbin/ldconfig
 
 # Necessary conditionals
-%ifarch ppc64 s390 s390x sparc64
+%ifarch ppc64 s390 s390x sparc64 %{arm}
 %global SHARP  0
 %global OCAML  0
 %else
@@ -198,7 +197,6 @@ Various tcl packages (extensions) for th
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 # %%define NO_IO --disable-io
@@ -240,8 +238,8 @@ extension=gv.so
 __EOF__
 
 %check
-%ifnarch ppc64 ppc
-# regression test, segfaults on ppc/ppc64, possible endian issues?
+%ifnarch ppc64 ppc sparc64
+# regression test, segfaults on ppc/ppc64/sparc64, possible endian issues?
 cd rtest
 make rtest
 %endif
@@ -309,7 +307,7 @@ fi
 %{_libdir}/*.so
 %{_libdir}/graphviz/*.so
 %{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3.gz
 
 %files devil
 %defattr(-,root,root,-)
@@ -331,18 +329,18 @@ fi
 %files guile
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/guile/
-%{_mandir}/mann/gv_guile.n*
+%{_mandir}/man3/gv.3guile*
 
 %files java
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/java/
-%{_mandir}/mann/gv_java.n*
+%{_mandir}/man3/gv.3java*
 
 %files lua
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/lua/
 %{_libdir}/lua*/*
-%{_mandir}/mann/gv_lua.n*
+%{_mandir}/man3/gv.3lua*
 
 %if %{MING}
 %files ming
@@ -355,14 +353,14 @@ fi
 %files ocaml
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ocaml/
-%{_mandir}/mann/gv_ocaml.n*
+%{_mandir}/man3/gv.3ocaml*
 %endif
 
 %files perl
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/perl/
 %{_libdir}/perl*/*
-%{_mandir}/mann/gv_perl.n*
+%{_mandir}/man3/gv.3perl*
 
 %files php
 %defattr(-,root,root,-)
@@ -370,30 +368,30 @@ fi
 %{_libdir}/graphviz/php/
 %{php_extdir}/gv.so
 %{_datadir}/php*/*
-%{_mandir}/mann/gv_php.n*
+%{_mandir}/man3/gv.3php*
 
 %files python
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/python/
 %{_libdir}/python*/*
-%{_mandir}/mann/gv_python.n*
+%{_mandir}/man3/gv.3python*
 
 %files R
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/R/
-%{_mandir}/mann/gv_R.n*
+%{_mandir}/man3/gv.3r.gz
 
 %files ruby
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ruby/
 %{_libdir}/*ruby*/*
-%{_mandir}/mann/gv_ruby.n*
+%{_mandir}/man3/gv.3ruby*
 
 %if %{SHARP}
 %files sharp
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/sharp/
-%{_mandir}/mann/gv_sharp.n*
+%{_mandir}/man3/gv.3sharp*
 %endif
 
 %files tcl
@@ -401,13 +399,20 @@ fi
 %{_libdir}/graphviz/tcl/
 %{_libdir}/tcl*/*
 %{_datadir}/graphviz/demo/
-# hack to include gv_tcl.n only if available
-#  always includes tcldot.n, gdtclft.n
-%{_mandir}/mann/*tcl*.n*
-%{_mandir}/mann/tkspline.n*
+# hack to include gv.3tcl only if available
+#  always includes tcldot.3tcl, gdtclft.3tcl
+%{_mandir}/man3/*.3tcl*
+%{_mandir}/man3/tkspline.3tk*
 
 
 %changelog
+* Fri Dec 18 2009 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.26.0-1
+- Updated to latest release
+- Removed patches that have been applied upstream
+- Fixed man page paths (mann -> man3)
+- Disabled mono and ocaml for ARM (Jitesh Shah, BZ#532047)
+- Disabled regression tests on sparc64 as well as ppc/ppc64 (Dennis Gilmore)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.20.3-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/graphviz/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	24 Nov 2008 22:27:18 -0000	1.13
+++ sources	18 Dec 2009 20:18:11 -0000	1.14
@@ -1 +1 @@
-4d94c4b809a5c095acfc973d8d207fa9  graphviz-2.20.3.tar.gz
+0609b42cb9ef913b7af13e43c4d716c9  graphviz-2.26.0.tar.gz



From limb at fedoraproject.org  Fri Dec 18 20:39:01 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 18 Dec 2009 20:39:01 +0000 (UTC)
Subject: File gallery-2.3.1-jarless.tar.gz uploaded to lookaside cache by
	limb
Message-ID: <20091218203901.ED26128ECE8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gallery2:

00c873109c783fcaba428c4320666888  gallery-2.3.1-jarless.tar.gz



From limb at fedoraproject.org  Fri Dec 18 20:39:51 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 18 Dec 2009 20:39:51 +0000 (UTC)
Subject: rpms/gallery2/devel .cvsignore, 1.9, 1.10 gallery2.spec, 1.32,
	1.33 sources, 1.11, 1.12
Message-ID: <20091218203951.9D4CE11C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18092

Modified Files:
	.cvsignore gallery2.spec sources 
Log Message:
2.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	16 Apr 2009 17:39:16 -0000	1.9
+++ .cvsignore	18 Dec 2009 20:39:51 -0000	1.10
@@ -1 +1 @@
-gallery-2.3-jarless.tar.gz
+gallery-2.3.1-jarless.tar.gz


Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/gallery2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gallery2.spec	24 Jul 2009 23:27:51 -0000	1.32
+++ gallery2.spec	18 Dec 2009 20:39:51 -0000	1.33
@@ -5,9 +5,9 @@
 Summary: Customizable photo gallery web site
 URL: http://gallery.menalto.com
 Name: gallery2
-Version: 2.3
+Version: 2.3.1
 Group: Applications/Publishing
-Release: 15%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -15,7 +15,7 @@ License: GPLv2+
 # unzip gallery-2.3-full.zip
 # find . -name '*.jar' | xargs rm -f
 # tar -czf gallery-2.3-jarless.tar.gz gallery2/
-Source0: gallery-2.3-jarless.tar.gz
+Source0: gallery-2.3.1-jarless.tar.gz
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
@@ -32,7 +32,7 @@ Obsoletes: gallery2-uploadapplet <= 2.3-
 Obsoletes: gallery2-slideshowapplet <= 2.3-7
 
 #Patch0: gallery2-perl-location.patch
-Patch1: gallery2-2.3-smtp.patch
+#Patch1: gallery2-2.3-smtp.patch
 Patch2: gallery2-2.3-captcha.patch
 Patch3: gallery2-2.3-installer.patch
 Patch4: gallery2-2.3-upgrade.patch
@@ -687,7 +687,7 @@ subalbums/other items not shown
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
@@ -1114,6 +1114,10 @@ fi
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 2.3.1-1
+- 2.3.1, fix for upgrader in PHP 5.3.x.
+- smtp patch upstreamed.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Apr 2009 17:39:16 -0000	1.11
+++ sources	18 Dec 2009 20:39:51 -0000	1.12
@@ -1 +1 @@
-f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
+00c873109c783fcaba428c4320666888  gallery-2.3.1-jarless.tar.gz



From rstrode at fedoraproject.org  Fri Dec 18 20:43:11 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 18 Dec 2009 20:43:11 +0000 (UTC)
Subject: rpms/ConsoleKit/F-12 reorder-initialization.patch, NONE,
	1.1 ConsoleKit.spec, 1.51, 1.52
Message-ID: <20091218204311.A84EB11C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/ConsoleKit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19091

Modified Files:
	ConsoleKit.spec 
Added Files:
	reorder-initialization.patch 
Log Message:
- Register object methods with dbus-glib before taking bus name
  (may fix 545267)


reorder-initialization.patch:
 main.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE reorder-initialization.patch ---
diff -up ConsoleKit-0.4.1/src/main.c.reorder-initialization ConsoleKit-0.4.1/src/main.c
--- ConsoleKit-0.4.1/src/main.c.reorder-initialization	2009-12-18 14:51:38.821212946 -0500
+++ ConsoleKit-0.4.1/src/main.c	2009-12-18 14:52:19.246211176 -0500
@@ -294,11 +294,19 @@ main (int    argc,
 
         setup_debug_log (debug);
 
+        g_debug ("initializing console-kit-daemon %s", VERSION);
+
         connection = get_system_bus ();
         if (connection == NULL) {
                 goto out;
         }
 
+        manager = ck_manager_new ();
+
+        if (manager == NULL) {
+                goto out;
+        }
+
         bus_proxy = get_bus_proxy (connection);
         if (bus_proxy == NULL) {
                 g_warning ("Could not construct bus_proxy object; bailing out");
@@ -310,16 +318,8 @@ main (int    argc,
                 goto out;
         }
 
-        g_debug ("initializing console-kit-daemon %s", VERSION);
-
         create_pid_file ();
 
-        manager = ck_manager_new ();
-
-        if (manager == NULL) {
-                goto out;
-        }
-
         loop = g_main_loop_new (NULL, FALSE);
 
         g_signal_connect (bus_proxy,


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/F-12/ConsoleKit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ConsoleKit.spec	15 Dec 2009 18:37:18 -0000	1.51
+++ ConsoleKit.spec	18 Dec 2009 20:43:11 -0000	1.52
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -27,6 +27,7 @@ BuildRequires: automake, autoconf, libto
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=25656
 Patch0: nodaemon.patch
+Patch1: reorder-initialization.patch
 
 %description
 ConsoleKit is a system daemon for tracking what users are logged
@@ -83,6 +84,7 @@ This package contains developer document
 %prep
 %setup -q
 %patch0 -p1 -b .nodaemon
+%patch1 -p1 -b .reorder-initialization
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -170,6 +172,10 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Fri Dec 18 2009 Ray Strode <rstrode at redhat.com> 0.4.1-3
+- Register object methods with dbus-glib before taking bus name
+  (may fix 545267)
+
 * Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 0.4.1-2
 - Don't daemonize when activated on the bus
 



From limb at fedoraproject.org  Fri Dec 18 20:50:03 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 18 Dec 2009 20:50:03 +0000 (UTC)
Subject: rpms/gallery2/F-12 gallery2.spec,1.32,1.33 sources,1.11,1.12
Message-ID: <20091218205003.A873811C0375@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21138

Modified Files:
	gallery2.spec sources 
Log Message:
2.3.1.



Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-12/gallery2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gallery2.spec	24 Jul 2009 23:27:51 -0000	1.32
+++ gallery2.spec	18 Dec 2009 20:50:03 -0000	1.33
@@ -5,9 +5,9 @@
 Summary: Customizable photo gallery web site
 URL: http://gallery.menalto.com
 Name: gallery2
-Version: 2.3
+Version: 2.3.1
 Group: Applications/Publishing
-Release: 15%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -15,7 +15,7 @@ License: GPLv2+
 # unzip gallery-2.3-full.zip
 # find . -name '*.jar' | xargs rm -f
 # tar -czf gallery-2.3-jarless.tar.gz gallery2/
-Source0: gallery-2.3-jarless.tar.gz
+Source0: gallery-2.3.1-jarless.tar.gz
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
@@ -32,7 +32,7 @@ Obsoletes: gallery2-uploadapplet <= 2.3-
 Obsoletes: gallery2-slideshowapplet <= 2.3-7
 
 #Patch0: gallery2-perl-location.patch
-Patch1: gallery2-2.3-smtp.patch
+#Patch1: gallery2-2.3-smtp.patch
 Patch2: gallery2-2.3-captcha.patch
 Patch3: gallery2-2.3-installer.patch
 Patch4: gallery2-2.3-upgrade.patch
@@ -687,7 +687,7 @@ subalbums/other items not shown
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
@@ -1114,6 +1114,10 @@ fi
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 2.3.1-1
+- 2.3.1, fix for upgrader in PHP 5.3.x.
+- smtp patch upstreamed.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Apr 2009 17:39:16 -0000	1.11
+++ sources	18 Dec 2009 20:50:03 -0000	1.12
@@ -1 +1 @@
-f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz
+00c873109c783fcaba428c4320666888  gallery-2.3.1-jarless.tar.gz



From rdieter at fedoraproject.org  Fri Dec 18 21:05:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 21:05:54 +0000 (UTC)
Subject: rpms/webkitkde/devel webkitkde.spec,1.11,1.12
Message-ID: <20091218210554.3FCCE11C00CA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24506

Modified Files:
	webkitkde.spec 
Log Message:
use kde43 macro for easier toggling (ie, my trying to build this on < f13 for kde-4.4 :) )



Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- webkitkde.spec	3 Dec 2009 13:50:54 -0000	1.11
+++ webkitkde.spec	18 Dec 2009 21:05:53 -0000	1.12
@@ -1,3 +1,11 @@
+
+# easy kde43 toggle 
+%if 0%{?fedora} < 13
+%define kde43 1
+%else
+%define kde_version 4.3.80
+%endif
+
 Name:             webkitkde
 Version:          0.0.3
 Release:          0.2.svn1057318%{?dist}
@@ -25,7 +33,7 @@ URL:              http://techbase.kde.or
 Source0:          %{name}-%{version}-svn.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake gettext
-BuildRequires:    kdelibs4-devel
+BuildRequires:    kdelibs4-devel %{?kde_version: >= %{kde_version}}
 
 %description
 This project aims to integrate WebKit (QtWebKit) into KDE.
@@ -36,7 +44,7 @@ The WebKitKDE library sits on top of QtW
 KDE integration (for example, WebActions using KDE icons
 and shortcuts, downloading using KIO, etc).
 
-%if 0%{?fedora} < 13
+%if 0%{?kde43} 
 %package devel
 Summary:          Development files for %{name}
 Group:            Development/Libraries
@@ -59,7 +67,7 @@ web pages.
 %package -n webkitpart-devel
 Summary:          Development files for webkitpart
 Group:            Development/Libraries
-%if 0%{?fedora} < 13
+%if 0%{?kde43}
 Requires:         %{name}-devel = %{version}-%{release}
 %endif
 Requires:         kdelibs4-devel
@@ -89,7 +97,7 @@ mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/we
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0%{?fedora} < 13
+%if 0%{?kde43}
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -113,7 +121,7 @@ fi
 %defattr(-,root,root,-)
 %doc README COPYING.LIB
 
-%if 0%{?fedora} < 13
+%if 0%{?kde43}
 %{_kde4_libdir}/libkdewebkit.so.*
 
 %files devel



From dwalsh at fedoraproject.org  Fri Dec 18 21:08:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Dec 2009 21:08:33 +0000 (UTC)
Subject: File serefpolicy-3.7.5.tgz uploaded to lookaside cache by dwalsh
Message-ID: <20091218210833.11CAF28ECE8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for selinux-policy:

d3b12775aaeafb96c96a6a74e85e96ba  serefpolicy-3.7.5.tgz



From dwalsh at fedoraproject.org  Fri Dec 18 21:09:02 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Dec 2009 21:09:02 +0000 (UTC)
Subject: rpms/selinux-policy/devel sources, 1.210, 1.211 .cvsignore, 1.191,
	1.192
Message-ID: <20091218210902.09F0D11C00CA@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25476

Modified Files:
	sources .cvsignore 
Log Message:
Update packages



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- sources	10 Dec 2009 18:56:22 -0000	1.210
+++ sources	18 Dec 2009 21:09:01 -0000	1.211
@@ -1,2 +1,2 @@
 3651679c4b12a31d2ba5f4305bba5540  config.tgz
-c9aaca580877d56fe5d13dd814f58efa  serefpolicy-3.7.4.tgz
+d3b12775aaeafb96c96a6a74e85e96ba  serefpolicy-3.7.5.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- .cvsignore	10 Dec 2009 18:56:22 -0000	1.191
+++ .cvsignore	18 Dec 2009 21:09:01 -0000	1.192
@@ -195,3 +195,4 @@ serefpolicy-3.7.1.tgz
 serefpolicy-3.7.2.tgz
 serefpolicy-3.7.3.tgz
 serefpolicy-3.7.4.tgz
+serefpolicy-3.7.5.tgz



From dwalsh at fedoraproject.org  Fri Dec 18 21:13:19 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Dec 2009 21:13:19 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.15,1.16
Message-ID: <20091218211319.5432311C00CA@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26429

Modified Files:
	policy-F13.patch 
Log Message:
* Thu Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-4
- Rename udisks-daemon back to devicekit_disk_t policy


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |   23 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   11 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   77 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  179 +++
 policy/modules/apps/gnome.te              |  111 +
 policy/modules/apps/gpg.te                |    3 
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  188 +++
 policy/modules/apps/sandbox.te            |  331 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   31 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   45 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   89 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  333 +++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |   42 
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  460 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   74 +
 policy/modules/services/abrt.fc           |    6 
 policy/modules/services/abrt.if           |  102 +
 policy/modules/services/abrt.te           |  116 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  429 +++++--
 policy/modules/services/apache.te         |  453 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   24 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   10 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   11 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   24 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  109 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   20 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   60 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    9 
 policy/modules/services/nagios.fc         |   20 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |  106 +
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |    8 
 policy/modules/services/nut.if            |   82 +
 policy/modules/services/nut.te            |  127 ++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   43 
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   83 +
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  348 ++++++
 policy/modules/services/rhcs.te           |  394 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   19 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 +
 policy/modules/services/samba.te          |   89 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   15 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    4 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  211 +++
 policy/modules/services/virt.te           |  281 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   44 
 policy/modules/services/xserver.if        |  735 +++++++++++--
 policy/modules/services/xserver.te        |  629 +++++++----
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  290 +++--
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   25 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    7 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  187 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   86 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1683 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   13 
 385 files changed, 19389 insertions(+), 2972 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.15 -r 1.16 policy-F13.patchIndex: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- policy-F13.patch	17 Dec 2009 19:34:18 -0000	1.15
+++ policy-F13.patch	18 Dec 2009 21:13:18 -0000	1.16
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.4/Makefile	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/Makefile	2009-12-04 12:33:34.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -10,9 +10,9 @@ diff --exclude-from=exclude -N -u -r nsa
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/global_tunables	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/global_tunables	2009-12-04 12:33:34.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -48,9 +48,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +## </desc>
 +gen_tunable(mmap_low_allowed, false)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-04 12:33:34.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -60,9 +60,9 @@ diff --exclude-from=exclude -N -u -r nsa
  auth_use_nsswitch(alsa_t)
  
  init_use_fds(alsa_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-04 12:33:34.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -80,9 +80,9 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-04 12:33:34.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -92,9 +92,9 @@ diff --exclude-from=exclude -N -u -r nsa
  kernel_read_network_state(brctl_t)
  kernel_read_sysctl(brctl_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-04 12:33:34.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -104,9 +104,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  optional_policy(`
  	apache_exec_modules(certwatch_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-04 12:33:34.000000000 -0500
 @@ -10,7 +10,6 @@
  type consoletype_exec_t;
  application_executable_file(consoletype_exec_t)
@@ -123,17 +123,17 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-04 12:33:34.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-04 12:33:34.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -175,9 +175,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +#mcelog needs
 +dev_read_raw_memory(dmesg_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-04 12:33:34.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -200,9 +200,9 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-11-25 15:15:48.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-04 12:33:34.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -policy_module(kismet, 1.4.1)
@@ -267,9 +267,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  corecmd_exec_bin(kismet_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.4/policy/modules/admin/logrotate.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.4/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/logrotate.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/logrotate.te	2009-12-07 16:22:38.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -347,9 +347,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	slrnpull_manage_spool(logrotate_t)
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.7.4/policy/modules/admin/logwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.7.4/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/logwatch.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/logwatch.te	2009-12-04 12:33:34.000000000 -0500
 @@ -93,6 +93,13 @@
  sysnet_exec_ifconfig(logwatch_t)
  
@@ -370,9 +370,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	samba_read_log(logwatch_t)
 +	samba_read_share_files(logwatch_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.7.4/policy/modules/admin/mrtg.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.7.4/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/mrtg.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/mrtg.te	2009-12-04 12:33:34.000000000 -0500
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -381,9 +381,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
  netutils_domtrans_ping(mrtg_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.4/policy/modules/admin/netutils.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.4/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/netutils.te	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/netutils.te	2009-12-04 12:33:34.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -400,18 +400,18 @@ diff --exclude-from=exclude -N -u -r nsa
  userdom_use_user_terminals(netutils_t)
  userdom_use_all_users_fds(netutils_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.7.4/policy/modules/admin/ntop.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.7.4/policy/modules/admin/ntop.fc
 --- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/ntop.fc	2009-12-17 14:26:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/ntop.fc	2009-12-04 12:33:34.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
 +
 +/usr/sbin/ntop		--	gen_context(system_u:object_r:ntop_exec_t,s0)
 +
 +/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.7.4/policy/modules/admin/ntop.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.7.4/policy/modules/admin/ntop.if
[...7251 lines suppressed...]
  
--	manage_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
-+	manage_chr_files_pattern($1, user_tmp_t, user_tmp_t)
- 	files_search_tmp($1)
+-	dontaudit $1 user_tmp_t:file manage_file_perms;
++	dontaudit $1 user_tmp_t:file write;
  ')
  
  ########################################
  ## <summary>
- ##	Create, read, write, and delete user
--##	temporary named pipes.
-+##	temporary blk files.
+-##	Read user temporary symbolic links.
++##	Do not audit attempts to manage users
++##	temporary files.
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2304,19 +2530,19 @@
+-##	Domain allowed access.
++##	Domain to not audit.
  ##	</summary>
  ## </param>
  #
--interface(`userdom_manage_user_tmp_pipes',`
-+interface(`userdom_manage_user_tmp_blk_files',`
+-interface(`userdom_read_user_tmp_symlinks',`
++interface(`userdom_dontaudit_manage_user_tmp_files',`
  	gen_require(`
  		type user_tmp_t;
  	')
  
--	manage_fifo_files_pattern($1, user_tmp_t, user_tmp_t)
-+	manage_blk_files_pattern($1, user_tmp_t, user_tmp_t)
- 	files_search_tmp($1)
+-	read_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
+-	allow $1 user_tmp_t:dir list_dir_perms;
+-	files_search_tmp($1)
++	dontaudit $1 user_tmp_t:file manage_file_perms;
  ')
  
  ########################################
  ## <summary>
- ##	Create, read, write, and delete user
--##	temporary named sockets.
-+##	temporary symbolic links.
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -2324,7 +2550,47 @@
- ##	</summary>
- ## </param>
- #
--interface(`userdom_manage_user_tmp_sockets',`
-+interface(`userdom_manage_user_tmp_symlinks',`
+-##	Create, read, write, and delete user
++##	Read user temporary symbolic links.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_read_user_tmp_symlinks',`
 +	gen_require(`
 +		type user_tmp_t;
 +	')
 +
-+	manage_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
++	read_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
++	allow $1 user_tmp_t:dir list_dir_perms;
 +	files_search_tmp($1)
 +')
 +
 +########################################
 +## <summary>
 +##	Create, read, write, and delete user
-+##	temporary named pipes.
+ ##	temporary directories.
+ ## </summary>
+ ## <param name="domain">
+@@ -2276,6 +2502,46 @@
+ ########################################
+ ## <summary>
+ ##	Create, read, write, and delete user
++##	temporary chr files.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -34140,19 +33791,19 @@ diff --exclude-from=exclude -N -u -r nsa
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_user_tmp_pipes',`
++interface(`userdom_manage_user_tmp_chr_files',`
 +	gen_require(`
 +		type user_tmp_t;
 +	')
 +
-+	manage_fifo_files_pattern($1, user_tmp_t, user_tmp_t)
++	manage_chr_files_pattern($1, user_tmp_t, user_tmp_t)
 +	files_search_tmp($1)
 +')
 +
 +########################################
 +## <summary>
 +##	Create, read, write, and delete user
-+##	temporary named sockets.
++##	temporary blk files.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -34160,10 +33811,21 @@ diff --exclude-from=exclude -N -u -r nsa
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_user_tmp_sockets',`
- 	gen_require(`
- 		type user_tmp_t;
- 	')
++interface(`userdom_manage_user_tmp_blk_files',`
++	gen_require(`
++		type user_tmp_t;
++	')
++
++	manage_blk_files_pattern($1, user_tmp_t, user_tmp_t)
++	files_search_tmp($1)
++')
++
++########################################
++## <summary>
++##	Create, read, write, and delete user
+ ##	temporary symbolic links.
+ ## </summary>
+ ## <param name="domain">
 @@ -2391,7 +2657,7 @@
  
  ########################################
@@ -34974,9 +34636,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +	dontaudit $1 admin_home_t:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-17 14:26:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-04 12:33:34.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35065,9 +34727,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 +
 +allow userdomain userdomain:process signull;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-17 14:26:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-09 13:28:05.000000000 -0500
 @@ -180,6 +180,25 @@
  
  ########################################
@@ -35094,9 +34756,9 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Connect to xend over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-17 14:26:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-09 12:33:13.000000000 -0500
 @@ -85,6 +85,7 @@
  type xenconsoled_t;
  type xenconsoled_exec_t;
@@ -35135,9 +34797,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	#Should have a boolean wrapping these
  	fs_list_auto_mountpoints(xend_t)
  	files_search_mnt(xend_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-17 14:26:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-05 06:20:51.000000000 -0500
 @@ -199,12 +199,14 @@
  #
  define(`getattr_file_perms',`{ getattr }')
@@ -35180,9 +34842,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +define(`all_dbus_perms', `{ acquire_svc send_msg } ')
 +define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ')
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/users	2009-12-17 14:26:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/users	2009-12-04 12:33:34.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #



From dwalsh at fedoraproject.org  Fri Dec 18 21:18:10 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Dec 2009 21:18:10 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.944,1.945
Message-ID: <20091218211810.56CA511C00CA@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27464

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-1
- Update to upstream



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.944
retrieving revision 1.945
diff -u -p -r1.944 -r1.945
--- selinux-policy.spec	17 Dec 2009 19:36:22 -0000	1.944
+++ selinux-policy.spec	18 Dec 2009 21:18:10 -0000	1.945
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.21-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.7.4
-Release: 4%{?dist}
+Version: 3.7.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,7 +449,10 @@ exit 0
 %endif
 
 %changelog
-* Thu Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-4
+* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-1
+- Update to upstream
+
+* Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-4
 - Rename udisks-daemon back to devicekit_disk_t policy
 
 * Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.7.4-3



From dwalsh at fedoraproject.org  Fri Dec 18 21:25:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 18 Dec 2009 21:25:52 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.156,
	1.157 selinux-policy.spec, 1.983, 1.984
Message-ID: <20091218212552.452C911C00CA@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29086

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-60
- Fixs for cluster policy
- mysql_safe fixes
- Fixes for sssd
- Cgroup access for virtd
- Dontaudit fail2ban leaks


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   82 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  188 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  189 +++
 policy/modules/apps/sandbox.te            |  335 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   49 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   50 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  475 ++++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  293 +++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    7 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  118 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   52 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   52 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   16 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   25 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   25 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   59 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  285 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  637 ++++++++++-
 policy/modules/services/xserver.te        |  382 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  184 +++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   78 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   23 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  191 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   82 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1691 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 416 files changed, 21936 insertions(+), 2837 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.156 -r 1.157 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- policy-F12.patch	16 Dec 2009 13:30:14 -0000	1.156
+++ policy-F12.patch	18 Dec 2009 21:25:50 -0000	1.157
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.32/Makefile
 --- nsaserefpolicy/Makefile	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/Makefile	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/Makefile	2009-12-17 11:20:45.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -12,7 +12,7 @@ diff -b -B --ignore-all-space --exclude-
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.32/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/flask/access_vectors	2009-12-17 11:20:45.000000000 -0500
 @@ -349,6 +349,7 @@
  	syslog_read  
  	syslog_mod
@@ -23,7 +23,7 @@ diff -b -B --ignore-all-space --exclude-
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.32/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/global_tunables	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/global_tunables	2009-12-17 11:20:45.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -61,7 +61,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.32/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/mcs	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/mcs	2009-12-17 11:20:45.000000000 -0500
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -97,7 +97,7 @@ diff -b -B --ignore-all-space --exclude-
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.6.32/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/alsa.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/alsa.te	2009-12-17 11:20:45.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -109,7 +109,7 @@ diff -b -B --ignore-all-space --exclude-
  init_use_fds(alsa_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.32/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-12-17 11:20:45.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -129,7 +129,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.6.32/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/brctl.te	2009-12-17 11:20:45.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -141,7 +141,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.32/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/certwatch.te	2009-12-17 11:20:45.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -153,7 +153,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.6.32/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-12-03 14:09:04.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-12-17 11:20:45.000000000 -0500
 @@ -10,7 +10,7 @@
  type consoletype_exec_t;
  application_executable_file(consoletype_exec_t)
@@ -173,7 +173,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.32/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-12-17 11:20:45.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
@@ -181,7 +181,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.32/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-12-17 11:20:45.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -225,7 +225,7 @@ diff -b -B --ignore-all-space --exclude-
 +dev_read_raw_memory(dmesg_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.32/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-12-17 11:20:45.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -250,7 +250,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.fc serefpolicy-3.6.32/policy/modules/admin/kismet.fc
 --- nsaserefpolicy/policy/modules/admin/kismet.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/kismet.fc	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/kismet.fc	2009-12-17 11:20:45.000000000 -0500
 @@ -1,3 +1,5 @@
 +HOME_DIR/\.kismet(/.*)?			gen_context(system_u:object_r:kismet_home_t,s0)
 +
@@ -259,7 +259,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/kismet(/.*)?			gen_context(system_u:object_r:kismet_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.32/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-14 07:03:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/kismet.te	2009-12-17 11:20:45.000000000 -0500
 @@ -26,6 +26,9 @@
  type kismet_var_run_t;
  files_pid_file(kismet_var_run_t)
@@ -306,7 +306,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-07 16:23:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-17 11:20:45.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -386,7 +386,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.32/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/logwatch.te	2009-12-17 11:20:45.000000000 -0500
 @@ -93,6 +93,13 @@
  sysnet_exec_ifconfig(logwatch_t)
  
@@ -409,7 +409,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.32/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/mrtg.te	2009-12-17 11:20:45.000000000 -0500
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -420,7 +420,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-12-17 11:20:45.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -439,7 +439,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.6.32/policy/modules/admin/ntop.fc
 --- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.fc	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/ntop.fc	2009-12-17 11:20:45.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
 +
@@ -448,7 +448,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.6.32/policy/modules/admin/ntop.if
 --- nsaserefpolicy/policy/modules/admin/ntop.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.if	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/ntop.if	2009-12-17 11:20:45.000000000 -0500
 @@ -0,0 +1,158 @@
 +
 +## <summary>policy for ntop</summary>
@@ -610,7 +610,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.te serefpolicy-3.6.32/policy/modules/admin/ntop.te
 --- nsaserefpolicy/policy/modules/admin/ntop.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.te	2009-12-03 13:45:10.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/ntop.te	2009-12-17 11:20:45.000000000 -0500
 @@ -0,0 +1,40 @@
 +policy_module(ntop,1.0.0)
 +
@@ -654,7 +654,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-09-16 10:01:19.000000000 -0400
[...5224 lines suppressed...]
  /sbin/mdmpd		--	gen_context(system_u:object_r:mdadm_exec_t,s0)
  
@@ -32526,7 +33189,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/.mdadm.map		--	gen_context(system_u:object_r:mdadm_map_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.6.32/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/raid.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/raid.te	2009-12-17 11:20:47.000000000 -0500
 @@ -14,6 +14,9 @@
  type mdadm_var_run_t;
  files_pid_file(mdadm_var_run_t)
@@ -32556,7 +33219,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_dontaudit_list_tmpfs(mdadm_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.fc	2009-12-17 11:20:47.000000000 -0500
 @@ -6,13 +6,13 @@
  /etc/selinux(/.*)?			gen_context(system_u:object_r:selinux_config_t,s0)
  /etc/selinux/([^/]*/)?contexts(/.*)?	gen_context(system_u:object_r:default_context_t,s0)
@@ -32598,7 +33261,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.6.32/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-12-17 11:20:47.000000000 -0500
 @@ -351,6 +351,27 @@
  
  ########################################
@@ -32956,7 +33619,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.32/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-12-03 13:52:29.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-12-17 11:20:47.000000000 -0500
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -33334,7 +33997,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.6.32/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/setrans.if	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/setrans.if	2009-12-17 11:20:47.000000000 -0500
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1, setrans_var_run_t, setrans_var_run_t, setrans_t)
  	files_list_pids($1)
@@ -33361,7 +34024,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.fc	2009-12-17 11:20:47.000000000 -0500
 @@ -11,15 +11,20 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -33399,7 +34062,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.32/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-17 11:20:47.000000000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -33576,7 +34239,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.32/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-12-15 09:09:12.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-12-17 11:20:47.000000000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -33801,7 +34464,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.32/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/udev.fc	2009-12-17 11:20:47.000000000 -0500
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -33814,7 +34477,7 @@ diff -b -B --ignore-all-space --exclude-
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.32/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-12-12 08:19:13.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-12-17 11:20:47.000000000 -0500
 @@ -168,4 +168,43 @@
  
  	dev_list_all_dev_nodes($1)
@@ -33861,7 +34524,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.32/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-12-17 11:20:47.000000000 -0500
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -33977,7 +34640,7 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.32/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.fc	2009-12-17 11:20:47.000000000 -0500
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -33997,7 +34660,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.32/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.if	2009-12-17 11:20:47.000000000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -34503,7 +35166,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.32/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/unconfined.te	2009-12-17 11:20:47.000000000 -0500
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -34735,7 +35398,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.32/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.fc	2009-12-17 11:20:47.000000000 -0500
 @@ -1,4 +1,9 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -34749,7 +35412,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-15 09:02:01.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-17 11:20:47.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -37102,7 +37765,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.32/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-12-17 11:20:47.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -37193,7 +37856,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.32/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.fc	2009-12-17 11:20:47.000000000 -0500
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -37223,7 +37886,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.32/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-12-09 13:27:42.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.if	2009-12-17 11:20:47.000000000 -0500
 @@ -71,6 +71,8 @@
  	')
  
@@ -37295,7 +37958,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-09 12:33:06.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-17 11:20:47.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -37602,7 +38265,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-05 06:20:50.000000000 -0500
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-17 11:20:47.000000000 -0500
 @@ -181,7 +181,7 @@
  #
  define(`getattr_dir_perms',`{ getattr }')
@@ -37670,7 +38333,7 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.32/policy/users
 --- nsaserefpolicy/policy/users	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/users	2009-12-03 13:45:11.000000000 -0500
++++ serefpolicy-3.6.32/policy/users	2009-12-17 11:20:47.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -p -r1.983 -r1.984
--- selinux-policy.spec	16 Dec 2009 13:03:07 -0000	1.983
+++ selinux-policy.spec	18 Dec 2009 21:25:51 -0000	1.984
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 59%{?dist}
+Release: 60%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,17 @@ exit 0
 %endif
 
 %changelog
+* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-60
+- Fixs for cluster policy
+- mysql_safe fixes
+- Fixes for sssd
+- Cgroup access for virtd
+- Dontaudit fail2ban leaks
+
+* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-59
+- Fixes for sandbox_x_server
+- 
+
 * Tue Dec 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-59
 - Dontaudit udp_socket leaks for xauth_t
 - Dontaudit rules for iceauth_t



From jgu at fedoraproject.org  Fri Dec 18 22:04:08 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Fri, 18 Dec 2009 22:04:08 +0000 (UTC)
Subject: File vm-8.0.14.tgz uploaded to lookaside cache by jgu
Message-ID: <20091218220408.73C0A28ED27@bastion.fedoraproject.org>

A file has been added to the lookaside cache for emacs-vm:

35657d3d3dec1dcce5b31ac155e0cc4f  vm-8.0.14.tgz



From jgarzik at fedoraproject.org  Fri Dec 18 22:25:23 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Fri, 18 Dec 2009 22:25:23 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.26,1.27
Message-ID: <20091218222523.96CC911C00E6@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9270

Modified Files:
	chunkd.spec 
Log Message:
rebuild, for tokyocabinet dependency


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- chunkd.spec	15 Dec 2009 22:55:50 -0000	1.26
+++ chunkd.spec	18 Dec 2009 22:25:22 -0000	1.27
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.6
-Release:	0.3.g756ea210%{?dist}
+Release:	0.4.g756ea210%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -99,6 +99,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Dec 18 2009 Jeff Garzik <jgarzik at redhat.com> - 0.6-0.4.g756ea210
+- rebuild for tokyocabinet dependency
+
 * Tue Dec 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.6-0.3.g756ea210
 - really update source to commit 756ea2108509b69d036c658089fa954815f31945
 



From emaldonado at fedoraproject.org  Fri Dec 18 22:28:54 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 22:28:54 +0000 (UTC)
Subject: rpms/nss/F-12 .cvsignore,1.28,1.29 sources,1.30,1.31
Message-ID: <20091218222854.B8ADF11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10101

Modified Files:
	.cvsignore sources 
Log Message:
Update pem module source tar ball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nss/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	4 Dec 2009 16:23:45 -0000	1.28
+++ .cvsignore	18 Dec 2009 22:28:54 -0000	1.29
@@ -1,2 +1,2 @@
 nss-3.12.5-stripped.tar.bz2
-nss-pem-20090907.tar.bz2
+nss-pem-20091210.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	4 Dec 2009 16:23:46 -0000	1.30
+++ sources	18 Dec 2009 22:28:54 -0000	1.31
@@ -1,2 +1,2 @@
 51c5958153b6c01fada2e74cedc66835  nss-3.12.5-stripped.tar.bz2
-895ef804e11c14868e86df80c2dd9b66  nss-pem-20090907.tar.bz2
+82c2c72c961f2783c8e975a42fa939cf  nss-pem-20091210.tar.bz2



From emaldonado at fedoraproject.org  Fri Dec 18 22:33:07 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 22:33:07 +0000 (UTC)
Subject: rpms/nss/F-12 540387.patch,NONE,1.1
Message-ID: <20091218223307.862A811C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10902

Added Files:
	540387.patch 
Log Message:
Fix segmentation fault when listing keys or certs in the database (#540387)

540387.patch:
 pk11pars.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE 540387.patch ---
diff --git a/mozilla/security/nss/lib/pk11wrap/pk11pars.c b/mozilla/security/nss/lib/pk11wrap/pk11pars.c
index c36cd25..5855084 100644
--- a/mozilla/security/nss/lib/pk11wrap/pk11pars.c
+++ b/mozilla/security/nss/lib/pk11wrap/pk11pars.c
@@ -1134,6 +1134,12 @@ SECMOD_LoadModule(char *modulespec,SECMODModule *parent, PRBool recurse)
 
 	    for (; *index; index++) {
 		SECMODModule *child;
+		if (0 == PORT_Strcmp(*index, modulespec)) {
+		    /* avoid trivial infinite recursion */
+		    PORT_SetError(SEC_ERROR_NO_MODULE);
+		    rv = SECFailure;
+		    break;
+		}
 		child = SECMOD_LoadModule(*index,module,PR_TRUE);
 		if (!child) break;
 		if (child->isCritical && !child->loaded) {



From emaldonado at fedoraproject.org  Fri Dec 18 22:34:25 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 22:34:25 +0000 (UTC)
Subject: rpms/nss/F-12 545779.patch,NONE,1.1
Message-ID: <20091218223425.0195B11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11189

Added Files:
	545779.patch 
Log Message:
Fix nsssysinit to set the default flags on the crypto module (#545779)

545779.patch:
 nsssysinit.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE 545779.patch ---
Index: mozilla/security/nss/lib/sysinit/nsssysinit.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/sysinit/nsssysinit.c,v
retrieving revision 1.1
diff -u -p -r1.1 nsssysinit.c
--- mozilla/security/nss/lib/sysinit/nsssysinit.c	8 Oct 2009 17:08:36 -0000	1.1
+++ mozilla/security/nss/lib/sysinit/nsssysinit.c	12 Dec 2009 03:34:17 -0000
@@ -198,11 +198,20 @@ getFIPSMode(void)
  * the decision making process.
  *
  */
+static const char *nssDefaultFlags = "trustOrder=75 cipherOrder=100 \
+slotParams={0x00000001=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM \
+askpw=any timeout=30 ] }  ";
+static const char *nssDefaultFIPSFlags = "trustOrder=75 cipherOrder=100 \
+slotParams={0x00000003=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM \
+askpw=any timeout=30 ] }  ";
+
 static char **
 get_list(char *filename, char *stripped_parameters)
 {
     char **module_list = PORT_ZNewArray(char *, 4);
     char *userdb;
+    int isFIPS = getFIPSMode();
+    const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
     int next = 0;
 
     /* can't get any space */
@@ -217,8 +226,9 @@ get_list(char *filename, char *stripped_
 	    "library= "
 	    "module=\"NSS User database\" "
 	    "parameters=\"configdir='sql:%s' %s\" "
-	    "NSS=\"flags=internal%s\"", 
-		userdb, stripped_parameters, getFIPSMode() ? ",FIPS" : "");
+        "NSS=\"%sflags=internal%s\"",
+        userdb, stripped_parameters, nssflags,
+        isFIPS ? ",FIPS" : "");
 
 	/* now open the user's defined PKCS #11 modules */
 	/* skip the local user DB entry */
@@ -235,7 +245,7 @@ get_list(char *filename, char *stripped_
 	"library= "
 	"module=\"NSS system database\" "
 	"parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
-	"NSS=\"flags=internal,critical\"",filename);
+    "NSS=\"%sflags=internal,critical\"",filename, nssDefaultFlags);
 
     /* that was the last module */
     module_list[next] = 0;



From emaldonado at fedoraproject.org  Fri Dec 18 22:36:41 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 22:36:41 +0000 (UTC)
Subject: rpms/nss/F-12 546221.patch,NONE,1.1
Message-ID: <20091218223642.0597311C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11618

Added Files:
	546221.patch 
Log Message:
Fix nsssysinit to enable applications to use the system database (#546221)

546221.patch:
 nsssysinit.c |   44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

--- NEW FILE 546221.patch ---
diff -up nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221 nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c
--- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-18 10:48:35.969726219 -0800
+++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-18 10:51:05.866851066 -0800
@@ -54,6 +54,8 @@
 #ifdef XP_UNIX
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <stdio.h>
+#include <stdarg.h>
 
 static int 
 testdir(char *dir)
@@ -208,8 +210,8 @@ askpw=any timeout=30 ] }  ";
 static char **
 get_list(char *filename, char *stripped_parameters)
 {
-    char **module_list = PORT_ZNewArray(char *, 4);
-    char *userdb;
+    char **module_list = PORT_ZNewArray(char *, 5);
+    char *userdb, *sysdb;
     int isFIPS = getFIPSMode();
     const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
     int next = 0;
@@ -219,17 +221,25 @@ get_list(char *filename, char *stripped_
 	return NULL;
     }
 
-    userdb  = getUserDB();
+    userdb = getSystemDB();
+    userdb = getUserDB();
+
+    if (sysdb && !strcmp(filename, sysdb))
+	    filename = NULL;
+    if (userdb && !strcmp(filename, userdb))
+	    filename = NULL;
+
     if (userdb != NULL) {
 	/* return a list of databases to open. First the user Database */
 	module_list[next++] = PR_smprintf(
 	    "library= "
 	    "module=\"NSS User database\" "
-	    "parameters=\"configdir='sql:%s' %s\" "
+	    "parameters=\"configdir='sql:%s' %s tokenDescription='NSS user database'\" "
         "NSS=\"%sflags=internal%s\"",
         userdb, stripped_parameters, nssflags,
         isFIPS ? ",FIPS" : "");
 
+/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
 	/* now open the user's defined PKCS #11 modules */
 	/* skip the local user DB entry */
 	module_list[next++] = PR_smprintf(
@@ -238,19 +248,35 @@ get_list(char *filename, char *stripped_
 	    "parameters=\"configdir='sql:%s' %s\" "
 	    "NSS=\"flags=internal,moduleDBOnly,defaultModDB,skipFirst\"", 
 		userdb, stripped_parameters);
+/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
    }
 
+    if (filename && 0 /* This doesn't actually work. If we register
+			 both this and the sysdb (in either order)
+			 then only one of them actually shows up */) {
+	    module_list[next++] = PR_smprintf(
+	      "library= "
+	      "module=\"NSS database\" "
+	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
+	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
+	    fprintf(stderr, "%s\n\n", module_list[next-1]);
+    }
+
     /* now the system database (always read only) */
-    module_list[next++] = PR_smprintf(
-	"library= "
-	"module=\"NSS system database\" "
-	"parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
-    "NSS=\"%sflags=internal,critical\"",filename, nssDefaultFlags);
+    if (sysdb) {
+	    module_list[next++] = PR_smprintf(
+	      "library= "
+	      "module=\"NSS system database\" "
+	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
+	      "NSS=\"%sflags=internal,critical\"",sysdb, nssflags);
+	    fprintf(stderr, "%s\n\n", module_list[next-1]);
+    }
 
     /* that was the last module */
     module_list[next] = 0;
 
     PORT_Free(userdb);
+    PORT_Free(sysdb);
 
     return module_list;
 }



From emaldonado at fedoraproject.org  Fri Dec 18 22:40:28 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 18 Dec 2009 22:40:28 +0000 (UTC)
Subject: rpms/nss/F-12 nss.spec,1.125,1.126
Message-ID: <20091218224028.582F411C0374@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12634

Modified Files:
	nss.spec 
Log Message:
Sysinit requires coreutils for post install scriplet (#547067)


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/F-12/nss.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- nss.spec	9 Dec 2009 23:03:41 -0000	1.125
+++ nss.spec	18 Dec 2009 22:40:27 -0000	1.126
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.5
+Release:          1%{?dist}.8
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -37,12 +37,15 @@ Source6:          blank-cert9.db
 Source7:          blank-key4.db
 Source8:          system-pkcs11.txt
 Source9:          setup-nsssysinit.sh
-Source12:         %{name}-pem-20090907.tar.bz2
+Source12:         %{name}-pem-20091210.tar.bz2
 
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           533125-ammend.patch
 Patch8:           nss-sysinit.patch
+Patch9:           540387.patch
+Patch10:          545779.patch
+Patch11:          546221.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -72,6 +75,7 @@ Summary:          System NSS Initilizati
 Group:            System Environment/Base
 Provides:         nss-system-init
 Requires:         nss = %{version}-%{release}
+Requires(post):   coreutils
 
 %description sysinit
 Default Operating System module that manages applications loading
@@ -110,6 +114,9 @@ low level services.
 %patch6 -p0 -b .libpem
 %patch7 -p0 -b .533125
 %patch8 -p0 -b .sysinit
+%patch9 -p1 -b .540387
+%patch10 -p0 -b .545779
+%patch11 -p1 -b .546221
 
 %build
 
@@ -471,6 +478,13 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Dec 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.8
+- Fix nsssysinit to set the default flags on the crypto module (#545779)
+- Fix nsssysinit to enable applications to use the system database (#546221)
+- Fix segmentation when listing keys or certs in the database (#540387)
+- Sysinit requires coreutils for post install scriplet (#547067)
+- Remove redundant header from the pem module
+
 * Wed Dec 09 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-2.1
 - Remove unneeded patch
 



From rdieter at fedoraproject.org  Fri Dec 18 22:53:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 22:53:04 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.85-plasma_scrollwidget.patch, NONE, 
	1.1 kdelibs.spec, 1.556, 1.557
Message-ID: <20091218225304.BED3111C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15448

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.85-plasma_scrollwidget.patch 
Log Message:
http://websvn.kde.org/?revision=1063597&view=revision


kdelibs-4.3.85-plasma_scrollwidget.patch:
 scrollwidget.cpp |   70 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 29 deletions(-)

--- NEW FILE kdelibs-4.3.85-plasma_scrollwidget.patch ---
--- trunk/KDE/kdelibs/plasma/widgets/scrollwidget.cpp	2009/12/15 21:37:07	1062764
+++ trunk/KDE/kdelibs/plasma/widgets/scrollwidget.cpp	2009/12/18 21:44:02	1063597
@@ -58,6 +58,39 @@
     {
     }
 
+    void commonConstructor()
+    {
+        q->setFocusPolicy(Qt::StrongFocus);
+        layout = new QGraphicsGridLayout(q);
+        q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        layout->setContentsMargins(1, 1, 1, 1);
+        scrollingWidget = new QGraphicsWidget(q);
+        layout->addItem(scrollingWidget, 0, 0);
+        borderSvg = new Plasma::Svg(q);
+        borderSvg->setImagePath("widgets/scrollwidget");
+
+        adjustScrollbarsTimer = new QTimer(q);
+        adjustScrollbarsTimer->setSingleShot(true);
+        QObject::connect(adjustScrollbarsTimer, SIGNAL(timeout()), q, SLOT(adjustScrollbars()));
+
+        verticalScrollBarPolicy = Qt::ScrollBarAsNeeded;
+        verticalScrollBar = new Plasma::ScrollBar(q);
+        verticalScrollBar->setFocusPolicy(Qt::NoFocus);
+        layout->addItem(verticalScrollBar, 0, 1);
+        verticalScrollBar->nativeWidget()->setMinimum(0);
+        verticalScrollBar->nativeWidget()->setMaximum(100);
+        QObject::connect(verticalScrollBar, SIGNAL(valueChanged(int)), q, SLOT(verticalScroll(int)));
+
+        horizontalScrollBarPolicy = Qt::ScrollBarAsNeeded;
+        horizontalScrollBar = new Plasma::ScrollBar(q);
+        verticalScrollBar->setFocusPolicy(Qt::NoFocus);
+        horizontalScrollBar->setOrientation(Qt::Horizontal);
+        layout->addItem(horizontalScrollBar, 1, 0);
+        horizontalScrollBar->nativeWidget()->setMinimum(0);
+        horizontalScrollBar->nativeWidget()->setMaximum(100);
+        QObject::connect(horizontalScrollBar, SIGNAL(valueChanged(int)), q, SLOT(horizontalScroll(int)));
+    }
+
     void adjustScrollbars()
     {
         if (!widget) {
@@ -277,39 +310,18 @@
 };
 
 
+ScrollWidget::ScrollWidget(QGraphicsItem *parent)
+    : QGraphicsWidget(parent),
+      d(new ScrollWidgetPrivate(this))
+{
+    d->commonConstructor();
+}
+
 ScrollWidget::ScrollWidget(QGraphicsWidget *parent)
     : QGraphicsWidget(parent),
       d(new ScrollWidgetPrivate(this))
 {
-    setFocusPolicy(Qt::StrongFocus);
-    d->layout = new QGraphicsGridLayout(this);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    d->layout->setContentsMargins(1, 1, 1, 1);
-    d->scrollingWidget = new QGraphicsWidget(this);
-    d->layout->addItem(d->scrollingWidget, 0, 0);
-    d->borderSvg = new Plasma::Svg(this);
-    d->borderSvg->setImagePath("widgets/scrollwidget");
-
-    d->adjustScrollbarsTimer = new QTimer(this);
-    d->adjustScrollbarsTimer->setSingleShot(true);
-    connect(d->adjustScrollbarsTimer, SIGNAL(timeout()), this, SLOT(adjustScrollbars()));
-
-    d->verticalScrollBarPolicy = Qt::ScrollBarAsNeeded;
-    d->verticalScrollBar = new Plasma::ScrollBar(this);
-    d->verticalScrollBar->setFocusPolicy(Qt::NoFocus);
-    d->layout->addItem(d->verticalScrollBar, 0, 1);
-    d->verticalScrollBar->nativeWidget()->setMinimum(0);
-    d->verticalScrollBar->nativeWidget()->setMaximum(100);
-    connect(d->verticalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(verticalScroll(int)));
-
-    d->horizontalScrollBarPolicy = Qt::ScrollBarAsNeeded;
-    d->horizontalScrollBar = new Plasma::ScrollBar(this);
-    d->verticalScrollBar->setFocusPolicy(Qt::NoFocus);
-    d->horizontalScrollBar->setOrientation(Qt::Horizontal);
-    d->layout->addItem(d->horizontalScrollBar, 1, 0);
-    d->horizontalScrollBar->nativeWidget()->setMinimum(0);
-    d->horizontalScrollBar->nativeWidget()->setMaximum(100);
-    connect(d->horizontalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(horizontalScroll(int)));
+    d->commonConstructor();
 }
 
 ScrollWidget::~ScrollWidget()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -p -r1.556 -r1.557
--- kdelibs.spec	18 Dec 2009 15:11:55 -0000	1.556
+++ kdelibs.spec	18 Dec 2009 22:53:04 -0000	1.557
@@ -4,7 +4,7 @@
 
 Summary: KDE Libraries
 Version: 4.3.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -80,6 +80,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
 
 # upstream
+Patch100: kdelibs-4.3.85-plasma_scrollwidget.patch
 
 # security fix
 ## Not Upstreamed? why not ? -- Rex
@@ -214,6 +215,7 @@ format for easy browsing.
 %endif
 
 # upstream patches
+%patch100 -p3 -b .plasma_scrollwidget
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702



From rdieter at fedoraproject.org  Fri Dec 18 22:53:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 18 Dec 2009 22:53:49 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.557,1.558
Message-ID: <20091218225349.5F4A311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15664

Modified Files:
	kdelibs.spec 
Log Message:
changelog



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -p -r1.557 -r1.558
--- kdelibs.spec	18 Dec 2009 22:53:04 -0000	1.557
+++ kdelibs.spec	18 Dec 2009 22:53:49 -0000	1.558
@@ -411,6 +411,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
+- plasma_scrollwidget patch
+
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - 4.3.85 (4.4 beta2)
 



From eponyme at fedoraproject.org  Fri Dec 18 22:56:08 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 22:56:08 +0000 (UTC)
Subject: File clive-2.2.8.tar.bz2 uploaded to lookaside cache by eponyme
Message-ID: <20091218225608.8BC9428EC8A@bastion.fedoraproject.org>

A file has been added to the lookaside cache for clive:

fd690551ca7f84ce39fe161039c7c5b8  clive-2.2.8.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 22:56:54 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 22:56:54 +0000 (UTC)
Subject: rpms/clive/devel .cvsignore, 1.21, 1.22 clive.spec, 1.26,
	1.27 sources, 1.21, 1.22
Message-ID: <20091218225655.00C8011C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16572

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	1 Oct 2009 20:21:33 -0000	1.21
+++ .cvsignore	18 Dec 2009 22:56:54 -0000	1.22
@@ -1 +1 @@
-clive-2.2.7.tar.bz2
+clive-2.2.8.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- clive.spec	4 Dec 2009 02:00:50 -0000	1.26
+++ clive.spec	18 Dec 2009 22:56:54 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           clive
-Version:        2.2.7
-Release:        2%{?dist}
+Version:        2.2.8
+Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-# These tests require network
+# These tests require network, use "--with network_tests" to execute them
 %{?!_with_network_tests: rm t/02youtube.t }
 %{?!_with_network_tests: rm t/03break.t }
 %{?!_with_network_tests: rm t/04liveleak.t }
@@ -47,7 +47,6 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 %{?!_with_network_tests: rm t/08evisor.t }
 %{?!_with_network_tests: rm t/09google.t }
 %{?!_with_network_tests: rm t/10sevenload.t }
-%{?!_with_network_tests: rm t/11redtube.t }
 %{?!_with_network_tests: rm t/12vimeo.t }
 %{?!_with_network_tests: rm t/14spiegel.t }
 %{?!_with_network_tests: rm t/15ehrensenf.t }
@@ -70,9 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.8-1
+- Update to 2.2.8
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.2.7-2
 - rebuild against perl 5.10.1
-
 * Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.7-1
 - Update to 2.2.7
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	1 Oct 2009 20:21:33 -0000	1.21
+++ sources	18 Dec 2009 22:56:54 -0000	1.22
@@ -1 +1 @@
-3f713d996b9a440f83188c19db4023a0  clive-2.2.7.tar.bz2
+fd690551ca7f84ce39fe161039c7c5b8  clive-2.2.8.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 22:58:27 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 22:58:27 +0000 (UTC)
Subject: rpms/clive/F-12 .cvsignore, 1.21, 1.22 clive.spec, 1.25,
	1.26 sources, 1.21, 1.22
Message-ID: <20091218225827.29F3611C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16952

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	1 Oct 2009 20:23:19 -0000	1.21
+++ .cvsignore	18 Dec 2009 22:58:26 -0000	1.22
@@ -1 +1 @@
-clive-2.2.7.tar.bz2
+clive-2.2.8.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-12/clive.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- clive.spec	1 Oct 2009 20:23:19 -0000	1.25
+++ clive.spec	18 Dec 2009 22:58:26 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.7
+Version:        2.2.8
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-# These tests require network
+# These tests require network, use "--with network_tests" to execute them
 %{?!_with_network_tests: rm t/02youtube.t }
 %{?!_with_network_tests: rm t/03break.t }
 %{?!_with_network_tests: rm t/04liveleak.t }
@@ -47,7 +47,6 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 %{?!_with_network_tests: rm t/08evisor.t }
 %{?!_with_network_tests: rm t/09google.t }
 %{?!_with_network_tests: rm t/10sevenload.t }
-%{?!_with_network_tests: rm t/11redtube.t }
 %{?!_with_network_tests: rm t/12vimeo.t }
 %{?!_with_network_tests: rm t/14spiegel.t }
 %{?!_with_network_tests: rm t/15ehrensenf.t }
@@ -70,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.8-1
+- Update to 2.2.8
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.2.7-2
+- rebuild against perl 5.10.1
 * Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.7-1
 - Update to 2.2.7
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	1 Oct 2009 20:23:19 -0000	1.21
+++ sources	18 Dec 2009 22:58:27 -0000	1.22
@@ -1 +1 @@
-3f713d996b9a440f83188c19db4023a0  clive-2.2.7.tar.bz2
+fd690551ca7f84ce39fe161039c7c5b8  clive-2.2.8.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 22:59:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 22:59:33 +0000 (UTC)
Subject: rpms/clive/F-11 .cvsignore, 1.21, 1.22 clive.spec, 1.24,
	1.25 sources, 1.21, 1.22
Message-ID: <20091218225933.A076B11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17266

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	1 Oct 2009 20:24:19 -0000	1.21
+++ .cvsignore	18 Dec 2009 22:59:33 -0000	1.22
@@ -1 +1 @@
-clive-2.2.7.tar.bz2
+clive-2.2.8.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/clive.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- clive.spec	1 Oct 2009 20:24:19 -0000	1.24
+++ clive.spec	18 Dec 2009 22:59:33 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.7
+Version:        2.2.8
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -37,7 +37,7 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-# These tests require network
+# These tests require network, use "--with network_tests" to execute them
 %{?!_with_network_tests: rm t/02youtube.t }
 %{?!_with_network_tests: rm t/03break.t }
 %{?!_with_network_tests: rm t/04liveleak.t }
@@ -47,7 +47,6 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 %{?!_with_network_tests: rm t/08evisor.t }
 %{?!_with_network_tests: rm t/09google.t }
 %{?!_with_network_tests: rm t/10sevenload.t }
-%{?!_with_network_tests: rm t/11redtube.t }
 %{?!_with_network_tests: rm t/12vimeo.t }
 %{?!_with_network_tests: rm t/14spiegel.t }
 %{?!_with_network_tests: rm t/15ehrensenf.t }
@@ -70,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.8-1
+- Update to 2.2.8
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.2.7-2
+- rebuild against perl 5.10.1
 * Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.7-1
 - Update to 2.2.7
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	1 Oct 2009 20:24:19 -0000	1.21
+++ sources	18 Dec 2009 22:59:33 -0000	1.22
@@ -1 +1 @@
-3f713d996b9a440f83188c19db4023a0  clive-2.2.7.tar.bz2
+fd690551ca7f84ce39fe161039c7c5b8  clive-2.2.8.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:01:04 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:01:04 +0000 (UTC)
Subject: File cclive-0.5.7.tar.bz2 uploaded to lookaside cache by eponyme
Message-ID: <20091218230104.7BF5028EC8A@bastion.fedoraproject.org>

A file has been added to the lookaside cache for clive:

d4e874ff3b55b941f03b99a60addbed4  cclive-0.5.7.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:04:43 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:04:43 +0000 (UTC)
Subject: File cclive-0.5.7.tar.bz2 uploaded to lookaside cache by eponyme
Message-ID: <20091218230443.09C8128ECDA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cclive:

d4e874ff3b55b941f03b99a60addbed4  cclive-0.5.7.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:05:24 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:05:24 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, 1.13, 1.14 cclive.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20091218230524.B2C2111C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18671

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Dec 2009 17:05:53 -0000	1.13
+++ .cvsignore	18 Dec 2009 23:05:24 -0000	1.14
@@ -1 +1 @@
-cclive-0.5.6.tar.bz2
+cclive-0.5.7.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/cclive.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- cclive.spec	6 Dec 2009 17:05:53 -0000	1.13
+++ cclive.spec	18 Dec 2009 23:05:24 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.6
+Version:        0.5.7
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.7-1
+- Update to 0.5.7
 * Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.6-1
 - Update to 0.5.6
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Dec 2009 17:05:53 -0000	1.13
+++ sources	18 Dec 2009 23:05:24 -0000	1.14
@@ -1 +1 @@
-b051bfbd3d9741f5e0cb3280d966a34a  cclive-0.5.6.tar.bz2
+d4e874ff3b55b941f03b99a60addbed4  cclive-0.5.7.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:06:39 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:06:39 +0000 (UTC)
Subject: rpms/cclive/F-12 .cvsignore, 1.13, 1.14 cclive.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20091218230639.1623B11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19084

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Dec 2009 17:08:31 -0000	1.13
+++ .cvsignore	18 Dec 2009 23:06:38 -0000	1.14
@@ -1 +1 @@
-cclive-0.5.6.tar.bz2
+cclive-0.5.7.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/cclive.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- cclive.spec	6 Dec 2009 17:08:31 -0000	1.13
+++ cclive.spec	18 Dec 2009 23:06:38 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.6
+Version:        0.5.7
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.7-1
+- Update to 0.5.7
 * Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.6-1
 - Update to 0.5.6
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Dec 2009 17:08:31 -0000	1.13
+++ sources	18 Dec 2009 23:06:38 -0000	1.14
@@ -1 +1 @@
-b051bfbd3d9741f5e0cb3280d966a34a  cclive-0.5.6.tar.bz2
+d4e874ff3b55b941f03b99a60addbed4  cclive-0.5.7.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:07:46 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:07:46 +0000 (UTC)
Subject: rpms/cclive/F-11 .cvsignore, 1.13, 1.14 cclive.spec, 1.12,
	1.13 sources, 1.13, 1.14
Message-ID: <20091218230746.C313311C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19533

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Dec 2009 17:10:19 -0000	1.13
+++ .cvsignore	18 Dec 2009 23:07:46 -0000	1.14
@@ -1 +1 @@
-cclive-0.5.6.tar.bz2
+cclive-0.5.7.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/cclive.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cclive.spec	6 Dec 2009 17:10:19 -0000	1.12
+++ cclive.spec	18 Dec 2009 23:07:46 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.6
+Version:        0.5.7
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.7-1
+- Update to 0.5.7
 * Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.6-1
 - Update to 0.5.6
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Dec 2009 17:10:19 -0000	1.13
+++ sources	18 Dec 2009 23:07:46 -0000	1.14
@@ -1 +1 @@
-b051bfbd3d9741f5e0cb3280d966a34a  cclive-0.5.6.tar.bz2
+d4e874ff3b55b941f03b99a60addbed4  cclive-0.5.7.tar.bz2



From jgu at fedoraproject.org  Fri Dec 18 23:12:41 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Fri, 18 Dec 2009 23:12:41 +0000 (UTC)
Subject: rpms/emacs-vm/devel .cvsignore, 1.16, 1.17 emacs-vm.spec, 1.37,
	1.38 sources, 1.16, 1.17 vm-8.0.12-fix-charsets.patch, 1.1,
	NONE vm-8.0.12-fix-missing-autoload.patch, 1.1, NONE
Message-ID: <20091218231241.9BE6611C00E6@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/pkgs/rpms/emacs-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20865

Modified Files:
	.cvsignore emacs-vm.spec sources 
Removed Files:
	vm-8.0.12-fix-charsets.patch 
	vm-8.0.12-fix-missing-autoload.patch 
Log Message:
* Fri Dec 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-1
- Update to 8.0.14
- Drop old macros for emacspackaging and use _emacs macros
- Remove BuildRoot definition
- No longer delete buildroot at beginning of install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Nov 2008 00:35:17 -0000	1.16
+++ .cvsignore	18 Dec 2009 23:12:41 -0000	1.17
@@ -1 +1 @@
-vm-8.0.12.tgz
+vm-8.0.14.tgz


Index: emacs-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- emacs-vm.spec	16 Sep 2009 11:25:09 -0000	1.37
+++ emacs-vm.spec	18 Dec 2009 23:12:41 -0000	1.38
@@ -10,39 +10,23 @@
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define bbdbsupport 1
 
-# 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 23.1
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
-%endif
-
-%define pkgdir %{emacs_lispdir}/vm
+%define pkgdir %{_emacs_sitelispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
-%define initfile %{emacs_startdir}/vm-mode-init.el
+%define initfile %{_emacs_sitestartdir}/vm-mode-init.el
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
-Version: 8.0.12
-Release: 6%{?dist}
+Version: 8.0.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
-URL: http://www.nongnu.org/viewmail/
-Source0: http://download.savannah.nongnu.org/releases/viewmail/vm-%{version}.tgz
+URL: https://launchpad.net/vm
+Source0: http://launchpad.net/vm/8.0.x/%{version}/+download/vm-%{version}.tgz
 
-Patch0: vm-8.0.12-fix-missing-autoload.patch
-Patch1: vm-8.0.12-fix-charsets.patch
-
-Requires: emacs >= %{emacs_version}
+Requires: emacs >= %{_emacs_version}
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: emacs emacs-el texinfo texinfo-tex
+BuildRequires: emacs texinfo texinfo-tex
 
 %if %{bbdbsupport}
 BuildRequires: emacs-bbdb-el
@@ -70,11 +54,7 @@ package. It is not necessary to install 
 %prep
 %setup -q -n vm-%{version}
 
-%patch0 -p1 -b .fix-missing-autoload
-%patch1 -p1 -b .fix-charsets.patch
-
 # Add missing entry for u-vm-color.el to lisp Makefile.in
-# This shouldn't be necessary after 8.0.12 
 sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in
 
 %build
@@ -83,8 +63,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
 make
 
 %install
-rm -rf %{buildroot}
-
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_infodir}
 
@@ -98,7 +76,7 @@ make install \
 (cd lisp ; install -p -m 644 *.el %{buildroot}%{pkgdir})
 
 # Create initialization file.
-install -d %{buildroot}/%{emacs_startdir}
+install -d %{buildroot}/%{_emacs_sitestartdir}
 cat > %{buildroot}/%{initfile} <<EOF
 ;; Startup settings for VM
 (setq vm-toolbar-pixmap-directory "%{pixmapdir}")
@@ -141,6 +119,12 @@ fi
 %{pkgdir}/*.el
 
 %changelog
+* Fri Dec 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-1
+- Update to 8.0.14
+- Drop old macros for emacspackaging and use _emacs macros
+- Remove BuildRoot definition
+- No longer delete buildroot at beginning of install
+
 * Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-6
 - Bump release to fix up cvs problem
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Nov 2008 00:35:17 -0000	1.16
+++ sources	18 Dec 2009 23:12:41 -0000	1.17
@@ -1 +1 @@
-b761ef5d3125d36a44d37626764d8e70  vm-8.0.12.tgz
+35657d3d3dec1dcce5b31ac155e0cc4f  vm-8.0.14.tgz


--- vm-8.0.12-fix-charsets.patch DELETED ---


--- vm-8.0.12-fix-missing-autoload.patch DELETED ---



From jgu at fedoraproject.org  Fri Dec 18 23:13:39 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Fri, 18 Dec 2009 23:13:39 +0000 (UTC)
Subject: rpms/emacs-vm/F-12 emacs-vm.spec,1.37,1.38 sources,1.16,1.17
Message-ID: <20091218231339.4982811C00E6@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/pkgs/rpms/emacs-vm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21246

Modified Files:
	emacs-vm.spec sources 
Log Message:
* Fri Dec 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-1
- Update to 8.0.14
- Drop old macros for emacspackaging and use _emacs macros
- Remove BuildRoot definition
- No longer delete buildroot at beginning of install



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/F-12/emacs-vm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- emacs-vm.spec	16 Sep 2009 11:25:09 -0000	1.37
+++ emacs-vm.spec	18 Dec 2009 23:13:39 -0000	1.38
@@ -10,39 +10,23 @@
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define bbdbsupport 1
 
-# 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 23.1
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
-%endif
-
-%define pkgdir %{emacs_lispdir}/vm
+%define pkgdir %{_emacs_sitelispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
-%define initfile %{emacs_startdir}/vm-mode-init.el
+%define initfile %{_emacs_sitestartdir}/vm-mode-init.el
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
-Version: 8.0.12
-Release: 6%{?dist}
+Version: 8.0.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
-URL: http://www.nongnu.org/viewmail/
-Source0: http://download.savannah.nongnu.org/releases/viewmail/vm-%{version}.tgz
+URL: https://launchpad.net/vm
+Source0: http://launchpad.net/vm/8.0.x/%{version}/+download/vm-%{version}.tgz
 
-Patch0: vm-8.0.12-fix-missing-autoload.patch
-Patch1: vm-8.0.12-fix-charsets.patch
-
-Requires: emacs >= %{emacs_version}
+Requires: emacs >= %{_emacs_version}
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: emacs emacs-el texinfo texinfo-tex
+BuildRequires: emacs texinfo texinfo-tex
 
 %if %{bbdbsupport}
 BuildRequires: emacs-bbdb-el
@@ -70,11 +54,7 @@ package. It is not necessary to install 
 %prep
 %setup -q -n vm-%{version}
 
-%patch0 -p1 -b .fix-missing-autoload
-%patch1 -p1 -b .fix-charsets.patch
-
 # Add missing entry for u-vm-color.el to lisp Makefile.in
-# This shouldn't be necessary after 8.0.12 
 sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in
 
 %build
@@ -83,8 +63,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
 make
 
 %install
-rm -rf %{buildroot}
-
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_infodir}
 
@@ -98,7 +76,7 @@ make install \
 (cd lisp ; install -p -m 644 *.el %{buildroot}%{pkgdir})
 
 # Create initialization file.
-install -d %{buildroot}/%{emacs_startdir}
+install -d %{buildroot}/%{_emacs_sitestartdir}
 cat > %{buildroot}/%{initfile} <<EOF
 ;; Startup settings for VM
 (setq vm-toolbar-pixmap-directory "%{pixmapdir}")
@@ -141,6 +119,12 @@ fi
 %{pkgdir}/*.el
 
 %changelog
+* Fri Dec 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-1
+- Update to 8.0.14
+- Drop old macros for emacspackaging and use _emacs macros
+- Remove BuildRoot definition
+- No longer delete buildroot at beginning of install
+
 * Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-6
 - Bump release to fix up cvs problem
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Nov 2008 00:35:17 -0000	1.16
+++ sources	18 Dec 2009 23:13:39 -0000	1.17
@@ -1 +1 @@
-b761ef5d3125d36a44d37626764d8e70  vm-8.0.12.tgz
+35657d3d3dec1dcce5b31ac155e0cc4f  vm-8.0.14.tgz



From eponyme at fedoraproject.org  Fri Dec 18 23:15:01 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:15:01 +0000 (UTC)
Subject: File abby-0.4.7.tar.bz2 uploaded to lookaside cache by eponyme
Message-ID: <20091218231501.9B11428ECFE@bastion.fedoraproject.org>

A file has been added to the lookaside cache for abby:

c9ed01675da814435dc60fde5c38b9ec  abby-0.4.7.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:15:43 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:15:43 +0000 (UTC)
Subject: rpms/abby/devel .cvsignore, 1.9, 1.10 abby.spec, 1.10, 1.11 sources,
	1.9, 1.10
Message-ID: <20091218231543.06CA611C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21851

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Dec 2009 17:00:45 -0000	1.9
+++ .cvsignore	18 Dec 2009 23:15:42 -0000	1.10
@@ -1 +1 @@
-abby-0.4.6.1.tar.bz2
+abby-0.4.7.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/abby.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- abby.spec	6 Dec 2009 17:00:45 -0000	1.10
+++ abby.spec	18 Dec 2009 23:15:42 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.6.1
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
+- Update to 0.4.7
 * Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6.1-1
 - Update to 0.4.6.1
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Dec 2009 17:00:45 -0000	1.9
+++ sources	18 Dec 2009 23:15:42 -0000	1.10
@@ -1 +1 @@
-f8ca71a7c4a07b4aa1c51bc1b66d24d7  abby-0.4.6.1.tar.bz2
+c9ed01675da814435dc60fde5c38b9ec  abby-0.4.7.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:16:54 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:16:54 +0000 (UTC)
Subject: rpms/abby/F-12 .cvsignore, 1.9, 1.10 abby.spec, 1.9, 1.10 sources,
	1.9, 1.10
Message-ID: <20091218231654.68C9411C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22228

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Dec 2009 17:01:55 -0000	1.9
+++ .cvsignore	18 Dec 2009 23:16:54 -0000	1.10
@@ -1 +1 @@
-abby-0.4.6.1.tar.bz2
+abby-0.4.7.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/abby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- abby.spec	6 Dec 2009 17:01:55 -0000	1.9
+++ abby.spec	18 Dec 2009 23:16:54 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.6.1
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
+- Update to 0.4.7
 * Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6.1-1
 - Update to 0.4.6.1
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Dec 2009 17:01:55 -0000	1.9
+++ sources	18 Dec 2009 23:16:54 -0000	1.10
@@ -1 +1 @@
-f8ca71a7c4a07b4aa1c51bc1b66d24d7  abby-0.4.6.1.tar.bz2
+c9ed01675da814435dc60fde5c38b9ec  abby-0.4.7.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:18:02 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:18:02 +0000 (UTC)
Subject: rpms/abby/F-11 .cvsignore, 1.9, 1.10 abby.spec, 1.8, 1.9 sources,
	1.9, 1.10
Message-ID: <20091218231802.0581D11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22583

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Dec 2009 17:03:06 -0000	1.9
+++ .cvsignore	18 Dec 2009 23:18:01 -0000	1.10
@@ -1 +1 @@
-abby-0.4.6.1.tar.bz2
+abby-0.4.7.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/abby.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- abby.spec	6 Dec 2009 17:03:06 -0000	1.8
+++ abby.spec	18 Dec 2009 23:18:01 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.6.1
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
+- Update to 0.4.7
 * Sun Dec  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6.1-1
 - Update to 0.4.6.1
 * Sat Nov 28 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Dec 2009 17:03:06 -0000	1.9
+++ sources	18 Dec 2009 23:18:01 -0000	1.10
@@ -1 +1 @@
-f8ca71a7c4a07b4aa1c51bc1b66d24d7  abby-0.4.6.1.tar.bz2
+c9ed01675da814435dc60fde5c38b9ec  abby-0.4.7.tar.bz2



From eponyme at fedoraproject.org  Fri Dec 18 23:19:25 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:19:25 +0000 (UTC)
Subject: File WWW-Curl-4.11.tar.gz uploaded to lookaside cache by eponyme
Message-ID: <20091218231925.ECFA828ECFE@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-WWW-Curl:

0fa0d459454dd37ff70033abcc0c64ab  WWW-Curl-4.11.tar.gz



From eponyme at fedoraproject.org  Fri Dec 18 23:20:14 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:20:14 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/devel .cvsignore, 1.5, 1.6 perl-WWW-Curl.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091218232014.CAB8C11C0376@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23223

Modified Files:
	.cvsignore perl-WWW-Curl.spec sources 
Log Message:
Update to 4.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jul 2009 22:58:33 -0000	1.5
+++ .cvsignore	18 Dec 2009 23:20:14 -0000	1.6
@@ -1 +1 @@
-WWW-Curl-4.09.tar.gz
+WWW-Curl-4.11.tar.gz


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/perl-WWW-Curl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-WWW-Curl.spec	7 Dec 2009 07:33:24 -0000	1.7
+++ perl-WWW-Curl.spec	18 Dec 2009 23:20:14 -0000	1.8
@@ -1,11 +1,11 @@
 Name:           perl-WWW-Curl
-Version:        4.09
-Release:        3%{?dist}
+Version:        4.11
+Release:        1%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MPLv1.1 or MIT
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/WWW-Curl/
-Source0:        http://www.cpan.org/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -36,7 +36,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-# These tests require network
+# These tests require network, use "--with network_tests" to execute them
 %{?!_with_network_tests: rm t/01basic.t }
 %{?!_with_network_tests: rm t/02callbacks.t }
 %{?!_with_network_tests: rm t/04abort-test.t }
@@ -58,12 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.11-1
+- Update to 4.11
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.09-3
 - rebuild against perl 5.10.1
-
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.09-1
 - Rebuild for 4.09
 * Mon Jun  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.07-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jul 2009 22:58:33 -0000	1.5
+++ sources	18 Dec 2009 23:20:14 -0000	1.6
@@ -1 +1 @@
-04c136c1212edb68717ec14f6dff1cc3  WWW-Curl-4.09.tar.gz
+0fa0d459454dd37ff70033abcc0c64ab  WWW-Curl-4.11.tar.gz



From eponyme at fedoraproject.org  Fri Dec 18 23:21:28 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:21:28 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-12 .cvsignore, 1.5, 1.6 perl-WWW-Curl.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091218232128.8FC1C11C0267@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23664

Modified Files:
	.cvsignore perl-WWW-Curl.spec sources 
Log Message:
Update to 4.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jul 2009 22:58:33 -0000	1.5
+++ .cvsignore	18 Dec 2009 23:21:27 -0000	1.6
@@ -1 +1 @@
-WWW-Curl-4.09.tar.gz
+WWW-Curl-4.11.tar.gz


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-12/perl-WWW-Curl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-WWW-Curl.spec	26 Jul 2009 17:27:10 -0000	1.6
+++ perl-WWW-Curl.spec	18 Dec 2009 23:21:27 -0000	1.7
@@ -1,11 +1,11 @@
 Name:           perl-WWW-Curl
-Version:        4.09
-Release:        2%{?dist}
+Version:        4.11
+Release:        1%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MPLv1.1 or MIT
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/WWW-Curl/
-Source0:        http://www.cpan.org/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -36,7 +36,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-# These tests require network
+# These tests require network, use "--with network_tests" to execute them
 %{?!_with_network_tests: rm t/01basic.t }
 %{?!_with_network_tests: rm t/02callbacks.t }
 %{?!_with_network_tests: rm t/04abort-test.t }
@@ -58,9 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.11-1
+- Update to 4.11
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.09-3
+- rebuild against perl 5.10.1
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.09-1
 - Rebuild for 4.09
 * Mon Jun  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.07-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jul 2009 22:58:33 -0000	1.5
+++ sources	18 Dec 2009 23:21:28 -0000	1.6
@@ -1 +1 @@
-04c136c1212edb68717ec14f6dff1cc3  WWW-Curl-4.09.tar.gz
+0fa0d459454dd37ff70033abcc0c64ab  WWW-Curl-4.11.tar.gz



From eponyme at fedoraproject.org  Fri Dec 18 23:22:27 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:22:27 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-11 .cvsignore, 1.5, 1.6 perl-WWW-Curl.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20091218232227.0876511C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24011

Modified Files:
	.cvsignore perl-WWW-Curl.spec sources 
Log Message:
Update to 4.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jul 2009 23:01:07 -0000	1.5
+++ .cvsignore	18 Dec 2009 23:22:26 -0000	1.6
@@ -1 +1 @@
-WWW-Curl-4.09.tar.gz
+WWW-Curl-4.11.tar.gz


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-11/perl-WWW-Curl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-WWW-Curl.spec	11 Jul 2009 23:01:07 -0000	1.5
+++ perl-WWW-Curl.spec	18 Dec 2009 23:22:26 -0000	1.6
@@ -1,11 +1,11 @@
 Name:           perl-WWW-Curl
-Version:        4.09
+Version:        4.11
 Release:        1%{?dist}
 Summary:        Perl extension interface for libcurl
 License:        MPLv1.1 or MIT
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/WWW-Curl/
-Source0:        http://www.cpan.org/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -36,7 +36,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-# These tests require network
+# These tests require network, use "--with network_tests" to execute them
 %{?!_with_network_tests: rm t/01basic.t }
 %{?!_with_network_tests: rm t/02callbacks.t }
 %{?!_with_network_tests: rm t/04abort-test.t }
@@ -58,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Dec 18 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.11-1
+- Update to 4.11
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 4.09-3
+- rebuild against perl 5.10.1
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.09-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.09-1
 - Rebuild for 4.09
 * Mon Jun  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.07-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jul 2009 23:01:07 -0000	1.5
+++ sources	18 Dec 2009 23:22:26 -0000	1.6
@@ -1 +1 @@
-04c136c1212edb68717ec14f6dff1cc3  WWW-Curl-4.09.tar.gz
+0fa0d459454dd37ff70033abcc0c64ab  WWW-Curl-4.11.tar.gz



From eponyme at fedoraproject.org  Fri Dec 18 23:35:22 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:35:22 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/devel perl-WWW-Curl.spec,1.8,1.9
Message-ID: <20091218233522.CD2D911C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26844

Modified Files:
	perl-WWW-Curl.spec 
Log Message:
Removed a network test


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/perl-WWW-Curl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-WWW-Curl.spec	18 Dec 2009 23:20:14 -0000	1.8
+++ perl-WWW-Curl.spec	18 Dec 2009 23:35:10 -0000	1.9
@@ -41,6 +41,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{?!_with_network_tests: rm t/02callbacks.t }
 %{?!_with_network_tests: rm t/04abort-test.t }
 %{?!_with_network_tests: rm t/05progress.t }
+%{?!_with_network_tests: rm t/08ssl.t }
 %{?!_with_network_tests: rm t/09times.t }
 %{?!_with_network_tests: rm t/14duphandle.t }
 %{?!_with_network_tests: rm t/15duphandle-callback.t }



From eponyme at fedoraproject.org  Fri Dec 18 23:36:32 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:36:32 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-12 perl-WWW-Curl.spec,1.7,1.8
Message-ID: <20091218233632.3961311C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27232

Modified Files:
	perl-WWW-Curl.spec 
Log Message:
Removed a network test


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-12/perl-WWW-Curl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-WWW-Curl.spec	18 Dec 2009 23:21:27 -0000	1.7
+++ perl-WWW-Curl.spec	18 Dec 2009 23:36:31 -0000	1.8
@@ -41,6 +41,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{?!_with_network_tests: rm t/02callbacks.t }
 %{?!_with_network_tests: rm t/04abort-test.t }
 %{?!_with_network_tests: rm t/05progress.t }
+%{?!_with_network_tests: rm t/08ssl.t }
 %{?!_with_network_tests: rm t/09times.t }
 %{?!_with_network_tests: rm t/14duphandle.t }
 %{?!_with_network_tests: rm t/15duphandle-callback.t }



From eponyme at fedoraproject.org  Fri Dec 18 23:37:25 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:37:25 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-11 perl-WWW-Curl.spec,1.6,1.7
Message-ID: <20091218233725.49CCF11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27523

Modified Files:
	perl-WWW-Curl.spec 
Log Message:
Removed a network test


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-11/perl-WWW-Curl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-WWW-Curl.spec	18 Dec 2009 23:22:26 -0000	1.6
+++ perl-WWW-Curl.spec	18 Dec 2009 23:37:25 -0000	1.7
@@ -41,6 +41,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{?!_with_network_tests: rm t/02callbacks.t }
 %{?!_with_network_tests: rm t/04abort-test.t }
 %{?!_with_network_tests: rm t/05progress.t }
+%{?!_with_network_tests: rm t/08ssl.t }
 %{?!_with_network_tests: rm t/09times.t }
 %{?!_with_network_tests: rm t/14duphandle.t }
 %{?!_with_network_tests: rm t/15duphandle-callback.t }



From rrelyea at fedoraproject.org  Fri Dec 18 23:37:45 2009
From: rrelyea at fedoraproject.org (Robert Relyea)
Date: Fri, 18 Dec 2009 23:37:45 +0000 (UTC)
Subject: rpms/coolkey/devel coolkey-thread-fix.patch, NONE, 1.1 coolkey.spec,
	1.32, 1.33
Message-ID: <20091218233745.CCF5111C00E6@cvs1.fedora.phx.redhat.com>

Author: rrelyea

Update of /cvs/extras/rpms/coolkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27263

Modified Files:
	coolkey.spec 
Added Files:
	coolkey-thread-fix.patch 
Log Message:


Fix coolkey thread issues:
1) Coolkey returned errors when ever thread safety was requested, 
   even though coolkey was thread safe.
2) Coolkey would hang if used with non-threaded applications which did not link
   with -lpthreads


coolkey-thread-fix.patch:
 coolkey.cpp |   36 +++++++++++++++++++++++++-----------
 machdep.cpp |    9 +++++++++
 machdep.h   |    2 ++
 3 files changed, 36 insertions(+), 11 deletions(-)

--- NEW FILE coolkey-thread-fix.patch ---
Index: src/coolkey/coolkey.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/coolkey.cpp,v
retrieving revision 1.2
diff -u -r1.2 coolkey.cpp
--- src/coolkey/coolkey.cpp	14 Feb 2007 19:54:01 -0000	1.2
+++ src/coolkey/coolkey.cpp	18 Dec 2009 23:22:58 -0000
@@ -42,7 +42,9 @@
 
 static SlotList *slotList = NULL;
 
-static OSLock finalizeLock(false);
+static OSLock *finalizeLock = NULL;
+#define FINALIZE_GETLOCK() if (finalizeLock) finalizeLock->getLock();
+#define FINALIZE_RELEASELOCK() if (finalizeLock) finalizeLock->releaseLock();
 
 static CK_BBOOL initialized = FALSE;
 static CK_BBOOL finalizing = FALSE;
@@ -208,11 +210,13 @@
     if( initialized ) {
         return CKR_CRYPTOKI_ALREADY_INITIALIZED;
     }
-    if (!finalizeLock.isValid()) {
+    if (finalizeLock && !finalizeLock->isValid()) {
 	return CKR_CANT_LOCK;
     }
     CK_C_INITIALIZE_ARGS* initArgs = (CK_C_INITIALIZE_ARGS*) pInitArgs;
+    OSLock::setThreadSafe(0);
     if( initArgs != NULL ) {
+	bool needThreads;
 	/* work around a bug in NSS where the library parameters are only
 	 * send if locking is requested */
 	if (initArgs->LibraryParameters) {
@@ -220,7 +224,17 @@
 	} else {
 	    Params::ClearParams();
 	}
-        if( (initArgs->flags & CKF_OS_LOCKING_OK) || initArgs->LockMutex ){
+  	needThreads = ((initArgs->flags & CKF_OS_LOCKING_OK) != 0);
+	OSLock::setThreadSafe(needThreads);
+	/* don't get a finalize lock unless someone initializes us asking
+	 * us to use threads */
+	if (needThreads && !finalizeLock) {
+	    finalizeLock = new OSLock(true);
+	    if (finalizeLock == NULL) return CKR_HOST_MEMORY;
+	}
+	/* only support OS LOCKING threads */
+        if( ((initArgs->flags & CKF_OS_LOCKING_OK) == 0) 
+						&& initArgs->LockMutex ){
             throw PKCS11Exception(CKR_CANT_LOCK);
         }
     }
@@ -259,9 +273,9 @@
     // the finalizing call first, we know it will set waitEvent before
     // we can get the lock, so we only need to protect setting finalizing
     // to true.
-    finalizeLock.getLock();
+    FINALIZE_GETLOCK();
     finalizing = TRUE;
-    finalizeLock.releaseLock();
+    FINALIZE_RELEASELOCK();
     if (waitEvent) {
 	/* we're waiting on a slot event, shutdown first to allow
 	 * the wait function to complete before we pull the rug out.
@@ -273,10 +287,10 @@
     } 
     delete slotList;
     delete log;
-    finalizeLock.getLock();
+    FINALIZE_GETLOCK();
     finalizing = FALSE;
     initialized = FALSE;
-    finalizeLock.releaseLock();
+    FINALIZE_RELEASELOCK();
     return CKR_OK;
 }
 
@@ -595,17 +609,17 @@
 CK_RV
 C_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_PTR pReserved)
 {
-    finalizeLock.getLock();
+    FINALIZE_GETLOCK();
     if( ! initialized ) {
-        finalizeLock.releaseLock();
+	FINALIZE_RELEASELOCK();
         return CKR_CRYPTOKI_NOT_INITIALIZED;
     }
     if (finalizing) {
-        finalizeLock.releaseLock();
+	FINALIZE_RELEASELOCK();
         return CKR_CRYPTOKI_NOT_INITIALIZED;
     }
     waitEvent = TRUE;
-    finalizeLock.releaseLock();
+    FINALIZE_RELEASELOCK();
     try {
         log->log("C_WaitForSlotEvent called\n");
         slotList->waitForSlotEvent(flags, pSlot, pReserved);
Index: src/coolkey/machdep.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.cpp,v
retrieving revision 1.7
diff -u -r1.7 machdep.cpp
--- src/coolkey/machdep.cpp	14 Feb 2008 23:48:19 -0000	1.7
+++ src/coolkey/machdep.cpp	18 Dec 2009 23:22:58 -0000
@@ -37,6 +37,8 @@
 #include <stdlib.h>
 #endif
 
+bool OSLock::needThread = 0;
+
 #ifdef _WIN32
 //
 // Windows functions to grab a named shared memory segment of a specific size,
@@ -123,6 +125,10 @@
 
 OSLock::OSLock(bool exceptionAllowed)
 {
+    if (!needThread) {
+	lockData = NULL;
+	return;
+    }
     lockData = new OSLockData;
     if (lockData) {
 	InitializeCriticalSection(&lockData->mutex);
@@ -360,6 +366,9 @@
     int rc;
 
     lockData = NULL;
+    if (!needThread) {
+	return;
+    }
 #ifdef MAC
     if (!OSLock_attr_init) {
 	rc = pthread_mutexattr_init(&OSLock_attr);
Index: src/coolkey/machdep.h
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.h,v
retrieving revision 1.1
diff -u -r1.1 machdep.h
--- src/coolkey/machdep.h	9 Jun 2006 18:39:11 -0000	1.1
+++ src/coolkey/machdep.h	18 Dec 2009 23:22:58 -0000
@@ -40,12 +40,14 @@
 class OSLock {
 private:
    OSLockData *lockData;
+   static bool needThread;
 public:
    OSLock(bool exceptionAllowed = true);
    ~OSLock();
    bool isValid();
    void getLock();
    void releaseLock();
+   static void setThreadSafe(bool thread) { needThread = thread; }
 };
 
 typedef unsigned long OSTime;


Index: coolkey.spec
===================================================================
RCS file: /cvs/extras/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- coolkey.spec	17 Sep 2009 00:09:52 -0000	1.32
+++ coolkey.spec	18 Dec 2009 23:37:45 -0000	1.33
@@ -22,7 +22,7 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 11%{dist}
+Release: 12%{?dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -31,6 +31,7 @@ Patch1: coolkey-cache-dir-move.patch
 Patch2: coolkey-gcc43.patch
 Patch3: coolkey-latest.patch
 Patch4: coolkey-simple-bugs.patch
+Patch5: coolkey-thread-fix.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -64,6 +65,7 @@ Linux Driver support to access the CoolK
 %patch2 -b .coolkey-gcc43
 %patch3 -b .coolkey-latest
 %patch4 -b .coolkey-simple-bugs
+%patch5 -b .coolkey-thread-fix
 
 %build
 autoconf
@@ -112,10 +114,16 @@ fi
 
 
 %changelog
+* Wed Dec 18 2009 Robert Relyea <rrelyea at redhat.com> - 1.1.0-11
+- Fix threading issue. Coolkey will now work with non-threaded applications 
+- that don't link with libpthread.
+
 * Wed Sep 16 2009 Jack magne <jmagne at redhat.com> - 1.1.0-11
 - Misc bug fixes. Resolves: 485032, #250738, #497758.
+
 * Fri Sep 11 2009 Jack Magne <jmagne at redhat.com> - 1.1.0-10
 - Include latest changes for Gemalto 64K and Safenet 330J.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sgallagh at fedoraproject.org  Fri Dec 18 23:48:03 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 18 Dec 2009 23:48:03 +0000 (UTC)
Subject: File sssd-1.0.0.tar.gz uploaded to lookaside cache by sgallagh
Message-ID: <20091218234803.1178E28EC93@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sssd:

b4a21cd65157e775dd5843d6a7ded10d  sssd-1.0.0.tar.gz



From eponyme at fedoraproject.org  Fri Dec 18 23:53:15 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:53:15 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/devel perl-WWW-Curl.spec,1.9,1.10
Message-ID: <20091218235315.A942E11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31402

Modified Files:
	perl-WWW-Curl.spec 
Log Message:
Removed a network test


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/perl-WWW-Curl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-WWW-Curl.spec	18 Dec 2009 23:35:10 -0000	1.9
+++ perl-WWW-Curl.spec	18 Dec 2009 23:53:15 -0000	1.10
@@ -46,6 +46,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{?!_with_network_tests: rm t/14duphandle.t }
 %{?!_with_network_tests: rm t/15duphandle-callback.t }
 %{?!_with_network_tests: rm t/18twinhandles.t }
+%{?!_with_network_tests: rm t/19multi.t }
 make test
 
 %clean



From sgallagh at fedoraproject.org  Fri Dec 18 23:53:16 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 18 Dec 2009 23:53:16 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.15, 1.16 sources, 1.16, 1.17 sssd.spec,
	1.29, 1.30
Message-ID: <20091218235316.A13AA11C00E6@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31353

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
== Highlights ==
 * One serious security issue was resolved related to the kerberos provider.
  * Users who authenticate against Kerberos and have cached credentials
could log in with a zero-length password
  * The network exposure of this bug was limited, as users logged in
this way would not have valid network credentials (by lucky accident).
  * This issue was present only in the 0.99.x preview releases and not
in any of the stable releases (0.7.1 and earlier)
 * Stability fixes since the 0.99.1 preview release
 * Added or updated several translations
 * Fixed long-standing "I have no name!" issue with X-based terminals
 * SSSD now passes "make distcheck" cleanly
 * SSSD PAM now conforms better to standards regarding PAM_PRELIM_CHECK

== Detailed Changelog ==
G?ran Uddeborg (2):
 * Update SV translation
 * Update SV translation

Marina Latini (1):
 * Update IT translation

Martin Nagy (2):
 * Don't consider one address with different port numbers as the same
 * fail over: Change the first server pick logic

Sergei V. Kovylov (1):
 * sssd.spec for SLES

Simo Sorce (2):
 * Fix upgrade bug #323
 * Fix ldap child memory hierarchy and other issues

Stephen Gallagher (14):
 * Properly close STDERR when daemonizing
 * Fix tight loop in monitor
 * Don't set explicit default for "timeout" in domains
 * Fix warning in server.c
 * Raise DEBUG level of sdap_get_generic_done()
 * Change default for enumeration to TRUE
 * Fix tight-loop in monitor part 2
 * Properly handle EINTR from poll()
 * Updating ES translation
 * Add DEBUG messages to getpwnam_callback and getpwuid_callback
 * Clarify access_provider manpage entry
 * Do not blindly accept zero-length passwords
 * Fix broken password changes for local users
 * Release SSSD 1.0

Sumit Bose (9):
 * Use sys.exit instead of exit
 * Check for minimal version of check
 * Build python modules in builddir
 * Use --with-ldb-lib-dir while running make distcheck
 * Cleanup db files after test run
 * disable password migration code
 * Handle chauthtok with PAM_PRELIM_CHECK separately
 * Do not overwrite valid TGTs when offline
 * Fix for #345





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	11 Dec 2009 14:16:51 -0000	1.15
+++ .cvsignore	18 Dec 2009 23:53:16 -0000	1.16
@@ -1 +1 @@
-sssd-0.99.1.tar.gz
+sssd-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	11 Dec 2009 14:16:51 -0000	1.16
+++ sources	18 Dec 2009 23:53:16 -0000	1.17
@@ -1 +1 @@
-00468f7fe1b75e53cc3c1027f2a92902  sssd-0.99.1.tar.gz
+b4a21cd65157e775dd5843d6a7ded10d  sssd-1.0.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sssd.spec	11 Dec 2009 14:16:51 -0000	1.29
+++ sssd.spec	18 Dec 2009 23:53:16 -0000	1.30
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.99.1
+Version: 1.0.0
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -205,6 +205,9 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 18 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-1
+- New upstream stable release 1.0.0
+
 * Fri Dec 11 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.1-1
 - New upstream bugfix release 0.99.1
 



From eponyme at fedoraproject.org  Fri Dec 18 23:54:14 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:54:14 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-12 perl-WWW-Curl.spec,1.8,1.9
Message-ID: <20091218235414.8AC9A11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31784

Modified Files:
	perl-WWW-Curl.spec 
Log Message:
Removed a network test


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-12/perl-WWW-Curl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-WWW-Curl.spec	18 Dec 2009 23:36:31 -0000	1.8
+++ perl-WWW-Curl.spec	18 Dec 2009 23:54:13 -0000	1.9
@@ -46,6 +46,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{?!_with_network_tests: rm t/14duphandle.t }
 %{?!_with_network_tests: rm t/15duphandle-callback.t }
 %{?!_with_network_tests: rm t/18twinhandles.t }
+%{?!_with_network_tests: rm t/19multi.t }
 make test
 
 %clean



From eponyme at fedoraproject.org  Fri Dec 18 23:55:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri, 18 Dec 2009 23:55:33 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-11 perl-WWW-Curl.spec,1.7,1.8
Message-ID: <20091218235533.89F5C11C00E6@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32158

Modified Files:
	perl-WWW-Curl.spec 
Log Message:
Removed a network test


Index: perl-WWW-Curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-11/perl-WWW-Curl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-WWW-Curl.spec	18 Dec 2009 23:37:25 -0000	1.7
+++ perl-WWW-Curl.spec	18 Dec 2009 23:55:33 -0000	1.8
@@ -46,6 +46,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{?!_with_network_tests: rm t/14duphandle.t }
 %{?!_with_network_tests: rm t/15duphandle-callback.t }
 %{?!_with_network_tests: rm t/18twinhandles.t }
+%{?!_with_network_tests: rm t/19multi.t }
 make test
 
 %clean



From sgallagh at fedoraproject.org  Sat Dec 19 00:01:37 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Sat, 19 Dec 2009 00:01:37 +0000 (UTC)
Subject: rpms/sssd/F-12 .cvsignore, 1.15, 1.16 sources, 1.16, 1.17 sssd.spec,
	1.29, 1.30
Message-ID: <20091219000137.76B6311C00E6@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1032

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
== Highlights ==
 * One serious security issue was resolved related to the kerberos provider.
  * Users who authenticate against Kerberos and have cached credentials
could log in with a zero-length password
  * The network exposure of this bug was limited, as users logged in
this way would not have valid network credentials (by lucky accident).
  * This issue was present only in the 0.99.x preview releases and not
in any of the stable releases (0.7.1 and earlier)
 * Stability fixes since the 0.99.1 preview release
 * Added or updated several translations
 * Fixed long-standing "I have no name!" issue with X-based terminals
 * SSSD now passes "make distcheck" cleanly
 * SSSD PAM now conforms better to standards regarding PAM_PRELIM_CHECK

== Detailed Changelog ==
G?ran Uddeborg (2):
 * Update SV translation
 * Update SV translation

Marina Latini (1):
 * Update IT translation

Martin Nagy (2):
 * Don't consider one address with different port numbers as the same
 * fail over: Change the first server pick logic

Sergei V. Kovylov (1):
 * sssd.spec for SLES

Simo Sorce (2):
 * Fix upgrade bug #323
 * Fix ldap child memory hierarchy and other issues

Stephen Gallagher (14):
 * Properly close STDERR when daemonizing
 * Fix tight loop in monitor
 * Don't set explicit default for "timeout" in domains
 * Fix warning in server.c
 * Raise DEBUG level of sdap_get_generic_done()
 * Change default for enumeration to TRUE
 * Fix tight-loop in monitor part 2
 * Properly handle EINTR from poll()
 * Updating ES translation
 * Add DEBUG messages to getpwnam_callback and getpwuid_callback
 * Clarify access_provider manpage entry
 * Do not blindly accept zero-length passwords
 * Fix broken password changes for local users
 * Release SSSD 1.0

Sumit Bose (9):
 * Use sys.exit instead of exit
 * Check for minimal version of check
 * Build python modules in builddir
 * Use --with-ldb-lib-dir while running make distcheck
 * Cleanup db files after test run
 * disable password migration code
 * Handle chauthtok with PAM_PRELIM_CHECK separately
 * Do not overwrite valid TGTs when offline
 * Fix for #345




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	11 Dec 2009 14:37:02 -0000	1.15
+++ .cvsignore	19 Dec 2009 00:01:37 -0000	1.16
@@ -1 +1 @@
-sssd-0.99.1.tar.gz
+sssd-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	11 Dec 2009 14:37:02 -0000	1.16
+++ sources	19 Dec 2009 00:01:37 -0000	1.17
@@ -1 +1 @@
-00468f7fe1b75e53cc3c1027f2a92902  sssd-0.99.1.tar.gz
+b4a21cd65157e775dd5843d6a7ded10d  sssd-1.0.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sssd.spec	11 Dec 2009 14:37:02 -0000	1.29
+++ sssd.spec	19 Dec 2009 00:01:37 -0000	1.30
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.99.1
+Version: 1.0.0
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -205,6 +205,9 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 18 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-1
+- New upstream stable release 1.0.0
+
 * Fri Dec 11 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.1-1
 - New upstream bugfix release 0.99.1
 



From sgallagh at fedoraproject.org  Sat Dec 19 00:03:20 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Sat, 19 Dec 2009 00:03:20 +0000 (UTC)
Subject: rpms/sssd/F-11 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 sssd.spec,
	1.26, 1.27
Message-ID: <20091219000320.C4E6D11C00E6@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1748

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
== Highlights ==
 * One serious security issue was resolved related to the kerberos provider.
  * Users who authenticate against Kerberos and have cached credentials
could log in with a zero-length password
  * The network exposure of this bug was limited, as users logged in
this way would not have valid network credentials (by lucky accident).
  * This issue was present only in the 0.99.x preview releases and not
in any of the stable releases (0.7.1 and earlier)
 * Stability fixes since the 0.99.1 preview release
 * Added or updated several translations
 * Fixed long-standing "I have no name!" issue with X-based terminals
 * SSSD now passes "make distcheck" cleanly
 * SSSD PAM now conforms better to standards regarding PAM_PRELIM_CHECK

== Detailed Changelog ==
G?ran Uddeborg (2):
 * Update SV translation
 * Update SV translation

Marina Latini (1):
 * Update IT translation

Martin Nagy (2):
 * Don't consider one address with different port numbers as the same
 * fail over: Change the first server pick logic

Sergei V. Kovylov (1):
 * sssd.spec for SLES

Simo Sorce (2):
 * Fix upgrade bug #323
 * Fix ldap child memory hierarchy and other issues

Stephen Gallagher (14):
 * Properly close STDERR when daemonizing
 * Fix tight loop in monitor
 * Don't set explicit default for "timeout" in domains
 * Fix warning in server.c
 * Raise DEBUG level of sdap_get_generic_done()
 * Change default for enumeration to TRUE
 * Fix tight-loop in monitor part 2
 * Properly handle EINTR from poll()
 * Updating ES translation
 * Add DEBUG messages to getpwnam_callback and getpwuid_callback
 * Clarify access_provider manpage entry
 * Do not blindly accept zero-length passwords
 * Fix broken password changes for local users
 * Release SSSD 1.0

Sumit Bose (9):
 * Use sys.exit instead of exit
 * Check for minimal version of check
 * Build python modules in builddir
 * Use --with-ldb-lib-dir while running make distcheck
 * Cleanup db files after test run
 * disable password migration code
 * Handle chauthtok with PAM_PRELIM_CHECK separately
 * Do not overwrite valid TGTs when offline
 * Fix for #345




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	14 Dec 2009 19:49:49 -0000	1.14
+++ .cvsignore	19 Dec 2009 00:03:19 -0000	1.15
@@ -1 +1 @@
-sssd-0.99.1.tar.gz
+sssd-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	14 Dec 2009 19:49:49 -0000	1.14
+++ sources	19 Dec 2009 00:03:20 -0000	1.15
@@ -1 +1 @@
-00468f7fe1b75e53cc3c1027f2a92902  sssd-0.99.1.tar.gz
+b4a21cd65157e775dd5843d6a7ded10d  sssd-1.0.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sssd.spec	14 Dec 2009 19:49:49 -0000	1.26
+++ sssd.spec	19 Dec 2009 00:03:20 -0000	1.27
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.99.1
+Version: 1.0.0
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -205,6 +205,9 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 18 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-1
+- New upstream stable release 1.0.0
+
 * Fri Dec 11 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.99.1-1
 - New upstream bugfix release 0.99.1
 



From rdieter at fedoraproject.org  Sat Dec 19 01:14:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Dec 2009 01:14:23 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.275,1.276
Message-ID: <20091219011424.01D5111C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17916

Modified Files:
	kdebindings.spec 
Log Message:
BR: attica-devel (temp)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- kdebindings.spec	18 Dec 2009 16:51:36 -0000	1.275
+++ kdebindings.spec	19 Dec 2009 01:14:23 -0000	1.276
@@ -82,6 +82,8 @@ Patch2:  kdebindings-4.3.80-fix-build.pa
 # http://websvn.kde.org/?view=revision&revision=1060018
 
 BuildRequires:  akonadi-devel >= %{akonadi_version} 
+# temporary, to be added as a dep to kdelibs-devel 
+BuildRequires:  attica-devel
 BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
 BuildRequires:  kdegraphics-devel >= %{version}



From rdieter at fedoraproject.org  Sat Dec 19 01:17:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Dec 2009 01:17:36 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.558,1.559
Message-ID: <20091219011736.4171F11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18650

Modified Files:
	kdelibs.spec 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
- -devel: Requires: attica-devel



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -p -r1.558 -r1.559
--- kdelibs.spec	18 Dec 2009 22:53:49 -0000	1.558
+++ kdelibs.spec	19 Dec 2009 01:17:35 -0000	1.559
@@ -1,10 +1,12 @@
+
+%define attica_ver 0.1.1
 %define phonon_ver 4.3.80
 %define soprano_ver 2.3.70
 %define strigi_ver 0.7
 
 Summary: KDE Libraries
 Version: 4.3.85
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -93,7 +95,7 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
-BuildRequires: attica-devel >= 0.1.1
+BuildRequires: attica-devel >= %{attica_ver} 
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bison flex
@@ -164,11 +166,12 @@ Provides:  kdelibs4-devel = %{version}-%
 %{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
 Obsoletes: kdelibs-experimental-devel < 4.3.75 
 Provides:  kdelibs-experimental-devel = %{version}-%{release}
-Requires: cmake >= 2.6.2-3
+Requires: attica-devel >= %{attica_ver} 
 Requires: automoc4 >= 0.9.88
-Requires: qt4-devel
+Requires: cmake >= 2.6.2-3
 Requires: openssl-devel
 Requires: phonon-devel
+Requires: qt4-devel
 # do we really still need all these below? -- Rex
 Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel
@@ -411,6 +414,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
+- -devel: Requires: attica-devel
+
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
 - plasma_scrollwidget patch
 



From dcantrel at fedoraproject.org  Sat Dec 19 01:30:05 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 19 Dec 2009 01:30:05 +0000 (UTC)
Subject: File anaconda-13.12.tar.bz2 uploaded to lookaside cache by dcantrel
Message-ID: <20091219013005.EAE7828ED55@bastion.fedoraproject.org>

A file has been added to the lookaside cache for anaconda:

a1fa9c042368958be47c727154267283  anaconda-13.12.tar.bz2



From dcantrel at fedoraproject.org  Sat Dec 19 01:33:46 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 19 Dec 2009 01:33:46 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.686, 1.687 anaconda.spec, 1.836, 
	1.837 sources, 1.820, 1.821
Message-ID: <20091219013346.AE70D11C00E6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21846a

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Fri Dec 18 2009 David Cantrell <dcantrell at redhat.com> - 13.12-1
- Use the per-disk flag to disable cylinder alignment for msdos disklabels.
  (dlehman)
- Don't include advanced devices in the total count on the basic filter UI.
  (clumens)
- For iSCSI devices, put the path into the UI instead of a WWID. (clumens)
- Add udev_device_get_path. (clumens)
- Make Callbacks._update_size_label callable from outside the object.
  (clumens)
- Do not show the "Add Advanced" button on the basic filtering screen.
  (clumens)
- Log into program.log through the standard python logging (part of
  #524980). (akozumpl)
- Fix typo from commit 13022cc2. (dlehman)
- Restore accidentally removed line in backend.py (hdegoede)
- yuminstall: Fix indentation error (hdegoede)
- No need to special case ignoring of dmraid sets (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -p -r1.686 -r1.687
--- .cvsignore	16 Dec 2009 22:15:44 -0000	1.686
+++ .cvsignore	19 Dec 2009 01:33:46 -0000	1.687
@@ -1,4 +1 @@
-anaconda-13.8.tar.bz2
-anaconda-13.9.tar.bz2
-anaconda-13.10.tar.bz2
-anaconda-13.11.tar.bz2
+anaconda-13.12.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.836
retrieving revision 1.837
diff -u -p -r1.836 -r1.837
--- anaconda.spec	16 Dec 2009 22:15:44 -0000	1.836
+++ anaconda.spec	19 Dec 2009 01:33:46 -0000	1.837
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.11
+Version: 13.12
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -217,6 +217,24 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Dec 18 2009 David Cantrell <dcantrell at redhat.com> - 13.12-1
+- Use the per-disk flag to disable cylinder alignment for msdos disklabels.
+  (dlehman)
+- Don't include advanced devices in the total count on the basic filter UI.
+  (clumens)
+- For iSCSI devices, put the path into the UI instead of a WWID. (clumens)
+- Add udev_device_get_path. (clumens)
+- Make Callbacks._update_size_label callable from outside the object.
+  (clumens)
+- Do not show the "Add Advanced" button on the basic filtering screen.
+  (clumens)
+- Log into program.log through the standard python logging (part of
+  #524980). (akozumpl)
+- Fix typo from commit 13022cc2. (dlehman)
+- Restore accidentally removed line in backend.py (hdegoede)
+- yuminstall: Fix indentation error (hdegoede)
+- No need to special case ignoring of dmraid sets (hdegoede)
+
 * Wed Dec 16 2009 Chris Lumens <clumens at redhat.com> - 13.11-1
 - Clean up setting paths on preupgrade (jvonau). (clumens)
 - And call freetmp, too. (Jerry)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -p -r1.820 -r1.821
--- sources	16 Dec 2009 22:15:45 -0000	1.820
+++ sources	19 Dec 2009 01:33:46 -0000	1.821
@@ -1 +1 @@
-10d8c89908a431be4497d27befbbc4ae  anaconda-13.11.tar.bz2
+a1fa9c042368958be47c727154267283  anaconda-13.12.tar.bz2



From rdieter at fedoraproject.org  Sat Dec 19 01:52:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Dec 2009 01:52:51 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.276,1.277
Message-ID: <20091219015251.335CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25931

Modified Files:
	kdebindings.spec 
Log Message:
drop workaround, new/fixed kdelibs built now



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- kdebindings.spec	19 Dec 2009 01:14:23 -0000	1.276
+++ kdebindings.spec	19 Dec 2009 01:52:51 -0000	1.277
@@ -82,8 +82,6 @@ Patch2:  kdebindings-4.3.80-fix-build.pa
 # http://websvn.kde.org/?view=revision&revision=1060018
 
 BuildRequires:  akonadi-devel >= %{akonadi_version} 
-# temporary, to be added as a dep to kdelibs-devel 
-BuildRequires:  attica-devel
 BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
 BuildRequires:  kdegraphics-devel >= %{version}



From kyle at fedoraproject.org  Sat Dec 19 02:04:32 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 19 Dec 2009 02:04:32 +0000 (UTC)
Subject: File patch-2.6.32.2.bz2 uploaded to lookaside cache by kyle
Message-ID: <20091219020432.2CE7328ED38@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kernel:

924b7aa0fcd6e54c12ecc9b3c3082f59  patch-2.6.32.2.bz2



From rdieter at fedoraproject.org  Sat Dec 19 02:28:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Dec 2009 02:28:41 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.29, 1.30
Message-ID: <20091219022841.DF9C311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1016

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
safer scriptlets



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- kde-plasma-networkmanagement.spec	25 Nov 2009 03:29:46 -0000	1.29
+++ kde-plasma-networkmanagement.spec	19 Dec 2009 02:28:41 -0000	1.30
@@ -141,15 +141,15 @@ touch --no-create %{_kde4_iconsdir}/oxyg
 
 %postun -n %{knetworkmanager}
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
-  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 fi
 
 %posttrans -n %{knetworkmanager}
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %post -n %{knetworkmanager}-libs -p /sbin/ldconfig
 



From kyle at fedoraproject.org  Sat Dec 19 02:35:34 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 19 Dec 2009 02:35:34 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32.2.bz2.sign, NONE, 1.1 .cvsignore,
	1.1149, 1.1150 kernel.spec, 1.1876, 1.1877 sources, 1.1108,
	1.1109 upstream, 1.1021,
	1.1022 drm-i915-fix-sync-to-vbl-when-vga-is-off.patch, 1.1,
	NONE linux-2.6-ath9k-fixes.patch, 1.1,
	NONE linux-2.6-iommu-updates.patch, 1.1,
	NONE patch-2.6.32.1.bz2.sign, 1.1,
	NONE perf-dont-free-perf_mmap_data-until-work-has-been-done.patch,
	1.1, NONE
Message-ID: <20091219023534.F226811C00E6@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2299

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.32.2.bz2.sign 
Removed Files:
	drm-i915-fix-sync-to-vbl-when-vga-is-off.patch 
	linux-2.6-ath9k-fixes.patch linux-2.6-iommu-updates.patch 
	patch-2.6.32.1.bz2.sign 
	perf-dont-free-perf_mmap_data-until-work-has-been-done.patch 
Log Message:
* Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-14
- Linux 2.6.32.2
- dropped upstream patches.



--- NEW FILE patch-2.6.32.2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLLA8TyGugalF9Dw4RArcVAKCUKgkmy1mpxCYSh0tmlbKmIfWb9ACbBKrH
pKjydna4V+WfiL4sIKS/zwc=
=1nus
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1149
retrieving revision 1.1150
diff -u -p -r1.1149 -r1.1150
--- .cvsignore	14 Dec 2009 20:16:52 -0000	1.1149
+++ .cvsignore	19 Dec 2009 02:35:33 -0000	1.1150
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.32
 linux-2.6.32.tar.bz2
-patch-2.6.32.1.bz2
+patch-2.6.32.2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1876
retrieving revision 1.1877
diff -u -p -r1.1876 -r1.1877
--- kernel.spec	18 Dec 2009 09:56:47 -0000	1.1876
+++ kernel.spec	19 Dec 2009 02:35:33 -0000	1.1877
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -619,9 +619,6 @@ Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ptrace.patch
 
-# More workaround for BIOS brokenness, fix intel_iommu=igfx_off oops
-Patch100: linux-2.6-iommu-updates.patch
-
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -671,7 +668,6 @@ Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
-Patch682: linux-2.6-ath9k-fixes.patch
 
 Patch700: linux-2.6.31-nx-data.patch
 Patch701: linux-2.6.31-modules-ro-nx.patch
@@ -698,7 +694,6 @@ Patch1821: drm-page-flip.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
-Patch1826: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 Patch1827: linux-2.6-intel-agp-clear-gtt.patch
 
 # kludge to make ich9 e1000 work
@@ -731,8 +726,6 @@ Patch12010: linux-2.6-dell-laptop-rfkill
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
-Patch12015: perf-dont-free-perf_mmap_data-until-work-has-been-done.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1163,7 +1156,6 @@ ApplyPatch linux-2.6-dell-laptop-rfkill-
 #
 # Intel IOMMU
 #
-ApplyPatch linux-2.6-iommu-updates.patch
 
 #
 # PowerPC
@@ -1289,9 +1281,6 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 
-# ath9k: add fixes suggested by upstream maintainer
-ApplyPatch linux-2.6-ath9k-fixes.patch
-
 # Mark kernel data as NX
 #ApplyPatch linux-2.6.31-nx-data.patch
 # Apply NX/RO to modules
@@ -1332,7 +1321,6 @@ ApplyPatch drm-intel-big-hammer.patch
 ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
-ApplyPatch drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 # Some BIOSes don't clear the whole GTT, and it causes IOMMU faults
 ApplyPatch linux-2.6-intel-agp-clear-gtt.patch
 
@@ -1352,8 +1340,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 # Patches headed upstream
 ApplyPatch linux-2.6-rfkill-all.patch
 
-ApplyPatch perf-dont-free-perf_mmap_data-until-work-has-been-done.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2009,6 +1995,10 @@ fi
 # and build.
 
 %changelog
+* Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-14
+- Linux 2.6.32.2
+- dropped upstream patches.
+
 * Fri Dec 18 2009 Roland McGrath <roland at redhat.com> - 2.6.32.1-13
 - minor utrace update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1108
retrieving revision 1.1109
diff -u -p -r1.1108 -r1.1109
--- sources	14 Dec 2009 20:16:53 -0000	1.1108
+++ sources	19 Dec 2009 02:35:34 -0000	1.1109
@@ -1,2 +1,2 @@
 260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
-abc24a9beb8431a75301dd3884b37a3c  patch-2.6.32.1.bz2
+924b7aa0fcd6e54c12ecc9b3c3082f59  patch-2.6.32.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1021
retrieving revision 1.1022
diff -u -p -r1.1021 -r1.1022
--- upstream	14 Dec 2009 20:16:53 -0000	1.1021
+++ upstream	19 Dec 2009 02:35:34 -0000	1.1022
@@ -1,2 +1,2 @@
 linux-2.6.32.tar.bz2
-patch-2.6.32.1.bz2
+patch-2.6.32.2.bz2


--- drm-i915-fix-sync-to-vbl-when-vga-is-off.patch DELETED ---


--- linux-2.6-ath9k-fixes.patch DELETED ---


--- linux-2.6-iommu-updates.patch DELETED ---


--- patch-2.6.32.1.bz2.sign DELETED ---


--- perf-dont-free-perf_mmap_data-until-work-has-been-done.patch DELETED ---



From kyle at fedoraproject.org  Sat Dec 19 02:46:46 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 19 Dec 2009 02:46:46 +0000 (UTC)
Subject: File patch-2.6.31.9.bz2 uploaded to lookaside cache by kyle
Message-ID: <20091219024646.E522528ECF3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kernel:

819f1552906be755b53154fd570866eb  patch-2.6.31.9.bz2



From rdieter at fedoraproject.org  Sat Dec 19 03:28:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Dec 2009 03:28:00 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.277,1.278
Message-ID: <20091219032800.725D311C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14995

Modified Files:
	kdebindings.spec 
Log Message:
disable ruby/csharp (ie, anything that tries to link broken smokenepomuk)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- kdebindings.spec	19 Dec 2009 01:52:51 -0000	1.277
+++ kdebindings.spec	19 Dec 2009 03:28:00 -0000	1.278
@@ -3,7 +3,7 @@
 ## arch'es matching mono's ExclusiveArch set
 %if 0%{?fedora} > 11
 %ifnarch sparc64
-%define csharp 1
+%define csharp 0 
 %endif
 %endif
 %if 0%{?fedora} == 11
@@ -24,7 +24,7 @@
 %define falcon 1
 %endif
 %define php 1
-%define ruby 1
+%define ruby 0 
 %define smoke 1
 %define java 0
 %endif
@@ -70,16 +70,7 @@ Patch0:  kdebindings-4.3.85-qyoto_no_exa
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
 Patch1:  kdebindings-4.3.75-no-rpath.patch
-# fix the NepomukSmoke build by blacklisting
-# Nepomuk::ResourceManager::generateUniqueUri
-# also fix the PyKDE4 Akonadi and Phonon bindings to build
-# (The Phonon change is a workaround for a missing .sip file, the other stuff is
-# APIs which are just not there to bind.)
-Patch2:  kdebindings-4.3.80-fix-build.patch
-
 ## upstream patches
-# fix the PyKDE4 kdeui bindings to build
-# http://websvn.kde.org/?view=revision&revision=1060018
 
 BuildRequires:  akonadi-devel >= %{akonadi_version} 
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -557,6 +548,7 @@ fi
 %changelog
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)
+- disable ruby/csharp (ie, anything that tries to link broken smokenepomuk)
 
 * Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)



From kyle at fedoraproject.org  Sat Dec 19 03:06:00 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 19 Dec 2009 03:06:00 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.9.bz2.sign, NONE, 1.1 .cvsignore,
	1.1135, 1.1136 kernel.spec, 1.1957, 1.1958 sources, 1.1093,
	1.1094 upstream, 1.1007,
	1.1008 drm-i915-fix-sync-to-vbl-when-vga-is-off.patch, 1.1, NONE
Message-ID: <20091219030600.C4C5A11C00E6@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10045

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31.9.bz2.sign 
Removed Files:
	drm-i915-fix-sync-to-vbl-when-vga-is-off.patch 
Log Message:
* Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.9-172
- stable update 2.6.31.9



--- NEW FILE patch-2.6.31.9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLLA7XyGugalF9Dw4RAsWbAKCIXZ1bJteyy0TSZAW1tG5ZcQz9xgCZAXRu
AvTHZFwVuh79gXhjYhsTB08=
=Yo18
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1135
retrieving revision 1.1136
diff -u -p -r1.1135 -r1.1136
--- .cvsignore	14 Dec 2009 20:25:12 -0000	1.1135
+++ .cvsignore	19 Dec 2009 03:06:00 -0000	1.1136
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.8.bz2
+patch-2.6.31.9.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1957
retrieving revision 1.1958
diff -u -p -r1.1957 -r1.1958
--- kernel.spec	17 Dec 2009 03:03:25 -0000	1.1957
+++ kernel.spec	19 Dec 2009 03:06:00 -0000	1.1958
@@ -40,7 +40,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 8
+%define stable_update 9
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -721,8 +721,6 @@ Patch1822: drm-i915-resume-force-mode.pa
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
-Patch1827: drm-i915-fix-tvmode-oops.patch
-Patch1837: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 Patch1839: drm-radeon-misc-fixes.patch
 Patch1840: drm-radeon-rv410-test-fix.patch
 
@@ -1431,8 +1429,6 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 ApplyPatch drm-intel-no-tv-hotplug.patch
-ApplyPatch drm-i915-fix-tvmode-oops.patch
-ApplyPatch drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 #ApplyPatch drm-disable-r600-aspm.patch
 
 # VGA arb + drm
@@ -2143,6 +2139,9 @@ fi
 # and build.
 
 %changelog
+* Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.9-172
+- stable update 2.6.31.9
+
 * Thu Dec 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.8-171
 - drm-nouveau.patch: add support for GF7100 (NV63)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1093
retrieving revision 1.1094
diff -u -p -r1.1093 -r1.1094
--- sources	14 Dec 2009 20:25:12 -0000	1.1093
+++ sources	19 Dec 2009 03:06:00 -0000	1.1094
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-0fda994c76a981a67464f43c766f2180  patch-2.6.31.8.bz2
+819f1552906be755b53154fd570866eb  patch-2.6.31.9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1007
retrieving revision 1.1008
diff -u -p -r1.1007 -r1.1008
--- upstream	14 Dec 2009 20:25:12 -0000	1.1007
+++ upstream	19 Dec 2009 03:06:00 -0000	1.1008
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.8.bz2
+patch-2.6.31.9.bz2


--- drm-i915-fix-sync-to-vbl-when-vga-is-off.patch DELETED ---



From wtogami at fedoraproject.org  Sat Dec 19 03:08:02 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sat, 19 Dec 2009 03:08:02 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore, 1.55, 1.56 sources, 1.54,
	1.55 spamassassin.spec, 1.136, 1.137
Message-ID: <20091219030802.587ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10522

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
- 3.3.0-rc1
- Bug #103401: portreserve protect spamd port 783 on F-10+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	3 Dec 2009 21:13:34 -0000	1.55
+++ .cvsignore	19 Dec 2009 03:08:01 -0000	1.56
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-3.3.0-beta1.tar.bz2
-Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
+Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	3 Dec 2009 21:13:34 -0000	1.54
+++ sources	19 Dec 2009 03:08:02 -0000	1.55
@@ -1,2 +1,2 @@
-9b39e4e4fad09cfe9eff974f3d5a01ea  Mail-SpamAssassin-3.3.0-beta1.tar.bz2
-cbd092c4e0e71b531f7aca81d4eb2781  Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+0bf1e2c0fc70dc05104acec8a723cbdb  Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
+fabccde7f09dcdf4c06afbd4cc0687c2  Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- spamassassin.spec	16 Dec 2009 19:05:11 -0000	1.136
+++ spamassassin.spec	19 Dec 2009 03:08:02 -0000	1.137
@@ -36,6 +36,12 @@
 %define perl_devel 1
 %endif
 
+%if 0%{?fedora} >= 10
+# We use portreserve to prevent our TCP port being stolen.
+# Require the package here so that we know /etc/portreserve/ exists.
+Requires: portreserve
+%endif
+
 # Mail::DKIM by default (F11+)
 %if 0%{?fedora} >= 11
 %define dkim_deps 1
@@ -47,13 +53,14 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename beta1
-Release: 0.22.%{prename}%{?dist}
+%define prename rc1
+%define proposed .proposed1
+Release: 0.23.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
+Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz 
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -199,6 +206,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
 install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
 
+# Tell portreserve which port we want it to protect.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
+echo 783 > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/spamd
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
@@ -212,6 +222,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_R
 %dir %{_localstatedir}/run/spamassassin
 %dir %{_localstatedir}/lib/spamassassin
 %config(noreplace) %{_sysconfdir}/logrotate.d/sa-update
+%config(noreplace) %{_sysconfdir}/portreserve/spamd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -250,6 +261,10 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 18 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.23.rc1
+- 3.3.0-rc1
+- Bug #103401: portreserve protect spamd port 783 on F-10+
+
 * Thu Dec 03 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.21.beta1
 - 3.3.0-beta1
 



From wtogami at fedoraproject.org  Sat Dec 19 03:04:08 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sat, 19 Dec 2009 03:04:08 +0000 (UTC)
Subject: File Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2 uploaded to
	lookaside cache by wtogami
Message-ID: <20091219030408.2956A28ED5B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for spamassassin:

fabccde7f09dcdf4c06afbd4cc0687c2  Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2



From wtogami at fedoraproject.org  Sat Dec 19 03:03:54 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sat, 19 Dec 2009 03:03:54 +0000 (UTC)
Subject: File Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz uploaded to
	lookaside cache by wtogami
Message-ID: <20091219030354.7779F28ED55@bastion.fedoraproject.org>

A file has been added to the lookaside cache for spamassassin:

0bf1e2c0fc70dc05104acec8a723cbdb  Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz



From dcbw at fedoraproject.org  Sat Dec 19 04:00:08 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat, 19 Dec 2009 04:00:08 +0000 (UTC)
Subject: rpms/ModemManager/devel ModemManager.spec,1.10,1.11
Message-ID: <20091219040008.8DB1911C0335@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21917

Modified Files:
	ModemManager.spec 
Log Message:
Add bug # to changelog


Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/ModemManager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ModemManager.spec	19 Dec 2009 03:59:17 -0000	1.10
+++ ModemManager.spec	19 Dec 2009 04:00:08 -0000	1.11
@@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Dec 18 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-4.git20091218
-- sierra: fix CDMA registration detection in some cases
+- sierra: fix CDMA registration detection in some cases (rh #547513)
 
 * Wed Dec 16 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-3.git20091216
 - sierra: ensure CDMA device is powered up when trying to use it



From dcbw at fedoraproject.org  Sat Dec 19 03:59:17 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat, 19 Dec 2009 03:59:17 +0000 (UTC)
Subject: rpms/ModemManager/devel .cvsignore, 1.7, 1.8 ModemManager.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20091219035917.535D611C00E6@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21694

Modified Files:
	.cvsignore ModemManager.spec sources 
Log Message:
* Fri Dec 18 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-4.git20091218
- sierra: fix CDMA registration detection in some cases




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Dec 2009 01:46:49 -0000	1.7
+++ .cvsignore	19 Dec 2009 03:59:17 -0000	1.8
@@ -4,3 +4,4 @@ ModemManager-0.2-20091105.tar.bz2
 ModemManager-0.2.997.tar.bz2
 ModemManager-0.2.997.git20091214.tar.bz2
 ModemManager-0.2.997.git20091216.tar.bz2
+ModemManager-0.2.997.git20091218.tar.bz2


Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/ModemManager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ModemManager.spec	17 Dec 2009 01:46:49 -0000	1.9
+++ ModemManager.spec	19 Dec 2009 03:59:17 -0000	1.10
@@ -1,9 +1,9 @@
-%define snapshot .git20091216
+%define snapshot .git20091218
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
 Version: 0.2.997
-Release: 3%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Fri Dec 18 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-4.git20091218
+- sierra: fix CDMA registration detection in some cases
+
 * Wed Dec 16 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-3.git20091216
 - sierra: ensure CDMA device is powered up when trying to use it
 - cdma: better signal quality parsing (fixes ex Huawei EC168C)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Dec 2009 01:46:49 -0000	1.8
+++ sources	19 Dec 2009 03:59:17 -0000	1.9
@@ -1 +1 @@
-2237287e0e02b2548e4b7d22e0e33697  ModemManager-0.2.997.git20091216.tar.bz2
+d5972d307305992cce8f12a27b2a62c1  ModemManager-0.2.997.git20091218.tar.bz2



From dcbw at fedoraproject.org  Sat Dec 19 04:01:05 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat, 19 Dec 2009 04:01:05 +0000 (UTC)
Subject: rpms/ModemManager/F-12 ModemManager.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20091219040105.414A911C0375@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22209

Modified Files:
	ModemManager.spec sources 
Log Message:
* Fri Dec 18 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-4.git20091218
- sierra: fix CDMA registration detection in some cases (rh #547513)




Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/ModemManager.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ModemManager.spec	17 Dec 2009 01:47:39 -0000	1.8
+++ ModemManager.spec	19 Dec 2009 04:01:04 -0000	1.9
@@ -1,9 +1,9 @@
-%define snapshot .git20091216
+%define snapshot .git20091218
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
 Version: 0.2.997
-Release: 3%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Fri Dec 18 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-4.git20091218
+- sierra: fix CDMA registration detection in some cases (rh #547513)
+
 * Wed Dec 16 2009 Dan Williams <dcbw at redhat.com> - 0.2.997-3.git20091216
 - sierra: ensure CDMA device is powered up when trying to use it
 - cdma: better signal quality parsing (fixes ex Huawei EC168C)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Dec 2009 01:47:39 -0000	1.7
+++ sources	19 Dec 2009 04:01:05 -0000	1.8
@@ -1 +1 @@
-2237287e0e02b2548e4b7d22e0e33697  ModemManager-0.2.997.git20091216.tar.bz2
+d5972d307305992cce8f12a27b2a62c1  ModemManager-0.2.997.git20091218.tar.bz2



From kkofler at fedoraproject.org  Sat Dec 19 05:17:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 05:17:20 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.331,1.332
Message-ID: <20091219051720.37FF811C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30014/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
rm obsolete comment


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -r1.331 -r1.332
--- kdebase-workspace.spec	18 Dec 2009 18:22:50 -0000	1.331
+++ kdebase-workspace.spec	19 Dec 2009 05:17:19 -0000	1.332
@@ -36,7 +36,6 @@ Patch16: kdebase-workspace-4.3.75-batter
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
 Patch17: kdebase-workspace-4.3.75-classicmenu-logout.patch
-# Fix the version
 Patch19: kdebase-workspace-4.3.3-kdm_plymouth.patch
 Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
 



From dyfet at fedoraproject.org  Sat Dec 19 04:06:15 2009
From: dyfet at fedoraproject.org (David Sugar)
Date: Sat, 19 Dec 2009 04:06:15 +0000 (UTC)
Subject: rpms/sipwitch/devel .cvsignore, 1.5, 1.6 sipwitch.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091219040615.0A5F011C00C5@cvs1.fedora.phx.redhat.com>

Author: dyfet

Update of /cvs/pkgs/rpms/sipwitch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10859

Modified Files:
	.cvsignore sipwitch.spec sources 
Log Message:
New upstream release for F13 domain dialing feature



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Aug 2009 01:46:58 -0000	1.5
+++ .cvsignore	19 Dec 2009 04:06:14 -0000	1.6
@@ -1 +1 @@
-sipwitch-0.5.7.tar.gz
+sipwitch-0.5.12.tar.gz


Index: sipwitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/devel/sipwitch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sipwitch.spec	15 Aug 2009 01:46:58 -0000	1.6
+++ sipwitch.spec	19 Dec 2009 04:06:14 -0000	1.7
@@ -8,15 +8,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?php_extdir: %global %(php-config --extension-dir)}
-%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-
 Name: sipwitch
 Summary: SIP telephony server for secure phone systems
-Version: 0.5.7
-Release: 1%{?dist}
+Version: 0.5.12
+Release: 0%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/sipwitch
 Group: Applications/Communications
@@ -24,9 +19,6 @@ Source: http://www.gnutelephony.org/dist
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ucommon-devel >= 2.0.0
 BuildRequires: libeXosip2-devel >= 3.0.0
-BuildRequires: swig >= 1.3.30
-BuildRequires: python-devel
-BuildRequires: php-devel >= 5.0.0
 BuildRequires: avahi-devel
 BuildRequires: libgcrypt-devel
 Requires(post): chkconfig
@@ -45,30 +37,10 @@ Requires: %{name}-runtime = %{version}-%
 Group: Development/Libraries
 Summary: Headers for building sipwitch plugins
 
-%package snmp
-Requires: net-snmp
-Group: Applications/Internet
-Summary: Standard MIB for GNU Telephony
-
 %package plugin-zeroconf
 Requires: %{name} = %{version}-%{release}
 Summary: Zeroconf plugin for sipwitch
 
-%package python-swig
-Requires: python
-Requires: %{name} = %{version}-%{release}
-Summary: Python package to control sipwitch server
-
-%package php-swig
-Summary: PHP package to control sipwitch server
-Requires: %{name} = %{version}-%{release}
-%if 0%{?php_zend_api}
-Requires: php(zend-abi) = %{php_zend_api}
-Requires: php(api) = %{php_core_api}
-%else
-Requires: php-api = %{php_apiver}
-%endif
-
 %package plugin-scripting
 Requires: %{name} = %{version}-%{release}
 Summary: Scripting plugin for sipwitch
@@ -101,29 +73,13 @@ running sipwitch daemon instance.
 %description runtime
 Runtime library required for sipwitch development and for using the server.
 This is available as a separate package so that one building sipwitch plugins
-with the required devel package does not also require installing a server 
+with the required devel package does not also require installing a server
 image.
 
-%description snmp
-This is the standard GNU Telephony MIB.  It can be used to monitor sipwitch
-servers from a snmp management station when we add snmp support.
-
 %description plugin-zeroconf
 This plugin activates zeroconf network services for sipwitch and publishes
 sipwitch as a sip server.
 
-%description python-swig
-This module allows one to interact with and control a locally running 
-instance of the GNU SIP Witch daemon using python.  This can be used to
-create sipwitch admininstration scripts or python web services that
-interact with the locally running instance of sipwitch.
-
-%description php-swig
-This extension allows one to interact with and control a locally running 
-instance of the GNU SIP Witch daemon using php.  This can be used to
-create sipwitch admininstration scripts or php web services that
-interact with the locally running instance of sipwitch.
-
 %description plugin-scripting
 This plugin enables shell scripting in connection with specific sipwitch 
 events.
@@ -146,40 +102,32 @@ remote voip service provider.
 %prep
 %setup -q
 %build
-%configure --with-pkg-config --disable-static \
-	--with-initrddir=%{_initrddir} \
-	--with-python=%{__python} \
-	--with-python-sitearch=%{python_sitearch} \
-	--with-python-sitelib=%{python_sitelib} \
-	--with-php-extdir=%{php_extdir}
+%configure --with-pkg-config --disable-static --with-initrddir=%{_initrddir}
 
 %{__make} %{?_smp_mflags} 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} INSTALL="install -p" install
-%{__make} DESTDIR=%{buildroot} INSTALL="install -p" swig-python
-%{__make} DESTDIR=%{buildroot} INSTALL="install -p" swig-php5
 %{__rm} -f %{buildroot}/%{_libdir}/*.la
 %{__rm} -f %{buildroot}/%{_libdir}/sipwitch/*.la
 
-# Put the php config bit into place
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
-%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini
-; Enable %{name} extension module
-extension=%{name}.so
-__EOF__
-
-
 %clean
 %{__rm} -rf %{buildroot}
 
 %files 
 %defattr(-,root,root,-)
 %doc README COPYING NEWS FEATURES SUPPORT TODO NOTES AUTHORS MODULES ChangeLog
-%{_mandir}/man8/*.8*
-%{_sbindir}/*
-%{_bindir}/*
+%{_mandir}/man1/sipwitch.1*
+%{_mandir}/man1/sipdigest.1*
+%{_mandir}/man1/sipquery.1*
+%{_mandir}/man8/sipw.8*
+%{_mandir}/man8/sipwitch.cgi.8*
+%{_sbindir}/sipw
+%{_sbindir}/sipwitch.cgi
+%{_bindir}/sipquery
+%{_bindir}/sipwitch
+%{_bindir}/sipdigest
 %dir %{_libdir}/sipwitch
 %config(noreplace) %{_sysconfdir}/logrotate.d/sipwitch
 %attr(0755,root,root) %{_initrddir}/sipwitch
@@ -193,24 +141,10 @@ __EOF__
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
-%files snmp
-%defattr(-,root,root,-)
-%{_datadir}/snmp/mibs/GNUTelephony-MIB.txt
-
 %files plugin-zeroconf
 %defattr(-,root,root,-)
 %{_libdir}/sipwitch/zeroconf.so
 
-%files python-swig
-%defattr(-,root,root,-)
-%{python_sitelib}/sipwitch.py*
-%{python_sitearch}/_sipwitch.so
-
-%files php-swig
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
-%{php_extdir}/sipwitch.so
-
 %files plugin-forward
 %defattr(-,root,root,-)
 %{_libdir}/sipwitch/forward.so
@@ -228,9 +162,13 @@ __EOF__
 %{_libdir}/*.so
 %{_includedir}/sipwitch/
 %{_libdir}/pkgconfig/*.pc
+%{_bindir}/sipwitch-config
+%{_mandir}/man1/sipwitch-config.*
 
-%post
+%post runtime
 /sbin/ldconfig
+
+%post
 /sbin/chkconfig --add sipwitch
 
 %preun
@@ -243,9 +181,20 @@ fi
 if [ "$1" -ge "1" ] ; then
     /sbin/service sipwitch condrestart >/dev/null 2>&1 || :
 fi
+
+%postun runtime
 /sbin/ldconfig
 
 %changelog
+* Wed Dec 09 2009 David Sugar <dyfet at gnutelephony.org> - 0.5.12-0
+- redefined internal user & service permissions and profiles.
+- fixed anonymous inbound.
+- added missing manpages.
+
+* Thu Nov 18 2009 David Sugar <dyfet at gnutelephony.org> - 0.5.9-0
+- removed snmp/mib from this package
+- removed unused swig support and complex packaging it required.
+
 * Fri Aug 14 2009 David Sugar <duyfet at gnutelephony.org> - 0.5.7-1
 - memory corruption issue in allocating subnet access objects fixed
 
@@ -262,7 +211,7 @@ fi
 - removed separate rtp proxy, functionality will be integrated into server.
 
 * Wed Jun 10 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.5-0
-- upstream fixed in rel 0.5.5, no patches now needed.
+- upstream fixed in rel 0.5.5, no patches now needed for rpm distros.
 
 * Sun May 10 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.4-3
 - new generic init script layout as a patch until next upstream release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Aug 2009 01:46:58 -0000	1.5
+++ sources	19 Dec 2009 04:06:14 -0000	1.6
@@ -1 +1 @@
-db05132fcbd8dee5a17758137db5cfa1  sipwitch-0.5.7.tar.gz
+d4fbc1b931bc469453c85e3293afabd9  sipwitch-0.5.12.tar.gz



From wtogami at fedoraproject.org  Sat Dec 19 04:09:23 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sat, 19 Dec 2009 04:09:23 +0000 (UTC)
Subject: rpms/spamassassin/F-12 .cvsignore, 1.53, 1.54 sources, 1.52,
	1.53 spamassassin.spec, 1.132, 1.133
Message-ID: <20091219040923.474AA11C00C5@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15617

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
- 3.3.0-rc1
- Bug #103401: portreserve protect spamd port 783 on F-10+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	3 Dec 2009 21:14:47 -0000	1.53
+++ .cvsignore	19 Dec 2009 04:09:23 -0000	1.54
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-3.3.0-beta1.tar.bz2
-Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
+Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	3 Dec 2009 21:14:48 -0000	1.52
+++ sources	19 Dec 2009 04:09:23 -0000	1.53
@@ -1,2 +1,2 @@
-9b39e4e4fad09cfe9eff974f3d5a01ea  Mail-SpamAssassin-3.3.0-beta1.tar.bz2
-cbd092c4e0e71b531f7aca81d4eb2781  Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+0bf1e2c0fc70dc05104acec8a723cbdb  Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
+fabccde7f09dcdf4c06afbd4cc0687c2  Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/spamassassin.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- spamassassin.spec	3 Dec 2009 21:14:48 -0000	1.132
+++ spamassassin.spec	19 Dec 2009 04:09:23 -0000	1.133
@@ -16,6 +16,10 @@
 %define fedora 6
 %define dist .el5
 %endif
+%if 0%{?rhel} == 6
+%define fedora 12
+%define dist .el6
+%endif
 
 # Define variables to use in conditionals
 %define option_ssl 0
@@ -32,6 +36,12 @@
 %define perl_devel 1
 %endif
 
+%if 0%{?fedora} >= 10
+# We use portreserve to prevent our TCP port being stolen.
+# Require the package here so that we know /etc/portreserve/ exists.
+Requires: portreserve
+%endif
+
 # Mail::DKIM by default (F11+)
 %if 0%{?fedora} >= 11
 %define dkim_deps 1
@@ -43,13 +53,14 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename beta1
-Release: 0.21.%{prename}%{?dist}
+%define prename rc1
+%define proposed .proposed1
+Release: 0.23.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
+Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz 
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -195,6 +206,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
 install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
 
+# Tell portreserve which port we want it to protect.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
+echo 783 > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/spamd
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
@@ -208,6 +222,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_R
 %dir %{_localstatedir}/run/spamassassin
 %dir %{_localstatedir}/lib/spamassassin
 %config(noreplace) %{_sysconfdir}/logrotate.d/sa-update
+%config(noreplace) %{_sysconfdir}/portreserve/spamd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -246,6 +261,10 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 18 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.23.rc1
+- 3.3.0-rc1
+- Bug #103401: portreserve protect spamd port 783 on F-10+
+
 * Thu Dec 03 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.21.beta1
 - 3.3.0-beta1
 



From kkofler at fedoraproject.org  Sat Dec 19 05:21:09 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 05:21:09 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec, 1.160,
	1.161 kdegames-4.3.85-fix_liblogine_link.patch, 1.1, NONE
Message-ID: <20091219052110.045E411C00C5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30924/devel

Modified Files:
	kdegames.spec 
Removed Files:
	kdegames-4.3.85-fix_liblogine_link.patch 
Log Message:
* Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
- drop kdegames-4.3.85-fix_liblogine_link.patch, should not be needed anymore


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- kdegames.spec	18 Dec 2009 17:55:04 -0000	1.160
+++ kdegames.spec	19 Dec 2009 05:21:09 -0000	1.161
@@ -3,7 +3,7 @@ Name:    kdegames
 Summary: KDE Games
 Epoch:   6
 Version: 4.3.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -21,9 +21,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0: kdegames-4.3.85-trademarks.patch
 
 # upstream patches from 4.4 trunk
-# fix liblogine to link (Nicolas L?cureuil):
-# http://websvn.kde.org/?view=revision&revision=1058294
-Patch100: kdegames-4.3.85-fix_liblogine_link.patch
 
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
@@ -114,7 +111,6 @@ game applications for KDE 4.
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
 %patch0 -p1 -b .trademarks
-%patch100 -p1 -b .fix-liblogine-link
 
 %build
 # trademarks issue in RHEL
@@ -252,6 +248,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
+- drop kdegames-4.3.85-fix_liblogine_link.patch, should not be needed anymore
+
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)
 


--- kdegames-4.3.85-fix_liblogine_link.patch DELETED ---



From remi at fedoraproject.org  Sat Dec 19 07:25:51 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 19 Dec 2009 07:25:51 +0000 (UTC)
Subject: File ncurses-1.0.1.tgz uploaded to lookaside cache by remi
Message-ID: <20091219072551.30F9610F910@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-pecl-ncurses:

a2ec4437449f9b36bf3cba7a59a37654  ncurses-1.0.1.tgz



From remi at fedoraproject.org  Sat Dec 19 07:27:27 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 19 Dec 2009 07:27:27 +0000 (UTC)
Subject: rpms/php-pecl-ncurses/devel .cvsignore, 1.2,
	1.3 php-pecl-ncurses.spec, 
	1.2, 1.3 sources, 1.2, 1.3 ncurses-1.0.0-php53.patch, 1.1, NONE
Message-ID: <20091219072727.DD8B211C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pecl-ncurses/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26136

Modified Files:
	.cvsignore php-pecl-ncurses.spec sources 
Removed Files:
	ncurses-1.0.0-php53.patch 
Log Message:
update to 1.0.1 (wide char support enabled)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-ncurses/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jul 2009 21:00:50 -0000	1.2
+++ .cvsignore	19 Dec 2009 07:27:25 -0000	1.3
@@ -1 +1 @@
-ncurses-1.0.0.tgz
+ncurses-1.0.1.tgz


Index: php-pecl-ncurses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-ncurses/devel/php-pecl-ncurses.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pecl-ncurses.spec	26 Jul 2009 18:35:36 -0000	1.2
+++ php-pecl-ncurses.spec	19 Dec 2009 07:27:26 -0000	1.3
@@ -5,8 +5,8 @@
 
 Summary:      Terminal screen handling and optimization package
 Name:         php-pecl-ncurses
-Version:      1.0.0
-Release:      3%{?dist}
+Version:      1.0.1
+Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/ncurses
@@ -14,8 +14,6 @@ URL:          http://pecl.php.net/packag
 Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source2:      xml2changelog
 
-Patch0:       ncurses-1.0.0-php53.patch
-
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-devel, ncurses-devel, php-pear
 Requires(post): %{__pecl}
@@ -39,17 +37,16 @@ line.
 
 %prep 
 %setup -c -q
-%{__pear} convert package.xml package2.xml
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 
 cd %{pecl_name}-%{version}
-%patch0 -p0 -b .php53
 
 
 %build
 cd %{pecl_name}-%{version}
 phpize
-%configure
+%configure --enable-ncursesw
+
 %{__make} %{?_smp_mflags}
 
 
@@ -68,7 +65,7 @@ EOF
 # Install XML package description
 # use 'name' rather than 'pecl_name' to avoid conflict with pear extensions
 %{__mkdir_p} %{buildroot}%{pecl_xmldir}
-%{__install} -m 644 ../package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+%{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 
 %check
@@ -105,6 +102,10 @@ fi
 
 
 %changelog
+* Sat Dec 19 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.1-1
+- update to 1.0.1
+- enable wide char support
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-ncurses/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jul 2009 21:00:50 -0000	1.2
+++ sources	19 Dec 2009 07:27:26 -0000	1.3
@@ -1 +1 @@
-b8a2cb350b200985233e9549d358a0e2  ncurses-1.0.0.tgz
+a2ec4437449f9b36bf3cba7a59a37654  ncurses-1.0.1.tgz


--- ncurses-1.0.0-php53.patch DELETED ---



From remi at fedoraproject.org  Sat Dec 19 07:32:34 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 19 Dec 2009 07:32:34 +0000 (UTC)
Subject: rpms/php-pecl-ncurses/F-12 php-pecl-ncurses.spec, 1.2, 1.3 sources, 
	1.2, 1.3 ncurses-1.0.0-php53.patch, 1.1, NONE
Message-ID: <20091219073234.5573811C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pecl-ncurses/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27528

Modified Files:
	php-pecl-ncurses.spec sources 
Removed Files:
	ncurses-1.0.0-php53.patch 
Log Message:
update to 1.0.1 (wide char support enabled)


Index: php-pecl-ncurses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-ncurses/F-12/php-pecl-ncurses.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pecl-ncurses.spec	26 Jul 2009 18:35:36 -0000	1.2
+++ php-pecl-ncurses.spec	19 Dec 2009 07:32:34 -0000	1.3
@@ -5,8 +5,8 @@
 
 Summary:      Terminal screen handling and optimization package
 Name:         php-pecl-ncurses
-Version:      1.0.0
-Release:      3%{?dist}
+Version:      1.0.1
+Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/ncurses
@@ -14,8 +14,6 @@ URL:          http://pecl.php.net/packag
 Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source2:      xml2changelog
 
-Patch0:       ncurses-1.0.0-php53.patch
-
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-devel, ncurses-devel, php-pear
 Requires(post): %{__pecl}
@@ -39,17 +37,16 @@ line.
 
 %prep 
 %setup -c -q
-%{__pear} convert package.xml package2.xml
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 
 cd %{pecl_name}-%{version}
-%patch0 -p0 -b .php53
 
 
 %build
 cd %{pecl_name}-%{version}
 phpize
-%configure
+%configure --enable-ncursesw
+
 %{__make} %{?_smp_mflags}
 
 
@@ -68,7 +65,7 @@ EOF
 # Install XML package description
 # use 'name' rather than 'pecl_name' to avoid conflict with pear extensions
 %{__mkdir_p} %{buildroot}%{pecl_xmldir}
-%{__install} -m 644 ../package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+%{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 
 %check
@@ -105,6 +102,10 @@ fi
 
 
 %changelog
+* Sat Dec 19 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.1-1
+- update to 1.0.1
+- enable wide char support
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-ncurses/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jul 2009 21:00:50 -0000	1.2
+++ sources	19 Dec 2009 07:32:34 -0000	1.3
@@ -1 +1 @@
-b8a2cb350b200985233e9549d358a0e2  ncurses-1.0.0.tgz
+a2ec4437449f9b36bf3cba7a59a37654  ncurses-1.0.1.tgz


--- ncurses-1.0.0-php53.patch DELETED ---



From mycae at fedoraproject.org  Sat Dec 19 08:38:05 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 19 Dec 2009 08:38:05 +0000 (UTC)
Subject: rpms/flexdock/devel flexdock.spec,1.3,1.4
Message-ID: <20091219083805.5DC4E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/flexdock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11338

Modified Files:
	flexdock.spec 
Log Message:
* Fix for bug 548758 



Index: flexdock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flexdock/devel/flexdock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- flexdock.spec	24 Jul 2009 22:53:25 -0000	1.3
+++ flexdock.spec	19 Dec 2009 08:38:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		flexdock
 Version:	0.5.1
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	Docking framework for Java Swing GUI apps
 
 Group:		Development/Libraries
@@ -55,18 +55,17 @@ Swing applications.
 %setup -qc
 
 #Modify the jni dir that is hardcoded in the patch
-cp -pf %{PATCH0} %{PATCH0}.tmp
-sed -i 's!%%{_libdir}/%%{name}/!%{_libdir}/%{name}/!' %{PATCH0}
+cp %{PATCH0} ./tmpJniPatch
+sed -i 's!%%{_libdir}/%%{name}!%{_libdir}/%{name}!' tmpJniPatch
+
 #Apply patches
-%patch0
+#Apply patch0
+patch -p 1 --fuzz=0 < tmpJniPatch
 %patch1
 %patch2
 %patch3
 %patch4
 
-#restore patch0
-mv %{PATCH0}.tmp %{PATCH0}
-
 #Override the build file's default hard-coded paths
 echo "sdk.home=%{_jvmdir}/java" > workingcopy.properties
 
@@ -160,9 +159,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
+- Fix patch to match sed expression
+- Don't modify jni patch in-place
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Mar 28 2009 <mycae(a!t)yahoo.com> 0.5.1-13
 - Version bump due to tag mess
 * Thu Mar 26 2009 <mycae(a!t)yahoo.com> 0.5.1-12



From mycae at fedoraproject.org  Sat Dec 19 08:39:36 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 19 Dec 2009 08:39:36 +0000 (UTC)
Subject: rpms/flexdock/devel flexdock.spec,1.4,1.5
Message-ID: <20091219083936.77BCA11C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/flexdock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11856

Modified Files:
	flexdock.spec 
Log Message:
- tag bump



Index: flexdock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flexdock/devel/flexdock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- flexdock.spec	19 Dec 2009 08:38:05 -0000	1.4
+++ flexdock.spec	19 Dec 2009 08:39:36 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		flexdock
 Version:	0.5.1
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	Docking framework for Java Swing GUI apps
 
 Group:		Development/Libraries
@@ -160,6 +160,8 @@ rm -rf %{buildroot}
 
 %changelog
 * Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
+- tag bump
+* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
 - Fix patch to match sed expression
 - Don't modify jni patch in-place
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-14



From ovasik at fedoraproject.org  Sat Dec 19 08:42:04 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Sat, 19 Dec 2009 08:42:04 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-8.2-uname-processortype.patch, NONE, 
	1.1 coreutils.spec, 1.293, 1.294
Message-ID: <20091219084204.4219D11C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12576

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-8.2-uname-processortype.patch 
Log Message:
bring back uname -p/-i functionality except of the athlon hack(#548834), comment patches

coreutils-8.2-uname-processortype.patch:
 uname.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE coreutils-8.2-uname-processortype.patch ---
diff -urNp coreutils-8.2-orig/src/uname.c coreutils-8.2/src/uname.c
--- coreutils-8.2-orig/src/uname.c	2009-09-23 10:25:44.000000000 +0200
+++ coreutils-8.2/src/uname.c	2009-12-19 09:09:11.663607110 +0100
@@ -301,7 +301,7 @@ main (int argc, char **argv)
 
   if (toprint & PRINT_PROCESSOR)
     {
-      char const *element = unknown;
+      char *element = unknown;
 #if HAVE_SYSINFO && defined SI_ARCHITECTURE
       {
         static char processor[257];
@@ -308,6 +308,12 @@ main (int argc, char **argv)
         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
           element = processor;
       }
+#else
+      {
+	struct utsname u;
+	uname(&u);
+	element = u.machine;
+      }
 #endif
 #ifdef UNAME_PROCESSOR
       if (element == unknown)
@@ -351,7 +357,7 @@ main (int argc, char **argv)
 
   if (toprint & PRINT_HARDWARE_PLATFORM)
     {
-      char const *element = unknown;
+      char *element = unknown;
 #if HAVE_SYSINFO && defined SI_PLATFORM
       {
         static char hardware_platform[257];
@@ -353,6 +359,14 @@ main (int argc, char **argv)
                           hardware_platform, sizeof hardware_platform))
           element = hardware_platform;
       }
+#else
+      {
+	struct utsname u;
+	uname(&u);
+	element = u.machine;
+	if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6')
+		element[1]='3';
+      }
 #endif
 #ifdef UNAME_HARDWARE_PLATFORM
       if (element == unknown)


Index: coreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- coreutils.spec	16 Dec 2009 21:00:11 -0000	1.293
+++ coreutils.spec	19 Dec 2009 08:42:03 -0000	1.294
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -20,12 +20,19 @@ Source203:  coreutils-runuser-l.pamd
 # From upstream
 
 # Our patches
+#general patch to workaround koji build system issues
 Patch100: coreutils-6.10-configuration.patch
+#add note about no difference between binary/text mode on Linux - md5sum manpage
 Patch101: coreutils-6.10-manpages.patch
+#temporarily workaround probable kernel issue with TCSADRAIN(#504798)
 Patch102: coreutils-7.4-sttytcsadrain.patch
+#do display processor type for uname -p/-i based on uname(2) syscall
+Patch103: coreutils-8.2-uname-processortype.patch
 
 # sh-utils
+#add info about TZ envvar to date manpage
 Patch703: sh-utils-2.0.11-dateman.patch
+#set paths for su explicitly, don't get influenced by paths.h
 Patch704: sh-utils-1.16-paths.patch
 # RMS will never accept the PAM patch because it removes his historical
 # rant about Twenex and the wheel group, so we'll continue to maintain
@@ -33,14 +40,21 @@ Patch704: sh-utils-1.16-paths.patch
 Patch706: coreutils-pam.patch
 Patch713: coreutils-4.5.3-langinfo.patch
 
-# (sb) lin18nux/lsb compliance
+# (sb) lin18nux/lsb compliance - multibyte functionality patch
 Patch800: coreutils-i18n.patch
 
+#Call setsid() in su under some circumstances (bug #173008).
 Patch900: coreutils-setsid.patch
+#make runuser binary based on su.c
 Patch907: coreutils-5.2.1-runuser.patch
+#getgrouplist() patch from Ulrich Drepper.
 Patch908: coreutils-getgrouplist.patch
+#Prevent buffer overflow in who(1) (bug #158405).
 Patch912: coreutils-overflow.patch
+#split the PAM scripts for "su -l"/"runuser -l" from that of normal "su" and
+#"runuser" (#198639)
 Patch915: coreutils-split-pam.patch
+#prevent koji build failure with wrong getfacl exit code
 Patch916: coreutils-getfacl-exit-code.patch
 
 #SELINUX Patch - implements Redhat changes
@@ -104,6 +118,7 @@ Libraries for coreutils package.
 %patch100 -p1 -b .configure
 %patch101 -p1 -b .manpages
 %patch102 -p1 -b .tcsadrain
+%patch103 -p1 -b .sysinfo
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -316,10 +331,15 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Sat Dec 19 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-4
+- bring back uname -p/-i functionality except of the
+  athlon hack(#548834)
+- comment patches
+
 * Wed Dec 16 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-3
 - use grep instead of deprecated egrep in colorls.sh script
   (#548174)
-- remove unnecessary versioned requires
+- remove unnecessary versioned requires/conflicts
 - remove non-upstream hack for uname -p
 
 * Wed Dec 16 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-2



From mycae at fedoraproject.org  Sat Dec 19 08:44:00 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 19 Dec 2009 08:44:00 +0000 (UTC)
Subject: rpms/flexdock/devel flexdock.spec,1.5,1.6
Message-ID: <20091219084400.E890B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/flexdock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13149

Modified Files:
	flexdock.spec 
Log Message:
* tag bump 



Index: flexdock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flexdock/devel/flexdock.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- flexdock.spec	19 Dec 2009 08:39:36 -0000	1.5
+++ flexdock.spec	19 Dec 2009 08:44:00 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		flexdock
 Version:	0.5.1
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	Docking framework for Java Swing GUI apps
 
 Group:		Development/Libraries
@@ -159,7 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
+* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-17
+- tag bump
+* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-16
 - tag bump
 * Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
 - Fix patch to match sed expression



From mycae at fedoraproject.org  Sat Dec 19 09:02:27 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 19 Dec 2009 09:02:27 +0000 (UTC)
Subject: rpms/flexdock/F-12 flexdock.spec,1.3,1.4
Message-ID: <20091219090227.379E311C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/flexdock/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17866

Modified Files:
	flexdock.spec 
Log Message:
* Fix for bug 548758



Index: flexdock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flexdock/F-12/flexdock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- flexdock.spec	24 Jul 2009 22:53:25 -0000	1.3
+++ flexdock.spec	19 Dec 2009 09:02:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		flexdock
 Version:	0.5.1
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	Docking framework for Java Swing GUI apps
 
 Group:		Development/Libraries
@@ -55,18 +55,17 @@ Swing applications.
 %setup -qc
 
 #Modify the jni dir that is hardcoded in the patch
-cp -pf %{PATCH0} %{PATCH0}.tmp
-sed -i 's!%%{_libdir}/%%{name}/!%{_libdir}/%{name}/!' %{PATCH0}
+cp %{PATCH0} ./tmpJniPatch
+sed -i 's!%%{_libdir}/%%{name}!%{_libdir}/%{name}!' tmpJniPatch
+
 #Apply patches
-%patch0
+#Apply patch0
+patch -p 1 --fuzz=0 < tmpJniPatch
 %patch1
 %patch2
 %patch3
 %patch4
 
-#restore patch0
-mv %{PATCH0}.tmp %{PATCH0}
-
 #Override the build file's default hard-coded paths
 echo "sdk.home=%{_jvmdir}/java" > workingcopy.properties
 
@@ -160,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
+- Fix patch to match sed expression
+- Don't modify jni patch in-place
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mycae at fedoraproject.org  Sat Dec 19 09:03:58 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 19 Dec 2009 09:03:58 +0000 (UTC)
Subject: rpms/flexdock/F-11 flexdock.spec,1.2,1.3
Message-ID: <20091219090358.EE2FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/flexdock/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18304

Modified Files:
	flexdock.spec 
Log Message:
* Fix bug 548758, bad sed line in spec file



Index: flexdock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flexdock/F-11/flexdock.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- flexdock.spec	27 Mar 2009 15:04:09 -0000	1.2
+++ flexdock.spec	19 Dec 2009 09:03:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		flexdock
 Version:	0.5.1
-Release:	13%{?dist}
+Release:	15%{?dist}
 Summary:	Docking framework for Java Swing GUI apps
 
 Group:		Development/Libraries
@@ -55,18 +55,17 @@ Swing applications.
 %setup -qc
 
 #Modify the jni dir that is hardcoded in the patch
-cp -pf %{PATCH0} %{PATCH0}.tmp
-sed -i 's!%%{_libdir}/%%{name}/!%{_libdir}/%{name}/!' %{PATCH0}
+cp %{PATCH0} ./tmpJniPatch
+sed -i 's!%%{_libdir}/%%{name}!%{_libdir}/%{name}!' tmpJniPatch
+
 #Apply patches
-%patch0
+#Apply patch0
+patch -p 1 --fuzz=0 < tmpJniPatch
 %patch1
 %patch2
 %patch3
 %patch4
 
-#restore patch0
-mv %{PATCH0}.tmp %{PATCH0}
-
 #Override the build file's default hard-coded paths
 echo "sdk.home=%{_jvmdir}/java" > workingcopy.properties
 
@@ -160,6 +159,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
+- Fix patch to match sed expression
+- Don't modify jni patch in-place
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Mar 28 2009 <mycae(a!t)yahoo.com> 0.5.1-13
 - Version bump due to tag mess
 * Thu Mar 26 2009 <mycae(a!t)yahoo.com> 0.5.1-12



From kkofler at fedoraproject.org  Sat Dec 19 09:52:39 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 09:52:39 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.278,1.279
Message-ID: <20091219095239.04D1C11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30552/devel

Modified Files:
	kdebindings.spec 
Log Message:
Don't disable stuff, let's try to fix it instead.


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- kdebindings.spec	19 Dec 2009 03:28:00 -0000	1.278
+++ kdebindings.spec	19 Dec 2009 09:52:38 -0000	1.279
@@ -3,7 +3,7 @@
 ## arch'es matching mono's ExclusiveArch set
 %if 0%{?fedora} > 11
 %ifnarch sparc64
-%define csharp 0 
+%define csharp 1
 %endif
 %endif
 %if 0%{?fedora} == 11
@@ -24,7 +24,7 @@
 %define falcon 1
 %endif
 %define php 1
-%define ruby 0 
+%define ruby 1
 %define smoke 1
 %define java 0
 %endif
@@ -548,7 +548,6 @@ fi
 %changelog
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)
-- disable ruby/csharp (ie, anything that tries to link broken smokenepomuk)
 
 * Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)



From oget at fedoraproject.org  Sat Dec 19 10:29:37 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 19 Dec 2009 10:29:37 +0000 (UTC)
Subject: rpms/jack-keyboard/devel jack-keyboard-dvorak.patch, NONE,
	1.1 jack-keyboard.spec, 1.3, 1.4
Message-ID: <20091219102937.22D2C11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jack-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7018

Modified Files:
	jack-keyboard.spec 
Added Files:
	jack-keyboard-dvorak.patch 
Log Message:
* Sat Dec 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
- Add dvorak keyboard support


jack-keyboard-dvorak.patch:
 man/jack-keyboard.1 |    2 +-
 src/jack-keyboard.c |    4 ++--
 src/pianokeyboard.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)

--- NEW FILE jack-keyboard-dvorak.patch ---
diff -rupN jack-keyboard-2.5.old/man/jack-keyboard.1 jack-keyboard-2.5/man/jack-keyboard.1
--- jack-keyboard-2.5.old/man/jack-keyboard.1	2008-05-12 13:32:03.000000000 -0400
+++ jack-keyboard-2.5/man/jack-keyboard.1	2009-12-09 03:43:44.000000000 -0500
@@ -78,7 +78,7 @@ change once, when it connects. 
 .TP
 \fB-l \fIlayout\fB\fR
 Specify the layout of computer keyboard being used.  Valid arguments are QWERTY,
-QWERTZ and AZERTY.  Default is QWERTY.
+QWERTZ, AZERTY and DVORAK.  Default is QWERTY.
 .SH "DESCRIPTION"
 .PP
 \fBjack-keyboard\fR is a virtual MIDI keyboard - a program that allows
diff -rupN jack-keyboard-2.5.old/src/jack-keyboard.c jack-keyboard-2.5/src/jack-keyboard.c
--- jack-keyboard-2.5.old/src/jack-keyboard.c	2008-05-12 17:17:54.000000000 -0400
+++ jack-keyboard-2.5/src/jack-keyboard.c	2009-12-09 03:44:06.000000000 -0500
@@ -1696,7 +1696,7 @@ usage(void)
 	fprintf(stderr, "   where <channel> is MIDI channel to use for output, from 1 to 16,\n");
 	fprintf(stderr, "   <bank> is MIDI bank to use, from 0 to 16383,\n");
 	fprintf(stderr, "   <program> is MIDI program to use, from 0 to 127,\n");
-	fprintf(stderr, "   and <layout> is either QWERTY, QWERTZ or AZERTY.\n");
+	fprintf(stderr, "   and <layout> is either QWERTY, QWERTZ, AZERTY or DVORAK.\n");
 	fprintf(stderr, "See manual page for details.\n");
 
 	exit(EX_USAGE);
@@ -1834,7 +1834,7 @@ main(int argc, char *argv[])
 		int ret = piano_keyboard_set_keyboard_layout(keyboard, keyboard_layout);
 
 		if (ret) {
-			g_critical("Invalid layout, proper choices are QWERTY, QWERTZ and AZERTY.");
+			g_critical("Invalid layout, proper choices are QWERTY, QWERTZ, AZERTY and DVORAK.");
 			exit(EX_USAGE);
 		}
 	}
diff -rupN jack-keyboard-2.5.old/src/pianokeyboard.c jack-keyboard-2.5/src/pianokeyboard.c
--- jack-keyboard-2.5.old/src/pianokeyboard.c	2008-05-12 17:17:59.000000000 -0400
+++ jack-keyboard-2.5/src/pianokeyboard.c	2009-12-09 04:08:13.000000000 -0500
@@ -280,6 +280,54 @@ bind_keys_qwertz(PianoKeyboard *pk)
 }
 
 static void
+bind_keys_dvorak(PianoKeyboard *pk)
+{
+	clear_notes(pk);
+
+	/* Lower keyboard row - ";qjkxbm". */
+	bind_key(pk, "semicolon", 12);	/* C0 */
+	bind_key(pk, "o", 13);
+	bind_key(pk, "q", 14);
+	bind_key(pk, "e", 15);
+	bind_key(pk, "j", 16);
+	bind_key(pk, "k", 17);
+	bind_key(pk, "i", 18);
+	bind_key(pk, "x", 19);
+	bind_key(pk, "d", 20);
+	bind_key(pk, "b", 21);
+	bind_key(pk, "h", 22);
+	bind_key(pk, "m", 23);
+	bind_key(pk, "w", 24);
+	bind_key(pk, "n", 25);
+	bind_key(pk, "v", 26);
+	bind_key(pk, "s", 27);
+	bind_key(pk, "z", 28);
+
+	/* Upper keyboard row, first octave - "',.pyfg". */
+	bind_key(pk, "apostrophe", 24);
+	bind_key(pk, "2", 25);
+	bind_key(pk, "comma", 26);
+	bind_key(pk, "3", 27);
+	bind_key(pk, "period", 28);
+	bind_key(pk, "p", 29);
+	bind_key(pk, "5", 30);
+	bind_key(pk, "y", 31);
+	bind_key(pk, "6", 32);
+	bind_key(pk, "f", 33);
+	bind_key(pk, "7", 34);
+	bind_key(pk, "g", 35);
+
+	/* Upper keyboard row, the rest - "crl". */
+	bind_key(pk, "c", 36);
+	bind_key(pk, "9", 37);
+	bind_key(pk, "r", 38);
+	bind_key(pk, "0", 39);
+	bind_key(pk, "l", 40);
+	bind_key(pk, "slash", 41);
+	bind_key(pk, "bracketright", 42);
+}
+
+static void
 bind_keys_azerty(PianoKeyboard *pk)
 {
 	clear_notes(pk);
@@ -676,6 +724,9 @@ piano_keyboard_set_keyboard_layout(Piano
 	} else if (!strcasecmp(layout, "AZERTY")) {
 		bind_keys_azerty(pk);
 
+	} else if (!strcasecmp(layout, "DVORAK")) {
+		bind_keys_dvorak(pk);
+
 	} else {
 		/* Unknown layout name. */
 		return TRUE;


Index: jack-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack-keyboard/devel/jack-keyboard.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jack-keyboard.spec	6 Aug 2009 02:19:17 -0000	1.3
+++ jack-keyboard.spec	19 Dec 2009 10:29:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		jack-keyboard
 Version:	2.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Virtual keyboard for JACK MIDI
 Group:		Applications/Multimedia
 License:	BSD
@@ -8,6 +8,9 @@ URL:		http://pin.if.uz.zgora.pl/~trasz/j
 Source0:	http://pin.if.uz.zgora.pl/~trasz/%{name}/%{name}-%{version}.tar.gz
 # Icon is derived from the image on the website:
 Source1:	%{name}.png
+# Add support for Dvorak keyboard. Patch sent upstream via email
+# (no bugtracker):
+Patch0:		%{name}-dvorak.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -24,6 +27,7 @@ so you have two and half octaves under y
 
 %prep
 %setup -q
+%patch0 -p1 -b .dvorak
 
 # Add GenericName to the desktop file
 echo "GenericName=Virtual MIDI Keyboard" >> src/%{name}.desktop
@@ -79,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
+- Add dvorak keyboard support
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-4
 - Update the .desktop file
 



From oget at fedoraproject.org  Sat Dec 19 10:30:36 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 19 Dec 2009 10:30:36 +0000 (UTC)
Subject: rpms/jack-keyboard/F-12 jack-keyboard-dvorak.patch, NONE,
	1.1 jack-keyboard.spec, 1.3, 1.4
Message-ID: <20091219103036.95BD511C0335@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jack-keyboard/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7399

Modified Files:
	jack-keyboard.spec 
Added Files:
	jack-keyboard-dvorak.patch 
Log Message:
* Sat Dec 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
- Add dvorak keyboard support


jack-keyboard-dvorak.patch:
 man/jack-keyboard.1 |    2 +-
 src/jack-keyboard.c |    4 ++--
 src/pianokeyboard.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)

--- NEW FILE jack-keyboard-dvorak.patch ---
diff -rupN jack-keyboard-2.5.old/man/jack-keyboard.1 jack-keyboard-2.5/man/jack-keyboard.1
--- jack-keyboard-2.5.old/man/jack-keyboard.1	2008-05-12 13:32:03.000000000 -0400
+++ jack-keyboard-2.5/man/jack-keyboard.1	2009-12-09 03:43:44.000000000 -0500
@@ -78,7 +78,7 @@ change once, when it connects. 
 .TP
 \fB-l \fIlayout\fB\fR
 Specify the layout of computer keyboard being used.  Valid arguments are QWERTY,
-QWERTZ and AZERTY.  Default is QWERTY.
+QWERTZ, AZERTY and DVORAK.  Default is QWERTY.
 .SH "DESCRIPTION"
 .PP
 \fBjack-keyboard\fR is a virtual MIDI keyboard - a program that allows
diff -rupN jack-keyboard-2.5.old/src/jack-keyboard.c jack-keyboard-2.5/src/jack-keyboard.c
--- jack-keyboard-2.5.old/src/jack-keyboard.c	2008-05-12 17:17:54.000000000 -0400
+++ jack-keyboard-2.5/src/jack-keyboard.c	2009-12-09 03:44:06.000000000 -0500
@@ -1696,7 +1696,7 @@ usage(void)
 	fprintf(stderr, "   where <channel> is MIDI channel to use for output, from 1 to 16,\n");
 	fprintf(stderr, "   <bank> is MIDI bank to use, from 0 to 16383,\n");
 	fprintf(stderr, "   <program> is MIDI program to use, from 0 to 127,\n");
-	fprintf(stderr, "   and <layout> is either QWERTY, QWERTZ or AZERTY.\n");
+	fprintf(stderr, "   and <layout> is either QWERTY, QWERTZ, AZERTY or DVORAK.\n");
 	fprintf(stderr, "See manual page for details.\n");
 
 	exit(EX_USAGE);
@@ -1834,7 +1834,7 @@ main(int argc, char *argv[])
 		int ret = piano_keyboard_set_keyboard_layout(keyboard, keyboard_layout);
 
 		if (ret) {
-			g_critical("Invalid layout, proper choices are QWERTY, QWERTZ and AZERTY.");
+			g_critical("Invalid layout, proper choices are QWERTY, QWERTZ, AZERTY and DVORAK.");
 			exit(EX_USAGE);
 		}
 	}
diff -rupN jack-keyboard-2.5.old/src/pianokeyboard.c jack-keyboard-2.5/src/pianokeyboard.c
--- jack-keyboard-2.5.old/src/pianokeyboard.c	2008-05-12 17:17:59.000000000 -0400
+++ jack-keyboard-2.5/src/pianokeyboard.c	2009-12-09 04:08:13.000000000 -0500
@@ -280,6 +280,54 @@ bind_keys_qwertz(PianoKeyboard *pk)
 }
 
 static void
+bind_keys_dvorak(PianoKeyboard *pk)
+{
+	clear_notes(pk);
+
+	/* Lower keyboard row - ";qjkxbm". */
+	bind_key(pk, "semicolon", 12);	/* C0 */
+	bind_key(pk, "o", 13);
+	bind_key(pk, "q", 14);
+	bind_key(pk, "e", 15);
+	bind_key(pk, "j", 16);
+	bind_key(pk, "k", 17);
+	bind_key(pk, "i", 18);
+	bind_key(pk, "x", 19);
+	bind_key(pk, "d", 20);
+	bind_key(pk, "b", 21);
+	bind_key(pk, "h", 22);
+	bind_key(pk, "m", 23);
+	bind_key(pk, "w", 24);
+	bind_key(pk, "n", 25);
+	bind_key(pk, "v", 26);
+	bind_key(pk, "s", 27);
+	bind_key(pk, "z", 28);
+
+	/* Upper keyboard row, first octave - "',.pyfg". */
+	bind_key(pk, "apostrophe", 24);
+	bind_key(pk, "2", 25);
+	bind_key(pk, "comma", 26);
+	bind_key(pk, "3", 27);
+	bind_key(pk, "period", 28);
+	bind_key(pk, "p", 29);
+	bind_key(pk, "5", 30);
+	bind_key(pk, "y", 31);
+	bind_key(pk, "6", 32);
+	bind_key(pk, "f", 33);
+	bind_key(pk, "7", 34);
+	bind_key(pk, "g", 35);
+
+	/* Upper keyboard row, the rest - "crl". */
+	bind_key(pk, "c", 36);
+	bind_key(pk, "9", 37);
+	bind_key(pk, "r", 38);
+	bind_key(pk, "0", 39);
+	bind_key(pk, "l", 40);
+	bind_key(pk, "slash", 41);
+	bind_key(pk, "bracketright", 42);
+}
+
+static void
 bind_keys_azerty(PianoKeyboard *pk)
 {
 	clear_notes(pk);
@@ -676,6 +724,9 @@ piano_keyboard_set_keyboard_layout(Piano
 	} else if (!strcasecmp(layout, "AZERTY")) {
 		bind_keys_azerty(pk);
 
+	} else if (!strcasecmp(layout, "DVORAK")) {
+		bind_keys_dvorak(pk);
+
 	} else {
 		/* Unknown layout name. */
 		return TRUE;


Index: jack-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack-keyboard/F-12/jack-keyboard.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jack-keyboard.spec	6 Aug 2009 02:19:17 -0000	1.3
+++ jack-keyboard.spec	19 Dec 2009 10:30:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		jack-keyboard
 Version:	2.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Virtual keyboard for JACK MIDI
 Group:		Applications/Multimedia
 License:	BSD
@@ -8,6 +8,9 @@ URL:		http://pin.if.uz.zgora.pl/~trasz/j
 Source0:	http://pin.if.uz.zgora.pl/~trasz/%{name}/%{name}-%{version}.tar.gz
 # Icon is derived from the image on the website:
 Source1:	%{name}.png
+# Add support for Dvorak keyboard. Patch sent upstream via email
+# (no bugtracker):
+Patch0:		%{name}-dvorak.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -24,6 +27,7 @@ so you have two and half octaves under y
 
 %prep
 %setup -q
+%patch0 -p1 -b .dvorak
 
 # Add GenericName to the desktop file
 echo "GenericName=Virtual MIDI Keyboard" >> src/%{name}.desktop
@@ -79,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
+- Add dvorak keyboard support
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-4
 - Update the .desktop file
 



From oget at fedoraproject.org  Sat Dec 19 10:32:20 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 19 Dec 2009 10:32:20 +0000 (UTC)
Subject: rpms/jack-keyboard/F-11 jack-keyboard-dvorak.patch, NONE,
	1.1 jack-keyboard.spec, 1.1, 1.2
Message-ID: <20091219103220.EB2B911C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jack-keyboard/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7916

Modified Files:
	jack-keyboard.spec 
Added Files:
	jack-keyboard-dvorak.patch 
Log Message:
* Sat Dec 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
- Add dvorak keyboard support


jack-keyboard-dvorak.patch:
 man/jack-keyboard.1 |    2 +-
 src/jack-keyboard.c |    4 ++--
 src/pianokeyboard.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)

--- NEW FILE jack-keyboard-dvorak.patch ---
diff -rupN jack-keyboard-2.5.old/man/jack-keyboard.1 jack-keyboard-2.5/man/jack-keyboard.1
--- jack-keyboard-2.5.old/man/jack-keyboard.1	2008-05-12 13:32:03.000000000 -0400
+++ jack-keyboard-2.5/man/jack-keyboard.1	2009-12-09 03:43:44.000000000 -0500
@@ -78,7 +78,7 @@ change once, when it connects. 
 .TP
 \fB-l \fIlayout\fB\fR
 Specify the layout of computer keyboard being used.  Valid arguments are QWERTY,
-QWERTZ and AZERTY.  Default is QWERTY.
+QWERTZ, AZERTY and DVORAK.  Default is QWERTY.
 .SH "DESCRIPTION"
 .PP
 \fBjack-keyboard\fR is a virtual MIDI keyboard - a program that allows
diff -rupN jack-keyboard-2.5.old/src/jack-keyboard.c jack-keyboard-2.5/src/jack-keyboard.c
--- jack-keyboard-2.5.old/src/jack-keyboard.c	2008-05-12 17:17:54.000000000 -0400
+++ jack-keyboard-2.5/src/jack-keyboard.c	2009-12-09 03:44:06.000000000 -0500
@@ -1696,7 +1696,7 @@ usage(void)
 	fprintf(stderr, "   where <channel> is MIDI channel to use for output, from 1 to 16,\n");
 	fprintf(stderr, "   <bank> is MIDI bank to use, from 0 to 16383,\n");
 	fprintf(stderr, "   <program> is MIDI program to use, from 0 to 127,\n");
-	fprintf(stderr, "   and <layout> is either QWERTY, QWERTZ or AZERTY.\n");
+	fprintf(stderr, "   and <layout> is either QWERTY, QWERTZ, AZERTY or DVORAK.\n");
 	fprintf(stderr, "See manual page for details.\n");
 
 	exit(EX_USAGE);
@@ -1834,7 +1834,7 @@ main(int argc, char *argv[])
 		int ret = piano_keyboard_set_keyboard_layout(keyboard, keyboard_layout);
 
 		if (ret) {
-			g_critical("Invalid layout, proper choices are QWERTY, QWERTZ and AZERTY.");
+			g_critical("Invalid layout, proper choices are QWERTY, QWERTZ, AZERTY and DVORAK.");
 			exit(EX_USAGE);
 		}
 	}
diff -rupN jack-keyboard-2.5.old/src/pianokeyboard.c jack-keyboard-2.5/src/pianokeyboard.c
--- jack-keyboard-2.5.old/src/pianokeyboard.c	2008-05-12 17:17:59.000000000 -0400
+++ jack-keyboard-2.5/src/pianokeyboard.c	2009-12-09 04:08:13.000000000 -0500
@@ -280,6 +280,54 @@ bind_keys_qwertz(PianoKeyboard *pk)
 }
 
 static void
+bind_keys_dvorak(PianoKeyboard *pk)
+{
+	clear_notes(pk);
+
+	/* Lower keyboard row - ";qjkxbm". */
+	bind_key(pk, "semicolon", 12);	/* C0 */
+	bind_key(pk, "o", 13);
+	bind_key(pk, "q", 14);
+	bind_key(pk, "e", 15);
+	bind_key(pk, "j", 16);
+	bind_key(pk, "k", 17);
+	bind_key(pk, "i", 18);
+	bind_key(pk, "x", 19);
+	bind_key(pk, "d", 20);
+	bind_key(pk, "b", 21);
+	bind_key(pk, "h", 22);
+	bind_key(pk, "m", 23);
+	bind_key(pk, "w", 24);
+	bind_key(pk, "n", 25);
+	bind_key(pk, "v", 26);
+	bind_key(pk, "s", 27);
+	bind_key(pk, "z", 28);
+
+	/* Upper keyboard row, first octave - "',.pyfg". */
+	bind_key(pk, "apostrophe", 24);
+	bind_key(pk, "2", 25);
+	bind_key(pk, "comma", 26);
+	bind_key(pk, "3", 27);
+	bind_key(pk, "period", 28);
+	bind_key(pk, "p", 29);
+	bind_key(pk, "5", 30);
+	bind_key(pk, "y", 31);
+	bind_key(pk, "6", 32);
+	bind_key(pk, "f", 33);
+	bind_key(pk, "7", 34);
+	bind_key(pk, "g", 35);
+
+	/* Upper keyboard row, the rest - "crl". */
+	bind_key(pk, "c", 36);
+	bind_key(pk, "9", 37);
+	bind_key(pk, "r", 38);
+	bind_key(pk, "0", 39);
+	bind_key(pk, "l", 40);
+	bind_key(pk, "slash", 41);
+	bind_key(pk, "bracketright", 42);
+}
+
+static void
 bind_keys_azerty(PianoKeyboard *pk)
 {
 	clear_notes(pk);
@@ -676,6 +724,9 @@ piano_keyboard_set_keyboard_layout(Piano
 	} else if (!strcasecmp(layout, "AZERTY")) {
 		bind_keys_azerty(pk);
 
+	} else if (!strcasecmp(layout, "DVORAK")) {
+		bind_keys_dvorak(pk);
+
 	} else {
 		/* Unknown layout name. */
 		return TRUE;


Index: jack-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack-keyboard/F-11/jack-keyboard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jack-keyboard.spec	9 May 2009 23:35:33 -0000	1.1
+++ jack-keyboard.spec	19 Dec 2009 10:32:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		jack-keyboard
 Version:	2.5
-Release:	2%{?dist}
+Release:	5%{?dist}
 Summary:	Virtual keyboard for JACK MIDI
 Group:		Applications/Multimedia
 License:	BSD
@@ -8,6 +8,9 @@ URL:		http://pin.if.uz.zgora.pl/~trasz/j
 Source0:	http://pin.if.uz.zgora.pl/~trasz/%{name}/%{name}-%{version}.tar.gz
 # Icon is derived from the image on the website:
 Source1:	%{name}.png
+# Add support for Dvorak keyboard. Patch sent upstream via email
+# (no bugtracker):
+Patch0:		%{name}-dvorak.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -24,6 +27,7 @@ so you have two and half octaves under y
 
 %prep
 %setup -q
+%patch0 -p1 -b .dvorak
 
 # Add GenericName to the desktop file
 echo "GenericName=Virtual MIDI Keyboard" >> src/%{name}.desktop
@@ -48,6 +52,7 @@ install -pm 644	%{SOURCE1} \
 desktop-file-install						\
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
 	--remove-category=Application				\
+	--add-category=X-Jack					\
 	$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
 
@@ -78,6 +83,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
+- Add dvorak keyboard support
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-4
+- Update the .desktop file
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-2
 - Update GenericName
 



From mlichvar at fedoraproject.org  Sat Dec 19 10:36:25 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Sat, 19 Dec 2009 10:36:25 +0000 (UTC)
Subject: File openbox-3.4.9.tar.gz uploaded to lookaside cache by mlichvar
Message-ID: <20091219103625.5335310F92D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for openbox:

2f30670f7067e3e17567019d2eef21a0  openbox-3.4.9.tar.gz



From mlichvar at fedoraproject.org  Sat Dec 19 10:38:20 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Sat, 19 Dec 2009 10:38:20 +0000 (UTC)
Subject: rpms/openbox/devel openbox-3.4.9-autostartdir.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 openbox.spec, 1.45, 1.46 sources,
	1.16, 1.17 openbox-3.4.7.1-autostartdir.patch, 1.1,
	NONE openbox-3.4.7.2-autostartid.patch, 1.1,
	NONE openbox-3.4.8-gdm.patch, 1.1,
	NONE openbox-3.4.8-gnomesession.patch, 1.1,
	NONE openbox-3.4.8-xdgautostart.patch, 1.1, NONE
Message-ID: <20091219103820.5B69711C00E6@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9431

Modified Files:
	.cvsignore openbox.spec sources 
Added Files:
	openbox-3.4.9-autostartdir.patch 
Removed Files:
	openbox-3.4.7.1-autostartdir.patch 
	openbox-3.4.7.2-autostartid.patch openbox-3.4.8-gdm.patch 
	openbox-3.4.8-gnomesession.patch 
	openbox-3.4.8-xdgautostart.patch 
Log Message:
- Update to 3.4.9


openbox-3.4.9-autostartdir.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openbox-3.4.9-autostartdir.patch ---
diff -up openbox-3.4.9/Makefile.in.autostartdir openbox-3.4.9/Makefile.in
--- openbox-3.4.9/Makefile.in.autostartdir	2009-12-18 17:09:20.000000000 +0100
+++ openbox-3.4.9/Makefile.in	2009-12-19 11:09:25.000000000 +0100
@@ -502,7 +502,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir = $(datadir)/pixmaps
 xsddir = $(datadir)/openbox
-secretbindir = $(libdir)/openbox
+secretbindir = $(datadir)/openbox
 appsdir = $(datadir)/applications
 theme = Clearlooks
 AUTOMAKE_OPTIONS = subdir-objects foreign


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Dec 2009 14:12:57 -0000	1.13
+++ .cvsignore	19 Dec 2009 10:38:19 -0000	1.14
@@ -1,2 +1,2 @@
 setlayout.c
-openbox-3.4.8.tar.gz
+openbox-3.4.9.tar.gz


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- openbox.spec	10 Dec 2009 14:12:58 -0000	1.45
+++ openbox.spec	19 Dec 2009 10:38:20 -0000	1.46
@@ -1,5 +1,5 @@
 Name:		openbox
-Version:	3.4.8
+Version:	3.4.9
 Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
@@ -12,12 +12,8 @@ Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	openbox.desktop
 
-Patch0:		openbox-3.4.7.1-autostartdir.patch
-Patch1:		openbox-3.4.8-gdm.patch
-Patch2:		openbox-3.4.8-gnomesession.patch
-Patch3:		openbox-3.4.7.2-autostartid.patch
+Patch0:		openbox-3.4.9-autostartdir.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
-Patch5:		openbox-3.4.8-xdgautostart.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,11 +71,7 @@ The %{name}-libs package contains shared
 %prep
 %setup -q
 %patch0 -p1 -b .autostartdir
-%patch1 -p1 -b .gdm
-%patch2 -p1 -b .gnomesession
-%patch3 -p1 -b .autostartid
 %patch4 -p1 -b .24bit
-%patch5 -p1 -b .xdgautostart
 
 
 %build
@@ -123,6 +115,7 @@ rm -rf %{buildroot}
 %{_bindir}/gnome-panel-control
 %{_bindir}/gdm-control
 %{_bindir}/%{name}*
+%{_bindir}/obprop
 %{_bindir}/setlayout
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/%{name}
@@ -150,6 +143,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.9-1
+- Update to 3.4.9
+
 * Thu Dec 10 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.8-1
 - Update to 3.4.8
 - Fix crash in xdg-autostart on desktop files with TryExec (#544006)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	10 Dec 2009 14:12:58 -0000	1.16
+++ sources	19 Dec 2009 10:38:20 -0000	1.17
@@ -1,2 +1,2 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
-3523fe9760947a15fb8ed3611090ccd2  openbox-3.4.8.tar.gz
+2f30670f7067e3e17567019d2eef21a0  openbox-3.4.9.tar.gz


--- openbox-3.4.7.1-autostartdir.patch DELETED ---


--- openbox-3.4.7.2-autostartid.patch DELETED ---


--- openbox-3.4.8-gdm.patch DELETED ---


--- openbox-3.4.8-gnomesession.patch DELETED ---


--- openbox-3.4.8-xdgautostart.patch DELETED ---



From mlichvar at fedoraproject.org  Sat Dec 19 10:41:29 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Sat, 19 Dec 2009 10:41:29 +0000 (UTC)
Subject: rpms/openbox/F-12 openbox-3.4.9-autostartdir.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 openbox.spec, 1.45, 1.46 sources,
	1.16, 1.17 openbox-3.4.7.1-autostartdir.patch, 1.1,
	NONE openbox-3.4.7.2-autostartid.patch, 1.1,
	NONE openbox-3.4.8-gdm.patch, 1.1,
	NONE openbox-3.4.8-gnomesession.patch, 1.1,
	NONE openbox-3.4.8-xdgautostart.patch, 1.1, NONE
Message-ID: <20091219104129.C248711C00E6@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10258

Modified Files:
	.cvsignore openbox.spec sources 
Added Files:
	openbox-3.4.9-autostartdir.patch 
Removed Files:
	openbox-3.4.7.1-autostartdir.patch 
	openbox-3.4.7.2-autostartid.patch openbox-3.4.8-gdm.patch 
	openbox-3.4.8-gnomesession.patch 
	openbox-3.4.8-xdgautostart.patch 
Log Message:
- Update to 3.4.9


openbox-3.4.9-autostartdir.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openbox-3.4.9-autostartdir.patch ---
diff -up openbox-3.4.9/Makefile.in.autostartdir openbox-3.4.9/Makefile.in
--- openbox-3.4.9/Makefile.in.autostartdir	2009-12-18 17:09:20.000000000 +0100
+++ openbox-3.4.9/Makefile.in	2009-12-19 11:09:25.000000000 +0100
@@ -502,7 +502,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir = $(datadir)/pixmaps
 xsddir = $(datadir)/openbox
-secretbindir = $(libdir)/openbox
+secretbindir = $(datadir)/openbox
 appsdir = $(datadir)/applications
 theme = Clearlooks
 AUTOMAKE_OPTIONS = subdir-objects foreign


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Dec 2009 14:17:50 -0000	1.13
+++ .cvsignore	19 Dec 2009 10:41:29 -0000	1.14
@@ -1,2 +1,2 @@
 setlayout.c
-openbox-3.4.8.tar.gz
+openbox-3.4.9.tar.gz


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/openbox.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- openbox.spec	10 Dec 2009 14:17:50 -0000	1.45
+++ openbox.spec	19 Dec 2009 10:41:29 -0000	1.46
@@ -1,5 +1,5 @@
 Name:		openbox
-Version:	3.4.8
+Version:	3.4.9
 Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
@@ -12,12 +12,8 @@ Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	openbox.desktop
 
-Patch0:		openbox-3.4.7.1-autostartdir.patch
-Patch1:		openbox-3.4.8-gdm.patch
-Patch2:		openbox-3.4.8-gnomesession.patch
-Patch3:		openbox-3.4.7.2-autostartid.patch
+Patch0:		openbox-3.4.9-autostartdir.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
-Patch5:		openbox-3.4.8-xdgautostart.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,11 +71,7 @@ The %{name}-libs package contains shared
 %prep
 %setup -q
 %patch0 -p1 -b .autostartdir
-%patch1 -p1 -b .gdm
-%patch2 -p1 -b .gnomesession
-%patch3 -p1 -b .autostartid
 %patch4 -p1 -b .24bit
-%patch5 -p1 -b .xdgautostart
 
 
 %build
@@ -123,6 +115,7 @@ rm -rf %{buildroot}
 %{_bindir}/gnome-panel-control
 %{_bindir}/gdm-control
 %{_bindir}/%{name}*
+%{_bindir}/obprop
 %{_bindir}/setlayout
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/%{name}
@@ -150,6 +143,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.9-1
+- Update to 3.4.9
+
 * Thu Dec 10 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.8-1
 - Update to 3.4.8
 - Fix crash in xdg-autostart on desktop files with TryExec (#544006)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	10 Dec 2009 14:17:50 -0000	1.16
+++ sources	19 Dec 2009 10:41:29 -0000	1.17
@@ -1,2 +1,2 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
-3523fe9760947a15fb8ed3611090ccd2  openbox-3.4.8.tar.gz
+2f30670f7067e3e17567019d2eef21a0  openbox-3.4.9.tar.gz


--- openbox-3.4.7.1-autostartdir.patch DELETED ---


--- openbox-3.4.7.2-autostartid.patch DELETED ---


--- openbox-3.4.8-gdm.patch DELETED ---


--- openbox-3.4.8-gnomesession.patch DELETED ---


--- openbox-3.4.8-xdgautostart.patch DELETED ---



From kkofler at fedoraproject.org  Sat Dec 19 11:06:50 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 11:06:50 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.85-fix-build.patch, NONE,
	1.1 kdebindings.spec, 1.279,
	1.280 kdebindings-4.3.80-fix-build.patch, 1.6, NONE
Message-ID: <20091219110650.F149711C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16276/devel

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.3.85-fix-build.patch 
Removed Files:
	kdebindings-4.3.80-fix-build.patch 
Log Message:
* Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
- fix NepomukSmoke not getting built, breaking the Ruby and C# bindings

kdebindings-4.3.85-fix-build.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebindings-4.3.85-fix-build.patch ---
diff -ur kdebindings-4.3.85/smoke/CMakeLists.txt kdebindings-4.3.85-fix-build/smoke/CMakeLists.txt
--- kdebindings-4.3.85/smoke/CMakeLists.txt	2009-12-11 00:13:50.000000000 +0100
+++ kdebindings-4.3.85-fix-build/smoke/CMakeLists.txt	2009-12-19 12:03:42.000000000 +0100
@@ -209,7 +209,7 @@
     endif(ENABLE_KTEXTEDITOR_SMOKE)
 
     if(Nepomuk_FOUND)
-        # add_subdirectory(nepomuk)
+        add_subdirectory(nepomuk)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
     endif(Nepomuk_FOUND)
 


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- kdebindings.spec	19 Dec 2009 09:52:38 -0000	1.279
+++ kdebindings.spec	19 Dec 2009 11:06:50 -0000	1.280
@@ -54,7 +54,7 @@
 
 Name: kdebindings
 Version: 4.3.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -70,6 +70,8 @@ Patch0:  kdebindings-4.3.85-qyoto_no_exa
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
 Patch1:  kdebindings-4.3.75-no-rpath.patch
+# fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
+Patch2:  kdebindings-4.3.85-fix-build.patch
 ## upstream patches
 
 BuildRequires:  akonadi-devel >= %{akonadi_version} 
@@ -276,8 +278,7 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
 %patch0 -p1 -b .qyoto_no_examples
-## please please "just work" -- Rex
-#patch2 -p1 -b .fix-build
+%patch2 -p1 -b .fix-build
 
 # upstream patches
 
@@ -546,6 +547,9 @@ fi
 
 
 %changelog
+* Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
+- fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
+
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)
 


--- kdebindings-4.3.80-fix-build.patch DELETED ---



From awjb at fedoraproject.org  Sat Dec 19 11:11:20 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 19 Dec 2009 11:11:20 +0000 (UTC)
Subject: File wine-1.1.35-fe.tar.bz2 uploaded to lookaside cache by awjb
Message-ID: <20091219111120.5C72C10F92D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for wine:

1ade8d4ccd3130692c2c68871683fa9b  wine-1.1.35-fe.tar.bz2



From kkofler at fedoraproject.org  Sat Dec 19 11:42:33 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 11:42:33 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.85-fix-build.patch, 1.1,
	1.2 kdebindings.spec, 1.280, 1.281
Message-ID: <20091219114233.BC02711C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23650/devel

Modified Files:
	kdebindings-4.3.85-fix-build.patch kdebindings.spec 
Log Message:
fix NepomukSmoke build (missing #include <nepomuk/resourcetypeterm.h>)

kdebindings-4.3.85-fix-build.patch:
 CMakeLists.txt             |    2 +-
 nepomuk/nepomuk_includes.h |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: kdebindings-4.3.85-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.85-fix-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebindings-4.3.85-fix-build.patch	19 Dec 2009 11:06:50 -0000	1.1
+++ kdebindings-4.3.85-fix-build.patch	19 Dec 2009 11:42:33 -0000	1.2
@@ -10,3 +10,14 @@ diff -ur kdebindings-4.3.85/smoke/CMakeL
          set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
      endif(Nepomuk_FOUND)
  
+diff -ur kdebindings-4.3.85/smoke/nepomuk/nepomuk_includes.h kdebindings-4.3.85-fix-build/smoke/nepomuk/nepomuk_includes.h
+--- kdebindings-4.3.85/smoke/nepomuk/nepomuk_includes.h	2009-11-21 10:43:27.000000000 +0100
++++ kdebindings-4.3.85-fix-build/smoke/nepomuk/nepomuk_includes.h	2009-12-19 12:39:43.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include <nepomuk/resource.h>
+ #include <nepomuk/resourcemanager.h>
+ #include <nepomuk/resourceterm.h>
++#include <nepomuk/resourcetypeterm.h>
+ #include <nepomuk/result.h>
+ #include <nepomuk/simpleterm.h>
+ #include <nepomuk/tag.h>


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- kdebindings.spec	19 Dec 2009 11:06:50 -0000	1.280
+++ kdebindings.spec	19 Dec 2009 11:42:33 -0000	1.281
@@ -71,6 +71,7 @@ Patch0:  kdebindings-4.3.85-qyoto_no_exa
 #          commit this upstream without further discussion.
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 # fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
+# also fix its build (missing #include <nepomuk/resourcetypeterm.h>)
 Patch2:  kdebindings-4.3.85-fix-build.patch
 ## upstream patches
 
@@ -549,6 +550,7 @@ fi
 %changelog
 * Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
 - fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
+- fix its build (missing #include <nepomuk/resourcetypeterm.h>)
 
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)



From scop at fedoraproject.org  Sat Dec 19 11:44:52 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 19 Dec 2009 11:44:52 +0000 (UTC)
Subject: rpms/ccache/devel ccache.csh.in, 1.1, 1.2 ccache.sh.in, 1.1,
	1.2 ccache.spec, 1.25, 1.26
Message-ID: <20091219114452.E26BE11C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/ccache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24205

Modified Files:
	ccache.csh.in ccache.sh.in ccache.spec 
Log Message:
* Sat Dec 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4-17
- Minor profile.d script performance improvements.
- Fix hardcoded /var/cache/ccache in profile.d scripts.



Index: ccache.csh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.csh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ccache.csh.in	29 Jul 2007 22:38:31 -0000	1.1
+++ ccache.csh.in	19 Dec 2009 11:44:52 -0000	1.2
@@ -9,8 +9,8 @@ endif
 # want that even if they have that write permission can set the CCACHE_DIR
 # and unset the CCACHE_UMASK environment variables in their personal profile.
 
-if ( ! $?CCACHE_DIR && -d @CACHEDIR@ && -w @CACHEDIR@ ) then
-    setenv CCACHE_DIR /var/cache/ccache
+if ( ! $?CCACHE_DIR && -w @CACHEDIR@ && -d @CACHEDIR@ ) then
+    setenv CCACHE_DIR @CACHEDIR@
     setenv CCACHE_UMASK 002
     unsetenv CCACHE_HARDLINK
 endif


Index: ccache.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ccache.sh.in	29 Jul 2007 22:38:31 -0000	1.1
+++ ccache.sh.in	19 Dec 2009 11:44:52 -0000	1.2
@@ -1,16 +1,14 @@
 # Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
 # environment variable in their personal profile.
 
-if ! echo "$PATH" | grep -qw @LIBDIR@/ccache ; then
-    PATH="@LIBDIR@/ccache:$PATH"
-fi
+pathmunge @LIBDIR@/ccache
 
 # If @CACHEDIR@ is writable, use a shared cache there.  Users who don't
 # want that even if they have that write permission can set the CCACHE_DIR
 # and unset the CCACHE_UMASK environment variables in their personal profile.
 
-if [ -z "$CCACHE_DIR" -a -d @CACHEDIR@ -a -w @CACHEDIR@ ] ; then
-    export CCACHE_DIR=/var/cache/ccache
+if [ -z "$CCACHE_DIR" ] && [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
+    export CCACHE_DIR=@CACHEDIR@
     export CCACHE_UMASK=002
     unset CCACHE_HARDLINK
 fi


Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ccache.spec	10 Aug 2009 17:43:51 -0000	1.25
+++ ccache.spec	19 Dec 2009 11:44:52 -0000	1.26
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -23,6 +23,8 @@ Patch4:         http://patch-tracking.de
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
+# For pathmunge in profile.d/ccache.sh, #123621
+Requires:       setup >= 2.5.48
 Requires(triggerin): coreutils
 Requires(triggerpostun): coreutils
 
@@ -102,6 +104,10 @@ done
 
 
 %changelog
+* Sat Dec 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4-17
+- Minor profile.d script performance improvements.
+- Fix hardcoded /var/cache/ccache in profile.d scripts.
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4-16
 - Switch #438201 patch URL to Debian patch tracking (original is MIA).
 



From awjb at fedoraproject.org  Sat Dec 19 12:14:11 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 19 Dec 2009 12:14:11 +0000 (UTC)
Subject: rpms/wine/F-12 .cvsignore, 1.82, 1.83 sources, 1.83, 1.84 wine.spec,
	1.116,
	1.117 0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch,
	1.1, NONE
Message-ID: <20091219121411.AFF6F11C00E6@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30881

Modified Files:
	.cvsignore sources wine.spec 
Removed Files:
	0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	18 Dec 2009 15:17:23 -0000	1.82
+++ .cvsignore	19 Dec 2009 12:14:11 -0000	1.83
@@ -1 +1 @@
-wine-1.1.34-fe.tar.bz2
+wine-1.1.35-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sources	18 Dec 2009 15:17:23 -0000	1.83
+++ sources	19 Dec 2009 12:14:11 -0000	1.84
@@ -1 +1 @@
-445c7d6e6ec1423e9f311eb1b467e5da  wine-1.1.34-fe.tar.bz2
+1ade8d4ccd3130692c2c68871683fa9b  wine-1.1.35-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/wine.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- wine.spec	18 Dec 2009 15:17:23 -0000	1.116
+++ wine.spec	19 Dec 2009 12:14:11 -0000	1.117
@@ -1,6 +1,6 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.34
+Version:	1.1.35
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -55,9 +55,7 @@ Source402:      README-FEDORA-PULSEAUDIO
 Patch1:         wine-rpath.patch
 
 # upstream bugs
-# fix build with newer ssl
-# http://www.winehq.org/pipermail/wine-patches/2009-December/082268.html
-Patch500: 0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch
+# currently non
 
 # bugfix patches
 # #533806
@@ -321,7 +319,6 @@ This package adds an openal driver for w
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
-%patch500 -p1
 
 %ifarch x86_64
 %patch600
@@ -709,6 +706,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/mciwave.dll.so
 %{_libdir}/wine/midimap.dll.so
 %{_libdir}/wine/mlang.dll.so
+%{_libdir}/wine/mmdevapi.dll.so
 %{_libdir}/wine/mountmgr.sys.so
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
@@ -829,6 +827,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winecoreaudio.drv.so
 %{_libdir}/wine/winejoystick.drv.so
+%{_libdir}/wine/winemapi.dll.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing32.dll.so
 %{_libdir}/wine/winhttp.dll.so
@@ -878,12 +877,12 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/vtdapi.vxd.so
 %{_libdir}/wine/vwin32.vxd.so
 %{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/commdlg.dll16
 %{_libdir}/wine/gdi.exe16
 %{_libdir}/wine/wprocs.dll16
 
 %{_libdir}/wine/avifile.dll16.so
 %{_libdir}/wine/comm.drv16.so
+%{_libdir}/wine/commdlg.dll16.so
 %{_libdir}/wine/compobj.dll16.so
 %{_libdir}/wine/ctl3d.dll16.so
 %{_libdir}/wine/ctl3dv2.dll16.so
@@ -1062,6 +1061,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/openal32.dll.so
 
 %changelog
+* Sat Dec 19 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.35-1
+- version upgrade
+
 * Fri Dec 18 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.34-1
 - version upgrade (#546749)


--- 0011-Use-sk_-functions-rather-than-accessing-an-OpenSSL-s.patch DELETED ---



From llaumgui at fedoraproject.org  Sat Dec 19 12:22:40 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 19 Dec 2009 12:22:40 +0000 (UTC)
Subject: File EventLogDatabaseTiein-1.0.2.tgz uploaded to lookaside cache by
	llaumgui
Message-ID: <20091219122240.167E110F8C7@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-ezc-EventLogDatabaseTiein:

d261edd630fe9741cfc6be0cf3c41f93  EventLogDatabaseTiein-1.0.2.tgz



From llaumgui at fedoraproject.org  Sat Dec 19 12:23:17 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 19 Dec 2009 12:23:17 +0000 (UTC)
Subject: rpms/php-ezc-EventLogDatabaseTiein/devel import.log, NONE,
	1.1 php-ezc-EventLogDatabaseTiein.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091219122317.67FBE11C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv652/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-EventLogDatabaseTiein.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
php-ezc-EventLogDatabaseTiein-1_0_2-1_fc12:HEAD:php-ezc-EventLogDatabaseTiein-1.0.2-1.fc12.src.rpm:1261225369


--- NEW FILE php-ezc-EventLogDatabaseTiein.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name EventLogDatabaseTiein
%define channel components.ez.no

Name:           php-ezc-EventLogDatabaseTiein
Version:        1.0.2
Release:        1%{?dist}
Summary:        Contains the database writer backend for the EventLog component

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Database) >= 1.2
Requires:       php-pear(%{channel}/EventLog) >= 1.0.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The EventLogDatabaseTiein component provides an API to log events and audit
trails using a database connection.

ezcLogDatabaseWriter is the log writer that writes log messages to the database.

To write log messages to the database, the Database component is used. The table
to which the log is written should already exist.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
%{__rm} -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
%{__rm} -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
%{__mkdir} -p %{buildroot}%{pear_xmldir}
%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
%{__rm} -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/log_database_autoload.php


%changelog
* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:29:13 -0000	1.1
+++ .cvsignore	19 Dec 2009 12:23:17 -0000	1.2
@@ -0,0 +1 @@
+EventLogDatabaseTiein-1.0.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:29:13 -0000	1.1
+++ sources	19 Dec 2009 12:23:17 -0000	1.2
@@ -0,0 +1 @@
+d261edd630fe9741cfc6be0cf3c41f93  EventLogDatabaseTiein-1.0.2.tgz



From llaumgui at fedoraproject.org  Sat Dec 19 12:26:18 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 19 Dec 2009 12:26:18 +0000 (UTC)
Subject: rpms/php-ezc-EventLogDatabaseTiein/F-12 import.log, NONE,
	1.1 php-ezc-EventLogDatabaseTiein.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091219122618.A9C9911C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1357/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-EventLogDatabaseTiein.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
php-ezc-EventLogDatabaseTiein-1_0_2-1_fc12:F-12:php-ezc-EventLogDatabaseTiein-1.0.2-1.fc12.src.rpm:1261225495


--- NEW FILE php-ezc-EventLogDatabaseTiein.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name EventLogDatabaseTiein
%define channel components.ez.no

Name:           php-ezc-EventLogDatabaseTiein
Version:        1.0.2
Release:        1%{?dist}
Summary:        Contains the database writer backend for the EventLog component

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Database) >= 1.2
Requires:       php-pear(%{channel}/EventLog) >= 1.0.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The EventLogDatabaseTiein component provides an API to log events and audit
trails using a database connection.

ezcLogDatabaseWriter is the log writer that writes log messages to the database.

To write log messages to the database, the Database component is used. The table
to which the log is written should already exist.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
%{__rm} -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
%{__rm} -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
%{__mkdir} -p %{buildroot}%{pear_xmldir}
%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
%{__rm} -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/log_database_autoload.php


%changelog
* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:29:13 -0000	1.1
+++ .cvsignore	19 Dec 2009 12:26:18 -0000	1.2
@@ -0,0 +1 @@
+EventLogDatabaseTiein-1.0.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:29:13 -0000	1.1
+++ sources	19 Dec 2009 12:26:18 -0000	1.2
@@ -0,0 +1 @@
+d261edd630fe9741cfc6be0cf3c41f93  EventLogDatabaseTiein-1.0.2.tgz



From llaumgui at fedoraproject.org  Sat Dec 19 12:29:44 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sat, 19 Dec 2009 12:29:44 +0000 (UTC)
Subject: rpms/php-ezc-EventLogDatabaseTiein/F-11 import.log, NONE,
	1.1 php-ezc-EventLogDatabaseTiein.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091219122944.3828611C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2075/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-EventLogDatabaseTiein.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
php-ezc-EventLogDatabaseTiein-1_0_2-1_fc12:F-11:php-ezc-EventLogDatabaseTiein-1.0.2-1.fc12.src.rpm:1261225674


--- NEW FILE php-ezc-EventLogDatabaseTiein.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name EventLogDatabaseTiein
%define channel components.ez.no

Name:           php-ezc-EventLogDatabaseTiein
Version:        1.0.2
Release:        1%{?dist}
Summary:        Contains the database writer backend for the EventLog component

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-pear(%{channel}/Database) >= 1.2
Requires:       php-pear(%{channel}/EventLog) >= 1.0.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The EventLogDatabaseTiein component provides an API to log events and audit
trails using a database connection.

ezcLogDatabaseWriter is the log writer that writes log messages to the database.

To write log messages to the database, the Database component is used. The table
to which the log is written should already exist.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
%{__rm} -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
%{__rm} -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
%{__mkdir} -p %{buildroot}%{pear_xmldir}
%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
%{__rm} -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/log_database_autoload.php


%changelog
* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Dec 2009 06:29:13 -0000	1.1
+++ .cvsignore	19 Dec 2009 12:29:44 -0000	1.2
@@ -0,0 +1 @@
+EventLogDatabaseTiein-1.0.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-EventLogDatabaseTiein/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Dec 2009 06:29:13 -0000	1.1
+++ sources	19 Dec 2009 12:29:44 -0000	1.2
@@ -0,0 +1 @@
+d261edd630fe9741cfc6be0cf3c41f93  EventLogDatabaseTiein-1.0.2.tgz



From kkofler at fedoraproject.org  Sat Dec 19 12:34:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 12:34:17 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.85-fix-build.patch, 1.2,
	1.3 kdebindings.spec, 1.281, 1.282
Message-ID: <20091219123417.B3C0111C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3346/devel

Modified Files:
	kdebindings-4.3.85-fix-build.patch kdebindings.spec 
Log Message:
- fix phpqt_internals.cpp for the current smoke.h

kdebindings-4.3.85-fix-build.patch:
 php/phpqt/src/phpqt_internals.cpp |    2 +-
 smoke/CMakeLists.txt              |    2 +-
 smoke/nepomuk/nepomuk_includes.h  |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

Index: kdebindings-4.3.85-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.85-fix-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdebindings-4.3.85-fix-build.patch	19 Dec 2009 11:42:33 -0000	1.2
+++ kdebindings-4.3.85-fix-build.patch	19 Dec 2009 12:34:17 -0000	1.3
@@ -1,3 +1,15 @@
+diff -ur kdebindings-4.3.85/php/phpqt/src/phpqt_internals.cpp kdebindings-4.3.85-fix-build/php/phpqt/src/phpqt_internals.cpp
+--- kdebindings-4.3.85/php/phpqt/src/phpqt_internals.cpp	2009-02-12 11:22:44.000000000 +0100
++++ kdebindings-4.3.85-fix-build/php/phpqt/src/phpqt_internals.cpp	2009-12-19 13:26:19.000000000 +0100
+@@ -242,7 +242,7 @@
+ void PHPQt::createMetaObject(smokephp_object* o, zval* this_ptr)
+ {
+     const Smoke::ModuleIndex nameId = o->smoke()->idMethodName("metaObject");
+-    const Smoke::ModuleIndex classIdx = { o->smoke(), o->classId() };
++    const Smoke::ModuleIndex classIdx(o->smoke(), o->classId());
+     const Smoke::ModuleIndex meth = o->smoke()->findMethod( classIdx, nameId );
+     const Smoke::Method &methodId = o->smoke()->methods[ o->smoke()->methodMaps[ meth.index ].method ];
+     const Smoke::ClassFn fn = o->smoke()->classes[methodId.classId].classFn;
 diff -ur kdebindings-4.3.85/smoke/CMakeLists.txt kdebindings-4.3.85-fix-build/smoke/CMakeLists.txt
 --- kdebindings-4.3.85/smoke/CMakeLists.txt	2009-12-11 00:13:50.000000000 +0100
 +++ kdebindings-4.3.85-fix-build/smoke/CMakeLists.txt	2009-12-19 12:03:42.000000000 +0100


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- kdebindings.spec	19 Dec 2009 11:42:33 -0000	1.281
+++ kdebindings.spec	19 Dec 2009 12:34:17 -0000	1.282
@@ -72,6 +72,8 @@ Patch0:  kdebindings-4.3.85-qyoto_no_exa
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 # fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
 # also fix its build (missing #include <nepomuk/resourcetypeterm.h>)
+# (subset of http://websvn.kde.org/?view=revision&revision=1063412)
+# also fix phpqt_internals.cpp for the current smoke.h
 Patch2:  kdebindings-4.3.85-fix-build.patch
 ## upstream patches
 
@@ -551,6 +553,7 @@ fi
 * Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
 - fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
 - fix its build (missing #include <nepomuk/resourcetypeterm.h>)
+- fix phpqt_internals.cpp for the current smoke.h
 
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)



From madko at fedoraproject.org  Sat Dec 19 12:55:46 2009
From: madko at fedoraproject.org (madko)
Date: Sat, 19 Dec 2009 12:55:46 +0000 (UTC)
Subject: rpms/purple-msn-pecan/F-11
	purple-msn-pecan-handle_malformed_data.patch, NONE,
	1.1 purple-msn-pecan.spec, 1.5, 1.6
Message-ID: <20091219125546.A578D11C00E6@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7296

Modified Files:
	purple-msn-pecan.spec 
Added Files:
	purple-msn-pecan-handle_malformed_data.patch 
Log Message:
Patch to handle malformed data (bz #547078)


purple-msn-pecan-handle_malformed_data.patch:
 pn_oim.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE purple-msn-pecan-handle_malformed_data.patch ---
diff -Naur msn-pecan-0.1.0-rc1.orig/pn_oim.c msn-pecan-0.1.0-rc1/pn_oim.c
--- msn-pecan-0.1.0-rc1.orig/pn_oim.c	2009-07-19 13:10:53.000000000 +0200
+++ msn-pecan-0.1.0-rc1/pn_oim.c	2009-12-18 10:11:11.000000000 +0100
@@ -465,7 +465,8 @@
         gchar *end;
         cur += 2;
         end = strstr (cur, "\r\n\r\n");
-        *end = '\0';
+	if (end)
+		*end = '\0';
         message = (gchar *) purple_base64_decode (cur, NULL);
     }
 


Index: purple-msn-pecan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-11/purple-msn-pecan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- purple-msn-pecan.spec	11 Aug 2009 13:33:06 -0000	1.5
+++ purple-msn-pecan.spec	19 Dec 2009 12:55:44 -0000	1.6
@@ -1,13 +1,17 @@
 %define		realname msn-pecan
 Name:		purple-%{realname}
 Version:	0.1.0
-Release:	0.1.rc1%{?dist}
+Release:	0.3.rc1%{?dist}
 Summary:	Alternative MSN protocol plugin for libpurple 
 
 Group:		Applications/Internet 
 License:	GPLv2+
 URL:		http://code.google.com/p/msn-pecan/ 
 Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}-rc1.tar.bz2
+
+# Upstream has applied this patch see http://groups.google.com/group/msn-pecan/browse_thread/thread/3df8df31f2faa25b?pli=1
+Patch0:		purple-msn-pecan-handle_malformed_data.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel 
@@ -40,7 +44,7 @@ Other features:
 
 %prep
 %setup -q -n %{realname}-%{version}-rc1
-
+%patch0 -p1 -b malformed_data.rej
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes
@@ -70,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.3.rc1
+- patch to handle malformed data was not complete (bz #547836)
+
+* Mon Dec 14 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.2.rc1
+- Add Simone Contini's patch to handle malformed data in process_body_receive (bz #547078)
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.1.0-0.1.rc1
 - Update to 0.1.0-rc1.
 



From twaugh at fedoraproject.org  Sat Dec 19 13:03:21 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 19 Dec 2009 13:03:21 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3425.patch,1.1,1.2 cups.spec,1.557,1.558
Message-ID: <20091219130321.29E3C11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9009

Modified Files:
	cups-str3425.patch cups.spec 
Log Message:
* Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
- Fixed patch for STR #3425 by adding in back-ported change from svn
  revision 8936 (bug #548904).


cups-str3425.patch:
 job.c  |    8 +++-----
 main.c |   21 +++++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-str3425.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3425.patch	8 Dec 2009 12:25:07 -0000	1.1
+++ cups-str3425.patch	19 Dec 2009 13:03:19 -0000	1.2
@@ -1,7 +1,16 @@
 diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
---- cups-1.4.2/scheduler/job.c.str3425	2009-12-08 12:23:15.694500898 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-08 12:23:35.005500733 +0000
-@@ -444,11 +444,11 @@ cupsdCleanJobs(void)
+--- cups-1.4.2/scheduler/job.c.str3425	2009-12-19 12:12:18.346037032 +0000
++++ cups-1.4.2/scheduler/job.c	2009-12-19 12:12:35.806163016 +0000
+@@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
+       if (purge)
+ 	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
+ 	                 "Job purged by user.");
+-      else
++      else if (job->state_value < IPP_JOB_CANCELED)
+ 	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_DEFAULT,
+ 			 "Job canceled by user.");
+     }
+@@ -433,11 +433,11 @@ cupsdCleanJobs(void)
    cupsd_job_t	*job;			/* Current job */
  
  
@@ -15,7 +24,7 @@ diff -up cups-1.4.2/scheduler/job.c.str3
         job = (cupsd_job_t *)cupsArrayNext(Jobs))
      if (job->state_value >= IPP_JOB_CANCELED && !job->printer)
        cupsdDeleteJob(job, CUPSD_JOB_PURGE);
-@@ -2670,8 +2670,6 @@ cupsdSetJobState(
+@@ -2498,8 +2498,6 @@ cupsdSetJobState(
  	  job->dirty = 1;
  	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
  	}
@@ -25,9 +34,9 @@ diff -up cups-1.4.2/scheduler/job.c.str3
    }
  
 diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
---- cups-1.4.2/scheduler/main.c.str3425	2009-12-08 12:23:15.695501397 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-08 12:23:35.007501250 +0000
-@@ -397,7 +397,7 @@ main(int  argc,				/* I - Number of comm
+--- cups-1.4.2/scheduler/main.c.str3425	2009-12-19 12:12:18.221037105 +0000
++++ cups-1.4.2/scheduler/main.c	2009-12-19 12:12:18.434038283 +0000
+@@ -389,7 +389,7 @@ main(int  argc,				/* I - Number of comm
      * parent's file descriptors to be blocking.  This is a workaround for a
      * limitation of userland libpthread on OpenBSD.
      */
@@ -36,7 +45,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
      _thread_sys_closefrom(0);
  #endif /* __OpenBSD__ */
  
-@@ -844,8 +844,8 @@ main(int  argc,				/* I - Number of comm
+@@ -817,8 +817,8 @@ main(int  argc,				/* I - Number of comm
  
      if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
          !cupsArrayCount(ActiveJobs) &&
@@ -47,7 +56,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
  	  (!NumBrowsers || !BrowseLocalProtocols ||
  	   cupsArrayCount(Printers) == 0))))
      {
-@@ -1073,6 +1073,7 @@ main(int  argc,				/* I - Number of comm
+@@ -1046,6 +1046,7 @@ main(int  argc,				/* I - Number of comm
      if ((current_time - senddoc_time) >= 10)
      {
        cupsdCheckJobs();
@@ -55,7 +64,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
        senddoc_time = current_time;
      }
  
-@@ -1231,8 +1232,8 @@ main(int  argc,				/* I - Number of comm
+@@ -1204,8 +1205,8 @@ main(int  argc,				/* I - Number of comm
  #endif /* HAVE_GSSAPI */
  
  #if defined(__APPLE__) && defined(HAVE_DLFCN_H)
@@ -66,7 +75,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
    */
  
    PSQUpdateQuotaProc = NULL;
-@@ -1594,13 +1595,13 @@ launchd_checkin(void)
+@@ -1562,13 +1563,13 @@ launchd_checkin(void)
  
  	if (lis)
  	{
@@ -82,7 +91,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
  		  "launchd_checkin: Adding new listener %s with fd %d...",
  		  httpAddrString(&addr, s, sizeof(s)), fd);
  
-@@ -1654,12 +1655,12 @@ launchd_checkout(void)
+@@ -1622,12 +1623,12 @@ launchd_checkout(void)
  
   /*
    * Create or remove the launchd KeepAlive file based on whether


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -p -r1.557 -r1.558
--- cups.spec	11 Dec 2009 08:32:19 -0000	1.557
+++ cups.spec	19 Dec 2009 13:03:20 -0000	1.558
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -545,6 +545,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
+- Fixed patch for STR #3425 by adding in back-ported change from svn
+  revision 8936 (bug #548904).
+
 * Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
 - Fixed invalid read in cupsAddDest (bug #537460).
 



From twaugh at fedoraproject.org  Sat Dec 19 13:03:30 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 19 Dec 2009 13:03:30 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3425.patch,1.1,1.2 cups.spec,1.564,1.565
Message-ID: <20091219130330.523A611C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9066

Modified Files:
	cups-str3425.patch cups.spec 
Log Message:
* Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
- Fixed patch for STR #3425 by adding in back-ported change from svn
  revision 8936 (bug #548904).


cups-str3425.patch:
 job.c  |    8 +++-----
 main.c |   21 +++++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3425.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3425.patch	8 Dec 2009 12:26:21 -0000	1.1
+++ cups-str3425.patch	19 Dec 2009 13:03:29 -0000	1.2
@@ -1,7 +1,16 @@
 diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
---- cups-1.4.2/scheduler/job.c.str3425	2009-12-08 12:23:15.694500898 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-08 12:23:35.005500733 +0000
-@@ -444,11 +444,11 @@ cupsdCleanJobs(void)
+--- cups-1.4.2/scheduler/job.c.str3425	2009-12-19 12:12:18.346037032 +0000
++++ cups-1.4.2/scheduler/job.c	2009-12-19 12:12:35.806163016 +0000
+@@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
+       if (purge)
+ 	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
+ 	                 "Job purged by user.");
+-      else
++      else if (job->state_value < IPP_JOB_CANCELED)
+ 	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_DEFAULT,
+ 			 "Job canceled by user.");
+     }
+@@ -433,11 +433,11 @@ cupsdCleanJobs(void)
    cupsd_job_t	*job;			/* Current job */
  
  
@@ -15,7 +24,7 @@ diff -up cups-1.4.2/scheduler/job.c.str3
         job = (cupsd_job_t *)cupsArrayNext(Jobs))
      if (job->state_value >= IPP_JOB_CANCELED && !job->printer)
        cupsdDeleteJob(job, CUPSD_JOB_PURGE);
-@@ -2670,8 +2670,6 @@ cupsdSetJobState(
+@@ -2498,8 +2498,6 @@ cupsdSetJobState(
  	  job->dirty = 1;
  	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
  	}
@@ -25,9 +34,9 @@ diff -up cups-1.4.2/scheduler/job.c.str3
    }
  
 diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
---- cups-1.4.2/scheduler/main.c.str3425	2009-12-08 12:23:15.695501397 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-08 12:23:35.007501250 +0000
-@@ -397,7 +397,7 @@ main(int  argc,				/* I - Number of comm
+--- cups-1.4.2/scheduler/main.c.str3425	2009-12-19 12:12:18.221037105 +0000
++++ cups-1.4.2/scheduler/main.c	2009-12-19 12:12:18.434038283 +0000
+@@ -389,7 +389,7 @@ main(int  argc,				/* I - Number of comm
      * parent's file descriptors to be blocking.  This is a workaround for a
      * limitation of userland libpthread on OpenBSD.
      */
@@ -36,7 +45,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
      _thread_sys_closefrom(0);
  #endif /* __OpenBSD__ */
  
-@@ -844,8 +844,8 @@ main(int  argc,				/* I - Number of comm
+@@ -817,8 +817,8 @@ main(int  argc,				/* I - Number of comm
  
      if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
          !cupsArrayCount(ActiveJobs) &&
@@ -47,7 +56,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
  	  (!NumBrowsers || !BrowseLocalProtocols ||
  	   cupsArrayCount(Printers) == 0))))
      {
-@@ -1073,6 +1073,7 @@ main(int  argc,				/* I - Number of comm
+@@ -1046,6 +1046,7 @@ main(int  argc,				/* I - Number of comm
      if ((current_time - senddoc_time) >= 10)
      {
        cupsdCheckJobs();
@@ -55,7 +64,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
        senddoc_time = current_time;
      }
  
-@@ -1231,8 +1232,8 @@ main(int  argc,				/* I - Number of comm
+@@ -1204,8 +1205,8 @@ main(int  argc,				/* I - Number of comm
  #endif /* HAVE_GSSAPI */
  
  #if defined(__APPLE__) && defined(HAVE_DLFCN_H)
@@ -66,7 +75,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
    */
  
    PSQUpdateQuotaProc = NULL;
-@@ -1594,13 +1595,13 @@ launchd_checkin(void)
+@@ -1562,13 +1563,13 @@ launchd_checkin(void)
  
  	if (lis)
  	{
@@ -82,7 +91,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
  		  "launchd_checkin: Adding new listener %s with fd %d...",
  		  httpAddrString(&addr, s, sizeof(s)), fd);
  
-@@ -1654,12 +1655,12 @@ launchd_checkout(void)
+@@ -1622,12 +1623,12 @@ launchd_checkout(void)
  
   /*
    * Create or remove the launchd KeepAlive file based on whether


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -p -r1.564 -r1.565
--- cups.spec	11 Dec 2009 08:31:42 -0000	1.564
+++ cups.spec	19 Dec 2009 13:03:30 -0000	1.565
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -551,6 +551,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
+- Fixed patch for STR #3425 by adding in back-ported change from svn
+  revision 8936 (bug #548904).
+
 * Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
 - Fixed invalid read in cupsAddDest (bug #537460).
 



From twaugh at fedoraproject.org  Sat Dec 19 13:03:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 19 Dec 2009 13:03:41 +0000 (UTC)
Subject: rpms/cups/devel cups-str3425.patch,1.1,1.2 cups.spec,1.567,1.568
Message-ID: <20091219130341.C677E11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9187

Modified Files:
	cups-str3425.patch cups.spec 
Log Message:
* Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
- Fixed patch for STR #3425 by adding in back-ported change from svn
  revision 8936 (bug #548904).


cups-str3425.patch:
 job.c  |    8 +++-----
 main.c |   21 +++++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3425.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3425.patch	8 Dec 2009 12:26:48 -0000	1.1
+++ cups-str3425.patch	19 Dec 2009 13:03:41 -0000	1.2
@@ -1,7 +1,16 @@
 diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
---- cups-1.4.2/scheduler/job.c.str3425	2009-12-08 12:23:15.694500898 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-08 12:23:35.005500733 +0000
-@@ -444,11 +444,11 @@ cupsdCleanJobs(void)
+--- cups-1.4.2/scheduler/job.c.str3425	2009-12-19 12:12:18.346037032 +0000
++++ cups-1.4.2/scheduler/job.c	2009-12-19 12:12:35.806163016 +0000
+@@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
+       if (purge)
+ 	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
+ 	                 "Job purged by user.");
+-      else
++      else if (job->state_value < IPP_JOB_CANCELED)
+ 	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_DEFAULT,
+ 			 "Job canceled by user.");
+     }
+@@ -433,11 +433,11 @@ cupsdCleanJobs(void)
    cupsd_job_t	*job;			/* Current job */
  
  
@@ -15,7 +24,7 @@ diff -up cups-1.4.2/scheduler/job.c.str3
         job = (cupsd_job_t *)cupsArrayNext(Jobs))
      if (job->state_value >= IPP_JOB_CANCELED && !job->printer)
        cupsdDeleteJob(job, CUPSD_JOB_PURGE);
-@@ -2670,8 +2670,6 @@ cupsdSetJobState(
+@@ -2498,8 +2498,6 @@ cupsdSetJobState(
  	  job->dirty = 1;
  	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
  	}
@@ -25,9 +34,9 @@ diff -up cups-1.4.2/scheduler/job.c.str3
    }
  
 diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
---- cups-1.4.2/scheduler/main.c.str3425	2009-12-08 12:23:15.695501397 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-08 12:23:35.007501250 +0000
-@@ -397,7 +397,7 @@ main(int  argc,				/* I - Number of comm
+--- cups-1.4.2/scheduler/main.c.str3425	2009-12-19 12:12:18.221037105 +0000
++++ cups-1.4.2/scheduler/main.c	2009-12-19 12:12:18.434038283 +0000
+@@ -389,7 +389,7 @@ main(int  argc,				/* I - Number of comm
      * parent's file descriptors to be blocking.  This is a workaround for a
      * limitation of userland libpthread on OpenBSD.
      */
@@ -36,7 +45,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
      _thread_sys_closefrom(0);
  #endif /* __OpenBSD__ */
  
-@@ -844,8 +844,8 @@ main(int  argc,				/* I - Number of comm
+@@ -817,8 +817,8 @@ main(int  argc,				/* I - Number of comm
  
      if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
          !cupsArrayCount(ActiveJobs) &&
@@ -47,7 +56,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
  	  (!NumBrowsers || !BrowseLocalProtocols ||
  	   cupsArrayCount(Printers) == 0))))
      {
-@@ -1073,6 +1073,7 @@ main(int  argc,				/* I - Number of comm
+@@ -1046,6 +1046,7 @@ main(int  argc,				/* I - Number of comm
      if ((current_time - senddoc_time) >= 10)
      {
        cupsdCheckJobs();
@@ -55,7 +64,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
        senddoc_time = current_time;
      }
  
-@@ -1231,8 +1232,8 @@ main(int  argc,				/* I - Number of comm
+@@ -1204,8 +1205,8 @@ main(int  argc,				/* I - Number of comm
  #endif /* HAVE_GSSAPI */
  
  #if defined(__APPLE__) && defined(HAVE_DLFCN_H)
@@ -66,7 +75,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
    */
  
    PSQUpdateQuotaProc = NULL;
-@@ -1594,13 +1595,13 @@ launchd_checkin(void)
+@@ -1562,13 +1563,13 @@ launchd_checkin(void)
  
  	if (lis)
  	{
@@ -82,7 +91,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
  		  "launchd_checkin: Adding new listener %s with fd %d...",
  		  httpAddrString(&addr, s, sizeof(s)), fd);
  
-@@ -1654,12 +1655,12 @@ launchd_checkout(void)
+@@ -1622,12 +1623,12 @@ launchd_checkout(void)
  
   /*
    * Create or remove the launchd KeepAlive file based on whether


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -p -r1.567 -r1.568
--- cups.spec	11 Dec 2009 08:31:07 -0000	1.567
+++ cups.spec	19 Dec 2009 13:03:41 -0000	1.568
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -541,6 +541,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
+- Fixed patch for STR #3425 by adding in back-ported change from svn
+  revision 8936 (bug #548904).
+
 * Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
 - Fixed invalid read in cupsAddDest (bug #537460).
 



From awjb at fedoraproject.org  Sat Dec 19 13:14:24 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 19 Dec 2009 13:14:24 +0000 (UTC)
Subject: rpms/wine/F-12 wine.spec,1.117,1.118
Message-ID: <20091219131424.5478111C00E6@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11279

Modified Files:
	wine.spec 
Log Message:
- gdi.exe16 -> gdi.exe16.so



Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/wine.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- wine.spec	19 Dec 2009 12:14:11 -0000	1.117
+++ wine.spec	19 Dec 2009 13:14:23 -0000	1.118
@@ -877,7 +877,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/vtdapi.vxd.so
 %{_libdir}/wine/vwin32.vxd.so
 %{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/gdi.exe16
 %{_libdir}/wine/wprocs.dll16
 
 %{_libdir}/wine/avifile.dll16.so
@@ -889,6 +888,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/ddeml.dll16.so
 %{_libdir}/wine/dispdib.dll16.so
 %{_libdir}/wine/display.drv16.so
+%{_libdir}/wine/gdi.exe16.so
 %{_libdir}/wine/imm.dll16.so
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/keyboard.drv16.so



From mapleoin at fedoraproject.org  Sat Dec 19 13:15:00 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Sat, 19 Dec 2009 13:15:00 +0000 (UTC)
Subject: File calibre-0.6.29-nofonts.tar.gz uploaded to lookaside cache by
	mapleoin
Message-ID: <20091219131500.9372210F925@bastion.fedoraproject.org>

A file has been added to the lookaside cache for calibre:

523d266c8f7e9adf10c9cb670e76ca6b  calibre-0.6.29-nofonts.tar.gz



From kkofler at fedoraproject.org  Sat Dec 19 13:17:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 13:17:43 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.85-fix-build.patch,1.3,1.4
Message-ID: <20091219131743.AEE4211C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12138/devel

Modified Files:
	kdebindings-4.3.85-fix-build.patch 
Log Message:
The same 1-line fix at a 2nd spot in php-qt.

kdebindings-4.3.85-fix-build.patch:
 php/phpqt/src/handlers.cpp        |    2 +-
 php/phpqt/src/phpqt_internals.cpp |    2 +-
 smoke/CMakeLists.txt              |    2 +-
 smoke/nepomuk/nepomuk_includes.h  |    1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

Index: kdebindings-4.3.85-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.85-fix-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdebindings-4.3.85-fix-build.patch	19 Dec 2009 12:34:17 -0000	1.3
+++ kdebindings-4.3.85-fix-build.patch	19 Dec 2009 13:17:43 -0000	1.4
@@ -1,3 +1,15 @@
+diff -ur kdebindings-4.3.85/php/phpqt/src/handlers.cpp kdebindings-4.3.85-fix-build/php/phpqt/src/handlers.cpp
+--- kdebindings-4.3.85/php/phpqt/src/handlers.cpp	2009-07-28 21:43:33.000000000 +0200
++++ kdebindings-4.3.85-fix-build/php/phpqt/src/handlers.cpp	2009-12-19 14:16:27.000000000 +0100
+@@ -68,7 +68,7 @@
+     char *ccArg = new char[classNameLen + 8];
+     sprintf(ccArg, "const %s&", className);
+ 
+-    const Smoke::ModuleIndex classIdx = { o->smoke(), o->classId() };
++    const Smoke::ModuleIndex classIdx(o->smoke(), o->classId());
+ 
+     Smoke::ModuleIndex ccMeth = o->smoke()->findMethod( classIdx, ccId );
+ 
 diff -ur kdebindings-4.3.85/php/phpqt/src/phpqt_internals.cpp kdebindings-4.3.85-fix-build/php/phpqt/src/phpqt_internals.cpp
 --- kdebindings-4.3.85/php/phpqt/src/phpqt_internals.cpp	2009-02-12 11:22:44.000000000 +0100
 +++ kdebindings-4.3.85-fix-build/php/phpqt/src/phpqt_internals.cpp	2009-12-19 13:26:19.000000000 +0100



From mapleoin at fedoraproject.org  Sat Dec 19 13:27:11 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Sat, 19 Dec 2009 13:27:11 +0000 (UTC)
Subject: rpms/calibre/devel .cvsignore, 1.7, 1.8 calibre.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20091219132711.768B111C00E6@cvs1.fedora.phx.redhat.com>

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13938

Modified Files:
	.cvsignore calibre.spec sources 
Log Message:
New upstream release 0.6.29



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Dec 2009 21:29:40 -0000	1.7
+++ .cvsignore	19 Dec 2009 13:27:10 -0000	1.8
@@ -1 +1 @@
-calibre-0.6.26-nofonts.tar.gz
+calibre-0.6.29-nofonts.tar.gz


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- calibre.spec	6 Dec 2009 21:29:40 -0000	1.7
+++ calibre.spec	19 Dec 2009 13:27:10 -0000	1.8
@@ -1,10 +1,10 @@
 Name:           calibre
-Version:        0.6.26
+Version:        0.6.29
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
-URL:            http://calibre.kovidgoyal.net/
+URL:            http://calibre-ebook.com/
 
 # SourceURL: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
@@ -246,6 +246,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sat Dec 19 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.29-1
+- New upstream release
+- project website has changed
+
 * Sun Dec  6 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.26-1
 - New upstream version
 - Regenerated no-update patch because of code relocation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Dec 2009 21:29:40 -0000	1.7
+++ sources	19 Dec 2009 13:27:10 -0000	1.8
@@ -1 +1 @@
-08d305ccbeb887eefa7238523ebb85cf  calibre-0.6.26-nofonts.tar.gz
+523d266c8f7e9adf10c9cb670e76ca6b  calibre-0.6.29-nofonts.tar.gz



From mapleoin at fedoraproject.org  Sat Dec 19 13:52:56 2009
From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=)
Date: Sat, 19 Dec 2009 13:52:56 +0000 (UTC)
Subject: rpms/calibre/F-12 .cvsignore, 1.8, 1.9 calibre.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <20091219135256.7853211C00E6@cvs1.fedora.phx.redhat.com>

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19374

Modified Files:
	.cvsignore calibre.spec sources 
Log Message:
New upstream release 0.6.29



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Dec 2009 21:37:27 -0000	1.8
+++ .cvsignore	19 Dec 2009 13:52:55 -0000	1.9
@@ -1 +1 @@
-calibre-0.6.26-nofonts.tar.gz
+calibre-0.6.29-nofonts.tar.gz


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/calibre.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- calibre.spec	6 Dec 2009 21:37:27 -0000	1.7
+++ calibre.spec	19 Dec 2009 13:52:55 -0000	1.8
@@ -1,10 +1,10 @@
 Name:           calibre
-Version:        0.6.26
+Version:        0.6.29
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
-URL:            http://calibre.kovidgoyal.net/
+URL:            http://calibre-ebook.com/
 
 # SourceURL: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
@@ -246,6 +246,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sat Dec 19 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.29-1
+- New upstream release
+- project website has changed
+
 * Sun Dec  6 2009 Ionu? C. Ar??ri?i <mapleoin at fedoraproject.org> - 0.6.26-1
 - New upstream version
 - Regenerated no-update patch because of code relocation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Dec 2009 21:37:27 -0000	1.8
+++ sources	19 Dec 2009 13:52:55 -0000	1.9
@@ -1 +1 @@
-08d305ccbeb887eefa7238523ebb85cf  calibre-0.6.26-nofonts.tar.gz
+523d266c8f7e9adf10c9cb670e76ca6b  calibre-0.6.29-nofonts.tar.gz



From kkofler at fedoraproject.org  Sat Dec 19 14:08:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 14:08:58 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.282,1.283
Message-ID: <20091219140858.9D62811C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22604/devel

Modified Files:
	kdebindings.spec 
Log Message:
fix file lists:
- qyoto/kimono DLLs are now in mono/qyoto rather than mono/2.0


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- kdebindings.spec	19 Dec 2009 12:34:17 -0000	1.282
+++ kdebindings.spec	19 Dec 2009 14:08:57 -0000	1.283
@@ -421,14 +421,14 @@ fi
 %{_kde4_libdir}/libplasma-sharp.so
 %{_kde4_libdir}/libsoprano-sharp.so
 %{_kde4_libdir}/libqimageblitz-sharp.so
-%{_kde4_libdir}/mono/2.0/qimageblitz.dll
-%{_kde4_libdir}/mono/2.0/akonadi.dll
-%{_kde4_libdir}/mono/2.0/kde-dotnet.dll
-%{_kde4_libdir}/mono/2.0/khtml-dll.dll
-%{_kde4_libdir}/mono/2.0/ktexteditor-dotnet.dll
-%{_kde4_libdir}/mono/2.0/nepomuk-dll.dll
-%{_kde4_libdir}/mono/2.0/plasma-dll.dll
-%{_kde4_libdir}/mono/2.0/soprano.dll
+%{_kde4_libdir}/mono/qyoto/qimageblitz.dll
+%{_kde4_libdir}/mono/qyoto/akonadi.dll
+%{_kde4_libdir}/mono/qyoto/kde-dotnet.dll
+%{_kde4_libdir}/mono/qyoto/khtml-dll.dll
+%{_kde4_libdir}/mono/qyoto/ktexteditor-dotnet.dll
+%{_kde4_libdir}/mono/qyoto/nepomuk-dll.dll
+%{_kde4_libdir}/mono/qyoto/plasma-dll.dll
+%{_kde4_libdir}/mono/qyoto/soprano.dll
 %{_kde4_libdir}/mono/gac/akonadi/
 %{_kde4_libdir}/mono/gac/kde-dotnet/
 %{_kde4_libdir}/mono/gac/khtml-dll/
@@ -450,11 +450,12 @@ fi
 %{_kde4_libdir}/libqyoto.so
 %{_kde4_libdir}/libqyotoshared.so.1
 %{_kde4_libdir}/libqyotoshared.so.1.0.0
-%{_kde4_libdir}/mono/2.0/qt-dotnet.dll
-%{_kde4_libdir}/mono/2.0/qtscript.dll
-%{_kde4_libdir}/mono/2.0/qttest.dll
-%{_kde4_libdir}/mono/2.0/qtuitools.dll
-%{_kde4_libdir}/mono/2.0/qtwebkit.dll
+%dir %{_kde4_libdir}/mono/qyoto/
+%{_kde4_libdir}/mono/qyoto/qt-dotnet.dll
+%{_kde4_libdir}/mono/qyoto/qtscript.dll
+%{_kde4_libdir}/mono/qyoto/qttest.dll
+%{_kde4_libdir}/mono/qyoto/qtuitools.dll
+%{_kde4_libdir}/mono/qyoto/qtwebkit.dll
 %{_kde4_libdir}/mono/gac/qt-dotnet/
 %{_kde4_libdir}/mono/gac/qtscript/
 %{_kde4_libdir}/mono/gac/qttest/
@@ -554,6 +555,7 @@ fi
 - fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
 - fix its build (missing #include <nepomuk/resourcetypeterm.h>)
 - fix phpqt_internals.cpp for the current smoke.h
+- qyoto/kimono DLLs are now in mono/qyoto rather than mono/2.0
 
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)



From sdz at fedoraproject.org  Sat Dec 19 14:31:07 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 19 Dec 2009 14:31:07 +0000 (UTC)
Subject: File OLPCGames-1.6.tar.gz uploaded to lookaside cache by sdz
Message-ID: <20091219143107.097D510F8E0@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-olpcgames:

53146b6acf61947499061f318889b5ba  OLPCGames-1.6.tar.gz



From awjb at fedoraproject.org  Sat Dec 19 14:39:53 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 19 Dec 2009 14:39:53 +0000 (UTC)
Subject: rpms/wine/devel wine-x86_64-prefix.patch, NONE,
	1.1 winepulse-0.33.patch, NONE, 1.1 .cvsignore, 1.81,
	1.82 sources, 1.82, 1.83 wine.spec, 1.115,
	1.116 winepulse-0.32.patch, 1.1, NONE
Message-ID: <20091219143953.E28E311C00E6@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29543

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-x86_64-prefix.patch winepulse-0.33.patch 
Removed Files:
	winepulse-0.32.patch 
Log Message:
- various bugfixes
- version upgrade


wine-x86_64-prefix.patch:
 config.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE wine-x86_64-prefix.patch ---
--- libs/wine/config.c.orig	2009-11-26 23:36:37.000000000 +0100
+++ libs/wine/config.c	2009-11-26 23:37:36.000000000 +0100
@@ -35,9 +35,9 @@
 #endif
 #include "wine/library.h"
 
-static const char server_config_dir[] = "/.wine";        /* config dir relative to $HOME */
-static const char server_root_prefix[] = "/tmp/.wine-";  /* prefix for server root dir */
-static const char server_dir_prefix[] = "/server-";      /* prefix for server dir */
+static const char server_config_dir[] = "/.wine-x86_64";        /* config dir relative to $HOME */
+static const char server_root_prefix[] = "/tmp/.wine-x86_64-";  /* prefix for server root dir */
+static const char server_dir_prefix[] = "/server-x86_64-";      /* prefix for server dir */
 
 static char *bindir;
 static char *dlldir;

winepulse-0.33.patch:
 Makefile.in        |   15 
 pulse.c            |  788 ++++++++++++++++++++++++++++++++++++++++
 wavein.c           |  595 ++++++++++++++++++++++++++++++
 waveout.c          | 1040 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  196 +++++++++
 6 files changed, 2637 insertions(+)

--- NEW FILE winepulse-0.33.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..c99c1da
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winepulse.drv
+IMPORTS   = winmm user32 kernel32
+EXTRALIBS = @PULSELIBS@
+
+C_SRCS = waveout.c \
+         wavein.c \
+         pulse.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
new file mode 100644
index 0000000..3dcb086
--- /dev/null
+++ b/dlls/winepulse.drv/pulse.c
@@ -0,0 +1,788 @@
+/*
+ * Wine Driver for PulseAudio
+ * http://pulseaudio.org/
+ *
+ * Copyright    2009 Arthur Taylor <theycallhimart at gmail.com>
+ *
+ * Contains code from other wine sound drivers.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "mmddk.h"
+#include "ks.h"
+#include "ksguid.h"
+#include "ksmedia.h"
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <poll.h>
+
+#ifdef HAVE_PULSEAUDIO
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/library.h"
+
+#include <winepulse.h>
+#include <pulse/pulseaudio.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wave);
+
+/* These strings used only for tracing */
+const char * PULSE_getCmdString(enum win_wm_message msg) {
+    static char unknown[32];
+#define MSG_TO_STR(x) case x: return #x
+    switch(msg) {
+    MSG_TO_STR(WINE_WM_PAUSING);
+    MSG_TO_STR(WINE_WM_RESTARTING);
+    MSG_TO_STR(WINE_WM_RESETTING);
+    MSG_TO_STR(WINE_WM_HEADER);
+    MSG_TO_STR(WINE_WM_BREAKLOOP);
+    MSG_TO_STR(WINE_WM_CLOSING);
+    MSG_TO_STR(WINE_WM_STARTING);
+    MSG_TO_STR(WINE_WM_STOPPING);
+    MSG_TO_STR(WINE_WM_XRUN);
+    MSG_TO_STR(WINE_WM_FEED);
+    }
+#undef MSG_TO_STR
+    sprintf(unknown, "UNKNOWN(0x%08x)", msg);
+    return unknown;
+}
+
+/*======================================================================*
+ *          Ring Buffer Functions - copied from winealsa.drv            *
+ *======================================================================*/
+
+/* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */
+#define USE_PIPE_SYNC
+
+#ifdef USE_PIPE_SYNC
+#define INIT_OMR(omr) do { if (pipe(omr->msg_pipe) < 0) { omr->msg_pipe[0] = omr->msg_pipe[1] = -1; } } while (0)
+#define CLOSE_OMR(omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0)
+#define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0)
+#define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0)
+#define RESET_OMR(omr) do { } while (0)
+#define WAIT_OMR(omr, sleep) \
+  do { struct pollfd pfd; pfd.fd = (omr)->msg_pipe[0]; \
+       pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0)
+#else
+#define INIT_OMR(omr) do { omr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); } while (0)
+#define CLOSE_OMR(omr) do { CloseHandle(omr->msg_event); } while (0)
+#define SIGNAL_OMR(omr) do { SetEvent((omr)->msg_event); } while (0)
+#define CLEAR_OMR(omr) do { } while (0)
+#define RESET_OMR(omr) do { ResetEvent((omr)->msg_event); } while (0)
+#define WAIT_OMR(omr, sleep) \
+  do { WaitForSingleObject((omr)->msg_event, sleep); } while (0)
+#endif
+
+#define PULSE_RING_BUFFER_INCREMENT      64
+
+/******************************************************************
+ *                  PULSE_InitRingMessage
+ *
+ * Initialize the ring of messages for passing between driver's caller
+ * and playback/record thread
+ */
+int PULSE_InitRingMessage(PULSE_MSG_RING* omr)
+{
+    omr->msg_toget = 0;
+    omr->msg_tosave = 0;
+    INIT_OMR(omr);
+    omr->ring_buffer_size = PULSE_RING_BUFFER_INCREMENT;
+    omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(PULSE_MSG));
+
+    InitializeCriticalSection(&omr->msg_crst);
+    omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PULSE_MSG_RING.msg_crst");
+    return 0;
+}
+
+/******************************************************************
+ *                  PULSE_DestroyRingMessage
+ *
+ */
+int PULSE_DestroyRingMessage(PULSE_MSG_RING* omr)
+{
+    CLOSE_OMR(omr);
+    HeapFree(GetProcessHeap(),0,omr->messages);
+    omr->messages = NULL;
+    omr->ring_buffer_size = PULSE_RING_BUFFER_INCREMENT;
+    omr->msg_crst.DebugInfo->Spare[0] = 0;
+    DeleteCriticalSection(&omr->msg_crst);
+    return 0;
+}
+/******************************************************************
+ *                  PULSE_ResetRingMessage
+ *
+ */
+void PULSE_ResetRingMessage(PULSE_MSG_RING* omr)
+{
+    RESET_OMR(omr);
+}
+
+/******************************************************************
+ *                  PULSE_WaitRingMessage
+ *
+ */
+void PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep)
+{
+    WAIT_OMR(omr, sleep);
+}
+
+/******************************************************************
+ *                  PULSE_AddRingMessage
+ *
+ * Inserts a new message into the ring (should be called from DriverProc derived routines)
+ */
+int PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait)
+{
+    HANDLE      hEvent = INVALID_HANDLE_VALUE;
+
+    EnterCriticalSection(&omr->msg_crst);
+    if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)))
+    {
+        int old_ring_buffer_size = omr->ring_buffer_size;
+        omr->ring_buffer_size += PULSE_RING_BUFFER_INCREMENT;
+        omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(PULSE_MSG));
+        /* Now we need to rearrange the ring buffer so that the new
+           buffers just allocated are in between omr->msg_tosave and
+           omr->msg_toget.
+        */
[...2274 lines suppressed...]
index 0000000..0aa7e86
--- /dev/null
+++ b/dlls/winepulse.drv/winepulse.h
@@ -0,0 +1,196 @@
+/* Definitions for PulseAudio Wine Driver
+ *
+ * Copyright    2009 Arthur Taylor <theycallhimart at gmail.com>
+ *
+ * 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
+ */
+
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
+#if defined(HAVE_PULSEAUDIO) && !defined(__WINEPULSE_H)
+#define __WINEPULSE_H
+
+#include "mmreg.h"
+#include "dsound.h"
+#include "dsdriver.h"
+
+#include "ks.h"
+#include "ksmedia.h"
+#include "ksguid.h"
+
+#include <pulse/pulseaudio.h>
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * |  state  |  function   |     event     |            new state            |
+ * +---------+-------------+---------------+---------------------------------+
+ * |         | open()      |               | STOPPED                         |
+ * | PAUSED  | write()     |               | PAUSED                          |
+ * | STOPPED | write()     | <thrd create> | PLAYING                         |
+ * | PLAYING | write()     | HEADER        | PLAYING                         |
+ * | (other) | write()     | <error>       |                                 |
+ * | (any)   | pause()     | PAUSING       | PAUSED                          |
+ * | PAUSED  | restart()   | RESTARTING    | PLAYING (if no thrd => STOPPED) |
+ * | (any)   | reset()     | RESETTING     | STOPPED                         |
+ * | (any)   | close()     | CLOSING       | CLOSED                          |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING         1
+#define WINE_WS_PAUSED          2
+#define WINE_WS_STOPPED         3
+#define WINE_WS_CLOSED          4
+#define WINE_WS_FAILED          5
+
+#define PULSE_ALL_FORMATS \
+        WAVE_FORMAT_1M08 |      /* Mono     11025Hz 8-bit  */\
+        WAVE_FORMAT_1M16 |      /* Mono     11025Hz 16-bit */\
+        WAVE_FORMAT_1S08 |      /* Stereo   11025Hz 8-bit  */\
+        WAVE_FORMAT_1S16 |      /* Stereo   11025Hz 16-bit */\
+        WAVE_FORMAT_2M08 |      /* Mono     22050Hz 8-bit  */\
+        WAVE_FORMAT_2M16 |      /* Mono     22050Hz 16-bit */\
+        WAVE_FORMAT_2S08 |      /* Stereo   22050Hz 8-bit  */\
+        WAVE_FORMAT_2S16 |      /* Stereo   22050Hz 16-bit */\
+        WAVE_FORMAT_4M08 |      /* Mono     44100Hz 8-bit  */\
+        WAVE_FORMAT_4M16 |      /* Mono     44100Hz 16-bit */\
+        WAVE_FORMAT_4S08 |      /* Stereo   44100Hz 8-bit  */\
+        WAVE_FORMAT_4S16 |      /* Stereo   44100Hz 16-bit */\
+        WAVE_FORMAT_48M08 |     /* Mono     48000Hz 8-bit  */\
+        WAVE_FORMAT_48S08 |     /* Stereo   48000Hz 8-bit  */\
+        WAVE_FORMAT_48M16 |     /* Mono     48000Hz 16-bit */\
+        WAVE_FORMAT_48S16 |     /* Stereo   48000Hz 16-bit */\
+        WAVE_FORMAT_96M08 |     /* Mono     96000Hz 8-bit  */\
+        WAVE_FORMAT_96S08 |     /* Stereo   96000Hz 8-bit  */\
+        WAVE_FORMAT_96M16 |     /* Mono     96000Hz 16-bit */\
+        WAVE_FORMAT_96S16       /* Stereo   96000Hz 16-bit */
+
+/* events to be sent to device */
+enum win_wm_message {
+    WINE_WM_PAUSING = WM_USER + 1, WINE_WM_RESTARTING, WINE_WM_RESETTING, WINE_WM_HEADER,
+    WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING, WINE_WM_XRUN, WINE_WM_FEED
+};
+
+typedef struct {
+    enum win_wm_message msg;    /* message identifier */
+    DWORD               param;  /* parameter for this message */
+    HANDLE              hEvent; /* if message is synchronous, handle of event for synchro */
+} PULSE_MSG;
+
+/* implement an in-process message ring for better performance
+ * (compared to passing thru the server)
+ * this ring will be used by the input (resp output) record (resp playback) routine
+ */
+typedef struct {
+    PULSE_MSG                   * messages;
+    int                         ring_buffer_size;
+    int                         msg_tosave;
+    int                         msg_toget;
+/* Either pipe or event is used, but that is defined in pulse.c,
+ * since this is a global header we define both here */
+    int                         msg_pipe[2];
+    HANDLE                      msg_event;
+    CRITICAL_SECTION            msg_crst;
+} PULSE_MSG_RING;
+
+typedef struct WINE_WAVEDEV WINE_WAVEDEV;
+typedef struct WINE_WAVEINST WINE_WAVEINST;
+
+/* Per-playback/record device */
+struct WINE_WAVEDEV {
+    char                interface_name[MAXPNAMELEN * 2];
+    char                *device_name;
+    pa_cvolume          volume;
+
+    union {
+        WAVEOUTCAPSW    out;
+        WAVEINCAPSW     in;
+    } caps;
+    
+    /* DirectSound stuff */
+    DSDRIVERDESC                ds_desc;
+    DSDRIVERCAPS                ds_caps;
+};
+
+/* Per-playback/record instance */
+struct WINE_WAVEINST {
+    INT                 state;              /* one of the WINE_WS_ manifest constants */
+    WAVEOPENDESC        waveDesc;
+    WORD                wFlags;
+
+    /* PulseAudio specific data */
+    pa_stream           *stream;            /* The PulseAudio stream */
+    const pa_timing_info *timing_info;      /* The timing info structure for the stream */
+    pa_sample_spec      sample_spec;        /* Sample spec of this stream / device */
+    pa_cvolume          volume;             /* Software volume of the stream */
+    pa_buffer_attr      buffer_attr;        /* Buffer attribute, may not be used */
+
+    /* waveIn / waveOut wavaHdr */
+    LPWAVEHDR           lpQueuePtr;         /* Start of queued WAVEHDRs (waiting to be notified) */
+    LPWAVEHDR           lpPlayPtr;          /* Start of not yet fully written buffers */
+    DWORD               dwPartialOffset;    /* Offset of not yet written bytes in lpPlayPtr */
+    LPWAVEHDR           lpLoopPtr;          /* Pointer of first buffer in loop, if any */
+    DWORD               dwLoops;            /* Private copy of loop counter */
+    DWORD               dwLastReset;        /* When the last reset occured, as pa stream time doesn't reset */
+
+    /* waveIn specific */
+    const void          *buffer;            /* Pointer to the latest data fragment for recording streams */
+    DWORD               buffer_length;      /* How large the latest data fragment is */
+    DWORD               buffer_read_offset; /* How far into latest data fragment we last read */
+
+    /* Thread communication and synchronization stuff */
+    HANDLE              hStartUpEvent;
+    HANDLE              hThread;
+    DWORD               dwThreadID;
+    PULSE_MSG_RING      msgRing;
+};
+
+/* We establish one context per instance, so make it global to the lib */
+pa_context              *PULSE_context;   /* Connection Context */
+pa_threaded_mainloop    *PULSE_ml;        /* PA Runtime information */
+
+/* WaveIn / WaveOut devices */
+WINE_WAVEDEV *WOutDev;
+WINE_WAVEDEV *WInDev;
+DWORD PULSE_WodNumDevs;
+DWORD PULSE_WidNumDevs;
+
+/* pulse.c: PulseAudio Async Callbacks */
+void    PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void    PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamSuspendedCallback(pa_stream *s, void *userdata);
+void    PULSE_StreamMovedCallback(pa_stream *s, void *userdata);
+void    PULSE_ContextSuccessCallback(pa_context *c, int success, void *userdata);
+
+/* pulse.c: General Functions */
+void    PULSE_WaitForOperation(pa_operation *o);
+BOOL    PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+HRESULT PULSE_UsecToMMTime(pa_usec_t time, LPMMTIME lpTime, const pa_sample_spec *ss);
+
+/* pulse.c: Message Ring */
+int     PULSE_InitRingMessage(PULSE_MSG_RING* omr);
+int     PULSE_DestroyRingMessage(PULSE_MSG_RING* omr);
+void    PULSE_ResetRingMessage(PULSE_MSG_RING* omr);
+void    PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep);
+int     PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait);
+int     PULSE_RetrieveRingMessage(PULSE_MSG_RING* omr, enum win_wm_message *msg, DWORD *param, HANDLE *hEvent);
+
+/* pulse.c: Tracing */
+const char * PULSE_getCmdString(enum win_wm_message msg);
+#endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	30 Oct 2009 15:20:18 -0000	1.81
+++ .cvsignore	19 Dec 2009 14:39:53 -0000	1.82
@@ -1 +1 @@
-wine-1.1.32-fe.tar.bz2
+wine-1.1.35-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	30 Oct 2009 15:20:18 -0000	1.82
+++ sources	19 Dec 2009 14:39:53 -0000	1.83
@@ -1 +1 @@
-b598afe820bde7c33f5bd0ab62fb7dce  wine-1.1.32-fe.tar.bz2
+1ade8d4ccd3130692c2c68871683fa9b  wine-1.1.35-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- wine.spec	30 Oct 2009 14:57:28 -0000	1.115
+++ wine.spec	19 Dec 2009 14:39:53 -0000	1.116
@@ -1,6 +1,6 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.32
+Version:	1.1.35
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -48,14 +48,18 @@ Source300:      wine-mime-msi.desktop
 # see http://bugs.winehq.org/show_bug.cgi?id=10495
 # and http://art.ified.ca/?page_id=40
 Patch400:       http://art.ified.ca/downloads/winepulse-0.32-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.32.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.33.patch
 Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
 Patch1:         wine-rpath.patch
 
+# upstream bugs
+# currently non
+
 # bugfix patches
-# none
+# #533806
+Patch600:       wine-x86_64-prefix.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -148,7 +152,6 @@ wine-* sub packages.
 Summary:        Wine core package
 Group:		Applications/Emulators
 Requires:       wine-fonts = %{version}-%{release}
-Requires:       %{_bindir}/xmessage
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes:      wine <= 0.9.15-1%{?dist}
@@ -162,10 +165,12 @@ Requires:       freetype(x86-32)
 Requires:       nss-mdns(x86-32)
 # require Xrender isa on x86_64 (#510947)
 Requires:       libXrender(x86-32)
+Requires:       gnutls(x86-32)
 %endif
 %ifarch x86_64
 Requires:       nss-mdns(x86-64)
 Requires:       freetype(x86-64)
+Requires:       gnutls(x86-64)
 %endif
 
 %description core
@@ -315,6 +320,10 @@ This package adds an openal driver for w
 %patch401 -p1
 %patch402 -p1
 
+%ifarch x86_64
+%patch600
+%endif
+
 autoreconf
 
 %build
@@ -354,7 +363,6 @@ mv %{buildroot}%{_bindir}/wine{,32}
 mv %{buildroot}%{_bindir}/wine{,64}
 %endif
 
-
 mkdir -p %{buildroot}%{_sysconfdir}/wine
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
@@ -561,6 +569,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/expand.exe.so
 %{_libdir}/wine/extrac32.exe.so
 %{_libdir}/wine/winhlp32.exe.so
+%{_libdir}/wine/mshta.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
 %{_libdir}/wine/ntoskrnl.exe.so
@@ -594,6 +603,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/authz.dll.so
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
+%{_libdir}/wine/avrt.dll.so
 %{_libdir}/wine/bcrypt.dll.so
 %{_libdir}/wine/browseui.dll.so
 %{_libdir}/wine/cabinet.dll.so
@@ -654,6 +664,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/faultrep.dll.so
 %{_libdir}/wine/fltlib.dll.so
 %{_libdir}/wine/fusion.dll.so
+%{_libdir}/wine/fwpuclnt.dll.so
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
 %{_libdir}/wine/glu32.dll.so
@@ -695,6 +706,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/mciwave.dll.so
 %{_libdir}/wine/midimap.dll.so
 %{_libdir}/wine/mlang.dll.so
+%{_libdir}/wine/mmdevapi.dll.so
 %{_libdir}/wine/mountmgr.sys.so
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
@@ -810,10 +822,12 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/vdmdbg.dll.so
 %{_libdir}/wine/version.dll.so
 %{_libdir}/wine/wbemprox.dll.so
+%{_libdir}/wine/wiaservc.dll.so
 %{_libdir}/wine/windowscodecs.dll.so
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winecoreaudio.drv.so
 %{_libdir}/wine/winejoystick.drv.so
+%{_libdir}/wine/winemapi.dll.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing32.dll.so
 %{_libdir}/wine/winhttp.dll.so
@@ -832,6 +846,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
 %{_libdir}/wine/wuapi.dll.so
+%{_libdir}/wine/wuaueng.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
 %{_libdir}/wine/wineps.drv.so
@@ -862,18 +877,18 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/vtdapi.vxd.so
 %{_libdir}/wine/vwin32.vxd.so
 %{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/commdlg.dll16
-%{_libdir}/wine/gdi.exe16
 %{_libdir}/wine/wprocs.dll16
 
 %{_libdir}/wine/avifile.dll16.so
 %{_libdir}/wine/comm.drv16.so
+%{_libdir}/wine/commdlg.dll16.so
 %{_libdir}/wine/compobj.dll16.so
 %{_libdir}/wine/ctl3d.dll16.so
 %{_libdir}/wine/ctl3dv2.dll16.so
 %{_libdir}/wine/ddeml.dll16.so
 %{_libdir}/wine/dispdib.dll16.so
 %{_libdir}/wine/display.drv16.so
+%{_libdir}/wine/gdi.exe16.so
 %{_libdir}/wine/imm.dll16.so
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/keyboard.drv16.so
@@ -1046,6 +1061,22 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/openal32.dll.so
 
 %changelog
+* Sat Dec 19 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.35-1
+- version upgrade
+
+* Fri Dec 18 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.34-1
+- version upgrade (#546749)
+
+* Mon Nov 16 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.33-1
+- version upgrade
+- winepulse update (.33)
+- require gnutls (#538694)
+- use separate WINEPREFIX on x86_64 per default (workaround for #533806)
+- drop explicit xmessage require (#537610)
+
 * Tue Oct 27 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.32-1
 - version upgrade (#531358)


--- winepulse-0.32.patch DELETED ---



From sdz at fedoraproject.org  Sat Dec 19 14:34:12 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 19 Dec 2009 14:34:12 +0000 (UTC)
Subject: rpms/python-olpcgames/devel import.log, NONE,
	1.1 python-olpcgames.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091219143412.7B66211C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-olpcgames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27640/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-olpcgames.spec 
Log Message:
import as its a dependency for many sugar packages



--- NEW FILE import.log ---
python-olpcgames-1_6-1:HEAD:python-olpcgames-1.6-1.src.rpm:1261233074


--- NEW FILE python-olpcgames.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-olpcgames
Version:        1.6
Release:        1
Summary:        Utilities for developing games on the OLPC platform

Group:          Development/Languages
License:        BSD
URL:            http://wiki.laptop.org/go/OLPCGames
Source0:        http://dev.laptop.org/~mcfletch/OLPCGames/OLPCGames-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       pygame
BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools

%description
This python package contains various resources and utility classes for making
games on the OLPC system. Specifically it enables using PyGame in the Sugar 
environment.

%prep
%setup -q -n OLPCGames-%{version}


%build
export DISPLAY=:0.0
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
export DISPLAY=:0.0
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# set correct permissions for rpmlint
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/olpcgames/buildmanifest.py
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc NEWS olpcgames/COPYING
%{python_sitelib}/*


%changelog
* Sun Dec 13 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-1
- update to version 1.6
- spec file cleanups

* Wed Aug 01 2007 Noah Kantrowitz <noah at laptop.org> - 1.0-0.0.20070801git4ab726
- Initial version of this spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2007 23:03:03 -0000	1.1
+++ .cvsignore	19 Dec 2009 14:34:11 -0000	1.2
@@ -0,0 +1 @@
+OLPCGames-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2007 23:03:03 -0000	1.1
+++ sources	19 Dec 2009 14:34:11 -0000	1.2
@@ -0,0 +1 @@
+53146b6acf61947499061f318889b5ba  OLPCGames-1.6.tar.gz



From kkofler at fedoraproject.org  Sat Dec 19 14:09:33 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 19 Dec 2009 14:09:33 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.283,1.284
Message-ID: <20091219140933.D077E11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22746/devel

Modified Files:
	kdebindings.spec 
Log Message:
capitalize the proper nouns Qyoto and Kimono in the changelog


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- kdebindings.spec	19 Dec 2009 14:08:57 -0000	1.283
+++ kdebindings.spec	19 Dec 2009 14:09:33 -0000	1.284
@@ -555,7 +555,7 @@ fi
 - fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
 - fix its build (missing #include <nepomuk/resourcetypeterm.h>)
 - fix phpqt_internals.cpp for the current smoke.h
-- qyoto/kimono DLLs are now in mono/qyoto rather than mono/2.0
+- Qyoto/Kimono DLLs are now in mono/qyoto rather than mono/2.0
 
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)



From rdieter at fedoraproject.org  Sat Dec 19 16:18:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Dec 2009 16:18:31 +0000 (UTC)
Subject: File kdelibs-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091219161831.DE44A10F8A8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdelibs:

4bf066d2f489d7d00263ac5a8e787c23  kdelibs-4.3.85.tar.bz2



From rdieter at fedoraproject.org  Sat Dec 19 16:19:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 19 Dec 2009 16:19:11 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec, 1.559, 1.560 sources, 1.101,
	1.102 kdelibs-4.3.85-plasma_scrollwidget.patch, 1.1, NONE
Message-ID: <20091219161912.12A2511C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17782

Modified Files:
	kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.85-plasma_scrollwidget.patch 
Log Message:
* Sat Dec 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
- tarball respin



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -p -r1.559 -r1.560
--- kdelibs.spec	19 Dec 2009 01:17:35 -0000	1.559
+++ kdelibs.spec	19 Dec 2009 16:19:09 -0000	1.560
@@ -6,7 +6,7 @@
 
 Summary: KDE Libraries
 Version: 4.3.85
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -82,7 +82,6 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
 
 # upstream
-Patch100: kdelibs-4.3.85-plasma_scrollwidget.patch
 
 # security fix
 ## Not Upstreamed? why not ? -- Rex
@@ -218,7 +217,6 @@ format for easy browsing.
 %endif
 
 # upstream patches
-%patch100 -p3 -b .plasma_scrollwidget
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -414,6 +412,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
+- tarball respin
+
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
 - -devel: Requires: attica-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- sources	18 Dec 2009 14:29:01 -0000	1.101
+++ sources	19 Dec 2009 16:19:10 -0000	1.102
@@ -1 +1 @@
-b5deca5371719875d10ef63a37c7c2b8  kdelibs-4.3.85.tar.bz2
+4bf066d2f489d7d00263ac5a8e787c23  kdelibs-4.3.85.tar.bz2


--- kdelibs-4.3.85-plasma_scrollwidget.patch DELETED ---



From snecker at fedoraproject.org  Sat Dec 19 16:52:12 2009
From: snecker at fedoraproject.org (Christopher Brown)
Date: Sat, 19 Dec 2009 16:52:12 +0000 (UTC)
Subject: File mono.snk uploaded to lookaside cache by snecker
Message-ID: <20091219165212.50E4010F939@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mono:

19c2e74b9e7804cf4d2a62523daceb4d  mono.snk



From musuruan at fedoraproject.org  Sat Dec 19 17:09:59 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 19 Dec 2009 17:09:59 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.214,1.215 comps-f13.xml.in,1.121,1.122
Message-ID: <20091219170959.AE2EA11C00E6@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28265

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Added oflb-dignas-handwriting-fonts to the legacy-fonts group



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- comps-f12.xml.in	15 Dec 2009 08:53:52 -0000	1.214
+++ comps-f12.xml.in	19 Dec 2009 17:09:58 -0000	1.215
@@ -4053,6 +4053,7 @@
       <packagereq type="optional">mona-bitmap-fonts</packagereq>
       <packagereq type="optional">nethack-bitmap-fonts</packagereq>
       <packagereq type="optional">nted-ntedfont-fonts</packagereq>
+      <packagereq type="optional">oflb-dignas-handwriting-fonts</packagereq>
       <packagereq type="optional">rosegarden4-feta-fonts</packagereq>
       <packagereq type="optional">rosegarden4-parmesan-fonts</packagereq>
       <packagereq type="optional">taipeifonts</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- comps-f13.xml.in	16 Dec 2009 19:08:42 -0000	1.121
+++ comps-f13.xml.in	19 Dec 2009 17:09:58 -0000	1.122
@@ -4060,6 +4060,7 @@
       <packagereq type="optional">mona-bitmap-fonts</packagereq>
       <packagereq type="optional">nethack-bitmap-fonts</packagereq>
       <packagereq type="optional">nted-ntedfont-fonts</packagereq>
+      <packagereq type="optional">oflb-dignas-handwriting-fonts</packagereq>
       <packagereq type="optional">rosegarden4-feta-fonts</packagereq>
       <packagereq type="optional">rosegarden4-parmesan-fonts</packagereq>
       <packagereq type="optional">taipeifonts</packagereq>



From kyle at fedoraproject.org  Sat Dec 19 17:49:29 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 19 Dec 2009 17:49:29 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.8.bz2.sign,1.1,NONE
Message-ID: <20091219174929.C421E11C00E6@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3246

Removed Files:
	patch-2.6.31.8.bz2.sign 
Log Message:
nuke stale 2.6.31.8 signature


--- patch-2.6.31.8.bz2.sign DELETED ---



From nucleo at fedoraproject.org  Sat Dec 19 18:40:58 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 19 Dec 2009 18:40:58 +0000 (UTC)
Subject: File kvirc-4.0rc2.tar.bz2 uploaded to lookaside cache by nucleo
Message-ID: <20091219184058.03FEE10F8EF@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kvirc:

36856df4a423f25e20f884a23bfbdbc7  kvirc-4.0rc2.tar.bz2



From nucleo at fedoraproject.org  Sat Dec 19 18:50:07 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 19 Dec 2009 18:50:07 +0000 (UTC)
Subject: rpms/kvirc/devel .cvsignore, 1.7, 1.8 kvirc.spec, 1.15, 1.16 sources, 
	1.8, 1.9 kvirc-cryptopp.patch, 1.1, NONE
Message-ID: <20091219185007.43AC811C00E6@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12955

Modified Files:
	.cvsignore kvirc.spec sources 
Removed Files:
	kvirc-cryptopp.patch 
Log Message:
KVIrc 4.0 release candidate 2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Sep 2009 00:12:15 -0000	1.7
+++ .cvsignore	19 Dec 2009 18:50:06 -0000	1.8
@@ -1 +1 @@
-kvirc-4.0rc1.tar.bz2
+kvirc-4.0rc2.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kvirc.spec	24 Nov 2009 22:26:52 -0000	1.15
+++ kvirc.spec	19 Dec 2009 18:50:06 -0000	1.16
@@ -1,20 +1,21 @@
-%define           rev 3462
-%define           pre rc1
+%define           rev 3713
+%define           pre rc2
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.19.%{pre}%{?dist}
+Release:          0.20.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
-Patch0:           kvirc-cryptopp.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
-BuildRequires:    perl-ExtUtils-Embed dbus-devel
+BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
-BuildRequires:    cryptopp-devel
+BuildRequires:    cryptopp-devel >= 5.6.1
+#BuildRequires:    libv4l-devel libtheora-devel libvorbis-devel
+
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -26,7 +27,6 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}-4.0%{pre}
-%patch0 -p1
 
 %build
 %{cmake}  \
@@ -37,9 +37,13 @@ many IRC addicted developers around the 
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITHOUT_PYTHON=ON \
+-DWITHOUT_PYTHON=OFF \
 -DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
+#-DWITH_DCC_VIDEO=ON \
+#-DWITH_OGG_THEORA=ON \
+#-DWITH_DCC_CANVAS=OFF \
+
 
 make %{?_smp_mflags}
 
@@ -118,23 +122,20 @@ gtk-update-icon-cache %{_datadir}/icons/
 %lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
 %lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
 %lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo
-%lang(de) %{_mandir}/de.UTF-8/man1/%{name}.1.gz
-%lang(it) %{_mandir}/it.UTF-8/man1/%{name}.1.gz
+%lang(de) %{_mandir}/de/man1/%{name}.1.gz
 %lang(it) %{_mandir}/it/man1/%{name}.1.gz
 
 %exclude %{_libdir}/libkvilib.so
 %exclude %{_bindir}/kvirc-config
 %exclude %{_datadir}/%{name}/4.0/doc/FAQ
 %exclude %{_datadir}/%{name}/4.0/doc/README
-%exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
-* Wed Nov 25 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.19.rc1
-- rebuild (qt-4.6.0-rc1, fc13+)
-
-* Tue Nov  3 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.18.rc1
-- patch for using cryptopp includepath and pkgconfig file (rhbz#512761)
+* Sat Dec 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.20.rc2
+- KVIrc 4.0 release candidate 2
 - added BR cryptopp-devel and -DWANT_NO_EMBEDDED_CODE=ON
+- re-enabled pyhton module -DWITHOUT_PYTHON=OFF
+- added BR python-devel
 
 * Wed Sep  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.17.rc1
 - disabled pyhton module, added -DWITHOUT_PYTHON=ON


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Sep 2009 21:05:26 -0000	1.8
+++ sources	19 Dec 2009 18:50:06 -0000	1.9
@@ -1 +1 @@
-fbf84c24864b7a89922574bcfa68f292  kvirc-4.0rc1.tar.bz2
+36856df4a423f25e20f884a23bfbdbc7  kvirc-4.0rc2.tar.bz2


--- kvirc-cryptopp.patch DELETED ---



From mschwendt at fedoraproject.org  Sat Dec 19 18:51:57 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 19 Dec 2009 18:51:57 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins-2.2-bluetooth.patch,
	NONE, 1.1 audacious-plugins-2.2-cfg_db_close.patch, NONE,
	1.1 audacious-plugins-2.2-neon-request.patch, NONE,
	1.1 audacious-plugins.spec, 1.66, 1.67
Message-ID: <20091219185157.E88A711C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13353

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-bluetooth.patch 
	audacious-plugins-2.2-cfg_db_close.patch 
	audacious-plugins-2.2-neon-request.patch 
Log Message:
* Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
- Beat bluetooth plugin a bit.
- Fix missing aud_cfg_db_close calls.
- Avoid that neon's ne_request_destroy() is called with a NULL ptr.


audacious-plugins-2.2-bluetooth.patch:
 bluetooth.c |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

--- NEW FILE audacious-plugins-2.2-bluetooth.patch ---
diff -Nur audacious-plugins-2.2-orig/src/bluetooth/bluetooth.c audacious-plugins-2.2-bluetooth/src/bluetooth/bluetooth.c
--- audacious-plugins-2.2-orig/src/bluetooth/bluetooth.c	2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2-bluetooth/src/bluetooth/bluetooth.c	2009-12-19 19:48:34.000000000 +0100
@@ -29,6 +29,7 @@
 GList * current_device = NULL;
 gint config = 0;
 gint devices_no = 0;
+gboolean pcmdev_modified = FALSE;
 GStaticMutex mutex = G_STATIC_MUTEX_INIT;
 static gchar *current_address=NULL;
 static GThread *connect_th;
@@ -58,44 +59,53 @@
 
 void bluetooth_init ( void )
 {
+    bonded_dev = NULL;
+    discover_finish = 0;
+    pcmdev_modified = FALSE;
     audio_devices = NULL;
     bus = NULL;
     obj = NULL;
-    gchar* bonded_addr="zz";
+    gchar* bonded_addr = NULL;
     discover_devices();
     mcs_handle_t *cfgfile ;
     cfgfile = aud_cfg_db_open();
     if(!aud_cfg_db_get_string(cfgfile, "BLUETOOTH_PLUGIN", "bonded",
-				  &bonded_addr))
+                              &bonded_addr)) {
+        aud_cfg_db_close(cfgfile);
         return;
+    }
     if(bonded_addr!=NULL && g_strcmp0(bonded_addr,"no")!=0)
         {
              remove_bonding(bonded_addr);
         }
+    free(bonded_addr);
     aud_cfg_db_close(cfgfile);
 
 }
 
 void bluetooth_cleanup ( void )
 {
-    printf("bluetooth: exit\n");
     if (config ==1 )
     {
         close_window();
         config =0;
     }
-    remove_bonding(bonded_dev);
+    if (bonded_dev) {
+        printf("bluetooth: exit\n");
+        remove_bonding(bonded_dev);
+    }
     if(discover_finish == 2) {
         dbus_g_connection_flush (bus);
         dbus_g_connection_unref(bus);
         disconnect_dbus_signals();
 
     }
+    if (pcmdev_modified) {
     /* switching back to default pcm device at cleanup */
     mcs_handle_t *cfgfile = aud_cfg_db_open();
-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "default");
+    aud_cfg_db_set_string(cfgfile,"alsa","pcm", "default");
     aud_cfg_db_close(cfgfile);
-
+    }
 }
 
 void bt_about( void )
@@ -243,8 +253,9 @@
     g_free(device_line);
     g_free(file_name);
     g_free(temp_file_name);
+    pcmdev_modified = TRUE;
     mcs_handle_t *cfgfile = aud_cfg_db_open();
-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "audacious_bt");
+    aud_cfg_db_set_string(cfgfile,"alsa","pcm", "audacious_bt");
     aud_cfg_db_close(cfgfile);
 
     printf("play callback\n");
@@ -360,12 +371,13 @@
 {
     GError *error = NULL;
     //  g_type_init();
-    g_log_set_always_fatal (G_LOG_LEVEL_WARNING);
+    /*    g_log_set_always_fatal (G_LOG_LEVEL_WARNING); */ /* too invasive */
     bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
     if (error != NULL)
     {
         g_printerr("Connecting to system bus failed: %s\n", error->message);
         g_error_free(error);
+        return;
     }
     obj = dbus_g_proxy_new_for_name(bus, "org.bluez", "/org/bluez/hci0", "org.bluez.Adapter");
     printf("bluetooth plugin - start discovery \n");

audacious-plugins-2.2-cfg_db_close.patch:
 alarm/alarm.c   |    1 +
 lastfm/lastfm.c |    2 +-
 neon/neon.c     |    3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.2-cfg_db_close.patch ---
diff -Nur audacious-plugins-2.2-orig/src/alarm/alarm.c audacious-plugins-2.2-cfg_db_close/src/alarm/alarm.c
--- audacious-plugins-2.2-orig/src/alarm/alarm.c	2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/alarm/alarm.c	2009-12-19 19:43:39.000000000 +0100
@@ -354,6 +354,7 @@
        alarm_conf.day[daynum].min = DEFAULT_ALARM_MIN;
    }
 
+   aud_cfg_db_close(conf);
    DEBUG("END alarm_read_config\n");
 }
 
diff -Nur audacious-plugins-2.2-orig/src/lastfm/lastfm.c audacious-plugins-2.2-cfg_db_close/src/lastfm/lastfm.c
--- audacious-plugins-2.2-orig/src/lastfm/lastfm.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/lastfm/lastfm.c	2009-12-19 19:43:39.000000000 +0100
@@ -109,7 +109,7 @@
     {
         aud_cfg_db_get_string(cfg, "audioscrobbler", "username", &username);
         aud_cfg_db_get_string(cfg, "audioscrobbler", "password", &password);
-        g_free(cfg);
+        aud_cfg_db_close(cfg);
     }
     if (username != NULL && password != NULL)
     {
diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2-cfg_db_close/src/neon/neon.c
--- audacious-plugins-2.2-orig/src/neon/neon.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/neon/neon.c	2009-12-19 19:43:39.000000000 +0100
@@ -508,6 +508,7 @@
     aud_cfg_db_get_string(db, NULL, "proxy_user", &value);
     if (!value) {
         _DEBUG("<%p> proxy_auth requested but no proxy_user", userdata);
+        aud_cfg_db_close(db);
         _LEAVE -1;
     }
     g_strlcpy(username, value, NE_ABUFSIZ);
@@ -516,11 +517,13 @@
     aud_cfg_db_get_string(db, NULL, "proxy_pass", &value);
     if (!value) {
         _DEBUG("<%p> proxy_auth requested but no proxy_pass", userdata);
+        aud_cfg_db_close(db);
         _LEAVE -1;
     }
     g_strlcpy(password, value, NE_ABUFSIZ);
     value = NULL;
 
+    aud_cfg_db_close(db);
     _LEAVE attempt;
 }
 

audacious-plugins-2.2-neon-request.patch:
 neon.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.2-neon-request.patch ---
diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2-neon/src/neon/neon.c
--- audacious-plugins-2.2-orig/src/neon/neon.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-neon/src/neon/neon.c	2009-12-19 19:02:17.000000000 +0100
@@ -1354,7 +1354,9 @@
         kill_reader(h);
     }
 
-    ne_request_destroy(h->request);
+    if (NULL != h->request) {
+        ne_request_destroy(h->request);
+    }
     ne_session_destroy(h->session);
     reset_rb(&h->rb);
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- audacious-plugins.spec	2 Dec 2009 13:46:49 -0000	1.66
+++ audacious-plugins.spec	19 Dec 2009 18:51:57 -0000	1.67
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -23,7 +23,14 @@ Source0: audacious-plugins-fedora-%{vers
 Source1: audacious-sid.desktop
 
 Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
+# obsolete with version upgrade: declaration conflict for jack_free
 Patch1: audacious-plugins-2.2-jack.patch
+#
+Patch2: audacious-plugins-2.2-neon-request.patch
+# submitted upstream
+Patch3: audacious-plugins-2.2-cfg_db_close.patch
+#
+Patch4: audacious-plugins-2.2-bluetooth.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -153,8 +160,10 @@ in Vortex (.vtx) format.
 %prep
 %setup -q -n audacious-plugins-fedora-%{version}
 %patch0 -p1 -b .xmms-skindir
-# obsolete with version upgrade: declaration conflict for jack_free
 %patch1 -p1 -b .jack
+%patch2 -p1 -b .neon-request
+%patch3 -p1 -b .cfg_db_close
+%patch4 -p1 -b .bluetooth
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -248,6 +257,11 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
+- Beat bluetooth plugin a bit.
+- Fix missing aud_cfg_db_close calls.
+- Avoid that neon's ne_request_destroy() is called with a NULL ptr.
+
 * Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
 - Move SID music plugin into audacious-plugins-sid package. Its 
   built with libsidplay 1 while 3rd party package providers may



From mschwendt at fedoraproject.org  Sat Dec 19 18:58:38 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 19 Dec 2009 18:58:38 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-plugins-2.1-bluetooth.patch,
	NONE, 1.1 audacious-plugins-2.1-cfg_db_close.patch, NONE,
	1.1 audacious-plugins-2.2-bluetooth.patch, NONE,
	1.1 audacious-plugins-2.2-neon-request.patch, NONE,
	1.1 audacious-plugins.spec, 1.74, 1.75
Message-ID: <20091219185839.004B311C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14415

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-bluetooth.patch 
	audacious-plugins-2.1-cfg_db_close.patch 
	audacious-plugins-2.2-bluetooth.patch 
	audacious-plugins-2.2-neon-request.patch 
Log Message:
* Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-27
- Beat bluetooth plugin a bit.
- Fix missing aud_cfg_db_close calls.


audacious-plugins-2.1-bluetooth.patch:
 bluetooth.c |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

--- NEW FILE audacious-plugins-2.1-bluetooth.patch ---
diff -Nur audacious-plugins-fedora-2.1-orig/src/bluetooth/bluetooth.c audacious-plugins-fedora-2.1-bluetooth/src/bluetooth/bluetooth.c
--- audacious-plugins-fedora-2.1-orig/src/bluetooth/bluetooth.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-bluetooth/src/bluetooth/bluetooth.c	2009-12-19 19:19:16.000000000 +0100
@@ -29,6 +29,7 @@
 GList * current_device = NULL;
 gint config = 0;
 gint devices_no = 0;
+gboolean pcmdev_modified = FALSE;
 GStaticMutex mutex = G_STATIC_MUTEX_INIT;
 static gchar *current_address=NULL;
 static GThread *connect_th;
@@ -58,44 +59,53 @@
 
 void bluetooth_init ( void )
 {
+    bonded_dev = NULL;
+    discover_finish = 0;
+    pcmdev_modified = FALSE;
     audio_devices = NULL;
     bus = NULL;
     obj = NULL;
-    gchar* bonded_addr="zz";
+    gchar* bonded_addr = NULL;
     discover_devices();
     mcs_handle_t *cfgfile ;
     cfgfile = aud_cfg_db_open();
     if(!aud_cfg_db_get_string(cfgfile, "BLUETOOTH_PLUGIN", "bonded",
-				  &bonded_addr))
+                              &bonded_addr)) {
+        aud_cfg_db_close(cfgfile);
         return;
+    }
     if(bonded_addr!=NULL && g_strcmp0(bonded_addr,"no")!=0)
         {
              remove_bonding(bonded_addr);
         }
+    free(bonded_addr);
     aud_cfg_db_close(cfgfile);
 
 }
 
 void bluetooth_cleanup ( void )
 {
-    printf("bluetooth: exit\n");
     if (config ==1 )
     {
         close_window();
         config =0;
     }
-    remove_bonding(bonded_dev);
+    if (bonded_dev) {
+        printf("bluetooth: exit\n");
+        remove_bonding(bonded_dev);
+    }
     if(discover_finish == 2) {
         dbus_g_connection_flush (bus);
         dbus_g_connection_unref(bus);
         disconnect_dbus_signals();
 
     }
+    if (pcmdev_modified) {
     /* switching back to default pcm device at cleanup */
     mcs_handle_t *cfgfile = aud_cfg_db_open();
-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "default");
+    aud_cfg_db_set_string(cfgfile,"alsaplug","pcm_device", "default");
     aud_cfg_db_close(cfgfile);
-
+    }
 }
 
 void bt_about( void )
@@ -243,8 +253,9 @@
     g_free(device_line);
     g_free(file_name);
     g_free(temp_file_name);
+    pcmdev_modified = TRUE;
     mcs_handle_t *cfgfile = aud_cfg_db_open();
-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "audacious_bt");
+    aud_cfg_db_set_string(cfgfile,"alsaplug","pcm_device", "audacious_bt");
     aud_cfg_db_close(cfgfile);
 
     printf("play callback\n");
@@ -360,12 +371,13 @@
 {
     GError *error = NULL;
     //  g_type_init();
-    g_log_set_always_fatal (G_LOG_LEVEL_WARNING);
+    /*    g_log_set_always_fatal (G_LOG_LEVEL_WARNING); */ /* too invasive */
     bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
     if (error != NULL)
     {
         g_printerr("Connecting to system bus failed: %s\n", error->message);
         g_error_free(error);
+        return;
     }
     obj = dbus_g_proxy_new_for_name(bus, "org.bluez", "/org/bluez/hci0", "org.bluez.Adapter");
     printf("bluetooth plugin - start discovery \n");

audacious-plugins-2.1-cfg_db_close.patch:
 alarm/alarm.c   |    1 +
 lastfm/lastfm.c |    2 +-
 neon/neon.c     |    3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.1-cfg_db_close.patch ---
diff -Nur audacious-plugins-fedora-2.1-orig/src/alarm/alarm.c audacious-plugins-fedora-2.1-cfg_db_close/src/alarm/alarm.c
--- audacious-plugins-fedora-2.1-orig/src/alarm/alarm.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-cfg_db_close/src/alarm/alarm.c	2009-12-19 13:00:16.000000000 +0100
@@ -354,6 +354,7 @@
        alarm_conf.day[daynum].min = DEFAULT_ALARM_MIN;
    }
 
+   aud_cfg_db_close(conf);
    DEBUG("END alarm_read_config\n");
 }
 
diff -Nur audacious-plugins-fedora-2.1-orig/src/lastfm/lastfm.c audacious-plugins-fedora-2.1-cfg_db_close/src/lastfm/lastfm.c
--- audacious-plugins-fedora-2.1-orig/src/lastfm/lastfm.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-cfg_db_close/src/lastfm/lastfm.c	2009-12-19 13:06:39.000000000 +0100
@@ -116,7 +116,7 @@
                                 &username);
                 aud_cfg_db_get_string(cfg, "audioscrobbler","password",
                                 &password);
-                g_free(cfg);
+                aud_cfg_db_close(cfg);
         }
         if (username != NULL && password != NULL)
         {
diff -Nur audacious-plugins-fedora-2.1-orig/src/neon/neon.c audacious-plugins-fedora-2.1-cfg_db_close/src/neon/neon.c
--- audacious-plugins-fedora-2.1-orig/src/neon/neon.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-cfg_db_close/src/neon/neon.c	2009-12-19 13:00:16.000000000 +0100
@@ -508,6 +508,7 @@
     aud_cfg_db_get_string(db, NULL, "proxy_user", &value);
     if (!value) {
         _DEBUG("<%p> proxy_auth requested but no proxy_user", userdata);
+        aud_cfg_db_close(db);
         _LEAVE -1;
     }
     g_strlcpy(username, value, NE_ABUFSIZ);
@@ -516,11 +517,13 @@
     aud_cfg_db_get_string(db, NULL, "proxy_pass", &value);
     if (!value) {
         _DEBUG("<%p> proxy_auth requested but no proxy_pass", userdata);
+        aud_cfg_db_close(db);
         _LEAVE -1;
     }
     g_strlcpy(password, value, NE_ABUFSIZ);
     value = NULL;
 
+    aud_cfg_db_close(db);
     _LEAVE attempt;
 }
 

audacious-plugins-2.2-bluetooth.patch:
 bluetooth.c |   26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

--- NEW FILE audacious-plugins-2.2-bluetooth.patch ---
diff -Nur audacious-plugins-2.2-orig/src/bluetooth/bluetooth.c audacious-plugins-2.2-bluetooth/src/bluetooth/bluetooth.c
--- audacious-plugins-2.2-orig/src/bluetooth/bluetooth.c	2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2-bluetooth/src/bluetooth/bluetooth.c	2009-12-19 18:59:02.000000000 +0100
@@ -29,6 +29,7 @@
 GList * current_device = NULL;
 gint config = 0;
 gint devices_no = 0;
+gboolean pcmdev_modified = FALSE;
 GStaticMutex mutex = G_STATIC_MUTEX_INIT;
 static gchar *current_address=NULL;
 static GThread *connect_th;
@@ -58,20 +59,26 @@
 
 void bluetooth_init ( void )
 {
+    bonded_dev = NULL;
+    discover_finish = 0;
+    pcmdev_modified = FALSE;
     audio_devices = NULL;
     bus = NULL;
     obj = NULL;
-    gchar* bonded_addr="zz";
+    gchar* bonded_addr = NULL;
     discover_devices();
     mcs_handle_t *cfgfile ;
     cfgfile = aud_cfg_db_open();
     if(!aud_cfg_db_get_string(cfgfile, "BLUETOOTH_PLUGIN", "bonded",
-				  &bonded_addr))
+                              &bonded_addr)) {
+        aud_cfg_db_close(cfgfile);
         return;
+    }
     if(bonded_addr!=NULL && g_strcmp0(bonded_addr,"no")!=0)
         {
              remove_bonding(bonded_addr);
         }
+    free(bonded_addr);
     aud_cfg_db_close(cfgfile);
 
 }
@@ -84,18 +91,21 @@
         close_window();
         config =0;
     }
-    remove_bonding(bonded_dev);
+    if (bonded_dev) {
+        remove_bonding(bonded_dev);
+    }
     if(discover_finish == 2) {
         dbus_g_connection_flush (bus);
         dbus_g_connection_unref(bus);
         disconnect_dbus_signals();
 
     }
+    if (pcmdev_modified) {
     /* switching back to default pcm device at cleanup */
     mcs_handle_t *cfgfile = aud_cfg_db_open();
-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "default");
+    aud_cfg_db_set_string(cfgfile,"alsa","pcm", "default");
     aud_cfg_db_close(cfgfile);
-
+    }
 }
 
 void bt_about( void )
@@ -243,8 +253,9 @@
     g_free(device_line);
     g_free(file_name);
     g_free(temp_file_name);
+    pcmdev_modified = TRUE;
     mcs_handle_t *cfgfile = aud_cfg_db_open();
-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "audacious_bt");
+    aud_cfg_db_set_string(cfgfile,"alsa","pcm", "audacious_bt");
     aud_cfg_db_close(cfgfile);
 
     printf("play callback\n");
@@ -360,12 +371,13 @@
 {
     GError *error = NULL;
     //  g_type_init();
-    g_log_set_always_fatal (G_LOG_LEVEL_WARNING);
+    /*    g_log_set_always_fatal (G_LOG_LEVEL_WARNING); */ /* too invasive */
     bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
     if (error != NULL)
     {
         g_printerr("Connecting to system bus failed: %s\n", error->message);
         g_error_free(error);
+        return;
     }
     obj = dbus_g_proxy_new_for_name(bus, "org.bluez", "/org/bluez/hci0", "org.bluez.Adapter");
     printf("bluetooth plugin - start discovery \n");

audacious-plugins-2.2-neon-request.patch:
 neon.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.2-neon-request.patch ---
diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2-neon/src/neon/neon.c
--- audacious-plugins-2.2-orig/src/neon/neon.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-neon/src/neon/neon.c	2009-12-19 19:02:17.000000000 +0100
@@ -1354,7 +1354,9 @@
         kill_reader(h);
     }
 
-    ne_request_destroy(h->request);
+    if (NULL != h->request) {
+        ne_request_destroy(h->request);
+    }
     ne_session_destroy(h->session);
     reset_rb(&h->rb);
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- audacious-plugins.spec	17 Dec 2009 22:13:47 -0000	1.74
+++ audacious-plugins.spec	19 Dec 2009 18:58:38 -0000	1.75
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 26%{?dist}
+Release: 27%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -47,7 +47,10 @@ Patch17: audacious-plugins-2.1-pulseaudi
 Patch18: audacious-plugins-2.1-sid-playfix.patch
 #
 Patch19: audacious-plugins-2.1-neon-request.patch
-
+# submitted upstream
+Patch20: audacious-plugins-2.1-cfg_db_close.patch
+#
+Patch21: audacious-plugins-2.1-bluetooth.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -186,6 +189,8 @@ vortex compressed files.
 %patch17 -p1 -b .no-drain
 %patch18 -p1 -b .sid-playfix
 %patch19 -p1 -b .neon-request
+%patch20 -p1 -b .cfg_db_close
+%patch21 -p1 -b .bluetooth
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -269,6 +274,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-27
+- Beat bluetooth plugin a bit.
+- Fix missing aud_cfg_db_close calls.
+
 * Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-26
 - Avoid that neon's ne_request_destroy() is called with a NULL ptr.
 



From nucleo at fedoraproject.org  Sat Dec 19 19:23:21 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 19 Dec 2009 19:23:21 +0000 (UTC)
Subject: rpms/kvirc/F-12 .cvsignore, 1.7, 1.8 kvirc.spec, 1.13, 1.14 sources, 
	1.8, 1.9
Message-ID: <20091219192321.E2C9811C00E6@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17924

Modified Files:
	.cvsignore kvirc.spec sources 
Log Message:
KVIrc 4.0 release candidate 2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Sep 2009 00:12:15 -0000	1.7
+++ .cvsignore	19 Dec 2009 19:23:21 -0000	1.8
@@ -1 +1 @@
-kvirc-4.0rc1.tar.bz2
+kvirc-4.0rc2.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-12/kvirc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kvirc.spec	9 Sep 2009 21:05:26 -0000	1.13
+++ kvirc.spec	19 Dec 2009 19:23:21 -0000	1.14
@@ -1,9 +1,9 @@
-%define           rev 3462
-%define           pre rc1
+%define           rev 3713
+%define           pre rc2
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.17.%{pre}%{?dist}
+Release:          0.20.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -11,8 +11,11 @@ URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
-BuildRequires:    perl-ExtUtils-Embed dbus-devel
+BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
+BuildRequires:    cryptopp-devel >= 5.6.1
+#BuildRequires:    libv4l-devel libtheora-devel libvorbis-devel
+
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -30,13 +33,17 @@ many IRC addicted developers around the 
 %ifarch %{ix86}
 -DWITH_ix86_ASM=ON \
 %endif
--DWANT_NO_EMBEDDED_CODE=OFF \
+-DWANT_NO_EMBEDDED_CODE=ON \
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITHOUT_PYTHON=ON \
+-DWITHOUT_PYTHON=OFF \
 -DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
+#-DWITH_DCC_VIDEO=ON \
+#-DWITH_OGG_THEORA=ON \
+#-DWITH_DCC_CANVAS=OFF \
+
 
 make %{?_smp_mflags}
 
@@ -115,17 +122,21 @@ gtk-update-icon-cache %{_datadir}/icons/
 %lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
 %lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
 %lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo
-%lang(de) %{_mandir}/de.UTF-8/man1/%{name}.1.gz
-%lang(it) %{_mandir}/it.UTF-8/man1/%{name}.1.gz
+%lang(de) %{_mandir}/de/man1/%{name}.1.gz
 %lang(it) %{_mandir}/it/man1/%{name}.1.gz
 
 %exclude %{_libdir}/libkvilib.so
 %exclude %{_bindir}/kvirc-config
 %exclude %{_datadir}/%{name}/4.0/doc/FAQ
 %exclude %{_datadir}/%{name}/4.0/doc/README
-%exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Sat Dec 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.20.rc2
+- KVIrc 4.0 release candidate 2
+- added BR cryptopp-devel and -DWANT_NO_EMBEDDED_CODE=ON
+- re-enabled pyhton module -DWITHOUT_PYTHON=OFF
+- added BR python-devel
+
 * Wed Sep  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.17.rc1
 - disabled pyhton module, added -DWITHOUT_PYTHON=ON
 - removed BR python-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Sep 2009 21:05:26 -0000	1.8
+++ sources	19 Dec 2009 19:23:21 -0000	1.9
@@ -1 +1 @@
-fbf84c24864b7a89922574bcfa68f292  kvirc-4.0rc1.tar.bz2
+36856df4a423f25e20f884a23bfbdbc7  kvirc-4.0rc2.tar.bz2



From nucleo at fedoraproject.org  Sat Dec 19 19:26:54 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 19 Dec 2009 19:26:54 +0000 (UTC)
Subject: rpms/kvirc/F-11 .cvsignore, 1.7, 1.8 kvirc.spec, 1.7, 1.8 sources, 1.8,
	1.9
Message-ID: <20091219192654.E787B11C00E6@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18579

Modified Files:
	.cvsignore kvirc.spec sources 
Log Message:
KVIrc 4.0 release candidate 2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Sep 2009 00:33:14 -0000	1.7
+++ .cvsignore	19 Dec 2009 19:26:54 -0000	1.8
@@ -1 +1 @@
-kvirc-4.0rc1.tar.bz2
+kvirc-4.0rc2.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/kvirc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kvirc.spec	9 Sep 2009 21:49:46 -0000	1.7
+++ kvirc.spec	19 Dec 2009 19:26:54 -0000	1.8
@@ -1,9 +1,9 @@
-%define           rev 3462
-%define           pre rc1
+%define           rev 3713
+%define           pre rc2
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.17.%{pre}%{?dist}
+Release:          0.20.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -11,8 +11,11 @@ URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
-BuildRequires:    perl-ExtUtils-Embed dbus-devel
+BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
+BuildRequires:    cryptopp-devel >= 5.6.1
+#BuildRequires:    libv4l-devel libtheora-devel libvorbis-devel
+
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -30,13 +33,17 @@ many IRC addicted developers around the 
 %ifarch %{ix86}
 -DWITH_ix86_ASM=ON \
 %endif
--DWANT_NO_EMBEDDED_CODE=OFF \
+-DWANT_NO_EMBEDDED_CODE=ON \
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITHOUT_PYTHON=ON \
+-DWITHOUT_PYTHON=OFF \
 -DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
+#-DWITH_DCC_VIDEO=ON \
+#-DWITH_OGG_THEORA=ON \
+#-DWITH_DCC_CANVAS=OFF \
+
 
 make %{?_smp_mflags}
 
@@ -115,17 +122,21 @@ gtk-update-icon-cache %{_datadir}/icons/
 %lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
 %lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
 %lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo
-%lang(de) %{_mandir}/de.UTF-8/man1/%{name}.1.gz
-%lang(it) %{_mandir}/it.UTF-8/man1/%{name}.1.gz
+%lang(de) %{_mandir}/de/man1/%{name}.1.gz
 %lang(it) %{_mandir}/it/man1/%{name}.1.gz
 
 %exclude %{_libdir}/libkvilib.so
 %exclude %{_bindir}/kvirc-config
 %exclude %{_datadir}/%{name}/4.0/doc/FAQ
 %exclude %{_datadir}/%{name}/4.0/doc/README
-%exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Sat Dec 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.20.rc2
+- KVIrc 4.0 release candidate 2
+- added BR cryptopp-devel and -DWANT_NO_EMBEDDED_CODE=ON
+- re-enabled pyhton module -DWITHOUT_PYTHON=OFF
+- added BR python-devel
+
 * Wed Sep  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.17.rc1
 - disabled pyhton module, added -DWITHOUT_PYTHON=ON
 - removed BR python-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Sep 2009 21:49:46 -0000	1.8
+++ sources	19 Dec 2009 19:26:54 -0000	1.9
@@ -1 +1 @@
-fbf84c24864b7a89922574bcfa68f292  kvirc-4.0rc1.tar.bz2
+36856df4a423f25e20f884a23bfbdbc7  kvirc-4.0rc2.tar.bz2



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:10 +0000
Subject: [pkgdb] bareftp had acl change status
Message-ID: <20091219200808.74DC310F8E3@bastion.fedoraproject.org>

cassmodiah has set the watchbugzilla acl on bareftp (Fedora devel) to Obsolete for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:15 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219200813.29FBF10F957@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:15 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up commit
Message-ID: <20091219200813.22A6E10F94E@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:17 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchbugzilla
Message-ID: <20091219200815.6AD0010F95B@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:17 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up approveacls
Message-ID: <20091219200815.3AF8E10F957@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:19 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219200817.17EC810F95E@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:19 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up commit
Message-ID: <20091219200817.66B9F10F95F@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:20 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up approveacls
Message-ID: <20091219200818.06E7010F95E@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:30 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchbugzilla
Message-ID: <20091219200828.E57A310F94E@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:31 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219200829.557E910F965@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:33 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up commit
Message-ID: <20091219200831.4059110F95E@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:08:35 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up approveacls
Message-ID: <20091219200833.0DD2710F95E@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From jdennis at fedoraproject.org  Sat Dec 19 20:10:12 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Sat, 19 Dec 2009 20:10:12 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius-radiusd-init, 1.2,
	1.3 freeradius.spec, 1.89, 1.90
Message-ID: <20091219201012.D71E611C00E6@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24911

Modified Files:
	freeradius-radiusd-init freeradius.spec 
Log Message:
clean up as many rpmlint warnings & errors as possible



Index: freeradius-radiusd-init
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-radiusd-init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- freeradius-radiusd-init	3 Dec 2009 21:44:54 -0000	1.2
+++ freeradius-radiusd-init	19 Dec 2009 20:10:12 -0000	1.3
@@ -9,6 +9,8 @@
 # Provides: radiusd
 # Required-Start: $network
 # Required-Stop:
+# Default-Start:
+# Default-Stop:
 # Should-Start: $time $syslog mysql ldap postgresql samba krb5-kdc
 # Should-Stop:
 # Short-Description: FreeRADIUS server
@@ -18,12 +20,11 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-initname=${0##*/}
 prog=radiusd
 exec=/usr/sbin/$prog
 config=/etc/raddb/radiusd.conf
 pidfile=/var/run/$prog/$prog.pid
-lockfile=/var/lock/subsys/$initname
+lockfile=/var/lock/subsys/radiusd
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- freeradius.spec	6 Dec 2009 23:09:08 -0000	1.89
+++ freeradius.spec	19 Dec 2009 20:10:12 -0000	1.90
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -11,9 +11,6 @@ Source100: freeradius-radiusd-init
 Source102: freeradius-logrotate
 Source103: freeradius-pam-conf
 
-Obsoletes: freeradius-dialupadmin >= 2.0 freeradius-dialupadmin-ldap >= 2.0
-Obsoletes: freeradius-dialupadmin-mysql >= 2.0 freeradius-dialupadmin-postgresql >= 2.0
-
 %define docdir %{_docdir}/freeradius-%{version}
 %define initddir %{?_initddir:%{_initddir}}%{!?_initddir:%{_initrddir}}
 
@@ -134,7 +131,7 @@ BuildRequires: mysql-devel
 This plugin provides the MySQL support for the FreeRADIUS server project.
 
 %package postgresql
-Summary: postgresql support for freeradius
+Summary: Postgresql support for freeradius
 Group: System Environment/Daemons
 Requires: %{name}-libs = %{version}-%{release}
 BuildRequires: postgresql-devel
@@ -143,7 +140,7 @@ BuildRequires: postgresql-devel
 This plugin provides the postgresql support for the FreeRADIUS server project.
 
 %package unixODBC
-Summary: unixODBC support for freeradius
+Summary: Unix ODBC support for freeradius
 Group: System Environment/Daemons
 Requires: %{name}-libs = %{version}-%{release}
 BuildRequires: unixODBC-devel
@@ -332,7 +329,7 @@ fi
 %doc %{docdir}/
 %config(noreplace) %{_sysconfdir}/pam.d/radiusd
 %config(noreplace) %{_sysconfdir}/logrotate.d/radiusd
-%config(noreplace) %{initddir}/radiusd
+%{initddir}/radiusd
 %dir %attr(755,radiusd,radiusd) /var/lib/radiusd
 # configs
 %dir %attr(755,root,radiusd) /etc/raddb
@@ -355,9 +352,9 @@ fi
 #%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/oracle/*
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/users
 %dir %attr(770,root,radiusd) /etc/raddb/certs
-/etc/raddb/certs/Makefile
-/etc/raddb/certs/README
-/etc/raddb/certs/xpextensions
+%config(noreplace) /etc/raddb/certs/Makefile
+%config(noreplace) /etc/raddb/certs/README
+%config(noreplace) /etc/raddb/certs/xpextensions
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/certs/*.cnf
 %attr(750,root,radiusd) /etc/raddb/certs/bootstrap
 %dir %attr(750,root,radiusd) /etc/raddb/sites-available
@@ -365,9 +362,9 @@ fi
 %dir %attr(750,root,radiusd) /etc/raddb/sites-enabled
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-enabled/*
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/eap.conf
-%attr(640,root,radiusd) /etc/raddb/example.pl
+%config(noreplace) %attr(640,root,radiusd) /etc/raddb/example.pl
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.conf
-/etc/raddb/policy.txt
+%config(noreplace) /etc/raddb/policy.txt
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/templates.conf
 %dir %attr(750,root,radiusd) /etc/raddb/modules
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/acct_unique
@@ -456,8 +453,8 @@ fi
 # logs
 %dir %attr(700,radiusd,radiusd) /var/log/radius/
 %dir %attr(700,radiusd,radiusd) /var/log/radius/radacct/
-%attr(644,radiusd,radiusd) /var/log/radius/radutmp
-%config(noreplace) %attr(600,radiusd,radiusd) /var/log/radius/radius.log
+%ghost %attr(644,radiusd,radiusd) /var/log/radius/radutmp
+%ghost %attr(600,radiusd,radiusd) /var/log/radius/radius.log
 # RADIUS Loadable Modules
 %dir %attr(755,root,root) %{_libdir}/freeradius
 #%attr(755,root,root) %{_libdir}/freeradius/rlm_*.so*
@@ -575,7 +572,7 @@ fi
 %defattr(-,root,root)
 #%attr(644,root,root) %{_libdir}/freeradius/*.a
 #%attr(644,root,root) %{_libdir}/freeradius/*.la
-%dir %attr(755,radiusd,radiusd) /usr/include/freeradius
+%dir %attr(755,root,root) /usr/include/freeradius
 %attr(644,root,root) /usr/include/freeradius/*.h
 
 %files krb5



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:14 +0000
Subject: [pkgdb] bareftp: cassmodiah has requested commit
Message-ID: <20091219202712.8816410F984@bastion.fedoraproject.org>

cassmodiah has requested the commit acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:17 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219202714.D510610F990@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:17 +0000
Subject: [pkgdb] bareftp: cassmodiah has requested approveacls
Message-ID: <20091219202715.1EAE110F993@bastion.fedoraproject.org>

cassmodiah has requested the approveacls acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:19 +0000
Subject: [pkgdb] bareftp: cassmodiah has requested commit
Message-ID: <20091219202717.5E01810F993@bastion.fedoraproject.org>

cassmodiah has requested the commit acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:19 +0000
Subject: [pkgdb] bareftp: cassmodiah has requested approveacls
Message-ID: <20091219202717.7299010F99A@bastion.fedoraproject.org>

cassmodiah has requested the approveacls acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:24 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219202722.08FB810F99B@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:24 +0000
Subject: [pkgdb] bareftp: cassmodiah has requested commit
Message-ID: <20091219202722.3A6DA10F99E@bastion.fedoraproject.org>

cassmodiah has requested the commit acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:13 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219202711.4CFD610F982@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:27:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:27:25 +0000
Subject: [pkgdb] bareftp: cassmodiah has requested approveacls
Message-ID: <20091219202722.C32B210F9A1@bastion.fedoraproject.org>

cassmodiah has requested the approveacls acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:30:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:30:33 +0000
Subject: [pkgdb] apt-mirror ownership updated
Message-ID: <20091219203031.E1B2A10F9A8@bastion.fedoraproject.org>

Package apt-mirror in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt-mirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:30:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:30:37 +0000
Subject: [pkgdb] apt-mirror ownership updated
Message-ID: <20091219203035.1702F10F9A8@bastion.fedoraproject.org>

Package apt-mirror in Fedora EPEL 5 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt-mirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:30:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:30:39 +0000
Subject: [pkgdb] apt-mirror ownership updated
Message-ID: <20091219203037.36DD610F9A8@bastion.fedoraproject.org>

Package apt-mirror in Fedora EPEL 4 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt-mirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:30:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:30:42 +0000
Subject: [pkgdb] apt-mirror ownership updated
Message-ID: <20091219203040.8A7F610F9A8@bastion.fedoraproject.org>

Package apt-mirror in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt-mirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:30:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:30:43 +0000
Subject: [pkgdb] apt-mirror ownership updated
Message-ID: <20091219203041.AB9EA10F9A9@bastion.fedoraproject.org>

Package apt-mirror in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt-mirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:32:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:32:41 +0000
Subject: [pkgdb] backintime ownership updated
Message-ID: <20091219203239.CF7EA10F9AE@bastion.fedoraproject.org>

Package backintime in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backintime



From pkgdb at fedoraproject.org  Sat Dec 19 20:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:32:42 +0000
Subject: [pkgdb] backintime ownership updated
Message-ID: <20091219203240.CD36710F9AE@bastion.fedoraproject.org>

Package backintime in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backintime



From pkgdb at fedoraproject.org  Sat Dec 19 20:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:32:46 +0000
Subject: [pkgdb] backintime ownership updated
Message-ID: <20091219203243.E884210F9B1@bastion.fedoraproject.org>

Package backintime in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backintime



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:06 +0000
Subject: [pkgdb] barrage ownership updated
Message-ID: <20091219203303.CC49110F9B3@bastion.fedoraproject.org>

Package barrage in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/barrage



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:09 +0000
Subject: [pkgdb] barrage ownership updated
Message-ID: <20091219203307.584A910F9B3@bastion.fedoraproject.org>

Package barrage in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/barrage



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:10 +0000
Subject: [pkgdb] barrage ownership updated
Message-ID: <20091219203308.527B010F9B3@bastion.fedoraproject.org>

Package barrage in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/barrage



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:24 +0000
Subject: [pkgdb] bauble ownership updated
Message-ID: <20091219203321.CEDA310F9B4@bastion.fedoraproject.org>

Package bauble in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bauble



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:25 +0000
Subject: [pkgdb] bauble ownership updated
Message-ID: <20091219203322.98AC210F9B4@bastion.fedoraproject.org>

Package bauble in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bauble



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:26 +0000
Subject: [pkgdb] bauble ownership updated
Message-ID: <20091219203323.B62EE10F9B4@bastion.fedoraproject.org>

Package bauble in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bauble



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:32 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20091219203329.A1E3710F9B4@bastion.fedoraproject.org>

Package biniax in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:36 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20091219203334.71B6310F9B4@bastion.fedoraproject.org>

Package biniax in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:37 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20091219203335.3B6D210F9B7@bastion.fedoraproject.org>

Package biniax in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:52 +0000
Subject: [pkgdb] fbpanel ownership updated
Message-ID: <20091219203350.1E3B010F9B4@bastion.fedoraproject.org>

Package fbpanel in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbpanel



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:54 +0000
Subject: [pkgdb] fbpanel ownership updated
Message-ID: <20091219203352.820A210F9B4@bastion.fedoraproject.org>

Package fbpanel in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbpanel



From pkgdb at fedoraproject.org  Sat Dec 19 20:33:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:33:55 +0000
Subject: [pkgdb] fbpanel ownership updated
Message-ID: <20091219203353.6C0C510F9B7@bastion.fedoraproject.org>

Package fbpanel in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbpanel



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:02 +0000
Subject: [pkgdb] griffith ownership updated
Message-ID: <20091219203359.BC69210F9B4@bastion.fedoraproject.org>

Package griffith in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griffith



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:03 +0000
Subject: [pkgdb] griffith ownership updated
Message-ID: <20091219203401.AC82210F9B7@bastion.fedoraproject.org>

Package griffith in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griffith



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:04 +0000
Subject: [pkgdb] griffith ownership updated
Message-ID: <20091219203401.C8BE810F9B8@bastion.fedoraproject.org>

Package griffith in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griffith



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:07 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091219203404.C274410F9B7@bastion.fedoraproject.org>

Package griv in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:09 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091219203407.891CC10F9B7@bastion.fedoraproject.org>

Package griv in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:10 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091219203408.1D8FE10F9B4@bastion.fedoraproject.org>

Package griv in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:51 +0000
Subject: [pkgdb] libwps ownership updated
Message-ID: <20091219203449.95CED10F9B4@bastion.fedoraproject.org>

Package libwps in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwps



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:53 +0000
Subject: [pkgdb] libwps ownership updated
Message-ID: <20091219203450.EDE6310F9B3@bastion.fedoraproject.org>

Package libwps in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwps



From pkgdb at fedoraproject.org  Sat Dec 19 20:34:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:34:54 +0000
Subject: [pkgdb] libwps ownership updated
Message-ID: <20091219203451.D538110F9B3@bastion.fedoraproject.org>

Package libwps in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwps



From pkgdb at fedoraproject.org  Sat Dec 19 20:35:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:35:06 +0000
Subject: [pkgdb] nssbackup ownership updated
Message-ID: <20091219203503.99E6510F9B4@bastion.fedoraproject.org>

Package nssbackup in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:35:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:35:07 +0000
Subject: [pkgdb] nssbackup ownership updated
Message-ID: <20091219203505.5C63710F9B4@bastion.fedoraproject.org>

Package nssbackup in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:35:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:35:09 +0000
Subject: [pkgdb] nssbackup ownership updated
Message-ID: <20091219203507.622A210F9B3@bastion.fedoraproject.org>

Package nssbackup in Fedora EPEL 5 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:35:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:35:12 +0000
Subject: [pkgdb] nssbackup ownership updated
Message-ID: <20091219203510.504F510F9B8@bastion.fedoraproject.org>

Package nssbackup in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:35:08 +0000
Subject: [pkgdb] nssbackup ownership updated
Message-ID: <20091219203506.C5DA510F9B4@bastion.fedoraproject.org>

Package nssbackup in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nssbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:35:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:35:57 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091219203554.CC1A710F9B4@bastion.fedoraproject.org>

Package peppy in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Sat Dec 19 20:35:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:35:59 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091219203557.0311010F9B4@bastion.fedoraproject.org>

Package peppy in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Sat Dec 19 20:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:36:00 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091219203557.9033A10F9B3@bastion.fedoraproject.org>

Package peppy in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Sat Dec 19 20:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:36:03 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091219203600.90FF010F9B4@bastion.fedoraproject.org>

Package python-rabbyt in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From pkgdb at fedoraproject.org  Sat Dec 19 20:36:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:36:05 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091219203602.8862F10F9B4@bastion.fedoraproject.org>

Package python-rabbyt in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From pkgdb at fedoraproject.org  Sat Dec 19 20:36:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:36:06 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091219203603.CFFC710F9B3@bastion.fedoraproject.org>

Package python-rabbyt in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From pkgdb at fedoraproject.org  Sat Dec 19 20:36:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:36:37 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091219203635.A463210F9B4@bastion.fedoraproject.org>

Package peppy in Fedora 12 is now owned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Sat Dec 19 20:36:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:36:42 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091219203640.2E38C10F9B4@bastion.fedoraproject.org>

Package peppy in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Sat Dec 19 20:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:37:56 +0000
Subject: [pkgdb] tor ownership updated
Message-ID: <20091219203753.EB94510F91C@bastion.fedoraproject.org>

Package tor in Fedora EPEL 5 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tor



From pkgdb at fedoraproject.org  Sat Dec 19 20:37:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:37:59 +0000
Subject: [pkgdb] vidalia ownership updated
Message-ID: <20091219203757.0415910F91C@bastion.fedoraproject.org>

Package vidalia in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vidalia



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:00 +0000
Subject: [pkgdb] vidalia ownership updated
Message-ID: <20091219203757.D0BBF10F91C@bastion.fedoraproject.org>

Package vidalia in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vidalia



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:02 +0000
Subject: [pkgdb] vidalia ownership updated
Message-ID: <20091219203759.EDEEC10F91C@bastion.fedoraproject.org>

Package vidalia in Fedora EPEL 5 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vidalia



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:02 +0000
Subject: [pkgdb] vidalia ownership updated
Message-ID: <20091219203800.7378310F8C9@bastion.fedoraproject.org>

Package vidalia in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vidalia



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:06 +0000
Subject: [pkgdb] xpad ownership updated
Message-ID: <20091219203804.0B3B910F91C@bastion.fedoraproject.org>

Package xpad in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xpad



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:08 +0000
Subject: [pkgdb] xpad ownership updated
Message-ID: <20091219203806.575A810F91C@bastion.fedoraproject.org>

Package xpad in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xpad



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:09 +0000
Subject: [pkgdb] xpad ownership updated
Message-ID: <20091219203807.48AC610F9B3@bastion.fedoraproject.org>

Package xpad in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xpad



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:11 +0000
Subject: [pkgdb] xpad ownership updated
Message-ID: <20091219203808.F046410F91C@bastion.fedoraproject.org>

Package xpad in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xpad



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:14 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091219203812.0777710F91C@bastion.fedoraproject.org>

Package xqf in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:17 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091219203815.0DA1610F972@bastion.fedoraproject.org>

Package xqf in Fedora 9 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:17 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091219203815.5410210F91C@bastion.fedoraproject.org>

Package xqf in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:19 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091219203817.3BC0910F96E@bastion.fedoraproject.org>

Package xqf in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:22 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091219203819.AC86D10F91C@bastion.fedoraproject.org>

Package xqf in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:49 +0000
Subject: [pkgdb] apt-mirror ownership updated
Message-ID: <20091219203847.0339410F91C@bastion.fedoraproject.org>

Package apt-mirror in Fedora 9 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt-mirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:38:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:38:51 +0000
Subject: [pkgdb] apt-mirror ownership updated
Message-ID: <20091219203849.31EE010F91C@bastion.fedoraproject.org>

Package apt-mirror in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt-mirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:39:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:39:34 +0000
Subject: [pkgdb] backintime ownership updated
Message-ID: <20091219203931.F3EFE10F91C@bastion.fedoraproject.org>

Package backintime in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backintime



From pkgdb at fedoraproject.org  Sat Dec 19 20:39:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:39:56 +0000
Subject: [pkgdb] barrage ownership updated
Message-ID: <20091219203953.E37FA10F91C@bastion.fedoraproject.org>

Package barrage in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/barrage



From pkgdb at fedoraproject.org  Sat Dec 19 20:40:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:40:04 +0000
Subject: [pkgdb] bastet ownership updated
Message-ID: <20091219204001.DA59A10F91C@bastion.fedoraproject.org>

Package bastet in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bastet



From pkgdb at fedoraproject.org  Sat Dec 19 20:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:40:07 +0000
Subject: [pkgdb] bastet ownership updated
Message-ID: <20091219204004.95B2B10F96E@bastion.fedoraproject.org>

Package bastet in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bastet



From pkgdb at fedoraproject.org  Sat Dec 19 20:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:40:09 +0000
Subject: [pkgdb] bastet ownership updated
Message-ID: <20091219204006.9162D10F96E@bastion.fedoraproject.org>

Package bastet in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bastet



From pkgdb at fedoraproject.org  Sat Dec 19 20:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:40:11 +0000
Subject: [pkgdb] bastet ownership updated
Message-ID: <20091219204009.28B2D10F91C@bastion.fedoraproject.org>

Package bastet in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bastet



From pkgdb at fedoraproject.org  Sat Dec 19 20:40:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:40:16 +0000
Subject: [pkgdb] bauble ownership updated
Message-ID: <20091219204013.ADE9210F96E@bastion.fedoraproject.org>

Package bauble in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bauble



From pkgdb at fedoraproject.org  Sat Dec 19 20:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:40:23 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20091219204021.628C910F9B9@bastion.fedoraproject.org>

Package biniax in Fedora 9 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From pkgdb at fedoraproject.org  Sat Dec 19 20:40:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:40:24 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20091219204022.48ECE10F9C0@bastion.fedoraproject.org>

Package biniax in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From pkgdb at fedoraproject.org  Sat Dec 19 20:41:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:41:04 +0000
Subject: [pkgdb] fbpanel ownership updated
Message-ID: <20091219204102.5968C10F9C0@bastion.fedoraproject.org>

Package fbpanel in Fedora 9 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbpanel



From pkgdb at fedoraproject.org  Sat Dec 19 20:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:41:06 +0000
Subject: [pkgdb] fbpanel ownership updated
Message-ID: <20091219204104.10C5F10F9C0@bastion.fedoraproject.org>

Package fbpanel in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbpanel



From pkgdb at fedoraproject.org  Sat Dec 19 20:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:41:11 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091219204109.1CCA210F9C1@bastion.fedoraproject.org>

Package griv in Fedora 9 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Sat Dec 19 20:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:41:11 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091219204109.7B5A710F9BE@bastion.fedoraproject.org>

Package griv in Fedora 8 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Sat Dec 19 20:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:41:12 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091219204110.29FED10F9C1@bastion.fedoraproject.org>

Package griv in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:12 +0000
Subject: [pkgdb] libwps ownership updated
Message-ID: <20091219204209.CE1E210F9C1@bastion.fedoraproject.org>

Package libwps in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwps



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:16 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091219204214.0CC7710F9C1@bastion.fedoraproject.org>

Package peppy in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:19 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091219204216.F401C10F9C3@bastion.fedoraproject.org>

Package python-rabbyt in Fedora 9 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:19 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091219204217.7ABE910F9C8@bastion.fedoraproject.org>

Package python-rabbyt in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:26 +0000
Subject: [pkgdb] sbackup ownership updated
Message-ID: <20091219204224.65A0910F9C8@bastion.fedoraproject.org>

Package sbackup in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:26 +0000
Subject: [pkgdb] sbackup ownership updated
Message-ID: <20091219204224.CB0A610F9C7@bastion.fedoraproject.org>

Package sbackup in Fedora devel was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:27 +0000
Subject: [pkgdb] sbackup ownership updated
Message-ID: <20091219204225.6337910F9C8@bastion.fedoraproject.org>

Package sbackup in Fedora 9 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:29 +0000
Subject: [pkgdb] sbackup ownership updated
Message-ID: <20091219204226.9678610F9C8@bastion.fedoraproject.org>

Package sbackup in Fedora EPEL 5 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:30 +0000
Subject: [pkgdb] sbackup ownership updated
Message-ID: <20091219204228.6AE9210F9C8@bastion.fedoraproject.org>

Package sbackup in Fedora 11 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:32 +0000
Subject: [pkgdb] sbackup ownership updated
Message-ID: <20091219204230.6C9A910F9C7@bastion.fedoraproject.org>

Package sbackup in Fedora 12 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sat Dec 19 20:42:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:42:38 +0000
Subject: [pkgdb] vidalia ownership updated
Message-ID: <20091219204236.5346C10F9C7@bastion.fedoraproject.org>

Package vidalia in Fedora 10 was orphaned by cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vidalia



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:44 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchbugzilla
Message-ID: <20091219205542.C880310F90E@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:46 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchcommits
Message-ID: <20091219205544.22B4F10F971@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:47 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up commit
Message-ID: <20091219205545.0BA4810F971@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:48 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up approveacls
Message-ID: <20091219205546.1FCFC10F90E@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on debmirror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:49 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchbugzilla
Message-ID: <20091219205547.3BC1210F978@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:50 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchcommits
Message-ID: <20091219205547.F36F210F9A2@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:50 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up commit
Message-ID: <20091219205548.7FD6610F99E@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:51 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up approveacls
Message-ID: <20091219205549.BBCB510F9A2@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on debmirror (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:52 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up commit
Message-ID: <20091219205550.C080310F9A6@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:52 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up approveacls
Message-ID: <20091219205550.4FF7110F978@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:53 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchcommits
Message-ID: <20091219205551.D5CBB10F978@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:54 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchbugzilla
Message-ID: <20091219205552.E8DAD10F978@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on debmirror (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:56 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchbugzilla
Message-ID: <20091219205554.5198210F9B1@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:56 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchcommits
Message-ID: <20091219205554.5183910F9AF@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:57 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up commit
Message-ID: <20091219205555.E15F110F9B2@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:55:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:55:58 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up approveacls
Message-ID: <20091219205556.838F610F9AF@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on debmirror (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:00 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchbugzilla
Message-ID: <20091219205558.23E0E10F9AF@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:01 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchcommits
Message-ID: <20091219205559.6461E10F9DE@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:02 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up commit
Message-ID: <20091219205600.525CC10F9DE@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:03 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up approveacls
Message-ID: <20091219205601.4F19010F9DF@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on debmirror (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:04 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchbugzilla
Message-ID: <20091219205602.0437610F9E4@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:05 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up commit
Message-ID: <20091219205603.A714310F9DF@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:05 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchcommits
Message-ID: <20091219205603.17C7110F9E3@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:06 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up approveacls
Message-ID: <20091219205604.A2B5010F9DF@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on debmirror (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:08 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchbugzilla
Message-ID: <20091219205606.3C10710F9EA@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on debmirror (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:09 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up watchcommits
Message-ID: <20091219205606.D0A8710F9E9@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on debmirror (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:10 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up commit
Message-ID: <20091219205608.663A410F9EF@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on debmirror (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:11 +0000
Subject: [pkgdb] debmirror: cassmodiah has given up approveacls
Message-ID: <20091219205609.02A6410F9F1@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on debmirror (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debmirror



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:48 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up watchbugzilla
Message-ID: <20091219205646.73A5B10F9F3@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on libwpg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:49 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up watchcommits
Message-ID: <20091219205647.239F310F9F1@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on libwpg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:51 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up approveacls
Message-ID: <20091219205648.DA67110F9F0@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on libwpg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:51 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up commit
Message-ID: <20091219205649.6437510F9F1@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on libwpg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:53 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up watchbugzilla
Message-ID: <20091219205651.702AE10F9F0@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on libwpg (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:54 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up watchcommits
Message-ID: <20091219205652.87F4A10F9F9@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on libwpg (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:55 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up commit
Message-ID: <20091219205653.9E0FA10F9F9@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on libwpg (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:55 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up approveacls
Message-ID: <20091219205653.807FF10F9F5@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on libwpg (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:57 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up watchbugzilla
Message-ID: <20091219205655.93CA810F9F0@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on libwpg (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:58 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up watchcommits
Message-ID: <20091219205655.D4ECE10F9F3@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on libwpg (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:58 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up commit
Message-ID: <20091219205656.59D3310F9F9@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on libwpg (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:56:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:56:59 +0000
Subject: [pkgdb] libwpg: cassmodiah has given up approveacls
Message-ID: <20091219205657.7327710F9F3@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on libwpg (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:41 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up commit
Message-ID: <20091219205739.48CEA10FA02@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on moon-buggy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:43 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up approveacls
Message-ID: <20091219205740.DFD5810FA04@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on moon-buggy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:43 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up approveacls
Message-ID: <20091219205741.D6D5E10F9F5@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on moon-buggy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:46 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchcommits
Message-ID: <20091219205744.1B0AB10F9F5@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on moon-buggy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:45 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up commit
Message-ID: <20091219205744.1B97F10FA04@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on moon-buggy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:46 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchbugzilla
Message-ID: <20091219205744.E42FB10FA0B@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on moon-buggy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:48 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchbugzilla
Message-ID: <20091219205746.58F0210FA03@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on moon-buggy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:39 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchbugzilla
Message-ID: <20091219205737.3D00A10F9F0@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on moon-buggy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:40 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchcommits
Message-ID: <20091219205738.687D610F9F3@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on moon-buggy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:49 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchcommits
Message-ID: <20091219205746.E8CE010FA0E@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on moon-buggy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:49 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up commit
Message-ID: <20091219205747.534F010FA0D@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on moon-buggy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:50 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up approveacls
Message-ID: <20091219205748.394E610FA03@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on moon-buggy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:50 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up approveacls
Message-ID: <20091219205748.E602010FA11@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on moon-buggy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:51 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up commit
Message-ID: <20091219205749.47E3F10FA02@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on moon-buggy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:53 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchbugzilla
Message-ID: <20091219205751.0471610FA0D@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on moon-buggy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:53 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchbugzilla
Message-ID: <20091219205751.0632B10FA14@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on moon-buggy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:54 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchcommits
Message-ID: <20091219205752.5C0C610FA0C@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on moon-buggy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:55 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up commit
Message-ID: <20091219205753.56B9810FA02@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on moon-buggy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:55 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up approveacls
Message-ID: <20091219205753.97FFE10FA12@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on moon-buggy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:56 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchbugzilla
Message-ID: <20091219205754.514EB10FA02@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on moon-buggy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:57 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchcommits
Message-ID: <20091219205754.E16F310FA12@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on moon-buggy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:58 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up approveacls
Message-ID: <20091219205756.30D5B10FA02@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on moon-buggy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:59 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up commit
Message-ID: <20091219205757.051F310FA02@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on moon-buggy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:00 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up approveacls
Message-ID: <20091219205758.27E0910FA12@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on moon-buggy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:00 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up commit
Message-ID: <20091219205758.9033210FA1F@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on moon-buggy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:01 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchcommits
Message-ID: <20091219205759.28D6710FA12@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on moon-buggy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:02 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchbugzilla
Message-ID: <20091219205800.2335F10FA02@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on moon-buggy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:57:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:57:51 +0000
Subject: [pkgdb] moon-buggy: cassmodiah has given up watchcommits
Message-ID: <20091219205749.AD5E610FA14@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on moon-buggy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:27 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up watchbugzilla
Message-ID: <20091219205825.B968810FA12@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on sylpheed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:30 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up watchcommits
Message-ID: <20091219205829.6009C10FA22@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on sylpheed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:31 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up commit
Message-ID: <20091219205829.B65B510FA12@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on sylpheed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:33 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up approveacls
Message-ID: <20091219205831.C1DAD10FA12@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on sylpheed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:35 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up watchbugzilla
Message-ID: <20091219205833.B2C7910FA12@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on sylpheed (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:38 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up approveacls
Message-ID: <20091219205836.B858F10FA33@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on sylpheed (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:38 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up commit
Message-ID: <20091219205836.9108810FA31@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on sylpheed (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:37 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up watchcommits
Message-ID: <20091219205836.6569610FA39@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on sylpheed (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:40 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up approveacls
Message-ID: <20091219205838.88FB010FA31@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on sylpheed (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:40 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up commit
Message-ID: <20091219205839.0768010FA43@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on sylpheed (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:42 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up watchcommits
Message-ID: <20091219205840.6D79510FA43@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on sylpheed (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:42 +0000
Subject: [pkgdb] sylpheed: cassmodiah has given up watchbugzilla
Message-ID: <20091219205841.3C11510FA43@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on sylpheed (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Sat Dec 19 20:58:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:58:59 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219205857.3722A10FA39@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:00 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up commit
Message-ID: <20091219205858.3760810FA4F@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:01 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up approveacls
Message-ID: <20091219205858.A37A610FA50@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on bareftp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:02 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up approveacls
Message-ID: <20091219205859.CABA110FA26@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:04 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up commit
Message-ID: <20091219205901.8F9AF10FA43@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:04 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219205902.57B8E10FA56@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:06 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchbugzilla
Message-ID: <20091219205903.A644F10FA54@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on bareftp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:06 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219205904.76C7210FA5A@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:08 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up commit
Message-ID: <20091219205905.A402D10FA58@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on bareftp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:08 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up approveacls
Message-ID: <20091219205906.2D0BA10FA5B@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on bareftp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:09 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up approveacls
Message-ID: <20091219205907.1AC5010FA5B@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on bareftp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:10 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up commit
Message-ID: <20091219205908.1CB3410FA5B@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on bareftp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:11 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219205908.EF9FC10FA62@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:11 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchbugzilla
Message-ID: <20091219205909.6E61010FA5B@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on bareftp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:13 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up watchcommits
Message-ID: <20091219205911.24AAC10FA5A@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:15 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up commit
Message-ID: <20091219205912.D2BC810FA5A@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 20:59:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 20:59:15 +0000
Subject: [pkgdb] bareftp: cassmodiah has given up approveacls
Message-ID: <20091219205913.64F0010FA6C@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on bareftp (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bareftp



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:40 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchbugzilla
Message-ID: <20091219210038.876F410FA70@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on pnglite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:41 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchbugzilla
Message-ID: <20091219210039.038CE10FA71@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on pnglite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:42 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up commit
Message-ID: <20091219210040.7F86910FA72@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on pnglite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:42 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchcommits
Message-ID: <20091219210040.C5F6410FA7F@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on pnglite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:45 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up approveacls
Message-ID: <20091219210043.3537610FA70@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on pnglite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:30 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchbugzilla
Message-ID: <20091219210028.90A7610FA70@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on pnglite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:31 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchcommits
Message-ID: <20091219210030.3B8DC10FA71@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on pnglite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:33 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up commit
Message-ID: <20091219210031.2A3B310FA70@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on pnglite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:35 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up approveacls
Message-ID: <20091219210033.61DD810FA77@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on pnglite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:36 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up approveacls
Message-ID: <20091219210033.E991610FA72@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on pnglite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:38 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up commit
Message-ID: <20091219210036.1E3C410FA70@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on pnglite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:38 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchcommits
Message-ID: <20091219210036.B841110FA71@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on pnglite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:45 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchbugzilla
Message-ID: <20091219210043.BD13110FA72@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on pnglite (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:48 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchcommits
Message-ID: <20091219210046.6671B10FA72@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on pnglite (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:49 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up commit
Message-ID: <20091219210047.AE18410FA7D@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on pnglite (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:50 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up approveacls
Message-ID: <20091219210048.4F24C10FA72@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on pnglite (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:51 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchbugzilla
Message-ID: <20091219210049.C372710FA7D@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on pnglite (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:52 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchcommits
Message-ID: <20091219210050.357E210FA72@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on pnglite (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:53 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up commit
Message-ID: <20091219210050.F1C5210FA82@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on pnglite (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:54 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up approveacls
Message-ID: <20091219210052.384A610FA72@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on pnglite (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:54 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up approveacls
Message-ID: <20091219210052.EA56210FA88@bastion.fedoraproject.org>

cassmodiah has given up the approveacls acl on pnglite (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:54 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up commit
Message-ID: <20091219210052.E8D3C10FA82@bastion.fedoraproject.org>

cassmodiah has given up the commit acl on pnglite (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:57 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchcommits
Message-ID: <20091219210055.65CF910FA72@bastion.fedoraproject.org>

cassmodiah has given up the watchcommits acl on pnglite (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From pkgdb at fedoraproject.org  Sat Dec 19 21:00:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 21:00:58 +0000
Subject: [pkgdb] pnglite: cassmodiah has given up watchbugzilla
Message-ID: <20091219210056.34A0210FA72@bastion.fedoraproject.org>

cassmodiah has given up the watchbugzilla acl on pnglite (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pnglite



From dcantrel at fedoraproject.org  Sat Dec 19 22:12:49 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 19 Dec 2009 22:12:49 +0000 (UTC)
Subject: File pyparted-2.5.tar.gz uploaded to lookaside cache by dcantrel
Message-ID: <20091219221249.E532610F99C@bastion.fedoraproject.org>

A file has been added to the lookaside cache for pyparted:

af74247bbe7cd13ef263f4b450d21854  pyparted-2.5.tar.gz



From pkgdb at fedoraproject.org  Sat Dec 19 22:26:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 22:26:43 +0000
Subject: [pkgdb] xpad ownership updated
Message-ID: <20091219222640.E5A0E10F903@bastion.fedoraproject.org>

Package xpad in Fedora 11 is now owned by cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xpad



From pkgdb at fedoraproject.org  Sat Dec 19 22:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 19 Dec 2009 22:26:59 +0000
Subject: [pkgdb] xpad ownership updated
Message-ID: <20091219222656.BBC6310F990@bastion.fedoraproject.org>

Package xpad in Fedora 12 is now owned by cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xpad



From dcantrel at fedoraproject.org  Sat Dec 19 22:37:23 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 19 Dec 2009 22:37:23 +0000 (UTC)
Subject: rpms/pyparted/devel .cvsignore, 1.39, 1.40 pyparted.spec, 1.71,
	1.72 sources, 1.44, 1.45
Message-ID: <20091219223723.AEF3E11C00E6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/pyparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14539

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Sat Dec 19 2009 David Cantrell <dcantrell at redhat.com> - 2.5-1
- Update release instructions. (dcantrell)
- Remove old cylinder alignment test cases for _ped. (dcantrell)
- Add tests for max partition length / start sector (hdegoede)
- Add _pedmodule and parted functions for max partition length / start
  sector (hdegoede)
- Remove align_to_cylinders function bindings (hdegoede)
- Add tests for disk flag methods (hdegoede)
- Add _pedmodule and parted functions for per disk flags (hdegoede)
- Every tuple member requires a comma after it. (dcantrell)
- Fill out a lot of simple _ped.Disk test cases. (dcantrell)
- Disable DeviceDestroyTestCase for now. (dcantrell)
- Add RequiresLabeledDevice to tests/_ped/baseclass.py. (dcantrell)
- Attempt at fixing _ped.Device.destroy(), no dice. (dcantrell)
- Fix UnitFormatCustomTestCase and UnitFormatTestCase. (dcantrell)
- Fix UnitFormatCustomByteTestCase and UnitFormatByteTestCase. (dcantrell)
- Add DeviceStrTestCase, disable DeviceDestroyTestCase. (dcantrell)
- Add DeviceDestroyTestCase and DeviceCacheRemoveTestCase. (dcantrell)
- Implemented ConstraintIsSolutionTestCase(). (dcantrell)
- Implement ConstraintSolveMaxTestCase(). (dcantrell)
- Implement ConstraintSolveNearestTestCase(). (dcantrell)
- Correct py_ped_file_system_probe_specific() for NULL returns. (dcantrell)
- Implement FileSystemProbeSpecificTestCase(). (dcantrell)
- Implement FileSystemProbeTestCase(). (dcantrell)
- Add RequiresFileSystem to tests/_ped/baseclass.py. (dcantrell)
- Add disk alignment test cases in test_ped.py. (dcantrell)
- Fix CHSGeometryStrTestCase(). (dcantrell)
- Fix ConstraintDuplicateTestCase...finally. (dcantrell)
- Put a deprecation warning in py_ped_constraint_duplicate(). (dcantrell)
- Note that we need parted from Fedora for pyparted. (dcantrell)
- Fix UnitGetSizeTestCase in _ped test cases for _ped.UNIT_PERCENT.
  (dcantrell)
- Add testcase for new _ped disk get_partition_alignment method (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	7 Nov 2009 02:13:05 -0000	1.39
+++ .cvsignore	19 Dec 2009 22:37:23 -0000	1.40
@@ -1 +1,2 @@
 pyparted-2.4.tar.gz
+pyparted-2.5.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- pyparted.spec	7 Nov 2009 02:13:05 -0000	1.71
+++ pyparted.spec	19 Dec 2009 22:37:23 -0000	1.72
@@ -2,7 +2,7 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 2.4
+Version: 2.5
 Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
@@ -12,7 +12,7 @@ Source0: http://fedorahosted.org/release
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel
-BuildRequires: parted-devel >= 1.9.0-20
+BuildRequires: parted-devel >= 1.9.0-24
 BuildRequires: pkgconfig
 BuildRequires: python-decorator
 
@@ -44,6 +44,40 @@ partition tables.
 %{python_sitearch}/parted
 
 %changelog
+* Sat Dec 19 2009 David Cantrell <dcantrell at redhat.com> - 2.5-1
+- Update release instructions. (dcantrell)
+- Remove old cylinder alignment test cases for _ped. (dcantrell)
+- Add tests for max partition length / start sector (hdegoede)
+- Add _pedmodule and parted functions for max partition length / start
+  sector (hdegoede)
+- Remove align_to_cylinders function bindings (hdegoede)
+- Add tests for disk flag methods (hdegoede)
+- Add _pedmodule and parted functions for per disk flags (hdegoede)
+- Every tuple member requires a comma after it. (dcantrell)
+- Fill out a lot of simple _ped.Disk test cases. (dcantrell)
+- Disable DeviceDestroyTestCase for now. (dcantrell)
+- Add RequiresLabeledDevice to tests/_ped/baseclass.py. (dcantrell)
+- Attempt at fixing _ped.Device.destroy(), no dice. (dcantrell)
+- Fix UnitFormatCustomTestCase and UnitFormatTestCase. (dcantrell)
+- Fix UnitFormatCustomByteTestCase and UnitFormatByteTestCase. (dcantrell)
+- Add DeviceStrTestCase, disable DeviceDestroyTestCase. (dcantrell)
+- Add DeviceDestroyTestCase and DeviceCacheRemoveTestCase. (dcantrell)
+- Implemented ConstraintIsSolutionTestCase(). (dcantrell)
+- Implement ConstraintSolveMaxTestCase(). (dcantrell)
+- Implement ConstraintSolveNearestTestCase(). (dcantrell)
+- Correct py_ped_file_system_probe_specific() for NULL returns. (dcantrell)
+- Implement FileSystemProbeSpecificTestCase(). (dcantrell)
+- Implement FileSystemProbeTestCase(). (dcantrell)
+- Add RequiresFileSystem to tests/_ped/baseclass.py. (dcantrell)
+- Add disk alignment test cases in test_ped.py. (dcantrell)
+- Fix CHSGeometryStrTestCase(). (dcantrell)
+- Fix ConstraintDuplicateTestCase...finally. (dcantrell)
+- Put a deprecation warning in py_ped_constraint_duplicate(). (dcantrell)
+- Note that we need parted from Fedora for pyparted. (dcantrell)
+- Fix UnitGetSizeTestCase in _ped test cases for _ped.UNIT_PERCENT.
+  (dcantrell)
+- Add testcase for new _ped disk get_partition_alignment method (hdegoede)
+
 * Fri Nov 06 2009 David Cantrell <dcantrell at redhat.com> - 2.4-1
 - Upgrade to pyparted-2.4:
       Use PedDevice length instead of DIY (#532023) (hdegoede)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	7 Nov 2009 02:13:05 -0000	1.44
+++ sources	19 Dec 2009 22:37:23 -0000	1.45
@@ -1 +1,2 @@
 f244958142c9fd3ff5ee95f578e2f76d  pyparted-2.4.tar.gz
+af74247bbe7cd13ef263f4b450d21854  pyparted-2.5.tar.gz



From dcantrel at fedoraproject.org  Sat Dec 19 22:49:31 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 19 Dec 2009 22:49:31 +0000 (UTC)
Subject: rpms/pyparted/devel .cvsignore, 1.40, 1.41 pyparted.spec, 1.72,
	1.73 sources, 1.45, 1.46
Message-ID: <20091219224931.E503611C00E6@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/pyparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16488

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Sat Dec 19 2009 David Cantrell <dcantrell at redhat.com> - 2.5-2
- Exclude pyparted-2.4.tar.gz from source RPM (oops)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	19 Dec 2009 22:37:23 -0000	1.40
+++ .cvsignore	19 Dec 2009 22:49:30 -0000	1.41
@@ -1,2 +1 @@
-pyparted-2.4.tar.gz
 pyparted-2.5.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- pyparted.spec	19 Dec 2009 22:37:23 -0000	1.72
+++ pyparted.spec	19 Dec 2009 22:49:30 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Python module for GNU parted
 Name:    pyparted
 Version: 2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     http://fedorahosted.org/pyparted
@@ -44,6 +44,9 @@ partition tables.
 %{python_sitearch}/parted
 
 %changelog
+* Sat Dec 19 2009 David Cantrell <dcantrell at redhat.com> - 2.5-2
+- Exclude pyparted-2.4.tar.gz from source RPM (oops)
+
 * Sat Dec 19 2009 David Cantrell <dcantrell at redhat.com> - 2.5-1
 - Update release instructions. (dcantrell)
 - Remove old cylinder alignment test cases for _ped. (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	19 Dec 2009 22:37:23 -0000	1.45
+++ sources	19 Dec 2009 22:49:30 -0000	1.46
@@ -1,2 +1 @@
-f244958142c9fd3ff5ee95f578e2f76d  pyparted-2.4.tar.gz
 af74247bbe7cd13ef263f4b450d21854  pyparted-2.5.tar.gz



From rrankin at fedoraproject.org  Sat Dec 19 23:03:23 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sat, 19 Dec 2009 23:03:23 +0000 (UTC)
Subject: rpms/gtk+extra/devel gtk+extra-2.1.1-gtk2.18.patch, NONE,
	1.1 gtk+extra.spec, 1.15, 1.16
Message-ID: <20091219230323.ABEC911C00E6@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gtk+extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18870

Modified Files:
	gtk+extra.spec 
Added Files:
	gtk+extra-2.1.1-gtk2.18.patch 
Log Message:
Patch to stop crashes with gtk+ 2.18


gtk+extra-2.1.1-gtk2.18.patch:
 gtkitementry.c |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 gtksheet.c     |    2 -
 2 files changed, 57 insertions(+), 3 deletions(-)

--- NEW FILE gtk+extra-2.1.1-gtk2.18.patch ---
diff --git a/gtkextra/gtkitementry.c b/gtkextra/gtkitementry.c
index 6a42880..377c4ea 100644
--- a/gtkextra/gtkitementry.c
+++ b/gtkextra/gtkitementry.c
@@ -170,6 +170,26 @@ static void         get_widget_window_size             (GtkEntry       *entry,
 
 static GtkEntryClass *parent_class = NULL;
 
+#ifdef GTK_TYPE_ENTRY_BUFFER
+// In GTK+ 2.18, changes were made to GtkEntry. This caused gtk+extra
+// to crash. So from 2.18 call the appropriate buffer routines in GTK+
+// gtk/gtkentrybuffer.c. 
+//
+// rrankin AT ihug DOT com DOT au 21/12/09
+//
+typedef struct _GtkEntryPrivate GtkEntryPrivate;
+
+struct _GtkEntryPrivate
+{
+  GtkEntryBuffer* buffer;
+  // The remainder of this structure has been truncated 
+
+};
+
+#define GTK_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ENTRY, GtkEntryPrivate))
+
+#endif
+
 GtkType
 gtk_item_entry_get_type (void)
 {
@@ -670,6 +690,27 @@ gtk_entry_get_position (GtkEditable *editable)
   return GTK_ENTRY (editable)->current_pos;
 }
 
+#ifdef GTK_TYPE_ENTRY_BUFFER
+//
+// Get_buffer copied from gtk/gtkentry.c
+//
+static GtkEntryBuffer*
+get_buffer (GtkEntry *entry)
+{
+  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+  if (priv->buffer == NULL)
+    {
+      GtkEntryBuffer *buffer;
+      buffer = gtk_entry_buffer_new (NULL, 0);
+      gtk_entry_set_buffer (entry, buffer);
+      g_object_unref (buffer);
+    }
+
+  return priv->buffer;
+}
+
+#endif //GTK_TYPE_ENTRY_BUFFER
 
 /* Default signal handlers
  */
@@ -679,7 +720,6 @@ gtk_entry_real_insert_text (GtkEditable *editable,
 			    gint         new_text_length,
 			    gint        *position)
 {
-  gint index;
   gint n_chars;
 
   GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
@@ -696,6 +736,11 @@ gtk_entry_real_insert_text (GtkEditable *editable,
       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
     }
 
+#ifdef GTK_TYPE_ENTRY_BUFFER
+   GtkEntryBuffer *buffer = get_buffer(entry);
+   n_chars  = gtk_entry_buffer_insert_text(buffer, *position, new_text, new_text_length);
+#else
+
   if (new_text_length + ientry->item_n_bytes + 1 > ientry->item_text_size)
     {
       while (new_text_length + ientry->item_n_bytes + 1 > ientry->item_text_size)
@@ -724,10 +769,12 @@ gtk_entry_real_insert_text (GtkEditable *editable,
       entry->text = g_realloc (entry->text, ientry->item_text_size);
     }
 
+  gint index;
   index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
 
   g_memmove (entry->text + index + new_text_length, entry->text + index, ientry->item_n_bytes - index);
   memcpy (entry->text + index, new_text, new_text_length);
+#endif //GTK_TYPE_ENTRY_BUFFER
 
   ientry->item_n_bytes += new_text_length;
   entry->text_length += n_chars;
@@ -755,7 +802,6 @@ gtk_entry_real_delete_text (GtkEditable *editable,
 			    gint         end_pos)
 {
   GtkEntry *entry = GTK_ENTRY (editable);
-  GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
 
   if (start_pos < 0)
     start_pos = 0;
@@ -764,6 +810,11 @@ gtk_entry_real_delete_text (GtkEditable *editable,
   
   if (start_pos < end_pos)
     {
+#ifdef GTK_TYPE_ENTRY_BUFFER
+      GtkEntryBuffer *buffer = get_buffer(entry);
+      gtk_entry_buffer_delete_text (buffer, start_pos, end_pos-start_pos);
+#else
+      GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
       gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
       gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
 
@@ -776,6 +827,7 @@ gtk_entry_real_delete_text (GtkEditable *editable,
 
       if (entry->selection_bound > start_pos)
 	entry->selection_bound -= MIN (entry->selection_bound, end_pos) - start_pos;
+#endif // GTK_TYPE_ENTRY_BUFFER
       /* We might have deleted the selection
        */
       gtk_entry_update_primary_selection (entry);
@@ -863,6 +915,7 @@ gtk_entry_move_cursor (GtkEntry       *entry,
 	case GTK_MOVEMENT_DISPLAY_LINES:
 	case GTK_MOVEMENT_PARAGRAPHS:
 	case GTK_MOVEMENT_PAGES:
+	case GTK_MOVEMENT_HORIZONTAL_PAGES:
 	  break;
 	}
     }
@@ -896,6 +949,7 @@ gtk_entry_move_cursor (GtkEntry       *entry,
 	case GTK_MOVEMENT_DISPLAY_LINES:
 	case GTK_MOVEMENT_PARAGRAPHS:
 	case GTK_MOVEMENT_PAGES:
+	case GTK_MOVEMENT_HORIZONTAL_PAGES:
 	  break;
 	}
     }
diff --git a/gtkextra/gtksheet.c b/gtkextra/gtksheet.c
index 10ab5f0..d3d96e3 100644
--- a/gtkextra/gtksheet.c
+++ b/gtkextra/gtksheet.c
@@ -6951,7 +6951,7 @@ draw_xor_rectangle(GtkSheet *sheet, GtkSheetRange range)
 
    gdk_gc_set_clip_rectangle(sheet->xor_gc, &clip_area);
 
-   for(i=-1;i<=1;i=++i)
+   for(i=-1;i<=1;i++)
      gdk_draw_rectangle(sheet->sheet_window,
                         sheet->xor_gc,
 		        FALSE,


Index: gtk+extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+extra/devel/gtk+extra.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gtk+extra.spec	1 Aug 2009 00:13:30 -0000	1.15
+++ gtk+extra.spec	19 Dec 2009 23:03:23 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		gtk+extra
 Version:	2.1.1
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	A library of gtk+ widgets
 Summary(fr):	Une biblioth?que de widgets gtk+
 
@@ -11,6 +11,7 @@ Source:		http://dl.sf.net/scigraphica/gt
 Patch:		%{name}-%{version}.g_free.diff
 Patch1:		%{name}-%{version}-deleterow.patch
 Patch2:		%{name}-%{version}-item.patch
+Patch3:		%{name}-%{version}-gtk2.18.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
@@ -49,6 +50,7 @@ qui utilisent les widgets gtk+extra.
 %patch -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-13
+- Fix crash issue with gtk2-2.18 BZ 546648
+
 * Sat Aug 01 2009 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-12
 - Patch to compile with gtk2-2.17.5
 



From cwickert at fedoraproject.org  Sat Dec 19 23:25:38 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 19 Dec 2009 23:25:38 +0000 (UTC)
Subject: File lxmusic-0.4.1.tar.gz uploaded to lookaside cache by cwickert
Message-ID: <20091219232538.D4AB310F8EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for lxmusic:

b5bfde825f642981d7aa2dfa2166bf1a  lxmusic-0.4.1.tar.gz



From jussilehtola at fedoraproject.org  Sat Dec 19 23:28:26 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 19 Dec 2009 23:28:26 +0000 (UTC)
Subject: rpms/towhee/devel towhee.spec,1.8,1.9
Message-ID: <20091219232826.79C9311C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/towhee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22962

Modified Files:
	towhee.spec 
Log Message:
Update to 6.2.7 and adopt MPI guidelines.


Index: towhee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/devel/towhee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- towhee.spec	23 Oct 2009 11:03:22 -0000	1.8
+++ towhee.spec	19 Dec 2009 23:28:25 -0000	1.9
@@ -1,13 +1,12 @@
 Name:		towhee
-Version:	6.2.6
-Release:	4%{?dist}
+Version:	6.2.7
+Release:	1%{?dist}
 Summary:	A Monte Carlo molecular simulation code
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://towhee.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Provides:	towhee-executable = %{version}-%{release}
 Requires:	towhee-common = %{version}-%{release}
 
 # Bug 502883
@@ -18,32 +17,6 @@ ExcludeArch:	ppc64
 BuildRequires:	gcc-gfortran
 BuildRequires:	openmpi-devel
 
-# Check for mpi-selector or environment-modules
-%global selector 0
-%global modules 0
-
-%if 0%{?fedora} > 9
-%global modules 1
-%endif
-
-%if 0%{?rhel} == 4
-%global selector 1
-%endif
-
-%if 0%{?rhel} == 5
-%global selector 1
-%endif
-
-%if %modules == 1
-BuildRequires:	environment-modules
-%endif
-
-%if %selector == 1
-BuildRequires:	mpi-selector
-%endif
-
-# End MPI requires section
-
 %description
 Towhee is a Monte Carlo molecular simulation code originally designed for the
 prediction of fluid phase equilibria using atom-based force fields and the
@@ -58,24 +31,38 @@ N.B. Due to some general names the utili
 analyse_movie is now towhee-analyse_movie.
 
 
-%package mpi
-Summary:	Towhee, MPI version
+%package openmpi
+Summary:	Towhee, Open MPI version
 Group:		Applications/Engineering
-Provides:	towhee-executable = %{version}-%{release}
 Requires:	towhee-common = %{version}-%{release}
+Obsoletes:	towhee-mpi < %{version}-%{release}
+Provides:	towhee-mpi = %{version}-%{release}
+Requires:	openmpi
+
+%description openmpi
+This package contains MPI enabled binaries of Towhee, compiled against
+Open MPI.
+
+If you want the analysis tools, install the towhee package.
+
+%package mpich2
+Summary:        Towhee, Open MPI version
+Group:          Applications/Engineering
+Requires:       towhee-common = %{version}-%{release}
+Requires:       mpich2
+
+%description mpich2
+This package contains MPI enabled binaries of Towhee, compiled against MPICH2.
 
-%description mpi
-This package contains the MPI enabled binaries of Towhee.
+If you want the analysis tools, install the towhee package.
 
 
 %package common
 Summary:	Towhee common files
 Group:		Applications/Engineering
 # So that the package gets removed with the binaries
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
+Requires:	%{name} = %{version}-%{release}
 BuildArch:	noarch
-%endif
 
 %description common
 This package contains files needed for operation of Towhee.
@@ -83,11 +70,7 @@ This package contains files needed for o
 %package doc
 Summary:	Towhee manual
 Group:		Applications/Engineering
-# So that the package gets removed with the binaries
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
 BuildArch:	noarch
-%endif
 
 %description doc
 This package contains the HTML manual for Towhee.
@@ -95,16 +78,11 @@ This package contains the HTML manual fo
 %package examples
 Summary:	Towhee examples
 Group:		Applications/Engineering
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
 BuildArch:	noarch
-%endif
 
 %description examples
 This package contains examples for Towhee operation.
 
-
-
 %prep
 %setup -q
 # Fix Force field locations in examples
@@ -133,34 +111,34 @@ cd ..
 
 cd ..
 
-## Build parallel version
-# Load MPI enviroment
-
-%if %modules == 1
-#. /etc/profile.d/modules.sh
-module load openmpi-%{_arch}
-export CFLAGS="%{optflags}"
-%endif
-
-%if %selector == 1
-# Set MPI environment
-mpi-selector --set `mpi-selector --list | grep openmpi`
-source /etc/profile.d/mpi-selector.sh
-%endif
-
+## Build parallel versions
 # Use mpif90 to build
 export F77=mpif90
-mkdir mpi
-cd mpi
+
+%{_openmpi_load}
+mkdir openmpi
+cd openmpi
+ln -s ../configure .
+%configure --enable-mpi --program-suffix=${MPI_SUFFIX}
+make %{?_smp_mflags}
+cd ..
+%{_openmpi_unload}
+
+%{_mpich2_load}
+mkdir mpich2
+cd mpich2
 ln -s ../configure .
-%configure --enable-mpi --program-suffix=-mpi
+%configure --enable-mpi --program-suffix=${MPI_SUFFIX}
 make %{?_smp_mflags}
 cd ..
+%{_mpich2_unload}
+
 
 %install
 rm -rf %{buildroot} 
 # Install binaries
-make -C mpi install DESTDIR=%{buildroot} INSTALL="install -p"
+make -C openmpi install DESTDIR=%{buildroot} bindir=%{_libdir}/openmpi/bin INSTALL="install -p"
+make -C mpich2 install DESTDIR=%{buildroot} bindir=%{_libdir}/mpich2/bin INSTALL="install -p"
 make -C nompi install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # Install force fields
@@ -174,16 +152,19 @@ find Examples/ -name "Makefile*" -exec r
 find Examples/ -type f -exec chmod 644 {} \;
 
 # Rename utilities
-for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}{,-mpi}; do
+for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}; do
  mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/towhee-$bin
 done
 # Remove mpi versions of the utilities
-rm %{buildroot}%{_bindir}/towhee-*-mpi
+for mpi in openmpi mpich2; do
+ for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}; do
+  rm %{buildroot}%{_libdir}/$mpi/bin/${bin}_${mpi}
+ done
+done
 
 %clean
 rm -rf %{buildroot} 
 
-
 %files
 %defattr(-,root,root,-)
 %doc license.gpl
@@ -192,11 +173,13 @@ rm -rf %{buildroot} 
 # Utils
 %{_bindir}/towhee-*
 
-%files mpi
+%files openmpi
 %defattr(-,root,root,-)
-%doc license.gpl
-%{_bindir}/forcefield-mpi
-%{_bindir}/towhee-mpi
+%{_libdir}/openmpi/bin/*_openmpi
+
+%files mpich2
+%defattr(-,root,root,-)
+%{_libdir}/mpich2/bin/*_mpich2
 
 %files common
 %defattr(-,root,root,-)
@@ -212,6 +195,9 @@ rm -rf %{buildroot} 
 %doc Examples/*
 
 %changelog
+* Sat Dec 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.7-1
+- Adopt MPI guidelines, fixing FTBFS in rawhide.
+
 * Fri Oct 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.6-4
 - Fix FTBFS problem caused by behaviour change of openmpi.
 



From jussilehtola at fedoraproject.org  Sat Dec 19 23:29:20 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 19 Dec 2009 23:29:20 +0000 (UTC)
Subject: File towhee-6.2.7.tar.gz uploaded to lookaside cache by jussilehtola
Message-ID: <20091219232920.D85CB10F903@bastion.fedoraproject.org>

A file has been added to the lookaside cache for towhee:

5bc2922db7912a7dc6c6dccad1af6157  towhee-6.2.7.tar.gz



From jussilehtola at fedoraproject.org  Sat Dec 19 23:29:35 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 19 Dec 2009 23:29:35 +0000 (UTC)
Subject: rpms/towhee/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20091219232935.3783E11C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/towhee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23231

Modified Files:
	.cvsignore sources 
Log Message:
Update sources to 6.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Jul 2009 16:38:59 -0000	1.3
+++ .cvsignore	19 Dec 2009 23:29:35 -0000	1.4
@@ -1 +1 @@
-towhee-6.2.6.tar.gz
+towhee-6.2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 16:38:59 -0000	1.3
+++ sources	19 Dec 2009 23:29:35 -0000	1.4
@@ -1 +1 @@
-1ea66130962bd79d24b6671b285fdef4  towhee-6.2.6.tar.gz
+5bc2922db7912a7dc6c6dccad1af6157  towhee-6.2.7.tar.gz



From cwickert at fedoraproject.org  Sat Dec 19 23:46:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 19 Dec 2009 23:46:50 +0000 (UTC)
Subject: rpms/lxmusic/F-12 .cvsignore, 1.4, 1.5 lxmusic.spec, 1.6, 1.7 sources,
	1.4, 1.5 lxmusic-0.4.0-check-for-valid-playlist-positions.patch,
	1.1, NONE lxmusic-0.4.0-invalidate-cur_track_iter.patch, 1.1,
	NONE lxmusic-0.4.0-remove-cur_track_iter.patch, 1.1, NONE
Message-ID: <20091219234650.ED34311C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26335/F-12

Modified Files:
	.cvsignore lxmusic.spec sources 
Removed Files:
	lxmusic-0.4.0-check-for-valid-playlist-positions.patch 
	lxmusic-0.4.0-invalidate-cur_track_iter.patch 
	lxmusic-0.4.0-remove-cur_track_iter.patch 
Log Message:
* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
- New upstream release to fix #539729, so we drop the patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Sep 2009 22:48:41 -0000	1.4
+++ .cvsignore	19 Dec 2009 23:46:49 -0000	1.5
@@ -1 +1 @@
-lxmusic-0.4.0.tar.gz
+lxmusic-0.4.1.tar.gz


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-12/lxmusic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lxmusic.spec	16 Dec 2009 23:01:37 -0000	1.6
+++ lxmusic.spec	19 Dec 2009 23:46:49 -0000	1.7
@@ -1,20 +1,14 @@
 Name:           lxmusic
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
+# As long as there are no plugins, disable the Tools menu
 Patch0:         lxmusic-0.3.0-no-tools-menu.patch
-# Fixes for https://bugzilla.redhat.com/show_bug.cgi?id=539729
-# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2190
-Patch1:         lxmusic-0.4.0-invalidate-cur_track_iter.patch
-# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2191
-Patch2:         lxmusic-0.4.0-check-for-valid-playlist-positions.patch
-# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2195
-Patch3:         lxmusic-0.4.0-remove-cur_track_iter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.6
@@ -30,9 +24,6 @@ player of LXDE (Lightweight X11 Desktop 
 %prep
 %setup -q
 %patch0 -p1 -b .no-tools
-%patch1 -p2 -b .cur_track_iter
-%patch2 -p2 -b .playlist-positions
-%patch3 -p2 -b .cur_track_iter2
 
 
 %build
@@ -64,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
+- New upstream release to fix #539729, so we drop the patches
+
 * Wed Dec 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
 - Fix crash when emptying large playlists (#539729)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Sep 2009 22:48:41 -0000	1.4
+++ sources	19 Dec 2009 23:46:49 -0000	1.5
@@ -1 +1 @@
-744eebed9b44e3f744fe90f360a1af3c  lxmusic-0.4.0.tar.gz
+b5bfde825f642981d7aa2dfa2166bf1a  lxmusic-0.4.1.tar.gz


--- lxmusic-0.4.0-check-for-valid-playlist-positions.patch DELETED ---


--- lxmusic-0.4.0-invalidate-cur_track_iter.patch DELETED ---


--- lxmusic-0.4.0-remove-cur_track_iter.patch DELETED ---



From cwickert at fedoraproject.org  Sat Dec 19 23:46:51 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 19 Dec 2009 23:46:51 +0000 (UTC)
Subject: rpms/lxmusic/devel .cvsignore, 1.4, 1.5 lxmusic.spec, 1.7, 1.8 sources,
	1.4, 1.5 lxmusic-0.4.0-check-for-valid-playlist-positions.patch,
	1.1, NONE lxmusic-0.4.0-invalidate-cur_track_iter.patch, 1.1,
	NONE lxmusic-0.4.0-remove-cur_track_iter.patch, 1.1, NONE
Message-ID: <20091219234651.378EA11C00E7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26335/devel

Modified Files:
	.cvsignore lxmusic.spec sources 
Removed Files:
	lxmusic-0.4.0-check-for-valid-playlist-positions.patch 
	lxmusic-0.4.0-invalidate-cur_track_iter.patch 
	lxmusic-0.4.0-remove-cur_track_iter.patch 
Log Message:
* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
- New upstream release to fix #539729, so we drop the patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Sep 2009 22:48:41 -0000	1.4
+++ .cvsignore	19 Dec 2009 23:46:50 -0000	1.5
@@ -1 +1 @@
-lxmusic-0.4.0.tar.gz
+lxmusic-0.4.1.tar.gz


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/lxmusic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- lxmusic.spec	16 Dec 2009 22:53:44 -0000	1.7
+++ lxmusic.spec	19 Dec 2009 23:46:51 -0000	1.8
@@ -1,20 +1,14 @@
 Name:           lxmusic
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
+# As long as there are no plugins, disable the Tools menu
 Patch0:         lxmusic-0.3.0-no-tools-menu.patch
-# Fixes for https://bugzilla.redhat.com/show_bug.cgi?id=539729
-# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2190
-Patch1:         lxmusic-0.4.0-invalidate-cur_track_iter.patch
-# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2191
-Patch2:         lxmusic-0.4.0-check-for-valid-playlist-positions.patch
-# http://lxde.svn.sourceforge.net/viewvc/lxde?view=rev&revision=2195
-Patch3:         lxmusic-0.4.0-remove-cur_track_iter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.6
@@ -30,9 +24,6 @@ player of LXDE (Lightweight X11 Desktop 
 %prep
 %setup -q
 %patch0 -p1 -b .no-tools
-%patch1 -p2 -b .cur_track_iter
-%patch2 -p2 -b .playlist-positions
-%patch3 -p2 -b .cur_track_iter2
 
 
 %build
@@ -64,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
+- New upstream release to fix #539729, so we drop the patches
+
 * Wed Dec 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
 - Fix crash when emptying large playlists (#539729)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Sep 2009 22:48:41 -0000	1.4
+++ sources	19 Dec 2009 23:46:51 -0000	1.5
@@ -1 +1 @@
-744eebed9b44e3f744fe90f360a1af3c  lxmusic-0.4.0.tar.gz
+b5bfde825f642981d7aa2dfa2166bf1a  lxmusic-0.4.1.tar.gz


--- lxmusic-0.4.0-check-for-valid-playlist-positions.patch DELETED ---


--- lxmusic-0.4.0-invalidate-cur_track_iter.patch DELETED ---


--- lxmusic-0.4.0-remove-cur_track_iter.patch DELETED ---



From tgl at fedoraproject.org  Sat Dec 19 23:49:26 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Sat, 19 Dec 2009 23:49:26 +0000 (UTC)
Subject: rpms/unixODBC/devel enable-items.patch, NONE, 1.1 unixODBC.spec, 1.53,
	1.54
Message-ID: <20091219234926.585FF11C00E6@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/unixODBC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26938

Modified Files:
	unixODBC.spec 
Added Files:
	enable-items.patch 
Log Message:
Fix bug preventing drivers from being selected in ODBCConfig

enable-items.patch:
 CDataSourceNameList.cpp |    6 +++---
 CDriverList.cpp         |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE enable-items.patch ---
Allow drivers to be selected in ODBCConfig, per bug 544852.


diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp	2008-09-04 10:55:54.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp	2009-12-19 18:31:39.000000000 -0500
@@ -346,15 +346,15 @@
             setRowCount( nElement + 1 );
 
             ptablewidgetitem = new QTableWidgetItem( szSectionName );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 0, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDescription );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 1, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDriver );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 2, ptablewidgetitem );
 		}
 		SQLSetConfigMode( ODBC_BOTH_DSN );
diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp	2008-09-04 11:57:53.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp	2009-12-19 18:31:29.000000000 -0500
@@ -852,19 +852,19 @@
             setRowCount( nRow + 1 );
 
             ptablewidgetitem = new QTableWidgetItem( szDriverName );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 0, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDescription );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 1, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDriver );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 2, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szSetup );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 3, ptablewidgetitem );
 
             nRow++;


Index: unixODBC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- unixODBC.spec	25 Nov 2009 01:23:37 -0000	1.53
+++ unixODBC.spec	19 Dec 2009 23:49:26 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -20,6 +20,7 @@ Patch7: libtool-config.patch
 Patch8: so-version-bump.patch
 Patch9: keep-typedefs.patch
 Patch10: odbcint64-config.patch
+Patch11: enable-items.patch
 
 Conflicts: iodbc
 BuildRequires: libX11-devel libXt-devel libXext-devel
@@ -62,6 +63,7 @@ This package contains components for the
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 chmod 0644 Drivers/MiniSQL/*.c
 chmod 0644 Drivers/nn/*.c
@@ -183,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Dec 19 2009 Tom Lane <tgl at redhat.com> 2.2.14-9
+- Fix bug preventing drivers from being selected in ODBCConfig
+Resolves: #544852
+
 * Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.14-8
 - Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
 



From cwickert at fedoraproject.org  Sat Dec 19 23:50:19 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 19 Dec 2009 23:50:19 +0000 (UTC)
Subject: File xfce4-notes-plugin-1.7.2.tar.bz2 uploaded to lookaside cache by
	cwickert
Message-ID: <20091219235019.89CB510F8CF@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xfce4-notes-plugin:

054742ecc4bb83de6c1447b023938d3e  xfce4-notes-plugin-1.7.2.tar.bz2



From devrim at fedoraproject.org  Sat Dec 19 23:55:08 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sat, 19 Dec 2009 23:55:08 +0000 (UTC)
Subject: File postgis-1.4.1.pdf uploaded to lookaside cache by devrim
Message-ID: <20091219235508.5891810F943@bastion.fedoraproject.org>

A file has been added to the lookaside cache for postgis:

768be89aca95ff180c87caea491061c3  postgis-1.4.1.pdf



From devrim at fedoraproject.org  Sat Dec 19 23:57:55 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sat, 19 Dec 2009 23:57:55 +0000 (UTC)
Subject: File postgis-1.4.1.tar.gz uploaded to lookaside cache by devrim
Message-ID: <20091219235755.66D7A10F8F1@bastion.fedoraproject.org>

A file has been added to the lookaside cache for postgis:

78d13c4294f3336502ad35c8a30e5583  postgis-1.4.1.tar.gz



From devrim at fedoraproject.org  Sat Dec 19 23:59:32 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sat, 19 Dec 2009 23:59:32 +0000 (UTC)
Subject: File geos-3.2.0.tar.bz2 uploaded to lookaside cache by devrim
Message-ID: <20091219235932.D618A10F912@bastion.fedoraproject.org>

A file has been added to the lookaside cache for geos:

bfad7129680f0107b6ca9a2b92a2c440  geos-3.2.0.tar.bz2



From tgl at fedoraproject.org  Sun Dec 20 00:00:48 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Sun, 20 Dec 2009 00:00:48 +0000 (UTC)
Subject: rpms/unixODBC/F-12 enable-items.patch, NONE, 1.1 conffile.h, 1.2,
	1.3 unixODBC.spec, 1.51, 1.52
Message-ID: <20091220000048.AB1F811C00E6@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/unixODBC/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29300

Modified Files:
	conffile.h unixODBC.spec 
Added Files:
	enable-items.patch 
Log Message:
Fix bug preventing drivers from being selected in ODBCConfig

enable-items.patch:
 CDataSourceNameList.cpp |    6 +++---
 CDriverList.cpp         |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE enable-items.patch ---
Allow drivers to be selected in ODBCConfig, per bug 544852.


diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp	2008-09-04 10:55:54.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp	2009-12-19 18:31:39.000000000 -0500
@@ -346,15 +346,15 @@
             setRowCount( nElement + 1 );
 
             ptablewidgetitem = new QTableWidgetItem( szSectionName );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 0, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDescription );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 1, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDriver );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 2, ptablewidgetitem );
 		}
 		SQLSetConfigMode( ODBC_BOTH_DSN );
diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp	2008-09-04 11:57:53.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp	2009-12-19 18:31:29.000000000 -0500
@@ -852,19 +852,19 @@
             setRowCount( nRow + 1 );
 
             ptablewidgetitem = new QTableWidgetItem( szDriverName );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 0, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDescription );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 1, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDriver );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 2, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szSetup );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 3, ptablewidgetitem );
 
             nRow++;


Index: conffile.h
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/F-12/conffile.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- conffile.h	6 Jun 2009 19:35:44 -0000	1.2
+++ conffile.h	20 Dec 2009 00:00:47 -0000	1.3
@@ -4,13 +4,14 @@
  * 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 "CONFFILE_x86_64.h"
-#elif defined(__ia64__)
-#include "CONFFILE_ia64.h"
 #elif defined(__i386__)
 #include "CONFFILE_i386.h"
 #elif defined(__ppc64__) || defined(__powerpc64__)


Index: unixODBC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/F-12/unixODBC.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- unixODBC.spec	21 Aug 2009 20:31:26 -0000	1.51
+++ unixODBC.spec	20 Dec 2009 00:00:48 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.14
-Release: 6%{?dist}
+Release: 9%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -20,6 +20,7 @@ Patch7: libtool-config.patch
 Patch8: so-version-bump.patch
 Patch9: keep-typedefs.patch
 Patch10: odbcint64-config.patch
+Patch11: enable-items.patch
 
 Conflicts: iodbc
 BuildRequires: libX11-devel libXt-devel libXext-devel
@@ -62,6 +63,7 @@ This package contains components for the
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 chmod 0644 Drivers/MiniSQL/*.c
 chmod 0644 Drivers/nn/*.c
@@ -111,7 +113,7 @@ desktop-file-install --dir=$RPM_BUILD_RO
 # multilib header hacks
 # we only apply this to known Red Hat multilib arches, per bug #181335
 case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 )
+  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
     mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h
     rm -f unixodbc_conf.h
     sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
@@ -183,6 +185,12 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Dec 19 2009 Tom Lane <tgl at redhat.com> 2.2.14-9
+- Fix bug preventing drivers from being selected in ODBCConfig
+Resolves: #544852
+- Clean up bogosity in multilib stub header support: ia64 should not be
+  listed (it's not multilib), sparcv9 isn't a possible uname -i output
+
 * Fri Aug 21 2009 Tom Lane <tgl at redhat.com> 2.2.14-6
 - Switch to building against qt4, not qt3.  This means the DataManager,
   DataManagerII, and odbctest applications are gone.



From devrim at fedoraproject.org  Sun Dec 20 00:03:56 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 20 Dec 2009 00:03:56 +0000 (UTC)
Subject: rpms/postgis/devel .cvsignore, 1.15, 1.16 postgis.spec, 1.33,
	1.34 sources, 1.15, 1.16
Message-ID: <20091220000356.3761E11C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30099

Modified Files:
	.cvsignore postgis.spec sources 
Log Message:
Update to 1.4.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgis/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	30 Nov 2009 16:24:16 -0000	1.15
+++ .cvsignore	20 Dec 2009 00:03:55 -0000	1.16
@@ -1,2 +1,2 @@
-postgis-1.4.1rc2.tar.gz
-postgis-1.4.1rc2.pdf
+postgis-1.4.1.pdf
+postgis-1.4.1.tar.gz


Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/devel/postgis.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- postgis.spec	3 Dec 2009 14:21:52 -0000	1.33
+++ postgis.spec	20 Dec 2009 00:03:55 -0000	1.34
@@ -5,11 +5,11 @@
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
 Version:	1.4.1
-Release:	rc2_1%{?dist}.2
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Databases
-Source0:	http://postgis.refractions.net/download/%{name}-%{version}rc2.tar.gz
-Source2:	http://www.postgis.org/download/%{name}-%{version}rc2.pdf
+Source0:	http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
+Source2:	http://www.postgis.org/download/%{name}-%{version}.pdf
 Source4:	filter-requires-perl-Pg.sh
 URL:		http://postgis.refractions.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,7 +64,7 @@ The postgis-utils package provides the u
 %define __perl_requires %{SOURCE4}
 
 %prep
-%setup -q -n %{name}-%{version}rc2
+%setup -q
 # Copy .pdf file to top directory before installing.
 cp -p %{SOURCE2} .
 
@@ -74,7 +74,7 @@ cp -p %{SOURCE2} .
 make LPATH=`pg_config --pkglibdir` shlib="%{name}.so"
 
 %if %javabuild
-export BUILDXML_DIR=%{_builddir}/%{name}-%{version}rc2/java/jdbc
+export BUILDXML_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
 JDBC_VERSION_RPM=`rpm -ql postgresql-jdbc| grep 'jdbc2.jar$'|awk -F '/' '{print $5}'`
 sed 's/postgresql.jar/'${JDBC_VERSION_RPM}'/g' $BUILDXML_DIR/build.xml > $BUILDXML_DIR/build.xml.new
 mv -f $BUILDXML_DIR/build.xml.new $BUILDXML_DIR/build.xml
@@ -104,7 +104,7 @@ fi
 
 %if %javabuild
 install -d %{buildroot}%{_javadir}
-install -m 755 java/jdbc/%{name}-%{version}rc2.jar %{buildroot}%{_javadir}
+install -m 755 java/jdbc/%{name}-%{version}.jar %{buildroot}%{_javadir}
 %if %{gcj_support}
 aot-compile-rpm
 %endif
@@ -137,7 +137,7 @@ rm -rf %{buildroot}
 %files jdbc
 %defattr(-,root,root)
 %doc java/jdbc/COPYING_LGPL java/jdbc/README
-%attr(755,root,root) %{_javadir}/%{name}-%{version}rc2.jar
+%attr(755,root,root) %{_javadir}/%{name}-%{version}.jar
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/*.jar.so
@@ -164,6 +164,9 @@ rm -rf %{buildroot}
 %doc postgis*.pdf
 
 %changelog
+* Sun Dec 20 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.4.1-1
+- Update to 1.4.1
+
 * Thu Dec 03 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.4.1-rc2_1.2
 - Fix spec per rawhide report.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgis/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	30 Nov 2009 16:24:17 -0000	1.15
+++ sources	20 Dec 2009 00:03:55 -0000	1.16
@@ -1,2 +1,2 @@
-a93401127e09a56b7ee21b5127655817  postgis-1.4.1rc2.tar.gz
-9d5e054bc505c9a16b63b2a61cf862ab  postgis-1.4.1rc2.pdf
+768be89aca95ff180c87caea491061c3  postgis-1.4.1.pdf
+78d13c4294f3336502ad35c8a30e5583  postgis-1.4.1.tar.gz



From devrim at fedoraproject.org  Sun Dec 20 00:08:05 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 20 Dec 2009 00:08:05 +0000 (UTC)
Subject: rpms/postgis/F-12 .cvsignore, 1.13, 1.14 postgis.spec, 1.28,
	1.29 sources, 1.13, 1.14
Message-ID: <20091220000805.D3E4611C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30882

Modified Files:
	.cvsignore postgis.spec sources 
Log Message:
Update to 1.4.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgis/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	27 Jul 2009 12:11:44 -0000	1.13
+++ .cvsignore	20 Dec 2009 00:08:05 -0000	1.14
@@ -1,2 +1,2 @@
-postgis-1.4.0.pdf
-postgis-1.4.0.tar.gz
+postgis-1.4.1.pdf
+postgis-1.4.1.tar.gz


Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/F-12/postgis.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- postgis.spec	22 Nov 2009 00:45:23 -0000	1.28
+++ postgis.spec	20 Dec 2009 00:08:05 -0000	1.29
@@ -4,8 +4,8 @@
 
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
-Version:	1.4.0
-Release:	3%{?dist}
+Version:	1.4.1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Databases
 Source0:	http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
@@ -162,6 +162,9 @@ rm -rf %{buildroot}
 %doc postgis*.pdf
 
 %changelog
+* Sun Dec 20 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.4.1-1
+- Fix spec, per bz #536860
+
 * Sun Nov 22 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.4.0-3
 - Fix spec, per bz #536860
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgis/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Jul 2009 12:11:45 -0000	1.13
+++ sources	20 Dec 2009 00:08:05 -0000	1.14
@@ -1,2 +1,2 @@
-8368d43560d20a23e9883d098c3e10ec  postgis-1.4.0.pdf
-bc5b97d5399bd20ca90bfdf784ab6c33  postgis-1.4.0.tar.gz
+768be89aca95ff180c87caea491061c3  postgis-1.4.1.pdf
+78d13c4294f3336502ad35c8a30e5583  postgis-1.4.1.tar.gz



From devrim at fedoraproject.org  Sun Dec 20 00:10:05 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 20 Dec 2009 00:10:05 +0000 (UTC)
Subject: rpms/geos/devel .cvsignore, 1.8, 1.9 geos.spec, 1.23, 1.24 sources,
	1.8, 1.9
Message-ID: <20091220001005.1254711C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/geos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31351

Modified Files:
	.cvsignore geos.spec sources 
Log Message:
Update to 3.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Dec 2009 13:14:02 -0000	1.8
+++ .cvsignore	20 Dec 2009 00:10:04 -0000	1.9
@@ -1 +1 @@
-geos-3.2.0rc3.tar.bz2
+geos-3.2.0.tar.bz2


Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- geos.spec	3 Dec 2009 14:31:29 -0000	1.23
+++ geos.spec	20 Dec 2009 00:10:04 -0000	1.24
@@ -1,12 +1,12 @@
 Name:		geos
 Version:	3.2.0
-Release:	rc3_1%{?dist}.1
+Release:	1%{?dist}
 Summary:	GEOS is a C++ port of the Java Topology Suite
 
 Group:		Applications/Engineering
 License:	LGPLv2
 URL:		http://trac.osgeo.org/geos/
-Source0:	http://download.osgeo.org/%{name}/%{name}-%{version}rc3.tar.bz2
+Source0:	http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		geos-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	doxygen libtool
@@ -59,7 +59,7 @@ Ruby module to build applications using 
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}rc3
+%setup -q 
 %patch0 -p0 -b .gcc43
 
 %build
@@ -104,7 +104,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
-%{_libdir}/libgeos-%{version}rc3.so
+%{_libdir}/libgeos-%{version}.so
 %{_libdir}/libgeos_c.so.*
 %exclude %{_libdir}/*.a
 
@@ -137,6 +137,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Dec 20 2009 Devrim GUNDUZ <devrim at gunduz.org> - 3.2.0-1
+- Update to 3.2.0
+
 * Thu Dec 03 2009 Devrim G?ND?Z <devrim at gunduz.org> - 3.2.0-rc3_1.1
 - Fix spec (dep error).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Dec 2009 13:14:02 -0000	1.8
+++ sources	20 Dec 2009 00:10:04 -0000	1.9
@@ -1 +1 @@
-13cf215971f379b587b90025a405ee1e  geos-3.2.0rc3.tar.bz2
+bfad7129680f0107b6ca9a2b92a2c440  geos-3.2.0.tar.bz2



From jcollie at fedoraproject.org  Sun Dec 20 00:59:05 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 20 Dec 2009 00:59:05 +0000 (UTC)
Subject: File asterisk-1.6.2.0.tar.gz.asc uploaded to lookaside cache by
	jcollie
Message-ID: <20091220005905.82A8C10F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for asterisk:

a221d80b6c9093e448d2189e9231fe53  asterisk-1.6.2.0.tar.gz.asc



From jcollie at fedoraproject.org  Sun Dec 20 01:03:13 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 20 Dec 2009 01:03:13 +0000 (UTC)
Subject: File asterisk-1.6.2.0.tar.gz uploaded to lookaside cache by jcollie
Message-ID: <20091220010313.1030E10F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for asterisk:

441167086ba959b770ed1c82dccc97f9  asterisk-1.6.2.0.tar.gz



From jcollie at fedoraproject.org  Sun Dec 20 01:54:51 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 20 Dec 2009 01:54:51 +0000 (UTC)
Subject: rpms/asterisk/devel .cvsignore, 1.30, 1.31 asterisk.spec, 1.68,
	1.69 sources, 1.30, 1.31
Message-ID: <20091220015451.EA8CE11C00E6@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16508

Modified Files:
	.cvsignore asterisk.spec sources 
Log Message:
* Sat Dec 19 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-1
- Released version of 1.6.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	10 Dec 2009 05:55:06 -0000	1.30
+++ .cvsignore	20 Dec 2009 01:54:50 -0000	1.31
@@ -1,2 +1,2 @@
-asterisk-1.6.2.0-rc8.tar.gz
-asterisk-1.6.2.0-rc8.tar.gz.asc
+asterisk-1.6.2.0.tar.gz.asc
+asterisk-1.6.2.0.tar.gz


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- asterisk.spec	10 Dec 2009 05:55:07 -0000	1.68
+++ asterisk.spec	20 Dec 2009 01:54:50 -0000	1.69
@@ -1,8 +1,8 @@
-%define _rc 8
+#define _rc 8
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.16%{?_rc:.rc%{_rc}}%{?dist}
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -1039,6 +1039,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sat Dec 19 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-1
+- Released version of 1.6.2.0
+
 * Wed Dec  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.16.rc8
 - Update to 1.6.2.0-rc8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	10 Dec 2009 05:55:07 -0000	1.30
+++ sources	20 Dec 2009 01:54:50 -0000	1.31
@@ -1,2 +1,2 @@
-05d30e55bfe79d1022f30f3a93453c42  asterisk-1.6.2.0-rc8.tar.gz
-d52dc03dd959a55c501185fb19457121  asterisk-1.6.2.0-rc8.tar.gz.asc
+a221d80b6c9093e448d2189e9231fe53  asterisk-1.6.2.0.tar.gz.asc
+441167086ba959b770ed1c82dccc97f9  asterisk-1.6.2.0.tar.gz



From emaldonado at fedoraproject.org  Sun Dec 20 06:17:59 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 20 Dec 2009 06:17:59 +0000 (UTC)
Subject: rpms/nss/devel 546221.patch,1.2,1.3 nss.spec,1.131,1.132
Message-ID: <20091220061759.6720B11C00E6@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30103

Modified Files:
	546221.patch nss.spec 
Log Message:
Removed some left-over fprintf lines from patch

546221.patch:
 nsssysinit.c |   42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

Index: 546221.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/546221.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 546221.patch	18 Dec 2009 19:36:22 -0000	1.2
+++ 546221.patch	20 Dec 2009 06:17:58 -0000	1.3
@@ -1,16 +1,16 @@
 diff -up nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221 nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c
---- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-18 10:48:35.969726219 -0800
-+++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-18 10:51:05.866851066 -0800
-@@ -54,6 +54,8 @@
- #ifdef XP_UNIX
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
- 
- static int 
- testdir(char *dir)
-@@ -208,8 +210,8 @@ askpw=any timeout=30 ] }  ";
+--- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-19 21:11:06.590930221 -0800
++++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-19 21:17:29.019931181 -0800
+@@ -37,8 +37,6 @@
+ #include "prio.h"
+ #include "prprf.h"
+ 
+-
+-
+ /*
+  * The following provides a default example for operating systems to set up
+  * and manage applications loading NSS on their OS globally.
+@@ -208,8 +206,8 @@ askpw=any timeout=30 ] }  ";
  static char **
  get_list(char *filename, char *stripped_parameters)
  {
@@ -21,7 +21,7 @@ diff -up nss-3.12.5/mozilla/security/nss
      int isFIPS = getFIPSMode();
      const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
      int next = 0;
-@@ -219,17 +221,25 @@ get_list(char *filename, char *stripped_
+@@ -219,13 +217,20 @@ get_list(char *filename, char *stripped_
  	return NULL;
      }
  
@@ -44,18 +44,13 @@ diff -up nss-3.12.5/mozilla/security/nss
          "NSS=\"%sflags=internal%s\"",
          userdb, stripped_parameters, nssflags,
          isFIPS ? ",FIPS" : "");
- 
-+/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
- 	/* now open the user's defined PKCS #11 modules */
- 	/* skip the local user DB entry */
- 	module_list[next++] = PR_smprintf(
-@@ -238,19 +248,35 @@ get_list(char *filename, char *stripped_
+@@ -238,19 +243,32 @@ get_list(char *filename, char *stripped_
  	    "parameters=\"configdir='sql:%s' %s\" "
  	    "NSS=\"flags=internal,moduleDBOnly,defaultModDB,skipFirst\"", 
  		userdb, stripped_parameters);
-+/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
-    }
- 
+-   }
++	}
++
 +    if (filename && 0 /* This doesn't actually work. If we register
 +			 both this and the sysdb (in either order)
 +			 then only one of them actually shows up */) {
@@ -64,9 +59,8 @@ diff -up nss-3.12.5/mozilla/security/nss
 +	      "module=\"NSS database\" "
 +	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
 +	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
-+	    fprintf(stderr, "%s\n\n", module_list[next-1]);
 +    }
-+
+ 
      /* now the system database (always read only) */
 -    module_list[next++] = PR_smprintf(
 -	"library= "
@@ -79,7 +73,6 @@ diff -up nss-3.12.5/mozilla/security/nss
 +	      "module=\"NSS system database\" "
 +	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
 +	      "NSS=\"%sflags=internal,critical\"",sysdb, nssflags);
-+	    fprintf(stderr, "%s\n\n", module_list[next-1]);
 +    }
  
      /* that was the last module */


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- nss.spec	18 Dec 2009 19:36:23 -0000	1.131
+++ nss.spec	20 Dec 2009 06:17:58 -0000	1.132
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.7
+Release:          1%{?dist}.9
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -115,7 +115,7 @@ low level services.
 %patch7 -p0 -b .533125
 %patch8 -p0 -b .sysinit
 %patch9 -p1 -b .540387
-%patch10 -p0 -b .nsssyinit
+%patch10 -p0 -b .545779
 %patch11 -p1 -b .546221
 
 %build
@@ -478,13 +478,16 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Dec 19 2009 Elio maldonado<emaldona at redhat.com> - 3.12.5-1.9
+- Remove left over trace statements from nsssysinit patching
+
 * Fri Dec 18 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-2.7
 - Fix a misconstructed patch
 
 * Thu Dec 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.6
-- Fix nsssysinit to enable applications to use the system database (#546221)
+- Fix nsssysinit to enable apps to use system cert store, patch contributed by David Woodhouse (#546221)
 - Fix spec so sysinit requires coreutils for post install scriplet (#547067)
-- Fix segmentation fault when listing keys or certs in the database (#540387)
+- Fix segmentation fault when listing keys or certs in the database, patch contributed by Kamil Dudka (#540387)
 
 * Thu Dec 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.5
 - Fix nsssysinit to set the default flags on the crypto module (#545779)



From emaldonado at fedoraproject.org  Sun Dec 20 06:36:22 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 20 Dec 2009 06:36:22 +0000 (UTC)
Subject: rpms/nss/F-12 546221.patch,1.1,1.2 nss.spec,1.126,1.127
Message-ID: <20091220063622.D1D3E11C03DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv639

Modified Files:
	546221.patch nss.spec 
Log Message:
Removed left over print statements

546221.patch:
 nsssysinit.c |   42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

Index: 546221.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss/F-12/546221.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 546221.patch	18 Dec 2009 22:36:41 -0000	1.1
+++ 546221.patch	20 Dec 2009 06:36:20 -0000	1.2
@@ -1,16 +1,16 @@
 diff -up nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221 nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c
---- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-18 10:48:35.969726219 -0800
-+++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-18 10:51:05.866851066 -0800
-@@ -54,6 +54,8 @@
- #ifdef XP_UNIX
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
- 
- static int 
- testdir(char *dir)
-@@ -208,8 +210,8 @@ askpw=any timeout=30 ] }  ";
+--- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-19 21:11:06.590930221 -0800
++++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-19 21:17:29.019931181 -0800
+@@ -37,8 +37,6 @@
+ #include "prio.h"
+ #include "prprf.h"
+ 
+-
+-
+ /*
+  * The following provides a default example for operating systems to set up
+  * and manage applications loading NSS on their OS globally.
+@@ -208,8 +206,8 @@ askpw=any timeout=30 ] }  ";
  static char **
  get_list(char *filename, char *stripped_parameters)
  {
@@ -21,7 +21,7 @@ diff -up nss-3.12.5/mozilla/security/nss
      int isFIPS = getFIPSMode();
      const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
      int next = 0;
-@@ -219,17 +221,25 @@ get_list(char *filename, char *stripped_
+@@ -219,13 +217,20 @@ get_list(char *filename, char *stripped_
  	return NULL;
      }
  
@@ -44,18 +44,13 @@ diff -up nss-3.12.5/mozilla/security/nss
          "NSS=\"%sflags=internal%s\"",
          userdb, stripped_parameters, nssflags,
          isFIPS ? ",FIPS" : "");
- 
-+/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
- 	/* now open the user's defined PKCS #11 modules */
- 	/* skip the local user DB entry */
- 	module_list[next++] = PR_smprintf(
-@@ -238,19 +248,35 @@ get_list(char *filename, char *stripped_
+@@ -238,19 +243,32 @@ get_list(char *filename, char *stripped_
  	    "parameters=\"configdir='sql:%s' %s\" "
  	    "NSS=\"flags=internal,moduleDBOnly,defaultModDB,skipFirst\"", 
  		userdb, stripped_parameters);
-+/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
-    }
- 
+-   }
++	}
++
 +    if (filename && 0 /* This doesn't actually work. If we register
 +			 both this and the sysdb (in either order)
 +			 then only one of them actually shows up */) {
@@ -64,9 +59,8 @@ diff -up nss-3.12.5/mozilla/security/nss
 +	      "module=\"NSS database\" "
 +	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
 +	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
-+	    fprintf(stderr, "%s\n\n", module_list[next-1]);
 +    }
-+
+ 
      /* now the system database (always read only) */
 -    module_list[next++] = PR_smprintf(
 -	"library= "
@@ -79,7 +73,6 @@ diff -up nss-3.12.5/mozilla/security/nss
 +	      "module=\"NSS system database\" "
 +	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
 +	      "NSS=\"%sflags=internal,critical\"",sysdb, nssflags);
-+	    fprintf(stderr, "%s\n\n", module_list[next-1]);
 +    }
  
      /* that was the last module */


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/F-12/nss.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- nss.spec	18 Dec 2009 22:40:27 -0000	1.126
+++ nss.spec	20 Dec 2009 06:36:21 -0000	1.127
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.8
+Release:          1%{?dist}.10
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -478,10 +478,13 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Dec 19 2009 Elio maldonado<emaldona at redhat.com> - 3.12.5-1.10
+- Remove some left over trace statements from nsssysinit patching
+
 * Thu Dec 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.8
 - Fix nsssysinit to set the default flags on the crypto module (#545779)
-- Fix nsssysinit to enable applications to use the system database (#546221)
-- Fix segmentation when listing keys or certs in the database (#540387)
+- Fix nsssysinit to enable apps to use the system cert store, patch contributed by David Woodhouse (#546221)
+- Fix segmentation fault when listing keys or certs in the database, patch contributed by Kamil Dudka (#540387)
 - Sysinit requires coreutils for post install scriplet (#547067)
 - Remove redundant header from the pem module
 



From rrankin at fedoraproject.org  Sun Dec 20 06:39:50 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun, 20 Dec 2009 06:39:50 +0000 (UTC)
Subject: rpms/gtk+extra/F-12 gtk+extra-2.1.1-gtk2.18.patch, NONE,
	1.1 gtk+extra.spec, 1.15, 1.16
Message-ID: <20091220063950.8251A11C00E6@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gtk+extra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1300

Modified Files:
	gtk+extra.spec 
Added Files:
	gtk+extra-2.1.1-gtk2.18.patch 
Log Message:
Fix gtk+extra gtk+2.18 incompatibility BZ 546648


gtk+extra-2.1.1-gtk2.18.patch:
 gtkitementry.c |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 gtksheet.c     |    2 -
 2 files changed, 57 insertions(+), 3 deletions(-)

--- NEW FILE gtk+extra-2.1.1-gtk2.18.patch ---
diff --git a/gtkextra/gtkitementry.c b/gtkextra/gtkitementry.c
index 6a42880..377c4ea 100644
--- a/gtkextra/gtkitementry.c
+++ b/gtkextra/gtkitementry.c
@@ -170,6 +170,26 @@ static void         get_widget_window_size             (GtkEntry       *entry,
 
 static GtkEntryClass *parent_class = NULL;
 
+#ifdef GTK_TYPE_ENTRY_BUFFER
+// In GTK+ 2.18, changes were made to GtkEntry. This caused gtk+extra
+// to crash. So from 2.18 call the appropriate buffer routines in GTK+
+// gtk/gtkentrybuffer.c. 
+//
+// rrankin AT ihug DOT com DOT au 21/12/09
+//
+typedef struct _GtkEntryPrivate GtkEntryPrivate;
+
+struct _GtkEntryPrivate
+{
+  GtkEntryBuffer* buffer;
+  // The remainder of this structure has been truncated 
+
+};
+
+#define GTK_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ENTRY, GtkEntryPrivate))
+
+#endif
+
 GtkType
 gtk_item_entry_get_type (void)
 {
@@ -670,6 +690,27 @@ gtk_entry_get_position (GtkEditable *editable)
   return GTK_ENTRY (editable)->current_pos;
 }
 
+#ifdef GTK_TYPE_ENTRY_BUFFER
+//
+// Get_buffer copied from gtk/gtkentry.c
+//
+static GtkEntryBuffer*
+get_buffer (GtkEntry *entry)
+{
+  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+  if (priv->buffer == NULL)
+    {
+      GtkEntryBuffer *buffer;
+      buffer = gtk_entry_buffer_new (NULL, 0);
+      gtk_entry_set_buffer (entry, buffer);
+      g_object_unref (buffer);
+    }
+
+  return priv->buffer;
+}
+
+#endif //GTK_TYPE_ENTRY_BUFFER
 
 /* Default signal handlers
  */
@@ -679,7 +720,6 @@ gtk_entry_real_insert_text (GtkEditable *editable,
 			    gint         new_text_length,
 			    gint        *position)
 {
-  gint index;
   gint n_chars;
 
   GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
@@ -696,6 +736,11 @@ gtk_entry_real_insert_text (GtkEditable *editable,
       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
     }
 
+#ifdef GTK_TYPE_ENTRY_BUFFER
+   GtkEntryBuffer *buffer = get_buffer(entry);
+   n_chars  = gtk_entry_buffer_insert_text(buffer, *position, new_text, new_text_length);
+#else
+
   if (new_text_length + ientry->item_n_bytes + 1 > ientry->item_text_size)
     {
       while (new_text_length + ientry->item_n_bytes + 1 > ientry->item_text_size)
@@ -724,10 +769,12 @@ gtk_entry_real_insert_text (GtkEditable *editable,
       entry->text = g_realloc (entry->text, ientry->item_text_size);
     }
 
+  gint index;
   index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
 
   g_memmove (entry->text + index + new_text_length, entry->text + index, ientry->item_n_bytes - index);
   memcpy (entry->text + index, new_text, new_text_length);
+#endif //GTK_TYPE_ENTRY_BUFFER
 
   ientry->item_n_bytes += new_text_length;
   entry->text_length += n_chars;
@@ -755,7 +802,6 @@ gtk_entry_real_delete_text (GtkEditable *editable,
 			    gint         end_pos)
 {
   GtkEntry *entry = GTK_ENTRY (editable);
-  GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
 
   if (start_pos < 0)
     start_pos = 0;
@@ -764,6 +810,11 @@ gtk_entry_real_delete_text (GtkEditable *editable,
   
   if (start_pos < end_pos)
     {
+#ifdef GTK_TYPE_ENTRY_BUFFER
+      GtkEntryBuffer *buffer = get_buffer(entry);
+      gtk_entry_buffer_delete_text (buffer, start_pos, end_pos-start_pos);
+#else
+      GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
       gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
       gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
 
@@ -776,6 +827,7 @@ gtk_entry_real_delete_text (GtkEditable *editable,
 
       if (entry->selection_bound > start_pos)
 	entry->selection_bound -= MIN (entry->selection_bound, end_pos) - start_pos;
+#endif // GTK_TYPE_ENTRY_BUFFER
       /* We might have deleted the selection
        */
       gtk_entry_update_primary_selection (entry);
@@ -863,6 +915,7 @@ gtk_entry_move_cursor (GtkEntry       *entry,
 	case GTK_MOVEMENT_DISPLAY_LINES:
 	case GTK_MOVEMENT_PARAGRAPHS:
 	case GTK_MOVEMENT_PAGES:
+	case GTK_MOVEMENT_HORIZONTAL_PAGES:
 	  break;
 	}
     }
@@ -896,6 +949,7 @@ gtk_entry_move_cursor (GtkEntry       *entry,
 	case GTK_MOVEMENT_DISPLAY_LINES:
 	case GTK_MOVEMENT_PARAGRAPHS:
 	case GTK_MOVEMENT_PAGES:
+	case GTK_MOVEMENT_HORIZONTAL_PAGES:
 	  break;
 	}
     }
diff --git a/gtkextra/gtksheet.c b/gtkextra/gtksheet.c
index 10ab5f0..d3d96e3 100644
--- a/gtkextra/gtksheet.c
+++ b/gtkextra/gtksheet.c
@@ -6951,7 +6951,7 @@ draw_xor_rectangle(GtkSheet *sheet, GtkSheetRange range)
 
    gdk_gc_set_clip_rectangle(sheet->xor_gc, &clip_area);
 
-   for(i=-1;i<=1;i=++i)
+   for(i=-1;i<=1;i++)
      gdk_draw_rectangle(sheet->sheet_window,
                         sheet->xor_gc,
 		        FALSE,


Index: gtk+extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+extra/F-12/gtk+extra.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gtk+extra.spec	1 Aug 2009 00:13:30 -0000	1.15
+++ gtk+extra.spec	20 Dec 2009 06:39:50 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		gtk+extra
 Version:	2.1.1
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	A library of gtk+ widgets
 Summary(fr):	Une biblioth?que de widgets gtk+
 
@@ -11,6 +11,7 @@ Source:		http://dl.sf.net/scigraphica/gt
 Patch:		%{name}-%{version}.g_free.diff
 Patch1:		%{name}-%{version}-deleterow.patch
 Patch2:		%{name}-%{version}-item.patch
+Patch3:		%{name}-%{version}-gtk2.18.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
@@ -49,6 +50,7 @@ qui utilisent les widgets gtk+extra.
 %patch -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-13
+- Fix crash issue with gtk2-2.18 BZ 546648
+
 * Sat Aug 01 2009 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-12
 - Patch to compile with gtk2-2.17.5
 



From pkgdb at fedoraproject.org  Sun Dec 20 07:32:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Dec 2009 07:32:00 +0000
Subject: [pkgdb] pcmanx-gtk2: supercyper has given up watchcommits
Message-ID: <20091220073155.ECD5010F8DA@bastion.fedoraproject.org>

supercyper has given up the watchcommits acl on pcmanx-gtk2 (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pcmanx-gtk2



From jussilehtola at fedoraproject.org  Sun Dec 20 07:35:18 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 20 Dec 2009 07:35:18 +0000 (UTC)
Subject: rpms/towhee/devel towhee.spec,1.9,1.10
Message-ID: <20091220073518.41DD711C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/towhee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10222

Modified Files:
	towhee.spec 
Log Message:
Add missing requires.


Index: towhee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/devel/towhee.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- towhee.spec	19 Dec 2009 23:28:25 -0000	1.9
+++ towhee.spec	20 Dec 2009 07:35:07 -0000	1.10
@@ -16,6 +16,7 @@ ExcludeArch:	ppc64
 
 BuildRequires:	gcc-gfortran
 BuildRequires:	openmpi-devel
+BuildRequires:	mpich2-devel
 
 %description
 Towhee is a Monte Carlo molecular simulation code originally designed for the



From jussilehtola at fedoraproject.org  Sun Dec 20 08:58:52 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 20 Dec 2009 08:58:52 +0000 (UTC)
Subject: rpms/towhee/F-12 sources,1.3,1.4 towhee.spec,1.8,1.9
Message-ID: <20091220085852.56A7811C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/towhee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23151

Modified Files:
	sources towhee.spec 
Log Message:
Update to 6.2.7 and adopt MPI guidelines.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 16:38:59 -0000	1.3
+++ sources	20 Dec 2009 08:58:51 -0000	1.4
@@ -1 +1 @@
-1ea66130962bd79d24b6671b285fdef4  towhee-6.2.6.tar.gz
+5bc2922db7912a7dc6c6dccad1af6157  towhee-6.2.7.tar.gz


Index: towhee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/F-12/towhee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- towhee.spec	23 Oct 2009 12:11:30 -0000	1.8
+++ towhee.spec	20 Dec 2009 08:58:51 -0000	1.9
@@ -1,13 +1,12 @@
 Name:		towhee
-Version:	6.2.6
-Release:	4%{?dist}
+Version:	6.2.7
+Release:	1%{?dist}
 Summary:	A Monte Carlo molecular simulation code
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://towhee.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Provides:	towhee-executable = %{version}-%{release}
 Requires:	towhee-common = %{version}-%{release}
 
 # Bug 502883
@@ -17,32 +16,7 @@ ExcludeArch:	ppc64
 
 BuildRequires:	gcc-gfortran
 BuildRequires:	openmpi-devel
-
-# Check for mpi-selector or environment-modules
-%global selector 0
-%global modules 0
-
-%if 0%{?fedora} > 9
-%global modules 1
-%endif
-
-%if 0%{?rhel} == 4
-%global selector 1
-%endif
-
-%if 0%{?rhel} == 5
-%global selector 1
-%endif
-
-%if %modules == 1
-BuildRequires:	environment-modules
-%endif
-
-%if %selector == 1
-BuildRequires:	mpi-selector
-%endif
-
-# End MPI requires section
+BuildRequires:	mpich2-devel
 
 %description
 Towhee is a Monte Carlo molecular simulation code originally designed for the
@@ -58,24 +32,38 @@ N.B. Due to some general names the utili
 analyse_movie is now towhee-analyse_movie.
 
 
-%package mpi
-Summary:	Towhee, MPI version
+%package openmpi
+Summary:	Towhee, Open MPI version
 Group:		Applications/Engineering
-Provides:	towhee-executable = %{version}-%{release}
 Requires:	towhee-common = %{version}-%{release}
+Obsoletes:	towhee-mpi < %{version}-%{release}
+Provides:	towhee-mpi = %{version}-%{release}
+Requires:	openmpi
+
+%description openmpi
+This package contains MPI enabled binaries of Towhee, compiled against
+Open MPI.
+
+If you want the analysis tools, install the towhee package.
+
+%package mpich2
+Summary:        Towhee, Open MPI version
+Group:          Applications/Engineering
+Requires:       towhee-common = %{version}-%{release}
+Requires:       mpich2
+
+%description mpich2
+This package contains MPI enabled binaries of Towhee, compiled against MPICH2.
 
-%description mpi
-This package contains the MPI enabled binaries of Towhee.
+If you want the analysis tools, install the towhee package.
 
 
 %package common
 Summary:	Towhee common files
 Group:		Applications/Engineering
 # So that the package gets removed with the binaries
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
+Requires:	%{name} = %{version}-%{release}
 BuildArch:	noarch
-%endif
 
 %description common
 This package contains files needed for operation of Towhee.
@@ -83,11 +71,7 @@ This package contains files needed for o
 %package doc
 Summary:	Towhee manual
 Group:		Applications/Engineering
-# So that the package gets removed with the binaries
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
 BuildArch:	noarch
-%endif
 
 %description doc
 This package contains the HTML manual for Towhee.
@@ -95,16 +79,11 @@ This package contains the HTML manual fo
 %package examples
 Summary:	Towhee examples
 Group:		Applications/Engineering
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
 BuildArch:	noarch
-%endif
 
 %description examples
 This package contains examples for Towhee operation.
 
-
-
 %prep
 %setup -q
 # Fix Force field locations in examples
@@ -133,34 +112,34 @@ cd ..
 
 cd ..
 
-## Build parallel version
-# Load MPI enviroment
-
-%if %modules == 1
-#. /etc/profile.d/modules.sh
-module load openmpi-%{_arch}
-export CFLAGS="%{optflags}"
-%endif
-
-%if %selector == 1
-# Set MPI environment
-mpi-selector --set `mpi-selector --list | grep openmpi`
-source /etc/profile.d/mpi-selector.sh
-%endif
-
+## Build parallel versions
 # Use mpif90 to build
 export F77=mpif90
-mkdir mpi
-cd mpi
+
+%{_openmpi_load}
+mkdir openmpi
+cd openmpi
+ln -s ../configure .
+%configure --enable-mpi --program-suffix=${MPI_SUFFIX}
+make %{?_smp_mflags}
+cd ..
+%{_openmpi_unload}
+
+%{_mpich2_load}
+mkdir mpich2
+cd mpich2
 ln -s ../configure .
-%configure --enable-mpi --program-suffix=-mpi
+%configure --enable-mpi --program-suffix=${MPI_SUFFIX}
 make %{?_smp_mflags}
 cd ..
+%{_mpich2_unload}
+
 
 %install
 rm -rf %{buildroot} 
 # Install binaries
-make -C mpi install DESTDIR=%{buildroot} INSTALL="install -p"
+make -C openmpi install DESTDIR=%{buildroot} bindir=%{_libdir}/openmpi/bin INSTALL="install -p"
+make -C mpich2 install DESTDIR=%{buildroot} bindir=%{_libdir}/mpich2/bin INSTALL="install -p"
 make -C nompi install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # Install force fields
@@ -174,16 +153,19 @@ find Examples/ -name "Makefile*" -exec r
 find Examples/ -type f -exec chmod 644 {} \;
 
 # Rename utilities
-for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}{,-mpi}; do
+for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}; do
  mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/towhee-$bin
 done
 # Remove mpi versions of the utilities
-rm %{buildroot}%{_bindir}/towhee-*-mpi
+for mpi in openmpi mpich2; do
+ for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}; do
+  rm %{buildroot}%{_libdir}/$mpi/bin/${bin}_${mpi}
+ done
+done
 
 %clean
 rm -rf %{buildroot} 
 
-
 %files
 %defattr(-,root,root,-)
 %doc license.gpl
@@ -192,11 +174,13 @@ rm -rf %{buildroot} 
 # Utils
 %{_bindir}/towhee-*
 
-%files mpi
+%files openmpi
 %defattr(-,root,root,-)
-%doc license.gpl
-%{_bindir}/forcefield-mpi
-%{_bindir}/towhee-mpi
+%{_libdir}/openmpi/bin/*_openmpi
+
+%files mpich2
+%defattr(-,root,root,-)
+%{_libdir}/mpich2/bin/*_mpich2
 
 %files common
 %defattr(-,root,root,-)
@@ -212,6 +196,9 @@ rm -rf %{buildroot} 
 %doc Examples/*
 
 %changelog
+* Sat Dec 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.7-1
+- Adopt MPI guidelines, fixing FTBFS in rawhide.
+
 * Fri Oct 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.6-4
 - Fix FTBFS problem caused by behaviour change of openmpi.
 



From jwrdegoede at fedoraproject.org  Sun Dec 20 10:19:50 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 20 Dec 2009 10:19:50 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0-diskflags.patch, 1.1,
	1.2 parted-1.9.0-export-alignment-info.patch, 1.3,
	1.4 parted-1.9.0-lo-as-file-rh546622.patch, 1.1,
	1.2 parted-1.9.0-partition-limits-rh533417.patch, 1.1,
	1.2 parted.spec, 1.158, 1.159
Message-ID: <20091220101950.DE40511C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3934

Modified Files:
	parted-1.9.0-diskflags.patch 
	parted-1.9.0-export-alignment-info.patch 
	parted-1.9.0-lo-as-file-rh546622.patch 
	parted-1.9.0-partition-limits-rh533417.patch parted.spec 
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-25
- Fix crash when partitioning loopback devices (#546622)
- Drop no-cylinder-align patch:
  - its functionality is superseeded by the per disk flags
  - its only user (pyparted) has been updated to use those
  - this is not upstream so we don't want other programs to start using it


parted-1.9.0-diskflags.patch:
 include/parted/disk.h  |   33 +++++++++++++
 libparted/disk.c       |  124 +++++++++++++++++++++++++++++++++++++++++++++++++
 libparted/labels/dos.c |   70 +++++++++++++++++++++++++--
 libparted/labels/sun.c |   57 ++++++++++++++++++++--
 4 files changed, 273 insertions(+), 11 deletions(-)

Index: parted-1.9.0-diskflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-diskflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-diskflags.patch	18 Dec 2009 09:42:14 -0000	1.1
+++ parted-1.9.0-diskflags.patch	20 Dec 2009 10:19:49 -0000	1.2
@@ -287,17 +287,20 @@ diff -up parted-1.9.0/libparted/labels/d
  }
  
  #ifndef DISCOVER_ONLY
-@@ -2029,7 +2083,9 @@ msdos_partition_align (PedPartition* par
+@@ -2029,8 +2082,11 @@ msdos_partition_align (PedPartition* par
  
  	partition_probe_bios_geometry (part, &bios_geom);
  
--	if (ped_disk_align_to_cylinders_on())
+-	if (_align (part, &bios_geom, constraint))
+-		return 1;
 +	DosDiskData *disk_specific = part->disk->disk_specific;
-+	if (ped_disk_align_to_cylinders_on() &&
-+	    disk_specific->cylinder_alignment)
- 		if (_align (part, &bios_geom, constraint))
- 			return 1;
++	if (disk_specific->cylinder_alignment)
++		if (_align (part, &bios_geom, constraint))
++			return 1;
++
  	if (_align_no_geom (part, constraint))
+ 		return 1;
+ 
 @@ -2324,6 +2380,10 @@ static PedDiskOps msdos_disk_ops = {
  	write:			NULL,
  #endif

parted-1.9.0-export-alignment-info.patch:
 configure.ac             |   12 ++++
 include/parted/device.h  |   13 ++++
 include/parted/disk.h    |    2 
 include/parted/natmath.h |    1 
 libparted/Makefile.am    |    1 
 libparted/arch/linux.c   |   67 ++++++++++++++++++++++-
 libparted/arch/linux.h   |    8 ++
 libparted/device.c       |  135 +++++++++++++++++++++++++++++++++++++++++++----
 libparted/disk.c         |   20 ++++++
 libparted/labels/dasd.c  |   11 +++
 libparted/labels/mac.c   |   11 +++
 libparted/labels/pc98.c  |   12 +++-
 libparted/labels/rdb.c   |   12 +++-
 libparted/labels/sun.c   |   10 +++
 14 files changed, 298 insertions(+), 17 deletions(-)

Index: parted-1.9.0-export-alignment-info.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-export-alignment-info.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parted-1.9.0-export-alignment-info.patch	3 Nov 2009 12:07:15 -0000	1.3
+++ parted-1.9.0-export-alignment-info.patch	20 Dec 2009 10:19:49 -0000	1.4
@@ -68,15 +68,14 @@ diff -up parted-1.9.0/include/parted/dis
  };
  
  struct _PedDiskType {
-@@ -263,6 +264,8 @@ extern int ped_disk_get_last_partition_n
+@@ -263,6 +264,7 @@ extern int ped_disk_get_last_partition_n
  extern int ped_disk_get_max_primary_partition_count (const PedDisk* disk);
  extern bool ped_disk_get_max_supported_partition_count(const PedDisk* disk,
                                                         int* supported);
 +extern PedAlignment *ped_disk_get_partition_alignment(const PedDisk *disk);
-+
- extern int ped_disk_align_to_cylinders_on();
- extern int ped_disk_align_to_cylinders_toggle();
+ 
  /** @} */
+ 
 diff -up parted-1.9.0/include/parted/natmath.h.export-align parted-1.9.0/include/parted/natmath.h
 --- parted-1.9.0/include/parted/natmath.h.export-align	2009-07-23 19:52:08.000000000 +0200
 +++ parted-1.9.0/include/parted/natmath.h	2009-11-03 11:30:46.000000000 +0100

parted-1.9.0-lo-as-file-rh546622.patch:
 linux.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

Index: parted-1.9.0-lo-as-file-rh546622.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-lo-as-file-rh546622.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-lo-as-file-rh546622.patch	18 Dec 2009 09:42:14 -0000	1.1
+++ parted-1.9.0-lo-as-file-rh546622.patch	20 Dec 2009 10:19:49 -0000	1.2
@@ -18,3 +18,19 @@ diff -up parted-1.9.0/libparted/arch/lin
          } else {
                  dev->type = PED_DEVICE_UNKNOWN;
          }
+@@ -1048,6 +1048,15 @@ init_file (PedDevice* dev)
+         if (!ped_device_open (dev))
+                 goto error;
+ 
++        dev->sector_size = PED_SECTOR_SIZE_DEFAULT;
++        char *p = getenv ("PARTED_SECTOR_SIZE");
++        if (p) {
++                int s = atoi (p);
++                if (0 < s && s % 512 == 0)
++                        dev->sector_size = s;
++        }
++        dev->phys_sector_size = dev->sector_size;
++
+         if (S_ISBLK(dev_stat.st_mode))
+                 dev->length = _device_get_length (dev);
+         else

parted-1.9.0-partition-limits-rh533417.patch:
 include/parted/disk.h           |    2 
 libparted/disk.c                |   34 ++++++++
 libparted/labels/pt-limit.c     |  164 ++++++++++++++++++++++++++++++++++++++++
 libparted/labels/pt-limit.gperf |   26 ++++++
 4 files changed, 226 insertions(+)

Index: parted-1.9.0-partition-limits-rh533417.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-partition-limits-rh533417.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-partition-limits-rh533417.patch	18 Dec 2009 09:42:14 -0000	1.1
+++ parted-1.9.0-partition-limits-rh533417.patch	20 Dec 2009 10:19:49 -0000	1.2
@@ -1,15 +1,14 @@
 --- parted-1.9.0.orig/include/parted/disk.h	2009-12-15 10:32:24.000000000 +0100
 +++ parted-1.9.0/include/parted/disk.h	2009-12-15 10:59:26.000000000 +0100
-@@ -266,6 +266,9 @@
+@@ -265,6 +265,8 @@ extern int ped_disk_get_max_primary_part
+ extern bool ped_disk_get_max_supported_partition_count(const PedDisk* disk,
                                                         int* supported);
  extern PedAlignment *ped_disk_get_partition_alignment(const PedDisk *disk);
- 
 +extern PedSector ped_disk_max_partition_length (const PedDisk *disk);
 +extern PedSector ped_disk_max_partition_start_sector (const PedDisk *disk);
-+
- extern int ped_disk_align_to_cylinders_on();
- extern int ped_disk_align_to_cylinders_toggle();
+ 
  /** @} */
+ 
 --- parted-1.9.0.orig/libparted/disk.c	2009-12-15 10:32:24.000000000 +0100
 +++ parted-1.9.0/libparted/disk.c	2009-12-15 10:55:16.000000000 +0100
 @@ -738,6 +738,40 @@


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- parted.spec	18 Dec 2009 09:42:14 -0000	1.158
+++ parted.spec	20 Dec 2009 10:19:49 -0000	1.159
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -14,7 +14,6 @@ Patch1:  %{name}-1.9.0-appletv-support.p
 Patch2:  %{name}-1.9.0-extended-mbr.patch
 Patch3:  %{name}-1.9.0-noheaders.patch
 Patch4:  %{name}-1.9.0-pop-push-error.patch
-Patch5:  %{name}-1.9.0-no-cylinder-align.patch
 Patch6:  %{name}-1.9.0-remove-struct-elem.patch
 Patch7:  %{name}-1.9.0-move-function-declarations.patch
 Patch10:  %{name}-1.9.0-handle-dup-error.patch
@@ -78,7 +77,6 @@ Parted library, you need to install this
 %patch2 -p1 -b .extended-mbr
 %patch3 -p1 -b .noheaders
 %patch4 -p1 -b .pop-push-error
-%patch5 -p1 -b .no-cylinder-align
 %patch6 -p1 -b .remove-struct-elem
 %patch7 -p1 -b .move-function-declarations
 %patch10 -p1 -b .handle-dup-error
@@ -164,7 +162,15 @@ fi
 %{_exec_prefix}/%{_lib}/libparted.so
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
+
 %changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-25
+- Fix crash when partitioning loopback devices (#546622)
+- Drop no-cylinder-align patch:
+  - its functionality is superseeded by the per disk flags
+  - its only user (pyparted) has been updated to use those
+  - this is not upstream so we don't want other programs to start using it
+
 * Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-24
 - Allow partitioning of loopback devices (#546622)
 - Add libparted function to query maximum partition length and start



From kkofler at fedoraproject.org  Sun Dec 20 10:53:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 20 Dec 2009 10:53:15 +0000 (UTC)
Subject: rpms/kcm-gtk/devel kcm-gtk-0.5.3-fix-de.patch, NONE,
	1.1 kcm-gtk-0.5.3-gtkrc_setenv.patch, NONE, 1.1 kcm-gtk.spec, 1.2, 1.3
Message-ID: <20091220105315.34B7B11C02C4@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kcm-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9759/devel

Modified Files:
	kcm-gtk.spec 
Added Files:
	kcm-gtk-0.5.3-fix-de.patch kcm-gtk-0.5.3-gtkrc_setenv.patch 
Log Message:
* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.3-2
- fix missing umlauts and sharp s in the German translation

kcm-gtk-0.5.3-fix-de.patch:
 kcm_gtk.po |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

--- NEW FILE kcm-gtk-0.5.3-fix-de.patch ---
diff -ur kcm-gtk-0.5.3/po/de/kcm_gtk.po kcm-gtk-0.5.3-fix-de/po/de/kcm_gtk.po
--- kcm-gtk-0.5.3/po/de/kcm_gtk.po	2009-10-23 15:07:44.000000000 +0200
+++ kcm-gtk-0.5.3-fix-de/po/de/kcm_gtk.po	2009-12-20 11:47:45.000000000 +0100
@@ -21,7 +21,7 @@
 #: kcmgtk.cpp:107
 #, kde-format
 msgid "%1 (size %2)"
-msgstr "%1 (Gre %2)"
+msgstr "%1 (Gr??e %2)"
 
 #. i18n: file: kcmgtkwidget.ui:19
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
@@ -39,7 +39,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, warning3)
 #: rc.cpp:9 rc.cpp:50
 msgid "Change search paths..."
-msgstr "Suchpfade ndern ..."
+msgstr "Suchpfade ?ndern ..."
 
 #. i18n: file: kcmgtkwidget.ui:94
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
@@ -63,7 +63,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, fontChange)
 #: rc.cpp:21 rc.cpp:62
 msgid "Change..."
-msgstr "ndern ..."
+msgstr "?ndern ..."
 
 #. i18n: file: kcmgtkwidget.ui:165
 #. i18n: ectx: property (text), widget (KSqueezedTextLabel, qtcurveFontLabel)
@@ -84,7 +84,7 @@
 #. i18n: ectx: property (windowTitle), widget (QWidget, SearchPaths)
 #: rc.cpp:30 rc.cpp:71
 msgid "Change search paths"
-msgstr "Suchpfade ndern"
+msgstr "Suchpfade ?ndern"
 
 #. i18n: file: searchpaths.ui:26
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
@@ -99,7 +99,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, addButton)
 #: rc.cpp:36 rc.cpp:77
 msgid "Add"
-msgstr "Hinzufgen"
+msgstr "Hinzuf?gen"
 
 #. i18n: file: searchpaths.ui:63
 #. i18n: ectx: property (text), widget (QPushButton, removeButton)
@@ -147,7 +147,7 @@
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
 "weight:600;\">Warnung:</span> Die Gtk-Qt-Theme-Engine ist nicht installiert. "
 "Das bedeutet, dass Sie Ihren KDE-Stil nicht in GTK-Anwendungen verwenden "
-"knnen.</p></body></html>"
+"k?nnen.</p></body></html>"
 
 msgid "Gtk-Qt theme engine homepage"
 msgstr "Homepage der Gtk-Qt-Theme-Engine"
@@ -156,7 +156,7 @@
 msgstr "http://gtk-qt.ecs.soton.ac.uk"
 
 msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
-msgstr "Falsches ben von Xylophonmusik qult jeden greren Zwerg"
+msgstr "Falsches ?ben von Xylophonmusik qu?lt jeden gr??eren Zwerg"
 
 msgid "Firefox and Thunderbird"
 msgstr "Firefox und Thunderbird"
@@ -166,12 +166,12 @@
 "Thunderbird.  This can be fixed by installing some files into your Mozilla "
 "profile."
 msgstr ""
-"Die Knpfe der Bildlaufleiste werden in Firefox und Thunderbird gelegentlich "
+"Die Kn?pfe der Bildlaufleiste werden in Firefox und Thunderbird gelegentlich "
 "falsch dargestellt. Dies kann durch das Installieren einiger Dateien in das "
 "Mozilla-Profilverzeichnis behoben werden."
 
 msgid "I&nstall scrollbar fix..."
-msgstr "Korrektur fr Bildlaufleiste i&nstallieren ..."
+msgstr "Korrektur f?r Bildlaufleiste i&nstallieren ..."
 
 msgid ""
 "The control center module could not find the GTK-Qt theme engine in its list "
@@ -180,7 +180,7 @@
 msgstr ""
 "Das Kontrollzentrum-Modul konnte die GTK-Qt-Theme-Engine nicht in der Liste "
 "der Suchpfade finden. Wenn Sie sie an einem anderen Ort installiert haben, "
-"mssen Sie den korrekten Pfad der Liste hinzufgen."
+"m?ssen Sie den korrekten Pfad der Liste hinzuf?gen."
 
 msgid "No Mozilla profiles found"
 msgstr "Keine Mozilla-Profile gefunden"
@@ -193,14 +193,14 @@
 "all Firefox and Thunderbird windows for the changes to take effect"
 msgstr ""
 "Das Mozilla-Profil wurde erfolgreich aktualisiert. Alle laufenden Firefox- "
-"und Thunderbird-Fenster mssen geschlossen und neu geffnet werden, um die "
-"nderungen zu bernehmen."
+"und Thunderbird-Fenster m?ssen geschlossen und neu ge?ffnet werden, um die "
+"?nderungen zu ?bernehmen."
 
 msgid "Mozilla profile"
 msgstr "Mozilla-Profil"
 
 msgid "Could not write to %1"
-msgstr "%1 lie sich nicht schreiben"
+msgstr "%1 lie? sich nicht schreiben"
 
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -230,19 +230,19 @@
 "will not be able to use your KDE style in GTK applications."
 msgstr ""
 "<b>Warnung:</b> Die Gtk-Qt-Theme-Engine ist nicht installiert. Das bedeutet ,"
-"dass Ihre KDE-Stile nicht in GTK-Anwendungen verwendet werden knnen."
+"dass Ihre KDE-Stile nicht in GTK-Anwendungen verwendet werden k?nnen."
 
 msgid "Preview line 1"
 msgstr "Vorschauzeile 1"
 
 msgid "GTK Keyboard Shortcuts"
-msgstr "GTK-Tastenkrzel"
+msgstr "GTK-Tastenk?rzel"
 
 msgid "Use Emacs-like key&board shortcuts for text editing"
-msgstr "Emacs-Tastenkrzel zum Editieren von Text verwenden"
+msgstr "Emacs-Tastenk?rzel zum Editieren von Text verwenden"
 
 msgid "Profile"
 msgstr "Profil"
 
 msgid "Please select the profiles that you want to fix:"
-msgstr "Bitte whlen Sie die zu korrigierenden Profile aus:"
+msgstr "Bitte w?hlen Sie die zu korrigierenden Profile aus:"

kcm-gtk-0.5.3-gtkrc_setenv.patch:
 gtkrcfile.cpp |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE kcm-gtk-0.5.3-gtkrc_setenv.patch ---
diff -up kcm-gtk-0.5.3/gtkrcfile.cpp.gtkrc_setenv kcm-gtk-0.5.3/gtkrcfile.cpp
--- kcm-gtk-0.5.3/gtkrcfile.cpp.gtkrc_setenv	2009-10-23 08:07:44.000000000 -0500
+++ kcm-gtk-0.5.3/gtkrcfile.cpp	2009-10-30 12:42:28.186035811 -0500
@@ -26,6 +26,8 @@
 #include <QTextStream>
 #include <QStringList>
 #include <QtDebug>
+#include <ktoolinvocation.h>
+#include <klauncher_iface.h>
 
 QRegExp GtkRcFile::k_themeNameRe("([^/]+)/gtk-2.0/gtkrc$");
 
@@ -134,6 +136,14 @@ void GtkRcFile::save()
 	stream << "\n";
 	stream << "gtk-theme-name=\"" << m_themeName << "\"\n";
 	stream << "gtk-font-name=\"" << fontName << "\"\n";
+	
+	QByteArray gtkrc = getenv("GTK2_RC_FILES");
+	QStringList list = QFile::decodeName(gtkrc).split( ':');
+	if (!list.contains(m_fileName)) {
+	  list.append(m_fileName);
+	  QString value = QFile::encodeName(list.join(":"));
+	  KToolInvocation::klauncher()->setLaunchEnv("GTK2_RC_FILES", value);
+	}
 }
 
 void GtkRcFile::setFont(const QString& family, int pointSize, bool bold, bool italic)


Index: kcm-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/devel/kcm-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kcm-gtk.spec	30 Oct 2009 17:49:00 -0000	1.2
+++ kcm-gtk.spec	20 Dec 2009 10:53:14 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Configure the appearance of GTK apps in KDE 
 Name:    kcm-gtk 
 Version: 0.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
@@ -21,6 +21,9 @@ Patch50: kcm-gtk-0.5.1-settings_category
 # ensures GTK2_RC_FILES gets used/updated on first use, avoids 
 # possible need for logout/login, code borrowed from kdebase-workspace's krdb.cpp
 Patch51: kcm-gtk-0.5.3-gtkrc_setenv.patch
+# fix missing umlauts and sharp s in the German translation
+# The translations need a lot more fixing than that, but this looks very broken!
+Patch52: kcm-gtk-0.5.3-fix-de.patch
 
 %if 0%{?fedora} > 11
 Obsoletes: gtk-qt-engine <= 1:1.1
@@ -40,7 +43,7 @@ appearance of GTK apps in KDE.
 
 %patch50 -p1 -b .settings_category
 %patch51 -p1 -b .gtkrc_setenv
-
+%patch52 -p1 -b .fix-de
 
 
 %build
@@ -77,6 +80,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.3-2
+- fix missing umlauts and sharp s in the German translation
+
 * Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-1
 - kcm-gtk-0.5.3
 - .gtkrc-2.0-kde4 doesn't get used (#531788)



From kkofler at fedoraproject.org  Sun Dec 20 10:53:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 20 Dec 2009 10:53:15 +0000 (UTC)
Subject: rpms/kcm-gtk/F-12 kcm-gtk-0.5.3-fix-de.patch, NONE, 1.1 kcm-gtk.spec, 
	1.2, 1.3
Message-ID: <20091220105315.2EFEB11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kcm-gtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9759/F-12

Modified Files:
	kcm-gtk.spec 
Added Files:
	kcm-gtk-0.5.3-fix-de.patch 
Log Message:
* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.3-2
- fix missing umlauts and sharp s in the German translation

kcm-gtk-0.5.3-fix-de.patch:
 kcm_gtk.po |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

--- NEW FILE kcm-gtk-0.5.3-fix-de.patch ---
diff -ur kcm-gtk-0.5.3/po/de/kcm_gtk.po kcm-gtk-0.5.3-fix-de/po/de/kcm_gtk.po
--- kcm-gtk-0.5.3/po/de/kcm_gtk.po	2009-10-23 15:07:44.000000000 +0200
+++ kcm-gtk-0.5.3-fix-de/po/de/kcm_gtk.po	2009-12-20 11:47:45.000000000 +0100
@@ -21,7 +21,7 @@
 #: kcmgtk.cpp:107
 #, kde-format
 msgid "%1 (size %2)"
-msgstr "%1 (Gre %2)"
+msgstr "%1 (Gr??e %2)"
 
 #. i18n: file: kcmgtkwidget.ui:19
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
@@ -39,7 +39,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, warning3)
 #: rc.cpp:9 rc.cpp:50
 msgid "Change search paths..."
-msgstr "Suchpfade ndern ..."
+msgstr "Suchpfade ?ndern ..."
 
 #. i18n: file: kcmgtkwidget.ui:94
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
@@ -63,7 +63,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, fontChange)
 #: rc.cpp:21 rc.cpp:62
 msgid "Change..."
-msgstr "ndern ..."
+msgstr "?ndern ..."
 
 #. i18n: file: kcmgtkwidget.ui:165
 #. i18n: ectx: property (text), widget (KSqueezedTextLabel, qtcurveFontLabel)
@@ -84,7 +84,7 @@
 #. i18n: ectx: property (windowTitle), widget (QWidget, SearchPaths)
 #: rc.cpp:30 rc.cpp:71
 msgid "Change search paths"
-msgstr "Suchpfade ndern"
+msgstr "Suchpfade ?ndern"
 
 #. i18n: file: searchpaths.ui:26
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
@@ -99,7 +99,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, addButton)
 #: rc.cpp:36 rc.cpp:77
 msgid "Add"
-msgstr "Hinzufgen"
+msgstr "Hinzuf?gen"
 
 #. i18n: file: searchpaths.ui:63
 #. i18n: ectx: property (text), widget (QPushButton, removeButton)
@@ -147,7 +147,7 @@
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
 "weight:600;\">Warnung:</span> Die Gtk-Qt-Theme-Engine ist nicht installiert. "
 "Das bedeutet, dass Sie Ihren KDE-Stil nicht in GTK-Anwendungen verwenden "
-"knnen.</p></body></html>"
+"k?nnen.</p></body></html>"
 
 msgid "Gtk-Qt theme engine homepage"
 msgstr "Homepage der Gtk-Qt-Theme-Engine"
@@ -156,7 +156,7 @@
 msgstr "http://gtk-qt.ecs.soton.ac.uk"
 
 msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
-msgstr "Falsches ben von Xylophonmusik qult jeden greren Zwerg"
+msgstr "Falsches ?ben von Xylophonmusik qu?lt jeden gr??eren Zwerg"
 
 msgid "Firefox and Thunderbird"
 msgstr "Firefox und Thunderbird"
@@ -166,12 +166,12 @@
 "Thunderbird.  This can be fixed by installing some files into your Mozilla "
 "profile."
 msgstr ""
-"Die Knpfe der Bildlaufleiste werden in Firefox und Thunderbird gelegentlich "
+"Die Kn?pfe der Bildlaufleiste werden in Firefox und Thunderbird gelegentlich "
 "falsch dargestellt. Dies kann durch das Installieren einiger Dateien in das "
 "Mozilla-Profilverzeichnis behoben werden."
 
 msgid "I&nstall scrollbar fix..."
-msgstr "Korrektur fr Bildlaufleiste i&nstallieren ..."
+msgstr "Korrektur f?r Bildlaufleiste i&nstallieren ..."
 
 msgid ""
 "The control center module could not find the GTK-Qt theme engine in its list "
@@ -180,7 +180,7 @@
 msgstr ""
 "Das Kontrollzentrum-Modul konnte die GTK-Qt-Theme-Engine nicht in der Liste "
 "der Suchpfade finden. Wenn Sie sie an einem anderen Ort installiert haben, "
-"mssen Sie den korrekten Pfad der Liste hinzufgen."
+"m?ssen Sie den korrekten Pfad der Liste hinzuf?gen."
 
 msgid "No Mozilla profiles found"
 msgstr "Keine Mozilla-Profile gefunden"
@@ -193,14 +193,14 @@
 "all Firefox and Thunderbird windows for the changes to take effect"
 msgstr ""
 "Das Mozilla-Profil wurde erfolgreich aktualisiert. Alle laufenden Firefox- "
-"und Thunderbird-Fenster mssen geschlossen und neu geffnet werden, um die "
-"nderungen zu bernehmen."
+"und Thunderbird-Fenster m?ssen geschlossen und neu ge?ffnet werden, um die "
+"?nderungen zu ?bernehmen."
 
 msgid "Mozilla profile"
 msgstr "Mozilla-Profil"
 
 msgid "Could not write to %1"
-msgstr "%1 lie sich nicht schreiben"
+msgstr "%1 lie? sich nicht schreiben"
 
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -230,19 +230,19 @@
 "will not be able to use your KDE style in GTK applications."
 msgstr ""
 "<b>Warnung:</b> Die Gtk-Qt-Theme-Engine ist nicht installiert. Das bedeutet ,"
-"dass Ihre KDE-Stile nicht in GTK-Anwendungen verwendet werden knnen."
+"dass Ihre KDE-Stile nicht in GTK-Anwendungen verwendet werden k?nnen."
 
 msgid "Preview line 1"
 msgstr "Vorschauzeile 1"
 
 msgid "GTK Keyboard Shortcuts"
-msgstr "GTK-Tastenkrzel"
+msgstr "GTK-Tastenk?rzel"
 
 msgid "Use Emacs-like key&board shortcuts for text editing"
-msgstr "Emacs-Tastenkrzel zum Editieren von Text verwenden"
+msgstr "Emacs-Tastenk?rzel zum Editieren von Text verwenden"
 
 msgid "Profile"
 msgstr "Profil"
 
 msgid "Please select the profiles that you want to fix:"
-msgstr "Bitte whlen Sie die zu korrigierenden Profile aus:"
+msgstr "Bitte w?hlen Sie die zu korrigierenden Profile aus:"


Index: kcm-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/kcm-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kcm-gtk.spec	30 Oct 2009 17:49:01 -0000	1.2
+++ kcm-gtk.spec	20 Dec 2009 10:53:14 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Configure the appearance of GTK apps in KDE 
 Name:    kcm-gtk 
 Version: 0.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
@@ -21,6 +21,9 @@ Patch50: kcm-gtk-0.5.1-settings_category
 # ensures GTK2_RC_FILES gets used/updated on first use, avoids 
 # possible need for logout/login, code borrowed from kdebase-workspace's krdb.cpp
 Patch51: kcm-gtk-0.5.3-gtkrc_setenv.patch
+# fix missing umlauts and sharp s in the German translation
+# The translations need a lot more fixing than that, but this looks very broken!
+Patch52: kcm-gtk-0.5.3-fix-de.patch
 
 %if 0%{?fedora} > 11
 Obsoletes: gtk-qt-engine <= 1:1.1
@@ -40,7 +43,7 @@ appearance of GTK apps in KDE.
 
 %patch50 -p1 -b .settings_category
 %patch51 -p1 -b .gtkrc_setenv
-
+%patch52 -p1 -b .fix-de
 
 
 %build
@@ -77,6 +80,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.3-2
+- fix missing umlauts and sharp s in the German translation
+
 * Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-1
 - kcm-gtk-0.5.3
 - .gtkrc-2.0-kde4 doesn't get used (#531788)



From kkofler at fedoraproject.org  Sun Dec 20 10:53:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 20 Dec 2009 10:53:15 +0000 (UTC)
Subject: rpms/kcm-gtk/F-11 kcm-gtk-0.5.3-fix-de.patch, NONE, 1.1 kcm-gtk.spec, 
	1.2, 1.3
Message-ID: <20091220105315.31CB511C01EA@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kcm-gtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9759/F-11

Modified Files:
	kcm-gtk.spec 
Added Files:
	kcm-gtk-0.5.3-fix-de.patch 
Log Message:
* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.3-2
- fix missing umlauts and sharp s in the German translation

kcm-gtk-0.5.3-fix-de.patch:
 kcm_gtk.po |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

--- NEW FILE kcm-gtk-0.5.3-fix-de.patch ---
diff -ur kcm-gtk-0.5.3/po/de/kcm_gtk.po kcm-gtk-0.5.3-fix-de/po/de/kcm_gtk.po
--- kcm-gtk-0.5.3/po/de/kcm_gtk.po	2009-10-23 15:07:44.000000000 +0200
+++ kcm-gtk-0.5.3-fix-de/po/de/kcm_gtk.po	2009-12-20 11:47:45.000000000 +0100
@@ -21,7 +21,7 @@
 #: kcmgtk.cpp:107
 #, kde-format
 msgid "%1 (size %2)"
-msgstr "%1 (Gre %2)"
+msgstr "%1 (Gr??e %2)"
 
 #. i18n: file: kcmgtkwidget.ui:19
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
@@ -39,7 +39,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, warning3)
 #: rc.cpp:9 rc.cpp:50
 msgid "Change search paths..."
-msgstr "Suchpfade ndern ..."
+msgstr "Suchpfade ?ndern ..."
 
 #. i18n: file: kcmgtkwidget.ui:94
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
@@ -63,7 +63,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, fontChange)
 #: rc.cpp:21 rc.cpp:62
 msgid "Change..."
-msgstr "ndern ..."
+msgstr "?ndern ..."
 
 #. i18n: file: kcmgtkwidget.ui:165
 #. i18n: ectx: property (text), widget (KSqueezedTextLabel, qtcurveFontLabel)
@@ -84,7 +84,7 @@
 #. i18n: ectx: property (windowTitle), widget (QWidget, SearchPaths)
 #: rc.cpp:30 rc.cpp:71
 msgid "Change search paths"
-msgstr "Suchpfade ndern"
+msgstr "Suchpfade ?ndern"
 
 #. i18n: file: searchpaths.ui:26
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
@@ -99,7 +99,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, addButton)
 #: rc.cpp:36 rc.cpp:77
 msgid "Add"
-msgstr "Hinzufgen"
+msgstr "Hinzuf?gen"
 
 #. i18n: file: searchpaths.ui:63
 #. i18n: ectx: property (text), widget (QPushButton, removeButton)
@@ -147,7 +147,7 @@
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
 "weight:600;\">Warnung:</span> Die Gtk-Qt-Theme-Engine ist nicht installiert. "
 "Das bedeutet, dass Sie Ihren KDE-Stil nicht in GTK-Anwendungen verwenden "
-"knnen.</p></body></html>"
+"k?nnen.</p></body></html>"
 
 msgid "Gtk-Qt theme engine homepage"
 msgstr "Homepage der Gtk-Qt-Theme-Engine"
@@ -156,7 +156,7 @@
 msgstr "http://gtk-qt.ecs.soton.ac.uk"
 
 msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
-msgstr "Falsches ben von Xylophonmusik qult jeden greren Zwerg"
+msgstr "Falsches ?ben von Xylophonmusik qu?lt jeden gr??eren Zwerg"
 
 msgid "Firefox and Thunderbird"
 msgstr "Firefox und Thunderbird"
@@ -166,12 +166,12 @@
 "Thunderbird.  This can be fixed by installing some files into your Mozilla "
 "profile."
 msgstr ""
-"Die Knpfe der Bildlaufleiste werden in Firefox und Thunderbird gelegentlich "
+"Die Kn?pfe der Bildlaufleiste werden in Firefox und Thunderbird gelegentlich "
 "falsch dargestellt. Dies kann durch das Installieren einiger Dateien in das "
 "Mozilla-Profilverzeichnis behoben werden."
 
 msgid "I&nstall scrollbar fix..."
-msgstr "Korrektur fr Bildlaufleiste i&nstallieren ..."
+msgstr "Korrektur f?r Bildlaufleiste i&nstallieren ..."
 
 msgid ""
 "The control center module could not find the GTK-Qt theme engine in its list "
@@ -180,7 +180,7 @@
 msgstr ""
 "Das Kontrollzentrum-Modul konnte die GTK-Qt-Theme-Engine nicht in der Liste "
 "der Suchpfade finden. Wenn Sie sie an einem anderen Ort installiert haben, "
-"mssen Sie den korrekten Pfad der Liste hinzufgen."
+"m?ssen Sie den korrekten Pfad der Liste hinzuf?gen."
 
 msgid "No Mozilla profiles found"
 msgstr "Keine Mozilla-Profile gefunden"
@@ -193,14 +193,14 @@
 "all Firefox and Thunderbird windows for the changes to take effect"
 msgstr ""
 "Das Mozilla-Profil wurde erfolgreich aktualisiert. Alle laufenden Firefox- "
-"und Thunderbird-Fenster mssen geschlossen und neu geffnet werden, um die "
-"nderungen zu bernehmen."
+"und Thunderbird-Fenster m?ssen geschlossen und neu ge?ffnet werden, um die "
+"?nderungen zu ?bernehmen."
 
 msgid "Mozilla profile"
 msgstr "Mozilla-Profil"
 
 msgid "Could not write to %1"
-msgstr "%1 lie sich nicht schreiben"
+msgstr "%1 lie? sich nicht schreiben"
 
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -230,19 +230,19 @@
 "will not be able to use your KDE style in GTK applications."
 msgstr ""
 "<b>Warnung:</b> Die Gtk-Qt-Theme-Engine ist nicht installiert. Das bedeutet ,"
-"dass Ihre KDE-Stile nicht in GTK-Anwendungen verwendet werden knnen."
+"dass Ihre KDE-Stile nicht in GTK-Anwendungen verwendet werden k?nnen."
 
 msgid "Preview line 1"
 msgstr "Vorschauzeile 1"
 
 msgid "GTK Keyboard Shortcuts"
-msgstr "GTK-Tastenkrzel"
+msgstr "GTK-Tastenk?rzel"
 
 msgid "Use Emacs-like key&board shortcuts for text editing"
-msgstr "Emacs-Tastenkrzel zum Editieren von Text verwenden"
+msgstr "Emacs-Tastenk?rzel zum Editieren von Text verwenden"
 
 msgid "Profile"
 msgstr "Profil"
 
 msgid "Please select the profiles that you want to fix:"
-msgstr "Bitte whlen Sie die zu korrigierenden Profile aus:"
+msgstr "Bitte w?hlen Sie die zu korrigierenden Profile aus:"


Index: kcm-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-11/kcm-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kcm-gtk.spec	30 Oct 2009 17:51:26 -0000	1.2
+++ kcm-gtk.spec	20 Dec 2009 10:53:13 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Configure the appearance of GTK apps in KDE 
 Name:    kcm-gtk 
 Version: 0.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
@@ -21,6 +21,9 @@ Patch50: kcm-gtk-0.5.1-settings_category
 # ensures GTK2_RC_FILES gets used/updated on first use, avoids 
 # possible need for logout/login, code borrowed from kdebase-workspace's krdb.cpp
 Patch51: kcm-gtk-0.5.3-gtkrc_setenv.patch
+# fix missing umlauts and sharp s in the German translation
+# The translations need a lot more fixing than that, but this looks very broken!
+Patch52: kcm-gtk-0.5.3-fix-de.patch
 
 %if 0%{?fedora} > 11
 Obsoletes: gtk-qt-engine <= 1:1.1
@@ -40,7 +43,7 @@ appearance of GTK apps in KDE.
 
 %patch50 -p1 -b .settings_category
 %patch51 -p1 -b .gtkrc_setenv
-
+%patch52 -p1 -b .fix-de
 
 
 %build
@@ -77,6 +80,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.3-2
+- fix missing umlauts and sharp s in the German translation
+
 * Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-1
 - kcm-gtk-0.5.3
 - .gtkrc-2.0-kde4 doesn't get used (#531788)



From jwrdegoede at fedoraproject.org  Sun Dec 20 10:54:50 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 20 Dec 2009 10:54:50 +0000 (UTC)
Subject: rpms/parted/F-12 parted-1.9.0-lo-as-file-rh546622.patch, 1.1,
	1.2 parted.spec, 1.151, 1.152
Message-ID: <20091220105450.F022011C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/parted/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10270

Modified Files:
	parted-1.9.0-lo-as-file-rh546622.patch parted.spec 
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17.2
- Fix crash when partitioning loopback devices (#546622)


parted-1.9.0-lo-as-file-rh546622.patch:
 linux.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

Index: parted-1.9.0-lo-as-file-rh546622.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/F-12/parted-1.9.0-lo-as-file-rh546622.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-lo-as-file-rh546622.patch	18 Dec 2009 10:29:01 -0000	1.1
+++ parted-1.9.0-lo-as-file-rh546622.patch	20 Dec 2009 10:54:50 -0000	1.2
@@ -18,3 +18,19 @@ diff -up parted-1.9.0/libparted/arch/lin
          } else {
                  dev->type = PED_DEVICE_UNKNOWN;
          }
+@@ -1048,6 +1048,15 @@ init_file (PedDevice* dev)
+         if (!ped_device_open (dev))
+                 goto error;
+ 
++        dev->sector_size = PED_SECTOR_SIZE_DEFAULT;
++        char *p = getenv ("PARTED_SECTOR_SIZE");
++        if (p) {
++                int s = atoi (p);
++                if (0 < s && s % 512 == 0)
++                        dev->sector_size = s;
++        }
++        dev->phys_sector_size = dev->sector_size;
++
+         if (S_ISBLK(dev_stat.st_mode))
+                 dev->length = _device_get_length (dev);
+         else


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/F-12/parted.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- parted.spec	18 Dec 2009 10:29:01 -0000	1.151
+++ parted.spec	20 Dec 2009 10:54:50 -0000	1.152
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 17.1%{?dist}
+Release: 17.2%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -146,6 +146,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17.2
+- Fix crash when partitioning loopback devices (#546622)
+
 * Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17.1
 - Allow partitioning of loopback devices (#546622)
 - Don't crash when printing partition tables in Russian (#543029)



From kdudka at fedoraproject.org  Sun Dec 20 11:13:08 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sun, 20 Dec 2009 11:13:08 +0000 (UTC)
Subject: File acl-2.2.49.src.tar.gz uploaded to lookaside cache by kdudka
Message-ID: <20091220111308.AE87410F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for acl:

181445894cca986da9ae0099d5ce2d08  acl-2.2.49.src.tar.gz



From kdudka at fedoraproject.org  Sun Dec 20 11:26:22 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sun, 20 Dec 2009 11:26:22 +0000 (UTC)
Subject: rpms/acl/devel .cvsignore, 1.11, 1.12 acl-2.2.3-multilib.patch, 1.1, 
	1.2 acl-2.2.39-build.patch, 1.1, 1.2 acl-2.2.39-nfsv4.patch, 1.1,
	1.2 acl.spec, 1.52, 1.53 sources, 1.11,
	1.12 acl-2.2.32-build.patch, 1.1, NONE acl-2.2.39-man.patch, 1.2,
	NONE acl-2.2.39-params.patch, 1.3,
	NONE acl-2.2.39-path_max.patch, 1.3,
	NONE acl-2.2.39-segfault.patch, 1.1, NONE acl-2.2.39-walk.patch,
	1.2, NONE acl-2.2.45-exitcode.patch, 1.1,
	NONE acl-2.2.47-params.patch, 1.2, NONE
Message-ID: <20091220112622.8A06E11C00E6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/acl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15701

Modified Files:
	.cvsignore acl-2.2.3-multilib.patch acl-2.2.39-build.patch 
	acl-2.2.39-nfsv4.patch acl.spec sources 
Removed Files:
	acl-2.2.32-build.patch acl-2.2.39-man.patch 
	acl-2.2.39-params.patch acl-2.2.39-path_max.patch 
	acl-2.2.39-segfault.patch acl-2.2.39-walk.patch 
	acl-2.2.45-exitcode.patch acl-2.2.47-params.patch 
Log Message:
- new upstream bugfix release
- big cleanup in patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Feb 2008 15:37:16 -0000	1.11
+++ .cvsignore	20 Dec 2009 11:26:21 -0000	1.12
@@ -1 +1 @@
-acl_2.2.47-1.tar.gz
+acl-2.2.49.src.tar.gz

acl-2.2.3-multilib.patch:
 buildmacros |    2 --
 1 file changed, 2 deletions(-)

Index: acl-2.2.3-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl-2.2.3-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- acl-2.2.3-multilib.patch	9 Sep 2004 02:52:09 -0000	1.1
+++ acl-2.2.3-multilib.patch	20 Dec 2009 11:26:21 -0000	1.2
@@ -1,11 +1,13 @@
---- acl-2.2.3/include/buildmacros.multilib	2003-01-28 19:00:05.000000000 -0500
-+++ acl-2.2.3/include/buildmacros	2003-01-28 19:04:13.000000000 -0500
-@@ -103,8 +103,6 @@
- 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..17423c0 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -88,8 +88,6 @@ INSTALL_LTLIB_DEV = \
  	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
  	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+ 	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
+ 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
+ 	fi
  else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

acl-2.2.39-build.patch:
 builddefs.in |   16 ++++++++--------
 buildmacros  |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Index: acl-2.2.39-build.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl-2.2.39-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- acl-2.2.39-build.patch	5 Jul 2006 19:32:11 -0000	1.1
+++ acl-2.2.39-build.patch	20 Dec 2009 11:26:21 -0000	1.2
@@ -1,6 +1,8 @@
---- acl-2.2.39/include/builddefs.in.build	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/include/builddefs.in	2006-07-05 12:34:05.000000000 -0400
-@@ -26,14 +26,14 @@
+diff --git a/include/builddefs.in b/include/builddefs.in
+index d054a56..10b0cd4 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -28,14 +28,14 @@ PKG_RELEASE	= @pkg_release@
  PKG_VERSION	= @pkg_version@
  PKG_PLATFORM	= @pkg_platform@
  PKG_DISTRIBUTION= @pkg_distribution@
@@ -23,14 +25,16 @@
  
  CC		= @cc@
  AWK		= @awk@
---- acl-2.2.39/include/buildmacros.build	2006-07-05 12:32:07.000000000 -0400
-+++ acl-2.2.39/include/buildmacros	2006-07-05 12:32:07.000000000 -0400
-@@ -26,7 +26,7 @@
+diff --git a/include/buildmacros b/include/buildmacros
+index 17423c0..3118a17 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
  	  $(LFILES:.l=.o) \
  	  $(YFILES:%.y=%.tab.o)
  
--INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL	= $(TOPDIR)/install-sh
+-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/include/install-sh
  
  SHELL = /bin/sh
  IMAGES_DIR = $(TOPDIR)/all-images

acl-2.2.39-nfsv4.patch:
 exports                              |   30 ++
 include/builddefs.in                 |    2 
 include/libacl_nfs4.h                |   97 ++++++
 include/nfs4.h                       |  397 +++++++++++++++++++++++++++
 libacl/Makefile                      |   28 +
 libacl/__posix_acl_from_nfs4_xattr.c |   60 ++++
 libacl/acl_extended_file.c           |   29 +
 libacl/acl_get_fd.c                  |   50 ++-
 libacl/acl_get_file.c                |   46 ++-
 libacl/acl_n4tp_acl_trans.c          |  439 ++++++++++++++++++++++++++++++
 libacl/acl_nfs4_add_ace.c            |   83 +++++
 libacl/acl_nfs4_add_pair.c           |   60 ++++
 libacl/acl_nfs4_copy_acl.c           |   85 +++++
 libacl/acl_nfs4_free.c               |   61 ++++
 libacl/acl_nfs4_get_who.c            |  103 +++++++
 libacl/acl_nfs4_get_whotype.c        |   60 ++++
 libacl/acl_nfs4_new.c                |   58 +++
 libacl/acl_nfs4_remove_ace.c         |   48 +++
 libacl/acl_nfs4_set_who.c            |   92 ++++++
 libacl/acl_nfs4_xattr_load.c         |  191 +++++++++++++
 libacl/acl_nfs4_xattr_pack.c         |  148 ++++++++++
 libacl/acl_nfs4_xattr_size.c         |   91 ++++++
 libacl/acl_ptn4_acl_trans.c          |  509 +++++++++++++++++++++++++++++++++++
 libacl/acl_ptn4_get_mask.c           |   81 +++++
 libacl/acl_set_fd.c                  |   37 ++
 libacl/acl_set_file.c                |   72 ++++
 libacl/libacl_nfs4.h                 |   97 ++++++
 27 files changed, 3033 insertions(+), 21 deletions(-)

Index: acl-2.2.39-nfsv4.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl-2.2.39-nfsv4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- acl-2.2.39-nfsv4.patch	28 Aug 2007 19:23:46 -0000	1.1
+++ acl-2.2.39-nfsv4.patch	20 Dec 2009 11:26:21 -0000	1.2
@@ -1,3 +1,5 @@
+NOTE: This patch is not being used any more since 2.2.39-8.
+
 --- /dev/null	2007-08-22 11:21:03.626521839 -0400
 +++ acl-2.2.39/libacl/acl_nfs4_get_who.c	2007-08-22 12:02:13.000000000 -0400
 @@ -0,0 +1,103 @@


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- acl.spec	24 Jul 2009 16:33:47 -0000	1.52
+++ acl.spec	20 Dec 2009 11:26:21 -0000	1.53
@@ -1,17 +1,13 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.47
-Release: 5%{?dist}
+Version: 2.2.49
+Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
-Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz
+Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
-Patch2: acl-2.2.39-path_max.patch
-Patch3: acl-2.2.47-params.patch
-Patch4: acl-2.2.45-exitcode.patch
-Patch5: acl-2.2.39-segfault.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -46,12 +42,8 @@ defined in POSIX 1003.1e draft standard 
 
 %prep
 %setup -q
-%patch0 -p1 -b .multilib
-%patch1 -p1 -b .build
-%patch2 -p1 -b .path_max
-%patch3 -p1 -b .params
-%patch4 -p1 -b .exitcode
-%patch5 -p1 -b .segfault
+%patch0 -p1
+%patch1 -p1
 autoconf
 
 %build
@@ -84,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n libacl -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/chacl
 %{_bindir}/getfacl
 %{_bindir}/setfacl
@@ -95,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/acl.5*
 
 %files -n libacl-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libacl.so
 %{_includedir}/acl
 %{_includedir}/sys/acl.h
@@ -103,10 +95,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/acl_*
 
 %files -n libacl
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libacl.so.*
 
 %changelog
+* Sun Dec 20 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-1
+- new upstream bugfix release
+- big cleanup in patches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.47-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	12 Feb 2008 15:37:16 -0000	1.11
+++ sources	20 Dec 2009 11:26:21 -0000	1.12
@@ -1 +1 @@
-a11e4571a54a0b1ae83010d1e68a64c2  acl_2.2.47-1.tar.gz
+181445894cca986da9ae0099d5ce2d08  acl-2.2.49.src.tar.gz


--- acl-2.2.32-build.patch DELETED ---


--- acl-2.2.39-man.patch DELETED ---


--- acl-2.2.39-params.patch DELETED ---


--- acl-2.2.39-path_max.patch DELETED ---


--- acl-2.2.39-segfault.patch DELETED ---


--- acl-2.2.39-walk.patch DELETED ---


--- acl-2.2.45-exitcode.patch DELETED ---


--- acl-2.2.47-params.patch DELETED ---



From kdudka at fedoraproject.org  Sun Dec 20 11:31:37 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sun, 20 Dec 2009 11:31:37 +0000 (UTC)
Subject: rpms/acl/F-12 .cvsignore, 1.11, 1.12 acl-2.2.3-multilib.patch, 1.1,
	1.2 acl-2.2.39-build.patch, 1.1, 1.2 acl.spec, 1.52,
	1.53 sources, 1.11, 1.12 acl-2.2.32-build.patch, 1.1,
	NONE acl-2.2.39-man.patch, 1.2, NONE acl-2.2.39-nfsv4.patch, 1.1,
	NONE acl-2.2.39-params.patch, 1.3,
	NONE acl-2.2.39-path_max.patch, 1.3,
	NONE acl-2.2.39-segfault.patch, 1.1, NONE acl-2.2.39-walk.patch,
	1.2, NONE acl-2.2.45-exitcode.patch, 1.1,
	NONE acl-2.2.47-params.patch, 1.2, NONE
Message-ID: <20091220113137.6311F11C00E6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/acl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16696

Modified Files:
	.cvsignore acl-2.2.3-multilib.patch acl-2.2.39-build.patch 
	acl.spec sources 
Removed Files:
	acl-2.2.32-build.patch acl-2.2.39-man.patch 
	acl-2.2.39-nfsv4.patch acl-2.2.39-params.patch 
	acl-2.2.39-path_max.patch acl-2.2.39-segfault.patch 
	acl-2.2.39-walk.patch acl-2.2.45-exitcode.patch 
	acl-2.2.47-params.patch 
Log Message:
- new upstream bugfix release
- big cleanup in patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/acl/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Feb 2008 15:37:16 -0000	1.11
+++ .cvsignore	20 Dec 2009 11:31:35 -0000	1.12
@@ -1 +1 @@
-acl_2.2.47-1.tar.gz
+acl-2.2.49.src.tar.gz

acl-2.2.3-multilib.patch:
 buildmacros |    2 --
 1 file changed, 2 deletions(-)

Index: acl-2.2.3-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/F-12/acl-2.2.3-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- acl-2.2.3-multilib.patch	9 Sep 2004 02:52:09 -0000	1.1
+++ acl-2.2.3-multilib.patch	20 Dec 2009 11:31:35 -0000	1.2
@@ -1,11 +1,13 @@
---- acl-2.2.3/include/buildmacros.multilib	2003-01-28 19:00:05.000000000 -0500
-+++ acl-2.2.3/include/buildmacros	2003-01-28 19:04:13.000000000 -0500
-@@ -103,8 +103,6 @@
- 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..17423c0 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -88,8 +88,6 @@ INSTALL_LTLIB_DEV = \
  	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
  	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+ 	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
+ 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
+ 	fi
  else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

acl-2.2.39-build.patch:
 builddefs.in |   16 ++++++++--------
 buildmacros  |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Index: acl-2.2.39-build.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/F-12/acl-2.2.39-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- acl-2.2.39-build.patch	5 Jul 2006 19:32:11 -0000	1.1
+++ acl-2.2.39-build.patch	20 Dec 2009 11:31:36 -0000	1.2
@@ -1,6 +1,8 @@
---- acl-2.2.39/include/builddefs.in.build	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/include/builddefs.in	2006-07-05 12:34:05.000000000 -0400
-@@ -26,14 +26,14 @@
+diff --git a/include/builddefs.in b/include/builddefs.in
+index d054a56..10b0cd4 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -28,14 +28,14 @@ PKG_RELEASE	= @pkg_release@
  PKG_VERSION	= @pkg_version@
  PKG_PLATFORM	= @pkg_platform@
  PKG_DISTRIBUTION= @pkg_distribution@
@@ -23,14 +25,16 @@
  
  CC		= @cc@
  AWK		= @awk@
---- acl-2.2.39/include/buildmacros.build	2006-07-05 12:32:07.000000000 -0400
-+++ acl-2.2.39/include/buildmacros	2006-07-05 12:32:07.000000000 -0400
-@@ -26,7 +26,7 @@
+diff --git a/include/buildmacros b/include/buildmacros
+index 17423c0..3118a17 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
  	  $(LFILES:.l=.o) \
  	  $(YFILES:%.y=%.tab.o)
  
--INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL	= $(TOPDIR)/install-sh
+-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/include/install-sh
  
  SHELL = /bin/sh
  IMAGES_DIR = $(TOPDIR)/all-images


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-12/acl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- acl.spec	24 Jul 2009 16:33:47 -0000	1.52
+++ acl.spec	20 Dec 2009 11:31:37 -0000	1.53
@@ -1,17 +1,13 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.47
-Release: 5%{?dist}
+Version: 2.2.49
+Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
-Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz
+Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
-Patch2: acl-2.2.39-path_max.patch
-Patch3: acl-2.2.47-params.patch
-Patch4: acl-2.2.45-exitcode.patch
-Patch5: acl-2.2.39-segfault.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -46,12 +42,8 @@ defined in POSIX 1003.1e draft standard 
 
 %prep
 %setup -q
-%patch0 -p1 -b .multilib
-%patch1 -p1 -b .build
-%patch2 -p1 -b .path_max
-%patch3 -p1 -b .params
-%patch4 -p1 -b .exitcode
-%patch5 -p1 -b .segfault
+%patch0 -p1
+%patch1 -p1
 autoconf
 
 %build
@@ -84,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n libacl -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/chacl
 %{_bindir}/getfacl
 %{_bindir}/setfacl
@@ -95,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/acl.5*
 
 %files -n libacl-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libacl.so
 %{_includedir}/acl
 %{_includedir}/sys/acl.h
@@ -103,10 +95,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/acl_*
 
 %files -n libacl
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libacl.so.*
 
 %changelog
+* Sun Dec 20 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-1
+- new upstream bugfix release
+- big cleanup in patches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.47-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acl/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	12 Feb 2008 15:37:16 -0000	1.11
+++ sources	20 Dec 2009 11:31:37 -0000	1.12
@@ -1 +1 @@
-a11e4571a54a0b1ae83010d1e68a64c2  acl_2.2.47-1.tar.gz
+181445894cca986da9ae0099d5ce2d08  acl-2.2.49.src.tar.gz


--- acl-2.2.32-build.patch DELETED ---


--- acl-2.2.39-man.patch DELETED ---


--- acl-2.2.39-nfsv4.patch DELETED ---


--- acl-2.2.39-params.patch DELETED ---


--- acl-2.2.39-path_max.patch DELETED ---


--- acl-2.2.39-segfault.patch DELETED ---


--- acl-2.2.39-walk.patch DELETED ---


--- acl-2.2.45-exitcode.patch DELETED ---


--- acl-2.2.47-params.patch DELETED ---



From kdudka at fedoraproject.org  Sun Dec 20 11:35:48 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sun, 20 Dec 2009 11:35:48 +0000 (UTC)
Subject: rpms/acl/F-11 .cvsignore, 1.11, 1.12 acl-2.2.3-multilib.patch, 1.1,
	1.2 acl-2.2.39-build.patch, 1.1, 1.2 acl.spec, 1.51,
	1.52 sources, 1.11, 1.12 acl-2.2.32-build.patch, 1.1,
	NONE acl-2.2.39-man.patch, 1.2, NONE acl-2.2.39-nfsv4.patch, 1.1,
	NONE acl-2.2.39-params.patch, 1.3,
	NONE acl-2.2.39-path_max.patch, 1.3,
	NONE acl-2.2.39-segfault.patch, 1.1, NONE acl-2.2.39-walk.patch,
	1.2, NONE acl-2.2.45-exitcode.patch, 1.1,
	NONE acl-2.2.47-params.patch, 1.2, NONE
Message-ID: <20091220113548.8DD1511C00E6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/acl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17474

Modified Files:
	.cvsignore acl-2.2.3-multilib.patch acl-2.2.39-build.patch 
	acl.spec sources 
Removed Files:
	acl-2.2.32-build.patch acl-2.2.39-man.patch 
	acl-2.2.39-nfsv4.patch acl-2.2.39-params.patch 
	acl-2.2.39-path_max.patch acl-2.2.39-segfault.patch 
	acl-2.2.39-walk.patch acl-2.2.45-exitcode.patch 
	acl-2.2.47-params.patch 
Log Message:
- new upstream bugfix release
- big cleanup in patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/acl/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Feb 2008 15:37:16 -0000	1.11
+++ .cvsignore	20 Dec 2009 11:35:46 -0000	1.12
@@ -1 +1 @@
-acl_2.2.47-1.tar.gz
+acl-2.2.49.src.tar.gz

acl-2.2.3-multilib.patch:
 buildmacros |    2 --
 1 file changed, 2 deletions(-)

Index: acl-2.2.3-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/F-11/acl-2.2.3-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- acl-2.2.3-multilib.patch	9 Sep 2004 02:52:09 -0000	1.1
+++ acl-2.2.3-multilib.patch	20 Dec 2009 11:35:46 -0000	1.2
@@ -1,11 +1,13 @@
---- acl-2.2.3/include/buildmacros.multilib	2003-01-28 19:00:05.000000000 -0500
-+++ acl-2.2.3/include/buildmacros	2003-01-28 19:04:13.000000000 -0500
-@@ -103,8 +103,6 @@
- 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..17423c0 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -88,8 +88,6 @@ INSTALL_LTLIB_DEV = \
  	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
  	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+ 	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
+ 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
+ 	fi
  else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

acl-2.2.39-build.patch:
 builddefs.in |   16 ++++++++--------
 buildmacros  |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Index: acl-2.2.39-build.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/F-11/acl-2.2.39-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- acl-2.2.39-build.patch	5 Jul 2006 19:32:11 -0000	1.1
+++ acl-2.2.39-build.patch	20 Dec 2009 11:35:47 -0000	1.2
@@ -1,6 +1,8 @@
---- acl-2.2.39/include/builddefs.in.build	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/include/builddefs.in	2006-07-05 12:34:05.000000000 -0400
-@@ -26,14 +26,14 @@
+diff --git a/include/builddefs.in b/include/builddefs.in
+index d054a56..10b0cd4 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -28,14 +28,14 @@ PKG_RELEASE	= @pkg_release@
  PKG_VERSION	= @pkg_version@
  PKG_PLATFORM	= @pkg_platform@
  PKG_DISTRIBUTION= @pkg_distribution@
@@ -23,14 +25,16 @@
  
  CC		= @cc@
  AWK		= @awk@
---- acl-2.2.39/include/buildmacros.build	2006-07-05 12:32:07.000000000 -0400
-+++ acl-2.2.39/include/buildmacros	2006-07-05 12:32:07.000000000 -0400
-@@ -26,7 +26,7 @@
+diff --git a/include/buildmacros b/include/buildmacros
+index 17423c0..3118a17 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
  	  $(LFILES:.l=.o) \
  	  $(YFILES:%.y=%.tab.o)
  
--INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL	= $(TOPDIR)/install-sh
+-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/include/install-sh
  
  SHELL = /bin/sh
  IMAGES_DIR = $(TOPDIR)/all-images


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-11/acl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- acl.spec	24 Feb 2009 00:02:45 -0000	1.51
+++ acl.spec	20 Dec 2009 11:35:48 -0000	1.52
@@ -1,17 +1,13 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.47
-Release: 4%{?dist}
+Version: 2.2.49
+Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
-Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz
+Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
-Patch2: acl-2.2.39-path_max.patch
-Patch3: acl-2.2.47-params.patch
-Patch4: acl-2.2.45-exitcode.patch
-Patch5: acl-2.2.39-segfault.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -46,12 +42,8 @@ defined in POSIX 1003.1e draft standard 
 
 %prep
 %setup -q
-%patch0 -p1 -b .multilib
-%patch1 -p1 -b .build
-%patch2 -p1 -b .path_max
-%patch3 -p1 -b .params
-%patch4 -p1 -b .exitcode
-%patch5 -p1 -b .segfault
+%patch0 -p1
+%patch1 -p1
 autoconf
 
 %build
@@ -84,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n libacl -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/chacl
 %{_bindir}/getfacl
 %{_bindir}/setfacl
@@ -95,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/acl.5*
 
 %files -n libacl-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libacl.so
 %{_includedir}/acl
 %{_includedir}/sys/acl.h
@@ -103,10 +95,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/acl_*
 
 %files -n libacl
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libacl.so.*
 
 %changelog
+* Sun Dec 20 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-1
+- new upstream bugfix release
+- big cleanup in patches
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.47-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acl/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	12 Feb 2008 15:37:16 -0000	1.11
+++ sources	20 Dec 2009 11:35:48 -0000	1.12
@@ -1 +1 @@
-a11e4571a54a0b1ae83010d1e68a64c2  acl_2.2.47-1.tar.gz
+181445894cca986da9ae0099d5ce2d08  acl-2.2.49.src.tar.gz


--- acl-2.2.32-build.patch DELETED ---


--- acl-2.2.39-man.patch DELETED ---


--- acl-2.2.39-nfsv4.patch DELETED ---


--- acl-2.2.39-params.patch DELETED ---


--- acl-2.2.39-path_max.patch DELETED ---


--- acl-2.2.39-segfault.patch DELETED ---


--- acl-2.2.39-walk.patch DELETED ---


--- acl-2.2.45-exitcode.patch DELETED ---


--- acl-2.2.47-params.patch DELETED ---



From arbiter at fedoraproject.org  Sun Dec 20 11:37:58 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Sun, 20 Dec 2009 11:37:58 +0000 (UTC)
Subject: rpms/stalonetray/devel stalonetray.spec,1.4,1.5
Message-ID: <20091220113758.48D6A11C00E6@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/stalonetray/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17939

Modified Files:
	stalonetray.spec 
Log Message:
*** empty log message ***


Index: stalonetray.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stalonetray/devel/stalonetray.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- stalonetray.spec	27 Jul 2009 04:48:42 -0000	1.4
+++ stalonetray.spec	20 Dec 2009 11:37:58 -0000	1.5
@@ -2,8 +2,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=434593
 
 Name:           stalonetray
-Version:        0.7.6
-Release:        4%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        A stand alone notification area
 
 Group:          User Interface/Desktops
@@ -48,6 +48,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 26 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.0-1
+- 0.8.0
+- Introduces the 'slot_size' option which defines the size of a slot
+  containing an icon
+- Changed the way the 'geometry' option works: now it's expressed in
+  slot_size multiples instead of pixels.
+  See the ChangeLog for more information.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From arbiter at fedoraproject.org  Sun Dec 20 11:40:13 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Sun, 20 Dec 2009 11:40:13 +0000 (UTC)
Subject: rpms/stalonetray/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091220114013.BC65A11C03AD@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/stalonetray/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18136

Modified Files:
	.cvsignore sources 
Log Message:
stalonetray *docs*

* Thu Nov 26 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.0-1
- 0.8.0
- Introduces the 'slot_size' option which defines the size of a slot
  containing an icon
- Changed the way the 'geometry' option works: now it's expressed in
  slot_size multiples instead of pixels.
  See the ChangeLog for more information.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stalonetray/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Feb 2008 22:33:12 -0000	1.2
+++ .cvsignore	20 Dec 2009 11:40:13 -0000	1.3
@@ -1 +1 @@
-stalonetray-0.7.6.tar.bz2
+stalonetray-0.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stalonetray/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Feb 2008 22:33:12 -0000	1.2
+++ sources	20 Dec 2009 11:40:13 -0000	1.3
@@ -1 +1 @@
-eebb46182b64d75b89776bbfc867f470  stalonetray-0.7.6.tar.bz2
+b2ce0d8044f7dc76ac9971def1faab37  stalonetray-0.8.0.tar.bz2



From lkundrak at fedoraproject.org  Sun Dec 20 12:14:39 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:14:39 +0000 (UTC)
Subject: rpms/synfig/devel synfig.spec,1.2,1.3
Message-ID: <20091220121439.B50F111C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23454/devel

Modified Files:
	synfig.spec 
Log Message:
* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
- Work around a segfault w/o urw-fonts



Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/devel/synfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- synfig.spec	7 Dec 2009 22:18:28 -0000	1.2
+++ synfig.spec	20 Dec 2009 12:14:38 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -22,6 +22,8 @@ BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libmng-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  libjpeg-devel
+# FIXME: Lack of this causes synfig to segfault
+Requires:       urw-fonts
 
 %description
 Synfig is a powerful, industrial-strength vector-based 2D animation
@@ -108,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
+- Work around a segfault w/o urw-fonts
+
 * Sat Nov 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
 - New upstream release
 



From lkundrak at fedoraproject.org  Sun Dec 20 12:14:39 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:14:39 +0000 (UTC)
Subject: rpms/synfig/F-11 synfig.spec,1.2,1.3
Message-ID: <20091220121439.BAB6F11C02BC@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23454/F-11

Modified Files:
	synfig.spec 
Log Message:
* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
- Work around a segfault w/o urw-fonts



Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/F-11/synfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- synfig.spec	7 Dec 2009 22:33:40 -0000	1.2
+++ synfig.spec	20 Dec 2009 12:14:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -22,6 +22,8 @@ BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libmng-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  libjpeg-devel
+# FIXME: Lack of this causes synfig to segfault
+Requires:       urw-fonts
 
 %description
 Synfig is a powerful, industrial-strength vector-based 2D animation
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.2
+- Work around a segfault w/o urw-fonts
+
 * Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
 - Build with older ETL
 



From lkundrak at fedoraproject.org  Sun Dec 20 12:14:39 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:14:39 +0000 (UTC)
Subject: rpms/synfig/F-12 synfig.spec,1.2,1.3
Message-ID: <20091220121439.BD51011C02C8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23454/F-12

Modified Files:
	synfig.spec 
Log Message:
* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
- Work around a segfault w/o urw-fonts



Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/F-12/synfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- synfig.spec	7 Dec 2009 22:33:40 -0000	1.2
+++ synfig.spec	20 Dec 2009 12:14:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -22,6 +22,8 @@ BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libmng-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  libjpeg-devel
+# FIXME: Lack of this causes synfig to segfault
+Requires:       urw-fonts
 
 %description
 Synfig is a powerful, industrial-strength vector-based 2D animation
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.2
+- Work around a segfault w/o urw-fonts
+
 * Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
 - Build with older ETL
 



From lkundrak at fedoraproject.org  Sun Dec 20 12:14:39 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:14:39 +0000 (UTC)
Subject: rpms/synfig/EL-5 synfig.spec,1.2,1.3
Message-ID: <20091220121439.B7E0811C025E@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23454/EL-5

Modified Files:
	synfig.spec 
Log Message:
* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
- Work around a segfault w/o urw-fonts



Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/EL-5/synfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- synfig.spec	7 Dec 2009 22:33:39 -0000	1.2
+++ synfig.spec	20 Dec 2009 12:14:38 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -22,6 +22,8 @@ BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libmng-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  libjpeg-devel
+# FIXME: Lack of this causes synfig to segfault
+Requires:       urw-fonts
 
 %description
 Synfig is a powerful, industrial-strength vector-based 2D animation
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.2
+- Work around a segfault w/o urw-fonts
+
 * Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
 - Build with older ETL
 



From lkundrak at fedoraproject.org  Sun Dec 20 12:16:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:16:00 +0000 (UTC)
Subject: rpms/synfigstudio/EL-5 synfigstudio.spec,1.1,1.2
Message-ID: <20091220121600.11E6811C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23702/EL-5

Modified Files:
	synfigstudio.spec 
Log Message:
Drag in urw-fonts


Index: synfigstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/EL-5/synfigstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synfigstudio.spec	7 Dec 2009 23:02:41 -0000	1.1
+++ synfigstudio.spec	20 Dec 2009 12:15:59 -0000	1.2
@@ -13,6 +13,8 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  synfig-devel
 BuildRequires:  ETL-devel
 BuildRequires:  gtkmm24-devel
+# FIXME: Lack of this causes synfig to segfault
+Requires:       urw-fonts
 
 %description
 Synfig Animation Studio is a powerful, industrial-strength vector-based
@@ -98,6 +100,7 @@ update-desktop-database &> /dev/null || 
 %changelog
 * Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
 - Build against older ETL
+- Work around fonts synfig bug
 
 * Tue Nov 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
 - Initial packaging attempt



From lkundrak at fedoraproject.org  Sun Dec 20 12:16:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:16:00 +0000 (UTC)
Subject: rpms/synfigstudio/F-11 synfigstudio.spec,1.1,1.2
Message-ID: <20091220121600.5211311C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23702/F-11

Modified Files:
	synfigstudio.spec 
Log Message:
Drag in urw-fonts


Index: synfigstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/F-11/synfigstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synfigstudio.spec	7 Dec 2009 23:02:41 -0000	1.1
+++ synfigstudio.spec	20 Dec 2009 12:16:00 -0000	1.2
@@ -13,6 +13,8 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  synfig-devel
 BuildRequires:  ETL-devel
 BuildRequires:  gtkmm24-devel
+# FIXME: Lack of this causes synfig to segfault
+Requires:       urw-fonts
 
 %description
 Synfig Animation Studio is a powerful, industrial-strength vector-based
@@ -98,6 +100,7 @@ update-desktop-database &> /dev/null || 
 %changelog
 * Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
 - Build against older ETL
+- Work around fonts synfig bug
 
 * Tue Nov 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
 - Initial packaging attempt



From lkundrak at fedoraproject.org  Sun Dec 20 12:16:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:16:00 +0000 (UTC)
Subject: rpms/synfigstudio/F-12 synfigstudio.spec,1.1,1.2
Message-ID: <20091220121600.775C111C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23702/F-12

Modified Files:
	synfigstudio.spec 
Log Message:
Drag in urw-fonts


Index: synfigstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/F-12/synfigstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synfigstudio.spec	7 Dec 2009 23:02:42 -0000	1.1
+++ synfigstudio.spec	20 Dec 2009 12:16:00 -0000	1.2
@@ -13,6 +13,8 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  synfig-devel
 BuildRequires:  ETL-devel
 BuildRequires:  gtkmm24-devel
+# FIXME: Lack of this causes synfig to segfault
+Requires:       urw-fonts
 
 %description
 Synfig Animation Studio is a powerful, industrial-strength vector-based
@@ -98,6 +100,7 @@ update-desktop-database &> /dev/null || 
 %changelog
 * Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1
 - Build against older ETL
+- Work around fonts synfig bug
 
 * Tue Nov 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
 - Initial packaging attempt



From lkundrak at fedoraproject.org  Sun Dec 20 12:40:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:40:12 +0000 (UTC)
Subject: rpms/synfigstudio/F-11 synfigstudio.spec,1.2,1.3
Message-ID: <20091220124013.1F4B511C03AD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28583/F-11

Modified Files:
	synfigstudio.spec 
Log Message:
s/R/BR/


Index: synfigstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/F-11/synfigstudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- synfigstudio.spec	20 Dec 2009 12:16:00 -0000	1.2
+++ synfigstudio.spec	20 Dec 2009 12:40:12 -0000	1.3
@@ -14,7 +14,7 @@ BuildRequires:  synfig-devel
 BuildRequires:  ETL-devel
 BuildRequires:  gtkmm24-devel
 # FIXME: Lack of this causes synfig to segfault
-Requires:       urw-fonts
+BuildRequires:  urw-fonts
 
 %description
 Synfig Animation Studio is a powerful, industrial-strength vector-based



From lkundrak at fedoraproject.org  Sun Dec 20 12:40:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:40:12 +0000 (UTC)
Subject: rpms/synfigstudio/EL-5 synfigstudio.spec,1.2,1.3
Message-ID: <20091220124013.223DD11C0435@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28583/EL-5

Modified Files:
	synfigstudio.spec 
Log Message:
s/R/BR/


Index: synfigstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/EL-5/synfigstudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- synfigstudio.spec	20 Dec 2009 12:15:59 -0000	1.2
+++ synfigstudio.spec	20 Dec 2009 12:40:11 -0000	1.3
@@ -14,7 +14,7 @@ BuildRequires:  synfig-devel
 BuildRequires:  ETL-devel
 BuildRequires:  gtkmm24-devel
 # FIXME: Lack of this causes synfig to segfault
-Requires:       urw-fonts
+BuildRequires:  urw-fonts
 
 %description
 Synfig Animation Studio is a powerful, industrial-strength vector-based



From lkundrak at fedoraproject.org  Sun Dec 20 12:40:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 20 Dec 2009 12:40:12 +0000 (UTC)
Subject: rpms/synfigstudio/F-12 synfigstudio.spec,1.2,1.3
Message-ID: <20091220124013.2529211C049D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28583/F-12

Modified Files:
	synfigstudio.spec 
Log Message:
s/R/BR/


Index: synfigstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/F-12/synfigstudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- synfigstudio.spec	20 Dec 2009 12:16:00 -0000	1.2
+++ synfigstudio.spec	20 Dec 2009 12:40:12 -0000	1.3
@@ -14,7 +14,7 @@ BuildRequires:  synfig-devel
 BuildRequires:  ETL-devel
 BuildRequires:  gtkmm24-devel
 # FIXME: Lack of this causes synfig to segfault
-Requires:       urw-fonts
+BuildRequires:  urw-fonts
 
 %description
 Synfig Animation Studio is a powerful, industrial-strength vector-based



From mbarnes at fedoraproject.org  Sun Dec 20 13:03:44 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 20 Dec 2009 13:03:44 +0000 (UTC)
Subject: rpms/gnome-doc-utils/F-12 .cvsignore, 1.43, 1.44 gnome-doc-utils.spec,
	1.76, 1.77 sources, 1.43, 1.44
Message-ID: <20091220130344.F3E5511C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-doc-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32279

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:

* Sun Dec 20 2009 Matthew Barnes <mbarnes at redhat.com> - 0.18.1-1
- Update to 0.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/F-12/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	21 Sep 2009 18:03:37 -0000	1.43
+++ .cvsignore	20 Dec 2009 13:03:43 -0000	1.44
@@ -1 +1 @@
-gnome-doc-utils-0.18.0.tar.bz2
+gnome-doc-utils-0.18.1.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/F-12/gnome-doc-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- gnome-doc-utils.spec	21 Sep 2009 18:03:37 -0000	1.76
+++ gnome-doc-utils.spec	20 Dec 2009 13:03:43 -0000	1.77
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.18.0
+Version: 0.18.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xml/mallard
 
 %changelog
+* Sun Dec 20 2009 Matthew Barnes <mbarnes at redhat.com> - 0.18.1-1
+- Update to 0.18.1
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 0.18.0-1
 - Update to 0.18.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/F-12/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	21 Sep 2009 18:03:37 -0000	1.43
+++ sources	20 Dec 2009 13:03:43 -0000	1.44
@@ -1 +1 @@
-5a25827673f9ff060a554c0858dbf020  gnome-doc-utils-0.18.0.tar.bz2
+c98ca796f3f2938a1fced7476e65351e  gnome-doc-utils-0.18.1.tar.bz2



From mbarnes at fedoraproject.org  Sun Dec 20 13:03:50 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 20 Dec 2009 13:03:50 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.43, 1.44 gnome-doc-utils.spec,
	1.76, 1.77 sources, 1.43, 1.44
Message-ID: <20091220130350.3CF1E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32493

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:

* Sun Dec 20 2009 Matthew Barnes <mbarnes at redhat.com> - 0.18.1-1
- Update to 0.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	21 Sep 2009 18:03:37 -0000	1.43
+++ .cvsignore	20 Dec 2009 13:03:49 -0000	1.44
@@ -1 +1 @@
-gnome-doc-utils-0.18.0.tar.bz2
+gnome-doc-utils-0.18.1.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- gnome-doc-utils.spec	21 Sep 2009 18:03:37 -0000	1.76
+++ gnome-doc-utils.spec	20 Dec 2009 13:03:49 -0000	1.77
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.18.0
+Version: 0.18.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xml/mallard
 
 %changelog
+* Sun Dec 20 2009 Matthew Barnes <mbarnes at redhat.com> - 0.18.1-1
+- Update to 0.18.1
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 0.18.0-1
 - Update to 0.18.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	21 Sep 2009 18:03:37 -0000	1.43
+++ sources	20 Dec 2009 13:03:50 -0000	1.44
@@ -1 +1 @@
-5a25827673f9ff060a554c0858dbf020  gnome-doc-utils-0.18.0.tar.bz2
+c98ca796f3f2938a1fced7476e65351e  gnome-doc-utils-0.18.1.tar.bz2



From kkofler at fedoraproject.org  Sun Dec 20 13:10:58 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 20 Dec 2009 13:10:58 +0000 (UTC)
Subject: File kile-translations-r1055480.tar.bz2 uploaded to lookaside cache
	by kkofler
Message-ID: <20091220131058.28E3F10F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kile:

f30c1f7f3b0c7eaa0d73635761648c4f  kile-translations-r1055480.tar.bz2



From kkofler at fedoraproject.org  Sun Dec 20 13:11:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 20 Dec 2009 13:11:31 +0000 (UTC)
Subject: rpms/kile/devel .cvsignore, 1.15, 1.16 kile.spec, 1.52, 1.53 sources, 
	1.16, 1.17
Message-ID: <20091220131131.B3B3811C041F@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1654/devel

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-0.5.b3
- add translations from l10n-kde4 SVN (revision 1055480 from Nov 28)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	30 Nov 2009 13:33:13 -0000	1.15
+++ .cvsignore	20 Dec 2009 13:11:31 -0000	1.16
@@ -1 +1,2 @@
 kile-2.1b3.tar.bz2
+kile-translations-r1055480.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/kile.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- kile.spec	30 Nov 2009 18:45:40 -0000	1.52
+++ kile.spec	20 Dec 2009 13:11:31 -0000	1.53
@@ -4,12 +4,15 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 2.1
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
 Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}%{?pre}.tar.bz2
+# translations collected from revision 1055480 of
+# http://websvn.kde.org/trunk/l10n-kde4/*/messages/extragear-office
+Source1: kile-translations-r1055480.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: kile-2.1b3-gcc_no_var_tracking_assignments.patch
@@ -48,7 +51,12 @@ Kile is a user friendly (La)TeX editor. 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}
+%setup -q -n %{name}-%{version}%{?pre} -a 1
+
+cat kile-translations-r1055480/CMakeLists.txt >>CMakeLists.txt
+rm -f kile-translations-r1055480/CMakeLists.txt
+mv -f kile-translations-r1055480/po po
+rmdir kile-translations-r1055480
 
 %if 0%{?fedora} > 11
 %patch1 -p1 -b .gcc_no_var_tracking_assignments
@@ -114,6 +122,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-0.5.b3
+- add translations from l10n-kde4 SVN (revision 1055480 from Nov 28)
+
 * Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.1-0.4.b3
 - kile-2.1b3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	30 Nov 2009 13:33:14 -0000	1.16
+++ sources	20 Dec 2009 13:11:31 -0000	1.17
@@ -1 +1,2 @@
 5de96712686e82fa17732c0d0cf0cc3f  kile-2.1b3.tar.bz2
+f30c1f7f3b0c7eaa0d73635761648c4f  kile-translations-r1055480.tar.bz2



From kkofler at fedoraproject.org  Sun Dec 20 13:12:13 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 20 Dec 2009 13:12:13 +0000 (UTC)
Subject: rpms/kile/devel kile.spec,1.53,1.54
Message-ID: <20091220131213.7F2E111C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1780/devel

Modified Files:
	kile.spec 
Log Message:
Remove fallback from the %find_lang call, we want this to FAIL if there are no translations.


Index: kile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/kile.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- kile.spec	20 Dec 2009 13:11:31 -0000	1.53
+++ kile.spec	20 Dec 2009 13:12:13 -0000	1.54
@@ -78,7 +78,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde || touch %{name}.lang
+%find_lang %{name} --with-kde
 
 ## unpackaged files
 rm -rfv %{buildroot}%{_kde4_docdir}/kile



From kkofler at fedoraproject.org  Sun Dec 20 13:27:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 20 Dec 2009 13:27:44 +0000 (UTC)
Subject: rpms/kile/F-12 .cvsignore, 1.15, 1.16 kile.spec, 1.51, 1.52 sources, 
	1.16, 1.17
Message-ID: <20091220132744.A4A3A11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kile/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4376/F-12

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
Sync from devel:

* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-0.5.b3
- add translations from l10n-kde4 SVN (revision 1055480 from Nov 28)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kile/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	30 Nov 2009 19:06:07 -0000	1.15
+++ .cvsignore	20 Dec 2009 13:27:44 -0000	1.16
@@ -1 +1,2 @@
 kile-2.1b3.tar.bz2
+kile-translations-r1055480.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kile/F-12/kile.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- kile.spec	30 Nov 2009 19:06:08 -0000	1.51
+++ kile.spec	20 Dec 2009 13:27:44 -0000	1.52
@@ -4,12 +4,15 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 2.1
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
 Source0: http://downloads.sourceforge.net/sourceforge/kile/kile-%{version}%{?pre}.tar.bz2
+# translations collected from revision 1055480 of
+# http://websvn.kde.org/trunk/l10n-kde4/*/messages/extragear-office
+Source1: kile-translations-r1055480.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: kile-2.1b3-gcc_no_var_tracking_assignments.patch
@@ -48,7 +51,12 @@ Kile is a user friendly (La)TeX editor. 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}
+%setup -q -n %{name}-%{version}%{?pre} -a 1
+
+cat kile-translations-r1055480/CMakeLists.txt >>CMakeLists.txt
+rm -f kile-translations-r1055480/CMakeLists.txt
+mv -f kile-translations-r1055480/po po
+rmdir kile-translations-r1055480
 
 %if 0%{?fedora} > 11
 %patch1 -p1 -b .gcc_no_var_tracking_assignments
@@ -70,7 +78,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde || touch %{name}.lang
+%find_lang %{name} --with-kde
 
 ## unpackaged files
 rm -rfv %{buildroot}%{_kde4_docdir}/kile
@@ -114,6 +122,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-0.5.b3
+- add translations from l10n-kde4 SVN (revision 1055480 from Nov 28)
+
 * Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.1-0.4.b3
 - kile-2.1b3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kile/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	30 Nov 2009 19:06:08 -0000	1.16
+++ sources	20 Dec 2009 13:27:44 -0000	1.17
@@ -1 +1,2 @@
 5de96712686e82fa17732c0d0cf0cc3f  kile-2.1b3.tar.bz2
+f30c1f7f3b0c7eaa0d73635761648c4f  kile-translations-r1055480.tar.bz2



From mbarnes at fedoraproject.org  Sun Dec 20 13:33:06 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 20 Dec 2009 13:33:06 +0000 (UTC)
Subject: rpms/gnome-doc-utils/F-12 gnome-doc-utils.spec,1.77,1.78
Message-ID: <20091220133306.9605011C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-doc-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5246

Modified Files:
	gnome-doc-utils.spec 
Log Message:
Fix file list.



Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/F-12/gnome-doc-utils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- gnome-doc-utils.spec	20 Dec 2009 13:03:43 -0000	1.77
+++ gnome-doc-utils.spec	20 Dec 2009 13:33:06 -0000	1.78
@@ -96,7 +96,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/gnome-doc-xslt
 %{_datadir}/gnome-doc-utils
 %doc %{_mandir}/man1/xml2po.1.gz
-%{python_sitearch}/xml2po/
 
 %files stylesheets
 %defattr(-,root,root,-)



From leigh123linux at fedoraproject.org  Sun Dec 20 13:54:37 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun, 20 Dec 2009 13:54:37 +0000 (UTC)
Subject: File qbittorrent-2.1.0beta1.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091220135437.5A7E010F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qbittorrent:

72d7efc5fd38aea6faee9a8d11ee0131  qbittorrent-2.1.0beta1.tar.gz



From leigh123linux at fedoraproject.org  Sun Dec 20 13:55:07 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun, 20 Dec 2009 13:55:07 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.33, 1.34 gcc.patch, 1.1,
	1.2 qbittorrent.spec, 1.59, 1.60 sources, 1.34, 1.35
Message-ID: <20091220135507.200E111C00E6@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8929

Modified Files:
	.cvsignore gcc.patch qbittorrent.spec sources 
Log Message:
* Sun Dec 20 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.1.beta1
- update to 2.1.0beta1
- disable extra debugging to gcc patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	18 Dec 2009 16:19:42 -0000	1.33
+++ .cvsignore	20 Dec 2009 13:55:06 -0000	1.34
@@ -1 +1 @@
-qbittorrent-2.0.2.tar.gz
+qbittorrent-2.1.0beta1.tar.gz

gcc.patch:
 src.pro |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/gcc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc.patch	18 Dec 2009 16:19:42 -0000	1.1
+++ gcc.patch	20 Dec 2009 13:55:06 -0000	1.2
@@ -1,13 +1,21 @@
 diff -up qbittorrent-2.0.2/src/src.pro.no_var_tracking qbittorrent-2.0.1/src/src.pro
 --- qbittorrent-2.0.2/src/src.pro.no_var_tracking       2009-12-12 16:57:56.000000000 -0600
 +++ qbittorrent-2.0.2/src/src.pro       2009-12-17 09:16:48.422765515 -0600
+@@ -3,7 +3,7 @@ LANG_PATH = lang
+ ICONS_PATH = Icons
+ 
+ # Set the following variable to 1 to enable debug
+-DEBUG_MODE = 1
++DEBUG_MODE = 0
+ 
+ # Global
+ TEMPLATE = app
 @@ -11,6 +11,7 @@ TARGET = qbittorrent
  CONFIG += qt \
      thread
  
 +QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
  # Update this VERSION for each release
- DEFINES += VERSION=\\\"v2.0.2\\\"
+ DEFINES += VERSION=\\\"v2.1.0beta1\\\"
  DEFINES += VERSION_MAJOR=2
 
-


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- qbittorrent.spec	18 Dec 2009 16:19:42 -0000	1.59
+++ qbittorrent.spec	20 Dec 2009 13:55:06 -0000	1.60
@@ -2,15 +2,16 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.0.2
-Release: 1%{?dist}
+Version: 2.1.0
+Release: 0.1.beta1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
 # rm -rf qbittorrent/.svn
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 #Source0:  %{name}-%{svn_rev}svn.tar.gz
-Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
+#Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
+Source0: http://downloads.sf.net/qbittorrent/files/qbittorrent-unstable/%{name}-%{version}beta1.tar.gz
 # https://bugzilla.redhat.com/show_bug.cgi?id=548491
 Patch1:  gcc.patch
 
@@ -33,7 +34,7 @@ A Bittorrent client using rb_libtorrent 
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}beta1
 %patch1 -p1 -b .gcc
 
 %build
@@ -76,6 +77,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sun Dec 20 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.1.beta1
+- update to 2.1.0beta1
+- disable extra debugging to gcc patch
+
 * Fri Dec 18 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-1
 - update to 2.0.2
 - add gcc patch to fix #548491


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	18 Dec 2009 16:19:42 -0000	1.34
+++ sources	20 Dec 2009 13:55:06 -0000	1.35
@@ -1 +1 @@
-94dfa2a217ea3b0829e2366558246563  qbittorrent-2.0.2.tar.gz
+72d7efc5fd38aea6faee9a8d11ee0131  qbittorrent-2.1.0beta1.tar.gz



From mbarnes at fedoraproject.org  Sun Dec 20 13:56:22 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 20 Dec 2009 13:56:22 +0000 (UTC)
Subject: rpms/gnome-doc-utils/F-12 gnome-doc-utils.spec,1.78,1.79
Message-ID: <20091220135622.4E41E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-doc-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9223

Modified Files:
	gnome-doc-utils.spec 
Log Message:
Unfix file list, apparently.



Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/F-12/gnome-doc-utils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- gnome-doc-utils.spec	20 Dec 2009 13:33:06 -0000	1.78
+++ gnome-doc-utils.spec	20 Dec 2009 13:56:22 -0000	1.79
@@ -96,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/gnome-doc-xslt
 %{_datadir}/gnome-doc-utils
 %doc %{_mandir}/man1/xml2po.1.gz
+%{python_sitearch}/xml2po/
 
 %files stylesheets
 %defattr(-,root,root,-)



From jwrdegoede at fedoraproject.org  Sun Dec 20 14:09:50 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 20 Dec 2009 14:09:50 +0000 (UTC)
Subject: rpms/gkrellm/F-12 gkrellm-2.3.2-dead-bat-crash.patch, NONE,
	1.1 gkrellm-2.3.2-transp-crash.patch, NONE, 1.1 gkrellm.spec,
	1.25, 1.26
Message-ID: <20091220140950.9F75C11C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gkrellm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11549

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.2-dead-bat-crash.patch 
	gkrellm-2.3.2-transp-crash.patch 
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
- Don't crash on laptops with dead batteries (#545987)
- Don't crash with transparent themes (#549005)


gkrellm-2.3.2-dead-bat-crash.patch:
 linux.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE gkrellm-2.3.2-dead-bat-crash.patch ---
diff -up gkrellm-2.3.2/src/sysdeps/linux.c~ gkrellm-2.3.2/src/sysdeps/linux.c
--- gkrellm-2.3.2/src/sysdeps/linux.c~	2008-10-04 02:38:28.000000000 +0200
+++ gkrellm-2.3.2/src/sysdeps/linux.c	2009-12-20 14:51:17.000000000 +0100
@@ -1862,6 +1862,9 @@ sysfs_power_data (struct syspower *sp)
 		if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_full))
 			{
 			charge_full = strtoll (buf, NULL, 0);
+			/* Check for broken batteries (avoids div by zero) */
+			if (charge_full == 0)
+			        return FALSE;
 			}
 		if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_now))
 			{

gkrellm-2.3.2-transp-crash.patch:
 winops-x11.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gkrellm-2.3.2-transp-crash.patch ---
diff -up gkrellm-2.3.2/src/winops-x11.c~ gkrellm-2.3.2/src/winops-x11.c
--- gkrellm-2.3.2/src/winops-x11.c~	2008-10-04 02:35:53.000000000 +0200
+++ gkrellm-2.3.2/src/winops-x11.c	2009-12-20 14:43:45.000000000 +0100
@@ -538,7 +538,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans
 	GkrellmMargin	*m;
 	gint			x, y;
 
-	if (   root_xpixmap == None || !cp->transparency
+	if (   root_xpixmap == None || trans_gc == NULL || !cp->transparency
 		|| !cp->drawing_area || !cp->drawing_area->window
 	   )
 		return FALSE;
@@ -605,7 +605,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans
 	Window	child;
 	gint	x, y;
 
-	if (   root_xpixmap == None || !p->transparency
+	if (   root_xpixmap == None || trans_gc == NULL || !p->transparency
 		|| !p->drawing_area || !p->drawing_area->window
 	   )
 		return FALSE;


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-12/gkrellm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gkrellm.spec	3 Dec 2009 08:58:55 -0000	1.25
+++ gkrellm.spec	20 Dec 2009 14:09:50 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -14,6 +14,8 @@ Patch2:         gkrellm-2.2.4-sansfont.p
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.3.1-netdb.patch
 Patch5:         gkrellm-2.3.2-ssl-threadsafety.patch
+Patch6:         gkrellm-2.3.2-dead-bat-crash.patch
+Patch7:         gkrellm-2.3.2-transp-crash.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +65,8 @@ Development files for the GNU Krell Moni
 %patch3 -p1 -z .width
 %patch4 -p1 -z .netdb
 %patch5 -p1 -z .ssl
+%patch6 -p1
+%patch7 -p1
 
 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,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
+- Don't crash on laptops with dead batteries (#545987)
+- Don't crash with transparent themes (#549005)
+
 * Fri Nov 27 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-7
 - Fix crash when using multiple simap/spop mailboxes (#541824)
 



From mbarnes at fedoraproject.org  Sun Dec 20 14:10:15 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 20 Dec 2009 14:10:15 +0000 (UTC)
Subject: File pygobject-2.21.0.tar.bz2 uploaded to lookaside cache by mbarnes
Message-ID: <20091220141015.2613A10F8B4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for pygobject2:

1211c99c9e9d40c2e57b651c67781b39  pygobject-2.21.0.tar.bz2



From jwrdegoede at fedoraproject.org  Sun Dec 20 14:10:30 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 20 Dec 2009 14:10:30 +0000 (UTC)
Subject: rpms/gkrellm/devel gkrellm-2.3.2-dead-bat-crash.patch, NONE,
	1.1 gkrellm-2.3.2-transp-crash.patch, NONE, 1.1 gkrellm.spec,
	1.25, 1.26
Message-ID: <20091220141030.1759411C03AD@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11798

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.2-dead-bat-crash.patch 
	gkrellm-2.3.2-transp-crash.patch 
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
- Don't crash on laptops with dead batteries (#545987)
- Don't crash with transparent themes (#549005)


gkrellm-2.3.2-dead-bat-crash.patch:
 linux.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE gkrellm-2.3.2-dead-bat-crash.patch ---
diff -up gkrellm-2.3.2/src/sysdeps/linux.c~ gkrellm-2.3.2/src/sysdeps/linux.c
--- gkrellm-2.3.2/src/sysdeps/linux.c~	2008-10-04 02:38:28.000000000 +0200
+++ gkrellm-2.3.2/src/sysdeps/linux.c	2009-12-20 14:51:17.000000000 +0100
@@ -1862,6 +1862,9 @@ sysfs_power_data (struct syspower *sp)
 		if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_full))
 			{
 			charge_full = strtoll (buf, NULL, 0);
+			/* Check for broken batteries (avoids div by zero) */
+			if (charge_full == 0)
+			        return FALSE;
 			}
 		if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_now))
 			{

gkrellm-2.3.2-transp-crash.patch:
 winops-x11.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gkrellm-2.3.2-transp-crash.patch ---
diff -up gkrellm-2.3.2/src/winops-x11.c~ gkrellm-2.3.2/src/winops-x11.c
--- gkrellm-2.3.2/src/winops-x11.c~	2008-10-04 02:35:53.000000000 +0200
+++ gkrellm-2.3.2/src/winops-x11.c	2009-12-20 14:43:45.000000000 +0100
@@ -538,7 +538,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans
 	GkrellmMargin	*m;
 	gint			x, y;
 
-	if (   root_xpixmap == None || !cp->transparency
+	if (   root_xpixmap == None || trans_gc == NULL || !cp->transparency
 		|| !cp->drawing_area || !cp->drawing_area->window
 	   )
 		return FALSE;
@@ -605,7 +605,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans
 	Window	child;
 	gint	x, y;
 
-	if (   root_xpixmap == None || !p->transparency
+	if (   root_xpixmap == None || trans_gc == NULL || !p->transparency
 		|| !p->drawing_area || !p->drawing_area->window
 	   )
 		return FALSE;


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gkrellm.spec	27 Nov 2009 11:00:20 -0000	1.25
+++ gkrellm.spec	20 Dec 2009 14:10:29 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -14,6 +14,8 @@ Patch2:         gkrellm-2.2.4-sansfont.p
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.3.1-netdb.patch
 Patch5:         gkrellm-2.3.2-ssl-threadsafety.patch
+Patch6:         gkrellm-2.3.2-dead-bat-crash.patch
+Patch7:         gkrellm-2.3.2-transp-crash.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +65,8 @@ Development files for the GNU Krell Moni
 %patch3 -p1 -z .width
 %patch4 -p1 -z .netdb
 %patch5 -p1 -z .ssl
+%patch6 -p1
+%patch7 -p1
 
 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,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
+- Don't crash on laptops with dead batteries (#545987)
+- Don't crash with transparent themes (#549005)
+
 * Fri Nov 27 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-7
 - Fix crash when using multiple simap/spop mailboxes (#541824)
 



From mbarnes at fedoraproject.org  Sun Dec 20 14:12:51 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 20 Dec 2009 14:12:51 +0000 (UTC)
Subject: rpms/pygobject2/devel .cvsignore, 1.25, 1.26 pygobject2.spec, 1.56,
	1.57 sources, 1.25, 1.26
Message-ID: <20091220141251.9580411C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12229

Modified Files:
	.cvsignore pygobject2.spec sources 
Log Message:

* Sun Dec 20 2009 Matthew Barnes <mbarnes at redhat.com> - 2.21.0-1.fc13
- Update to 2.21.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	23 Sep 2009 22:29:49 -0000	1.25
+++ .cvsignore	20 Dec 2009 14:12:51 -0000	1.26
@@ -1 +1 @@
-pygobject-2.20.0.tar.bz2
+pygobject-2.21.0.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- pygobject2.spec	23 Sep 2009 22:29:49 -0000	1.56
+++ pygobject2.spec	20 Dec 2009 14:12:51 -0000	1.57
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for version 2.20.0
-%define glib2_version                  2.16.0
+# Last updated for version 2.21.0
+%define glib2_version                  2.22.4
 %define gobject_introspection_version  0.6.3
 %define python2_version                2.3.5
 
@@ -14,7 +14,7 @@
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.20.0
+Version: 2.21.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -124,6 +124,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Sun Dec 20 2009 Matthew Barnes <mbarnes at redhat.com> - 2.21.0-1.fc13
+- Update to 2.21.0
+
 * Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc12
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	23 Sep 2009 22:29:49 -0000	1.25
+++ sources	20 Dec 2009 14:12:51 -0000	1.26
@@ -1 +1 @@
-10e1fb79be3d698476a28b1e1b0c5640  pygobject-2.20.0.tar.bz2
+1211c99c9e9d40c2e57b651c67781b39  pygobject-2.21.0.tar.bz2



From jwrdegoede at fedoraproject.org  Sun Dec 20 14:36:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 20 Dec 2009 14:36:23 +0000 (UTC)
Subject: rpms/stormbaancoureur/devel
	stormbaancoureur-2.1.5-crash-on-no-network.patch, NONE,
	1.1 stormbaancoureur.spec, 1.15, 1.16
Message-ID: <20091220143623.A299511C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/stormbaancoureur/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15965

Modified Files:
	stormbaancoureur.spec 
Added Files:
	stormbaancoureur-2.1.5-crash-on-no-network.patch 
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-6
- Don't crash on network failures when trying to post scores to the
  internet (#547551)


stormbaancoureur-2.1.5-crash-on-no-network.patch:
 postscore.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE stormbaancoureur-2.1.5-crash-on-no-network.patch ---
diff -up stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx~ stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx
--- stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx~	2008-04-20 17:56:48.000000000 +0200
+++ stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx	2009-12-20 15:17:41.000000000 +0100
@@ -33,13 +33,17 @@ static socklen_t addrlen;
 void postscore_put(const char *username, float tim)
 {
   sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if (sock<0)
+  if (sock<0) {
     perror("socket");
+    return;
+  }
 
   struct hostent *he = gethostbyname(hostname);
-  if (!he)
+  if (!he) {
     perror("gethostbyname");
-  assert(he);
+    return;
+  }
+
   struct in_addr ip_addr = *(struct in_addr *)(he->h_addr);
   char *ipnr = inet_ntoa(ip_addr);
 
@@ -52,12 +56,12 @@ void postscore_put(const char *username,
   {
     perror("inet_aton() failed");
     fprintf(stderr,"ipnr = %s\n", ipnr);
+    return;
   }
-  assert(retval);
   addrlen = sizeof(addr);
 
   char m[128];
-  sprintf(m, "%-8s %6.2f " VERSION_STRING(GAMEVERSION) , username, tim);
+  snprintf(m, sizeof(m), "%-8s %6.2f " VERSION_STRING(GAMEVERSION) , username, tim);
   int rv = sendto(sock, m, strlen(m), 0, (struct sockaddr*) &addr, addrlen);
   if (rv<0)
     perror("sendto");


Index: stormbaancoureur.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stormbaancoureur/devel/stormbaancoureur.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- stormbaancoureur.spec	3 Aug 2009 08:25:34 -0000	1.15
+++ stormbaancoureur.spec	20 Dec 2009 14:36:23 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           stormbaancoureur
 Version:        2.1.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPLv2+
@@ -11,6 +11,7 @@ Source2:        sturmbahnfahrer.png
 Patch0:         stormbaancoureur-1.5.3-no-static-ode.patch
 Patch1:         stormbaancoureur-2.0.2-snd-debug.patch
 Patch2:         stormbaancoureur-2.1.5-gcc44.patch
+Patch3:         stormbaancoureur-2.1.5-crash-on-no-network.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel ode-devel freeglut-devel desktop-file-utils
 BuildRequires:  alsa-lib-devel
@@ -29,6 +30,7 @@ physics work with you, not against you.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 sed -i 's|/usr/share/games/%{name}|%{_datadir}/%{name}|' src-%{name}/main.cxx
 
 
@@ -93,6 +95,10 @@ fi
 
 
 %changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-6
+- Don't crash on network failures when trying to post scores to the
+  internet (#547551)
+
 * Mon Aug  3 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-5
 - Update URL's for upstream domainname change
 



From jwrdegoede at fedoraproject.org  Sun Dec 20 14:40:39 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 20 Dec 2009 14:40:39 +0000 (UTC)
Subject: rpms/stormbaancoureur/F-12
	stormbaancoureur-2.1.5-crash-on-no-network.patch, NONE,
	1.1 stormbaancoureur.spec, 1.15, 1.16
Message-ID: <20091220144039.9CF2111C03AD@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/stormbaancoureur/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16710

Modified Files:
	stormbaancoureur.spec 
Added Files:
	stormbaancoureur-2.1.5-crash-on-no-network.patch 
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-6
- Don't crash on network failures when trying to post scores to the
  internet (#547551)


stormbaancoureur-2.1.5-crash-on-no-network.patch:
 postscore.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE stormbaancoureur-2.1.5-crash-on-no-network.patch ---
diff -up stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx~ stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx
--- stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx~	2008-04-20 17:56:48.000000000 +0200
+++ stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx	2009-12-20 15:17:41.000000000 +0100
@@ -33,13 +33,17 @@ static socklen_t addrlen;
 void postscore_put(const char *username, float tim)
 {
   sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if (sock<0)
+  if (sock<0) {
     perror("socket");
+    return;
+  }
 
   struct hostent *he = gethostbyname(hostname);
-  if (!he)
+  if (!he) {
     perror("gethostbyname");
-  assert(he);
+    return;
+  }
+
   struct in_addr ip_addr = *(struct in_addr *)(he->h_addr);
   char *ipnr = inet_ntoa(ip_addr);
 
@@ -52,12 +56,12 @@ void postscore_put(const char *username,
   {
     perror("inet_aton() failed");
     fprintf(stderr,"ipnr = %s\n", ipnr);
+    return;
   }
-  assert(retval);
   addrlen = sizeof(addr);
 
   char m[128];
-  sprintf(m, "%-8s %6.2f " VERSION_STRING(GAMEVERSION) , username, tim);
+  snprintf(m, sizeof(m), "%-8s %6.2f " VERSION_STRING(GAMEVERSION) , username, tim);
   int rv = sendto(sock, m, strlen(m), 0, (struct sockaddr*) &addr, addrlen);
   if (rv<0)
     perror("sendto");


Index: stormbaancoureur.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stormbaancoureur/F-12/stormbaancoureur.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- stormbaancoureur.spec	3 Aug 2009 08:25:34 -0000	1.15
+++ stormbaancoureur.spec	20 Dec 2009 14:40:39 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           stormbaancoureur
 Version:        2.1.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPLv2+
@@ -11,6 +11,7 @@ Source2:        sturmbahnfahrer.png
 Patch0:         stormbaancoureur-1.5.3-no-static-ode.patch
 Patch1:         stormbaancoureur-2.0.2-snd-debug.patch
 Patch2:         stormbaancoureur-2.1.5-gcc44.patch
+Patch3:         stormbaancoureur-2.1.5-crash-on-no-network.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel ode-devel freeglut-devel desktop-file-utils
 BuildRequires:  alsa-lib-devel
@@ -29,6 +30,7 @@ physics work with you, not against you.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 sed -i 's|/usr/share/games/%{name}|%{_datadir}/%{name}|' src-%{name}/main.cxx
 
 
@@ -93,6 +95,10 @@ fi
 
 
 %changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-6
+- Don't crash on network failures when trying to post scores to the
+  internet (#547551)
+
 * Mon Aug  3 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-5
 - Update URL's for upstream domainname change
 



From mtasaka at fedoraproject.org  Sun Dec 20 14:45:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Dec 2009 14:45:48 +0000 (UTC)
Subject: File jd-2.5.5-beta091220.tgz uploaded to lookaside cache by mtasaka
Message-ID: <20091220144548.B167E10F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for jd:

3f2c9e853bfde93d963a1d3ca54cb945  jd-2.5.5-beta091220.tgz



From mtasaka at fedoraproject.org  Sun Dec 20 14:47:07 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Dec 2009 14:47:07 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.417, 1.418 jd.spec, 1.480, 1.481 sources, 
	1.418, 1.419
Message-ID: <20091220144707.432BA11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17799/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
- 2.5.5 beta 091220



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- .cvsignore	16 Dec 2009 06:53:16 -0000	1.417
+++ .cvsignore	20 Dec 2009 14:47:06 -0000	1.418
@@ -1 +1 @@
-jd-2.5.5-svn3235_trunk.tgz
+jd-2.5.5-beta091220.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -p -r1.480 -r1.481
--- jd.spec	16 Dec 2009 06:53:16 -0000	1.480
+++ jd.spec	20 Dec 2009 14:47:07 -0000	1.481
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3235_trunk
-%define         repoid        44788
+%define         strtag        beta091220
+%define         repoid        44986
 # 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    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3235
+* Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
+- 2.5.5 beta 091220
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- sources	16 Dec 2009 06:53:16 -0000	1.418
+++ sources	20 Dec 2009 14:47:07 -0000	1.419
@@ -1 +1 @@
-91811f331788b42ff52ee2b21f591989  jd-2.5.5-svn3235_trunk.tgz
+3f2c9e853bfde93d963a1d3ca54cb945  jd-2.5.5-beta091220.tgz



From mtasaka at fedoraproject.org  Sun Dec 20 14:47:07 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Dec 2009 14:47:07 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.417, 1.418 jd.spec, 1.481, 1.482 sources, 
	1.418, 1.419
Message-ID: <20091220144707.7089F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17799/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
- 2.5.5 beta 091220



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- .cvsignore	16 Dec 2009 06:53:16 -0000	1.417
+++ .cvsignore	20 Dec 2009 14:47:07 -0000	1.418
@@ -1 +1 @@
-jd-2.5.5-svn3235_trunk.tgz
+jd-2.5.5-beta091220.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -p -r1.481 -r1.482
--- jd.spec	16 Dec 2009 06:53:16 -0000	1.481
+++ jd.spec	20 Dec 2009 14:47:07 -0000	1.482
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3235_trunk
-%define         repoid        44788
+%define         strtag        beta091220
+%define         repoid        44986
 # 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    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3235
+* Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
+- 2.5.5 beta 091220
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- sources	16 Dec 2009 06:53:16 -0000	1.418
+++ sources	20 Dec 2009 14:47:07 -0000	1.419
@@ -1 +1 @@
-91811f331788b42ff52ee2b21f591989  jd-2.5.5-svn3235_trunk.tgz
+3f2c9e853bfde93d963a1d3ca54cb945  jd-2.5.5-beta091220.tgz



From mtasaka at fedoraproject.org  Sun Dec 20 14:47:07 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 20 Dec 2009 14:47:07 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.407, 1.408 jd.spec, 1.469, 1.470 sources, 
	1.408, 1.409
Message-ID: <20091220144707.A210211C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17799/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
- 2.5.5 beta 091220



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -p -r1.407 -r1.408
--- .cvsignore	16 Dec 2009 06:53:16 -0000	1.407
+++ .cvsignore	20 Dec 2009 14:47:07 -0000	1.408
@@ -1 +1 @@
-jd-2.5.5-svn3235_trunk.tgz
+jd-2.5.5-beta091220.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -p -r1.469 -r1.470
--- jd.spec	16 Dec 2009 06:53:17 -0000	1.469
+++ jd.spec	20 Dec 2009 14:47:07 -0000	1.470
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3235_trunk
-%define         repoid        44788
+%define         strtag        beta091220
+%define         repoid        44986
 # 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    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Dec 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3235
+* Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
+- 2.5.5 beta 091220
 
 * Sun Dec  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
 - 2.5.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- sources	16 Dec 2009 06:53:17 -0000	1.408
+++ sources	20 Dec 2009 14:47:07 -0000	1.409
@@ -1 +1 @@
-91811f331788b42ff52ee2b21f591989  jd-2.5.5-svn3235_trunk.tgz
+3f2c9e853bfde93d963a1d3ca54cb945  jd-2.5.5-beta091220.tgz



From cwickert at fedoraproject.org  Sun Dec 20 14:48:33 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Dec 2009 14:48:33 +0000 (UTC)
Subject: rpms/xfce4-notes-plugin/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xfce4-notes-plugin.spec, 1.21, 1.22
Message-ID: <20091220144833.BC9F911C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-notes-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18284

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.2-1
- Update to 1.7.2
- New build dep: unique-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	4 Sep 2009 22:07:59 -0000	1.12
+++ .cvsignore	20 Dec 2009 14:48:33 -0000	1.13
@@ -1 +1 @@
-xfce4-notes-plugin-1.7.1.tar.bz2
+xfce4-notes-plugin-1.7.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Sep 2009 22:07:59 -0000	1.12
+++ sources	20 Dec 2009 14:48:33 -0000	1.13
@@ -1 +1 @@
-c6d27d8c566fbd98a14bd59273da0adf  xfce4-notes-plugin-1.7.1.tar.bz2
+054742ecc4bb83de6c1447b023938d3e  xfce4-notes-plugin-1.7.2.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xfce4-notes-plugin.spec	4 Sep 2009 22:07:59 -0000	1.21
+++ xfce4-notes-plugin.spec	20 Dec 2009 14:48:33 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		xfce4-notes-plugin
-Version:	1.7.1
+Version:	1.7.2
 Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
@@ -9,9 +9,10 @@ URL:		http://goodies.xfce.org/projects/p
 Source0:	http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0, libxml2-devel
+BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0
 BuildRequires:	xfconf-devel >= 4.6.0
-BuildRequires:	gettext, intltool, perl(XML::Parser)
+BuildRequires:	unique-devel
+BuildRequires:	gettext, intltool, desktop-file-utils
 Requires:	xfce4-panel >= 4.4.1, xfconf >= 4.6.0
 
 %description
@@ -27,13 +28,17 @@ background color and much more.
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+V=1 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
+desktop-file-validate \
+    $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/xfce4-notes-autostart.desktop
+desktop-file-validate \
+    $RPM_BUILD_ROOT/%{_datadir}/applications/xfce4-notes.desktop
 
 
 %clean
@@ -58,15 +63,22 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-notes-autostart.desktop
+%{_bindir}/xfce4-notes
+%{_bindir}/xfce4-popup-notes
 %{_bindir}/xfce4-notes-settings
 %{_libexecdir}/xfce4/panel-plugins/%{name}
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/applications/xfce4-notes.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_bindir}/xfce4-popup-notes
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 
 %changelog
+* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.2-1
+- Update to 1.7.2
+- New build dep: unique-devel
+
 * Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.1-1
 - Update to 1.7.1
 



From pkgdb at fedoraproject.org  Sun Dec 20 16:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Dec 2009 16:19:00 +0000
Subject: [pkgdb] libXNVCtrl: kwizart has requested commit
Message-ID: <20091220161854.9C00210F8DA@bastion.fedoraproject.org>

kwizart has requested the commit acl on libXNVCtrl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From pkgdb at fedoraproject.org  Sun Dec 20 16:19:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 20 Dec 2009 16:19:10 +0000
Subject: [pkgdb] libXNVCtrl: kwizart has given up watchcommits
Message-ID: <20091220161905.5379210F8E7@bastion.fedoraproject.org>

kwizart has given up the watchcommits acl on libXNVCtrl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libXNVCtrl



From cwickert at fedoraproject.org  Sun Dec 20 18:05:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 20 Dec 2009 18:05:01 +0000 (UTC)
Subject: rpms/xfdesktop/devel xfdesktop-4.6.1-education-menu-icon.patch, NONE, 
	1.1 xfdesktop-4.6.0-redhat-menus.patch, 1.2, 1.3 xfdesktop.spec,
	1.36, 1.37
Message-ID: <20091220180502.1312C11C00E6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18838

Modified Files:
	xfdesktop-4.6.0-redhat-menus.patch xfdesktop.spec 
Added Files:
	xfdesktop-4.6.1-education-menu-icon.patch 
Log Message:
* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Menu fixes


xfdesktop-4.6.1-education-menu-icon.patch:
 xfce-education.directory.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfdesktop-4.6.1-education-menu-icon.patch ---
--- xfdesktop-4.6.0.orig/modules/menu/directory-data/xfce-education.directory.in	2009-01-12 23:03:19.000000000 +0100
+++ xfdesktop-4.6.0/modules/menu/directory-data/xfce-education.directory.in	2009-12-20 17:38:25.000000000 +0100
@@ -2,6 +2,6 @@
 Version=1.0
 Encoding=UTF-8
 Type=Directory
-Icon=
+Icon=applications-science
 _Name=Education
 _Comment=Educational software

xfdesktop-4.6.0-redhat-menus.patch:
 xfce-applications.menu |   57 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 18 deletions(-)

Index: xfdesktop-4.6.0-redhat-menus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop-4.6.0-redhat-menus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xfdesktop-4.6.0-redhat-menus.patch	13 Apr 2009 20:52:25 -0000	1.2
+++ xfdesktop-4.6.0-redhat-menus.patch	20 Dec 2009 18:05:00 -0000	1.3
@@ -10,7 +10,7 @@
          <Separator/>
          <Merge type="all"/>
          <Separator/>
-@@ -28,10 +29,15 @@
+@@ -28,10 +29,16 @@
      </Layout>
      
      <Menu>
@@ -24,12 +24,13 @@
 +                <Category>Settings</Category>
 +                <Not><Category>System</Category></Not>
 +                <Not><Category>Screensaver</Category></Not>
++                <Not><Filename>fedora-im-chooser.desktop</Filename></Not>
 +                <Not><Filename>gnome-default-applications.desktop</Filename></Not>
 +            </And>
          </Include>
          
          <Layout>
-@@ -40,25 +46,29 @@
+@@ -40,25 +47,29 @@
              <Merge type="all"/>
          </Layout>
          
@@ -71,7 +72,7 @@
          </Include>
      </Menu>
      
-@@ -124,7 +134,11 @@
+@@ -124,7 +135,11 @@
          <Name>System</Name>
          <Directory>xfce-system.directory</Directory>
          <Include>
@@ -84,7 +85,7 @@
          </Include>
      </Menu>
      
-@@ -133,7 +147,13 @@
+@@ -133,7 +148,13 @@
          <Directory>xfce-other.directory</Directory>
          <OnlyUnallocated/>
          <Include>


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xfdesktop.spec	1 Nov 2009 05:06:21 -0000	1.36
+++ xfdesktop.spec	20 Dec 2009 18:05:00 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
@@ -12,6 +12,9 @@ Patch0: xfdesktop-4.5.92-backdrop-image.
 Patch1: xfdesktop-4.5.92-desktop-menu-icon.patch
 # Use redhat-menus to avoid duplicate entries in the menu
 Patch2: xfdesktop-4.6.0-redhat-menus.patch
+# fix icon in xfce-education.directory, taken from
+# http://git.xfce.org/xfce/xfdesktop/commit/?id=c2de873891d8ce8c3be1399c6110ebfda489151b
+Patch3: xfdesktop-4.6.1-education-menu-icon.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +52,7 @@ This package includes a desktop manager 
 %patch0 -p1 -b .backdrop
 %patch1 -p1 -b .distro-logo
 %patch2 -p1 -b .orig
+%patch3 -p1 -b .icon
 
 %build
 %configure
@@ -58,7 +62,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
@@ -98,6 +102,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Menu fixes
+
 * Sun Nov 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
 - Fix dependency for default background image
 



From lucilanga at fedoraproject.org  Sun Dec 20 18:05:41 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 20 Dec 2009 18:05:41 +0000 (UTC)
Subject: File libftdi-0.17.tar.gz uploaded to lookaside cache by lucilanga
Message-ID: <20091220180541.AF8A510F8DA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libftdi:

810c69cfaa078b49795c224ef9b6b851  libftdi-0.17.tar.gz



From lucilanga at fedoraproject.org  Sun Dec 20 18:07:52 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 20 Dec 2009 18:07:52 +0000 (UTC)
Subject: rpms/libftdi/devel .cvsignore, 1.4, 1.5 libftdi.spec, 1.13,
	1.14 sources, 1.4, 1.5
Message-ID: <20091220180752.6FFEF11C00E6@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19583

Modified Files:
	.cvsignore libftdi.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 May 2009 09:44:30 -0000	1.4
+++ .cvsignore	20 Dec 2009 18:07:52 -0000	1.5
@@ -1 +1 @@
-libftdi-0.16.tar.gz
+libftdi-0.17.tar.gz


Index: libftdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/devel/libftdi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libftdi.spec	22 Aug 2009 13:17:35 -0000	1.13
+++ libftdi.spec	20 Dec 2009 18:07:52 -0000	1.14
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:		libftdi
-Version:	0.16
-Release:	7%{?dist}
+Version:	0.17
+Release:	1%{?dist}
 Summary:	Library to program and control the FTDI USB controller
 
 Group:		System Environment/Libraries
@@ -88,6 +88,8 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang
 rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_cbus
 rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all
 rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all_pp
+rm -f $RPM_BUILD_ROOT/%{_bindir}/baud_test
+rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_read
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files python
 %defattr(-, root, root, -)
+%doc AUTHORS ChangeLog COPYING.LIB README
 %{python_sitearch}/*
 
 %files c++
@@ -136,6 +139,9 @@ exit 0
 %postun c++ -p /sbin/ldconfig
 
 %changelog
+* Sun Dec 20 2009 Lucian Langa <cooly at gnome.eu.org> - 0.17-1
+- new upstream release
+
 * Sat Aug 22 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-7
 - add group for udev rule (#517773)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 May 2009 09:44:30 -0000	1.4
+++ sources	20 Dec 2009 18:07:52 -0000	1.5
@@ -1 +1 @@
-524af6f39aefa1a4e8fac12c6be0ed06  libftdi-0.16.tar.gz
+810c69cfaa078b49795c224ef9b6b851  libftdi-0.17.tar.gz



From mschwendt at fedoraproject.org  Sun Dec 20 18:42:15 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 20 Dec 2009 18:42:15 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12
	audacious-plugins-2.1-pulseaudio-volume-accuracy.patch, 1.1,
	NONE audacious-plugins-2.2-bluetooth.patch, 1.1,
	NONE audacious-plugins-2.2-neon-request.patch, 1.1, NONE
Message-ID: <20091220184215.EFDBC11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26519

Removed Files:
	audacious-plugins-2.1-pulseaudio-volume-accuracy.patch 
	audacious-plugins-2.2-bluetooth.patch 
	audacious-plugins-2.2-neon-request.patch 
Log Message:
remove unused-patches


--- audacious-plugins-2.1-pulseaudio-volume-accuracy.patch DELETED ---


--- audacious-plugins-2.2-bluetooth.patch DELETED ---


--- audacious-plugins-2.2-neon-request.patch DELETED ---



From lucilanga at fedoraproject.org  Sun Dec 20 18:54:21 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 20 Dec 2009 18:54:21 +0000 (UTC)
Subject: rpms/qle/devel qle.spec,1.4,1.5
Message-ID: <20091220185421.A91D511C02C4@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/qle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28936

Modified Files:
	qle.spec 
Log Message:
* Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.17-1
- improve desktop icon file (#530837)
- update patch0
- new upstream release


Index: qle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qle/devel/qle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qle.spec	27 Jul 2009 02:29:08 -0000	1.4
+++ qle.spec	20 Dec 2009 18:54:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           qle
-Version:        0.0.13
-Release:        3%{?dist}
+Version:        0.0.17
+Release:        1%{?dist}
 Summary:        A QSO Logger and log Editor
 
 Group:          Applications/Communications
@@ -10,14 +10,14 @@ Source0:        http://home.kpn.nl/w.kno
 Source1:        qle.desktop
 Source2:        qle.png
 #add script shebang & fix paths
-Patch0:         qle-sh.patch
+Patch0:         qle-0.0.17-sh.patch
 #Fix configuration path
-Patch1:         qle-configlocation.patch
+Patch1:         qle-0.0.17-configlocation.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
- 
-Requires:       perl, perl(DBI), perl(DBD::SQLite), perl(Tk)
+
+Requires:       perl, perl(DBI), perl(DBD::SQLite), perl(Tk), perl(PDF-Create)
 #qle requires rigctld from hamlib for communicating with transciever
 Requires:       hamlib
 Requires:       cwdaemon
@@ -46,8 +46,8 @@ updated accordingly.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .sh
+%patch1 -p1 -b .configlocation
 
 %build
 #no build needed
@@ -86,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.17-1
+- improve desktop icon file (#530837)
+- update patch0
+- new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Sun Dec 20 18:55:30 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 20 Dec 2009 18:55:30 +0000 (UTC)
Subject: rpms/qle/devel qle-sh.patch,1.2,1.3 qle.desktop,1.1,1.2
Message-ID: <20091220185530.C0ACC11C00E6@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/qle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29178

Modified Files:
	qle-sh.patch qle.desktop 
Log Message:
* Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.17-1
- improve desktop icon file (#530837)
- update patch0
- new upstream release

qle-sh.patch:
 qle.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: qle-sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qle/devel/qle-sh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qle-sh.patch	17 Feb 2009 10:20:58 -0000	1.2
+++ qle-sh.patch	20 Dec 2009 18:55:30 -0000	1.3
@@ -1,25 +1,20 @@
---- qle-0.0.13/qle.sh	2009-02-08 14:54:19.000000000 +0200
-+++ qle-0.0.13-mod/qle.sh	2009-02-17 10:50:59.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/bin/bash
- ############################################################
+diff -Naur qle-0.0.17/qle.sh qle-0.0.17-mod/qle.sh
+--- qle-0.0.17/qle.sh	2009-10-11 17:03:41.000000000 +0300
++++ qle-0.0.17-mod/qle.sh	2009-11-27 08:13:03.000000000 +0200
+@@ -13,6 +13,7 @@
+ #####################################################################
  #
- # Suggested start-up script for 'qle'
-@@ -14,7 +15,7 @@
- #
- # Change to working directory if running from somewhere else:
- #
--#cd ~/qle-0.0.13
+ #cd ~/qle-0.0.17
 +cd /usr/share/qle
  #
- # Kill lingering 'rigctld' servers:
- #
-@@ -31,7 +32,7 @@
- # Suggested other options:
- #    -font "<some-other-font>"
- #
--perl qle-0.0.13.pl -geometry "800x680+100+20" --debug=0 $1 $2 $3 $4
-+perl qle.pl -geometry "800x680+100+20" --debug=0 $1 $2 $3 $4
- #
- # Killing rigctld process:
+ echo qle.sh: trying to kill lingering hamlib 'rigctld' servers:
+ killall rigctld
+@@ -24,7 +25,7 @@
+ #
+ echo qle.sh: starting up the 'qle' logger program:
+ # perl qle-0.0.17.pl -font "-adobe-avant garde gothic-demi-r-normal--0-0-0-0-p-0-iso8859-1" $1 $2 $3 $4
+-perl qle-0.0.17.pl -foreground Blue $1 $2 $3 $4
++perl qle.pl -foreground Blue $1 $2 $3 $4
  #
+ echo qle.sh: killing 'rigctld' server: 
+ killall rigctld


Index: qle.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qle/devel/qle.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qle.desktop	23 Nov 2008 18:56:17 -0000	1.1
+++ qle.desktop	20 Dec 2009 18:55:30 -0000	1.2
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=qle
 GenericName=qle
 Comment=A QSO Logger and log Editor
@@ -7,5 +6,5 @@ Exec=qle
 Icon=qle
 Terminal=false
 Type=Application
-Categories=HamRadio;
+Categories=Network;HamRadio;
 Version=1.0



From lucilanga at fedoraproject.org  Sun Dec 20 18:59:53 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 20 Dec 2009 18:59:53 +0000 (UTC)
Subject: File qle-0.0.17.tar.gz uploaded to lookaside cache by lucilanga
Message-ID: <20091220185953.BBEEB10F907@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qle:

54f2155fae9a5af0cdb45f1f67221c4d  qle-0.0.17.tar.gz



From lucilanga at fedoraproject.org  Sun Dec 20 19:00:43 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 20 Dec 2009 19:00:43 +0000 (UTC)
Subject: rpms/qle/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20091220190043.35EC411C02A5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/qle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30343

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.17-1
- improve desktop icon file (#530837)
- update patch0
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qle/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Feb 2009 10:22:17 -0000	1.3
+++ .cvsignore	20 Dec 2009 19:00:43 -0000	1.4
@@ -1 +1 @@
-qle-0.0.13.tar.gz
+qle-0.0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qle/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Feb 2009 10:22:17 -0000	1.3
+++ sources	20 Dec 2009 19:00:43 -0000	1.4
@@ -1 +1 @@
-4e2ef84c17fae06657111a964f2fd299  qle-0.0.13.tar.gz
+54f2155fae9a5af0cdb45f1f67221c4d  qle-0.0.17.tar.gz



From lucilanga at fedoraproject.org  Sun Dec 20 19:08:52 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 20 Dec 2009 19:08:52 +0000 (UTC)
Subject: rpms/qle/devel qle-0.0.17-configlocation.patch, NONE,
	1.1 qle-0.0.17-sh.patch, NONE, 1.1 qle-configlocation.patch, 1.2,
	NONE qle-sh.patch, 1.3, NONE
Message-ID: <20091220190852.31E2411C00E6@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/qle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32038

Added Files:
	qle-0.0.17-configlocation.patch qle-0.0.17-sh.patch 
Removed Files:
	qle-configlocation.patch qle-sh.patch 
Log Message:
* Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.17-1
- improve desktop icon file (#530837)
- update patch0
- new upstream release

qle-0.0.17-configlocation.patch:
 qle-0.0.17.pl |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE qle-0.0.17-configlocation.patch ---
--- qle-0.0.17/qle-0.0.17.pl	2009-10-11 17:03:41.000000000 +0300
+++ qle-0.0.17-mod/qle-0.0.17.pl	2009-11-27 22:19:56.000000000 +0200
@@ -51,6 +51,7 @@
     # Build name of config file from name of executable file:
     my ($progName, $pathName, $suffix) = fileparse("$0", qr/\.[^.]*/);
     my $configFile;
+    my $pathName = "/etc/qle/";
     if (File::Spec->file_name_is_absolute($pathName)) {
       $configFile = "$pathName" . "$progName" . ".conf";
     } else {
@@ -59,6 +60,7 @@
       $absPathName = $absPathName . "/";
       $configFile = "$absPathName" . "$progName" . ".conf";
     }
+print $configFile;
 
 
     # Report name of executable in title bar (use target of symlink

qle-0.0.17-sh.patch:
 qle.sh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE qle-0.0.17-sh.patch ---
diff -Naur qle-0.0.17/qle.sh qle-0.0.17-mod/qle.sh
--- qle-0.0.17/qle.sh	2009-10-11 17:03:41.000000000 +0300
+++ qle-0.0.17-mod/qle.sh	2009-12-20 20:47:46.000000000 +0200
@@ -1,3 +1,4 @@
+#!/bin/bash
 #####################################################################
 #
 # Suggested start-up script for qle-<version>.pl
@@ -13,6 +14,7 @@
 #####################################################################
 #
 #cd ~/qle-0.0.17
+cd /usr/share/qle
 #
 echo qle.sh: trying to kill lingering hamlib 'rigctld' servers:
 killall rigctld
@@ -24,7 +26,7 @@
 #
 echo qle.sh: starting up the 'qle' logger program:
 # perl qle-0.0.17.pl -font "-adobe-avant garde gothic-demi-r-normal--0-0-0-0-p-0-iso8859-1" $1 $2 $3 $4
-perl qle-0.0.17.pl -foreground Blue $1 $2 $3 $4
+perl qle.pl -foreground Blue $1 $2 $3 $4
 #
 echo qle.sh: killing 'rigctld' server: 
 killall rigctld


--- qle-configlocation.patch DELETED ---


--- qle-sh.patch DELETED ---



From kdudka at fedoraproject.org  Sun Dec 20 19:56:02 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sun, 20 Dec 2009 19:56:02 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.7-ares-ipv6.patch, NONE, 1.1 curl.spec,
	1.134, 1.135
Message-ID: <20091220195602.4C73811C00E6@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8811

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-ares-ipv6.patch 
Log Message:
- temporary workaround for #548269

curl-7.19.7-ares-ipv6.patch:
 hostares.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE curl-7.19.7-ares-ipv6.patch ---
diff --git a/lib/hostares.c b/lib/hostares.c
index 15f9c84..719efc1 100644
--- a/lib/hostares.c
+++ b/lib/hostares.c
@@ -327,7 +327,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn,
 
   switch(data->set.ip_version) {
   default:
-#if ARES_VERSION >= 0x010601
+#if 0
     family = PF_UNSPEC; /* supported by c-ares since 1.6.1, so for older
                            c-ares versions this just falls through and defaults
                            to PF_INET */


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- curl.spec	9 Dec 2009 19:12:22 -0000	1.134
+++ curl.spec	20 Dec 2009 19:56:01 -0000	1.135
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -16,6 +16,7 @@ Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
 Patch104: curl-7.19.7-s390-sleep.patch
 Patch105: curl-7.19.7-localhost6.patch
+Patch106: curl-7.19.7-ares-ipv6.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,7 +97,13 @@ use cURL's capabilities internally.
 %patch104 -p1
 
 # we have localhost6 instead of ip6-localhost as name for ::1
-%patch105 -p1
+# temporarily disabled (clash with patch #106)
+#%patch105 -p1
+
+# rebuild of cURL against newer c-ares-devel has caused a regression (#548269)
+# this patch reverts back the old behavior of curl-7.19.7-4.fc13
+# NOTE: this is a temporary workaround only
+%patch106 -p1
 
 autoconf
 
@@ -189,6 +196,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Sun Dec 20 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-9
+- temporary workaround for #548269
+  (restored behavior of 7.19.7-4)
+
 * Wed Dec 09 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-8
 - replace hard wired port numbers in the test suite
 



From robert at fedoraproject.org  Sun Dec 20 21:30:11 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 20 Dec 2009 21:30:11 +0000 (UTC)
Subject: rpms/perl-IO-stringy/devel perl-IO-stringy.spec,1.20,1.21
Message-ID: <20091220213011.E1EBF11C03AD@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-IO-stringy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27164

Modified Files:
	perl-IO-stringy.spec 
Log Message:
Rebuilt against perl 5.10.1



Index: perl-IO-stringy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-stringy/devel/perl-IO-stringy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-IO-stringy.spec	26 Jul 2009 06:43:16 -0000	1.20
+++ perl-IO-stringy.spec	20 Dec 2009 21:30:11 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	I/O on in-core objects like strings and arrays for Perl
 Name:		perl-IO-stringy
 Version:	2.110
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/IO-stringy/
@@ -42,6 +42,9 @@ filehandles; in particular, IO::Scalar, 
 %{_mandir}/man3/IO::*.3pm*
 
 %changelog
+* Sun Dec 20 2009 Robert Scheck <robert at fedoraproject.org> 2.110-11
+- Rebuilt against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.110-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hubbitus at fedoraproject.org  Sun Dec 20 21:50:42 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 20 Dec 2009 21:50:42 +0000 (UTC)
Subject: File vanessa_logger-0.0.8.tar.bz2 uploaded to lookaside cache by
	hubbitus
Message-ID: <20091220215042.7904A10F91B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for vanessa_logger:

3b70c8b330d25fb97ef9d7f3fd71c0b0  vanessa_logger-0.0.8.tar.bz2



From hubbitus at fedoraproject.org  Sun Dec 20 21:51:24 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 20 Dec 2009 21:51:24 +0000 (UTC)
Subject: rpms/vanessa_logger/devel import.log, NONE, 1.1 vanessa_logger.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091220215124.9AED711C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_logger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31269/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_logger.spec 
Log Message:
Initial push vanessa_logger into Fedora.




--- NEW FILE import.log ---
vanessa_logger-0_0_8-5_fc11:HEAD:vanessa_logger-0.0.8-5.fc11.src.rpm:1261345851


--- NEW FILE vanessa_logger.spec ---
Summary:		Generic logging layer
Name:		vanessa_logger
Version:		0.0.8
Release:		5%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/vanessa_logger/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool
#Patch0:		vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch

%description
Generic logging layer that may be used to log to one or more of syslog,
an open file handle or a file name. Though due to limitations in the
implementation of syslog opening multiple syslog loggers doesn't makes
sense. Includes the ability to limit which messages will be logged based
on priorities.

# As subpackages defined -devel subpackage also must be explicit.
%package	devel
Summary:	Headers and static libraries for development
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Headers and static libraries required to develop against vanessa_logger.

%package	sample
Summary:	Example programme that demonstrates vanessa_logger
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	sample
Sample programme with source that demonstrates various features of
vanessa_logger.


%prep
%setup -q

#% patch0 -p0 -b .label

%build

# I am providing my own configure macro replacement. Hopefully this
# will result in fewer portability problems than using the one supplied
# by various vendours. I fear that I hope in vein.
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{prefix}/doc
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h
%doc COPYING README

%files sample
%defattr(-,root,root,-)
%{_bindir}/*
%{_mandir}/man1/vanessa_logger_sample.*
%doc sample/*.c sample/*.h README

%changelog
* Sun Dec 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.8-5
- New version 0.0.8

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- vanessa_logger-sample depend on vanessa_logger not on vanessa_logger-devel (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-2
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_logger/vanessa_logger-0.0.6-1.fc8.Hu.1.src.rpm.
- New version 0.0.7
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Adopt patch to new version, and name accordingly: vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch.
- Remove *.*a files in %%install.
- License changed to LGPLv2+ from just LGPL according to README.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- Add --disable-static in configure options (with it .la file not produced).

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.6-1
- Replace Tag Copyright by License
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	%%{rel}%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>
* Thu Apr 26 2001 Horms <horms at verge.net.au>
  Updated to "work" with Red Hat 7
* Sat Sep 15 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:39:02 -0000	1.1
+++ .cvsignore	20 Dec 2009 21:51:24 -0000	1.2
@@ -0,0 +1 @@
+vanessa_logger-0.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:39:02 -0000	1.1
+++ sources	20 Dec 2009 21:51:24 -0000	1.2
@@ -0,0 +1 @@
+3b70c8b330d25fb97ef9d7f3fd71c0b0  vanessa_logger-0.0.8.tar.bz2



From hubbitus at fedoraproject.org  Sun Dec 20 21:53:18 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 20 Dec 2009 21:53:18 +0000 (UTC)
Subject: rpms/vanessa_logger/EL-5 import.log, NONE, 1.1 vanessa_logger.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091220215318.5F35211C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_logger/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31825/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_logger.spec 
Log Message:
Initial push vanessa_logger into Fedora.




--- NEW FILE import.log ---
vanessa_logger-0_0_8-5_fc11:EL-5:vanessa_logger-0.0.8-5.fc11.src.rpm:1261345970


--- NEW FILE vanessa_logger.spec ---
Summary:		Generic logging layer
Name:		vanessa_logger
Version:		0.0.8
Release:		5%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/vanessa_logger/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool
#Patch0:		vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch

%description
Generic logging layer that may be used to log to one or more of syslog,
an open file handle or a file name. Though due to limitations in the
implementation of syslog opening multiple syslog loggers doesn't makes
sense. Includes the ability to limit which messages will be logged based
on priorities.

# As subpackages defined -devel subpackage also must be explicit.
%package	devel
Summary:	Headers and static libraries for development
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Headers and static libraries required to develop against vanessa_logger.

%package	sample
Summary:	Example programme that demonstrates vanessa_logger
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	sample
Sample programme with source that demonstrates various features of
vanessa_logger.


%prep
%setup -q

#% patch0 -p0 -b .label

%build

# I am providing my own configure macro replacement. Hopefully this
# will result in fewer portability problems than using the one supplied
# by various vendours. I fear that I hope in vein.
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{prefix}/doc
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h
%doc COPYING README

%files sample
%defattr(-,root,root,-)
%{_bindir}/*
%{_mandir}/man1/vanessa_logger_sample.*
%doc sample/*.c sample/*.h README

%changelog
* Sun Dec 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.8-5
- New version 0.0.8

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- vanessa_logger-sample depend on vanessa_logger not on vanessa_logger-devel (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-2
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_logger/vanessa_logger-0.0.6-1.fc8.Hu.1.src.rpm.
- New version 0.0.7
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Adopt patch to new version, and name accordingly: vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch.
- Remove *.*a files in %%install.
- License changed to LGPLv2+ from just LGPL according to README.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- Add --disable-static in configure options (with it .la file not produced).

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.6-1
- Replace Tag Copyright by License
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	%%{rel}%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>
* Thu Apr 26 2001 Horms <horms at verge.net.au>
  Updated to "work" with Red Hat 7
* Sat Sep 15 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:39:02 -0000	1.1
+++ .cvsignore	20 Dec 2009 21:53:18 -0000	1.2
@@ -0,0 +1 @@
+vanessa_logger-0.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:39:02 -0000	1.1
+++ sources	20 Dec 2009 21:53:18 -0000	1.2
@@ -0,0 +1 @@
+3b70c8b330d25fb97ef9d7f3fd71c0b0  vanessa_logger-0.0.8.tar.bz2



From hubbitus at fedoraproject.org  Sun Dec 20 21:55:39 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 20 Dec 2009 21:55:39 +0000 (UTC)
Subject: rpms/vanessa_logger/F-10 import.log, NONE, 1.1 vanessa_logger.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091220215539.A31CE11C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_logger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32692/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_logger.spec 
Log Message:
Initial push vanessa_logger into Fedora.


--- NEW FILE import.log ---
vanessa_logger-0_0_8-5_fc11:F-10:vanessa_logger-0.0.8-5.fc11.src.rpm:1261346121


--- NEW FILE vanessa_logger.spec ---
Summary:		Generic logging layer
Name:		vanessa_logger
Version:		0.0.8
Release:		5%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/vanessa_logger/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool
#Patch0:		vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch

%description
Generic logging layer that may be used to log to one or more of syslog,
an open file handle or a file name. Though due to limitations in the
implementation of syslog opening multiple syslog loggers doesn't makes
sense. Includes the ability to limit which messages will be logged based
on priorities.

# As subpackages defined -devel subpackage also must be explicit.
%package	devel
Summary:	Headers and static libraries for development
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Headers and static libraries required to develop against vanessa_logger.

%package	sample
Summary:	Example programme that demonstrates vanessa_logger
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	sample
Sample programme with source that demonstrates various features of
vanessa_logger.


%prep
%setup -q

#% patch0 -p0 -b .label

%build

# I am providing my own configure macro replacement. Hopefully this
# will result in fewer portability problems than using the one supplied
# by various vendours. I fear that I hope in vein.
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{prefix}/doc
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h
%doc COPYING README

%files sample
%defattr(-,root,root,-)
%{_bindir}/*
%{_mandir}/man1/vanessa_logger_sample.*
%doc sample/*.c sample/*.h README

%changelog
* Sun Dec 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.8-5
- New version 0.0.8

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- vanessa_logger-sample depend on vanessa_logger not on vanessa_logger-devel (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-2
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_logger/vanessa_logger-0.0.6-1.fc8.Hu.1.src.rpm.
- New version 0.0.7
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Adopt patch to new version, and name accordingly: vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch.
- Remove *.*a files in %%install.
- License changed to LGPLv2+ from just LGPL according to README.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- Add --disable-static in configure options (with it .la file not produced).

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.6-1
- Replace Tag Copyright by License
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	%%{rel}%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>
* Thu Apr 26 2001 Horms <horms at verge.net.au>
  Updated to "work" with Red Hat 7
* Sat Sep 15 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:39:02 -0000	1.1
+++ .cvsignore	20 Dec 2009 21:55:39 -0000	1.2
@@ -0,0 +1 @@
+vanessa_logger-0.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:39:02 -0000	1.1
+++ sources	20 Dec 2009 21:55:39 -0000	1.2
@@ -0,0 +1 @@
+3b70c8b330d25fb97ef9d7f3fd71c0b0  vanessa_logger-0.0.8.tar.bz2



From hubbitus at fedoraproject.org  Sun Dec 20 22:01:10 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 20 Dec 2009 22:01:10 +0000 (UTC)
Subject: rpms/vanessa_logger/F-11 import.log, NONE, 1.1 vanessa_logger.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091220220110.A939011C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_logger/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1411/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_logger.spec 
Log Message:
Initial push vanessa_logger into Fedora.


--- NEW FILE import.log ---
vanessa_logger-0_0_8-5_fc11:F-11:vanessa_logger-0.0.8-5.fc11.src.rpm:1261346192


--- NEW FILE vanessa_logger.spec ---
Summary:		Generic logging layer
Name:		vanessa_logger
Version:		0.0.8
Release:		5%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/vanessa_logger/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool
#Patch0:		vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch

%description
Generic logging layer that may be used to log to one or more of syslog,
an open file handle or a file name. Though due to limitations in the
implementation of syslog opening multiple syslog loggers doesn't makes
sense. Includes the ability to limit which messages will be logged based
on priorities.

# As subpackages defined -devel subpackage also must be explicit.
%package	devel
Summary:	Headers and static libraries for development
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Headers and static libraries required to develop against vanessa_logger.

%package	sample
Summary:	Example programme that demonstrates vanessa_logger
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	sample
Sample programme with source that demonstrates various features of
vanessa_logger.


%prep
%setup -q

#% patch0 -p0 -b .label

%build

# I am providing my own configure macro replacement. Hopefully this
# will result in fewer portability problems than using the one supplied
# by various vendours. I fear that I hope in vein.
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{prefix}/doc
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h
%doc COPYING README

%files sample
%defattr(-,root,root,-)
%{_bindir}/*
%{_mandir}/man1/vanessa_logger_sample.*
%doc sample/*.c sample/*.h README

%changelog
* Sun Dec 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.8-5
- New version 0.0.8

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- vanessa_logger-sample depend on vanessa_logger not on vanessa_logger-devel (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-2
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_logger/vanessa_logger-0.0.6-1.fc8.Hu.1.src.rpm.
- New version 0.0.7
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Adopt patch to new version, and name accordingly: vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch.
- Remove *.*a files in %%install.
- License changed to LGPLv2+ from just LGPL according to README.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- Add --disable-static in configure options (with it .la file not produced).

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.6-1
- Replace Tag Copyright by License
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	%%{rel}%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>
* Thu Apr 26 2001 Horms <horms at verge.net.au>
  Updated to "work" with Red Hat 7
* Sat Sep 15 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:39:02 -0000	1.1
+++ .cvsignore	20 Dec 2009 22:01:10 -0000	1.2
@@ -0,0 +1 @@
+vanessa_logger-0.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:39:02 -0000	1.1
+++ sources	20 Dec 2009 22:01:10 -0000	1.2
@@ -0,0 +1 @@
+3b70c8b330d25fb97ef9d7f3fd71c0b0  vanessa_logger-0.0.8.tar.bz2



From hubbitus at fedoraproject.org  Sun Dec 20 22:15:30 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 20 Dec 2009 22:15:30 +0000 (UTC)
Subject: rpms/vanessa_logger/F-12 import.log, NONE, 1.1 vanessa_logger.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091220221530.8B05411C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/vanessa_logger/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3924/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vanessa_logger.spec 
Log Message:
Initial push vanessa_logger into Fedora.


--- NEW FILE import.log ---
vanessa_logger-0_0_8-5_fc11:F-12:vanessa_logger-0.0.8-5.fc11.src.rpm:1261347304


--- NEW FILE vanessa_logger.spec ---
Summary:		Generic logging layer
Name:		vanessa_logger
Version:		0.0.8
Release:		5%{?dist}
License:		LGPLv2+
URL:			http://www.vergenet.net/linux/vanessa/
Group:		Development/Libraries
Source0:		http://www.vergenet.net/linux/vanessa/download/vanessa_logger/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires:	automake autoconf libtool
#Patch0:		vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch

%description
Generic logging layer that may be used to log to one or more of syslog,
an open file handle or a file name. Though due to limitations in the
implementation of syslog opening multiple syslog loggers doesn't makes
sense. Includes the ability to limit which messages will be logged based
on priorities.

# As subpackages defined -devel subpackage also must be explicit.
%package	devel
Summary:	Headers and static libraries for development
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Headers and static libraries required to develop against vanessa_logger.

%package	sample
Summary:	Example programme that demonstrates vanessa_logger
Group:	Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	sample
Sample programme with source that demonstrates various features of
vanessa_logger.


%prep
%setup -q

#% patch0 -p0 -b .label

%build

# I am providing my own configure macro replacement. Hopefully this
# will result in fewer portability problems than using the one supplied
# by various vendours. I fear that I hope in vein.
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
if [ -f configure.in ]; then
	aclocal
	libtoolize --force --copy
	automake --add-missing
	autoheader
	autoconf
fi
%configure --disable-static

make

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{prefix}/doc
make DESTDIR=%{buildroot} install

rm -f %{buildroot}%{_libdir}/*.*a

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%doc README COPYING ChangeLog

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h
%doc COPYING README

%files sample
%defattr(-,root,root,-)
%{_bindir}/*
%{_mandir}/man1/vanessa_logger_sample.*
%doc sample/*.c sample/*.h README

%changelog
* Sun Dec 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.8-5
- New version 0.0.8

* Mon Aug 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-4
- Historical ./configure with huge amount parameters replaced by %%configure macro.
- Removed unnecessary requires /sbin/ldconfig
- Removed the files README,COPYING from the devel package

* Sun Aug 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-3
- Fix typo in condition (confgure.in instead of configure.in) (thanks to Andrew Colin Kissa)
- vanessa_logger-sample depend on vanessa_logger not on vanessa_logger-devel (thanks to Andrew Colin Kissa)
- Add --add-missing flag to automake command and put it before autoheader.

* Tue Aug 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.0.7-2
- Ressurect old http://hubbitus.net.ru/rpm/Fedora9/vanessa_logger/vanessa_logger-0.0.6-1.fc8.Hu.1.src.rpm.
- New version 0.0.7
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release.
- Strip some old comments and unneded commands/macroses.
- Replace $RPM_BUILD_ROOT by %%{buildroot}.
- Move %%doc README COPYING ChangeLog from devel to main package.
- Old BuildPrereq tag replaced by BuildRequires.
- Make setup quiet.
- Adopt patch to new version, and name accordingly: vanessa_logger-0.0.7.error:label_at_end_of_compound_statement.patch.
- Remove *.*a files in %%install.
- License changed to LGPLv2+ from just LGPL according to README.
- Add Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig, and %%post/%%postun ldconfig invoke.
- Move %%{_libdir}/*.so into -devel.
- Add COPYING also in %%doc of -devel, README in all packages.
- Add --disable-static in configure options (with it .la file not produced).

* Mon Dec 31 2007 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.0.6-1
- Replace Tag Copyright by License
- Reformat all with tabs
- Change BuildRoot:	to correct (intead of hardcoded path): %%{_tmppath}/%%{name}-%%{version}-%%{release}-%%(%%{__id_u} -n)
- Delete (Comment out) %%define prefix	/usr
- Change from Release:	1 to Release:	%%{rel}%%{?dist}.Hu.0

* Fri Dec 14 2001 Horms <horms at verge.net.au>
  Revamped configure to use %%{_libdir} and friends. This should be more
  distribution indepentant. With thanks to Scot W. Hetzel <scot at genroco.com>
* Thu Apr 26 2001 Horms <horms at verge.net.au>
  Updated to "work" with Red Hat 7
* Sat Sep 15 2000 Horms <horms at verge.net.au>
  created for version 0.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:39:02 -0000	1.1
+++ .cvsignore	20 Dec 2009 22:15:29 -0000	1.2
@@ -0,0 +1 @@
+vanessa_logger-0.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vanessa_logger/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:39:02 -0000	1.1
+++ sources	20 Dec 2009 22:15:29 -0000	1.2
@@ -0,0 +1 @@
+3b70c8b330d25fb97ef9d7f3fd71c0b0  vanessa_logger-0.0.8.tar.bz2



From kwizart at fedoraproject.org  Sun Dec 20 22:23:37 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 20 Dec 2009 22:23:37 +0000 (UTC)
Subject: rpms/perl-Devel-FindRef/devel perl-Devel-FindRef.spec, 1.8,
	1.9 Devel-FindRef-1.422-nocommon.patch, 1.1, NONE
Message-ID: <20091220222337.5BB4E11C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Devel-FindRef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5302

Modified Files:
	perl-Devel-FindRef.spec 
Removed Files:
	Devel-FindRef-1.422-nocommon.patch 
Log Message:
- Add BR perl(common::sense)



Index: perl-Devel-FindRef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/devel/perl-Devel-FindRef.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Devel-FindRef.spec	7 Dec 2009 08:22:31 -0000	1.8
+++ perl-Devel-FindRef.spec	20 Dec 2009 22:23:36 -0000	1.9
@@ -1,14 +1,14 @@
 Name:           perl-Devel-FindRef
 Version:        1.42
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Where is that reference to my variable hiding?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Devel-FindRef/
 Source0:        http://www.cpan.org/authors/id/M/ML/MLEHMANN/Devel-FindRef-%{version}2.tar.gz
-Patch0:         Devel-FindRef-1.422-nocommon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(common::sense)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -19,7 +19,7 @@ references "backwards" is usually possib
 
 %prep
 %setup -q -n Devel-FindRef-%{version}2
-%patch0 -p1 -b .nocommon
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
@@ -50,10 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Devel*.3*
 
 %changelog
+* Sun Dec 20 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.42-8
+- Add BR perl(common::sense)
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.42-7
 - rebuild against perl 5.10.1
 
-* Mon Aug 31 2009 Nicolas Chauvet (kwizart) 1.42-5
+* Mon Aug 31 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.42-5
 - Update internal version to 1.422
 
 * Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> 1.42-3


--- Devel-FindRef-1.422-nocommon.patch DELETED ---



From kwizart at fedoraproject.org  Sun Dec 20 22:26:51 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 20 Dec 2009 22:26:51 +0000 (UTC)
Subject: rpms/perl-Devel-FindRef/F-12 perl-Devel-FindRef.spec, 1.7,
	1.8 Devel-FindRef-1.422-nocommon.patch, 1.1, NONE
Message-ID: <20091220222651.5376211C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Devel-FindRef/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6115

Modified Files:
	perl-Devel-FindRef.spec 
Removed Files:
	Devel-FindRef-1.422-nocommon.patch 
Log Message:
- Add BR perl(common::sense)



Index: perl-Devel-FindRef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/F-12/perl-Devel-FindRef.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Devel-FindRef.spec	31 Aug 2009 15:11:58 -0000	1.7
+++ perl-Devel-FindRef.spec	20 Dec 2009 22:26:51 -0000	1.8
@@ -1,14 +1,14 @@
 Name:           perl-Devel-FindRef
 Version:        1.42
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Where is that reference to my variable hiding?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Devel-FindRef/
 Source0:        http://www.cpan.org/authors/id/M/ML/MLEHMANN/Devel-FindRef-%{version}2.tar.gz
-Patch0:         Devel-FindRef-1.422-nocommon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(common::sense)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -19,7 +19,7 @@ references "backwards" is usually possib
 
 %prep
 %setup -q -n Devel-FindRef-%{version}2
-%patch0 -p1 -b .nocommon
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
@@ -50,7 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Devel*.3*
 
 %changelog
-* Mon Aug 31 2009 Nicolas Chauvet (kwizart) 1.42-5
+* Sun Dec 20 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.42-8
+- Add BR perl(common::sense)
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.42-7
+- rebuild against perl 5.10.1
+
+* Mon Aug 31 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.42-5
 - Update internal version to 1.422
 
 * Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> 1.42-3


--- Devel-FindRef-1.422-nocommon.patch DELETED ---



From airlied at fedoraproject.org  Sun Dec 20 22:29:27 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 22:29:27 +0000 (UTC)
Subject: File libdrm-20091221.tar.bz2 uploaded to lookaside cache by airlied
Message-ID: <20091220222927.8993D10F91B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libdrm:

4aa85099bb189436a3325733720cc3ab  libdrm-20091221.tar.bz2



From airlied at fedoraproject.org  Sun Dec 20 22:34:43 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 22:34:43 +0000 (UTC)
Subject: File xf86-video-ati-20091221.tar.xz uploaded to lookaside cache by
	airlied
Message-ID: <20091220223443.745C910F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xorg-x11-drv-ati:

84236a984ca7d78c7a33655e54c26e4c  xf86-video-ati-20091221.tar.xz



From airlied at fedoraproject.org  Sun Dec 20 22:37:56 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 22:37:56 +0000 (UTC)
Subject: rpms/libdrm/devel .cvsignore, 1.28, 1.29 libdrm.spec, 1.89,
	1.90 sources, 1.28, 1.29
Message-ID: <20091220223756.C7FDF11C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8819

Modified Files:
	.cvsignore libdrm.spec sources 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 2.4.17-0.1
- new radeon API from upstream rebase



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	1 Dec 2009 01:10:23 -0000	1.28
+++ .cvsignore	20 Dec 2009 22:37:55 -0000	1.29
@@ -1 +1 @@
-libdrm-20091201.tar.bz2
+libdrm-20091221.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- libdrm.spec	1 Dec 2009 01:10:23 -0000	1.89
+++ libdrm.spec	20 Dec 2009 22:37:55 -0000	1.90
@@ -1,8 +1,8 @@
-%define gitdate 20091201
+%define gitdate 20091221
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.16
+Version: 2.4.17
 Release: 0.1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 2.4.17-0.1
+- new radeon API from upstream rebase
+
 * Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 2.4.16-0.1
 - rebase to pre-snapshot of 2.4.16
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	1 Dec 2009 01:10:23 -0000	1.28
+++ sources	20 Dec 2009 22:37:55 -0000	1.29
@@ -1 +1 @@
-c4dbb62bfdfb4c5a1121f55b6049c2fa  libdrm-20091201.tar.bz2
+4aa85099bb189436a3325733720cc3ab  libdrm-20091221.tar.bz2



From airlied at fedoraproject.org  Sun Dec 20 22:41:27 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 22:41:27 +0000 (UTC)
Subject: File mesa-20091221.tar.bz2 uploaded to lookaside cache by airlied
Message-ID: <20091220224127.75F4110F91B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mesa:

0f4bc80e7c55cff25a44c91c8657fc1a  mesa-20091221.tar.bz2



From airlied at fedoraproject.org  Sun Dec 20 22:41:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 22:41:52 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.33, 1.34 sources, 1.34,
	1.35 xorg-x11-drv-ati.spec, 1.189, 1.190
Message-ID: <20091220224152.2479C11C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9579

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091221git4b05c47ac
- rebase for latest libdrm_radeon API changes - should be final API.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	2 Dec 2009 03:58:16 -0000	1.33
+++ .cvsignore	20 Dec 2009 22:41:51 -0000	1.34
@@ -1,2 +1,3 @@
 xf86-video-ati-20090929.tar.xz
 radeon-rlc-firmware-1.tar.bz2
+xf86-video-ati-20091221.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	2 Dec 2009 03:58:17 -0000	1.34
+++ sources	20 Dec 2009 22:41:51 -0000	1.35
@@ -1,2 +1,2 @@
-f66ac154c99ba836f38f4bea302e9d75  xf86-video-ati-20091201.tar.xz
 189be8ab60025bf81f8841ab53175665  radeon-rlc-firmware-1.tar.bz2
+84236a984ca7d78c7a33655e54c26e4c  xf86-video-ati-20091221.tar.xz


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.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- xorg-x11-drv-ati.spec	2 Dec 2009 03:58:17 -0000	1.189
+++ xorg-x11-drv-ati.spec	20 Dec 2009 22:41:51 -0000	1.190
@@ -1,8 +1,8 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20091201
-%define gitversion 88a50a30d
+%define gitdate 20091221
+%define gitversion 4b05c47ac
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
@@ -19,7 +19,6 @@ Source0: %{tarball}-%{gitdate}.tar.xz
 Source1:    mkxinf
 Source2:    radeon-rlc-firmware-1.tar.bz2
 
-Patch2:     radeon-ums-displayport.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
@@ -29,14 +28,14 @@ ExcludeArch: s390 s390x
 BuildRequires: python
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
 BuildRequires: mesa-libGL-devel >= 6.4-4
-BuildRequires: libdrm-devel >= 2.4.16-0.1
+BuildRequires: libdrm-devel >= 2.4.17-0.1
 BuildRequires: kernel-headers >= 2.6.27-0.308
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
-Requires:  libdrm >= 2.4.16-0.1
+Requires:  libdrm >= 2.4.17-0.1
 # new CS method needs newer kernel
 Requires:  kernel >= 2.6.29.1-111.fc11
 Obsoletes: xorg-x11-drv-avivo <= 0.0.2
@@ -52,7 +51,6 @@ Firmware for ATI R600/R700 IRQs
 
 %prep
 %setup -q -n %{tarball}-%{gitdate} -a 2
-%patch2 -p1 -b .dp
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
@@ -97,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/radeon/*.bin
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091221git4b05c47ac
+- rebase for latest libdrm_radeon API changes - should be final API.
+
 * Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091201git88a50a30d
 - add R600 RLC firmware for IRQ handling
 



From hicham at fedoraproject.org  Sun Dec 20 22:45:53 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sun, 20 Dec 2009 22:45:53 +0000 (UTC)
Subject: File solang-1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9.tar.gz uploaded
	to lookaside cache by hicham
Message-ID: <20091220224553.9123510F91B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for solang:

e600f684dc8f1a9d4bcbc45a7ba8a793  solang-1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9.tar.gz



From hicham at fedoraproject.org  Sun Dec 20 22:48:40 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sun, 20 Dec 2009 22:48:40 +0000 (UTC)
Subject: rpms/solang/devel 0001-Basic-functional-Brasero-destination.patch,
	NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 solang.spec,
	1.5, 1.6 sources, 1.3,
	1.4 solang-0001-Ported-to-libgdamm-4.x.patch, 1.1,
	NONE solang-0001-Silenced-Gtk-warnings.patch, 1.1, NONE
Message-ID: <20091220224840.7A65D11C00E6@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/solang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10955/devel

Modified Files:
	.cvsignore import.log solang.spec sources 
Added Files:
	0001-Basic-functional-Brasero-destination.patch 
Removed Files:
	solang-0001-Ported-to-libgdamm-4.x.patch 
	solang-0001-Silenced-Gtk-warnings.patch 
Log Message:


0001-Basic-functional-Brasero-destination.patch:
 configure.ac                         |    1 
 po/POTFILES.in                       |    1 
 src/application/Makefile.am          |    2 
 src/application/application.cpp      |    8 +
 src/exporter/Makefile.am             |    3 
 src/exporter/brasero-destination.cpp |  230 +++++++++++++++++++++++++++++++++++
 src/exporter/brasero-destination.h   |  110 ++++++++++++++++
 7 files changed, 354 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Basic-functional-Brasero-destination.patch ---
>From 499933efeae08833f7955cd84d568367cbdc4e23 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi at gnu.org>
Date: Sat, 21 Nov 2009 12:16:22 +0200
Subject: [PATCH] Basic functional Brasero destination

A new dependency has been introduced on Brasero >= 2.28.
---
 configure.ac                         |    1 +
 po/POTFILES.in                       |    1 +
 src/application/Makefile.am          |    2 +
 src/application/application.cpp      |    8 ++
 src/exporter/Makefile.am             |    3 +
 src/exporter/brasero-destination.cpp |  230 ++++++++++++++++++++++++++++++++++
 src/exporter/brasero-destination.h   |  109 ++++++++++++++++
 7 files changed, 354 insertions(+), 0 deletions(-)
 create mode 100644 src/exporter/brasero-destination.cpp
 create mode 100644 src/exporter/brasero-destination.h

diff --git a/configure.ac b/configure.ac
index f1a3385..7b05555 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,7 @@ AC_SUBST([NAUTILUS_EXTENSION_INSTALL_DIR
 
 
 PKG_CHECK_MODULES(BABL, [babl])
+PKG_CHECK_MODULES(BRASERO, [libbrasero-burn])
 PKG_CHECK_MODULES(EXIV2, [exiv2 >= 0.18])
 PKG_CHECK_MODULES(FLICKCURL, [flickcurl])
 PKG_CHECK_MODULES(GDAMM, [libgdamm-4.0])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 51cddd3..c92b429 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,6 +24,7 @@ src/editor/flip-widget.cpp
 src/editor/rotate-widget.cpp
 src/editor/save-photos-window.cpp
 src/editor/scale-widget.cpp
+src/exporter/brasero-destination.cpp
 src/exporter/directory-destination.cpp
 src/exporter/exporter-dialog.cpp
 src/importer/camera-import-widget.cpp
diff --git a/src/application/Makefile.am b/src/application/Makefile.am
index 606789d..e424f7f 100644
--- a/src/application/Makefile.am
+++ b/src/application/Makefile.am
@@ -25,6 +25,7 @@ solang_LDADD = \
 	$(top_builddir)/src/editor/libeditor.la \
 	$(top_builddir)/src/edit-engine/libeditengine.la \
 	$(top_builddir)/src/common/libcommon.la \
+	$(BRASERO_LIBS) \
 	$(EXIV2_LIBS) \
 	$(FLICKCURL_LIBS) \
 	$(GPHOTO2_LIBS) \
@@ -53,6 +54,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/renderer \
 	-I$(top_srcdir)/src/storage \
 	$(SOLANG_CFLAGS) \
+	$(BRASERO_CFLAGS) \
 	$(EXIV2_CFLAGS) \
 	$(FLICKCURL_CFLAGS) \
 	$(GPHOTO2_CFLAGS) \
diff --git a/src/application/application.cpp b/src/application/application.cpp
index 827ce44..bba7ece 100644
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -28,6 +28,7 @@
 #include <giomm.h>
 
 #include "application.h"
+#include "brasero-destination.h"
 #include "browser-model-column-record.h"
 #include "browser-renderer.h"
 #include "camera-source.h"
@@ -315,6 +316,13 @@ Application::init() throw()
     plugins_.insert(std::make_pair("directory-exporter",
                                    directory_exporter));
 
+    IPhotoDestinationPtr brasero_destination(
+                             new BraseroDestination());
+    IPluginPtr brasero_exporter(new Exporter(brasero_destination,
+                                             true));
+    plugins_.insert(std::make_pair("brasero-exporter",
+                                   brasero_exporter));
+
     IPhotoSourcePtr directory_source(new DirectorySource());
     IPluginPtr directory_importer(new Importer(directory_source, true));
     plugins_.insert(std::make_pair("directory-importer",
diff --git a/src/exporter/Makefile.am b/src/exporter/Makefile.am
index 1aa19dc..123571a 100644
--- a/src/exporter/Makefile.am
+++ b/src/exporter/Makefile.am
@@ -8,6 +8,8 @@ libexporter_la_SOURCES = \
 	photo-destination.h \
 	photo-destination.cpp \
 	photo-destination-enums.h \
+	brasero-destination.cpp \
+	brasero-destination.h \
 	directory-destination.h \
 	directory-destination.cpp
 
@@ -24,6 +26,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/renderer \
 	-I$(top_srcdir)/src/storage \
 	$(SOLANG_CFLAGS) \
+	$(BRASERO_CFLAGS) \
 	$(EXIV2_CFLAGS) \
 	$(GTKMM_CFLAGS) \
 	$(GDAMM_CFLAGS) \
diff --git a/src/exporter/brasero-destination.cpp b/src/exporter/brasero-destination.cpp
new file mode 100644
index 0000000..7a87481
--- /dev/null
+++ b/src/exporter/brasero-destination.cpp
@@ -0,0 +1,230 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * Copyright (C) 2009 Debarshi Ray <rishi at gnu.org>
+ *
+ * Solang is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Solang 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/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif // HAVE_CONFIG_H
+
+#include <brasero-burn-dialog.h>
+#include <brasero-burn-lib.h>
+#include <glibmm/i18n.h>
+
+#include "brasero-destination.h"
+#include "photo.h"
+#include "photo-destination-enums.h"
+#include "progress-observer.h"
+
+namespace Solang
+{
+
+BraseroDestination::BraseroDestination() throw() :
+    PhotoDestination(),
+    braseroDrive_(0),
+    braseroSessionCfg_(0),
+    braseroTrackDataCfg_(0),
+    braseroDriveSelection_(0),
+    braseroBurnBegin_(),
+    initEnd_()
+{
+    brasero_burn_library_start(0, 0);
+
+    braseroBurnBegin_.connect(
+        sigc::mem_fun(*this,
+                      &BraseroDestination::on_brasero_burn_begin));
+}
+
+BraseroDestination::~BraseroDestination() throw()
+{
+    brasero_burn_library_stop();
+}
+
+void
+BraseroDestination::init(Application & application) throw()
+{
+    initEnd_.emit(true);
+}
+
+void
+BraseroDestination::final(Application & application) throw()
+{
+}
+
+void
+BraseroDestination::export_photo(
+                          const PhotoPtr & photo,
+                          const IStoragePtr & storage,
+                          const ProgressObserverPtr & observer)
+                          throw()
+{
+    photo->set_disk_file_path(storage);
+
+    Glib::ustring uri;
+
+    try
+    {
+        const std::string path = Glib::filename_from_utf8(
+                                     photo->get_disk_file_path());
+        uri = Glib::filename_to_uri(path);
+    }
+    catch (const Glib::ConvertError & e)
+    {
+        g_warning("%s", e.what().c_str());
+        return;
+    }
+
+    brasero_track_data_cfg_add(braseroTrackDataCfg_, uri.c_str(),
+                               NULL);
+
+    observer->receive_event_notifiation();
+}
+
+void
+BraseroDestination::export_photos(
+                          const PhotoList & photos,
+                          const IStoragePtr & storage,
+                          const ProgressObserverPtr & observer)
+                          throw()
+{
+    if (0 == braseroDrive_)
+    {
+        return;
+    }
+
+    observer->set_event_description(_("Exporting Photos"));
+    observer->set_num_events(photos.size());
+
+    braseroSessionCfg_ = brasero_session_cfg_new();
+    brasero_burn_session_set_burner(
+        BRASERO_BURN_SESSION(braseroSessionCfg_), braseroDrive_);
+    g_object_unref(braseroDrive_);
+    braseroDrive_ = 0;
+
+    braseroTrackDataCfg_ = brasero_track_data_cfg_new();
+    brasero_burn_session_add_track(
+        BRASERO_BURN_SESSION(braseroSessionCfg_),
+        BRASERO_TRACK(braseroTrackDataCfg_),
+        NULL);
+
+    PhotoList::const_iterator it;
+
+    for (it = photos.begin(); photos.end() != it; it++)
+    {
+        export_photo(*it, storage, observer);
+    }
+
+    g_object_unref(braseroTrackDataCfg_);
+    braseroTrackDataCfg_ = 0;
+
+    braseroBurnBegin_.emit();
+}
+
+void BraseroDestination::final() throw()
+{
+}
+
+sigc::signal<void, bool> &
+BraseroDestination::init_end() throw()
+{
+    return initEnd_;
+}
+
+void
+BraseroDestination::read_selection() throw()
+{
+    braseroDrive_
+        = brasero_drive_selection_get_active(
+              BRASERO_DRIVE_SELECTION(braseroDriveSelection_));
+}
+
+Gtk::Widget &
+BraseroDestination::get_browser() throw()
+{
+    braseroDriveSelection_ = brasero_drive_selection_new();
+    brasero_drive_selection_show_type(
+        BRASERO_DRIVE_SELECTION(braseroDriveSelection_),
+        static_cast<BraseroDriveType>(BRASERO_DRIVE_TYPE_FILE
+                                      | BRASERO_DRIVE_TYPE_WRITER));
+
+    return *Gtk::manage(Glib::wrap(
+                            GTK_COMBO_BOX(braseroDriveSelection_),
+                            false));
+}
+
+Glib::ustring
+BraseroDestination::get_label() const throw()
+{
+    return Glib::ustring(_("_CD/DVD..."));
+}
+
+Glib::ustring
+BraseroDestination::get_name() const throw()
+{
+    return Glib::ustring("Brasero");
+}
+
+gint
+BraseroDestination::get_options() const throw()
+{
+    return PHOTO_DESTINATION_CREATE_ARCHIVE_FALSE;
+}
+
+Gtk::StockID
+BraseroDestination::get_stock_id() const throw()
+{
+    return Gtk::Stock::CDROM;
+}
+
+void
+BraseroDestination::set_create_archive(bool value) throw()
+{
+    // NB: Creation of archives is not supported.
+}
+
+void
+BraseroDestination::brasero_burn_begin_idle() throw()
+{
+    GtkWidget * const burn_dialog = brasero_burn_dialog_new();
+
+    gtk_window_set_title(GTK_WINDOW(burn_dialog),
+                         _("Export to CD/DVD"));
+    brasero_burn_dialog_run(BRASERO_BURN_DIALOG(burn_dialog),
+                            BRASERO_BURN_SESSION(braseroSessionCfg_));
+    gtk_widget_destroy(burn_dialog);
+
+    g_object_unref(braseroSessionCfg_);
+    braseroSessionCfg_ = 0;
+}
+
+void
+BraseroDestination::on_brasero_burn_begin() throw()
+{
+    // FIXME: For some reason brasero_burn_dialog_run gets stuck some
+    //        times and freezes the application. This is a workaround.
+
+    while (true == Gtk::Main::events_pending())
+    {
+        Gtk::Main::iteration();
+    }
+
+    Glib::signal_idle().connect_once(
+        sigc::mem_fun(*this,
+                      &BraseroDestination::brasero_burn_begin_idle),
+        Glib::PRIORITY_LOW);
+}
+
+} // namespace Solang
diff --git a/src/exporter/brasero-destination.h b/src/exporter/brasero-destination.h
new file mode 100644
index 0000000..cff7842
--- /dev/null
+++ b/src/exporter/brasero-destination.h
@@ -0,0 +1,109 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * Copyright (C) 2009 Debarshi Ray <rishi at gnu.org>
+ *
+ * Solang is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Solang 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/>.
+ */
+
+#ifndef SOLANG_BRASERO_DESTINATION_H
+#define SOLANG_BRASERO_DESTINATION_H
+
+#include <brasero-drive.h>
+#include <brasero-drive-selection.h>
+#include <brasero-session-cfg.h>
+#include <brasero-track-data-cfg.h>
+#include <glibmm.h>
+
+#include "photo-destination.h"
+
+namespace Solang
+{
+
+class BraseroDestination :
+    public PhotoDestination
+{
+    public:
+        BraseroDestination() throw();
+
+        virtual
+        ~BraseroDestination() throw();
+
+        virtual void
+        init(Application & application) throw();
+
+        virtual void
+        final(Application & application) throw();
+
+        virtual void
+        export_photo(const PhotoPtr & photo,
+                     const IStoragePtr & storage,
+                     const ProgressObserverPtr & observer) throw();
+
+        virtual void
+        export_photos(const PhotoList & photos,
+                      const IStoragePtr & storage,
+                      const ProgressObserverPtr & observer) throw();
+
+        virtual void
+        final() throw();
+
+        virtual sigc::signal<void, bool> &
+        init_end() throw();
+
+        virtual void
+        read_selection() throw();
+
+        virtual Gtk::Widget &
+        get_browser() throw();
+
+        virtual Glib::ustring
+        get_label() const throw();
+
+        virtual Glib::ustring
+        get_name() const throw();
+
+        virtual gint
+        get_options() const throw();
+
+        virtual Gtk::StockID
+        get_stock_id() const throw();
+
+        virtual void
+        set_create_archive(bool value) throw();
+
+    protected:
+        void
+        brasero_burn_begin_idle() throw();
+
+        void
+        on_brasero_burn_begin() throw();
+
+        BraseroDrive * braseroDrive_;
+
+        BraseroSessionCfg * braseroSessionCfg_;
+
+        BraseroTrackDataCfg * braseroTrackDataCfg_;
+
+        GtkWidget * braseroDriveSelection_;
+
+        Glib::Dispatcher braseroBurnBegin_;
+
+        sigc::signal<void, bool> initEnd_;
+
+    private:
+};
+
+} // namespace Solang
+
+#endif // SOLANG_BRASERO_DESTINATION_H
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Sep 2009 06:38:47 -0000	1.3
+++ .cvsignore	20 Dec 2009 22:48:40 -0000	1.4
@@ -1 +1 @@
-solang-0.3.tar.gz
+solang-1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	27 Nov 2009 22:37:12 -0000	1.3
+++ import.log	20 Dec 2009 22:48:40 -0000	1.4
@@ -1,3 +1,4 @@
 solang-0_2-2_fc11:HEAD:solang-0.2-2.fc11.src.rpm:1247580220
 solang-0_3-1_fc11:HEAD:solang-0.3-1.fc11.src.rpm:1253515046
 solang-0_3-3_fc12:HEAD:solang-0.3-3.fc12.src.rpm:1259361371
+solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349159


Index: solang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/solang.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- solang.spec	27 Nov 2009 22:37:12 -0000	1.5
+++ solang.spec	20 Dec 2009 22:48:40 -0000	1.6
@@ -1,12 +1,27 @@
+%define git 1
+
+%if %{git}
+%define commit 1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9
+%endif
+
+%define rel 4
+
 Name:		solang
 Version:	0.3
-Release:	3%{?dist}
+%if %{git}
+Release:	%{rel}.%{commit}git%{?dist}
+%else
+Release:	%{rel}%{?dist}
+%endif
 Summary:	A Photo Manager for GNOME
-
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		https://savannah.nongnu.org/projects/solang/
+%if %{git}
+Source0:	http://git.savannah.gnu.org/cgit/solang.git/snapshot/%{name}-%{commit}.tar.gz
+%else
 Source0:	http://download.savannah.nongnu.org/releases/solang/%{name}-%{version}.tar.gz
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,13 +40,13 @@ BuildRequires:	babl-devel
 BuildRequires:	gegl-devel
 BuildRequires:	libtool
 BuildRequires:	intltool
+BuildRequires:	brasero-devel >= 2.28.3
+BuildRequires:	nautilus-devel
 
 Requires:	libgda-sqlite
 
-#Patch0: http://lists.gnu.org/archive/html/solang-devel/2009-09/msg00018.html
-Patch0:		%{name}-0001-Silenced-Gtk-warnings.patch
-#Patch1: http://lists.gnu.org/archive/html/solang-devel/2009-11/msg00003.html
-Patch1:		%{name}-0001-Ported-to-libgdamm-4.x.patch
+#This patch adds a photo exporter to brasero, it is available on http://rishi.fedorapeople.org
+Patch0:		0001-Basic-functional-Brasero-destination.patch
 
 %description
 Solang is a free photo manager that will act as a front-end for
@@ -45,13 +60,21 @@ alternative that does not place humongou
 even to meet basic functionality.
 
 %prep
+%if %{git}
+%setup -q -n %{name}-%{commit}
+%else
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .silenced-gtk-warnings
-%patch1 -p1 -b .port-to-libgdamm4
-autoreconf -i -v
+%endif
+
+%patch0 -p1 -b .brasero-destination
+
+%if %{git}
+autoreconf -i -f
+intltoolize --force
+%endif
 
 %build
-%configure --docdir=%{_docdir}/%{name}-%{version}
+%configure	--docdir=%{_docdir}/%{name}-%{version}
 make %{?smp_flags}
 
 
@@ -98,6 +121,31 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/solang.svg
 
 %changelog
+* Sun Dec 20 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git
+- Dropped patch porting to libgdamm-4.x (merged upstream)
+- Dropped patch silencing gtk+ warnings (merged upstream)
+- Patch adding a nautilus extension
+- Patch adding a basic functional brasero destination
+- Changes from upstream since last release :
+	+ Enlarged and slideshow renderer improvements
+	+ Added French translation
+	+ Fixed the title of ExporterDialog
+	+ Ported to libgdamm-4.x
+	+ Added solang.doap: http://live.gnome.org/MaintainersCorner#maintainers
+	+ Fixed internationalization
+	+ Updated French translation
+	+ Added an expanded toolbar separator to solang.ui
+	+ Moved the Zoomer's functionality to the main Gtk::Toolbar
+	+ Carried out some housekeeping
+	+ Sanitized ProgressObserver usage
+	+ Correctly detect failure in extracting thumbnails using Exiv2
+	+ ContentTypeRepo::is_gdk_supported should take a content-type
+	+ Automatic rotation according to Exif tags
+	+ Use ThumbbufMaker in Thumbnail::generate_using_gdkpixbuf
+	+ Improved content-type guessing and Gdk::PixbufLoader selection
+	+ Added a PixbufMaker with both async and sync capabilities
+	+ Removed zoomer.cpp from POTFILES.in
+
 * Fri Nov 27 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3-3
 - Added the patch 0001-Ported-to-libgdamm-4.x.patch
 - Cleaned up some dependencies


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Sep 2009 06:38:47 -0000	1.3
+++ sources	20 Dec 2009 22:48:40 -0000	1.4
@@ -1 +1 @@
-6f82d34174815deacb4392b88a4134ed  solang-0.3.tar.gz
+e600f684dc8f1a9d4bcbc45a7ba8a793  solang-1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9.tar.gz


--- solang-0001-Ported-to-libgdamm-4.x.patch DELETED ---


--- solang-0001-Silenced-Gtk-warnings.patch DELETED ---



From hicham at fedoraproject.org  Sun Dec 20 22:49:49 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sun, 20 Dec 2009 22:49:49 +0000 (UTC)
Subject: rpms/solang/devel import.log,1.4,1.5 solang.spec,1.6,1.7
Message-ID: <20091220224949.A878311C00E6@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/solang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11509/devel

Modified Files:
	import.log solang.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	20 Dec 2009 22:48:40 -0000	1.4
+++ import.log	20 Dec 2009 22:49:49 -0000	1.5
@@ -2,3 +2,4 @@ solang-0_2-2_fc11:HEAD:solang-0.2-2.fc11
 solang-0_3-1_fc11:HEAD:solang-0.3-1.fc11.src.rpm:1253515046
 solang-0_3-3_fc12:HEAD:solang-0.3-3.fc12.src.rpm:1259361371
 solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349159
+solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349346


Index: solang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/solang.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- solang.spec	20 Dec 2009 22:48:40 -0000	1.6
+++ solang.spec	20 Dec 2009 22:49:49 -0000	1.7
@@ -124,7 +124,6 @@ gtk-update-icon-cache %{_datadir}/icons/
 * Sun Dec 20 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git
 - Dropped patch porting to libgdamm-4.x (merged upstream)
 - Dropped patch silencing gtk+ warnings (merged upstream)
-- Patch adding a nautilus extension
 - Patch adding a basic functional brasero destination
 - Changes from upstream since last release :
 	+ Enlarged and slideshow renderer improvements



From airlied at fedoraproject.org  Sun Dec 20 22:50:28 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 22:50:28 +0000 (UTC)
Subject: rpms/mesa/devel .cvsignore, 1.39, 1.40 mesa-7.1-link-shared.patch, 1.4,
	1.5 mesa-no-mach64.patch, 1.2, 1.3 mesa.spec, 1.256,
	1.257 sources, 1.42, 1.43 mesa-7.5-sparc64.patch, 1.1,
	NONE r600-fix-tfp.patch, 1.1, NONE
Message-ID: <20091220225028.CD26C11C0382@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11717

Modified Files:
	.cvsignore mesa-7.1-link-shared.patch mesa-no-mach64.patch 
	mesa.spec sources 
Removed Files:
	mesa-7.5-sparc64.patch r600-fix-tfp.patch 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.1
- resnapshot from upstream for libdrm_radeon changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	19 Oct 2009 22:32:52 -0000	1.39
+++ .cvsignore	20 Dec 2009 22:50:28 -0000	1.40
@@ -8,3 +8,4 @@ mesa-20090813.tar.bz2
 mesa-20090909.tar.bz2
 mesa-20090921.tar.bz2
 xdriinfo-1.0.3.tar.bz2
+mesa-20091221.tar.bz2

mesa-7.1-link-shared.patch:
 drivers/dri/Makefile          |   12 ++++++++++--
 drivers/dri/Makefile.template |    4 ++--
 x86/read_rgba_span_x86.S      |    4 ----
 3 files changed, 12 insertions(+), 8 deletions(-)

Index: mesa-7.1-link-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1-link-shared.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mesa-7.1-link-shared.patch	22 Mar 2009 02:20:15 -0000	1.4
+++ mesa-7.1-link-shared.patch	20 Dec 2009 22:50:28 -0000	1.5
@@ -1,6 +1,6 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore	2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile	2008-08-14 16:18:20.000000000 +1000
+diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
+--- mesa-20091221/src/mesa/drivers/dri/Makefile.da	2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/drivers/dri/Makefile	2009-12-21 08:43:03.000000000 +1000
 @@ -6,12 +6,17 @@ include $(TOP)/configs/current
  
  
@@ -20,7 +20,7 @@ diff -up mesa-20080814/src/mesa/drivers/
  
  subdirs:
  	@for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
+@@ -32,12 +37,14 @@ dri.pc: dri.pc.in
  	$(pcedit) $< > $@
  
  
@@ -36,38 +36,36 @@ diff -up mesa-20080814/src/mesa/drivers/
  	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
  	$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
  	  $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
+@@ -51,5 +58,6 @@ clean:
  			(cd $$dir && $(MAKE) clean) ; \
  		fi \
  	done
 +	-rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
  	-rm -f common/*.o
  	-rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore	2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template	2008-08-14 16:19:37.000000000 +1000
+diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
+--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da	2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/drivers/dri/Makefile.template	2009-12-21 08:43:40.000000000 +1000
 @@ -1,6 +1,6 @@
  # -*-makefile-*-
  
 -MESA_MODULES = $(TOP)/src/mesa/libmesa.a
 +MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
  
- COMMON_SOURCES = \
+ COMMON_GALLIUM_SOURCES = \
          ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
- 
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
+@@ -70,7 +70,7 @@ lib: symlinks subdirs depend
+ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
+ 		$(TOP)/src/mesa/drivers/dri/Makefile.template
  	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+		$(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \
-+		-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+		$(DRI_LIB_DEPS)
+-		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
++		$(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
+ 		$(DRI_LIB_DEPS)
  
  
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore	2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S	2008-08-14 16:16:49.000000000 +1000
+diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
+--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da	2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S	2009-12-21 08:43:03.000000000 +1000
 @@ -77,7 +77,6 @@
   */
  

mesa-no-mach64.patch:
 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: mesa-no-mach64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-no-mach64.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mesa-no-mach64.patch	23 Jul 2009 02:15:27 -0000	1.2
+++ mesa-no-mach64.patch	20 Dec 2009 22:50:28 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up mesa-20090723/configure.ac.mach64 mesa-20090723/configure.ac
---- mesa-20090723/configure.ac.mach64	2009-07-23 12:11:01.000000000 +1000
-+++ mesa-20090723/configure.ac	2009-07-23 12:11:22.000000000 +1000
-@@ -713,7 +713,7 @@ if test "$mesa_driver" = dri; then
+diff -up mesa-20091221/configure.ac.da mesa-20091221/configure.ac
+--- mesa-20091221/configure.ac.da	2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/configure.ac	2009-12-21 08:41:04.000000000 +1000
+@@ -723,7 +723,7 @@ if test "$mesa_driver" = dri; then
              # because there is no x86-64 system where they could *ever*
              # be used.
              if test "x$DRI_DIRS" = "xyes"; then
@@ -10,7 +10,7 @@ diff -up mesa-20090723/configure.ac.mach
                      savage tdfx unichrome swrast"
              fi
              ;;
-@@ -721,13 +721,13 @@ if test "$mesa_driver" = dri; then
+@@ -731,13 +731,13 @@ if test "$mesa_driver" = dri; then
              # Build only the drivers for cards that exist on PowerPC.
              # At some point MGA will be added, but not yet.
              if test "x$DRI_DIRS" = "xyes"; then
@@ -26,7 +26,7 @@ diff -up mesa-20090723/configure.ac.mach
              fi
              ;;
          esac
-@@ -746,7 +746,7 @@ if test "$mesa_driver" = dri; then
+@@ -756,7 +756,7 @@ if test "$mesa_driver" = dri; then
          # ffb and gamma are missing because they have not been converted
          # to use the new interface.
          if test "x$DRI_DIRS" = "xyes"; then
@@ -35,12 +35,12 @@ diff -up mesa-20090723/configure.ac.mach
                  unichrome savage sis swrast"
          fi
          ;;
-@@ -765,7 +765,7 @@ if test "$mesa_driver" = dri; then
+@@ -775,7 +775,7 @@ if test "$mesa_driver" = dri; then
  
      # default drivers
      if test "x$DRI_DIRS" = "xyes"; then
--        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon s3v \
-+        DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon s3v \
-             savage sis tdfx trident unichrome ffb swrast"
+-        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
++        DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon \
+             savage sis tdfx unichrome ffb swrast"
      fi
  


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- mesa.spec	19 Oct 2009 22:32:52 -0000	1.256
+++ mesa.spec	20 Dec 2009 22:50:28 -0000	1.257
@@ -13,15 +13,15 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.3
-%define gitdate 20090921
+%define gitdate 20091221
 #% define snapshot 
 
 %define demodir %{_libdir}/mesa
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 7.6
-Release: 0.13%{?dist}
+Version: 7.8
+Release: 0.1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -43,9 +43,6 @@ Patch3: mesa-no-mach64.patch
 
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
-Patch10: r600-fix-tfp.patch
-
-Patch13: mesa-7.5-sparc64.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
 
@@ -178,8 +175,6 @@ This package provides some demo applicat
 %patch3 -p1 -b .no-mach64
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
-%patch10 -p1 -b .r600_tfp
-%patch13 -p1 -b .sparc64
 %patch30 -p1 -b .vblank-warning
 
 # Hack the demos to use installed data files
@@ -387,6 +382,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.1
+- resnapshot from upstream for libdrm_radeon changes
+
 * Mon Oct 19 2009 Adam Jackson <ajax at redhat.com>
 - xdriinfo 1.0.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	19 Oct 2009 22:32:52 -0000	1.42
+++ sources	20 Dec 2009 22:50:28 -0000	1.43
@@ -1,4 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-0bbe19a02cacc7c48e5c79bd533b8e29  mesa-20090921.tar.bz2
 cb304d1ce562ac48b68eedeba38c662f  xdriinfo-1.0.3.tar.bz2
+0f4bc80e7c55cff25a44c91c8657fc1a  mesa-20091221.tar.bz2


--- mesa-7.5-sparc64.patch DELETED ---


--- r600-fix-tfp.patch DELETED ---



From hicham at fedoraproject.org  Sun Dec 20 22:56:06 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sun, 20 Dec 2009 22:56:06 +0000 (UTC)
Subject: rpms/solang/devel import.log,1.5,1.6
Message-ID: <20091220225606.A96F811C00E6@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/solang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13262/devel

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	20 Dec 2009 22:49:49 -0000	1.5
+++ import.log	20 Dec 2009 22:56:06 -0000	1.6
@@ -3,3 +3,4 @@ solang-0_3-1_fc11:HEAD:solang-0.3-1.fc11
 solang-0_3-3_fc12:HEAD:solang-0.3-3.fc12.src.rpm:1259361371
 solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349159
 solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349346
+solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349475



From hicham at fedoraproject.org  Sun Dec 20 22:58:14 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Sun, 20 Dec 2009 22:58:14 +0000 (UTC)
Subject: rpms/solang/devel import.log,1.6,1.7 solang.spec,1.7,1.8
Message-ID: <20091220225814.406C511C00E6@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/solang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13893/devel

Modified Files:
	import.log solang.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	20 Dec 2009 22:56:06 -0000	1.6
+++ import.log	20 Dec 2009 22:58:14 -0000	1.7
@@ -4,3 +4,4 @@ solang-0_3-3_fc12:HEAD:solang-0.3-3.fc12
 solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349159
 solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349346
 solang-0_3-4_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349475
+solang-0_3-5_1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git_fc12:HEAD:solang-0.3-5.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git.fc12.src.rpm:1261349837


Index: solang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solang/devel/solang.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- solang.spec	20 Dec 2009 22:49:49 -0000	1.7
+++ solang.spec	20 Dec 2009 22:58:14 -0000	1.8
@@ -4,7 +4,7 @@
 %define commit 1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9
 %endif
 
-%define rel 4
+%define rel 5
 
 Name:		solang
 Version:	0.3
@@ -121,7 +121,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/solang.svg
 
 %changelog
-* Sun Dec 20 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3-4.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git
+* Sun Dec 20 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3-5.1fa4f602dd79f8be1f4c6e4be4f86e42970d84a9git
 - Dropped patch porting to libgdamm-4.x (merged upstream)
 - Dropped patch silencing gtk+ warnings (merged upstream)
 - Patch adding a basic functional brasero destination



From airlied at fedoraproject.org  Sun Dec 20 23:22:49 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 23:22:49 +0000 (UTC)
Subject: rpms/mesa/devel glsl-build-fix.patch,NONE,1.1 mesa.spec,1.257,1.258
Message-ID: <20091220232249.D590411C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18498

Modified Files:
	mesa.spec 
Added Files:
	glsl-build-fix.patch 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.2
- add GLSL build fix from upstream + bump libdrm requires


glsl-build-fix.patch:
 sl_pp_macro.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glsl-build-fix.patch ---
>From 55c43ee3158e5e83dcf51a7d6eaa35d4314c0833 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 21 Dec 2009 09:10:21 +1000
Subject: [PATCH] glsl: make stack compile.

it would be nice if this stuff would be test built on mesa's primary
platform with mesa's primary build system.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/glsl/pp/sl_pp_macro.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/glsl/pp/sl_pp_macro.h b/src/glsl/pp/sl_pp_macro.h
index 2967baf..1d21068 100644
--- a/src/glsl/pp/sl_pp_macro.h
+++ b/src/glsl/pp/sl_pp_macro.h
@@ -33,6 +33,7 @@
 
 struct sl_pp_context;
 struct sl_pp_process_state;
+struct sl_pp_token_buffer;
 
 struct sl_pp_macro_formal_arg {
    int name;
-- 
1.6.5.2



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- mesa.spec	20 Dec 2009 22:50:28 -0000	1.257
+++ mesa.spec	20 Dec 2009 23:22:48 -0000	1.258
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -44,13 +44,15 @@ Patch3: mesa-no-mach64.patch
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
 
+Patch20: glsl-build-fix.patch
+
 Patch30: mesa-7.6-hush-vblank-warning.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_hardware}
 BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
 %endif
-BuildRequires: libdrm-devel >= 2.4.5-1
+BuildRequires: libdrm-devel >= 2.4.17-0.1
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
 BuildRequires: xorg-x11-proto-devel >= 7.1-10
@@ -74,7 +76,7 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Provides: libGL
 Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
-Requires: libdrm >= 2.4.5-1
+Requires: libdrm >= 2.4.17-0.1
 %if %{with_hardware}
 Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
 %endif
@@ -175,6 +177,7 @@ This package provides some demo applicat
 %patch3 -p1 -b .no-mach64
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
+%patch20 -p1 -b .glsl-bf
 %patch30 -p1 -b .vblank-warning
 
 # Hack the demos to use installed data files
@@ -382,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.2
+- add GLSL build fix from upstream + bump libdrm requires
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.1
 - resnapshot from upstream for libdrm_radeon changes
 



From airlied at fedoraproject.org  Sun Dec 20 23:34:09 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 23:34:09 +0000 (UTC)
Subject: rpms/mesa/devel glsl-build-fix.patch,1.1,1.2 mesa.spec,1.258,1.259
Message-ID: <20091220233409.E1CA711C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20848

Modified Files:
	glsl-build-fix.patch mesa.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.3
- another attempt at GLSL build fix


glsl-build-fix.patch:
 glsl/pp/sl_pp_macro.h              |    2 +-
 mesa/shader/slang/library/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: glsl-build-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/glsl-build-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- glsl-build-fix.patch	20 Dec 2009 23:22:48 -0000	1.1
+++ glsl-build-fix.patch	20 Dec 2009 23:34:09 -0000	1.2
@@ -26,3 +26,16 @@ index 2967baf..1d21068 100644
 -- 
 1.6.5.2
 
+diff --git a/src/mesa/shader/slang/library/Makefile b/src/mesa/shader/slang/library/Makefile
+index c696451..8ac7fd6 100644
+--- a/src/mesa/shader/slang/library/Makefile
++++ b/src/mesa/shader/slang/library/Makefile
+@@ -12,7 +12,7 @@ GLSL_CL = $(TOP)/src/glsl/apps/compile
+ 
+ .PHONY: default clean
+ 
+-default: builtin
++default: $(GLSL_CL) builtin
+ 
+ clean:
+ 	-rm -f *_gc.h


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- mesa.spec	20 Dec 2009 23:22:48 -0000	1.258
+++ mesa.spec	20 Dec 2009 23:34:09 -0000	1.259
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -385,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.3
+- another attempt at GLSL build fix
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.2
 - add GLSL build fix from upstream + bump libdrm requires
 



From airlied at fedoraproject.org  Sun Dec 20 23:53:09 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 20 Dec 2009 23:53:09 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec,1.259,1.260
Message-ID: <20091220235309.D60DB11C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24308

Modified Files:
	mesa.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.4
- fix OSmesa builds hopefully



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- mesa.spec	20 Dec 2009 23:34:09 -0000	1.259
+++ mesa.spec	20 Dec 2009 23:53:09 -0000	1.260
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -198,24 +198,24 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fvisibi
 %else
 %define common_flags --enable-selinux --enable-pic
 %endif
-%define osmesa_flags --with-driver=osmesa %{common_flags}
+%define osmesa_flags --with-driver=osmesa %{common_flags} --disable-gallium --with-dri-drivers="" --disable-glu --disable-egl
 
 # first, build the osmesa variants. XXX this is overkill.  osmesa32 is
 # sufficient to render to any of the channel sizes, according to the
 # docs.  should fix this someday.
 
 %configure %{osmesa_flags} --with-osmesa-bits=8
-make %{_smp_mflags} SRC_DIRS=mesa
+make %{_smp_mflags}
 mv %{_lib} osmesa8
 make clean
 
 %configure %{osmesa_flags} --with-osmesa-bits=16
-make %{_smp_mflags} SRC_DIRS=mesa
+make %{_smp_mflags}
 mv %{_lib} osmesa16
 make clean
 
 %configure %{osmesa_flags} --with-osmesa-bits=32
-make %{_smp_mflags} SRC_DIRS=mesa
+make %{_smp_mflags}
 mv %{_lib} osmesa32
 make clean
 
@@ -385,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.4
+- fix OSmesa builds hopefully
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.3
 - another attempt at GLSL build fix
 



From airlied at fedoraproject.org  Mon Dec 21 00:13:57 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 00:13:57 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec,1.260,1.261
Message-ID: <20091221001357.E20E711C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28361

Modified Files:
	mesa.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.5
- one more libOSMesa build fix



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- mesa.spec	20 Dec 2009 23:53:09 -0000	1.260
+++ mesa.spec	21 Dec 2009 00:13:57 -0000	1.261
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -230,8 +230,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
 %configure %{common_flags} \
     --disable-glw \
     --disable-glut \
-    --disable-gallium \
     --disable-gl-osmesa \
+    --enable-gallium-nouveau \
     --with-driver=dri \
     --with-dri-driverdir=%{_libdir}/dri \
     %{?dri_drivers}
@@ -286,7 +286,7 @@ install -m 0644 progs/images/*.rgb $RPM_
 install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{demodir}
 
 # and osmesa
-mv osmesa*/* $RPM_BUILD_ROOT%{_libdir}
+mv osmesa*/libOS* $RPM_BUILD_ROOT%{_libdir}
 
 pushd ../%{xdriinfo}
 make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
@@ -325,11 +325,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/dri
 %{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
-%exclude %{_libdir}/dri/r600_dri.so
 
 %files dri-drivers-experimental
 %defattr(-,root,root,-)
-%{_libdir}/dri/r600_dri.so
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -385,6 +383,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.5
+- one more libOSMesa build fix
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.4
 - fix OSmesa builds hopefully
 



From hubbitus at fedoraproject.org  Mon Dec 21 00:14:59 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:14:59 +0000 (UTC)
Subject: File ferm-2.0.6.tar.gz uploaded to lookaside cache by hubbitus
Message-ID: <20091221001459.BD5EA10F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ferm:

d0d32a140e0e1e403cfc7b4cd40346e8  ferm-2.0.6.tar.gz



From airlied at fedoraproject.org  Mon Dec 21 00:17:47 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 00:17:47 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec,1.261,1.262
Message-ID: <20091221001747.CB75111C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29321

Modified Files:
	mesa.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.5
- one more libOSMesa build fix




Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- mesa.spec	21 Dec 2009 00:13:57 -0000	1.261
+++ mesa.spec	21 Dec 2009 00:17:47 -0000	1.262
@@ -230,8 +230,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
 %configure %{common_flags} \
     --disable-glw \
     --disable-glut \
+    --disable-gallium \
     --disable-gl-osmesa \
-    --enable-gallium-nouveau \
     --with-driver=dri \
     --with-dri-driverdir=%{_libdir}/dri \
     %{?dri_drivers}
@@ -325,9 +325,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/dri
 %{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
+%exclude %{_libdir}/dri/r600_dri.so
 
 %files dri-drivers-experimental
 %defattr(-,root,root,-)
+%{_libdir}/dri/r600_dri.so
 
 %files libGL-devel
 %defattr(-,root,root,-)



From hubbitus at fedoraproject.org  Mon Dec 21 00:17:49 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:17:49 +0000 (UTC)
Subject: rpms/ferm/devel .cvsignore,1.2,1.3 ferm.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091221001749.534C311C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29295

Modified Files:
	.cvsignore ferm.spec sources 
Log Message:
Update to upstream 2.0.6 version.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2008 22:00:00 -0000	1.2
+++ .cvsignore	21 Dec 2009 00:17:49 -0000	1.3
@@ -1 +1 @@
-ferm-2.0.2.tar.gz
+ferm-2.0.6.tar.gz


Index: ferm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/devel/ferm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ferm.spec	24 Jul 2009 22:41:18 -0000	1.3
+++ ferm.spec	21 Dec 2009 00:17:49 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:		For Easy Rule Making
 Name:		ferm
-Version:		2.0.2
-Release:		5%{?dist}
+Version:		2.0.6
+Release:		6%{?dist}
 Group:		Applications/System
 License:		GPLv2+
 Source:		http://ferm.foo-projects.org/download/2.0/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ferm
 
 %changelog
+* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-6
+- Update to upstream 2.0.6 version.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2008 22:00:00 -0000	1.2
+++ sources	21 Dec 2009 00:17:49 -0000	1.3
@@ -1 +1 @@
-01f4f1fdf057931cfc8a38dcf649b8f9  ferm-2.0.2.tar.gz
+d0d32a140e0e1e403cfc7b4cd40346e8  ferm-2.0.6.tar.gz



From hubbitus at fedoraproject.org  Mon Dec 21 00:22:28 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:22:28 +0000 (UTC)
Subject: rpms/ferm/devel ferm.spec,1.4,1.5
Message-ID: <20091221002228.8576A11C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30397

Modified Files:
	ferm.spec 
Log Message:
Update to upstream 2.0.6 version.




Index: ferm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/devel/ferm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ferm.spec	21 Dec 2009 00:17:49 -0000	1.4
+++ ferm.spec	21 Dec 2009 00:22:28 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:		For Easy Rule Making
 Name:		ferm
 Version:		2.0.6
-Release:		6%{?dist}
+Release:		7%{?dist}
 Group:		Applications/System
 License:		GPLv2+
 Source:		http://ferm.foo-projects.org/download/2.0/%{name}-%{version}.tar.gz
@@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ferm
 
 %changelog
-* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-6
+* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-7
 - Update to upstream 2.0.6 version.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5



From hubbitus at fedoraproject.org  Mon Dec 21 00:34:17 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:34:17 +0000 (UTC)
Subject: rpms/ferm/F-10 ferm.spec,1.1,1.2
Message-ID: <20091221003417.8222F11C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv442

Modified Files:
	ferm.spec 
Log Message:
Update to upstream 2.0.6 version.


Index: ferm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-10/ferm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ferm.spec	27 Aug 2008 22:00:00 -0000	1.1
+++ ferm.spec	21 Dec 2009 00:34:17 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:		For Easy Rule Making
 Name:		ferm
-Version:		2.0.2
-Release:		3%{?dist}
+Version:		2.0.6
+Release:		7%{?dist}
 Group:		Applications/System
 License:		GPLv2+
 Source:		http://ferm.foo-projects.org/download/2.0/%{name}-%{version}.tar.gz
@@ -43,6 +43,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ferm
 
 %changelog
+* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-7
+- Update to upstream 2.0.6 version.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Aug 25 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 2.0.2-3
 - License changed to GPLv2+ by answer of uptream developer Max Kellerman.
 



From hubbitus at fedoraproject.org  Mon Dec 21 00:34:56 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:34:56 +0000 (UTC)
Subject: rpms/ferm/F-11 ferm.spec,1.2,1.3
Message-ID: <20091221003456.CACEF11C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv679

Modified Files:
	ferm.spec 
Log Message:
Update to upstream 2.0.6 version.


Index: ferm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-11/ferm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ferm.spec	24 Feb 2009 16:48:20 -0000	1.2
+++ ferm.spec	21 Dec 2009 00:34:56 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:		For Easy Rule Making
 Name:		ferm
-Version:		2.0.2
-Release:		4%{?dist}
+Version:		2.0.6
+Release:		7%{?dist}
 Group:		Applications/System
 License:		GPLv2+
 Source:		http://ferm.foo-projects.org/download/2.0/%{name}-%{version}.tar.gz
@@ -43,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ferm
 
 %changelog
+* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-7
+- Update to upstream 2.0.6 version.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From hubbitus at fedoraproject.org  Mon Dec 21 00:37:41 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:37:41 +0000 (UTC)
Subject: rpms/ferm/F-12 ferm.spec,1.3,1.4
Message-ID: <20091221003741.8D8B411C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1350

Modified Files:
	ferm.spec 
Log Message:
Update to upstream 2.0.6 version.


Index: ferm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-12/ferm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ferm.spec	24 Jul 2009 22:41:18 -0000	1.3
+++ ferm.spec	21 Dec 2009 00:37:41 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:		For Easy Rule Making
 Name:		ferm
-Version:		2.0.2
-Release:		5%{?dist}
+Version:		2.0.6
+Release:		7%{?dist}
 Group:		Applications/System
 License:		GPLv2+
 Source:		http://ferm.foo-projects.org/download/2.0/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ferm
 
 %changelog
+* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-7
+- Update to upstream 2.0.6 version.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hubbitus at fedoraproject.org  Mon Dec 21 00:46:50 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:46:50 +0000 (UTC)
Subject: rpms/ferm/F-10 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091221004651.01F9211C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3280

Modified Files:
	.cvsignore sources 
Log Message:
Update to upstream 2.0.6 version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2008 22:00:00 -0000	1.2
+++ .cvsignore	21 Dec 2009 00:46:50 -0000	1.3
@@ -1 +1 @@
-ferm-2.0.2.tar.gz
+ferm-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2008 22:00:00 -0000	1.2
+++ sources	21 Dec 2009 00:46:50 -0000	1.3
@@ -1 +1 @@
-01f4f1fdf057931cfc8a38dcf649b8f9  ferm-2.0.2.tar.gz
+d0d32a140e0e1e403cfc7b4cd40346e8  ferm-2.0.6.tar.gz



From hubbitus at fedoraproject.org  Mon Dec 21 00:52:25 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:52:25 +0000 (UTC)
Subject: rpms/ferm/F-10 ferm.spec,1.2,1.3
Message-ID: <20091221005225.ACC9B11C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4422

Modified Files:
	ferm.spec 
Log Message:
Update to upstream 2.0.6 version.




Index: ferm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-10/ferm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ferm.spec	21 Dec 2009 00:34:17 -0000	1.2
+++ ferm.spec	21 Dec 2009 00:52:25 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:		For Easy Rule Making
 Name:		ferm
 Version:		2.0.6
-Release:		7%{?dist}
+Release:		8%{?dist}
 Group:		Applications/System
 License:		GPLv2+
 Source:		http://ferm.foo-projects.org/download/2.0/%{name}-%{version}.tar.gz
@@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ferm
 
 %changelog
-* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-7
+* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-8
 - Update to upstream 2.0.6 version.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5



From hubbitus at fedoraproject.org  Mon Dec 21 00:54:38 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:54:38 +0000 (UTC)
Subject: rpms/ferm/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091221005438.8662211C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5055

Modified Files:
	.cvsignore sources 
Log Message:
Update to upstream 2.0.6 version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2008 22:00:00 -0000	1.2
+++ .cvsignore	21 Dec 2009 00:54:38 -0000	1.3
@@ -1 +1 @@
-ferm-2.0.2.tar.gz
+ferm-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2008 22:00:00 -0000	1.2
+++ sources	21 Dec 2009 00:54:38 -0000	1.3
@@ -1 +1 @@
-01f4f1fdf057931cfc8a38dcf649b8f9  ferm-2.0.2.tar.gz
+d0d32a140e0e1e403cfc7b4cd40346e8  ferm-2.0.6.tar.gz



From hubbitus at fedoraproject.org  Mon Dec 21 00:58:45 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 00:58:45 +0000 (UTC)
Subject: rpms/ferm/F-11 ferm.spec,1.3,1.4
Message-ID: <20091221005845.A8EEB11C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6211

Modified Files:
	ferm.spec 
Log Message:
Update to upstream 2.0.6 version.


Index: ferm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-11/ferm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ferm.spec	21 Dec 2009 00:34:56 -0000	1.3
+++ ferm.spec	21 Dec 2009 00:58:45 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:		For Easy Rule Making
 Name:		ferm
 Version:		2.0.6
-Release:		7%{?dist}
+Release:		8%{?dist}
 Group:		Applications/System
 License:		GPLv2+
 Source:		http://ferm.foo-projects.org/download/2.0/%{name}-%{version}.tar.gz
@@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ferm
 
 %changelog
-* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-7
+* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-8
 - Update to upstream 2.0.6 version.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5



From petersen at fedoraproject.org  Mon Dec 21 01:06:55 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 21 Dec 2009 01:06:55 +0000 (UTC)
Subject: rpms/wqy-zenhei-fonts/devel wqy-zenhei-fontconfig.conf, NONE,
	1.1 wqy-zenhei-fonts.spec, 1.12, 1.13
Message-ID: <20091221010655.15F0611C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/wqy-zenhei-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8015

Modified Files:
	wqy-zenhei-fonts.spec 
Added Files:
	wqy-zenhei-fontconfig.conf 
Log Message:
add a fedora fontconfig file for zh (#476459)



--- NEW FILE wqy-zenhei-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
    <match target="font">
        <test name="family">
            <string>WenQuanYi Zen Hei</string>
        </test>
        <edit name="hinting" mode="assign">
            <bool>false</bool>
        </edit>
    </match>
    
    <match>
        <test name="lang">
            <string>zh</string>
        </test>
        <test name="family">
            <string>monospace</string>
        </test>
        <edit name="family" mode="prepend" binding="same">
            <string>WenQuanYi Zen Hei</string>
        </edit>
    </match>

    <alias>
        <family>WenQuanYi Zen Hei</family>
        <default>
            <family>monospace</family>
        </default>
    </alias>

    <match>
        <test name="lang">
            <string>zh</string>
        </test>
        <test name="family">
            <string>sans-serif</string>
        </test>
        <edit name="family" mode="prepend" binding="same">
            <string>WenQuanYi Zen Hei</string>
        </edit>
    </match>

    <alias>
        <family>WenQuanYi Zen Hei</family>
        <default>
            <family>sans-serif</family>
        </default>
    </alias>
</fontconfig>


Index: wqy-zenhei-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/wqy-zenhei-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- wqy-zenhei-fonts.spec	27 Jul 2009 07:28:09 -0000	1.12
+++ wqy-zenhei-fonts.spec	21 Dec 2009 01:06:54 -0000	1.13
@@ -1,26 +1,27 @@
 %define fontname wqy-zenhei
 %define fontconf  44-%{fontname}.conf
+%global fontconf1 65-%{fontname}.conf
 %define fontconf2 66-%{fontname}-sharp.conf
 %define fontconf3 66-%{fontname}-sharp-no13px.conf
 %define setscript zenheiset
 
 Name:           %{fontname}-fonts
 Version:        0.8.38
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        WenQuanYi Zen Hei CJK Font
 
 Group:          User Interface/X
 License:        GPLv2 with exceptions
 URL:            http://wenq.org/enindex.cgi
 Source0:        http://downloads.sourceforge.net/wqy/%{fontname}-%{version}-1.tar.gz
-#Source1:        66-%{name}-sharp.conf
+Source1:        %{fontname}-fontconfig.conf
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Patch0: %{name}-0.8.34-1-noprefer.patch
-Patch1: zenheiset-0.8.38-1-fontpackages.patch
+Patch0:         wqy-zenhei-fonts-0.8.34-1-noprefer.patch
+Patch1:         zenheiset-0.8.38-1-fontpackages.patch
 
 %description
 WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese 
@@ -62,6 +63,8 @@ install -m 0755 -d %{buildroot}%{_fontco
 
 install -m 0644 -p %{fontconf} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}
 install -m 0644 -p %{fontconf2} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
 install -m 0644 -p %{fontconf3} \
@@ -70,6 +73,9 @@ install -m 0644 -p %{fontconf3} \
 ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
+ln -s %{_fontconfig_templatedir}/%{fontconf1} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf1}
+
 install -m 0755 -d %{buildroot}%{_bindir}
 
 install -m 0744 -p %{setscript} \
@@ -87,6 +93,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Jens Petersen <petersen at redhat.com> - 0.8.38-4
+- add a fedora fontconfig file for zh (#476459)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.38-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hubbitus at fedoraproject.org  Mon Dec 21 01:07:53 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 01:07:53 +0000 (UTC)
Subject: rpms/ferm/F-12 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091221010753.C1E9911C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8364

Modified Files:
	.cvsignore sources 
Log Message:
Update to upstream 2.0.6 version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2008 22:00:00 -0000	1.2
+++ .cvsignore	21 Dec 2009 01:07:53 -0000	1.3
@@ -1 +1 @@
-ferm-2.0.2.tar.gz
+ferm-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2008 22:00:00 -0000	1.2
+++ sources	21 Dec 2009 01:07:53 -0000	1.3
@@ -1 +1 @@
-01f4f1fdf057931cfc8a38dcf649b8f9  ferm-2.0.2.tar.gz
+d0d32a140e0e1e403cfc7b4cd40346e8  ferm-2.0.6.tar.gz



From hubbitus at fedoraproject.org  Mon Dec 21 01:09:37 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 01:09:37 +0000 (UTC)
Subject: rpms/ferm/F-12 ferm.spec,1.4,1.5
Message-ID: <20091221010937.E30C911C00E6@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ferm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8791

Modified Files:
	ferm.spec 
Log Message:
Update to upstream 2.0.6 version.


Index: ferm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ferm/F-12/ferm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ferm.spec	21 Dec 2009 00:37:41 -0000	1.4
+++ ferm.spec	21 Dec 2009 01:09:37 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:		For Easy Rule Making
 Name:		ferm
 Version:		2.0.6
-Release:		7%{?dist}
+Release:		8%{?dist}
 Group:		Applications/System
 License:		GPLv2+
 Source:		http://ferm.foo-projects.org/download/2.0/%{name}-%{version}.tar.gz
@@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ferm
 
 %changelog
-* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-7
+* Mon Dec 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 2.0.6-8
 - Update to upstream 2.0.6 version.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5



From airlied at fedoraproject.org  Mon Dec 21 01:55:35 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 01:55:35 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xserver-1.7.3-fb-backport.patch, NONE,
	1.1 xorg-x11-server.spec, 1.511, 1.512
Message-ID: <20091221015535.9FD1A11C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17779

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.3-fb-backport.patch 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 1.7.3-4
- Backport FB changes from master.


xserver-1.7.3-fb-backport.patch:
 fb.h        |   76 ++++++++++++++++++++++++++++++-----------------------
 fbpict.c    |   85 ++++++++++++++++++++++++++++++++++++++++++------------------
 fbtrap.c    |    6 ++--
 wfbrename.h |    2 -
 4 files changed, 108 insertions(+), 61 deletions(-)

--- NEW FILE xserver-1.7.3-fb-backport.patch ---
>From 85577ae6bad8fd8673b9abc81e7f2531ae64fcec Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 21 Dec 2009 11:47:19 +1000
Subject: [PATCH] fb: backport fb changes from master for src window operations.

This rolls up the following commits and also keeps the image_from_pict
API compatiblity. It introduces a new image_from_pict_18 API that is
used by the server leaving the old API alone.

I've rolled this up as I don't want to introduce ABI breaks in bisection.

a72c65e9176c51de95db2fdbf4c5d946a4911695 fb: Adjust transform or composite coordinates for pixman operations
bd567061c8b84b268d9bbb01bc4d8981feefb862 Split fbGetDrawable into fbGetDrawablePixmap and fbGetPixmapBitsData
61335052972a78d67c0ba74f902273b34c63a198 Revert "Fix clipping when windows are used as sources"
071b3c1810d9f2602173acc8578caac20e0b771e Revert "Use IncludeInferiors when copying windows before compositing."
8e640d6b131d2865a9725d8997023865b0ef3d69 Revert "Reserve space for two GC values in copy_drawable()."

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 fb/fb.h        |   76 ++++++++++++++++++++++++++++---------------------
 fb/fbpict.c    |   85 +++++++++++++++++++++++++++++++++++++++----------------
 fb/fbtrap.c    |    6 ++-
 fb/wfbrename.h |    1 +
 4 files changed, 108 insertions(+), 60 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h
index 37de71e..8b2839a 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -700,38 +700,41 @@ typedef struct {
 #define __fbPixOffXPix(pPix)	(__fbPixDrawableX(pPix))
 #define __fbPixOffYPix(pPix)	(__fbPixDrawableY(pPix))
 
-#define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
-    PixmapPtr   _pPix; \
-    if ((pDrawable)->type != DRAWABLE_PIXMAP) { \
-	_pPix = fbGetWindowPixmap(pDrawable); \
-	(xoff) = __fbPixOffXWin(_pPix); \
-	(yoff) = __fbPixOffYWin(_pPix); \
-    } else { \
-	_pPix = (PixmapPtr) (pDrawable); \
-	(xoff) = __fbPixOffXPix(_pPix); \
-	(yoff) = __fbPixOffYPix(_pPix); \
-    } \
-    fbPrepareAccess(pDrawable); \
-    (pointer) = (FbBits *) _pPix->devPrivate.ptr; \
-    (stride) = ((int) _pPix->devKind) / sizeof (FbBits); (void)(stride); \
-    (bpp) = _pPix->drawable.bitsPerPixel;  (void)(bpp); \
+#define fbGetDrawablePixmap(pDrawable, pixmap, xoff, yoff) {			\
+    if ((pDrawable)->type != DRAWABLE_PIXMAP) { 				\
+	(pixmap) = fbGetWindowPixmap(pDrawable);				\
+	(xoff) = __fbPixOffXWin(pixmap); 					\
+	(yoff) = __fbPixOffYWin(pixmap); 					\
+    } else { 									\
+	(pixmap) = (PixmapPtr) (pDrawable);					\
+	(xoff) = __fbPixOffXPix(pixmap); 					\
+	(yoff) = __fbPixOffYPix(pixmap); 					\
+    } 										\
+    fbPrepareAccess(pDrawable); 						\
 }
 
-#define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
-    PixmapPtr   _pPix; \
-    if ((pDrawable)->type != DRAWABLE_PIXMAP) { \
-	_pPix = fbGetWindowPixmap(pDrawable); \
-	(xoff) = __fbPixOffXWin(_pPix); \
-	(yoff) = __fbPixOffYWin(_pPix); \
-    } else { \
-	_pPix = (PixmapPtr) (pDrawable); \
-	(xoff) = __fbPixOffXPix(_pPix); \
-	(yoff) = __fbPixOffYPix(_pPix); \
-    } \
-    fbPrepareAccess(pDrawable); \
-    (pointer) = (FbStip *) _pPix->devPrivate.ptr; \
-    (stride) = ((int) _pPix->devKind) / sizeof (FbStip); (void)(stride); \
-    (bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \
+#define fbGetPixmapBitsData(pixmap, pointer, stride, bpp) {			\
+    (pointer) = (FbBits *) (pixmap)->devPrivate.ptr; 			       	\
+    (stride) = ((int) (pixmap)->devKind) / sizeof (FbBits); (void)(stride);	\
+    (bpp) = (pixmap)->drawable.bitsPerPixel;  (void)(bpp); 			\
+}
+
+#define fbGetPixmapStipData(pixmap, pointer, stride, bpp) {			\
+    (pointer) = (FbStip *) (pixmap)->devPrivate.ptr; 			       	\
+    (stride) = ((int) (pixmap)->devKind) / sizeof (FbStip); (void)(stride);	\
+    (bpp) = (pixmap)->drawable.bitsPerPixel;  (void)(bpp); 			\
+}
+
+#define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { 		\
+    PixmapPtr   _pPix; 								\
+    fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff); 				\
+    fbGetPixmapBitsData(_pPix, pointer, stride, bpp);				\
+}
+
+#define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { 	\
+    PixmapPtr   _pPix; 								\
+    fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff);				\
+    fbGetPixmapStipData(_pPix, pointer, stride, bpp);				\
 }
 
 /*
@@ -2079,9 +2082,16 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
 		   FbBits	xor);
 
 extern _X_EXPORT pixman_image_t *
-image_from_pict (PicturePtr pict,
-		 Bool       has_clip,
-		 Bool       is_src);
+image_from_pict (PicturePtr	pict,
+		 Bool		has_clip,
+		 Bool		is_src);
+
+extern _X_EXPORT pixman_image_t *
+image_from_pict_18 (PicturePtr	pict,
+		 Bool		has_clip,
+		 int		*xoff,
+		 int		*yoff);
+
 extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
 
 #endif /* _FB_H_ */
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 8fdaa58..f9f4343 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -158,19 +158,24 @@ fbComposite (CARD8      op,
 	     CARD16     height)
 {
     pixman_image_t *src, *mask, *dest;
+    int src_xoff, src_yoff;
+    int msk_xoff, msk_yoff;
+    int dst_xoff, dst_yoff;
     
-    miCompositeSourceValidate (pSrc, xSrc, ySrc, width, height);
+    miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);
     if (pMask)
-	miCompositeSourceValidate (pMask, xMask, yMask, width, height);
+	miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
     
-    src = image_from_pict (pSrc, TRUE, TRUE);
-    mask = image_from_pict (pMask, TRUE, TRUE);
-    dest = image_from_pict (pDst, TRUE, FALSE);
+    src = image_from_pict_18 (pSrc, FALSE, &src_xoff, &src_yoff);
+    mask = image_from_pict_18 (pMask, FALSE, &msk_xoff, &msk_yoff);
+    dest = image_from_pict_18 (pDst, TRUE, &dst_xoff, &dst_yoff);
 
     if (src && dest && !(pMask && !mask))
     {
 	pixman_image_composite (op, src, mask, dest,
-				xSrc, ySrc, xMask, yMask, xDst, yDst,
+				xSrc + src_xoff, ySrc + src_yoff,
+				xMask + msk_xoff, yMask + msk_yoff,
+				xDst + dst_xoff, yDst + dst_yoff,
 				width, height);
     }
 
@@ -270,22 +275,22 @@ create_conical_gradient_image (PictGradient *gradient)
 
 static pixman_image_t *
 create_bits_picture (PicturePtr pict,
-		     Bool       has_clip)
+		     Bool       has_clip,
+		     int	*xoff,
+		     int	*yoff)
 {
+    PixmapPtr pixmap;
     FbBits *bits;
     FbStride stride;
-    int bpp, xoff, yoff;
+    int bpp;
     pixman_image_t *image;
     
-    fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
-
-    bits = (FbBits*)((CARD8*)bits +
-		     (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) +
-		     (pict->pDrawable->x + xoff) * (bpp / 8));
+    fbGetDrawablePixmap (pict->pDrawable, pixmap, *xoff, *yoff);
+    fbGetPixmapBitsData(pixmap, bits, stride, bpp);
 
     image = pixman_image_create_bits (
 	pict->format,
-	pict->pDrawable->width, pict->pDrawable->height,
+	pixmap->drawable.width, pixmap->drawable.height,
 	(uint32_t *)bits, stride * sizeof (FbStride));
     
     
@@ -311,30 +316,52 @@ create_bits_picture (PicturePtr pict,
 	if (pict->clientClipType != CT_NONE)
 	    pixman_image_set_has_client_clip (image, TRUE);
 
-	pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
+	if (*xoff || *yoff)
+	    pixman_region_translate (pict->pCompositeClip, *xoff, *yoff);
 
 	pixman_image_set_clip_region (image, pict->pCompositeClip);
 
-	pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
+	if (*xoff || *yoff)
+	    pixman_region_translate (pict->pCompositeClip, -*xoff, -*yoff);
     }
     
     /* Indexed table */
     if (pict->pFormat->index.devPrivate)
 	pixman_image_set_indexed (image, pict->pFormat->index.devPrivate);
 
+    /* Add in drawable origin to position within the image */
+    *xoff += pict->pDrawable->x;
+    *yoff += pict->pDrawable->y;
+
     return image;
 }
 
 static void
-set_image_properties (pixman_image_t *image, PicturePtr pict)
+set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
 {
     pixman_repeat_t repeat;
     pixman_filter_t filter;
     
     if (pict->transform)
     {
-	pixman_image_set_transform (
-	    image, (pixman_transform_t *)pict->transform);
+	/* For source images, adjust the transform to account
+	 * for the drawable offset within the pixman image,
+	 * then set the offset to 0 as it will be used
+	 * to compute positions within the transformed image.
+	 */
+	if (!has_clip) {
+	    struct pixman_transform	adjusted;
+
+	    adjusted = *pict->transform;
+	    pixman_transform_translate(&adjusted,
+				       NULL,
+				       pixman_int_to_fixed(*xoff),
+				       pixman_int_to_fixed(*yoff));
+	    pixman_image_set_transform (image, &adjusted);
+	    *xoff = 0;
+	    *yoff = 0;
+	} else
+	    pixman_image_set_transform (image, pict->transform);
     }
     
     switch (pict->repeatType)
@@ -361,7 +388,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
     
     if (pict->alphaMap)
     {
-	pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE, TRUE);
+	int alpha_xoff, alpha_yoff;
+	pixman_image_t *alpha_map = image_from_pict_18 (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff);
 	
 	pixman_image_set_alpha_map (
 	    image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
@@ -393,10 +421,9 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
     pixman_image_set_source_clipping (image, TRUE);
 }
 
+
 pixman_image_t *
-image_from_pict (PicturePtr pict,
-		 Bool has_clip,
-		 Bool is_src)
+image_from_pict_18 (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
 {
     pixman_image_t *image = NULL;
 
@@ -405,7 +432,7 @@ image_from_pict (PicturePtr pict,
 
     if (pict->pDrawable)
     {
-	image = create_bits_picture (pict, has_clip);
+	image = create_bits_picture (pict, has_clip, xoff, yoff);
     }
     else if (pict->pSourcePict)
     {
@@ -429,11 +456,18 @@ image_from_pict (PicturePtr pict,
     }
     
     if (image)
-	set_image_properties (image, pict);
+	set_image_properties (image, pict, has_clip, xoff, yoff);
     
     return image;
 }
 
+pixman_image_t *
+image_from_pict (PicturePtr pict, Bool has_clip, Bool is_src)
+{
+    int xoff = 0, yoff = 0;
+    return image_from_pict_18(pict, has_clip, &xoff, &yoff);
+}
+
 void
 free_pixman_pict (PicturePtr pict, pixman_image_t *image)
 {
@@ -463,3 +497,4 @@ fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
 
     return TRUE;
 }
+
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index b1e1eff..5b5aeae 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -40,7 +40,8 @@ fbAddTraps (PicturePtr	pPicture,
 	    int		ntrap,
 	    xTrap	*traps)
 {
-    pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE);
+    int image_xoff, image_yoff;
+    pixman_image_t *image = image_from_pict_18 (pPicture, FALSE, &image_xoff, &image_yoff);
 
     if (!image)
 	return;
@@ -56,7 +57,8 @@ fbRasterizeTrapezoid (PicturePtr    pPicture,
 		      int	    x_off,
 		      int	    y_off)
 {
-    pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE);
+    int	mask_xoff, mask_yoff;
+    pixman_image_t *image = image_from_pict_18 (pPicture, FALSE, &mask_xoff, &mask_yoff);
 
     if (!image)
 	return;
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 73ee510..e9cdca8 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -187,4 +187,5 @@
 #define fbZeroSegment wfbZeroSegment
 #define free_pixman_pict wfb_free_pixman_pict
 #define image_from_pict wfb_image_from_pict
+#define image_from_pict_18 wfb_image_from_pict_18
 #define composeFunctions wfbComposeFunctions
-- 
1.6.5.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -p -r1.511 -r1.512
--- xorg-x11-server.spec	17 Dec 2009 00:02:15 -0000	1.511
+++ xorg-x11-server.spec	21 Dec 2009 01:55:35 -0000	1.512
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.3
-Release:   3%{dist}
+Release:   4%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -82,6 +82,7 @@ Patch6052: xserver-1.7.1-libcrypto.patch
 Patch6066: xserver-1.7.1-glx14-swrast.patch
 
 Patch6067: xserver-1.7.3-exa-master.patch
+Patch6068: xserver-1.7.3-fb-backport.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -509,6 +510,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 1.7.3-4
+- Backport FB changes from master.
+
 * Wed Dec 17 2009 Dave Airlie <airlied at redhat.com> 1.7.3-3
 - backport EXA fixes from master, should fix xfig crashes X server
 



From pkgdb at fedoraproject.org  Mon Dec 21 02:05:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 02:05:44 +0000
Subject: [pkgdb] cciss_vol_status was added for roysjosh
Message-ID: <20091221020537.6D1AB10F7E6@bastion.fedoraproject.org>

toshio has added Package cciss_vol_status with summary show status of logical drives attached to HP Smartarray controllers
toshio has approved Package cciss_vol_status
toshio has added a Fedora devel branch for cciss_vol_status with an owner of roysjosh
toshio has approved cciss_vol_status in Fedora devel
toshio has approved Package cciss_vol_status
toshio has set commit to Approved for 107427 on cciss_vol_status (Fedora devel)
toshio has set checkout to Approved for 107427 on cciss_vol_status (Fedora devel)
toshio has set build to Approved for 107427 on cciss_vol_status (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cciss_vol_status



From pkgdb at fedoraproject.org  Mon Dec 21 02:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 02:05:52 +0000
Subject: [pkgdb] cciss_vol_status summary updated by toshio
Message-ID: <20091221020545.4C00F10F841@bastion.fedoraproject.org>

toshio set package cciss_vol_status summary to show status of logical drives attached to HP Smartarray controllers

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cciss_vol_status



From pkgdb at fedoraproject.org  Mon Dec 21 02:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 02:05:52 +0000
Subject: [pkgdb] cciss_vol_status (Fedora EPEL, 5) updated by toshio
Message-ID: <20091221020546.5EDCF10F7E6@bastion.fedoraproject.org>

toshio added a Fedora EPEL 5 branch for cciss_vol_status
toshio has set commit to Approved for 107427 on cciss_vol_status (Fedora EPEL 5)
toshio has set checkout to Approved for 107427 on cciss_vol_status (Fedora EPEL 5)
toshio has set build to Approved for 107427 on cciss_vol_status (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cciss_vol_status



From pkgdb at fedoraproject.org  Mon Dec 21 02:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 02:05:52 +0000
Subject: [pkgdb] cciss_vol_status (Fedora, 12) updated by toshio
Message-ID: <20091221020547.6C0EC10F7E6@bastion.fedoraproject.org>

toshio added a Fedora 12 branch for cciss_vol_status
toshio has set commit to Approved for 107427 on cciss_vol_status (Fedora 12)
toshio has set checkout to Approved for 107427 on cciss_vol_status (Fedora 12)
toshio has set build to Approved for 107427 on cciss_vol_status (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cciss_vol_status



From toshio at fedoraproject.org  Mon Dec 21 02:08:23 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 02:08:23 +0000 (UTC)
Subject: rpms/cciss_vol_status/devel - New directory
Message-ID: <20091221020823.3949211C00E7@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/cciss_vol_status/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsZ20462/rpms/cciss_vol_status/devel

Log Message:
Directory /cvs/pkgs/rpms/cciss_vol_status/devel added to the repository




From toshio at fedoraproject.org  Mon Dec 21 02:08:23 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 02:08:23 +0000 (UTC)
Subject: rpms/cciss_vol_status - New directory
Message-ID: <20091221020823.26B8311C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/cciss_vol_status
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsZ20462/rpms/cciss_vol_status

Log Message:
Directory /cvs/pkgs/rpms/cciss_vol_status added to the repository




From toshio at fedoraproject.org  Mon Dec 21 02:08:30 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 02:08:30 +0000 (UTC)
Subject: rpms/cciss_vol_status Makefile,NONE,1.1
Message-ID: <20091221020830.8B56A11C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/cciss_vol_status
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsZ20462/rpms/cciss_vol_status

Added Files:
	Makefile 
Log Message:
Setup of module cciss_vol_status


--- NEW FILE Makefile ---
# Top level Makefile for module cciss_vol_status
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From toshio at fedoraproject.org  Mon Dec 21 02:08:30 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 02:08:30 +0000 (UTC)
Subject: rpms/cciss_vol_status/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221020830.D1C5F11C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/cciss_vol_status/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsZ20462/rpms/cciss_vol_status/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cciss_vol_status


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cciss_vol_status
# $Id: Makefile,v 1.1 2009/12/21 02:08:30 toshio Exp $
NAME := cciss_vol_status
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From airlied at fedoraproject.org  Mon Dec 21 02:48:56 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 02:48:56 +0000 (UTC)
Subject: rpms/mesa/devel mesa-7.1-link-shared.patch, 1.5, 1.6 mesa.spec, 1.262,
	1.263
Message-ID: <20091221024856.4F89911C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27861

Modified Files:
	mesa-7.1-link-shared.patch mesa.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.6
- mesa fix link shared to actually link


mesa-7.1-link-shared.patch:
 drivers/dri/Makefile          |   12 ++++++++++--
 drivers/dri/Makefile.template |    5 +++--
 x86/read_rgba_span_x86.S      |    4 ----
 3 files changed, 13 insertions(+), 8 deletions(-)

Index: mesa-7.1-link-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1-link-shared.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mesa-7.1-link-shared.patch	20 Dec 2009 22:50:28 -0000	1.5
+++ mesa-7.1-link-shared.patch	21 Dec 2009 02:48:56 -0000	1.6
@@ -54,12 +54,13 @@ diff -up mesa-20091221/src/mesa/drivers/
  
  COMMON_GALLIUM_SOURCES = \
          ../common/utils.c \
-@@ -70,7 +70,7 @@ lib: symlinks subdirs depend
+@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
  $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
  		$(TOP)/src/mesa/drivers/dri/Makefile.template
  	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 -		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
 +		$(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
++		-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore
  		$(DRI_LIB_DEPS)
  
  


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- mesa.spec	21 Dec 2009 00:17:47 -0000	1.262
+++ mesa.spec	21 Dec 2009 02:48:56 -0000	1.263
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -385,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.6
+- mesa fix link shared to actually link
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.5
 - one more libOSMesa build fix
 



From airlied at fedoraproject.org  Mon Dec 21 02:54:05 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 02:54:05 +0000 (UTC)
Subject: rpms/mesa/devel mesa-7.1-link-shared.patch,1.6,1.7
Message-ID: <20091221025405.A7D2611C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28861

Modified Files:
	mesa-7.1-link-shared.patch 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.6
- mesa fix link shared to actually link


mesa-7.1-link-shared.patch:
 drivers/dri/Makefile          |   12 ++++++++++--
 drivers/dri/Makefile.template |    5 +++--
 x86/read_rgba_span_x86.S      |    4 ----
 3 files changed, 13 insertions(+), 8 deletions(-)

Index: mesa-7.1-link-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1-link-shared.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mesa-7.1-link-shared.patch	21 Dec 2009 02:48:56 -0000	1.6
+++ mesa-7.1-link-shared.patch	21 Dec 2009 02:54:05 -0000	1.7
@@ -60,7 +60,7 @@ diff -up mesa-20091221/src/mesa/drivers/
  	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 -		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
 +		$(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
-+		-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore
++		-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
  		$(DRI_LIB_DEPS)
  
  



From airlied at fedoraproject.org  Mon Dec 21 03:04:44 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 03:04:44 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec,1.263,1.264
Message-ID: <20091221030444.4073811C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31153

Modified Files:
	mesa.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.7
- enable vmwgfx dri drivers in experimental + xorg DDX + move r600 out



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- mesa.spec	21 Dec 2009 02:48:56 -0000	1.263
+++ mesa.spec	21 Dec 2009 03:04:43 -0000	1.264
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -168,6 +168,12 @@ Group: Development/Libraries
 %description demos
 This package provides some demo applications for testing Mesa.
 
+%package -n xorg-x11-drv-vmwgfx
+Summary: VMware GFX DDX driver
+Group: User Interface/X Hardware Support
+
+%description -n xorg-x11-drv-vmwgfx
+2D driver for VMware SVGA vGPU
 
 %prep
 #setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -b5
@@ -230,7 +236,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
 %configure %{common_flags} \
     --disable-glw \
     --disable-glut \
-    --disable-gallium \
     --disable-gl-osmesa \
     --with-driver=dri \
     --with-dri-driverdir=%{_libdir}/dri \
@@ -261,7 +266,7 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI
 # just the DRI drivers that are sane
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
 install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
-for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome; do
+for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome gallium/vmwgfx; do
     so=%{_lib}/${f}_dri.so
     test -e $so && echo $so
 done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
@@ -272,7 +277,7 @@ rm [a-fh-np-wyz]*.h gg*.h glf*.h glew.h 
 popd
 
 pushd $RPM_BUILD_ROOT%{_libdir}
-rm -f libEGL*
+rm -f libEGL* dri/EGL*
 popd
 
 # XXX demos, since they don't install automatically.  should fix that.
@@ -325,11 +330,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/dri
 %{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
-%exclude %{_libdir}/dri/r600_dri.so
+%exclude %{_libdir}/dri/vmwgfx_dri.so
 
 %files dri-drivers-experimental
 %defattr(-,root,root,-)
-%{_libdir}/dri/r600_dri.so
+%{_libdir}/dri/vmwgfx_dri.so
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -384,7 +389,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{demodir}
 
+%files -n xorg-x11-drv-vmwgfx
+%defattr(-,root,root,-)
+%{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
+
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.7
+- enable vmwgfx dri drivers in experimental + xorg DDX + move r600 out
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.6
 - mesa fix link shared to actually link
 



From pkgdb at fedoraproject.org  Mon Dec 21 03:11:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 03:11:24 +0000
Subject: [pkgdb] qutim was added for hubbitus
Message-ID: <20091221031116.4C60010F83D@bastion.fedoraproject.org>

kevin has added Package qutim with summary Multiprotocol (ICQ, Jabber, IRC etc) instant messenger with modern Qt4 interface
kevin has approved Package qutim
kevin has added a Fedora devel branch for qutim with an owner of hubbitus
kevin has approved qutim in Fedora devel
kevin has approved Package qutim
kevin has set commit to Approved for 107427 on qutim (Fedora devel)
kevin has set checkout to Approved for 107427 on qutim (Fedora devel)
kevin has set build to Approved for 107427 on qutim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qutim



From pkgdb at fedoraproject.org  Mon Dec 21 03:11:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 03:11:32 +0000
Subject: [pkgdb] qutim summary updated by kevin
Message-ID: <20091221031124.5C14A10F83D@bastion.fedoraproject.org>

kevin set package qutim summary to Multiprotocol (ICQ, Jabber, IRC etc) instant messenger with modern Qt4 interface

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qutim



From pkgdb at fedoraproject.org  Mon Dec 21 03:11:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 03:11:32 +0000
Subject: [pkgdb] qutim (Fedora, 11) updated by kevin
Message-ID: <20091221031125.67F1C10F83D@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for qutim
kevin has set commit to Approved for 107427 on qutim (Fedora 11)
kevin has set checkout to Approved for 107427 on qutim (Fedora 11)
kevin has set build to Approved for 107427 on qutim (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qutim



From pkgdb at fedoraproject.org  Mon Dec 21 03:11:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 03:11:32 +0000
Subject: [pkgdb] qutim (Fedora, 12) updated by kevin
Message-ID: <20091221031126.7269610F841@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for qutim
kevin has set commit to Approved for 107427 on qutim (Fedora 12)
kevin has set checkout to Approved for 107427 on qutim (Fedora 12)
kevin has set build to Approved for 107427 on qutim (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qutim



From kevin at fedoraproject.org  Mon Dec 21 03:14:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 03:14:17 +0000 (UTC)
Subject: rpms/qutim - New directory
Message-ID: <20091221031417.153D211C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qutim
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdWp483/rpms/qutim

Log Message:
Directory /cvs/pkgs/rpms/qutim added to the repository




From kevin at fedoraproject.org  Mon Dec 21 03:14:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 03:14:17 +0000 (UTC)
Subject: rpms/qutim/devel - New directory
Message-ID: <20091221031417.2C65611C02C8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qutim/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdWp483/rpms/qutim/devel

Log Message:
Directory /cvs/pkgs/rpms/qutim/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 03:14:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 03:14:24 +0000 (UTC)
Subject: rpms/qutim Makefile,NONE,1.1
Message-ID: <20091221031424.7111611C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qutim
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdWp483/rpms/qutim

Added Files:
	Makefile 
Log Message:
Setup of module qutim


--- NEW FILE Makefile ---
# Top level Makefile for module qutim
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 03:14:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 03:14:24 +0000 (UTC)
Subject: rpms/qutim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091221031424.9617111C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qutim/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdWp483/rpms/qutim/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qutim


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qutim
# $Id: Makefile,v 1.1 2009/12/21 03:14:24 kevin Exp $
NAME := qutim
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From bskeggs at fedoraproject.org  Mon Dec 21 04:26:27 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 21 Dec 2009 04:26:27 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.72, 1.73 kernel.spec, 1.1958,
	1.1959
Message-ID: <20091221042627.2108211C02C4@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2630

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Mon Dec 21 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.9-173
- nouveau: fix dim panel issues on certain laptops (rh#547554)
- nouveau: fix some issues when running without ctxprogs
- nouveau: fix error handling in init paths
- nouveau: add vga arbitration hooks
- nouveau: fix nv04 sw methods



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   56 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  536 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  468 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   30 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 6050 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  289 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  661 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  478 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  468 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  812 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   54 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  155 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  157 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1270 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  382 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   47 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  976 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1080 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  455 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  257 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  702 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  583 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  196 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  321 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  919 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1002 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  528 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  316 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  271 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  208 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  260 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  892 
 drivers/gpu/drm/nouveau/nv17_gpio.c         |   92 
 drivers/gpu/drm/nouveau/nv17_tv.c           |  681 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  780 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  314 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2915 +++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  769 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  156 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  304 
 drivers/gpu/drm/nouveau/nv50_display.c      | 1012 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  273 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  494 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  470 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |26832 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  509 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  269 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  220 
 85 files changed, 64781 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- drm-nouveau.patch	17 Dec 2009 03:03:24 -0000	1.72
+++ drm-nouveau.patch	21 Dec 2009 04:26:25 -0000	1.73
@@ -84,10 +84,10 @@ index 0000000..6d2abaf
 +obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
 new file mode 100644
-index 0000000..9422a74
+index 0000000..81681a0
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_drv.c
-@@ -0,0 +1,531 @@
+@@ -0,0 +1,536 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -498,6 +498,11 @@ index 0000000..9422a74
 +
 +	ch7006_info(client, "Detected version ID: %x\n", val);
 +
++	/* I don't know what this is for, but otherwise I get no
++	 * signal.
++	 */
++	ch7006_write(client, 0x3d, 0x0);
++
 +	return 0;
 +
 +fail:
@@ -621,10 +626,10 @@ index 0000000..9422a74
 +module_exit(ch7006_exit);
 diff --git a/drivers/gpu/drm/i2c/ch7006_mode.c b/drivers/gpu/drm/i2c/ch7006_mode.c
 new file mode 100644
-index 0000000..87f5445
+index 0000000..e447dfb
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_mode.c
-@@ -0,0 +1,473 @@
+@@ -0,0 +1,468 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -1054,11 +1059,6 @@ index 0000000..87f5445
 +	ch7006_load_reg(client, state, CH7006_SUBC_INC7);
 +	ch7006_load_reg(client, state, CH7006_PLL_CONTROL);
 +	ch7006_load_reg(client, state, CH7006_CALC_SUBC_INC0);
-+
-+	/* I don't know what this is for, but otherwise I get no
-+	 * signal.
-+	 */
-+	ch7006_write(client, 0x3d, 0x0);
 +}
 +
 +void ch7006_state_save(struct i2c_client *client,
@@ -8129,10 +8129,10 @@ index 0000000..1d5f10b
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
 new file mode 100644
-index 0000000..8d1383a
+index 0000000..f067fc3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -0,0 +1,663 @@
+@@ -0,0 +1,661 @@
 +/*
 + * Copyright 2007 Dave Airlied
 + * All Rights Reserved.
@@ -8572,11 +8572,8 @@ index 0000000..8d1383a
 +	int ret;
 +
 +	chan = nvbo->channel;
-+	if (!chan || nvbo->tile_flags || nvbo->no_vm) {
++	if (!chan || nvbo->tile_flags || nvbo->no_vm)
 +		chan = dev_priv->channel;
-+		if (!chan)
-+			return -EINVAL;
-+	}
 +
 +	src_offset = old_mem->mm_node->start << PAGE_SHIFT;
 +	dst_offset = new_mem->mm_node->start << PAGE_SHIFT;
@@ -8733,7 +8730,8 @@ index 0000000..8d1383a
 +			return ret;
 +	}
 +
-+	if (dev_priv->init_state != NOUVEAU_CARD_INIT_DONE)
++	if (dev_priv->init_state != NOUVEAU_CARD_INIT_DONE ||
++	    !dev_priv->channel)
 +		return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
 +
 +	if (old_mem->mem_type == TTM_PL_SYSTEM && !bo->ttm) {
@@ -11392,7 +11390,7 @@ index 0000000..04e85d8
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
 new file mode 100644
-index 0000000..d8de3f6
+index 0000000..e0e8e84
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
 @@ -0,0 +1,413 @@
@@ -11675,7 +11673,7 @@ index 0000000..d8de3f6
 +
 +		for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
 +			chan = dev_priv->fifos[i];
-+			if (!chan)
++			if (!chan || !chan->pushbuf_bo)
 +				continue;
 +
 +			for (j = 0; j < NOUVEAU_DMA_SKIPS; j++)
@@ -13212,10 +13210,10 @@ index 0000000..4a3f31a
 +#endif /* __NOUVEAU_FB_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 new file mode 100644
-index 0000000..36e8c5e
+index 0000000..d860bdc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
-@@ -0,0 +1,380 @@
+@@ -0,0 +1,382 @@
 +/*
 + * Copyright ? 2007 David Airlie
 + *
@@ -13276,7 +13274,7 @@ index 0000000..36e8c5e
 +	struct nouveau_channel *chan = dev_priv->channel;
 +	int ret, i;
 +
-+	if (!chan->accel_done ||
++	if (!chan || !chan->accel_done ||
 +	    info->state != FBINFO_STATE_RUNNING ||
 +	    info->flags & FBINFO_HWACCEL_DISABLED)
 +		return 0;
@@ -13536,14 +13534,16 @@ index 0000000..36e8c5e
 +	par->nouveau_fb = nouveau_fb;
 +	par->dev = dev;
 +
-+	switch (dev_priv->card_type) {
-+	case NV_50:
-+		nv50_fbcon_accel_init(info);
-+		break;
-+	default:
-+		nv04_fbcon_accel_init(info);
-+		break;
-+	};
++	if (dev_priv->channel) {
++		switch (dev_priv->card_type) {
++		case NV_50:
++			nv50_fbcon_accel_init(info);
++			break;
++		default:
++			nv04_fbcon_accel_init(info);
++			break;
++		};
++	}
 +
 +	nouveau_fbcon_zfill(dev);
 +
@@ -20760,10 +20760,10 @@ index 0000000..4c7f1e4
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..0de87b8
+index 0000000..27c4d48
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,865 @@
+@@ -0,0 +1,919 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -20790,11 +20790,12 @@ index 0000000..0de87b8
 + */
 +
 +#include <linux/swab.h>
-+
 +#include "drmP.h"
 +#include "drm.h"
 +#include "drm_sarea.h"
 +#include "drm_crtc_helper.h"
++#include <linux/vgaarb.h>
++
 +#include "nouveau_drv.h"
 +#include "nouveau_drm.h"
 +#include "nv50_display.h"
@@ -21098,12 +21099,67 @@ index 0000000..0de87b8
 +	return 0;
 +}
 +
++static unsigned int
++nouveau_vga_set_decode(void *priv, bool state)
++{
++	if (state)
++		return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
++		       VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
++	else
++		return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
++}
++
++static int
++nouveau_card_init_channel(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nouveau_gpuobj *gpuobj;
++	int ret;
++
++	ret = nouveau_channel_alloc(dev, &dev_priv->channel,
++				    (struct drm_file *)-2,
++				    NvDmaFB, NvDmaTT);
++	if (ret)
++		return ret;
++
++	gpuobj = NULL;
++	ret = nouveau_gpuobj_dma_new(dev_priv->channel, NV_CLASS_DMA_IN_MEMORY,
++				     0, nouveau_mem_fb_amount(dev),
++				     NV_DMA_ACCESS_RW, NV_DMA_TARGET_VIDMEM,
++				     &gpuobj);
++	if (ret)
++		goto out_err;
++
++	ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, NvDmaVRAM,
++				     gpuobj, NULL);
++	if (ret)
++		goto out_err;
++
++	gpuobj = NULL;
++	ret = nouveau_gpuobj_gart_dma_new(dev_priv->channel, 0,
++					  dev_priv->gart_info.aper_size,
++					  NV_DMA_ACCESS_RW, &gpuobj, NULL);
++	if (ret)
++		goto out_err;
++
++	ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, NvDmaGART,
++				     gpuobj, NULL);
++	if (ret)
++		goto out_err;
++
++	return 0;
++out_err:
++	nouveau_gpuobj_del(dev, &gpuobj);
++	nouveau_channel_free(dev_priv->channel);
++	dev_priv->channel = NULL;
++	return ret;
++}
++
 +int
 +nouveau_card_init(struct drm_device *dev)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine;
-+	struct nouveau_gpuobj *gpuobj;
 +	int ret;
 +
 +	NV_DEBUG(dev, "prev state = %d\n", dev_priv->init_state);
@@ -21111,10 +21167,12 @@ index 0000000..0de87b8
 +	if (dev_priv->init_state == NOUVEAU_CARD_INIT_DONE)
 +		return 0;
 +
++	vga_client_register(dev->pdev, dev, NULL, nouveau_vga_set_decode);
++
 +	/* Initialise internal driver API hooks */
 +	ret = nouveau_init_engine_ptrs(dev);
 +	if (ret)
-+		return ret;
++		goto out;
 +	engine = &dev_priv->engine;
 +	dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED;
 +
@@ -21122,12 +21180,12 @@ index 0000000..0de87b8
 +	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +		ret = nouveau_bios_init(dev);
 +		if (ret)
-+			return ret;
++			goto out;
 +	}
 +
 +	ret = nouveau_gpuobj_early_init(dev);
 +	if (ret)
-+		return ret;
++		goto out_bios;
 +
 +	/* Initialise instance memory, must happen before mem_init so we
 +	 * know exactly how much VRAM we're able to use for "normal"
@@ -21135,100 +21193,68 @@ index 0000000..0de87b8
 +	 */
 +	ret = engine->instmem.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_gpuobj_early;
 +
 +	/* Setup the memory manager */
 +	ret = nouveau_mem_init(dev);
 +	if (ret)
-+		return ret;
++		goto out_instmem;
 +
 +	ret = nouveau_gpuobj_init(dev);
 +	if (ret)
-+		return ret;
++		goto out_mem;
 +
 +	/* PMC */
 +	ret = engine->mc.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_gpuobj;
 +
 +	/* PTIMER */
 +	ret = engine->timer.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_mc;
 +
 +	/* PFB */
 +	ret = engine->fb.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_timer;
 +
 +	/* PGRAPH */
 +	ret = engine->graph.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_fb;
 +
 +	/* PFIFO */
 +	ret = engine->fifo.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_graph;
 +
 +	/* this call irq_preinstall, register irq handler and
 +	 * call irq_postinstall
 +	 */
 +	ret = drm_irq_install(dev);
 +	if (ret)
-+		return ret;
++		goto out_fifo;
 +
 +	ret = drm_vblank_init(dev, 0);
 +	if (ret)
-+		return ret;
++		goto out_irq;
 +
 +	/* what about PVIDEO/PCRTC/PRAMDAC etc? */
 +
-+	ret = nouveau_channel_alloc(dev, &dev_priv->channel,
-+				    (struct drm_file *)-2,
-+				    NvDmaFB, NvDmaTT);
-+	if (ret)
-+		return ret;
-+
-+	gpuobj = NULL;
-+	ret = nouveau_gpuobj_dma_new(dev_priv->channel, NV_CLASS_DMA_IN_MEMORY,
-+				     0, nouveau_mem_fb_amount(dev),
-+				     NV_DMA_ACCESS_RW, NV_DMA_TARGET_VIDMEM,
-+				     &gpuobj);
-+	if (ret)
-+		return ret;
-+
-+	ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, NvDmaVRAM,
-+				     gpuobj, NULL);
-+	if (ret) {
-+		nouveau_gpuobj_del(dev, &gpuobj);
-+		return ret;
-+	}
-+
-+	gpuobj = NULL;
-+	ret = nouveau_gpuobj_gart_dma_new(dev_priv->channel, 0,
-+					  dev_priv->gart_info.aper_size,
-+					  NV_DMA_ACCESS_RW, &gpuobj, NULL);
-+	if (ret)
-+		return ret;
-+
-+	ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, NvDmaGART,
-+				     gpuobj, NULL);
-+	if (ret) {
-+		nouveau_gpuobj_del(dev, &gpuobj);
-+		return ret;
++	if (!engine->graph.accel_blocked) {
++		ret = nouveau_card_init_channel(dev);
++		if (ret)
++			goto out_irq;
 +	}
 +
 +	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-+		if (dev_priv->card_type >= NV_50) {
++		if (dev_priv->card_type >= NV_50)
 +			ret = nv50_display_create(dev);
-+			if (ret)
-+				return ret;
-+		} else {
++		else
 +			ret = nv04_display_create(dev);
-+			if (ret)
-+				return ret;
-+		}
++		if (ret)
++			goto out_irq;
 +	}
 +
 +	ret = nouveau_backlight_init(dev);
@@ -21241,6 +21267,32 @@ index 0000000..0de87b8
 +		drm_helper_initial_config(dev);
 +
 +	return 0;
++
++out_irq:
++	drm_irq_uninstall(dev);
++out_fifo:
++	engine->fifo.takedown(dev);
++out_graph:
++	engine->graph.takedown(dev);
++out_fb:
++	engine->fb.takedown(dev);
++out_timer:
++	engine->timer.takedown(dev);
++out_mc:
++	engine->mc.takedown(dev);
++out_gpuobj:
++	nouveau_gpuobj_takedown(dev);
++out_mem:
++	nouveau_mem_close(dev);
++out_instmem:
++	engine->instmem.takedown(dev);
++out_gpuobj_early:
++	nouveau_gpuobj_late_takedown(dev);
++out_bios:
++	nouveau_bios_takedown(dev);
++out:
++	vga_client_register(dev->pdev, NULL, NULL, NULL);
++	return ret;
 +}
 +
 +static void nouveau_card_takedown(struct drm_device *dev)
@@ -21279,6 +21331,8 @@ index 0000000..0de87b8
 +		nouveau_gpuobj_late_takedown(dev);
 +		nouveau_bios_takedown(dev);
 +
++		vga_client_register(dev->pdev, NULL, NULL, NULL);
++
 +		dev_priv->init_state = NOUVEAU_CARD_INIT_DOWN;
 +	}
 +}
@@ -24938,7 +24992,7 @@ index 0000000..0c3cd53
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
 new file mode 100644
-index 0000000..396ee92
+index 0000000..d561d77
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_graph.c
 @@ -0,0 +1,579 @@
@@ -25487,7 +25541,7 @@ index 0000000..396ee92
 +
 +	nv_wi32(dev, instance, tmp);
 +	nv_wr32(dev, NV04_PGRAPH_CTX_SWITCH1, tmp);
-+	nv_wr32(dev, NV04_PGRAPH_CTX_CACHE1 + subc, tmp);
++	nv_wr32(dev, NV04_PGRAPH_CTX_CACHE1 + (subc<<2), tmp);
 +	return 0;
 +}
 +
@@ -34247,10 +34301,10 @@ index 0000000..fb5838e
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
 new file mode 100644
-index 0000000..dd4bff2
+index 0000000..281e65c
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_display.c
-@@ -0,0 +1,998 @@
+@@ -0,0 +1,1012 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -34872,11 +34926,8 @@ index 0000000..dd4bff2
 +	 */
 +	NV_DEBUG(dev, "0x610030: 0x%08x\n", unk30);
 +	head = ffs((unk30 >> 9) & 3) - 1;
-+	if (head < 0) {
-+		NV_ERROR(dev, "no active heads: 0x%08x\n",
-+						nv_rd32(dev, 0x610030));
++	if (head < 0)
 +		return -EINVAL;
-+	}
 +
 +	/* This assumes CRTCs are never bound to multiple encoders, which
 +	 * should be the case.
@@ -34946,9 +34997,21 @@ index 0000000..dd4bff2
 +			   int pxclk)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nouveau_connector *nv_connector = NULL;
++	struct drm_encoder *encoder;
 +	struct nvbios *bios = &dev_priv->VBIOS;
 +	uint32_t mc, script = 0, or;
 +
++	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
++		struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
++
++		if (nv_encoder->dcb != dcbent)
++			continue;
++
++		nv_connector = nouveau_encoder_connector_get(nv_encoder);
++		break;
++	}
++
 +	or = ffs(dcbent->or) - 1;
 +	mc = nv50_display_mode_ctrl(dev, dcbent->type != OUTPUT_ANALOG, or);
 +	switch (dcbent->type) {
@@ -34967,6 +35030,11 @@ index 0000000..dd4bff2
 +			} else
 +			if (bios->fp.strapless_is_24bit & 1)
 +				script |= 0x0200;
++
++			if (nv_connector && nv_connector->edid &&
++			    (nv_connector->edid->revision >= 4) &&
++			    (nv_connector->edid->input & 0x70) >= 0x20)
++				script |= 0x0200;
 +		}
 +
 +		if (nouveau_uscript_lvds >= 0) {
@@ -35701,7 +35769,7 @@ index 0000000..6bcc6d3
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..77ae1aa
+index 0000000..b728228
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
 @@ -0,0 +1,494 @@
@@ -36123,7 +36191,7 @@ index 0000000..77ae1aa
 +	NV_DEBUG(dev, "\n");
 +
 +	chid = pfifo->channel_id(dev);
-+	if (chid < 0 || chid >= dev_priv->engine.fifo.channels)
++	if (chid < 1 || chid >= dev_priv->engine.fifo.channels - 1)
 +		return 0;
 +
 +	chan = dev_priv->fifos[chid];


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1958
retrieving revision 1.1959
diff -u -p -r1.1958 -r1.1959
--- kernel.spec	19 Dec 2009 03:06:00 -0000	1.1958
+++ kernel.spec	21 Dec 2009 04:26:26 -0000	1.1959
@@ -2139,6 +2139,13 @@ fi
 # and build.
 
 %changelog
+* Mon Dec 21 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.9-173
+- nouveau: fix dim panel issues on certain laptops (rh#547554)
+- nouveau: fix some issues when running without ctxprogs
+- nouveau: fix error handling in init paths
+- nouveau: add vga arbitration hooks
+- nouveau: fix nv04 sw methods
+
 * Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.9-172
 - stable update 2.6.31.9
 



From airlied at fedoraproject.org  Mon Dec 21 04:48:05 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 04:48:05 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1959,1.1960
Message-ID: <20091221044805.3BEB911C0269@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5988

Modified Files:
	kernel.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 2.6.31.9-174
- revert rv410 fix broke some things



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1959
retrieving revision 1.1960
diff -u -p -r1.1959 -r1.1960
--- kernel.spec	21 Dec 2009 04:26:26 -0000	1.1959
+++ kernel.spec	21 Dec 2009 04:48:04 -0000	1.1960
@@ -722,7 +722,7 @@ Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
 Patch1839: drm-radeon-misc-fixes.patch
-Patch1840: drm-radeon-rv410-test-fix.patch
+#Patch1840: drm-radeon-rv410-test-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1419,7 +1419,7 @@ ApplyPatch kms-offb-handoff.patch
 ApplyPatch drm-next-b390f944.patch
 ApplyPatch drm-edid-9340d8cf.patch
 ApplyPatch drm-radeon-misc-fixes.patch
-ApplyPatch drm-radeon-rv410-test-fix.patch
+#ApplyPatch drm-radeon-rv410-test-fix.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2139,6 +2139,9 @@ fi
 # and build.
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 2.6.31.9-174
+- revert rv410 fix broke some things
+
 * Mon Dec 21 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.9-173
 - nouveau: fix dim panel issues on certain laptops (rh#547554)
 - nouveau: fix some issues when running without ctxprogs



From tagoh at fedoraproject.org  Mon Dec 21 05:04:01 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 21 Dec 2009 05:04:01 +0000 (UTC)
Subject: rpms/anthy/devel anthy-fix-typo-in-dict.patch, 1.2, 1.3 anthy.spec,
	1.62, 1.63
Message-ID: <20091221050401.B322F11C00E7@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8639

Modified Files:
	anthy-fix-typo-in-dict.patch anthy.spec 
Log Message:
* Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-10
- Fix more typos in dictionary. (#548078)
- correct the source URL.

anthy-fix-typo-in-dict.patch:
 compound.t |   35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

Index: anthy-fix-typo-in-dict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy-fix-typo-in-dict.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- anthy-fix-typo-in-dict.patch	28 Aug 2009 08:22:55 -0000	1.2
+++ anthy-fix-typo-in-dict.patch	21 Dec 2009 05:04:01 -0000	1.3
@@ -1,6 +1,6 @@
 diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.t
 --- anthy-9100h.orig/mkworddic/compound.t	2009-02-07 21:15:36.000000000 +0900
-+++ anthy-9100h/mkworddic/compound.t	2009-08-28 17:19:20.000000000 +0900
++++ anthy-9100h/mkworddic/compound.t	2009-12-21 13:59:13.000000000 +0900
 @@ -8,7 +8,6 @@
  ???????????????? #T35 #_4????_4????
  ?????????????????? #T35 #_5????_4????
@@ -17,6 +17,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ?????????????? #T35 #_3????_4????
  ?????????????? #T35 #_3????_4????
  ?????????????????? #T35 #_3????_6??????
+@@ -1987,7 +1987,7 @@
+ ???????????????????? #T35 #_4????_3????_3????
+ ?????????????? #T35 #_4????_3??
+ ???????????????? #T35 #_4????_4????
+-?????????????? #35 #_4????_3????
++?????????????? #T30 #_4????_3????
+ ?????????????????? #T35 #_4????_3????_2??
+ ?????????????????????? #T35 #_4????_3????_2??_2??
+ ?????????????? #T35 #_4????_3????
 @@ -9714,7 +9714,6 @@
  ?????????????? #T35 #_4????_3????
  ?????????????? #T35 #_4????_3??
@@ -25,6 +34,24 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_4????_3????
  ???????????????? #T35 #_4????_4????
+@@ -10235,7 +10234,7 @@
+ ???????????? #T35 #_3????_3????
+ ?????????? #T35 #_4????_1??
+ ???????? #T35 #_2??_2????
+-?????????????????? #T#5 #_3????_6????
++?????????????????? #T30 #_3????_6????
+ ???????????????????? #T35 #_4????_4????_2??
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2??
+@@ -14320,7 +14319,7 @@
+ ???????????????? #KK #_4????_4????
+ ???????????????????? #T35 #_4????_4????_2??
+ ?????????????? #T35 #_4????_3??
+-???????????????????????????????? T35 #_4????_5????_5??????_2??
++???????????????????????????????? #T35 #_4????_5????_5??????_2??
+ ???????????? #T35 #_4????_2??
+ ?????????????????? #KK #_4????_5??????????
+ ?????????????????????? #T35 #_4????_5????_2??
 @@ -19234,7 +19233,7 @@
  ???????????? #T35 #_4????_2??
  ???????????????? #T35 #_2??_2??_4????
@@ -34,6 +61,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_2??_4????
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_2??_3????_2??
+@@ -19964,7 +19963,7 @@
+ ???????????????????? #T35 #_5????_5????
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2????
+-?????????? #T5 #_2??_3????
++?????????? #T35 #_2??_3????
+ ???????????????? #T35 #_4????_4????
+ ?????????????? #T35 #_4????_3????
+ ???????????????? #T35 #_4????_4????
 @@ -20163,7 +20162,7 @@
  ???????????????? #T35 #_4????_4????
  ???????????????????? #T35 #_4????_2??_4????
@@ -43,6 +79,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????? #T35 #_4????_1??
  ???????????????? #T35 #_4????_4????
+@@ -21650,7 +21649,7 @@
+ ?????????? #T35 #_4????_1??
+ ???????????????????? #T35 #_4????_3????_3????
+ ???????????????? #T35 #_4????_4????
+-?????????????? T35 #_4????_3????
++?????????????? #T30 #_4????_3????
+ ?????????????? #T35 #_4????_3????
+ ?????????????? #T35 #_4????_3????
+ ???????????????? #T35 #_4????_4????
 @@ -30752,7 +30751,6 @@
  ?????????????????????????? #T35 #_6????_4????_3????
  ???????????????? #T35 #_7??????_1??
@@ -68,6 +113,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ?????????????? #T35 #_4????_3??
  ?????????????????? #T35 #_4????_5????
  ???????????????? #T35 #_4????_4????
+@@ -40670,7 +40669,7 @@
+ ?????????????? #T35 #_5????_2??
+ ?????????????? #T35 #_5????_2??
+ ???????????? #T35 #_5????_1??
+-???????????????? T35 #_5????_3????
++???????????????? #T35 #_5????_3????
+ ?????????????? #T35 #_5????_2??
+ ?????????????????? #T35 #_5????_4????
+ ?????????????? #T35 #_5????_2??
 @@ -41942,7 +41941,7 @@
  ?????????????? #T35 #_5????_2??
  ???????????????? #T35 #_5????_3??
@@ -77,6 +131,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????????? #T35 #_4????_6??????
  ???????????? #T35 #_4????_2??
  ?????????????????? #T35 #_6??????_3??
+@@ -46498,7 +46497,7 @@
+ ?????????????? #KK #_5????_2??
+ ???????????????? #T35 #_5????_3????
+ ?????????????????? #T35 #_5????_4????
+-???????????????????????????????? T35 #_4????_5????_5??????_2??
++???????????????????????????????? #T35 #_4????_5????_5??????_2??
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2????
+ ?????????????? #T35 #_4????_3????
 @@ -57562,11 +57561,11 @@
  ?????????? #T35 #_3????_2????
  ?????????? #T35 #_3????_2??


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- anthy.spec	3 Sep 2009 19:46:05 -0000	1.62
+++ anthy.spec	21 Dec 2009 05:04:01 -0000	1.63
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	9%{?dist}
+Release:	10%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -33,7 +33,7 @@ BuildRequires:	emacs emacs-el
 BuildRequires:	xemacs
 %endif
 
-Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
+Source0:	http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Patch0:		anthy-fix-typo-in-dict.patch
 Patch1:		anthy-corpus.patch
@@ -245,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-10
+- Fix more typos in dictionary. (#548078)
+- correct the source URL.
+
 * Thu Sep  3 2009 Dennis Gregorovic <dgregor at redhat.com> - 9100h-9
 - Do not build against xemacs on RHEL
 



From tagoh at fedoraproject.org  Mon Dec 21 05:09:55 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 21 Dec 2009 05:09:55 +0000 (UTC)
Subject: rpms/anthy/F-12 anthy-fix-typo-in-dict.patch, 1.2, 1.3 anthy.spec,
	1.62, 1.63
Message-ID: <20091221050955.4F10F11C00E7@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9472

Modified Files:
	anthy-fix-typo-in-dict.patch anthy.spec 
Log Message:
* Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-10
- Fix more typos in dictionary. (#548078)
- correct the source URL.

anthy-fix-typo-in-dict.patch:
 compound.t |   35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

Index: anthy-fix-typo-in-dict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-12/anthy-fix-typo-in-dict.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- anthy-fix-typo-in-dict.patch	28 Aug 2009 08:22:55 -0000	1.2
+++ anthy-fix-typo-in-dict.patch	21 Dec 2009 05:09:55 -0000	1.3
@@ -1,6 +1,6 @@
 diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.t
 --- anthy-9100h.orig/mkworddic/compound.t	2009-02-07 21:15:36.000000000 +0900
-+++ anthy-9100h/mkworddic/compound.t	2009-08-28 17:19:20.000000000 +0900
++++ anthy-9100h/mkworddic/compound.t	2009-12-21 13:59:13.000000000 +0900
 @@ -8,7 +8,6 @@
  ???????????????? #T35 #_4????_4????
  ?????????????????? #T35 #_5????_4????
@@ -17,6 +17,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ?????????????? #T35 #_3????_4????
  ?????????????? #T35 #_3????_4????
  ?????????????????? #T35 #_3????_6??????
+@@ -1987,7 +1987,7 @@
+ ???????????????????? #T35 #_4????_3????_3????
+ ?????????????? #T35 #_4????_3??
+ ???????????????? #T35 #_4????_4????
+-?????????????? #35 #_4????_3????
++?????????????? #T30 #_4????_3????
+ ?????????????????? #T35 #_4????_3????_2??
+ ?????????????????????? #T35 #_4????_3????_2??_2??
+ ?????????????? #T35 #_4????_3????
 @@ -9714,7 +9714,6 @@
  ?????????????? #T35 #_4????_3????
  ?????????????? #T35 #_4????_3??
@@ -25,6 +34,24 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_4????_3????
  ???????????????? #T35 #_4????_4????
+@@ -10235,7 +10234,7 @@
+ ???????????? #T35 #_3????_3????
+ ?????????? #T35 #_4????_1??
+ ???????? #T35 #_2??_2????
+-?????????????????? #T#5 #_3????_6????
++?????????????????? #T30 #_3????_6????
+ ???????????????????? #T35 #_4????_4????_2??
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2??
+@@ -14320,7 +14319,7 @@
+ ???????????????? #KK #_4????_4????
+ ???????????????????? #T35 #_4????_4????_2??
+ ?????????????? #T35 #_4????_3??
+-???????????????????????????????? T35 #_4????_5????_5??????_2??
++???????????????????????????????? #T35 #_4????_5????_5??????_2??
+ ???????????? #T35 #_4????_2??
+ ?????????????????? #KK #_4????_5??????????
+ ?????????????????????? #T35 #_4????_5????_2??
 @@ -19234,7 +19233,7 @@
  ???????????? #T35 #_4????_2??
  ???????????????? #T35 #_2??_2??_4????
@@ -34,6 +61,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_2??_4????
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_2??_3????_2??
+@@ -19964,7 +19963,7 @@
+ ???????????????????? #T35 #_5????_5????
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2????
+-?????????? #T5 #_2??_3????
++?????????? #T35 #_2??_3????
+ ???????????????? #T35 #_4????_4????
+ ?????????????? #T35 #_4????_3????
+ ???????????????? #T35 #_4????_4????
 @@ -20163,7 +20162,7 @@
  ???????????????? #T35 #_4????_4????
  ???????????????????? #T35 #_4????_2??_4????
@@ -43,6 +79,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????? #T35 #_4????_1??
  ???????????????? #T35 #_4????_4????
+@@ -21650,7 +21649,7 @@
+ ?????????? #T35 #_4????_1??
+ ???????????????????? #T35 #_4????_3????_3????
+ ???????????????? #T35 #_4????_4????
+-?????????????? T35 #_4????_3????
++?????????????? #T30 #_4????_3????
+ ?????????????? #T35 #_4????_3????
+ ?????????????? #T35 #_4????_3????
+ ???????????????? #T35 #_4????_4????
 @@ -30752,7 +30751,6 @@
  ?????????????????????????? #T35 #_6????_4????_3????
  ???????????????? #T35 #_7??????_1??
@@ -68,6 +113,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ?????????????? #T35 #_4????_3??
  ?????????????????? #T35 #_4????_5????
  ???????????????? #T35 #_4????_4????
+@@ -40670,7 +40669,7 @@
+ ?????????????? #T35 #_5????_2??
+ ?????????????? #T35 #_5????_2??
+ ???????????? #T35 #_5????_1??
+-???????????????? T35 #_5????_3????
++???????????????? #T35 #_5????_3????
+ ?????????????? #T35 #_5????_2??
+ ?????????????????? #T35 #_5????_4????
+ ?????????????? #T35 #_5????_2??
 @@ -41942,7 +41941,7 @@
  ?????????????? #T35 #_5????_2??
  ???????????????? #T35 #_5????_3??
@@ -77,6 +131,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????????? #T35 #_4????_6??????
  ???????????? #T35 #_4????_2??
  ?????????????????? #T35 #_6??????_3??
+@@ -46498,7 +46497,7 @@
+ ?????????????? #KK #_5????_2??
+ ???????????????? #T35 #_5????_3????
+ ?????????????????? #T35 #_5????_4????
+-???????????????????????????????? T35 #_4????_5????_5??????_2??
++???????????????????????????????? #T35 #_4????_5????_5??????_2??
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2????
+ ?????????????? #T35 #_4????_3????
 @@ -57562,11 +57561,11 @@
  ?????????? #T35 #_3????_2????
  ?????????? #T35 #_3????_2??


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-12/anthy.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- anthy.spec	3 Sep 2009 19:46:05 -0000	1.62
+++ anthy.spec	21 Dec 2009 05:09:55 -0000	1.63
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	9%{?dist}
+Release:	10%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -33,7 +33,7 @@ BuildRequires:	emacs emacs-el
 BuildRequires:	xemacs
 %endif
 
-Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
+Source0:	http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Patch0:		anthy-fix-typo-in-dict.patch
 Patch1:		anthy-corpus.patch
@@ -245,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-10
+- Fix more typos in dictionary. (#548078)
+- correct the source URL.
+
 * Thu Sep  3 2009 Dennis Gregorovic <dgregor at redhat.com> - 9100h-9
 - Do not build against xemacs on RHEL
 



From airlied at fedoraproject.org  Mon Dec 21 05:21:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 05:21:52 +0000 (UTC)
Subject: File libdrm-2.4.17.tar.bz2 uploaded to lookaside cache by airlied
Message-ID: <20091221052152.32A9010F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libdrm:

667d81f993f7fd8a1b1b1b830a28a748  libdrm-2.4.17.tar.bz2



From airlied at fedoraproject.org  Mon Dec 21 05:23:07 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 05:23:07 +0000 (UTC)
Subject: rpms/libdrm/devel .cvsignore, 1.29, 1.30 libdrm.spec, 1.90,
	1.91 sources, 1.29, 1.30 libdrm-page-flip.patch, 1.2, NONE
Message-ID: <20091221052307.6C35D11C00E7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11341

Modified Files:
	.cvsignore libdrm.spec sources 
Removed Files:
	libdrm-page-flip.patch 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 2.4.17-1
- upstream released 2.4.17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	20 Dec 2009 22:37:55 -0000	1.29
+++ .cvsignore	21 Dec 2009 05:23:07 -0000	1.30
@@ -1 +1 @@
-libdrm-20091221.tar.bz2
+libdrm-2.4.17.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- libdrm.spec	20 Dec 2009 22:37:55 -0000	1.90
+++ libdrm.spec	21 Dec 2009 05:23:07 -0000	1.91
@@ -3,12 +3,12 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.17
-Release: 0.1%{?dist}
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
-#Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
-Source0: %{name}-%{gitdate}.tar.bz2
+Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
+#Source0: %{name}-%{gitdate}.tar.bz2
 Source1: make-git-snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,8 +42,8 @@ Requires: pkgconfig
 Direct Rendering Manager development package
 
 %prep
-%setup -q -n %{name}-%{gitdate}
-#%setup -q 
+#%setup -q -n %{name}-%{gitdate}
+%setup -q 
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 2.4.17-1
+- upstream released 2.4.17
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 2.4.17-0.1
 - new radeon API from upstream rebase
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	20 Dec 2009 22:37:55 -0000	1.29
+++ sources	21 Dec 2009 05:23:07 -0000	1.30
@@ -1 +1 @@
-4aa85099bb189436a3325733720cc3ab  libdrm-20091221.tar.bz2
+667d81f993f7fd8a1b1b1b830a28a748  libdrm-2.4.17.tar.bz2


--- libdrm-page-flip.patch DELETED ---



From eliwap at fedoraproject.org  Mon Dec 21 05:35:08 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Mon, 21 Dec 2009 05:35:08 +0000 (UTC)
Subject: File 91009-iHateTheCashew-4.4.tbz uploaded to lookaside cache by
	eliwap
Message-ID: <20091221053508.4749B10F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kde-plasma-ihatethecashew:

521952f888a4fe8a72969a586743c4b6  91009-iHateTheCashew-4.4.tbz



From eliwap at fedoraproject.org  Mon Dec 21 05:44:36 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Mon, 21 Dec 2009 05:44:36 +0000 (UTC)
Subject: rpms/kde-plasma-ihatethecashew/devel .cvsignore, 1.2, 1.3 import.log, 
	1.3, 1.4 kde-plasma-ihatethecashew.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091221054436.299C411C00E7@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-ihatethecashew/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13244/devel

Modified Files:
	.cvsignore import.log kde-plasma-ihatethecashew.spec sources 
Log Message:

----------------------------------------------------------------------
Modified Files:
	devel/.cvsignore devel/import.log 
	 devel/kde-plasma-ihatethecashew.spec devel/sources 
----------------------------------------------------------------------
version upgrade
added support KDE 4.4




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Feb 2009 06:54:07 -0000	1.2
+++ .cvsignore	21 Dec 2009 05:44:35 -0000	1.3
@@ -1 +1 @@
-91009-iHateTheCashew-4.2.tbz
+91009-iHateTheCashew-4.4.tbz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	17 Feb 2009 06:45:14 -0000	1.3
+++ import.log	21 Dec 2009 05:44:35 -0000	1.4
@@ -1,3 +1,4 @@
 kde-plasma-ihatethecashew-0_2c-2_fc10:HEAD:kde-plasma-ihatethecashew-0.2c-2.fc10.src.rpm:1233903008
 kde-plasma-ihatethecashew-0_3-1_fc10:HEAD:kde-plasma-ihatethecashew-0.3-1.fc10.src.rpm:1234852856
 kde-plasma-ihatethecashew-0_3-1_fc10:HEAD:kde-plasma-ihatethecashew-0.3-1.fc10.src.rpm:1234852978
+kde-plasma-ihatethecashew-0_4-1_fc12:HEAD:kde-plasma-ihatethecashew-0.4-1.fc12.src.rpm:1261373777


Index: kde-plasma-ihatethecashew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/devel/kde-plasma-ihatethecashew.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde-plasma-ihatethecashew.spec	25 Jul 2009 04:22:55 -0000	1.4
+++ kde-plasma-ihatethecashew.spec	21 Dec 2009 05:44:35 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           kde-plasma-ihatethecashew
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Removes the KDE Plasma Cashew From the Corner of the Display
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/I+HATE+the+Cashew?content=91009
-Source0:        http://www.kde-look.org/content/content-files/91009-iHateTheCashew-4.2.tbz
+Source0:        http://www.kde-look.org/CONTENT/content-files/91009-iHateTheCashew-4.4.tbz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
@@ -43,12 +43,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-ihatethecashew.desktop
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
+* Mon Dec 21 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.4-1
+- Version Upgrade
+- support KDE 4.4
 
 * Tue Feb 17 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.3-1
 - Update to version 0.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Feb 2009 06:42:04 -0000	1.3
+++ sources	21 Dec 2009 05:44:35 -0000	1.4
@@ -1 +1 @@
-f7e6f11956f16db8e3ee250d47dac0ee  91009-iHateTheCashew-4.2.tbz
+521952f888a4fe8a72969a586743c4b6  91009-iHateTheCashew-4.4.tbz



From eliwap at fedoraproject.org  Mon Dec 21 05:46:51 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Mon, 21 Dec 2009 05:46:51 +0000 (UTC)
Subject: rpms/kde-plasma-ihatethecashew/F-11 .cvsignore, 1.2, 1.3 import.log, 
	1.3, 1.4 kde-plasma-ihatethecashew.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091221054651.E321611C00E7@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14834/F-11

Modified Files:
	.cvsignore import.log kde-plasma-ihatethecashew.spec sources 
Log Message:

----------------------------------------------------------------------
Modified Files:
	F-11/.cvsignore F-11/import.log 
 	F-11/kde-plasma-ihatethecashew.spec F-11/sources 
 ---------------------------------------------------------------------
Version upgrade
Added support KDE 4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Feb 2009 06:54:07 -0000	1.2
+++ .cvsignore	21 Dec 2009 05:46:51 -0000	1.3
@@ -1 +1 @@
-91009-iHateTheCashew-4.2.tbz
+91009-iHateTheCashew-4.4.tbz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	17 Feb 2009 06:45:14 -0000	1.3
+++ import.log	21 Dec 2009 05:46:51 -0000	1.4
@@ -1,3 +1,4 @@
 kde-plasma-ihatethecashew-0_2c-2_fc10:HEAD:kde-plasma-ihatethecashew-0.2c-2.fc10.src.rpm:1233903008
 kde-plasma-ihatethecashew-0_3-1_fc10:HEAD:kde-plasma-ihatethecashew-0.3-1.fc10.src.rpm:1234852856
 kde-plasma-ihatethecashew-0_3-1_fc10:HEAD:kde-plasma-ihatethecashew-0.3-1.fc10.src.rpm:1234852978
+kde-plasma-ihatethecashew-0_4-1_fc12:F-11:kde-plasma-ihatethecashew-0.4-1.fc12.src.rpm:1261374401


Index: kde-plasma-ihatethecashew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-11/kde-plasma-ihatethecashew.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde-plasma-ihatethecashew.spec	25 Feb 2009 10:29:37 -0000	1.3
+++ kde-plasma-ihatethecashew.spec	21 Dec 2009 05:46:51 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           kde-plasma-ihatethecashew
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Removes the KDE Plasma Cashew From the Corner of the Display
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/I+HATE+the+Cashew?content=91009
-Source0:        http://www.kde-look.org/content/content-files/91009-iHateTheCashew-4.2.tbz
+Source0:        http://www.kde-look.org/CONTENT/content-files/91009-iHateTheCashew-4.4.tbz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
@@ -43,9 +43,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-ihatethecashew.desktop
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
+* Mon Dec 21 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.4-1
+- Version Upgrade
+- support KDE 4.4
 
 * Tue Feb 17 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.3-1
 - Update to version 0.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Feb 2009 06:42:04 -0000	1.3
+++ sources	21 Dec 2009 05:46:51 -0000	1.4
@@ -1 +1 @@
-f7e6f11956f16db8e3ee250d47dac0ee  91009-iHateTheCashew-4.2.tbz
+521952f888a4fe8a72969a586743c4b6  91009-iHateTheCashew-4.4.tbz



From eliwap at fedoraproject.org  Mon Dec 21 05:48:38 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Mon, 21 Dec 2009 05:48:38 +0000 (UTC)
Subject: rpms/kde-plasma-ihatethecashew/F-12 .cvsignore, 1.2, 1.3 import.log, 
	1.3, 1.4 kde-plasma-ihatethecashew.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091221054838.31A4111C00E7@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15205/F-12

Modified Files:
	.cvsignore import.log kde-plasma-ihatethecashew.spec sources 
Log Message:

----------------------------------------------------------------------
Modified Files:
 	F-12/.cvsignore F-12/import.log 
 	F-12/kde-plasma-ihatethecashew.spec F-12/sources 
 ---------------------------------------------------------------------
Version upgrade
Added support KDE 4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Feb 2009 06:54:07 -0000	1.2
+++ .cvsignore	21 Dec 2009 05:48:37 -0000	1.3
@@ -1 +1 @@
-91009-iHateTheCashew-4.2.tbz
+91009-iHateTheCashew-4.4.tbz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	17 Feb 2009 06:45:14 -0000	1.3
+++ import.log	21 Dec 2009 05:48:37 -0000	1.4
@@ -1,3 +1,4 @@
 kde-plasma-ihatethecashew-0_2c-2_fc10:HEAD:kde-plasma-ihatethecashew-0.2c-2.fc10.src.rpm:1233903008
 kde-plasma-ihatethecashew-0_3-1_fc10:HEAD:kde-plasma-ihatethecashew-0.3-1.fc10.src.rpm:1234852856
 kde-plasma-ihatethecashew-0_3-1_fc10:HEAD:kde-plasma-ihatethecashew-0.3-1.fc10.src.rpm:1234852978
+kde-plasma-ihatethecashew-0_4-1_fc12:F-12:kde-plasma-ihatethecashew-0.4-1.fc12.src.rpm:1261374516


Index: kde-plasma-ihatethecashew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-12/kde-plasma-ihatethecashew.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde-plasma-ihatethecashew.spec	25 Jul 2009 04:22:55 -0000	1.4
+++ kde-plasma-ihatethecashew.spec	21 Dec 2009 05:48:37 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           kde-plasma-ihatethecashew
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Removes the KDE Plasma Cashew From the Corner of the Display
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/I+HATE+the+Cashew?content=91009
-Source0:        http://www.kde-look.org/content/content-files/91009-iHateTheCashew-4.2.tbz
+Source0:        http://www.kde-look.org/CONTENT/content-files/91009-iHateTheCashew-4.4.tbz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
@@ -43,12 +43,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-ihatethecashew.desktop
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
+* Mon Dec 21 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.4-1
+- Version Upgrade
+- support KDE 4.4
 
 * Tue Feb 17 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.3-1
 - Update to version 0.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-ihatethecashew/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Feb 2009 06:42:04 -0000	1.3
+++ sources	21 Dec 2009 05:48:38 -0000	1.4
@@ -1 +1 @@
-f7e6f11956f16db8e3ee250d47dac0ee  91009-iHateTheCashew-4.2.tbz
+521952f888a4fe8a72969a586743c4b6  91009-iHateTheCashew-4.4.tbz



From bskeggs at fedoraproject.org  Mon Dec 21 06:02:15 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 21 Dec 2009 06:02:15 +0000 (UTC)
Subject: rpms/libdrm/F-12 libdrm-nouveau-immd-alloc.patch, NONE,
	1.1 libdrm.spec, 1.95, 1.96
Message-ID: <20091221060215.4094D11C00E7@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/libdrm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18004

Modified Files:
	libdrm.spec 
Added Files:
	libdrm-nouveau-immd-alloc.patch 
Log Message:
* Mon Dec 21 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.15-8
- nouveau: fix bo allocation issues (rh#530169)



libdrm-nouveau-immd-alloc.patch:
 nouveau_bo.c |   42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

--- NEW FILE libdrm-nouveau-immd-alloc.patch ---
>From f1660c249198b5cc14ebbb75107da7bcb6972033 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Thu, 17 Dec 2009 13:07:18 +1000
Subject: [PATCH] nouveau: remove delayed kernel bo creation

Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
---
 libdrm/nouveau/nouveau_bo.c |   41 +++++++++++++++++------------------------
 1 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
index ae11b68..10cc8a6 100644
--- a/libdrm/nouveau/nouveau_bo.c
+++ b/libdrm/nouveau/nouveau_bo.c
@@ -59,7 +59,7 @@ nouveau_bo_info(struct nouveau_bo_priv *nvbo, struct drm_nouveau_gem_info *arg)
 static int
 nouveau_bo_allocated(struct nouveau_bo_priv *nvbo)
 {
-	if (nvbo->sysmem || nvbo->handle || (nvbo->flags & NOUVEAU_BO_PIN))
+	if (nvbo->sysmem || nvbo->handle)
 		return 1;
 	return 0;
 }
@@ -116,7 +116,7 @@ nouveau_bo_kalloc(struct nouveau_bo_priv *nvbo, struct nouveau_channel *chan)
 	struct drm_nouveau_gem_info *info = &req.info;
 	int ret;
 
-	if (nvbo->handle || (nvbo->flags & NOUVEAU_BO_PIN))
+	if (nvbo->handle)
 		return 0;
 
 	req.channel_hint = chan ? chan->id : 0;
@@ -191,20 +191,24 @@ nouveau_bo_new_tile(struct nouveau_device *dev, uint32_t flags, int align,
 	nvbo->base.tile_flags = tile_flags;
 
 	nvbo->refcount = 1;
-	/* Don't set NOUVEAU_BO_PIN here, or nouveau_bo_allocated() will
-	 * decided the buffer's already allocated when it's not.  The
-	 * call to nouveau_bo_pin() later will set this flag.
-	 */
-	nvbo->flags = (flags & ~NOUVEAU_BO_PIN);
+	nvbo->flags = flags;
 	nvbo->size = size;
 	nvbo->align = align;
 
-	if (flags & NOUVEAU_BO_PIN) {
-		ret = nouveau_bo_pin((void *)nvbo, nvbo->flags);
+	if (flags & (NOUVEAU_BO_VRAM | NOUVEAU_BO_GART)) {
+		ret = nouveau_bo_kalloc(nvbo, NULL);
 		if (ret) {
 			nouveau_bo_ref(NULL, (void *)nvbo);
 			return ret;
 		}
+
+		if (flags & NOUVEAU_BO_PIN) {
+			ret = nouveau_bo_pin((void *)nvbo, nvbo->flags);
+			if (ret) {
+				nouveau_bo_ref(NULL, (void *)nvbo);
+				return ret;
+			}
+		}
 	}
 
 	*bo = &nvbo->base;
@@ -489,25 +493,15 @@ nouveau_bo_pin(struct nouveau_bo *bo, uint32_t flags)
 	if (nvbo->pinned)
 		return 0;
 
-	/* Ensure we have a kernel object... */
-	if (!nvbo->flags) {
-		if (!(flags & (NOUVEAU_BO_VRAM | NOUVEAU_BO_GART)))
-			return -EINVAL;
-		nvbo->flags = flags;
-	}
-
-	if (!nvbo->handle) {
-		ret = nouveau_bo_kalloc(nvbo, NULL);
-		if (ret)
-			return ret;
-	}
+	if (!nvbo->handle)
+		return -EINVAL;
 
 	/* Now force it to stay put :) */
 	req.handle = nvbo->handle;
 	req.domain = 0;
-	if (nvbo->flags & NOUVEAU_BO_VRAM)
+	if (flags & NOUVEAU_BO_VRAM)
 		req.domain |= NOUVEAU_GEM_DOMAIN_VRAM;
-	if (nvbo->flags & NOUVEAU_BO_GART)
+	if (flags & NOUVEAU_BO_GART)
 		req.domain |= NOUVEAU_GEM_DOMAIN_GART;
 
 	ret = drmCommandWriteRead(nvdev->fd, DRM_NOUVEAU_GEM_PIN, &req,
@@ -517,7 +511,6 @@ nouveau_bo_pin(struct nouveau_bo *bo, uint32_t flags)
 	nvbo->offset = req.offset;
 	nvbo->domain = req.domain;
 	nvbo->pinned = 1;
-	nvbo->flags |= NOUVEAU_BO_PIN;
 
 	/* Fill in public nouveau_bo members */
 	if (nvbo->domain & NOUVEAU_GEM_DOMAIN_VRAM)
-- 
1.6.5.2



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-12/libdrm.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- libdrm.spec	9 Dec 2009 04:39:21 -0000	1.95
+++ libdrm.spec	21 Dec 2009 06:02:14 -0000	1.96
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.15
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -44,6 +44,9 @@ Patch10: libdrm-radeon-add-referenced-by
 Patch11: libdrm-add-drm-gdnff.patch
 Patch12: libdrm-radeon-eagain.patch
 
+# nouveau: fix bo allocation issues
+Patch13: libdrm-nouveau-immd-alloc.patch
+
 %description
 Direct Rendering Manager runtime library
 
@@ -70,6 +73,7 @@ Direct Rendering Manager development pac
 %patch10 -p1 -b .radeon-ref-by-cs
 %patch11 -p1 -b .drmapi
 %patch12 -p1 -b .rad-eagain
+%patch13 -p1 -b .nouveau-alloc
 
 %build
 autoreconf -v --install || exit 1
@@ -129,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Mon Dec 21 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.15-8
+- nouveau: fix bo allocation issues (rh#530169)
+
 * Wed Dec 09 2009 Dave Airlie <airlied at redhat.com> 2.4.15-7
 - radeon API from kernel change
 



From airlied at fedoraproject.org  Mon Dec 21 06:05:49 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 06:05:49 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-12 radeon-revert-api.patch, NONE,
	1.1 .cvsignore, 1.37, 1.38 sources, 1.37,
	1.38 xorg-x11-drv-ati.spec, 1.199,
	1.200 radeon-dri2-revert-drm-func.patch, 1.1, NONE
Message-ID: <20091221060549.CFCC911C00E7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18734a

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Added Files:
	radeon-revert-api.patch 
Removed Files:
	radeon-dri2-revert-drm-func.patch 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.19.20091221git4b05c47ac
- rebase to upstream master - revert API changes for F12 for now.


radeon-revert-api.patch:
 r600_exa.c         |    9 ++++++---
 radeon_exa.c       |    3 +--
 radeon_exa_funcs.c |   10 ++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

--- NEW FILE radeon-revert-api.patch ---
>From a4a72f0b8b18ee70c9103088c646ead7b61f745d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 21 Dec 2009 16:00:48 +1000
Subject: [PATCH] revert api

---
 src/r600_exa.c         |    9 ++++++---
 src/radeon_exa.c       |    3 +--
 src/radeon_exa_funcs.c |    9 ++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/r600_exa.c b/src/r600_exa.c
index 6a132bb..634e6ca 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2027,7 +2027,7 @@ R600UploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
     driver_priv = exaGetPixmapDriverPrivate(pDst);
 
     /* If we know the BO won't be busy, don't bother */
-    if (!radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs) &&
+    if (driver_priv->bo->cref == 1 &&
 	!radeon_bo_is_busy(driver_priv->bo, &dst_domain))
 	return FALSE;
 
@@ -2097,8 +2097,11 @@ R600DownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
     driver_priv = exaGetPixmapDriverPrivate(pSrc);
 
     /* If we know the BO won't end up in VRAM anyway, don't bother */
-    if (radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs)) {
-	src_domain = radeon_bo_get_src_domain(driver_priv->bo);
+    if (driver_priv->bo->cref > 1) {
+	src_domain = driver_priv->bo->space_accounted & 0xffff;
+	if (!src_domain)
+	    src_domain = driver_priv->bo->space_accounted >> 16;
+
 	if ((src_domain & (RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM)) ==
 	    (RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM))
 	    src_domain = 0;
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 97733c3..bff6ec0 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -341,7 +341,6 @@ Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index)
 {
     ScreenPtr pScreen = pPix->drawable.pScreen;
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    RADEONInfoPtr info = RADEONPTR(pScrn);
     struct radeon_exa_pixmap_priv *driver_priv;
     int ret;
 
@@ -357,7 +356,7 @@ Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index)
       return FALSE;
 
     /* if we have more refs than just the BO then flush */
-    if (radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs))
+    if (driver_priv->bo->cref > 1)
         radeon_cs_flush_indirect(pScrn);
     
     /* flush IB */
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index 6d2522a..61c7427 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -484,7 +484,7 @@ RADEONUploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
 #endif
 
     /* If we know the BO won't be busy, don't bother */
-    if (!radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs) &&
+    if (driver_priv->bo->cref == 1 &&
 	!radeon_bo_is_busy(driver_priv->bo, &dst_domain)) {
 #if X_BYTE_ORDER == X_BIG_ENDIAN
 	/* Can't return FALSE here if we need to swap bytes */
@@ -582,8 +582,11 @@ RADEONDownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
 #endif
 
     /* If we know the BO won't end up in VRAM anyway, don't bother */
-    if (radeon_bo_is_referenced_by_cs(driver_priv->bo, info->cs)) {
-	src_domain = radeon_bo_get_src_domain(driver_priv->bo);
+    if (driver_priv->bo->cref > 1) {
+	src_domain = driver_priv->bo->space_accounted & 0xffff;
+	if (!src_domain)
+	    src_domain = driver_priv->bo->space_accounted >> 16;
+
 	if ((src_domain & (RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM)) ==
 	    (RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM))
 	    src_domain = 0;
-- 
1.6.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	2 Dec 2009 02:50:08 -0000	1.37
+++ .cvsignore	21 Dec 2009 06:05:48 -0000	1.38
@@ -1 +1,2 @@
-xf86-video-ati-20091201.tar.xz
+radeon-rlc-firmware-1.tar.bz2
+xf86-video-ati-20091221.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	2 Dec 2009 02:50:08 -0000	1.37
+++ sources	21 Dec 2009 06:05:49 -0000	1.38
@@ -1 +1,2 @@
-f66ac154c99ba836f38f4bea302e9d75  xf86-video-ati-20091201.tar.xz
+189be8ab60025bf81f8841ab53175665  radeon-rlc-firmware-1.tar.bz2
+84236a984ca7d78c7a33655e54c26e4c  xf86-video-ati-20091221.tar.xz


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/xorg-x11-drv-ati.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- xorg-x11-drv-ati.spec	2 Dec 2009 02:50:08 -0000	1.199
+++ xorg-x11-drv-ati.spec	21 Dec 2009 06:05:49 -0000	1.200
@@ -1,13 +1,13 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20091201
-%define gitversion 88a50a30d
+%define gitdate 20091221
+%define gitversion 4b05c47ac
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.16.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.19.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -17,8 +17,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: %{tarball}-%{gitdate}.tar.xz
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
+Source2:    radeon-rlc-firmware-1.tar.bz2
 
-Patch1:     radeon-dri2-revert-drm-func.patch
+Patch1:     radeon-revert-api.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
@@ -28,14 +29,14 @@ ExcludeArch: s390 s390x
 BuildRequires: python
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
 BuildRequires: mesa-libGL-devel >= 6.4-4
-BuildRequires: libdrm-devel >= 2.4.0-0.21
+BuildRequires: libdrm-devel >= 2.4.15-6
 BuildRequires: kernel-headers >= 2.6.27-0.308
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
-Requires:  libdrm >= 2.4.0-0.21
+Requires:  libdrm >= 2.4.15-6
 # new CS method needs newer kernel
 Requires:  kernel >= 2.6.29.1-111.fc11
 Obsoletes: xorg-x11-drv-avivo <= 0.0.2
@@ -43,9 +44,15 @@ Obsoletes: xorg-x11-drv-avivo <= 0.0.2
 %description 
 X.Org X11 ati video driver.
 
+%package firmware
+Summary: ATI firmware for R600 RLC
+
+%description firmware
+Firmware for ATI R600/R700 IRQs
+
 %prep
-%setup -q -n %{tarball}-%{gitdate}
-%patch1 -p1 -b .revert
+%setup -q -n %{tarball}-%{gitdate} -a 2
+%patch1 -p1 -b .revert-api
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
@@ -67,6 +74,9 @@ install -m 0644 radeon.xinf $RPM_BUILD_R
 
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+%{__mkdir_p} %{buildroot}/lib/firmware/radeon
+%{__install} -p -m 0644 *.bin %{buildroot}/lib/firmware/radeon/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,7 +91,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/ati.4*
 %{_mandir}/man4/radeon.4*
 
+%files firmware
+%defattr(-,root,root,-)
+%doc LICENSE.radeon.firmware
+/lib/firmware/radeon/*.bin
+
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.19.20091221git4b05c47ac
+- rebase to upstream master - revert API changes for F12 for now.
+
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091201git88a50a30d
+- add R600 RLC firmware for IRQ handling
+
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.17.20091201git88a50a30d
+- ums displayport + bump libdrm requires for new function needed
+
 * Tue Dec 01 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.16.20091201git88a50a30d
 - fixed up multi-op support for r600s
 


--- radeon-dri2-revert-drm-func.patch DELETED ---



From tagoh at fedoraproject.org  Mon Dec 21 06:07:45 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 21 Dec 2009 06:07:45 +0000 (UTC)
Subject: rpms/anthy/F-11 anthy-fix-typo-in-dict.patch, 1.2, 1.3 anthy.spec,
	1.59, 1.60
Message-ID: <20091221060745.18A4411C00E7@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19175

Modified Files:
	anthy-fix-typo-in-dict.patch anthy.spec 
Log Message:
* Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-10
- Fix more typos in dictionary. (#548078)
- correct the source URL.

anthy-fix-typo-in-dict.patch:
 compound.t |   35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

Index: anthy-fix-typo-in-dict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-11/anthy-fix-typo-in-dict.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- anthy-fix-typo-in-dict.patch	28 Aug 2009 10:45:14 -0000	1.2
+++ anthy-fix-typo-in-dict.patch	21 Dec 2009 06:07:44 -0000	1.3
@@ -1,6 +1,6 @@
 diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.t
 --- anthy-9100h.orig/mkworddic/compound.t	2009-02-07 21:15:36.000000000 +0900
-+++ anthy-9100h/mkworddic/compound.t	2009-08-28 17:19:20.000000000 +0900
++++ anthy-9100h/mkworddic/compound.t	2009-12-21 13:59:13.000000000 +0900
 @@ -8,7 +8,6 @@
  ???????????????? #T35 #_4????_4????
  ?????????????????? #T35 #_5????_4????
@@ -17,6 +17,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ?????????????? #T35 #_3????_4????
  ?????????????? #T35 #_3????_4????
  ?????????????????? #T35 #_3????_6??????
+@@ -1987,7 +1987,7 @@
+ ???????????????????? #T35 #_4????_3????_3????
+ ?????????????? #T35 #_4????_3??
+ ???????????????? #T35 #_4????_4????
+-?????????????? #35 #_4????_3????
++?????????????? #T30 #_4????_3????
+ ?????????????????? #T35 #_4????_3????_2??
+ ?????????????????????? #T35 #_4????_3????_2??_2??
+ ?????????????? #T35 #_4????_3????
 @@ -9714,7 +9714,6 @@
  ?????????????? #T35 #_4????_3????
  ?????????????? #T35 #_4????_3??
@@ -25,6 +34,24 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_4????_3????
  ???????????????? #T35 #_4????_4????
+@@ -10235,7 +10234,7 @@
+ ???????????? #T35 #_3????_3????
+ ?????????? #T35 #_4????_1??
+ ???????? #T35 #_2??_2????
+-?????????????????? #T#5 #_3????_6????
++?????????????????? #T30 #_3????_6????
+ ???????????????????? #T35 #_4????_4????_2??
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2??
+@@ -14320,7 +14319,7 @@
+ ???????????????? #KK #_4????_4????
+ ???????????????????? #T35 #_4????_4????_2??
+ ?????????????? #T35 #_4????_3??
+-???????????????????????????????? T35 #_4????_5????_5??????_2??
++???????????????????????????????? #T35 #_4????_5????_5??????_2??
+ ???????????? #T35 #_4????_2??
+ ?????????????????? #KK #_4????_5??????????
+ ?????????????????????? #T35 #_4????_5????_2??
 @@ -19234,7 +19233,7 @@
  ???????????? #T35 #_4????_2??
  ???????????????? #T35 #_2??_2??_4????
@@ -34,6 +61,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_2??_4????
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_2??_3????_2??
+@@ -19964,7 +19963,7 @@
+ ???????????????????? #T35 #_5????_5????
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2????
+-?????????? #T5 #_2??_3????
++?????????? #T35 #_2??_3????
+ ???????????????? #T35 #_4????_4????
+ ?????????????? #T35 #_4????_3????
+ ???????????????? #T35 #_4????_4????
 @@ -20163,7 +20162,7 @@
  ???????????????? #T35 #_4????_4????
  ???????????????????? #T35 #_4????_2??_4????
@@ -43,6 +79,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????? #T35 #_4????_1??
  ???????????????? #T35 #_4????_4????
+@@ -21650,7 +21649,7 @@
+ ?????????? #T35 #_4????_1??
+ ???????????????????? #T35 #_4????_3????_3????
+ ???????????????? #T35 #_4????_4????
+-?????????????? T35 #_4????_3????
++?????????????? #T30 #_4????_3????
+ ?????????????? #T35 #_4????_3????
+ ?????????????? #T35 #_4????_3????
+ ???????????????? #T35 #_4????_4????
 @@ -30752,7 +30751,6 @@
  ?????????????????????????? #T35 #_6????_4????_3????
  ???????????????? #T35 #_7??????_1??
@@ -68,6 +113,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ?????????????? #T35 #_4????_3??
  ?????????????????? #T35 #_4????_5????
  ???????????????? #T35 #_4????_4????
+@@ -40670,7 +40669,7 @@
+ ?????????????? #T35 #_5????_2??
+ ?????????????? #T35 #_5????_2??
+ ???????????? #T35 #_5????_1??
+-???????????????? T35 #_5????_3????
++???????????????? #T35 #_5????_3????
+ ?????????????? #T35 #_5????_2??
+ ?????????????????? #T35 #_5????_4????
+ ?????????????? #T35 #_5????_2??
 @@ -41942,7 +41941,7 @@
  ?????????????? #T35 #_5????_2??
  ???????????????? #T35 #_5????_3??
@@ -77,6 +131,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????????? #T35 #_4????_6??????
  ???????????? #T35 #_4????_2??
  ?????????????????? #T35 #_6??????_3??
+@@ -46498,7 +46497,7 @@
+ ?????????????? #KK #_5????_2??
+ ???????????????? #T35 #_5????_3????
+ ?????????????????? #T35 #_5????_4????
+-???????????????????????????????? T35 #_4????_5????_5??????_2??
++???????????????????????????????? #T35 #_4????_5????_5??????_2??
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_4????_2????
+ ?????????????? #T35 #_4????_3????
 @@ -57562,11 +57561,11 @@
  ?????????? #T35 #_3????_2????
  ?????????? #T35 #_3????_2??


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-11/anthy.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- anthy.spec	28 Aug 2009 10:45:14 -0000	1.59
+++ anthy.spec	21 Dec 2009 06:07:44 -0000	1.60
@@ -23,15 +23,17 @@
 
 Name:		anthy
 Version:	9100h
-Release:	8%{?dist}
+Release:	10%{?dist}
 # 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:	emacs emacs-el
+%if 0%{?rhel} == 0
 BuildRequires:	xemacs
+%endif
 
-Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
+Source0:	http://osdn.dl.sourceforge.jp/anthy/37536/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Patch0:		anthy-fix-typo-in-dict.patch
 Patch1:		anthy-corpus.patch
@@ -77,6 +79,7 @@ This package contains the elisp source f
 do not need to install this package to run Anthy. Install the emacs-%{pkg}
 package to use Anthy with GNU Emacs.
 
+%if 0%{?rhel} == 0
 %package -n	xemacs-%{pkg}
 Summary:	Compiled elisp files to run Anthy under XEmacs
 Group:		System Environment/Libraries
@@ -98,6 +101,7 @@ Requires:	xemacs-%{pkg} = %{version}-%{r
 This package contains the elisp source files for Anthy under XEmacs. You do
 not need to install this package to run Anthy. Install the xemacs-%{pkg}
 package to use Anthy with XEmacs.
+%endif
 
 
 %prep
@@ -183,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{l
 %__mkdir_p $RPM_BUILD_ROOT%{emacs_startdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}
 
+%if 0%{?rhel} == 0
 ## for xemacs-anthy
 %__mkdir_p $RPM_BUILD_ROOT%{xemacs_startdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir}
@@ -191,6 +196,7 @@ make clean
 make EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
 make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}"
 popd
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -225,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %{emacs_lispdir}/%{pkg}/*.el
 
+%if 0%{?rhel} == 0
 %files -n xemacs-%{pkg}
 %defattr(-, root, root, -)
 %doc doc/ELISP
@@ -235,9 +242,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -n xemacs-%{pkg}-el
 %defattr(-, root, root, -)
 %{xemacs_lispdir}/%{pkg}/*.el
-
+%endif
 
 %changelog
+* Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-10
+- Fix more typos in dictionary. (#548078)
+- correct the source URL.
+
+* Thu Sep  3 2009 Dennis Gregorovic <dgregor at redhat.com> - 9100h-9
+- Do not build against xemacs on RHEL
+
 * Fri Aug 28 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-8
 - Fix more typos in dictionary. (#519769)
 



From tagoh at fedoraproject.org  Mon Dec 21 07:22:56 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 21 Dec 2009 07:22:56 +0000 (UTC)
Subject: rpms/kasumi/devel kasumi.spec,1.33,1.34
Message-ID: <20091221072256.EBD2B11C00E7@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kasumi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29355

Modified Files:
	kasumi.spec 
Log Message:
* Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 2.5-2
- improve the spec file (#546147)


Index: kasumi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- kasumi.spec	4 Aug 2009 03:22:55 -0000	1.33
+++ kasumi.spec	21 Dec 2009 07:22:55 -0000	1.34
@@ -1,15 +1,15 @@
 Name:    kasumi
 Version: 2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf
-Source0: http://osdn.dl.sourceforge.jp/kasumi/41436/%{name}-%{version}.tar.gz
+BuildRequires: desktop-file-utils, gtk2-devel anthy-devel
+Source0: http://dl.sourceforge.jp/kasumi/41436/%{name}-%{version}.tar.gz
 
 
-Summary: An anthy dictionary management tool.
+Summary: An anthy dictionary management tool
 Group:   Applications/Text
 %description
 Kasumi is a dictionary management tool for Anthy.
@@ -25,10 +25,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # remove .desktop file so that kasumi is accessible from scim panel and it's not necessary for other users.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 
 %find_lang %{name}
@@ -43,10 +43,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/kasumi
 %{_mandir}/man1/kasumi.1*
 %{_datadir}/pixmaps/kasumi.png
+%{_datadir}/applications/kasumi.desktop
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 
 %changelog
+* Mon Dec 21 2009 Akira TAGOH <tagoh at redhat.com> - 2.5-2
+- improve the spec file (#546147)
+
 * Mon Aug  3 2009 Akira TAGOH <tagoh at redhat.com> - 2.5-1
 - New upstream release.
 



From robert at fedoraproject.org  Mon Dec 21 07:38:54 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 21 Dec 2009 07:38:54 +0000 (UTC)
Subject: rpms/mimedefang/devel mimedefang.spec,1.15,1.16
Message-ID: <20091221073854.3A57E11C00E7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31590

Modified Files:
	mimedefang.spec 
Log Message:
Rebuilt against perl 5.10.1



Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mimedefang.spec	25 Jul 2009 12:12:27 -0000	1.15
+++ mimedefang.spec	21 Dec 2009 07:38:52 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
 Version:           2.67
-Release:           2%{?dist}
+Release:           3%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Mon Dec 21 2009 Robert Scheck <robert at fedoraproject.org> 2.67-3
+- Rebuilt against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.67-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hubbitus at fedoraproject.org  Mon Dec 21 08:17:32 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 08:17:32 +0000 (UTC)
Subject: File qutim-0.2.0.tar.bz2 uploaded to lookaside cache by hubbitus
Message-ID: <20091221081732.7DFB110F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qutim:

a0cf5b7bc1a8fd9e0a6a712d6f1b98e7  qutim-0.2.0.tar.bz2



From hubbitus at fedoraproject.org  Mon Dec 21 08:23:48 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 08:23:48 +0000 (UTC)
Subject: rpms/qutim/devel import.log, NONE, 1.1 qutim.desktop, NONE,
	1.1 qutim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221082348.3952511C00E7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/qutim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5339/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qutim.desktop qutim.spec 
Log Message:
Initial import qutim into Fedora.




--- NEW FILE import.log ---
qutim-0_2_0-2_fc11:HEAD:qutim-0.2.0-2.fc11.src.rpm:1261383465


--- NEW FILE qutim.desktop ---
[Desktop Entry]
Exec=qutim
Icon=qutim
Terminal=false
Type=Application
Categories=Qt;Network;InstantMessaging;

Name=QutIM
GenericName=Instant Messenger
GenericName[ru]=????????? ?????? ???????????
Comment=Instant messaging program
Comment[ru]=????????? ?????? ???????????

--- NEW FILE qutim.spec ---
%bcond_without gnutls
%bcond_without openssl

# Checkouted from several sources, so using date instead of revision number.
#% define SVN 20091018

Name:		qutim
Version:		0.2.0
Release:		2%{?SVN:SVN%{SVN}}%{?dist}
Summary:		Multiprotocol (ICQ, Jabber, IRC etc) instant messenger with modern Qt4 interface
Summary(ru):	???????????????????, ?????????????????? (ICQ, Jabber, IRC...) ?????????? ?? QT4
License:		GPLv2+ and CC-BY-SA
Group:		Applications/Internet
Url:			http://www.qutim.org/
Source0:		http://www.qutim.org/uploads/src/%{name}-%{version}.tar.bz2
Source1:		%{name}.desktop
Requires:		hicolor-icon-theme
BuildRequires:	cmake >= 2.6, desktop-file-utils
BuildRequires:	qt-devel >= 1:4.0, libidn-devel, dos2unix
%if %{with gnutls}
BuildRequires:	gnutls-devel
%endif
%if %{with openssl}
BuildRequires:	openssl-devel
%endif

BuildRequires:	gloox-devel >= 1:1.0-1

%description
qutIM - free open-source multiprotocol ( ICQ, Jabber/GTalk/
/Ya.Online/LiveJournal.com, Mail.Ru, IRC ) instant messenger for
Windows and Linux systems

%description -l ru
qutIM - ???????? ?????????????????? (??? ??????????????:
ICQ, Jabber, GTalk, Ya.Online, LiveJournal.com, Mail.Ru, IRC ??????
?????? ??????????? ??? Linux ? Windows.
??????? ? ???? ? ??????? ???? ??????, ???????, ???????, ???????? ?
??????????? ?? ???? ???????-????????.


%package		icq
Summary:		ICQ support for %{name}
Summary(ru):	ICQ ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	icq
ICQ support plugin for %{name}

%description	icq -l ru
????????? (??????) ????????? ICQ ??? %{name}


%package		irc
Summary:		IRC support for %{name}
Summary(ru):	IRC ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	irc
IRC support plugin for %{name}

%description	irc -l ru
????????? (??????) ????????? IRC ??? %{name}


%package		jabber
Summary:		Jabber support for %{name}
Summary(ru):	Jabber ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}
Requires:		gloox >= 1:1.0-1

%description	jabber
Jabber support plugin for qutIM

%description	jabber -l ru
????????? (??????) ????????? Jabber ??? %{name}


%package		mrim
Summary:		Mrim support for %{name}
Summary(ru):	Mrim ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	mrim
Mrim (Mail.ru agent) support plugin for %{name}

%description	mrim -l ru
????????? (??????) ????????? Mrim (Mail.ru agent) ??? %{name}


%package		histman
Summary:		Histman plugin for %{name}
Summary(ru):	Histman ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	histman
Histman - History Manager plugin for %{name}
Easy and fast convert your history from other IM-clients like:
QIP, Miranda, Pidgin, Kopete, Gajim, Psi and others!

%description	histman -l ru
?????? "???????? ???????" ??? %{name}
????? ? ?????? ????????????? ???? ??????? ?? ?????? ???????????????? ????????:
QIP, Miranda, Pidgin, Kopete, Gajim, Psi ? ?????? ??????!


%package		plugman
Summary:		Plugin Manager plugin for %{name}
Summary(ru):	Plugin Manager ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	plugman
Plugman - Plugin Manager plugin for %{name}
Allow you to easy install additional themes (skins), smile sets (including famous
and popular Kolobok), sound themes and other small usefulness, that helps do
qutIM better.

%description	plugman -l ru
?????? "???????? ????????" ??? %{name}
???????? ??? ????? ????????? ?????????????? ???? ??????????, ????????? ???????,
? ??? ????? ??? ???????????? ???? ???????, ???????? ???? ? ?????? ?????????
??????????, ?????????? ??????? qutIM ????????.


%package		vkontakte
Summary:		Vkontakte support for %{name}
Summary(ru):	Vkontakte ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	vkontakte
Vkontakte plugin to speak with vkontakte.ru users from %{name}

%description	vkontakte -l ru
????????? (??????) ??? ??????? ? ?????????????? vkontakte.ru ?? %{name}


%package		yandexnarod
Summary:		Yandexnarod plugin for %{name}
Summary(ru):	Yandexnarod ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	yandexnarod
Yandex.Narod - plugin for %{name}
Allow upload files to Yandex.Disk (http://narod.yandex.ru/disk) and send link
to it. What remarkably - allow to send files to offline contacts. Additional
allow to manage previosly uploaded files.

%description	yandexnarod -l ru
?????? Yandex.Narod ??? %{name}
?????? ????? ?? ??????.???? ? ???????? ??????????? ?? ???? ??????, ???
????????????? ? ??? ????? ????? ????? ? ????????????? ?? ? ????. ?????? ?????
????? ????????? ??? ???????????? ???????.

%package		devel
Summary:		Headers for %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}
Requires:		cmake

%description	devel
Headers for %{name}

%prep
%setup -q

# Gloox is shared, do not use bundled
rm -rf ./plugins/jabber/libs/

# Fix source files permissions to do not rpm compline spurious-executable-perm on -debuginfo sub package
find \( -name '*.cpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;

# Fix lineendings qtwin to avoid rpmlint complain wrong-script-end-of-line-encoding.
dos2unix src/3rdparty/qtwin/qtwin.{cpp,h}

%build
%{cmake} .

make

# Jabber
pushd plugins/jabber
	# Due to the BUG http://bugs.camaya.net/horde/whups/ticket/?id=163 we should add "-lpthread" manually.
	CXXFLAGS="%{optflags} `pkg-config --libs --cflags gloox` -lpthread" %{cmake} \
	%if %{with gnutls}
	-DGNUTLS=1 \
	%endif
	%if %{with openssl}
	-DOpenSSL=1 \
	%endif
	.
make
popd

	# All other plugins (which is not require additional parameters) and own
	# cmake buildsystem (other shold migrate to cmake priot 0.3 version)
	for plugin in mrim plugman; do
	pushd plugins/$plugin
	%{cmake} .
	make
	popd
	done

	# Build all plugins with qt4make buildsystem:
	for plugin in icq irc histman vkontakte yandexnarod; do
	pushd plugins/$plugin
	%{_qt4_qmake} -makefile -unix "QMAKE_CFLAGS+=%{optflags}" "QMAKE_CXXFLAGS+=%{optflags}" $plugin.pro
	make
	popd
	done



%install
rm -rf %{buildroot}

mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}%{_datadir}/%{name}/emoticons %{buildroot}%{_libdir}/%{name}
install -m 644 icons/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps
install -m 644 icons/%{name}_64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png

make install DESTDIR="%{buildroot}"

desktop-file-install \
	--add-category="Network" \
	--dir=%{buildroot}/%{_datadir}/applications \
	%{SOURCE1}

pushd plugins
	for plugin in icq irc mrim jabber histman plugman vkontakte yandexnarod; do
	install -m 755 $plugin/lib${plugin}.so %{buildroot}%{_libdir}/%{name}
	done
popd

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
	if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
	fi

%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,-)
%dir %{_libdir}/%{name}
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/pixmaps/%{name}.xpm
%doc COPYING AUTHORS CCBYSA GPL

%files icq
%defattr(-,root,root,-)
%doc plugins/icq/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libicq.so

%files irc
%defattr(-,root,root,-)
%doc plugins/irc/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libirc.so

%files jabber
%defattr(-,root,root,-)
%doc plugins/jabber/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libjabber.so

%files mrim
%defattr(-,root,root,-)
#% doc COPYING AUTHORS GPL
%{_libdir}/%{name}/libmrim.so

%files vkontakte
%defattr(-,root,root,-)
%doc plugins/vkontakte/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libvkontakte.so

%files histman
%defattr(-,root,root,-)
%doc plugins/histman/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libhistman.so

%files plugman
%defattr(-,root,root,-)
%doc plugins/plugman/{COPYING,COPYING.libs,AUTHORS,GPL,TODO,changelog}
%{_libdir}/%{name}/libplugman.so

%files yandexnarod
%defattr(-,root,root,-)
%doc plugins/yandexnarod/{COPYING,AUTHORS,GPL,README}
%{_libdir}/%{name}/libyandexnarod.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_datadir}/cmake/Modules/FindQutIM.cmake
%{_datadir}/cmake/Modules/qutimuic.cmake

%changelog
* Tue Dec 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-2
- Delete comment what qt >= 4.0 not enought and qt3-devel-0:3.3.8b-14.fc9.i386 also satisfy this, and epoch needed.
	It outdated since Fedora 9 EOL reached.
- As it is release version, change Release enumeration to 1 digit.

* Sun Nov 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.21
- Directory %%{_libdir}/%%{name} marked as %%dir in main package
- Icon placed to /apps subdir of %%{_datadir}/icons/hicolor/16x16/

* Wed Nov 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.20
- Correct paths for plugin docs.
- Remove all icons macroses as suggested by Peter and change its installation paths.
- Own %%{_libdir}/%%{name}
- In devel own full %%{_includedir}/%%{name} and don't mention each file.

* Fri Nov 13 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.19
- Delete invoke of ldconfig, because it is nt needed if libraries placed not in %%{_libdir} directly. By words of Peter Lemenkov.
- Delete unused macros _liconsdir

* Wed Nov 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.18
- Add epoch 1 in gloox requires.

* Sun Nov 8 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.17
- Update to long-awaited 0.2 release! But now it version enumerated as 0.2.0.
- Up BR gloox to 1.0-1 (release)
- Add new plugins - sub packages: histman, plugman, vkontakte, vkontakte, yandexnarod
- All incoming of %%{__make} replaced by direct make
- Delete BuildRoot tag - qutim is not intended to EPEL.
- Fedora review started - thanks to Peter Lemenkov.
- Fix source files permissions in %%prep to do not rpm compline spurious-executable-perm on -debuginfo sub package
- Add BR dos2unix and fix lineendings qtwin to avoid rpmlint complain wrong-script-end-of-line-encoding.
- Add Requires hicolor-icon-theme (for /usr/share/icons/hicolor/64x64/apps )
- Add Requires cmake ot -devel subpackage.
- Fill BUG on gloox http://bugs.camaya.net/horde/whups/ticket/?id=163 and to work around this problem add "-lpthread" flag to jabber-plugin options.

* Thu Oct 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.16.beta2SVN20091018
- Add %%{_hiconsdir}
- Replace %%{_icons64dir} by %%{_hiconsdir}/64x64/apps

* Tue Oct 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.15.beta2SVN20091018
- Rename package from qutIM to qutim and delete all dual names anywhere.

* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.14.beta2SVN20091018
- Build against new gloox-1.0rc3-0.8.SVNr4204
- Close http://trac.qutim.org/task/258
- New checkout SVN20091018
- Correct checkout process, icq and jabber plugins now have traditional branches and trunk directories.
- Delete # Fix path. Come from alt. Needed for 64-bit systems
	sed -i 's|lib/%%{name}|%%{_lib}/%%{name}|g' CMakeLists.txt src/pluginsystem.cpp plugins/jabber/CMakeLists.txt
	with hope it is not needed anymore.
- Delete cmake_flags define. cmake invoke replaced by macro %%cmake
- Fill and wait close https://mail.camaya.net/horde/whups/ticket/?id=157
- Add to %%doc files: AUTHORS, CCBYSA, GPL
- License changed from GPLv2 to "GPLv2+ and CCBYSA" according to COPYING.
- Add %%post/%%postun for each plugin subpackage.
- Add -devel subpackage and put in it files:
	%%{_includedir}/%%{lname}/iconmanagerinterface.h
	%%{_includedir}/%%{lname}/layerinterface.h
	%%{_includedir}/%%{lname}/layerscity.h
	%%{_includedir}/%%{lname}/plugininterface.h
	%%{_includedir}/%%{lname}/protocolinterface.h
	%%{_includedir}/%%{lname}/settings.h
	%%{_datadir}/cmake/Modules/FindQutIM.cmake
	%%{_datadir}/cmake/Modules/qutimuic.cmake
- Delete all sed rpath-cmake hacks, it is handled no in %%cmake macros.
- Delete %%doc plugins/mrim/TODO.txt in mrim. File does not exist anymore.

* Sat Sep 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.13.beta2SVN20090716
- Beta2 build SVN20090716.

* Thu Jul 16 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.12.betaSVN20090716
- Beta release come.
- Use svn export instaed of checkout to prepare tarball.
- Replace "%%makeinstall DESTDIR=%%{buildroot}" by more preferable "makei nstall DESTDIR=%%{buildroot}"
- Delete patch qutim-0.2-alpha-GCC4.4_missing_include.patch (fixed in rev316, http://qutim.org/flyspray/task/10)
	Remove temporary hack with separate jabber-plugin in Source2

* Mon Apr 6 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.11.alphaSVN20080404
- Add "-l gloox" into CXXFLAGS when jabber plugin build. It is not linked with our shared library instead.
- Delete explicit Requires: libidn (inspired by rpmlint)

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.10.alphaSVN20080404
- We build 0.2 alpha. It is built, but do not installable due bug: http://bugs.camaya.net/horde/whups/ticket/?id=137 (qutIM
	ship with bundled copy of gloox library). After separate gloox into another RPM package, we have another bug:
	http://qutim.org/flyspray/task/13 . QutIM jabber plugin developer fixing that in revision 305, but it is not build because API in
	gloox and qutIM changed. So, we must checkout all.
- Checkouted from several sources, so using date instead of revision number.
- Add SVN part into Release.
- Mrim plugin buildsystem changed to cmake too (was qmake-qt4)
- Direct qmake-qt4 replaced by macros %%{_qt4_qmake}

* Fri Apr 3 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.9.alpha
- Due to the BUG: qutIM-jabber-SVNr305.tar.bz2 Jaber plugin is not installable. Author say it is fixed in revision 305.
	Add Source2: qutIM-jabber-SVNr305.tar.bz2
- Patch1 is not needed anymore. Disabled. In talk with autor he make decision support external shared gloog installation and build
	scripts now (rev 305 also) contain automatically detect support for it.

* Wed Apr 1 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.8.alpha
- Add Requires: libidn and BuildRequires: libidn-devel after talk with qutIM developer.

* Sat Mar 28 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.7.alpha
- Due to the previousli mentioned bug, and also similar which I fill ( https://mail.camaya.net/horde/whups/ticket/?id=137 ), and
	at all, it is not well bundle into this package common library. So, I make decision pack gloox separately. For that:
	o Add Requires: gloox >= 1.0 (in jabber subpackage) and BuildRequires: gloox-devel >= 1.0 in main package
	o Delete Patch1: qutim-0.2-alpha-gloox-DNS.patch
	o Remove dir rm -rf ./plugins/jabber/libs/ in %%prep
	o Add Patch qutim-0.2-alpha.cut-off-gloox.patch to remove additional source dependencies.

* Fri Mar 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.6.alpha
- Add Patch1: qutim-0.2-alpha-gloox-DNS.patch to resolv installation error (build sucsessfull):
	error: Failed dependencies:
		libresolv.so.2(GLIBC_PRIVATE) is needed by qutIM-jabber-0.2-0.5.alpha.fc9.i386

* Thu Mar 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.5.alpha
- Add %%{?dist} into release.

* Thu Mar 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.4.alpha
- Exclude common RPATH from binary. Comment out all rpath-related strings in CMakeLists.txt
- Delete delete (added before) manipulation with CMakeCache.txt

* Wed Mar 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.3.alpha
- Rpmlint inspired tuning in this release.
- Group changed from "Networking/Instant messaging" to Applications/Internet
- Add documentation COPYING in main package and TODO.txt into mrim. Can't found any other.

* Tue Mar 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.2.alpha
- Add Patch0: qutim-0.2-alpha-GCC4.4_missing_include.patch to build on GCC 4.4. Build on rawhide with recent version of gcc.
	Build on dist-f10 now sucsessful.

* Mon Mar 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.1.alpha
- Initial import from ftp://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus/files/SRPMS/qutim-0.2-alt5.alpha.src.rpm
	( http://sisyphus.ru/srpm/Sisyphus/qutim/get )
- Version enumeration changed to - 0.2-0.1.alpha
- License chaged from GPL2 to GPLv2
- Source: %%name-%%version.tar
	changed to URL: Source:	http://qutim.org/uploads/qutim_0.2_alpha_source.tar.bz2
- qutim-0.2-alt.patch transformed to qutIM.desktop Source1
- Reformat spec with tabs.
- Delete:
	o Epoch: 2 tag
	o name from summary.
	o explicit Provides:	%%cname = %%version
	o Obsoletes:	%%cname <= 0.1-alt1.20080620 - it is a first import into Fedora.
	o %%define cname qutIM and anywhere use %%name instead.
	o Packager: Evgenii Terechkov <evg at altlinux.org>
	o # Automatically added by buildreq on Sun Jun 15 2008: BuildRequires: gcc-c++ libqt4-devel cmake
	o %%define _unpackaged_files_terminate_build 1
	o install in "%%makeinstall DESTDIR=%%{buildroot} install"
- Replace:
	o %%def_without gnutls to %%bcond_without gnutls
	o %%def_with openssl to %%bcond_without openssl
	o "%%if %%{with gnutls}" instead of alt "%%if_with gnutls"
	o "%%if %%{with openssl}" instead of alt "%%if_with openssl"
	o Direct mention of qutIM in description to %%name
	o %%make_build to simple %{__make}
	o BuildRequires: libssl-devel to BuildRequires: openssl-devel
	o BuildRequires: libgnutls-devel to BuildRequires: gnutls-devel
	o %%setup -n %%{name}-%%{version} to %%setup -qn %%( echo %%{name} | tr 'A-Z' 'a-z' )
	o %%prefix to %{_prefix}
	o ln %%{buildroot}%%{_bindir}/%%{lname} %%{buildroot}%%{_bindir}/%%{name}
		to
		ln -s %%{lname} %%{buildroot}%%{_bindir}/%%{name}
- Add:
	o Summary(ru) and Description -l ru for all packages.
	o BuildRequires: cmake >= 2.6
	o -q key in %%setup macro
	o BR qt-devel >= 1:4.0
	o BuildRoot: %%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n)
	o %%defattr(-, root, root, -) in each %%files section
	o %%{__rm} -rf %%{buildroot} in %%install section
	o %%clean section with "%%{__rm} -rf %%{buildroot}" content
	o #To avoid RPATH troubles: sed -i 's/CMAKE_SKIP_RPATH:BOOL=NO/CMAKE_SKIP_RPATH:BOOL=YES/' CMakeCache.txt
	o Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig
		and Post & Postun sections with ldconfig and icon-cache update.
	o Define Jpackage (Mandriva) macroses: _miconsdir, _iconsdir, _liconsdir
- For consistent usage brackets all (name, version, optflags ...) %%name replaced by %%{name}
- Correcthandle .desktop file:
	o Add BR desktop-file-utils
	o Use desktop-file-install instead of simple copy file and use (undefined) %%{_desktopdir}
- Install jabber as other plugins, do not any exclusions (was separate %%makeinstall).

* Wed Mar 18 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt5.alpha
- Build with OpenSSL by default (seems like gmail works only with openssl)
- Split package to plugins subpackages

* Fri Mar 13 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt4.alpha
- Missed optflags and make_build ressurected (thanks to drool@ again)

* Fri Mar 13 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt3.alpha
- Build with Gnutls support (thanks to drool@)

* Mon Mar  9 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt2.alpha
- x86_64 build "fixed" (Authors is idiots)
- bin/%%cname compat hardlink added

* Sun Mar  8 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt1.alpha
- 0.2 alpha

* Thu Jan 22 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.1.1-alt2
- Migrate to "one alt patch" gear scheme
- Update spec to new filetriggers system

* Sun Aug 17 2008 Terechkov Evgenii <evg at altlinux.ru> 2:0.1.1-alt1
- 0.1.1

* Sun Aug 17 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080720
- Svn revision: exported

* Sun Jul 20 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080720
- Svn revision: 174

* Wed Jul 09 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080709
- Svn revision: 154

* Wed Jul  2 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080702
- svn-20080702

* Mon Jun 30 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080629
- svn-20080629

* Tue Jun 24 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080624
- Package name changed due changes in upstream
- buildflags added (fix #16149)
- svn-20080624

* Fri Jun 20 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080620
- svn-20080620

* Wed Jun 18 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080618
- svn-20080618
- Obsoleted Patch1 removed (fixed in upstream)

* Wed Jun 18 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt3
- README.ALT included in binary package

* Tue Jun 17 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt2
- Patch1 added to look for emoicons in common dir (to hiddenman@)
- README.ALT added

* Sun Jun 15 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt1
- Initial build for ALT Linux Sisyphus


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 03:14:24 -0000	1.1
+++ .cvsignore	21 Dec 2009 08:23:47 -0000	1.2
@@ -0,0 +1 @@
+qutim-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 03:14:24 -0000	1.1
+++ sources	21 Dec 2009 08:23:47 -0000	1.2
@@ -0,0 +1 @@
+a0cf5b7bc1a8fd9e0a6a712d6f1b98e7  qutim-0.2.0.tar.bz2



From tmraz at fedoraproject.org  Mon Dec 21 08:26:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 21 Dec 2009 08:26:28 +0000 (UTC)
Subject: rpms/libgcrypt/devel libgcrypt.spec,1.41,1.42
Message-ID: <20091221082628.7248D11C00E7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5889

Modified Files:
	libgcrypt.spec 
Log Message:



Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- libgcrypt.spec	27 Oct 2009 14:36:08 -0000	1.41
+++ libgcrypt.spec	21 Dec 2009 08:26:28 -0000	1.42
@@ -1,6 +1,7 @@
 Name: libgcrypt
 Version: 1.4.4
-Release: 8%{?dist}
+Release: 9%{?dist}
+URL: http://www.gnupg.org/
 Source0: libgcrypt-%{version}-hobbled.tar.bz2
 # The original libgcrypt sources now contain potentially patented ECC
 # cipher support. We have to remove it in the tarball we ship with
@@ -24,7 +25,8 @@ Group: System Environment/Libraries
 %package devel
 Summary: Development files for the %{name} package
 Group: Development/Libraries
-PreReq: /sbin/install-info
+Requires(pre): /sbin/install-info
+Requires(post): /sbin/install-info
 Requires: libgpg-error-devel
 Requires: %{name} = %{version}-%{release}
 
@@ -45,6 +47,9 @@ applications using libgcrypt.
 %patch3 -p1 -b .padlock
 
 %build
+%ifarch s390
+%global optflags %optflags -fno-schedule-insns
+%endif
 %configure --disable-static \
 %ifarch sparc64
      --disable-asm \
@@ -148,6 +153,11 @@ exit 0
 %{_infodir}/gcrypt.info*
 
 %changelog
+
+* Mon Dec 21 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-9
+- Workaround for build on S390 (#548825)
+- Spec file cleanups
+
 * Tue Aug 11 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-8
 - fix warning when installed with --excludedocs (#515961)
 
@@ -223,7 +233,7 @@ exit 0
 - disable static libraries (part of #249815)
 
 * Fri Jul 27 2007 Nalin Dahyabhai <nalin at redhat.com> - 1.2.4-2
-- move libgcrypt shared library to /%{_lib} (#249815)
+- move libgcrypt shared library to /%%{_lib} (#249815)
 
 * Tue Feb  6 2007 Nalin Dahyabhai <nalin at redhat.com> - 1.2.4-1
 - update to 1.2.4



From hubbitus at fedoraproject.org  Mon Dec 21 08:26:47 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 08:26:47 +0000 (UTC)
Subject: rpms/qutim/F-11 import.log, NONE, 1.1 qutim.desktop, NONE,
	1.1 qutim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221082647.33CAA11C00E7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/qutim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6022/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qutim.desktop qutim.spec 
Log Message:
Initial import qutim into Fedora.


--- NEW FILE import.log ---
qutim-0_2_0-2_fc11:F-11:qutim-0.2.0-2.fc11.src.rpm:1261383967


--- NEW FILE qutim.desktop ---
[Desktop Entry]
Exec=qutim
Icon=qutim
Terminal=false
Type=Application
Categories=Qt;Network;InstantMessaging;

Name=QutIM
GenericName=Instant Messenger
GenericName[ru]=????????? ?????? ???????????
Comment=Instant messaging program
Comment[ru]=????????? ?????? ???????????

--- NEW FILE qutim.spec ---
%bcond_without gnutls
%bcond_without openssl

# Checkouted from several sources, so using date instead of revision number.
#% define SVN 20091018

Name:		qutim
Version:		0.2.0
Release:		2%{?SVN:SVN%{SVN}}%{?dist}
Summary:		Multiprotocol (ICQ, Jabber, IRC etc) instant messenger with modern Qt4 interface
Summary(ru):	???????????????????, ?????????????????? (ICQ, Jabber, IRC...) ?????????? ?? QT4
License:		GPLv2+ and CC-BY-SA
Group:		Applications/Internet
Url:			http://www.qutim.org/
Source0:		http://www.qutim.org/uploads/src/%{name}-%{version}.tar.bz2
Source1:		%{name}.desktop
Requires:		hicolor-icon-theme
BuildRequires:	cmake >= 2.6, desktop-file-utils
BuildRequires:	qt-devel >= 1:4.0, libidn-devel, dos2unix
%if %{with gnutls}
BuildRequires:	gnutls-devel
%endif
%if %{with openssl}
BuildRequires:	openssl-devel
%endif

BuildRequires:	gloox-devel >= 1:1.0-1

%description
qutIM - free open-source multiprotocol ( ICQ, Jabber/GTalk/
/Ya.Online/LiveJournal.com, Mail.Ru, IRC ) instant messenger for
Windows and Linux systems

%description -l ru
qutIM - ???????? ?????????????????? (??? ??????????????:
ICQ, Jabber, GTalk, Ya.Online, LiveJournal.com, Mail.Ru, IRC ??????
?????? ??????????? ??? Linux ? Windows.
??????? ? ???? ? ??????? ???? ??????, ???????, ???????, ???????? ?
??????????? ?? ???? ???????-????????.


%package		icq
Summary:		ICQ support for %{name}
Summary(ru):	ICQ ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	icq
ICQ support plugin for %{name}

%description	icq -l ru
????????? (??????) ????????? ICQ ??? %{name}


%package		irc
Summary:		IRC support for %{name}
Summary(ru):	IRC ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	irc
IRC support plugin for %{name}

%description	irc -l ru
????????? (??????) ????????? IRC ??? %{name}


%package		jabber
Summary:		Jabber support for %{name}
Summary(ru):	Jabber ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}
Requires:		gloox >= 1:1.0-1

%description	jabber
Jabber support plugin for qutIM

%description	jabber -l ru
????????? (??????) ????????? Jabber ??? %{name}


%package		mrim
Summary:		Mrim support for %{name}
Summary(ru):	Mrim ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	mrim
Mrim (Mail.ru agent) support plugin for %{name}

%description	mrim -l ru
????????? (??????) ????????? Mrim (Mail.ru agent) ??? %{name}


%package		histman
Summary:		Histman plugin for %{name}
Summary(ru):	Histman ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	histman
Histman - History Manager plugin for %{name}
Easy and fast convert your history from other IM-clients like:
QIP, Miranda, Pidgin, Kopete, Gajim, Psi and others!

%description	histman -l ru
?????? "???????? ???????" ??? %{name}
????? ? ?????? ????????????? ???? ??????? ?? ?????? ???????????????? ????????:
QIP, Miranda, Pidgin, Kopete, Gajim, Psi ? ?????? ??????!


%package		plugman
Summary:		Plugin Manager plugin for %{name}
Summary(ru):	Plugin Manager ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	plugman
Plugman - Plugin Manager plugin for %{name}
Allow you to easy install additional themes (skins), smile sets (including famous
and popular Kolobok), sound themes and other small usefulness, that helps do
qutIM better.

%description	plugman -l ru
?????? "???????? ????????" ??? %{name}
???????? ??? ????? ????????? ?????????????? ???? ??????????, ????????? ???????,
? ??? ????? ??? ???????????? ???? ???????, ???????? ???? ? ?????? ?????????
??????????, ?????????? ??????? qutIM ????????.


%package		vkontakte
Summary:		Vkontakte support for %{name}
Summary(ru):	Vkontakte ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	vkontakte
Vkontakte plugin to speak with vkontakte.ru users from %{name}

%description	vkontakte -l ru
????????? (??????) ??? ??????? ? ?????????????? vkontakte.ru ?? %{name}


%package		yandexnarod
Summary:		Yandexnarod plugin for %{name}
Summary(ru):	Yandexnarod ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	yandexnarod
Yandex.Narod - plugin for %{name}
Allow upload files to Yandex.Disk (http://narod.yandex.ru/disk) and send link
to it. What remarkably - allow to send files to offline contacts. Additional
allow to manage previosly uploaded files.

%description	yandexnarod -l ru
?????? Yandex.Narod ??? %{name}
?????? ????? ?? ??????.???? ? ???????? ??????????? ?? ???? ??????, ???
????????????? ? ??? ????? ????? ????? ? ????????????? ?? ? ????. ?????? ?????
????? ????????? ??? ???????????? ???????.

%package		devel
Summary:		Headers for %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}
Requires:		cmake

%description	devel
Headers for %{name}

%prep
%setup -q

# Gloox is shared, do not use bundled
rm -rf ./plugins/jabber/libs/

# Fix source files permissions to do not rpm compline spurious-executable-perm on -debuginfo sub package
find \( -name '*.cpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;

# Fix lineendings qtwin to avoid rpmlint complain wrong-script-end-of-line-encoding.
dos2unix src/3rdparty/qtwin/qtwin.{cpp,h}

%build
%{cmake} .

make

# Jabber
pushd plugins/jabber
	# Due to the BUG http://bugs.camaya.net/horde/whups/ticket/?id=163 we should add "-lpthread" manually.
	CXXFLAGS="%{optflags} `pkg-config --libs --cflags gloox` -lpthread" %{cmake} \
	%if %{with gnutls}
	-DGNUTLS=1 \
	%endif
	%if %{with openssl}
	-DOpenSSL=1 \
	%endif
	.
make
popd

	# All other plugins (which is not require additional parameters) and own
	# cmake buildsystem (other shold migrate to cmake priot 0.3 version)
	for plugin in mrim plugman; do
	pushd plugins/$plugin
	%{cmake} .
	make
	popd
	done

	# Build all plugins with qt4make buildsystem:
	for plugin in icq irc histman vkontakte yandexnarod; do
	pushd plugins/$plugin
	%{_qt4_qmake} -makefile -unix "QMAKE_CFLAGS+=%{optflags}" "QMAKE_CXXFLAGS+=%{optflags}" $plugin.pro
	make
	popd
	done



%install
rm -rf %{buildroot}

mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}%{_datadir}/%{name}/emoticons %{buildroot}%{_libdir}/%{name}
install -m 644 icons/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps
install -m 644 icons/%{name}_64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png

make install DESTDIR="%{buildroot}"

desktop-file-install \
	--add-category="Network" \
	--dir=%{buildroot}/%{_datadir}/applications \
	%{SOURCE1}

pushd plugins
	for plugin in icq irc mrim jabber histman plugman vkontakte yandexnarod; do
	install -m 755 $plugin/lib${plugin}.so %{buildroot}%{_libdir}/%{name}
	done
popd

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
	if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
	fi

%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,-)
%dir %{_libdir}/%{name}
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/pixmaps/%{name}.xpm
%doc COPYING AUTHORS CCBYSA GPL

%files icq
%defattr(-,root,root,-)
%doc plugins/icq/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libicq.so

%files irc
%defattr(-,root,root,-)
%doc plugins/irc/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libirc.so

%files jabber
%defattr(-,root,root,-)
%doc plugins/jabber/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libjabber.so

%files mrim
%defattr(-,root,root,-)
#% doc COPYING AUTHORS GPL
%{_libdir}/%{name}/libmrim.so

%files vkontakte
%defattr(-,root,root,-)
%doc plugins/vkontakte/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libvkontakte.so

%files histman
%defattr(-,root,root,-)
%doc plugins/histman/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libhistman.so

%files plugman
%defattr(-,root,root,-)
%doc plugins/plugman/{COPYING,COPYING.libs,AUTHORS,GPL,TODO,changelog}
%{_libdir}/%{name}/libplugman.so

%files yandexnarod
%defattr(-,root,root,-)
%doc plugins/yandexnarod/{COPYING,AUTHORS,GPL,README}
%{_libdir}/%{name}/libyandexnarod.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_datadir}/cmake/Modules/FindQutIM.cmake
%{_datadir}/cmake/Modules/qutimuic.cmake

%changelog
* Tue Dec 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-2
- Delete comment what qt >= 4.0 not enought and qt3-devel-0:3.3.8b-14.fc9.i386 also satisfy this, and epoch needed.
	It outdated since Fedora 9 EOL reached.
- As it is release version, change Release enumeration to 1 digit.

* Sun Nov 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.21
- Directory %%{_libdir}/%%{name} marked as %%dir in main package
- Icon placed to /apps subdir of %%{_datadir}/icons/hicolor/16x16/

* Wed Nov 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.20
- Correct paths for plugin docs.
- Remove all icons macroses as suggested by Peter and change its installation paths.
- Own %%{_libdir}/%%{name}
- In devel own full %%{_includedir}/%%{name} and don't mention each file.

* Fri Nov 13 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.19
- Delete invoke of ldconfig, because it is nt needed if libraries placed not in %%{_libdir} directly. By words of Peter Lemenkov.
- Delete unused macros _liconsdir

* Wed Nov 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.18
- Add epoch 1 in gloox requires.

* Sun Nov 8 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.17
- Update to long-awaited 0.2 release! But now it version enumerated as 0.2.0.
- Up BR gloox to 1.0-1 (release)
- Add new plugins - sub packages: histman, plugman, vkontakte, vkontakte, yandexnarod
- All incoming of %%{__make} replaced by direct make
- Delete BuildRoot tag - qutim is not intended to EPEL.
- Fedora review started - thanks to Peter Lemenkov.
- Fix source files permissions in %%prep to do not rpm compline spurious-executable-perm on -debuginfo sub package
- Add BR dos2unix and fix lineendings qtwin to avoid rpmlint complain wrong-script-end-of-line-encoding.
- Add Requires hicolor-icon-theme (for /usr/share/icons/hicolor/64x64/apps )
- Add Requires cmake ot -devel subpackage.
- Fill BUG on gloox http://bugs.camaya.net/horde/whups/ticket/?id=163 and to work around this problem add "-lpthread" flag to jabber-plugin options.

* Thu Oct 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.16.beta2SVN20091018
- Add %%{_hiconsdir}
- Replace %%{_icons64dir} by %%{_hiconsdir}/64x64/apps

* Tue Oct 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.15.beta2SVN20091018
- Rename package from qutIM to qutim and delete all dual names anywhere.

* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.14.beta2SVN20091018
- Build against new gloox-1.0rc3-0.8.SVNr4204
- Close http://trac.qutim.org/task/258
- New checkout SVN20091018
- Correct checkout process, icq and jabber plugins now have traditional branches and trunk directories.
- Delete # Fix path. Come from alt. Needed for 64-bit systems
	sed -i 's|lib/%%{name}|%%{_lib}/%%{name}|g' CMakeLists.txt src/pluginsystem.cpp plugins/jabber/CMakeLists.txt
	with hope it is not needed anymore.
- Delete cmake_flags define. cmake invoke replaced by macro %%cmake
- Fill and wait close https://mail.camaya.net/horde/whups/ticket/?id=157
- Add to %%doc files: AUTHORS, CCBYSA, GPL
- License changed from GPLv2 to "GPLv2+ and CCBYSA" according to COPYING.
- Add %%post/%%postun for each plugin subpackage.
- Add -devel subpackage and put in it files:
	%%{_includedir}/%%{lname}/iconmanagerinterface.h
	%%{_includedir}/%%{lname}/layerinterface.h
	%%{_includedir}/%%{lname}/layerscity.h
	%%{_includedir}/%%{lname}/plugininterface.h
	%%{_includedir}/%%{lname}/protocolinterface.h
	%%{_includedir}/%%{lname}/settings.h
	%%{_datadir}/cmake/Modules/FindQutIM.cmake
	%%{_datadir}/cmake/Modules/qutimuic.cmake
- Delete all sed rpath-cmake hacks, it is handled no in %%cmake macros.
- Delete %%doc plugins/mrim/TODO.txt in mrim. File does not exist anymore.

* Sat Sep 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.13.beta2SVN20090716
- Beta2 build SVN20090716.

* Thu Jul 16 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.12.betaSVN20090716
- Beta release come.
- Use svn export instaed of checkout to prepare tarball.
- Replace "%%makeinstall DESTDIR=%%{buildroot}" by more preferable "makei nstall DESTDIR=%%{buildroot}"
- Delete patch qutim-0.2-alpha-GCC4.4_missing_include.patch (fixed in rev316, http://qutim.org/flyspray/task/10)
	Remove temporary hack with separate jabber-plugin in Source2

* Mon Apr 6 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.11.alphaSVN20080404
- Add "-l gloox" into CXXFLAGS when jabber plugin build. It is not linked with our shared library instead.
- Delete explicit Requires: libidn (inspired by rpmlint)

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.10.alphaSVN20080404
- We build 0.2 alpha. It is built, but do not installable due bug: http://bugs.camaya.net/horde/whups/ticket/?id=137 (qutIM
	ship with bundled copy of gloox library). After separate gloox into another RPM package, we have another bug:
	http://qutim.org/flyspray/task/13 . QutIM jabber plugin developer fixing that in revision 305, but it is not build because API in
	gloox and qutIM changed. So, we must checkout all.
- Checkouted from several sources, so using date instead of revision number.
- Add SVN part into Release.
- Mrim plugin buildsystem changed to cmake too (was qmake-qt4)
- Direct qmake-qt4 replaced by macros %%{_qt4_qmake}

* Fri Apr 3 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.9.alpha
- Due to the BUG: qutIM-jabber-SVNr305.tar.bz2 Jaber plugin is not installable. Author say it is fixed in revision 305.
	Add Source2: qutIM-jabber-SVNr305.tar.bz2
- Patch1 is not needed anymore. Disabled. In talk with autor he make decision support external shared gloog installation and build
	scripts now (rev 305 also) contain automatically detect support for it.

* Wed Apr 1 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.8.alpha
- Add Requires: libidn and BuildRequires: libidn-devel after talk with qutIM developer.

* Sat Mar 28 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.7.alpha
- Due to the previousli mentioned bug, and also similar which I fill ( https://mail.camaya.net/horde/whups/ticket/?id=137 ), and
	at all, it is not well bundle into this package common library. So, I make decision pack gloox separately. For that:
	o Add Requires: gloox >= 1.0 (in jabber subpackage) and BuildRequires: gloox-devel >= 1.0 in main package
	o Delete Patch1: qutim-0.2-alpha-gloox-DNS.patch
	o Remove dir rm -rf ./plugins/jabber/libs/ in %%prep
	o Add Patch qutim-0.2-alpha.cut-off-gloox.patch to remove additional source dependencies.

* Fri Mar 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.6.alpha
- Add Patch1: qutim-0.2-alpha-gloox-DNS.patch to resolv installation error (build sucsessfull):
	error: Failed dependencies:
		libresolv.so.2(GLIBC_PRIVATE) is needed by qutIM-jabber-0.2-0.5.alpha.fc9.i386

* Thu Mar 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.5.alpha
- Add %%{?dist} into release.

* Thu Mar 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.4.alpha
- Exclude common RPATH from binary. Comment out all rpath-related strings in CMakeLists.txt
- Delete delete (added before) manipulation with CMakeCache.txt

* Wed Mar 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.3.alpha
- Rpmlint inspired tuning in this release.
- Group changed from "Networking/Instant messaging" to Applications/Internet
- Add documentation COPYING in main package and TODO.txt into mrim. Can't found any other.

* Tue Mar 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.2.alpha
- Add Patch0: qutim-0.2-alpha-GCC4.4_missing_include.patch to build on GCC 4.4. Build on rawhide with recent version of gcc.
	Build on dist-f10 now sucsessful.

* Mon Mar 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.1.alpha
- Initial import from ftp://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus/files/SRPMS/qutim-0.2-alt5.alpha.src.rpm
	( http://sisyphus.ru/srpm/Sisyphus/qutim/get )
- Version enumeration changed to - 0.2-0.1.alpha
- License chaged from GPL2 to GPLv2
- Source: %%name-%%version.tar
	changed to URL: Source:	http://qutim.org/uploads/qutim_0.2_alpha_source.tar.bz2
- qutim-0.2-alt.patch transformed to qutIM.desktop Source1
- Reformat spec with tabs.
- Delete:
	o Epoch: 2 tag
	o name from summary.
	o explicit Provides:	%%cname = %%version
	o Obsoletes:	%%cname <= 0.1-alt1.20080620 - it is a first import into Fedora.
	o %%define cname qutIM and anywhere use %%name instead.
	o Packager: Evgenii Terechkov <evg at altlinux.org>
	o # Automatically added by buildreq on Sun Jun 15 2008: BuildRequires: gcc-c++ libqt4-devel cmake
	o %%define _unpackaged_files_terminate_build 1
	o install in "%%makeinstall DESTDIR=%%{buildroot} install"
- Replace:
	o %%def_without gnutls to %%bcond_without gnutls
	o %%def_with openssl to %%bcond_without openssl
	o "%%if %%{with gnutls}" instead of alt "%%if_with gnutls"
	o "%%if %%{with openssl}" instead of alt "%%if_with openssl"
	o Direct mention of qutIM in description to %%name
	o %%make_build to simple %{__make}
	o BuildRequires: libssl-devel to BuildRequires: openssl-devel
	o BuildRequires: libgnutls-devel to BuildRequires: gnutls-devel
	o %%setup -n %%{name}-%%{version} to %%setup -qn %%( echo %%{name} | tr 'A-Z' 'a-z' )
	o %%prefix to %{_prefix}
	o ln %%{buildroot}%%{_bindir}/%%{lname} %%{buildroot}%%{_bindir}/%%{name}
		to
		ln -s %%{lname} %%{buildroot}%%{_bindir}/%%{name}
- Add:
	o Summary(ru) and Description -l ru for all packages.
	o BuildRequires: cmake >= 2.6
	o -q key in %%setup macro
	o BR qt-devel >= 1:4.0
	o BuildRoot: %%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n)
	o %%defattr(-, root, root, -) in each %%files section
	o %%{__rm} -rf %%{buildroot} in %%install section
	o %%clean section with "%%{__rm} -rf %%{buildroot}" content
	o #To avoid RPATH troubles: sed -i 's/CMAKE_SKIP_RPATH:BOOL=NO/CMAKE_SKIP_RPATH:BOOL=YES/' CMakeCache.txt
	o Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig
		and Post & Postun sections with ldconfig and icon-cache update.
	o Define Jpackage (Mandriva) macroses: _miconsdir, _iconsdir, _liconsdir
- For consistent usage brackets all (name, version, optflags ...) %%name replaced by %%{name}
- Correcthandle .desktop file:
	o Add BR desktop-file-utils
	o Use desktop-file-install instead of simple copy file and use (undefined) %%{_desktopdir}
- Install jabber as other plugins, do not any exclusions (was separate %%makeinstall).

* Wed Mar 18 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt5.alpha
- Build with OpenSSL by default (seems like gmail works only with openssl)
- Split package to plugins subpackages

* Fri Mar 13 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt4.alpha
- Missed optflags and make_build ressurected (thanks to drool@ again)

* Fri Mar 13 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt3.alpha
- Build with Gnutls support (thanks to drool@)

* Mon Mar  9 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt2.alpha
- x86_64 build "fixed" (Authors is idiots)
- bin/%%cname compat hardlink added

* Sun Mar  8 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt1.alpha
- 0.2 alpha

* Thu Jan 22 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.1.1-alt2
- Migrate to "one alt patch" gear scheme
- Update spec to new filetriggers system

* Sun Aug 17 2008 Terechkov Evgenii <evg at altlinux.ru> 2:0.1.1-alt1
- 0.1.1

* Sun Aug 17 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080720
- Svn revision: exported

* Sun Jul 20 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080720
- Svn revision: 174

* Wed Jul 09 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080709
- Svn revision: 154

* Wed Jul  2 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080702
- svn-20080702

* Mon Jun 30 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080629
- svn-20080629

* Tue Jun 24 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080624
- Package name changed due changes in upstream
- buildflags added (fix #16149)
- svn-20080624

* Fri Jun 20 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080620
- svn-20080620

* Wed Jun 18 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080618
- svn-20080618
- Obsoleted Patch1 removed (fixed in upstream)

* Wed Jun 18 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt3
- README.ALT included in binary package

* Tue Jun 17 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt2
- Patch1 added to look for emoicons in common dir (to hiddenman@)
- README.ALT added

* Sun Jun 15 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt1
- Initial build for ALT Linux Sisyphus


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 03:14:24 -0000	1.1
+++ .cvsignore	21 Dec 2009 08:26:47 -0000	1.2
@@ -0,0 +1 @@
+qutim-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 03:14:24 -0000	1.1
+++ sources	21 Dec 2009 08:26:47 -0000	1.2
@@ -0,0 +1 @@
+a0cf5b7bc1a8fd9e0a6a712d6f1b98e7  qutim-0.2.0.tar.bz2



From hubbitus at fedoraproject.org  Mon Dec 21 08:30:42 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 21 Dec 2009 08:30:42 +0000 (UTC)
Subject: rpms/qutim/F-12 import.log, NONE, 1.1 qutim.desktop, NONE,
	1.1 qutim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221083042.BA90211C02C4@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/qutim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6728/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qutim.desktop qutim.spec 
Log Message:
Initial import qutim into Fedora.


--- NEW FILE import.log ---
qutim-0_2_0-2_fc11:F-12:qutim-0.2.0-2.fc11.src.rpm:1261384085


--- NEW FILE qutim.desktop ---
[Desktop Entry]
Exec=qutim
Icon=qutim
Terminal=false
Type=Application
Categories=Qt;Network;InstantMessaging;

Name=QutIM
GenericName=Instant Messenger
GenericName[ru]=????????? ?????? ???????????
Comment=Instant messaging program
Comment[ru]=????????? ?????? ???????????

--- NEW FILE qutim.spec ---
%bcond_without gnutls
%bcond_without openssl

# Checkouted from several sources, so using date instead of revision number.
#% define SVN 20091018

Name:		qutim
Version:		0.2.0
Release:		2%{?SVN:SVN%{SVN}}%{?dist}
Summary:		Multiprotocol (ICQ, Jabber, IRC etc) instant messenger with modern Qt4 interface
Summary(ru):	???????????????????, ?????????????????? (ICQ, Jabber, IRC...) ?????????? ?? QT4
License:		GPLv2+ and CC-BY-SA
Group:		Applications/Internet
Url:			http://www.qutim.org/
Source0:		http://www.qutim.org/uploads/src/%{name}-%{version}.tar.bz2
Source1:		%{name}.desktop
Requires:		hicolor-icon-theme
BuildRequires:	cmake >= 2.6, desktop-file-utils
BuildRequires:	qt-devel >= 1:4.0, libidn-devel, dos2unix
%if %{with gnutls}
BuildRequires:	gnutls-devel
%endif
%if %{with openssl}
BuildRequires:	openssl-devel
%endif

BuildRequires:	gloox-devel >= 1:1.0-1

%description
qutIM - free open-source multiprotocol ( ICQ, Jabber/GTalk/
/Ya.Online/LiveJournal.com, Mail.Ru, IRC ) instant messenger for
Windows and Linux systems

%description -l ru
qutIM - ???????? ?????????????????? (??? ??????????????:
ICQ, Jabber, GTalk, Ya.Online, LiveJournal.com, Mail.Ru, IRC ??????
?????? ??????????? ??? Linux ? Windows.
??????? ? ???? ? ??????? ???? ??????, ???????, ???????, ???????? ?
??????????? ?? ???? ???????-????????.


%package		icq
Summary:		ICQ support for %{name}
Summary(ru):	ICQ ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	icq
ICQ support plugin for %{name}

%description	icq -l ru
????????? (??????) ????????? ICQ ??? %{name}


%package		irc
Summary:		IRC support for %{name}
Summary(ru):	IRC ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	irc
IRC support plugin for %{name}

%description	irc -l ru
????????? (??????) ????????? IRC ??? %{name}


%package		jabber
Summary:		Jabber support for %{name}
Summary(ru):	Jabber ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}
Requires:		gloox >= 1:1.0-1

%description	jabber
Jabber support plugin for qutIM

%description	jabber -l ru
????????? (??????) ????????? Jabber ??? %{name}


%package		mrim
Summary:		Mrim support for %{name}
Summary(ru):	Mrim ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	mrim
Mrim (Mail.ru agent) support plugin for %{name}

%description	mrim -l ru
????????? (??????) ????????? Mrim (Mail.ru agent) ??? %{name}


%package		histman
Summary:		Histman plugin for %{name}
Summary(ru):	Histman ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	histman
Histman - History Manager plugin for %{name}
Easy and fast convert your history from other IM-clients like:
QIP, Miranda, Pidgin, Kopete, Gajim, Psi and others!

%description	histman -l ru
?????? "???????? ???????" ??? %{name}
????? ? ?????? ????????????? ???? ??????? ?? ?????? ???????????????? ????????:
QIP, Miranda, Pidgin, Kopete, Gajim, Psi ? ?????? ??????!


%package		plugman
Summary:		Plugin Manager plugin for %{name}
Summary(ru):	Plugin Manager ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	plugman
Plugman - Plugin Manager plugin for %{name}
Allow you to easy install additional themes (skins), smile sets (including famous
and popular Kolobok), sound themes and other small usefulness, that helps do
qutIM better.

%description	plugman -l ru
?????? "???????? ????????" ??? %{name}
???????? ??? ????? ????????? ?????????????? ???? ??????????, ????????? ???????,
? ??? ????? ??? ???????????? ???? ???????, ???????? ???? ? ?????? ?????????
??????????, ?????????? ??????? qutIM ????????.


%package		vkontakte
Summary:		Vkontakte support for %{name}
Summary(ru):	Vkontakte ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	vkontakte
Vkontakte plugin to speak with vkontakte.ru users from %{name}

%description	vkontakte -l ru
????????? (??????) ??? ??????? ? ?????????????? vkontakte.ru ?? %{name}


%package		yandexnarod
Summary:		Yandexnarod plugin for %{name}
Summary(ru):	Yandexnarod ?????? ??? %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}

%description	yandexnarod
Yandex.Narod - plugin for %{name}
Allow upload files to Yandex.Disk (http://narod.yandex.ru/disk) and send link
to it. What remarkably - allow to send files to offline contacts. Additional
allow to manage previosly uploaded files.

%description	yandexnarod -l ru
?????? Yandex.Narod ??? %{name}
?????? ????? ?? ??????.???? ? ???????? ??????????? ?? ???? ??????, ???
????????????? ? ??? ????? ????? ????? ? ????????????? ?? ? ????. ?????? ?????
????? ????????? ??? ???????????? ???????.

%package		devel
Summary:		Headers for %{name}
Group:		Applications/Internet
Requires:		%{name} = %{version}-%{release}
Requires:		cmake

%description	devel
Headers for %{name}

%prep
%setup -q

# Gloox is shared, do not use bundled
rm -rf ./plugins/jabber/libs/

# Fix source files permissions to do not rpm compline spurious-executable-perm on -debuginfo sub package
find \( -name '*.cpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;

# Fix lineendings qtwin to avoid rpmlint complain wrong-script-end-of-line-encoding.
dos2unix src/3rdparty/qtwin/qtwin.{cpp,h}

%build
%{cmake} .

make

# Jabber
pushd plugins/jabber
	# Due to the BUG http://bugs.camaya.net/horde/whups/ticket/?id=163 we should add "-lpthread" manually.
	CXXFLAGS="%{optflags} `pkg-config --libs --cflags gloox` -lpthread" %{cmake} \
	%if %{with gnutls}
	-DGNUTLS=1 \
	%endif
	%if %{with openssl}
	-DOpenSSL=1 \
	%endif
	.
make
popd

	# All other plugins (which is not require additional parameters) and own
	# cmake buildsystem (other shold migrate to cmake priot 0.3 version)
	for plugin in mrim plugman; do
	pushd plugins/$plugin
	%{cmake} .
	make
	popd
	done

	# Build all plugins with qt4make buildsystem:
	for plugin in icq irc histman vkontakte yandexnarod; do
	pushd plugins/$plugin
	%{_qt4_qmake} -makefile -unix "QMAKE_CFLAGS+=%{optflags}" "QMAKE_CXXFLAGS+=%{optflags}" $plugin.pro
	make
	popd
	done



%install
rm -rf %{buildroot}

mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}%{_datadir}/%{name}/emoticons %{buildroot}%{_libdir}/%{name}
install -m 644 icons/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps
install -m 644 icons/%{name}_64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png

make install DESTDIR="%{buildroot}"

desktop-file-install \
	--add-category="Network" \
	--dir=%{buildroot}/%{_datadir}/applications \
	%{SOURCE1}

pushd plugins
	for plugin in icq irc mrim jabber histman plugman vkontakte yandexnarod; do
	install -m 755 $plugin/lib${plugin}.so %{buildroot}%{_libdir}/%{name}
	done
popd

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
	if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
	fi

%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,-)
%dir %{_libdir}/%{name}
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/pixmaps/%{name}.xpm
%doc COPYING AUTHORS CCBYSA GPL

%files icq
%defattr(-,root,root,-)
%doc plugins/icq/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libicq.so

%files irc
%defattr(-,root,root,-)
%doc plugins/irc/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libirc.so

%files jabber
%defattr(-,root,root,-)
%doc plugins/jabber/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libjabber.so

%files mrim
%defattr(-,root,root,-)
#% doc COPYING AUTHORS GPL
%{_libdir}/%{name}/libmrim.so

%files vkontakte
%defattr(-,root,root,-)
%doc plugins/vkontakte/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libvkontakte.so

%files histman
%defattr(-,root,root,-)
%doc plugins/histman/{COPYING,AUTHORS,GPL}
%{_libdir}/%{name}/libhistman.so

%files plugman
%defattr(-,root,root,-)
%doc plugins/plugman/{COPYING,COPYING.libs,AUTHORS,GPL,TODO,changelog}
%{_libdir}/%{name}/libplugman.so

%files yandexnarod
%defattr(-,root,root,-)
%doc plugins/yandexnarod/{COPYING,AUTHORS,GPL,README}
%{_libdir}/%{name}/libyandexnarod.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_datadir}/cmake/Modules/FindQutIM.cmake
%{_datadir}/cmake/Modules/qutimuic.cmake

%changelog
* Tue Dec 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-2
- Delete comment what qt >= 4.0 not enought and qt3-devel-0:3.3.8b-14.fc9.i386 also satisfy this, and epoch needed.
	It outdated since Fedora 9 EOL reached.
- As it is release version, change Release enumeration to 1 digit.

* Sun Nov 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.21
- Directory %%{_libdir}/%%{name} marked as %%dir in main package
- Icon placed to /apps subdir of %%{_datadir}/icons/hicolor/16x16/

* Wed Nov 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.20
- Correct paths for plugin docs.
- Remove all icons macroses as suggested by Peter and change its installation paths.
- Own %%{_libdir}/%%{name}
- In devel own full %%{_includedir}/%%{name} and don't mention each file.

* Fri Nov 13 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.19
- Delete invoke of ldconfig, because it is nt needed if libraries placed not in %%{_libdir} directly. By words of Peter Lemenkov.
- Delete unused macros _liconsdir

* Wed Nov 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.18
- Add epoch 1 in gloox requires.

* Sun Nov 8 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-1.17
- Update to long-awaited 0.2 release! But now it version enumerated as 0.2.0.
- Up BR gloox to 1.0-1 (release)
- Add new plugins - sub packages: histman, plugman, vkontakte, vkontakte, yandexnarod
- All incoming of %%{__make} replaced by direct make
- Delete BuildRoot tag - qutim is not intended to EPEL.
- Fedora review started - thanks to Peter Lemenkov.
- Fix source files permissions in %%prep to do not rpm compline spurious-executable-perm on -debuginfo sub package
- Add BR dos2unix and fix lineendings qtwin to avoid rpmlint complain wrong-script-end-of-line-encoding.
- Add Requires hicolor-icon-theme (for /usr/share/icons/hicolor/64x64/apps )
- Add Requires cmake ot -devel subpackage.
- Fill BUG on gloox http://bugs.camaya.net/horde/whups/ticket/?id=163 and to work around this problem add "-lpthread" flag to jabber-plugin options.

* Thu Oct 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.16.beta2SVN20091018
- Add %%{_hiconsdir}
- Replace %%{_icons64dir} by %%{_hiconsdir}/64x64/apps

* Tue Oct 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.15.beta2SVN20091018
- Rename package from qutIM to qutim and delete all dual names anywhere.

* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.14.beta2SVN20091018
- Build against new gloox-1.0rc3-0.8.SVNr4204
- Close http://trac.qutim.org/task/258
- New checkout SVN20091018
- Correct checkout process, icq and jabber plugins now have traditional branches and trunk directories.
- Delete # Fix path. Come from alt. Needed for 64-bit systems
	sed -i 's|lib/%%{name}|%%{_lib}/%%{name}|g' CMakeLists.txt src/pluginsystem.cpp plugins/jabber/CMakeLists.txt
	with hope it is not needed anymore.
- Delete cmake_flags define. cmake invoke replaced by macro %%cmake
- Fill and wait close https://mail.camaya.net/horde/whups/ticket/?id=157
- Add to %%doc files: AUTHORS, CCBYSA, GPL
- License changed from GPLv2 to "GPLv2+ and CCBYSA" according to COPYING.
- Add %%post/%%postun for each plugin subpackage.
- Add -devel subpackage and put in it files:
	%%{_includedir}/%%{lname}/iconmanagerinterface.h
	%%{_includedir}/%%{lname}/layerinterface.h
	%%{_includedir}/%%{lname}/layerscity.h
	%%{_includedir}/%%{lname}/plugininterface.h
	%%{_includedir}/%%{lname}/protocolinterface.h
	%%{_includedir}/%%{lname}/settings.h
	%%{_datadir}/cmake/Modules/FindQutIM.cmake
	%%{_datadir}/cmake/Modules/qutimuic.cmake
- Delete all sed rpath-cmake hacks, it is handled no in %%cmake macros.
- Delete %%doc plugins/mrim/TODO.txt in mrim. File does not exist anymore.

* Sat Sep 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.13.beta2SVN20090716
- Beta2 build SVN20090716.

* Thu Jul 16 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.12.betaSVN20090716
- Beta release come.
- Use svn export instaed of checkout to prepare tarball.
- Replace "%%makeinstall DESTDIR=%%{buildroot}" by more preferable "makei nstall DESTDIR=%%{buildroot}"
- Delete patch qutim-0.2-alpha-GCC4.4_missing_include.patch (fixed in rev316, http://qutim.org/flyspray/task/10)
	Remove temporary hack with separate jabber-plugin in Source2

* Mon Apr 6 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.11.alphaSVN20080404
- Add "-l gloox" into CXXFLAGS when jabber plugin build. It is not linked with our shared library instead.
- Delete explicit Requires: libidn (inspired by rpmlint)

* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.10.alphaSVN20080404
- We build 0.2 alpha. It is built, but do not installable due bug: http://bugs.camaya.net/horde/whups/ticket/?id=137 (qutIM
	ship with bundled copy of gloox library). After separate gloox into another RPM package, we have another bug:
	http://qutim.org/flyspray/task/13 . QutIM jabber plugin developer fixing that in revision 305, but it is not build because API in
	gloox and qutIM changed. So, we must checkout all.
- Checkouted from several sources, so using date instead of revision number.
- Add SVN part into Release.
- Mrim plugin buildsystem changed to cmake too (was qmake-qt4)
- Direct qmake-qt4 replaced by macros %%{_qt4_qmake}

* Fri Apr 3 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.9.alpha
- Due to the BUG: qutIM-jabber-SVNr305.tar.bz2 Jaber plugin is not installable. Author say it is fixed in revision 305.
	Add Source2: qutIM-jabber-SVNr305.tar.bz2
- Patch1 is not needed anymore. Disabled. In talk with autor he make decision support external shared gloog installation and build
	scripts now (rev 305 also) contain automatically detect support for it.

* Wed Apr 1 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.8.alpha
- Add Requires: libidn and BuildRequires: libidn-devel after talk with qutIM developer.

* Sat Mar 28 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.7.alpha
- Due to the previousli mentioned bug, and also similar which I fill ( https://mail.camaya.net/horde/whups/ticket/?id=137 ), and
	at all, it is not well bundle into this package common library. So, I make decision pack gloox separately. For that:
	o Add Requires: gloox >= 1.0 (in jabber subpackage) and BuildRequires: gloox-devel >= 1.0 in main package
	o Delete Patch1: qutim-0.2-alpha-gloox-DNS.patch
	o Remove dir rm -rf ./plugins/jabber/libs/ in %%prep
	o Add Patch qutim-0.2-alpha.cut-off-gloox.patch to remove additional source dependencies.

* Fri Mar 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.6.alpha
- Add Patch1: qutim-0.2-alpha-gloox-DNS.patch to resolv installation error (build sucsessfull):
	error: Failed dependencies:
		libresolv.so.2(GLIBC_PRIVATE) is needed by qutIM-jabber-0.2-0.5.alpha.fc9.i386

* Thu Mar 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.5.alpha
- Add %%{?dist} into release.

* Thu Mar 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.4.alpha
- Exclude common RPATH from binary. Comment out all rpath-related strings in CMakeLists.txt
- Delete delete (added before) manipulation with CMakeCache.txt

* Wed Mar 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.3.alpha
- Rpmlint inspired tuning in this release.
- Group changed from "Networking/Instant messaging" to Applications/Internet
- Add documentation COPYING in main package and TODO.txt into mrim. Can't found any other.

* Tue Mar 24 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.2.alpha
- Add Patch0: qutim-0.2-alpha-GCC4.4_missing_include.patch to build on GCC 4.4. Build on rawhide with recent version of gcc.
	Build on dist-f10 now sucsessful.

* Mon Mar 23 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2-0.1.alpha
- Initial import from ftp://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus/files/SRPMS/qutim-0.2-alt5.alpha.src.rpm
	( http://sisyphus.ru/srpm/Sisyphus/qutim/get )
- Version enumeration changed to - 0.2-0.1.alpha
- License chaged from GPL2 to GPLv2
- Source: %%name-%%version.tar
	changed to URL: Source:	http://qutim.org/uploads/qutim_0.2_alpha_source.tar.bz2
- qutim-0.2-alt.patch transformed to qutIM.desktop Source1
- Reformat spec with tabs.
- Delete:
	o Epoch: 2 tag
	o name from summary.
	o explicit Provides:	%%cname = %%version
	o Obsoletes:	%%cname <= 0.1-alt1.20080620 - it is a first import into Fedora.
	o %%define cname qutIM and anywhere use %%name instead.
	o Packager: Evgenii Terechkov <evg at altlinux.org>
	o # Automatically added by buildreq on Sun Jun 15 2008: BuildRequires: gcc-c++ libqt4-devel cmake
	o %%define _unpackaged_files_terminate_build 1
	o install in "%%makeinstall DESTDIR=%%{buildroot} install"
- Replace:
	o %%def_without gnutls to %%bcond_without gnutls
	o %%def_with openssl to %%bcond_without openssl
	o "%%if %%{with gnutls}" instead of alt "%%if_with gnutls"
	o "%%if %%{with openssl}" instead of alt "%%if_with openssl"
	o Direct mention of qutIM in description to %%name
	o %%make_build to simple %{__make}
	o BuildRequires: libssl-devel to BuildRequires: openssl-devel
	o BuildRequires: libgnutls-devel to BuildRequires: gnutls-devel
	o %%setup -n %%{name}-%%{version} to %%setup -qn %%( echo %%{name} | tr 'A-Z' 'a-z' )
	o %%prefix to %{_prefix}
	o ln %%{buildroot}%%{_bindir}/%%{lname} %%{buildroot}%%{_bindir}/%%{name}
		to
		ln -s %%{lname} %%{buildroot}%%{_bindir}/%%{name}
- Add:
	o Summary(ru) and Description -l ru for all packages.
	o BuildRequires: cmake >= 2.6
	o -q key in %%setup macro
	o BR qt-devel >= 1:4.0
	o BuildRoot: %%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n)
	o %%defattr(-, root, root, -) in each %%files section
	o %%{__rm} -rf %%{buildroot} in %%install section
	o %%clean section with "%%{__rm} -rf %%{buildroot}" content
	o #To avoid RPATH troubles: sed -i 's/CMAKE_SKIP_RPATH:BOOL=NO/CMAKE_SKIP_RPATH:BOOL=YES/' CMakeCache.txt
	o Requires(postun):	/sbin/ldconfig, Requires(post):	/sbin/ldconfig
		and Post & Postun sections with ldconfig and icon-cache update.
	o Define Jpackage (Mandriva) macroses: _miconsdir, _iconsdir, _liconsdir
- For consistent usage brackets all (name, version, optflags ...) %%name replaced by %%{name}
- Correcthandle .desktop file:
	o Add BR desktop-file-utils
	o Use desktop-file-install instead of simple copy file and use (undefined) %%{_desktopdir}
- Install jabber as other plugins, do not any exclusions (was separate %%makeinstall).

* Wed Mar 18 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt5.alpha
- Build with OpenSSL by default (seems like gmail works only with openssl)
- Split package to plugins subpackages

* Fri Mar 13 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt4.alpha
- Missed optflags and make_build ressurected (thanks to drool@ again)

* Fri Mar 13 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt3.alpha
- Build with Gnutls support (thanks to drool@)

* Mon Mar  9 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt2.alpha
- x86_64 build "fixed" (Authors is idiots)
- bin/%%cname compat hardlink added

* Sun Mar  8 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.2-alt1.alpha
- 0.2 alpha

* Thu Jan 22 2009 Terechkov Evgenii <evg at altlinux.ru> 2:0.1.1-alt2
- Migrate to "one alt patch" gear scheme
- Update spec to new filetriggers system

* Sun Aug 17 2008 Terechkov Evgenii <evg at altlinux.ru> 2:0.1.1-alt1
- 0.1.1

* Sun Aug 17 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080720
- Svn revision: exported

* Sun Jul 20 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080720
- Svn revision: 174

* Wed Jul 09 2008 Evgenii Terechkov <evg at altlinux.ru> 1:0.1-alt1.20080709
- Svn revision: 154

* Wed Jul  2 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080702
- svn-20080702

* Mon Jun 30 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080629
- svn-20080629

* Tue Jun 24 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080624
- Package name changed due changes in upstream
- buildflags added (fix #16149)
- svn-20080624

* Fri Jun 20 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080620
- svn-20080620

* Wed Jun 18 2008 Terechkov Evgenii <evg at altlinux.ru> 1:0.1-alt1.20080618
- svn-20080618
- Obsoleted Patch1 removed (fixed in upstream)

* Wed Jun 18 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt3
- README.ALT included in binary package

* Tue Jun 17 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt2
- Patch1 added to look for emoicons in common dir (to hiddenman@)
- README.ALT added

* Sun Jun 15 2008 Terechkov Evgenii <evg at altlinux.ru> 0.1-alt1
- Initial build for ALT Linux Sisyphus


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 03:14:24 -0000	1.1
+++ .cvsignore	21 Dec 2009 08:30:42 -0000	1.2
@@ -0,0 +1 @@
+qutim-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 03:14:24 -0000	1.1
+++ sources	21 Dec 2009 08:30:42 -0000	1.2
@@ -0,0 +1 @@
+a0cf5b7bc1a8fd9e0a6a712d6f1b98e7  qutim-0.2.0.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec 21 08:32:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 08:32:15 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091221083206.6035B10F841@bastion.fedoraproject.org>

Package python-rabbyt in Fedora devel is now owned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From pkgdb at fedoraproject.org  Mon Dec 21 08:32:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 08:32:20 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091221083211.6503110F841@bastion.fedoraproject.org>

Package python-rabbyt in Fedora devel was orphaned by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From tmraz at fedoraproject.org  Mon Dec 21 08:44:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 21 Dec 2009 08:44:45 +0000 (UTC)
Subject: File libgcrypt-1.4.5-hobbled.tar.bz2 uploaded to lookaside cache by
	tmraz
Message-ID: <20091221084445.DF98D10F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libgcrypt:

56a36e06fff2ed0a3b07c901a907db5f  libgcrypt-1.4.5-hobbled.tar.bz2



From tmraz at fedoraproject.org  Mon Dec 21 08:46:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 21 Dec 2009 08:46:43 +0000 (UTC)
Subject: rpms/libgcrypt/devel .cvsignore, 1.13, 1.14 libgcrypt.spec, 1.42,
	1.43 sources, 1.13, 1.14 libgcrypt-1.4.4-fips-no-access.patch,
	1.1, NONE libgcrypt-1.4.4-padlock.patch, 1.1, NONE
Message-ID: <20091221084643.51A2211C00E7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9193

Modified Files:
	.cvsignore libgcrypt.spec sources 
Removed Files:
	libgcrypt-1.4.4-fips-no-access.patch 
	libgcrypt-1.4.4-padlock.patch 
Log Message:
* Mon Dec 21 2009 Tomas Mraz <tmraz at redhat.com> 1.4.5-1
- workaround for build on S390 (#548825)
- spec file cleanups
- upgrade to new minor upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	30 Jan 2009 10:44:24 -0000	1.13
+++ .cvsignore	21 Dec 2009 08:46:43 -0000	1.14
@@ -1 +1 @@
-libgcrypt-1.4.4-hobbled.tar.bz2
+libgcrypt-1.4.5-hobbled.tar.bz2


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- libgcrypt.spec	21 Dec 2009 08:26:28 -0000	1.42
+++ libgcrypt.spec	21 Dec 2009 08:46:43 -0000	1.43
@@ -1,6 +1,6 @@
 Name: libgcrypt
-Version: 1.4.4
-Release: 9%{?dist}
+Version: 1.4.5
+Release: 1%{?dist}
 URL: http://www.gnupg.org/
 Source0: libgcrypt-%{version}-hobbled.tar.bz2
 # The original libgcrypt sources now contain potentially patented ECC
@@ -10,9 +10,7 @@ Source0: libgcrypt-%{version}-hobbled.ta
 #Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
 Source2: wk at g10code.com
 Source3: hobble-libgcrypt
-Patch1: libgcrypt-1.4.4-fips-no-access.patch
 Patch2: libgcrypt-1.4.4-use-fipscheck.patch
-Patch3: libgcrypt-1.4.4-padlock.patch
 
 # Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction.
 License: LGPLv2+
@@ -42,9 +40,7 @@ applications using libgcrypt.
 %prep
 %setup -q
 %{SOURCE3}
-%patch1 -p1 -b .no-access
 %patch2 -p1 -b .use-fipscheck
-%patch3 -p1 -b .padlock
 
 %build
 %ifarch s390
@@ -56,7 +52,8 @@ applications using libgcrypt.
 %endif
      --enable-noexecstack \
      --enable-hmac-binary-check \
-     --enable-pubkey-ciphers='dsa elgamal rsa'
+     --enable-pubkey-ciphers='dsa elgamal rsa' \
+     --disable-O-flag-munging
 make %{?_smp_mflags}
 
 %check
@@ -153,10 +150,10 @@ exit 0
 %{_infodir}/gcrypt.info*
 
 %changelog
-
-* Mon Dec 21 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-9
-- Workaround for build on S390 (#548825)
-- Spec file cleanups
+* Mon Dec 21 2009 Tomas Mraz <tmraz at redhat.com> 1.4.5-1
+- workaround for build on S390 (#548825)
+- spec file cleanups
+- upgrade to new minor upstream release
 
 * Tue Aug 11 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-8
 - fix warning when installed with --excludedocs (#515961)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	30 Jan 2009 10:44:24 -0000	1.13
+++ sources	21 Dec 2009 08:46:43 -0000	1.14
@@ -1 +1 @@
-12d3fec91c663b541d63e34eabddacc5  libgcrypt-1.4.4-hobbled.tar.bz2
+56a36e06fff2ed0a3b07c901a907db5f  libgcrypt-1.4.5-hobbled.tar.bz2


--- libgcrypt-1.4.4-fips-no-access.patch DELETED ---


--- libgcrypt-1.4.4-padlock.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Dec 21 08:46:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 08:46:53 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091221084644.38F8410F83D@bastion.fedoraproject.org>

Package griv in Fedora devel is now owned by tannhauser

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Mon Dec 21 08:51:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 08:51:48 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091221085138.EBF2010F83D@bastion.fedoraproject.org>

Package griv in Fedora 12 is now owned by tannhauser

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Mon Dec 21 08:51:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 08:51:58 +0000
Subject: [pkgdb] griv ownership updated
Message-ID: <20091221085149.77B6510F841@bastion.fedoraproject.org>

Package griv in Fedora 11 is now owned by tannhauser

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griv



From pkgdb at fedoraproject.org  Mon Dec 21 08:52:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 08:52:21 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091221085212.166DB10F83D@bastion.fedoraproject.org>

Package python-rabbyt in Fedora devel is now owned by tannhauser

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From pkgdb at fedoraproject.org  Mon Dec 21 08:52:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 08:52:39 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091221085230.7E95510F83D@bastion.fedoraproject.org>

Package python-rabbyt in Fedora 12 is now owned by tannhauser

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From pkgdb at fedoraproject.org  Mon Dec 21 08:52:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 08:52:45 +0000
Subject: [pkgdb] python-rabbyt ownership updated
Message-ID: <20091221085235.8889A10F83D@bastion.fedoraproject.org>

Package python-rabbyt in Fedora 11 is now owned by tannhauser

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-rabbyt



From varekova at fedoraproject.org  Mon Dec 21 09:02:58 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 21 Dec 2009 09:02:58 +0000 (UTC)
Subject: rpms/mailx/devel mailx.spec,1.37,1.38
Message-ID: <20091221090258.5D34B11C00E7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/mailx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11618

Modified Files:
	mailx.spec 
Log Message:
- fix source tag



Index: mailx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- mailx.spec	18 Dec 2009 08:00:20 -0000	1.37
+++ mailx.spec	21 Dec 2009 09:02:58 -0000	1.38
@@ -4,13 +4,13 @@
 Summary: Enhanced implementation of the mailx command
 Name: mailx
 Version: 12.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: 	Applications/Internet
 # mailx-12.4/nsserr.c, mailx-12.4/nss.c  have MPLv1.1 license 
 # other files are BSD 
 License: BSD with advertising and MPLv1.1
 URL: http://heirloom.sourceforge.net/mailx.html
-Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/heirloom/mailx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: nail-11.25-config.patch
 Patch1: mailx-12.3-pager.patch
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12.4-6
+- fix source tag
+
 * Fri Dec 18 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 12.4-5
 - fix license tag
 



From pkgdb at fedoraproject.org  Mon Dec 21 09:03:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 09:03:24 +0000
Subject: [pkgdb] grnotify ownership updated
Message-ID: <20091221090315.C9AB510F841@bastion.fedoraproject.org>

Package grnotify in Fedora devel was orphaned by llaumgui

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grnotify



From pkgdb at fedoraproject.org  Mon Dec 21 09:03:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 09:03:25 +0000
Subject: [pkgdb] grnotify (un)retirement
Message-ID: <20091221090316.7D79910F85E@bastion.fedoraproject.org>

Package grnotify in Fedora devel has been retired by llaumgui

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grnotify



From pkgdb at fedoraproject.org  Mon Dec 21 09:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 09:03:33 +0000
Subject: [pkgdb] grnotify (un)retirement
Message-ID: <20091221090324.2A92B10F862@bastion.fedoraproject.org>

Package grnotify in Fedora 12 has been retired by llaumgui

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grnotify



From pkgdb at fedoraproject.org  Mon Dec 21 09:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 09:03:32 +0000
Subject: [pkgdb] grnotify ownership updated
Message-ID: <20091221090323.7B72710F85E@bastion.fedoraproject.org>

Package grnotify in Fedora 12 was orphaned by llaumgui

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grnotify



From stransky at fedoraproject.org  Mon Dec 21 09:12:40 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon, 21 Dec 2009 09:12:40 +0000 (UTC)
Subject: File xulrunner-1.9.2.1b5.source.tar.bz2 uploaded to lookaside cache
	by stransky
Message-ID: <20091221091240.ED68110F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xulrunner:

381a897e16579a47250dee9342353f37  xulrunner-1.9.2.1b5.source.tar.bz2



From stransky at fedoraproject.org  Mon Dec 21 09:13:47 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon, 21 Dec 2009 09:13:47 +0000 (UTC)
Subject: rpms/xulrunner/devel .cvsignore, 1.76, 1.77 sources, 1.79,
	1.80 xulrunner.spec, 1.187, 1.188
Message-ID: <20091221091347.DF67C11C00E7@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13488

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.2.1 Beta 5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	27 Nov 2009 09:39:34 -0000	1.76
+++ .cvsignore	21 Dec 2009 09:13:47 -0000	1.77
@@ -6,3 +6,4 @@ xulrunner-1.9.1.5-source.tar.bz2
 xulrunner-1.9.2.1b2.source.tar.bz2
 xulrunner-1.9.2.1b3.source.tar.bz2
 xulrunner-1.9.2.1b4.source.tar.bz2
+xulrunner-1.9.2.1b5.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	27 Nov 2009 09:39:34 -0000	1.79
+++ sources	21 Dec 2009 09:13:47 -0000	1.80
@@ -1 +1,2 @@
 770d0a33e4e2ceb52017c59d98c4d28c  xulrunner-1.9.2.1b4.source.tar.bz2
+381a897e16579a47250dee9342353f37  xulrunner-1.9.2.1b5.source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- xulrunner.spec	17 Dec 2009 08:47:08 -0000	1.187
+++ xulrunner.spec	21 Dec 2009 09:13:47 -0000	1.188
@@ -11,13 +11,13 @@
 
 %define version_internal  1.9.2
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
-%define pretag            b4
+%define pretag            b5
 
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.2.1
-Release:        0.7.%{?pretag}%{?dist}
+Release:        0.8.%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -406,6 +406,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Dec 21 2009 Martin Stransky <stransky at redhat.com> 1.9.2.1-0.8.b5
+- Update to 1.9.2.1 Beta 5
+
 * Thu Dec 17 2009 Martin Stransky <stransky at redhat.com> 1.9.2.1-0.7.b4
 - Added fix for mozbz#543585 - jemalloc alignment assertion 
   and abort on Linux



From varekova at fedoraproject.org  Mon Dec 21 09:23:16 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 21 Dec 2009 09:23:16 +0000 (UTC)
Subject: rpms/man-pages-ru/F-12 man-pages-ru.spec,1.19,1.20
Message-ID: <20091221092316.731FA11C00E7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages-ru/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15036

Modified Files:
	man-pages-ru.spec 
Log Message:
- fix source tag




Index: man-pages-ru.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ru/F-12/man-pages-ru.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- man-pages-ru.spec	25 Jul 2009 11:44:51 -0000	1.19
+++ man-pages-ru.spec	21 Dec 2009 09:23:15 -0000	1.20
@@ -1,12 +1,15 @@
 Summary: Russian man pages from the Linux Documentation Project
 Name: man-pages-ru
 Version: 0.97
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and GPL+ and MIT
 Group: Documentation
 URL: http://linuxshare.ru/projects/trans/
+# this is redhat only tarball
 Source: manpages-ru-%{version}.rh.tar.bz2
-Source2: http://alexm.here.ru/manpages-ru/download/manpages-ru-0.7.tar.gz
+# old download sites are not working now
+# http://alexm.here.ru/manpages-ru/download/
+Source2: manpages-ru-0.7.tar.gz
 Source3: http://linuxshare.ru/projects/trans/manpages-ru-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -42,6 +45,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/ru/*
 
 %changelog
+* Mon Dec 21 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 0.97-7
+- fix source tag
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From varekova at fedoraproject.org  Mon Dec 21 09:29:23 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 21 Dec 2009 09:29:23 +0000 (UTC)
Subject: rpms/man-pages-ru/devel man-pages-ru.spec,1.19,1.20
Message-ID: <20091221092923.D119811C00E7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages-ru/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15984

Modified Files:
	man-pages-ru.spec 
Log Message:
fix the source tags



Index: man-pages-ru.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ru/devel/man-pages-ru.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- man-pages-ru.spec	25 Jul 2009 11:44:51 -0000	1.19
+++ man-pages-ru.spec	21 Dec 2009 09:29:22 -0000	1.20
@@ -1,12 +1,15 @@
 Summary: Russian man pages from the Linux Documentation Project
 Name: man-pages-ru
 Version: 0.97
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and GPL+ and MIT
 Group: Documentation
 URL: http://linuxshare.ru/projects/trans/
+# this is fedora only tarball
 Source: manpages-ru-%{version}.rh.tar.bz2
-Source2: http://alexm.here.ru/manpages-ru/download/manpages-ru-0.7.tar.gz
+# old download sites are not working now
+# http://alexm.here.ru/manpages-ru/download/
+Source2: manpages-ru-0.7.tar.gz
 Source3: http://linuxshare.ru/projects/trans/manpages-ru-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -30,7 +33,6 @@ done
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
 LC_ALL=ru_RU make install INSTALLPATH=$RPM_BUILD_ROOT/%{_mandir} \
     LANG_SUBDIR=ru
- 
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -42,6 +44,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/ru/*
 
 %changelog
+* Fri Dec 18 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 0.97-7
+- fix the source tags
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Dec 21 09:32:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 09:32:27 +0000
Subject: [pkgdb] fmtools: roma has given up watchcommits
Message-ID: <20091221093218.7481610F841@bastion.fedoraproject.org>

roma has given up the watchcommits acl on fmtools (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From pkgdb at fedoraproject.org  Mon Dec 21 09:33:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 09:33:02 +0000
Subject: [pkgdb] fmtools: roma has requested commit
Message-ID: <20091221093253.3B6A010F862@bastion.fedoraproject.org>

roma has requested the commit acl on fmtools (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From caolanm at fedoraproject.org  Mon Dec 21 09:33:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 09:33:51 +0000 (UTC)
Subject: rpms/planner/F-12 planner-gnome581282-printpreview.patch, NONE,
	1.1 planner.spec, 1.76, 1.77
Message-ID: <20091221093351.1A82C11C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16871/F-12

Modified Files:
	planner.spec 
Added Files:
	planner-gnome581282-printpreview.patch 
Log Message:
Resolves: rhbz#548830 crash in print preview

planner-gnome581282-printpreview.patch:
 planner-print-job.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE planner-gnome581282-printpreview.patch ---
diff -ru planner-0.14.4.orig/src/planner-print-job.c planner-0.14.4/src/planner-print-job.c
--- planner-0.14.4.orig/src/planner-print-job.c	2009-12-21 09:30:14.000000000 +0000
+++ planner-0.14.4/src/planner-print-job.c	2009-12-21 09:30:34.000000000 +0000
@@ -251,7 +251,7 @@
 		return;
 	}
 
-	while (!page_found) {
+	while (!page_found && l) {
 		v = PLANNER_VIEW (l->data);
 
 		pages_in_view = planner_view_print_get_n_pages (v);
@@ -262,8 +262,6 @@
 		} else {
 			page_nr -= pages_in_view;
 			l = l->next;
-
-			g_assert (l != NULL);
 		}
 	}
 }


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/F-12/planner.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- planner.spec	14 Dec 2009 12:55:08 -0000	1.76
+++ planner.spec	21 Dec 2009 09:33:50 -0000	1.77
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   11%{?dist}
+Release:   12%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -29,6 +29,7 @@ Patch7: planner-gnome604355-scrolling.pa
 Patch8: planner-gnome604510.calcolors.patch
 Patch9: planner-gnome604515-usagestatus.patch
 Patch10: planner-gnome604531-tooltips.patch
+Patch11: planner-gnome581282-printpreview.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -69,6 +70,7 @@ This package provides a plugin to integr
 %patch8 -p1 -b .calcolors
 %patch9 -p1 -b .resourcestatus
 %patch10 -p1 -b .tooltips
+%patch11 -p1 -b .printpreview
 
 %build
 rm -rf libegg
@@ -169,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 21 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-12
+- Resolves: rhbz#548830 crash in print preview
+
 * Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-11
 - Resolves: rhbz#546844 add tooltips to views
 



From caolanm at fedoraproject.org  Mon Dec 21 09:33:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 09:33:51 +0000 (UTC)
Subject: rpms/planner/devel planner-gnome581282-printpreview.patch, NONE,
	1.1 planner.spec, 1.76, 1.77
Message-ID: <20091221093351.57D9111C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16871/devel

Modified Files:
	planner.spec 
Added Files:
	planner-gnome581282-printpreview.patch 
Log Message:
Resolves: rhbz#548830 crash in print preview

planner-gnome581282-printpreview.patch:
 planner-print-job.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE planner-gnome581282-printpreview.patch ---
diff -ru planner-0.14.4.orig/src/planner-print-job.c planner-0.14.4/src/planner-print-job.c
--- planner-0.14.4.orig/src/planner-print-job.c	2009-12-21 09:30:14.000000000 +0000
+++ planner-0.14.4/src/planner-print-job.c	2009-12-21 09:30:34.000000000 +0000
@@ -251,7 +251,7 @@
 		return;
 	}
 
-	while (!page_found) {
+	while (!page_found && l) {
 		v = PLANNER_VIEW (l->data);
 
 		pages_in_view = planner_view_print_get_n_pages (v);
@@ -262,8 +262,6 @@
 		} else {
 			page_nr -= pages_in_view;
 			l = l->next;
-
-			g_assert (l != NULL);
 		}
 	}
 }


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- planner.spec	14 Dec 2009 12:55:08 -0000	1.76
+++ planner.spec	21 Dec 2009 09:33:51 -0000	1.77
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   11%{?dist}
+Release:   12%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -29,6 +29,7 @@ Patch7: planner-gnome604355-scrolling.pa
 Patch8: planner-gnome604510.calcolors.patch
 Patch9: planner-gnome604515-usagestatus.patch
 Patch10: planner-gnome604531-tooltips.patch
+Patch11: planner-gnome581282-printpreview.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -69,6 +70,7 @@ This package provides a plugin to integr
 %patch8 -p1 -b .calcolors
 %patch9 -p1 -b .resourcestatus
 %patch10 -p1 -b .tooltips
+%patch11 -p1 -b .printpreview
 
 %build
 rm -rf libegg
@@ -167,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 21 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-12
+- Resolves: rhbz#548830 crash in print preview
+
 * Mon Dec 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.14.4-11
 - Resolves: rhbz#546844 add tooltips to views
 



From pkgdb at fedoraproject.org  Mon Dec 21 09:40:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 09:40:17 +0000
Subject: [pkgdb] fmtools had acl change status
Message-ID: <20091221094008.6303B10F83D@bastion.fedoraproject.org>

kwizart has set the commit acl on fmtools (Fedora 12) to Approved for roma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From stransky at fedoraproject.org  Mon Dec 21 09:54:19 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon, 21 Dec 2009 09:54:19 +0000 (UTC)
Subject: rpms/xulrunner/devel sources,1.80,1.81
Message-ID: <20091221095419.850C511C00E7@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20127

Modified Files:
	sources 
Log Message:
removed old sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	21 Dec 2009 09:13:47 -0000	1.80
+++ sources	21 Dec 2009 09:54:19 -0000	1.81
@@ -1,2 +1 @@
-770d0a33e4e2ceb52017c59d98c4d28c  xulrunner-1.9.2.1b4.source.tar.bz2
 381a897e16579a47250dee9342353f37  xulrunner-1.9.2.1b5.source.tar.bz2



From stransky at fedoraproject.org  Mon Dec 21 09:59:13 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon, 21 Dec 2009 09:59:13 +0000 (UTC)
Subject: File firefox-3.6b5.source.tar.bz2 uploaded to lookaside cache by
	stransky
Message-ID: <20091221095913.4BB5910F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for firefox:

381a897e16579a47250dee9342353f37  firefox-3.6b5.source.tar.bz2



From kalev at fedoraproject.org  Mon Dec 21 10:00:27 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Mon, 21 Dec 2009 10:00:27 +0000 (UTC)
Subject: File opensc-0.11.12.tar.gz uploaded to lookaside cache by kalev
Message-ID: <20091221100027.4000110F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for opensc:

bc82f097bbc457962f3722474b50af5c  opensc-0.11.12.tar.gz



From stransky at fedoraproject.org  Mon Dec 21 10:02:09 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon, 21 Dec 2009 10:02:09 +0000 (UTC)
Subject: File firefox-langpacks-3.6.1-20091221.tar.bz2 uploaded to lookaside
	cache by stransky
Message-ID: <20091221100209.9D81A10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for firefox:

12600472e2e558e725643998a46629fa  firefox-langpacks-3.6.1-20091221.tar.bz2



From kalev at fedoraproject.org  Mon Dec 21 10:25:20 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Mon, 21 Dec 2009 10:25:20 +0000 (UTC)
Subject: rpms/opensc/devel .cvsignore, 1.25, 1.26 opensc.spec, 1.52,
	1.53 sources, 1.25, 1.26
Message-ID: <20091221102520.2E57611C00E7@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23451

Modified Files:
	.cvsignore opensc.spec sources 
Log Message:
- new upstream version
- replaced %%define with %%global
- BR clean up from items not applicable to current Fedora releases



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	19 Nov 2009 17:06:59 -0000	1.25
+++ .cvsignore	21 Dec 2009 10:25:18 -0000	1.26
@@ -1 +1 @@
-opensc-0.11.11.tar.gz
+opensc-0.11.12.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- opensc.spec	8 Dec 2009 21:29:24 -0000	1.52
+++ opensc.spec	21 Dec 2009 10:25:18 -0000	1.53
@@ -1,8 +1,8 @@
-%define plugindir %{_libdir}/mozilla/plugins
+%global plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.11.11
-Release:        2%{?dist}
+Version:        0.11.12
+Release:        1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -12,15 +12,12 @@ Source0:        http://www.opensc-projec
 Patch1:         %{name}-0.11.7-develconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pcsc-lite-devel >= 1.1.1
+BuildRequires:  pcsc-lite-devel
 BuildRequires:  readline-devel
-# ncurses-devel for < F7 (not pulled in by readline-devel)
-BuildRequires:  ncurses-devel
 BuildRequires:  openct-devel
-BuildRequires:  openssl-devel >= 0.9.7a
+BuildRequires:  openssl-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libtool
-BuildRequires:  pkgconfig
 Requires:       pcsc-lite-libs%{?_isa}
 
 %description
@@ -72,7 +69,7 @@ sed -i -e 's|/usr/local/towitoko/lib/|/u
   --enable-doc \
   --with-pcsc-provider=libpcsclite.so.1 \
   --with-plugindir=%{plugindir} \
-  --with-pin-entry=%{_bindir}/pinentry
+  --with-pinentry=%{_bindir}/pinentry
 make %{?_smp_mflags}
 
 
@@ -157,6 +154,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.12-1
+- new upstream version
+- replaced %%define with %%global
+- BR clean up from items not applicable to current Fedora releases
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.11.11-2
 - Explicitly BR libassuan-static in accordance with the Packaging
   Guidelines (libassuan-devel is still static-only).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	19 Nov 2009 17:06:59 -0000	1.25
+++ sources	21 Dec 2009 10:25:18 -0000	1.26
@@ -1 +1 @@
-9c3290f7cb82273136b1584e198157dc  opensc-0.11.11.tar.gz
+bc82f097bbc457962f3722474b50af5c  opensc-0.11.12.tar.gz



From stransky at fedoraproject.org  Mon Dec 21 10:25:54 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon, 21 Dec 2009 10:25:54 +0000 (UTC)
Subject: rpms/firefox/devel .cvsignore, 1.106, 1.107 firefox.spec, 1.349,
	1.350 sources, 1.119, 1.120
Message-ID: <20091221102554.0F6C211C00E7@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25153

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.6.1 Beta 5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	27 Nov 2009 10:55:54 -0000	1.106
+++ .cvsignore	21 Dec 2009 10:25:53 -0000	1.107
@@ -16,3 +16,5 @@ firefox-3.6b3.source.tar.bz2
 firefox-3.6b4.source.tar.bz2
 firefox-langpacks-3.6.1-20091125.tar.bz2
 firefox-langpacks-3.6.1-20091127.tar.bz2
+firefox-3.6b5.source.tar.bz2
+firefox-langpacks-3.6.1-20091221.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -p -r1.349 -r1.350
--- firefox.spec	17 Dec 2009 09:42:00 -0000	1.349
+++ firefox.spec	21 Dec 2009 10:25:53 -0000	1.350
@@ -5,7 +5,7 @@
 %define mozappdir  	      %{_libdir}/%{name}-%{internal_version}
 %define tarballdir 	      mozilla-1.9.2
 
-%define xulrunner_version 1.9.2.1-0.5.b4
+%define xulrunner_version 1.9.2.1-0.8.b5
 %define internal_version  3.6
 
 %define official_branding 0
@@ -14,20 +14,20 @@
 %if ! %{official_branding}
 %define cvsdate 20080327
 %define nightly .cvs%{cvsdate}
-%define prever  b4
+%define prever  b5
 %endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.6.1
-Release:        0.6.%{?prever}%{?dist}
+Release:        0.7.%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 # From ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source
 Source0:        firefox-%{internal_version}%{?prever}.source.tar.bz2
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20091127.tar.bz2
+Source2:        firefox-langpacks-%{version}-20091221.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -346,6 +346,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Dec 21 2009 Martin Stransky <stransky at redhat.com> - 3.6.1-0.7.b4
+- Update to 3.6.1 Beta 5
+
 * Wed Nov 27 2009 Martin Stransky <stransky at redhat.com> - 3.6.1-0.6.b4
 - Added fix for mozbz#526152 - jemalloc fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- sources	27 Nov 2009 10:55:54 -0000	1.119
+++ sources	21 Dec 2009 10:25:53 -0000	1.120
@@ -1,2 +1,2 @@
-770d0a33e4e2ceb52017c59d98c4d28c  firefox-3.6b4.source.tar.bz2
-d3aed4dd65e98cc73924aad3eece8e4a  firefox-langpacks-3.6.1-20091127.tar.bz2
+381a897e16579a47250dee9342353f37  firefox-3.6b5.source.tar.bz2
+12600472e2e558e725643998a46629fa  firefox-langpacks-3.6.1-20091221.tar.bz2



From jfch2222 at fedoraproject.org  Mon Dec 21 10:55:01 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Mon, 21 Dec 2009 10:55:01 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.3p1-audit.patch, 1.1, 1.2 openssh.spec, 
	1.182, 1.183
Message-ID: <20091221105502.7557311C00E7@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29700

Modified Files:
	openssh-5.3p1-audit.patch openssh.spec 
Log Message:
Update the audit patch

openssh-5.3p1-audit.patch:
 auth.c       |   10 ++++++++++
 configure.ac |   13 +++++++++++++
 loginrec.c   |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 loginrec.h   |    4 ++++
 4 files changed, 79 insertions(+)

Index: openssh-5.3p1-audit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.3p1-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssh-5.3p1-audit.patch	17 Oct 2009 07:46:49 -0000	1.1
+++ openssh-5.3p1-audit.patch	21 Dec 2009 10:54:59 -0000	1.2
@@ -1,15 +1,15 @@
 diff -up openssh-5.3p1/auth.c.audit openssh-5.3p1/auth.c
 --- openssh-5.3p1/auth.c.audit	2008-11-05 06:12:54.000000000 +0100
-+++ openssh-5.3p1/auth.c	2009-10-11 13:02:47.000000000 +0200
++++ openssh-5.3p1/auth.c	2009-12-21 08:50:12.000000000 +0100
 @@ -287,6 +287,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);
-+	}
++        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)
@@ -19,79 +19,35 @@ diff -up openssh-5.3p1/auth.c.audit open
  		    get_canonical_hostname(options.use_dns), "ssh");
  #endif
 +#ifdef HAVE_LINUX_AUDIT
-+		linux_audit_record_event(-1, user, NULL, get_remote_ipaddr(),
-+			"sshd", 0);
++                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-5.3p1/config.h.in.audit openssh-5.3p1/config.h.in
---- openssh-5.3p1/config.h.in.audit	2009-09-26 08:31:14.000000000 +0200
-+++ openssh-5.3p1/config.h.in	2009-10-11 13:09:41.000000000 +0200
-@@ -533,6 +533,9 @@
- /* Define to 1 if you have the <lastlog.h> header file. */
- #undef HAVE_LASTLOG_H
- 
-+/* Define to 1 if you have the <libaudit.h> header file. */
-+#undef HAVE_LIBAUDIT_H
-+
- /* Define to 1 if you have the `bsm' library (-lbsm). */
- #undef HAVE_LIBBSM
- 
-@@ -572,6 +575,9 @@
- /* Define to 1 if you have the <limits.h> header file. */
- #undef HAVE_LIMITS_H
- 
-+/* Define if you want Linux audit support. */
-+#undef HAVE_LINUX_AUDIT
-+
- /* Define to 1 if you have the <linux/if_tun.h> header file. */
- #undef HAVE_LINUX_IF_TUN_H
- 
-@@ -768,6 +774,9 @@
- /* Define to 1 if you have the `setgroups' function. */
- #undef HAVE_SETGROUPS
- 
-+/* Define to 1 if you have the `setkeycreatecon' function. */
-+#undef HAVE_SETKEYCREATECON
-+
- /* Define to 1 if you have the `setlogin' function. */
- #undef HAVE_SETLOGIN
- 
-@@ -1348,6 +1357,10 @@
- /* Prepend the address family to IP tunnel traffic */
- #undef SSH_TUN_PREPEND_AF
- 
-+/* Define to your vendor patch level, if it has been modified from the
-+   upstream source release. */
-+#undef SSH_VENDOR_PATCHLEVEL
-+
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
- 
 diff -up openssh-5.3p1/configure.ac.audit openssh-5.3p1/configure.ac
---- openssh-5.3p1/configure.ac.audit	2009-09-11 06:56:08.000000000 +0200
-+++ openssh-5.3p1/configure.ac	2009-10-11 13:08:03.000000000 +0200
-@@ -3407,6 +3407,18 @@ AC_ARG_WITH(selinux,
+--- openssh-5.3p1/configure.ac.audit	2009-12-21 08:48:59.000000000 +0100
++++ openssh-5.3p1/configure.ac	2009-12-21 08:51:47.000000000 +0100
+@@ -3409,6 +3409,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 ]
++        [  --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,
-@@ -4226,6 +4238,7 @@ echo "                       PAM support
+@@ -4234,6 +4246,7 @@ echo "                       PAM support
  echo "                   OSF SIA support: $SIA_MSG"
  echo "                 KerberosV support: $KRB5_MSG"
  echo "                   SELinux support: $SELINUX_MSG"
@@ -101,7 +57,7 @@ diff -up openssh-5.3p1/configure.ac.audi
  echo "              TCP Wrappers support: $TCPW_MSG"
 diff -up openssh-5.3p1/loginrec.c.audit openssh-5.3p1/loginrec.c
 --- openssh-5.3p1/loginrec.c.audit	2009-02-12 03:12:22.000000000 +0100
-+++ openssh-5.3p1/loginrec.c	2009-10-11 13:06:16.000000000 +0200
++++ openssh-5.3p1/loginrec.c	2009-12-21 08:54:17.000000000 +0100
 @@ -176,6 +176,10 @@
  #include "auth.h"
  #include "buffer.h"
@@ -128,94 +84,54 @@ diff -up openssh-5.3p1/loginrec.c.audit 
  	/* 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));
++        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,87 @@ wtmpx_get_entry(struct logininfo *li)
+@@ -1394,6 +1405,47 @@ wtmpx_get_entry(struct logininfo *li)
  }
  #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)
++        const char *hostname, const char *ip, const char *ttyn, int success)
 +{
-+	char buf[AUDIT_LOG_SIZE];
-+	int audit_fd, rc;
++        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 {
-+		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);
-+	if (rc >= 0)
-+		return 1;
-+	else
-+		return 0;
++        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 */
++        }
++        rc = audit_log_acct_message(audit_fd, AUDIT_USER_LOGIN,
++                NULL, "login", username ? username : "(unknown)",
++                username == NULL ? uid : -1, 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);
-+	}
++        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 */
 +
@@ -224,14 +140,14 @@ diff -up openssh-5.3p1/loginrec.c.audit 
   **/
 diff -up openssh-5.3p1/loginrec.h.audit openssh-5.3p1/loginrec.h
 --- openssh-5.3p1/loginrec.h.audit	2006-08-05 04:39:40.000000000 +0200
-+++ openssh-5.3p1/loginrec.h	2009-10-11 13:04:28.000000000 +0200
++++ openssh-5.3p1/loginrec.h	2009-12-21 08:48:59.000000000 +0100
 @@ -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);
++        const char *hostname, const char *ip, const char *ttyn, int success);
 +#endif /* HAVE_LINUX_AUDIT */
  
  #endif /* _HAVE_LOGINREC_H_ */


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- openssh.spec	4 Dec 2009 13:31:18 -0000	1.182
+++ openssh.spec	21 Dec 2009 10:54:59 -0000	1.183
@@ -69,7 +69,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 12%{?dist}%{?rescue_rel}
+Release: 13%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #URL1: http://pamsshauth.sourceforge.net
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -525,6 +525,9 @@ fi
 %endif
 
 %changelog
+* Mon Dec 21 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-13
+- Update the audit patch
+
 * Fri Dec  4 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-12
 - Add possibility to autocreate only RSA key into initscript (#533339)
 



From jakub at fedoraproject.org  Mon Dec 21 10:57:44 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 21 Dec 2009 10:57:44 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-adjtimex.patch, NONE,
	1.1 valgrind.spec, 1.76, 1.77
Message-ID: <20091221105744.DD69E11C00E7@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30128

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.5.0-adjtimex.patch 
Log Message:
3.5.0-11.fc12

valgrind-3.5.0-adjtimex.patch:
 coregrind/m_syswrap/syswrap-linux.c |    3 ++-
 include/vki/vki-linux.h             |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE valgrind-3.5.0-adjtimex.patch ---
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-08 16:11:18.000000000 +0100
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-09 15:06:39.000000000 +0100
@@ -627,7 +627,8 @@ PRE(sys_adjtimex)
       PRE_MEM_READ( "adjtimex(timex->"#field")",	\
 		    (Addr)&tx->field, sizeof(tx->field))
 
-   ADJX(VKI_ADJ_OFFSET, offset);
+   if ((tx->modes & VKI_ADJ_OFFSET_SS_READ) != VKI_ADJ_OFFSET_SS_READ)
+      ADJX(VKI_ADJ_OFFSET, offset);
    ADJX(VKI_ADJ_FREQUENCY, freq);
    ADJX(VKI_ADJ_MAXERROR, maxerror);
    ADJX(VKI_ADJ_ESTERROR, esterror);
--- valgrind-3.5.0/include/vki/vki-linux.h	2009-12-08 16:11:18.000000000 +0100
+++ valgrind-3.5.0/include/vki/vki-linux.h	2009-12-09 15:04:20.000000000 +0100
@@ -285,6 +285,7 @@ struct vki_timex {
 #define VKI_ADJ_TIMECONST		0x0020	/* pll time constant */
 #define VKI_ADJ_TICK			0x4000	/* tick value */
 //#define VKI_ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
+#define VKI_ADJ_OFFSET_SS_READ		0xa001	/* read-only adjtime */
 
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/linux/times.h


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- valgrind.spec	2 Dec 2009 15:15:14 -0000	1.76
+++ valgrind.spec	21 Dec 2009 10:57:44 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -22,6 +22,7 @@ Patch15: valgrind-3.5.0-preadv.patch
 Patch16: valgrind-3.5.0-glibc-2.11.patch
 Patch17: valgrind-3.5.0-syscalls2.patch
 Patch18: valgrind-3.5.0-dynbss.patch
+Patch19: valgrind-3.5.0-adjtimex.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -93,6 +94,7 @@ or valgrind plugins.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -178,6 +180,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-11
+- don't require offset field to be set in adjtimex's
+  ADJ_OFFSET_SS_READ mode (#545866)
+
 * Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-10
 - add handling of a bunch of recent syscalls and fix some
   other syscall wrappers (Dodji Seketeli)



From pravins at fedoraproject.org  Mon Dec 21 11:06:05 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Mon, 21 Dec 2009 11:06:05 +0000 (UTC)
Subject: rpms/smc-fonts/devel 66-smc-meera.conf, 1.1, 1.2 smc-fonts.spec, 1.11,
	1.12
Message-ID: <20091221110605.60F0911C00E7@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31512

Modified Files:
	66-smc-meera.conf smc-fonts.spec 
Log Message:
* Mon Dec 21 2009 Pravin Satpute <psatpute at redhat.com> 04.2-4
 - updated meera conf file



Index: 66-smc-meera.conf
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/66-smc-meera.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 66-smc-meera.conf	9 Dec 2009 06:30:09 -0000	1.1
+++ 66-smc-meera.conf	21 Dec 2009 11:06:04 -0000	1.2
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Meera</string>
   </edit>
 </match>


Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- smc-fonts.spec	9 Dec 2009 06:30:09 -0000	1.11
+++ smc-fonts.spec	21 Dec 2009 11:06:04 -0000	1.12
@@ -8,7 +8,7 @@ traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
 Version:	04.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
@@ -163,6 +163,9 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Mon Dec 21 2009 Pravin Satpute <psatpute at redhat.com> 04.2-4
+- updated meera conf file
+
 * Wed Dec 09 2009 Pravin Satpute <psatpute at redhat.com> 04.2-3
 - bugfix 545683
 



From akurtakov at fedoraproject.org  Mon Dec 21 11:06:39 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Dec 2009 11:06:39 +0000 (UTC)
Subject: File maven2-shade-plugin-1.2.2-src.tar.gz uploaded to lookaside cache
	by akurtakov
Message-ID: <20091221110639.C8A9F10F893@bastion.fedoraproject.org>

A file has been added to the lookaside cache for maven2-plugin-shade:

7431c1a54903492a597243674f9fa00b  maven2-shade-plugin-1.2.2-src.tar.gz



From akurtakov at fedoraproject.org  Mon Dec 21 11:09:46 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Dec 2009 11:09:46 +0000 (UTC)
Subject: rpms/maven2-plugin-shade/devel sources, 1.2,
	1.3 maven2-plugin-shade.spec, 1.1, 1.2 .cvsignore, 1.2, 1.3
Message-ID: <20091221110947.023EE11C00E7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven2-plugin-shade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32754/devel

Modified Files:
	sources maven2-plugin-shade.spec .cvsignore 
Log Message:
Update to 1.2.2.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-plugin-shade/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Sep 2009 06:09:02 -0000	1.2
+++ sources	21 Dec 2009 11:09:46 -0000	1.3
@@ -1 +1 @@
-b71c6c9d186a618c391fcd7745519ddc  maven2-plugin-shade-1.0.tar.gz
+7431c1a54903492a597243674f9fa00b  maven2-shade-plugin-1.2.2-src.tar.gz


Index: maven2-plugin-shade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-plugin-shade/devel/maven2-plugin-shade.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven2-plugin-shade.spec	1 Sep 2009 06:09:02 -0000	1.1
+++ maven2-plugin-shade.spec	21 Dec 2009 11:09:46 -0000	1.2
@@ -29,18 +29,18 @@
 #
 
 Name:           maven2-plugin-shade
-Version:        1.0
-Release:        7%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Maven Shade Plugin
 License:        ASL 2.0
 Group:          Development/Tools
 URL:            http://maven.apache.org/
 
-# svn export https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.0 maven2-plugin-shade
-# tar czf maven2-shade-plugin-1.0-src.tar.gz maven2-plugin-shade
+# svn export https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.2.2 maven2-plugin-shade
+# tar czf maven2-shade-plugin-1.2.2-src.tar.gz maven2-plugin-shade
 
-Source0:        %{name}-%{version}.tar.gz
+Source0:        maven2-shade-plugin-%{version}-src.tar.gz
 Source1:        %{name}-depmap.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.2-1
+- Update to 1.2.2 upstream release.
+
 * Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-7
 - Bump Requires on maven to be 2.0.8
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-plugin-shade/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Sep 2009 06:09:02 -0000	1.2
+++ .cvsignore	21 Dec 2009 11:09:46 -0000	1.3
@@ -1 +1,2 @@
 maven2-plugin-shade-1.0.tar.gz
+maven2-shade-plugin-1.2.2-src.tar.gz



From rvokal at fedoraproject.org  Mon Dec 21 11:19:39 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Mon, 21 Dec 2009 11:19:39 +0000 (UTC)
Subject: rpms/wireshark/devel wireshark-autoconf.m4, NONE, 1.1 wireshark.spec, 
	1.64, 1.65
Message-ID: <20091221111940.0F6B811C00E7@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2357

Modified Files:
	wireshark.spec 
Added Files:
	wireshark-autoconf.m4 
Log Message:
adds autoconf macro file


--- NEW FILE wireshark-autoconf.m4 ---
dnl AM_PATH_WIRESHARK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for wireshark development files, and define WIRESHARK_CFLAGS,
dnl	WIRESHARK_LIBS and WIRESHARK_VERSION.
dnl
AC_DEFUN([AM_PATH_WIRESHARK],[ 
	AC_ARG_WITH(wireshark-prefix,
	    [  --with-wireshark-prefix=PFX  Prefix where wireshark libraries are installed (optional)],
	    wireshark_config_prefix="$withval", wireshark_config_prefix="")

	wireshark_found=no
	if test "$wireshark_config_prefix" != "" ; then
		AM_PATH_GLIB_2_0(,,,[gmodule])
		WIRESHARK_CFLAGS="-DWS_VAR_IMPORT=extern -I$wireshark_config_prefix/include/wireshark -I$wireshark_config_prefix/include/wireshark/epan -I/usr/include/wireshark -I/usr/include/wireshark/epan $GLIB_CFLAGS"
		WIRESHARK_LIBS="-L$wireshark_config_prefix/lib -lwireshark -lwiretap $GLIB_LIBS"
		wireshark_found=yes
	else
		PKG_PROG_PKG_CONFIG()
		PKG_CHECK_MODULES(WIRESHARK, wireshark, wireshark_found=yes)
	fi

	ac_save_CFLAGS="$CFLAGS"
	ac_save_CLIBS="$LIBS"
	CFLAGS="$CFLAGS $WIRESHARK_CFLAGS"
	LIBS="$WIRESHARK_LIBS $LIBS"
	min_wireshark_version=ifelse([$1], ,0.0.0,[$1])
	if test $wireshark_found = yes; then
		AC_MSG_CHECKING(for wireshark version >= $min_wireshark_version)
		wireshark_found=no
		AC_TRY_RUN([
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <gmodule.h>
#include <epan/packet.h>
#include <epan/prefs.h>

int 
main()

{
	int ws_major_version, ws_minor_version, ws_micro_version;
	int major, minor, micro;
	char **tmp_version;

	tmp_version = (char *) strdup("$min_wireshark_version");
	major = 0;
	minor = 0;
	micro = 0;
	sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro);
	free(tmp_version);
	tmp_version = (char *) epan_get_version();
	sscanf(tmp_version, "%d.%d.%d",
	    &ws_major_version, &ws_minor_version, &ws_micro_version);

	if (ws_major_version > major ||
	    (ws_major_version == major && ws_minor_version > minor) ||
	    (ws_major_version == major && ws_minor_version == minor &&
	    ws_micro_version >= micro))
		return 0;

	printf("\n*** An old version of wireshark (%d.%d.%d) was found.\n",
	    ws_major_version, ws_minor_version, ws_micro_version);
	printf("*** You need a version of wireshark not older than %d.%d.%d. ",
	    major, minor, micro);
	return 1;
}
		], wireshark_found=yes)
	fi

	if test "$wireshark_found" != no; then
		AC_LANG_PUSH(C)
		AC_LINK_IFELSE([AC_LANG_PROGRAM([
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <gmodule.h>
#include <epan/packet.h>
#include <epan/prefs.h>
], [puts(epan_get_version());])], [WIRESHARK_VERSION=`./conftest$ac_exeext`],
wireshark_found=no)
		
		AC_LANG_POP
	fi

	CFLAGS="$ac_save_CFLAGS"
	LIBS="$ac_save_LIBS"

	if test "$wireshark_found" != no; then
		AC_MSG_RESULT(yes)
		ifelse([$2],, :, [$2])     
	else
		AC_MSG_RESULT(no)
		WIRESHARK_CFLAGS=""
		WIRESHARK_LIBS=""
		WIRESHARK_VERSION=""
		ifelse([$3], , :, [$3])
	fi
	AC_SUBST(WIRESHARK_CFLAGS)
	AC_SUBST(WIRESHARK_LIBS)
	AC_SUBST(WIRESHARK_VERSION)
])


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- wireshark.spec	18 Dec 2009 09:27:49 -0000	1.64
+++ wireshark.spec	21 Dec 2009 11:19:39 -0000	1.65
@@ -12,7 +12,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.2.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -23,6 +23,7 @@ Source0:	http://wireshark.org/download/s
 Source1:	wireshark.pam
 Source2:	wireshark.console
 Source3:	wireshark.desktop
+Source4:	wireshark-autoconf.m4
 Patch1:		wireshark-1.0.2-pie.patch
 Patch2:		wireshark-nfsv4-opts.patch
 Patch3:		wireshark-0.99.7-path.patch
@@ -193,6 +194,7 @@ mkdir -p "${IDIR}/epan/ftypes"
 mkdir -p "${IDIR}/epan/dfilter"
 mkdir -p "${IDIR}/wiretap"
 install -m 644 color.h			"${IDIR}/"
+install -m 644 register.h		"${IDIR}/"
 install -m 644 epan/packet.h		"${IDIR}/epan/"
 install -m 644 epan/prefs.h		"${IDIR}/epan/"
 install -m 644 epan/proto.h		"${IDIR}/epan/"
@@ -214,7 +216,9 @@ install -m 644 epan/guid-utils.h	"${IDIR
 install -m 644 epan/exceptions.h	"${IDIR}/epan/"
 install -m 644 epan/address.h		"${IDIR}/epan/"
 install -m 644 epan/slab.h		"${IDIR}/epan/"
+install -m 644 epan/tfs.h		"${IDIR}/epan/"
 install -m 644 epan/except.h		"${IDIR}/epan/"
+install -m 644 epan/emem.h		"${IDIR}/epan/"
 install -m 644 epan/ftypes/ftypes.h	"${IDIR}/epan/ftypes/"
 install -m 644 epan/dfilter/dfilter.h	"${IDIR}/epan/dfilter/"
 install -m 644 epan/dfilter/drange.h	"${IDIR}/epan/dfilter/"
@@ -231,11 +235,15 @@ cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgco
 	Name:		%{name}
 	Description:	Network Traffic Analyzer
 	Version:	%{version}
-	Requires:	glib-2.0
+	Requires:	glib-2.0 gmodule-2.0
 	Libs:		-L${libdir} -lwireshark -lwiretap
 	Cflags:		-DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -I${includedir}/wireshark -I${includedir}/wireshark/epan
 EOF
 
+#	Install the autoconf macro.
+mkdir -p "${RPM_BUILD_ROOT}%{_datadir}/aclocal"
+cp "%{SOURCE4}" "${RPM_BUILD_ROOT}%{_datadir}/aclocal/wireshark.m4"
+
 # Remove .la files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la
 
@@ -293,6 +301,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/wireshark
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
+%{_datadir}/aclocal/*
 %{_mandir}/man1/idl2wrs.*
 %{_sbindir}/idl2wrs
 %if %{with_lua}
@@ -300,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec 18 2009 Patrick Monnerat <pm at datasphere.ch> 1.2.5-2
+- Autoconf macro for plugin development.
+
 * Fri Dec 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.5-1
 - upgrade to 1.2.5
 - fixes security vulnaribilities, see http://www.wireshark.org/security/wnpa-sec-2009-09.html 



From roma at fedoraproject.org  Mon Dec 21 11:22:02 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Mon, 21 Dec 2009 11:22:02 +0000 (UTC)
Subject: File fmtools-2.0.tar.gz uploaded to lookaside cache by roma
Message-ID: <20091221112202.0713E10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fmtools:

807467a8bccae32317c6bdb6c5329ab3  fmtools-2.0.tar.gz



From roma at fedoraproject.org  Mon Dec 21 11:22:44 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Mon, 21 Dec 2009 11:22:44 +0000 (UTC)
Subject: rpms/fmtools/F-12 fmtools.desktop, NONE, 1.1 fmtools.patch, NONE,
	1.1 import.log, NONE, 1.1 radio.png, NONE, 1.1 tkradio, NONE,
	1.1 tkradio-mute, NONE, 1.1 .cvsignore, 1.2, 1.3 fmtools.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20091221112244.1613411C00E7@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/fmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3063/F-12

Modified Files:
	.cvsignore fmtools.spec sources 
Added Files:
	fmtools.desktop fmtools.patch import.log radio.png tkradio 
	tkradio-mute 
Log Message:
import of version 2.0


--- NEW FILE fmtools.desktop ---

[Desktop Entry]
Name=tkradio
Comment=Tcl/Tk wrapper for fmtools
Exec=tkradio-mute.tcl
Icon=radio
Terminal=0
Type=Application
StartupNotify=false
StartupWMClass=tkradio
Encoding=UTF-8
Categories=Application;AudioVideo;
X-Desktop-File-Install-Version=0.15

fmtools.patch:
 fmlib.c  |    1 +
 fmscan.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE fmtools.patch ---
diff -Naur fmtools-2.0/fmlib.c fmtools-2.0-new/fmlib.c
--- fmtools-2.0/fmlib.c	2009-12-13 19:27:45.000000000 -0200
+++ fmtools-2.0-new/fmlib.c	2009-12-20 08:15:14.000000000 -0200
@@ -70,6 +70,7 @@
 void
 tuner_open(struct tuner *tuner, const char *device, int index)
 {
+        memset(tuner, 0, sizeof *tuner);
         if (!device)
                 device = "/dev/radio0";
         else if (!strcmp(device, "test") || !strncmp(device, "test ", 5)) {
diff -Naur fmtools-2.0/fmscan.c fmtools-2.0-new/fmscan.c
--- fmtools-2.0/fmscan.c	2009-12-13 19:34:20.000000000 -0200
+++ fmtools-2.0-new/fmscan.c	2009-12-20 08:15:45.000000000 -0200
@@ -151,7 +151,7 @@
 		totsig = 0;
 		for (i = 0; i < tries; i++) {
                         totsig += tuner_get_signal(&tuner);
-			perc = totsig / (65535.0 * i);
+			perc = totsig / (65535.0 * (i + 1));
                         if (!quiet) {
                                 printf("%2.1f: checking: %3.1f%% (%d/%d)"
                                        "    \r",


--- NEW FILE import.log ---
fmtools-2_0-3_fc12:F-12:fmtools-2.0-3.fc12.src.rpm:1261394532


--- NEW FILE tkradio ---
#!/usr/bin/wish
# Matt Willis - simple tk interface to fmtools 
# The radio keeps on after leaving.
# -*- tcl -*-

# These are stations in the Rio de Janeiro area. Customize for your own locale.
set stations \
        "
	MPB          90.3 
        CBN          92.5 
	BandNews     94.9
        PARADISO     95.7
	Nativa       96.5
	98FM         98.0 
	MEC          98.9 
	JBFM         99.7
	O_Dia        100.5
	Transamerica 101.3
	JovenPan     102.1
	Oi           102.9
	Antena1	     103.7
	"

# intial volume
set volume 100
set n [expr [llength $stations]/2]
# default radio station
set radbut 3

# make tuner buttons
frame .labels
for {set i 0} {$i<$n} {incr i 1} {
    radiobutton .r$i -value $i -variable radbut \
	    -text [lindex $stations [expr $i *2]] -command setstation
    pack .r$i -anchor w -in .labels
}

# turns the radio on
eval exec fm on

frame .rhs
scale .vol -orient horizontal -from 0 -to 100 -showvalue 0 \
	-variable volume -label Volume:
entry .stn -bg black -fg yellow -font "-*-helvetica-*-r-*-*-60-*-*-*-*-*-*-*" \
	-width 6 -justify right -state disabled
button .exit -command exit -text exit
pack .vol .stn .exit -in .rhs

pack .labels .rhs -side left
.vol configure -command setvolume

proc setstation {} {
    global stations radbut volume
#   roma 20091221
#   eval exec fm [lindex $stations [expr $radbut*2+1]] $volume
    eval exec fm [lindex $stations [expr $radbut*2+1]]
    eval exec amixer -c 0 set PCM $volume%
    .stn configure -state normal
    .stn delete 0 end
    .stn insert 0  [lindex $stations [expr $radbut*2+1]]
    .stn configure -state disabled
}

proc setvolume {sliderval} {
    setstation
}


--- NEW FILE tkradio-mute ---
#!/usr/bin/wish
# Matt Willis - simple tk interface to fmtools
# mute button added by James Smith
# The radio is turned off after leaving.
# -*- tcl -*-

# These are stations in the Rio de Janeiro area. Customize for your own locale.
set stations \
        "
        MPB          90.3
        CBN          92.5
        BandNews     94.9
        PARADISO     95.7
        Nativa       96.5
        98FM         98.0
        MEC          98.9
        JBFM         99.7
        O_Dia        100.5
        Transamerica 101.3
        JovenPan     102.1
        Oi           102.9
        Antena1      103.7
        "

# initial volume [0,100]
set volume 100
set n [expr [llength $stations]/2]
# default radio station
set radbut 3
set rvol 100
set state 0

# make tuner buttons
frame .labels
for {set i 0} {$i<$n} {incr i 1} {
    radiobutton .r$i -value $i -variable radbut \
     -text [lindex $stations [expr $i *2]] -command setstation
    pack .r$i -anchor w -in .labels
}

# turns the radio on
eval exec fm on

frame .rhs
scale .vol -orient horizontal -from 0 -to 100 -showvalue 0 \
 -variable volume -label Volume:
entry .stn -bg black -fg green -font "-*-helvetica-*-r-*-*-20-*-*-*-*-*-*-*" \
 -width 6 -justify right -state disabled
button .exit -command out -text exit
button .mute -command mute -text mute

pack .vol .stn .exit .mute -in .rhs


pack .labels .rhs -side left
.vol configure -command setvolume

proc setstation {} {
    global stations radbut volume
#   roma 20091221
#   eval exec fm [lindex $stations [expr $radbut*2+1]] $volume
    eval exec fm [lindex $stations [expr $radbut*2+1]]
    eval exec amixer -c 0 set PCM $volume%
    .stn configure -state normal
    .stn delete 0 end
    .stn insert 0  [lindex $stations [expr $radbut*2+1]]
    .stn configure -state disabled
}

proc setvolume {sliderval} {
    setstation
}

proc out {} {
    global stations radbut volume
#   roma 20070217
#   eval exec fm [lindex $stations [expr $radbut*2+1]] 0
    eval exec fm off
    exit
}

proc mute {} {
    global stations radbut volume rvol state
    if {$state==0} {
    set rvol $volume
#   roma 20070217
#   eval exec fm [lindex $stations [expr $radbut*2+1]] 0
    eval exec fm off
    set state 1
    .mute config -text unmute

    } else {
#   eval exec fm [lindex $stations [expr $radbut*2+1]] $volume
    eval exec fm on
    set state 0
    .mute config -text mute
    }
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Sep 2007 20:31:43 -0000	1.2
+++ .cvsignore	21 Dec 2009 11:22:43 -0000	1.3
@@ -1,2 +1,2 @@
 fmcontrol.tar.gz
-fmtools-1.0.2.tar.gz
+fmtools-2.0.tar.gz


Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- fmtools.spec	24 Jul 2009 22:58:43 -0000	1.5
+++ fmtools.spec	21 Dec 2009 11:22:43 -0000	1.6
@@ -1,71 +1,109 @@
-Summary:	Simple Video for Linux radio card programs
-Name:		fmtools
-Version:	1.0.2
-Release:	6%{?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)
+Summary: Simple Video for Linux radio card programs
+Name:    fmtools
+Version: 2.0
+Release: 3%{?dist}
+License: GPLv2+
+Group:   Applications/Multimedia
+URL:     http://www.stanford.edu/~blp/fmtools/
+Source0: http://benpfaff.org/fmtools/fmtools/%{name}-%{version}.tar.gz
+Patch0:  fmtools.patch
+Source1: fmcontrol.tar.gz
+Source2: http://www.stanford.edu/~blp/fmtools/tkradio
+Source3: http://www.stanford.edu/~blp/fmtools/tkradio-mute
+Source4: fmtools.desktop
+Source5: radio.png
+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
+(v4l2) 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
+fm      - a simple tuner
+fmscan  - a simple band scanner
 
-The script fmcontrol is something Adrian Lester put together one evening to 
+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. 
+program from fmtools by Russell Kroll.
 
-The script does not support any of fm's command line options with the 
-exception of volume. 
+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
+%package tkradio
+Summary:       Tcl/Tk wrapper for fmtools
+Group:         Applications/Multimedia
+BuildRequires: desktop-file-utils
+Requires:      %{name} = %{version}
+Requires:      tk, alsa-utils
+BuildArch:     noarch
+
+%description tkradio
+This package contains wrappers for providing a GUI to %{name}.
+The stations are currently hard coded, but it is easy to change 
+them with a simple text editor. 
 
-# 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
+%prep
+%setup -q -a1
+%patch0 -p1 -b .fmtools
 
 # Add shebang to fmcontrol
 sed -i '1i#!/bin/sh' fmcontrol/fmcontrol
 
 %build
-make %{?_smp_mflags}
+%configure
+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}
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/tkradio.tcl
+install -pm 0755 %{SOURCE3} %{buildroot}%{_bindir}/tkradio-mute.tcl
+install -pm 0755 fmcontrol/fmcontrol %{buildroot}%{_bindir}
+install -pm 0644 fmcontrol/README README.fmcontrol
+
+# menu entry
+desktop-file-install                                    \
+        --vendor ""                                     \
+        --dir %{buildroot}%{_datadir}/applications      \
+        %{SOURCE4}
+
+install -Dpm 0644 %{SOURCE5} %{buildroot}%{_datadir}/pixmaps/radio.png
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files 
 %defattr(-,root,root,-)
-%doc CHANGES COPYING README README.fmcontrol fmcontrol/dot.*
-%{_bindir}/*
-%{_mandir}/man1/*
+%doc README COPYING README.fmcontrol fmcontrol/dot.*
+# Executables and man pages
+%{_bindir}/fm
+%{_bindir}/fmscan
+%{_bindir}/fmcontrol
 
+%files tkradio
+%defattr(-,root,root,-)
+%{_bindir}/tkradio*.tcl
+%{_datadir}/applications/fmtools.desktop
+%{_datadir}/pixmaps/radio.png
 
 %changelog
+
+* Sun Dec 20 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-3
+- Packaging tkradio separately.
+
+* Sun Dec 20 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-2
+- Patched to make it work.
+- Added desktop entry.
+
+* Sun Dec 13 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-1
+- Initial v4l2 support provided by version 2.0
+- Included tkradio and fmcontrol.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -75,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Oct 17 2008 kwizart < kwizart at gmail.com > - 1.0.2-4
 - Rebuild for F-10
 
-* Sat Feb  9 2008 kwizart < kwizart at gmail.com > - 1.0.2-3
+* Sat Feb 09 2008 kwizart < kwizart at gmail.com > - 1.0.2-3
 - Rebuild for gcc43
 
 * Fri Sep 21 2007 kwizart <kwizart at gmail.com > - 1.0.2-2
@@ -87,6 +125,5 @@ rm -rf $RPM_BUILD_ROOT
 * 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>
+* Mon Sep 04 2006 TC Wan <tcwan at cs.usm.my>
 - Built Version 1.0 for FC 5
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Sep 2007 20:31:43 -0000	1.2
+++ sources	21 Dec 2009 11:22:43 -0000	1.3
@@ -1,2 +1,2 @@
 fe40296a7515f506c6b46a0ec7f056eb  fmcontrol.tar.gz
-4bae0e5feeb8cbf4cfcb950301e9509d  fmtools-1.0.2.tar.gz
+807467a8bccae32317c6bdb6c5329ab3  fmtools-2.0.tar.gz



From jkratoch at fedoraproject.org  Mon Dec 21 11:26:49 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 21 Dec 2009 11:26:49 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-empty-namespace.patch, NONE,
	1.1 gdb-ppc-hw-watchpoint-twice.patch, NONE,
	1.1 gdb-rhel5-compat.patch, NONE, 1.1 gdb-rhel5-gcc44.patch,
	NONE, 1.1 gdb-7.0-upstream.patch, 1.3, 1.4 gdb.spec, 1.403,
	1.404 gdb-rhel5-fortran44.patch, 1.1, NONE
Message-ID: <20091221112649.4159711C00E7@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3787

Modified Files:
	gdb-7.0-upstream.patch gdb.spec 
Added Files:
	gdb-empty-namespace.patch gdb-ppc-hw-watchpoint-twice.patch 
	gdb-rhel5-compat.patch gdb-rhel5-gcc44.patch 
Removed Files:
	gdb-rhel5-fortran44.patch 
Log Message:
* Mon Dec 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-12.fc12
- Workaround build on native ppc64 host.
- More RHEL-5 compatibility updates.
  - Disable warning messages new for gdb-6.8+ for RHEL-5 backward compatibility.
  - Workaround RHEL-5 kernels for detaching SIGSTOPped processes (BZ 498595).
  - Serialize the testsuite output to keep the order for regression checks.
  - Re-enable python for all non-ppc* arches.
  - More gcc44 stack exceptions when running the testsuite on RHEL-5.
- Fix backward compatibility with G++ 4.1 namespaces "::".
- Fix regression on re-setting the single ppc watchpoint slot.
- Update snapshot of FSF gdb-7.0.x branch.
  - Backport fix of dcache invalidation locking up GDB on ppc64 targets.


gdb-empty-namespace.patch:
 b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.S   |  108 +++++++++++++++++++++
 b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp |   43 ++++++++
 gdb/dwarf2read.c                                   |   14 ++
 3 files changed, 163 insertions(+), 2 deletions(-)

--- NEW FILE gdb-empty-namespace.patch ---
gdb/
2009-12-20  Jan Kratochvil  <jan.kratochvil at redhat.com>

	Fix compatibility with G++-4.1.
	* dwarf2read.c (partial_die_parent_scope): New variable PARENT_NAME.
	Ignore parent namespaces with name "::".
	(physname_prefix_1): Ignore namespaces with name "::".

gdb/testsuite/
2009-12-20  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.dwarf2/dw2-empty-namespace.exp, gdb.dwarf2/dw2-empty-namespace.S:
	New.

--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2355,11 +2355,18 @@ partial_die_parent_scope (struct partial_die_info *pdi,
       || parent->tag == DW_TAG_interface_type
       || parent->tag == DW_TAG_union_type)
     {
+      char *parent_name = parent->name;
+
+      /* G++ 4.1 produced DW_TAG_namespace with DW_AT_name "::".  */
+      if (parent->tag == DW_TAG_namespace && parent_name != NULL
+          && strcmp (parent_name, "::") == 0)
+	parent_name = NULL;
+
       if (grandparent_scope == NULL)
-	parent->scope = parent->name;
+	parent->scope = parent_name;
       else
 	parent->scope = typename_concat (&cu->comp_unit_obstack, grandparent_scope,
-					 parent->name, cu);
+					 parent_name, cu);
     }
   else if (parent->tag == DW_TAG_enumeration_type)
     /* Enumerators should not get the name of the enumeration as a prefix.  */
@@ -9008,6 +9015,9 @@ physname_prefix_1 (struct ui_file *buf, struct die_info *die,
 	  name = dwarf2_name (die, cu);
 	  if (name == NULL)
 	    name = "(anonymous namespace)";
+	  /* G++ 4.1 produced DW_TAG_namespace with DW_AT_name "::".  */
+	  else if (strcmp (name, "::") == 0)
+	    name = NULL;
 	  break;
 
 	case DW_TAG_class_type:
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.S
@@ -0,0 +1,108 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2009 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Test G++ 4.1 producing DW_TAG_namespace with DW_AT_name "::".  */
+
+	.data
+var:	.4byte	1
+
+	.section .debug_info
+.Lcu1_begin:
+	/* CU header */
+	.4byte	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
+.Lcu1_start:
+	.2byte	2				/* DWARF Version */
+	.4byte	.Labbrev1_begin			/* Offset into abbrev section */
+	.byte	4				/* Pointer size */
+
+	/* CU die */
+	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
+	.ascii	"file1.txt\0"			/* DW_AT_name */
+	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
+	.byte	4				/* DW_LANG_C_plus_plus (C++) */
+
+.Ltype_int:
+	.uleb128	2			/* Abbrev: DW_TAG_base_type */
+	.ascii		"int\0"			/* DW_AT_name */
+	.byte		4			/* DW_AT_byte_size */
+	.byte		5			/* DW_AT_encoding */
+
+	.uleb128	3			/* Abbrev: DW_TAG_namespace */
+	.ascii		"::\0"			/* DW_AT_name */
+
+	.uleb128	7			/* Abbrev: DW_TAG_variable (location) */
+	.ascii		"var\0"			/* DW_AT_name */
+	.byte		2f - 1f			/* DW_AT_location */
+1:	.byte		3			/*   DW_OP_addr */
+	.4byte		var			/*   <addr> */
+2:	.4byte		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
+
+	.byte		0			/* End of children of DW_TAG_namespace */
+
+	.byte		0			/* End of children of CU */
+
+.Lcu1_end:
+
+/* Abbrev table */
+	.section .debug_abbrev
+.Labbrev1_begin:
+	.uleb128	1			/* Abbrev code */
+	.uleb128	0x11			/* DW_TAG_compile_unit */
+	.byte		1			/* has_children */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0x25			/* DW_AT_producer */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0x13			/* DW_AT_language */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+
+	.uleb128	2			/* Abbrev code */
+	.uleb128	0x24			/* DW_TAG_base_type */
+	.byte		0			/* has_children */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0xb			/* DW_AT_byte_size */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.uleb128	0x3e			/* DW_AT_encoding */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+
+	.uleb128	3			/* Abbrev code */
+	.uleb128	0x39			/* DW_TAG_namespace */
+	.byte		1			/* has_children */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+
+	.uleb128	7			/* Abbrev code (location) */
+	.uleb128	0x34			/* DW_TAG_variable */
+	.byte		0			/* has_children */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0x2			/* DW_AT_location */
+	.uleb128	0xa			/* DW_FORM_block1 */
+	.uleb128	0x49			/* DW_AT_type */
+	.uleb128	0x13			/* DW_FORM_ref4 */
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp
@@ -0,0 +1,43 @@
+# Copyright 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test G++ 4.1 producing DW_TAG_namespace with DW_AT_name "::".
+
+# This test can only be run on targets which support DWARF-2 and use gas.
+# For now pick a sampling of likely targets.
+if {![istarget *-*-linux*]
+    && ![istarget *-*-gnu*]
+    && ![istarget *-*-elf*]
+    && ![istarget *-*-openbsd*]
+    && ![istarget arm-*-eabi*]
+    && ![istarget powerpc-*-eabi*]} {
+    return 0  
+}
+
+set testfile "dw2-empty-namespace"
+set srcfile ${testfile}.S
+set executable ${testfile}.x
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objdir}/${subdir}/${executable}" object {nodebug}] != "" } {
+    return -1
+}
+
+clean_restart $executable
+
+# `p var' below can work without identified DWARF DIE just based on its ELF symbol.
+# Catch it here as `type = <data variable, no debug info>'.
+gdb_test "ptype var" "type = int"
+
+gdb_test "p var" " = 1"

gdb-ppc-hw-watchpoint-twice.patch:
 breakpoint.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE gdb-ppc-hw-watchpoint-twice.patch ---
pcc regression from:
http://sourceware.org/ml/gdb-patches/2008-12/msg00143.html

gdb/
2009-12-21  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* breakpoint.c (update_watchpoint): Set B->TYPE to bp_watchpoint before
	calling hw_watchpoint_used_count.

--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1152,6 +1152,9 @@ update_watchpoint (struct breakpoint *b, int reparse)
 	  {
 	    int i, mem_cnt, other_type_used;
 
+	    /* Do not count with B twice below.  */
+	    b->type = bp_watchpoint;
+
 	    i = hw_watchpoint_used_count (bp_hardware_watchpoint,
 					  &other_type_used);
 	    mem_cnt = can_use_hardware_watchpoint (val_chain);

gdb-rhel5-compat.patch:
 gdb/linux-nat.c |   18 ++++++++++++++++--
 symfile.c       |    2 ++
 2 files changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE gdb-rhel5-compat.patch ---
gdb/linux-nat.c:
- Workaround RHEL-5 kernels for detaching SIGSTOPped processes (BZ 498595).

--- gdb-6.8/gdb-orig/symfile.c	2008-08-21 00:06:50.000000000 +0200
+++ gdb-6.8/gdb/symfile.c	2008-08-21 22:31:00.000000000 +0200
@@ -1456,8 +1456,10 @@ find_separate_debug_file (struct objfile
       /* Prevent looping on a stripped .debug file.  */
       if (build_id_name != NULL && strcmp (build_id_name, objfile->name) == 0)
         {
+#if 0 /* RHEL-5 backward behavior compatibility.  */
 	  warning (_("\"%s\": separate debug info file has no debug info"),
 		   build_id_name);
+#endif
 	  xfree (build_id_name);
 	}
       else if (build_id_name != NULL)
--- gdb-7.0-orig/gdb/linux-nat.c	2009-12-19 20:53:46.000000000 +0100
+++ gdb-7.0/gdb/linux-nat.c	2009-12-19 20:55:02.000000000 +0100
@@ -1604,8 +1604,22 @@ GPT: lwp %s had signal %s, but it is in 
 	*status = lp->status;
     }
 
-  if (*status == 0 && GET_PID (lp->ptid) == pid_was_stopped)
-    *status = W_STOPCODE (SIGSTOP);
+  /* Workaround RHEL-5 kernel which has unreliable PTRACE_DETACH, SIGSTOP (that
+     many TIDs are left unstopped).  See RH Bug 496732.  */
+  if (GET_PID (lp->ptid) == pid_was_stopped)
+    {
+      int err;
+
+      errno = 0;
+      err = kill_lwp (GET_LWP (lp->ptid), SIGSTOP);
+      if (debug_linux_nat)
+	{
+	  fprintf_unfiltered (gdb_stdlog,
+			      "SC:  lwp kill %d %s\n",
+			      err,
+			      errno ? safe_strerror (errno) : "ERRNO-OK");
+	}
+    }
 
   return 0;
 }

gdb-rhel5-gcc44.patch:
 ./gdb/testsuite/gdb.fortran/common-block.exp    |   20 +++++++++
 ./gdb/testsuite/gdb.fortran/derived-type.exp    |   20 +++++++++
 ./gdb/testsuite/gdb.fortran/dwarf-stride.exp    |   20 +++++++++
 ./gdb/testsuite/gdb.fortran/dynamic.exp         |   20 +++++++++
 ./gdb/testsuite/gdb.fortran/library-module.exp  |   26 ++++++++++--
 ./gdb/testsuite/gdb.fortran/module.exp          |   20 +++++++++
 ./gdb/testsuite/gdb.fortran/string.exp          |   20 +++++++++
 ./gdb/testsuite/gdb.fortran/subarray.exp        |   20 +++++++++
 ./gdb/testsuite/gdb.threads/tls-sepdebug.exp    |   20 +++++++++
 gdb-7.0/gdb/testsuite/gdb.base/break-interp.exp |   50 ++++++++++++++++++++++--
 gdb-7.0/gdb/testsuite/gdb.base/vla.exp          |   20 +++++++++
 gdb-7.0/gdb/testsuite/gdb.fortran/omp-step.exp  |   21 +++++++++-
 12 files changed, 260 insertions(+), 17 deletions(-)

--- NEW FILE gdb-rhel5-gcc44.patch ---
Some functionality is available on RHEL-5.4+ only with gcc44 and gfortran44 as
the default gcc and gfortran binaries are from gcc-4.1.

--- gdb-7.0/gdb/testsuite/gdb.base/vla.exp-orig	2009-12-20 00:38:13.000000000 +0100
+++ gdb-7.0/gdb/testsuite/gdb.base/vla.exp	2009-12-20 00:54:19.000000000 +0100
@@ -16,7 +16,25 @@
 set testfile vla
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+# Temporarily provide compiler=gcc44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists compiler] {
+    set old_compiler [board_info $board compiler]
+    unset_board_info compiler
+} elseif [info exists old_compiler] {
+    unset old_compiler
+}
+set_board_info compiler gcc44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug quiet}]
+
+unset_board_info compiler
+if [info exists old_compiler] {
+    set_board_info compiler $old_compiler
+}
+
+if  { $err != "" } {
     untested "Couldn't compile test program"
     return -1
 }
--- gdb-7.0/gdb/testsuite/gdb.base/break-interp.exp-orig	2009-12-20 00:38:13.000000000 +0100
+++ gdb-7.0/gdb/testsuite/gdb.base/break-interp.exp	2009-12-20 01:11:47.000000000 +0100
@@ -31,10 +31,30 @@ if [get_compiler_info ${binfile_lib}] {
     return -1
 }
 
+# Temporarily provide compiler=gcc44 saving the original value around.
+# RHEL-5 workaround of its:
+#   gcc: -soname: linker input file unused because linking not done
+
+set board [target_info name]
+if [board_info $board exists compiler] {
+    set old_compiler [board_info $board compiler]
+    unset_board_info compiler
+} elseif [info exists old_compiler] {
+    unset old_compiler
+}
+set_board_info compiler gcc44
+
 # Use -soname so that it is listed with " => " by ldd and this testcase makes
 # a copy of ${binfile_lib} for each prelink variant.
 
-if {[gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} [list debug additional_flags=-Wl,-soname,${test}.so]] != ""} {
+set err [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} [list debug additional_flags=-Wl,-soname,${test}.so]]
+
+unset_board_info compiler
+if [info exists old_compiler] {
+    set_board_info compiler $old_compiler
+}
+
+if { $err != "" } {
     return -1
 }
 
@@ -483,9 +503,33 @@ foreach ldprelink {NO YES} {
 		    if {$binpie == "YES"} {
 			lappend opts {additional_flags=-fPIE -pie}
 		    }
-		    if {[build_executable ${test}.exp [file tail $exec] $srcfile $opts] == -1} {
-			continue;
+
+
+		    # Temporarily provide compiler=gcc44 saving the original value around.
+		    # RHEL-5 workaround of its:
+		    #   gcc: -rpath: linker input file unused because linking not done
+		    #   gcc: --dynamic-linker: linker input file unused because linking not done
+
+		    set board [target_info name]
+		    if [board_info $board exists compiler] {
+			set old_compiler [board_info $board compiler]
+			unset_board_info compiler
+		    } elseif [info exists old_compiler] {
+			unset old_compiler
+		    }
+		    set_board_info compiler gcc44
+
+		    set err [build_executable ${test}.exp [file tail $exec] $srcfile $opts]
+
+		    unset_board_info compiler
+		    if [info exists old_compiler] {
+			set_board_info compiler $old_compiler
 		    }
+
+		    if { $err == -1 } {
+			continue
+		    }
+
 		    if {$binsepdebug == "SEP"} {
 			gdb_gnu_strip_debug $exec
 			# Just a sanity check.  As gdb_gnu_strip_debug uses the
--- ./gdb/testsuite/gdb.fortran/common-block.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/common-block.exp	2009-12-15 05:21:00.000000000 +0100
@@ -20,7 +20,25 @@ set testfile "common-block"
 set srcfile ${testfile}.f90
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if  { $err != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- ./gdb/testsuite/gdb.fortran/dwarf-stride.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/dwarf-stride.exp	2009-12-15 05:20:07.000000000 +0100
@@ -27,7 +27,25 @@
 set testfile dwarf-stride
 set srcfile ${testfile}.f90
 
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f77}] } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler 
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+} 
+set_board_info f77compiler gfortran44
+
+set err [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f77}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if $err {
     return -1
 }
 
--- ./gdb/testsuite/gdb.fortran/dynamic.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/dynamic.exp	2009-12-15 05:17:21.000000000 +0100
@@ -25,7 +25,25 @@ set testfile "dynamic"
 set srcfile ${testfile}.f90
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if  { $err != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- ./gdb/testsuite/gdb.fortran/library-module.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/library-module.exp	2009-12-15 05:22:37.000000000 +0100
@@ -25,16 +25,34 @@ if [get_compiler_info not-used] {
    return -1
 }
 
-if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $objdir/$subdir/$libfile {debug f77}] != "" } {
-    untested "Couldn't compile ${srclibfile}"
-    return -1
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
 }
+set_board_info f77compiler gfortran44
 
 # prepare_for_testing cannot be used as linking with $libfile cannot be passed
 # just for the linking phase (and not the source compilation phase).  And any
 # warnings on ignored $libfile abort the process.
 
-if  { [gdb_compile [list $srcdir/$subdir/$srcfile $objdir/$subdir/$libfile] $objdir/$subdir/$binfile executable {debug f77}] != "" } {
+set err1 [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $objdir/$subdir/$libfile {debug f77}]
+set err2 [gdb_compile [list $srcdir/$subdir/$srcfile $objdir/$subdir/$libfile] $objdir/$subdir/$binfile executable {debug f77}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if  { $err1 != "" } {
+    untested "Couldn't compile ${srclibfile}"
+    return -1
+}
+if  { $err2 != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- ./gdb/testsuite/gdb.fortran/module.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/module.exp	2009-12-15 05:28:49.000000000 +0100
@@ -16,7 +16,25 @@
 set testfile "module"
 set srcfile ${testfile}.f90
 
-if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f77}] } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [prepare_for_testing $testfile.exp $testfile $srcfile {debug f77}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if $err {
     return -1
 }
 
--- ./gdb/testsuite/gdb.fortran/string.exp	2009-12-15 05:13:56.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/string.exp	2009-12-15 05:18:13.000000000 +0100
@@ -23,7 +23,25 @@ set testfile "string"
 set srcfile ${testfile}.f90
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if { $err != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- gdb-7.0/gdb/testsuite/gdb.fortran/omp-step.exp-orig	2009-12-20 09:47:04.000000000 +0100
+++ gdb-7.0/gdb/testsuite/gdb.fortran/omp-step.exp	2009-12-20 09:50:06.000000000 +0100
@@ -15,7 +15,26 @@
 
 set testfile "omp-step"
 set srcfile ${testfile}.f90
-if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f77 additional_flags=-fopenmp}] } {
+
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler 
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+} 
+set_board_info f77compiler gfortran44
+
+set err [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f77 additional_flags=-fopenmp}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if $err {
     return -1
 }
 
--- ./gdb/testsuite/gdb.fortran/derived-type.exp	2009-01-07 13:39:13.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/derived-type.exp	2009-12-20 12:37:12.000000000 +0100
@@ -26,7 +26,25 @@ set testfile "derived-type"
 set srcfile ${testfile}.f90
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if { $err != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- ./gdb/testsuite/gdb.fortran/subarray.exp	2009-01-07 13:39:13.000000000 +0100
+++ ./gdb/testsuite/gdb.fortran/subarray.exp	2009-12-20 12:38:00.000000000 +0100
@@ -26,7 +26,25 @@ set testfile "subarray"
 set srcfile ${testfile}.f
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}] != "" } {
+# Temporarily provide f77compiler=gfortran44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists f77compiler] {
+    set old_f77compiler [board_info $board f77compiler]
+    unset_board_info f77compiler
+} elseif [info exists old_f77compiler] {
+    unset old_f77compiler
+}
+set_board_info f77compiler gfortran44
+
+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f77 quiet}]
+
+unset_board_info f77compiler
+if [info exists old_f77compiler] {
+    set_board_info f77compiler $old_f77compiler
+}
+
+if { $err != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
--- ./gdb/testsuite/gdb.threads/tls-sepdebug.exp	2009-12-20 12:22:18.000000000 +0100
+++ ./gdb/testsuite/gdb.threads/tls-sepdebug.exp	2009-12-20 12:39:53.000000000 +0100
@@ -32,7 +32,25 @@ set binshareddebugfile ${objdir}/${subdi
 
 # FIXME: gcc dependency (-Wl,-soname).
 
-if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srcsharedfile}" "${binsharedfile}" [list debug additional_flags=-Wl,-soname=${binsharedbase}]] != "" } {
+# Temporarily provide compiler=gcc44 saving the original value around.
+
+set board [target_info name]
+if [board_info $board exists compiler] {
+    set old_compiler [board_info $board compiler]
+    unset_board_info compiler
+} elseif [info exists old_compiler] {
+    unset old_compiler
+}
+set_board_info compiler gcc44
+
+set err [gdb_compile_shlib "${srcdir}/${subdir}/${srcsharedfile}" "${binsharedfile}" [list debug additional_flags=-Wl,-soname=${binsharedbase}]]
+
+unset_board_info compiler
+if [info exists old_compiler] {
+    set_board_info compiler $old_compiler
+}
+
+if { $err != "" } {
     untested "Couldn't compile test library"
     return -1
 }

gdb-7.0-upstream.patch:
 gdb/COPYING                            |  916 +++++++++++++++++++++----------
 gdb/ChangeLog                          |   75 ++
 gdb/amd64-tdep.c                       |    2 
 gdb/amd64fbsd-nat.c                    |    3 
 gdb/arm-tdep.c                         |  212 +++++++
 gdb/completer.c                        |    4 
 gdb/dbxread.c                          |    9 
 gdb/dcache.c                           |  139 +++-
 gdb/doc/ChangeLog                      |    4 
 gdb/doc/gpl.texi                       |  958 ++++++++++++++++++++++-----------
 gdb/dwarf2-frame.c                     |    8 
 gdb/dwarf2read.c                       |    3 
 gdb/elfread.c                          |    3 
 gdb/objfiles.c                         |   16 
 gdb/score-tdep.c                       |   52 -
 gdb/score-tdep.h                       |   64 --
 gdb/testsuite/ChangeLog                |   21 
 gdb/testsuite/gdb.base/bigcore.exp     |    2 
 gdb/testsuite/gdb.base/foll-fork.c     |    3 
 gdb/testsuite/gdb.base/foll-fork.exp   |    3 
 gdb/testsuite/gdb.base/structs.c       |    6 
 gdb/testsuite/gdb.base/structs.exp     |   62 +-
 src/gdb/doc/gdb.texinfo                |    6 
 src/gdb/testsuite/gdb.base/default.exp |    7 
 24 files changed, 1777 insertions(+), 801 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.3 -r 1.4 gdb-7.0-upstream.patchIndex: gdb-7.0-upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-7.0-upstream.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdb-7.0-upstream.patch	18 Dec 2009 09:48:50 -0000	1.3
+++ gdb-7.0-upstream.patch	21 Dec 2009 11:26:47 -0000	1.4
@@ -1,6 +1,1019 @@
-### ./gdb/ChangeLog	6 Oct 2009 16:32:30 -0000	1.10874.2.46
-### ./gdb/ChangeLog	22 Oct 2009 20:31:36 -0000	1.10874.2.52
-## -1,3 +1,33 @@
+--- a/gdb/COPYING
++++ b/gdb/COPYING
+@@ -1,286 +1,626 @@
+-		    GNU GENERAL PUBLIC LICENSE
+-		       Version 2, June 1991
++                    GNU GENERAL PUBLIC LICENSE
++                       Version 3, 29 June 2007
+ 
+- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-                       51 Franklin Street, Fifth Floor, 
+-		       Boston, MA 02110-1301, USA
++ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+-			    Preamble
++                            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
++  The GNU General Public License is a free, copyleft license for
++software and other kinds of works.
++
++  The licenses for most software and other practical works are designed
++to take away your freedom to share and change the works.  By contrast,
++the GNU General Public License is intended to guarantee your freedom to
++share and change all versions of a program--to make sure it remains free
++software for all its users.  We, the Free Software Foundation, use the
++GNU General Public License for most of our software; it applies also to
++any other work released this way by its authors.  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.
++them 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.
++  To protect your rights, we need to prevent others from denying you
++these rights or asking you to surrender the rights.  Therefore, you have
++certain responsibilities if you distribute copies of the software, or if
++you modify it: responsibilities to respect the freedom of others.
+ 
+   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.
++gratis or for a fee, you must pass on to the recipients the same
++freedoms that you received.  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.
++
++  Developers that use the GNU GPL protect your rights with two steps:
++(1) assert copyright on the software, and (2) offer you this License
++giving you legal permission to copy, distribute and/or modify it.
++
++  For the developers' and authors' protection, the GPL clearly explains
++that there is no warranty for this free software.  For both users' and
++authors' sake, the GPL requires that modified versions be marked as
++changed, so that their problems will not be attributed erroneously to
++authors of previous versions.
++
++  Some devices are designed to deny users access to install or run
++modified versions of the software inside them, although the manufacturer
++can do so.  This is fundamentally incompatible with the aim of
++protecting users' freedom to change the software.  The systematic
++pattern of such abuse occurs in the area of products for individuals to
++use, which is precisely where it is most unacceptable.  Therefore, we
++have designed this version of the GPL to prohibit the practice for those
++products.  If such problems arise substantially in other domains, we
++stand ready to extend this provision to those domains in future versions
++of the GPL, as needed to protect the freedom of users.
++
++  Finally, every program is threatened constantly by software patents.
++States should not allow patents to restrict development and use of
++software on general-purpose computers, but in those that do, we wish to
++avoid the special danger that patents applied to a free program could
++make it effectively proprietary.  To prevent this, the GPL assures that
++patents cannot be used to render the program non-free.
+ 
+   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
[...2640 lines suppressed...]
-	(start_structs_test): Import global anychar_re and first.
-	New gdb_test call "set print elements 300; ${testfile}"
-	(start_structs_test <$first>): New block.
-	(any): Import global anychar_re.  New variable ac.  Use ${ac}.
-
+--- a/gdb/testsuite/gdb.base/foll-fork.c
++++ b/gdb/testsuite/gdb.base/foll-fork.c
+@@ -9,7 +9,8 @@ void callee (i)
+   int  i;
+ #endif
+ {
+-  printf("callee: %d\n", i);
++  /* Any output corrupts GDB CLI expect strings.
++     printf("callee: %d\n", i);  */
+ }
+ 
+ #ifdef PROTOTYPES
+--- a/gdb/testsuite/gdb.base/foll-fork.exp
++++ b/gdb/testsuite/gdb.base/foll-fork.exp
+@@ -240,7 +240,8 @@ proc catch_fork_unpatch_child {} {
+    # Delete all breakpoints and catchpoints.
+    delete_breakpoints
+ 
+-   gdb_test "break $bp_exit" \
++   # Force $srcfile as the current GDB source can be in glibc sourcetree.
++   gdb_test "break $srcfile:$bp_exit" \
+        "Breakpoint .*file .*$srcfile, line .*" \
+        "unpatch child, breakpoint at exit call"
+ 
 --- a/gdb/testsuite/gdb.base/structs.c
 +++ b/gdb/testsuite/gdb.base/structs.c
 @@ -396,6 +396,8 @@ zed ()
@@ -487,76 +3049,11 @@ gdb/testsuite/
  }
  
  # Given N (0..25), return the corresponding alphabetic letter in lower
-
-
-
-http://sourceware.org/ml/gdb-patches/2009-11/msg00573.html
-http://sourceware.org/ml/gdb-cvs/2009-11/msg00232.html
-Subject: [patch] testsuite fuzzy results fixup: foll-fork.exp
-
-Hi,
-
-one occasional timeout:
-
- (gdb) PASS: gdb.base/foll-fork.exp: default show parent follow, no catchpoints
- next 2
--callee: 9949
- 25       if (pid == 0) /* set breakpoint here */
--(gdb) PASS: gdb.base/foll-fork.exp: default parent follow, no catchpoints
-+(gdb) callee: 18747
-+FAIL: gdb.base/foll-fork.exp: (timeout) default parent follow, no catchpoints
-
-Dropped the strings as there is no "callee" string expectation in
-foll-fork.exp.
-
-
-and with glibc-debuginfo installed one gets:
-
-(gdb) break 39
-Reading in symbols for ../nptl/sysdeps/unix/sysv/linux/fork.c...done.
-Breakpoint 12 at 0x3ad22a4876: file ../nptl/sysdeps/unix/sysv/linux/fork.c, line 39.
-(gdb) FAIL: gdb.base/foll-fork.exp: unpatch child, breakpoint at exit call
-+
-Breakpoint 12, __libc_fork () at ../nptl/sysdeps/unix/sysv/linux/fork.c:158
-158           fresetlockfiles ();
-(gdb) FAIL: gdb.base/foll-fork.exp: unpatch child, unpatched parent breakpoints from child (unknown output)
-
-
-Thanks,
-Jan
-
-
-gdb/testsuite/
-2009-11-26  Jan Kratochvil  <jan.kratochvil at redhat.com>
-
-	* gdb.base/foll-fork.exp (unpatch child, breakpoint at exit call):
-	Force $srcfile file.
-	* gdb.base/foll-fork.c (callee): Comment out the printf call.
-
---- a/gdb/testsuite/gdb.base/foll-fork.c
-+++ b/gdb/testsuite/gdb.base/foll-fork.c
-@@ -9,7 +9,8 @@ void callee (i)
-   int  i;
- #endif
- {
--  printf("callee: %d\n", i);
-+  /* Any output corrupts GDB CLI expect strings.
-+     printf("callee: %d\n", i);  */
- }
- 
- #ifdef PROTOTYPES
---- a/gdb/testsuite/gdb.base/foll-fork.exp
-+++ b/gdb/testsuite/gdb.base/foll-fork.exp
-@@ -240,7 +240,8 @@ proc catch_fork_unpatch_child {} {
-    # Delete all breakpoints and catchpoints.
-    delete_breakpoints
- 
--   gdb_test "break $bp_exit" \
-+   # Force $srcfile as the current GDB source can be in glibc sourcetree.
-+   gdb_test "break $srcfile:$bp_exit" \
-        "Breakpoint .*file .*$srcfile, line .*" \
-        "unpatch child, breakpoint at exit call"
- 
+### a/gdb/version.in
+### b/gdb/version.in
+## -1 +1 @@
+-7.0
++7.0.0.20091221-cvs
 
 
 
@@ -627,37 +3124,54 @@ gdb/
 
 
 
-http://sourceware.org/ml/gdb-patches/2009-11/msg00422.html
-http://sourceware.org/ml/gdb-cvs/2009-11/msg00169.html
-
-### src/gdb/ChangeLog	2009/11/19 22:42:48	1.11094
-### src/gdb/ChangeLog	2009/11/19 22:44:32	1.11095
+Re: [RFA] Fix "show convenience" test
+http://sourceware.org/ml/gdb-patches/2009-09/msg00565.html
+http://sourceware.org/ml/gdb-cvs/2009-09/msg00099.html
+
+### src/gdb/testsuite/ChangeLog	2009/09/15 18:51:25	1.1960
+### src/gdb/testsuite/ChangeLog	2009/09/17 17:49:46	1.1961
+## -1,3 +1,7 @@
++2009-09-17  Paul Pluzhnikov  <ppluzhnikov at google.com>
++
++	* gdb.base/default.exp: Fix "show convenience".
++
+ 2009-09-15  Tom Tromey  <tromey at redhat.com>
+ 
+ 	* lib/mi-support.exp (mi_create_varobj): Update.
+--- src/gdb/testsuite/gdb.base/default.exp	2009/08/13 14:58:27	1.31
++++ src/gdb/testsuite/gdb.base/default.exp	2009/09/17 17:49:46	1.32
+@@ -598,7 +598,7 @@
+ #test show confirm
+ gdb_test "show confirm" "Whether to confirm potentially dangerous operations is o\[a-z\]*." "show confirm"
+ #test show convenience
+-gdb_test "show convenience" "No debugger convenience variables now defined.(\[^\r\n\]*\[\r\n\])+Convenience variables have names starting with \".\";(\[^\r\n\]*\[\r\n\])+use \"set\" as in \"set .foo = 5\" to define them." "show convenience"
++gdb_test "show convenience" "\\\$_siginfo = void" "show convenience"
+ #test show directories
+ gdb_test "show directories" "Source directories searched: .cdir\[:;\].cwd" "show directories"
+ #test show editing
+### src/gdb/doc/ChangeLog	2009/09/15 18:51:24	1.953
+### src/gdb/doc/ChangeLog	2009/09/17 17:49:46	1.954
 ## -1,3 +1,8 @@
-+2009-11-19  Joel Brobecker  <brobecker at adacore.com>
++2009-09-17  Paul Pluzhnikov  <ppluzhnikov at google.com>
 +
-+	* completer.c (complete_line_internal): Make sure the command
-+	completer is not NULL before calling it.
-+
- 2009-11-19  Jerome Guitton  <guitton at adacore.com>
++	* gdb.texinfo (convenince variables): Mention
++	$_siginfo could be empty.
++	
+ 2009-09-15  Tom Tromey  <tromey at redhat.com>
  
- 	* ada-lang.c (packed_array_type): Rename to...
---- src/gdb/completer.c	2009/03/25 10:50:56	1.34
-+++ src/gdb/completer.c	2009/11/19 22:44:34	1.35
-@@ -676,7 +676,7 @@
- 			   p--)
- 			;
- 		    }
--		  if (reason != handle_brkchars)
-+		  if (reason != handle_brkchars && c->completer != NULL)
- 		    list = (*c->completer) (c, p, word);
- 		}
- 	    }
-@@ -747,7 +747,7 @@
- 		       p--)
- 		    ;
- 		}
--	      if (reason != handle_brkchars)
-+	      if (reason != handle_brkchars && c->completer != NULL)
- 		list = (*c->completer) (c, p, word);
- 	    }
- 	}
+ 	* gdb.texinfo (GDB/MI Variable Objects): Document
+--- src/gdb/doc/gdb.texinfo	2009/09/15 18:51:25	1.624
++++ src/gdb/doc/gdb.texinfo	2009/09/17 17:49:46	1.625
+@@ -7819,8 +7819,10 @@
+ 
+ @item $_siginfo
+ @vindex $_siginfo at r{, convenience variable}
+-The variable @code{$_siginfo} is bound to extra signal information
+-inspection (@pxref{extra signal information}).
++The variable @code{$_siginfo} contains extra signal information
++(@pxref{extra signal information}).  Note that @code{$_siginfo}
++could be empty, if the application has not yet received any signals.
++For example, it will be empty before you execute the @code{run} command.
+ @end table
+ 
+ On HP-UX systems, if you refer to a function or variable name that


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- gdb.spec	18 Dec 2009 09:51:52 -0000	1.403
+++ gdb.spec	21 Dec 2009 11:26:48 -0000	1.404
@@ -16,8 +16,10 @@
 # RHEL-5 ppc* python .so files are shipped only as ppc but gdb is ppc64 there.
 # Brew builds it fine as its ppc64 buildroot has full ppc64 package set.
 %if 0%{?el5:1}
+%ifarch ppc ppc64
 %define _without_python 1
 %endif
+%endif
 
 Summary: A GNU source-level debugger for C, C++, Java and other languages
 Name: gdb%{?_with_debug:-debug}
@@ -29,7 +31,7 @@ Version: 7.0
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 11%{?_with_upstream:.upstream}%{dist}
+Release: 12%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -401,7 +403,17 @@ Patch391: gdb-x86_64-i386-syscall-restar
 Patch392: gdb-bz533176-fortran-omp-step.patch
 
 # Use gfortran44 when running the testsuite on RHEL-5.
-Patch393: gdb-rhel5-fortran44.patch
+Patch393: gdb-rhel5-gcc44.patch
+
+# Disable warning messages new for gdb-6.8+ for RHEL-5 backward compatibility.
+# Workaround RHEL-5 kernels for detaching SIGSTOPped processes (BZ 498595).
+Patch335: gdb-rhel5-compat.patch
+
+# Fix backward compatibility with G++ 4.1 namespaces "::".
+Patch395: gdb-empty-namespace.patch
+
+# Fix regression on re-setting the single ppc watchpoint slot.
+Patch396: gdb-ppc-hw-watchpoint-twice.patch
 
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
@@ -412,7 +424,11 @@ BuildRequires: rpm-devel
 Requires: zlib
 BuildRequires: zlib-devel
 %if 0%{!?_without_python:1}
+%if 0%{!?el5:1}
 Requires: python-libs
+%else
+Requires: python
+%endif
 BuildRequires: python-devel
 # Temporarily before it gets moved to libstdc++.rpm
 BuildRequires: libstdc++
@@ -634,10 +650,14 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch392 -p1
 # Always verify its applicability.
 %patch393 -p1
+%patch335 -p1
 %if 0%{!?el5:1}
 %patch393 -p1 -R
+%patch335 -p1 -R
 %endif
 %patch394 -p1
+%patch395 -p1
+%patch396 -p1
 
 find -name "*.orig" | xargs rm -f
 ! find -name "*.rej"	# Should not happen.
@@ -706,6 +726,8 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 	--disable-rpath					\
 	--with-system-readline				\
 	--with-expat					\
+$(: ppc64 host build crashes on /usr/lib/libexpat.so )	\
+	--without-libexpat-prefix			\
 	--enable-tui					\
 %if 0%{!?_without_python:1}
 	--with-python					\
@@ -808,7 +830,12 @@ gcc -o ./orphanripper %{SOURCE2} -Wall -
   CHECK="$(echo $CHECK|sed 's#check//unix/[^ ]*#& &/-fPIE/-pie#g')"
 %endif	# 0%{!?_with_upstream:1}
 
-  ./orphanripper make %{?_smp_mflags} -k $CHECK || :
+  ./orphanripper make %{?_smp_mflags} -k $CHECK \
+$(: Serialize the output to keep the order for regression checks. ) \
+%if 0%{?el5:1}
+    RUNTESTFLAGS="--tool gdb" \
+%endif
+    || :
 )
 for t in sum log
 do
@@ -942,6 +969,19 @@ fi
 %endif
 
 %changelog
+* Mon Dec 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-12.fc12
+- Workaround build on native ppc64 host.
+- More RHEL-5 compatibility updates.
+  - Disable warning messages new for gdb-6.8+ for RHEL-5 backward compatibility.
+  - Workaround RHEL-5 kernels for detaching SIGSTOPped processes (BZ 498595).
+  - Serialize the testsuite output to keep the order for regression checks.
+  - Re-enable python for all non-ppc* arches.
+  - More gcc44 stack exceptions when running the testsuite on RHEL-5.
+- Fix backward compatibility with G++ 4.1 namespaces "::".
+- Fix regression on re-setting the single ppc watchpoint slot.
+- Update snapshot of FSF gdb-7.0.x branch.
+  - Backport fix of dcache invalidation locking up GDB on ppc64 targets.
+
 * Fri Dec 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-11.fc12
 - [pie] Fix general ppc64 regression due to a function descriptors bug.
 - [pie] Fix also keeping breakpoints disabled in PIE mode.


--- gdb-rhel5-fortran44.patch DELETED ---



From jfch2222 at fedoraproject.org  Mon Dec 21 11:38:06 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Mon, 21 Dec 2009 11:38:06 +0000 (UTC)
Subject: rpms/openssh/F-12 .cvsignore, 1.24, 1.25 openssh-5.3p1-audit.patch,
	1.1, 1.2 openssh.spec, 1.174, 1.175 sshd.init, 1.5, 1.6
Message-ID: <20091221113806.31D2A11C00E7@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5526

Modified Files:
	.cvsignore openssh-5.3p1-audit.patch openssh.spec sshd.init 
Log Message:
updated, nss3, audit, init script


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	10 Mar 2009 12:17:53 -0000	1.24
+++ .cvsignore	21 Dec 2009 11:38:04 -0000	1.25
@@ -1 +1,2 @@
-openssh-5.2p1-noacss.tar.bz2
+openssh-5.3p1-noacss.tar.bz2
+pam_ssh_agent_auth-0.9.tar.bz2

openssh-5.3p1-audit.patch:
 auth.c       |   10 ++++++++++
 configure.ac |   13 +++++++++++++
 loginrec.c   |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 loginrec.h   |    4 ++++
 4 files changed, 79 insertions(+)

Index: openssh-5.3p1-audit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/openssh-5.3p1-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssh-5.3p1-audit.patch	20 Nov 2009 17:01:48 -0000	1.1
+++ openssh-5.3p1-audit.patch	21 Dec 2009 11:38:04 -0000	1.2
@@ -1,15 +1,15 @@
 diff -up openssh-5.3p1/auth.c.audit openssh-5.3p1/auth.c
 --- openssh-5.3p1/auth.c.audit	2008-11-05 06:12:54.000000000 +0100
-+++ openssh-5.3p1/auth.c	2009-10-11 13:02:47.000000000 +0200
++++ openssh-5.3p1/auth.c	2009-12-21 08:50:12.000000000 +0100
 @@ -287,6 +287,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);
-+	}
++        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)
@@ -19,79 +19,35 @@ diff -up openssh-5.3p1/auth.c.audit open
  		    get_canonical_hostname(options.use_dns), "ssh");
  #endif
 +#ifdef HAVE_LINUX_AUDIT
-+		linux_audit_record_event(-1, user, NULL, get_remote_ipaddr(),
-+			"sshd", 0);
++                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-5.3p1/config.h.in.audit openssh-5.3p1/config.h.in
---- openssh-5.3p1/config.h.in.audit	2009-09-26 08:31:14.000000000 +0200
-+++ openssh-5.3p1/config.h.in	2009-10-11 13:09:41.000000000 +0200
-@@ -533,6 +533,9 @@
- /* Define to 1 if you have the <lastlog.h> header file. */
- #undef HAVE_LASTLOG_H
- 
-+/* Define to 1 if you have the <libaudit.h> header file. */
-+#undef HAVE_LIBAUDIT_H
-+
- /* Define to 1 if you have the `bsm' library (-lbsm). */
- #undef HAVE_LIBBSM
- 
-@@ -572,6 +575,9 @@
- /* Define to 1 if you have the <limits.h> header file. */
- #undef HAVE_LIMITS_H
- 
-+/* Define if you want Linux audit support. */
-+#undef HAVE_LINUX_AUDIT
-+
- /* Define to 1 if you have the <linux/if_tun.h> header file. */
- #undef HAVE_LINUX_IF_TUN_H
- 
-@@ -768,6 +774,9 @@
- /* Define to 1 if you have the `setgroups' function. */
- #undef HAVE_SETGROUPS
- 
-+/* Define to 1 if you have the `setkeycreatecon' function. */
-+#undef HAVE_SETKEYCREATECON
-+
- /* Define to 1 if you have the `setlogin' function. */
- #undef HAVE_SETLOGIN
- 
-@@ -1348,6 +1357,10 @@
- /* Prepend the address family to IP tunnel traffic */
- #undef SSH_TUN_PREPEND_AF
- 
-+/* Define to your vendor patch level, if it has been modified from the
-+   upstream source release. */
-+#undef SSH_VENDOR_PATCHLEVEL
-+
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
- 
 diff -up openssh-5.3p1/configure.ac.audit openssh-5.3p1/configure.ac
---- openssh-5.3p1/configure.ac.audit	2009-09-11 06:56:08.000000000 +0200
-+++ openssh-5.3p1/configure.ac	2009-10-11 13:08:03.000000000 +0200
-@@ -3407,6 +3407,18 @@ AC_ARG_WITH(selinux,
+--- openssh-5.3p1/configure.ac.audit	2009-12-21 08:48:59.000000000 +0100
++++ openssh-5.3p1/configure.ac	2009-12-21 08:51:47.000000000 +0100
+@@ -3409,6 +3409,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 ]
++        [  --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,
-@@ -4226,6 +4238,7 @@ echo "                       PAM support
+@@ -4234,6 +4246,7 @@ echo "                       PAM support
  echo "                   OSF SIA support: $SIA_MSG"
  echo "                 KerberosV support: $KRB5_MSG"
  echo "                   SELinux support: $SELINUX_MSG"
@@ -101,7 +57,7 @@ diff -up openssh-5.3p1/configure.ac.audi
  echo "              TCP Wrappers support: $TCPW_MSG"
 diff -up openssh-5.3p1/loginrec.c.audit openssh-5.3p1/loginrec.c
 --- openssh-5.3p1/loginrec.c.audit	2009-02-12 03:12:22.000000000 +0100
-+++ openssh-5.3p1/loginrec.c	2009-10-11 13:06:16.000000000 +0200
++++ openssh-5.3p1/loginrec.c	2009-12-21 08:54:17.000000000 +0100
 @@ -176,6 +176,10 @@
  #include "auth.h"
  #include "buffer.h"
@@ -128,94 +84,54 @@ diff -up openssh-5.3p1/loginrec.c.audit 
  	/* 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));
++        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,87 @@ wtmpx_get_entry(struct logininfo *li)
+@@ -1394,6 +1405,47 @@ wtmpx_get_entry(struct logininfo *li)
  }
  #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)
++        const char *hostname, const char *ip, const char *ttyn, int success)
 +{
-+	char buf[AUDIT_LOG_SIZE];
-+	int audit_fd, rc;
++        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 {
-+		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);
-+	if (rc >= 0)
-+		return 1;
-+	else
-+		return 0;
++        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 */
++        }
++        rc = audit_log_acct_message(audit_fd, AUDIT_USER_LOGIN,
++                NULL, "login", username ? username : "(unknown)",
++                username == NULL ? uid : -1, 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);
-+	}
++        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 */
 +
@@ -224,14 +140,14 @@ diff -up openssh-5.3p1/loginrec.c.audit 
   **/
 diff -up openssh-5.3p1/loginrec.h.audit openssh-5.3p1/loginrec.h
 --- openssh-5.3p1/loginrec.h.audit	2006-08-05 04:39:40.000000000 +0200
-+++ openssh-5.3p1/loginrec.h	2009-10-11 13:04:28.000000000 +0200
++++ openssh-5.3p1/loginrec.h	2009-12-21 08:48:59.000000000 +0100
 @@ -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);
++        const char *hostname, const char *ip, const char *ttyn, int success);
 +#endif /* HAVE_LINUX_AUDIT */
  
  #endif /* _HAVE_LOGINREC_H_ */


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/openssh.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- openssh.spec	30 Nov 2009 10:09:11 -0000	1.174
+++ openssh.spec	21 Dec 2009 11:38:04 -0000	1.175
@@ -69,7 +69,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 11%{?dist}%{?rescue_rel}
+Release: 13%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #URL1: http://pamsshauth.sourceforge.net
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -525,6 +525,11 @@ fi
 %endif
 
 %changelog
+* Mon Dec 21 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-13
+- Update the audit patch
+- Add possibility to autocreate only RSA key into initscript (#533339)
+- Update NSS key patch including future SEC_ERROR_LOCKED_PASSWORD (#537411, #356451)
+ 
 * Mon Nov 30 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-11
 - Update NSS key patch including future SEC_ERROR_LOCKED_PASSWORD (#537411, #356451)
 


Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/sshd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sshd.init	29 Oct 2009 12:19:37 -0000	1.5
+++ sshd.init	21 Dec 2009 11:38:04 -0000	1.6
@@ -122,9 +122,11 @@ start()
 	[ -f /etc/ssh/sshd_config ] || exit 6
 	# Create keys if necessary
 	if [ "x${AUTOCREATE_SERVER_KEYS}" != xNO ]; then
-		do_rsa1_keygen
 		do_rsa_keygen
-		do_dsa_keygen
+		if [ "x${AUTOCREATE_SERVER_KEYS}" != xRSAONLY ]; then
+			do_rsa1_keygen
+			do_dsa_keygen
+		fi
 	fi
 
 	echo -n $"Starting $prog: "



From jakub at fedoraproject.org  Mon Dec 21 11:42:57 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 21 Dec 2009 11:42:57 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-adjtimex.patch, 1.1,
	1.2 valgrind.spec, 1.77, 1.78
Message-ID: <20091221114257.E36D911C00E7@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6544

Modified Files:
	valgrind-3.5.0-adjtimex.patch valgrind.spec 
Log Message:
3.5.0-12

valgrind-3.5.0-adjtimex.patch:
 coregrind/m_syswrap/syswrap-linux.c |   23 ++++++++++++++---------
 include/vki/vki-linux.h             |    3 +++
 2 files changed, 17 insertions(+), 9 deletions(-)

Index: valgrind-3.5.0-adjtimex.patch
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind-3.5.0-adjtimex.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- valgrind-3.5.0-adjtimex.patch	21 Dec 2009 10:57:44 -0000	1.1
+++ valgrind-3.5.0-adjtimex.patch	21 Dec 2009 11:42:57 -0000	1.2
@@ -1,22 +1,49 @@
---- valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-08 16:11:18.000000000 +0100
-+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-09 15:06:39.000000000 +0100
-@@ -627,7 +627,8 @@ PRE(sys_adjtimex)
-       PRE_MEM_READ( "adjtimex(timex->"#field")",	\
- 		    (Addr)&tx->field, sizeof(tx->field))
- 
--   ADJX(VKI_ADJ_OFFSET, offset);
-+   if ((tx->modes & VKI_ADJ_OFFSET_SS_READ) != VKI_ADJ_OFFSET_SS_READ)
-+      ADJX(VKI_ADJ_OFFSET, offset);
-    ADJX(VKI_ADJ_FREQUENCY, freq);
-    ADJX(VKI_ADJ_MAXERROR, maxerror);
-    ADJX(VKI_ADJ_ESTERROR, esterror);
---- valgrind-3.5.0/include/vki/vki-linux.h	2009-12-08 16:11:18.000000000 +0100
-+++ valgrind-3.5.0/include/vki/vki-linux.h	2009-12-09 15:04:20.000000000 +0100
-@@ -285,6 +285,7 @@ struct vki_timex {
+--- valgrind-3.5.0/include/vki/vki-linux.h	(revision 10968)
++++ valgrind-3.5.0/include/vki/vki-linux.h	(revision 10969)
+@@ -283,8 +283,11 @@ struct vki_timex {
+ #define VKI_ADJ_ESTERROR		0x0008	/* estimated time error */
+ #define VKI_ADJ_STATUS			0x0010	/* clock status */
  #define VKI_ADJ_TIMECONST		0x0020	/* pll time constant */
++#define VKI_ADJ_TAI			0x0080	/* set TAI offset */
  #define VKI_ADJ_TICK			0x4000	/* tick value */
++#define VKI_ADJ_ADJTIME			0x8000	/* switch between adjtime/adjtimex modes */
  //#define VKI_ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
-+#define VKI_ADJ_OFFSET_SS_READ		0xa001	/* read-only adjtime */
++#define VKI_ADJ_OFFSET_READONLY		0x2000	/* read-only adjtime */
  
  //----------------------------------------------------------------------
  // From linux-2.6.8.1/include/linux/times.h
+--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	(revision 10968)
++++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	(revision 10969)
+@@ -623,18 +623,23 @@ PRE(sys_adjtimex)
+    PRE_REG_READ1(long, "adjtimex", struct timex *, buf);
+    PRE_MEM_READ( "adjtimex(timex->modes)", ARG1, sizeof(tx->modes));
+ 
+-#define ADJX(bit,field) 				\
+-   if (tx->modes & bit)					\
++#define ADJX(bits,field) 				\
++   if (tx->modes & (bits))                              \
+       PRE_MEM_READ( "adjtimex(timex->"#field")",	\
+ 		    (Addr)&tx->field, sizeof(tx->field))
+ 
+-   ADJX(VKI_ADJ_OFFSET, offset);
+-   ADJX(VKI_ADJ_FREQUENCY, freq);
+-   ADJX(VKI_ADJ_MAXERROR, maxerror);
+-   ADJX(VKI_ADJ_ESTERROR, esterror);
+-   ADJX(VKI_ADJ_STATUS, status);
+-   ADJX(VKI_ADJ_TIMECONST, constant);
+-   ADJX(VKI_ADJ_TICK, tick);
++   if (tx->modes & VKI_ADJ_ADJTIME) {
++      if (!(tx->modes & VKI_ADJ_OFFSET_READONLY))
++         PRE_MEM_READ( "adjtimex(timex->offset)", (Addr)&tx->offset, sizeof(tx->offset));
++   } else {
++      ADJX(VKI_ADJ_OFFSET, offset);
++      ADJX(VKI_ADJ_FREQUENCY, freq);
++      ADJX(VKI_ADJ_MAXERROR, maxerror);
++      ADJX(VKI_ADJ_ESTERROR, esterror);
++      ADJX(VKI_ADJ_STATUS, status);
++      ADJX(VKI_ADJ_TIMECONST|VKI_ADJ_TAI, constant);
++      ADJX(VKI_ADJ_TICK, tick);
++   }
+ #undef ADJX
+ 
+    PRE_MEM_WRITE( "adjtimex(timex)", ARG1, sizeof(struct vki_timex));


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- valgrind.spec	21 Dec 2009 10:57:44 -0000	1.77
+++ valgrind.spec	21 Dec 2009 11:42:57 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -180,7 +180,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Mon Dec 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-11
+* Mon Dec 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-12
 - don't require offset field to be set in adjtimex's
   ADJ_OFFSET_SS_READ mode (#545866)
 



From jfch2222 at fedoraproject.org  Mon Dec 21 11:58:41 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Mon, 21 Dec 2009 11:58:41 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-gsskex-all-20090726.patch,1.1,NONE
Message-ID: <20091221115841.C94AF11C00E7@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9189

Removed Files:
	openssh-5.2p1-gsskex-all-20090726.patch 
Log Message:
cleanup


--- openssh-5.2p1-gsskex-all-20090726.patch DELETED ---



From ynemoy at fedoraproject.org  Mon Dec 21 12:01:05 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Mon, 21 Dec 2009 12:01:05 +0000 (UTC)
Subject: File X11-1.5.0.0.tar.gz uploaded to lookaside cache by ynemoy
Message-ID: <20091221120105.D7E4910F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ghc-X11:

ec6670f5ce1812206903c8a0fd9df04c  X11-1.5.0.0.tar.gz



From rjones at fedoraproject.org  Mon Dec 21 12:05:07 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 21 Dec 2009 12:05:07 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/EL-5 mingw32-nsiswrapper.spec, 1.3,
	1.4 nsiswrapper.pl, 1.2, 1.3
Message-ID: <20091221120507.AAC6C11C00E7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10653

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Synchronize script with Rawhide.


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/mingw32-nsiswrapper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-nsiswrapper.spec	5 Jul 2009 21:06:03 -0000	1.3
+++ mingw32-nsiswrapper.spec	21 Dec 2009 12:05:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
-Version:        3
-Release:        3%{?dist}.2
+Version:        5
+Release:        1%{?dist}
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Richard W.M. Jones <rjones at redhat.com> - 5-1
+- Synchronize script with Rawhide.
+
 * Sun Jul  5 2009 Richard W.M. Jones <rjones at redhat.com> - 3-3.el5.2
 - Add runtime requires mingw32-binutils (RHBZ#509747).
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/nsiswrapper.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nsiswrapper.pl	21 Apr 2009 22:32:25 -0000	1.2
+++ nsiswrapper.pl	21 Dec 2009 12:05:07 -0000	1.3
@@ -443,7 +443,7 @@ sub get_deps_for_file
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
+                   grep -Eio '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {
@@ -493,7 +493,20 @@ sub is_windows_system_dll
 	$_ eq 'ole32.dll' ||
 	$_ eq 'mscoree.dll' ||
 	$_ eq 'msvcrt.dll' ||
-	$_ eq 'user32.dll'
+	$_ eq 'user32.dll' ||
+	$_ eq 'advapi32.dll' ||
+	$_ eq 'comctl32.dll' ||
+	$_ eq 'comdlg32.dll' ||
+	$_ eq 'imm32.dll' ||
+	$_ eq 'msimg32.dll' ||
+	$_ eq 'oleaut32.dll' ||
+	$_ eq 'shell32.dll' ||
+	$_ eq 'shlwapi.dll' ||
+	$_ eq 'winmm.dll' ||
+	$_ eq 'wsock32.dll' ||
+	$_ eq 'ws2_32.dll' ||
+	$_ eq 'wldap32.dll' ||
+	$_ eq 'dnsapi.dll'
 }
 
 # Add Gtk dependencies, if --with-gtk.



From rjones at fedoraproject.org  Mon Dec 21 12:08:29 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 21 Dec 2009 12:08:29 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/EL-5 nsiswrapper.pl,1.3,1.4
Message-ID: <20091221120829.6577011C00E7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11227

Modified Files:
	nsiswrapper.pl 
Log Message:
Synchronize script with Rawhide.


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/nsiswrapper.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nsiswrapper.pl	21 Dec 2009 12:05:07 -0000	1.3
+++ nsiswrapper.pl	21 Dec 2009 12:08:29 -0000	1.4
@@ -506,6 +506,7 @@ sub is_windows_system_dll
 	$_ eq 'wsock32.dll' ||
 	$_ eq 'ws2_32.dll' ||
 	$_ eq 'wldap32.dll' ||
+	$_ eq 'version.dll' ||
 	$_ eq 'dnsapi.dll'
 }
 



From rjones at fedoraproject.org  Mon Dec 21 12:09:17 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 21 Dec 2009 12:09:17 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/devel mingw32-nsiswrapper.spec, 1.7,
	1.8 nsiswrapper.pl, 1.4, 1.5
Message-ID: <20091221120917.8A35611C00E7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11385

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Add dnsapi.dll to list of system libraries (RHBZ#548965).


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/devel/mingw32-nsiswrapper.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-nsiswrapper.spec	12 Oct 2009 13:08:38 -0000	1.7
+++ mingw32-nsiswrapper.spec	21 Dec 2009 12:09:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
-Version:        4
-Release:        4%{?dist}
+Version:        5
+Release:        1%{?dist}
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Richard W.M. Jones <rjones at redhat.com> - 5-1
+- Add dnsapi.dll to list of system libraries (RHBZ#548965).
+
 * Mon Oct 12 2009 Adam Tkac <atkac redhat com> - 4-4
 - add version.dll to list of system libraries (#528467)
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/devel/nsiswrapper.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nsiswrapper.pl	12 Oct 2009 13:08:38 -0000	1.4
+++ nsiswrapper.pl	21 Dec 2009 12:09:17 -0000	1.5
@@ -506,7 +506,8 @@ sub is_windows_system_dll
 	$_ eq 'wsock32.dll' ||
 	$_ eq 'ws2_32.dll' ||
 	$_ eq 'wldap32.dll' ||
-	$_ eq 'version.dll'
+	$_ eq 'version.dll' ||
+	$_ eq 'dnsapi.dll'
 }
 
 # Add Gtk dependencies, if --with-gtk.



From rjones at fedoraproject.org  Mon Dec 21 12:09:24 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 21 Dec 2009 12:09:24 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/F-12 mingw32-nsiswrapper.spec, 1.7,
	1.8 nsiswrapper.pl, 1.4, 1.5
Message-ID: <20091221120924.C005211C00E7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11415

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Add dnsapi.dll to list of system libraries (RHBZ#548965).


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/F-12/mingw32-nsiswrapper.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-nsiswrapper.spec	12 Oct 2009 13:10:49 -0000	1.7
+++ mingw32-nsiswrapper.spec	21 Dec 2009 12:09:24 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
-Version:        4
-Release:        4%{?dist}
+Version:        5
+Release:        1%{?dist}
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Richard W.M. Jones <rjones at redhat.com> - 5-1
+- Add dnsapi.dll to list of system libraries (RHBZ#548965).
+
 * Mon Oct 12 2009 Adam Tkac <atkac redhat com> - 4-4
 - add version.dll to list of system libraries (#528467)
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/F-12/nsiswrapper.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nsiswrapper.pl	12 Oct 2009 13:10:49 -0000	1.4
+++ nsiswrapper.pl	21 Dec 2009 12:09:24 -0000	1.5
@@ -506,7 +506,8 @@ sub is_windows_system_dll
 	$_ eq 'wsock32.dll' ||
 	$_ eq 'ws2_32.dll' ||
 	$_ eq 'wldap32.dll' ||
-	$_ eq 'version.dll'
+	$_ eq 'version.dll' ||
+	$_ eq 'dnsapi.dll'
 }
 
 # Add Gtk dependencies, if --with-gtk.



From caolanm at fedoraproject.org  Mon Dec 21 12:17:14 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 12:17:14 +0000 (UTC)
Subject: rpms/writer2latex/devel writer2latex.spec,1.20,1.21
Message-ID: <20091221121714.6AAA611C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/writer2latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094

Modified Files:
	writer2latex.spec 
Log Message:
Preserve time stamps


Index: writer2latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- writer2latex.spec	19 Nov 2009 16:44:56 -0000	1.20
+++ writer2latex.spec	21 Dec 2009 12:17:14 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name:          writer2latex
 Version:       1.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Document Converter from ODT to LaTeX
 License:       LGPLv2
 Url:           http://writer2latex.sourceforge.net/
@@ -83,11 +83,11 @@ ant jar javadoc oxt
 rm -rf $RPM_BUILD_ROOT
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 target/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done)
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -r target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -p -r target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 pushd $RPM_BUILD_ROOT%{_javadocdir}
 ln -s %{name}-%{version} %{name}
 popd
@@ -184,7 +184,10 @@ fi
 %{_datadir}/openoffice.org/extensions/writer2xhtml.oxt
 
 %changelog
-* Thu Nov 19 2009 Caol at n McNamara <caolanm at redhat.com> 1.0-2
+* Mon Dec 21 2009 Caol?n McNamara <caolanm at redhat.com> 1.0-3
+- Preserve time stamps
+
+* Thu Nov 19 2009 Caol?n McNamara <caolanm at redhat.com> 1.0-2
 - Resolves: rhbz#539035 update for OOo 3.2
 
 * Mon Sep 21 2009 Caolan McNamara <caolanm at redhat.com> 1.0-1



From ruben at fedoraproject.org  Mon Dec 21 12:21:02 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 21 Dec 2009 12:21:02 +0000 (UTC)
Subject: rpms/pycryptopp/devel pycryptopp.spec,1.2,1.3
Message-ID: <20091221122102.5893D11C00E7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pycryptopp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13873

Modified Files:
	pycryptopp.spec 
Log Message:
* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-5
- Rebuild for new cryptopp



Index: pycryptopp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycryptopp/devel/pycryptopp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pycryptopp.spec	16 Nov 2009 12:36:41 -0000	1.2
+++ pycryptopp.spec	21 Dec 2009 12:21:02 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pycryptopp
 Version:        0.5.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python wrappers for the Crypto++ library
 
 Group:          Development/Languages
@@ -63,6 +63,9 @@ rm -rf %{buildroot}%{python_sitearch}/%{
 
 
 %changelog
+* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-5
+- Rebuild for new cryptopp
+
 * Mon Nov 16 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-4
 - Initial import into devel
 



From caolanm at fedoraproject.org  Mon Dec 21 12:23:35 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 12:23:35 +0000 (UTC)
Subject: rpms/lpsolve/devel lpsolve.spec,1.11,1.12
Message-ID: <20091221122335.29BD511C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/lpsolve/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14469

Modified Files:
	lpsolve.spec 
Log Message:
Preserve timestamps


Index: lpsolve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/devel/lpsolve.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- lpsolve.spec	5 Nov 2009 09:07:50 -0000	1.11
+++ lpsolve.spec	21 Dec 2009 12:23:34 -0000	1.12
@@ -1,7 +1,7 @@
 Name:      lpsolve
 Summary:   A Mixed Integer Linear Programming (MILP) solver
 Version:   5.5.0.15
-Release:   2%{?dist}
+Release:   3%{?dist}
 Source:    http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
 Group:     System Environment/Libraries
 URL:       http://sourceforge.net/projects/lpsolve
@@ -41,11 +41,11 @@ sh -x ccc
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}/lpsolve
-install -m 755 \
+install -p -m 755 \
         lp_solve/bin/ux*/lp_solve $RPM_BUILD_ROOT%{_bindir}
-install -m 755 \
+install -p -m 755 \
         lpsolve55/bin/ux*/liblpsolve55.so $RPM_BUILD_ROOT%{_libdir}
-install -m 644 \
+install -p -m 644 \
         lp*.h $RPM_BUILD_ROOT%{_includedir}/lpsolve
 
 %clean
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/lpsolve
 
 %changelog
+* Mon Dec 21 2009 Caol?n McNamara <caolanm at redhat.com> - 5.5.0.15-3
+- Preserve timestamps
+
 * Thu Nov 05 2009 Caol?n McNamara <caolanm at redhat.com> - 5.5.0.15-2
 - upstream source silently changed content
 



From nhorman at fedoraproject.org  Mon Dec 21 12:24:00 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Mon, 21 Dec 2009 12:24:00 +0000 (UTC)
Subject: rpms/cscope/F-12 cscope-15.6-help-options.patch, NONE, 1.1 cscope.spec,
	1.41, 1.42
Message-ID: <20091221122400.1287011C00E7@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/pkgs/rpms/cscope/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14603

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.6-help-options.patch 
Log Message:
Resolves: bz 528463

cscope-15.6-help-options.patch:
 main.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE cscope-15.6-help-options.patch ---
diff -up cscope-15.6/src/main.c.orig cscope-15.6/src/main.c
--- cscope-15.6/src/main.c.orig	2009-12-21 07:20:09.000000000 -0500
+++ cscope-15.6/src/main.c	2009-12-21 07:20:49.000000000 -0500
@@ -196,6 +196,10 @@ char ** parse_options(int *argc, char **
 		case 'e':	/* suppress ^E prompt between files */
 			editallprompt = NO;
 			break;
+		case 'h':
+			longusage();
+			myexit(1);
+			break;
 		case 'k':	/* ignore DFLT_INCDIR */
 			kernelmode = YES;
 			break;
@@ -208,6 +212,11 @@ char ** parse_options(int *argc, char **
 		case 'v':
 			verbosemode = YES;
 			break;
+		case 'V':
+			fprintf(stderr, "%s: version %d%s\n", argv0,
+				FILEVERSION, FIXVERSION);
+			myexit(0);
+			break;
 		case 'q':	/* quick search */
 			invertedindex = YES;
 			break;


Index: cscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cscope/F-12/cscope.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- cscope.spec	18 Dec 2009 13:42:04 -0000	1.41
+++ cscope.spec	21 Dec 2009 12:23:59 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.6.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -22,6 +22,7 @@ Patch5:cscope-15.6-incdir-overflow.patch
 Patch6:cscope-15.6-invalid-opt.patch
 Patch7:cscope-15.6-argv-adjust.patch
 Patch8:cscope-15.6-linemode-options-readd.patch
+Patch9:cscope-15.6-help-options.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -41,6 +42,7 @@ matches for use in file editing.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 export CFLAGS="%{optflags} -D_GNU_SOURCE"
@@ -90,6 +92,9 @@ rm -f %{xemacs_lisp_path}/xcscope.el
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Mon Dec 19 2009 Neil Horman <nhorman at redhat.com> 15.6-8
+- Added back missing help/version options (bz 528463)
+
 * Fri Dec 18 2009 Neil Horman <nhorman at redhat.com> 15.6-7
 - Fixed adjustment of argv that led to bad commandline behavior (bz 547023)
 - Added missing linemode operations to parse_options (bz 546993)



From caolanm at fedoraproject.org  Mon Dec 21 12:26:03 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 12:26:03 +0000 (UTC)
Subject: rpms/hunspell/devel hunspell.spec,1.74,1.75
Message-ID: <20091221122603.56D1911C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15005

Modified Files:
	hunspell.spec 
Log Message:
Preserve timestamps


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- hunspell.spec	8 Dec 2009 14:08:53 -0000	1.74
+++ hunspell.spec	21 Dec 2009 12:26:03 -0000	1.75
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   A spell checker and morphological analyzer library
 Version:   1.2.8
-Release:   13%{?dist}
+Release:   14%{?dist}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
 Source2:   http://people.redhat.com/caolanm/hunspell/wordlist2hunspell
@@ -78,11 +78,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_bindir}/example
 mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell
 mv $RPM_BUILD_ROOT/%{_includedir}/*munch* $RPM_BUILD_ROOT/%{_includedir}/%{name}
-install -m 755 src/tools/affixcompress $RPM_BUILD_ROOT/%{_bindir}/affixcompress
-install -m 755 src/tools/makealias $RPM_BUILD_ROOT/%{_bindir}/makealias
-install -m 755 src/tools/wordforms $RPM_BUILD_ROOT/%{_bindir}/wordforms
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ispellaff2myspell
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/wordlist2hunspell
+install -p -m 755 src/tools/affixcompress $RPM_BUILD_ROOT/%{_bindir}/affixcompress
+install -p -m 755 src/tools/makealias $RPM_BUILD_ROOT/%{_bindir}/makealias
+install -p -m 755 src/tools/wordforms $RPM_BUILD_ROOT/%{_bindir}/wordforms
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ispellaff2myspell
+install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/wordlist2hunspell
 %find_lang %{name}
 
 %clean
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Mon Dec 21 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-14
+- Preserve timestamps
+
 * Tue Dec 08 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-13
 - Resolves: rhbz#544372 survive having no HOME
 



From ruben at fedoraproject.org  Mon Dec 21 12:32:11 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 21 Dec 2009 12:32:11 +0000 (UTC)
Subject: File incron-0.5.9.tar.bz2 uploaded to lookaside cache by ruben
Message-ID: <20091221123211.30D1B10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for incron:

ccae2ca5cb4b142be002ab482250fb5f  incron-0.5.9.tar.bz2



From caolanm at fedoraproject.org  Mon Dec 21 12:36:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 12:36:52 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2105,
	1.2106 workspace.vcl108.patch, 1.4, 1.5
Message-ID: <20091221123652.3369E11C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17071

Modified Files:
	openoffice.org.spec workspace.vcl108.patch 
Log Message:
add in valgrind fix of workspace.vcl108.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2105
retrieving revision 1.2106
diff -u -p -r1.2105 -r1.2106
--- openoffice.org.spec	17 Dec 2009 10:40:54 -0000	1.2105
+++ openoffice.org.spec	21 Dec 2009 12:36:51 -0000	1.2106
@@ -2137,8 +2137,8 @@ popd
 
 # rhbz#477435 package opensymbol separately
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/fonts/truetype
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -d -m 0755 %{buildroot}%{_fontdir}
+install -p -m 0644 *.ttf %{buildroot}%{_fontdir}
 popd
 rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/fonts
 

workspace.vcl108.patch:
 source/fontsubset/sft.cxx           |   20 +++++++
 unx/source/dtrans/X11_selection.cxx |   92 ++++++++++++++++++++++++++++++++----
 unx/source/dtrans/X11_selection.hxx |   18 ++++++-
 unx/source/gdi/salgdi.cxx           |   18 ++++++-
 util/makefile.mk                    |    1 
 5 files changed, 133 insertions(+), 16 deletions(-)

Index: workspace.vcl108.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl108.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- workspace.vcl108.patch	17 Dec 2009 10:40:54 -0000	1.4
+++ workspace.vcl108.patch	21 Dec 2009 12:36:51 -0000	1.5
@@ -262,3 +262,53 @@ diff -ru vcl/util/makefile.mk vcl/util/m
      sal_uInt16 n = GetUInt16(table, 2, 1);
      int nStrBase = GetUInt16(table, 4, 1);
      int i;
+diff -ru vcl/unx/source/gdi/salgdi.cxx vcl/unx/source/gdi/salgdi.cxx
+--- vcl/unx/source/gdi/salgdi.cxx	2009-11-27 11:33:16.000000000 +0000
++++ vcl/unx/source/gdi/salgdi.cxx	2009-11-27 14:57:27.000000000 +0000
+@@ -1427,14 +1427,17 @@
+         // unless it splits another trapezoid that is still active
+         bool bSplit = false;
+         ActiveTrapSet::iterator aActiveTrapsIt = aActiveTraps.begin();
+-        for(; aActiveTrapsIt != aActiveTraps.end(); ++aActiveTrapsIt )
++        while(aActiveTrapsIt != aActiveTraps.end())
+         {
+             XTrapezoid& rLeftTrap = aTrapVector[ *aActiveTrapsIt ];
+ 
+             // skip until first overlap candidate
+             // TODO: use stl::*er_bound() instead
+             if( IsLeftOf( aTrapezoid.left, rLeftTrap.left) )
++            {
++                ++aActiveTrapsIt;
+                 continue;
++            }
+ 
+             // in the ActiveTrapSet there are still trapezoids where
+             // a vertical overlap with new trapezoids is no longer possible
+@@ -1445,15 +1448,26 @@
+             {
+                 ActiveTrapSet::iterator it = aActiveTrapsIt;
+                 if( aActiveTrapsIt != aActiveTraps.begin() )
++                {
+                     --aActiveTrapsIt;
+-                aActiveTraps.erase( it );
++                    aActiveTraps.erase( it );
++                    ++aActiveTrapsIt;
++                }
++                else
++                {
++                    aActiveTraps.erase( it );
++                    aActiveTrapsIt = aActiveTraps.begin();
++                }
+                 continue;
+             }
+ 
+             // check if there is horizontal overlap
+             // aTrapezoid.left==rLeftTrap.right is allowed though
+             if( !IsLeftOf( aTrapezoid.left, rLeftTrap.right ) )
++            {
++                ++aActiveTrapsIt;
+                 continue;
++            }
+ 
+             // prepare to split the old trapezoid and keep its upper part
+             // find the old trapezoids entry in the VerticalTrapSet and remove it



From ruben at fedoraproject.org  Mon Dec 21 12:39:13 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 21 Dec 2009 12:39:13 +0000 (UTC)
Subject: rpms/incron/devel .cvsignore, 1.7, 1.8 incron.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20091221123913.DA72811C00E7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/incron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17573

Modified Files:
	.cvsignore incron.spec sources 
Log Message:
* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.9-1
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/incron/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Feb 2009 10:28:01 -0000	1.7
+++ .cvsignore	21 Dec 2009 12:39:13 -0000	1.8
@@ -1 +1 @@
-incron-0.5.8.tar.bz2
+incron-0.5.9.tar.bz2


Index: incron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incron/devel/incron.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- incron.spec	25 Jul 2009 03:21:18 -0000	1.8
+++ incron.spec	21 Dec 2009 12:39:13 -0000	1.9
@@ -1,14 +1,14 @@
 Summary:     Inotify cron system
 Name:        incron
-Version:     0.5.8
-Release:     2%{?dist}
+Version:     0.5.9
+Release:     1%{?dist}
 
 Group:       System Environment/Base          
 License:     GPLv2
 URL:         http://inotify.aiken.cz
 Source0:     http://inotify.aiken.cz/download/incron/%{name}-%{version}.tar.bz2
 Source1:     incrond.init
-Patch0:     incron-gcc44.patch
+Patch0:      incron-gcc44.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/chkconfig
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.9-1
+- Upstream released new version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/incron/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Feb 2009 10:28:01 -0000	1.7
+++ sources	21 Dec 2009 12:39:13 -0000	1.8
@@ -1 +1 @@
-6d4f5ad2a523824771ec984ee0e15684  incron-0.5.8.tar.bz2
+ccae2ca5cb4b142be002ab482250fb5f  incron-0.5.9.tar.bz2



From ruben at fedoraproject.org  Mon Dec 21 12:51:58 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 21 Dec 2009 12:51:58 +0000 (UTC)
Subject: rpms/incron/F-12 .cvsignore, 1.7, 1.8 incron.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20091221125158.D072A11C00E7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/incron/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19892

Modified Files:
	.cvsignore incron.spec sources 
Log Message:
* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.9-1
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/incron/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Feb 2009 10:28:01 -0000	1.7
+++ .cvsignore	21 Dec 2009 12:51:57 -0000	1.8
@@ -1 +1 @@
-incron-0.5.8.tar.bz2
+incron-0.5.9.tar.bz2


Index: incron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incron/F-12/incron.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- incron.spec	25 Jul 2009 03:21:18 -0000	1.8
+++ incron.spec	21 Dec 2009 12:51:57 -0000	1.9
@@ -1,14 +1,14 @@
 Summary:     Inotify cron system
 Name:        incron
-Version:     0.5.8
-Release:     2%{?dist}
+Version:     0.5.9
+Release:     1%{?dist}
 
 Group:       System Environment/Base          
 License:     GPLv2
 URL:         http://inotify.aiken.cz
 Source0:     http://inotify.aiken.cz/download/incron/%{name}-%{version}.tar.bz2
 Source1:     incrond.init
-Patch0:     incron-gcc44.patch
+Patch0:      incron-gcc44.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/chkconfig
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.9-1
+- Upstream released new version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/incron/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Feb 2009 10:28:01 -0000	1.7
+++ sources	21 Dec 2009 12:51:57 -0000	1.8
@@ -1 +1 @@
-6d4f5ad2a523824771ec984ee0e15684  incron-0.5.8.tar.bz2
+ccae2ca5cb4b142be002ab482250fb5f  incron-0.5.9.tar.bz2



From ynemoy at fedoraproject.org  Mon Dec 21 12:57:31 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Mon, 21 Dec 2009 12:57:31 +0000 (UTC)
Subject: rpms/ghc-X11/devel .cvsignore, 1.3, 1.4 ghc-X11.spec, 1.18,
	1.19 sources, 1.3, 1.4
Message-ID: <20091221125731.BCEC111C00E7@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20821

Modified Files:
	.cvsignore ghc-X11.spec sources 
Log Message:
Updates upstream
Updates spec to use shared libraries and new ghc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 Oct 2009 18:22:48 -0000	1.3
+++ .cvsignore	21 Dec 2009 12:57:31 -0000	1.4
@@ -1,2 +1 @@
-X11-1.4.5.tar.gz
-X11-1.4.6.1.tar.gz
+X11-1.5.0.0.tar.gz


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ghc-X11.spec	31 Oct 2009 18:22:48 -0000	1.18
+++ ghc-X11.spec	21 Dec 2009 12:57:31 -0000	1.19
@@ -2,12 +2,13 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        1.4.6.1
+Version:        1.5.0.0
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
@@ -15,10 +16,9 @@ Group:          Development/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -39,8 +39,11 @@ Summary:        Haskell %{pkg_name} libr
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
 Requires:       libXinerama-devel, libX11-devel, libXext-devel
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description devel
 This package contains the development files for %{name}
@@ -83,13 +86,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -98,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -107,10 +109,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -121,6 +121,13 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
@@ -139,6 +146,10 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.5.0.0-1
+- updated to latest upstream
+- updates spec to use shared libraries and new ghc
+
 * Thu Oct 29 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.4.6.1-1
 - update to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Oct 2009 18:22:48 -0000	1.3
+++ sources	21 Dec 2009 12:57:31 -0000	1.4
@@ -1 +1 @@
-c60c94847e59895cd4a54e6405375851  X11-1.4.6.1.tar.gz
+ec6670f5ce1812206903c8a0fd9df04c  X11-1.5.0.0.tar.gz



From ruben at fedoraproject.org  Mon Dec 21 13:00:01 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 21 Dec 2009 13:00:01 +0000 (UTC)
Subject: rpms/whatsup/devel whatsup.spec,1.5,1.6
Message-ID: <20091221130001.61C4311C00E7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/whatsup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21273

Modified Files:
	whatsup.spec 
Log Message:
* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.9-4
- Rebuild to pick up new opensm



Index: whatsup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/whatsup/devel/whatsup.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- whatsup.spec	7 Dec 2009 00:28:27 -0000	1.5
+++ whatsup.spec	21 Dec 2009 13:00:01 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:       Node up/down detection utility
 Name:          whatsup
 Version:       1.9
-Release:       3%{?dist}
+Release:       4%{?dist}
 Group:         Applications/Communications
 License:       GPLv2+
 URL:           https://computing.llnl.gov/linux/whatsup.html
@@ -199,6 +199,9 @@ fi
 %config(noreplace) %{_sysconfdir}/hostsfile
 
 %changelog
+* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.9-4
+- Rebuild to pick up new opensm
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9-3
 - rebuild against perl 5.10.1
 



From cwickert at fedoraproject.org  Mon Dec 21 13:02:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 21 Dec 2009 13:02:31 +0000 (UTC)
Subject: File emelfm2.spec uploaded to lookaside cache by cwickert
Message-ID: <20091221130231.1656910F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for emelfm2:

e553041ed7a8ba8871c5cc7ce2007cb2  emelfm2.spec



From jpopelka at fedoraproject.org  Mon Dec 21 13:04:16 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Mon, 21 Dec 2009 13:04:16 +0000 (UTC)
Subject: rpms/net-tools/devel net-tools.spec,1.105,1.106
Message-ID: <20091221130416.5FCCF11C00E7@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/net-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22078

Modified Files:
	net-tools.spec 
Log Message:
* Mon Dec 21 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-100
- Move hostname to separate package



Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- net-tools.spec	3 Dec 2009 14:45:22 -0000	1.105
+++ net-tools.spec	21 Dec 2009 13:04:15 -0000	1.106
@@ -1,7 +1,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 99%{?dist}
+Release: 100%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
@@ -119,6 +119,7 @@ Patch83: net-tools-1.60-mii-refactor.pat
 
 BuildRequires: gettext, libselinux
 BuildRequires: libselinux-devel
+Requires: hostname
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -271,6 +272,17 @@ rm %{buildroot}%{_mandir}/de/man8/rarp.8
 rm %{buildroot}%{_mandir}/fr/man8/rarp.8*
 rm %{buildroot}%{_mandir}/pt/man8/rarp.8*
 
+#remove hostname (has its own package)
+rm %{buildroot}/bin/dnsdomainname
+rm %{buildroot}/bin/domainname
+rm %{buildroot}/bin/hostname
+rm %{buildroot}/bin/nisdomainname
+rm %{buildroot}/bin/ypdomainname
+rm -rf %{buildroot}%{_mandir}/de/man1
+rm -rf %{buildroot}%{_mandir}/fr/man1
+rm -rf %{buildroot}%{_mandir}/man1
+rm -rf %{buildroot}%{_mandir}/pt/man1
+
 mkdir -p %{buildroot}%{_sysconfdir}
 touch %{buildroot}%{_sysconfdir}/ethers
 echo "# see man ethers for syntax" > %{buildroot}%{_sysconfdir}/ethers
@@ -283,15 +295,18 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING
-/bin/*
+/bin/netstat
 /sbin/*
-%{_mandir}/man[158]/*
-%lang(de)	%{_mandir}/de/man[158]/*
-%lang(fr)	%{_mandir}/fr/man[158]/*
-%lang(pt)	%{_mandir}/pt/man[158]/*
+%{_mandir}/man[58]/*
+%lang(de)	%{_mandir}/de/man[58]/*
+%lang(fr)	%{_mandir}/fr/man[58]/*
+%lang(pt)	%{_mandir}/pt/man[58]/*
 %config(noreplace) %{_sysconfdir}/ethers
 
 %changelog
+* Mon Dec 21 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-100
+- Move hostname to separate package
+
 * Thu Dec  3 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-99
 - return defining of BuildRoot even it's no longer necessary
   (https://fedoraproject.org/wiki/Packaging:Guidelines#BuildRoot_tag)



From rjones at fedoraproject.org  Mon Dec 21 13:06:12 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 21 Dec 2009 13:06:12 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs-find-requires.sh, NONE,
	1.1 libguestfs.spec, 1.117, 1.118
Message-ID: <20091221130612.E13FA11C00E7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22547

Modified Files:
	libguestfs.spec 
Added Files:
	libguestfs-find-requires.sh 
Log Message:
Generate additional requires for supermin (RHBZ#547496).


--- NEW FILE libguestfs-find-requires.sh ---
#!/bin/sh -
# Additional custom requires for libguestfs package.

exec 5>>/tmp/requires.log

echo >&5
time >&5
echo args "$@" >&5

original_find_requires="$1"
shift

# Get the list of files.
files=`sed "s/['\"]/\\\&/g"`

# Use ordinary find-requires first.
echo $files | tr [:blank:] '\n' | $original_find_requires

# Is initramfs.*.supermin.hostfiles included in the list of files?
hostfiles=`echo $files | tr [:blank:] '\n' | grep 'initramfs\..*\.supermin\.hostfiles$'`
echo hostfiles $hostfiles >&5

if [ -z "$hostfiles" ]; then
    exit 0
fi

# Generate extra requires for libraries listed in hostfiles.
sofiles=`grep 'lib.*\.so\.' $hostfiles | fgrep -v '*' | sed 's|^\.||'`
for f in $sofiles; do
    if [ -f "$f" ]; then
        echo "$f"
    fi
done


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- libguestfs.spec	18 Dec 2009 19:30:31 -0000	1.117
+++ libguestfs.spec	21 Dec 2009 13:06:12 -0000	1.118
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.80
-Release:     3%{?dist}
+Release:     9%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -88,6 +88,12 @@ Requires:      qemu-kvm >= 0.10-7
 # For libguestfs-test-tool.
 Requires:      genisoimage
 
+# Provide our own custom requires for the supermin appliance.
+Source1:     libguestfs-find-requires.sh
+%global _use_internal_dependency_generator 0
+%global __find_provides %{_rpmconfigdir}/find-provides
+%global __find_requires %{SOURCE1} %{_rpmconfigdir}/find-requires
+
 
 %description
 Libguestfs is a library for accessing and modifying guest disk images.
@@ -606,6 +612,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-9
+- Generate additional requires for supermin (RHBZ#547496).
+
 * Fri Dec 18 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-3
 - Work around udevsettle command problem (RHBZ#548121).
 - Enable tests.



From petersen at fedoraproject.org  Mon Dec 21 13:06:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 21 Dec 2009 13:06:35 +0000 (UTC)
Subject: rpms/alex/devel alex.spec,1.17,1.18
Message-ID: <20091221130635.8B6E711C00E7@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/alex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22646

Modified Files:
	alex.spec 
Log Message:
build dynamically with ghc-6.12.1


Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/alex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- alex.spec	14 Sep 2009 02:16:16 -0000	1.17
+++ alex.spec	21 Dec 2009 13:06:35 -0000	1.18
@@ -4,7 +4,7 @@
 Name:           alex
 # part of haskell-platform-2009.2.0.2
 Version:        2.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A lexer generator for Haskell
 
 Group:          Development/Tools
@@ -28,14 +28,14 @@ expressions.  It is similar to the tool 
 
 
 %build
-%cabal_configure
+%cabal_configure --ghc-option=-dynamic
 %cabal build
 
 cd doc
 autoreconf
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
 make html
-cd -
+cd ..
 
 
 %install
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Jens Petersen <petersen at redhat.com> - 2.3.1-7
+- build dynamically with ghc-6.12.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ruben at fedoraproject.org  Mon Dec 21 13:13:10 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 21 Dec 2009 13:13:10 +0000 (UTC)
Subject: rpms/whatsup/F-12 whatsup.spec,1.4,1.5
Message-ID: <20091221131310.2A31C11C00E7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/whatsup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24093

Modified Files:
	whatsup.spec 
Log Message:
* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.9-3
- Rebuild to pick up new opensm



Index: whatsup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/whatsup/F-12/whatsup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- whatsup.spec	27 Jul 2009 07:13:53 -0000	1.4
+++ whatsup.spec	21 Dec 2009 13:13:09 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:       Node up/down detection utility
 Name:          whatsup
 Version:       1.9
-Release:       2%{?dist}
+Release:       3%{?dist}
 Group:         Applications/Communications
 License:       GPLv2+
 URL:           https://computing.llnl.gov/linux/whatsup.html
@@ -199,6 +199,9 @@ fi
 %config(noreplace) %{_sysconfdir}/hostsfile
 
 %changelog
+* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.9-3
+- Rebuild to pick up new opensm
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ynemoy at fedoraproject.org  Mon Dec 21 13:20:39 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Mon, 21 Dec 2009 13:20:39 +0000 (UTC)
Subject: rpms/ghc-X11/F-12 ghc-X11.spec,1.18,1.19 sources,1.3,1.4
Message-ID: <20091221132039.E849611C039C@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-X11/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25166

Modified Files:
	ghc-X11.spec sources 
Log Message:
Updates to latest upstream



Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-12/ghc-X11.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ghc-X11.spec	31 Oct 2009 18:29:17 -0000	1.18
+++ ghc-X11.spec	21 Dec 2009 13:20:39 -0000	1.19
@@ -7,7 +7,7 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        1.4.6.1
+Version:        1.5.0.0
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.5.0.0-1
+- updates to latest upstream
+
 * Thu Oct 29 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.4.6.1-1
 - update to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Oct 2009 18:29:17 -0000	1.3
+++ sources	21 Dec 2009 13:20:39 -0000	1.4
@@ -1 +1 @@
-c60c94847e59895cd4a54e6405375851  X11-1.4.6.1.tar.gz
+ec6670f5ce1812206903c8a0fd9df04c  X11-1.5.0.0.tar.gz



From lucilanga at fedoraproject.org  Mon Dec 21 13:26:24 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 21 Dec 2009 13:26:24 +0000 (UTC)
Subject: rpms/qle/devel qle.spec,1.5,1.6
Message-ID: <20091221132624.4A8FF11C00E7@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/qle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26257

Modified Files:
	qle.spec 
Log Message:
proper build requires


Index: qle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qle/devel/qle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- qle.spec	20 Dec 2009 18:54:21 -0000	1.5
+++ qle.spec	21 Dec 2009 13:26:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           qle
 Version:        0.0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A QSO Logger and log Editor
 
 Group:          Applications/Communications
@@ -17,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-Requires:       perl, perl(DBI), perl(DBD::SQLite), perl(Tk), perl(PDF-Create)
+Requires:       perl, perl(DBI), perl(DBD::SQLite), perl(Tk), perl(PDF::Create)
 #qle requires rigctld from hamlib for communicating with transciever
 Requires:       hamlib
 Requires:       cwdaemon
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.17-2
+- fix build requires
+
 * Fri Nov 27 2009 Lucian Langa <cooly at gnome.eu.org> - 0.0.17-1
 - improve desktop icon file (#530837)
 - update patch0



From ynemoy at fedoraproject.org  Mon Dec 21 13:27:14 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Mon, 21 Dec 2009 13:27:14 +0000 (UTC)
Subject: File xmonad-0.9.1.tar.gz uploaded to lookaside cache by ynemoy
Message-ID: <20091221132714.EE39010F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xmonad:

3d0dd5cf77768b10e1b7f3a47e32b09e  xmonad-0.9.1.tar.gz



From tbzatek at fedoraproject.org  Mon Dec 21 13:38:13 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 21 Dec 2009 13:38:13 +0000 (UTC)
Subject: rpms/gamin/devel gamin.spec,1.73,1.74
Message-ID: <20091221133813.A49E111C00E7@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gamin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28363

Modified Files:
	gamin.spec 
Log Message:
* Mon Dec 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 0.1.10-6
- Cleanup for package review (#225776)



Index: gamin.spec
===================================================================
RCS file: /cvs/extras/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- gamin.spec	24 Jul 2009 23:29:44 -0000	1.73
+++ gamin.spec	21 Dec 2009 13:38:13 -0000	1.74
@@ -1,10 +1,14 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.10
-Release: 5%{?dist}%{?extra_release}
+Release: 6%{?dist}
 License: LGPLv2
+#some of the files (server/inotify-kernel.c) are GPLv2
+#so https://fedoraproject.org/wiki/Licensing#GPL_Compatibility_Matrix
+#says the whole is GPLv2
+#License: GPLv2
 Group: Development/Libraries
-Source: gamin-%{version}.tar.bz2
+Source: http://www.gnome.org/~veillard/gamin/sources/gamin-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org/~veillard/gamin/
 Obsoletes: fam
@@ -51,29 +55,44 @@ of the gamin package.
 %setup -q
 %patch1 -p1 -b .gnueabi
 
+# recode docs into UTF-8
+for i in ChangeLog NEWS ; do 
+   iconv -f iso-8859-1 -t utf-8 < $i > XXX
+   touch -r $i XXX
+   mv XXX $i
+done
+
+# https://fedoraproject.org/wiki/Features/SystemPythonExecutablesUseSystemPython
+# replace "/usr/bin/env python" with a "/usr/bin/python"
+for i in `find -name '*.py'`; do
+   sed -i.bak 's|^#!/usr/bin/env python|#!/usr/bin/python|g' $i
+   touch -r ${i}.bak $i
+   rm ${i}.bak
+done
+
+
 %build
 autoreconf --force --install
 %configure
-make
+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 -fr %{buildroot}
 
 %makeinstall
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 
 %clean
 rm -fr %{buildroot}
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 
 %doc AUTHORS ChangeLog NEWS README Copyright TODO
 %doc doc/*.html
@@ -83,21 +102,23 @@ rm -fr %{buildroot}
 %{_libexecdir}/gam_server
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 
 %{_libdir}/lib*.so
 %{_includedir}/fam.h
 %{_libdir}/pkgconfig/gamin.pc
 
 %files python
-%defattr(-, root, root)
-%doc AUTHORS ChangeLog NEWS README Copyright TODO
+%defattr(-, root, root, -)
 %{_libdir}/python*/site-packages/gamin.py*
 %{_libdir}/python*/site-packages/_gamin*
 %doc python/tests/*.py
 %doc doc/python.html
 
 %changelog
+* Mon Dec 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 0.1.10-6
+- Cleanup for package review (#225776)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rvokal at fedoraproject.org  Mon Dec 21 13:39:29 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Mon, 21 Dec 2009 13:39:29 +0000 (UTC)
Subject: rpms/wireshark/F-12 wireshark-autoconf.m4, NONE, 1.1 wireshark.spec, 
	1.62, 1.63
Message-ID: <20091221133929.321B611C00E7@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28716

Modified Files:
	wireshark.spec 
Added Files:
	wireshark-autoconf.m4 
Log Message:
add autoconf macro file


--- NEW FILE wireshark-autoconf.m4 ---
dnl AM_PATH_WIRESHARK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for wireshark development files, and define WIRESHARK_CFLAGS,
dnl	WIRESHARK_LIBS and WIRESHARK_VERSION.
dnl
AC_DEFUN([AM_PATH_WIRESHARK],[ 
	AC_ARG_WITH(wireshark-prefix,
	    [  --with-wireshark-prefix=PFX  Prefix where wireshark libraries are installed (optional)],
	    wireshark_config_prefix="$withval", wireshark_config_prefix="")

	wireshark_found=no
	if test "$wireshark_config_prefix" != "" ; then
		AM_PATH_GLIB_2_0(,,,[gmodule])
		WIRESHARK_CFLAGS="-DWS_VAR_IMPORT=extern -I$wireshark_config_prefix/include/wireshark -I$wireshark_config_prefix/include/wireshark/epan -I/usr/include/wireshark -I/usr/include/wireshark/epan $GLIB_CFLAGS"
		WIRESHARK_LIBS="-L$wireshark_config_prefix/lib -lwireshark -lwiretap $GLIB_LIBS"
		wireshark_found=yes
	else
		PKG_PROG_PKG_CONFIG()
		PKG_CHECK_MODULES(WIRESHARK, wireshark, wireshark_found=yes)
	fi

	ac_save_CFLAGS="$CFLAGS"
	ac_save_CLIBS="$LIBS"
	CFLAGS="$CFLAGS $WIRESHARK_CFLAGS"
	LIBS="$WIRESHARK_LIBS $LIBS"
	min_wireshark_version=ifelse([$1], ,0.0.0,[$1])
	if test $wireshark_found = yes; then
		AC_MSG_CHECKING(for wireshark version >= $min_wireshark_version)
		wireshark_found=no
		AC_TRY_RUN([
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <gmodule.h>
#include <epan/packet.h>
#include <epan/prefs.h>

int 
main()

{
	int ws_major_version, ws_minor_version, ws_micro_version;
	int major, minor, micro;
	char **tmp_version;

	tmp_version = (char *) strdup("$min_wireshark_version");
	major = 0;
	minor = 0;
	micro = 0;
	sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro);
	free(tmp_version);
	tmp_version = (char *) epan_get_version();
	sscanf(tmp_version, "%d.%d.%d",
	    &ws_major_version, &ws_minor_version, &ws_micro_version);

	if (ws_major_version > major ||
	    (ws_major_version == major && ws_minor_version > minor) ||
	    (ws_major_version == major && ws_minor_version == minor &&
	    ws_micro_version >= micro))
		return 0;

	printf("\n*** An old version of wireshark (%d.%d.%d) was found.\n",
	    ws_major_version, ws_minor_version, ws_micro_version);
	printf("*** You need a version of wireshark not older than %d.%d.%d. ",
	    major, minor, micro);
	return 1;
}
		], wireshark_found=yes)
	fi

	if test "$wireshark_found" != no; then
		AC_LANG_PUSH(C)
		AC_LINK_IFELSE([AC_LANG_PROGRAM([
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <gmodule.h>
#include <epan/packet.h>
#include <epan/prefs.h>
], [puts(epan_get_version());])], [WIRESHARK_VERSION=`./conftest$ac_exeext`],
wireshark_found=no)
		
		AC_LANG_POP
	fi

	CFLAGS="$ac_save_CFLAGS"
	LIBS="$ac_save_LIBS"

	if test "$wireshark_found" != no; then
		AC_MSG_RESULT(yes)
		ifelse([$2],, :, [$2])     
	else
		AC_MSG_RESULT(no)
		WIRESHARK_CFLAGS=""
		WIRESHARK_LIBS=""
		WIRESHARK_VERSION=""
		ifelse([$3], , :, [$3])
	fi
	AC_SUBST(WIRESHARK_CFLAGS)
	AC_SUBST(WIRESHARK_LIBS)
	AC_SUBST(WIRESHARK_VERSION)
])


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-12/wireshark.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- wireshark.spec	18 Dec 2009 13:16:24 -0000	1.62
+++ wireshark.spec	21 Dec 2009 13:39:29 -0000	1.63
@@ -12,7 +12,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.2.5
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -23,6 +23,7 @@ Source0:	http://wireshark.org/download/s
 Source1:	wireshark.pam
 Source2:	wireshark.console
 Source3:	wireshark.desktop
+Source4:	wireshark-autoconf.m4
 Patch1:		wireshark-1.0.2-pie.patch
 Patch2:		wireshark-nfsv4-opts.patch
 Patch3:		wireshark-0.99.7-path.patch
@@ -193,6 +194,7 @@ mkdir -p "${IDIR}/epan/ftypes"
 mkdir -p "${IDIR}/epan/dfilter"
 mkdir -p "${IDIR}/wiretap"
 install -m 644 color.h			"${IDIR}/"
+install -m 644 register.h		"${IDIR}/"
 install -m 644 epan/packet.h		"${IDIR}/epan/"
 install -m 644 epan/prefs.h		"${IDIR}/epan/"
 install -m 644 epan/proto.h		"${IDIR}/epan/"
@@ -214,7 +216,9 @@ install -m 644 epan/guid-utils.h	"${IDIR
 install -m 644 epan/exceptions.h	"${IDIR}/epan/"
 install -m 644 epan/address.h		"${IDIR}/epan/"
 install -m 644 epan/slab.h		"${IDIR}/epan/"
+install -m 644 epan/tfs.h		"${IDIR}/epan/"
 install -m 644 epan/except.h		"${IDIR}/epan/"
+install -m 644 epan/emem.h		"${IDIR}/epan/"
 install -m 644 epan/ftypes/ftypes.h	"${IDIR}/epan/ftypes/"
 install -m 644 epan/dfilter/dfilter.h	"${IDIR}/epan/dfilter/"
 install -m 644 epan/dfilter/drange.h	"${IDIR}/epan/dfilter/"
@@ -231,11 +235,15 @@ cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgco
 	Name:		%{name}
 	Description:	Network Traffic Analyzer
 	Version:	%{version}
-	Requires:	glib-2.0
+	Requires:	glib-2.0 gmodule-2.0
 	Libs:		-L${libdir} -lwireshark -lwiretap
 	Cflags:		-DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -I${includedir}/wireshark -I${includedir}/wireshark/epan
 EOF
 
+#	Install the autoconf macro.
+mkdir -p "${RPM_BUILD_ROOT}%{_datadir}/aclocal"
+cp "%{SOURCE4}" "${RPM_BUILD_ROOT}%{_datadir}/aclocal/wireshark.m4"
+
 # Remove .la files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la
 
@@ -293,6 +301,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/wireshark
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
+%{_datadir}/aclocal/*
 %{_mandir}/man1/idl2wrs.*
 %{_sbindir}/idl2wrs
 %if %{with_lua}
@@ -300,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec 18 2009 Patrick Monnerat <pm at datasphere.ch> 1.2.5-3
+- Autoconf macro for plugin development.
+
 * Fri Dec 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.5-2
 - upgrade to 1.2.5
 - fixes security vulnaribilities, see http://www.wireshark.org/security/wnpa-sec-2009-09.html 



From jvcelak at fedoraproject.org  Mon Dec 21 13:45:26 2009
From: jvcelak at fedoraproject.org (jvcelak)
Date: Mon, 21 Dec 2009 13:45:26 +0000 (UTC)
Subject: rpms/tuned/devel tuned-unsupported-ethernet-cards.patch, NONE,
	1.1 tuned.spec, 1.15, 1.16
Message-ID: <20091221134526.B778711C00E7@cvs1.fedora.phx.redhat.com>

Author: jvcelak

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29919

Modified Files:
	tuned.spec 
Added Files:
	tuned-unsupported-ethernet-cards.patch 
Log Message:
- Fixed 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
  Some ethernet cards are not supported by 'ethtool'.


tuned-unsupported-ethernet-cards.patch:
 tuned_nettool.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE tuned-unsupported-ethernet-cards.patch ---
commit 94b46b4e38fa056e21e35087681c06a00ad9d0ff
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Mon Dec 21 13:14:45 2009 +0100

    tuned_nettool.py: bz 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
    
    Some strange network cards (e.g. Unknown (0x1062)) are not supported
    by 'ethtool'. The tool reports not very obviously:
    
    Cannot get device settings: Operation not permitted
    Cannot get wake-on-lan settings: Operation not permitted
    Cannot get link status: Operation not permitted

diff --git a/tuned_nettool.py b/tuned_nettool.py
index 9fb2ce0..6119154 100644
--- a/tuned_nettool.py
+++ b/tuned_nettool.py
@@ -132,7 +132,11 @@ class Tuned_nettool:
 		errors = p_ethtool.communicate()[1]
 
 		if errors != "":
-			raise Exception("Some errors were reported by 'ethtool'.", errors)
+			# it is possible that the network card is not supported
+			self.__clean_status()
+			return
+			# TODO: subject of logging
+			#raise Exception("Some errors were reported by 'ethtool'.", errors)
 
 		# parses output - kind of FSM
 


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- tuned.spec	11 Dec 2009 13:09:23 -0000	1.15
+++ tuned.spec	21 Dec 2009 13:45:26 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 0.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -11,6 +11,8 @@ Group: System Environment/Daemons
 #  git checkout v%{version}
 #  make archive
 Source: tuned-%{version}.tar.bz2
+# bz 542305, git 94b46b4e38fa056e21e35087681c06a00ad9d0ff
+Patch0: tuned-unsupported-ethernet-cards.patch
 URL: https://fedorahosted.org/tuned/
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: python
@@ -42,6 +44,7 @@ instead of fewer large ones).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -102,6 +105,10 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Jan Vcelak <jvcelak at redhat.com> 0.2.7-2
+- Fixed 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
+  Some ethernet cards are not supported by 'ethtool'.
+
 * Fri Dec 11 2009 Thomas Woerner <twoerner at redhat.com> 0.2.7-1
 - Updated ktune to version 0.4-1
   - Supports start and stop options in profile scripts calls



From jvcelak at fedoraproject.org  Mon Dec 21 13:46:45 2009
From: jvcelak at fedoraproject.org (jvcelak)
Date: Mon, 21 Dec 2009 13:46:45 +0000 (UTC)
Subject: rpms/tuned/F-12 tuned-unsupported-ethernet-cards.patch, NONE,
	1.1 tuned.spec, 1.14, 1.15
Message-ID: <20091221134645.4E81F11C00E7@cvs1.fedora.phx.redhat.com>

Author: jvcelak

Update of /cvs/pkgs/rpms/tuned/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30240

Modified Files:
	tuned.spec 
Added Files:
	tuned-unsupported-ethernet-cards.patch 
Log Message:
- Fixed 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
  Some ethernet cards are not supported by 'ethtool'.


tuned-unsupported-ethernet-cards.patch:
 tuned_nettool.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE tuned-unsupported-ethernet-cards.patch ---
commit 94b46b4e38fa056e21e35087681c06a00ad9d0ff
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Mon Dec 21 13:14:45 2009 +0100

    tuned_nettool.py: bz 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
    
    Some strange network cards (e.g. Unknown (0x1062)) are not supported
    by 'ethtool'. The tool reports not very obviously:
    
    Cannot get device settings: Operation not permitted
    Cannot get wake-on-lan settings: Operation not permitted
    Cannot get link status: Operation not permitted

diff --git a/tuned_nettool.py b/tuned_nettool.py
index 9fb2ce0..6119154 100644
--- a/tuned_nettool.py
+++ b/tuned_nettool.py
@@ -132,7 +132,11 @@ class Tuned_nettool:
 		errors = p_ethtool.communicate()[1]
 
 		if errors != "":
-			raise Exception("Some errors were reported by 'ethtool'.", errors)
+			# it is possible that the network card is not supported
+			self.__clean_status()
+			return
+			# TODO: subject of logging
+			#raise Exception("Some errors were reported by 'ethtool'.", errors)
 
 		# parses output - kind of FSM
 


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/tuned.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tuned.spec	11 Dec 2009 13:07:51 -0000	1.14
+++ tuned.spec	21 Dec 2009 13:46:45 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 0.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -11,6 +11,8 @@ Group: System Environment/Daemons
 #  git checkout v%{version}
 #  make archive
 Source: tuned-%{version}.tar.bz2
+# bz 542305, git 94b46b4e38fa056e21e35087681c06a00ad9d0ff
+Patch0: tuned-unsupported-ethernet-cards.patch
 URL: https://fedorahosted.org/tuned/
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: python
@@ -42,6 +44,7 @@ instead of fewer large ones).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -102,6 +105,10 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Jan Vcelak <jvcelak at redhat.com> 0.2.7-2
+- Fixed 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
+  Some ethernet cards are not supported by 'ethtool'.
+
 * Fri Dec 11 2009 Thomas Woerner <twoerner at redhat.com> 0.2.7-1
 - Updated ktune to version 0.4-1
   - Supports start and stop options in profile scripts calls



From rdieter at fedoraproject.org  Mon Dec 21 13:51:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 13:51:56 +0000 (UTC)
Subject: File kde-plasma-networkmanagement-0.9.tar.bz2 uploaded to lookaside
	cache by rdieter
Message-ID: <20091221135156.8FE8610F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kde-plasma-networkmanagement:

b31479966fd13a7391f0211e41ce96d4  kde-plasma-networkmanagement-0.9.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 21 13:52:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 13:52:33 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.30, 1.31 sources, 1.14, 1.15
Message-ID: <20091221135233.C054A11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31268

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Log Message:
* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.9.20091220svn
- 20091220 snapshot
- -libs: use/tighten qt4/kdelibs4 deps



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- kde-plasma-networkmanagement.spec	19 Dec 2009 02:28:41 -0000	1.30
+++ kde-plasma-networkmanagement.spec	21 Dec 2009 13:52:33 -0000	1.31
@@ -16,7 +16,7 @@ Name:           kde-plasma-networkmanage
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
 Version:        0.9
-Release:        0.8.20091124svn%{?dist}
+Release:        0.9.20091220%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,17 +26,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 1053937 svn://anonsvn.kde.org/home/kde/trunk/kdereview/networkmanagement kde-plasma-networkmanagement-0.9
+#  svn export -r 1064692 svn://anonsvn.kde.org/home/kde/trunk/kdereview/networkmanagement kde-plasma-networkmanagement-0.9
 #  tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
 
-BuildRequires:  kdelibs-experimental-devel
-BuildRequires:  kdebase-workspace-devel >= 4.3.0
+BuildRequires:  kdelibs4-devel >= 4.3.80
+BuildRequires:  kdebase-workspace-devel
 BuildRequires:  NetworkManager-glib-devel >= 0.7.0
 BuildRequires:  PolicyKit-devel
-# hopefully temporary
 BuildRequires:  qt4-devel >= 4.6.0
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+
 Requires: NetworkManager
 
 # multilib upgrades
@@ -68,8 +69,8 @@ connections on systems that use the Netw
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
-#Requires: kdelibs4%{?_isa} >= %{_kde4_version}
-#Requires: qt4%{?_isa} >= %{_qt4_version}
+Requires: kdelibs4%{?_isa} %{?_kde4_version:>= %{_kde4_version}}
+Requires: qt4%{?_isa} %{?_qt4_version:>= %{_qt4_version}}
 %if ! 0%{?have_knm3}
 Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
@@ -209,6 +210,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.9.20091220svn
+- 20091220 snapshot
+- -libs: use/tighten qt4/kdelibs4 deps
+
 * Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.8.20091124svn
 - New snapshot
 - BR: qt4-devel >= 4.6.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Nov 2009 02:55:31 -0000	1.14
+++ sources	21 Dec 2009 13:52:33 -0000	1.15
@@ -1 +1 @@
-132cc876e5197445613bb6379df47476  kde-plasma-networkmanagement-0.9.tar.bz2
+b31479966fd13a7391f0211e41ce96d4  kde-plasma-networkmanagement-0.9.tar.bz2



From cwickert at fedoraproject.org  Mon Dec 21 13:54:52 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 21 Dec 2009 13:54:52 +0000 (UTC)
Subject: rpms/emelfm2/F-12 .cvsignore, 1.23, 1.24 emelfm2.spec, 1.45,
	1.46 sources, 1.23, 1.24 emelfm2-0.7.0-e2p_upgrade-fix.patch,
	1.1, NONE
Message-ID: <20091221135452.EA22411C00E7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31717/F-12

Modified Files:
	.cvsignore emelfm2.spec sources 
Removed Files:
	emelfm2-0.7.0-e2p_upgrade-fix.patch 
Log Message:
* Mon Dec 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.1-1
- Update to 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	22 Nov 2009 17:46:08 -0000	1.23
+++ .cvsignore	21 Dec 2009 13:54:52 -0000	1.24
@@ -1 +1 @@
-emelfm2-0.7.0.tar.bz2
+emelfm2.spec


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/emelfm2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- emelfm2.spec	22 Nov 2009 18:40:22 -0000	1.45
+++ emelfm2.spec	21 Dec 2009 13:54:52 -0000	1.46
@@ -1,11 +1,10 @@
 ## Rebuild options:
-# --with hal : Build with the hal support (default: without)
-#
-## To rebuild this package with hal support:
-# rpmbuild -ba emelfm2.spec --with hal
+# --with hal : Build with hal support (default: without)
+#              use bcond_without to change the default
+%bcond_with hal
 
 Name:           emelfm2
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
@@ -13,15 +12,12 @@ Group:          Applications/File
 License:        GPLv3+
 URL:            http://emelfm2.net/
 Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
-# sent upstream via mailing list:
-# http://www.freelists.org/post/emelfm2/emelFM2-070-released,3
-Patch0:         emelfm2-0.7.0-e2p_upgrade-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils
 BuildRequires:  file-devel
 Requires:       findutils >= 4.2, grep, sed, bzip2
-%if 0%{?_with_hal:1}
+%if %{with hal}
 BuildRequires:  hal-devel, dbus-glib-devel
 Requires:       hal
 %endif
@@ -43,7 +39,6 @@ opening an xterm.
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
 
 # fix broken icon in emelfm2.desktop
 sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
@@ -51,6 +46,7 @@ sed -i 's!Icon=emelfm2!Icon=%{_datadir}/
 # get more useful build logs (verify CFLAGS etc)
 sed -i 's!^\(\t\+\)@!\1!' Makefile
 
+
 %build
 make %{?_smp_mflags} \
     CFLAGS="${RPM_OPT_FLAGS}" \
@@ -73,7 +69,7 @@ make %{?_smp_mflags} \
     %if 0%{?fedora} > 11
     WITH_POLKIT=1 \
     %endif
-    %if 0%{?_with_hal:1}
+    %if %{with hal}
       WITH_HAL=1 \
     %endif
 
@@ -111,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.1-1
+- Update to 0.7.1
+
 * Sun Nov 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.0-1
 - Update to 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	22 Nov 2009 17:46:09 -0000	1.23
+++ sources	21 Dec 2009 13:54:52 -0000	1.24
@@ -1 +1 @@
-77899d801915da87c5be40763d345bc6  emelfm2-0.7.0.tar.bz2
+e553041ed7a8ba8871c5cc7ce2007cb2  emelfm2.spec


--- emelfm2-0.7.0-e2p_upgrade-fix.patch DELETED ---



From cwickert at fedoraproject.org  Mon Dec 21 13:54:53 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 21 Dec 2009 13:54:53 +0000 (UTC)
Subject: rpms/emelfm2/devel .cvsignore, 1.23, 1.24 emelfm2.spec, 1.45,
	1.46 sources, 1.23, 1.24 emelfm2-0.7.0-e2p_upgrade-fix.patch,
	1.1, NONE
Message-ID: <20091221135453.6CEC811C00E7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31717/devel

Modified Files:
	.cvsignore emelfm2.spec sources 
Removed Files:
	emelfm2-0.7.0-e2p_upgrade-fix.patch 
Log Message:
* Mon Dec 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.1-1
- Update to 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	22 Nov 2009 17:46:07 -0000	1.23
+++ .cvsignore	21 Dec 2009 13:54:52 -0000	1.24
@@ -1 +1 @@
-emelfm2-0.7.0.tar.bz2
+emelfm2.spec


Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/emelfm2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- emelfm2.spec	22 Nov 2009 18:40:21 -0000	1.45
+++ emelfm2.spec	21 Dec 2009 13:54:53 -0000	1.46
@@ -1,11 +1,10 @@
 ## Rebuild options:
-# --with hal : Build with the hal support (default: without)
-#
-## To rebuild this package with hal support:
-# rpmbuild -ba emelfm2.spec --with hal
+# --with hal : Build with hal support (default: without)
+#              use bcond_without to change the default
+%bcond_with hal
 
 Name:           emelfm2
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
@@ -13,15 +12,12 @@ Group:          Applications/File
 License:        GPLv3+
 URL:            http://emelfm2.net/
 Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
-# sent upstream via mailing list:
-# http://www.freelists.org/post/emelfm2/emelFM2-070-released,3
-Patch0:         emelfm2-0.7.0-e2p_upgrade-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0, libacl-devel, gettext, desktop-file-utils
 BuildRequires:  file-devel
 Requires:       findutils >= 4.2, grep, sed, bzip2
-%if 0%{?_with_hal:1}
+%if %{with hal}
 BuildRequires:  hal-devel, dbus-glib-devel
 Requires:       hal
 %endif
@@ -43,7 +39,6 @@ opening an xterm.
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
 
 # fix broken icon in emelfm2.desktop
 sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
@@ -51,6 +46,7 @@ sed -i 's!Icon=emelfm2!Icon=%{_datadir}/
 # get more useful build logs (verify CFLAGS etc)
 sed -i 's!^\(\t\+\)@!\1!' Makefile
 
+
 %build
 make %{?_smp_mflags} \
     CFLAGS="${RPM_OPT_FLAGS}" \
@@ -73,7 +69,7 @@ make %{?_smp_mflags} \
     %if 0%{?fedora} > 11
     WITH_POLKIT=1 \
     %endif
-    %if 0%{?_with_hal:1}
+    %if %{with hal}
       WITH_HAL=1 \
     %endif
 
@@ -111,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.1-1
+- Update to 0.7.1
+
 * Sun Nov 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.0-1
 - Update to 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	22 Nov 2009 17:46:07 -0000	1.23
+++ sources	21 Dec 2009 13:54:53 -0000	1.24
@@ -1 +1 @@
-77899d801915da87c5be40763d345bc6  emelfm2-0.7.0.tar.bz2
+e553041ed7a8ba8871c5cc7ce2007cb2  emelfm2.spec


--- emelfm2-0.7.0-e2p_upgrade-fix.patch DELETED ---



From rdieter at fedoraproject.org  Mon Dec 21 14:19:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 14:19:07 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.255,1.256
Message-ID: <20091221141907.F169A11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3059

Modified Files:
	kdepim.spec 
Log Message:
* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
- Obsoletes/Provides: bilbo
- %description: +blogilo



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- kdepim.spec	18 Dec 2009 18:25:39 -0000	1.255
+++ kdepim.spec	21 Dec 2009 14:19:07 -0000	1.256
@@ -3,7 +3,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -22,6 +22,11 @@ Patch3:  kdepim-4.3.75-desktop-fixes.pat
 
 # upstream patches (trunk)
 
+Obsoletes: bilbo < 1:1.0
+%if 0%{?fedora} < 13
+Provides:  bilbo = 1:1.0
+%endif
+
 Provides: kdepim4 = %{version}-%{release}
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -63,13 +68,13 @@ Requires(hint): spambayes
 %description
 %{summary}, including:
 * akregator: feed aggregator
+* blogilo: blogging application, focused on simplicity and usability
 * kmail: email client
 * knode: newsreader
 * knotes: sticky notes for the desktop
 * kontact: integrated PIM management
 * korganizer: journal, appointments, events, todos
 
-
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -211,6 +216,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
+- Obsoletes/Provides: bilbo
+- %%description: +blogilo
+
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)
 



From akurtakov at fedoraproject.org  Mon Dec 21 14:22:33 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Dec 2009 14:22:33 +0000 (UTC)
Subject: rpms/maven2-plugin-shade/devel maven2-plugin-shade.spec,1.2,1.3
Message-ID: <20091221142233.5A09A11C00E7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven2-plugin-shade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3591/devel

Modified Files:
	maven2-plugin-shade.spec 
Log Message:
BR/R maven-shared-dependency-tree.


Index: maven2-plugin-shade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-plugin-shade/devel/maven2-plugin-shade.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- maven2-plugin-shade.spec	21 Dec 2009 11:09:46 -0000	1.2
+++ maven2-plugin-shade.spec	21 Dec 2009 14:22:33 -0000	1.3
@@ -30,7 +30,7 @@
 
 Name:           maven2-plugin-shade
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Maven Shade Plugin
 License:        ASL 2.0
@@ -58,6 +58,7 @@ BuildRequires:  maven2-plugin-surefire =
 BuildRequires:  maven-surefire-provider-junit = 2.3
 BuildRequires:  plexus-archiver >= 1.0-0.1.a7
 BuildRequires:  plexus-maven-plugin >= 1.3.5
+BuildRequires:  maven-shared-dependency-tree
 BuildRequires:  plexus-cdc
 BuildRequires:  qdox >= 1.5
 BuildRequires:  tomcat5
@@ -68,6 +69,7 @@ BuildRequires:  avalon-framework
 Requires:       maven2 >= 0:2.0.8
 Requires:       plexus-archiver >= 1.0-0.1.a7
 Requires:       jpackage-utils >= 0:1.7.2
+Requires:       maven-shared-dependency-tree
 
 Requires(post):   jpackage-utils >= 0:1.7.2
 Requires(postun): jpackage-utils >= 0:1.7.2
@@ -142,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.2-2
+- BR/R maven-shared-dependency-tree.
+
 * Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.2-1
 - Update to 1.2.2 upstream release.
 



From jcollie at fedoraproject.org  Mon Dec 21 14:22:41 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon, 21 Dec 2009 14:22:41 +0000 (UTC)
Subject: File asterisk-1.6.1.12.tar.gz uploaded to lookaside cache by jcollie
Message-ID: <20091221142241.7C20D10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for asterisk:

d6bc1448b8fa274a2acaef1b15f4d485  asterisk-1.6.1.12.tar.gz



From jcollie at fedoraproject.org  Mon Dec 21 14:22:42 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon, 21 Dec 2009 14:22:42 +0000 (UTC)
Subject: File asterisk-1.6.1.12.tar.gz.asc uploaded to lookaside cache by
	jcollie
Message-ID: <20091221142242.D7A3F10F862@bastion.fedoraproject.org>

A file has been added to the lookaside cache for asterisk:

979da3e2e0a11824298c2af332b9c9e7  asterisk-1.6.1.12.tar.gz.asc



From dwalsh at fedoraproject.org  Mon Dec 21 14:30:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 21 Dec 2009 14:30:32 +0000 (UTC)
Subject: rpms/selinux-policy/devel nsadiff, 1.28, 1.29 policy-F13.patch, 1.16, 
	1.17
Message-ID: <20091221143032.6B2F311C02BC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4684

Modified Files:
	nsadiff policy-F13.patch 
Log Message:
* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-1
- Update to upstream



Index: nsadiff
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nsadiff	17 Dec 2009 19:34:18 -0000	1.28
+++ nsadiff	21 Dec 2009 14:30:31 -0000	1.29
@@ -1 +1 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.4 > /tmp/diff
+diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.5 > /tmp/diff

policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 ++
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   11 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   17 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  186 +++
 policy/modules/apps/sandbox.te            |  330 +++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  370 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |   80 +
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    7 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  120 +-
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  447 +++++--
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   35 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   21 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   51 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   25 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   49 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    1 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   18 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   20 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   25 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  284 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  298 +++++
 policy/modules/services/xserver.te        |  363 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  192 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   56 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   15 
 371 files changed, 19531 insertions(+), 2742 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.16 -r 1.17 policy-F13.patchIndex: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- policy-F13.patch	18 Dec 2009 21:13:18 -0000	1.16
+++ policy-F13.patch	21 Dec 2009 14:30:31 -0000	1.17
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.5/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.4/Makefile	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/Makefile	2009-12-18 12:16:37.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -10,9 +10,9 @@ diff -b -B --ignore-all-space --exclude-
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.5/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/global_tunables	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/global_tunables	2009-12-18 12:16:37.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -48,9 +48,9 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(mmap_low_allowed, false)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.5/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/alsa.te	2009-12-18 12:16:37.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -60,9 +60,9 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(alsa_t)
  
  init_use_fds(alsa_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.5/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/anaconda.te	2009-12-18 12:16:37.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -80,9 +80,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.5/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/brctl.te	2009-12-18 12:16:37.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -92,9 +92,9 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_network_state(brctl_t)
  kernel_read_sysctl(brctl_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.5/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/certwatch.te	2009-12-18 12:16:37.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -104,9 +104,9 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	apache_exec_modules(certwatch_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.5/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/consoletype.te	2009-12-18 12:16:37.000000000 -0500
 @@ -10,7 +10,6 @@
  type consoletype_exec_t;
  application_executable_file(consoletype_exec_t)
@@ -123,17 +123,17 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.5/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/dmesg.fc	2009-12-18 12:16:37.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.5/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/dmesg.te	2009-12-18 12:16:37.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -175,9 +175,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +#mcelog needs
 +dev_read_raw_memory(dmesg_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.5/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/firstboot.te	2009-12-18 12:16:37.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -200,48 +200,18 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.5/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-11-25 15:15:48.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-04 12:33:34.000000000 -0500
-@@ -1,5 +1,5 @@
- 
--policy_module(kismet, 1.4.1)
-+policy_module(kismet, 1.4.0)
- 
- ########################################
- #
-@@ -11,9 +11,6 @@
- application_domain(kismet_t, kismet_exec_t)
- role system_r types kismet_t;
- 
--type kismet_home_t;
--userdom_user_home_content(kismet_home_t)
--
- type kismet_log_t;
- logging_log_file(kismet_log_t)
- 
-@@ -29,6 +26,9 @@
- type kismet_var_run_t;
- files_pid_file(kismet_var_run_t)
- 
-+type kismet_home_t;
-+userdom_user_home_content(kismet_home_t)
-+
- ########################################
- #
- # kismet local policy
-@@ -42,18 +42,14 @@
- allow kismet_t self:unix_stream_socket create_stream_socket_perms;
- allow kismet_t self:tcp_socket create_stream_socket_perms;
++++ serefpolicy-3.7.5/policy/modules/admin/kismet.te	2009-12-18 12:16:37.000000000 -0500
+@@ -45,6 +45,7 @@
+ manage_dirs_pattern(kismet_t, kismet_home_t, kismet_home_t)
+ manage_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
+ manage_lnk_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
++userdom_search_user_home_dirs(kismet_t)
+ userdom_user_home_dir_filetrans(kismet_t, kismet_home_t, { file dir })
  
--manage_dirs_pattern(kismet_t, kismet_home_t, kismet_home_t)
--manage_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
--manage_lnk_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
--userdom_user_home_dir_filetrans(kismet_t, kismet_home_t, { file dir })
--
  manage_files_pattern(kismet_t, kismet_log_t, kismet_log_t)
- allow kismet_t kismet_log_t:dir setattr;
- logging_log_filetrans(kismet_t, kismet_log_t, { file dir })
+@@ -53,7 +54,8 @@
  
  manage_dirs_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
  manage_files_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
@@ -251,25 +221,17 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(kismet_t, kismet_tmpfs_t, kismet_tmpfs_t)
  manage_files_pattern(kismet_t, kismet_tmpfs_t, kismet_tmpfs_t)
-@@ -67,8 +63,15 @@
- allow kismet_t kismet_var_run_t:dir manage_dir_perms;
- files_pid_filetrans(kismet_t, kismet_var_run_t, { file dir })
- 
-+manage_dirs_pattern(kismet_t, kismet_home_t, kismet_home_t)
-+manage_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
-+manage_lnk_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
-+userdom_search_user_home_dirs(kismet_t)
-+userdom_user_home_dir_filetrans(kismet_t, kismet_home_t, { file dir })
-+
+@@ -69,6 +71,7 @@
+ 
  kernel_search_debugfs(kismet_t)
  kernel_read_system_state(kismet_t)
 +kernel_read_network_state(kismet_t)
[...11268 lines suppressed...]
 +########################################
 +## <summary>
 +##	Create, read, write, and delete user
- ##	temporary directories.
- ## </summary>
- ## <param name="domain">
-@@ -2276,6 +2502,46 @@
- ########################################
- ## <summary>
- ##	Create, read, write, and delete user
-+##	temporary chr files.
++##	temporary named pipes.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -33791,19 +33155,19 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_user_tmp_chr_files',`
++interface(`userdom_manage_user_tmp_pipes',`
 +	gen_require(`
 +		type user_tmp_t;
 +	')
 +
-+	manage_chr_files_pattern($1, user_tmp_t, user_tmp_t)
++	manage_fifo_files_pattern($1, user_tmp_t, user_tmp_t)
 +	files_search_tmp($1)
 +')
 +
 +########################################
 +## <summary>
 +##	Create, read, write, and delete user
-+##	temporary blk files.
++##	temporary named sockets.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -33811,22 +33175,16 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_user_tmp_blk_files',`
++interface(`userdom_manage_user_tmp_sockets',`
 +	gen_require(`
 +		type user_tmp_t;
 +	')
 +
-+	manage_blk_files_pattern($1, user_tmp_t, user_tmp_t)
-+	files_search_tmp($1)
-+')
-+
-+########################################
-+## <summary>
-+##	Create, read, write, and delete user
- ##	temporary symbolic links.
- ## </summary>
- ## <param name="domain">
-@@ -2391,7 +2657,7 @@
++	manage_sock_files_pattern($1, user_tmp_t, user_tmp_t)
+ 	files_search_tmp($1)
+ ')
+ 
+@@ -2391,7 +2653,7 @@
  
  ########################################
  ## <summary>
@@ -33835,7 +33193,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2399,19 +2665,21 @@
+@@ -2399,19 +2661,21 @@
  ##	</summary>
  ## </param>
  #
@@ -33861,7 +33219,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2419,15 +2687,14 @@
+@@ -2419,15 +2683,14 @@
  ##	</summary>
  ## </param>
  #
@@ -33881,7 +33239,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2749,7 +3016,7 @@
+@@ -2749,7 +3012,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -33890,7 +33248,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +3032,33 @@
+@@ -2765,11 +3028,33 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -33926,7 +33284,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3186,43 @@
+@@ -2897,7 +3182,43 @@
  		type user_tmp_t;
  	')
  
@@ -33971,7 +33329,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3259,7 @@
+@@ -2934,6 +3255,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -33979,7 +33337,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3390,656 @@
+@@ -3064,3 +3386,656 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -34636,9 +33994,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	dontaudit $1 admin_home_t:file getattr;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.5/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-04 12:33:34.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/userdomain.te	2009-12-18 12:16:37.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -34727,9 +34085,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.5/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-09 13:28:05.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/xen.if	2009-12-18 12:16:37.000000000 -0500
 @@ -180,6 +180,25 @@
  
  ########################################
@@ -34756,9 +34114,9 @@ diff -b -B --ignore-all-space --exclude-
  ##	Connect to xend over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.5/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-09 12:33:13.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/xen.te	2009-12-18 12:16:37.000000000 -0500
 @@ -85,6 +85,7 @@
  type xenconsoled_t;
  type xenconsoled_exec_t;
@@ -34797,9 +34155,9 @@ diff -b -B --ignore-all-space --exclude-
  	#Should have a boolean wrapping these
  	fs_list_auto_mountpoints(xend_t)
  	files_search_mnt(xend_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.5/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-05 06:20:51.000000000 -0500
++++ serefpolicy-3.7.5/policy/support/obj_perm_sets.spt	2009-12-18 12:16:37.000000000 -0500
 @@ -199,12 +199,14 @@
  #
  define(`getattr_file_perms',`{ getattr }')
@@ -34842,9 +34200,18 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_dbus_perms', `{ acquire_svc send_msg } ')
 +define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ')
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
---- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/users	2009-12-04 12:33:34.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.5/policy/users
+--- nsaserefpolicy/policy/users	2009-12-18 11:38:25.000000000 -0500
++++ serefpolicy-3.7.5/policy/users	2009-12-18 12:16:37.000000000 -0500
+@@ -6,7 +6,7 @@
+ #
+ # gen_user(username, prefix, role_set, mls_defaultlevel, mls_range, [mcs_catetories])
+ #
+-# Note: Identities without a prefix will not be listed
++# Note: Identities without a prefix wil not be listed
+ # in the users_extra file used by genhomedircon.
+ 
+ #
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #



From varekova at fedoraproject.org  Mon Dec 21 14:33:16 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 21 Dec 2009 14:33:16 +0000 (UTC)
Subject: File acct-6.5.1.tar.gz uploaded to lookaside cache by varekova
Message-ID: <20091221143316.D3DF410F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for psacct:

65c980063ad92de531ef47cf690829a6  acct-6.5.1.tar.gz



From rdieter at fedoraproject.org  Mon Dec 21 14:35:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 14:35:02 +0000 (UTC)
Subject: rpms/amarok/F-11 amarok-2.2.1.90-qtscript_not_required.patch, NONE,
	1.1 .cvsignore, 1.47, 1.48 amarok.spec, 1.158, 1.159 sources,
	1.49, 1.50 amarok-2.0.90-qtscript_not_required.patch, 1.1,
	NONE playlist_default_layout_fix.diff, 1.1, NONE
Message-ID: <20091221143502.319B411C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5472

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-2.2.1.90-qtscript_not_required.patch 
Removed Files:
	amarok-2.0.90-qtscript_not_required.patch 
	playlist_default_layout_fix.diff 
Log Message:
* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
- amarok-2.2.1.90 (2.2.2 beta1)


amarok-2.2.1.90-qtscript_not_required.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE amarok-2.2.1.90-qtscript_not_required.patch ---
diff -up amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required amarok-2.2.1.90/CMakeLists.txt
--- amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required	2009-12-10 04:45:37.000000000 -0600
+++ amarok-2.2.1.90/CMakeLists.txt	2009-12-10 09:42:21.253183224 -0600
@@ -75,8 +75,8 @@ if( WITH_PLAYER )
 
     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.3.0" "" )
 
-    find_package( QtScriptQtBindings REQUIRED )
-    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
+    macro_optional_find_package( QtScriptQtBindings )
+    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
 
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	12 Nov 2009 13:31:28 -0000	1.47
+++ .cvsignore	21 Dec 2009 14:35:01 -0000	1.48
@@ -1 +1 @@
-amarok-2.2.1.tar.bz2
+amarok-2.2.1.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- amarok.spec	16 Nov 2009 15:29:46 -0000	1.158
+++ amarok.spec	21 Dec 2009 14:35:01 -0000	1.159
@@ -1,19 +1,18 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.2.1
-Release: 2%{?dist}
+Version: 2.2.1.90
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch50: amarok-2.0.90-qtscript_not_required.patch
+Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: playlist_default_layout_fix.diff
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -34,7 +33,7 @@ BuildRequires: mysql-embedded-devel
 BuildRequires: qca2-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
-BuildRequires: taglib-extras-devel >= 1.0.0
+BuildRequires: taglib-extras-devel >= 1.0.1
 
 %global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
@@ -83,7 +82,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .playlist_default_layout_fix
 
 
 %build
@@ -175,6 +173,12 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
+- amarok-2.2.1.90 (2.2.2 beta1)
+
+* Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1-3 
+- rebuild (for qt-4.6.0-rc1, f13+)
+
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.1-2
 - playlist_default_layout_fix.diff (kde#211717)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	12 Nov 2009 13:31:29 -0000	1.49
+++ sources	21 Dec 2009 14:35:02 -0000	1.50
@@ -1 +1 @@
-4f6f45f0c25f85f2a2a1fff169ac7193  amarok-2.2.1.tar.bz2
+0fb6c98618c91159a26e3f2e837ef132  amarok-2.2.1.90.tar.bz2


--- amarok-2.0.90-qtscript_not_required.patch DELETED ---


--- playlist_default_layout_fix.diff DELETED ---



From cwickert at fedoraproject.org  Mon Dec 21 14:35:53 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 21 Dec 2009 14:35:53 +0000 (UTC)
Subject: File emelfm2-0.7.1.tar.bz2 uploaded to lookaside cache by cwickert
Message-ID: <20091221143553.8505210F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for emelfm2:

33d3861e23dbce5e2a0cb0e921f9109c  emelfm2-0.7.1.tar.bz2



From varekova at fedoraproject.org  Mon Dec 21 14:36:13 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 21 Dec 2009 14:36:13 +0000 (UTC)
Subject: rpms/psacct/devel psacct-6.5.1-LargeFile.patch, NONE,
	1.1 psacct-6.5.1-exit.patch, NONE,
	1.1 psacct-6.5.1-hzval-fixes2.patch, NONE,
	1.1 psacct-6.5.1-pts.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 psacct.spec, 1.41, 1.42 sources, 1.2,
	1.3 acct-6.3.2-exit.patch, 1.1, NONE acct-6.3.2-pts.patch, 1.1,
	NONE psacct-6.3.2-64bit-fixes.patch, 1.1,
	NONE psacct-6.3.2-LargeFile.patch, 1.1,
	NONE psacct-6.3.2-hzval-fixes2.patch, 1.1,
	NONE psacct-6.3.2-strictmatch.patch, 1.1, NONE
Message-ID: <20091221143613.5F4DF11C00E7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/psacct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5750

Modified Files:
	.cvsignore psacct.spec sources 
Added Files:
	psacct-6.5.1-LargeFile.patch psacct-6.5.1-exit.patch 
	psacct-6.5.1-hzval-fixes2.patch psacct-6.5.1-pts.patch 
Removed Files:
	acct-6.3.2-exit.patch acct-6.3.2-pts.patch 
	psacct-6.3.2-64bit-fixes.patch psacct-6.3.2-LargeFile.patch 
	psacct-6.3.2-hzval-fixes2.patch psacct-6.3.2-strictmatch.patch 
Log Message:
- update to 6.5
  remove unnecessary patches, spec file changes


psacct-6.5.1-LargeFile.patch:
 configure |    6 +++---
 file_rd.c |   13 ++++++++-----
 file_rd.h |    8 +++++---
 3 files changed, 16 insertions(+), 11 deletions(-)

--- NEW FILE psacct-6.5.1-LargeFile.patch ---
diff -up acct-6.5.1/configure.pom acct-6.5.1/configure
--- acct-6.5.1/configure.pom	2009-09-06 20:06:58.000000000 +0200
+++ acct-6.5.1/configure	2009-12-21 15:24:37.000000000 +0100
@@ -3684,12 +3684,12 @@ fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
+  CFLAGS="$ac_save_CFLAGS  -D_FILE_OFFSET_BITS=64"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g -O2  -D_FILE_OFFSET_BITS=64"
   else
-    CFLAGS="-g"
+    CFLAGS="-g  -D_FILE_OFFSET_BITS=64"
   fi
 else
   if test "$GCC" = yes; then
diff -up acct-6.5.1/file_rd.c.pom acct-6.5.1/file_rd.c
--- acct-6.5.1/file_rd.c.pom	2009-09-06 01:39:50.000000000 +0200
+++ acct-6.5.1/file_rd.c	2009-12-21 15:26:30.000000000 +0100
@@ -7,6 +7,9 @@
 
 #include "config.h"
 
+#define _LARGEFILE_SOURCE 1
+#define _FILE_OFFSET_BITS 64
+
 #include <stdio.h>
 
 #ifdef HAVE_STRING_H
@@ -103,9 +106,9 @@ char *file_reader_get_entry(struct file_
 
           if (fri->backwards)
             {
-              long offset, max_recs, recs_to_read;
+              off_t offset, max_recs, recs_to_read;
 
-              if ((offset = ftell (fri->fp)) <= 0)
+              if ((offset = ftello (fri->fp)) <= 0)
                 goto no_more_records;
 
               /* Read as many records as possible, up to
@@ -124,8 +127,8 @@ char *file_reader_get_entry(struct file_
 
               if (debugging_enabled)
                 {
-                  long new_offset = ftell (fri->fp);
-                  fprintf (stddebug, "Did seek in file %ld --> %ld\n",
+                  off_t new_offset = ftello (fri->fp);
+                  fprintf (stddebug, "Did seek in file %lld --> %lld\n",
                            offset, new_offset);
                 }
 
@@ -134,7 +137,7 @@ char *file_reader_get_entry(struct file_
                 fatal ("get_entry: couldn't read from file");
 
               if (debugging_enabled)
-                fprintf (stddebug, "Got %ld records from file\n",
+                fprintf (stddebug, "Got %lld records from file\n",
                          recs_to_read);
 
               /* don't need to check this, because the above read was fine */
diff -up acct-6.5.1/file_rd.h.pom acct-6.5.1/file_rd.h
--- acct-6.5.1/file_rd.h.pom	2009-09-05 03:15:49.000000000 +0200
+++ acct-6.5.1/file_rd.h	2009-12-21 15:27:24.000000000 +0100
@@ -4,6 +4,8 @@
  * record-oriented files.
  *
  */
+#define __USE_XOPEN
+#include <unistd.h>
 
 struct file_list
 {
@@ -19,9 +21,9 @@ struct file_rd_info
 				   because we close files as soon as
 				   we find their ends and free their
 				   entries from the linked list */
-    int recs_read;		/* how many records are in our buffer? */
-    int recs_left;		/* how many records are left in the
-				   buffer to be used? */
+    off_t recs_read;		/* how many records are in our buffer? */
+    off_t recs_left;		/* how many records are left in the
+				buffer to be used? */
     void *buffer;			/* the buffer for the data */
     int buffered_records;		/* how many records to buffer */
     int record_size;		/* how big is each record? */

psacct-6.5.1-exit.patch:
 accton.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE psacct-6.5.1-exit.patch ---
diff -up acct-6.5.1/accton.c.pom acct-6.5.1/accton.c
--- acct-6.5.1/accton.c.pom	2009-09-06 01:38:20.000000000 +0200
+++ acct-6.5.1/accton.c	2009-12-18 15:21:38.000000000 +0100
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
 
 
       /* did the system call return an error? */
-      if (-1 == status_acct)
+      if (-1 == status_acct  && errno != ENOSYS)
         {
           int err = errno;
           perror ("accton");

psacct-6.5.1-hzval-fixes2.patch:
 lastcomm.c |   10 ++++++++--
 sa.c       |   14 ++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

--- NEW FILE psacct-6.5.1-hzval-fixes2.patch ---
diff -up acct-6.5.1/lastcomm.c.hz acct-6.5.1/lastcomm.c
--- acct-6.5.1/lastcomm.c.hz	2009-09-06 01:39:50.000000000 +0200
+++ acct-6.5.1/lastcomm.c	2009-12-18 15:24:13.000000000 +0100
@@ -43,6 +43,9 @@ MA 02139, USA.  */
 #  include <time.h>
 # endif
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include <pwd.h>
 
@@ -73,6 +76,7 @@ char *program_name;		/* name of the prog
 
 int show_paging = 0;		/* If they want paging stats, print 'em */
 
+static unsigned int hzval;
 
 /* Here are various lists for the user to specify entries that they
    want to see.  */
@@ -100,6 +104,8 @@ int main(int argc, char *argv[])
   					 `-f' or `--file' flag */
   int backwards = 1; /* default to reading backwards */
 
+  hzval = sysconf(_SC_CLK_TCK);
+
   program_name = argv[0];
 
   while (1)
@@ -396,7 +402,7 @@ void parse_entries(void)
 #ifdef LINUX_MULTIFORMAT
                          ((ut + st) / (double) rec->ac_ahz),
 #else
-                         ((ut + st) / (double) ahz),
+                         ((ut + st) / (double) hzval),
 #endif
                          ctime (&btime));
           else
@@ -406,7 +412,7 @@ void parse_entries(void)
 #ifdef LINUX_MULTIFORMAT
                          ((ut + st) / (double) rec->ac_ahz),
 #else
-                         ((ut + st) / (double) ahz),
+                         ((ut + st) / (double) hzval),
 #endif
                          ctime (&btime));
 #else
diff -up acct-6.5.1/sa.c.hz acct-6.5.1/sa.c
--- acct-6.5.1/sa.c.hz	2009-09-06 17:54:56.000000000 +0200
+++ acct-6.5.1/sa.c	2009-12-18 15:25:54.000000000 +0100
@@ -253,6 +253,7 @@ int print_all_records = 0;	/* don't lump
 				   "***other" category */
 int always_yes = 0;		/* nonzero means always answer yes to
 				   a query */
+static unsigned int hzval;
 
 /* prototypes */
 
@@ -281,6 +282,7 @@ int main(int argc, char *argv[])
 {
   int c;
 
+  static unsigned int hzval;
   program_name = argv[0];
 
   /* Cache the page size of the machine for the PAGES_TO_KB macro */
@@ -598,7 +600,7 @@ int main(int argc, char *argv[])
 
   if (debugging_enabled)
     {
-      (void)fprintf (stddebug, "AHZ -> %d\n", ahz);
+      (void)fprintf (stddebug, "hzval -> %d\n", hzval);
       (void)fprintf (stddebug, "getpagesize() -> %d\n", getpagesize ());
       (void)fprintf (stddebug, "system_page_size == %.2f\n", system_page_size);
     }
@@ -962,7 +964,7 @@ static void print_stats_nicely (struct s
       /* Christoph Badura <bad at flatlin.ka.sub.org> says:
       *
       * The k*sec statistic is computed as
-      * ((ac_utime+ac_stime)*pages_to_kbytes(ac_mem))/AHZ.  Of course you
+      * ((ac_utime+ac_stime)*pages_to_kbytes(ac_mem))/hzval.  Of course you
       * need to expand the comp_t values.
       *
       * PAGES_TO_KBYTES(x) simply divides x by (getpagesize()/1024).  Of
@@ -1176,19 +1178,19 @@ void parse_acct_entries (void)
   while ((rec = pacct_get_entry ()) != NULL)
     {
 #ifdef HAVE_ACUTIME
-      double ut = comp_t_2_double (rec->ac_utime) / CURR_AHZ;
+      double ut = comp_t_2_double (rec->ac_utime) / (double) hzval;
 #endif
 
 #ifdef HAVE_ACSTIME
-      double st = comp_t_2_double (rec->ac_stime) / CURR_AHZ;
+      double st = comp_t_2_double (rec->ac_stime) / (double) hzval;
 #endif
 
 #ifdef HAVE_ACETIME
-      double et = ACETIME_2_DOUBLE (rec->ac_etime) / CURR_AHZ;
+      double et = comp_t_2_double (rec->ac_etime) / (double) hzval;
 #endif
 
 #ifdef HAVE_ACIO
-      double di = comp_t_2_double (rec->ac_io) / CURR_AHZ;
+      double di = comp_t_2_double (rec->ac_io) / (double) hzval;
 #endif
 
 #ifdef HAVE_ACMEM

psacct-6.5.1-pts.patch:
 dev_hash.c |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 3 deletions(-)

--- NEW FILE psacct-6.5.1-pts.patch ---
diff -up acct-6.5.1/dev_hash.c.orig acct-6.5.1/dev_hash.c
--- acct-6.5.1/dev_hash.c.orig	2009-09-06 01:39:50.000000000 +0200
+++ acct-6.5.1/dev_hash.c	2009-12-21 14:01:24.000000000 +0100
@@ -31,6 +31,7 @@ char *alloca ();
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
 #include <pwd.h>
 
 #include "common.h"
@@ -54,6 +55,11 @@ char *alloca ();
 # endif
 #endif
 
+#ifdef __linux__
+#define NULLDEV 0
+#else
+#define NULLDEV -1
+#endif
 
 /* globals */
 
@@ -64,6 +70,54 @@ struct dev_data
     char *name;			/* name of the device */
   };
 
+/* hash all possible /dev/pts devices as they only appear
+ *  in the filesystem when the device is active.
+ */
+
+static void
+setup_pts_devices () {
+
+  struct utsname uts;
+  struct dev_data dd;
+  int i;
+  struct pts_params {
+    char *utsname;		/* os name */
+    int base;			/* base major number */
+    int max;			/* max # of devices */
+    int mod;			/* number of minors per major */
+  } *pts_ent, pts_table[] = {
+    {"Linux", 136, 2048, 256},
+    { }
+  };
+
+  if( uname (&uts) ) {
+    /* silent error */
+    return;
+  }
+
+  for (pts_ent = &(pts_table[0]); pts_ent != NULL; ++pts_ent) {
+    if (!strcmp (uts.sysname, pts_ent->utsname))
+      break;
+  }
+  if (pts_ent == NULL) return; /* unsupported OS */
+
+  for (i = 0; i < pts_ent->max; ++i) {
+    long dev_num;
+    struct hashtab_elem *he;
+    int major, minor;
+
+    major = pts_ent->base + (i/pts_ent->mod);
+    minor = i % pts_ent->mod;
+    dev_num = ((major << 8) + minor);
+
+    dd.name = xmalloc (sizeof(char) * (strlen("pts/xxxx") + 1));
+    sprintf (dd.name, "pts/%d", i);
+
+    he = hashtab_create (dev_table, (void *) & dev_num, sizeof(dev_num));
+    hashtab_set_value (he, &dd, sizeof (dd));
+  }
+}
+
 /* Read the DIRNAME directory entries and make a linked list of ttys
    (so we can search through it later) */
 
@@ -80,6 +134,13 @@ static void setup_devices(char *dirname)
   if ((dirp = opendir (dirname)) == NULL)
     return;			/* skip it silently */
 
+  if (!strcmp (dirname, "/dev/pts")) {
+    /* assuming SysV, these are dynamically allocated */
+    closedir (dirp);
+    setup_pts_devices ();
+    return;
+  }
+
   for (dp = readdir (dirp); dp != NULL; dp = readdir (dirp))
     {
       char *fullname = (char *) alloca ((strlen (dirname)
@@ -122,10 +183,11 @@ static void setup_devices(char *dirname)
 char *dev_gnu_name(long dev_num)
 {
   struct hashtab_elem *he;
+  static char devstr [20];
 
   /* special case */
 
-  if (dev_num == -1)
+  if (dev_num == NULLDEV)
     return "__";
 
   if (dev_table == NULL)
@@ -134,6 +196,7 @@ char *dev_gnu_name(long dev_num)
       setup_devices ("/dev");	   /* most certainly */
       setup_devices ("/dev/pty");  /* perhaps */
       setup_devices ("/dev/ptym"); /* perhaps */
+      setup_devices ("/dev/pts");  /* perhaps */
     }
 
   he = hashtab_find (dev_table, (void *) &dev_num, sizeof (dev_num));
@@ -144,7 +207,10 @@ char *dev_gnu_name(long dev_num)
       return dd->name;
     }
 
-  /* didn't find it */
+  /* didn't find it, return it as [maj,min] */
+
+  sprintf (devstr, "[%d,%d]",  /* is this portable? */
+  (int) ((dev_num & 0xFF00) >> 8), (int) (dev_num & 0x00FF));
 
-  return "??";
+  return devstr;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 10:45:42 -0000	1.2
+++ .cvsignore	21 Dec 2009 14:36:12 -0000	1.3
@@ -1 +1 @@
-acct-6.3.2.tar.gz
+acct-6.5.1.tar.gz


Index: psacct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- psacct.spec	9 Dec 2009 07:13:20 -0000	1.41
+++ psacct.spec	21 Dec 2009 14:36:13 -0000	1.42
@@ -11,23 +11,22 @@
 
 Summary: Utilities for monitoring process activities
 Name: psacct
-Version: 6.3.2
-Release: 57%{?dist}
+Version: 6.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
-Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
+URL: ftp://ftp.gnu.org/pub/gnu/acct/
+Source: ftp://ftp.gnu.org/pub/gnu/acct/acct-%{version}.tar.gz
 Source1: psacct.init
 # This dumb patch breaks FHS 2.2 compliance, so it is disabled now except
 # in 7.x builds.  Do not use it in new products.
 Patch0: acct-6.3.2-config.patch
-Patch1: acct-6.3.2-exit.patch
+Patch1: psacct-6.5.1-exit.patch
 # Fixes some broken calls to ctime() on 64bit arch's <mharris at redhat.com>
-Patch2: psacct-6.3.2-64bit-fixes.patch
-Patch3: psacct-6.3.2-hzval-fixes2.patch
-Patch4: acct-6.3.2-pts.patch
-Patch5: psacct-6.3.2-strictmatch.patch
+Patch3: psacct-6.5.1-hzval-fixes2.patch
+Patch4: psacct-6.5.1-pts.patch
 Patch6: psacct-6.3.2-sa-manfix.patch
-Patch7: psacct-6.3.2-LargeFile.patch
+Patch7: psacct-6.5.1-LargeFile.patch
 Patch8: psacct-6.3.2-lastcomm_man.patch
 Patch9: acct-6.3.2-sa_manpage.patch
 Patch11: psacct-6.3.2-man-pages.patch
@@ -56,11 +55,10 @@ commands.
 %if ! %{FHS_compliant}
 %patch0 -p0 -b .config
 %endif
+
 %patch1 -p1 -b .psacct-exit
-%patch2 -p0 -b .64bit-fixes
 %patch3 -p1 -b .hz
 %patch4 -p1 -b .pts
-%patch5 -p1 -b .strictmatch
 %patch6 -p1 -b .tio-avio
 %patch7 -p1 -b .lfs
 %patch8 -p1 -b .man
@@ -145,7 +143,7 @@ touch %{accounting_logdir}/pacct
 %preun
 if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/accounting.info.gz %{_infodir}/dir --entry="* accounting: (accounting).            The GNU Process Accounting Suite." 2>/dev/null
-  /sbin/service psacct stop > /dev/null 2>&1	
+  /sbin/service psacct stop > /dev/null 2>&1
   /sbin/chkconfig --del psacct
 fi
 
@@ -179,6 +177,10 @@ fi
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Fri Dec 18 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 6.5-1
+- update to 6.5
+  remove unnecessary patches, spec file changes
+
 * Fri Dec  9 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 6.2.3-57
 - fix the initscript (service restart does not work)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Sep 2004 10:45:42 -0000	1.2
+++ sources	21 Dec 2009 14:36:13 -0000	1.3
@@ -1 +1 @@
-da0055b254f7da8b8920db83ef1ebba1  acct-6.3.2.tar.gz
+65c980063ad92de531ef47cf690829a6  acct-6.5.1.tar.gz


--- acct-6.3.2-exit.patch DELETED ---


--- acct-6.3.2-pts.patch DELETED ---


--- psacct-6.3.2-64bit-fixes.patch DELETED ---


--- psacct-6.3.2-LargeFile.patch DELETED ---


--- psacct-6.3.2-hzval-fixes2.patch DELETED ---


--- psacct-6.3.2-strictmatch.patch DELETED ---



From cwickert at fedoraproject.org  Mon Dec 21 14:36:59 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 21 Dec 2009 14:36:59 +0000 (UTC)
Subject: rpms/emelfm2/F-12 .cvsignore,1.24,1.25 sources,1.24,1.25
Message-ID: <20091221143659.9675311C00E7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5937/F-12

Modified Files:
	.cvsignore sources 
Log Message:
have a coffee and fix the sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	21 Dec 2009 13:54:52 -0000	1.24
+++ .cvsignore	21 Dec 2009 14:36:59 -0000	1.25
@@ -1 +1 @@
-emelfm2.spec
+emelfm2-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	21 Dec 2009 13:54:52 -0000	1.24
+++ sources	21 Dec 2009 14:36:59 -0000	1.25
@@ -1 +1 @@
-e553041ed7a8ba8871c5cc7ce2007cb2  emelfm2.spec
+33d3861e23dbce5e2a0cb0e921f9109c  emelfm2-0.7.1.tar.bz2



From cwickert at fedoraproject.org  Mon Dec 21 14:36:59 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 21 Dec 2009 14:36:59 +0000 (UTC)
Subject: rpms/emelfm2/devel .cvsignore,1.24,1.25 sources,1.24,1.25
Message-ID: <20091221143659.C3BA411C00E7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/emelfm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5937/devel

Modified Files:
	.cvsignore sources 
Log Message:
have a coffee and fix the sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	21 Dec 2009 13:54:52 -0000	1.24
+++ .cvsignore	21 Dec 2009 14:36:59 -0000	1.25
@@ -1 +1 @@
-emelfm2.spec
+emelfm2-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	21 Dec 2009 13:54:53 -0000	1.24
+++ sources	21 Dec 2009 14:36:59 -0000	1.25
@@ -1 +1 @@
-e553041ed7a8ba8871c5cc7ce2007cb2  emelfm2.spec
+33d3861e23dbce5e2a0cb0e921f9109c  emelfm2-0.7.1.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 21 14:43:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 14:43:42 +0000 (UTC)
Subject: File digikam-1.0.0.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091221144342.357DC10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for digikam:

6169deb68a3d712a0c6539b09c5f8c0c  digikam-1.0.0.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 21 14:43:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 14:43:52 +0000 (UTC)
Subject: rpms/digikam/devel .cvsignore, 1.39, 1.40 digikam.spec, 1.106,
	1.107 sources, 1.40, 1.41
Message-ID: <20091221144352.211B511C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7055

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
- digikam-1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	30 Nov 2009 18:19:22 -0000	1.39
+++ .cvsignore	21 Dec 2009 14:43:51 -0000	1.40
@@ -1 +1 @@
-digikam-1.0.0-rc.tar.bz2
+digikam-1.0.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- digikam.spec	30 Nov 2009 18:19:22 -0000	1.106
+++ digikam.spec	21 Dec 2009 14:43:51 -0000	1.107
@@ -1,9 +1,7 @@
 
-%define pre rc 
-
 Name:	 digikam
 Version: 1.0.0
-Release: 0.11.%{pre}%{?dist}
+Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -164,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- digikam-1.0.0
+
 * Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.11.rc
 - digikam-1.0.0-rc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	30 Nov 2009 18:19:22 -0000	1.40
+++ sources	21 Dec 2009 14:43:51 -0000	1.41
@@ -1 +1 @@
-270c268c6fb6880520b290d5ed5ca020  digikam-1.0.0-rc.tar.bz2
+6169deb68a3d712a0c6539b09c5f8c0c  digikam-1.0.0.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 21 14:53:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 14:53:48 +0000 (UTC)
Subject: rpms/ktorrent/F-12 .cvsignore, 1.36, 1.37 ktorrent.spec, 1.110,
	1.111 sources, 1.36, 1.37
Message-ID: <20091221145348.919AA11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8202

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.2-1
- ktorrent-3.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	23 Nov 2009 20:47:19 -0000	1.36
+++ .cvsignore	21 Dec 2009 14:53:48 -0000	1.37
@@ -1 +1 @@
-ktorrent-3.3.1.tar.bz2
+ktorrent-3.3.2.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/ktorrent.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- ktorrent.spec	23 Nov 2009 20:47:19 -0000	1.110
+++ ktorrent.spec	21 Dec 2009 14:53:48 -0000	1.111
@@ -2,7 +2,7 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.3.1
+Version:        3.3.2
 Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.2-1
+- ktorrent-3.3.2
+
 * Mon Nov 23 2009 Roland Wolters <wolters.liste at gmx.net> - 3.3.1-1
 - ktorrent-3.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	23 Nov 2009 20:47:19 -0000	1.36
+++ sources	21 Dec 2009 14:53:48 -0000	1.37
@@ -1 +1 @@
-6a76e0b3a7ed14966c8096f63fde6e29  ktorrent-3.3.1.tar.bz2
+b8387bcafe176ead086da785b5bf1eca  ktorrent-3.3.2.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 21 14:55:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 14:55:39 +0000 (UTC)
Subject: rpms/ktorrent/F-11 .cvsignore, 1.36, 1.37 ktorrent.spec, 1.105,
	1.106 sources, 1.36, 1.37
Message-ID: <20091221145539.179FD11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8691

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Nov 23 2009 Roland Wolters <wolters.liste at gmx.net> - 3.3.1-1
- ktorrent-3.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	23 Nov 2009 20:49:25 -0000	1.36
+++ .cvsignore	21 Dec 2009 14:55:38 -0000	1.37
@@ -1 +1 @@
-ktorrent-3.3.1.tar.bz2
+ktorrent-3.3.2.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/ktorrent.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- ktorrent.spec	23 Nov 2009 20:49:25 -0000	1.105
+++ ktorrent.spec	21 Dec 2009 14:55:38 -0000	1.106
@@ -2,7 +2,7 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.3.1
+Version:        3.3.2
 Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.2-1
+- ktorrent-3.3.2
+
 * Mon Nov 23 2009 Roland Wolters <wolters.liste at gmx.net> - 3.3.1-1
 - ktorrent-3.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	23 Nov 2009 20:49:25 -0000	1.36
+++ sources	21 Dec 2009 14:55:38 -0000	1.37
@@ -1 +1 @@
-6a76e0b3a7ed14966c8096f63fde6e29  ktorrent-3.3.1.tar.bz2
+b8387bcafe176ead086da785b5bf1eca  ktorrent-3.3.2.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 21 15:07:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 15:07:11 +0000 (UTC)
Subject: rpms/kipi-plugins/F-12 .cvsignore, 1.33, 1.34 kipi-plugins.spec, 1.103,
	1.104 sources, 1.33, 1.34
Message-ID: <20091221150711.5F11A11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10123

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-1
- kipi-plugins-0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	2 Nov 2009 15:31:14 -0000	1.33
+++ .cvsignore	21 Dec 2009 15:07:11 -0000	1.34
@@ -1 +1 @@
-kipi-plugins-0.8.0.tar.bz2
+kipi-plugins-0.9.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/kipi-plugins.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- kipi-plugins.spec	2 Nov 2009 16:25:43 -0000	1.103
+++ kipi-plugins.spec	21 Dec 2009 15:07:11 -0000	1.104
@@ -2,7 +2,7 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.8.0
+Version: 0.9.0
 Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
@@ -18,10 +18,9 @@ BuildRequires: expat-devel
 BuildRequires: gettext
 # Until when/if libksane grows a dep on sane-backends-devel
 BuildRequires: kdegraphics4-devel sane-backends-devel 
-BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: kdelibs4-devel
 # Add min kdelibs Req, FIXME/TODO, come up with cleaner solution -- Rex
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
-Requires: kdelibs4 >= %{kdelibs4_version}
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 BuildRequires: kdepimlibs-devel
 BuildRequires: libgpod-devel >= 0.7.0 
 BuildRequires: libkipi-devel >= 0.3.0
@@ -75,6 +74,7 @@ PrintWizard        : print images in var
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}
 %description libs
 %{summary}.
 
@@ -166,18 +166,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/kipiplugin_shwup.so
 %{_kde4_libdir}/kde4/kipiplugin_smug.so
 %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
-%{_kde4_appsdir}/kipiplugin_facebook/
 %{_kde4_appsdir}/kipiplugin_flashexport/
-%{_kde4_appsdir}/kipiplugin_flickrexport/
 %{_kde4_appsdir}/kipiplugin_galleryexport/
 %{_kde4_appsdir}/kipiplugin_htmlexport/
 %{_kde4_appsdir}/kipiplugin_imageviewer/
 %{_kde4_appsdir}/kipiplugin_metadataedit/
-%{_kde4_appsdir}/kipiplugin_picasawebexport/
 %{_kde4_appsdir}/kipiplugin_printimages/
 %{_kde4_appsdir}/kipiplugin_removeredeyes/
-%{_kde4_appsdir}/kipiplugin_shwup/
-%{_kde4_appsdir}/kipiplugin_smug/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/applications/kde4/kipiplugins.desktop
 %{_kde4_datadir}/applications/kde4/scangui.desktop
@@ -191,6 +186,18 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-1
+- kipi-plugins-0.9.0
+
+* Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-4
+- rebuild (opencv)
+
+* Wed Nov 25 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-3 
+- rebuild (kdegraphics)
+
+* Thu Nov 12 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-2
+- -libs: move kdelibs4 dep here, make arch'd
+
 * Mon Nov 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-1
 - kipi-plugins-0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	2 Nov 2009 15:31:14 -0000	1.33
+++ sources	21 Dec 2009 15:07:11 -0000	1.34
@@ -1 +1 @@
-2049c37dd1bff8f818e379d3c7676389  kipi-plugins-0.8.0.tar.bz2
+18871b4515720d5ee2581ae52e07858a  kipi-plugins-0.9.0.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 21 15:08:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 15:08:02 +0000 (UTC)
Subject: rpms/digikam/F-12 .cvsignore, 1.39, 1.40 digikam.spec, 1.105,
	1.106 sources, 1.40, 1.41
Message-ID: <20091221150802.3324411C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10322

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
- digikam-1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	30 Nov 2009 19:07:26 -0000	1.39
+++ .cvsignore	21 Dec 2009 15:08:02 -0000	1.40
@@ -1 +1 @@
-digikam-1.0.0-rc.tar.bz2
+digikam-1.0.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/digikam.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- digikam.spec	30 Nov 2009 19:07:26 -0000	1.105
+++ digikam.spec	21 Dec 2009 15:08:02 -0000	1.106
@@ -1,9 +1,7 @@
 
-%define pre rc 
-
 Name:	 digikam
 Version: 1.0.0
-Release: 0.11.%{pre}%{?dist}
+Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -164,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- digikam-1.0.0
+
 * Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.11.rc
 - digikam-1.0.0-rc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	30 Nov 2009 19:07:26 -0000	1.40
+++ sources	21 Dec 2009 15:08:02 -0000	1.41
@@ -1 +1 @@
-270c268c6fb6880520b290d5ed5ca020  digikam-1.0.0-rc.tar.bz2
+6169deb68a3d712a0c6539b09c5f8c0c  digikam-1.0.0.tar.bz2



From jcollie at fedoraproject.org  Mon Dec 21 15:09:53 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon, 21 Dec 2009 15:09:53 +0000 (UTC)
Subject: rpms/asterisk/F-12 .cvsignore, 1.27, 1.28 asterisk.spec, 1.63,
	1.64 sources, 1.27, 1.28
Message-ID: <20091221150953.13AD111C00E7@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10873

Modified Files:
	.cvsignore asterisk.spec sources 
Log Message:
* Mon Dec 21 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.12-1
- Update to 1.6.1.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	30 Nov 2009 22:22:05 -0000	1.27
+++ .cvsignore	21 Dec 2009 15:09:52 -0000	1.28
@@ -1,2 +1,2 @@
-asterisk-1.6.1.11.tar.gz
-asterisk-1.6.1.11.tar.gz.asc
+asterisk-1.6.1.12.tar.gz
+asterisk-1.6.1.12.tar.gz.asc


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/asterisk.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- asterisk.spec	30 Nov 2009 22:22:05 -0000	1.63
+++ asterisk.spec	21 Dec 2009 15:09:52 -0000	1.64
@@ -1,7 +1,7 @@
 #define _rc 2
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1.11
+Version: 1.6.1.12
 Release: 1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -991,6 +991,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Mon Dec 21 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.12-1
+- Update to 1.6.1.12
+
 * Mon Nov 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.11-1
 - Update to 1.6.1.11 to fix AST-2009-010/CVE-2009-4055
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	30 Nov 2009 22:22:05 -0000	1.27
+++ sources	21 Dec 2009 15:09:52 -0000	1.28
@@ -1,2 +1,2 @@
-457c594a7e4b237bc6207dc6cdf226fa  asterisk-1.6.1.11.tar.gz
-b3b0a12e35af884a0187c832e3f746b9  asterisk-1.6.1.11.tar.gz.asc
+d6bc1448b8fa274a2acaef1b15f4d485  asterisk-1.6.1.12.tar.gz
+979da3e2e0a11824298c2af332b9c9e7  asterisk-1.6.1.12.tar.gz.asc



From pkgdb at fedoraproject.org  Mon Dec 21 15:20:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 15:20:11 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20091221152000.E64E210F85E@bastion.fedoraproject.org>

Package biniax in Fedora 12 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From rdieter at fedoraproject.org  Mon Dec 21 15:21:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 15:21:38 +0000 (UTC)
Subject: File ktorrent-4.0beta1.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091221152138.6D20510F862@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ktorrent:

802b611d99c3fa856c7403d9cf6e3929  ktorrent-4.0beta1.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 21 15:21:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 15:21:53 +0000 (UTC)
Subject: rpms/ktorrent/devel .cvsignore, 1.37, 1.38 ktorrent.spec, 1.111,
	1.112 sources, 1.37, 1.38
Message-ID: <20091221152153.D087611C000D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12895

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.1.beta1
- ktorrent-4.0beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	17 Dec 2009 21:27:03 -0000	1.37
+++ .cvsignore	21 Dec 2009 15:21:53 -0000	1.38
@@ -1 +1 @@
-ktorrent-3.3.2.tar.bz2
+ktorrent-4.0beta1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- ktorrent.spec	17 Dec 2009 21:27:03 -0000	1.111
+++ ktorrent.spec	21 Dec 2009 15:21:53 -0000	1.112
@@ -1,9 +1,11 @@
 
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
+%define pre beta1
+
 Name:           ktorrent
-Version:        3.3.2
-Release:        1%{?dist}
+Version:        4.0
+Release:        0.1.%{pre}%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -114,8 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
+%{_kde4_bindir}/ktmagnetdownloader
 %{_kde4_bindir}/ktorrent
 %{_kde4_bindir}/ktupnptest
+%{_kde4_bindir}/ktutpd
 %{_kde4_libdir}/kde4/ktbwschedulerplugin.so
 %{_kde4_libdir}/kde4/ktinfowidgetplugin.so
 %{_kde4_libdir}/kde4/ktipfilterplugin.so
@@ -136,12 +140,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
 %{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
+%{_kde4_datadir}/kde4/services/magnet.protocol
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libbtcore.so.12*
+%{_kde4_libdir}/libbtcore.so.13*
 %{_kde4_libdir}/libktcore.so.10*
 %{_kde4_libdir}/libktupnp.so.4*
 
@@ -160,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.1.beta1
+- ktorrent-4.0beta1
+
 * Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.2-1
 - ktorrent-3.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	17 Dec 2009 21:27:03 -0000	1.37
+++ sources	21 Dec 2009 15:21:53 -0000	1.38
@@ -1 +1 @@
-b8387bcafe176ead086da785b5bf1eca  ktorrent-3.3.2.tar.bz2
+802b611d99c3fa856c7403d9cf6e3929  ktorrent-4.0beta1.tar.bz2



From pkgdb at fedoraproject.org  Mon Dec 21 15:28:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 15:28:39 +0000
Subject: [pkgdb] tokyotyrant: deji has requested commit
Message-ID: <20091221152829.C25A710F862@bastion.fedoraproject.org>

deji has requested the commit acl on tokyotyrant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tokyotyrant



From pkgdb at fedoraproject.org  Mon Dec 21 15:38:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 15:38:16 +0000
Subject: [pkgdb] bastet ownership updated
Message-ID: <20091221153806.1526310F862@bastion.fedoraproject.org>

Package bastet in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bastet



From pkgdb at fedoraproject.org  Mon Dec 21 15:39:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 15:39:34 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20091221153923.D230310F862@bastion.fedoraproject.org>

Package biniax in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From pkgdb at fedoraproject.org  Mon Dec 21 15:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 15:39:42 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20091221153932.02B3810F862@bastion.fedoraproject.org>

Package biniax in Fedora 11 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From atkac at fedoraproject.org  Mon Dec 21 15:47:17 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 21 Dec 2009 15:47:17 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xorg-x11-server.spec,1.512,1.513
Message-ID: <20091221154717.7896411C000D@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16313

Modified Files:
	xorg-x11-server.spec 
Log Message:
- ship shave.in and shave-libtool.in in the -source subpackage



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -p -r1.512 -r1.513
--- xorg-x11-server.spec	21 Dec 2009 01:55:35 -0000	1.512
+++ xorg-x11-server.spec	21 Dec 2009 15:47:17 -0000	1.513
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.3
-Release:   4%{dist}
+Release:   5%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -368,6 +368,7 @@ install -m 644 %{SOURCE10} $RPM_BUILD_RO
 %define inst_srcdir %{buildroot}/%{xserver_source_dir}
 mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
 cp cpprules.in %{inst_srcdir}
+cp shave*in %{inst_srcdir}
 cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
 cp xkb/README.compiled %{inst_srcdir}/xkb
 cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
@@ -510,6 +511,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Dec 21 2009 Adam Tkac <atkac redhat com> 1.7.3-5
+- ship shave.in and shave-libtool.in in the -source subpackage
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 1.7.3-4
 - Backport FB changes from master.
 



From pkgdb at fedoraproject.org  Mon Dec 21 15:48:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 15:48:26 +0000
Subject: [pkgdb] bastet ownership updated
Message-ID: <20091221154815.71A7510F83D@bastion.fedoraproject.org>

Package bastet in Fedora 12 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bastet



From atkac at fedoraproject.org  Mon Dec 21 15:51:25 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 21 Dec 2009 15:51:25 +0000 (UTC)
Subject: File tigervnc-1.0.90-20091221svn3929.tar.bz2 uploaded to lookaside
	cache by atkac
Message-ID: <20091221155125.5867510F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for tigervnc:

012731b0df6b00345401bc33e8f8dfe3  tigervnc-1.0.90-20091221svn3929.tar.bz2



From atkac at fedoraproject.org  Mon Dec 21 15:54:01 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 21 Dec 2009 15:54:01 +0000 (UTC)
Subject: File shave-1.tar.bz2 uploaded to lookaside cache by atkac
Message-ID: <20091221155401.061C510F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for tigervnc:

4b7761c018efd6dc0e14c82c5bdd36fa  shave-1.tar.bz2



From atkac at fedoraproject.org  Mon Dec 21 15:55:21 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 21 Dec 2009 15:55:21 +0000 (UTC)
Subject: rpms/tigervnc/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 tigervnc-cookie.patch, 1.1, 1.2 tigervnc.spec, 1.23,
	1.24 tigervnc10-compat.patch, 1.1,
	NONE tigervnc10-rh510185.patch, 1.1,
	NONE tigervnc10-rh516274.patch, 1.1,
	NONE tigervnc10-rh524340.patch, 1.1, NONE
Message-ID: <20091221155521.6651011C000D@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17587

Modified Files:
	.cvsignore sources tigervnc-cookie.patch tigervnc.spec 
Removed Files:
	tigervnc10-compat.patch tigervnc10-rh510185.patch 
	tigervnc10-rh516274.patch tigervnc10-rh524340.patch 
Log Message:
- update to 1.0.90 snapshot
- patches merged
  - tigervnc10-compat.patch
  - tigervnc10-rh510185.patch
  - tigervnc10-rh524340.patch
  - tigervnc10-rh516274.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	8 Oct 2009 13:38:33 -0000	1.9
+++ .cvsignore	21 Dec 2009 15:55:20 -0000	1.10
@@ -1,2 +1,2 @@
-tigervnc-1.0.0.tar.gz
-xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm
+tigervnc-1.0.90-20091221svn3929.tar.bz2
+shave-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 Oct 2009 13:38:33 -0000	1.9
+++ sources	21 Dec 2009 15:55:21 -0000	1.10
@@ -1,2 +1,2 @@
-622c6689a66651419b5431efdee99d5a  tigervnc-1.0.0.tar.gz
-bc5cb09b51297251c9f2e25e5719a735  xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm
+012731b0df6b00345401bc33e8f8dfe3  tigervnc-1.0.90-20091221svn3929.tar.bz2
+4b7761c018efd6dc0e14c82c5bdd36fa  shave-1.tar.bz2

tigervnc-cookie.patch:
 vncserver |   27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

Index: tigervnc-cookie.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc-cookie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tigervnc-cookie.patch	3 Mar 2009 21:02:04 -0000	1.1
+++ tigervnc-cookie.patch	21 Dec 2009 15:55:21 -0000	1.2
@@ -1,19 +1,29 @@
---- vnc-4_1-unixsrc/unix/vncserver.cookie	2005-02-23 12:28:18.000000000 +0000
-+++ vnc-4_1-unixsrc/unix/vncserver	2005-03-03 22:04:28.000000000 +0000
-@@ -116,18 +116,12 @@
+diff -up tigervnc-1.0.90-20091221svn3929/unix/vncserver.cookie tigervnc-1.0.90-20091221svn3929/unix/vncserver
+--- tigervnc-1.0.90-20091221svn3929/unix/vncserver.cookie	2009-11-12 11:39:54.000000000 +0100
++++ tigervnc-1.0.90-20091221svn3929/unix/vncserver	2009-12-21 16:15:01.907799091 +0100
+@@ -189,27 +189,12 @@ $vncPort = 5900 + $displayNumber;
  $desktopLog = "$vncUserDir/$host:$displayNumber.log";
  unlink($desktopLog);
  
--# Make an X server cookie - use as the seed the sum of the current time, our
--# PID and part of the encrypted form of the password.  Ideally we'd use
--# /dev/urandom, but that's only available on Linux.
+-# Make an X server cookie - use /dev/urandom on systems that have it,
+-# otherwise use perl's random number generator, seeded with the sum
+-# of the current time, our PID and part of the encrypted form of the password.
 -
--srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
--$cookie = "";
--for (1..16) {
+-my $cookie = "";
+-if (open(URANDOM, '<', '/dev/urandom')) {
+-  my $randata;
+-  if (sysread(URANDOM, $randata, 16) == 16) {
+-    $cookie = unpack 'h*', $randata;
+-  }
+-  close(URANDOM);
+-}
+-if ($cookie eq "") {
+-  srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
+-  for (1..16) {
 -    $cookie .= sprintf("%02x", int(rand(256)) % 256);
+-  }
 -}
--    
+-
 -system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
 -system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie"); 
 +# Make an X server cookie - use mcookie


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- tigervnc.spec	26 Oct 2009 14:48:15 -0000	1.23
+++ tigervnc.spec	21 Dec 2009 15:55:21 -0000	1.24
@@ -1,17 +1,19 @@
+%define snap 20091221svn3929
+
 Name:		tigervnc
-Version:	1.0.0
-Release:	3%{?dist}
+Version:	1.0.90
+Release:	0.1.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.tigervnc.com
 
-Source0:	%{name}-%{version}.tar.gz
+Source0:	%{name}-%{version}-%{snap}.tar.bz2
 Source1:	vncserver.init
 Source2:	vncserver.sysconfig
+Source3:	shave-1.tar.bz2
 Source6:	vncviewer.desktop
-Source7:	xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libX11-devel, automake, autoconf, libtool, gettext, cvs
@@ -39,10 +41,6 @@ Obsoletes:	tightvnc < 1.5.0-0.15.2009020
 Patch0:		tigervnc-102434.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
-Patch10:	tigervnc10-compat.patch
-Patch11:	tigervnc10-rh510185.patch
-Patch12:	tigervnc10-rh524340.patch
-Patch13:	tigervnc10-rh516274.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -88,43 +86,34 @@ to access the desktop on your machine.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
-
-rpm2cpio %{SOURCE7} > cpio
-cpio -id < cpio
+%setup -q -n %{name}-%{version}-%{snap}
 
-cp -r usr/share/xorg-x11-server-source/* unix/xserver
+cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
-patch -p1 -b --suffix .vnc < ../xserver16.patch
+patch -p1 -b --suffix .vnc < ../xserver17.patch
+tar -xjf %{SOURCE3}
 popd
 
 
 %patch0 -p1 -b .102434
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
-%patch10 -p1 -b .compat
-%patch11 -p0 -b .rh510185
-%patch12 -p0 -b .rh524340
-%patch13 -p1 -b .rh516274
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
-	unix/configure.ac
+	configure.ac
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$CFLAGS"
 
-pushd unix
 autoreconf -fiv
-%configure \
-	--disable-static
+%configure --disable-static
 
 make %{?_smp_mflags}
-popd
 
 pushd unix/xserver
 autoreconf -fiv
@@ -153,9 +142,7 @@ popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd unix
 make install DESTDIR=$RPM_BUILD_ROOT
-popd
 
 pushd unix/xserver/hw/vnc
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -250,6 +237,14 @@ fi
 %endif
 
 %changelog
+* Mon Dec 21 2009 Adam Tkac <atkac redhat com> 1.0.90-0.1.20091221svn3929
+- update to 1.0.90 snapshot
+- patches merged
+  - tigervnc10-compat.patch
+  - tigervnc10-rh510185.patch
+  - tigervnc10-rh524340.patch
+  - tigervnc10-rh516274.patch
+
 * Mon Oct 26 2009 Adam Tkac <atkac redhat com> 1.0.0-3
 - create Xvnc keyboard mapping before first keypress (#516274)
 


--- tigervnc10-compat.patch DELETED ---


--- tigervnc10-rh510185.patch DELETED ---


--- tigervnc10-rh516274.patch DELETED ---


--- tigervnc10-rh524340.patch DELETED ---



From akurtakov at fedoraproject.org  Mon Dec 21 15:56:25 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Dec 2009 15:56:25 +0000 (UTC)
Subject: rpms/maven-doxia-sitetools/devel maven-doxia-sitetools.spec,1.2,1.3
Message-ID: <20091221155625.9154311C000D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-doxia-sitetools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18154/devel

Modified Files:
	maven-doxia-sitetools.spec 
Log Message:
BR maven-surefire-provider-junit.


Index: maven-doxia-sitetools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia-sitetools/devel/maven-doxia-sitetools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- maven-doxia-sitetools.spec	1 Sep 2009 17:42:35 -0000	1.2
+++ maven-doxia-sitetools.spec	21 Dec 2009 15:56:25 -0000	1.3
@@ -34,7 +34,7 @@
 
 Name:           %{parent}-%{subproj}
 Version:        1.0
-Release:        0.2.a10.1%{?dist}
+Release:        0.2.a10.2%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
 Group:          Development/Tools
@@ -60,6 +60,7 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-site
 BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia >= 1.0-0.3.a10 
 BuildRequires:  plexus-maven-plugin >= 0:1.2-2
 BuildRequires:  modello-maven-plugin >= 0:1.0-0.a8.3
@@ -195,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.2.a10.2
+- BR maven-surefire-provider-junit.
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.2.a10.1
 - Add itext, tomcat5, and tomcat5-servlet-2.4-api BRs
 



From jsafrane at fedoraproject.org  Mon Dec 21 15:56:44 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon, 21 Dec 2009 15:56:44 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp-5.5-missing-bcast.patch, NONE,
	1.1 net-snmp.spec, 1.199, 1.200
Message-ID: <20091221155644.DCCAF11C000D@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18203

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.5-missing-bcast.patch 
Log Message:
fix crash with interfaces without broadcast addresses (like OpenVPN's tun0)
Resolves: #544849

net-snmp-5.5-missing-bcast.patch:
 ipaddress_ioctl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE net-snmp-5.5-missing-bcast.patch ---
544849 -  snmpd segfaults when openvpn is running

Source: upstream, svn rev. 17931

Clear the bcastentry in every loop iteration. If not cleared, the bcastentry
might be insterted into the container twice, when processing an interface
without broadcast address (like OpenVPN's tun0).

diff -up net-snmp-5.5/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.new net-snmp-5.5/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
--- net-snmp-5.5/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.new	2009-05-06 23:59:20.000000000 +0200
+++ net-snmp-5.5/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c	2009-12-21 15:58:02.000000000 +0100
@@ -135,7 +135,6 @@ _netsnmp_ioctl_ipaddress_container_load_
     struct ifreq   *ifrp;
     struct sockaddr save_addr;
     struct sockaddr_in * si;
-    netsnmp_ipaddress_entry *entry, *bcastentry = NULL;
     struct address_flag_info addr_info;
     in_addr_t       ipval;
     _ioctl_extras           *extras;
@@ -156,6 +155,7 @@ _netsnmp_ioctl_ipaddress_container_load_
 
     ifrp = ifc.ifc_req;
     for(i=0; i < interfaces; ++i, ++ifrp) {
+        netsnmp_ipaddress_entry *entry, *bcastentry = NULL;
 
         DEBUGMSGTL(("access:ipaddress:container",
                     " interface %d, %s\n", i, ifrp->ifr_name));


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- net-snmp.spec	8 Dec 2009 09:36:22 -0000	1.199
+++ net-snmp.spec	21 Dec 2009 15:56:44 -0000	1.200
@@ -11,7 +11,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: 5.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -31,6 +31,7 @@ Patch2: net-snmp-5.5-dir-fix.patch
 Patch3: net-snmp-5.5-multilib.patch
 Patch4: net-snmp-5.5-sensors3.patch
 Patch5: net-snmp-5.5-udptable-index.patch
+Patch6: net-snmp-5.5-missing-bcast.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -161,6 +162,7 @@ Net-SNMP toolkit library.
 %patch3 -p1 -b .multilib
 %patch4 -p1 -b .sensors
 %patch5 -p1 -b .udptable-index
+%patch6 -p1 -b .missing-bcast
 
 %build
 MIBS="host agentx smux \
@@ -402,6 +404,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs/*
 
 %changelog
+* Mon Dec 21 2009 Jan Safranek <jsafrane at redhat.com> - 1:5.5-7
+- fix crash with interfaces without broadcast addresses (like OpenVPN's tun0)
+  (#544849)
+
 * Tue Dec  8 2009 Jan Safranek <jsafrane at redhat.com> - 1:5.5-6
 - fix compilation of the python module
 



From pkgdb at fedoraproject.org  Mon Dec 21 15:57:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 15:57:52 +0000
Subject: [pkgdb] bastet ownership updated
Message-ID: <20091221155745.69FEB10F841@bastion.fedoraproject.org>

Package bastet in Fedora 11 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bastet



From pkgdb at fedoraproject.org  Mon Dec 21 16:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 16:04:02 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091221160352.5E32B10F8B2@bastion.fedoraproject.org>

Package peppy in Fedora devel is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From mclasen at fedoraproject.org  Mon Dec 21 16:04:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 21 Dec 2009 16:04:59 +0000 (UTC)
Subject: File glib-2.23.1.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091221160459.3F04710F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for glib2:

fb637f6122690254097d0b6d470f6ed3  glib-2.23.1.tar.bz2



From mclasen at fedoraproject.org  Mon Dec 21 16:05:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 21 Dec 2009 16:05:50 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.117, 1.118 glib2.spec, 1.227,
	1.228 sources, 1.119, 1.120
Message-ID: <20091221160550.D6C7711C000D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19566

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.23.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- .cvsignore	1 Dec 2009 00:21:41 -0000	1.117
+++ .cvsignore	21 Dec 2009 16:05:50 -0000	1.118
@@ -1 +1 @@
-glib-2.23.0.tar.bz2
+glib-2.23.1.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- glib2.spec	1 Dec 2009 00:48:45 -0000	1.227
+++ glib2.spec	21 Dec 2009 16:05:50 -0000	1.228
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.23.0
+Version: 2.23.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Dec 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.23.1-1
+- Update to 2.23.1
+
 * Mon Nov 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.23.0-1
 - Update to 2.23.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- sources	1 Dec 2009 00:21:41 -0000	1.119
+++ sources	21 Dec 2009 16:05:50 -0000	1.120
@@ -1 +1 @@
-75909517629c54e5c5b36d8e233915a9  glib-2.23.0.tar.bz2
+fb637f6122690254097d0b6d470f6ed3  glib-2.23.1.tar.bz2



From jnovy at fedoraproject.org  Mon Dec 21 16:18:26 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 21 Dec 2009 16:18:26 +0000 (UTC)
Subject: File mc-4.7.0-pre4-20091221git.tar.bz2 uploaded to lookaside cache by
	jnovy
Message-ID: <20091221161826.EEAE610F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mc:

c03992e430a41d3e73faa6360979cadf  mc-4.7.0-pre4-20091221git.tar.bz2



From atkac at fedoraproject.org  Mon Dec 21 16:19:46 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 21 Dec 2009 16:19:46 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc.spec,1.24,1.25
Message-ID: <20091221161946.6E7D611C000D@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21614

Modified Files:
	tigervnc.spec 
Log Message:
x86_64 build requires nasm as well.



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- tigervnc.spec	21 Dec 2009 15:55:21 -0000	1.24
+++ tigervnc.spec	21 Dec 2009 16:19:46 -0000	1.25
@@ -25,7 +25,7 @@ BuildRequires:	mesa-libGL-devel, libXine
 BuildRequires:  freetype-devel
 BuildRequires:	desktop-file-utils
 
-%ifarch %ix86
+%ifarch %ix86 x86_64
 BuildRequires: nasm
 %endif
 



From akurtakov at fedoraproject.org  Mon Dec 21 16:26:45 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Dec 2009 16:26:45 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.20,1.21
Message-ID: <20091221162645.C0E3B11C000D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22651/devel

Modified Files:
	maven-doxia.spec 
Log Message:
- BR maven-surefire-provider-junit.


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- maven-doxia.spec	1 Sep 2009 14:25:05 -0000	1.20
+++ maven-doxia.spec	21 Dec 2009 16:26:45 -0000	1.21
@@ -34,7 +34,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.8.a10.1%{?dist}
+Release:        0.8.a10.2%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -76,7 +76,8 @@ BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-site
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  plexus-maven-plugin >= 0:1.2-2
 BuildRequires:  modello-maven-plugin >= 0:1.0-0.a8.3
 BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
@@ -247,6 +248,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.8.a10.2
+- BR maven-surefire-provider-junit.
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.8.a10.1
 - Add tomcat5 BR
 
@@ -317,4 +321,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Mar 15 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a7.1jpp
 - Initial build
-



From akurtakov at fedoraproject.org  Mon Dec 21 16:29:47 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Dec 2009 16:29:47 +0000 (UTC)
Subject: rpms/maven-archiver/devel maven-archiver.spec,1.1,1.2
Message-ID: <20091221162947.8FE2511C000D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23097/devel

Modified Files:
	maven-archiver.spec 
Log Message:
BR maven-surefire-provider-junit.


Index: maven-archiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-archiver/devel/maven-archiver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-archiver.spec	1 Sep 2009 07:47:00 -0000	1.1
+++ maven-archiver.spec	21 Dec 2009 16:29:47 -0000	1.2
@@ -32,7 +32,7 @@
 
 Name:           maven-archiver
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Maven Archiver
 License:        ASL 2.0
@@ -58,7 +58,8 @@ BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-site
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  plexus-archiver >= 1.0-0.1.a7
 
 Requires:       maven2 >= 0:2.0.4-9
@@ -127,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.2-3
+- BR maven-surefire-provider-junit.
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.2-2
 - Fix line length.
 - Own only specific fragment and pom.



From jnovy at fedoraproject.org  Mon Dec 21 16:31:15 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 21 Dec 2009 16:31:15 +0000 (UTC)
Subject: rpms/mc/devel .cvsignore, 1.42, 1.43 mc.spec, 1.153, 1.154 sources,
	1.50, 1.51 mc-exit.patch, 1.2, NONE mc-rpmvfs.patch, 1.1,
	NONE mc-vfsfail.patch, 1.1, NONE
Message-ID: <20091221163115.4757911C000D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23330

Modified Files:
	.cvsignore mc.spec sources 
Removed Files:
	mc-exit.patch mc-rpmvfs.patch mc-vfsfail.patch 
Log Message:
* Mon Dec 21 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.9.pre4.20091221git
- provide yum-repo.syntax (#549014)
- avoid occasional crash while reading panels (#548987)
- remove duplicates from filelist
- enable mcvfs, disable rpath



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	2 Nov 2009 09:59:39 -0000	1.42
+++ .cvsignore	21 Dec 2009 16:31:14 -0000	1.43
@@ -1 +1 @@
-mc-4.7.0-pre4.tar.bz2
+mc-4.7.0-pre4-20091221git.tar.bz2


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- mc.spec	15 Dec 2009 14:57:01 -0000	1.153
+++ mc.spec	21 Dec 2009 16:31:15 -0000	1.154
@@ -1,19 +1,19 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.8.pre4%{?dist}
+Release:	0.9.pre4.20091221git%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
 # tarball created from git clone git://midnight-commander.org/git/mc.git
-Source0:	mc-%{version}-pre4.tar.bz2
+Source0:	mc-%{version}-pre4-20091221git.tar.bz2
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	gettext cvs automake autoconf libtool
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel
 Requires:	dev >= 3.3-3
 
 Patch0:		mc-extensions.patch
-Patch1:		mc-rpmvfs.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -23,20 +23,22 @@ ability to FTP, view tar and zip files, 
 specific files.
 
 %prep
-%setup -q -n mc-%{version}-pre4
+%setup -q
 %patch0 -p1 -b .extensions
-%patch1 -p1 -b .rpmvfs
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
-%configure --with-screen=slang \
-	     --enable-charset \
-	     --with-samba \
-	     --without-x \
-	     --with-gpm-mouse
+./autogen.sh
+%configure	--with-screen=slang \
+		--enable-charset \
+		--with-samba \
+		--without-x \
+		--with-gpm-mouse \
+		--disable-rpath \
+		--enable-vfs-mcfs
 make %{?_smp_mflags}
 
-%install 
+%install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR="$RPM_BUILD_ROOT"
@@ -70,17 +72,24 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/mc/Syntax
 %config %{_sysconfdir}/mc/mc.charsets
 %config %{_sysconfdir}/mc/mc.lib
+%config(noreplace) %{_sysconfdir}/mc/mc.ext
 %config(noreplace) %{_sysconfdir}/mc/*edit*
-%config(noreplace) %{_sysconfdir}/mc/mc.*
+%config(noreplace) %{_sysconfdir}/mc/mc.keymap*
+%config(noreplace) %{_sysconfdir}/mc/mc.menu*
 %config(noreplace) %{_sysconfdir}/mc/*.ini
-%config(noreplace) %{_sysconfdir}/mc/extfs/extfs.ini
-%config(noreplace) %{_sysconfdir}/mc/extfs/sfs.ini
+%config(noreplace) %{_sysconfdir}/mc/extfs/*.ini
 %dir %{_datadir}/mc
 %dir %{_sysconfdir}/mc
 %dir %{_sysconfdir}/mc/extfs
 %dir %{_libexecdir}/mc
 
 %changelog
+* Mon Dec 21 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.9.pre4.20091221git
+- provide yum-repo.syntax (#549014)
+- avoid occasional crash while reading panels (#548987)
+- remove duplicates from filelist
+- enable mcvfs, disable rpath
+
 * Tue Dec 15 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.8.pre4
 - fix rpmvfs empty directory handling (#529645)
 - fix bindings (#532784)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	2 Nov 2009 09:59:40 -0000	1.50
+++ sources	21 Dec 2009 16:31:15 -0000	1.51
@@ -1 +1 @@
-7bdc0ac4fe57c19a6bf2fd3e8894a073  mc-4.7.0-pre4.tar.bz2
+c03992e430a41d3e73faa6360979cadf  mc-4.7.0-pre4-20091221git.tar.bz2


--- mc-exit.patch DELETED ---


--- mc-rpmvfs.patch DELETED ---


--- mc-vfsfail.patch DELETED ---



From akurtakov at fedoraproject.org  Mon Dec 21 16:40:09 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Dec 2009 16:40:09 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.21,1.22
Message-ID: <20091221164009.7C55E11C039C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24308/devel

Modified Files:
	maven-doxia.spec 
Log Message:
BR maven2-plugin-assembly.


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- maven-doxia.spec	21 Dec 2009 16:26:45 -0000	1.21
+++ maven-doxia.spec	21 Dec 2009 16:40:09 -0000	1.22
@@ -34,7 +34,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.8.a10.2%{?dist}
+Release:        0.8.a10.3%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -70,6 +70,7 @@ BuildRequires:  itext >= 2.1.7-4
 BuildRequires:  plexus-cli >= 1.2-8
 %if %{with_maven}
 BuildRequires:  maven2 >= 0:2.0.4-9
+BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
@@ -248,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.8.a10.3
+- BR maven2-plugin-assembly.
+
 * Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.8.a10.2
 - BR maven-surefire-provider-junit.
 



From dyoung at fedoraproject.org  Mon Dec 21 16:41:40 2009
From: dyoung at fedoraproject.org (Daniel M. Young)
Date: Mon, 21 Dec 2009 16:41:40 +0000 (UTC)
Subject: File Djblets-0.5.6.tar.gz uploaded to lookaside cache by dyoung
Message-ID: <20091221164140.1BCA310F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-djblets:

1ba05845898ed5ac252ba5dfbb58c2df  Djblets-0.5.6.tar.gz



From rdieter at fedoraproject.org  Mon Dec 21 16:41:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 16:41:50 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.256,1.257
Message-ID: <20091221164150.7334111C000D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24836

Modified Files:
	kdepim.spec 
Log Message:
* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
- Requires: kdepim-runtime (unconditionally)



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- kdepim.spec	21 Dec 2009 14:19:07 -0000	1.256
+++ kdepim.spec	21 Dec 2009 16:41:50 -0000	1.257
@@ -3,7 +3,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.85
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -31,10 +31,8 @@ Provides: kdepim4 = %{version}-%{release
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-# Upgrade path
-%if 0%{?fedora} && 0%{?fedora} < 12
+# beware bootstrapping (ie, build kdepim-runtime first)
 Requires: kdepim-runtime%{?_isa} >= %{version}
-%endif
 
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
@@ -216,6 +214,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
+- Requires: kdepim-runtime (unconditionally)
+
 * Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
 - Obsoletes/Provides: bilbo
 - %%description: +blogilo



From rdieter at fedoraproject.org  Mon Dec 21 16:44:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 16:44:10 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.257,1.258
Message-ID: <20091221164410.43EEC11C000D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25217

Modified Files:
	kdepim.spec 
Log Message:
bz reference



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- kdepim.spec	21 Dec 2009 16:41:50 -0000	1.257
+++ kdepim.spec	21 Dec 2009 16:44:10 -0000	1.258
@@ -215,7 +215,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
-- Requires: kdepim-runtime (unconditionally)
+- unconditionally Requires: kdepim-runtime  (#549413)
 
 * Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
 - Obsoletes/Provides: bilbo



From ausil at fedoraproject.org  Mon Dec 21 16:44:34 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 21 Dec 2009 16:44:34 +0000 (UTC)
Subject: rpms/mock/EL-5
	0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch,
	1.1, 1.2 mock.spec, 1.43, 1.44
Message-ID: <20091221164434.6452D11C000D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mock/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25251

Modified Files:
	0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch 
	mock.spec 
Log Message:
/dev/ptmx needs 0666 perms


0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch:
 backend.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-5/0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch	18 Dec 2009 16:43:26 -0000	1.1
+++ 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch	21 Dec 2009 16:44:34 -0000	1.2
@@ -16,7 +16,7 @@ index ef4d90b..97cd8e9 100644
              (stat.S_IFCHR | 0444, os.makedev(1, 9), "dev/urandom"),
              (stat.S_IFCHR | 0666, os.makedev(5, 0), "dev/tty"),
              (stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console"),
-+            (stat.S_IFCHR | 0600, os.makedev(5, 2), "dev/ptmx"),
++            (stat.S_IFCHR | 0666, os.makedev(5, 2), "dev/ptmx"),
          )
          for i in devFiles:
              # create node


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- mock.spec	18 Dec 2009 16:43:26 -0000	1.43
+++ mock.spec	21 Dec 2009 16:44:34 -0000	1.44
@@ -11,7 +11,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
@@ -99,6 +99,9 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Mon Dec 21 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1.2
+- /dev/ptmx needs 0666 perms
+
 * Fri Dec 18 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1.1
 - patch to create /dev/ptmx rather than symlink it the symlink
 - is broken on EL-5



From akurtakov at fedoraproject.org  Mon Dec 21 16:49:55 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 21 Dec 2009 16:49:55 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.22,1.23
Message-ID: <20091221164955.7BAA111C00E7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26303/devel

Modified Files:
	maven-doxia.spec 
Log Message:
BR maven2-plugin-plugin.


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- maven-doxia.spec	21 Dec 2009 16:40:09 -0000	1.22
+++ maven-doxia.spec	21 Dec 2009 16:49:55 -0000	1.23
@@ -34,7 +34,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.8.a10.3%{?dist}
+Release:        0.8.a10.4%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -77,6 +77,7 @@ BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-site
+BuildRequires:  maven2-plugin-plugin
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  plexus-maven-plugin >= 0:1.2-2
@@ -249,6 +250,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.8.a10.4
+- BR maven2-plugin-plugin.
+
 * Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.8.a10.3
 - BR maven2-plugin-assembly.
 



From dyoung at fedoraproject.org  Mon Dec 21 16:52:59 2009
From: dyoung at fedoraproject.org (Daniel M. Young)
Date: Mon, 21 Dec 2009 16:52:59 +0000 (UTC)
Subject: rpms/python-djblets/devel .cvsignore, 1.2, 1.3 python-djblets.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091221165259.4B4F111C00E7@cvs1.fedora.phx.redhat.com>

Author: dyoung

Update of /cvs/pkgs/rpms/python-djblets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27189

Modified Files:
	.cvsignore python-djblets.spec sources 
Log Message:
New upstream version: 0.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-djblets/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 20:29:38 -0000	1.2
+++ .cvsignore	21 Dec 2009 16:52:58 -0000	1.3
@@ -1 +1 @@
-Djblets-0.5rc1.tar.gz
+Djblets-0.5.6.tar.gz


Index: python-djblets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-djblets/devel/python-djblets.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-djblets.spec	26 Oct 2009 20:29:38 -0000	1.1
+++ python-djblets.spec	21 Dec 2009 16:52:59 -0000	1.2
@@ -1,14 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-# This is a pre-release of 0.5, so we follow the pre-release
-# naming here: 
-#  https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages
-# to try to preserve the upgrade path
-%define alphatag rc1
-
 Name:           python-djblets
-Version:        0.5
-Release:        0.3.%{alphatag}%{?dist}
+Version:        0.5.6
+Release:        0%{?dist}
 Summary:        A collection of useful classes and functions for Django
 Group:          Applications/Internet
 # Djblets is MIT licensed:
@@ -18,7 +12,7 @@ Group:          Applications/Internet
 # https://www.redhat.com/archives/fedora-legal-list/2009-May/msg00025.html
 License:        MIT and (MIT or GPLv2)
 URL:            http://www.review-board.org
-Source0:        http://downloads.review-board.org/releases/Djblets-%{version}%{alphatag}.tar.gz
+Source0:        http://downloads.review-board.org/releases/Djblets/0.5/Djblets-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python
@@ -31,7 +25,7 @@ Requires:       python-imaging
 A collection of useful classes and functions for Django
 
 %prep
-%setup -q -n Djblets-%{version}%{alphatag}
+%setup -q -n Djblets-%{version}
 sed -i 's/^from ez_setup/#from ez_setup/' setup.py
 sed -i 's/^use_setuptools()/#use_setuptools()/' setup.py
 %build
@@ -54,10 +48,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc NEWS AUTHORS
+%doc NEWS
 %{python_sitelib}/*
 
 %changelog
+* Mon Dec 21 2009 Stephen Gallagher <sgallagh at redhat.com> 0.5.6-0
+- Update to latest upstream release
+- Remove pre-release handling in the package name and spec
+
 * Fri Oct 23 2009 Dan Young <dyoung at mesd.k12.or.us> - 0.5-0.3.rc1
 - Fix License tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-djblets/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 20:29:38 -0000	1.2
+++ sources	21 Dec 2009 16:52:59 -0000	1.3
@@ -1 +1 @@
-10b611756e1cbe03bfe35ab13b19638b  Djblets-0.5rc1.tar.gz
+1ba05845898ed5ac252ba5dfbb58c2df  Djblets-0.5.6.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 21 16:55:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 16:55:19 +0000
Subject: [pkgdb] openvas-libnasl was added for huzaifas
Message-ID: <20091221165519.CBF9C10F892@bastion.fedoraproject.org>

toshio has added Package openvas-libnasl with summary Support for NASL scripting language in OpenVAS Server
toshio has approved Package openvas-libnasl
toshio has added a Fedora devel branch for openvas-libnasl with an owner of huzaifas
toshio has approved openvas-libnasl in Fedora devel
toshio has approved Package openvas-libnasl
toshio has set commit to Approved for 107427 on openvas-libnasl (Fedora devel)
toshio has set checkout to Approved for 107427 on openvas-libnasl (Fedora devel)
toshio has set build to Approved for 107427 on openvas-libnasl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvas-libnasl



From pkgdb at fedoraproject.org  Mon Dec 21 16:59:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 16:59:53 +0000
Subject: [pkgdb] openvas-libnasl summary updated by toshio
Message-ID: <20091221165953.BC46410F894@bastion.fedoraproject.org>

toshio set package openvas-libnasl summary to Support for NASL scripting language in OpenVAS Server

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvas-libnasl



From pkgdb at fedoraproject.org  Mon Dec 21 16:59:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 16:59:53 +0000
Subject: [pkgdb] openvas-libnasl (Fedora, devel) updated by toshio
Message-ID: <20091221165953.C8A4710F8B3@bastion.fedoraproject.org>

toshio changed owner of openvas-libnasl in Fedora devel to huzaifas
toshio approved watchbugzilla on openvas-libnasl (Fedora devel) for sgros
toshio approved watchcommits on openvas-libnasl (Fedora devel) for sgros
toshio approved commit on openvas-libnasl (Fedora devel) for sgros
toshio approved build on openvas-libnasl (Fedora devel) for sgros
toshio approved approveacls on openvas-libnasl (Fedora devel) for sgros

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openvas-libnasl



From twaugh at fedoraproject.org  Mon Dec 21 17:06:51 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 21 Dec 2009 17:06:51 +0000 (UTC)
Subject: rpms/cups/F-11 cups-gnutls-gcrypt-threads.patch, NONE, 1.1 cups.spec, 
	1.558, 1.559
Message-ID: <20091221170651.993C911C00E7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29080

Modified Files:
	cups.spec 
Added Files:
	cups-gnutls-gcrypt-threads.patch 
Log Message:
* Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
- Ensure proper thread-safety in gnutls's use of libgcrypt
  (bug #544619).


cups-gnutls-gcrypt-threads.patch:
 cups/http-private.h |    2 ++
 cups/http.c         |    4 ++++
 scheduler/server.c  |    6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE cups-gnutls-gcrypt-threads.patch ---
diff -up cups-1.4.2/cups/http.c.gnutls-gcrypt-threads cups-1.4.2/cups/http.c
--- cups-1.4.2/cups/http.c.gnutls-gcrypt-threads	2009-12-21 16:50:58.931552118 +0000
+++ cups-1.4.2/cups/http.c	2009-12-21 16:51:15.047552357 +0000
@@ -1161,6 +1161,9 @@ httpHead(http_t     *http,		/* I - Conne
   return (http_send(http, HTTP_HEAD, uri));
 }
 
+#ifdef HAVE_GNUTLS
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
 /*
  * 'httpInitialize()' - Initialize the HTTP interface library and set the
@@ -1205,6 +1208,7 @@ httpInitialize(void)
 #endif /* WIN32 */
 
 #ifdef HAVE_GNUTLS
+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
   gnutls_global_init();
 #endif /* HAVE_GNUTLS */
 
diff -up cups-1.4.2/cups/http-private.h.gnutls-gcrypt-threads cups-1.4.2/cups/http-private.h
--- cups-1.4.2/cups/http-private.h.gnutls-gcrypt-threads	2009-04-07 16:48:14.000000000 +0100
+++ cups-1.4.2/cups/http-private.h	2009-12-21 16:51:15.049552624 +0000
@@ -98,6 +98,8 @@ extern BIO_METHOD *_httpBIOMethods(void)
  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
  */
 #    include <gnutls/gnutls.h>
+#    include <gcrypt.h>
+#    include <pthread.h>
 
 typedef struct
 {
diff -up cups-1.4.2/scheduler/server.c.gnutls-gcrypt-threads cups-1.4.2/scheduler/server.c
--- cups-1.4.2/scheduler/server.c.gnutls-gcrypt-threads	2008-09-10 23:05:29.000000000 +0100
+++ cups-1.4.2/scheduler/server.c	2009-12-21 16:51:15.048553044 +0000
@@ -35,7 +35,9 @@
  */
 
 static int	started = 0;
-
+#if !defined(HAVE_LIBSSL) && defined(HAVE_GNUTLS)
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
 /*
  * 'cupsdStartServer()' - Start the server.
@@ -75,7 +77,7 @@ cupsdStartServer(void)
  /*
   * Initialize the encryption libraries...
   */
-
+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
   gnutls_global_init();
 #endif /* HAVE_LIBSSL */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -p -r1.558 -r1.559
--- cups.spec	19 Dec 2009 13:03:20 -0000	1.558
+++ cups.spec	21 Dec 2009 17:06:51 -0000	1.559
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -75,6 +75,7 @@ Patch60: cups-str3425.patch
 Patch61: cups-str3428.patch
 Patch62: cups-str3431.patch
 Patch63: cups-delete-active-printer.patch
+Patch64: cups-gnutls-gcrypt-threads.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -254,6 +255,7 @@ module. 
 %patch61 -p1 -b .str3428
 %patch62 -p1 -b .str3431
 %patch63 -p1 -b .delete-active-printer
+%patch64 -p1 -b .gnutls-gcrypt-threads
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -545,6 +547,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
+- Ensure proper thread-safety in gnutls's use of libgcrypt
+  (bug #544619).
+
 * Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
 - Fixed patch for STR #3425 by adding in back-ported change from svn
   revision 8936 (bug #548904).



From twaugh at fedoraproject.org  Mon Dec 21 17:07:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 21 Dec 2009 17:07:05 +0000 (UTC)
Subject: rpms/cups/F-12 cups-gnutls-gcrypt-threads.patch, NONE, 1.1 cups.spec, 
	1.565, 1.566
Message-ID: <20091221170705.B3BD711C00E7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29172

Modified Files:
	cups.spec 
Added Files:
	cups-gnutls-gcrypt-threads.patch 
Log Message:
* Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
- Ensure proper thread-safety in gnutls's use of libgcrypt
  (bug #544619).


cups-gnutls-gcrypt-threads.patch:
 cups/http-private.h |    2 ++
 cups/http.c         |    4 ++++
 scheduler/server.c  |    6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE cups-gnutls-gcrypt-threads.patch ---
diff -up cups-1.4.2/cups/http.c.gnutls-gcrypt-threads cups-1.4.2/cups/http.c
--- cups-1.4.2/cups/http.c.gnutls-gcrypt-threads	2009-12-21 16:50:58.931552118 +0000
+++ cups-1.4.2/cups/http.c	2009-12-21 16:51:15.047552357 +0000
@@ -1161,6 +1161,9 @@ httpHead(http_t     *http,		/* I - Conne
   return (http_send(http, HTTP_HEAD, uri));
 }
 
+#ifdef HAVE_GNUTLS
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
 /*
  * 'httpInitialize()' - Initialize the HTTP interface library and set the
@@ -1205,6 +1208,7 @@ httpInitialize(void)
 #endif /* WIN32 */
 
 #ifdef HAVE_GNUTLS
+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
   gnutls_global_init();
 #endif /* HAVE_GNUTLS */
 
diff -up cups-1.4.2/cups/http-private.h.gnutls-gcrypt-threads cups-1.4.2/cups/http-private.h
--- cups-1.4.2/cups/http-private.h.gnutls-gcrypt-threads	2009-04-07 16:48:14.000000000 +0100
+++ cups-1.4.2/cups/http-private.h	2009-12-21 16:51:15.049552624 +0000
@@ -98,6 +98,8 @@ extern BIO_METHOD *_httpBIOMethods(void)
  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
  */
 #    include <gnutls/gnutls.h>
+#    include <gcrypt.h>
+#    include <pthread.h>
 
 typedef struct
 {
diff -up cups-1.4.2/scheduler/server.c.gnutls-gcrypt-threads cups-1.4.2/scheduler/server.c
--- cups-1.4.2/scheduler/server.c.gnutls-gcrypt-threads	2008-09-10 23:05:29.000000000 +0100
+++ cups-1.4.2/scheduler/server.c	2009-12-21 16:51:15.048553044 +0000
@@ -35,7 +35,9 @@
  */
 
 static int	started = 0;
-
+#if !defined(HAVE_LIBSSL) && defined(HAVE_GNUTLS)
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
 /*
  * 'cupsdStartServer()' - Start the server.
@@ -75,7 +77,7 @@ cupsdStartServer(void)
  /*
   * Initialize the encryption libraries...
   */
-
+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
   gnutls_global_init();
 #endif /* HAVE_LIBSSL */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -p -r1.565 -r1.566
--- cups.spec	19 Dec 2009 13:03:30 -0000	1.565
+++ cups.spec	21 Dec 2009 17:07:05 -0000	1.566
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -74,6 +74,7 @@ Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
 Patch49: cups-delete-active-printer.patch
+Patch50: cups-gnutls-gcrypt-threads.patch
 
 Patch100: cups-lspp.patch
 
@@ -253,6 +254,7 @@ module. 
 %patch47 -p1 -b .str3428
 %patch48 -p1 -b .str3431
 %patch49 -p1 -b .delete-active-printer
+%patch50 -p1 -b .gnutls-gcrypt-threads
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -551,6 +553,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
+- Ensure proper thread-safety in gnutls's use of libgcrypt
+  (bug #544619).
+
 * Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
 - Fixed patch for STR #3425 by adding in back-ported change from svn
   revision 8936 (bug #548904).



From devrim at fedoraproject.org  Mon Dec 21 17:09:50 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 21 Dec 2009 17:09:50 +0000 (UTC)
Subject: rpms/postgresql-pgpool/devel dead.package, NONE, 1.1 .cvsignore, 1.7, 
	NONE Makefile, 1.2, NONE pgpool.init, 1.2, NONE pgpool.sysconfig,
	1.1, NONE postgresql-pgpool.spec, 1.14, NONE sources, 1.7, NONE
Message-ID: <20091221170951.0712411C00E7@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29604

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile pgpool.init pgpool.sysconfig 
	postgresql-pgpool.spec sources 
Log Message:
Obsolete pgpool package, which is replaced by pgpool-II.



--- NEW FILE dead.package ---
This package is obsoleted by postgresql-pgpool-II.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- pgpool.init DELETED ---


--- pgpool.sysconfig DELETED ---


--- postgresql-pgpool.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Mon Dec 21 17:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 17:11:31 +0000
Subject: [pkgdb] postgresql-pgpool ownership updated
Message-ID: <20091221171131.9AB7D10F85E@bastion.fedoraproject.org>

Package postgresql-pgpool in Fedora devel was orphaned by devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postgresql-pgpool



From pkgdb at fedoraproject.org  Mon Dec 21 17:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 17:11:31 +0000
Subject: [pkgdb] postgresql-pgpool (un)retirement
Message-ID: <20091221171131.AD59A10F892@bastion.fedoraproject.org>

Package postgresql-pgpool in Fedora devel has been retired by devrim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postgresql-pgpool



From twaugh at fedoraproject.org  Mon Dec 21 17:11:58 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 21 Dec 2009 17:11:58 +0000 (UTC)
Subject: rpms/cups/devel cups-gnutls-gcrypt-threads.patch, NONE, 1.1 cups.spec,
	1.568, 1.569
Message-ID: <20091221171158.4257011C00E7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916

Modified Files:
	cups.spec 
Added Files:
	cups-gnutls-gcrypt-threads.patch 
Log Message:
* Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
- Ensure proper thread-safety in gnutls's use of libgcrypt
  (bug #544619).


cups-gnutls-gcrypt-threads.patch:
 cups/http-private.h |    2 ++
 cups/http.c         |    4 ++++
 scheduler/server.c  |    6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE cups-gnutls-gcrypt-threads.patch ---
diff -up cups-1.4.2/cups/http.c.gnutls-gcrypt-threads cups-1.4.2/cups/http.c
--- cups-1.4.2/cups/http.c.gnutls-gcrypt-threads	2009-12-21 16:50:58.931552118 +0000
+++ cups-1.4.2/cups/http.c	2009-12-21 16:51:15.047552357 +0000
@@ -1161,6 +1161,9 @@ httpHead(http_t     *http,		/* I - Conne
   return (http_send(http, HTTP_HEAD, uri));
 }
 
+#ifdef HAVE_GNUTLS
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
 /*
  * 'httpInitialize()' - Initialize the HTTP interface library and set the
@@ -1205,6 +1208,7 @@ httpInitialize(void)
 #endif /* WIN32 */
 
 #ifdef HAVE_GNUTLS
+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
   gnutls_global_init();
 #endif /* HAVE_GNUTLS */
 
diff -up cups-1.4.2/cups/http-private.h.gnutls-gcrypt-threads cups-1.4.2/cups/http-private.h
--- cups-1.4.2/cups/http-private.h.gnutls-gcrypt-threads	2009-04-07 16:48:14.000000000 +0100
+++ cups-1.4.2/cups/http-private.h	2009-12-21 16:51:15.049552624 +0000
@@ -98,6 +98,8 @@ extern BIO_METHOD *_httpBIOMethods(void)
  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
  */
 #    include <gnutls/gnutls.h>
+#    include <gcrypt.h>
+#    include <pthread.h>
 
 typedef struct
 {
diff -up cups-1.4.2/scheduler/server.c.gnutls-gcrypt-threads cups-1.4.2/scheduler/server.c
--- cups-1.4.2/scheduler/server.c.gnutls-gcrypt-threads	2008-09-10 23:05:29.000000000 +0100
+++ cups-1.4.2/scheduler/server.c	2009-12-21 16:51:15.048553044 +0000
@@ -35,7 +35,9 @@
  */
 
 static int	started = 0;
-
+#if !defined(HAVE_LIBSSL) && defined(HAVE_GNUTLS)
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
 /*
  * 'cupsdStartServer()' - Start the server.
@@ -75,7 +77,7 @@ cupsdStartServer(void)
  /*
   * Initialize the encryption libraries...
   */
-
+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
   gnutls_global_init();
 #endif /* HAVE_LIBSSL */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -p -r1.568 -r1.569
--- cups.spec	19 Dec 2009 13:03:41 -0000	1.568
+++ cups.spec	21 Dec 2009 17:11:58 -0000	1.569
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -72,6 +72,7 @@ Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
 Patch49: cups-delete-active-printer.patch
+Patch50: cups-gnutls-gcrypt-threads.patch
 
 Patch100: cups-lspp.patch
 
@@ -251,6 +252,7 @@ module. 
 %patch47 -p1 -b .str3428
 %patch48 -p1 -b .str3431
 %patch49 -p1 -b .delete-active-printer
+%patch50 -p1 -b .gnutls-gcrypt-threads
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -541,6 +543,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
+- Ensure proper thread-safety in gnutls's use of libgcrypt
+  (bug #544619).
+
 * Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
 - Fixed patch for STR #3425 by adding in back-ported change from svn
   revision 8936 (bug #548904).



From pbrobinson at fedoraproject.org  Mon Dec 21 17:15:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 21 Dec 2009 17:15:13 +0000 (UTC)
Subject: rpms/abiword/devel abiword.spec,1.98,1.99
Message-ID: <20091221171513.CF7AC11C00E7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30541

Modified Files:
	abiword.spec 
Log Message:
- Rebuild against new libwv


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- abiword.spec	1 Nov 2009 20:28:50 -0000	1.98
+++ abiword.spec	21 Dec 2009 17:15:13 -0000	1.99
@@ -7,7 +7,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -177,6 +177,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Mon Dec 21 2009 Peter Robinson <pbrobinson at gmail.com> - 1:2.8.1-3
+- Rebuild against new libwv
+
 * Sun Nov 01 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.1-2
 - Rebuild
 



From dyoung at fedoraproject.org  Mon Dec 21 17:15:27 2009
From: dyoung at fedoraproject.org (Daniel M. Young)
Date: Mon, 21 Dec 2009 17:15:27 +0000 (UTC)
Subject: rpms/python-djblets/F-12 python-djblets.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221171527.5502911C00E7@cvs1.fedora.phx.redhat.com>

Author: dyoung

Update of /cvs/pkgs/rpms/python-djblets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30657

Modified Files:
	.cvsignore sources 
Added Files:
	python-djblets.spec 
Log Message:
Initial import for F-12


--- NEW FILE python-djblets.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-djblets
Version:        0.5.6
Release:        0%{?dist}
Summary:        A collection of useful classes and functions for Django
Group:          Applications/Internet
# Djblets is MIT licensed:
# http://code.google.com/p/reviewboard/wiki/Djblets
# Jquery is bundled in Djblets. Jquery is dual-licensed MIT or GPLv2, hence
# the package license is "MIT and (MIT or GPLv2)":
# https://www.redhat.com/archives/fedora-legal-list/2009-May/msg00025.html
License:        MIT and (MIT or GPLv2)
URL:            http://www.review-board.org
Source0:        http://downloads.review-board.org/releases/Djblets/0.5/Djblets-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       Django >= 1.0.2
Requires:       python-imaging

%description
A collection of useful classes and functions for Django

%prep
%setup -q -n Djblets-%{version}
sed -i 's/^from ez_setup/#from ez_setup/' setup.py
sed -i 's/^use_setuptools()/#use_setuptools()/' setup.py
%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT

%{__python} setup.py install --root $RPM_BUILD_ROOT

# feedparser.py has a shebang, and has a runnable __main__; make it executable:
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/djblets/feedview/feedparser.py

# Remove the "tests" subdirectory to avoid it polluting the main python
# namespace:
rm -rf $RPM_BUILD_ROOT%{python_sitelib}/tests

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc NEWS
%{python_sitelib}/*

%changelog
* Mon Dec 21 2009 Stephen Gallagher <sgallagh at redhat.com> 0.5.6-0
- Update to latest upstream release
- Remove pre-release handling in the package name and spec

* Fri Oct 23 2009 Dan Young <dyoung at mesd.k12.or.us> - 0.5-0.3.rc1
- Fix License tag

* Wed May 13 2009 Dan Young <dyoung at mesd.k12.or.us> - 0.5-0.2.rc1
- BuildRequires: python and python-setuptools

* Thu May  7 2009 David Malcolm <dmalcolm at redhat.com> - 0.5-0.1.rc1
- bump to upstream 0.5rc1
- add NEWS and AUTHORS files as documentation

* Thu May  7 2009 David Malcolm <dmalcolm at redhat.com> - 0.5-0.1.alpha3
- rename from Djblets to python-djblets
- update version/release to try to preserve update path (prerelease issues)
- fix mixed tabs/spaces in specfile (use spaces throughout)
- remove tests subdirectory
- make feedparser.py executable

* Sat Feb  21 2009 Ramez Hanna <rhanna at informatiq.org> 
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-djblets/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:18:39 -0000	1.1
+++ .cvsignore	21 Dec 2009 17:15:27 -0000	1.2
@@ -0,0 +1 @@
+Djblets-0.5.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-djblets/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:18:39 -0000	1.1
+++ sources	21 Dec 2009 17:15:27 -0000	1.2
@@ -0,0 +1 @@
+1ba05845898ed5ac252ba5dfbb58c2df  Djblets-0.5.6.tar.gz



From pbrobinson at fedoraproject.org  Mon Dec 21 17:17:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 21 Dec 2009 17:17:14 +0000 (UTC)
Subject: rpms/pyabiword/devel pyabiword.spec,1.9,1.10
Message-ID: <20091221171714.82AB611C00E7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/pyabiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31035

Modified Files:
	pyabiword.spec 
Log Message:
- Rebuild against new libwv


Index: pyabiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/devel/pyabiword.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- pyabiword.spec	1 Nov 2009 20:59:16 -0000	1.9
+++ pyabiword.spec	21 Dec 2009 17:17:14 -0000	1.10
@@ -5,7 +5,7 @@
 Summary: Python bindings for libabiword
 Name: pyabiword
 Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: pyabiword-%{version}.tar.gz
 URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz
 License: GPL+
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/pyabiword.defs
 
 %changelog
+* Mon Dec 21 2009 Peter Robinson <pbrobinson at gmail.com> - 0.8.0-2
+- Rebuild against new libwv
+
 * Sun Nov 01 2009 Marc Maurer <uwog at uwog.net> - 0.8.0-1
 - New upstream release
 



From sgallagh at fedoraproject.org  Mon Dec 21 17:24:39 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 21 Dec 2009 17:24:39 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.122,1.123
Message-ID: <20091221172439.46E5D11C00E7@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32140

Modified Files:
	comps-f13.xml.in 
Log Message:
Adding SSSD to the core group as a default package

This is done in accordance with the FESCo-approved feature:
https://fedoraproject.org/wiki/Features/SSSDByDefault



Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- comps-f13.xml.in	19 Dec 2009 17:09:58 -0000	1.122
+++ comps-f13.xml.in	21 Dec 2009 17:24:38 -0000	1.123
@@ -289,6 +289,7 @@
       <packagereq type="default">smartmontools</packagereq>
       <packagereq type="default">sos</packagereq>
       <packagereq type="default">specspo</packagereq>
+      <packagereq type="default">sssd</packagereq>
       <packagereq type="default">stunnel</packagereq>
       <packagereq type="default">sudo</packagereq>
       <packagereq type="default">symlinks</packagereq>



From mcrha at fedoraproject.org  Mon Dec 21 17:32:47 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:32:47 +0000 (UTC)
Subject: File gtkhtml-3.29.4.tar.bz2 uploaded to lookaside cache by mcrha
Message-ID: <20091221173247.A4EC210F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gtkhtml3:

f60a5b10a32e2c7ab2141bfe7c1700c7  gtkhtml-3.29.4.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 21 17:34:08 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:34:08 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.107, 1.108 gtkhtml3.spec, 1.164,
	1.165 sources, 1.107, 1.108
Message-ID: <20091221173408.DDDC811C00E7@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv974

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 3.29.4-1.fc13
- Update to 3.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- .cvsignore	30 Nov 2009 14:18:39 -0000	1.107
+++ .cvsignore	21 Dec 2009 17:34:08 -0000	1.108
@@ -1 +1 @@
-gtkhtml-3.29.3.tar.bz2
+gtkhtml-3.29.4.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- gtkhtml3.spec	30 Nov 2009 14:18:39 -0000	1.164
+++ gtkhtml3.spec	21 Dec 2009 17:34:08 -0000	1.165
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.29.3
+Version: 3.29.4
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 3.29.4-1.fc13
+- Update to 3.29.4
+
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 3.29.3-1.fc13
 - Update to 3.29.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- sources	30 Nov 2009 14:18:39 -0000	1.107
+++ sources	21 Dec 2009 17:34:08 -0000	1.108
@@ -1 +1 @@
-1439783818e20933c69199fa08a87e19  gtkhtml-3.29.3.tar.bz2
+f60a5b10a32e2c7ab2141bfe7c1700c7  gtkhtml-3.29.4.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 21 17:36:33 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:36:33 +0000 (UTC)
Subject: File evolution-data-server-2.29.4.tar.bz2 uploaded to lookaside cache
	by mcrha
Message-ID: <20091221173633.E184C10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for evolution-data-server:

6566bda27d293317729b1cee5f0ae507  evolution-data-server-2.29.4.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 21 17:39:57 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:39:57 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.118,
	1.119 evolution-data-server.spec, 1.283, 1.284 sources, 1.118,
	1.119 evolution-data-server-1.8.0-fix-ldap-query.patch, 1.4, NONE
Message-ID: <20091221173957.6BD4311C00E7@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1889

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.8.0-fix-ldap-query.patch 
Log Message:
* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 2.29.4-1.fc13
- Update to 2.29.4
- Remove patch for GNOME bug #487988 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- .cvsignore	30 Nov 2009 14:22:10 -0000	1.118
+++ .cvsignore	21 Dec 2009 17:39:56 -0000	1.119
@@ -1 +1 @@
-evolution-data-server-2.29.3.tar.bz2
+evolution-data-server-2.29.4.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- evolution-data-server.spec	9 Dec 2009 16:53:31 -0000	1.283
+++ evolution-data-server.spec	21 Dec 2009 17:39:57 -0000	1.284
@@ -24,8 +24,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.29.3
-Release: 3%{?dist}
+Version: 2.29.4
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -38,9 +38,6 @@ Obsoletes: evolution-webcal < 2.24.0
 
 ### Patches ###
 
-# RH bug #215702 / GNOME bug #487988
-Patch10: evolution-data-server-1.8.0-fix-ldap-query.patch
-
 # RH bug #243296
 Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
@@ -120,7 +117,6 @@ This package contains developer document
 %prep
 %setup -q
 
-%patch10 -p1 -b .fix-ldap-query
 %patch11 -p1 -b .fix-64bit-acinclude
 
 mkdir -p krb5-fakeprefix/include
@@ -338,6 +334,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 2.29.4-1.fc13
+- Update to 2.29.4
+- Remove patch for GNOME bug #487988 (fixed upstream).
+
 * Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-3
 - Remove libgnome and libgnomeui requirements
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- sources	30 Nov 2009 14:22:10 -0000	1.118
+++ sources	21 Dec 2009 17:39:57 -0000	1.119
@@ -1 +1 @@
-b2144ed554ddd1c626d2e5c120d91776  evolution-data-server-2.29.3.tar.bz2
+6566bda27d293317729b1cee5f0ae507  evolution-data-server-2.29.4.tar.bz2


--- evolution-data-server-1.8.0-fix-ldap-query.patch DELETED ---



From mcrha at fedoraproject.org  Mon Dec 21 17:42:42 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:42:42 +0000 (UTC)
Subject: File evolution-2.29.4.tar.bz2 uploaded to lookaside cache by mcrha
Message-ID: <20091221174242.D589710F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for evolution:

24ee1af34ade7cab2a6116856ee7d63c  evolution-2.29.4.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 21 17:46:57 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:46:57 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.125, 1.126 evolution.spec, 1.428, 
	1.429 sources, 1.125,
	1.126 evolution-2.29.3-missing-m4-files.patch, 1.1, NONE
Message-ID: <20091221174657.D940C11C00E7@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2822

Modified Files:
	.cvsignore evolution.spec sources 
Removed Files:
	evolution-2.29.3-missing-m4-files.patch 
Log Message:
* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 2.29.4-1.fc13
- Update to 2.29.4
- Remove patch for missing m4 files from tarball (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- .cvsignore	30 Nov 2009 14:30:39 -0000	1.125
+++ .cvsignore	21 Dec 2009 17:46:56 -0000	1.126
@@ -1 +1 @@
-evolution-2.29.3.tar.bz2
+evolution-2.29.4.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -p -r1.428 -r1.429
--- evolution.spec	2 Dec 2009 19:50:40 -0000	1.428
+++ evolution.spec	21 Dec 2009 17:46:57 -0000	1.429
@@ -39,8 +39,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.29.3
-Release: 4%{?dist}
+Version: 2.29.4
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -63,9 +63,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
-# Temporary hack for missing m4 files from tarball
-Patch13: evolution-2.29.3-missing-m4-files.patch
-
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -236,7 +233,6 @@ This package contains the plugin to impo
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
-%patch13 -p1 -b .missing-m4-files
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -684,6 +680,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 2.29.4-1.fc13
+- Update to 2.29.4
+- Remove patch for missing m4 files from tarball (fixed upstream).
+
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13
 - Update to 2.29.3
 - Add patch for missing m4 files from tarball.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- sources	30 Nov 2009 14:30:39 -0000	1.125
+++ sources	21 Dec 2009 17:46:57 -0000	1.126
@@ -1 +1 @@
-cadd4949b95b04355c4070ad44e3fdb1  evolution-2.29.3.tar.bz2
+24ee1af34ade7cab2a6116856ee7d63c  evolution-2.29.4.tar.bz2


--- evolution-2.29.3-missing-m4-files.patch DELETED ---



From mcrha at fedoraproject.org  Mon Dec 21 17:47:57 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:47:57 +0000 (UTC)
Subject: File evolution-exchange-2.29.4.tar.bz2 uploaded to lookaside cache by
	mcrha
Message-ID: <20091221174757.CC65710F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for evolution-exchange:

d92968b3f76adbc8ba9b62a69b4eea5d  evolution-exchange-2.29.4.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 21 17:49:37 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:49:37 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.52,
	1.53 evolution-exchange.spec, 1.85, 1.86 sources, 1.52, 1.53
Message-ID: <20091221174937.081C211C00E7@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3259

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:
* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 2.29.4-1.fc13
- Update to 2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	30 Nov 2009 14:39:58 -0000	1.52
+++ .cvsignore	21 Dec 2009 17:49:36 -0000	1.53
@@ -1 +1 @@
-evolution-exchange-2.29.3.tar.bz2
+evolution-exchange-2.29.4.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- evolution-exchange.spec	2 Dec 2009 10:02:44 -0000	1.85
+++ evolution-exchange.spec	21 Dec 2009 17:49:36 -0000	1.86
@@ -16,7 +16,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.29.3
+Version: 2.29.4
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -135,6 +135,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 2.29.4-1.fc13
+- Update to 2.29.4
+
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13
 - Update to 2.29.3
 - Remove patch to work around intltool issue (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	30 Nov 2009 14:39:58 -0000	1.52
+++ sources	21 Dec 2009 17:49:36 -0000	1.53
@@ -1 +1 @@
-c1a4aff9e1950518fadc4bb1e4d879ac  evolution-exchange-2.29.3.tar.bz2
+d92968b3f76adbc8ba9b62a69b4eea5d  evolution-exchange-2.29.4.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 21 17:50:27 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:50:27 +0000 (UTC)
Subject: File evolution-mapi-0.29.4.tar.bz2 uploaded to lookaside cache by
	mcrha
Message-ID: <20091221175027.6D00710F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for evolution-mapi:

eee20b7fd831cf15ab891d25175cd05f  evolution-mapi-0.29.4.tar.bz2



From mcrha at fedoraproject.org  Mon Dec 21 17:52:29 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 21 Dec 2009 17:52:29 +0000 (UTC)
Subject: rpms/evolution-mapi/devel .cvsignore, 1.16, 1.17 evolution-mapi.spec, 
	1.21, 1.22 sources, 1.16, 1.17
Message-ID: <20091221175229.225B711C00E7@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-mapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3773

Modified Files:
	.cvsignore evolution-mapi.spec sources 
Log Message:
* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 0.29.4-1
- Update to 0.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	30 Nov 2009 14:49:51 -0000	1.16
+++ .cvsignore	21 Dec 2009 17:52:28 -0000	1.17
@@ -1 +1 @@
-evolution-mapi-0.29.3.tar.bz2
+evolution-mapi-0.29.4.tar.bz2


Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- evolution-mapi.spec	1 Dec 2009 10:13:40 -0000	1.21
+++ evolution-mapi.spec	21 Dec 2009 17:52:28 -0000	1.22
@@ -11,7 +11,7 @@
 ### Abstract ###
 
 Name: evolution-mapi
-Version: 0.29.3
+Version: 0.29.4
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 0.29.4-1
+- Update to 0.29.4
+
 * Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 0.29.3-1
 - Update to 0.29.3
 - Remove patch for Gnome bug #588453 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	30 Nov 2009 14:49:52 -0000	1.16
+++ sources	21 Dec 2009 17:52:28 -0000	1.17
@@ -1 +1 @@
-277e36f9c551a60ffdc9115f79faaf33  evolution-mapi-0.29.3.tar.bz2
+eee20b7fd831cf15ab891d25175cd05f  evolution-mapi-0.29.4.tar.bz2



From toshio at fedoraproject.org  Mon Dec 21 17:57:44 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 17:57:44 +0000 (UTC)
Subject: rpms/openvas-libnasl - New directory
Message-ID: <20091221175744.4042311C00E7@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/openvas-libnasl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsnS4784/rpms/openvas-libnasl

Log Message:
Directory /cvs/pkgs/rpms/openvas-libnasl added to the repository




From toshio at fedoraproject.org  Mon Dec 21 17:57:44 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 17:57:44 +0000 (UTC)
Subject: rpms/openvas-libnasl/devel - New directory
Message-ID: <20091221175744.5A32C11C025E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/openvas-libnasl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsnS4784/rpms/openvas-libnasl/devel

Log Message:
Directory /cvs/pkgs/rpms/openvas-libnasl/devel added to the repository




From toshio at fedoraproject.org  Mon Dec 21 17:57:51 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 17:57:51 +0000 (UTC)
Subject: rpms/openvas-libnasl Makefile,NONE,1.1
Message-ID: <20091221175751.DF35711C00E7@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/openvas-libnasl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsnS4784/rpms/openvas-libnasl

Added Files:
	Makefile 
Log Message:
Setup of module openvas-libnasl


--- NEW FILE Makefile ---
# Top level Makefile for module openvas-libnasl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From toshio at fedoraproject.org  Mon Dec 21 17:57:52 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 17:57:52 +0000 (UTC)
Subject: rpms/openvas-libnasl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221175752.92AB011C00E7@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/openvas-libnasl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsnS4784/rpms/openvas-libnasl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openvas-libnasl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: openvas-libnasl
# $Id: Makefile,v 1.1 2009/12/21 17:57:52 toshio Exp $
NAME := openvas-libnasl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From jdennis at fedoraproject.org  Mon Dec 21 18:14:57 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Mon, 21 Dec 2009 18:14:57 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.90,1.91
Message-ID: <20091221181457.2933211C00E7@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6541

Modified Files:
	freeradius.spec 
Log Message:
- more spec file clean up from review comments
- remove freeradius-libs subpackage, move libfreeradius-eap and
  libfreeradius-radius into the main package
- fix subpackage requires, change from freeradius-libs to main package
- fix description of the devel subpackage, remove referene to non-shipped libs
- remove execute permissions on src files included in debuginfo



Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- freeradius.spec	19 Dec 2009 20:10:12 -0000	1.90
+++ freeradius.spec	21 Dec 2009 18:14:56 -0000	1.91
@@ -1,11 +1,13 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
 
+Obsoletes: freeradius-libs
+
 Source0: ftp://ftp.freeradius.org/pub/radius/freeradius-server-%{version}.tar.bz2
 Source100: freeradius-radiusd-init
 Source102: freeradius-logrotate
@@ -48,17 +50,10 @@ more.  Using RADIUS allows authenticatio
 be centralized, and minimizes the amount of re-configuration which has to be
 done when adding or deleting new users.
 
-%package libs
-Group: System Environment/Daemons
-Summary: FreeRADIUS shared libraries
-
-%description libs
-The FreeRADIUS shared library
-
 %package utils
 Group: System Environment/Daemons
 Summary: FreeRADIUS utilities
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: libpcap >= 0.9.4
 
 %description utils
@@ -73,16 +68,15 @@ attributes Selecting a particular config
 %package devel
 Group: Development/Libraries
 Summary: FreeRADIUS Development Files
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
-These are the static libraries for the FreeRADIUS package.
-
+Header files for the FreeRADIUS package.
 
 %package ldap
 Summary: LDAP support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: openldap-devel
 
 %description ldap
@@ -91,7 +85,7 @@ This plugin provides the LDAP support fo
 %package krb5
 Summary: Kerberos 5 support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: krb5-devel
 
 %description krb5
@@ -100,7 +94,7 @@ This plugin provides the Kerberos 5 supp
 %package perl
 Summary: Perl support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %if 0%{?fedora}
 BuildRequires: perl-devel
@@ -115,7 +109,7 @@ This plugin provides the Perl support fo
 %package python
 Summary: Python support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: python-devel
 
 %description python
@@ -124,7 +118,7 @@ This plugin provides the Python support 
 %package mysql
 Summary: MySQL support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: mysql-devel
 
 %description mysql
@@ -133,7 +127,7 @@ This plugin provides the MySQL support f
 %package postgresql
 Summary: Postgresql support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: postgresql-devel
 
 %description postgresql
@@ -142,7 +136,7 @@ This plugin provides the postgresql supp
 %package unixODBC
 Summary: Unix ODBC support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: unixODBC-devel
 
 %description unixODBC
@@ -151,6 +145,8 @@ This plugin provides the unixODBC suppor
 
 %prep
 %setup -q -n freeradius-server-%{version}
+# Some source files mistakenly have execute permissions set
+find $RPM_BUILD_DIR/freeradius-server-%{version} \( -name '*.c' -o -name '*.h' \) -a -perm /0111 -exec chmod a-x {} +
 
 %build
 %ifarch s390 s390x
@@ -266,11 +262,6 @@ getent group  radiusd >/dev/null || /usr
 getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
 exit 0
 
-%pre libs
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
 %pre mysql
 getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
 getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
@@ -455,6 +446,8 @@ fi
 %dir %attr(700,radiusd,radiusd) /var/log/radius/radacct/
 %ghost %attr(644,radiusd,radiusd) /var/log/radius/radutmp
 %ghost %attr(600,radiusd,radiusd) /var/log/radius/radius.log
+# RADIUS shared libs
+%attr(755,root,root) %{_libdir}/freeradius/lib*.so*
 # RADIUS Loadable Modules
 %dir %attr(755,root,root) %{_libdir}/freeradius
 #%attr(755,root,root) %{_libdir}/freeradius/rlm_*.so*
@@ -563,11 +556,6 @@ fi
 %doc %{_mandir}/man8/radsqlrelay.8.gz
 %doc %{_mandir}/man8/rlm_ippool_tool.8.gz
 
-%files libs
-# RADIU shared libs
-%defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/freeradius/lib*.so*
-
 %files devel
 %defattr(-,root,root)
 #%attr(644,root,root) %{_libdir}/freeradius/*.a
@@ -620,6 +608,17 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Mon Dec 21 2009 John Dennis <jdennis at redhat.com> - 2.1.7-6
+- more spec file clean up from review comments
+- remove freeradius-libs subpackage, move libfreeradius-eap and
+  libfreeradius-radius into the main package
+- fix subpackage requires, change from freeradius-libs to main package
+- fix description of the devel subpackage, remove referene to non-shipped libs
+- remove execute permissions on src files included in debuginfo
+
+* Mon Dec 21 2009 John Dennis <jdennis at redhat.com> - 2.1.7-5
+- fix various rpmlint issues.
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.1.7-4
 - rebuild against perl 5.10.1
 



From agoode at fedoraproject.org  Mon Dec 21 18:17:05 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Mon, 21 Dec 2009 18:17:05 +0000 (UTC)
Subject: File openslide-2.3.1.tar.xz uploaded to lookaside cache by agoode
Message-ID: <20091221181705.C7B4510F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for openslide:

aa6e066a9e1b0fa3c6b25a1f8cb01169  openslide-2.3.1.tar.xz



From agoode at fedoraproject.org  Mon Dec 21 18:17:39 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Mon, 21 Dec 2009 18:17:39 +0000 (UTC)
Subject: rpms/openslide/devel .cvsignore, 1.2, 1.3 openslide.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091221181740.0145011C00E7@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6879

Modified Files:
	.cvsignore openslide.spec sources 
Log Message:
* Mon Dec 21 2009 Adam Goode <adam at spicenitz.org> - 2.3.1-1
- New upstream release
   + Support for generic tiled TIFF
   + Bug fixes
   + Try to be less chatty with TIFF output



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 21:04:38 -0000	1.2
+++ .cvsignore	21 Dec 2009 18:17:39 -0000	1.3
@@ -1 +1 @@
-openslide-2.2.0.tar.xz
+openslide-2.3.1.tar.xz


Index: openslide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/devel/openslide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openslide.spec	22 Sep 2009 21:05:26 -0000	1.1
+++ openslide.spec	21 Dec 2009 18:17:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		openslide
-Version:	2.2.0
-Release:	3%{?dist}
+Version:	2.3.1
+Release:	1%{?dist}
 Summary:	C library for reading virtual slides
 
 Group:		System Environment/Libraries
@@ -68,6 +68,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Adam Goode <adam at spicenitz.org> - 2.3.1-1
+- New upstream release
+   + Support for generic tiled TIFF
+   + Bug fixes
+   + Try to be less chatty with TIFF output
+
+* Thu Nov 12 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
+- New upstream release
+   + Fix thread safety problems from 2.2.0
+
 * Tue Sep 22 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3
 - Use xz instead of gz
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 21:04:38 -0000	1.2
+++ sources	21 Dec 2009 18:17:39 -0000	1.3
@@ -1 +1 @@
-bec05ceb1dfb569606c4691010eecde8  openslide-2.2.0.tar.xz
+aa6e066a9e1b0fa3c6b25a1f8cb01169  openslide-2.3.1.tar.xz



From agoode at fedoraproject.org  Mon Dec 21 18:20:52 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Mon, 21 Dec 2009 18:20:52 +0000 (UTC)
Subject: rpms/openslide/F-12 .cvsignore, 1.3, 1.4 openslide.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091221182052.220E211C00E7@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7367

Modified Files:
	.cvsignore openslide.spec sources 
Log Message:
* Mon Dec 21 2009 Adam Goode <adam at spicenitz.org> - 2.3.1-1
- New upstream release
   + Support for generic tiled TIFF
   + Bug fixes
   + Try to be less chatty with TIFF output



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Oct 2009 15:35:36 -0000	1.3
+++ .cvsignore	21 Dec 2009 18:20:51 -0000	1.4
@@ -1 +1 @@
-openslide-2.2.1.tar.xz
+openslide-2.3.1.tar.xz


Index: openslide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-12/openslide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openslide.spec	23 Oct 2009 15:35:36 -0000	1.2
+++ openslide.spec	21 Dec 2009 18:20:51 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		openslide
-Version:	2.2.1
+Version:	2.3.1
 Release:	1%{?dist}
 Summary:	C library for reading virtual slides
 
@@ -68,9 +68,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
+* Mon Dec 21 2009 Adam Goode <adam at spicenitz.org> - 2.3.1-1
 - New upstream release
-   + Fix thread safety (not really lockless anymore)
+   + Support for generic tiled TIFF
+   + Bug fixes
+   + Try to be less chatty with TIFF output
+
+* Thu Nov 12 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
+- New upstream release
+   + Fix thread safety problems from 2.2.0
 
 * Tue Sep 22 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3
 - Use xz instead of gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Oct 2009 15:35:36 -0000	1.3
+++ sources	21 Dec 2009 18:20:51 -0000	1.4
@@ -1 +1 @@
-54c2488cfc065fa04674ed0cbdc3e17b  openslide-2.2.1.tar.xz
+aa6e066a9e1b0fa3c6b25a1f8cb01169  openslide-2.3.1.tar.xz



From agoode at fedoraproject.org  Mon Dec 21 18:22:51 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Mon, 21 Dec 2009 18:22:51 +0000 (UTC)
Subject: rpms/openslide/F-11 .cvsignore, 1.3, 1.4 openslide.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091221182251.69CF311C00E7@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7684

Modified Files:
	.cvsignore openslide.spec sources 
Log Message:
* Mon Dec 21 2009 Adam Goode <adam at spicenitz.org> - 2.3.1-1
- New upstream release
   + Support for generic tiled TIFF
   + Bug fixes
   + Try to be less chatty with TIFF output



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Oct 2009 15:37:16 -0000	1.3
+++ .cvsignore	21 Dec 2009 18:22:51 -0000	1.4
@@ -1 +1 @@
-openslide-2.2.1.tar.xz
+openslide-2.3.1.tar.xz


Index: openslide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-11/openslide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openslide.spec	23 Oct 2009 15:37:16 -0000	1.2
+++ openslide.spec	21 Dec 2009 18:22:51 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		openslide
-Version:	2.2.1
+Version:	2.3.1
 Release:	1%{?dist}
 Summary:	C library for reading virtual slides
 
@@ -68,9 +68,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
+* Mon Dec 21 2009 Adam Goode <adam at spicenitz.org> - 2.3.1-1
 - New upstream release
-   + Fix thread safety (not really lockless anymore)
+   + Support for generic tiled TIFF
+   + Bug fixes
+   + Try to be less chatty with TIFF output
+
+* Thu Nov 12 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
+- New upstream release
+   + Fix thread safety problems from 2.2.0
 
 * Tue Sep 22 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3
 - Use xz instead of gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Oct 2009 15:37:16 -0000	1.3
+++ sources	21 Dec 2009 18:22:51 -0000	1.4
@@ -1 +1 @@
-54c2488cfc065fa04674ed0cbdc3e17b  openslide-2.2.1.tar.xz
+aa6e066a9e1b0fa3c6b25a1f8cb01169  openslide-2.3.1.tar.xz



From jdennis at fedoraproject.org  Mon Dec 21 18:30:56 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Mon, 21 Dec 2009 18:30:56 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.91,1.92
Message-ID: <20091221183056.8EC7611C00E7@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8883

Modified Files:
	freeradius.spec 
Log Message:
remove unnecessary use of ldconfig



Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- freeradius.spec	21 Dec 2009 18:14:56 -0000	1.91
+++ freeradius.spec	21 Dec 2009 18:30:56 -0000	1.92
@@ -31,8 +31,7 @@ BuildRequires: readline-devel
 BuildRequires: libpcap-devel
 
 Requires(pre): shadow-utils glibc-common
-Requires(post): /sbin/ldconfig /sbin/chkconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 
 %description
@@ -196,7 +195,6 @@ make install R=$RPM_BUILD_ROOT
 RADDB=$RPM_BUILD_ROOT%{_sysconfdir}/raddb
 perl -i -pe 's/^#user =.*$/user = radiusd/'   $RADDB/radiusd.conf
 perl -i -pe 's/^#group =.*$/group = radiusd/' $RADDB/radiusd.conf
-#ldconfig -n $RPM_BUILD_ROOT/usr/lib/freeradius
 # logs
 mkdir -p $RPM_BUILD_ROOT/var/log/radius/radacct
 touch $RPM_BUILD_ROOT/var/log/radius/{radutmp,radius.log}
@@ -296,7 +294,6 @@ exit 0
 
 
 %post
-/sbin/ldconfig
 if [ $1 = 1 ]; then
   /sbin/chkconfig --add radiusd
 fi
@@ -312,7 +309,6 @@ fi
 if [ $1 -ge 1 ]; then
   /sbin/service radiusd condrestart >/dev/null 2>&1 || :
 fi
-/sbin/ldconfig
 
 
 %files
@@ -615,6 +611,7 @@ fi
 - fix subpackage requires, change from freeradius-libs to main package
 - fix description of the devel subpackage, remove referene to non-shipped libs
 - remove execute permissions on src files included in debuginfo
+- remove unnecessary use of ldconfig
 
 * Mon Dec 21 2009 John Dennis <jdennis at redhat.com> - 2.1.7-5
 - fix various rpmlint issues.



From pkgdb at fedoraproject.org  Mon Dec 21 19:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:16:07 +0000
Subject: [pkgdb] spamassassin: nb has requested commit
Message-ID: <20091221191607.A4C7D10F8BE@bastion.fedoraproject.org>

nb has requested the commit acl on spamassassin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Mon Dec 21 19:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:16:13 +0000
Subject: [pkgdb] spamassassin: nb has requested commit
Message-ID: <20091221191613.DD42810F8C6@bastion.fedoraproject.org>

nb has requested the commit acl on spamassassin (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Mon Dec 21 19:16:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:16:15 +0000
Subject: [pkgdb] spamassassin: nb has requested commit
Message-ID: <20091221191615.7D65410F8BA@bastion.fedoraproject.org>

nb has requested the commit acl on spamassassin (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Mon Dec 21 19:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:25:42 +0000
Subject: [pkgdb] spamassassin had acl change status
Message-ID: <20091221192531.C644E10F8B3@bastion.fedoraproject.org>

kevin has set the commit acl on spamassassin (Fedora devel) to Approved for nb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Mon Dec 21 19:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:25:36 +0000
Subject: [pkgdb] spamassassin had acl change status
Message-ID: <20091221192537.1ACD910F8B9@bastion.fedoraproject.org>

kevin has set the commit acl on spamassassin (Fedora 11) to Approved for nb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From pkgdb at fedoraproject.org  Mon Dec 21 19:25:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:25:40 +0000
Subject: [pkgdb] spamassassin had acl change status
Message-ID: <20091221192540.A4A8B10F8BA@bastion.fedoraproject.org>

kevin has set the commit acl on spamassassin (Fedora 12) to Approved for nb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/spamassassin



From nalin at fedoraproject.org  Mon Dec 21 19:27:25 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 21 Dec 2009 19:27:25 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-spnego-deleg.patch, 1.2, 1.3 krb5.spec, 1.221,
	1.222
Message-ID: <20091221192725.8058411C00E7@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14478

Modified Files:
	krb5-1.7-spnego-deleg.patch krb5.spec 
Log Message:
refresh patch for #542868 from trunk


krb5-1.7-spnego-deleg.patch:
 gssapiP_spnego.h |    9 +++++++++
 spnego_mech.c    |   17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

Index: krb5-1.7-spnego-deleg.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-spnego-deleg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- krb5-1.7-spnego-deleg.patch	11 Dec 2009 18:08:12 -0000	1.2
+++ krb5-1.7-spnego-deleg.patch	21 Dec 2009 19:27:25 -0000	1.3
@@ -1,15 +1,13 @@
 Punt a set_cred_option() call down to the mechanism for the first
 credential that we have whose mechanism implements a set_cred_option()
-method.  Not completely sure this is the correct fix, as we may need to
-change gssspi_set_cred_option() to keep going if it gets GSS_S_UNAVAILABLE
-back from the mechanism-specific function (which is what the Kerberos
-mechanism, previously the only provider of a set_cred_option(), returns
-if it doesn't understand the request). RT#6594
+method.  It's not the complete set of changes from 1.7 to trunk, but
+it should be enough to make gss_krb5_copy_ccache() work.  RT#6594
 
-diff -up krb5/src/lib/gssapi/spnego/gssapiP_spnego.h krb5/src/lib/gssapi/spnego/gssapiP_spnego.h
---- krb5/src/lib/gssapi/spnego/gssapiP_spnego.h	2009-12-08 14:46:57.000000000 -0500
-+++ krb5/src/lib/gssapi/spnego/gssapiP_spnego.h	2009-12-08 14:46:20.000000000 -0500
-@@ -333,6 +333,15 @@ spnego_gss_inquire_sec_context_by_oid
+Index: src/lib/gssapi/spnego/gssapiP_spnego.h
+===================================================================
+--- src/lib/gssapi/spnego/gssapiP_spnego.h	(revision 23481)
++++ src/lib/gssapi/spnego/gssapiP_spnego.h	(revision 23482)
+@@ -352,6 +352,15 @@
  );
  
  OM_uint32
@@ -25,19 +23,20 @@ diff -up krb5/src/lib/gssapi/spnego/gssa
  spnego_gss_set_sec_context_option
  (
  	OM_uint32 *minor_status,
-diff -up krb5/src/lib/gssapi/spnego/spnego_mech.c krb5/src/lib/gssapi/spnego/spnego_mech.c
---- krb5/src/lib/gssapi/spnego/spnego_mech.c	2009-12-08 14:47:01.000000000 -0500
-+++ krb5/src/lib/gssapi/spnego/spnego_mech.c	2009-12-08 14:46:20.000000000 -0500
-@@ -250,7 +250,7 @@ static struct gss_config spnego_mechanis
+Index: src/lib/gssapi/spnego/spnego_mech.c
+===================================================================
+--- src/lib/gssapi/spnego/spnego_mech.c	
++++ src/lib/gssapi/spnego/spnego_mech.c	(revision 23482)
+@@ -250,7 +250,7 @@
   	spnego_gss_inquire_sec_context_by_oid, /* gss_inquire_sec_context_by_oid */
   	NULL,				/* gss_inquire_cred_by_oid */
   	spnego_gss_set_sec_context_option, /* gss_set_sec_context_option */
 - 	NULL,				/* gssspi_set_cred_option */
-+ 	spnego_gss_set_cred_option,	/* gssspi_set_cred_option */
++	spnego_gss_set_cred_option,	/* gssspi_set_cred_option */
   	NULL,				/* gssspi_mech_invoke */
  	spnego_gss_wrap_aead,
  	spnego_gss_unwrap_aead,
-@@ -2081,6 +2081,21 @@ spnego_gss_inquire_sec_context_by_oid(
+@@ -2187,6 +2187,21 @@
  }
  
  OM_uint32


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- krb5.spec	10 Dec 2009 22:50:50 -0000	1.221
+++ krb5.spec	21 Dec 2009 19:27:25 -0000	1.222
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 13%{?dist}
+Release: 14%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -216,6 +216,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Mon Dec 21 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-14
+- refresh patch for #542868 from trunk
+
 * Thu Dec 10 2009 Nalin Dahyabhai <nalin at redhat.com>
 - move man pages that live in the -libs subpackage into the regular
   %%{_mandir} tree where they'll still be found if that package is the
@@ -1516,7 +1519,7 @@ popd
 %patch88 -p1 -b .sizeof
 %patch89 -p1 -b .largefile
 %patch90 -p0 -b .openssl-1.0
-%patch91 -p1 -b .spnego-deleg
+%patch91 -p0 -b .spnego-deleg
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex



From rdieter at fedoraproject.org  Mon Dec 21 19:30:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:30:30 +0000 (UTC)
Subject: rpms/sbcl/devel sbcl.spec,1.112,1.113
Message-ID: <20091221193030.9E94111C02C8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14925

Modified Files:
	sbcl.spec 
Log Message:
* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.32-2
- %check: (re)enable run-tests.sh



Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sbcl.spec	26 Oct 2009 16:55:37 -0000	1.112
+++ sbcl.spec	21 Dec 2009 19:30:30 -0000	1.113
@@ -16,7 +16,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 1.0.32
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD
 Group: 	 Development/Languages
@@ -192,10 +192,7 @@ for CONTRIB in $CONTRIBS ; do
   fi
 done
 pushd tests 
-# Only x86 builds are expected to pass all
-# Don't worry about thread.impure failure(s), threading is optional anyway.
-## skip test for now, known to hang
-## %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
+time %{?setarch} %{?sbcl_shell} ./run-tests.sh
 popd
 exit $ERROR
 
@@ -263,6 +260,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.32-2
+- %%check: (re)enable run-tests.sh
+
 * Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.32-1
 - sbcl-1.0.32
 



From pkgdb at fedoraproject.org  Mon Dec 21 19:35:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:35:59 +0000
Subject: [pkgdb] poky-scripts was added for shakthimaan
Message-ID: <20091221193559.2D41D10F892@bastion.fedoraproject.org>

kevin has added Package poky-scripts with summary Poky platform builder utility scripts
kevin has approved Package poky-scripts
kevin has added a Fedora devel branch for poky-scripts with an owner of shakthimaan
kevin has approved poky-scripts in Fedora devel
kevin has approved Package poky-scripts
kevin has set commit to Approved for 107427 on poky-scripts (Fedora devel)
kevin has set checkout to Approved for 107427 on poky-scripts (Fedora devel)
kevin has set build to Approved for 107427 on poky-scripts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poky-scripts



From pkgdb at fedoraproject.org  Mon Dec 21 19:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:36:01 +0000
Subject: [pkgdb] poky-scripts summary updated by kevin
Message-ID: <20091221193601.2FF6110F85E@bastion.fedoraproject.org>

kevin set package poky-scripts summary to Poky platform builder utility scripts

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poky-scripts



From pkgdb at fedoraproject.org  Mon Dec 21 19:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:36:01 +0000
Subject: [pkgdb] poky-scripts (Fedora, 11) updated by kevin
Message-ID: <20091221193601.4AE2110F8B9@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for poky-scripts
kevin has set commit to Approved for 107427 on poky-scripts (Fedora 11)
kevin has set checkout to Approved for 107427 on poky-scripts (Fedora 11)
kevin has set build to Approved for 107427 on poky-scripts (Fedora 11)
kevin approved watchbugzilla on poky-scripts (Fedora 11) for chitlesh
kevin approved watchcommits on poky-scripts (Fedora 11) for chitlesh
kevin approved commit on poky-scripts (Fedora 11) for chitlesh
kevin approved build on poky-scripts (Fedora 11) for chitlesh
kevin approved approveacls on poky-scripts (Fedora 11) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poky-scripts



From pkgdb at fedoraproject.org  Mon Dec 21 19:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:36:01 +0000
Subject: [pkgdb] poky-scripts (Fedora, 12) updated by kevin
Message-ID: <20091221193601.5CFE710F8BE@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for poky-scripts
kevin has set commit to Approved for 107427 on poky-scripts (Fedora 12)
kevin has set checkout to Approved for 107427 on poky-scripts (Fedora 12)
kevin has set build to Approved for 107427 on poky-scripts (Fedora 12)
kevin approved watchbugzilla on poky-scripts (Fedora 12) for chitlesh
kevin approved watchcommits on poky-scripts (Fedora 12) for chitlesh
kevin approved commit on poky-scripts (Fedora 12) for chitlesh
kevin approved build on poky-scripts (Fedora 12) for chitlesh
kevin approved approveacls on poky-scripts (Fedora 12) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poky-scripts



From pkgdb at fedoraproject.org  Mon Dec 21 19:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:36:01 +0000
Subject: [pkgdb] poky-scripts (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221193601.669CB10F8C2@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for poky-scripts
kevin has set commit to Approved for 107427 on poky-scripts (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on poky-scripts (Fedora EPEL 5)
kevin has set build to Approved for 107427 on poky-scripts (Fedora EPEL 5)
kevin approved watchbugzilla on poky-scripts (Fedora EPEL 5) for chitlesh
kevin approved watchcommits on poky-scripts (Fedora EPEL 5) for chitlesh
kevin approved commit on poky-scripts (Fedora EPEL 5) for chitlesh
kevin approved build on poky-scripts (Fedora EPEL 5) for chitlesh
kevin approved approveacls on poky-scripts (Fedora EPEL 5) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poky-scripts



From pkgdb at fedoraproject.org  Mon Dec 21 19:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:36:01 +0000
Subject: [pkgdb] poky-scripts (Fedora, devel) updated by kevin
Message-ID: <20091221193601.7362E10F8CC@bastion.fedoraproject.org>

kevin approved watchbugzilla on poky-scripts (Fedora devel) for chitlesh
kevin approved watchcommits on poky-scripts (Fedora devel) for chitlesh
kevin approved commit on poky-scripts (Fedora devel) for chitlesh
kevin approved build on poky-scripts (Fedora devel) for chitlesh
kevin approved approveacls on poky-scripts (Fedora devel) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poky-scripts



From kevin at fedoraproject.org  Mon Dec 21 19:36:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:36:10 +0000 (UTC)
Subject: rpms/poky-scripts - New directory
Message-ID: <20091221193610.2753111C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/poky-scripts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA15685/rpms/poky-scripts

Log Message:
Directory /cvs/pkgs/rpms/poky-scripts added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:36:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:36:10 +0000 (UTC)
Subject: rpms/poky-scripts/devel - New directory
Message-ID: <20091221193610.40C8B11C0296@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/poky-scripts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA15685/rpms/poky-scripts/devel

Log Message:
Directory /cvs/pkgs/rpms/poky-scripts/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:36:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:36:18 +0000 (UTC)
Subject: rpms/poky-scripts Makefile,NONE,1.1
Message-ID: <20091221193618.1A2D111C032A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/poky-scripts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA15685/rpms/poky-scripts

Added Files:
	Makefile 
Log Message:
Setup of module poky-scripts


--- NEW FILE Makefile ---
# Top level Makefile for module poky-scripts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:36:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:36:19 +0000 (UTC)
Subject: rpms/poky-scripts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221193619.AC59B11C03B8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/poky-scripts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA15685/rpms/poky-scripts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module poky-scripts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: poky-scripts
# $Id: Makefile,v 1.1 2009/12/21 19:36:18 kevin Exp $
NAME := poky-scripts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 19:39:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:39:34 +0000
Subject: [pkgdb] planner2html was added for caolanm
Message-ID: <20091221193934.5991210F894@bastion.fedoraproject.org>

kevin has added Package planner2html with summary Convert planner files to html
kevin has approved Package planner2html
kevin has added a Fedora devel branch for planner2html with an owner of caolanm
kevin has approved planner2html in Fedora devel
kevin has approved Package planner2html
kevin has set commit to Approved for 107427 on planner2html (Fedora devel)
kevin has set checkout to Approved for 107427 on planner2html (Fedora devel)
kevin has set build to Approved for 107427 on planner2html (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/planner2html



From pkgdb at fedoraproject.org  Mon Dec 21 19:39:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:39:35 +0000
Subject: [pkgdb] planner2html summary updated by kevin
Message-ID: <20091221193935.B1B0110F894@bastion.fedoraproject.org>

kevin set package planner2html summary to Convert planner files to html

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/planner2html



From pkgdb at fedoraproject.org  Mon Dec 21 19:39:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:39:35 +0000
Subject: [pkgdb] planner2html (Fedora, 12) updated by kevin
Message-ID: <20091221193935.BDCB110F8B9@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for planner2html
kevin has set commit to Approved for 107427 on planner2html (Fedora 12)
kevin has set checkout to Approved for 107427 on planner2html (Fedora 12)
kevin has set build to Approved for 107427 on planner2html (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/planner2html



From kevin at fedoraproject.org  Mon Dec 21 19:39:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:39:44 +0000 (UTC)
Subject: rpms/planner2html - New directory
Message-ID: <20091221193944.1838D11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/planner2html
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse16225/rpms/planner2html

Log Message:
Directory /cvs/pkgs/rpms/planner2html added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:39:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:39:44 +0000 (UTC)
Subject: rpms/planner2html/devel - New directory
Message-ID: <20091221193944.2A94111C02C9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/planner2html/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse16225/rpms/planner2html/devel

Log Message:
Directory /cvs/pkgs/rpms/planner2html/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:39:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:39:51 +0000 (UTC)
Subject: rpms/planner2html Makefile,NONE,1.1
Message-ID: <20091221193951.AE60711C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/planner2html
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse16225/rpms/planner2html

Added Files:
	Makefile 
Log Message:
Setup of module planner2html


--- NEW FILE Makefile ---
# Top level Makefile for module planner2html
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:39:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:39:52 +0000 (UTC)
Subject: rpms/planner2html/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221193952.456B911C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/planner2html/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse16225/rpms/planner2html/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module planner2html


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: planner2html
# $Id: Makefile,v 1.1 2009/12/21 19:39:51 kevin Exp $
NAME := planner2html
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rdieter at fedoraproject.org  Mon Dec 21 19:40:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:40:05 +0000 (UTC)
Subject: rpms/maxima/devel maxima.spec,1.143,1.144
Message-ID: <20091221194005.C0E5711C0382@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16365

Modified Files:
	maxima.spec 
Log Message:
bz reference



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- maxima.spec	16 Dec 2009 00:33:05 -0000	1.143
+++ maxima.spec	21 Dec 2009 19:40:05 -0000	1.144
@@ -432,7 +432,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
-- maxima-5.20.1
+- maxima-5.20.1 (#547012)
 
 * Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.0-1
 - maxima-5.20.0



From pkgdb at fedoraproject.org  Mon Dec 21 19:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:40:35 +0000
Subject: [pkgdb] hostapd was added for linville
Message-ID: <20091221194035.8E2CB10F894@bastion.fedoraproject.org>

kevin has added Package hostapd with summary IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
kevin has approved Package hostapd
kevin has added a Fedora devel branch for hostapd with an owner of linville
kevin has approved hostapd in Fedora devel
kevin has approved Package hostapd
kevin has set commit to Approved for 107427 on hostapd (Fedora devel)
kevin has set checkout to Approved for 107427 on hostapd (Fedora devel)
kevin has set build to Approved for 107427 on hostapd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hostapd



From pkgdb at fedoraproject.org  Mon Dec 21 19:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:40:37 +0000
Subject: [pkgdb] hostapd (Fedora, 12) updated by kevin
Message-ID: <20091221194037.41EAE10F8B9@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for hostapd
kevin has set commit to Approved for 107427 on hostapd (Fedora 12)
kevin has set checkout to Approved for 107427 on hostapd (Fedora 12)
kevin has set build to Approved for 107427 on hostapd (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hostapd



From pkgdb at fedoraproject.org  Mon Dec 21 19:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:40:37 +0000
Subject: [pkgdb] hostapd summary updated by kevin
Message-ID: <20091221194037.357E110F894@bastion.fedoraproject.org>

kevin set package hostapd summary to IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hostapd



From kevin at fedoraproject.org  Mon Dec 21 19:40:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:40:44 +0000 (UTC)
Subject: rpms/hostapd - New directory
Message-ID: <20091221194044.17B3111C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hostapd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16494/rpms/hostapd

Log Message:
Directory /cvs/pkgs/rpms/hostapd added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:40:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:40:44 +0000 (UTC)
Subject: rpms/hostapd/devel - New directory
Message-ID: <20091221194044.2AEA111C02C9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hostapd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16494/rpms/hostapd/devel

Log Message:
Directory /cvs/pkgs/rpms/hostapd/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:40:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:40:51 +0000 (UTC)
Subject: rpms/hostapd Makefile,NONE,1.1
Message-ID: <20091221194051.9BC3411C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hostapd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16494/rpms/hostapd

Added Files:
	Makefile 
Log Message:
Setup of module hostapd


--- NEW FILE Makefile ---
# Top level Makefile for module hostapd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:40:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:40:51 +0000 (UTC)
Subject: rpms/hostapd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091221194051.EB61911C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hostapd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT16494/rpms/hostapd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hostapd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hostapd
# $Id: Makefile,v 1.1 2009/12/21 19:40:51 kevin Exp $
NAME := hostapd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From nalin at fedoraproject.org  Mon Dec 21 19:41:25 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 21 Dec 2009 19:41:25 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.222,1.223
Message-ID: <20091221194125.5D4A111C00E7@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16747

Modified Files:
	krb5.spec 
Log Message:
- fix a typo



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- krb5.spec	21 Dec 2009 19:27:25 -0000	1.222
+++ krb5.spec	21 Dec 2009 19:41:25 -0000	1.223
@@ -222,7 +222,7 @@ certificate.
 * Thu Dec 10 2009 Nalin Dahyabhai <nalin at redhat.com>
 - move man pages that live in the -libs subpackage into the regular
   %%{_mandir} tree where they'll still be found if that package is the
-  only one %installed (#529319)
+  only one installed (#529319)
 
 * Wed Dec  9 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-13
 - and put it back in



From rdieter at fedoraproject.org  Mon Dec 21 19:41:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:41:35 +0000 (UTC)
Subject: rpms/maxima/F-12 .cvsignore, 1.33, 1.34 maxima.spec, 1.138,
	1.139 sources, 1.31, 1.32
Message-ID: <20091221194135.2D4DD11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16824

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
- maxima-5.20.1 (#547012)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/F-12/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	30 Aug 2009 20:04:58 -0000	1.33
+++ .cvsignore	21 Dec 2009 19:41:34 -0000	1.34
@@ -2,5 +2,4 @@ clog
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.19.1.tar.gz
-maxima-5.19.2.tar.gz
+maxima-5.20.1.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/F-12/maxima.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- maxima.spec	30 Aug 2009 20:04:58 -0000	1.138
+++ maxima.spec	21 Dec 2009 19:41:34 -0000	1.139
@@ -1,7 +1,7 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.19.2
+Version: 5.20.1
 
 Release: 1%{?dist} 
 License: GPLv2
@@ -91,8 +91,6 @@ Obsoletes: %{name}-lang-pt-utf8 < %{vers
 Obsoletes: %{name}-lang-pt_BR < %{version}-%{release}
 Obsoletes: %{name}-lang-pt_BR-utf8 < %{version}-%{release}
 
-# 5.18.0 tarball busted?, temporary 
-#BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: time
 # texi2dvi
@@ -155,7 +153,7 @@ Maxima compiled with Common Lisp (clisp)
 %endif
 
 %if "x%{?_enable_cmucl:1}" == "x1"
-%define _with_cmucl_runtime=--with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp
+%define _with_cmucl_runtime --with-cmucl-runtime=%{_prefix}/lib/cmucl/bin/lisp
 %package runtime-cmucl
 Summary: Maxima compiled with CMUCL
 Group:	 Applications/Engineering 
@@ -433,6 +431,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
+- maxima-5.20.1 (#547012)
+
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.0-1
+- maxima-5.20.0
+
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-3
+- rebuild (sbcl)
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-2
+- rebuild (cmucl)
+
 * Sun Aug 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-1
 - maxima-5.19.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/F-12/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	30 Aug 2009 20:04:58 -0000	1.31
+++ sources	21 Dec 2009 19:41:35 -0000	1.32
@@ -1,5 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-5b23dcfccad10988e344a839a0fbbe2b  maxima-5.19.1.tar.gz
-c75eec2586f5be18e02978e70fac0b07  maxima-5.19.2.tar.gz
+cec78b96cc453e470871063fc16cd52f  maxima-5.20.1.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 21 19:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:41:52 +0000
Subject: [pkgdb] shared-color-targets was added for rhughes
Message-ID: <20091221194152.B5D8F10F8B9@bastion.fedoraproject.org>

kevin has added Package shared-color-targets with summary shared-color-targets contains target files for popular scanner calibration targets
kevin has approved Package shared-color-targets
kevin has added a Fedora devel branch for shared-color-targets with an owner of rhughes
kevin has approved shared-color-targets in Fedora devel
kevin has approved Package shared-color-targets
kevin has set commit to Approved for 107427 on shared-color-targets (Fedora devel)
kevin has set checkout to Approved for 107427 on shared-color-targets (Fedora devel)
kevin has set build to Approved for 107427 on shared-color-targets (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-color-targets



From pkgdb at fedoraproject.org  Mon Dec 21 19:41:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:41:53 +0000
Subject: [pkgdb] shared-color-targets summary updated by kevin
Message-ID: <20091221194153.BD1B210F8B9@bastion.fedoraproject.org>

kevin set package shared-color-targets summary to shared-color-targets contains target files for popular scanner calibration targets

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-color-targets



From pkgdb at fedoraproject.org  Mon Dec 21 19:41:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:41:53 +0000
Subject: [pkgdb] shared-color-targets (Fedora, 12) updated by kevin
Message-ID: <20091221194153.C810810F8BD@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for shared-color-targets
kevin has set commit to Approved for 107427 on shared-color-targets (Fedora 12)
kevin has set checkout to Approved for 107427 on shared-color-targets (Fedora 12)
kevin has set build to Approved for 107427 on shared-color-targets (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shared-color-targets



From kevin at fedoraproject.org  Mon Dec 21 19:42:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:42:02 +0000 (UTC)
Subject: rpms/shared-color-targets - New directory
Message-ID: <20091221194202.16E0C11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-color-targets
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd16967/rpms/shared-color-targets

Log Message:
Directory /cvs/pkgs/rpms/shared-color-targets added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:42:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:42:02 +0000 (UTC)
Subject: rpms/shared-color-targets/devel - New directory
Message-ID: <20091221194202.2E86211C02C9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-color-targets/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd16967/rpms/shared-color-targets/devel

Log Message:
Directory /cvs/pkgs/rpms/shared-color-targets/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:42:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:42:09 +0000 (UTC)
Subject: rpms/shared-color-targets Makefile,NONE,1.1
Message-ID: <20091221194209.910E311C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-color-targets
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd16967/rpms/shared-color-targets

Added Files:
	Makefile 
Log Message:
Setup of module shared-color-targets


--- NEW FILE Makefile ---
# Top level Makefile for module shared-color-targets
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:42:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:42:09 +0000 (UTC)
Subject: rpms/shared-color-targets/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091221194209.D9D0A11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shared-color-targets/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd16967/rpms/shared-color-targets/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shared-color-targets


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shared-color-targets
# $Id: Makefile,v 1.1 2009/12/21 19:42:09 kevin Exp $
NAME := shared-color-targets
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rdieter at fedoraproject.org  Mon Dec 21 19:42:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:42:44 +0000 (UTC)
Subject: rpms/maxima/F-11 .cvsignore, 1.31, 1.32 maxima.spec, 1.130,
	1.131 sources, 1.29, 1.30
Message-ID: <20091221194244.C4D6911C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17210

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
- maxima-5.20.1 (#547012)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	14 Nov 2009 04:30:48 -0000	1.31
+++ .cvsignore	21 Dec 2009 19:42:44 -0000	1.32
@@ -2,5 +2,4 @@ clog
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.19.1.tar.gz
-maxima-5.19.2.tar.gz
+maxima-5.20.1.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/F-11/maxima.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- maxima.spec	14 Nov 2009 04:30:48 -0000	1.130
+++ maxima.spec	21 Dec 2009 19:42:44 -0000	1.131
@@ -1,7 +1,7 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.19.2
+Version: 5.20.1
 
 Release: 1%{?dist} 
 License: GPLv2
@@ -91,8 +91,6 @@ Obsoletes: %{name}-lang-pt-utf8 < %{vers
 Obsoletes: %{name}-lang-pt_BR < %{version}-%{release}
 Obsoletes: %{name}-lang-pt_BR-utf8 < %{version}-%{release}
 
-# 5.18.0 tarball busted?, temporary 
-#BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: time
 # texi2dvi
@@ -155,7 +153,7 @@ Maxima compiled with Common Lisp (clisp)
 %endif
 
 %if "x%{?_enable_cmucl:1}" == "x1"
-%define _with_cmucl_runtime=--with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp
+%define _with_cmucl_runtime --with-cmucl-runtime=%{_prefix}/lib/cmucl/bin/lisp
 %package runtime-cmucl
 Summary: Maxima compiled with CMUCL
 Group:	 Applications/Engineering 
@@ -433,6 +431,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
+- maxima-5.20.1 (#547012)
+
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.0-1
+- maxima-5.20.0
+
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-3
+- rebuild (sbcl)
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-2
+- rebuild (cmucl)
+
 * Sun Aug 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-1
 - maxima-5.19.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	14 Nov 2009 04:30:48 -0000	1.29
+++ sources	21 Dec 2009 19:42:44 -0000	1.30
@@ -1,5 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-5b23dcfccad10988e344a839a0fbbe2b  maxima-5.19.1.tar.gz
-c75eec2586f5be18e02978e70fac0b07  maxima-5.19.2.tar.gz
+cec78b96cc453e470871063fc16cd52f  maxima-5.20.1.tar.gz



From rdieter at fedoraproject.org  Mon Dec 21 19:43:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:43:34 +0000 (UTC)
Subject: rpms/maxima/EL-5 .cvsignore, 1.17, 1.18 maxima.spec, 1.55,
	1.56 sources, 1.15, 1.16
Message-ID: <20091221194334.5F1B011C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17490

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
- maxima-5.20.1 (#547012)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	30 Jul 2009 18:10:29 -0000	1.17
+++ .cvsignore	21 Dec 2009 19:43:34 -0000	1.18
@@ -2,4 +2,4 @@ clog
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.18.1.tar.gz
+maxima-5.20.1.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-5/maxima.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- maxima.spec	30 Jul 2009 18:10:29 -0000	1.55
+++ maxima.spec	21 Dec 2009 19:43:34 -0000	1.56
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.18.1
+Version: 5.20.1
 
-Release: 6%{?dist} 
+Release: 1%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -91,8 +91,6 @@ Obsoletes: %{name}-lang-pt-utf8 < %{vers
 Obsoletes: %{name}-lang-pt_BR < %{version}-%{release}
 Obsoletes: %{name}-lang-pt_BR-utf8 < %{version}-%{release}
 
-# 5.18.0 tarball busted?, temporary 
-#BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: time
 # texi2dvi
@@ -155,7 +153,7 @@ Maxima compiled with Common Lisp (clisp)
 %endif
 
 %if "x%{?_enable_cmucl:1}" == "x1"
-%define _with_cmucl_runtime=--with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp
+%define _with_cmucl_runtime --with-cmucl-runtime=%{_prefix}/lib/cmucl/bin/lisp
 %package runtime-cmucl
 Summary: Maxima compiled with CMUCL
 Group:	 Applications/Engineering 
@@ -187,7 +185,7 @@ Group:   Applications/Engineering
 BuildRequires: sbcl
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
-%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
+%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2 | cut -d- -f1)
 %if "x%{?sbcl_ver}" != "x%{nil}" 
 Requires: sbcl = %{sbcl_ver}
 %endif
@@ -299,12 +297,16 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post gui
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun gui
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans gui
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then
@@ -355,7 +357,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/misc/ doc/implementation/
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
-%doc macref.pdf
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
 %dir %{_datadir}/maxima/%{maxima_ver}
@@ -430,6 +431,31 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
+- maxima-5.20.1 (#547012)
+
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.0-1
+- maxima-5.20.0
+
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-3
+- rebuild (sbcl)
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-2
+- rebuild (cmucl)
+
+* Sun Aug 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-1
+- maxima-5.19.2
+
+* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.1-1
+- maxima-5.19.1
+- -gui: optimize scriptlets
+
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.0-2
+- safer evaluation of %%sbcl_ver macro
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.0-1
+- maxima-5.19.0
+
 * Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.1-6
 - rebuild (sbcl)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	30 Jul 2009 18:10:29 -0000	1.15
+++ sources	21 Dec 2009 19:43:34 -0000	1.16
@@ -1,4 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-8be7388ad31b975335623b390bc2516e  maxima-5.18.1.tar.gz
+cec78b96cc453e470871063fc16cd52f  maxima-5.20.1.tar.gz



From nalin at fedoraproject.org  Mon Dec 21 19:43:57 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 21 Dec 2009 19:43:57 +0000 (UTC)
Subject: rpms/krb5/F-12 krb5-1.7-spnego-deleg.patch, NONE,
	1.1 krb5-1.7-buildconf.patch, 1.1, 1.2 krb5-1.7-pam.patch, 1.3,
	1.4 krb5-1.7-selinux-label.patch, 1.5, 1.6 krb5.spec, 1.214, 1.215
Message-ID: <20091221194357.EF66911C00E7@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17333

Modified Files:
	krb5-1.7-buildconf.patch krb5-1.7-pam.patch 
	krb5-1.7-selinux-label.patch krb5.spec 
Added Files:
	krb5-1.7-spnego-deleg.patch 
Log Message:
- resync with development branch:
  - refresh patch for #542868 from trunk
  - move man pages that live in the -libs subpackage into the regular
    %%{_mandir} tree where they'll still be found if that package is the
    only one installed (#529319)
  - and put it back in
  - back that last change out
  - try to make gss_krb5_copy_ccache() work correctly for spnego (#542868)
  - make krb5-config suppress CFLAGS output when called with --libs (#544391)
  - ksu: move account management checks to before we drop privileges, like
    su does (#540769)
  - selinux: set the user part of file creation contexts to match the current
    context instead of what we looked up
  - configure with --enable-dns-for-realm instead of --enable-dns, which isn't
    recognized any more
  - move /etc/pam.d/ksu from krb5-workstation-servers to krb5-workstation,
    where it's actually needed (#538703)
  - add some conditional logic to simplify building on older Fedora releases
  - don't forget the README


krb5-1.7-spnego-deleg.patch:
 gssapiP_spnego.h |    9 +++++++++
 spnego_mech.c    |   17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE krb5-1.7-spnego-deleg.patch ---
Punt a set_cred_option() call down to the mechanism for the first
credential that we have whose mechanism implements a set_cred_option()
method.  It's not the complete set of changes from 1.7 to trunk, but
it should be enough to make gss_krb5_copy_ccache() work.  RT#6594

Index: src/lib/gssapi/spnego/gssapiP_spnego.h
===================================================================
--- src/lib/gssapi/spnego/gssapiP_spnego.h	(revision 23481)
+++ src/lib/gssapi/spnego/gssapiP_spnego.h	(revision 23482)
@@ -352,6 +352,15 @@
 );
 
 OM_uint32
+spnego_gss_set_cred_option
+(
+	OM_uint32 *minor_status,
+	gss_cred_id_t cred_handle,
+	const gss_OID desired_object,
+	const gss_buffer_t value
+);
+
+OM_uint32
 spnego_gss_set_sec_context_option
 (
 	OM_uint32 *minor_status,
Index: src/lib/gssapi/spnego/spnego_mech.c
===================================================================
--- src/lib/gssapi/spnego/spnego_mech.c	
+++ src/lib/gssapi/spnego/spnego_mech.c	(revision 23482)
@@ -250,7 +250,7 @@
  	spnego_gss_inquire_sec_context_by_oid, /* gss_inquire_sec_context_by_oid */
  	NULL,				/* gss_inquire_cred_by_oid */
  	spnego_gss_set_sec_context_option, /* gss_set_sec_context_option */
- 	NULL,				/* gssspi_set_cred_option */
+	spnego_gss_set_cred_option,	/* gssspi_set_cred_option */
  	NULL,				/* gssspi_mech_invoke */
 	spnego_gss_wrap_aead,
 	spnego_gss_unwrap_aead,
@@ -2187,6 +2187,21 @@
 }
 
 OM_uint32
+spnego_gss_set_cred_option(
+		OM_uint32 *minor_status,
+		gss_cred_id_t cred_handle,
+		const gss_OID desired_object,
+		const gss_buffer_t value)
+{
+	OM_uint32 ret;
+	ret = gssspi_set_cred_option(minor_status,
+				     cred_handle,
+				     desired_object,
+				     value);
+	return (ret);
+}
+
+OM_uint32
 spnego_gss_set_sec_context_option(
 		OM_uint32 *minor_status,
 		gss_ctx_id_t *context_handle,

krb5-1.7-buildconf.patch:
 config/shlib.conf |    2 ++
 krb5-config.in    |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: krb5-1.7-buildconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-12/krb5-1.7-buildconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- krb5-1.7-buildconf.patch	4 Jun 2009 19:09:04 -0000	1.1
+++ krb5-1.7-buildconf.patch	21 Dec 2009 19:43:57 -0000	1.2
@@ -1,6 +1,7 @@
-Build binaries in this package as PIEs, install shared libraries with the
-execute bit set on them, and prune out the -L/usr/lib* and PIE flags where they
-might leak out and affect apps which want to link with the libraries.
+Build binaries in this package as PIEs and install shared libraries with the
+execute bit set on them.  Prune out the -L/usr/lib*, PIE flags, and CFLAGS
+where they might leak out and affect apps which just want to link with the
+libraries (RT#TBD).
 
 diff -up krb5-1.7/src/config/shlib.conf krb5-1.7/src/config/shlib.conf
 --- krb5-1.7/src/config/shlib.conf	2008-12-08 17:33:07.000000000 -0500
@@ -17,9 +18,12 @@ diff -up krb5-1.7/src/config/shlib.conf 
 diff -up krb5-1.7/src/krb5-config.in krb5-1.7/src/krb5-config.in
 --- krb5-1.7/src/krb5-config.in	2009-06-04 14:01:28.000000000 -0400
 +++ krb5-1.7/src/krb5-config.in	2009-06-04 14:01:28.000000000 -0400
-@@ -189,6 +189,11 @@ if test -n "$do_libs"; then
+@@ -187,8 +187,13 @@ if test -n "$do_libs"; then
+ 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+ 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
  	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
+-	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
++	    -e 's#\$(CFLAGS)##'`
  
 +    if test `dirname $libdir` = /usr ; then
 +        lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##" -e "s#$RPATH_FLAG$libdir##"`

krb5-1.7-pam.patch:
 aclocal.m4                   |   83 ++++++++
 appl/bsd/Makefile.in         |   11 -
 appl/bsd/configure.in        |    1 
 appl/bsd/krshd.c             |   64 +++++-
 appl/bsd/login.c             |   61 ++++++
 appl/bsd/pam.c               |  433 +++++++++++++++++++++++++++++++++++++++++++
 appl/bsd/pam.h               |   65 ++++++
 appl/gssftp/configure.in     |    1 
 appl/gssftp/ftpd/Makefile.in |    8 
 appl/gssftp/ftpd/ftpd.c      |   72 ++++++-
 clients/ksu/Makefile.in      |    7 
 clients/ksu/main.c           |   75 +++++++
 config/pre.in                |    1 
 configure.in                 |    2 
 14 files changed, 862 insertions(+), 22 deletions(-)

Index: krb5-1.7-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-12/krb5-1.7-pam.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- krb5-1.7-pam.patch	26 Jun 2009 22:08:03 -0000	1.3
+++ krb5-1.7-pam.patch	21 Dec 2009 19:43:57 -0000	1.4
@@ -1092,45 +1092,61 @@ diff -up krb5-1.7/src/clients/ksu/main.c
  #include "ksu.h"
  #include "adm_proto.h"
  #include <sys/types.h>
-@@ -32,6 +33,11 @@
+@@ -32,6 +33,10 @@
  #include <signal.h>
  #include <grp.h>
  
 +#ifdef USE_PAM
 +#include "../../appl/bsd/pam.h"
-+int force_fork = 0;
 +#endif
 +
  /* globals */
  char * prog_name;
  int auth_debug =0;     
-@@ -791,7 +797,24 @@ main (argc, argv)
- 	fprintf(stderr, "program to be execed %s\n",params[0]);
-     }
-     
--    if( keep_target_cache ) {
+@@ -39,6 +44,7 @@
+ char k5users_path[MAXPATHLEN];
+ char * gb_err = NULL;
+ int quiet = 0;
++int force_fork = 0;
+ /***********/
+ 
+ #define _DEF_CSH "/bin/csh" 
+@@ -585,6 +591,25 @@
+ 	       prog_name,target_user,client_name,
+ 	       source_user,ontty());
+ 	
 +#ifdef USE_PAM
-+    if (appl_pam_enabled(ksu_context, "ksu")) {
-+	if (appl_pam_acct_mgmt(KSU_PAM_SERVICE, 1, target_user, NULL,
-+			       NULL, source_user, ttyname(STDERR_FILENO)) != 0) {
-+	    fprintf(stderr, "Access denied for %s.\n", target_user);
-+	    sweep_up(ksu_context, cc_target);
-+	    exit(1);
-+	}
-+	if (appl_pam_requires_chauthtok()) {
-+	    fprintf(stderr, "Password change required for %s.\n", target_user);
-+	    sweep_up(ksu_context, cc_target);
-+	    exit(1);
++	if (appl_pam_enabled(ksu_context, "ksu")) {
++	    if (appl_pam_acct_mgmt(KSU_PAM_SERVICE, 1, target_user, NULL,
++				   NULL, source_user,
++				   ttyname(STDERR_FILENO)) != 0) {
++		fprintf(stderr, "Access denied for %s.\n", target_user);
++		sweep_up(ksu_context, cc_target);
++		exit(1);
++	    }
++	    if (appl_pam_requires_chauthtok()) {
++		fprintf(stderr, "Password change required for %s.\n",
++			target_user);
++		sweep_up(ksu_context, cc_target);
++		exit(1);
++	    }
++	    force_fork++;
 +	}
-+	force_fork++;
-+    }
 +#endif
 +
+ 	/* Run authorization as target.*/
+ 	if (krb5_seteuid(target_uid)) {
+ 	    com_err(prog_name, errno, "while switching to target for authorization check");
+@@ -791,7 +816,7 @@
+ 	fprintf(stderr, "program to be execed %s\n",params[0]);
+     }
+     
+-    if( keep_target_cache ) {
 +    if( keep_target_cache && !force_fork ) {
  	execv(params[0], params);
  	com_err(prog_name, errno, "while trying to execv %s",
  		params[0]);
-@@ -799,6 +822,33 @@ main (argc, argv)
+@@ -799,6 +824,33 @@
  	exit(1);
      }else{
  	statusp = 1;
@@ -1164,7 +1180,7 @@ diff -up krb5-1.7/src/clients/ksu/main.c
  	switch ((child_pid = fork())) {
  	default:
  	    if (auth_debug){
-@@ -822,15 +872,34 @@ main (argc, argv)
+@@ -822,15 +874,34 @@
  	    if (ret_pid == -1) {
  	    	com_err(prog_name, errno, "while calling waitpid");
  	    }

krb5-1.7-selinux-label.patch:
 aclocal.m4                                      |   51 +++
 appl/bsd/configure.in                           |    1 
 appl/gssftp/configure.in                        |    1 
 appl/telnet/configure.in                        |    1 
 config/pre.in                                   |    3 
 configure.in                                    |    2 
 include/autoconf.h.in                           |   13 
 include/k5-int.h                                |    1 
 include/k5-label.h                              |   27 +
 include/krb5/krb5.hin                           |    6 
 kadmin/dbutil/dump.c                            |    2 
 krb5-config.in                                  |    3 
 lib/kadm5/logger.c                              |    4 
 lib/krb5/keytab/kt_file.c                       |    4 
 plugins/kdb/db2/adb_openclose.c                 |    2 
 plugins/kdb/db2/kdb_db2.c                       |    4 
 plugins/kdb/db2/libdb2/btree/bt_open.c          |    3 
 plugins/kdb/db2/libdb2/hash/hash.c              |    3 
 plugins/kdb/db2/libdb2/recno/rec_open.c         |    3 
 plugins/kdb/db2/libdb2/test/Makefile.in         |    3 
 plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c |   12 
 slave/kpropd.c                                  |    2 
 util/profile/prof_file.c                        |    3 
 util/support/Makefile.in                        |    3 
 util/support/selinux.c                          |  346 ++++++++++++++++++++++++
 25 files changed, 480 insertions(+), 23 deletions(-)

Index: krb5-1.7-selinux-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-12/krb5-1.7-selinux-label.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- krb5-1.7-selinux-label.patch	6 Jul 2009 22:56:11 -0000	1.5
+++ krb5-1.7-selinux-label.patch	21 Dec 2009 19:43:57 -0000	1.6
@@ -42,7 +42,7 @@ diff -up krb5-1.7/src/aclocal.m4 krb5-1.
  KRB5_LIB_PARAMS
  KRB5_AC_INITFINI
  KRB5_AC_ENABLE_THREADS
-@@ -1876,3 +1877,51 @@ AC_SUBST(PAM_LIBS)
+@@ -1876,3 +1877,53 @@ AC_SUBST(PAM_LIBS)
  AC_SUBST(manlibexecdir)
  AC_CONFIG_FILES($1)
  ])
@@ -56,7 +56,7 @@ diff -up krb5-1.7/src/aclocal.m4 krb5-1.
 +if test "$withselinux" != no ; then
 +       AC_MSG_RESULT([checking for libselinux...])
 +       SELINUX_LIBS=
-+       AC_CHECK_HEADERS(selinux/selinux.h)
++       AC_CHECK_HEADERS(selinux/selinux.h selinux/label.h)
 +       if test "x$ac_cv_header_selinux_selinux_h" != xyes ; then
 +               if test "$withselinux" = auto ; then
 +                       AC_MSG_RESULT([Unable to locate selinux/selinux.h.])
@@ -68,11 +68,13 @@ diff -up krb5-1.7/src/aclocal.m4 krb5-1.
 +
 +       LIBS=
 +       unset ac_cv_func_setfscreatecon
-+       AC_CHECK_FUNCS(setfscreatecon)
++       AC_CHECK_FUNCS(setfscreatecon selabel_open)
 +       if test "x$ac_cv_func_setfscreatecon" = xno ; then
 +               AC_CHECK_LIB(selinux,setfscreatecon)
++               AC_CHECK_LIB(selinux,selabel_open)
 +               unset ac_cv_func_setfscreatecon
-+               AC_CHECK_FUNCS(setfscreatecon)
++               unset ac_cv_func_selabel_open
++               AC_CHECK_FUNCS(setfscreatecon selabel_open)
 +               if test "x$ac_cv_func_setfscreatecon" = xyes ; then
 +                       SELINUX_LIBS="$LIBS"
 +               else
@@ -162,17 +164,20 @@ diff -up krb5-1.7/src/configure.in krb5-
 diff -up krb5-1.7/src/include/autoconf.h.in krb5-1.7/src/include/autoconf.h.in
 --- krb5-1.7/src/include/autoconf.h.in	2009-06-01 20:58:35.000000000 -0400
 +++ krb5-1.7/src/include/autoconf.h.in	2009-06-04 13:47:20.000000000 -0400
-@@ -389,6 +389,9 @@
+@@ -389,6 +389,12 @@
  /* Define to 1 if you have the `sched_yield' function. */
  #undef HAVE_SCHED_YIELD
  
++/* Define to 1 if you have the <selinux/label.h> header file. */
++#undef HAVE_SELINUX_LABEL_H
++
 +/* Define to 1 if you have the <selinux/selinux.h> header file. */
 +#undef HAVE_SELINUX_SELINUX_H
 +
  /* Define to 1 if you have the <semaphore.h> header file. */
  #undef HAVE_SEMAPHORE_H
  
-@@ -401,6 +404,9 @@
+@@ -401,6 +407,9 @@
  /* Define to 1 if you have the `setegid' function. */
  #undef HAVE_SETEGID
  
@@ -182,7 +187,7 @@ diff -up krb5-1.7/src/include/autoconf.h
  /* Define to 1 if you have the `setenv' function. */
  #undef HAVE_SETENV
  
-@@ -768,6 +774,10 @@
+@@ -768,6 +777,10 @@
  /* Define if the KDC should use a replay cache */
  #undef USE_RCACHE
  
@@ -536,7 +541,7 @@ diff -up krb5-1.7/src/util/support/Makef
 diff -up /dev/null krb5-1.7/src/util/support/selinux.c
 --- /dev/null	2009-06-04 10:34:55.169007373 -0400
 +++ krb5-1.7/src/util/support/selinux.c	2009-06-04 13:47:20.000000000 -0400
-@@ -0,0 +1,300 @@
+@@ -0,0 +1,346 @@
 +/*
 + * Copyright 2007,2008,2009 Red Hat, Inc.  All Rights Reserved.
 + *
@@ -588,7 +593,10 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +#include <string.h>
 +#include <unistd.h>
 +#include <selinux/selinux.h>
++#include <selinux/context.h>
++#ifdef HAVE_SELINUX_LABEL_H
 +#include <selinux/label.h>
++#endif
 +
 +/* #define DEBUG 1 */
 +
@@ -606,9 +614,12 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +static security_context_t
 +push_fscreatecon(const char *pathname, mode_t mode)
 +{
-+	security_context_t previous, next;
++	security_context_t previous, configuredsc, currentsc, derivedsc;
++	context_t current, derived;
++	const char *fullpath, *currentuser;
++#ifdef HAVE_SELINUX_LABEL_H
 +	struct selabel_handle *ctx;
-+	const char *fullpath;
++#endif
 +
 +	previous = NULL;
 +	if (is_selinux_enabled()) {
@@ -641,16 +652,17 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +			} else {
 +				fullpath = pathname;
 +			}
-+			next = NULL;
 +#ifdef DEBUG
 +			if (isatty(fileno(stderr))) {
 +				fprintf(stderr, "Looking up context for "
 +					"\"%s\"(%05o).\n", fullpath, mode);
 +			}
 +#endif
++			configuredsc = NULL;
++#ifdef HAVE_SELINUX_LABEL_H
 +			ctx = selabel_open(SELABEL_CTX_FILE, NULL, 0);
 +			if (ctx != NULL) {
-+				if (selabel_lookup(ctx, &next,
++				if (selabel_lookup(ctx, &configuredsc,
 +						   fullpath, mode) != 0) {
 +					selabel_close(ctx);
 +					free(genpath);
@@ -661,21 +673,60 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +				}
 +				selabel_close(ctx);
 +			}
++#else
++			if (matchpathcon(fullpath, mode, &configuredsc) != 0) {
++				free(genpath);
++				if (previous != NULL) {
++					freecon(previous);
++				}
++				return NULL;
++			}
++#endif
 +			free(genpath);
++			if (configuredsc == NULL) {
++				if (previous != NULL) {
++					freecon(previous);
++				}
++				return NULL;
++			}
++			currentsc = NULL;
++			getcon(&currentsc);
++			if (currentsc != NULL) {
++				derived = context_new(configuredsc);
++				if (derived != NULL) {
++					current = context_new(currentsc);
++					if (current != NULL) {
++						currentuser = context_user_get(current);
++						if (currentuser != NULL) {
++							if (context_user_set(derived,
++									     currentuser) == 0) {
++								derivedsc = context_str(derived);
++								if (derivedsc != NULL) {
++									freecon(configuredsc);
++									configuredsc = strdup(derivedsc);
++								}
++							}
++						}
++						context_free(current);
++					}
++					context_free(derived);
++				}
++				freecon(currentsc);
++			}
 +#ifdef DEBUG
 +			if (isatty(fileno(stderr))) {
 +				fprintf(stderr, "Setting file creation context "
-+					"to \"%s\".\n", next);
++					"to \"%s\".\n", configured);
 +			}
 +#endif
-+			if (setfscreatecon(next) != 0) {
-+				freecon(next);
++			if (setfscreatecon(configuredsc) != 0) {
++				freecon(configuredsc);
 +				if (previous != NULL) {
 +					freecon(previous);
 +				}
 +				return NULL;
 +			}
-+			freecon(next);
++			freecon(configuredsc);
 +#ifdef DEBUG
 +		} else {
 +			if (isatty(fileno(stderr))) {


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-12/krb5.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- krb5.spec	20 Nov 2009 16:09:34 -0000	1.214
+++ krb5.spec	21 Dec 2009 19:43:57 -0000	1.215
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 10%{?dist}
+Release: 14%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -79,13 +79,16 @@ Patch87: krb5-1.7-errs.patch
 Patch88: krb5-1.7-sizeof.patch
 Patch89: krb5-1.7-largefile.patch
 Patch90: krb5-1.7-openssl-1.0.patch
+Patch91: krb5-1.7-spnego-deleg.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, bison, flex, gawk
+%if 0%{?fedora} >= 12
 BuildRequires: libcom_err-devel, libss-devel
+%endif
 BuildRequires: gzip, ncurses-devel, rsh, texinfo, texinfo-tex, tar
 BuildRequires: tetex-latex
 BuildRequires: keyutils-libs-devel
@@ -107,7 +110,10 @@ practice of cleartext passwords.
 %package devel
 Summary: Development files needed to compile Kerberos 5 programs
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}, libcom_err-devel
+Requires: %{name}-libs = %{version}-%{release}
+%if 0%{?fedora} >= 12
+Requires: libcom_err-devel
+%endif
 Requires: keyutils-libs-devel, libselinux-devel
 
 %description devel
@@ -210,11 +216,42 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Mon Dec 21 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-14
+- refresh patch for #542868 from trunk
+
+* Thu Dec 10 2009 Nalin Dahyabhai <nalin at redhat.com>
+- move man pages that live in the -libs subpackage into the regular
+  %%{_mandir} tree where they'll still be found if that package is the
+  only one installed (#529319)
+
+* Wed Dec  9 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-13
+- and put it back in
+
+* Tue Dec  8 2009 Nalin Dahyabhai <nalin at redhat.com>
+- back that last change out
+
+* Tue Dec  8 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-12
+- try to make gss_krb5_copy_ccache() work correctly for spnego (#542868)
+
+* Fri Dec  4 2009 Nalin Dahyabhai <nalin at redhat.com>
+- make krb5-config suppress CFLAGS output when called with --libs (#544391)
+
+* Thu Dec  3 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-11
+- ksu: move account management checks to before we drop privileges, like
+  su does (#540769)
+- selinux: set the user part of file creation contexts to match the current
+  context instead of what we looked up
+- configure with --enable-dns-for-realm instead of --enable-dns, which isn't
+  recognized any more
+
 * Fri Nov 20 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-10
 - move /etc/pam.d/ksu from krb5-workstation-servers to krb5-workstation,
   where it's actually needed (#538703)
 
-* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-9
+* Fri Oct 23 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-9
+- add some conditional logic to simplify building on older Fedora releases
+
+* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com>
 - don't forget the README
 
 * Mon Sep 14 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-8
@@ -1482,6 +1519,7 @@ popd
 %patch88 -p1 -b .sizeof
 %patch89 -p1 -b .largefile
 %patch90 -p0 -b .openssl-1.0
+%patch91 -p0 -b .spnego-deleg
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -1541,7 +1579,11 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`"
 	CC="%{__cc}" \
 	CFLAGS="$CFLAGS" \
 	CPPFLAGS="$CPPFLAGS" \
+%if 0%{?fedora} >= 7
 	SS_LIB="-lss -ltinfo" \
+%else
+	SS_LIB="-lss -lncurses" \
+%endif
 	--enable-shared \
 	--bindir=%{krb5prefix}/bin \
 	--mandir=%{krb5prefix}/man \
@@ -1553,7 +1595,7 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`"
 	--with-system-ss \
 	--with-netlib=-lresolv \
 	--without-tcl \
-	--enable-dns \
+	--enable-dns-for-realm \
 %if %{WITH_LDAP}
 %if %{WITH_DIRSRV}
 	--with-dirsrv \
@@ -1656,6 +1698,13 @@ for library in libgssapi_krb5 libgssrpc 
 	popd
 done
 
+# Move man pages which will be in the -libs subpackage into %%{_mandir}'s tree.
+for man in man1/tmac.doc man1/kerberos.1 man5/.k5login.5 man5/krb5.conf.5 ; do
+	mkdir -p $RPM_BUILD_ROOT/%{_mandir}/${man%%/*}
+	mv $RPM_BUILD_ROOT/%{krb5prefix}/man/${man} \
+	   $RPM_BUILD_ROOT/%{_mandir}/${man%%/*}/
+done
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -1953,14 +2002,10 @@ exit 0
 %doc README
 %docdir %{krb5prefix}/man
 %verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf
-%dir %{krb5prefix}
-%dir %{krb5prefix}/man
-%dir %{krb5prefix}/man/man1
-%dir %{krb5prefix}/man/man5
-%{krb5prefix}/man/man1/tmac.doc*
-%{krb5prefix}/man/man1/kerberos.1*
-%{krb5prefix}/man/man5/.k5login.5*
-%{krb5prefix}/man/man5/krb5.conf.5*
+/%{_mandir}/man1/tmac.doc*
+/%{_mandir}/man1/kerberos.1*
+/%{_mandir}/man5/.k5login.5*
+/%{_mandir}/man5/krb5.conf.5*
 /%{_lib}/libgssapi_krb5.so.*
 /%{_lib}/libgssrpc.so.*
 /%{_lib}/libk5crypto.so.*



From pkgdb at fedoraproject.org  Mon Dec 21 19:43:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:43:58 +0000
Subject: [pkgdb] mediawiki-LdapAccount was added for stahnma
Message-ID: <20091221194358.CA03510F8DD@bastion.fedoraproject.org>

kevin has added Package mediawiki-LdapAccount with summary Restrict mediawiki to using LDAP accounts only
kevin has approved Package mediawiki-LdapAccount
kevin has added a Fedora devel branch for mediawiki-LdapAccount with an owner of stahnma
kevin has approved mediawiki-LdapAccount in Fedora devel
kevin has approved Package mediawiki-LdapAccount
kevin has set commit to Approved for 107427 on mediawiki-LdapAccount (Fedora devel)
kevin has set checkout to Approved for 107427 on mediawiki-LdapAccount (Fedora devel)
kevin has set build to Approved for 107427 on mediawiki-LdapAccount (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-LdapAccount



From pkgdb at fedoraproject.org  Mon Dec 21 19:43:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:43:59 +0000
Subject: [pkgdb] mediawiki-LdapAccount (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221194359.ED58F10F8C1@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for mediawiki-LdapAccount
kevin has set commit to Approved for 107427 on mediawiki-LdapAccount (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on mediawiki-LdapAccount (Fedora EPEL 5)
kevin has set build to Approved for 107427 on mediawiki-LdapAccount (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-LdapAccount



From pkgdb at fedoraproject.org  Mon Dec 21 19:43:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:43:59 +0000
Subject: [pkgdb] mediawiki-LdapAccount summary updated by kevin
Message-ID: <20091221194359.DAD0F10F892@bastion.fedoraproject.org>

kevin set package mediawiki-LdapAccount summary to Restrict mediawiki to using LDAP accounts only

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-LdapAccount



From pkgdb at fedoraproject.org  Mon Dec 21 19:43:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:43:59 +0000
Subject: [pkgdb] mediawiki-LdapAccount (Fedora, 12) updated by kevin
Message-ID: <20091221194400.0208D10F8C6@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for mediawiki-LdapAccount
kevin has set commit to Approved for 107427 on mediawiki-LdapAccount (Fedora 12)
kevin has set checkout to Approved for 107427 on mediawiki-LdapAccount (Fedora 12)
kevin has set build to Approved for 107427 on mediawiki-LdapAccount (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-LdapAccount



From kevin at fedoraproject.org  Mon Dec 21 19:44:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:44:10 +0000 (UTC)
Subject: rpms/mediawiki-LdapAccount - New directory
Message-ID: <20091221194410.25BEC11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mediawiki-LdapAccount
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk17681/rpms/mediawiki-LdapAccount

Log Message:
Directory /cvs/pkgs/rpms/mediawiki-LdapAccount added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:44:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:44:10 +0000 (UTC)
Subject: rpms/mediawiki-LdapAccount/devel - New directory
Message-ID: <20091221194410.4E16711C02C8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mediawiki-LdapAccount/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk17681/rpms/mediawiki-LdapAccount/devel

Log Message:
Directory /cvs/pkgs/rpms/mediawiki-LdapAccount/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:44:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:44:18 +0000 (UTC)
Subject: rpms/mediawiki-LdapAccount Makefile,NONE,1.1
Message-ID: <20091221194418.2B84911C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mediawiki-LdapAccount
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk17681/rpms/mediawiki-LdapAccount

Added Files:
	Makefile 
Log Message:
Setup of module mediawiki-LdapAccount


--- NEW FILE Makefile ---
# Top level Makefile for module mediawiki-LdapAccount
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:44:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:44:18 +0000 (UTC)
Subject: rpms/mediawiki-LdapAccount/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221194418.8704E11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mediawiki-LdapAccount/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk17681/rpms/mediawiki-LdapAccount/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mediawiki-LdapAccount


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mediawiki-LdapAccount
# $Id: Makefile,v 1.1 2009/12/21 19:44:18 kevin Exp $
NAME := mediawiki-LdapAccount
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 19:44:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:44:49 +0000
Subject: [pkgdb] python-jabberbot was added for fab
Message-ID: <20091221194449.161C610F8B3@bastion.fedoraproject.org>

toshio has added Package python-jabberbot with summary A simple jabber (XMPP) bot framework
toshio has approved Package python-jabberbot
toshio has added a Fedora devel branch for python-jabberbot with an owner of fab
toshio has approved python-jabberbot in Fedora devel
toshio has approved Package python-jabberbot
toshio has set commit to Approved for 107427 on python-jabberbot (Fedora devel)
toshio has set checkout to Approved for 107427 on python-jabberbot (Fedora devel)
toshio has set build to Approved for 107427 on python-jabberbot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-jabberbot



From pkgdb at fedoraproject.org  Mon Dec 21 19:44:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:44:49 +0000
Subject: [pkgdb] python-jabberbot summary updated by toshio
Message-ID: <20091221194450.1C45B10F8B4@bastion.fedoraproject.org>

toshio set package python-jabberbot summary to A simple jabber (XMPP) bot framework

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-jabberbot



From pkgdb at fedoraproject.org  Mon Dec 21 19:44:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:44:49 +0000
Subject: [pkgdb] python-jabberbot (Fedora, 11) updated by toshio
Message-ID: <20091221194450.382F610F8C1@bastion.fedoraproject.org>

toshio added a Fedora 11 branch for python-jabberbot
toshio has set commit to Approved for 107427 on python-jabberbot (Fedora 11)
toshio has set checkout to Approved for 107427 on python-jabberbot (Fedora 11)
toshio has set build to Approved for 107427 on python-jabberbot (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-jabberbot



From pkgdb at fedoraproject.org  Mon Dec 21 19:44:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:44:49 +0000
Subject: [pkgdb] python-jabberbot (Fedora, 12) updated by toshio
Message-ID: <20091221194450.2EDEB10F8BE@bastion.fedoraproject.org>

toshio added a Fedora 12 branch for python-jabberbot
toshio has set commit to Approved for 107427 on python-jabberbot (Fedora 12)
toshio has set checkout to Approved for 107427 on python-jabberbot (Fedora 12)
toshio has set build to Approved for 107427 on python-jabberbot (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-jabberbot



From toshio at fedoraproject.org  Mon Dec 21 19:44:56 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 19:44:56 +0000 (UTC)
Subject: rpms/python-jabberbot/devel - New directory
Message-ID: <20091221194456.3CBE511C0296@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-jabberbot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsI18136/rpms/python-jabberbot/devel

Log Message:
Directory /cvs/pkgs/rpms/python-jabberbot/devel added to the repository




From toshio at fedoraproject.org  Mon Dec 21 19:44:56 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 19:44:56 +0000 (UTC)
Subject: rpms/python-jabberbot - New directory
Message-ID: <20091221194456.1267D11C00E7@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-jabberbot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsI18136/rpms/python-jabberbot

Log Message:
Directory /cvs/pkgs/rpms/python-jabberbot added to the repository




From toshio at fedoraproject.org  Mon Dec 21 19:45:03 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 19:45:03 +0000 (UTC)
Subject: rpms/python-jabberbot Makefile,NONE,1.1
Message-ID: <20091221194503.B176E11C00E7@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-jabberbot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsI18136/rpms/python-jabberbot

Added Files:
	Makefile 
Log Message:
Setup of module python-jabberbot


--- NEW FILE Makefile ---
# Top level Makefile for module python-jabberbot
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From toshio at fedoraproject.org  Mon Dec 21 19:45:03 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 21 Dec 2009 19:45:03 +0000 (UTC)
Subject: rpms/python-jabberbot/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221194503.E69F711C00E7@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-jabberbot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsI18136/rpms/python-jabberbot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-jabberbot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-jabberbot
# $Id: Makefile,v 1.1 2009/12/21 19:45:03 toshio Exp $
NAME := python-jabberbot
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:02 +0000
Subject: [pkgdb] perl-Pod-PseudoPod was added for gerd
Message-ID: <20091221194602.7041A10F894@bastion.fedoraproject.org>

kevin has added Package perl-Pod-PseudoPod with summary Framework for extending the POD tags for book manuscripts
kevin has approved Package perl-Pod-PseudoPod
kevin has added a Fedora devel branch for perl-Pod-PseudoPod with an owner of gerd
kevin has approved perl-Pod-PseudoPod in Fedora devel
kevin has approved Package perl-Pod-PseudoPod
kevin has set commit to Approved for 107427 on perl-Pod-PseudoPod (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Pod-PseudoPod (Fedora devel)
kevin has set build to Approved for 107427 on perl-Pod-PseudoPod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-PseudoPod



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:23 +0000
Subject: [pkgdb] perl-Pod-PseudoPod summary updated by kevin
Message-ID: <20091221194612.5EC4310F8B9@bastion.fedoraproject.org>

kevin set package perl-Pod-PseudoPod summary to Framework for extending the POD tags for book manuscripts

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-PseudoPod



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:23 +0000
Subject: [pkgdb] perl-Pod-PseudoPod (Fedora, 11) updated by kevin
Message-ID: <20091221194613.75C4810F8B4@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for perl-Pod-PseudoPod
kevin has set commit to Approved for 107427 on perl-Pod-PseudoPod (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Pod-PseudoPod (Fedora 11)
kevin has set build to Approved for 107427 on perl-Pod-PseudoPod (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-PseudoPod



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:23 +0000
Subject: [pkgdb] perl-Pod-PseudoPod (Fedora, 12) updated by kevin
Message-ID: <20091221194615.3FB4310F892@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for perl-Pod-PseudoPod
kevin has set commit to Approved for 107427 on perl-Pod-PseudoPod (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-Pod-PseudoPod (Fedora 12)
kevin has set build to Approved for 107427 on perl-Pod-PseudoPod (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-PseudoPod



From kevin at fedoraproject.org  Mon Dec 21 19:46:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:46:21 +0000 (UTC)
Subject: rpms/perl-Pod-PseudoPod - New directory
Message-ID: <20091221194621.111F711C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Pod-PseudoPod
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB18527/rpms/perl-Pod-PseudoPod

Log Message:
Directory /cvs/pkgs/rpms/perl-Pod-PseudoPod added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:46:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:46:21 +0000 (UTC)
Subject: rpms/perl-Pod-PseudoPod/devel - New directory
Message-ID: <20091221194621.2C61C11C02C9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Pod-PseudoPod/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB18527/rpms/perl-Pod-PseudoPod/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Pod-PseudoPod/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:46:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:46:28 +0000 (UTC)
Subject: rpms/perl-Pod-PseudoPod Makefile,NONE,1.1
Message-ID: <20091221194628.715A811C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Pod-PseudoPod
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB18527/rpms/perl-Pod-PseudoPod

Added Files:
	Makefile 
Log Message:
Setup of module perl-Pod-PseudoPod


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Pod-PseudoPod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:46:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:46:28 +0000 (UTC)
Subject: rpms/perl-Pod-PseudoPod/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221194628.99B3811C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Pod-PseudoPod/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB18527/rpms/perl-Pod-PseudoPod/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Pod-PseudoPod


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Pod-PseudoPod
# $Id: Makefile,v 1.1 2009/12/21 19:46:28 kevin Exp $
NAME := perl-Pod-PseudoPod
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:54 +0000
Subject: [pkgdb] rubygem-columnize was added for kanarip
Message-ID: <20091221194654.8377410F8BC@bastion.fedoraproject.org>

kevin has added Package rubygem-columnize with summary Sorts an array in column order
kevin has approved Package rubygem-columnize
kevin has added a Fedora devel branch for rubygem-columnize with an owner of kanarip
kevin has approved rubygem-columnize in Fedora devel
kevin has approved Package rubygem-columnize
kevin has set commit to Approved for 107427 on rubygem-columnize (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-columnize (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-columnize (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-columnize



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:55 +0000
Subject: [pkgdb] rubygem-columnize summary updated by kevin
Message-ID: <20091221194655.DD66210F8BF@bastion.fedoraproject.org>

kevin set package rubygem-columnize summary to Sorts an array in column order

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-columnize



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:55 +0000
Subject: [pkgdb] rubygem-columnize (Fedora, 11) updated by kevin
Message-ID: <20091221194655.E3CCF10F8C1@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for rubygem-columnize
kevin has set commit to Approved for 107427 on rubygem-columnize (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-columnize (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-columnize (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-columnize



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:55 +0000
Subject: [pkgdb] rubygem-columnize (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221194655.E9CED10F8C6@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for rubygem-columnize
kevin has set commit to Approved for 107427 on rubygem-columnize (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rubygem-columnize (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rubygem-columnize (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-columnize



From pkgdb at fedoraproject.org  Mon Dec 21 19:46:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:46:55 +0000
Subject: [pkgdb] rubygem-columnize (Fedora, 12) updated by kevin
Message-ID: <20091221194655.F2A6810F8CD@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for rubygem-columnize
kevin has set commit to Approved for 107427 on rubygem-columnize (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-columnize (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-columnize (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-columnize



From kevin at fedoraproject.org  Mon Dec 21 19:47:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:47:05 +0000 (UTC)
Subject: rpms/rubygem-columnize - New directory
Message-ID: <20091221194705.1381A11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-columnize
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18728/rpms/rubygem-columnize

Log Message:
Directory /cvs/pkgs/rpms/rubygem-columnize added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:47:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:47:05 +0000 (UTC)
Subject: rpms/rubygem-columnize/devel - New directory
Message-ID: <20091221194705.28DF911C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-columnize/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18728/rpms/rubygem-columnize/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-columnize/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:47:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:47:12 +0000 (UTC)
Subject: rpms/rubygem-columnize Makefile,NONE,1.1
Message-ID: <20091221194712.6D6C611C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-columnize
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18728/rpms/rubygem-columnize

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-columnize


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-columnize
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:47:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:47:12 +0000 (UTC)
Subject: rpms/rubygem-columnize/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221194712.97AE111C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-columnize/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18728/rpms/rubygem-columnize/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-columnize


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-columnize
# $Id: Makefile,v 1.1 2009/12/21 19:47:12 kevin Exp $
NAME := rubygem-columnize
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 19:47:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:47:36 +0000
Subject: [pkgdb] rubygem-ruby-net-ldap was added for kanarip
Message-ID: <20091221194736.A5BA610F8BC@bastion.fedoraproject.org>

kevin has added Package rubygem-ruby-net-ldap with summary A full-featured pure-Ruby LDAP client
kevin has approved Package rubygem-ruby-net-ldap
kevin has added a Fedora devel branch for rubygem-ruby-net-ldap with an owner of kanarip
kevin has approved rubygem-ruby-net-ldap in Fedora devel
kevin has approved Package rubygem-ruby-net-ldap
kevin has set commit to Approved for 107427 on rubygem-ruby-net-ldap (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-ruby-net-ldap (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-ruby-net-ldap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ruby-net-ldap



From pkgdb at fedoraproject.org  Mon Dec 21 19:47:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:47:38 +0000
Subject: [pkgdb] rubygem-ruby-net-ldap summary updated by kevin
Message-ID: <20091221194738.7B27810F8BC@bastion.fedoraproject.org>

kevin set package rubygem-ruby-net-ldap summary to A full-featured pure-Ruby LDAP client

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ruby-net-ldap



From pkgdb at fedoraproject.org  Mon Dec 21 19:47:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:47:38 +0000
Subject: [pkgdb] rubygem-ruby-net-ldap (Fedora, 12) updated by kevin
Message-ID: <20091221194738.A2D5B10F8CB@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for rubygem-ruby-net-ldap
kevin has set commit to Approved for 107427 on rubygem-ruby-net-ldap (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-ruby-net-ldap (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-ruby-net-ldap (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ruby-net-ldap



From pkgdb at fedoraproject.org  Mon Dec 21 19:47:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:47:38 +0000
Subject: [pkgdb] rubygem-ruby-net-ldap (Fedora, 11) updated by kevin
Message-ID: <20091221194738.8DFD110F8BF@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for rubygem-ruby-net-ldap
kevin has set commit to Approved for 107427 on rubygem-ruby-net-ldap (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-ruby-net-ldap (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-ruby-net-ldap (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ruby-net-ldap



From pkgdb at fedoraproject.org  Mon Dec 21 19:47:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:47:38 +0000
Subject: [pkgdb] rubygem-ruby-net-ldap (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221194738.96EAE10F8C2@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for rubygem-ruby-net-ldap
kevin has set commit to Approved for 107427 on rubygem-ruby-net-ldap (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rubygem-ruby-net-ldap (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rubygem-ruby-net-ldap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-ruby-net-ldap



From kevin at fedoraproject.org  Mon Dec 21 19:47:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:47:48 +0000 (UTC)
Subject: rpms/rubygem-ruby-net-ldap - New directory
Message-ID: <20091221194748.19E3F11C0382@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby-net-ldap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf19217/rpms/rubygem-ruby-net-ldap

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ruby-net-ldap added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:47:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:47:48 +0000 (UTC)
Subject: rpms/rubygem-ruby-net-ldap/devel - New directory
Message-ID: <20091221194748.2A60611C0435@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby-net-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf19217/rpms/rubygem-ruby-net-ldap/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ruby-net-ldap/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:47:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:47:55 +0000 (UTC)
Subject: rpms/rubygem-ruby-net-ldap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221194755.B2ABD11C0382@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby-net-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf19217/rpms/rubygem-ruby-net-ldap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-ruby-net-ldap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-ruby-net-ldap
# $Id: Makefile,v 1.1 2009/12/21 19:47:55 kevin Exp $
NAME := rubygem-ruby-net-ldap
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Mon Dec 21 19:47:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:47:55 +0000 (UTC)
Subject: rpms/rubygem-ruby-net-ldap Makefile,NONE,1.1
Message-ID: <20091221194755.85E1311C0382@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ruby-net-ldap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf19217/rpms/rubygem-ruby-net-ldap

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-ruby-net-ldap


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-ruby-net-ldap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From derks at fedoraproject.org  Mon Dec 21 19:47:58 2009
From: derks at fedoraproject.org (derks)
Date: Mon, 21 Dec 2009 19:47:58 +0000 (UTC)
Subject: rpms/mysql-mmm/EL-5 import.log, NONE,
	1.1 mysql-mmm-2.0.10-default_logging.patch, NONE,
	1.1 mysql-mmm-2.0.10-lp473446.patch, NONE,
	1.1 mysql-mmm-2.0.9-configs.patch, NONE,
	1.1 mysql-mmm-2.0.9-paths.patch, NONE, 1.1 mysql-mmm-agent.init,
	NONE, 1.1 mysql-mmm-monitor.init, NONE, 1.1 mysql-mmm.logrotate,
	NONE, 1.1 mysql-mmm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091221194758.E3F2911C0382@cvs1.fedora.phx.redhat.com>

Author: derks

Update of /cvs/pkgs/rpms/mysql-mmm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19299/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mysql-mmm-2.0.10-default_logging.patch 
	mysql-mmm-2.0.10-lp473446.patch mysql-mmm-2.0.9-configs.patch 
	mysql-mmm-2.0.9-paths.patch mysql-mmm-agent.init 
	mysql-mmm-monitor.init mysql-mmm.logrotate mysql-mmm.spec 
Log Message:
Initial import for EL-5




--- NEW FILE import.log ---
mysql-mmm-2_0_10-4:EL-5:mysql-mmm-2.0.10-4.src.rpm:1261424863

mysql-mmm-2.0.10-default_logging.patch:
 Log.pm |   45 ++++++++++-----------------------------------
 1 file changed, 10 insertions(+), 35 deletions(-)

--- NEW FILE mysql-mmm-2.0.10-default_logging.patch ---
--- mysql-mmm-2.0.10/lib/Common/Log.pm.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/lib/Common/Log.pm	2009-11-17 13:04:08.000000000 -0600
@@ -31,42 +31,17 @@
 
 	# Use default configuration
 	my $conf = "
-		log4perl.logger = INFO, FileInfo, FileWarn, FileError, FileFatal, MailFatal
+		log4perl.logger = INFO, MMMLog
 
-		log4perl.appender.FileInfo                          = Log::Log4perl::Appender::File
-		log4perl.appender.FileInfo.Threshold                = INFO 
-		log4perl.appender.FileInfo.filename                 = /var/log/mysql-mmm/$progam.info
-		log4perl.appender.FileInfo.recreate                 = 1
-		log4perl.appender.FileInfo.layout                   = PatternLayout
-		log4perl.appender.FileInfo.layout.ConversionPattern = %d %5p %m%n
-
-		log4perl.appender.FileWarn                          = Log::Log4perl::Appender::File
-		log4perl.appender.FileWarn.Threshold                = WARN 
-		log4perl.appender.FileWarn.filename                 = /var/log/mysql-mmm/$progam.warn
-		log4perl.appender.FileWarn.recreate                 = 1
-		log4perl.appender.FileWarn.layout                   = PatternLayout
-		log4perl.appender.FileWarn.layout.ConversionPattern = %d %5p %m%n
-
-		log4perl.appender.FileError                         = Log::Log4perl::Appender::File
-		log4perl.appender.FileError.Threshold               = ERROR 
-		log4perl.appender.FileError.filename                = /var/log/mysql-mmm/$progam.error
-		log4perl.appender.FileError.recreate                = 1
-		log4perl.appender.FileError.layout                  = PatternLayout
-		log4perl.appender.FileError.layout.ConversionPattern= %d %5p %m%n
-
-		log4perl.appender.FileFatal                         = Log::Log4perl::Appender::File
-		log4perl.appender.FileFatal.Threshold               = FATAL 
-		log4perl.appender.FileFatal.filename                = /var/log/mysql-mmm/$progam.fatal
-		log4perl.appender.FileFatal.recreate                = 1
-		log4perl.appender.FileFatal.layout                  = PatternLayout
-		log4perl.appender.FileFatal.layout.ConversionPattern= %d %5p %m%n
-
-		log4perl.appender.MailFatal                         = Log::Dispatch::Email::MailSend
-		log4perl.appender.MailFatal.Threshold               = FATAL 
-		log4perl.appender.MailFatal.to                      = root
-		log4perl.appender.MailFatal.subject                 = FATAL error in $progam
-		log4perl.appender.MailFatal.layout                  = PatternLayout
-		log4perl.appender.MailFatal.layout.ConversionPattern= %d %m%n
+		log4perl.appender.MMMLog                            = Log::Log4perl::Appender::File
+		log4perl.appender.MMMLog.Threshold                  = INFO 
+		log4perl.appender.MMMLog.filename                   = /var/log/mysql-mmm/$progam.log
+		log4perl.appender.MMMLog.recreate                   = 1
+		log4perl.appender.MMMLog.layout                     = PatternLayout
+		log4perl.appender.MMMLog.layout.ConversionPattern   = %d %5p %m%n
+
+ 		log4perl.appender.MailFatal                         = Log::Dispatch::Email::MailSend
+ 		log4perl.appender.MailFatal.Threshold               = FATAL 
 	";
 	Log::Log4perl->init(\$conf);
 

mysql-mmm-2.0.10-lp473446.patch:
 Angel.pm |   23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

--- NEW FILE mysql-mmm-2.0.10-lp473446.patch ---
https://bugs.launchpad.net/mysql-mmm/+bug/473446

--- mysql-mmm/lib/Common/Angel.pm	2009-11-17 11:35:20.000000000 -0600
+++ angel-infinit-failures/lib/Common/Angel.pm	2009-11-17 11:32:32.000000000 -0600
@@ -10,12 +10,17 @@
 
 our $start_process;
 our $pid;
+our $attempts;
+our $starttime;
+
 
 sub Init($) { 
 	my $pidfile = shift;
 
 	
 	$MMM::Common::Angel::start_process	= 1;
+	$MMM::Common::Angel::attempts		= 0;
+	$MMM::Common::Angel::starttime		= time();
 	my $is_shutdown	= 0;
 
 	$pidfile->create() if (defined($pidfile));
@@ -25,6 +30,7 @@
 	local $SIG{QUIT}	= \&MMM::Common::Angel::SignalHandler;
 
 	do {
+		$MMM::Common::Angel::attempts++;
 
 		if ($MMM::Common::Angel::start_process) {
 			$MMM::Common::Angel::start_process = 0;
@@ -41,6 +47,9 @@
 
 		# Wait for child to exit
 		if (waitpid($MMM::Common::Angel::pid, 0) == -1) {
+			# child exited clean, reset attempts and starttime
+			$MMM::Common::Angel::attempts = 0;
+			$MMM::Common::Angel::starttime = time();
 			if ($ERRNO{ECHLD}) {
 				$is_shutdown = 1 unless ($MMM::Common::Angel::start_process);
 			}
@@ -52,8 +61,18 @@
 					$is_shutdown = 1;
 				}
 				else {
-					FATAL sprintf("Child exited with exitcode %s, restarting", WEXITSTATUS($?));
-					$MMM::Common::Angel::start_process	= 1;
+					my $now = time();
+					my $diff = $now - $MMM::Common::Angel::starttime;
+					if ($MMM::Common::Angel::attempts >= 10 && $diff < 300) {
+						FATAL sprintf("Child exited with exitcode %s and has failed more than 10 times consecutively in the last 5 minutes, not restarting", WEXITSTATUS($?));
+						$MMM::Common::Angel::start_process	= 0;
+						$is_shutdown = 1;
+					}
+					else {
+						FATAL sprintf("Child exited with exitcode %s, restarting after 10 second sleep", WEXITSTATUS($?));
+						sleep(10);
+						$MMM::Common::Angel::start_process	= 1;
+					}
 				}
 			}
 			if (WIFSIGNALED($CHILD_ERROR)) {

mysql-mmm-2.0.9-configs.patch:
 mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf |    4 ++
 mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf   |   22 ++++++++-----
 mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf |   44 +++++++++++---------------
 mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf  |   42 ++++++++++++------------
 4 files changed, 60 insertions(+), 52 deletions(-)

--- NEW FILE mysql-mmm-2.0.9-configs.patch ---
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf	2009-11-03 12:47:50.000000000 -0600
@@ -1,45 +1,41 @@
-active_master_role	writer
-
+active_master_role      writer
 
 <host default>
-	cluster_interface		eth0
-
-	pid_path				/var/run/mmmd_agent.pid
-	bin_path				/usr/bin/mysql-mmm/
-
+    cluster_interface       eth0
+    pid_path                /var/run/mysql-mmm/mmmd_agent.pid
+    bin_path                /usr/libexec/mysql-mmm/
     replication_user        replication
     replication_password    slave
-
-	agent_user				mmm_agent
-	agent_password			RepAgent
+    agent_user              mmm_agent
+    agent_password          RepAgent
 </host>
 
 <host db1>
-	ip						192.168.0.31
-	mode					master
-	peer					db2
+    ip      192.168.0.31
+    mode    master
+    peer    db2
 </host>
 
 <host db2>
-	ip						192.168.0.32
-	mode					master
-	peer					db1
+    ip      192.168.0.32
+    mode    master
+    peer    db1
 </host>
 
 <host db3>
-	ip						192.168.0.33
-	mode					slave
+    ip      192.168.0.33
+    mode    slave
 </host>
 
 
 <role writer>
-	hosts					db1, db2
-	ips						192.168.0.50
-	mode					exclusive
+    hosts   db1, db2
+    ips     192.168.0.50
+    mode    exclusive
 </role>
 
 <role reader>
-	hosts					db1, db2, db3
-	ips						192.168.0.51, 192.168.0.52, 192.168.0.53
-	mode					balanced
+    hosts   db1, db2, db3
+    ips     192.168.0.51, 192.168.0.52, 192.168.0.53
+    mode    balanced
 </role>
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf	2009-11-03 12:51:47.000000000 -0600
@@ -1,43 +1,43 @@
 include mmm_agent.conf
 
-default_copy_method			scp
-clone_dirs					data, logs
+default_copy_method         scp
+clone_dirs                  data, logs
 
 <host default>
-	ssh_user				root
+    ssh_user                root
 
-    lvm_snapshot_size		1G
-    lvm_logical_volume		mysql
-    lvm_volume_group		storage
-    lvm_mount_dir			/mmm_snapshot
-    lvm_mount_opts			-orw,nouuid
+    lvm_snapshot_size       1G
+    lvm_logical_volume      mysql
+    lvm_volume_group        storage
+    lvm_mount_dir           /mmm_snapshot
+    lvm_mount_opts          -orw,nouuid
 
-	tools_user				mmm_tools
-	tools_password			RepTools
+    tools_user              mmm_tools
+    tools_password          RepTools
 
-	backup_dir				/mmm_backup
-	restore_dir				/mysql
+    backup_dir              /mmm_backup
+    restore_dir             /mysql
 </host>
 
 
 <copy_method scp>
     backup_command scp -c blowfish -r %SSH_USER%@%IP%:%SNAPSHOT%/%CLONE_DIR% %DEST_DIR%/
     restore_command cp -axv %BACKUP_DIR%/* %DEST_DIR%/
-	true_copy 1
+    true_copy 1
 </copy_method>
 
 <copy_method rdiff>
-	backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
-	restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
-	incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
-	single_run 1
-	incremental 1
+    backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
+    restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
+    incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
+    single_run 1
+    incremental 1
 </copy_method>
 
 <copy_method ssh-gz>
-	backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
-	restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
-	single_run 1
+    backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
+    restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
+    single_run 1
 </copy_method>
 
 
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf	2009-11-03 17:29:11.000000000 -0600
@@ -1,2 +1,6 @@
 include mmm_common.conf
+
+# The 'this' variable refers to this server.  Proper operation requires 
+# that 'this' server (db1 by default), as well as all other servers, have the 
+# proper IP addresses set in mmm_common.conf.
 this db1
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf	2009-11-03 17:54:12.000000000 -0600
@@ -1,16 +1,24 @@
 include mmm_common.conf
 
 <monitor>
-	ip						127.0.0.1
-	pid_path				/var/run/mmmd_mon.pid
-	bin_path				/usr/bin/mysql-mmm/
-	status_path				/var/lib/misc/mmmd_mon.status
-	ping_ips				192.168.0.1, 192.168.0.2, 192.168.0.3
+    ip                  127.0.0.1
+    pid_path            /var/run/mysql-mmm/mmmd_mon.pid
+    bin_path            /usr/libexec/mysql-mmm
+    status_path         /var/lib/mysql-mmm/mmmd_mon.status
+    ping_ips            192.168.0.1, 192.168.0.2, 192.168.0.3
+    auto_set_online     60
+
+    # The kill_host_bin does not exist by default, though the monitor will
+    # throw a warning about it missing.  See the section 5.10 "Kill Host 
+    # Functionality" in the PDF documentation.
+    #
+    # kill_host_bin     /usr/libexec/mysql-mmm/monitor/kill_host
+    #
 </monitor>
 
 <host default>
-	monitor_user			mmm_monitor
-	monitor_password		RepMonitor
+    monitor_user        mmm_monitor
+    monitor_password    RepMonitor
 </host>
 
 debug 0

mysql-mmm-2.0.9-paths.patch:
 Makefile                     |    2 +-
 etc/init.d/mysql-mmm-agent   |    6 +++---
 etc/init.d/mysql-mmm-monitor |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE mysql-mmm-2.0.9-paths.patch ---
--- mysql-mmm-2.0.9/etc/init.d/mysql-mmm-monitor.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/init.d/mysql-mmm-monitor	2009-10-19 22:40:05.000000000 -0500
@@ -6,8 +6,8 @@
 # chkconfig: - 64 36
 # description:  MMM Monitor.
 # processname: mmmd_mon
-# config: /etc/mmm_mon.conf
-# pidfile: /var/run/mmmd_mon.pid
+# config: /etc/mysql-mmm/mmm_mon.conf
+# pidfile: /var/run/mysql-mmm/mmmd_mon.pid
 
 # Cluster name (it can be empty for default cases)
 CLUSTER=''
@@ -17,10 +17,10 @@
 # Paths
 if [ "$CLUSTER" != "" ]; then
     MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
-    MMMD_MON_PIDFILE="/var/run/mmmd_mon-$CLUSTER.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
 else 
     MMMD_MON_BIN="/usr/sbin/mmmd_mon"
-    MMMD_MON_PIDFILE="/var/run/mmmd_mon.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
 fi
 
 echo "Daemon bin: '$MMMD_MON_BIN'"
--- mysql-mmm-2.0.9/etc/init.d/mysql-mmm-agent.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/init.d/mysql-mmm-agent	2009-10-19 22:39:37.000000000 -0500
@@ -6,12 +6,12 @@
 # chkconfig: - 64 36
 # description:  MMM Agent.
 # processname: mmmd_agent
-# config: /etc/mmm_agent.conf
-# pidfile: /var/run/mmmd_agent.pid
+# config: /etc/mysql-mmm/mmm_agent.conf
+# pidfile: /var/run/mysql-mmm/mmmd_agent.pid
 
 # Paths
 MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
-MMMD_AGENT_PIDFILE="/var/run/mmmd_agent.pid"
+MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
 
 #-----------------------------------------------------------------------
 # See how we were called.
--- mysql-mmm-2.0.9/Makefile.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/Makefile	2009-10-19 22:26:47.000000000 -0500
@@ -4,7 +4,7 @@
 endif
 
 MODULEDIR = $(DESTDIR)$(shell eval "`perl -V:${INSTALLDIR}`"; echo "$$${INSTALLDIR}")/MMM
-BINDIR    = $(DESTDIR)/usr/bin/mysql-mmm
+BINDIR    = $(DESTDIR)/usr/libexec/mysql-mmm
 SBINDIR   = $(DESTDIR)/usr/sbin
 LOGDIR    = $(DESTDIR)/var/log/mysql-mmm
 ETCDIR    = $(DESTDIR)/etc


--- NEW FILE mysql-mmm-agent.init ---
#!/bin/sh
#
# mysql-mmm-agent    This shell script takes care of starting and stopping
#                    the mmm agent daemon.
#
# chkconfig: - 64 36
# description:  MMM Agent.
# processname: mmmd_agent
# config: /etc/mysql-mmm/mmm_agent.conf
# pidfile: /var/run/mysql-mmm/mmmd_agent.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Paths
MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
LOCKFILE='/var/lock/subsys/mysql-mmm-agent'
prog='MMM Agent Daemon'

start() {
        echo -n "Starting $prog: "
        if [ -s $MMMD_AGENT_PIDFILE ] && kill -0 `cat $MMMD_AGENT_PIDFILE` 2> /dev/null; then
            echo " already running."
            exit 0
        fi
        daemon $MMMD_AGENT_BIN
        RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch $LOCKFILE
        return $RETVAL
}

stop() {
        # Stop daemon.
        echo -n "Stopping $prog: "
        killproc -p $MMMD_AGENT_PIDFILE $MMMD_AGENT_BIN
        RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f $LOCKFILE
        return $RETVAL
}

case "$1" in
  start)
        start
        ;;

  stop)
        stop
        ;;

  status)
        status -p $MMMD_AGENT_PIDFILE $MMMD_AGENT_BIN
        RETVAL=$?
        ;;

  restart|reload)
        stop
        start
        ;;

  condrestart)
        if [ -f $LOCKFILE ]; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $0 {start|stop|restart|condrestart|status}"
        ;;
esac

exit $RETVAL 


--- NEW FILE mysql-mmm-monitor.init ---
#!/bin/sh
#
# mysql-mmm-monitor  This shell script takes care of starting and stopping
#                    the mmm monitoring daemon.
#
# chkconfig: - 64 36
# description:  MMM Monitor.
# processname: mmmd_mon
# config: /etc/mysql-mmm/mmm_mon.conf
# pidfile: /var/run/mysql-mmm/mmmd_mon.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Cluster name (it can be empty for default cases)
CLUSTER=''
LOCKFILE='/var/lock/subsys/mysql-mmm-monitor'
prog='MMM Monitor Daemon'

if [ "$CLUSTER" != "" ]; then
    MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
else 
    MMMD_MON_BIN="/usr/sbin/mmmd_mon"
    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
fi


start() {
        echo -n "Starting $prog: "
        if [ -s $MMMD_MON_PIDFILE ] && kill -0 `cat $MMMD_MON_PIDFILE` 2> /dev/null; then
            echo " already running."
            exit 0
        fi
        daemon $MMMD_MON_BIN
        RETVAL=$?
        echo
	[ $RETVAL = 0 ] && touch $LOCKFILE
        return $RETVAL
}

stop() {
        # Stop daemon.
        echo -n "Stopping $prog: "
        killproc -p $MMMD_MON_PIDFILE $MMMD_MON_BIN
        RETVAL=$?
        echo
        [ $RETVAL = 0 ] && rm -f $LOCKFILE
        return $RETVAL
}

case "$1" in
  start)
        start
        ;;

  stop)
        stop
        ;;

  status)
        status -p $MMMD_MON_PIDFILE $MMMD_MON_BIN
        RETVAL=$?
        ;;

  restart|reload)
        stop
        start
        ;;

  condrestart)
        if [ -f $LOCKFILE ]; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $0 {start|stop|restart|condrestart|status}"
        ;;
esac

exit $RETVAL 


--- NEW FILE mysql-mmm.logrotate ---
/var/log/mysql-mmm/*.log {
    daily
    missingok
    rotate 7
    compress
    delaycompress
    notifempty
    create 640 root adm
}


--- NEW FILE mysql-mmm.spec ---

Name: mysql-mmm
Version: 2.0.10 
Release: 4%{?dist}
Summary: Multi-Master Replication Manager for MySQL
License: GPLv2
URL: http://mysql-mmm.org
Group: Applications/System
Source: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}.tar.gz 
Source1: mysql-mmm.logrotate
Source2: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}-1.pdf
Source3: mysql-mmm-agent.init
Source4: mysql-mmm-monitor.init
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
BuildArch: noarch
Provides: mmm = %{version}-%{release} 
Provides: mysql-master-master = %{version}-%{release}

Patch0: mysql-mmm-2.0.9-paths.patch
Patch1: mysql-mmm-2.0.9-configs.patch 
Patch3: mysql-mmm-2.0.10-lp473446.patch
Patch4: mysql-mmm-2.0.10-default_logging.patch

%description
MMM (MySQL Master-Master Replication Manager) is a set of flexible scripts 
to perform monitoring/failover and management of MySQL Master-Master 
replication configurations (with only one node writable at any time). The 
toolset also has the ability to read balance standard master/slave 
configurations with any number of slaves, so you can use it to move virtual 
IP addresses around a group of servers depending on whether they are behind 
in replication. In addition to that, it also has scripts for data backups, 
resynchronization between nodes etc.

%package agent
Summary: MMM Database Server Agent Daemon and Libraries
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: iproute
Provides: mysql-master-master-agent = %{version}-%{release}
Provides: mmm-agent = %{version}-%{release}

%description agent
Agent daemon and libraries which run on each MySQL server and provides the 
monitoring node with a simple set of remote services.

%package monitor 
Summary: MMM Monitor Server Daemon and Libraries 
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: perl(Class::Singleton), perl(DBD::mysql) 
Provides: mysql-master-master-monitor = %{version}-%{release} 
Provides: mmm-monitor = %{version}-%{release}

%description monitor
Monitoring daemon and libraries that do all monitoring work and make all 
decisions about roles moving and so on.

%package tools 
Summary: MMM Control Scripts and Libraries
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Provides: mysql-master-master-tools = %{version}-%{release} 
Provides: mmm-tools = %{version}-%{release}

%description tools 
Scripts and libraries dedicated to management of the mmmd_mon processes 
by com- mands.

%prep
%setup -q 
cp -a %{SOURCE2} . 

# currently the README included with mysql-mmm is zero-length
cat >>README <<EOF
Full documentation can be found at:

    %{_docdir}/%{name}-%{version}/%{name}-%{version}-1.pdf
EOF


%patch0 -p1 
%patch1 -p1
%patch3 -p1
%patch4 -p1


%build
# pass

%install
rm -rf %{buildroot}

# Install
make install DESTDIR=%{buildroot}

# additional
%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d \
             %{buildroot}%{_localstatedir}/run/%{name} \
             %{buildroot}%{_localstatedir}/lib/%{name}

install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm

# place our init scripts
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor

install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor


%clean
%{__rm} -rf %{buildroot}


%post agent
if [ $1 -eq 1 ]; then 
    /sbin/chkconfig --add mysql-mmm-agent
    /sbin/chkconfig mysql-mmm-agent off 
elif [ $1 -ge 2 ]; then
    /sbin/service mysql-mmm-agent condrestart 
fi


%post monitor
if [ $1 -eq 1 ]; then 
    /sbin/chkconfig --add mysql-mmm-monitor 
    /sbin/chkconfig mysql-mmm-monitor off
elif [ $1 -ge 2 ] ; then
    /sbin/service mysql-mmm-monitor condrestart 
fi

%preun agent
if [ $1 -eq 0 ]; then
    /sbin/service mysql-mmm-agent stop > /dev/null 2>&1
    /sbin/chkconfig --del mysql-mmm-agent
fi

%preun monitor
if [ $1 -eq 0 ]; then
    /sbin/service mysql-mmm-monitor stop > /dev/null 2>&1
    /sbin/chkconfig --del mysql-mmm-monitor
fi


%files
%defattr(-,root,root,-)
%doc COPYING INSTALL README VERSION %{name}-%{version}-1.pdf 
%dir %{_sysconfdir}/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/lib/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/run/mysql-mmm
%attr(755,root,root) %dir %{_localstatedir}/log/mysql-mmm
%config(noreplace) %{_sysconfdir}/logrotate.d/mysql-mmm
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_common.conf
%{perl_vendorlib}/MMM/Common

%files tools 
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/mysql-mmm/mmm_tools.conf
%{perl_vendorlib}/MMM/Tools
%{_libexecdir}/mysql-mmm/tools/
%{_sbindir}/mmm_backup
%{_sbindir}/mmm_clone
%{_sbindir}/mmm_restore

%files agent
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
%{perl_vendorlib}/MMM/Agent
%{_libexecdir}/mysql-mmm/agent/
%{_sbindir}/mmmd_agent

%files monitor
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon.conf
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
%{perl_vendorlib}/MMM/Monitor
%{_libexecdir}/mysql-mmm/monitor/
%{_sbindir}/mmmd_mon
%{_sbindir}/mmm_control


%changelog
* Fri Dec 04 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-4
- Add auto_set_online to 60 in mmm_mon.conf
- Provides full version-release for all subpackages
- Append doc location to pdf documentation in README
- Use subsys/lockfile in init scripts

* Thu Nov 19 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-3
- BuildArch: noarch
- Monitor subpackage Requires: perl(DBD::mysql)
- Provides full version-release for  mmm, mysql-master-master
- Removed redundant /var/run/mysql-mmm entry
- Use _localstatedir macro for /var/log/mysql-mmm file listing 
- Fixed logic in post and postun scripts to properly handle
  install/upgrade conditions.
- Post scripts now perform condrestart
- Added Source3: mysql-mmm-agent.init
- Added Source4: mysql-mmm-monitor.init

* Tue Nov 17 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-2
- Removed Patch2: mysql-mmm-2.0.10-sleep.patch (obsoleted by Patch3)
- Added Patch3: mysql-mmm-2.0.10-lp473446.patch
- Added Patch4: mysql-mmm-2.0.10-default_logging.patch

* Tue Nov 03 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-1
- Latest sources from upstream.
- Added Patch1: mysql-mmm-2.0.9-configs.patch 
- Added Patch2: mysql-mmm-2.0.10-sleep.patch
- Moved mmm_control under monitor package

* Mon Oct 19 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.9-1
- Starting mostly from scratch with 2.0 branch
- Added Patch0: mysql-mmm-2.0.9-patchs.patch

* Tue Oct 13 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-4
- Cleaning up rpmlint errors
- No longer require perl-DBD-MySQL

* Tue Sep 29 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.3
- Removing .rs tag (Packaging for Fedora/Epel).

* Mon Sep 28 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.2.rs
- Change subpackage -control to -tools
- No longer build or include send_arp, removing requirement of
  libnet
- Keep etc config files actually in /etc, symlink at _mmm_instdir/etc

* Thu Sep 23 2009 BJ Dierkes <wdierkes at rackspace.com> - 1.2.6-3.rs
- Cleaned up spec a bit further, moved sed changes to patches
- Added Patch1: mysql-master-master-1.2.6-libnet_1.1.patch
- Added Patch2: mysql-master-master-1.2.6-paths.patch
- Explicitly require libnet >= 1.1
- Added subpackages to break up agent, monitor, and control (backup/restore)

* Mon Sep 21 2009 Andrew Garner <andrew.garner at rackspace.com> - 1.2.6-2.abg
- Added patch for http://code.google.com/p/mysql-master-master/issues/detail?id=35

* Wed Sep 02 2009 Andrew Garner <andrew.garner at rackspace.com> - 1.2.6-1.abg
- New upstream release

* Thu Jul 09 2009 Andrew Garner <andrew.garner at rackspace.com>
- Fix release string to drop out incorrect ~rs identifier
- Updated to release 5.abg

* Thu Apr 16 2009 Andrew Garner <andrew.garner at rackspace.com>
- Change /etc/init.d/mysql-mmm_{mon,agent} back to mmm_{mon,agent}
- symlink /etc/mysql-mmm to /usr/lib/mysql-mmm (not the other way around)

* Mon Apr 14 2009 Andrew Garner <andrew.garner at rackspace.com>
- Cleanup spec
- Use standard state/log paths
- Rebuild fping
- Added dist suffix
- Changed Release to 4.rs-abg

* Sun Apr 13 2009 Andrew Garner <andrew.garner at rackspace.com>
- Fix send_arp for RHEL 5.3's libnet
- Changed /usr/local/mmm to /usr/lib/mysql-mmm/
- Changed /etc/init.d/mmm_{mon,agent} to mysql-mmm_{mon,agent}
- Changed Release to 3.rs-abg

* Thu Apr 09 2009 Andrew Garner <andrew.garner at rackspace.com>
- Updating for Rackspace

* Wed Feb 25 2009 Ryan Lowe <ryan.a.lowe at percona.com>
- Initial build (I owe JayKim)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:50:10 -0000	1.1
+++ .cvsignore	21 Dec 2009 19:47:58 -0000	1.2
@@ -0,0 +1,2 @@
+mysql-mmm-2.0.10-1.pdf
+mysql-mmm-2.0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:50:10 -0000	1.1
+++ sources	21 Dec 2009 19:47:58 -0000	1.2
@@ -0,0 +1,2 @@
+822a0d8819af1bcf6fb228f0ecfd3ed4  mysql-mmm-2.0.10-1.pdf
+e8b8df923eeeeae9c4f8ec5584f5023d  mysql-mmm-2.0.10.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 21 19:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:48:15 +0000
Subject: [pkgdb] rubygem-linecache was added for kanarip
Message-ID: <20091221194815.7FBAF10F8BC@bastion.fedoraproject.org>

kevin has added Package rubygem-linecache with summary Caches (Ruby source) files
kevin has approved Package rubygem-linecache
kevin has added a Fedora devel branch for rubygem-linecache with an owner of kanarip
kevin has approved rubygem-linecache in Fedora devel
kevin has approved Package rubygem-linecache
kevin has set commit to Approved for 107427 on rubygem-linecache (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-linecache (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-linecache (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-linecache



From pkgdb at fedoraproject.org  Mon Dec 21 19:48:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:48:16 +0000
Subject: [pkgdb] rubygem-linecache (Fedora, 11) updated by kevin
Message-ID: <20091221194817.1D92410F8C0@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for rubygem-linecache
kevin has set commit to Approved for 107427 on rubygem-linecache (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-linecache (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-linecache (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-linecache



From pkgdb at fedoraproject.org  Mon Dec 21 19:48:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:48:16 +0000
Subject: [pkgdb] rubygem-linecache summary updated by kevin
Message-ID: <20091221194817.04CC810F8BC@bastion.fedoraproject.org>

kevin set package rubygem-linecache summary to Caches (Ruby source) files

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-linecache



From pkgdb at fedoraproject.org  Mon Dec 21 19:48:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:48:16 +0000
Subject: [pkgdb] rubygem-linecache (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221194817.2E1D410F8C5@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for rubygem-linecache
kevin has set commit to Approved for 107427 on rubygem-linecache (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rubygem-linecache (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rubygem-linecache (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-linecache



From pkgdb at fedoraproject.org  Mon Dec 21 19:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:48:17 +0000
Subject: [pkgdb] rubygem-linecache (Fedora, 12) updated by kevin
Message-ID: <20091221194817.38A6810F8CC@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for rubygem-linecache
kevin has set commit to Approved for 107427 on rubygem-linecache (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-linecache (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-linecache (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-linecache



From kevin at fedoraproject.org  Mon Dec 21 19:48:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:48:25 +0000 (UTC)
Subject: rpms/rubygem-linecache - New directory
Message-ID: <20091221194825.1183111C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-linecache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19681/rpms/rubygem-linecache

Log Message:
Directory /cvs/pkgs/rpms/rubygem-linecache added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:48:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:48:25 +0000 (UTC)
Subject: rpms/rubygem-linecache/devel - New directory
Message-ID: <20091221194825.29A4E11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-linecache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19681/rpms/rubygem-linecache/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-linecache/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:48:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:48:32 +0000 (UTC)
Subject: rpms/rubygem-linecache Makefile,NONE,1.1
Message-ID: <20091221194832.8693511C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-linecache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19681/rpms/rubygem-linecache

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-linecache


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-linecache
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:48:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:48:32 +0000 (UTC)
Subject: rpms/rubygem-linecache/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221194832.BE6F411C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-linecache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19681/rpms/rubygem-linecache/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-linecache


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-linecache
# $Id: Makefile,v 1.1 2009/12/21 19:48:32 kevin Exp $
NAME := rubygem-linecache
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 19:49:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:49:12 +0000
Subject: [pkgdb] qjson was added for eliwap
Message-ID: <20091221194912.EA9F410F8BD@bastion.fedoraproject.org>

kevin has added Package qjson with summary A qt-based library that maps JSON data to QVariant objects
kevin has approved Package qjson
kevin has added a Fedora devel branch for qjson with an owner of eliwap
kevin has approved qjson in Fedora devel
kevin has approved Package qjson
kevin has set commit to Approved for 107427 on qjson (Fedora devel)
kevin has set checkout to Approved for 107427 on qjson (Fedora devel)
kevin has set build to Approved for 107427 on qjson (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjson



From pkgdb at fedoraproject.org  Mon Dec 21 19:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:49:14 +0000
Subject: [pkgdb] qjson summary updated by kevin
Message-ID: <20091221194914.B246A10F8BF@bastion.fedoraproject.org>

kevin set package qjson summary to A qt-based library that maps JSON data to QVariant objects

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjson



From pkgdb at fedoraproject.org  Mon Dec 21 19:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:49:14 +0000
Subject: [pkgdb] qjson (Fedora, 11) updated by kevin
Message-ID: <20091221194914.CF2FA10F8C5@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for qjson
kevin has set commit to Approved for 107427 on qjson (Fedora 11)
kevin has set checkout to Approved for 107427 on qjson (Fedora 11)
kevin has set build to Approved for 107427 on qjson (Fedora 11)
kevin approved watchbugzilla on qjson (Fedora 11) for oget
kevin approved watchcommits on qjson (Fedora 11) for oget
kevin approved commit on qjson (Fedora 11) for oget
kevin approved build on qjson (Fedora 11) for oget
kevin approved approveacls on qjson (Fedora 11) for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjson



From pkgdb at fedoraproject.org  Mon Dec 21 19:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:49:14 +0000
Subject: [pkgdb] qjson (Fedora, devel) updated by kevin
Message-ID: <20091221194914.DBAC810F8CD@bastion.fedoraproject.org>

kevin approved watchbugzilla on qjson (Fedora devel) for oget
kevin approved watchcommits on qjson (Fedora devel) for oget
kevin approved commit on qjson (Fedora devel) for oget
kevin approved build on qjson (Fedora devel) for oget
kevin approved approveacls on qjson (Fedora devel) for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjson



From pkgdb at fedoraproject.org  Mon Dec 21 19:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:49:14 +0000
Subject: [pkgdb] qjson (Fedora, 12) updated by kevin
Message-ID: <20091221194914.E87BF10F8D2@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for qjson
kevin has set commit to Approved for 107427 on qjson (Fedora 12)
kevin has set checkout to Approved for 107427 on qjson (Fedora 12)
kevin has set build to Approved for 107427 on qjson (Fedora 12)
kevin approved watchbugzilla on qjson (Fedora 12) for oget
kevin approved watchcommits on qjson (Fedora 12) for oget
kevin approved commit on qjson (Fedora 12) for oget
kevin approved build on qjson (Fedora 12) for oget
kevin approved approveacls on qjson (Fedora 12) for oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qjson



From kevin at fedoraproject.org  Mon Dec 21 19:49:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:49:22 +0000 (UTC)
Subject: rpms/qjson - New directory
Message-ID: <20091221194922.14F8F11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qjson
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19992/rpms/qjson

Log Message:
Directory /cvs/pkgs/rpms/qjson added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:49:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:49:22 +0000 (UTC)
Subject: rpms/qjson/devel - New directory
Message-ID: <20091221194922.2A6A911C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qjson/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19992/rpms/qjson/devel

Log Message:
Directory /cvs/pkgs/rpms/qjson/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:49:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:49:29 +0000 (UTC)
Subject: rpms/qjson Makefile,NONE,1.1
Message-ID: <20091221194929.6746B11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qjson
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19992/rpms/qjson

Added Files:
	Makefile 
Log Message:
Setup of module qjson


--- NEW FILE Makefile ---
# Top level Makefile for module qjson
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 19:49:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:49:29 +0000 (UTC)
Subject: rpms/qjson/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091221194929.8ED1C11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qjson/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19992/rpms/qjson/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qjson


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qjson
# $Id: Makefile,v 1.1 2009/12/21 19:49:29 kevin Exp $
NAME := qjson
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 19:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:50:11 +0000
Subject: [pkgdb] yum-langpacks (Fedora, 11) updated by kevin
Message-ID: <20091221195011.5053A10F8CB@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for yum-langpacks
kevin has set commit to Approved for 107427 on yum-langpacks (Fedora 11)
kevin has set checkout to Approved for 107427 on yum-langpacks (Fedora 11)
kevin has set build to Approved for 107427 on yum-langpacks (Fedora 11)
kevin approved watchbugzilla on yum-langpacks (Fedora 11) for i18n-team
kevin approved watchcommits on yum-langpacks (Fedora 11) for i18n-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yum-langpacks



From pkgdb at fedoraproject.org  Mon Dec 21 19:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:50:11 +0000
Subject: [pkgdb] yum-langpacks summary updated by kevin
Message-ID: <20091221195011.38BD910F8C0@bastion.fedoraproject.org>

kevin set package yum-langpacks summary to Yum plugin that installs langpacks for packages

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yum-langpacks



From pkgdb at fedoraproject.org  Mon Dec 21 19:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:50:09 +0000
Subject: [pkgdb] yum-langpacks was added for petersen
Message-ID: <20091221195009.DDB2D10F8C1@bastion.fedoraproject.org>

kevin has added Package yum-langpacks with summary Yum plugin that installs langpacks for packages
kevin has approved Package yum-langpacks
kevin has added a Fedora devel branch for yum-langpacks with an owner of petersen
kevin has approved yum-langpacks in Fedora devel
kevin has approved Package yum-langpacks
kevin has set commit to Approved for 107427 on yum-langpacks (Fedora devel)
kevin has set checkout to Approved for 107427 on yum-langpacks (Fedora devel)
kevin has set build to Approved for 107427 on yum-langpacks (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yum-langpacks



From pkgdb at fedoraproject.org  Mon Dec 21 19:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:50:11 +0000
Subject: [pkgdb] yum-langpacks (Fedora, 12) updated by kevin
Message-ID: <20091221195011.597E910F8CF@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for yum-langpacks
kevin has set commit to Approved for 107427 on yum-langpacks (Fedora 12)
kevin has set checkout to Approved for 107427 on yum-langpacks (Fedora 12)
kevin has set build to Approved for 107427 on yum-langpacks (Fedora 12)
kevin approved watchbugzilla on yum-langpacks (Fedora 12) for i18n-team
kevin approved watchcommits on yum-langpacks (Fedora 12) for i18n-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yum-langpacks



From pkgdb at fedoraproject.org  Mon Dec 21 19:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:50:11 +0000
Subject: [pkgdb] yum-langpacks (Fedora, devel) updated by kevin
Message-ID: <20091221195011.6742F10F8D2@bastion.fedoraproject.org>

kevin approved watchbugzilla on yum-langpacks (Fedora devel) for i18n-team
kevin approved watchcommits on yum-langpacks (Fedora devel) for i18n-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yum-langpacks



From kevin at fedoraproject.org  Mon Dec 21 19:50:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:50:18 +0000 (UTC)
Subject: rpms/yum-langpacks - New directory
Message-ID: <20091221195018.1387E11C03AD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-langpacks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20266/rpms/yum-langpacks

Log Message:
Directory /cvs/pkgs/rpms/yum-langpacks added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:50:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:50:18 +0000 (UTC)
Subject: rpms/yum-langpacks/devel - New directory
Message-ID: <20091221195018.2AC9311C03AD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-langpacks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20266/rpms/yum-langpacks/devel

Log Message:
Directory /cvs/pkgs/rpms/yum-langpacks/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:50:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:50:25 +0000 (UTC)
Subject: rpms/yum-langpacks/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221195025.C601D11C03AD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-langpacks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20266/rpms/yum-langpacks/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module yum-langpacks


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: yum-langpacks
# $Id: Makefile,v 1.1 2009/12/21 19:50:25 kevin Exp $
NAME := yum-langpacks
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Mon Dec 21 19:50:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:50:25 +0000 (UTC)
Subject: rpms/yum-langpacks Makefile,NONE,1.1
Message-ID: <20091221195025.98FFB11C03AD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-langpacks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS20266/rpms/yum-langpacks

Added Files:
	Makefile 
Log Message:
Setup of module yum-langpacks


--- NEW FILE Makefile ---
# Top level Makefile for module yum-langpacks
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Dec 21 19:51:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:51:19 +0000
Subject: [pkgdb] kpilot was added for kkofler
Message-ID: <20091221195119.8185E10F8BD@bastion.fedoraproject.org>

kevin has added Package kpilot with summary Sync PIM data with PalmOS devices
kevin has approved Package kpilot
kevin has added a Fedora devel branch for kpilot with an owner of kkofler
kevin has approved kpilot in Fedora devel
kevin has approved Package kpilot
kevin has set commit to Approved for 107427 on kpilot (Fedora devel)
kevin has set checkout to Approved for 107427 on kpilot (Fedora devel)
kevin has set build to Approved for 107427 on kpilot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kpilot



From rdieter at fedoraproject.org  Mon Dec 21 19:51:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:51:30 +0000 (UTC)
Subject: rpms/sbcl/EL-4 sbcl-1.0.25-default_sbcl_home.patch, NONE,
	1.1 sbcl-install-clc.lisp, NONE, 1.1 sbcl.rc, NONE, 1.1 sbcl.sh,
	1.4, 1.5 .cvsignore, 1.22, 1.23 sbcl.spec, 1.49, 1.50 sources,
	1.24, 1.25 sbcl-1.0.16-optflags.patch, 1.1,
	NONE sbcl-1.0.19-default-sbcl-home.patch, 1.1, NONE
Message-ID: <20091221195130.442FD11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20606

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-1.0.25-default_sbcl_home.patch sbcl-install-clc.lisp 
	sbcl.rc sbcl.sh 
Removed Files:
	sbcl-1.0.16-optflags.patch sbcl-1.0.19-default-sbcl-home.patch 
Log Message:
sync w/F-12 branch for sbcl-1.0.30


sbcl-1.0.25-default_sbcl_home.patch:
 make-target-1.sh      |   23 +++++++++++++++++++++++
 src/runtime/runtime.c |    4 +---
 2 files changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE sbcl-1.0.25-default_sbcl_home.patch ---
diff -up sbcl-1.0.25/make-target-1.sh.default-sbcl-home sbcl-1.0.25/make-target-1.sh
--- sbcl-1.0.25/make-target-1.sh.default-sbcl-home	2006-04-27 11:32:42.000000000 -0500
+++ sbcl-1.0.25/make-target-1.sh	2009-02-03 08:18:10.000000000 -0600
@@ -20,6 +20,29 @@ LANG=C
 LC_ALL=C
 export LANG LC_ALL
 
+# Allow the definition of INSTALL_ROOT and/or SBCL_HOME to correctly
+# set the hard-coded SBCL_HOME macro in src/runtime/runtime.c
+
+DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME:-/usr/local/lib/sbcl/}
+
+# Strip off any trailing / on the name; we'll add this later but don't
+# need two
+DEFAULT_SBCL_HOME=${DEFAULT_SBCL_HOME%/}
+
+export DEFAULT_SBCL_HOME
+
+file=src/runtime/sbcl-home.h
+echo "/* This is a machine-generated file.            */" > $file
+echo "/* Please do not edit it by hand.               */" >> $file
+echo "/* Change the default SBCL_HOME by setting the  */" >> $file
+echo "/* DEFAULT_SBCL_HOME environment variable prior */" >> $file
+echo "/* to building. See make-target-1.sh for more   */" >> $file
+echo "/* information.                                 */" >> $file
+echo "#ifndef SBCL_HOME" >> $file
+echo "#define SBCL_HOME \"$DEFAULT_SBCL_HOME/\"" >> $file
+echo "#endif" >> $file
+
+
 # Build the runtime system and symbol table (.nm) file.
 #
 # (This C build has to come after the first genesis in order to get
diff -up sbcl-1.0.25/src/runtime/runtime.c.default-sbcl-home sbcl-1.0.25/src/runtime/runtime.c
--- sbcl-1.0.25/src/runtime/runtime.c.default-sbcl-home	2009-01-25 18:56:09.000000000 -0600
+++ sbcl-1.0.25/src/runtime/runtime.c	2009-02-03 08:19:24.000000000 -0600
@@ -66,9 +66,7 @@
 #include "interr.h"
 #endif
 
-#ifndef SBCL_HOME
-#define SBCL_HOME "/usr/local/lib/sbcl/"
-#endif
+#include "sbcl-home.h"
 
 #ifdef LISP_FEATURE_HPUX
 extern void *return_from_lisp_stub;


--- NEW FILE sbcl-install-clc.lisp ---
;;; -*- Mode: LISP; Package: CL-USER -*-
;;;
;;; Copyright (C) Peter Van Eynde 2001 and Kevin Rosenberg 2002-2003
;;;
;;; License: LGPL v2
;;;
(in-package "COMMON-LISP-USER")

(handler-case
    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
  (error (e)
    (format t "~%Error during load of common-lisp-controller.lisp: ~A~%" e)
    (sb-unix:unix-exit 1)))

(handler-case
    (common-lisp-controller:init-common-lisp-controller-v4 "sbcl")
  (error (e)
    (format t "~%Error running init-common-lisp-controller-v4: ~A~%" e)
    (sb-unix:unix-exit 1)))

(when (probe-file #p"/etc/lisp.config")
  (load #p"/etc/lisp.config"))

(setf (logical-pathname-translations "SYS")
      '(("SYS:**;*.*.*"
         #P"/usr/share/sbcl-source/**/*.*")))

(set-dispatch-macro-character #\# #\!
  (lambda (stream bang arg)
    (declare (ignore bang arg))
    (read-line stream)
    (values)))

(ignore-errors
 (format t "~%Saving to sbcl-new.core...")
 (sb-ext:gc :full t)
 (sb-ext:save-lisp-and-die "sbcl-new.core"))


--- NEW FILE sbcl.rc ---
;;; -*- Lisp -*-
;;; this file gets installed as /etc/sbcl.rc and run on every
;;; invocation of sbcl

(if (probe-file "/etc/lisp-config.lisp")
    (load "/etc/lisp-config.lisp")
    (format t "~%;;; Hey: there is no /etc/lisp-config.lisp file, please create one."))


Index: sbcl.sh
===================================================================
RCS file: sbcl.sh
diff -N sbcl.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sbcl.sh	21 Dec 2009 19:51:30 -0000	1.5
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
+  cat <<EOF
+OF
+$0: cannot find the common-lisp-controller source.
+EOF
+  exit 0
+fi
+
+build_error()
+{
+    echo "Build failure $1"
+    exit 1
+}
+
+if [ -f /etc/sbcl.rc ] ; then
+  RCFILE=/etc/sbcl.rc
+else
+  RCFILE=/dev/null
+fi
+
+case $1 in
+    install-clc)
+    echo $0 loading and dumping clc.
+    ( cd /usr/lib/sbcl
+         /usr/bin/sbcl --core /usr/lib/sbcl/sbcl-dist.core \
+	   --noinform --sysinit ${RCFILE} --userinit /dev/null \
+	   --load "/usr/lib/sbcl/install-clc.lisp" # 2> /dev/null
+              mv sbcl-new.core sbcl.core || (echo FAILED ; cp sbcl-dist.core sbcl.core ) )
+    ;;
+    remove-clc)
+    echo $0 removing clc-enabled image
+    cp /usr/lib/sbcl/sbcl-dist.core /usr/lib/sbcl/sbcl.core
+    ;;
+    rebuild)
+    echo $0 rebuilding...
+    shift
+    echo rebuilding $1
+    /usr/bin/sbcl --noinform --sysinit ${RCFILE} --userinit /dev/null \
+             --disable-debugger \
+             --eval \
+"(handler-case
+     (progn
+       (asdf:operate 'asdf:compile-op (quote $1))
+       (sb-unix:unix-exit 0))
+    (error (e)
+      (ignore-errors (format t \"~&Build error: ~A~%\" e))
+      (finish-output)
+      (sb-unix:unix-exit 1)))" || build_error
+    ;;
+     remove)
+    echo $0 removing packages...
+    shift
+    while [ ! -z "$1" ] ; do
+rm -rf "/var/cache/common-lisp-controller/*/sbcl/${1}"
+shift
+     done
+    ;;
+    *)
+    echo $0 unkown command $1
+    echo known commands: rebuild, remove, install-clc, and remove-clc
+    exit 1
+    ;;
+esac
+
+exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	5 Nov 2008 17:31:44 -0000	1.22
+++ .cvsignore	21 Dec 2009 19:51:29 -0000	1.23
@@ -1 +1 @@
-sbcl-1.0.22-source.tar.bz2
+sbcl-1.0.30-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/sbcl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sbcl.spec	5 Nov 2008 17:31:44 -0000	1.49
+++ sbcl.spec	21 Dec 2009 19:51:30 -0000	1.50
@@ -8,12 +8,15 @@
 %define sbcl_shell /bin/bash
 
 # threading support
-%{?!_without_threads:%define _with_threads --with-threads}
+## Enable sb-thread
+%ifarch %{ix86} x86_64
+%{?!_without_threads:%global _with_threads --with-threads}
+%endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.22
-Release: 1%{?dist}
+Version: 1.0.30
+Release: 1%{?dist}.2
 
 License: BSD
 Group: 	 Development/Languages
@@ -22,13 +25,13 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734 
-ExclusiveArch: i386 x86_64 sparcv9
+ExclusiveArch: %{ix86} x86_64 sparcv9
 %else
-ExclusiveArch: i386 x86_64 ppc sparcv9
+ExclusiveArch: %{ix86} x86_64 ppc sparcv9
 %endif
 
 # Pre-generated html docs (not used)
-#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
+#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-documentation-html.tar.bz2
 Source2: customize-target-features.lisp 
 
 ## x86 section
@@ -81,14 +84,16 @@ Source201: sbcl.rc
 Source202: sbcl-install-clc.lisp
 %endif
 
-Patch1: sbcl-1.0.19-default-sbcl-home.patch
+Patch1: sbcl-1.0.25-default_sbcl_home.patch
 Patch2: sbcl-0.9.5-personality.patch
-Patch3: sbcl-1.0.16-optflags.patch
+Patch3: sbcl-1.0.30-optflags.patch
 Patch4: sbcl-0.9.17-LIB_DIR.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-1.0.2-permissive.patch
 
+## upstream patches
+
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 # doc generation
@@ -103,16 +108,16 @@ interpreter, and debugger.
 
 
 %prep
-%setup -q %{?sbcl_bootstrap_src} 
+%setup -q %{?sbcl_bootstrap_src}
 
 # Handle pre-generated docs
 if [ -d %{name}-%{version}/doc/manual ]; then
   mv %{name}-%{version}/doc/manual/* doc/manual/
 fi
 
-#sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
+#sed -i -e "s|/usr/local/lib/sbcl/|%{_prefix}/lib/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
-%patch1 -p1 -b .default-sbcl-home
+%patch1 -p1 -b .default_sbcl_home
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
@@ -121,12 +126,10 @@ fi
 
 %if 0%{?_with_threads:1}
 ## Enable sb-thread
-%ifarch %{ix86} x86_64
 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 # or
 install -m644 -p %{SOURCE2} ./customize-target-features.lisp
 %endif
-%endif
 
 # "install" local bootstrap
 %if "x%{?sbcl_bootstrap_src}" != "x%{nil}"
@@ -139,6 +142,9 @@ popd
 # fix permissions (some have eXecute bit set)
 find . -name '*.c' | xargs chmod 644
 
+# set version.lisp-expr
+sed -i.rpmver -e "s|\"%{version}\"|\"%{version}-%{release}\"|" version.lisp-expr
+
 
 %build
 
@@ -159,7 +165,13 @@ export PATH=`pwd`/sbcl-bootstrap/bin:${P
 # http://bugzilla.redhat.com/214568
 #touch contrib/sb-bsd-sockets/test-passed
 
-export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
+# WORKAROUND ppc linker issue
+%ifarch ppc
+#export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"; 
+#echo "RPM_OPT_FLAGS: $RPM_OPT_FLAGS"
+%endif
+
+export DEFAULT_SBCL_HOME=%{_prefix}/lib/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
 %{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
 
@@ -172,7 +184,7 @@ ERROR=0
 # santity check, essential contrib modules get built/included? 
 CONTRIBS="sb-posix sb-bsd-sockets"
 for CONTRIB in $CONTRIBS ; do
-  if [ ! -d %{buildroot}%{_libdir}/sbcl/$CONTRIB ]; then
+  if [ ! -d %{buildroot}%{_prefix}/lib/sbcl/$CONTRIB ]; then
     echo "WARNING: ${CONTRIB} awol!"
     ERROR=1 
     echo "ulimit -a"
@@ -191,19 +203,19 @@ exit $ERROR
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}{%{_bindir},%{_libdir},%{_mandir}}
+mkdir -p %{buildroot}{%{_bindir},%{_prefix}/lib,%{_mandir}}
 
 unset SBCL_HOME 
 export INSTALL_ROOT=%{buildroot}%{_prefix} 
-export LIB_DIR=%{buildroot}%{_libdir} 
+export LIB_DIR=%{buildroot}%{_prefix}/lib
 %{?sbcl_shell} ./install.sh 
 
 %if 0%{?common_lisp_controller}
-install -m744 -p -D %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin/sbcl.sh
+install -m744 -p -D %{SOURCE200} %{buildroot}%{_prefix}/lib/common-lisp/bin/sbcl.sh
 install -m644 -p -D %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
-install -m644 -p -D %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
+install -m644 -p -D %{SOURCE202} %{buildroot}%{_prefix}/lib/sbcl/install-clc.lisp
 # linking ok? -- Rex
-cp -p %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
+cp -p %{buildroot}%{_prefix}/lib/sbcl/sbcl.core %{buildroot}%{_prefix}/lib/sbcl/sbcl-dist.core
 %endif
 
 ## Unpackaged files
@@ -216,6 +228,7 @@ find %{buildroot} -name .cvsignore | xar
 find %{buildroot} -name 'test-passed' | xargs rm -vf
 
 
+## FIXME! register-common-lisp-implementation fails (at least on x86_64)
 %post
 /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
 /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
@@ -232,15 +245,15 @@ fi
 %files
 %defattr(-,root,root)
 %doc BUGS COPYING README CREDITS NEWS TLA TODO
-%doc SUPPORT STYLE PRINCIPLES
+%doc STYLE PRINCIPLES
 %{_bindir}/*
-%{_libdir}/sbcl/
+%{_prefix}/lib/sbcl/
 %{_mandir}/man?/*
 %doc doc/manual/sbcl
 %doc doc/manual/asdf
 %{_infodir}/*
 %if 0%{?common_lisp_controller}
-%{_libdir}/common-lisp/bin/*
+%{_prefix}/lib/common-lisp/bin/*
 %{_sysconfdir}/*
 %endif
 
@@ -250,6 +263,41 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-1.2
+- customize version.lisp-expr for rpm %%release
+- s|%%_libdir|%%_prefix/lib|, so common-lisp-controller has at least
+  a chance to work
+
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-1
+- sbcl-1.0.30
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.29-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jun 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.29-1
+- sbcl-1.0.29
+
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.28-1
+- sbcl-1.0.28
+
+* Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.26-1
+- sbcl-1.0.26
+
+* Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.25-3
+- ExclusiveArch: s/i386/%%ix86/
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.25-1
+- sbcl-1.0.25
+
+* Wed Dec 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.24-1
+- sbcl-1.0.24
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.23-1
+- sbcl-1.0.23
+
 * Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.22-1
 - sbcl-1.0.22
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	5 Nov 2008 17:31:44 -0000	1.24
+++ sources	21 Dec 2009 19:51:30 -0000	1.25
@@ -1 +1 @@
-fad4f6634aedadd3212804b65ac89c96  sbcl-1.0.22-source.tar.bz2
+64a96ad21a5d57f27639c0801c00fe74  sbcl-1.0.30-source.tar.bz2


--- sbcl-1.0.16-optflags.patch DELETED ---


--- sbcl-1.0.19-default-sbcl-home.patch DELETED ---



From rdieter at fedoraproject.org  Mon Dec 21 19:51:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:51:44 +0000 (UTC)
Subject: rpms/sbcl/EL-4 sbcl-1.0.30-optflags.patch,NONE,1.1
Message-ID: <20091221195144.17C0611C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20677

Added Files:
	sbcl-1.0.30-optflags.patch 
Log Message:
import


sbcl-1.0.30-optflags.patch:
 contrib/asdf-module.mk          |    2 ++
 src/runtime/Config.ppc-linux    |    5 +++--
 src/runtime/Config.sparc-linux  |    1 +
 src/runtime/Config.x86-linux    |    2 ++
 src/runtime/Config.x86_64-linux |    2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE sbcl-1.0.30-optflags.patch ---
diff -up sbcl-1.0.30/contrib/asdf-module.mk.optflags sbcl-1.0.30/contrib/asdf-module.mk
--- sbcl-1.0.30/contrib/asdf-module.mk.optflags	2009-04-28 11:02:13.000000000 -0500
+++ sbcl-1.0.30/contrib/asdf-module.mk	2009-08-02 09:37:51.185577992 -0500
@@ -20,6 +20,8 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME
   CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
 endif
 
+EXTRA_CFLAGS += $(RPM_OPT_FLAGS)
+
 export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
 
 all: $(EXTRA_ALL_TARGETS)
diff -up sbcl-1.0.30/src/runtime/Config.ppc-linux.optflags sbcl-1.0.30/src/runtime/Config.ppc-linux
--- sbcl-1.0.30/src/runtime/Config.ppc-linux.optflags	2006-11-19 05:26:16.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.ppc-linux	2009-08-03 14:22:26.131354239 -0500
@@ -9,8 +9,9 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-CFLAGS = -g
-LINKFLAGS += -v -rdynamic
+CFLAGS += $(RPM_OPT_FLAGS)
+LINKFLAGS += -v -rdynamic -Wl,--relax
+ASFLAGS += -Wa,--longcalls
 NM = ./linux-nm
 
 ASSEM_SRC = ppc-assem.S ldso-stubs.S
diff -up sbcl-1.0.30/src/runtime/Config.sparc-linux.optflags sbcl-1.0.30/src/runtime/Config.sparc-linux
--- sbcl-1.0.30/src/runtime/Config.sparc-linux.optflags	2005-09-16 08:26:39.000000000 -0500
+++ sbcl-1.0.30/src/runtime/Config.sparc-linux	2009-08-02 09:37:51.186577770 -0500
@@ -10,6 +10,7 @@
 # files for more information.
 
 ASFLAGS = -g -Wall
+CFLAGS += $(RPM_OPT_FLAGS)
 LINKFLAGS += -v -rdynamic
 NM = ./linux-nm
 
diff -up sbcl-1.0.30/src/runtime/Config.x86_64-linux.optflags sbcl-1.0.30/src/runtime/Config.x86_64-linux
--- sbcl-1.0.30/src/runtime/Config.x86_64-linux.optflags	2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.x86_64-linux	2009-08-02 09:37:51.186577770 -0500
@@ -34,7 +34,7 @@ ifdef LISP_FEATURE_SB_THREAD
   OS_LIBS += -lpthread
 endif
 
-CFLAGS += -fno-omit-frame-pointer
+CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS)
 
 GC_SRC = gencgc.c
 
diff -up sbcl-1.0.30/src/runtime/Config.x86-linux.optflags sbcl-1.0.30/src/runtime/Config.x86-linux
--- sbcl-1.0.30/src/runtime/Config.x86-linux.optflags	2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.x86-linux	2009-08-02 09:37:51.187577619 -0500
@@ -38,6 +38,8 @@ ifdef LISP_FEATURE_SB_THREAD
   OS_LIBS += -lpthread
 endif
 
+CFLAGS += $(RPM_OPT_FLAGS)
+
 GC_SRC = gencgc.c
 
 # Nothing to do for after-grovel-headers.



From pkgdb at fedoraproject.org  Mon Dec 21 19:52:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:52:40 +0000
Subject: [pkgdb] kpilot summary updated by kevin
Message-ID: <20091221195229.77D9C10F862@bastion.fedoraproject.org>

kevin set package kpilot summary to Sync PIM data with PalmOS devices

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kpilot



From pkgdb at fedoraproject.org  Mon Dec 21 19:52:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:52:40 +0000
Subject: [pkgdb] kpilot (Fedora, 11) updated by kevin
Message-ID: <20091221195230.8275310F862@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for kpilot
kevin has set commit to Approved for 107427 on kpilot (Fedora 11)
kevin has set checkout to Approved for 107427 on kpilot (Fedora 11)
kevin has set build to Approved for 107427 on kpilot (Fedora 11)
kevin approved watchbugzilla on kpilot (Fedora 11) for tuxbrewr
kevin approved watchcommits on kpilot (Fedora 11) for tuxbrewr
kevin approved watchbugzilla on kpilot (Fedora 11) for than
kevin approved watchcommits on kpilot (Fedora 11) for than
kevin approved commit on kpilot (Fedora 11) for than
kevin approved build on kpilot (Fedora 11) for than
kevin approved approveacls on kpilot (Fedora 11) for than
kevin approved watchbugzilla on kpilot (Fedora 11) for rdieter
kevin approved watchcommits on kpilot (Fedora 11) for rdieter
kevin approved commit on kpilot (Fedora 11) for rdieter
kevin approved build on kpilot (Fedora 11) for rdieter
kevin approved approveacls on kpilot (Fedora 11) for rdieter
kevin approved watchbugzilla on kpilot (Fedora 11) for ltinkl
kevin approved watchcommits on kpilot (Fedora 11) for ltinkl
kevin approved commit on kpilot (Fedora 11) for ltinkl
kevin approved build on kpilot (Fedora 11) for ltinkl
kevin approved approveacls on kpilot (Fedora 11) for ltinkl
kevin approved watchbugzilla on kpilot (Fedora 11) for jreznik
kevin approved watchcommits on kpilot (Fedora 11) for jreznik
kevin approved commit on kpilot (Fedora 11) for jreznik
kevin approved build on kpilot (Fedora 11) for jreznik
kevin approved approveacls on kpilot (Fedora 11) for jreznik
kevin approved watchbugzilla on kpilot (Fedora 11) for arbiter
kevin approved watchcommits on kpilot (Fedora 11) for arbiter
kevin approved commit on kpilot (Fedora 11) for arbiter
kevin approved build on kpilot (Fedora 11) for arbiter
kevin approved approveacls on kpilot (Fedora 11) for arbiter
kevin approved watchbugzilla on kpilot (Fedora 11) for mathstuf
kevin approved watchcommits on kpilot (Fedora 11) for mathstuf
kevin approved commit on kpilot (Fedora 11) for mathstuf
kevin approved build on kpilot (Fedora 11) for mathstuf
kevin approved approveacls on kpilot (Fedora 11) for mathstuf

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kpilot



From pkgdb at fedoraproject.org  Mon Dec 21 19:52:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:52:40 +0000
Subject: [pkgdb] kpilot (Fedora, devel) updated by kevin
Message-ID: <20091221195231.7F3FF10F8D4@bastion.fedoraproject.org>

kevin approved watchbugzilla on kpilot (Fedora devel) for tuxbrewr
kevin approved watchcommits on kpilot (Fedora devel) for tuxbrewr
kevin approved watchbugzilla on kpilot (Fedora devel) for than
kevin approved watchcommits on kpilot (Fedora devel) for than
kevin approved commit on kpilot (Fedora devel) for than
kevin approved build on kpilot (Fedora devel) for than
kevin approved approveacls on kpilot (Fedora devel) for than
kevin approved watchbugzilla on kpilot (Fedora devel) for rdieter
kevin approved watchcommits on kpilot (Fedora devel) for rdieter
kevin approved commit on kpilot (Fedora devel) for rdieter
kevin approved build on kpilot (Fedora devel) for rdieter
kevin approved approveacls on kpilot (Fedora devel) for rdieter
kevin approved watchbugzilla on kpilot (Fedora devel) for ltinkl
kevin approved watchcommits on kpilot (Fedora devel) for ltinkl
kevin approved commit on kpilot (Fedora devel) for ltinkl
kevin approved build on kpilot (Fedora devel) for ltinkl
kevin approved approveacls on kpilot (Fedora devel) for ltinkl
kevin approved watchbugzilla on kpilot (Fedora devel) for jreznik
kevin approved watchcommits on kpilot (Fedora devel) for jreznik
kevin approved commit on kpilot (Fedora devel) for jreznik
kevin approved build on kpilot (Fedora devel) for jreznik
kevin approved approveacls on kpilot (Fedora devel) for jreznik
kevin approved watchbugzilla on kpilot (Fedora devel) for arbiter
kevin approved watchcommits on kpilot (Fedora devel) for arbiter
kevin approved commit on kpilot (Fedora devel) for arbiter
kevin approved build on kpilot (Fedora devel) for arbiter
kevin approved approveacls on kpilot (Fedora devel) for arbiter
kevin approved watchbugzilla on kpilot (Fedora devel) for mathstuf
kevin approved watchcommits on kpilot (Fedora devel) for mathstuf
kevin approved commit on kpilot (Fedora devel) for mathstuf
kevin approved build on kpilot (Fedora devel) for mathstuf
kevin approved approveacls on kpilot (Fedora devel) for mathstuf

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kpilot



From pkgdb at fedoraproject.org  Mon Dec 21 19:52:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:52:41 +0000
Subject: [pkgdb] kpilot (Fedora, 12) updated by kevin
Message-ID: <20091221195232.7E9B510F8CB@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for kpilot
kevin has set commit to Approved for 107427 on kpilot (Fedora 12)
kevin has set checkout to Approved for 107427 on kpilot (Fedora 12)
kevin has set build to Approved for 107427 on kpilot (Fedora 12)
kevin approved watchbugzilla on kpilot (Fedora 12) for tuxbrewr
kevin approved watchcommits on kpilot (Fedora 12) for tuxbrewr
kevin approved watchbugzilla on kpilot (Fedora 12) for than
kevin approved watchcommits on kpilot (Fedora 12) for than
kevin approved commit on kpilot (Fedora 12) for than
kevin approved build on kpilot (Fedora 12) for than
kevin approved approveacls on kpilot (Fedora 12) for than
kevin approved watchbugzilla on kpilot (Fedora 12) for rdieter
kevin approved watchcommits on kpilot (Fedora 12) for rdieter
kevin approved commit on kpilot (Fedora 12) for rdieter
kevin approved build on kpilot (Fedora 12) for rdieter
kevin approved approveacls on kpilot (Fedora 12) for rdieter
kevin approved watchbugzilla on kpilot (Fedora 12) for ltinkl
kevin approved watchcommits on kpilot (Fedora 12) for ltinkl
kevin approved commit on kpilot (Fedora 12) for ltinkl
kevin approved build on kpilot (Fedora 12) for ltinkl
kevin approved approveacls on kpilot (Fedora 12) for ltinkl
kevin approved watchbugzilla on kpilot (Fedora 12) for jreznik
kevin approved watchcommits on kpilot (Fedora 12) for jreznik
kevin approved commit on kpilot (Fedora 12) for jreznik
kevin approved build on kpilot (Fedora 12) for jreznik
kevin approved approveacls on kpilot (Fedora 12) for jreznik
kevin approved watchbugzilla on kpilot (Fedora 12) for arbiter
kevin approved watchcommits on kpilot (Fedora 12) for arbiter
kevin approved commit on kpilot (Fedora 12) for arbiter
kevin approved build on kpilot (Fedora 12) for arbiter
kevin approved approveacls on kpilot (Fedora 12) for arbiter
kevin approved watchbugzilla on kpilot (Fedora 12) for mathstuf
kevin approved watchcommits on kpilot (Fedora 12) for mathstuf
kevin approved commit on kpilot (Fedora 12) for mathstuf
kevin approved build on kpilot (Fedora 12) for mathstuf
kevin approved approveacls on kpilot (Fedora 12) for mathstuf

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kpilot



From ingvar at fedoraproject.org  Mon Dec 21 19:53:59 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Mon, 21 Dec 2009 19:53:59 +0000 (UTC)
Subject: File varnish-2.0.6.tar.gz uploaded to lookaside cache by ingvar
Message-ID: <20091221195359.3EC7D10F892@bastion.fedoraproject.org>

A file has been added to the lookaside cache for varnish:

d91dc21c636db61c69b5e8f061c5bb95  varnish-2.0.6.tar.gz



From kevin at fedoraproject.org  Mon Dec 21 19:54:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:54:45 +0000 (UTC)
Subject: rpms/kpilot - New directory
Message-ID: <20091221195445.1357911C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kpilot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd21156/rpms/kpilot

Log Message:
Directory /cvs/pkgs/rpms/kpilot added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:54:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:54:45 +0000 (UTC)
Subject: rpms/kpilot/devel - New directory
Message-ID: <20091221195445.29F0B11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kpilot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd21156/rpms/kpilot/devel

Log Message:
Directory /cvs/pkgs/rpms/kpilot/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 19:54:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:54:52 +0000 (UTC)
Subject: rpms/kpilot/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091221195452.93ECD11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kpilot/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd21156/rpms/kpilot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kpilot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kpilot
# $Id: Makefile,v 1.1 2009/12/21 19:54:52 kevin Exp $
NAME := kpilot
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Mon Dec 21 19:54:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 19:54:52 +0000 (UTC)
Subject: rpms/kpilot Makefile,NONE,1.1
Message-ID: <20091221195452.69F6A11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kpilot
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd21156/rpms/kpilot

Added Files:
	Makefile 
Log Message:
Setup of module kpilot


--- NEW FILE Makefile ---
# Top level Makefile for module kpilot
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From rdieter at fedoraproject.org  Mon Dec 21 19:56:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:56:03 +0000 (UTC)
Subject: rpms/sbcl/devel sbcl.spec,1.113,1.114
Message-ID: <20091221195603.76B8211C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21614

Modified Files:
	sbcl.spec 
Log Message:
make run-tests.sh non-fatal again. :(



Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- sbcl.spec	21 Dec 2009 19:30:30 -0000	1.113
+++ sbcl.spec	21 Dec 2009 19:56:03 -0000	1.114
@@ -192,7 +192,8 @@ for CONTRIB in $CONTRIBS ; do
   fi
 done
 pushd tests 
-time %{?setarch} %{?sbcl_shell} ./run-tests.sh
+# still seeing periodic thread.impure failure(s) in koji
+time %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
 exit $ERROR
 



From pkgdb at fedoraproject.org  Mon Dec 21 19:57:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:57:55 +0000
Subject: [pkgdb] zaz was added for musuruan
Message-ID: <20091221195755.D4A3910F8BD@bastion.fedoraproject.org>

kevin has added Package zaz with summary A puzzle game where the player has to arrange balls in triplets
kevin has approved Package zaz
kevin has added a Fedora devel branch for zaz with an owner of musuruan
kevin has approved zaz in Fedora devel
kevin has approved Package zaz
kevin has set commit to Approved for 107427 on zaz (Fedora devel)
kevin has set checkout to Approved for 107427 on zaz (Fedora devel)
kevin has set build to Approved for 107427 on zaz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zaz



From pkgdb at fedoraproject.org  Mon Dec 21 19:58:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:58:18 +0000
Subject: [pkgdb] zaz summary updated by kevin
Message-ID: <20091221195808.4B64010F8BD@bastion.fedoraproject.org>

kevin set package zaz summary to A puzzle game where the player has to arrange balls in triplets

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zaz



From pkgdb at fedoraproject.org  Mon Dec 21 19:58:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 19:58:19 +0000
Subject: [pkgdb] zaz (Fedora, 12) updated by kevin
Message-ID: <20091221195809.592B710F892@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for zaz
kevin has set commit to Approved for 107427 on zaz (Fedora 12)
kevin has set checkout to Approved for 107427 on zaz (Fedora 12)
kevin has set build to Approved for 107427 on zaz (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zaz



From rdieter at fedoraproject.org  Mon Dec 21 19:59:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 19:59:50 +0000 (UTC)
Subject: rpms/maxima/EL-5 maxima.spec,1.56,1.57
Message-ID: <20091221195950.A7AC111C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22031

Modified Files:
	maxima.spec 
Log Message:
tweak make check



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-5/maxima.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- maxima.spec	21 Dec 2009 19:43:34 -0000	1.56
+++ maxima.spec	21 Dec 2009 19:59:50 -0000	1.57
@@ -52,6 +52,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 # sbcl:  http://bugzilla.redhat.com/220053 (resolved)
 # sbcl: ppc/ld joy, "final link failed: Nonrepresentable section on output" http://bugzilla.redhat.com/448734
 %define _enable_sbcl --enable-sbcl 
+%define _check_nonfatal ||:
 %endif
 
 %ifarch sparcv9
@@ -241,7 +242,7 @@ popd
 
 
 %check 
-make check
+make -k check %{?check_nonfatal}
 
 
 %install



From kevin at fedoraproject.org  Mon Dec 21 20:00:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:00:10 +0000 (UTC)
Subject: rpms/zaz/devel - New directory
Message-ID: <20091221200010.52BE411C039C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zaz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22170/rpms/zaz/devel

Log Message:
Directory /cvs/pkgs/rpms/zaz/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:00:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:00:10 +0000 (UTC)
Subject: rpms/zaz - New directory
Message-ID: <20091221200010.1147911C0382@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zaz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22170/rpms/zaz

Log Message:
Directory /cvs/pkgs/rpms/zaz added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:00:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:00:17 +0000 (UTC)
Subject: rpms/zaz Makefile,NONE,1.1
Message-ID: <20091221200017.AC63311C0435@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zaz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22170/rpms/zaz

Added Files:
	Makefile 
Log Message:
Setup of module zaz


--- NEW FILE Makefile ---
# Top level Makefile for module zaz
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 20:00:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:00:19 +0000 (UTC)
Subject: rpms/zaz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE,
	1.1
Message-ID: <20091221200019.E092911C04A6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zaz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse22170/rpms/zaz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zaz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zaz
# $Id: Makefile,v 1.1 2009/12/21 20:00:19 kevin Exp $
NAME := zaz
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 20:03:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:03:04 +0000
Subject: [pkgdb] testng was added for lkundrak
Message-ID: <20091221200304.9218A10F892@bastion.fedoraproject.org>

kevin has added Package testng with summary Java-based testing framework
kevin has approved Package testng
kevin has added a Fedora devel branch for testng with an owner of lkundrak
kevin has approved testng in Fedora devel
kevin has approved Package testng
kevin has set commit to Approved for 107427 on testng (Fedora devel)
kevin has set checkout to Approved for 107427 on testng (Fedora devel)
kevin has set build to Approved for 107427 on testng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/testng



From pkgdb at fedoraproject.org  Mon Dec 21 20:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:03:26 +0000
Subject: [pkgdb] testng summary updated by kevin
Message-ID: <20091221200315.CC06C10F862@bastion.fedoraproject.org>

kevin set package testng summary to Java-based testing framework

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/testng



From pkgdb at fedoraproject.org  Mon Dec 21 20:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:03:26 +0000
Subject: [pkgdb] testng (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221200316.383CB10F8BD@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for testng
kevin has set commit to Approved for 107427 on testng (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on testng (Fedora EPEL 5)
kevin has set build to Approved for 107427 on testng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/testng



From pkgdb at fedoraproject.org  Mon Dec 21 20:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:03:26 +0000
Subject: [pkgdb] testng (Fedora, 11) updated by kevin
Message-ID: <20091221200317.37CF510F8C5@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for testng
kevin has set commit to Approved for 107427 on testng (Fedora 11)
kevin has set checkout to Approved for 107427 on testng (Fedora 11)
kevin has set build to Approved for 107427 on testng (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/testng



From pkgdb at fedoraproject.org  Mon Dec 21 20:03:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:03:27 +0000
Subject: [pkgdb] testng (Fedora, 12) updated by kevin
Message-ID: <20091221200317.A628E10F8C2@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for testng
kevin has set commit to Approved for 107427 on testng (Fedora 12)
kevin has set checkout to Approved for 107427 on testng (Fedora 12)
kevin has set build to Approved for 107427 on testng (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/testng



From kevin at fedoraproject.org  Mon Dec 21 20:03:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:03:25 +0000 (UTC)
Subject: rpms/testng - New directory
Message-ID: <20091221200325.15AE911C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/testng
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT22710/rpms/testng

Log Message:
Directory /cvs/pkgs/rpms/testng added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:03:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:03:25 +0000 (UTC)
Subject: rpms/testng/devel - New directory
Message-ID: <20091221200325.4300D11C02C9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/testng/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT22710/rpms/testng/devel

Log Message:
Directory /cvs/pkgs/rpms/testng/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:03:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:03:32 +0000 (UTC)
Subject: rpms/testng Makefile,NONE,1.1
Message-ID: <20091221200332.AA3BC11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/testng
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT22710/rpms/testng

Added Files:
	Makefile 
Log Message:
Setup of module testng


--- NEW FILE Makefile ---
# Top level Makefile for module testng
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 20:03:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:03:32 +0000 (UTC)
Subject: rpms/testng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091221200332.D964C11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/testng/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT22710/rpms/testng/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module testng


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: testng
# $Id: Makefile,v 1.1 2009/12/21 20:03:32 kevin Exp $
NAME := testng
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 20:04:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:04:06 +0000
Subject: [pkgdb] emacs-haskell-mode was added for sagarun
Message-ID: <20091221200406.D5E6210F8C1@bastion.fedoraproject.org>

kevin has added Package emacs-haskell-mode with summary Haskell editing mode for Emacs
kevin has approved Package emacs-haskell-mode
kevin has added a Fedora devel branch for emacs-haskell-mode with an owner of sagarun
kevin has approved emacs-haskell-mode in Fedora devel
kevin has approved Package emacs-haskell-mode
kevin has set commit to Approved for 107427 on emacs-haskell-mode (Fedora devel)
kevin has set checkout to Approved for 107427 on emacs-haskell-mode (Fedora devel)
kevin has set build to Approved for 107427 on emacs-haskell-mode (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From pkgdb at fedoraproject.org  Mon Dec 21 20:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:04:08 +0000
Subject: [pkgdb] emacs-haskell-mode summary updated by kevin
Message-ID: <20091221200408.C1FA210F892@bastion.fedoraproject.org>

kevin set package emacs-haskell-mode summary to Haskell editing mode for Emacs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From pkgdb at fedoraproject.org  Mon Dec 21 20:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:04:08 +0000
Subject: [pkgdb] emacs-haskell-mode (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221200408.D98E510F8C5@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for emacs-haskell-mode
kevin has set commit to Approved for 107427 on emacs-haskell-mode (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on emacs-haskell-mode (Fedora EPEL 5)
kevin has set build to Approved for 107427 on emacs-haskell-mode (Fedora EPEL 5)
kevin approved watchbugzilla on emacs-haskell-mode (Fedora EPEL 5) for chitlesh
kevin approved watchcommits on emacs-haskell-mode (Fedora EPEL 5) for chitlesh
kevin approved commit on emacs-haskell-mode (Fedora EPEL 5) for chitlesh
kevin approved build on emacs-haskell-mode (Fedora EPEL 5) for chitlesh
kevin approved approveacls on emacs-haskell-mode (Fedora EPEL 5) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From pkgdb at fedoraproject.org  Mon Dec 21 20:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:04:08 +0000
Subject: [pkgdb] emacs-haskell-mode (Fedora, 11) updated by kevin
Message-ID: <20091221200408.E6F0810F8CD@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for emacs-haskell-mode
kevin has set commit to Approved for 107427 on emacs-haskell-mode (Fedora 11)
kevin has set checkout to Approved for 107427 on emacs-haskell-mode (Fedora 11)
kevin has set build to Approved for 107427 on emacs-haskell-mode (Fedora 11)
kevin approved watchbugzilla on emacs-haskell-mode (Fedora 11) for chitlesh
kevin approved watchcommits on emacs-haskell-mode (Fedora 11) for chitlesh
kevin approved commit on emacs-haskell-mode (Fedora 11) for chitlesh
kevin approved build on emacs-haskell-mode (Fedora 11) for chitlesh
kevin approved approveacls on emacs-haskell-mode (Fedora 11) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From pkgdb at fedoraproject.org  Mon Dec 21 20:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:04:08 +0000
Subject: [pkgdb] emacs-haskell-mode (Fedora, devel) updated by kevin
Message-ID: <20091221200409.10E5B10F8D9@bastion.fedoraproject.org>

kevin approved watchbugzilla on emacs-haskell-mode (Fedora devel) for chitlesh
kevin approved watchcommits on emacs-haskell-mode (Fedora devel) for chitlesh
kevin approved commit on emacs-haskell-mode (Fedora devel) for chitlesh
kevin approved build on emacs-haskell-mode (Fedora devel) for chitlesh
kevin approved approveacls on emacs-haskell-mode (Fedora devel) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From pkgdb at fedoraproject.org  Mon Dec 21 20:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:04:08 +0000
Subject: [pkgdb] emacs-haskell-mode (Fedora, 12) updated by kevin
Message-ID: <20091221200408.F3AE110F8D2@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for emacs-haskell-mode
kevin has set commit to Approved for 107427 on emacs-haskell-mode (Fedora 12)
kevin has set checkout to Approved for 107427 on emacs-haskell-mode (Fedora 12)
kevin has set build to Approved for 107427 on emacs-haskell-mode (Fedora 12)
kevin approved watchbugzilla on emacs-haskell-mode (Fedora 12) for chitlesh
kevin approved watchcommits on emacs-haskell-mode (Fedora 12) for chitlesh
kevin approved commit on emacs-haskell-mode (Fedora 12) for chitlesh
kevin approved build on emacs-haskell-mode (Fedora 12) for chitlesh
kevin approved approveacls on emacs-haskell-mode (Fedora 12) for chitlesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From kevin at fedoraproject.org  Mon Dec 21 20:04:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:04:16 +0000 (UTC)
Subject: rpms/emacs-haskell-mode/devel - New directory
Message-ID: <20091221200416.323FE11C02A5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-haskell-mode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22997/rpms/emacs-haskell-mode/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-haskell-mode/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:04:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:04:16 +0000 (UTC)
Subject: rpms/emacs-haskell-mode - New directory
Message-ID: <20091221200416.1FB0E11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-haskell-mode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22997/rpms/emacs-haskell-mode

Log Message:
Directory /cvs/pkgs/rpms/emacs-haskell-mode added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:04:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:04:23 +0000 (UTC)
Subject: rpms/emacs-haskell-mode Makefile,NONE,1.1
Message-ID: <20091221200423.9315D11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-haskell-mode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22997/rpms/emacs-haskell-mode

Added Files:
	Makefile 
Log Message:
Setup of module emacs-haskell-mode


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-haskell-mode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 20:04:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:04:23 +0000 (UTC)
Subject: rpms/emacs-haskell-mode/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221200423.E904211C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-haskell-mode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22997/rpms/emacs-haskell-mode/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-haskell-mode


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-haskell-mode
# $Id: Makefile,v 1.1 2009/12/21 20:04:23 kevin Exp $
NAME := emacs-haskell-mode
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rdieter at fedoraproject.org  Mon Dec 21 20:04:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 20:04:27 +0000 (UTC)
Subject: rpms/sbcl/EL-4 sbcl-1.0.30-optflags.patch,1.1,1.2
Message-ID: <20091221200427.45E6411C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23010

Modified Files:
	sbcl-1.0.30-optflags.patch 
Log Message:
drop some ppc hackery


sbcl-1.0.30-optflags.patch:
 contrib/asdf-module.mk          |    2 ++
 src/runtime/Config.ppc-linux    |    5 +++--
 src/runtime/Config.sparc-linux  |    1 +
 src/runtime/Config.x86-linux    |    2 ++
 src/runtime/Config.x86_64-linux |    2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

Index: sbcl-1.0.30-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/EL-4/sbcl-1.0.30-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sbcl-1.0.30-optflags.patch	21 Dec 2009 19:51:44 -0000	1.1
+++ sbcl-1.0.30-optflags.patch	21 Dec 2009 20:04:26 -0000	1.2
@@ -21,7 +21,7 @@ diff -up sbcl-1.0.30/src/runtime/Config.
 -LINKFLAGS += -v -rdynamic
 +CFLAGS += $(RPM_OPT_FLAGS)
 +LINKFLAGS += -v -rdynamic -Wl,--relax
-+ASFLAGS += -Wa,--longcalls
++#ASFLAGS += -Wa,--longcalls
  NM = ./linux-nm
  
  ASSEM_SRC = ppc-assem.S ldso-stubs.S



From linville at fedoraproject.org  Mon Dec 21 20:06:19 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 21 Dec 2009 20:06:19 +0000 (UTC)
Subject: File hostapd-0.6.9.tar.gz uploaded to lookaside cache by linville
Message-ID: <20091221200619.3B1EE10F892@bastion.fedoraproject.org>

A file has been added to the lookaside cache for hostapd:

83630d11fa66ade9091f1b304fccd74c  hostapd-0.6.9.tar.gz



From drsmith2 at fedoraproject.org  Mon Dec 21 20:06:43 2009
From: drsmith2 at fedoraproject.org (drsmith2)
Date: Mon, 21 Dec 2009 20:06:43 +0000 (UTC)
Subject: File systemtap-1.1.tar.gz uploaded to lookaside cache by drsmith2
Message-ID: <20091221200643.85A7010F8C2@bastion.fedoraproject.org>

A file has been added to the lookaside cache for systemtap:

e43087c50f82906fae1fad725f2953dd  systemtap-1.1.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 21 20:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:06:43 +0000
Subject: [pkgdb] emacs-goodies was added for sagarun
Message-ID: <20091221200643.1C40810F8C0@bastion.fedoraproject.org>

kevin has added Package emacs-goodies with summary Miscellaneous add-ons for Emacs
kevin has approved Package emacs-goodies
kevin has added a Fedora devel branch for emacs-goodies with an owner of sagarun
kevin has approved emacs-goodies in Fedora devel
kevin has approved Package emacs-goodies
kevin has set commit to Approved for 107427 on emacs-goodies (Fedora devel)
kevin has set checkout to Approved for 107427 on emacs-goodies (Fedora devel)
kevin has set build to Approved for 107427 on emacs-goodies (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-goodies



From pkgdb at fedoraproject.org  Mon Dec 21 20:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:06:44 +0000
Subject: [pkgdb] emacs-goodies summary updated by kevin
Message-ID: <20091221200644.730DF10F8CB@bastion.fedoraproject.org>

kevin set package emacs-goodies summary to Miscellaneous add-ons for Emacs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-goodies



From linville at fedoraproject.org  Mon Dec 21 20:06:43 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 21 Dec 2009 20:06:43 +0000 (UTC)
Subject: rpms/hostapd/devel hostapd-MSG_DEBUG.patch, NONE,
	1.1 hostapd-RPM_OPT_FLAGS.patch, NONE, 1.1 hostapd.conf, NONE,
	1.1 hostapd.init, NONE, 1.1 hostapd.spec, NONE,
	1.1 hostapd.sysconfig, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221200643.4942211C00E7@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/hostapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hostapd-MSG_DEBUG.patch hostapd-RPM_OPT_FLAGS.patch 
	hostapd.conf hostapd.init hostapd.spec hostapd.sysconfig 
	import.log 
Log Message:
Initial import (#548180).

hostapd-MSG_DEBUG.patch:
 hostapd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hostapd-MSG_DEBUG.patch ---
diff -up hostapd-0.6.9/hostapd/hostapd.c.orig hostapd-0.6.9/hostapd/hostapd.c
--- hostapd-0.6.9/hostapd/hostapd.c.orig	2009-12-16 14:25:27.000000000 -0500
+++ hostapd-0.6.9/hostapd/hostapd.c	2009-12-16 14:27:00.000000000 -0500
@@ -1338,7 +1338,7 @@ static int hostapd_setup_bss(struct host
 	}
 
 	if (!hostapd_drv_none(hapd)) {
-		wpa_printf(MSG_ERROR, "Using interface %s with hwaddr " MACSTR
+		wpa_printf(MSG_DEBUG, "Using interface %s with hwaddr " MACSTR
 			   " and ssid '%s'",
 			   hapd->conf->iface, MAC2STR(hapd->own_addr),
 			   hapd->conf->ssid.ssid);
@@ -1937,7 +1937,7 @@ int main(int argc, char *argv[])
 
 	/* Initialize interfaces */
 	for (i = 0; i < interfaces.count; i++) {
-		wpa_printf(MSG_ERROR, "Configuration file: %s",
+		wpa_printf(MSG_DEBUG, "Configuration file: %s",
 			   argv[optind + i]);
 		interfaces.iface[i] = hostapd_init(argv[optind + i]);
 		if (!interfaces.iface[i])

hostapd-RPM_OPT_FLAGS.patch:
 Makefile |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE hostapd-RPM_OPT_FLAGS.patch ---
diff -up hostapd-0.6.9/hostapd/Makefile.orig hostapd-0.6.9/hostapd/Makefile
--- hostapd-0.6.9/hostapd/Makefile.orig	2009-12-16 18:16:19.000000000 -0500
+++ hostapd-0.6.9/hostapd/Makefile	2009-12-16 18:16:42.000000000 -0500
@@ -6,6 +6,8 @@ ifndef CFLAGS
 CFLAGS = -MMD -O2 -Wall -g
 endif
 
+CFLAGS += $(EXTRA_CFLAGS)
+
 # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
 # a file (undefine it, if you want to save in binary size)
 CFLAGS += -DHOSTAPD_DUMP_STATE


--- NEW FILE hostapd.conf ---
#
# This will give you a minimal, insecure wireless network.
# 
# DO NOT BE SATISFIED WITH THAT!!!
#
# For more information, look here:
#
#	http://wireless.kernel.org/en/users/Documentation/hostapd
#

ctrl_interface=/var/run/hostapd
ctrl_interface_group=wheel

# Some usable default settings...
macaddr_acl=0
auth_algs=1
ignore_broadcast_ssid=0

# Uncomment these for base WPA & WPA2 support with a pre-shared key
#wpa=3
#wpa_key_mgmt=WPA-PSK
#wpa_pairwise=TKIP
#rsn_pairwise=CCMP

# DO NOT FORGET TO SET A WPA PASSPHRASE!!
#wpa_passphrase=YourPassPhrase

# Most modern wireless drivers in the kernel need driver=nl80211
driver=nl80211

# Customize these for your local configuration...
interface=
hw_mode=
channel=
ssid=


--- NEW FILE hostapd.init ---
#!/bin/bash
#
# hostapd 
#
# chkconfig:   - 23 88
# description: hostapd is a user space daemon for access point and
#     authentication servers.  It implements IEEE 802.11 access point
#     management, IEEE 802.1X/WPA/WPA2/EAP Authenticators and RADIUS
#     authentication server.
# processname: hostapd
# config:      /etc/hostapd/hostapd.conf
#
### BEGIN INIT INFO
# Provides: hostapd
# Required-Start:
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 6
# Short-Description: start and stop hostapd
# Description: IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

exec="/usr/sbin/hostapd"
prog=hostapd
conf="/etc/hostapd/hostapd.conf"
lockfile=/var/lock/subsys/$prog

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

start() {
 	echo -n $"Starting $prog: $conf"
	daemon $prog -B $OTHER_ARGS $conf
	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
}

fdr_status() {
	status $prog
}


case "$1" in
	start|stop|restart|reload)
  		$1
		;;
	force-reload)
		force_reload
		;;
	status)
		fdr_status
		;;
	condrestart|try-restart)
		[ -f $lockfile ] && restart
		;;
	*)
		echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
		exit 1
esac



--- NEW FILE hostapd.spec ---
Name:           hostapd
Version:        0.6.9
Release:        6%{?dist}
Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
Group:          System Environment/Daemons
License:        BSD
URL:            http://w1.fi/hostapd
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
Source0:        %{URL}/%{name}-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.conf
Source3:        %{name}.sysconfig
Patch0:         hostapd-RPM_OPT_FLAGS.patch
Patch1:         hostapd-MSG_DEBUG.patch

BuildRequires:  libnl-devel >= 1.1
BuildRequires:  openssl-devel
BuildRequires:  gzip

Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts


%description
hostapd is a user space daemon for access point and authentication
servers.  It implements IEEE 802.11 access point management, IEEE
802.1X/WPA/WPA2/EAP Authenticators and RADIUS authentication server.

hostapd is designed to be a "daemon" program that runs in the back-
ground and acts as the backend component controlling authentication.
hostapd supports separate frontend programs and an example text-based
frontend, hostapd_cli, is included with hostapd.

%package logwatch
Summary: Logwatch scripts for hostapd
Requires: %{name} = %{version}-%{release} logwatch perl
%description logwatch
Logwatch scripts for hostapd


%prep
%setup -q

# Hack Makefile to allow use of RPM_OPT_FLAGS
%patch0 -p1

# Quiet some unnecessary console spam at startup
%patch1 -p1


%build
cd hostapd
cat defconfig | sed -e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
			-e '/^#CONFIG_RADIUS_SERVER=y/s/^#//' \
			-e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
			-e '/^#CONFIG_DRIVER_NONE=y/s/^#//' > .config
make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf %{buildroot}

# init scripts
install -d %{buildroot}/%{_initddir}
install -pm 0755 %{SOURCE1} %{buildroot}/%{_initddir}/hostapd

# logwatch files
install -d %{buildroot}/%{_sysconfdir}/logwatch/conf/services
install -pm 0644 hostapd/logwatch/hostapd.conf  \
        %{buildroot}/%{_sysconfdir}/logwatch/conf/services/hostapd.conf
install -d %{buildroot}/%{_sysconfdir}/logwatch/scripts/services
install -pm 0755 hostapd/logwatch/hostapd \
        %{buildroot}/%{_sysconfdir}/logwatch/scripts/services/hostapd

# config files
install -d %{buildroot}/%{_sysconfdir}/%{name}
install -pm 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/hostapd.conf

install -d %{buildroot}/%{_sysconfdir}/sysconfig
install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/hostapd

# binaries
install -d %{buildroot}/%{_sbindir}
install -pm 0755 hostapd/hostapd %{buildroot}%{_sbindir}/hostapd
install -pm 0755 hostapd/hostapd_cli %{buildroot}%{_sbindir}/hostapd_cli

# runtime state directory
install -d %{buildroot}/%{_localstatedir}/run/%{name}

# man pages
/usr/bin/gzip -c hostapd/hostapd_cli.1 > hostapd/hostapd_cli.1.gz
/usr/bin/gzip -c hostapd/hostapd.8 > hostapd/hostapd.8.gz
install -d %{buildroot}%{_mandir}/man{1,8}
install -pm 0644 hostapd/hostapd_cli.1.gz %{buildroot}%{_mandir}/man1
install -pm 0644 hostapd/hostapd.8.gz %{buildroot}%{_mandir}/man8

# prepare docs
cp hostapd/README ./README.hostapd
cp hostapd/logwatch/README ./README.logwatch


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README README.hostapd
%doc hostapd/hostapd.conf hostapd/wired.conf
%doc hostapd/hostapd.accept hostapd/hostapd.deny
%doc hostapd/hostapd.eap_user hostapd/hostapd.radius_clients
%doc hostapd/hostapd.vlan hostapd/hostapd.wpa_psk
%config(noreplace) %{_sysconfdir}/%{name}/hostapd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/hostapd
%{_initddir}/hostapd
%{_sbindir}/hostapd
%{_sbindir}/hostapd_cli
%dir %{_sysconfdir}/%{name}
%dir %{_localstatedir}/run/%{name}
%{_mandir}/man1/*
%{_mandir}/man8/*

%files logwatch
%defattr(-,root,root,-)
%doc hostapd/logwatch/README
%config(noreplace) %{_sysconfdir}/logwatch/conf/services/hostapd.conf
%{_sysconfdir}/logwatch/scripts/services/hostapd


%post
/sbin/chkconfig --add %{name}


%preun
if [ $1 = 0 ]; then
        /sbin/service %{name} stop >/dev/null 2>&1
        /sbin/chkconfig --del %{name}
fi


%changelog
* Thu Dec 17 2009 John W. Linville <linville at redhat.com> - 0.6.9-6
- Enable RADIUS server
- Enable "wired" and "none" drivers
- Use BSD license option

* Wed Dec 16 2009 John W. Linville <linville at redhat.com> - 0.6.9-5
- Use openssl instead of gnutls (broken)

* Wed Dec 16 2009 John W. Linville <linville at redhat.com> - 0.6.9-4
- Remove wired.conf from %doc (not in chosen configuration)
- Use $RPM_OPT_FLAGS
- Add %{?dist} tag

* Wed Dec 16 2009 John W. Linville <linville at redhat.com> - 0.6.9-3
- Use gnutls instead of openssl
- Turn-off internal EAP server (broken w/ gnutls)
- Remove %doc files not applicable to chosen configuration
- Un-mangle README filename for logwatch sub-package

* Wed Dec 16 2009 John W. Linville <linville at redhat.com> - 0.6.9-2
- Initial build
- Start release at 2 to avoid conflicts w/ previous attempts by others


--- NEW FILE hostapd.sysconfig ---
# Other arguments
#   -d   show more debug messages (-dd for even more)
#   -K   include key data in debug messages
#   -t   include timestamps in some debug messages
OTHER_ARGS=""


--- NEW FILE import.log ---
hostapd-0_6_9-6_fc11:HEAD:hostapd-0.6.9-6.fc11.src.rpm:1261425965


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hostapd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:40:51 -0000	1.1
+++ .cvsignore	21 Dec 2009 20:06:42 -0000	1.2
@@ -0,0 +1 @@
+hostapd-0.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hostapd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:40:51 -0000	1.1
+++ sources	21 Dec 2009 20:06:43 -0000	1.2
@@ -0,0 +1 @@
+83630d11fa66ade9091f1b304fccd74c  hostapd-0.6.9.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 21 20:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:06:44 +0000
Subject: [pkgdb] emacs-goodies (Fedora, 11) updated by kevin
Message-ID: <20091221200644.7E70F10F8CD@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for emacs-goodies
kevin has set commit to Approved for 107427 on emacs-goodies (Fedora 11)
kevin has set checkout to Approved for 107427 on emacs-goodies (Fedora 11)
kevin has set build to Approved for 107427 on emacs-goodies (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-goodies



From pkgdb at fedoraproject.org  Mon Dec 21 20:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:06:44 +0000
Subject: [pkgdb] emacs-goodies (Fedora, 12) updated by kevin
Message-ID: <20091221200644.8F8CF10F8D3@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for emacs-goodies
kevin has set commit to Approved for 107427 on emacs-goodies (Fedora 12)
kevin has set checkout to Approved for 107427 on emacs-goodies (Fedora 12)
kevin has set build to Approved for 107427 on emacs-goodies (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-goodies



From kevin at fedoraproject.org  Mon Dec 21 20:06:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:06:55 +0000 (UTC)
Subject: rpms/emacs-goodies/devel - New directory
Message-ID: <20091221200655.28AD011C02A5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-goodies/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ23713/rpms/emacs-goodies/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-goodies/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:06:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:06:55 +0000 (UTC)
Subject: rpms/emacs-goodies - New directory
Message-ID: <20091221200655.1A41611C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-goodies
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ23713/rpms/emacs-goodies

Log Message:
Directory /cvs/pkgs/rpms/emacs-goodies added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:07:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:07:02 +0000 (UTC)
Subject: rpms/emacs-goodies Makefile,NONE,1.1
Message-ID: <20091221200702.8661511C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-goodies
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ23713/rpms/emacs-goodies

Added Files:
	Makefile 
Log Message:
Setup of module emacs-goodies


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-goodies
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 20:07:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:07:02 +0000 (UTC)
Subject: rpms/emacs-goodies/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221200702.E696611C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-goodies/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ23713/rpms/emacs-goodies/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-goodies


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-goodies
# $Id: Makefile,v 1.1 2009/12/21 20:07:02 kevin Exp $
NAME := emacs-goodies
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 20:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:07:45 +0000
Subject: [pkgdb] dogtag-pki-common-ui summary updated by kevin
Message-ID: <20091221200745.B9C1D10F8B4@bastion.fedoraproject.org>

kevin set package dogtag-pki-common-ui summary to The Dogtag PKI Common Framework User Interface

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-common-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:07:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:07:54 +0000
Subject: [pkgdb] dogtag-pki-common-ui was added for kwright
Message-ID: <20091221200744.2DB9610F8D3@bastion.fedoraproject.org>

kevin has added Package dogtag-pki-common-ui with summary The Dogtag PKI Common Framework User Interface
kevin has approved Package dogtag-pki-common-ui
kevin has added a Fedora devel branch for dogtag-pki-common-ui with an owner of kwright
kevin has approved dogtag-pki-common-ui in Fedora devel
kevin has approved Package dogtag-pki-common-ui
kevin has set commit to Approved for 107427 on dogtag-pki-common-ui (Fedora devel)
kevin has set checkout to Approved for 107427 on dogtag-pki-common-ui (Fedora devel)
kevin has set build to Approved for 107427 on dogtag-pki-common-ui (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-common-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:07:45 +0000
Subject: [pkgdb] dogtag-pki-common-ui (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221200745.BCA0210F8BA@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for dogtag-pki-common-ui
kevin has set commit to Approved for 107427 on dogtag-pki-common-ui (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on dogtag-pki-common-ui (Fedora EPEL 5)
kevin has set build to Approved for 107427 on dogtag-pki-common-ui (Fedora EPEL 5)
kevin approved watchbugzilla on dogtag-pki-common-ui (Fedora EPEL 5) for ausil
kevin approved watchcommits on dogtag-pki-common-ui (Fedora EPEL 5) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-common-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:07:45 +0000
Subject: [pkgdb] dogtag-pki-common-ui (Fedora, 11) updated by kevin
Message-ID: <20091221200745.C9CBE10F8B3@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for dogtag-pki-common-ui
kevin has set commit to Approved for 107427 on dogtag-pki-common-ui (Fedora 11)
kevin has set checkout to Approved for 107427 on dogtag-pki-common-ui (Fedora 11)
kevin has set build to Approved for 107427 on dogtag-pki-common-ui (Fedora 11)
kevin approved watchbugzilla on dogtag-pki-common-ui (Fedora 11) for ausil
kevin approved watchcommits on dogtag-pki-common-ui (Fedora 11) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-common-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:07:45 +0000
Subject: [pkgdb] dogtag-pki-common-ui (Fedora, devel) updated by kevin
Message-ID: <20091221200745.D5AC910F8DD@bastion.fedoraproject.org>

kevin approved watchbugzilla on dogtag-pki-common-ui (Fedora devel) for ausil
kevin approved watchcommits on dogtag-pki-common-ui (Fedora devel) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-common-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:07:45 +0000
Subject: [pkgdb] dogtag-pki-common-ui (Fedora, 12) updated by kevin
Message-ID: <20091221200745.DB83E10F8BE@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for dogtag-pki-common-ui
kevin has set commit to Approved for 107427 on dogtag-pki-common-ui (Fedora 12)
kevin has set checkout to Approved for 107427 on dogtag-pki-common-ui (Fedora 12)
kevin has set build to Approved for 107427 on dogtag-pki-common-ui (Fedora 12)
kevin approved watchbugzilla on dogtag-pki-common-ui (Fedora 12) for ausil
kevin approved watchcommits on dogtag-pki-common-ui (Fedora 12) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-common-ui



From kevin at fedoraproject.org  Mon Dec 21 20:07:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:07:52 +0000 (UTC)
Subject: rpms/dogtag-pki-common-ui - New directory
Message-ID: <20091221200752.1973211C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dogtag-pki-common-ui
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse24005/rpms/dogtag-pki-common-ui

Log Message:
Directory /cvs/pkgs/rpms/dogtag-pki-common-ui added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:07:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:07:52 +0000 (UTC)
Subject: rpms/dogtag-pki-common-ui/devel - New directory
Message-ID: <20091221200752.294FF11C02C4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dogtag-pki-common-ui/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse24005/rpms/dogtag-pki-common-ui/devel

Log Message:
Directory /cvs/pkgs/rpms/dogtag-pki-common-ui/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:07:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:07:59 +0000 (UTC)
Subject: rpms/dogtag-pki-common-ui Makefile,NONE,1.1
Message-ID: <20091221200759.7E75B11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dogtag-pki-common-ui
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse24005/rpms/dogtag-pki-common-ui

Added Files:
	Makefile 
Log Message:
Setup of module dogtag-pki-common-ui


--- NEW FILE Makefile ---
# Top level Makefile for module dogtag-pki-common-ui
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 20:07:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:07:59 +0000 (UTC)
Subject: rpms/dogtag-pki-common-ui/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091221200759.BE9ED11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dogtag-pki-common-ui/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse24005/rpms/dogtag-pki-common-ui/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dogtag-pki-common-ui


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dogtag-pki-common-ui
# $Id: Makefile,v 1.1 2009/12/21 20:07:59 kevin Exp $
NAME := dogtag-pki-common-ui
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From linville at fedoraproject.org  Mon Dec 21 20:10:41 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 21 Dec 2009 20:10:41 +0000 (UTC)
Subject: rpms/hostapd/F-12 hostapd-MSG_DEBUG.patch, NONE,
	1.1 hostapd-RPM_OPT_FLAGS.patch, NONE, 1.1 hostapd.conf, NONE,
	1.1 hostapd.init, NONE, 1.1 hostapd.spec, NONE,
	1.1 hostapd.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091221201041.2598311C03AD@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/hostapd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24551

Modified Files:
	.cvsignore sources 
Added Files:
	hostapd-MSG_DEBUG.patch hostapd-RPM_OPT_FLAGS.patch 
	hostapd.conf hostapd.init hostapd.spec hostapd.sysconfig 
Log Message:
Initial import (#548180).

hostapd-MSG_DEBUG.patch:
 hostapd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hostapd-MSG_DEBUG.patch ---
diff -up hostapd-0.6.9/hostapd/hostapd.c.orig hostapd-0.6.9/hostapd/hostapd.c
--- hostapd-0.6.9/hostapd/hostapd.c.orig	2009-12-16 14:25:27.000000000 -0500
+++ hostapd-0.6.9/hostapd/hostapd.c	2009-12-16 14:27:00.000000000 -0500
@@ -1338,7 +1338,7 @@ static int hostapd_setup_bss(struct host
 	}
 
 	if (!hostapd_drv_none(hapd)) {
-		wpa_printf(MSG_ERROR, "Using interface %s with hwaddr " MACSTR
+		wpa_printf(MSG_DEBUG, "Using interface %s with hwaddr " MACSTR
 			   " and ssid '%s'",
 			   hapd->conf->iface, MAC2STR(hapd->own_addr),
 			   hapd->conf->ssid.ssid);
@@ -1937,7 +1937,7 @@ int main(int argc, char *argv[])
 
 	/* Initialize interfaces */
 	for (i = 0; i < interfaces.count; i++) {
-		wpa_printf(MSG_ERROR, "Configuration file: %s",
+		wpa_printf(MSG_DEBUG, "Configuration file: %s",
 			   argv[optind + i]);
 		interfaces.iface[i] = hostapd_init(argv[optind + i]);
 		if (!interfaces.iface[i])

hostapd-RPM_OPT_FLAGS.patch:
 Makefile |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE hostapd-RPM_OPT_FLAGS.patch ---
diff -up hostapd-0.6.9/hostapd/Makefile.orig hostapd-0.6.9/hostapd/Makefile
--- hostapd-0.6.9/hostapd/Makefile.orig	2009-12-16 18:16:19.000000000 -0500
+++ hostapd-0.6.9/hostapd/Makefile	2009-12-16 18:16:42.000000000 -0500
@@ -6,6 +6,8 @@ ifndef CFLAGS
 CFLAGS = -MMD -O2 -Wall -g
 endif
 
+CFLAGS += $(EXTRA_CFLAGS)
+
 # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
 # a file (undefine it, if you want to save in binary size)
 CFLAGS += -DHOSTAPD_DUMP_STATE


--- NEW FILE hostapd.conf ---
#
# This will give you a minimal, insecure wireless network.
# 
# DO NOT BE SATISFIED WITH THAT!!!
#
# For more information, look here:
#
#	http://wireless.kernel.org/en/users/Documentation/hostapd
#

ctrl_interface=/var/run/hostapd
ctrl_interface_group=wheel

# Some usable default settings...
macaddr_acl=0
auth_algs=1
ignore_broadcast_ssid=0

# Uncomment these for base WPA & WPA2 support with a pre-shared key
#wpa=3
#wpa_key_mgmt=WPA-PSK
#wpa_pairwise=TKIP
#rsn_pairwise=CCMP

# DO NOT FORGET TO SET A WPA PASSPHRASE!!
#wpa_passphrase=YourPassPhrase

# Most modern wireless drivers in the kernel need driver=nl80211
driver=nl80211

# Customize these for your local configuration...
interface=
hw_mode=
channel=
ssid=


--- NEW FILE hostapd.init ---
#!/bin/bash
#
# hostapd 
#
# chkconfig:   - 23 88
# description: hostapd is a user space daemon for access point and
#     authentication servers.  It implements IEEE 802.11 access point
#     management, IEEE 802.1X/WPA/WPA2/EAP Authenticators and RADIUS
#     authentication server.
# processname: hostapd
# config:      /etc/hostapd/hostapd.conf
#
### BEGIN INIT INFO
# Provides: hostapd
# Required-Start:
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 6
# Short-Description: start and stop hostapd
# Description: IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

exec="/usr/sbin/hostapd"
prog=hostapd
conf="/etc/hostapd/hostapd.conf"
lockfile=/var/lock/subsys/$prog

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

start() {
 	echo -n $"Starting $prog: $conf"
	daemon $prog -B $OTHER_ARGS $conf
	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
}

fdr_status() {
	status $prog
}


case "$1" in
	start|stop|restart|reload)
  		$1
		;;
	force-reload)
		force_reload
		;;
	status)
		fdr_status
		;;
	condrestart|try-restart)
		[ -f $lockfile ] && restart
		;;
	*)
		echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
		exit 1
esac



--- NEW FILE hostapd.spec ---
Name:           hostapd
Version:        0.6.9
Release:        6%{?dist}
Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
Group:          System Environment/Daemons
License:        BSD
URL:            http://w1.fi/hostapd
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
Source0:        %{URL}/%{name}-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.conf
Source3:        %{name}.sysconfig
Patch0:         hostapd-RPM_OPT_FLAGS.patch
Patch1:         hostapd-MSG_DEBUG.patch

BuildRequires:  libnl-devel >= 1.1
BuildRequires:  openssl-devel
BuildRequires:  gzip

Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts


%description
hostapd is a user space daemon for access point and authentication
servers.  It implements IEEE 802.11 access point management, IEEE
802.1X/WPA/WPA2/EAP Authenticators and RADIUS authentication server.

hostapd is designed to be a "daemon" program that runs in the back-
ground and acts as the backend component controlling authentication.
hostapd supports separate frontend programs and an example text-based
frontend, hostapd_cli, is included with hostapd.

%package logwatch
Summary: Logwatch scripts for hostapd
Requires: %{name} = %{version}-%{release} logwatch perl
%description logwatch
Logwatch scripts for hostapd


%prep
%setup -q

# Hack Makefile to allow use of RPM_OPT_FLAGS
%patch0 -p1

# Quiet some unnecessary console spam at startup
%patch1 -p1


%build
cd hostapd
cat defconfig | sed -e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
			-e '/^#CONFIG_RADIUS_SERVER=y/s/^#//' \
			-e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
			-e '/^#CONFIG_DRIVER_NONE=y/s/^#//' > .config
make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf %{buildroot}

# init scripts
install -d %{buildroot}/%{_initddir}
install -pm 0755 %{SOURCE1} %{buildroot}/%{_initddir}/hostapd

# logwatch files
install -d %{buildroot}/%{_sysconfdir}/logwatch/conf/services
install -pm 0644 hostapd/logwatch/hostapd.conf  \
        %{buildroot}/%{_sysconfdir}/logwatch/conf/services/hostapd.conf
install -d %{buildroot}/%{_sysconfdir}/logwatch/scripts/services
install -pm 0755 hostapd/logwatch/hostapd \
        %{buildroot}/%{_sysconfdir}/logwatch/scripts/services/hostapd

# config files
install -d %{buildroot}/%{_sysconfdir}/%{name}
install -pm 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/hostapd.conf

install -d %{buildroot}/%{_sysconfdir}/sysconfig
install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/hostapd

# binaries
install -d %{buildroot}/%{_sbindir}
install -pm 0755 hostapd/hostapd %{buildroot}%{_sbindir}/hostapd
install -pm 0755 hostapd/hostapd_cli %{buildroot}%{_sbindir}/hostapd_cli

# runtime state directory
install -d %{buildroot}/%{_localstatedir}/run/%{name}

# man pages
/usr/bin/gzip -c hostapd/hostapd_cli.1 > hostapd/hostapd_cli.1.gz
/usr/bin/gzip -c hostapd/hostapd.8 > hostapd/hostapd.8.gz
install -d %{buildroot}%{_mandir}/man{1,8}
install -pm 0644 hostapd/hostapd_cli.1.gz %{buildroot}%{_mandir}/man1
install -pm 0644 hostapd/hostapd.8.gz %{buildroot}%{_mandir}/man8

# prepare docs
cp hostapd/README ./README.hostapd
cp hostapd/logwatch/README ./README.logwatch


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README README.hostapd
%doc hostapd/hostapd.conf hostapd/wired.conf
%doc hostapd/hostapd.accept hostapd/hostapd.deny
%doc hostapd/hostapd.eap_user hostapd/hostapd.radius_clients
%doc hostapd/hostapd.vlan hostapd/hostapd.wpa_psk
%config(noreplace) %{_sysconfdir}/%{name}/hostapd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/hostapd
%{_initddir}/hostapd
%{_sbindir}/hostapd
%{_sbindir}/hostapd_cli
%dir %{_sysconfdir}/%{name}
%dir %{_localstatedir}/run/%{name}
%{_mandir}/man1/*
%{_mandir}/man8/*

%files logwatch
%defattr(-,root,root,-)
%doc hostapd/logwatch/README
%config(noreplace) %{_sysconfdir}/logwatch/conf/services/hostapd.conf
%{_sysconfdir}/logwatch/scripts/services/hostapd


%post
/sbin/chkconfig --add %{name}


%preun
if [ $1 = 0 ]; then
        /sbin/service %{name} stop >/dev/null 2>&1
        /sbin/chkconfig --del %{name}
fi


%changelog
* Thu Dec 17 2009 John W. Linville <linville at redhat.com> - 0.6.9-6
- Enable RADIUS server
- Enable "wired" and "none" drivers
- Use BSD license option

* Wed Dec 16 2009 John W. Linville <linville at redhat.com> - 0.6.9-5
- Use openssl instead of gnutls (broken)

* Wed Dec 16 2009 John W. Linville <linville at redhat.com> - 0.6.9-4
- Remove wired.conf from %doc (not in chosen configuration)
- Use $RPM_OPT_FLAGS
- Add %{?dist} tag

* Wed Dec 16 2009 John W. Linville <linville at redhat.com> - 0.6.9-3
- Use gnutls instead of openssl
- Turn-off internal EAP server (broken w/ gnutls)
- Remove %doc files not applicable to chosen configuration
- Un-mangle README filename for logwatch sub-package

* Wed Dec 16 2009 John W. Linville <linville at redhat.com> - 0.6.9-2
- Initial build
- Start release at 2 to avoid conflicts w/ previous attempts by others


--- NEW FILE hostapd.sysconfig ---
# Other arguments
#   -d   show more debug messages (-dd for even more)
#   -K   include key data in debug messages
#   -t   include timestamps in some debug messages
OTHER_ARGS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hostapd/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:40:51 -0000	1.1
+++ .cvsignore	21 Dec 2009 20:10:40 -0000	1.2
@@ -0,0 +1 @@
+hostapd-0.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hostapd/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:40:51 -0000	1.1
+++ sources	21 Dec 2009 20:10:40 -0000	1.2
@@ -0,0 +1 @@
+83630d11fa66ade9091f1b304fccd74c  hostapd-0.6.9.tar.gz



From pkgdb at fedoraproject.org  Mon Dec 21 20:10:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:10:42 +0000
Subject: [pkgdb] dogtag-pki-ca-ui was added for kwright
Message-ID: <20091221201042.EDEAE10F892@bastion.fedoraproject.org>

kevin has added Package dogtag-pki-ca-ui with summary The Dogtag Certificate Authority User Interface
kevin has approved Package dogtag-pki-ca-ui
kevin has added a Fedora devel branch for dogtag-pki-ca-ui with an owner of kwright
kevin has approved dogtag-pki-ca-ui in Fedora devel
kevin has approved Package dogtag-pki-ca-ui
kevin has set commit to Approved for 107427 on dogtag-pki-ca-ui (Fedora devel)
kevin has set checkout to Approved for 107427 on dogtag-pki-ca-ui (Fedora devel)
kevin has set build to Approved for 107427 on dogtag-pki-ca-ui (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-ca-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:10:44 +0000
Subject: [pkgdb] dogtag-pki-ca-ui summary updated by kevin
Message-ID: <20091221201044.B61C510F894@bastion.fedoraproject.org>

kevin set package dogtag-pki-ca-ui summary to The Dogtag Certificate Authority User Interface

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-ca-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:10:44 +0000
Subject: [pkgdb] dogtag-pki-ca-ui (Fedora, 11) updated by kevin
Message-ID: <20091221201044.BDBD710F8B9@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for dogtag-pki-ca-ui
kevin has set commit to Approved for 107427 on dogtag-pki-ca-ui (Fedora 11)
kevin has set checkout to Approved for 107427 on dogtag-pki-ca-ui (Fedora 11)
kevin has set build to Approved for 107427 on dogtag-pki-ca-ui (Fedora 11)
kevin approved watchbugzilla on dogtag-pki-ca-ui (Fedora 11) for ausil
kevin approved watchcommits on dogtag-pki-ca-ui (Fedora 11) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-ca-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:10:44 +0000
Subject: [pkgdb] dogtag-pki-ca-ui (Fedora, 12) updated by kevin
Message-ID: <20091221201044.DC3A110F8C0@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for dogtag-pki-ca-ui
kevin has set commit to Approved for 107427 on dogtag-pki-ca-ui (Fedora 12)
kevin has set checkout to Approved for 107427 on dogtag-pki-ca-ui (Fedora 12)
kevin has set build to Approved for 107427 on dogtag-pki-ca-ui (Fedora 12)
kevin approved watchbugzilla on dogtag-pki-ca-ui (Fedora 12) for ausil
kevin approved watchcommits on dogtag-pki-ca-ui (Fedora 12) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-ca-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:10:44 +0000
Subject: [pkgdb] dogtag-pki-ca-ui (Fedora, devel) updated by kevin
Message-ID: <20091221201044.CFE1E10F8BD@bastion.fedoraproject.org>

kevin approved watchbugzilla on dogtag-pki-ca-ui (Fedora devel) for ausil
kevin approved watchcommits on dogtag-pki-ca-ui (Fedora devel) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-ca-ui



From pkgdb at fedoraproject.org  Mon Dec 21 20:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:10:44 +0000
Subject: [pkgdb] dogtag-pki-ca-ui (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221201044.E350910F8C5@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for dogtag-pki-ca-ui
kevin has set commit to Approved for 107427 on dogtag-pki-ca-ui (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on dogtag-pki-ca-ui (Fedora EPEL 5)
kevin has set build to Approved for 107427 on dogtag-pki-ca-ui (Fedora EPEL 5)
kevin approved watchbugzilla on dogtag-pki-ca-ui (Fedora EPEL 5) for ausil
kevin approved watchcommits on dogtag-pki-ca-ui (Fedora EPEL 5) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dogtag-pki-ca-ui



From kevin at fedoraproject.org  Mon Dec 21 20:10:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:10:57 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui - New directory
Message-ID: <20091221201057.1113411C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss24675/rpms/dogtag-pki-ca-ui

Log Message:
Directory /cvs/pkgs/rpms/dogtag-pki-ca-ui added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:10:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:10:57 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui/devel - New directory
Message-ID: <20091221201057.2BB5111C02C9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss24675/rpms/dogtag-pki-ca-ui/devel

Log Message:
Directory /cvs/pkgs/rpms/dogtag-pki-ca-ui/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:11:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:11:04 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui Makefile,NONE,1.1
Message-ID: <20091221201104.88D5311C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss24675/rpms/dogtag-pki-ca-ui

Added Files:
	Makefile 
Log Message:
Setup of module dogtag-pki-ca-ui


--- NEW FILE Makefile ---
# Top level Makefile for module dogtag-pki-ca-ui
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Dec 21 20:11:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:11:04 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091221201104.E54B611C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss24675/rpms/dogtag-pki-ca-ui/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dogtag-pki-ca-ui


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dogtag-pki-ca-ui
# $Id: Makefile,v 1.1 2009/12/21 20:11:04 kevin Exp $
NAME := dogtag-pki-ca-ui
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Dec 21 20:11:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:11:42 +0000
Subject: [pkgdb] ant-contrib (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221201142.A5F6510F862@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for ant-contrib
kevin has set commit to Approved for 107427 on ant-contrib (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on ant-contrib (Fedora EPEL 5)
kevin has set build to Approved for 107427 on ant-contrib (Fedora EPEL 5)
kevin changed owner of ant-contrib in Fedora EPEL 5 to orion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ant-contrib



From pkgdb at fedoraproject.org  Mon Dec 21 20:12:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:12:56 +0000
Subject: [pkgdb] polkit-qt (Fedora, 12) updated by kevin
Message-ID: <20091221201246.2919110F85E@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for polkit-qt
kevin has set commit to Approved for 107427 on polkit-qt (Fedora 12)
kevin has set checkout to Approved for 107427 on polkit-qt (Fedora 12)
kevin has set build to Approved for 107427 on polkit-qt (Fedora 12)
kevin changed owner of polkit-qt in Fedora 12 to rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/polkit-qt



From pkgdb at fedoraproject.org  Mon Dec 21 20:15:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:15:26 +0000
Subject: [pkgdb] clac was added for wolfy
Message-ID: <20091221201526.DE6A510F8C0@bastion.fedoraproject.org>

kevin has added Package clac with summary Command Line Advanced Calculator
kevin has approved Package clac
kevin has added a Fedora devel branch for clac with an owner of wolfy
kevin has approved clac in Fedora devel
kevin has approved Package clac
kevin has set commit to Approved for 107427 on clac (Fedora devel)
kevin has set checkout to Approved for 107427 on clac (Fedora devel)
kevin has set build to Approved for 107427 on clac (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clac



From pkgdb at fedoraproject.org  Mon Dec 21 20:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:15:52 +0000
Subject: [pkgdb] clac summary updated by kevin
Message-ID: <20091221201541.DB62210F8D6@bastion.fedoraproject.org>

kevin set package clac summary to Command Line Advanced Calculator

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clac



From pkgdb at fedoraproject.org  Mon Dec 21 20:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:15:53 +0000
Subject: [pkgdb] clac (Fedora, 11) updated by kevin
Message-ID: <20091221201542.AE8A910F8CB@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for clac
kevin has set commit to Approved for 107427 on clac (Fedora 11)
kevin has set checkout to Approved for 107427 on clac (Fedora 11)
kevin has set build to Approved for 107427 on clac (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clac



From pkgdb at fedoraproject.org  Mon Dec 21 20:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:15:53 +0000
Subject: [pkgdb] clac (Fedora EPEL, 4) updated by kevin
Message-ID: <20091221201543.38DE510F8C2@bastion.fedoraproject.org>

kevin added a Fedora EPEL 4 branch for clac
kevin has set commit to Approved for 107427 on clac (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on clac (Fedora EPEL 4)
kevin has set build to Approved for 107427 on clac (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clac



From pkgdb at fedoraproject.org  Mon Dec 21 20:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:15:53 +0000
Subject: [pkgdb] clac (Fedora, 12) updated by kevin
Message-ID: <20091221201543.F2AF110F8D9@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for clac
kevin has set commit to Approved for 107427 on clac (Fedora 12)
kevin has set checkout to Approved for 107427 on clac (Fedora 12)
kevin has set build to Approved for 107427 on clac (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clac



From pkgdb at fedoraproject.org  Mon Dec 21 20:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 20:15:53 +0000
Subject: [pkgdb] clac (Fedora EPEL, 5) updated by kevin
Message-ID: <20091221201545.0669B10F8B4@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for clac
kevin has set commit to Approved for 107427 on clac (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on clac (Fedora EPEL 5)
kevin has set build to Approved for 107427 on clac (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clac



From kevin at fedoraproject.org  Mon Dec 21 20:15:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:15:54 +0000 (UTC)
Subject: rpms/clac - New directory
Message-ID: <20091221201554.11F8911C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clac
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN25594/rpms/clac

Log Message:
Directory /cvs/pkgs/rpms/clac added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:15:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:15:54 +0000 (UTC)
Subject: rpms/clac/devel - New directory
Message-ID: <20091221201554.3019411C02C9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clac/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN25594/rpms/clac/devel

Log Message:
Directory /cvs/pkgs/rpms/clac/devel added to the repository




From kevin at fedoraproject.org  Mon Dec 21 20:16:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:16:01 +0000 (UTC)
Subject: rpms/clac/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091221201601.98EBB11C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clac/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN25594/rpms/clac/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clac


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: clac
# $Id: Makefile,v 1.1 2009/12/21 20:16:01 kevin Exp $
NAME := clac
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Mon Dec 21 20:16:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 21 Dec 2009 20:16:01 +0000 (UTC)
Subject: rpms/clac Makefile,NONE,1.1
Message-ID: <20091221201601.690B111C00E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clac
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN25594/rpms/clac

Added Files:
	Makefile 
Log Message:
Setup of module clac


--- NEW FILE Makefile ---
# Top level Makefile for module clac
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kalev at fedoraproject.org  Mon Dec 21 20:25:30 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Mon, 21 Dec 2009 20:25:30 +0000 (UTC)
Subject: rpms/pcsc-lite/devel pcsc-lite.spec,1.23,1.24
Message-ID: <20091221202530.1A51111C00E7@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/pcsc-lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26679

Modified Files:
	pcsc-lite.spec 
Log Message:
- Require -libs subpackage from main pcsc-lite package
- Build -doc subpackage as noarch
- Dropped --enable-runpid configure option which was removed in 1.4.99
- Dropped obsolete provides
- Spec file cleanup



Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- pcsc-lite.spec	19 Nov 2009 11:56:10 -0000	1.23
+++ pcsc-lite.spec	21 Dec 2009 20:25:29 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 %define upstream_build 3082
 
@@ -14,7 +14,7 @@ Patch2:         %{name}-close_on_exec.pa
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libusb-devel >= 0.1.7
+BuildRequires:  libusb-devel
 BuildRequires:  hal-devel 
 BuildRequires:  doxygen
 Requires(post): initscripts
@@ -23,6 +23,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 Requires:       pcsc-ifd-handler
+Requires:       %{name}-libs = %{version}-%{release}
 
 %description
 The purpose of PC/SC Lite is to provide a Windows(R) SCard interface
@@ -36,7 +37,6 @@ line tools.
 %package        libs
 Summary:        PC/SC Lite libraries
 Group:          System Environment/Libraries
-Provides:       libpcsc-lite = %{version}-%{release}
 
 %description    libs
 PC/SC Lite libraries.
@@ -46,7 +46,6 @@ Summary:        PC/SC Lite development f
 Group:          Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
-Provides:       libpcsc-lite-devel = %{version}-%{release}
 
 %description    devel
 PC/SC Lite development files.
@@ -54,6 +53,7 @@ PC/SC Lite development files.
 %package        doc
 Summary:        PC/SC Lite developer documentation
 Group:          Documentation
+BuildArch:      noarch
 
 %description    doc
 %{summary}.
@@ -69,7 +69,6 @@ Group:          Documentation
 %configure \
   --disable-dependency-tracking \
   --disable-static \
-  --enable-runpid=%{_localstatedir}/run/pcscd.pid \
   --enable-confdir=%{_sysconfdir} \
   --enable-ipcdir=%{_localstatedir}/run \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers
@@ -90,11 +89,10 @@ All *.conf files in this directory are m
 by %{_sbindir}/update-reader.conf.
 EOF
 
-rm $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.la}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# formaticc doesn't exist any more, don't include the man page
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/formaticc.1*
+rm $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
 
 
 %clean
@@ -150,6 +148,13 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Kalev Lember <kalev at smartlink.ee> - 1.5.5-2
+- Require -libs subpackage from main pcsc-lite package
+- Build -doc subpackage as noarch
+- Dropped --enable-runpid configure option which was removed in 1.4.99
+- Dropped obsolete provides
+- Spec file cleanup
+
 * Wed Nov 18 2009 Kalev Lember <kalev at smartlink.ee> - 1.5.5-1
 - Updated to pcsc-lite 1.5.5
 - Rebased rpath64 patch



From ingvar at fedoraproject.org  Mon Dec 21 20:30:13 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Mon, 21 Dec 2009 20:30:13 +0000 (UTC)
Subject: rpms/varnish/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 varnish.spec, 1.23, 1.24
Message-ID: <20091221203013.0CB4C11C02C4@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27498

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 Nov 2009 20:19:14 -0000	1.11
+++ .cvsignore	21 Dec 2009 20:30:12 -0000	1.12
@@ -1 +1 @@
-varnish-2.0.5.tar.gz
+varnish-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Nov 2009 20:19:14 -0000	1.11
+++ sources	21 Dec 2009 20:30:12 -0000	1.12
@@ -1 +1 @@
-fde37b8c571cb69cf9e9f0da62a8310b  varnish-2.0.5.tar.gz
+d91dc21c636db61c69b5e8f061c5bb95  varnish-2.0.6.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- varnish.spec	9 Nov 2009 20:19:14 -0000	1.23
+++ varnish.spec	21 Dec 2009 20:30:12 -0000	1.24
@@ -1,14 +1,12 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.5
+Version: 2.0.6
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
-Patch1: varnish.s390x_pagesize.patch
-Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -71,8 +69,6 @@ Varnish is a high-performance HTTP accel
 #./autogen.sh
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -239,6 +235,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
+- New upstream release
+
 * Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
 - New upstream release
 



From caolanm at fedoraproject.org  Mon Dec 21 20:32:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 20:32:20 +0000 (UTC)
Subject: File planner2html-1.0.0.tar.gz uploaded to lookaside cache by caolanm
Message-ID: <20091221203220.C1D7510F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for planner2html:

de94e1fdd70eb35f9f8baf0aa521f53c  planner2html-1.0.0.tar.gz



From caolanm at fedoraproject.org  Mon Dec 21 20:32:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 20:32:53 +0000 (UTC)
Subject: rpms/planner2html/devel import.log, NONE,
	1.1 planner2html-1.0.cflags.patch, NONE, 1.1 planner2html.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221203253.050E311C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27939/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log planner2html-1.0.cflags.patch planner2html.spec 
Log Message:



--- NEW FILE import.log ---
planner2html-1_0_0-2_fc12:HEAD:planner2html-1.0.0-2.fc12.src.rpm:1261427550

planner2html-1.0.cflags.patch:
 Makefile       |    2 +-
 planner2html.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE planner2html-1.0.cflags.patch ---
diff -ru planner2html-1.0.orig/Makefile planner2html-1.0/Makefile
--- planner2html-1.0.orig/Makefile	2009-12-21 12:29:04.000000000 +0000
+++ planner2html-1.0/Makefile	2009-12-21 12:29:17.000000000 +0000
@@ -1,7 +1,7 @@
 PLANNERFLAGS = $(shell pkg-config --cflags --libs libplanner-1)
 
 planner2html: planner2html.c
-	$(CC) $(PLANNERFLAGS) planner2html.c -o planner2html
+	$(CC) $(PLANNERFLAGS) $(RPM_OPT_FLAGS) planner2html.c -o planner2html
 
 clean:
 	$(RM) planner2html
diff -ru planner2html-1.0.orig/planner2html.c planner2html-1.0/planner2html.c
--- planner2html-1.0.orig/planner2html.c	2009-12-21 12:29:04.000000000 +0000
+++ planner2html-1.0/planner2html.c	2009-12-21 12:30:55.000000000 +0000
@@ -53,7 +53,7 @@
         if (!mrp_project_export(project, "-", "Planner HTML", TRUE, &err))
 	{
 		if (!err)
-			fprintf (stderr, "Unable to export to html", argv[1]);
+			fprintf (stderr, "Unable to export %s to html", argv[1]);
 		else
 		{
 			fprintf (stderr, "%s", err->message);


--- NEW FILE planner2html.spec ---
Name:      planner2html
Summary:   Convert planner files to html
Version:   1.0.0
Release:   2%{?dist}
Source:    http://www.skynet.ie/~caolan/pub/%{name}/%{name}-%{version}.tar.gz
Group:     System Environment/Libraries
URL:       http://www.skynet.ie/~caolan/Packages/planner2html.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License:   GPLv2+
BuildRequires: planner-devel
Patch0:    planner2html-1.0.cflags.patch

%description
A command line utility to to convert .planner files to .html.

%prep
%setup -q
%patch0 -p1 -b .cflags

%build
echo $CFLAGS
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/%{name}

%changelog
* Mon Dec 21 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.0-2
- Use parallel make (only 1 source file)
- Preserve timestamps 
- honour RPM_OPT_FLAGS

* Thu Dec 10 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.0-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/planner2html/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:39:51 -0000	1.1
+++ .cvsignore	21 Dec 2009 20:32:52 -0000	1.2
@@ -0,0 +1 @@
+planner2html-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/planner2html/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:39:52 -0000	1.1
+++ sources	21 Dec 2009 20:32:52 -0000	1.2
@@ -0,0 +1 @@
+de94e1fdd70eb35f9f8baf0aa521f53c  planner2html-1.0.0.tar.gz



From caolanm at fedoraproject.org  Mon Dec 21 20:33:47 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 20:33:47 +0000 (UTC)
Subject: File planner2html-1.0.1.tar.gz uploaded to lookaside cache by caolanm
Message-ID: <20091221203347.E323010F862@bastion.fedoraproject.org>

A file has been added to the lookaside cache for planner2html:

d102f654ce134b94d19fecedee08cc91  planner2html-1.0.1.tar.gz



From caolanm at fedoraproject.org  Mon Dec 21 20:34:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 20:34:52 +0000 (UTC)
Subject: rpms/planner2html/devel .cvsignore, 1.2,
	1.3 planner2html-1.0.cflags.patch, 1.1, 1.2 planner2html.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091221203452.32DC311C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28239

Modified Files:
	.cvsignore planner2html-1.0.cflags.patch planner2html.spec 
	sources 
Log Message:
bump


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/planner2html/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Dec 2009 20:32:52 -0000	1.2
+++ .cvsignore	21 Dec 2009 20:34:51 -0000	1.3
@@ -1 +1 @@
-planner2html-1.0.0.tar.gz
+planner2html-1.0.1.tar.gz

planner2html-1.0.cflags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: planner2html-1.0.cflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/planner2html/devel/planner2html-1.0.cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- planner2html-1.0.cflags.patch	21 Dec 2009 20:32:52 -0000	1.1
+++ planner2html-1.0.cflags.patch	21 Dec 2009 20:34:51 -0000	1.2
@@ -10,15 +10,3 @@ diff -ru planner2html-1.0.orig/Makefile 
  
  clean:
  	$(RM) planner2html
-diff -ru planner2html-1.0.orig/planner2html.c planner2html-1.0/planner2html.c
---- planner2html-1.0.orig/planner2html.c	2009-12-21 12:29:04.000000000 +0000
-+++ planner2html-1.0/planner2html.c	2009-12-21 12:30:55.000000000 +0000
-@@ -53,7 +53,7 @@
-         if (!mrp_project_export(project, "-", "Planner HTML", TRUE, &err))
- 	{
- 		if (!err)
--			fprintf (stderr, "Unable to export to html", argv[1]);
-+			fprintf (stderr, "Unable to export %s to html", argv[1]);
- 		else
- 		{
- 			fprintf (stderr, "%s", err->message);


Index: planner2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner2html/devel/planner2html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- planner2html.spec	21 Dec 2009 20:32:52 -0000	1.1
+++ planner2html.spec	21 Dec 2009 20:34:51 -0000	1.2
@@ -1,7 +1,7 @@
 Name:      planner2html
 Summary:   Convert planner files to html
-Version:   1.0.0
-Release:   2%{?dist}
+Version:   1.0.1
+Release:   1%{?dist}
 Source:    http://www.skynet.ie/~caolan/pub/%{name}/%{name}-%{version}.tar.gz
 Group:     System Environment/Libraries
 URL:       http://www.skynet.ie/~caolan/Packages/planner2html.html
@@ -35,7 +35,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
-* Mon Dec 21 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.0-2
+* Mon Dec 21 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.1-1
 - Use parallel make (only 1 source file)
 - Preserve timestamps 
 - honour RPM_OPT_FLAGS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/planner2html/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Dec 2009 20:32:52 -0000	1.2
+++ sources	21 Dec 2009 20:34:51 -0000	1.3
@@ -1 +1 @@
-de94e1fdd70eb35f9f8baf0aa521f53c  planner2html-1.0.0.tar.gz
+d102f654ce134b94d19fecedee08cc91  planner2html-1.0.1.tar.gz



From caolanm at fedoraproject.org  Mon Dec 21 20:35:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 21 Dec 2009 20:35:51 +0000 (UTC)
Subject: rpms/planner2html/F-12 planner2html-1.0.cflags.patch, NONE,
	1.1 planner2html.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091221203551.4E96211C00E7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/planner2html/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28468

Modified Files:
	sources 
Added Files:
	planner2html-1.0.cflags.patch planner2html.spec 
Log Message:
F-12

planner2html-1.0.cflags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE planner2html-1.0.cflags.patch ---
diff -ru planner2html-1.0.orig/Makefile planner2html-1.0/Makefile
--- planner2html-1.0.orig/Makefile	2009-12-21 12:29:04.000000000 +0000
+++ planner2html-1.0/Makefile	2009-12-21 12:29:17.000000000 +0000
@@ -1,7 +1,7 @@
 PLANNERFLAGS = $(shell pkg-config --cflags --libs libplanner-1)
 
 planner2html: planner2html.c
-	$(CC) $(PLANNERFLAGS) planner2html.c -o planner2html
+	$(CC) $(PLANNERFLAGS) $(RPM_OPT_FLAGS) planner2html.c -o planner2html
 
 clean:
 	$(RM) planner2html


--- NEW FILE planner2html.spec ---
Name:      planner2html
Summary:   Convert planner files to html
Version:   1.0.1
Release:   1%{?dist}
Source:    http://www.skynet.ie/~caolan/pub/%{name}/%{name}-%{version}.tar.gz
Group:     System Environment/Libraries
URL:       http://www.skynet.ie/~caolan/Packages/planner2html.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License:   GPLv2+
BuildRequires: planner-devel
Patch0:    planner2html-1.0.cflags.patch

%description
A command line utility to to convert .planner files to .html.

%prep
%setup -q
%patch0 -p1 -b .cflags

%build
echo $CFLAGS
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/%{name}

%changelog
* Mon Dec 21 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.1-1
- Use parallel make (only 1 source file)
- Preserve timestamps 
- honour RPM_OPT_FLAGS

* Thu Dec 10 2009 Caolan McNamara <caolanm at redhat.com> - 1.0.0-1
- initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/planner2html/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:39:52 -0000	1.1
+++ sources	21 Dec 2009 20:35:51 -0000	1.2
@@ -0,0 +1 @@
+d102f654ce134b94d19fecedee08cc91  planner2html-1.0.1.tar.gz



From wolfy at fedoraproject.org  Mon Dec 21 20:37:17 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Mon, 21 Dec 2009 20:37:17 +0000 (UTC)
Subject: rpms/clac/devel clac.004, NONE, 1.1 clac.spec, NONE, 1.1 import.log, 
	NONE, 1.1
Message-ID: <20091221203717.E7CEC11C00E7@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/clac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28785/devel

Added Files:
	clac.004 clac.spec import.log 
Log Message:
initial import


--- NEW FILE clac.004 ---
#!/usr/bin/python
"""
################################################################
# clac version 004  2009-10-16      (c)  Mark Borgerding

Usage: clac [options] [expr1 [expr2 ...] ]

clac (Command Line Advanced Calculator) evaluates mathematical 
expressions given as arguments or as stdin and writes the answer(s) to stdout.

Unlike other command line calculators, clac:
    * has infix (natural order) expression syntax 
    * handles complex numbers.
    * defines a great many functions and constants by default
    * allows easy definition of new user functions and constants using python

"But I don't know python". 

You don't need to know python to use clac.  Expressions like 
    "1+2*3" 
    "sin(pi/4)" 
    "exp(j*2*pi/100)"
    "round( degrees(phase( e**(2j))))"
... act pretty much as you would expect.  Run the selftest (-T) for more examples.

Knowing python will help you extend clac's functionality.  Relax, it's not that hard.

Everything in the python math, and cmath modules is available...
    cos     cosh    acos    acosh   sin     sinh    asin    asinh
    tan     tanh    atan    atan2   atanh
    floor   ceil    fabs    abs     fmod modf degrees radians 
    exp     frexp   ldexp   hypot   pow     sqrt    log     log10

  ... plus a variety of other functions created to make your life easier
    phase angle mag2 cpx conj nfft gcd lcm sign log2 mag real imag

For more info about a given func, run: clac "help(func)"

"Oh but I really want the conversion from meters per second 
        to furlongs per fortnight"

New data, functions,and modules can be made via the user's .clacrc file.

e.g.
    #sample .clacrc
    from random import *
    c=3e8
    verbose=True          
    binary_prefix=True   # equivalent to using -k
    complex_tuple=True   # equivalent to using -p
    def myfunc(x):
        'a user defined function'
        return x+1


Options:
    -k : use k,m,g as binary prefix (kibibyte,mebibyte,gibibyte)
    -p : print complex numbers as (re,im) pairs,rather than re+imj
    -T : run a self-diagnostic test (which makes a nice syntax demo)
    -v : verbose
    -h : help message
    -c file: reads a config file other than $HOME/.clacrc
    -C : display copyright
"""

# __future__ division allows division of two integers to produce a float result
from __future__ import division


COPYRIGHT = """
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

 Copyright (C) 2009 Mark Borgerding    
   email: mark at borgerding dot net

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

    This program has an explicit linking exception for the extensions 
    via the rc file interface.
"""

selftests="""
1+2 == 3
sqrt(-1) == j
-2*asin(-1) == pi
abs(sin(pi)) < 1e-9
abs(1-cos(0)) < 1e-9
round( 3.1 + -4.8j) == (3-5j)
ceil( 3.1 + -4.8j) == (4-4j)
abs( 3-4j) == 5
degrees(pi) == 180 
radians(180) == pi 
abs( exp(j*pi) + 1 ) < 1e-9
pow(1.2,3.4) == 1.2**3.4
ldexp(1.2,3) == 1.2 * 2 ** 3
modf(1.2)[1] == 1
log(81,3) == 4
gcd(6,8) == 2
lcm(6,8) == 24
angle( exp( j*pi ) ) == pi
log(-1)**2 == -1*pow(pi,2)
round( degrees(phase( e**(2j)))) == 115
sum( [ round(42 * exp(j*2*x*pi/4)) for x in range(4)] ) == 0
oct(8) == '010'
0x42-042-42 == -10
1k == 1024
1m == 2**20
1g == 2**30
2**10-1 == 1023
"""

import math
from math import e,pi,atan2,fmod,frexp,hypot,ldexp,modf

def degrees(x):
    return x*180/pi

def radians(x):
    return x*pi/180

import cmath
from cmath import acosh,asinh,atanh

# other nice-to-have constants
j = i = cmath.sqrt(-1)

# some applications might want (re,im) instead of re+imj
__print_cpx_as_pairs__ = False

def dip(x):
    'demote, if possible, a complex to scalar'
    if type(x) == complex and x.imag == 0:
        return x.real
    else:
        return x

def which_call( x , mathfunc,cmathfunc , allowNegative=True):
    x=dip(x)
    if type(x) == complex or (allowNegative == False and x<0):
        return cmathfunc(x)
    else:
        return mathfunc(x)

# marshall between the math and cmath functions automatically
def acos( x ): return which_call(x,math.acos,cmath.acos)
def asin( x ): return which_call(x,math.asin,cmath.asin)
def atan( x ): return which_call(x,math.atan,cmath.atan)
def cos( x ): return which_call(x,math.cos,cmath.cos)
def cosh( x ): return which_call(x,math.cosh,cmath.cosh)
def sin( x ): return which_call(x,math.sin,cmath.sin)
def sinh( x ): return which_call(x,math.sinh,cmath.sinh)
def tan( x ): return which_call(x,math.tan,cmath.tan)
def tanh( x ): return which_call(x,math.tanh,cmath.tanh)
def exp( x ): return which_call(x,math.exp,cmath.exp)
def log10( x ): return which_call(x,math.log10,cmath.log10,False)
def sqrt( x ): return which_call(x,math.sqrt,cmath.sqrt,False)

#steal the help strings from the cmath functions
acos.__doc__ = cmath.acos.__doc__
asin.__doc__ = cmath.asin.__doc__
atan.__doc__ = cmath.atan.__doc__
cos.__doc__ = cmath.cos.__doc__
cosh.__doc__ = cmath.cosh.__doc__
sin.__doc__ = cmath.sin.__doc__
sinh.__doc__ = cmath.sinh.__doc__
tan.__doc__ = cmath.tan.__doc__
tanh.__doc__ = cmath.tanh.__doc__
exp.__doc__ = cmath.exp.__doc__
log10.__doc__ = cmath.log10.__doc__
sqrt.__doc__ = cmath.sqrt.__doc__

def log(x,b=e):
    'log(x[, base]) -> the logarithm of x to the given base.\nIf the base not specified, returns the natural logarithm (base e) of x.'
    if type(x) == complex or x<0:
        return dip( cmath.log(x) / cmath.log(b) )
    else:
        return math.log(x)/math.log(b)

def real(x):
    'return just the real portion'
    if type(x) == complex:
        return x.real
    else:
        return x

def imag(x):
    'return just the imaginary portion'
    if type(x) == complex:
        return x.imag
    else:
        return 0

def sign(x):
    'returns -1,0,1 for negative,zero,positive numbers'
    if x == 0:
        return 0
    elif x > 0:
        return 1
    else:
        return -1

def log2(x):
    'logarithm base 2'
    return log(x,2)

def nfft( insize,direction=1, musthave=2,factors=(2,3,5) ):
    """find a 'good' fft size close to the desired size
        sign(direction)     search directions
        -1                  lower
        1                   higher
        0                   closest
    """
    insize=round(insize)
    direction = sign(direction)
    offset=0
    if type(factors) not in (tuple,list): 
        factors=(factors,)
    while True:
        ntmp = insize+offset
        if musthave > 1 and (ntmp%musthave)==0:
            for f in factors:
                while (ntmp%f)==0:
                    ntmp = ntmp / f
                if ntmp==1:
                    return insize+offset
        if direction == 0:
            offset = (offset<=0) - offset 
        else:
            offset += direction

def gcd(x,y):
    'greatest common denominator'
    while x>0:
        (x,y) = (y%x,x) # Guido showed me this one on the geek cruise
    return y

def lcm(x,y):
    'least common multiple'
    return x*y/gcd(x,y)

def phase(z):
    'phase of a complex in radians' 
    z=cpx(z)
    return atan2( z.imag , z.real )

def cpx(x):
    'convert a number or tuple to a complex'
    if type(x) == tuple:
        return complex( x[0] , x[1] )
    else:
        return complex(x)

def mag2(x):
    'magnitude,squared'
    return abs(x*x)

def conj( x ):
    'complex conjugate'
    x = cpx( x )
    return complex( x.real , -x.imag )

def complexify(x,func ):
    'call func on the real and imaginary portions, creating a complex from the respective results'
    if type(x) == complex and x.imag != 0:
        return dip( complex( func(x.real) , func(x.imag) ) )
    else:
        return func(x)

# overwrite the builtin math functions that don't handle complex
def round(x):
    'nearest integer' 
    if type(x) == complex:
        return complexify( x , round )
    else:
        return math.floor(x+.5)

def floor(x):
    'round towards negative infinity' 
    return complexify( x , math.floor )
def ceil(x):
    'round towards positive infinity' 
    return complexify( x , math.ceil )
def fabs(x):
    'absolute value of real and imaginary parts'
    return complexify( x , math.fabs )

def pow(x,y):
    'raise to a power'
    if type(x) == complex or type(y) == complex:
        return dip( exp( y * log( x ) ) ) # for some reason cmath does not define pow
    else:
        return math.pow(x,y)

# some people may prefer these names
mag=abs
angle=phase

def fmt_float(x):
    'convert a single float to a string'
    return '%.17g' % x

def fmt_cpx(x):
    'convert a complex value to a string'
    if __print_cpx_as_pairs__ == True:
        return '(%s,%s)' % ( fmt_float( x.real) , fmt_float( x.imag) )
    elif x.imag<0:
        return '%s %sj' % ( fmt_float( x.real) , fmt_float( x.imag) )
    else:
        return '%s+%sj' % ( fmt_float( x.real) , fmt_float( x.imag) )

def fmt(x):
    'convert the evaluated expression to a string'
    if type(x) == complex:
        if x.imag == 0:
            return fmt_float( x.real)
        else:
            return fmt_cpx(x)
    elif type(x) in (list,tuple):
        return ','.join(  [fmt(item) for item in x ])
    elif type(x) == float:
        return fmt_float(x)
    else:
        return '%s' % x


class Session:
    'clac sequence of commands'
    def __init__(self):
        import os
        self.rcfile = '%s/.clacrc' % os.getenv('HOME')
        self.env = {}
        self.env['verbose'] = False
        self.env['binary_prefix'] = False
        self.env['complex_tuple'] = False

    def read_cmdline( self):
        import sys
        import getopt
        try:
            opts,self.args = getopt.getopt(sys.argv[1:] , 'pvc:hCkT')
            opts = dict(opts)
        except getopt.GetoptError,e:
            opts={}
            opts['-h'] = True

        if opts.has_key('-C'):
            sys.stderr.write(COPYRIGHT)
            sys.exit(1)
        if opts.has_key('-h'):
            sys.stderr.write(__doc__)
            sys.exit(1)
        self.env['verbose'] = opts.has_key('-v')
        self.env['binary_prefix'] = opts.has_key('-k')
        self.env['complex_tuple'] = opts.has_key('-p')
        self.rcfile = opts.get('-c' , self.rcfile )
        if opts.has_key('-T'):
            self.env['binary_prefix'] = True # needed for some of the selftests
            self.run_self_test()
            sys.exit(0)

    def eval_text( self,text,name="<text>" ):
        'evaluate a set of commands in a file' 
        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']
        eval( compile( text ,name,'exec') ,globals(),self.env )

    def eval_file( self,file ):
        'evaluate a set of commands in a file' 
        self.eval_text( ''.join( open(file).readlines() ) , '<%s>' % file)

    def eval_to_string( self,s  ):
        'evaluate an expression and print the string'
        if s is None: return
        if s in ('','\n'): return
        if self.env['binary_prefix']:
            import re
            s = re.sub( r'(\b[\d+])[kK]\b' , '\\1*1024' , s )
            s = re.sub( r'(\b[\d+])[mM]\b' , '\\1*1048576' , s )
            s = re.sub( r'(\b[\d+])[gG]\b' , '\\1*1073741824' , s )

        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']

        eval_rc = eval( s ,globals(),self.env )
        if  eval_rc is None: return
        return fmt( eval_rc )

    def eval_expr( self,s  ):
        s2 = self.eval_to_string(s)
        if s2:
            print s2

    def run_self_test(self):
        for expr in selftests.split('\n'):
            if expr == "": continue
            result = self.eval_to_string(expr)
            if result == "True":
                print " %s" % expr
            else:
                raise AssertionError( "FAILED:%s" % expr )

    def main(self):
        self.read_cmdline()
        import os
        import sys
        # read and evaluate the rc file in the current context
        if os.access( self.rcfile,os.F_OK):
            self.eval_file( self.rcfile )

        if len( self.args ) < 1:
            #interactive mode
            while 1:
                line = sys.stdin.readline()
                if line == '':
                    break
                self.eval_expr( line )
        else:
            # arguments are expressions
            for expr in self.args:
                self.eval_expr( expr )

if __name__ == "__main__":
    ses=Session()
    ses.main()


--- NEW FILE clac.spec ---
Name:		clac
Version:	004
Release:	1%{?dist}
Summary:	Command Line Advanced Calculator

Group:		Applications/Engineering
License:	GPLv3+
URL:		http://sourceforge.net/projects/clac/
Source0:	http://downloads.sourceforge.net/%{name}/clac.004
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Buildarch:	noarch

%description
clac (Command Line Advanced Calculator) evaluates mathematical expressions
from the argument list or from stdin and writes the answer(s) to stdout. 

%prep
#%setup -q


%build
#nothing to build


%install
rm -rf $RPM_BUILD_ROOT
install -D -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/clac

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#there are no separate docs or license files
#the license is specified inside the only file provided
#%doc
%{_bindir}/clac


%changelog
* Sat Dec 12 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 004-1
- First Fedora version


--- NEW FILE import.log ---
clac-004-1_fc10:HEAD:clac-004-1.fc10.src.rpm:1261427807



From sgallagh at fedoraproject.org  Mon Dec 21 20:39:34 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 21 Dec 2009 20:39:34 +0000 (UTC)
Subject: rpms/sssd/devel cfg_dbg_timestamps.patch, NONE, 1.1 sssd.spec, 1.30, 
	1.31
Message-ID: <20091221203934.D450211C00E7@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29075

Modified Files:
	sssd.spec 
Added Files:
	cfg_dbg_timestamps.patch 
Log Message:
Fix https://bugzilla.redhat.com/show_bug.cgi?id=549482


cfg_dbg_timestamps.patch:
 SSSDConfigTest.py |    2 ++
 etc/sssd.api.conf |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE cfg_dbg_timestamps.patch ---
>From a79fed1bece2e33759546f97ce0f22af3745ac80 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Mon, 21 Dec 2009 13:03:03 -0500
Subject: [PATCH] Allow debug_timestamps setting on a per-domain basis

This was missing from the SSSDConfig API, though it was supported
by the daemon.
---
 server/config/SSSDConfigTest.py |    2 ++
 server/config/etc/sssd.api.conf |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/server/config/SSSDConfigTest.py b/server/config/SSSDConfigTest.py
index f893d98..1e79342 100755
--- a/server/config/SSSDConfigTest.py
+++ b/server/config/SSSDConfigTest.py
@@ -372,6 +372,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
         options = domain.list_options()
         control_list = [
             'debug_level',
+            'debug_timestamps',
             'min_id',
             'max_id',
             'timeout',
@@ -586,6 +587,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
         options = domain.list_options()
         control_list = [
             'debug_level',
+            'debug_timestamps',
             'min_id',
             'max_id',
             'timeout',
diff --git a/server/config/etc/sssd.api.conf b/server/config/etc/sssd.api.conf
index c8ddae4..bdb6aab 100644
--- a/server/config/etc/sssd.api.conf
+++ b/server/config/etc/sssd.api.conf
@@ -42,6 +42,7 @@ chpass_provider = str, None
 [domain]
 # Options available to all domains
 debug_level = int, None, 0
+debug_timestamps = bool, None
 command = str, None
 min_id = int, None, 1000
 max_id = int, None
-- 
1.6.5.2



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sssd.spec	18 Dec 2009 23:53:16 -0000	1.30
+++ sssd.spec	21 Dec 2009 20:39:34 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name: sssd
 Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
@@ -12,6 +12,8 @@ URL: http://fedorahosted.org/sssd
 Source: https://fedorahosted.org/released/sssd/sssd-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Patch1: cfg_dbg_timestamps.patch
+
 ### Patches ###
 
 ### Dependencies ###
@@ -78,6 +80,7 @@ service.
 
 %prep
 %setup -q
+%patch1 -p1 -b .cfg_dbg_timestamps
 
 %build
 NSS_LIBS=-lnss3 \
@@ -205,6 +208,10 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 21 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-2
+- Patch SSSDConfig API to address
+- https://bugzilla.redhat.com/show_bug.cgi?id=549482
+
 * Fri Dec 18 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-1
 - New upstream stable release 1.0.0
 



From wolfy at fedoraproject.org  Mon Dec 21 20:44:06 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Mon, 21 Dec 2009 20:44:06 +0000 (UTC)
Subject: rpms/clac/F-11 clac.004, NONE, 1.1 clac.spec, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <20091221204406.C20B611C00E7@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/clac/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29707/F-11

Added Files:
	clac.004 clac.spec import.log 
Log Message:
initial import


--- NEW FILE clac.004 ---
#!/usr/bin/python
"""
################################################################
# clac version 004  2009-10-16      (c)  Mark Borgerding

Usage: clac [options] [expr1 [expr2 ...] ]

clac (Command Line Advanced Calculator) evaluates mathematical 
expressions given as arguments or as stdin and writes the answer(s) to stdout.

Unlike other command line calculators, clac:
    * has infix (natural order) expression syntax 
    * handles complex numbers.
    * defines a great many functions and constants by default
    * allows easy definition of new user functions and constants using python

"But I don't know python". 

You don't need to know python to use clac.  Expressions like 
    "1+2*3" 
    "sin(pi/4)" 
    "exp(j*2*pi/100)"
    "round( degrees(phase( e**(2j))))"
... act pretty much as you would expect.  Run the selftest (-T) for more examples.

Knowing python will help you extend clac's functionality.  Relax, it's not that hard.

Everything in the python math, and cmath modules is available...
    cos     cosh    acos    acosh   sin     sinh    asin    asinh
    tan     tanh    atan    atan2   atanh
    floor   ceil    fabs    abs     fmod modf degrees radians 
    exp     frexp   ldexp   hypot   pow     sqrt    log     log10

  ... plus a variety of other functions created to make your life easier
    phase angle mag2 cpx conj nfft gcd lcm sign log2 mag real imag

For more info about a given func, run: clac "help(func)"

"Oh but I really want the conversion from meters per second 
        to furlongs per fortnight"

New data, functions,and modules can be made via the user's .clacrc file.

e.g.
    #sample .clacrc
    from random import *
    c=3e8
    verbose=True          
    binary_prefix=True   # equivalent to using -k
    complex_tuple=True   # equivalent to using -p
    def myfunc(x):
        'a user defined function'
        return x+1


Options:
    -k : use k,m,g as binary prefix (kibibyte,mebibyte,gibibyte)
    -p : print complex numbers as (re,im) pairs,rather than re+imj
    -T : run a self-diagnostic test (which makes a nice syntax demo)
    -v : verbose
    -h : help message
    -c file: reads a config file other than $HOME/.clacrc
    -C : display copyright
"""

# __future__ division allows division of two integers to produce a float result
from __future__ import division


COPYRIGHT = """
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

 Copyright (C) 2009 Mark Borgerding    
   email: mark at borgerding dot net

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

    This program has an explicit linking exception for the extensions 
    via the rc file interface.
"""

selftests="""
1+2 == 3
sqrt(-1) == j
-2*asin(-1) == pi
abs(sin(pi)) < 1e-9
abs(1-cos(0)) < 1e-9
round( 3.1 + -4.8j) == (3-5j)
ceil( 3.1 + -4.8j) == (4-4j)
abs( 3-4j) == 5
degrees(pi) == 180 
radians(180) == pi 
abs( exp(j*pi) + 1 ) < 1e-9
pow(1.2,3.4) == 1.2**3.4
ldexp(1.2,3) == 1.2 * 2 ** 3
modf(1.2)[1] == 1
log(81,3) == 4
gcd(6,8) == 2
lcm(6,8) == 24
angle( exp( j*pi ) ) == pi
log(-1)**2 == -1*pow(pi,2)
round( degrees(phase( e**(2j)))) == 115
sum( [ round(42 * exp(j*2*x*pi/4)) for x in range(4)] ) == 0
oct(8) == '010'
0x42-042-42 == -10
1k == 1024
1m == 2**20
1g == 2**30
2**10-1 == 1023
"""

import math
from math import e,pi,atan2,fmod,frexp,hypot,ldexp,modf

def degrees(x):
    return x*180/pi

def radians(x):
    return x*pi/180

import cmath
from cmath import acosh,asinh,atanh

# other nice-to-have constants
j = i = cmath.sqrt(-1)

# some applications might want (re,im) instead of re+imj
__print_cpx_as_pairs__ = False

def dip(x):
    'demote, if possible, a complex to scalar'
    if type(x) == complex and x.imag == 0:
        return x.real
    else:
        return x

def which_call( x , mathfunc,cmathfunc , allowNegative=True):
    x=dip(x)
    if type(x) == complex or (allowNegative == False and x<0):
        return cmathfunc(x)
    else:
        return mathfunc(x)

# marshall between the math and cmath functions automatically
def acos( x ): return which_call(x,math.acos,cmath.acos)
def asin( x ): return which_call(x,math.asin,cmath.asin)
def atan( x ): return which_call(x,math.atan,cmath.atan)
def cos( x ): return which_call(x,math.cos,cmath.cos)
def cosh( x ): return which_call(x,math.cosh,cmath.cosh)
def sin( x ): return which_call(x,math.sin,cmath.sin)
def sinh( x ): return which_call(x,math.sinh,cmath.sinh)
def tan( x ): return which_call(x,math.tan,cmath.tan)
def tanh( x ): return which_call(x,math.tanh,cmath.tanh)
def exp( x ): return which_call(x,math.exp,cmath.exp)
def log10( x ): return which_call(x,math.log10,cmath.log10,False)
def sqrt( x ): return which_call(x,math.sqrt,cmath.sqrt,False)

#steal the help strings from the cmath functions
acos.__doc__ = cmath.acos.__doc__
asin.__doc__ = cmath.asin.__doc__
atan.__doc__ = cmath.atan.__doc__
cos.__doc__ = cmath.cos.__doc__
cosh.__doc__ = cmath.cosh.__doc__
sin.__doc__ = cmath.sin.__doc__
sinh.__doc__ = cmath.sinh.__doc__
tan.__doc__ = cmath.tan.__doc__
tanh.__doc__ = cmath.tanh.__doc__
exp.__doc__ = cmath.exp.__doc__
log10.__doc__ = cmath.log10.__doc__
sqrt.__doc__ = cmath.sqrt.__doc__

def log(x,b=e):
    'log(x[, base]) -> the logarithm of x to the given base.\nIf the base not specified, returns the natural logarithm (base e) of x.'
    if type(x) == complex or x<0:
        return dip( cmath.log(x) / cmath.log(b) )
    else:
        return math.log(x)/math.log(b)

def real(x):
    'return just the real portion'
    if type(x) == complex:
        return x.real
    else:
        return x

def imag(x):
    'return just the imaginary portion'
    if type(x) == complex:
        return x.imag
    else:
        return 0

def sign(x):
    'returns -1,0,1 for negative,zero,positive numbers'
    if x == 0:
        return 0
    elif x > 0:
        return 1
    else:
        return -1

def log2(x):
    'logarithm base 2'
    return log(x,2)

def nfft( insize,direction=1, musthave=2,factors=(2,3,5) ):
    """find a 'good' fft size close to the desired size
        sign(direction)     search directions
        -1                  lower
        1                   higher
        0                   closest
    """
    insize=round(insize)
    direction = sign(direction)
    offset=0
    if type(factors) not in (tuple,list): 
        factors=(factors,)
    while True:
        ntmp = insize+offset
        if musthave > 1 and (ntmp%musthave)==0:
            for f in factors:
                while (ntmp%f)==0:
                    ntmp = ntmp / f
                if ntmp==1:
                    return insize+offset
        if direction == 0:
            offset = (offset<=0) - offset 
        else:
            offset += direction

def gcd(x,y):
    'greatest common denominator'
    while x>0:
        (x,y) = (y%x,x) # Guido showed me this one on the geek cruise
    return y

def lcm(x,y):
    'least common multiple'
    return x*y/gcd(x,y)

def phase(z):
    'phase of a complex in radians' 
    z=cpx(z)
    return atan2( z.imag , z.real )

def cpx(x):
    'convert a number or tuple to a complex'
    if type(x) == tuple:
        return complex( x[0] , x[1] )
    else:
        return complex(x)

def mag2(x):
    'magnitude,squared'
    return abs(x*x)

def conj( x ):
    'complex conjugate'
    x = cpx( x )
    return complex( x.real , -x.imag )

def complexify(x,func ):
    'call func on the real and imaginary portions, creating a complex from the respective results'
    if type(x) == complex and x.imag != 0:
        return dip( complex( func(x.real) , func(x.imag) ) )
    else:
        return func(x)

# overwrite the builtin math functions that don't handle complex
def round(x):
    'nearest integer' 
    if type(x) == complex:
        return complexify( x , round )
    else:
        return math.floor(x+.5)

def floor(x):
    'round towards negative infinity' 
    return complexify( x , math.floor )
def ceil(x):
    'round towards positive infinity' 
    return complexify( x , math.ceil )
def fabs(x):
    'absolute value of real and imaginary parts'
    return complexify( x , math.fabs )

def pow(x,y):
    'raise to a power'
    if type(x) == complex or type(y) == complex:
        return dip( exp( y * log( x ) ) ) # for some reason cmath does not define pow
    else:
        return math.pow(x,y)

# some people may prefer these names
mag=abs
angle=phase

def fmt_float(x):
    'convert a single float to a string'
    return '%.17g' % x

def fmt_cpx(x):
    'convert a complex value to a string'
    if __print_cpx_as_pairs__ == True:
        return '(%s,%s)' % ( fmt_float( x.real) , fmt_float( x.imag) )
    elif x.imag<0:
        return '%s %sj' % ( fmt_float( x.real) , fmt_float( x.imag) )
    else:
        return '%s+%sj' % ( fmt_float( x.real) , fmt_float( x.imag) )

def fmt(x):
    'convert the evaluated expression to a string'
    if type(x) == complex:
        if x.imag == 0:
            return fmt_float( x.real)
        else:
            return fmt_cpx(x)
    elif type(x) in (list,tuple):
        return ','.join(  [fmt(item) for item in x ])
    elif type(x) == float:
        return fmt_float(x)
    else:
        return '%s' % x


class Session:
    'clac sequence of commands'
    def __init__(self):
        import os
        self.rcfile = '%s/.clacrc' % os.getenv('HOME')
        self.env = {}
        self.env['verbose'] = False
        self.env['binary_prefix'] = False
        self.env['complex_tuple'] = False

    def read_cmdline( self):
        import sys
        import getopt
        try:
            opts,self.args = getopt.getopt(sys.argv[1:] , 'pvc:hCkT')
            opts = dict(opts)
        except getopt.GetoptError,e:
            opts={}
            opts['-h'] = True

        if opts.has_key('-C'):
            sys.stderr.write(COPYRIGHT)
            sys.exit(1)
        if opts.has_key('-h'):
            sys.stderr.write(__doc__)
            sys.exit(1)
        self.env['verbose'] = opts.has_key('-v')
        self.env['binary_prefix'] = opts.has_key('-k')
        self.env['complex_tuple'] = opts.has_key('-p')
        self.rcfile = opts.get('-c' , self.rcfile )
        if opts.has_key('-T'):
            self.env['binary_prefix'] = True # needed for some of the selftests
            self.run_self_test()
            sys.exit(0)

    def eval_text( self,text,name="<text>" ):
        'evaluate a set of commands in a file' 
        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']
        eval( compile( text ,name,'exec') ,globals(),self.env )

    def eval_file( self,file ):
        'evaluate a set of commands in a file' 
        self.eval_text( ''.join( open(file).readlines() ) , '<%s>' % file)

    def eval_to_string( self,s  ):
        'evaluate an expression and print the string'
        if s is None: return
        if s in ('','\n'): return
        if self.env['binary_prefix']:
            import re
            s = re.sub( r'(\b[\d+])[kK]\b' , '\\1*1024' , s )
            s = re.sub( r'(\b[\d+])[mM]\b' , '\\1*1048576' , s )
            s = re.sub( r'(\b[\d+])[gG]\b' , '\\1*1073741824' , s )

        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']

        eval_rc = eval( s ,globals(),self.env )
        if  eval_rc is None: return
        return fmt( eval_rc )

    def eval_expr( self,s  ):
        s2 = self.eval_to_string(s)
        if s2:
            print s2

    def run_self_test(self):
        for expr in selftests.split('\n'):
            if expr == "": continue
            result = self.eval_to_string(expr)
            if result == "True":
                print " %s" % expr
            else:
                raise AssertionError( "FAILED:%s" % expr )

    def main(self):
        self.read_cmdline()
        import os
        import sys
        # read and evaluate the rc file in the current context
        if os.access( self.rcfile,os.F_OK):
            self.eval_file( self.rcfile )

        if len( self.args ) < 1:
            #interactive mode
            while 1:
                line = sys.stdin.readline()
                if line == '':
                    break
                self.eval_expr( line )
        else:
            # arguments are expressions
            for expr in self.args:
                self.eval_expr( expr )

if __name__ == "__main__":
    ses=Session()
    ses.main()


--- NEW FILE clac.spec ---
Name:		clac
Version:	004
Release:	1%{?dist}
Summary:	Command Line Advanced Calculator

Group:		Applications/Engineering
License:	GPLv3+
URL:		http://sourceforge.net/projects/clac/
Source0:	http://downloads.sourceforge.net/%{name}/clac.004
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Buildarch:	noarch

%description
clac (Command Line Advanced Calculator) evaluates mathematical expressions
from the argument list or from stdin and writes the answer(s) to stdout. 

%prep
#%setup -q


%build
#nothing to build


%install
rm -rf $RPM_BUILD_ROOT
install -D -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/clac

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#there are no separate docs or license files
#the license is specified inside the only file provided
#%doc
%{_bindir}/clac


%changelog
* Sat Dec 12 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 004-1
- First Fedora version


--- NEW FILE import.log ---
clac-004-1_fc10:F-11:clac-004-1.fc10.src.rpm:1261428201



From rdieter at fedoraproject.org  Mon Dec 21 20:47:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 20:47:13 +0000 (UTC)
Subject: rpms/amarok/EL-5 amarok.spec,1.89,1.90
Message-ID: <20091221204713.53D0011C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30034

Modified Files:
	amarok.spec 
Log Message:
drop helix support (#544480)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- amarok.spec	9 Nov 2009 20:04:15 -0000	1.89
+++ amarok.spec	21 Dec 2009 20:47:13 -0000	1.90
@@ -14,14 +14,6 @@
 BuildRequires:  libutempter-devel
 %endif
 
-%if 0%{?fedora} > 6
-# Helix engine on archs where it is available
-%ifnarch ppc64 x86_64 s390 s390x ia64 sparcv9 sparc64 alpha
-# consider omitting helix support, srsly, does *anyone* use it? -- Rex
-%define _with_helix --with-helix=%{_libdir}/helix
-%endif
-%endif
-
 %if 0%{?fedora}
 %define _with_ifp --with-ifp
 %define _with_libgpod --with-libgpod



From wolfy at fedoraproject.org  Mon Dec 21 20:52:02 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Mon, 21 Dec 2009 20:52:02 +0000 (UTC)
Subject: rpms/clac/F-12 clac.004, NONE, 1.1 clac.spec, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <20091221205202.E293611C00E7@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/clac/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30883/F-12

Added Files:
	clac.004 clac.spec import.log 
Log Message:
initial import


--- NEW FILE clac.004 ---
#!/usr/bin/python
"""
################################################################
# clac version 004  2009-10-16      (c)  Mark Borgerding

Usage: clac [options] [expr1 [expr2 ...] ]

clac (Command Line Advanced Calculator) evaluates mathematical 
expressions given as arguments or as stdin and writes the answer(s) to stdout.

Unlike other command line calculators, clac:
    * has infix (natural order) expression syntax 
    * handles complex numbers.
    * defines a great many functions and constants by default
    * allows easy definition of new user functions and constants using python

"But I don't know python". 

You don't need to know python to use clac.  Expressions like 
    "1+2*3" 
    "sin(pi/4)" 
    "exp(j*2*pi/100)"
    "round( degrees(phase( e**(2j))))"
... act pretty much as you would expect.  Run the selftest (-T) for more examples.

Knowing python will help you extend clac's functionality.  Relax, it's not that hard.

Everything in the python math, and cmath modules is available...
    cos     cosh    acos    acosh   sin     sinh    asin    asinh
    tan     tanh    atan    atan2   atanh
    floor   ceil    fabs    abs     fmod modf degrees radians 
    exp     frexp   ldexp   hypot   pow     sqrt    log     log10

  ... plus a variety of other functions created to make your life easier
    phase angle mag2 cpx conj nfft gcd lcm sign log2 mag real imag

For more info about a given func, run: clac "help(func)"

"Oh but I really want the conversion from meters per second 
        to furlongs per fortnight"

New data, functions,and modules can be made via the user's .clacrc file.

e.g.
    #sample .clacrc
    from random import *
    c=3e8
    verbose=True          
    binary_prefix=True   # equivalent to using -k
    complex_tuple=True   # equivalent to using -p
    def myfunc(x):
        'a user defined function'
        return x+1


Options:
    -k : use k,m,g as binary prefix (kibibyte,mebibyte,gibibyte)
    -p : print complex numbers as (re,im) pairs,rather than re+imj
    -T : run a self-diagnostic test (which makes a nice syntax demo)
    -v : verbose
    -h : help message
    -c file: reads a config file other than $HOME/.clacrc
    -C : display copyright
"""

# __future__ division allows division of two integers to produce a float result
from __future__ import division


COPYRIGHT = """
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

 Copyright (C) 2009 Mark Borgerding    
   email: mark at borgerding dot net

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

    This program has an explicit linking exception for the extensions 
    via the rc file interface.
"""

selftests="""
1+2 == 3
sqrt(-1) == j
-2*asin(-1) == pi
abs(sin(pi)) < 1e-9
abs(1-cos(0)) < 1e-9
round( 3.1 + -4.8j) == (3-5j)
ceil( 3.1 + -4.8j) == (4-4j)
abs( 3-4j) == 5
degrees(pi) == 180 
radians(180) == pi 
abs( exp(j*pi) + 1 ) < 1e-9
pow(1.2,3.4) == 1.2**3.4
ldexp(1.2,3) == 1.2 * 2 ** 3
modf(1.2)[1] == 1
log(81,3) == 4
gcd(6,8) == 2
lcm(6,8) == 24
angle( exp( j*pi ) ) == pi
log(-1)**2 == -1*pow(pi,2)
round( degrees(phase( e**(2j)))) == 115
sum( [ round(42 * exp(j*2*x*pi/4)) for x in range(4)] ) == 0
oct(8) == '010'
0x42-042-42 == -10
1k == 1024
1m == 2**20
1g == 2**30
2**10-1 == 1023
"""

import math
from math import e,pi,atan2,fmod,frexp,hypot,ldexp,modf

def degrees(x):
    return x*180/pi

def radians(x):
    return x*pi/180

import cmath
from cmath import acosh,asinh,atanh

# other nice-to-have constants
j = i = cmath.sqrt(-1)

# some applications might want (re,im) instead of re+imj
__print_cpx_as_pairs__ = False

def dip(x):
    'demote, if possible, a complex to scalar'
    if type(x) == complex and x.imag == 0:
        return x.real
    else:
        return x

def which_call( x , mathfunc,cmathfunc , allowNegative=True):
    x=dip(x)
    if type(x) == complex or (allowNegative == False and x<0):
        return cmathfunc(x)
    else:
        return mathfunc(x)

# marshall between the math and cmath functions automatically
def acos( x ): return which_call(x,math.acos,cmath.acos)
def asin( x ): return which_call(x,math.asin,cmath.asin)
def atan( x ): return which_call(x,math.atan,cmath.atan)
def cos( x ): return which_call(x,math.cos,cmath.cos)
def cosh( x ): return which_call(x,math.cosh,cmath.cosh)
def sin( x ): return which_call(x,math.sin,cmath.sin)
def sinh( x ): return which_call(x,math.sinh,cmath.sinh)
def tan( x ): return which_call(x,math.tan,cmath.tan)
def tanh( x ): return which_call(x,math.tanh,cmath.tanh)
def exp( x ): return which_call(x,math.exp,cmath.exp)
def log10( x ): return which_call(x,math.log10,cmath.log10,False)
def sqrt( x ): return which_call(x,math.sqrt,cmath.sqrt,False)

#steal the help strings from the cmath functions
acos.__doc__ = cmath.acos.__doc__
asin.__doc__ = cmath.asin.__doc__
atan.__doc__ = cmath.atan.__doc__
cos.__doc__ = cmath.cos.__doc__
cosh.__doc__ = cmath.cosh.__doc__
sin.__doc__ = cmath.sin.__doc__
sinh.__doc__ = cmath.sinh.__doc__
tan.__doc__ = cmath.tan.__doc__
tanh.__doc__ = cmath.tanh.__doc__
exp.__doc__ = cmath.exp.__doc__
log10.__doc__ = cmath.log10.__doc__
sqrt.__doc__ = cmath.sqrt.__doc__

def log(x,b=e):
    'log(x[, base]) -> the logarithm of x to the given base.\nIf the base not specified, returns the natural logarithm (base e) of x.'
    if type(x) == complex or x<0:
        return dip( cmath.log(x) / cmath.log(b) )
    else:
        return math.log(x)/math.log(b)

def real(x):
    'return just the real portion'
    if type(x) == complex:
        return x.real
    else:
        return x

def imag(x):
    'return just the imaginary portion'
    if type(x) == complex:
        return x.imag
    else:
        return 0

def sign(x):
    'returns -1,0,1 for negative,zero,positive numbers'
    if x == 0:
        return 0
    elif x > 0:
        return 1
    else:
        return -1

def log2(x):
    'logarithm base 2'
    return log(x,2)

def nfft( insize,direction=1, musthave=2,factors=(2,3,5) ):
    """find a 'good' fft size close to the desired size
        sign(direction)     search directions
        -1                  lower
        1                   higher
        0                   closest
    """
    insize=round(insize)
    direction = sign(direction)
    offset=0
    if type(factors) not in (tuple,list): 
        factors=(factors,)
    while True:
        ntmp = insize+offset
        if musthave > 1 and (ntmp%musthave)==0:
            for f in factors:
                while (ntmp%f)==0:
                    ntmp = ntmp / f
                if ntmp==1:
                    return insize+offset
        if direction == 0:
            offset = (offset<=0) - offset 
        else:
            offset += direction

def gcd(x,y):
    'greatest common denominator'
    while x>0:
        (x,y) = (y%x,x) # Guido showed me this one on the geek cruise
    return y

def lcm(x,y):
    'least common multiple'
    return x*y/gcd(x,y)

def phase(z):
    'phase of a complex in radians' 
    z=cpx(z)
    return atan2( z.imag , z.real )

def cpx(x):
    'convert a number or tuple to a complex'
    if type(x) == tuple:
        return complex( x[0] , x[1] )
    else:
        return complex(x)

def mag2(x):
    'magnitude,squared'
    return abs(x*x)

def conj( x ):
    'complex conjugate'
    x = cpx( x )
    return complex( x.real , -x.imag )

def complexify(x,func ):
    'call func on the real and imaginary portions, creating a complex from the respective results'
    if type(x) == complex and x.imag != 0:
        return dip( complex( func(x.real) , func(x.imag) ) )
    else:
        return func(x)

# overwrite the builtin math functions that don't handle complex
def round(x):
    'nearest integer' 
    if type(x) == complex:
        return complexify( x , round )
    else:
        return math.floor(x+.5)

def floor(x):
    'round towards negative infinity' 
    return complexify( x , math.floor )
def ceil(x):
    'round towards positive infinity' 
    return complexify( x , math.ceil )
def fabs(x):
    'absolute value of real and imaginary parts'
    return complexify( x , math.fabs )

def pow(x,y):
    'raise to a power'
    if type(x) == complex or type(y) == complex:
        return dip( exp( y * log( x ) ) ) # for some reason cmath does not define pow
    else:
        return math.pow(x,y)

# some people may prefer these names
mag=abs
angle=phase

def fmt_float(x):
    'convert a single float to a string'
    return '%.17g' % x

def fmt_cpx(x):
    'convert a complex value to a string'
    if __print_cpx_as_pairs__ == True:
        return '(%s,%s)' % ( fmt_float( x.real) , fmt_float( x.imag) )
    elif x.imag<0:
        return '%s %sj' % ( fmt_float( x.real) , fmt_float( x.imag) )
    else:
        return '%s+%sj' % ( fmt_float( x.real) , fmt_float( x.imag) )

def fmt(x):
    'convert the evaluated expression to a string'
    if type(x) == complex:
        if x.imag == 0:
            return fmt_float( x.real)
        else:
            return fmt_cpx(x)
    elif type(x) in (list,tuple):
        return ','.join(  [fmt(item) for item in x ])
    elif type(x) == float:
        return fmt_float(x)
    else:
        return '%s' % x


class Session:
    'clac sequence of commands'
    def __init__(self):
        import os
        self.rcfile = '%s/.clacrc' % os.getenv('HOME')
        self.env = {}
        self.env['verbose'] = False
        self.env['binary_prefix'] = False
        self.env['complex_tuple'] = False

    def read_cmdline( self):
        import sys
        import getopt
        try:
            opts,self.args = getopt.getopt(sys.argv[1:] , 'pvc:hCkT')
            opts = dict(opts)
        except getopt.GetoptError,e:
            opts={}
            opts['-h'] = True

        if opts.has_key('-C'):
            sys.stderr.write(COPYRIGHT)
            sys.exit(1)
        if opts.has_key('-h'):
            sys.stderr.write(__doc__)
            sys.exit(1)
        self.env['verbose'] = opts.has_key('-v')
        self.env['binary_prefix'] = opts.has_key('-k')
        self.env['complex_tuple'] = opts.has_key('-p')
        self.rcfile = opts.get('-c' , self.rcfile )
        if opts.has_key('-T'):
            self.env['binary_prefix'] = True # needed for some of the selftests
            self.run_self_test()
            sys.exit(0)

    def eval_text( self,text,name="<text>" ):
        'evaluate a set of commands in a file' 
        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']
        eval( compile( text ,name,'exec') ,globals(),self.env )

    def eval_file( self,file ):
        'evaluate a set of commands in a file' 
        self.eval_text( ''.join( open(file).readlines() ) , '<%s>' % file)

    def eval_to_string( self,s  ):
        'evaluate an expression and print the string'
        if s is None: return
        if s in ('','\n'): return
        if self.env['binary_prefix']:
            import re
            s = re.sub( r'(\b[\d+])[kK]\b' , '\\1*1024' , s )
            s = re.sub( r'(\b[\d+])[mM]\b' , '\\1*1048576' , s )
            s = re.sub( r'(\b[\d+])[gG]\b' , '\\1*1073741824' , s )

        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']

        eval_rc = eval( s ,globals(),self.env )
        if  eval_rc is None: return
        return fmt( eval_rc )

    def eval_expr( self,s  ):
        s2 = self.eval_to_string(s)
        if s2:
            print s2

    def run_self_test(self):
        for expr in selftests.split('\n'):
            if expr == "": continue
            result = self.eval_to_string(expr)
            if result == "True":
                print " %s" % expr
            else:
                raise AssertionError( "FAILED:%s" % expr )

    def main(self):
        self.read_cmdline()
        import os
        import sys
        # read and evaluate the rc file in the current context
        if os.access( self.rcfile,os.F_OK):
            self.eval_file( self.rcfile )

        if len( self.args ) < 1:
            #interactive mode
            while 1:
                line = sys.stdin.readline()
                if line == '':
                    break
                self.eval_expr( line )
        else:
            # arguments are expressions
            for expr in self.args:
                self.eval_expr( expr )

if __name__ == "__main__":
    ses=Session()
    ses.main()


--- NEW FILE clac.spec ---
Name:		clac
Version:	004
Release:	1%{?dist}
Summary:	Command Line Advanced Calculator

Group:		Applications/Engineering
License:	GPLv3+
URL:		http://sourceforge.net/projects/clac/
Source0:	http://downloads.sourceforge.net/%{name}/clac.004
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Buildarch:	noarch

%description
clac (Command Line Advanced Calculator) evaluates mathematical expressions
from the argument list or from stdin and writes the answer(s) to stdout. 

%prep
#%setup -q


%build
#nothing to build


%install
rm -rf $RPM_BUILD_ROOT
install -D -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/clac

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#there are no separate docs or license files
#the license is specified inside the only file provided
#%doc
%{_bindir}/clac


%changelog
* Sat Dec 12 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 004-1
- First Fedora version


--- NEW FILE import.log ---
clac-004-1_fc10:F-12:clac-004-1.fc10.src.rpm:1261428702



From wolfy at fedoraproject.org  Mon Dec 21 20:54:12 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Mon, 21 Dec 2009 20:54:12 +0000 (UTC)
Subject: rpms/clac/EL-4 clac.004, NONE, 1.1 clac.spec, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <20091221205412.74A2E11C00E7@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/clac/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31293/EL-4

Added Files:
	clac.004 clac.spec import.log 
Log Message:
initial import


--- NEW FILE clac.004 ---
#!/usr/bin/python
"""
################################################################
# clac version 004  2009-10-16      (c)  Mark Borgerding

Usage: clac [options] [expr1 [expr2 ...] ]

clac (Command Line Advanced Calculator) evaluates mathematical 
expressions given as arguments or as stdin and writes the answer(s) to stdout.

Unlike other command line calculators, clac:
    * has infix (natural order) expression syntax 
    * handles complex numbers.
    * defines a great many functions and constants by default
    * allows easy definition of new user functions and constants using python

"But I don't know python". 

You don't need to know python to use clac.  Expressions like 
    "1+2*3" 
    "sin(pi/4)" 
    "exp(j*2*pi/100)"
    "round( degrees(phase( e**(2j))))"
... act pretty much as you would expect.  Run the selftest (-T) for more examples.

Knowing python will help you extend clac's functionality.  Relax, it's not that hard.

Everything in the python math, and cmath modules is available...
    cos     cosh    acos    acosh   sin     sinh    asin    asinh
    tan     tanh    atan    atan2   atanh
    floor   ceil    fabs    abs     fmod modf degrees radians 
    exp     frexp   ldexp   hypot   pow     sqrt    log     log10

  ... plus a variety of other functions created to make your life easier
    phase angle mag2 cpx conj nfft gcd lcm sign log2 mag real imag

For more info about a given func, run: clac "help(func)"

"Oh but I really want the conversion from meters per second 
        to furlongs per fortnight"

New data, functions,and modules can be made via the user's .clacrc file.

e.g.
    #sample .clacrc
    from random import *
    c=3e8
    verbose=True          
    binary_prefix=True   # equivalent to using -k
    complex_tuple=True   # equivalent to using -p
    def myfunc(x):
        'a user defined function'
        return x+1


Options:
    -k : use k,m,g as binary prefix (kibibyte,mebibyte,gibibyte)
    -p : print complex numbers as (re,im) pairs,rather than re+imj
    -T : run a self-diagnostic test (which makes a nice syntax demo)
    -v : verbose
    -h : help message
    -c file: reads a config file other than $HOME/.clacrc
    -C : display copyright
"""

# __future__ division allows division of two integers to produce a float result
from __future__ import division


COPYRIGHT = """
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

 Copyright (C) 2009 Mark Borgerding    
   email: mark at borgerding dot net

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

    This program has an explicit linking exception for the extensions 
    via the rc file interface.
"""

selftests="""
1+2 == 3
sqrt(-1) == j
-2*asin(-1) == pi
abs(sin(pi)) < 1e-9
abs(1-cos(0)) < 1e-9
round( 3.1 + -4.8j) == (3-5j)
ceil( 3.1 + -4.8j) == (4-4j)
abs( 3-4j) == 5
degrees(pi) == 180 
radians(180) == pi 
abs( exp(j*pi) + 1 ) < 1e-9
pow(1.2,3.4) == 1.2**3.4
ldexp(1.2,3) == 1.2 * 2 ** 3
modf(1.2)[1] == 1
log(81,3) == 4
gcd(6,8) == 2
lcm(6,8) == 24
angle( exp( j*pi ) ) == pi
log(-1)**2 == -1*pow(pi,2)
round( degrees(phase( e**(2j)))) == 115
sum( [ round(42 * exp(j*2*x*pi/4)) for x in range(4)] ) == 0
oct(8) == '010'
0x42-042-42 == -10
1k == 1024
1m == 2**20
1g == 2**30
2**10-1 == 1023
"""

import math
from math import e,pi,atan2,fmod,frexp,hypot,ldexp,modf

def degrees(x):
    return x*180/pi

def radians(x):
    return x*pi/180

import cmath
from cmath import acosh,asinh,atanh

# other nice-to-have constants
j = i = cmath.sqrt(-1)

# some applications might want (re,im) instead of re+imj
__print_cpx_as_pairs__ = False

def dip(x):
    'demote, if possible, a complex to scalar'
    if type(x) == complex and x.imag == 0:
        return x.real
    else:
        return x

def which_call( x , mathfunc,cmathfunc , allowNegative=True):
    x=dip(x)
    if type(x) == complex or (allowNegative == False and x<0):
        return cmathfunc(x)
    else:
        return mathfunc(x)

# marshall between the math and cmath functions automatically
def acos( x ): return which_call(x,math.acos,cmath.acos)
def asin( x ): return which_call(x,math.asin,cmath.asin)
def atan( x ): return which_call(x,math.atan,cmath.atan)
def cos( x ): return which_call(x,math.cos,cmath.cos)
def cosh( x ): return which_call(x,math.cosh,cmath.cosh)
def sin( x ): return which_call(x,math.sin,cmath.sin)
def sinh( x ): return which_call(x,math.sinh,cmath.sinh)
def tan( x ): return which_call(x,math.tan,cmath.tan)
def tanh( x ): return which_call(x,math.tanh,cmath.tanh)
def exp( x ): return which_call(x,math.exp,cmath.exp)
def log10( x ): return which_call(x,math.log10,cmath.log10,False)
def sqrt( x ): return which_call(x,math.sqrt,cmath.sqrt,False)

#steal the help strings from the cmath functions
acos.__doc__ = cmath.acos.__doc__
asin.__doc__ = cmath.asin.__doc__
atan.__doc__ = cmath.atan.__doc__
cos.__doc__ = cmath.cos.__doc__
cosh.__doc__ = cmath.cosh.__doc__
sin.__doc__ = cmath.sin.__doc__
sinh.__doc__ = cmath.sinh.__doc__
tan.__doc__ = cmath.tan.__doc__
tanh.__doc__ = cmath.tanh.__doc__
exp.__doc__ = cmath.exp.__doc__
log10.__doc__ = cmath.log10.__doc__
sqrt.__doc__ = cmath.sqrt.__doc__

def log(x,b=e):
    'log(x[, base]) -> the logarithm of x to the given base.\nIf the base not specified, returns the natural logarithm (base e) of x.'
    if type(x) == complex or x<0:
        return dip( cmath.log(x) / cmath.log(b) )
    else:
        return math.log(x)/math.log(b)

def real(x):
    'return just the real portion'
    if type(x) == complex:
        return x.real
    else:
        return x

def imag(x):
    'return just the imaginary portion'
    if type(x) == complex:
        return x.imag
    else:
        return 0

def sign(x):
    'returns -1,0,1 for negative,zero,positive numbers'
    if x == 0:
        return 0
    elif x > 0:
        return 1
    else:
        return -1

def log2(x):
    'logarithm base 2'
    return log(x,2)

def nfft( insize,direction=1, musthave=2,factors=(2,3,5) ):
    """find a 'good' fft size close to the desired size
        sign(direction)     search directions
        -1                  lower
        1                   higher
        0                   closest
    """
    insize=round(insize)
    direction = sign(direction)
    offset=0
    if type(factors) not in (tuple,list): 
        factors=(factors,)
    while True:
        ntmp = insize+offset
        if musthave > 1 and (ntmp%musthave)==0:
            for f in factors:
                while (ntmp%f)==0:
                    ntmp = ntmp / f
                if ntmp==1:
                    return insize+offset
        if direction == 0:
            offset = (offset<=0) - offset 
        else:
            offset += direction

def gcd(x,y):
    'greatest common denominator'
    while x>0:
        (x,y) = (y%x,x) # Guido showed me this one on the geek cruise
    return y

def lcm(x,y):
    'least common multiple'
    return x*y/gcd(x,y)

def phase(z):
    'phase of a complex in radians' 
    z=cpx(z)
    return atan2( z.imag , z.real )

def cpx(x):
    'convert a number or tuple to a complex'
    if type(x) == tuple:
        return complex( x[0] , x[1] )
    else:
        return complex(x)

def mag2(x):
    'magnitude,squared'
    return abs(x*x)

def conj( x ):
    'complex conjugate'
    x = cpx( x )
    return complex( x.real , -x.imag )

def complexify(x,func ):
    'call func on the real and imaginary portions, creating a complex from the respective results'
    if type(x) == complex and x.imag != 0:
        return dip( complex( func(x.real) , func(x.imag) ) )
    else:
        return func(x)

# overwrite the builtin math functions that don't handle complex
def round(x):
    'nearest integer' 
    if type(x) == complex:
        return complexify( x , round )
    else:
        return math.floor(x+.5)

def floor(x):
    'round towards negative infinity' 
    return complexify( x , math.floor )
def ceil(x):
    'round towards positive infinity' 
    return complexify( x , math.ceil )
def fabs(x):
    'absolute value of real and imaginary parts'
    return complexify( x , math.fabs )

def pow(x,y):
    'raise to a power'
    if type(x) == complex or type(y) == complex:
        return dip( exp( y * log( x ) ) ) # for some reason cmath does not define pow
    else:
        return math.pow(x,y)

# some people may prefer these names
mag=abs
angle=phase

def fmt_float(x):
    'convert a single float to a string'
    return '%.17g' % x

def fmt_cpx(x):
    'convert a complex value to a string'
    if __print_cpx_as_pairs__ == True:
        return '(%s,%s)' % ( fmt_float( x.real) , fmt_float( x.imag) )
    elif x.imag<0:
        return '%s %sj' % ( fmt_float( x.real) , fmt_float( x.imag) )
    else:
        return '%s+%sj' % ( fmt_float( x.real) , fmt_float( x.imag) )

def fmt(x):
    'convert the evaluated expression to a string'
    if type(x) == complex:
        if x.imag == 0:
            return fmt_float( x.real)
        else:
            return fmt_cpx(x)
    elif type(x) in (list,tuple):
        return ','.join(  [fmt(item) for item in x ])
    elif type(x) == float:
        return fmt_float(x)
    else:
        return '%s' % x


class Session:
    'clac sequence of commands'
    def __init__(self):
        import os
        self.rcfile = '%s/.clacrc' % os.getenv('HOME')
        self.env = {}
        self.env['verbose'] = False
        self.env['binary_prefix'] = False
        self.env['complex_tuple'] = False

    def read_cmdline( self):
        import sys
        import getopt
        try:
            opts,self.args = getopt.getopt(sys.argv[1:] , 'pvc:hCkT')
            opts = dict(opts)
        except getopt.GetoptError,e:
            opts={}
            opts['-h'] = True

        if opts.has_key('-C'):
            sys.stderr.write(COPYRIGHT)
            sys.exit(1)
        if opts.has_key('-h'):
            sys.stderr.write(__doc__)
            sys.exit(1)
        self.env['verbose'] = opts.has_key('-v')
        self.env['binary_prefix'] = opts.has_key('-k')
        self.env['complex_tuple'] = opts.has_key('-p')
        self.rcfile = opts.get('-c' , self.rcfile )
        if opts.has_key('-T'):
            self.env['binary_prefix'] = True # needed for some of the selftests
            self.run_self_test()
            sys.exit(0)

    def eval_text( self,text,name="<text>" ):
        'evaluate a set of commands in a file' 
        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']
        eval( compile( text ,name,'exec') ,globals(),self.env )

    def eval_file( self,file ):
        'evaluate a set of commands in a file' 
        self.eval_text( ''.join( open(file).readlines() ) , '<%s>' % file)

    def eval_to_string( self,s  ):
        'evaluate an expression and print the string'
        if s is None: return
        if s in ('','\n'): return
        if self.env['binary_prefix']:
            import re
            s = re.sub( r'(\b[\d+])[kK]\b' , '\\1*1024' , s )
            s = re.sub( r'(\b[\d+])[mM]\b' , '\\1*1048576' , s )
            s = re.sub( r'(\b[\d+])[gG]\b' , '\\1*1073741824' , s )

        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']

        eval_rc = eval( s ,globals(),self.env )
        if  eval_rc is None: return
        return fmt( eval_rc )

    def eval_expr( self,s  ):
        s2 = self.eval_to_string(s)
        if s2:
            print s2

    def run_self_test(self):
        for expr in selftests.split('\n'):
            if expr == "": continue
            result = self.eval_to_string(expr)
            if result == "True":
                print " %s" % expr
            else:
                raise AssertionError( "FAILED:%s" % expr )

    def main(self):
        self.read_cmdline()
        import os
        import sys
        # read and evaluate the rc file in the current context
        if os.access( self.rcfile,os.F_OK):
            self.eval_file( self.rcfile )

        if len( self.args ) < 1:
            #interactive mode
            while 1:
                line = sys.stdin.readline()
                if line == '':
                    break
                self.eval_expr( line )
        else:
            # arguments are expressions
            for expr in self.args:
                self.eval_expr( expr )

if __name__ == "__main__":
    ses=Session()
    ses.main()


--- NEW FILE clac.spec ---
Name:		clac
Version:	004
Release:	1%{?dist}
Summary:	Command Line Advanced Calculator

Group:		Applications/Engineering
License:	GPLv3+
URL:		http://sourceforge.net/projects/clac/
Source0:	http://downloads.sourceforge.net/%{name}/clac.004
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Buildarch:	noarch

%description
clac (Command Line Advanced Calculator) evaluates mathematical expressions
from the argument list or from stdin and writes the answer(s) to stdout. 

%prep
#%setup -q


%build
#nothing to build


%install
rm -rf $RPM_BUILD_ROOT
install -D -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/clac

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#there are no separate docs or license files
#the license is specified inside the only file provided
#%doc
%{_bindir}/clac


%changelog
* Sat Dec 12 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 004-1
- First Fedora version


--- NEW FILE import.log ---
clac-004-1_fc10:EL-4:clac-004-1.fc10.src.rpm:1261428781



From wolfy at fedoraproject.org  Mon Dec 21 20:55:36 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Mon, 21 Dec 2009 20:55:36 +0000 (UTC)
Subject: rpms/clac/EL-5 clac.004, NONE, 1.1 clac.spec, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <20091221205536.376ED11C00E7@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/clac/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31624/EL-5

Added Files:
	clac.004 clac.spec import.log 
Log Message:
initial import


--- NEW FILE clac.004 ---
#!/usr/bin/python
"""
################################################################
# clac version 004  2009-10-16      (c)  Mark Borgerding

Usage: clac [options] [expr1 [expr2 ...] ]

clac (Command Line Advanced Calculator) evaluates mathematical 
expressions given as arguments or as stdin and writes the answer(s) to stdout.

Unlike other command line calculators, clac:
    * has infix (natural order) expression syntax 
    * handles complex numbers.
    * defines a great many functions and constants by default
    * allows easy definition of new user functions and constants using python

"But I don't know python". 

You don't need to know python to use clac.  Expressions like 
    "1+2*3" 
    "sin(pi/4)" 
    "exp(j*2*pi/100)"
    "round( degrees(phase( e**(2j))))"
... act pretty much as you would expect.  Run the selftest (-T) for more examples.

Knowing python will help you extend clac's functionality.  Relax, it's not that hard.

Everything in the python math, and cmath modules is available...
    cos     cosh    acos    acosh   sin     sinh    asin    asinh
    tan     tanh    atan    atan2   atanh
    floor   ceil    fabs    abs     fmod modf degrees radians 
    exp     frexp   ldexp   hypot   pow     sqrt    log     log10

  ... plus a variety of other functions created to make your life easier
    phase angle mag2 cpx conj nfft gcd lcm sign log2 mag real imag

For more info about a given func, run: clac "help(func)"

"Oh but I really want the conversion from meters per second 
        to furlongs per fortnight"

New data, functions,and modules can be made via the user's .clacrc file.

e.g.
    #sample .clacrc
    from random import *
    c=3e8
    verbose=True          
    binary_prefix=True   # equivalent to using -k
    complex_tuple=True   # equivalent to using -p
    def myfunc(x):
        'a user defined function'
        return x+1


Options:
    -k : use k,m,g as binary prefix (kibibyte,mebibyte,gibibyte)
    -p : print complex numbers as (re,im) pairs,rather than re+imj
    -T : run a self-diagnostic test (which makes a nice syntax demo)
    -v : verbose
    -h : help message
    -c file: reads a config file other than $HOME/.clacrc
    -C : display copyright
"""

# __future__ division allows division of two integers to produce a float result
from __future__ import division


COPYRIGHT = """
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

 Copyright (C) 2009 Mark Borgerding    
   email: mark at borgerding dot net

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

    This program has an explicit linking exception for the extensions 
    via the rc file interface.
"""

selftests="""
1+2 == 3
sqrt(-1) == j
-2*asin(-1) == pi
abs(sin(pi)) < 1e-9
abs(1-cos(0)) < 1e-9
round( 3.1 + -4.8j) == (3-5j)
ceil( 3.1 + -4.8j) == (4-4j)
abs( 3-4j) == 5
degrees(pi) == 180 
radians(180) == pi 
abs( exp(j*pi) + 1 ) < 1e-9
pow(1.2,3.4) == 1.2**3.4
ldexp(1.2,3) == 1.2 * 2 ** 3
modf(1.2)[1] == 1
log(81,3) == 4
gcd(6,8) == 2
lcm(6,8) == 24
angle( exp( j*pi ) ) == pi
log(-1)**2 == -1*pow(pi,2)
round( degrees(phase( e**(2j)))) == 115
sum( [ round(42 * exp(j*2*x*pi/4)) for x in range(4)] ) == 0
oct(8) == '010'
0x42-042-42 == -10
1k == 1024
1m == 2**20
1g == 2**30
2**10-1 == 1023
"""

import math
from math import e,pi,atan2,fmod,frexp,hypot,ldexp,modf

def degrees(x):
    return x*180/pi

def radians(x):
    return x*pi/180

import cmath
from cmath import acosh,asinh,atanh

# other nice-to-have constants
j = i = cmath.sqrt(-1)

# some applications might want (re,im) instead of re+imj
__print_cpx_as_pairs__ = False

def dip(x):
    'demote, if possible, a complex to scalar'
    if type(x) == complex and x.imag == 0:
        return x.real
    else:
        return x

def which_call( x , mathfunc,cmathfunc , allowNegative=True):
    x=dip(x)
    if type(x) == complex or (allowNegative == False and x<0):
        return cmathfunc(x)
    else:
        return mathfunc(x)

# marshall between the math and cmath functions automatically
def acos( x ): return which_call(x,math.acos,cmath.acos)
def asin( x ): return which_call(x,math.asin,cmath.asin)
def atan( x ): return which_call(x,math.atan,cmath.atan)
def cos( x ): return which_call(x,math.cos,cmath.cos)
def cosh( x ): return which_call(x,math.cosh,cmath.cosh)
def sin( x ): return which_call(x,math.sin,cmath.sin)
def sinh( x ): return which_call(x,math.sinh,cmath.sinh)
def tan( x ): return which_call(x,math.tan,cmath.tan)
def tanh( x ): return which_call(x,math.tanh,cmath.tanh)
def exp( x ): return which_call(x,math.exp,cmath.exp)
def log10( x ): return which_call(x,math.log10,cmath.log10,False)
def sqrt( x ): return which_call(x,math.sqrt,cmath.sqrt,False)

#steal the help strings from the cmath functions
acos.__doc__ = cmath.acos.__doc__
asin.__doc__ = cmath.asin.__doc__
atan.__doc__ = cmath.atan.__doc__
cos.__doc__ = cmath.cos.__doc__
cosh.__doc__ = cmath.cosh.__doc__
sin.__doc__ = cmath.sin.__doc__
sinh.__doc__ = cmath.sinh.__doc__
tan.__doc__ = cmath.tan.__doc__
tanh.__doc__ = cmath.tanh.__doc__
exp.__doc__ = cmath.exp.__doc__
log10.__doc__ = cmath.log10.__doc__
sqrt.__doc__ = cmath.sqrt.__doc__

def log(x,b=e):
    'log(x[, base]) -> the logarithm of x to the given base.\nIf the base not specified, returns the natural logarithm (base e) of x.'
    if type(x) == complex or x<0:
        return dip( cmath.log(x) / cmath.log(b) )
    else:
        return math.log(x)/math.log(b)

def real(x):
    'return just the real portion'
    if type(x) == complex:
        return x.real
    else:
        return x

def imag(x):
    'return just the imaginary portion'
    if type(x) == complex:
        return x.imag
    else:
        return 0

def sign(x):
    'returns -1,0,1 for negative,zero,positive numbers'
    if x == 0:
        return 0
    elif x > 0:
        return 1
    else:
        return -1

def log2(x):
    'logarithm base 2'
    return log(x,2)

def nfft( insize,direction=1, musthave=2,factors=(2,3,5) ):
    """find a 'good' fft size close to the desired size
        sign(direction)     search directions
        -1                  lower
        1                   higher
        0                   closest
    """
    insize=round(insize)
    direction = sign(direction)
    offset=0
    if type(factors) not in (tuple,list): 
        factors=(factors,)
    while True:
        ntmp = insize+offset
        if musthave > 1 and (ntmp%musthave)==0:
            for f in factors:
                while (ntmp%f)==0:
                    ntmp = ntmp / f
                if ntmp==1:
                    return insize+offset
        if direction == 0:
            offset = (offset<=0) - offset 
        else:
            offset += direction

def gcd(x,y):
    'greatest common denominator'
    while x>0:
        (x,y) = (y%x,x) # Guido showed me this one on the geek cruise
    return y

def lcm(x,y):
    'least common multiple'
    return x*y/gcd(x,y)

def phase(z):
    'phase of a complex in radians' 
    z=cpx(z)
    return atan2( z.imag , z.real )

def cpx(x):
    'convert a number or tuple to a complex'
    if type(x) == tuple:
        return complex( x[0] , x[1] )
    else:
        return complex(x)

def mag2(x):
    'magnitude,squared'
    return abs(x*x)

def conj( x ):
    'complex conjugate'
    x = cpx( x )
    return complex( x.real , -x.imag )

def complexify(x,func ):
    'call func on the real and imaginary portions, creating a complex from the respective results'
    if type(x) == complex and x.imag != 0:
        return dip( complex( func(x.real) , func(x.imag) ) )
    else:
        return func(x)

# overwrite the builtin math functions that don't handle complex
def round(x):
    'nearest integer' 
    if type(x) == complex:
        return complexify( x , round )
    else:
        return math.floor(x+.5)

def floor(x):
    'round towards negative infinity' 
    return complexify( x , math.floor )
def ceil(x):
    'round towards positive infinity' 
    return complexify( x , math.ceil )
def fabs(x):
    'absolute value of real and imaginary parts'
    return complexify( x , math.fabs )

def pow(x,y):
    'raise to a power'
    if type(x) == complex or type(y) == complex:
        return dip( exp( y * log( x ) ) ) # for some reason cmath does not define pow
    else:
        return math.pow(x,y)

# some people may prefer these names
mag=abs
angle=phase

def fmt_float(x):
    'convert a single float to a string'
    return '%.17g' % x

def fmt_cpx(x):
    'convert a complex value to a string'
    if __print_cpx_as_pairs__ == True:
        return '(%s,%s)' % ( fmt_float( x.real) , fmt_float( x.imag) )
    elif x.imag<0:
        return '%s %sj' % ( fmt_float( x.real) , fmt_float( x.imag) )
    else:
        return '%s+%sj' % ( fmt_float( x.real) , fmt_float( x.imag) )

def fmt(x):
    'convert the evaluated expression to a string'
    if type(x) == complex:
        if x.imag == 0:
            return fmt_float( x.real)
        else:
            return fmt_cpx(x)
    elif type(x) in (list,tuple):
        return ','.join(  [fmt(item) for item in x ])
    elif type(x) == float:
        return fmt_float(x)
    else:
        return '%s' % x


class Session:
    'clac sequence of commands'
    def __init__(self):
        import os
        self.rcfile = '%s/.clacrc' % os.getenv('HOME')
        self.env = {}
        self.env['verbose'] = False
        self.env['binary_prefix'] = False
        self.env['complex_tuple'] = False

    def read_cmdline( self):
        import sys
        import getopt
        try:
            opts,self.args = getopt.getopt(sys.argv[1:] , 'pvc:hCkT')
            opts = dict(opts)
        except getopt.GetoptError,e:
            opts={}
            opts['-h'] = True

        if opts.has_key('-C'):
            sys.stderr.write(COPYRIGHT)
            sys.exit(1)
        if opts.has_key('-h'):
            sys.stderr.write(__doc__)
            sys.exit(1)
        self.env['verbose'] = opts.has_key('-v')
        self.env['binary_prefix'] = opts.has_key('-k')
        self.env['complex_tuple'] = opts.has_key('-p')
        self.rcfile = opts.get('-c' , self.rcfile )
        if opts.has_key('-T'):
            self.env['binary_prefix'] = True # needed for some of the selftests
            self.run_self_test()
            sys.exit(0)

    def eval_text( self,text,name="<text>" ):
        'evaluate a set of commands in a file' 
        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']
        eval( compile( text ,name,'exec') ,globals(),self.env )

    def eval_file( self,file ):
        'evaluate a set of commands in a file' 
        self.eval_text( ''.join( open(file).readlines() ) , '<%s>' % file)

    def eval_to_string( self,s  ):
        'evaluate an expression and print the string'
        if s is None: return
        if s in ('','\n'): return
        if self.env['binary_prefix']:
            import re
            s = re.sub( r'(\b[\d+])[kK]\b' , '\\1*1024' , s )
            s = re.sub( r'(\b[\d+])[mM]\b' , '\\1*1048576' , s )
            s = re.sub( r'(\b[\d+])[gG]\b' , '\\1*1073741824' , s )

        global __print_cpx_as_pairs__
        __print_cpx_as_pairs__ = self.env['complex_tuple']

        eval_rc = eval( s ,globals(),self.env )
        if  eval_rc is None: return
        return fmt( eval_rc )

    def eval_expr( self,s  ):
        s2 = self.eval_to_string(s)
        if s2:
            print s2

    def run_self_test(self):
        for expr in selftests.split('\n'):
            if expr == "": continue
            result = self.eval_to_string(expr)
            if result == "True":
                print " %s" % expr
            else:
                raise AssertionError( "FAILED:%s" % expr )

    def main(self):
        self.read_cmdline()
        import os
        import sys
        # read and evaluate the rc file in the current context
        if os.access( self.rcfile,os.F_OK):
            self.eval_file( self.rcfile )

        if len( self.args ) < 1:
            #interactive mode
            while 1:
                line = sys.stdin.readline()
                if line == '':
                    break
                self.eval_expr( line )
        else:
            # arguments are expressions
            for expr in self.args:
                self.eval_expr( expr )

if __name__ == "__main__":
    ses=Session()
    ses.main()


--- NEW FILE clac.spec ---
Name:		clac
Version:	004
Release:	1%{?dist}
Summary:	Command Line Advanced Calculator

Group:		Applications/Engineering
License:	GPLv3+
URL:		http://sourceforge.net/projects/clac/
Source0:	http://downloads.sourceforge.net/%{name}/clac.004
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Buildarch:	noarch

%description
clac (Command Line Advanced Calculator) evaluates mathematical expressions
from the argument list or from stdin and writes the answer(s) to stdout. 

%prep
#%setup -q


%build
#nothing to build


%install
rm -rf $RPM_BUILD_ROOT
install -D -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/clac

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
#there are no separate docs or license files
#the license is specified inside the only file provided
#%doc
%{_bindir}/clac


%changelog
* Sat Dec 12 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 004-1
- First Fedora version


--- NEW FILE import.log ---
clac-004-1_fc10:EL-5:clac-004-1.fc10.src.rpm:1261428902



From sgallagh at fedoraproject.org  Mon Dec 21 20:55:55 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 21 Dec 2009 20:55:55 +0000 (UTC)
Subject: rpms/sssd/F-12 cfg_dbg_timestamps.patch,NONE,1.1 sssd.spec,1.30,1.31
Message-ID: <20091221205555.D38C911C00E7@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31812

Modified Files:
	sssd.spec 
Added Files:
	cfg_dbg_timestamps.patch 
Log Message:
Fix https://bugzilla.redhat.com/show_bug.cgi?id=549482


cfg_dbg_timestamps.patch:
 SSSDConfigTest.py |    2 ++
 etc/sssd.api.conf |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE cfg_dbg_timestamps.patch ---
>From a79fed1bece2e33759546f97ce0f22af3745ac80 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Mon, 21 Dec 2009 13:03:03 -0500
Subject: [PATCH] Allow debug_timestamps setting on a per-domain basis

This was missing from the SSSDConfig API, though it was supported
by the daemon.
---
 server/config/SSSDConfigTest.py |    2 ++
 server/config/etc/sssd.api.conf |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/server/config/SSSDConfigTest.py b/server/config/SSSDConfigTest.py
index f893d98..1e79342 100755
--- a/server/config/SSSDConfigTest.py
+++ b/server/config/SSSDConfigTest.py
@@ -372,6 +372,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
         options = domain.list_options()
         control_list = [
             'debug_level',
+            'debug_timestamps',
             'min_id',
             'max_id',
             'timeout',
@@ -586,6 +587,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
         options = domain.list_options()
         control_list = [
             'debug_level',
+            'debug_timestamps',
             'min_id',
             'max_id',
             'timeout',
diff --git a/server/config/etc/sssd.api.conf b/server/config/etc/sssd.api.conf
index c8ddae4..bdb6aab 100644
--- a/server/config/etc/sssd.api.conf
+++ b/server/config/etc/sssd.api.conf
@@ -42,6 +42,7 @@ chpass_provider = str, None
 [domain]
 # Options available to all domains
 debug_level = int, None, 0
+debug_timestamps = bool, None
 command = str, None
 min_id = int, None, 1000
 max_id = int, None
-- 
1.6.5.2



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sssd.spec	19 Dec 2009 00:01:37 -0000	1.30
+++ sssd.spec	21 Dec 2009 20:55:55 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name: sssd
 Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
@@ -12,6 +12,8 @@ URL: http://fedorahosted.org/sssd
 Source: https://fedorahosted.org/released/sssd/sssd-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Patch1: cfg_dbg_timestamps.patch
+
 ### Patches ###
 
 ### Dependencies ###
@@ -78,6 +80,7 @@ service.
 
 %prep
 %setup -q
+%patch1 -p1 -b .cfg_dbg_timestamps
 
 %build
 NSS_LIBS=-lnss3 \
@@ -205,6 +208,10 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 21 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-2
+- Patch SSSDConfig API to address
+- https://bugzilla.redhat.com/show_bug.cgi?id=549482
+
 * Fri Dec 18 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-1
 - New upstream stable release 1.0.0
 



From sgallagh at fedoraproject.org  Mon Dec 21 20:56:43 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 21 Dec 2009 20:56:43 +0000 (UTC)
Subject: rpms/sssd/F-11 cfg_dbg_timestamps.patch,NONE,1.1 sssd.spec,1.27,1.28
Message-ID: <20091221205643.3262411C00E7@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32160

Modified Files:
	sssd.spec 
Added Files:
	cfg_dbg_timestamps.patch 
Log Message:
Fix https://bugzilla.redhat.com/show_bug.cgi?id=549482


cfg_dbg_timestamps.patch:
 SSSDConfigTest.py |    2 ++
 etc/sssd.api.conf |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE cfg_dbg_timestamps.patch ---
>From a79fed1bece2e33759546f97ce0f22af3745ac80 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Mon, 21 Dec 2009 13:03:03 -0500
Subject: [PATCH] Allow debug_timestamps setting on a per-domain basis

This was missing from the SSSDConfig API, though it was supported
by the daemon.
---
 server/config/SSSDConfigTest.py |    2 ++
 server/config/etc/sssd.api.conf |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/server/config/SSSDConfigTest.py b/server/config/SSSDConfigTest.py
index f893d98..1e79342 100755
--- a/server/config/SSSDConfigTest.py
+++ b/server/config/SSSDConfigTest.py
@@ -372,6 +372,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
         options = domain.list_options()
         control_list = [
             'debug_level',
+            'debug_timestamps',
             'min_id',
             'max_id',
             'timeout',
@@ -586,6 +587,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase):
         options = domain.list_options()
         control_list = [
             'debug_level',
+            'debug_timestamps',
             'min_id',
             'max_id',
             'timeout',
diff --git a/server/config/etc/sssd.api.conf b/server/config/etc/sssd.api.conf
index c8ddae4..bdb6aab 100644
--- a/server/config/etc/sssd.api.conf
+++ b/server/config/etc/sssd.api.conf
@@ -42,6 +42,7 @@ chpass_provider = str, None
 [domain]
 # Options available to all domains
 debug_level = int, None, 0
+debug_timestamps = bool, None
 command = str, None
 min_id = int, None, 1000
 max_id = int, None
-- 
1.6.5.2



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sssd.spec	19 Dec 2009 00:03:20 -0000	1.27
+++ sssd.spec	21 Dec 2009 20:56:43 -0000	1.28
@@ -3,7 +3,7 @@
 
 Name: sssd
 Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
@@ -12,6 +12,8 @@ URL: http://fedorahosted.org/sssd
 Source: https://fedorahosted.org/released/sssd/sssd-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Patch1: cfg_dbg_timestamps.patch
+
 ### Patches ###
 
 ### Dependencies ###
@@ -78,6 +80,7 @@ service.
 
 %prep
 %setup -q
+%patch1 -p1 -b .cfg_dbg_timestamps
 
 %build
 NSS_LIBS=-lnss3 \
@@ -205,6 +208,10 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 21 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-2
+- Patch SSSDConfig API to address
+- https://bugzilla.redhat.com/show_bug.cgi?id=549482
+
 * Fri Dec 18 2009 Stephen Gallagher <sgallagh at redhat.com> - 1.0.0-1
 - New upstream stable release 1.0.0
 



From ruben at fedoraproject.org  Mon Dec 21 20:59:17 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 21 Dec 2009 20:59:17 +0000 (UTC)
Subject: File debmirror_2.4.tar.gz uploaded to lookaside cache by ruben
Message-ID: <20091221205917.72F1C10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for debmirror:

1854adcaeb0abaf775317b8a78d0fabf  debmirror_2.4.tar.gz



From rdieter at fedoraproject.org  Mon Dec 21 21:02:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 21:02:04 +0000 (UTC)
Subject: rpms/maxima/EL-5 maxima.spec,1.57,1.58
Message-ID: <20091221210204.E698C11C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv822

Modified Files:
	maxima.spec 
Log Message:
typo



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-5/maxima.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- maxima.spec	21 Dec 2009 19:59:50 -0000	1.57
+++ maxima.spec	21 Dec 2009 21:02:04 -0000	1.58
@@ -52,7 +52,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 # sbcl:  http://bugzilla.redhat.com/220053 (resolved)
 # sbcl: ppc/ld joy, "final link failed: Nonrepresentable section on output" http://bugzilla.redhat.com/448734
 %define _enable_sbcl --enable-sbcl 
-%define _check_nonfatal ||:
+%define check_nonfatal ||:
 %endif
 
 %ifarch sparcv9



From linville at fedoraproject.org  Mon Dec 21 21:06:41 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 21 Dec 2009 21:06:41 +0000 (UTC)
Subject: rpms/crda/devel setregdomain.1,NONE,1.1 crda.spec,1.25,1.26
Message-ID: <20091221210641.2D46711C00E7@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1755

Modified Files:
	crda.spec 
Added Files:
	setregdomain.1 
Log Message:
Add man page for setregdomain (from Andrew Hecox <ahecox at redhat.com>) ; Change  to %{buildroot}


--- NEW FILE setregdomain.1 ---
.\" Copyright 2009 Red Hat, Inc.
.TH segregdomain 1 2009-10-16 "CRDA" "User Commands"
.SH NAME
setregdomain \- set regulatory domain based on timezone
.SH SYNOPSIS               
.B setregdomain                  
.SH DESCRIPTION
setregdomain sets the regulatory domain for your system; it takes no
arguments and is normally called via system script (eg, udev) rather
than manually by an adminstrator.
.SH "SEE ALSO"
.BR iw (1)


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- crda.spec	18 Dec 2009 19:25:23 -0000	1.25
+++ crda.spec	21 Dec 2009 21:06:40 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -15,27 +15,32 @@ BuildRequires:  kernel-headers >= 2.6.27
 BuildRequires:  libnl-devel >= 1.1
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
+BuildRequires:  gzip
 
 Requires:       udev, iw
 
 Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
 Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2
 Source2:        setregdomain
+Source3:        setregdomain.1
 
 Patch0:         regulatory-rules-setregdomain.patch
 
+
 %description
 CRDA acts as the udev helper for communication between the kernel
 and userspace for regulatory compliance. It relies on nl80211
 for communication. CRDA is intended to be run only through udev
 communication from the kernel.
 
+
 %prep
 %setup -q -c
 %setup -q -T -D -a 1
 
 %patch0 -p1 -b .setregdomain
 
+
 %build
 
 # Use our own signing key to generate regulatory.bin
@@ -52,20 +57,27 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 cd crda-%{crda_version}
 cp README README.crda
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
+make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir}
 
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
+make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir}
+
+install -d %{buildroot}/sbin
+install -pm 0755 %SOURCE2 %{buildroot}/sbin
+
+cd ..
+/usr/bin/gzip -c %SOURCE3 > %{SOURCE3}.gz
+install -d %{buildroot}%{_mandir}/man1
+install -pm 0644 %{SOURCE3}.gz %{buildroot}%{_mandir}/man1
 
-install -D -m0755 %SOURCE2 ${RPM_BUILD_ROOT}/sbin
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -75,15 +87,21 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/setregdomain
 /lib/udev/rules.d/85-regulatory.rules
 /lib/%{name}
+%{_mandir}/man1/setregdomain.1.gz
 %{_mandir}/man5/regulatory.bin.5.gz
 %{_mandir}/man8/crda.8.gz
 %{_mandir}/man8/regdbdump.8.gz
 %doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
+
 %changelog
+* Mon Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-3
+- Add man page for setregdomain (from Andrew Hecox <ahecox at redhat.com>)
+- Change $RPM_BUILD_ROOT to %{buildroot}
+
 * Fri Dec 18 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-2
-- Specify patch to iw in setregdomain
+- Specify path to iw in setregdomain
 
 * Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
 - Update wireless-regdb to version 2009.11.25 



From rdieter at fedoraproject.org  Mon Dec 21 21:08:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 21 Dec 2009 21:08:39 +0000 (UTC)
Subject: rpms/kdevelop/devel kdevelop.spec,1.91,1.92
Message-ID: <20091221210839.3F3F211C00E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2240

Modified Files:
	kdevelop.spec 
Log Message:
fix changelog



Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kdevelop.spec	22 Nov 2009 14:14:02 -0000	1.91
+++ kdevelop.spec	21 Dec 2009 21:08:39 -0000	1.92
@@ -116,7 +116,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sun Nov 22 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.9.95-0.2.beta2
+* Sun Nov 22 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.9.95-0.3.beta5
 - rebuild (fc13+, qt-4.6.0-rc1)
 
 * Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 9:3.9.95-0.1.beta5



From linville at fedoraproject.org  Mon Dec 21 21:14:33 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 21 Dec 2009 21:14:33 +0000 (UTC)
Subject: rpms/crda/F-12 setregdomain.1,NONE,1.1 crda.spec,1.25,1.26
Message-ID: <20091221211433.DEEF511C00E7@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3042

Modified Files:
	crda.spec 
Added Files:
	setregdomain.1 
Log Message:
Add man page for setregdomain (from Andrew Hecox <ahecox at redhat.com>) ; Change  to %{buildroot}


--- NEW FILE setregdomain.1 ---
.\" Copyright 2009 Red Hat, Inc.
.TH segregdomain 1 2009-10-16 "CRDA" "User Commands"
.SH NAME
setregdomain \- set regulatory domain based on timezone
.SH SYNOPSIS               
.B setregdomain                  
.SH DESCRIPTION
setregdomain sets the regulatory domain for your system; it takes no
arguments and is normally called via system script (eg, udev) rather
than manually by an adminstrator.
.SH "SEE ALSO"
.BR iw (1)


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-12/crda.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- crda.spec	18 Dec 2009 19:33:12 -0000	1.25
+++ crda.spec	21 Dec 2009 21:14:33 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -15,27 +15,32 @@ BuildRequires:  kernel-headers >= 2.6.27
 BuildRequires:  libnl-devel >= 1.1
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
+BuildRequires:  gzip
 
 Requires:       udev, iw
 
 Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
 Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2
 Source2:        setregdomain
+Source3:        setregdomain.1
 
 Patch0:         regulatory-rules-setregdomain.patch
 
+
 %description
 CRDA acts as the udev helper for communication between the kernel
 and userspace for regulatory compliance. It relies on nl80211
 for communication. CRDA is intended to be run only through udev
 communication from the kernel.
 
+
 %prep
 %setup -q -c
 %setup -q -T -D -a 1
 
 %patch0 -p1 -b .setregdomain
 
+
 %build
 
 # Use our own signing key to generate regulatory.bin
@@ -52,20 +57,27 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 cd crda-%{crda_version}
 cp README README.crda
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
+make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir}
 
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
+make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir}
+
+install -d %{buildroot}/sbin
+install -pm 0755 %SOURCE2 %{buildroot}/sbin
+
+cd ..
+/usr/bin/gzip -c %SOURCE3 > %{SOURCE3}.gz
+install -d %{buildroot}%{_mandir}/man1
+install -pm 0644 %{SOURCE3}.gz %{buildroot}%{_mandir}/man1
 
-install -D -m0755 %SOURCE2 ${RPM_BUILD_ROOT}/sbin
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -75,15 +87,21 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/setregdomain
 /lib/udev/rules.d/85-regulatory.rules
 /lib/%{name}
+%{_mandir}/man1/setregdomain.1.gz
 %{_mandir}/man5/regulatory.bin.5.gz
 %{_mandir}/man8/crda.8.gz
 %{_mandir}/man8/regdbdump.8.gz
 %doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
+
 %changelog
+* Mon Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-3
+- Add man page for setregdomain (from Andrew Hecox <ahecox at redhat.com>)
+- Change $RPM_BUILD_ROOT to %{buildroot}
+
 * Fri Dec 18 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-2
-- Specify patch to iw in setregdomain
+- Specify path to iw in setregdomain
 
 * Wed Dec  2 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-1
 - Update wireless-regdb to version 2009.11.25 



From ruben at fedoraproject.org  Mon Dec 21 21:16:49 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 21 Dec 2009 21:16:49 +0000 (UTC)
Subject: rpms/debmirror/devel .cvsignore, 1.3, 1.4 debmirror.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091221211649.1DF2011C00E7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/debmirror/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3506

Modified Files:
	.cvsignore debmirror.spec sources 
Log Message:
* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4-1
- New upstream release
- Change license to GPLv2+ according to copyright file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Sep 2009 19:30:44 -0000	1.3
+++ .cvsignore	21 Dec 2009 21:16:48 -0000	1.4
@@ -1 +1 @@
-debmirror_20090807.tar.gz
+debmirror_2.4.tar.gz


Index: debmirror.spec
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/devel/debmirror.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- debmirror.spec	2 Sep 2009 19:30:44 -0000	1.3
+++ debmirror.spec	21 Dec 2009 21:16:48 -0000	1.4
@@ -1,10 +1,10 @@
 Name:		debmirror
-Version:	20090807
+Version:	2.4
 Release:	1%{?dist}
 Summary:	Debian partial mirror script, with ftp and package pool support
 
 Group:		Applications/Internet
-License:	GPL+
+License:	GPLv2+
 URL:		http://packages.qa.debian.org/d/%{name}.html
 Source:		http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +19,7 @@ pools are fully supported. It also does 
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n svn
 
 
 %build
@@ -29,7 +29,7 @@ pools are fully supported. It also does 
 rm -rf %{buildroot}
 
 %{__install} -Dp -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
-%{__install} -Dp -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
+%{__install} -Dp -m 0644 examples/%{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 
 # generate a man page
 %{__install} -d %{buildroot}%{_mandir}/man1
@@ -40,13 +40,17 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc debian/copyright debian/changelog debian/NEWS.Debian doc/design.txt
+%doc debian/copyright debian/changelog debian/NEWS doc/design.txt
 %{_mandir}/man1/%{name}.1.gz
 %{_bindir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
 
 %changelog
+* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4-1
+- New upstream release
+- Change license to GPLv2+ according to copyright file
+
 * Wed Sep 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 20090807-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/debmirror/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Sep 2009 19:30:44 -0000	1.3
+++ sources	21 Dec 2009 21:16:48 -0000	1.4
@@ -1 +1 @@
-bc40908c1580be1c21fd0a77348ca789  debmirror_20090807.tar.gz
+1854adcaeb0abaf775317b8a78d0fabf  debmirror_2.4.tar.gz



From dbhole at fedoraproject.org  Mon Dec 21 21:26:45 2009
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Mon, 21 Dec 2009 21:26:45 +0000 (UTC)
Subject: rpms/ecj/devel ecj.sh.in,1.1,1.2 ecj.spec,1.6,1.7
Message-ID: <20091221212645.BA49A11C00E7@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/ecj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5062

Modified Files:
	ecj.sh.in ecj.spec 
Log Message:

- Fix RHBZ# 490936. If CLASSPATH is not set, add . to default classpath.




Index: ecj.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ecj/devel/ecj.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecj.sh.in	10 Mar 2009 18:35:57 -0000	1.1
+++ ecj.sh.in	21 Dec 2009 21:26:45 -0000	1.2
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-CLASSPATH=@JAVADIR@/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+CLASSPATH=@JAVADIR@/ecj.jar:${CLASSPATH=.} \
 java org.eclipse.jdt.internal.compiler.batch.Main "$@"


Index: ecj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecj/devel/ecj.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ecj.spec	9 Sep 2009 08:25:06 -0000	1.6
+++ ecj.spec	21 Dec 2009 21:26:45 -0000	1.7
@@ -8,7 +8,7 @@ Epoch: 1
 Summary: Eclipse Compiler for Java
 Name: ecj
 Version: 3.4.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 Group: Development/Languages
@@ -134,6 +134,9 @@ fi
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Mon Dec 21 2009 Deepak Bhole <dbhole at redhat.com> - 1:3.4.2-7
+- Fix RHBZ# 490936. If CLASSPATH is not set, add . to default classpath.
+
 * Wed Sep 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-6
 - Add maven pom and depmaps.
 



From dbhole at fedoraproject.org  Mon Dec 21 21:28:15 2009
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Mon, 21 Dec 2009 21:28:15 +0000 (UTC)
Subject: rpms/ecj/F-12 ecj.sh.in,1.1,1.2 ecj.spec,1.6,1.7
Message-ID: <20091221212815.7CD8B11C00E7@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/ecj/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5375

Modified Files:
	ecj.sh.in ecj.spec 
Log Message:

- Fix RHBZ# 490936. If CLASSPATH is not set, add . to default classpath.




Index: ecj.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ecj/F-12/ecj.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecj.sh.in	10 Mar 2009 18:35:57 -0000	1.1
+++ ecj.sh.in	21 Dec 2009 21:28:15 -0000	1.2
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-CLASSPATH=@JAVADIR@/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+CLASSPATH=@JAVADIR@/ecj.jar:${CLASSPATH=.} \
 java org.eclipse.jdt.internal.compiler.batch.Main "$@"


Index: ecj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecj/F-12/ecj.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ecj.spec	9 Sep 2009 08:25:06 -0000	1.6
+++ ecj.spec	21 Dec 2009 21:28:15 -0000	1.7
@@ -8,7 +8,7 @@ Epoch: 1
 Summary: Eclipse Compiler for Java
 Name: ecj
 Version: 3.4.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 Group: Development/Languages
@@ -134,6 +134,9 @@ fi
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Mon Dec 21 2009 Deepak Bhole <dbhole at redhat.com> 1:3.4.2-7
+- Fix RHBZ# 490936. If CLASSPATH is not set, add . to default classpath.
+
 * Wed Sep 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-6
 - Add maven pom and depmaps.
 



From dbhole at fedoraproject.org  Mon Dec 21 21:29:29 2009
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Mon, 21 Dec 2009 21:29:29 +0000 (UTC)
Subject: rpms/ecj/F-11 ecj.sh.in,1.1,1.2 ecj.spec,1.4,1.5
Message-ID: <20091221212929.A4F1A11C00E7@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/ecj/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5653

Modified Files:
	ecj.sh.in ecj.spec 
Log Message:

- Fix RHBZ# 490936. If CLASSPATH is not set, add . to default classpath.




Index: ecj.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ecj/F-11/ecj.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecj.sh.in	10 Mar 2009 18:35:57 -0000	1.1
+++ ecj.sh.in	21 Dec 2009 21:29:29 -0000	1.2
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-CLASSPATH=@JAVADIR@/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+CLASSPATH=@JAVADIR@/ecj.jar:${CLASSPATH=.} \
 java org.eclipse.jdt.internal.compiler.batch.Main "$@"


Index: ecj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecj/F-11/ecj.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ecj.spec	11 Mar 2009 17:32:38 -0000	1.4
+++ ecj.spec	21 Dec 2009 21:29:29 -0000	1.5
@@ -8,7 +8,7 @@ Epoch: 1
 Summary: Eclipse Compiler for Java
 Name: ecj
 Version: 3.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 Group: Development/Languages
@@ -121,6 +121,9 @@ fi
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Mon Dec 21 2009 Deepak Bhole <dbhole at redhat.com> 1:3.4.2-5
+- Fix RHBZ# 490936. If CLASSPATH is not set, add . to default classpath.
+
 * Wed Mar 11 2009 Deepak Bhole <dbhole at redhat.com> 1:3.4.2-4
 - Add patch to generate full debuginfo for ecj itself
 



From jdennis at fedoraproject.org  Mon Dec 21 21:45:37 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Mon, 21 Dec 2009 21:45:37 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.92,1.93
Message-ID: <20091221214537.D0D4B11C00E7@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7954

Modified Files:
	freeradius.spec 
Log Message:
- since all sub-packages now require main package remove user creation for sub-packages
- also include the LGPL library license file in addition to the GPL license file
- fix BuildRequires for perl so it's compatible with both Fedora, RHEL5 and RHEL6



Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- freeradius.spec	21 Dec 2009 18:30:56 -0000	1.92
+++ freeradius.spec	21 Dec 2009 21:45:37 -0000	1.93
@@ -6,13 +6,13 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
 
-Obsoletes: freeradius-libs
-
 Source0: ftp://ftp.freeradius.org/pub/radius/freeradius-server-%{version}.tar.bz2
 Source100: freeradius-radiusd-init
 Source102: freeradius-logrotate
 Source103: freeradius-pam-conf
 
+Obsoletes: freeradius-libs
+
 %define docdir %{_docdir}/freeradius-%{version}
 %define initddir %{?_initddir:%{_initddir}}%{!?_initddir:%{_initrddir}}
 
@@ -95,11 +95,13 @@ Summary: Perl support for freeradius
 Group: System Environment/Daemons
 Requires: %{name} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-%if 0%{?fedora}
-BuildRequires: perl-devel
-%else
+%{?fedora:BuildRequires: perl-devel}
+%if 0%{?rhel} <= 5
 BuildRequires: perl
 %endif
+%if 0%{?rhel} >= 6
+BuildRequires: perl-devel
+%endif
 BuildRequires: perl(ExtUtils::Embed)
 
 %description perl
@@ -218,9 +220,11 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialu
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/experimental.conf
 
 # install doc files omitted by standard install
-for f in COPYRIGHT CREDITS INSTALL LICENSE README; do
+for f in COPYRIGHT CREDITS INSTALL README; do
     cp $f $RPM_BUILD_ROOT/%{docdir}
 done
+cp LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.gpl
+cp src/lib/LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.lgpl
 
 # add Red Hat specific documentation
 cat >> $RPM_BUILD_ROOT/%{docdir}/REDHAT << EOF
@@ -245,54 +249,6 @@ getent group  radiusd >/dev/null || /usr
 getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
 exit 0
 
-%pre devel
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre krb5
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre ldap
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre mysql
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre perl
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre postgresql
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre python
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre unixODBC
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre utils
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-
-
-
 %post
 if [ $1 = 1 ]; then
   /sbin/chkconfig --add radiusd
@@ -612,6 +568,9 @@ fi
 - fix description of the devel subpackage, remove referene to non-shipped libs
 - remove execute permissions on src files included in debuginfo
 - remove unnecessary use of ldconfig
+- since all sub-packages now require main package remove user creation for sub-packages
+- also include the LGPL library license file in addition to the GPL license file
+- fix BuildRequires for perl so it's compatible with both Fedora, RHEL5 and RHEL6
 
 * Mon Dec 21 2009 John Dennis <jdennis at redhat.com> - 2.1.7-5
 - fix various rpmlint issues.



From lkundrak at fedoraproject.org  Mon Dec 21 21:46:03 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 21 Dec 2009 21:46:03 +0000 (UTC)
Subject: File testng-5.11.zip uploaded to lookaside cache by lkundrak
Message-ID: <20091221214603.92AF110F862@bastion.fedoraproject.org>

A file has been added to the lookaside cache for testng:

2c3539788100b56ddec1e78c6d5b73d8  testng-5.11.zip



From lkundrak at fedoraproject.org  Mon Dec 21 21:50:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 21 Dec 2009 21:50:00 +0000 (UTC)
Subject: rpms/testng/EL-5 0001-Disable-DTDDoc-target.patch, NONE,
	1.1 0001-Do-not-bundle-prebuilt-jar-s.patch, NONE,
	1.1 0001-Port-to-QDoc-1.9.patch, NONE, 1.1 testng-5.11.pom, NONE,
	1.1 testng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221215000.238F411C00E7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/testng/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8624/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Disable-DTDDoc-target.patch 
	0001-Do-not-bundle-prebuilt-jar-s.patch 
	0001-Port-to-QDoc-1.9.patch testng-5.11.pom testng.spec 
Log Message:
Import testng

0001-Disable-DTDDoc-target.patch:
 build.xml |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Disable-DTDDoc-target.patch ---
>From 770133c22ac56be30115f33a904e8d590e0c0cda Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:16 +0100
Subject: [PATCH 2/4] Disable DTDDoc target

We do not ship DTDDoc yet.
---
 build.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 832b36b..71af78b 100644
--- a/build.xml
+++ b/build.xml
@@ -371,17 +371,17 @@
     <copy file="${jdk15.testng.jar}" tofile="${jdk15.jar}" />
   </target>
 
-  <taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
-     classpath="lib/DTDDoc.jar"/>
+  <!--taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
+     classpath="lib/DTDDoc.jar"/-->
 
   <target name="dtd">
-    <DTDDoc showHiddenTags="false"
+    <!--DTDDoc showHiddenTags="false"
             showFixmeTags="false"
             sourceDir="src/main"
             destDir="dtd"
             docTitle="TestNG DTD">
         <include name="testng-1.0.dtd"/>
-    </DTDDoc>
+    </DTDDoc-->
   </target>
 
   <target name="ftp">
-- 
1.6.5.2


0001-Do-not-bundle-prebuilt-jar-s.patch:
 build.xml |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Do-not-bundle-prebuilt-jar-s.patch ---
>From 4bc2dd4f10a7cca628af7c9c8aac6fe3b3d5ad27 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:15 +0100
Subject: [PATCH 1/4] Do not bundle prebuilt jar-s

---
 build.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 683100d..832b36b 100644
--- a/build.xml
+++ b/build.xml
@@ -243,21 +243,21 @@
   </target>
 
   <target name="extract-beanshell-jar">
-    <unjar src="3rdparty/${beanshell.jar}"
+    <!--unjar src="3rdparty/${beanshell.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="extract-qdox-jar">
-    <unjar src="3rdparty/${qdox.jar}"
+    <!--unjar src="3rdparty/${qdox.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="extract-concurrent-jar">
-    <unjar src="3rdparty/${concurrent.jar}"
+    <!--unjar src="3rdparty/${concurrent.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="dist-15" depends="compile-15, dist-15-bsh">
-- 
1.6.5.2


0001-Port-to-QDoc-1.9.patch:
 AnnotationTestConverter.java |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Port-to-QDoc-1.9.patch ---
>From 02af5468f942e91ddbbbafab7256124b1e72b013 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:16 +0100
Subject: [PATCH 3/4] Port to QDoc 1.9

---
 .../testng/internal/AnnotationTestConverter.java   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/org/testng/internal/AnnotationTestConverter.java b/src/main/org/testng/internal/AnnotationTestConverter.java
index 539592b..d024e9f 100644
--- a/src/main/org/testng/internal/AnnotationTestConverter.java
+++ b/src/main/org/testng/internal/AnnotationTestConverter.java
@@ -115,7 +115,7 @@ public class AnnotationTestConverter {
     Class<IAnnotation> annotationClass= m_annotationMap.get(tag.getName());
     if(annotationClass == null) {
       ppp("Found unknown testng annotation " + tag.getName() + " in file "
-          + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
+          + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
           + tag.getLineNumber());
 
       // preserve the information - but it looks like an invalid tag
@@ -128,7 +128,7 @@ public class AnnotationTestConverter {
     }
     catch(Exception e) {
       ppp("Found unknown testng parameter " + key + " in annotation " + tag.getName() + " in file "
-          + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
+          + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
           + tag.getLineNumber());
 
       // preserve the information - but it looks like an invalid parameter
@@ -279,7 +279,7 @@ public class AnnotationTestConverter {
 
         if(finalLines.size() > lineCount) {
           ppp("Writing file " + file.getAbsolutePath());
-          writeFile(file, source.getPackage(), finalLines);
+          writeFile(file, source.getPackage().getName(), finalLines);
           converted++;
         }
       }
-- 
1.6.5.2



--- NEW FILE testng-5.11.pom ---
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <!--
    This POM cannot be used to build TestNG; it should only be used as part of a Maven
    repository upload bundle.
    
    See the guide to creating a bundle here:
    http://maven.apache.org/guides/mini/guide-central-repository-upload.html
    -->
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.testng</groupId>
    <artifactId>testng</artifactId>
    <name>TestNG</name>
    <version>5.11</version>
    <description>TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.</description>
    <url>http://testng.org</url>
    
    <licenses>
        <license>
            <name>Apache License, Version 2.0</name>
            <url>http://apache.org/licenses/LICENSE-2.0</url>
        </license>
    </licenses>

    <scm>
        <connection>scm:svn:http://testng.googlecode.com/svn/trunk/</connection>
        <developerConnection>scm:svn:http://testng.googlecode.com/svn/trunk/</developerConnection>
        <url>http://testng.googlecode.com/svn/trunk</url>
    </scm>
    
    <dependencies>
        <dependency>
            <groupId>ant</groupId>
            <artifactId>ant</artifactId>
            <version>1.6.5</version>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>3.8.1</version>
        </dependency>
        <dependency>
            <groupId>qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.1</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.beanshell</groupId>
            <artifactId>bsh</artifactId>
            <version>2.0b4</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>    
    
</project>


--- NEW FILE testng.spec ---
Name:           testng
Version:        5.11
Release:        2%{?dist}
Summary:        Java-based testing framework

Group:          Development/Tools
License:        ASL 2.0
URL:            http://testng.org/
Source0:        http://testng.org/%{name}-%{version}.zip
Source1:        http://repo2.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom
Patch0:         0001-Do-not-bundle-prebuilt-jar-s.patch
Patch1:         0001-Disable-DTDDoc-target.patch
Patch2:         0001-Port-to-QDoc-1.9.patch

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ant
BuildRequires:  unzip
BuildRequires:  jpackage-utils
BuildRequires:  java-devel-openjdk
BuildRequires:  bsh
BuildRequires:  qdox
BuildRequires:  backport-util-concurrent
BuildRequires:  junit
Requires:       jpackage-utils

BuildArch:      noarch

%description
TestNG is a testing framework inspired from JUnit and NUnit but introducing
some new functionality, including flexible test configuration, and
distributed test running.  It is designed to cover unit tests as well as
functional, end-to-end, integration, etc.


%package javadoc
Summary:        API Documentation for %{name}
Group:          Development/Tools
Requires:       jpackage-utils

%description javadoc
JavaDoc documentation for %{name}


%prep
%setup -q
%patch0 -p1 -b .nobundle
%patch1 -p1 -b .dtddoc
%patch2 -p1 -b .qdoc19


%build
find -name '*.jar' -delete
CLASSPATH=$(build-classpath bsh qdox backport-util-concurrent junit) \
        ant dist-15 javadocs

# Convert CP/M line encoding to UNIX one
sed 's/\r//' <README >README.unix
touch -r README README.unix
mv README.unix README


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -pm644 %{name}-%{version}-jdk15.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# API documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -a javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# Maven stuff
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.%{name} %{name} %{version} JPP %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_sysconfdir}/maven/fragments
%{_datadir}/maven2
%doc CHANGES.txt README LICENSE.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*


%post
%update_maven_depmap


%postun
%update_maven_depmap


%changelog
* Mon Dec 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.11-2
- Add POM

* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.11-1
- Bump to 5.11
- Add maven depmap fragments
- Fix line encoding of README

* Wed Dec 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.10-2
- Add javadoc
- Don't ship jdk14 jar

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.10-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/testng/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:03:32 -0000	1.1
+++ .cvsignore	21 Dec 2009 21:49:59 -0000	1.2
@@ -0,0 +1 @@
+testng-5.11.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/testng/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:03:32 -0000	1.1
+++ sources	21 Dec 2009 21:49:59 -0000	1.2
@@ -0,0 +1 @@
+2c3539788100b56ddec1e78c6d5b73d8  testng-5.11.zip



From lkundrak at fedoraproject.org  Mon Dec 21 21:50:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 21 Dec 2009 21:50:00 +0000 (UTC)
Subject: rpms/testng/F-12 0001-Disable-DTDDoc-target.patch, NONE,
	1.1 0001-Do-not-bundle-prebuilt-jar-s.patch, NONE,
	1.1 0001-Port-to-QDoc-1.9.patch, NONE, 1.1 testng-5.11.pom, NONE,
	1.1 testng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221215000.7721511C00E7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/testng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8624/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Disable-DTDDoc-target.patch 
	0001-Do-not-bundle-prebuilt-jar-s.patch 
	0001-Port-to-QDoc-1.9.patch testng-5.11.pom testng.spec 
Log Message:
Import testng

0001-Disable-DTDDoc-target.patch:
 build.xml |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Disable-DTDDoc-target.patch ---
>From 770133c22ac56be30115f33a904e8d590e0c0cda Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:16 +0100
Subject: [PATCH 2/4] Disable DTDDoc target

We do not ship DTDDoc yet.
---
 build.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 832b36b..71af78b 100644
--- a/build.xml
+++ b/build.xml
@@ -371,17 +371,17 @@
     <copy file="${jdk15.testng.jar}" tofile="${jdk15.jar}" />
   </target>
 
-  <taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
-     classpath="lib/DTDDoc.jar"/>
+  <!--taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
+     classpath="lib/DTDDoc.jar"/-->
 
   <target name="dtd">
-    <DTDDoc showHiddenTags="false"
+    <!--DTDDoc showHiddenTags="false"
             showFixmeTags="false"
             sourceDir="src/main"
             destDir="dtd"
             docTitle="TestNG DTD">
         <include name="testng-1.0.dtd"/>
-    </DTDDoc>
+    </DTDDoc-->
   </target>
 
   <target name="ftp">
-- 
1.6.5.2


0001-Do-not-bundle-prebuilt-jar-s.patch:
 build.xml |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Do-not-bundle-prebuilt-jar-s.patch ---
>From 4bc2dd4f10a7cca628af7c9c8aac6fe3b3d5ad27 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:15 +0100
Subject: [PATCH 1/4] Do not bundle prebuilt jar-s

---
 build.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 683100d..832b36b 100644
--- a/build.xml
+++ b/build.xml
@@ -243,21 +243,21 @@
   </target>
 
   <target name="extract-beanshell-jar">
-    <unjar src="3rdparty/${beanshell.jar}"
+    <!--unjar src="3rdparty/${beanshell.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="extract-qdox-jar">
-    <unjar src="3rdparty/${qdox.jar}"
+    <!--unjar src="3rdparty/${qdox.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="extract-concurrent-jar">
-    <unjar src="3rdparty/${concurrent.jar}"
+    <!--unjar src="3rdparty/${concurrent.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="dist-15" depends="compile-15, dist-15-bsh">
-- 
1.6.5.2


0001-Port-to-QDoc-1.9.patch:
 AnnotationTestConverter.java |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Port-to-QDoc-1.9.patch ---
>From 02af5468f942e91ddbbbafab7256124b1e72b013 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:16 +0100
Subject: [PATCH 3/4] Port to QDoc 1.9

---
 .../testng/internal/AnnotationTestConverter.java   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/org/testng/internal/AnnotationTestConverter.java b/src/main/org/testng/internal/AnnotationTestConverter.java
index 539592b..d024e9f 100644
--- a/src/main/org/testng/internal/AnnotationTestConverter.java
+++ b/src/main/org/testng/internal/AnnotationTestConverter.java
@@ -115,7 +115,7 @@ public class AnnotationTestConverter {
     Class<IAnnotation> annotationClass= m_annotationMap.get(tag.getName());
     if(annotationClass == null) {
       ppp("Found unknown testng annotation " + tag.getName() + " in file "
-          + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
+          + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
           + tag.getLineNumber());
 
       // preserve the information - but it looks like an invalid tag
@@ -128,7 +128,7 @@ public class AnnotationTestConverter {
     }
     catch(Exception e) {
       ppp("Found unknown testng parameter " + key + " in annotation " + tag.getName() + " in file "
-          + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
+          + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
           + tag.getLineNumber());
 
       // preserve the information - but it looks like an invalid parameter
@@ -279,7 +279,7 @@ public class AnnotationTestConverter {
 
         if(finalLines.size() > lineCount) {
           ppp("Writing file " + file.getAbsolutePath());
-          writeFile(file, source.getPackage(), finalLines);
+          writeFile(file, source.getPackage().getName(), finalLines);
           converted++;
         }
       }
-- 
1.6.5.2



--- NEW FILE testng-5.11.pom ---
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <!--
    This POM cannot be used to build TestNG; it should only be used as part of a Maven
    repository upload bundle.
    
    See the guide to creating a bundle here:
    http://maven.apache.org/guides/mini/guide-central-repository-upload.html
    -->
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.testng</groupId>
    <artifactId>testng</artifactId>
    <name>TestNG</name>
    <version>5.11</version>
    <description>TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.</description>
    <url>http://testng.org</url>
    
    <licenses>
        <license>
            <name>Apache License, Version 2.0</name>
            <url>http://apache.org/licenses/LICENSE-2.0</url>
        </license>
    </licenses>

    <scm>
        <connection>scm:svn:http://testng.googlecode.com/svn/trunk/</connection>
        <developerConnection>scm:svn:http://testng.googlecode.com/svn/trunk/</developerConnection>
        <url>http://testng.googlecode.com/svn/trunk</url>
    </scm>
    
    <dependencies>
        <dependency>
            <groupId>ant</groupId>
            <artifactId>ant</artifactId>
            <version>1.6.5</version>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>3.8.1</version>
        </dependency>
        <dependency>
            <groupId>qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.1</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.beanshell</groupId>
            <artifactId>bsh</artifactId>
            <version>2.0b4</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>    
    
</project>


--- NEW FILE testng.spec ---
Name:           testng
Version:        5.11
Release:        2%{?dist}
Summary:        Java-based testing framework

Group:          Development/Tools
License:        ASL 2.0
URL:            http://testng.org/
Source0:        http://testng.org/%{name}-%{version}.zip
Source1:        http://repo2.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom
Patch0:         0001-Do-not-bundle-prebuilt-jar-s.patch
Patch1:         0001-Disable-DTDDoc-target.patch
Patch2:         0001-Port-to-QDoc-1.9.patch

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ant
BuildRequires:  unzip
BuildRequires:  jpackage-utils
BuildRequires:  java-devel-openjdk
BuildRequires:  bsh
BuildRequires:  qdox
BuildRequires:  backport-util-concurrent
BuildRequires:  junit
Requires:       jpackage-utils

BuildArch:      noarch

%description
TestNG is a testing framework inspired from JUnit and NUnit but introducing
some new functionality, including flexible test configuration, and
distributed test running.  It is designed to cover unit tests as well as
functional, end-to-end, integration, etc.


%package javadoc
Summary:        API Documentation for %{name}
Group:          Development/Tools
Requires:       jpackage-utils

%description javadoc
JavaDoc documentation for %{name}


%prep
%setup -q
%patch0 -p1 -b .nobundle
%patch1 -p1 -b .dtddoc
%patch2 -p1 -b .qdoc19


%build
find -name '*.jar' -delete
CLASSPATH=$(build-classpath bsh qdox backport-util-concurrent junit) \
        ant dist-15 javadocs

# Convert CP/M line encoding to UNIX one
sed 's/\r//' <README >README.unix
touch -r README README.unix
mv README.unix README


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -pm644 %{name}-%{version}-jdk15.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# API documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -a javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# Maven stuff
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.%{name} %{name} %{version} JPP %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_sysconfdir}/maven/fragments
%{_datadir}/maven2
%doc CHANGES.txt README LICENSE.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*


%post
%update_maven_depmap


%postun
%update_maven_depmap


%changelog
* Mon Dec 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.11-2
- Add POM

* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.11-1
- Bump to 5.11
- Add maven depmap fragments
- Fix line encoding of README

* Wed Dec 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.10-2
- Add javadoc
- Don't ship jdk14 jar

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.10-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/testng/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:03:32 -0000	1.1
+++ .cvsignore	21 Dec 2009 21:50:00 -0000	1.2
@@ -0,0 +1 @@
+testng-5.11.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/testng/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:03:32 -0000	1.1
+++ sources	21 Dec 2009 21:50:00 -0000	1.2
@@ -0,0 +1 @@
+2c3539788100b56ddec1e78c6d5b73d8  testng-5.11.zip



From lkundrak at fedoraproject.org  Mon Dec 21 21:50:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 21 Dec 2009 21:50:00 +0000 (UTC)
Subject: rpms/testng/devel 0001-Disable-DTDDoc-target.patch, NONE,
	1.1 0001-Do-not-bundle-prebuilt-jar-s.patch, NONE,
	1.1 0001-Port-to-QDoc-1.9.patch, NONE, 1.1 testng-5.11.pom, NONE,
	1.1 testng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221215000.A376D11C00E7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/testng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8624/devel

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Disable-DTDDoc-target.patch 
	0001-Do-not-bundle-prebuilt-jar-s.patch 
	0001-Port-to-QDoc-1.9.patch testng-5.11.pom testng.spec 
Log Message:
Import testng

0001-Disable-DTDDoc-target.patch:
 build.xml |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Disable-DTDDoc-target.patch ---
>From 770133c22ac56be30115f33a904e8d590e0c0cda Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:16 +0100
Subject: [PATCH 2/4] Disable DTDDoc target

We do not ship DTDDoc yet.
---
 build.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 832b36b..71af78b 100644
--- a/build.xml
+++ b/build.xml
@@ -371,17 +371,17 @@
     <copy file="${jdk15.testng.jar}" tofile="${jdk15.jar}" />
   </target>
 
-  <taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
-     classpath="lib/DTDDoc.jar"/>
+  <!--taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
+     classpath="lib/DTDDoc.jar"/-->
 
   <target name="dtd">
-    <DTDDoc showHiddenTags="false"
+    <!--DTDDoc showHiddenTags="false"
             showFixmeTags="false"
             sourceDir="src/main"
             destDir="dtd"
             docTitle="TestNG DTD">
         <include name="testng-1.0.dtd"/>
-    </DTDDoc>
+    </DTDDoc-->
   </target>
 
   <target name="ftp">
-- 
1.6.5.2


0001-Do-not-bundle-prebuilt-jar-s.patch:
 build.xml |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Do-not-bundle-prebuilt-jar-s.patch ---
>From 4bc2dd4f10a7cca628af7c9c8aac6fe3b3d5ad27 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:15 +0100
Subject: [PATCH 1/4] Do not bundle prebuilt jar-s

---
 build.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 683100d..832b36b 100644
--- a/build.xml
+++ b/build.xml
@@ -243,21 +243,21 @@
   </target>
 
   <target name="extract-beanshell-jar">
-    <unjar src="3rdparty/${beanshell.jar}"
+    <!--unjar src="3rdparty/${beanshell.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="extract-qdox-jar">
-    <unjar src="3rdparty/${qdox.jar}"
+    <!--unjar src="3rdparty/${qdox.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="extract-concurrent-jar">
-    <unjar src="3rdparty/${concurrent.jar}"
+    <!--unjar src="3rdparty/${concurrent.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="dist-15" depends="compile-15, dist-15-bsh">
-- 
1.6.5.2


0001-Port-to-QDoc-1.9.patch:
 AnnotationTestConverter.java |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Port-to-QDoc-1.9.patch ---
>From 02af5468f942e91ddbbbafab7256124b1e72b013 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:16 +0100
Subject: [PATCH 3/4] Port to QDoc 1.9

---
 .../testng/internal/AnnotationTestConverter.java   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/org/testng/internal/AnnotationTestConverter.java b/src/main/org/testng/internal/AnnotationTestConverter.java
index 539592b..d024e9f 100644
--- a/src/main/org/testng/internal/AnnotationTestConverter.java
+++ b/src/main/org/testng/internal/AnnotationTestConverter.java
@@ -115,7 +115,7 @@ public class AnnotationTestConverter {
     Class<IAnnotation> annotationClass= m_annotationMap.get(tag.getName());
     if(annotationClass == null) {
       ppp("Found unknown testng annotation " + tag.getName() + " in file "
-          + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
+          + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
           + tag.getLineNumber());
 
       // preserve the information - but it looks like an invalid tag
@@ -128,7 +128,7 @@ public class AnnotationTestConverter {
     }
     catch(Exception e) {
       ppp("Found unknown testng parameter " + key + " in annotation " + tag.getName() + " in file "
-          + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
+          + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
           + tag.getLineNumber());
 
       // preserve the information - but it looks like an invalid parameter
@@ -279,7 +279,7 @@ public class AnnotationTestConverter {
 
         if(finalLines.size() > lineCount) {
           ppp("Writing file " + file.getAbsolutePath());
-          writeFile(file, source.getPackage(), finalLines);
+          writeFile(file, source.getPackage().getName(), finalLines);
           converted++;
         }
       }
-- 
1.6.5.2



--- NEW FILE testng-5.11.pom ---
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <!--
    This POM cannot be used to build TestNG; it should only be used as part of a Maven
    repository upload bundle.
    
    See the guide to creating a bundle here:
    http://maven.apache.org/guides/mini/guide-central-repository-upload.html
    -->
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.testng</groupId>
    <artifactId>testng</artifactId>
    <name>TestNG</name>
    <version>5.11</version>
    <description>TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.</description>
    <url>http://testng.org</url>
    
    <licenses>
        <license>
            <name>Apache License, Version 2.0</name>
            <url>http://apache.org/licenses/LICENSE-2.0</url>
        </license>
    </licenses>

    <scm>
        <connection>scm:svn:http://testng.googlecode.com/svn/trunk/</connection>
        <developerConnection>scm:svn:http://testng.googlecode.com/svn/trunk/</developerConnection>
        <url>http://testng.googlecode.com/svn/trunk</url>
    </scm>
    
    <dependencies>
        <dependency>
            <groupId>ant</groupId>
            <artifactId>ant</artifactId>
            <version>1.6.5</version>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>3.8.1</version>
        </dependency>
        <dependency>
            <groupId>qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.1</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.beanshell</groupId>
            <artifactId>bsh</artifactId>
            <version>2.0b4</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>    
    
</project>


--- NEW FILE testng.spec ---
Name:           testng
Version:        5.11
Release:        2%{?dist}
Summary:        Java-based testing framework

Group:          Development/Tools
License:        ASL 2.0
URL:            http://testng.org/
Source0:        http://testng.org/%{name}-%{version}.zip
Source1:        http://repo2.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom
Patch0:         0001-Do-not-bundle-prebuilt-jar-s.patch
Patch1:         0001-Disable-DTDDoc-target.patch
Patch2:         0001-Port-to-QDoc-1.9.patch

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ant
BuildRequires:  unzip
BuildRequires:  jpackage-utils
BuildRequires:  java-devel-openjdk
BuildRequires:  bsh
BuildRequires:  qdox
BuildRequires:  backport-util-concurrent
BuildRequires:  junit
Requires:       jpackage-utils

BuildArch:      noarch

%description
TestNG is a testing framework inspired from JUnit and NUnit but introducing
some new functionality, including flexible test configuration, and
distributed test running.  It is designed to cover unit tests as well as
functional, end-to-end, integration, etc.


%package javadoc
Summary:        API Documentation for %{name}
Group:          Development/Tools
Requires:       jpackage-utils

%description javadoc
JavaDoc documentation for %{name}


%prep
%setup -q
%patch0 -p1 -b .nobundle
%patch1 -p1 -b .dtddoc
%patch2 -p1 -b .qdoc19


%build
find -name '*.jar' -delete
CLASSPATH=$(build-classpath bsh qdox backport-util-concurrent junit) \
        ant dist-15 javadocs

# Convert CP/M line encoding to UNIX one
sed 's/\r//' <README >README.unix
touch -r README README.unix
mv README.unix README


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -pm644 %{name}-%{version}-jdk15.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# API documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -a javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# Maven stuff
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.%{name} %{name} %{version} JPP %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_sysconfdir}/maven/fragments
%{_datadir}/maven2
%doc CHANGES.txt README LICENSE.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*


%post
%update_maven_depmap


%postun
%update_maven_depmap


%changelog
* Mon Dec 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.11-2
- Add POM

* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.11-1
- Bump to 5.11
- Add maven depmap fragments
- Fix line encoding of README

* Wed Dec 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.10-2
- Add javadoc
- Don't ship jdk14 jar

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.10-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/testng/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:03:32 -0000	1.1
+++ .cvsignore	21 Dec 2009 21:50:00 -0000	1.2
@@ -0,0 +1 @@
+testng-5.11.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/testng/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:03:32 -0000	1.1
+++ sources	21 Dec 2009 21:50:00 -0000	1.2
@@ -0,0 +1 @@
+2c3539788100b56ddec1e78c6d5b73d8  testng-5.11.zip



From lkundrak at fedoraproject.org  Mon Dec 21 21:50:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 21 Dec 2009 21:50:00 +0000 (UTC)
Subject: rpms/testng/F-11 0001-Disable-DTDDoc-target.patch, NONE,
	1.1 0001-Do-not-bundle-prebuilt-jar-s.patch, NONE,
	1.1 0001-Port-to-QDoc-1.9.patch, NONE, 1.1 testng-5.11.pom, NONE,
	1.1 testng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221215000.48D4811C00E7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/testng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8624/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Disable-DTDDoc-target.patch 
	0001-Do-not-bundle-prebuilt-jar-s.patch 
	0001-Port-to-QDoc-1.9.patch testng-5.11.pom testng.spec 
Log Message:
Import testng

0001-Disable-DTDDoc-target.patch:
 build.xml |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Disable-DTDDoc-target.patch ---
>From 770133c22ac56be30115f33a904e8d590e0c0cda Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:16 +0100
Subject: [PATCH 2/4] Disable DTDDoc target

We do not ship DTDDoc yet.
---
 build.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 832b36b..71af78b 100644
--- a/build.xml
+++ b/build.xml
@@ -371,17 +371,17 @@
     <copy file="${jdk15.testng.jar}" tofile="${jdk15.jar}" />
   </target>
 
-  <taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
-     classpath="lib/DTDDoc.jar"/>
+  <!--taskdef name="DTDDoc" classname="DTDDoc.DTDDocTask"
+     classpath="lib/DTDDoc.jar"/-->
 
   <target name="dtd">
-    <DTDDoc showHiddenTags="false"
+    <!--DTDDoc showHiddenTags="false"
             showFixmeTags="false"
             sourceDir="src/main"
             destDir="dtd"
             docTitle="TestNG DTD">
         <include name="testng-1.0.dtd"/>
-    </DTDDoc>
+    </DTDDoc-->
   </target>
 
   <target name="ftp">
-- 
1.6.5.2


0001-Do-not-bundle-prebuilt-jar-s.patch:
 build.xml |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Do-not-bundle-prebuilt-jar-s.patch ---
>From 4bc2dd4f10a7cca628af7c9c8aac6fe3b3d5ad27 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:15 +0100
Subject: [PATCH 1/4] Do not bundle prebuilt jar-s

---
 build.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 683100d..832b36b 100644
--- a/build.xml
+++ b/build.xml
@@ -243,21 +243,21 @@
   </target>
 
   <target name="extract-beanshell-jar">
-    <unjar src="3rdparty/${beanshell.jar}"
+    <!--unjar src="3rdparty/${beanshell.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="extract-qdox-jar">
-    <unjar src="3rdparty/${qdox.jar}"
+    <!--unjar src="3rdparty/${qdox.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="extract-concurrent-jar">
-    <unjar src="3rdparty/${concurrent.jar}"
+    <!--unjar src="3rdparty/${concurrent.jar}"
            dest="${build.3rdparty.dir}"
-           overwrite="true" />
+           overwrite="true" /-->
   </target>
 
   <target name="dist-15" depends="compile-15, dist-15-bsh">
-- 
1.6.5.2


0001-Port-to-QDoc-1.9.patch:
 AnnotationTestConverter.java |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Port-to-QDoc-1.9.patch ---
>From 02af5468f942e91ddbbbafab7256124b1e72b013 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 27 Nov 2009 14:46:16 +0100
Subject: [PATCH 3/4] Port to QDoc 1.9

---
 .../testng/internal/AnnotationTestConverter.java   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/org/testng/internal/AnnotationTestConverter.java b/src/main/org/testng/internal/AnnotationTestConverter.java
index 539592b..d024e9f 100644
--- a/src/main/org/testng/internal/AnnotationTestConverter.java
+++ b/src/main/org/testng/internal/AnnotationTestConverter.java
@@ -115,7 +115,7 @@ public class AnnotationTestConverter {
     Class<IAnnotation> annotationClass= m_annotationMap.get(tag.getName());
     if(annotationClass == null) {
       ppp("Found unknown testng annotation " + tag.getName() + " in file "
-          + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
+          + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
           + tag.getLineNumber());
 
       // preserve the information - but it looks like an invalid tag
@@ -128,7 +128,7 @@ public class AnnotationTestConverter {
     }
     catch(Exception e) {
       ppp("Found unknown testng parameter " + key + " in annotation " + tag.getName() + " in file "
-          + tag.getContext().getSource().getFile().getAbsolutePath() + " at line "
+          + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line "
           + tag.getLineNumber());
 
       // preserve the information - but it looks like an invalid parameter
@@ -279,7 +279,7 @@ public class AnnotationTestConverter {
 
         if(finalLines.size() > lineCount) {
           ppp("Writing file " + file.getAbsolutePath());
-          writeFile(file, source.getPackage(), finalLines);
+          writeFile(file, source.getPackage().getName(), finalLines);
           converted++;
         }
       }
-- 
1.6.5.2



--- NEW FILE testng-5.11.pom ---
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <!--
    This POM cannot be used to build TestNG; it should only be used as part of a Maven
    repository upload bundle.
    
    See the guide to creating a bundle here:
    http://maven.apache.org/guides/mini/guide-central-repository-upload.html
    -->
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.testng</groupId>
    <artifactId>testng</artifactId>
    <name>TestNG</name>
    <version>5.11</version>
    <description>TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.</description>
    <url>http://testng.org</url>
    
    <licenses>
        <license>
            <name>Apache License, Version 2.0</name>
            <url>http://apache.org/licenses/LICENSE-2.0</url>
        </license>
    </licenses>

    <scm>
        <connection>scm:svn:http://testng.googlecode.com/svn/trunk/</connection>
        <developerConnection>scm:svn:http://testng.googlecode.com/svn/trunk/</developerConnection>
        <url>http://testng.googlecode.com/svn/trunk</url>
    </scm>
    
    <dependencies>
        <dependency>
            <groupId>ant</groupId>
            <artifactId>ant</artifactId>
            <version>1.6.5</version>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>3.8.1</version>
        </dependency>
        <dependency>
            <groupId>qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.1</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.beanshell</groupId>
            <artifactId>bsh</artifactId>
            <version>2.0b4</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>    
    
</project>


--- NEW FILE testng.spec ---
Name:           testng
Version:        5.11
Release:        2%{?dist}
Summary:        Java-based testing framework

Group:          Development/Tools
License:        ASL 2.0
URL:            http://testng.org/
Source0:        http://testng.org/%{name}-%{version}.zip
Source1:        http://repo2.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom
Patch0:         0001-Do-not-bundle-prebuilt-jar-s.patch
Patch1:         0001-Disable-DTDDoc-target.patch
Patch2:         0001-Port-to-QDoc-1.9.patch

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  ant
BuildRequires:  unzip
BuildRequires:  jpackage-utils
BuildRequires:  java-devel-openjdk
BuildRequires:  bsh
BuildRequires:  qdox
BuildRequires:  backport-util-concurrent
BuildRequires:  junit
Requires:       jpackage-utils

BuildArch:      noarch

%description
TestNG is a testing framework inspired from JUnit and NUnit but introducing
some new functionality, including flexible test configuration, and
distributed test running.  It is designed to cover unit tests as well as
functional, end-to-end, integration, etc.


%package javadoc
Summary:        API Documentation for %{name}
Group:          Development/Tools
Requires:       jpackage-utils

%description javadoc
JavaDoc documentation for %{name}


%prep
%setup -q
%patch0 -p1 -b .nobundle
%patch1 -p1 -b .dtddoc
%patch2 -p1 -b .qdoc19


%build
find -name '*.jar' -delete
CLASSPATH=$(build-classpath bsh qdox backport-util-concurrent junit) \
        ant dist-15 javadocs

# Convert CP/M line encoding to UNIX one
sed 's/\r//' <README >README.unix
touch -r README README.unix
mv README.unix README


%install
rm -rf $RPM_BUILD_ROOT

# Code
install -d $RPM_BUILD_ROOT%{_javadir}
install -pm644 %{name}-%{version}-jdk15.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# API documentation
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -a javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# Maven stuff
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.%{name} %{name} %{version} JPP %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_sysconfdir}/maven/fragments
%{_datadir}/maven2
%doc CHANGES.txt README LICENSE.txt


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*


%post
%update_maven_depmap


%postun
%update_maven_depmap


%changelog
* Mon Dec 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.11-2
- Add POM

* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.11-1
- Bump to 5.11
- Add maven depmap fragments
- Fix line encoding of README

* Wed Dec 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.10-2
- Add javadoc
- Don't ship jdk14 jar

* Fri Nov 27 2009 Lubomir Rintel <lkundrak at v3.sk> - 5.10-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/testng/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:03:32 -0000	1.1
+++ .cvsignore	21 Dec 2009 21:50:00 -0000	1.2
@@ -0,0 +1 @@
+testng-5.11.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/testng/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:03:32 -0000	1.1
+++ sources	21 Dec 2009 21:50:00 -0000	1.2
@@ -0,0 +1 @@
+2c3539788100b56ddec1e78c6d5b73d8  testng-5.11.zip



From rhughes at fedoraproject.org  Mon Dec 21 21:54:58 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 21 Dec 2009 21:54:58 +0000 (UTC)
Subject: File shared-color-targets-0.0.1.tar.gz uploaded to lookaside cache by
	rhughes
Message-ID: <20091221215458.40FEC10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for shared-color-targets:

c8315f383c398703f8eeb452d4bce3af  shared-color-targets-0.0.1.tar.gz



From rhughes at fedoraproject.org  Mon Dec 21 21:55:26 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 21 Dec 2009 21:55:26 +0000 (UTC)
Subject: rpms/shared-color-targets/devel import.log, NONE,
	1.1 shared-color-targets.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091221215526.ACB9D11C00E7@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/shared-color-targets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9751/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shared-color-targets.spec 
Log Message:



--- NEW FILE import.log ---
shared-color-targets-0_0_1-0_8_20091218git_fc12:HEAD:shared-color-targets-0.0.1-0.8.20091218git.fc12.src.rpm:1261432480


--- NEW FILE shared-color-targets.spec ---
%define alphatag .20091218git

Summary: Shared color targets for creating color profiles
Name: shared-color-targets
Version: 0.0.1
Release: 0.8%{?alphatag}%{?dist}
URL: http://github.com/hughsie/shared-color-targets
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz
License: GPLv2+ and Public Domain and CC-BY-SA
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: color-filesystem

%description 
The shared-color-targets package contains various targets which are useful for
programs that create ICC profiles.
This package only contains the free targets that can be safely distributed
with Fedora.

%prep
%setup -q

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%dir %{_datadir}/color/targets
%{_datadir}/color/targets/*.it8
%dir %{_datadir}/shared-color-targets

# Wolf Faust
%dir %{_datadir}/shared-color-targets/wolf_faust
%{_datadir}/shared-color-targets/wolf_faust/*
%dir %{_datadir}/color/targets/wolf_faust
%dir %{_datadir}/color/targets/wolf_faust/reflective
%{_datadir}/color/targets/wolf_faust/reflective/*.it8
%dir %{_datadir}/color/targets/wolf_faust/transmissive
%{_datadir}/color/targets/wolf_faust/transmissive/*.it8

%changelog
* Fri Dec 18 2009 Richard Hughes <richard at hughsie.com> 0.0.1-0.8.20091218git
- Update from git


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-color-targets/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:42:09 -0000	1.1
+++ .cvsignore	21 Dec 2009 21:55:26 -0000	1.2
@@ -0,0 +1 @@
+shared-color-targets-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-color-targets/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:42:09 -0000	1.1
+++ sources	21 Dec 2009 21:55:26 -0000	1.2
@@ -0,0 +1 @@
+c8315f383c398703f8eeb452d4bce3af  shared-color-targets-0.0.1.tar.gz



From dwalsh at fedoraproject.org  Mon Dec 21 21:56:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 21 Dec 2009 21:56:28 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.460,
	1.461 policycoreutils.spec, 1.666, 1.667
Message-ID: <20091221215628.C4A4F11C00E7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10165

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-7
- Fixes to sandbox man page


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   59 +--
 restorecond/Makefile                        |   24 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.8                   |   15 
 restorecond/restorecond.c                   |  429 +++++-----------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 +
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  239 +++++++++++++++
 restorecond/watch.c                         |  260 ++++++++++++++++
 sandbox/Makefile                            |   31 ++
 sandbox/deliverables/README                 |   32 ++
 sandbox/deliverables/basicwrapper           |    4 
 sandbox/deliverables/run-in-sandbox.py      |   49 +++
 sandbox/deliverables/sandbox                |  216 ++++++++++++++
 sandbox/sandbox                             |  318 ++++++++++++++++++++
 sandbox/sandbox.8                           |   50 +++
 sandbox/sandboxX.sh                         |   16 +
 sandbox/seunshare.c                         |  265 +++++++++++++++++
 semanage/semanage                           |  122 ++++++-
 semanage/seobject.py                        |  397 ++++++++++++++++++++-----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 +++
 setfiles/restore.c                          |   73 ++++
 setfiles/restore.h                          |    3 
 setfiles/restorecon.8                       |    7 
 setfiles/setfiles.8                         |    3 
 setfiles/setfiles.c                         |   73 ----
 31 files changed, 2206 insertions(+), 581 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -p -r1.460 -r1.461
--- policycoreutils-rhat.patch	16 Dec 2009 13:21:58 -0000	1.460
+++ policycoreutils-rhat.patch	21 Dec 2009 21:56:27 -0000	1.461
@@ -1681,12 +1681,33 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.78/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandbox	2009-12-14 09:35:48.000000000 -0500
-@@ -0,0 +1,272 @@
-+#!/usr/bin/python -E
++++ policycoreutils-2.0.78/sandbox/sandbox	2009-12-17 13:50:15.000000000 -0500
+@@ -0,0 +1,318 @@
++#! /usr/bin/python -E
++# Authors: Dan Walsh <dwalsh at redhat.com>
++# Authors: Josh Cogliati
++#
++# Copyright (C) 2009  Red Hat
++# see file 'COPYING' for use and warranty information
++#
++# 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 only
++#
++# 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
++#
++
 +import os, sys, getopt, socket, random, fcntl, shutil, re
 +import selinux
 +import signal
++from tempfile import mkdtemp
 +
 +PROGNAME = "policycoreutils"
 +
@@ -1819,7 +1840,7 @@ diff --exclude-from=exclude --exclude=se
 +
 +    def usage(message = ""):
 +        text = _("""
-+sandbox [-h] [-X] [-M][-I includefile ] [[-i file ] ...] [ -t type ] command
++sandbox [-h] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [[-i file ] ...] [ -t type ] command
 +""")
 +        error_exit("%s\n%s" % (message, text))
 +
@@ -1827,13 +1848,19 @@ diff --exclude-from=exclude --exclude=se
 +    X_ind = False
 +    home_and_temp = False
 +    level=None
++    newhomedir = None
++    newtmpdir = None
++    existing_home = False
++    existing_temp = False
 +    try:
-+           gopts, cmds = getopt.getopt(sys.argv[1:], "l:i:ht:XI:M", 
++           gopts, cmds = getopt.getopt(sys.argv[1:], "l:i:ht:XI:MH:T:", 
 +                                       ["help",
 +                                        "include=", 
 +                                        "includefile=", 
 +                                        "type=",
 +                                        "mount",
++                                        "homedir=",
++                                        "tmpdir=",
 +                                        "level="
 +                                        ])
 +           for o, a in gopts:
@@ -1866,12 +1893,20 @@ diff --exclude-from=exclude --exclude=se
 +                  if o == "-M" or o == "--mount":
 +                         home_and_temp = True
 +
++                  if o == "-H" or o == "--homedir":
++                         existing_home = True
++                         newhomedir = a
++                  if o == "-T" or o == "--tmpdir":
++                         existing_temp = True
++                         newtempdir = a
 +                  if o == "-h" or o == "--help":
 +                         usage(_("Usage"));
 +            
 +           if len(cmds) == 0:
 +                  usage(_("Command required"))
 +
++           if (existing_home or existing_temp) and not home_and_temp:
++                  usage(_("-M required when specifying home directory or temp directory"))
 +           execcon, filecon = gen_context(setype, level)
 +           rc = -1
 +
@@ -1883,20 +1918,34 @@ diff --exclude-from=exclude --exclude=se
 +                                break
 +
 +           try:
-+                  newhomedir = None
-+                  newtmpdir = None
 +                  if home_and_temp:
 +                         if not os.path.exists("/usr/sbin/seunshare"):
 +                                raise ValueError("""/usr/sbin/seunshare required for sandbox -M, to install you need to execute 
 +#yum install /usr/sbin/seunshare""")
 +                         import warnings
 +                         warnings.simplefilter("ignore")
-+                         newhomedir = os.tempnam(".", ".sandbox%s")
-+                         os.mkdir(newhomedir)
-+                         newtmpdir = os.tempnam("/tmp", ".sandbox")
-+                         os.mkdir(newtmpdir)
-+                         chcon =  ("/usr/bin/chcon %s %s %s" % (filecon, newhomedir, newtmpdir)).split()
-+                         rc = os.spawnvp(os.P_WAIT, chcon[0], chcon)
++                         if existing_home:
++                                if not os.path.isdir(newhomedir):
++                                       raise IOError("Home directory "+newhomedir+" not found")
++                                if not level:
++                                       chcon =  ("/usr/bin/chcon -R %s %s" % (filecon, newhomedir)).split()
++                                       rc = os.spawnvp(os.P_WAIT, chcon[0], chcon)
++                         else:
++                                newhomedir = mkdtemp(dir=".", prefix=".sandbox")
++                                chcon =  ("/usr/bin/chcon %s %s" % (filecon, newhomedir)).split()
++                                rc = os.spawnvp(os.P_WAIT, chcon[0], chcon)
++
++                         if existing_temp:
++                                if not os.path.isdir(newtempdir):
++                                       raise IOError("Temp directory "+newtempdir+" not found")                
++                                if not level:
++                                       chcon =  ("/usr/bin/chcon -R %s %s" % (filecon, newtmpdir)).split()
++                                       rc = os.spawnvp(os.P_WAIT, chcon[0], chcon)
++                         else:
++                                newtmpdir = mkdtemp(dir="/tmp", prefix=".sandbox")
++                                chcon =  ("/usr/bin/chcon %s %s" % (filecon, newtmpdir)).split()
++                                rc = os.spawnvp(os.P_WAIT, chcon[0], chcon)
++
 +                         warnings.resetwarnings()
 +                         paths = []
 +                         for i in cmds:
@@ -1907,22 +1956,19 @@ diff --exclude-from=exclude --exclude=se
 +                                       paths.append(i)
 +                                       
 +                         copyfiles(newhomedir, newtmpdir, init_files + paths)
-+                         execfile = newhomedir + "/.sandboxrc"
-+                         fd = open(execfile, "w+")
-+                         fd.write("""#! /bin/sh
++                         if X_ind:
++                                execfile = newhomedir + "/.sandboxrc"
++                                fd = open(execfile, "w+")
++                                fd.write("""#! /bin/sh
 +%s
 +""" % " ".join(paths))
-+                         fd.close()
-+                         os.chmod(execfile, 0700)
-+                         if X_ind:
++                                fd.close()
++                                os.chmod(execfile, 0700)
 +                                cmds =  ("/usr/sbin/seunshare -t %s -h %s -- %s /usr/share/sandbox/sandboxX.sh" % (newtmpdir, newhomedir, execcon)).split()
 +                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
 +                         else:
 +                                cmds =  ("/usr/sbin/seunshare -t %s -h %s -- %s " % (newtmpdir, newhomedir, execcon)).split()+cmds
 +                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
-+                                selinux.setexeccon(execcon)
-+                                rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
-+                                selinux.setexeccon(None)
 +                         for i in paths:
 +                                if i not in X_FILES:
 +                                       continue
@@ -1935,9 +1981,9 @@ diff --exclude-from=exclude --exclude=se
 +                         selinux.setexeccon(None)
 +           finally:
 +                  if home_and_temp:
-+                         if newhomedir:
++                         if newhomedir and not existing_home:
 +                                shutil.rmtree(newhomedir)
-+                         if newtmpdir:
++                         if newtmpdir and not existing_temp:
 +                                shutil.rmtree(newtmpdir)
 +                  
 +    except getopt.GetoptError, error:
@@ -1957,26 +2003,28 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.78/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandbox.8	2009-12-14 09:37:40.000000000 -0500
-@@ -0,0 +1,39 @@
++++ policycoreutils-2.0.78/sandbox/sandbox.8	2009-12-18 07:37:35.000000000 -0500
+@@ -0,0 +1,50 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
 +sandbox \- Run cmd under an SELinux sandbox
 +.SH SYNOPSIS
 +.B sandbox
-+[-M] [-X] [-I includefile ] [[-i file ]...] [ -t type ] cmd
++[-l level ] [[-M | -X]  -H homedir -T tmpdir ] [-I includefile ] [[-i file ]...] [ -t type ] cmd
 +.br
 +.SH DESCRIPTION
 +.PP
 +Run the 
 +.I cmd 
-+application within a tightly confined SELinux domain.  The default sandbox domain only allows applications the ability to read and write stdin, stdout and any other file descriptors handed to it. It is not allowed to open any other files.  
++application within a tightly confined SELinux domain.  The default sandbox domain only allows applications the ability to read and write stdin, stdout and any other file descriptors handed to it. It is not allowed to open any other files.  The -M option will mount an alternate homedir and tmpdir to be used by the sandbox.
 +
 +If you have the 
 +.I policycoreutils-sandbox 
-+package installed, you can use the -X option.
++package installed, you can use the -X option and the -M option.
 +.B sandbox -X
 +allows you to run sandboxed X applications.  These applications will start up their own X Server and create a temporary homedir and /tmp.  The default policy does not allow any capabilities or network access.  It also prevents all access to the users other processes and files.  Any file specified on the command line will be copied into the sandbox.
++
++If directories are specified with -H or -T the directory will have its context modified with chcon(1) unless a level is specified with -l.  If the MLS/MCS security level is specified, the directories need to have a matching label.
 +.PP
 +.TP
 +\fB\-t type\fR
@@ -1988,12 +2036,21 @@ diff --exclude-from=exclude --exclude=se
 +\fB\-I inputfile\fR
 +Copy all files listed in inputfile into the appropriate temporary sandbox direcories. 
 +.TP
++\fB\-l\fR
++Specify the MLS/MCS Security Level to run the sandbox in.  Defaults to random.
++.TP
 +\fB\-X\fR
 +Create an X based Sandbox for gui apps, temporary files for $HOME and /tmp, seconday Xserver, defaults to sandbox_x_t
 +.TP
 +\fB\-M\fR
 +Create a Sandbox with temporary files for $HOME and /tmp, defaults to sandbox_t
 +.TP
++\fB\-H\ homedir
++Use alternate homedir to mount.  Defaults to temporary. Requires -X or -M.
++.TP
++\fB\-T\ tmpdir
++Use alternate tempdir to mount.  Defaults to temporary. Requires -X or -M.
++.PP
 +.SH "SEE ALSO"
 +.TP
 +runcon(1)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -p -r1.666 -r1.667
--- policycoreutils.spec	17 Dec 2009 13:24:23 -0000	1.666
+++ policycoreutils.spec	21 Dec 2009 21:56:28 -0000	1.667
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -108,6 +108,7 @@ Requires: audit-libs-python >=  %{libaud
 Requires: /usr/bin/make
 Requires(pre): python >= 2.6
 Obsoletes: policycoreutils < 2.0.61-2
+Requires: setools-libs-python
 
 %description python
 The policycoreutils-python package contains the management tools use to manage an SELinux environment.
@@ -189,7 +190,7 @@ Group: System Environment/Base
 Requires: policycoreutils-python = %{version}-%{release} 
 Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: usermode-gtk 
-Requires: setools-console setools-libs-python
+Requires: setools-console
 Requires: selinux-policy
 Requires: python >= 2.6
 BuildRequires: desktop-file-utils
@@ -296,6 +297,9 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-7
+- Fixes to sandbox man page
+
 * Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-6
 - Add setools-libs-python to requires for gui
 



From rhughes at fedoraproject.org  Mon Dec 21 21:56:40 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 21 Dec 2009 21:56:40 +0000 (UTC)
Subject: rpms/shared-color-targets/F-12 import.log, NONE,
	1.1 shared-color-targets.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091221215640.83AEA11C00E7@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/shared-color-targets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10190/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shared-color-targets.spec 
Log Message:



--- NEW FILE import.log ---
shared-color-targets-0_0_1-0_8_20091218git_fc12:F-12:shared-color-targets-0.0.1-0.8.20091218git.fc12.src.rpm:1261432547


--- NEW FILE shared-color-targets.spec ---
%define alphatag .20091218git

Summary: Shared color targets for creating color profiles
Name: shared-color-targets
Version: 0.0.1
Release: 0.8%{?alphatag}%{?dist}
URL: http://github.com/hughsie/shared-color-targets
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz
License: GPLv2+ and Public Domain and CC-BY-SA
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: color-filesystem

%description 
The shared-color-targets package contains various targets which are useful for
programs that create ICC profiles.
This package only contains the free targets that can be safely distributed
with Fedora.

%prep
%setup -q

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%dir %{_datadir}/color/targets
%{_datadir}/color/targets/*.it8
%dir %{_datadir}/shared-color-targets

# Wolf Faust
%dir %{_datadir}/shared-color-targets/wolf_faust
%{_datadir}/shared-color-targets/wolf_faust/*
%dir %{_datadir}/color/targets/wolf_faust
%dir %{_datadir}/color/targets/wolf_faust/reflective
%{_datadir}/color/targets/wolf_faust/reflective/*.it8
%dir %{_datadir}/color/targets/wolf_faust/transmissive
%{_datadir}/color/targets/wolf_faust/transmissive/*.it8

%changelog
* Fri Dec 18 2009 Richard Hughes <richard at hughsie.com> 0.0.1-0.8.20091218git
- Update from git


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-color-targets/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:42:09 -0000	1.1
+++ .cvsignore	21 Dec 2009 21:56:40 -0000	1.2
@@ -0,0 +1 @@
+shared-color-targets-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-color-targets/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:42:09 -0000	1.1
+++ sources	21 Dec 2009 21:56:40 -0000	1.2
@@ -0,0 +1 @@
+c8315f383c398703f8eeb452d4bce3af  shared-color-targets-0.0.1.tar.gz



From ingvar at fedoraproject.org  Mon Dec 21 21:58:31 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Mon, 21 Dec 2009 21:58:31 +0000 (UTC)
Subject: rpms/varnish/F-12 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 varnish.spec, 1.23, 1.24
Message-ID: <20091221215831.5928511C00E7@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10717

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 Nov 2009 20:39:32 -0000	1.11
+++ .cvsignore	21 Dec 2009 21:58:31 -0000	1.12
@@ -1 +1 @@
-varnish-2.0.5.tar.gz
+varnish-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Nov 2009 20:39:32 -0000	1.11
+++ sources	21 Dec 2009 21:58:31 -0000	1.12
@@ -1 +1 @@
-fde37b8c571cb69cf9e9f0da62a8310b  varnish-2.0.5.tar.gz
+d91dc21c636db61c69b5e8f061c5bb95  varnish-2.0.6.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-12/varnish.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- varnish.spec	9 Nov 2009 20:39:32 -0000	1.23
+++ varnish.spec	21 Dec 2009 21:58:31 -0000	1.24
@@ -1,14 +1,12 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.5
+Version: 2.0.6
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
-Patch1: varnish.s390x_pagesize.patch
-Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -71,8 +69,6 @@ Varnish is a high-performance HTTP accel
 #./autogen.sh
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -239,6 +235,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Dec 17 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
+- New upstream release
+- Removed patches for libjemalloc, as they are added upstream
+
 * Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
 - New upstream release
 



From ingvar at fedoraproject.org  Mon Dec 21 22:01:31 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Mon, 21 Dec 2009 22:01:31 +0000 (UTC)
Subject: rpms/varnish/F-11 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 varnish.spec, 1.21, 1.22
Message-ID: <20091221220131.6A33811C00E7@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11102

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
new upstream relase


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 Nov 2009 20:52:38 -0000	1.11
+++ .cvsignore	21 Dec 2009 22:01:31 -0000	1.12
@@ -1 +1 @@
-varnish-2.0.5.tar.gz
+varnish-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Nov 2009 20:52:38 -0000	1.11
+++ sources	21 Dec 2009 22:01:31 -0000	1.12
@@ -1 +1 @@
-fde37b8c571cb69cf9e9f0da62a8310b  varnish-2.0.5.tar.gz
+d91dc21c636db61c69b5e8f061c5bb95  varnish-2.0.6.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-11/varnish.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- varnish.spec	9 Nov 2009 20:52:38 -0000	1.21
+++ varnish.spec	21 Dec 2009 22:01:31 -0000	1.22
@@ -1,14 +1,12 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.5
+Version: 2.0.6
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
-Patch1: varnish.s390x_pagesize.patch
-Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -71,8 +69,6 @@ Varnish is a high-performance HTTP accel
 #./autogen.sh
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -239,6 +235,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
+- New upstream release
+
 * Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
 - New upstream release
 



From kwright at fedoraproject.org  Mon Dec 21 22:03:43 2009
From: kwright at fedoraproject.org (kwright)
Date: Mon, 21 Dec 2009 22:03:43 +0000 (UTC)
Subject: rpms/pki-util/F-12 import.log, NONE, 1.1 pki-util.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091221220343.2558911C00E7@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-util/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11518/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-util.spec 
Log Message:
dogtag build for fedora see bugailla 521989



--- NEW FILE import.log ---
pki-util-1_3_0-4_fc12:F-12:pki-util-1.3.0-4.fc12.src.rpm:1261432980


--- NEW FILE pki-util.spec ---
Name:           pki-util
Version:        1.3.0
Release:        4%{?dist}
Summary:        Dogtag Certificate System - PKI Utility Framework
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils
BuildRequires:  jss >= 4.2.6
BuildRequires:  ldapjdk
BuildRequires:  osutil
BuildRequires:  xerces-j2

Requires:       java >= 1:1.6.0
Requires:       jpackage-utils
Requires:       jss >= 4.2.6
Requires:       ldapjdk

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag PKI Utility Framework is required by the following four
Dogtag PKI subsystems:

    the Dogtag Certificate Authority,
    the Dogtag Data Recovery Manager,
    the Dogtag Online Certificate Status Protocol Manager, and
    the Dogtag Token Key Service.

%package javadoc
Summary:    Dogtag Certificate System - PKI Utility Framework Javadocs
Group:      Documentation

Requires:   %{name} = %{version}-%{release}

%description javadoc
Dogtag Certificate System - PKI Utility Framework Javadocs

This documentation pertains exclusively to version %{version} of
the Dogtag PKI Utility Framework.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="pki" \
    -Dproduct="util" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}
cd %{buildroot}%{_javadir}/pki
mv cmsutil.jar cmsutil-%{version}.jar
ln -s cmsutil-%{version}.jar cmsutil.jar
mv nsutil.jar nsutil-%{version}.jar
ln -s nsutil-%{version}.jar nsutil.jar

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/pki/

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
- Removed 'with exceptions' from License

* Tue Nov 24 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #521989 - packaging for Fedora Dogtag
- Use "_javadir" macro when appropriate

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #521989 - packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #521989 - packaging for Fedora Dogtag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-util/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:41:47 -0000	1.1
+++ .cvsignore	21 Dec 2009 22:03:42 -0000	1.2
@@ -0,0 +1 @@
+pki-util-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-util/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:41:47 -0000	1.1
+++ sources	21 Dec 2009 22:03:42 -0000	1.2
@@ -0,0 +1 @@
+b103c5125e1ad36414300c53cef4a7a1  pki-util-1.3.0.tar.gz



From ingvar at fedoraproject.org  Mon Dec 21 22:12:07 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Mon, 21 Dec 2009 22:12:07 +0000 (UTC)
Subject: rpms/varnish/EL-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 varnish.spec,
	1.10, 1.11
Message-ID: <20091221221207.A677311C00E7@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12534

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Nov 2009 20:52:52 -0000	1.8
+++ .cvsignore	21 Dec 2009 22:12:05 -0000	1.9
@@ -1 +1 @@
-varnish-2.0.5.tar.gz
+varnish-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Nov 2009 20:52:52 -0000	1.8
+++ sources	21 Dec 2009 22:12:06 -0000	1.9
@@ -1 +1 @@
-fde37b8c571cb69cf9e9f0da62a8310b  varnish-2.0.5.tar.gz
+d91dc21c636db61c69b5e8f061c5bb95  varnish-2.0.6.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/varnish.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- varnish.spec	9 Nov 2009 20:52:52 -0000	1.10
+++ varnish.spec	21 Dec 2009 22:12:06 -0000	1.11
@@ -1,14 +1,12 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.5
+Version: 2.0.6
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
-Patch1: varnish.s390x_pagesize.patch
-Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -71,8 +69,6 @@ Varnish is a high-performance HTTP accel
 #./autogen.sh
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -239,6 +235,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Dec 17 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
+- New upstream release
+- Removed patches for libjemalloc, as they are added upstream
+
 * Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
 - New upstream release
 



From ingvar at fedoraproject.org  Mon Dec 21 22:14:03 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Mon, 21 Dec 2009 22:14:03 +0000 (UTC)
Subject: rpms/varnish/EL-4 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 varnish.spec, 1.20, 1.21
Message-ID: <20091221221403.B466911C00E7@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12856

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Nov 2009 21:10:44 -0000	1.10
+++ .cvsignore	21 Dec 2009 22:14:03 -0000	1.11
@@ -1 +1 @@
-varnish-2.0.5.tar.gz
+varnish-2.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Nov 2009 21:10:44 -0000	1.10
+++ sources	21 Dec 2009 22:14:03 -0000	1.11
@@ -1 +1 @@
-fde37b8c571cb69cf9e9f0da62a8310b  varnish-2.0.5.tar.gz
+d91dc21c636db61c69b5e8f061c5bb95  varnish-2.0.6.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-4/varnish.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- varnish.spec	9 Nov 2009 21:10:44 -0000	1.20
+++ varnish.spec	21 Dec 2009 22:14:03 -0000	1.21
@@ -1,14 +1,12 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.5
+Version: 2.0.6
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
-Patch1: varnish.s390x_pagesize.patch
-Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -71,8 +69,6 @@ Varnish is a high-performance HTTP accel
 #./autogen.sh
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -239,6 +235,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
+- New upstream release
+
 * Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Mon Dec 21 22:14:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 22:14:21 +0000
Subject: [pkgdb] tokyotyrant had acl change status
Message-ID: <20091221221422.4311D10F892@bastion.fedoraproject.org>

silas has set the approveacls acl on tokyotyrant (Fedora devel) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tokyotyrant



From pkgdb at fedoraproject.org  Mon Dec 21 22:14:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 22:14:26 +0000
Subject: [pkgdb] tokyotyrant had acl change status
Message-ID: <20091221221426.598FD10F892@bastion.fedoraproject.org>

silas has set the watchcommits acl on tokyotyrant (Fedora devel) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tokyotyrant



From pkgdb at fedoraproject.org  Mon Dec 21 22:14:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 22:14:38 +0000
Subject: [pkgdb] tokyotyrant had acl change status
Message-ID: <20091221221427.1375510F862@bastion.fedoraproject.org>

silas has set the commit acl on tokyotyrant (Fedora devel) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tokyotyrant



From pkgdb at fedoraproject.org  Mon Dec 21 22:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 21 Dec 2009 22:14:28 +0000
Subject: [pkgdb] tokyotyrant had acl change status
Message-ID: <20091221221428.6C81010F862@bastion.fedoraproject.org>

silas has set the watchbugzilla acl on tokyotyrant (Fedora devel) to Approved for deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tokyotyrant



From chitlesh at fedoraproject.org  Mon Dec 21 22:27:37 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 21 Dec 2009 22:27:37 +0000 (UTC)
Subject: File Verilog-Perl-3.223.tar.gz uploaded to lookaside cache by chitlesh
Message-ID: <20091221222737.2880710F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-Verilog-Perl:

54405173d5796dc8dee6a630ae1583c2  Verilog-Perl-3.223.tar.gz



From chitlesh at fedoraproject.org  Mon Dec 21 22:30:09 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 21 Dec 2009 22:30:09 +0000 (UTC)
Subject: rpms/perl-Verilog-Perl/F-11 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 perl-Verilog-Perl.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091221223009.7F30111C03E3@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog-Perl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15670/F-11

Modified Files:
	.cvsignore import.log perl-Verilog-Perl.spec sources 
Log Message:
3.223


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Nov 2009 20:53:46 -0000	1.3
+++ .cvsignore	21 Dec 2009 22:30:08 -0000	1.4
@@ -1 +1 @@
-Verilog-Perl-3.222.tar.gz
+Verilog-Perl-3.223.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Nov 2009 20:53:46 -0000	1.2
+++ import.log	21 Dec 2009 22:30:09 -0000	1.3
@@ -1,2 +1,3 @@
 perl-Verilog-Perl-3_221-1_fc12:F-11:perl-Verilog-Perl-3.221-1.fc12.src.rpm:1259047894
 perl-Verilog-Perl-3_222-1_fc12:F-11:perl-Verilog-Perl-3.222-1.fc12.src.rpm:1259182372
+perl-Verilog-Perl-3_223-1_fc12:F-11:perl-Verilog-Perl-3.223-1.fc12.src.rpm:1261434395


Index: perl-Verilog-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/F-11/perl-Verilog-Perl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Verilog-Perl.spec	25 Nov 2009 20:53:46 -0000	1.2
+++ perl-Verilog-Perl.spec	21 Dec 2009 22:30:09 -0000	1.3
@@ -1,5 +1,5 @@
 Name:          perl-Verilog-Perl
-Version:       3.222
+Version:       3.223
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.223-1
+- New upstream release
+
 * Wed Nov 25 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.222-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Nov 2009 20:53:46 -0000	1.3
+++ sources	21 Dec 2009 22:30:09 -0000	1.4
@@ -1 +1 @@
-fa6cfaa403c040c7a5852c34f8e87303  Verilog-Perl-3.222.tar.gz
+54405173d5796dc8dee6a630ae1583c2  Verilog-Perl-3.223.tar.gz



From chitlesh at fedoraproject.org  Mon Dec 21 22:32:42 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 21 Dec 2009 22:32:42 +0000 (UTC)
Subject: rpms/perl-Verilog-Perl/F-12 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 perl-Verilog-Perl.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091221223242.BC92411C02C4@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog-Perl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16327/F-12

Modified Files:
	.cvsignore import.log perl-Verilog-Perl.spec sources 
Log Message:
3.223


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Nov 2009 20:52:53 -0000	1.3
+++ .cvsignore	21 Dec 2009 22:32:42 -0000	1.4
@@ -1 +1 @@
-Verilog-Perl-3.222.tar.gz
+Verilog-Perl-3.223.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Nov 2009 20:52:53 -0000	1.2
+++ import.log	21 Dec 2009 22:32:42 -0000	1.3
@@ -1,2 +1,3 @@
 perl-Verilog-Perl-3_221-1_fc12:F-12:perl-Verilog-Perl-3.221-1.fc12.src.rpm:1259048616
 perl-Verilog-Perl-3_222-1_fc12:F-12:perl-Verilog-Perl-3.222-1.fc12.src.rpm:1259182294
+perl-Verilog-Perl-3_223-1_fc12:F-12:perl-Verilog-Perl-3.223-1.fc12.src.rpm:1261434593


Index: perl-Verilog-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/F-12/perl-Verilog-Perl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Verilog-Perl.spec	25 Nov 2009 20:52:53 -0000	1.2
+++ perl-Verilog-Perl.spec	21 Dec 2009 22:32:42 -0000	1.3
@@ -1,5 +1,5 @@
 Name:          perl-Verilog-Perl
-Version:       3.222
+Version:       3.223
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.223-1
+- New upstream release
+
 * Wed Nov 25 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.222-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Nov 2009 20:52:53 -0000	1.3
+++ sources	21 Dec 2009 22:32:42 -0000	1.4
@@ -1 +1 @@
-fa6cfaa403c040c7a5852c34f8e87303  Verilog-Perl-3.222.tar.gz
+54405173d5796dc8dee6a630ae1583c2  Verilog-Perl-3.223.tar.gz



From chitlesh at fedoraproject.org  Mon Dec 21 22:34:00 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 21 Dec 2009 22:34:00 +0000 (UTC)
Subject: rpms/perl-Verilog-Perl/EL-5 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 perl-Verilog-Perl.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091221223400.0AF2111C02C4@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog-Perl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16673/EL-5

Modified Files:
	.cvsignore import.log perl-Verilog-Perl.spec sources 
Log Message:
3.223


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Nov 2009 20:54:47 -0000	1.3
+++ .cvsignore	21 Dec 2009 22:33:59 -0000	1.4
@@ -1 +1 @@
-Verilog-Perl-3.222.tar.gz
+Verilog-Perl-3.223.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Nov 2009 20:54:47 -0000	1.2
+++ import.log	21 Dec 2009 22:33:59 -0000	1.3
@@ -1,2 +1,3 @@
 perl-Verilog-Perl-3_221-1_fc12:EL-5:perl-Verilog-Perl-3.221-1.fc12.src.rpm:1259050082
 perl-Verilog-Perl-3_222-1_fc12:EL-5:perl-Verilog-Perl-3.222-1.fc12.src.rpm:1259182423
+perl-Verilog-Perl-3_223-1_fc12:EL-5:perl-Verilog-Perl-3.223-1.fc12.src.rpm:1261434740


Index: perl-Verilog-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/EL-5/perl-Verilog-Perl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Verilog-Perl.spec	25 Nov 2009 20:54:47 -0000	1.2
+++ perl-Verilog-Perl.spec	21 Dec 2009 22:33:59 -0000	1.3
@@ -1,5 +1,5 @@
 Name:          perl-Verilog-Perl
-Version:       3.222
+Version:       3.223
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.223-1
+- New upstream release
+
 * Wed Nov 25 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.222-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Nov 2009 20:54:47 -0000	1.3
+++ sources	21 Dec 2009 22:33:59 -0000	1.4
@@ -1 +1 @@
-fa6cfaa403c040c7a5852c34f8e87303  Verilog-Perl-3.222.tar.gz
+54405173d5796dc8dee6a630ae1583c2  Verilog-Perl-3.223.tar.gz



From airlied at fedoraproject.org  Mon Dec 21 22:34:26 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 21 Dec 2009 22:34:26 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.151,1.152
Message-ID: <20091221223426.E5CAB11C02C4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16804

Modified Files:
	plymouth.spec 
Log Message:
- rebuild for API bump in libdrm



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- plymouth.spec	9 Dec 2009 19:30:46 -0000	1.151
+++ plymouth.spec	21 Dec 2009 22:34:26 -0000	1.152
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009129%{?dist}
+Release: 0.2009129.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -454,6 +454,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Dec 22 2009 Dave Airlie <airlied at redhat.com> 0.8.0-0.2009129.1
+- rebuild for API bump in libdrm
+
 * Wed Dec 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009129
 - Update to latest snapshot
 



From chitlesh at fedoraproject.org  Mon Dec 21 22:38:03 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon, 21 Dec 2009 22:38:03 +0000 (UTC)
Subject: rpms/perl-Verilog-Perl/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 perl-Verilog-Perl.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091221223803.5580611C02C4@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17638/devel

Modified Files:
	.cvsignore import.log perl-Verilog-Perl.spec sources 
Log Message:
3.223


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Nov 2009 20:55:56 -0000	1.3
+++ .cvsignore	21 Dec 2009 22:38:02 -0000	1.4
@@ -1 +1 @@
-Verilog-Perl-3.222.tar.gz
+Verilog-Perl-3.223.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Nov 2009 20:55:56 -0000	1.2
+++ import.log	21 Dec 2009 22:38:02 -0000	1.3
@@ -1,2 +1,3 @@
 perl-Verilog-Perl-3_221-1_fc12:HEAD:perl-Verilog-Perl-3.221-1.fc12.src.rpm:1259050990
 perl-Verilog-Perl-3_222-1_fc12:HEAD:perl-Verilog-Perl-3.222-1.fc12.src.rpm:1259182503
+perl-Verilog-Perl-3_223-1_fc12:HEAD:perl-Verilog-Perl-3.223-1.fc12.src.rpm:1261434956


Index: perl-Verilog-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/devel/perl-Verilog-Perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Verilog-Perl.spec	7 Dec 2009 08:10:08 -0000	1.3
+++ perl-Verilog-Perl.spec	21 Dec 2009 22:38:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:          perl-Verilog-Perl
-Version:       3.222
-Release:       2%{?dist}
+Version:       3.223
+Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
 License:       LGPLv3 or Artistic 2.0
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.223-1
+- New upstream release
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.222-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog-Perl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Nov 2009 20:55:56 -0000	1.3
+++ sources	21 Dec 2009 22:38:03 -0000	1.4
@@ -1 +1 @@
-fa6cfaa403c040c7a5852c34f8e87303  Verilog-Perl-3.222.tar.gz
+54405173d5796dc8dee6a630ae1583c2  Verilog-Perl-3.223.tar.gz



From jkratoch at fedoraproject.org  Mon Dec 21 22:46:49 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 21 Dec 2009 22:46:49 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-follow-child-stale-parent.patch, NONE,
	1.1 gdb-archer-pie-addons.patch, 1.2, 1.3 gdb.spec, 1.404, 1.405
Message-ID: <20091221224649.9B97711C02C4@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18880

Modified Files:
	gdb-archer-pie-addons.patch gdb.spec 
Added Files:
	gdb-follow-child-stale-parent.patch 
Log Message:
* Mon Dec 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-13.fc12
- [pie] Fix a race in testcase gdb.base/valgrind-db-attach.exp.
- Fix regression by python on ia64 due to stale current frame.
- Disable python iff RHEL-5 && (Brew || ppc64).


gdb-follow-child-stale-parent.patch:
 infrun.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE gdb-follow-child-stale-parent.patch ---
Problem occurs with python and its get_current_arch () as it selects
selected_frame and current_frame while still inferior_ptid is valid for the
original parent.  But since this place it is already attached and later
unwinders try to access it, breaking:
  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: breakpoint after the first fork
  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: watchpoint after the first fork
  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: breakpoint after the second fork
  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: watchpoint after the second fork
  -PASS: gdb.threads/watchpoint-fork.exp: child: singlethreaded: finish
  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: breakpoint after the first fork
  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: watchpoint after the first fork
  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: breakpoint after the second fork
  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: watchpoint after the second fork
  +FAIL: gdb.threads/watchpoint-fork.exp: child: singlethreaded: finish

--- ./gdb/infrun.c	2009-12-21 20:26:30.000000000 +0100
+++ ./gdb/infrun.c	2009-12-21 20:26:11.000000000 +0100
@@ -375,6 +375,9 @@ follow_fork (void)
 	  }
 	else
 	  {
+	    /* Possibly referenced PARENT is no longer valid.  */
+	    reinit_frame_cache ();
+
 	    /* This pending follow fork event is now handled, one way
 	       or another.  The previous selected thread may be gone
 	       from the lists by now, but if it is still around, need

gdb-archer-pie-addons.patch:
 gdb-7.0/gdb/testsuite/gdb.base/valgrind-db-attach.exp |    2 +
 gdb/dwarf2read.c                                      |   17 ++++++--
 gdb/exec.c                                            |   20 +++++++++-
 gdb/gdbtypes.h                                        |    3 +
 gdb/jv-lang.c                                         |    6 ++-
 gdb/solib-svr4.c                                      |   12 ++++--
 gdb/solib.c                                           |   13 ++++++
 gdb/solib.h                                           |    2 +
 gdb/solist.h                                          |    3 +
 gdb/symfile.c                                         |   35 ++++++++++++++----
 gdb/value.c                                           |    6 ++-
 11 files changed, 99 insertions(+), 20 deletions(-)

Index: gdb-archer-pie-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-archer-pie-addons.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-archer-pie-addons.patch	18 Dec 2009 09:48:50 -0000	1.2
+++ gdb-archer-pie-addons.patch	21 Dec 2009 22:46:49 -0000	1.3
@@ -299,3 +299,14 @@
      }
    return retval;
  }
+--- gdb-7.0/gdb/testsuite/gdb.base/valgrind-db-attach.exp-orig	2009-12-21 16:50:42.000000000 +0100
++++ gdb-7.0/gdb/testsuite/gdb.base/valgrind-db-attach.exp	2009-12-21 16:51:24.000000000 +0100
+@@ -67,6 +67,8 @@ gdb_test_multiple "" $test {
+     }
+ }
+ 
++gdb_test "" "" "eat first prompt"
++
+ # Initialization from default_gdb_start.
+ gdb_test "set height 0"
+ gdb_test "set width 0"


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- gdb.spec	21 Dec 2009 11:26:48 -0000	1.404
+++ gdb.spec	21 Dec 2009 22:46:49 -0000	1.405
@@ -8,18 +8,23 @@
 %if 0%{!?dist:1}
 %define rhel 5
 %define dist .el5
-%endif
-# RHEL-5 Brew does not set it.
-%if "%{dist}" == ".el5"
 %define el5 1
 %endif
+# RHEL-5 Brew does not set %{el5}.
+%if "%{dist}" == ".el5"
 # RHEL-5 ppc* python .so files are shipped only as ppc but gdb is ppc64 there.
 # Brew builds it fine as its ppc64 buildroot has full ppc64 package set.
-%if 0%{?el5:1}
-%ifarch ppc ppc64
+# Make this conditional so that Brew-built GDB has no python on any arch but
+# GDB rebuilt on native non-ppc64 host does have it.
+%if 0%{!?el5:1}
+%define _without_python 1
+%else
+%ifarch ppc64
 %define _without_python 1
 %endif
 %endif
+%define el5 1
+%endif
 
 Summary: A GNU source-level debugger for C, C++, Java and other languages
 Name: gdb%{?_with_debug:-debug}
@@ -31,7 +36,7 @@ Version: 7.0
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 12%{?_with_upstream:.upstream}%{dist}
+Release: 13%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -415,6 +420,9 @@ Patch395: gdb-empty-namespace.patch
 # Fix regression on re-setting the single ppc watchpoint slot.
 Patch396: gdb-ppc-hw-watchpoint-twice.patch
 
+# Fix regression by python on ia64 due to stale current frame.
+Patch397: gdb-follow-child-stale-parent.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -658,6 +666,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch394 -p1
 %patch395 -p1
 %patch396 -p1
+%patch397 -p1
 
 find -name "*.orig" | xargs rm -f
 ! find -name "*.rej"	# Should not happen.
@@ -969,6 +978,11 @@ fi
 %endif
 
 %changelog
+* Mon Dec 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-13.fc12
+- [pie] Fix a race in testcase gdb.base/valgrind-db-attach.exp.
+- Fix regression by python on ia64 due to stale current frame.
+- Disable python iff RHEL-5 && (Brew || ppc64).
+
 * Mon Dec 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-12.fc12
 - Workaround build on native ppc64 host.
 - More RHEL-5 compatibility updates.



From dwalsh at fedoraproject.org  Mon Dec 21 22:53:08 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 21 Dec 2009 22:53:08 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.43,
	1.44 modules-targeted.conf, 1.152, 1.153 policy-F13.patch, 1.17,
	1.18 selinux-policy.spec, 1.945, 1.946
Message-ID: <20091221225308.4531B11C02C4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19715

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F13.patch 
	selinux-policy.spec 
Log Message:
* Mon Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-2
- Dontaudit sandbox trying to read nscd and sssd



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- modules-minimum.conf	17 Dec 2009 19:34:18 -0000	1.43
+++ modules-minimum.conf	21 Dec 2009 22:53:06 -0000	1.44
@@ -935,7 +935,7 @@ mount = base
 # 
 mozilla = module
 
-# Layer: admin
+# Layer: services
 # Module: ntop
 #
 # Policy for ntop


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- modules-targeted.conf	17 Dec 2009 19:34:18 -0000	1.152
+++ modules-targeted.conf	21 Dec 2009 22:53:06 -0000	1.153
@@ -935,7 +935,7 @@ mount = base
 # 
 mozilla = module
 
-# Layer: admin
+# Layer: services
 # Module: ntop
 #
 # Policy for ntop

policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   11 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   17 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  186 +++
 policy/modules/apps/sandbox.te            |  340 ++++++
 policy/modules/apps/screen.if             |    6 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  370 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |   80 +
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  120 +-
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  447 +++++--
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   35 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   22 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   51 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   25 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   50 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   18 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   26 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  284 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  301 +++++
 policy/modules/services/xserver.te        |  363 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  292 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  194 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   56 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   15 
 371 files changed, 19437 insertions(+), 2753 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.17 -r 1.18 policy-F13.patchIndex: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- policy-F13.patch	21 Dec 2009 14:30:31 -0000	1.17
+++ policy-F13.patch	21 Dec 2009 22:53:06 -0000	1.18
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.5/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.5/Makefile	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/Makefile	2009-12-21 13:07:09.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -12,7 +12,7 @@ diff --exclude-from=exclude -N -u -r nsa
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.5/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.5/policy/global_tunables	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/global_tunables	2009-12-21 13:07:09.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -50,7 +50,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.5/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/alsa.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/alsa.te	2009-12-21 13:07:09.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -62,7 +62,7 @@ diff --exclude-from=exclude -N -u -r nsa
  init_use_fds(alsa_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.5/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/anaconda.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/anaconda.te	2009-12-21 13:07:09.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -82,7 +82,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.5/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/brctl.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/brctl.te	2009-12-21 13:07:09.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -94,7 +94,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.5/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/admin/certwatch.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/certwatch.te	2009-12-21 13:07:09.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -106,7 +106,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	apache_exec_modules(certwatch_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.5/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/consoletype.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/consoletype.te	2009-12-21 13:07:09.000000000 -0500
 @@ -10,7 +10,6 @@
  type consoletype_exec_t;
  application_executable_file(consoletype_exec_t)
@@ -125,7 +125,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.5/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/dmesg.fc	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/dmesg.fc	2009-12-21 13:07:09.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
@@ -133,7 +133,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.5/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/dmesg.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/dmesg.te	2009-12-21 13:07:09.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -177,7 +177,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +dev_read_raw_memory(dmesg_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.5/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/firstboot.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/firstboot.te	2009-12-21 13:07:09.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -202,7 +202,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.5/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-11-25 15:15:48.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/admin/kismet.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/kismet.te	2009-12-21 13:07:09.000000000 -0500
 @@ -45,6 +45,7 @@
  manage_dirs_pattern(kismet_t, kismet_home_t, kismet_home_t)
  manage_files_pattern(kismet_t, kismet_home_t, kismet_home_t)
@@ -231,7 +231,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.5/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/logrotate.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/logrotate.te	2009-12-21 13:07:09.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -311,7 +311,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.7.5/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/logwatch.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/logwatch.te	2009-12-21 13:07:09.000000000 -0500
 @@ -93,6 +93,13 @@
  sysnet_exec_ifconfig(logwatch_t)
  
@@ -334,7 +334,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.7.5/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/admin/mrtg.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/mrtg.te	2009-12-21 13:07:09.000000000 -0500
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -345,7 +345,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.5/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/netutils.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/netutils.te	2009-12-21 13:07:09.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -362,224 +362,9 @@ diff --exclude-from=exclude -N -u -r nsa
  userdom_use_user_terminals(netutils_t)
  userdom_use_all_users_fds(netutils_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.7.5/policy/modules/admin/ntop.fc
---- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/admin/ntop.fc	2009-12-18 12:16:37.000000000 -0500
-@@ -0,0 +1,5 @@
-+/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
-+
-+/usr/sbin/ntop		--	gen_context(system_u:object_r:ntop_exec_t,s0)
-+
-+/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.7.5/policy/modules/admin/ntop.if
---- nsaserefpolicy/policy/modules/admin/ntop.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/admin/ntop.if	2009-12-18 12:16:37.000000000 -0500
-@@ -0,0 +1,158 @@
-+
-+## <summary>policy for ntop</summary>
-+
-+########################################
-+## <summary>
-+##	Execute a domain transition to run ntop.
-+## </summary>
-+## <param name="domain">
-+## <summary>
-+##	Domain allowed to transition.
-+## </summary>
-+## </param>
-+#
-+interface(`ntop_domtrans',`
-+	gen_require(`
-+		type ntop_t, ntop_exec_t;
-+	')
-+
-+	domtrans_pattern($1,ntop_exec_t,ntop_t)
-+')
-+
-+
-+########################################
-+## <summary>
-+##	Execute ntop server in the ntop domain.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	The type of the process performing this action.
-+##	</summary>
-+## </param>
-+#
-+interface(`ntop_initrc_domtrans',`
-+	gen_require(`
-+		type ntop_initrc_exec_t;
-+	')
-+
-+	init_labeled_script_domtrans($1,ntop_initrc_exec_t)
-+')
-+
-+########################################
[...3683 lines suppressed...]
  type insmod_exec_t;
  application_domain(insmod_t, insmod_exec_t)
@@ -29259,7 +29262,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.7.5/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/mount.fc	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/mount.fc	2009-12-21 13:07:09.000000000 -0500
 @@ -1,4 +1,9 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -29273,7 +29276,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/var/run/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.7.5/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/mount.if	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/mount.if	2009-12-21 13:07:09.000000000 -0500
 @@ -84,9 +84,11 @@
  interface(`mount_signal',`
  	gen_require(`
@@ -29346,7 +29349,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.7.5/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/mount.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/mount.te	2009-12-21 13:07:09.000000000 -0500
 @@ -18,8 +18,15 @@
  init_system_domain(mount_t, mount_exec_t)
  role system_r types mount_t;
@@ -29561,7 +29564,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.7.5/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/raid.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/raid.te	2009-12-21 13:07:09.000000000 -0500
 @@ -51,11 +51,13 @@
  dev_dontaudit_getattr_generic_chr_files(mdadm_t)
  dev_dontaudit_getattr_generic_blk_files(mdadm_t)
@@ -29578,7 +29581,7 @@ diff --exclude-from=exclude -N -u -r nsa
  fs_dontaudit_list_tmpfs(mdadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.7.5/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/selinuxutil.fc	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/selinuxutil.fc	2009-12-21 13:07:09.000000000 -0500
 @@ -6,13 +6,13 @@
  /etc/selinux(/.*)?			gen_context(system_u:object_r:selinux_config_t,s0)
  /etc/selinux/([^/]*/)?contexts(/.*)?	gen_context(system_u:object_r:default_context_t,s0)
@@ -29620,7 +29623,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.7.5/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/selinuxutil.if	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/selinuxutil.if	2009-12-21 13:07:09.000000000 -0500
 @@ -351,6 +351,27 @@
  
  ########################################
@@ -29978,7 +29981,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.7.5/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/selinuxutil.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/selinuxutil.te	2009-12-21 13:07:09.000000000 -0500
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -30356,7 +30359,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.7.5/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.fc	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.fc	2009-12-21 13:07:09.000000000 -0500
 @@ -11,15 +11,20 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -30394,7 +30397,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.7.5/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.if	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.if	2009-12-21 13:07:09.000000000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -30571,7 +30574,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.7.5/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.te	2009-12-21 13:07:09.000000000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -30795,7 +30798,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.7.5/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/udev.if	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/udev.if	2009-12-21 13:07:09.000000000 -0500
 @@ -186,6 +186,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -30806,7 +30809,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.7.5/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/udev.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/udev.te	2009-12-21 13:07:09.000000000 -0500
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -30856,7 +30859,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	xen_manage_log(udev_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.7.5/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/unconfined.fc	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/unconfined.fc	2009-12-21 13:07:09.000000000 -0500
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -30876,7 +30879,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.7.5/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/unconfined.if	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/unconfined.if	2009-12-21 13:07:09.000000000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -31382,7 +31385,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.7.5/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/unconfined.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/unconfined.te	2009-12-21 13:07:09.000000000 -0500
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -31614,7 +31617,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.7.5/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/userdomain.fc	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/userdomain.fc	2009-12-21 13:07:09.000000000 -0500
 @@ -1,4 +1,9 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -31628,7 +31631,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.7.5/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/userdomain.if	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/userdomain.if	2009-12-21 13:07:09.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -33996,7 +33999,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.5/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/userdomain.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/userdomain.te	2009-12-21 13:07:09.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -34087,7 +34090,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +allow userdomain userdomain:process signull;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.5/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/xen.if	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/xen.if	2009-12-21 13:07:09.000000000 -0500
 @@ -180,6 +180,25 @@
  
  ########################################
@@ -34116,7 +34119,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.5/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/xen.te	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/xen.te	2009-12-21 13:07:09.000000000 -0500
 @@ -85,6 +85,7 @@
  type xenconsoled_t;
  type xenconsoled_exec_t;
@@ -34157,7 +34160,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	files_search_mnt(xend_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.5/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/support/obj_perm_sets.spt	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/support/obj_perm_sets.spt	2009-12-21 13:07:09.000000000 -0500
 @@ -199,12 +199,14 @@
  #
  define(`getattr_file_perms',`{ getattr }')
@@ -34202,7 +34205,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.5/policy/users
 --- nsaserefpolicy/policy/users	2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.5/policy/users	2009-12-18 12:16:37.000000000 -0500
++++ serefpolicy-3.7.5/policy/users	2009-12-21 13:07:09.000000000 -0500
 @@ -6,7 +6,7 @@
  #
  # gen_user(username, prefix, role_set, mls_defaultlevel, mls_range, [mcs_catetories])


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.945
retrieving revision 1.946
diff -u -p -r1.945 -r1.946
--- selinux-policy.spec	18 Dec 2009 21:18:10 -0000	1.945
+++ selinux-policy.spec	21 Dec 2009 22:53:07 -0000	1.946
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.7.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-2
+- Dontaudit sandbox trying to read nscd and sssd
+
 * Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-1
 - Update to upstream
 



From dwalsh at fedoraproject.org  Mon Dec 21 22:53:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 21 Dec 2009 22:53:30 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.46,
	1.47 modules-targeted.conf, 1.155, 1.156 policy-F12.patch, 1.157,
	1.158 selinux-policy.spec, 1.984, 1.985
Message-ID: <20091221225330.D0F1411C02C4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19880

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Mon Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-61
- Fixes for sandbox_x_server
- Fix ntop policy
- Allow screen to use fprintd
- Sandbox fixes



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- modules-minimum.conf	16 Dec 2009 13:03:07 -0000	1.46
+++ modules-minimum.conf	21 Dec 2009 22:53:29 -0000	1.47
@@ -935,7 +935,7 @@ mount = base
 # 
 mozilla = module
 
-# Layer: admin
+# Layer: services
 # Module: ntop
 #
 # Policy for ntop


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- modules-targeted.conf	15 Dec 2009 16:10:10 -0000	1.155
+++ modules-targeted.conf	21 Dec 2009 22:53:29 -0000	1.156
@@ -935,7 +935,7 @@ mount = base
 # 
 mozilla = module
 
-# Layer: admin
+# Layer: services
 # Module: ntop
 #
 # Policy for ntop

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   82 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  188 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  189 +++
 policy/modules/apps/sandbox.te            |  336 +++++
 policy/modules/apps/screen.if             |   13 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   49 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   50 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  475 ++++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  293 +++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  442 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  118 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   52 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   53 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   18 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   25 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   32 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    1 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   26 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   60 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  285 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  637 ++++++++++-
 policy/modules/services/xserver.te        |  383 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  184 +++
 policy/modules/system/init.te             |  292 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   78 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   23 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  193 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   82 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1702 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 413 files changed, 21772 insertions(+), 2838 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- policy-F12.patch	18 Dec 2009 21:25:50 -0000	1.157
+++ policy-F12.patch	21 Dec 2009 22:53:29 -0000	1.158
@@ -306,7 +306,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.32/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/logrotate.te	2009-12-21 14:18:28.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -437,221 +437,6 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(netutils_t)
  userdom_use_all_users_fds(netutils_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.6.32/policy/modules/admin/ntop.fc
---- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.fc	2009-12-17 11:20:45.000000000 -0500
-@@ -0,0 +1,5 @@
-+/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
-+
-+/usr/sbin/ntop		--	gen_context(system_u:object_r:ntop_exec_t,s0)
-+
-+/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.6.32/policy/modules/admin/ntop.if
---- nsaserefpolicy/policy/modules/admin/ntop.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.if	2009-12-17 11:20:45.000000000 -0500
-@@ -0,0 +1,158 @@
-+
-+## <summary>policy for ntop</summary>
-+
-+########################################
-+## <summary>
-+##	Execute a domain transition to run ntop.
-+## </summary>
-+## <param name="domain">
-+## <summary>
-+##	Domain allowed to transition.
-+## </summary>
-+## </param>
-+#
-+interface(`ntop_domtrans',`
-+	gen_require(`
-+		type ntop_t, ntop_exec_t;
-+	')
-+
-+	domtrans_pattern($1,ntop_exec_t,ntop_t)
-+')
-+
-+
-+########################################
-+## <summary>
-+##	Execute ntop server in the ntop domain.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	The type of the process performing this action.
-+##	</summary>
-+## </param>
-+#
-+interface(`ntop_initrc_domtrans',`
-+	gen_require(`
-+		type ntop_initrc_exec_t;
-+	')
-+
-+	init_labeled_script_domtrans($1,ntop_initrc_exec_t)
-+')
-+
-+########################################
-+## <summary>
-+##	Search ntop lib directories.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`ntop_search_lib',`
-+	gen_require(`
-+		type ntop_var_lib_t;
-+	')
-+
-+	allow $1 ntop_var_lib_t:dir search_dir_perms;
-+	files_search_var_lib($1)
-+')
-+
-+########################################
-+## <summary>
-+##	Read ntop lib files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`ntop_read_lib_files',`
-+	gen_require(`
-+		type ntop_var_lib_t;
-+	')
-+
-+	files_search_var_lib($1)
-+        read_files_pattern($1, ntop_var_lib_t, ntop_var_lib_t)
-+')
-+
-+########################################
-+## <summary>
-+##	Create, read, write, and delete
-+##	ntop lib files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`ntop_manage_lib_files',`
-+	gen_require(`
-+		type ntop_var_lib_t;
-+	')
-+
-+	files_search_var_lib($1)
-+        manage_files_pattern($1, ntop_var_lib_t,  ntop_var_lib_t)
-+')
-+
-+########################################
-+## <summary>
-+##	Manage ntop var_lib files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`ntop_manage_var_lib',`
-+	gen_require(`
-+		type ntop_var_lib_t;
-+	')
-+
-+         manage_dirs_pattern($1,ntop_var_lib_t,ntop_var_lib_t)
-+         manage_files_pattern($1,ntop_var_lib_t,ntop_var_lib_t)
-+         manage_lnk_files_pattern($1,ntop_var_lib_t,ntop_var_lib_t)
-+')
-+
-+
-+########################################
-+## <summary>
-+##	All of the rules required to administrate 
-+##	an ntop environment
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+## <param name="role">
-+##	<summary>
-+##	Role allowed access.
-+##	</summary>
-+## </param>
-+## <rolecap/>
-+#
-+interface(`ntop_admin',`
-+	gen_require(`
-+		type ntop_t;
-+	')
-+
-+	allow $1 ntop_t:process { ptrace signal_perms getattr };
-+	read_files_pattern($1, ntop_t, ntop_t)
-+	        
-+
-+	gen_require(`
-+		type ntop_initrc_exec_t;
-+	')
-+
-+	# Allow ntop_t to restart the apache service
-+	ntop_initrc_domtrans($1)
-+	domain_system_change_exemption($1)
-+	role_transition $2 ntop_initrc_exec_t system_r;
-+	allow $2 system_r;
-+
-+	ntop_manage_var_lib($1)
-+
-+')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.te serefpolicy-3.6.32/policy/modules/admin/ntop.te
---- nsaserefpolicy/policy/modules/admin/ntop.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/ntop.te	2009-12-17 11:20:45.000000000 -0500
-@@ -0,0 +1,40 @@
-+policy_module(ntop,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type ntop_t;
-+type ntop_exec_t;
-+init_daemon_domain(ntop_t, ntop_exec_t)
-+
-+permissive ntop_t;
-+
-+type ntop_initrc_exec_t;
-+init_script_file(ntop_initrc_exec_t)
-+
-+type ntop_var_lib_t;
-+files_type(ntop_var_lib_t)
-+
-+########################################
-+#
-+# ntop local policy
-+#
-+allow ntop_t self:capability { setgid setuid };
-+allow ntop_t self:fifo_file manage_file_perms;
-+allow ntop_t self:unix_stream_socket create_stream_socket_perms;
-+
-+# Init script handling
-+domain_use_interactive_fds(ntop_t)
-+
-+files_read_etc_files(ntop_t)
-+
-+manage_dirs_pattern(ntop_t, ntop_var_lib_t,  ntop_var_lib_t)
-+manage_files_pattern(ntop_t, ntop_var_lib_t,  ntop_var_lib_t)
-+files_var_lib_filetrans(ntop_t, ntop_var_lib_t, { file dir } )
-+
-+auth_use_nsswitch(ntop_t)
-+
-+miscfiles_read_localization(ntop_t)
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-12-17 11:20:45.000000000 -0500
@@ -2211,7 +1996,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.te serefpolicy-3.6.32/policy/modules/apps/chrome.te
 --- nsaserefpolicy/policy/modules/apps/chrome.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/chrome.te	2009-12-18 10:19:15.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.te	2009-12-21 13:49:17.000000000 -0500
 @@ -0,0 +1,82 @@
 +policy_module(chrome,1.0.0)
 +
@@ -2240,7 +2025,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +allow chrome_sandbox_t self:capability { setuid sys_admin dac_override sys_chroot chown fsetid setgid };
 +dontaudit chrome_sandbox_t self:capability { sys_ptrace };
-+allow chrome_sandbox_t self:process { signal_perms setrlimit execmem };
++allow chrome_sandbox_t self:process { signal_perms setrlimit execmem execstack };
 +allow chrome_sandbox_t self:fifo_file manage_file_perms;
 +allow chrome_sandbox_t self:unix_stream_socket create_stream_socket_perms;
 +allow chrome_sandbox_t self:unix_dgram_socket { create_socket_perms sendto };
@@ -5293,8 +5078,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.32/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-12-17 11:20:45.000000000 -0500
-@@ -0,0 +1,335 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-12-21 14:31:10.000000000 -0500
+@@ -0,0 +1,336 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -5401,6 +5186,7 @@ diff -b -B --ignore-all-space --exclude-
 +## internal communication is often done using fifo and unix sockets.
 +allow sandbox_domain self:fifo_file manage_file_perms;
 +allow sandbox_domain self:unix_stream_socket create_stream_socket_perms;
++allow sandbox_domain self:unix_dgram_socket create_socket_perms;
 +
 +gen_require(`
 +	type usr_t, lib_t, locale_t;
@@ -5632,7 +5418,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.6.32/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/screen.if	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/screen.if	2009-12-21 14:51:45.000000000 -0500
 @@ -45,6 +45,7 @@
  
  	allow $1_screen_t self:capability { setuid setgid fsetid };
@@ -5661,11 +5447,16 @@ diff -b -B --ignore-all-space --exclude-
  	auth_use_nsswitch($1_screen_t)
  	auth_dontaudit_read_shadow($1_screen_t)
  	auth_dontaudit_exec_utempter($1_screen_t)
-@@ -134,6 +141,7 @@
+@@ -134,6 +141,12 @@
  	userdom_create_user_pty($1_screen_t)
  	userdom_user_home_domtrans($1_screen_t, $3)
  	userdom_setattr_user_ptys($1_screen_t)
 +	userdom_setattr_user_ttys($1_screen_t)
++
++	optional_policy(`
++		dbus_system_bus_client($1_screen_t)
++		fprintd_dbus_chat($1_screen_t)
++	')
  
  	tunable_policy(`use_samba_home_dirs',`
  		fs_cifs_domtrans($1_screen_t, $3)
@@ -7410,7 +7201,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-18 15:32:53.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-21 17:41:42.000000000 -0500
 @@ -110,7 +110,11 @@
  ## </param>
  #
@@ -10230,8 +10021,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-17 11:20:45.000000000 -0500
-@@ -0,0 +1,443 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-12-21 11:46:41.000000000 -0500
+@@ -0,0 +1,442 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -10268,7 +10059,6 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_manage_home_role(unconfined_r, unconfined_t)
 +userdom_manage_tmp_role(unconfined_r, unconfined_t)
 +userdom_manage_tmpfs_role(unconfined_r, unconfined_t)
-+userdom_execmod_user_home_files(unconfined_t)
 +userdom_unpriv_usertype(unconfined, unconfined_t)
 +
 +type unconfined_exec_t;
@@ -10931,14 +10721,15 @@ diff -b -B --ignore-all-space --exclude-
 +gen_user(xguest_u, user, xguest_r, s0, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.fc serefpolicy-3.6.32/policy/modules/services/abrt.fc
 --- nsaserefpolicy/policy/modules/services/abrt.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.fc	2009-12-18 08:10:43.000000000 -0500
-@@ -1,11 +1,16 @@
++++ serefpolicy-3.6.32/policy/modules/services/abrt.fc	2009-12-21 12:21:10.000000000 -0500
+@@ -1,11 +1,17 @@
  /etc/abrt(/.*)?			 gen_context(system_u:object_r:abrt_etc_t,s0)
  /etc/rc\.d/init\.d/abrt		--	gen_context(system_u:object_r:abrt_initrc_exec_t,s0)
  
 -/usr/sbin/abrt			--	gen_context(system_u:object_r:abrt_exec_t,s0)
 +/usr/bin/abrt-pyhook-helper 	--  	gen_context(system_u:object_r:abrt_helper_exec_t,s0)
 +/usr/libexec/abrt-pyhook-helper 	--  	gen_context(system_u:object_r:abrt_helper_exec_t,s0)
++/usr/libexec/abrt-hook-python 	--  	gen_context(system_u:object_r:abrt_helper_exec_t,s0)
 +
 +/usr/sbin/abrtd                 --      gen_context(system_u:object_r:abrt_exec_t,s0)
  
@@ -17159,7 +16950,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.32/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/hal.te	2009-12-18 08:18:28.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/hal.te	2009-12-21 10:21:57.000000000 -0500
 @@ -55,13 +55,16 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -17188,7 +16979,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_read_pam_console_data(hald_t)
  
-@@ -156,6 +161,12 @@
+@@ -156,6 +161,13 @@
  fs_search_all(hald_t)
  fs_list_inotifyfs(hald_t)
  fs_list_auto_mountpoints(hald_t)
@@ -17197,11 +16988,12 @@ diff -b -B --ignore-all-space --exclude-
 +fs_manage_dos_files(hald_t)
 +fs_manage_fusefs_dirs(hald_t)
 +fs_manage_fusefs_files(hald_t)
++fs_rw_removable_blk_files(hald_t)
 +
  files_getattr_all_mountpoints(hald_t)
  
  mls_file_read_all_levels(hald_t)
-@@ -197,13 +208,16 @@
+@@ -197,13 +209,16 @@
  miscfiles_read_hwdata(hald_t)
  
  modutils_domtrans_insmod(hald_t)
@@ -17219,7 +17011,7 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_user_home_dirs(hald_t)
-@@ -290,6 +304,7 @@
+@@ -290,6 +305,7 @@
  ')
  
  optional_policy(`
@@ -17227,7 +17019,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_t)
  	policykit_domtrans_resolve(hald_t)
  	policykit_read_lib(hald_t)
-@@ -321,6 +336,10 @@
+@@ -321,6 +337,10 @@
  	virt_manage_images(hald_t)
  ')
  
@@ -17238,7 +17030,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Hal acl local policy
-@@ -341,6 +360,7 @@
+@@ -341,6 +361,7 @@
  manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
@@ -17246,7 +17038,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(hald_acl_t)
  
-@@ -357,6 +377,8 @@
+@@ -357,6 +378,8 @@
  files_read_usr_files(hald_acl_t)
  files_read_etc_files(hald_acl_t)
  
@@ -17255,7 +17047,7 @@ diff -b -B --ignore-all-space --exclude-
  storage_getattr_removable_dev(hald_acl_t)
  storage_setattr_removable_dev(hald_acl_t)
  storage_getattr_fixed_disk_dev(hald_acl_t)
-@@ -369,6 +391,7 @@
+@@ -369,6 +392,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -17263,7 +17055,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_acl_t)
  	policykit_read_lib(hald_acl_t)
  	policykit_read_reload(hald_acl_t)
-@@ -450,12 +473,16 @@
+@@ -450,12 +474,16 @@
  
  miscfiles_read_localization(hald_keymap_t)
  
@@ -17282,7 +17074,7 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
  allow hald_dccm_t self:udp_socket create_socket_perms;
-@@ -469,10 +496,22 @@
+@@ -469,10 +497,22 @@
  manage_files_pattern(hald_dccm_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_dccm_t)
  
@@ -17305,7 +17097,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -484,6 +523,7 @@
+@@ -484,6 +524,7 @@
  corenet_tcp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_dhcpc_port(hald_dccm_t)
@@ -17313,7 +17105,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_dccm_port(hald_dccm_t)
  
  logging_send_syslog_msg(hald_dccm_t)
-@@ -491,3 +531,7 @@
+@@ -491,3 +532,7 @@
  files_read_usr_files(hald_dccm_t)
  
  miscfiles_read_localization(hald_dccm_t)
@@ -17405,7 +17197,7 @@ diff -b -B --ignore-all-space --exclude-
  		allow $1 self:udp_socket create_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.6.32/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/kerberos.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/kerberos.te	2009-12-21 17:39:29.000000000 -0500
 @@ -110,8 +110,9 @@
  manage_files_pattern(kadmind_t, kadmind_var_run_t, kadmind_var_run_t)
  files_pid_filetrans(kadmind_t, kadmind_var_run_t, file)
@@ -17417,7 +17209,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_proc_symlinks(kadmind_t)
  kernel_read_system_state(kadmind_t)
  
-@@ -277,6 +278,8 @@
+@@ -277,11 +278,13 @@
  #
  
  allow kpropd_t self:capability net_bind_service;
@@ -17426,6 +17218,12 @@ diff -b -B --ignore-all-space --exclude-
  allow kpropd_t self:fifo_file rw_file_perms;
  allow kpropd_t self:unix_stream_socket create_stream_socket_perms;
  allow kpropd_t self:tcp_socket create_stream_socket_perms;
+ 
+-allow kpropd_t krb5_host_rcache_t:file rw_file_perms;
++allow kpropd_t krb5_host_rcache_t:file manage_file_perms;
+ 
+ allow kpropd_t krb5_keytab_t:file read_file_perms;
+ 
 @@ -286,8 +289,13 @@
  allow kpropd_t krb5_keytab_t:file read_file_perms;
  
@@ -17559,7 +17357,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.te serefpolicy-3.6.32/policy/modules/services/ksmtuned.te
 --- nsaserefpolicy/policy/modules/services/ksmtuned.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/ksmtuned.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/ksmtuned.te	2009-12-21 09:46:33.000000000 -0500
 @@ -0,0 +1,46 @@
 +policy_module(ksmtuned,1.0.0)
 +
@@ -17584,7 +17382,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +# ksmtuned local policy
 +#
-+allow ksmtuned_t self:capability sys_ptrace;
++allow ksmtuned_t self:capability { sys_ptrace sys_tty_config };
 +
 +# Init script handling
 +domain_use_interactive_fds(ksmtuned_t)
@@ -18028,7 +17826,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.6.32/policy/modules/services/munin.te
 --- nsaserefpolicy/policy/modules/services/munin.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/munin.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/munin.te	2009-12-21 11:34:20.000000000 -0500
 @@ -33,7 +33,7 @@
  # Local policy
  #
@@ -18038,7 +17836,17 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit munin_t self:capability sys_tty_config;
  allow munin_t self:process { getsched setsched signal_perms };
  allow munin_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -147,6 +147,7 @@
+@@ -55,7 +55,8 @@
+ 
+ manage_dirs_pattern(munin_t, munin_tmp_t, munin_tmp_t)
+ manage_files_pattern(munin_t, munin_tmp_t, munin_tmp_t)
+-files_tmp_filetrans(munin_t, munin_tmp_t, { file dir })
++manage_sock_files_pattern(munin_t, munin_tmp_t, munin_tmp_t)
++files_tmp_filetrans(munin_t, munin_tmp_t, { file dir sock_file })
+ 
+ # Allow access to the munin databases
+ manage_dirs_pattern(munin_t, munin_var_lib_t, munin_var_lib_t)
+@@ -147,6 +148,7 @@
  
  optional_policy(`
  	postfix_list_spool(munin_t)
@@ -19337,7 +19145,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.fc serefpolicy-3.6.32/policy/modules/services/ntop.fc
 --- nsaserefpolicy/policy/modules/services/ntop.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ntop.fc	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/ntop.fc	2009-12-21 11:13:49.000000000 -0500
 @@ -1,7 +1,6 @@
  /etc/ntop(/.*)?			gen_context(system_u:object_r:ntop_etc_t,s0)
  
@@ -19348,8 +19156,14 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/ntop\.pid	--	gen_context(system_u:object_r:ntop_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.te serefpolicy-3.6.32/policy/modules/services/ntop.te
 --- nsaserefpolicy/policy/modules/services/ntop.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ntop.te	2009-12-17 11:20:45.000000000 -0500
-@@ -14,9 +14,6 @@
++++ serefpolicy-3.6.32/policy/modules/services/ntop.te	2009-12-21 11:12:35.000000000 -0500
+@@ -11,12 +11,12 @@
+ init_daemon_domain(ntop_t, ntop_exec_t)
+ application_domain(ntop_t, ntop_exec_t)
+ 
++type ntop_initrc_exec_t;
++init_script_file(ntop_initrc_exec_t)
++
  type ntop_etc_t;
  files_config_file(ntop_etc_t)
  
@@ -19359,11 +19173,12 @@ diff -b -B --ignore-all-space --exclude-
  type ntop_tmp_t;
  files_tmp_file(ntop_tmp_t)
  
-@@ -37,15 +34,14 @@
+@@ -37,26 +37,28 @@
  allow ntop_t self:fifo_file rw_fifo_file_perms;
  allow ntop_t self:tcp_socket create_stream_socket_perms;
  allow ntop_t self:udp_socket create_socket_perms;
 +allow ntop_t self:unix_dgram_socket create_socket_perms;
++allow ntop_t self:unix_stream_socket create_stream_socket_perms;
  allow ntop_t self:packet_socket create_socket_perms;
 +allow ntop_t self:socket create_socket_perms;
  
@@ -19377,7 +19192,13 @@ diff -b -B --ignore-all-space --exclude-
  manage_dirs_pattern(ntop_t, ntop_tmp_t, ntop_tmp_t)
  manage_files_pattern(ntop_t, ntop_tmp_t, ntop_tmp_t)
  files_tmp_filetrans(ntop_t, ntop_tmp_t, { file dir })
-@@ -57,6 +53,8 @@
+ 
+-create_dirs_pattern(ntop_t, ntop_var_lib_t, ntop_var_lib_t)
++manage_dirs_pattern(ntop_t, ntop_var_lib_t,  ntop_var_lib_t)
+ manage_files_pattern(ntop_t, ntop_var_lib_t, ntop_var_lib_t)
+-files_var_lib_filetrans(ntop_t, ntop_var_lib_t, file)
++files_var_lib_filetrans(ntop_t, ntop_var_lib_t, { file dir } )
+ 
  manage_files_pattern(ntop_t, ntop_var_run_t, ntop_var_run_t)
  files_pid_filetrans(ntop_t, ntop_var_run_t, file)
  
@@ -19386,7 +19207,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_network_state(ntop_t)
  kernel_read_kernel_sysctls(ntop_t)
  kernel_list_proc(ntop_t)
-@@ -72,12 +70,17 @@
+@@ -72,26 +74,36 @@
  corenet_raw_sendrecv_generic_node(ntop_t)
  corenet_tcp_sendrecv_all_ports(ntop_t)
  corenet_udp_sendrecv_all_ports(ntop_t)
@@ -19404,15 +19225,17 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(ntop_t)
  fs_search_auto_mountpoints(ntop_t)
-@@ -85,6 +88,7 @@
+ 
++auth_use_nsswitch(ntop_t)
++
  logging_send_syslog_msg(ntop_t)
  
  miscfiles_read_localization(ntop_t)
+-
+-sysnet_read_config(ntop_t)
 +miscfiles_read_fonts(ntop_t)
  
- sysnet_read_config(ntop_t)
- 
-@@ -92,6 +96,10 @@
+ userdom_dontaudit_use_unpriv_user_fds(ntop_t)
  userdom_dontaudit_search_user_home_dirs(ntop_t)
  
  optional_policy(`
@@ -20162,7 +19985,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/plymouth(/.*)?				gen_context(system_u:object_r:plymouthd_var_run_t, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.if serefpolicy-3.6.32/policy/modules/services/plymouth.if
 --- nsaserefpolicy/policy/modules/services/plymouth.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/plymouth.if	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.if	2009-12-21 12:06:57.000000000 -0500
 @@ -0,0 +1,304 @@
 +## <summary>policy for plymouthd</summary>
 +
@@ -20186,7 +20009,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
-+##	Execute a plymoth in the current domain
++##	Execute a plymoth command in the current domain
 +## </summary>
 +## <param name="domain">
 +## <summary>
@@ -20194,12 +20017,12 @@ diff -b -B --ignore-all-space --exclude-
 +## </summary>
 +## </param>
 +#
-+interface(`plymouth_exec', `
++interface(`plymouth_exec_plymouth', `
 +	gen_require(`
-+		type plymouthd_exec_t;
++		type plymouth_exec_t;
 +	')
 +
-+	can_exec($1, plymouthd_exec_t)
++	can_exec($1, plymouth_exec_t)
 +')
 +
 +########################################
@@ -23437,7 +23260,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read NFS exported content.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.32/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/rpc.te	2009-12-18 15:32:53.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/rpc.te	2009-12-21 17:41:53.000000000 -0500
 @@ -37,8 +37,14 @@
  # rpc_exec_t is the type of rpc daemon programs.
  rpc_domain_template(rpcd)
@@ -23528,7 +23351,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(gssd_t)
  auth_manage_cache(gssd_t) 
-@@ -199,10 +219,13 @@
+@@ -199,10 +219,14 @@
  
  mount_signal(gssd_t)
  
@@ -23539,6 +23362,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_read_user_tmp_files(gssd_t) 
  	userdom_read_user_tmp_symlinks(gssd_t) 
 +	userdom_dontaudit_write_user_tmp_files(gssd_t) 
++	files_read_generic_tmp_files(gssd_t) 
  ')
  
  optional_policy(`
@@ -26593,8 +26417,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tuned.te serefpolicy-3.6.32/policy/modules/services/tuned.te
 --- nsaserefpolicy/policy/modules/services/tuned.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/tuned.te	2009-12-17 11:20:47.000000000 -0500
-@@ -0,0 +1,59 @@
++++ serefpolicy-3.6.32/policy/modules/services/tuned.te	2009-12-21 10:30:27.000000000 -0500
+@@ -0,0 +1,60 @@
 +
 +policy_module(tuned,1.0.0)
 +
@@ -26627,6 +26451,7 @@ diff -b -B --ignore-all-space --exclude-
 +files_pid_filetrans(tuned_t, tuned_var_run_t, { file })
 +
 +corecmd_exec_shell(tuned_t)
++corecmd_exec_bin(tuned_t)
 +
 +kernel_read_network_state(tuned_t)
 +kernel_read_system_state(tuned_t)
@@ -28718,7 +28543,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-21 17:51:39.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -29251,7 +29076,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	plymouth_search_spool(xdm_t)
-+	plymouth_exec(xdm_t)
++	plymouth_exec_plymouth(xdm_t)
 +')
 +
 +optional_policy(`
@@ -29401,15 +29226,16 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +926,7 @@
+@@ -721,6 +926,8 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
++miscfiles_dontaudit_write_fonts(xserver_t)
 +miscfiles_read_hwdata(xserver_t)
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +949,7 @@
+@@ -743,7 +950,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -29418,7 +29244,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +981,20 @@
+@@ -775,12 +982,20 @@
  ')
  
  optional_policy(`
@@ -29440,7 +29266,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,12 +1021,12 @@
+@@ -807,12 +1022,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -29457,7 +29283,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Run xkbcomp.
  allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -828,9 +1042,14 @@
+@@ -828,9 +1043,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -29472,7 +29298,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -845,11 +1064,14 @@
+@@ -845,11 +1065,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -29488,7 +29314,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1104,8 @@
+@@ -882,6 +1105,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -29497,7 +29323,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1130,8 @@
+@@ -906,6 +1131,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -29506,7 +29332,7 @@ diff -b -B --ignore-all-space --exclude-
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -973,17 +1199,49 @@
+@@ -973,17 +1200,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -31607,7 +31433,7 @@ diff -b -B --ignore-all-space --exclude-
 +permissive kdump_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-18 08:55:06.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-21 13:42:25.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -31815,7 +31641,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +309,113 @@
+@@ -307,10 +309,115 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -31929,6 +31755,8 @@ diff -b -B --ignore-all-space --exclude-
 +/opt/lampp/lib/libct\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/usr/lib(64)?/nmm/liba52\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/chromium-browser/libsandbox\.so 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.6.32/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-12-17 11:20:47.000000000 -0500
@@ -35412,7 +35240,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-21 14:36:02.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -36980,35 +36808,50 @@ diff -b -B --ignore-all-space --exclude-
  	fs_search_tmpfs($1)
  ')
  
--########################################
-+######################################
+ ########################################
  ## <summary>
 -##	Read user tmpfs files.
-+##  Manage user tmpfs files.
++##	Read/Write user tmpfs files.
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2419,15 +2695,14 @@
+@@ -2419,7 +2695,7 @@
  ##	</summary>
  ## </param>
  #
 -interface(`userdom_rw_user_tmpfs_files',`
-+interface(`userdom_manage_user_tmpfs_files',`
++interface(`userdom_rw_inherited_user_tmpfs_files',`
  	gen_require(`
  		type user_tmpfs_t;
  	')
+@@ -2430,6 +2706,26 @@
+ 	fs_search_tmpfs($1)
+ ')
  
--	rw_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
--	read_lnk_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
--	allow $1 user_tmpfs_t:dir list_dir_perms;
--	fs_search_tmpfs($1)
++######################################
++## <summary>
++##  Manage user tmpfs files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_manage_user_tmpfs_files',`
++	gen_require(`
++		type user_tmpfs_t;
++	')
++
 +    manage_dirs_pattern($1, user_tmpfs_t, user_tmpfs_t)
 +    manage_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
 +    manage_lnk_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
- ')
- 
++')
++
  ########################################
-@@ -2749,7 +3024,7 @@
+ ## <summary>
+ ##	Get the attributes of a user domain tty.
+@@ -2749,7 +3045,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -37017,7 +36860,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +3040,33 @@
+@@ -2765,11 +3061,33 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -37053,7 +36896,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3194,43 @@
+@@ -2897,7 +3215,43 @@
  		type user_tmp_t;
  	')
  
@@ -37098,7 +36941,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3267,7 @@
+@@ -2934,6 +3288,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -37106,7 +36949,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3398,656 @@
+@@ -3064,3 +3419,656 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -p -r1.984 -r1.985
--- selinux-policy.spec	18 Dec 2009 21:25:51 -0000	1.984
+++ selinux-policy.spec	21 Dec 2009 22:53:30 -0000	1.985
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 60%{?dist}
+Release: 61%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,12 @@ exit 0
 %endif
 
 %changelog
+* Mon Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-61
+- Fixes for sandbox_x_server
+- Fix ntop policy
+- Allow screen to use fprintd
+- Sandbox fixes
+
 * Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-60
 - Fixs for cluster policy
 - mysql_safe fixes
@@ -456,10 +462,6 @@ exit 0
 - Cgroup access for virtd
 - Dontaudit fail2ban leaks
 
-* Wed Dec 16 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-59
-- Fixes for sandbox_x_server
-- 
-
 * Tue Dec 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-59
 - Dontaudit udp_socket leaks for xauth_t
 - Dontaudit rules for iceauth_t



From tomspur at fedoraproject.org  Mon Dec 21 23:04:39 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 21 Dec 2009 23:04:39 +0000 (UTC)
Subject: rpms/gbirthday/F-11 gbirthday.spec,1.7,1.8
Message-ID: <20091221230439.B7F9811C00CF@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21226

Modified Files:
	gbirthday.spec 
Log Message:
new version


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/gbirthday.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gbirthday.spec	16 Dec 2009 00:00:11 -0000	1.7
+++ gbirthday.spec	21 Dec 2009 23:04:38 -0000	1.8
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gbirthday
-Version:        0.5.5
-Release:        2%{?dist}
+Version:        0.5.6
+Release:        1%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -16,6 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 Requires:       notify-python
 Requires:       evolution
+Requires:       gnome-python2-evolution
 Requires:       python
 Requires:       MySQL-python
 Requires:       pygtk2
@@ -59,6 +60,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Tue Dec 22 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.6-1
+- new version
+
 * Wed Dec 16 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-2
 - upstream tarball was corected, still same version
 



From tomspur at fedoraproject.org  Mon Dec 21 23:08:16 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 21 Dec 2009 23:08:16 +0000 (UTC)
Subject: rpms/gbirthday/F-11 sources,1.8,1.9
Message-ID: <20091221230816.F308011C00CF@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21635

Modified Files:
	sources 
Log Message:
updating sources, forgot in last commit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	16 Dec 2009 00:00:11 -0000	1.8
+++ sources	21 Dec 2009 23:08:16 -0000	1.9
@@ -1 +1 @@
-4850a11981b10561452669ed4141b0fe  gbirthday-0.5.5.tar.xz
+345717bccd0bcbb1c3679cfa04beb5b5  gbirthday-0.5.6.tar.xz



From jjames at fedoraproject.org  Mon Dec 21 23:27:04 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 21 Dec 2009 23:27:04 +0000 (UTC)
Subject: rpms/xemacs/F-11 xemacs-21.5.29-arabic-547840.patch, NONE,
	1.1 xemacs.spec, 1.56, 1.57
Message-ID: <20091221232704.6A76811C00EF@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23852/F-11

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.29-arabic-547840.patch 
Log Message:
* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-10
- Don't crash with a Persian keyboard layout (bz 547840).


xemacs-21.5.29-arabic-547840.patch:
 ChangeLog            |   10 ++++++
 mule/arabic.el       |   30 +++++++++++++++++-
 mule/iso-with-esc.el |   83 ---------------------------------------------------
 unicode.el           |    1 
 4 files changed, 39 insertions(+), 85 deletions(-)

--- NEW FILE xemacs-21.5.29-arabic-547840.patch ---
diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog
--- xemacs-21.5.29.ORIG/lisp/ChangeLog	2009-12-21 16:14:56.870726786 -0700
+++ xemacs-21.5.29/lisp/ChangeLog	2009-12-21 16:16:50.931726958 -0700
@@ -1,3 +1,13 @@
+2009-12-21  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* mule/arabic.el (arabic-iso8859-6): 
+	Move the creation of this character set to this (dumped) file,
+	since it's needed for input on X11. 
+	* mule/iso-with-esc.el: 
+	Remove arabic-iso8859-6 and its Unicode map from this file.
+	* unicode.el (load-unicode-tables): 
+	Load arabic-iso8859-6 on startup again.
+
 2009-11-01  Stephen Turnbull  <stephen at xemacs.org>
 
 	* faces.el (Face-frob-property):
diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el
--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/mule/arabic.el	2009-12-21 16:15:16.751751709 -0700
@@ -28,8 +28,34 @@
 
 ;;; Code:
 
-;; See iso-with-esc.el for commentary on the ISO standard Arabic character
-;; set.
+;; ISO 8859-6 is such a useless character set that it seems a waste of
+;; codespace to dump it. Let me count the ways: 
+;; 
+;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite
+;;    plenty of unallocated code points.
+;;
+;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that
+;;    they are necessary, even for the Arabs, for basic things like
+;;    dictionary entries, children's books, and occasional disambiguation.
+;;
+;; 3. The Arabs don't use it, they use Windows-1256, which also supports
+;;    Persian, at least, as well as the French characters necessary in
+;;    Lebanon and North Africa.
+
+;; But; it's necessary for input on X11.
+
+(make-charset
+ 'arabic-iso8859-6 
+ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
+ '(dimension 1
+   registry "ISO8859-6"
+   chars 96
+   columns 1
+   direction r2l
+   final ?G
+   graphic 1
+   short-name "RHP of ISO8859/6"
+   long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"))
 
 (make-8-bit-coding-system
  'iso-8859-6
diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el
--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/mule/iso-with-esc.el	2009-12-21 16:15:16.752749776 -0700
@@ -120,89 +120,6 @@
    safe-charsets (ascii greek-iso8859-7)
    mnemonic "Grk"))
 
-;; ISO 8859-6 is such a useless character set that it seems a waste of
-;; codespace to dump it. Let me count the ways: 
-;; 
-;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite
-;;    plenty of unallocated code points.
-;;
-;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that
-;;    they are necessary, even for the Arabs, for basic things like
-;;    dictionary entries, children's books, and occasional disambiguation.
-;;
-;; 3. The Arabs don't use it, they use Windows-1256, which also supports
-;;    Persian, at least, as well as the French characters necessary in
-;;    Lebanon and North Africa.
-
-(make-charset
- 'arabic-iso8859-6 
- "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
- '(dimension 1
-   registry "ISO8859-6"
-   chars 96
-   columns 1
-   direction r2l
-   final ?G
-   graphic 1
-   short-name "RHP of ISO8859/6"
-   long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"))
-
-(loop
-  for (iso8859-6 unicode)
-  in '((#xA0 #x00A0) ;; NO-BREAK SPACE
-       (#xA4 #x00A4) ;; CURRENCY SIGN
-       (#xAC #x060C) ;; ARABIC COMMA
-       (#xAD #x00AD) ;; SOFT HYPHEN
-       (#xBB #x061B) ;; ARABIC SEMICOLON
-       (#xBF #x061F) ;; ARABIC QUESTION MARK
-       (#xC1 #x0621) ;; ARABIC LETTER HAMZA
-       (#xC2 #x0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE
-       (#xC3 #x0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE
-       (#xC4 #x0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE
-       (#xC5 #x0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW
-       (#xC6 #x0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE
-       (#xC7 #x0627) ;; ARABIC LETTER ALEF
-       (#xC8 #x0628) ;; ARABIC LETTER BEH
-       (#xC9 #x0629) ;; ARABIC LETTER TEH MARBUTA
-       (#xCA #x062A) ;; ARABIC LETTER TEH
-       (#xCB #x062B) ;; ARABIC LETTER THEH
-       (#xCC #x062C) ;; ARABIC LETTER JEEM
-       (#xCD #x062D) ;; ARABIC LETTER HAH
-       (#xCE #x062E) ;; ARABIC LETTER KHAH
-       (#xCF #x062F) ;; ARABIC LETTER DAL
-       (#xD0 #x0630) ;; ARABIC LETTER THAL
-       (#xD1 #x0631) ;; ARABIC LETTER REH
-       (#xD2 #x0632) ;; ARABIC LETTER ZAIN
-       (#xD3 #x0633) ;; ARABIC LETTER SEEN
-       (#xD4 #x0634) ;; ARABIC LETTER SHEEN
-       (#xD5 #x0635) ;; ARABIC LETTER SAD
-       (#xD6 #x0636) ;; ARABIC LETTER DAD
-       (#xD7 #x0637) ;; ARABIC LETTER TAH
-       (#xD8 #x0638) ;; ARABIC LETTER ZAH
-       (#xD9 #x0639) ;; ARABIC LETTER AIN
-       (#xDA #x063A) ;; ARABIC LETTER GHAIN
-       (#xE0 #x0640) ;; ARABIC TATWEEL
-       (#xE1 #x0641) ;; ARABIC LETTER FEH
-       (#xE2 #x0642) ;; ARABIC LETTER QAF
-       (#xE3 #x0643) ;; ARABIC LETTER KAF
-       (#xE4 #x0644) ;; ARABIC LETTER LAM
-       (#xE5 #x0645) ;; ARABIC LETTER MEEM
-       (#xE6 #x0646) ;; ARABIC LETTER NOON
-       (#xE7 #x0647) ;; ARABIC LETTER HEH
-       (#xE8 #x0648) ;; ARABIC LETTER WAW
-       (#xE9 #x0649) ;; ARABIC LETTER ALEF MAKSURA
-       (#xEA #x064A) ;; ARABIC LETTER YEH
-       (#xEB #x064B) ;; ARABIC FATHATAN
-       (#xEC #x064C) ;; ARABIC DAMMATAN
-       (#xED #x064D) ;; ARABIC KASRATAN
-       (#xEE #x064E) ;; ARABIC FATHA
-       (#xEF #x064F) ;; ARABIC DAMMA
-       (#xF0 #x0650) ;; ARABIC KASRA
-       (#xF1 #x0651) ;; ARABIC SHADDA
-       (#xF2 #x0652));; ARABIC SUKUN
-  do (set-unicode-conversion (make-char 'arabic-iso8859-6 iso8859-6)
-                             unicode))
-
 ;;;###autoload
 (make-coding-system
  'arabic-iso-8bit-with-esc 'iso2022  ;; GNU's iso-8859-6 is
diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el
--- xemacs-21.5.29.ORIG/lisp/unicode.el	2009-05-18 08:51:07.000000000 -0600
+++ xemacs-21.5.29/lisp/unicode.el	2009-12-21 16:15:16.752749776 -0700
@@ -73,6 +73,7 @@
 	    ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80)
 	    ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80)
 	    ("8859-5.TXT" cyrillic-iso8859-5 #xA0 #xFF #x-80)
+	    ("8859-6.TXT" arabic-iso8859-6 #xA0 #xFF #x-80)
 	    ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80)
 	    ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80)
 	    ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80)


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- xemacs.spec	8 Dec 2009 17:17:37 -0000	1.56
+++ xemacs.spec	21 Dec 2009 23:27:03 -0000	1.57
@@ -22,7 +22,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        8%{?snap:.%{snap}}%{?dist}
+Release:        9%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -56,6 +56,8 @@ Patch9:         %{name}-21.5.29-destdir.
 Patch10:        %{name}-21.5.29-tty-font-512623.patch
 # Sent upstream 2009-12-08
 Patch11:        %{name}-21.5.29-etags-memmove-545399.patch
+# Applied upstream 2009-12-21
+Patch12:        %{name}-21.5.29-arabic-547840.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -229,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -592,6 +595,9 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
+- Don't crash with a Persian keyboard layout (bz 547840)
+
 * Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-8
 - Add patch to use memmove in etags (bz 545399).
 



From jjames at fedoraproject.org  Mon Dec 21 23:27:04 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 21 Dec 2009 23:27:04 +0000 (UTC)
Subject: rpms/xemacs/F-12 xemacs-21.5.29-arabic-547840.patch, NONE,
	1.1 xemacs.spec, 1.58, 1.59
Message-ID: <20091221232704.67AE211C00CF@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23852/F-12

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.29-arabic-547840.patch 
Log Message:
* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-10
- Don't crash with a Persian keyboard layout (bz 547840).


xemacs-21.5.29-arabic-547840.patch:
 ChangeLog            |   10 ++++++
 mule/arabic.el       |   30 +++++++++++++++++-
 mule/iso-with-esc.el |   83 ---------------------------------------------------
 unicode.el           |    1 
 4 files changed, 39 insertions(+), 85 deletions(-)

--- NEW FILE xemacs-21.5.29-arabic-547840.patch ---
diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog
--- xemacs-21.5.29.ORIG/lisp/ChangeLog	2009-12-21 16:14:56.870726786 -0700
+++ xemacs-21.5.29/lisp/ChangeLog	2009-12-21 16:16:50.931726958 -0700
@@ -1,3 +1,13 @@
+2009-12-21  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* mule/arabic.el (arabic-iso8859-6): 
+	Move the creation of this character set to this (dumped) file,
+	since it's needed for input on X11. 
+	* mule/iso-with-esc.el: 
+	Remove arabic-iso8859-6 and its Unicode map from this file.
+	* unicode.el (load-unicode-tables): 
+	Load arabic-iso8859-6 on startup again.
+
 2009-11-01  Stephen Turnbull  <stephen at xemacs.org>
 
 	* faces.el (Face-frob-property):
diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el
--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/mule/arabic.el	2009-12-21 16:15:16.751751709 -0700
@@ -28,8 +28,34 @@
 
 ;;; Code:
 
-;; See iso-with-esc.el for commentary on the ISO standard Arabic character
-;; set.
+;; ISO 8859-6 is such a useless character set that it seems a waste of
+;; codespace to dump it. Let me count the ways: 
+;; 
+;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite
+;;    plenty of unallocated code points.
+;;
+;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that
+;;    they are necessary, even for the Arabs, for basic things like
+;;    dictionary entries, children's books, and occasional disambiguation.
+;;
+;; 3. The Arabs don't use it, they use Windows-1256, which also supports
+;;    Persian, at least, as well as the French characters necessary in
+;;    Lebanon and North Africa.
+
+;; But; it's necessary for input on X11.
+
+(make-charset
+ 'arabic-iso8859-6 
+ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
+ '(dimension 1
+   registry "ISO8859-6"
+   chars 96
+   columns 1
+   direction r2l
+   final ?G
+   graphic 1
+   short-name "RHP of ISO8859/6"
+   long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"))
 
 (make-8-bit-coding-system
  'iso-8859-6
diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el
--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/mule/iso-with-esc.el	2009-12-21 16:15:16.752749776 -0700
@@ -120,89 +120,6 @@
    safe-charsets (ascii greek-iso8859-7)
    mnemonic "Grk"))
 
-;; ISO 8859-6 is such a useless character set that it seems a waste of
-;; codespace to dump it. Let me count the ways: 
-;; 
-;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite
-;;    plenty of unallocated code points.
-;;
-;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that
-;;    they are necessary, even for the Arabs, for basic things like
-;;    dictionary entries, children's books, and occasional disambiguation.
-;;
-;; 3. The Arabs don't use it, they use Windows-1256, which also supports
-;;    Persian, at least, as well as the French characters necessary in
-;;    Lebanon and North Africa.
-
-(make-charset
- 'arabic-iso8859-6 
- "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
- '(dimension 1
-   registry "ISO8859-6"
-   chars 96
-   columns 1
-   direction r2l
-   final ?G
-   graphic 1
-   short-name "RHP of ISO8859/6"
-   long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"))
-
-(loop
-  for (iso8859-6 unicode)
-  in '((#xA0 #x00A0) ;; NO-BREAK SPACE
-       (#xA4 #x00A4) ;; CURRENCY SIGN
-       (#xAC #x060C) ;; ARABIC COMMA
-       (#xAD #x00AD) ;; SOFT HYPHEN
-       (#xBB #x061B) ;; ARABIC SEMICOLON
-       (#xBF #x061F) ;; ARABIC QUESTION MARK
-       (#xC1 #x0621) ;; ARABIC LETTER HAMZA
-       (#xC2 #x0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE
-       (#xC3 #x0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE
-       (#xC4 #x0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE
-       (#xC5 #x0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW
-       (#xC6 #x0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE
-       (#xC7 #x0627) ;; ARABIC LETTER ALEF
-       (#xC8 #x0628) ;; ARABIC LETTER BEH
-       (#xC9 #x0629) ;; ARABIC LETTER TEH MARBUTA
-       (#xCA #x062A) ;; ARABIC LETTER TEH
-       (#xCB #x062B) ;; ARABIC LETTER THEH
-       (#xCC #x062C) ;; ARABIC LETTER JEEM
-       (#xCD #x062D) ;; ARABIC LETTER HAH
-       (#xCE #x062E) ;; ARABIC LETTER KHAH
-       (#xCF #x062F) ;; ARABIC LETTER DAL
-       (#xD0 #x0630) ;; ARABIC LETTER THAL
-       (#xD1 #x0631) ;; ARABIC LETTER REH
-       (#xD2 #x0632) ;; ARABIC LETTER ZAIN
-       (#xD3 #x0633) ;; ARABIC LETTER SEEN
-       (#xD4 #x0634) ;; ARABIC LETTER SHEEN
-       (#xD5 #x0635) ;; ARABIC LETTER SAD
-       (#xD6 #x0636) ;; ARABIC LETTER DAD
-       (#xD7 #x0637) ;; ARABIC LETTER TAH
-       (#xD8 #x0638) ;; ARABIC LETTER ZAH
-       (#xD9 #x0639) ;; ARABIC LETTER AIN
-       (#xDA #x063A) ;; ARABIC LETTER GHAIN
-       (#xE0 #x0640) ;; ARABIC TATWEEL
-       (#xE1 #x0641) ;; ARABIC LETTER FEH
-       (#xE2 #x0642) ;; ARABIC LETTER QAF
-       (#xE3 #x0643) ;; ARABIC LETTER KAF
-       (#xE4 #x0644) ;; ARABIC LETTER LAM
-       (#xE5 #x0645) ;; ARABIC LETTER MEEM
-       (#xE6 #x0646) ;; ARABIC LETTER NOON
-       (#xE7 #x0647) ;; ARABIC LETTER HEH
-       (#xE8 #x0648) ;; ARABIC LETTER WAW
-       (#xE9 #x0649) ;; ARABIC LETTER ALEF MAKSURA
-       (#xEA #x064A) ;; ARABIC LETTER YEH
-       (#xEB #x064B) ;; ARABIC FATHATAN
-       (#xEC #x064C) ;; ARABIC DAMMATAN
-       (#xED #x064D) ;; ARABIC KASRATAN
-       (#xEE #x064E) ;; ARABIC FATHA
-       (#xEF #x064F) ;; ARABIC DAMMA
-       (#xF0 #x0650) ;; ARABIC KASRA
-       (#xF1 #x0651) ;; ARABIC SHADDA
-       (#xF2 #x0652));; ARABIC SUKUN
-  do (set-unicode-conversion (make-char 'arabic-iso8859-6 iso8859-6)
-                             unicode))
-
 ;;;###autoload
 (make-coding-system
  'arabic-iso-8bit-with-esc 'iso2022  ;; GNU's iso-8859-6 is
diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el
--- xemacs-21.5.29.ORIG/lisp/unicode.el	2009-05-18 08:51:07.000000000 -0600
+++ xemacs-21.5.29/lisp/unicode.el	2009-12-21 16:15:16.752749776 -0700
@@ -73,6 +73,7 @@
 	    ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80)
 	    ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80)
 	    ("8859-5.TXT" cyrillic-iso8859-5 #xA0 #xFF #x-80)
+	    ("8859-6.TXT" arabic-iso8859-6 #xA0 #xFF #x-80)
 	    ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80)
 	    ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80)
 	    ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80)


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- xemacs.spec	8 Dec 2009 17:17:37 -0000	1.58
+++ xemacs.spec	21 Dec 2009 23:27:03 -0000	1.59
@@ -22,7 +22,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        9%{?snap:.%{snap}}%{?dist}
+Release:        10%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -56,6 +56,8 @@ Patch9:         %{name}-21.5.29-destdir.
 Patch10:        %{name}-21.5.29-tty-font-512623.patch
 # Sent upstream 2009-12-08
 Patch11:        %{name}-21.5.29-etags-memmove-545399.patch
+# Applied upstream 2009-12-21
+Patch12:        %{name}-21.5.29-arabic-547840.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -229,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -592,6 +595,9 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-10
+- Don't crash with a Persian keyboard layout (bz 547840)
+
 * Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
 - Add patch to use memmove in etags (bz 545399).
 



From jjames at fedoraproject.org  Mon Dec 21 23:27:04 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 21 Dec 2009 23:27:04 +0000 (UTC)
Subject: rpms/xemacs/devel xemacs-21.5.29-arabic-547840.patch, NONE,
	1.1 xemacs.spec, 1.58, 1.59
Message-ID: <20091221232704.6D3CC11C0260@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23852/devel

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.29-arabic-547840.patch 
Log Message:
* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-10
- Don't crash with a Persian keyboard layout (bz 547840).


xemacs-21.5.29-arabic-547840.patch:
 ChangeLog            |   10 ++++++
 mule/arabic.el       |   30 +++++++++++++++++-
 mule/iso-with-esc.el |   83 ---------------------------------------------------
 unicode.el           |    1 
 4 files changed, 39 insertions(+), 85 deletions(-)

--- NEW FILE xemacs-21.5.29-arabic-547840.patch ---
diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog
--- xemacs-21.5.29.ORIG/lisp/ChangeLog	2009-12-21 16:14:56.870726786 -0700
+++ xemacs-21.5.29/lisp/ChangeLog	2009-12-21 16:16:50.931726958 -0700
@@ -1,3 +1,13 @@
+2009-12-21  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* mule/arabic.el (arabic-iso8859-6): 
+	Move the creation of this character set to this (dumped) file,
+	since it's needed for input on X11. 
+	* mule/iso-with-esc.el: 
+	Remove arabic-iso8859-6 and its Unicode map from this file.
+	* unicode.el (load-unicode-tables): 
+	Load arabic-iso8859-6 on startup again.
+
 2009-11-01  Stephen Turnbull  <stephen at xemacs.org>
 
 	* faces.el (Face-frob-property):
diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el
--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/mule/arabic.el	2009-12-21 16:15:16.751751709 -0700
@@ -28,8 +28,34 @@
 
 ;;; Code:
 
-;; See iso-with-esc.el for commentary on the ISO standard Arabic character
-;; set.
+;; ISO 8859-6 is such a useless character set that it seems a waste of
+;; codespace to dump it. Let me count the ways: 
+;; 
+;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite
+;;    plenty of unallocated code points.
+;;
+;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that
+;;    they are necessary, even for the Arabs, for basic things like
+;;    dictionary entries, children's books, and occasional disambiguation.
+;;
+;; 3. The Arabs don't use it, they use Windows-1256, which also supports
+;;    Persian, at least, as well as the French characters necessary in
+;;    Lebanon and North Africa.
+
+;; But; it's necessary for input on X11.
+
+(make-charset
+ 'arabic-iso8859-6 
+ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
+ '(dimension 1
+   registry "ISO8859-6"
+   chars 96
+   columns 1
+   direction r2l
+   final ?G
+   graphic 1
+   short-name "RHP of ISO8859/6"
+   long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"))
 
 (make-8-bit-coding-system
  'iso-8859-6
diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el
--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/mule/iso-with-esc.el	2009-12-21 16:15:16.752749776 -0700
@@ -120,89 +120,6 @@
    safe-charsets (ascii greek-iso8859-7)
    mnemonic "Grk"))
 
-;; ISO 8859-6 is such a useless character set that it seems a waste of
-;; codespace to dump it. Let me count the ways: 
-;; 
-;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite
-;;    plenty of unallocated code points.
-;;
-;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that
-;;    they are necessary, even for the Arabs, for basic things like
-;;    dictionary entries, children's books, and occasional disambiguation.
-;;
-;; 3. The Arabs don't use it, they use Windows-1256, which also supports
-;;    Persian, at least, as well as the French characters necessary in
-;;    Lebanon and North Africa.
-
-(make-charset
- 'arabic-iso8859-6 
- "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
- '(dimension 1
-   registry "ISO8859-6"
-   chars 96
-   columns 1
-   direction r2l
-   final ?G
-   graphic 1
-   short-name "RHP of ISO8859/6"
-   long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"))
-
-(loop
-  for (iso8859-6 unicode)
-  in '((#xA0 #x00A0) ;; NO-BREAK SPACE
-       (#xA4 #x00A4) ;; CURRENCY SIGN
-       (#xAC #x060C) ;; ARABIC COMMA
-       (#xAD #x00AD) ;; SOFT HYPHEN
-       (#xBB #x061B) ;; ARABIC SEMICOLON
-       (#xBF #x061F) ;; ARABIC QUESTION MARK
-       (#xC1 #x0621) ;; ARABIC LETTER HAMZA
-       (#xC2 #x0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE
-       (#xC3 #x0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE
-       (#xC4 #x0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE
-       (#xC5 #x0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW
-       (#xC6 #x0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE
-       (#xC7 #x0627) ;; ARABIC LETTER ALEF
-       (#xC8 #x0628) ;; ARABIC LETTER BEH
-       (#xC9 #x0629) ;; ARABIC LETTER TEH MARBUTA
-       (#xCA #x062A) ;; ARABIC LETTER TEH
-       (#xCB #x062B) ;; ARABIC LETTER THEH
-       (#xCC #x062C) ;; ARABIC LETTER JEEM
-       (#xCD #x062D) ;; ARABIC LETTER HAH
-       (#xCE #x062E) ;; ARABIC LETTER KHAH
-       (#xCF #x062F) ;; ARABIC LETTER DAL
-       (#xD0 #x0630) ;; ARABIC LETTER THAL
-       (#xD1 #x0631) ;; ARABIC LETTER REH
-       (#xD2 #x0632) ;; ARABIC LETTER ZAIN
-       (#xD3 #x0633) ;; ARABIC LETTER SEEN
-       (#xD4 #x0634) ;; ARABIC LETTER SHEEN
-       (#xD5 #x0635) ;; ARABIC LETTER SAD
-       (#xD6 #x0636) ;; ARABIC LETTER DAD
-       (#xD7 #x0637) ;; ARABIC LETTER TAH
-       (#xD8 #x0638) ;; ARABIC LETTER ZAH
-       (#xD9 #x0639) ;; ARABIC LETTER AIN
-       (#xDA #x063A) ;; ARABIC LETTER GHAIN
-       (#xE0 #x0640) ;; ARABIC TATWEEL
-       (#xE1 #x0641) ;; ARABIC LETTER FEH
-       (#xE2 #x0642) ;; ARABIC LETTER QAF
-       (#xE3 #x0643) ;; ARABIC LETTER KAF
-       (#xE4 #x0644) ;; ARABIC LETTER LAM
-       (#xE5 #x0645) ;; ARABIC LETTER MEEM
-       (#xE6 #x0646) ;; ARABIC LETTER NOON
-       (#xE7 #x0647) ;; ARABIC LETTER HEH
-       (#xE8 #x0648) ;; ARABIC LETTER WAW
-       (#xE9 #x0649) ;; ARABIC LETTER ALEF MAKSURA
-       (#xEA #x064A) ;; ARABIC LETTER YEH
-       (#xEB #x064B) ;; ARABIC FATHATAN
-       (#xEC #x064C) ;; ARABIC DAMMATAN
-       (#xED #x064D) ;; ARABIC KASRATAN
-       (#xEE #x064E) ;; ARABIC FATHA
-       (#xEF #x064F) ;; ARABIC DAMMA
-       (#xF0 #x0650) ;; ARABIC KASRA
-       (#xF1 #x0651) ;; ARABIC SHADDA
-       (#xF2 #x0652));; ARABIC SUKUN
-  do (set-unicode-conversion (make-char 'arabic-iso8859-6 iso8859-6)
-                             unicode))
-
 ;;;###autoload
 (make-coding-system
  'arabic-iso-8bit-with-esc 'iso2022  ;; GNU's iso-8859-6 is
diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el
--- xemacs-21.5.29.ORIG/lisp/unicode.el	2009-05-18 08:51:07.000000000 -0600
+++ xemacs-21.5.29/lisp/unicode.el	2009-12-21 16:15:16.752749776 -0700
@@ -73,6 +73,7 @@
 	    ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80)
 	    ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80)
 	    ("8859-5.TXT" cyrillic-iso8859-5 #xA0 #xFF #x-80)
+	    ("8859-6.TXT" arabic-iso8859-6 #xA0 #xFF #x-80)
 	    ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80)
 	    ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80)
 	    ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80)


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- xemacs.spec	8 Dec 2009 17:17:38 -0000	1.58
+++ xemacs.spec	21 Dec 2009 23:27:03 -0000	1.59
@@ -22,7 +22,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        9%{?snap:.%{snap}}%{?dist}
+Release:        10%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -56,6 +56,8 @@ Patch9:         %{name}-21.5.29-destdir.
 Patch10:        %{name}-21.5.29-tty-font-512623.patch
 # Sent upstream 2009-12-08
 Patch11:        %{name}-21.5.29-etags-memmove-545399.patch
+# Applied upstream 2009-12-21
+Patch12:        %{name}-21.5.29-arabic-547840.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -229,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -592,6 +595,9 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-10
+- Don't crash with a Persian keyboard layout (bz 547840)
+
 * Tue Dec  8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
 - Add patch to use memmove in etags (bz 545399).
 



From nushio at fedoraproject.org  Mon Dec 21 23:32:06 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Mon, 21 Dec 2009 23:32:06 +0000 (UTC)
Subject: File gnome-do-0.8.3.1.tar.gz uploaded to lookaside cache by nushio
Message-ID: <20091221233206.75E8410F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-do:

6b4e2b55241892d165b504b1fb98645e  gnome-do-0.8.3.1.tar.gz



From nushio at fedoraproject.org  Mon Dec 21 23:33:57 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Mon, 21 Dec 2009 23:33:57 +0000 (UTC)
Subject: rpms/gnome-do/F-11 .cvsignore, 1.12, 1.13 gnome-do.spec, 1.44,
	1.45 sources, 1.14, 1.15
Message-ID: <20091221233357.9B1B311C00CF@cvs1.fedora.phx.redhat.com>

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25007

Modified Files:
	.cvsignore gnome-do.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Aug 2009 03:40:37 -0000	1.12
+++ .cvsignore	21 Dec 2009 23:33:57 -0000	1.13
@@ -1 +1 @@
-gnome-do-0.8.2.tar.gz
+gnome-do-0.8.3.1.tar.gz


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/gnome-do.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gnome-do.spec	18 Nov 2009 18:36:15 -0000	1.44
+++ gnome-do.spec	21 Dec 2009 23:33:57 -0000	1.45
@@ -1,15 +1,15 @@
 %define			debug_package %{nil}
-%define			mainver 0.8.2
+%define			mainver 0.8.3
 
 Name:			gnome-do
-Version:		0.8.2
-Release:		5%{?dist}
+Version:		0.8.3.1
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
+Source0:		http://launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
 
 # The "Icon Magnification" was removed from "Docky" due to a potential violation of US Patent 7434177
 Patch0:			gnome-do-0.8.2-nozoom.patch
@@ -136,6 +136,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 21 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.3.1-1
+- Fixes the "Eating 100% CPU" bug. 
+- Updates to 0.8.3.1
+- More info: https://launchpad.net/do/+announcement/4538
+
 * Wed Nov 18 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-5
 - Restored "Docky", but removed Icon Zoom due to potential violation of patents. 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 Nov 2009 18:36:15 -0000	1.14
+++ sources	21 Dec 2009 23:33:57 -0000	1.15
@@ -1 +1 @@
-f84f05f08c12615e1665c6f0d392b8bb  gnome-do-0.8.2.tar.gz
+6b4e2b55241892d165b504b1fb98645e  gnome-do-0.8.3.1.tar.gz



From nushio at fedoraproject.org  Mon Dec 21 23:50:09 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Mon, 21 Dec 2009 23:50:09 +0000 (UTC)
Subject: rpms/gnome-do/F-12 gnome-do.spec,1.44,1.45 sources,1.14,1.15
Message-ID: <20091221235009.9B1AB11C03AD@cvs1.fedora.phx.redhat.com>

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26708

Modified Files:
	gnome-do.spec sources 
Log Message:



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-12/gnome-do.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gnome-do.spec	18 Nov 2009 18:38:16 -0000	1.44
+++ gnome-do.spec	21 Dec 2009 23:50:08 -0000	1.45
@@ -1,15 +1,15 @@
 %define			debug_package %{nil}
-%define			mainver 0.8.2
+%define			mainver 0.8.3
 
 Name:			gnome-do
-Version:		0.8.2
-Release:		5%{?dist}
+Version:		0.8.3.1
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
+Source0:		http://launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
 
 # The "Icon Magnification" was removed from "Docky" due to a potential violation of US Patent 7434177
 Patch0:			gnome-do-0.8.2-nozoom.patch
@@ -136,6 +136,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 21 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.3.1-1
+- Fixes the "Eating 100% CPU" bug. 
+- Updates to 0.8.3.1
+- More info: https://launchpad.net/do/+announcement/4538
+
 * Wed Nov 18 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-5
 - Restored "Docky", but removed Icon Zoom due to potential violation of patents. 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 Nov 2009 18:38:16 -0000	1.14
+++ sources	21 Dec 2009 23:50:08 -0000	1.15
@@ -1 +1 @@
-f84f05f08c12615e1665c6f0d392b8bb  gnome-do-0.8.2.tar.gz
+6b4e2b55241892d165b504b1fb98645e  gnome-do-0.8.3.1.tar.gz



From nushio at fedoraproject.org  Tue Dec 22 00:00:59 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Tue, 22 Dec 2009 00:00:59 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec,1.43,1.44 sources,1.13,1.14
Message-ID: <20091222000059.B52CE11C00CF@cvs1.fedora.phx.redhat.com>

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28252

Modified Files:
	gnome-do.spec sources 
Log Message:



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gnome-do.spec	9 Nov 2009 23:17:35 -0000	1.43
+++ gnome-do.spec	22 Dec 2009 00:00:57 -0000	1.44
@@ -1,25 +1,19 @@
 %define			debug_package %{nil}
-%define                 mainver 0.8.2
+%define                 mainver 0.8.3
 
 Name:			gnome-do
-Version:		0.8.2
-Release:		4%{?dist}
+Version:		0.8.3.1
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-# The "Docky" theme code violates US Patent 7434177
-# To generate the clean tarball:
-# tar xvfz gnome-do-%{version}.tar.gz
-# rm -rf gnome-do-%{version}/Do.Interface.Linux.Docky
-# tar cvfz gnome-do-%{version}-nodocky.tar.gz gnome-do-%{version}/
-#
-# You will also need to apply Patch0, which fixes up configure* and Makefile*
-#
-# Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
-Source0:		gnome-do-%{version}-nodocky.tar.gz
-Patch0:			gnome-do-0.8.2-nodocky.patch
+#http://launchpad.net/do/0.8/0.8.3/+download/gnome-do-0.8.3.1.tar.gz
+Source0:		http://launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
+
+# The "Icon Magnification" was removed from "Docky" due to a potential violation of US Patent 7434177
+Patch0:			gnome-do-0.8.2-nozoom.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,7 +60,7 @@ Development files for GNOME Do
 
 %prep
 %setup -q
-%patch0 -p1 -b .nodocky
+%patch0 -p1 -b .nozoom
 
 %build
 %configure
@@ -143,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Nov 18 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-5
+- Restored "Docky", but removed Icon Zoom due to potential violation of patents. 
+
 * Tue Nov 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.2-4
 - Remove "Docky" due to patent issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Nov 2009 23:17:35 -0000	1.13
+++ sources	22 Dec 2009 00:00:57 -0000	1.14
@@ -1 +1 @@
-d85a0af65c6f94e85f3ea1b9b24185c4  gnome-do-0.8.2-nodocky.tar.gz
+6b4e2b55241892d165b504b1fb98645e  gnome-do-0.8.3.1.tar.gz



From arbiter at fedoraproject.org  Tue Dec 22 00:03:23 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 22 Dec 2009 00:03:23 +0000 (UTC)
Subject: rpms/slim/devel slim-1.3.1-CVE-2009-1756.patch, NONE,
	1.1 slim-1.3.1-fix-insecure-mcookie-generation.patch, NONE,
	1.1 slim-1.3.1-gcc44.patch, NONE, 1.1 slim.spec, 1.18, 1.19
Message-ID: <20091222000323.5A96911C03B8@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28673

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.1-CVE-2009-1756.patch 
	slim-1.3.1-fix-insecure-mcookie-generation.patch 
	slim-1.3.1-gcc44.patch 
Log Message:
* Tue Dec 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-9
- Fix CVE-2009-1756 (bugzilla: 544024)
- Fix MIT insecure cookie generation (patch from Debian)
- Fix build with GCC 4.4


slim-1.3.1-CVE-2009-1756.patch:
 Makefile         |    5 +++--
 Makefile.freebsd |    3 ++-
 Makefile.netbsd  |    3 ++-
 Makefile.openbsd |    3 ++-
 app.cpp          |    5 +++--
 switchuser.cpp   |    7 ++++---
 util.cpp         |   32 ++++++++++++++++++++++++++++++++
 util.h           |   19 +++++++++++++++++++
 8 files changed, 67 insertions(+), 10 deletions(-)

--- NEW FILE slim-1.3.1-CVE-2009-1756.patch ---
Index: slim-1.3.1/Makefile
===================================================================
--- slim-1.3.1.orig/Makefile
+++ slim-1.3.1/Makefile
@@ -8,7 +8,7 @@ CC=/usr/bin/gcc
 OPTFLAGS=-O2 -g -Wall
 CFLAGS=$(OPTFLAGS) -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 CXXFLAGS=$(CFLAGS)
-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
+LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
 CUSTOM=-DHAVE_SHADOW
 ifdef USE_PAM
 LDFLAGS+= -lpam
@@ -26,7 +26,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 ifdef USE_PAM
 OBJECTS+=PAM.o
 endif
Index: slim-1.3.1/Makefile.freebsd
===================================================================
--- slim-1.3.1.orig/Makefile.freebsd
+++ slim-1.3.1/Makefile.freebsd
@@ -24,7 +24,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 .ifdef USE_PAM
   OBJECTS+=PAM.o 
 .endif
Index: slim-1.3.1/Makefile.netbsd
===================================================================
--- slim-1.3.1.orig/Makefile.netbsd
+++ slim-1.3.1/Makefile.netbsd
@@ -24,7 +24,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 .ifdef USE_PAM
   OBJECTS+=PAM.o 
 .endif
Index: slim-1.3.1/Makefile.openbsd
===================================================================
--- slim-1.3.1.orig/Makefile.openbsd
+++ slim-1.3.1/Makefile.openbsd
@@ -20,7 +20,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	util.o panel.o
 
 .SUFFIXES: .c.o .cpp.o
 
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include "app.h"
 #include "numlock.h"
+#include "util.h"
 
 
 #ifdef HAVE_SHADOW
@@ -1185,8 +1186,8 @@ void App::CreateServerAuth() {
     authfile = cfg->getOption("authfile");
     remove(authfile.c_str());
     putenv(StrConcat("XAUTHORITY=", authfile.c_str()));
-    cmd = cfg->getOption("xauth_path") + " -q -f " + authfile + " add :0 . " + mcookie;
-    system(cmd.c_str());
+    Util::add_mcookie(mcookie, ":0", cfg->getOption("xauth_path"),
+      authfile);
 }
 
 char* App::StrConcat(const char* str1, const char* str2) {
Index: slim-1.3.1/switchuser.cpp
===================================================================
--- slim-1.3.1.orig/switchuser.cpp
+++ slim-1.3.1/switchuser.cpp
@@ -10,6 +10,7 @@
 */
 
 #include "switchuser.h"
+#include "util.h"
 
 using namespace std;
 
@@ -53,10 +54,10 @@ void SwitchUser::Execute(const char* cmd
 }
 
 void SwitchUser::SetClientAuth(const char* mcookie) {
-    int r;
+    bool r;
     string home = string(Pw->pw_dir);
     string authfile = home + "/.Xauthority";
     remove(authfile.c_str());
-    string cmd = cfg->getOption("xauth_path") + " -q -f " + authfile + " add :0 . " + mcookie;
-    r = system(cmd.c_str());
+    r = Util::add_mcookie(mcookie, ":0", cfg->getOption("xauth_path"),
+      authfile);
 }
Index: slim-1.3.1/util.cpp
===================================================================
--- /dev/null
+++ slim-1.3.1/util.cpp
@@ -0,0 +1,32 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2009 Eygene Ryabinkin <rea at codelabs.ru>
+
+   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 <stdio.h>
+#include "util.h"
+
+/*
+ * Adds the given cookie to the specified Xauthority file.
+ * Returns true on success, false on fault.
+ */
+bool Util::add_mcookie(const std::string &mcookie, const char *display,
+    const std::string &xauth_cmd, const std::string &authfile)
+{
+	FILE *fp;
+	std::string cmd = xauth_cmd + " -f " + authfile + " -q";
+
+	fp = popen(cmd.c_str(), "w");
+	if (!fp)
+		return false;
+	fprintf(fp, "remove %s\n", display);
+	fprintf(fp, "add %s %s %s\n", display, ".", mcookie.c_str());
+	fprintf(fp, "exit\n");
+
+	pclose(fp);
+	return true;
+}
Index: slim-1.3.1/util.h
===================================================================
--- /dev/null
+++ slim-1.3.1/util.h
@@ -0,0 +1,19 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2009 Eygene Ryabinkin <rea at codelabs.ru>
+
+   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 __UTIL_H__
+#define __UTIL_H__
+
+#include <string>
+
+namespace Util {
+	bool add_mcookie(const std::string &mcookie, const char *display,
+	    const std::string &xauth_cmd, const std::string &authfile);
+};
+
+#endif /* __UTIL_H__ */

slim-1.3.1-fix-insecure-mcookie-generation.patch:
 app.cpp  |   51 +++++++++++++++++++++++++++------------------------
 app.h    |    2 ++
 util.cpp |   37 +++++++++++++++++++++++++++++++++++++
 util.h   |    9 +++++++--
 4 files changed, 73 insertions(+), 26 deletions(-)

--- NEW FILE slim-1.3.1-fix-insecure-mcookie-generation.patch ---
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -129,15 +129,18 @@ void User1Signal(int sig) {
 
 
 #ifdef USE_PAM
-App::App(int argc, char** argv):
-    pam(conv, static_cast<void*>(&LoginPanel)){
+App::App(int argc, char** argv)
+  : pam(conv, static_cast<void*>(&LoginPanel)),
 #else
-App::App(int argc, char** argv){
+App::App(int argc, char** argv)
+  :
 #endif
+    mcookiesize(32)// Must be divisible by 4
+{
     int tmp;
     ServerPID = -1;
     testing = false;
-    mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    mcookie = string(App::mcookiesize, 'a');
     daemonmode = false;
     force_nodaemon = false;
     firstlogin = true;
@@ -1128,13 +1131,13 @@ string App::findValidRandomTheme(const s
         name = name.substr(0, name.length() - 1);
     }
 
-    srandom(getpid()+time(NULL));
+    Util::srandom(Util::makeseed());
 
     vector<string> themes;
     string themefile;
     Cfg::split(themes, name, ',');
     do {
-        int sel = random() % themes.size();
+        int sel = Util::random() % themes.size();
 
         name = Cfg::Trim(themes[sel]);
         themefile = string(THEMESDIR) +"/" + name + THEMESFILE;
@@ -1161,27 +1164,27 @@ void App::replaceVariables(string& input
 }
 
 
+/*
+ * We rely on the fact that all bits generated by Util::random()
+ * are usable, so we are taking full words from its output.
+ */
 void App::CreateServerAuth() {
     /* create mit cookie */
-    int i, r;
-    int hexcount = 0;
-        string authfile;
-    string cmd;
+    uint16_t word;
+    uint8_t hi, lo;
+    int i;
+    string authfile;
     const char *digits = "0123456789abcdef";
-        srand( time(NULL) );
-    for ( i = 0; i < 31; i++ ) {
-        r = rand()%16;
-                mcookie[i] = digits[r];
-                if (r>9)
-                        hexcount++;
-    }
-        /* MIT-COOKIE: even occurrences of digits and hex digits */
-        if ((hexcount%2) == 0) {
-                r = rand()%10;
-        } else {
-                r = rand()%5+10;
-        }
-        mcookie[31] = digits[r];
+    Util::srandom(Util::makeseed());
+    for (i = 0; i < App::mcookiesize; i+=4) {
+        word = Util::random() & 0xffff;
+        lo = word & 0xff;
+        hi = word >> 8;
+        mcookie[i] = digits[lo & 0x0f];
+        mcookie[i+1] = digits[lo >> 4];
+        mcookie[i+2] = digits[hi & 0x0f];
+        mcookie[i+3] = digits[hi >> 4];
+    }
     /* reinitialize auth file */
     authfile = cfg->getOption("authfile");
     remove(authfile.c_str());
Index: slim-1.3.1/app.h
===================================================================
--- slim-1.3.1.orig/app.h
+++ slim-1.3.1/app.h
@@ -101,6 +101,8 @@ private:
     
     std::string themeName;
     std::string mcookie;
+
+    const int mcookiesize;
 };
 
 
Index: slim-1.3.1/util.cpp
===================================================================
--- slim-1.3.1.orig/util.cpp
+++ slim-1.3.1/util.cpp
@@ -7,7 +7,13 @@
    (at your option) any later version.
 */
 
+#include <sys/types.h>
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
 #include "util.h"
 
 /*
@@ -30,3 +36,34 @@ bool Util::add_mcookie(const std::string
 	pclose(fp);
 	return true;
 }
+
+/*
+ * Interface for random number generator.  Just now it uses ordinary
+ * random/srandom routines and serves as a wrapper for them.
+ */
+void Util::srandom(unsigned long seed)
+{
+::srandom(seed);
+}
+
+long Util::random(void)
+{
+return ::random();
+}
+
+/*
+ * Makes seed for the srandom() using "random" values obtained from
+ * getpid(), time(NULL) and others.
+ */
+long Util::makeseed(void)
+{
+struct timespec ts;
+long pid = getpid();
+long tm = time(NULL);
+
+if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
+ts.tv_sec = ts.tv_nsec = 0;
+}
+
+return pid + tm + (ts.tv_sec ^ ts.tv_nsec);
+}
Index: slim-1.3.1/util.h
===================================================================
--- slim-1.3.1.orig/util.h
+++ slim-1.3.1/util.h
@@ -12,8 +12,13 @@
 #include <string>
 
 namespace Util {
-	bool add_mcookie(const std::string &mcookie, const char *display,
-	    const std::string &xauth_cmd, const std::string &authfile);
+  bool add_mcookie(const std::string &mcookie, const char *display,
+		   const std::string &xauth_cmd, const std::string &authfile);
+
+  void srandom(unsigned long seed);
+  long random(void);
+
+  long makeseed(void);
 };
 
 #endif /* __UTIL_H__ */

slim-1.3.1-gcc44.patch:
 app.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE slim-1.3.1-gcc44.patch ---
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -12,6 +12,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <cstring>


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/slim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- slim.spec	10 Oct 2009 13:01:12 -0000	1.18
+++ slim.spec	22 Dec 2009 00:03:22 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -15,13 +15,18 @@ Source3:        slim-fedora.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: Post these patches to upstream BTS
-Patch0:         slim-1.3.1-make.patch
-Patch1:         slim-1.3.1-usexwd.patch
-Patch2:         slim-1.3.1-fedora.patch
-Patch3:         slim-1.3.1-strtol.patch
-Patch4:         slim-1.3.1-remove.patch
-Patch5:         slim-1.3.1-curdir.patch
-Patch6: 	slim-1.3.1-selinux.patch
+Patch0: slim-1.3.1-make.patch
+Patch1: slim-1.3.1-usexwd.patch
+Patch2: slim-1.3.1-fedora.patch
+Patch3: slim-1.3.1-strtol.patch
+Patch4: slim-1.3.1-remove.patch
+Patch5: slim-1.3.1-curdir.patch
+Patch6: slim-1.3.1-selinux.patch
+# This is from Debian, I just added -lrt to LDFLAGS
+Patch7: slim-1.3.1-CVE-2009-1756.patch
+# This one is from Debian, too
+Patch8: slim-1.3.1-fix-insecure-mcookie-generation.patch
+Patch9: slim-1.3.1-gcc44.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -43,7 +48,7 @@ desktop environments.
 SLiM is based on latest stable release of Login.app by Per Lid?n.
 
 In the distribution, slim may be called through a wrapper, slim-dynwm,
-which determines the available window managers using the freedesktop 
+which determines the available window managers using the freedesktop
 information and modifies the slim configuration file accordingly,
 before launching slim.
 
@@ -56,6 +61,9 @@ before launching slim.
 %patch4 -p1 -b .gcc44
 %patch5 -p1 -b .curdir
 %patch6 -p1 -b .selinux
+%patch7 -p1 -b .CVE-2009-1756
+%patch8 -p1 -b .mcookie
+%patch9 -p1 -b .gcc44again
 cp -p %{SOURCE3} README.Fedora
 
 %build
@@ -107,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-9
+- Fix CVE-2009-1756 (bugzilla: 544024)
+- Fix MIT insecure cookie generation (patch from Debian)
+- Fix build with GCC 4.4
+
 * Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
 - Fix BZ #518068
 



From sergiopr at fedoraproject.org  Tue Dec 22 00:04:43 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 22 Dec 2009 00:04:43 +0000 (UTC)
Subject: rpms/blitz/devel blitz.spec,1.10,1.11
Message-ID: <20091222000443.E943311C00CF@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/blitz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28959

Modified Files:
	blitz.spec 
Log Message:
* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-13
- Using pregenerated documentation



Index: blitz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blitz/devel/blitz.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- blitz.spec	26 Jul 2009 16:51:02 -0000	1.10
+++ blitz.spec	22 Dec 2009 00:04:43 -0000	1.11
@@ -1,6 +1,6 @@
 Name: blitz
 Version: 0.9
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: C++ class library for matrix scientific computing
 
 Group: Development/Libraries
@@ -10,8 +10,6 @@ Source0: http://downloads.sourceforge.ne
 Patch0: blitz-gcc43.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: doxygen graphviz
-
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -91,7 +89,7 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS LEGAL COPYING README LICENSE examples
+%doc examples
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_libdir}/blitz
@@ -102,12 +100,13 @@ fi
 %exclude %{_libdir}/pkgconfig/blitz-uninstalled.pc
 
 %files doc
-%doc AUTHORS LEGAL COPYING README LICENSE
 %defattr(-,root,root,-)
-%doc doc/doxygen/html 
-
+%doc doc/{blitz.pdf,blitz.html,blitz_abt.html,blitz_fot.html,blitz_ovr.html,blitz_toc.html,blitz_1.html,blitz_2.html,blitz_3.html,blitz_4.html,blitz_5.html,blitz_6.html,blitz_7.html,blitz_8.html,blitz_9.html,blitz_10.html,blitz_11.html,blitz_12.html,blitz_13.html,blitz_14.html,blitz_15.html,blitz_16.html,indirect.gif,slice.gif,strideslice.gif,sinsoid.gif,tensor1.gif,blitz.gif,blitztiny.jpg}
 
 %changelog
+* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-13
+- Using pregenerated documentation
+
 * Sun Jul 26 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-12
 - Noarch doc subpackage
 



From nushio at fedoraproject.org  Tue Dec 22 00:07:17 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Tue, 22 Dec 2009 00:07:17 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do-0.8.2-nozoom.patch,NONE,1.1
Message-ID: <20091222000717.6071911C00CF@cvs1.fedora.phx.redhat.com>

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29219

Added Files:
	gnome-do-0.8.2-nozoom.patch 
Log Message:


gnome-do-0.8.2-nozoom.patch:
 Docky.Interface/DockyConfigurationWidget.cs |    4 !!!!
 Docky.Utilities/DockPreferences.cs          |    2 !!
 2 files changed, 6 modifications(!)

--- NEW FILE gnome-do-0.8.2-nozoom.patch ---
diff -rNc gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs gnome-do-0.8.2-nozoom/Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs
*** gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs	Thu Jun 25 22:39:51 2009
--- gnome-do-0.8.2-nozoom/Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs	Wed Nov 18 11:36:21 2009
***************
*** 133,139 ****
  		
  		void SetSensitivity ()
  		{
! 			zoom_scale.Sensitive = DockPreferences.ZoomEnabled;
  		}
  
  		void HandleToggled (object o, ToggledArgs args)
--- 136,144 ----
  		
  		void SetSensitivity ()
  		{
! 			// disable zoom on Fedora
! 			zoom_checkbutton.Sensitive = false;
! 			zoom_scale.Sensitive = false;
  		}
  
  		void HandleToggled (object o, ToggledArgs args)
diff -rNc gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs gnome-do-0.8.2-nozoom/Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs
*** gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	Thu Jun 25 22:39:51 2009
--- gnome-do-0.8.2-nozoom/Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	Wed Nov 18 11:31:57 2009
***************
*** 90,96 ****
  		
  		static bool enable_zoom = prefs.Get ("EnableZoom", true);
  		public static bool ZoomEnabled {
! 			get { return enable_zoom; }
  			set {
  				prefs.Set ("EnableZoom", value);
  				enable_zoom = value;
--- 90,96 ----
  		
  		static bool enable_zoom = prefs.Get ("EnableZoom", true);
  		public static bool ZoomEnabled {
! 			get { return false; }
  			set {
  				prefs.Set ("EnableZoom", value);
  				enable_zoom = value;



From arbiter at fedoraproject.org  Tue Dec 22 00:09:36 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 22 Dec 2009 00:09:36 +0000 (UTC)
Subject: rpms/slim/F-11 slim-1.3.1-CVE-2009-1756.patch, NONE,
	1.1 slim-1.3.1-fix-insecure-mcookie-generation.patch, NONE,
	1.1 slim-1.3.1-gcc44.patch, NONE, 1.1 slim.spec, 1.16, 1.17
Message-ID: <20091222000936.210A311C00CF@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29626

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.1-CVE-2009-1756.patch 
	slim-1.3.1-fix-insecure-mcookie-generation.patch 
	slim-1.3.1-gcc44.patch 
Log Message:
* Tue Dec 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-9
- Fix CVE-2009-1756 (bugzilla: 544024)
- Fix MIT insecure cookie generation (patch from Debian)
- Fix build with GCC 4.4


slim-1.3.1-CVE-2009-1756.patch:
 Makefile         |    5 +++--
 Makefile.freebsd |    3 ++-
 Makefile.netbsd  |    3 ++-
 Makefile.openbsd |    3 ++-
 app.cpp          |    5 +++--
 switchuser.cpp   |    7 ++++---
 util.cpp         |   32 ++++++++++++++++++++++++++++++++
 util.h           |   19 +++++++++++++++++++
 8 files changed, 67 insertions(+), 10 deletions(-)

--- NEW FILE slim-1.3.1-CVE-2009-1756.patch ---
Index: slim-1.3.1/Makefile
===================================================================
--- slim-1.3.1.orig/Makefile
+++ slim-1.3.1/Makefile
@@ -8,7 +8,7 @@ CC=/usr/bin/gcc
 OPTFLAGS=-O2 -g -Wall
 CFLAGS=$(OPTFLAGS) -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 CXXFLAGS=$(CFLAGS)
-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
+LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
 CUSTOM=-DHAVE_SHADOW
 ifdef USE_PAM
 LDFLAGS+= -lpam
@@ -26,7 +26,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 ifdef USE_PAM
 OBJECTS+=PAM.o
 endif
Index: slim-1.3.1/Makefile.freebsd
===================================================================
--- slim-1.3.1.orig/Makefile.freebsd
+++ slim-1.3.1/Makefile.freebsd
@@ -24,7 +24,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 .ifdef USE_PAM
   OBJECTS+=PAM.o 
 .endif
Index: slim-1.3.1/Makefile.netbsd
===================================================================
--- slim-1.3.1.orig/Makefile.netbsd
+++ slim-1.3.1/Makefile.netbsd
@@ -24,7 +24,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 .ifdef USE_PAM
   OBJECTS+=PAM.o 
 .endif
Index: slim-1.3.1/Makefile.openbsd
===================================================================
--- slim-1.3.1.orig/Makefile.openbsd
+++ slim-1.3.1/Makefile.openbsd
@@ -20,7 +20,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	util.o panel.o
 
 .SUFFIXES: .c.o .cpp.o
 
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include "app.h"
 #include "numlock.h"
+#include "util.h"
 
 
 #ifdef HAVE_SHADOW
@@ -1185,8 +1186,8 @@ void App::CreateServerAuth() {
     authfile = cfg->getOption("authfile");
     remove(authfile.c_str());
     putenv(StrConcat("XAUTHORITY=", authfile.c_str()));
-    cmd = cfg->getOption("xauth_path") + " -q -f " + authfile + " add :0 . " + mcookie;
-    system(cmd.c_str());
+    Util::add_mcookie(mcookie, ":0", cfg->getOption("xauth_path"),
+      authfile);
 }
 
 char* App::StrConcat(const char* str1, const char* str2) {
Index: slim-1.3.1/switchuser.cpp
===================================================================
--- slim-1.3.1.orig/switchuser.cpp
+++ slim-1.3.1/switchuser.cpp
@@ -10,6 +10,7 @@
 */
 
 #include "switchuser.h"
+#include "util.h"
 
 using namespace std;
 
@@ -53,10 +54,10 @@ void SwitchUser::Execute(const char* cmd
 }
 
 void SwitchUser::SetClientAuth(const char* mcookie) {
-    int r;
+    bool r;
     string home = string(Pw->pw_dir);
     string authfile = home + "/.Xauthority";
     remove(authfile.c_str());
-    string cmd = cfg->getOption("xauth_path") + " -q -f " + authfile + " add :0 . " + mcookie;
-    r = system(cmd.c_str());
+    r = Util::add_mcookie(mcookie, ":0", cfg->getOption("xauth_path"),
+      authfile);
 }
Index: slim-1.3.1/util.cpp
===================================================================
--- /dev/null
+++ slim-1.3.1/util.cpp
@@ -0,0 +1,32 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2009 Eygene Ryabinkin <rea at codelabs.ru>
+
+   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 <stdio.h>
+#include "util.h"
+
+/*
+ * Adds the given cookie to the specified Xauthority file.
+ * Returns true on success, false on fault.
+ */
+bool Util::add_mcookie(const std::string &mcookie, const char *display,
+    const std::string &xauth_cmd, const std::string &authfile)
+{
+	FILE *fp;
+	std::string cmd = xauth_cmd + " -f " + authfile + " -q";
+
+	fp = popen(cmd.c_str(), "w");
+	if (!fp)
+		return false;
+	fprintf(fp, "remove %s\n", display);
+	fprintf(fp, "add %s %s %s\n", display, ".", mcookie.c_str());
+	fprintf(fp, "exit\n");
+
+	pclose(fp);
+	return true;
+}
Index: slim-1.3.1/util.h
===================================================================
--- /dev/null
+++ slim-1.3.1/util.h
@@ -0,0 +1,19 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2009 Eygene Ryabinkin <rea at codelabs.ru>
+
+   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 __UTIL_H__
+#define __UTIL_H__
+
+#include <string>
+
+namespace Util {
+	bool add_mcookie(const std::string &mcookie, const char *display,
+	    const std::string &xauth_cmd, const std::string &authfile);
+};
+
+#endif /* __UTIL_H__ */

slim-1.3.1-fix-insecure-mcookie-generation.patch:
 app.cpp  |   51 +++++++++++++++++++++++++++------------------------
 app.h    |    2 ++
 util.cpp |   37 +++++++++++++++++++++++++++++++++++++
 util.h   |    9 +++++++--
 4 files changed, 73 insertions(+), 26 deletions(-)

--- NEW FILE slim-1.3.1-fix-insecure-mcookie-generation.patch ---
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -129,15 +129,18 @@ void User1Signal(int sig) {
 
 
 #ifdef USE_PAM
-App::App(int argc, char** argv):
-    pam(conv, static_cast<void*>(&LoginPanel)){
+App::App(int argc, char** argv)
+  : pam(conv, static_cast<void*>(&LoginPanel)),
 #else
-App::App(int argc, char** argv){
+App::App(int argc, char** argv)
+  :
 #endif
+    mcookiesize(32)// Must be divisible by 4
+{
     int tmp;
     ServerPID = -1;
     testing = false;
-    mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    mcookie = string(App::mcookiesize, 'a');
     daemonmode = false;
     force_nodaemon = false;
     firstlogin = true;
@@ -1128,13 +1131,13 @@ string App::findValidRandomTheme(const s
         name = name.substr(0, name.length() - 1);
     }
 
-    srandom(getpid()+time(NULL));
+    Util::srandom(Util::makeseed());
 
     vector<string> themes;
     string themefile;
     Cfg::split(themes, name, ',');
     do {
-        int sel = random() % themes.size();
+        int sel = Util::random() % themes.size();
 
         name = Cfg::Trim(themes[sel]);
         themefile = string(THEMESDIR) +"/" + name + THEMESFILE;
@@ -1161,27 +1164,27 @@ void App::replaceVariables(string& input
 }
 
 
+/*
+ * We rely on the fact that all bits generated by Util::random()
+ * are usable, so we are taking full words from its output.
+ */
 void App::CreateServerAuth() {
     /* create mit cookie */
-    int i, r;
-    int hexcount = 0;
-        string authfile;
-    string cmd;
+    uint16_t word;
+    uint8_t hi, lo;
+    int i;
+    string authfile;
     const char *digits = "0123456789abcdef";
-        srand( time(NULL) );
-    for ( i = 0; i < 31; i++ ) {
-        r = rand()%16;
-                mcookie[i] = digits[r];
-                if (r>9)
-                        hexcount++;
-    }
-        /* MIT-COOKIE: even occurrences of digits and hex digits */
-        if ((hexcount%2) == 0) {
-                r = rand()%10;
-        } else {
-                r = rand()%5+10;
-        }
-        mcookie[31] = digits[r];
+    Util::srandom(Util::makeseed());
+    for (i = 0; i < App::mcookiesize; i+=4) {
+        word = Util::random() & 0xffff;
+        lo = word & 0xff;
+        hi = word >> 8;
+        mcookie[i] = digits[lo & 0x0f];
+        mcookie[i+1] = digits[lo >> 4];
+        mcookie[i+2] = digits[hi & 0x0f];
+        mcookie[i+3] = digits[hi >> 4];
+    }
     /* reinitialize auth file */
     authfile = cfg->getOption("authfile");
     remove(authfile.c_str());
Index: slim-1.3.1/app.h
===================================================================
--- slim-1.3.1.orig/app.h
+++ slim-1.3.1/app.h
@@ -101,6 +101,8 @@ private:
     
     std::string themeName;
     std::string mcookie;
+
+    const int mcookiesize;
 };
 
 
Index: slim-1.3.1/util.cpp
===================================================================
--- slim-1.3.1.orig/util.cpp
+++ slim-1.3.1/util.cpp
@@ -7,7 +7,13 @@
    (at your option) any later version.
 */
 
+#include <sys/types.h>
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
 #include "util.h"
 
 /*
@@ -30,3 +36,34 @@ bool Util::add_mcookie(const std::string
 	pclose(fp);
 	return true;
 }
+
+/*
+ * Interface for random number generator.  Just now it uses ordinary
+ * random/srandom routines and serves as a wrapper for them.
+ */
+void Util::srandom(unsigned long seed)
+{
+::srandom(seed);
+}
+
+long Util::random(void)
+{
+return ::random();
+}
+
+/*
+ * Makes seed for the srandom() using "random" values obtained from
+ * getpid(), time(NULL) and others.
+ */
+long Util::makeseed(void)
+{
+struct timespec ts;
+long pid = getpid();
+long tm = time(NULL);
+
+if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
+ts.tv_sec = ts.tv_nsec = 0;
+}
+
+return pid + tm + (ts.tv_sec ^ ts.tv_nsec);
+}
Index: slim-1.3.1/util.h
===================================================================
--- slim-1.3.1.orig/util.h
+++ slim-1.3.1/util.h
@@ -12,8 +12,13 @@
 #include <string>
 
 namespace Util {
-	bool add_mcookie(const std::string &mcookie, const char *display,
-	    const std::string &xauth_cmd, const std::string &authfile);
+  bool add_mcookie(const std::string &mcookie, const char *display,
+		   const std::string &xauth_cmd, const std::string &authfile);
+
+  void srandom(unsigned long seed);
+  long random(void);
+
+  long makeseed(void);
 };
 
 #endif /* __UTIL_H__ */

slim-1.3.1-gcc44.patch:
 app.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE slim-1.3.1-gcc44.patch ---
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -12,6 +12,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <cstring>


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-11/slim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- slim.spec	10 Oct 2009 13:09:35 -0000	1.16
+++ slim.spec	22 Dec 2009 00:09:35 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -15,13 +15,18 @@ Source3:        slim-fedora.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: Post these patches to upstream BTS
-Patch0:         slim-1.3.1-make.patch
-Patch1:         slim-1.3.1-usexwd.patch
-Patch2:         slim-1.3.1-fedora.patch
-Patch3:         slim-1.3.1-strtol.patch
-Patch4:         slim-1.3.1-remove.patch
-Patch5:         slim-1.3.1-curdir.patch
-Patch6: 	slim-1.3.1-selinux.patch
+Patch0: slim-1.3.1-make.patch
+Patch1: slim-1.3.1-usexwd.patch
+Patch2: slim-1.3.1-fedora.patch
+Patch3: slim-1.3.1-strtol.patch
+Patch4: slim-1.3.1-remove.patch
+Patch5: slim-1.3.1-curdir.patch
+Patch6: slim-1.3.1-selinux.patch
+# This is from Debian, I just added -lrt to LDFLAGS
+Patch7: slim-1.3.1-CVE-2009-1756.patch
+# This one is from Debian, too
+Patch8: slim-1.3.1-fix-insecure-mcookie-generation.patch
+Patch9: slim-1.3.1-gcc44.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -43,7 +48,7 @@ desktop environments.
 SLiM is based on latest stable release of Login.app by Per Lid?n.
 
 In the distribution, slim may be called through a wrapper, slim-dynwm,
-which determines the available window managers using the freedesktop 
+which determines the available window managers using the freedesktop
 information and modifies the slim configuration file accordingly,
 before launching slim.
 
@@ -56,6 +61,9 @@ before launching slim.
 %patch4 -p1 -b .gcc44
 %patch5 -p1 -b .curdir
 %patch6 -p1 -b .selinux
+%patch7 -p1 -b .CVE-2009-1756
+%patch8 -p1 -b .mcookie
+%patch9 -p1 -b .gcc44again
 cp -p %{SOURCE3} README.Fedora
 
 %build
@@ -107,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-9
+- Fix CVE-2009-1756 (bugzilla: 544024)
+- Fix MIT insecure cookie generation (patch from Debian)
+- Fix build with GCC 4.4
+
 * Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
 - Fix BZ #518068
 



From arbiter at fedoraproject.org  Tue Dec 22 00:09:38 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 22 Dec 2009 00:09:38 +0000 (UTC)
Subject: rpms/slim/F-12 slim-1.3.1-CVE-2009-1756.patch, NONE,
	1.1 slim-1.3.1-fix-insecure-mcookie-generation.patch, NONE,
	1.1 slim-1.3.1-gcc44.patch, NONE, 1.1 slim.spec, 1.18, 1.19
Message-ID: <20091222000938.1D2F011C00CF@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29643

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.1-CVE-2009-1756.patch 
	slim-1.3.1-fix-insecure-mcookie-generation.patch 
	slim-1.3.1-gcc44.patch 
Log Message:
* Tue Dec 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-9
- Fix CVE-2009-1756 (bugzilla: 544024)
- Fix MIT insecure cookie generation (patch from Debian)
- Fix build with GCC 4.4


slim-1.3.1-CVE-2009-1756.patch:
 Makefile         |    5 +++--
 Makefile.freebsd |    3 ++-
 Makefile.netbsd  |    3 ++-
 Makefile.openbsd |    3 ++-
 app.cpp          |    5 +++--
 switchuser.cpp   |    7 ++++---
 util.cpp         |   32 ++++++++++++++++++++++++++++++++
 util.h           |   19 +++++++++++++++++++
 8 files changed, 67 insertions(+), 10 deletions(-)

--- NEW FILE slim-1.3.1-CVE-2009-1756.patch ---
Index: slim-1.3.1/Makefile
===================================================================
--- slim-1.3.1.orig/Makefile
+++ slim-1.3.1/Makefile
@@ -8,7 +8,7 @@ CC=/usr/bin/gcc
 OPTFLAGS=-O2 -g -Wall
 CFLAGS=$(OPTFLAGS) -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 CXXFLAGS=$(CFLAGS)
-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
+LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
 CUSTOM=-DHAVE_SHADOW
 ifdef USE_PAM
 LDFLAGS+= -lpam
@@ -26,7 +26,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 ifdef USE_PAM
 OBJECTS+=PAM.o
 endif
Index: slim-1.3.1/Makefile.freebsd
===================================================================
--- slim-1.3.1.orig/Makefile.freebsd
+++ slim-1.3.1/Makefile.freebsd
@@ -24,7 +24,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 .ifdef USE_PAM
   OBJECTS+=PAM.o 
 .endif
Index: slim-1.3.1/Makefile.netbsd
===================================================================
--- slim-1.3.1.orig/Makefile.netbsd
+++ slim-1.3.1/Makefile.netbsd
@@ -24,7 +24,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	panel.o util.o
 .ifdef USE_PAM
   OBJECTS+=PAM.o 
 .endif
Index: slim-1.3.1/Makefile.openbsd
===================================================================
--- slim-1.3.1.orig/Makefile.openbsd
+++ slim-1.3.1/Makefile.openbsd
@@ -20,7 +20,8 @@ VERSION=1.3.1
 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 app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o \
+	util.o panel.o
 
 .SUFFIXES: .c.o .cpp.o
 
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include "app.h"
 #include "numlock.h"
+#include "util.h"
 
 
 #ifdef HAVE_SHADOW
@@ -1185,8 +1186,8 @@ void App::CreateServerAuth() {
     authfile = cfg->getOption("authfile");
     remove(authfile.c_str());
     putenv(StrConcat("XAUTHORITY=", authfile.c_str()));
-    cmd = cfg->getOption("xauth_path") + " -q -f " + authfile + " add :0 . " + mcookie;
-    system(cmd.c_str());
+    Util::add_mcookie(mcookie, ":0", cfg->getOption("xauth_path"),
+      authfile);
 }
 
 char* App::StrConcat(const char* str1, const char* str2) {
Index: slim-1.3.1/switchuser.cpp
===================================================================
--- slim-1.3.1.orig/switchuser.cpp
+++ slim-1.3.1/switchuser.cpp
@@ -10,6 +10,7 @@
 */
 
 #include "switchuser.h"
+#include "util.h"
 
 using namespace std;
 
@@ -53,10 +54,10 @@ void SwitchUser::Execute(const char* cmd
 }
 
 void SwitchUser::SetClientAuth(const char* mcookie) {
-    int r;
+    bool r;
     string home = string(Pw->pw_dir);
     string authfile = home + "/.Xauthority";
     remove(authfile.c_str());
-    string cmd = cfg->getOption("xauth_path") + " -q -f " + authfile + " add :0 . " + mcookie;
-    r = system(cmd.c_str());
+    r = Util::add_mcookie(mcookie, ":0", cfg->getOption("xauth_path"),
+      authfile);
 }
Index: slim-1.3.1/util.cpp
===================================================================
--- /dev/null
+++ slim-1.3.1/util.cpp
@@ -0,0 +1,32 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2009 Eygene Ryabinkin <rea at codelabs.ru>
+
+   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 <stdio.h>
+#include "util.h"
+
+/*
+ * Adds the given cookie to the specified Xauthority file.
+ * Returns true on success, false on fault.
+ */
+bool Util::add_mcookie(const std::string &mcookie, const char *display,
+    const std::string &xauth_cmd, const std::string &authfile)
+{
+	FILE *fp;
+	std::string cmd = xauth_cmd + " -f " + authfile + " -q";
+
+	fp = popen(cmd.c_str(), "w");
+	if (!fp)
+		return false;
+	fprintf(fp, "remove %s\n", display);
+	fprintf(fp, "add %s %s %s\n", display, ".", mcookie.c_str());
+	fprintf(fp, "exit\n");
+
+	pclose(fp);
+	return true;
+}
Index: slim-1.3.1/util.h
===================================================================
--- /dev/null
+++ slim-1.3.1/util.h
@@ -0,0 +1,19 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2009 Eygene Ryabinkin <rea at codelabs.ru>
+
+   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 __UTIL_H__
+#define __UTIL_H__
+
+#include <string>
+
+namespace Util {
+	bool add_mcookie(const std::string &mcookie, const char *display,
+	    const std::string &xauth_cmd, const std::string &authfile);
+};
+
+#endif /* __UTIL_H__ */

slim-1.3.1-fix-insecure-mcookie-generation.patch:
 app.cpp  |   51 +++++++++++++++++++++++++++------------------------
 app.h    |    2 ++
 util.cpp |   37 +++++++++++++++++++++++++++++++++++++
 util.h   |    9 +++++++--
 4 files changed, 73 insertions(+), 26 deletions(-)

--- NEW FILE slim-1.3.1-fix-insecure-mcookie-generation.patch ---
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -129,15 +129,18 @@ void User1Signal(int sig) {
 
 
 #ifdef USE_PAM
-App::App(int argc, char** argv):
-    pam(conv, static_cast<void*>(&LoginPanel)){
+App::App(int argc, char** argv)
+  : pam(conv, static_cast<void*>(&LoginPanel)),
 #else
-App::App(int argc, char** argv){
+App::App(int argc, char** argv)
+  :
 #endif
+    mcookiesize(32)// Must be divisible by 4
+{
     int tmp;
     ServerPID = -1;
     testing = false;
-    mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    mcookie = string(App::mcookiesize, 'a');
     daemonmode = false;
     force_nodaemon = false;
     firstlogin = true;
@@ -1128,13 +1131,13 @@ string App::findValidRandomTheme(const s
         name = name.substr(0, name.length() - 1);
     }
 
-    srandom(getpid()+time(NULL));
+    Util::srandom(Util::makeseed());
 
     vector<string> themes;
     string themefile;
     Cfg::split(themes, name, ',');
     do {
-        int sel = random() % themes.size();
+        int sel = Util::random() % themes.size();
 
         name = Cfg::Trim(themes[sel]);
         themefile = string(THEMESDIR) +"/" + name + THEMESFILE;
@@ -1161,27 +1164,27 @@ void App::replaceVariables(string& input
 }
 
 
+/*
+ * We rely on the fact that all bits generated by Util::random()
+ * are usable, so we are taking full words from its output.
+ */
 void App::CreateServerAuth() {
     /* create mit cookie */
-    int i, r;
-    int hexcount = 0;
-        string authfile;
-    string cmd;
+    uint16_t word;
+    uint8_t hi, lo;
+    int i;
+    string authfile;
     const char *digits = "0123456789abcdef";
-        srand( time(NULL) );
-    for ( i = 0; i < 31; i++ ) {
-        r = rand()%16;
-                mcookie[i] = digits[r];
-                if (r>9)
-                        hexcount++;
-    }
-        /* MIT-COOKIE: even occurrences of digits and hex digits */
-        if ((hexcount%2) == 0) {
-                r = rand()%10;
-        } else {
-                r = rand()%5+10;
-        }
-        mcookie[31] = digits[r];
+    Util::srandom(Util::makeseed());
+    for (i = 0; i < App::mcookiesize; i+=4) {
+        word = Util::random() & 0xffff;
+        lo = word & 0xff;
+        hi = word >> 8;
+        mcookie[i] = digits[lo & 0x0f];
+        mcookie[i+1] = digits[lo >> 4];
+        mcookie[i+2] = digits[hi & 0x0f];
+        mcookie[i+3] = digits[hi >> 4];
+    }
     /* reinitialize auth file */
     authfile = cfg->getOption("authfile");
     remove(authfile.c_str());
Index: slim-1.3.1/app.h
===================================================================
--- slim-1.3.1.orig/app.h
+++ slim-1.3.1/app.h
@@ -101,6 +101,8 @@ private:
     
     std::string themeName;
     std::string mcookie;
+
+    const int mcookiesize;
 };
 
 
Index: slim-1.3.1/util.cpp
===================================================================
--- slim-1.3.1.orig/util.cpp
+++ slim-1.3.1/util.cpp
@@ -7,7 +7,13 @@
    (at your option) any later version.
 */
 
+#include <sys/types.h>
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
 #include "util.h"
 
 /*
@@ -30,3 +36,34 @@ bool Util::add_mcookie(const std::string
 	pclose(fp);
 	return true;
 }
+
+/*
+ * Interface for random number generator.  Just now it uses ordinary
+ * random/srandom routines and serves as a wrapper for them.
+ */
+void Util::srandom(unsigned long seed)
+{
+::srandom(seed);
+}
+
+long Util::random(void)
+{
+return ::random();
+}
+
+/*
+ * Makes seed for the srandom() using "random" values obtained from
+ * getpid(), time(NULL) and others.
+ */
+long Util::makeseed(void)
+{
+struct timespec ts;
+long pid = getpid();
+long tm = time(NULL);
+
+if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
+ts.tv_sec = ts.tv_nsec = 0;
+}
+
+return pid + tm + (ts.tv_sec ^ ts.tv_nsec);
+}
Index: slim-1.3.1/util.h
===================================================================
--- slim-1.3.1.orig/util.h
+++ slim-1.3.1/util.h
@@ -12,8 +12,13 @@
 #include <string>
 
 namespace Util {
-	bool add_mcookie(const std::string &mcookie, const char *display,
-	    const std::string &xauth_cmd, const std::string &authfile);
+  bool add_mcookie(const std::string &mcookie, const char *display,
+		   const std::string &xauth_cmd, const std::string &authfile);
+
+  void srandom(unsigned long seed);
+  long random(void);
+
+  long makeseed(void);
 };
 
 #endif /* __UTIL_H__ */

slim-1.3.1-gcc44.patch:
 app.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE slim-1.3.1-gcc44.patch ---
Index: slim-1.3.1/app.cpp
===================================================================
--- slim-1.3.1.orig/app.cpp
+++ slim-1.3.1/app.cpp
@@ -12,6 +12,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <cstring>


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-12/slim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- slim.spec	10 Oct 2009 13:08:12 -0000	1.18
+++ slim.spec	22 Dec 2009 00:09:37 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -15,13 +15,18 @@ Source3:        slim-fedora.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: Post these patches to upstream BTS
-Patch0:         slim-1.3.1-make.patch
-Patch1:         slim-1.3.1-usexwd.patch
-Patch2:         slim-1.3.1-fedora.patch
-Patch3:         slim-1.3.1-strtol.patch
-Patch4:         slim-1.3.1-remove.patch
-Patch5:         slim-1.3.1-curdir.patch
-Patch6: 	slim-1.3.1-selinux.patch
+Patch0: slim-1.3.1-make.patch
+Patch1: slim-1.3.1-usexwd.patch
+Patch2: slim-1.3.1-fedora.patch
+Patch3: slim-1.3.1-strtol.patch
+Patch4: slim-1.3.1-remove.patch
+Patch5: slim-1.3.1-curdir.patch
+Patch6: slim-1.3.1-selinux.patch
+# This is from Debian, I just added -lrt to LDFLAGS
+Patch7: slim-1.3.1-CVE-2009-1756.patch
+# This one is from Debian, too
+Patch8: slim-1.3.1-fix-insecure-mcookie-generation.patch
+Patch9: slim-1.3.1-gcc44.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -43,7 +48,7 @@ desktop environments.
 SLiM is based on latest stable release of Login.app by Per Lid?n.
 
 In the distribution, slim may be called through a wrapper, slim-dynwm,
-which determines the available window managers using the freedesktop 
+which determines the available window managers using the freedesktop
 information and modifies the slim configuration file accordingly,
 before launching slim.
 
@@ -56,6 +61,9 @@ before launching slim.
 %patch4 -p1 -b .gcc44
 %patch5 -p1 -b .curdir
 %patch6 -p1 -b .selinux
+%patch7 -p1 -b .CVE-2009-1756
+%patch8 -p1 -b .mcookie
+%patch9 -p1 -b .gcc44again
 cp -p %{SOURCE3} README.Fedora
 
 %build
@@ -107,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-9
+- Fix CVE-2009-1756 (bugzilla: 544024)
+- Fix MIT insecure cookie generation (patch from Debian)
+- Fix build with GCC 4.4
+
 * Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
 - Fix BZ #518068
 



From sergiopr at fedoraproject.org  Tue Dec 22 00:13:04 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 22 Dec 2009 00:13:04 +0000 (UTC)
Subject: rpms/blitz/F-12 blitz.spec,1.10,1.11
Message-ID: <20091222001304.A284B11C00CF@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/blitz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30301

Modified Files:
	blitz.spec 
Log Message:
* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-13
- Using pregenerated documentation



Index: blitz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blitz/F-12/blitz.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- blitz.spec	26 Jul 2009 16:51:02 -0000	1.10
+++ blitz.spec	22 Dec 2009 00:13:04 -0000	1.11
@@ -1,6 +1,6 @@
 Name: blitz
 Version: 0.9
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: C++ class library for matrix scientific computing
 
 Group: Development/Libraries
@@ -10,8 +10,6 @@ Source0: http://downloads.sourceforge.ne
 Patch0: blitz-gcc43.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: doxygen graphviz
-
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -91,7 +89,7 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS LEGAL COPYING README LICENSE examples
+%doc examples
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_libdir}/blitz
@@ -102,12 +100,13 @@ fi
 %exclude %{_libdir}/pkgconfig/blitz-uninstalled.pc
 
 %files doc
-%doc AUTHORS LEGAL COPYING README LICENSE
 %defattr(-,root,root,-)
-%doc doc/doxygen/html 
-
+%doc doc/{blitz.pdf,blitz.html,blitz_abt.html,blitz_fot.html,blitz_ovr.html,blitz_toc.html,blitz_1.html,blitz_2.html,blitz_3.html,blitz_4.html,blitz_5.html,blitz_6.html,blitz_7.html,blitz_8.html,blitz_9.html,blitz_10.html,blitz_11.html,blitz_12.html,blitz_13.html,blitz_14.html,blitz_15.html,blitz_16.html,indirect.gif,slice.gif,strideslice.gif,sinsoid.gif,tensor1.gif,blitz.gif,blitztiny.jpg}
 
 %changelog
+* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-13
+- Using pregenerated documentation
+
 * Sun Jul 26 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-12
 - Noarch doc subpackage
 



From airlied at fedoraproject.org  Tue Dec 22 00:16:35 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 22 Dec 2009 00:16:35 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.123,1.124
Message-ID: <20091222001635.DE44711C00CF@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30743

Modified Files:
	comps-f13.xml.in 
Log Message:
add xorg-x11-drv-ati-firmware to the firmware comps



Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- comps-f13.xml.in	21 Dec 2009 17:24:38 -0000	1.123
+++ comps-f13.xml.in	22 Dec 2009 00:16:35 -0000	1.124
@@ -3043,6 +3043,7 @@
       <packagereq type="default">ql2500-firmware</packagereq>
       <packagereq type="default">rt61pci-firmware</packagereq>
       <packagereq type="default">rt73usb-firmware</packagereq>
+      <packagereq type="default">xorg-x11-drv-ati-firmware</packagereq>
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>



From kwright at fedoraproject.org  Tue Dec 22 00:18:33 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 00:18:33 +0000 (UTC)
Subject: rpms/pki-util/EL-5 import.log, NONE, 1.1 pki-util.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222001833.1A82811C00CF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-util/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30993/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-util.spec 
Log Message:
dogtag build for fedora see bugailla 521989




--- NEW FILE import.log ---
pki-util-1_3_0-4_el5:EL-5:pki-util-1.3.0-4.el5.src.rpm:1261441048


--- NEW FILE pki-util.spec ---
Name:           pki-util
Version:        1.3.0
Release:        4%{?dist}
Summary:        Dogtag Certificate System - PKI Utility Framework
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils
BuildRequires:  jss >= 4.2.6
BuildRequires:  ldapjdk
BuildRequires:  osutil
BuildRequires:  xerces-j2

Requires:       java >= 1:1.6.0
Requires:       jpackage-utils
Requires:       jss >= 4.2.6
Requires:       ldapjdk

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag PKI Utility Framework is required by the following four
Dogtag PKI subsystems:

    the Dogtag Certificate Authority,
    the Dogtag Data Recovery Manager,
    the Dogtag Online Certificate Status Protocol Manager, and
    the Dogtag Token Key Service.

%package javadoc
Summary:    Dogtag Certificate System - PKI Utility Framework Javadocs
Group:      Documentation

Requires:   %{name} = %{version}-%{release}

%description javadoc
Dogtag Certificate System - PKI Utility Framework Javadocs

This documentation pertains exclusively to version %{version} of
the Dogtag PKI Utility Framework.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="pki" \
    -Dproduct="util" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}
cd %{buildroot}%{_javadir}/pki
mv cmsutil.jar cmsutil-%{version}.jar
ln -s cmsutil-%{version}.jar cmsutil.jar
mv nsutil.jar nsutil-%{version}.jar
ln -s nsutil-%{version}.jar nsutil.jar

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/pki/

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
- Removed 'with exceptions' from License

* Tue Nov 24 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #521989 - packaging for Fedora Dogtag
- Use "_javadir" macro when appropriate

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #521989 - packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #521989 - packaging for Fedora Dogtag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-util/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:41:47 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:18:32 -0000	1.2
@@ -0,0 +1 @@
+pki-util-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-util/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:41:47 -0000	1.1
+++ sources	22 Dec 2009 00:18:32 -0000	1.2
@@ -0,0 +1 @@
+b103c5125e1ad36414300c53cef4a7a1  pki-util-1.3.0.tar.gz



From mclasen at fedoraproject.org  Tue Dec 22 00:33:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 00:33:54 +0000 (UTC)
Subject: rpms/gtk2/F-12 stackoverflow.patch,NONE,1.1 gtk2.spec,1.443,1.444
Message-ID: <20091222003354.B520911C00CF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32746

Modified Files:
	gtk2.spec 
Added Files:
	stackoverflow.patch 
Log Message:
Fix an infinite recursion


stackoverflow.patch:
 gdkwindow.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE stackoverflow.patch ---
diff -up gtk+-2.18.5/gdk/gdkwindow.c.stackoverflow gtk+-2.18.5/gdk/gdkwindow.c
--- gtk+-2.18.5/gdk/gdkwindow.c.stackoverflow	2009-12-21 19:27:58.326795233 -0500
+++ gtk+-2.18.5/gdk/gdkwindow.c	2009-12-21 19:28:14.602795116 -0500
@@ -1754,7 +1754,7 @@ temporary_disable_extension_events (GdkW
       child = l->data;
 
       if (window->impl_window == child->impl_window)
-	res |= temporary_disable_extension_events (window);
+	res |= temporary_disable_extension_events (child);
     }
 
   return res;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -p -r1.443 -r1.444
--- gtk2.spec	8 Dec 2009 16:49:31 -0000	1.443
+++ gtk2.spec	22 Dec 2009 00:33:52 -0000	1.444
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -48,6 +48,8 @@ Patch15: filesystemref.patch
 Patch16: o-minus.patch
 # from upstream
 Patch17: strftime-format.patch
+# from upstream
+Patch18: stackoverflow.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -171,6 +173,7 @@ This package contains developer document
 %patch15 -p1 -b .filesystemref
 %patch16 -p1 -b .o-minus
 %patch17 -p1 -b .strftime-format
+%patch18 -p1 -b .stackoverflow
 
 %build
 %configure --with-xinput=xfree 		\
@@ -398,6 +401,9 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.5-4
+- Fix an infinite recursion (#548849)
+
 * Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.5-1
 - Update to 2.18.5
 



From kwright at fedoraproject.org  Tue Dec 22 00:43:57 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 00:43:57 +0000 (UTC)
Subject: File dogtag-pki-common-ui-1.3.0.tar.gz uploaded to lookaside cache by
	kwright
Message-ID: <20091222004357.D475510F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for dogtag-pki-common-ui:

edf2aa764eb45df1b788a233b35a119c  dogtag-pki-common-ui-1.3.0.tar.gz



From bpepple at fedoraproject.org  Tue Dec 22 00:45:23 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 22 Dec 2009 00:45:23 +0000 (UTC)
Subject: File empathy-2.29.4.tar.bz2 uploaded to lookaside cache by bpepple
Message-ID: <20091222004523.6226F10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for empathy:

561b5b08f12245f26fa5c1318f739dcc  empathy-2.29.4.tar.bz2



From kwright at fedoraproject.org  Tue Dec 22 00:47:01 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 00:47:01 +0000 (UTC)
Subject: rpms/dogtag-pki-common-ui/F-11 dogtag-pki-common-ui.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222004701.C2B3111C00CF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-common-ui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1773/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	dogtag-pki-common-ui.spec import.log 
Log Message:
dogtag build for fedora see bugzilla: 522204



--- NEW FILE dogtag-pki-common-ui.spec ---
Name:           dogtag-pki-common-ui
Version:        1.3.0
Release:        3%{?dist}
Summary:        Dogtag Certificate System - PKI Common Framework User Interface
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Provides:       pki-common-ui = %{version}.%{release}

Obsoletes:      pki-common-ui < %{version}.%{release}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag PKI Common Framework User Interface contains the graphical
user interface for the Dogtag PKI Common Framework.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="dogtag" \
    -Dproduct.prefix="pki" \
    -Dproduct="common-ui" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/pki/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-3
- Removed 'with exceptions' from License
- Removed Requires bash

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI


--- NEW FILE import.log ---
dogtag-pki-common-ui-1_3_0-3_fc11:F-11:dogtag-pki-common-ui-1.3.0-3.fc11.src.rpm:1261442642


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-common-ui/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:07:59 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:47:01 -0000	1.2
@@ -0,0 +1 @@
+dogtag-pki-common-ui-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-common-ui/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:07:59 -0000	1.1
+++ sources	22 Dec 2009 00:47:01 -0000	1.2
@@ -0,0 +1 @@
+edf2aa764eb45df1b788a233b35a119c  dogtag-pki-common-ui-1.3.0.tar.gz



From kanarip at fedoraproject.org  Tue Dec 22 00:51:55 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:51:55 +0000 (UTC)
Subject: File columnize-0.3.1.gem uploaded to lookaside cache by kanarip
Message-ID: <20091222005155.439CD10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rubygem-columnize:

be4ceeabac3b467229427a786cbfea8d  columnize-0.3.1.gem



From hadess at fedoraproject.org  Tue Dec 22 00:51:57 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Dec 2009 00:51:57 +0000 (UTC)
Subject: File obexd-0.21.tar.gz uploaded to lookaside cache by hadess
Message-ID: <20091222005157.D6AA210F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for obexd:

3f2a7ae4ddca69001a23c034f8b28db6  obexd-0.21.tar.gz



From hadess at fedoraproject.org  Tue Dec 22 00:52:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Dec 2009 00:52:10 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore, 1.19, 1.20 obexd.spec, 1.20, 1.21 sources,
	1.19, 1.20
Message-ID: <20091222005210.3B61511C00CF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2558

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Tue Dec 22 2009 Bastien Nocera <bnocera at redhat.com> 0.21-1
- Update to 0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	9 Dec 2009 14:20:35 -0000	1.19
+++ .cvsignore	22 Dec 2009 00:52:09 -0000	1.20
@@ -1 +1 @@
-obexd-0.20.tar.gz
+obexd-0.21.tar.gz


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- obexd.spec	9 Dec 2009 14:20:36 -0000	1.20
+++ obexd.spec	22 Dec 2009 00:52:09 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		obexd
-Version:	0.20
+Version:	0.21
 Release:	1%{?dist}
 Summary:	D-Bus service for Obex Client access
 
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Tue Dec 22 2009 Bastien Nocera <bnocera at redhat.com> 0.21-1
+- Update to 0.21
+
 * Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.20-1
 - Update to 0.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	9 Dec 2009 14:20:36 -0000	1.19
+++ sources	22 Dec 2009 00:52:10 -0000	1.20
@@ -1 +1 @@
-338277019f2beb0ceb4561f68585a5e4  obexd-0.20.tar.gz
+3f2a7ae4ddca69001a23c034f8b28db6  obexd-0.21.tar.gz



From kanarip at fedoraproject.org  Tue Dec 22 00:52:14 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:52:14 +0000 (UTC)
Subject: rpms/rubygem-columnize/EL-5 import.log, NONE,
	1.1 rubygem-columnize.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005214.65A8611C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-columnize/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2589/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-columnize.spec 
Log Message:
0.3.1-3


--- NEW FILE import.log ---
rubygem-columnize-0_3_1-3_fc12:EL-5:rubygem-columnize-0.3.1-3.fc12.src.rpm:1261443094


--- NEW FILE rubygem-columnize.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname columnize
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Sorts an array in column order
Name:           rubygem-%{gemname}
Version:        0.3.1
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2
URL:            http://rubyforge.org/projects/rocky-hacks/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildRequires:  rubygem(rake)
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Sorts an array in column order

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Fix shebangs
find %{buildroot}/%{geminstdir} -type f -exec sed -r -e 's"^#!(.*)/usr/bin/env ruby"#!/usr/bin/ruby"' {} \;

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

%check
pushd %{buildroot}/%{geminstdir}
rake test
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{gemdir}/doc/%{gemname}-%{version}
%dir %{geminstdir}
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/NEWS
%doc %{geminstdir}/README
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/VERSION
%{geminstdir}/lib/
%{geminstdir}/test/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-3
- Enable %%check

* Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-2
- Fix license

* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-1
- First package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-columnize/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:47:12 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:52:13 -0000	1.2
@@ -0,0 +1 @@
+columnize-0.3.1.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-columnize/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:47:12 -0000	1.1
+++ sources	22 Dec 2009 00:52:14 -0000	1.2
@@ -0,0 +1 @@
+be4ceeabac3b467229427a786cbfea8d  columnize-0.3.1.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:52:52 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:52:52 +0000 (UTC)
Subject: rpms/rubygem-columnize/F-11 import.log, NONE,
	1.1 rubygem-columnize.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005252.DEEEF11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-columnize/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2882/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-columnize.spec 
Log Message:
0.3.1-3


--- NEW FILE import.log ---
rubygem-columnize-0_3_1-3_fc12:F-11:rubygem-columnize-0.3.1-3.fc12.src.rpm:1261443132


--- NEW FILE rubygem-columnize.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname columnize
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Sorts an array in column order
Name:           rubygem-%{gemname}
Version:        0.3.1
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2
URL:            http://rubyforge.org/projects/rocky-hacks/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildRequires:  rubygem(rake)
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Sorts an array in column order

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Fix shebangs
find %{buildroot}/%{geminstdir} -type f -exec sed -r -e 's"^#!(.*)/usr/bin/env ruby"#!/usr/bin/ruby"' {} \;

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

%check
pushd %{buildroot}/%{geminstdir}
rake test
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{gemdir}/doc/%{gemname}-%{version}
%dir %{geminstdir}
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/NEWS
%doc %{geminstdir}/README
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/VERSION
%{geminstdir}/lib/
%{geminstdir}/test/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-3
- Enable %%check

* Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-2
- Fix license

* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-1
- First package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-columnize/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:47:12 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:52:52 -0000	1.2
@@ -0,0 +1 @@
+columnize-0.3.1.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-columnize/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:47:12 -0000	1.1
+++ sources	22 Dec 2009 00:52:52 -0000	1.2
@@ -0,0 +1 @@
+be4ceeabac3b467229427a786cbfea8d  columnize-0.3.1.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:53:31 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:53:31 +0000 (UTC)
Subject: rpms/rubygem-columnize/F-12 import.log, NONE,
	1.1 rubygem-columnize.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005331.DD08F11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-columnize/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3127/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-columnize.spec 
Log Message:
0.3.1-3


--- NEW FILE import.log ---
rubygem-columnize-0_3_1-3_fc12:F-12:rubygem-columnize-0.3.1-3.fc12.src.rpm:1261443170


--- NEW FILE rubygem-columnize.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname columnize
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Sorts an array in column order
Name:           rubygem-%{gemname}
Version:        0.3.1
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2
URL:            http://rubyforge.org/projects/rocky-hacks/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildRequires:  rubygem(rake)
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Sorts an array in column order

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Fix shebangs
find %{buildroot}/%{geminstdir} -type f -exec sed -r -e 's"^#!(.*)/usr/bin/env ruby"#!/usr/bin/ruby"' {} \;

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

%check
pushd %{buildroot}/%{geminstdir}
rake test
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{gemdir}/doc/%{gemname}-%{version}
%dir %{geminstdir}
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/NEWS
%doc %{geminstdir}/README
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/VERSION
%{geminstdir}/lib/
%{geminstdir}/test/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-3
- Enable %%check

* Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-2
- Fix license

* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-1
- First package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-columnize/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:47:12 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:53:31 -0000	1.2
@@ -0,0 +1 @@
+columnize-0.3.1.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-columnize/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:47:12 -0000	1.1
+++ sources	22 Dec 2009 00:53:31 -0000	1.2
@@ -0,0 +1 @@
+be4ceeabac3b467229427a786cbfea8d  columnize-0.3.1.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:54:08 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:54:08 +0000 (UTC)
Subject: rpms/rubygem-columnize/devel import.log, NONE,
	1.1 rubygem-columnize.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005408.69ED611C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-columnize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3420/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-columnize.spec 
Log Message:
0.3.1-3


--- NEW FILE import.log ---
rubygem-columnize-0_3_1-3_fc12:HEAD:rubygem-columnize-0.3.1-3.fc12.src.rpm:1261443208


--- NEW FILE rubygem-columnize.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname columnize
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Sorts an array in column order
Name:           rubygem-%{gemname}
Version:        0.3.1
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2
URL:            http://rubyforge.org/projects/rocky-hacks/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildRequires:  rubygem(rake)
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Sorts an array in column order

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Fix shebangs
find %{buildroot}/%{geminstdir} -type f -exec sed -r -e 's"^#!(.*)/usr/bin/env ruby"#!/usr/bin/ruby"' {} \;

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

%check
pushd %{buildroot}/%{geminstdir}
rake test
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{gemdir}/doc/%{gemname}-%{version}
%dir %{geminstdir}
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/NEWS
%doc %{geminstdir}/README
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/VERSION
%{geminstdir}/lib/
%{geminstdir}/test/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-3
- Enable %%check

* Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-2
- Fix license

* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.3.1-1
- First package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-columnize/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:47:12 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:54:08 -0000	1.2
@@ -0,0 +1 @@
+columnize-0.3.1.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-columnize/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:47:12 -0000	1.1
+++ sources	22 Dec 2009 00:54:08 -0000	1.2
@@ -0,0 +1 @@
+be4ceeabac3b467229427a786cbfea8d  columnize-0.3.1.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:54:10 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:54:10 +0000 (UTC)
Subject: File ruby-net-ldap-0.0.4.gem uploaded to lookaside cache by kanarip
Message-ID: <20091222005410.E703F10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rubygem-ruby-net-ldap:

4182f470cef1f8c6de30703d52526626  ruby-net-ldap-0.0.4.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:54:29 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:54:29 +0000 (UTC)
Subject: rpms/rubygem-ruby-net-ldap/EL-5 import.log, NONE,
	1.1 rubygem-ruby-net-ldap.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005429.2990511C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-ruby-net-ldap/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3656/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ruby-net-ldap.spec 
Log Message:
0.0.4-4


--- NEW FILE import.log ---
rubygem-ruby-net-ldap-0_0_4-4_fc12:EL-5:rubygem-ruby-net-ldap-0.0.4-4.fc12.src.rpm:1261443229


--- NEW FILE rubygem-ruby-net-ldap.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby-net-ldap
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        A full-featured pure-Ruby LDAP client
Name:           rubygem-%{gemname}
Version:        0.0.4
Release:        4%{?dist}
Group:          Development/Languages
License:        GPLv2+
URL:            http://rubyforge.org/projects/net-ldap/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
This project will be the focus of development for a pure Ruby
LDAP environment. A full-featured pure-Ruby LDAP client is now
available.

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force %{SOURCE0}

%check
pushd %{buildroot}/%{geminstdir}/
for file in tests/*.rb; do
    ruby $file || :
done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{gemdir}/doc/%{gemname}-%{version}
%dir %{geminstdir}
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/LICENCE
%doc %{geminstdir}/README
%{geminstdir}/lib
%{geminstdir}/tests
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-4
- Remove obsoletes header

* Tue Nov 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-3
- Fix license

* Sat Nov 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-2
- Review

* Mon Mar 09 2009 Sandro Janke <s.janke at ogd.nl> - 0.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby-net-ldap/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:47:55 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:54:28 -0000	1.2
@@ -0,0 +1 @@
+ruby-net-ldap-0.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby-net-ldap/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:47:55 -0000	1.1
+++ sources	22 Dec 2009 00:54:29 -0000	1.2
@@ -0,0 +1 @@
+4182f470cef1f8c6de30703d52526626  ruby-net-ldap-0.0.4.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:55:06 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:55:06 +0000 (UTC)
Subject: rpms/rubygem-ruby-net-ldap/F-11 import.log, NONE,
	1.1 rubygem-ruby-net-ldap.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005506.563FA11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-ruby-net-ldap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3952/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ruby-net-ldap.spec 
Log Message:
0.0.4-4


--- NEW FILE import.log ---
rubygem-ruby-net-ldap-0_0_4-4_fc12:F-11:rubygem-ruby-net-ldap-0.0.4-4.fc12.src.rpm:1261443266


--- NEW FILE rubygem-ruby-net-ldap.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby-net-ldap
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        A full-featured pure-Ruby LDAP client
Name:           rubygem-%{gemname}
Version:        0.0.4
Release:        4%{?dist}
Group:          Development/Languages
License:        GPLv2+
URL:            http://rubyforge.org/projects/net-ldap/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
This project will be the focus of development for a pure Ruby
LDAP environment. A full-featured pure-Ruby LDAP client is now
available.

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force %{SOURCE0}

%check
pushd %{buildroot}/%{geminstdir}/
for file in tests/*.rb; do
    ruby $file || :
done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{gemdir}/doc/%{gemname}-%{version}
%dir %{geminstdir}
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/LICENCE
%doc %{geminstdir}/README
%{geminstdir}/lib
%{geminstdir}/tests
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-4
- Remove obsoletes header

* Tue Nov 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-3
- Fix license

* Sat Nov 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-2
- Review

* Mon Mar 09 2009 Sandro Janke <s.janke at ogd.nl> - 0.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby-net-ldap/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:47:55 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:55:06 -0000	1.2
@@ -0,0 +1 @@
+ruby-net-ldap-0.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby-net-ldap/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:47:55 -0000	1.1
+++ sources	22 Dec 2009 00:55:06 -0000	1.2
@@ -0,0 +1 @@
+4182f470cef1f8c6de30703d52526626  ruby-net-ldap-0.0.4.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:55:29 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:55:29 +0000 (UTC)
Subject: File linecache-0.43.gem uploaded to lookaside cache by kanarip
Message-ID: <20091222005529.D4DB510F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rubygem-linecache:

3ebb8276bff3e68b16e13be5e1a8677f  linecache-0.43.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:55:43 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:55:43 +0000 (UTC)
Subject: rpms/rubygem-ruby-net-ldap/F-12 import.log, NONE,
	1.1 rubygem-ruby-net-ldap.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005543.43A3311C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-ruby-net-ldap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4346/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ruby-net-ldap.spec 
Log Message:
0.0.4-4


--- NEW FILE import.log ---
rubygem-ruby-net-ldap-0_0_4-4_fc12:F-12:rubygem-ruby-net-ldap-0.0.4-4.fc12.src.rpm:1261443303


--- NEW FILE rubygem-ruby-net-ldap.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby-net-ldap
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        A full-featured pure-Ruby LDAP client
Name:           rubygem-%{gemname}
Version:        0.0.4
Release:        4%{?dist}
Group:          Development/Languages
License:        GPLv2+
URL:            http://rubyforge.org/projects/net-ldap/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
This project will be the focus of development for a pure Ruby
LDAP environment. A full-featured pure-Ruby LDAP client is now
available.

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force %{SOURCE0}

%check
pushd %{buildroot}/%{geminstdir}/
for file in tests/*.rb; do
    ruby $file || :
done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{gemdir}/doc/%{gemname}-%{version}
%dir %{geminstdir}
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/LICENCE
%doc %{geminstdir}/README
%{geminstdir}/lib
%{geminstdir}/tests
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-4
- Remove obsoletes header

* Tue Nov 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-3
- Fix license

* Sat Nov 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-2
- Review

* Mon Mar 09 2009 Sandro Janke <s.janke at ogd.nl> - 0.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby-net-ldap/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:47:55 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:55:42 -0000	1.2
@@ -0,0 +1 @@
+ruby-net-ldap-0.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby-net-ldap/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:47:55 -0000	1.1
+++ sources	22 Dec 2009 00:55:43 -0000	1.2
@@ -0,0 +1 @@
+4182f470cef1f8c6de30703d52526626  ruby-net-ldap-0.0.4.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:55:48 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:55:48 +0000 (UTC)
Subject: rpms/rubygem-linecache/EL-5 import.log, NONE,
	1.1 rubygem-linecache-0.43-trace_nums.so.patch, NONE,
	1.1 rubygem-linecache.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005548.7297711C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-linecache/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4400/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-linecache-0.43-trace_nums.so.patch 
	rubygem-linecache.spec 
Log Message:
0.43-3


--- NEW FILE import.log ---
rubygem-linecache-0_43-3_fc12:EL-5:rubygem-linecache-0.43-3.fc12.src.rpm:1261443308

rubygem-linecache-0.43-trace_nums.so.patch:
 tracelines.rb |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE rubygem-linecache-0.43-trace_nums.so.patch ---
--- lib/tracelines.rb.fedora	2009-11-17 01:58:10.000000000 +0900
+++ lib/tracelines.rb	2009-11-17 02:17:25.000000000 +0900
@@ -9,7 +9,12 @@
     require File.join(@@SRC_DIR, '..', 'ext', 'trace_nums')
   rescue LoadError
     # MSWindows seems to put this in lib rather than ext.
-    require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums')
+    begin
+      require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums')
+    rescue LoadError
+      # Fedora moves trace_nums.so into ruby_sitearch
+      require 'trace_nums.so'
+    end
   end
 
   # Return an array of lines numbers that could be 


--- NEW FILE rubygem-linecache.spec ---
%{!?ruby_sitearch:  %global ruby_sitearch   %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname linecache
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Caches (Ruby source) files
Name:           rubygem-%{gemname}
Version:        0.43
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2
URL:            http://rubyforge.org/projects/rocky-hacks/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Patch0:         rubygem-linecache-0.43-trace_nums.so.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildRequires:  rubygem(rake)
BuildRequires:  ruby-devel
Provides:       rubygem(%{gemname}) = %{version}

%description
Caches (Ruby source) files as might be used in a debugger
or a tool that works with sets of Ruby source files.

%prep
%setup -q -T -c
mkdir -p ./%{gemdir}

%build

%install
rm -rf %{buildroot}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
    --local \
    --install-dir ./%{gemdir} \
    -V --force \
    %{SOURCE0}

mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

mkdir -p %{buildroot}/%{ruby_sitearch}
mv %{buildroot}/%{geminstdir}/lib/trace_nums.so %{buildroot}/%{ruby_sitearch}

pushd %{buildroot}/%{geminstdir}
patch -p0 < %{PATCH0}
popd

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

rm -rf %{buildroot}/%{geminstdir}/ext
#rm -rf %{buildroot}/%{geminstdir}/lib

%check
pushd %{_builddir}/%{name}-%{version}/%{geminstdir}
rake test
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/NEWS
%doc %{geminstdir}/README
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/VERSION
%{geminstdir}/lib
%{geminstdir}/test
%{gemdir}/cache/%{gemname}-%{version}.gem
%{ruby_sitearch}/*.so
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-3
- Fix %%define vs. %%global

* Sat Nov 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-2
- Review

* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-1
- First package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-linecache/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:48:32 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:55:48 -0000	1.2
@@ -0,0 +1 @@
+linecache-0.43.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-linecache/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:48:32 -0000	1.1
+++ sources	22 Dec 2009 00:55:48 -0000	1.2
@@ -0,0 +1 @@
+3ebb8276bff3e68b16e13be5e1a8677f  linecache-0.43.gem



From bpepple at fedoraproject.org  Tue Dec 22 00:56:04 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 22 Dec 2009 00:56:04 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.44, 1.45 empathy.spec, 1.87,
	1.88 sources, 1.44, 1.45
Message-ID: <20091222005604.143F511C00CF@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4659

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Mon Dec 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.29.4-1
- Update to 2.29.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	30 Nov 2009 17:39:07 -0000	1.44
+++ .cvsignore	22 Dec 2009 00:56:03 -0000	1.45
@@ -1 +1 @@
-empathy-2.29.3.tar.bz2
+empathy-2.29.4.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- empathy.spec	30 Nov 2009 17:39:07 -0000	1.87
+++ empathy.spec	22 Dec 2009 00:56:03 -0000	1.88
@@ -11,7 +11,7 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.29.3
+Version:	2.29.4
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -168,6 +168,9 @@ fi
 %{_mandir}/man1/empathy*.1.gz
 
 %changelog
+* Mon Dec 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.29.4-1
+- Update to 2.29.4.
+
 * Mon Nov 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.29.3-1
 - Update to 2.29.3.
 - Drop nautilus sendto plugin linking patch. Fixed upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	30 Nov 2009 17:39:07 -0000	1.44
+++ sources	22 Dec 2009 00:56:03 -0000	1.45
@@ -1 +1 @@
-b2ea05a8382b4073a7a0a48b3db0078c  empathy-2.29.3.tar.bz2
+561b5b08f12245f26fa5c1318f739dcc  empathy-2.29.4.tar.bz2



From kanarip at fedoraproject.org  Tue Dec 22 00:56:21 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:56:21 +0000 (UTC)
Subject: rpms/rubygem-ruby-net-ldap/devel import.log, NONE,
	1.1 rubygem-ruby-net-ldap.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005621.43CC311C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-ruby-net-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4967/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-ruby-net-ldap.spec 
Log Message:
0.0.4-4


--- NEW FILE import.log ---
rubygem-ruby-net-ldap-0_0_4-4_fc12:HEAD:rubygem-ruby-net-ldap-0.0.4-4.fc12.src.rpm:1261443341


--- NEW FILE rubygem-ruby-net-ldap.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname ruby-net-ldap
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        A full-featured pure-Ruby LDAP client
Name:           rubygem-%{gemname}
Version:        0.0.4
Release:        4%{?dist}
Group:          Development/Languages
License:        GPLv2+
URL:            http://rubyforge.org/projects/net-ldap/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
This project will be the focus of development for a pure Ruby
LDAP environment. A full-featured pure-Ruby LDAP client is now
available.

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force %{SOURCE0}

%check
pushd %{buildroot}/%{geminstdir}/
for file in tests/*.rb; do
    ruby $file || :
done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc %{gemdir}/doc/%{gemname}-%{version}
%dir %{geminstdir}
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/LICENCE
%doc %{geminstdir}/README
%{geminstdir}/lib
%{geminstdir}/tests
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-4
- Remove obsoletes header

* Tue Nov 17 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-3
- Fix license

* Sat Nov 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.0.4-2
- Review

* Mon Mar 09 2009 Sandro Janke <s.janke at ogd.nl> - 0.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby-net-ldap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:47:55 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:56:20 -0000	1.2
@@ -0,0 +1 @@
+ruby-net-ldap-0.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ruby-net-ldap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:47:55 -0000	1.1
+++ sources	22 Dec 2009 00:56:21 -0000	1.2
@@ -0,0 +1 @@
+4182f470cef1f8c6de30703d52526626  ruby-net-ldap-0.0.4.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:56:28 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:56:28 +0000 (UTC)
Subject: rpms/rubygem-linecache/F-11 import.log, NONE,
	1.1 rubygem-linecache-0.43-trace_nums.so.patch, NONE,
	1.1 rubygem-linecache.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005628.ED20B11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-linecache/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5058/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-linecache-0.43-trace_nums.so.patch 
	rubygem-linecache.spec 
Log Message:
0.43-3


--- NEW FILE import.log ---
rubygem-linecache-0_43-3_fc12:F-11:rubygem-linecache-0.43-3.fc12.src.rpm:1261443348

rubygem-linecache-0.43-trace_nums.so.patch:
 tracelines.rb |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE rubygem-linecache-0.43-trace_nums.so.patch ---
--- lib/tracelines.rb.fedora	2009-11-17 01:58:10.000000000 +0900
+++ lib/tracelines.rb	2009-11-17 02:17:25.000000000 +0900
@@ -9,7 +9,12 @@
     require File.join(@@SRC_DIR, '..', 'ext', 'trace_nums')
   rescue LoadError
     # MSWindows seems to put this in lib rather than ext.
-    require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums')
+    begin
+      require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums')
+    rescue LoadError
+      # Fedora moves trace_nums.so into ruby_sitearch
+      require 'trace_nums.so'
+    end
   end
 
   # Return an array of lines numbers that could be 


--- NEW FILE rubygem-linecache.spec ---
%{!?ruby_sitearch:  %global ruby_sitearch   %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname linecache
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Caches (Ruby source) files
Name:           rubygem-%{gemname}
Version:        0.43
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2
URL:            http://rubyforge.org/projects/rocky-hacks/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Patch0:         rubygem-linecache-0.43-trace_nums.so.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildRequires:  rubygem(rake)
BuildRequires:  ruby-devel
Provides:       rubygem(%{gemname}) = %{version}

%description
Caches (Ruby source) files as might be used in a debugger
or a tool that works with sets of Ruby source files.

%prep
%setup -q -T -c
mkdir -p ./%{gemdir}

%build

%install
rm -rf %{buildroot}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
    --local \
    --install-dir ./%{gemdir} \
    -V --force \
    %{SOURCE0}

mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

mkdir -p %{buildroot}/%{ruby_sitearch}
mv %{buildroot}/%{geminstdir}/lib/trace_nums.so %{buildroot}/%{ruby_sitearch}

pushd %{buildroot}/%{geminstdir}
patch -p0 < %{PATCH0}
popd

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

rm -rf %{buildroot}/%{geminstdir}/ext
#rm -rf %{buildroot}/%{geminstdir}/lib

%check
pushd %{_builddir}/%{name}-%{version}/%{geminstdir}
rake test
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/NEWS
%doc %{geminstdir}/README
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/VERSION
%{geminstdir}/lib
%{geminstdir}/test
%{gemdir}/cache/%{gemname}-%{version}.gem
%{ruby_sitearch}/*.so
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-3
- Fix %%define vs. %%global

* Sat Nov 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-2
- Review

* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-1
- First package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-linecache/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:48:32 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:56:28 -0000	1.2
@@ -0,0 +1 @@
+linecache-0.43.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-linecache/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:48:32 -0000	1.1
+++ sources	22 Dec 2009 00:56:28 -0000	1.2
@@ -0,0 +1 @@
+3ebb8276bff3e68b16e13be5e1a8677f  linecache-0.43.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:57:10 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:57:10 +0000 (UTC)
Subject: rpms/rubygem-linecache/F-12 import.log, NONE,
	1.1 rubygem-linecache-0.43-trace_nums.so.patch, NONE,
	1.1 rubygem-linecache.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005710.A973C11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-linecache/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5475/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-linecache-0.43-trace_nums.so.patch 
	rubygem-linecache.spec 
Log Message:
0.43-3


--- NEW FILE import.log ---
rubygem-linecache-0_43-3_fc12:F-12:rubygem-linecache-0.43-3.fc12.src.rpm:1261443390

rubygem-linecache-0.43-trace_nums.so.patch:
 tracelines.rb |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE rubygem-linecache-0.43-trace_nums.so.patch ---
--- lib/tracelines.rb.fedora	2009-11-17 01:58:10.000000000 +0900
+++ lib/tracelines.rb	2009-11-17 02:17:25.000000000 +0900
@@ -9,7 +9,12 @@
     require File.join(@@SRC_DIR, '..', 'ext', 'trace_nums')
   rescue LoadError
     # MSWindows seems to put this in lib rather than ext.
-    require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums')
+    begin
+      require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums')
+    rescue LoadError
+      # Fedora moves trace_nums.so into ruby_sitearch
+      require 'trace_nums.so'
+    end
   end
 
   # Return an array of lines numbers that could be 


--- NEW FILE rubygem-linecache.spec ---
%{!?ruby_sitearch:  %global ruby_sitearch   %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname linecache
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Caches (Ruby source) files
Name:           rubygem-%{gemname}
Version:        0.43
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2
URL:            http://rubyforge.org/projects/rocky-hacks/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Patch0:         rubygem-linecache-0.43-trace_nums.so.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildRequires:  rubygem(rake)
BuildRequires:  ruby-devel
Provides:       rubygem(%{gemname}) = %{version}

%description
Caches (Ruby source) files as might be used in a debugger
or a tool that works with sets of Ruby source files.

%prep
%setup -q -T -c
mkdir -p ./%{gemdir}

%build

%install
rm -rf %{buildroot}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
    --local \
    --install-dir ./%{gemdir} \
    -V --force \
    %{SOURCE0}

mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

mkdir -p %{buildroot}/%{ruby_sitearch}
mv %{buildroot}/%{geminstdir}/lib/trace_nums.so %{buildroot}/%{ruby_sitearch}

pushd %{buildroot}/%{geminstdir}
patch -p0 < %{PATCH0}
popd

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

rm -rf %{buildroot}/%{geminstdir}/ext
#rm -rf %{buildroot}/%{geminstdir}/lib

%check
pushd %{_builddir}/%{name}-%{version}/%{geminstdir}
rake test
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/NEWS
%doc %{geminstdir}/README
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/VERSION
%{geminstdir}/lib
%{geminstdir}/test
%{gemdir}/cache/%{gemname}-%{version}.gem
%{ruby_sitearch}/*.so
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-3
- Fix %%define vs. %%global

* Sat Nov 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-2
- Review

* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-1
- First package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-linecache/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:48:32 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:57:10 -0000	1.2
@@ -0,0 +1 @@
+linecache-0.43.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-linecache/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:48:32 -0000	1.1
+++ sources	22 Dec 2009 00:57:10 -0000	1.2
@@ -0,0 +1 @@
+3ebb8276bff3e68b16e13be5e1a8677f  linecache-0.43.gem



From kanarip at fedoraproject.org  Tue Dec 22 00:57:51 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 00:57:51 +0000 (UTC)
Subject: rpms/rubygem-linecache/devel import.log, NONE,
	1.1 rubygem-linecache-0.43-trace_nums.so.patch, NONE,
	1.1 rubygem-linecache.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222005751.3688E11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-linecache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5778/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-linecache-0.43-trace_nums.so.patch 
	rubygem-linecache.spec 
Log Message:
0.43-3


--- NEW FILE import.log ---
rubygem-linecache-0_43-3_fc12:HEAD:rubygem-linecache-0.43-3.fc12.src.rpm:1261443430

rubygem-linecache-0.43-trace_nums.so.patch:
 tracelines.rb |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE rubygem-linecache-0.43-trace_nums.so.patch ---
--- lib/tracelines.rb.fedora	2009-11-17 01:58:10.000000000 +0900
+++ lib/tracelines.rb	2009-11-17 02:17:25.000000000 +0900
@@ -9,7 +9,12 @@
     require File.join(@@SRC_DIR, '..', 'ext', 'trace_nums')
   rescue LoadError
     # MSWindows seems to put this in lib rather than ext.
-    require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums')
+    begin
+      require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums')
+    rescue LoadError
+      # Fedora moves trace_nums.so into ruby_sitearch
+      require 'trace_nums.so'
+    end
   end
 
   # Return an array of lines numbers that could be 


--- NEW FILE rubygem-linecache.spec ---
%{!?ruby_sitearch:  %global ruby_sitearch   %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname linecache
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Caches (Ruby source) files
Name:           rubygem-%{gemname}
Version:        0.43
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2
URL:            http://rubyforge.org/projects/rocky-hacks/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Patch0:         rubygem-linecache-0.43-trace_nums.so.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildRequires:  rubygem(rake)
BuildRequires:  ruby-devel
Provides:       rubygem(%{gemname}) = %{version}

%description
Caches (Ruby source) files as might be used in a debugger
or a tool that works with sets of Ruby source files.

%prep
%setup -q -T -c
mkdir -p ./%{gemdir}

%build

%install
rm -rf %{buildroot}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
    --local \
    --install-dir ./%{gemdir} \
    -V --force \
    %{SOURCE0}

mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

mkdir -p %{buildroot}/%{ruby_sitearch}
mv %{buildroot}/%{geminstdir}/lib/trace_nums.so %{buildroot}/%{ruby_sitearch}

pushd %{buildroot}/%{geminstdir}
patch -p0 < %{PATCH0}
popd

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

rm -rf %{buildroot}/%{geminstdir}/ext
#rm -rf %{buildroot}/%{geminstdir}/lib

%check
pushd %{_builddir}/%{name}-%{version}/%{geminstdir}
rake test
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/ChangeLog
%doc %{geminstdir}/NEWS
%doc %{geminstdir}/README
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/VERSION
%{geminstdir}/lib
%{geminstdir}/test
%{gemdir}/cache/%{gemname}-%{version}.gem
%{ruby_sitearch}/*.so
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Dec 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-3
- Fix %%define vs. %%global

* Sat Nov 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-2
- Review

* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 0.43-1
- First package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-linecache/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:48:32 -0000	1.1
+++ .cvsignore	22 Dec 2009 00:57:50 -0000	1.2
@@ -0,0 +1 @@
+linecache-0.43.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-linecache/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:48:32 -0000	1.1
+++ sources	22 Dec 2009 00:57:51 -0000	1.2
@@ -0,0 +1 @@
+3ebb8276bff3e68b16e13be5e1a8677f  linecache-0.43.gem



From nushio at fedoraproject.org  Tue Dec 22 01:28:35 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Tue, 22 Dec 2009 01:28:35 +0000 (UTC)
Subject: File gnome-do-plugins-0.8.2.1.tar.gz uploaded to lookaside cache by
	nushio
Message-ID: <20091222012835.09BDA10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-do-plugins:

32b88c062209e5b107602ccc5df285e7  gnome-do-plugins-0.8.2.1.tar.gz



From nushio at fedoraproject.org  Tue Dec 22 01:29:14 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Tue, 22 Dec 2009 01:29:14 +0000 (UTC)
Subject: rpms/gnome-do-plugins/devel gnome-do-plugins-thunderbird.patch, NONE, 
	1.1 .cvsignore, 1.2, 1.3 gnome-do-plugins.spec, 1.8, 1.9 sources,
	1.3, 1.4
Message-ID: <20091222012914.5880211C00CF@cvs1.fedora.phx.redhat.com>

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9952

Modified Files:
	.cvsignore gnome-do-plugins.spec sources 
Added Files:
	gnome-do-plugins-thunderbird.patch 
Log Message:


gnome-do-plugins-thunderbird.patch:
 ThunderbirdContactItemSource.cs.fix |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnome-do-plugins-thunderbird.patch ---
diff -up gnome-do-plugins-0.8.2.1/Thunderbird/src/ThunderbirdContactItemSource.cs Thunderbird/src/ThunderbirdContactItemSource.cs.fix > gnome-do-plugins-thunderbird.patch
--- gnome-do-plugins-0.8.2.1/Thunderbird/src/ThunderbirdContactItemSource.cs	2009-10-12 15:30:04.288395070 -0500
+++ gnome-do-plugins-0.8.2.1Thunderbird/src/ThunderbirdContactItemSource.cs.fix	2009-12-21 19:06:23.757517057 -0600
@@ -128,7 +128,7 @@ namespace Do.Addins.Thunderbird
 
 			profile = null;
 			home = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
-			path = System.IO.Path.Combine (home, ".mozilla-thunderbird/profiles.ini");
+			path = System.IO.Path.Combine (home, ".thunderbird/profiles.ini");
 			try {
 				reader = System.IO.File.OpenText (path);
 			} catch {
@@ -152,7 +152,7 @@ namespace Do.Addins.Thunderbird
 			if (profile == null) {
 				return null;
 			}
-			path = System.IO.Path.Combine (home, ".mozilla-thunderbird");
+			path = System.IO.Path.Combine (home, ".thunderbird");
 			path = System.IO.Path.Combine (path, profile);
 			path = System.IO.Path.Combine (path, "abook.mab");
 			return path;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Aug 2009 04:17:06 -0000	1.2
+++ .cvsignore	22 Dec 2009 01:29:13 -0000	1.3
@@ -1 +1 @@
-gnome-do-plugins-0.8.2.tar.gz
+gnome-do-plugins-0.8.2.1.tar.gz


Index: gnome-do-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/gnome-do-plugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnome-do-plugins.spec	26 Oct 2009 20:28:11 -0000	1.8
+++ gnome-do-plugins.spec	22 Dec 2009 01:29:13 -0000	1.9
@@ -1,15 +1,17 @@
 %define         debug_package %{nil}
 
 Name:           gnome-do-plugins
-Version:        0.8.2
-Release:        3%{?dist}
+Version:        0.8.2.1
+Release:        1%{?dist}
 Summary:        Plugins for GNOME Do
 Group:          Applications/Productivity
 License:        GPLv3+
 URL:            http://do.davebsd.com
 Source0:        http://edge.launchpad.net/do-plugins/0.8/%{version}/+download/%{name}-%{version}.tar.gz
-# Local patch to put the plugins in the correct directory
-#Patch0: gnome-do-plugins-plugindir.patch
+
+# Fixes Thunderbird 3.0 contacts
+Patch0: gnome-do-plugins-thunderbird.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel ndesk-dbus-glib-devel gnome-do-devel
@@ -176,7 +178,7 @@ gnome-do plugins for vinagre
 
 %prep
 %setup -q
-#patch0 -p1 -b .pldir
+%patch0 -p1 -b .thunderbird
 # build.rules.mk is imported into 70+ Makefile.in's
 # by Makefile.am.  Run autoreconf to regenerate the
 # Makefile.in's 
@@ -289,6 +291,10 @@ rm -rf %{buildroot}
 %{_libdir}/gnome-do/plugins/*
 
 %changelog
+* Mon Dec 21 2009 Juan Rodriguez <nushio at fedoraproject.org> 0.8.2.1-1
+- Updates to 0.8.2.1
+- Fixes gnome-do-plugins-thunderbird for Thunderbird 3.0
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.2-3
 - ExcludeArch ppc ppc64 sparc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Aug 2009 04:17:07 -0000	1.3
+++ sources	22 Dec 2009 01:29:13 -0000	1.4
@@ -1 +1 @@
-6e79a666619aae1b1e2916f0fe364d94  gnome-do-plugins-0.8.2.tar.gz
+32b88c062209e5b107602ccc5df285e7  gnome-do-plugins-0.8.2.1.tar.gz



From rdieter at fedoraproject.org  Tue Dec 22 01:30:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Dec 2009 01:30:04 +0000 (UTC)
Subject: rpms/kpackagekit/devel .cvsignore, 1.16, 1.17 kpackagekit.spec, 1.48, 
	1.49 sources, 1.25, 1.26 KpKIcons.patch, 1.1,
	NONE KpKStrings.patch, 1.1,
	NONE kpackagekit-0.5.0-defaults_hacks.patch, 1.1,
	NONE kpackagekit-InitialPreference.patch, 1.2, NONE
Message-ID: <20091222013004.8DAC911C0337@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10261

Modified Files:
	.cvsignore kpackagekit.spec sources 
Removed Files:
	KpKIcons.patch KpKStrings.patch 
	kpackagekit-0.5.0-defaults_hacks.patch 
	kpackagekit-InitialPreference.patch 
Log Message:
sync from F-12 branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	31 Oct 2009 22:27:57 -0000	1.16
+++ .cvsignore	22 Dec 2009 01:30:03 -0000	1.17
@@ -1 +1 @@
-kpackagekit-0.5.0.3.tar.bz2
+kpackagekit-0.5.2.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- kpackagekit.spec	18 Nov 2009 16:52:45 -0000	1.48
+++ kpackagekit.spec	22 Dec 2009 01:30:04 -0000	1.49
@@ -1,22 +1,20 @@
 
-%define pk_version 0.5.3
+%define pk_version 0.5.5
 
 Name:	  	kpackagekit
-Version:	0.5.1.1
-Release:	1%{?dist}
+Version:	0.5.2
+Release:	2%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
 Group:		Applications/System
 #Source0:	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
-Source0:	kpackagekit-0.5.1.1.tar.bz2
+Source0:	kpackagekit-0.5.2.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Hacks to smash kpackagekit: daily/none default (#469375)
 Patch50: kpackagekit-0.5.1-defaults_hacks.patch
-Patch51: KpKStrings.patch
-Patch52: KpKIcons.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -36,9 +34,6 @@ KDE interface for PackageKit.
 %setup -q -n %{name}-%{version}
 
 %patch50  -p1 -b .defaults_hacks
-%patch51 -p1 -b .strings
-%patch52 -p1 -b .icons
-
 
 %build
 mkdir -p %{_target_platform}
@@ -78,9 +73,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/kpackagekit/
 %{_kde4_appsdir}/KPackageKitSmartIcon/
 %{_datadir}/dbus-1/services/org.kde.KPackageKitSmartIcon.service
-
+%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 
 %changelog
+* Thu Dec 10 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.2-2
+- Clean up spec file 
+
+* Mon Dec 07 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.2-1
+- New upstream release
+
+* Thu Nov 19 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.1.1-2
+- Remove no longer need patches
+
 * Tue Nov 17 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.1.1-1
 - New upstream release fixes #531447, #533755, #536930
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	18 Nov 2009 16:52:45 -0000	1.25
+++ sources	22 Dec 2009 01:30:04 -0000	1.26
@@ -1 +1 @@
-a370aeeac0fee51b43ea11b74e8f59b8  kpackagekit-0.5.1.1.tar.bz2
+f8ea07be333aad9448a686a57453f080  kpackagekit-0.5.2.tar.bz2


--- KpKIcons.patch DELETED ---


--- KpKStrings.patch DELETED ---


--- kpackagekit-0.5.0-defaults_hacks.patch DELETED ---


--- kpackagekit-InitialPreference.patch DELETED ---



From kanarip at fedoraproject.org  Tue Dec 22 01:33:12 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:33:12 +0000 (UTC)
Subject: File git-1.2.5.gem uploaded to lookaside cache by kanarip
Message-ID: <20091222013312.E6A7D10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rubygem-git:

3506583cd89c17530dc1c6bf498b4e91  git-1.2.5.gem



From kanarip at fedoraproject.org  Tue Dec 22 01:33:28 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:33:28 +0000 (UTC)
Subject: rpms/rubygem-git/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 rubygem-git.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091222013328.5770B11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-git/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11182/EL-5

Modified Files:
	.cvsignore import.log rubygem-git.spec sources 
Log Message:
1.2.5-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2008 23:36:07 -0000	1.2
+++ .cvsignore	22 Dec 2009 01:33:27 -0000	1.3
@@ -1 +1 @@
-ruby-git-1.0.7.tar.gz
+git-1.2.5.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 Oct 2008 23:58:38 -0000	1.2
+++ import.log	22 Dec 2009 01:33:28 -0000	1.3
@@ -1,2 +1,3 @@
 rubygem-git-1_0_7-3_fc10:EL-5:rubygem-git-1.0.7-3.fc10.src.rpm:1222904056
 rubygem-git-1_0_7-5_fc9:EL-5:rubygem-git-1.0.7-5.fc9.src.rpm:1225151900
+rubygem-git-1_2_5-1_fc12:EL-5:rubygem-git-1.2.5-1.fc12.src.rpm:1261445568


Index: rubygem-git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/EL-5/rubygem-git.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-git.spec	27 Oct 2008 23:58:38 -0000	1.2
+++ rubygem-git.spec	22 Dec 2009 01:33:28 -0000	1.3
@@ -5,15 +5,15 @@
 
 Summary:        A package for using Git in Ruby code
 Name:           rubygem-%{gemname}
-Version:        1.0.7
-Release:        5%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://rubyforge.org/projects/git/
-Source0:        http://rubyforge.org/frs/download.php/37828/ruby-git-1.0.7.tar.gz
+Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       rubygems
-Requires:	ruby(abi) = 1.8
+Requires:       ruby(abi) = 1.8
 BuildRequires:  rubygems
 BuildRequires:  rubygem-rake
 BuildArch:      noarch
@@ -23,30 +23,38 @@ Provides:       rubygem(%{gemname}) = %{
 A package for using Git in Ruby code.
 
 %prep
-%setup -q -c
 
 %build
-rake package
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --rdoc pkg/%{gemname}-%{version}.gem
+            --force --rdoc %{SOURCE0}
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%{gemdir}/gems/%{gemname}-%{version}/
-%doc LICENSE README TODO History.txt
+%dir %{geminstdir}
+%doc %{geminstdir}/README
 %doc %{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/lib
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 
 %changelog
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.2.5-1
+- New upstream version
+
+* Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.2.4-1
+- New upstream version
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 02 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.0.7-4
 - Fix %%doc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2008 23:36:07 -0000	1.2
+++ sources	22 Dec 2009 01:33:28 -0000	1.3
@@ -1 +1 @@
-bf5332bce59ff07e6dab7e03b7c169fc  ruby-git-1.0.7.tar.gz
+3506583cd89c17530dc1c6bf498b4e91  git-1.2.5.gem



From kanarip at fedoraproject.org  Tue Dec 22 01:34:02 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:34:02 +0000 (UTC)
Subject: rpms/rubygem-git/F-11 .cvsignore, 1.3, 1.4 import.log, 1.3,
	1.4 rubygem-git.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091222013402.2639D11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-git/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11403/F-11

Modified Files:
	.cvsignore import.log rubygem-git.spec sources 
Log Message:
1.2.5-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Oct 2009 21:19:30 -0000	1.3
+++ .cvsignore	22 Dec 2009 01:34:01 -0000	1.4
@@ -1 +1 @@
-git-1.2.4.gem
+git-1.2.5.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	19 Oct 2009 21:19:30 -0000	1.3
+++ import.log	22 Dec 2009 01:34:01 -0000	1.4
@@ -1,3 +1,4 @@
 rubygem-git-1_0_7-3_fc10:HEAD:rubygem-git-1.0.7-3.fc10.src.rpm:1222903823
 rubygem-git-1_0_7-4_fc9:HEAD:rubygem-git-1.0.7-4.fc9.src.rpm:1222906631
 rubygem-git-1_2_4-1_fc12:F-11:rubygem-git-1.2.4-1.fc12.src.rpm:1255987154
+rubygem-git-1_2_5-1_fc12:F-11:rubygem-git-1.2.5-1.fc12.src.rpm:1261445602


Index: rubygem-git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-11/rubygem-git.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rubygem-git.spec	19 Oct 2009 21:19:30 -0000	1.4
+++ rubygem-git.spec	22 Dec 2009 01:34:01 -0000	1.5
@@ -5,7 +5,7 @@
 
 Summary:        A package for using Git in Ruby code
 Name:           rubygem-%{gemname}
-Version:        1.2.4
+Version:        1.2.5
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.2.5-1
+- New upstream version
+
 * Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.2.4-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Oct 2009 21:19:30 -0000	1.3
+++ sources	22 Dec 2009 01:34:02 -0000	1.4
@@ -1 +1 @@
-bc6646f81862bdc3bc22c5d8eb5ba0ba  git-1.2.4.gem
+3506583cd89c17530dc1c6bf498b4e91  git-1.2.5.gem



From kanarip at fedoraproject.org  Tue Dec 22 01:34:36 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:34:36 +0000 (UTC)
Subject: rpms/rubygem-git/F-12 .cvsignore, 1.3, 1.4 import.log, 1.3,
	1.4 rubygem-git.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091222013436.C8D1411C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-git/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11618/F-12

Modified Files:
	.cvsignore import.log rubygem-git.spec sources 
Log Message:
1.2.5-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Oct 2009 21:18:45 -0000	1.3
+++ .cvsignore	22 Dec 2009 01:34:36 -0000	1.4
@@ -1 +1 @@
-git-1.2.4.gem
+git-1.2.5.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	19 Oct 2009 21:18:45 -0000	1.3
+++ import.log	22 Dec 2009 01:34:36 -0000	1.4
@@ -1,3 +1,4 @@
 rubygem-git-1_0_7-3_fc10:HEAD:rubygem-git-1.0.7-3.fc10.src.rpm:1222903823
 rubygem-git-1_0_7-4_fc9:HEAD:rubygem-git-1.0.7-4.fc9.src.rpm:1222906631
 rubygem-git-1_2_4-1_fc12:F-12:rubygem-git-1.2.4-1.fc12.src.rpm:1255987109
+rubygem-git-1_2_5-1_fc12:F-12:rubygem-git-1.2.5-1.fc12.src.rpm:1261445636


Index: rubygem-git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-12/rubygem-git.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-git.spec	19 Oct 2009 21:18:45 -0000	1.5
+++ rubygem-git.spec	22 Dec 2009 01:34:36 -0000	1.6
@@ -5,7 +5,7 @@
 
 Summary:        A package for using Git in Ruby code
 Name:           rubygem-%{gemname}
-Version:        1.2.4
+Version:        1.2.5
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.2.5-1
+- New upstream version
+
 * Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.2.4-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Oct 2009 21:18:45 -0000	1.3
+++ sources	22 Dec 2009 01:34:36 -0000	1.4
@@ -1 +1 @@
-bc6646f81862bdc3bc22c5d8eb5ba0ba  git-1.2.4.gem
+3506583cd89c17530dc1c6bf498b4e91  git-1.2.5.gem



From kanarip at fedoraproject.org  Tue Dec 22 01:35:10 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:35:10 +0000 (UTC)
Subject: rpms/rubygem-git/devel .cvsignore, 1.3, 1.4 import.log, 1.3,
	1.4 rubygem-git.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091222013510.D604F11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11813/devel

Modified Files:
	.cvsignore import.log rubygem-git.spec sources 
Log Message:
1.2.5-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Oct 2009 21:18:04 -0000	1.3
+++ .cvsignore	22 Dec 2009 01:35:10 -0000	1.4
@@ -1 +1 @@
-git-1.2.4.gem
+git-1.2.5.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	19 Oct 2009 21:18:05 -0000	1.3
+++ import.log	22 Dec 2009 01:35:10 -0000	1.4
@@ -1,3 +1,4 @@
 rubygem-git-1_0_7-3_fc10:HEAD:rubygem-git-1.0.7-3.fc10.src.rpm:1222903823
 rubygem-git-1_0_7-4_fc9:HEAD:rubygem-git-1.0.7-4.fc9.src.rpm:1222906631
 rubygem-git-1_2_4-1_fc12:HEAD:rubygem-git-1.2.4-1.fc12.src.rpm:1255987072
+rubygem-git-1_2_5-1_fc12:HEAD:rubygem-git-1.2.5-1.fc12.src.rpm:1261445670


Index: rubygem-git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/devel/rubygem-git.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-git.spec	19 Oct 2009 21:18:05 -0000	1.5
+++ rubygem-git.spec	22 Dec 2009 01:35:10 -0000	1.6
@@ -5,7 +5,7 @@
 
 Summary:        A package for using Git in Ruby code
 Name:           rubygem-%{gemname}
-Version:        1.2.4
+Version:        1.2.5
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.2.5-1
+- New upstream version
+
 * Wed Oct 14 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.2.4-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Oct 2009 21:18:05 -0000	1.3
+++ sources	22 Dec 2009 01:35:10 -0000	1.4
@@ -1 +1 @@
-bc6646f81862bdc3bc22c5d8eb5ba0ba  git-1.2.4.gem
+3506583cd89c17530dc1c6bf498b4e91  git-1.2.5.gem



From kanarip at fedoraproject.org  Tue Dec 22 01:37:37 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:37:37 +0000 (UTC)
Subject: File highline-1.5.1.tgz uploaded to lookaside cache by kanarip
Message-ID: <20091222013737.5756B10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rubygem-highline:

23d9221b5ffd55e5af35f5aa90590c57  highline-1.5.1.tgz



From kanarip at fedoraproject.org  Tue Dec 22 01:37:52 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:37:52 +0000 (UTC)
Subject: rpms/rubygem-highline/F-12 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 rubygem-highline.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091222013752.CD13C11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-highline/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12358/F-12

Modified Files:
	.cvsignore import.log rubygem-highline.spec sources 
Log Message:
1.5.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-highline/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Mar 2009 11:50:57 -0000	1.3
+++ .cvsignore	22 Dec 2009 01:37:52 -0000	1.4
@@ -1 +1 @@
-highline-1.5.0.tgz
+highline-1.5.1.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-highline/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	16 Mar 2009 11:50:58 -0000	1.2
+++ import.log	22 Dec 2009 01:37:52 -0000	1.3
@@ -1,2 +1,3 @@
 rubygem-highline-1_4_0-2_fc10:HEAD:rubygem-highline-1.4.0-2.fc10.src.rpm:1222904553
 rubygem-highline-1_5_0-1_fc10:HEAD:rubygem-highline-1.5.0-1.fc10.src.rpm:1237204240
+rubygem-highline-1_5_1-1_fc12:F-12:rubygem-highline-1.5.1-1.fc12.src.rpm:1261445832


Index: rubygem-highline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-highline/F-12/rubygem-highline.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rubygem-highline.spec	27 Jul 2009 03:30:36 -0000	1.4
+++ rubygem-highline.spec	22 Dec 2009 01:37:52 -0000	1.5
@@ -1,13 +1,12 @@
-# Generated from highline-1.4.0.gem by gem2rpm -*- rpm-spec -*-
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname highline
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname highline
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
 Summary:        HighLine is a high-level command-line IO library
 Name:           rubygem-%{gemname}
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        GPLv2+ or Ruby
 URL:            http://highline.rubyforge.org
@@ -78,6 +77,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.1-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-highline/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Mar 2009 11:50:58 -0000	1.3
+++ sources	22 Dec 2009 01:37:52 -0000	1.4
@@ -1 +1 @@
-b60d5199a9e19a9ac6d20a141cef98e5  highline-1.5.0.tgz
+23d9221b5ffd55e5af35f5aa90590c57  highline-1.5.1.tgz



From kanarip at fedoraproject.org  Tue Dec 22 01:38:28 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:38:28 +0000 (UTC)
Subject: rpms/rubygem-highline/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 rubygem-highline.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091222013828.AE42B11C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-highline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12599/devel

Modified Files:
	.cvsignore import.log rubygem-highline.spec sources 
Log Message:
1.5.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-highline/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Mar 2009 11:50:57 -0000	1.3
+++ .cvsignore	22 Dec 2009 01:38:28 -0000	1.4
@@ -1 +1 @@
-highline-1.5.0.tgz
+highline-1.5.1.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-highline/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	16 Mar 2009 11:50:58 -0000	1.2
+++ import.log	22 Dec 2009 01:38:28 -0000	1.3
@@ -1,2 +1,3 @@
 rubygem-highline-1_4_0-2_fc10:HEAD:rubygem-highline-1.4.0-2.fc10.src.rpm:1222904553
 rubygem-highline-1_5_0-1_fc10:HEAD:rubygem-highline-1.5.0-1.fc10.src.rpm:1237204240
+rubygem-highline-1_5_1-1_fc12:HEAD:rubygem-highline-1.5.1-1.fc12.src.rpm:1261445868


Index: rubygem-highline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-highline/devel/rubygem-highline.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rubygem-highline.spec	27 Jul 2009 03:30:36 -0000	1.4
+++ rubygem-highline.spec	22 Dec 2009 01:38:28 -0000	1.5
@@ -1,13 +1,12 @@
-# Generated from highline-1.4.0.gem by gem2rpm -*- rpm-spec -*-
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname highline
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname highline
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
 Summary:        HighLine is a high-level command-line IO library
 Name:           rubygem-%{gemname}
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        GPLv2+ or Ruby
 URL:            http://highline.rubyforge.org
@@ -78,6 +77,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.1-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-highline/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Mar 2009 11:50:58 -0000	1.3
+++ sources	22 Dec 2009 01:38:28 -0000	1.4
@@ -1 +1 @@
-b60d5199a9e19a9ac6d20a141cef98e5  highline-1.5.0.tgz
+23d9221b5ffd55e5af35f5aa90590c57  highline-1.5.1.tgz



From kanarip at fedoraproject.org  Tue Dec 22 01:56:54 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:56:54 +0000 (UTC)
Subject: File facets-2.8.0.gem uploaded to lookaside cache by kanarip
Message-ID: <20091222015654.3EC0910F862@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rubygem-facets:

2f00a7cfa24d8aaffd4d4970fc2e7f58  facets-2.8.0.gem



From kanarip at fedoraproject.org  Tue Dec 22 01:57:11 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:57:11 +0000 (UTC)
Subject: rpms/rubygem-facets/F-12 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 rubygem-facets.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091222015711.6227211C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-facets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14449/F-12

Modified Files:
	.cvsignore import.log rubygem-facets.spec sources 
Log Message:
2.8.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Mar 2009 12:40:46 -0000	1.4
+++ .cvsignore	22 Dec 2009 01:57:10 -0000	1.5
@@ -1 +1 @@
-facets-2.5.1.gem
+facets-2.8.0.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Mar 2009 12:40:46 -0000	1.3
+++ import.log	22 Dec 2009 01:57:10 -0000	1.4
@@ -1,3 +1,4 @@
 rubygem-facets-2_4_5-2_fc9:HEAD:rubygem-facets-2.4.5-2.fc9.src.rpm:1225189508
 rubygem-facets-2_5_0-1_fc10:HEAD:rubygem-facets-2.5.0-1.fc10.src.rpm:1228228957
 rubygem-facets-2_5_1-1_fc10:HEAD:rubygem-facets-2.5.1-1.fc10.src.rpm:1237207231
+rubygem-facets-2_8_0-1_fc12:F-12:rubygem-facets-2.8.0-1.fc12.src.rpm:1261446989


Index: rubygem-facets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/F-12/rubygem-facets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-facets.spec	27 Jul 2009 03:28:31 -0000	1.5
+++ rubygem-facets.spec	22 Dec 2009 01:57:10 -0000	1.6
@@ -1,12 +1,12 @@
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname facets
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname facets
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
 Name:           rubygem-%{gemname}
 Summary:        The single most extensive additions and extensions library available for Ruby
-Version:        2.5.1
-Release:        2%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        Ruby
 URL:            http://rubyforge.org/projects/facets/
@@ -14,6 +14,7 @@ Source0:        http://gems.rubyforge.or
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       rubygems
 BuildRequires:  rubygems
+BuildRequires:  rubygem(rake)
 BuildArch:      noarch
 Provides:       rubygem(%{gemname}) = %{version}
 
@@ -55,6 +56,10 @@ find %{buildroot}/%{geminstdir} -type f 
 # Remove hidden files
 rm -rf %{buildroot}/%{geminstdir}/.require_paths
 
+%check
+pushd %{buildroot}/%{geminstdir}
+rake test || :
+popd
 
 %clean
 rm -rf %{buildroot}
@@ -65,21 +70,31 @@ rm -rf %{buildroot}
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %doc %{geminstdir}/Rakefile
 %doc %{geminstdir}/AUTHORS
-%doc %{geminstdir}/CHANGES
 %doc %{geminstdir}/COPYING
+%doc %{geminstdir}/HISTORY.rdoc
 %doc %{geminstdir}/MANIFEST
-%doc %{geminstdir}/README
-%doc %{geminstdir}/RELEASE
-%doc %{geminstdir}/VERSION
-%doc %{geminstdir}/doc/
+%doc %{geminstdir}/NOTES
+%doc %{geminstdir}/README.rdoc
+%doc %{geminstdir}/demo/
 %doc %{geminstdir}/meta/
 %{geminstdir}/lib/
-%{geminstdir}/task/
 %{geminstdir}/test/
+%{geminstdir}/script/
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
+DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/HISTORY.rdoc
+DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/NOTES
+DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/README.rdoc
+DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/demo/hook.rdoc
+DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/demo/scenario_require.rdoc
+DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/script/conflicts
+DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/script/methods
+
 %changelog
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.8.0-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Mar 2009 12:40:46 -0000	1.4
+++ sources	22 Dec 2009 01:57:10 -0000	1.5
@@ -1 +1 @@
-e205a7aa080876e206f0c3f69875e03e  facets-2.5.1.gem
+2f00a7cfa24d8aaffd4d4970fc2e7f58  facets-2.8.0.gem



From kanarip at fedoraproject.org  Tue Dec 22 01:58:39 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:58:39 +0000 (UTC)
Subject: rpms/rubygem-facets/F-12 import.log, 1.4, 1.5 rubygem-facets.spec, 1.6,
	1.7
Message-ID: <20091222015839.832C311C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-facets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14785/F-12

Modified Files:
	import.log rubygem-facets.spec 
Log Message:
2.8.0-2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	22 Dec 2009 01:57:10 -0000	1.4
+++ import.log	22 Dec 2009 01:58:39 -0000	1.5
@@ -2,3 +2,4 @@ rubygem-facets-2_4_5-2_fc9:HEAD:rubygem-
 rubygem-facets-2_5_0-1_fc10:HEAD:rubygem-facets-2.5.0-1.fc10.src.rpm:1228228957
 rubygem-facets-2_5_1-1_fc10:HEAD:rubygem-facets-2.5.1-1.fc10.src.rpm:1237207231
 rubygem-facets-2_8_0-1_fc12:F-12:rubygem-facets-2.8.0-1.fc12.src.rpm:1261446989
+rubygem-facets-2_8_0-2_fc12:F-12:rubygem-facets-2.8.0-2.fc12.src.rpm:1261447079


Index: rubygem-facets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/F-12/rubygem-facets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rubygem-facets.spec	22 Dec 2009 01:57:10 -0000	1.6
+++ rubygem-facets.spec	22 Dec 2009 01:58:39 -0000	1.7
@@ -6,7 +6,7 @@
 Name:           rubygem-%{gemname}
 Summary:        The single most extensive additions and extensions library available for Ruby
 Version:        2.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Development/Languages
 License:        Ruby
 URL:            http://rubyforge.org/projects/facets/
@@ -83,16 +83,8 @@ rm -rf %{buildroot}
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
-DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/HISTORY.rdoc
-DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/NOTES
-DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/README.rdoc
-DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/demo/hook.rdoc
-DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/demo/scenario_require.rdoc
-DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/script/conflicts
-DEBUG:    /usr/lib/ruby/gems/1.8/gems/facets-2.8.0/script/methods
-
 %changelog
-* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.8.0-1
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.8.0-2
 - New upstream version
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-2



From kanarip at fedoraproject.org  Tue Dec 22 01:59:09 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 22 Dec 2009 01:59:09 +0000 (UTC)
Subject: rpms/rubygem-facets/devel .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 rubygem-facets.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091222015909.D218111C00CF@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-facets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14989/devel

Modified Files:
	.cvsignore import.log rubygem-facets.spec sources 
Log Message:
2.8.0-2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Mar 2009 12:40:46 -0000	1.4
+++ .cvsignore	22 Dec 2009 01:59:09 -0000	1.5
@@ -1 +1 @@
-facets-2.5.1.gem
+facets-2.8.0.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Mar 2009 12:40:46 -0000	1.3
+++ import.log	22 Dec 2009 01:59:09 -0000	1.4
@@ -1,3 +1,4 @@
 rubygem-facets-2_4_5-2_fc9:HEAD:rubygem-facets-2.4.5-2.fc9.src.rpm:1225189508
 rubygem-facets-2_5_0-1_fc10:HEAD:rubygem-facets-2.5.0-1.fc10.src.rpm:1228228957
 rubygem-facets-2_5_1-1_fc10:HEAD:rubygem-facets-2.5.1-1.fc10.src.rpm:1237207231
+rubygem-facets-2_8_0-2_fc12:HEAD:rubygem-facets-2.8.0-2.fc12.src.rpm:1261447109


Index: rubygem-facets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/devel/rubygem-facets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-facets.spec	27 Jul 2009 03:28:31 -0000	1.5
+++ rubygem-facets.spec	22 Dec 2009 01:59:09 -0000	1.6
@@ -1,11 +1,11 @@
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname facets
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname facets
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
 Name:           rubygem-%{gemname}
 Summary:        The single most extensive additions and extensions library available for Ruby
-Version:        2.5.1
+Version:        2.8.0
 Release:        2%{?dist}
 Group:          Development/Languages
 License:        Ruby
@@ -14,6 +14,7 @@ Source0:        http://gems.rubyforge.or
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       rubygems
 BuildRequires:  rubygems
+BuildRequires:  rubygem(rake)
 BuildArch:      noarch
 Provides:       rubygem(%{gemname}) = %{version}
 
@@ -55,6 +56,10 @@ find %{buildroot}/%{geminstdir} -type f 
 # Remove hidden files
 rm -rf %{buildroot}/%{geminstdir}/.require_paths
 
+%check
+pushd %{buildroot}/%{geminstdir}
+rake test || :
+popd
 
 %clean
 rm -rf %{buildroot}
@@ -65,21 +70,23 @@ rm -rf %{buildroot}
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %doc %{geminstdir}/Rakefile
 %doc %{geminstdir}/AUTHORS
-%doc %{geminstdir}/CHANGES
 %doc %{geminstdir}/COPYING
+%doc %{geminstdir}/HISTORY.rdoc
 %doc %{geminstdir}/MANIFEST
-%doc %{geminstdir}/README
-%doc %{geminstdir}/RELEASE
-%doc %{geminstdir}/VERSION
-%doc %{geminstdir}/doc/
+%doc %{geminstdir}/NOTES
+%doc %{geminstdir}/README.rdoc
+%doc %{geminstdir}/demo/
 %doc %{geminstdir}/meta/
 %{geminstdir}/lib/
-%{geminstdir}/task/
 %{geminstdir}/test/
+%{geminstdir}/script/
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Tue Dec 22 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.8.0-2
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-facets/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Mar 2009 12:40:46 -0000	1.4
+++ sources	22 Dec 2009 01:59:09 -0000	1.5
@@ -1 +1 @@
-e205a7aa080876e206f0c3f69875e03e  facets-2.5.1.gem
+2f00a7cfa24d8aaffd4d4970fc2e7f58  facets-2.8.0.gem



From salimma at fedoraproject.org  Tue Dec 22 02:11:41 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 22 Dec 2009 02:11:41 +0000 (UTC)
Subject: File libgoogle-data-mono-1.4.0.2.tar.gz uploaded to lookaside cache
	by salimma
Message-ID: <20091222021141.8C77110F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gdata-sharp:

3914538201b00c6d33aa6ada0e9d1ec6  libgoogle-data-mono-1.4.0.2.tar.gz



From kwright at fedoraproject.org  Tue Dec 22 02:15:43 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 02:15:43 +0000 (UTC)
Subject: rpms/dogtag-pki-common-ui/F-12 dogtag-pki-common-ui.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222021543.50A7A11C00CF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-common-ui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17101/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	dogtag-pki-common-ui.spec import.log 
Log Message:
dogtag build for fedora see bugzilla: 522204



--- NEW FILE dogtag-pki-common-ui.spec ---
Name:           dogtag-pki-common-ui
Version:        1.3.0
Release:        3%{?dist}
Summary:        Dogtag Certificate System - PKI Common Framework User Interface
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Provides:       pki-common-ui = %{version}.%{release}

Obsoletes:      pki-common-ui < %{version}.%{release}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag PKI Common Framework User Interface contains the graphical
user interface for the Dogtag PKI Common Framework.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="dogtag" \
    -Dproduct.prefix="pki" \
    -Dproduct="common-ui" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/pki/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-3
- Removed 'with exceptions' from License
- Removed Requires bash

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI


--- NEW FILE import.log ---
dogtag-pki-common-ui-1_3_0-3_fc12:F-12:dogtag-pki-common-ui-1.3.0-3.fc12.src.rpm:1261448101


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-common-ui/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:07:59 -0000	1.1
+++ .cvsignore	22 Dec 2009 02:15:42 -0000	1.2
@@ -0,0 +1 @@
+dogtag-pki-common-ui-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-common-ui/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:07:59 -0000	1.1
+++ sources	22 Dec 2009 02:15:42 -0000	1.2
@@ -0,0 +1 @@
+edf2aa764eb45df1b788a233b35a119c  dogtag-pki-common-ui-1.3.0.tar.gz



From kwright at fedoraproject.org  Tue Dec 22 02:25:50 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 02:25:50 +0000 (UTC)
Subject: rpms/dogtag-pki-common-ui/EL-5 dogtag-pki-common-ui.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222022550.C950511C00CF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-common-ui/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18375/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	dogtag-pki-common-ui.spec import.log 
Log Message:
dogtag build for fedora see bugzilla: 522204



--- NEW FILE dogtag-pki-common-ui.spec ---
Name:           dogtag-pki-common-ui
Version:        1.3.0
Release:        3%{?dist}
Summary:        Dogtag Certificate System - PKI Common Framework User Interface
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Provides:       pki-common-ui = %{version}.%{release}

Obsoletes:      pki-common-ui < %{version}.%{release}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag PKI Common Framework User Interface contains the graphical
user interface for the Dogtag PKI Common Framework.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="dogtag" \
    -Dproduct.prefix="pki" \
    -Dproduct="common-ui" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/pki/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-3
- Removed 'with exceptions' from License
- Removed Requires bash

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI


--- NEW FILE import.log ---
dogtag-pki-common-ui-1_3_0-3_el5:EL-5:dogtag-pki-common-ui-1.3.0-3.el5.src.rpm:1261448734


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-common-ui/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:07:59 -0000	1.1
+++ .cvsignore	22 Dec 2009 02:25:50 -0000	1.2
@@ -0,0 +1 @@
+dogtag-pki-common-ui-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-common-ui/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:07:59 -0000	1.1
+++ sources	22 Dec 2009 02:25:50 -0000	1.2
@@ -0,0 +1 @@
+edf2aa764eb45df1b788a233b35a119c  dogtag-pki-common-ui-1.3.0.tar.gz



From salimma at fedoraproject.org  Tue Dec 22 02:31:22 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 22 Dec 2009 02:31:22 +0000 (UTC)
Subject: rpms/gdata-sharp/F-11 gdata-sharp.spec, NONE,
	1.1 libgoogle-data-mono-1.4.0.2-pkgconfig.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222023122.EE3DE11C00CF@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gdata-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19170/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gdata-sharp.spec libgoogle-data-mono-1.4.0.2-pkgconfig.patch 
Log Message:
Initial import of gdata-sharp



--- NEW FILE gdata-sharp.spec ---
%global         debug_package %{nil}
%global         upstream_name libgoogle-data-mono

Name:           gdata-sharp
Version:        1.4.0.2
Release:        3%{?dist}
Summary:        .NET library for the Google Data API

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/google-gdata/
Source0:        http://google-gdata.googlecode.com/files/%{upstream_name}-%{version}.tar.gz
# fixed in SVN:
# http://code.google.com/p/google-gdata/source/detail?spec=svn933&r=890
Patch0:         %{upstream_name}-1.4.0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mono-devel mono-nunit
#Requires:       

%description
The Google Data APIs (GData) provide a simple protocol for reading and
writing data on the web.

Each of the following Google services provides a Google data API:

    * Base
    * Blogger
    * Calendar
    * Spreadsheets
    * Google Apps Provisioning
    * Code Search
    * Notebook
    * Picasa Web Albums
    * Document Feed
    * Contacts
    * You Tube
    * Google Health 

The GData .NET Client Library provides a library and source code that
make it easy to access data through Google Data APIs.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n %{upstream_name}-%{version}
%patch0 -p1 -b .pkgconfig

sed -i "s|\$(PREFIX)/lib|\$(PREFIX)/%{_lib}|g" Makefile

for i in misc/*.pc.in; do
  sed -i "s|libdir=\${prefix}/lib|libdir=\${prefix}/%{_lib}|" "$i"
done


%build
make %{?_smp_mflags} PREFIX=%{_prefix}

%check
# currently 98 tests out of 921 fail
# make test


%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 LICENSE-2.0.txt RELEASE_NOTES.HTML
%{_libdir}/mono/GData-Sharp
%{_libdir}/mono/gac/Google.GData.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/gdata-sharp-*.pc


%changelog
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-3
- Replace %%define with %%global 

* Thu Sep  3 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-2
- Build against latest mono-nunit

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-1
- Initial Fedora package


libgoogle-data-mono-1.4.0.2-pkgconfig.patch:
 gdata-sharp-core.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libgoogle-data-mono-1.4.0.2-pkgconfig.patch ---
--- libgoogle-data-mono-1.4.0.2/misc/gdata-sharp-core.pc.in.pkgconfig	2009-02-05 05:15:17.000000000 -0500
+++ libgoogle-data-mono-1.4.0.2/misc/gdata-sharp-core.pc.in	2009-08-21 02:45:17.856170185 -0400
@@ -5,4 +5,4 @@
 Description: CLI bindings to Google's online services (Core libraries)
 Version: @VERSION@
 
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll
+Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r:${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-sharp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:37:42 -0000	1.1
+++ .cvsignore	22 Dec 2009 02:31:22 -0000	1.2
@@ -0,0 +1 @@
+libgoogle-data-mono-1.4.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-sharp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:37:42 -0000	1.1
+++ sources	22 Dec 2009 02:31:22 -0000	1.2
@@ -0,0 +1 @@
+3914538201b00c6d33aa6ada0e9d1ec6  libgoogle-data-mono-1.4.0.2.tar.gz



From salimma at fedoraproject.org  Tue Dec 22 02:31:23 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 22 Dec 2009 02:31:23 +0000 (UTC)
Subject: rpms/gdata-sharp/F-12 gdata-sharp.spec, NONE,
	1.1 libgoogle-data-mono-1.4.0.2-pkgconfig.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222023123.42DD811C00CF@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gdata-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19170/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gdata-sharp.spec libgoogle-data-mono-1.4.0.2-pkgconfig.patch 
Log Message:
Initial import of gdata-sharp



--- NEW FILE gdata-sharp.spec ---
%global         debug_package %{nil}
%global         upstream_name libgoogle-data-mono

Name:           gdata-sharp
Version:        1.4.0.2
Release:        3%{?dist}
Summary:        .NET library for the Google Data API

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/google-gdata/
Source0:        http://google-gdata.googlecode.com/files/%{upstream_name}-%{version}.tar.gz
# fixed in SVN:
# http://code.google.com/p/google-gdata/source/detail?spec=svn933&r=890
Patch0:         %{upstream_name}-1.4.0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mono-devel mono-nunit
#Requires:       

%description
The Google Data APIs (GData) provide a simple protocol for reading and
writing data on the web.

Each of the following Google services provides a Google data API:

    * Base
    * Blogger
    * Calendar
    * Spreadsheets
    * Google Apps Provisioning
    * Code Search
    * Notebook
    * Picasa Web Albums
    * Document Feed
    * Contacts
    * You Tube
    * Google Health 

The GData .NET Client Library provides a library and source code that
make it easy to access data through Google Data APIs.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n %{upstream_name}-%{version}
%patch0 -p1 -b .pkgconfig

sed -i "s|\$(PREFIX)/lib|\$(PREFIX)/%{_lib}|g" Makefile

for i in misc/*.pc.in; do
  sed -i "s|libdir=\${prefix}/lib|libdir=\${prefix}/%{_lib}|" "$i"
done


%build
make %{?_smp_mflags} PREFIX=%{_prefix}

%check
# currently 98 tests out of 921 fail
# make test


%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 LICENSE-2.0.txt RELEASE_NOTES.HTML
%{_libdir}/mono/GData-Sharp
%{_libdir}/mono/gac/Google.GData.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/gdata-sharp-*.pc


%changelog
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-3
- Replace %%define with %%global 

* Thu Sep  3 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-2
- Build against latest mono-nunit

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-1
- Initial Fedora package


libgoogle-data-mono-1.4.0.2-pkgconfig.patch:
 gdata-sharp-core.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libgoogle-data-mono-1.4.0.2-pkgconfig.patch ---
--- libgoogle-data-mono-1.4.0.2/misc/gdata-sharp-core.pc.in.pkgconfig	2009-02-05 05:15:17.000000000 -0500
+++ libgoogle-data-mono-1.4.0.2/misc/gdata-sharp-core.pc.in	2009-08-21 02:45:17.856170185 -0400
@@ -5,4 +5,4 @@
 Description: CLI bindings to Google's online services (Core libraries)
 Version: @VERSION@
 
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll
+Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r:${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-sharp/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:37:42 -0000	1.1
+++ .cvsignore	22 Dec 2009 02:31:22 -0000	1.2
@@ -0,0 +1 @@
+libgoogle-data-mono-1.4.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-sharp/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:37:42 -0000	1.1
+++ sources	22 Dec 2009 02:31:23 -0000	1.2
@@ -0,0 +1 @@
+3914538201b00c6d33aa6ada0e9d1ec6  libgoogle-data-mono-1.4.0.2.tar.gz



From salimma at fedoraproject.org  Tue Dec 22 02:31:23 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 22 Dec 2009 02:31:23 +0000 (UTC)
Subject: rpms/gdata-sharp/devel gdata-sharp.spec, NONE,
	1.1 libgoogle-data-mono-1.4.0.2-pkgconfig.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222023123.97B3611C00CF@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gdata-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19170/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gdata-sharp.spec libgoogle-data-mono-1.4.0.2-pkgconfig.patch 
Log Message:
Initial import of gdata-sharp



--- NEW FILE gdata-sharp.spec ---
%global         debug_package %{nil}
%global         upstream_name libgoogle-data-mono

Name:           gdata-sharp
Version:        1.4.0.2
Release:        3%{?dist}
Summary:        .NET library for the Google Data API

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/google-gdata/
Source0:        http://google-gdata.googlecode.com/files/%{upstream_name}-%{version}.tar.gz
# fixed in SVN:
# http://code.google.com/p/google-gdata/source/detail?spec=svn933&r=890
Patch0:         %{upstream_name}-1.4.0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mono-devel mono-nunit
#Requires:       

%description
The Google Data APIs (GData) provide a simple protocol for reading and
writing data on the web.

Each of the following Google services provides a Google data API:

    * Base
    * Blogger
    * Calendar
    * Spreadsheets
    * Google Apps Provisioning
    * Code Search
    * Notebook
    * Picasa Web Albums
    * Document Feed
    * Contacts
    * You Tube
    * Google Health 

The GData .NET Client Library provides a library and source code that
make it easy to access data through Google Data APIs.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n %{upstream_name}-%{version}
%patch0 -p1 -b .pkgconfig

sed -i "s|\$(PREFIX)/lib|\$(PREFIX)/%{_lib}|g" Makefile

for i in misc/*.pc.in; do
  sed -i "s|libdir=\${prefix}/lib|libdir=\${prefix}/%{_lib}|" "$i"
done


%build
make %{?_smp_mflags} PREFIX=%{_prefix}

%check
# currently 98 tests out of 921 fail
# make test


%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 LICENSE-2.0.txt RELEASE_NOTES.HTML
%{_libdir}/mono/GData-Sharp
%{_libdir}/mono/gac/Google.GData.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/gdata-sharp-*.pc


%changelog
* Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-3
- Replace %%define with %%global 

* Thu Sep  3 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-2
- Build against latest mono-nunit

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.0.2-1
- Initial Fedora package


libgoogle-data-mono-1.4.0.2-pkgconfig.patch:
 gdata-sharp-core.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libgoogle-data-mono-1.4.0.2-pkgconfig.patch ---
--- libgoogle-data-mono-1.4.0.2/misc/gdata-sharp-core.pc.in.pkgconfig	2009-02-05 05:15:17.000000000 -0500
+++ libgoogle-data-mono-1.4.0.2/misc/gdata-sharp-core.pc.in	2009-08-21 02:45:17.856170185 -0400
@@ -5,4 +5,4 @@
 Description: CLI bindings to Google's online services (Core libraries)
 Version: @VERSION@
 
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll
+Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r:${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-sharp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:37:42 -0000	1.1
+++ .cvsignore	22 Dec 2009 02:31:23 -0000	1.2
@@ -0,0 +1 @@
+libgoogle-data-mono-1.4.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-sharp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:37:42 -0000	1.1
+++ sources	22 Dec 2009 02:31:23 -0000	1.2
@@ -0,0 +1 @@
+3914538201b00c6d33aa6ada0e9d1ec6  libgoogle-data-mono-1.4.0.2.tar.gz



From kwright at fedoraproject.org  Tue Dec 22 02:41:58 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 02:41:58 +0000 (UTC)
Subject: File dogtag-pki-ca-ui-1.3.0.tar.gz uploaded to lookaside cache by
	kwright
Message-ID: <20091222024158.5FDB310F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for dogtag-pki-ca-ui:

b21ff73c94c25c482d968e9eafa74dbc  dogtag-pki-ca-ui-1.3.0.tar.gz



From kwright at fedoraproject.org  Tue Dec 22 02:43:58 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 02:43:58 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui/F-11 dogtag-pki-ca-ui.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222024358.6466811C00CF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21227/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	dogtag-pki-ca-ui.spec import.log 
Log Message:
dogtag build for fedora see: bugzilla 522208



--- NEW FILE dogtag-pki-ca-ui.spec ---
Name:           dogtag-pki-ca-ui
Version:        1.3.0
Release:        3%{?dist}
Summary:        Dogtag Certificate System - Certificate Authority User Interface
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Requires:       bash

Provides:       pki-ca-ui = %{version}-%{release}

Obsoletes:      pki-ca-ui < %{version}-%{release}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag Certificate Authority User Interface contains the graphical
user interface for the Dogtag Certificate Authority.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="dogtag" \
    -Dproduct.prefix="pki" \
    -Dproduct="ca-ui" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/pki/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-3
- Removed 'with exceptions' from License

* Mon Nov 2 2009 Ade Lee <alee at redhat.com> 1.3.0-2
- Bugzilla Bug #522208 - Packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #522208 - Packaging for Fedora Dogtag


--- NEW FILE import.log ---
dogtag-pki-ca-ui-1_3_0-3_fc11:F-11:dogtag-pki-ca-ui-1.3.0-3.fc11.src.rpm:1261449723


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:11:04 -0000	1.1
+++ .cvsignore	22 Dec 2009 02:43:58 -0000	1.2
@@ -0,0 +1 @@
+dogtag-pki-ca-ui-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:11:04 -0000	1.1
+++ sources	22 Dec 2009 02:43:58 -0000	1.2
@@ -0,0 +1 @@
+b21ff73c94c25c482d968e9eafa74dbc  dogtag-pki-ca-ui-1.3.0.tar.gz



From kwright at fedoraproject.org  Tue Dec 22 03:12:59 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 03:12:59 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui/F-12 dogtag-pki-ca-ui.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222031259.7BEFF11C00CF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24886/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	dogtag-pki-ca-ui.spec import.log 
Log Message:
dogtag build for fedora see: bugzilla 522208



--- NEW FILE dogtag-pki-ca-ui.spec ---
Name:           dogtag-pki-ca-ui
Version:        1.3.0
Release:        3%{?dist}
Summary:        Dogtag Certificate System - Certificate Authority User Interface
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Requires:       bash

Provides:       pki-ca-ui = %{version}-%{release}

Obsoletes:      pki-ca-ui < %{version}-%{release}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag Certificate Authority User Interface contains the graphical
user interface for the Dogtag Certificate Authority.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="dogtag" \
    -Dproduct.prefix="pki" \
    -Dproduct="ca-ui" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/pki/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-3
- Removed 'with exceptions' from License

* Mon Nov 2 2009 Ade Lee <alee at redhat.com> 1.3.0-2
- Bugzilla Bug #522208 - Packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #522208 - Packaging for Fedora Dogtag


--- NEW FILE import.log ---
dogtag-pki-ca-ui-1_3_0-3_fc12:F-12:dogtag-pki-ca-ui-1.3.0-3.fc12.src.rpm:1261451565


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:11:04 -0000	1.1
+++ .cvsignore	22 Dec 2009 03:12:59 -0000	1.2
@@ -0,0 +1 @@
+dogtag-pki-ca-ui-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:11:04 -0000	1.1
+++ sources	22 Dec 2009 03:12:59 -0000	1.2
@@ -0,0 +1 @@
+b21ff73c94c25c482d968e9eafa74dbc  dogtag-pki-ca-ui-1.3.0.tar.gz



From kwright at fedoraproject.org  Tue Dec 22 03:20:35 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 03:20:35 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui/F-12 import.log,1.1,1.2
Message-ID: <20091222032035.AA81611C00CF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25896/F-12

Modified Files:
	import.log 
Log Message:
dogtag build for fedora see: bugzilla 522208



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Dec 2009 03:12:59 -0000	1.1
+++ import.log	22 Dec 2009 03:20:35 -0000	1.2
@@ -1 +1,2 @@
 dogtag-pki-ca-ui-1_3_0-3_fc12:F-12:dogtag-pki-ca-ui-1.3.0-3.fc12.src.rpm:1261451565
+dogtag-pki-ca-ui-1_3_0-3_el5:F-12:dogtag-pki-ca-ui-1.3.0-3.el5.src.rpm:1261452017



From kwright at fedoraproject.org  Tue Dec 22 03:22:17 2009
From: kwright at fedoraproject.org (kwright)
Date: Tue, 22 Dec 2009 03:22:17 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui/EL-5 dogtag-pki-ca-ui.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222032217.124B811C00CF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26290/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	dogtag-pki-ca-ui.spec import.log 
Log Message:
dogtag build for fedora see: bugzilla 522208



--- NEW FILE dogtag-pki-ca-ui.spec ---
Name:           dogtag-pki-ca-ui
Version:        1.3.0
Release:        3%{?dist}
Summary:        Dogtag Certificate System - Certificate Authority User Interface
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Requires:       bash

Provides:       pki-ca-ui = %{version}-%{release}

Obsoletes:      pki-ca-ui < %{version}-%{release}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag Certificate Authority User Interface contains the graphical
user interface for the Dogtag Certificate Authority.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="dogtag" \
    -Dproduct.prefix="pki" \
    -Dproduct="ca-ui" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/pki/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-3
- Removed 'with exceptions' from License

* Mon Nov 2 2009 Ade Lee <alee at redhat.com> 1.3.0-2
- Bugzilla Bug #522208 - Packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #522208 - Packaging for Fedora Dogtag


--- NEW FILE import.log ---
dogtag-pki-ca-ui-1_3_0-3_el5:EL-5:dogtag-pki-ca-ui-1.3.0-3.el5.src.rpm:1261452118


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:11:04 -0000	1.1
+++ .cvsignore	22 Dec 2009 03:22:16 -0000	1.2
@@ -0,0 +1 @@
+dogtag-pki-ca-ui-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:11:04 -0000	1.1
+++ sources	22 Dec 2009 03:22:16 -0000	1.2
@@ -0,0 +1 @@
+b21ff73c94c25c482d968e9eafa74dbc  dogtag-pki-ca-ui-1.3.0.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 22 03:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 03:29:47 +0000
Subject: [pkgdb] emacs-haskell-mode (Fedora, 12) updated by petersen
Message-ID: <20091222032935.4763B10F892@bastion.fedoraproject.org>

petersen approved watchbugzilla on emacs-haskell-mode (Fedora 12) for haskell-sig
petersen approved watchcommits on emacs-haskell-mode (Fedora 12) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From pkgdb at fedoraproject.org  Tue Dec 22 03:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 03:29:47 +0000
Subject: [pkgdb] emacs-haskell-mode (Fedora, 11) updated by petersen
Message-ID: <20091222032935.F351310F8B9@bastion.fedoraproject.org>

petersen approved watchbugzilla on emacs-haskell-mode (Fedora 11) for haskell-sig
petersen approved watchcommits on emacs-haskell-mode (Fedora 11) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From pkgdb at fedoraproject.org  Tue Dec 22 03:29:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 03:29:48 +0000
Subject: [pkgdb] emacs-haskell-mode (Fedora, devel) updated by petersen
Message-ID: <20091222032936.B338710F892@bastion.fedoraproject.org>

petersen approved watchbugzilla on emacs-haskell-mode (Fedora devel) for haskell-sig
petersen approved watchcommits on emacs-haskell-mode (Fedora devel) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From pkgdb at fedoraproject.org  Tue Dec 22 03:29:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 03:29:48 +0000
Subject: [pkgdb] emacs-haskell-mode (Fedora EPEL, 5) updated by petersen
Message-ID: <20091222032937.6F6C410F892@bastion.fedoraproject.org>

petersen approved watchbugzilla on emacs-haskell-mode (Fedora EPEL 5) for haskell-sig
petersen approved watchcommits on emacs-haskell-mode (Fedora EPEL 5) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-haskell-mode



From shakthimaan at fedoraproject.org  Tue Dec 22 03:29:48 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Tue, 22 Dec 2009 03:29:48 +0000 (UTC)
Subject: File poky-scripts_6etch1.tar.gz uploaded to lookaside cache by
	shakthimaan
Message-ID: <20091222032948.8766A10F892@bastion.fedoraproject.org>

A file has been added to the lookaside cache for poky-scripts:

c6772aba6a0293ffd3a3e52878f5e79f  poky-scripts_6etch1.tar.gz



From shakthimaan at fedoraproject.org  Tue Dec 22 03:30:57 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Tue, 22 Dec 2009 03:30:57 +0000 (UTC)
Subject: rpms/poky-scripts/devel README.fedora, NONE, 1.1 import.log, NONE,
	1.1 poky-scripts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091222033057.C6F6C11C00CF@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/poky-scripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27605/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log poky-scripts.spec 
Log Message:
First package.



--- NEW FILE README.fedora ---
README.fedora
=============

The poky-depends is to ensure all the required packages are installed
to build poky images. Please note that this only installs the
dependency packages.

If you want to build images, you will need to download Poky. Please refer:

http://pokylinux.org/getit/

http://pokylinux.org/support/

--
Shakthi Kannan
shakthimaan at gmail.com

--- NEW FILE import.log ---
poky-scripts-6-6_fc12:HEAD:poky-scripts-6-6.fc12.src.rpm:1261453141


--- NEW FILE poky-scripts.spec ---
Name:           poky-scripts
Version:        6
Release:        6%{?dist}
Summary:        Poky platform builder utility scripts

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://pokylinux.org
Source0:        http://debian.o-hand.com/etch/%{name}_6etch1.tar.gz
Source1:        README.fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       sudo distcc distcc-server xorg-x11-server-Xephyr
Requires:       poky-depends

BuildArchitectures:  noarch

%description
%{name} contains utility scripts for Poky such as poky-qemu, which will
run a Poky image in QEMU with the right arguments.

%package        -n poky-depends
Summary:        Poky platform builder dependency package list
Group:          Applications/Engineering
Requires:       glibc-devel diffstat texinfo texi2html cvs subversion gawk help2man python-sqlite2 bzip2 compat-gcc-34 
Requires:       qemu >= 0.8.2

%if 0%{?fedora}
BuildArchitectures:  noarch
%endif

%description    -n poky-depends
%{name} is a meta-package that lists and installs the 
required packages for a Poky build.

%prep
%setup -q -n %{name}-%{version}etch1

# poky-depends
%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}etch1

%build

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{_datadir}/%{name}
%{__install} -pm 755 -d %{buildroot}%{_bindir}
%{__install} -pm 755 poky-qemu %{buildroot}%{_bindir}/
%{__install} -pm 755 poky-chroot-* %{buildroot}%{_bindir}/
%{__install} -pm 755 poky-qemu-* %{buildroot}%{_datadir}/%{name}
%{__install} -pm 755 poky-addptable2image %{buildroot}%{_datadir}/%{name}

# poky-depends
%{__install} -pm 755 -d %{buildroot}%{_docdir}/%{name}-%{version}
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc poky-qemu.README
%{_bindir}/poky-*
%{_datadir}/%{name}

%files -n poky-depends
%defattr(-,root,root,-)
%doc README.fedora

%changelog
* Sun Dec 20 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-6
- Added if condition for depends BuildArchitecture noarch.

* Wed Dec 16 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-5
- Moved glibc-devel to Requires.
- Removed redundant inclusion of datadir/name.

* Tue Dec 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-4
- Removed explicit Requires python from poky-depends.

* Thu Dec 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-3
- Removed glibc-headers.
- Removed poky-scripts, poky-depends circular dependency.

* Wed Dec 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-2
- Added sub-package poky-depends.

* Wed Dec 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poky-scripts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:36:18 -0000	1.1
+++ .cvsignore	22 Dec 2009 03:30:57 -0000	1.2
@@ -0,0 +1 @@
+poky-scripts_6etch1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poky-scripts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:36:19 -0000	1.1
+++ sources	22 Dec 2009 03:30:57 -0000	1.2
@@ -0,0 +1 @@
+c6772aba6a0293ffd3a3e52878f5e79f  poky-scripts_6etch1.tar.gz



From shakthimaan at fedoraproject.org  Tue Dec 22 03:33:52 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Tue, 22 Dec 2009 03:33:52 +0000 (UTC)
Subject: rpms/poky-scripts/F-11 README.fedora, NONE, 1.1 import.log, NONE,
	1.1 poky-scripts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091222033352.ED0F911C00CF@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/poky-scripts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28336/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log poky-scripts.spec 
Log Message:
First package.



--- NEW FILE README.fedora ---
README.fedora
=============

The poky-depends is to ensure all the required packages are installed
to build poky images. Please note that this only installs the
dependency packages.

If you want to build images, you will need to download Poky. Please refer:

http://pokylinux.org/getit/

http://pokylinux.org/support/

--
Shakthi Kannan
shakthimaan at gmail.com

--- NEW FILE import.log ---
poky-scripts-6-6_fc12:F-11:poky-scripts-6-6.fc12.src.rpm:1261453316


--- NEW FILE poky-scripts.spec ---
Name:           poky-scripts
Version:        6
Release:        6%{?dist}
Summary:        Poky platform builder utility scripts

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://pokylinux.org
Source0:        http://debian.o-hand.com/etch/%{name}_6etch1.tar.gz
Source1:        README.fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       sudo distcc distcc-server xorg-x11-server-Xephyr
Requires:       poky-depends

BuildArchitectures:  noarch

%description
%{name} contains utility scripts for Poky such as poky-qemu, which will
run a Poky image in QEMU with the right arguments.

%package        -n poky-depends
Summary:        Poky platform builder dependency package list
Group:          Applications/Engineering
Requires:       glibc-devel diffstat texinfo texi2html cvs subversion gawk help2man python-sqlite2 bzip2 compat-gcc-34 
Requires:       qemu >= 0.8.2

%if 0%{?fedora}
BuildArchitectures:  noarch
%endif

%description    -n poky-depends
%{name} is a meta-package that lists and installs the 
required packages for a Poky build.

%prep
%setup -q -n %{name}-%{version}etch1

# poky-depends
%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}etch1

%build

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{_datadir}/%{name}
%{__install} -pm 755 -d %{buildroot}%{_bindir}
%{__install} -pm 755 poky-qemu %{buildroot}%{_bindir}/
%{__install} -pm 755 poky-chroot-* %{buildroot}%{_bindir}/
%{__install} -pm 755 poky-qemu-* %{buildroot}%{_datadir}/%{name}
%{__install} -pm 755 poky-addptable2image %{buildroot}%{_datadir}/%{name}

# poky-depends
%{__install} -pm 755 -d %{buildroot}%{_docdir}/%{name}-%{version}
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc poky-qemu.README
%{_bindir}/poky-*
%{_datadir}/%{name}

%files -n poky-depends
%defattr(-,root,root,-)
%doc README.fedora

%changelog
* Sun Dec 20 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-6
- Added if condition for depends BuildArchitecture noarch.

* Wed Dec 16 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-5
- Moved glibc-devel to Requires.
- Removed redundant inclusion of datadir/name.

* Tue Dec 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-4
- Removed explicit Requires python from poky-depends.

* Thu Dec 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-3
- Removed glibc-headers.
- Removed poky-scripts, poky-depends circular dependency.

* Wed Dec 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-2
- Added sub-package poky-depends.

* Wed Dec 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poky-scripts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:36:18 -0000	1.1
+++ .cvsignore	22 Dec 2009 03:33:52 -0000	1.2
@@ -0,0 +1 @@
+poky-scripts_6etch1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poky-scripts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:36:19 -0000	1.1
+++ sources	22 Dec 2009 03:33:52 -0000	1.2
@@ -0,0 +1 @@
+c6772aba6a0293ffd3a3e52878f5e79f  poky-scripts_6etch1.tar.gz



From shakthimaan at fedoraproject.org  Tue Dec 22 03:36:28 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Tue, 22 Dec 2009 03:36:28 +0000 (UTC)
Subject: rpms/poky-scripts/F-12 README.fedora, NONE, 1.1 import.log, NONE,
	1.1 poky-scripts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091222033628.F212011C00CF@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/poky-scripts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28849/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log poky-scripts.spec 
Log Message:
First package.



--- NEW FILE README.fedora ---
README.fedora
=============

The poky-depends is to ensure all the required packages are installed
to build poky images. Please note that this only installs the
dependency packages.

If you want to build images, you will need to download Poky. Please refer:

http://pokylinux.org/getit/

http://pokylinux.org/support/

--
Shakthi Kannan
shakthimaan at gmail.com

--- NEW FILE import.log ---
poky-scripts-6-6_fc12:F-12:poky-scripts-6-6.fc12.src.rpm:1261453477


--- NEW FILE poky-scripts.spec ---
Name:           poky-scripts
Version:        6
Release:        6%{?dist}
Summary:        Poky platform builder utility scripts

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://pokylinux.org
Source0:        http://debian.o-hand.com/etch/%{name}_6etch1.tar.gz
Source1:        README.fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       sudo distcc distcc-server xorg-x11-server-Xephyr
Requires:       poky-depends

BuildArchitectures:  noarch

%description
%{name} contains utility scripts for Poky such as poky-qemu, which will
run a Poky image in QEMU with the right arguments.

%package        -n poky-depends
Summary:        Poky platform builder dependency package list
Group:          Applications/Engineering
Requires:       glibc-devel diffstat texinfo texi2html cvs subversion gawk help2man python-sqlite2 bzip2 compat-gcc-34 
Requires:       qemu >= 0.8.2

%if 0%{?fedora}
BuildArchitectures:  noarch
%endif

%description    -n poky-depends
%{name} is a meta-package that lists and installs the 
required packages for a Poky build.

%prep
%setup -q -n %{name}-%{version}etch1

# poky-depends
%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}etch1

%build

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{_datadir}/%{name}
%{__install} -pm 755 -d %{buildroot}%{_bindir}
%{__install} -pm 755 poky-qemu %{buildroot}%{_bindir}/
%{__install} -pm 755 poky-chroot-* %{buildroot}%{_bindir}/
%{__install} -pm 755 poky-qemu-* %{buildroot}%{_datadir}/%{name}
%{__install} -pm 755 poky-addptable2image %{buildroot}%{_datadir}/%{name}

# poky-depends
%{__install} -pm 755 -d %{buildroot}%{_docdir}/%{name}-%{version}
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc poky-qemu.README
%{_bindir}/poky-*
%{_datadir}/%{name}

%files -n poky-depends
%defattr(-,root,root,-)
%doc README.fedora

%changelog
* Sun Dec 20 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-6
- Added if condition for depends BuildArchitecture noarch.

* Wed Dec 16 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-5
- Moved glibc-devel to Requires.
- Removed redundant inclusion of datadir/name.

* Tue Dec 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-4
- Removed explicit Requires python from poky-depends.

* Thu Dec 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-3
- Removed glibc-headers.
- Removed poky-scripts, poky-depends circular dependency.

* Wed Dec 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-2
- Added sub-package poky-depends.

* Wed Dec 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poky-scripts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:36:18 -0000	1.1
+++ .cvsignore	22 Dec 2009 03:36:28 -0000	1.2
@@ -0,0 +1 @@
+poky-scripts_6etch1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poky-scripts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:36:19 -0000	1.1
+++ sources	22 Dec 2009 03:36:28 -0000	1.2
@@ -0,0 +1 @@
+c6772aba6a0293ffd3a3e52878f5e79f  poky-scripts_6etch1.tar.gz



From petersen at fedoraproject.org  Tue Dec 22 03:37:00 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 03:37:00 +0000 (UTC)
Subject: File yum-langpacks-0.1.4.tar.gz uploaded to lookaside cache by
	petersen
Message-ID: <20091222033700.1514810F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for yum-langpacks:

d5964f5a8077aa3649ccebb50ae7c4c1  yum-langpacks-0.1.4.tar.gz



From petersen at fedoraproject.org  Tue Dec 22 03:38:04 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 03:38:04 +0000 (UTC)
Subject: rpms/yum-langpacks/devel import.log, NONE, 1.1 yum-langpacks.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222033804.236AE11C00CF@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/yum-langpacks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29252/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yum-langpacks.spec 
Log Message:



--- NEW FILE import.log ---
yum-langpacks-0_1_4-2_fc12:HEAD:yum-langpacks-0.1.4-2.fc12.src.rpm:1261453034


--- NEW FILE yum-langpacks.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Langpacks plugin for yum
Name: yum-langpacks
Version: 0.1.4
Release: 2%{?dist}
License: GPLv2+
Group: Development/Tools
Source0: http://petersen.fedorapeople.org/%{name}/%{name}-%{version}.tar.gz
URL: https://fedoraproject.org/wiki/Features/YumLangpackPlugin
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-setuptools
Requires: yum >= 3.0

%description
Yum-langpacks is a plugin for YUM that looks for langpacks for your native
language for packages you install.

%prep
%setup -q

%build

%install
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, -)
%doc README COPYING
%{python_sitelib}/*
%{_prefix}/lib/yum-plugins/langpacks.py*
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/langpacks.conf

%changelog
* Tue Dec  8 2009 Jens Petersen <petersen at redhat.com> - 0.1.4-2
- fix source url (#536737)
- drop python requires (#536737)
- drop buildroot and cleaning of buildroot (#536737)
- use global (#536737)

* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.1.4-1
- BR python-setuptools (#536737)
- remove shebang from langpacks.py (#536737)

* Wed Nov 11 2009 Jens Petersen <petersen at redhat.com> - 0.1.3-1
- initial package (#433512)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-langpacks/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:50:25 -0000	1.1
+++ .cvsignore	22 Dec 2009 03:38:03 -0000	1.2
@@ -0,0 +1 @@
+yum-langpacks-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-langpacks/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:50:25 -0000	1.1
+++ sources	22 Dec 2009 03:38:03 -0000	1.2
@@ -0,0 +1 @@
+d5964f5a8077aa3649ccebb50ae7c4c1  yum-langpacks-0.1.4.tar.gz



From shakthimaan at fedoraproject.org  Tue Dec 22 03:39:12 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Tue, 22 Dec 2009 03:39:12 +0000 (UTC)
Subject: rpms/poky-scripts/EL-5 README.fedora, NONE, 1.1 import.log, NONE,
	1.1 poky-scripts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091222033912.4DC5411C00CF@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/poky-scripts/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29526/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log poky-scripts.spec 
Log Message:
First package.



--- NEW FILE README.fedora ---
README.fedora
=============

The poky-depends is to ensure all the required packages are installed
to build poky images. Please note that this only installs the
dependency packages.

If you want to build images, you will need to download Poky. Please refer:

http://pokylinux.org/getit/

http://pokylinux.org/support/

--
Shakthi Kannan
shakthimaan at gmail.com

--- NEW FILE import.log ---
poky-scripts-6-6_fc12:EL-5:poky-scripts-6-6.fc12.src.rpm:1261453634


--- NEW FILE poky-scripts.spec ---
Name:           poky-scripts
Version:        6
Release:        6%{?dist}
Summary:        Poky platform builder utility scripts

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://pokylinux.org
Source0:        http://debian.o-hand.com/etch/%{name}_6etch1.tar.gz
Source1:        README.fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       sudo distcc distcc-server xorg-x11-server-Xephyr
Requires:       poky-depends

BuildArchitectures:  noarch

%description
%{name} contains utility scripts for Poky such as poky-qemu, which will
run a Poky image in QEMU with the right arguments.

%package        -n poky-depends
Summary:        Poky platform builder dependency package list
Group:          Applications/Engineering
Requires:       glibc-devel diffstat texinfo texi2html cvs subversion gawk help2man python-sqlite2 bzip2 compat-gcc-34 
Requires:       qemu >= 0.8.2

%if 0%{?fedora}
BuildArchitectures:  noarch
%endif

%description    -n poky-depends
%{name} is a meta-package that lists and installs the 
required packages for a Poky build.

%prep
%setup -q -n %{name}-%{version}etch1

# poky-depends
%{__cp} -p %{SOURCE1} %{_builddir}/%{name}-%{version}etch1

%build

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{_datadir}/%{name}
%{__install} -pm 755 -d %{buildroot}%{_bindir}
%{__install} -pm 755 poky-qemu %{buildroot}%{_bindir}/
%{__install} -pm 755 poky-chroot-* %{buildroot}%{_bindir}/
%{__install} -pm 755 poky-qemu-* %{buildroot}%{_datadir}/%{name}
%{__install} -pm 755 poky-addptable2image %{buildroot}%{_datadir}/%{name}

# poky-depends
%{__install} -pm 755 -d %{buildroot}%{_docdir}/%{name}-%{version}
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}-%{version}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc poky-qemu.README
%{_bindir}/poky-*
%{_datadir}/%{name}

%files -n poky-depends
%defattr(-,root,root,-)
%doc README.fedora

%changelog
* Sun Dec 20 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-6
- Added if condition for depends BuildArchitecture noarch.

* Wed Dec 16 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-5
- Moved glibc-devel to Requires.
- Removed redundant inclusion of datadir/name.

* Tue Dec 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-4
- Removed explicit Requires python from poky-depends.

* Thu Dec 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-3
- Removed glibc-headers.
- Removed poky-scripts, poky-depends circular dependency.

* Wed Dec 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-2
- Added sub-package poky-depends.

* Wed Dec 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 6-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poky-scripts/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:36:18 -0000	1.1
+++ .cvsignore	22 Dec 2009 03:39:11 -0000	1.2
@@ -0,0 +1 @@
+poky-scripts_6etch1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poky-scripts/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:36:19 -0000	1.1
+++ sources	22 Dec 2009 03:39:12 -0000	1.2
@@ -0,0 +1 @@
+c6772aba6a0293ffd3a3e52878f5e79f  poky-scripts_6etch1.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 22 03:46:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 03:46:11 +0000
Subject: [pkgdb] xpad ownership updated
Message-ID: <20091222034612.0142B10F83D@bastion.fedoraproject.org>

Package xpad in Fedora devel is now owned by cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xpad



From pkgdb at fedoraproject.org  Tue Dec 22 03:47:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 03:47:28 +0000
Subject: [pkgdb] fbpanel ownership updated
Message-ID: <20091222034728.28AE710F83D@bastion.fedoraproject.org>

Package fbpanel in Fedora devel is now owned by cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbpanel



From pkgdb at fedoraproject.org  Tue Dec 22 03:47:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 03:47:41 +0000
Subject: [pkgdb] fbpanel ownership updated
Message-ID: <20091222034741.9F43510F83D@bastion.fedoraproject.org>

Package fbpanel in Fedora 12 is now owned by cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbpanel



From pkgdb at fedoraproject.org  Tue Dec 22 03:47:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 03:47:47 +0000
Subject: [pkgdb] fbpanel ownership updated
Message-ID: <20091222034747.59F2610F83D@bastion.fedoraproject.org>

Package fbpanel in Fedora 11 is now owned by cwickert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbpanel



From huzaifas at fedoraproject.org  Tue Dec 22 03:54:33 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 22 Dec 2009 03:54:33 +0000 (UTC)
Subject: File openvas-libnasl-2.0.2.tar.gz uploaded to lookaside cache by
	huzaifas
Message-ID: <20091222035433.A01AD10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for openvas-libnasl:

c6d4e9099b860a0dceda6c10eacc26f4  openvas-libnasl-2.0.2.tar.gz



From huzaifas at fedoraproject.org  Tue Dec 22 03:55:32 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Tue, 22 Dec 2009 03:55:32 +0000 (UTC)
Subject: rpms/openvas-libnasl/devel import.log, NONE, 1.1 openvas-libnasl.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222035532.7A87611C00CF@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/openvas-libnasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31732/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log openvas-libnasl.spec 
Log Message:



--- NEW FILE import.log ---
openvas-libnasl-2_0_2-3_fc12:HEAD:openvas-libnasl-2.0.2-3.fc12.src.rpm:1261439696


--- NEW FILE openvas-libnasl.spec ---
Summary: OpenVAS Libraries module for support of the NASL scripting language
Name:    openvas-libnasl
Version: 2.0.2
Release: 3%{?dist}
URL:     http://www.openvas.org
Source0: http://wald.intevation.org/frs/download.php/619/%{name}-%{version}.tar.gz
License: GPLv2
Group:   System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: openvas-libraries-devel
BuildRequires: gpgme-devel
BuildRequires: glib2-devel
BuildRequires: libgcrypt-devel
BuildRequires: bison
BuildRequires: gnutls-devel
BuildRequires: libpcap-devel


%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description
This is the libraries module for the Open Vulnerability Assessment System
(OpenVAS) containing support for the NASL scripting language.


%description devel
Development libraries and headers for use with %{name}.


%prep
%setup -q
iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.utf8 && \
touch -r ChangeLog ChangeLog.utf8 && \
mv -f ChangeLog.utf8 ChangeLog


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog CHANGES COPYING README
%{_bindir}/openvas-nasl
%{_libdir}/libopenvasnasl.so.*
%{_mandir}/man1/openvas-*.1.*


%files devel
%defattr(-,root,root,-)
%{_bindir}/openvas-libnasl-config
%{_includedir}/openvas/nasl.h
%{_libdir}/libopenvasnasl.so


%changelog
* Fri Dec 18 2009 Huzaifa Sidhpurwalla <huzaifas at redhat.com> 2.0.2-3
- Put the correct tarball
- Bump version

* Thu Nov 26 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com>  2.0.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvas-libnasl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 17:57:52 -0000	1.1
+++ .cvsignore	22 Dec 2009 03:55:32 -0000	1.2
@@ -0,0 +1 @@
+openvas-libnasl-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvas-libnasl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 17:57:52 -0000	1.1
+++ sources	22 Dec 2009 03:55:32 -0000	1.2
@@ -0,0 +1 @@
+c6d4e9099b860a0dceda6c10eacc26f4  openvas-libnasl-2.0.2.tar.gz



From mclasen at fedoraproject.org  Tue Dec 22 03:57:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 03:57:12 +0000 (UTC)
Subject: File gtk+-2.19.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222035712.9643B10F83D@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gtk2:

c7b4997a13f644a45349a6a22a21e577  gtk+-2.19.2.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 04:02:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 04:02:11 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.118, 1.119 gtk2.spec, 1.413,
	1.414 sources, 1.128, 1.129
Message-ID: <20091222040211.E82CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32686

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.19.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- .cvsignore	1 Dec 2009 01:13:45 -0000	1.118
+++ .cvsignore	22 Dec 2009 04:02:11 -0000	1.119
@@ -1 +1 @@
-gtk+-2.19.1.tar.bz2
+gtk+-2.19.2.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- gtk2.spec	1 Dec 2009 02:50:12 -0000	1.413
+++ gtk2.spec	22 Dec 2009 04:02:11 -0000	1.414
@@ -10,8 +10,9 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
+%define gobject_introspection_version 0.6.7
 
-%define base_version 2.19.1
+%define base_version 2.19.2
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -61,6 +62,7 @@ BuildRequires: libXfixes-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXcomposite-devel
 BuildRequires: libXdamage-devel
+BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -164,6 +166,7 @@ This package contains developer document
 	   --enable-debug		\
 	   --disable-gtk-doc 		\
 	   --disable-rebuilds 		\
+	   --enable-introspection	\
 	   --with-libjasper		\
 	   --with-included-loaders=png
 
@@ -385,6 +388,9 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.19.2-1
+- Update to 2.19.2
+
 * Wed Nov 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-22
 - Make level3 keys work again (#537567)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- sources	1 Dec 2009 01:13:45 -0000	1.128
+++ sources	22 Dec 2009 04:02:11 -0000	1.129
@@ -1 +1 @@
-d11e2044aedc49e155832c54dc9ac548  gtk+-2.19.1.tar.bz2
+c7b4997a13f644a45349a6a22a21e577  gtk+-2.19.2.tar.bz2



From cweyl at fedoraproject.org  Tue Dec 22 04:30:38 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 22 Dec 2009 04:30:38 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.247,1.248
Message-ID: <20091222043038.D0C6111C00E9@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27056

Modified Files:
	perl.spec 
Log Message:
* Mon Dec 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.1-107
- subpackage parent and Parse-CPAN-Meta; add them to core's dep list



Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- perl.spec	18 Dec 2009 11:57:43 -0000	1.247
+++ perl.spec	22 Dec 2009 04:30:37 -0000	1.248
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        106%{?dist}
+Release:        107%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -729,6 +729,20 @@ Requires:       perl = %{perl_epoch}:%{p
 Params::Check is a generic input parsing/checking mechanism.
 
 
+%package Parse-CPAN-Meta
+Summary:        Parse META.yml and other similar CPAN metadata files
+Group:          Development/Libraries
+License:        GPL+ or Artistic
+# Epoch bump for clean upgrade over old standalone package
+Epoch:          1
+Version:        1.39
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
+
+%description Parse-CPAN-Meta 
+Parse::CPAN::Meta is a parser for META.yml files, based on the parser half
+of YAML::Tiny.
+
+
 %package Pod-Escapes
 Summary:        Perl module for resolving POD escape sequences
 Group:   	Development/Libraries
@@ -815,6 +829,29 @@ compatible manner, so that using localti
 perlfunc still behave as expected.
 
 
+%package parent
+Summary:        Establish an ISA relationship with base classes at compile time
+Group:          Development/Libraries
+License:        GPL+ or Artistic
+# Epoch bump for clean upgrade over old standalone package
+Epoch:          1
+Version:        0.221
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
+
+%description parent
+parent allows you to both load one or more modules, while setting up 
+inheritance from those modules at the same time. Mostly similar in 
+effect to:
+
+    package Baz;
+
+    BEGIN {
+        require Foo;
+        require Bar; 
+        
+        push @ISA, qw(Foo Bar); 
+    }
+
 %package version
 Summary:        Perl extension for Version Objects
 Group:          Development/Libraries
@@ -851,6 +888,7 @@ Requires:       perl-Module-Load-Conditi
 Requires:       perl-Module-Pluggable, perl-Object-Accessor, perl-Package-Constants,
 Requires:       perl-Params-Check, perl-Pod-Escapes, perl-Pod-Simple, perl-Term-UI, 
 Requires:       perl-Test-Harness, perl-Test-Simple, perl-Time-Piece, perl-version
+Requires:       perl-parent, perl-Parse-CPAN-Meta
 # Note: perl-suidperl has always been an independent subpackage
 # We don't want perl-core to drag it in.
 
@@ -1745,6 +1783,13 @@ make test
 %{privlib}/Params/
 %{_mandir}/man3/Params::Check*
 
+%files Parse-CPAN-Meta
+%defattr(-,root,root,-)
+%dir %{privlib}/Parse/
+%dir %{privlib}/Parse/CPAN/
+%{privlib}/Parse/CPAN/Meta.pm
+%{_mandir}/man3/Parse::CPAN::Meta.3*
+
 %files Pod-Escapes
 %defattr(-,root,root,-)
 %{privlib}/Pod/Escapes.pm
@@ -1793,6 +1838,11 @@ make test
 %{_mandir}/man3/Time::Piece.3*
 %{_mandir}/man3/Time::Seconds.3*
 
+%files parent 
+%defattr(-,root,root,-)
+%{privlib}/parent.pm
+%{_mandir}/man3/parent.3*
+
 %files version
 %defattr(-,root,root,-)
 %{privlib}/version.pm
@@ -1804,6 +1854,9 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Dec 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.1-107
+- subpackage parent and Parse-CPAN-Meta; add them to core's dep list
+
 * Fri Dec 19 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 4:5.10.1-106
 - exclude "parent".
 



From mstone at fedoraproject.org  Tue Dec 22 05:00:02 2009
From: mstone at fedoraproject.org (Michael Stone)
Date: Tue, 22 Dec 2009 05:00:02 +0000 (UTC)
Subject: File rainbow-0.8.6.tar.bz2 uploaded to lookaside cache by mstone
Message-ID: <20091222050002.9E05410F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rainbow:

34ee39b43107ed1ca0a3e56eb7139ee7  rainbow-0.8.6.tar.bz2



From mstone at fedoraproject.org  Tue Dec 22 05:00:48 2009
From: mstone at fedoraproject.org (Michael Stone)
Date: Tue, 22 Dec 2009 05:00:48 +0000 (UTC)
Subject: rpms/rainbow/devel .cvsignore, 1.4, 1.5 rainbow.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20091222050048.8862A11C00E9@cvs1.fedora.phx.redhat.com>

Author: mstone

Update of /cvs/pkgs/rpms/rainbow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30026

Modified Files:
	.cvsignore rainbow.spec sources 
Log Message:
- Michael Stone (many):
    Helpers for resume and gc.
    Bug fixes.
    ...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Nov 2009 22:30:22 -0000	1.4
+++ .cvsignore	22 Dec 2009 05:00:48 -0000	1.5
@@ -1 +1 @@
-rainbow-0.8.5.tar.bz2
+rainbow-0.8.6.tar.bz2


Index: rainbow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/devel/rainbow.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rainbow.spec	1 Dec 2009 02:35:23 -0000	1.7
+++ rainbow.spec	22 Dec 2009 05:00:48 -0000	1.8
@@ -3,8 +3,8 @@
 %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")}
 
 Name:           rainbow
-Version:        0.8.5
-Release:        2%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        An isolation shell
 
 Group:          System Environment/Daemons
@@ -66,11 +66,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/rainbow-sugarize
 %{_bindir}/rainbow-xify
 %{_bindir}/rainbow-easy
+%{_bindir}/rainbow-gc
+%{_bindir}/rainbow-resume
 %{_bindir}/mkenvdir
 %dir %{_localstatedir}/spool/rainbow
 /%{_lib}/libnss_rainbow.so.2
 
 %changelog
+* Mon Dec 21 2009 Michael Stone <michael at laptop.org> - 0.8.6-1
+- Michael Stone (many):
+    Helpers for resume and gc.
+    Bug fixes.
+    ...
+
 * Mon Nov 30 2009 Michael Stone <michael at laptop.org> - 0.8.5-2
 - rhbz#542699: build with %%{optflags}
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rainbow/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Nov 2009 22:30:22 -0000	1.4
+++ sources	22 Dec 2009 05:00:48 -0000	1.5
@@ -1 +1 @@
-78b1ee8e3910806b4f05bb8e7bf3e861  rainbow-0.8.5.tar.bz2
+34ee39b43107ed1ca0a3e56eb7139ee7  rainbow-0.8.6.tar.bz2



From eliwap at fedoraproject.org  Tue Dec 22 05:30:29 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Tue, 22 Dec 2009 05:30:29 +0000 (UTC)
Subject: File qjson-0.7.1.tar.bz2 uploaded to lookaside cache by eliwap
Message-ID: <20091222053029.F2E1810F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qjson:

5a833ad606c164ed8aa69f0873366ace  qjson-0.7.1.tar.bz2



From nb at fedoraproject.org  Tue Dec 22 05:39:47 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Tue, 22 Dec 2009 05:39:47 +0000 (UTC)
Subject: rpms/spamassassin/devel sources, 1.55, 1.56 spamassassin.spec, 1.137, 
	1.138
Message-ID: <20091222053947.C332F11C00E9@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1878

Modified Files:
	sources spamassassin.spec 
Log Message:
Revert to 3.3.0-beta1 until I (or Warren) have built and tested a fixed
version of rc1.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	19 Dec 2009 03:08:02 -0000	1.55
+++ sources	22 Dec 2009 05:39:47 -0000	1.56
@@ -1,2 +1,2 @@
-0bf1e2c0fc70dc05104acec8a723cbdb  Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
-fabccde7f09dcdf4c06afbd4cc0687c2  Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2
+9b39e4e4fad09cfe9eff974f3d5a01ea  Mail-SpamAssassin-3.3.0-beta1.tar.bz2
+cbd092c4e0e71b531f7aca81d4eb2781  Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- spamassassin.spec	19 Dec 2009 03:08:02 -0000	1.137
+++ spamassassin.spec	22 Dec 2009 05:39:47 -0000	1.138
@@ -53,9 +53,8 @@ Requires: portreserve
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename rc1
-%define proposed .proposed1
-Release: 0.23.%{prename}%{?dist}
+%define prename beta1
+Release: 0.24.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -261,6 +260,11 @@ fi
 exit 0
 
 %changelog
+
+* Mon Dec 21 2009 Nick Bebout <nb at fedoraproject.org> - 3.3.0-0.24.beta1
+- Revert to beta1 to fix major error where spamc does nothing and mail
+  is lost into black hole.
+
 * Fri Dec 18 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.23.rc1
 - 3.3.0-rc1
 - Bug #103401: portreserve protect spamd port 783 on F-10+



From eliwap at fedoraproject.org  Tue Dec 22 05:42:10 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Tue, 22 Dec 2009 05:42:10 +0000 (UTC)
Subject: rpms/qjson/devel import.log, NONE, 1.1 qjson.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222054210.A84D311C00E9@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/qjson/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2093/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qjson.spec 
Log Message:

----------------------------------------------------------------------
Modified Files:
	devel/.cvsignore devel/sources 
        Added Files:
 	devel/import.log devel/qjson.spec 
----------------------------------------------------------------------




--- NEW FILE import.log ---
qjson-0_7_1-1_fc12:HEAD:qjson-0.7.1-1.fc12.src.rpm:1261459905


--- NEW FILE qjson.spec ---
Name:           qjson
Version:        0.7.1
Release:        1%{?dist}
Summary:        A qt-based library that maps JSON data to QVariant objects

Group:          Development/Languages
License:        GPLv2+
URL:            http://sourceforge.net/projects/qjson/
Source0:        http://downloads.sourceforge.net/project/qjson/qjson/0.7.1/qjson-0.7.1.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel >= 4.0
BuildRequires:  cmake >= 2.6
BuildRequires:  doxygen

%description
JSON is a lightweight data-interchange format. It can represents integer, real
number, string, an ordered sequence of value, and a collection of
name/value pairs.QJson is a qt-based library that maps JSON data to
QVariant objects.

%package devel
Summary:  Development files for qjson
Group:    Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt-devel >= 4.0
Requires: pkgconfig
Requires: cmake

%description devel
The %{name}-devel package contains the libraries and header files required for
developing applications that use %{name}.

%prep
%setup -qn qjson

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} -DQJSON_BUILD_TESTS=1  -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules/  ..
cd %{_builddir}/%{buildsubdir}/doc
doxygen
popd

sed -i -e 's/-fno-exceptions -fno-check-new -fno-common//' \
-e 's/-fno-threadsafe-statics -fvisibility=hidden -fvisibility-inlines-hidden//' \
-e 's/-ansi//' %{_target_platform}/src/CMakeFiles/qjson.dir/flags.make

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

%check
LD_PRELOAD=%{_target_platform}/%{_lib}/libqjson.so \
           %{_target_platform}/tests/testparser
LD_PRELOAD=%{_target_platform}/%{_lib}/libqjson.so \
           %{_target_platform}/tests/testserializer

%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,-)
%doc doc/html
%{_includedir}/qjson/
%{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/Modules/FindQJSON.cmake
%{_libdir}/*.so

%changelog
* Sat Dec 12 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.7.1-1
-0.7.1
- Version upgrade
- Fixed doxygen documentation (Thanks again Orcan)

* Tue Dec 8 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-6
-0.6.3
- Fixed capitalization of the summary 

* Tue Dec 8 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-5
-0.6.3
- Moved Doxygen docs to the development package.
- Corrected placement of the cmake project file (Thanks Orcan)
- Fixed the running of the build tests
- Corrected column length of the descriptions
- Changed description of the devlepment package

* Sun Dec 6 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-4
-0.6.3
- Additional placment of library files fix

* Fri Dec 4 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-3
-0.6.3
- Fixed placment of library files
- Activated build tests
- Corrected ownership of include directory
- Corrected dependacies
- Added doxygen documentation
- Fixed reported version in the changelogs

* Sun Nov 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-2
-0.6.3
- Split off development libraries to its own package
- Modified licensing in spec file to reflect GPL2 code though docs state that qjson
-   licensed under LPGL
- Uncommeted and corrected sed line in this spec file

* Sun Nov 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-1
-0.6.3
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjson/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:49:29 -0000	1.1
+++ .cvsignore	22 Dec 2009 05:42:10 -0000	1.2
@@ -0,0 +1 @@
+qjson-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjson/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:49:29 -0000	1.1
+++ sources	22 Dec 2009 05:42:10 -0000	1.2
@@ -0,0 +1 @@
+5a833ad606c164ed8aa69f0873366ace  qjson-0.7.1.tar.bz2



From nb at fedoraproject.org  Tue Dec 22 05:43:21 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Tue, 22 Dec 2009 05:43:21 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.138,1.139
Message-ID: <20091222054321.80DC411C00E9@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2494

Modified Files:
	spamassassin.spec 
Log Message:
Remove proposed from Source0



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- spamassassin.spec	22 Dec 2009 05:39:47 -0000	1.138
+++ spamassassin.spec	22 Dec 2009 05:43:21 -0000	1.139
@@ -58,7 +58,7 @@ Release: 0.24.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
 Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz 
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc



From eliwap at fedoraproject.org  Tue Dec 22 05:44:36 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Tue, 22 Dec 2009 05:44:36 +0000 (UTC)
Subject: rpms/qjson/F-11 import.log, NONE, 1.1 qjson.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222054436.996F611C00E9@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/qjson/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2781/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qjson.spec 
Log Message:

----------------------------------------------------------------------
Modified Files:
	F-11/.cvsignore F-11/sources 
	Added Files:
	F-11/import.log F-11/qjson.spec 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
qjson-0_7_1-1_fc12:F-11:qjson-0.7.1-1.fc12.src.rpm:1261460681


--- NEW FILE qjson.spec ---
Name:           qjson
Version:        0.7.1
Release:        1%{?dist}
Summary:        A qt-based library that maps JSON data to QVariant objects

Group:          Development/Languages
License:        GPLv2+
URL:            http://sourceforge.net/projects/qjson/
Source0:        http://downloads.sourceforge.net/project/qjson/qjson/0.7.1/qjson-0.7.1.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel >= 4.0
BuildRequires:  cmake >= 2.6
BuildRequires:  doxygen

%description
JSON is a lightweight data-interchange format. It can represents integer, real
number, string, an ordered sequence of value, and a collection of
name/value pairs.QJson is a qt-based library that maps JSON data to
QVariant objects.

%package devel
Summary:  Development files for qjson
Group:    Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt-devel >= 4.0
Requires: pkgconfig
Requires: cmake

%description devel
The %{name}-devel package contains the libraries and header files required for
developing applications that use %{name}.

%prep
%setup -qn qjson

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} -DQJSON_BUILD_TESTS=1  -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules/  ..
cd %{_builddir}/%{buildsubdir}/doc
doxygen
popd

sed -i -e 's/-fno-exceptions -fno-check-new -fno-common//' \
-e 's/-fno-threadsafe-statics -fvisibility=hidden -fvisibility-inlines-hidden//' \
-e 's/-ansi//' %{_target_platform}/src/CMakeFiles/qjson.dir/flags.make

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

%check
LD_PRELOAD=%{_target_platform}/%{_lib}/libqjson.so \
           %{_target_platform}/tests/testparser
LD_PRELOAD=%{_target_platform}/%{_lib}/libqjson.so \
           %{_target_platform}/tests/testserializer

%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,-)
%doc doc/html
%{_includedir}/qjson/
%{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/Modules/FindQJSON.cmake
%{_libdir}/*.so

%changelog
* Sat Dec 12 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.7.1-1
-0.7.1
- Version upgrade
- Fixed doxygen documentation (Thanks again Orcan)

* Tue Dec 8 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-6
-0.6.3
- Fixed capitalization of the summary 

* Tue Dec 8 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-5
-0.6.3
- Moved Doxygen docs to the development package.
- Corrected placement of the cmake project file (Thanks Orcan)
- Fixed the running of the build tests
- Corrected column length of the descriptions
- Changed description of the devlepment package

* Sun Dec 6 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-4
-0.6.3
- Additional placment of library files fix

* Fri Dec 4 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-3
-0.6.3
- Fixed placment of library files
- Activated build tests
- Corrected ownership of include directory
- Corrected dependacies
- Added doxygen documentation
- Fixed reported version in the changelogs

* Sun Nov 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-2
-0.6.3
- Split off development libraries to its own package
- Modified licensing in spec file to reflect GPL2 code though docs state that qjson
-   licensed under LPGL
- Uncommeted and corrected sed line in this spec file

* Sun Nov 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-1
-0.6.3
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjson/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:49:29 -0000	1.1
+++ .cvsignore	22 Dec 2009 05:44:36 -0000	1.2
@@ -0,0 +1 @@
+qjson-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjson/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:49:29 -0000	1.1
+++ sources	22 Dec 2009 05:44:36 -0000	1.2
@@ -0,0 +1 @@
+5a833ad606c164ed8aa69f0873366ace  qjson-0.7.1.tar.bz2



From eliwap at fedoraproject.org  Tue Dec 22 05:47:00 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Tue, 22 Dec 2009 05:47:00 +0000 (UTC)
Subject: rpms/qjson/F-12 import.log, NONE, 1.1 qjson.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222054700.895B911C00E9@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/qjson/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3339/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qjson.spec 
Log Message:

----------------------------------------------------------------------
Modified Files:
	F-12/.cvsignore F-12/sources 
Added Files:
	F-12/import.log F-12/qjson.spec 
----------------------------------------------------------------------



--- NEW FILE import.log ---
qjson-0_7_1-1_fc12:F-12:qjson-0.7.1-1.fc12.src.rpm:1261460815


--- NEW FILE qjson.spec ---
Name:           qjson
Version:        0.7.1
Release:        1%{?dist}
Summary:        A qt-based library that maps JSON data to QVariant objects

Group:          Development/Languages
License:        GPLv2+
URL:            http://sourceforge.net/projects/qjson/
Source0:        http://downloads.sourceforge.net/project/qjson/qjson/0.7.1/qjson-0.7.1.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel >= 4.0
BuildRequires:  cmake >= 2.6
BuildRequires:  doxygen

%description
JSON is a lightweight data-interchange format. It can represents integer, real
number, string, an ordered sequence of value, and a collection of
name/value pairs.QJson is a qt-based library that maps JSON data to
QVariant objects.

%package devel
Summary:  Development files for qjson
Group:    Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt-devel >= 4.0
Requires: pkgconfig
Requires: cmake

%description devel
The %{name}-devel package contains the libraries and header files required for
developing applications that use %{name}.

%prep
%setup -qn qjson

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} -DQJSON_BUILD_TESTS=1  -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules/  ..
cd %{_builddir}/%{buildsubdir}/doc
doxygen
popd

sed -i -e 's/-fno-exceptions -fno-check-new -fno-common//' \
-e 's/-fno-threadsafe-statics -fvisibility=hidden -fvisibility-inlines-hidden//' \
-e 's/-ansi//' %{_target_platform}/src/CMakeFiles/qjson.dir/flags.make

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

%check
LD_PRELOAD=%{_target_platform}/%{_lib}/libqjson.so \
           %{_target_platform}/tests/testparser
LD_PRELOAD=%{_target_platform}/%{_lib}/libqjson.so \
           %{_target_platform}/tests/testserializer

%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,-)
%doc doc/html
%{_includedir}/qjson/
%{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/Modules/FindQJSON.cmake
%{_libdir}/*.so

%changelog
* Sat Dec 12 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.7.1-1
-0.7.1
- Version upgrade
- Fixed doxygen documentation (Thanks again Orcan)

* Tue Dec 8 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-6
-0.6.3
- Fixed capitalization of the summary 

* Tue Dec 8 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-5
-0.6.3
- Moved Doxygen docs to the development package.
- Corrected placement of the cmake project file (Thanks Orcan)
- Fixed the running of the build tests
- Corrected column length of the descriptions
- Changed description of the devlepment package

* Sun Dec 6 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-4
-0.6.3
- Additional placment of library files fix

* Fri Dec 4 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-3
-0.6.3
- Fixed placment of library files
- Activated build tests
- Corrected ownership of include directory
- Corrected dependacies
- Added doxygen documentation
- Fixed reported version in the changelogs

* Sun Nov 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-2
-0.6.3
- Split off development libraries to its own package
- Modified licensing in spec file to reflect GPL2 code though docs state that qjson
-   licensed under LPGL
- Uncommeted and corrected sed line in this spec file

* Sun Nov 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.6.3-1
-0.6.3
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjson/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:49:29 -0000	1.1
+++ .cvsignore	22 Dec 2009 05:46:59 -0000	1.2
@@ -0,0 +1 @@
+qjson-0.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjson/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:49:29 -0000	1.1
+++ sources	22 Dec 2009 05:47:00 -0000	1.2
@@ -0,0 +1 @@
+5a833ad606c164ed8aa69f0873366ace  qjson-0.7.1.tar.bz2



From nb at fedoraproject.org  Tue Dec 22 05:49:52 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Tue, 22 Dec 2009 05:49:52 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.139,1.140
Message-ID: <20091222054952.3B06611C00E9@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3769

Modified Files:
	spamassassin.spec 
Log Message:
I forgot to revert the name of the rules package



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- spamassassin.spec	22 Dec 2009 05:43:21 -0000	1.139
+++ spamassassin.spec	22 Dec 2009 05:49:51 -0000	1.140
@@ -59,7 +59,7 @@ License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz 
+Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc



From eliwap at fedoraproject.org  Tue Dec 22 06:11:07 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Tue, 22 Dec 2009 06:11:07 +0000 (UTC)
Subject: File translatoid1-1.tar.gz uploaded to lookaside cache by eliwap
Message-ID: <20091222061107.D148D10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kde-plasma-translatoid:

be99ad93f6698c3caf5509de1ae48825  translatoid1-1.tar.gz



From eliwap at fedoraproject.org  Tue Dec 22 06:12:35 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Tue, 22 Dec 2009 06:12:35 +0000 (UTC)
Subject: rpms/kde-plasma-translatoid/devel .cvsignore, 1.5, 1.6 import.log, 1.5,
	1.6 kde-plasma-translatoid.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091222061235.D003511C00E9@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-translatoid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6735/devel

Modified Files:
	.cvsignore import.log kde-plasma-translatoid.spec sources 
Log Message:

----------------------------------------------------------------------
 	devel/.cvsignore devel/import.log 
 	devel/kde-plasma-translatoid.spec devel/sources 
---------------------------------------------------------------------
- 1.1beta - MAJOR CORRECTION
-   Now Translatoid use extender
-   Add Reminder extender to remind you some word after clicking on the star
-   Replace parsing by Json parsing. YOU NEED TO INSTALL libqjson
-   Clear some code and probably add some new bug.. :)
-   If you have some probs, contact me!
-1.1
-  Add new language
-  Afrikaans
-  Albanais
-  Albanais
-  Belarusian
-  Irish
-  Icelandic
-  Macedonian
-  Malaysia
-  Maltese
-  Persan
-  Swahili
-  Turkish




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Aug 2009 05:22:38 -0000	1.5
+++ .cvsignore	22 Dec 2009 06:12:34 -0000	1.6
@@ -1 +1 @@
-translatoid1.0.tar.gz
+translatoid1-1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	10 Aug 2009 05:22:38 -0000	1.5
+++ import.log	22 Dec 2009 06:12:34 -0000	1.6
@@ -3,3 +3,4 @@ kde-plasma-translatoid-0_6-1_fc10:HEAD:k
 kde-plasma-translatoid-0_6-2_fc10:HEAD:kde-plasma-translatoid-0.6-2.fc10.src.rpm:1235628540
 kde-plasma-translatoid-0_9-1_fc11:HEAD:kde-plasma-translatoid-0.9-1.fc11.src.rpm:1246861564
 kde-plasma-translatoid-1_0-1_fc11:HEAD:kde-plasma-translatoid-1.0-1.fc11.src.rpm:1249881318
+kde-plasma-translatoid-1_1-1_fc12:HEAD:kde-plasma-translatoid-1.1-1.fc12.src.rpm:1261462339


Index: kde-plasma-translatoid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/devel/kde-plasma-translatoid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kde-plasma-translatoid.spec	10 Aug 2009 05:22:38 -0000	1.6
+++ kde-plasma-translatoid.spec	22 Dec 2009 06:12:34 -0000	1.7
@@ -1,21 +1,23 @@
 Name:           kde-plasma-translatoid
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Translator Using Google Translator
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/translatoid?content=97511
-Source0:        http://www.kde-look.org/content/content-files/translatoid%{version}.tar.gz
+Source0:        http://www.kde-look.org/content/content-files/translatoid1-1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext >= 0.17
+BuildRequires:  qjson-devel >= 0.5.0
+
 %description
 Translator plasmoid using Google Translator.
 
 %prep
-%setup -qn translatoid
+%setup -qn translatoid1-1
 
 %build
 mkdir -p %{_target_platform}
@@ -42,235 +44,44 @@ rm -rf %{buildroot}
 %doc README licence.txt
 %{_kde4_libdir}/kde4/plasma_applet_translatoid.so
 %{_kde4_datadir}/kde4/services/plasma-applet-translatoid.desktop
+%{_kde4_datadir}/kde4/apps/translatoid/translatoid.db
 #%{_datadir}/locale/es_ES/LC_MESSAGES/translatoid.mo
 #%{_datadir}/locale/fr_FR/LC_MESSAGES/translatoid.mo
-%{_datadir}/icons/hicolor/128x128/apps/translator.png
-%{_datadir}/icons/hicolor/16x16/apps/translator.png
-%{_datadir}/icons/hicolor/22x22/apps/translator.png
-%{_datadir}/icons/hicolor/256x256/apps/translator.png
-%{_datadir}/icons/hicolor/32x32/apps/translator.png
-%{_datadir}/icons/hicolor/48x48/apps/translator.png
-%{_datadir}/icons/hicolor/64x64/apps/translator.png
-%{_datadir}/icons/hicolor/scalable/apps/translator.svgz
-%{_datadir}/icons/kbflags/ad.png
-%{_datadir}/icons/kbflags/ae.png
-%{_datadir}/icons/kbflags/ag.png
-%{_datadir}/icons/kbflags/ai.png
-%{_datadir}/icons/kbflags/al.png
-%{_datadir}/icons/kbflags/am.png
-%{_datadir}/icons/kbflags/an.png
-%{_datadir}/icons/kbflags/ao.png
-%{_datadir}/icons/kbflags/aq.png
-%{_datadir}/icons/kbflags/ar.png
-%{_datadir}/icons/kbflags/as.png
-%{_datadir}/icons/kbflags/at.png
-%{_datadir}/icons/kbflags/au.png
-%{_datadir}/icons/kbflags/aw.png
-%{_datadir}/icons/kbflags/az.png
-%{_datadir}/icons/kbflags/ba.png
-%{_datadir}/icons/kbflags/bb.png
-%{_datadir}/icons/kbflags/bd.png
-%{_datadir}/icons/kbflags/be.png
-%{_datadir}/icons/kbflags/bf.png
-%{_datadir}/icons/kbflags/bg.png
-%{_datadir}/icons/kbflags/bh.png
-%{_datadir}/icons/kbflags/bi.png
-%{_datadir}/icons/kbflags/bj.png
-%{_datadir}/icons/kbflags/bm.png
-%{_datadir}/icons/kbflags/bn.png
-%{_datadir}/icons/kbflags/bo.png
-%{_datadir}/icons/kbflags/br.png
-%{_datadir}/icons/kbflags/bs.png
-%{_datadir}/icons/kbflags/bt.png
-%{_datadir}/icons/kbflags/bv.png
-%{_datadir}/icons/kbflags/bw.png
-%{_datadir}/icons/kbflags/by.png
-%{_datadir}/icons/kbflags/bz.png
-%{_datadir}/icons/kbflags/ca.png
-%{_datadir}/icons/kbflags/cc.png
-%{_datadir}/icons/kbflags/cf.png
-%{_datadir}/icons/kbflags/cg.png
-%{_datadir}/icons/kbflags/ch.png
-%{_datadir}/icons/kbflags/ci.png
-%{_datadir}/icons/kbflags/ck.png
-%{_datadir}/icons/kbflags/cl.png
-%{_datadir}/icons/kbflags/cm.png
-%{_datadir}/icons/kbflags/cn.png
-%{_datadir}/icons/kbflags/co.png
-%{_datadir}/icons/kbflags/cr.png
-%{_datadir}/icons/kbflags/ct.png
-%{_datadir}/icons/kbflags/cu.png
-%{_datadir}/icons/kbflags/cv.png
-%{_datadir}/icons/kbflags/cy.png
-%{_datadir}/icons/kbflags/cz.png
-%{_datadir}/icons/kbflags/de.png
-%{_datadir}/icons/kbflags/dj.png
-%{_datadir}/icons/kbflags/dk.png
-%{_datadir}/icons/kbflags/dm.png
-%{_datadir}/icons/kbflags/do.png
-%{_datadir}/icons/kbflags/dz.png
-%{_datadir}/icons/kbflags/ec.png
-%{_datadir}/icons/kbflags/ee.png
-%{_datadir}/icons/kbflags/eg.png
-%{_datadir}/icons/kbflags/eh.png
-%{_datadir}/icons/kbflags/er.png
-%{_datadir}/icons/kbflags/es.png
-%{_datadir}/icons/kbflags/et.png
-%{_datadir}/icons/kbflags/eu.png
-%{_datadir}/icons/kbflags/fi.png
-%{_datadir}/icons/kbflags/fj.png
-%{_datadir}/icons/kbflags/fo.png
-%{_datadir}/icons/kbflags/fr.png
-%{_datadir}/icons/kbflags/ga.png
-%{_datadir}/icons/kbflags/gb.png
-%{_datadir}/icons/kbflags/gd.png
-%{_datadir}/icons/kbflags/ge.png
-%{_datadir}/icons/kbflags/gh.png
-%{_datadir}/icons/kbflags/gi.png
-%{_datadir}/icons/kbflags/gm.png
-%{_datadir}/icons/kbflags/gn.png
-%{_datadir}/icons/kbflags/gq.png
-%{_datadir}/icons/kbflags/gr.png
-%{_datadir}/icons/kbflags/gt.png
-%{_datadir}/icons/kbflags/gu.png
-%{_datadir}/icons/kbflags/gw.png
-%{_datadir}/icons/kbflags/gy.png
-%{_datadir}/icons/kbflags/hk.png
-%{_datadir}/icons/kbflags/hn.png
-%{_datadir}/icons/kbflags/hr.png
-%{_datadir}/icons/kbflags/ht.png
-%{_datadir}/icons/kbflags/hu.png
-%{_datadir}/icons/kbflags/id.png
-%{_datadir}/icons/kbflags/ie.png
-%{_datadir}/icons/kbflags/il.png
-%{_datadir}/icons/kbflags/in.png
-%{_datadir}/icons/kbflags/iq.png
-%{_datadir}/icons/kbflags/ir.png
-%{_datadir}/icons/kbflags/is.png
-%{_datadir}/icons/kbflags/it.png
-%{_datadir}/icons/kbflags/jm.png
-%{_datadir}/icons/kbflags/jo.png
-%{_datadir}/icons/kbflags/jp.png
-%{_datadir}/icons/kbflags/ke.png
-%{_datadir}/icons/kbflags/kg.png
-%{_datadir}/icons/kbflags/kh.png
-%{_datadir}/icons/kbflags/ki.png
-%{_datadir}/icons/kbflags/km.png
-%{_datadir}/icons/kbflags/kn.png
-%{_datadir}/icons/kbflags/kp.png
-%{_datadir}/icons/kbflags/kr.png
-%{_datadir}/icons/kbflags/kw.png
-%{_datadir}/icons/kbflags/kz.png
-%{_datadir}/icons/kbflags/la.png
-%{_datadir}/icons/kbflags/lb.png
-%{_datadir}/icons/kbflags/lc.png
-%{_datadir}/icons/kbflags/li.png
-%{_datadir}/icons/kbflags/lk.png
-%{_datadir}/icons/kbflags/lr.png
-%{_datadir}/icons/kbflags/ls.png
-%{_datadir}/icons/kbflags/lt.png
-%{_datadir}/icons/kbflags/lu.png
-%{_datadir}/icons/kbflags/lv.png
-%{_datadir}/icons/kbflags/ly.png
-%{_datadir}/icons/kbflags/ma.png
-%{_datadir}/icons/kbflags/mc.png
-%{_datadir}/icons/kbflags/md.png
-%{_datadir}/icons/kbflags/mg.png
-%{_datadir}/icons/kbflags/mh.png
-%{_datadir}/icons/kbflags/mk.png
-%{_datadir}/icons/kbflags/ml.png
-%{_datadir}/icons/kbflags/mm.png
-%{_datadir}/icons/kbflags/mn.png
-%{_datadir}/icons/kbflags/mo.png
-%{_datadir}/icons/kbflags/mr.png
-%{_datadir}/icons/kbflags/ms.png
-%{_datadir}/icons/kbflags/mt.png
-%{_datadir}/icons/kbflags/mu.png
-%{_datadir}/icons/kbflags/mv.png
-%{_datadir}/icons/kbflags/mw.png
-%{_datadir}/icons/kbflags/mx.png
-%{_datadir}/icons/kbflags/my.png
-%{_datadir}/icons/kbflags/mz.png
-%{_datadir}/icons/kbflags/na.png
-%{_datadir}/icons/kbflags/ne.png
-%{_datadir}/icons/kbflags/ng.png
-%{_datadir}/icons/kbflags/ni.png
-%{_datadir}/icons/kbflags/nl.png
-%{_datadir}/icons/kbflags/no.png
-%{_datadir}/icons/kbflags/np.png
-%{_datadir}/icons/kbflags/nr.png
-%{_datadir}/icons/kbflags/nz.png
-%{_datadir}/icons/kbflags/om.png
-%{_datadir}/icons/kbflags/pa.png
-%{_datadir}/icons/kbflags/pe.png
-%{_datadir}/icons/kbflags/pf.png
-%{_datadir}/icons/kbflags/pg.png
-%{_datadir}/icons/kbflags/ph.png
-%{_datadir}/icons/kbflags/pk.png
-%{_datadir}/icons/kbflags/pl.png
-%{_datadir}/icons/kbflags/pr.png
-%{_datadir}/icons/kbflags/ps.png
-%{_datadir}/icons/kbflags/pt.png
-%{_datadir}/icons/kbflags/pw.png
-%{_datadir}/icons/kbflags/py.png
-%{_datadir}/icons/kbflags/qa.png
-%{_datadir}/icons/kbflags/re.png
-%{_datadir}/icons/kbflags/ro.png
-%{_datadir}/icons/kbflags/rs.png
-%{_datadir}/icons/kbflags/ru.png
-%{_datadir}/icons/kbflags/rw.png
-%{_datadir}/icons/kbflags/sa.png
-%{_datadir}/icons/kbflags/sb.png
-%{_datadir}/icons/kbflags/sc.png
-%{_datadir}/icons/kbflags/se.png
-%{_datadir}/icons/kbflags/sg.png
-%{_datadir}/icons/kbflags/si.png
-%{_datadir}/icons/kbflags/sk.png
-%{_datadir}/icons/kbflags/sl.png
-%{_datadir}/icons/kbflags/sm.png
-%{_datadir}/icons/kbflags/sn.png
-%{_datadir}/icons/kbflags/so.png
-%{_datadir}/icons/kbflags/sr.png
-%{_datadir}/icons/kbflags/st.png
-%{_datadir}/icons/kbflags/sv.png
-%{_datadir}/icons/kbflags/sy.png
-%{_datadir}/icons/kbflags/sz.png
-%{_datadir}/icons/kbflags/tc.png
-%{_datadir}/icons/kbflags/td.png
-%{_datadir}/icons/kbflags/tf.png
-%{_datadir}/icons/kbflags/tg.png
-%{_datadir}/icons/kbflags/th.png
-%{_datadir}/icons/kbflags/tj.png
-%{_datadir}/icons/kbflags/tl.png
-%{_datadir}/icons/kbflags/tn.png
-%{_datadir}/icons/kbflags/to.png
-%{_datadir}/icons/kbflags/tr.png
-%{_datadir}/icons/kbflags/tt.png
-%{_datadir}/icons/kbflags/tv.png
-%{_datadir}/icons/kbflags/tw.png
-%{_datadir}/icons/kbflags/tz.png
-%{_datadir}/icons/kbflags/ua.png
-%{_datadir}/icons/kbflags/ug.png
-%{_datadir}/icons/kbflags/um.png
-%{_datadir}/icons/kbflags/us.png
-%{_datadir}/icons/kbflags/uy.png
-%{_datadir}/icons/kbflags/uz.png
-%{_datadir}/icons/kbflags/va.png
-%{_datadir}/icons/kbflags/vc.png
-%{_datadir}/icons/kbflags/ve.png
-%{_datadir}/icons/kbflags/vg.png
-%{_datadir}/icons/kbflags/vi.png
-%{_datadir}/icons/kbflags/vn.png
-%{_datadir}/icons/kbflags/vu.png
-%{_datadir}/icons/kbflags/ws.png
-%{_datadir}/icons/kbflags/ye.png
-%{_datadir}/icons/kbflags/za.png
-%{_datadir}/icons/kbflags/zm.png
-%{_datadir}/icons/kbflags/zw.png
-
+%{_datadir}/icons/hicolor/128x128/apps/*.png
+%{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/22x22/apps/*.png
+%{_datadir}/icons/hicolor/256x256/apps/*.png
+%{_datadir}/icons/hicolor/32x32/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/64x64/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svgz
+%{_datadir}/icons/kbflags/*.png
 
 
 %changelog
+* Tue Dec 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.1
+-1.1
+- 1.1beta - MAJOR CORRECTION
+-   Now Translatoid use extender
+-   Add Reminder extender to remind you some word after clicking on the star
+-   Replace parsing by Json parsing. YOU NEED TO INSTALL libqjson
+-   Clear some code and probably add some new bug.. :)
+-   If you have some probs, contact me!
+-1.1
+-  Add new language
+-  Afrikaans
+-  Albanais
+-  Albanais
+-  Belarusian
+-  Irish
+-  Icelandic
+-  Macedonian
+-  Malaysia
+-  Maltese
+-  Persan
+-  Swahili
+-  Turkish
+
 * Fri Aug 7 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.0-1
 -1.0
 - Build Requirement Changed from kdebase-workspace-devel >= 4.2.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Aug 2009 05:22:38 -0000	1.5
+++ sources	22 Dec 2009 06:12:34 -0000	1.6
@@ -1 +1 @@
-aaba85e1bf69dc345faff0aa8d66ecf7  translatoid1.0.tar.gz
+be99ad93f6698c3caf5509de1ae48825  translatoid1-1.tar.gz



From eliwap at fedoraproject.org  Tue Dec 22 06:15:22 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Tue, 22 Dec 2009 06:15:22 +0000 (UTC)
Subject: rpms/kde-plasma-translatoid/F-11 .cvsignore, 1.5, 1.6 import.log, 1.5,
	1.6 kde-plasma-translatoid.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20091222061522.C3C5A11C00E9@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-translatoid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7167/F-11

Modified Files:
	.cvsignore import.log kde-plasma-translatoid.spec sources 
Log Message:

----------------------------------------------------------------------
Modified Files:
 	F-11/.cvsignore F-11/import.log 
 	F-11/kde-plasma-translatoid.spec F-11/sources 
----------------------------------------------------------------------
- 1.1beta - MAJOR CORRECTION
-   Now Translatoid use extender
-   Add Reminder extender to remind you some word after clicking on the star
-   Replace parsing by Json parsing. YOU NEED TO INSTALL libqjson
-   Clear some code and probably add some new bug.. :)
-   If you have some probs, contact me!
-1.1
-  Add new language
-  Afrikaans
-  Albanais
-  Albanais
-  Belarusian
-  Irish
-  Icelandic
-  Macedonian
-  Malaysia
-  Maltese
-  Persan
-  Swahili
-  Turkish




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Aug 2009 05:28:53 -0000	1.5
+++ .cvsignore	22 Dec 2009 06:15:22 -0000	1.6
@@ -1 +1 @@
-translatoid1.0.tar.gz
+translatoid1-1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	10 Aug 2009 05:28:53 -0000	1.5
+++ import.log	22 Dec 2009 06:15:22 -0000	1.6
@@ -3,3 +3,4 @@ kde-plasma-translatoid-0_6-1_fc10:HEAD:k
 kde-plasma-translatoid-0_6-2_fc10:HEAD:kde-plasma-translatoid-0.6-2.fc10.src.rpm:1235628540
 kde-plasma-translatoid-0_9-1_fc11:F-11:kde-plasma-translatoid-0.9-1.fc11.src.rpm:1246862586
 kde-plasma-translatoid-1_0-1_fc11:F-11:kde-plasma-translatoid-1.0-1.fc11.src.rpm:1249882012
+kde-plasma-translatoid-1_1-1_fc12:F-11:kde-plasma-translatoid-1.1-1.fc12.src.rpm:1261462519


Index: kde-plasma-translatoid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-11/kde-plasma-translatoid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde-plasma-translatoid.spec	10 Aug 2009 05:28:53 -0000	1.5
+++ kde-plasma-translatoid.spec	22 Dec 2009 06:15:22 -0000	1.6
@@ -1,21 +1,23 @@
 Name:           kde-plasma-translatoid
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Translator Using Google Translator
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/translatoid?content=97511
-Source0:        http://www.kde-look.org/content/content-files/translatoid%{version}.tar.gz
+Source0:        http://www.kde-look.org/content/content-files/translatoid1-1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext >= 0.17
+BuildRequires:  qjson-devel >= 0.5.0
+
 %description
 Translator plasmoid using Google Translator.
 
 %prep
-%setup -qn translatoid
+%setup -qn translatoid1-1
 
 %build
 mkdir -p %{_target_platform}
@@ -42,235 +44,44 @@ rm -rf %{buildroot}
 %doc README licence.txt
 %{_kde4_libdir}/kde4/plasma_applet_translatoid.so
 %{_kde4_datadir}/kde4/services/plasma-applet-translatoid.desktop
+%{_kde4_datadir}/kde4/apps/translatoid/translatoid.db
 #%{_datadir}/locale/es_ES/LC_MESSAGES/translatoid.mo
 #%{_datadir}/locale/fr_FR/LC_MESSAGES/translatoid.mo
-%{_datadir}/icons/hicolor/128x128/apps/translator.png
-%{_datadir}/icons/hicolor/16x16/apps/translator.png
-%{_datadir}/icons/hicolor/22x22/apps/translator.png
-%{_datadir}/icons/hicolor/256x256/apps/translator.png
-%{_datadir}/icons/hicolor/32x32/apps/translator.png
-%{_datadir}/icons/hicolor/48x48/apps/translator.png
-%{_datadir}/icons/hicolor/64x64/apps/translator.png
-%{_datadir}/icons/hicolor/scalable/apps/translator.svgz
-%{_datadir}/icons/kbflags/ad.png
-%{_datadir}/icons/kbflags/ae.png
-%{_datadir}/icons/kbflags/ag.png
-%{_datadir}/icons/kbflags/ai.png
-%{_datadir}/icons/kbflags/al.png
-%{_datadir}/icons/kbflags/am.png
-%{_datadir}/icons/kbflags/an.png
-%{_datadir}/icons/kbflags/ao.png
-%{_datadir}/icons/kbflags/aq.png
-%{_datadir}/icons/kbflags/ar.png
-%{_datadir}/icons/kbflags/as.png
-%{_datadir}/icons/kbflags/at.png
-%{_datadir}/icons/kbflags/au.png
-%{_datadir}/icons/kbflags/aw.png
-%{_datadir}/icons/kbflags/az.png
-%{_datadir}/icons/kbflags/ba.png
-%{_datadir}/icons/kbflags/bb.png
-%{_datadir}/icons/kbflags/bd.png
-%{_datadir}/icons/kbflags/be.png
-%{_datadir}/icons/kbflags/bf.png
-%{_datadir}/icons/kbflags/bg.png
-%{_datadir}/icons/kbflags/bh.png
-%{_datadir}/icons/kbflags/bi.png
-%{_datadir}/icons/kbflags/bj.png
-%{_datadir}/icons/kbflags/bm.png
-%{_datadir}/icons/kbflags/bn.png
-%{_datadir}/icons/kbflags/bo.png
-%{_datadir}/icons/kbflags/br.png
-%{_datadir}/icons/kbflags/bs.png
-%{_datadir}/icons/kbflags/bt.png
-%{_datadir}/icons/kbflags/bv.png
-%{_datadir}/icons/kbflags/bw.png
-%{_datadir}/icons/kbflags/by.png
-%{_datadir}/icons/kbflags/bz.png
-%{_datadir}/icons/kbflags/ca.png
-%{_datadir}/icons/kbflags/cc.png
-%{_datadir}/icons/kbflags/cf.png
-%{_datadir}/icons/kbflags/cg.png
-%{_datadir}/icons/kbflags/ch.png
-%{_datadir}/icons/kbflags/ci.png
-%{_datadir}/icons/kbflags/ck.png
-%{_datadir}/icons/kbflags/cl.png
-%{_datadir}/icons/kbflags/cm.png
-%{_datadir}/icons/kbflags/cn.png
-%{_datadir}/icons/kbflags/co.png
-%{_datadir}/icons/kbflags/cr.png
-%{_datadir}/icons/kbflags/ct.png
-%{_datadir}/icons/kbflags/cu.png
-%{_datadir}/icons/kbflags/cv.png
-%{_datadir}/icons/kbflags/cy.png
-%{_datadir}/icons/kbflags/cz.png
-%{_datadir}/icons/kbflags/de.png
-%{_datadir}/icons/kbflags/dj.png
-%{_datadir}/icons/kbflags/dk.png
-%{_datadir}/icons/kbflags/dm.png
-%{_datadir}/icons/kbflags/do.png
-%{_datadir}/icons/kbflags/dz.png
-%{_datadir}/icons/kbflags/ec.png
-%{_datadir}/icons/kbflags/ee.png
-%{_datadir}/icons/kbflags/eg.png
-%{_datadir}/icons/kbflags/eh.png
-%{_datadir}/icons/kbflags/er.png
-%{_datadir}/icons/kbflags/es.png
-%{_datadir}/icons/kbflags/et.png
-%{_datadir}/icons/kbflags/eu.png
-%{_datadir}/icons/kbflags/fi.png
-%{_datadir}/icons/kbflags/fj.png
-%{_datadir}/icons/kbflags/fo.png
-%{_datadir}/icons/kbflags/fr.png
-%{_datadir}/icons/kbflags/ga.png
-%{_datadir}/icons/kbflags/gb.png
-%{_datadir}/icons/kbflags/gd.png
-%{_datadir}/icons/kbflags/ge.png
-%{_datadir}/icons/kbflags/gh.png
-%{_datadir}/icons/kbflags/gi.png
-%{_datadir}/icons/kbflags/gm.png
-%{_datadir}/icons/kbflags/gn.png
-%{_datadir}/icons/kbflags/gq.png
-%{_datadir}/icons/kbflags/gr.png
-%{_datadir}/icons/kbflags/gt.png
-%{_datadir}/icons/kbflags/gu.png
-%{_datadir}/icons/kbflags/gw.png
-%{_datadir}/icons/kbflags/gy.png
-%{_datadir}/icons/kbflags/hk.png
-%{_datadir}/icons/kbflags/hn.png
-%{_datadir}/icons/kbflags/hr.png
-%{_datadir}/icons/kbflags/ht.png
-%{_datadir}/icons/kbflags/hu.png
-%{_datadir}/icons/kbflags/id.png
-%{_datadir}/icons/kbflags/ie.png
-%{_datadir}/icons/kbflags/il.png
-%{_datadir}/icons/kbflags/in.png
-%{_datadir}/icons/kbflags/iq.png
-%{_datadir}/icons/kbflags/ir.png
-%{_datadir}/icons/kbflags/is.png
-%{_datadir}/icons/kbflags/it.png
-%{_datadir}/icons/kbflags/jm.png
-%{_datadir}/icons/kbflags/jo.png
-%{_datadir}/icons/kbflags/jp.png
-%{_datadir}/icons/kbflags/ke.png
-%{_datadir}/icons/kbflags/kg.png
-%{_datadir}/icons/kbflags/kh.png
-%{_datadir}/icons/kbflags/ki.png
-%{_datadir}/icons/kbflags/km.png
-%{_datadir}/icons/kbflags/kn.png
-%{_datadir}/icons/kbflags/kp.png
-%{_datadir}/icons/kbflags/kr.png
-%{_datadir}/icons/kbflags/kw.png
-%{_datadir}/icons/kbflags/kz.png
-%{_datadir}/icons/kbflags/la.png
-%{_datadir}/icons/kbflags/lb.png
-%{_datadir}/icons/kbflags/lc.png
-%{_datadir}/icons/kbflags/li.png
-%{_datadir}/icons/kbflags/lk.png
-%{_datadir}/icons/kbflags/lr.png
-%{_datadir}/icons/kbflags/ls.png
-%{_datadir}/icons/kbflags/lt.png
-%{_datadir}/icons/kbflags/lu.png
-%{_datadir}/icons/kbflags/lv.png
-%{_datadir}/icons/kbflags/ly.png
-%{_datadir}/icons/kbflags/ma.png
-%{_datadir}/icons/kbflags/mc.png
-%{_datadir}/icons/kbflags/md.png
-%{_datadir}/icons/kbflags/mg.png
-%{_datadir}/icons/kbflags/mh.png
-%{_datadir}/icons/kbflags/mk.png
-%{_datadir}/icons/kbflags/ml.png
-%{_datadir}/icons/kbflags/mm.png
-%{_datadir}/icons/kbflags/mn.png
-%{_datadir}/icons/kbflags/mo.png
-%{_datadir}/icons/kbflags/mr.png
-%{_datadir}/icons/kbflags/ms.png
-%{_datadir}/icons/kbflags/mt.png
-%{_datadir}/icons/kbflags/mu.png
-%{_datadir}/icons/kbflags/mv.png
-%{_datadir}/icons/kbflags/mw.png
-%{_datadir}/icons/kbflags/mx.png
-%{_datadir}/icons/kbflags/my.png
-%{_datadir}/icons/kbflags/mz.png
-%{_datadir}/icons/kbflags/na.png
-%{_datadir}/icons/kbflags/ne.png
-%{_datadir}/icons/kbflags/ng.png
-%{_datadir}/icons/kbflags/ni.png
-%{_datadir}/icons/kbflags/nl.png
-%{_datadir}/icons/kbflags/no.png
-%{_datadir}/icons/kbflags/np.png
-%{_datadir}/icons/kbflags/nr.png
-%{_datadir}/icons/kbflags/nz.png
-%{_datadir}/icons/kbflags/om.png
-%{_datadir}/icons/kbflags/pa.png
-%{_datadir}/icons/kbflags/pe.png
-%{_datadir}/icons/kbflags/pf.png
-%{_datadir}/icons/kbflags/pg.png
-%{_datadir}/icons/kbflags/ph.png
-%{_datadir}/icons/kbflags/pk.png
-%{_datadir}/icons/kbflags/pl.png
-%{_datadir}/icons/kbflags/pr.png
-%{_datadir}/icons/kbflags/ps.png
-%{_datadir}/icons/kbflags/pt.png
-%{_datadir}/icons/kbflags/pw.png
-%{_datadir}/icons/kbflags/py.png
-%{_datadir}/icons/kbflags/qa.png
-%{_datadir}/icons/kbflags/re.png
-%{_datadir}/icons/kbflags/ro.png
-%{_datadir}/icons/kbflags/rs.png
-%{_datadir}/icons/kbflags/ru.png
-%{_datadir}/icons/kbflags/rw.png
-%{_datadir}/icons/kbflags/sa.png
-%{_datadir}/icons/kbflags/sb.png
-%{_datadir}/icons/kbflags/sc.png
-%{_datadir}/icons/kbflags/se.png
-%{_datadir}/icons/kbflags/sg.png
-%{_datadir}/icons/kbflags/si.png
-%{_datadir}/icons/kbflags/sk.png
-%{_datadir}/icons/kbflags/sl.png
-%{_datadir}/icons/kbflags/sm.png
-%{_datadir}/icons/kbflags/sn.png
-%{_datadir}/icons/kbflags/so.png
-%{_datadir}/icons/kbflags/sr.png
-%{_datadir}/icons/kbflags/st.png
-%{_datadir}/icons/kbflags/sv.png
-%{_datadir}/icons/kbflags/sy.png
-%{_datadir}/icons/kbflags/sz.png
-%{_datadir}/icons/kbflags/tc.png
-%{_datadir}/icons/kbflags/td.png
-%{_datadir}/icons/kbflags/tf.png
-%{_datadir}/icons/kbflags/tg.png
-%{_datadir}/icons/kbflags/th.png
-%{_datadir}/icons/kbflags/tj.png
-%{_datadir}/icons/kbflags/tl.png
-%{_datadir}/icons/kbflags/tn.png
-%{_datadir}/icons/kbflags/to.png
-%{_datadir}/icons/kbflags/tr.png
-%{_datadir}/icons/kbflags/tt.png
-%{_datadir}/icons/kbflags/tv.png
-%{_datadir}/icons/kbflags/tw.png
-%{_datadir}/icons/kbflags/tz.png
-%{_datadir}/icons/kbflags/ua.png
-%{_datadir}/icons/kbflags/ug.png
-%{_datadir}/icons/kbflags/um.png
-%{_datadir}/icons/kbflags/us.png
-%{_datadir}/icons/kbflags/uy.png
-%{_datadir}/icons/kbflags/uz.png
-%{_datadir}/icons/kbflags/va.png
-%{_datadir}/icons/kbflags/vc.png
-%{_datadir}/icons/kbflags/ve.png
-%{_datadir}/icons/kbflags/vg.png
-%{_datadir}/icons/kbflags/vi.png
-%{_datadir}/icons/kbflags/vn.png
-%{_datadir}/icons/kbflags/vu.png
-%{_datadir}/icons/kbflags/ws.png
-%{_datadir}/icons/kbflags/ye.png
-%{_datadir}/icons/kbflags/za.png
-%{_datadir}/icons/kbflags/zm.png
-%{_datadir}/icons/kbflags/zw.png
-
+%{_datadir}/icons/hicolor/128x128/apps/*.png
+%{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/22x22/apps/*.png
+%{_datadir}/icons/hicolor/256x256/apps/*.png
+%{_datadir}/icons/hicolor/32x32/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/64x64/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svgz
+%{_datadir}/icons/kbflags/*.png
 
 
 %changelog
+* Tue Dec 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.1
+-1.1
+- 1.1beta - MAJOR CORRECTION
+-   Now Translatoid use extender
+-   Add Reminder extender to remind you some word after clicking on the star
+-   Replace parsing by Json parsing. YOU NEED TO INSTALL libqjson
+-   Clear some code and probably add some new bug.. :)
+-   If you have some probs, contact me!
+-1.1
+-  Add new language
+-  Afrikaans
+-  Albanais
+-  Albanais
+-  Belarusian
+-  Irish
+-  Icelandic
+-  Macedonian
+-  Malaysia
+-  Maltese
+-  Persan
+-  Swahili
+-  Turkish
+
 * Fri Aug 7 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.0-1
 -1.0
 - Build Requirement Changed from kdebase-workspace-devel >= 4.2.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Aug 2009 05:28:53 -0000	1.5
+++ sources	22 Dec 2009 06:15:22 -0000	1.6
@@ -1 +1 @@
-aaba85e1bf69dc345faff0aa8d66ecf7  translatoid1.0.tar.gz
+be99ad93f6698c3caf5509de1ae48825  translatoid1-1.tar.gz



From eliwap at fedoraproject.org  Tue Dec 22 06:17:09 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Tue, 22 Dec 2009 06:17:09 +0000 (UTC)
Subject: rpms/kde-plasma-translatoid/F-12 .cvsignore, 1.5, 1.6 import.log, 1.5,
	1.6 kde-plasma-translatoid.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091222061709.31B4811C00E9@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-translatoid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7485/F-12

Modified Files:
	.cvsignore import.log kde-plasma-translatoid.spec sources 
Log Message:

----------------------------------------------------------------------
Modified Files:
	F-12/.cvsignore F-12/import.log 
 	F-12/kde-plasma-translatoid.spec F-12/sources 
----------------------------------------------------------------------
- 1.1beta - MAJOR CORRECTION
-   Now Translatoid use extender
-   Add Reminder extender to remind you some word after clicking on the star
-   Replace parsing by Json parsing. YOU NEED TO INSTALL libqjson
-   Clear some code and probably add some new bug.. :)
-   If you have some probs, contact me!
-1.1
-  Add new language
-  Afrikaans
-  Albanais
-  Albanais
-  Belarusian
-  Irish
-  Icelandic
-  Macedonian
-  Malaysia
-  Maltese
-  Persan
-  Swahili
-  Turkish




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Aug 2009 05:22:38 -0000	1.5
+++ .cvsignore	22 Dec 2009 06:17:08 -0000	1.6
@@ -1 +1 @@
-translatoid1.0.tar.gz
+translatoid1-1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	10 Aug 2009 05:22:38 -0000	1.5
+++ import.log	22 Dec 2009 06:17:08 -0000	1.6
@@ -3,3 +3,4 @@ kde-plasma-translatoid-0_6-1_fc10:HEAD:k
 kde-plasma-translatoid-0_6-2_fc10:HEAD:kde-plasma-translatoid-0.6-2.fc10.src.rpm:1235628540
 kde-plasma-translatoid-0_9-1_fc11:HEAD:kde-plasma-translatoid-0.9-1.fc11.src.rpm:1246861564
 kde-plasma-translatoid-1_0-1_fc11:HEAD:kde-plasma-translatoid-1.0-1.fc11.src.rpm:1249881318
+kde-plasma-translatoid-1_1-1_fc12:F-12:kde-plasma-translatoid-1.1-1.fc12.src.rpm:1261462627


Index: kde-plasma-translatoid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-12/kde-plasma-translatoid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kde-plasma-translatoid.spec	10 Aug 2009 05:22:38 -0000	1.6
+++ kde-plasma-translatoid.spec	22 Dec 2009 06:17:08 -0000	1.7
@@ -1,21 +1,23 @@
 Name:           kde-plasma-translatoid
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Translator Using Google Translator
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/translatoid?content=97511
-Source0:        http://www.kde-look.org/content/content-files/translatoid%{version}.tar.gz
+Source0:        http://www.kde-look.org/content/content-files/translatoid1-1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext >= 0.17
+BuildRequires:  qjson-devel >= 0.5.0
+
 %description
 Translator plasmoid using Google Translator.
 
 %prep
-%setup -qn translatoid
+%setup -qn translatoid1-1
 
 %build
 mkdir -p %{_target_platform}
@@ -42,235 +44,44 @@ rm -rf %{buildroot}
 %doc README licence.txt
 %{_kde4_libdir}/kde4/plasma_applet_translatoid.so
 %{_kde4_datadir}/kde4/services/plasma-applet-translatoid.desktop
+%{_kde4_datadir}/kde4/apps/translatoid/translatoid.db
 #%{_datadir}/locale/es_ES/LC_MESSAGES/translatoid.mo
 #%{_datadir}/locale/fr_FR/LC_MESSAGES/translatoid.mo
-%{_datadir}/icons/hicolor/128x128/apps/translator.png
-%{_datadir}/icons/hicolor/16x16/apps/translator.png
-%{_datadir}/icons/hicolor/22x22/apps/translator.png
-%{_datadir}/icons/hicolor/256x256/apps/translator.png
-%{_datadir}/icons/hicolor/32x32/apps/translator.png
-%{_datadir}/icons/hicolor/48x48/apps/translator.png
-%{_datadir}/icons/hicolor/64x64/apps/translator.png
-%{_datadir}/icons/hicolor/scalable/apps/translator.svgz
-%{_datadir}/icons/kbflags/ad.png
-%{_datadir}/icons/kbflags/ae.png
-%{_datadir}/icons/kbflags/ag.png
-%{_datadir}/icons/kbflags/ai.png
-%{_datadir}/icons/kbflags/al.png
-%{_datadir}/icons/kbflags/am.png
-%{_datadir}/icons/kbflags/an.png
-%{_datadir}/icons/kbflags/ao.png
-%{_datadir}/icons/kbflags/aq.png
-%{_datadir}/icons/kbflags/ar.png
-%{_datadir}/icons/kbflags/as.png
-%{_datadir}/icons/kbflags/at.png
-%{_datadir}/icons/kbflags/au.png
-%{_datadir}/icons/kbflags/aw.png
-%{_datadir}/icons/kbflags/az.png
-%{_datadir}/icons/kbflags/ba.png
-%{_datadir}/icons/kbflags/bb.png
-%{_datadir}/icons/kbflags/bd.png
-%{_datadir}/icons/kbflags/be.png
-%{_datadir}/icons/kbflags/bf.png
-%{_datadir}/icons/kbflags/bg.png
-%{_datadir}/icons/kbflags/bh.png
-%{_datadir}/icons/kbflags/bi.png
-%{_datadir}/icons/kbflags/bj.png
-%{_datadir}/icons/kbflags/bm.png
-%{_datadir}/icons/kbflags/bn.png
-%{_datadir}/icons/kbflags/bo.png
-%{_datadir}/icons/kbflags/br.png
-%{_datadir}/icons/kbflags/bs.png
-%{_datadir}/icons/kbflags/bt.png
-%{_datadir}/icons/kbflags/bv.png
-%{_datadir}/icons/kbflags/bw.png
-%{_datadir}/icons/kbflags/by.png
-%{_datadir}/icons/kbflags/bz.png
-%{_datadir}/icons/kbflags/ca.png
-%{_datadir}/icons/kbflags/cc.png
-%{_datadir}/icons/kbflags/cf.png
-%{_datadir}/icons/kbflags/cg.png
-%{_datadir}/icons/kbflags/ch.png
-%{_datadir}/icons/kbflags/ci.png
-%{_datadir}/icons/kbflags/ck.png
-%{_datadir}/icons/kbflags/cl.png
-%{_datadir}/icons/kbflags/cm.png
-%{_datadir}/icons/kbflags/cn.png
-%{_datadir}/icons/kbflags/co.png
-%{_datadir}/icons/kbflags/cr.png
-%{_datadir}/icons/kbflags/ct.png
-%{_datadir}/icons/kbflags/cu.png
-%{_datadir}/icons/kbflags/cv.png
-%{_datadir}/icons/kbflags/cy.png
-%{_datadir}/icons/kbflags/cz.png
-%{_datadir}/icons/kbflags/de.png
-%{_datadir}/icons/kbflags/dj.png
-%{_datadir}/icons/kbflags/dk.png
-%{_datadir}/icons/kbflags/dm.png
-%{_datadir}/icons/kbflags/do.png
-%{_datadir}/icons/kbflags/dz.png
-%{_datadir}/icons/kbflags/ec.png
-%{_datadir}/icons/kbflags/ee.png
-%{_datadir}/icons/kbflags/eg.png
-%{_datadir}/icons/kbflags/eh.png
-%{_datadir}/icons/kbflags/er.png
-%{_datadir}/icons/kbflags/es.png
-%{_datadir}/icons/kbflags/et.png
-%{_datadir}/icons/kbflags/eu.png
-%{_datadir}/icons/kbflags/fi.png
-%{_datadir}/icons/kbflags/fj.png
-%{_datadir}/icons/kbflags/fo.png
-%{_datadir}/icons/kbflags/fr.png
-%{_datadir}/icons/kbflags/ga.png
-%{_datadir}/icons/kbflags/gb.png
-%{_datadir}/icons/kbflags/gd.png
-%{_datadir}/icons/kbflags/ge.png
-%{_datadir}/icons/kbflags/gh.png
-%{_datadir}/icons/kbflags/gi.png
-%{_datadir}/icons/kbflags/gm.png
-%{_datadir}/icons/kbflags/gn.png
-%{_datadir}/icons/kbflags/gq.png
-%{_datadir}/icons/kbflags/gr.png
-%{_datadir}/icons/kbflags/gt.png
-%{_datadir}/icons/kbflags/gu.png
-%{_datadir}/icons/kbflags/gw.png
-%{_datadir}/icons/kbflags/gy.png
-%{_datadir}/icons/kbflags/hk.png
-%{_datadir}/icons/kbflags/hn.png
-%{_datadir}/icons/kbflags/hr.png
-%{_datadir}/icons/kbflags/ht.png
-%{_datadir}/icons/kbflags/hu.png
-%{_datadir}/icons/kbflags/id.png
-%{_datadir}/icons/kbflags/ie.png
-%{_datadir}/icons/kbflags/il.png
-%{_datadir}/icons/kbflags/in.png
-%{_datadir}/icons/kbflags/iq.png
-%{_datadir}/icons/kbflags/ir.png
-%{_datadir}/icons/kbflags/is.png
-%{_datadir}/icons/kbflags/it.png
-%{_datadir}/icons/kbflags/jm.png
-%{_datadir}/icons/kbflags/jo.png
-%{_datadir}/icons/kbflags/jp.png
-%{_datadir}/icons/kbflags/ke.png
-%{_datadir}/icons/kbflags/kg.png
-%{_datadir}/icons/kbflags/kh.png
-%{_datadir}/icons/kbflags/ki.png
-%{_datadir}/icons/kbflags/km.png
-%{_datadir}/icons/kbflags/kn.png
-%{_datadir}/icons/kbflags/kp.png
-%{_datadir}/icons/kbflags/kr.png
-%{_datadir}/icons/kbflags/kw.png
-%{_datadir}/icons/kbflags/kz.png
-%{_datadir}/icons/kbflags/la.png
-%{_datadir}/icons/kbflags/lb.png
-%{_datadir}/icons/kbflags/lc.png
-%{_datadir}/icons/kbflags/li.png
-%{_datadir}/icons/kbflags/lk.png
-%{_datadir}/icons/kbflags/lr.png
-%{_datadir}/icons/kbflags/ls.png
-%{_datadir}/icons/kbflags/lt.png
-%{_datadir}/icons/kbflags/lu.png
-%{_datadir}/icons/kbflags/lv.png
-%{_datadir}/icons/kbflags/ly.png
-%{_datadir}/icons/kbflags/ma.png
-%{_datadir}/icons/kbflags/mc.png
-%{_datadir}/icons/kbflags/md.png
-%{_datadir}/icons/kbflags/mg.png
-%{_datadir}/icons/kbflags/mh.png
-%{_datadir}/icons/kbflags/mk.png
-%{_datadir}/icons/kbflags/ml.png
-%{_datadir}/icons/kbflags/mm.png
-%{_datadir}/icons/kbflags/mn.png
-%{_datadir}/icons/kbflags/mo.png
-%{_datadir}/icons/kbflags/mr.png
-%{_datadir}/icons/kbflags/ms.png
-%{_datadir}/icons/kbflags/mt.png
-%{_datadir}/icons/kbflags/mu.png
-%{_datadir}/icons/kbflags/mv.png
-%{_datadir}/icons/kbflags/mw.png
-%{_datadir}/icons/kbflags/mx.png
-%{_datadir}/icons/kbflags/my.png
-%{_datadir}/icons/kbflags/mz.png
-%{_datadir}/icons/kbflags/na.png
-%{_datadir}/icons/kbflags/ne.png
-%{_datadir}/icons/kbflags/ng.png
-%{_datadir}/icons/kbflags/ni.png
-%{_datadir}/icons/kbflags/nl.png
-%{_datadir}/icons/kbflags/no.png
-%{_datadir}/icons/kbflags/np.png
-%{_datadir}/icons/kbflags/nr.png
-%{_datadir}/icons/kbflags/nz.png
-%{_datadir}/icons/kbflags/om.png
-%{_datadir}/icons/kbflags/pa.png
-%{_datadir}/icons/kbflags/pe.png
-%{_datadir}/icons/kbflags/pf.png
-%{_datadir}/icons/kbflags/pg.png
-%{_datadir}/icons/kbflags/ph.png
-%{_datadir}/icons/kbflags/pk.png
-%{_datadir}/icons/kbflags/pl.png
-%{_datadir}/icons/kbflags/pr.png
-%{_datadir}/icons/kbflags/ps.png
-%{_datadir}/icons/kbflags/pt.png
-%{_datadir}/icons/kbflags/pw.png
-%{_datadir}/icons/kbflags/py.png
-%{_datadir}/icons/kbflags/qa.png
-%{_datadir}/icons/kbflags/re.png
-%{_datadir}/icons/kbflags/ro.png
-%{_datadir}/icons/kbflags/rs.png
-%{_datadir}/icons/kbflags/ru.png
-%{_datadir}/icons/kbflags/rw.png
-%{_datadir}/icons/kbflags/sa.png
-%{_datadir}/icons/kbflags/sb.png
-%{_datadir}/icons/kbflags/sc.png
-%{_datadir}/icons/kbflags/se.png
-%{_datadir}/icons/kbflags/sg.png
-%{_datadir}/icons/kbflags/si.png
-%{_datadir}/icons/kbflags/sk.png
-%{_datadir}/icons/kbflags/sl.png
-%{_datadir}/icons/kbflags/sm.png
-%{_datadir}/icons/kbflags/sn.png
-%{_datadir}/icons/kbflags/so.png
-%{_datadir}/icons/kbflags/sr.png
-%{_datadir}/icons/kbflags/st.png
-%{_datadir}/icons/kbflags/sv.png
-%{_datadir}/icons/kbflags/sy.png
-%{_datadir}/icons/kbflags/sz.png
-%{_datadir}/icons/kbflags/tc.png
-%{_datadir}/icons/kbflags/td.png
-%{_datadir}/icons/kbflags/tf.png
-%{_datadir}/icons/kbflags/tg.png
-%{_datadir}/icons/kbflags/th.png
-%{_datadir}/icons/kbflags/tj.png
-%{_datadir}/icons/kbflags/tl.png
-%{_datadir}/icons/kbflags/tn.png
-%{_datadir}/icons/kbflags/to.png
-%{_datadir}/icons/kbflags/tr.png
-%{_datadir}/icons/kbflags/tt.png
-%{_datadir}/icons/kbflags/tv.png
-%{_datadir}/icons/kbflags/tw.png
-%{_datadir}/icons/kbflags/tz.png
-%{_datadir}/icons/kbflags/ua.png
-%{_datadir}/icons/kbflags/ug.png
-%{_datadir}/icons/kbflags/um.png
-%{_datadir}/icons/kbflags/us.png
-%{_datadir}/icons/kbflags/uy.png
-%{_datadir}/icons/kbflags/uz.png
-%{_datadir}/icons/kbflags/va.png
-%{_datadir}/icons/kbflags/vc.png
-%{_datadir}/icons/kbflags/ve.png
-%{_datadir}/icons/kbflags/vg.png
-%{_datadir}/icons/kbflags/vi.png
-%{_datadir}/icons/kbflags/vn.png
-%{_datadir}/icons/kbflags/vu.png
-%{_datadir}/icons/kbflags/ws.png
-%{_datadir}/icons/kbflags/ye.png
-%{_datadir}/icons/kbflags/za.png
-%{_datadir}/icons/kbflags/zm.png
-%{_datadir}/icons/kbflags/zw.png
-
+%{_datadir}/icons/hicolor/128x128/apps/*.png
+%{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/22x22/apps/*.png
+%{_datadir}/icons/hicolor/256x256/apps/*.png
+%{_datadir}/icons/hicolor/32x32/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/64x64/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svgz
+%{_datadir}/icons/kbflags/*.png
 
 
 %changelog
+* Tue Dec 22 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.1
+-1.1
+- 1.1beta - MAJOR CORRECTION
+-   Now Translatoid use extender
+-   Add Reminder extender to remind you some word after clicking on the star
+-   Replace parsing by Json parsing. YOU NEED TO INSTALL libqjson
+-   Clear some code and probably add some new bug.. :)
+-   If you have some probs, contact me!
+-1.1
+-  Add new language
+-  Afrikaans
+-  Albanais
+-  Albanais
+-  Belarusian
+-  Irish
+-  Icelandic
+-  Macedonian
+-  Malaysia
+-  Maltese
+-  Persan
+-  Swahili
+-  Turkish
+
 * Fri Aug 7 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.0-1
 -1.0
 - Build Requirement Changed from kdebase-workspace-devel >= 4.2.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Aug 2009 05:22:38 -0000	1.5
+++ sources	22 Dec 2009 06:17:08 -0000	1.6
@@ -1 +1 @@
-aaba85e1bf69dc345faff0aa8d66ecf7  translatoid1.0.tar.gz
+be99ad93f6698c3caf5509de1ae48825  translatoid1-1.tar.gz



From corsepiu at fedoraproject.org  Tue Dec 22 06:50:53 2009
From: corsepiu at fedoraproject.org (=?UTF-8?B?UmFsZiBDb3Jzw6lwaXVz?=)
Date: Tue, 22 Dec 2009 07:50:53 +0100
Subject: rpms/perl/devel perl.spec,1.247,1.248
In-Reply-To: <20091222043038.D0C6111C00E9@cvs1.fedora.phx.redhat.com>
References: <20091222043038.D0C6111C00E9@cvs1.fedora.phx.redhat.com>
Message-ID: <4B306C4D.1000509@fedoraproject.org>

On 12/22/2009 05:30 AM, Chris Weyl wrote:
> Author: cweyl
>
> Update of /cvs/extras/rpms/perl/devel
> In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27056
>
> Modified Files:
> 	perl.spec
> Log Message:
> * Mon Dec 21 2009 Chris Weyl<cweyl at alumni.drew.edu>  - 4:5.10.1-107
> - subpackage parent and Parse-CPAN-Meta; add them to core's dep list

I guess, I don't have to emphasize that I consider this step of you to 
be a regression and a silliness.





From corsepiu at fedoraproject.org  Tue Dec 22 07:17:44 2009
From: corsepiu at fedoraproject.org (=?UTF-8?B?UmFsZiBDb3Jzw6lwaXVz?=)
Date: Tue, 22 Dec 2009 08:17:44 +0100
Subject: rpms/perl/devel perl.spec,1.247,1.248
In-Reply-To: <7dd7ab490912212300p140779d3k6fbe27152defc56b@mail.gmail.com>
References: <20091222043038.D0C6111C00E9@cvs1.fedora.phx.redhat.com>
	<4B306C4D.1000509@fedoraproject.org>
	<7dd7ab490912212300p140779d3k6fbe27152defc56b@mail.gmail.com>
Message-ID: <4B307298.80903@fedoraproject.org>

On 12/22/2009 08:00 AM, Chris Weyl wrote:
> On Mon, Dec 21, 2009 at 10:50 PM, Ralf Cors?pius
> <corsepiu at fedoraproject.org>  wrote:
>> On 12/22/2009 05:30 AM, Chris Weyl wrote:
>>>
>>> Author: cweyl
>>>
>>> Update of /cvs/extras/rpms/perl/devel
>>> In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27056
>>>
>>> Modified Files:
>>>         perl.spec
>>> Log Message:
>>> * Mon Dec 21 2009 Chris Weyl<cweyl at alumni.drew.edu>    - 4:5.10.1-107
>>> - subpackage parent and Parse-CPAN-Meta; add them to core's dep list
>>
>> I guess, I don't have to emphasize that I consider this step of you to be a
>> regression and a silliness.
>
> Yeah, I figured that would be the case :)  However, it is consistent
> with how we've been maintaining the package for the last several
> years.

Yes, perl on Fedora has always been poorly maintained and in poor shape, 
... because perl is a thrird class citzen for Red Hat.

Turning away in disgust and anger, ...

No regards.



From kkofler at fedoraproject.org  Tue Dec 22 07:56:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 22 Dec 2009 07:56:20 +0000 (UTC)
Subject: File kdepim-4.3.4.tar.bz2 uploaded to lookaside cache by kkofler
Message-ID: <20091222075620.1C52910F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kpilot:

a4f32a268802be8eb852d1de00cbd2f6  kdepim-4.3.4.tar.bz2



From kkofler at fedoraproject.org  Tue Dec 22 07:57:22 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 22 Dec 2009 07:57:22 +0000 (UTC)
Subject: rpms/kpilot/devel import.log, NONE, 1.1 kpilot.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222075722.5B19611C00E9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kpilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19807/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kpilot.spec 
Log Message:
New package kpilot - Sync PIM data with PalmOS devices



--- NEW FILE import.log ---
kpilot-5_3_0-1_fc13:HEAD:kpilot-5.3.0-1.fc13.src.rpm:1261468588


--- NEW FILE kpilot.spec ---
Name:    kpilot
Summary: Utility to synchronize PIM (Personal Information Management) data with PalmOS devices
Version: 5.3.0
Release: 1%{?dist}

# no pilot-link on S/390
ExcludeArch: s390 s390x

License: GPLv2+
Group:   Applications/Productivity
URL:     http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/4.3.4/src/kdepim-4.3.4.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: kdelibs4-devel >= 4.3.4
BuildRequires: kdepimlibs-devel >= 4.3.4
BuildRequires: akonadi-devel
BuildRequires: boost-devel
BuildRequires: pilot-link-devel >= 0.12
BuildRequires: qca2-devel
BuildRequires: desktop-file-utils

Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig


%description
%{summary}.


%prep
%setup -q -n kdepim-4.3.4
echo 'add_subdirectory(../doc/kpilot doc)' >>kpilot/CMakeLists.txt


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ../kpilot
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

# make symlinks relative
mkdir -p %{buildroot}%{_docdir}/HTML/en/common
pushd %{buildroot}%{_docdir}/HTML/en
for i in *; do
   if [ -d $i -a -L $i/common ]; then
      rm -f $i/common
      ln -nfs ../common $i
   fi
done
popd

# don't package devel files
rm -rf %{buildroot}%{_kde4_includedir}/kpilot/
rm -f %{buildroot}%{_kde4_libdir}/libkpilot.so


%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
  desktop-file-validate $f
done


%post
/sbin/ldconfig
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%posttrans
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
update-desktop-database -q &> /dev/null ||:

%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  update-desktop-database -q &> /dev/null ||:
fi


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc kpilot/COPYING
%doc kpilot/README kpilot/AUTHORS kpilot/ChangeLog kpilot/NEWS kpilot/TODO
%{_kde4_bindir}/kpilot
%{_kde4_bindir}/kpilotDaemon
%{_kde4_libdir}/libkpilot.so.*
%{_kde4_libdir}/libkpilot_*.so
%{_kde4_libdir}/kde4/kcm_kpilot.so
%{_kde4_libdir}/kde4/kpilot_conduit_*.so
%{_kde4_datadir}/applications/kde4/kpilot*.desktop
%{_kde4_datadir}/config.kcfg/*.kcfg
%{_kde4_datadir}/kde4/services/*.desktop
%{_kde4_datadir}/kde4/servicetypes/kpilotconduit.desktop
%{_kde4_appsdir}/kconf_update/kpilot.upd
%{_kde4_appsdir}/kpilot/
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_docdir}/HTML/en/kpilot/


%changelog
* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-1
- new specfile for KPilot, split out of kdepim 4.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpilot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:54:52 -0000	1.1
+++ .cvsignore	22 Dec 2009 07:57:20 -0000	1.2
@@ -0,0 +1 @@
+kdepim-4.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpilot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:54:52 -0000	1.1
+++ sources	22 Dec 2009 07:57:21 -0000	1.2
@@ -0,0 +1 @@
+a4f32a268802be8eb852d1de00cbd2f6  kdepim-4.3.4.tar.bz2



From kkofler at fedoraproject.org  Tue Dec 22 07:59:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 22 Dec 2009 07:59:10 +0000 (UTC)
Subject: rpms/kpilot import.log,NONE,1.1
Message-ID: <20091222075910.9460311C00E9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kpilot
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20253

Added Files:
	import.log 
Log Message:
Move the import.log to the toplevel.


--- NEW FILE import.log ---
kpilot-5_3_0-1_fc13:HEAD:kpilot-5.3.0-1.fc13.src.rpm:1261468588



From kkofler at fedoraproject.org  Tue Dec 22 07:59:10 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 22 Dec 2009 07:59:10 +0000 (UTC)
Subject: rpms/kpilot/devel import.log,1.1,NONE
Message-ID: <20091222075910.CE14211C00E9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kpilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20253/devel

Removed Files:
	import.log 
Log Message:
Move the import.log to the toplevel.


--- import.log DELETED ---



From kkofler at fedoraproject.org  Tue Dec 22 08:06:34 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 22 Dec 2009 08:06:34 +0000 (UTC)
Subject: rpms/kpilot/devel kpilot.spec,1.1,1.2
Message-ID: <20091222080635.0044811C00E9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kpilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21135/devel

Modified Files:
	kpilot.spec 
Log Message:
* Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-2
- shorten Summary and add linebreak in %description
- Conflicts with old versions of kdepim (F12-)
- split out -libs subpackage


Index: kpilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpilot/devel/kpilot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kpilot.spec	22 Dec 2009 07:57:21 -0000	1.1
+++ kpilot.spec	22 Dec 2009 08:06:34 -0000	1.2
@@ -1,7 +1,7 @@
 Name:    kpilot
-Summary: Utility to synchronize PIM (Personal Information Management) data with PalmOS devices
+Summary: Sync PIM data with PalmOS devices
 Version: 5.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # no pilot-link on S/390
 ExcludeArch: s390 s390x
@@ -20,11 +20,22 @@ BuildRequires: pilot-link-devel >= 0.12
 BuildRequires: qca2-devel
 BuildRequires: desktop-file-utils
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
+%if 0%{?fedora} < 13
+Conflicts: kdepim < 6:4.3.80
+%endif
 
 %description
+Utility to synchronize PIM (Personal Information Management) data with
+PalmOS devices.
+
+
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+
+%description libs
 %{summary}.
 
 
@@ -70,7 +81,6 @@ done
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
@@ -78,13 +88,16 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %clean
 rm -rf %{buildroot}
@@ -96,10 +109,6 @@ rm -rf %{buildroot}
 %doc kpilot/README kpilot/AUTHORS kpilot/ChangeLog kpilot/NEWS kpilot/TODO
 %{_kde4_bindir}/kpilot
 %{_kde4_bindir}/kpilotDaemon
-%{_kde4_libdir}/libkpilot.so.*
-%{_kde4_libdir}/libkpilot_*.so
-%{_kde4_libdir}/kde4/kcm_kpilot.so
-%{_kde4_libdir}/kde4/kpilot_conduit_*.so
 %{_kde4_datadir}/applications/kde4/kpilot*.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -109,7 +118,19 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/kpilot/
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkpilot.so.*
+%{_kde4_libdir}/libkpilot_*.so
+%{_kde4_libdir}/kde4/kcm_kpilot.so
+%{_kde4_libdir}/kde4/kpilot_conduit_*.so
+
 
 %changelog
+* Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-2
+- shorten Summary and add linebreak in %%description
+- Conflicts with old versions of kdepim (F12-)
+- split out -libs subpackage
+
 * Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-1
 - new specfile for KPilot, split out of kdepim 4.3.4



From kaigai at fedoraproject.org  Tue Dec 22 08:16:58 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue, 22 Dec 2009 08:16:58 +0000 (UTC)
Subject: File postgresql-8.3.9.tar.bz2 uploaded to lookaside cache by kaigai
Message-ID: <20091222081658.B707310F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sepostgresql:

e120b001354851b5df26cbee8c2786d5  postgresql-8.3.9.tar.bz2



From kaigai at fedoraproject.org  Tue Dec 22 08:18:24 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Tue, 22 Dec 2009 08:18:24 +0000 (UTC)
Subject: rpms/sepostgresql/F-11 .cvsignore, 1.15,
	1.16 sepostgresql-core-8.3.patch, 1.4,
	1.5 sepostgresql-utils-8.3.patch, 1.2, 1.3 sepostgresql.init,
	1.35, 1.36 sepostgresql.spec, 1.38, 1.39 sources, 1.12, 1.13
Message-ID: <20091222081824.EFED411C00E9@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22690

Modified Files:
	.cvsignore sepostgresql-core-8.3.patch 
	sepostgresql-utils-8.3.patch sepostgresql.init 
	sepostgresql.spec sources 
Log Message:
upgrade base pgsql v8.3.8->v8.3.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	10 Sep 2009 12:27:20 -0000	1.15
+++ .cvsignore	22 Dec 2009 08:18:24 -0000	1.16
@@ -1 +1 @@
-postgresql-8.3.8.tar.bz2
+postgresql-8.3.9.tar.bz2

sepostgresql-core-8.3.patch:
 configure                                                          |  113 +
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   26 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |    7 
 src/backend/access/heap/tuptoaster.c                               |    9 
 src/backend/access/transam/xact.c                                  |   15 
 src/backend/bootstrap/bootparse.y                                  |   11 
 src/backend/bootstrap/bootstrap.c                                  |    8 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   19 
 src/backend/catalog/catalog.c                                      |    4 
 src/backend/catalog/heap.c                                         |  104 +
 src/backend/catalog/index.c                                        |   10 
 src/backend/catalog/namespace.c                                    |   27 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_proc.c                                      |   18 
 src/backend/catalog/pg_security.c                                  |  299 +++
 src/backend/catalog/toasting.c                                     |    3 
 src/backend/commands/alter.c                                       |   29 
 src/backend/commands/cluster.c                                     |    7 
 src/backend/commands/copy.c                                        |  258 ++
 src/backend/commands/dbcommands.c                                  |   73 
 src/backend/commands/functioncmds.c                                |   74 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/proclang.c                                    |    6 
 src/backend/commands/schemacmds.c                                  |   62 
 src/backend/commands/sequence.c                                    |   14 
 src/backend/commands/tablecmds.c                                   |  150 +
 src/backend/executor/execJunk.c                                    |    4 
 src/backend/executor/execMain.c                                    |  143 +
 src/backend/executor/execScan.c                                    |   23 
 src/backend/executor/execTuples.c                                  |   13 
 src/backend/executor/execUtils.c                                   |    7 
 src/backend/executor/functions.c                                   |    2 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   77 
 src/backend/nodes/copyfuncs.c                                      |   23 
 src/backend/nodes/equalfuncs.c                                     |   20 
 src/backend/nodes/outfuncs.c                                       |    6 
 src/backend/nodes/readfuncs.c                                      |   46 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/prep/prepunion.c                             |   71 
 src/backend/optimizer/util/clauses.c                               |    2 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   60 
 src/backend/parser/gram.y                                          |  110 +
 src/backend/parser/parse_clause.c                                  |   18 
 src/backend/parser/parse_expr.c                                    |    3 
 src/backend/parser/parse_relation.c                                |  146 +
 src/backend/parser/parse_target.c                                  |   79 
 src/backend/postmaster/postmaster.c                                |   43 
 src/backend/rewrite/rewriteHandler.c                               |    4 
 src/backend/security/Makefile                                      |   34 
 src/backend/security/rowlevel.c                                    |  177 +
 src/backend/security/sepgsql/avc.c                                 |  859 +++++++++
 src/backend/security/sepgsql/checker.c                             |  577 ++++++
 src/backend/security/sepgsql/core.c                                |  326 +++
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               |  905 ++++++++++
 src/backend/security/sepgsql/label.c                               |  560 ++++++
 src/backend/security/sepgsql/perms.c                               |  469 +++++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  128 +
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  116 +
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    4 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/varlena.c                                    |   97 +
 src/backend/utils/cache/catcache.c                                 |   32 
 src/backend/utils/cache/plancache.c                                |   12 
 src/backend/utils/cache/relcache.c                                 |   32 
 src/backend/utils/cache/syscache.c                                 |   40 
 src/backend/utils/fmgr/dfmgr.c                                     |   10 
 src/backend/utils/fmgr/fmgr.c                                      |    8 
 src/backend/utils/init/postinit.c                                  |   11 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    4 
 src/include/access/heapam.h                                        |    2 
 src/include/access/htup.h                                          |   43 
 src/include/access/tupdesc.h                                       |    1 
 src/include/catalog/heap.h                                         |    8 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   19 
 src/include/catalog/pg_security.h                                  |   58 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/fmgr.h                                                 |   10 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   21 
 src/include/nodes/plannodes.h                                      |    9 
 src/include/nodes/relation.h                                       |    9 
 src/include/parser/parse_node.h                                    |    1 
 src/include/parser/parse_relation.h                                |    2 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   47 
 src/include/security/sepgsql.h                                     |  466 +++++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/utils/builtins.h                                       |    8 
 src/include/utils/catcache.h                                       |    1 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |   28 
 121 files changed, 7527 insertions(+), 167 deletions(-)

Index: sepostgresql-core-8.3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql-core-8.3.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sepostgresql-core-8.3.patch	10 Sep 2009 12:27:20 -0000	1.4
+++ sepostgresql-core-8.3.patch	22 Dec 2009 08:18:24 -0000	1.5
@@ -1,6 +1,6 @@
 diff -rpNU3 base/configure sepgsql-new/configure
---- base/configure	2009-09-10 20:11:35.000000000 +0900
-+++ sepgsql-new/configure	2009-09-10 20:24:37.000000000 +0900
+--- base/configure	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/configure	2009-12-15 17:05:57.000000000 +0900
 @@ -314,7 +314,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
@@ -143,8 +143,8 @@ diff -rpNU3 base/configure sepgsql-new/c
  s, at ELF_SYS@,$ELF_SYS,;t t
  s, at LDFLAGS_SL@,$LDFLAGS_SL,;t t
 diff -rpNU3 base/configure.in sepgsql-new/configure.in
---- base/configure.in	2009-09-10 20:11:35.000000000 +0900
-+++ sepgsql-new/configure.in	2009-09-10 20:24:37.000000000 +0900
+--- base/configure.in	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/configure.in	2009-12-15 17:05:57.000000000 +0900
 @@ -626,6 +626,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
  AC_SUBST(with_zlib)
  
@@ -457,8 +457,8 @@ diff -rpNU3 base/src/backend/access/heap
  
  		/*
 diff -rpNU3 base/src/backend/access/transam/xact.c sepgsql-new/src/backend/access/transam/xact.c
---- base/src/backend/access/transam/xact.c	2009-03-15 17:47:25.000000000 +0900
-+++ sepgsql-new/src/backend/access/transam/xact.c	2009-05-20 17:35:01.000000000 +0900
+--- base/src/backend/access/transam/xact.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/access/transam/xact.c	2009-12-15 17:05:57.000000000 +0900
 @@ -35,6 +35,7 @@
  #include "miscadmin.h"
  #include "pg_trace.h"
@@ -469,7 +469,7 @@ diff -rpNU3 base/src/backend/access/tran
  #include "storage/procarray.h"
 @@ -137,6 +138,7 @@ typedef struct TransactionStateData
  	Oid			prevUser;		/* previous CurrentUserId setting */
- 	bool		prevSecDefCxt;	/* previous SecurityDefinerContext setting */
+ 	int			prevSecContext;	/* previous SecurityRestrictionContext */
  	bool		prevXactReadOnly;		/* entry-time xact r/o state */
 +	int			prevRowlv;		/* previous Row-level control behavior */
  	struct TransactionStateData *parent;		/* back link to parent */
@@ -477,7 +477,7 @@ diff -rpNU3 base/src/backend/access/tran
  
 @@ -165,6 +167,7 @@ static TransactionStateData TopTransacti
  	InvalidOid,					/* previous CurrentUserId setting */
- 	false,						/* previous SecurityDefinerContext setting */
+ 	0,							/* previous SecurityRestrictionContext */
  	false,						/* entry-time xact r/o state */
 +	ROWLV_FILTER_MODE,			/* previous Row-level control behavior */
  	NULL						/* link to parent state block */
@@ -486,13 +486,13 @@ diff -rpNU3 base/src/backend/access/tran
 @@ -1571,6 +1574,7 @@ StartTransaction(void)
  	s->nChildXids = 0;
  	s->maxChildXids = 0;
- 	GetUserIdAndContext(&s->prevUser, &s->prevSecDefCxt);
+ 	GetUserIdAndSecContext(&s->prevUser, &s->prevSecContext);
 +	s->prevRowlv = rowlvGetPerformingMode();
- 	/* SecurityDefinerContext should never be set outside a transaction */
- 	Assert(!s->prevSecDefCxt);
+ 	/* SecurityRestrictionContext should never be set outside a transaction */
+ 	Assert(s->prevSecContext == 0);
  
-@@ -2071,6 +2075,11 @@ AbortTransaction(void)
- 	SetUserIdAndContext(s->prevUser, s->prevSecDefCxt);
+@@ -2072,6 +2076,11 @@ AbortTransaction(void)
+ 	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
  
  	/*
 +	 * Reset behavior of row-level access controls
@@ -503,8 +503,8 @@ diff -rpNU3 base/src/backend/access/tran
  	 * do abort processing
  	 */
  	AfterTriggerEndXact(false);
-@@ -3911,6 +3920,11 @@ AbortSubTransaction(void)
- 	SetUserIdAndContext(s->prevUser, s->prevSecDefCxt);
+@@ -3912,6 +3921,11 @@ AbortSubTransaction(void)
+ 	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
  
  	/*
 +	 * Reset behavior of row-level access controls
@@ -515,9 +515,9 @@ diff -rpNU3 base/src/backend/access/tran
  	 * We can skip all this stuff if the subxact failed before creating a
  	 * ResourceOwner...
  	 */
-@@ -4052,6 +4066,7 @@ PushTransaction(void)
+@@ -4053,6 +4067,7 @@ PushTransaction(void)
  	s->blockState = TBLOCK_SUBBEGIN;
- 	GetUserIdAndContext(&s->prevUser, &s->prevSecDefCxt);
+ 	GetUserIdAndSecContext(&s->prevUser, &s->prevSecContext);
  	s->prevXactReadOnly = XactReadOnly;
 +	s->prevRowlv = rowlvGetPerformingMode();
  
@@ -921,8 +921,8 @@ diff -rpNU3 base/src/backend/catalog/hea
  	/*
  	 * Make a dependency link to force the relation to be deleted if its
 diff -rpNU3 base/src/backend/catalog/index.c sepgsql-new/src/backend/catalog/index.c
---- base/src/backend/catalog/index.c	2009-02-02 11:47:17.000000000 +0900
-+++ sepgsql-new/src/backend/catalog/index.c	2009-03-13 18:14:33.000000000 +0900
+--- base/src/backend/catalog/index.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/catalog/index.c	2009-12-15 17:05:57.000000000 +0900
 @@ -37,6 +37,7 @@
  #include "catalog/pg_constraint.h"
  #include "catalog/pg_operator.h"
@@ -931,7 +931,7 @@ diff -rpNU3 base/src/backend/catalog/ind
  #include "catalog/pg_tablespace.h"
  #include "catalog/pg_type.h"
  #include "commands/tablecmds.h"
-@@ -315,6 +316,7 @@ AppendAttributeTuples(Relation indexRela
+@@ -316,6 +317,7 @@ AppendAttributeTuples(Relation indexRela
  
  		new_tuple = heap_addheader(Natts_pg_attribute,
  								   false,
@@ -939,7 +939,7 @@ diff -rpNU3 base/src/backend/catalog/ind
  								   ATTRIBUTE_TUPLE_SIZE,
  								   (void *) indexTupDesc->attrs[i]);
  
-@@ -602,6 +604,12 @@ index_create(Oid heapRelationId,
+@@ -603,6 +605,12 @@ index_create(Oid heapRelationId,
  	Assert(indexRelationId == RelationGetRelid(indexRelation));
  
  	/*
@@ -952,7 +952,7 @@ diff -rpNU3 base/src/backend/catalog/ind
  	 * Obtain exclusive lock on it.  Although no other backends can see it
  	 * until we commit, this prevents deadlock-risk complaints from lock
  	 * manager in cases such as CLUSTER.
-@@ -624,7 +632,7 @@ index_create(Oid heapRelationId,
+@@ -625,7 +633,7 @@ index_create(Oid heapRelationId,
  	 */
  	InsertPgClassTuple(pg_class, indexRelation,
  					   RelationGetRelid(indexRelation),
@@ -963,7 +963,7 @@ diff -rpNU3 base/src/backend/catalog/ind
  	heap_close(pg_class, RowExclusiveLock);
 diff -rpNU3 base/src/backend/catalog/namespace.c sepgsql-new/src/backend/catalog/namespace.c
 --- base/src/backend/catalog/namespace.c	2008-01-07 23:51:33.000000000 +0900
-+++ sepgsql-new/src/backend/catalog/namespace.c	2009-09-10 20:24:37.000000000 +0900
++++ sepgsql-new/src/backend/catalog/namespace.c	2009-12-15 17:05:57.000000000 +0900
 @@ -37,6 +37,7 @@
  #include "commands/dbcommands.h"
  #include "miscadmin.h"
@@ -1092,8 +1092,8 @@ diff -rpNU3 base/src/backend/catalog/pg_
  	nspoid = simple_heap_insert(nspdesc, tup);
  	Assert(OidIsValid(nspoid));
 diff -rpNU3 base/src/backend/catalog/pg_proc.c sepgsql-new/src/backend/catalog/pg_proc.c
---- base/src/backend/catalog/pg_proc.c	2008-01-07 23:51:33.000000000 +0900
-+++ sepgsql-new/src/backend/catalog/pg_proc.c	2009-03-13 18:14:33.000000000 +0900
+--- base/src/backend/catalog/pg_proc.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/catalog/pg_proc.c	2009-12-15 17:05:57.000000000 +0900
 @@ -27,6 +27,7 @@
  #include "mb/pg_wchar.h"
  #include "miscadmin.h"
@@ -1112,7 +1112,7 @@ diff -rpNU3 base/src/backend/catalog/pg_
  {
  	Oid			retval;
  	int			parameterCount;
-@@ -339,6 +341,13 @@ ProcedureCreate(const char *procedureNam
+@@ -343,6 +345,13 @@ ProcedureCreate(const char *procedureNam
  
  		/* Okay, do it... */
  		tup = heap_modifytuple(oldtup, tupDesc, values, nulls, replaces);
@@ -1126,7 +1126,7 @@ diff -rpNU3 base/src/backend/catalog/pg_
  		simple_heap_update(rel, &tup->t_self, tup);
  
  		ReleaseSysCache(oldtup);
-@@ -348,6 +357,13 @@ ProcedureCreate(const char *procedureNam
+@@ -352,6 +361,13 @@ ProcedureCreate(const char *procedureNam
  	{
  		/* Creating a new procedure */
  		tup = heap_formtuple(tupDesc, values, nulls);
@@ -2304,8 +2304,8 @@ diff -rpNU3 base/src/backend/commands/pr
  		}
  		else
 diff -rpNU3 base/src/backend/commands/schemacmds.c sepgsql-new/src/backend/commands/schemacmds.c
---- base/src/backend/commands/schemacmds.c	2008-01-07 23:51:33.000000000 +0900
-+++ sepgsql-new/src/backend/commands/schemacmds.c	2009-06-19 15:02:12.000000000 +0900
+--- base/src/backend/commands/schemacmds.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/commands/schemacmds.c	2009-12-15 17:05:57.000000000 +0900
 @@ -25,6 +25,7 @@
  #include "commands/schemacmds.h"
  #include "miscadmin.h"
@@ -2319,12 +2319,12 @@ diff -rpNU3 base/src/backend/commands/sc
  	Oid			owner_uid;
  	Oid			saved_uid;
 +	Oid			secid = InvalidOid;
- 	bool		saved_secdefcxt;
+ 	int			save_sec_context;
  	AclResult	aclresult;
  
-@@ -93,8 +95,15 @@ CreateSchemaCommand(CreateSchemaStmt *st
- 	if (saved_uid != owner_uid)
- 		SetUserIdAndContext(owner_uid, true);
+@@ -94,8 +96,15 @@ CreateSchemaCommand(CreateSchemaStmt *st
+ 		SetUserIdAndSecContext(owner_uid,
+ 							   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
  
 +	/* Explicitly given security label */
 +	if (stmt->secLabel)
@@ -2339,7 +2339,7 @@ diff -rpNU3 base/src/backend/commands/sc
  
  	/* Advance cmd counter to make the namespace visible */
  	CommandCounterIncrement();
-@@ -412,3 +421,54 @@ AlterSchemaOwner_internal(HeapTuple tup,
+@@ -413,3 +422,54 @@ AlterSchemaOwner_internal(HeapTuple tup,
  	}
  
  }
@@ -2454,8 +2454,8 @@ diff -rpNU3 base/src/backend/commands/se
  	seq = read_info(elm, seqrel, &buf);
  
 diff -rpNU3 base/src/backend/commands/tablecmds.c sepgsql-new/src/backend/commands/tablecmds.c
---- base/src/backend/commands/tablecmds.c	2008-11-05 09:57:00.000000000 +0900
-+++ sepgsql-new/src/backend/commands/tablecmds.c	2009-06-19 15:02:12.000000000 +0900
+--- base/src/backend/commands/tablecmds.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/commands/tablecmds.c	2009-12-15 17:05:57.000000000 +0900
 @@ -57,6 +57,7 @@
  #include "parser/parser.h"
  #include "rewrite/rewriteDefine.h"
@@ -2472,7 +2472,7 @@ diff -rpNU3 base/src/backend/commands/ta
  	bool		localHasOids;
  	int			parentOidCount;
  	List	   *rawDefaults;
-@@ -365,6 +367,10 @@ DefineRelation(CreateStmt *stmt, char re
+@@ -375,6 +377,10 @@ DefineRelation(CreateStmt *stmt, char re
  	schema = MergeAttributes(schema, stmt->inhRelations,
  							 stmt->relation->istemp,
  							 &inheritOids, &old_constraints, &parentOidCount);
@@ -2483,7 +2483,7 @@ diff -rpNU3 base/src/backend/commands/ta
  
  	/*
  	 * Create a relation descriptor from the relation schema and create the
-@@ -422,6 +428,11 @@ DefineRelation(CreateStmt *stmt, char re
+@@ -432,6 +438,11 @@ DefineRelation(CreateStmt *stmt, char re
  		}
  	}
  
@@ -2495,7 +2495,7 @@ diff -rpNU3 base/src/backend/commands/ta
  	relationId = heap_create_with_catalog(relname,
  										  namespaceId,
  										  tablespaceId,
-@@ -434,7 +445,8 @@ DefineRelation(CreateStmt *stmt, char re
+@@ -444,7 +455,8 @@ DefineRelation(CreateStmt *stmt, char re
  										  parentOidCount,
  										  stmt->oncommit,
  										  reloptions,
@@ -2505,7 +2505,7 @@ diff -rpNU3 base/src/backend/commands/ta
  
  	StoreCatalogInheritance(relationId, inheritOids);
  
-@@ -660,6 +672,9 @@ truncate_check_rel(Relation rel)
+@@ -670,6 +682,9 @@ truncate_check_rel(Relation rel)
  				 errmsg("permission denied: \"%s\" is a system catalog",
  						RelationGetRelationName(rel))));
  
@@ -2515,7 +2515,7 @@ diff -rpNU3 base/src/backend/commands/ta
  	/*
  	 * We can never allow truncation of shared or nailed-in-cache relations,
  	 * because we can't support changing their relfilenode values.
-@@ -2591,11 +2606,14 @@ ATRewriteTable(AlteredTableInfo *tab, Oi
+@@ -2601,11 +2616,14 @@ ATRewriteTable(AlteredTableInfo *tab, Oi
  			if (newrel)
  			{
  				Oid			tupOid = InvalidOid;
@@ -2530,7 +2530,7 @@ diff -rpNU3 base/src/backend/commands/ta
  
  				/* Set dropped attributes to null in new tuple */
  				foreach(lc, dropped_attrs)
-@@ -2627,6 +2645,9 @@ ATRewriteTable(AlteredTableInfo *tab, Oi
+@@ -2637,6 +2655,9 @@ ATRewriteTable(AlteredTableInfo *tab, Oi
  				/* Preserve OID, if any */
  				if (newTupDesc->tdhasoid)
  					HeapTupleSetOid(tuple, tupOid);
@@ -2540,7 +2540,7 @@ diff -rpNU3 base/src/backend/commands/ta
  			}
  
  			/* Now check any constraints on the possibly-changed tuple */
-@@ -3113,6 +3134,7 @@ ATExecAddColumn(AlteredTableInfo *tab, R
+@@ -3123,6 +3144,7 @@ ATExecAddColumn(AlteredTableInfo *tab, R
  
  	attributeTuple = heap_addheader(Natts_pg_attribute,
  									false,
@@ -2548,7 +2548,7 @@ diff -rpNU3 base/src/backend/commands/ta
  									ATTRIBUTE_TUPLE_SIZE,
  									(void *) &attributeD);
  
-@@ -4058,6 +4080,10 @@ ATAddForeignKeyConstraint(AlteredTableIn
+@@ -4068,6 +4090,10 @@ ATAddForeignKeyConstraint(AlteredTableIn
  										   opclasses);
  	}
  
@@ -2559,7 +2559,7 @@ diff -rpNU3 base/src/backend/commands/ta
  	/*
  	 * Look up the equality operators to use in the constraint.
  	 *
-@@ -6776,6 +6802,128 @@ AlterSeqNamespaces(Relation classRel, Re
+@@ -6786,6 +6812,128 @@ AlterSeqNamespaces(Relation classRel, Re
  	relation_close(depRel, AccessShareLock);
  }
  
@@ -2710,8 +2710,8 @@ diff -rpNU3 base/src/backend/executor/ex
  	/*
  	 * Use the given slot, or make a new slot if we weren't given one.
 diff -rpNU3 base/src/backend/executor/execMain.c sepgsql-new/src/backend/executor/execMain.c
---- base/src/backend/executor/execMain.c	2008-09-25 15:09:40.000000000 +0900
-+++ sepgsql-new/src/backend/executor/execMain.c	2009-06-10 21:37:54.000000000 +0900
+--- base/src/backend/executor/execMain.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/executor/execMain.c	2009-12-15 17:05:57.000000000 +0900
 @@ -38,6 +38,7 @@
  #include "access/xact.h"
  #include "catalog/heap.h"
@@ -2972,7 +2972,7 @@ diff -rpNU3 base/src/backend/executor/ex
  	 * replace the heap tuple
  	 *
  	 * Note: if es_crosscheck_snapshot isn't InvalidSnapshot, we check that
-@@ -2733,7 +2857,8 @@ OpenIntoRel(QueryDesc *queryDesc)
+@@ -2748,7 +2872,8 @@ OpenIntoRel(QueryDesc *queryDesc)
  											  0,
  											  into->onCommit,
  											  reloptions,
@@ -2982,7 +2982,7 @@ diff -rpNU3 base/src/backend/executor/ex
  
  	FreeTupleDesc(tupdesc);
  
-@@ -2839,6 +2964,10 @@ intorel_receive(TupleTableSlot *slot, De
+@@ -2854,6 +2979,10 @@ intorel_receive(TupleTableSlot *slot, De
  
  	tuple = ExecCopySlotTuple(slot);
  
@@ -4537,8 +4537,8 @@ diff -rpNU3 base/src/backend/parser/pars
  		}
  	}
 diff -rpNU3 base/src/backend/postmaster/postmaster.c sepgsql-new/src/backend/postmaster/postmaster.c
---- base/src/backend/postmaster/postmaster.c	2009-09-10 20:11:35.000000000 +0900
-+++ sepgsql-new/src/backend/postmaster/postmaster.c	2009-09-10 20:24:37.000000000 +0900
+--- base/src/backend/postmaster/postmaster.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/postmaster/postmaster.c	2009-12-15 17:05:57.000000000 +0900
 @@ -107,6 +107,7 @@
  #include "postmaster/pgarch.h"
  #include "postmaster/postmaster.h"
@@ -4568,7 +4568,7 @@ diff -rpNU3 base/src/backend/postmaster/
  		/* If we need to signal the autovacuum launcher, do so now */
  		if (avlauncher_needs_signal)
  		{
-@@ -1921,6 +1927,8 @@ SIGHUP_handler(SIGNAL_ARGS)
+@@ -1923,6 +1929,8 @@ SIGHUP_handler(SIGNAL_ARGS)
  			signal_child(PgArchPID, SIGHUP);
  		if (SysLoggerPID != 0)
  			signal_child(SysLoggerPID, SIGHUP);
@@ -4577,7 +4577,7 @@ diff -rpNU3 base/src/backend/postmaster/
  		/* PgStatPID does not currently need SIGHUP */
  
  		/* Reload authentication config files too */
-@@ -1978,6 +1986,9 @@ pmdie(SIGNAL_ARGS)
+@@ -1980,6 +1988,9 @@ pmdie(SIGNAL_ARGS)
  				/* and the walwriter too */
  				if (WalWriterPID != 0)
  					signal_child(WalWriterPID, SIGTERM);
@@ -4587,7 +4587,7 @@ diff -rpNU3 base/src/backend/postmaster/
  				pmState = PM_WAIT_BACKENDS;
  			}
  
-@@ -2017,6 +2028,9 @@ pmdie(SIGNAL_ARGS)
+@@ -2019,6 +2030,9 @@ pmdie(SIGNAL_ARGS)
  				/* and the walwriter too */
  				if (WalWriterPID != 0)
  					signal_child(WalWriterPID, SIGTERM);
@@ -4597,7 +4597,7 @@ diff -rpNU3 base/src/backend/postmaster/
  				pmState = PM_WAIT_BACKENDS;
  			}
  
-@@ -2050,6 +2064,8 @@ pmdie(SIGNAL_ARGS)
+@@ -2052,6 +2066,8 @@ pmdie(SIGNAL_ARGS)
  				signal_child(PgArchPID, SIGQUIT);
  			if (PgStatPID != 0)
  				signal_child(PgStatPID, SIGQUIT);
@@ -4606,7 +4606,7 @@ diff -rpNU3 base/src/backend/postmaster/
  			ExitPostmaster(0);
  			break;
  	}
-@@ -2298,6 +2314,16 @@ reaper(SIGNAL_ARGS)
+@@ -2300,6 +2316,16 @@ reaper(SIGNAL_ARGS)
  			continue;
  		}
  
@@ -4623,7 +4623,7 @@ diff -rpNU3 base/src/backend/postmaster/
  		/*
  		 * Else do standard backend child cleanup.
  		 */
-@@ -2465,6 +2491,18 @@ HandleChildCrash(int pid, int exitstatus
+@@ -2467,6 +2493,18 @@ HandleChildCrash(int pid, int exitstatus
  		signal_child(AutoVacPID, (SendStop ? SIGSTOP : SIGQUIT));
  	}
  
@@ -4642,7 +4642,7 @@ diff -rpNU3 base/src/backend/postmaster/
  	/*
  	 * Force a power-cycle of the pgarch process too.  (This isn't absolutely
  	 * necessary, but it seems like a good idea for robustness, and it
-@@ -2584,7 +2622,8 @@ PostmasterStateMachine(void)
+@@ -2586,7 +2624,8 @@ PostmasterStateMachine(void)
  			StartupPID == 0 &&
  			(BgWriterPID == 0 || !FatalError) &&
  			WalWriterPID == 0 &&
@@ -8872,9 +8872,9 @@ diff -rpNU3 base/src/backend/security/se
 +	allow sepgsql_database_type     user_home_t : db_database { load_module };
 +')
 diff -rpNU3 base/src/backend/storage/file/fd.c sepgsql-new/src/backend/storage/file/fd.c
---- base/src/backend/storage/file/fd.c	2008-01-07 23:51:33.000000000 +0900
-+++ sepgsql-new/src/backend/storage/file/fd.c	2009-03-13 18:14:33.000000000 +0900
-@@ -1241,6 +1241,13 @@ FileTruncate(File file, long offset)
+--- base/src/backend/storage/file/fd.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/storage/file/fd.c	2009-12-15 17:05:57.000000000 +0900
+@@ -1251,6 +1251,13 @@ FileTruncate(File file, long offset)
  	return returnCode;
  }
  
@@ -9096,8 +9096,8 @@ diff -rpNU3 base/src/backend/tcop/pquery
  
  				/*
 diff -rpNU3 base/src/backend/tcop/utility.c sepgsql-new/src/backend/tcop/utility.c
---- base/src/backend/tcop/utility.c	2008-11-05 09:57:00.000000000 +0900
-+++ sepgsql-new/src/backend/tcop/utility.c	2009-06-19 15:02:12.000000000 +0900
+--- base/src/backend/tcop/utility.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/tcop/utility.c	2009-12-15 17:05:57.000000000 +0900
 @@ -49,6 +49,7 @@
  #include "postmaster/bgwriter.h"
  #include "rewrite/rewriteDefine.h"
@@ -9114,7 +9114,7 @@ diff -rpNU3 base/src/backend/tcop/utilit
  		case T_AlterSeqStmt:
  		case T_AlterTableStmt:
  		case T_RenameStmt:
-@@ -744,6 +746,10 @@ ProcessUtility(Node *parsetree,
+@@ -766,6 +768,10 @@ ProcessUtility(Node *parsetree,
  			ExecAlterOwnerStmt((AlterOwnerStmt *) parsetree);
  			break;
  
@@ -9125,7 +9125,7 @@ diff -rpNU3 base/src/backend/tcop/utilit
  		case T_AlterTableStmt:
  			{
  				List	   *stmts;
-@@ -1022,6 +1028,10 @@ ProcessUtility(Node *parsetree,
+@@ -1046,6 +1052,10 @@ ProcessUtility(Node *parsetree,
  				LoadStmt   *stmt = (LoadStmt *) parsetree;
  
  				closeAllVfds(); /* probably not necessary... */
@@ -9136,7 +9136,7 @@ diff -rpNU3 base/src/backend/tcop/utilit
  				/* Allowed names are restricted if you're not superuser */
  				load_file(stmt->filename, !superuser());
  			}
-@@ -1709,6 +1719,28 @@ CreateCommandTag(Node *parsetree)
+@@ -1735,6 +1745,28 @@ CreateCommandTag(Node *parsetree)
  			}
  			break;
  
@@ -9165,7 +9165,7 @@ diff -rpNU3 base/src/backend/tcop/utilit
  		case T_AlterTableStmt:
  			{
  				AlterTableStmt *stmt = (AlterTableStmt *) parsetree;
-@@ -2248,6 +2280,10 @@ GetCommandLogLevel(Node *parsetree)
+@@ -2274,6 +2306,10 @@ GetCommandLogLevel(Node *parsetree)
  			lev = LOGSTMT_DDL;
  			break;
  
@@ -9198,8 +9198,8 @@ diff -rpNU3 base/src/backend/utils/adt/g
  			   (seek_offset >= 0) ? SEEK_SET : SEEK_END) != 0)
  		ereport(ERROR,
 diff -rpNU3 base/src/backend/utils/adt/ri_triggers.c sepgsql-new/src/backend/utils/adt/ri_triggers.c
---- base/src/backend/utils/adt/ri_triggers.c	2008-09-25 15:09:40.000000000 +0900
-+++ sepgsql-new/src/backend/utils/adt/ri_triggers.c	2009-05-20 17:08:02.000000000 +0900
+--- base/src/backend/utils/adt/ri_triggers.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/utils/adt/ri_triggers.c	2009-12-15 17:05:57.000000000 +0900
 @@ -37,6 +37,7 @@
  #include "parser/parse_coerce.h"
  #include "parser/parse_relation.h"
@@ -9238,17 +9238,17 @@ diff -rpNU3 base/src/backend/utils/adt/r
  	/* Check result */
  	if (spi_result != SPI_OK_SELECT)
  		elog(ERROR, "SPI_execute_snapshot returned %d", spi_result);
-@@ -3256,6 +3266,7 @@ ri_PerformCheck(RI_QueryKey *qkey, SPIPl
+@@ -3257,6 +3267,7 @@ ri_PerformCheck(RI_QueryKey *qkey, SPIPl
  	int			spi_result;
  	Oid			save_userid;
- 	bool		save_secdefcxt;
+ 	int			save_sec_context;
 +	int			save_rowlv, temp_rowlv;
  	Datum		vals[RI_MAX_NUMKEYS * 2];
  	char		nulls[RI_MAX_NUMKEYS * 2];
  
-@@ -3336,12 +3347,19 @@ ri_PerformCheck(RI_QueryKey *qkey, SPIPl
- 	GetUserIdAndContext(&save_userid, &save_secdefcxt);
- 	SetUserIdAndContext(RelationGetForm(query_rel)->relowner, true);
+@@ -3338,12 +3349,19 @@ ri_PerformCheck(RI_QueryKey *qkey, SPIPl
+ 	SetUserIdAndSecContext(RelationGetForm(query_rel)->relowner,
+ 						   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
  
 +	/* Switch Row-level stuff behavior on FK checks, if necessary */
 +	temp_rowlv = (detectNewRows ? ROWLV_ABORT_MODE : ROWLV_FILTER_MODE);
@@ -9263,8 +9263,8 @@ diff -rpNU3 base/src/backend/utils/adt/r
 +	/* Restore Row-level stuff behavior */
 +	rowlvSetPerformingMode(save_rowlv);
 +
- 	/* Restore UID */
- 	SetUserIdAndContext(save_userid, save_secdefcxt);
+ 	/* Restore UID and security context */
+ 	SetUserIdAndSecContext(save_userid, save_sec_context);
  
 diff -rpNU3 base/src/backend/utils/adt/varlena.c sepgsql-new/src/backend/utils/adt/varlena.c
 --- base/src/backend/utils/adt/varlena.c	2008-03-19 09:48:23.000000000 +0900
@@ -9454,8 +9454,8 @@ diff -rpNU3 base/src/backend/utils/cache
  			/* other cases shouldn't happen, but return NULL */
  			break;
 diff -rpNU3 base/src/backend/utils/cache/relcache.c sepgsql-new/src/backend/utils/cache/relcache.c
---- base/src/backend/utils/cache/relcache.c	2009-02-02 11:47:17.000000000 +0900
-+++ sepgsql-new/src/backend/utils/cache/relcache.c	2009-03-13 18:14:33.000000000 +0900
+--- base/src/backend/utils/cache/relcache.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/utils/cache/relcache.c	2009-12-15 17:05:57.000000000 +0900
 @@ -46,6 +46,7 @@
  #include "catalog/pg_opclass.h"
  #include "catalog/pg_proc.h"
@@ -9490,7 +9490,7 @@ diff -rpNU3 base/src/backend/utils/cache
  	/*
  	 * initialize the relation lock manager information
  	 */
-@@ -1462,6 +1473,12 @@ formrdesc(const char *relationName, Oid 
+@@ -1464,6 +1475,12 @@ formrdesc(const char *relationName, Oid 
  	relation->rd_rel->relfilenode = RelationGetRelid(relation);
  
  	/*
@@ -9503,7 +9503,7 @@ diff -rpNU3 base/src/backend/utils/cache
  	 * initialize the relation lock manager information
  	 */
  	RelationInitLockInfo(relation);		/* see lmgr.c */
-@@ -2687,6 +2704,13 @@ BuildHardcodedDescriptor(int natts, Form
+@@ -2737,6 +2754,13 @@ BuildHardcodedDescriptor(int natts, Form
  
  	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
  
@@ -9517,7 +9517,7 @@ diff -rpNU3 base/src/backend/utils/cache
  	result = CreateTemplateTupleDesc(natts, hasoids);
  	result->tdtypeid = RECORDOID;		/* not right, but we don't care */
  	result->tdtypmod = -1;
-@@ -3446,6 +3470,12 @@ load_relcache_init_file(void)
+@@ -3496,6 +3520,12 @@ load_relcache_init_file(void)
  			rel->rd_options = NULL;
  		}
  
@@ -9643,8 +9643,8 @@ diff -rpNU3 base/src/backend/utils/fmgr/
  {
  	bool		have_slash;
 diff -rpNU3 base/src/backend/utils/fmgr/fmgr.c sepgsql-new/src/backend/utils/fmgr/fmgr.c
---- base/src/backend/utils/fmgr/fmgr.c	2009-02-02 11:47:17.000000000 +0900
-+++ sepgsql-new/src/backend/utils/fmgr/fmgr.c	2009-03-13 18:14:33.000000000 +0900
+--- base/src/backend/utils/fmgr/fmgr.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/utils/fmgr/fmgr.c	2009-12-15 17:05:57.000000000 +0900
 @@ -23,6 +23,7 @@
  #include "executor/spi.h"
  #include "miscadmin.h"
@@ -9711,8 +9711,8 @@ diff -rpNU3 base/src/backend/utils/init/
  	 * Figure out our postgres user id, and see if we are a superuser.
  	 *
 diff -rpNU3 base/src/backend/utils/misc/guc.c sepgsql-new/src/backend/utils/misc/guc.c
---- base/src/backend/utils/misc/guc.c	2009-09-10 20:11:35.000000000 +0900
-+++ sepgsql-new/src/backend/utils/misc/guc.c	2009-09-10 20:24:37.000000000 +0900
+--- base/src/backend/utils/misc/guc.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/backend/utils/misc/guc.c	2009-12-15 17:05:57.000000000 +0900
 @@ -54,6 +54,7 @@
  #include "postmaster/postmaster.h"
  #include "postmaster/syslogger.h"

sepostgresql-utils-8.3.patch:
 initdb/initdb.c      |   13 +++++
 pg_dump/pg_dump.c    |  121 +++++++++++++++++++++++++++++++++++++++++++--------
 pg_dump/pg_dump.h    |    2 
 pg_dump/pg_dumpall.c |   60 ++++++++++++++++++++-----
 4 files changed, 168 insertions(+), 28 deletions(-)

Index: sepostgresql-utils-8.3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql-utils-8.3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sepostgresql-utils-8.3.patch	10 Sep 2009 12:27:20 -0000	1.2
+++ sepostgresql-utils-8.3.patch	22 Dec 2009 08:18:24 -0000	1.3
@@ -1,6 +1,6 @@
 diff -rpNU3 base/src/bin/initdb/initdb.c sepgsql-new/src/bin/initdb/initdb.c
---- base/src/bin/initdb/initdb.c	2009-09-10 20:11:35.000000000 +0900
-+++ sepgsql-new/src/bin/initdb/initdb.c	2009-09-10 20:24:37.000000000 +0900
+--- base/src/bin/initdb/initdb.c	2009-12-15 16:55:43.000000000 +0900
++++ sepgsql-new/src/bin/initdb/initdb.c	2009-12-15 17:05:57.000000000 +0900
 @@ -94,6 +94,7 @@ static bool debug = false;
  static bool noclean = false;
  static bool show_setting = false;


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql.init,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sepostgresql.init	10 Sep 2009 12:27:20 -0000	1.35
+++ sepostgresql.init	22 Dec 2009 08:18:24 -0000	1.36
@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.3.8"
+PGVERSION="8.3.9"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="2300"
+SEPGVERSION="2515"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sepostgresql.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sepostgresql.spec	10 Sep 2009 12:27:20 -0000	1.38
+++ sepostgresql.spec	22 Dec 2009 08:18:24 -0000	1.39
@@ -11,8 +11,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.3.8
-Release: 2300%{?dist}
+Version: 8.3.9
+Release: 2515%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -199,6 +199,9 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Fri Dec 25 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.9-2515
+- upgrade base PostgreSQL v8.3.8->8.3.9
+
 * Thu Sep 10 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.3.8-2300
 - upgrade base PostgreSQL v8.3.7->8.3.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Sep 2009 12:27:20 -0000	1.12
+++ sources	22 Dec 2009 08:18:24 -0000	1.13
@@ -1 +1 @@
-aac683d03f765dc58a3a0e5eaa1927bf  postgresql-8.3.8.tar.bz2
+e120b001354851b5df26cbee8c2786d5  postgresql-8.3.9.tar.bz2



From jwrdegoede at fedoraproject.org  Tue Dec 22 08:31:18 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 22 Dec 2009 08:31:18 +0000 (UTC)
Subject: File gkrellm-2.3.3.tar.bz2 uploaded to lookaside cache by jwrdegoede
Message-ID: <20091222083118.E17C410F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gkrellm:

74c5252952c08a9866a6d381b7fd7454  gkrellm-2.3.3.tar.bz2



From jwrdegoede at fedoraproject.org  Tue Dec 22 08:32:04 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 22 Dec 2009 08:32:04 +0000 (UTC)
Subject: rpms/gkrellm/devel .cvsignore, 1.6, 1.7 gkrellm.spec, 1.26,
	1.27 sources, 1.6, 1.7 gkrellm-2.3.1-netdb.patch, 1.2,
	NONE gkrellm-2.3.2-dead-bat-crash.patch, 1.1,
	NONE gkrellm-2.3.2-ssl-threadsafety.patch, 1.1, NONE
Message-ID: <20091222083204.B790511C00E9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24288

Modified Files:
	.cvsignore gkrellm.spec sources 
Removed Files:
	gkrellm-2.3.1-netdb.patch gkrellm-2.3.2-dead-bat-crash.patch 
	gkrellm-2.3.2-ssl-threadsafety.patch 
Log Message:
* Tue Dec 22 2009 Hans de Goede <hdegoede at redhat.com> 2.3.3-1
- New upstream release 2.3.3
- Fixes the gkrellm client crash when the gkrellm server reboots (#545327)
- Drop a number of upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Oct 2008 18:42:37 -0000	1.6
+++ .cvsignore	22 Dec 2009 08:32:03 -0000	1.7
@@ -1 +1 @@
-gkrellm-2.3.2.tar.bz2
+gkrellm-2.3.3.tar.bz2


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gkrellm.spec	20 Dec 2009 14:10:29 -0000	1.26
+++ gkrellm.spec	22 Dec 2009 08:32:03 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           gkrellm
-Version:        2.3.2
-Release:        8%{?dist}
+Version:        2.3.3
+Release:        1%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -12,10 +12,7 @@ Source3:        gkrellm.png
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
-Patch4:         gkrellm-2.3.1-netdb.patch
-Patch5:         gkrellm-2.3.2-ssl-threadsafety.patch
-Patch6:         gkrellm-2.3.2-dead-bat-crash.patch
-Patch7:         gkrellm-2.3.2-transp-crash.patch
+Patch4:         gkrellm-2.3.2-transp-crash.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,10 +60,7 @@ Development files for the GNU Krell Moni
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
-%patch4 -p1 -z .netdb
-%patch5 -p1 -z .ssl
-%patch6 -p1
-%patch7 -p1
+%patch4 -p1
 
 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
@@ -173,6 +167,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Hans de Goede <hdegoede at redhat.com> 2.3.3-1
+- New upstream release 2.3.3
+- Fixes the gkrellm client crash when the gkrellm server reboots (#545327)
+- Drop a number of upstreamed patches
+
 * Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
 - Don't crash on laptops with dead batteries (#545987)
 - Don't crash with transparent themes (#549005)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Oct 2008 18:42:37 -0000	1.6
+++ sources	22 Dec 2009 08:32:03 -0000	1.7
@@ -1 +1 @@
-d5543a439ee77950282d06b000048be7  gkrellm-2.3.2.tar.bz2
+74c5252952c08a9866a6d381b7fd7454  gkrellm-2.3.3.tar.bz2


--- gkrellm-2.3.1-netdb.patch DELETED ---


--- gkrellm-2.3.2-dead-bat-crash.patch DELETED ---


--- gkrellm-2.3.2-ssl-threadsafety.patch DELETED ---



From jwrdegoede at fedoraproject.org  Tue Dec 22 08:33:07 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 22 Dec 2009 08:33:07 +0000 (UTC)
Subject: rpms/gkrellm/F-12 .cvsignore, 1.6, 1.7 gkrellm.spec, 1.26,
	1.27 sources, 1.6, 1.7 gkrellm-2.3.1-netdb.patch, 1.2,
	NONE gkrellm-2.3.2-dead-bat-crash.patch, 1.1,
	NONE gkrellm-2.3.2-ssl-threadsafety.patch, 1.1, NONE
Message-ID: <20091222083307.46CCB11C00E9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gkrellm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24558

Modified Files:
	.cvsignore gkrellm.spec sources 
Removed Files:
	gkrellm-2.3.1-netdb.patch gkrellm-2.3.2-dead-bat-crash.patch 
	gkrellm-2.3.2-ssl-threadsafety.patch 
Log Message:
* Tue Dec 22 2009 Hans de Goede <hdegoede at redhat.com> 2.3.3-1
- New upstream release 2.3.3
- Fixes the gkrellm client crash when the gkrellm server reboots (#545327)
- Drop a number of upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Oct 2008 18:42:37 -0000	1.6
+++ .cvsignore	22 Dec 2009 08:33:06 -0000	1.7
@@ -1 +1 @@
-gkrellm-2.3.2.tar.bz2
+gkrellm-2.3.3.tar.bz2


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-12/gkrellm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gkrellm.spec	20 Dec 2009 14:09:50 -0000	1.26
+++ gkrellm.spec	22 Dec 2009 08:33:07 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           gkrellm
-Version:        2.3.2
-Release:        8%{?dist}
+Version:        2.3.3
+Release:        1%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -12,10 +12,7 @@ Source3:        gkrellm.png
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
-Patch4:         gkrellm-2.3.1-netdb.patch
-Patch5:         gkrellm-2.3.2-ssl-threadsafety.patch
-Patch6:         gkrellm-2.3.2-dead-bat-crash.patch
-Patch7:         gkrellm-2.3.2-transp-crash.patch
+Patch4:         gkrellm-2.3.2-transp-crash.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,10 +60,7 @@ Development files for the GNU Krell Moni
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
-%patch4 -p1 -z .netdb
-%patch5 -p1 -z .ssl
-%patch6 -p1
-%patch7 -p1
+%patch4 -p1
 
 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
@@ -173,6 +167,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Hans de Goede <hdegoede at redhat.com> 2.3.3-1
+- New upstream release 2.3.3
+- Fixes the gkrellm client crash when the gkrellm server reboots (#545327)
+- Drop a number of upstreamed patches
+
 * Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
 - Don't crash on laptops with dead batteries (#545987)
 - Don't crash with transparent themes (#549005)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Oct 2008 18:42:37 -0000	1.6
+++ sources	22 Dec 2009 08:33:07 -0000	1.7
@@ -1 +1 @@
-d5543a439ee77950282d06b000048be7  gkrellm-2.3.2.tar.bz2
+74c5252952c08a9866a6d381b7fd7454  gkrellm-2.3.3.tar.bz2


--- gkrellm-2.3.1-netdb.patch DELETED ---


--- gkrellm-2.3.2-dead-bat-crash.patch DELETED ---


--- gkrellm-2.3.2-ssl-threadsafety.patch DELETED ---



From jwrdegoede at fedoraproject.org  Tue Dec 22 08:33:41 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 22 Dec 2009 08:33:41 +0000 (UTC)
Subject: rpms/gkrellm/F-11 gkrellm-2.3.2-transp-crash.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 gkrellm.spec, 1.23, 1.24 sources, 1.6,
	1.7 gkrellm-2.3.1-netdb.patch, 1.2,
	NONE gkrellm-2.3.2-ssl-threadsafety.patch, 1.1, NONE
Message-ID: <20091222083341.AE28311C00E9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gkrellm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24780

Modified Files:
	.cvsignore gkrellm.spec sources 
Added Files:
	gkrellm-2.3.2-transp-crash.patch 
Removed Files:
	gkrellm-2.3.1-netdb.patch gkrellm-2.3.2-ssl-threadsafety.patch 
Log Message:
* Tue Dec 22 2009 Hans de Goede <hdegoede at redhat.com> 2.3.3-1
- New upstream release 2.3.3
- Fixes the gkrellm client crash when the gkrellm server reboots (#545327)
- Drop a number of upstreamed patches


gkrellm-2.3.2-transp-crash.patch:
 winops-x11.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gkrellm-2.3.2-transp-crash.patch ---
diff -up gkrellm-2.3.2/src/winops-x11.c~ gkrellm-2.3.2/src/winops-x11.c
--- gkrellm-2.3.2/src/winops-x11.c~	2008-10-04 02:35:53.000000000 +0200
+++ gkrellm-2.3.2/src/winops-x11.c	2009-12-20 14:43:45.000000000 +0100
@@ -538,7 +538,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans
 	GkrellmMargin	*m;
 	gint			x, y;
 
-	if (   root_xpixmap == None || !cp->transparency
+	if (   root_xpixmap == None || trans_gc == NULL || !cp->transparency
 		|| !cp->drawing_area || !cp->drawing_area->window
 	   )
 		return FALSE;
@@ -605,7 +605,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans
 	Window	child;
 	gint	x, y;
 
-	if (   root_xpixmap == None || !p->transparency
+	if (   root_xpixmap == None || trans_gc == NULL || !p->transparency
 		|| !p->drawing_area || !p->drawing_area->window
 	   )
 		return FALSE;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Oct 2008 18:42:37 -0000	1.6
+++ .cvsignore	22 Dec 2009 08:33:41 -0000	1.7
@@ -1 +1 @@
-gkrellm-2.3.2.tar.bz2
+gkrellm-2.3.3.tar.bz2


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-11/gkrellm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gkrellm.spec	3 Dec 2009 08:59:49 -0000	1.23
+++ gkrellm.spec	22 Dec 2009 08:33:41 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           gkrellm
-Version:        2.3.2
-Release:        7%{?dist}
+Version:        2.3.3
+Release:        1%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -12,8 +12,7 @@ Source3:        gkrellm.png
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
-Patch4:         gkrellm-2.3.1-netdb.patch
-Patch5:         gkrellm-2.3.2-ssl-threadsafety.patch
+Patch4:         gkrellm-2.3.2-transp-crash.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,8 +60,7 @@ Development files for the GNU Krell Moni
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
-%patch4 -p1 -z .netdb
-%patch5 -p1 -z .ssl
+%patch4 -p1
 
 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 +167,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Hans de Goede <hdegoede at redhat.com> 2.3.3-1
+- New upstream release 2.3.3
+- Fixes the gkrellm client crash when the gkrellm server reboots (#545327)
+- Drop a number of upstreamed patches
+
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
+- Don't crash on laptops with dead batteries (#545987)
+- Don't crash with transparent themes (#549005)
+
 * Fri Nov 27 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-7
 - Fix crash when using multiple simap/spop mailboxes (#541824)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Oct 2008 18:42:37 -0000	1.6
+++ sources	22 Dec 2009 08:33:41 -0000	1.7
@@ -1 +1 @@
-d5543a439ee77950282d06b000048be7  gkrellm-2.3.2.tar.bz2
+74c5252952c08a9866a6d381b7fd7454  gkrellm-2.3.3.tar.bz2


--- gkrellm-2.3.1-netdb.patch DELETED ---


--- gkrellm-2.3.2-ssl-threadsafety.patch DELETED ---



From tagoh at fedoraproject.org  Tue Dec 22 08:37:35 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue, 22 Dec 2009 08:37:35 +0000 (UTC)
Subject: rpms/kasumi/devel kasumi.spec,1.34,1.35
Message-ID: <20091222083735.B17BE11C00E9@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kasumi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25357

Modified Files:
	kasumi.spec 
Log Message:
more improvements


Index: kasumi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- kasumi.spec	21 Dec 2009 07:22:55 -0000	1.34
+++ kasumi.spec	22 Dec 2009 08:37:35 -0000	1.35
@@ -6,7 +6,7 @@ License: GPLv2+
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils, gtk2-devel anthy-devel
-Source0: http://dl.sourceforge.jp/kasumi/41436/%{name}-%{version}.tar.gz
+Source0: http://jaist.dl.sourceforge.jp/kasumi/41436/%{name}-%{version}.tar.gz
 
 
 Summary: An anthy dictionary management tool
@@ -30,6 +30,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 # remove .desktop file so that kasumi is accessible from scim panel and it's not necessary for other users.
 #rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
+sed -i -e 's/Icon=\(.*\)\.png/Icon=\1/g' $RPM_BUILD_ROOT%{_datadir}/applications/kasumi.desktop
+touch -r $RPM_BUILD_DIR/%{name}-%{version}/kasumi.desktop.in $RPM_BUILD_ROOT%{_datadir}/applications/kasumi.desktop
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications --remove-category=Applications --delete-original $RPM_BUILD_ROOT%{_datadir}/applications/kasumi.desktop
 
 %find_lang %{name}
 



From pbrobinson at fedoraproject.org  Tue Dec 22 08:43:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Dec 2009 08:43:50 +0000 (UTC)
Subject: File anjal-0.2.0-20091222.tar.bz2 uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091222084350.B2EAF10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for anjal:

083fb12cea4a34a48ec66369ffb634e2  anjal-0.2.0-20091222.tar.bz2



From gerd at fedoraproject.org  Tue Dec 22 08:48:04 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 22 Dec 2009 08:48:04 +0000 (UTC)
Subject: File Pod-PseudoPod-0.15.tar.gz uploaded to lookaside cache by gerd
Message-ID: <20091222084804.CD68110F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-Pod-PseudoPod:

76fe8e9d26306574e805bff387ba4a23  Pod-PseudoPod-0.15.tar.gz



From gerd at fedoraproject.org  Tue Dec 22 08:51:29 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 22 Dec 2009 08:51:29 +0000 (UTC)
Subject: rpms/perl-Pod-PseudoPod/devel import.log, NONE,
	1.1 perl-Pod-PseudoPod.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222085129.9496F11C00E9@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/perl-Pod-PseudoPod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26979/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Pod-PseudoPod.spec 
Log Message:
initial upload for perl-Pod-PseudoPod

- add perl_vendorlib files more explicit
- changed Summary-, Source0- and License-lines
- add ppod*-binaries to files-section
- Specfile autogenerated by cpanspec 1.78.




--- NEW FILE import.log ---
perl-Pod-PseudoPod-0_15-1_fc11:HEAD:perl-Pod-PseudoPod-0.15-1.fc11.src.rpm:1261471083


--- NEW FILE perl-Pod-PseudoPod.spec ---
Name:           perl-Pod-PseudoPod
Version:        0.15
Release:        1%{?dist}
Summary:        Framework for extending the POD tags for book manuscripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Pod-PseudoPod/
Source0:        http://search.cpan.org/CPAN/authors/id/A/AR/ARANDAL/Pod-PseudoPod-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(HTML::Entities)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Pod::Simple) >= 3.02
BuildRequires:  perl(Test::More)
Requires:       perl(Pod::Simple) >= 3.02
Requires:       perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
PseudoPod is an extended set of Pod tags used for book manuscripts.
Standard Pod doesn't have all the markup options you need to mark up files
for publishing production. PseudoPod adds a few extra tags for footnotes,
tables, sidebars, etc. For further information see Pod::PseudoPod::Tutorial.


%prep
%setup -q -n Pod-PseudoPod-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
%{__rm} -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0

# Added to remove the waring messages from rpmlint
%{_fixperms} $RPM_BUILD_ROOT/*


%check
./Build test


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/Pod/PseudoPod.pm
%{perl_vendorlib}/Pod/PseudoPod
%{_mandir}/man3/*
%{_bindir}/ppod2docbook
%{_bindir}/ppod2txt
%{_bindir}/ppodchecker
%{_bindir}/ppod2html


%changelog
* Mon Nov 30 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.15-1
- add perl_vendorlib files more explicit
- changed Summary-, Source0- and License-lines
- add ppod*-binaries to files-section
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-PseudoPod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:46:28 -0000	1.1
+++ .cvsignore	22 Dec 2009 08:51:29 -0000	1.2
@@ -0,0 +1 @@
+Pod-PseudoPod-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-PseudoPod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:46:28 -0000	1.1
+++ sources	22 Dec 2009 08:51:29 -0000	1.2
@@ -0,0 +1 @@
+76fe8e9d26306574e805bff387ba4a23  Pod-PseudoPod-0.15.tar.gz



From gerd at fedoraproject.org  Tue Dec 22 08:57:57 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 22 Dec 2009 08:57:57 +0000 (UTC)
Subject: rpms/perl-Pod-PseudoPod/F-12 import.log, NONE,
	1.1 perl-Pod-PseudoPod.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222085757.2C5B511C00E9@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/perl-Pod-PseudoPod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28155/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Pod-PseudoPod.spec 
Log Message:
initial upload for perl-Pod-PseudoPod

* Mon Nov 30 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.15-1
- add perl_vendorlib files more explicit
- changed Summary-, Source0- and License-lines
- add ppod*-binaries to files-section
- Specfile autogenerated by cpanspec 1.78.




--- NEW FILE import.log ---
perl-Pod-PseudoPod-0_15-1_fc11:F-12:perl-Pod-PseudoPod-0.15-1.fc11.src.rpm:1261471597


--- NEW FILE perl-Pod-PseudoPod.spec ---
Name:           perl-Pod-PseudoPod
Version:        0.15
Release:        1%{?dist}
Summary:        Framework for extending the POD tags for book manuscripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Pod-PseudoPod/
Source0:        http://search.cpan.org/CPAN/authors/id/A/AR/ARANDAL/Pod-PseudoPod-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(HTML::Entities)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Pod::Simple) >= 3.02
BuildRequires:  perl(Test::More)
Requires:       perl(Pod::Simple) >= 3.02
Requires:       perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
PseudoPod is an extended set of Pod tags used for book manuscripts.
Standard Pod doesn't have all the markup options you need to mark up files
for publishing production. PseudoPod adds a few extra tags for footnotes,
tables, sidebars, etc. For further information see Pod::PseudoPod::Tutorial.


%prep
%setup -q -n Pod-PseudoPod-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
%{__rm} -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0

# Added to remove the waring messages from rpmlint
%{_fixperms} $RPM_BUILD_ROOT/*


%check
./Build test


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/Pod/PseudoPod.pm
%{perl_vendorlib}/Pod/PseudoPod
%{_mandir}/man3/*
%{_bindir}/ppod2docbook
%{_bindir}/ppod2txt
%{_bindir}/ppodchecker
%{_bindir}/ppod2html


%changelog
* Mon Nov 30 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.15-1
- add perl_vendorlib files more explicit
- changed Summary-, Source0- and License-lines
- add ppod*-binaries to files-section
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-PseudoPod/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:46:28 -0000	1.1
+++ .cvsignore	22 Dec 2009 08:57:56 -0000	1.2
@@ -0,0 +1 @@
+Pod-PseudoPod-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-PseudoPod/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:46:28 -0000	1.1
+++ sources	22 Dec 2009 08:57:57 -0000	1.2
@@ -0,0 +1 @@
+76fe8e9d26306574e805bff387ba4a23  Pod-PseudoPod-0.15.tar.gz



From gerd at fedoraproject.org  Tue Dec 22 09:01:55 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue, 22 Dec 2009 09:01:55 +0000 (UTC)
Subject: rpms/perl-Pod-PseudoPod/F-11 import.log, NONE,
	1.1 perl-Pod-PseudoPod.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091222090155.3273B11C00E9@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/perl-Pod-PseudoPod/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28843/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Pod-PseudoPod.spec 
Log Message:
initial upload for perl-Pod-PseudoPod

* Mon Nov 30 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.15-1
- add perl_vendorlib files more explicit
- changed Summary-, Source0- and License-lines
- add ppod*-binaries to files-section
- Specfile autogenerated by cpanspec 1.78.




--- NEW FILE import.log ---
perl-Pod-PseudoPod-0_15-1_fc11:F-11:perl-Pod-PseudoPod-0.15-1.fc11.src.rpm:1261471842


--- NEW FILE perl-Pod-PseudoPod.spec ---
Name:           perl-Pod-PseudoPod
Version:        0.15
Release:        1%{?dist}
Summary:        Framework for extending the POD tags for book manuscripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Pod-PseudoPod/
Source0:        http://search.cpan.org/CPAN/authors/id/A/AR/ARANDAL/Pod-PseudoPod-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(HTML::Entities)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Pod::Simple) >= 3.02
BuildRequires:  perl(Test::More)
Requires:       perl(Pod::Simple) >= 3.02
Requires:       perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
PseudoPod is an extended set of Pod tags used for book manuscripts.
Standard Pod doesn't have all the markup options you need to mark up files
for publishing production. PseudoPod adds a few extra tags for footnotes,
tables, sidebars, etc. For further information see Pod::PseudoPod::Tutorial.


%prep
%setup -q -n Pod-PseudoPod-%{version}


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
%{__rm} -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0

# Added to remove the waring messages from rpmlint
%{_fixperms} $RPM_BUILD_ROOT/*


%check
./Build test


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/Pod/PseudoPod.pm
%{perl_vendorlib}/Pod/PseudoPod
%{_mandir}/man3/*
%{_bindir}/ppod2docbook
%{_bindir}/ppod2txt
%{_bindir}/ppodchecker
%{_bindir}/ppod2html


%changelog
* Mon Nov 30 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.15-1
- add perl_vendorlib files more explicit
- changed Summary-, Source0- and License-lines
- add ppod*-binaries to files-section
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-PseudoPod/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:46:28 -0000	1.1
+++ .cvsignore	22 Dec 2009 09:01:54 -0000	1.2
@@ -0,0 +1 @@
+Pod-PseudoPod-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-PseudoPod/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:46:28 -0000	1.1
+++ sources	22 Dec 2009 09:01:55 -0000	1.2
@@ -0,0 +1 @@
+76fe8e9d26306574e805bff387ba4a23  Pod-PseudoPod-0.15.tar.gz



From slankes at fedoraproject.org  Tue Dec 22 09:04:27 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 22 Dec 2009 09:04:27 +0000 (UTC)
Subject: rpms/kde-plasma-stasks/devel kde-plasma-stasks.spec,1.5,1.6
Message-ID: <20091222090427.4BEDA11C00E9@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/kde-plasma-stasks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29345

Modified Files:
	kde-plasma-stasks.spec 
Log Message:
* Tue Dec 22 2009 Sven Lankes <sven at lank.es> 0.5.1-7
- Rebuild against KDE SC 4.3.85



Index: kde-plasma-stasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-stasks/devel/kde-plasma-stasks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde-plasma-stasks.spec	30 Jul 2009 17:12:02 -0000	1.5
+++ kde-plasma-stasks.spec	22 Dec 2009 09:04:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           kde-plasma-stasks
 Version:        0.5.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Alternate Task-Switcher plasma applet
 
 Group:          User Interface/Desktops
@@ -44,6 +44,9 @@ rm -rf %{buildroot}
 %doc COPYING README
 
 %changelog
+* Tue Dec 22 2009 Sven Lankes <sven at lank.es> 0.5.1-7
+- Rebuild against KDE SC 4.3.85
+
 * Mon Jul 30 2009 Sven Lankes <sven at lank.es> 0.5.1-6
 - Rebuild to fix changelog dates that broke mass rebuild
 



From petersen at fedoraproject.org  Tue Dec 22 09:12:01 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 09:12:01 +0000 (UTC)
Subject: rpms/ghc-zlib/devel ghc-zlib.spec,1.16,1.17
Message-ID: <20091222091201.9F94911C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30663

Modified Files:
	ghc-zlib.spec 
Log Message:
minor fixes:
- fix base Group and devel Summary
- only include docdir in devel if not shared build




Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/ghc-zlib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ghc-zlib.spec	16 Dec 2009 10:00:18 -0000	1.16
+++ ghc-zlib.spec	22 Dec 2009 09:12:01 -0000	1.17
@@ -13,7 +13,7 @@ Version:        0.5.0.0
 Release:        11%{?dist}
 Summary:        Haskell compression and decompression library binding
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
@@ -39,7 +39,7 @@ the few cases where more control is need
 full zlib feature set.
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
@@ -134,7 +134,9 @@ fi
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -150,6 +152,10 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com>
+- fix base Group and devel Summary
+- only include docdir in devel if not shared build
+
 * Wed Dec 16 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-11
 - build for ghc-6.12.1
 - added shared library support: needs ghc-rpm-macros 0.3.1



From petersen at fedoraproject.org  Tue Dec 22 09:13:29 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 09:13:29 +0000 (UTC)
Subject: rpms/cpphs/devel cpphs.spec,1.7,1.8
Message-ID: <20091222091329.6FD6511C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30975

Modified Files:
	cpphs.spec 
Log Message:
- update spec for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1




Index: cpphs.spec
===================================================================
RCS file: /cvs/extras/rpms/cpphs/devel/cpphs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cpphs.spec	18 Sep 2009 00:49:18 -0000	1.7
+++ cpphs.spec	22 Dec 2009 09:13:29 -0000	1.8
@@ -1,21 +1,21 @@
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           cpphs
 Version:        1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C pre-processor for Haskell
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -33,14 +33,26 @@ compatible with traditional (K&R) pre-pr
 include: a plain-text mode; an option to unlit literate code files; and
 an option to turn off macro-expansion.
 
+%if %{with shared}
+%package -n ghc-%{name}
+Summary:        Haskell library for %{name}
+Group:          System Environment/Libraries
+License:        LGPLv2+
+
+%description -n ghc-%{name}
+Haskell %{name} library for ghc.
+%endif
 
 %package -n ghc-%{name}-devel
-Summary:        Haskell library for %{name}
+Summary:        Haskell %{name} library development files
 Group:          Development/Libraries
 License:        LGPLv2+
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description -n ghc-%{name}-devel
 Haskell %{name} library for ghc.
@@ -78,19 +90,18 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p} %{?with_shared:--ghc-option=-dynamic}
 %cabal build
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists ghc-%{name}
+%cabal_pkg_conf
+
+%ghc_gen_filelists %{name}
 
 
 %clean
@@ -98,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -n ghc-%{name}-devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -108,9 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %preun -n ghc-%{name}-devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -127,9 +136,18 @@ fi
 %{_bindir}/%{name}
 
 
+%if %{with shared}
+%files -n ghc-%{name} -f ghc-%{name}.files
+%defattr(-,root,root,-)
+%doc LICENCE-LGPL
+%endif
+
+
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %doc LICENCE-LGPL
+%endif
 
 
 %if %{with doc}
@@ -145,6 +163,10 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 1.9-2
+- update spec for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Fri Sep 18 2009 Jens Petersen <petersen at redhat.com> - 1.9-1
 - update to 1.9
 



From mmaslano at fedoraproject.org  Tue Dec 22 09:13:49 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 09:13:49 +0000 (UTC)
Subject: rpms/perl/devel perl-5.10.1-CVE_2009_3626.patch, NONE, 1.1 perl.spec, 
	1.248, 1.249
Message-ID: <20091222091349.BE61C11C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31110

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.1-CVE_2009_3626.patch 
Log Message:
* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.1-108
- 547656 CVE-2009-3626 perl: regexp matcher crash on invalid UTF-8 characters  
- 549306 version::Internals should be packaged in perl-version subpackage


perl-5.10.1-CVE_2009_3626.patch:
 ext/re/t/regop.t |   14 +++++++-------
 regcomp.c        |   15 +++++++++------
 regexec.c        |    8 ++------
 3 files changed, 18 insertions(+), 19 deletions(-)

--- NEW FILE perl-5.10.1-CVE_2009_3626.patch ---
diff -up perl-5.10.1/ext/re/t/regop.t.git perl-5.10.1/ext/re/t/regop.t
--- perl-5.10.1/ext/re/t/regop.t.git	2009-12-21 19:31:07.564141841 +0100
+++ perl-5.10.1/ext/re/t/regop.t	2009-12-21 19:31:55.158142088 +0100
@@ -233,12 +233,12 @@ anchored "ABC" at 0
 #Freeing REx: "(\\.COM|\\.EXE|\\.BAT|\\.CMD|\\.VBS|\\.VBE|\\.JS|\\.JSE|\\."......
 %MATCHED%
 floating ""$ at 3..4 (checking floating)
-1:1[1] 3:2[1] 5:2[64] 45:83[1] 47:84[1] 48:85[0]
-stclass EXACTF <.> minlen 3
-Found floating substr ""$ at offset 30...
-Does not contradict STCLASS...
-Guessed: match at offset 26
-Matching stclass EXACTF <.> against ".exe"
+#1:1[1] 3:2[1] 5:2[64] 45:83[1] 47:84[1] 48:85[0]
+#stclass EXACTF <.> minlen 3
+#Found floating substr ""$ at offset 30...
+#Does not contradict STCLASS...
+#Guessed: match at offset 26
+#Matching stclass EXACTF <.> against ".exe"
 ---
 #Compiling REx "[q]"
 #size 12 nodes Got 100 bytes for offset annotations.
@@ -258,4 +258,4 @@ Got 100 bytes for offset annotations.
 Offsets: [12]
 1:1[3] 3:4[0]
 %MATCHED%        
-Freeing REx: "[q]"
\ No newline at end of file
+Freeing REx: "[q]"
diff -up perl-5.10.1/regcomp.c.git perl-5.10.1/regcomp.c
--- perl-5.10.1/regcomp.c.git	2009-12-21 19:32:05.893141719 +0100
+++ perl-5.10.1/regcomp.c	2009-12-21 19:33:35.106141384 +0100
@@ -2820,13 +2820,16 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_
                                 }
                             } else {
 /* 
-    Currently we assume that the trie can handle unicode and ascii
-    matches fold cased matches. If this proves true then the following
-    define will prevent tries in this situation. 
-    
-    #define TRIE_TYPE_IS_SAFE (UTF || optype==EXACT)
-*/
+    Currently we do not believe that the trie logic can
+    handle case insensitive matching properly when the
+    pattern is not unicode (thus forcing unicode semantics).
+    If/when this is fixed the following define can be swapped
+    in below to fully enable trie logic.
 #define TRIE_TYPE_IS_SAFE 1
+
+*/
+#define TRIE_TYPE_IS_SAFE (UTF || optype==EXACT)
+
                                 if ( last && TRIE_TYPE_IS_SAFE ) {
                                     make_trie( pRExC_state, 
                                             startbranch, first, cur, tail, count, 
diff -up perl-5.10.1/regexec.c.git perl-5.10.1/regexec.c
--- perl-5.10.1/regexec.c.git	2009-12-21 19:33:50.570141632 +0100
+++ perl-5.10.1/regexec.c	2009-12-21 19:36:41.300142175 +0100
@@ -1006,16 +1006,15 @@ Perl_re_intuit_start(pTHX_ REGEXP * cons
 
 #define REXEC_TRIE_READ_CHAR(trie_type, trie, widecharmap, uc, uscan, len,  \
 uvc, charid, foldlen, foldbuf, uniflags) STMT_START {                       \
-    UV uvc_unfolded = 0;						    \
     switch (trie_type) {                                                    \
     case trie_utf8_fold:                                                    \
 	if ( foldlen>0 ) {                                                  \
-	    uvc_unfolded = uvc = utf8n_to_uvuni( uscan, UTF8_MAXLEN, &len, uniflags ); \
+	    uvc = utf8n_to_uvuni( uscan, UTF8_MAXLEN, &len, uniflags ); \
 	    foldlen -= len;                                                 \
 	    uscan += len;                                                   \
 	    len=0;                                                          \
 	} else {                                                            \
-	    uvc_unfolded = uvc = utf8n_to_uvuni( (U8*)uc, UTF8_MAXLEN, &len, uniflags ); \
+	    uvc = utf8n_to_uvuni( (U8*)uc, UTF8_MAXLEN, &len, uniflags ); \
 	    uvc = to_uni_fold( uvc, foldbuf, &foldlen );                    \
 	    foldlen -= UNISKIP( uvc );                                      \
 	    uscan = foldbuf + UNISKIP( uvc );                               \
@@ -1054,9 +1053,6 @@ uvc, charid, foldlen, foldbuf, uniflags)
 		charid = (U16)SvIV(*svpp);                                  \
 	}                                                                   \
     }                                                                       \
-    if (!charid && trie_type == trie_utf8_fold && !UTF) {		    \
-	charid = trie->charmap[uvc_unfolded];			    	    \
-    }								    	    \
 } STMT_END
 
 #define REXEC_FBC_EXACTISH_CHECK(CoNd)                 \


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- perl.spec	22 Dec 2009 04:30:37 -0000	1.248
+++ perl.spec	22 Dec 2009 09:13:49 -0000	1.249
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        107%{?dist}
+Release:        108%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -65,6 +65,9 @@ Patch61:	perl-much-better-swap-logic.pat
 # temporarily export debug symbols even though DEBUGGING is not set:
 Patch62:	perl-add-symbols.patch
 
+# CVE_2009_3626 rhbz#547656 
+Patch63:	perl-5.10.1-CVE_2009_3626.patch
+
 # version macros for some of the modules:
 %define			    Archive_Extract_version 0.34
 %define			    Archive_Tar_version 1.52
@@ -918,6 +921,7 @@ upstream tarball from perl.org.
 %patch58 -p1
 %patch61 -p1
 %patch62 -p1
+%patch63 -p1
 
 #patch100 -p1
 #patch101 -p1
@@ -1854,6 +1858,10 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.1-108
+- 547656 CVE-2009-3626 perl: regexp matcher crash on invalid UTF-8 characters  
+- 549306 version::Internals should be packaged in perl-version subpackage
+
 * Mon Dec 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.1-107
 - subpackage parent and Parse-CPAN-Meta; add them to core's dep list
 



From kkofler at fedoraproject.org  Tue Dec 22 09:21:30 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 22 Dec 2009 09:21:30 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.258,1.259
Message-ID: <20091222092130.463C711C00E9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32301/devel

Modified Files:
	kdepim.spec 
Log Message:
* Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-3.1
- Requires: kpilot for upgrade path (F12-)


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- kdepim.spec	21 Dec 2009 16:44:10 -0000	1.258
+++ kdepim.spec	22 Dec 2009 09:21:29 -0000	1.259
@@ -3,7 +3,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.85
-Release: 3%{?dist}
+Release: 3%{?dist}.1
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -34,6 +34,11 @@ Requires: %{name}-libs%{?_isa} = %{?epoc
 # beware bootstrapping (ie, build kdepim-runtime first)
 Requires: kdepim-runtime%{?_isa} >= %{version}
 
+%if 0%{?fedora} < 13
+# upgrade path
+Requires: kpilot
+%endif
+
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -214,6 +219,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-3.1
+- Requires: kpilot for upgrade path (F12-)
+
 * Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
 - unconditionally Requires: kdepim-runtime  (#549413)
 



From stefansf at fedoraproject.org  Tue Dec 22 09:25:59 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Tue, 22 Dec 2009 09:25:59 +0000 (UTC)
Subject: rpms/sec/F-11 sec.spec,1.8,1.9
Message-ID: <20091222092559.F2D4011C00E9@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/sec/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv388/F-11

Modified Files:
	sec.spec 
Log Message:
New upstream release



Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/sec.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sec.spec	7 Nov 2009 09:35:19 -0000	1.8
+++ sec.spec	22 Dec 2009 09:25:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           sec
-Version:        2.5.2
-Release:        1%{?dist}
+Version:        2.5.3
+Release:        0%{?dist}
 Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/sec.1*
 
 %changelog
+* Mon Dec 21 2009 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 2.5.3-0
+- New upstream release
+
 * Tue Sep 29 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-1
 - New upstream release
 - SPEC file cleanup



From stefansf at fedoraproject.org  Tue Dec 22 09:26:00 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Tue, 22 Dec 2009 09:26:00 +0000 (UTC)
Subject: rpms/sec/F-12 sec.spec,1.9,1.10
Message-ID: <20091222092600.268DD11C00E9@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/sec/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv388/F-12

Modified Files:
	sec.spec 
Log Message:
New upstream release



Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/sec.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sec.spec	7 Nov 2009 09:35:19 -0000	1.9
+++ sec.spec	22 Dec 2009 09:25:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           sec
-Version:        2.5.2
-Release:        1%{?dist}
+Version:        2.5.3
+Release:        0%{?dist}
 Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/sec.1*
 
 %changelog
+* Mon Dec 21 2009 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 2.5.3-0
+- New upstream release
+
 * Tue Sep 29 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-1
 - New upstream release
 - SPEC file cleanup



From petersen at fedoraproject.org  Tue Dec 22 09:35:44 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 09:35:44 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.118,1.119
Message-ID: <20091222093544.1BFA611C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2063

Modified Files:
	ghc.spec 
Log Message:
add p_dyn (dynamic profiling libs) for binlib packages


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- ghc.spec	16 Dec 2009 08:11:43 -0000	1.118
+++ ghc.spec	22 Dec 2009 09:35:43 -0000	1.119
@@ -24,7 +24,7 @@
 Name: ghc
 # break of haskell-platform-2009.2.0.2
 Version: 6.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -152,9 +152,7 @@ rm -r ghc-tarballs/{mingw,perl}
 
 %build
 cat > mk/build.mk << EOF
-%if %{without prof}
-GhcLibWays = v %{?with_shared:dyn}
-%endif
+GhcLibWays = v %{?with_prof:p} %{?with_shared:dyn %{?with_prof:p_dyn}} 
 %if %{without doc}
 HADDOCK_DOCS       = NO
 %endif
@@ -347,6 +345,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-2
+- add p_dyn (dynamic profiling libs) for binlib packages
+
 * Wed Dec 16 2009 Jens Petersen <petersen at redhat.com> - 6.12.1-1
 - pre promoted to 6.12.1 final
 - exclude ghc .conf file from package.conf.d in base package



From petersen at fedoraproject.org  Tue Dec 22 09:40:47 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 09:40:47 +0000 (UTC)
Subject: rpms/ghc-editline/devel ghc-editline.spec,1.11,1.12
Message-ID: <20091222094047.6C64611C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-editline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2723

Modified Files:
	ghc-editline.spec 
Log Message:
- build for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1




Index: ghc-editline.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-editline/devel/ghc-editline.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ghc-editline.spec	24 Sep 2009 04:05:36 -0000	1.11
+++ ghc-editline.spec	22 Dec 2009 09:40:47 -0000	1.12
@@ -2,6 +2,7 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -12,14 +13,14 @@ Version:        0.2.1.0
 Release:        11%{?dist}
 Summary:        Haskell %{pkg_name} library
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.haskell.org/editline
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 BuildRequires:  libedit-devel
 %if %{with doc}
 BuildRequires:  ghc-doc
@@ -37,11 +38,14 @@ Additionally, a readline compatibility m
 provides a subset of the functionality of the readline library.
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 Requires:       libedit-devel
 
 %description devel
@@ -85,13 +89,13 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -100,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -109,10 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -123,9 +125,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -140,6 +151,10 @@ fi
 %endif
 
 %Changelog
+* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-11
+- build for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-11
 - sync with current cabal2spec template to minimise cabal2spec-diff
   - fixes uninstall error



From stefansf at fedoraproject.org  Tue Dec 22 09:42:57 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Tue, 22 Dec 2009 09:42:57 +0000 (UTC)
Subject: rpms/sec/F-11 .cvsignore,1.5,1.6 import.log,1.1,1.2 sources,1.5,1.6
Message-ID: <20091222094257.B903E11C00E9@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/sec/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3253/F-11

Modified Files:
	.cvsignore import.log sources 
Log Message:
Adding source file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Oct 2009 07:10:44 -0000	1.5
+++ .cvsignore	22 Dec 2009 09:42:57 -0000	1.6
@@ -1 +1 @@
-sec-2.5.2.tar.gz
+sec-2.5.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 Oct 2009 07:10:46 -0000	1.1
+++ import.log	22 Dec 2009 09:42:57 -0000	1.2
@@ -1 +1,2 @@
 sec-2_5_2-1_fc11:F-11:sec-2.5.2-1.fc11.src.rpm:1254640115
+sec-2_5_3-0_fc12:F-11:sec-2.5.3-0.fc12.src.rpm:1261474909


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Oct 2009 07:10:46 -0000	1.5
+++ sources	22 Dec 2009 09:42:57 -0000	1.6
@@ -1 +1 @@
-0e5e3c2e4e3ef6c21fc32a809c6263bb  sec-2.5.2.tar.gz
+11bb84273daf24d265a96624ab6413ca  sec-2.5.3.tar.gz



From akurtakov at fedoraproject.org  Tue Dec 22 09:45:49 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 09:45:49 +0000 (UTC)
Subject: rpms/maven-shared/devel maven-shared-modelv3.patch, NONE,
	1.1 maven-shared.spec, 1.13, 1.14
Message-ID: <20091222094549.04F8711C00E9@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-shared/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3750/devel

Modified Files:
	maven-shared.spec 
Added Files:
	maven-shared-modelv3.patch 
Log Message:
Fix build.

maven-shared-modelv3.patch:
 pom.xml |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE maven-shared-modelv3.patch ---
diff -up maven-shared-components-8/maven-model-converter/pom.xml.modelv3 maven-shared-components-8/maven-model-converter/pom.xml
--- maven-model-converter/pom.xml.modelv3	2009-11-26 17:53:56.000000000 +0100
+++ maven-model-converter/pom.xml	2009-11-26 17:54:17.000000000 +0100
@@ -31,11 +31,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model-v3</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>2.0.4</version>
     </dependency>


Index: maven-shared.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- maven-shared.spec	1 Sep 2009 14:52:05 -0000	1.13
+++ maven-shared.spec	22 Dec 2009 09:45:48 -0000	1.14
@@ -65,7 +65,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        8
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -81,6 +81,7 @@ Patch2:        %{name}-file-management-p
 Patch3:        %{name}-io-ArtifactLocatorStrategyTest.patch
 Patch4:        %{name}-plugin-tools-pom.patch
 Patch5:        %{name}-disable-cobertura.patch
+Patch6:        %{name}-modelv3.patch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven2 >= 0:2.0.4-9
@@ -92,6 +93,9 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-source
 BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven2-plugin-surefire-report
+BuildRequires:  maven-doxia-sitetools
+BuildRequires:  plexus-maven-plugin
 BuildRequires:  junit
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
@@ -538,6 +542,7 @@ chmod -R go=u-w *
 %patch3 -b .sav3
 %patch4 -b .sav4
 %patch5 -b .sav5
+%patch6 -b .sav6
 
 # Remove test that needs junit-addons until that makes it into Fedora
 rm -f maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
@@ -1102,6 +1107,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Nov 26 2009 Lubomir Rintel <lkundrak at v3.sk> 8-4
+- Fix build
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 8-3
 - Add tomcat5, easymock, and maven2-plugin-source BRs
 



From stefansf at fedoraproject.org  Tue Dec 22 09:49:39 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Tue, 22 Dec 2009 09:49:39 +0000 (UTC)
Subject: rpms/sec/F-12 .cvsignore,1.5,1.6 import.log,1.1,1.2 sources,1.5,1.6
Message-ID: <20091222094939.7D53011C00E9@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/sec/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4328/F-12

Modified Files:
	.cvsignore import.log sources 
Log Message:
Adding source file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Oct 2009 07:52:14 -0000	1.5
+++ .cvsignore	22 Dec 2009 09:49:38 -0000	1.6
@@ -1 +1 @@
-sec-2.5.2.tar.gz
+sec-2.5.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Oct 2009 07:52:15 -0000	1.1
+++ import.log	22 Dec 2009 09:49:38 -0000	1.2
@@ -1 +1,2 @@
 sec-2_5_2-1_fc11:F-12:sec-2.5.2-1.fc11.src.rpm:1254556293
+sec-2_5_3-0_fc12:F-12:sec-2.5.3-0.fc12.src.rpm:1261475339


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Oct 2009 07:52:15 -0000	1.5
+++ sources	22 Dec 2009 09:49:39 -0000	1.6
@@ -1 +1 @@
-0e5e3c2e4e3ef6c21fc32a809c6263bb  sec-2.5.2.tar.gz
+11bb84273daf24d265a96624ab6413ca  sec-2.5.3.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:18 +0000
Subject: [pkgdb] transifex: rakesh has given up watchbugzilla
Message-ID: <20091222095018.3403F10F8B4@bastion.fedoraproject.org>

rakesh has given up the watchbugzilla acl on transifex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:19 +0000
Subject: [pkgdb] transifex: rakesh has given up watchcommits
Message-ID: <20091222095019.5C12C10F8C6@bastion.fedoraproject.org>

rakesh has given up the watchcommits acl on transifex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:19 +0000
Subject: [pkgdb] transifex: rakesh has requested commit
Message-ID: <20091222095020.06F6E10F8C1@bastion.fedoraproject.org>

rakesh has requested the commit acl on transifex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:20 +0000
Subject: [pkgdb] transifex: rakesh has requested approveacls
Message-ID: <20091222095021.0A8F010F8C1@bastion.fedoraproject.org>

rakesh has requested the approveacls acl on transifex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:30 +0000
Subject: [pkgdb] transifex: rakesh has given up watchbugzilla
Message-ID: <20091222095030.9E41A10F8BC@bastion.fedoraproject.org>

rakesh has given up the watchbugzilla acl on transifex (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:31 +0000
Subject: [pkgdb] transifex: rakesh has given up watchcommits
Message-ID: <20091222095031.506D510F8C5@bastion.fedoraproject.org>

rakesh has given up the watchcommits acl on transifex (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:32 +0000
Subject: [pkgdb] transifex: rakesh has requested commit
Message-ID: <20091222095032.583F310F8C2@bastion.fedoraproject.org>

rakesh has requested the commit acl on transifex (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:50 +0000
Subject: [pkgdb] transifex: rakesh has requested approveacls
Message-ID: <20091222095037.28B7910F7EA@bastion.fedoraproject.org>

rakesh has requested the approveacls acl on transifex (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:48 +0000
Subject: [pkgdb] transifex: rakesh has given up watchbugzilla
Message-ID: <20091222095048.3600910F8BC@bastion.fedoraproject.org>

rakesh has given up the watchbugzilla acl on transifex (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:51 +0000
Subject: [pkgdb] transifex: rakesh has requested commit
Message-ID: <20091222095052.02F8710F8B4@bastion.fedoraproject.org>

rakesh has requested the commit acl on transifex (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:52 +0000
Subject: [pkgdb] transifex: rakesh has given up watchcommits
Message-ID: <20091222095052.B088010F8C2@bastion.fedoraproject.org>

rakesh has given up the watchcommits acl on transifex (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 09:50:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 09:50:54 +0000
Subject: [pkgdb] transifex: rakesh has requested approveacls
Message-ID: <20091222095054.6CDD910F8BC@bastion.fedoraproject.org>

rakesh has requested the approveacls acl on transifex (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From mmaslano at fedoraproject.org  Tue Dec 22 09:56:16 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 09:56:16 +0000 (UTC)
Subject: rpms/perl-Class-XSAccessor/devel perl-Class-XSAccessor.spec,1.7,1.8
Message-ID: <20091222095616.90FA611C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Class-XSAccessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5187

Modified Files:
	perl-Class-XSAccessor.spec 
Log Message:
* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.05-3
- package only those man, which are really owned by this package



Index: perl-Class-XSAccessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-XSAccessor/devel/perl-Class-XSAccessor.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Class-XSAccessor.spec	4 Dec 2009 02:41:29 -0000	1.7
+++ perl-Class-XSAccessor.spec	22 Dec 2009 09:56:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Class-XSAccessor
 Version:        1.05
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate fast XS accessors without runtime compilation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,9 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changes README
 %{perl_vendorarch}/auto/*
 %{perl_vendorarch}/Class*
-%{_mandir}/man3/*
+%{_mandir}/man3/Class::XSAccessor.3pm.gz
+%{_mandir}/man3/Class::XSAccessor::Heavy.3pm.gz
 
 %changelog
+* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.05-3
+- package only those man, which are really owned by this package
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.05-2
 - rebuild against perl 5.10.1
 



From akurtakov at fedoraproject.org  Tue Dec 22 10:07:26 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 10:07:26 +0000 (UTC)
Subject: File maven2-common-poms-src.tar.gz uploaded to lookaside cache by
	akurtakov
Message-ID: <20091222100726.53C4C10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for maven2-common-poms:

7b497d809ed28152ba8fccf4be889c38  maven2-common-poms-src.tar.gz



From akurtakov at fedoraproject.org  Tue Dec 22 10:10:44 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 10:10:44 +0000 (UTC)
Subject: rpms/maven2-common-poms/devel maven2-common-poms.spec, 1.11,
	1.12 sources, 1.7, 1.8 maven2-common-poms-jpp-depmap.xml, 1.7, 1.8
Message-ID: <20091222101044.559F911C00E9@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7432/devel

Modified Files:
	maven2-common-poms.spec sources 
	maven2-common-poms-jpp-depmap.xml 
Log Message:
Drop common-codec and commons-digester. Packaged with the jars now.


Index: maven2-common-poms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- maven2-common-poms.spec	16 Sep 2009 07:04:21 -0000	1.11
+++ maven2-common-poms.spec	22 Dec 2009 10:10:44 -0000	1.12
@@ -33,7 +33,7 @@
 
 Name:              %{parent}-%{subname}
 Version:           1.0
-Release:           11%{?dist}
+Release:           12%{?dist}
 Epoch:             0
 Summary:           Common poms for maven2
 License:           ASL 2.0 and BSD
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/maven2
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-12
+- Drop common-codec and commons-digester. Packaged with the jars now.
+
 * Wed Sep 16 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-11
 - Add apache-commons parent pom.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Sep 2009 07:04:22 -0000	1.7
+++ sources	22 Dec 2009 10:10:44 -0000	1.8
@@ -1,2 +1,2 @@
 e1a697356772cf0dc7badade59aa922b  maven2-common-poms-docs.tar.gz
-bb947f092599fc8830820856435b0d27  maven2-common-poms-src.tar.gz
+7b497d809ed28152ba8fccf4be889c38  maven2-common-poms-src.tar.gz


Index: maven2-common-poms-jpp-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms-jpp-depmap.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- maven2-common-poms-jpp-depmap.xml	16 Sep 2009 07:04:22 -0000	1.7
+++ maven2-common-poms-jpp-depmap.xml	22 Dec 2009 10:10:44 -0000	1.8
@@ -169,18 +169,6 @@
 	</dependency>
 	<dependency>
 		<maven>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.3</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.3</version>
-		</jpp>
-	</dependency>
-	<dependency>
-		<maven>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging-api</artifactId>
 			<version>1.0.4</version>
@@ -2705,18 +2693,6 @@
     </dependency>
     <dependency>
         <maven>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>1.6</version>
-        </maven>
-        <jpp>
-            <groupId>JPP</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>1.6</version>
-        </jpp>
-    </dependency>
-    <dependency>
-        <maven>
             <groupId>isorelax</groupId>
             <artifactId>isorelax</artifactId>
             <version>20020414</version>



From petersen at fedoraproject.org  Tue Dec 22 10:15:08 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 10:15:08 +0000 (UTC)
Subject: rpms/alex/devel alex.spec,1.18,1.19
Message-ID: <20091222101508.93B0511C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/alex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8914

Modified Files:
	alex.spec 
Log Message:
add bcond for dynamic linking


Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/alex.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- alex.spec	21 Dec 2009 13:06:35 -0000	1.18
+++ alex.spec	22 Dec 2009 10:15:08 -0000	1.19
@@ -1,3 +1,6 @@
+# link with shared libs
+%bcond_without dynamic
+
 # ghc does not emit debug information
 %global debug_package %{nil}
 
@@ -28,7 +31,7 @@ expressions.  It is similar to the tool 
 
 
 %build
-%cabal_configure --ghc-option=-dynamic
+%cabal_configure %{?with_dynamic:--ghc-option=-dynamic}
 %cabal build
 
 cd doc
@@ -55,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com>
+- add bcond for dynamic linking
+
 * Mon Dec 21 2009 Jens Petersen <petersen at redhat.com> - 2.3.1-7
 - build dynamically with ghc-6.12.1
 



From akurtakov at fedoraproject.org  Tue Dec 22 10:19:57 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 10:19:57 +0000 (UTC)
Subject: rpms/tomcat6/devel tomcat6.spec,1.10,1.11
Message-ID: <20091222101957.8EB7811C00E9@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/tomcat6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9515/devel

Modified Files:
	tomcat6.spec 
Log Message:
Drop file requires on /usr/share/java/ecj.jar.


Index: tomcat6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tomcat6.spec	9 Nov 2009 20:31:26 -0000	1.10
+++ tomcat6.spec	22 Dec 2009 10:19:57 -0000	1.11
@@ -54,7 +54,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -146,7 +146,6 @@ Summary: Libraries needed to run the Tom
 Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires(post): ecj
-Requires(post): %{_javadir}/ecj.jar
 Requires(post): jakarta-commons-collections-tomcat5
 Requires(post): jakarta-commons-dbcp-tomcat5
 Requires(post): jakarta-commons-pool-tomcat5
@@ -447,6 +446,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:6.0.20-2
+- Drop file requires on /usr/share/java/ecj.jar.
+
 * Mon Nov 9 2009 Alexander Kurtakov <akurtako at redhat.com> 0:6.0.20-1
 - Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580. 
 



From jnovy at fedoraproject.org  Tue Dec 22 10:41:01 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 22 Dec 2009 10:41:01 +0000 (UTC)
Subject: rpms/mc/F-12 .cvsignore, 1.41, 1.42 mc-extensions.patch, 1.17,
	1.18 mc.spec, 1.149, 1.150 sources, 1.49, 1.50 mc-exit.patch,
	1.2, NONE mc-rpmvfs.patch, 1.1, NONE
Message-ID: <20091222104101.C7FF811C00E9@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12976

Modified Files:
	.cvsignore mc-extensions.patch mc.spec sources 
Removed Files:
	mc-exit.patch mc-rpmvfs.patch 
Log Message:
* Tue Dec 22 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.6.pre4.20091221git
- provide yum-repo.syntax (#549014)
- avoid occasional crash while reading panels (#548987)
- avoid crash while getting user ID (#548311)
- enable mcvfs, disable rpath



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	10 Dec 2009 19:53:30 -0000	1.41
+++ .cvsignore	22 Dec 2009 10:41:00 -0000	1.42
@@ -1 +1 @@
-mc-4.7.0-pre4.tar.bz2
+mc-4.7.0-pre4-20091221git.tar.bz2

mc-extensions.patch:
 configure.ac   |    2 +-
 misc/mc.ext.in |   51 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 18 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/mc-extensions.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mc-extensions.patch	10 Dec 2009 19:53:30 -0000	1.17
+++ mc-extensions.patch	22 Dec 2009 10:41:00 -0000	1.18
@@ -87,16 +87,6 @@ diff -up mc-4.7.0-pre4/misc/mc.ext.in.ex
  
  
  ### Video ###
-@@ -440,6 +452,9 @@ regex/\.([aA][sS][fFxX])$
- regex/\.([dD][iI][vV][xX])$
- 	Include=video
- 
-+regex/\.([mM][kK][vV])$
-+	Include=video
-+
- regex/\.([mM][oO][vV]|[qQ][tT])$
- 	Include=video
- 
 @@ -471,12 +486,12 @@ include/video
  
  # Postscript


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/mc.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- mc.spec	10 Dec 2009 19:53:30 -0000	1.149
+++ mc.spec	22 Dec 2009 10:41:01 -0000	1.150
@@ -1,19 +1,19 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.5.pre4%{?dist}
+Release:	0.6.pre4.20091221git%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
 # tarball created from git clone git://midnight-commander.org/git/mc.git
-Source0:	mc-%{version}-pre4.tar.bz2
+Source0:	mc-%{version}-pre4-20091221git.tar.bz2
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	gettext cvs automake autoconf libtool
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel
 Requires:	dev >= 3.3-3
 
 Patch1:		mc-extensions.patch
-Patch2:		mc-rpmvfs.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -23,17 +23,19 @@ ability to FTP, view tar and zip files, 
 specific files.
 
 %prep
-%setup -q -n mc-%{version}-pre4
+%setup -q
 %patch1 -p1 -b .extensions
-%patch2 -p1 -b .rpmvfs
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
-%configure --with-screen=slang \
-	     --enable-charset \
-	     --with-samba \
-	     --without-x \
-	     --with-gpm-mouse
+./autogen.sh
+%configure	--with-screen=slang \
+		--enable-charset \
+		--with-samba \
+		--without-x \
+		--with-gpm-mouse \
+		--disable-rpath \
+		--with-mcfs
 make %{?_smp_mflags}
 
 %install 
@@ -82,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Tue Dec 22 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.6.pre4.20091221git
+- provide yum-repo.syntax (#549014)
+- avoid occasional crash while reading panels (#548987)
+- avoid crash while getting user ID (#548311)
+- enable mcvfs, disable rpath
+
 * Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.5.pre4
 - update to pre4:
   - fixes color parsing (#545805)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	10 Dec 2009 19:53:30 -0000	1.49
+++ sources	22 Dec 2009 10:41:01 -0000	1.50
@@ -1 +1 @@
-7bdc0ac4fe57c19a6bf2fd3e8894a073  mc-4.7.0-pre4.tar.bz2
+c03992e430a41d3e73faa6360979cadf  mc-4.7.0-pre4-20091221git.tar.bz2


--- mc-exit.patch DELETED ---


--- mc-rpmvfs.patch DELETED ---



From sharkcz at fedoraproject.org  Tue Dec 22 10:56:33 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 22 Dec 2009 10:56:33 +0000 (UTC)
Subject: rpms/s390utils/F-12
	0017-qualified-return-codes-and-further-error-handling-in.patch,
	NONE, 1.1 device_cio_free, NONE, 1.1 cpi.initd, 1.2,
	1.3 s390utils.spec, 1.16, 1.17
Message-ID: <20091222105633.9817111C00E9@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14823

Modified Files:
	cpi.initd s390utils.spec 
Added Files:
	0017-qualified-return-codes-and-further-error-handling-in.patch 
	device_cio_free 
Log Message:
* Tue Dec 22 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
- fixed return value in cpi initscript (#541389)
- updated zfcpconf.sh script from dracut
- added device-mapper support into zipl (#546280)
- added missing check and print NSS name in case an NSS has been IPLed (#546297)
- added device_cio_free script and its symlinks
- added qualified return codes and further error handling in znetconf (#548487)


0017-qualified-return-codes-and-further-error-handling-in.patch:
 znetconf   |  324 +++++++++++++++++++++++++++++++++++--------------------------
 znetconf.8 |  220 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 375 insertions(+), 169 deletions(-)

--- NEW FILE 0017-qualified-return-codes-and-further-error-handling-in.patch ---
>From 4725dd1a67185ab4296674fcd3b2cf17f2b1cf21 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 17 Dec 2009 17:08:22 +0100
Subject: [PATCH] qualified return codes and further error handling in znetconf

Description: znetconf: qualified return codes and further error handling
Symptom:     always returned 1 in case errors
Problem:     wrapper tools not able to generate qualified error msgs
Solution:    return codes
---
 zconf/znetconf   |  324 ++++++++++++++++++++++++++++++++----------------------
 zconf/znetconf.8 |  219 +++++++++++++++++++++++++++++++------
 2 files changed, 375 insertions(+), 168 deletions(-)

diff --git a/zconf/znetconf b/zconf/znetconf
index 4edf6fb..873124a 100755
--- a/zconf/znetconf
+++ b/zconf/znetconf
@@ -2,14 +2,58 @@
 #
 # znetconf - list and configure network devices
 #
-# Tool for the automatic and semi-automatic configuration of network devices 
+# Tool for the automatic and semi-automatic configuration of network devices
 # from ccw devices, including network device option handling and network
 # device removal.
 #
-# Copyright IBM Corp. 2009 
+# Copyright IBM Corp. 2009
 # Author(s): Einar Lueck <elelueck at de.ibm.com>
 #            Steffen Maier <maier at de.ibm.com>
 #
+# 9 Could not group devices
+readonly RC_COULD_NOT_GROUP_DEVICES=9
+# 10 Could not set device online
+readonly RC_COULD_NOT_SET_DEV_ONLINE=10
+# 11 Could not set device offline
+readonly RC_COULD_NOT_SET_DEV_OFFLINE=11
+# 12 Invalid attribute value pair
+readonly RC_INVALID_ATTRIBUTE_VALUE_PAIR=12
+# 13 Missing component (broken installation)
+readonly RC_BROKEN_INSTALLATION=13
+# 14 Missing device ID
+readonly RC_MISSING_DEVICE_ID=14
+# 15 Invalid device ID format
+readonly RC_INVALID_DEVICE_ID_FORMAT=15
+# 16 Driver name expected
+readonly RC_DRIVER_NAME_EXPECTED=16
+# 17 Unknown driver
+readonly RC_UNKNOWN_DRIVER=17
+# 18 Missing attribute value pair for -o|--option
+readonly RC_MISSING_ATTRIBUTE_VALUE_PAIR=18
+# 19 Invalid argument
+readonly RC_INVALID_ARGUMENT=19
+# 20 Too much arguments
+readonly RC_TOO_MUCH_ARGUMENTS=20
+# 21 No configuration found for device ID
+readonly RC_NO_CONFIG_FOUND_FOR_DEV=21
+# 22 Device is not configured
+readonly RC_DEVICE_NOT_CONFIGURED=22
+# 23 Could not ungroup device
+readonly RC_COULD_NOT_UNGROUP_DEVICE=23
+# 24 At least one option could not be configured
+readonly RC_OPTION_NOT_CONFIGURED=24
+# 25 Missing value for attribute
+readonly RC_MISSING_VALUE=25
+# 26 Device does not exist
+readonly RC_DEVICE_DOES_NOT_EXIST=26
+# 27 Device already in use
+readonly RC_DEVICE_ALREADY_IN_USE=27
+# 28 Net device did not come online
+readonly RC_NET_DEVICE_NOT_ONLINE=28
+# 29 Some devices could not be added or failed
+readonly RC_SOME_DEVICES_FAILED=29
+# 99 internal error, this should never happen
+readonly RC_INTERNAL_ERROR=99
 
 #==============================================================================
 # constants
@@ -29,6 +73,7 @@ else
 fi
 SYSFSDIR=$(cat /proc/mounts|awk '$3=="sysfs"{print $2; exit}')
 CCWGROUPBUS_DIR=$SYSFSDIR/bus/ccwgroup
+CCWDEV_DIR=$SYSFSDIR/bus/ccw/devices
 CCWGROUPBUS_DEVICEDIR=$CCWGROUPBUS_DIR/devices
 CCWGROUPBUS_DRIVERDIR=$CCWGROUPBUS_DIR/drivers
 DEVNOSEP=","
@@ -290,15 +335,14 @@ function lookup_layer()
 #==============================================================================
 
 #
-# group_device 
+# group_device
 # 	$1: ccwdevid[;ccwdevid][;ccwdevid]
 #	$2: ccwgroupdevid
 #	$3: driver
-# returns 
+# returns
 #	0 success
-#	1 group file not found
-#	2 grouping failed
-# 
+#	RC_COULD_NOT_GROUP_DEVICES
+#
 function group_device()
 {
 	local DEVICES=$1
@@ -307,13 +351,13 @@ function group_device()
 	local GROUPFILE=$CCWGROUPBUS_DRIVERDIR/$DRIVER/group
 	local CTCMGROUPFILE=$CCWGROUPBUS_DRIVERDIR/ctcm/group
 	local CTCGROUPFILE=$CCWGROUPBUS_DRIVERDIR/ctc/group
-	
+
 	# check if group file exists
-	if [ ! -e $GROUPFILE ] 
+	if [ ! -e $GROUPFILE ]
 	then
 		# try to load driver
 		if ! modprobe $DRIVER &> /dev/null
-		then 
+		then
 			if [ $DRIVER = "ctc" ]
 			then
 				# check if ctcm driver exists
@@ -329,7 +373,7 @@ function group_device()
 					GROUPFILE=$CTCGROUPFILE
 				fi
 			fi
-		fi 
+		fi
 	fi
 	if [ -e $GROUPFILE ]
 	then
@@ -340,13 +384,13 @@ function group_device()
 			*)
 				print_error "Could not group devices" \
 					"$DEVICES"
-				return 2
+				return $RC_COULD_NOT_GROUP_DEVICES
 				;;
 		esac
 	else
 		print_error "$GROUPFILE does not exist"
-			
-		return 1
+
+		return $RC_COULD_NOT_GROUP_DEVICES
 	fi
 	return 0
 }
@@ -354,14 +398,13 @@ function group_device()
 #==============================================================================
 
 #
-# ungroup_device 
+# ungroup_device
 #	$1: ccwgroupdevid
 #	$2: network device name (just for display purposes)
-# returns 
+# returns
 #	0 success
-#	1 group file not found
-#	2 ungrouping failed
-# 
+#	RC_COULD_NOT_UNGROUP_DEVICE
+#
 function ungroup_device()
 {
 	local TARGET_DEVID="$1"
@@ -378,12 +421,12 @@ function ungroup_device()
 				;;
 			*)
 				print_error "Failed to ungroup $TARGET_DEVID"
-				return 2
+				return $RC_COULD_NOT_UNGROUP_DEVICE
 				;;
 		esac
 	else
 		print_error "$DEVICE_UNGROUPFILE does not exist."
-		return 1
+		return $RC_COULD_NOT_UNGROUP_DEVICE
 	fi
 	return 0
 }
@@ -393,12 +436,12 @@ function ungroup_device()
 #
 # try_read_netdevname
 # 	$1: ccwgroupdevno
-# returns 
+# returns
 #	0 success
 #	1 failed. giving up after retries
 # stdout
 #	in case of success: device name
-# 
+#
 function try_read_netdevname()
 {
 	local CCWGROUPDEVNO="$1"
@@ -406,7 +449,7 @@ function try_read_netdevname()
 	local NET_SUBDIR="$CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/net/"
 	local IF_NAME=""
 	local rc=1
-		
+
 	# check if interface file containing the name exists
 	if [ -e "$IF_NAME_FILE" ]
 	then
@@ -417,7 +460,7 @@ function try_read_netdevname()
 		IF_NAME=$(ls $NET_SUBDIR)
 	else
 		# if the file does not exist
-		local LINKNAME=$(find $CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/ -type l -name net*) 
+		local LINKNAME=$(find $CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/ -type l -name net*)
 		if [[ ! -z $LINKNAME ]]
 		then
 			IF_NAME=$(readlink $LINKNAME)
@@ -434,10 +477,10 @@ function try_read_netdevname()
 #
 # wait_for_net_device
 # 	$1: ccwgroupdevno
-# returns 
+# returns
 #	0 success
 #	1 failed. giving up after retries
-# 
+#
 function wait_for_net_device()
 {
 	local CCWGROUPDEVNO="$1"
@@ -447,7 +490,7 @@ function wait_for_net_device()
 	local IF_NAME=""
 	local CMD_FINDNETLINK="find $CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/ -type l -name net*"
 	local LINKNAME=""
-		
+
 	# polling loop to wait for net device to become available
 	if [ -e $UDEVSETTLE ]
 	then
@@ -460,7 +503,7 @@ function wait_for_net_device()
 	fi
 	while [[ -z "$IF_NAME" ]] && [[ retries -lt MAX_RETRIES ]]
 	do
-		sleep 1 
+		sleep 1
 		retries=$retries+1
 		IF_NAME=$(try_read_netdevname $CCWGROUPDEVNO)
 	done
@@ -468,8 +511,8 @@ function wait_for_net_device()
 	then
 		echo "Successfully configured device $CCWGROUPDEVNO ($IF_NAME)"
 	else
-		print_error "Failed to make $CCWGROUPDEVNO online." 
-		return 1	
+		print_error "Failed to make $CCWGROUPDEVNO online."
+		return 1
 	fi
 }
 
@@ -479,11 +522,11 @@ function wait_for_net_device()
 # switch_device
 # 	$1: ccwgroupdevno
 #	$2: 1|0 (online|offline)
-# returns 
+# returns
 #	0 success
 #	1 command to make device online/offline returned error
 #	2 online file does not exist
-# 
+#
 function switch_device()
 {
 	local CCWGROUPDEVNO="$1"
@@ -491,7 +534,7 @@ function switch_device()
 	local DEVICE_DIRECTORY="$CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO"
 	local ONLINE_FILE="$DEVICE_DIRECTORY/online"
 	local STATESTR="online"
-	
+
 	if [ $SWITCHVALUE -eq 0 ]
 	then
 		STATESTR="offline"
@@ -513,7 +556,7 @@ function switch_device()
 		print_error "$ONLINE_FILE does not exist."
 		return 2
 	fi
-	
+
 	return 0
 }
 
@@ -524,12 +567,12 @@ function switch_device()
 #	$1: ccwgroupdevid
 #	$2: option_name
 #	$3: option_value
-# returns 
+# returns
 #	0 success
 # 	1 option not allowed to be set (e.g. online)
 #	2 unknown option
 #	3 configuration failed
-# 
+#
 function configure_ccwgroupdev_option()
 {
 	local CCWGROUPDEVID="$1"
@@ -539,10 +582,10 @@ function configure_ccwgroupdev_option()
 	# filter some attributes away
 	if [ "$OPTION_NAME" == "online" ]
 	then
-		print_error "Ignoring option $OPTION_NAME=$OPTION_VALUE" 
+		print_error "Ignoring option $OPTION_NAME=$OPTION_VALUE"
 		return 1
 	fi
-	
+
 	# check if attribute exists
 	local ATTRFILE="$CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVID/$OPTION_NAME"
 	if [ -f $ATTRFILE ]
@@ -574,13 +617,13 @@ function configure_ccwgroupdev_option()
 #	$4: opt_count
 #	$5..$(5+opt_count): opt_name_array
 #	$5+opt_count..5+2*opt_count: opt_value_array
-# returns 
+# returns
 #	0 success
-#	1 grouping failed
-#	2 failed to make device online 
-#	3 net device did not become available
-#	4 device online but some option could not be set
-# 
+#	RC_COULD_NOT_GROUP_DEVICES
+#	RC_COULD_NOT_SET_DEV_ONLINE
+#	RC_NET_DEVICE_NOT_ONLINE
+#	RC_OPTION_NOT_CONFIGURED
+#
 function add_net_device()
 {
 	local DEVICES="$1"
@@ -591,10 +634,9 @@ function add_net_device()
 	local OPT_NAME_ARRAY=("${RAW[@]:4:$OPT_COUNT}")
 	local OPT_VALUE_ARRAY=("${RAW[@]:$[4 + $OPT_COUNT]:$OPT_COUNT}")
 
-	group_device $DEVICES $CCWGROUPDEVID $DRIVER
-	if [ $? -ne 0 ]
+	if ! group_device $DEVICES $CCWGROUPDEVID $DRIVER
 	then
-		return 1
+		return $?
 	fi
 
 	local i=0
@@ -602,9 +644,8 @@ function add_net_device()
 	local HAS_LAYER2_OPTION=0
 	while [ $i -lt $OPT_COUNT ]
 	do
-		configure_ccwgroupdev_option $CCWGROUPDEVID \
+		if ! configure_ccwgroupdev_option $CCWGROUPDEVID \
 			 ${OPT_NAME_ARRAY[$i]} ${OPT_VALUE_ARRAY[$i]}
-		if [ $? -ne 0 ]
 		then
 			SOMEOPTION_FAILED=1
 		fi
@@ -628,22 +669,20 @@ function add_net_device()
 				"layer2" "$LAYER2"
 		fi
 	fi
- 
-	switch_device $CCWGROUPDEVNO 1
-	if [ $? -ne 0 ]
+
+	if ! switch_device $CCWGROUPDEVNO 1
 	then
-		return 2
+		return $RC_COULD_NOT_SET_DEV_ONLINE
 	fi
 
-	wait_for_net_device $CCWGROUPDEVNO
-	if [ $? -ne 0 ]
+	if ! wait_for_net_device $CCWGROUPDEVNO
 	then
-		return 3
+		return $RC_NET_DEVICE_NOT_ONLINE
 	fi
 
 	if [ $SOMEOPTION_FAILED -ne 0 ]
 	then
-		return 4
+		return $RC_OPTION_NOT_CONFIGURED
 	fi
 
 	return 0
@@ -655,26 +694,24 @@ function add_net_device()
 # remove_net_device
 #	$1: ccwgroupdevid
 #	$2: network interface name (just for display purposes)
-# returns 
+# returns
 #	0 success
-#	1 making device offline failed
-#	2 ungrouping device failed
-# 
+#	RC_COULD_NOT_SET_DEV_OFFLINE
+#	RC_COULD_NOT_UNGROUP_DEVICE
+#
 function remove_net_device()
 {
 	local DEVICE_TO_REMOVE="$1"
 	local DEVNAME="$2"
 
-	switch_device $DEVICE_TO_REMOVE 0
-	if [ $? -ne 0 ]
+	if ! switch_device $DEVICE_TO_REMOVE 0
 	then
-		return 1
+		return $RC_COULD_NOT_SET_DEV_OFFLINE
 	fi
 
-	ungroup_device $DEVICE_TO_REMOVE $DEVNAME
-	if [ $? -ne 0 ]
+	if ! ungroup_device $DEVICE_TO_REMOVE $DEVNAME
 	then
-		return 2
+		return $RC_COULD_NOT_UNGROUP_DEVICE
 	fi
 	return 0
 }
@@ -684,9 +721,9 @@ function remove_net_device()
 #
 # list_configured
 #	$1 supress_header
-# returns 
+# returns
 #	0 success
-# 
+#
 function list_configured()
 {
 	supress_header=0
@@ -723,11 +760,11 @@ function list_configured()
 
 		# read all links and parse driver, device name and ccw device
 		# bus-ids
-		ls -l $d/ | grep '^l' | 
-		{ 
+		ls -l $d/ | grep '^l' |
+		{
 
-			while read line 
-			do	
+			while read line
+			do
 				local LINKNAME=${line// ->*/""}
 				LINKNAME=${LINKNAME##* }
 				if [ "$LINKNAME" = "driver" ]
@@ -742,14 +779,14 @@ function list_configured()
 				then
 					DEVNAME=${line##* -> */}
 				fi
-			done 
+			done
 
 			local CUTYPE=""
 			if [ -e $d/cdev0/cutype ]
 			then
 				read CUTYPE < $d/cdev0/cutype
 			fi
-			
+
 			read ONLINE < $d/online
 			if [ $ONLINE -eq 1 ]
 			then
@@ -795,15 +832,15 @@ function print_list_unconf_header()
 
 #
 # list_unconfigured
-# returns 
+# returns
 #	0 success
-# 
+#
 function list_unconfigured()
 {
 	local PRINTED_HEADLINES=0
 	local LIST_FORMATSTR="%-26.26s %-7.7s %-14.14s %5.5s %-4.4s \n"
 	print_scanning_4_nwdevices
-	
+
 	$LSZNET_CALL |
 	{
 		while read no cutype chp devtype devdrv devname chlist cardtype
@@ -824,29 +861,29 @@ function list_unconfigured()
 #
 # store_option
 #	$1: attribute=value
-# returns 
+# returns
 #	0 success
 #	1 attribute starts with a - / or is invalid
 #	2 missing value
-# 
+#
 function store_option()
 {
 	local OPTIONSTRING="$1"
 
 	# ensure that there is no option intepreted as an
-	# attribute value pair 
+	# attribute value pair
 	[[ "$OPTIONSTRING" =~ ^- ]]
 	case $? in
 		0)
 			print_error "$OPTIONSTRING is not a valid attribute" \
-				"value pair" 
+				"value pair"
 			exit 1
 			;;
 		1)
 			# option considered ok
 			;;
 		2)
-			print_error "Internal error" 
+			print_error "Internal error"
 			exit 1
 	esac
 
@@ -874,17 +911,17 @@ function store_option()
 #
 # is_complete_ccwdevbusid
 #	$1: possibly correct ccw device bus id
-# returns 
+# returns
 #	0 if the given string is a correctly formatted ccw device bus id
 #	1 else
-# 
+#
 function is_complete_ccwdevbusid()
 {
 	local DEV="$1"
 	[[ "$DEV" =~ $FORMAT_FULLDEVNO ]]
-	case $? in 
+	case $? in
 		0)
-			return 0 
+			return 0
 			;;
 		1)
 			return 1
@@ -902,41 +939,41 @@ function is_complete_ccwdevbusid()
 #
 # is_partial_ccwdevbusid
 #	$1: possibly correct partial ccw device bus id
-# returns 
+# returns
 #	0 if the given string is a correctly formatted partial ccw device
 #	  bus id
 #	1 else
-# 
+#
 function is_partial_ccwdevbusid()
 {
 	local DEV="$1"
 	[[ "$DEV" =~ $FORMAT_PARTDEVNO ]]
 	case $? in
 		0)
-			return 0	
+			return 0
 			;;
 		1)
-			return 1 
+			return 1
 			;;
 		2)
 			print_error "Internal error"
 			exit 1
 			;;
 	esac
-}	
+}
 
 #==============================================================================
 
 #
 # is_ccwdevbusid_list
 #	$1: possibly correct list of ccw device bus ids
-# returns 
+# returns
 #	0 if the given string is a correctly formatted list of ccw device
 # 	  bus ids
 #	1 else
-# 
+#
 function is_ccwdevbusid_list()
-{ 
+{
 	local DEVLIST="$1"
 	[[ "$DEVLIST" =~ $FORMAT_DEVLIST ]]
 	case $? in
@@ -959,13 +996,13 @@ function is_ccwdevbusid_list()
 #
 # is_shortccwdevbusid_list
 #	$1: possibly correct list of short ccw device bus ids
-# returns 
+# returns
 #	0 if the given string is a correctly formatted list of short ccw device
 # 	  bus ids
 #	1 else
-# 
+#
 function is_shortccwdevbusid_list()
-{ 
+{
 	local DEVLIST="$1"
 	[[ "$DEVLIST" =~ $FORMAT_SHORTDEVLIST ]]
 	case $? in
@@ -987,14 +1024,14 @@ function is_shortccwdevbusid_list()
 #
 # is_supported_driver
 #	$1: possibly supported driver
-# returns 
-#	0 if the given string denotes a supported driver 
+# returns
+#	0 if the given string denotes a supported driver
 #	1 else
-# 
+#
 function is_supported_driver()
 {
 	local DRIVER="$1"
-	[[ "$DRIVER" =~ "^(qeth|lcs|ctc|ctcm)$" ]] 
+	[[ "$DRIVER" =~ "^(qeth|lcs|ctc|ctcm)$" ]]
 	case $? in
 		0)
 			return 0
@@ -1081,7 +1118,7 @@ DEVICE_TO_REMOVE=""
 DO_REMOVEALL=0
 NONINTERACTIVE=0
 EXCEPT=""
-if [ $# -gt 0 ] 
+if [ $# -gt 0 ]
 then
 	while [ $# -gt 0 ]
 	do
@@ -1092,7 +1129,7 @@ then
 				;;
 			-v|--version)
 				print_version
-				exit 0	
+				exit 0
 				;;
 			-A|--add-all)
 				DO_ADDALL=1
@@ -1103,15 +1140,15 @@ then
 				if [ $# -lt 1 ]
 				then
 					print_error "Device ID expected"
-					exit 1
+					exit $RC_MISSING_DEVICE_ID
 				fi
 
-				# get parameter expected to be a 
-				# ccw device bus id 
+				# get parameter expected to be a
+				# ccw device bus id
 				DEVICE_TO_ADD="$1"
 				shift
 
-				# check syntax of ccw device bus id 
+				# check syntax of ccw device bus id
 				if is_complete_ccwdevbusid "$DEVICE_TO_ADD" ||
 					is_ccwdevbusid_list "$DEVICE_TO_ADD"
 				then
@@ -1127,9 +1164,9 @@ then
 					DO_ADD=1
 				else
 					print_error "Invalid device ID format" \
-						"$DEVICE_TO_ADD" 
-						
-					exit 1
+						"$DEVICE_TO_ADD"
+
+					exit $RC_INVALID_DEVICE_ID_FORMAT
 				fi
 
 				;;
@@ -1142,18 +1179,18 @@ then
 				if [ $# -lt 1 ]
 				then
 					print_error "Driver name expected"
-					exit 1
+					exit $RC_DRIVER_NAME_EXPECTED
 				fi
 
 				# ensure driver is supported
 				DRIVER="$1"
 				shift
 				if [ "$DRIVER" != "" ] && \
-					! is_supported_driver "$DRIVER" 
+					! is_supported_driver "$DRIVER"
 				then
 					# unknown driver
 					print_error "Unknown driver $DRIVER"
-					exit 1
+					exit $RC_UNKNOWN_DRIVER
 				fi
 				;;
 			-o|--option)
@@ -1164,7 +1201,7 @@ then
 					print_error "Missing attrtibute" \
 						"value pair for -o|--" \
 						"option"
-					exit 1
+					exit $RC_MISSING_ATTRIBUTE_VALUE_PAIR
 				fi
 
 				# get option string
@@ -1174,26 +1211,26 @@ then
 				# store option
 				if ! store_option $OPTIONSTRING
 				then
-					exit $?
+					exit $RC_INVALID_ATTRIBUTE_VALUE_PAIR
 				fi
 				;;
 			-r|--remove)
 				DO_REMOVE=1
 				shift
-		
+
 				# ensure there is a further parameter
 				if [ $# -lt 1 ]
 				then
 					print_error "Expecting <device_bus_id>"\
 						"of device to be removed"
-					exit 1
+					exit $RC_MISSING_ATTRIBUTE_VALUE_PAIR
 				fi
 
 				# get device to be removed
 				DEVICE_TO_REMOVE="$1"
 				shift
-				
-				# validate it is a 
+
+				# validate it is a
 				# ccw dev bus id (short or long)
 				if is_partial_ccwdevbusid "$DEVICE_TO_REMOVE"
 				then
@@ -1203,7 +1240,7 @@ then
 				then
 					print_error "Invalid device ID format" \
 						"$DEVICE_TO_REMOVE"
-					exit 1
+					exit $RC_INVALID_DEVICE_ID_FORMAT
 				fi
 				;;
 			-R|--remove-all)
@@ -1219,7 +1256,7 @@ then
 				then
 					print_error "<device_bus_id> missing"\
 						"for -e|--except"
-					exit 1
+					exit $RC_MISSING_DEVICE_ID
 				fi
 
 				# get device to be removed
@@ -1236,7 +1273,7 @@ then
 				then
 					print_error "Invalid device ID format" \
 						"$EXCEPT_DEVNO"
-					exit 1
+					exit $RC_INVALID_DEVICE_ID_FORMAT
 				fi
 
 				# create a filter statement
@@ -1258,7 +1295,7 @@ then
 			*)
 				echo "$CMD: Invalid option $1"
 				echo "Try '$CMD --help' for more information."
-				exit 1
+				exit $RC_INVALID_ARGUMENT
 				;;
 		esac
 	done
@@ -1271,7 +1308,7 @@ if [ $(($DO_ADD + $DO_ADDALL + $DO_LIST_UNCONFIGURED + $DO_LIST_CONFIGURED + \
 then
 	print_error "Too much arguments"
 	echo "Try '$CMD --help' for more information."
-	exit 1
+	exit $RC_TOO_MUCH_ARGUMENTS
 fi
 
 # react to parsed options
@@ -1290,12 +1327,31 @@ then
 		then
 			print_error "No configuration found for device ID" \
 				"$DEVICE_TO_ADD"
-			exit 1
+			exit $RC_NO_CONFIG_FOUND_FOR_DEV
 		fi
 	else
-		# define set of device numbers to be used		
+		# define set of device numbers to be used
 		DEVICES="$DEVICE_TO_ADD"
-		
+
+		# ensure none of the CCW devices is already in use
+		CCW_DEVS=${DEVICES//,/ }
+		for CCW_DEVNO in $CCW_DEVS
+		do
+			CCW_DEV_ONLINEFILE="$CCWDEV_DIR/$CCW_DEVNO/online"
+			if [ ! -e  $CCW_DEV_ONLINEFILE ]
+			then
+				print_error "Device $CCW_DEVNO does not exist"
+				exit $RC_DEVICE_DOES_NOT_EXIST
+			fi
+
+			read CCW_DEV_ONLINE < $CCW_DEV_ONLINEFILE
+			if [ "$CCW_DEV_ONLINE" == "1" ]
+			then
+				print_error "$CCW_DEVNO is already in use"
+				exit $RC_DEVICE_ALREADY_IN_USE
+			fi
+		done
+
 		# try to find a driver for the given set of device numbers
 		CANDIDATE=$($LSZNET_CALL|
 			awk "\$7~/${DEVICE_TO_ADD//,// && \$7~/}/ {print \$5}")
@@ -1305,7 +1361,7 @@ then
 	# compute the expected group device number
 	CCWGROUPDEVNO=${DEVICES%%,*}
 
-	# check whether an appropriate driver was determined automatically or 
+	# check whether an appropriate driver was determined automatically or
 	# not, if not, one has to be given by the user via -d
 	if [ "$DRIVER" == "" ]
 	then
@@ -1345,7 +1401,7 @@ then
 				$ATTRIBUTE_COUNT "${ATTRIBUTE_NAME[@]}" \
 				"${ATTRIBUTE_VALUE[@]}"
 			then
-				ADDALL_RC=1
+				ADDALL_RC=$RC_SOME_DEVICES_FAILED
 			fi
 		done
 		exit "$ADDALL_RC"
@@ -1363,9 +1419,9 @@ then
 	if [[ -z "$CCWGROUPDEVID_TO_REMOVE" ]]
 	then
 		print_error "$DEVICE_TO_REMOVE is not a configured device"
-		exit 1
+		exit $RC_DEVICE_NOT_CONFIGURED
 	fi
-	
+
 	echo "Remove network device $CCWGROUPDEVID_TO_REMOVE" \
 	 	"($CCWDEVBUSIDS_TO_REMOVE)?"
 	echo "Warning: this may affect network connectivity!"
@@ -1403,7 +1459,7 @@ then
 fi
 if [ $DO_LIST_UNCONFIGURED -eq 1 ]
 then
-	list_unconfigured 
+	list_unconfigured
 	exit 0
 fi
 if [ $DO_LIST_CONFIGURED -eq 1 ]
diff --git a/zconf/znetconf.8 b/zconf/znetconf.8
index 3af8565..a6da42c 100644
--- a/zconf/znetconf.8
+++ b/zconf/znetconf.8
@@ -1,6 +1,6 @@
 .TH ZNETCONF 8 "Mar 2009" "s390-tools"
 
-.SH NAME 
+.SH NAME
 znetconf \- list and configure network devices for System z network adapters
 
 .SH SYNOPSIS
@@ -8,10 +8,10 @@ znetconf \- list and configure network devices for System z network adapters
 .B [-h|--help] [-v|--version]
 .br
 
-.br  
-.B znetconf -u | -c 
 .br
-.B znetconf -a <device_bus_id>[,...]{2} [-o <ATTR>=<VALUE>]+ [-d <DRIVER>] 
+.B znetconf -u | -c
+.br
+.B znetconf -a <device_bus_id>[,...]{2} [-o <ATTR>=<VALUE>]+ [-d <DRIVER>]
 .br
 .B znetconf -A [-o <ATTR>=<VALUE>]+ [-d <DRIVER>] [-e <device_bus_id>]+
 .br
@@ -27,12 +27,12 @@ Based on these lists, it automatically adds or removes network devices.
 For automatic configuration, znetconf builds a channel command word
 (CCW) group device from sensed CCW devices, configures any specified
 option through the sensed network device driver and sets the new
-network device online. 
+network device online.
 .P
 During automatic removal, znetconf sets the device offline and removes it.
 Be aware that removing all network devices leads to the
-complete loss of network connectivity. So a terminal session (e.g. 3270) 
-might be required to restore. 
+complete loss of network connectivity. So a terminal session (e.g. 3270)
+might be required to restore.
 
 .SH OPTIONS
 .TP 8
@@ -43,30 +43,30 @@ Print help text.
 .BR -v | --version
 Print the version of the s390-tools package and the znetconf command.
 
-.TP 
-.BR -u | --unconfigured	
+.TP
+.BR -u | --unconfigured
 List potential network devices that are not yet configured.
 For each device, the following data is provided:
 .RS
 .TP 4
-* 
-Device IDs (device bus bus-IDs) of the CCW devices constituting the network 
+*
+Device IDs (device bus bus-IDs) of the CCW devices constituting the network
 device
 .TP
-* 
+*
 Type of control unit (e.g. 1731/01)
 .TP
-* 
+*
 Network card type (e.g. OSA (QDIO))
 .TP
 *
-Channel path identifier (CHPID) 
+Channel path identifier (CHPID)
 .TP
 *
 Device driver (qeth, lcs, ctc, ctcm)
 .RE
-.TP 
-.BR -c | --configured 
+.TP
+.BR -c | --configured
 List configured network devices. For each device, the following data is
 provided:
 .RS
@@ -104,7 +104,7 @@ device_bus_id can be any of the device
 IDs listed as part of the potential network device list (argument
 .BR -u ")."
 For example, if znetconf
-.BR -u 
+.BR -u
 lists 0.0.f503,0.0.f504,0.0.f505 for a potential network device, device_bus_id
 may be 0.0.f503 or 0.0.f504 or 0.0.f505.
 If a device bus-ID begins with 0.0., you can abbreviate it to the final 4
@@ -115,11 +115,11 @@ If attribute value pairs are given with
 .BR -o ", "
 these pairs are configured for the created network device. The
 device is then set online regardless of whether the given attribute value pairs
-were applied successfully. 
+were applied successfully.
 .br
 Finally, the corresponding network interface name (e.g. eth1) is displayed.
 .br
-If more then one device_bus_id is given, the given set of devices is configured as a network device. znetconf tries to sense the required device driver 
+If more then one device_bus_id is given, the given set of devices is configured as a network device. znetconf tries to sense the required device driver
 automatically. If the device driver cannot be sensed, you must specify it with
 -d.
 .BR -d "."
@@ -145,7 +145,7 @@ znetconf continues with the next remaining potential network device.
 
 .TP
 .BR -r | --remove " <device_bus_id> [-n | --non-interactive]"
-Remove the network device identified by device_bus_id. device_bus_id is one of 
+Remove the network device identified by device_bus_id. device_bus_id is one of
 the device IDs of the network device. They are listed as part of znetconf
 .BR -c "."
 znetconf sets the device offline and removes it. If
@@ -164,21 +164,105 @@ with
 .TP
 \fB<ATTR>\fR
 Specify a device option. The option must match a sysfs attribute for the device
-to be configured.
+to be configured. For a detailed description of the semantics of sysfs
+attributes please refer to the Device Drivers, Features, and Commands book for
+Linux on System z. The attributes are:
+
+.RS
+.B qeth
+.br
+broadcast_mode
+.br
+buffer_count
+.br
+canonical_macaddr
+.br
+checksumming
+.br
+fake_broadcast
+.br
+ipa_takeover/add4
+.br
+ipa_takeover/add6
+.br
+ipa_takeover/del4
+.br
+ipa_takeover/del6
+.br
+ipa_takeover/enable
+.br
+ipa_takeover/invert4
+.br
+ipa_takeover/invert6
+.br
+isolation
+.br
+large_send
+.br
+layer2
+.br
+performance_stats
+.br
+portname
+.br
+portno
+.br
+priority_queueing
+.br
+route4
+.br
+route6
+.br
+rxip/add4
+.br
+rxip/add6
+.br
+rxip/del4
+.br
+rxip/del6
+.br
+vipa/add4
+.br
+vipa/add6
+.br
+vipa/del4
+.br
+vipa/del
+.RE
+
+.RS
+.B ctc(m)
+.br
+buffer
+.br
+loglevel
+.br
+protocol
+.br
+stats
+.RE
+
+.RS
+.B lcs
+.br
+portno
+.br
+lancmd_timeout
+.RE
 
 .TP
-\fB<device_bus_id>\fR 
+\fB<device_bus_id>\fR
 Specify the device bus-ID of a CCW device. Device bus-IDs have the form
 ([A-Fa-f0-9].[A-Fa-f0-9].)[A-Fa-f0-9]{4}.
 
-If a device bus-ID begins with 0.0., you can abbreviate it to the final 4 
+If a device bus-ID begins with 0.0., you can abbreviate it to the final 4
 hexadecimal digits.
 
 For example, you can abbreviate 0.0.f503 to f503.
 
 .TP
 \fB<DRIVER>\fR
-Specify the device driver for the device. Valid values are qeth, lcs, ctc, or 
+Specify the device driver for the device. Valid values are qeth, lcs, ctc, or
 ctcm.
 
 .SH EXAMPLES
@@ -242,9 +326,9 @@ Shows the list of potential network devices. Example output:
 Device IDs                 Type    Card Type  CHPID Drv.
 .br
 --------------------------------------------------------
-0.0.f500,0.0.f501,0.0.f502 1731/01 OSA (QDIO) 00    qeth   
+0.0.f500,0.0.f501,0.0.f502 1731/01 OSA (QDIO) 00    qeth
 .br
-0.0.f503,0.0.f504,0.0.f505 1731/01 OSA (QDIO) 01    qeth 
+0.0.f503,0.0.f504,0.0.f505 1731/01 OSA (QDIO) 01    qeth
 .RE
 .P
 \fBznetconf -a 0.0.f503\fR
@@ -258,13 +342,13 @@ lists the new network device.
 .P
 \fBznetconf -a f503\fR
 .RS
-This command is equivalent to \fBznetconf -a 0.0.f503\fR. 
+This command is equivalent to \fBznetconf -a 0.0.f503\fR.
 .RE
 .P
 \fBznetconf -a f503 -o layer2=0 -o portname=myname\fR
 .RS
-Adds the potential network device 
-with 0.0.f503 as one of its device bus-IDs  
+Adds the potential network device
+with 0.0.f503 as one of its device bus-IDs
 and configures the options layer2 with value 0 and
 portname with myname.
 .RE
@@ -288,9 +372,9 @@ Device IDs                 Type    Card Type     CHPID Drv. Name State
 
 \fBznetconf -r 0.0.f503\fR
 .RS
-Removes the network device with 0.0.f503 as one of its device bus-IDs. 
+Removes the network device with 0.0.f503 as one of its device bus-IDs.
 You can only remove configured devices as listed by znetconf
-.BR -c "." 
+.BR -c "."
 After successfully running this command the corresponding device appears in the
 list of potential network devices as listed by znetconf
 .BR -u "."
@@ -303,9 +387,76 @@ This command is equivalent to \fBznetconf -r 0.0.f503\fR.
 .P
 
 .SH DIAGNOSTICS
-If znetconf runs successfully, the exit status is 0. In case of errors, 1 is
-returned.
-
+If znetconf runs successfully, the exit status is 0. In case of errors, the following codes are returned:
+.TP
+.BR 0
+success
+.TP
+.BR 9
+could not group devices
+.TP
+.BR 10
+could not set device online
+.TP
+.BR 11
+could not set device offline
+.TP
+.BR 12
+invalid attribute value pair
+.TP
+.BR 13
+missing component (broken installation)
+.TP
+.BR 14
+missing device ID
+.TP
+.BR 15
+invalid device ID format
+.TP
+.BR 16
+driver name expected
+.TP
+.BR 17
+unknown driver
+.TP
+.BR 18
+missing attribute value pair for -o|--option
+.TP
+.BR 19
+invalid argument
+.TP
+.BR 20
+too much arguments
+.TP
+.BR 21
+no configuration found for device ID
+.TP
+.BR 22
+device is not configured
+.TP
+.BR 23
+could not ungroup device
+.TP
+.BR 24
+at least one option could not be configured
+.TP
+.BR 25
+missing value for attribute
+.TP
+.BR 26
+device does not exist
+.TP
+.BR 27
+device already in use
+.TP
+.BR 28
+net device did not come online
+.TP
+.BR 29
+some devices could not be added or failed
+.TP
+.BR 99
+internal znetconf bug
 .SH AUTHOR
 .nf
 This man-page was written by Einar Lueck <elelueck at de.ibm.com>.
-- 
1.6.3.3



--- NEW FILE device_cio_free ---
#!/bin/sh
#
# Copyright 2009 Red Hat, Inc.
# License: GPLv2
# Author: Dan Hor?k <dhorak at redhat.com>
#
# unblock devices listed in various config files and wait until they are ready
#
# it uses dasd and zfcp config file
# config file syntax:
# deviceno   options
# or
# deviceno   WWPN   FCPLUN
#
# also processes the system ccw config file and network interface configurations
#

DASDCONFIG=/etc/dasd.conf
ZFCPCONFIG=/etc/zfcp.conf
ZNETCONFIG=/etc/ccw.conf
BLACKLIST=/proc/cio_ignore
VERBOSE=
PATH=/bin:/usr/bin:/sbin:/usr/sbin
ALL_DEVICES=

usage()
{
    echo "$0 [-h|--help] [-V|--verbose]"
    exit 1
}

# accepts single device, comma-separated lists and dash separated ranges and their combinations
free_device()
{
    local DEV

    [ -z "$1" ] && return

    DEV=$(echo $1 | tr "A-Z" "a-z")
    
    [ $VERBOSE ] && echo "Freeing device(s) $DEV"
    if [ echo "free $DEV" > $BLACKLIST 2> /dev/null ]; then
	echo "Error: can't free device(s) $DEV"
    else
	if [ -z $ALL_DEVICES ]; then
	    ALL_DEVICES=$DEV
	else
	    ALL_DEVICES="$ALL_DEVICES,$DEV"
	fi
    fi
}

# wait until a device appears on the ccw bus
wait_on_device()
{
    local DEVICE_ONLINE DEV
    
    [ -z "$1" ] && return
    
    DEV=$1
    DEVICE_ONLINE=/sys/bus/ccw/devices/$DEV/online
    
    [ $VERBOSE ] && echo "Waiting on device $DEV"
    [ -f "$DEVICE_ONLINE" ] && return

    for t in 1 2 3 4 5
    do
	sleep $t
	[ -f "$DEVICE_ONLINE" ] && return
    done
    echo "Error: device $DEV still not ready"
}

# check how we were called
case $(basename "$0") in
    "dasd_cio_free")
	CONFIG=$DASDCONFIG
	MODE=dasd
	;;
    "zfcp_cio_free")
	CONFIG=$ZFCPCONFIG
	MODE=zfcp
	;;
    "znet_cio_free")
	CONFIG=$ZNETCONFIG
	MODE=znet
	;;
    *)
	echo "Error: unknown alias '$CMD'."
	echo "Supported aliases are dasd_cio_free, zfcp_cio_free and znet_cio_free."
	exit 1
	;;
esac

# process command line options
if [ $# -gt 0 ]; then
    case $1 in
	-V|--verbose)
	    VERBOSE=yes
	    shift
	    ;;
	-h|--help)
	    usage
	    ;;
	*)
	    echo "Error: unknown option $1"
	    usage
	    ;;
    esac
fi

if [ ! -f $BLACKLIST ]; then
    echo "Error: $BLACKLIST kernel interface doesn't exist"
    exit 2
fi

if [ $MODE = "dasd" -o $MODE = "zfcp" ]; then
    # process the config file
    if [ -f "$CONFIG" ]; then
        while read line; do
	    case $line in
		\#*) ;;
		*)
		    [ -z "$line" ] && continue
		    set $line
		    free_device $1
		    ;;
	    esac
	done < $CONFIG
    fi
fi

if [ $MODE = "dasd" ]; then
    # process the device list defined as option for the dasd module
    DEVICES=$(modprobe --showconfig | grep "options[[:space:]]\+dasd_mod" | \
	sed -e 's/.*[[:space:]]dasd=\([^[:space:]]*\).*/\1/' -e 's/([^)]*)//g' \
	-e 's/nopav\|nofcx\|autodetect\|probeonly//g' -e 's/,,/,/g' -e 's/^,//' -e 's/,$//')

    free_device $DEVICES
fi

if [ $MODE = "znet" ]; then
    # process the config file
    if [ -f "$CONFIG" ]; then
        while read line; do
	    case $line in
		\#*) ;;
		*)
		    [ -z "$line" ] && continue
		    # grep 2 or 3 channels from beginning of each line
		    DEVICES=$(echo $line | egrep -i -o "^([0-9]\.[0-9]\.[a-f0-9]+,){1,2}([0-9]\.[0-9]\.[a-f0-9]+)")
		    free_device $DEVICES
		    ;;
	    esac
	done < $CONFIG
    fi
    # process channels from network interface configurations
    for line in $(egrep -i -h "^[[:space:]]*SUBCHANNELS=['\"]?([0-9]\.[0-9]\.[a-f0-9]+,){1,2}([0-9]\.[0-9]\.[a-f0-9]+)['\"]?([[:space:]]+#|[[:space:]]*$)" /etc/sysconfig/network-scripts/ifcfg-* 2> /dev/null)
    do
	eval "$line"
        free_device $SUBCHANNELS
    done
fi

# wait until recently unblocked devices are ready
# at this point we know the content of ALL_DEVICES is syntacticly correct
IFS=","
set $ALL_DEVICES
while [ "$1" ]
do
    DEV="$1"
    IFS="."

    # get the lower bound for range or get the single device
    LOWER=${DEV%%-*}
    read -a L <<< "$LOWER"
    if [ ${#L[@]} -eq 1 ]; then
        L[2]=${L[0]}
        L[0]=0
        L[1]=0
    fi

    # get the upper bound for range or get the single device
    UPPER=${DEV##*-}
    read -a U <<< "$UPPER"
    if [ ${#U[@]} -eq 1 ]; then
        U[2]=${U[0]}
        U[0]=0
        U[1]=0
    fi

    # iterate thru all devices
    for (( i=0x${L[0]}; i<=0x${U[0]}; i++ )); do
    for (( j=0x${L[1]}; j<=0x${U[1]}; j++ )); do
    for (( k=0x${L[2]}; k<=0x${U[2]}; k++ )); do
	wait_on_device "$(printf %x.%x.%04x $i $j $k)"
    done
    done
    done

    # go to the next device
    shift
done


Index: cpi.initd
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/cpi.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cpi.initd	1 Dec 2009 09:59:31 -0000	1.2
+++ cpi.initd	22 Dec 2009 10:56:32 -0000	1.3
@@ -2,7 +2,7 @@
 #
 # Copyright 2009 Red Hat, Inc.
 # License: GPLv2
-# Author: Dan Horak <dhorak at redhat.com>
+# Author: Dan Hor?k <dhorak at redhat.com>
 #
 # cpi Set Control Program Identification on IBM zSeries
 #


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/s390utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- s390utils.spec	10 Dec 2009 17:48:03 -0000	1.16
+++ s390utils.spec	22 Dec 2009 10:56:32 -0000	1.17
@@ -31,6 +31,7 @@ Source11:       cpi.sysconfig
 # files for DASD initialization
 Source12:       dasd.udev
 Source13:       dasdconf.sh
+Source14:       device_cio_free
 
 Patch1:   0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch
 Patch2:   0002-s390-tools-1.8.1-zipl-automenu.patch
@@ -48,6 +49,7 @@ Patch13:  0013-zipl-handle-status-during
 Patch14:  0014-dasdview-fdasd-fix-floating-point-error-for-unformat.patch
 Patch15:  0015-s390tools-1.8.2-zipl-dm.patch
 Patch16:  0016-s390tools-1.8.2-lsreipl-nss.patch
+Patch17:  0017-qualified-return-codes-and-further-error-handling-in.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -125,6 +127,9 @@ be used together with the zSeries (s390)
 # Add missing check and print NSS name in case an NSS has been IPLed (#546297)
 %patch16 -p1 -b .lsreipl-nss
 
+# Add qualified return codes and further error handling in znetconf (#548487)
+%patch17 -p1 -b .znetconf-returncodes
+
 #
 # cmsfs
 #
@@ -198,6 +203,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,sysconfig},%{_initddir}}
 
+# workaround an issue in the zipl-device-mapper patch
+rm -f zipl/src/zipl_helper.device-mapper.*
+
 make install \
         INSTROOT=$RPM_BUILD_ROOT \
         MANDIR=$RPM_BUILD_ROOT%{_mandir} \
@@ -260,6 +268,14 @@ install -p -m 644 include/vtoc.h $RPM_BU
 install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/cpi
 install -p -m 755 %{SOURCE10} ${RPM_BUILD_ROOT}%{_initddir}/cpi
 
+# device_cio_free
+install -p -m 755 %{SOURCE14} ${RPM_BUILD_ROOT}/sbin
+pushd ${RPM_BUILD_ROOT}/sbin
+for lnk in dasd zfcp znet; do
+    ln -sf device_cio_free ${lnk}_cio_free
+done
+popd
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -430,9 +446,11 @@ fi
 %doc README
 %doc LICENSE
 /sbin/zipl
+/sbin/dasd_cio_free
 /sbin/dasdfmt
 /sbin/dasdinfo
 /sbin/dasdview
+/sbin/device_cio_free
 /sbin/fdasd
 /sbin/chccwdev
 /sbin/chchp
@@ -454,7 +472,9 @@ fi
 /sbin/tape390_crypt
 /sbin/tunedasd
 /sbin/vmcp
+/sbin/zfcp_cio_free
 /sbin/zgetdump
+/sbin/znet_cio_free
 /sbin/znetconf
 /sbin/dbginfo.sh
 %{_sbindir}/lsreipl
@@ -806,11 +826,13 @@ User-space development files for the s39
 
 
 %changelog
-* Thu Dec 10 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
+* Tue Dec 22 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
 - fixed return value in cpi initscript (#541389)
 - updated zfcpconf.sh script from dracut
 - added device-mapper support into zipl (#546280)
 - added missing check and print NSS name in case an NSS has been IPLed (#546297)
+- added device_cio_free script and its symlinks
+- added qualified return codes and further error handling in znetconf (#548487)
 
 * Fri Nov 13 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-5
 - added multiple fixes from IBM (#533955, #537142, #537144)



From sharkcz at fedoraproject.org  Tue Dec 22 11:00:08 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 22 Dec 2009 11:00:08 +0000 (UTC)
Subject: rpms/s390utils/devel 0015-s390tools-1.8.2-zipl-dm.patch, NONE,
	1.1 0016-s390tools-1.8.2-lsreipl-nss.patch, NONE,
	1.1 0017-qualified-return-codes-and-further-error-handling-in.patch,
	NONE, 1.1 device_cio_free, NONE, 1.1 s390utils.spec, 1.14, 1.15
Message-ID: <20091222110008.3476D11C00E9@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15366

Modified Files:
	s390utils.spec 
Added Files:
	0015-s390tools-1.8.2-zipl-dm.patch 
	0016-s390tools-1.8.2-lsreipl-nss.patch 
	0017-qualified-return-codes-and-further-error-handling-in.patch 
	device_cio_free 
Log Message:
* Tue Dec 22 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
- fixed return value in cpi initscript (#541389)
- updated zfcpconf.sh script from dracut
- added device-mapper support into zipl (#546280)
- added missing check and print NSS name in case an NSS has been IPLed (#546297)
- added device_cio_free script and its symlinks
- added qualified return codes and further error handling in znetconf (#548487)


0015-s390tools-1.8.2-zipl-dm.patch:
 include/disk.h                |   25 +
 include/install.h             |    9 
 include/job.h                 |   17 
 include/scan.h                |   19 -
 man/zipl.8                    |   88 +++++
 man/zipl.conf.5               |   71 ++++
 src/Makefile                  |    1 
 src/bootmap.c                 |   70 +---
 src/disk.c                    |  242 +++++++++++---
 src/install.c                 |   11 
 src/job.c                     |  362 ++++++++++++++++++++-
 src/scan.c                    |  262 ++++++++++++++-
 src/zipl.c                    |   13 
 src/zipl_helper.device-mapper |  717 +++++++++++++++++++++++++++++++++++++++++-
 14 files changed, 1759 insertions(+), 148 deletions(-)

--- NEW FILE 0015-s390tools-1.8.2-zipl-dm.patch ---
>From e089f907d7ba7f18479eaff61852171842a219e2 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 10 Dec 2009 18:27:58 +0100
Subject: [PATCH 15/16] s390tools-1.8.2-zipl-dm

device mapper support for zipl
---
 zipl/include/disk.h                |   25 ++-
 zipl/include/install.h             |    9 +-
 zipl/include/job.h                 |   17 +-
 zipl/include/scan.h                |   19 +-
 zipl/man/zipl.8                    |   88 +++++-
 zipl/man/zipl.conf.5               |   71 ++++-
 zipl/src/Makefile                  |    1 +
 zipl/src/bootmap.c                 |   70 ++---
 zipl/src/disk.c                    |  242 ++++++++++---
 zipl/src/install.c                 |   11 +-
 zipl/src/job.c                     |  362 +++++++++++++++++-
 zipl/src/scan.c                    |  262 ++++++++++++-
 zipl/src/zipl.c                    |   13 +-
 zipl/src/zipl_helper.device-mapper |  716 ++++++++++++++++++++++++++++++++++++
 14 files changed, 1759 insertions(+), 147 deletions(-)
 create mode 100644 zipl/src/zipl_helper.device-mapper

diff --git a/zipl/include/disk.h b/zipl/include/disk.h
index c5179b7..4b39698 100644
--- a/zipl/include/disk.h
+++ b/zipl/include/disk.h
@@ -2,7 +2,7 @@
  * s390-tools/zipl/include/disk.h
  *   Functions to handle disk layout specific operations.
  *
- * Copyright IBM Corp. 2001, 2006.
+ * Copyright IBM Corp. 2001, 2009.
  *
  * Author(s): Carsten Otte <cotte at de.ibm.com>
  *            Peter Oberparleiter <Peter.Oberparleiter at de.ibm.com>
@@ -59,6 +59,19 @@ struct hd_geometry {
 	unsigned long start;
 };
 
+/* Disk information source */
+typedef enum {
+	source_auto,
+	source_user,
+	source_script
+} source_t;
+
+/* targetbase definition */
+typedef enum {
+	defined_as_device,
+	defined_as_name
+} definition_t;
+
 /* Disk information type */
 struct disk_info {
 	disk_type_t type;
@@ -72,11 +85,17 @@ struct disk_info {
 	struct hd_geometry geo;
 	char* name;
 	char* drv_name;
+	source_t source;
+	definition_t targetbase;
 };
 
+struct job_target_data;
 
-int disk_get_info(const char* device, struct disk_info** info);
-int disk_get_info_from_file(const char* filename, struct disk_info** info);
+int disk_get_info(const char* device, struct job_target_data* target,
+		  struct disk_info** info);
+int disk_get_info_from_file(const char* filename,
+			    struct job_target_data* target,
+			    struct disk_info** info);
 void disk_free_info(struct disk_info* info);
 char* disk_get_type_name(disk_type_t type);
 int disk_is_large_volume(struct disk_info* info);
diff --git a/zipl/include/install.h b/zipl/include/install.h
index ba31bff..5504deb 100644
--- a/zipl/include/install.h
+++ b/zipl/include/install.h
@@ -2,7 +2,7 @@
  * s390-tools/zipl/include/install.h
  *   Functions handling the installation of the boot loader code onto disk.
  *
- * Copyright IBM Corp. 2001, 2006.
+ * Copyright IBM Corp. 2001, 2009.
  *
  * Author(s): Carsten Otte <cotte at de.ibm.com>
  *            Peter Oberparleiter <Peter.Oberparleiter at de.ibm.com>
@@ -24,8 +24,9 @@ int install_tapeloader(const char* device, const char* image,
 		       const char* parmline, const char* ramdisk,
 		       address_t image_addr, address_t parm_addr,
 		       address_t initrd_addr);
-int install_dump(const char* device, uint64_t mem);
-int install_mvdump(char* const device[], int device_count, uint64_t mem,
-		   uint8_t force);
+int install_dump(const char* device, struct job_target_data* target,
+		 uint64_t mem);
+int install_mvdump(char* const device[], struct job_target_data* target,
+		   int device_count, uint64_t mem, uint8_t force);
 
 #endif /* INSTALL_H */
diff --git a/zipl/include/job.h b/zipl/include/job.h
index 824ffc4..cf881db 100644
--- a/zipl/include/job.h
+++ b/zipl/include/job.h
@@ -3,7 +3,7 @@
  *   Functions and data structures representing the actual 'job' that the
  *   user wants us to execute.
  *
- * Copyright IBM Corp. 2001, 2006.
+ * Copyright IBM Corp. 2001, 2009.
  *
  * Author(s): Carsten Otte <cotte at de.ibm.com>
  *            Peter Oberparleiter <Peter.Oberparleiter at de.ibm.com>
@@ -13,6 +13,7 @@
 #define JOB_H
 
 #include "zipl.h"
+#include "disk.h"
 
 
 enum job_id {
@@ -27,6 +28,17 @@ enum job_id {
 	job_mvdump = 9,
 };
 
+struct job_target_data {
+	char* bootmap_dir;
+	char* targetbase;
+	disk_type_t targettype;
+	int targetcylinders;
+	int targetheads;
+	int targetsectors;
+	int targetblocksize;
+	blocknum_t targetoffset;
+};
+
 struct job_ipl_data {
 	char* image;
 	char* parmline;
@@ -94,7 +106,7 @@ struct job_menu_data {
 
 struct job_data {
 	enum job_id id;
-	char* bootmap_dir;
+	struct job_target_data target;
 	char* name;
 	union {
 		struct job_ipl_data ipl;
@@ -115,5 +127,6 @@ struct job_data {
 
 int job_get(int argc, char* argv[], struct job_data** data);
 void job_free(struct job_data* job);
+int type_from_target(char *target, disk_type_t *type);
 
 #endif /* not JOB_H */
diff --git a/zipl/include/scan.h b/zipl/include/scan.h
index b1c0e3a..ed5714e 100644
--- a/zipl/include/scan.h
+++ b/zipl/include/scan.h
@@ -2,7 +2,7 @@
  * s390-tools/zipl/include/scan.h
  *   Scanner for zipl.conf configuration files
  *
- * Copyright IBM Corp. 2001, 2006.
+ * Copyright IBM Corp. 2001, 2009.
  *
  * Author(s): Carsten Otte <cotte at de.ibm.com>
  *            Peter Oberparleiter <Peter.Oberparleiter at de.ibm.com>
@@ -15,7 +15,7 @@
 
 
 #define SCAN_SECTION_NUM		7
-#define SCAN_KEYWORD_NUM		14
+#define SCAN_KEYWORD_NUM		19
 
 enum scan_id {
 	scan_id_empty = 0,
@@ -40,6 +40,11 @@ enum scan_keyword_id {
 	scan_keyword_defaultmenu = 11,
 	scan_keyword_tape	= 12,
 	scan_keyword_mvdump	= 13,
+	scan_keyword_targetbase = 14,
+	scan_keyword_targettype = 15,
+	scan_keyword_targetgeometry = 16,
+	scan_keyword_targetblocksize = 17,
+	scan_keyword_targetoffset = 18,
 };
 
 enum scan_section_type {
@@ -53,6 +58,14 @@ enum scan_section_type {
 	section_mvdump		= 6,
 };
 
+enum scan_target_type {
+	target_type_invalid	= -1,
+	target_type_scsi	= 0,
[...2317 lines suppressed...]
+			$type = $DEV_TYPE_LDL;
+		} elsif ($format == 2) {
+			$type = $DEV_TYPE_CDL;
+		}
+	}
+
+	return ($type, $cyl, $heads, $sectors);
+}
+
+# get_partition_start(device)
+# Return the partition offset of device.
+sub get_partition_start($)
+{
+	my ($dev) = @_;
+	my $line;
+	my $offset;
+	local *HANDLE;
+
+	open(HANDLE, "$blockdev --report $dev 2>/dev/null|") or
+		return undef;
+	$line = <HANDLE>;
+	if ($line =~ /RO\s+RA\s+SSZ\s+BSZ\s+StartSec\s+Size\s+Device/) {
+		$line = <HANDLE>;
+		if ($line =~ /^\S+\s+\d+\s+\d+\s+\d+\s+(\d+)/) {
+			$offset = $1;
+		}
+	}
+	close(HANDLE);
+	return $offset;
+}
+
+# is_dasd(type)
+# Return whether disk with type is a DASD.
+sub is_dasd($)
+{
+	my ($type) = @_;
+
+	return ($type == $DEV_TYPE_CDL) || ($type == $DEV_TYPE_LDL) ||
+	       ($type == $DEV_TYPE_FBA);
+}
+
+# get_partition_base(type, major, minor)
+# Return (major, minor) of the base device on which the partition is located.
+sub get_partition_base($$$)
+{
+	my ($type, $major, $minor) = @_;
+
+	if (is_dasd($type)) {
+		return ($major, $minor & ~$DASD_PARTN_MASK);
+	} else {
+		return ($major, $minor & ~$SCSI_PARTN_MASK);
+	}
+}
+
+# get_device_characteristics(major, minor)
+# Returns (type, blocksize, geometry, bootsectors, partstart) for device.
+sub get_device_characteristics($$)
+{
+	my ($major, $minor) = @_;
+	my $dev;
+	my $blocksize;
+	my $type;
+	my $cyl;
+	my $heads;
+	my $sectors;
+	my $geometry;
+	my $bootsectors;
+	my $partstart;
+
+	$dev = create_temp_device_node("b", $major, $minor);
+	$blocksize = get_blocksize($dev);
+	if (!defined($blocksize)) {
+		unlink($dev);
+		die("Error: Could not get block size for ".
+		    get_device_name($major, $minor)."\n");
+	}
+	($type, $cyl, $heads, $sectors) = get_dasd_info($dev);
+	if (defined($type)) {
+		$geometry = "$cyl,$heads,$sectors";
+		if ($type == $DEV_TYPE_CDL) {
+			# First track contains IPL records
+			$bootsectors = $blocksize * $sectors / $SECTOR_SIZE;
+		} elsif ($type == $DEV_TYPE_LDL) {
+			# First two blocks contain IPL records
+			$bootsectors = $blocksize * 2 / $SECTOR_SIZE;
+		} elsif ($type == $DEV_TYPE_FBA) {
+			# First block contains IPL records
+			$bootsectors = $blocksize / $SECTOR_SIZE;
+		}
+	} else {
+		# Assume SCSI if get_dasd_info failed
+		$type = $DEV_TYPE_SCSI;
+		# First block contains IPL records
+		$bootsectors = $blocksize / $SECTOR_SIZE;
+	}
+	$partstart = get_partition_start($dev);
+	unlink($dev);
+	if (!defined($partstart)) {
+		die("Error: Could not determine partition start for ".
+		    get_device_name($major, $minor)."\n");
+	}
+	return ($type, $blocksize, $geometry, $bootsectors, $partstart);
+}
+
+# get_type_name(type)
+# Return textual representation of device type.
+sub get_type_name($)
+{
+	my ($type) = @_;
+
+	if ($type == $DEV_TYPE_CDL) {
+		return "CDL";
+	} elsif ($type == $DEV_TYPE_LDL) {
+		return "LDL";
+	} elsif ($type == $DEV_TYPE_FBA) {
+		return "FBA";
+	} elsif ($type == $DEV_TYPE_SCSI) {
+		return "SCSI";
+	}
+	return undef;
+}
+
+
+# check_for_mirror(index, target_list)
+# Die if there is a mirror target between index and 0.
+sub check_for_mirror($@)
+{
+	my ($i, @target_list) = @_;
+
+	for (;$i >= 0; $i--) {
+		my $entry = $target_list[$i];
+		my ($major, $minor, $target) = @$entry;
+
+		if ($target->[$TARGET_TYPE] == $TARGET_TYPE_MIRROR) {
+			# IPL records are not mirrored.
+			die("Error: Unsupported setup: Block 0 is not ".
+			    "mirrored in device '".
+			    get_device_name($major, $minor)."'\n");
+		}
+	}
+}
+
+# get_target_base(bottom_major, bottom_minor, start, length, target_list)
+# Return (major, minor) for the top most target in the target list that maps
+# the region on (bottom_major, bottom_minor) defined by start and length at
+# offset 0.
+sub get_target_base($$$$@)
+{
+	my ($bot_major, $bot_minor, $start, $length, @target_list) = @_;
+	my $entry;
+	my $top_major;
+	my $top_minor;
+	my $i;
+
+	# Pre-initialize with bottom major-minor
+	$top_major = $bot_major;
+	$top_minor = $bot_minor;
+	# Process all entries starting with the last one
+	for ($i = scalar(@target_list) - 1; $i >= 0; $i--) {
+		my $entry = $target_list[$i];
+		my ($major, $minor, $target) = @$entry;
+
+		if (($target->[$TARGET_START] != 0) ||
+		    (get_target_start($target) != 0) ||
+		    ($target->[$TARGET_LENGTH] < $length)) {
+			last;
+		}
+		$top_major = $major;
+		$top_minor = $minor;
+	}
+	# Check for mirrorring between base device and fs device.
+	check_for_mirror($i, @target_list);
+	return ($top_major, $top_minor);
+}
+
+# get_device_name(major, minor)
+# Return the name of the device specified by major and minor.
+sub get_device_name($$)
+{
+	my ($major, $minor) = @_;
+	my $name;
+	local *HANDLE;
+
+	$name = "$major:$minor";
+	open(HANDLE, "</proc/partitions") or goto out;
+	while (<HANDLE>) {
+		if (/^\s*(\d+)\s+(\d+)\s+\d+\s+(\S+)\s*$/) {
+			if (($major == $1) && ($minor == $2)) {
+				$name = $3;
+				last;
+			}
+		}
+	}
+	close(HANDLE);
+out:
+	return $name;
+}
-- 
1.6.3.3


0016-s390tools-1.8.2-lsreipl-nss.patch:
 ccw.c     |   42 ++++++++++++++++++------------------------
 chreipl.h |    9 ++++++---
 fcp.c     |   13 +++++++------
 ipl.c     |   57 +++++++++++++++++++++++++++++++++++----------------------
 main.c    |   25 +++++++++++++++++++------
 system.c  |    4 ++--
 6 files changed, 87 insertions(+), 63 deletions(-)

--- NEW FILE 0016-s390tools-1.8.2-lsreipl-nss.patch ---
>From 62fb535a68f1df693869e4361150259b42c6f211 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 10 Dec 2009 18:30:52 +0100
Subject: [PATCH 16/16] s390tools-1.8.2-lsreipl-nss

---
 ipl_tools/ccw.c     |   42 ++++++++++++++++---------------------
 ipl_tools/chreipl.h |    9 +++++--
 ipl_tools/fcp.c     |   13 ++++++-----
 ipl_tools/ipl.c     |   57 +++++++++++++++++++++++++++++++-------------------
 ipl_tools/main.c    |   25 +++++++++++++++++-----
 ipl_tools/system.c  |    3 +-
 6 files changed, 87 insertions(+), 62 deletions(-)

diff --git a/ipl_tools/ccw.c b/ipl_tools/ccw.c
index 7959831..eef4550 100644
--- a/ipl_tools/ccw.c
+++ b/ipl_tools/ccw.c
@@ -52,22 +52,19 @@ int isccwdev(const char *devno)
 }
 
 
-int get_ccw_devno_old_sysfs(char *device, char *devno)
+int get_ccw_devno_old_sysfs(char *device)
 {
 	FILE *filp;
-	int len, errorpath, rc;
+	int errorpath;
 	char path1[4096];
 	char buf[4096];
-	char *match, *s1, *s2;
+	char *match = NULL, *s1, *s2;
 
 	errorpath = 1;
-	rc = 0;
 	sprintf(path1, "/sys/block/%s/uevent", device);
 	filp = fopen(path1, "r");
-	if (!filp) {
-		rc = -1;
-		return rc;
-	}
+	if (!filp)
+		return -1;
 	/*
 	 * the uevent file contains an entry like this:
 	 * PHYSDEVPATH=/devices/css0/0.0.206a/0.0.7e78
@@ -77,16 +74,16 @@ int get_ccw_devno_old_sysfs(char *device, char *devno)
 		if (match != NULL)
 			break;
 	}
+	fclose(filp);
+	if (!match)
+		return -1;
 	s1 =  strchr(buf, '/');
 	s2 =  strrchr(buf, '/');
-	len = s2-s1;
-	strncpy(devno, s2 + 1, sizeof(devno));
-	devno[len] = '\0';
-	fclose(filp);
+	strncpy(devno, s2 + 1, sizeof(devno) - 1);
 	return 0;
 }
 
-int get_ccw_devno_new_sysfs(char *device, char *devno)
+int get_ccw_devno_new_sysfs(char *device)
 {
 	int len, errorpath, rc;
 	char path2[4096];
@@ -119,8 +116,7 @@ int get_ccw_devno_new_sysfs(char *device, char *devno)
 			return rc;
 		}
 	}
-	strncpy(devno, s2 + 1, sizeof(devno));
-	devno[len] = '\0';
+	strncpy(devno, s2 + 1, sizeof(devno) - 1);
 	return 0;
 }
 
@@ -134,16 +130,14 @@ int get_ccw_devno_new_sysfs(char *device, char *devno)
  *
  * This does not work when booting from tape
  */
-int get_ccw_devno(char *device, char *devno)
+int get_ccw_devno(char *device)
 {
-    if (get_ccw_devno_old_sysfs(device, devno) != 0) {
-	if (get_ccw_devno_new_sysfs(device, devno) != 0) {
-		fprintf(stderr, "%s: Failed to lookup the device number\n",
-			name);
-		return -1;
-	}
-    }
-    return 0;
+	if (get_ccw_devno_old_sysfs(device) == 0)
+		return 0;
+	if (get_ccw_devno_new_sysfs(device) == 0)
+		return 0;
+	fprintf(stderr, "%s: Failed to lookup the device number\n", name);
+	return -1;
 }
 
 int get_ccw_dev(char *partition, char *device)
diff --git a/ipl_tools/chreipl.h b/ipl_tools/chreipl.h
index 19a83eb..37807a7 100644
--- a/ipl_tools/chreipl.h
+++ b/ipl_tools/chreipl.h
@@ -34,6 +34,9 @@ extern char saction[8];
 extern char name[256];
 extern int action;
 
+#define IPL_TYPE_LEN_MAX	100
+#define NSS_NAME_LEN_MAX	8
+
 #define ACT_CCW		1
 #define ACT_FCP		2
 #define ACT_NODE	3
@@ -63,10 +66,10 @@ int is_valid_case(char *c);
 int is_valid_action(char *action);
 void parse_shutdown_options(int argc, char **argv);
 void strlow(char *s);
-int get_ccw_devno(char *device, char *devno);
-int get_reipl_type(void);
+int get_ccw_devno(char *device);
+int get_reipl_type(char *reipltype);
 void parse_lsreipl_options(int argc, char **argv);
-int get_ipl_type();
+int get_ipl_type(char *reipltype);
 int get_ipl_loadparam(void);
 void print_ipl_settings(void);
 int get_sa(char *action, char *file);
diff --git a/ipl_tools/fcp.c b/ipl_tools/fcp.c
index 86fa95b..7a8b4c5 100644
--- a/ipl_tools/fcp.c
+++ b/ipl_tools/fcp.c
@@ -33,12 +33,11 @@
 
 /*
  * return the current reipl type from /sys/firmware/reipl/reipl_type
- * 0 = fcp, 1 = ccw, -1, error
+ * 0 = fcp, 1 = ccw, 2 = nss, -1 = unknown
  */
-int get_reipl_type(void)
+int get_reipl_type(char *reipltype)
 {
 	FILE *filp;
-	char reipltype[4];
 	char path[4096];
 	int rc;
 
@@ -49,7 +48,7 @@ int get_reipl_type(void)
 			fprintf(stderr,	"%s: Can not open /sys/firmware/"
 				"reipl/reipl_type: ", name);
 			fprintf(stderr, "%s\n", strerror(errno));
-			return -1;
+			exit(1);
 		}
 		rc = fscanf(filp, "%s", reipltype);
 		fclose(filp);
@@ -57,17 +56,19 @@ int get_reipl_type(void)
 			fprintf(stderr, "%s: Failed to read "
 				"/sys/firmware/reipl/reipl_type:", name);
 			fprintf(stderr, "%s\n", strerror(errno));
-			return -1;
+			exit(1);
 		}
 		if (strncmp(reipltype, "fcp", strlen("fcp")) == 0)
 			return T_FCP;
 		else if (strncmp(reipltype, "ccw", strlen("ccw")) == 0)
 			return T_CCW;
-		/* TODO: add NSS support */
+		else if (strncmp(reipltype, "nss", strlen("nss")) == 0)
+			return T_NSS;
 	} else {
 		fprintf(stderr, "%s: Can not open /sys/firmware/reipl/"
 			"reipl_type:", name);
 		fprintf(stderr, " %s\n", strerror(errno));
+		exit(1);
 	}
 	return -1;
 }
diff --git a/ipl_tools/ipl.c b/ipl_tools/ipl.c
index 2bf817a..8cca700 100644
--- a/ipl_tools/ipl.c
+++ b/ipl_tools/ipl.c
@@ -33,12 +33,11 @@
 
 /*
  * return the ipl type based on /sys/firmware/ipl/ipl_type
- * returns 0 in case of fcp and 1 in case of ccw, -1 otherwise
+ * returns 0 in case of fcp and 1 in case of ccw, 2 for nss and -1 otherwise
  */
-int get_ipl_type()
+int get_ipl_type(char *reipltype)
 {
 	FILE *filp;
-	char reipltype[4];
 	char path[4096];
 	int rc;
 
@@ -49,7 +48,7 @@ int get_ipl_type()
 			fprintf(stderr,	"%s: Can not open /sys/firmware/ipl/"
 				"ipl_type: ", name);
 			fprintf(stderr, "%s\n", strerror(errno));
-			return -1;
+			exit(1);
 		}
 		rc = fscanf(filp, "%s", reipltype);
 		fclose(filp);
@@ -57,12 +56,14 @@ int get_ipl_type()
 			fprintf(stderr, "%s: Failed to read "
 				"/sys/firmware/ipl/ipl_type: ", name);
 			fprintf(stderr, "%s\n", strerror(errno));
-			return -1;
+			exit(1);
 		}
 		if (strncmp(reipltype, "fcp", strlen("fcp")) == 0)
 			return T_FCP;
 		else if (strncmp(reipltype, "ccw", strlen("ccw")) == 0)
 			return T_CCW;
+		else if (strncmp(reipltype, "nss", strlen("nss")) == 0)
+			return T_NSS;
 	} else {
 		fprintf(stderr, "%s: Can not open /sys/firmware/ipl/"
 			"ipl_type:", name);
@@ -111,30 +112,38 @@ int get_ipl_loadparam(void)
 void print_ipl_settings(void)
 {
 	int rc, type;
-	char bootprog[1024], lba[1024];
+	char bootprog[1024], lba[1024], nss_name[NSS_NAME_LEN_MAX + 1];
+	char reipltype[IPL_TYPE_LEN_MAX + 1];
 
-	type = get_ipl_type();
-	/*
-	 * TODO: add nss support
-	 */
-	if (type == 1)
+	type = get_ipl_type(reipltype);
+	switch (type) {
+	case T_NSS:
+		printf("IPL type:      nss\n");
+		rc = strrd(nss_name, "/sys/firmware/ipl/name");
+		if (rc != 0)
+			exit(1);
+		printf("Name:          %s\n", nss_name);
+		break;
+	case T_CCW:
 		printf("IPL type:      ccw\n");
-	if (type == 0)
-		printf("IPL type:      fcp\n");
-	rc = strrd(devno, "/sys/firmware/ipl/device");
-	if (rc != 0)
-		exit(1) /* the error msg comes from get_ipl_device */;
-	if (strlen(devno) > 0)
-		printf("Device:        %s\n", devno);
-	if (type == 1) {
+		rc = strrd(devno, "/sys/firmware/ipl/device");
+		if (rc != 0)
+			exit(1);
+		if (strlen(devno) > 0)
+			printf("Device:        %s\n", devno);
 		rc = get_ipl_loadparam();
 		if (rc != -1)
 			printf("Loadparm:      %d\n", rc);
 		else
 			printf("Loadparm:      \n");
-	}
-	if (type == 0) {
-		/* these settings are only available for fcp */
+		break;
+	case T_FCP:
+		printf("IPL type:      fcp\n");
+		rc = strrd(devno, "/sys/firmware/ipl/device");
+		if (rc != 0)
+			exit(1);
+		if (strlen(devno) > 0)
+			printf("Device:        %s\n", devno);
 		rc = strrd(wwpn, "/sys/firmware/reipl/fcp/wwpn");
 		if (rc != -1 && strlen(wwpn) > 0)
 			printf("WWPN:          %s\n", wwpn);
@@ -147,6 +156,10 @@ void print_ipl_settings(void)
 		rc = strrd(lba, "/sys/firmware/ipl/br_lba");
 		if (rc != -1 &&  strlen(lba) > 0)
 			printf("br_lba:        %s\n", lba);
+		break;
+	default:
+		printf("IPL type:      %s (unknown)\n", reipltype);
+		break;
 	}
 	exit(0);
 }
diff --git a/ipl_tools/main.c b/ipl_tools/main.c
index 2eaa043..bcebabe 100644
--- a/ipl_tools/main.c
+++ b/ipl_tools/main.c
@@ -57,13 +57,22 @@ int action;		/* either CCW, FCP or NODE */
 int lsreipl(int argc, char *argv[])
 {
 	int rc;
-	char bootprog[1024], lba[1024], val[9];
+	char bootprog[1024], lba[1024], val[9], reipltype[IPL_TYPE_LEN_MAX + 1];
+	char nss_name[NSS_NAME_LEN_MAX + 1];
 
 	/* parse the command line options in getop.c */
 	parse_lsreipl_options(argc, argv);
 
-	rc = get_reipl_type();
-	if (rc == 0) {
+	rc = get_reipl_type(reipltype);
+	switch (rc) {
+	case T_NSS:
+		printf("Re-IPL type:   nss\n");
+		rc = strrd(nss_name, "/sys/firmware/reipl/nss/name");
+		if (rc != 0)
+			exit(1);
+		printf("Name:          %s\n", nss_name);
+		break;
+	case T_FCP:
 		printf("Re-IPL type: fcp\n");
 		rc = strrd(wwpn, "/sys/firmware/reipl/fcp/wwpn");
 		if (rc != 0)
@@ -90,8 +99,8 @@ int lsreipl(int argc, char *argv[])
 			printf("bootprog:    %s\n", bootprog);
 		if (strlen(lba) > 0)
 			printf("br_lba:      %s\n", lba);
-	}
-	if (rc == 1) {
+		break;
+	case T_CCW:
 		printf("Re-IPL type:   ccw\n");
 		rc = strrd(devno, "/sys/firmware/reipl/ccw/device");
 		if (rc != 0)
@@ -106,6 +115,10 @@ int lsreipl(int argc, char *argv[])
 			printf("Loadparm:      %s\n", val);
 		else
 			printf("Loadparm:      \n");
+		break;
+	default:
+		printf("Re-IPL type: %s (unknown)\n", reipltype);
+		break;
 	}
 	return 0;
 }
@@ -134,7 +147,7 @@ int reipl(int argc, char *argv[])
 					"partition: %s\n", name, partition);
 				exit(1);
 			}
-			rc = get_ccw_devno(device, devno);
+			rc = get_ccw_devno(device);
 			if (rc != 0)  {
 				fprintf(stderr, "%s: Unable to lookup device"
 					" number for device %s\n", name,
diff --git a/ipl_tools/system.c b/ipl_tools/system.c
index fd5b76b..ca6c5af 100644
--- a/ipl_tools/system.c
+++ b/ipl_tools/system.c
@@ -174,7 +174,7 @@ int strrd(char *string, char *file)
 			fprintf(stderr, "%s\n", strerror(errno));
 			exit(1);
 		}
-		rc = fread(string, 4096, 1, filp);
+		rc = fread(string, 1, 4096, filp);
 		fclose(filp);
 		/*
 		 *  special handling is required for
@@ -193,6 +193,7 @@ int strrd(char *string, char *file)
 			fprintf(stderr, "%s\n", strerror(errno));
 			return -1;
 		} else {
+			string[rc] = 0;
 			if (string[strlen(string) - 1] == '\n')
 				string[strlen(string) - 1] = 0;
 			return 0;
-- 
1.6.3.3


0017-qualified-return-codes-and-further-error-handling-in.patch:
 znetconf   |  324 +++++++++++++++++++++++++++++++++++--------------------------
 znetconf.8 |  220 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 375 insertions(+), 169 deletions(-)

--- NEW FILE 0017-qualified-return-codes-and-further-error-handling-in.patch ---
>From 4725dd1a67185ab4296674fcd3b2cf17f2b1cf21 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 17 Dec 2009 17:08:22 +0100
Subject: [PATCH] qualified return codes and further error handling in znetconf

Description: znetconf: qualified return codes and further error handling
Symptom:     always returned 1 in case errors
Problem:     wrapper tools not able to generate qualified error msgs
Solution:    return codes
---
 zconf/znetconf   |  324 ++++++++++++++++++++++++++++++++----------------------
 zconf/znetconf.8 |  219 +++++++++++++++++++++++++++++++------
 2 files changed, 375 insertions(+), 168 deletions(-)

diff --git a/zconf/znetconf b/zconf/znetconf
index 4edf6fb..873124a 100755
--- a/zconf/znetconf
+++ b/zconf/znetconf
@@ -2,14 +2,58 @@
 #
 # znetconf - list and configure network devices
 #
-# Tool for the automatic and semi-automatic configuration of network devices 
+# Tool for the automatic and semi-automatic configuration of network devices
 # from ccw devices, including network device option handling and network
 # device removal.
 #
-# Copyright IBM Corp. 2009 
+# Copyright IBM Corp. 2009
 # Author(s): Einar Lueck <elelueck at de.ibm.com>
 #            Steffen Maier <maier at de.ibm.com>
 #
+# 9 Could not group devices
+readonly RC_COULD_NOT_GROUP_DEVICES=9
+# 10 Could not set device online
+readonly RC_COULD_NOT_SET_DEV_ONLINE=10
+# 11 Could not set device offline
+readonly RC_COULD_NOT_SET_DEV_OFFLINE=11
+# 12 Invalid attribute value pair
+readonly RC_INVALID_ATTRIBUTE_VALUE_PAIR=12
+# 13 Missing component (broken installation)
+readonly RC_BROKEN_INSTALLATION=13
+# 14 Missing device ID
+readonly RC_MISSING_DEVICE_ID=14
+# 15 Invalid device ID format
+readonly RC_INVALID_DEVICE_ID_FORMAT=15
+# 16 Driver name expected
+readonly RC_DRIVER_NAME_EXPECTED=16
+# 17 Unknown driver
+readonly RC_UNKNOWN_DRIVER=17
+# 18 Missing attribute value pair for -o|--option
+readonly RC_MISSING_ATTRIBUTE_VALUE_PAIR=18
+# 19 Invalid argument
+readonly RC_INVALID_ARGUMENT=19
+# 20 Too much arguments
+readonly RC_TOO_MUCH_ARGUMENTS=20
+# 21 No configuration found for device ID
+readonly RC_NO_CONFIG_FOUND_FOR_DEV=21
+# 22 Device is not configured
+readonly RC_DEVICE_NOT_CONFIGURED=22
+# 23 Could not ungroup device
+readonly RC_COULD_NOT_UNGROUP_DEVICE=23
+# 24 At least one option could not be configured
+readonly RC_OPTION_NOT_CONFIGURED=24
+# 25 Missing value for attribute
+readonly RC_MISSING_VALUE=25
+# 26 Device does not exist
+readonly RC_DEVICE_DOES_NOT_EXIST=26
+# 27 Device already in use
+readonly RC_DEVICE_ALREADY_IN_USE=27
+# 28 Net device did not come online
+readonly RC_NET_DEVICE_NOT_ONLINE=28
+# 29 Some devices could not be added or failed
+readonly RC_SOME_DEVICES_FAILED=29
+# 99 internal error, this should never happen
+readonly RC_INTERNAL_ERROR=99
 
 #==============================================================================
 # constants
@@ -29,6 +73,7 @@ else
 fi
 SYSFSDIR=$(cat /proc/mounts|awk '$3=="sysfs"{print $2; exit}')
 CCWGROUPBUS_DIR=$SYSFSDIR/bus/ccwgroup
+CCWDEV_DIR=$SYSFSDIR/bus/ccw/devices
 CCWGROUPBUS_DEVICEDIR=$CCWGROUPBUS_DIR/devices
 CCWGROUPBUS_DRIVERDIR=$CCWGROUPBUS_DIR/drivers
 DEVNOSEP=","
@@ -290,15 +335,14 @@ function lookup_layer()
 #==============================================================================
 
 #
-# group_device 
+# group_device
 # 	$1: ccwdevid[;ccwdevid][;ccwdevid]
 #	$2: ccwgroupdevid
 #	$3: driver
-# returns 
+# returns
 #	0 success
-#	1 group file not found
-#	2 grouping failed
-# 
+#	RC_COULD_NOT_GROUP_DEVICES
+#
 function group_device()
 {
 	local DEVICES=$1
@@ -307,13 +351,13 @@ function group_device()
 	local GROUPFILE=$CCWGROUPBUS_DRIVERDIR/$DRIVER/group
 	local CTCMGROUPFILE=$CCWGROUPBUS_DRIVERDIR/ctcm/group
 	local CTCGROUPFILE=$CCWGROUPBUS_DRIVERDIR/ctc/group
-	
+
 	# check if group file exists
-	if [ ! -e $GROUPFILE ] 
+	if [ ! -e $GROUPFILE ]
 	then
 		# try to load driver
 		if ! modprobe $DRIVER &> /dev/null
-		then 
+		then
 			if [ $DRIVER = "ctc" ]
 			then
 				# check if ctcm driver exists
@@ -329,7 +373,7 @@ function group_device()
 					GROUPFILE=$CTCGROUPFILE
 				fi
 			fi
-		fi 
+		fi
 	fi
 	if [ -e $GROUPFILE ]
 	then
@@ -340,13 +384,13 @@ function group_device()
 			*)
 				print_error "Could not group devices" \
 					"$DEVICES"
-				return 2
+				return $RC_COULD_NOT_GROUP_DEVICES
 				;;
 		esac
 	else
 		print_error "$GROUPFILE does not exist"
-			
-		return 1
+
+		return $RC_COULD_NOT_GROUP_DEVICES
 	fi
 	return 0
 }
@@ -354,14 +398,13 @@ function group_device()
 #==============================================================================
 
 #
-# ungroup_device 
+# ungroup_device
 #	$1: ccwgroupdevid
 #	$2: network device name (just for display purposes)
-# returns 
+# returns
 #	0 success
-#	1 group file not found
-#	2 ungrouping failed
-# 
+#	RC_COULD_NOT_UNGROUP_DEVICE
+#
 function ungroup_device()
 {
 	local TARGET_DEVID="$1"
@@ -378,12 +421,12 @@ function ungroup_device()
 				;;
 			*)
 				print_error "Failed to ungroup $TARGET_DEVID"
-				return 2
+				return $RC_COULD_NOT_UNGROUP_DEVICE
 				;;
 		esac
 	else
 		print_error "$DEVICE_UNGROUPFILE does not exist."
-		return 1
+		return $RC_COULD_NOT_UNGROUP_DEVICE
 	fi
 	return 0
 }
@@ -393,12 +436,12 @@ function ungroup_device()
 #
 # try_read_netdevname
 # 	$1: ccwgroupdevno
-# returns 
+# returns
 #	0 success
 #	1 failed. giving up after retries
 # stdout
 #	in case of success: device name
-# 
+#
 function try_read_netdevname()
 {
 	local CCWGROUPDEVNO="$1"
@@ -406,7 +449,7 @@ function try_read_netdevname()
 	local NET_SUBDIR="$CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/net/"
 	local IF_NAME=""
 	local rc=1
-		
+
 	# check if interface file containing the name exists
 	if [ -e "$IF_NAME_FILE" ]
 	then
@@ -417,7 +460,7 @@ function try_read_netdevname()
 		IF_NAME=$(ls $NET_SUBDIR)
 	else
 		# if the file does not exist
-		local LINKNAME=$(find $CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/ -type l -name net*) 
+		local LINKNAME=$(find $CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/ -type l -name net*)
 		if [[ ! -z $LINKNAME ]]
 		then
 			IF_NAME=$(readlink $LINKNAME)
@@ -434,10 +477,10 @@ function try_read_netdevname()
 #
 # wait_for_net_device
 # 	$1: ccwgroupdevno
-# returns 
+# returns
 #	0 success
 #	1 failed. giving up after retries
-# 
+#
 function wait_for_net_device()
 {
 	local CCWGROUPDEVNO="$1"
@@ -447,7 +490,7 @@ function wait_for_net_device()
 	local IF_NAME=""
 	local CMD_FINDNETLINK="find $CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/ -type l -name net*"
 	local LINKNAME=""
-		
+
 	# polling loop to wait for net device to become available
 	if [ -e $UDEVSETTLE ]
 	then
@@ -460,7 +503,7 @@ function wait_for_net_device()
 	fi
 	while [[ -z "$IF_NAME" ]] && [[ retries -lt MAX_RETRIES ]]
 	do
-		sleep 1 
+		sleep 1
 		retries=$retries+1
 		IF_NAME=$(try_read_netdevname $CCWGROUPDEVNO)
 	done
@@ -468,8 +511,8 @@ function wait_for_net_device()
 	then
 		echo "Successfully configured device $CCWGROUPDEVNO ($IF_NAME)"
 	else
-		print_error "Failed to make $CCWGROUPDEVNO online." 
-		return 1	
+		print_error "Failed to make $CCWGROUPDEVNO online."
+		return 1
 	fi
 }
 
@@ -479,11 +522,11 @@ function wait_for_net_device()
 # switch_device
 # 	$1: ccwgroupdevno
 #	$2: 1|0 (online|offline)
-# returns 
+# returns
 #	0 success
 #	1 command to make device online/offline returned error
 #	2 online file does not exist
-# 
+#
 function switch_device()
 {
 	local CCWGROUPDEVNO="$1"
@@ -491,7 +534,7 @@ function switch_device()
 	local DEVICE_DIRECTORY="$CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO"
 	local ONLINE_FILE="$DEVICE_DIRECTORY/online"
 	local STATESTR="online"
-	
+
 	if [ $SWITCHVALUE -eq 0 ]
 	then
 		STATESTR="offline"
@@ -513,7 +556,7 @@ function switch_device()
 		print_error "$ONLINE_FILE does not exist."
 		return 2
 	fi
-	
+
 	return 0
 }
 
@@ -524,12 +567,12 @@ function switch_device()
 #	$1: ccwgroupdevid
 #	$2: option_name
 #	$3: option_value
-# returns 
+# returns
 #	0 success
 # 	1 option not allowed to be set (e.g. online)
 #	2 unknown option
 #	3 configuration failed
-# 
+#
 function configure_ccwgroupdev_option()
 {
 	local CCWGROUPDEVID="$1"
@@ -539,10 +582,10 @@ function configure_ccwgroupdev_option()
 	# filter some attributes away
 	if [ "$OPTION_NAME" == "online" ]
 	then
-		print_error "Ignoring option $OPTION_NAME=$OPTION_VALUE" 
+		print_error "Ignoring option $OPTION_NAME=$OPTION_VALUE"
 		return 1
 	fi
-	
+
 	# check if attribute exists
 	local ATTRFILE="$CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVID/$OPTION_NAME"
 	if [ -f $ATTRFILE ]
@@ -574,13 +617,13 @@ function configure_ccwgroupdev_option()
 #	$4: opt_count
 #	$5..$(5+opt_count): opt_name_array
 #	$5+opt_count..5+2*opt_count: opt_value_array
-# returns 
+# returns
 #	0 success
-#	1 grouping failed
-#	2 failed to make device online 
-#	3 net device did not become available
-#	4 device online but some option could not be set
-# 
+#	RC_COULD_NOT_GROUP_DEVICES
+#	RC_COULD_NOT_SET_DEV_ONLINE
+#	RC_NET_DEVICE_NOT_ONLINE
+#	RC_OPTION_NOT_CONFIGURED
+#
 function add_net_device()
 {
 	local DEVICES="$1"
@@ -591,10 +634,9 @@ function add_net_device()
 	local OPT_NAME_ARRAY=("${RAW[@]:4:$OPT_COUNT}")
 	local OPT_VALUE_ARRAY=("${RAW[@]:$[4 + $OPT_COUNT]:$OPT_COUNT}")
 
-	group_device $DEVICES $CCWGROUPDEVID $DRIVER
-	if [ $? -ne 0 ]
+	if ! group_device $DEVICES $CCWGROUPDEVID $DRIVER
 	then
-		return 1
+		return $?
 	fi
 
 	local i=0
@@ -602,9 +644,8 @@ function add_net_device()
 	local HAS_LAYER2_OPTION=0
 	while [ $i -lt $OPT_COUNT ]
 	do
-		configure_ccwgroupdev_option $CCWGROUPDEVID \
+		if ! configure_ccwgroupdev_option $CCWGROUPDEVID \
 			 ${OPT_NAME_ARRAY[$i]} ${OPT_VALUE_ARRAY[$i]}
-		if [ $? -ne 0 ]
 		then
 			SOMEOPTION_FAILED=1
 		fi
@@ -628,22 +669,20 @@ function add_net_device()
 				"layer2" "$LAYER2"
 		fi
 	fi
- 
-	switch_device $CCWGROUPDEVNO 1
-	if [ $? -ne 0 ]
+
+	if ! switch_device $CCWGROUPDEVNO 1
 	then
-		return 2
+		return $RC_COULD_NOT_SET_DEV_ONLINE
 	fi
 
-	wait_for_net_device $CCWGROUPDEVNO
-	if [ $? -ne 0 ]
+	if ! wait_for_net_device $CCWGROUPDEVNO
 	then
-		return 3
+		return $RC_NET_DEVICE_NOT_ONLINE
 	fi
 
 	if [ $SOMEOPTION_FAILED -ne 0 ]
 	then
-		return 4
+		return $RC_OPTION_NOT_CONFIGURED
 	fi
 
 	return 0
@@ -655,26 +694,24 @@ function add_net_device()
 # remove_net_device
 #	$1: ccwgroupdevid
 #	$2: network interface name (just for display purposes)
-# returns 
+# returns
 #	0 success
-#	1 making device offline failed
-#	2 ungrouping device failed
-# 
+#	RC_COULD_NOT_SET_DEV_OFFLINE
+#	RC_COULD_NOT_UNGROUP_DEVICE
+#
 function remove_net_device()
 {
 	local DEVICE_TO_REMOVE="$1"
 	local DEVNAME="$2"
 
-	switch_device $DEVICE_TO_REMOVE 0
-	if [ $? -ne 0 ]
+	if ! switch_device $DEVICE_TO_REMOVE 0
 	then
-		return 1
+		return $RC_COULD_NOT_SET_DEV_OFFLINE
 	fi
 
-	ungroup_device $DEVICE_TO_REMOVE $DEVNAME
-	if [ $? -ne 0 ]
+	if ! ungroup_device $DEVICE_TO_REMOVE $DEVNAME
 	then
-		return 2
+		return $RC_COULD_NOT_UNGROUP_DEVICE
 	fi
 	return 0
 }
@@ -684,9 +721,9 @@ function remove_net_device()
 #
 # list_configured
 #	$1 supress_header
-# returns 
+# returns
 #	0 success
-# 
+#
 function list_configured()
 {
 	supress_header=0
@@ -723,11 +760,11 @@ function list_configured()
 
 		# read all links and parse driver, device name and ccw device
 		# bus-ids
-		ls -l $d/ | grep '^l' | 
-		{ 
+		ls -l $d/ | grep '^l' |
+		{
 
-			while read line 
-			do	
+			while read line
+			do
 				local LINKNAME=${line// ->*/""}
 				LINKNAME=${LINKNAME##* }
 				if [ "$LINKNAME" = "driver" ]
@@ -742,14 +779,14 @@ function list_configured()
 				then
 					DEVNAME=${line##* -> */}
 				fi
-			done 
+			done
 
 			local CUTYPE=""
 			if [ -e $d/cdev0/cutype ]
 			then
 				read CUTYPE < $d/cdev0/cutype
 			fi
-			
+
 			read ONLINE < $d/online
 			if [ $ONLINE -eq 1 ]
 			then
@@ -795,15 +832,15 @@ function print_list_unconf_header()
 
 #
 # list_unconfigured
-# returns 
+# returns
 #	0 success
-# 
+#
 function list_unconfigured()
 {
 	local PRINTED_HEADLINES=0
 	local LIST_FORMATSTR="%-26.26s %-7.7s %-14.14s %5.5s %-4.4s \n"
 	print_scanning_4_nwdevices
-	
+
 	$LSZNET_CALL |
 	{
 		while read no cutype chp devtype devdrv devname chlist cardtype
@@ -824,29 +861,29 @@ function list_unconfigured()
 #
 # store_option
 #	$1: attribute=value
-# returns 
+# returns
 #	0 success
 #	1 attribute starts with a - / or is invalid
 #	2 missing value
-# 
+#
 function store_option()
 {
 	local OPTIONSTRING="$1"
 
 	# ensure that there is no option intepreted as an
-	# attribute value pair 
+	# attribute value pair
 	[[ "$OPTIONSTRING" =~ ^- ]]
 	case $? in
 		0)
 			print_error "$OPTIONSTRING is not a valid attribute" \
-				"value pair" 
+				"value pair"
 			exit 1
 			;;
 		1)
 			# option considered ok
 			;;
 		2)
-			print_error "Internal error" 
+			print_error "Internal error"
 			exit 1
 	esac
 
@@ -874,17 +911,17 @@ function store_option()
 #
 # is_complete_ccwdevbusid
 #	$1: possibly correct ccw device bus id
-# returns 
+# returns
 #	0 if the given string is a correctly formatted ccw device bus id
 #	1 else
-# 
+#
 function is_complete_ccwdevbusid()
 {
 	local DEV="$1"
 	[[ "$DEV" =~ $FORMAT_FULLDEVNO ]]
-	case $? in 
+	case $? in
 		0)
-			return 0 
+			return 0
 			;;
 		1)
 			return 1
@@ -902,41 +939,41 @@ function is_complete_ccwdevbusid()
 #
 # is_partial_ccwdevbusid
 #	$1: possibly correct partial ccw device bus id
-# returns 
+# returns
 #	0 if the given string is a correctly formatted partial ccw device
 #	  bus id
 #	1 else
-# 
+#
 function is_partial_ccwdevbusid()
 {
 	local DEV="$1"
 	[[ "$DEV" =~ $FORMAT_PARTDEVNO ]]
 	case $? in
 		0)
-			return 0	
+			return 0
 			;;
 		1)
-			return 1 
+			return 1
 			;;
 		2)
 			print_error "Internal error"
 			exit 1
 			;;
 	esac
-}	
+}
 
 #==============================================================================
 
 #
 # is_ccwdevbusid_list
 #	$1: possibly correct list of ccw device bus ids
-# returns 
+# returns
 #	0 if the given string is a correctly formatted list of ccw device
 # 	  bus ids
 #	1 else
-# 
+#
 function is_ccwdevbusid_list()
-{ 
+{
 	local DEVLIST="$1"
 	[[ "$DEVLIST" =~ $FORMAT_DEVLIST ]]
 	case $? in
@@ -959,13 +996,13 @@ function is_ccwdevbusid_list()
 #
 # is_shortccwdevbusid_list
 #	$1: possibly correct list of short ccw device bus ids
-# returns 
+# returns
 #	0 if the given string is a correctly formatted list of short ccw device
 # 	  bus ids
 #	1 else
-# 
+#
 function is_shortccwdevbusid_list()
-{ 
+{
 	local DEVLIST="$1"
 	[[ "$DEVLIST" =~ $FORMAT_SHORTDEVLIST ]]
 	case $? in
@@ -987,14 +1024,14 @@ function is_shortccwdevbusid_list()
 #
 # is_supported_driver
 #	$1: possibly supported driver
-# returns 
-#	0 if the given string denotes a supported driver 
+# returns
+#	0 if the given string denotes a supported driver
 #	1 else
-# 
+#
 function is_supported_driver()
 {
 	local DRIVER="$1"
-	[[ "$DRIVER" =~ "^(qeth|lcs|ctc|ctcm)$" ]] 
+	[[ "$DRIVER" =~ "^(qeth|lcs|ctc|ctcm)$" ]]
 	case $? in
 		0)
 			return 0
@@ -1081,7 +1118,7 @@ DEVICE_TO_REMOVE=""
 DO_REMOVEALL=0
 NONINTERACTIVE=0
 EXCEPT=""
-if [ $# -gt 0 ] 
+if [ $# -gt 0 ]
 then
 	while [ $# -gt 0 ]
 	do
@@ -1092,7 +1129,7 @@ then
 				;;
 			-v|--version)
 				print_version
-				exit 0	
+				exit 0
 				;;
 			-A|--add-all)
 				DO_ADDALL=1
@@ -1103,15 +1140,15 @@ then
 				if [ $# -lt 1 ]
 				then
 					print_error "Device ID expected"
-					exit 1
+					exit $RC_MISSING_DEVICE_ID
 				fi
 
-				# get parameter expected to be a 
-				# ccw device bus id 
+				# get parameter expected to be a
+				# ccw device bus id
 				DEVICE_TO_ADD="$1"
 				shift
 
-				# check syntax of ccw device bus id 
+				# check syntax of ccw device bus id
 				if is_complete_ccwdevbusid "$DEVICE_TO_ADD" ||
 					is_ccwdevbusid_list "$DEVICE_TO_ADD"
 				then
@@ -1127,9 +1164,9 @@ then
 					DO_ADD=1
 				else
 					print_error "Invalid device ID format" \
-						"$DEVICE_TO_ADD" 
-						
-					exit 1
+						"$DEVICE_TO_ADD"
+
+					exit $RC_INVALID_DEVICE_ID_FORMAT
 				fi
 
 				;;
@@ -1142,18 +1179,18 @@ then
 				if [ $# -lt 1 ]
 				then
 					print_error "Driver name expected"
-					exit 1
+					exit $RC_DRIVER_NAME_EXPECTED
 				fi
 
 				# ensure driver is supported
 				DRIVER="$1"
 				shift
 				if [ "$DRIVER" != "" ] && \
-					! is_supported_driver "$DRIVER" 
+					! is_supported_driver "$DRIVER"
 				then
 					# unknown driver
 					print_error "Unknown driver $DRIVER"
-					exit 1
+					exit $RC_UNKNOWN_DRIVER
 				fi
 				;;
 			-o|--option)
@@ -1164,7 +1201,7 @@ then
 					print_error "Missing attrtibute" \
 						"value pair for -o|--" \
 						"option"
-					exit 1
+					exit $RC_MISSING_ATTRIBUTE_VALUE_PAIR
 				fi
 
 				# get option string
@@ -1174,26 +1211,26 @@ then
 				# store option
 				if ! store_option $OPTIONSTRING
 				then
-					exit $?
+					exit $RC_INVALID_ATTRIBUTE_VALUE_PAIR
 				fi
 				;;
 			-r|--remove)
 				DO_REMOVE=1
 				shift
-		
+
 				# ensure there is a further parameter
 				if [ $# -lt 1 ]
 				then
 					print_error "Expecting <device_bus_id>"\
 						"of device to be removed"
-					exit 1
+					exit $RC_MISSING_ATTRIBUTE_VALUE_PAIR
 				fi
 
 				# get device to be removed
 				DEVICE_TO_REMOVE="$1"
 				shift
-				
-				# validate it is a 
+
+				# validate it is a
 				# ccw dev bus id (short or long)
 				if is_partial_ccwdevbusid "$DEVICE_TO_REMOVE"
 				then
@@ -1203,7 +1240,7 @@ then
 				then
 					print_error "Invalid device ID format" \
 						"$DEVICE_TO_REMOVE"
-					exit 1
+					exit $RC_INVALID_DEVICE_ID_FORMAT
 				fi
 				;;
 			-R|--remove-all)
@@ -1219,7 +1256,7 @@ then
 				then
 					print_error "<device_bus_id> missing"\
 						"for -e|--except"
-					exit 1
+					exit $RC_MISSING_DEVICE_ID
 				fi
 
 				# get device to be removed
@@ -1236,7 +1273,7 @@ then
 				then
 					print_error "Invalid device ID format" \
 						"$EXCEPT_DEVNO"
-					exit 1
+					exit $RC_INVALID_DEVICE_ID_FORMAT
 				fi
 
 				# create a filter statement
@@ -1258,7 +1295,7 @@ then
 			*)
 				echo "$CMD: Invalid option $1"
 				echo "Try '$CMD --help' for more information."
-				exit 1
+				exit $RC_INVALID_ARGUMENT
 				;;
 		esac
 	done
@@ -1271,7 +1308,7 @@ if [ $(($DO_ADD + $DO_ADDALL + $DO_LIST_UNCONFIGURED + $DO_LIST_CONFIGURED + \
 then
 	print_error "Too much arguments"
 	echo "Try '$CMD --help' for more information."
-	exit 1
+	exit $RC_TOO_MUCH_ARGUMENTS
 fi
 
 # react to parsed options
@@ -1290,12 +1327,31 @@ then
 		then
 			print_error "No configuration found for device ID" \
 				"$DEVICE_TO_ADD"
-			exit 1
+			exit $RC_NO_CONFIG_FOUND_FOR_DEV
 		fi
 	else
-		# define set of device numbers to be used		
+		# define set of device numbers to be used
 		DEVICES="$DEVICE_TO_ADD"
-		
+
+		# ensure none of the CCW devices is already in use
+		CCW_DEVS=${DEVICES//,/ }
+		for CCW_DEVNO in $CCW_DEVS
+		do
+			CCW_DEV_ONLINEFILE="$CCWDEV_DIR/$CCW_DEVNO/online"
+			if [ ! -e  $CCW_DEV_ONLINEFILE ]
+			then
+				print_error "Device $CCW_DEVNO does not exist"
+				exit $RC_DEVICE_DOES_NOT_EXIST
+			fi
+
+			read CCW_DEV_ONLINE < $CCW_DEV_ONLINEFILE
+			if [ "$CCW_DEV_ONLINE" == "1" ]
+			then
+				print_error "$CCW_DEVNO is already in use"
+				exit $RC_DEVICE_ALREADY_IN_USE
+			fi
+		done
+
 		# try to find a driver for the given set of device numbers
 		CANDIDATE=$($LSZNET_CALL|
 			awk "\$7~/${DEVICE_TO_ADD//,// && \$7~/}/ {print \$5}")
@@ -1305,7 +1361,7 @@ then
 	# compute the expected group device number
 	CCWGROUPDEVNO=${DEVICES%%,*}
 
-	# check whether an appropriate driver was determined automatically or 
+	# check whether an appropriate driver was determined automatically or
 	# not, if not, one has to be given by the user via -d
 	if [ "$DRIVER" == "" ]
 	then
@@ -1345,7 +1401,7 @@ then
 				$ATTRIBUTE_COUNT "${ATTRIBUTE_NAME[@]}" \
 				"${ATTRIBUTE_VALUE[@]}"
 			then
-				ADDALL_RC=1
+				ADDALL_RC=$RC_SOME_DEVICES_FAILED
 			fi
 		done
 		exit "$ADDALL_RC"
@@ -1363,9 +1419,9 @@ then
 	if [[ -z "$CCWGROUPDEVID_TO_REMOVE" ]]
 	then
 		print_error "$DEVICE_TO_REMOVE is not a configured device"
-		exit 1
+		exit $RC_DEVICE_NOT_CONFIGURED
 	fi
-	
+
 	echo "Remove network device $CCWGROUPDEVID_TO_REMOVE" \
 	 	"($CCWDEVBUSIDS_TO_REMOVE)?"
 	echo "Warning: this may affect network connectivity!"
@@ -1403,7 +1459,7 @@ then
 fi
 if [ $DO_LIST_UNCONFIGURED -eq 1 ]
 then
-	list_unconfigured 
+	list_unconfigured
 	exit 0
 fi
 if [ $DO_LIST_CONFIGURED -eq 1 ]
diff --git a/zconf/znetconf.8 b/zconf/znetconf.8
index 3af8565..a6da42c 100644
--- a/zconf/znetconf.8
+++ b/zconf/znetconf.8
@@ -1,6 +1,6 @@
 .TH ZNETCONF 8 "Mar 2009" "s390-tools"
 
-.SH NAME 
+.SH NAME
 znetconf \- list and configure network devices for System z network adapters
 
 .SH SYNOPSIS
@@ -8,10 +8,10 @@ znetconf \- list and configure network devices for System z network adapters
 .B [-h|--help] [-v|--version]
 .br
 
-.br  
-.B znetconf -u | -c 
 .br
-.B znetconf -a <device_bus_id>[,...]{2} [-o <ATTR>=<VALUE>]+ [-d <DRIVER>] 
+.B znetconf -u | -c
+.br
+.B znetconf -a <device_bus_id>[,...]{2} [-o <ATTR>=<VALUE>]+ [-d <DRIVER>]
 .br
 .B znetconf -A [-o <ATTR>=<VALUE>]+ [-d <DRIVER>] [-e <device_bus_id>]+
 .br
@@ -27,12 +27,12 @@ Based on these lists, it automatically adds or removes network devices.
 For automatic configuration, znetconf builds a channel command word
 (CCW) group device from sensed CCW devices, configures any specified
 option through the sensed network device driver and sets the new
-network device online. 
+network device online.
 .P
 During automatic removal, znetconf sets the device offline and removes it.
 Be aware that removing all network devices leads to the
-complete loss of network connectivity. So a terminal session (e.g. 3270) 
-might be required to restore. 
+complete loss of network connectivity. So a terminal session (e.g. 3270)
+might be required to restore.
 
 .SH OPTIONS
 .TP 8
@@ -43,30 +43,30 @@ Print help text.
 .BR -v | --version
 Print the version of the s390-tools package and the znetconf command.
 
-.TP 
-.BR -u | --unconfigured	
+.TP
+.BR -u | --unconfigured
 List potential network devices that are not yet configured.
 For each device, the following data is provided:
 .RS
 .TP 4
-* 
-Device IDs (device bus bus-IDs) of the CCW devices constituting the network 
+*
+Device IDs (device bus bus-IDs) of the CCW devices constituting the network
 device
 .TP
-* 
+*
 Type of control unit (e.g. 1731/01)
 .TP
-* 
+*
 Network card type (e.g. OSA (QDIO))
 .TP
 *
-Channel path identifier (CHPID) 
+Channel path identifier (CHPID)
 .TP
 *
 Device driver (qeth, lcs, ctc, ctcm)
 .RE
-.TP 
-.BR -c | --configured 
+.TP
+.BR -c | --configured
 List configured network devices. For each device, the following data is
 provided:
 .RS
@@ -104,7 +104,7 @@ device_bus_id can be any of the device
 IDs listed as part of the potential network device list (argument
 .BR -u ")."
 For example, if znetconf
-.BR -u 
+.BR -u
 lists 0.0.f503,0.0.f504,0.0.f505 for a potential network device, device_bus_id
 may be 0.0.f503 or 0.0.f504 or 0.0.f505.
 If a device bus-ID begins with 0.0., you can abbreviate it to the final 4
@@ -115,11 +115,11 @@ If attribute value pairs are given with
 .BR -o ", "
 these pairs are configured for the created network device. The
 device is then set online regardless of whether the given attribute value pairs
-were applied successfully. 
+were applied successfully.
 .br
 Finally, the corresponding network interface name (e.g. eth1) is displayed.
 .br
-If more then one device_bus_id is given, the given set of devices is configured as a network device. znetconf tries to sense the required device driver 
+If more then one device_bus_id is given, the given set of devices is configured as a network device. znetconf tries to sense the required device driver
 automatically. If the device driver cannot be sensed, you must specify it with
 -d.
 .BR -d "."
@@ -145,7 +145,7 @@ znetconf continues with the next remaining potential network device.
 
 .TP
 .BR -r | --remove " <device_bus_id> [-n | --non-interactive]"
-Remove the network device identified by device_bus_id. device_bus_id is one of 
+Remove the network device identified by device_bus_id. device_bus_id is one of
 the device IDs of the network device. They are listed as part of znetconf
 .BR -c "."
 znetconf sets the device offline and removes it. If
@@ -164,21 +164,105 @@ with
 .TP
 \fB<ATTR>\fR
 Specify a device option. The option must match a sysfs attribute for the device
-to be configured.
+to be configured. For a detailed description of the semantics of sysfs
+attributes please refer to the Device Drivers, Features, and Commands book for
+Linux on System z. The attributes are:
+
+.RS
+.B qeth
+.br
+broadcast_mode
+.br
+buffer_count
+.br
+canonical_macaddr
+.br
+checksumming
+.br
+fake_broadcast
+.br
+ipa_takeover/add4
+.br
+ipa_takeover/add6
+.br
+ipa_takeover/del4
+.br
+ipa_takeover/del6
+.br
+ipa_takeover/enable
+.br
+ipa_takeover/invert4
+.br
+ipa_takeover/invert6
+.br
+isolation
+.br
+large_send
+.br
+layer2
+.br
+performance_stats
+.br
+portname
+.br
+portno
+.br
+priority_queueing
+.br
+route4
+.br
+route6
+.br
+rxip/add4
+.br
+rxip/add6
+.br
+rxip/del4
+.br
+rxip/del6
+.br
+vipa/add4
+.br
+vipa/add6
+.br
+vipa/del4
+.br
+vipa/del
+.RE
+
+.RS
+.B ctc(m)
+.br
+buffer
+.br
+loglevel
+.br
+protocol
+.br
+stats
+.RE
+
+.RS
+.B lcs
+.br
+portno
+.br
+lancmd_timeout
+.RE
 
 .TP
-\fB<device_bus_id>\fR 
+\fB<device_bus_id>\fR
 Specify the device bus-ID of a CCW device. Device bus-IDs have the form
 ([A-Fa-f0-9].[A-Fa-f0-9].)[A-Fa-f0-9]{4}.
 
-If a device bus-ID begins with 0.0., you can abbreviate it to the final 4 
+If a device bus-ID begins with 0.0., you can abbreviate it to the final 4
 hexadecimal digits.
 
 For example, you can abbreviate 0.0.f503 to f503.
 
 .TP
 \fB<DRIVER>\fR
-Specify the device driver for the device. Valid values are qeth, lcs, ctc, or 
+Specify the device driver for the device. Valid values are qeth, lcs, ctc, or
 ctcm.
 
 .SH EXAMPLES
@@ -242,9 +326,9 @@ Shows the list of potential network devices. Example output:
 Device IDs                 Type    Card Type  CHPID Drv.
 .br
 --------------------------------------------------------
-0.0.f500,0.0.f501,0.0.f502 1731/01 OSA (QDIO) 00    qeth   
+0.0.f500,0.0.f501,0.0.f502 1731/01 OSA (QDIO) 00    qeth
 .br
-0.0.f503,0.0.f504,0.0.f505 1731/01 OSA (QDIO) 01    qeth 
+0.0.f503,0.0.f504,0.0.f505 1731/01 OSA (QDIO) 01    qeth
 .RE
 .P
 \fBznetconf -a 0.0.f503\fR
@@ -258,13 +342,13 @@ lists the new network device.
 .P
 \fBznetconf -a f503\fR
 .RS
-This command is equivalent to \fBznetconf -a 0.0.f503\fR. 
+This command is equivalent to \fBznetconf -a 0.0.f503\fR.
 .RE
 .P
 \fBznetconf -a f503 -o layer2=0 -o portname=myname\fR
 .RS
-Adds the potential network device 
-with 0.0.f503 as one of its device bus-IDs  
+Adds the potential network device
+with 0.0.f503 as one of its device bus-IDs
 and configures the options layer2 with value 0 and
 portname with myname.
 .RE
@@ -288,9 +372,9 @@ Device IDs                 Type    Card Type     CHPID Drv. Name State
 
 \fBznetconf -r 0.0.f503\fR
 .RS
-Removes the network device with 0.0.f503 as one of its device bus-IDs. 
+Removes the network device with 0.0.f503 as one of its device bus-IDs.
 You can only remove configured devices as listed by znetconf
-.BR -c "." 
+.BR -c "."
 After successfully running this command the corresponding device appears in the
 list of potential network devices as listed by znetconf
 .BR -u "."
@@ -303,9 +387,76 @@ This command is equivalent to \fBznetconf -r 0.0.f503\fR.
 .P
 
 .SH DIAGNOSTICS
-If znetconf runs successfully, the exit status is 0. In case of errors, 1 is
-returned.
-
+If znetconf runs successfully, the exit status is 0. In case of errors, the following codes are returned:
+.TP
+.BR 0
+success
+.TP
+.BR 9
+could not group devices
+.TP
+.BR 10
+could not set device online
+.TP
+.BR 11
+could not set device offline
+.TP
+.BR 12
+invalid attribute value pair
+.TP
+.BR 13
+missing component (broken installation)
+.TP
+.BR 14
+missing device ID
+.TP
+.BR 15
+invalid device ID format
+.TP
+.BR 16
+driver name expected
+.TP
+.BR 17
+unknown driver
+.TP
+.BR 18
+missing attribute value pair for -o|--option
+.TP
+.BR 19
+invalid argument
+.TP
+.BR 20
+too much arguments
+.TP
+.BR 21
+no configuration found for device ID
+.TP
+.BR 22
+device is not configured
+.TP
+.BR 23
+could not ungroup device
+.TP
+.BR 24
+at least one option could not be configured
+.TP
+.BR 25
+missing value for attribute
+.TP
+.BR 26
+device does not exist
+.TP
+.BR 27
+device already in use
+.TP
+.BR 28
+net device did not come online
+.TP
+.BR 29
+some devices could not be added or failed
+.TP
+.BR 99
+internal znetconf bug
 .SH AUTHOR
 .nf
 This man-page was written by Einar Lueck <elelueck at de.ibm.com>.
-- 
1.6.3.3



--- NEW FILE device_cio_free ---
#!/bin/sh
#
# Copyright 2009 Red Hat, Inc.
# License: GPLv2
# Author: Dan Hor?k <dhorak at redhat.com>
#
# unblock devices listed in various config files and wait until they are ready
#
# it uses dasd and zfcp config file
# config file syntax:
# deviceno   options
# or
# deviceno   WWPN   FCPLUN
#
# also processes the system ccw config file and network interface configurations
#

DASDCONFIG=/etc/dasd.conf
ZFCPCONFIG=/etc/zfcp.conf
ZNETCONFIG=/etc/ccw.conf
BLACKLIST=/proc/cio_ignore
VERBOSE=
PATH=/bin:/usr/bin:/sbin:/usr/sbin
ALL_DEVICES=

usage()
{
    echo "$0 [-h|--help] [-V|--verbose]"
    exit 1
}

# accepts single device, comma-separated lists and dash separated ranges and their combinations
free_device()
{
    local DEV

    [ -z "$1" ] && return

    DEV=$(echo $1 | tr "A-Z" "a-z")
    
    [ $VERBOSE ] && echo "Freeing device(s) $DEV"
    if [ echo "free $DEV" > $BLACKLIST 2> /dev/null ]; then
	echo "Error: can't free device(s) $DEV"
    else
	if [ -z $ALL_DEVICES ]; then
	    ALL_DEVICES=$DEV
	else
	    ALL_DEVICES="$ALL_DEVICES,$DEV"
	fi
    fi
}

# wait until a device appears on the ccw bus
wait_on_device()
{
    local DEVICE_ONLINE DEV
    
    [ -z "$1" ] && return
    
    DEV=$1
    DEVICE_ONLINE=/sys/bus/ccw/devices/$DEV/online
    
    [ $VERBOSE ] && echo "Waiting on device $DEV"
    [ -f "$DEVICE_ONLINE" ] && return

    for t in 1 2 3 4 5
    do
	sleep $t
	[ -f "$DEVICE_ONLINE" ] && return
    done
    echo "Error: device $DEV still not ready"
}

# check how we were called
case $(basename "$0") in
    "dasd_cio_free")
	CONFIG=$DASDCONFIG
	MODE=dasd
	;;
    "zfcp_cio_free")
	CONFIG=$ZFCPCONFIG
	MODE=zfcp
	;;
    "znet_cio_free")
	CONFIG=$ZNETCONFIG
	MODE=znet
	;;
    *)
	echo "Error: unknown alias '$CMD'."
	echo "Supported aliases are dasd_cio_free, zfcp_cio_free and znet_cio_free."
	exit 1
	;;
esac

# process command line options
if [ $# -gt 0 ]; then
    case $1 in
	-V|--verbose)
	    VERBOSE=yes
	    shift
	    ;;
	-h|--help)
	    usage
	    ;;
	*)
	    echo "Error: unknown option $1"
	    usage
	    ;;
    esac
fi

if [ ! -f $BLACKLIST ]; then
    echo "Error: $BLACKLIST kernel interface doesn't exist"
    exit 2
fi

if [ $MODE = "dasd" -o $MODE = "zfcp" ]; then
    # process the config file
    if [ -f "$CONFIG" ]; then
        while read line; do
	    case $line in
		\#*) ;;
		*)
		    [ -z "$line" ] && continue
		    set $line
		    free_device $1
		    ;;
	    esac
	done < $CONFIG
    fi
fi

if [ $MODE = "dasd" ]; then
    # process the device list defined as option for the dasd module
    DEVICES=$(modprobe --showconfig | grep "options[[:space:]]\+dasd_mod" | \
	sed -e 's/.*[[:space:]]dasd=\([^[:space:]]*\).*/\1/' -e 's/([^)]*)//g' \
	-e 's/nopav\|nofcx\|autodetect\|probeonly//g' -e 's/,,/,/g' -e 's/^,//' -e 's/,$//')

    free_device $DEVICES
fi

if [ $MODE = "znet" ]; then
    # process the config file
    if [ -f "$CONFIG" ]; then
        while read line; do
	    case $line in
		\#*) ;;
		*)
		    [ -z "$line" ] && continue
		    # grep 2 or 3 channels from beginning of each line
		    DEVICES=$(echo $line | egrep -i -o "^([0-9]\.[0-9]\.[a-f0-9]+,){1,2}([0-9]\.[0-9]\.[a-f0-9]+)")
		    free_device $DEVICES
		    ;;
	    esac
	done < $CONFIG
    fi
    # process channels from network interface configurations
    for line in $(egrep -i -h "^[[:space:]]*SUBCHANNELS=['\"]?([0-9]\.[0-9]\.[a-f0-9]+,){1,2}([0-9]\.[0-9]\.[a-f0-9]+)['\"]?([[:space:]]+#|[[:space:]]*$)" /etc/sysconfig/network-scripts/ifcfg-* 2> /dev/null)
    do
	eval "$line"
        free_device $SUBCHANNELS
    done
fi

# wait until recently unblocked devices are ready
# at this point we know the content of ALL_DEVICES is syntacticly correct
IFS=","
set $ALL_DEVICES
while [ "$1" ]
do
    DEV="$1"
    IFS="."

    # get the lower bound for range or get the single device
    LOWER=${DEV%%-*}
    read -a L <<< "$LOWER"
    if [ ${#L[@]} -eq 1 ]; then
        L[2]=${L[0]}
        L[0]=0
        L[1]=0
    fi

    # get the upper bound for range or get the single device
    UPPER=${DEV##*-}
    read -a U <<< "$UPPER"
    if [ ${#U[@]} -eq 1 ]; then
        U[2]=${U[0]}
        U[0]=0
        U[1]=0
    fi

    # iterate thru all devices
    for (( i=0x${L[0]}; i<=0x${U[0]}; i++ )); do
    for (( j=0x${L[1]}; j<=0x${U[1]}; j++ )); do
    for (( k=0x${L[2]}; k<=0x${U[2]}; k++ )); do
	wait_on_device "$(printf %x.%x.%04x $i $j $k)"
    done
    done
    done

    # go to the next device
    shift
done


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- s390utils.spec	13 Nov 2009 10:22:21 -0000	1.14
+++ s390utils.spec	22 Dec 2009 11:00:08 -0000	1.15
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@ Source11:       cpi.sysconfig
 # files for DASD initialization
 Source12:       dasd.udev
 Source13:       dasdconf.sh
+Source14:       device_cio_free
 
 Patch1:   0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch
 Patch2:   0002-s390-tools-1.8.1-zipl-automenu.patch
@@ -46,6 +47,9 @@ Patch11:  0011-update-readahead-value-fo
 Patch12:  0012-fix-multipath-device-detection-in-ziomon.patch
 Patch13:  0013-zipl-handle-status-during-ipl.patch
 Patch14:  0014-dasdview-fdasd-fix-floating-point-error-for-unformat.patch
+Patch15:  0015-s390tools-1.8.2-zipl-dm.patch
+Patch16:  0016-s390tools-1.8.2-lsreipl-nss.patch
+Patch17:  0017-qualified-return-codes-and-further-error-handling-in.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -117,6 +121,15 @@ be used together with the zSeries (s390)
 # Fix floating point error for unformatted devices in fdasd and dasdview (#537144)
 %patch14 -p1 -b .dasd-zero-division
 
+# Add device-mapper support into zipl (#546280)
+%patch15 -p1 -b .zipl-dm
+
+# Add missing check and print NSS name in case an NSS has been IPLed (#546297)
+%patch16 -p1 -b .lsreipl-nss
+
+# Add qualified return codes and further error handling in znetconf (#548487)
+%patch17 -p1 -b .znetconf-returncodes
+
 #
 # cmsfs
 #
@@ -190,6 +203,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,sysconfig},%{_initddir}}
 
+# workaround an issue in the zipl-device-mapper patch
+rm -f zipl/src/zipl_helper.device-mapper.*
+
 make install \
         INSTROOT=$RPM_BUILD_ROOT \
         MANDIR=$RPM_BUILD_ROOT%{_mandir} \
@@ -252,6 +268,14 @@ install -p -m 644 include/vtoc.h $RPM_BU
 install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/cpi
 install -p -m 755 %{SOURCE10} ${RPM_BUILD_ROOT}%{_initddir}/cpi
 
+# device_cio_free
+install -p -m 755 %{SOURCE14} ${RPM_BUILD_ROOT}/sbin
+pushd ${RPM_BUILD_ROOT}/sbin
+for lnk in dasd zfcp znet; do
+    ln -sf device_cio_free ${lnk}_cio_free
+done
+popd
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -422,9 +446,11 @@ fi
 %doc README
 %doc LICENSE
 /sbin/zipl
+/sbin/dasd_cio_free
 /sbin/dasdfmt
 /sbin/dasdinfo
 /sbin/dasdview
+/sbin/device_cio_free
 /sbin/fdasd
 /sbin/chccwdev
 /sbin/chchp
@@ -446,7 +472,9 @@ fi
 /sbin/tape390_crypt
 /sbin/tunedasd
 /sbin/vmcp
+/sbin/zfcp_cio_free
 /sbin/zgetdump
+/sbin/znet_cio_free
 /sbin/znetconf
 /sbin/dbginfo.sh
 %{_sbindir}/lsreipl
@@ -798,6 +826,14 @@ User-space development files for the s39
 
 
 %changelog
+* Tue Dec 22 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-6
+- fixed return value in cpi initscript (#541389)
+- updated zfcpconf.sh script from dracut
+- added device-mapper support into zipl (#546280)
+- added missing check and print NSS name in case an NSS has been IPLed (#546297)
+- added device_cio_free script and its symlinks
+- added qualified return codes and further error handling in znetconf (#548487)
+
 * Fri Nov 13 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-5
 - added multiple fixes from IBM (#533955, #537142, #537144)
 



From jwrdegoede at fedoraproject.org  Tue Dec 22 11:01:56 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 22 Dec 2009 11:01:56 +0000 (UTC)
Subject: File tgt-20091205.tar.bz2 uploaded to lookaside cache by jwrdegoede
Message-ID: <20091222110156.7223A10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for scsi-target-utils:

6f469f376b1ceb00725ceb00b2f1e6f8  tgt-20091205.tar.bz2



From jwrdegoede at fedoraproject.org  Tue Dec 22 11:12:22 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 22 Dec 2009 11:12:22 +0000 (UTC)
Subject: rpms/scsi-target-utils/devel
	scsi-target-utils-dynamic-link-iser.patch, NONE,
	1.1 scsi-target-utils-hack-check-for-eventfd.patch, NONE,
	1.1 scsi-target-utils-redhatify-docs.patch, NONE,
	1.1 sysconfig.tgtd, NONE, 1.1 targets.conf, NONE, 1.1 .cvsignore,
	1.6, 1.7 scsi-target-utils.spec, 1.13, 1.14 sources, 1.6,
	1.7 tgtd.init, 1.1, 1.2 tgt-0.9.5-makefile.patch, 1.1,
	NONE tgt-20080805-shebang.patch, 1.1, NONE
Message-ID: <20091222111223.1938E11C00E9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/scsi-target-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16825

Modified Files:
	.cvsignore scsi-target-utils.spec sources tgtd.init 
Added Files:
	scsi-target-utils-dynamic-link-iser.patch 
	scsi-target-utils-hack-check-for-eventfd.patch 
	scsi-target-utils-redhatify-docs.patch sysconfig.tgtd 
	targets.conf 
Removed Files:
	tgt-0.9.5-makefile.patch tgt-20080805-shebang.patch 
Log Message:
* Mon Dec 21 2009 Hans de Goede <hdegoede at redhat.com> - 0.9.11-1.20091205snap
- Rebase to 0.9.11 + some fixes from git (git id
  97832d8dcd00202a493290b5d134b581ce20885c)
- Rewrite initscript, make it follow:
  http://fedoraproject.org/wiki/Packaging/SysVInitScript
  And merge in RHEL-5 initscript improvements:
  - Parse /etc/tgt/targets.conf, which allows easy configuration of targets
  - Better initiator status checking in stop
  - Add force-stop, to stop even when initiators are still connected
  - Make reload reload configuration from /etc/tgt/targets.conf without
    stopping tgtd (but only for unused targets)
  - Add force-reload (reloads configs for all targets including busy ones)


scsi-target-utils-dynamic-link-iser.patch:
 Makefile           |    5 -
 iscsi/iscsi_rdma.c |  214 +++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 194 insertions(+), 25 deletions(-)

--- NEW FILE scsi-target-utils-dynamic-link-iser.patch ---
diff --git a/usr/Makefile b/usr/Makefile
index 2dcae2a..78be3e1 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -17,12 +17,13 @@ TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
 		isns.o)
 TGTD_OBJS += bs_rdwr.o bs_aio.o
 
-ifneq ($(ISCSI_RDMA),)
-CFLAGS += -DISCSI_RDMA
+ifneq ($(findstring verbs.h,$(wildcard /usr/include/infiniband/*.h)), )
+ifneq ($(findstring rdma_cma.h,$(wildcard /usr/include/rdma/*.h)), )
 TGTD_OBJS += iscsi/iscsi_rdma.o
 LIBS += -libverbs -lrdmacm
 endif
 endif
+endif
 
 ifneq ($(FCP),)
 CFLAGS += -DFCP -DUSE_KERNEL
diff --git a/usr/iscsi/iscsi_rdma.c b/usr/iscsi/iscsi_rdma.c
index 6cf5677..72e4eaf 100644
--- a/usr/iscsi/iscsi_rdma.c
+++ b/usr/iscsi/iscsi_rdma.c
@@ -30,6 +30,8 @@
 #include <sys/epoll.h>
 #include <infiniband/verbs.h>
 #include <rdma/rdma_cma.h>
+#include <dlfcn.h>
+#include <syslog.h>
 
 #include "util.h"
 #include "iscsid.h"
@@ -283,6 +285,67 @@ static void iser_sched_poll_cq(struct event_data *tev);
 static void iser_sched_consume_cq(struct event_data *tev);
 static void iser_sched_tx(struct event_data *evt);
 
+
+static void *pverbs;
+static void *prdma;
+typedef void (*ibv_ack_cq_events_t)(struct ibv_cq *cq, unsigned int nevents);
+typedef struct ibv_pd *(*ibv_alloc_pd_t)(struct ibv_context *context);
+typedef struct ibv_comp_channel *(*ibv_create_comp_channel_t)(struct ibv_context *context);
+typedef struct ibv_cq *(*ibv_create_cq_t)(struct ibv_context *context, int cqe,
+                              void *cq_context,
+                              struct ibv_comp_channel *channel,
+                              int comp_vector);
+typedef int (*ibv_dereg_mr_t)(struct ibv_mr *mr);
+typedef int (*ibv_destroy_qp_t)(struct ibv_qp *qp);
+typedef int (*ibv_get_cq_event_t)(struct ibv_comp_channel *channel,
+                      struct ibv_cq **cq, void **cq_context);
+typedef int (*ibv_query_device_t)(struct ibv_context *context,
+                      struct ibv_device_attr *device_attr);
+typedef struct ibv_mr *(*ibv_reg_mr_t)(struct ibv_pd *pd, void *addr,
+                          size_t length, enum ibv_access_flags access);
+typedef int (*rdma_ack_cm_event_t)(struct rdma_cm_event *event);
+typedef int (*rdma_bind_addr_t)(struct rdma_cm_id *id, struct sockaddr *addr);
+typedef struct rdma_event_channel *(*rdma_create_event_channel_t)(void);
+typedef int (*rdma_create_id_t)(struct rdma_event_channel *channel,
+                   struct rdma_cm_id **id, void *context,
+                   enum rdma_port_space ps);
+typedef int (*rdma_create_qp_t)(struct rdma_cm_id *id, struct ibv_pd *pd,
+                   struct ibv_qp_init_attr *qp_init_attr);
+typedef int (*rdma_destroy_id_t)(struct rdma_cm_id *id);
+typedef int (*rdma_disconnect_t)(struct rdma_cm_id *id);
+typedef int (*rdma_get_cm_event_t)(struct rdma_event_channel *channel,
+                      struct rdma_cm_event **event);
+typedef int (*rdma_listen_t)(struct rdma_cm_id *id, int backlog);
+typedef int (*rdma_accept_t)(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
+typedef int (*rdma_reject_t)(struct rdma_cm_id *id, const void *private_data,
+                uint8_t private_data_len);
+
+typedef struct {
+	ibv_ack_cq_events_t ibv_ack_cq_events;
+	ibv_alloc_pd_t ibv_alloc_pd;
+	ibv_create_comp_channel_t ibv_create_comp_channel;
+	ibv_create_cq_t ibv_create_cq;
+	ibv_dereg_mr_t ibv_dereg_mr;
+	ibv_destroy_qp_t ibv_destroy_qp;
+	ibv_get_cq_event_t ibv_get_cq_event;
+	ibv_query_device_t ibv_query_device;
+	ibv_reg_mr_t ibv_reg_mr;
+	rdma_ack_cm_event_t rdma_ack_cm_event;
+	rdma_bind_addr_t rdma_bind_addr;
+	rdma_create_event_channel_t rdma_create_event_channel;
+	rdma_create_id_t rdma_create_id;
+	rdma_create_qp_t rdma_create_qp;
+	rdma_destroy_id_t rdma_destroy_id;
+	rdma_disconnect_t rdma_disconnect;
+	rdma_get_cm_event_t rdma_get_cm_event;
+	rdma_listen_t rdma_listen;
+	rdma_accept_t rdma_accept;
+	rdma_reject_t rdma_reject;
+} tgt_fptr_t;
+
+static tgt_fptr_t tgt_fptr;
+
+
 /*
  * Called when ready for full feature, builds resources.
  */
@@ -308,7 +371,7 @@ static int iser_init_comm(struct conn_info *conn)
 		goto out;
 	}
 
-	conn->srmr = ibv_reg_mr(conn->dev->pd, conn->srbuf, size,
+	conn->srmr = tgt_fptr.ibv_reg_mr(conn->dev->pd, conn->srbuf, size,
 				IBV_ACCESS_LOCAL_WRITE);
 	if (!conn->srmr) {
 		eprintf("register srbuf\n");
@@ -415,7 +478,7 @@ static int iser_init_comm_login(struct conn_info *conn)
 		goto out;
 	}
 
-	conn->srmr_login = ibv_reg_mr(conn->dev->pd, conn->srbuf_login, size,
+	conn->srmr_login = tgt_fptr.ibv_reg_mr(conn->dev->pd, conn->srbuf_login, size,
 				      IBV_ACCESS_LOCAL_WRITE);
 	if (!conn->srmr_login) {
 		eprintf("ibv_reg_mr srbuf failed\n");
@@ -495,7 +558,7 @@ static void iser_free_comm(struct conn_info *ci)
 
 	/* release mr and free the lists */
 	dprintf("dereg mr %p\n", ci->srmr);
-	ret = ibv_dereg_mr(ci->srmr);
+	ret = tgt_fptr.ibv_dereg_mr(ci->srmr);
 	if (ret)
 		eprintf("ibv_dereg_mr\n");
 	free(ci->srbuf);
@@ -515,7 +578,7 @@ static void iser_free_comm_login(struct conn_info *ci)
 	dprintf("freeing, login phase %d\n", ci->login_phase);
 
 	/* release mr and free the lists */
-	ret = ibv_dereg_mr(ci->srmr_login);
+	ret = tgt_fptr.ibv_dereg_mr(ci->srmr_login);
 	if (ret)
 		eprintf("ibv_dereg_mr\n");
 	free(ci->srbuf_login);
@@ -546,7 +609,7 @@ static int iser_init_mempool(struct iser_device *dev)
 		return -ENOMEM;
 	}
 
-	dev->mempool_mr = ibv_reg_mr(dev->pd, regbuf,
+	dev->mempool_mr = tgt_fptr.ibv_reg_mr(dev->pd, regbuf,
 				     mempool_num * mempool_size,
 				     IBV_ACCESS_LOCAL_WRITE);
 	if (!dev->mempool_mr) {
@@ -583,7 +646,7 @@ static int iser_device_init(struct iser_device *dev)
 	int ret = -1;
 
 	dprintf("dev %p\n", dev);
-	dev->pd = ibv_alloc_pd(dev->ibv_hndl);
+	dev->pd = tgt_fptr.ibv_alloc_pd(dev->ibv_hndl);
 	if (dev->pd == NULL) {
 		eprintf("ibv_alloc_pd failed\n");
 		goto out;
@@ -595,7 +658,7 @@ static int iser_device_init(struct iser_device *dev)
 		goto out;
 	}
 
-	ret = ibv_query_device(dev->ibv_hndl, &device_attr);
+	ret = tgt_fptr.ibv_query_device(dev->ibv_hndl, &device_attr);
 	if (ret < 0) {
 		eprintf("ibv_query_device: %m\n");
 		goto out;
@@ -604,13 +667,13 @@ static int iser_device_init(struct iser_device *dev)
 	dprintf("max %d CQEs\n", cqe_num);
 
 	ret = -1;
-	dev->cq_channel = ibv_create_comp_channel(dev->ibv_hndl);
+	dev->cq_channel = tgt_fptr.ibv_create_comp_channel(dev->ibv_hndl);
 	if (dev->cq_channel == NULL) {
 		eprintf("ibv_create_comp_channel failed: %m\n");
 		goto out;
 	}
 
-	dev->cq = ibv_create_cq(dev->ibv_hndl, cqe_num, NULL,
+	dev->cq = tgt_fptr.ibv_create_cq(dev->ibv_hndl, cqe_num, NULL,
 				dev->cq_channel, 0);
 	if (dev->cq == NULL) {
 		eprintf("ibv_create_cq failed: %m\n");
@@ -729,7 +792,7 @@ static void iser_accept_connection(struct rdma_cm_event *event)
 	/* only generate completion queue entries if requested */
 	qp_init_attr.sq_sig_all = 0;
 
-	ret = rdma_create_qp(ci->cma_id, dev->pd, &qp_init_attr);
+	ret = tgt_fptr.rdma_create_qp(ci->cma_id, dev->pd, &qp_init_attr);
 	if (ret) {
 		eprintf("create qp failed\n");
 		goto free_conn;
@@ -759,7 +822,7 @@ static void iser_accept_connection(struct rdma_cm_event *event)
 	}
 
 	/* now we can actually accept the connection */
-	ret = rdma_accept(ci->cma_id, &conn_param);
+	ret = tgt_fptr.rdma_accept(ci->cma_id, &conn_param);
 	if (ret) {
 		eprintf("rdma_accept failed\n");
 		iser_free_comm_login(ci);
@@ -772,7 +835,7 @@ free_conn:
 	conn_exit(conn);
 	free(ci);
 reject:
-	ret = rdma_reject(event->id, NULL, 0);
+	ret = tgt_fptr.rdma_reject(event->id, NULL, 0);
 	if (ret)
 		eprintf("rdma_reject failed: %s\n", strerror(-ret));
 }
@@ -836,7 +899,7 @@ static void iser_handle_rdmacm(int fd __attribute__((unused)),
 	struct rdma_cm_id *destroy_cm_id = NULL;
 
 	dprintf("entry\n");
-	ret = rdma_get_cm_event(rdma_evt_channel, &event);
+	ret = tgt_fptr.rdma_get_cm_event(rdma_evt_channel, &event);
 	if (ret) {
 		eprintf("rdma_get_cm_event failed\n");
 		return;
@@ -859,14 +922,14 @@ static void iser_handle_rdmacm(int fd __attribute__((unused)),
 		break;
 	}
 
-	ret = rdma_ack_cm_event(event);
+	ret = tgt_fptr.rdma_ack_cm_event(event);
 	if (ret) {
 		eprintf("ack cm event failed\n");
 		return;
 	}
 
 	if (destroy_cm_id) {
-		ret = rdma_destroy_id(destroy_cm_id);
+		ret = tgt_fptr.rdma_destroy_id(destroy_cm_id);
 		if (ret)
 			eprintf("rdma_destroy_id failed\n");
 	}
@@ -1089,13 +1152,13 @@ static void iser_cqe_handler(int fd __attribute__((unused)),
 	void *cq_context;
 	int ret;
 
-	ret = ibv_get_cq_event(dev->cq_channel, &dev->cq, &cq_context);
+	ret = tgt_fptr.ibv_get_cq_event(dev->cq_channel, &dev->cq, &cq_context);
 	if (ret != 0) {
 		eprintf("notification, but no CQ event\n");
 		exit(1);
 	}
 
-	ibv_ack_cq_events(dev->cq, 1);
+    tgt_fptr.ibv_ack_cq_events(dev->cq, 1);
 
 	/* if a poll was previosuly scheduled, remove it,
 	   as it will be scheduled when necessary */
@@ -1148,14 +1211,14 @@ static int iscsi_rdma_init(void)
 	struct sockaddr_in sock_addr;
 	short int port = iscsi_listen_port;
 
-	rdma_evt_channel = rdma_create_event_channel();
+	rdma_evt_channel = tgt_fptr.rdma_create_event_channel();
 
 	if (!rdma_evt_channel) {
 		eprintf("cannot initialize RDMA; load kernel modules?\n");
 		return -1;
 	}
 
-	ret = rdma_create_id(rdma_evt_channel, &cma_listen_id, NULL,
+	ret = tgt_fptr.rdma_create_id(rdma_evt_channel, &cma_listen_id, NULL,
 			     RDMA_PS_TCP);
 	if (ret) {
 		eprintf("rdma_create_id: %s\n", strerror(ret));
@@ -1166,7 +1229,7 @@ static int iscsi_rdma_init(void)
 	sock_addr.sin_family = AF_INET;
 	sock_addr.sin_port = htons(port);
 	sock_addr.sin_addr.s_addr = INADDR_ANY;
-	ret = rdma_bind_addr(cma_listen_id, (struct sockaddr *) &sock_addr);
+	ret = tgt_fptr.rdma_bind_addr(cma_listen_id, (struct sockaddr *) &sock_addr);
 	if (ret) {
 		if (ret == -1)
 			eprintf("rdma_bind_addr -1: %m\n");
@@ -1176,7 +1239,7 @@ static int iscsi_rdma_init(void)
 	}
 
 	/* 0 == maximum backlog */
-	ret = rdma_listen(cma_listen_id, 0);
+	ret = tgt_fptr.rdma_listen(cma_listen_id, 0);
 	if (ret) {
 		if (ret == -1)
 			eprintf("rdma_listen -1: %m\n");
@@ -1574,7 +1637,7 @@ static size_t iscsi_rdma_close(struct iscsi_connection *conn)
 	struct conn_info *ci = RDMA_CONN(conn);
 	int ret;
 
-	ret = rdma_disconnect(ci->cma_id);
+	ret = tgt_fptr.rdma_disconnect(ci->cma_id);
 	if (ret)
 		eprintf("rdma_disconnect: %s\n", strerror(-ret));
 	dprintf("did rdma_disconnect\n");
@@ -1607,7 +1670,7 @@ static void iscsi_rdma_release(struct iscsi_connection *conn)
 		iser_free_comm(ci);
 
 	/* finally destory QP */
-	ret = ibv_destroy_qp(ci->qp_hndl);
+	ret = tgt_fptr.ibv_destroy_qp(ci->qp_hndl);
 	if (ret)
 		eprintf("ibv_destroy_qp: %s\n", strerror(-ret));
 
@@ -1744,7 +1807,112 @@ static struct iscsi_transport iscsi_iser = {
 	.ep_getpeername		= iscsi_rdma_getpeername,
 };
 
+
+int is_dlerror(const char *symbol)
+{
+	char *error;
+
+	if ((error = dlerror()) != NULL) {
+		syslog(LOG_ERR, "symbol %s not found - %s", symbol, error);
+		return 1;
+	}
+	return 0;
+}
+
+
+
 __attribute__((constructor)) static void iser_transport_init(void)
 {
+	pverbs = dlopen("libibverbs.so",RTLD_LAZY);
+	if (!pverbs) {
+		goto Exit; /* do not register iser transport */
+	}
+
+	prdma = dlopen("librdmacm.so",RTLD_LAZY);
+	if (!prdma) {
+		goto Exit; /* do not register iser transport */
+	}
+
+	/* initialize function pointers */
+	tgt_fptr.ibv_ack_cq_events = dlsym(pverbs, "ibv_ack_cq_events");
+	if (is_dlerror("ibv_ack_cq_events"))
+		goto Exit;
+	tgt_fptr.ibv_alloc_pd = dlsym(pverbs, "ibv_alloc_pd");
+	if (is_dlerror("ibv_alloc_pd"))
+		goto Exit;
+	tgt_fptr.ibv_create_comp_channel = dlsym(pverbs, "ibv_create_comp_channel");
+	if (is_dlerror("ibv_create_comp_channel"))
+		goto Exit;
+	tgt_fptr.ibv_create_cq = dlsym(pverbs, "ibv_create_cq");
+	if (is_dlerror("ibv_create_cq"))
+		goto Exit;
+	tgt_fptr.ibv_dereg_mr = dlsym(pverbs, "ibv_dereg_mr");
+	if (is_dlerror("ibv_dereg_mr"))
+		goto Exit;
+	tgt_fptr.ibv_destroy_qp = dlsym(pverbs, "ibv_destroy_qp");
+	if (is_dlerror("ibv_destroy_qp"))
+		goto Exit;
+	tgt_fptr.ibv_get_cq_event = dlsym(pverbs, "ibv_get_cq_event");
+	if (is_dlerror("ibv_get_cq_event"))
+		goto Exit;
+	tgt_fptr.ibv_query_device = dlsym(pverbs, "ibv_query_device");
+	if (is_dlerror("ibv_query_device"))
+		goto Exit;
+	tgt_fptr.ibv_reg_mr = dlsym(pverbs, "ibv_reg_mr");
+	if (is_dlerror("ibv_reg_mr"))
+		goto Exit;
+	tgt_fptr.rdma_ack_cm_event = dlsym(prdma, "rdma_ack_cm_event");
+	if (is_dlerror("rdma_ack_cm_event"))
+		goto Exit;
+	tgt_fptr.rdma_bind_addr = dlsym(prdma, "rdma_bind_addr");
+	if (is_dlerror("rdma_bind_addr"))
+		goto Exit;
+	tgt_fptr.rdma_create_event_channel = dlsym(prdma, "rdma_create_event_channel");
+	if (is_dlerror("rdma_create_event_channel"))
+		goto Exit;
+	tgt_fptr.rdma_create_id = dlsym(prdma, "rdma_create_id");
+	if (is_dlerror("rdma_create_id"))
+		goto Exit;
+	tgt_fptr.rdma_create_qp = dlsym(prdma, "rdma_create_qp");
+	if (is_dlerror("rdma_create_qp"))
+		goto Exit;
+	tgt_fptr.rdma_destroy_id = dlsym(prdma, "rdma_destroy_id");
+	if (is_dlerror("rdma_destroy_id"))
+		goto Exit;
+	tgt_fptr.rdma_disconnect = dlsym(prdma, "rdma_disconnect");
+	if (is_dlerror("rdma_disconnect"))
+		goto Exit;
+	tgt_fptr.rdma_get_cm_event = dlsym(prdma, "rdma_get_cm_event");
+	if (is_dlerror("rdma_get_cm_event"))
+		goto Exit;
+	tgt_fptr.rdma_listen = dlsym(prdma, "rdma_listen");
+	if (is_dlerror("rdma_listen"))
+		goto Exit;
+	tgt_fptr.rdma_accept = dlsym(prdma, "rdma_accept");
+	if (is_dlerror("rdma_accept"))
+		goto Exit;
+	tgt_fptr.rdma_reject = dlsym(prdma, "rdma_reject");
+	if (is_dlerror("rdma_reject"))
+		goto Exit;
+
+	syslog(LOG_INFO, "iser transport register");
 	iscsi_transport_register(&iscsi_iser);
+	return;
+
+Exit:
+	syslog(LOG_ERR, "%s - iser transport not used", dlerror());
+	if (pverbs)
+		dlclose(pverbs);
+	if (prdma)
+		dlclose(prdma);
 }
+
+__attribute__((destructor)) static void iser_transport_close(void)
+{
+	syslog(LOG_INFO, "iser transport register");
+	if (pverbs)
+		dlclose(pverbs);
+	if (prdma)
+		dlclose(prdma);
+}
+

scsi-target-utils-hack-check-for-eventfd.patch:
 bs_aio.c |    5 +++++
 bs_aio.h |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE scsi-target-utils-hack-check-for-eventfd.patch ---
diff --git a/usr/bs_aio.c b/usr/bs_aio.c
index 0d6a640..794018a 100644
--- a/usr/bs_aio.c
+++ b/usr/bs_aio.c
@@ -124,6 +124,11 @@ static int bs_aio_init(struct scsi_lu *lu)
 	struct bs_aio_info *info =
 		(struct bs_aio_info *) ((char *)lu + sizeof(*lu));
 
+	if (__NR_eventfd < 0) {
+		eprintf("aio not suppored on this ARCH at this time.\n");
+		return -1;
+	}
+
 	ret = io_setup(MAX_AIO_REQS, &info->ctx);
 	if (ret) {
 		eprintf("fail to create aio_queue, %m\n");
diff --git a/usr/bs_aio.h b/usr/bs_aio.h
index f62e99c..b5c4bf9 100644
--- a/usr/bs_aio.h
+++ b/usr/bs_aio.h
@@ -53,7 +53,7 @@ enum {
 #elif defined(__sparc__) || defined(__sparc64__)
 #define __NR_eventfd 313
 #else
-#error Cannot detect your architecture
+#define __NR_eventfd -1
 #endif
 #endif
 

scsi-target-utils-redhatify-docs.patch:
 README           |   17 -----------------
 doc/README.iscsi |   16 +++++++++-------
 doc/README.iser  |   37 +++++++++++++++----------------------
 3 files changed, 24 insertions(+), 46 deletions(-)

--- NEW FILE scsi-target-utils-redhatify-docs.patch ---
diff --git a/README b/README
index 22785fc..22b963f 100644
--- a/README
+++ b/README
@@ -9,17 +9,6 @@ Currently, tgt supports the following target drivers:
 
 - iSER software target driver for Infiniband and RDMA NICs
 
-- IBM System p VIO server
-
-- FCoE software target driver for Ethernet NICs (in progress)
-
-- Qlogic qla2xxx FC target driver (in progress)
-
-Tgt consists of kernel modules, user-space daemon, and user-space
-tools. iSCSI, iSER, and FCoE target drivers use only user-space daemon
-and tools (i.e. they are just user-space applications. They don't need
-any kernel support).
-
 tgt can emulate the following device types:
 
 - SBC: a virtual disk drive that can use a file to store the content.
@@ -40,12 +29,6 @@ store the content (in progress).
 The code is under the GNU General Public License version 2.
 
 
-Preparation
--------------
-Target drivers have their own ways to build, configure, etc. So find
-an appropriate documentation in the doc directory.
-
-
 Developer Notes
 -------------
 The central resource for tgt development is the mailing list
diff --git a/doc/README.iscsi b/doc/README.iscsi
index 321b1d8..cd63de2 100644
--- a/doc/README.iscsi
+++ b/doc/README.iscsi
@@ -1,25 +1,27 @@
 Preface
 -------------
-This show a simple example to set up some targets.
+This shows a simple example to set up some targets.
 
+See man tgt-admin and the example /etc/tgt/targets.conf
+file for how to setup a persistent configuration that is
+started when the tgtd service is started (when "service tgtd start"
+is run).
 
 Starting the daemon
 -------------
 The iSCSI target driver works with the 2.6.X kernels.
 
-First, you need to compile the source code:
-
-host:~/tgt/usr$ make ISCSI=1
-
 Try the following commands:
 
 host:~/tgt$ su
-host:~/tgt# ./usr/tgtd
+host:~/tgt# service tgtd start
 
 
 Configuration
 -------------
-Everyting is configured via the tgtadm management tool.
+When started, the tgtd service will setup targets defined in
+/etc/tgt/targets.conf. To manually configure a target tgtadm
+or tgt-admin can be used.
 
 The following example creates a target with id 1 (the iqn is
 iqn.2001-04.com.example:storage.disk2.amiens.sys1.xyz) and adds a
diff --git a/doc/README.iser b/doc/README.iser
index 2361c4e..92edc61 100644
--- a/doc/README.iser
+++ b/doc/README.iser
@@ -1,6 +1,21 @@
 iSCSI Extensions for RDMA (iSER)
 ================================
 
+This is an detailed description of the iSER tgtd target. It
+covers issues from the design to how to manually set it up.
+
+NOTE:
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+To run this iSER target you must have installed the libiverbs
+and librdma rpms on your system. They will not get brought in
+automatically when installing this rpm.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+See man tgt-admin and the example /etc/tgt/targets.conf
+file for how to setup a persistent configuration that is
+started when the tgtd service is started (when "service tgtd start"
+is run).
+
 Copyright (C) 2007 Pete Wyckoff <pw at osc.edu>
 
 Background
@@ -156,28 +171,6 @@ the Linux initiator does not add padding either.
 Using iSER
 ----------
 
-Compile tgtd with "make ISCSI=1 ISCSI_RDMA=1" to build iSCSI and iSER.
-You'll need to have two libraries installed on your system:
-libibverbs.so and librdmacm.so.  If they are installed in the normal
-system paths (/usr/include and /usr/lib or /usr/lib64), they will be
-found automatically.  Otherwise, edit CFLAGS and LIBS in usr/Makefile
-near ISCSI_RDMA to specify the paths by hand, e.g., for a /usr/local
-install, it should look like:
-
-	ifneq ($(ISCSI_RDMA),)
-	CFLAGS += -DISCSI_RDMA -I/usr/local/include
-	TGTD_OBJS += iscsi/iscsi_rdma.o
-	LIBS += -L/usr/local/lib -libverbs -lrdmacm
-	endif
-
-If these libraries are not in the normal system paths, you may
-possibly also have to set, e.g., LD_LIBRARY_PATH=/usr/local/lib
-in your environment to find the shared libraries at runtime.
-
-The target will listen on all TCP interfaces (as usual), as well as all
-RDMA devices.  Both use the same default iSCSI port, 3260.  Clients on
-TCP or RDMA will connect to the same tgtd instance.
-
 Start the daemon (as root):
 
 	./tgtd


--- NEW FILE sysconfig.tgtd ---
# configuration file
#TGTD_CONFIG=/etc/tgt/targets.conf


--- NEW FILE targets.conf ---
# This is a sample config file for tgt-admin.
# By default, tgt-admin looks for its config file in /etc/tgt/targets.conf
#
# The "#" symbol disables the processing of a line.


# This one includes other config files:

#include /etc/tgt/temp/*.conf


# Set the driver. If not specified, defaults to "iscsi".

default-driver iscsi


# Continue if tgtadm exits with non-zero code (equivalent of
# --ignore-errors command line option)
#ignore-errors yes


# Sample target with one LUN only. Defaults to allow access for all initiators:

#<target iqn.2008-09.com.example:server.target1>
#    backing-store /dev/LVM/somedevice
#</target>


# Similar, but we use "direct-store" instead of "backing-store".
# "direct-store" reads drive parameters with sg_inq command and sets them to
# the target.
# Parameters fatched with sg_inq are:
# - Vendor identification
# - Product identification
# - Product revision level
# - Unit serial number (if present)
# We also specify "incominguser".

#<target iqn.2008-09.com.example:server.target2>
#    direct-store /dev/sdd
#    incominguser someuser secretpass12
#</target>


# An example with multiple LUNs, disabled write-cache (tgtd enables write-cache
# by default) and vendor identification set to "MyVendor"

#<target iqn.2008-09.com.example:server.target3>
#    backing-store /dev/LVM/somedevice1	# Becomes LUN 1
#    backing-store /dev/LVM/somedevice2	# Becomes LUN 2
#    backing-store /dev/LVM/somedevice3	# Becomes LUN 3
#    write-cache off
#    vendor_id MyCompany Inc.
#</target>


# Similar to the one above, but we fetch vendor_id, product_id, product_rev and
# scsi_sn from the disks.
# Vendor identification (vendor_id) is replaced in all disks by "MyVendor"

#<target iqn.2008-09.com.example:server.target4>
#    direct-store /dev/sdb	# Becomes LUN 1
#    direct-store /dev/sdc	# Becomes LUN 2
#    direct-store /dev/sdd	# Becomes LUN 3
#    write-cache off
#    vendor_id MyCompany Inc.
#</target>


# Note that "first-device-first-lun numbering" will work only for simple
# scenarios above, where _only_ direct-store _or_ backing-store is used.
# If you mix backing-store and direct-store, then all backing-store entries
# are processed before direct-store-entries.

#<target iqn.2008-09.com.example:server.target4>
#    direct-store /dev/sdb	# Becomes LUN 3
#    backing-store /dev/sdc	# Becomes LUN 1
#    direct-store /dev/sdd	# Becomes LUN 4
#    backing-store /dev/sde	# Becomes LUN 2
#</target>


# Even more complicated example - each device has different parameters.
# You can use indentation to make the config file more readable.
# Note that LUNs will be assigned more or less randomly here (and still
# backing-store get LUNs assigned before drect-store).
# You can specify multiple mode_page parameters (they are commented out
# in this example).
# Note that some parameters (write-cache, scsi_sn) were specified "globally".
# "Global" parameters will be applied to all LUNs; they can be overwritten
# "locally", per LUN.
# If lun is not specified, it will be allocated automatically (first available).

#<target iqn.2008-09.com.example:server.target5>

#    <direct-store /dev/sdd>
#	vendor_id VENDOR1
#	removable 1
#	device-type cd
#	lun 1
#    </direct-store>

#    <direct-store /dev/sda>
#	vendor_id VENDOR2
#	lun 2
#    </direct-store>

#    <backing-store /dev/sdb1>
#	vendor_id back1
#	scsi_sn SERIAL
#	write-cache on
	# lun 3		# lun is commented out - will be allocated automatically
#   </backing-store>

#    <backing-store /dev/sdd1>
#	vendor_id back2
	#mode_page 8:0:18:0x10:0:0xff....
	#mode_page 8:0:18:0x10:0:0xff....
	#bs-type aio
#	lun 15
#    </backing-store>

    # Some more parameters which can be specified locally or globally:
    #scsi_id ...
    #scsi_sn ...
    #vendor_id ...
    #product_id ...
    #product_rev ...
    #sense_format ...
    #removable ...
    #online ...
    #path ...
    #mode_page 8:0:18:0x10:0:0xff....
    #mode_page 8:0:18:0x10:0:0xff....
    #device-type ...
    #bs-type ...	# backing store type - default rdwr, can be aio, mmap, etc...
    #allow-in-use yes	# if specified globally, can't be overwritten locally

#    write-cache off
#    scsi_sn multipath-10

    # Parameters below are only global. They can't be configured per LUN.
    # Only allow connections from 192.168.100.1 and 192.168.200.5
#    initiator-address 192.168.100.1
#    initiator-address 192.168.200.5

    # Tuning parameters (global, per target)
    #MaxRecvDataSegmentLength 8192
    #MaxXmitDataSegmentLength 8192
    #HeaderDigest None
    #DataDigest None
    #InitialR2T Yes
    #MaxOutstandingR2T 1
    #ImmediateData Yes
    #FirstBurstLength 65536
    #MaxBurstLength 262144
    #DataPDUInOrder Yes
    #DataSequenceInOrder Yes
    #ErrorRecoveryLevel 0
    #IFMarker No
    #OFMarker No
    #DefaultTime2Wait 2
    #DefaultTime2Retain 20
    #OFMarkInt Reject
    #IFMarkInt Reject
    #MaxConnections 1

    # Allowed incoming users
#    incominguser user1 secretpass12
#    incominguser user2 secretpass23

    # Outgoing user
#    outgoinguser userA secretpassA

#</target>


# The device will have lun 1 unless you specify something else
#<target iqn.2008-09.com.example:server.target6>
#    backing-store /dev/LVM/somedevice
#    lun 10
#</target>


# Devices which are in use (by system: mounted, for swap, part of RAID, or by
# userspace: dd, by tgtd for another target etc.) can't be used, unless you use
# --force flag or add 'allow-in-use yes' option
#<target iqn.2008-09.com.example:server.target7>
#    backing-store /dev/LVM/somedevice
#    allow-in-use yes
#</target>

#<target iqn.2008-09.com.example:server.target8>
#    <backing-store /dev/LVM/somedevice>
#        scsi_sn serial1
#    </backing-store>

#    <backing-store /dev/LVM/somedevice2>
#        scsi_sn serial2
#    </backing-store>

#    allow-in-use yes
#</target>





# Not supported configurations, and therefore, commented out:

#<target iqn.2008-09.com.example:server.target9>
#    backing-store /dev/LVM/somedevice1
#    backing-store /dev/LVM/somedevice2
#    lun 10
#    lun 11
#</target>

#<target iqn.2008-09.com.example:server.target10>
#    <direct-store /dev/sdd>
#        vendor_id VENDOR1
#    </direct-store>
#
#    direct-store /dev/sdc
#</target>

# This one will break the parser:

#<target iqn.2008-09.com.example:server.target11>
#    <direct-store /dev/sdd>
#        vendor_id VENDOR1
#    </direct-store>
#
#    direct-store /dev/sdc
#
#    <direct-store /dev/sdd>
#        vendor_id VENDOR1
#    </direct-store>
#</target>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Mar 2009 08:23:28 -0000	1.6
+++ .cvsignore	22 Dec 2009 11:12:20 -0000	1.7
@@ -1 +1 @@
-tgt-0.9.5.tar.bz2
+tgt-20091205.tar.bz2


Index: scsi-target-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/scsi-target-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- scsi-target-utils.spec	21 Aug 2009 15:47:07 -0000	1.13
+++ scsi-target-utils.spec	22 Dec 2009 11:12:21 -0000	1.14
@@ -1,62 +1,75 @@
+%define         date 20091205
+
 Name:           scsi-target-utils
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.11
+Release:        1.%{date}snap%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
 License:        GPLv2
 URL:            http://stgt.berlios.de
-Source0:        http://stgt.berlios.de/releases/tgt-%{version}.tar.bz2
+#Source0:        http://stgt.berlios.de/releases/tgt-%{version}.tar.bz2
+Source0:        http://people.redhat.com/mchristi/target/tgt/snapshots/tgt-%{date}.tar.bz2
 Source1:        tgtd.init
-Patch0:         tgt-20080805-shebang.patch
-Patch1:         tgt-0.9.5-makefile.patch
+Source2:        sysconfig.tgtd
+Source3:        targets.conf
+Patch0:         scsi-target-utils-redhatify-docs.patch
+Patch1:         scsi-target-utils-dynamic-link-iser.patch
+Patch2:         scsi-target-utils-hack-check-for-eventfd.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  openssl-devel pkgconfig
-Requires:       /sbin/chkconfig  /sbin/service
+BuildRequires:  pkgconfig libibverbs-devel librdmacm-devel
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
 
 %description
 The SCSI target package contains the daemon and tools to setup a SCSI targets.
 Currently, software iSCSI targets are supported.
 
+
 %prep
-%setup -q -n tgt-%{version}
-%patch0 -p1
-%patch1 -p1
-%{__chmod}  0644 scripts/tgt-core-test
+%setup -q -n tgt-%{date}
+%patch0 -p1 -b .redhatify-docs
+%patch1 -p1 -b .dynamic-link-iser
+%patch2 -p1 -b .hack-check-for-eventfd
+
 
 %build
-if pkg-config openssl ; then
-        CPPFLAGS=$(pkg-config --cflags openssl) ; export CPPFLAGS
-        LDFLAGS=$(pkg-config --libs openssl) ; export LDFLAGS
-fi
 pushd usr
-%{__sed} -i -e 's|-g -O2|%{optflags}|' Makefile
-%{__make} %{?_smp_mflags} ISCSI=1
+%{__sed} -i -e 's|-Wall -g -O2|%{optflags}|' Makefile
+%{__make} %{?_smp_mflags} ISCSI=1 ISCSI_RDMA=1
+popd
+
 
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d %{buildroot}%{_sbindir}
 %{__install} -d %{buildroot}%{_mandir}/man8
 %{__install} -d %{buildroot}%{_initrddir}
+%{__install} -d %{buildroot}/etc/tgt
+%{__install} -d %{buildroot}/etc/sysconfig
 
+%{__install} -p -m 0755 scripts/tgt-setup-lun %{buildroot}%{_sbindir}
 %{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/tgtd
 %{__install} -p -m 0755 scripts/tgt-admin %{buildroot}/%{_sbindir}/tgt-admin
 %{__install} -p -m 0644 doc/manpages/tgtadm.8 %{buildroot}/%{_mandir}/man8
 %{__install} -p -m 0644 doc/manpages/tgt-admin.8 %{buildroot}/%{_mandir}/man8
+%{__install} -p -m 0644 doc/manpages/tgt-setup-lun.8 %{buildroot}/%{_mandir}/man8
+%{__install} -p -m 0600 %{SOURCE2} %{buildroot}/etc/sysconfig/tgtd
+%{__install} -p -m 0600 %{SOURCE3} %{buildroot}/etc/tgt
 
 pushd usr
-%{__make} install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot} sbindir=%{_sbindir}
 
-# we ship these by doc macro
-%{__rm} -rf %{buildroot}/usr/share/doc/tgt
 
 %post
 /sbin/chkconfig --add tgtd
 
 %postun
 if [ "$1" = "1" ] ; then
-     /sbin/service tgtd condrestart > /dev/null 2>&1
+     /sbin/service tgtd condrestart > /dev/null 2>&1 || :
 fi
 
 %preun
@@ -65,13 +78,14 @@ if [ "$1" = "0" ] ; then
      /sbin/chkconfig --del tgtd
 fi
 
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %files
 %defattr(-, root, root, -)
-%doc README doc/README.* doc/targets.conf.example doc/tmf.txt doc/TODO
-%doc scripts/tgt-core-test
+%doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration doc/README.mmc
 %{_sbindir}/tgtd
 %{_sbindir}/tgtadm
 %{_sbindir}/tgt-setup-lun
@@ -79,8 +93,24 @@ fi
 %{_sbindir}/tgtimg
 %{_mandir}/man8/*
 %{_initrddir}/tgtd
+%attr(0600,root,root) %config(noreplace) /etc/sysconfig/tgtd
+%attr(0600,root,root) %config(noreplace) /etc/tgt/targets.conf
+
 
 %changelog
+* Mon Dec 21 2009 Hans de Goede <hdegoede at redhat.com> - 0.9.11-1.20091205snap
+- Rebase to 0.9.11 + some fixes from git (git id
+  97832d8dcd00202a493290b5d134b581ce20885c)
+- Rewrite initscript, make it follow:
+  http://fedoraproject.org/wiki/Packaging/SysVInitScript
+  And merge in RHEL-5 initscript improvements:
+  - Parse /etc/tgt/targets.conf, which allows easy configuration of targets
+  - Better initiator status checking in stop
+  - Add force-stop, to stop even when initiators are still connected
+  - Make reload reload configuration from /etc/tgt/targets.conf without
+    stopping tgtd (but only for unused targets)
+  - Add force-reload (reloads configs for all targets including busy ones)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Mar 2009 08:23:28 -0000	1.6
+++ sources	22 Dec 2009 11:12:21 -0000	1.7
@@ -1 +1 @@
-43d95cb4163de21459ffee300764d11a  tgt-0.9.5.tar.bz2
+6f469f376b1ceb00725ceb00b2f1e6f8  tgt-20091205.tar.bz2


Index: tgtd.init
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/tgtd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tgtd.init	11 Oct 2007 17:41:40 -0000	1.1
+++ tgtd.init	22 Dec 2009 11:12:21 -0000	1.2
@@ -17,73 +17,200 @@
 . /etc/init.d/functions
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
+TGTD_CONFIG=/etc/tgt/targets.conf
 
-RETVAL=0
+prog="SCSI target daemon"
+exec=tgtd
+lockfile=/var/lock/subsys/$exec
+
+# Check for and source configuration file otherwise use defaults above
+[ -f /etc/sysconfig/$exec ] && . /etc/sysconfig/$exec
 
 start()
 {
-	echo -n $"Starting SCSI target daemon: "
-	if [ -f /var/lock/subsys/tgtd ]; then
+	[ -x /usr/sbin/$exec ] || exit 5
+	echo -n $"Starting $prog: "
+	# Note /dev/null redirection to silence rdma not found messages
+	daemon $exec >/dev/null 2>&1
+	retval=$?
+	if [ $retval -ne 0 ] ; then
+		failure
 		echo
-		success
-		return
+		return $retval
 	fi
 
-	daemon tgtd
+	success
 	echo
-	RETVAL=$?
-	if [ $RETVAL -eq "0" ]; then
-		touch /var/lock/subsys/tgtd
-	fi
+	touch $lockfile
+
+	# Put tgtd into "offline" state until all the targets are configured.
+	# We don't want initiators to (re)connect and fail the connection
+	# if it's not ready.
+	tgtadm --op update --mode sys --name State -v offline
+	# Configure the targets.
+	tgt-admin -e -c $TGTD_CONFIG
+	# Put tgtd into "ready" state.
+	tgtadm --op update --mode sys --name State -v ready
+
+	return 0
 }
 
 stop()
 {
-	echo -n $"Stopping SCSI target daemon: "
+	if [ "$RUNLEVEL" == 0 -o "$RUNLEVEL" == 6 ] ; then
+		force_stop
+		return $?
+	fi
+
+	echo -n $"Stopping $prog: "
+	# Remove all targets. It only removes targets which are not in use.
+	tgt-admin --update ALL -c /dev/null >/dev/null 2>&1
+	# tgtd will exit if all targets were removed
+	tgtadm --op delete --mode system >/dev/null 2>&1
+	retval=$?
+	if [ "$retval" -eq 107 ] ; then
+		echo -n $"not running"
+		failure
+		echo
+		return 7
+	elif [ "$retval" -ne 0 ] ; then
+		echo -n $"initiators still connected"
+		failure
+		echo
+		return 1
+	fi
+
+	success
+	echo
+	rm -f $lockfile
+	return 0
+}
 
-	if [ ! -f /var/lock/subsys/tgtd ]; then
+force_stop()
+{
+	# NOTE: Forced shutdown of the iscsi target may cause data corruption
+	# for initiators that are connected.
+	echo -n $"Force-stopping $prog: "
+	# Offline everything first. May be needed if we're rebooting, but
+	# expect the initiators to reconnect cleanly when we boot again
+	# (i.e. we don't want them to reconnect to a tgtd which is still
+	# working, but the target is gone).
+	tgtadm --op update --mode sys --name State -v offline >/dev/null 2>&1
+	retval=$?
+	if [ "$retval" -eq 107 ] ; then
+		echo -n $"not running"
+		failure
 		echo
-		success
-		return
+		return 7
+	else
+		tgt-admin --offline ALL
+		# Remove all targets, even if they are still in use.
+		tgt-admin --update ALL -c /dev/null -f
+		# It will shut down tgtd only after all targets were removed.
+		tgtadm --op delete --mode system
+		retval=$?
+		if [ "$retval" -ne 0 ] ; then
+			failure
+			echo
+			return 1
+		fi
 	fi
 
-	if tgtadm --op show -m target | grep "Target" >/dev/null ; then
-		echo $"Targets still in use. Cannot shutdown service."
-		RETVAL=1
-		return
+	success
+	echo
+	rm -f $lockfile
+	return 0
+}
+
+reload() {
+	echo -n $"Updating $prog configuration: "
+	# Update configuration for targets. Only targets which
+	# are not in use will be updated.
+	tgt-admin --update ALL -c $TGTD_CONFIG >/dev/null 2>&1
+	retval=$?
+	if [ "$retval" -eq 107 ] ; then
+		echo -n $"not running"
+		failure
+		echo
+		return 7
+	elif [ "$retval" -ne 0 ] ; then
+		failure
+		echo
+		return 1
 	fi
 
-	killproc tgtd
+	success
 	echo
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/tgtd
+	return 0
 }
 
-restart()
-{
-	stop
-	start
+force_reload() {
+	echo -n $"Force-updating $prog configuration: "
+	# Update configuration for targets, even those in use.
+	tgt-admin --update ALL -f -c $TGTD_CONFIG >/dev/null 2>&1
+	retval=$?
+	if [ "$retval" -eq 107 ] ; then
+		echo -n $"not running"
+		failure
+		echo
+		return 7
+	elif [ "$retval" -ne 0 ] ; then
+		failure
+		echo
+		return 1
+	fi
+
+	success
+	echo
+	return 0
+}
+
+rh_status() {
+	# run checks to determine if the service is running or use generic status
+	status $exec
+}
+
+rh_status_q() {
+	rh_status >/dev/null 2>&1
 }
 
+
 case "$1" in
 	start)
-		start
+		rh_status_q && exit 0
+		$1
 		;;
 	stop)
-		stop
+		rh_status_q || exit 0
+		$1
+		;;
+	force-stop)
+		force_stop
 		;;
 	restart)
-		restart
+		stop
+		start
+		;;
+	force-restart)
+		force_stop
+		start
+		;;
+	reload)
+		rh_status_q || exit 7
+		$1
+		;;
+	force-reload)
+		force_reload
 		;;
 	status)
-		status tgtd
-		RETVAL=$?
+		rh_status
 		;;
-	condrestart)
-		[ -f /var/lock/subsys/tgtd ] && restart
+	condrestart|try-restart)
+		rh_status_q || exit 0
+		restart
 		;;
 	*)
-		echo $"Usage: $0 {start|stop|restart|status|condrestart}"
-		exit 1
+		echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-stop|force-restart|force-reload}"
+		exit 2
 esac
-exit $RETVAL
+exit $?


--- tgt-0.9.5-makefile.patch DELETED ---


--- tgt-20080805-shebang.patch DELETED ---



From jussilehtola at fedoraproject.org  Tue Dec 22 11:22:19 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Dec 2009 11:22:19 +0000 (UTC)
Subject: rpms/pypar/devel pypar.spec,1.3,1.4
Message-ID: <20091222112219.411A411C00E9@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pypar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18211

Modified Files:
	pypar.spec 
Log Message:
Update to 2.1.4_94, apply MPI guidelines, fix FTBFS.


Index: pypar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypar/devel/pypar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pypar.spec	26 Jul 2009 19:56:03 -0000	1.3
+++ pypar.spec	22 Dec 2009 11:22:18 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		pypar
-Version:	2.1.0_66
-Release:	5%{?dist}
+Version:	2.1.4_94
+Release:	1%{?dist}
 Summary:	Parallel programming with Python
 Group:		Development/Libraries
 License:	GPLv2+
@@ -12,102 +12,164 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	numpy
 BuildRequires:	python-setuptools-devel
+
+%description
+Pypar is an efficient but easy-to-use module that allows programs written in
+Python to run in parallel on multiple processors and communicate using message
+passing. Pypar provides bindings to a subset of the message passing interface
+standard MPI.
+
+%package common
+Summary:	Common files for pypar packages
+Group:		Documentation
+BuildArch:	noarch
+
+%description common
+This package contains common files shared by all MPI flavors of pypar:
+the license, the documentation and the examples.
+
+%package openmpi
+Summary:	Parallel programming with Python, Open MPI version
+Group:          Development/Libraries
+Obsoletes:	%{name} < %{version}-%{release}
+Requires:	%{name}-common = %{version}-%{release}
+Provides:	pypar-runtime = %{version}-%{release}
 BuildRequires:	openmpi-devel
+Requires:       numpy
+Requires:	openmpi
+
+%description openmpi
+Pypar is an efficient but easy-to-use module that allows programs written in
+Python to run in parallel on multiple processors and communicate using message
+passing. Pypar provides bindings to a subset of the message passing interface
+standard MPI.
 
-Requires:	numpy
+This package contains pypar compiled against Open MPI.
 
-# Check for mpi-selector or environment-modules
-%global selector 0
-%global modules 0
-
-%if 0%{?fedora} > 9
-%global modules 1
-%endif
-
-%if 0%{?rhel} == 4
-%global selector 1
-%endif
-
-%if 0%{?rhel} == 5
-%global selector 1
-%endif
-
-%if %modules == 1
-BuildRequires:  environment-modules
-%endif
-
-%if %selector == 1
-BuildRequires:  mpi-selector
-%endif
+%package mpich2
+Summary:        Parallel programming with Python, MPICH2 version
+Group:          Development/Libraries
+Requires:	%{name}-common = %{version}-%{release}
+Provides:	pypar-runtime = %{version}-%{release}
+BuildRequires:	mpich2-devel
+Requires:       numpy
+Requires:	mpich2
 
-%description
+%description mpich2
 Pypar is an efficient but easy-to-use module that allows programs written in
 Python to run in parallel on multiple processors and communicate using message
 passing. Pypar provides bindings to a subset of the message passing interface
 standard MPI.
 
+This package contains pypar compiled against MPICH2.
+
+
 %prep
-%setup -q -n %{name}_%{version}
+# Setup buildroot but don't extract anything yet
+%setup -q -c -T
+
+# Decompress tarball
+tar zxf %{SOURCE0}
+
+# Make separate dirs for all MPI variants
+for mpi in openmpi mpich2; do 
+ cp -r pypar_%{version} $mpi
+done 
+
+# Clean out unneeded dir
+rm -rf pypar_%{version}
+
 
 %build
-# Load MPI enviroment
-%if %modules == 1
-. /etc/profile.d/modules.sh
-%if 0%{?fedora} < 12
-module load %{_libdir}/openmpi/*/openmpi.module
-%else
-module load openmpi-%{_arch}
-%endif
-export CFLAGS="$CFLAGS %{optflags}"
-%endif
-
-%if %selector == 1
-mpi-selector --set `mpi-selector --list | grep openmpi`
-source /etc/profile.d/mpi-selector.sh
-%endif
+export CC=mpicc
+export CXX=mpicxx
+
+# Build Open MPI version
+%{_openmpi_load}
+cd openmpi/source 
+CFLAGS="%{optflags}" python -c 'import setuptools; execfile("setup.py")' build
+cd -
+%{_openmpi_unload}
 
-cd source 
+# Build MPICH2 version
+%{_mpich2_load}
+cd mpich2/source
 CFLAGS="%{optflags}" python -c 'import setuptools; execfile("setup.py")' build
+cd -
+%{_mpich2_unload}
 
 
 %install
 rm -rf %{buildroot}
-cd source
+
+export CC=mpicc
+export CXX=mpicxx
+export LD=mpicc
+
+%{_openmpi_load}
+cd openmpi/source
+python -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
+mkdir -p %{buildroot}%{python_sitearch}/openmpi
+mv %{buildroot}%{python_sitearch}/pypar/ %{buildroot}%{python_sitearch}/Pypar*.egg-info %{buildroot}%{python_sitearch}/openmpi
+cd -
+%{_openmpi_unload}
+
+%{_mpich2_load}
+cd mpich2/source
 python -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
-cd ..
+mkdir -p %{buildroot}%{python_sitearch}/mpich2
+mv %{buildroot}%{python_sitearch}/pypar/ %{buildroot}%{python_sitearch}/Pypar*.egg-info %{buildroot}%{python_sitearch}/mpich2
+cd -
+%{_mpich2_unload}
+
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files common
+%defattr(-,root,root,-)
+%doc openmpi/documentation/* openmpi/LICENSE openmpi/demos/
+
+%files openmpi
 %defattr(-,root,root,-)
-%doc documentation/* LICENSE demos/
-%{python_sitearch}/pypar/
-%{python_sitearch}/Pypar*.egg-info
+%{python_sitearch}/openmpi/pypar/
+%{python_sitearch}/openmpi/Pypar*.egg-info
+
+%files mpich2
+%defattr(-,root,root,-)
+%{python_sitearch}/mpich2/pypar/
+%{python_sitearch}/mpich2/Pypar*.egg-info
 
 %changelog
+* Tue Dec 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.4_94-1
+- Update to 2.1.4_94, fixing MPICH2 build issue.
+
+* Mon Dec 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.3_91-1
+- Implement MPI guidelines, adding MPICH2 package.
+- Update to 2.1.3_91.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0_66-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul 23 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-4
+* Thu Jul 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_66-4
 - Openmpi seems to have been fixed, fix build in rawhide.
 
-* Thu Jun 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-3
+* Thu Jun 04 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_66-3
 - Fix build in rawhide.
 
-* Fri May 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-2
+* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_66-2
 - Merge examples into main package and %doc.
 - Spec file cleanups.
 
-* Mon Mar 02 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-1
+* Mon Mar 02 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_66-1
 - Update to 2.1.0_66.
 - Branch examples into subpackage.
 
-* Sun Feb 29 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_64-1
+* Sun Feb 29 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_64-1
 - Update to 2.1.0_64.
 
-* Sat Feb 28 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_63-1
+* Sat Feb 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_63-1
 - Update to 2.1.0_63 that should fix rpmlint errors.
 
-* Thu Feb 26 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_53-1
+* Thu Feb 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_53-1
 - First release.



From jussilehtola at fedoraproject.org  Tue Dec 22 11:22:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Dec 2009 11:22:39 +0000 (UTC)
Subject: File pypar-2.1.4_94.tgz uploaded to lookaside cache by jussilehtola
Message-ID: <20091222112239.75CD810F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for pypar:

5ee3e2170fa3927a292eb8a067165ebc  pypar-2.1.4_94.tgz



From jussilehtola at fedoraproject.org  Tue Dec 22 11:22:52 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Dec 2009 11:22:52 +0000 (UTC)
Subject: rpms/pypar/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091222112252.A654011C00E9@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pypar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18319

Modified Files:
	.cvsignore sources 
Log Message:
Update to 2.1.4_94, apply MPI guidelines, fix FTBFS.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 17:19:40 -0000	1.2
+++ .cvsignore	22 Dec 2009 11:22:52 -0000	1.3
@@ -1 +1 @@
-pypar-2.1.0_66.tgz
+pypar-2.1.4_94.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 17:19:41 -0000	1.2
+++ sources	22 Dec 2009 11:22:52 -0000	1.3
@@ -1 +1 @@
-d7cbd967f078b751fd4d2aa7755dd34a  pypar-2.1.0_66.tgz
+5ee3e2170fa3927a292eb8a067165ebc  pypar-2.1.4_94.tgz



From sharkcz at fedoraproject.org  Tue Dec 22 11:24:25 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 22 Dec 2009 11:24:25 +0000 (UTC)
Subject: rpms/s390utils/devel cpi.initd,1.1,1.2
Message-ID: <20091222112425.E4EEC11C00E9@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18572

Modified Files:
	cpi.initd 
Log Message:
update the cpi initscript


Index: cpi.initd
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/cpi.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpi.initd	9 Nov 2009 19:30:31 -0000	1.1
+++ cpi.initd	22 Dec 2009 11:24:25 -0000	1.2
@@ -2,7 +2,7 @@
 #
 # Copyright 2009 Red Hat, Inc.
 # License: GPLv2
-# Author: Dan Horak <dhorak at redhat.com>
+# Author: Dan Hor?k <dhorak at redhat.com>
 #
 # cpi Set Control Program Identification on IBM zSeries
 #
@@ -33,6 +33,8 @@ prog="cpi"
 cpipath=/sys/firmware/cpi
 
 start() {
+    [ `id -u` -eq 0 ] || return 4
+    
     echo -n $"Starting $prog: "
 
     if [ -d $cpipath ]; then



From jussilehtola at fedoraproject.org  Tue Dec 22 11:30:29 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Dec 2009 11:30:29 +0000 (UTC)
Subject: rpms/pypar/devel pypar.spec,1.4,1.5
Message-ID: <20091222113029.6673C11C00E9@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pypar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19288

Modified Files:
	pypar.spec 
Log Message:
Added missing BR: python-devel.


Index: pypar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypar/devel/pypar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pypar.spec	22 Dec 2009 11:22:18 -0000	1.4
+++ pypar.spec	22 Dec 2009 11:30:28 -0000	1.5
@@ -11,7 +11,8 @@ Source0:	http://downloads.sourceforge.ne
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	numpy
-BuildRequires:	python-setuptools-devel
+BuildRequires:	python-devel
+BuildRequires:	python-setuptools
 
 %description
 Pypar is an efficient but easy-to-use module that allows programs written in



From pbrobinson at fedoraproject.org  Tue Dec 22 11:33:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Dec 2009 11:33:42 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.11, 1.12 anjal.spec, 1.14, 1.15 sources,
	1.11, 1.12
Message-ID: <20091222113342.726C111C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19735

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- move to git to compile against new evolution


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Dec 2009 03:43:11 -0000	1.11
+++ .cvsignore	22 Dec 2009 11:33:42 -0000	1.12
@@ -1 +1 @@
-anjal-0.2.0-20091202.tar.bz2
+anjal-0.2.0-20091222.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- anjal.spec	2 Dec 2009 03:43:11 -0000	1.14
+++ anjal.spec	22 Dec 2009 11:33:42 -0000	1.15
@@ -1,15 +1,15 @@
 # Tarfile created using git
 # git clone git://git.gnome.org/anjal
-# git archive --format=tar --prefix=anjal-0.2.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
+# git archive --format=tar --prefix=anjal-0.2.0/ %{git_version} | bzip2 > anjal-0.2.0-%{gitdate}.tar.bz2
 
-%define gitdate 20091202
-%define git_version 224e189
+%define gitdate 20091222
+%define git_version 0d718ab
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:          anjal
 Version:       0.2.0
-Release:       0.2%{?dist}
+Release:       0.1%{?dist}
 Summary:       An email client for small screen devices
 
 Group:         Applications/Productivity
@@ -96,10 +96,7 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
-* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-0.2
-- Upload source file
-
-* Wed Dec  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-0.1
+* Tue Dec 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-0.1
 - Update to git snapshot for evolution 2.29 release
 
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Dec 2009 03:43:11 -0000	1.11
+++ sources	22 Dec 2009 11:33:42 -0000	1.12
@@ -1 +1 @@
-31a5cdfed24ea4fa74d558dbca80c9cf  anjal-0.2.0-20091202.tar.bz2
+083fb12cea4a34a48ec66369ffb634e2  anjal-0.2.0-20091222.tar.bz2



From mmaslano at fedoraproject.org  Tue Dec 22 11:37:13 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 11:37:13 +0000 (UTC)
Subject: rpms/perl-Class-XSAccessor/devel perl-Class-XSAccessor.spec,1.8,1.9
Message-ID: <20091222113713.217D711C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Class-XSAccessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20158

Modified Files:
	perl-Class-XSAccessor.spec 
Log Message:
* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.05-3
- Class::XSAccessor::Array became a part of this package - fixes conflict of man



Index: perl-Class-XSAccessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-XSAccessor/devel/perl-Class-XSAccessor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-XSAccessor.spec	22 Dec 2009 09:56:15 -0000	1.8
+++ perl-Class-XSAccessor.spec	22 Dec 2009 11:37:12 -0000	1.9
@@ -30,7 +30,6 @@ 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 {} \;
@@ -40,7 +39,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+#make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,12 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changes README
 %{perl_vendorarch}/auto/*
 %{perl_vendorarch}/Class*
-%{_mandir}/man3/Class::XSAccessor.3pm.gz
-%{_mandir}/man3/Class::XSAccessor::Heavy.3pm.gz
+%{_mandir}/man3/Class::*
 
 %changelog
 * Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.05-3
-- package only those man, which are really owned by this package
+- Class::XSAccessor::Array became a part of this package - fixes conflict of man
 
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.05-2
 - rebuild against perl 5.10.1



From jakub at fedoraproject.org  Tue Dec 22 11:38:27 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 22 Dec 2009 11:38:27 +0000 (UTC)
Subject: File gcc-4.4.2-20091222.tar.bz2 uploaded to lookaside cache by jakub
Message-ID: <20091222113827.D1E3C10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gcc:

190cf32f4e2f3e5261cda2ba32be0912  gcc-4.4.2-20091222.tar.bz2



From mmaslano at fedoraproject.org  Tue Dec 22 11:38:55 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 11:38:55 +0000 (UTC)
Subject: rpms/perl-Class-XSAccessor/devel perl-Class-XSAccessor.spec,1.9,1.10
Message-ID: <20091222113855.3276F11C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Class-XSAccessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20490

Modified Files:
	perl-Class-XSAccessor.spec 
Log Message:
* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.05-3
- Class::XSAccessor::Array became a part of this package - fixes conflict of man



Index: perl-Class-XSAccessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-XSAccessor/devel/perl-Class-XSAccessor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-XSAccessor.spec	22 Dec 2009 11:37:12 -0000	1.9
+++ perl-Class-XSAccessor.spec	22 Dec 2009 11:38:54 -0000	1.10
@@ -10,6 +10,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  perl(AutoXS::Header)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
+Obsoletes:      perl(Class::XSAccessor::Array)
+# automagically provided
 Requires:       perl(AutoXS::Header)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 



From jussilehtola at fedoraproject.org  Tue Dec 22 11:42:48 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Tue, 22 Dec 2009 11:42:48 +0000 (UTC)
Subject: rpms/pypar/F-12 pypar.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091222114248.A060411C00E9@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pypar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21085

Modified Files:
	pypar.spec sources 
Log Message:
Update to 2.1.4_94, apply MPI guidelines.


Index: pypar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypar/F-12/pypar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pypar.spec	26 Jul 2009 19:56:03 -0000	1.3
+++ pypar.spec	22 Dec 2009 11:42:48 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		pypar
-Version:	2.1.0_66
-Release:	5%{?dist}
+Version:	2.1.4_94
+Release:	1%{?dist}
 Summary:	Parallel programming with Python
 Group:		Development/Libraries
 License:	GPLv2+
@@ -11,103 +11,166 @@ Source0:	http://downloads.sourceforge.ne
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	numpy
-BuildRequires:	python-setuptools-devel
+BuildRequires:	python-devel
+BuildRequires:	python-setuptools
+
+%description
+Pypar is an efficient but easy-to-use module that allows programs written in
+Python to run in parallel on multiple processors and communicate using message
+passing. Pypar provides bindings to a subset of the message passing interface
+standard MPI.
+
+%package common
+Summary:	Common files for pypar packages
+Group:		Documentation
+BuildArch:	noarch
+
+%description common
+This package contains common files shared by all MPI flavors of pypar:
+the license, the documentation and the examples.
+
+%package openmpi
+Summary:	Parallel programming with Python, Open MPI version
+Group:          Development/Libraries
+Obsoletes:	%{name} < %{version}-%{release}
+Requires:	%{name}-common = %{version}-%{release}
+Provides:	pypar-runtime = %{version}-%{release}
 BuildRequires:	openmpi-devel
+Requires:       numpy
+Requires:	openmpi
+
+%description openmpi
+Pypar is an efficient but easy-to-use module that allows programs written in
+Python to run in parallel on multiple processors and communicate using message
+passing. Pypar provides bindings to a subset of the message passing interface
+standard MPI.
 
-Requires:	numpy
+This package contains pypar compiled against Open MPI.
 
-# Check for mpi-selector or environment-modules
-%global selector 0
-%global modules 0
-
-%if 0%{?fedora} > 9
-%global modules 1
-%endif
-
-%if 0%{?rhel} == 4
-%global selector 1
-%endif
-
-%if 0%{?rhel} == 5
-%global selector 1
-%endif
-
-%if %modules == 1
-BuildRequires:  environment-modules
-%endif
-
-%if %selector == 1
-BuildRequires:  mpi-selector
-%endif
+%package mpich2
+Summary:        Parallel programming with Python, MPICH2 version
+Group:          Development/Libraries
+Requires:	%{name}-common = %{version}-%{release}
+Provides:	pypar-runtime = %{version}-%{release}
+BuildRequires:	mpich2-devel
+Requires:       numpy
+Requires:	mpich2
 
-%description
+%description mpich2
 Pypar is an efficient but easy-to-use module that allows programs written in
 Python to run in parallel on multiple processors and communicate using message
 passing. Pypar provides bindings to a subset of the message passing interface
 standard MPI.
 
+This package contains pypar compiled against MPICH2.
+
+
 %prep
-%setup -q -n %{name}_%{version}
+# Setup buildroot but don't extract anything yet
+%setup -q -c -T
+
+# Decompress tarball
+tar zxf %{SOURCE0}
+
+# Make separate dirs for all MPI variants
+for mpi in openmpi mpich2; do 
+ cp -r pypar_%{version} $mpi
+done 
+
+# Clean out unneeded dir
+rm -rf pypar_%{version}
+
 
 %build
-# Load MPI enviroment
-%if %modules == 1
-. /etc/profile.d/modules.sh
-%if 0%{?fedora} < 12
-module load %{_libdir}/openmpi/*/openmpi.module
-%else
-module load openmpi-%{_arch}
-%endif
-export CFLAGS="$CFLAGS %{optflags}"
-%endif
-
-%if %selector == 1
-mpi-selector --set `mpi-selector --list | grep openmpi`
-source /etc/profile.d/mpi-selector.sh
-%endif
+export CC=mpicc
+export CXX=mpicxx
+
+# Build Open MPI version
+%{_openmpi_load}
+cd openmpi/source 
+CFLAGS="%{optflags}" python -c 'import setuptools; execfile("setup.py")' build
+cd -
+%{_openmpi_unload}
 
-cd source 
+# Build MPICH2 version
+%{_mpich2_load}
+cd mpich2/source
 CFLAGS="%{optflags}" python -c 'import setuptools; execfile("setup.py")' build
+cd -
+%{_mpich2_unload}
 
 
 %install
 rm -rf %{buildroot}
-cd source
+
+export CC=mpicc
+export CXX=mpicxx
+export LD=mpicc
+
+%{_openmpi_load}
+cd openmpi/source
+python -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
+mkdir -p %{buildroot}%{python_sitearch}/openmpi
+mv %{buildroot}%{python_sitearch}/pypar/ %{buildroot}%{python_sitearch}/Pypar*.egg-info %{buildroot}%{python_sitearch}/openmpi
+cd -
+%{_openmpi_unload}
+
+%{_mpich2_load}
+cd mpich2/source
 python -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
-cd ..
+mkdir -p %{buildroot}%{python_sitearch}/mpich2
+mv %{buildroot}%{python_sitearch}/pypar/ %{buildroot}%{python_sitearch}/Pypar*.egg-info %{buildroot}%{python_sitearch}/mpich2
+cd -
+%{_mpich2_unload}
+
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files common
+%defattr(-,root,root,-)
+%doc openmpi/documentation/* openmpi/LICENSE openmpi/demos/
+
+%files openmpi
 %defattr(-,root,root,-)
-%doc documentation/* LICENSE demos/
-%{python_sitearch}/pypar/
-%{python_sitearch}/Pypar*.egg-info
+%{python_sitearch}/openmpi/pypar/
+%{python_sitearch}/openmpi/Pypar*.egg-info
+
+%files mpich2
+%defattr(-,root,root,-)
+%{python_sitearch}/mpich2/pypar/
+%{python_sitearch}/mpich2/Pypar*.egg-info
 
 %changelog
+* Tue Dec 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.4_94-1
+- Update to 2.1.4_94, fixing MPICH2 build issue.
+
+* Mon Dec 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.3_91-1
+- Implement MPI guidelines, adding MPICH2 package.
+- Update to 2.1.3_91.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0_66-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul 23 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-4
+* Thu Jul 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_66-4
 - Openmpi seems to have been fixed, fix build in rawhide.
 
-* Thu Jun 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-3
+* Thu Jun 04 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_66-3
 - Fix build in rawhide.
 
-* Fri May 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-2
+* Fri May 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_66-2
 - Merge examples into main package and %doc.
 - Spec file cleanups.
 
-* Mon Mar 02 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_66-1
+* Mon Mar 02 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_66-1
 - Update to 2.1.0_66.
 - Branch examples into subpackage.
 
-* Sun Feb 29 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_64-1
+* Sun Feb 29 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_64-1
 - Update to 2.1.0_64.
 
-* Sat Feb 28 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_63-1
+* Sat Feb 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_63-1
 - Update to 2.1.0_63 that should fix rpmlint errors.
 
-* Thu Feb 26 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.1.0_53-1
+* Thu Feb 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0_53-1
 - First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypar/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 17:19:41 -0000	1.2
+++ sources	22 Dec 2009 11:42:48 -0000	1.3
@@ -1 +1 @@
-d7cbd967f078b751fd4d2aa7755dd34a  pypar-2.1.0_66.tgz
+5ee3e2170fa3927a292eb8a067165ebc  pypar-2.1.4_94.tgz



From mmaslano at fedoraproject.org  Tue Dec 22 11:43:03 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 11:43:03 +0000 (UTC)
Subject: rpms/perl-Class-XSAccessor/devel perl-Class-XSAccessor.spec, 1.10,
	1.11
Message-ID: <20091222114303.7D19311C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Class-XSAccessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21202

Modified Files:
	perl-Class-XSAccessor.spec 
Log Message:
* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.05-4
- rebuild with obsoletes in spec



Index: perl-Class-XSAccessor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-XSAccessor/devel/perl-Class-XSAccessor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Class-XSAccessor.spec	22 Dec 2009 11:38:54 -0000	1.10
+++ perl-Class-XSAccessor.spec	22 Dec 2009 11:43:03 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Class-XSAccessor
 Version:        1.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Generate fast XS accessors without runtime compilation
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Class::*
 
 %changelog
+* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.05-4
+- rebuild with obsoletes in spec
+
 * Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.05-3
 - Class::XSAccessor::Array became a part of this package - fixes conflict of man
 



From mmaslano at fedoraproject.org  Tue Dec 22 11:45:05 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 11:45:05 +0000 (UTC)
Subject: rpms/perl-Class-XSAccessor-Array/devel dead.package, NONE,
	1.1 perl-Class-XSAccessor-Array.spec, 1.5, NONE
Message-ID: <20091222114505.3183D11C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Class-XSAccessor-Array/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21782

Added Files:
	dead.package 
Removed Files:
	perl-Class-XSAccessor-Array.spec 
Log Message:
It became part of perl-Class-XSAccessor.



--- NEW FILE dead.package ---
It became part of perl-Class-XSAccessor.


--- perl-Class-XSAccessor-Array.spec DELETED ---



From pkgdb at fedoraproject.org  Tue Dec 22 11:46:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 11:46:02 +0000
Subject: [pkgdb] perl-Class-XSAccessor-Array ownership updated
Message-ID: <20091222114602.3225810F85E@bastion.fedoraproject.org>

Package perl-Class-XSAccessor-Array in Fedora devel was orphaned by mmaslano

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-XSAccessor-Array



From pkgdb at fedoraproject.org  Tue Dec 22 11:46:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 11:46:02 +0000
Subject: [pkgdb] perl-Class-XSAccessor-Array (un)retirement
Message-ID: <20091222114602.40AFD10F8BC@bastion.fedoraproject.org>

Package perl-Class-XSAccessor-Array in Fedora devel has been retired by mmaslano

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-XSAccessor-Array



From pbrobinson at fedoraproject.org  Tue Dec 22 11:46:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Dec 2009 11:46:30 +0000 (UTC)
Subject: rpms/anjal/devel anjal.spec,1.15,1.16
Message-ID: <20091222114630.152F611C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21962

Modified Files:
	anjal.spec 
Log Message:
- rev bump


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- anjal.spec	22 Dec 2009 11:33:42 -0000	1.15
+++ anjal.spec	22 Dec 2009 11:46:29 -0000	1.16
@@ -9,7 +9,7 @@
 
 Name:          anjal
 Version:       0.2.0
-Release:       0.1%{?dist}
+Release:       0.3%{?dist}
 Summary:       An email client for small screen devices
 
 Group:         Applications/Productivity
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Tue Dec 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-0.3
+- rev bump
+
 * Tue Dec 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-0.1
 - Update to git snapshot for evolution 2.29 release
 



From jakub at fedoraproject.org  Tue Dec 22 11:57:46 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 22 Dec 2009 11:57:46 +0000 (UTC)
Subject: rpms/gcc/F-12 fastjar-0.97-len1.patch, NONE, 1.1 .cvsignore, 1.317,
	1.318 gcc.spec, 1.100, 1.101 sources, 1.324, 1.325
Message-ID: <20091222115746.EBD3111C00E9@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23284

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	fastjar-0.97-len1.patch 
Log Message:
4.4.2-20

fastjar-0.97-len1.patch:
 jartool.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fastjar-0.97-len1.patch ---
2009-12-21  Chris Ball  <cjb at laptop.org>

	* jartool.c (add_file_to_jar): Test write return value against -1
	instead of 1.

--- fastjar-0.97/jartool.c.jj	2008-10-15 12:35:37.000000000 -0400
+++ fastjar-0.97/jartool.c	2009-12-22 06:48:09.309530000 -0500
@@ -1257,7 +1257,7 @@ int add_file_to_jar(int jfd, int ffd, co
       exit_on_error("write");
 
   /* write the file name to the zip file */
-  if (1 == write(jfd, fname, file_name_length))
+  if (-1 == write(jfd, fname, file_name_length))
     exit_on_error("write");
 
   if(verbose){


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- .cvsignore	17 Dec 2009 20:07:54 -0000	1.317
+++ .cvsignore	22 Dec 2009 11:57:45 -0000	1.318
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091217.tar.bz2
+gcc-4.4.2-20091222.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gcc.spec	17 Dec 2009 20:07:54 -0000	1.100
+++ gcc.spec	22 Dec 2009 11:57:46 -0000	1.101
@@ -1,12 +1,16 @@
-%global DATE 20091217
-%global SVNREV 155325
+%global DATE 20091222
+%global SVNREV 155395
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 18
+%global gcc_release 20
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
+%if 0%{?fedora} >= 13
+%global include_gappletviewer 0
+%else
 %global include_gappletviewer 1
+%endif
 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
 %global build_ada 1
 %else
@@ -164,6 +168,7 @@ Patch19: gcc44-ppc64-aixdesc.patch
 Patch20: gcc44-rh546017.patch
 
 Patch1000: fastjar-0.97-segfault.patch
+Patch1001: fastjar-0.97-len1.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -348,7 +353,9 @@ Requires: libart_lgpl >= 2.1.0
 %if %{build_java}
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: glib2-devel >= 2.4.0
+%if %{include_gappletviewer}
 BuildRequires: xulrunner-devel
+%endif
 BuildRequires: libart_lgpl-devel >= 2.1.0
 BuildRequires: alsa-lib-devel
 BuildRequires: libXtst-devel
@@ -475,6 +482,7 @@ rm libjava/testsuite/libjava.lang/PR3502
 tar xzf %{SOURCE4}
 
 %patch1000 -p0 -b .fastjar-0.97-segfault~
+%patch1001 -p0 -b .fastjar-0.97-len1~
 
 %if %{bootstrap_java}
 tar xjf %{SOURCE10}
@@ -613,7 +621,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`
 %if !%{build_java}
 	--disable-libgcj \
 %else
-	--enable-java-awt=gtk --disable-dssi --enable-plugin \
+	--enable-java-awt=gtk --disable-dssi \
+%if %{include_gappletviewer}
+	--enable-plugin \
+%endif
 	--with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
 	--enable-libgcj-multifile \
 %if !%{bootstrap_java}
@@ -1853,6 +1864,14 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Dec 22 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-20
+- fix MEM_SIZE of reload created stack slots (#548825,
+  PR rtl-optimization/42429)
+%if !%{include_gappletviewer}
+- remove gappletviewer, gcjwebplugin and related files for F13 (#548783)
+%endif
+- fix addition of one character long filenames in fastjar (#549493)
+
 * Thu Dec 17 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-18
 - update from gcc-4_4-branch
   - PRs c++/42387


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- sources	17 Dec 2009 20:07:54 -0000	1.324
+++ sources	22 Dec 2009 11:57:46 -0000	1.325
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-1bac2d18babfc08d9c27d488ffd75cc4  gcc-4.4.2-20091217.tar.bz2
+190cf32f4e2f3e5261cda2ba32be0912  gcc-4.4.2-20091222.tar.bz2



From jakub at fedoraproject.org  Tue Dec 22 12:11:53 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 22 Dec 2009 12:11:53 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc.spec,1.101,1.102 gcc44-rh546017.patch,1.1,NONE
Message-ID: <20091222121153.E704611C00E9@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24872

Modified Files:
	gcc.spec 
Removed Files:
	gcc44-rh546017.patch 
Log Message:
4.4.2-20


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gcc.spec	22 Dec 2009 11:57:46 -0000	1.101
+++ gcc.spec	22 Dec 2009 12:11:52 -0000	1.102
@@ -165,7 +165,6 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
-Patch20: gcc44-rh546017.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 Patch1001: fastjar-0.97-len1.patch
@@ -474,7 +473,6 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
-%patch20 -p0 -b .rh546017~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*


--- gcc44-rh546017.patch DELETED ---



From jakub at fedoraproject.org  Tue Dec 22 12:22:32 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 22 Dec 2009 12:22:32 +0000 (UTC)
Subject: rpms/gcc/devel fastjar-0.97-len1.patch, NONE, 1.1 .cvsignore, 1.297, 
	1.298 gcc.spec, 1.76, 1.77 import.log, 1.3, 1.4 sources, 1.301, 1.302
Message-ID: <20091222122232.57B6311C00E9@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26501/devel

Modified Files:
	.cvsignore gcc.spec import.log sources 
Added Files:
	fastjar-0.97-len1.patch 
Log Message:
4.4.2-20.fc13


fastjar-0.97-len1.patch:
 jartool.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fastjar-0.97-len1.patch ---
2009-12-21  Chris Ball  <cjb at laptop.org>

	* jartool.c (add_file_to_jar): Test write return value against -1
	instead of 1.

--- fastjar-0.97/jartool.c.jj	2008-10-15 12:35:37.000000000 -0400
+++ fastjar-0.97/jartool.c	2009-12-22 06:48:09.309530000 -0500
@@ -1257,7 +1257,7 @@ int add_file_to_jar(int jfd, int ffd, co
       exit_on_error("write");
 
   /* write the file name to the zip file */
-  if (1 == write(jfd, fname, file_name_length))
+  if (-1 == write(jfd, fname, file_name_length))
     exit_on_error("write");
 
   if(verbose){


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- .cvsignore	4 Dec 2009 12:41:27 -0000	1.297
+++ .cvsignore	22 Dec 2009 12:22:31 -0000	1.298
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091204.tar.bz2
+gcc-4.4.2-20091222.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- gcc.spec	4 Dec 2009 12:41:27 -0000	1.76
+++ gcc.spec	22 Dec 2009 12:22:31 -0000	1.77
@@ -1,12 +1,16 @@
-%global DATE 20091204
-%global SVNREV 154977
+%global DATE 20091222
+%global SVNREV 155395
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 14
+%global gcc_release 20
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
+%if 0%{?fedora} >= 13
+%global include_gappletviewer 0
+%else
 %global include_gappletviewer 1
+%endif
 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
 %global build_ada 1
 %else
@@ -163,6 +167,7 @@ Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
 
 Patch1000: fastjar-0.97-segfault.patch
+Patch1001: fastjar-0.97-len1.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -347,7 +352,9 @@ Requires: libart_lgpl >= 2.1.0
 %if %{build_java}
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: glib2-devel >= 2.4.0
+%if %{include_gappletviewer}
 BuildRequires: xulrunner-devel
+%endif
 BuildRequires: libart_lgpl-devel >= 2.1.0
 BuildRequires: alsa-lib-devel
 BuildRequires: libXtst-devel
@@ -473,6 +480,7 @@ rm libjava/testsuite/libjava.lang/PR3502
 tar xzf %{SOURCE4}
 
 %patch1000 -p0 -b .fastjar-0.97-segfault~
+%patch1001 -p0 -b .fastjar-0.97-len1~
 
 %if %{bootstrap_java}
 tar xjf %{SOURCE10}
@@ -611,7 +619,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`
 %if !%{build_java}
 	--disable-libgcj \
 %else
-	--enable-java-awt=gtk --disable-dssi --enable-plugin \
+	--enable-java-awt=gtk --disable-dssi \
+%if %{include_gappletviewer}
+	--enable-plugin \
+%endif
 	--with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
 	--enable-libgcj-multifile \
 %if !%{bootstrap_java}
@@ -1383,6 +1394,8 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/fma4intrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xopintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/lwpintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/abmintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/popcntintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm_malloc.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm3dnow.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cpuid.h
@@ -1849,6 +1862,47 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Dec 22 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-20
+- fix MEM_SIZE of reload created stack slots (#548825,
+  PR rtl-optimization/42429)
+%if !%{include_gappletviewer}
+- remove gappletviewer, gcjwebplugin and related files for F13 (#548783)
+%endif
+- fix addition of one character long filenames in fastjar (#549493)
+
+* Thu Dec 17 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-18
+- update from gcc-4_4-branch
+  - PRs c++/42387
+- another C++ virtual dtors fix (PR c++/42386)
+- VTA mode and COND_EXEC fixes (PR debug/41679)
+- fix ICE in chrec_convert_1 (#547775)
+- fix debuginfo for optimized out TLS vars
+- use DW_AT_location with DW_OP_addr + DW_OP_stack_value instead of
+  DW_AT_const_value with address in it, use DW_OP_addr + DW_OP_stack_value
+  instead of DW_OP_implicit_value with address (#546017)
+
+* Mon Dec 14 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-17
+- propagate TREE_NOTHROW/TREE_READONLY/DECL_PURE_P from ipa-pure-const and
+  EH opt to all same body aliases (#547286)
+- don't emit DWARF location list entries with no location or DW_AT_location
+  with empty blocks (PR debug/41473)
+- fix up AMD LWP support
+- don't crash when mangling C++ decls inside of middle-end generated functions
+  (PR c++/41183)
+
+* Fri Dec 11 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-16
+- update from gcc-4_4-branch
+  - PRs c++/27425, c++/34274, c++/42301, fortran/42268, java/41991,
+	libstdc++/42273, rtl-optimization/41574, target/41196, target/41939
+	target/42263
+
+* Wed Dec  9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-15
+- VTA backports
+  - PRs debug/42166, debug/42234, debug/42244, debug/42299
+- fix handling of C++ COMDAT virtual destructors
+- some x86/x86_64 FMA4, XOP, ABM and LWP fixes
+- fix a decltype handling bug in templates (PR c++/42277)
+
 * Fri Dec  4 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-14
 - update from gcc-4_4-branch
   - PRs libstdc++/42261, middle-end/42049


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Dec 2009 12:41:27 -0000	1.3
+++ import.log	22 Dec 2009 12:22:32 -0000	1.4
@@ -1,3 +1,4 @@
 gcc-4_4_0-0_3:HEAD:gcc-4.4.0-0.3.src.rpm:1232130841
 gcc-4_4_0-5:HEAD:gcc-4.4.0-5.src.rpm:1242291126
 gcc-4_4_2-14_fc13:HEAD:gcc-4.4.2-14.fc13.src.rpm:1259930464
+gcc-4_4_2-20_fc13:HEAD:gcc-4.4.2-20.fc13.src.rpm:1261484502


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- sources	4 Dec 2009 12:41:27 -0000	1.301
+++ sources	22 Dec 2009 12:22:32 -0000	1.302
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-dcff137d5ba8e70cd5cf8fcd0b34ede6  gcc-4.4.2-20091204.tar.bz2
+190cf32f4e2f3e5261cda2ba32be0912  gcc-4.4.2-20091222.tar.bz2



From mmaslano at fedoraproject.org  Tue Dec 22 12:23:07 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 12:23:07 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/devel perl-Parse-CPAN-Meta.spec,1.8,NONE
Message-ID: <20091222122307.6324A11C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26702

Removed Files:
	perl-Parse-CPAN-Meta.spec 
Log Message:
Became part of perl(core).



--- perl-Parse-CPAN-Meta.spec DELETED ---



From mmaslano at fedoraproject.org  Tue Dec 22 12:28:02 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 12:28:02 +0000 (UTC)
Subject: rpms/perl/devel perl-update-Parse-CPAN-Meta.patch, NONE, 1.1 perl.spec,
	1.249, 1.250
Message-ID: <20091222122802.4CE1E11C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27318

Modified Files:
	perl.spec 
Added Files:
	perl-update-Parse-CPAN-Meta.patch 
Log Message:
* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.1-109
- 547656 CVE-2009-3626 perl: regexp matcher crash on invalid UTF-8 characters  
- 549306 version::Internals should be packaged in perl-version subpackage
- Parse-CPAN-Meta updated and separate package is dead


perl-update-Parse-CPAN-Meta.patch:
 Meta.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-update-Parse-CPAN-Meta.patch ---
diff -up perl-5.10.1/lib/Parse/CPAN/Meta.pm.old perl-5.10.1/lib/Parse/CPAN/Meta.pm
--- perl-5.10.1/lib/Parse/CPAN/Meta.pm.old	2009-06-10 18:37:40.000000000 +0200
+++ perl-5.10.1/lib/Parse/CPAN/Meta.pm	2009-12-22 13:08:39.089184165 +0100
@@ -15,7 +15,7 @@ BEGIN {
 	# Class structure
 	require 5.004;
 	require Exporter;
-	$Parse::CPAN::Meta::VERSION   = '1.39';
+	$Parse::CPAN::Meta::VERSION   = '1.40';
 	@Parse::CPAN::Meta::ISA       = qw{ Exporter      };
 	@Parse::CPAN::Meta::EXPORT_OK = qw{ Load LoadFile };
 }


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- perl.spec	22 Dec 2009 09:13:49 -0000	1.249
+++ perl.spec	22 Dec 2009 12:28:01 -0000	1.250
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        108%{?dist}
+Release:        109%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -153,6 +153,8 @@ Patch124:	perl-update-IO-Compress-Base.p
 Patch125:	perl-update-IO-Compress-Zlib.patch
 %define			    IO_Compress_Zlib_version 2.020
 #... also update version number of Compress::Zlib
+Patch126:       perl-update-Parse-CPAN-Meta.patch
+%define                     Parse_CPAN_Meta_version 1.40
 
 # FIXME: Compress-Raw-Zlib also contains Compress-Raw-Bzip2
 # and IO-Compress-Zlib contains IO-Compress-Bzip2
@@ -226,6 +228,10 @@ Provides: perl(utf8_heavy.pl)
 Provides: perl(validate.pl)
 Provides: perl(Carp::Heavy)
 
+# Parse_CPAN_Meta
+Provides: perl-Parse-CPAN-Meta = %{Parse_CPAN_Meta_version}
+Obsoletes: perl-Parse-CPAN-Meta < 1.40
+
 # Long history in 3rd-party repositories:
 Provides: perl-File-Temp = %{File_Temp_version}
 Obsoletes: perl-File-Temp < 0.20
@@ -738,7 +744,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        1.39
+Version:        1.40
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Parse-CPAN-Meta 
@@ -948,7 +954,7 @@ upstream tarball from perl.org.
 #patch122 -p1
 #patch123 -p1
 #patch124 -p1
-#patch125 -p1
+%patch126 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1205,6 +1211,7 @@ pushd %{build_archlib}/CORE/
 	'Fedora Patch123: Update Storable to %{Storable_version}' \
 	'Fedora Patch124: Update IO::Compress::Base to %{IO_Compress_Base_version}' \
 	'Fedora Patch125: Update IO::Compress::Zlib to %{IO_Compress_Zlib_version}' \
+	'Fedora Patch126: Update Parse::CPAN::Meta::version to %{Parse_CPAN_Meta_version}'
 	%{nil}
 
 rm patchlevel.bak
@@ -1226,7 +1233,7 @@ rm -rf $RPM_BUILD_ROOT
 # ext/threads-shared/t/stress......FAILED--expected 1 tests, saw 0
 # I no longer remember what was failing on sparc64.
 %ifnarch ppc64 s390x sparc64
-make test
+#make test
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -1858,9 +1865,10 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
-* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.1-108
+* Tue Dec 22 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.1-109
 - 547656 CVE-2009-3626 perl: regexp matcher crash on invalid UTF-8 characters  
 - 549306 version::Internals should be packaged in perl-version subpackage
+- Parse-CPAN-Meta updated and separate package is dead
 
 * Mon Dec 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.1-107
 - subpackage parent and Parse-CPAN-Meta; add them to core's dep list



From hadess at fedoraproject.org  Tue Dec 22 12:35:44 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Dec 2009 12:35:44 +0000 (UTC)
Subject: File gnome-bluetooth-2.28.5.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091222123544.A59E210F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-bluetooth:

f21060e362dd45f6447484435ba3790a  gnome-bluetooth-2.28.5.tar.bz2



From hadess at fedoraproject.org  Tue Dec 22 12:36:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Dec 2009 12:36:01 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-12 .cvsignore, 1.25, 1.26 gnome-bluetooth.spec,
	1.98, 1.99 sources, 1.26,
	1.27 0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch,
	1.1, NONE 0002-Fix-crash-when-obex-client-isn-t-running-already.patch, 
	1.1, NONE
Message-ID: <20091222123601.B695E11C00E9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28210

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Removed Files:
	0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch 
	0002-Fix-crash-when-obex-client-isn-t-running-already.patch 
Log Message:
* Tue Dec 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.5-1
- Update to 2.28.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	11 Dec 2009 13:01:29 -0000	1.25
+++ .cvsignore	22 Dec 2009 12:36:01 -0000	1.26
@@ -1 +1 @@
-gnome-bluetooth-2.28.4.tar.bz2
+gnome-bluetooth-2.28.5.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/gnome-bluetooth.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- gnome-bluetooth.spec	14 Dec 2009 13:22:16 -0000	1.98
+++ gnome-bluetooth.spec	22 Dec 2009 12:36:01 -0000	1.99
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
-Version:	2.28.4
-Release:	2%{?dist}
+Version:	2.28.5
+Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -34,10 +34,6 @@ Requires:	pulseaudio-module-bluetooth
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=544881
-Patch0:		0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch
-Patch1:		0002-Fix-crash-when-obex-client-isn-t-running-already.patch
-
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
@@ -66,8 +62,6 @@ for writing applications that require a 
 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure --disable-desktop-update --disable-icon-update
@@ -200,6 +194,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Dec 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.5-1
+- Update to 2.28.5
+
 * Mon Dec 14 2009 Bastien Nocera <bnocera at redhat.com> 2.28.4-2
 - Add patch to fix possible crasher in bluetooth-sendto (#544881)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	11 Dec 2009 13:01:29 -0000	1.26
+++ sources	22 Dec 2009 12:36:01 -0000	1.27
@@ -1 +1 @@
-7b32e8af8773cc4224f7060f115256f7  gnome-bluetooth-2.28.4.tar.bz2
+f21060e362dd45f6447484435ba3790a  gnome-bluetooth-2.28.5.tar.bz2


--- 0001-Fix-memory-leaks-when-using-dbus_g_method_get_sender.patch DELETED ---


--- 0002-Fix-crash-when-obex-client-isn-t-running-already.patch DELETED ---



From dnovotny at fedoraproject.org  Tue Dec 22 12:54:05 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 22 Dec 2009 12:54:05 +0000 (UTC)
Subject: rpms/mailman/devel mailman-2.1.12-init-not-on.patch, NONE,
	1.1 mailman.spec, 1.89, 1.90
Message-ID: <20091222125405.72D3211C00E9@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/mailman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30354

Modified Files:
	mailman.spec 
Added Files:
	mailman-2.1.12-init-not-on.patch 
Log Message:
service not on by default


mailman-2.1.12-init-not-on.patch:
 mailman.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mailman-2.1.12-init-not-on.patch ---
diff -up mailman-2.1.12/misc/mailman.in.not-on mailman-2.1.12/misc/mailman.in
--- mailman-2.1.12/misc/mailman.in.not-on	2009-12-22 13:09:58.000000000 +0100
+++ mailman-2.1.12/misc/mailman.in	2009-12-22 13:10:28.000000000 +0100
@@ -36,8 +36,7 @@
 # Required-Start: $local_fs $remote_fs $network $named
 # Should-Start: httpd
 # Required-Stop: $local_fs $remote_fs $network
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 6
+# Default-Stop: 0 1 3 4 5 6
 # Short-Description: start and stop Mailman
 # Description: Mailman is the GNU mailing list manager.
 ### END INIT INFO


Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- mailman.spec	14 Oct 2009 11:16:49 -0000	1.89
+++ mailman.spec	22 Dec 2009 12:54:04 -0000	1.90
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.12
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 3
 Group: Applications/Internet
 Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -34,6 +34,8 @@ Patch16: mailman-2.1.12-privurl.patch
 Patch17: mailman-2.1.12-mmcfg.patch
 Patch18: mailman-2.1.12-initcleanup.patch
 Patch19: mailman-2.1.12-codage.patch
+# the service is now off by default
+Patch20: mailman-2.1.12-init-not-on.patch
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -122,6 +124,7 @@ additional installation steps, these are
 %patch17 -p1 -b .mmcfg
 %patch18 -p1 -b .initcleanup
 %patch19 -p1
+%patch20 -p1
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -294,6 +297,9 @@ fi
 # shouldn't silently stop the service, so if mailman was running
 # we'll leave a temp file in the lock directory as a flag so in
 # the post install phase we can restart it.
+#
+# rpmlint will complain here about "dangerous use of rm"
+# but this is OK because we are only rm-ing our temporary file
 if [ -d %{lockdir} ]; then
   rm -f %{restart_flag}
   /sbin/service %{name} status >/dev/null 2>&1
@@ -354,6 +360,10 @@ exit 0
 %{mmdir}/messages
 %{mmdir}/pythonlib
 %{mmdir}/scripts
+# rpmlint will complain here about config files being in /usr
+# but these are both data files -parts of mailman's web UI-
+# and config files - user can change them to match the design
+# and/or content of their web pages
 %config(noreplace) %{mmdir}/templates
 %{mmdir}/tests
 %{varmmdir}
@@ -489,6 +499,9 @@ exit 0
 %attr(0755,root,root) %{_bindir}/mailman-update-cfg
 
 %changelog
+* Tue Dec 22 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-13
+- the service is now not on by default (change for merge review, #226117)
+
 * Wed Oct 14 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-12
 - fix the last patch (bz#528492), no space between "coding" and ":"
 



From mmaslano at fedoraproject.org  Tue Dec 22 13:02:47 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 22 Dec 2009 13:02:47 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.250,1.251
Message-ID: <20091222130247.7C1EC11C00E9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31459

Modified Files:
	perl.spec 
Log Message:
Add tests back.



Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- perl.spec	22 Dec 2009 12:28:01 -0000	1.250
+++ perl.spec	22 Dec 2009 13:02:45 -0000	1.251
@@ -1233,7 +1233,7 @@ rm -rf $RPM_BUILD_ROOT
 # ext/threads-shared/t/stress......FAILED--expected 1 tests, saw 0
 # I no longer remember what was failing on sparc64.
 %ifnarch ppc64 s390x sparc64
-#make test
+make test
 %endif
 
 %post libs -p /sbin/ldconfig



From tbzatek at fedoraproject.org  Tue Dec 22 13:14:05 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 22 Dec 2009 13:14:05 +0000 (UTC)
Subject: File gnome-keyring-2.29.4.tar.bz2 uploaded to lookaside cache by
	tbzatek
Message-ID: <20091222131405.3D1F210F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-keyring:

146bd73a36f3e2303ef3e8f9f41ea0bc  gnome-keyring-2.29.4.tar.bz2



From rdieter at fedoraproject.org  Tue Dec 22 13:33:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Dec 2009 13:33:27 +0000 (UTC)
Subject: rpms/kde-plasma-yawp/devel kde-plasma-yawp.spec,1.3,1.4
Message-ID: <20091222133327.DD9E011C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-yawp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2378

Modified Files:
	kde-plasma-yawp.spec 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.2-2
- rebuild against kde-4.4beta1 (#549620)



Index: kde-plasma-yawp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-yawp/devel/kde-plasma-yawp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde-plasma-yawp.spec	7 Dec 2009 09:07:09 -0000	1.3
+++ kde-plasma-yawp.spec	22 Dec 2009 13:33:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kde-plasma-yawp
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Yet Another Weather Plasmoid
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -11,31 +11,34 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  gettext
 BuildRequires:  kdebase-workspace-devel
-BuildRequires:  kdelibs-devel
+BuildRequires:  kdelibs4-devel
 BuildRequires:  kdeplasma-addons-devel
 
 
 %description
 This colorful plasmoid shows weather maps, reports and forecasts.
 
+
 %prep
 %setup -q -n yawp-%{version}
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang plasma_applet_yawp
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -53,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.2-2
+- rebuild against kde-4.4beta1 (#549620)
+
 * Sun Dec 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.2-1
 - Update to new upstream version
 



From pkgdb at fedoraproject.org  Tue Dec 22 13:34:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:34:50 +0000
Subject: [pkgdb] barrage ownership updated
Message-ID: <20091222133450.78AC510F7EA@bastion.fedoraproject.org>

Package barrage in Fedora devel is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/barrage



From pkgdb at fedoraproject.org  Tue Dec 22 13:34:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:34:54 +0000
Subject: [pkgdb] barrage ownership updated
Message-ID: <20091222133454.D237C10F7EA@bastion.fedoraproject.org>

Package barrage in Fedora 11 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/barrage



From pkgdb at fedoraproject.org  Tue Dec 22 13:34:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:34:55 +0000
Subject: [pkgdb] barrage ownership updated
Message-ID: <20091222133455.3D30410F8BE@bastion.fedoraproject.org>

Package barrage in Fedora 12 is now owned by limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/barrage



From sergiopr at fedoraproject.org  Tue Dec 22 13:45:23 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 22 Dec 2009 13:45:23 +0000 (UTC)
Subject: File xpa-2.1.11.tar.gz uploaded to lookaside cache by sergiopr
Message-ID: <20091222134523.9821110F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xpa:

5af281bd1455739b3a15d949fdcc7adb  xpa-2.1.11.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 22 13:47:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:47:52 +0000
Subject: [pkgdb] psutils: dnovotny has given up watchbugzilla
Message-ID: <20091222134751.F1D1710F85E@bastion.fedoraproject.org>

dnovotny has given up the watchbugzilla acl on psutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 13:47:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:47:54 +0000
Subject: [pkgdb] psutils: dnovotny has given up watchcommits
Message-ID: <20091222134754.77FF410F85E@bastion.fedoraproject.org>

dnovotny has given up the watchcommits acl on psutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 13:48:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:48:13 +0000
Subject: [pkgdb] psutils: dnovotny has requested commit
Message-ID: <20091222134800.15FF210F85E@bastion.fedoraproject.org>

dnovotny has requested the commit acl on psutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 13:48:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:48:02 +0000
Subject: [pkgdb] psutils: dnovotny has requested approveacls
Message-ID: <20091222134802.5553010F85E@bastion.fedoraproject.org>

dnovotny has requested the approveacls acl on psutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 13:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:48:12 +0000
Subject: [pkgdb] psutils: dnovotny has given up watchbugzilla
Message-ID: <20091222134812.60AD210F7EA@bastion.fedoraproject.org>

dnovotny has given up the watchbugzilla acl on psutils (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 13:48:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:48:14 +0000
Subject: [pkgdb] psutils: dnovotny has given up watchcommits
Message-ID: <20091222134814.C7DF110F7EA@bastion.fedoraproject.org>

dnovotny has given up the watchcommits acl on psutils (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 13:48:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:48:33 +0000
Subject: [pkgdb] psutils: dnovotny has requested commit
Message-ID: <20091222134819.B193B10F8BC@bastion.fedoraproject.org>

dnovotny has requested the commit acl on psutils (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 13:48:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 13:48:22 +0000
Subject: [pkgdb] psutils: dnovotny has requested approveacls
Message-ID: <20091222134822.0825710F8C1@bastion.fedoraproject.org>

dnovotny has requested the approveacls acl on psutils (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From twaugh at fedoraproject.org  Tue Dec 22 14:03:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 14:03:13 +0000 (UTC)
Subject: File pycups-1.9.47.tar.bz2 uploaded to lookaside cache by twaugh
Message-ID: <20091222140313.72A3910F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for system-config-printer:

b2c94db15c916e0776e320addb279ba8  pycups-1.9.47.tar.bz2



From hadess at fedoraproject.org  Tue Dec 22 14:05:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Dec 2009 14:05:42 +0000 (UTC)
Subject: File gnome-bluetooth-2.28.6.tar.bz2 uploaded to lookaside cache by
	hadess
Message-ID: <20091222140542.022D210F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-bluetooth:

ec8553e5db92fe67596a106dbbc774df  gnome-bluetooth-2.28.6.tar.bz2



From hadess at fedoraproject.org  Tue Dec 22 14:06:00 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 22 Dec 2009 14:06:00 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-12 .cvsignore, 1.26, 1.27 gnome-bluetooth.spec,
	1.99, 1.100 sources, 1.27, 1.28
Message-ID: <20091222140600.9E59411C00E9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6095

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Tue Dec 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.6-1
- Update to 2.28.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	22 Dec 2009 12:36:01 -0000	1.26
+++ .cvsignore	22 Dec 2009 14:05:59 -0000	1.27
@@ -1 +1 @@
-gnome-bluetooth-2.28.5.tar.bz2
+gnome-bluetooth-2.28.6.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/gnome-bluetooth.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gnome-bluetooth.spec	22 Dec 2009 12:36:01 -0000	1.99
+++ gnome-bluetooth.spec	22 Dec 2009 14:05:59 -0000	1.100
@@ -1,5 +1,5 @@
 Name:		gnome-bluetooth
-Version:	2.28.5
+Version:	2.28.6
 Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
@@ -194,6 +194,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Dec 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.6-1
+- Update to 2.28.6
+
 * Tue Dec 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.5-1
 - Update to 2.28.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	22 Dec 2009 12:36:01 -0000	1.27
+++ sources	22 Dec 2009 14:05:59 -0000	1.28
@@ -1 +1 @@
-f21060e362dd45f6447484435ba3790a  gnome-bluetooth-2.28.5.tar.bz2
+ec8553e5db92fe67596a106dbbc774df  gnome-bluetooth-2.28.6.tar.bz2



From caolanm at fedoraproject.org  Tue Dec 22 14:07:35 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 22 Dec 2009 14:07:35 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch, NONE,
	1.1 openoffice.org.spec, 1.2046, 1.2047
Message-ID: <20091222140735.E970A11C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6418/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch 
Log Message:
Resolves: rhbz#545824 bustage in writer with emboldened fonts

openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch:
 fntcache.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch ---
diff -ru sw.orig/source/core/txtnode/fntcache.cxx sw/source/core/txtnode/fntcache.cxx
--- sw.orig/source/core/txtnode/fntcache.cxx	2009-12-21 10:33:36.000000000 +0000
+++ sw/source/core/txtnode/fntcache.cxx	2009-12-22 13:34:48.000000000 +0000
@@ -482,6 +482,11 @@
         pScrFont = pPrtFont;
 
         FontMetric aMet = pPrt->GetFontMetric( );
+        //Don't loose "faked" properties of the logical font that don't truly
+        //exist in the physical font metrics which vcl which fake up for us
+        aMet.SetWeight(pScrFont->GetWeight());
+        aMet.SetItalic(pScrFont->GetItalic());
+
         bSymbol = RTL_TEXTENCODING_SYMBOL == aMet.GetCharSet();
 
         if ( USHRT_MAX == nGuessedLeading )
@@ -521,6 +526,11 @@
 
 				pPrt->SetFont( aFnt2 );
 				aMet = pPrt->GetFontMetric( );
+				//Don't loose "faked" properties of the logical font that don't
+				//truly exist in the physical font metrics which vcl which fake
+				//up for us
+				aMet.SetWeight(aFnt2.GetWeight());
+				aMet.SetItalic(aFnt2.GetItalic());
 			}
 
             const XubString aStandardStr( sStandardString,


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2046
retrieving revision 1.2047
diff -u -p -r1.2046 -r1.2047
--- openoffice.org.spec	18 Dec 2009 09:27:49 -0000	1.2046
+++ openoffice.org.spec	22 Dec 2009 14:07:35 -0000	1.2047
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 23
+%define rh_rpm_release 24
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -182,6 +182,7 @@ Patch105: workspace.vcl105.patch
 Patch106: workspace.fwk132.patch
 Patch107: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 Patch108: workspace.ooo32gsl03.patch
+Patch109: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1750,6 +1751,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch106 -p1 -b .workspace.fwk132.patch
 %patch107 -p0 -b .ooo47279.sd.objectsave.safe.patch
 %patch108 -p0 -b .workspace.ooo32gsl03.patch
+%patch109 -p0 -b .ooo107834.sw.pseudoattribs.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4283,6 +4285,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Dec 22 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.24
+- Resolves: rhbz#545824 bustage in writer with emboldened fonts
+
 * Fri Dec 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.23
 - Resolves: rhbz#548512 workspace.ooo32gsl03.patch
 



From caolanm at fedoraproject.org  Tue Dec 22 14:07:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 22 Dec 2009 14:07:37 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch, NONE,
	1.1 openoffice.org.spec, 1.2106, 1.2107
Message-ID: <20091222140737.55FF111C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6418/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch 
Log Message:
Resolves: rhbz#545824 bustage in writer with emboldened fonts

openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch:
 fntcache.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch ---
diff -ru sw.orig/source/core/txtnode/fntcache.cxx sw/source/core/txtnode/fntcache.cxx
--- sw.orig/source/core/txtnode/fntcache.cxx	2009-12-21 10:33:36.000000000 +0000
+++ sw/source/core/txtnode/fntcache.cxx	2009-12-22 13:34:48.000000000 +0000
@@ -482,6 +482,11 @@
         pScrFont = pPrtFont;
 
         FontMetric aMet = pPrt->GetFontMetric( );
+        //Don't loose "faked" properties of the logical font that don't truly
+        //exist in the physical font metrics which vcl which fake up for us
+        aMet.SetWeight(pScrFont->GetWeight());
+        aMet.SetItalic(pScrFont->GetItalic());
+
         bSymbol = RTL_TEXTENCODING_SYMBOL == aMet.GetCharSet();
 
         if ( USHRT_MAX == nGuessedLeading )
@@ -521,6 +526,11 @@
 
 				pPrt->SetFont( aFnt2 );
 				aMet = pPrt->GetFontMetric( );
+				//Don't loose "faked" properties of the logical font that don't
+				//truly exist in the physical font metrics which vcl which fake
+				//up for us
+				aMet.SetWeight(aFnt2.GetWeight());
+				aMet.SetItalic(aFnt2.GetItalic());
 			}
 
             const XubString aStandardStr( sStandardString,


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2106
retrieving revision 1.2107
diff -u -p -r1.2106 -r1.2107
--- openoffice.org.spec	21 Dec 2009 12:36:51 -0000	1.2106
+++ openoffice.org.spec	22 Dec 2009 14:07:36 -0000	1.2107
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 8
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -130,6 +130,7 @@ Patch52: workspace.vcl108.patch
 Patch53: workspace.pythonssldedux.patch
 Patch54: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 Patch55: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch56: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1657,6 +1658,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch53 -p1 -b .workspace.pythonssldedux.patch
 %patch54 -p1 -b .ooo106502.svx.fixspelltimer.patch
 %patch55 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch56 -p0 -b .ooo107834.sw.pseudoattribs.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4159,6 +4161,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 22 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-8.2
+- Resolves: rhbz#545824 bustage in writer with emboldened fonts
+
 * Thu Dec 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-8.1
 - latest milestone
 - drop integrated openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch



From sergiopr at fedoraproject.org  Tue Dec 22 14:08:43 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 22 Dec 2009 14:08:43 +0000 (UTC)
Subject: rpms/xpa/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xpa-makefile.patch, 1.1, 1.2 xpa.spec, 1.27, 1.28
Message-ID: <20091222140843.E998211C00E9@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/xpa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6615

Modified Files:
	.cvsignore sources xpa-makefile.patch xpa.spec 
Log Message:
* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.11-1
- New upstream source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Sep 2009 16:02:20 -0000	1.5
+++ .cvsignore	22 Dec 2009 14:08:43 -0000	1.6
@@ -1 +1 @@
-xpa-2.1.10.tar.gz
+xpa-2.1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Sep 2009 16:02:20 -0000	1.5
+++ sources	22 Dec 2009 14:08:43 -0000	1.6
@@ -1 +1 @@
-af8c65ed96e672f7d4abd3492bdaa93c  xpa-2.1.10.tar.gz
+5af281bd1455739b3a15d949fdcc7adb  xpa-2.1.11.tar.gz

xpa-makefile.patch:
 Makefile.in |   69 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 23 deletions(-)

Index: xpa-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/xpa-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xpa-makefile.patch	10 Sep 2009 16:02:20 -0000	1.1
+++ xpa-makefile.patch	22 Dec 2009 14:08:43 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur xpa-2.1.10/Makefile.in xpa.am/Makefile.in
---- xpa-2.1.10/Makefile.in	2009-08-22 23:12:11.000000000 +0200
-+++ xpa.am/Makefile.in	2009-09-10 17:52:59.000000000 +0200
+diff -ur xpa-2.1.11/Makefile.in xpa-2.1.11.new/Makefile.in
+--- xpa-2.1.11/Makefile.in	2009-10-05 18:46:56.000000000 +0200
++++ xpa-2.1.11.new/Makefile.in	2009-12-22 15:05:06.000000000 +0100
 @@ -37,19 +37,19 @@
  INSTALL_ROOT =
  
@@ -26,7 +26,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  
  # Platform-specific X compiler flags (include file specifications)
  X_CFLAGS = 		@X_CFLAGS@
-@@ -102,6 +102,31 @@
+@@ -102,6 +102,29 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
@@ -53,12 +53,10 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
 +target_alias = @target_alias@
 +# end
 +
-+
-+
  #----------------------------------------------------------------
  # The information below is modified by the configure script when
  # Makefile is generated from Makefile.in.  You shouldn't normally
-@@ -147,7 +172,7 @@
+@@ -147,7 +170,7 @@
  
  # used in link line
  # LLIB=	$(LIB)
@@ -67,7 +65,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  
  PROGS =		xpaset xpaget xpainfo xpaaccess xpans xpamb
  
-@@ -175,7 +200,7 @@
+@@ -175,7 +198,7 @@
  		$(RANLIB) $(LIB)
  
  shlib:		$(LIB)
@@ -76,8 +74,8 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
  		rm -f lib$(PACKAGE).tmp/xt*.o; \
  		rm -f lib$(PACKAGE).tmp/tcl*.o; \
-@@ -184,7 +209,7 @@
- 		rm -rf lib$(PACKAGE).tmp)
+@@ -192,7 +215,7 @@
+ 		-luser32 -lwsock32
  
  tclxpa:		$(LIB)
 -		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
@@ -85,7 +83,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
  		rm -f libtclxpa.tmp/xt*.o; \
  		CC='$(CC)' CXX=$(CXX) \
-@@ -204,34 +229,34 @@
+@@ -212,34 +235,34 @@
  		echo "pkg_mkIndex -direct -verbose . libtclxpa.so; exit"| tclsh)
  
  xpaset:		$(LIB) xpaset.o
@@ -130,7 +128,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  		$(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(LIBS)
  
  # Smoke test: allows end-users to quickly discern basic usability
-@@ -257,7 +282,7 @@
+@@ -265,7 +288,7 @@
  	   else \
  		echo "Installing $$i" ; \
  		$(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \
@@ -139,7 +137,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  	   fi; \
  	   done;)
  
-@@ -266,7 +291,7 @@
+@@ -274,7 +297,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
@@ -148,7 +146,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -274,7 +299,7 @@
+@@ -282,7 +305,7 @@
  	@echo "Installing $(LIB)";
  	@$(INSTALL_DATA) $(LIB) $(LIB_INSTALL_DIR)/$(LIB);
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(LIB));
@@ -157,7 +155,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  	@echo "Installing xpa.h"
  	@$(INSTALL_DATA) xpa.h $(INCLUDE_INSTALL_DIR)/xpa.h
  	@echo "Installing prsetup.h"
-@@ -288,7 +313,7 @@
+@@ -296,7 +319,7 @@
  install-man:
  	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
  	    echo "Making directory $(MAN_INSTALL_DIR)"; \
@@ -166,7 +164,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  	    chmod 755 $(MAN_INSTALL_DIR); \
  	    else true; \
  	fi;
-@@ -299,7 +324,7 @@
+@@ -307,7 +330,7 @@
  		M="$(MAN_INSTALL_DIR)/man$$E"; \
  		if [ ! -d $$M ] ; then \
  		    echo "Making directory $$M"; \


Index: xpa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/xpa.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xpa.spec	10 Sep 2009 16:02:21 -0000	1.27
+++ xpa.spec	22 Dec 2009 14:08:43 -0000	1.28
@@ -2,7 +2,7 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name: xpa
-Version: 2.1.10
+Version: 2.1.11
 Release: 1%{?dist}
 Summary: The X Public Access messaging system
 
@@ -112,6 +112,9 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/*.a
 
 %changelog
+* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.11-1
+- New upstream source
+
 * Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.10-1
 - New upstream source
 



From twaugh at fedoraproject.org  Tue Dec 22 14:08:47 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 14:08:47 +0000 (UTC)
Subject: rpms/system-config-printer/F-11 pycups-1.9.47.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.208, 1.209 sources, 1.214,
	1.215 system-config-printer.spec, 1.315,
	1.316 pycups-1.9.46.tar.bz2.sig, 1.1, NONE
Message-ID: <20091222140847.F333F11C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6641

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.47.tar.bz2.sig 
Removed Files:
	pycups-1.9.46.tar.bz2.sig 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.47.



--- NEW FILE pycups-1.9.47.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/.cvsignore,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- .cvsignore	30 Nov 2009 13:04:44 -0000	1.208
+++ .cvsignore	22 Dec 2009 14:08:47 -0000	1.209
@@ -207,3 +207,4 @@ system-config-printer-1.1.12.tar.xz
 system-config-printer-1.1.13.tar.xz
 system-config-printer-1.1.14.tar.xz
 system-config-printer-1.1.15.tar.xz
+pycups-1.9.47.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/sources,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- sources	30 Nov 2009 13:04:44 -0000	1.214
+++ sources	22 Dec 2009 14:08:47 -0000	1.215
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
 9ae89a1293d78fafe1edf4d37fd0f54b  system-config-printer-1.1.15.tar.xz
+b2c94db15c916e0776e320addb279ba8  pycups-1.9.47.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- system-config-printer.spec	9 Dec 2009 10:54:56 -0000	1.315
+++ system-config-printer.spec	22 Dec 2009 14:08:47 -0000	1.316
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.46
+%define pycups_version 1.9.47
 %define pysmbc_version 1.0.6
 %{!?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)")}
@@ -177,6 +177,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.47.
+
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
 - Fixed jobviewer traceback with short-lived state reasons (bug #545733).
 


--- pycups-1.9.46.tar.bz2.sig DELETED ---



From pkgdb at fedoraproject.org  Tue Dec 22 14:11:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:11:03 +0000
Subject: [pkgdb] psutils had acl change status
Message-ID: <20091222141103.BDBB310F8BE@bastion.fedoraproject.org>

tsmetana has set the commit acl on psutils (Fedora devel) to Approved for dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 14:11:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:11:23 +0000
Subject: [pkgdb] psutils had acl change status
Message-ID: <20091222141109.4842710F8BE@bastion.fedoraproject.org>

tsmetana has set the approveacls acl on psutils (Fedora devel) to Approved for dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 14:11:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:11:18 +0000
Subject: [pkgdb] psutils had acl change status
Message-ID: <20091222141118.9997C10F85E@bastion.fedoraproject.org>

tsmetana has set the commit acl on psutils (Fedora 12) to Approved for dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From pkgdb at fedoraproject.org  Tue Dec 22 14:11:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:11:38 +0000
Subject: [pkgdb] psutils had acl change status
Message-ID: <20091222141124.79A3E10F85E@bastion.fedoraproject.org>

tsmetana has set the approveacls acl on psutils (Fedora 12) to Approved for dnovotny

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/psutils



From twaugh at fedoraproject.org  Tue Dec 22 14:27:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 14:27:13 +0000 (UTC)
Subject: rpms/system-config-printer/F-12 pycups-1.9.47.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.208, 1.209 sources, 1.214,
	1.215 system-config-printer-no-epydoc.patch, 1.1,
	1.2 system-config-printer.spec, 1.327,
	1.328 pycups-1.9.46.tar.bz2.sig, 1.1, NONE
Message-ID: <20091222142713.7612D11C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9405

Modified Files:
	.cvsignore sources system-config-printer-no-epydoc.patch 
	system-config-printer.spec 
Added Files:
	pycups-1.9.47.tar.bz2.sig 
Removed Files:
	pycups-1.9.46.tar.bz2.sig 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.47.



--- NEW FILE pycups-1.9.47.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/.cvsignore,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- .cvsignore	30 Nov 2009 13:02:48 -0000	1.208
+++ .cvsignore	22 Dec 2009 14:27:12 -0000	1.209
@@ -207,3 +207,4 @@ system-config-printer-1.1.12.tar.xz
 system-config-printer-1.1.13.tar.xz
 system-config-printer-1.1.14.tar.xz
 system-config-printer-1.1.15.tar.xz
+pycups-1.9.47.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/sources,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- sources	30 Nov 2009 13:02:48 -0000	1.214
+++ sources	22 Dec 2009 14:27:13 -0000	1.215
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
 9ae89a1293d78fafe1edf4d37fd0f54b  system-config-printer-1.1.15.tar.xz
+b2c94db15c916e0776e320addb279ba8  pycups-1.9.47.tar.bz2

system-config-printer-no-epydoc.patch:
 Makefile.am            |    4 +++-
 Makefile.in            |    4 +++-
 pycups-1.9.47/Makefile |    4 +++-
 pysmbc-1.0.6/Makefile  |    4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

Index: system-config-printer-no-epydoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer-no-epydoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-no-epydoc.patch	30 Oct 2009 12:30:59 -0000	1.1
+++ system-config-printer-no-epydoc.patch	22 Dec 2009 14:27:13 -0000	1.2
@@ -26,9 +26,9 @@ diff -up system-config-printer-1.1.13/Ma
  
  distcheck-hook: update-po
  
-diff -up system-config-printer-1.1.13/pycups-1.9.46/Makefile.no-epydoc system-config-printer-1.1.13/pycups-1.9.46/Makefile
---- system-config-printer-1.1.13/pycups-1.9.46/Makefile.no-epydoc	2009-10-30 11:32:53.089519286 +0000
-+++ system-config-printer-1.1.13/pycups-1.9.46/Makefile	2009-10-30 11:33:07.606519162 +0000
+diff -up system-config-printer-1.1.13/pycups-1.9.47/Makefile.no-epydoc system-config-printer-1.1.13/pycups-1.9.47/Makefile
+--- system-config-printer-1.1.13/pycups-1.9.47/Makefile.no-epydoc	2009-10-30 11:32:53.089519286 +0000
++++ system-config-printer-1.1.13/pycups-1.9.47/Makefile	2009-10-30 11:33:07.606519162 +0000
 @@ -14,7 +14,9 @@ cups.so: $(SOURCES)
  
  doc:	cups.so


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- system-config-printer.spec	18 Dec 2009 10:57:47 -0000	1.327
+++ system-config-printer.spec	22 Dec 2009 14:27:13 -0000	1.328
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.46
+%define pycups_version 1.9.47
 %define pysmbc_version 1.0.6
 %{!?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)")}
@@ -204,6 +204,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.47.
+
 * Fri Dec 18 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-9
 - Prevent traceback when no downloadable driver selected (#548449).
 


--- pycups-1.9.46.tar.bz2.sig DELETED ---



From pkgdb at fedoraproject.org  Tue Dec 22 14:27:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:27:25 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20091222142725.A0C4E10F8BC@bastion.fedoraproject.org>

ivazquez has set the commit acl on transifex (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Tue Dec 22 14:27:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:27:40 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20091222142740.1E06410F894@bastion.fedoraproject.org>

ivazquez has set the commit acl on transifex (Fedora 12) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From rakesh at fedoraproject.org  Tue Dec 22 14:30:23 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 22 Dec 2009 14:30:23 +0000 (UTC)
Subject: File transifex-0.7.3.tar.gz uploaded to lookaside cache by rakesh
Message-ID: <20091222143023.50E3210F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for transifex:

e1ddf9d1875fab6b7c1ef3740e1135dc  transifex-0.7.3.tar.gz



From twaugh at fedoraproject.org  Tue Dec 22 14:33:06 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 14:33:06 +0000 (UTC)
Subject: rpms/system-config-printer/devel pycups-1.9.47.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.208, 1.209 sources, 1.214,
	1.215 system-config-printer-no-epydoc.patch, 1.1,
	1.2 system-config-printer.spec, 1.323,
	1.324 pycups-1.9.46.tar.bz2.sig, 1.1, NONE
Message-ID: <20091222143306.42B8F11C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10437

Modified Files:
	.cvsignore sources system-config-printer-no-epydoc.patch 
	system-config-printer.spec 
Added Files:
	pycups-1.9.47.tar.bz2.sig 
Removed Files:
	pycups-1.9.46.tar.bz2.sig 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.47.



--- NEW FILE pycups-1.9.47.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- .cvsignore	30 Nov 2009 13:01:51 -0000	1.208
+++ .cvsignore	22 Dec 2009 14:33:05 -0000	1.209
@@ -207,3 +207,4 @@ system-config-printer-1.1.12.tar.xz
 system-config-printer-1.1.13.tar.xz
 system-config-printer-1.1.14.tar.xz
 system-config-printer-1.1.15.tar.xz
+pycups-1.9.47.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- sources	30 Nov 2009 13:01:52 -0000	1.214
+++ sources	22 Dec 2009 14:33:05 -0000	1.215
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
 9ae89a1293d78fafe1edf4d37fd0f54b  system-config-printer-1.1.15.tar.xz
+b2c94db15c916e0776e320addb279ba8  pycups-1.9.47.tar.bz2

system-config-printer-no-epydoc.patch:
 Makefile.am            |    4 +++-
 Makefile.in            |    4 +++-
 pycups-1.9.47/Makefile |    4 +++-
 pysmbc-1.0.6/Makefile  |    4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

Index: system-config-printer-no-epydoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-no-epydoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-no-epydoc.patch	30 Oct 2009 12:32:02 -0000	1.1
+++ system-config-printer-no-epydoc.patch	22 Dec 2009 14:33:05 -0000	1.2
@@ -26,9 +26,9 @@ diff -up system-config-printer-1.1.13/Ma
  
  distcheck-hook: update-po
  
-diff -up system-config-printer-1.1.13/pycups-1.9.46/Makefile.no-epydoc system-config-printer-1.1.13/pycups-1.9.46/Makefile
---- system-config-printer-1.1.13/pycups-1.9.46/Makefile.no-epydoc	2009-10-30 11:32:53.089519286 +0000
-+++ system-config-printer-1.1.13/pycups-1.9.46/Makefile	2009-10-30 11:33:07.606519162 +0000
+diff -up system-config-printer-1.1.13/pycups-1.9.47/Makefile.no-epydoc system-config-printer-1.1.13/pycups-1.9.47/Makefile
+--- system-config-printer-1.1.13/pycups-1.9.47/Makefile.no-epydoc	2009-10-30 11:32:53.089519286 +0000
++++ system-config-printer-1.1.13/pycups-1.9.47/Makefile	2009-10-30 11:33:07.606519162 +0000
 @@ -14,7 +14,9 @@ cups.so: $(SOURCES)
  
  doc:	cups.so


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- system-config-printer.spec	18 Dec 2009 10:57:57 -0000	1.323
+++ system-config-printer.spec	22 Dec 2009 14:33:06 -0000	1.324
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.46
+%define pycups_version 1.9.47
 %define pysmbc_version 1.0.6
 %{!?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)")}
@@ -204,6 +204,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.47.
+
 * Fri Dec 18 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-9
 - Prevent traceback when no downloadable driver selected (#548449).
 


--- pycups-1.9.46.tar.bz2.sig DELETED ---



From rakesh at fedoraproject.org  Tue Dec 22 14:34:38 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 22 Dec 2009 14:34:38 +0000 (UTC)
Subject: rpms/transifex/devel .cvsignore, 1.5, 1.6 import.log, 1.3, 1.4 sources,
	1.8, 1.9 transifex.spec, 1.10, 1.11 transifex-0.5-docdb.patch,
	1.1, NONE
Message-ID: <20091222143438.4AD3911C00E9@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/transifex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10748/devel

Modified Files:
	.cvsignore import.log sources transifex.spec 
Removed Files:
	transifex-0.5-docdb.patch 
Log Message:
Updated to 0.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Apr 2009 20:55:16 -0000	1.5
+++ .cvsignore	22 Dec 2009 14:34:37 -0000	1.6
@@ -1 +1 @@
-transifex-0.6.tar.gz
+transifex-0.7.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	19 Mar 2009 03:37:15 -0000	1.3
+++ import.log	22 Dec 2009 14:34:38 -0000	1.4
@@ -1,3 +1,4 @@
 transifex-0_5-0_6_rc1_hgc3439806202e:HEAD:transifex-0.5-0.6.rc1.hgc3439806202e.src.rpm:1236983887
 transifex-0_5-0_7_rc1_hge0ede2b7056e:HEAD:transifex-0.5-0.7.rc1.hge0ede2b7056e.src.rpm:1237350346
 transifex-0_5-1:HEAD:transifex-0.5-1.src.rpm:1237433795
+transifex-0_7_3-1_fc13:HEAD:transifex-0.7.3-1.fc13.src.rpm:1261493253


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	29 Apr 2009 20:55:17 -0000	1.8
+++ sources	22 Dec 2009 14:34:38 -0000	1.9
@@ -1 +1 @@
-2393027a685ecfad10946a821ac2d65f  transifex-0.6.tar.gz
+e1ddf9d1875fab6b7c1ef3740e1135dc  transifex-0.7.3.tar.gz


Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/transifex.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- transifex.spec	27 Jul 2009 06:14:14 -0000	1.10
+++ transifex.spec	22 Dec 2009 14:34:38 -0000	1.11
@@ -1,8 +1,8 @@
 %define confdir %{_sysconfdir}/%{name}
 
 Name:       transifex
-Version:    0.6
-Release:    3%{?dist}
+Version:    0.7.3
+Release:    1%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
@@ -13,15 +13,20 @@ Source1:    django-settings.py.in
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-BuildRequires:  python-sphinx gettext-devel
-BuildRequires:  Django django-authopenid = 0.9.6 django-contact-form
-BuildRequires:  django-notification django-pagination django-tagging
-BuildRequires:  python-markdown django-evolution
-Requires:   Django django-authopenid = 0.9.6 django-contact-form
-Requires:   django-notification django-pagination django-tagging
-Requires:   python-markdown python-pygments django-evolution
-Requires:   mercurial python-urlgrabber
-Requires:   intltool >= 0.37.1
+BuildRequires:  python-sphinx gettext python-markdown
+
+BuildRequires:  Django django-contact-form django-pagination django-tagging
+BuildRequires:  django-notification django-profile Django-south django-piston
+BuildRequires:  django-authority 
+#BuildRequires:  django-authority django-filter django-sorting
+
+Requires:   mercurial >= 1.3 python-urlgrabber intltool >= 0.37.1
+Requires:   python-markdown python-pygments python-polib >= 0.4.2
+
+Requires:   Django django-contact-form django-pagination django-tagging
+Requires:   django-notification django-profile Django-south django-piston
+Requires:   django-authority 
+#Requires:   django-authority django-filter django-sorting
 
 %description
 Transifex is a web-system that facilitates the process of submitting
@@ -49,11 +54,15 @@ sed -e 's!share/locale!.*/locale!' /usr/
 cd transifex
 rm -rf .hg* build-tools
 rm -r vcs/tests
-python manage.py syncdb --noinput
+python manage.py syncdb --noinput    # Setup DB tables
+#python manage.py migrate             # Setup more DB tables
+#python manage.py txcreatelanguages   # Create a standard set of languages
+#python manage.py txcreatenoticetypes # Create a standard set of notice types
+#python manage.py txcompilemessages   # Create message catalogs for i18n
+cd ..
+cd docs
+make html
 cd ..
-#cd docs
-#make html
-#cd ..
 find transifex/locale -name django.po -execdir msgfmt --check-format -o django.mo {} \;
 
 %install
@@ -71,10 +80,15 @@ do
     mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/scratchdir/sources/"$vcs"
 done
 
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+
 install -d -m 0755 $RPM_BUILD_ROOT/%{confdir}
 
 cp -a settings/*.conf $RPM_BUILD_ROOT/%{confdir}
 
+sed -i -e 's!^\(LOG_PATH = \).*$!\1"%{_localstatedir}/log/%{name}"!' \
+    $RPM_BUILD_ROOT/%{confdir}/10-base.conf
+
 sed -e 's!\[\[confpath\]\]!%{confdir}!' %{SOURCE1} > \
     $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py
 
@@ -101,8 +115,7 @@ fi
 
 %files -f transifex.lst
 %defattr(-,root,root,-)
-#%%doc LICENSE README docs/_build/html
-%doc LICENSE README
+%doc LICENSE README docs/html
 %dir %{confdir}
 %config(noreplace) %{confdir}/10-base.conf
 %config(noreplace) %{confdir}/20-engines.conf
@@ -133,17 +146,22 @@ fi
 %{_datadir}/%{name}/simpleauth
 %{_datadir}/%{name}/simplelock
 %{_datadir}/%{name}/site_media
+%{_datadir}/%{name}/submissions
 %{_datadir}/%{name}/tarball
 %{_datadir}/%{name}/templates
 %{_datadir}/%{name}/txcommon
 %{_datadir}/%{name}/translations
 %{_datadir}/%{name}/txcollections
+%{_datadir}/%{name}/txpermissions
 %dir %{_datadir}/%{name}/vcs
 %{_datadir}/%{name}/vcs/*.py
 %{_datadir}/%{name}/vcs/*.py[co]
 %dir %{_datadir}/%{name}/vcs/lib
 %{_datadir}/%{name}/vcs/lib/*.py
 %{_datadir}/%{name}/vcs/lib/*.py[co]
+%dir %{_datadir}/%{name}/vcs/migrations
+%{_datadir}/%{name}/vcs/migrations/*.py
+%{_datadir}/%{name}/vcs/migrations/*.py[co]
 %dir %{_datadir}/%{name}/vcs/lib/support
 %{_datadir}/%{name}/vcs/lib/support/__init__.py
 %{_datadir}/%{name}/vcs/lib/support/__init__.py[co]
@@ -158,6 +176,7 @@ fi
 %{_datadir}/%{name}/vcs/lib/types/dummy.py[co]
 %{_datadir}/%{name}/vcs/lib/types/hg.py
 %{_datadir}/%{name}/vcs/lib/types/hg.py[co]
+%{_datadir}/%{name}/webtrans
 %dir %{_localstatedir}/lib/%{name}
 %dir %{_localstatedir}/lib/%{name}/scratchdir
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources
@@ -186,6 +205,10 @@ fi
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Tue Dec 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.7.3
+- (patched by petersen) Updated to 0.7.3, for details:
+- http://code.transifex.org/index.cgi/tx-0.7.x/file/0fafc780e303/docs/releases/0.7.txt
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- transifex-0.5-docdb.patch DELETED ---



From smilner at fedoraproject.org  Tue Dec 22 14:43:00 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 22 Dec 2009 14:43:00 +0000 (UTC)
Subject: File virtualenv-1.4.3.tar.gz uploaded to lookaside cache by smilner
Message-ID: <20091222144300.D3C1010F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-virtualenv:

2b639cee32d15fd049a49561957afe4b  virtualenv-1.4.3.tar.gz



From pkgdb at fedoraproject.org  Tue Dec 22 14:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:43:39 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091222144325.479DC10F85E@bastion.fedoraproject.org>

Package peppy in Fedora 11 is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Tue Dec 22 14:43:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:43:28 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091222144329.07CBB10F85E@bastion.fedoraproject.org>

Package peppy in Fedora 10 is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Tue Dec 22 14:43:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:43:32 +0000
Subject: [pkgdb] peppy ownership updated
Message-ID: <20091222144332.99BAA10F85E@bastion.fedoraproject.org>

Package peppy in Fedora 12 is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/peppy



From pkgdb at fedoraproject.org  Tue Dec 22 14:44:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:44:52 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091222144452.BB32810F85E@bastion.fedoraproject.org>

Package xqf in Fedora devel is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From pkgdb at fedoraproject.org  Tue Dec 22 14:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:45:04 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091222144504.165D310F85E@bastion.fedoraproject.org>

Package xqf in Fedora 10 is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From pkgdb at fedoraproject.org  Tue Dec 22 14:45:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:45:07 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091222144507.91DA310F85E@bastion.fedoraproject.org>

Package xqf in Fedora 11 is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From pkgdb at fedoraproject.org  Tue Dec 22 14:45:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 14:45:22 +0000
Subject: [pkgdb] xqf ownership updated
Message-ID: <20091222144522.A421E10F85E@bastion.fedoraproject.org>

Package xqf in Fedora 12 is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xqf



From akurtakov at fedoraproject.org  Tue Dec 22 14:45:43 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 14:45:43 +0000 (UTC)
Subject: rpms/plexus-digest/devel plexus-digest.spec, 1.1,
	1.2 plexus-digest-jpp-depmap.xml, 1.1, NONE
Message-ID: <20091222144543.8548211C00E9@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-digest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12433/devel

Modified Files:
	plexus-digest.spec 
Removed Files:
	plexus-digest-jpp-depmap.xml 
Log Message:
- Drop not needed depmap.
- Build with maven.


Index: plexus-digest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-digest/devel/plexus-digest.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- plexus-digest.spec	21 Aug 2009 19:02:53 -0000	1.1
+++ plexus-digest.spec	22 Dec 2009 14:45:42 -0000	1.2
@@ -31,15 +31,15 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define with_maven 0
-%define without_maven 1
+%define with_maven 1
+%define without_maven 0
 
 %define parent plexus
 %define subname digest
 
 Name:           plexus-digest
 Version:        1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        Plexus Digest / Hashcode Components
 License:        ASL 2.0
@@ -49,7 +49,6 @@ Source0:        %{name}-1.0-src.tar.gz
 # svn export http://svn.codehaus.org/plexus/tags/plexus-digest-1.0 plexus-digest/
 # tar czf plexus-digest-1.0-src.tar.gz plexus-digest/
 
-Source1:                %{name}-jpp-depmap.xml
 Source2:                %{name}-%{version}-build.xml
 Source3:                %{name}-components.xml
 
@@ -71,7 +70,6 @@ BuildRequires:  maven-surefire-provider-
 BuildRequires:  maven2-common-poms >= 1.0
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
-BuildRequires:  maven-release
 BuildRequires:  qdox >= 1.5
 %endif
 
@@ -118,7 +116,6 @@ mkdir -p $MAVEN_REPO_LOCAL
 mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
         install javadoc:javadoc
 #       -Dmaven.test.failure.ignore=true \
 
@@ -173,6 +170,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-10
+- Drop not needed depmap.
+- Build with maven.
+
 * Fri Aug 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-9
 - Fix License, formatting and comments.
 


--- plexus-digest-jpp-depmap.xml DELETED ---



From petersen at fedoraproject.org  Tue Dec 22 14:46:39 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 14:46:39 +0000 (UTC)
Subject: rpms/cpphs/devel cpphs.spec,1.8,1.9
Message-ID: <20091222144639.CE27B11C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12813

Modified Files:
	cpphs.spec 
Log Message:
drop -dynamic for now since Cabal chokes with prof looking for p_dyn


Index: cpphs.spec
===================================================================
RCS file: /cvs/extras/rpms/cpphs/devel/cpphs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cpphs.spec	22 Dec 2009 09:13:29 -0000	1.8
+++ cpphs.spec	22 Dec 2009 14:46:39 -0000	1.9
@@ -90,7 +90,8 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p} %{?with_shared:--ghc-option=-dynamic}
+# dynamic + prof breaks cabal looking for p_dyn
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -166,6 +167,7 @@ fi
 * Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 1.9-2
 - update spec for ghc-6.12.1
 - added shared library support: needs ghc-rpm-macros 0.3.1
+- drop -dynamic for now since Cabal chokes with prof looking for p_dyn
 
 * Fri Sep 18 2009 Jens Petersen <petersen at redhat.com> - 1.9-1
 - update to 1.9



From smilner at fedoraproject.org  Tue Dec 22 14:46:42 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 22 Dec 2009 14:46:42 +0000 (UTC)
Subject: rpms/python-virtualenv/devel .cvsignore, 1.7,
	1.8 python-virtualenv.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20091222144642.819AF11C00E9@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12786

Modified Files:
	.cvsignore python-virtualenv.spec sources 
Log Message:
Update for upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Nov 2009 23:21:57 -0000	1.7
+++ .cvsignore	22 Dec 2009 14:46:42 -0000	1.8
@@ -1 +1 @@
-virtualenv-1.4.2.tar.gz
+virtualenv-1.4.3.tar.gz


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/python-virtualenv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-virtualenv.spec	12 Nov 2009 23:21:57 -0000	1.11
+++ python-virtualenv.spec	22 Dec 2009 14:46:42 -0000	1.12
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.4.3-1
+- Updated for upstream release.
+
 * Thu Nov 12 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.4.2-1
 - Updated for upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Nov 2009 23:21:57 -0000	1.7
+++ sources	22 Dec 2009 14:46:42 -0000	1.8
@@ -1 +1 @@
-7b1a10f0e84dd945c9b006ace1e1bb16  virtualenv-1.4.2.tar.gz
+2b639cee32d15fd049a49561957afe4b  virtualenv-1.4.3.tar.gz



From petersen at fedoraproject.org  Tue Dec 22 14:51:09 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 14:51:09 +0000 (UTC)
Subject: rpms/ghc-editline/devel ghc-editline.spec,1.12,1.13
Message-ID: <20091222145109.871F411C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-editline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14181

Modified Files:
	ghc-editline.spec 
Log Message:
bah - bump release


Index: ghc-editline.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-editline/devel/ghc-editline.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ghc-editline.spec	22 Dec 2009 09:40:47 -0000	1.12
+++ ghc-editline.spec	22 Dec 2009 14:51:09 -0000	1.13
@@ -10,7 +10,7 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        0.2.1.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          System Environment/Libraries
@@ -151,7 +151,7 @@ fi
 %endif
 
 %Changelog
-* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-11
+* Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-12
 - build for ghc-6.12.1
 - added shared library support: needs ghc-rpm-macros 0.3.1
 



From twaugh at fedoraproject.org  Tue Dec 22 14:54:17 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 14:54:17 +0000 (UTC)
Subject: File system-config-printer-1.1.16.tar.xz uploaded to lookaside cache
	by twaugh
Message-ID: <20091222145417.0CA8010F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for system-config-printer:

8c2643d8a670eaadc3fa6890149b753b  system-config-printer-1.1.16.tar.xz



From akurtakov at fedoraproject.org  Tue Dec 22 14:59:46 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 14:59:46 +0000 (UTC)
Subject: File plexus-digest-1.1-src.tar.gz uploaded to lookaside cache by
	akurtakov
Message-ID: <20091222145946.5D0DD10F8C2@bastion.fedoraproject.org>

A file has been added to the lookaside cache for plexus-digest:

20c1ef7ad22c36523c2f213f8ccd9239  plexus-digest-1.1-src.tar.gz



From akurtakov at fedoraproject.org  Tue Dec 22 15:02:34 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 15:02:34 +0000 (UTC)
Subject: rpms/plexus-digest/devel plexus-digest.spec, 1.2, 1.3 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091222150234.7864211C00E9@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-digest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16238/devel

Modified Files:
	plexus-digest.spec .cvsignore sources 
Log Message:
Update to 1.1.


Index: plexus-digest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-digest/devel/plexus-digest.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- plexus-digest.spec	22 Dec 2009 14:45:42 -0000	1.2
+++ plexus-digest.spec	22 Dec 2009 15:02:34 -0000	1.3
@@ -38,18 +38,18 @@
 %define subname digest
 
 Name:           plexus-digest
-Version:        1.0
-Release:        10%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Plexus Digest / Hashcode Components
 License:        ASL 2.0
 Group:          Development/Libraries
-URL:            http://plexus.codehaus.org/
-Source0:        %{name}-1.0-src.tar.gz
-# svn export http://svn.codehaus.org/plexus/tags/plexus-digest-1.0 plexus-digest/
-# tar czf plexus-digest-1.0-src.tar.gz plexus-digest/
+URL:            http://plexus.codehaus.org/plexus-components/plexus-digest/
+Source0:        %{name}-%{version}-src.tar.gz
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-digest-1.1/ plexus-digest/
+# tar czf plexus-digest-1.1-src.tar.gz plexus-digest/
 
-Source2:                %{name}-%{version}-build.xml
+Source2:                %{name}-1.0-build.xml
 Source3:                %{name}-components.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,7 +65,7 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire = 2.3
+BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit = 2.3
 BuildRequires:  maven2-common-poms >= 1.0
 BuildRequires:  maven-doxia
@@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-1
+- Update to upstream 1.1.
+
 * Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-10
 - Drop not needed depmap.
 - Build with maven.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-digest/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Aug 2009 19:02:53 -0000	1.2
+++ .cvsignore	22 Dec 2009 15:02:34 -0000	1.3
@@ -1 +1,2 @@
 plexus-digest-1.0-src.tar.gz
+plexus-digest-1.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-digest/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Aug 2009 19:02:53 -0000	1.2
+++ sources	22 Dec 2009 15:02:34 -0000	1.3
@@ -1 +1 @@
-4157331c995b33e8ca0396894b591ecf  plexus-digest-1.0-src.tar.gz
+20c1ef7ad22c36523c2f213f8ccd9239  plexus-digest-1.1-src.tar.gz



From smilner at fedoraproject.org  Tue Dec 22 15:04:06 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 22 Dec 2009 15:04:06 +0000 (UTC)
Subject: rpms/python-virtualenv/F-12 .cvsignore, 1.7,
	1.8 python-virtualenv.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20091222150406.6E33D11C00E9@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16634

Modified Files:
	.cvsignore python-virtualenv.spec sources 
Log Message:
Updated for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Nov 2009 23:30:51 -0000	1.7
+++ .cvsignore	22 Dec 2009 15:04:05 -0000	1.8
@@ -1 +1 @@
-virtualenv-1.4.2.tar.gz
+virtualenv-1.4.3.tar.gz


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-12/python-virtualenv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-virtualenv.spec	12 Nov 2009 23:30:51 -0000	1.11
+++ python-virtualenv.spec	22 Dec 2009 15:04:06 -0000	1.12
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.4.3-1
+- Updated for upstream release.
+
 * Thu Nov 12 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.4.2-1
 - Updated for upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Nov 2009 23:30:51 -0000	1.7
+++ sources	22 Dec 2009 15:04:06 -0000	1.8
@@ -1 +1 @@
-7b1a10f0e84dd945c9b006ace1e1bb16  virtualenv-1.4.2.tar.gz
+2b639cee32d15fd049a49561957afe4b  virtualenv-1.4.3.tar.gz



From mclasen at fedoraproject.org  Tue Dec 22 15:04:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:04:53 +0000 (UTC)
Subject: File gobject-introspection-0.6.7.tar.bz2 uploaded to lookaside cache
	by mclasen
Message-ID: <20091222150453.F338010F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gobject-introspection:

41205c14cbd86632806578448e29bd30  gobject-introspection-0.6.7.tar.bz2



From rdieter at fedoraproject.org  Tue Dec 22 15:05:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Dec 2009 15:05:28 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.124,1.125
Message-ID: <20091222150528.E670B11C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16957

Modified Files:
	comps-f13.xml.in 
Log Message:
kde-desktop: kcm_touchpad default



Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- comps-f13.xml.in	22 Dec 2009 00:16:35 -0000	1.124
+++ comps-f13.xml.in	22 Dec 2009 15:05:28 -0000	1.125
@@ -3729,6 +3729,7 @@
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kcm-gtk</packagereq>
+      <packagereq type="default">kcm_touchpad</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeartwork-screensavers</packagereq>
@@ -3770,7 +3771,6 @@
       <packagereq type="optional">kbibtex</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
-      <packagereq type="optional">kcm_touchpad</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
       <packagereq type="optional">kcometen4</packagereq>
       <packagereq type="optional">kde-colorscheme-plastik</packagereq>



From twaugh at fedoraproject.org  Tue Dec 22 15:05:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 15:05:49 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-1.1.16.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.209, 1.210 sources, 1.215, 1.216 system-config-printer.spec,
	1.316, 1.317 system-config-printer-1.1.15.tar.xz.sig, 1.1,
	NONE system-config-printer-browsepoll.patch, 1.1,
	NONE system-config-printer-cupsd.conf-parser.patch, 1.1,
	NONE system-config-printer-localize-statereason.patch, 1.1,
	NONE system-config-printer-lpd-uri.patch, 1.1,
	NONE system-config-printer-short-lived-states.patch, 1.1,
	NONE system-config-printer-troubleshooter-traceback.patch, 1.1, NONE
Message-ID: <20091222150549.B0CFB11C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17050

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.16.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.15.tar.xz.sig 
	system-config-printer-browsepoll.patch 
	system-config-printer-cupsd.conf-parser.patch 
	system-config-printer-localize-statereason.patch 
	system-config-printer-lpd-uri.patch 
	system-config-printer-short-lived-states.patch 
	system-config-printer-troubleshooter-traceback.patch 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
- 1.1.16:
  - Ignore com.apple.print.recoverable state reason.
  - Prevent traceback in found_network_printer_callback (bug #547765).
  - Use asynchronous connection class for fetching device lists
    (bug #549749).
  - Prevent traceback when no downloadable driver selected
    (bug #548449).
  - Prevent traceback when cancel button in troubleshooter pressed
    (bug #546821).
  - Prefer Foomatic/hpijs to hpcups for the time being.
  - Clear device screen each time a new dialog is presented.
  - Constraints handling fix.



--- NEW FILE system-config-printer-1.1.16.tar.xz.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/.cvsignore,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- .cvsignore	22 Dec 2009 14:08:47 -0000	1.209
+++ .cvsignore	22 Dec 2009 15:05:49 -0000	1.210
@@ -208,3 +208,4 @@ system-config-printer-1.1.13.tar.xz
 system-config-printer-1.1.14.tar.xz
 system-config-printer-1.1.15.tar.xz
 pycups-1.9.47.tar.bz2
+system-config-printer-1.1.16.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/sources,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- sources	22 Dec 2009 14:08:47 -0000	1.215
+++ sources	22 Dec 2009 15:05:49 -0000	1.216
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-9ae89a1293d78fafe1edf4d37fd0f54b  system-config-printer-1.1.15.tar.xz
 b2c94db15c916e0776e320addb279ba8  pycups-1.9.47.tar.bz2
+8c2643d8a670eaadc3fa6890149b753b  system-config-printer-1.1.16.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- system-config-printer.spec	22 Dec 2009 14:08:47 -0000	1.316
+++ system-config-printer.spec	22 Dec 2009 15:05:49 -0000	1.317
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.15
-Release: 7%{?dist}
+Version: 1.1.16
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,13 +15,6 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
-Patch1: system-config-printer-localize-statereason.patch
-Patch2: system-config-printer-browsepoll.patch
-Patch3: system-config-printer-cupsd.conf-parser.patch
-Patch4: system-config-printer-troubleshooter-traceback.patch
-Patch5: system-config-printer-lpd-uri.patch
-Patch6: system-config-printer-short-lived-states.patch
-
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -69,12 +62,6 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .localize-statereason
-%patch2 -p1 -b .browsepoll
-%patch3 -p1 -b .cupsd.conf-parser
-%patch4 -p1 -b .troubleshooter-traceback
-%patch5 -p1 -b .lpd-uri
-%patch6 -p1 -b .short-lived-states
 
 %build
 %configure
@@ -130,6 +117,10 @@ rm -rf %buildroot
 %{_bindir}/my-default-printer
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/AdvancedServerSettings.py*
+%{_datadir}/%{name}/asyncconn.py*
+%{_datadir}/%{name}/asyncipp.py*
+%{_datadir}/%{name}/asyncpk1.py*
+%{_datadir}/%{name}/asyncpk0.py*
 %{_datadir}/%{name}/authconn.py*
 %{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
@@ -177,8 +168,20 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
 - Updated pycups to 1.9.47.
+- 1.1.16:
+  - Ignore com.apple.print.recoverable state reason.
+  - Prevent traceback in found_network_printer_callback (bug #547765).
+  - Use asynchronous connection class for fetching device lists
+    (bug #549749).
+  - Prevent traceback when no downloadable driver selected
+    (bug #548449).
+  - Prevent traceback when cancel button in troubleshooter pressed
+    (bug #546821).
+  - Prefer Foomatic/hpijs to hpcups for the time being.
+  - Clear device screen each time a new dialog is presented.
+  - Constraints handling fix.
 
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
 - Fixed jobviewer traceback with short-lived state reasons (bug #545733).


--- system-config-printer-1.1.15.tar.xz.sig DELETED ---


--- system-config-printer-browsepoll.patch DELETED ---


--- system-config-printer-cupsd.conf-parser.patch DELETED ---


--- system-config-printer-localize-statereason.patch DELETED ---


--- system-config-printer-lpd-uri.patch DELETED ---


--- system-config-printer-short-lived-states.patch DELETED ---


--- system-config-printer-troubleshooter-traceback.patch DELETED ---



From mclasen at fedoraproject.org  Tue Dec 22 15:08:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:08:09 +0000 (UTC)
Subject: rpms/gobject-introspection/devel .cvsignore, 1.6,
	1.7 gobject-introspection.spec, 1.15, 1.16 sources, 1.6, 1.7
Message-ID: <20091222150809.5F2BB11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gobject-introspection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17538

Modified Files:
	.cvsignore gobject-introspection.spec sources 
Log Message:
0.6.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Sep 2009 21:43:34 -0000	1.6
+++ .cvsignore	22 Dec 2009 15:08:08 -0000	1.7
@@ -1 +1 @@
-gobject-introspection-0.6.5.tar.gz
+gobject-introspection-0.6.7.tar.bz2


Index: gobject-introspection.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/gobject-introspection.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gobject-introspection.spec	4 Sep 2009 21:43:34 -0000	1.15
+++ gobject-introspection.spec	22 Dec 2009 15:08:09 -0000	1.16
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gobject-introspection
-Version:        0.6.5
+Version:        0.6.7
 Release:        1%{?dist}
 Summary:        Introspection system for GObject-based libraries
 
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.gz
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.6.7-1
+- Update to 0.6.7
+
 * Fri Sep 11 2009 Colin Walters <walters at verbum.org> - 0.6.5-1
 - New upstream
 - Drop libtool dep 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Sep 2009 21:43:34 -0000	1.6
+++ sources	22 Dec 2009 15:08:09 -0000	1.7
@@ -1 +1 @@
-e0f419a2bf6326c96d5291680cad97fa  gobject-introspection-0.6.5.tar.gz
+41205c14cbd86632806578448e29bd30  gobject-introspection-0.6.7.tar.bz2



From deji at fedoraproject.org  Tue Dec 22 15:10:52 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 22 Dec 2009 15:10:52 +0000 (UTC)
Subject: rpms/tokyotyrant/devel tokyotyrant.spec,1.3,1.4
Message-ID: <20091222151052.9C91111C00E9@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyotyrant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18212

Modified Files:
	tokyotyrant.spec 
Log Message:
* Tue Dec 22 2009  Deji Akingunola <dakingun at gmail.com> - 1.1.35-2
- Rebuild for tokyocabinet soname bump



Index: tokyotyrant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/tokyotyrant.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tokyotyrant.spec	7 Oct 2009 18:43:21 -0000	1.3
+++ tokyotyrant.spec	22 Dec 2009 15:10:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             tokyotyrant
 Version:          1.1.35
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          A network interface to Tokyo Cabinet
 
 Group:            Applications/Databases
@@ -134,6 +134,9 @@ fi
 %{_mandir}/man3/t*.gz
 
 %changelog
+* Tue Dec 22 2009  Deji Akingunola <dakingun at gmail.com> - 1.1.35-2
+- Rebuild for tokyocabinet soname bump
+
 * Wed Oct 07 2009 Silas Sewell <silas at sewell.ch> - 1.1.35-1
 - Update to 1.1.35
 



From mclasen at fedoraproject.org  Tue Dec 22 15:12:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:12:57 +0000 (UTC)
Subject: File atk-1.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222151257.BD01810F8C1@bastion.fedoraproject.org>

A file has been added to the lookaside cache for atk:

805c6e3b076bedffccfd7e56e7026932  atk-1.29.4.tar.bz2



From tbzatek at fedoraproject.org  Tue Dec 22 15:14:37 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 22 Dec 2009 15:14:37 +0000 (UTC)
Subject: rpms/gnome-keyring/devel gnome-keyring-2.28.1-nopass.patch, NONE,
	1.1 gnome-keyring-2.29.4-die-on-session-exit.patch, NONE,
	1.1 .cvsignore, 1.66, 1.67 gnome-keyring.spec, 1.130,
	1.131 sources, 1.66, 1.67
Message-ID: <20091222151437.91F7211C00E9@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18739

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Added Files:
	gnome-keyring-2.28.1-nopass.patch 
	gnome-keyring-2.29.4-die-on-session-exit.patch 
Log Message:
* Tue Dec 22 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.4-1
- Update to 2.29.4

This is not intended for building yet, we need to solve https://bugzilla.redhat.com/show_bug.cgi?id=549709#c1 first. Just committing my changes.


gnome-keyring-2.28.1-nopass.patch:
 gkr-pam-module.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE gnome-keyring-2.28.1-nopass.patch ---
diff -up gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass gnome-keyring-2.28.1/pam/gkr-pam-module.c
--- gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass	2009-09-25 21:55:50.000000000 -0400
+++ gnome-keyring-2.28.1/pam/gkr-pam-module.c	2009-10-19 11:27:34.000000000 -0400
@@ -878,6 +878,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
 
 	started_daemon = 0;
 
+
 	/* Should we start the daemon? */
 	if (args & ARG_AUTO_START) {
 		ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon);
@@ -944,8 +945,9 @@ pam_sm_open_session (pam_handle_t *ph, i
 		 * different PAM callbacks from different processes.
 		 * 
 		 * No use complaining
+		 * Do not start gnome-keyring, dbus will start it on login.
 		 */
-		password = NULL;
+		return PAM_SUCCESS;
 	}
 	
 	started_daemon = 0;

gnome-keyring-2.29.4-die-on-session-exit.patch:
 gkd-dbus-session.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gnome-keyring-2.29.4-die-on-session-exit.patch ---
diff -up gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c.bak gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c
--- gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c.bak	2009-12-15 04:31:36.000000000 +0100
+++ gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c	2009-12-22 14:44:45.000000000 +0100
@@ -130,7 +130,11 @@ signal_filter (DBusConnection *conn, DBu
 		unregister_daemon_in_session (conn);
 		gkd_main_quit ();
 		return DBUS_HANDLER_RESULT_HANDLED;
-	}
+	} else if (dbus_message_is_signal (msg, DBUS_INTERFACE_LOCAL, "Disconnected")) {
+		unregister_daemon_in_session (conn);
+		gkd_main_quit ();
+		return DBUS_HANDLER_RESULT_HANDLED;
+ 	}
 
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	21 Sep 2009 16:31:31 -0000	1.66
+++ .cvsignore	22 Dec 2009 15:14:37 -0000	1.67
@@ -1 +1 @@
-gnome-keyring-2.28.0.tar.bz2
+gnome-keyring-2.29.4.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- gnome-keyring.spec	21 Sep 2009 16:31:31 -0000	1.130
+++ gnome-keyring.spec	22 Dec 2009 15:14:37 -0000	1.131
@@ -1,17 +1,26 @@
 %define glib2_version 2.16.0
-%define gtk2_version 2.6.0
+%define gtk2_version 2.18.0
 %define dbus_version 1.0
+%define eggdbus_version 0.4
 %define hal_version 0.5.7
 %define gcrypt_version 1.2.2
 %define libtasn1_version 0.3.4
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.28.0
+Version: 2.29.4
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.29/gnome-keyring-%{version}.tar.bz2
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=598494
+Patch2: gnome-keyring-2.29.4-die-on-session-exit.patch
+
+# http://bugzilla.redhat.com/529709
+# http://bugs.gnome.org/598494
+Patch3: gnome-keyring-2.28.1-nopass.patch
+
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,6 +28,7 @@ BuildRequires: glib2-devel >= %{glib2_ve
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: eggdbus-devel >= %{eggdbus_version}
 BuildRequires: libgcrypt-devel >= %{gcrypt_version}
 BuildRequires: libtasn1-devel >= %{libtasn1_version}
 BuildRequires: pam-devel
@@ -64,6 +74,8 @@ automatically unlock the "login" keyring
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch2 -p1 -b .die-on-session-exit
+%patch3 -p1 -b .no-pass
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -123,15 +135,15 @@ fi
 %{_libexecdir}/*
 %{_datadir}/dbus-1/services/org.gnome.keyring.service
 %{_datadir}/gcr
+%{_datadir}/gnome-keyring
 %{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
-%{_sysconfdir}/xdg/autostart/gnome-keyring-daemon.desktop
+%{_sysconfdir}/xdg/autostart/*
 
 %files devel
 %defattr(-, root, root)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-%doc %{_datadir}/gtk-doc/html/gnome-keyring/
 %doc %{_datadir}/gtk-doc/html/gp11/
 %doc %{_datadir}/gtk-doc/html/gcr/
 
@@ -141,6 +153,9 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.4-1
+- Update to 2.29.4
+
 * Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	21 Sep 2009 16:31:31 -0000	1.66
+++ sources	22 Dec 2009 15:14:37 -0000	1.67
@@ -1 +1 @@
-07fa253d8506c22640d74eb4fc90a092  gnome-keyring-2.28.0.tar.bz2
+146bd73a36f3e2303ef3e8f9f41ea0bc  gnome-keyring-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 15:14:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:14:48 +0000 (UTC)
Subject: rpms/atk/devel .cvsignore, 1.43, 1.44 atk.spec, 1.69, 1.70 sources,
	1.43, 1.44
Message-ID: <20091222151448.CAB2711C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/atk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18967

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	1 Dec 2009 02:43:44 -0000	1.43
+++ .cvsignore	22 Dec 2009 15:14:48 -0000	1.44
@@ -1 +1 @@
-atk-1.29.3.tar.bz2
+atk-1.29.4.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/atk.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- atk.spec	2 Dec 2009 13:55:58 -0000	1.69
+++ atk.spec	22 Dec 2009 15:14:48 -0000	1.70
@@ -2,8 +2,8 @@
 
 Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.29.3
-Release: 2%{?dist}
+Version: 1.29.4
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/atk/1.29/atk-%{version}.tar.bz2
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.4-1
+- Update to 1.29.4
+
 * Wed Dec  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.3-2
 - Drop BR
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	1 Dec 2009 02:43:44 -0000	1.43
+++ sources	22 Dec 2009 15:14:48 -0000	1.44
@@ -1 +1 @@
-caf6364ebf59c1b77ac052f42b7a2f43  atk-1.29.3.tar.bz2
+805c6e3b076bedffccfd7e56e7026932  atk-1.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 15:16:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:16:02 +0000 (UTC)
Subject: rpms/gobject-introspection/devel gobject-introspection.spec, 1.16,
	1.17
Message-ID: <20091222151602.8B0E811C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gobject-introspection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19312

Modified Files:
	gobject-introspection.spec 
Log Message:
Fix spec



Index: gobject-introspection.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/gobject-introspection.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gobject-introspection.spec	22 Dec 2009 15:08:09 -0000	1.16
+++ gobject-introspection.spec	22 Dec 2009 15:16:02 -0000	1.17
@@ -9,7 +9,7 @@ Summary:        Introspection system for
 Group:		Development/Libraries
 License:        GPLv2+, LGPLv2+, MIT
 URL:            http://live.gnome.org/GObjectIntrospection
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel



From smilner at fedoraproject.org  Tue Dec 22 15:18:32 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 22 Dec 2009 15:18:32 +0000 (UTC)
Subject: rpms/python-virtualenv/F-11 .cvsignore, 1.7,
	1.8 python-virtualenv.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091222151832.E2EA611C00E9@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19876

Modified Files:
	.cvsignore python-virtualenv.spec sources 
Log Message:
Updated for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Nov 2009 23:31:55 -0000	1.7
+++ .cvsignore	22 Dec 2009 15:18:32 -0000	1.8
@@ -1 +1 @@
-virtualenv-1.4.2.tar.gz
+virtualenv-1.4.3.tar.gz


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-11/python-virtualenv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-virtualenv.spec	12 Nov 2009 23:31:55 -0000	1.10
+++ python-virtualenv.spec	22 Dec 2009 15:18:32 -0000	1.11
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.4.3-1
+- Updated for upstream release.
+
 * Thu Nov 12 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.4.2-1
 - Updated for upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Nov 2009 23:31:55 -0000	1.7
+++ sources	22 Dec 2009 15:18:32 -0000	1.8
@@ -1 +1 @@
-7b1a10f0e84dd945c9b006ace1e1bb16  virtualenv-1.4.2.tar.gz
+2b639cee32d15fd049a49561957afe4b  virtualenv-1.4.3.tar.gz



From mitr at fedoraproject.org  Tue Dec 22 15:21:46 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 22 Dec 2009 15:21:46 +0000 (UTC)
Subject: File tmpwatch-2.9.17.tar.bz2 uploaded to lookaside cache by mitr
Message-ID: <20091222152146.57F7910F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for tmpwatch:

7738f5db4ae0ce3795c224f13a597356  tmpwatch-2.9.17.tar.bz2



From smilner at fedoraproject.org  Tue Dec 22 15:26:55 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 22 Dec 2009 15:26:55 +0000 (UTC)
Subject: rpms/python-virtualenv/EL-5 .cvsignore, 1.4,
	1.5 python-virtualenv.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091222152655.D79AE11C00E9@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/python-virtualenv/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21618

Modified Files:
	.cvsignore python-virtualenv.spec sources 
Log Message:
Updated for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Nov 2009 23:28:25 -0000	1.4
+++ .cvsignore	22 Dec 2009 15:26:55 -0000	1.5
@@ -1 +1 @@
-virtualenv-1.4.2.tar.gz
+virtualenv-1.4.3.tar.gz


Index: python-virtualenv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/python-virtualenv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-virtualenv.spec	12 Nov 2009 23:28:25 -0000	1.3
+++ python-virtualenv.spec	22 Dec 2009 15:26:55 -0000	1.4
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-virtualenv
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.4.3-1
+- Updated for upstream release.
+
 * Thu Nov 12 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.4.2-1
 - Updated for upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtualenv/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Nov 2009 23:28:25 -0000	1.4
+++ sources	22 Dec 2009 15:26:55 -0000	1.5
@@ -1 +1 @@
-7b1a10f0e84dd945c9b006ace1e1bb16  virtualenv-1.4.2.tar.gz
+2b639cee32d15fd049a49561957afe4b  virtualenv-1.4.3.tar.gz



From mitr at fedoraproject.org  Tue Dec 22 15:28:10 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 22 Dec 2009 15:28:10 +0000 (UTC)
Subject: rpms/tmpwatch/devel .cvsignore, 1.28, 1.29 sources, 1.29,
	1.30 tmpwatch.spec, 1.42, 1.43
Message-ID: <20091222152810.1954A11C00E9@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/tmpwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21752

Modified Files:
	.cvsignore sources tmpwatch.spec 
Log Message:
* Tue Dec 22 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.17-1
- Update to tmpwatch-2.9.17.
  Resolves: #548932



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	15 Oct 2009 14:50:36 -0000	1.28
+++ .cvsignore	22 Dec 2009 15:28:09 -0000	1.29
@@ -1 +1 @@
-tmpwatch-2.9.16.tar.bz2
+tmpwatch-2.9.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	15 Oct 2009 14:50:36 -0000	1.29
+++ sources	22 Dec 2009 15:28:09 -0000	1.30
@@ -1 +1 @@
-40eee5c3e3f352c30e532ffc1f0af3a8  tmpwatch-2.9.16.tar.bz2
+7738f5db4ae0ce3795c224f13a597356  tmpwatch-2.9.17.tar.bz2


Index: tmpwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/devel/tmpwatch.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- tmpwatch.spec	15 Oct 2009 14:50:37 -0000	1.42
+++ tmpwatch.spec	22 Dec 2009 15:28:09 -0000	1.43
@@ -1,6 +1,6 @@
 Summary: A utility for removing files based on when they were last accessed
 Name: tmpwatch
-Version: 2.9.16
+Version: 2.9.17
 Release: 1%{?dist}
 URL: https://fedorahosted.org/tmpwatch/
 Source0: https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-%{version}.tar.bz2
@@ -50,6 +50,10 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Tue Dec 22 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.17-1
+- Update to tmpwatch-2.9.17.
+  Resolves: #548932
+
 * Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.16-1
 - Update to tmpwatch-2.9.16.
 - Exclude /tmp/hsperfdata_*.



From petersen at fedoraproject.org  Tue Dec 22 15:29:55 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 15:29:55 +0000 (UTC)
Subject: rpms/cpphs/devel cpphs.spec,1.9,1.10
Message-ID: <20091222152955.7317F11C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22219

Modified Files:
	cpphs.spec 
Log Message:
use ghc-cpphs for ghc_gen_filelists


Index: cpphs.spec
===================================================================
RCS file: /cvs/extras/rpms/cpphs/devel/cpphs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cpphs.spec	22 Dec 2009 14:46:39 -0000	1.9
+++ cpphs.spec	22 Dec 2009 15:29:55 -0000	1.10
@@ -43,6 +43,7 @@ License:        LGPLv2+
 Haskell %{name} library for ghc.
 %endif
 
+
 %package -n ghc-%{name}-devel
 Summary:        Haskell %{name} library development files
 Group:          Development/Libraries
@@ -102,7 +103,7 @@ This package contains profiling librarie
 %cabal_install
 %cabal_pkg_conf
 
-%ghc_gen_filelists %{name}
+%ghc_gen_filelists ghc-%{name}
 
 
 %clean
@@ -168,6 +169,7 @@ fi
 - update spec for ghc-6.12.1
 - added shared library support: needs ghc-rpm-macros 0.3.1
 - drop -dynamic for now since Cabal chokes with prof looking for p_dyn
+- use ghc-cpphs for ghc_gen_filelists
 
 * Fri Sep 18 2009 Jens Petersen <petersen at redhat.com> - 1.9-1
 - update to 1.9



From pkgdb at fedoraproject.org  Tue Dec 22 15:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 15:29:59 +0000
Subject: [pkgdb] griffith ownership updated
Message-ID: <20091222152959.D2BB810F894@bastion.fedoraproject.org>

Package griffith in Fedora devel is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griffith



From pkgdb at fedoraproject.org  Tue Dec 22 15:30:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 15:30:21 +0000
Subject: [pkgdb] griffith ownership updated
Message-ID: <20091222153007.7ABC410F894@bastion.fedoraproject.org>

Package griffith in Fedora 11 is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griffith



From pkgdb at fedoraproject.org  Tue Dec 22 15:30:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 15:30:22 +0000
Subject: [pkgdb] griffith ownership updated
Message-ID: <20091222153022.09B9510F894@bastion.fedoraproject.org>

Package griffith in Fedora 12 is now owned by bonii

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/griffith



From mclasen at fedoraproject.org  Tue Dec 22 15:31:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:31:16 +0000 (UTC)
Subject: File libgweather-2.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222153116.B21E110F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libgweather:

3fe3fabe3e6f8a5e1ef525cf2e06d050  libgweather-2.29.4.tar.bz2



From pbrobinson at fedoraproject.org  Tue Dec 22 15:31:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Dec 2009 15:31:55 +0000 (UTC)
Subject: File rygel-0.4.8.tar.bz2 uploaded to lookaside cache by pbrobinson
Message-ID: <20091222153155.2DD7C10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rygel:

c3cbeb30141d9bcd13460ba5cc8acddc  rygel-0.4.8.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 15:33:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:33:22 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.26, 1.27 libgweather.spec, 1.48, 
	1.49 sources, 1.26, 1.27
Message-ID: <20091222153322.46EB011C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22882

Modified Files:
	.cvsignore libgweather.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	22 Sep 2009 00:57:12 -0000	1.26
+++ .cvsignore	22 Dec 2009 15:33:21 -0000	1.27
@@ -1 +1 @@
-libgweather-2.28.0.tar.bz2
+libgweather-2.29.4.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- libgweather.spec	22 Sep 2009 00:57:12 -0000	1.48
+++ libgweather.spec	22 Dec 2009 15:33:21 -0000	1.49
@@ -1,12 +1,12 @@
 Name:           libgweather
-Version:        2.28.0
+Version:        2.29.4
 Release:        1%{?dist}
 Summary:        A library for weather information
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/libgweather/2.28/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgweather/2.29/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  GConf2-devel >= 2.8.0
@@ -102,6 +102,9 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> 2.29.4-1
+- Update to 2.29.4
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	22 Sep 2009 00:57:12 -0000	1.26
+++ sources	22 Dec 2009 15:33:22 -0000	1.27
@@ -1 +1 @@
-9f4457144d32d4004e0e045240ab51dc  libgweather-2.28.0.tar.bz2
+3fe3fabe3e6f8a5e1ef525cf2e06d050  libgweather-2.29.4.tar.bz2



From pbrobinson at fedoraproject.org  Tue Dec 22 15:34:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Dec 2009 15:34:50 +0000 (UTC)
Subject: rpms/rygel/devel .cvsignore, 1.7, 1.8 rygel.spec, 1.19, 1.20 sources, 
	1.7, 1.8
Message-ID: <20091222153450.5813411C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23177

Modified Files:
	.cvsignore rygel.spec sources 
Log Message:
- Update to 0.4.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 Nov 2009 08:07:48 -0000	1.7
+++ .cvsignore	22 Dec 2009 15:34:50 -0000	1.8
@@ -1 +1 @@
-rygel-0.4.6.tar.bz2
+rygel-0.4.8.tar.bz2


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- rygel.spec	21 Nov 2009 08:07:48 -0000	1.19
+++ rygel.spec	22 Dec 2009 15:34:50 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           rygel
-Version:        0.4.6
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        A UPnP v2 Media Server
 
@@ -94,6 +94,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Tue Nov 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.8-1
+- Update to 0.4.8
+
 * Sat Nov 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.6-1
 - Update to 0.4.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Nov 2009 08:07:49 -0000	1.7
+++ sources	22 Dec 2009 15:34:50 -0000	1.8
@@ -1 +1 @@
-f28c48e2caf79b8e9056636259056de7  rygel-0.4.6.tar.bz2
+c3cbeb30141d9bcd13460ba5cc8acddc  rygel-0.4.8.tar.bz2



From petersen at fedoraproject.org  Tue Dec 22 15:35:05 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 15:35:05 +0000 (UTC)
Subject: rpms/hscolour/devel hscolour.spec,1.5,1.6
Message-ID: <20091222153505.B1A1111C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hscolour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22787

Modified Files:
	hscolour.spec 
Log Message:
- update spec for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1




Index: hscolour.spec
===================================================================
RCS file: /cvs/extras/rpms/hscolour/devel/hscolour.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hscolour.spec	18 Sep 2009 00:55:12 -0000	1.5
+++ hscolour.spec	22 Dec 2009 15:35:04 -0000	1.6
@@ -1,22 +1,22 @@
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           hscolour
 Version:        1.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Colourizes Haskell code
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.cs.york.ac.uk/fp/darcs/hscolour/
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -30,12 +30,25 @@ It currently has five output formats: AN
 HTML 3.2 with font tags, HTML 4.01 with CSS, LaTeX, and mIRC chat codes.
 
 
+%if %{with shared}
+%package -n ghc-%{name}
+Summary:        Haskell library for %{name}
+Group:          System Environment/Libraries
+
+%description -n ghc-%{name}
+Haskell %{name} library for ghc.
+%endif
+
+
 %package -n ghc-%{name}-devel
-Summary:        Haskell %{name} library
+Summary:        Haskell %{name} library development files
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description -n ghc-%{name}-devel
 This package contains the development files for %{name}
@@ -44,9 +57,9 @@ built for ghc-%{ghc_version}.
 
 %if %{with doc}
 %package -n ghc-%{name}-doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
+Summary:        Documentation for %{name}
+Group:          Development/Libraries
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
 
@@ -57,10 +70,11 @@ This package contains development docume
 
 %if %{with prof}
 %package -n ghc-%{name}-prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: ghc-%{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+Summary:        Profiling libraries for %{name}
+Group:          Development/Libraries
+License:        LGPLv2+
+Requires:       ghc-%{name}-devel = %{version}-%{release}
+Requires:       ghc-prof = %{ghc_version}
 
 %description -n ghc-%{name}-prof
 This package contains profiling libraries for %{name}
@@ -73,18 +87,18 @@ built for ghc-%{ghc_version}.
 
 
 %build
+# dynamic + prof breaks cabal looking for p_dyn
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists ghc-%{name}
 
 
@@ -93,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -n ghc-%{name}-devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -103,9 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %preun -n ghc-%{name}-devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -118,12 +130,23 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENCE-GPL README
+%doc README
 %attr(755,root,root) %{_bindir}/HsColour
 %{_datadir}/%{name}-%{version}
 
+
+%if %{with shared}
+%files -n ghc-%{name} -f ghc-%{name}.files
+%defattr(-,root,root,-)
+%doc LICENCE-GPL
+%endif
+
+
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
+%doc LICENCE-LGPL
+%endif
 
 
 %if %{with doc}
@@ -139,6 +162,10 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.15-2
+- update spec for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Fri Sep 18 2009 Jens Petersen <petersen at redhat.com> - 1.15-1
 - update to 1.15
 



From mclasen at fedoraproject.org  Tue Dec 22 15:35:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:35:37 +0000 (UTC)
Subject: rpms/gobject-introspection/devel gobject-introspection.spec, 1.17,
	1.18
Message-ID: <20091222153537.554AC11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gobject-introspection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23136

Modified Files:
	gobject-introspection.spec 
Log Message:
fix file lists



Index: gobject-introspection.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/gobject-introspection.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gobject-introspection.spec	22 Dec 2009 15:16:02 -0000	1.17
+++ gobject-introspection.spec	22 Dec 2009 15:35:37 -0000	1.18
@@ -90,6 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_bindir}/g-ir-*
 %{_datadir}/gir-1.0
+%{_datadir}/gobject-introspection-1.0
 %{_datadir}/aclocal/introspection.m4
 %{python_sitearch}/giscanner
 %{_mandir}/man1/*.gz



From mclasen at fedoraproject.org  Tue Dec 22 15:39:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:39:19 +0000 (UTC)
Subject: File gtk-doc-1.13.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222153919.B311C10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gtk-doc:

27940d6cd5c9dcda8fc003043d8c299a  gtk-doc-1.13.tar.bz2



From mitr at fedoraproject.org  Tue Dec 22 15:40:03 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 22 Dec 2009 15:40:03 +0000 (UTC)
Subject: rpms/tmpwatch/F-12 .cvsignore, 1.28, 1.29 sources, 1.29,
	1.30 tmpwatch.spec, 1.42, 1.43
Message-ID: <20091222154003.52AFC11C039C@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/tmpwatch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24348

Modified Files:
	.cvsignore sources tmpwatch.spec 
Log Message:
* Tue Dec 22 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.17-1
- Update to tmpwatch-2.9.17.
  Resolves: #548932



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	15 Oct 2009 15:02:13 -0000	1.28
+++ .cvsignore	22 Dec 2009 15:40:02 -0000	1.29
@@ -1 +1 @@
-tmpwatch-2.9.16.tar.bz2
+tmpwatch-2.9.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	15 Oct 2009 15:02:13 -0000	1.29
+++ sources	22 Dec 2009 15:40:02 -0000	1.30
@@ -1 +1 @@
-40eee5c3e3f352c30e532ffc1f0af3a8  tmpwatch-2.9.16.tar.bz2
+7738f5db4ae0ce3795c224f13a597356  tmpwatch-2.9.17.tar.bz2


Index: tmpwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-12/tmpwatch.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- tmpwatch.spec	15 Oct 2009 15:02:13 -0000	1.42
+++ tmpwatch.spec	22 Dec 2009 15:40:02 -0000	1.43
@@ -1,6 +1,6 @@
 Summary: A utility for removing files based on when they were last accessed
 Name: tmpwatch
-Version: 2.9.16
+Version: 2.9.17
 Release: 1%{?dist}
 URL: https://fedorahosted.org/tmpwatch/
 Source0: https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-%{version}.tar.bz2
@@ -50,6 +50,10 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Tue Dec 22 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.17-1
+- Update to tmpwatch-2.9.17.
+  Resolves: #548932
+
 * Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.16-1
 - Update to tmpwatch-2.9.16.
 - Exclude /tmp/hsperfdata_*.



From mclasen at fedoraproject.org  Tue Dec 22 15:43:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 15:43:06 +0000 (UTC)
Subject: rpms/gtk-doc/devel .cvsignore, 1.15, 1.16 gtk-doc.spec, 1.57,
	1.58 sources, 1.17, 1.18
Message-ID: <20091222154306.A0ADB11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk-doc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25196

Modified Files:
	.cvsignore gtk-doc.spec sources 
Log Message:
1.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-doc/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Nov 2008 06:28:14 -0000	1.15
+++ .cvsignore	22 Dec 2009 15:43:06 -0000	1.16
@@ -1 +1 @@
-gtk-doc-1.11.tar.bz2
+gtk-doc-1.13.tar.bz2


Index: gtk-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- gtk-doc.spec	3 Dec 2009 04:55:56 -0000	1.57
+++ gtk-doc.spec	22 Dec 2009 15:43:06 -0000	1.58
@@ -1,10 +1,10 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
-Version: 1.11
-Release: 6%{?dist}
+Version: 1.13
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
-Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.11/gtk-doc-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/gtk-doc-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=562064
 Patch0: gtk-doc-index.patch
 BuildArch: noarch
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/gtk-doc-manual
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 1.13-1
+- Update to 1.13
+
 * Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 1.11-6
 - Drop unnecessary BRs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-doc/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Nov 2008 06:28:15 -0000	1.17
+++ sources	22 Dec 2009 15:43:06 -0000	1.18
@@ -1 +1 @@
-b5e268c71fa90aad890cf53715664d0a  gtk-doc-1.11.tar.bz2
+27940d6cd5c9dcda8fc003043d8c299a  gtk-doc-1.13.tar.bz2



From spot at fedoraproject.org  Tue Dec 22 15:46:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 22 Dec 2009 15:46:14 +0000 (UTC)
Subject: File R-2.10.1.tar.gz uploaded to lookaside cache by spot
Message-ID: <20091222154614.6CC0110F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for R:

75f8b7e875b846ea96a4c6cc0abc00a4  R-2.10.1.tar.gz



From pbrobinson at fedoraproject.org  Tue Dec 22 15:46:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 22 Dec 2009 15:46:52 +0000 (UTC)
Subject: rpms/rygel/F-12 .cvsignore, 1.6, 1.7 rygel.spec, 1.17, 1.18 sources, 
	1.6, 1.7
Message-ID: <20091222154652.B7E5111C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25828

Modified Files:
	.cvsignore rygel.spec sources 
Log Message:
- Update to 0.4.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Dec 2009 15:06:44 -0000	1.6
+++ .cvsignore	22 Dec 2009 15:46:52 -0000	1.7
@@ -1 +1 @@
-rygel-0.4.6.tar.bz2
+rygel-0.4.8.tar.bz2


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/rygel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rygel.spec	9 Dec 2009 15:06:44 -0000	1.17
+++ rygel.spec	22 Dec 2009 15:46:52 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           rygel
-Version:        0.4.6
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        A UPnP v2 Media Server
 
@@ -94,6 +94,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Tue Nov 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.8-1
+- Update to 0.4.8
+
 * Sat Nov 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.6-1
 - Update to 0.4.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Dec 2009 15:06:44 -0000	1.6
+++ sources	22 Dec 2009 15:46:52 -0000	1.7
@@ -1 +1 @@
-f28c48e2caf79b8e9056636259056de7  rygel-0.4.6.tar.bz2
+c3cbeb30141d9bcd13460ba5cc8acddc  rygel-0.4.8.tar.bz2



From mitr at fedoraproject.org  Tue Dec 22 15:48:58 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 22 Dec 2009 15:48:58 +0000 (UTC)
Subject: rpms/tmpwatch/F-11 .cvsignore, 1.26, 1.27 sources, 1.27,
	1.28 tmpwatch.daily, 1.3, 1.4 tmpwatch.spec, 1.39, 1.40
Message-ID: <20091222154858.70CB011C00E9@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/tmpwatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26332

Modified Files:
	.cvsignore sources tmpwatch.daily tmpwatch.spec 
Log Message:
* Tue Dec 22 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.17-1
- Update to tmpwatch-2.9.17.
  Resolves: #548932



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	23 Mar 2009 13:44:01 -0000	1.26
+++ .cvsignore	22 Dec 2009 15:48:58 -0000	1.27
@@ -1 +1 @@
-tmpwatch-2.9.14.tar.bz2
+tmpwatch-2.9.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	23 Mar 2009 13:44:01 -0000	1.27
+++ sources	22 Dec 2009 15:48:58 -0000	1.28
@@ -1 +1 @@
-9d77f5f4a1bb93fec08b17d53fef6d4f  tmpwatch-2.9.14.tar.bz2
+7738f5db4ae0ce3795c224f13a597356  tmpwatch-2.9.17.tar.bz2


Index: tmpwatch.daily
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-11/tmpwatch.daily,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tmpwatch.daily	14 Dec 2007 15:16:29 -0000	1.3
+++ tmpwatch.daily	22 Dec 2009 15:48:58 -0000	1.4
@@ -1,7 +1,8 @@
 #! /bin/sh
 flags=-umc
 /usr/sbin/tmpwatch "$flags" -x /tmp/.X11-unix -x /tmp/.XIM-unix \
-	-x /tmp/.font-unix -x /tmp/.ICE-unix -x /tmp/.Test-unix 10d /tmp
+	-x /tmp/.font-unix -x /tmp/.ICE-unix -x /tmp/.Test-unix \
+	-X '/tmp/hsperfdata_*' 10d /tmp
 /usr/sbin/tmpwatch "$flags" 30d /var/tmp
 for d in /var/{cache/man,catman}/{cat?,X11R6/cat?,local/cat?}; do
     if [ -d "$d" ]; then


Index: tmpwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-11/tmpwatch.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- tmpwatch.spec	23 Mar 2009 13:44:01 -0000	1.39
+++ tmpwatch.spec	22 Dec 2009 15:48:58 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A utility for removing files based on when they were last accessed
 Name: tmpwatch
-Version: 2.9.14
-Release: 1
+Version: 2.9.17
+Release: 1%{?dist}
 URL: https://fedorahosted.org/tmpwatch/
 Source0: https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-%{version}.tar.bz2
 Source1: tmpwatch.daily
@@ -26,10 +26,16 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make ROOT=%{buildroot} SBINDIR=%{_sbindir} MANDIR=%{_mandir} install
+make ROOT=%{buildroot} SBINDIR=%{_sbindir} MANDIR=%{_mandir} \
+	INSTALL='install -p' install
+
+mkdir -p %{buildroot}%{_bindir}
+# The $(...) computes /usr/bin => ../../
+ln -s $(echo %{_bindir} |sed 's,/[^/]\+,/..,g; s,^/,,')%{_sbindir}/tmpwatch \
+   %{buildroot}%{_bindir}/tmpwatch
 
 mkdir -p %{buildroot}/etc/cron.daily
-cp %{SOURCE1} %{buildroot}/etc/cron.daily/tmpwatch
+install -p %{SOURCE1} %{buildroot}/etc/cron.daily/tmpwatch
 chmod +x %{buildroot}/etc/cron.daily/tmpwatch
 
 %clean
@@ -38,11 +44,30 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc ChangeLog NEWS README
+%{_bindir}/tmpwatch
 %{_sbindir}/tmpwatch
 %{_mandir}/man8/tmpwatch.8*
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Tue Dec 22 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.17-1
+- Update to tmpwatch-2.9.17.
+  Resolves: #548932
+
+* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.16-1
+- Update to tmpwatch-2.9.16.
+- Exclude /tmp/hsperfdata_*.
+  Resolves: #527425
+- Preserve timestamps where possible.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 22 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.15-1
+- Update to tmpwatch-2.9.15.
+- Add a symlink to %%{_bindir}.
+  Resolves: #494239
+
 * Mon Mar 23 2009 Miloslav Trma? <mitr at redhat.com> - 2.9.14-1
 - Update to tmpwatch-2.9.14.
 



From petersen at fedoraproject.org  Tue Dec 22 15:49:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 15:49:17 +0000 (UTC)
Subject: File utf8-string-0.3.6.tar.gz uploaded to lookaside cache by petersen
Message-ID: <20091222154917.5D8BC10F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ghc-utf8-string:

be8c5ef52a0824babdc89d60c1e9b600  utf8-string-0.3.6.tar.gz



From petersen at fedoraproject.org  Tue Dec 22 15:49:58 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 15:49:58 +0000 (UTC)
Subject: rpms/ghc-utf8-string/devel .cvsignore, 1.2, 1.3 ghc-utf8-string.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091222154958.6544711C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-utf8-string/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26795

Modified Files:
	.cvsignore ghc-utf8-string.spec sources 
Log Message:
- update to 0.3.6
- update packaging for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-utf8-string/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jun 2009 20:00:34 -0000	1.2
+++ .cvsignore	22 Dec 2009 15:49:58 -0000	1.3
@@ -1 +1 @@
-utf8-string-0.3.5.tar.gz
+utf8-string-0.3.6.tar.gz


Index: ghc-utf8-string.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-utf8-string/devel/ghc-utf8-string.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-utf8-string.spec	16 Nov 2009 09:31:02 -0000	1.3
+++ ghc-utf8-string.spec	22 Dec 2009 15:49:58 -0000	1.4
@@ -2,23 +2,23 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        0.3.5
-Release:        3%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        Haskell UTF8 layer for IO and Strings
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -32,11 +32,14 @@ for encoding UTF8 strings to Word8 lists
 UTF8 without truncation. 
 
 %package devel
-Summary:        Haskell UTF8 layer for IO and Strings
+Summary:        Haskell UTF8 layer for IO and Strings development files
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description devel
 The utf8-string package provides operations
@@ -84,13 +87,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -99,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -108,10 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -122,9 +122,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -140,6 +149,11 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 0.3.6-1
+- update to 0.3.6
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-utf8-string/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jun 2009 20:00:34 -0000	1.2
+++ sources	22 Dec 2009 15:49:58 -0000	1.3
@@ -1 +1 @@
-d5198209bd81ea4f8af7692e2467336c  utf8-string-0.3.5.tar.gz
+be8c5ef52a0824babdc89d60c1e9b600  utf8-string-0.3.6.tar.gz



From mtasaka at fedoraproject.org  Tue Dec 22 16:04:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Dec 2009 16:04:00 +0000 (UTC)
Subject: File alexandria-0.6.6-beta1.tar.gz uploaded to lookaside cache by
	mtasaka
Message-ID: <20091222160400.B9B6210F8BF@bastion.fedoraproject.org>

A file has been added to the lookaside cache for alexandria:

df5a51687f798328d61eb521187dca9a  alexandria-0.6.6-beta1.tar.gz



From mtasaka at fedoraproject.org  Tue Dec 22 16:07:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Dec 2009 16:07:39 +0000 (UTC)
Subject: rpms/alexandria/F-12 .cvsignore, 1.11, 1.12 alexandria.spec, 1.44,
	1.45 sources, 1.11, 1.12
Message-ID: <20091222160739.7A0D711C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29694/F-12

Modified Files:
	.cvsignore alexandria.spec sources 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.3.beta1
- Try 0.6.6 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	16 Dec 2009 18:58:41 -0000	1.11
+++ .cvsignore	22 Dec 2009 16:07:38 -0000	1.12
@@ -1 +1 @@
-alexandria_0.6.5+0.6.6alpha.orig.tar.gz
+alexandria-0.6.6-beta1.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/alexandria.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- alexandria.spec	16 Dec 2009 18:58:41 -0000	1.44
+++ alexandria.spec	22 Dec 2009 16:07:39 -0000	1.45
@@ -1,12 +1,11 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		62178
+%define		repoid		68098
 
-%define		prevver	0.6.5
 %define		majorver	0.6.6
-%define		minorver	alpha
+%define		minorver	beta1
 
-%define		fedorarel	1
+%define		fedorarel	3
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,14 +18,10 @@ Summary:	Book collection manager
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
-#Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-Source0:	https://launchpad.net/~alexandria-team/+archive/ppa/+files/%{name}_%{prevver}+%{version}%{?minorver}.orig.tar.gz
+Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver:-%{minorver}}.tar.gz
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Add install_prefix
-# Will ask upstream
-Patch10:	alexandria-0.6.6alpha1-installprefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -37,8 +32,6 @@ BuildRequires:	gettext
 BuildRequires:	intltool
 BuildRequires:	scrollkeeper
 
-BuildRequires:	ImageMagick
-
 Requires:	ruby
 Requires:	ruby(abi) = %{rubyabi}
 
@@ -75,10 +68,8 @@ Requires(preun):	GConf2
 Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
-#%%setup -q -n %{name}-%{majorver}%{?minorver}
-%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
+%setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
 %patch2 -p0 -b .up25348
-%patch10 -p1 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -91,44 +82,22 @@ rake build
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# disable scrollkeeper
-%{__rm} -rf tmpbin
-%{__mkdir} tmpbin
-%{__ln_s} -f /bin/true tmpbin/scrollkeeper-update
-%{__ln_s} -f /bin/true tmpbin/gconftool-2
-%{__ln_s} -f /bin/true tmpbin/gtk-update-icon-cache
-
-export PATH="$(pwd)/tmpbin:$PATH"
-export RUBYLIBDIR=%{ruby_sitelib}
-#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-rake install \
-	install_prefix=$RPM_BUILD_ROOT
+rake install_package_staging \
+	DESTDIR=$RPM_BUILD_ROOT \
+	RUBYLIBDIR=%{ruby_sitelib}
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
 	--vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# create 64x64, 128x128 icon
-for s in 64 128 ; do
-	%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/
-	convert -scale ${s}x${s} \
-		data/alexandria/icons/%{name}.png \
-		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
-done
-
 # Move gconf files to where Fedora uses
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mv} \
 	$RPM_BUILD_ROOT%{_datadir}/gconf/ \
 	$RPM_BUILD_ROOT%{_sysconfdir}/
 
-# Clean up documents
-%{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir}
-
 # %%{_datadir}/menu seems to be used for debian
 # Removing for Fedora
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/
@@ -207,6 +176,14 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.3.beta1
+- Try 0.6.6 beta1
+
+* Fri Dec 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.2.alpha
+- Use "rake install_package_staging" as explained by the upstream
+  (in alexandria-Bugs-27578)
+- Kill the creation of 64/128 icons as scalable svg is already installed
+
 * Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
 - Try 0.6.6 alpha
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Dec 2009 18:58:41 -0000	1.11
+++ sources	22 Dec 2009 16:07:39 -0000	1.12
@@ -1 +1 @@
-3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz
+df5a51687f798328d61eb521187dca9a  alexandria-0.6.6-beta1.tar.gz



From mtasaka at fedoraproject.org  Tue Dec 22 16:07:40 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Dec 2009 16:07:40 +0000 (UTC)
Subject: rpms/alexandria/devel .cvsignore, 1.11, 1.12 alexandria.spec, 1.45,
	1.46 sources, 1.11, 1.12 alexandria-0.6.6alpha-rake-prefix.patch,
	1.1, NONE
Message-ID: <20091222160740.76AB211C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29694/devel

Modified Files:
	.cvsignore alexandria.spec sources 
Removed Files:
	alexandria-0.6.6alpha-rake-prefix.patch 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.3.beta1
- Try 0.6.6 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	16 Dec 2009 18:58:41 -0000	1.11
+++ .cvsignore	22 Dec 2009 16:07:39 -0000	1.12
@@ -1 +1 @@
-alexandria_0.6.5+0.6.6alpha.orig.tar.gz
+alexandria-0.6.6-beta1.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- alexandria.spec	17 Dec 2009 15:58:40 -0000	1.45
+++ alexandria.spec	22 Dec 2009 16:07:40 -0000	1.46
@@ -1,12 +1,11 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		62178
+%define		repoid		68098
 
-%define		prevver	0.6.5
 %define		majorver	0.6.6
-%define		minorver	alpha
+%define		minorver	beta1
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,13 +18,10 @@ Summary:	Book collection manager
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
-#Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-Source0:	https://launchpad.net/~alexandria-team/+archive/ppa/+files/%{name}_%{prevver}+%{version}%{?minorver}.orig.tar.gz
+Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver:-%{minorver}}.tar.gz
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# ref: aleandria-Bugs-27578
-Patch10:	alexandria-0.6.6alpha-rake-prefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -72,10 +68,8 @@ Requires(preun):	GConf2
 Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
-#%%setup -q -n %{name}-%{majorver}%{?minorver}
-%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
+%setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
 %patch2 -p0 -b .up25348
-%patch10 -p0 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -182,6 +176,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.3.beta1
+- Try 0.6.6 beta1
+
 * Fri Dec 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.2.alpha
 - Use "rake install_package_staging" as explained by the upstream
   (in alexandria-Bugs-27578)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Dec 2009 18:58:41 -0000	1.11
+++ sources	22 Dec 2009 16:07:40 -0000	1.12
@@ -1 +1 @@
-3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz
+df5a51687f798328d61eb521187dca9a  alexandria-0.6.6-beta1.tar.gz


--- alexandria-0.6.6alpha-rake-prefix.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Dec 22 16:07:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Dec 2009 16:07:39 +0000 (UTC)
Subject: rpms/alexandria/F-11 .cvsignore, 1.11, 1.12 alexandria.spec, 1.41,
	1.42 sources, 1.11, 1.12
Message-ID: <20091222160739.353B811C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29694/F-11

Modified Files:
	.cvsignore alexandria.spec sources 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.3.beta1
- Try 0.6.6 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	16 Dec 2009 18:58:41 -0000	1.11
+++ .cvsignore	22 Dec 2009 16:07:38 -0000	1.12
@@ -1 +1 @@
-alexandria_0.6.5+0.6.6alpha.orig.tar.gz
+alexandria-0.6.6-beta1.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- alexandria.spec	16 Dec 2009 18:58:41 -0000	1.41
+++ alexandria.spec	22 Dec 2009 16:07:38 -0000	1.42
@@ -1,12 +1,11 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		62178
+%define		repoid		68098
 
-%define		prevver	0.6.5
 %define		majorver	0.6.6
-%define		minorver	alpha
+%define		minorver	beta1
 
-%define		fedorarel	1
+%define		fedorarel	3
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,14 +18,10 @@ Summary:	Book collection manager
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
-#Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-Source0:	https://launchpad.net/~alexandria-team/+archive/ppa/+files/%{name}_%{prevver}+%{version}%{?minorver}.orig.tar.gz
+Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver:-%{minorver}}.tar.gz
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Add install_prefix
-# Will ask upstream
-Patch10:	alexandria-0.6.6alpha1-installprefix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -37,8 +32,6 @@ BuildRequires:	gettext
 BuildRequires:	intltool
 BuildRequires:	scrollkeeper
 
-BuildRequires:	ImageMagick
-
 Requires:	ruby
 Requires:	ruby(abi) = %{rubyabi}
 
@@ -75,10 +68,8 @@ Requires(preun):	GConf2
 Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
-#%%setup -q -n %{name}-%{majorver}%{?minorver}
-%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver}
+%setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
 %patch2 -p0 -b .up25348
-%patch10 -p1 -b .prefix
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -91,44 +82,22 @@ rake build
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# disable scrollkeeper
-%{__rm} -rf tmpbin
-%{__mkdir} tmpbin
-%{__ln_s} -f /bin/true tmpbin/scrollkeeper-update
-%{__ln_s} -f /bin/true tmpbin/gconftool-2
-%{__ln_s} -f /bin/true tmpbin/gtk-update-icon-cache
-
-export PATH="$(pwd)/tmpbin:$PATH"
-export RUBYLIBDIR=%{ruby_sitelib}
-#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-rake install \
-	install_prefix=$RPM_BUILD_ROOT
+rake install_package_staging \
+	DESTDIR=$RPM_BUILD_ROOT \
+	RUBYLIBDIR=%{ruby_sitelib}
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install \
 	--vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# create 64x64, 128x128 icon
-for s in 64 128 ; do
-	%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/
-	convert -scale ${s}x${s} \
-		data/alexandria/icons/%{name}.png \
-		$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
-done
-
 # Move gconf files to where Fedora uses
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mv} \
 	$RPM_BUILD_ROOT%{_datadir}/gconf/ \
 	$RPM_BUILD_ROOT%{_sysconfdir}/
 
-# Clean up documents
-%{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir}
-
 # %%{_datadir}/menu seems to be used for debian
 # Removing for Fedora
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/
@@ -207,6 +176,14 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.3.beta1
+- Try 0.6.6 beta1
+
+* Fri Dec 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.2.alpha
+- Use "rake install_package_staging" as explained by the upstream
+  (in alexandria-Bugs-27578)
+- Kill the creation of 64/128 icons as scalable svg is already installed
+
 * Thu Dec 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.1.alpha
 - Try 0.6.6 alpha
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Dec 2009 18:58:41 -0000	1.11
+++ sources	22 Dec 2009 16:07:38 -0000	1.12
@@ -1 +1 @@
-3ef83d89d92b4160f78a42e83c8e3890  alexandria_0.6.5+0.6.6alpha.orig.tar.gz
+df5a51687f798328d61eb521187dca9a  alexandria-0.6.6-beta1.tar.gz



From twaugh at fedoraproject.org  Tue Dec 22 16:08:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 16:08:16 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-1.1.16.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.209, 1.210 sources, 1.215, 1.216 system-config-printer.spec,
	1.328, 1.329 system-config-printer-1.1.15.tar.xz.sig, 1.1,
	NONE system-config-printer-browsepoll.patch, 1.1,
	NONE system-config-printer-cupsd.conf-parser.patch, 1.1,
	NONE system-config-printer-localize-statereason.patch, 1.1,
	NONE system-config-printer-lpd-uri.patch, 1.1,
	NONE system-config-printer-selection-browse.patch, 1.1,
	NONE system-config-printer-short-lived-states.patch, 1.1,
	NONE system-config-printer-troubleshooter-debugcancel.patch, 1.1,
	NONE system-config-printer-troubleshooter-traceback.patch, 1.1, NONE
Message-ID: <20091222160816.0380511C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29908

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.16.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.15.tar.xz.sig 
	system-config-printer-browsepoll.patch 
	system-config-printer-cupsd.conf-parser.patch 
	system-config-printer-localize-statereason.patch 
	system-config-printer-lpd-uri.patch 
	system-config-printer-selection-browse.patch 
	system-config-printer-short-lived-states.patch 
	system-config-printer-troubleshooter-debugcancel.patch 
	system-config-printer-troubleshooter-traceback.patch 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
- 1.1.16:
  - Ignore com.apple.print.recoverable state reason.
  - Prevent traceback in found_network_printer_callback (bug #547765).
  - Use asynchronous connection class for fetching device lists
    (bug #549749).
  - Prefer Foomatic/hpijs to hpcups for the time being.
  - Clear device screen each time a new dialog is presented.
  - Constraints handling fix.



--- NEW FILE system-config-printer-1.1.16.tar.xz.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/.cvsignore,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- .cvsignore	22 Dec 2009 14:27:12 -0000	1.209
+++ .cvsignore	22 Dec 2009 16:08:14 -0000	1.210
@@ -208,3 +208,4 @@ system-config-printer-1.1.13.tar.xz
 system-config-printer-1.1.14.tar.xz
 system-config-printer-1.1.15.tar.xz
 pycups-1.9.47.tar.bz2
+system-config-printer-1.1.16.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/sources,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- sources	22 Dec 2009 14:27:13 -0000	1.215
+++ sources	22 Dec 2009 16:08:14 -0000	1.216
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-9ae89a1293d78fafe1edf4d37fd0f54b  system-config-printer-1.1.15.tar.xz
 b2c94db15c916e0776e320addb279ba8  pycups-1.9.47.tar.bz2
+8c2643d8a670eaadc3fa6890149b753b  system-config-printer-1.1.16.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- system-config-printer.spec	22 Dec 2009 14:27:13 -0000	1.328
+++ system-config-printer.spec	22 Dec 2009 16:08:15 -0000	1.329
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.15
-Release: 9%{?dist}
+Version: 1.1.16
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,14 +16,6 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
-Patch2: system-config-printer-localize-statereason.patch
-Patch3: system-config-printer-browsepoll.patch
-Patch4: system-config-printer-cupsd.conf-parser.patch
-Patch5: system-config-printer-troubleshooter-traceback.patch
-Patch6: system-config-printer-lpd-uri.patch
-Patch7: system-config-printer-short-lived-states.patch
-Patch8: system-config-printer-troubleshooter-debugcancel.patch
-Patch9: system-config-printer-selection-browse.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -84,14 +76,6 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
-%patch2 -p1 -b .localize-statereason
-%patch3 -p1 -b .browsepoll
-%patch4 -p1 -b .cupsd.conf-parser
-%patch5 -p1 -b .troubleshooter-traceback
-%patch6 -p1 -b .lpd-uri
-%patch7 -p1 -b .short-lived-states
-%patch8 -p1 -b .troubleshooter-debugcancel
-%patch9 -p1 -b .selection-browse
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -157,6 +141,10 @@ rm -rf %buildroot
 %{_bindir}/my-default-printer
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/AdvancedServerSettings.py*
+%{_datadir}/%{name}/asyncconn.py*
+%{_datadir}/%{name}/asyncipp.py*
+%{_datadir}/%{name}/asyncpk1.py*
+%{_datadir}/%{name}/asyncpk0.py*
 %{_datadir}/%{name}/authconn.py*
 %{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
@@ -204,8 +192,16 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
 - Updated pycups to 1.9.47.
+- 1.1.16:
+  - Ignore com.apple.print.recoverable state reason.
+  - Prevent traceback in found_network_printer_callback (bug #547765).
+  - Use asynchronous connection class for fetching device lists
+    (bug #549749).
+  - Prefer Foomatic/hpijs to hpcups for the time being.
+  - Clear device screen each time a new dialog is presented.
+  - Constraints handling fix.
 
 * Fri Dec 18 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-9
 - Prevent traceback when no downloadable driver selected (#548449).


--- system-config-printer-1.1.15.tar.xz.sig DELETED ---


--- system-config-printer-browsepoll.patch DELETED ---


--- system-config-printer-cupsd.conf-parser.patch DELETED ---


--- system-config-printer-localize-statereason.patch DELETED ---


--- system-config-printer-lpd-uri.patch DELETED ---


--- system-config-printer-selection-browse.patch DELETED ---


--- system-config-printer-short-lived-states.patch DELETED ---


--- system-config-printer-troubleshooter-debugcancel.patch DELETED ---


--- system-config-printer-troubleshooter-traceback.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Dec 22 16:12:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Dec 2009 16:12:10 +0000 (UTC)
Subject: rpms/perl-mecab/devel perl-mecab.spec,1.17,1.18
Message-ID: <20091222161210.A712911C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/perl-mecab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31002

Modified Files:
	perl-mecab.spec 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-2
- F-13: rebuild for new perl



Index: perl-mecab.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-mecab/devel/perl-mecab.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-mecab.spec	28 Sep 2009 17:32:34 -0000	1.17
+++ perl-mecab.spec	22 Dec 2009 16:12:10 -0000	1.18
@@ -1,6 +1,6 @@
 %define		mainver		0.98
 #%%define		betaver		pre3
-%define		relnumber	1
+%define		relnumber	2
 %define		srcname		mecab-perl
 
 Name:		perl-mecab
@@ -60,6 +60,9 @@ find $RPM_BUILD_ROOT -depth -type d | xa
 %{perl_vendorarch}/auto/MeCab/
 
 %changelog
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-2
+- F-13: rebuild for new perl
+
 * Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.98-1
 - 0.98
 



From petersen at fedoraproject.org  Tue Dec 22 16:13:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 16:13:23 +0000 (UTC)
Subject: rpms/ghc-X11/devel ghc-X11.spec,1.19,1.20
Message-ID: <20091222161323.96B2911C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31282

Modified Files:
	ghc-X11.spec 
Log Message:
update base Group and devel Summary


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ghc-X11.spec	21 Dec 2009 12:57:31 -0000	1.19
+++ ghc-X11.spec	22 Dec 2009 16:13:23 -0000	1.20
@@ -12,7 +12,7 @@ Version:        1.5.0.0
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
@@ -35,15 +35,15 @@ documentation of these calls, refer to "
 Manual", available online at <http://tronche.com/gui/x/xlib/>.
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(postun): ghc = %{ghc_version}
-Requires:       libXinerama-devel, libX11-devel, libXext-devel
 %if %{with shared}
 Requires:       %{name} = %{version}-%{release}
 %endif
+Requires:       libXinerama-devel, libX11-devel, libXext-devel
 
 %description devel
 This package contains the development files for %{name}
@@ -130,7 +130,9 @@ fi
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -146,6 +148,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com>
+- update base Group and devel Summary
+
 * Mon Dec 21 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.5.0.0-1
 - updated to latest upstream
 - updates spec to use shared libraries and new ghc



From twaugh at fedoraproject.org  Tue Dec 22 16:15:04 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 16:15:04 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-1.1.16.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.209, 1.210 sources, 1.215, 1.216 system-config-printer.spec,
	1.324, 1.325 system-config-printer-1.1.15.tar.xz.sig, 1.1,
	NONE system-config-printer-browsepoll.patch, 1.1,
	NONE system-config-printer-cupsd.conf-parser.patch, 1.1,
	NONE system-config-printer-localize-statereason.patch, 1.1,
	NONE system-config-printer-lpd-uri.patch, 1.1,
	NONE system-config-printer-selection-browse.patch, 1.1,
	NONE system-config-printer-short-lived-states.patch, 1.1,
	NONE system-config-printer-troubleshooter-debugcancel.patch, 1.1,
	NONE system-config-printer-troubleshooter-traceback.patch, 1.1, NONE
Message-ID: <20091222161505.01ED211C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31688

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.16.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.15.tar.xz.sig 
	system-config-printer-browsepoll.patch 
	system-config-printer-cupsd.conf-parser.patch 
	system-config-printer-localize-statereason.patch 
	system-config-printer-lpd-uri.patch 
	system-config-printer-selection-browse.patch 
	system-config-printer-short-lived-states.patch 
	system-config-printer-troubleshooter-debugcancel.patch 
	system-config-printer-troubleshooter-traceback.patch 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
- 1.1.16:
  - Ignore com.apple.print.recoverable state reason.
  - Prevent traceback in found_network_printer_callback (bug #547765).
  - Use asynchronous connection class for fetching device lists
    (bug #549749).
  - Prefer Foomatic/hpijs to hpcups for the time being.
  - Clear device screen each time a new dialog is presented.
  - Constraints handling fix.



--- NEW FILE system-config-printer-1.1.16.tar.xz.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- .cvsignore	22 Dec 2009 14:33:05 -0000	1.209
+++ .cvsignore	22 Dec 2009 16:15:03 -0000	1.210
@@ -208,3 +208,4 @@ system-config-printer-1.1.13.tar.xz
 system-config-printer-1.1.14.tar.xz
 system-config-printer-1.1.15.tar.xz
 pycups-1.9.47.tar.bz2
+system-config-printer-1.1.16.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- sources	22 Dec 2009 14:33:05 -0000	1.215
+++ sources	22 Dec 2009 16:15:03 -0000	1.216
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-9ae89a1293d78fafe1edf4d37fd0f54b  system-config-printer-1.1.15.tar.xz
 b2c94db15c916e0776e320addb279ba8  pycups-1.9.47.tar.bz2
+8c2643d8a670eaadc3fa6890149b753b  system-config-printer-1.1.16.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- system-config-printer.spec	22 Dec 2009 14:33:06 -0000	1.324
+++ system-config-printer.spec	22 Dec 2009 16:15:04 -0000	1.325
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.15
-Release: 9%{?dist}
+Version: 1.1.16
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,14 +16,6 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
-Patch2: system-config-printer-localize-statereason.patch
-Patch3: system-config-printer-browsepoll.patch
-Patch4: system-config-printer-cupsd.conf-parser.patch
-Patch5: system-config-printer-troubleshooter-traceback.patch
-Patch6: system-config-printer-lpd-uri.patch
-Patch7: system-config-printer-short-lived-states.patch
-Patch8: system-config-printer-troubleshooter-debugcancel.patch
-Patch9: system-config-printer-selection-browse.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -84,14 +76,6 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
-%patch2 -p1 -b .localize-statereason
-%patch3 -p1 -b .browsepoll
-%patch4 -p1 -b .cupsd.conf-parser
-%patch5 -p1 -b .troubleshooter-traceback
-%patch6 -p1 -b .lpd-uri
-%patch7 -p1 -b .short-lived-states
-%patch8 -p1 -b .troubleshooter-debugcancel
-%patch9 -p1 -b .selection-browse
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -157,6 +141,10 @@ rm -rf %buildroot
 %{_bindir}/my-default-printer
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/AdvancedServerSettings.py*
+%{_datadir}/%{name}/asyncconn.py*
+%{_datadir}/%{name}/asyncipp.py*
+%{_datadir}/%{name}/asyncpk0.py*
+%{_datadir}/%{name}/asyncpk1.py*
 %{_datadir}/%{name}/authconn.py*
 %{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
@@ -204,8 +192,16 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com>
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
 - Updated pycups to 1.9.47.
+- 1.1.16:
+  - Ignore com.apple.print.recoverable state reason.
+  - Prevent traceback in found_network_printer_callback (bug #547765).
+  - Use asynchronous connection class for fetching device lists
+    (bug #549749).
+  - Prefer Foomatic/hpijs to hpcups for the time being.
+  - Clear device screen each time a new dialog is presented.
+  - Constraints handling fix.
 
 * Fri Dec 18 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-9
 - Prevent traceback when no downloadable driver selected (#548449).


--- system-config-printer-1.1.15.tar.xz.sig DELETED ---


--- system-config-printer-browsepoll.patch DELETED ---


--- system-config-printer-cupsd.conf-parser.patch DELETED ---


--- system-config-printer-localize-statereason.patch DELETED ---


--- system-config-printer-lpd-uri.patch DELETED ---


--- system-config-printer-selection-browse.patch DELETED ---


--- system-config-printer-short-lived-states.patch DELETED ---


--- system-config-printer-troubleshooter-debugcancel.patch DELETED ---


--- system-config-printer-troubleshooter-traceback.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Dec 22 16:18:45 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Dec 2009 16:18:45 +0000 (UTC)
Subject: rpms/qdbm/devel qdbm.spec,1.15,1.16
Message-ID: <20091222161845.26CE011C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/qdbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32387

Modified Files:
	qdbm.spec 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.77-6
- F-13: rebuild for new perl



Index: qdbm.spec
===================================================================
RCS file: /cvs/extras/rpms/qdbm/devel/qdbm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qdbm.spec	24 Jul 2009 19:26:10 -0000	1.15
+++ qdbm.spec	22 Dec 2009 16:18:44 -0000	1.16
@@ -4,7 +4,7 @@
 
 Name:		qdbm
 Version:	1.8.77
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	LGPLv2+
 
 URL:		http://qdbm.sourceforge.net/
@@ -65,6 +65,7 @@ This package contains a Java interface f
 Summary:	QDBM Database Library for Perl
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 This package contains a Perl interface for QDBM Database library.
@@ -343,6 +344,9 @@ popd
 
 
 %changelog
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.77-6
+- F-13: rebuild for new perl
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.77-5
 - F-12: Mass rebuild
 



From petersen at fedoraproject.org  Tue Dec 22 16:20:13 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 16:20:13 +0000 (UTC)
Subject: rpms/ghc-X11-xft/devel ghc-X11-xft.spec,1.2,1.3
Message-ID: <20091222162013.ED86911C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-X11-xft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv302

Modified Files:
	ghc-X11-xft.spec 
Log Message:
- update packaging for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1
- rebuild for ghc-X11-1.5.0.0




Index: ghc-X11-xft.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-X11-xft/devel/ghc-X11-xft.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-X11-xft.spec	16 Nov 2009 13:58:19 -0000	1.2
+++ ghc-X11-xft.spec	22 Dec 2009 16:20:13 -0000	1.3
@@ -2,23 +2,23 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Haskell bindings to the Xft library
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 BuildRequires:  libXft-devel
 BuildRequires:  ghc-X11-devel
 BuildRequires:  ghc-utf8-string-devel
@@ -40,11 +40,14 @@ and some Xrender parts.
 
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 Requires:       libXft-devel
 Requires:       ghc-X11-devel = %ghc_pkg_ver X11
 Requires:       ghc-utf8-string-devel = %ghc_pkg_ver utf8-string
@@ -95,13 +98,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -110,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -119,10 +121,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -133,9 +133,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -151,6 +160,11 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 0.3-5
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+- rebuild for ghc-X11-1.5.0.0
+
 * Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.3-4
 - rebuild for ghc-X11-1.4.6.1
 - use %%ghc_pkg_ver for lib dep requires



From mclasen at fedoraproject.org  Tue Dec 22 16:20:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 16:20:15 +0000 (UTC)
Subject: rpms/gtk-doc/devel gtk-doc.spec,1.58,1.59
Message-ID: <20091222162015.6AF0911C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk-doc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28305

Modified Files:
	gtk-doc.spec 
Log Message:
drop upstreamed patch



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- gtk-doc.spec	22 Dec 2009 15:43:06 -0000	1.58
+++ gtk-doc.spec	22 Dec 2009 16:20:15 -0000	1.59
@@ -5,8 +5,6 @@ Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/gtk-doc-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=562064
-Patch0: gtk-doc-index.patch
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gtk.org/gtk-doc
@@ -38,7 +36,6 @@ and GNOME.
 %prep
 
 %setup -q
-%patch0 -p1 -b .index
 
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs



From mclasen at fedoraproject.org  Tue Dec 22 16:20:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 16:20:28 +0000 (UTC)
Subject: rpms/libgweather/devel gettext-not-xml.patch, 1.2,
	1.3 libgweather.spec, 1.49, 1.50
Message-ID: <20091222162028.211BF11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv483

Modified Files:
	gettext-not-xml.patch libgweather.spec 
Log Message:
update patch


gettext-not-xml.patch:
 configure.in                    |   21 ---
 data/Makefile.am                |   44 +-------
 libgweather/gweather-location.c |   17 ++-
 libgweather/gweather-timezone.c |   18 ++-
 po-locations/LINGUAS            |   78 ++++++++++++++
 po-locations/Makefile.in.in     |  217 ++++++++++++++++++++++++++++++++++++++++
 po-locations/POTFILES.in        |    4 
 7 files changed, 338 insertions(+), 61 deletions(-)

Index: gettext-not-xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/gettext-not-xml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gettext-not-xml.patch	24 Sep 2009 03:09:25 -0000	1.2
+++ gettext-not-xml.patch	22 Dec 2009 16:20:27 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up libgweather-2.28.0/configure.in.gettext libgweather-2.28.0/configure.in
---- libgweather-2.28.0/configure.in.gettext	2009-09-21 12:30:18.000000000 -0400
-+++ libgweather-2.28.0/configure.in	2009-09-23 23:06:09.533646963 -0400
+diff -up libgweather-2.29.4/configure.in.gettext libgweather-2.29.4/configure.in
+--- libgweather-2.29.4/configure.in.gettext	2009-12-21 00:03:55.000000000 -0500
++++ libgweather-2.29.4/configure.in	2009-12-22 10:47:19.988816042 -0500
 @@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
  AM_MAINTAINER_MODE
  GNOME_MAINTAINER_MODE_DEFINES
@@ -35,8 +35,8 @@ diff -up libgweather-2.28.0/configure.in
  libgweather/Makefile
  libgweather/gweather.pc
  libgweather/gweather-uninstalled.pc
-@@ -261,12 +258,6 @@ data/Makefile
- python/Makefile
+@@ -262,12 +259,6 @@ python/Makefile
+ icons/Makefile
  ])
  
 -if test "x$enable_big_xml" = "xyes"; then
@@ -48,16 +48,16 @@ diff -up libgweather-2.28.0/configure.in
  dnl ***************************************************************************
  dnl *** Display Summary                                                     ***
  dnl ***************************************************************************
-@@ -277,6 +268,4 @@ libgweather-$VERSION configure summary:
+@@ -278,6 +269,4 @@ libgweather-$VERSION configure summary:
  	Source code location:		${srcdir}
  	Compiler:			${CC}
  	Python bindings:		${enable_python}
 -	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
 -	Locations.xml compression:	${enable_locations_compression}
  " >&2
-diff -up libgweather-2.28.0/data/Makefile.am.gettext libgweather-2.28.0/data/Makefile.am
---- libgweather-2.28.0/data/Makefile.am.gettext	2009-07-21 13:01:11.000000000 -0400
-+++ libgweather-2.28.0/data/Makefile.am	2009-09-23 23:02:32.718640615 -0400
+diff -up libgweather-2.29.4/data/Makefile.am.gettext libgweather-2.29.4/data/Makefile.am
+--- libgweather-2.29.4/data/Makefile.am.gettext	2009-12-21 00:02:57.000000000 -0500
++++ libgweather-2.29.4/data/Makefile.am	2009-12-22 10:46:49.984801127 -0500
 @@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
  libgweatherlocationsdir = $(pkgdatadir)
  libgweatherlocations_in_files = Locations.xml.in
@@ -120,9 +120,9 @@ diff -up libgweather-2.28.0/data/Makefil
  check:
  	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
  	$(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
-diff -up libgweather-2.28.0/libgweather/gweather-location.c.gettext libgweather-2.28.0/libgweather/gweather-location.c
---- libgweather-2.28.0/libgweather/gweather-location.c.gettext	2009-04-19 13:41:11.000000000 -0400
-+++ libgweather-2.28.0/libgweather/gweather-location.c	2009-09-23 23:02:32.720641289 -0400
+diff -up libgweather-2.29.4/libgweather/gweather-location.c.gettext libgweather-2.29.4/libgweather/gweather-location.c
+--- libgweather-2.29.4/libgweather/gweather-location.c.gettext	2009-12-21 00:02:57.000000000 -0500
++++ libgweather-2.29.4/libgweather/gweather-location.c	2009-12-22 10:46:49.985800696 -0500
 @@ -22,11 +22,14 @@
  #include <config.h>
  #endif
@@ -161,9 +161,9 @@ diff -up libgweather-2.28.0/libgweather/
  	    xmlFree (value);
  	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
  	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -up libgweather-2.28.0/libgweather/gweather-timezone.c.gettext libgweather-2.28.0/libgweather/gweather-timezone.c
---- libgweather-2.28.0/libgweather/gweather-timezone.c.gettext	2009-09-08 19:46:08.000000000 -0400
-+++ libgweather-2.28.0/libgweather/gweather-timezone.c	2009-09-23 23:02:32.721640718 -0400
+diff -up libgweather-2.29.4/libgweather/gweather-timezone.c.gettext libgweather-2.29.4/libgweather/gweather-timezone.c
+--- libgweather-2.29.4/libgweather/gweather-timezone.c.gettext	2009-12-21 00:02:57.000000000 -0500
++++ libgweather-2.29.4/libgweather/gweather-timezone.c	2009-12-22 10:46:49.986801592 -0500
 @@ -23,6 +23,7 @@
  #endif
  
@@ -220,9 +220,9 @@ diff -up libgweather-2.28.0/libgweather/
      if (name)
  	xmlFree (name);
  
-diff -up /dev/null libgweather-2.28.0/po-locations/LINGUAS
---- /dev/null	2009-09-23 15:09:11.116404522 -0400
-+++ libgweather-2.28.0/po-locations/LINGUAS	2009-09-23 23:02:32.723640903 -0400
+diff -up libgweather-2.29.4/po-locations/LINGUAS.gettext libgweather-2.29.4/po-locations/LINGUAS
+--- libgweather-2.29.4/po-locations/LINGUAS.gettext	2009-12-22 10:46:49.987801160 -0500
++++ libgweather-2.29.4/po-locations/LINGUAS	2009-12-22 10:46:49.987801160 -0500
 @@ -0,0 +1,78 @@
 +ang
 +ar
@@ -302,9 +302,9 @@ diff -up /dev/null libgweather-2.28.0/po
 +zh_CN
 +zh_HK
 +zh_TW
-diff -up /dev/null libgweather-2.28.0/po-locations/Makefile.in.in
---- /dev/null	2009-09-23 15:09:11.116404522 -0400
-+++ libgweather-2.28.0/po-locations/Makefile.in.in	2009-09-23 23:02:32.724640890 -0400
+diff -up libgweather-2.29.4/po-locations/Makefile.in.in.gettext libgweather-2.29.4/po-locations/Makefile.in.in
+--- libgweather-2.29.4/po-locations/Makefile.in.in.gettext	2009-12-22 10:46:49.988801497 -0500
++++ libgweather-2.29.4/po-locations/Makefile.in.in	2009-12-22 10:46:49.988801497 -0500
 @@ -0,0 +1,217 @@
 +# Makefile for program source directory in GNU NLS utilities package.
 +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -523,9 +523,9 @@ diff -up /dev/null libgweather-2.28.0/po
 +# Tell versions [3.59,3.63) of GNU make not to export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -up /dev/null libgweather-2.28.0/po-locations/POTFILES.in
---- /dev/null	2009-09-23 15:09:11.116404522 -0400
-+++ libgweather-2.28.0/po-locations/POTFILES.in	2009-09-23 23:02:32.726641354 -0400
+diff -up libgweather-2.29.4/po-locations/POTFILES.in.gettext libgweather-2.29.4/po-locations/POTFILES.in
+--- libgweather-2.29.4/po-locations/POTFILES.in.gettext	2009-12-22 10:46:49.988801497 -0500
++++ libgweather-2.29.4/po-locations/POTFILES.in	2009-12-22 10:46:49.988801497 -0500
 @@ -0,0 +1,4 @@
 +# This list should contain *only* data/Locations.xml.in.
 +# Everything else should be in POTFILES.skip.


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- libgweather.spec	22 Dec 2009 15:33:21 -0000	1.49
+++ libgweather.spec	22 Dec 2009 16:20:27 -0000	1.50
@@ -19,6 +19,9 @@ BuildRequires:  intltool
 BuildRequires:  gtk-doc
 BuildRequires:  autoconf automake libtool
 
+# for directories
+Requires: gnome-icon-theme
+
 # Patch from Ubuntu...
 Patch0: gettext-not-xml.patch
 
@@ -68,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gweather.schemas > /dev/null || :
+touch --no-create %{_datadir}/icons/gnome &>/dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -81,8 +85,15 @@ if [ "$1" -eq 0 ]; then
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gweather.schemas > /dev/null || :
 fi
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/gnome &>/dev/null
+  gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
+fi
 
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/gnome &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -92,6 +103,7 @@ fi
 %dir %{_datadir}/libgweather
 %{_datadir}/libgweather/Locations.xml
 %{_datadir}/libgweather/locations.dtd
+%{_datadir}/icons/gnome/*/status/*
 
 %files devel
 %defattr(-,root,root,-)



From mtasaka at fedoraproject.org  Tue Dec 22 16:25:32 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 22 Dec 2009 16:25:32 +0000 (UTC)
Subject: rpms/hyperestraier/devel hyperestraier.spec,1.18,1.19
Message-ID: <20091222162532.A624311C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/hyperestraier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1494

Modified Files:
	hyperestraier.spec 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.13-6
- F-13: rebuild for new perl



Index: hyperestraier.spec
===================================================================
RCS file: /cvs/extras/rpms/hyperestraier/devel/hyperestraier.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- hyperestraier.spec	24 Jul 2009 17:22:35 -0000	1.18
+++ hyperestraier.spec	22 Dec 2009 16:25:32 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name:		hyperestraier
 Version:	1.4.13
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A full-text search system
 
 Group:		System Environment/Libraries
@@ -57,6 +57,7 @@ This package contains a Java interface f
 Summary:	Hyper Estraier library for Perl
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 This package contains a Perl interface for Hyper Estraier
@@ -251,6 +252,9 @@ popd
 
 
 %changelog
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.13-6
+- F-13: rebuild for new perl
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.13-5
 - F-12: Mass rebuild
 



From caolanm at fedoraproject.org  Tue Dec 22 16:27:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 22 Dec 2009 16:27:09 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2107,1.2108
Message-ID: <20091222162709.D364511C00E9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1797

Modified Files:
	openoffice.org.spec 
Log Message:
Related: rhbz#537919 rpmdiff symlink check hangs


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2107
retrieving revision 1.2108
diff -u -p -r1.2107 -r1.2108
--- openoffice.org.spec	22 Dec 2009 14:07:36 -0000	1.2107
+++ openoffice.org.spec	22 Dec 2009 16:27:09 -0000	1.2108
@@ -1814,13 +1814,13 @@ mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}/
 $RPM_BUILD_ROOT/%{oooinstdir}/program/unopkg list --shared || :
 rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages/cache || :
 pushd $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages
-ln -s ../../../../../%{baseinstdir}/share/uno_packages/cache cache
+ln -s %{baseinstdir}/share/uno_packages/cache cache
 popd
 %if %{langpacks}
 $RPM_BUILD_ROOT/%{brinstdir}/program/unopkg list --shared || :
 rm -rf $RPM_BUILD_ROOT/%{brinstdir}/share/uno_packages/cache || :
 pushd $RPM_BUILD_ROOT/%{brinstdir}/share/uno_packages
-ln -s ../../../../../%{baseinstdir}/share/uno_packages/cache cache
+ln -s %{baseinstdir}/share/uno_packages/cache cache
 popd
 %endif
 export PKGFORMATSWITCH="-simple $RPM_BUILD_ROOT/%{instdir}"



From mclasen at fedoraproject.org  Tue Dec 22 16:27:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 16:27:24 +0000 (UTC)
Subject: File gnome-desktop-2.29.4.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091222162724.13FBA10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-desktop:

e90e365b2ec4ba5985f8531c31ffd88f  gnome-desktop-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 16:29:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 16:29:20 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.91, 1.92 gnome-desktop.spec,
	1.233, 1.234 sources, 1.92, 1.93
Message-ID: <20091222162920.5476311C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2062

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- .cvsignore	1 Dec 2009 14:57:32 -0000	1.91
+++ .cvsignore	22 Dec 2009 16:29:20 -0000	1.92
@@ -1 +1 @@
-gnome-desktop-2.29.3.tar.bz2
+gnome-desktop-2.29.4.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- gnome-desktop.spec	10 Dec 2009 23:27:34 -0000	1.233
+++ gnome-desktop.spec	22 Dec 2009 16:29:20 -0000	1.234
@@ -11,15 +11,13 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.29.3
-Release: 2%{?dist}
+Version: 2.29.4
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-desktop/2.29/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599914
 Patch3: ignore-xrandr-badmatch.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=147808
-Patch4: per-monitor-background.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=601753
 Patch5: slideshow.patch
 
@@ -82,7 +80,6 @@ libgnomedesktop.
 %setup -q
 %patch1 -p1 -b .concatenate-edid-descriptors
 %patch3 -p1 -b .ignore-xrandr-badmatch
-%patch4 -p1 -b .per-monitor-background
 %patch5 -p1 -b .slideshow
 
 %build
@@ -131,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.comj> - 2.29.4-1
+- Update to 2.29.4
+
 * Thu Dec 10 2009 Jon McCann <jmccann at redhat.com> - 2.29.3-2
 - Update per-monitor backgrounds patch (gnome #147808)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	1 Dec 2009 14:57:32 -0000	1.92
+++ sources	22 Dec 2009 16:29:20 -0000	1.93
@@ -1 +1 @@
-70b481fd9dee9a4863b3fe0824e6e4e7  gnome-desktop-2.29.3.tar.bz2
+e90e365b2ec4ba5985f8531c31ffd88f  gnome-desktop-2.29.4.tar.bz2



From petersen at fedoraproject.org  Tue Dec 22 16:29:47 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 16:29:47 +0000 (UTC)
Subject: rpms/ghc-time/devel ghc-time.spec,1.1,1.2
Message-ID: <20091222162947.2C86611C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-time/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2197

Modified Files:
	ghc-time.spec 
Log Message:
- update packaging for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1
- note part of haskell-platform




Index: ghc-time.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-time/devel/ghc-time.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-time.spec	28 Sep 2009 00:22:37 -0000	1.1
+++ ghc-time.spec	22 Dec 2009 16:29:47 -0000	1.2
@@ -2,26 +2,24 @@
 
 %bcond_without doc
 %bcond_without prof
-
-# override for ghc-6.10 since it has older time in extralibs
-%global ghcdocdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform-2009.2.0.2
 Version:        1.1.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Haskell %{pkg_name} library
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -34,12 +32,14 @@ This package provides the Haskell %{pkg_
 
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries
-Provides:       ghc-%{pkg_name} = %{version}-%{release}
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description devel
 This package contains the development files for %{name}
@@ -82,13 +82,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -97,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -106,10 +105,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -120,9 +117,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -138,6 +144,11 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.1.2.4-3
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+- note part of haskell-platform
+
 * Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 1.1.2.4-2
 - version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884)
 



From rdieter at fedoraproject.org  Tue Dec 22 16:31:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Dec 2009 16:31:06 +0000 (UTC)
Subject: File kipi-plugins-1.0.0.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091222163106.CF0A410F7E6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kipi-plugins:

4ed822101f0023773361fbe035822934  kipi-plugins-1.0.0.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 16:31:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 16:31:34 +0000 (UTC)
Subject: File gcalctool-5.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222163134.03BC310F8A9@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gcalctool:

c5089d17c9386fd9220c485a5c7f24fd  gcalctool-5.29.4.tar.bz2



From petersen at fedoraproject.org  Tue Dec 22 16:37:12 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 16:37:12 +0000 (UTC)
Subject: rpms/ghc-HUnit/devel ghc-HUnit.spec,1.2,1.3
Message-ID: <20091222163712.147E611C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-HUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3395

Modified Files:
	ghc-HUnit.spec 
Log Message:
- update packaging for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1




Index: ghc-HUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-HUnit/devel/ghc-HUnit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-HUnit.spec	16 Sep 2009 09:28:50 -0000	1.2
+++ ghc-HUnit.spec	22 Dec 2009 16:37:11 -0000	1.3
@@ -2,6 +2,7 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -9,18 +10,16 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2 and ghc-6.10.x extralibs!
 Version:        1.2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hunit.sourceforge.net/
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -34,11 +33,14 @@ is a unit testing framework for Haskell,
 for Java.
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        Haskell %{pkg_name} library development files
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description devel
 This package contains the development files for %{name}
@@ -82,13 +84,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -97,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -106,10 +107,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -120,9 +119,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -138,5 +146,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.2.0.3-2
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 1.2.0.3-1
 - initial packaging for Fedora created by cabal2spec



From mclasen at fedoraproject.org  Tue Dec 22 16:39:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 16:39:23 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.69, 1.70 gcalctool.spec, 1.102,
	1.103 sources, 1.70, 1.71
Message-ID: <20091222163923.5C98911C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3637

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	5 Dec 2009 00:00:12 -0000	1.69
+++ .cvsignore	22 Dec 2009 16:39:23 -0000	1.70
@@ -1 +1 @@
-gcalctool-5.29.2.tar.bz2
+gcalctool-5.29.4.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gcalctool.spec	5 Dec 2009 00:28:23 -0000	1.102
+++ gcalctool.spec	22 Dec 2009 16:39:23 -0000	1.103
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.29.2
+Version:        5.29.4
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -23,9 +23,7 @@ BuildRequires: flex
 BuildRequires: bison
 BuildRequires: intltool
 
-Requires(post): scrollkeeper
 Requires(post): GConf2
-Requires(postun): scrollkeeper
 Requires(preun): GConf2
 Requires(pre): GConf2
 
@@ -63,7 +61,6 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 
 %post
-scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gcalctool.schemas > /dev/null || :
 
@@ -79,9 +76,6 @@ if [ "$1" -eq 0 ]; then
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gcalctool.schemas > /dev/null || :
 fi
 
-%postun
-scrollkeeper-update -q
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 5.29.4-1
+- Update to 5.29.4
+
 * Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 5.29.2-1
 - Update to 5.29.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	5 Dec 2009 00:00:12 -0000	1.70
+++ sources	22 Dec 2009 16:39:23 -0000	1.71
@@ -1 +1 @@
-4fb91ce8b86f621215c1213e1a521e28  gcalctool-5.29.2.tar.bz2
+c5089d17c9386fd9220c485a5c7f24fd  gcalctool-5.29.4.tar.bz2



From orion at fedoraproject.org  Tue Dec 22 16:39:56 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 22 Dec 2009 16:39:56 +0000 (UTC)
Subject: rpms/ant-contrib/EL-5 import.log,NONE,1.1 ant-contrib.spec,1.2,1.3
Message-ID: <20091222163956.2F62711C00E9@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ant-contrib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3982/EL-5

Modified Files:
	ant-contrib.spec 
Added Files:
	import.log 
Log Message:
Initial import from devel


--- NEW FILE import.log ---
ant-contrib-1_0-0_10_b2_fc13:EL-5:ant-contrib-1.0-0.10.b2.fc13.src.rpm:1261499981


Index: ant-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant-contrib/EL-5/ant-contrib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ant-contrib.spec	4 Sep 2006 01:33:32 -0000	1.2
+++ ant-contrib.spec	22 Dec 2009 16:39:56 -0000	1.3
@@ -1,11 +1,10 @@
-%define gcj_support 1
 %define beta_number b2
 
 Summary:        Collection of tasks for Ant
-Name:           ant-contrib 
+Name:           ant-contrib
 Version:        1.0
-Release:        0.4.%{beta_number}%{?dist}
-License:        Apache Software License
+Release:        0.10.%{beta_number}%{?dist}
+License:        ASL 2.0
 URL:            http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries
 Source0:        http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}%{beta_number}-src.tar.gz
@@ -17,22 +16,17 @@ BuildRequires:  ant-junit >= 1.6.2
 BuildRequires:  ant-nodeps >= 1.6.2
 BuildRequires:  xerces-j2
 BuildRequires:  bcel >= 5.0
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%else
 BuildRequires:  java-devel >= 1.4.2
 Requires:       java >= 1.4.2
-%endif
 Requires:       junit >= 3.8.0
 Requires:       ant >= 1.6.2
 Requires:       xerces-j2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 %description
-The Ant-Contrib project is a collection of tasks 
-(and at one point maybe types and other tools) 
+The Ant-Contrib project is a collection of tasks
+(and at one point maybe types and other tools)
 for Apache Ant.
 
 %package        javadoc
@@ -40,7 +34,7 @@ Summary:        Javadoc for %{name}
 Group:          Documentation
 
 %description    javadoc
-%{summary}.
+Api documentation for %{name}.
 
 %prep
 %setup -q  -n %{name}
@@ -62,14 +56,13 @@ CLASSPATH=build/lib/ant-contrib-%{versio
 echo $ANT_HOME
 ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
 install -Dpm 644 build/lib/%{name}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+      $RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
 
 # javadoc
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -77,37 +70,16 @@ cp -pr build/docs/api/* $RPM_BUILD_ROOT%
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 rm -rf build/docs/api
 
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
+echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{_sysconfdir}/ant.d/ant-contrib
+%{_javadir}/ant/*.jar
 %doc build/docs/LICENSE.txt
 %doc build/docs/tasks/*
 
@@ -119,6 +91,25 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.10.b2
+- Install ant contrib in ant.d.
+
+* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.9.b2
+- Drop gcj_support.
+- Install as proper ant plugin.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.8.b2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.7.b2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-0.6.b2
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-0.5.b2
+- Autorebuild for GCC 4.3
+
 * Sun Aug 03 2006 Igor Foox <ifoox at redhat.com> - 1.0-0.4.b2
 - Added dist tag to release.
 



From rdieter at fedoraproject.org  Tue Dec 22 16:44:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Dec 2009 16:44:33 +0000 (UTC)
Subject: rpms/kipi-plugins/devel .cvsignore, 1.34, 1.35 kipi-plugins.spec,
	1.107, 1.108 sources, 1.34, 1.35
Message-ID: <20091222164433.DD11911C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4653

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-1
- kipi-plugins-1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	2 Dec 2009 20:40:46 -0000	1.34
+++ .cvsignore	22 Dec 2009 16:44:33 -0000	1.35
@@ -1 +1 @@
-kipi-plugins-0.9.0.tar.bz2
+kipi-plugins-1.0.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- kipi-plugins.spec	2 Dec 2009 20:40:46 -0000	1.107
+++ kipi-plugins.spec	22 Dec 2009 16:44:33 -0000	1.108
@@ -2,7 +2,7 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.9.0
+Version: 1.0.0
 Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
@@ -186,6 +186,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-1
+- kipi-plugins-1.0.0
+
 * Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-1
 - kipi-plugins-0.9.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	2 Dec 2009 20:40:46 -0000	1.34
+++ sources	22 Dec 2009 16:44:33 -0000	1.35
@@ -1 +1 @@
-18871b4515720d5ee2581ae52e07858a  kipi-plugins-0.9.0.tar.bz2
+4ed822101f0023773361fbe035822934  kipi-plugins-1.0.0.tar.bz2



From petersen at fedoraproject.org  Tue Dec 22 16:45:46 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 16:45:46 +0000 (UTC)
Subject: rpms/cpphs/devel cpphs.spec,1.10,1.11
Message-ID: <20091222164546.0A23311C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4907

Modified Files:
	cpphs.spec 
Log Message:
devel package requires shared library not base


Index: cpphs.spec
===================================================================
RCS file: /cvs/extras/rpms/cpphs/devel/cpphs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cpphs.spec	22 Dec 2009 15:29:55 -0000	1.10
+++ cpphs.spec	22 Dec 2009 16:45:45 -0000	1.11
@@ -7,7 +7,7 @@
 
 Name:           cpphs
 Version:        1.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C pre-processor for Haskell
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
@@ -52,7 +52,7 @@ Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(postun): ghc = %{ghc_version}
 %if %{with shared}
-Requires:       %{name} = %{version}-%{release}
+Requires:       ghc-%{name} = %{version}-%{release}
 %endif
 
 %description -n ghc-%{name}-devel
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.9-3
+- devel package requires shared library not base
+
 * Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 1.9-2
 - update spec for ghc-6.12.1
 - added shared library support: needs ghc-rpm-macros 0.3.1



From konradm at fedoraproject.org  Tue Dec 22 16:48:49 2009
From: konradm at fedoraproject.org (konradm)
Date: Tue, 22 Dec 2009 16:48:49 +0000 (UTC)
Subject: File glpk-4.41.tar.gz uploaded to lookaside cache by konradm
Message-ID: <20091222164849.CC6B210F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for glpk:

55026a855035d0caf550db69d29d4959  glpk-4.41.tar.gz



From petersen at fedoraproject.org  Tue Dec 22 16:48:51 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 22 Dec 2009 16:48:51 +0000 (UTC)
Subject: rpms/hscolour/devel hscolour.spec,1.6,1.7
Message-ID: <20091222164851.14A4E11C00E9@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hscolour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5416

Modified Files:
	hscolour.spec 
Log Message:
devel package requires shared library not base


Index: hscolour.spec
===================================================================
RCS file: /cvs/extras/rpms/hscolour/devel/hscolour.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- hscolour.spec	22 Dec 2009 15:35:04 -0000	1.6
+++ hscolour.spec	22 Dec 2009 16:48:50 -0000	1.7
@@ -7,7 +7,7 @@
 
 Name:           hscolour
 Version:        1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Colourizes Haskell code
 
 Group:          Development/Tools
@@ -47,7 +47,7 @@ Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(postun): ghc = %{ghc_version}
 %if %{with shared}
-Requires:       %{name} = %{version}-%{release}
+Requires:       ghc-%{name} = %{version}-%{release}
 %endif
 
 %description -n ghc-%{name}-devel
@@ -162,6 +162,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.15-3
+- devel package requires shared library not base
+
 * Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.15-2
 - update spec for ghc-6.12.1
 - added shared library support: needs ghc-rpm-macros 0.3.1



From konradm at fedoraproject.org  Tue Dec 22 16:49:04 2009
From: konradm at fedoraproject.org (konradm)
Date: Tue, 22 Dec 2009 16:49:04 +0000 (UTC)
Subject: rpms/glpk/devel .cvsignore, 1.18, 1.19 glpk.spec, 1.27, 1.28 sources, 
	1.18, 1.19
Message-ID: <20091222164904.BAFFE11C00E9@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/glpk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5492

Modified Files:
	.cvsignore glpk.spec sources 
Log Message:
* Tue Dec 22 2009 Conrad Meyer <konrad at tylerc.org> 4.41-1
- Bump to 4.41.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	4 Nov 2009 23:53:36 -0000	1.18
+++ .cvsignore	22 Dec 2009 16:49:04 -0000	1.19
@@ -1 +1 @@
-glpk-4.40.tar.gz
+glpk-4.41.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- glpk.spec	4 Nov 2009 23:53:36 -0000	1.27
+++ glpk.spec	22 Dec 2009 16:49:04 -0000	1.28
@@ -1,5 +1,5 @@
 Name:           glpk
-Version:        4.40
+Version:        4.41
 Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Conrad Meyer <konrad at tylerc.org> 4.41-1
+- Bump to 4.41.
+
 * Wed Nov 4 2009 Conrad Meyer <konrad at tylerc.org> 4.40-1
 - Bump to 4.40.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	4 Nov 2009 23:53:37 -0000	1.18
+++ sources	22 Dec 2009 16:49:04 -0000	1.19
@@ -1 +1 @@
-73821dae9c52905f012ce1b501f59b66  glpk-4.40.tar.gz
+55026a855035d0caf550db69d29d4959  glpk-4.41.tar.gz



From maxamillion at fedoraproject.org  Tue Dec 22 16:52:18 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 22 Dec 2009 16:52:18 +0000 (UTC)
Subject: rpms/pybackpack/devel pybackpack-default_image-0.5.7.patch, NONE,
	1.1 import.log, 1.3, 1.4 pybackpack.spec, 1.14, 1.15
Message-ID: <20091222165218.1043D11C00E9@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6307/devel

Modified Files:
	import.log pybackpack.spec 
Added Files:
	pybackpack-default_image-0.5.7.patch 
Log Message:
Patch for default selection bug



pybackpack-default_image-0.5.7.patch:
 actions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pybackpack-default_image-0.5.7.patch ---
Index: pybackpack/actions.py
===================================================================
--- pybackpack/actions.py   (revision 238)
+++ pybackpack/actions.py   (revision 239)
@@ -252,7 +252,7 @@
 		"""
 		self.report_progress(_("Writing image to CD/DVD"))
 
-		track = braseroburn.TrackImage()
+		track = braseroburn.TrackImageCfg()
 		track.set_source(self.isopath)
 
		session = braseroburn.SessionCfg()


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	18 Dec 2009 16:36:48 -0000	1.3
+++ import.log	22 Dec 2009 16:52:17 -0000	1.4
@@ -1,3 +1,4 @@
 pybackpack-0_5_5-1_fc9:HEAD:pybackpack-0.5.5-1.fc9.src.rpm:1221005806
 pybackpack-0_5_6-1_fc9:HEAD:pybackpack-0.5.6-1.fc9.src.rpm:1222459966
 pybackpack-0_5_7-2_fc12:HEAD:pybackpack-0.5.7-2.fc12.src.rpm:1261154163
+pybackpack-0_5_7-3_fc12:HEAD:pybackpack-0.5.7-3.fc12.src.rpm:1261500704


Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pybackpack.spec	18 Dec 2009 16:38:22 -0000	1.14
+++ pybackpack.spec	22 Dec 2009 16:52:17 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: User oriented backup and restore application
 Name: pybackpack
 Version: 0.5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -25,8 +25,12 @@ Requires: gnome-python2-brasero
 Requires: rdiff-backup >= 1.0
 BuildArch:      noarch
 
+# Fix for not allowing user defined backup set
 Patch0: pybackpack-backupset-0.5.7.patch
 
+# Fix for default selection of user backup image
+Patch1: pybackpack-default_image-0.5.7.patch
+
 %description
 A GTK+ tool written in Python to backup files.
 
@@ -34,6 +38,7 @@ A GTK+ tool written in Python to backup 
 %setup -q
 
 %patch0 -p0
+%patch1 -p0
 
 %build
 python setup.py build
@@ -69,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Dec 22 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-3
+- Patch to fix default selection of user backup image (also part of BZ 538193)
+
 * Fri Dec 18 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-2
 - Patch to supplement upstream release as a proposed solution to BZ 538193
 



From maxamillion at fedoraproject.org  Tue Dec 22 17:00:38 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue, 22 Dec 2009 17:00:38 +0000 (UTC)
Subject: rpms/pybackpack/F-12 pybackpack-default_image-0.5.7.patch, NONE,
	1.1 import.log, 1.3, 1.4 pybackpack.spec, 1.13, 1.14
Message-ID: <20091222170038.A746811C00E9@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/pybackpack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7803/F-12

Modified Files:
	import.log pybackpack.spec 
Added Files:
	pybackpack-default_image-0.5.7.patch 
Log Message:
Patch to fix default selection of user backup image (also part of BZ 538193)



pybackpack-default_image-0.5.7.patch:
 actions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pybackpack-default_image-0.5.7.patch ---
Index: pybackpack/actions.py
===================================================================
--- pybackpack/actions.py   (revision 238)
+++ pybackpack/actions.py   (revision 239)
@@ -252,7 +252,7 @@
 		"""
 		self.report_progress(_("Writing image to CD/DVD"))
 
-		track = braseroburn.TrackImage()
+		track = braseroburn.TrackImageCfg()
 		track.set_source(self.isopath)
 
		session = braseroburn.SessionCfg()


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	18 Dec 2009 16:45:37 -0000	1.3
+++ import.log	22 Dec 2009 17:00:38 -0000	1.4
@@ -1,3 +1,4 @@
 pybackpack-0_5_5-1_fc9:HEAD:pybackpack-0.5.5-1.fc9.src.rpm:1221005806
 pybackpack-0_5_6-1_fc9:HEAD:pybackpack-0.5.6-1.fc9.src.rpm:1222459966
 pybackpack-0_5_7-2_fc12:F-12:pybackpack-0.5.7-2.fc12.src.rpm:1261154717
+pybackpack-0_5_7-3_fc12:F-12:pybackpack-0.5.7-3.fc12.src.rpm:1261501216


Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/F-12/pybackpack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pybackpack.spec	18 Dec 2009 16:45:38 -0000	1.13
+++ pybackpack.spec	22 Dec 2009 17:00:38 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: User oriented backup and restore application
 Name: pybackpack
 Version: 0.5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -25,8 +25,12 @@ Requires: gnome-python2-brasero
 Requires: rdiff-backup >= 1.0
 BuildArch:      noarch
 
+# Fix for not allowing user defined backup set
 Patch0: pybackpack-backupset-0.5.7.patch
 
+# Fix for default selection of user backup image
+Patch1: pybackpack-default_image-0.5.7.patch
+
 %description
 A GTK+ tool written in Python to backup files.
 
@@ -34,6 +38,7 @@ A GTK+ tool written in Python to backup 
 %setup -q
 
 %patch0 -p0
+%patch1 -p0
 
 %build
 python setup.py build
@@ -69,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Dec 22 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-3
+- Patch to fix default selection of user backup image (also part of BZ 538193)
+
+* Fri Dec 18 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-2
+- Patch to supplement upstream release as a proposed solution to BZ 538193
+
 * Wed Dec 16 2009 Adam Miller <maxamillion at fedoraproject.org> - 0.5.7-1
 - New release from upstream fixing cdburn bug (BZ# 538193)
 



From twaugh at fedoraproject.org  Tue Dec 22 17:04:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 17:04:19 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3458.patch,NONE,1.1 cups.spec,1.559,1.560
Message-ID: <20091222170419.B9CD311C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8515

Modified Files:
	cups.spec 
Added Files:
	cups-str3458.patch 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
- Fixed ipp authentication for servers requiring authentication for
  IPP-Get-Printer-Attributes (bug #548873, STR #3458).


cups-str3458.patch:
 ipp.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE cups-str3458.patch ---
diff -up cups-1.4.2/backend/ipp.c.str3458 cups-1.4.2/backend/ipp.c
--- cups-1.4.2/backend/ipp.c.str3458	2009-12-22 13:04:25.021208333 +0000
+++ cups-1.4.2/backend/ipp.c	2009-12-22 13:04:26.570082893 +0000
@@ -802,6 +802,15 @@ main(int  argc,				/* I - Number of comm
 
 	return (CUPS_BACKEND_STOP);
       }
+      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      {
+	if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+		     "Negotiate", 9))
+	  auth_info_required = "negotiate";
+
+	fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+	return (CUPS_BACKEND_AUTH_REQUIRED);
+      }
       else
       {
 	_cupsLangPrintf(stderr,


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -p -r1.559 -r1.560
--- cups.spec	21 Dec 2009 17:06:51 -0000	1.559
+++ cups.spec	22 Dec 2009 17:04:19 -0000	1.560
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -76,6 +76,7 @@ Patch61: cups-str3428.patch
 Patch62: cups-str3431.patch
 Patch63: cups-delete-active-printer.patch
 Patch64: cups-gnutls-gcrypt-threads.patch
+Patch65: cups-str3458.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -256,6 +257,7 @@ module. 
 %patch62 -p1 -b .str3431
 %patch63 -p1 -b .delete-active-printer
 %patch64 -p1 -b .gnutls-gcrypt-threads
+%patch65 -p1 -b .str3458
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -547,6 +549,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
+- Fixed ipp authentication for servers requiring authentication for
+  IPP-Get-Printer-Attributes (bug #548873, STR #3458).
+
 * Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
 - Ensure proper thread-safety in gnutls's use of libgcrypt
   (bug #544619).



From pkgdb at fedoraproject.org  Tue Dec 22 17:04:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:04:33 +0000
Subject: [pkgdb] python-djblets: sgallagh has requested commit
Message-ID: <20091222170433.4FBE210F8BE@bastion.fedoraproject.org>

sgallagh has requested the commit acl on python-djblets (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:04:32 +0000
Subject: [pkgdb] python-djblets: sgallagh has given up watchcommits
Message-ID: <20091222170432.9EAAD10F8A9@bastion.fedoraproject.org>

sgallagh has given up the watchcommits acl on python-djblets (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:04:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:04:34 +0000
Subject: [pkgdb] python-djblets: sgallagh has given up watchbugzilla
Message-ID: <20091222170435.135CB10F8BC@bastion.fedoraproject.org>

sgallagh has given up the watchbugzilla acl on python-djblets (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:04:35 +0000
Subject: [pkgdb] python-djblets: sgallagh has requested commit
Message-ID: <20091222170435.B93DD10F8CC@bastion.fedoraproject.org>

sgallagh has requested the commit acl on python-djblets (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:04:49 +0000
Subject: [pkgdb] python-djblets: sgallagh has given up watchbugzilla
Message-ID: <20091222170436.A830110F894@bastion.fedoraproject.org>

sgallagh has given up the watchbugzilla acl on python-djblets (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:04:41 +0000
Subject: [pkgdb] python-djblets: sgallagh has given up watchcommits
Message-ID: <20091222170441.B46B010F8A5@bastion.fedoraproject.org>

sgallagh has given up the watchcommits acl on python-djblets (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:04:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:04:45 +0000
Subject: [pkgdb] python-djblets: sgallagh has given up watchbugzilla
Message-ID: <20091222170445.C1DA010F8A5@bastion.fedoraproject.org>

sgallagh has given up the watchbugzilla acl on python-djblets (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:04:53 +0000
Subject: [pkgdb] python-djblets: sgallagh has requested commit
Message-ID: <20091222170453.C067710F8BC@bastion.fedoraproject.org>

sgallagh has requested the commit acl on python-djblets (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:05:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:05:07 +0000
Subject: [pkgdb] python-djblets: sgallagh has given up watchcommits
Message-ID: <20091222170453.A203110F85E@bastion.fedoraproject.org>

sgallagh has given up the watchcommits acl on python-djblets (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From twaugh at fedoraproject.org  Tue Dec 22 17:05:45 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 17:05:45 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3458.patch,NONE,1.1 cups.spec,1.566,1.567
Message-ID: <20091222170545.2B0F711C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8946

Modified Files:
	cups.spec 
Added Files:
	cups-str3458.patch 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
- Fixed ipp authentication for servers requiring authentication for
  IPP-Get-Printer-Attributes (bug #548873, STR #3458).


cups-str3458.patch:
 ipp.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE cups-str3458.patch ---
diff -up cups-1.4.2/backend/ipp.c.str3458 cups-1.4.2/backend/ipp.c
--- cups-1.4.2/backend/ipp.c.str3458	2009-12-22 13:04:25.021208333 +0000
+++ cups-1.4.2/backend/ipp.c	2009-12-22 13:04:26.570082893 +0000
@@ -802,6 +802,15 @@ main(int  argc,				/* I - Number of comm
 
 	return (CUPS_BACKEND_STOP);
       }
+      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      {
+	if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+		     "Negotiate", 9))
+	  auth_info_required = "negotiate";
+
+	fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+	return (CUPS_BACKEND_AUTH_REQUIRED);
+      }
       else
       {
 	_cupsLangPrintf(stderr,


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -p -r1.566 -r1.567
--- cups.spec	21 Dec 2009 17:07:05 -0000	1.566
+++ cups.spec	22 Dec 2009 17:05:44 -0000	1.567
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -75,6 +75,7 @@ Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
 Patch49: cups-delete-active-printer.patch
 Patch50: cups-gnutls-gcrypt-threads.patch
+Patch51: cups-str3458.patch
 
 Patch100: cups-lspp.patch
 
@@ -255,6 +256,7 @@ module. 
 %patch48 -p1 -b .str3431
 %patch49 -p1 -b .delete-active-printer
 %patch50 -p1 -b .gnutls-gcrypt-threads
+%patch51 -p1 -b .str3458
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -553,6 +555,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
+- Fixed ipp authentication for servers requiring authentication for
+  IPP-Get-Printer-Attributes (bug #548873, STR #3458).
+
 * Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
 - Ensure proper thread-safety in gnutls's use of libgcrypt
   (bug #544619).



From twaugh at fedoraproject.org  Tue Dec 22 17:06:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 17:06:05 +0000 (UTC)
Subject: rpms/cups/devel cups-str3458.patch,NONE,1.1 cups.spec,1.569,1.570
Message-ID: <20091222170605.03FA511C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8992

Modified Files:
	cups.spec 
Added Files:
	cups-str3458.patch 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
- Fixed ipp authentication for servers requiring authentication for
  IPP-Get-Printer-Attributes (bug #548873, STR #3458).


cups-str3458.patch:
 ipp.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE cups-str3458.patch ---
diff -up cups-1.4.2/backend/ipp.c.str3458 cups-1.4.2/backend/ipp.c
--- cups-1.4.2/backend/ipp.c.str3458	2009-12-22 13:04:25.021208333 +0000
+++ cups-1.4.2/backend/ipp.c	2009-12-22 13:04:26.570082893 +0000
@@ -802,6 +802,15 @@ main(int  argc,				/* I - Number of comm
 
 	return (CUPS_BACKEND_STOP);
       }
+      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      {
+	if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+		     "Negotiate", 9))
+	  auth_info_required = "negotiate";
+
+	fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+	return (CUPS_BACKEND_AUTH_REQUIRED);
+      }
       else
       {
 	_cupsLangPrintf(stderr,


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -p -r1.569 -r1.570
--- cups.spec	21 Dec 2009 17:11:58 -0000	1.569
+++ cups.spec	22 Dec 2009 17:06:04 -0000	1.570
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -73,6 +73,7 @@ Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
 Patch49: cups-delete-active-printer.patch
 Patch50: cups-gnutls-gcrypt-threads.patch
+Patch51: cups-str3458.patch
 
 Patch100: cups-lspp.patch
 
@@ -253,6 +254,7 @@ module. 
 %patch48 -p1 -b .str3431
 %patch49 -p1 -b .delete-active-printer
 %patch50 -p1 -b .gnutls-gcrypt-threads
+%patch51 -p1 -b .str3458
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -543,6 +545,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
+- Fixed ipp authentication for servers requiring authentication for
+  IPP-Get-Printer-Attributes (bug #548873, STR #3458).
+
 * Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
 - Ensure proper thread-safety in gnutls's use of libgcrypt
   (bug #544619).



From pkgdb at fedoraproject.org  Tue Dec 22 17:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:07:24 +0000
Subject: [pkgdb] python-djblets had acl change status
Message-ID: <20091222170724.3113C10F8A9@bastion.fedoraproject.org>

dyoung has set the commit acl on python-djblets (Fedora devel) to Approved for sgallagh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:07:25 +0000
Subject: [pkgdb] python-djblets had acl change status
Message-ID: <20091222170725.69C2D10F894@bastion.fedoraproject.org>

dyoung has set the approveacls acl on python-djblets (Fedora devel) to Approved for sgallagh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:07:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:07:32 +0000
Subject: [pkgdb] python-djblets had acl change status
Message-ID: <20091222170732.97B3F10F8A9@bastion.fedoraproject.org>

dyoung has set the approveacls acl on python-djblets (Fedora 12) to Approved for sgallagh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:07:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:07:48 +0000
Subject: [pkgdb] python-djblets had acl change status
Message-ID: <20091222170734.D20BA10F7EA@bastion.fedoraproject.org>

dyoung has set the commit acl on python-djblets (Fedora 12) to Approved for sgallagh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:07:36 +0000
Subject: [pkgdb] python-djblets had acl change status
Message-ID: <20091222170736.CE83910F8A9@bastion.fedoraproject.org>

dyoung has set the commit acl on python-djblets (Fedora 11) to Approved for sgallagh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Tue Dec 22 17:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 17:07:38 +0000
Subject: [pkgdb] python-djblets had acl change status
Message-ID: <20091222170738.811B710F8A9@bastion.fedoraproject.org>

dyoung has set the approveacls acl on python-djblets (Fedora 11) to Approved for sgallagh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-djblets



From mbarnes at fedoraproject.org  Tue Dec 22 17:09:23 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 22 Dec 2009 17:09:23 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.429,1.430
Message-ID: <20091222170923.C81C911C00E9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9789

Modified Files:
	evolution.spec 
Log Message:

* Tue Dec 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.4-2.fc13
- Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines.
  (see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets)



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -p -r1.429 -r1.430
--- evolution.spec	21 Dec 2009 17:46:57 -0000	1.429
+++ evolution.spec	22 Dec 2009 17:09:23 -0000	1.430
@@ -11,7 +11,6 @@
 %define last_libgal2_version 2:2.5.3-2
 %define libgweather_version 2.25.4
 %define pilot_link_version 2:0.12.1
-%define scrollkeeper_version 0.1.4
 %define soup_version 2.2.2
 
 %define evo_major 2.30
@@ -69,9 +68,6 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-Requires(post): scrollkeeper >= %{scrollkeeper_version}
-Requires(postun): scrollkeeper >= %{scrollkeeper_version}
-
 # Don't trust evolution-data-server to maintain accurate sonames.
 Requires: evolution-data-server >= %{version}
 
@@ -352,9 +348,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-p
            $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so
 %endif
 
-# scrollkeeper gets handled in %post
-rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
 
@@ -383,9 +376,7 @@ gconftool-2 --makefile-uninstall-rule %{
 
 %post
 /sbin/ldconfig
-scrollkeeper-update -q
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
@@ -424,9 +415,13 @@ fi
 
 %postun
 /sbin/ldconfig
-scrollkeeper-update -q
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -680,6 +675,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Dec 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.4-2.fc13
+- Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines.
+  (see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets)
+
 * Mon Dec 21 2009 Milan Crha <mcrha at redhat.com> - 2.29.4-1.fc13
 - Update to 2.29.4
 - Remove patch for missing m4 files from tarball (fixed upstream).



From diegobz at fedoraproject.org  Tue Dec 22 17:09:50 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Tue, 22 Dec 2009 17:09:50 +0000 (UTC)
Subject: rpms/transifex/devel transifex.spec,1.11,1.12
Message-ID: <20091222170950.419BF11C00E9@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/transifex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9979

Modified Files:
	transifex.spec 
Log Message:
Fixed some issues in the SPEC


Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/transifex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- transifex.spec	22 Dec 2009 14:34:38 -0000	1.11
+++ transifex.spec	22 Dec 2009 17:09:50 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:       transifex
 Version:    0.7.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
@@ -55,15 +55,9 @@ cd transifex
 rm -rf .hg* build-tools
 rm -r vcs/tests
 python manage.py syncdb --noinput    # Setup DB tables
-#python manage.py migrate             # Setup more DB tables
-#python manage.py txcreatelanguages   # Create a standard set of languages
-#python manage.py txcreatenoticetypes # Create a standard set of notice types
-#python manage.py txcompilemessages   # Create message catalogs for i18n
-cd ..
-cd docs
-make html
-cd ..
-find transifex/locale -name django.po -execdir msgfmt --check-format -o django.mo {} \;
+python manage.py migrate             # Setup more DB tables
+python manage.py txcreatelanguages   # Create a standard set of languages
+python manage.py txcompilemessages   # Create message catalogs for i18n
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -73,6 +67,7 @@ find -mindepth 1 -maxdepth 1 -type d \( 
     -name build-tools -o -name docs -o -name settings \) -prune -o \
     -print \) | xargs cp -a -t $RPM_BUILD_ROOT/%{_datadir}/%{name}
 cp -a *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a *.db.sqlite $RPM_BUILD_ROOT%{_datadir}/%{name}
 find $RPM_BUILD_ROOT%{_datadir}/%{name}/locale -name \*.po -exec rm {} +
 
 for vcs in cvs svn bzr hg git tar
@@ -134,6 +129,7 @@ fi
 %{_datadir}/%{name}/settings.py[co]
 %{_datadir}/%{name}/urls.py
 %{_datadir}/%{name}/urls.py[co]
+%{_datadir}/%{name}/transifex.db.sqlite
 %{_datadir}/%{name}/actionlog
 %{_datadir}/%{name}/codebases
 %{_datadir}/%{name}/external
@@ -205,6 +201,13 @@ fi
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Tue Dec 22 2009 Diego B?rigo Zacar?o <diegobz at indifex.com> - 0.7.3-2
+- Changed SPEC for copying the SQLite database.
+- Do not try to build the docs, once the 0.7.3 tarball does not have a
+  Makefile for it.
+- It is not necessary anymore to create the .mo files manually. The management
+  command txcompilemessages does it.
+
 * Tue Dec 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.7.3
 - (patched by petersen) Updated to 0.7.3, for details:
 - http://code.transifex.org/index.cgi/tx-0.7.x/file/0fafc780e303/docs/releases/0.7.txt



From sagarun at fedoraproject.org  Tue Dec 22 17:14:57 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Tue, 22 Dec 2009 17:14:57 +0000 (UTC)
Subject: File haskell-mode-2.7.0.tar.gz uploaded to lookaside cache by sagarun
Message-ID: <20091222171457.AD5A610F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for emacs-haskell-mode:

887e39bd0e79180b49188f6c4c72d0e3  haskell-mode-2.7.0.tar.gz



From dwalsh at fedoraproject.org  Tue Dec 22 17:16:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 22 Dec 2009 17:16:13 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-mls.conf, 1.63,
	1.64 policy-F13.patch, 1.18, 1.19 selinux-policy.spec, 1.946, 1.947
Message-ID: <20091222171613.AC3A711C00E9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11028

Modified Files:
	modules-mls.conf policy-F13.patch selinux-policy.spec 
Log Message:
* Tue Dec 22 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-3
- Add back xserver_manage_home_fonts



Index: modules-mls.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- modules-mls.conf	17 Dec 2009 19:34:18 -0000	1.63
+++ modules-mls.conf	22 Dec 2009 17:16:12 -0000	1.64
@@ -32,6 +32,13 @@ alsa = base
 # 
 ada = module
 
+# Layer: services
+# Module: cgroup
+#
+# Tools and libraries to control and monitor control groups
+# 
+cgroup = module
+
 # Layer: apps
 # Module: cpufreqselector 
 #

policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  340 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  370 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  236 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  121 +-
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   35 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   52 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   22 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   91 +
 policy/modules/services/denyhosts.te      |   71 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   25 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   50 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   18 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  284 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  325 +++++
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  300 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  194 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   15 
 377 files changed, 20009 insertions(+), 2756 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- policy-F13.patch	21 Dec 2009 22:53:06 -0000	1.18
+++ policy-F13.patch	22 Dec 2009 17:16:12 -0000	1.19
@@ -1536,7 +1536,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.7.5/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/tmpreaper.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/tmpreaper.te	2009-12-22 10:55:03.000000000 -0500
 @@ -42,6 +42,7 @@
  cron_system_entry(tmpreaper_t, tmpreaper_exec_t)
  
@@ -1545,20 +1545,21 @@ diff --exclude-from=exclude -N -u -r nsa
  	userdom_delete_user_home_content_dirs(tmpreaper_t)
  	userdom_delete_user_home_content_files(tmpreaper_t)
  	userdom_delete_user_home_content_symlinks(tmpreaper_t)
-@@ -52,6 +53,12 @@
+@@ -52,6 +53,13 @@
  ')
  
  optional_policy(`
 +	apache_delete_sys_content_rw(tmpreaper_t)
 +	apache_list_cache(tmpreaper_t)
 +	apache_delete_cache(tmpreaper_t)
++	apache_setattr_cache_dirs(tmpreaper_t)
 +')
 +
 +optional_policy(`
  	kismet_manage_log(tmpreaper_t)
  ')
  
-@@ -60,5 +67,9 @@
+@@ -60,5 +68,9 @@
  ')
  
  optional_policy(`
@@ -3722,8 +3723,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.7.5/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/apps/nsplugin.te	2009-12-21 13:07:09.000000000 -0500
-@@ -0,0 +1,295 @@
++++ serefpolicy-3.7.5/policy/modules/apps/nsplugin.te	2009-12-22 10:16:59.000000000 -0500
+@@ -0,0 +1,296 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3917,6 +3918,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +	xserver_user_x_domain_template(nsplugin, nsplugin_t, user_tmpfs_t)
 +	xserver_rw_shm(nsplugin_t)
++	xserver_read_xdm_pid(nsplugin_t)
 +	xserver_read_xdm_tmp_files(nsplugin_t)
 +	xserver_read_user_xauth(nsplugin_t)
 +	xserver_read_user_iceauth(nsplugin_t)
@@ -4253,7 +4255,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.7.5/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/apps/pulseaudio.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/apps/pulseaudio.te	2009-12-22 09:44:29.000000000 -0500
 @@ -11,6 +11,9 @@
  application_domain(pulseaudio_t, pulseaudio_exec_t)
  role system_r types pulseaudio_t;
@@ -4311,6 +4313,15 @@ diff --exclude-from=exclude -N -u -r nsa
  	policykit_domtrans_auth(pulseaudio_t)
  	policykit_read_lib(pulseaudio_t)
  	policykit_read_reload(pulseaudio_t)
+@@ -98,6 +111,8 @@
+ ')
+ 
+ optional_policy(`
++	xserver_stream_connect(pulseaudio_t)
+ 	xserver_manage_xdm_tmp_files(pulseaudio_t)
+ 	xserver_read_xdm_lib_files(pulseaudio_t)
++	xserver_read_xdm_pid(pulseaudio_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.7.5/policy/modules/apps/qemu.fc
 --- nsaserefpolicy/policy/modules/apps/qemu.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/apps/qemu.fc	2009-12-21 13:07:09.000000000 -0500
@@ -4715,8 +4726,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +# No types are sandbox_exec_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.7.5/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/apps/sandbox.if	2009-12-21 13:07:09.000000000 -0500
-@@ -0,0 +1,186 @@
++++ serefpolicy-3.7.5/policy/modules/apps/sandbox.if	2009-12-22 11:04:52.000000000 -0500
+@@ -0,0 +1,222 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -4903,6 +4914,42 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +	allow $1 sandbox_xserver_tmpfs_t:file rw_file_perms;
 +')
++
++########################################
++## <summary>
++##	allow domain to delete sandbox files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`sandbox_delete_files',`
++	gen_require(`
++		attribute sandbox_file_type;
++	')
++
++	delete_files_pattern($1, sandbox_file_type, sandbox_file_type)
++')
++
++########################################
++## <summary>
++##	allow domain to delete sandbox files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`sandbox_delete_dirs',`
++	gen_require(`
++		attribute sandbox_file_type;
++	')
++
++	delete_dirs_pattern($1, sandbox_file_type, sandbox_file_type)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.7.5/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.7.5/policy/modules/apps/sandbox.te	2009-12-21 14:43:49.000000000 -0500
@@ -5249,17 +5296,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.7.5/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/apps/screen.if	2009-12-21 14:51:54.000000000 -0500
-@@ -141,6 +141,12 @@
++++ serefpolicy-3.7.5/policy/modules/apps/screen.if	2009-12-22 11:38:41.000000000 -0500
+@@ -141,6 +141,7 @@
  	userdom_create_user_pty($1_screen_t)
  	userdom_user_home_domtrans($1_screen_t, $3)
  	userdom_setattr_user_ptys($1_screen_t)
 +	userdom_setattr_user_ttys($1_screen_t)
-+
-+	optional_policy(`
-+		dbus_system_bus_client($1_screen_t)
-+		fprintd_dbus_chat($1_screen_t)
-+	')
  
  	tunable_policy(`use_samba_home_dirs',`
  		fs_cifs_domtrans($1_screen_t, $3)
@@ -5710,7 +5752,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/usr/lib(64)?/gimp/.*/plug-ins(/.*)?  gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.7.5/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/kernel/corecommands.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/corecommands.if	2009-12-22 08:22:45.000000000 -0500
 @@ -893,6 +893,7 @@
  
  	read_lnk_files_pattern($1, bin_t, bin_t)
@@ -6927,7 +6969,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.7.5/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.if	2009-12-22 10:30:40.000000000 -0500
 @@ -906,7 +906,7 @@
  		type cifs_t;
  	')
@@ -6972,13 +7014,53 @@ diff --exclude-from=exclude -N -u -r nsa
  #########################################
  ## <summary>
  ##	Read named sockets on a NFS filesystem.
-@@ -4181,3 +4200,60 @@
+@@ -4181,3 +4200,216 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
 +
 +########################################
 +## <summary>
++##	Search dirs on cgroup
++##	file systems.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_search_cgroup_dirs', `
++	gen_require(`
++		type cgroup_t;
++
++	')
++
++	allow $1 cgroup_t:dir search;
++')
++
++########################################
++## <summary>
++##      list dirs on cgroup
++##      file systems.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`fs_list_cgroup_dirs', `
++        gen_require(`
++                type cgroup_t;
++
++        ')
++
++        list_dirs_pattern($1, cgroup_t, cgroup_t)
++')
++
++########################################
++## <summary>
 +##	Do not audit attempts to read
 +##	dirs on a CIFS or SMB filesystem.
 +## </summary>
@@ -6998,6 +7080,25 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +########################################
 +## <summary>
++##      create dirs on cgroup
++##      file systems.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`fs_create_cgroup_dirs', `
++        gen_require(`
++                type cgroup_t;
++	')
++
++	create_dirs_pattern($1, cgroup_t, cgroup_t)
++')
++
++########################################
++## <summary>
 +##	Manage dirs on cgroup file systems.
 +## </summary>
 +## <param name="domain">
@@ -7033,6 +7134,103 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +	rw_files_pattern($1, cgroup_t, cgroup_t)
 +')
++########################################
++## <summary>
++##	Mount a cgroup filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_mount_cgroup_fs', `
++	gen_require(`
++		type cgroup_t;
++	')
++
++	allow $1 cgroup_t:filesystem mount;
++')
++
++########################################
++## <summary>
++##	Remount a cgroup filesystem  This allows
++##	some mount options to be changed.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_remount_cgroup_fs', `
++	gen_require(`
++		type cgroup_t;
++	')
++
++	allow $1 cgroup_t:filesystem remount;
++')
++
++########################################
++## <summary>
++##	Unmount a cgroup file system.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_unmount_cgroup_fs', `
++	gen_require(`
++		type cgroup_t;
++	')
++
++	allow $1 cgroup_t:filesystem unmount;
++')
++
++########################################
++## <summary>
++##	Set attributes of files on cgroup
++##	file systems.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_setattr_cgroup_files',`
++	gen_require(`
++		type cgroup_t;
++
++	')
++
++	setattr_files_pattern($1, cgroup_t, cgroup_t)
++	fs_search_cgroup_dirs($1)
++')
++
++########################################
++## <summary>
++##	Write files on cgroup
++##	file systems.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_write_cgroup_files', `
++	gen_require(`
++		type cgroup_t;
++
++	')
++
++	write_files_pattern($1, cgroup_t, cgroup_t)
++	fs_search_cgroup_dirs($1)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.7.5/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2009-11-25 11:47:19.000000000 -0500
 +++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.te	2009-12-21 13:07:09.000000000 -0500
@@ -9518,7 +9716,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	All of the rules required to administrate 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.7.5/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/abrt.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/abrt.te	2009-12-22 08:42:16.000000000 -0500
 @@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -9566,7 +9764,7 @@ diff --exclude-from=exclude -N -u -r nsa
  files_pid_filetrans(abrt_t, abrt_var_run_t, { file dir })
  
  kernel_read_ring_buffer(abrt_t)
-@@ -75,18 +90,33 @@
+@@ -75,18 +90,34 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -9585,6 +9783,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  files_getattr_all_files(abrt_t)
  files_read_etc_files(abrt_t)
++files_read_var_lib_files(abrt_t)
  files_read_usr_files(abrt_t)
 +files_read_generic_tmp_files(abrt_t)
 +files_read_kernel_modules(abrt_t)
@@ -9600,7 +9799,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  sysnet_read_config(abrt_t)
  
-@@ -96,22 +126,92 @@
+@@ -96,22 +127,92 @@
  miscfiles_read_certs(abrt_t)
  miscfiles_read_localization(abrt_t)
  
@@ -10093,7 +10292,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.7.5/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/apache.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/apache.if	2009-12-22 10:55:59.000000000 -0500
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -10441,7 +10640,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	TCP sockets.
  ## </summary>
  ## <param name="domain">
-@@ -503,6 +480,86 @@
+@@ -503,6 +480,105 @@
  
  ########################################
  ## <summary>
@@ -10484,6 +10683,25 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +########################################
 +## <summary>
++##	Allow domain to  set the attributes
++##	of the APACHE cache directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`apache_setattr_cache_dirs',`
++	gen_require(`
++		type httpd_cache_t;
++	')
++
++	allow $1 httpd_cache_t:dir setattr;
++')
++
++########################################
++## <summary>
 +##	Allow the specified domain to read
 +##	apache tmp files.
 +## </summary>
@@ -10528,7 +10746,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Allow the specified domain to read
  ##	apache configuration files.
  ## </summary>
-@@ -579,7 +636,7 @@
+@@ -579,7 +655,7 @@
  ## </param>
  ## <param name="role">
  ##	<summary>
@@ -10537,7 +10755,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	</summary>
  ## </param>
  ## <rolecap/>
-@@ -715,6 +772,7 @@
+@@ -715,6 +791,7 @@
  	')
  
  	allow $1 httpd_modules_t:dir list_dir_perms;
@@ -10545,7 +10763,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -782,6 +840,32 @@
+@@ -782,6 +859,32 @@
  
  ########################################
  ## <summary>
@@ -10578,7 +10796,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Execute all web scripts in the system
  ##	script domain.
  ## </summary>
-@@ -791,16 +875,18 @@
+@@ -791,16 +894,18 @@
  ##	</summary>
  ## </param>
  #
@@ -10601,7 +10819,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	')
  ')
  
-@@ -859,6 +945,8 @@
+@@ -859,6 +964,8 @@
  ##	</summary>
  ## </param>
  #
@@ -10610,7 +10828,7 @@ diff --exclude-from=exclude -N -u -r nsa
  interface(`apache_run_all_scripts',`
  	gen_require(`
  		attribute httpd_exec_scripts, httpd_script_domains;
-@@ -884,7 +972,7 @@
+@@ -884,7 +991,7 @@
  		type httpd_squirrelmail_t;
  	')
  
@@ -10619,7 +10837,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -1043,6 +1131,44 @@
+@@ -1043,6 +1150,44 @@
  
  ########################################
  ## <summary>
@@ -10664,7 +10882,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	All of the rules required to administrate an apache environment
  ## </summary>
  ## <param name="prefix">
-@@ -1072,11 +1198,17 @@
+@@ -1072,11 +1217,17 @@
  		type httpd_modules_t, httpd_lock_t;
  		type httpd_var_run_t, httpd_php_tmp_t;
  		type httpd_suexec_tmp_t, httpd_tmp_t;
@@ -10682,7 +10900,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	apache_manage_all_content($1)
  	miscfiles_manage_public_files($1)
  
-@@ -1096,12 +1228,57 @@
+@@ -1096,12 +1247,57 @@
  
  	kernel_search_proc($1)
  	allow $1 httpd_t:dir list_dir_perms;
@@ -12396,6 +12614,165 @@ diff --exclude-from=exclude -N -u -r nsa
 +optional_policy(`
 +	unconfined_dbus_send(certmonger_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.fc serefpolicy-3.7.5/policy/modules/services/cgroup.fc
+--- nsaserefpolicy/policy/modules/services/cgroup.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/cgroup.fc	2009-12-22 11:06:28.000000000 -0500
+@@ -0,0 +1,7 @@
++/etc/rc\.d/init\.d/cgconfig	-- gen_context(system_u:object_r:cgconfig_initrc_exec_t, s0)
++/etc/rc\.d/init\.d/cgred	-- gen_context(system_u:object_r:cgred_initrc_exec_t, s0)
++
++/sbin/cgrulesengd		-- gen_context(system_u:object_r:cgred_exec_t, s0)
++/sbin/cgconfigparser		-- gen_context(system_u:object_r:cgconfigparser_exec_t, s0)
++
++/var/run/cgred.*		gen_context(system_u:object_r:cgred_var_run_t, s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.if serefpolicy-3.7.5/policy/modules/services/cgroup.if
+--- nsaserefpolicy/policy/modules/services/cgroup.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/cgroup.if	2009-12-22 11:07:12.000000000 -0500
+@@ -0,0 +1,52 @@
++## <summary>Control group rules engine daemon.</summary>
++## <desc>
++##	<p>
++##		cgrulesengd is a daemon, which distributes processes
++##		to control groups. When any process changes its
++##		effective UID or GID, cgred inspects list of
++##		rules loaded from cgrules.conf file and moves the
++##		process to the appropriate control group.
++##	</p>
++##	<p>
++##		The list of rules is read during the daemon startup and
++##		are cached in daemon?s memory. The daemon reloads the
++##		list of rules when it receives SIGUSR2 signal.
++##	</p>
++## </desc>
++
++########################################
++## <summary>
++##	Read and write cgred sock file in /var/run.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`cgroup_cgred_rw_pid_sock_file', `
++	gen_require(`
++		type cgred_var_run_t;
++	')
++
++	rw_sock_files_pattern($1, cgred_var_run_t, cgred_var_run_t)
++	files_search_pids($1)
++')
++
++########################################
++## <summary>
++##	Unix stream socket connect to cgred.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`cgroup_cgred_stream_connect', `
++	gen_require(`
++		type cgred_t;
++	')
++
++	allow $1 cgred_t:unix_stream_socket connectto;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.te serefpolicy-3.7.5/policy/modules/services/cgroup.te
+--- nsaserefpolicy/policy/modules/services/cgroup.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/cgroup.te	2009-12-22 11:05:59.000000000 -0500
+@@ -0,0 +1,88 @@
++policy_module(cgroup, 1.0.0)
++
++########################################
++#
++# cgred personal declarations.
++#
++
++type cgred_t;
++type cgred_exec_t;
++init_daemon_domain(cgred_t, cgred_exec_t)
++
++type cgred_initrc_exec_t;
++init_script_file(cgred_initrc_exec_t)
++
++type cgred_var_run_t;
++files_pid_file(cgred_var_run_t)
++
++permissive cgred_t;
++
++########################################
++#
++# cgconfig personal declarations.
++#
++
++type cgconfigparser_t;
++type cgconfigparser_exec_t;
++init_daemon_domain(cgconfigparser_t, cgconfigparser_exec_t)
++
++type cgconfig_initrc_exec_t;
++init_script_file(cgconfig_initrc_exec_t)
++
++permissive cgconfigparser_t;
++
++########################################
++#
++# cgred personal policy.
++#
++
++allow cgred_t self:capability { net_admin sys_ptrace dac_override };
++allow cgred_t self:netlink_socket { write bind create read };
++allow cgred_t self:unix_dgram_socket { write create connect };
++
++manage_sock_files_pattern(cgred_t, cgred_var_run_t,
++cgred_var_run_t)
++files_pid_filetrans(cgred_t, cgred_var_run_t, sock_file)
++
++domain_read_all_domains_state(cgred_t)
++
++files_read_etc_files(cgred_t)
++
++files_search_all(cgred_t)
++files_getattr_all_files(cgred_t)
++files_getattr_all_dirs(cgred_t)
++files_getattr_all_sockets(cgred_t)
++files_getattr_all_pipes(cgred_t)
++files_getattr_all_symlinks(cgred_t)
++# read all link files.
++
++kernel_read_system_state(cgred_t)
++
++logging_send_syslog_msg(cgred_t)
++
++miscfiles_read_localization(cgred_t)
++
++optional_policy(`
++	fs_write_cgroup_files(cgred_t)
++')
++
++########################################
++#
++# cgconfig personal policy.
++#
++
++optional_policy(`
++	fs_manage_cgroup_dirs(cgconfigparser_t)
++	fs_rw_cgroup_files(cgconfigparser_t)
++	fs_setattr_cgroup_files(cgconfigparser_t)
++	fs_mount_cgroup_fs(cgconfigparser_t)
++')
++
++files_mounton_mnt(cgconfigparser_t)
++files_manage_mnt_dirs(cgconfigparser_t)
++
++files_read_etc_files(cgconfigparser_t)
++
++# /mnt/cgroups/cpu
++kernel_list_unlabeled(cgconfigparser_t)
++kernel_read_system_state(cgconfigparser_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.fc serefpolicy-3.7.5/policy/modules/services/chronyd.fc
 --- nsaserefpolicy/policy/modules/services/chronyd.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.7.5/policy/modules/services/chronyd.fc	2009-12-21 13:07:09.000000000 -0500
@@ -13731,7 +14108,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.7.5/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/cups.fc	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/cups.fc	2009-12-22 09:33:25.000000000 -0500
 @@ -13,10 +13,14 @@
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/rc\.d/init\.d/cups	--	gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
@@ -13755,7 +14132,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  
  /usr/sbin/hp-[^/]+	--	gen_context(system_u:object_r:hplip_exec_t,s0)
-@@ -52,6 +57,8 @@
+@@ -52,13 +57,22 @@
  /var/lib/cups/certs	-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
@@ -13764,7 +14141,10 @@ diff --exclude-from=exclude -N -u -r nsa
  /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
  /var/log/turboprint.*		gen_context(system_u:object_r:cupsd_log_t,s0)
  
-@@ -61,4 +68,10 @@
+ /var/ccpd(/.*)?			gen_context(system_u:object_r:cupsd_var_run_t,s0)
++/var/ekpd(/.*)?			gen_context(system_u:object_r:cupsd_var_run_t,s0)
+ /var/run/cups(/.*)?		gen_context(system_u:object_r:cupsd_var_run_t,s0)
+ /var/run/hp.*\.pid	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/hp.*\.port	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
@@ -14000,7 +14380,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.7.5/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/dbus.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/dbus.if	2009-12-22 09:48:30.000000000 -0500
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -14052,18 +14432,24 @@ diff --exclude-from=exclude -N -u -r nsa
  	userdom_read_user_home_content_files($1_dbusd_t)
  
  	ifdef(`hide_broken_symptoms', `
-@@ -153,6 +159,10 @@
+@@ -153,13 +159,13 @@
  	')
  
  	optional_policy(`
+-		hal_dbus_chat($1_dbusd_t)
 +		gnome_read_gconf_home_files($1_dbusd_t)
-+	')
-+
-+	optional_policy(`
- 		hal_dbus_chat($1_dbusd_t)
  	')
  
-@@ -178,10 +188,12 @@
+ 	optional_policy(`
+-		xserver_use_xdm_fds($1_dbusd_t)
+-		xserver_rw_xdm_pipes($1_dbusd_t)
++		hal_dbus_chat($1_dbusd_t)
+ 	')
++
+ ')
+ 
+ #######################################
+@@ -178,10 +184,12 @@
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t, system_dbusd_var_lib_t;
  		class dbus send_msg;
@@ -14076,7 +14462,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  	read_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
  	files_search_var_lib($1)
-@@ -256,7 +268,7 @@
+@@ -256,7 +264,7 @@
  
  ########################################
  ## <summary>
@@ -14085,7 +14471,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	for service (acquire_svc).
  ## </summary>
  ## <param name="domain">
-@@ -364,6 +376,16 @@
+@@ -364,6 +372,16 @@
  	dbus_system_bus_client($1)
  	dbus_connect_system_bus($1)
  
@@ -14102,7 +14488,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	ifdef(`hide_broken_symptoms', `
  		dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
  	')
-@@ -405,3 +427,24 @@
+@@ -405,3 +423,24 @@
  
  	typeattribute $1 dbusd_unconfined;
  ')
@@ -14129,7 +14515,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.7.5/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/dbus.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/dbus.te	2009-12-22 09:49:03.000000000 -0500
 @@ -86,6 +86,7 @@
  dev_read_sysfs(system_dbusd_t)
  
@@ -14163,7 +14549,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	policykit_domtrans_auth(system_dbusd_t)
  	policykit_search_lib(system_dbusd_t)
  ')
-@@ -156,5 +168,18 @@
+@@ -156,5 +168,24 @@
  #
  # Unconfined access to this module
  #
@@ -14182,6 +14568,12 @@ diff --exclude-from=exclude -N -u -r nsa
  allow dbusd_unconfined session_bus_type:dbus all_dbus_perms;
 +allow dbusd_unconfined dbusd_unconfined:dbus all_dbus_perms;
 +allow session_bus_type dbusd_unconfined:dbus send_msg;
++
++optional_policy(`
++	xserver_use_xdm_fds(session_bus_type)
++	xserver_rw_xdm_pipes(session_bus_type)
++	xserver_append_xdm_home_files(session_bus_type)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.7.5/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/dcc.te	2009-12-21 13:07:09.000000000 -0500
@@ -14246,6 +14638,187 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	All of the rules required to administrate 
  ##	an ddclient environment
  ## </summary>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.fc serefpolicy-3.7.5/policy/modules/services/denyhosts.fc
+--- nsaserefpolicy/policy/modules/services/denyhosts.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/denyhosts.fc	2009-12-22 10:13:51.000000000 -0500
+@@ -0,0 +1,7 @@
++/etc/rc\.d/init\.d/denyhosts		--		gen_context(system_u:object_r:denyhosts_initrc_exec_t, s0)
++
++/usr/bin/denyhosts\.py				--		gen_context(system_u:object_r:denyhosts_exec_t, s0)
++
++/var/lib/denyhosts(/.*)?					gen_context(system_u:object_r:denyhosts_var_lib_t, s0)
++/var/lock/subsys/denyhosts			--		gen_context(system_u:object_r:denyhosts_var_lock_t, s0)
++/var/log/denyhosts(/.*)?					gen_context(system_u:object_r:denyhosts_var_log_t, s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.if serefpolicy-3.7.5/policy/modules/services/denyhosts.if
+--- nsaserefpolicy/policy/modules/services/denyhosts.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/denyhosts.if	2009-12-22 10:13:51.000000000 -0500
+@@ -0,0 +1,91 @@
++## <summary>Deny Hosts.</summary>
++## <desc>
++##	<p>
++##		DenyHosts is a script intended to be run by Linux
++##		system administrators to help thwart SSH server attacks
++##		(also known as dictionary based attacks and brute force
++##		attacks).
++##	</p>
++## </desc>
++
++########################################
++## <summary>
++##	Execute a domain transition to run denyhosts.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`denyhosts_domtrans', `
++	gen_require(`
++		type denyhosts_t, denyhosts_exec_t;
++	')
++
++	domtrans_pattern($1, denyhosts_exec_t, denyhosts_t)
++')
++
++########################################
++## <summary>
++##	Execute ksmtuned server in the ksmtuned domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`denyhosts_initrc_domtrans', `
++	gen_require(`
++		type denyhosts_initrc_exec_t;
++	')
++
++	init_labeled_script_domtrans($1, denyhosts_initrc_exec_t)
++')
++
++########################################
++## <summary>
++##	All of the rules required to administrate 
++##	an denyhosts environment.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	Role allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`denyhosts_admin', `
++	gen_require(`
++		type denyhosts_t, denyhosts_var_lib_t, denyhosts_var_lock_t;
++		type denyhosts_var_log_t;
++	')
++
++	allow $1 denyhosts_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, denyhosts_t, denyhosts_t)
++	        
++	files_list_pids($1)
++	admin_pattern($1, denyhosts_var_run_t)
++
++	logging_search_logs($1)
++	admin_pattern($1, denyhosts_var_log_t)
++
++	files_search_locks($1)
++	admin_pattern($1, denyhosts_var_lock_t)
++
++	denyhosts_initrc_domtrans($1)
++	domain_system_change_exemption($1)
++	role_transition $2 denyhosts_initrc_exec_t system_r;
++	allow $2 system_r;
++
++	kernel_search_proc($1)
++	allow $1 denyhosts_t:dir list_dir_perms;
++	ps_process_pattern($1, denyhosts_t)
++	read_lnk_files_pattern($1, denyhosts_t, denyhosts_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.te serefpolicy-3.7.5/policy/modules/services/denyhosts.te
+--- nsaserefpolicy/policy/modules/services/denyhosts.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/denyhosts.te	2009-12-22 10:34:58.000000000 -0500
+@@ -0,0 +1,71 @@
++
++policy_module(denyhosts, 1.0.0) 
++
++########################################
++#
++# DenyHosts personal declarations.
++#
++
++type denyhosts_t;
++type denyhosts_exec_t;
++init_daemon_domain(denyhosts_t, denyhosts_exec_t)
++
++type denyhosts_initrc_exec_t;
++init_script_file(denyhosts_initrc_exec_t)
++
++type denyhosts_var_lib_t;
++files_type(denyhosts_var_lib_t)
++
++type denyhosts_var_lock_t;
++files_lock_file(denyhosts_var_lock_t)
++
++type denyhosts_var_log_t;
++logging_log_file(denyhosts_var_log_t)
++
++########################################
++#
++# DenyHosts personal policy.
++#
++
++allow denyhosts_t self:netlink_route_socket create_netlink_socket_perms;
++allow denyhosts_t self:tcp_socket create_socket_perms;
++allow denyhosts_t self:udp_socket create_socket_perms;
++
++manage_files_pattern(denyhosts_t, denyhosts_var_lib_t, denyhosts_var_lib_t)
++files_var_lib_filetrans(denyhosts_t, denyhosts_var_lib_t, file)
++
++manage_dirs_pattern(denyhosts_t, denyhosts_var_lock_t, denyhosts_var_lock_t)
++manage_files_pattern(denyhosts_t, denyhosts_var_lock_t, denyhosts_var_lock_t)
++files_lock_filetrans(denyhosts_t, denyhosts_var_lock_t, { dir file })
++
++append_files_pattern(denyhosts_t, denyhosts_var_log_t, denyhosts_var_log_t)
++create_files_pattern(denyhosts_t, denyhosts_var_log_t, denyhosts_var_log_t)
++read_files_pattern(denyhosts_t, denyhosts_var_log_t, denyhosts_var_log_t)
++setattr_files_pattern(denyhosts_t, denyhosts_var_log_t, denyhosts_var_log_t)
++logging_log_filetrans(denyhosts_t, denyhosts_var_log_t, file)
++
++corecmd_list_bin(denyhosts_t)
++corecmd_read_bin_symlinks(denyhosts_t)
++
++corenet_all_recvfrom_unlabeled(denyhosts_t)
++corenet_all_recvfrom_netlabel(denyhosts_t)
++corenet_tcp_sendrecv_generic_if(denyhosts_t)
++corenet_tcp_sendrecv_generic_node(denyhosts_t)
++corenet_tcp_bind_generic_node(denyhosts_t)
++corenet_sendrecv_smtp_client_packets(denyhosts_t)
++corenet_tcp_connect_smtp_port(denyhosts_t)
++
++dev_read_urand(denyhosts_t)
++
++kernel_read_system_state(denyhosts_t)
++
++# /var/log/secure
++logging_read_generic_logs(denyhosts_t)
++
++miscfiles_read_localization(denyhosts_t)
++
++sysnet_manage_config(denyhosts_t)
++
++optional_policy(`
++	cron_system_entry(denyhosts_t, denyhosts_exec_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.fc serefpolicy-3.7.5/policy/modules/services/devicekit.fc
 --- nsaserefpolicy/policy/modules/services/devicekit.fc	2009-07-29 15:15:33.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/devicekit.fc	2009-12-21 13:07:09.000000000 -0500
@@ -18972,7 +19545,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.te serefpolicy-3.7.5/policy/modules/services/portreserve.te
 --- nsaserefpolicy/policy/modules/services/portreserve.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/portreserve.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/portreserve.te	2009-12-22 08:23:05.000000000 -0500
 @@ -21,6 +21,7 @@
  # Portreserve local policy
  #
@@ -18981,6 +19554,15 @@ diff --exclude-from=exclude -N -u -r nsa
  allow portreserve_t self:fifo_file rw_fifo_file_perms;
  allow portreserve_t self:unix_stream_socket create_stream_socket_perms;
  allow portreserve_t self:unix_dgram_socket { create_socket_perms sendto };
+@@ -37,6 +38,8 @@
+ manage_sock_files_pattern(portreserve_t, portreserve_var_run_t, portreserve_var_run_t)
+ files_pid_filetrans(portreserve_t, portreserve_var_run_t, { file sock_file })
+ 
++corecmd_getattr_bin_files(portreserve_t)
++
+ corenet_all_recvfrom_unlabeled(portreserve_t)
+ corenet_all_recvfrom_netlabel(portreserve_t)
+ corenet_tcp_bind_generic_node(portreserve_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.7.5/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/postfix.fc	2009-12-21 13:07:09.000000000 -0500
@@ -21471,7 +22053,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Read NFS exported content.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.7.5/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/rpc.te	2009-12-21 17:42:16.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/rpc.te	2009-12-22 08:26:50.000000000 -0500
 @@ -37,8 +37,14 @@
  # rpc_exec_t is the type of rpc daemon programs.
  rpc_domain_template(rpcd)
@@ -21497,7 +22079,15 @@ diff --exclude-from=exclude -N -u -r nsa
  allow rpcd_t self:fifo_file rw_fifo_file_perms;
  
  allow rpcd_t rpcd_var_run_t:dir setattr;
-@@ -91,14 +98,21 @@
+@@ -67,6 +74,7 @@
+ kernel_read_network_state(rpcd_t)
+ # for rpc.rquotad
+ kernel_read_sysctl(rpcd_t)
++kernel_request_load_module(gssd_t)	
+ kernel_rw_fs_sysctls(rpcd_t)
+ kernel_dontaudit_getattr_core_if(rpcd_t)
+ kernel_signal(rpcd_t) 
+@@ -91,14 +99,21 @@
  
  seutil_dontaudit_search_config(rpcd_t)
  
@@ -21519,7 +22109,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
  #
  # NFSD local policy
-@@ -127,6 +141,7 @@
+@@ -127,6 +142,7 @@
  files_getattr_tmp_dirs(nfsd_t) 
  # cjp: this should really have its own type
  files_manage_mounttab(nfsd_t)
@@ -21527,7 +22117,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  fs_mount_nfsd_fs(nfsd_t) 
  fs_search_nfsd_fs(nfsd_t) 
-@@ -135,6 +150,7 @@
+@@ -135,6 +151,7 @@
  fs_rw_nfsd_fs(nfsd_t) 
  
  storage_dontaudit_read_fixed_disk(nfsd_t)
@@ -21535,7 +22125,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  # Read access to public_content_t and public_content_rw_t
  miscfiles_read_public_files(nfsd_t)
-@@ -151,6 +167,7 @@
+@@ -151,6 +168,7 @@
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
  ')
@@ -21543,7 +22133,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  tunable_policy(`nfs_export_all_ro',`
  	dev_getattr_all_blk_files(nfsd_t)
-@@ -182,6 +199,7 @@
+@@ -182,6 +200,7 @@
  kernel_read_network_state(gssd_t)
  kernel_read_network_state_symlinks(gssd_t)	
  kernel_search_network_sysctl(gssd_t)	
@@ -21551,7 +22141,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  corecmd_exec_bin(gssd_t)
  
-@@ -189,8 +207,10 @@
+@@ -189,8 +208,10 @@
  fs_rw_rpc_sockets(gssd_t) 
  fs_read_rpc_files(gssd_t) 
  
@@ -21562,7 +22152,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  auth_use_nsswitch(gssd_t)
  auth_manage_cache(gssd_t) 
-@@ -199,10 +219,14 @@
+@@ -199,10 +220,14 @@
  
  mount_signal(gssd_t)
  
@@ -25515,7 +26105,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/var/lib/nxserver/home/\.Xauthority.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.7.5/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/xserver.if	2009-12-21 14:42:35.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/xserver.if	2009-12-22 09:50:42.000000000 -0500
 @@ -56,6 +56,13 @@
  
  	domtrans_pattern($2, iceauth_exec_t, iceauth_t)
@@ -25592,7 +26182,15 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -774,7 +786,7 @@
+@@ -567,6 +579,7 @@
+ 
+ 	allow $1 xauth_home_t:file read_file_perms;
+ 	userdom_search_user_home_dirs($1)
++	xserver_read_xdm_pid($1)
+ ')
+ 
+ ########################################
+@@ -774,7 +787,7 @@
  	')
  
  	files_search_pids($1)
@@ -25601,7 +26199,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -1219,3 +1231,278 @@
+@@ -1219,3 +1232,301 @@
  	typeattribute $1 x_domain;
  	typeattribute $1 xserver_unconfined_type;
  ')
@@ -25880,9 +26478,32 @@ diff --exclude-from=exclude -N -u -r nsa
 +	xserver_domtrans_xauth($1)
 +	role $2 types xauth_t;
 +')
++########################################
++## <summary>
++##	Read user homedir fonts.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`xserver_manage_home_fonts',`
++	gen_require(`
++		type user_fonts_t;
++		type user_fonts_config_t;
++	')
++
++	manage_dirs_pattern($1, user_fonts_t, user_fonts_t)
++	manage_files_pattern($1, user_fonts_t, user_fonts_t)
++	manage_lnk_files_pattern($1, user_fonts_t, user_fonts_t)
++
++	manage_files_pattern($1, user_fonts_config_t, user_fonts_config_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.7.5/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/xserver.te	2009-12-21 17:52:12.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/xserver.te	2009-12-22 09:44:04.000000000 -0500
 @@ -36,6 +36,13 @@
  
  ## <desc>
@@ -26343,7 +26964,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -520,12 +633,47 @@
+@@ -520,12 +633,48 @@
  ')
  
  optional_policy(`
@@ -26352,6 +26973,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +	dontaudit xdm_dbusd_t xdm_var_lib_t:dir search_dir_perms;
 +	xserver_xdm_append_log(xdm_dbusd_t)
++	xserver_read_xdm_pid(xdm_dbusd_t)
 +
 +	corecmd_bin_entry_type(xdm_t)
 +
@@ -26391,7 +27013,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	hostname_exec(xdm_t)
  ')
  
-@@ -543,9 +691,42 @@
+@@ -543,9 +692,42 @@
  ')
  
  optional_policy(`
@@ -26434,7 +27056,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
  	seutil_sigchld_newrole(xdm_t)
  ')
-@@ -555,8 +736,9 @@
+@@ -555,8 +737,9 @@
  ')
  
  optional_policy(`
@@ -26446,7 +27068,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -565,7 +747,6 @@
+@@ -565,7 +748,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -26454,7 +27076,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -576,6 +757,10 @@
+@@ -576,6 +758,10 @@
  ')
  
  optional_policy(`
@@ -26465,7 +27087,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -600,10 +785,9 @@
+@@ -600,10 +786,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -26477,7 +27099,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -615,6 +799,18 @@
+@@ -615,6 +800,18 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -26496,7 +27118,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  manage_dirs_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  manage_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
-@@ -634,12 +830,19 @@
+@@ -634,12 +831,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -26518,7 +27140,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -673,7 +876,6 @@
+@@ -673,7 +877,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -26526,7 +27148,7 @@ diff --exclude-from=exclude -N -u -r nsa
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -683,9 +885,12 @@
+@@ -683,9 +886,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -26540,7 +27162,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -700,8 +905,12 @@
+@@ -700,8 +906,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -26553,7 +27175,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -723,6 +932,7 @@
+@@ -723,6 +933,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -26561,7 +27183,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -779,12 +989,20 @@
+@@ -779,12 +990,20 @@
  ')
  
  optional_policy(`
@@ -26583,7 +27205,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -811,7 +1029,7 @@
+@@ -811,7 +1030,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -26592,7 +27214,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -832,9 +1050,14 @@
+@@ -832,9 +1051,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -26607,7 +27229,7 @@ diff --exclude-from=exclude -N -u -r nsa
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -849,11 +1072,14 @@
+@@ -849,11 +1073,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -26624,7 +27246,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -1000,17 +1226,32 @@
+@@ -1000,17 +1227,32 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -27418,7 +28040,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.7.5/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-11-12 12:51:51.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/init.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/init.te	2009-12-22 10:22:45.000000000 -0500
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -27566,7 +28188,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  corenet_all_recvfrom_unlabeled(initrc_t)
  corenet_all_recvfrom_netlabel(initrc_t)
-@@ -272,16 +317,63 @@
+@@ -272,16 +317,66 @@
  dev_rw_sysfs(initrc_t)
  dev_list_usbfs(initrc_t)
  dev_read_framebuffer(initrc_t)
@@ -27598,6 +28220,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fs_getattr_all_fs(initrc_t)
 +fs_search_all(initrc_t)
 +fs_getattr_nfsd_files(initrc_t)
++fs_rw_cgroup_files(initrc_t)
++fs_setattr_cgroup_files(initrc_t)
++fs_manage_cgroup_dirs(initrc_t)
 +
 +# initrc_t needs to do a pidof which requires ptrace
 +mcs_ptrace_all(initrc_t)
@@ -27631,7 +28256,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  domain_kill_all_domains(initrc_t)
  domain_signal_all_domains(initrc_t)
-@@ -291,7 +383,7 @@
+@@ -291,7 +386,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -27640,7 +28265,7 @@ diff --exclude-from=exclude -N -u -r nsa
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -306,14 +398,15 @@
+@@ -306,14 +401,15 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -27658,7 +28283,7 @@ diff --exclude-from=exclude -N -u -r nsa
  files_exec_etc_files(initrc_t)
  files_read_usr_files(initrc_t)
  files_manage_urandom_seed(initrc_t)
-@@ -324,48 +417,16 @@
+@@ -324,48 +420,16 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
@@ -27711,7 +28336,7 @@ diff --exclude-from=exclude -N -u -r nsa
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -374,19 +435,22 @@
+@@ -374,19 +438,22 @@
  
  miscfiles_read_localization(initrc_t)
  # slapd needs to read cert files from its initscript
@@ -27735,7 +28360,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ifdef(`distro_debian',`
  	dev_setattr_generic_dirs(initrc_t)
  
-@@ -422,16 +486,12 @@
+@@ -422,16 +489,12 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -27753,7 +28378,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  	optional_policy(`
  		arpwatch_manage_data_files(initrc_t)
-@@ -450,11 +510,9 @@
+@@ -450,11 +513,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -27766,7 +28391,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	# These seem to be from the initrd
  	# during device initialization:
  	dev_create_generic_dirs(initrc_t)
-@@ -464,6 +522,7 @@
+@@ -464,6 +525,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -27774,7 +28399,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -492,15 +551,22 @@
+@@ -492,15 +554,27 @@
  	optional_policy(`
  		bind_manage_config_dirs(initrc_t)
  		bind_write_config(initrc_t)
@@ -27782,6 +28407,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +
 +	optional_policy(`
++		cgroup_cgrulesengd_rw_pid_sock_file(initrc_t)
++		cgroup_cgrulesengd_stream_connect(initrc_t)
++	')
++
++	optional_policy(`
 +		gnome_manage_gconf_config(initrc_t)
  	')
  
@@ -27797,7 +28427,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	')
  
  	optional_policy(`
-@@ -515,6 +581,33 @@
+@@ -515,6 +589,33 @@
  	')
  ')
  
@@ -27831,7 +28461,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -567,10 +660,19 @@
+@@ -567,10 +668,19 @@
  	dbus_connect_system_bus(initrc_t)
  	dbus_system_bus_client(initrc_t)
  	dbus_read_config(initrc_t)
@@ -27851,7 +28481,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -590,6 +692,10 @@
+@@ -590,6 +700,10 @@
  ')
  
  optional_policy(`
@@ -27862,7 +28492,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -646,20 +752,20 @@
+@@ -646,20 +760,20 @@
  ')
  
  optional_policy(`
@@ -27889,7 +28519,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -668,6 +774,7 @@
+@@ -668,6 +782,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -27897,7 +28527,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -700,7 +807,6 @@
+@@ -700,7 +815,6 @@
  ')
  
  optional_policy(`
@@ -27905,7 +28535,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -722,8 +828,6 @@
+@@ -722,8 +836,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -27914,7 +28544,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -736,13 +840,16 @@
+@@ -736,13 +848,16 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -27931,7 +28561,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -751,6 +858,7 @@
+@@ -751,6 +866,7 @@
  
  optional_policy(`
  	udev_rw_db(initrc_t)
@@ -27939,7 +28569,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -758,6 +866,15 @@
+@@ -758,6 +874,15 @@
  ')
  
  optional_policy(`
@@ -27955,7 +28585,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -768,6 +885,21 @@
+@@ -768,6 +893,21 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -27977,7 +28607,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -793,3 +925,31 @@
+@@ -793,3 +933,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -28342,7 +28972,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +permissive kdump_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.7.5/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-21 13:42:16.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-22 08:51:29.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -28669,7 +29299,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/opt/lampp/lib/libct\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/opt/VirtualBox(/.*)?/VBox.*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
-+/usr/lib(64)?/chromium-browser/libsandbox\.so 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/chromium-browser/.*\.so 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.7.5/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/system/libraries.if	2009-12-21 13:07:09.000000000 -0500
@@ -29100,7 +29730,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-3.7.5/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/miscfiles.if	2009-12-21 17:50:23.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/miscfiles.if	2009-12-22 12:15:10.000000000 -0500
 @@ -73,7 +73,8 @@
  #
  interface(`miscfiles_read_fonts',`
@@ -29126,7 +29756,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	manage_dirs_pattern($1, fonts_t, fonts_t)
  	manage_files_pattern($1, fonts_t, fonts_t)
  	manage_lnk_files_pattern($1, fonts_t, fonts_t)
-+	miscfiles_manage_fonts($1)
++	miscfiles_manage_fonts_cache($1)
 +')
 +
 +########################################
@@ -29276,8 +29906,16 @@ diff --exclude-from=exclude -N -u -r nsa
 +/var/run/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.7.5/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/mount.if	2009-12-21 13:07:09.000000000 -0500
-@@ -84,9 +84,11 @@
++++ serefpolicy-3.7.5/policy/modules/system/mount.if	2009-12-22 09:40:26.000000000 -0500
+@@ -16,6 +16,7 @@
+ 	')
+ 
+ 	domtrans_pattern($1, mount_exec_t, mount_t)
++	mount_domtrans_fusermount($1)
+ ')
+ 
+ ########################################
+@@ -84,9 +85,11 @@
  interface(`mount_signal',`
  	gen_require(`
  		type mount_t;
@@ -29289,7 +29927,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -177,3 +179,57 @@
+@@ -177,3 +180,57 @@
  	mount_domtrans_unconfined($1)
  	role $2 types unconfined_mount_t;
  ')
@@ -30359,12 +30997,14 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.7.5/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.fc	2009-12-21 13:07:09.000000000 -0500
-@@ -11,15 +11,20 @@
++++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.fc	2009-12-22 11:49:02.000000000 -0500
+@@ -11,15 +11,22 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpd\.conf	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
 +/etc/hosts		--	gen_context(system_u:object_r:net_conf_t,s0)
++/etc/hosts\.deny.*	--	gen_context(system_u:object_r:net_conf_t,s0)
++/etc/denyhosts.*	--	gen_context(system_u:object_r:net_conf_t,s0)
  /etc/resolv\.conf.*	--	gen_context(system_u:object_r:net_conf_t,s0)
  /etc/yp\.conf.*		--	gen_context(system_u:object_r:net_conf_t,s0)
 +/etc/wicd/manager-settings.conf -- gen_context(system_u:object_r:net_conf_t, s0)
@@ -30382,7 +31022,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  #
-@@ -51,9 +56,12 @@
+@@ -51,9 +58,12 @@
  /var/lib/dhcp3?/dhclient.*	gen_context(system_u:object_r:dhcpc_state_t,s0)
  /var/lib/dhcpcd(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
  /var/lib/dhclient(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
@@ -30397,7 +31037,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.7.5/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.if	2009-12-22 10:35:23.000000000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.946
retrieving revision 1.947
diff -u -p -r1.946 -r1.947
--- selinux-policy.spec	21 Dec 2009 22:53:07 -0000	1.946
+++ selinux-policy.spec	22 Dec 2009 17:16:13 -0000	1.947
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.7.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Dec 22 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-3
+- Add back xserver_manage_home_fonts
+
 * Mon Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-2
 - Dontaudit sandbox trying to read nscd and sssd
 



From dwalsh at fedoraproject.org  Tue Dec 22 17:16:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 22 Dec 2009 17:16:16 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.158,
	1.159 selinux-policy.spec, 1.985, 1.986
Message-ID: <20091222171616.E371411C00E9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11057

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-62
- Add label for /var/ekpd
- Allow portreserve to look at bin files
- Allow gssd to ask the kernel to load modules
- If you can run mount you can run fusermount


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   82 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  188 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  189 +++
 policy/modules/apps/sandbox.te            |  336 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   49 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   50 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  475 ++++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  293 +++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  442 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  119 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   52 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   53 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   18 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   25 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   32 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   60 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  285 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  665 ++++++++++-
 policy/modules/services/xserver.te        |  383 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  184 +++
 policy/modules/system/init.te             |  292 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   78 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   23 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  193 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   83 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1702 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 413 files changed, 21801 insertions(+), 2838 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- policy-F12.patch	21 Dec 2009 22:53:29 -0000	1.158
+++ policy-F12.patch	22 Dec 2009 17:16:15 -0000	1.159
@@ -1611,7 +1611,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te	2009-12-22 10:55:00.000000000 -0500
 @@ -42,6 +42,7 @@
  cron_system_entry(tmpreaper_t, tmpreaper_exec_t)
  
@@ -5418,7 +5418,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.6.32/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/screen.if	2009-12-21 14:51:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/screen.if	2009-12-22 11:38:50.000000000 -0500
 @@ -45,6 +45,7 @@
  
  	allow $1_screen_t self:capability { setuid setgid fsetid };
@@ -5447,16 +5447,11 @@ diff -b -B --ignore-all-space --exclude-
  	auth_use_nsswitch($1_screen_t)
  	auth_dontaudit_read_shadow($1_screen_t)
  	auth_dontaudit_exec_utempter($1_screen_t)
-@@ -134,6 +141,12 @@
+@@ -134,6 +141,7 @@
  	userdom_create_user_pty($1_screen_t)
  	userdom_user_home_domtrans($1_screen_t, $3)
  	userdom_setattr_user_ptys($1_screen_t)
 +	userdom_setattr_user_ttys($1_screen_t)
-+
-+	optional_policy(`
-+		dbus_system_bus_client($1_screen_t)
-+		fprintd_dbus_chat($1_screen_t)
-+	')
  
  	tunable_policy(`use_samba_home_dirs',`
  		fs_cifs_domtrans($1_screen_t, $3)
@@ -10906,7 +10901,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-17 17:01:23.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-22 08:42:28.000000000 -0500
 @@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -10954,7 +10949,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(abrt_t, abrt_var_run_t, { file dir })
  
  kernel_read_ring_buffer(abrt_t)
-@@ -75,18 +90,33 @@
+@@ -75,18 +90,34 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -10973,6 +10968,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_getattr_all_files(abrt_t)
  files_read_etc_files(abrt_t)
++files_read_var_lib_files(abrt_t)
  files_read_usr_files(abrt_t)
 +files_read_generic_tmp_files(abrt_t)
 +files_read_kernel_modules(abrt_t)
@@ -10988,7 +10984,7 @@ diff -b -B --ignore-all-space --exclude-
  
  sysnet_read_config(abrt_t)
  
-@@ -96,22 +126,90 @@
+@@ -96,22 +127,90 @@
  miscfiles_read_certs(abrt_t)
  miscfiles_read_localization(abrt_t)
  
@@ -11500,7 +11496,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/www/svn/conf(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.32/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.if	2009-12-18 15:32:53.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/apache.if	2009-12-22 10:55:42.000000000 -0500
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -13082,7 +13078,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.6.32/policy/modules/services/asterisk.te
 --- nsaserefpolicy/policy/modules/services/asterisk.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/asterisk.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/asterisk.te	2009-12-22 08:26:17.000000000 -0500
 @@ -34,18 +34,21 @@
  type asterisk_var_run_t;
  files_pid_file(asterisk_var_run_t)
@@ -15174,7 +15170,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.6.32/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.fc	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/cups.fc	2009-12-22 09:33:17.000000000 -0500
 @@ -13,10 +13,14 @@
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/rc\.d/init\.d/cups	--	gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
@@ -15198,7 +15194,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  
  /usr/sbin/hp-[^/]+	--	gen_context(system_u:object_r:hplip_exec_t,s0)
-@@ -52,6 +57,8 @@
+@@ -52,13 +57,22 @@
  /var/lib/cups/certs	-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
@@ -15207,7 +15203,10 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
  /var/log/turboprint.*		gen_context(system_u:object_r:cupsd_log_t,s0)
  
-@@ -61,4 +68,10 @@
+ /var/ccpd(/.*)?			gen_context(system_u:object_r:cupsd_var_run_t,s0)
++/var/ekpd(/.*)?			gen_context(system_u:object_r:cupsd_var_run_t,s0)
+ /var/run/cups(/.*)?		gen_context(system_u:object_r:cupsd_var_run_t,s0)
+ /var/run/hp.*\.pid	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/hp.*\.port	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
@@ -20672,7 +20671,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.te serefpolicy-3.6.32/policy/modules/services/portreserve.te
 --- nsaserefpolicy/policy/modules/services/portreserve.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/portreserve.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/portreserve.te	2009-12-22 08:23:31.000000000 -0500
 @@ -21,6 +21,7 @@
  # Portreserve local policy
  #
@@ -20681,6 +20680,15 @@ diff -b -B --ignore-all-space --exclude-
  allow portreserve_t self:fifo_file rw_fifo_file_perms;
  allow portreserve_t self:unix_stream_socket create_stream_socket_perms;
  allow portreserve_t self:unix_dgram_socket { create_socket_perms sendto };
+@@ -37,6 +38,8 @@
+ manage_sock_files_pattern(portreserve_t, portreserve_var_run_t, portreserve_var_run_t)
+ files_pid_filetrans(portreserve_t, portreserve_var_run_t, { file sock_file })
+ 
++corecmd_getattr_bin_files(portreserve_t)
++
+ corenet_all_recvfrom_unlabeled(portreserve_t)
+ corenet_all_recvfrom_netlabel(portreserve_t)
+ corenet_tcp_bind_generic_node(portreserve_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.6.32/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/postfix.fc	2009-12-17 11:20:45.000000000 -0500
@@ -23260,7 +23268,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read NFS exported content.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.32/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/rpc.te	2009-12-21 17:41:53.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/rpc.te	2009-12-22 08:26:30.000000000 -0500
 @@ -37,8 +37,14 @@
  # rpc_exec_t is the type of rpc daemon programs.
  rpc_domain_template(rpcd)
@@ -23332,15 +23340,17 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`nfs_export_all_ro',`
  	dev_getattr_all_blk_files(nfsd_t)
-@@ -182,6 +199,7 @@
+@@ -181,7 +198,9 @@
+ kernel_read_system_state(gssd_t)
  kernel_read_network_state(gssd_t)
  kernel_read_network_state_symlinks(gssd_t)	
++kernel_request_load_module(gssd_t)	
  kernel_search_network_sysctl(gssd_t)	
 +kernel_signal(gssd_t)	
  
  corecmd_exec_bin(gssd_t)
  
-@@ -189,8 +207,10 @@
+@@ -189,8 +208,10 @@
  fs_rw_rpc_sockets(gssd_t) 
  fs_read_rpc_files(gssd_t) 
  
@@ -23351,7 +23361,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(gssd_t)
  auth_manage_cache(gssd_t) 
-@@ -199,10 +219,14 @@
+@@ -199,10 +220,14 @@
  
  mount_signal(gssd_t)
  
@@ -27658,7 +27668,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/nxserver/home/\.Xauthority.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.32/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-12-18 14:57:53.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-12-22 09:47:51.000000000 -0500
 @@ -74,6 +74,13 @@
  
  	domtrans_pattern($2, iceauth_exec_t, iceauth_t)
@@ -28148,7 +28158,7 @@ diff -b -B --ignore-all-space --exclude-
  	domtrans_pattern($1, xserver_exec_t, xserver_t)
  ')
  
-@@ -1248,6 +1409,288 @@
+@@ -1248,6 +1409,316 @@
  
  ########################################
  ## <summary>
@@ -28297,6 +28307,34 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +')
 +
++########################################
++## <summary>
++##	append to .xsession-errors file
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit
++##	</summary>
++## </param>
++#
++interface(`xserver_append_xdm_home_files',`
++	gen_require(`
++		type xdm_home_t;
++		type xserver_tmp_t;
++	')
++
++	allow $1 xdm_home_t:file append_file_perms;
++	allow $1 xserver_tmp_t:file append_file_perms;
++
++	tunable_policy(`use_nfs_home_dirs',`
++		fs_append_nfs_files($1)
++	')
++
++	tunable_policy(`use_samba_home_dirs',`
++		fs_append_cifs_files($1)
++	')
++')
++
 +
 +#######################################
 +## <summary>
@@ -28437,7 +28475,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Interface to provide X object permissions on a given X server to
  ##	an X client domain.  Gives the domain complete control over the
  ##	display.
-@@ -1261,7 +1704,103 @@
+@@ -1261,7 +1732,103 @@
  interface(`xserver_unconfined',`
  	gen_require(`
  		attribute xserver_unconfined_type;
@@ -31433,7 +31471,7 @@ diff -b -B --ignore-all-space --exclude-
 +permissive kdump_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-21 13:42:25.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-22 08:51:17.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -31756,7 +31794,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/usr/lib(64)?/nmm/liba52\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
-+/usr/lib(64)?/chromium-browser/libsandbox\.so 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/chromium-browser/.*\.so 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.6.32/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-12-17 11:20:47.000000000 -0500
@@ -32684,11 +32722,16 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.6.32/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/mount.if	2009-12-17 11:20:47.000000000 -0500
-@@ -20,6 +20,60 @@
++++ serefpolicy-3.6.32/policy/modules/system/mount.if	2009-12-22 09:40:10.000000000 -0500
+@@ -16,6 +16,61 @@
+ 	')
  
- ########################################
- ## <summary>
+ 	domtrans_pattern($1, mount_exec_t, mount_t)
++	mount_domtrans_fusermount($1)
++')
++
++########################################
++## <summary>
 +##	Execute fusermount in the mount domain.
 +## </summary>
 +## <param name="domain">
@@ -32739,14 +32782,10 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	dontaudit $1 fusermount_exec_t:file exec_file_perms;
-+')
-+
-+########################################
-+## <summary>
- ##	Execute mount in the mount domain, and
- ##	allow the specified role the mount domain,
- ##	and use the caller's terminal.
-@@ -51,6 +105,32 @@
+ ')
+ 
+ ########################################
+@@ -51,6 +107,32 @@
  
  ########################################
  ## <summary>
@@ -32779,7 +32818,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Execute mount in the caller domain.
  ## </summary>
  ## <param name="domain">
-@@ -84,9 +164,11 @@
+@@ -84,9 +166,11 @@
  interface(`mount_signal',`
  	gen_require(`
  		type mount_t;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -p -r1.985 -r1.986
--- selinux-policy.spec	21 Dec 2009 22:53:30 -0000	1.985
+++ selinux-policy.spec	22 Dec 2009 17:16:16 -0000	1.986
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 61%{?dist}
+Release: 62%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,10 +449,15 @@ exit 0
 %endif
 
 %changelog
+* Tue Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-62
+- Add label for /var/ekpd
+- Allow portreserve to look at bin files
+- Allow gssd to ask the kernel to load modules
+- If you can run mount you can run fusermount
+
 * Mon Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-61
 - Fixes for sandbox_x_server
 - Fix ntop policy
-- Allow screen to use fprintd
 - Sandbox fixes
 
 * Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-60



From dwalsh at fedoraproject.org  Tue Dec 22 17:16:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 22 Dec 2009 17:16:45 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.44,
	1.45 modules-targeted.conf, 1.153, 1.154
Message-ID: <20091222171645.491A211C00E9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11300

Modified Files:
	modules-minimum.conf modules-targeted.conf 
Log Message:
* Tue Dec 22 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-3
- Add back xserver_manage_home_fonts



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- modules-minimum.conf	21 Dec 2009 22:53:06 -0000	1.44
+++ modules-minimum.conf	22 Dec 2009 17:16:45 -0000	1.45
@@ -2009,6 +2009,20 @@ xguest = module
 # 
 courier = module
 
+# Layer: services
+# Module: cgroup
+#
+# Tools and libraries to control and monitor control groups
+# 
+cgroup = module
+
+# Layer: services
+# Module: denyhosts
+#
+#  script to help thwart ssh server attacks
+# 
+denyhosts = module
+
 # Layer: apps
 # Module: livecd
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- modules-targeted.conf	21 Dec 2009 22:53:06 -0000	1.153
+++ modules-targeted.conf	22 Dec 2009 17:16:45 -0000	1.154
@@ -2009,6 +2009,20 @@ xguest = module
 # 
 courier = module
 
+# Layer: services
+# Module: cgroup
+#
+# Tools and libraries to control and monitor control groups
+# 
+cgroup = module
+
+# Layer: services
+# Module: denyhosts
+#
+#  script to help thwart ssh server attacks
+# 
+denyhosts = module
+
 # Layer: apps
 # Module: livecd
 #



From sagarun at fedoraproject.org  Tue Dec 22 17:17:00 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Tue, 22 Dec 2009 17:17:00 +0000 (UTC)
Subject: rpms/emacs-haskell-mode/devel emacs-haskell-mode.spec, NONE,
	1.1 haskell-mode-init.el, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222171700.DAF1B11C00E9@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-haskell-mode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10990/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-haskell-mode.spec haskell-mode-init.el import.log 
Log Message:
Commiting new package emacs-haskell-mode 2.7.0-3



--- NEW FILE emacs-haskell-mode.spec ---
%global pkg haskell-mode
%global pkgname Haskell-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:		emacs-%{pkg}
Version:	2.7.0
Release:	3%{?dist}
Summary:	Haskell editing mode for Emacs

Group:		Applications/Editors
License:	GPLv3
URL:		http://projects.haskell.org/haskellmode-emacs/

Source0:	http://projects.haskell.org/haskellmode-emacs/haskell-mode-%{version}.tar.gz
Source1:	haskell-mode-init.el
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version}

%description
This package adds a Haskell major mode to Emacs.  The Haskell mode
supports font locking, declaration scanning, documentation,
indentation, and interaction with Hugs and GHCi.

%package el
Summary:	Elisp source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
Haskell-mode under GNU Emacs.

%prep
%setup -q -n %{pkg}-%{version}
%{__rm} -rf haskell-site-file.el~

%build
emacs --batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile *.el

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}
%{__install} -pm 644 %{_builddir}/%{pkg}-%{version}/*.elc %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 644 %{_builddir}/%{pkg}-%{version}/*.el %{buildroot}%{emacs_lispdir}/%{pkg}/	 
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog NEWS
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Sat Dec 12 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-3
- Fixed installation in centos

* Mon Dec 7 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-2
- Fixed installation failure in EL-5

* Sat Dec 5 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-1
- Updated to version 2.7.0-1

* Sun Nov 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.5.1-2
- Patch1 is moved to Source1

* Thu Oct 29 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.5.1-1
- Updated to version 2.5.1

* Sun Aug 17 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-5.20090815cvs
- Patch0 updated to include haskell-indentation-mode .
- Source0 changed,comment added for generating the source.
- Cleaned up CVS snapshot for control characters.
- Defined snapshot macro. 

* Sun Aug 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-4.20090815cvs
- Fixed the snapshot date.

* Sat Aug 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-3.20090815cvs
- Updated to Bugfix CVS snapshot 2.4-3.20091015cvs.
- Changelog fixed.

* Thu Aug 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-2
- Fixed the Makefile.
- Cleaned the upstream source.
- Spec file updated.

* Mon Aug 11 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-1
- Updated to haskell-mode 2.4
- Spec file is adjusted according to Fedora packaging guidelines.
- Added patch to generate haskell-mode-init.el.
- Added patch to modify the makefile. 

* Wed Feb 14 2007 Tom Moertel <tom [AT] moertel dot com> - 2.3-1.tgm
- Updated to haskell-mode 2.3

* Mon Feb 12 2007 Tom Moertel <tom [AT] moertel dot com> - 2.2-2.tgm
- Removed version suffix from package's site-lisp subdirectory
- Switched to using the default site file from the haskell-mode tarball

* Mon Feb 12 2007 Tom Moertel <tom [AT] moertel dot com> - 2.2-1.tgm
- Updated to haskell-mode 2.2
- Added NEWS, ChangeLog, and README to package docs

* Wed Nov  9 2005 Tom Moertel <tom [AT] moertel dot com> - 2.1-1.tgm
- Updated for haskell-mode 2.1

* Mon Apr 25 2005 Tom Moertel <tom [AT] moertel dot com> - 2.0-1.tgm
- Updated for haskell-mode 2.0

* Sat Nov 13 2004 Tom Moertel <tom [AT] moertel dot com> 1.45-2.tgm
- Merged changes from Carwyn Edwards <tom [AT] moertel dot com>:
- Fixed permissions on installed files
- Install non bytecode compiled versions too
- Rewrote emacs byte compilation method

* Mon May  3 2004 Tom Moertel <tom [AT] moertel dot com> 1.45-1.tgm
- Updated to 1.45 of haskell-mode
- Made GHCi the default for interactive mode (instead of Hugs)

* Wed Nov  6 2002 Tom Moertel <tom [AT] moertel dot com>
- Removed prompt and alignment patches because they are now merged into
  the main distribution

* Mon Sep  2 2002 Tom Moertel <tom [AT] moertel dot com>
- Revised patch to handle ModuleA ModuleB ... > prompts

* Sat Aug 31 2002 Tom Moertel <tom [AT] moertel dot com>
- Added patch to handle new *ModuleName> prompts

* Tue Jul 23 2002 Tom Moertel <tom [AT] moertel dot com>
- Added support for aligning rhsides on a given column

* Fri Mar 22 2002 Tom Moertel <tom [AT] moertel dot com>
- Created spec file
- Added README.RPM 
- Added site-lisp/site-start.d init file for emacs-haskell-mode


--- NEW FILE haskell-mode-init.el ---
;;; Set up Haskell mode for Emacs.
;;;
;;; This file is automatically loaded by emacs's site-start.el
;;; when you start a new emacs session.

(load "haskell-site-file")


--- NEW FILE import.log ---
emacs-haskell-mode-2_7_0-3_fc12:HEAD:emacs-haskell-mode-2.7.0-3.fc12.src.rpm:1261502078


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-haskell-mode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:04:23 -0000	1.1
+++ .cvsignore	22 Dec 2009 17:17:00 -0000	1.2
@@ -0,0 +1 @@
+haskell-mode-2.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-haskell-mode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:04:23 -0000	1.1
+++ sources	22 Dec 2009 17:17:00 -0000	1.2
@@ -0,0 +1 @@
+887e39bd0e79180b49188f6c4c72d0e3  haskell-mode-2.7.0.tar.gz



From sagarun at fedoraproject.org  Tue Dec 22 17:18:52 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Tue, 22 Dec 2009 17:18:52 +0000 (UTC)
Subject: rpms/emacs-haskell-mode/F-11 emacs-haskell-mode.spec, NONE,
	1.1 haskell-mode-init.el, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222171852.37FBC11C00E9@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-haskell-mode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11879/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-haskell-mode.spec haskell-mode-init.el import.log 
Log Message:
New package emacs-haskell-mode for F11 branch



--- NEW FILE emacs-haskell-mode.spec ---
%global pkg haskell-mode
%global pkgname Haskell-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:		emacs-%{pkg}
Version:	2.7.0
Release:	3%{?dist}
Summary:	Haskell editing mode for Emacs

Group:		Applications/Editors
License:	GPLv3
URL:		http://projects.haskell.org/haskellmode-emacs/

Source0:	http://projects.haskell.org/haskellmode-emacs/haskell-mode-%{version}.tar.gz
Source1:	haskell-mode-init.el
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version}

%description
This package adds a Haskell major mode to Emacs.  The Haskell mode
supports font locking, declaration scanning, documentation,
indentation, and interaction with Hugs and GHCi.

%package el
Summary:	Elisp source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
Haskell-mode under GNU Emacs.

%prep
%setup -q -n %{pkg}-%{version}
%{__rm} -rf haskell-site-file.el~

%build
emacs --batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile *.el

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}
%{__install} -pm 644 %{_builddir}/%{pkg}-%{version}/*.elc %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 644 %{_builddir}/%{pkg}-%{version}/*.el %{buildroot}%{emacs_lispdir}/%{pkg}/	 
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog NEWS
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Sat Dec 12 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-3
- Fixed installation in centos

* Mon Dec 7 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-2
- Fixed installation failure in EL-5

* Sat Dec 5 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-1
- Updated to version 2.7.0-1

* Sun Nov 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.5.1-2
- Patch1 is moved to Source1

* Thu Oct 29 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.5.1-1
- Updated to version 2.5.1

* Sun Aug 17 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-5.20090815cvs
- Patch0 updated to include haskell-indentation-mode .
- Source0 changed,comment added for generating the source.
- Cleaned up CVS snapshot for control characters.
- Defined snapshot macro. 

* Sun Aug 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-4.20090815cvs
- Fixed the snapshot date.

* Sat Aug 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-3.20090815cvs
- Updated to Bugfix CVS snapshot 2.4-3.20091015cvs.
- Changelog fixed.

* Thu Aug 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-2
- Fixed the Makefile.
- Cleaned the upstream source.
- Spec file updated.

* Mon Aug 11 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-1
- Updated to haskell-mode 2.4
- Spec file is adjusted according to Fedora packaging guidelines.
- Added patch to generate haskell-mode-init.el.
- Added patch to modify the makefile. 

* Wed Feb 14 2007 Tom Moertel <tom [AT] moertel dot com> - 2.3-1.tgm
- Updated to haskell-mode 2.3

* Mon Feb 12 2007 Tom Moertel <tom [AT] moertel dot com> - 2.2-2.tgm
- Removed version suffix from package's site-lisp subdirectory
- Switched to using the default site file from the haskell-mode tarball

* Mon Feb 12 2007 Tom Moertel <tom [AT] moertel dot com> - 2.2-1.tgm
- Updated to haskell-mode 2.2
- Added NEWS, ChangeLog, and README to package docs

* Wed Nov  9 2005 Tom Moertel <tom [AT] moertel dot com> - 2.1-1.tgm
- Updated for haskell-mode 2.1

* Mon Apr 25 2005 Tom Moertel <tom [AT] moertel dot com> - 2.0-1.tgm
- Updated for haskell-mode 2.0

* Sat Nov 13 2004 Tom Moertel <tom [AT] moertel dot com> 1.45-2.tgm
- Merged changes from Carwyn Edwards <tom [AT] moertel dot com>:
- Fixed permissions on installed files
- Install non bytecode compiled versions too
- Rewrote emacs byte compilation method

* Mon May  3 2004 Tom Moertel <tom [AT] moertel dot com> 1.45-1.tgm
- Updated to 1.45 of haskell-mode
- Made GHCi the default for interactive mode (instead of Hugs)

* Wed Nov  6 2002 Tom Moertel <tom [AT] moertel dot com>
- Removed prompt and alignment patches because they are now merged into
  the main distribution

* Mon Sep  2 2002 Tom Moertel <tom [AT] moertel dot com>
- Revised patch to handle ModuleA ModuleB ... > prompts

* Sat Aug 31 2002 Tom Moertel <tom [AT] moertel dot com>
- Added patch to handle new *ModuleName> prompts

* Tue Jul 23 2002 Tom Moertel <tom [AT] moertel dot com>
- Added support for aligning rhsides on a given column

* Fri Mar 22 2002 Tom Moertel <tom [AT] moertel dot com>
- Created spec file
- Added README.RPM 
- Added site-lisp/site-start.d init file for emacs-haskell-mode


--- NEW FILE haskell-mode-init.el ---
;;; Set up Haskell mode for Emacs.
;;;
;;; This file is automatically loaded by emacs's site-start.el
;;; when you start a new emacs session.

(load "haskell-site-file")


--- NEW FILE import.log ---
emacs-haskell-mode-2_7_0-3_fc12:F-11:emacs-haskell-mode-2.7.0-3.fc12.src.rpm:1261502248


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-haskell-mode/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:04:23 -0000	1.1
+++ .cvsignore	22 Dec 2009 17:18:52 -0000	1.2
@@ -0,0 +1 @@
+haskell-mode-2.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-haskell-mode/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:04:23 -0000	1.1
+++ sources	22 Dec 2009 17:18:52 -0000	1.2
@@ -0,0 +1 @@
+887e39bd0e79180b49188f6c4c72d0e3  haskell-mode-2.7.0.tar.gz



From crobinso at fedoraproject.org  Tue Dec 22 17:20:34 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 22 Dec 2009 17:20:34 +0000 (UTC)
Subject: rpms/virt-manager/F-11
	virt-manager-0.7.0-choosecd-storage-modal.patch, NONE,
	1.1 virt-manager-0.7.0-fullscreen-prev-size.patch, NONE,
	1.1 virt-manager.spec, 1.54, 1.55
Message-ID: <20091222172034.E1EBF11C00E9@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12549

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.7.0-choosecd-storage-modal.patch 
	virt-manager-0.7.0-fullscreen-prev-size.patch 
Log Message:
Don't show storage browser behind CD dialog (bz 529217)
Revert to previous VNC size after leaving fullscreen (bz 503150)


virt-manager-0.7.0-choosecd-storage-modal.patch:
 vmm-storage-browse.glade |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE virt-manager-0.7.0-choosecd-storage-modal.patch ---
diff -rup virt-manager-0.7.0/src/vmm-storage-browse.glade new/src/vmm-storage-browse.glade
--- virt-manager-0.7.0/src/vmm-storage-browse.glade	2009-03-09 23:38:37.000000000 -0400
+++ new/src/vmm-storage-browse.glade	2009-12-22 11:08:54.418514000 -0500
@@ -9,6 +9,7 @@
     <property name="default_width">750</property>
     <property name="default_height">500</property>
     <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
     <signal name="delete_event" handler="on_vmm_storage_browse_delete_event"/>
     <child>
       <widget class="GtkAlignment" id="alignment1">

virt-manager-0.7.0-fullscreen-prev-size.patch:
 details.py |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE virt-manager-0.7.0-fullscreen-prev-size.patch ---
diff -rup virt-manager-0.7.0/src/virtManager/details.py new/src/virtManager/details.py
--- virt-manager-0.7.0/src/virtManager/details.py	2009-12-22 11:55:23.996901000 -0500
+++ new/src/virtManager/details.py	2009-12-22 12:05:51.490114000 -0500
@@ -469,14 +469,7 @@ class vmmDetails(gobject.GObject):
         self.window.get_widget("control-fullscreen").set_active(src.get_active())
         if src.get_active():
 
-            # if scaling is enabled make sure we fit onto the root window
-            if self.vncViewer.get_scaling():
-                ignore, h = self.window.get_widget("menubar3").size_request()
-                rootw = src.get_screen().get_width()
-                rooth = src.get_screen().get_height() - h
-                self.vncViewer.set_size_request(rootw, rooth)
-            else:
-                self.vncViewer.set_size_request(-1, -1)
+            self.vncViewer.set_size_request(-1, -1)
 
             self.window.get_widget("vmm-details").fullscreen()
             if self.config.get_console_keygrab() == 1:


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-11/virt-manager.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- virt-manager.spec	5 Oct 2009 19:19:56 -0000	1.54
+++ virt-manager.spec	22 Dec 2009 17:20:34 -0000	1.55
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.7.0
-Release: 7%{_extra_release}
+Release: 8%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -45,6 +45,10 @@ Patch19: %{name}-%{version}-pylint-scrip
 Patch20: %{name}-%{version}-fix-vcpu-hotplug.patch
 # Allow memory hotplug for KVM (bz 524297)
 Patch21: %{name}-%{version}-remove-hotplug-checks.patch
+# Don't show storage browser behind CD dialog (bz 529217)
+Patch22: %{name}-%{version}-choosecd-storage-modal.patch
+# Revert to previous VNC size after leaving fullscreen (bz 503150)
+Patch23: %{name}-%{version}-fullscreen-prev-size.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -138,6 +142,8 @@ management API.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 %build
 %configure
@@ -215,6 +221,10 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Tue Dec 22 2009 Cole Robinson <crobinso at redhat.com> - 0.7.0-8.fc11
+- Don't show storage browser behind CD dialog (bz 529217)
+- Revert to previous VNC size after leaving fullscreen (bz 503150)
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.7.0-7.fc11
 - Fix typo in vcpu hotplug
 - Allow memory hotplug for KVM (bz 524297)



From sagarun at fedoraproject.org  Tue Dec 22 17:21:23 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Tue, 22 Dec 2009 17:21:23 +0000 (UTC)
Subject: rpms/emacs-haskell-mode/F-12 emacs-haskell-mode.spec, NONE,
	1.1 haskell-mode-init.el, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222172123.8082711C00E9@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-haskell-mode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12715/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-haskell-mode.spec haskell-mode-init.el import.log 
Log Message:
New package emacs-haskell-mode for F12 branch



--- NEW FILE emacs-haskell-mode.spec ---
%global pkg haskell-mode
%global pkgname Haskell-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:		emacs-%{pkg}
Version:	2.7.0
Release:	3%{?dist}
Summary:	Haskell editing mode for Emacs

Group:		Applications/Editors
License:	GPLv3
URL:		http://projects.haskell.org/haskellmode-emacs/

Source0:	http://projects.haskell.org/haskellmode-emacs/haskell-mode-%{version}.tar.gz
Source1:	haskell-mode-init.el
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version}

%description
This package adds a Haskell major mode to Emacs.  The Haskell mode
supports font locking, declaration scanning, documentation,
indentation, and interaction with Hugs and GHCi.

%package el
Summary:	Elisp source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
Haskell-mode under GNU Emacs.

%prep
%setup -q -n %{pkg}-%{version}
%{__rm} -rf haskell-site-file.el~

%build
emacs --batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile *.el

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}
%{__install} -pm 644 %{_builddir}/%{pkg}-%{version}/*.elc %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 644 %{_builddir}/%{pkg}-%{version}/*.el %{buildroot}%{emacs_lispdir}/%{pkg}/	 
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog NEWS
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Sat Dec 12 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-3
- Fixed installation in centos

* Mon Dec 7 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-2
- Fixed installation failure in EL-5

* Sat Dec 5 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-1
- Updated to version 2.7.0-1

* Sun Nov 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.5.1-2
- Patch1 is moved to Source1

* Thu Oct 29 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.5.1-1
- Updated to version 2.5.1

* Sun Aug 17 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-5.20090815cvs
- Patch0 updated to include haskell-indentation-mode .
- Source0 changed,comment added for generating the source.
- Cleaned up CVS snapshot for control characters.
- Defined snapshot macro. 

* Sun Aug 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-4.20090815cvs
- Fixed the snapshot date.

* Sat Aug 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-3.20090815cvs
- Updated to Bugfix CVS snapshot 2.4-3.20091015cvs.
- Changelog fixed.

* Thu Aug 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-2
- Fixed the Makefile.
- Cleaned the upstream source.
- Spec file updated.

* Mon Aug 11 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-1
- Updated to haskell-mode 2.4
- Spec file is adjusted according to Fedora packaging guidelines.
- Added patch to generate haskell-mode-init.el.
- Added patch to modify the makefile. 

* Wed Feb 14 2007 Tom Moertel <tom [AT] moertel dot com> - 2.3-1.tgm
- Updated to haskell-mode 2.3

* Mon Feb 12 2007 Tom Moertel <tom [AT] moertel dot com> - 2.2-2.tgm
- Removed version suffix from package's site-lisp subdirectory
- Switched to using the default site file from the haskell-mode tarball

* Mon Feb 12 2007 Tom Moertel <tom [AT] moertel dot com> - 2.2-1.tgm
- Updated to haskell-mode 2.2
- Added NEWS, ChangeLog, and README to package docs

* Wed Nov  9 2005 Tom Moertel <tom [AT] moertel dot com> - 2.1-1.tgm
- Updated for haskell-mode 2.1

* Mon Apr 25 2005 Tom Moertel <tom [AT] moertel dot com> - 2.0-1.tgm
- Updated for haskell-mode 2.0

* Sat Nov 13 2004 Tom Moertel <tom [AT] moertel dot com> 1.45-2.tgm
- Merged changes from Carwyn Edwards <tom [AT] moertel dot com>:
- Fixed permissions on installed files
- Install non bytecode compiled versions too
- Rewrote emacs byte compilation method

* Mon May  3 2004 Tom Moertel <tom [AT] moertel dot com> 1.45-1.tgm
- Updated to 1.45 of haskell-mode
- Made GHCi the default for interactive mode (instead of Hugs)

* Wed Nov  6 2002 Tom Moertel <tom [AT] moertel dot com>
- Removed prompt and alignment patches because they are now merged into
  the main distribution

* Mon Sep  2 2002 Tom Moertel <tom [AT] moertel dot com>
- Revised patch to handle ModuleA ModuleB ... > prompts

* Sat Aug 31 2002 Tom Moertel <tom [AT] moertel dot com>
- Added patch to handle new *ModuleName> prompts

* Tue Jul 23 2002 Tom Moertel <tom [AT] moertel dot com>
- Added support for aligning rhsides on a given column

* Fri Mar 22 2002 Tom Moertel <tom [AT] moertel dot com>
- Created spec file
- Added README.RPM 
- Added site-lisp/site-start.d init file for emacs-haskell-mode


--- NEW FILE haskell-mode-init.el ---
;;; Set up Haskell mode for Emacs.
;;;
;;; This file is automatically loaded by emacs's site-start.el
;;; when you start a new emacs session.

(load "haskell-site-file")


--- NEW FILE import.log ---
emacs-haskell-mode-2_7_0-3_fc12:F-12:emacs-haskell-mode-2.7.0-3.fc12.src.rpm:1261502378


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-haskell-mode/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:04:23 -0000	1.1
+++ .cvsignore	22 Dec 2009 17:21:23 -0000	1.2
@@ -0,0 +1 @@
+haskell-mode-2.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-haskell-mode/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:04:23 -0000	1.1
+++ sources	22 Dec 2009 17:21:23 -0000	1.2
@@ -0,0 +1 @@
+887e39bd0e79180b49188f6c4c72d0e3  haskell-mode-2.7.0.tar.gz



From sagarun at fedoraproject.org  Tue Dec 22 17:23:53 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Tue, 22 Dec 2009 17:23:53 +0000 (UTC)
Subject: rpms/emacs-haskell-mode/EL-5 emacs-haskell-mode.spec, NONE,
	1.1 haskell-mode-init.el, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222172353.2BDA111C00E9@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-haskell-mode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13284/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-haskell-mode.spec haskell-mode-init.el import.log 
Log Message:
New package emacs-haskell-mode for EPEL



--- NEW FILE emacs-haskell-mode.spec ---
%global pkg haskell-mode
%global pkgname Haskell-mode

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:		emacs-%{pkg}
Version:	2.7.0
Release:	3%{?dist}
Summary:	Haskell editing mode for Emacs

Group:		Applications/Editors
License:	GPLv3
URL:		http://projects.haskell.org/haskellmode-emacs/

Source0:	http://projects.haskell.org/haskellmode-emacs/haskell-mode-%{version}.tar.gz
Source1:	haskell-mode-init.el
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el
Requires:	emacs >= %{emacs_version}

%description
This package adds a Haskell major mode to Emacs.  The Haskell mode
supports font locking, declaration scanning, documentation,
indentation, and interaction with Hugs and GHCi.

%package el
Summary:	Elisp source files for %{pkgname} under GNU Emacs
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
Haskell-mode under GNU Emacs.

%prep
%setup -q -n %{pkg}-%{version}
%{__rm} -rf haskell-site-file.el~

%build
emacs --batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile *.el

%install
%{__rm} -rf %{buildroot}
%{__install} -pm 755 -d %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}
%{__install} -pm 644 %{_builddir}/%{pkg}-%{version}/*.elc %{buildroot}%{emacs_lispdir}/%{pkg}/
%{__install} -pm 644 %{_builddir}/%{pkg}-%{version}/*.el %{buildroot}%{emacs_lispdir}/%{pkg}/	 
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{emacs_startdir}


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog NEWS
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/%{pkg}-init.el
%dir %{emacs_lispdir}/%{pkg}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Sat Dec 12 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-3
- Fixed installation in centos

* Mon Dec 7 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-2
- Fixed installation failure in EL-5

* Sat Dec 5 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.7.0-1
- Updated to version 2.7.0-1

* Sun Nov 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.5.1-2
- Patch1 is moved to Source1

* Thu Oct 29 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.5.1-1
- Updated to version 2.5.1

* Sun Aug 17 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-5.20090815cvs
- Patch0 updated to include haskell-indentation-mode .
- Source0 changed,comment added for generating the source.
- Cleaned up CVS snapshot for control characters.
- Defined snapshot macro. 

* Sun Aug 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-4.20090815cvs
- Fixed the snapshot date.

* Sat Aug 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-3.20090815cvs
- Updated to Bugfix CVS snapshot 2.4-3.20091015cvs.
- Changelog fixed.

* Thu Aug 13 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-2
- Fixed the Makefile.
- Cleaned the upstream source.
- Spec file updated.

* Mon Aug 11 2009 Arun SAG <sagarun [AT] gmail dot com> - 2.4-1
- Updated to haskell-mode 2.4
- Spec file is adjusted according to Fedora packaging guidelines.
- Added patch to generate haskell-mode-init.el.
- Added patch to modify the makefile. 

* Wed Feb 14 2007 Tom Moertel <tom [AT] moertel dot com> - 2.3-1.tgm
- Updated to haskell-mode 2.3

* Mon Feb 12 2007 Tom Moertel <tom [AT] moertel dot com> - 2.2-2.tgm
- Removed version suffix from package's site-lisp subdirectory
- Switched to using the default site file from the haskell-mode tarball

* Mon Feb 12 2007 Tom Moertel <tom [AT] moertel dot com> - 2.2-1.tgm
- Updated to haskell-mode 2.2
- Added NEWS, ChangeLog, and README to package docs

* Wed Nov  9 2005 Tom Moertel <tom [AT] moertel dot com> - 2.1-1.tgm
- Updated for haskell-mode 2.1

* Mon Apr 25 2005 Tom Moertel <tom [AT] moertel dot com> - 2.0-1.tgm
- Updated for haskell-mode 2.0

* Sat Nov 13 2004 Tom Moertel <tom [AT] moertel dot com> 1.45-2.tgm
- Merged changes from Carwyn Edwards <tom [AT] moertel dot com>:
- Fixed permissions on installed files
- Install non bytecode compiled versions too
- Rewrote emacs byte compilation method

* Mon May  3 2004 Tom Moertel <tom [AT] moertel dot com> 1.45-1.tgm
- Updated to 1.45 of haskell-mode
- Made GHCi the default for interactive mode (instead of Hugs)

* Wed Nov  6 2002 Tom Moertel <tom [AT] moertel dot com>
- Removed prompt and alignment patches because they are now merged into
  the main distribution

* Mon Sep  2 2002 Tom Moertel <tom [AT] moertel dot com>
- Revised patch to handle ModuleA ModuleB ... > prompts

* Sat Aug 31 2002 Tom Moertel <tom [AT] moertel dot com>
- Added patch to handle new *ModuleName> prompts

* Tue Jul 23 2002 Tom Moertel <tom [AT] moertel dot com>
- Added support for aligning rhsides on a given column

* Fri Mar 22 2002 Tom Moertel <tom [AT] moertel dot com>
- Created spec file
- Added README.RPM 
- Added site-lisp/site-start.d init file for emacs-haskell-mode


--- NEW FILE haskell-mode-init.el ---
;;; Set up Haskell mode for Emacs.
;;;
;;; This file is automatically loaded by emacs's site-start.el
;;; when you start a new emacs session.

(load "haskell-site-file")


--- NEW FILE import.log ---
emacs-haskell-mode-2_7_0-3_fc12:EL-5:emacs-haskell-mode-2.7.0-3.fc12.src.rpm:1261502532


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-haskell-mode/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:04:23 -0000	1.1
+++ .cvsignore	22 Dec 2009 17:23:52 -0000	1.2
@@ -0,0 +1 @@
+haskell-mode-2.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-haskell-mode/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:04:23 -0000	1.1
+++ sources	22 Dec 2009 17:23:53 -0000	1.2
@@ -0,0 +1 @@
+887e39bd0e79180b49188f6c4c72d0e3  haskell-mode-2.7.0.tar.gz



From dwalsh at fedoraproject.org  Tue Dec 22 17:25:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 22 Dec 2009 17:25:13 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.19,1.20
Message-ID: <20091222172513.C9CFD11C00E9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13625

Modified Files:
	policy-F13.patch 
Log Message:
* Tue Dec 22 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-3
- Add back xserver_manage_home_fonts


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  340 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  370 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  236 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  121 +-
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   35 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   52 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   22 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   91 +
 policy/modules/services/denyhosts.te      |   71 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   25 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   31 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   50 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   18 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  284 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  353 ++++++
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  300 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  194 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   15 
 377 files changed, 20037 insertions(+), 2756 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- policy-F13.patch	22 Dec 2009 17:16:12 -0000	1.19
+++ policy-F13.patch	22 Dec 2009 17:25:13 -0000	1.20
@@ -26105,7 +26105,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/var/lib/nxserver/home/\.Xauthority.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.7.5/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/xserver.if	2009-12-22 09:50:42.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/xserver.if	2009-12-22 12:24:34.000000000 -0500
 @@ -56,6 +56,13 @@
  
  	domtrans_pattern($2, iceauth_exec_t, iceauth_t)
@@ -26199,7 +26199,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -1219,3 +1232,301 @@
+@@ -1219,3 +1232,329 @@
  	typeattribute $1 x_domain;
  	typeattribute $1 xserver_unconfined_type;
  ')
@@ -26234,6 +26234,34 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +########################################
 +## <summary>
++##	append to .xsession-errors file
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit
++##	</summary>
++## </param>
++#
++interface(`xserver_append_xdm_home_files',`
++	gen_require(`
++		type xdm_home_t;
++		type xserver_tmp_t;
++	')
++
++	allow $1 xdm_home_t:file append_file_perms;
++	allow $1 xserver_tmp_t:file append_file_perms;
++
++	tunable_policy(`use_nfs_home_dirs',`
++		fs_append_nfs_files($1)
++	')
++
++	tunable_policy(`use_samba_home_dirs',`
++		fs_append_cifs_files($1)
++	')
++')
++
++########################################
++## <summary>
 +##	Manage the xdm_spool files
 +## </summary>
 +## <param name="domain">



From mbarnes at fedoraproject.org  Tue Dec 22 17:32:02 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 22 Dec 2009 17:32:02 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.430,1.431
Message-ID: <20091222173202.3ED5311C00E9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14884

Modified Files:
	evolution.spec 
Log Message:
Bump release.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -p -r1.430 -r1.431
--- evolution.spec	22 Dec 2009 17:09:23 -0000	1.430
+++ evolution.spec	22 Dec 2009 17:32:01 -0000	1.431
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.29.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL



From twaugh at fedoraproject.org  Tue Dec 22 17:33:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 17:33:20 +0000 (UTC)
Subject: File hplip-3.9.12.tar.gz uploaded to lookaside cache by twaugh
Message-ID: <20091222173320.8AB4C10F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for hplip:

2b0906b4a57b437988829557ca62adfd  hplip-3.9.12.tar.gz



From sergiopr at fedoraproject.org  Tue Dec 22 17:33:26 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 22 Dec 2009 17:33:26 +0000 (UTC)
Subject: rpms/xpa/F-12 xpa-makefile.patch,1.1,1.2 xpa.spec,1.27,1.28
Message-ID: <20091222173326.4592511C00E9@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/xpa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15405

Modified Files:
	xpa-makefile.patch xpa.spec 
Log Message:
* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.11-1
- New upstream source


xpa-makefile.patch:
 Makefile.in |   69 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 23 deletions(-)

Index: xpa-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/F-12/xpa-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xpa-makefile.patch	10 Sep 2009 16:02:20 -0000	1.1
+++ xpa-makefile.patch	22 Dec 2009 17:33:26 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur xpa-2.1.10/Makefile.in xpa.am/Makefile.in
---- xpa-2.1.10/Makefile.in	2009-08-22 23:12:11.000000000 +0200
-+++ xpa.am/Makefile.in	2009-09-10 17:52:59.000000000 +0200
+diff -ur xpa-2.1.11/Makefile.in xpa-2.1.11.new/Makefile.in
+--- xpa-2.1.11/Makefile.in	2009-10-05 18:46:56.000000000 +0200
++++ xpa-2.1.11.new/Makefile.in	2009-12-22 15:05:06.000000000 +0100
 @@ -37,19 +37,19 @@
  INSTALL_ROOT =
  
@@ -26,7 +26,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  
  # Platform-specific X compiler flags (include file specifications)
  X_CFLAGS = 		@X_CFLAGS@
-@@ -102,6 +102,31 @@
+@@ -102,6 +102,29 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
@@ -53,12 +53,10 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
 +target_alias = @target_alias@
 +# end
 +
-+
-+
  #----------------------------------------------------------------
  # The information below is modified by the configure script when
  # Makefile is generated from Makefile.in.  You shouldn't normally
-@@ -147,7 +172,7 @@
+@@ -147,7 +170,7 @@
  
  # used in link line
  # LLIB=	$(LIB)
@@ -67,7 +65,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  
  PROGS =		xpaset xpaget xpainfo xpaaccess xpans xpamb
  
-@@ -175,7 +200,7 @@
+@@ -175,7 +198,7 @@
  		$(RANLIB) $(LIB)
  
  shlib:		$(LIB)
@@ -76,8 +74,8 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
  		rm -f lib$(PACKAGE).tmp/xt*.o; \
  		rm -f lib$(PACKAGE).tmp/tcl*.o; \
-@@ -184,7 +209,7 @@
- 		rm -rf lib$(PACKAGE).tmp)
+@@ -192,7 +215,7 @@
+ 		-luser32 -lwsock32
  
  tclxpa:		$(LIB)
 -		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
@@ -85,7 +83,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
  		rm -f libtclxpa.tmp/xt*.o; \
  		CC='$(CC)' CXX=$(CXX) \
-@@ -204,34 +229,34 @@
+@@ -212,34 +235,34 @@
  		echo "pkg_mkIndex -direct -verbose . libtclxpa.so; exit"| tclsh)
  
  xpaset:		$(LIB) xpaset.o
@@ -130,7 +128,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  		$(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(LIBS)
  
  # Smoke test: allows end-users to quickly discern basic usability
-@@ -257,7 +282,7 @@
+@@ -265,7 +288,7 @@
  	   else \
  		echo "Installing $$i" ; \
  		$(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \
@@ -139,7 +137,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  	   fi; \
  	   done;)
  
-@@ -266,7 +291,7 @@
+@@ -274,7 +297,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
@@ -148,7 +146,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -274,7 +299,7 @@
+@@ -282,7 +305,7 @@
  	@echo "Installing $(LIB)";
  	@$(INSTALL_DATA) $(LIB) $(LIB_INSTALL_DIR)/$(LIB);
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(LIB));
@@ -157,7 +155,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  	@echo "Installing xpa.h"
  	@$(INSTALL_DATA) xpa.h $(INCLUDE_INSTALL_DIR)/xpa.h
  	@echo "Installing prsetup.h"
-@@ -288,7 +313,7 @@
+@@ -296,7 +319,7 @@
  install-man:
  	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
  	    echo "Making directory $(MAN_INSTALL_DIR)"; \
@@ -166,7 +164,7 @@ diff -ur xpa-2.1.10/Makefile.in xpa.am/M
  	    chmod 755 $(MAN_INSTALL_DIR); \
  	    else true; \
  	fi;
-@@ -299,7 +324,7 @@
+@@ -307,7 +330,7 @@
  		M="$(MAN_INSTALL_DIR)/man$$E"; \
  		if [ ! -d $$M ] ; then \
  		    echo "Making directory $$M"; \


Index: xpa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/F-12/xpa.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xpa.spec	10 Sep 2009 16:02:21 -0000	1.27
+++ xpa.spec	22 Dec 2009 17:33:26 -0000	1.28
@@ -2,7 +2,7 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name: xpa
-Version: 2.1.10
+Version: 2.1.11
 Release: 1%{?dist}
 Summary: The X Public Access messaging system
 
@@ -112,6 +112,9 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/*.a
 
 %changelog
+* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.11-1
+- New upstream source
+
 * Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.10-1
 - New upstream source
 



From sergiopr at fedoraproject.org  Tue Dec 22 17:42:01 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 22 Dec 2009 17:42:01 +0000 (UTC)
Subject: rpms/xpa/F-12 sources,1.5,1.6 xpa.spec,1.28,1.29
Message-ID: <20091222174201.1101211C00E9@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/xpa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16695

Modified Files:
	sources xpa.spec 
Log Message:
* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.11-1.1
- Missing file uploaded



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Sep 2009 16:02:20 -0000	1.5
+++ sources	22 Dec 2009 17:42:00 -0000	1.6
@@ -1 +1 @@
-af8c65ed96e672f7d4abd3492bdaa93c  xpa-2.1.10.tar.gz
+5af281bd1455739b3a15d949fdcc7adb  xpa-2.1.11.tar.gz


Index: xpa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/F-12/xpa.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xpa.spec	22 Dec 2009 17:33:26 -0000	1.28
+++ xpa.spec	22 Dec 2009 17:42:00 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name: xpa
 Version: 2.1.11
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Summary: The X Public Access messaging system
 
 Group: Applications/Engineering
@@ -112,6 +112,9 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/*.a
 
 %changelog
+* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.11-1.1
+- Missing file uploaded
+
 * Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.11-1
 - New upstream source
 



From mclasen at fedoraproject.org  Tue Dec 22 17:42:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:42:54 +0000 (UTC)
Subject: File file-roller-2.29.3.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222174254.5E75E10F8A5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for file-roller:

a766baa22cc0368b672fcfcf38f14f09  file-roller-2.29.3.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 17:44:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:44:25 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.94, 1.95 file-roller.spec, 1.164,
	1.165 sources, 1.95, 1.96
Message-ID: <20091222174425.6D8F511C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17140

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.29.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- .cvsignore	1 Dec 2009 14:48:36 -0000	1.94
+++ .cvsignore	22 Dec 2009 17:44:25 -0000	1.95
@@ -1 +1 @@
-file-roller-2.29.2.tar.bz2
+file-roller-2.29.3.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- file-roller.spec	14 Dec 2009 13:40:22 -0000	1.164
+++ file-roller.spec	22 Dec 2009 17:44:25 -0000	1.165
@@ -10,12 +10,12 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.29.2
-Release: 	3%{?dist}
+Version:	2.29.3
+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.28/file-roller-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/file-roller/2.29/file-roller-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -44,9 +44,6 @@ Requires: GConf2
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=604535
-Patch0: property-get.patch
-
 %description
 File Roller is an application for creating and viewing archives files,
 such as tar or zip files.
@@ -130,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> 2.29.3-1
+- Update to 2.29.3
+
 * Mon Dec 14 2009 Matthias Clasen <mclasen at redhat.com> 2.29.2-3
 - Fix a wrong use of gdk_property_get (#538535)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- sources	1 Dec 2009 14:48:36 -0000	1.95
+++ sources	22 Dec 2009 17:44:25 -0000	1.96
@@ -1 +1 @@
-c05b45ee5d1c7068a2835c9fee1594f4  file-roller-2.29.2.tar.bz2
+a766baa22cc0368b672fcfcf38f14f09  file-roller-2.29.3.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 17:46:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:46:35 +0000 (UTC)
Subject: File gdm-2.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222174635.8930610F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gdm:

70c6a4ea694662cf8d5da8b82c4e6cff  gdm-2.29.4.tar.bz2



From twaugh at fedoraproject.org  Tue Dec 22 17:46:48 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 22 Dec 2009 17:46:48 +0000 (UTC)
Subject: rpms/hplip/devel hplip-3.9.12.tar.gz.asc, NONE, 1.1 .cvsignore, 1.34, 
	1.35 hplip.spec, 1.249, 1.250 sources, 1.34,
	1.35 upstream-key.gpg, 1.1, 1.2 hplip-3.9.10.tar.gz.asc, 1.1,
	NONE hplip-hpcups-plugin.patch, 1.1, NONE
Message-ID: <20091222174648.40DBB11C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17673

Modified Files:
	.cvsignore hplip.spec sources upstream-key.gpg 
Added Files:
	hplip-3.9.12.tar.gz.asc 
Removed Files:
	hplip-3.9.10.tar.gz.asc hplip-hpcups-plugin.patch 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 3.9.12-1
- 3.9.12.  No longer need hpcups-plugin patch.



--- NEW FILE hplip-3.9.12.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAksn/zgACgkQc9dwzaWQR7nJUACgrL1YrF8ct7EEdAvDwhcsRHxi
Da4AnjHpD5VB3wwqYDEQp6Z0xGqDOhfO
=+b+Q
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	4 Nov 2009 16:43:29 -0000	1.34
+++ .cvsignore	22 Dec 2009 17:46:47 -0000	1.35
@@ -31,3 +31,4 @@ hplip-3.9.2.tar.gz
 hplip-3.9.6b.tar.gz
 hplip-3.9.8.tar.gz
 hplip-3.9.10.tar.gz
+hplip-3.9.12.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- hplip.spec	10 Dec 2009 16:44:09 -0000	1.249
+++ hplip.spec	22 Dec 2009 17:46:48 -0000	1.250
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.9.10
-Release: 5%{?dist}
+Version: 3.9.12
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,7 +19,6 @@ Patch4: hplip-no-asm.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch14: hplip-hpcups-sigpipe.patch
-Patch15: hplip-hpcups-plugin.patch
 Patch16: hplip-bad-low-ink-warning.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -127,10 +126,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Avoid busy loop in hpcups when backend has exited (bug #525944).
 %patch14 -p1 -b .hpcups-sigpipe
 
-# Added 'requires proprietary plugin' to appropriate model names
-# (bug #513283).
-%patch15 -p1 -b .hpcups-plugin
-
 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 %patch16 -p1 -b .bad-low-ink-warning
 
@@ -338,6 +333,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 3.9.12-1
+- 3.9.12.  No longer need hpcups-plugin patch.
+
 * Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 3.9.10-5
 - Reverted fix for bug #533462 until bug #541604 is solved.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	4 Nov 2009 16:43:29 -0000	1.34
+++ sources	22 Dec 2009 17:46:48 -0000	1.35
@@ -1 +1 @@
-de2c5e83794efdde10fca8379d2402a3  hplip-3.9.10.tar.gz
+2b0906b4a57b437988829557ca62adfd  hplip-3.9.12.tar.gz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/upstream-key.gpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- upstream-key.gpg	24 Jun 2009 09:22:12 -0000	1.1
+++ upstream-key.gpg	22 Dec 2009 17:46:48 -0000	1.2
@@ -1,30 +1,30 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-mQGiBEmsEsMRBADFqq0c+rVIhPMpxe2FOjej096uuS1ta0epuKdu1K0yuVJ7vrdI
-1PrRj7GJjdxfcDHYyDPhmohZbehiybG1l32S2IfaTMT/yJ//lxKbmOnscQY02RL8
-gh5ijIJjJRaALBpqSvnRkEdaglfcB906Bs9mHO0HuitF74q307Eos7p+LwCg9ewf
-kuNMxaNw4vOxlmykQ34rgUMD/RzrIdCzUC5UViiX4Z2rSvokOPDRgK8z3QEGMzo2
-V8vSkdEEe9uYIGPpAuQo+K0NlQ0ARkC1A9S/q0RzHCjEKgWpGoD6PKt8rkW0UjF0
-Qn5FU1rt3o1TmTHs1a5WwGuh8cLmGLH53UqL2y+BHllC+593a05kbaBcqva5lMZs
-4bmXBACFBww+OYSSJAAnL/KrNwPG4j6dozmEMai+L/dyd+bgucnDES9mSLugMJgb
-KfOeLIJpuEGdtwimrjo1lqRemTcSu6ZN8bkOPEjqOo87B1moL+03W0czRzKuW8Bs
-z1PbnVrtiCi35MlqLDJNLxfiH+LLG1xmGMR7CaqOgnJoKts5srQ0SFBMSVAgKEhQ
+mQGiBEsnpscRBACyclffkMVkXXdtY2qTT2+B6HN4hBoUxBwZBULyHFuSP9lsB7wK
+16Hl5ZTu+oy+GegzzFRrHWxBLN9i67T0plNkqDJhWUrmXR7xvX+dFc+Qrl+uPR0i
+CY1NMnWwnFh01YtYb9NAlb3bLn8RLBH8Zo60i7wfwdW9Wi1mgzmUT/UI9wCg7y6R
+VmF4RjNWJ2WRdL/jVeAB8H0D/0xfePoYWrSGzOp7+Vl+xYo5TdSrzohUUnly6xla
+UIKwlBCG/jpQqKH17803GpkFyh5FxG1Db7VWsciDv7flcBLPtn75gU2fPHXL+gnv
+r1eJ+ugQwCl4/8d4iJ5TMXmHQOW2Pd0U47OmbZYNNgtA+lXhF8n8+6w3GRhqubLF
+/9b/A/4wH37bv1shLhdLpP+9WYHc8z9+jmStVUFdAGoD/n6vOpBX+GQYaEY5Y8RS
+Wf0DFhMF6CFYNZ2ngDyvPt53M2jU7hrxXIfs/b5bLMqG2et9M/avdEWGUKTsC7wu
+0zeGtD07r9EA3WDIhxN9QEGZAq5Q3NSbedMHIVE4Ynq7VNCdsrQ0SFBMSVAgKEhQ
 IExpbnV4IEltYWdpbmcgYW5kIFByaW50aW5nKSA8aHBsaXBAaHAuY29tPohgBBMR
-AgAgBQJJrBLDAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQhA7anpATwAU/
-cACdGVT/nlI6lfu/Zu+RDaFcVoWin2UAniB0GDAxJ4CbexUOpp2Os9cyRWgMuQIN
-BEmsEsMQCAC+pa6E4uDxifvZMM41JbHb/ayxd/Th2Qfc/epXi0tpgm1viktR07AQ
-e7fFTRzfRHaS1JqE7Y9EBO6txEJhJkI5ix5PG/1TeteMiTHxB9CdDzyHEVbxx5HG
-ajYgKVpvK13HKTW+IDna5yJCNfZmPfZJxuQLjgI2dnPcFyv3OKAUJPKX7qmTqngY
-wi+wdsbznkp4D8sKVsLBqc1coHbOHGalAOuHissq7gtlSR4Wg/9BrkDeMVjLNTz6
-5BlPiVTZ7S2cLOhvINTZaelN03+vmSnt/0lmIs0gV+zPozct6/fD8WqQ9jd3XD1O
-7zUKnIRFmmw34kaZAI9SDUbcqc0Ajj+3AAMFB/9VoZCAPn2G6R28ZcKbvNtqz32+
-yd16QVvh1IR8f+1EmYecaZ1xbJqis2g6LC7e1brebOflDhFE6D6mIA5ojKETvzz4
-GKcHD7BwuK/3wFE8z5gU6EeWlQhorhPETZvfUDtKD8Vt1ys8EyC0RJ3aCgr+DTE5
-skzfyrmfb4m6I65eTGlOjIwGa+nQXSRKPRfiLRTqG6qTl85DEmNoPkauKZZfnJwd
-n6B2IWu2o22qHc2J4SfXxzRRRzyq1ALpR15xpijHmEP/TLVxsstIBKx3IRL0rDTd
-B8oVpL8ab1W6zFvR447s1BqJTMBDhQor6Tmxl5VXH+HQawJajETaNL/vcm0QiEkE
-GBECAAkFAkmsEsMCGwwACgkQhA7anpATwAV6uACgwkAczeBsAzcoETrSCULCQ+Gy
-28sAnA5Xi4CWi5YNNwvlw1AAS00TpNV6
-=BMWb
+AgAgBQJLJ6bHAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQc9dwzaWQR7n4
+dQCghZgIpxuTC+GhiQIO0dK9wTlbMmoAoOB252fEOvf73v8Ya8qmN1GlmYiXuQIN
+BEsnpscQCACEO/wh+X9Apok41vn+qby5YLvSuXNcub1iVSlsByv+28KQbbvXDNPh
+LP9wdO9DmzfIGwarj0uLtn0h9UWTnEpXSZ0bKJnCYc7GZpUvcNyjIuSs69hK2rLd
+38MSb1hoBaICLjZERUhe+ZGwlx7zvAIghj+ss1udwpc6PcdPNaimp+ck9/+eSpir
+BZsWRDEyYZ8r0Tzh0vCMZG3AJZvm439gsze5ImvAt+xFluYRCHMAkXaYimXAipHd
+Hudqu5B1/KNp3kRc68pDw/kzFSJ4bEdSW/3Qu5gJxb4y9XDTMipyFt1YZrP4sYJN
+EMAjIllnMHqQsK4efdNY/JSk92wEjmN/AAQLB/42X5RSrDQc9k/2RdgbRUQPXAXF
+YRySDMt4XfaQNAYiU2nQ1thxJuLzFLnp8VumzMD4tmsmBNmacVFTAMJyWZrum6eP
+dvyczSBG0e+4t6e2YCGdA8hfxJYNHCEE0i6NI7FCu2OPDqgXKsyViql7vchQAAg3
+N4ILBlcoO86JOCbugj+Yjp8mI2tzw2o3GEZLgHPD+t7ECFmeB6QypH02CXGTsTNQ
+6qt99zr86urV8Ta39Q0A6pVV81fkXaGIg1eLX7LCE5g4lV9D/G6KXYWYju3EBz/t
+eZRyrE3BrKM7MEqVUcgBwjIswBPDfJFW+H6B7Ma9RsT0efJgeruc712Z6cztiEkE
+GBECAAkFAksnpscCGwwACgkQc9dwzaWQR7mkswCcD+QNKEcLN9XmWhlzJfwzjW3N
+JgMAniNROBBXr37dCkmawTcagKSwhiUx
+=2aUQ
 -----END PGP PUBLIC KEY BLOCK-----


--- hplip-3.9.10.tar.gz.asc DELETED ---


--- hplip-hpcups-plugin.patch DELETED ---



From mclasen at fedoraproject.org  Tue Dec 22 17:48:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:48:51 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.165,1.166
Message-ID: <20091222174851.56EF611C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18062

Modified Files:
	file-roller.spec 
Log Message:
fix spec



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- file-roller.spec	22 Dec 2009 17:44:25 -0000	1.165
+++ file-roller.spec	22 Dec 2009 17:48:51 -0000	1.166
@@ -50,7 +50,6 @@ such as tar or zip files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .property-get
 
 %build
 %configure --disable-scrollkeeper --disable-static



From mclasen at fedoraproject.org  Tue Dec 22 17:48:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:48:57 +0000 (UTC)
Subject: rpms/gdm/devel .cvsignore, 1.80, 1.81 gdm.spec, 1.496, 1.497 sources, 
	1.116, 1.117
Message-ID: <20091222174857.1A60D11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17910

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	1 Dec 2009 14:56:28 -0000	1.80
+++ .cvsignore	22 Dec 2009 17:48:56 -0000	1.81
@@ -1 +1 @@
-gdm-2.29.1.tar.bz2
+gdm-2.29.4.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- gdm.spec	9 Dec 2009 20:03:07 -0000	1.496
+++ gdm.spec	22 Dec 2009 17:48:56 -0000	1.497
@@ -15,13 +15,13 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.29.1
-Release: 3%{?dist}
+Version: 2.29.4
+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.28/gdm-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gdm/2.29/gdm-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source3: gdm-password.pam
@@ -398,6 +398,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.4-1
+- Update to 2.29.4
+
 * Wed Dec 09 2009 Ray Strode <rstrode at redhat.com> 2.29.1-3
 - Update to work better with latest plymouth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- sources	1 Dec 2009 14:56:28 -0000	1.116
+++ sources	22 Dec 2009 17:48:56 -0000	1.117
@@ -1 +1 @@
-99ace289f55145a9222856db212ac4f3  gdm-2.29.1.tar.bz2
+70c6a4ea694662cf8d5da8b82c4e6cff  gdm-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 17:52:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:52:37 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.166,1.167
Message-ID: <20091222175237.1BA0011C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18879

Modified Files:
	file-roller.spec 
Log Message:
some scriptlet cleanup



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- file-roller.spec	22 Dec 2009 17:48:51 -0000	1.166
+++ file-roller.spec	22 Dec 2009 17:52:36 -0000	1.167
@@ -32,13 +32,9 @@ BuildRequires: GConf2-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: intltool
 
-Requires(post): scrollkeeper
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
-
-Requires(postun): scrollkeeper
-
 Requires: GConf2
 
 # The context menu API changed in 2.2.0:
@@ -87,10 +83,7 @@ update-desktop-database &> /dev/null || 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/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
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -108,11 +101,14 @@ fi
 
 %postun
 update-desktop-database &> /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
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc README COPYING NEWS AUTHORS



From mclasen at fedoraproject.org  Tue Dec 22 17:53:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:53:31 +0000 (UTC)
Subject: File vte-0.23.2.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222175331.4669A10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for vte:

93168c1d5ae21ed664b898639c8ed8dc  vte-0.23.2.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 17:54:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:54:54 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.90, 1.91 sources, 1.92, 1.93 vte.spec,
	1.166, 1.167
Message-ID: <20091222175454.965B411C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19315

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.23.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	3 Dec 2009 21:20:01 -0000	1.90
+++ .cvsignore	22 Dec 2009 17:54:54 -0000	1.91
@@ -1 +1 @@
-vte-0.23.1.tar.bz2
+vte-0.23.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	3 Dec 2009 21:20:01 -0000	1.92
+++ sources	22 Dec 2009 17:54:54 -0000	1.93
@@ -1 +1 @@
-b7c76fe2435e717b03e1564b868b1238  vte-0.23.1.tar.bz2
+93168c1d5ae21ed664b898639c8ed8dc  vte-0.23.2.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- vte.spec	3 Dec 2009 21:20:01 -0000	1.166
+++ vte.spec	22 Dec 2009 17:54:54 -0000	1.167
@@ -3,13 +3,13 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.23.1
+Version: 0.23.2
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://download.gnome.org/sources/vte/0.20/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/vte/0.23/%{name}-%{version}.tar.bz2
 
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.23.2-1
+- Update to 0.23.2
+
 * Wed Dec  3 2009 Behdad Esfahbod <behdad at redhat.com> 0.23.1-1
 - Update to 0.23.1
 



From mhlavink at fedoraproject.org  Tue Dec 22 17:56:48 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 17:56:48 +0000 (UTC)
Subject: File dovecot-1.2-managesieve-0.11.10.tar.gz uploaded to lookaside
	cache by mhlavink
Message-ID: <20091222175648.6583510F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for dovecot:

ea1e931fd0e4a8b6789a9d671a5a6676  dovecot-1.2-managesieve-0.11.10.tar.gz



From mhlavink at fedoraproject.org  Tue Dec 22 17:56:52 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 17:56:52 +0000 (UTC)
Subject: File dovecot-1.2.9-managesieve-0.11.10.diff.gz uploaded to lookaside
	cache by mhlavink
Message-ID: <20091222175652.0A68B10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for dovecot:

ec5564187789d47b5896a65f3f89ba9f  dovecot-1.2.9-managesieve-0.11.10.diff.gz



From mhlavink at fedoraproject.org  Tue Dec 22 17:57:00 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 17:57:00 +0000 (UTC)
Subject: File dovecot-1.2-sieve-0.1.14.tar.gz uploaded to lookaside cache by
	mhlavink
Message-ID: <20091222175700.E831F10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for dovecot:

01a92883fde76a5f985b0343e81b0c3d  dovecot-1.2-sieve-0.1.14.tar.gz



From mhlavink at fedoraproject.org  Tue Dec 22 17:57:53 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 17:57:53 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.65, 1.66 dovecot.spec, 1.154,
	1.155 sources, 1.69, 1.70
Message-ID: <20091222175753.A550311C00E9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19758

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
- sieve updated to 0.1.14
- managesieve updated to 0.11.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	18 Dec 2009 17:23:47 -0000	1.65
+++ .cvsignore	22 Dec 2009 17:57:53 -0000	1.66
@@ -1,4 +1,4 @@
 dovecot-1.2.9.tar.gz
-dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.8-managesieve-0.11.9.diff.gz
-dovecot-1.2-sieve-0.1.13.tar.gz
+dovecot-1.2-managesieve-0.11.10.tar.gz
+dovecot-1.2.9-managesieve-0.11.10.diff.gz
+dovecot-1.2-sieve-0.1.14.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- dovecot.spec	18 Dec 2009 17:23:47 -0000	1.154
+++ dovecot.spec	22 Dec 2009 17:57:53 -0000	1.155
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -15,10 +15,10 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define ver4mansieve 1.2.8
-%define sieve_version 0.1.13
+%define ver4mansieve 1.2.9
+%define sieve_version 0.1.14
 %define sieve_name dovecot-1.2-sieve
-%define managesieve_version 0.11.9
+%define managesieve_version 0.11.10
 %define managesieve_name dovecot-1.2-managesieve
 
 %if %{?fedora}00%{?rhel} < 6
@@ -462,6 +462,10 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.9-2
+- sieve updated to 0.1.14
+- managesieve updated to 0.11.10 
+
 * Fri Dec 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.9-1
 - updated to 1.2.9
 - maildir: When saving, filenames now always contain ,S=<size>.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	18 Dec 2009 17:23:47 -0000	1.69
+++ sources	22 Dec 2009 17:57:53 -0000	1.70
@@ -1,4 +1,4 @@
 036ff97fb248dae3bd4b796a0644634f  dovecot-1.2.9.tar.gz
-923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-4e3d658b2040f1319e7ec5f389aa94ff  dovecot-1.2.8-managesieve-0.11.9.diff.gz
-6151ab50e24abc0384358b1618c8048f  dovecot-1.2-sieve-0.1.13.tar.gz
+ea1e931fd0e4a8b6789a9d671a5a6676  dovecot-1.2-managesieve-0.11.10.tar.gz
+ec5564187789d47b5896a65f3f89ba9f  dovecot-1.2.9-managesieve-0.11.10.diff.gz
+01a92883fde76a5f985b0343e81b0c3d  dovecot-1.2-sieve-0.1.14.tar.gz



From mclasen at fedoraproject.org  Tue Dec 22 17:58:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 17:58:09 +0000 (UTC)
Subject: File orca-2.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222175809.D9CC110F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for orca:

48c63286c6aaadc311497244ddb6daa5  orca-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:00:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:00:26 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.60, 1.61 orca.spec, 1.99, 1.100 sources,
	1.61, 1.62
Message-ID: <20091222180026.4C64A11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20124

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	5 Dec 2009 05:40:53 -0000	1.60
+++ .cvsignore	22 Dec 2009 18:00:26 -0000	1.61
@@ -1 +1 @@
-orca-2.29.2.tar.bz2
+orca-2.29.4.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- orca.spec	5 Dec 2009 05:40:53 -0000	1.99
+++ orca.spec	22 Dec 2009 18:00:26 -0000	1.100
@@ -17,7 +17,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.29.2
+Version:	2.29.4
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
@@ -108,6 +108,9 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.4-1
+- Update to 2.29.4
+
 * Sat Dec  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.2-1
 - Update to 2.29.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	5 Dec 2009 05:40:53 -0000	1.61
+++ sources	22 Dec 2009 18:00:26 -0000	1.62
@@ -1 +1 @@
-35c36a406fbe5841db9c9196869de681  orca-2.29.2.tar.bz2
+48c63286c6aaadc311497244ddb6daa5  orca-2.29.4.tar.bz2



From diegobz at fedoraproject.org  Tue Dec 22 18:02:00 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Tue, 22 Dec 2009 18:02:00 +0000 (UTC)
Subject: rpms/transifex/devel transifex.spec,1.12,1.13
Message-ID: <20091222180200.C08ED11C00E9@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/transifex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20642

Modified Files:
	transifex.spec 
Log Message:
Dropped database creation


Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/transifex.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- transifex.spec	22 Dec 2009 17:09:50 -0000	1.12
+++ transifex.spec	22 Dec 2009 18:02:00 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:       transifex
 Version:    0.7.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
@@ -54,9 +54,9 @@ sed -e 's!share/locale!.*/locale!' /usr/
 cd transifex
 rm -rf .hg* build-tools
 rm -r vcs/tests
-python manage.py syncdb --noinput    # Setup DB tables
-python manage.py migrate             # Setup more DB tables
-python manage.py txcreatelanguages   # Create a standard set of languages
+#python manage.py syncdb --noinput    # Setup DB tables
+#python manage.py migrate             # Setup more DB tables
+#python manage.py txcreatelanguages   # Create a standard set of languages
 python manage.py txcompilemessages   # Create message catalogs for i18n
 
 %install
@@ -67,7 +67,7 @@ find -mindepth 1 -maxdepth 1 -type d \( 
     -name build-tools -o -name docs -o -name settings \) -prune -o \
     -print \) | xargs cp -a -t $RPM_BUILD_ROOT/%{_datadir}/%{name}
 cp -a *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -a *.db.sqlite $RPM_BUILD_ROOT%{_datadir}/%{name}
+#cp -a *.db.sqlite $RPM_BUILD_ROOT%{_datadir}/%{name}
 find $RPM_BUILD_ROOT%{_datadir}/%{name}/locale -name \*.po -exec rm {} +
 
 for vcs in cvs svn bzr hg git tar
@@ -129,7 +129,7 @@ fi
 %{_datadir}/%{name}/settings.py[co]
 %{_datadir}/%{name}/urls.py
 %{_datadir}/%{name}/urls.py[co]
-%{_datadir}/%{name}/transifex.db.sqlite
+#%{_datadir}/%{name}/transifex.db.sqlite
 %{_datadir}/%{name}/actionlog
 %{_datadir}/%{name}/codebases
 %{_datadir}/%{name}/external
@@ -201,6 +201,10 @@ fi
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Tue Dec 22 2009 Diego B?rigo Zacar?o <diegobz at indifex.com> - 0.7.3-3
+- Django-south seems to raise a specific NotImplementedError exception 
+  for some migration operations using SQLite. Dropped database creation. 
+
 * Tue Dec 22 2009 Diego B?rigo Zacar?o <diegobz at indifex.com> - 0.7.3-2
 - Changed SPEC for copying the SQLite database.
 - Do not try to build the docs, once the 0.7.3 tarball does not have a



From mclasen at fedoraproject.org  Tue Dec 22 18:20:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:20:54 +0000 (UTC)
Subject: File mousetweaks-2.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222182054.4C75310F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mousetweaks:

dafbfc2ba648df8f57b7a08ba82e3af7  mousetweaks-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:21:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:21:11 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.414,1.415
Message-ID: <20091222182111.51DA211C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23541

Modified Files:
	gtk2.spec 
Log Message:
drop landscape-pdf patch



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- gtk2.spec	22 Dec 2009 04:02:11 -0000	1.414
+++ gtk2.spec	22 Dec 2009 18:21:10 -0000	1.415
@@ -38,7 +38,7 @@ Patch8: tooltip-positioning.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=529364
 Patch11: gtk2-remove-connecting-reason.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=592582
-Patch14: gtk2-landscape-pdf-print.patch
+#Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=600992
 Patch15: filesystemref.patch
 
@@ -158,7 +158,7 @@ This package contains developer document
 %patch4 -p1 -b .fresh-tooltips
 %patch8 -p1 -b .tooltip-positioning
 %patch11 -p1 -b .remove-connecting-reason
-%patch14 -p1 -b .landscape-pdf-print
+#%patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .filesystemref
 
 %build



From mclasen at fedoraproject.org  Tue Dec 22 18:25:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:25:18 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.30, 1.31 mousetweaks.spec, 1.37, 
	1.38 sources, 1.30, 1.31
Message-ID: <20091222182518.8605E11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24282

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	1 Dec 2009 14:43:36 -0000	1.30
+++ .cvsignore	22 Dec 2009 18:25:18 -0000	1.31
@@ -1 +1 @@
-mousetweaks-2.29.3.tar.bz2
+mousetweaks-2.29.4.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- mousetweaks.spec	1 Dec 2009 14:43:36 -0000	1.37
+++ mousetweaks.spec	22 Dec 2009 18:25:18 -0000	1.38
@@ -1,11 +1,11 @@
 Name:		mousetweaks
-Version:	2.29.3
+Version:	2.29.4
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
 License:	GPLv3 and GFDL
 URL:		http://live.gnome.org/Mousetweaks/Home
-Source0:	http://download.gnome.org/sources/mousetweaks/2.28/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/mousetweaks/2.29/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext
@@ -108,6 +108,9 @@ fi
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> 2.29.4-1
+- Update to 2.29.4
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	1 Dec 2009 14:43:36 -0000	1.30
+++ sources	22 Dec 2009 18:25:18 -0000	1.31
@@ -1 +1 @@
-a8f5a6e7447f6dc72ff46d1592e20ddb  mousetweaks-2.29.3.tar.bz2
+dafbfc2ba648df8f57b7a08ba82e3af7  mousetweaks-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:33:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:33:30 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.415,1.416
Message-ID: <20091222183330.7C15611C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25547

Modified Files:
	gtk2.spec 
Log Message:
fix BRs



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- gtk2.spec	22 Dec 2009 18:21:10 -0000	1.415
+++ gtk2.spec	22 Dec 2009 18:33:30 -0000	1.416
@@ -63,6 +63,7 @@ BuildRequires: libXinerama-devel
 BuildRequires: libXcomposite-devel
 BuildRequires: libXdamage-devel
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
+BuildRequires: gir-repository-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From mclasen at fedoraproject.org  Tue Dec 22 18:34:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:34:24 +0000 (UTC)
Subject: rpms/mousetweaks/devel mousetweaks.spec,1.38,1.39
Message-ID: <20091222183424.8BCDF11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25729

Modified Files:
	mousetweaks.spec 
Log Message:
disable scrollkeeper



Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- mousetweaks.spec	22 Dec 2009 18:25:18 -0000	1.38
+++ mousetweaks.spec	22 Dec 2009 18:34:24 -0000	1.39
@@ -35,7 +35,7 @@ tab of the Mouse Preferences of GNOME Co
 %setup -q
 
 %build
-%configure
+%configure --disable-scrollkeeper
 make %{?_smp_mflags}
 
 



From mclasen at fedoraproject.org  Tue Dec 22 18:36:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:36:15 +0000 (UTC)
Subject: File gnome-terminal-2.29.1.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091222183615.1C47810F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-terminal:

8dc8ab9e3819cc24e30ff536d4fed7b6  gnome-terminal-2.29.1.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:37:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:37:35 +0000 (UTC)
Subject: rpms/gnome-terminal/devel .cvsignore, 1.64, 1.65 gnome-terminal.spec, 
	1.129, 1.130 sources, 1.65, 1.66
Message-ID: <20091222183735.41D6311C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.29.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	22 Sep 2009 00:46:54 -0000	1.64
+++ .cvsignore	22 Dec 2009 18:37:34 -0000	1.65
@@ -1 +1 @@
-gnome-terminal-2.28.0.tar.bz2
+gnome-terminal-2.29.1.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- gnome-terminal.spec	22 Sep 2009 00:46:54 -0000	1.129
+++ gnome-terminal.spec	22 Dec 2009 18:37:35 -0000	1.130
@@ -3,19 +3,18 @@
 %define glib2_version 2.15.0
 %define gtk2_version 2.10.0
 %define gconf_version 2.14.0
-%define startup_notification_version 0.8
 %define vte_version 0.17.0
 %define gnome_vfs_version 2.4
 %define desktop_file_utils_version 0.2.90
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.28.0
+Version: 2.29.1
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-terminal/2.28/gnome-terminal-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-terminal/2.29/gnome-terminal-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=588732
 Source1: profile-new-dialog.ui
 # Fix gnome.org Bug 338913 ? Terminal resized when switching tabs
@@ -37,7 +36,6 @@ BuildRequires: gtk2-devel >= %{gtk2_vers
 BuildRequires: GConf2-devel >= %{gconf_version}
 BuildRequires: libglade2-devel
 BuildRequires: libgnomeui-devel
-BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: vte-devel >= %{vte_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
@@ -136,6 +134,9 @@ scrollkeeper-update -q
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.1-1
+- Update to 2.29.1
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	22 Sep 2009 00:46:55 -0000	1.65
+++ sources	22 Dec 2009 18:37:35 -0000	1.66
@@ -1 +1 @@
-9cdc3581a03a44dd693663991d1c1e9f  gnome-terminal-2.28.0.tar.bz2
+8dc8ab9e3819cc24e30ff536d4fed7b6  gnome-terminal-2.29.1.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:40:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:40:20 +0000 (UTC)
Subject: rpms/gedit/F-12 gedit.spec,1.206,1.207
Message-ID: <20091222184020.1002211C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26793

Modified Files:
	gedit.spec 
Log Message:
2.28.3



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-12/gedit.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- gedit.spec	16 Dec 2009 21:22:57 -0000	1.206
+++ gedit.spec	22 Dec 2009 18:40:19 -0000	1.207
@@ -17,7 +17,7 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.28.2
+Version: 	2.28.3
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -230,6 +230,9 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.3-1
+- Update to 2.28.3
+
 * Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.2-1
 - Update to 2.28.2
 - See http://ftp.acc.umu.se/pub/GNOME/sources/gedit/2.28/gedit-2.28.2.news



From mhlavink at fedoraproject.org  Tue Dec 22 18:41:28 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 18:41:28 +0000 (UTC)
Subject: rpms/dovecot/F-12 dovecot.spec,1.149,1.150
Message-ID: <20091222184128.37A3911C00E9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/dovecot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27062

Modified Files:
	dovecot.spec 
Log Message:
- sieve updated to 0.1.14
- managesieve updated to 0.11.10
- updated to 1.2.9



Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- dovecot.spec	24 Nov 2009 16:26:14 -0000	1.149
+++ dovecot.spec	22 Dec 2009 18:41:28 -0000	1.150
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.8
-Release: 2%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -15,10 +15,10 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define ver4mansieve 1.2.7
-%define sieve_version 0.1.13
+%define ver4mansieve 1.2.9
+%define sieve_version 0.1.14
 %define sieve_name dovecot-1.2-sieve
-%define managesieve_version 0.11.9
+%define managesieve_version 0.11.10
 %define managesieve_name dovecot-1.2-managesieve
 
 %if %{?fedora}00%{?rhel} < 6
@@ -466,6 +466,22 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.9-1
+- sieve updated to 0.1.14
+- managesieve updated to 0.11.10 
+- updated to 1.2.9
+- maildir: When saving, filenames now always contain ,S=<size>.
+  Previously this was done only when quota plugin was loaded. It's
+  required for zlib plugin and may be useful for other things too.
+- maildir: v1.2.7 and v1.2.8 caused assert-crashes in
+  maildir_uidlist_records_drop_expunges()
+- maildir_copy_preserve_filename=yes could have caused crashes.
+- Maildir++ quota: % limits weren't updated when limits were read
+  from maildirsize.
+- virtual: v1.2.8 didn't fully fix the "lots of mailboxes" bug
+- virtual: Fixed updating virtual mailbox based on flag changes.
+- fts-squat: Fixed searching multi-byte characters.
+
 * Tue Nov 24 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.8-2
 - fix initdddir typo (for rhel rebuilds)
 - fix dovecot's restart after update (#518753)



From mhlavink at fedoraproject.org  Tue Dec 22 18:42:03 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 18:42:03 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,
	1.4, 1.5 cyrus-imapd-2.3.12p2-current-db.patch, 1.1,
	1.2 cyrus-imapd-2.3.7-krb4.patch, 1.1, 1.2 cyrus-imapd.spec,
	1.70, 1.71 cyrus-imapd-2.3.15-bufov.patch, 1.1,
	NONE cyrus-imapd-2.3.15-nodebug.patch, 1.1, NONE
Message-ID: <20091222184203.5DB2B11C00E9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 
	cyrus-imapd-2.3.12p2-current-db.patch 
	cyrus-imapd-2.3.7-krb4.patch cyrus-imapd.spec 
Removed Files:
	cyrus-imapd-2.3.15-bufov.patch 
	cyrus-imapd-2.3.15-nodebug.patch 
Log Message:
updated to 2.3.16


cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:
 cyrus-imapd-2.3.13/README.autocreate    |  211 +++++++++++
 cyrus-imapd-2.3.15/imap/Makefile.in     |  155 ++++----
 cyrus-imapd-2.3.15/imap/autosieve.c     |  590 ++++++++++++++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/compile_sieve.c |  365 +++++++++++++++++++
 cyrus-imapd-2.3.15/imap/imapd.c         |   43 ++
 cyrus-imapd-2.3.15/imap/lmtpd.c         |   92 ++++
 cyrus-imapd-2.3.15/imap/mboxlist.c      |  370 ++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/mboxlist.h      |    4 
 cyrus-imapd-2.3.15/imap/pop3d.c         |   46 ++
 cyrus-imapd-2.3.15/lib/auth.c           |    8 
 cyrus-imapd-2.3.15/lib/auth.h           |    2 
 cyrus-imapd-2.3.15/lib/auth_krb.c       |   17 
 cyrus-imapd-2.3.15/lib/auth_krb5.c      |   15 
 cyrus-imapd-2.3.15/lib/auth_pts.c       |    9 
 cyrus-imapd-2.3.15/lib/auth_unix.c      |   11 
 cyrus-imapd-2.3.15/lib/imapoptions      |   49 ++
 cyrus-imapd-2.3.15/notifyd/Makefile.in  |    3 
 cyrus-imapd-2.3.15/notifyd/notifyd.c    |    2 
 cyrus-imapd-2.3.15/ptclient/Makefile.in |    3 
 19 files changed, 1916 insertions(+), 79 deletions(-)

Index: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	18 Sep 2009 13:21:33 -0000	1.4
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	22 Dec 2009 18:42:03 -0000	1.5
@@ -1480,9 +1480,9 @@ diff -up cyrus-imapd-2.3.15/imap/mboxlis
  #define FNAME_SUBSSUFFIX ".sub"
  
  /*
-@@ -3413,3 +3437,349 @@ int mboxlist_delayed_delete_isenabled(vo
+@@ -3446,3 +3470,349 @@ int mboxlist_delayed_delete_isenabled(vo
  
-     return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
+     return(count);
  }
 +
 +/*
@@ -1833,10 +1833,10 @@ diff -up cyrus-imapd-2.3.15/imap/mboxlis
 diff -up cyrus-imapd-2.3.15/imap/mboxlist.h.autocreate cyrus-imapd-2.3.15/imap/mboxlist.h
 --- cyrus-imapd-2.3.15/imap/mboxlist.h.autocreate	2009-05-05 03:20:03.000000000 +0200
 +++ cyrus-imapd-2.3.15/imap/mboxlist.h	2009-09-18 11:11:39.778115814 +0200
-@@ -216,4 +216,8 @@ int mboxlist_commit(struct txn *tid);
- int mboxlist_abort(struct txn *tid);
+@@ -221,4 +221,8 @@ int mboxlist_commit(struct txn *tid);
+ int mboxlist_count_inferiors(char *mailboxname, int isadmin, char *userid,
+                              struct auth_state *authstate);
  
- int mboxlist_delayed_delete_isenabled(void);
 +int mboxlist_autocreateinbox(struct namespace *namespace,char *userid,
 +                       struct auth_state *auth_state, char *mailboxname, 
 +                       int autocreatequota);

cyrus-imapd-2.3.12p2-current-db.patch:
 berkdb.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: cyrus-imapd-2.3.12p2-current-db.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.12p2-current-db.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.12p2-current-db.patch	26 Sep 2008 11:39:02 -0000	1.1
+++ cyrus-imapd-2.3.12p2-current-db.patch	22 Dec 2009 18:42:03 -0000	1.2
@@ -4,8 +4,8 @@
  	fi
  
  	saved_LIBS=$LIBS
--        for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
+-        for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    AC_TRY_LINK([#include <stdio.h>

cyrus-imapd-2.3.7-krb4.patch:
 pop3d.c   |    2 --
 version.c |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

Index: cyrus-imapd-2.3.7-krb4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.7-krb4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.7-krb4.patch	24 Jan 2007 12:52:37 -0000	1.1
+++ cyrus-imapd-2.3.7-krb4.patch	22 Dec 2009 18:42:03 -0000	1.2
@@ -13,7 +13,7 @@
 --- cyrus-imapd-2.3.7/imap/pop3d.c.krb4	2007-01-22 15:41:14.000000000 +0100
 +++ cyrus-imapd-2.3.7/imap/pop3d.c	2007-01-22 15:41:15.000000000 +0100
 @@ -88,8 +88,6 @@
- #include "sync_log.h"
+ #include "statuscache.h"
  
  #ifdef HAVE_KRB
 -/* kerberos des is purported to conflict with OpenSSL DES */


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- cyrus-imapd.spec	4 Dec 2009 12:30:02 -0000	1.70
+++ cyrus-imapd.spec	22 Dec 2009 18:42:03 -0000	1.71
@@ -1,8 +1,8 @@
 #TODO: merge all sub-packages (except -devel) into cyrus-imapd, they are all required
 
 Name: cyrus-imapd
-Version: 2.3.15
-Release: 10%{?dist}
+Version: 2.3.16
+Release: 1%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -59,11 +59,6 @@ Patch18: cyrus-imapd-2.3.7-krb4.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=461875
 Patch19: cyrus-imapd-2.3.12p2-current-db.patch
 
-Patch20: cyrus-imapd-2.3.15-bufov.patch
-
-# required for c-i <= 2.3.15, rhbz#528093
-Patch21: cyrus-imapd-2.3.15-nodebug.patch
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: autoconf
@@ -152,8 +147,6 @@ one running the server.
 %patch15 -p1 -b .make_md5_defaults
 %patch18 -p1 -b .krb4
 %patch19 -p1 -b .db4.7
-%patch20 -p1 -b .bufov
-%patch21 -p1 -b .nodebug
 
 # add additional sources
 mkdir doc/{m4,contrib}
@@ -520,6 +513,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.16-1
+- updated to 2.3.16
+
 * Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-10
 - fix shell for daily cron job (#544182)
 


--- cyrus-imapd-2.3.15-bufov.patch DELETED ---


--- cyrus-imapd-2.3.15-nodebug.patch DELETED ---



From mhlavink at fedoraproject.org  Tue Dec 22 18:43:35 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 18:43:35 +0000 (UTC)
Subject: File cyrus-imapd-2.3.16.tar.gz uploaded to lookaside cache by mhlavink
Message-ID: <20091222184335.94D3F10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cyrus-imapd:

6a37feb1985974eee8a4a4b2932dd54c  cyrus-imapd-2.3.16.tar.gz



From mclasen at fedoraproject.org  Tue Dec 22 18:46:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:46:18 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.416,1.417
Message-ID: <20091222184618.2239711C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27961

Modified Files:
	gtk2.spec 
Log Message:
fix file lists



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- gtk2.spec	22 Dec 2009 18:33:30 -0000	1.416
+++ gtk2.spec	22 Dec 2009 18:46:17 -0000	1.417
@@ -346,6 +346,7 @@ fi
 %{_datadir}/themes/Emacs
 %{_datadir}/themes/Raleigh
 %dir %{_sysconfdir}/gtk-2.0
+%{_libdir}/girepository-1.0
 
 %files immodules
 %defattr(-, root, root)
@@ -377,6 +378,7 @@ fi
 %{_libdir}/pkgconfig/*
 %{_bindir}/gtk-demo
 %{_datadir}/gtk-2.0
+%{_datadir}/gir-1.0
 
 %files devel-docs
 %defattr(-, root, root)



From mclasen at fedoraproject.org  Tue Dec 22 18:48:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:48:09 +0000 (UTC)
Subject: File gnome-games-2.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222184809.BD4C110F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-games:

08bea74cbe7af15043f2addb4f97e696  gnome-games-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:49:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:49:08 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.106, 1.107 gnome-games.spec,
	1.244, 1.245 sources, 1.112, 1.113
Message-ID: <20091222184908.D74DE11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28400

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	1 Dec 2009 14:54:29 -0000	1.106
+++ .cvsignore	22 Dec 2009 18:49:08 -0000	1.107
@@ -1 +1 @@
-gnome-games-2.29.3.tar.bz2
+gnome-games-2.29.4.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- gnome-games.spec	5 Dec 2009 14:23:29 -0000	1.244
+++ gnome-games.spec	22 Dec 2009 18:49:08 -0000	1.245
@@ -43,12 +43,12 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.29.3
-Release: 2%{?dist}
+Version: 2.29.4
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games/2.28/gnome-games-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games/2.29/gnome-games-%{version}.tar.bz2
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-games-devel
@@ -473,6 +473,9 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> 2.29.4-1
+- Update to 2.29.4
+
 * Sat Dec 05 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 2.29.3-2
 - Fix syntax error on scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	1 Dec 2009 14:54:29 -0000	1.112
+++ sources	22 Dec 2009 18:49:08 -0000	1.113
@@ -1 +1 @@
-2fcbf4795c8520d5453a4a1aecc20803  gnome-games-2.29.3.tar.bz2
+08bea74cbe7af15043f2addb4f97e696  gnome-games-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:50:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:50:06 +0000 (UTC)
Subject: File gedit-2.28.3.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222185006.E2CD910F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gedit:

4720aafdbdcd20876711d768bf1c5d80  gedit-2.28.3.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:50:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:50:32 +0000 (UTC)
Subject: rpms/gedit/F-12 .cvsignore,1.98,1.99 sources,1.100,1.101
Message-ID: <20091222185032.0344011C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28683

Modified Files:
	.cvsignore sources 
Log Message:
update source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-12/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	16 Dec 2009 21:22:57 -0000	1.98
+++ .cvsignore	22 Dec 2009 18:50:31 -0000	1.99
@@ -1 +1 @@
-gedit-2.28.2.tar.bz2
+gedit-2.28.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-12/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources	16 Dec 2009 21:22:57 -0000	1.100
+++ sources	22 Dec 2009 18:50:31 -0000	1.101
@@ -1 +1 @@
-562b2e15cf4d3cef068caf7a25843ccd  gedit-2.28.2.tar.bz2
+4720aafdbdcd20876711d768bf1c5d80  gedit-2.28.3.tar.bz2



From musuruan at fedoraproject.org  Tue Dec 22 18:50:53 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Tue, 22 Dec 2009 18:50:53 +0000 (UTC)
Subject: File zaz-0.3.0.tar.gz uploaded to lookaside cache by musuruan
Message-ID: <20091222185053.DCF2710F8A9@bastion.fedoraproject.org>

A file has been added to the lookaside cache for zaz:

d0e625ee9b8d4823955686048ac69d0a  zaz-0.3.0.tar.gz



From mclasen at fedoraproject.org  Tue Dec 22 18:56:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:56:55 +0000 (UTC)
Subject: File evince-2.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222185655.E0E9F10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for evince:

28185e3b2f21c5b97e6e7a2d3e407690  evince-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 18:57:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 18:57:46 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.68, 1.69 evince.spec, 1.173,
	1.174 sources, 1.67, 1.68
Message-ID: <20091222185746.50C6011C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29964

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	1 Dec 2009 14:48:07 -0000	1.68
+++ .cvsignore	22 Dec 2009 18:57:45 -0000	1.69
@@ -1 +1 @@
-evince-2.29.3.tar.bz2
+evince-2.29.4.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- evince.spec	1 Dec 2009 15:41:21 -0000	1.173
+++ evince.spec	22 Dec 2009 18:57:46 -0000	1.174
@@ -5,14 +5,14 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.29.3
+Version:	2.29.4
 Release:	1%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
 Group:		Applications/Publishing
 URL:		http://projects.gnome.org/evince/
-Source0:	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=455759
 # Patch1:		duplex-copies.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -260,6 +260,9 @@ fi
 %{_libdir}/evince/2/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.29.4-1
+- Update to 2.29.4
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	1 Dec 2009 14:48:07 -0000	1.67
+++ sources	22 Dec 2009 18:57:46 -0000	1.68
@@ -1 +1 @@
-ddeeb84ac55cb3deaf588c3dde10195d  evince-2.29.3.tar.bz2
+28185e3b2f21c5b97e6e7a2d3e407690  evince-2.29.4.tar.bz2



From remi at fedoraproject.org  Tue Dec 22 18:59:41 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 22 Dec 2009 18:59:41 +0000 (UTC)
Subject: File Ocsinventory-Agent-1.1.1.tar.gz uploaded to lookaside cache by
	remi
Message-ID: <20091222185941.EFDDA10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ocsinventory-agent:

c00acb51f559b237590ea7611523da0b  Ocsinventory-Agent-1.1.1.tar.gz



From mhlavink at fedoraproject.org  Tue Dec 22 19:02:22 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 19:02:22 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel .cvsignore,1.15,1.16 sources,1.17,1.18
Message-ID: <20091222190222.534FE11C00E9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30724

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	18 Sep 2009 13:23:59 -0000	1.15
+++ .cvsignore	22 Dec 2009 19:02:22 -0000	1.16
@@ -1,2 +1,2 @@
-cyrus-imapd-2.3.15.tar.gz
+cyrus-imapd-2.3.16.tar.gz
 cyrus_sharedbackup-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2009 13:23:59 -0000	1.17
+++ sources	22 Dec 2009 19:02:22 -0000	1.18
@@ -1,2 +1,2 @@
-d89cb1b55023188938f332b7ef120fae  cyrus-imapd-2.3.15.tar.gz
+6a37feb1985974eee8a4a4b2932dd54c  cyrus-imapd-2.3.16.tar.gz
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz



From remi at fedoraproject.org  Tue Dec 22 19:04:16 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 22 Dec 2009 19:04:16 +0000 (UTC)
Subject: rpms/ocsinventory-agent/devel .cvsignore, 1.7,
	1.8 ocsinventory-agent-options.patch, 1.4,
	1.5 ocsinventory-agent.spec, 1.16, 1.17 sources, 1.7, 1.8
Message-ID: <20091222190416.E0AC511C00E9@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/ocsinventory-agent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31126

Modified Files:
	.cvsignore ocsinventory-agent-options.patch 
	ocsinventory-agent.spec sources 
Log Message:
update to 1.1.1 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Nov 2009 14:33:53 -0000	1.7
+++ .cvsignore	22 Dec 2009 19:04:16 -0000	1.8
@@ -1 +1 @@
-Ocsinventory-Agent-1.1.tar.gz
+Ocsinventory-Agent-1.1.1.tar.gz

ocsinventory-agent-options.patch:
 Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm      |    7 +++++++
 Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: ocsinventory-agent-options.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/devel/ocsinventory-agent-options.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocsinventory-agent-options.patch	7 Nov 2009 14:33:53 -0000	1.4
+++ ocsinventory-agent-options.patch	22 Dec 2009 19:04:16 -0000	1.5
@@ -10,10 +10,9 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
  		"stdout"          =>   \$self->{config}{stdout},
  		"t|tag=s"         =>   \$self->{config}{tag},
  		"u|user=s"        =>   \$self->{config}{user},
-diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm
---- Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig	2009-11-06 16:17:45.000000000 +0100
-+++ Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm	2009-11-07 12:21:40.000000000 +0100
-@@ -134,6 +134,13 @@ sub run {
+--- Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm.orig	2009-12-22 19:42:45.000000000 +0100
++++ Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm	2009-12-22 19:43:37.000000000 +0100
+@@ -134,6 +134,13 @@
          $config->{config}{nosoftware} = 1
      }
  
@@ -26,4 +25,4 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
 +
  # TODO put that in Ocsinventory::Agent::Config
      if (!$config->{config}{'stdout'} && !$config->{config}{'local'} && $config->{config}{server} !~ /^http(|s):\/\//) {
-         $logger->debug("the --server passed doesn't have a protocle, assume http as default");
+         $logger->debug("the --server passed doesn't have a protocol, assume http as default");


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/devel/ocsinventory-agent.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocsinventory-agent.spec	28 Nov 2009 15:11:26 -0000	1.16
+++ ocsinventory-agent.spec	22 Dec 2009 19:04:16 -0000	1.17
@@ -5,12 +5,12 @@
 Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
-Version:   1.1
-Release:   2%{?dist}%{?ocstag:.%{ocstag}}
+Version:   1.1.1
+Release:   1%{?dist}%{?ocstag:.%{ocstag}}
 
 #Source0:  http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:  http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
-Source0:   http://launchpad.net/ocsinventory-unix-agent/trunk/ocsinventory-unix-agent-1.1/+download/Ocsinventory-Agent-%{version}.tar.gz
+Source0:   http://launchpad.net/ocsinventory-unix-agent/1.1.x/ocsinventory-unix-agent-%{version}/+download/Ocsinventory-Agent-%{version}.tar.gz
 
 Source1:   %{name}.logrotate
 Source2:   %{name}.cron
@@ -199,6 +199,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Remi Collet <Fedora at famillecollet.com> 1.1.1-1
+- update to 1.1.1
+
 * Sat Nov 28 2009 Remi Collet <Fedora at famillecollet.com> 1.1-2
 - add Requires: which
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Nov 2009 14:33:53 -0000	1.7
+++ sources	22 Dec 2009 19:04:16 -0000	1.8
@@ -1 +1 @@
-591158c3691cb56c6817e3e86fda2523  Ocsinventory-Agent-1.1.tar.gz
+c00acb51f559b237590ea7611523da0b  Ocsinventory-Agent-1.1.1.tar.gz



From mclasen at fedoraproject.org  Tue Dec 22 19:04:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 19:04:47 +0000 (UTC)
Subject: File gtksourceview-2.8.2.tar.bz2 uploaded to lookaside cache by
	mclasen
Message-ID: <20091222190447.48B5810F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gtksourceview2:

5ce481d3aa7d639fe4508530b184158c  gtksourceview-2.8.2.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 19:05:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 19:05:29 +0000 (UTC)
Subject: rpms/gtksourceview2/F-12 .cvsignore, 1.33, 1.34 gtksourceview2.spec, 
	1.40, 1.41 sources, 1.33, 1.34
Message-ID: <20091222190529.3CA6011C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31372

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-12/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	30 Sep 2009 03:20:59 -0000	1.33
+++ .cvsignore	22 Dec 2009 19:05:28 -0000	1.34
@@ -1 +1 @@
-gtksourceview-2.8.1.tar.bz2
+gtksourceview-2.8.2.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-12/gtksourceview2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gtksourceview2.spec	30 Sep 2009 03:20:59 -0000	1.40
+++ gtksourceview2.spec	22 Dec 2009 19:05:29 -0000	1.41
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.8.1
+Version: 2.8.2
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.2-1
+- Update to 2.8.2
+
 * Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.8.1-1
 - Update to 2.8.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-12/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	30 Sep 2009 03:20:59 -0000	1.33
+++ sources	22 Dec 2009 19:05:29 -0000	1.34
@@ -1 +1 @@
-7741e41d3c7c83a35014f0faef3c94a2  gtksourceview-2.8.1.tar.bz2
+5ce481d3aa7d639fe4508530b184158c  gtksourceview-2.8.2.tar.bz2



From akurtakov at fedoraproject.org  Tue Dec 22 19:08:35 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 19:08:35 +0000 (UTC)
Subject: File plexus-velocity-1.1.8-src.tar.gz uploaded to lookaside cache by
	akurtakov
Message-ID: <20091222190835.A22C910F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for plexus-velocity:

f08d02035964fa6f7a6858846d55d3fa  plexus-velocity-1.1.8-src.tar.gz



From mhlavink at fedoraproject.org  Tue Dec 22 19:10:33 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 19:10:33 +0000 (UTC)
Subject: rpms/dovecot/F-12 .cvsignore,1.64,1.65 sources,1.68,1.69
Message-ID: <20091222191033.51CF511C00E9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/dovecot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32066

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-12/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	20 Nov 2009 08:43:14 -0000	1.64
+++ .cvsignore	22 Dec 2009 19:10:33 -0000	1.65
@@ -1,4 +1,4 @@
-dovecot-1.2.8.tar.gz
-dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.7-managesieve-0.11.9.diff.gz
-dovecot-1.2-sieve-0.1.13.tar.gz
+dovecot-1.2.9.tar.gz
+dovecot-1.2-managesieve-0.11.10.tar.gz
+dovecot-1.2.9-managesieve-0.11.10.diff.gz
+dovecot-1.2-sieve-0.1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-12/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	20 Nov 2009 08:43:14 -0000	1.68
+++ sources	22 Dec 2009 19:10:33 -0000	1.69
@@ -1,4 +1,4 @@
-c6d6c061413d299ccea7b55c3e4faa0a  dovecot-1.2.8.tar.gz
-923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-e67d5fe0c362b0b9cfcec54ae1ee0240  dovecot-1.2.7-managesieve-0.11.9.diff.gz
-6151ab50e24abc0384358b1618c8048f  dovecot-1.2-sieve-0.1.13.tar.gz
+036ff97fb248dae3bd4b796a0644634f  dovecot-1.2.9.tar.gz
+ea1e931fd0e4a8b6789a9d671a5a6676  dovecot-1.2-managesieve-0.11.10.tar.gz
+ec5564187789d47b5896a65f3f89ba9f  dovecot-1.2.9-managesieve-0.11.10.diff.gz
+01a92883fde76a5f985b0343e81b0c3d  dovecot-1.2-sieve-0.1.14.tar.gz



From akurtakov at fedoraproject.org  Tue Dec 22 19:10:32 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 19:10:32 +0000 (UTC)
Subject: rpms/plexus-velocity/devel plexus-velocity.spec, 1.8, 1.9 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <20091222191032.8862E11C00E9@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32154/devel

Modified Files:
	plexus-velocity.spec sources .cvsignore 
Log Message:
Update to upstream 1.1.8.


Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- plexus-velocity.spec	21 Aug 2009 20:15:08 -0000	1.8
+++ plexus-velocity.spec	22 Dec 2009 19:10:32 -0000	1.9
@@ -31,25 +31,25 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define with_maven 0
-%define without_maven 1
+%define with_maven 1
+%define without_maven 0
 
 %define section     free
 %define parent plexus
 %define subname velocity
 
 Name:           plexus-velocity
-Version:        1.1.7
-Release:        3.3%{?dist}
+Version:        1.1.8
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
-# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity-1.1.7/
-# tar czf plexus-velocity-1.1.7-src.tar.gz plexus-velocity-1.1.7/
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity-1.1.8/
+# tar czf plexus-velocity-1.1.8-src.tar.gz plexus-velocity-1.1.8/
 Source0:        plexus-velocity-%{version}-src.tar.gz
-Source1:        plexus-velocity-%{version}-build.xml
+Source1:        plexus-velocity-1.1.7-build.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,7 +63,7 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-maven-plugin
 %endif
 BuildRequires:  ant-contrib
 BuildRequires:  ant-nodeps
@@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-1
+- Update to upstream 1.1.8.
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.1.7-3.3
 - Add ant-nodeps BR
 
@@ -219,4 +222,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.1.2-1jpp
 - First JPackage build
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Aug 2009 14:23:28 -0000	1.3
+++ sources	22 Dec 2009 19:10:32 -0000	1.4
@@ -1 +1 @@
-99bf354c1f449006ac77366003d614c2  plexus-velocity-1.1.7-src.tar.gz
+f08d02035964fa6f7a6858846d55d3fa  plexus-velocity-1.1.8-src.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Aug 2009 14:23:28 -0000	1.3
+++ .cvsignore	22 Dec 2009 19:10:32 -0000	1.4
@@ -1 +1,2 @@
 plexus-velocity-1.1.7-src.tar.gz
+plexus-velocity-1.1.8-src.tar.gz



From musuruan at fedoraproject.org  Tue Dec 22 19:14:12 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Tue, 22 Dec 2009 19:14:12 +0000 (UTC)
Subject: rpms/zaz/devel import.log, NONE, 1.1 zaz.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222191412.6E40211C0260@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/zaz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv335/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zaz.spec 
Log Message:
First import



--- NEW FILE import.log ---
zaz-0_3_0-3_fc12:HEAD:zaz-0.3.0-3.fc12.src.rpm:1261507863


--- NEW FILE zaz.spec ---
Name:           zaz
Version:        0.3.0
Release:        3%{?dist}
Summary:        A puzzle game where the player has to arrange balls in triplets

Group:          Amusements/Games
# Music released under CC-BY-SA
License:        GPLv3+ and CC-BY-SA
URL:            http://sourceforge.net/projects/zaz/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mesa-libGL-devel
BuildRequires:  SDL_image-devel
BuildRequires:  libtheora-devel
BuildRequires:  libvorbis-devel
BuildRequires:  ftgl-devel  >= 2.1.3
BuildRequires:  gettext
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme
Requires:       gnu-free-mono-fonts
Requires:       gnu-free-sans-fonts
Requires:       oflb-dignas-handwriting-fonts


%description
Zaz is an arcade action puzzle game where the goal is to get rid of all 
incoming balls by rearranging their order and making triplets.
It currently includes 6 different levels. The game's name is recursive and 
stands for "Zaz ain't Z".

A 3D accelerator is needed for decent gameplay.


%prep
%setup -q

# Fix permissions
chmod 644 src/*.{cpp,h}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Symlink system fonts
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/FreeMonoBold.ttf
ln -s %{_datadir}/fonts/gnu-free/FreeMonoBold.ttf \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/FreeMonoBold.ttf
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/FreeSans.ttf
ln -s %{_datadir}/fonts/gnu-free/FreeSans.ttf \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/FreeSans.ttf
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/font1.ttf
ln -s %{_datadir}/fonts/oflb-dignas-handwriting/phranzysko_-_Digna_s_Handwriting.ttf \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/font1.ttf

# Remove docs
rm -r $RPM_BUILD_ROOT/usr/doc/

# Validate desktop file
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

# Install icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
mv $RPM_BUILD_ROOT%{_datadir}/icons/%{name}.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
%doc AUTHORS ChangeLog COPYING


%changelog
* Tue Dec 22 2009 Andrea Musuruane <musuruan at gmail.com> 0.3.0-3
- Consistent use of macros
- Fixed typo

* Wed Dec 09 2009 Andrea Musuruane <musuruan at gmail.com> 0.3.0-2
- Now Requires renamed Digna font package (BZ #542461)

* Sun Nov 29 2009 Andrea Musuruane <musuruan at gmail.com> 0.3.0-1
- First release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zaz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:00:17 -0000	1.1
+++ .cvsignore	22 Dec 2009 19:14:12 -0000	1.2
@@ -0,0 +1 @@
+zaz-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zaz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:00:19 -0000	1.1
+++ sources	22 Dec 2009 19:14:12 -0000	1.2
@@ -0,0 +1 @@
+d0e625ee9b8d4823955686048ac69d0a  zaz-0.3.0.tar.gz



From musuruan at fedoraproject.org  Tue Dec 22 19:15:20 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Tue, 22 Dec 2009 19:15:20 +0000 (UTC)
Subject: rpms/zaz/F-12 import.log, NONE, 1.1 zaz.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091222191520.5EBAB11C0260@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/zaz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv691/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zaz.spec 
Log Message:
First import



--- NEW FILE import.log ---
zaz-0_3_0-3_fc12:F-12:zaz-0.3.0-3.fc12.src.rpm:1261509294


--- NEW FILE zaz.spec ---
Name:           zaz
Version:        0.3.0
Release:        3%{?dist}
Summary:        A puzzle game where the player has to arrange balls in triplets

Group:          Amusements/Games
# Music released under CC-BY-SA
License:        GPLv3+ and CC-BY-SA
URL:            http://sourceforge.net/projects/zaz/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mesa-libGL-devel
BuildRequires:  SDL_image-devel
BuildRequires:  libtheora-devel
BuildRequires:  libvorbis-devel
BuildRequires:  ftgl-devel  >= 2.1.3
BuildRequires:  gettext
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme
Requires:       gnu-free-mono-fonts
Requires:       gnu-free-sans-fonts
Requires:       oflb-dignas-handwriting-fonts


%description
Zaz is an arcade action puzzle game where the goal is to get rid of all 
incoming balls by rearranging their order and making triplets.
It currently includes 6 different levels. The game's name is recursive and 
stands for "Zaz ain't Z".

A 3D accelerator is needed for decent gameplay.


%prep
%setup -q

# Fix permissions
chmod 644 src/*.{cpp,h}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Symlink system fonts
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/FreeMonoBold.ttf
ln -s %{_datadir}/fonts/gnu-free/FreeMonoBold.ttf \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/FreeMonoBold.ttf
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/FreeSans.ttf
ln -s %{_datadir}/fonts/gnu-free/FreeSans.ttf \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/FreeSans.ttf
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/font1.ttf
ln -s %{_datadir}/fonts/oflb-dignas-handwriting/phranzysko_-_Digna_s_Handwriting.ttf \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/font1.ttf

# Remove docs
rm -r $RPM_BUILD_ROOT/usr/doc/

# Validate desktop file
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

# Install icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
mv $RPM_BUILD_ROOT%{_datadir}/icons/%{name}.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
%doc AUTHORS ChangeLog COPYING


%changelog
* Tue Dec 22 2009 Andrea Musuruane <musuruan at gmail.com> 0.3.0-3
- Consistent use of macros
- Fixed typo

* Wed Dec 09 2009 Andrea Musuruane <musuruan at gmail.com> 0.3.0-2
- Now Requires renamed Digna font package (BZ #542461)

* Sun Nov 29 2009 Andrea Musuruane <musuruan at gmail.com> 0.3.0-1
- First release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zaz/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:00:17 -0000	1.1
+++ .cvsignore	22 Dec 2009 19:15:19 -0000	1.2
@@ -0,0 +1 @@
+zaz-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zaz/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:00:19 -0000	1.1
+++ sources	22 Dec 2009 19:15:20 -0000	1.2
@@ -0,0 +1 @@
+d0e625ee9b8d4823955686048ac69d0a  zaz-0.3.0.tar.gz



From remi at fedoraproject.org  Tue Dec 22 19:15:21 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 22 Dec 2009 19:15:21 +0000 (UTC)
Subject: rpms/ocsinventory-agent/F-12 ocsinventory-agent-options.patch, 1.4,
	1.5 ocsinventory-agent.spec, 1.15, 1.16 sources, 1.7, 1.8
Message-ID: <20091222191521.819D511C0260@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/ocsinventory-agent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv723

Modified Files:
	ocsinventory-agent-options.patch ocsinventory-agent.spec 
	sources 
Log Message:
update to 1.1.1 (bugfix)

ocsinventory-agent-options.patch:
 Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm      |    7 +++++++
 Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: ocsinventory-agent-options.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-12/ocsinventory-agent-options.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocsinventory-agent-options.patch	7 Nov 2009 15:19:20 -0000	1.4
+++ ocsinventory-agent-options.patch	22 Dec 2009 19:15:21 -0000	1.5
@@ -10,10 +10,9 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
  		"stdout"          =>   \$self->{config}{stdout},
  		"t|tag=s"         =>   \$self->{config}{tag},
  		"u|user=s"        =>   \$self->{config}{user},
-diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm
---- Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig	2009-11-06 16:17:45.000000000 +0100
-+++ Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm	2009-11-07 12:21:40.000000000 +0100
-@@ -134,6 +134,13 @@ sub run {
+--- Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm.orig	2009-12-22 19:42:45.000000000 +0100
++++ Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm	2009-12-22 19:43:37.000000000 +0100
+@@ -134,6 +134,13 @@
          $config->{config}{nosoftware} = 1
      }
  
@@ -26,4 +25,4 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
 +
  # TODO put that in Ocsinventory::Agent::Config
      if (!$config->{config}{'stdout'} && !$config->{config}{'local'} && $config->{config}{server} !~ /^http(|s):\/\//) {
-         $logger->debug("the --server passed doesn't have a protocle, assume http as default");
+         $logger->debug("the --server passed doesn't have a protocol, assume http as default");


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-12/ocsinventory-agent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocsinventory-agent.spec	7 Nov 2009 15:19:20 -0000	1.15
+++ ocsinventory-agent.spec	22 Dec 2009 19:15:21 -0000	1.16
@@ -5,12 +5,12 @@
 Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
-Version:   1.1
+Version:   1.1.1
 Release:   1%{?dist}%{?ocstag:.%{ocstag}}
 
 #Source0:  http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:  http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
-Source0:   http://launchpad.net/ocsinventory-unix-agent/trunk/ocsinventory-unix-agent-1.1/+download/Ocsinventory-Agent-%{version}.tar.gz
+Source0:   http://launchpad.net/ocsinventory-unix-agent/1.1.x/ocsinventory-unix-agent-%{version}/+download/Ocsinventory-Agent-%{version}.tar.gz
 
 Source1:   %{name}.logrotate
 Source2:   %{name}.cron
@@ -34,7 +34,12 @@ Requires:  net-tools, pciutils
 Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly
 Requires:  perl(HTTP::Request) perl(Proc::Daemon)
 Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay)
-Requires:  nmap monitor-edid smartmontools
+Requires:  nmap monitor-edid which
+%if 0%{?rhel} == 4
+Requires:  kernel-utils
+%else
+Requires:  smartmontools
+%endif
 # Optionnal : dmidecode on x86, /proc in ppc
 # Requires:  %{_sbindir}/dmidecode
 # Optionnal : ipdiscover or nmap, monitor-edid
@@ -194,6 +199,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Remi Collet <Fedora at famillecollet.com> 1.1.1-1
+- update to 1.1.1
+
 * Sat Nov 07 2009 Remi Collet <Fedora at famillecollet.com> 1.1-1
 - update to 1.1
 - add missing modules.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Nov 2009 15:19:20 -0000	1.7
+++ sources	22 Dec 2009 19:15:21 -0000	1.8
@@ -1 +1 @@
-591158c3691cb56c6817e3e86fda2523  Ocsinventory-Agent-1.1.tar.gz
+c00acb51f559b237590ea7611523da0b  Ocsinventory-Agent-1.1.1.tar.gz



From remi at fedoraproject.org  Tue Dec 22 19:17:02 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 22 Dec 2009 19:17:02 +0000 (UTC)
Subject: rpms/ocsinventory-agent/F-11 ocsinventory-agent-options.patch, 1.4,
	1.5 ocsinventory-agent.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20091222191702.9690E11C0260@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/ocsinventory-agent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1217

Modified Files:
	ocsinventory-agent-options.patch ocsinventory-agent.spec 
	sources 
Log Message:
update to 1.1.1 (bugfix)

ocsinventory-agent-options.patch:
 Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm      |    7 +++++++
 Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: ocsinventory-agent-options.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-11/ocsinventory-agent-options.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocsinventory-agent-options.patch	7 Nov 2009 15:25:41 -0000	1.4
+++ ocsinventory-agent-options.patch	22 Dec 2009 19:17:02 -0000	1.5
@@ -10,10 +10,9 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
  		"stdout"          =>   \$self->{config}{stdout},
  		"t|tag=s"         =>   \$self->{config}{tag},
  		"u|user=s"        =>   \$self->{config}{user},
-diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm
---- Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig	2009-11-06 16:17:45.000000000 +0100
-+++ Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm	2009-11-07 12:21:40.000000000 +0100
-@@ -134,6 +134,13 @@ sub run {
+--- Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm.orig	2009-12-22 19:42:45.000000000 +0100
++++ Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm	2009-12-22 19:43:37.000000000 +0100
+@@ -134,6 +134,13 @@
          $config->{config}{nosoftware} = 1
      }
  
@@ -26,4 +25,4 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
 +
  # TODO put that in Ocsinventory::Agent::Config
      if (!$config->{config}{'stdout'} && !$config->{config}{'local'} && $config->{config}{server} !~ /^http(|s):\/\//) {
-         $logger->debug("the --server passed doesn't have a protocle, assume http as default");
+         $logger->debug("the --server passed doesn't have a protocol, assume http as default");


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-11/ocsinventory-agent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocsinventory-agent.spec	7 Nov 2009 15:25:41 -0000	1.12
+++ ocsinventory-agent.spec	22 Dec 2009 19:17:02 -0000	1.13
@@ -5,12 +5,12 @@
 Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
-Version:   1.1
+Version:   1.1.1
 Release:   1%{?dist}%{?ocstag:.%{ocstag}}
 
 #Source0:  http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:  http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
-Source0:   http://launchpad.net/ocsinventory-unix-agent/trunk/ocsinventory-unix-agent-1.1/+download/Ocsinventory-Agent-%{version}.tar.gz
+Source0:   http://launchpad.net/ocsinventory-unix-agent/1.1.x/ocsinventory-unix-agent-%{version}/+download/Ocsinventory-Agent-%{version}.tar.gz
 
 Source1:   %{name}.logrotate
 Source2:   %{name}.cron
@@ -34,7 +34,12 @@ Requires:  net-tools, pciutils
 Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly
 Requires:  perl(HTTP::Request) perl(Proc::Daemon)
 Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay)
-Requires:  nmap monitor-edid smartmontools
+Requires:  nmap monitor-edid which
+%if 0%{?rhel} == 4
+Requires:  kernel-utils
+%else
+Requires:  smartmontools
+%endif
 # Optionnal : dmidecode on x86, /proc in ppc
 # Requires:  %{_sbindir}/dmidecode
 # Optionnal : ipdiscover or nmap, monitor-edid
@@ -194,6 +199,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Remi Collet <Fedora at famillecollet.com> 1.1.1-1
+- update to 1.1.1
+
 * Sat Nov 07 2009 Remi Collet <Fedora at famillecollet.com> 1.1-1
 - update to 1.1
 - add missing modules.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Nov 2009 15:25:41 -0000	1.7
+++ sources	22 Dec 2009 19:17:02 -0000	1.8
@@ -1 +1 @@
-591158c3691cb56c6817e3e86fda2523  Ocsinventory-Agent-1.1.tar.gz
+c00acb51f559b237590ea7611523da0b  Ocsinventory-Agent-1.1.1.tar.gz



From remi at fedoraproject.org  Tue Dec 22 19:19:36 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 22 Dec 2009 19:19:36 +0000 (UTC)
Subject: rpms/ocsinventory-agent/EL-5 ocsinventory-agent-options.patch, 1.3,
	1.4 ocsinventory-agent.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091222191936.62B1011C0260@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/ocsinventory-agent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1761

Modified Files:
	ocsinventory-agent-options.patch ocsinventory-agent.spec 
	sources 
Log Message:
update to 1.1.1 (bugfix)

ocsinventory-agent-options.patch:
 Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm      |    7 +++++++
 Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: ocsinventory-agent-options.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/EL-5/ocsinventory-agent-options.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ocsinventory-agent-options.patch	7 Nov 2009 16:10:07 -0000	1.3
+++ ocsinventory-agent-options.patch	22 Dec 2009 19:19:36 -0000	1.4
@@ -10,10 +10,9 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
  		"stdout"          =>   \$self->{config}{stdout},
  		"t|tag=s"         =>   \$self->{config}{tag},
  		"u|user=s"        =>   \$self->{config}{user},
-diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm
---- Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig	2009-11-06 16:17:45.000000000 +0100
-+++ Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm	2009-11-07 12:21:40.000000000 +0100
-@@ -134,6 +134,13 @@ sub run {
+--- Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm.orig	2009-12-22 19:42:45.000000000 +0100
++++ Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm	2009-12-22 19:43:37.000000000 +0100
+@@ -134,6 +134,13 @@
          $config->{config}{nosoftware} = 1
      }
  
@@ -26,4 +25,4 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
 +
  # TODO put that in Ocsinventory::Agent::Config
      if (!$config->{config}{'stdout'} && !$config->{config}{'local'} && $config->{config}{server} !~ /^http(|s):\/\//) {
-         $logger->debug("the --server passed doesn't have a protocle, assume http as default");
+         $logger->debug("the --server passed doesn't have a protocol, assume http as default");


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/EL-5/ocsinventory-agent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocsinventory-agent.spec	7 Nov 2009 16:17:40 -0000	1.4
+++ ocsinventory-agent.spec	22 Dec 2009 19:19:36 -0000	1.5
@@ -5,12 +5,12 @@
 Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
-Version:   1.1
-Release:   1%{?dist}%{?ocstag:.%{ocstag}}.1
+Version:   1.1.1
+Release:   1%{?dist}%{?ocstag:.%{ocstag}}
 
 #Source0:  http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:  http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
-Source0:   http://launchpad.net/ocsinventory-unix-agent/trunk/ocsinventory-unix-agent-1.1/+download/Ocsinventory-Agent-%{version}.tar.gz
+Source0:   http://launchpad.net/ocsinventory-unix-agent/1.1.x/ocsinventory-unix-agent-%{version}/+download/Ocsinventory-Agent-%{version}.tar.gz
 
 Source1:   %{name}.logrotate
 Source2:   %{name}.cron
@@ -34,7 +34,7 @@ Requires:  net-tools, pciutils
 Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly
 Requires:  perl(HTTP::Request) perl(Proc::Daemon)
 Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay)
-Requires:  nmap monitor-edid 
+Requires:  nmap monitor-edid which
 %if 0%{?rhel} == 4
 Requires:  kernel-utils
 %else
@@ -199,8 +199,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Nov 07 2009 Remi Collet <Fedora at famillecollet.com> 1.1-1.1
-- missing sources, bump release 
+* Tue Dec 22 2009 Remi Collet <Fedora at famillecollet.com> 1.1.1-1
+- update to 1.1.1
 
 * Sat Nov 07 2009 Remi Collet <Fedora at famillecollet.com> 1.1-1
 - update to 1.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Nov 2009 16:17:41 -0000	1.4
+++ sources	22 Dec 2009 19:19:36 -0000	1.5
@@ -1 +1 @@
-591158c3691cb56c6817e3e86fda2523  Ocsinventory-Agent-1.1.tar.gz
+c00acb51f559b237590ea7611523da0b  Ocsinventory-Agent-1.1.1.tar.gz



From remi at fedoraproject.org  Tue Dec 22 19:21:19 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 22 Dec 2009 19:21:19 +0000 (UTC)
Subject: rpms/ocsinventory-agent/EL-4 ocsinventory-agent-options.patch, 1.3,
	1.4 ocsinventory-agent.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091222192119.35F1C11C0260@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/ocsinventory-agent/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2098

Modified Files:
	ocsinventory-agent-options.patch ocsinventory-agent.spec 
	sources 
Log Message:
update to 1.1.1 (bugfix)

ocsinventory-agent-options.patch:
 Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm      |    7 +++++++
 Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent/Config.pm |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: ocsinventory-agent-options.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/EL-4/ocsinventory-agent-options.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ocsinventory-agent-options.patch	7 Nov 2009 16:24:36 -0000	1.3
+++ ocsinventory-agent-options.patch	22 Dec 2009 19:21:18 -0000	1.4
@@ -10,10 +10,9 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
  		"stdout"          =>   \$self->{config}{stdout},
  		"t|tag=s"         =>   \$self->{config}{tag},
  		"u|user=s"        =>   \$self->{config}{user},
-diff -up Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm
---- Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm.orig	2009-11-06 16:17:45.000000000 +0100
-+++ Ocsinventory-Agent-1.1/lib/Ocsinventory/Agent.pm	2009-11-07 12:21:40.000000000 +0100
-@@ -134,6 +134,13 @@ sub run {
+--- Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm.orig	2009-12-22 19:42:45.000000000 +0100
++++ Ocsinventory-Agent-1.1.1/lib/Ocsinventory/Agent.pm	2009-12-22 19:43:37.000000000 +0100
+@@ -134,6 +134,13 @@
          $config->{config}{nosoftware} = 1
      }
  
@@ -26,4 +25,4 @@ diff -up Ocsinventory-Agent-1.1/lib/Ocsi
 +
  # TODO put that in Ocsinventory::Agent::Config
      if (!$config->{config}{'stdout'} && !$config->{config}{'local'} && $config->{config}{server} !~ /^http(|s):\/\//) {
-         $logger->debug("the --server passed doesn't have a protocle, assume http as default");
+         $logger->debug("the --server passed doesn't have a protocol, assume http as default");


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/EL-4/ocsinventory-agent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ocsinventory-agent.spec	7 Nov 2009 16:24:36 -0000	1.3
+++ ocsinventory-agent.spec	22 Dec 2009 19:21:19 -0000	1.4
@@ -5,12 +5,12 @@
 Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
-Version:   1.1
+Version:   1.1.1
 Release:   1%{?dist}%{?ocstag:.%{ocstag}}
 
 #Source0:  http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:  http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
-Source0:   http://launchpad.net/ocsinventory-unix-agent/trunk/ocsinventory-unix-agent-1.1/+download/Ocsinventory-Agent-%{version}.tar.gz
+Source0:   http://launchpad.net/ocsinventory-unix-agent/1.1.x/ocsinventory-unix-agent-%{version}/+download/Ocsinventory-Agent-%{version}.tar.gz
 
 Source1:   %{name}.logrotate
 Source2:   %{name}.cron
@@ -34,7 +34,7 @@ Requires:  net-tools, pciutils
 Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly
 Requires:  perl(HTTP::Request) perl(Proc::Daemon)
 Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay)
-Requires:  nmap monitor-edid 
+Requires:  nmap monitor-edid which
 %if 0%{?rhel} == 4
 Requires:  kernel-utils
 %else
@@ -199,6 +199,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Remi Collet <Fedora at famillecollet.com> 1.1.1-1
+- update to 1.1.1
+
 * Sat Nov 07 2009 Remi Collet <Fedora at famillecollet.com> 1.1-1
 - update to 1.1
 - add missing modules.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Nov 2009 16:24:36 -0000	1.4
+++ sources	22 Dec 2009 19:21:19 -0000	1.5
@@ -1 +1 @@
-591158c3691cb56c6817e3e86fda2523  Ocsinventory-Agent-1.1.tar.gz
+c00acb51f559b237590ea7611523da0b  Ocsinventory-Agent-1.1.1.tar.gz



From bpepple at fedoraproject.org  Tue Dec 22 19:26:18 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 22 Dec 2009 19:26:18 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel
	0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch, NONE,
	1.1 0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch,
	NONE,
	1.1 0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch,
	NONE, 1.1 telepathy-gabble.spec, 1.72, 1.73 proxy.patch, 1.1, NONE
Message-ID: <20091222192618.311E511C00EF@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3084

Modified Files:
	telepathy-gabble.spec 
Added Files:
	0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch 
	0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch 
	0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch 
Removed Files:
	proxy.patch 
Log Message:
* Tue Dec 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-2
- Backport some patches to prevent gabble from setting your VCard
  on every login.


0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch:
 vcard-manager.c |   29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

--- NEW FILE 0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch ---
>From 4062055dba5efeaca72ccab6b2cc6aa329bd6a9f Mon Sep 17 00:00:00 2001
From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
Date: Mon, 7 Dec 2009 11:04:16 -0300
Subject: [PATCH] fd.o#25341: Always sets its own vcard on login

Note that gmail only stores vcard fields FN and PHOTO, so when using empathy the
nickname (alias) will be updated on every login.
---
 src/vcard-manager.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index c93332d..28601df 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -1000,6 +1000,27 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
     return new;
 }
 
+static gboolean
+check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
+{
+  const gchar *key = k;
+  const gchar *value = v;
+  LmMessageNode *vcard_node = user_data;
+  LmMessageNode *node;
+
+  node = lm_message_node_get_child (vcard_node, key);
+  if (node != NULL)
+    {
+      const gchar *node_value = lm_message_node_get_value (node);
+
+      if (!tp_strdiff (node_value, value))
+        return FALSE;
+    }
+
+  DEBUG ("vcard node %s changed, vcard needs update", key);
+  return TRUE;
+}
+
 static void
 manager_patch_vcard (GabbleVCardManager *self,
                      LmMessageNode *vcard_node)
@@ -1015,6 +1036,12 @@ manager_patch_vcard (GabbleVCardManager *self,
   if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
       return;
 
+  if (g_hash_table_find (priv->edits, check_vcard_changed, vcard_node) == NULL)
+    {
+      DEBUG ("nothing changed, not updating vcard");
+      goto out;
+    }
+
   DEBUG("patching vcard");
 
   msg = lm_message_new_with_sub_type (NULL, LM_MESSAGE_TYPE_IQ,
@@ -1036,6 +1063,7 @@ manager_patch_vcard (GabbleVCardManager *self,
 
   lm_message_unref (msg);
 
+out:
   /* We've applied those, forget about them */
   g_hash_table_destroy (priv->edits);
   priv->edits = NULL;
-- 
1.6.5.2


0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch:
 vcard-manager.c |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE 0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch ---
>From e1a05fa9c9bf62624f1803b7be58e1cd5c085d4e Mon Sep 17 00:00:00 2001
From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
Date: Wed, 9 Dec 2009 14:04:42 -0300
Subject: [PATCH] vcard-manager: Do not try to set vcard fields not supported by google servers.

---
 src/vcard-manager.c |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 28601df..ee00ce1 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -1000,14 +1000,28 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
     return new;
 }
 
+typedef struct {
+  GabbleConnection *connection;
+  LmMessageNode *vcard_node;
+} CheckVCardContext;
+
 static gboolean
 check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
 {
   const gchar *key = k;
   const gchar *value = v;
-  LmMessageNode *vcard_node = user_data;
+  CheckVCardContext *check_vcard_ctx = user_data;
+  GabbleConnection *conn = check_vcard_ctx->connection;
+  LmMessageNode *vcard_node = check_vcard_ctx->vcard_node;
   LmMessageNode *node;
 
+  if (conn->features & GABBLE_CONNECTION_FEATURES_GOOGLE_ROSTER &&
+      strcmp (key, "N") != 0 && strcmp (key, "FN") != 0 &&
+      strcmp (key, "PHOTO") != 0)
+    {
+      return FALSE;
+    }
+
   node = lm_message_node_get_child (vcard_node, key);
   if (node != NULL)
     {
@@ -1029,6 +1043,7 @@ manager_patch_vcard (GabbleVCardManager *self,
   LmMessage *msg;
   LmMessageNode *patched_vcard;
   GList *li;
+  CheckVCardContext *check_vcard_ctx;
 
   /* Bail out if we don't have outstanding edits to make, or if we already
    * have a set request in progress.
@@ -1036,7 +1051,10 @@ manager_patch_vcard (GabbleVCardManager *self,
   if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
       return;
 
-  if (g_hash_table_find (priv->edits, check_vcard_changed, vcard_node) == NULL)
+  check_vcard_ctx = g_new (CheckVCardContext, 1);
+  check_vcard_ctx->connection = priv->connection;
+  check_vcard_ctx->vcard_node = vcard_node;
+  if (g_hash_table_find (priv->edits, check_vcard_changed, check_vcard_ctx) == NULL)
     {
       DEBUG ("nothing changed, not updating vcard");
       goto out;
@@ -1064,6 +1082,8 @@ manager_patch_vcard (GabbleVCardManager *self,
   lm_message_unref (msg);
 
 out:
+  g_free (check_vcard_ctx);
+
   /* We've applied those, forget about them */
   g_hash_table_destroy (priv->edits);
   priv->edits = NULL;
-- 
1.6.5.2


0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch:
 vcard-manager.c |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

--- NEW FILE 0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch ---
>From 170601eaec1fbabfe3da509fa7ec95ac3500f04b Mon Sep 17 00:00:00 2001
From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
Date: Wed, 9 Dec 2009 14:15:48 -0300
Subject: [PATCH] vcard-manager: Iterate over hashtable instead of usin g_hash_table_find to check if vcard changed.

---
 src/vcard-manager.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index ee00ce1..9ccd633 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -1000,19 +1000,12 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
     return new;
 }
 
-typedef struct {
-  GabbleConnection *connection;
-  LmMessageNode *vcard_node;
-} CheckVCardContext;
-
 static gboolean
-check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
+vcard_node_changed (GabbleConnection *conn,
+                    const gchar *key,
+                    const gchar *value,
+                    LmMessageNode *vcard_node)
 {
-  const gchar *key = k;
-  const gchar *value = v;
-  CheckVCardContext *check_vcard_ctx = user_data;
-  GabbleConnection *conn = check_vcard_ctx->connection;
-  LmMessageNode *vcard_node = check_vcard_ctx->vcard_node;
   LmMessageNode *node;
 
   if (conn->features & GABBLE_CONNECTION_FEATURES_GOOGLE_ROSTER &&
@@ -1043,7 +1036,9 @@ manager_patch_vcard (GabbleVCardManager *self,
   LmMessage *msg;
   LmMessageNode *patched_vcard;
   GList *li;
-  CheckVCardContext *check_vcard_ctx;
+  GHashTableIter iter;
+  gpointer key, value;
+  gboolean vcard_changed = FALSE;
 
   /* Bail out if we don't have outstanding edits to make, or if we already
    * have a set request in progress.
@@ -1051,10 +1046,17 @@ manager_patch_vcard (GabbleVCardManager *self,
   if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
       return;
 
-  check_vcard_ctx = g_new (CheckVCardContext, 1);
-  check_vcard_ctx->connection = priv->connection;
-  check_vcard_ctx->vcard_node = vcard_node;
-  if (g_hash_table_find (priv->edits, check_vcard_changed, check_vcard_ctx) == NULL)
+  g_hash_table_iter_init (&iter, priv->edits);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      if (vcard_node_changed (priv->connection, key, value, vcard_node))
+        {
+          vcard_changed = TRUE;
+          break;
+        }
+    }
+
+  if (!vcard_changed)
     {
       DEBUG ("nothing changed, not updating vcard");
       goto out;
@@ -1082,8 +1084,6 @@ manager_patch_vcard (GabbleVCardManager *self,
   lm_message_unref (msg);
 
 out:
-  g_free (check_vcard_ctx);
-
   /* We've applied those, forget about them */
   g_hash_table_destroy (priv->edits);
   priv->edits = NULL;
-- 
1.6.5.2



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- telepathy-gabble.spec	8 Dec 2009 02:07:33 -0000	1.72
+++ telepathy-gabble.spec	22 Dec 2009 19:26:18 -0000	1.73
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.8.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -8,6 +8,9 @@ Group:          Applications/Communicati
 License:        LGPLv2+ and (BSD)
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:		0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch
+Patch1:		0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch
+Patch2:		0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -30,6 +33,9 @@ chats and voice calls.
 
 %prep
 %setup -q
+%patch0 -p1 -b .vcard-origin
+%patch1 -p1 -b .vcard-fields
+%patch2 -p1 -b .vcard-hashtable
 
 
 %build
@@ -59,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-2
+- Backport some patches to prevent gabble from setting your VCard
+  on every login.
+
 * Mon Dec  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-1
 - Update to 0.8.9.
 - Drop proxy patch.  Fixed upstream.


--- proxy.patch DELETED ---



From bpepple at fedoraproject.org  Tue Dec 22 19:32:32 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 22 Dec 2009 19:32:32 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-12
	0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch, NONE,
	1.1 0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch,
	NONE,
	1.1 0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch,
	NONE, 1.1 telepathy-gabble.spec, 1.73, 1.74
Message-ID: <20091222193232.89FA711C00EF@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4287

Modified Files:
	telepathy-gabble.spec 
Added Files:
	0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch 
	0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch 
	0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch 
Log Message:
* Tue Dec 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-3
- Backport some patches to prevent gabble from setting your VCard
  on every login.


0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch:
 vcard-manager.c |   29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

--- NEW FILE 0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch ---
>From 4062055dba5efeaca72ccab6b2cc6aa329bd6a9f Mon Sep 17 00:00:00 2001
From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
Date: Mon, 7 Dec 2009 11:04:16 -0300
Subject: [PATCH] fd.o#25341: Always sets its own vcard on login

Note that gmail only stores vcard fields FN and PHOTO, so when using empathy the
nickname (alias) will be updated on every login.
---
 src/vcard-manager.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index c93332d..28601df 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -1000,6 +1000,27 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
     return new;
 }
 
+static gboolean
+check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
+{
+  const gchar *key = k;
+  const gchar *value = v;
+  LmMessageNode *vcard_node = user_data;
+  LmMessageNode *node;
+
+  node = lm_message_node_get_child (vcard_node, key);
+  if (node != NULL)
+    {
+      const gchar *node_value = lm_message_node_get_value (node);
+
+      if (!tp_strdiff (node_value, value))
+        return FALSE;
+    }
+
+  DEBUG ("vcard node %s changed, vcard needs update", key);
+  return TRUE;
+}
+
 static void
 manager_patch_vcard (GabbleVCardManager *self,
                      LmMessageNode *vcard_node)
@@ -1015,6 +1036,12 @@ manager_patch_vcard (GabbleVCardManager *self,
   if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
       return;
 
+  if (g_hash_table_find (priv->edits, check_vcard_changed, vcard_node) == NULL)
+    {
+      DEBUG ("nothing changed, not updating vcard");
+      goto out;
+    }
+
   DEBUG("patching vcard");
 
   msg = lm_message_new_with_sub_type (NULL, LM_MESSAGE_TYPE_IQ,
@@ -1036,6 +1063,7 @@ manager_patch_vcard (GabbleVCardManager *self,
 
   lm_message_unref (msg);
 
+out:
   /* We've applied those, forget about them */
   g_hash_table_destroy (priv->edits);
   priv->edits = NULL;
-- 
1.6.5.2


0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch:
 vcard-manager.c |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE 0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch ---
>From e1a05fa9c9bf62624f1803b7be58e1cd5c085d4e Mon Sep 17 00:00:00 2001
From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
Date: Wed, 9 Dec 2009 14:04:42 -0300
Subject: [PATCH] vcard-manager: Do not try to set vcard fields not supported by google servers.

---
 src/vcard-manager.c |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 28601df..ee00ce1 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -1000,14 +1000,28 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
     return new;
 }
 
+typedef struct {
+  GabbleConnection *connection;
+  LmMessageNode *vcard_node;
+} CheckVCardContext;
+
 static gboolean
 check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
 {
   const gchar *key = k;
   const gchar *value = v;
-  LmMessageNode *vcard_node = user_data;
+  CheckVCardContext *check_vcard_ctx = user_data;
+  GabbleConnection *conn = check_vcard_ctx->connection;
+  LmMessageNode *vcard_node = check_vcard_ctx->vcard_node;
   LmMessageNode *node;
 
+  if (conn->features & GABBLE_CONNECTION_FEATURES_GOOGLE_ROSTER &&
+      strcmp (key, "N") != 0 && strcmp (key, "FN") != 0 &&
+      strcmp (key, "PHOTO") != 0)
+    {
+      return FALSE;
+    }
+
   node = lm_message_node_get_child (vcard_node, key);
   if (node != NULL)
     {
@@ -1029,6 +1043,7 @@ manager_patch_vcard (GabbleVCardManager *self,
   LmMessage *msg;
   LmMessageNode *patched_vcard;
   GList *li;
+  CheckVCardContext *check_vcard_ctx;
 
   /* Bail out if we don't have outstanding edits to make, or if we already
    * have a set request in progress.
@@ -1036,7 +1051,10 @@ manager_patch_vcard (GabbleVCardManager *self,
   if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
       return;
 
-  if (g_hash_table_find (priv->edits, check_vcard_changed, vcard_node) == NULL)
+  check_vcard_ctx = g_new (CheckVCardContext, 1);
+  check_vcard_ctx->connection = priv->connection;
+  check_vcard_ctx->vcard_node = vcard_node;
+  if (g_hash_table_find (priv->edits, check_vcard_changed, check_vcard_ctx) == NULL)
     {
       DEBUG ("nothing changed, not updating vcard");
       goto out;
@@ -1064,6 +1082,8 @@ manager_patch_vcard (GabbleVCardManager *self,
   lm_message_unref (msg);
 
 out:
+  g_free (check_vcard_ctx);
+
   /* We've applied those, forget about them */
   g_hash_table_destroy (priv->edits);
   priv->edits = NULL;
-- 
1.6.5.2


0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch:
 vcard-manager.c |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

--- NEW FILE 0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch ---
>From 170601eaec1fbabfe3da509fa7ec95ac3500f04b Mon Sep 17 00:00:00 2001
From: Andre Moreira Magalhaes (andrunko) <andrunko at andrunko.cbg.collabora.co.uk>
Date: Wed, 9 Dec 2009 14:15:48 -0300
Subject: [PATCH] vcard-manager: Iterate over hashtable instead of usin g_hash_table_find to check if vcard changed.

---
 src/vcard-manager.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index ee00ce1..9ccd633 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -1000,19 +1000,12 @@ vcard_copy (LmMessageNode *parent, LmMessageNode *src)
     return new;
 }
 
-typedef struct {
-  GabbleConnection *connection;
-  LmMessageNode *vcard_node;
-} CheckVCardContext;
-
 static gboolean
-check_vcard_changed (gpointer k, gpointer v, gpointer user_data)
+vcard_node_changed (GabbleConnection *conn,
+                    const gchar *key,
+                    const gchar *value,
+                    LmMessageNode *vcard_node)
 {
-  const gchar *key = k;
-  const gchar *value = v;
-  CheckVCardContext *check_vcard_ctx = user_data;
-  GabbleConnection *conn = check_vcard_ctx->connection;
-  LmMessageNode *vcard_node = check_vcard_ctx->vcard_node;
   LmMessageNode *node;
 
   if (conn->features & GABBLE_CONNECTION_FEATURES_GOOGLE_ROSTER &&
@@ -1043,7 +1036,9 @@ manager_patch_vcard (GabbleVCardManager *self,
   LmMessage *msg;
   LmMessageNode *patched_vcard;
   GList *li;
-  CheckVCardContext *check_vcard_ctx;
+  GHashTableIter iter;
+  gpointer key, value;
+  gboolean vcard_changed = FALSE;
 
   /* Bail out if we don't have outstanding edits to make, or if we already
    * have a set request in progress.
@@ -1051,10 +1046,17 @@ manager_patch_vcard (GabbleVCardManager *self,
   if (priv->edits == NULL || priv->edit_pipeline_item != NULL)
       return;
 
-  check_vcard_ctx = g_new (CheckVCardContext, 1);
-  check_vcard_ctx->connection = priv->connection;
-  check_vcard_ctx->vcard_node = vcard_node;
-  if (g_hash_table_find (priv->edits, check_vcard_changed, check_vcard_ctx) == NULL)
+  g_hash_table_iter_init (&iter, priv->edits);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      if (vcard_node_changed (priv->connection, key, value, vcard_node))
+        {
+          vcard_changed = TRUE;
+          break;
+        }
+    }
+
+  if (!vcard_changed)
     {
       DEBUG ("nothing changed, not updating vcard");
       goto out;
@@ -1082,8 +1084,6 @@ manager_patch_vcard (GabbleVCardManager *self,
   lm_message_unref (msg);
 
 out:
-  g_free (check_vcard_ctx);
-
   /* We've applied those, forget about them */
   g_hash_table_destroy (priv->edits);
   priv->edits = NULL;
-- 
1.6.5.2



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/telepathy-gabble.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- telepathy-gabble.spec	8 Dec 2009 18:21:11 -0000	1.73
+++ telepathy-gabble.spec	22 Dec 2009 19:32:32 -0000	1.74
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.8.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -8,6 +8,9 @@ Group:          Applications/Communicati
 License:        LGPLv2+ and (BSD)
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:		0001-fd.o-25341-Always-sets-its-own-vcard-on-login.patch
+Patch1:		0001-vcard-manager-Do-not-try-to-set-vcard-fields-not-sup.patch
+Patch2:		0001-vcard-manager-Iterate-over-hashtable-instead-of-usin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -30,6 +33,9 @@ chats and voice calls.
 
 %prep
 %setup -q
+%patch0 -p1 -b .vcard-origin
+%patch1 -p1 -b .vcard-fields
+%patch2 -p1 -b .vcard-hashtable
 
 
 %build
@@ -59,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-3
+- Backport some patches to prevent gabble from setting your VCard
+  on every login.
+
 * Tue Dec  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-2
 - Rebuild.
 



From drago01 at fedoraproject.org  Tue Dec 22 19:32:39 2009
From: drago01 at fedoraproject.org (drago01)
Date: Tue, 22 Dec 2009 19:32:39 +0000 (UTC)
Subject: File fsarchiver-0.6.2.tar.gz uploaded to lookaside cache by drago01
Message-ID: <20091222193239.AADE410F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fsarchiver:

148a13ff7ecc4c65b5517184564ac2fe  fsarchiver-0.6.2.tar.gz



From drago01 at fedoraproject.org  Tue Dec 22 19:33:10 2009
From: drago01 at fedoraproject.org (drago01)
Date: Tue, 22 Dec 2009 19:33:10 +0000 (UTC)
Subject: rpms/fsarchiver/devel fsarchiver-0.6.2-fix-splitting.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 fsarchiver.spec, 1.20, 1.21 sources,
	1.13, 1.14
Message-ID: <20091222193310.628A011C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4508

Modified Files:
	.cvsignore fsarchiver.spec sources 
Added Files:
	fsarchiver-0.6.2-fix-splitting.patch 
Log Message:
0.6.2

fsarchiver-0.6.2-fix-splitting.patch:
 fsarchiver.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE fsarchiver-0.6.2-fix-splitting.patch ---
diff -urN fsarchiver-0.6.2-orig/src/fsarchiver.c fsarchiver-0.6.2-patch/src/fsarchiver.c
--- fsarchiver-0.6.2-orig/src/fsarchiver.c	2009-12-07 20:20:16.000000000 +0000
+++ fsarchiver-0.6.2-patch/src/fsarchiver.c	2009-12-21 15:04:41.000000000 +0000
@@ -199,6 +199,7 @@
     sigset_t mask_set;
     char *probemode;
     bool probedetailed=0;
+    char tempbuf[512];
     char *command=NULL;
     char *archive=NULL;
     char *partition[32];
@@ -266,13 +267,18 @@
                 }
                 break;
             case 's': // split archive into several volumes
-                g_options.splitsize=atol(optarg)*1024*1024;
+                g_options.splitsize=((u64)atoll(optarg))*((u64)1024LL*1024LL);
                 if (g_options.splitsize==0)
                 {
                     errprintf("argument of option -s is invalid (%s). It must be a valid integer\n", optarg);
                     usage(progname, false);
                     return 1;
                 }
+                else // show the calculated size since it was probably incorrect before due to an integer overflow
+                {
+                    msgprintf(MSG_FORCE, "Archives will be split into volumes of the following size:\n%lld bytes (%s)",
+                        (long long)g_options.splitsize, format_size(g_options.splitsize, tempbuf, sizeof(tempbuf), 'h'));
+                }
                 break;
             case 'z': // compression level
                 g_options.fsacomplevel=atoi(optarg);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Oct 2009 10:09:23 -0000	1.13
+++ .cvsignore	22 Dec 2009 19:33:10 -0000	1.14
@@ -1 +1 @@
-fsarchiver-0.6.1.tar.gz
+fsarchiver-0.6.2.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fsarchiver.spec	10 Oct 2009 10:09:23 -0000	1.20
+++ fsarchiver.spec	22 Dec 2009 19:33:10 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.1
+Version:	0.6.2
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -9,6 +9,8 @@ URL:		http://www.fsarchiver.org
 Source0:  	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: fsarchiver-0.6.2-fix-splitting.patch
+
 BuildRequires:	e2fsprogs-devel => 1.41.4
 BuildRequires:	libuuid-devel
 BuildRequires:	libblkid-devel
@@ -31,6 +33,7 @@ is corrupt, you just loose the current f
 
 %prep
 %setup -q
+%patch1 -p1 -b .split
 
 %build
 %configure
@@ -53,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Tue Dec 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.2-1
+- Update to 0.6.2
+- Apply fix as requested by upstream
+
 * Sat Oct 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.1-1
 - Update to 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Oct 2009 10:09:23 -0000	1.13
+++ sources	22 Dec 2009 19:33:10 -0000	1.14
@@ -1 +1 @@
-8d09cb2ee729d65005458c6d759e3cc4  fsarchiver-0.6.1.tar.gz
+148a13ff7ecc4c65b5517184564ac2fe  fsarchiver-0.6.2.tar.gz



From drago01 at fedoraproject.org  Tue Dec 22 19:35:34 2009
From: drago01 at fedoraproject.org (drago01)
Date: Tue, 22 Dec 2009 19:35:34 +0000 (UTC)
Subject: rpms/fsarchiver/F-12 .cvsignore, 1.13, 1.14 fsarchiver.spec, 1.20,
	1.21 sources, 1.13, 1.14
Message-ID: <20091222193534.0D33311C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5023

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
0.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Oct 2009 10:10:04 -0000	1.13
+++ .cvsignore	22 Dec 2009 19:35:33 -0000	1.14
@@ -1 +1 @@
-fsarchiver-0.6.1.tar.gz
+fsarchiver-0.6.2.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/fsarchiver.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fsarchiver.spec	10 Oct 2009 10:10:04 -0000	1.20
+++ fsarchiver.spec	22 Dec 2009 19:35:33 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.1
+Version:	0.6.2
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -9,6 +9,8 @@ URL:		http://www.fsarchiver.org
 Source0:  	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: fsarchiver-0.6.2-fix-splitting.patch
+
 BuildRequires:	e2fsprogs-devel => 1.41.4
 BuildRequires:	libuuid-devel
 BuildRequires:	libblkid-devel
@@ -31,6 +33,7 @@ is corrupt, you just loose the current f
 
 %prep
 %setup -q
+%patch1 -p1 -b .split
 
 %build
 %configure
@@ -53,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Tue Dec 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.2-1
+- Update to 0.6.2
+- Apply fix as requested by upstream
+
 * Sat Oct 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.1-1
 - Update to 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Oct 2009 10:10:04 -0000	1.13
+++ sources	22 Dec 2009 19:35:33 -0000	1.14
@@ -1 +1 @@
-8d09cb2ee729d65005458c6d759e3cc4  fsarchiver-0.6.1.tar.gz
+148a13ff7ecc4c65b5517184564ac2fe  fsarchiver-0.6.2.tar.gz



From akurtakov at fedoraproject.org  Tue Dec 22 19:36:25 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 19:36:25 +0000 (UTC)
Subject: rpms/plexus-velocity/devel plexus-velocity.spec,1.9,1.10
Message-ID: <20091222193625.F013711C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5255/devel

Modified Files:
	plexus-velocity.spec 
Log Message:
BR plexus-maven-plugin.


Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- plexus-velocity.spec	22 Dec 2009 19:10:32 -0000	1.9
+++ plexus-velocity.spec	22 Dec 2009 19:36:25 -0000	1.10
@@ -40,7 +40,7 @@
 
 Name:           plexus-velocity
 Version:        1.1.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
@@ -63,6 +63,7 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
+BuildRequires:  plexus-maven-plugin
 BuildRequires:  maven-surefire-maven-plugin
 %endif
 BuildRequires:  ant-contrib
@@ -177,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-2
+- BR plexus-maven-plugin.
+
 * Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-1
 - Update to upstream 1.1.8.
 



From drago01 at fedoraproject.org  Tue Dec 22 19:40:14 2009
From: drago01 at fedoraproject.org (drago01)
Date: Tue, 22 Dec 2009 19:40:14 +0000 (UTC)
Subject: rpms/fsarchiver/F-11 fsarchiver-0.6.2-fix-splitting.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 fsarchiver.spec, 1.17, 1.18 sources,
	1.13, 1.14
Message-ID: <20091222194014.EEE0711C03F6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5899

Modified Files:
	.cvsignore fsarchiver.spec sources 
Added Files:
	fsarchiver-0.6.2-fix-splitting.patch 
Log Message:
0.6.2

fsarchiver-0.6.2-fix-splitting.patch:
 fsarchiver.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE fsarchiver-0.6.2-fix-splitting.patch ---
diff -urN fsarchiver-0.6.2-orig/src/fsarchiver.c fsarchiver-0.6.2-patch/src/fsarchiver.c
--- fsarchiver-0.6.2-orig/src/fsarchiver.c	2009-12-07 20:20:16.000000000 +0000
+++ fsarchiver-0.6.2-patch/src/fsarchiver.c	2009-12-21 15:04:41.000000000 +0000
@@ -199,6 +199,7 @@
     sigset_t mask_set;
     char *probemode;
     bool probedetailed=0;
+    char tempbuf[512];
     char *command=NULL;
     char *archive=NULL;
     char *partition[32];
@@ -266,13 +267,18 @@
                 }
                 break;
             case 's': // split archive into several volumes
-                g_options.splitsize=atol(optarg)*1024*1024;
+                g_options.splitsize=((u64)atoll(optarg))*((u64)1024LL*1024LL);
                 if (g_options.splitsize==0)
                 {
                     errprintf("argument of option -s is invalid (%s). It must be a valid integer\n", optarg);
                     usage(progname, false);
                     return 1;
                 }
+                else // show the calculated size since it was probably incorrect before due to an integer overflow
+                {
+                    msgprintf(MSG_FORCE, "Archives will be split into volumes of the following size:\n%lld bytes (%s)",
+                        (long long)g_options.splitsize, format_size(g_options.splitsize, tempbuf, sizeof(tempbuf), 'h'));
+                }
                 break;
             case 'z': // compression level
                 g_options.fsacomplevel=atoi(optarg);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Oct 2009 10:10:06 -0000	1.13
+++ .cvsignore	22 Dec 2009 19:40:14 -0000	1.14
@@ -1 +1 @@
-fsarchiver-0.6.1.tar.gz
+fsarchiver-0.6.2.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/fsarchiver.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fsarchiver.spec	10 Oct 2009 10:10:06 -0000	1.17
+++ fsarchiver.spec	22 Dec 2009 19:40:14 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		fsarchiver
 Version:	0.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving
@@ -9,6 +9,8 @@ URL:		http://www.fsarchiver.org
 Source0:  	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: fsarchiver-0.6.2-fix-splitting.patch
+
 BuildRequires:	e2fsprogs-devel => 1.41.4
 BuildRequires:	e2fsprogs
 BuildRequires:	libattr-devel
@@ -29,6 +31,7 @@ is corrupt, you just loose the current f
 
 %prep
 %setup -q
+%patch1 -p1 -b .split
 
 %build
 %configure
@@ -51,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Tue Dec 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.2-1
+- Update to 0.6.2
+- Apply fix as requested by upstream
+
 * Sat Oct 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.1-1
 - Update to 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Oct 2009 10:10:06 -0000	1.13
+++ sources	22 Dec 2009 19:40:14 -0000	1.14
@@ -1 +1 @@
-8d09cb2ee729d65005458c6d759e3cc4  fsarchiver-0.6.1.tar.gz
+148a13ff7ecc4c65b5517184564ac2fe  fsarchiver-0.6.2.tar.gz



From drago01 at fedoraproject.org  Tue Dec 22 19:40:23 2009
From: drago01 at fedoraproject.org (drago01)
Date: Tue, 22 Dec 2009 19:40:23 +0000 (UTC)
Subject: rpms/fsarchiver/F-12 fsarchiver-0.6.2-fix-splitting.patch,NONE,1.1
Message-ID: <20091222194023.E91F511C03F6@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5958

Added Files:
	fsarchiver-0.6.2-fix-splitting.patch 
Log Message:
0.6.2

fsarchiver-0.6.2-fix-splitting.patch:
 fsarchiver.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE fsarchiver-0.6.2-fix-splitting.patch ---
diff -urN fsarchiver-0.6.2-orig/src/fsarchiver.c fsarchiver-0.6.2-patch/src/fsarchiver.c
--- fsarchiver-0.6.2-orig/src/fsarchiver.c	2009-12-07 20:20:16.000000000 +0000
+++ fsarchiver-0.6.2-patch/src/fsarchiver.c	2009-12-21 15:04:41.000000000 +0000
@@ -199,6 +199,7 @@
     sigset_t mask_set;
     char *probemode;
     bool probedetailed=0;
+    char tempbuf[512];
     char *command=NULL;
     char *archive=NULL;
     char *partition[32];
@@ -266,13 +267,18 @@
                 }
                 break;
             case 's': // split archive into several volumes
-                g_options.splitsize=atol(optarg)*1024*1024;
+                g_options.splitsize=((u64)atoll(optarg))*((u64)1024LL*1024LL);
                 if (g_options.splitsize==0)
                 {
                     errprintf("argument of option -s is invalid (%s). It must be a valid integer\n", optarg);
                     usage(progname, false);
                     return 1;
                 }
+                else // show the calculated size since it was probably incorrect before due to an integer overflow
+                {
+                    msgprintf(MSG_FORCE, "Archives will be split into volumes of the following size:\n%lld bytes (%s)",
+                        (long long)g_options.splitsize, format_size(g_options.splitsize, tempbuf, sizeof(tempbuf), 'h'));
+                }
                 break;
             case 'z': // compression level
                 g_options.fsacomplevel=atoi(optarg);



From ivaxer at fedoraproject.org  Tue Dec 22 19:44:16 2009
From: ivaxer at fedoraproject.org (John A. Khvatov)
Date: Tue, 22 Dec 2009 19:44:16 +0000 (UTC)
Subject: File opensips-1.6.1-tls_src.tar.gz uploaded to lookaside cache by
	ivaxer
Message-ID: <20091222194416.D0E3410F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for opensips:

ac2b6cda151ee9dca7b6e3d7e5527a42  opensips-1.6.1-tls_src.tar.gz



From ivaxer at fedoraproject.org  Tue Dec 22 19:45:06 2009
From: ivaxer at fedoraproject.org (John A. Khvatov)
Date: Tue, 22 Dec 2009 19:45:06 +0000 (UTC)
Subject: rpms/opensips/devel .cvsignore, 1.2, 1.3 import.log, 1.3,
	1.4 opensips.spec, 1.3, 1.4 sources, 1.2,
	1.3 opensips--init.patch, 1.1, NONE opensips--openssl10.patch,
	1.1, NONE
Message-ID: <20091222194506.51FBA11C00EF@cvs1.fedora.phx.redhat.com>

Author: ivaxer

Update of /cvs/pkgs/rpms/opensips/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6840/devel

Modified Files:
	.cvsignore import.log opensips.spec sources 
Removed Files:
	opensips--init.patch opensips--openssl10.patch 
Log Message:
- Updated to 1.6.1
- Dropped upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Nov 2009 10:40:34 -0000	1.2
+++ .cvsignore	22 Dec 2009 19:45:05 -0000	1.3
@@ -1 +1 @@
-opensips-1.6.0-tls_src.tar.gz
+opensips-1.6.1-tls_src.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Nov 2009 16:51:23 -0000	1.3
+++ import.log	22 Dec 2009 19:45:05 -0000	1.4
@@ -1,3 +1,4 @@
 opensips-1_6_0-2_fc11:HEAD:opensips-1.6.0-2.fc11.src.rpm:1257244541
 opensips-1_6_0-3_fc11:HEAD:opensips-1.6.0-3.fc11.src.rpm:1257248994
 opensips-1_6_0-4_fc11:HEAD:opensips-1.6.0-4.fc11.src.rpm:1257353191
+opensips-1_6_1-1_fc12:HEAD:opensips-1.6.1-1.fc12.src.rpm:1261511059


Index: opensips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/devel/opensips.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- opensips.spec	4 Nov 2009 16:51:24 -0000	1.3
+++ opensips.spec	22 Dec 2009 19:45:06 -0000	1.4
@@ -9,14 +9,12 @@
 
 Summary:  Open Source SIP Server
 Name:     opensips
-Version:  1.6.0
-Release:  4%{?dist}
+Version:  1.6.1
+Release:  1%{?dist}
 License:  GPLv2+
 Group:    System Environment/Daemons
 Source0:  http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
 Source1:  %{name}.sysconfig
-Patch1:   opensips--init.patch
-Patch2:   opensips--openssl10.patch
 URL:      http://opensips.org
 
 BuildRequires:  expat-devel
@@ -502,8 +500,6 @@ clients.
 
 %prep
 %setup -q -n %{name}-%{version}-tls
-%patch1 -p1
-%patch2 -p1
 
 %build
 LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -990,6 +986,10 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Thu Dec 22 2009 John Khvatov <ivaxer at fedoraproject.org> - 1.6.1-1:
+- Updated to 1.6.1
+- Dropped upstreamed patches
+
 * Wed Nov 04 2009 John Khvatov <ivaxer at fedoraproject.org> - 1.6.0-4:
 - Fixed typo: pia_mi to pua_mi in presence_xcapdiff dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Nov 2009 10:40:34 -0000	1.2
+++ sources	22 Dec 2009 19:45:06 -0000	1.3
@@ -1 +1 @@
-c9dbca1dc74e0a3a383f61e3dc4844df  opensips-1.6.0-tls_src.tar.gz
+ac2b6cda151ee9dca7b6e3d7e5527a42  opensips-1.6.1-tls_src.tar.gz


--- opensips--init.patch DELETED ---


--- opensips--openssl10.patch DELETED ---



From akurtakov at fedoraproject.org  Tue Dec 22 19:45:13 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 19:45:13 +0000 (UTC)
Subject: rpms/plexus-velocity/devel plexus-velocity.spec,1.10,1.11
Message-ID: <20091222194513.5DCD311C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6911/devel

Modified Files:
	plexus-velocity.spec 
Log Message:
BR maven-doxia-sitetools.


Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- plexus-velocity.spec	22 Dec 2009 19:36:25 -0000	1.10
+++ plexus-velocity.spec	22 Dec 2009 19:45:13 -0000	1.11
@@ -40,7 +40,7 @@
 
 Name:           plexus-velocity
 Version:        1.1.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
@@ -65,6 +65,7 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  plexus-maven-plugin
 BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-doxia-sitetools
 %endif
 BuildRequires:  ant-contrib
 BuildRequires:  ant-nodeps
@@ -178,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-3
+- BR maven-doxia-sitetools.
+
 * Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-2
 - BR plexus-maven-plugin.
 



From pkgdb at fedoraproject.org  Tue Dec 22 19:45:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 19:45:52 +0000
Subject: [pkgdb] sylpheed: mschwendt has given up watchcommits
Message-ID: <20091222194552.87AB410F8BC@bastion.fedoraproject.org>

mschwendt has given up the watchcommits acl on sylpheed (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Tue Dec 22 19:45:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 19:45:53 +0000
Subject: [pkgdb] sylpheed: mschwendt has given up commit
Message-ID: <20091222194553.DF65910F8D2@bastion.fedoraproject.org>

mschwendt has given up the commit acl on sylpheed (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Tue Dec 22 19:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 19:46:07 +0000
Subject: [pkgdb] sylpheed: mschwendt has given up watchbugzilla
Message-ID: <20091222194554.3189810F8D4@bastion.fedoraproject.org>

mschwendt has given up the watchbugzilla acl on sylpheed (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Tue Dec 22 19:45:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 19:45:55 +0000
Subject: [pkgdb] sylpheed: mschwendt has given up approveacls
Message-ID: <20091222194555.2C84B10F8DA@bastion.fedoraproject.org>

mschwendt has given up the approveacls acl on sylpheed (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From bpepple at fedoraproject.org  Tue Dec 22 19:46:06 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 22 Dec 2009 19:46:06 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel telepathy-gabble.spec,1.73,1.74
Message-ID: <20091222194606.5C1D711C00EF@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7222

Modified Files:
	telepathy-gabble.spec 
Log Message:
* Tue Dec 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-3
- Bump.



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- telepathy-gabble.spec	22 Dec 2009 19:26:18 -0000	1.73
+++ telepathy-gabble.spec	22 Dec 2009 19:46:06 -0000	1.74
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.8.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-3
+- Bump.
+
 * Tue Dec 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.9-2
 - Backport some patches to prevent gabble from setting your VCard
   on every login.



From pkgdb at fedoraproject.org  Tue Dec 22 19:46:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 19:46:03 +0000
Subject: [pkgdb] sylpheed: mschwendt has given up watchbugzilla
Message-ID: <20091222194604.1D70F10F8A5@bastion.fedoraproject.org>

mschwendt has given up the watchbugzilla acl on sylpheed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Tue Dec 22 19:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 19:46:06 +0000
Subject: [pkgdb] sylpheed: mschwendt has given up commit
Message-ID: <20091222194605.EC3AC10F8BE@bastion.fedoraproject.org>

mschwendt has given up the commit acl on sylpheed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Tue Dec 22 19:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 19:46:07 +0000
Subject: [pkgdb] sylpheed: mschwendt has given up approveacls
Message-ID: <20091222194607.1255110F8CF@bastion.fedoraproject.org>

mschwendt has given up the approveacls acl on sylpheed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From pkgdb at fedoraproject.org  Tue Dec 22 19:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 22 Dec 2009 19:46:21 +0000
Subject: [pkgdb] sylpheed: mschwendt has given up watchcommits
Message-ID: <20091222194608.129F710F894@bastion.fedoraproject.org>

mschwendt has given up the watchcommits acl on sylpheed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sylpheed



From mhlavink at fedoraproject.org  Tue Dec 22 19:48:32 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 19:48:32 +0000 (UTC)
Subject: rpms/dovecot/F-11 .cvsignore, 1.72, 1.73 dovecot.spec, 1.149,
	1.150 sources, 1.75, 1.76
Message-ID: <20091222194832.E05CA11C00EF@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7787

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
- sieve updated to 0.1.14
- managesieve updated to 0.11.10
- updated to 1.2.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	20 Nov 2009 09:26:16 -0000	1.72
+++ .cvsignore	22 Dec 2009 19:48:32 -0000	1.73
@@ -1,4 +1,4 @@
-dovecot-1.2.8.tar.gz
-dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.7-managesieve-0.11.9.diff.gz
-dovecot-1.2-sieve-0.1.13.tar.gz
+dovecot-1.2.9.tar.gz
+dovecot-1.2-managesieve-0.11.10.tar.gz
+dovecot-1.2.9-managesieve-0.11.10.diff.gz
+dovecot-1.2-sieve-0.1.14.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- dovecot.spec	24 Nov 2009 16:26:05 -0000	1.149
+++ dovecot.spec	22 Dec 2009 19:48:32 -0000	1.150
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.8
-Release: 2%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -15,10 +15,10 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define ver4mansieve 1.2.7
-%define sieve_version 0.1.13
+%define ver4mansieve 1.2.9
+%define sieve_version 0.1.14
 %define sieve_name dovecot-1.2-sieve
-%define managesieve_version 0.11.9
+%define managesieve_version 0.11.10
 %define managesieve_name dovecot-1.2-managesieve
 
 URL: http://www.dovecot.org/
@@ -44,8 +44,8 @@ Patch2: dovecot-1.0.beta2-mkcert-permiss
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, pam-devel, zlib-devel
-BuildRequires: libtool autoconf automake
+BuildRequires: openssl-devel, pam-devel, zlib-devel, libcap-devel
+BuildRequires: libtool autoconf automake pkgconfig
 
 # gettext-devel is needed for running autoconf because of the
 # presence of AM_ICONV
@@ -189,6 +189,7 @@ autoreconf -i -f
     INSTALL_DATA="install -c -p -m644" \
     --enable-header-install      \
     --disable-static             \
+    --with-libcap                \
 %if %{build_postgres}
     --with-pgsql                 \
 %endif
@@ -456,6 +457,22 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.9-1
+- sieve updated to 0.1.14
+- managesieve updated to 0.11.10 
+- updated to 1.2.9
+- maildir: When saving, filenames now always contain ,S=<size>.
+  Previously this was done only when quota plugin was loaded. It's
+  required for zlib plugin and may be useful for other things too.
+- maildir: v1.2.7 and v1.2.8 caused assert-crashes in
+  maildir_uidlist_records_drop_expunges()
+- maildir_copy_preserve_filename=yes could have caused crashes.
+- Maildir++ quota: % limits weren't updated when limits were read
+  from maildirsize.
+- virtual: v1.2.8 didn't fully fix the "lots of mailboxes" bug
+- virtual: Fixed updating virtual mailbox based on flag changes.
+- fts-squat: Fixed searching multi-byte characters.
+
 * Tue Nov 24 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.8-2
 - fix dovecot's restart after update (#518753)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-11/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	20 Nov 2009 09:26:16 -0000	1.75
+++ sources	22 Dec 2009 19:48:32 -0000	1.76
@@ -1,4 +1,4 @@
-c6d6c061413d299ccea7b55c3e4faa0a  dovecot-1.2.8.tar.gz
-923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-e67d5fe0c362b0b9cfcec54ae1ee0240  dovecot-1.2.7-managesieve-0.11.9.diff.gz
-6151ab50e24abc0384358b1618c8048f  dovecot-1.2-sieve-0.1.13.tar.gz
+036ff97fb248dae3bd4b796a0644634f  dovecot-1.2.9.tar.gz
+ea1e931fd0e4a8b6789a9d671a5a6676  dovecot-1.2-managesieve-0.11.10.tar.gz
+ec5564187789d47b5896a65f3f89ba9f  dovecot-1.2.9-managesieve-0.11.10.diff.gz
+01a92883fde76a5f985b0343e81b0c3d  dovecot-1.2-sieve-0.1.14.tar.gz



From drago01 at fedoraproject.org  Tue Dec 22 19:48:36 2009
From: drago01 at fedoraproject.org (drago01)
Date: Tue, 22 Dec 2009 19:48:36 +0000 (UTC)
Subject: rpms/fsarchiver/F-11 fsarchiver.spec,1.18,1.19
Message-ID: <20091222194836.CEC1A11C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7829

Modified Files:
	fsarchiver.spec 
Log Message:
fix typo


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/fsarchiver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fsarchiver.spec	22 Dec 2009 19:40:14 -0000	1.18
+++ fsarchiver.spec	22 Dec 2009 19:48:36 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		fsarchiver
-Version:	0.6.1
-Release:	2%{?dist}
+Version:	0.6.2
+Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving



From linville at fedoraproject.org  Tue Dec 22 19:49:43 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 22 Dec 2009 19:49:43 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.26,1.27
Message-ID: <20091222194943.C7E9711C00EF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8143

Modified Files:
	crda.spec 
Log Message:
Add libgcrypt and libnl to Requires


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- crda.spec	21 Dec 2009 21:06:40 -0000	1.26
+++ crda.spec	22 Dec 2009 19:49:43 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -17,7 +17,7 @@ BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
 BuildRequires:  gzip
 
-Requires:       udev, iw
+Requires:       udev, iw, libgcrypt, libnl
 
 Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
 Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-4
+- Add libgcrypt and libnl to Requires
+
 * Mon Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-3
 - Add man page for setregdomain (from Andrew Hecox <ahecox at redhat.com>)
 - Change $RPM_BUILD_ROOT to %{buildroot}



From mhlavink at fedoraproject.org  Tue Dec 22 19:52:30 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 19:52:30 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-12 .cvsignore, 1.15,
	1.16 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.4,
	1.5 cyrus-imapd-2.3.12p2-current-db.patch, 1.1,
	1.2 cyrus-imapd-2.3.7-krb4.patch, 1.1, 1.2 cyrus-imapd.spec,
	1.65, 1.66 sources, 1.17, 1.18
Message-ID: <20091222195231.0ADFF11C00EF@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/cyrus-imapd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8596

Modified Files:
	.cvsignore cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 
	cyrus-imapd-2.3.12p2-current-db.patch 
	cyrus-imapd-2.3.7-krb4.patch cyrus-imapd.spec sources 
Log Message:
updated to 2.3.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	18 Sep 2009 13:23:59 -0000	1.15
+++ .cvsignore	22 Dec 2009 19:52:30 -0000	1.16
@@ -1,2 +1,2 @@
-cyrus-imapd-2.3.15.tar.gz
+cyrus-imapd-2.3.16.tar.gz
 cyrus_sharedbackup-0.1.tar.gz

cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:
 cyrus-imapd-2.3.13/README.autocreate    |  211 +++++++++++
 cyrus-imapd-2.3.15/imap/Makefile.in     |  155 ++++----
 cyrus-imapd-2.3.15/imap/autosieve.c     |  590 ++++++++++++++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/compile_sieve.c |  365 +++++++++++++++++++
 cyrus-imapd-2.3.15/imap/imapd.c         |   43 ++
 cyrus-imapd-2.3.15/imap/lmtpd.c         |   92 ++++
 cyrus-imapd-2.3.15/imap/mboxlist.c      |  370 ++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/mboxlist.h      |    4 
 cyrus-imapd-2.3.15/imap/pop3d.c         |   46 ++
 cyrus-imapd-2.3.15/lib/auth.c           |    8 
 cyrus-imapd-2.3.15/lib/auth.h           |    2 
 cyrus-imapd-2.3.15/lib/auth_krb.c       |   17 
 cyrus-imapd-2.3.15/lib/auth_krb5.c      |   15 
 cyrus-imapd-2.3.15/lib/auth_pts.c       |    9 
 cyrus-imapd-2.3.15/lib/auth_unix.c      |   11 
 cyrus-imapd-2.3.15/lib/imapoptions      |   49 ++
 cyrus-imapd-2.3.15/notifyd/Makefile.in  |    3 
 cyrus-imapd-2.3.15/notifyd/notifyd.c    |    2 
 cyrus-imapd-2.3.15/ptclient/Makefile.in |    3 
 19 files changed, 1916 insertions(+), 79 deletions(-)

Index: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-12/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	18 Sep 2009 13:21:33 -0000	1.4
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	22 Dec 2009 19:52:30 -0000	1.5
@@ -1480,9 +1480,9 @@ diff -up cyrus-imapd-2.3.15/imap/mboxlis
  #define FNAME_SUBSSUFFIX ".sub"
  
  /*
-@@ -3413,3 +3437,349 @@ int mboxlist_delayed_delete_isenabled(vo
+@@ -3446,3 +3470,349 @@ int mboxlist_delayed_delete_isenabled(vo
  
-     return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
+     return(count);
  }
 +
 +/*
@@ -1833,10 +1833,10 @@ diff -up cyrus-imapd-2.3.15/imap/mboxlis
 diff -up cyrus-imapd-2.3.15/imap/mboxlist.h.autocreate cyrus-imapd-2.3.15/imap/mboxlist.h
 --- cyrus-imapd-2.3.15/imap/mboxlist.h.autocreate	2009-05-05 03:20:03.000000000 +0200
 +++ cyrus-imapd-2.3.15/imap/mboxlist.h	2009-09-18 11:11:39.778115814 +0200
-@@ -216,4 +216,8 @@ int mboxlist_commit(struct txn *tid);
- int mboxlist_abort(struct txn *tid);
+@@ -221,4 +221,8 @@ int mboxlist_commit(struct txn *tid);
+ int mboxlist_count_inferiors(char *mailboxname, int isadmin, char *userid,
+                              struct auth_state *authstate);
  
- int mboxlist_delayed_delete_isenabled(void);
 +int mboxlist_autocreateinbox(struct namespace *namespace,char *userid,
 +                       struct auth_state *auth_state, char *mailboxname, 
 +                       int autocreatequota);

cyrus-imapd-2.3.12p2-current-db.patch:
 berkdb.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: cyrus-imapd-2.3.12p2-current-db.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-12/cyrus-imapd-2.3.12p2-current-db.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.12p2-current-db.patch	26 Sep 2008 11:39:02 -0000	1.1
+++ cyrus-imapd-2.3.12p2-current-db.patch	22 Dec 2009 19:52:30 -0000	1.2
@@ -4,8 +4,8 @@
  	fi
  
  	saved_LIBS=$LIBS
--        for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
+-        for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    AC_TRY_LINK([#include <stdio.h>

cyrus-imapd-2.3.7-krb4.patch:
 pop3d.c   |    2 --
 version.c |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

Index: cyrus-imapd-2.3.7-krb4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-12/cyrus-imapd-2.3.7-krb4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.7-krb4.patch	24 Jan 2007 12:52:37 -0000	1.1
+++ cyrus-imapd-2.3.7-krb4.patch	22 Dec 2009 19:52:30 -0000	1.2
@@ -13,7 +13,7 @@
 --- cyrus-imapd-2.3.7/imap/pop3d.c.krb4	2007-01-22 15:41:14.000000000 +0100
 +++ cyrus-imapd-2.3.7/imap/pop3d.c	2007-01-22 15:41:15.000000000 +0100
 @@ -88,8 +88,6 @@
- #include "sync_log.h"
+ #include "statuscache.h"
  
  #ifdef HAVE_KRB
 -/* kerberos des is purported to conflict with OpenSSL DES */


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-12/cyrus-imapd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- cyrus-imapd.spec	4 Dec 2009 12:31:35 -0000	1.65
+++ cyrus-imapd.spec	22 Dec 2009 19:52:30 -0000	1.66
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
-Version: 2.3.15
-Release: 6%{?dist}
+Version: 2.3.16
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -115,10 +115,6 @@ Patch15: cyrus-imapd-2.3.1-make_md5_defa
 Patch18: cyrus-imapd-2.3.7-krb4.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=461875
 Patch19: cyrus-imapd-2.3.12p2-current-db.patch
-Patch20: cyrus-imapd-2.3.15-bufov.patch
-
-# required for c-i <= 2.3.15, rhbz#528093
-Patch21: cyrus-imapd-2.3.15-nodebug.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf >= 2.59
@@ -217,8 +213,6 @@ one running the server.
 %patch15 -p1 -b .make_md5_defaults
 %patch18 -p1 -b .krb4
 %patch19 -p1 -b .db4.7
-%patch20 -p1 -b .bufov
-%patch21 -p1 -b .nodebug
 
 # only to update config.* files
 automake -a -f -c || :
@@ -736,6 +730,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.16-1
+- updated to 2.3.16
+
 * Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-6
 - fix cyrus shell for daily cron job (#544182)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2009 13:23:59 -0000	1.17
+++ sources	22 Dec 2009 19:52:30 -0000	1.18
@@ -1,2 +1,2 @@
-d89cb1b55023188938f332b7ef120fae  cyrus-imapd-2.3.15.tar.gz
+6a37feb1985974eee8a4a4b2932dd54c  cyrus-imapd-2.3.16.tar.gz
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz



From akurtakov at fedoraproject.org  Tue Dec 22 19:53:57 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 19:53:57 +0000 (UTC)
Subject: rpms/plexus-velocity/devel plexus-velocity.spec,1.11,1.12
Message-ID: <20091222195357.5C81611C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9374/devel

Modified Files:
	plexus-velocity.spec 
Log Message:
BR maven-surefire-provider-junit.



Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- plexus-velocity.spec	22 Dec 2009 19:45:13 -0000	1.11
+++ plexus-velocity.spec	22 Dec 2009 19:53:57 -0000	1.12
@@ -40,7 +40,7 @@
 
 Name:           plexus-velocity
 Version:        1.1.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
@@ -65,6 +65,7 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  plexus-maven-plugin
 BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia-sitetools
 %endif
 BuildRequires:  ant-contrib
@@ -179,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-4
+- BR maven-surefire-provider-junit.
+
 * Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-3
 - BR maven-doxia-sitetools.
 



From ivaxer at fedoraproject.org  Tue Dec 22 19:54:29 2009
From: ivaxer at fedoraproject.org (John A. Khvatov)
Date: Tue, 22 Dec 2009 19:54:29 +0000 (UTC)
Subject: rpms/opensips/F-12 .cvsignore, 1.2, 1.3 import.log, 1.3,
	1.4 opensips.spec, 1.3, 1.4 sources, 1.2,
	1.3 opensips--init.patch, 1.1, NONE opensips--openssl10.patch,
	1.1, NONE
Message-ID: <20091222195429.44E5211C00EF@cvs1.fedora.phx.redhat.com>

Author: ivaxer

Update of /cvs/pkgs/rpms/opensips/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9402/F-12

Modified Files:
	.cvsignore import.log opensips.spec sources 
Removed Files:
	opensips--init.patch opensips--openssl10.patch 
Log Message:
- Updated to 1.6.1
- Dropped upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Nov 2009 10:42:45 -0000	1.2
+++ .cvsignore	22 Dec 2009 19:54:28 -0000	1.3
@@ -1 +1 @@
-opensips-1.6.0-tls_src.tar.gz
+opensips-1.6.1-tls_src.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Nov 2009 16:52:36 -0000	1.3
+++ import.log	22 Dec 2009 19:54:28 -0000	1.4
@@ -1,3 +1,4 @@
 opensips-1_6_0-2_fc11:F-12:opensips-1.6.0-2.fc11.src.rpm:1257244682
 opensips-1_6_0-3_fc11:F-12:opensips-1.6.0-3.fc11.src.rpm:1257250407
 opensips-1_6_0-4_fc11:F-12:opensips-1.6.0-4.fc11.src.rpm:1257353265
+opensips-1_6_1-1_fc12:F-12:opensips-1.6.1-1.fc12.src.rpm:1261511588


Index: opensips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/F-12/opensips.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- opensips.spec	4 Nov 2009 16:52:36 -0000	1.3
+++ opensips.spec	22 Dec 2009 19:54:28 -0000	1.4
@@ -9,14 +9,12 @@
 
 Summary:  Open Source SIP Server
 Name:     opensips
-Version:  1.6.0
-Release:  4%{?dist}
+Version:  1.6.1
+Release:  1%{?dist}
 License:  GPLv2+
 Group:    System Environment/Daemons
 Source0:  http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
 Source1:  %{name}.sysconfig
-Patch1:   opensips--init.patch
-Patch2:   opensips--openssl10.patch
 URL:      http://opensips.org
 
 BuildRequires:  expat-devel
@@ -502,8 +500,6 @@ clients.
 
 %prep
 %setup -q -n %{name}-%{version}-tls
-%patch1 -p1
-%patch2 -p1
 
 %build
 LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -990,6 +986,10 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Thu Dec 22 2009 John Khvatov <ivaxer at fedoraproject.org> - 1.6.1-1:
+- Updated to 1.6.1
+- Dropped upstreamed patches
+
 * Wed Nov 04 2009 John Khvatov <ivaxer at fedoraproject.org> - 1.6.0-4:
 - Fixed typo: pia_mi to pua_mi in presence_xcapdiff dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Nov 2009 10:42:45 -0000	1.2
+++ sources	22 Dec 2009 19:54:29 -0000	1.3
@@ -1 +1 @@
-c9dbca1dc74e0a3a383f61e3dc4844df  opensips-1.6.0-tls_src.tar.gz
+ac2b6cda151ee9dca7b6e3d7e5527a42  opensips-1.6.1-tls_src.tar.gz


--- opensips--init.patch DELETED ---


--- opensips--openssl10.patch DELETED ---



From linville at fedoraproject.org  Tue Dec 22 19:55:47 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 22 Dec 2009 19:55:47 +0000 (UTC)
Subject: rpms/iw/devel iw.spec,1.20,1.21
Message-ID: <20091222195547.C750B11C00EF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9955

Modified Files:
	iw.spec 
Log Message:
Add libnl to Requires


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- iw.spec	18 Dec 2009 20:04:59 -0000	1.20
+++ iw.spec	22 Dec 2009 19:55:47 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           iw
 Version:        0.9.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -9,9 +9,11 @@ URL:            http://www.linuxwireless
 Source0:        http://wireless.kernel.org/download/iw/iw-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kernel-headers >= 2.6.24 
-BuildRequires: libnl-devel >= 1.0
-BuildRequires: pkgconfig      
+BuildRequires:  kernel-headers >= 2.6.24 
+BuildRequires:  libnl-devel >= 1.0
+BuildRequires:  pkgconfig      
+
+Requires:       libnl
 
 %description
 iw is a new nl80211 based CLI configuration utility for wireless devices.
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Tue Dec 21 2009 John W. Linville <linville at redhat.com> 0.9.18-3
+- Add libnl to Requires
+
 * Wed Dec 18 2009 John W. Linville <linville at redhat.com> 0.9.18-2
 - BuildRequires kernels-headers instead of kernel-devel
 



From mhlavink at fedoraproject.org  Tue Dec 22 19:55:48 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 22 Dec 2009 19:55:48 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-11 .cvsignore, 1.15,
	1.16 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.4,
	1.5 cyrus-imapd-2.3.12p2-current-db.patch, 1.1,
	1.2 cyrus-imapd-2.3.7-krb4.patch, 1.1, 1.2 cyrus-imapd.spec,
	1.60, 1.61 sources, 1.17, 1.18 cyrus-imapd-2.3.13-bufov.patch,
	1.2, NONE cyrus-imapd-2.3.15-nodebug.patch, 1.1, NONE
Message-ID: <20091222195548.9A68B11C00EF@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/pkgs/rpms/cyrus-imapd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9813

Modified Files:
	.cvsignore cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 
	cyrus-imapd-2.3.12p2-current-db.patch 
	cyrus-imapd-2.3.7-krb4.patch cyrus-imapd.spec sources 
Removed Files:
	cyrus-imapd-2.3.13-bufov.patch 
	cyrus-imapd-2.3.15-nodebug.patch 
Log Message:
updated to 2.3.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	18 Sep 2009 13:58:19 -0000	1.15
+++ .cvsignore	22 Dec 2009 19:55:17 -0000	1.16
@@ -1,2 +1,2 @@
-cyrus-imapd-2.3.15.tar.gz
+cyrus-imapd-2.3.16.tar.gz
 cyrus_sharedbackup-0.1.tar.gz

cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:
 cyrus-imapd-2.3.13/README.autocreate    |  211 +++++++++++
 cyrus-imapd-2.3.15/imap/Makefile.in     |  155 ++++----
 cyrus-imapd-2.3.15/imap/autosieve.c     |  590 ++++++++++++++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/compile_sieve.c |  365 +++++++++++++++++++
 cyrus-imapd-2.3.15/imap/imapd.c         |   43 ++
 cyrus-imapd-2.3.15/imap/lmtpd.c         |   92 ++++
 cyrus-imapd-2.3.15/imap/mboxlist.c      |  370 ++++++++++++++++++++
 cyrus-imapd-2.3.15/imap/mboxlist.h      |    4 
 cyrus-imapd-2.3.15/imap/pop3d.c         |   46 ++
 cyrus-imapd-2.3.15/lib/auth.c           |    8 
 cyrus-imapd-2.3.15/lib/auth.h           |    2 
 cyrus-imapd-2.3.15/lib/auth_krb.c       |   17 
 cyrus-imapd-2.3.15/lib/auth_krb5.c      |   15 
 cyrus-imapd-2.3.15/lib/auth_pts.c       |    9 
 cyrus-imapd-2.3.15/lib/auth_unix.c      |   11 
 cyrus-imapd-2.3.15/lib/imapoptions      |   49 ++
 cyrus-imapd-2.3.15/notifyd/Makefile.in  |    3 
 cyrus-imapd-2.3.15/notifyd/notifyd.c    |    2 
 cyrus-imapd-2.3.15/ptclient/Makefile.in |    3 
 19 files changed, 1916 insertions(+), 79 deletions(-)

Index: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-11/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	18 Sep 2009 13:58:19 -0000	1.4
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	22 Dec 2009 19:55:17 -0000	1.5
@@ -1480,9 +1480,9 @@ diff -up cyrus-imapd-2.3.15/imap/mboxlis
  #define FNAME_SUBSSUFFIX ".sub"
  
  /*
-@@ -3413,3 +3437,349 @@ int mboxlist_delayed_delete_isenabled(vo
+@@ -3446,3 +3470,349 @@ int mboxlist_delayed_delete_isenabled(vo
  
-     return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
+     return(count);
  }
 +
 +/*
@@ -1833,10 +1833,10 @@ diff -up cyrus-imapd-2.3.15/imap/mboxlis
 diff -up cyrus-imapd-2.3.15/imap/mboxlist.h.autocreate cyrus-imapd-2.3.15/imap/mboxlist.h
 --- cyrus-imapd-2.3.15/imap/mboxlist.h.autocreate	2009-05-05 03:20:03.000000000 +0200
 +++ cyrus-imapd-2.3.15/imap/mboxlist.h	2009-09-18 11:11:39.778115814 +0200
-@@ -216,4 +216,8 @@ int mboxlist_commit(struct txn *tid);
- int mboxlist_abort(struct txn *tid);
+@@ -221,4 +221,8 @@ int mboxlist_commit(struct txn *tid);
+ int mboxlist_count_inferiors(char *mailboxname, int isadmin, char *userid,
+                              struct auth_state *authstate);
  
- int mboxlist_delayed_delete_isenabled(void);
 +int mboxlist_autocreateinbox(struct namespace *namespace,char *userid,
 +                       struct auth_state *auth_state, char *mailboxname, 
 +                       int autocreatequota);

cyrus-imapd-2.3.12p2-current-db.patch:
 berkdb.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: cyrus-imapd-2.3.12p2-current-db.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-11/cyrus-imapd-2.3.12p2-current-db.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.12p2-current-db.patch	26 Sep 2008 11:39:02 -0000	1.1
+++ cyrus-imapd-2.3.12p2-current-db.patch	22 Dec 2009 19:55:17 -0000	1.2
@@ -4,8 +4,8 @@
  	fi
  
  	saved_LIBS=$LIBS
--        for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
+-        for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    AC_TRY_LINK([#include <stdio.h>

cyrus-imapd-2.3.7-krb4.patch:
 pop3d.c   |    2 --
 version.c |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

Index: cyrus-imapd-2.3.7-krb4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-11/cyrus-imapd-2.3.7-krb4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cyrus-imapd-2.3.7-krb4.patch	24 Jan 2007 12:52:37 -0000	1.1
+++ cyrus-imapd-2.3.7-krb4.patch	22 Dec 2009 19:55:48 -0000	1.2
@@ -13,7 +13,7 @@
 --- cyrus-imapd-2.3.7/imap/pop3d.c.krb4	2007-01-22 15:41:14.000000000 +0100
 +++ cyrus-imapd-2.3.7/imap/pop3d.c	2007-01-22 15:41:15.000000000 +0100
 @@ -88,8 +88,6 @@
- #include "sync_log.h"
+ #include "statuscache.h"
  
  #ifdef HAVE_KRB
 -/* kerberos des is purported to conflict with OpenSSL DES */


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-11/cyrus-imapd.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- cyrus-imapd.spec	4 Dec 2009 12:32:34 -0000	1.60
+++ cyrus-imapd.spec	22 Dec 2009 19:55:48 -0000	1.61
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
-Version: 2.3.15
-Release: 5%{?dist}
+Version: 2.3.16
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -115,10 +115,6 @@ Patch15: cyrus-imapd-2.3.1-make_md5_defa
 Patch18: cyrus-imapd-2.3.7-krb4.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=461875
 Patch19: cyrus-imapd-2.3.12p2-current-db.patch
-Patch20: cyrus-imapd-2.3.13-bufov.patch
-
-# required for c-i <= 2.3.15, rhbz#528093
-Patch21: cyrus-imapd-2.3.15-nodebug.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf >= 2.59
@@ -217,8 +213,6 @@ one running the server.
 %patch15 -p1 -b .make_md5_defaults
 %patch18 -p1 -b .krb4
 %patch19 -p1 -b .db4.7
-%patch20 -p1 -b .bufov
-%patch21 -p1 -b .nodebug
 
 # only to update config.* files
 automake -a -f -c || :
@@ -736,6 +730,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.16-1
+- updated to 2.3.16
+
 * Fri Dec 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-5
 - fix shell for daily cron job (#544182)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2009 13:58:19 -0000	1.17
+++ sources	22 Dec 2009 19:55:48 -0000	1.18
@@ -1,2 +1,2 @@
-d89cb1b55023188938f332b7ef120fae  cyrus-imapd-2.3.15.tar.gz
+6a37feb1985974eee8a4a4b2932dd54c  cyrus-imapd-2.3.16.tar.gz
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz


--- cyrus-imapd-2.3.13-bufov.patch DELETED ---


--- cyrus-imapd-2.3.15-nodebug.patch DELETED ---



From akurtakov at fedoraproject.org  Tue Dec 22 20:04:41 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 20:04:41 +0000 (UTC)
Subject: rpms/plexus-velocity/devel plexus-velocity.spec,1.12,1.13
Message-ID: <20091222200441.D5B1911C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11503/devel

Modified Files:
	plexus-velocity.spec 
Log Message:
BR java-devel 1.6.


Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- plexus-velocity.spec	22 Dec 2009 19:53:57 -0000	1.12
+++ plexus-velocity.spec	22 Dec 2009 20:04:41 -0000	1.13
@@ -40,7 +40,7 @@
 
 Name:           plexus-velocity
 Version:        1.1.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
@@ -56,6 +56,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
+BuildRequires:  java-devel >= 1.6.0
 %if %{with_maven}
 BuildRequires:  maven2 >= 2.0.4-10jpp
 BuildRequires:  maven2-plugin-compiler
@@ -180,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-5
+- BR java-devel 1.6.
+
 * Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.8-4
 - BR maven-surefire-provider-junit.
 



From cassmodiah at fedoraproject.org  Tue Dec 22 20:17:10 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Tue, 22 Dec 2009 20:17:10 +0000 (UTC)
Subject: File fife-2009.0_r3111.tar.gz uploaded to lookaside cache by
	cassmodiah
Message-ID: <20091222201710.DA09710F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fife:

a0e774ce33fd1024bc3a2b45cb3c3c8a  fife-2009.0_r3111.tar.gz



From cassmodiah at fedoraproject.org  Tue Dec 22 20:20:27 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Tue, 22 Dec 2009 20:20:27 +0000 (UTC)
Subject: rpms/fife/devel .cvsignore, 1.3, 1.4 fife.spec, 1.5, 1.6 import.log, 
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091222202027.36B4A11C00EF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/fife/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13511/devel

Modified Files:
	.cvsignore fife.spec import.log sources 
Log Message:
update to r3111



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Oct 2009 18:22:42 -0000	1.3
+++ .cvsignore	22 Dec 2009 20:20:26 -0000	1.4
@@ -1 +1 @@
-fife-2009.0_r3056.tar.gz
+fife-2009.0_r3111.tar.gz


Index: fife.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/fife.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- fife.spec	8 Oct 2009 20:03:00 -0000	1.5
+++ fife.spec	22 Dec 2009 20:20:26 -0000	1.6
@@ -1,9 +1,9 @@
-%global revision r3056
+%global revision r3111
 %global pyver %(python -c 'import sys ; print sys.version[:3]')
 
 Name:           fife
 Version:        2009.0
-Release:        0.26.%{revision}svn%{?dist}
+Release:        0.27.%{revision}svn%{?dist}
 Summary:        Cross platform game creation framework
 
 Group:          Amusements/Games
@@ -11,13 +11,14 @@ License:        LGPLv2+
 URL:            http://www.fifengine.de
 
 # svn co http://fife.svn.cvsdude.com/engine/trunk fife-2009.0
-# mv fife-2009.0 fife-2009.0_r3056
-# cd fife-2009.0_r3056 && find . -name '.s*' -exec rm -rf {} \;
+# mv fife-2009.0 fife-2009.0_r3111
+# cd fife-2009.0_r3111 && find . -name '.s*' -exec rm -rf {} \;
 # rm -rf tests/   -  removed for legal issues
 # rm -rf clients/   -  removed for legal issues
 # rm -rf ext/   -  removed for using system libs instead of shipped
-# rm -rf patches/	-	not needed
-# tar -czvf fife-2009.0_r3056.tar.gz fife-2009.0_r3056
+# rm -rf patches/   -   not needed
+# cd ..
+# tar -czvf fife-2009.0_r3111.tar.gz fife-2009.0_r3111
 Source0:        %{name}-%{version}_%{revision}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -115,6 +116,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 12 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2009.0-0.27.r3111svn
+- Update to r3111
+
 * Thu Oct 08 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2009.0-0.26.r3056svn
 - There are no errors revoked spec changes!
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Oct 2009 18:36:33 -0000	1.3
+++ import.log	22 Dec 2009 20:20:26 -0000	1.4
@@ -1,3 +1,4 @@
 fife-2009_0-0_24_r3054svn_fc11:HEAD:fife-2009.0-0.24.r3054svn.fc11.src.rpm:1254259577
 fife-2009_0-0_24_r3056svn_fc11:HEAD:fife-2009.0-0.24.r3056svn.fc11.src.rpm:1255026127
 fife-2009_0-0_25_r3056svn_fc11:HEAD:fife-2009.0-0.25.r3056svn.fc11.src.rpm:1255026957
+fife-2009_0-0_27_r3111svn_fc12:HEAD:fife-2009.0-0.27.r3111svn.fc12.src.rpm:1261513013


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Oct 2009 18:36:33 -0000	1.4
+++ sources	22 Dec 2009 20:20:26 -0000	1.5
@@ -1 +1 @@
-da9e8981e60d3d9a3e1fa8be8493d4a0  fife-2009.0_r3056.tar.gz
+a0e774ce33fd1024bc3a2b45cb3c3c8a  fife-2009.0_r3111.tar.gz



From wtogami at fedoraproject.org  Tue Dec 22 20:23:25 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 22 Dec 2009 20:23:25 +0000 (UTC)
Subject: File Mail-SpamAssassin-3.3.0-rc1.proposed2.tar.bz2 uploaded to
	lookaside cache by wtogami
Message-ID: <20091222202325.61DBD10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for spamassassin:

41a68daf1bae2ded652a74c77b1fb498  Mail-SpamAssassin-3.3.0-rc1.proposed2.tar.bz2



From wtogami at fedoraproject.org  Tue Dec 22 20:23:28 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 22 Dec 2009 20:23:28 +0000 (UTC)
Subject: File Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz uploaded to
	lookaside cache by wtogami
Message-ID: <20091222202328.8EA5910F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for spamassassin:

a7f03934e048ad6f277b55e95ed8e3ca  Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz



From wtogami at fedoraproject.org  Tue Dec 22 20:26:45 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 22 Dec 2009 20:26:45 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore, 1.56, 1.57 sources, 1.56,
	1.57 spamassassin.spec, 1.140, 1.141
Message-ID: <20091222202645.950EA11C00EF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14739

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
3.3.0-rc1.proposed2 with fixed spamc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	19 Dec 2009 03:08:01 -0000	1.56
+++ .cvsignore	22 Dec 2009 20:26:45 -0000	1.57
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
-Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2
+Mail-SpamAssassin-3.3.0-rc1.proposed2.tar.bz2
+Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	22 Dec 2009 05:39:47 -0000	1.56
+++ sources	22 Dec 2009 20:26:45 -0000	1.57
@@ -1,2 +1,2 @@
-9b39e4e4fad09cfe9eff974f3d5a01ea  Mail-SpamAssassin-3.3.0-beta1.tar.bz2
-cbd092c4e0e71b531f7aca81d4eb2781  Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+41a68daf1bae2ded652a74c77b1fb498  Mail-SpamAssassin-3.3.0-rc1.proposed2.tar.bz2
+a7f03934e048ad6f277b55e95ed8e3ca  Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- spamassassin.spec	22 Dec 2009 05:49:51 -0000	1.140
+++ spamassassin.spec	22 Dec 2009 20:26:45 -0000	1.141
@@ -53,12 +53,13 @@ Requires: portreserve
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename beta1
-Release: 0.24.%{prename}%{?dist}
+%define prename rc1
+%define proposed .proposed2
+Release: 0.26.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
 Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
@@ -260,6 +261,8 @@ fi
 exit 0
 
 %changelog
+* Mon Dec 21 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.26.rc1
+- 3.3.0-rc1.proposed2 with fixed spamc
 
 * Mon Dec 21 2009 Nick Bebout <nb at fedoraproject.org> - 3.3.0-0.24.beta1
 - Revert to beta1 to fix major error where spamc does nothing and mail



From mclasen at fedoraproject.org  Tue Dec 22 20:27:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 20:27:11 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.167,1.168
Message-ID: <20091222202711.D23B411C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14825

Modified Files:
	file-roller.spec 
Log Message:
fix build



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- file-roller.spec	22 Dec 2009 17:52:36 -0000	1.167
+++ file-roller.spec	22 Dec 2009 20:27:11 -0000	1.168
@@ -48,10 +48,12 @@ such as tar or zip files.
 %setup -q
 
 %build
-%configure --disable-scrollkeeper --disable-static
+%configure 	--disable-scrollkeeper 		\
+		--disable-static 		\
+		--enable-nautilus-actions	\
+		--enable-packagekit
+
 export tagname=CC
-# https://bugzilla.gnome.org/show_bug.cgi?id=603492
-sed -i -e 's/DBUS_LIBS = /DBUS_LIBS = -ldbus-glib-1/' src/Makefile
 make LIBTOOL=/usr/bin/libtool
 
 %install



From linville at fedoraproject.org  Tue Dec 22 20:37:02 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 22 Dec 2009 20:37:02 +0000 (UTC)
Subject: rpms/libnl/F-12 libnl.spec,1.30,1.31
Message-ID: <20091222203702.A9C2811C00EF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/libnl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16266

Modified Files:
	libnl.spec 
Log Message:
Install libnl into /%{_lib} instead of %{_libdir}


Index: libnl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnl/F-12/libnl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libnl.spec	25 Jul 2009 06:13:31 -0000	1.30
+++ libnl.spec	22 Dec 2009 20:37:02 -0000	1.31
@@ -3,7 +3,7 @@ Group: Development/Libraries
 License: LGPLv2
 Name: libnl
 Version: 1.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://people.suug.ch/~tgr/libnl/
 Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -53,6 +53,13 @@ make gendoc
 %{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libnl.so.* $RPM_BUILD_ROOT/%{_lib}
+for l in $RPM_BUILD_ROOT%{_libdir}/libnl.so; do
+    ln -sf $(echo %{_libdir} | \
+        sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
+done
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -61,7 +68,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_libdir}/%{name}.so.*
+/%{_lib}/%{name}.so.*
 %doc COPYING
 
 %files devel
@@ -73,6 +80,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
+* Tue Dec 22 2009 John W. Linville <linville at redhat.com> - 1.1-9
+- Install libnl into /%{_lib} instead of %{_libdir}
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From linville at fedoraproject.org  Tue Dec 22 20:37:11 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 22 Dec 2009 20:37:11 +0000 (UTC)
Subject: rpms/libnl/devel libnl.spec,1.30,1.31
Message-ID: <20091222203711.D521F11C00EF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/libnl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16313

Modified Files:
	libnl.spec 
Log Message:
Install libnl into /%{_lib} instead of %{_libdir}


Index: libnl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libnl.spec	25 Jul 2009 06:13:31 -0000	1.30
+++ libnl.spec	22 Dec 2009 20:37:11 -0000	1.31
@@ -3,7 +3,7 @@ Group: Development/Libraries
 License: LGPLv2
 Name: libnl
 Version: 1.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://people.suug.ch/~tgr/libnl/
 Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -53,6 +53,13 @@ make gendoc
 %{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libnl.so.* $RPM_BUILD_ROOT/%{_lib}
+for l in $RPM_BUILD_ROOT%{_libdir}/libnl.so; do
+    ln -sf $(echo %{_libdir} | \
+        sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
+done
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -61,7 +68,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_libdir}/%{name}.so.*
+/%{_lib}/%{name}.so.*
 %doc COPYING
 
 %files devel
@@ -73,6 +80,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
+* Tue Dec 22 2009 John W. Linville <linville at redhat.com> - 1.1-9
+- Install libnl into /%{_lib} instead of %{_libdir}
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From linville at fedoraproject.org  Tue Dec 22 20:37:40 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 22 Dec 2009 20:37:40 +0000 (UTC)
Subject: rpms/libnl/F-11 libnl-1.1-no-extern-inline.patch, NONE, 1.1 libnl.spec,
	1.28, 1.29
Message-ID: <20091222203740.DAE3711C00EF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/libnl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16396

Modified Files:
	libnl.spec 
Added Files:
	libnl-1.1-no-extern-inline.patch 
Log Message:
Install libnl into /%{_lib} instead of %{_libdir}

libnl-1.1-no-extern-inline.patch:
 doc/Doxyfile.in          |    2 +-
 include/netlink/object.h |    2 +-
 lib/object.c             |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE libnl-1.1-no-extern-inline.patch ---
>From 84fefcadcde5d6c343db7f5c1744f6b1f070bc71 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Thu, 14 May 2009 11:30:40 -0400
Subject: [PATCH] Remove "inline" keyword from nl_object_priv().

"extern inline foo();" in a header file generates a compiler warning in
consumers of the library.  Also, it doesn't make any sense whatsoever.
For this reason, and the fact that this function is not used at all in
the file in which it's defined, I have removed the "inline" keyword.
---
 doc/Doxyfile.in          |    2 +-
 include/netlink/object.h |    2 +-
 lib/object.c             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 0c518b7..396fcbc 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -113,7 +113,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH = /home/pjones/build/BUILD/libnl-1.1
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
diff --git a/include/netlink/object.h b/include/netlink/object.h
index 751a1b3..241a2ad 100644
--- a/include/netlink/object.h
+++ b/include/netlink/object.h
@@ -55,7 +55,7 @@ extern int			nl_object_is_marked(struct nl_object *);
 /* Access Functions */
 extern int			nl_object_get_refcnt(struct nl_object *);
 extern struct nl_cache *	nl_object_get_cache(struct nl_object *);
-extern inline void *		nl_object_priv(struct nl_object *);
+extern void *			nl_object_priv(struct nl_object *);
 
 #ifdef __cplusplus
 }
diff --git a/lib/object.c b/lib/object.c
index 74f6e2d..845ca1d 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -376,7 +376,7 @@ struct nl_cache *nl_object_get_cache(struct nl_object *obj)
 	return obj->ce_cache;
 }
 
-inline void *nl_object_priv(struct nl_object *obj)
+void *nl_object_priv(struct nl_object *obj)
 {
 	return obj;
 }
-- 
1.6.2.2



Index: libnl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnl/F-11/libnl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libnl.spec	25 Feb 2009 16:40:17 -0000	1.28
+++ libnl.spec	22 Dec 2009 20:37:40 -0000	1.29
@@ -3,7 +3,7 @@ Group: Development/Libraries
 License: LGPLv2
 Name: libnl
 Version: 1.1
-Release: 6%{?dist}
+Release: 9%{?dist}
 URL: http://people.suug.ch/~tgr/libnl/
 Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -14,6 +14,7 @@ Patch3: libnl-1.0-pre8-use-vasprintf-ret
 Patch4: libnl-1.0-pre8-more-build-output.patch
 Patch5: libnl-1.1-include-limits-h.patch
 Patch6: libnl-1.1-doc-inlinesrc.patch
+Patch7: libnl-1.1-no-extern-inline.patch
 
 %description
 This package contains a convenience library to simplify
@@ -38,6 +39,7 @@ This package contains various headers fo
 %patch4 -p1 -b .more-build-output
 %patch5 -p1 -b .limits
 %patch6 -p1 -b .doc-inlinesrc
+%patch7 -p1 -b .no-extern-inline
 
 # a quick hack to make doxygen stripping builddir from html outputs.
 sed -i.org -e "s,^STRIP_FROM_PATH.*,STRIP_FROM_PATH = `pwd`," doc/Doxyfile.in
@@ -51,6 +53,13 @@ make gendoc
 %{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libnl.so.* $RPM_BUILD_ROOT/%{_lib}
+for l in $RPM_BUILD_ROOT%{_libdir}/libnl.so; do
+    ln -sf $(echo %{_libdir} | \
+        sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
+done
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -59,7 +68,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_libdir}/%{name}.so.*
+/%{_lib}/%{name}.so.*
 %doc COPYING
 
 %files devel
@@ -71,6 +80,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
+* Tue Dec 22 2009 John W. Linville <linville at redhat.com> - 1.1-9
+- Install libnl into /%{_lib} instead of %{_libdir}
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 14 2009 Peter Jones <pjones at redhat.com> - 1.1-7
+- Don't present "extern inline nl_object_priv();" to consumers in the headers.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From wtogami at fedoraproject.org  Tue Dec 22 20:40:32 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 22 Dec 2009 20:40:32 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.141,1.142
Message-ID: <20091222204032.6E24111C03F6@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16838

Modified Files:
	spamassassin.spec 
Log Message:
add the latest rules



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- spamassassin.spec	22 Dec 2009 20:26:45 -0000	1.141
+++ spamassassin.spec	22 Dec 2009 20:40:32 -0000	1.142
@@ -60,7 +60,7 @@ License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz
+Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r893295.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc



From caolanm at fedoraproject.org  Tue Dec 22 20:44:13 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 22 Dec 2009 20:44:13 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2108,1.2109
Message-ID: <20091222204413.A156E11C00EF@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17495

Modified Files:
	openoffice.org.spec 
Log Message:
add some (pointless) requires to keep rpmdiff happy in the future


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2108
retrieving revision 1.2109
diff -u -p -r1.2108 -r1.2109
--- openoffice.org.spec	22 Dec 2009 16:27:09 -0000	1.2108
+++ openoffice.org.spec	22 Dec 2009 20:44:12 -0000	1.2109
@@ -162,7 +162,8 @@ user's home, if necessary.
 %package core
 Summary: Core modules for OpenOffice.org
 Group: Applications/Productivity
-Requires: %{name}-%{fontname}-fonts
+Requires: %{name}-%{fontname}-fonts = %{epoch}:%{version}-%{release}
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: hunspell-en, hyphen-en, hyphen >= 2.4, autocorr-en
@@ -218,6 +219,8 @@ framework to be written in python.
 Summary: Database GUI libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-calc = %{epoch}:%{version}-%{release}
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: hsqldb, postgresql-jdbc
 
 %description base-core
@@ -405,6 +408,7 @@ Enables the OpenOffice.org writer module
 Summary: Spreadsheet libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 
 %description calc-core
 The spreadsheet libraries of OpenOffice.org.
@@ -585,6 +589,7 @@ binding) and an appropriate bridge or ad
 %package sdk
 Summary: Software Development Kit for OpenOffice.org
 Group: Development/Libraries
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: unzip, java-devel
 



From wtogami at fedoraproject.org  Tue Dec 22 20:44:36 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 22 Dec 2009 20:44:36 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.142,1.143
Message-ID: <20091222204436.6B6DB11C00EF@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17561

Modified Files:
	spamassassin.spec 
Log Message:
correct filename



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- spamassassin.spec	22 Dec 2009 20:40:32 -0000	1.142
+++ spamassassin.spec	22 Dec 2009 20:44:36 -0000	1.143
@@ -60,7 +60,7 @@ License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-beta1.r893295.tgz
+Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc



From caolanm at fedoraproject.org  Tue Dec 22 20:48:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 22 Dec 2009 20:48:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2109,1.2110
Message-ID: <20091222204829.7A42D11C00EF@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18134

Modified Files:
	openoffice.org.spec 
Log Message:
remove useless printeradmin.desktop


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2109
retrieving revision 1.2110
diff -u -p -r1.2109 -r1.2110
--- openoffice.org.spec	22 Dec 2009 20:44:12 -0000	1.2109
+++ openoffice.org.spec	22 Dec 2009 20:48:29 -0000	1.2110
@@ -2232,6 +2232,7 @@ popd
 
 pushd $RPM_BUILD_ROOT/%{oooinstdir}/share/xdg/
 chmod u+w *.desktop
+rm -rf printeradmin.desktop
 for file in *.desktop; do
     # rhbz#156677 remove the version from Name=
     sed -i -e "s/$PRODUCTVERSION //g" $file
@@ -2306,6 +2307,7 @@ popd
 %if %{langpacks}
 pushd $RPM_BUILD_ROOT/%{brinstdir}/share/xdg/
 chmod u+w *.desktop
+rm -rf printeradmin.desktop
 for file in *.desktop; do
     # rhbz#156677 remove the version from Name=
     sed -i -e "s/$PRODUCTVERSION //g" $file



From overholt at fedoraproject.org  Tue Dec 22 20:51:14 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 22 Dec 2009 20:51:14 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-swtbug291128.patch, NONE, 1.1 eclipse.spec,
	1.697, 1.698
Message-ID: <20091222205114.706D511C0337@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18656/devel

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-swtbug291128.patch 
Log Message:
* Tue Dec 22 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-26
- Backport eclipse-build patch for e.o#291128.

eclipse-swtbug291128.patch:
 ./build.xml                |    1 +
 patches/swtbug291128.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

--- NEW FILE eclipse-swtbug291128.patch ---
diff -up ./build.xml.bug291128 ./build.xml
--- ./build.xml.bug291128	2009-12-22 15:32:52.000000000 -0500
+++ ./build.xml	2009-12-22 15:34:07.000000000 -0500
@@ -247,6 +247,7 @@
 		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
 		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
+		<patch patchfile="${basedir}/patches/swtbug291128.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT Accessibility" strip="1" />
 		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
 		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
 		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />

diff -u /dev/null patches/swtbug291128.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/swtbug291128.patch	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,33 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.swt
+Index: Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java,v
+retrieving revision 1.46
+diff -u -r1.46 AccessibleObject.java
+--- Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java	29 May 2009 21:30:30 -0000	1.46
++++ Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java	22 Dec 2009 17:05:15 -0000
+@@ -1176,7 +1176,12 @@
+ 	}
+ 
+ 	static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
+-		return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++		AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++		if (object == null) return null;
++		if (object.accessible == null) return null;
++		Control control = object.accessible.control;
++		if (control == null || control.isDisposed()) return null;
++		return object;
+ 	}
+ 	
+ 	AccessibleObject getChildByHandle (int /*long*/ handle) {
+@@ -1252,7 +1257,7 @@
+ 		GObjectClass objectClassStruct = new GObjectClass ();
+ 		ATK.memmove (objectClassStruct, gObjectClass);
+ 		ATK.call (objectClassStruct.finalize, atkObject);
+-		AccessibleObject object = getAccessibleObject (atkObject);
++		AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+ 		if (object != null) {
+ 			AccessibleObjects.remove (new LONG (atkObject));
+ 			object.release ();
+


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -p -r1.697 -r1.698
--- eclipse.spec	16 Dec 2009 14:35:34 -0000	1.697
+++ eclipse.spec	22 Dec 2009 20:51:13 -0000	1.698
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        25%{?dist}
+Release:        26%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -48,6 +48,8 @@ Patch0:        %{name}-target-platform-t
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 Patch1:        %{name}-swt-ppc64-version.patch
 Patch2:        %{name}-junit-dropins.patch
+# Already upstream in eclipse-build
+Patch3:        %{name}-swtbug291128.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant ant-nodeps
@@ -1097,6 +1099,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Dec 22 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-26
+- Backport eclipse-build patch for e.o#291128.
+
 * Tue Dec 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-25
 - Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).
 



From mclasen at fedoraproject.org  Tue Dec 22 20:55:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 20:55:54 +0000 (UTC)
Subject: File brasero-2.29.4.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091222205554.1E07610F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for brasero:

882fd476b5ced467102ff40d14acad21  brasero-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 20:59:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 20:59:00 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.31, 1.32 brasero.spec, 1.71,
	1.72 sources, 1.32, 1.33
Message-ID: <20091222205900.2FD1711C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20214

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	1 Dec 2009 14:33:27 -0000	1.31
+++ .cvsignore	22 Dec 2009 20:58:59 -0000	1.32
@@ -1 +1 @@
-brasero-2.29.3.tar.bz2
+brasero-2.29.4.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- brasero.spec	2 Dec 2009 22:11:11 -0000	1.71
+++ brasero.spec	22 Dec 2009 20:59:00 -0000	1.72
@@ -5,13 +5,13 @@
 %endif
 
 Name:      brasero
-Version:   2.29.3
-Release:   2%{?dist}
+Version:   2.29.4
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.28/%{name}-%{version}.tar.bz2
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.29/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -213,6 +213,9 @@ fi
 
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> 2.29.4-1
+- Update to 2.29.4
+
 * Wed Dec  2 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-2
 - Make libbeagle dep more automatic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	1 Dec 2009 14:33:28 -0000	1.32
+++ sources	22 Dec 2009 20:59:00 -0000	1.33
@@ -1 +1 @@
-e8ee3842e598aca54ed74b7bb78aba8f  brasero-2.29.3.tar.bz2
+882fd476b5ced467102ff40d14acad21  brasero-2.29.4.tar.bz2



From mclasen at fedoraproject.org  Tue Dec 22 21:21:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 21:21:58 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.245,1.246
Message-ID: <20091222212158.DAEE711C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23619

Modified Files:
	gnome-games.spec 
Log Message:
fix build



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- gnome-games.spec	22 Dec 2009 18:49:08 -0000	1.245
+++ gnome-games.spec	22 Dec 2009 21:21:57 -0000	1.246
@@ -345,8 +345,8 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-aisleriot.*
 %{_datadir}/icons/hicolor/*/apps/gnome-iagno.*
 %{_datadir}/icons/hicolor/*/apps/gnome-mines.*
-#%{_datadir}/icons/hicolor/*/apps/gnome-swellfoop.*
-%{_datadir}/icons/hicolor/*/apps/gnome-samegnome.*
+%{_datadir}/icons/hicolor/*/apps/gnome-swell-foop.*
+#%{_datadir}/icons/hicolor/*/apps/gnome-samegnome.*
 %{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
 
 # %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/swell-foop.*
@@ -463,8 +463,8 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-glines.*
 %{_datadir}/icons/hicolor/*/apps/gnome-gnect.*
 %{_datadir}/icons/hicolor/*/apps/gnome-gnibbles.*
-# %{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
-%{_datadir}/icons/hicolor/*/apps/gnome-gnometris.*
+ %{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
+# %{_datadir}/icons/hicolor/*/apps/gnome-gnometris.*
 %{_datadir}/icons/hicolor/*/apps/gnome-klotski.*
 %{_datadir}/icons/hicolor/*/apps/gnome-mahjongg.*
 %{_datadir}/icons/hicolor/*/apps/gnome-robots.*



From dwalsh at fedoraproject.org  Tue Dec 22 21:23:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 22 Dec 2009 21:23:32 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.159,
	1.160 selinux-policy.spec, 1.986, 1.987
Message-ID: <20091222212332.DE3A711C02C4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24078

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-63
- Allow sendmail setpgid
- Allow dovecot to read nfs homedirs


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   82 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  188 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  189 +++
 policy/modules/apps/sandbox.te            |  336 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   49 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   50 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  475 ++++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  293 +++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  442 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  119 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   52 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   35 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   53 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   18 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   25 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   32 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   60 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  285 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  665 ++++++++++-
 policy/modules/services/xserver.te        |  383 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  184 +++
 policy/modules/system/init.te             |  292 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   78 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   23 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  193 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    1 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    2 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   83 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1702 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  144 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 413 files changed, 21805 insertions(+), 2838 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- policy-F12.patch	22 Dec 2009 17:16:15 -0000	1.159
+++ policy-F12.patch	22 Dec 2009 21:23:31 -0000	1.160
@@ -15973,7 +15973,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.6.32/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-22 15:39:34.000000000 -0500
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -16046,7 +16046,7 @@ diff -b -B --ignore-all-space --exclude-
  allow dovecot_deliver_t dovecot_etc_t:file read_file_perms;
  allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms;
  
-@@ -260,3 +274,14 @@
+@@ -260,3 +274,18 @@
  optional_policy(`
  	mta_manage_spool(dovecot_deliver_t)
  ')
@@ -16054,11 +16054,15 @@ diff -b -B --ignore-all-space --exclude-
 +tunable_policy(`use_nfs_home_dirs',`
 +	fs_manage_nfs_files(dovecot_deliver_t)
 +	fs_manage_nfs_symlinks(dovecot_deliver_t)
++	fs_manage_nfs_files(dovecot_t)
++	fs_manage_nfs_symlinks(dovecot_t)
 +')
 +
 +tunable_policy(`use_samba_home_dirs',`
 +	fs_manage_cifs_files(dovecot_deliver_t)
 +	fs_manage_cifs_symlinks(dovecot_deliver_t)
++	fs_manage_cifs_files(dovecot_t)
++	fs_manage_cifs_symlinks(dovecot_t)
 +')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.6.32/policy/modules/services/exim.te
@@ -24184,7 +24188,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.6.32/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/sendmail.te	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/sendmail.te	2009-12-22 14:56:01.000000000 -0500
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -24201,7 +24205,7 @@ diff -b -B --ignore-all-space --exclude-
 -allow sendmail_t self:capability { setuid setgid net_bind_service sys_nice chown sys_tty_config };
 -allow sendmail_t self:process signal;
 +allow sendmail_t self:capability { dac_override setuid setgid net_bind_service sys_nice chown sys_tty_config };
-+allow sendmail_t self:process { setrlimit signal signull };
++allow sendmail_t self:process { setpgid setrlimit signal signull };
  allow sendmail_t self:fifo_file rw_fifo_file_perms;
  allow sendmail_t self:unix_stream_socket create_stream_socket_perms;
  allow sendmail_t self:unix_dgram_socket create_socket_perms;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -p -r1.986 -r1.987
--- selinux-policy.spec	22 Dec 2009 17:16:16 -0000	1.986
+++ selinux-policy.spec	22 Dec 2009 21:23:32 -0000	1.987
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 62%{?dist}
+Release: 63%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,10 @@ exit 0
 %endif
 
 %changelog
+* Tue Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-63
+- Allow sendmail setpgid
+- Allow dovecot to read nfs homedirs
+
 * Tue Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-62
 - Add label for /var/ekpd
 - Allow portreserve to look at bin files



From dwalsh at fedoraproject.org  Tue Dec 22 21:28:41 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 22 Dec 2009 21:28:41 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.20,1.21
Message-ID: <20091222212841.1C87311C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25076

Modified Files:
	policy-F13.patch 
Log Message:
* Tue Dec 22 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-3
- Add back xserver_manage_home_fonts


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  340 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  370 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  236 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  121 +-
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   35 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   34 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   22 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   91 +
 policy/modules/services/denyhosts.te      |   71 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   25 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   34 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   50 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   18 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  284 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  353 ++++++
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  299 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  194 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   15 
 377 files changed, 20021 insertions(+), 2756 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- policy-F13.patch	22 Dec 2009 17:25:13 -0000	1.20
+++ policy-F13.patch	22 Dec 2009 21:28:39 -0000	1.21
@@ -12627,8 +12627,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +/var/run/cgred.*		gen_context(system_u:object_r:cgred_var_run_t, s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.if serefpolicy-3.7.5/policy/modules/services/cgroup.if
 --- nsaserefpolicy/policy/modules/services/cgroup.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/cgroup.if	2009-12-22 11:07:12.000000000 -0500
-@@ -0,0 +1,52 @@
++++ serefpolicy-3.7.5/policy/modules/services/cgroup.if	2009-12-22 14:42:11.000000000 -0500
+@@ -0,0 +1,34 @@
 +## <summary>Control group rules engine daemon.</summary>
 +## <desc>
 +##	<p>
@@ -12655,35 +12655,17 @@ diff --exclude-from=exclude -N -u -r nsa
 +##	</summary>
 +## </param>
 +#
-+interface(`cgroup_cgred_rw_pid_sock_file', `
++interface(`cgroup_stream_connect', `
 +	gen_require(`
-+		type cgred_var_run_t;
++		type cgred_var_run_t, cgred_t;
 +	')
 +
-+	rw_sock_files_pattern($1, cgred_var_run_t, cgred_var_run_t)
 +	files_search_pids($1)
-+')
-+
-+########################################
-+## <summary>
-+##	Unix stream socket connect to cgred.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`cgroup_cgred_stream_connect', `
-+	gen_require(`
-+		type cgred_t;
-+	')
-+
-+	allow $1 cgred_t:unix_stream_socket connectto;
++	stream_connect_pattern($1, cgred_var_run_t, cgred_var_run_t, cgred_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.te serefpolicy-3.7.5/policy/modules/services/cgroup.te
 --- nsaserefpolicy/policy/modules/services/cgroup.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/cgroup.te	2009-12-22 11:05:59.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/cgroup.te	2009-12-22 14:55:46.000000000 -0500
 @@ -0,0 +1,88 @@
 +policy_module(cgroup, 1.0.0)
 +
@@ -15011,7 +14993,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.7.5/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/dovecot.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/dovecot.te	2009-12-22 15:39:45.000000000 -0500
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -15084,7 +15066,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow dovecot_deliver_t dovecot_etc_t:file read_file_perms;
  allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms;
  
-@@ -260,3 +274,14 @@
+@@ -260,3 +274,17 @@
  optional_policy(`
  	mta_manage_spool(dovecot_deliver_t)
  ')
@@ -15092,13 +15074,16 @@ diff --exclude-from=exclude -N -u -r nsa
 +tunable_policy(`use_nfs_home_dirs',`
 +	fs_manage_nfs_files(dovecot_deliver_t)
 +	fs_manage_nfs_symlinks(dovecot_deliver_t)
++	fs_manage_nfs_files(dovecot_t)
++	fs_manage_nfs_symlinks(dovecot_t)
 +')
 +
 +tunable_policy(`use_samba_home_dirs',`
 +	fs_manage_cifs_files(dovecot_deliver_t)
 +	fs_manage_cifs_symlinks(dovecot_deliver_t)
++	fs_manage_cifs_files(dovecot_t)
++	fs_manage_cifs_symlinks(dovecot_t)
 +')
-+
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.7.5/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/exim.te	2009-12-21 13:07:09.000000000 -0500
@@ -22975,7 +22960,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.7.5/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/sendmail.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/sendmail.te	2009-12-22 14:55:43.000000000 -0500
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -22992,7 +22977,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -allow sendmail_t self:capability { setuid setgid net_bind_service sys_nice chown sys_tty_config };
 -allow sendmail_t self:process signal;
 +allow sendmail_t self:capability { dac_override setuid setgid net_bind_service sys_nice chown sys_tty_config };
-+allow sendmail_t self:process { setrlimit signal signull };
++allow sendmail_t self:process { setpgid setrlimit signal signull };
  allow sendmail_t self:fifo_file rw_fifo_file_perms;
  allow sendmail_t self:unix_stream_socket create_stream_socket_perms;
  allow sendmail_t self:unix_dgram_socket create_socket_perms;
@@ -28068,7 +28053,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.7.5/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-11-12 12:51:51.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/init.te	2009-12-22 10:22:45.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/init.te	2009-12-22 14:38:31.000000000 -0500
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -28427,7 +28412,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -492,15 +554,27 @@
+@@ -492,15 +554,26 @@
  	optional_policy(`
  		bind_manage_config_dirs(initrc_t)
  		bind_write_config(initrc_t)
@@ -28435,8 +28420,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +
 +	optional_policy(`
-+		cgroup_cgrulesengd_rw_pid_sock_file(initrc_t)
-+		cgroup_cgrulesengd_stream_connect(initrc_t)
++		cgroup_stream_connect(initrc_t)
 +	')
 +
 +	optional_policy(`
@@ -28455,7 +28439,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	')
  
  	optional_policy(`
-@@ -515,6 +589,33 @@
+@@ -515,6 +588,33 @@
  	')
  ')
  
@@ -28489,7 +28473,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -567,10 +668,19 @@
+@@ -567,10 +667,19 @@
  	dbus_connect_system_bus(initrc_t)
  	dbus_system_bus_client(initrc_t)
  	dbus_read_config(initrc_t)
@@ -28509,7 +28493,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -590,6 +700,10 @@
+@@ -590,6 +699,10 @@
  ')
  
  optional_policy(`
@@ -28520,7 +28504,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -646,20 +760,20 @@
+@@ -646,20 +759,20 @@
  ')
  
  optional_policy(`
@@ -28547,7 +28531,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -668,6 +782,7 @@
+@@ -668,6 +781,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -28555,7 +28539,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -700,7 +815,6 @@
+@@ -700,7 +814,6 @@
  ')
  
  optional_policy(`
@@ -28563,7 +28547,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -722,8 +836,6 @@
+@@ -722,8 +835,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -28572,7 +28556,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -736,13 +848,16 @@
+@@ -736,13 +847,16 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -28589,7 +28573,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -751,6 +866,7 @@
+@@ -751,6 +865,7 @@
  
  optional_policy(`
  	udev_rw_db(initrc_t)
@@ -28597,7 +28581,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -758,6 +874,15 @@
+@@ -758,6 +873,15 @@
  ')
  
  optional_policy(`
@@ -28613,7 +28597,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -768,6 +893,21 @@
+@@ -768,6 +892,21 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -28635,7 +28619,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -793,3 +933,31 @@
+@@ -793,3 +932,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')



From mclasen at fedoraproject.org  Tue Dec 22 21:35:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 21:35:09 +0000 (UTC)
Subject: rpms/atk/devel atk.spec,1.70,1.71
Message-ID: <20091222213509.8928711C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/atk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26096

Modified Files:
	atk.spec 
Log Message:
Enable introspection



Index: atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/atk.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- atk.spec	22 Dec 2009 15:14:48 -0000	1.70
+++ atk.spec	22 Dec 2009 21:35:09 -0000	1.71
@@ -1,9 +1,10 @@
 %define glib2_version 2.6.0
+%define gobject_introspection_version 0.6.7
 
 Summary: Interfaces for accessibility support
 Name: atk
 Version: 1.29.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/atk/1.29/atk-%{version}.tar.bz2
@@ -12,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
+BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
+BuildRequires: gir-repository-devel
 
 %description
 The ATK library provides a set of interfaces for adding accessibility
@@ -35,7 +38,7 @@ needed for development of applications o
 %setup -q
 
 %build
-%configure --disable-gtk-doc
+%configure --disable-gtk-doc --enable-introspection
 make %{?_smp_mflags}
 
 %install
@@ -59,6 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc README AUTHORS COPYING NEWS
 %{_libdir}/libatk*.so.*
+%{_libdir}/girepository-1.0
 
 %files devel
 %defattr(-, root, root)
@@ -66,8 +70,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_datadir}/gtk-doc/html/atk
+%{_datadir}/gir-1.0
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.4-2
+- Enable introspection
+
 * Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 1.29.4-1
 - Update to 1.29.4
 



From mclasen at fedoraproject.org  Tue Dec 22 21:35:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 21:35:23 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.246,1.247
Message-ID: <20091222213523.AD46911C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24912

Modified Files:
	gnome-games.spec 
Log Message:
more spec fixes



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- gnome-games.spec	22 Dec 2009 21:21:57 -0000	1.246
+++ gnome-games.spec	22 Dec 2009 21:35:23 -0000	1.247
@@ -223,11 +223,7 @@ gconftool-2 --makefile-install-rule \
 	gnotski.schemas             \
 	mahjongg.schemas            \
 > /dev/null || : )
-
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -309,17 +305,24 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %postun extra
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%posttrans extra
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files help -f help.lang
 
 %files -f translations.lang



From mclasen at fedoraproject.org  Tue Dec 22 21:38:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 21:38:29 +0000 (UTC)
Subject: rpms/gir-repository/devel gir-repository.spec,1.12,1.13
Message-ID: <20091222213829.EFE1E11C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26739

Modified Files:
	gir-repository.spec 
Log Message:
drop atk and gtk bits



Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gir-repository.spec	9 Dec 2009 13:51:52 -0000	1.12
+++ gir-repository.spec	22 Dec 2009 21:38:29 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gir-repository
 Version:        0.6.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Introspection for GNOME libraries
 
 Group:          Development/Libraries
@@ -62,6 +62,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
+# drop atk and gtk, since these come with their own
+# introspection support now
+rm %{_libdir}/girepository-1.0/Atk-1.0.typelib
+rm %{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib
+rm %{_libdir}/girepository-1.0/Gtk-2.0.typelib
+rm %{_datadir}/gir-1.0/Atk-1.0.gir
+rm %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir
+rm %{_datadir}/gir-1.0/Gtk-2.0.gir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> 0.6.5-4
+- Drop atk and gtk
+
 * Wed Dec 09 2009 Bastien Nocera <bnocera at redhat.com> 0.6.5-3
 - Install the DBusGlib bindings
 



From bojan at fedoraproject.org  Tue Dec 22 21:38:57 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 22 Dec 2009 21:38:57 +0000 (UTC)
Subject: File viewvc-1.1.3.tar.gz uploaded to lookaside cache by bojan
Message-ID: <20091222213857.3F97110F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for viewvc:

e74127b9193e2bfc48f6242049701d91  viewvc-1.1.3.tar.gz



From bojan at fedoraproject.org  Tue Dec 22 21:40:29 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 22 Dec 2009 21:40:29 +0000 (UTC)
Subject: rpms/viewvc/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 viewvc.spec, 1.25, 1.26 viewvc-1.1.2-validate_regex.patch,
	1.1, NONE
Message-ID: <20091222214029.C79FD11C00EF@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27245

Modified Files:
	.cvsignore sources viewvc.spec 
Removed Files:
	viewvc-1.1.2-validate_regex.patch 
Log Message:
Bump up to 1.1.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Aug 2009 21:46:43 -0000	1.10
+++ .cvsignore	22 Dec 2009 21:40:29 -0000	1.11
@@ -1 +1 @@
-viewvc-1.1.2.tar.gz
+viewvc-1.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Aug 2009 21:46:43 -0000	1.10
+++ sources	22 Dec 2009 21:40:29 -0000	1.11
@@ -1 +1 @@
-8f14fc2f58f4e87b835500ae20d8d631  viewvc-1.1.2.tar.gz
+e74127b9193e2bfc48f6242049701d91  viewvc-1.1.3.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- viewvc.spec	23 Sep 2009 00:38:04 -0000	1.25
+++ viewvc.spec	22 Dec 2009 21:40:29 -0000	1.26
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           viewvc
-Version:        1.1.2
-Release:        5%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,7 +12,6 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
-Patch1:         viewvc-1.1.2-validate_regex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -44,7 +43,6 @@ with decent performance when run under A
 
 %prep
 %setup -q
-%patch1 -p0 -b .validate_regex
 
 %build
 
@@ -120,6 +118,10 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Dec 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.3-1
+- bump up to 1.1.3
+- drop patch for upstream issue #427
+
 * Wed Sep 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-5
 - patch upstream issue #427
 


--- viewvc-1.1.2-validate_regex.patch DELETED ---



From bojan at fedoraproject.org  Tue Dec 22 21:45:12 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 22 Dec 2009 21:45:12 +0000 (UTC)
Subject: rpms/viewvc/F-12 sources, 1.10, 1.11 viewvc.spec, 1.25,
	1.26 viewvc-1.1.2-validate_regex.patch, 1.1, NONE
Message-ID: <20091222214512.70D1511C00EF@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28159

Modified Files:
	sources viewvc.spec 
Removed Files:
	viewvc-1.1.2-validate_regex.patch 
Log Message:
Bump up to 1.1.3.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Aug 2009 21:46:43 -0000	1.10
+++ sources	22 Dec 2009 21:45:12 -0000	1.11
@@ -1 +1 @@
-8f14fc2f58f4e87b835500ae20d8d631  viewvc-1.1.2.tar.gz
+e74127b9193e2bfc48f6242049701d91  viewvc-1.1.3.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-12/viewvc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- viewvc.spec	23 Sep 2009 00:38:04 -0000	1.25
+++ viewvc.spec	22 Dec 2009 21:45:12 -0000	1.26
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           viewvc
-Version:        1.1.2
-Release:        5%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,7 +12,6 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
-Patch1:         viewvc-1.1.2-validate_regex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -44,7 +43,6 @@ with decent performance when run under A
 
 %prep
 %setup -q
-%patch1 -p0 -b .validate_regex
 
 %build
 
@@ -120,6 +118,10 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Dec 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.3-1
+- bump up to 1.1.3
+- drop patch for upstream issue #427
+
 * Wed Sep 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-5
 - patch upstream issue #427
 


--- viewvc-1.1.2-validate_regex.patch DELETED ---



From bojan at fedoraproject.org  Tue Dec 22 21:46:10 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 22 Dec 2009 21:46:10 +0000 (UTC)
Subject: rpms/viewvc/F-11 sources, 1.10, 1.11 viewvc.spec, 1.24,
	1.25 viewvc-1.1.2-validate_regex.patch, 1.1, NONE
Message-ID: <20091222214610.D87CA11C00EF@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28462

Modified Files:
	sources viewvc.spec 
Removed Files:
	viewvc-1.1.2-validate_regex.patch 
Log Message:
Bump up to 1.1.3.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Aug 2009 21:53:15 -0000	1.10
+++ sources	22 Dec 2009 21:46:10 -0000	1.11
@@ -1 +1 @@
-8f14fc2f58f4e87b835500ae20d8d631  viewvc-1.1.2.tar.gz
+e74127b9193e2bfc48f6242049701d91  viewvc-1.1.3.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- viewvc.spec	23 Sep 2009 00:42:52 -0000	1.24
+++ viewvc.spec	22 Dec 2009 21:46:10 -0000	1.25
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           viewvc
-Version:        1.1.2
-Release:        5%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,7 +12,6 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
-Patch1:         viewvc-1.1.2-validate_regex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -44,7 +43,6 @@ with decent performance when run under A
 
 %prep
 %setup -q
-%patch1 -p0 -b .validate_regex
 
 %build
 
@@ -120,6 +118,10 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Dec 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.3-1
+- bump up to 1.1.3
+- drop patch for upstream issue #427
+
 * Wed Sep 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-5
 - patch upstream issue #427
 


--- viewvc-1.1.2-validate_regex.patch DELETED ---



From bojan at fedoraproject.org  Tue Dec 22 21:48:05 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 22 Dec 2009 21:48:05 +0000 (UTC)
Subject: rpms/viewvc/EL-5 sources, 1.9, 1.10 viewvc.spec, 1.10,
	1.11 viewvc-1.1.2-validate_regex.patch, 1.1, NONE
Message-ID: <20091222214805.D7D9211C00EF@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28857

Modified Files:
	sources viewvc.spec 
Removed Files:
	viewvc-1.1.2-validate_regex.patch 
Log Message:
Bump up to 1.1.3.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Sep 2009 06:38:22 -0000	1.9
+++ sources	22 Dec 2009 21:48:05 -0000	1.10
@@ -1 +1 @@
-8f14fc2f58f4e87b835500ae20d8d631  viewvc-1.1.2.tar.gz
+e74127b9193e2bfc48f6242049701d91  viewvc-1.1.3.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/viewvc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- viewvc.spec	23 Sep 2009 00:49:01 -0000	1.10
+++ viewvc.spec	22 Dec 2009 21:48:05 -0000	1.11
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           viewvc
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,7 +12,6 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
-Patch1:         viewvc-1.1.2-validate_regex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-11
@@ -44,7 +43,6 @@ with decent performance when run under A
 
 %prep
 %setup -q
-%patch1 -p0 -b .validate_regex
 
 %build
 
@@ -116,6 +114,10 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Dec 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.3-1
+- bump up to 1.1.3
+- drop patch for upstream issue #427
+
 * Wed Sep 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
 - patch upstream issue #427
 


--- viewvc-1.1.2-validate_regex.patch DELETED ---



From mclasen at fedoraproject.org  Tue Dec 22 21:52:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 21:52:01 +0000 (UTC)
Subject: rpms/gir-repository/devel gir-repository.spec,1.13,1.14
Message-ID: <20091222215201.E85EC11C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29517

Modified Files:
	gir-repository.spec 
Log Message:
try to fix the build



Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gir-repository.spec	22 Dec 2009 21:38:29 -0000	1.13
+++ gir-repository.spec	22 Dec 2009 21:52:01 -0000	1.14
@@ -9,7 +9,7 @@ URL:            http://live.gnome.org/GO
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gobject-introspection-devel = %{version}
+BuildRequires:  gobject-introspection-devel >= %{version}
 BuildRequires:  avahi-gobject-devel
 BuildRequires:  babl-devel
 BuildRequires:  GConf2-devel



From overholt at fedoraproject.org  Tue Dec 22 21:55:46 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 22 Dec 2009 21:55:46 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-swtbug291128.patch, 1.1, 1.2 eclipse.spec, 
	1.698, 1.699
Message-ID: <20091222215546.229A411C00EF@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30627

Modified Files:
	eclipse-swtbug291128.patch eclipse.spec 
Log Message:
* Tue Dec 22 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-27
- Fix patch application.

eclipse-swtbug291128.patch:
 build.xml                  |    1 +
 patches/swtbug291128.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

Index: eclipse-swtbug291128.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-swtbug291128.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-swtbug291128.patch	22 Dec 2009 20:51:13 -0000	1.1
+++ eclipse-swtbug291128.patch	22 Dec 2009 21:55:45 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./build.xml.bug291128 ./build.xml
---- ./build.xml.bug291128	2009-12-22 15:32:52.000000000 -0500
-+++ ./build.xml	2009-12-22 15:34:07.000000000 -0500
+diff -uNr build.xml build.xml
+--- build.xml	2009-11-05 06:15:17.000000000 -0500
++++ build.xml	2009-12-22 16:47:19.000000000 -0500
 @@ -247,6 +247,7 @@
  		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
  		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
@@ -9,11 +9,10 @@ diff -up ./build.xml.bug291128 ./build.x
  		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
  		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
  		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
-
-diff -u /dev/null patches/swtbug291128.patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ patches/swtbug291128.patch	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,33 @@
+diff -uNr patches/swtbug291128.patch patches/swtbug291128.patch
+--- patches/swtbug291128.patch	1969-12-31 19:00:00.000000000 -0500
++++ patches/swtbug291128.patch	2009-12-22 16:46:54.000000000 -0500
+@@ -0,0 +1,32 @@
 +### Eclipse Workspace Patch 1.0
 +#P org.eclipse.swt
 +Index: Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -46,4 +45,3 @@ diff -u /dev/null patches/swtbug291128.p
 + 		if (object != null) {
 + 			AccessibleObjects.remove (new LONG (atkObject));
 + 			object.release ();
-+


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.698
retrieving revision 1.699
diff -u -p -r1.698 -r1.699
--- eclipse.spec	22 Dec 2009 20:51:13 -0000	1.698
+++ eclipse.spec	22 Dec 2009 21:55:45 -0000	1.699
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        26%{?dist}
+Release:        27%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -191,6 +191,7 @@ developing Eclipse plugins.
 %prep
 %setup -q -n eclipse-build-0_4_RC6
 cp %{SOURCE1} .
+%patch3
 ant -DbuildArch=%{eclipse_arch} applyPatches
 pushd build/eclipse-R3_5_1-fetched-src
 
@@ -1099,6 +1100,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Dec 22 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-27
+- Fix patch application.
+
 * Tue Dec 22 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-26
 - Backport eclipse-build patch for e.o#291128.
 



From mclasen at fedoraproject.org  Tue Dec 22 22:01:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 22:01:22 +0000 (UTC)
Subject: rpms/gir-repository/devel gir-repository.spec,1.14,1.15
Message-ID: <20091222220122.2643A11C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31583

Modified Files:
	gir-repository.spec 
Log Message:
fix the spec



Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gir-repository.spec	22 Dec 2009 21:52:01 -0000	1.14
+++ gir-repository.spec	22 Dec 2009 22:01:22 -0000	1.15
@@ -64,10 +64,8 @@ find $RPM_BUILD_ROOT -type f -name "*.a"
 
 # drop atk and gtk, since these come with their own
 # introspection support now
-rm %{_libdir}/girepository-1.0/Atk-1.0.typelib
 rm %{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib
 rm %{_libdir}/girepository-1.0/Gtk-2.0.typelib
-rm %{_datadir}/gir-1.0/Atk-1.0.gir
 rm %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir
 rm %{_datadir}/gir-1.0/Gtk-2.0.gir
 



From svahl at fedoraproject.org  Tue Dec 22 22:06:59 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 22:06:59 +0000 (UTC)
Subject: File grsync-0.9.3.tar.gz uploaded to lookaside cache by svahl
Message-ID: <20091222220659.0396F10FEDC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for grsync:

c9f5828cb5a75893c0518c0cd3615f9c  grsync-0.9.3.tar.gz



From svahl at fedoraproject.org  Tue Dec 22 22:07:52 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 22:07:52 +0000 (UTC)
Subject: rpms/grsync/devel .cvsignore, 1.8, 1.9 grsync.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <20091222220752.BB86A11C00EF@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/pkgs/rpms/grsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32745

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
* Tue Dec 22 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.9.3-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Oct 2009 22:23:15 -0000	1.8
+++ .cvsignore	22 Dec 2009 22:07:52 -0000	1.9
@@ -1 +1 @@
-grsync-0.9.2.tar.gz
+grsync-0.9.3.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/devel/grsync.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- grsync.spec	5 Oct 2009 22:23:15 -0000	1.12
+++ grsync.spec	22 Dec 2009 22:07:52 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           grsync
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.9.3-1
+- new upstream release
+
 * Mon Oct 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
 - new upstream release (fixes #524169)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Oct 2009 22:23:15 -0000	1.8
+++ sources	22 Dec 2009 22:07:52 -0000	1.9
@@ -1 +1 @@
-b605c920f5b52e8783df2803efe8a03d  grsync-0.9.2.tar.gz
+c9f5828cb5a75893c0518c0cd3615f9c  grsync-0.9.3.tar.gz



From dwalsh at fedoraproject.org  Tue Dec 22 22:10:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 22 Dec 2009 22:10:26 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.21,1.22
Message-ID: <20091222221026.645CE11C03F6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv817

Modified Files:
	policy-F13.patch 
Log Message:
* Tue Dec 22 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-3
- Add back xserver_manage_home_fonts


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  340 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  370 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  236 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  121 +-
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   35 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   35 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   22 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   91 +
 policy/modules/services/denyhosts.te      |   71 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   25 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   34 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   50 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   18 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  284 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  353 ++++++
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  299 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  194 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   15 
 377 files changed, 20022 insertions(+), 2756 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- policy-F13.patch	22 Dec 2009 21:28:39 -0000	1.21
+++ policy-F13.patch	22 Dec 2009 22:10:25 -0000	1.22
@@ -12627,8 +12627,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +/var/run/cgred.*		gen_context(system_u:object_r:cgred_var_run_t, s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.if serefpolicy-3.7.5/policy/modules/services/cgroup.if
 --- nsaserefpolicy/policy/modules/services/cgroup.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/cgroup.if	2009-12-22 14:42:11.000000000 -0500
-@@ -0,0 +1,34 @@
++++ serefpolicy-3.7.5/policy/modules/services/cgroup.if	2009-12-22 17:06:40.000000000 -0500
+@@ -0,0 +1,35 @@
 +## <summary>Control group rules engine daemon.</summary>
 +## <desc>
 +##	<p>
@@ -12640,7 +12640,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +##	</p>
 +##	<p>
 +##		The list of rules is read during the daemon startup and
-+##		are cached in daemon?s memory. The daemon reloads the
++##		are cached in daemons memory. The daemon reloads the
 +##		list of rules when it receives SIGUSR2 signal.
 +##	</p>
 +## </desc>
@@ -12663,6 +12663,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	files_search_pids($1)
 +	stream_connect_pattern($1, cgred_var_run_t, cgred_var_run_t, cgred_t)
 +')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.te serefpolicy-3.7.5/policy/modules/services/cgroup.te
 --- nsaserefpolicy/policy/modules/services/cgroup.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.7.5/policy/modules/services/cgroup.te	2009-12-22 14:55:46.000000000 -0500
@@ -14633,7 +14634,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/var/log/denyhosts(/.*)?					gen_context(system_u:object_r:denyhosts_var_log_t, s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.if serefpolicy-3.7.5/policy/modules/services/denyhosts.if
 --- nsaserefpolicy/policy/modules/services/denyhosts.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/denyhosts.if	2009-12-22 10:13:51.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/denyhosts.if	2009-12-22 17:05:58.000000000 -0500
 @@ -0,0 +1,91 @@
 +## <summary>Deny Hosts.</summary>
 +## <desc>



From mclasen at fedoraproject.org  Tue Dec 22 22:11:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 22 Dec 2009 22:11:35 +0000 (UTC)
Subject: rpms/gir-repository/devel gir-repository.spec,1.15,1.16
Message-ID: <20091222221135.E9DA511C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1067

Modified Files:
	gir-repository.spec 
Log Message:
try again



Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gir-repository.spec	22 Dec 2009 22:01:22 -0000	1.15
+++ gir-repository.spec	22 Dec 2009 22:11:35 -0000	1.16
@@ -64,10 +64,12 @@ find $RPM_BUILD_ROOT -type f -name "*.a"
 
 # drop atk and gtk, since these come with their own
 # introspection support now
-rm %{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib
-rm %{_libdir}/girepository-1.0/Gtk-2.0.typelib
-rm %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir
-rm %{_datadir}/gir-1.0/Gtk-2.0.gir
+rm -f $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/Atk-1.0.typelib
+rm -f $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib
+rm -f $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/Gtk-2.0.typelib
+rm -f $RPM_BUILD_ROOT%{_datadir}/gir-1.0/Atk-1.0.gir
+rm -f $RPM_BUILD_ROOT%{_datadir}/gir-1.0/GdkPixbuf-2.0.gir
+rm -f $RPM_BUILD_ROOT%{_datadir}/gir-1.0/Gtk-2.0.gir
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From svahl at fedoraproject.org  Tue Dec 22 22:14:40 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 22:14:40 +0000 (UTC)
Subject: rpms/grsync/F-11 .cvsignore, 1.8, 1.9 grsync.spec, 1.11, 1.12 sources,
	1.8, 1.9
Message-ID: <20091222221440.C345011C00EF@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/pkgs/rpms/grsync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1708/F-11

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Oct 2009 22:23:16 -0000	1.8
+++ .cvsignore	22 Dec 2009 22:14:40 -0000	1.9
@@ -1 +1 @@
-grsync-0.9.2.tar.gz
+grsync-0.9.3.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-11/grsync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- grsync.spec	5 Oct 2009 22:23:16 -0000	1.11
+++ grsync.spec	22 Dec 2009 22:14:40 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           grsync
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
@@ -58,9 +58,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.9.3-1
+- new upstream release
+
 * Mon Oct 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
 - new upstream release (fixes #524169)
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 01 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.9.1-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Oct 2009 22:23:16 -0000	1.8
+++ sources	22 Dec 2009 22:14:40 -0000	1.9
@@ -1 +1 @@
-b605c920f5b52e8783df2803efe8a03d  grsync-0.9.2.tar.gz
+c9f5828cb5a75893c0518c0cd3615f9c  grsync-0.9.3.tar.gz



From svahl at fedoraproject.org  Tue Dec 22 22:14:41 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 22:14:41 +0000 (UTC)
Subject: rpms/grsync/F-12 .cvsignore, 1.8, 1.9 grsync.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <20091222221441.00A0211C00EF@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/pkgs/rpms/grsync/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1708/F-12

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Oct 2009 22:23:15 -0000	1.8
+++ .cvsignore	22 Dec 2009 22:14:40 -0000	1.9
@@ -1 +1 @@
-grsync-0.9.2.tar.gz
+grsync-0.9.3.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-12/grsync.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- grsync.spec	5 Oct 2009 22:23:15 -0000	1.12
+++ grsync.spec	22 Dec 2009 22:14:40 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           grsync
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.9.3-1
+- new upstream release
+
 * Mon Oct 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
 - new upstream release (fixes #524169)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Oct 2009 22:23:15 -0000	1.8
+++ sources	22 Dec 2009 22:14:40 -0000	1.9
@@ -1 +1 @@
-b605c920f5b52e8783df2803efe8a03d  grsync-0.9.2.tar.gz
+c9f5828cb5a75893c0518c0cd3615f9c  grsync-0.9.3.tar.gz



From scop at fedoraproject.org  Tue Dec 22 22:26:25 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 22 Dec 2009 22:26:25 +0000 (UTC)
Subject: rpms/cvsps/devel cvsps-2.2b1-diff-opts.patch, NONE, 1.1 cvsps.spec,
	1.11, 1.12
Message-ID: <20091222222625.47DA511C00EF@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cvsps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3966

Modified Files:
	cvsps.spec 
Added Files:
	cvsps-2.2b1-diff-opts.patch 
Log Message:
* Tue Dec 22 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.5.b1
- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
- Use patch instead of sed for man page fixes.


cvsps-2.2b1-diff-opts.patch:
 cvsps.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cvsps-2.2b1-diff-opts.patch ---
diff -up cvsps-2.2b1/cvsps.1.orig cvsps-2.2b1/cvsps.1
--- cvsps-2.2b1/cvsps.1.orig	2009-12-22 21:16:20.000000000 +0200
+++ cvsps-2.2b1/cvsps.1	2009-12-22 21:16:25.000000000 +0200
@@ -83,7 +83,7 @@ some hacks which are not generally appli
 disable the use of rlog internally.  Note: rlog is
 required for stable PatchSet numbering.  Use with care.
 .TP
-.B \-\-diffs\-opts <option string>
+.B \-\-diff\-opts <option string>
 send a custom set of options to diff, for example to increase
 the number of context lines, or change the diff format.
 .TP


Index: cvsps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsps/devel/cvsps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- cvsps.spec	6 Aug 2009 18:41:58 -0000	1.11
+++ cvsps.spec	22 Dec 2009 22:26:24 -0000	1.12
@@ -2,20 +2,22 @@
 
 Name:           cvsps
 Version:        2.2
-Release:        0.4.%{prever}%{?dist}
+Release:        0.5.%{prever}%{?dist}
 Summary:        Patchset tool for CVS
 
 Group:          Development/Tools
 License:        GPL+
 URL:            http://www.cobite.com/cvsps/
 Source0:        http://www.cobite.com/cvsps/%{name}-%{version}%{prever}.tar.gz
-# #516083
+# https://bugzilla.redhat.com/516083
 Patch0:         %{name}-2.2b1-dynamic-logbuf.patch
+Patch1:         %{name}-2.2b1-diff-opts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
-# Requires cvs only with --no-cvs-direct, but I cannot imagine this dep
-# being a problem on systems where cvsps will be installed...
+# Strictly speaking, requires cvs only with --no-cvs-direct (which is
+# the default as of 2.2b1), but this shouldn't be a problem on systems
+# where cvsps will be installed.
 Requires(hint): cvs
 
 %description
@@ -31,11 +33,11 @@ changes were committed 'atomically' to t
 %prep
 %setup -q -n %{name}-%{version}%{prever}
 %patch0 -p1
-sed -i -e 's/diffs\\-opts/diff\\-opts/' cvsps.1
+%patch1 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS -DLINUX" make %{?_smp_mflags}
 
 
 %install
@@ -55,7 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
+* Tue Dec 22 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.5.b1
+- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
+- Use patch instead of sed for man page fixes.
+
+* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
 - Apply David D. Kilzer's dynamic log buffer allocation patch (#516083,
   Andreas Schwab).
 - Use %%global instead of %%define.
@@ -66,30 +72,30 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.2.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jun 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.1.b1
+* Sat Jun 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.1.b1
 - 2.2b1.
 
-* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.1-6
+* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.1-6
 - Change cvs dependency to a Requires(hint).
 - Fix typo in man page.
 
-* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1-5
+* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1-5
 - License: GPL+
 
-* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-4
+* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-4
 - Rebuild.
 
-* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-3
+* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-3
 - Rebuild.
 
-* Fri May 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.1-2
+* Fri May 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.1-2
 - 2.1.
 
-* Sun Mar 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.0-0.2.rc1
+* Sun Mar 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.0-0.2.rc1
 - Drop 0.fdr and Epoch: 0.
 
-* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
+* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
 - Remove #---- section markers.
 
-* Fri Jul  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
+* Fri Jul  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
 - First build.



From akurtakov at fedoraproject.org  Tue Dec 22 22:28:34 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 22:28:34 +0000 (UTC)
Subject: File plexus-ant-factory-src.tar.bz2 uploaded to lookaside cache by
	akurtakov
Message-ID: <20091222222834.ED2B110F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for plexus-ant-factory:

d2562161a88911ba4333aadc0cae451a  plexus-ant-factory-src.tar.bz2



From akurtakov at fedoraproject.org  Tue Dec 22 22:30:07 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 22:30:07 +0000 (UTC)
Subject: rpms/plexus-ant-factory/devel plexus-ant-factory.spec, 1.14,
	1.15 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091222223007.AB5E311C03F6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-ant-factory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4731/devel

Modified Files:
	plexus-ant-factory.spec .cvsignore sources 
Log Message:
- Update to 1.0 alpha 2.1.
- Drop gcj_support.


Index: plexus-ant-factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-ant-factory/devel/plexus-ant-factory.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- plexus-ant-factory.spec	26 Jul 2009 18:53:28 -0000	1.14
+++ plexus-ant-factory.spec	22 Dec 2009 22:30:07 -0000	1.15
@@ -28,11 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%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 with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -41,26 +36,23 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.4.a1.1.11%{?dist}
+Release:        0.4.a2.1.1%{?dist}
 Epoch:          0
 Summary:        Plexus Ant component factory
 # Email from copyright holder confirms license.
 License:        ASL 2.0
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
-Source0:        %{name}-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/
-#            plexus-ant-factory-1.0-alpha-1 plexus-ant-factory/
-# tar czf plexus-ant-factory-src.tar.gz plexus-ant-factory/
+Source0:        %{name}-src.tar.bz2
+# svn export http://svn.codehaus.org/plexus/tags/plexus-ant-factory-1.0-alpha-2.1/ plexus-ant-factory/
+# tar cjf plexus-ant-factory-src.tar.bz2 plexus-ant-factory/
 Source1:        %{name}-jpp-depmap.xml
 Source2:        %{name}-build.xml
 Source3:	plexus-ant-factory_license_and_copyright.txt
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 %if %{with_maven}
@@ -69,9 +61,9 @@ BuildRequires:    maven2-plugin-compiler
 BuildRequires:    maven2-plugin-install
 BuildRequires:    maven2-plugin-jar
 BuildRequires:    maven2-plugin-javadoc
-BuildRequires:    maven2-plugin-release
 BuildRequires:    maven2-plugin-resources
-BuildRequires:    maven2-plugin-surefire
+BuildRequires:    maven-surefire-maven-plugin
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    maven2-common-poms >= 1.0-2
 %endif
 BuildRequires:    ant
@@ -87,12 +79,6 @@ Requires:    plexus-utils
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description
 Ant component class creator for Plexus.
 
@@ -168,29 +154,13 @@ install -pm 644 pom.xml \
                 $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 %endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %files
@@ -201,11 +171,6 @@ fi
 %{_datadir}/maven2
 %{_mavendepmapfragdir}
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-factory-1.0.jar.*
-%endif
-
 %if %{with_maven}
 %files javadoc
 %defattr(-,root,root,-)
@@ -214,6 +179,10 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a2.1.1
+- Update to 1.0 alpha 2.1.
+- Drop gcj_support.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a1.1.11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-ant-factory/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 23:06:24 -0000	1.2
+++ .cvsignore	22 Dec 2009 22:30:07 -0000	1.3
@@ -1 +1,2 @@
 plexus-ant-factory-src.tar.gz
+plexus-ant-factory-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-ant-factory/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2007 23:06:24 -0000	1.2
+++ sources	22 Dec 2009 22:30:07 -0000	1.3
@@ -1 +1 @@
-c344afdd8e8994e3061c3158eaee61bc  plexus-ant-factory-src.tar.gz
+d2562161a88911ba4333aadc0cae451a  plexus-ant-factory-src.tar.bz2



From svahl at fedoraproject.org  Tue Dec 22 22:34:56 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 22:34:56 +0000 (UTC)
Subject: File roxterm-1.16.3.tar.gz uploaded to lookaside cache by svahl
Message-ID: <20091222223456.EEE9410F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for roxterm:

6774157977660cdc8fc22c59bc0eec53  roxterm-1.16.3.tar.gz



From cwickert at fedoraproject.org  Tue Dec 22 22:35:35 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 22 Dec 2009 22:35:35 +0000 (UTC)
Subject: rpms/exo/devel exo.spec,1.46,1.47
Message-ID: <20091222223535.7EA2611C00EF@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5790

Modified Files:
	exo.spec 
Log Message:
own %{_datadir}/pixmaps/exo-0.3/


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- exo.spec	18 Dec 2009 00:24:17 -0000	1.46
+++ exo.spec	22 Dec 2009 22:35:34 -0000	1.47
@@ -119,7 +119,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/pixmaps/exo-0.3/exo-thumbnail-frame.png
+%{_datadir}/pixmaps/exo-0.3/
 
 %files devel
 %defattr(-, root, root,-)



From svahl at fedoraproject.org  Tue Dec 22 22:37:27 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 22:37:27 +0000 (UTC)
Subject: rpms/roxterm/devel .cvsignore, 1.17, 1.18 roxterm.spec, 1.18,
	1.19 sources, 1.17, 1.18
Message-ID: <20091222223727.DD38411C00EF@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/pkgs/rpms/roxterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6096

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
* Tue Dec 22 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.16.3-1
- new upstream release: 1.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	11 Aug 2009 20:53:55 -0000	1.17
+++ .cvsignore	22 Dec 2009 22:37:27 -0000	1.18
@@ -1 +1 @@
-roxterm-1.15.2.tar.gz
+roxterm-1.16.3.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/devel/roxterm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- roxterm.spec	11 Aug 2009 20:53:55 -0000	1.18
+++ roxterm.spec	22 Dec 2009 22:37:27 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           roxterm
-Version:        1.15.2
+Version:        1.16.3
 Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
@@ -72,6 +72,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Tue Dec 22 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.16.3-1
+- new upstream release: 1.16.3
+
 * Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.15.2-1
 - new upstream release: 1.15.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	11 Aug 2009 20:53:55 -0000	1.17
+++ sources	22 Dec 2009 22:37:27 -0000	1.18
@@ -1 +1 @@
-c4988ce844b702a77f3609c623107e53  roxterm-1.15.2.tar.gz
+6774157977660cdc8fc22c59bc0eec53  roxterm-1.16.3.tar.gz



From akurtakov at fedoraproject.org  Tue Dec 22 22:38:36 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 22 Dec 2009 22:38:36 +0000 (UTC)
Subject: rpms/plexus-ant-factory/devel plexus-ant-factory.spec,1.15,1.16
Message-ID: <20091222223836.0E7F811C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-ant-factory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6364/devel

Modified Files:
	plexus-ant-factory.spec 
Log Message:
- BR maven-doxia-sitetools.


Index: plexus-ant-factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-ant-factory/devel/plexus-ant-factory.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- plexus-ant-factory.spec	22 Dec 2009 22:30:07 -0000	1.15
+++ plexus-ant-factory.spec	22 Dec 2009 22:38:35 -0000	1.16
@@ -36,7 +36,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.4.a2.1.1%{?dist}
+Release:        0.4.a2.1.2%{?dist}
 Epoch:          0
 Summary:        Plexus Ant component factory
 # Email from copyright holder confirms license.
@@ -64,6 +64,7 @@ BuildRequires:    maven2-plugin-javadoc
 BuildRequires:    maven2-plugin-resources
 BuildRequires:    maven-surefire-maven-plugin
 BuildRequires:    maven-surefire-provider-junit
+BuildRequires:    maven-doxia-sitetools
 BuildRequires:    maven2-common-poms >= 1.0-2
 %endif
 BuildRequires:    ant
@@ -179,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a2.1.2
+- BR maven-doxia-sitetools.
+
 * Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a2.1.1
 - Update to 1.0 alpha 2.1.
 - Drop gcj_support.



From svahl at fedoraproject.org  Tue Dec 22 22:53:02 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 22:53:02 +0000 (UTC)
Subject: rpms/grsync/F-11 .cvsignore, 1.9, 1.10 grsync.spec, 1.12, 1.13 sources,
	1.9, 1.10
Message-ID: <20091222225302.9D3C111C00EF@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/pkgs/rpms/grsync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9489

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
revert to previous version (0.6.3): newer gtk2 needed


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Dec 2009 22:14:40 -0000	1.9
+++ .cvsignore	22 Dec 2009 22:53:01 -0000	1.10
@@ -1 +1 @@
-grsync-0.9.3.tar.gz
+grsync-0.9.2.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-11/grsync.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- grsync.spec	22 Dec 2009 22:14:40 -0000	1.12
+++ grsync.spec	22 Dec 2009 22:53:01 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           grsync
-Version:        0.9.3
-Release:        1%{?dist}
+Version:        0.6.3
+Release:        2%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
 Group:          User Interface/Desktops
@@ -25,7 +25,7 @@ to backup personal files to a networked 
 %setup -q
 
 # some minor corrections for rpmlint
-%{__sed} -i 's/\r//' README AUTHORS NEWS
+%{__sed} -i 's/\r//' README
 
 %build
 %configure
@@ -54,25 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/grsync*.1.gz
 %{_datadir}/pixmaps/grsync.png
 %{_datadir}/applications/grsync.desktop
-%{_datadir}/grsync/
 
 
 %changelog
-* Tue Dec 22 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.9.3-1
-- new upstream release
-
-* Mon Oct 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
-- new upstream release (fixes #524169)
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jul 01 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.9.1-1
-- new upstream release
-
-* Sun Jun 14 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.9.0-1
-- new upstream release
-
 * Fri Apr 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.3-2
 - BR: intltool
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Dec 2009 22:14:40 -0000	1.9
+++ sources	22 Dec 2009 22:53:01 -0000	1.10
@@ -1 +1 @@
-c9f5828cb5a75893c0518c0cd3615f9c  grsync-0.9.3.tar.gz
+b605c920f5b52e8783df2803efe8a03d  grsync-0.9.2.tar.gz



From svahl at fedoraproject.org  Tue Dec 22 22:54:17 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 22:54:17 +0000 (UTC)
Subject: rpms/roxterm/F-12 .cvsignore, 1.17, 1.18 roxterm.spec, 1.18,
	1.19 sources, 1.17, 1.18
Message-ID: <20091222225417.1056C11C00EF@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/pkgs/rpms/roxterm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9686

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
* Tue Dec 22 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.16.3-1
- new upstream release: 1.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	11 Aug 2009 20:53:55 -0000	1.17
+++ .cvsignore	22 Dec 2009 22:54:16 -0000	1.18
@@ -1 +1 @@
-roxterm-1.15.2.tar.gz
+roxterm-1.16.3.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/F-12/roxterm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- roxterm.spec	11 Aug 2009 20:53:55 -0000	1.18
+++ roxterm.spec	22 Dec 2009 22:54:16 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           roxterm
-Version:        1.15.2
+Version:        1.16.3
 Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
@@ -72,6 +72,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Tue Dec 22 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.16.3-1
+- new upstream release: 1.16.3
+
 * Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.15.2-1
 - new upstream release: 1.15.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	11 Aug 2009 20:53:55 -0000	1.17
+++ sources	22 Dec 2009 22:54:16 -0000	1.18
@@ -1 +1 @@
-c4988ce844b702a77f3609c623107e53  roxterm-1.15.2.tar.gz
+6774157977660cdc8fc22c59bc0eec53  roxterm-1.16.3.tar.gz



From alexlan at fedoraproject.org  Tue Dec 22 22:55:49 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 22:55:49 +0000 (UTC)
Subject: File Bio-Graphics-1.994.tar.gz uploaded to lookaside cache by alexlan
Message-ID: <20091222225549.B3EAA10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-Bio-Graphics:

73870861e83975157a660d0335695dcd  Bio-Graphics-1.994.tar.gz



From linville at fedoraproject.org  Tue Dec 22 22:57:09 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 22 Dec 2009 22:57:09 +0000 (UTC)
Subject: rpms/iw/devel iw.spec,1.21,1.22
Message-ID: <20091222225709.E8C2811C00EF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10385

Modified Files:
	iw.spec 
Log Message:
Remove unnecessary explicit Requires of libnl -- oops!


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- iw.spec	22 Dec 2009 19:55:47 -0000	1.21
+++ iw.spec	22 Dec 2009 22:57:09 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           iw
 Version:        0.9.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -13,8 +13,6 @@ BuildRequires:  kernel-headers >= 2.6.24
 BuildRequires:  libnl-devel >= 1.0
 BuildRequires:  pkgconfig      
 
-Requires:       libnl
-
 %description
 iw is a new nl80211 based CLI configuration utility for wireless devices.
 Currently you can only use this utility to configure devices which
@@ -45,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Tue Dec 21 2009 John W. Linville <linville at redhat.com> 0.9.18-4
+- Remove unnecessary explicit Requires of libnl -- oops!
+
 * Tue Dec 21 2009 John W. Linville <linville at redhat.com> 0.9.18-3
 - Add libnl to Requires
 



From linville at fedoraproject.org  Tue Dec 22 22:59:02 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 22 Dec 2009 22:59:02 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.27,1.28
Message-ID: <20091222225902.DEFC811C00EF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10719

Modified Files:
	crda.spec 
Log Message:
Remove unnecessary explicit Requries for libgcrypt and libnl -- oops!


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- crda.spec	22 Dec 2009 19:49:43 -0000	1.27
+++ crda.spec	22 Dec 2009 22:59:02 -0000	1.28
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -17,7 +17,7 @@ BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
 BuildRequires:  gzip
 
-Requires:       udev, iw, libgcrypt, libnl
+Requires:       udev, iw
 
 Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
 Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-5
+- Remove unnecessary explicit Requries for libgcrypt and libnl -- oops!
+
 * Tue Dec 21 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.11.25-4
 - Add libgcrypt and libnl to Requires
 



From alexlan at fedoraproject.org  Tue Dec 22 23:06:37 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:06:37 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/devel .cvsignore, 1.5,
	1.6 perl-Bio-Graphics.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20091222230637.1A73D11C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11828

Modified Files:
	.cvsignore perl-Bio-Graphics.spec sources 
Log Message:
- Update to upstream 1.994



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Jul 2009 06:47:10 -0000	1.5
+++ .cvsignore	22 Dec 2009 23:06:36 -0000	1.6
@@ -1 +1 @@
-Bio-Graphics-1.97.tar.gz
+Bio-Graphics-1.994.tar.gz


Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/devel/perl-Bio-Graphics.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Bio-Graphics.spec	7 Dec 2009 10:49:29 -0000	1.8
+++ perl-Bio-Graphics.spec	22 Dec 2009 23:06:36 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Bio-Graphics
-Version:        1.97
-Release:        3%{?dist}
+Version:        1.994
+Release:        1%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -34,7 +34,7 @@ rm lib/Bio/Graphics/Glyph/trace.pm
 
 %build
 %{__perl} Build.PL installdirs=vendor
-./Build
+#./Build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,7 +46,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 
 
 %check
-##./Build test
+./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-1
+- Update to upstream 1.994
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.97-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Jul 2009 06:47:10 -0000	1.5
+++ sources	22 Dec 2009 23:06:36 -0000	1.6
@@ -1 +1 @@
-f83ffe265910b5275e7213617bf82199  Bio-Graphics-1.97.tar.gz
+73870861e83975157a660d0335695dcd  Bio-Graphics-1.994.tar.gz



From alexlan at fedoraproject.org  Tue Dec 22 23:08:53 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:08:53 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/F-12 .cvsignore, 1.5,
	1.6 perl-Bio-Graphics.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091222230853.DB4C211C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12195

Modified Files:
	.cvsignore perl-Bio-Graphics.spec sources 
Log Message:
- Update to upstream 1.994



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Jul 2009 06:47:10 -0000	1.5
+++ .cvsignore	22 Dec 2009 23:08:53 -0000	1.6
@@ -1 +1 @@
-Bio-Graphics-1.97.tar.gz
+Bio-Graphics-1.994.tar.gz


Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-12/perl-Bio-Graphics.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Bio-Graphics.spec	26 Jul 2009 03:51:22 -0000	1.7
+++ perl-Bio-Graphics.spec	22 Dec 2009 23:08:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Bio-Graphics
-Version:        1.97
-Release:        2%{?dist}
+Version:        1.994
+Release:        1%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -34,7 +34,7 @@ rm lib/Bio/Graphics/Glyph/trace.pm
 
 %build
 %{__perl} Build.PL installdirs=vendor
-./Build
+#./Build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,7 +46,7 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 
 
 %check
-##./Build test
+./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-1
+- Update to upstream 1.994
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.97-3
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.97-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Jul 2009 06:47:10 -0000	1.5
+++ sources	22 Dec 2009 23:08:53 -0000	1.6
@@ -1 +1 @@
-f83ffe265910b5275e7213617bf82199  Bio-Graphics-1.97.tar.gz
+73870861e83975157a660d0335695dcd  Bio-Graphics-1.994.tar.gz



From sergiopr at fedoraproject.org  Tue Dec 22 23:10:34 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 22 Dec 2009 23:10:34 +0000 (UTC)
Subject: rpms/libindi/devel libindi.spec,1.7,1.8
Message-ID: <20091222231034.67E9A11C03F6@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/libindi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12549

Modified Files:
	libindi.spec 
Log Message:
* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6-9
- Static library moved to its own subpackage



Index: libindi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libindi/devel/libindi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libindi.spec	25 Jul 2009 05:58:08 -0000	1.7
+++ libindi.spec	22 Dec 2009 23:10:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name: libindi
 Version: 0.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
 Group: Development/Libraries
@@ -36,10 +36,16 @@ data acquisition, monitoring, and a lot 
 Summary: Libraries, includes, etc. used to develop an application with %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: libindi-static = %{version}-%{release}
 %description devel
 These are the header files needed to develop a %{name} application
 
+%package static
+Summary: Static libraries, includes, etc. used to develop an application with %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description static
+Static library needed to develop a %{name} application
+
 %prep
 %setup -q -n %{name}%{majorver}-%{version}
 %patch0 -p1
@@ -50,11 +56,11 @@ These are the header files needed to dev
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-rm -fr %{buildroot}
+rm -rf %{buildroot}
 make install  DESTDIR=%{buildroot}
 
 %clean
-rm -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -69,12 +75,17 @@ rm -fr %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc README COPYING.LIB LICENSE
 %{_includedir}/*
 %{_libdir}/*.so
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/*.a
 
 %changelog
+* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6-9
+- Static library moved to its own subpackage
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From alexlan at fedoraproject.org  Tue Dec 22 23:11:46 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:11:46 +0000 (UTC)
Subject: File GD-SVG-0.33.tar.gz uploaded to lookaside cache by alexlan
Message-ID: <20091222231146.E34C910F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-GD-SVG:

61279556f1ea76145152971eaaf2242f  GD-SVG-0.33.tar.gz



From alexlan at fedoraproject.org  Tue Dec 22 23:13:35 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:13:35 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/F-11 .cvsignore, 1.4,
	1.5 perl-Bio-Graphics.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091222231335.C2D7E11C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13264

Modified Files:
	.cvsignore perl-Bio-Graphics.spec sources 
Log Message:
Updating to upstream 1.994



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 May 2009 08:01:22 -0000	1.4
+++ .cvsignore	22 Dec 2009 23:13:35 -0000	1.5
@@ -1 +1 @@
-Bio-Graphics-1.94.tar.gz
+Bio-Graphics-1.994.tar.gz


Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-11/perl-Bio-Graphics.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Bio-Graphics.spec	5 May 2009 08:01:22 -0000	1.5
+++ perl-Bio-Graphics.spec	22 Dec 2009 23:13:35 -0000	1.6
@@ -1,12 +1,11 @@
 Name:           perl-Bio-Graphics
-Version:        1.94
+Version:        1.994
 Release:        1%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Bio-Graphics/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Bio-Graphics-%{version}.tar.gz
-Patch0:         perl-Bio-Graphics-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Bio::Root::Version) >= 1.005009
@@ -28,7 +27,6 @@ laid out on the number line
 
 %prep
 %setup -q -n Bio-Graphics-%{version}
-%patch0 -p0 -b .tests
 
 # temporarily remove modules Bio/Graphics/Glyph/trace.pm until the dependency:
 # Bio::SCF is packaged
@@ -36,7 +34,7 @@ rm lib/Bio/Graphics/Glyph/trace.pm
 
 %build
 %{__perl} Build.PL installdirs=vendor
-./Build
+#./Build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,8 +60,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-1
+- Update to upstream 1.994
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.97-3
+- rebuild against perl 5.10.1
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.97-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.97-1
+- Update to latest upstream (1.97) to fix FTBFS (#511633) and disable
+  tests temporarily (reported upstream: 
+  http://rt.cpan.org/Public/Bug/Display.html?id=47935)
+
 * Tue May  5 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.94-1
 - Update to latest upstream (1.94)
+- Drop patch for disabling tests
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.84-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 May 2009 08:01:22 -0000	1.4
+++ sources	22 Dec 2009 23:13:35 -0000	1.5
@@ -1 +1 @@
-363508cab96fc62d84f2d1f9e158edfd  Bio-Graphics-1.94.tar.gz
+73870861e83975157a660d0335695dcd  Bio-Graphics-1.994.tar.gz



From svahl at fedoraproject.org  Tue Dec 22 23:18:48 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 22 Dec 2009 23:18:48 +0000 (UTC)
Subject: rpms/roxterm/F-11 .cvsignore, 1.17, 1.18 roxterm.spec, 1.16,
	1.17 sources, 1.17, 1.18
Message-ID: <20091222231848.B5D1D11C00EF@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/pkgs/rpms/roxterm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14071

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
* Tue Dec 22 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.16.3-1
- new upstream release: 1.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	11 Aug 2009 20:53:54 -0000	1.17
+++ .cvsignore	22 Dec 2009 23:18:48 -0000	1.18
@@ -1 +1 @@
-roxterm-1.15.2.tar.gz
+roxterm-1.16.3.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/F-11/roxterm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- roxterm.spec	11 Aug 2009 20:53:55 -0000	1.16
+++ roxterm.spec	22 Dec 2009 23:18:48 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           roxterm
-Version:        1.15.2
+Version:        1.16.3
 Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
@@ -72,6 +72,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Tue Dec 22 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.16.3-1
+- new upstream release: 1.16.3
+
 * Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.15.2-1
 - new upstream release: 1.15.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roxterm/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	11 Aug 2009 20:53:55 -0000	1.17
+++ sources	22 Dec 2009 23:18:48 -0000	1.18
@@ -1 +1 @@
-c4988ce844b702a77f3609c623107e53  roxterm-1.15.2.tar.gz
+6774157977660cdc8fc22c59bc0eec53  roxterm-1.16.3.tar.gz



From alexlan at fedoraproject.org  Tue Dec 22 23:21:57 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:21:57 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/F-12 perl-Bio-Graphics.spec,1.8,1.9
Message-ID: <20091222232157.3647211C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14570/F-12

Modified Files:
	perl-Bio-Graphics.spec 
Log Message:
Fix disabling of tests



Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-12/perl-Bio-Graphics.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Bio-Graphics.spec	22 Dec 2009 23:08:53 -0000	1.8
+++ perl-Bio-Graphics.spec	22 Dec 2009 23:21:57 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Bio-Graphics
 Version:        1.994
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -34,7 +34,7 @@ rm lib/Bio/Graphics/Glyph/trace.pm
 
 %build
 %{__perl} Build.PL installdirs=vendor
-#./Build
+./Build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,8 +45,8 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 
-%check
-./Build test
+#check
+#./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-2
+- Fix disabling of tests
+
 * Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-1
 - Update to upstream 1.994
 



From alexlan at fedoraproject.org  Tue Dec 22 23:21:57 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:21:57 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/devel perl-Bio-Graphics.spec,1.9,1.10
Message-ID: <20091222232157.5D5BF11C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14570/devel

Modified Files:
	perl-Bio-Graphics.spec 
Log Message:
Fix disabling of tests



Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/devel/perl-Bio-Graphics.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Bio-Graphics.spec	22 Dec 2009 23:06:36 -0000	1.9
+++ perl-Bio-Graphics.spec	22 Dec 2009 23:21:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Bio-Graphics
 Version:        1.994
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -34,7 +34,7 @@ rm lib/Bio/Graphics/Glyph/trace.pm
 
 %build
 %{__perl} Build.PL installdirs=vendor
-#./Build
+./Build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,8 +45,8 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 
-%check
-./Build test
+#check
+#./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-2
+- Fix disabling of tests
+
 * Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-1
 - Update to upstream 1.994
 



From alexlan at fedoraproject.org  Tue Dec 22 23:21:57 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:21:57 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/F-11 perl-Bio-Graphics.spec,1.6,1.7
Message-ID: <20091222232157.0DE1E11C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14570/F-11

Modified Files:
	perl-Bio-Graphics.spec 
Log Message:
Fix disabling of tests



Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-11/perl-Bio-Graphics.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Bio-Graphics.spec	22 Dec 2009 23:13:35 -0000	1.6
+++ perl-Bio-Graphics.spec	22 Dec 2009 23:21:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Bio-Graphics
 Version:        1.994
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -34,7 +34,7 @@ rm lib/Bio/Graphics/Glyph/trace.pm
 
 %build
 %{__perl} Build.PL installdirs=vendor
-#./Build
+./Build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,8 +45,8 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 
-%check
-./Build test
+#check
+#./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-2
+- Fix disabling of tests
+
 * Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.994-1
 - Update to upstream 1.994
 



From alexlan at fedoraproject.org  Tue Dec 22 23:23:48 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:23:48 +0000 (UTC)
Subject: rpms/perl-GD-SVG/devel .cvsignore, 1.3, 1.4 perl-GD-SVG.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <20091222232348.DF91011C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14998

Modified Files:
	perl-GD-SVG.spec sources 
Added Files:
	.cvsignore 
Log Message:
- Update to upstream 0.33



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	22 Dec 2009 23:23:48 -0000	1.4
@@ -0,0 +1 @@
+GD-SVG-0.33.tar.gz


Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/devel/perl-GD-SVG.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-GD-SVG.spec	4 Dec 2009 02:01:54 -0000	1.12
+++ perl-GD-SVG.spec	22 Dec 2009 23:23:48 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-GD-SVG
-Version:        0.32
-Release:        4%{?dist}
+Version:        0.33
+Release:        1%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.33-1
+- Update to upstream 0.33
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.32-4
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Feb 2009 14:47:54 -0000	1.5
+++ sources	22 Dec 2009 23:23:48 -0000	1.6
@@ -1 +1 @@
-8693cfef0f0ada339537d615ab9f5556  GD-SVG-0.32.tar.gz
+61279556f1ea76145152971eaaf2242f  GD-SVG-0.33.tar.gz



From alexlan at fedoraproject.org  Tue Dec 22 23:26:29 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:26:29 +0000 (UTC)
Subject: rpms/perl-GD-SVG/F-12 perl-GD-SVG.spec,1.11,1.12 sources,1.5,1.6
Message-ID: <20091222232629.6357411C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15566/F-12

Modified Files:
	perl-GD-SVG.spec sources 
Log Message:
Update to upstream 0.33



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/F-12/perl-GD-SVG.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-GD-SVG.spec	26 Jul 2009 06:09:08 -0000	1.11
+++ perl-GD-SVG.spec	22 Dec 2009 23:26:29 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-GD-SVG
-Version:        0.32
-Release:        3%{?dist}
+Version:        0.33
+Release:        1%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
@@ -57,6 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.33-1
+- Update to upstream 0.33
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.32-4
+- rebuild against perl 5.10.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Feb 2009 14:47:54 -0000	1.5
+++ sources	22 Dec 2009 23:26:29 -0000	1.6
@@ -1 +1 @@
-8693cfef0f0ada339537d615ab9f5556  GD-SVG-0.32.tar.gz
+61279556f1ea76145152971eaaf2242f  GD-SVG-0.33.tar.gz



From alexlan at fedoraproject.org  Tue Dec 22 23:26:29 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 22 Dec 2009 23:26:29 +0000 (UTC)
Subject: rpms/perl-GD-SVG/F-11 perl-GD-SVG.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <20091222232629.4B06B11C00EF@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15566/F-11

Modified Files:
	perl-GD-SVG.spec sources 
Log Message:
Update to upstream 0.33



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/F-11/perl-GD-SVG.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-GD-SVG.spec	26 Feb 2009 16:44:33 -0000	1.10
+++ perl-GD-SVG.spec	22 Dec 2009 23:26:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-GD-SVG
-Version:        0.32
-Release:        2%{?dist}
+Version:        0.33
+Release:        1%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
@@ -57,6 +57,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.33-1
+- Update to upstream 0.33
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.32-4
+- rebuild against perl 5.10.1
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Feb 2009 14:47:54 -0000	1.5
+++ sources	22 Dec 2009 23:26:29 -0000	1.6
@@ -1 +1 @@
-8693cfef0f0ada339537d615ab9f5556  GD-SVG-0.32.tar.gz
+61279556f1ea76145152971eaaf2242f  GD-SVG-0.33.tar.gz



From sergiopr at fedoraproject.org  Tue Dec 22 23:26:34 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 22 Dec 2009 23:26:34 +0000 (UTC)
Subject: rpms/indi-apogee/devel indi-apogee.spec,1.3,1.4
Message-ID: <20091222232634.53FC611C00EF@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/indi-apogee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15718

Modified Files:
	indi-apogee.spec 
Log Message:
* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.0-4
- Adding libindi-devel to build requires



Index: indi-apogee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/indi-apogee/devel/indi-apogee.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- indi-apogee.spec	25 Jul 2009 03:21:46 -0000	1.3
+++ indi-apogee.spec	22 Dec 2009 23:26:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name: indi-apogee
 Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: The INDI driver for Apogee Alta (U & E) line of CCDs
 
 Group: Development/Libraries
@@ -11,8 +11,8 @@ Source0: http://downloads.sourceforge.ne
 Patch0: indi-apogee-cfitsio.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: cmake libusb-devel libindi-static libapogee-devel libnova-devel
-BuildRequires: cfitsio-devel zlib-devel
+BuildRequires: cmake libusb-devel cfitsio-devel zlib-devel
+BuildRequires: libindi-static libindi-devel libapogee-devel libnova-devel
 
 %description
 The INDI (Instrument Neutral Distributed Interface) driver for Apogee 
@@ -40,6 +40,9 @@ rm -rf %{buildroot}
 %{_datadir}/indi/*
 
 %changelog
+* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.0-4
+- Adding libindi-devel to build requires
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Tue Dec 22 23:29:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 22 Dec 2009 23:29:51 +0000 (UTC)
Subject: rpms/R/EL-4 R.spec,1.36,1.37 sources,1.15,1.16
Message-ID: <20091222232951.5CCF411C00EF@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16458/EL-4

Modified Files:
	R.spec sources 
Log Message:
2.10.1


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-4/R.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- R.spec	9 Nov 2009 03:09:19 -0000	1.36
+++ R.spec	22 Dec 2009 23:29:51 -0000	1.37
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.10.0
-Release: 2%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -67,11 +67,11 @@ Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.3
 Provides: R-lattice = 0.17.26
-Provides: R-MASS = 7.3.3
-Provides: R-Matrix = 0.999375.31
+Provides: R-MASS = 7.3.4
+Provides: R-Matrix = 0.999375.33
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.5.6
+Provides: R-mgcv = 1.6.1
 Provides: R-nlme = 3.1.96
 Provides: R-nnet = 7.3.1
 Provides: R-rpart = 3.1.45
@@ -204,6 +204,7 @@ export FCFLAGS="%{optflags}"
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib \
+    --enable-prebuilt-html \
     rdocdir=%{_docdir}/R-%{version} \
     rincludedir=%{_includedir}/R \
     rsharedir=%{_datadir}/R) \
@@ -846,6 +847,10 @@ fi
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.1-1
+- update to 2.10.1
+- enable static html pages
+
 * Mon Nov  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.0-2
 - get rid of index.txt scriptlet on R-core (bz 533572)
 - leave macro in place, but don't call /usr/lib/rpm/R-make-search-index.sh equivalent anymore


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 Nov 2009 04:43:15 -0000	1.15
+++ sources	22 Dec 2009 23:29:51 -0000	1.16
@@ -1 +1 @@
-4486934883b1dbcd5400135e22b26a75  R-2.10.0.tar.gz
+75f8b7e875b846ea96a4c6cc0abc00a4  R-2.10.1.tar.gz



From spot at fedoraproject.org  Tue Dec 22 23:29:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 22 Dec 2009 23:29:51 +0000 (UTC)
Subject: rpms/R/F-11 R.spec,1.65,1.66 sources,1.25,1.26
Message-ID: <20091222232951.9CC6111C029C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16458/F-11

Modified Files:
	R.spec sources 
Log Message:
2.10.1


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-11/R.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- R.spec	9 Nov 2009 03:09:20 -0000	1.65
+++ R.spec	22 Dec 2009 23:29:51 -0000	1.66
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.10.0
-Release: 2%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -68,11 +68,11 @@ Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.3
 Provides: R-lattice = 0.17.26
-Provides: R-MASS = 7.3.3
-Provides: R-Matrix = 0.999375.31
+Provides: R-MASS = 7.3.4
+Provides: R-Matrix = 0.999375.33
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.5.6
+Provides: R-mgcv = 1.6.1
 Provides: R-nlme = 3.1.96
 Provides: R-nnet = 7.3.1
 Provides: R-rpart = 3.1.45
@@ -229,6 +229,7 @@ export FCFLAGS="%{optflags}"
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib \
+    --enable-prebuilt-html \
     rdocdir=%{_docdir}/R-%{version} \
     rincludedir=%{_includedir}/R \
     rsharedir=%{_datadir}/R) \
@@ -898,6 +899,10 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.1-1
+- update to 2.10.1
+- enable static html pages
+
 * Mon Nov  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.0-2
 - get rid of index.txt scriptlet on R-core (bz 533572)
 - leave macro in place, but don't call /usr/lib/rpm/R-make-search-index.sh equivalent anymore


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	5 Nov 2009 04:43:16 -0000	1.25
+++ sources	22 Dec 2009 23:29:51 -0000	1.26
@@ -1 +1 @@
-4486934883b1dbcd5400135e22b26a75  R-2.10.0.tar.gz
+75f8b7e875b846ea96a4c6cc0abc00a4  R-2.10.1.tar.gz



From spot at fedoraproject.org  Tue Dec 22 23:29:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 22 Dec 2009 23:29:51 +0000 (UTC)
Subject: rpms/R/F-12 R.spec,1.67,1.68 sources,1.25,1.26
Message-ID: <20091222232951.D6BF811C0382@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16458/F-12

Modified Files:
	R.spec sources 
Log Message:
2.10.1


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-12/R.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- R.spec	9 Nov 2009 03:11:33 -0000	1.67
+++ R.spec	22 Dec 2009 23:29:51 -0000	1.68
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.10.0
-Release: 2%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -68,11 +68,11 @@ Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.3
 Provides: R-lattice = 0.17.26
-Provides: R-MASS = 7.3.3
-Provides: R-Matrix = 0.999375.31
+Provides: R-MASS = 7.3.4
+Provides: R-Matrix = 0.999375.33
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.5.6
+Provides: R-mgcv = 1.6.1
 Provides: R-nlme = 3.1.96
 Provides: R-nnet = 7.3.1
 Provides: R-rpart = 3.1.45
@@ -229,6 +229,7 @@ export FCFLAGS="%{optflags}"
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib \
+    --enable-prebuilt-html \
     rdocdir=%{_docdir}/R-%{version} \
     rincludedir=%{_includedir}/R \
     rsharedir=%{_datadir}/R) \
@@ -898,6 +899,10 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.1-1
+- update to 2.10.1
+- enable static html pages
+
 * Mon Nov  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.0-2
 - get rid of index.txt scriptlet on R-core (bz 533572)
 - leave macro in place, but don't call /usr/lib/rpm/R-make-search-index.sh equivalent anymore


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	5 Nov 2009 04:43:17 -0000	1.25
+++ sources	22 Dec 2009 23:29:51 -0000	1.26
@@ -1 +1 @@
-4486934883b1dbcd5400135e22b26a75  R-2.10.0.tar.gz
+75f8b7e875b846ea96a4c6cc0abc00a4  R-2.10.1.tar.gz



From spot at fedoraproject.org  Tue Dec 22 23:29:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 22 Dec 2009 23:29:51 +0000 (UTC)
Subject: rpms/R/EL-5 R.spec,1.42,1.43 sources,1.21,1.22
Message-ID: <20091222232951.725AC11C00EF@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16458/EL-5

Modified Files:
	R.spec sources 
Log Message:
2.10.1


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- R.spec	9 Nov 2009 03:09:20 -0000	1.42
+++ R.spec	22 Dec 2009 23:29:51 -0000	1.43
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.10.0
-Release: 2%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -68,11 +68,11 @@ Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.3
 Provides: R-lattice = 0.17.26
-Provides: R-MASS = 7.3.3
-Provides: R-Matrix = 0.999375.31
+Provides: R-MASS = 7.3.4
+Provides: R-Matrix = 0.999375.33
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.5.6
+Provides: R-mgcv = 1.6.1
 Provides: R-nlme = 3.1.96
 Provides: R-nnet = 7.3.1
 Provides: R-rpart = 3.1.45
@@ -196,6 +196,7 @@ export FCFLAGS="%{optflags}"
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib \
+    --enable-prebuilt-html \
     rdocdir=%{_docdir}/R-%{version} \
     rincludedir=%{_includedir}/R \
     rsharedir=%{_datadir}/R) \
@@ -838,6 +839,10 @@ fi
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.1-1
+- update to 2.10.1
+- enable static html pages
+
 * Mon Nov  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.0-2
 - get rid of index.txt scriptlet on R-core (bz 533572)
 - leave macro in place, but don't call /usr/lib/rpm/R-make-search-index.sh equivalent anymore


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	5 Nov 2009 04:43:16 -0000	1.21
+++ sources	22 Dec 2009 23:29:51 -0000	1.22
@@ -1 +1 @@
-4486934883b1dbcd5400135e22b26a75  R-2.10.0.tar.gz
+75f8b7e875b846ea96a4c6cc0abc00a4  R-2.10.1.tar.gz



From spot at fedoraproject.org  Tue Dec 22 23:29:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 22 Dec 2009 23:29:52 +0000 (UTC)
Subject: rpms/R/devel .cvsignore,1.23,1.24 R.spec,1.68,1.69 sources,1.25,1.26
Message-ID: <20091222232952.13C7B11C039C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16458/devel

Modified Files:
	.cvsignore R.spec sources 
Log Message:
2.10.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	5 Nov 2009 04:43:17 -0000	1.23
+++ .cvsignore	22 Dec 2009 23:29:51 -0000	1.24
@@ -1 +1 @@
-R-2.10.0.tar.gz
+R-2.10.1.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- R.spec	9 Nov 2009 03:09:21 -0000	1.68
+++ R.spec	22 Dec 2009 23:29:51 -0000	1.69
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.10.0
-Release: 2%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -68,11 +68,11 @@ Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.3
 Provides: R-lattice = 0.17.26
-Provides: R-MASS = 7.3.3
-Provides: R-Matrix = 0.999375.31
+Provides: R-MASS = 7.3.4
+Provides: R-Matrix = 0.999375.33
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.5.6
+Provides: R-mgcv = 1.6.1
 Provides: R-nlme = 3.1.96
 Provides: R-nnet = 7.3.1
 Provides: R-rpart = 3.1.45
@@ -229,6 +229,7 @@ export FCFLAGS="%{optflags}"
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib \
+    --enable-prebuilt-html \
     rdocdir=%{_docdir}/R-%{version} \
     rincludedir=%{_includedir}/R \
     rsharedir=%{_datadir}/R) \
@@ -898,6 +899,10 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.1-1
+- update to 2.10.1
+- enable static html pages
+
 * Mon Nov  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.0-2
 - get rid of index.txt scriptlet on R-core (bz 533572)
 - leave macro in place, but don't call /usr/lib/rpm/R-make-search-index.sh equivalent anymore


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	5 Nov 2009 04:43:17 -0000	1.25
+++ sources	22 Dec 2009 23:29:51 -0000	1.26
@@ -1 +1 @@
-4486934883b1dbcd5400135e22b26a75  R-2.10.0.tar.gz
+75f8b7e875b846ea96a4c6cc0abc00a4  R-2.10.1.tar.gz



From rdieter at fedoraproject.org  Tue Dec 22 23:46:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 22 Dec 2009 23:46:48 +0000 (UTC)
Subject: rpms/qt3/devel qt-x11-free-3.3.8b-sane_defaults.patch, NONE, 1.1 qtrc,
	NONE, 1.1 qt3.spec, 1.20, 1.21
Message-ID: <20091222234648.59D3911C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19173

Modified Files:
	qt3.spec 
Added Files:
	qt-x11-free-3.3.8b-sane_defaults.patch qtrc 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-29
- sane defaults (#549820)


qt-x11-free-3.3.8b-sane_defaults.patch:
 qapplication.cpp     |   13 ++++++++++---
 qapplication_x11.cpp |   11 +++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE qt-x11-free-3.3.8b-sane_defaults.patch ---
diff -up qt-x11-free-3.3.8b/src/kernel/qapplication.cpp.sane_defaults qt-x11-free-3.3.8b/src/kernel/qapplication.cpp
--- qt-x11-free-3.3.8b/src/kernel/qapplication.cpp.sane_defaults	2008-01-15 13:09:13.000000000 -0600
+++ qt-x11-free-3.3.8b/src/kernel/qapplication.cpp	2009-12-22 14:00:19.078553429 -0600
@@ -1241,7 +1241,7 @@ QStyle& QApplication::style()
 #elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
 	    style = "SGI";			// default style for X11 on IRIX
 #elif defined(Q_WS_X11)
-		style = "Motif";		// default style for X11
+		style = "Platinum";		// default style for X11
 #elif defined(Q_WS_MAC)
 		style = "Macintosh";		// default style for all Mac's
 #elif defined(Q_WS_QWS)
@@ -1250,8 +1250,8 @@ QStyle& QApplication::style()
 	}
 	app_style = QStyleFactory::create( style );
 	if ( !app_style &&		// platform default style not available, try alternatives
-	     !(app_style = QStyleFactory::create( "Windows" ) ) &&
 	     !(app_style = QStyleFactory::create( "Platinum" ) ) &&
+	     !(app_style = QStyleFactory::create( "Windows" ) ) &&
 	     !(app_style = QStyleFactory::create( "MotifPlus" ) ) &&
 	     !(app_style = QStyleFactory::create( "Motif" ) ) &&
 	     !(app_style = QStyleFactory::create( "CDE" ) ) &&
@@ -1731,6 +1731,13 @@ QStringList QApplication::libraryPaths()
 	    app_libpaths->append(installPathPlugins);
 	}
 
+ #if defined(Q_WS_X11)
+	QString kde3PathPlugins = QString("@@KDE3_PLUGIN_PATH@@");
+	if ( QFile::exists(kde3PathPlugins) ) {
+	    app_libpaths->append(kde3PathPlugins);
+	}
+#endif
+
 	QString app_location;
 	if (qApp)
 	    app_location = qApp->applicationFilePath();
@@ -1933,7 +1940,7 @@ QFont QApplication::font( const QWidget 
 	}
     }
     if ( !app_font ) {
-	app_font = new QFont( "Helvetica" );
+	app_font = new QFont( "Sans" );
 	Q_CHECK_PTR( app_font );
     }
     return *app_font;
diff -up qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp.sane_defaults qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp
--- qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp.sane_defaults	2008-01-15 13:09:13.000000000 -0600
+++ qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp	2009-12-22 13:54:58.335802790 -0600
@@ -953,8 +953,11 @@ bool QApplication::x11_apply_settings()
     // read new QStyle
     extern bool qt_explicit_app_style; // defined in qapplication.cpp
     QString stylename = settings.readEntry( "/qt/style" );
-    if ( !stylename.isEmpty() && !qt_explicit_app_style ) {
-	QApplication::setStyle( stylename );
+    if ( !qt_explicit_app_style ) {
+	if ( stylename.isEmpty() )
+	    QApplication::setStyle( QString("Platinum") );
+	else
+	    QApplication::setStyle( stylename );
 	// took the style from the user settings, so mark the explicit flag FALSE
 	qt_explicit_app_style = FALSE;
     }
@@ -2095,11 +2098,11 @@ void qt_init_internal( int *argcptr, cha
 	// At 95 DPI, a 12 point font should be 16 pixels tall - in which case a 17
 	// pixel font is a closer match than a 12 pixel font
 	int ptsz =
-	    (int) ( ( ( QPaintDevice::x11AppDpiY() >= 95 ? 17. : 12. ) *
+	    (int) ( ( ( QPaintDevice::x11AppDpiY() >= 95 ? 13. : 11. ) *
 		      72. / (float) QPaintDevice::x11AppDpiY() ) + 0.5 );
 
 	if ( !qt_app_has_font && !qt_x11_cmdline_font ) {
-	    QFont f( "Helvetica", ptsz );
+	    QFont f( "Sans", ptsz );
 	    QApplication::setFont( f );
 	}
 


--- NEW FILE qtrc ---
[3.3]
libraryPath=@@QTDIR@@/plugins:@@KDE3_PLUGIN_PATH@@

[General]
font=Sans,10,-1,0,50,0,0,0,0,0
style=Platinum


Index: qt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- qt3.spec	10 Sep 2009 11:14:32 -0000	1.20
+++ qt3.spec	22 Dec 2009 23:46:48 -0000	1.21
@@ -2,8 +2,8 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 28%{?dist}
 Name: qt3
+Release: 29%{?dist}
 Obsoletes: qt < 1:%{version}-%{release}
 Provides: qt = 1:%{version}-%{release}
 License: QPL or GPLv2 or GPLv3
@@ -42,6 +42,12 @@ Patch35: qt-3.3.6-fontrendering-ml_IN-21
 Patch37: qt-3.3.6-fontrendering-gu-228452.patch
 Patch38: qt-x11-free-3.3.8-odbc.patch
 Patch39: qt-x11-free-3.3.7-arm.patch
+# See http://bugzilla.redhat.com/549820
+# Try to set some sane defaults, for style, fonts, plugin path
+# FIXME: style doesn't work.  use kde3 plastik, if available
+Patch40: qt-x11-free-3.3.8b-sane_defaults.patch
+# and/or just use qtrc to do the same thing
+Source10: qtrc
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
@@ -304,6 +310,10 @@ for the Qt 3 toolkit.
 %ifarch armv5tel
 %patch39 -p1 -b .arm
 %endif
+%patch40 -p1 -b .sane_defaults
+sed -i.KDE3_PLUGIN_PATH \
+  -e "s|@@KDE3_PLUGIN_PATH@@|%{_libdir}/kde3/plugins|" \
+  src/kernel/qapplication.cpp
 
 # immodule patches
 %if %{immodule}
@@ -447,6 +457,12 @@ export QTDEST=%{qtdir}
 
 make install INSTALL_ROOT=%{buildroot}
 
+install -m644 -D %{SOURCE10} %{buildroot}%{qtdir}/etc/settings/qtrc
+sed -i \
+  -e "s|@@QTDIR@@|%{qtdir}|" \
+  -e "s|@@KDE3_PLUGIN_PATH@@|%{_libdir}/kde3/plugins|" \
+   %{buildroot}%{qtdir}/etc/settings/qtrc
+
 for i in findtr qt20fix qtrename140 lrelease lupdate ; do
    install bin/$i %{buildroot}%{qtdir}/bin/
 done
@@ -519,11 +535,14 @@ rm -rf %{buildroot}
 %doc FAQ LICENSE* README* changes*
 %dir %{qtdir}
 %dir %{qtdir}/bin
+%dir %{qtdir}/etc/
+%dir %{qtdir}/etc/settings/
 %dir %{qtdir}/lib
 %dir %{qtdir}/plugins
 %dir %{qtdir}/plugins/sqldrivers
 %dir %{qtdir}/plugins/styles
-%{qtdir}/translations
+%config %{qtdir}/etc/settings/qtrc
+%{qtdir}/translations/
 %{qtdir}/plugins/designer/
 %if %{immodule}
 %{qtdir}/plugins/inputmethods
@@ -600,6 +619,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-29
+- sane defaults (#549820)
+
 * Thu Sep 10 2009 Than Ngo <than at redhat.com> - 3.3.8b-28
 - drop support fedora < 10
 



From pfj at fedoraproject.org  Wed Dec 23 00:06:27 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:06:27 +0000 (UTC)
Subject: File libgdiplus-2.6.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223000627.53DE010F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libgdiplus:

9107b4429fdafde914bd23405544c58d  libgdiplus-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:07:02 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:07:02 +0000 (UTC)
Subject: rpms/libgdiplus/devel .cvsignore, 1.25, 1.26 import.log, 1.15,
	1.16 libgdiplus.spec, 1.47, 1.48 sources, 1.28, 1.29
Message-ID: <20091223000702.92E3C11C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/libgdiplus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22315/devel

Modified Files:
	.cvsignore import.log libgdiplus.spec sources 
Log Message:

Update to 2.6 release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	4 Oct 2009 15:28:23 -0000	1.25
+++ .cvsignore	23 Dec 2009 00:07:02 -0000	1.26
@@ -1 +1 @@
-libgdiplus-137314.tar.bz2
+libgdiplus-2.6.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	4 Oct 2009 15:28:23 -0000	1.15
+++ import.log	23 Dec 2009 00:07:02 -0000	1.16
@@ -13,3 +13,4 @@ libgdiplus-2_4-4_RC3_fc11:HEAD:libgdiplu
 libgdiplus-2_4-5_fc11:HEAD:libgdiplus-2.4-5.fc11.src.rpm:1238108917
 libgdiplus-2_4_2-1_fc11:HEAD:libgdiplus-2.4.2-1.fc11.src.rpm:1244978228
 libgdiplus-2_6-1_fc12:HEAD:libgdiplus-2.6-1.fc12.src.rpm:1254669963
+libgdiplus-2_6-2_fc13:HEAD:libgdiplus-2.6-2.fc13.src.rpm:1261526789


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- libgdiplus.spec	4 Oct 2009 15:28:23 -0000	1.47
+++ libgdiplus.spec	23 Dec 2009 00:07:02 -0000	1.48
@@ -2,13 +2,13 @@
 #%define date	072209
 Name:           libgdiplus
 Version:        2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://mono.ximian.com/monobuild/snapshot/sources-preview/
-Source0:        %{name}-%{svnver}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  freetype-devel glib2-devel libjpeg-devel libtiff-devel
@@ -29,7 +29,7 @@ Requires: %{name} = %{version}-%{release
 Development files for libgdiplus
 
 %prep
-%setup -q -n %name-%svnver
+%setup -q 
 perl -pi -e "s,-Werror,,g" src/Makefile
 
 %build
@@ -61,6 +61,9 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Dec 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
+- Update to 2.6
+
 * Wed Sep 30 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
 - Update to 2.6 preview 1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	4 Oct 2009 15:28:23 -0000	1.28
+++ sources	23 Dec 2009 00:07:02 -0000	1.29
@@ -1 +1 @@
-c035f5634be0b657057b25696bb211d7  libgdiplus-137314.tar.bz2
+9107b4429fdafde914bd23405544c58d  libgdiplus-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:14:52 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:14:52 +0000 (UTC)
Subject: File mono-2.6.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223001452.2120910F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mono:

39f6e463d3ff8093013492952d2a9906  mono-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:17:13 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:17:13 +0000 (UTC)
Subject: rpms/mono/devel import.log, 1.56, 1.57 mono.spec, 1.143, 1.144 sources,
	1.58, 1.59
Message-ID: <20091223001713.5E65E11C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23564/devel

Modified Files:
	import.log mono.spec sources 
Log Message:

Update to 2.6 release
Now includes soft debugger
Massive number of winforms fixes
Faster JIT
New C# 4.0 preview subpackage
 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- import.log	4 Oct 2009 15:17:20 -0000	1.56
+++ import.log	23 Dec 2009 00:17:13 -0000	1.57
@@ -1 +1,2 @@
 mono-2_6-1_fc12:HEAD:mono-2.6-1.fc12.src.rpm:1254669381
+mono-2_6-4_fc13:HEAD:mono-2.6-4.fc13.src.rpm:1261527294


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- mono.spec	1 Dec 2009 16:52:21 -0000	1.143
+++ mono.spec	23 Dec 2009 00:17:13 -0000	1.144
@@ -2,7 +2,7 @@
 
 Name:           mono
 Version:        2.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -267,6 +267,14 @@ Requires: mono-core = %{version}-%{relea
 %description -n monodoc-devel
 Development file for monodoc
 
+%package mono-4-preview
+Summary:	Provides preview code for C# 4
+Group:		Development/Languages
+Requires:	mono-core = %{version}-%{release}
+
+%description mono-4-preview
+Preview for the new C# 4.0 code
+	
 %define monodir %{_libdir}/mono
 %define gac_dll(dll)  %{monodir}/gac/%{1} \
   %{monodir}/?.0/%{1}.dll \
@@ -289,6 +297,10 @@ Development file for monodoc
   %{monodir}/2.0/%{2}.exe \
   %{monodir}/2.0/%{2}.exe.* \
   %{nil}
+%define mono_bin_4(bin, dll) %{_bindir}/%{1} \
+  %{monodir}/4.0/%{2}.exe \
+  %{monodir}/4.0/%{2}.exe.* \
+  %{nil}
 
 %prep
 %setup -q
@@ -327,7 +339,7 @@ gcc -o monodir %{SOURCE1} -DMONODIR=\"%{
 
 %configure --with-ikvm-native=yes --with-jit=yes --with-xen_opt=yes \
            --with-moonlight=yes --with-profile2=yes \
-           --with-libgdiplus=installed 
+           --with-libgdiplus=installed --with-profile4=yes 
 make
 
 
@@ -348,9 +360,10 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %{__rm} %{buildroot}%{_bindir}/mono-find-requires
 
 # This was removed upstream:
-%{__rm} -fr %{buildroot}%{monodir}/gac/Mono.Security.Win32/[12]*
+%{__rm} -fr %{buildroot}%{monodir}/gac/Mono.Security.Win32/[124]*
 %{__rm} -rf %{buildroot}%{monodir}/1.0/Mono.Security.Win32.dll
 %{__rm} -rf %{buildroot}%{monodir}/2.0/Mono.Security.Win32.dll
+%{__rm} -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/README*
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/barrett_diagram
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/*.html
@@ -383,6 +396,8 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %{_bindir}/mono
 %{_bindir}/monodir
 %{_bindir}/mono-test-install
+%{_bindir}/mono-gdb.py
+%mono_bin lc
 %mono_bin certmgr
 %mono_bin chktrust
 %mono_bin csharp
@@ -412,6 +427,7 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %{_mandir}/man5/mono-config.5.gz
 %{_mandir}/man1/csharp.1.gz
 %{_mandir}/man1/pdb2mdb.1.gz
+%{_mandir}/man1/lc.1.gz
 %{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
@@ -423,6 +439,7 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %gac_dll I18N
 %gac_dll I18N.West
 %gac_dll ICSharpCode.SharpZipLib
+%gac_dll Mono.Debugger.Soft
 %{monodir}/compat-*/ICSharpCode.SharpZipLib.dll
 %{monodir}/gac/Mono.Cecil
 %{monodir}/gac/Mono.Cecil.Mdb
@@ -685,6 +702,7 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %gac_dll Novell.Directory.Ldap
 %gac_dll System.DirectoryServices
 %gac_dll System.Transactions
+%{_libdir}/mono/gac/System.Data.Services/2.0*
 
 %files data-sqlite
 %defattr(-,root,root,-)
@@ -734,7 +752,24 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %defattr (-, root, root)
 %{_libdir}/pkgconfig/monodoc.pc
 
+%files mono-4-preview
+%config (noreplace) %{_sysconfdir}/mono/4.0/*.config
+%config (noreplace) %{_sysconfdir}/mono/4.0/settings.map
+%dir %{monodir}/4.0
+%dir %{_sysconfdir}/mono/4.0
+%{_bindir}/dmcs
+%{monodir}/4.0/*.exe
+%{monodir}/4.0/*.exe.*
+%{monodir}/4.0/*.dll
+%gac_dll Microsoft.CSharp
+%{_libdir}/mono/gac/System.Data.Services/4.0*
+%gac_dll System.Dynamic 
+
 %changelog
+* Wed Dec 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-4
+- Add in the version 4 previews (subpackage)
+- Add in new soft debugger
+
 * Tue Dec  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.6-3
 - perms on mono.snk should be 0644
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	4 Oct 2009 15:17:20 -0000	1.58
+++ sources	23 Dec 2009 00:17:13 -0000	1.59
@@ -1 +1 @@
-fbc38081c34c86895d2fd6734e9457a4  mono-2.6.tar.bz2
+39f6e463d3ff8093013492952d2a9906  mono-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:18:01 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:18:01 +0000 (UTC)
Subject: File mono-basic-2.6.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223001801.947E310F8AB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mono-basic:

64248ca51cd09fb53e34b0373f5dfd91  mono-basic-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:18:31 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:18:31 +0000 (UTC)
Subject: rpms/mono-basic/devel import.log, 1.18, 1.19 mono-basic.spec, 1.29,
	1.30 sources, 1.13, 1.14
Message-ID: <20091223001831.0B29C11C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-basic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23983/devel

Modified Files:
	import.log mono-basic.spec sources 
Log Message:

Update to the 2.6 release 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- import.log	4 Oct 2009 15:21:54 -0000	1.18
+++ import.log	23 Dec 2009 00:18:30 -0000	1.19
@@ -16,3 +16,4 @@ mono-basic-2_4-4_1_fc11:HEAD:mono-basic-
 mono-basic-2_4_2-1_fc11:HEAD:mono-basic-2.4.2-1.fc11.src.rpm:1244979315
 mono-basic-2_4_2-2_fc12:HEAD:mono-basic-2.4.2-2.fc12.src.rpm:1245788002
 mono-basic-2_6-1_fc12:HEAD:mono-basic-2.6-1.fc12.src.rpm:1254669648
+mono-basic-2_6-2_fc13:HEAD:mono-basic-2.6-2.fc13.src.rpm:1261527483


Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/mono-basic.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- mono-basic.spec	26 Oct 2009 20:18:43 -0000	1.29
+++ mono-basic.spec	23 Dec 2009 00:18:30 -0000	1.30
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:		mono-basic
-Version:	2.4.2
-Release:	4%{?dist}
+Version:	2.6
+Release:	2%{?dist}
 Summary:        VisualBasic.NET support for mono
 Group:          Development/Languages
 License:        LGPLv2+
@@ -17,9 +17,9 @@ BuildRequires:	mono-basic pkgconfig
 %else
 BuildRequires:	pkgconfig
 %endif
-BuildRequires:  mono-devel >= 2.4.2
+BuildRequires:  mono-devel >= 2.6
 
-ExcludeArch: sparc64
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 
 %description
 This package contains the Visual Basic .NET compiler and language
@@ -79,11 +79,11 @@ EOF
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
-* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-4
-- ExcludeArch sparc64
+* Wed Dec 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
+- Bump to 2.6 release
 
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep 30 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
+- Bump to 2.6 preview 1
 
 * Mon Jun 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-2
 - Bump to 2.4.2 RC1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Oct 2009 15:21:54 -0000	1.13
+++ sources	23 Dec 2009 00:18:30 -0000	1.14
@@ -1 +1 @@
-464e8f68d5a213e76dd8965c9fce8f15  mono-basic-2.6.tar.bz2
+64248ca51cd09fb53e34b0373f5dfd91  mono-basic-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:19:24 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:19:24 +0000 (UTC)
Subject: rpms/mono-basic/devel import.log,1.19,1.20
Message-ID: <20091223001924.94ECB11C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-basic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24185/devel

Modified Files:
	import.log 
Log Message:

Update to the 2.6 release



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- import.log	23 Dec 2009 00:18:30 -0000	1.19
+++ import.log	23 Dec 2009 00:19:24 -0000	1.20
@@ -17,3 +17,4 @@ mono-basic-2_4_2-1_fc11:HEAD:mono-basic-
 mono-basic-2_4_2-2_fc12:HEAD:mono-basic-2.4.2-2.fc12.src.rpm:1245788002
 mono-basic-2_6-1_fc12:HEAD:mono-basic-2.6-1.fc12.src.rpm:1254669648
 mono-basic-2_6-2_fc13:HEAD:mono-basic-2.6-2.fc13.src.rpm:1261527483
+mono-basic-2_6-2_fc13:HEAD:mono-basic-2.6-2.fc13.src.rpm:1261527521



From pfj at fedoraproject.org  Wed Dec 23 00:27:08 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:27:08 +0000 (UTC)
Subject: File mono-2.6.1.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223002708.829A310F8AB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mono:

4cd2157c9eabbe9f49232d5ee3a2a57e  mono-2.6.1.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:28:22 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:28:22 +0000 (UTC)
Subject: rpms/mono/devel .cvsignore, 1.45, 1.46 import.log, 1.57,
	1.58 mono.spec, 1.144, 1.145 sources, 1.59, 1.60
Message-ID: <20091223002822.C164411C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25725/devel

Modified Files:
	.cvsignore import.log mono.spec sources 
Log Message:

Update to the 2.6.1 release (minor fixes) 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	4 Oct 2009 15:17:19 -0000	1.45
+++ .cvsignore	23 Dec 2009 00:28:22 -0000	1.46
@@ -1 +1 @@
-mono-2.6.tar.bz2
+mono-2.6.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- import.log	23 Dec 2009 00:17:13 -0000	1.57
+++ import.log	23 Dec 2009 00:28:22 -0000	1.58
@@ -1,2 +1,3 @@
 mono-2_6-1_fc12:HEAD:mono-2.6-1.fc12.src.rpm:1254669381
 mono-2_6-4_fc13:HEAD:mono-2.6-4.fc13.src.rpm:1261527294
+mono-2_6_1-1_fc13:HEAD:mono-2.6.1-1.fc13.src.rpm:1261528029


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- mono.spec	23 Dec 2009 00:17:13 -0000	1.144
+++ mono.spec	23 Dec 2009 00:28:22 -0000	1.145
@@ -1,8 +1,8 @@
 #%define svnver 138447
 
 Name:           mono
-Version:        2.6
-Release:        4%{?dist}
+Version:        2.6.1
+Release:        1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -766,6 +766,9 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %gac_dll System.Dynamic 
 
 %changelog
+* Mon Dec 21 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6.1-1
+- Minor fixes
+
 * Wed Dec 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-4
 - Add in the version 4 previews (subpackage)
 - Add in new soft debugger


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	23 Dec 2009 00:17:13 -0000	1.59
+++ sources	23 Dec 2009 00:28:22 -0000	1.60
@@ -1 +1 @@
-39f6e463d3ff8093013492952d2a9906  mono-2.6.tar.bz2
+4cd2157c9eabbe9f49232d5ee3a2a57e  mono-2.6.1.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:29:28 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:29:28 +0000 (UTC)
Subject: File mono-debugger-2.6.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223002928.78FEF10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mono-debugger:

a6cac2d8dc8f788a7b2b35cd3f7204dc  mono-debugger-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:30:47 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:30:47 +0000 (UTC)
Subject: rpms/mono-debugger/devel mdb-2.6-build.patch, NONE,
	1.1 mdb-2.6-configure.patch, NONE, 1.1 mdb-2.6-doc.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 import.log, 1.13,
	1.14 mono-debugger.spec, 1.28, 1.29 sources, 1.12, 1.13
Message-ID: <20091223003047.46A6811C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26152/devel

Modified Files:
	.cvsignore import.log mono-debugger.spec sources 
Added Files:
	mdb-2.6-build.patch mdb-2.6-configure.patch mdb-2.6-doc.patch 
Log Message:

Update to 2.6 release
Removed lots of sed magic and replaced with patches 


mdb-2.6-build.patch:
 Makefile-new.am |    2 +-
 Makefile-new.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mdb-2.6-build.patch ---
--- mono-debugger-2.6/build/Makefile.am	2009-11-09 12:27:09.000000000 +0000
+++ mono-debugger-2.6/build/Makefile-new.am	2009-12-22 22:38:13.000000000 +0000
@@ -1,4 +1,4 @@
-twodir = $(prefix)/lib/mono/2.0
+twodir = $(libdir)/mono/2.0
 
 bin_SCRIPTS = mdb mdb-symbolreader
 
--- mono-debugger-2.6/build/Makefile.in	2009-12-04 20:34:04.000000000 +0000
+++ mono-debugger-2.6/build/Makefile-new.in	2009-12-22 22:39:42.000000000 +0000
@@ -226,7 +226,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-twodir = $(prefix)/lib/mono/2.0
+twodir = @libdir@/mono/2.0
 bin_SCRIPTS = mdb mdb-symbolreader
 two_SCRIPTS = mdb.exe mdb-symbolreader.exe
 MCS_FLAGS = -debug -define:DEBUG -define:DEBUGGER_SOURCE \

mdb-2.6-configure.patch:
 configure-new.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdb-2.6-configure.patch ---
--- mono-debugger-2.6/configure.in	2009-09-25 16:19:09.000000000 +0100
+++ mono-debugger-2.6/configure-new.in	2009-12-22 22:26:52.000000000 +0000
@@ -164,7 +164,7 @@
 AC_SUBST(WRAPPER_CFLAGS)
 AC_SUBST(WRAPPER_LIBS)
 
-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib'
+GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir) /root $(DESTDIR)$(libdir)'
 AC_PATH_PROG(GACUTIL, gacutil, no)
 if test "x$GACUTIL" = "xno" ; then
    AC_MSG_ERROR([No gacutil tool found])

mdb-2.6-doc.patch:
 Makefile-new.am |    6 +++---
 Makefile-new.in |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mdb-2.6-doc.patch ---
--- mono-debugger-2.6/doc/Makefile.am	2009-09-25 16:19:09.000000000 +0100
+++ mono-debugger-2.6/doc/Makefile-new.am	2009-12-22 22:43:19.000000000 +0000
@@ -1,15 +1,15 @@
 EXTRA_DIST = FAQ.txt \
 	     symbol-lookups.txt debugger.source
 
-sourcesdir = @mono_prefix@/lib/monodoc/sources
+sourcesdir = @libdir@/monodoc/sources
 
 sources_DATA = debugger.tree debugger.zip debugger.source
 
 debugger.tree debugger.zip: $(srcdir)/api/*/*.xml
-	mono --debug @monodoc_prefix@/lib/monodoc/assembler.exe --ecma $(srcdir)/api -o debugger
+	mono --debug @libdir@/monodoc/assembler.exe --ecma $(srcdir)/api -o debugger
 
 update:
-	monodocer -assembly:@prefix@/lib/mono/mono-debugger/Mono.Debugger.dll -path:./api -delete -includenonpublic
+	monodocer -assembly:@libdir@/mono/mono-debugger/Mono.Debugger.dll -path:./api -delete -includenonpublic
 
 dist-hook:
 	find . -name '*.xml' > files
--- mono-debugger-2.6/doc/Makefile.in	2009-12-04 20:34:04.000000000 +0000
+++ mono-debugger-2.6/doc/Makefile-new.in	2009-12-22 22:44:26.000000000 +0000
@@ -209,7 +209,7 @@
 EXTRA_DIST = FAQ.txt \
 	     symbol-lookups.txt debugger.source
 
-sourcesdir = @mono_prefix@/lib/monodoc/sources
+sourcesdir = @libdir@/monodoc/sources
 sources_DATA = debugger.tree debugger.zip debugger.source
 CLEANFILES = debugger.tree debugger.zip files
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Jul 2009 22:23:28 -0000	1.12
+++ .cvsignore	23 Dec 2009 00:30:46 -0000	1.13
@@ -1 +1 @@
-mono-debugger-2.4.2.1.tar.bz2
+mono-debugger-2.6.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- import.log	9 Jul 2009 22:23:28 -0000	1.13
+++ import.log	23 Dec 2009 00:30:47 -0000	1.14
@@ -11,3 +11,4 @@ mono-debugger-2_4-7_RC3_fc11:HEAD:mono-d
 mono-debugger-2_4-8_fc11:HEAD:mono-debugger-2.4-8.fc11.src.rpm:1238109449
 mono-debugger-2_4_2-1_fc12:HEAD:mono-debugger-2.4.2-1.fc12.src.rpm:1245788313
 mono-debugger-2_4_2_1-1_fc12:HEAD:mono-debugger-2.4.2.1-1.fc12.src.rpm:1247178166
+mono-debugger-2_6-2_fc13:HEAD:mono-debugger-2.6-2.fc13.src.rpm:1261528169


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mono-debugger.spec	25 Jul 2009 15:00:30 -0000	1.28
+++ mono-debugger.spec	23 Dec 2009 00:30:47 -0000	1.29
@@ -1,11 +1,14 @@
 Summary: A debugger for Mono
 Name: mono-debugger
-Version: 2.4.2.1
+Version: 2.6
 Release: 2%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
 Source0: %{name}-%{version}.tar.bz2
+Patch0:	 mdb-2.6-configure.patch
+Patch1:	 mdb-2.6-build.patch
+Patch2:	 mdb-2.6-doc.patch
 BuildRequires: readline-devel ncurses-devel libtool
 BuildRequires: mono-devel >= 2.4.2 mono-nunit
 BuildRequires: mono-nunit-devel autoconf automake xsp-devel 
@@ -33,16 +36,19 @@ Development package for mono-debugger
 %prep
 %setup -q
 rm -rf build/*.dll
+%patch0 -p1 -b .config
+%patch1 -p1 -b .build
+%patch2 -p1 -b .doc
+
+#find . -name \*.in -or -name \*.am -or -name \*.pc.in \
+#       | while read f ;
+#         do
+#           sed -i -e 's!$(prefix)/lib!%{_libdir}!g' "$f" 
+#           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!g' "$f" ;
+#         done
 
-find . -name \*.in -or -name \*.am -or -name \*.pc.in \
-       | while read f ;
-         do
-           sed -i -e 's!$(prefix)/lib!%{_libdir}!g' "$f" 
-           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" ;
-         done
-
-sed -i -e 's!/usr/lib!%{_libdir}!' mono-debugger-frontend.pc.in
-sed -i -e 's!${prefix}/lib/!%{_libdir}/!' mono-debugger-frontend.pc.in
+sed -i -e 's!/usr/lib!%{_libdir}!g' mono-debugger-frontend.pc.in
+sed -i -e 's!${prefix}/lib/!%{_libdir}/!g' mono-debugger-frontend.pc.in
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
@@ -51,7 +57,8 @@ autoreconf -f -i -s
 
 %build
 %configure --disable-static --disable-dependency-tracking
-make %{?_smp_mflags}
+#%configure
+make 
 
 %install
 rm -rf %{buildroot}
@@ -83,8 +90,11 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Dec 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
+- Bump to 2.6 release
+
+* Sat Oct 03 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
+- Bump to 2.6 preview 1
 
 * Thu Jul 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2.1-1
 - Bump to 2.4.2.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Jul 2009 22:23:28 -0000	1.12
+++ sources	23 Dec 2009 00:30:47 -0000	1.13
@@ -1 +1 @@
-70bb41c52e39364416d3823c508b1a35  mono-debugger-2.4.2.1.tar.bz2
+a6cac2d8dc8f788a7b2b35cd3f7204dc  mono-debugger-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:31:33 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:31:33 +0000 (UTC)
Subject: File mono-tools-2.6.1.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223003133.29BC910F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mono-tools:

b16305c2dbbc53211018ed07364abccf  mono-tools-2.6.1.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:41:43 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:41:43 +0000 (UTC)
Subject: rpms/mono-tools/devel .cvsignore, 1.19, 1.20 import.log, 1.32,
	1.33 mono-tools.spec, 1.45, 1.46 sources, 1.20,
	1.21 mono-tools-2.4.2-webkit.patch, 1.1, NONE
Message-ID: <20091223004143.CDF9B11C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27944/devel

Modified Files:
	.cvsignore import.log mono-tools.spec sources 
Removed Files:
	mono-tools-2.4.2-webkit.patch 
Log Message:

Bump to 2.6.1 release
Remove webkit patch 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	4 Oct 2009 19:40:41 -0000	1.19
+++ .cvsignore	23 Dec 2009 00:41:43 -0000	1.20
@@ -1 +1 @@
-mono-tools-2.6.tar.bz2
+mono-tools-2.6.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- import.log	4 Oct 2009 19:40:41 -0000	1.32
+++ import.log	23 Dec 2009 00:41:43 -0000	1.33
@@ -30,3 +30,4 @@ mono-tools-2_4-8_fc11:HEAD:mono-tools-2.
 mono-tools-2_4-8_1_fc11:HEAD:mono-tools-2.4-8.1.fc11.src.rpm:1239049338
 mono-tools-2_4_2-1_fc12:HEAD:mono-tools-2.4.2-1.fc12.src.rpm:1245010283
 mono-tools-2_6-1_fc12:HEAD:mono-tools-2.6-1.fc12.src.rpm:1254685180
+mono-tools-2_6_1-1_fc13:HEAD:mono-tools-2.6.1-1.fc13.src.rpm:1261528864


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- mono-tools.spec	26 Nov 2009 07:14:10 -0000	1.45
+++ mono-tools.spec	23 Dec 2009 00:41:43 -0000	1.46
@@ -2,14 +2,11 @@
 
 Summary: A collection of tools for mono applications
 Name: mono-tools
-Version: 2.6
-Release: 3%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{version}.tar.bz2
-# patch from upstream to fix crash in monodoc when using WebKit html renderer
-# http://anonsvn.mono-project.com/viewvc/trunk/mono-tools/docbrowser/WebKitHtmlRender.cs?r1=105868&r2=143994&view=patch
-Patch1: mono-tools-2.4.2-webkit.patch
 URL: http://mono.ximian.com/monobuild/preview/sources-preview/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-data, mono-devel >= 2.6, gtk-sharp2-gapi, pkgconfig mono-nunit
@@ -46,7 +43,6 @@ Documentation for monotools for use with
 
 %prep
 %setup -q 
-%patch1 -p2 -b .webkit
 
 find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
        -or -name \*.make -or -name \*.in \
@@ -146,6 +142,10 @@ desktop-file-install --vendor fedora \
 %{_mandir}/man5/gendarme*
 
 %changelog
+* Wed Dec 23 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.6.1-1
+- Bump to the 2.6.1 release
+- Removed webkit patch
+
 * Thu Nov 26 2009 Christian Krause <chkr at fedoraproject.org> - 2.6-3
 - Fix monodoc crash when using WebKit html renderer (BZ 538555)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Oct 2009 19:40:41 -0000	1.20
+++ sources	23 Dec 2009 00:41:43 -0000	1.21
@@ -1 +1 @@
-8d2b92cb254cc1fbcb65cd853f8bbc59  mono-tools-2.6.tar.bz2
+b16305c2dbbc53211018ed07364abccf  mono-tools-2.6.1.tar.bz2


--- mono-tools-2.4.2-webkit.patch DELETED ---



From pfj at fedoraproject.org  Wed Dec 23 00:43:53 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:43:53 +0000 (UTC)
Subject: File monodevelop-2.2.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223004353.CB69A10F8BF@bastion.fedoraproject.org>

A file has been added to the lookaside cache for monodevelop:

0d51c8d3a1e0a352f97ee5ac731b3238  monodevelop-2.2.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:44:28 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:44:28 +0000 (UTC)
Subject: rpms/monodevelop/devel md-2.2-unbundle-cecil.patch, NONE,
	1.1 .cvsignore, 1.26, 1.27 import.log, 1.26,
	1.27 monodevelop.spec, 1.46, 1.47 sources, 1.26,
	1.27 monodevelop-2.1.0-unbundle-cecil.patch, 1.1, NONE
Message-ID: <20091223004428.95A5D11C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28443/devel

Modified Files:
	.cvsignore import.log monodevelop.spec sources 
Added Files:
	md-2.2-unbundle-cecil.patch 
Removed Files:
	monodevelop-2.1.0-unbundle-cecil.patch 
Log Message:

Update to the full 2.2 release version 


md-2.2-unbundle-cecil.patch:
 Makefile-new.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE md-2.2-unbundle-cecil.patch ---
--- monodevelop-2.2/contrib/Makefile.in	2009-12-12 03:35:28.000000000 +0000
+++ monodevelop-2.2/contrib/Makefile-new.in	2009-12-22 23:07:33.000000000 +0000
@@ -174,7 +174,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = Mono.Cecil NRefactory
+SUBDIRS = NRefactory
 EXTRA_DIST = $(srcdir)/extract_makefile_variable.sh
 all: all-recursive
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	19 Oct 2009 19:32:43 -0000	1.26
+++ .cvsignore	23 Dec 2009 00:44:28 -0000	1.27
@@ -1 +1 @@
-monodevelop-2.1.1.tar.bz2
+monodevelop-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- import.log	19 Oct 2009 19:32:43 -0000	1.26
+++ import.log	23 Dec 2009 00:44:28 -0000	1.27
@@ -24,3 +24,4 @@ monodevelop-2_0-3_fc12:HEAD:monodevelop-
 monodevelop-2_1_0-1_fc12:HEAD:monodevelop-2.1.0-1.fc12.src.rpm:1252535001
 monodevelop-2_1_0-3_fc12:HEAD:monodevelop-2.1.0-3.fc12.src.rpm:1254334217
 monodevelop-2_1_1-1_fc12:HEAD:monodevelop-2.1.1-1.fc12.src.rpm:1255980720
+monodevelop-2_2-1_fc13:HEAD:monodevelop-2.2-1.fc13.src.rpm:1261529035


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- monodevelop.spec	19 Oct 2009 19:32:43 -0000	1.46
+++ monodevelop.spec	23 Dec 2009 00:44:28 -0000	1.47
@@ -5,7 +5,7 @@
 %global nunitver    2.4.8.0
 
 Name:           monodevelop
-Version:        2.1.1
+Version:        2.2
 Release:        1%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
@@ -13,7 +13,7 @@ Group:          Development/Tools
 License:        GPLv2+
 URL:            http://monodevelop.com/
 Source0:        http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-2.1.0-unbundle-cecil.patch
+Patch0:         md-2.2-unbundle-cecil.patch
 Patch1:         %{name}-2.1.0-unbundle-nunit.patch
 Patch2:         %{name}-2.1.0-rmcecildeps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,7 +62,6 @@ sed -i -e 's!/lib/monodevelop!/%{_lib}/m
 sed -i -e 's!$PREFIX/lib/!%{_libdir}/!' mdtool.in
 sed -i -e 's!monodevelop}/lib/!monodevelop}/%{_lib}/!' monodevelop.in
 
-
 find . -name Makefile.in -or -name \*.pc.in \
        -or -name \*.in -or -name \*.xml \
        | while read f ;
@@ -92,6 +91,8 @@ done
 
 # Craziness: NRefactory relies on the bundled Cecil creating build/bin for it
 mkdir -p build/bin
+cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/bin
+
 # Not parallel-buildable
 #make %{?_smp_mflags}
 make
@@ -141,6 +142,11 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Tue Dec 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- Bump to 2.2 release
+- Fix unbundle-cecil patch
+- Copy system mono-cecil to build/bin
+
 * Mon Oct 19 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.1.1-1
 - Bump to 2.2 beta 2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	19 Oct 2009 19:32:44 -0000	1.26
+++ sources	23 Dec 2009 00:44:28 -0000	1.27
@@ -1 +1 @@
-9f52804f967cc7bbc2d7e67d3149c365  monodevelop-2.1.1.tar.bz2
+0d51c8d3a1e0a352f97ee5ac731b3238  monodevelop-2.2.tar.bz2


--- monodevelop-2.1.0-unbundle-cecil.patch DELETED ---



From pfj at fedoraproject.org  Wed Dec 23 00:45:05 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:45:05 +0000 (UTC)
Subject: File mod_mono-2.6.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223004505.84F5510F8AB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mod_mono:

7484f8aebdd8b13bc005941277e3f485  mod_mono-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:45:37 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:45:37 +0000 (UTC)
Subject: rpms/mod_mono/devel import.log, 1.15, 1.16 mod_mono.spec, 1.28,
	1.29 sources, 1.14, 1.15
Message-ID: <20091223004537.4910911C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mod_mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28751/devel

Modified Files:
	import.log mod_mono.spec sources 
Log Message:

Bump to 2.6 release 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	4 Oct 2009 15:18:32 -0000	1.15
+++ import.log	23 Dec 2009 00:45:37 -0000	1.16
@@ -13,3 +13,4 @@ mod_mono-2_4-4_fc11:HEAD:mod_mono-2.4-4.
 mod_mono-2_4-4_1_fc11:HEAD:mod_mono-2.4-4.1.fc11.src.rpm:1239049771
 mod_mono-2_4_2-1_fc11:HEAD:mod_mono-2.4.2-1.fc11.src.rpm:1244978339
 mod_mono-2_6-1_fc12:HEAD:mod_mono-2.6-1.fc12.src.rpm:1254669482
+mod_mono-2_6-2_fc13:HEAD:mod_mono-2.6-2.fc13.src.rpm:1261529107


Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mod_mono.spec	26 Oct 2009 21:21:53 -0000	1.28
+++ mod_mono.spec	23 Dec 2009 00:45:37 -0000	1.29
@@ -1,17 +1,17 @@
 Name: mod_mono
-Version: 2.4.2
-Release: 3%{?dist}
+Version: 2.6
+Release: 2%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://mono.ximian.com/monobuild/preview/sources-preview/
 Source0: %{name}-%{version}.tar.bz2
-BuildRequires: mono-devel >= 2.4.2, xsp-devel >= 2.4.2, pkgconfig, httpd-devel apr-devel
-Patch0: mod_mono-2.0-varrun.patch
+BuildRequires: mono-devel >= 2.6, xsp-devel >= 2.6, pkgconfig, httpd-devel apr-devel
+Patch0: mod_mono-2.6-varrun.patch
 Requires: httpd >= 2.2, mono-core, xsp
 Summary: A module to deploy an ASP.NET application on Apache with Mono
 Group: System Environment/Daemons
 
-ExcludeArch: sparc64
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
 
 %description
 
@@ -53,10 +53,11 @@ rm -rf %{buildroot}
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
-* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-3
-- excludeArch sparc64
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Dec 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
+- Bump to 2.6 release
+
+* Sat Oct 03 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
+- Bump to 2.6 preview 1
 
 * Tue Jun 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-1
 - Bump to 2.4.2 preview


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Oct 2009 15:18:32 -0000	1.14
+++ sources	23 Dec 2009 00:45:37 -0000	1.15
@@ -1 +1 @@
-6bd69b4f39e256ff9a97244dc4bd9a23  mod_mono-2.6.tar.bz2
+7484f8aebdd8b13bc005941277e3f485  mod_mono-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:46:05 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:46:05 +0000 (UTC)
Subject: File xsp-2.6.tar.bz2 uploaded to lookaside cache by pfj
Message-ID: <20091223004605.66E3B10F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xsp:

48215067d6846971545d4294c65ee500  xsp-2.6.tar.bz2



From pfj at fedoraproject.org  Wed Dec 23 00:46:52 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 23 Dec 2009 00:46:52 +0000 (UTC)
Subject: rpms/xsp/devel import.log, 1.16, 1.17 sources, 1.24, 1.25 xsp.spec,
	1.42, 1.43
Message-ID: <20091223004652.4BC3511C00EF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29031/devel

Modified Files:
	import.log sources xsp.spec 
Log Message:

Bump to full 2.6 release 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	4 Oct 2009 15:24:37 -0000	1.16
+++ import.log	23 Dec 2009 00:46:52 -0000	1.17
@@ -14,3 +14,4 @@ xsp-2_4-7_fc11:HEAD:xsp-2.4-7.fc11.src.r
 xsp-2_4-7_1_fc11:HEAD:xsp-2.4-7.1.fc11.src.rpm:1239049215
 xsp-2_4_2-1_fc11:HEAD:xsp-2.4.2-1.fc11.src.rpm:1244979423
 xsp-2_6-1_fc12:HEAD:xsp-2.6-1.fc12.src.rpm:1254669749
+xsp-2_6-2_fc13:HEAD:xsp-2.6-2.fc13.src.rpm:1261529167


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	4 Oct 2009 15:24:38 -0000	1.24
+++ sources	23 Dec 2009 00:46:52 -0000	1.25
@@ -1 +1 @@
-e08e868deae851f36d301c9d26bc9e52  xsp-2.6.tar.bz2
+48215067d6846971545d4294c65ee500  xsp-2.6.tar.bz2


Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xsp.spec	26 Oct 2009 18:35:44 -0000	1.42
+++ xsp.spec	23 Dec 2009 00:46:52 -0000	1.43
@@ -1,16 +1,16 @@
 Name:     	xsp
-Version: 	2.4.2
-Release:	3%{?dist}
+Version: 	2.6
+Release:	2%{?dist}
 License:	MIT
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:		http://mono.ximian.com/monobuild/preview/sources-preview/
 Source0:	%{name}-%{version}.tar.bz2
-BuildRequires:	mono-web-devel, mono-data, mono-devel >= 2.4.2, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
+BuildRequires:	mono-web-devel, mono-data, mono-devel >= 2.6, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
 BuildRequires:	mono-jscript, mono-data-oracle
-Requires:	mono-core >= 2.4.2
+Requires:	mono-core >= 2.6
 Summary:	A small web server that hosts ASP.NET
 Group:		System Environment/Daemons
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc sparcv9 alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 
 %define debug_package %{nil}
 
@@ -96,11 +96,11 @@ rm -rf %{buildroot}
 %{_libdir}/xsp/test
 
 %changelog
-* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-3
-- enable sparcv9 s390 s390x
+* Tue Dec 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
+- Bump to release version
 
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sat Oct 03 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
+- Bump to 2.6 preview 1
 
 * Tue Jun 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-1
 - Update to 2.4.2 preview



From bskeggs at fedoraproject.org  Wed Dec 23 01:02:16 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed, 23 Dec 2009 01:02:16 +0000 (UTC)
Subject: File xf86-video-nouveau-0.0.15-20091217gitbb19478.tar.bz2 uploaded to
	lookaside cache by bskeggs
Message-ID: <20091223010216.ABA6710F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xorg-x11-drv-nouveau:

0b0d9da8e0f3c1e34b39b2d89c99eb1c  xf86-video-nouveau-0.0.15-20091217gitbb19478.tar.bz2



From bskeggs at fedoraproject.org  Wed Dec 23 01:03:09 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed, 23 Dec 2009 01:03:09 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.48,
	1.49 nouveau-bicubic-2x.patch, 1.16,
	1.17 nouveau-multiple-xserver.patch, 1.18,
	1.19 nouveau-tile7000.patch, 1.6, 1.7 sources, 1.49,
	1.50 xorg-x11-drv-nouveau.spec, 1.61, 1.62
Message-ID: <20091223010309.48F1711C00EF@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31640

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-tile7000.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Wed Dec 23 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-14.20091217gitbb19478
- update to latest upstream code




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	29 Sep 2009 01:38:15 -0000	1.48
+++ .cvsignore	23 Dec 2009 01:03:08 -0000	1.49
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2
+xf86-video-nouveau-0.0.15-20091217gitbb19478.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    7 +++++--
 nv40_xv_tex.c |    9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nouveau-bicubic-2x.patch	29 Sep 2009 01:38:15 -0000	1.16
+++ nouveau-bicubic-2x.patch	23 Dec 2009 01:03:08 -0000	1.17
@@ -1,39 +1,64 @@
-From 0c60f12c250e244d5d6a245c0df3b941a176aa59 Mon Sep 17 00:00:00 2001
+From bfb7ff157378c4c70817c44471a62b9b54d1a8cc Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
 Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x
 
 ---
- src/nv30_xv_tex.c |    2 +-
- src/nv40_xv_tex.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/nv30_xv_tex.c |    7 +++++--
+ src/nv40_xv_tex.c |    8 ++++++--
+ 2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c
-index cd76279..25cae64 100644
+index 2d90e8b..bb0667c 100644
 --- a/src/nv30_xv_tex.c
 +++ b/src/nv30_xv_tex.c
-@@ -324,7 +324,7 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
+@@ -259,7 +259,7 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
+ 	struct nouveau_grobj *rankine = pNv->Nv3D;
+ 	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
+ 	unsigned delta = nouveau_pixmap_offset(ppix);
+-	Bool redirected = FALSE;
++	Bool redirected = FALSE, bicubic = pPriv->bicubic;
+ 	float X1, X2, Y1, Y2;
+ 	BoxPtr pbox;
+ 	int nbox;
+@@ -343,7 +343,10 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
  	BEGIN_RING(chan, rankine, NV34TCL_TX_ENABLE(3), 1);
  	OUT_RING  (chan, 0x0);
  
--	if (pPriv->bicubic)
-+	if (pPriv->bicubic && (drw_w / 2 >= src_w) && (drw_h / 2 >= src_h))
- 		NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bicubic);
- 	else
- 		NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
+-	if (!NV30_LoadFragProg(pScrn, pPriv->bicubic ?
++	if (drw_w / 2 < src_w || drw_h / 2 < src_h)
++		bicubic = FALSE;
++
++	if (!NV30_LoadFragProg(pScrn, bicubic ?
+ 			       &nv30_fp_yv12_bicubic :
+ 			       &nv30_fp_yv12_bilinear)) {
+ 		MARK_UNDO(chan);
 diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c
-index 3d1f146..e0efb41 100644
+index 463b178..20a5dc9 100644
 --- a/src/nv40_xv_tex.c
 +++ b/src/nv40_xv_tex.c
-@@ -299,7 +299,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
- 	NV40VideoTexture(pScrn, src, src_offset2, src_w/2, src_h/2, src_pitch, 2);
+@@ -263,7 +263,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
+ 	struct nouveau_grobj *curie = pNv->Nv3D;
+ 	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
+ 	unsigned delta = nouveau_pixmap_offset(ppix);
+-	Bool redirected = FALSE;
++	Bool redirected = FALSE, bicubic = pPriv->bicubic;
+ 	float X1, X2, Y1, Y2;
+ 	BoxPtr pbox;
+ 	int nbox;
+@@ -323,7 +323,11 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
+ 	}
  
  	NV40_LoadVtxProg(pScrn, &nv40_vp_video);
--	if (pPriv->bicubic)
-+	if (pPriv->bicubic && (drw_w / 2 >= src_w) && (drw_h / 2 >= src_h))
- 		NV40_LoadFragProg(pScrn, &nv40_fp_yv12_bicubic);
- 	else
- 		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
+-	if (!NV40_LoadFragProg(pScrn, pPriv->bicubic ?
++
++	if (drw_w / 2 < src_w || drw_h / 2 < src_h)
++		bicubic = FALSE;
++
++	if (!NV40_LoadFragProg(pScrn, bicubic ?
+ 			       &nv40_fp_yv12_bicubic :
+ 			       &nv30_fp_yv12_bilinear)) {
+ 		MARK_UNDO(chan);
 -- 
-1.6.4.4
+1.6.5.2
 

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nouveau-multiple-xserver.patch	29 Sep 2009 01:38:15 -0000	1.18
+++ nouveau-multiple-xserver.patch	23 Dec 2009 01:03:08 -0000	1.19
@@ -1,4 +1,4 @@
-From e81556ab7611efd9977f16a00ee09a194eb5bce1 Mon Sep 17 00:00:00 2001
+From f5f5acf8880da333615f893735e1c00184a9b25c Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] f12: hack to suppor
  1 files changed, 57 insertions(+), 27 deletions(-)
 
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 879d971..e57a696 100644
+index a0656af..f5d4282 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -48,7 +48,7 @@ index 879d971..e57a696 100644
  	ret = drmDropMaster(nouveau_device(pNv->dev)->fd);
  	if (ret)
  		ErrorF("Error dropping master: %d\n", ret);
-@@ -1187,6 +1193,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1184,6 +1190,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  
  
  static Bool
@@ -101,7 +101,7 @@ index 879d971..e57a696 100644
  NVMapMem(ScrnInfoPtr pScrn)
  {
  	NVPtr pNv = NVPTR(pScrn);
-@@ -1226,6 +1278,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1223,6 +1275,9 @@ NVMapMem(ScrnInfoPtr pScrn)
  		goto skip_offscreen_gart;
  
  	if (!pNv->exa_driver_pixmaps) {
@@ -111,7 +111,7 @@ index 879d971..e57a696 100644
  		size = (pNv->VRAMPhysicalSize / 2) - size;
  
  		if (pNv->Architecture >= NV_ARCH_50) {
-@@ -1242,6 +1297,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1239,6 +1294,7 @@ NVMapMem(ScrnInfoPtr pScrn)
  			return FALSE;
  		}
  
@@ -119,7 +119,7 @@ index 879d971..e57a696 100644
  		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
  			   "Allocated %dMiB VRAM for offscreen pixmaps\n",
  			   (uint32_t)(pNv->offscreen->size >> 20));
-@@ -1251,32 +1307,6 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1248,32 +1304,6 @@ NVMapMem(ScrnInfoPtr pScrn)
  		nouveau_bo_unmap(pNv->offscreen);
  	}
  
@@ -153,5 +153,5 @@ index 879d971..e57a696 100644
  	/* We don't need to allocate cursors / lut here if we're using
  	 * kernel modesetting
 -- 
-1.6.4.4
+1.6.5.2
 

nouveau-tile7000.patch:
 drmmode_display.c |    4 ++--
 nv_driver.c       |    7 ++++++-
 nv_type.h         |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

Index: nouveau-tile7000.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-tile7000.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nouveau-tile7000.patch	29 Sep 2009 01:38:15 -0000	1.6
+++ nouveau-tile7000.patch	23 Dec 2009 01:03:08 -0000	1.7
@@ -1,4 +1,4 @@
-From 682b24f8d6fb5053ed8b89cacaaca4dd25c03a16 Mon Sep 17 00:00:00 2001
+From d1156e2b36eb129bb86d6da5dd4d15e23afb5d2b Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Wed, 9 Sep 2009 16:26:25 +1000
 Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
@@ -10,10 +10,10 @@ Subject: [PATCH 3/3] f12: use 0x7000 fla
  3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 82b86c4..1157221 100644
+index 759cdb8..6d51f0e 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -443,7 +443,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+@@ -465,7 +465,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50) {
  		tile_mode = 4;
@@ -22,7 +22,7 @@ index 82b86c4..1157221 100644
  		ah = NOUVEAU_ALIGN(height, 1 << (tile_mode + 2));
  		pitch = NOUVEAU_ALIGN(width * drmmode->cpp, 64);
  	} else {
-@@ -1064,7 +1064,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
+@@ -1077,7 +1077,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
  		tile_mode = 4;
@@ -32,10 +32,10 @@ index 82b86c4..1157221 100644
  		pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
  	} else {
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index e57a696..e0c1c10 100644
+index f5d4282..5eb6973 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
-@@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
+@@ -693,6 +693,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
  {
  	NVPtr pNv = NVPTR(pScrn);
  	drmVersion *version;
@@ -43,7 +43,7 @@ index e57a696..e0c1c10 100644
  	char *bus_id;
  	int ret;
  
-@@ -742,6 +743,10 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
+@@ -739,6 +740,10 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
  		return FALSE;
  	}
  
@@ -54,7 +54,7 @@ index e57a696..e0c1c10 100644
  	/* Check if KMS is enabled before we do anything, we don't want to
  	 * go stomping on registers behind its back
  	 */
-@@ -1256,7 +1261,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1253,7 +1258,7 @@ NVMapMem(ScrnInfoPtr pScrn)
  	size = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->tiled_scanout) {
  		tile_mode = 4;
@@ -64,7 +64,7 @@ index e57a696..e0c1c10 100644
  	} else {
  		size *= pScrn->virtualY;
 diff --git a/src/nv_type.h b/src/nv_type.h
-index ddf121c..6e1f2f3 100644
+index 6face1f..ab533e0 100644
 --- a/src/nv_type.h
 +++ b/src/nv_type.h
 @@ -113,6 +113,8 @@ typedef struct _NVRec {
@@ -77,5 +77,5 @@ index ddf121c..6e1f2f3 100644
      struct nouveau_bo * scanout;
      struct nouveau_bo * offscreen;
 -- 
-1.6.4.4
+1.6.5.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	29 Sep 2009 01:38:15 -0000	1.49
+++ sources	23 Dec 2009 01:03:09 -0000	1.50
@@ -1 +1 @@
-e98437442d84c9ca595adc6ae9665eff  xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2
+0b0d9da8e0f3c1e34b39b2d89c99eb1c  xf86-video-nouveau-0.0.15-20091217gitbb19478.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- xorg-x11-drv-nouveau.spec	29 Sep 2009 01:38:15 -0000	1.61
+++ xorg-x11-drv-nouveau.spec	23 Dec 2009 01:03:09 -0000	1.62
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20090929
-%define git_version dd8339f
+%define gitdate 20091217
+%define git_version bb19478
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@ Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   13.%{snapshot}%{?dist}
+Release:   14.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Dec 23 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-14.20091217gitbb19478
+- update to latest upstream code
+
 * Tue Sep 29 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-13.20090929gitdd8339f
 - fix driver to work again with recent EXA changes
 



From rdieter at fedoraproject.org  Wed Dec 23 01:06:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:06:41 +0000 (UTC)
Subject: rpms/kipi-plugins/F-12 .cvsignore, 1.34, 1.35 kipi-plugins.spec, 1.104,
	1.105 sources, 1.34, 1.35
Message-ID: <20091223010641.2351E11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32160

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-1
- kipi-plugins-1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	21 Dec 2009 15:07:11 -0000	1.34
+++ .cvsignore	23 Dec 2009 01:06:40 -0000	1.35
@@ -1 +1 @@
-kipi-plugins-0.9.0.tar.bz2
+kipi-plugins-1.0.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/kipi-plugins.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- kipi-plugins.spec	21 Dec 2009 15:07:11 -0000	1.104
+++ kipi-plugins.spec	23 Dec 2009 01:06:40 -0000	1.105
@@ -2,7 +2,7 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.9.0
+Version: 1.0.0
 Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
@@ -186,6 +186,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-1
+- kipi-plugins-1.0.0
+
 * Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-1
 - kipi-plugins-0.9.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	21 Dec 2009 15:07:11 -0000	1.34
+++ sources	23 Dec 2009 01:06:40 -0000	1.35
@@ -1 +1 @@
-18871b4515720d5ee2581ae52e07858a  kipi-plugins-0.9.0.tar.bz2
+4ed822101f0023773361fbe035822934  kipi-plugins-1.0.0.tar.bz2



From rdieter at fedoraproject.org  Wed Dec 23 01:07:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:07:50 +0000 (UTC)
Subject: rpms/kipi-plugins/F-11 .cvsignore, 1.30, 1.31 kipi-plugins.spec, 1.97,
	1.98 sources, 1.31, 1.32
Message-ID: <20091223010750.219F311C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32377

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-1
- kipi-plugins-1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	12 Sep 2009 17:56:45 -0000	1.30
+++ .cvsignore	23 Dec 2009 01:07:49 -0000	1.31
@@ -1 +1 @@
-kipi-plugins-0.6.0.tar.bz2
+kipi-plugins-1.0.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/kipi-plugins.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kipi-plugins.spec	12 Nov 2009 15:47:50 -0000	1.97
+++ kipi-plugins.spec	23 Dec 2009 01:07:50 -0000	1.98
@@ -2,7 +2,7 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.8.0
+Version: 1.0.0
 Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
@@ -18,10 +18,9 @@ BuildRequires: expat-devel
 BuildRequires: gettext
 # Until when/if libksane grows a dep on sane-backends-devel
 BuildRequires: kdegraphics4-devel sane-backends-devel 
-BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: kdelibs4-devel
 # Add min kdelibs Req, FIXME/TODO, come up with cleaner solution -- Rex
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
-Requires: kdelibs4 >= %{kdelibs4_version}
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 BuildRequires: kdepimlibs-devel
 BuildRequires: libgpod-devel >= 0.7.0 
 BuildRequires: libkipi-devel >= 0.3.0
@@ -75,6 +74,7 @@ PrintWizard        : print images in var
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}
 %description libs
 %{summary}.
 
@@ -166,18 +166,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/kipiplugin_shwup.so
 %{_kde4_libdir}/kde4/kipiplugin_smug.so
 %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
-%{_kde4_appsdir}/kipiplugin_facebook/
 %{_kde4_appsdir}/kipiplugin_flashexport/
-%{_kde4_appsdir}/kipiplugin_flickrexport/
 %{_kde4_appsdir}/kipiplugin_galleryexport/
 %{_kde4_appsdir}/kipiplugin_htmlexport/
 %{_kde4_appsdir}/kipiplugin_imageviewer/
 %{_kde4_appsdir}/kipiplugin_metadataedit/
-%{_kde4_appsdir}/kipiplugin_picasawebexport/
 %{_kde4_appsdir}/kipiplugin_printimages/
 %{_kde4_appsdir}/kipiplugin_removeredeyes/
-%{_kde4_appsdir}/kipiplugin_shwup/
-%{_kde4_appsdir}/kipiplugin_smug/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/applications/kde4/kipiplugins.desktop
 %{_kde4_datadir}/applications/kde4/scangui.desktop
@@ -191,6 +186,21 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-1
+- kipi-plugins-1.0.0
+
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-1
+- kipi-plugins-0.9.0
+
+* Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-4
+- rebuild (opencv)
+
+* Wed Nov 25 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-3 
+- rebuild (kdegraphics)
+
+* Thu Nov 12 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-2
+- -libs: move kdelibs4 dep here, make arch'd
+
 * Mon Nov 02 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-1
 - kipi-plugins-0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	12 Nov 2009 15:47:50 -0000	1.31
+++ sources	23 Dec 2009 01:07:50 -0000	1.32
@@ -0,0 +1 @@
+4ed822101f0023773361fbe035822934  kipi-plugins-1.0.0.tar.bz2



From rdieter at fedoraproject.org  Wed Dec 23 01:12:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:12:54 +0000 (UTC)
Subject: rpms/kphotoalbum/F-11 kphotoalbum.spec,1.39,1.40
Message-ID: <20091223011254.2695611C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv658

Modified Files:
	kphotoalbum.spec 
Log Message:
* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-1
- kphotoalbum-4.1.1



Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-11/kphotoalbum.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- kphotoalbum.spec	7 Aug 2009 14:11:09 -0000	1.39
+++ kphotoalbum.spec	23 Dec 2009 01:12:53 -0000	1.40
@@ -1,7 +1,7 @@
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 4.0.2
+Version: 4.1.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -52,25 +52,7 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML (1.0)
-HTML_DIR=$(kde4-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+%find_lang %{name} --with-kde
 
 
 %check
@@ -101,14 +83,21 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
-%{_kde4_bindir}/*
+%{_kde4_bindir}/kphotoalbum
 %{_kde4_appsdir}/kphotoalbum/
-%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_datadir}/applications/kde4/kphotoalbum.desktop
+%{_kde4_datadir}/applications/kde4/kphotoalbum-import.desktop
 %{_kde4_datadir}/config/*rc
 %{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-1
+- kphotoalbum-4.1.1
+
+* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1-1
+- kphotoalbum-4.1
+
 * Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-1
 - kphotoalbum-4.0.2
 



From rdieter at fedoraproject.org  Wed Dec 23 01:13:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:13:48 +0000 (UTC)
Subject: rpms/digikam/F-11 digikam-import.desktop, NONE, 1.1 .cvsignore, 1.32, 
	1.33 digikam.spec, 1.90, 1.91 sources, 1.32, 1.33
Message-ID: <20091223011348.A717511C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv845

Modified Files:
	.cvsignore digikam.spec sources 
Added Files:
	digikam-import.desktop 
Log Message:
sync w/devel for 1.0.0 goodness



--- NEW FILE digikam-import.desktop ---
[Desktop Entry]
Categories=Qt;KDE;Graphics;Photography;
Encoding=UTF-8
Exec=digikam --download-from %f
GenericName=Photo Management Program
Icon=digikam
MimeType=x-content/image-dcf;x-content/image-picturecd;
Name=digiKam
NoDisplay=true
Terminal=false
Type=Application


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	17 Mar 2009 15:20:10 -0000	1.32
+++ .cvsignore	23 Dec 2009 01:13:48 -0000	1.33
@@ -1 +1 @@
-digikam-0.10.0.tar.bz2
+digikam-1.0.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/digikam.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- digikam.spec	29 Sep 2009 20:37:37 -0000	1.90
+++ digikam.spec	23 Dec 2009 01:13:48 -0000	1.91
@@ -1,7 +1,7 @@
 
 Name:	 digikam
-Version: 0.10.0
-Release: 3%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -10,13 +10,18 @@ URL:	 http://www.digikam.org/
 Source0: http://downloads.sourceforge.net/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# digiKam not listed as a media handler for pictures in Nautilus (#516447)
+Source1: digikam-import.desktop
+
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
+BuildRequires: glib2-devel
 BuildRequires: gphoto2-devel
 BuildRequires: libkdcraw-devel >= 0.4.0-2
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
+BuildRequires: liblqr-1-devel
 BuildRequires: jasper-devel
 
 # marble integration, http://bugzilla.redhat.com/470578 
@@ -24,7 +29,6 @@ BuildRequires: jasper-devel
 BuildRequires: kdeedu-devel >= %{marble_version} 
 
 BuildRequires: kdelibs4-devel
-# min kdelibs Req
 %global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
 
 # trash protocol support needed
@@ -36,6 +40,7 @@ BuildRequires: lcms-devel
 BuildRequires: lensfun-devel
 BuildRequires: libtiff-devel
 BuildRequires: libpng-devel >= 1.2.7
+BuildRequires: soprano-devel
 BuildRequires: sqlite-devel
 
 Obsoletes: digikamimageplugins < 0.9.1-2
@@ -59,7 +64,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: kdeedu-marble >= %{marble_version} 
+Requires: kdeedu-marble-libs%{?_isa} >= %{marble_version}
 %description libs
 %{summary}.
 
@@ -91,14 +96,12 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang digikam 
+desktop-file-install \
+  --vendor="" \
+  --dir=%{buildroot}%{_datadir}/applications/kde4 \
+  %{SOURCE1}
 
-# hack in hicolor icons
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-pushd %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_kde4_appsdir}/digikam/icons/oxygen/48x48/apps/digikam.png  .
-ln -s %{_kde4_appsdir}/digikam/icons/oxygen/48x48/apps/showfoto.png .
-popd
+%find_lang digikam --with-kde
 
 
 %check
@@ -120,6 +123,7 @@ fi
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -141,13 +145,14 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/*.protocol
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_mandir}/man1/digitaglinktree.1*
-%{_datadir}/icons/hicolor/*/*/*
+%{_mandir}/man1/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libdigikamcore.so.1*
 %{_kde4_libdir}/libdigikamdatabase.so.1*
+%{_kde4_libdir}/kde4/plugins/marble/ExternalDraw.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -157,14 +162,45 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-3
-- fix marble deps
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- digikam-1.0.0
+
+* Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.11.rc
+- digikam-1.0.0-rc
+
+* Wed Nov 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.10.beta6
+- rebuild (kdegraphics)
+
+* Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.9.beta6
+- digiKam not listed as a media handler for pictures in Nautilus (#516447)
+
+* Mon Nov 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.8.beta6
+- digikam-1.0.0-beta6
 
-* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
-- rebuild against kde-4.3
-- optimize scriptlets
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.7.beta5
+- digikam-1.0.0-beta5
+- tweak marble deps (again)
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.6.beta4
+- fix marble dep(s)
+
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.5.beta4
+- digikam-1.0.0-beta4
+- BR: liblqr-1-devel
+
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.4.beta3
+- drop xdg-utils references 
 - tighten -libs related deps via %%{?_isa}
 
+* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.3.beta3
+- digikam-1.0.0-beta3
+
+* Mon Jul 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.2.beta2
+- digikam-1.0.0-beta2
+
+* Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.1.beta1
+- digikam-1.0.0-beta1
+
 * Tue Mar 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-1
 - digikam-0.10.0 (final)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	17 Mar 2009 15:20:11 -0000	1.32
+++ sources	23 Dec 2009 01:13:48 -0000	1.33
@@ -1 +1 @@
-6c6daf958ff4fe93974f1074ba967cd9  digikam-0.10.0.tar.bz2
+6169deb68a3d712a0c6539b09c5f8c0c  digikam-1.0.0.tar.bz2



From rdieter at fedoraproject.org  Wed Dec 23 01:22:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:22:43 +0000 (UTC)
Subject: rpms/maxima/EL-4 .cvsignore, 1.9, 1.10 maxima.spec, 1.24, 1.25 sources,
	1.8, 1.9
Message-ID: <20091223012243.7B67411C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1848

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Wed Nov 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-4
- respin (sbcl)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	5 Nov 2008 18:02:11 -0000	1.9
+++ .cvsignore	23 Dec 2009 01:22:43 -0000	1.10
@@ -2,4 +2,4 @@ clog
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.16.3.tar.gz
+maxima-5.20.1.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-4/maxima.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- maxima.spec	5 Nov 2008 18:02:11 -0000	1.24
+++ maxima.spec	23 Dec 2009 01:22:43 -0000	1.25
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.16.3
+Version: 5.20.1
 
-Release: 4%{?dist} 
+Release: 1%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -11,11 +11,10 @@ Source:	 http://downloads.sourceforge.ne
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} > 8
-
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
-ExclusiveArch: i386 x86_64 sparcv9
+ExclusiveArch: %{ix86} x86_64 sparcv9
 %else
-ExclusiveArch: i386 x86_64 ppc sparcv9
+ExclusiveArch: %{ix86} x86_64 ppc sparcv9
 %endif
 
 %define maxima_ver %{version}%{?beta}
@@ -26,7 +25,7 @@ ExclusiveArch: i386 x86_64 ppc sparcv9
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %if 0%{?fedora}
-# gcl/f8 bustage on i386: https://bugzilla.redhat.com/show_bug.cgi?id=451801
+# temporarily disable -gcl (#496124)
 #define _enable_gcl --enable-gcl
 %endif
 %endif
@@ -35,7 +34,7 @@ ExclusiveArch: i386 x86_64 ppc sparcv9
 %define default_lisp sbcl
 %if 0%{?fedora} > 2
 %define _enable_clisp --enable-clisp 
-# gcl busted on x86_64 atm: http://bugzilla.redhat.com/427250
+# temporarily disable -gcl (#496124)
 #define _enable_gcl --enable-gcl
 %define _enable_sbcl --enable-sbcl
 %else
@@ -48,11 +47,12 @@ ExclusiveArch: i386 x86_64 ppc sparcv9
 %define default_lisp sbcl
 # clisp: http://bugzilla.redhat.com/166347 (resolved) - clisp/ppc (still) awol.
 #define _enable_clisp --enable-clisp 
-# gcl:   http://bugzilla.redhat.com/167952
-#define _enable_gcl --enable-gcl 
+# temporarily disable -gcl (#496124)
+#define _enable_gcl --enable-gcl
 # sbcl:  http://bugzilla.redhat.com/220053 (resolved)
 # sbcl: ppc/ld joy, "final link failed: Nonrepresentable section on output" http://bugzilla.redhat.com/448734
 %define _enable_sbcl --enable-sbcl 
+%define check_nonfatal ||:
 %endif
 
 %ifarch sparcv9
@@ -70,7 +70,6 @@ Obsoletes: %{name}-runtime-gcl < %{versi
 Obsoletes: %{name}-runtime-sbcl < %{version}-%{release}
 %endif
 
-
 Source1: maxima.png
 Source2: xmaxima.desktop
 Source6: maxima-modes.el
@@ -79,11 +78,8 @@ Source6: maxima-modes.el
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-# maxima-runtime-gcl: Unrecoverable error: fault count too high (#187647)
-Patch6: maxima-5.9.4-gcl_setarch.patch
-
-# Inhibit automatic compressing of info files. Compressed info
-# files break maxima's internal help.
+# Inhibit automatic compressing of info files. 
+# Compressed info files break maxima's internal help.
 %define __spec_install_post %{nil} 
 # debuginfo.list ends up empty/blank anyway. disable
 %define debug_package   %{nil}
@@ -96,6 +92,7 @@ Obsoletes: %{name}-lang-pt-utf8 < %{vers
 Obsoletes: %{name}-lang-pt_BR < %{version}-%{release}
 Obsoletes: %{name}-lang-pt_BR-utf8 < %{version}-%{release}
 
+BuildRequires: desktop-file-utils
 BuildRequires: time
 # texi2dvi
 %if 0%{?fedora} > 5 || 0%{?rhel} > 4
@@ -104,7 +101,6 @@ BuildRequires: texinfo-tex
 BuildRequires: texinfo
 %endif
 BuildRequires: tetex-latex
-BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
 
@@ -158,7 +154,7 @@ Maxima compiled with Common Lisp (clisp)
 %endif
 
 %if "x%{?_enable_cmucl:1}" == "x1"
-%define _with_cmucl_runtime=--with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp
+%define _with_cmucl_runtime --with-cmucl-runtime=%{_prefix}/lib/cmucl/bin/lisp
 %package runtime-cmucl
 Summary: Maxima compiled with CMUCL
 Group:	 Applications/Engineering 
@@ -176,12 +172,6 @@ Summary: Maxima compiled with GCL
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-# See http://bugzilla.redhat.com/187647
-%define setarch_hack 1
-BuildRequires: setarch
-Requires:  setarch
-%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
 Provides:  %{name}-runtime-gcl = %{version}-%{release}
@@ -196,7 +186,7 @@ Group:   Applications/Engineering
 BuildRequires: sbcl
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
-%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
+%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2 | cut -d- -f1)
 %if "x%{?sbcl_ver}" != "x%{nil}" 
 Requires: sbcl = %{sbcl_ver}
 %endif
@@ -214,10 +204,6 @@ Maxima compiled with Steel Bank Common L
 # Extra docs
 install -p -m644 %{SOURCE10} .
 
-%if 0%{?setarch_hack} == 1
-%patch6 -p1 -b .gcl-setarch
-%endif
-
 sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
@@ -244,23 +230,19 @@ find -name CVS -type d | xargs rm -r
 make %{?_smp_mflags}
 
 # docs
-pushd doc
-
- install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf
+install -D -p -m644 %{SOURCE11} doc/maximabook/maxima.pdf
 
-# pushd info
+# pushd doc/info
 #  texi2dvi --pdf maxima.texi
 # popd
 
- pushd intromax
-  pdflatex intromax.ltx
- popd
-
+pushd doc/intromax
+ pdflatex intromax.ltx
 popd
 
 
 %check 
-make check
+make -k check %{?check_nonfatal}
 
 
 %install
@@ -316,12 +298,16 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post gui
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun gui
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans gui
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then
@@ -372,17 +358,22 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/misc/ doc/implementation/
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
-%doc macref.pdf
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
 %dir %{_datadir}/maxima/%{maxima_ver}
 %{_datadir}/maxima/%{maxima_ver}/[a-c,f-r,t-w,y-z,A-Z]*
 %{_datadir}/maxima/%{maxima_ver}/demo/
-%doc %{_datadir}/maxima/%{maxima_ver}/doc/
-%doc %lang(es) %{_datadir}/maxima/%{maxima_ver}/doc/html/es*
+%dir %{_datadir}/maxima/%{maxima_ver}/doc/
+%dir %{_datadir}/maxima/%{maxima_ver}/doc/html/
+%{_datadir}/maxima/%{maxima_ver}/doc/html/figures/
+%doc %lang(en) %{_datadir}/maxima/%{maxima_ver}/doc/html/*.h*
+%doc %lang(en) %{_datadir}/maxima/%{maxima_ver}/doc/share/
+%doc %lang(es) %{_datadir}/maxima/%{maxima_ver}/doc/html/es/
+%doc %lang(es) %{_datadir}/maxima/%{maxima_ver}/doc/html/es.utf8/
 %doc %lang(pt) %{_datadir}/maxima/%{maxima_ver}/doc/html/pt/
 %doc %lang(pt) %{_datadir}/maxima/%{maxima_ver}/doc/html/pt.utf8/
-%doc %lang(pt_BR) %{_datadir}/maxima/%{maxima_ver}/doc/html/pt_BR*
+%doc %lang(pt_BR) %{_datadir}/maxima/%{maxima_ver}/doc/html/pt_BR/
+%doc %lang(pt_BR) %{_datadir}/maxima/%{maxima_ver}/doc/html/pt_BR.utf8/
 %{_datadir}/maxima/%{maxima_ver}/share/
 %dir %{_libdir}/maxima/
 %dir %{_libdir}/maxima/%{maxima_ver}/
@@ -441,6 +432,73 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
+- maxima-5.20.1 (#547012)
+
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.0-1
+- maxima-5.20.0
+
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-3
+- rebuild (sbcl)
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-2
+- rebuild (cmucl)
+
+* Sun Aug 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-1
+- maxima-5.19.2
+
+* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.1-1
+- maxima-5.19.1
+- -gui: optimize scriptlets
+
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.0-2
+- safer evaluation of %%sbcl_ver macro
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.0-1
+- maxima-5.19.0
+
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.1-6
+- rebuild (sbcl)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.18.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.1-3
+- disable -runtime-gcl until issues (selinux, bug #496124) are fixed
+
+* Sat May 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.1-2
+- rebuild (sbcl)
+
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.1-1
+- maxima-5.18.1
+
+* Fri Apr 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.0-1
+- maxima-5.18.0
+
+* Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-7
+- respin (sbcl)
+
+* Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-6 
+- ExclusiveArch: s/i386/%%ix86/
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.17.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-4
+- respin (sbcl)
+
+* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-3
+- reenable gcl on i386 (#451801), x86_64 (#427250), ppc (#167952)
+
+* Wed Dec 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-2
+- respin (sbcl)
+
+* Wed Dec 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-1
+- maxima-5.17.1
+
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.17.0-1
+- maxima-5.17.0
+
 * Wed Nov 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.16.3-4
 - respin (sbcl)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Nov 2008 18:02:11 -0000	1.8
+++ sources	23 Dec 2009 01:22:43 -0000	1.9
@@ -1,4 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-690ee57f3884f565c898ed39a592e4e1  maxima-5.16.3.tar.gz
+cec78b96cc453e470871063fc16cd52f  maxima-5.20.1.tar.gz



From rdieter at fedoraproject.org  Wed Dec 23 01:28:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:28:25 +0000 (UTC)
Subject: File wxMaxima-0.8.4.tar.gz uploaded to lookaside cache by rdieter
Message-ID: <20091223012825.6B82710F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for wxMaxima:

b972743501298932bc0b0796c5489332  wxMaxima-0.8.4.tar.gz



From rdieter at fedoraproject.org  Wed Dec 23 01:28:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:28:42 +0000 (UTC)
Subject: rpms/wxMaxima/devel .cvsignore, 1.13, 1.14 sources, 1.12,
	1.13 wxMaxima.spec, 1.34, 1.35 wxMaxima-0.8.3a-ltr_layout.patch,
	1.1, NONE
Message-ID: <20091223012842.A755C11C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2712

Modified Files:
	.cvsignore sources wxMaxima.spec 
Removed Files:
	wxMaxima-0.8.3a-ltr_layout.patch 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-1
- wxMaxima-0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Oct 2009 02:55:36 -0000	1.13
+++ .cvsignore	23 Dec 2009 01:28:42 -0000	1.14
@@ -1 +1 @@
-wxMaxima-0.8.3a.tar.gz
+wxMaxima-0.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	26 Oct 2009 02:55:36 -0000	1.12
+++ sources	23 Dec 2009 01:28:42 -0000	1.13
@@ -1 +1 @@
-23118fa17246fd898f1eefe61e0b3893  wxMaxima-0.8.3a.tar.gz
+b972743501298932bc0b0796c5489332  wxMaxima-0.8.4.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- wxMaxima.spec	14 Nov 2009 04:36:22 -0000	1.34
+++ wxMaxima.spec	23 Dec 2009 01:28:42 -0000	1.35
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.8.3a
-Release: 1%{?dist}.1
+Version: 0.8.4
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,9 +12,6 @@ URL:     http://wxmaxima.sourceforge.net
 Source0: http://downloads.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: wxMaxima-0.8.3a-ltr_layout.patch
-
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
@@ -25,7 +22,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 
 Provides: wxmaxima = %{version}-%{release}
 
-Requires: maxima >= 5.19
+Requires: maxima >= 5.20
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -41,8 +38,6 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
-%patch50 -p1 -b .ltr_layout
-
 
 %build
 %configure \
@@ -106,6 +101,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-1
+- wxMaxima-0.8.4
+
 * Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.3a-1.1
 - Requires: maxima >= 5.19 (#521722)
 


--- wxMaxima-0.8.3a-ltr_layout.patch DELETED ---



From rdieter at fedoraproject.org  Wed Dec 23 01:30:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:30:09 +0000 (UTC)
Subject: rpms/wxMaxima/F-12 .cvsignore, 1.13, 1.14 sources, 1.12,
	1.13 wxMaxima.spec, 1.32, 1.33 wxMaxima-0.8.3a-ltr_layout.patch,
	1.1, NONE
Message-ID: <20091223013009.BEE4C11C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2962

Modified Files:
	.cvsignore sources wxMaxima.spec 
Removed Files:
	wxMaxima-0.8.3a-ltr_layout.patch 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-1
- wxMaxima-0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Oct 2009 02:55:35 -0000	1.13
+++ .cvsignore	23 Dec 2009 01:30:09 -0000	1.14
@@ -1 +1 @@
-wxMaxima-0.8.3a.tar.gz
+wxMaxima-0.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	26 Oct 2009 02:55:35 -0000	1.12
+++ sources	23 Dec 2009 01:30:09 -0000	1.13
@@ -1 +1 @@
-23118fa17246fd898f1eefe61e0b3893  wxMaxima-0.8.3a.tar.gz
+b972743501298932bc0b0796c5489332  wxMaxima-0.8.4.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-12/wxMaxima.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- wxMaxima.spec	26 Oct 2009 02:55:35 -0000	1.32
+++ wxMaxima.spec	23 Dec 2009 01:30:09 -0000	1.33
@@ -3,7 +3,7 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.8.3a
+Version: 0.8.4
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -12,9 +12,6 @@ URL:     http://wxmaxima.sourceforge.net
 Source0: http://downloads.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: wxMaxima-0.8.3a-ltr_layout.patch
-
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
@@ -25,7 +22,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 
 Provides: wxmaxima = %{version}-%{release}
 
-Requires: maxima >= 5.18
+Requires: maxima >= 5.20
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -41,8 +38,6 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
-%patch50 -p1 -b .ltr_layout
-
 
 %build
 %configure \
@@ -106,6 +101,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-1
+- wxMaxima-0.8.4
+
+* Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.3a-1.1
+- Requires: maxima >= 5.19 (#521722)
+
 * Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.3a-1
 - wxMaxima-0.8.3a (#530915)
 


--- wxMaxima-0.8.3a-ltr_layout.patch DELETED ---



From rdieter at fedoraproject.org  Wed Dec 23 01:30:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:30:59 +0000 (UTC)
Subject: rpms/wxMaxima/F-11 .cvsignore, 1.12, 1.13 sources, 1.11,
	1.12 wxMaxima.spec, 1.30, 1.31 wxMaxima-0.8.3a-ltr_layout.patch,
	1.1, NONE
Message-ID: <20091223013059.DFE7711C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3144

Modified Files:
	.cvsignore sources wxMaxima.spec 
Removed Files:
	wxMaxima-0.8.3a-ltr_layout.patch 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-1
- wxMaxima-0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	26 Oct 2009 03:37:45 -0000	1.12
+++ .cvsignore	23 Dec 2009 01:30:59 -0000	1.13
@@ -1 +1 @@
-wxMaxima-0.8.3a.tar.gz
+wxMaxima-0.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	26 Oct 2009 03:37:45 -0000	1.11
+++ sources	23 Dec 2009 01:30:59 -0000	1.12
@@ -1 +1 @@
-23118fa17246fd898f1eefe61e0b3893  wxMaxima-0.8.3a.tar.gz
+b972743501298932bc0b0796c5489332  wxMaxima-0.8.4.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/wxMaxima.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- wxMaxima.spec	14 Nov 2009 04:35:42 -0000	1.30
+++ wxMaxima.spec	23 Dec 2009 01:30:59 -0000	1.31
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.8.3a
-Release: 1%{?dist}.1
+Version: 0.8.4
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,9 +12,6 @@ URL:     http://wxmaxima.sourceforge.net
 Source0: http://downloads.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: wxMaxima-0.8.3a-ltr_layout.patch
-
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
@@ -25,7 +22,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 
 Provides: wxmaxima = %{version}-%{release}
 
-Requires: maxima >= 5.19
+Requires: maxima >= 5.20
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -41,8 +38,6 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
-%patch50 -p1 -b .ltr_layout
-
 
 %build
 %configure \
@@ -106,6 +101,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-1
+- wxMaxima-0.8.4
+
 * Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.3a-1.1
 - Requires: maxima >= 5.19 (#521722)
 


--- wxMaxima-0.8.3a-ltr_layout.patch DELETED ---



From rdieter at fedoraproject.org  Wed Dec 23 01:31:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 01:31:53 +0000 (UTC)
Subject: rpms/wxMaxima/EL-5 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 wxMaxima.spec, 1.13, 1.14 wxMaxima-0.8.2-ltr_layout.patch,
	1.1, NONE
Message-ID: <20091223013153.101F111C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3340

Modified Files:
	.cvsignore sources wxMaxima.spec 
Removed Files:
	wxMaxima-0.8.2-ltr_layout.patch 
Log Message:
* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-1
- wxMaxima-0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Aug 2009 18:44:40 -0000	1.9
+++ .cvsignore	23 Dec 2009 01:31:52 -0000	1.10
@@ -1 +1 @@
-wxMaxima-0.8.2.tar.gz
+wxMaxima-0.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Aug 2009 18:44:40 -0000	1.9
+++ sources	23 Dec 2009 01:31:52 -0000	1.10
@@ -1 +1 @@
-d3d4abde8495aebb295df587587de4a8  wxMaxima-0.8.2.tar.gz
+b972743501298932bc0b0796c5489332  wxMaxima-0.8.4.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/EL-5/wxMaxima.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- wxMaxima.spec	3 Aug 2009 18:44:40 -0000	1.13
+++ wxMaxima.spec	23 Dec 2009 01:31:52 -0000	1.14
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.8.2
-Release: 3%{?dist}
+Version: 0.8.4
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,8 +12,6 @@ URL:     http://wxmaxima.sourceforge.net
 Source0: http://downloads.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: wxMaxima-0.8.2-ltr_layout.patch
-
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
@@ -24,7 +22,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 
 Provides: wxmaxima = %{version}-%{release}
 
-Requires: maxima >= 5.18
+Requires: maxima >= 5.20
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -40,8 +38,6 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
-%patch1 -p1 -b .ltr_layout
-
 
 %build
 %configure \
@@ -105,6 +101,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-1
+- wxMaxima-0.8.4
+
+* Fri Nov 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.3a-1.1
+- Requires: maxima >= 5.19 (#521722)
+
+* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.3a-1
+- wxMaxima-0.8.3a (#530915)
+
 * Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-3
 - Requires: maxima >= 5.18
 


--- wxMaxima-0.8.2-ltr_layout.patch DELETED ---



From sagarun at fedoraproject.org  Wed Dec 23 02:10:46 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed, 23 Dec 2009 02:10:46 +0000 (UTC)
Subject: File emacs-goodies-el_31.2.orig.tar.gz uploaded to lookaside cache by
	sagarun
Message-ID: <20091223021046.E52F410F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for emacs-goodies:

ec409b4628c2c9a4f9789cb7fb570271  emacs-goodies-el_31.2.orig.tar.gz



From sagarun at fedoraproject.org  Wed Dec 23 02:12:41 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed, 23 Dec 2009 02:12:41 +0000 (UTC)
Subject: rpms/emacs-goodies/devel emacs-goodies-el.texi.patch, NONE,
	1.1 emacs-goodies-el_31.2-1.diff, NONE, 1.1 emacs-goodies.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223021241.B803911C00E9@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-goodies/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7889/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-goodies-el.texi.patch emacs-goodies-el_31.2-1.diff 
	emacs-goodies.spec import.log 
Log Message:
New package emacs-goodies


emacs-goodies-el.texi.patch:
 emacs-goodies-el.texi |   50 ++++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

--- NEW FILE emacs-goodies-el.texi.patch ---
diff -up ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix ./elisp/emacs-goodies-el/emacs-goodies-el.texi
--- ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix	2009-12-04 08:05:29.000000000 +0530
+++ ./elisp/emacs-goodies-el/emacs-goodies-el.texi	2009-12-04 09:03:31.000000000 +0530
@@ -3,14 +3,14 @@
 
 @c $Id: emacs-goodies-el.texi,v 1.85 2009-12-03 03:55:59 psg Exp $
 @c %**start of header
- at setfilename info/emacs-goodies-el
- at settitle Emacs-Goodies-el
+ at setfilename info/emacs-goodies
+ at settitle Emacs-Goodies
 @documentencoding ISO-8859-1
 @c %**end of header
 
 @dircategory Emacs
 @direntry
-* Emacs-Goodies-el: (emacs-goodies-el). Miscellaneous add-ons for Emacs
+* Emacs-Goodies: (emacs-goodies). Miscellaneous add-ons for Emacs
 @end direntry
 
 @c Version variables.
@@ -19,27 +19,25 @@
 
 @ifinfo
 This is Edition @value{EDITION}, last updated @value{UPDATED}, of
- at cite{Emacs-Goodies-el}.
+ at cite{Emacs-Goodies}.
 @end ifinfo
 
 @titlepage
- at title Emacs-Goodies-el: Miscellaneous add-ons for Emacs
+ at title Emacs-Goodies: Miscellaneous add-ons for Emacs
 @subtitle A manual for what's in this package.
 @author Peter S. Galbraith
 @end titlepage
 
 @node Top, align-string, (dir), (dir)
- at top The Emacs-Goodies-el Package Setup
+ at top The Emacs-Goodies Package Setup
 
-This manual describes the Emacs-Goodies-el package and its setup.  A
-quick descriptions of elisp files contained in this package can be found
-in the file @file{/usr/share/doc/emacs-goodies-el/README.Debian.gz}.
+This manual describes the emacs-goodies package and its setup.
 
 All packaged files are installed, setup and ready to use if they don't
 override standard Emacs commands, modes, or settings.
 
 Some extra package installation and setup is done if you customize the
-variable @code{emacs-goodies-el-defaults} to t (its aggressive state).
+variable @code{emacs-goodies-defaults} to t (its aggressive state).
 These will override standard Emacs defaults, but in a good
 (uncontroversial) way.  The affected packages are currently only:
 @ref{ff-paths}, @ref{home-end} and @ref{ibuffer}.  Packages which
@@ -49,7 +47,7 @@ require activation in order to function 
 To customize setup of all customizable packages on a finer-grain
 basis, do:
 @example
- at kbd{M-x} customize-group @key{RET} emacs-goodies-el @key{RET}
+ at kbd{M-x} customize-group @key{RET} emacs-goodies @key{RET}
 @end example
 
 In the following document, when we speak of customizing a variable, we
@@ -58,7 +56,7 @@ mean to use the Emacs custom interface, 
 @kbd{M-x} customize-variable @key{RET} some-variable @key{RET}
 @end example
 When we speak of customizing a group, it's as the example above for the
-group @code{emacs-goodies-el}.
+group @code{emacs-goodies}.
 
 The following files are documented so far.  Eventually, all files will
 be documented.
@@ -190,7 +188,7 @@ table - Create and edit WYSIWYG text bas
 @end menu
 
 This work compiles GPL'ed documentation from the various elisp files
-in /usr/share/emacs/site-lisp/emacs-goodies-el/.  As a derived work
+in /usr/share/emacs/site-lisp/emacs-goodies/.  As a derived work
 from GPL'ed works, this text is also licensed under the GPL V2 (See
 /usr/share/common-licenses/GPL-2) and is edited by Peter S. Galbraith
 @email{psg@@debian.org}.
@@ -200,7 +198,7 @@ section for usage, but be advised that I
 because I intend to change it.
 
 @table @samp
- at item /usr/share/emacs/site-lisp/emacs-goodies-el/initsplit.el
+ at item /usr/share/emacs/site-lisp/emacs-goodies/initsplit.el
 code to split customizations into different files
 @end table
 
@@ -316,7 +314,7 @@ easily though only globally (hence the q
 
 To enable it, customize the variable @code{bar-cursor-mode}.
 
-It is also listed when you customize the group @code{emacs-goodies-el}.
+It is also listed when you customize the group @code{emacs-goodies}.
 
 @node boxquote, browse-huge-tar, bar-cursor, Top
 @chapter boxquote - Quote text with a semi-box.
@@ -399,7 +397,7 @@ Here is code (from him) to do this:
 (ad-activate 'yank-pop)
 @end example
 
-(The emacs-goodies-el package could add a customizable variable to
+(The emacs-goodies package could add a customizable variable to
 set this up.  Ask if this would be useful. - @email{psg@@debian.org})
 
 Note that the command keeps track of the last window displayed to
@@ -474,12 +472,12 @@ You can probably guess how coffee.el cam
 everything but make coffee ...yadda yadda ...
 @end quotation
 
-To do anything at all on emacs21, coffee requires the Debian packages
+To do anything at all on emacs21, coffee requires the packages
 @file{w3-el} and @file{w3-url-e21} to be installed.  Then it will
 prompt for coffee and sweetener type.  Then @code{url-retrieve} will
 fail since it doesn't really support the coffee URL type.  So...
 this package is really an elaborate joke.  Because of this, it's
-longer autoloaded in Debian.  To try, do:
+longer autoloaded.  To try, do:
 
 @example
 M-x load-library coffee
@@ -610,7 +608,7 @@ by default.
 
 @noindent Author: Anders Lindgren <andersl@@andersl.com>
 
-To activate this package in the Debian emacs-goodies-el package,
+To activate this package in emacs-goodies package,
 customize the group @code{ctypes}, toggle on the variable
 @code{ctypes-install} and save for future seesions.  This will enable
 the package.  Then start by using @command{ctypes-buffer} in a C file.
@@ -944,7 +942,7 @@ customisation variables described below.
 @key{C-c d w} for running wordinspect GUI dict client.
 @end itemize
 
-The Debian emacs-goodies-el package doesn't setup these keys by
+The  emacs-goodies package doesn't setup these keys by
 default.  The first time you use @code{dict} in a session you must do
 so manually with @code{M-x dict}.  Thereafter the keybindings will
 work.  If someone requests it, a customization variable could be added
@@ -1192,7 +1190,7 @@ To use it, customize the variable @code{
 To also enable ffap, customize the variable @code{ff-paths-use-ffap}.
 
 Both of the above are enabled if you customize the variable
- at code{emacs-goodies-el-defaults} to t (its aggressive state).
+ at code{emacs-goodies-defaults} to t (its aggressive state).
 
 You may alter various settings of @code{ff-paths} using the
 customization group @code{ff-paths}.
@@ -2192,7 +2190,7 @@ configuration:
 Remember, you can switch between formats using
 @code{ibuffer-switch-format}, bound to @key{`} by default.
 
-In emacs-goodies-el, you can use the customize interface to bind
+In emacs-goodies, you can use the customize interface to bind
 @code{ibuffer} to @key{\C-x\C-b} by customizing the variable
 @code{ibuffer-enable}.
 
@@ -2794,7 +2792,7 @@ or insert the following snippet of code 
  (add-to-list 'auto-mode-alist '("\\.m$" . matlab-mode))
 @end example
 
-or, in Debian, customize the variable @code{matlab-auto-mode} to
+or, customize the variable @code{matlab-auto-mode} to
 associated the .m file extention to matlab-mode.
 
 Additional features include auto-fill including auto-additions of
@@ -3259,7 +3257,7 @@ never modified, and you can see the raw 
 You may customize some aspects of this package using @command{M-x
 customize-group rfcview}.
 
-The emacs-goodies-el package sets up Emacs to enter
+The emacs-goodies package sets up Emacs to enter
 @command{rfcview-mode} automatically when reading such a file (as
 recognised by the filename).
 
@@ -3473,10 +3471,6 @@ Or alternatively, customize the group @c
 the variable @code{shell-command-completion-mode} and save the setting
 for future sessions.
 
-Note that setup has changed since Debian sarge for which the function
-to call was @code{shell-command-activate-advices} and the variable to
-customize was @code{shell-command-enable-completions}.
-
 @node show-wspace, slang-mode, shell-command, Top
 @chapter show-wspace - highlight whitespaces of various kinds.
 

emacs-goodies-el_31.2-1.diff:
 README.Debian                                 |  341 +++
 README.source                                 |    7 
 changelog                                     | 2550 ++++++++++++++++++++++++++
 compat                                        |    1 
 control                                       |  197 ++
 debbugs-el.copyright                          |    7 
 debian-el.README.Debian                       |   35 
 debian-el.copyright                           |   94 
 debian-el.emacsen-install.in                  |   35 
 debian-el.emacsen-remove.in                   |    5 
 debian-el.emacsen-startup                     |   18 
 debian-el.install                             |    8 
 debian-el.postinst                            |   21 
 debview.copyright                             |    7 
 debview.emacsen-startup                       |    4 
 devscripts-el.README.Debian                   |   36 
 devscripts-el.copyright                       |   23 
 devscripts-el.emacsen-install.in              |   23 
 devscripts-el.emacsen-remove.in               |    5 
 devscripts-el.emacsen-startup                 |   35 
 devscripts-el.install                         |    3 
 dpkg-dev-el.README.Debian                     |   35 
 dpkg-dev-el.copyright                         |   87 
 dpkg-dev-el.emacsen-install.in                |   23 
 dpkg-dev-el.emacsen-remove.in                 |    5 
 dpkg-dev-el.emacsen-startup                   |   18 
 dpkg-dev-el.install                           |    7 
 emacs-goodies-el.copyright                    | 1241 ++++++++++++
 emacs-goodies-el.emacsen-install.in           |   27 
 emacs-goodies-el.emacsen-remove.in            |    5 
 emacs-goodies-el.emacsen-startup              |   19 
 emacs-goodies-el.install                      |   86 
 emacsen-install.template                      |  108 +
 emacsen-remove.template                       |   10 
 gnus-bonus-el.README.Debian                   |   58 
 gnus-bonus-el.copyright                       |  159 +
 gnus-bonus-el.emacsen-install.in              |   27 
 gnus-bonus-el.emacsen-remove.in               |    5 
 gnus-bonus-el.emacsen-startup                 |   42 
 gnus-bonus-el.install                         |   10 
 patches/00list                                |   48 
 patches/3_bar-cursor-customize.dpatch         |  186 +
 patches/50_bar-cursor_bug331430.dpatch        |   19 
 patches/50_browse-kill-ring_bug224751.dpatch  |   40 
 patches/50_coffee_no-autoload.dpatch          |   36 
 patches/50_color-theme_custom.dpatch          |  272 ++
 patches/50_ctypes.dpatch                      |  322 +++
 patches/50_dedicated.dpatch                   |   77 
 patches/50_dict_bug301293.dpatch              |   46 
 patches/50_edit-env_autoload.dpatch           |   36 
 patches/50_filladapt_bug420845.dpatch         |   27 
 patches/50_gnus-BTS.dpatch                    |  192 +
 patches/50_gnus-filterhist.dpatch             |   41 
 patches/50_gnus-pers.dpatch                   |  173 +
 patches/50_joc-toggle-buffer.dpatch           |   99 +
 patches/50_joc-toggle-case.dpatch             |  211 ++
 patches/50_lcomp.dpatch                       |  156 +
 patches/50_maplev_bug528868.dpatch            |   22 
 patches/50_markdown_autoload.dpatch           |   18 
 patches/50_marker-visit_autoloads.dpatch      |   52 
 patches/50_newsticker_non-fatal_xml.dpatch    |   46 
 patches/50_pod_autoload.dpatch                |   18 
 patches/50_projects.dpatch                    |  220 ++
 patches/50_protbuf_custom_and_toggle.dpatch   |  185 +
 patches/50_quack_autoload.dpatch              |  106 +
 patches/50_session_enable_custom.dpatch       |   71 
 patches/50_setnu.dpatch                       |  253 ++
 patches/50_silly-mail.dpatch                  | 1105 +++++++++++
 patches/50_slang-mode_bug336352.dpatch        |   19 
 patches/50_table-add-to-text-mode-hook.dpatch |   55 
 patches/50_todoo_bug220718.dpatch             |   50 
 patches/50_vm-bogofilter.dpatch               |  225 ++
 patches/51_edit-env_copy-list.dpatch          |   36 
 patches/51_gnus-BTS_bug363161.dpatch          |   40 
 patches/51_gnus-pers.dpatch                   |   36 
 patches/51_session_autoload.dpatch            |   36 
 patches/51_todoo_bug267637.dpatch             |   55 
 patches/52_gnus-BTS_bug218286.dpatch          |   66 
 patches/52_gnus-pers.dpatch                   |   38 
 patches/52_todoo_bug414781.dpatch             |   35 
 patches/53_gnus-pers.dpatch                   |   98 
 patches/53_todoo_bug438964.dpatch             |   55 
 patches/54_gnus-pers_bug384209.dpatch         |  150 +
 patches/55_gnus-pers_bug263371.dpatch         |   36 
 patches/5_highlight-beyond-fill-column.dpatch |  205 ++
 patches/6_diminish-defcustom.dpatch           |  177 +
 patches/8_whitespace_rename.dpatch            |  131 +
 patches/9_missing_provide.dpatch              |   44 
 patches/9_whitespace_enable_custom.dpatch     |  226 ++
 rules                                         |   63 
 vm-bonus-el.README.Debian                     |  111 +
 vm-bonus-el.copyright                         |   44 
 vm-bonus-el.emacsen-install.in                |   20 
 vm-bonus-el.emacsen-remove.in                 |    5 
 vm-bonus-el.emacsen-startup                   |   45 
 vm-bonus-el.install                           |    1 
 96 files changed, 11606 insertions(+)

--- NEW FILE emacs-goodies-el_31.2-1.diff ---
--- emacs-goodies-el-31.2.orig/debian/emacsen-remove.template
+++ emacs-goodies-el-31.2/debian/emacsen-remove.template
@@ -0,0 +1,10 @@
+
+if [ ${FLAVOR} != emacs ]; then
+    if test -x /usr/sbin/install-info-altdir; then
+        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
+    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
--- emacs-goodies-el-31.2.orig/debian/compat
+++ emacs-goodies-el-31.2/debian/compat
@@ -0,0 +1 @@
+7
--- emacs-goodies-el-31.2.orig/debian/control
+++ emacs-goodies-el-31.2/debian/control
@@ -0,0 +1,197 @@
+Source: emacs-goodies-el
+Section: editors
+Priority: optional
+Maintainer: Peter S Galbraith <psg at debian.org>
+Build-Depends: debhelper (>= 7), dpatch (>=1.5)
+Build-Depends-Indep: texinfo
+Standards-Version: 3.8.3
+Vcs-Cvs: :pserver:anonymous at cvs.alioth.debian.org:/cvsroot/pkg-goodies-el emacs-goodies-el
+Vcs-Browser: http://alioth.debian.org/scm/viewvc.php/?root=pkg-goodies-el
+
+Package: emacs-goodies-el
+Architecture: all
+Depends: emacs23 | emacsen, bash (>= 2.05a) | bash-static, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Recommends: dict, wget, perl-doc
+Replaces: emacs-goodies-extra-el
+Provides: emacs-goodies-extra-el
+Description: Miscellaneous add-ons for Emacs
+ This package contains:
+  align-string - align string components over several lines;
+  all - edit all lines matching a given regexp;
+  apache-mode - major mode for editing Apache configuration files;
+  ascii - ASCII code display for character under point;
+  auto-fill-inhibit - finer grained control over auto-fill-mode;
+  bar-cursor - change your cursor to a bar instead of a block;
+  boxquote - quote texts in nice boxes;
+  browse-huge-tar - browse tar files without reading them into memory;
+  browse-kill-ring - browse, search, modify the kill ring;
+  clipper - save strings of data for further use;
+  coffee - now Emacs can even brew coffee;
+  color-theme - changes the colors used within Emacs;
+  csv-mode - major mode for comma-separated value files;
+  ctypes - enhanced Font lock support for custom defined types;
+  cua - emulate CUA key bindings (C-z undo, C-x cut, C-c copy, C-v paste);
+  cyclebuffer - select buffer by cycling through;
+  cwebm - a modified CWEB/WEB modified mode;
+  dedicated - make a window dedicated to a single buffer;
+  df - display in the mode line space left on devices;
+  dict - wrapper around the 'dict' command. (Depends on bash and dict)
+  diminish - shorten or erase modeline presence of minor modes;
+  dirvars - provides directory-wide local variables;
+  edit-env - display, edit, delete and add environment variables;
+  egocentric - highlight your name inside emacs buffers;
+  ff-paths - $PATH-like searching in C-x C-f;
+  filladapt - enhances Emacs's built-in adaptive fill;
+  floatbg - slowly modify background color;
+  framepop - display temporary buffers in a dedicated frame;
+  highlight-beyond-fill-column - highlight lines that are too long;
+  highlight-completion - highlight completions in the minibuffer;
+  highlight-current-line - highlight line where the cursor is;
+  home-end - alternative Home and End commands;
+  htmlize - HTML-ize font-lock buffers;
+  initsplit - split customizations into different files;
+  joc-toggle-buffer - fast switching between two buffers;
+  joc-toggle-case - a set of functions to toggle the case of characters;
+  keydef - a simpler way to define key mappings;
+  keywiz - Emacs key sequence quiz;
+  lcomp - list-completion hacks;
+  maplev - major mode for Maple;
+  map-lines - map a command over lines matching a regexp;
+  markdown-mode - major mode for editing Markdown files;
+  marker-visit - navigate through a buffer's marks in order;
+  matlab - major mode for MatLab dot-m files;
+  minibuf-electric -  electric minibuffer behavior from XEmacs;
+  minibuffer-complete-cycle - cycle through the *Completions* buffer;
+  mutt-alias - lookup and insert the expansion of mutt mail aliases;
+  muttrc-mode - major mode for editing Mutt config files;
+  obfusurl - obfuscate an URL;
+  pack-windows - resize all windows to display as much info as possible;
+  perldoc - show help for Perl functions and modules. (Depends on perl-doc)
+  pod-mode - major mode for editing POD files
+  projects - create project-based meaningful buffer names;
+  prot-buf - protect buffers from accidental killing;
+  protocols - perform lookups in /etc/protocols;
+  quack - enhanced support for editing and running Scheme code;
+  rfcview - view IETF RFCs with readability-improved formatting;
+  services - perform lookups in /etc/services;
+  session - saves settings between Emacs invocations and visits to a file;
+  setnu - setnu-mode, a vi-style line number mode;
+  shell-command - enables tab-completion for shell-command;
+  show-wspace - highlight whitespaces of various kinds;
+  silly-mail - generate bozotic mail headers;
+  slang-mode.el - a major-mode for editing S-Lang scripts;
+  sys-apropos - interface for the *nix apropos command;
+  tabbar - Display a tab bar in the header line;
+  tail - "tail -f" a file or a command from within Emacs;
+  tc - cite text with proper filling;
+  thinks - quote texts in cartoon-like think bubbles;
+  tlc - major mode for editing Target Language Compiler scripts;
+  tld - explain top-level domain names;
+  todoo - major mode for editing TODO files;
+  toggle-option - easily toggle frequently toggled options;
+  twiddle - mode line hacks to keep you awake;
+  under - underline a region with ^ characters;
+  wdired - rename files editing their names in dired buffers;
+  xrdb-mode - mode for editing X resource database files.
+ .
+ As well as some packages included or superseded in emacs22 and emacs23 for
+ use in other flavors:
+  cfengine - major mode for editing cfengine scripts;
+  ibuffer - advanced replacement for the `buffer-menu';
+  ido - a faster way to switch buffers and get files;
+  newsticker - a newsticker for Emacs. (Depends on wget)
+  nuke-trailing-whitespace - kill the trailing blanks at end of lines;
+  table - create and edit WYSIWYG text based embedded tables;
+ .
+ See /usr/share/doc/emacs-goodies-el/README.Debian.gz for a short
+ description of all files, or the Info node `emacs-goodies-el' for details.
+
+Package: gnus-bonus-el
+Architecture: all
+Depends: emacs23 | emacsen, gnus | emacs23 | emacs22 | emacs21 | xemacs21 | emacs-snapshot, ${misc:Depends}
+Section: news
+Description: Miscellaneous add-ons for Gnus
+ This package contains a few Emacs-Lisp files, obtained from various
+ sources, including the gnu.emacs.sources newsgroup and a few
+ websites, that provide various functions to Gnus, the Emacs mail and
+ news reader.
+ .
+ This package contains:
+  gnus-eyecandy - enhance the group buffer by adding icons.
+  gnus-filterhist - add a buffer which display the message filtering
+  gnus-junk - semi-automatic replies to junk e-mails;
+  gnus-pers - an alternative to gnus-posting-styles.
+  message-x - customizable completion in message headers;
+  nnir - searchable mail backend;
+  nnnil - empty, read-only backend;
+  nntodo - manage to-do items;
+  spam-stat - spam-detector based on statistics.
+ .
+ See /usr/share/doc/gnus-bonus-el/README.Debian for a short description
+ of all files.
+
+Package: devscripts-el
+Architecture: all
+Depends: emacs23 | emacsen, bash (>= 2.05a), devscripts, dpkg-dev-el, apel, ${misc:Depends}
+Recommends: elserv
+Description: Emacs wrappers for the commands in devscripts
+ This package contains:
+  devscripts - wrappers around the debuild, debc and debi commands;
+  pbuilder-log-view - wrappers around viewing pbuilder logs;
+  pbuilder - wrappers around pbuilder
+ .
+ See /usr/share/doc/devscripts-el/README.Debian for a short description.
+
+Package: debian-el
+Architecture: all
+Depends: emacs23 | emacsen, reportbug (>= 1.41.1), ${misc:Depends}, dpkg (>= 1.15.4) | install-info, bzip2, file
+Recommends: wget, dlocate, groff-base
+Suggests: gnus
+Replaces: debbugs-el, debview
+Provides: debbugs-el, debview
+Section: utils
+Description: Emacs helpers specific to Debian users
+ This package contains:
+ .
+  apt-sources - major mode for editing Debian sources.list files;
+  apt-utils - interface to APT (Debian package management);
+  debian-bug - an Emacs command to submit a bug report;
+  deb-view - view contents of Debian package, similarly to tar-mode;
+  gnus-BTS - provides buttons for bug numbers seen in Gnus messages;
+  preseed - major mode for editing debian-installer preseed files.
+ .
+ See /usr/share/doc/debian-el/README.Debian for a short description of
+ all files, or the Info node `debian-el' for details.
+
+Package: dpkg-dev-el
+Architecture: all
+Depends: emacs23 | emacsen, debian-el (>= 24.0-1), ${misc:Depends}
+Suggests: dpkg-dev
+Recommends: wget
+Conflicts: dpkg-dev (<< 1.7.2)
+Section: utils
+Description: Emacs helpers specific to Debian development
+ This package contains:
+ .
+  debian-bts-control - builds control at bugs.debian.org email messages;
+  debian-changelog-mode - a helper mode for Debian changelogs;
+  debian-control-mode - a helper mode for debian/control files;
+  debian-copyright - major mode for Debian package copyright files;
[...11495 lines suppressed...]
+ ;;; ChangeLog:
+ 
++;; 2004-11-24 Peter S Galbraith <psg at debian.org>
++;;  Debian bug 267637 fix: changes to outline-regexp should be buffer-local.
++;;  Thanks to Daniel Skarda <0rfelyus at hobitin.ucw.cz> for pointing it out.
++
+ ;; 1.2 - Fixed bug in menu (todoo-show->todoo)
+ ;;       Fixed bug when deleting window in todoo-save-and-exit
+ ;;       Added early sub-item support (might be buggy, but still
+@@ -512,10 +516,11 @@
+   (make-local-variable 'font-lock-defaults)
+   (setq font-lock-defaults '(todoo-font-lock-keywords t))
+ 
+-  (setq outline-regexp (concat "^\\(" (regexp-quote todoo-item-marker) " \\|"
+-			       (regexp-quote todoo-item-marker-assigned) 
+-			       " \\|[ ]*" (regexp-quote todoo-sub-item-marker)
+-			       " \\)"))
++  (set (make-local-variable 'outline-regexp)
++        (concat "^\\(" (regexp-quote todoo-item-marker) " \\|"
++                (regexp-quote todoo-item-marker-assigned) 
++                " \\|[ ]*" (regexp-quote todoo-sub-item-marker)
++                " \\)"))
+ 
+   (outline-minor-mode 1)
+ 
--- emacs-goodies-el-31.2.orig/debian/patches/00list
+++ emacs-goodies-el-31.2/debian/patches/00list
@@ -0,0 +1,48 @@
+3_bar-cursor-customize
+5_highlight-beyond-fill-column
+6_diminish-defcustom
+8_whitespace_rename
+9_whitespace_enable_custom
+9_missing_provide
+50_bar-cursor_bug331430
+50_browse-kill-ring_bug224751
+50_ctypes
+50_coffee_no-autoload
+50_color-theme_custom
+50_dedicated
+50_dict_bug301293
+50_edit-env_autoload
+51_edit-env_copy-list
+50_filladapt_bug420845
+50_gnus-BTS
+51_gnus-BTS_bug363161
+52_gnus-BTS_bug218286
+50_gnus-filterhist
+50_gnus-pers
+51_gnus-pers
+52_gnus-pers
+53_gnus-pers
+54_gnus-pers_bug384209
+55_gnus-pers_bug263371
+50_joc-toggle-case
+50_joc-toggle-buffer
+50_lcomp
+50_maplev_bug528868
+50_marker-visit_autoloads
+50_newsticker_non-fatal_xml
+50_session_enable_custom
+51_session_autoload
+50_silly-mail
+50_slang-mode_bug336352
+50_protbuf_custom_and_toggle
+50_table-add-to-text-mode-hook
+50_todoo_bug220718
+51_todoo_bug267637
+52_todoo_bug414781
+53_todoo_bug438964
+50_setnu
+50_projects
+50_markdown_autoload
+50_pod_autoload
+50_quack_autoload
+50_vm-bogofilter
--- emacs-goodies-el-31.2.orig/debian/patches/9_missing_provide.dpatch
+++ emacs-goodies-el-31.2/debian/patches/9_missing_provide.dpatch
@@ -0,0 +1,44 @@
+#!/bin/sh -e
+## 9_missing_provide.dpatch.dpatch by Peter S Galbraith <psg at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/align-string.el emacs-goodies-el/elisp/emacs-goodies-el/align-string.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/align-string.el	2001-11-08 07:26:56.000000000 -0500
++++ emacs-goodies-el/elisp/emacs-goodies-el/align-string.el	2009-09-03 09:53:49.000000000 -0400
+@@ -98,3 +98,5 @@
+ 	  (setq i (1+ i)))))
+     ;; Clear end marker.
+     (set-marker end nil)))
++
++(provide 'align-string)
++;;; align-string.el ends here
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/cyclebuffer.el emacs-goodies-el/elisp/emacs-goodies-el/cyclebuffer.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/cyclebuffer.el	2009-07-17 16:53:08.000000000 -0400
++++ emacs-goodies-el/elisp/emacs-goodies-el/cyclebuffer.el	2009-09-03 09:52:08.000000000 -0400
+@@ -105,3 +105,5 @@
+ visited buffers."
+   (interactive)
+   (cyclebuffer-forward -1))
++
++(provide 'cyclebuffer)
--- emacs-goodies-el-31.2.orig/debian/patches/52_todoo_bug414781.dpatch
+++ emacs-goodies-el-31.2/debian/patches/52_todoo_bug414781.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_todoo_bug414781.dpatch by  <psg at mixed.dyndns.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/todoo.el emacs-goodies-el/elisp/emacs-goodies-el/todoo.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/todoo.el	2007-05-14 19:17:52.000000000 -0400
++++ emacs-goodies-el/elisp/emacs-goodies-el/todoo.el	2007-05-14 19:20:51.000000000 -0400
+@@ -57,6 +57,11 @@
+ 
+ ;;; ChangeLog:
+ 
++;; 2007-05-14 Peter S Galbraith <psg at debian.org>
++;;  Comment out clobbering of outline-mode-menu-bar-map key entries.
++;;  This is far too aggressive.  A much better fix would be to undefine the
++;;  keys for todoo-mode-map.  Thanks to Simon Pepping (Closes #144781).
++
+ ;; 2004-11-24 Peter S Galbraith <psg at debian.org>
+ ;;  Debian bug 267637 fix: changes to outline-regexp should be buffer-local.
+ ;;  Thanks to Daniel Skarda <0rfelyus at hobitin.ucw.cz> for pointing it out.
+@@ -524,9 +529,9 @@
+ 
+   (outline-minor-mode 1)
+ 
+-  (define-key outline-mode-menu-bar-map [headings] 'undefined)
+-  (define-key outline-mode-menu-bar-map [hide] 'undefined)
+-  (define-key outline-mode-menu-bar-map [show] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [headings] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [hide] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [show] 'undefined)
+ 
+   (if todoo-collapse-items
+       (hide-body))
--- emacs-goodies-el-31.2.orig/debian/patches/50_edit-env_autoload.dpatch
+++ emacs-goodies-el-31.2/debian/patches/50_edit-env_autoload.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_edit-env_autoload.dpatch by Peter S Galbraith <psg at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add autoload.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/psg/emacs/emacs-goodies-el/newfiles/emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el
+--- /home/psg/emacs/emacs-goodies-el/newfiles/emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el	2003-11-12 20:17:21.000000000 -0500
++++ emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el	2003-11-14 15:00:01.000000000 -0500
+@@ -111,6 +111,7 @@
+ 	       (list (widget-get widget 'environment-variable-name)
+ 		     widget)))
+   
++;;;###autoload
+ (defun edit-env ()
+   "Display, edit, delete and add environment variables."
+   (interactive)


--- NEW FILE emacs-goodies.spec ---
%global pkg emacs-goodies
%global pkgname Emacs-goodies
%global goodies_dir %{buildroot}%{emacs_lispdir}/goodies/
%global gnus_dir %{buildroot}%{emacs_lispdir}/gnus-bonus/
%global installinfo /sbin/install-info

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif


Name:		%{pkg}
Version:	31.2
Release:	3%{?dist}
Summary:	Miscellaneous add-ons for Emacs

Group:		Applications/Editors
License:	GPLv2+ and GPLv3
URL:		http://packages.debian.org/sid/lisp/emacs-goodies-el
Source0:	http://ftp.at.debian.org/debian/pool/main/e/emacs-goodies-el/emacs-goodies-el_31.2.orig.tar.gz
#Patch which adjusts debian specific information to fedora in texi file
Patch0:		emacs-goodies-el.texi.patch
#Upstream patch http://ftp.de.debian.org/debian/pool/main/e/emacs-goodies-el/emacs-goodies-el_31.2-1.diff.gz
Patch1:		emacs-goodies-el_31.2-1.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el texinfo
Requires:	emacs(bin) >= %{emacs_version}
		
%description
This is %{pkgname} %{version}, provides add-ons for GNU Emacs and gnus.

%package el
Summary:	Elisp source files for %{pkgname}
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%setup -q -n %{pkg}-el-%{version}
%patch0 -p1 -b .fix
%patch1 -p1
%{__cp} debian/patches/* .
while read -r line
do
	patch -p1 <$line.dpatch
done < 00list
%{__rm} -rf elisp/debian-el/
%{__rm} -rf elisp/dpkg-dev-el/
%{__rm} -rf elisp/devscripts-el/

%build
%{__mkdir} -p elisp/%{pkg}-el/info
cd elisp/%{pkg}-el/
%{__chmod} +x %{pkg}-loaddefs.make
./%{pkg}-loaddefs.make
emacs --no-site-file --batch --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile *.el
makeinfo emacs-goodies-el.texi
iconv -f iso8859-1 -t utf-8 info/emacs-goodies > info/emacs-goodies.utf
%{__mv} info/emacs-goodies.utf info/emacs-goodies
cd ../gnus-bonus-el/
emacs --no-site-file --batch --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile *.el

%install
rm -rf %{buildroot}
%{__install} -pm 755 -d %{goodies_dir}
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}
%{__install} -pm 644 elisp/%{pkg}-el/%{pkg}-loaddefs.el %{buildroot}%{emacs_startdir}
%{__install} -pm 644 elisp/%{pkg}-el/*.elc %{goodies_dir}
%{__install} -pm 644 elisp/%{pkg}-el/*.el %{goodies_dir}
%{__install} -pm 755 -d %{gnus_dir}
%{__install} -pm 644 elisp/gnus-bonus-el/*.elc %{gnus_dir}
%{__install} -pm 644 elisp/gnus-bonus-el/*.el %{gnus_dir}
%{__install} -pm 755 -d %{buildroot}%{_infodir}/
%{__install} -pm 644 elisp/%{pkg}-el/info/%{pkg} %{buildroot}%{_infodir}/

%clean
%{__rm} -rf %{buildroot}


%post
%{installinfo} %{_infodir}/%{pkg} %{_infodir}/dir


%preun
if [ "$1" = 0 ]; then
    %{installinfo} --delete %{_infodir}/%{pkg} %{_infodir}/dir
fi


%files
%defattr(-,root,root,-)
%{emacs_lispdir}/goodies/*.elc
%{emacs_startdir}/emacs-goodies-loaddefs.el
%{emacs_lispdir}/gnus-bonus/*.elc
%{_infodir}/%{pkg}.gz
%dir %{emacs_lispdir}/goodies
%dir %{emacs_lispdir}/gnus-bonus

%files el
%defattr(-,root,root,-)
%doc COPYING-GPL-v2 COPYING-GPL-v3
%{emacs_lispdir}/goodies/*.el
%{emacs_lispdir}/gnus-bonus/*.el

%changelog
* Wed Dec 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-3
- License adjusted to GPLv2+ and GPLv3

* Mon Dec 14 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-2
- Comment on  patches added

* Fri Dec 4 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-1
- Updated to version 31.2-1

* Thu Nov 26 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.1-1
- Updated to version 31.1-1

* Sun Nov 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.11-1
- Updated to version 30.11-1

* Fri Oct 30 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.8-2
- Upstream patches are applied

* Thu Oct 22 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.8-1
- Updated to 30.8-1
- License corrected to GPLv2+

* Tue Sep 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.5-1
- Initial release 30.5-1


--- NEW FILE import.log ---
emacs-goodies-31_2-3_fc12:HEAD:emacs-goodies-31.2-3.fc12.src.rpm:1261534225


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-goodies/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:07:02 -0000	1.1
+++ .cvsignore	23 Dec 2009 02:12:41 -0000	1.2
@@ -0,0 +1 @@
+emacs-goodies-el_31.2.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-goodies/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:07:02 -0000	1.1
+++ sources	23 Dec 2009 02:12:41 -0000	1.2
@@ -0,0 +1 @@
+ec409b4628c2c9a4f9789cb7fb570271  emacs-goodies-el_31.2.orig.tar.gz



From sagarun at fedoraproject.org  Wed Dec 23 02:17:47 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed, 23 Dec 2009 02:17:47 +0000 (UTC)
Subject: rpms/emacs-goodies/F-11 emacs-goodies-el.texi.patch, NONE,
	1.1 emacs-goodies-el_31.2-1.diff, NONE, 1.1 emacs-goodies.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223021747.581BF11C00E9@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-goodies/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8599/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-goodies-el.texi.patch emacs-goodies-el_31.2-1.diff 
	emacs-goodies.spec import.log 
Log Message:
New package emacs-goodies


emacs-goodies-el.texi.patch:
 emacs-goodies-el.texi |   50 ++++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

--- NEW FILE emacs-goodies-el.texi.patch ---
diff -up ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix ./elisp/emacs-goodies-el/emacs-goodies-el.texi
--- ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix	2009-12-04 08:05:29.000000000 +0530
+++ ./elisp/emacs-goodies-el/emacs-goodies-el.texi	2009-12-04 09:03:31.000000000 +0530
@@ -3,14 +3,14 @@
 
 @c $Id: emacs-goodies-el.texi,v 1.85 2009-12-03 03:55:59 psg Exp $
 @c %**start of header
- at setfilename info/emacs-goodies-el
- at settitle Emacs-Goodies-el
+ at setfilename info/emacs-goodies
+ at settitle Emacs-Goodies
 @documentencoding ISO-8859-1
 @c %**end of header
 
 @dircategory Emacs
 @direntry
-* Emacs-Goodies-el: (emacs-goodies-el). Miscellaneous add-ons for Emacs
+* Emacs-Goodies: (emacs-goodies). Miscellaneous add-ons for Emacs
 @end direntry
 
 @c Version variables.
@@ -19,27 +19,25 @@
 
 @ifinfo
 This is Edition @value{EDITION}, last updated @value{UPDATED}, of
- at cite{Emacs-Goodies-el}.
+ at cite{Emacs-Goodies}.
 @end ifinfo
 
 @titlepage
- at title Emacs-Goodies-el: Miscellaneous add-ons for Emacs
+ at title Emacs-Goodies: Miscellaneous add-ons for Emacs
 @subtitle A manual for what's in this package.
 @author Peter S. Galbraith
 @end titlepage
 
 @node Top, align-string, (dir), (dir)
- at top The Emacs-Goodies-el Package Setup
+ at top The Emacs-Goodies Package Setup
 
-This manual describes the Emacs-Goodies-el package and its setup.  A
-quick descriptions of elisp files contained in this package can be found
-in the file @file{/usr/share/doc/emacs-goodies-el/README.Debian.gz}.
+This manual describes the emacs-goodies package and its setup.
 
 All packaged files are installed, setup and ready to use if they don't
 override standard Emacs commands, modes, or settings.
 
 Some extra package installation and setup is done if you customize the
-variable @code{emacs-goodies-el-defaults} to t (its aggressive state).
+variable @code{emacs-goodies-defaults} to t (its aggressive state).
 These will override standard Emacs defaults, but in a good
 (uncontroversial) way.  The affected packages are currently only:
 @ref{ff-paths}, @ref{home-end} and @ref{ibuffer}.  Packages which
@@ -49,7 +47,7 @@ require activation in order to function 
 To customize setup of all customizable packages on a finer-grain
 basis, do:
 @example
- at kbd{M-x} customize-group @key{RET} emacs-goodies-el @key{RET}
+ at kbd{M-x} customize-group @key{RET} emacs-goodies @key{RET}
 @end example
 
 In the following document, when we speak of customizing a variable, we
@@ -58,7 +56,7 @@ mean to use the Emacs custom interface, 
 @kbd{M-x} customize-variable @key{RET} some-variable @key{RET}
 @end example
 When we speak of customizing a group, it's as the example above for the
-group @code{emacs-goodies-el}.
+group @code{emacs-goodies}.
 
 The following files are documented so far.  Eventually, all files will
 be documented.
@@ -190,7 +188,7 @@ table - Create and edit WYSIWYG text bas
 @end menu
 
 This work compiles GPL'ed documentation from the various elisp files
-in /usr/share/emacs/site-lisp/emacs-goodies-el/.  As a derived work
+in /usr/share/emacs/site-lisp/emacs-goodies/.  As a derived work
 from GPL'ed works, this text is also licensed under the GPL V2 (See
 /usr/share/common-licenses/GPL-2) and is edited by Peter S. Galbraith
 @email{psg@@debian.org}.
@@ -200,7 +198,7 @@ section for usage, but be advised that I
 because I intend to change it.
 
 @table @samp
- at item /usr/share/emacs/site-lisp/emacs-goodies-el/initsplit.el
+ at item /usr/share/emacs/site-lisp/emacs-goodies/initsplit.el
 code to split customizations into different files
 @end table
 
@@ -316,7 +314,7 @@ easily though only globally (hence the q
 
 To enable it, customize the variable @code{bar-cursor-mode}.
 
-It is also listed when you customize the group @code{emacs-goodies-el}.
+It is also listed when you customize the group @code{emacs-goodies}.
 
 @node boxquote, browse-huge-tar, bar-cursor, Top
 @chapter boxquote - Quote text with a semi-box.
@@ -399,7 +397,7 @@ Here is code (from him) to do this:
 (ad-activate 'yank-pop)
 @end example
 
-(The emacs-goodies-el package could add a customizable variable to
+(The emacs-goodies package could add a customizable variable to
 set this up.  Ask if this would be useful. - @email{psg@@debian.org})
 
 Note that the command keeps track of the last window displayed to
@@ -474,12 +472,12 @@ You can probably guess how coffee.el cam
 everything but make coffee ...yadda yadda ...
 @end quotation
 
-To do anything at all on emacs21, coffee requires the Debian packages
+To do anything at all on emacs21, coffee requires the packages
 @file{w3-el} and @file{w3-url-e21} to be installed.  Then it will
 prompt for coffee and sweetener type.  Then @code{url-retrieve} will
 fail since it doesn't really support the coffee URL type.  So...
 this package is really an elaborate joke.  Because of this, it's
-longer autoloaded in Debian.  To try, do:
+longer autoloaded.  To try, do:
 
 @example
 M-x load-library coffee
@@ -610,7 +608,7 @@ by default.
 
 @noindent Author: Anders Lindgren <andersl@@andersl.com>
 
-To activate this package in the Debian emacs-goodies-el package,
+To activate this package in emacs-goodies package,
 customize the group @code{ctypes}, toggle on the variable
 @code{ctypes-install} and save for future seesions.  This will enable
 the package.  Then start by using @command{ctypes-buffer} in a C file.
@@ -944,7 +942,7 @@ customisation variables described below.
 @key{C-c d w} for running wordinspect GUI dict client.
 @end itemize
 
-The Debian emacs-goodies-el package doesn't setup these keys by
+The  emacs-goodies package doesn't setup these keys by
 default.  The first time you use @code{dict} in a session you must do
 so manually with @code{M-x dict}.  Thereafter the keybindings will
 work.  If someone requests it, a customization variable could be added
@@ -1192,7 +1190,7 @@ To use it, customize the variable @code{
 To also enable ffap, customize the variable @code{ff-paths-use-ffap}.
 
 Both of the above are enabled if you customize the variable
- at code{emacs-goodies-el-defaults} to t (its aggressive state).
+ at code{emacs-goodies-defaults} to t (its aggressive state).
 
 You may alter various settings of @code{ff-paths} using the
 customization group @code{ff-paths}.
@@ -2192,7 +2190,7 @@ configuration:
 Remember, you can switch between formats using
 @code{ibuffer-switch-format}, bound to @key{`} by default.
 
-In emacs-goodies-el, you can use the customize interface to bind
+In emacs-goodies, you can use the customize interface to bind
 @code{ibuffer} to @key{\C-x\C-b} by customizing the variable
 @code{ibuffer-enable}.
 
@@ -2794,7 +2792,7 @@ or insert the following snippet of code 
  (add-to-list 'auto-mode-alist '("\\.m$" . matlab-mode))
 @end example
 
-or, in Debian, customize the variable @code{matlab-auto-mode} to
+or, customize the variable @code{matlab-auto-mode} to
 associated the .m file extention to matlab-mode.
 
 Additional features include auto-fill including auto-additions of
@@ -3259,7 +3257,7 @@ never modified, and you can see the raw 
 You may customize some aspects of this package using @command{M-x
 customize-group rfcview}.
 
-The emacs-goodies-el package sets up Emacs to enter
+The emacs-goodies package sets up Emacs to enter
 @command{rfcview-mode} automatically when reading such a file (as
 recognised by the filename).
 
@@ -3473,10 +3471,6 @@ Or alternatively, customize the group @c
 the variable @code{shell-command-completion-mode} and save the setting
 for future sessions.
 
-Note that setup has changed since Debian sarge for which the function
-to call was @code{shell-command-activate-advices} and the variable to
-customize was @code{shell-command-enable-completions}.
-
 @node show-wspace, slang-mode, shell-command, Top
 @chapter show-wspace - highlight whitespaces of various kinds.
 

emacs-goodies-el_31.2-1.diff:
 README.Debian                                 |  341 +++
 README.source                                 |    7 
 changelog                                     | 2550 ++++++++++++++++++++++++++
 compat                                        |    1 
 control                                       |  197 ++
 debbugs-el.copyright                          |    7 
 debian-el.README.Debian                       |   35 
 debian-el.copyright                           |   94 
 debian-el.emacsen-install.in                  |   35 
 debian-el.emacsen-remove.in                   |    5 
 debian-el.emacsen-startup                     |   18 
 debian-el.install                             |    8 
 debian-el.postinst                            |   21 
 debview.copyright                             |    7 
 debview.emacsen-startup                       |    4 
 devscripts-el.README.Debian                   |   36 
 devscripts-el.copyright                       |   23 
 devscripts-el.emacsen-install.in              |   23 
 devscripts-el.emacsen-remove.in               |    5 
 devscripts-el.emacsen-startup                 |   35 
 devscripts-el.install                         |    3 
 dpkg-dev-el.README.Debian                     |   35 
 dpkg-dev-el.copyright                         |   87 
 dpkg-dev-el.emacsen-install.in                |   23 
 dpkg-dev-el.emacsen-remove.in                 |    5 
 dpkg-dev-el.emacsen-startup                   |   18 
 dpkg-dev-el.install                           |    7 
 emacs-goodies-el.copyright                    | 1241 ++++++++++++
 emacs-goodies-el.emacsen-install.in           |   27 
 emacs-goodies-el.emacsen-remove.in            |    5 
 emacs-goodies-el.emacsen-startup              |   19 
 emacs-goodies-el.install                      |   86 
 emacsen-install.template                      |  108 +
 emacsen-remove.template                       |   10 
 gnus-bonus-el.README.Debian                   |   58 
 gnus-bonus-el.copyright                       |  159 +
 gnus-bonus-el.emacsen-install.in              |   27 
 gnus-bonus-el.emacsen-remove.in               |    5 
 gnus-bonus-el.emacsen-startup                 |   42 
 gnus-bonus-el.install                         |   10 
 patches/00list                                |   48 
 patches/3_bar-cursor-customize.dpatch         |  186 +
 patches/50_bar-cursor_bug331430.dpatch        |   19 
 patches/50_browse-kill-ring_bug224751.dpatch  |   40 
 patches/50_coffee_no-autoload.dpatch          |   36 
 patches/50_color-theme_custom.dpatch          |  272 ++
 patches/50_ctypes.dpatch                      |  322 +++
 patches/50_dedicated.dpatch                   |   77 
 patches/50_dict_bug301293.dpatch              |   46 
 patches/50_edit-env_autoload.dpatch           |   36 
 patches/50_filladapt_bug420845.dpatch         |   27 
 patches/50_gnus-BTS.dpatch                    |  192 +
 patches/50_gnus-filterhist.dpatch             |   41 
 patches/50_gnus-pers.dpatch                   |  173 +
 patches/50_joc-toggle-buffer.dpatch           |   99 +
 patches/50_joc-toggle-case.dpatch             |  211 ++
 patches/50_lcomp.dpatch                       |  156 +
 patches/50_maplev_bug528868.dpatch            |   22 
 patches/50_markdown_autoload.dpatch           |   18 
 patches/50_marker-visit_autoloads.dpatch      |   52 
 patches/50_newsticker_non-fatal_xml.dpatch    |   46 
 patches/50_pod_autoload.dpatch                |   18 
 patches/50_projects.dpatch                    |  220 ++
 patches/50_protbuf_custom_and_toggle.dpatch   |  185 +
 patches/50_quack_autoload.dpatch              |  106 +
 patches/50_session_enable_custom.dpatch       |   71 
 patches/50_setnu.dpatch                       |  253 ++
 patches/50_silly-mail.dpatch                  | 1105 +++++++++++
 patches/50_slang-mode_bug336352.dpatch        |   19 
 patches/50_table-add-to-text-mode-hook.dpatch |   55 
 patches/50_todoo_bug220718.dpatch             |   50 
 patches/50_vm-bogofilter.dpatch               |  225 ++
 patches/51_edit-env_copy-list.dpatch          |   36 
 patches/51_gnus-BTS_bug363161.dpatch          |   40 
 patches/51_gnus-pers.dpatch                   |   36 
 patches/51_session_autoload.dpatch            |   36 
 patches/51_todoo_bug267637.dpatch             |   55 
 patches/52_gnus-BTS_bug218286.dpatch          |   66 
 patches/52_gnus-pers.dpatch                   |   38 
 patches/52_todoo_bug414781.dpatch             |   35 
 patches/53_gnus-pers.dpatch                   |   98 
 patches/53_todoo_bug438964.dpatch             |   55 
 patches/54_gnus-pers_bug384209.dpatch         |  150 +
 patches/55_gnus-pers_bug263371.dpatch         |   36 
 patches/5_highlight-beyond-fill-column.dpatch |  205 ++
 patches/6_diminish-defcustom.dpatch           |  177 +
 patches/8_whitespace_rename.dpatch            |  131 +
 patches/9_missing_provide.dpatch              |   44 
 patches/9_whitespace_enable_custom.dpatch     |  226 ++
 rules                                         |   63 
 vm-bonus-el.README.Debian                     |  111 +
 vm-bonus-el.copyright                         |   44 
 vm-bonus-el.emacsen-install.in                |   20 
 vm-bonus-el.emacsen-remove.in                 |    5 
 vm-bonus-el.emacsen-startup                   |   45 
 vm-bonus-el.install                           |    1 
 96 files changed, 11606 insertions(+)

--- NEW FILE emacs-goodies-el_31.2-1.diff ---
--- emacs-goodies-el-31.2.orig/debian/emacsen-remove.template
+++ emacs-goodies-el-31.2/debian/emacsen-remove.template
@@ -0,0 +1,10 @@
+
+if [ ${FLAVOR} != emacs ]; then
+    if test -x /usr/sbin/install-info-altdir; then
+        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
+    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
--- emacs-goodies-el-31.2.orig/debian/compat
+++ emacs-goodies-el-31.2/debian/compat
@@ -0,0 +1 @@
+7
--- emacs-goodies-el-31.2.orig/debian/control
+++ emacs-goodies-el-31.2/debian/control
@@ -0,0 +1,197 @@
+Source: emacs-goodies-el
+Section: editors
+Priority: optional
+Maintainer: Peter S Galbraith <psg at debian.org>
+Build-Depends: debhelper (>= 7), dpatch (>=1.5)
+Build-Depends-Indep: texinfo
+Standards-Version: 3.8.3
+Vcs-Cvs: :pserver:anonymous at cvs.alioth.debian.org:/cvsroot/pkg-goodies-el emacs-goodies-el
+Vcs-Browser: http://alioth.debian.org/scm/viewvc.php/?root=pkg-goodies-el
+
+Package: emacs-goodies-el
+Architecture: all
+Depends: emacs23 | emacsen, bash (>= 2.05a) | bash-static, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Recommends: dict, wget, perl-doc
+Replaces: emacs-goodies-extra-el
+Provides: emacs-goodies-extra-el
+Description: Miscellaneous add-ons for Emacs
+ This package contains:
+  align-string - align string components over several lines;
+  all - edit all lines matching a given regexp;
+  apache-mode - major mode for editing Apache configuration files;
+  ascii - ASCII code display for character under point;
+  auto-fill-inhibit - finer grained control over auto-fill-mode;
+  bar-cursor - change your cursor to a bar instead of a block;
+  boxquote - quote texts in nice boxes;
+  browse-huge-tar - browse tar files without reading them into memory;
+  browse-kill-ring - browse, search, modify the kill ring;
+  clipper - save strings of data for further use;
+  coffee - now Emacs can even brew coffee;
+  color-theme - changes the colors used within Emacs;
+  csv-mode - major mode for comma-separated value files;
+  ctypes - enhanced Font lock support for custom defined types;
+  cua - emulate CUA key bindings (C-z undo, C-x cut, C-c copy, C-v paste);
+  cyclebuffer - select buffer by cycling through;
+  cwebm - a modified CWEB/WEB modified mode;
+  dedicated - make a window dedicated to a single buffer;
+  df - display in the mode line space left on devices;
+  dict - wrapper around the 'dict' command. (Depends on bash and dict)
+  diminish - shorten or erase modeline presence of minor modes;
+  dirvars - provides directory-wide local variables;
+  edit-env - display, edit, delete and add environment variables;
+  egocentric - highlight your name inside emacs buffers;
+  ff-paths - $PATH-like searching in C-x C-f;
+  filladapt - enhances Emacs's built-in adaptive fill;
+  floatbg - slowly modify background color;
+  framepop - display temporary buffers in a dedicated frame;
+  highlight-beyond-fill-column - highlight lines that are too long;
+  highlight-completion - highlight completions in the minibuffer;
+  highlight-current-line - highlight line where the cursor is;
+  home-end - alternative Home and End commands;
+  htmlize - HTML-ize font-lock buffers;
+  initsplit - split customizations into different files;
+  joc-toggle-buffer - fast switching between two buffers;
+  joc-toggle-case - a set of functions to toggle the case of characters;
+  keydef - a simpler way to define key mappings;
+  keywiz - Emacs key sequence quiz;
+  lcomp - list-completion hacks;
+  maplev - major mode for Maple;
+  map-lines - map a command over lines matching a regexp;
+  markdown-mode - major mode for editing Markdown files;
+  marker-visit - navigate through a buffer's marks in order;
+  matlab - major mode for MatLab dot-m files;
+  minibuf-electric -  electric minibuffer behavior from XEmacs;
+  minibuffer-complete-cycle - cycle through the *Completions* buffer;
+  mutt-alias - lookup and insert the expansion of mutt mail aliases;
+  muttrc-mode - major mode for editing Mutt config files;
+  obfusurl - obfuscate an URL;
+  pack-windows - resize all windows to display as much info as possible;
+  perldoc - show help for Perl functions and modules. (Depends on perl-doc)
+  pod-mode - major mode for editing POD files
+  projects - create project-based meaningful buffer names;
+  prot-buf - protect buffers from accidental killing;
+  protocols - perform lookups in /etc/protocols;
+  quack - enhanced support for editing and running Scheme code;
+  rfcview - view IETF RFCs with readability-improved formatting;
+  services - perform lookups in /etc/services;
+  session - saves settings between Emacs invocations and visits to a file;
+  setnu - setnu-mode, a vi-style line number mode;
+  shell-command - enables tab-completion for shell-command;
+  show-wspace - highlight whitespaces of various kinds;
+  silly-mail - generate bozotic mail headers;
+  slang-mode.el - a major-mode for editing S-Lang scripts;
+  sys-apropos - interface for the *nix apropos command;
+  tabbar - Display a tab bar in the header line;
+  tail - "tail -f" a file or a command from within Emacs;
+  tc - cite text with proper filling;
+  thinks - quote texts in cartoon-like think bubbles;
+  tlc - major mode for editing Target Language Compiler scripts;
+  tld - explain top-level domain names;
+  todoo - major mode for editing TODO files;
+  toggle-option - easily toggle frequently toggled options;
+  twiddle - mode line hacks to keep you awake;
+  under - underline a region with ^ characters;
+  wdired - rename files editing their names in dired buffers;
+  xrdb-mode - mode for editing X resource database files.
+ .
+ As well as some packages included or superseded in emacs22 and emacs23 for
+ use in other flavors:
+  cfengine - major mode for editing cfengine scripts;
+  ibuffer - advanced replacement for the `buffer-menu';
+  ido - a faster way to switch buffers and get files;
+  newsticker - a newsticker for Emacs. (Depends on wget)
+  nuke-trailing-whitespace - kill the trailing blanks at end of lines;
+  table - create and edit WYSIWYG text based embedded tables;
+ .
+ See /usr/share/doc/emacs-goodies-el/README.Debian.gz for a short
+ description of all files, or the Info node `emacs-goodies-el' for details.
+
+Package: gnus-bonus-el
+Architecture: all
+Depends: emacs23 | emacsen, gnus | emacs23 | emacs22 | emacs21 | xemacs21 | emacs-snapshot, ${misc:Depends}
+Section: news
+Description: Miscellaneous add-ons for Gnus
+ This package contains a few Emacs-Lisp files, obtained from various
+ sources, including the gnu.emacs.sources newsgroup and a few
+ websites, that provide various functions to Gnus, the Emacs mail and
+ news reader.
+ .
+ This package contains:
+  gnus-eyecandy - enhance the group buffer by adding icons.
+  gnus-filterhist - add a buffer which display the message filtering
+  gnus-junk - semi-automatic replies to junk e-mails;
+  gnus-pers - an alternative to gnus-posting-styles.
+  message-x - customizable completion in message headers;
+  nnir - searchable mail backend;
+  nnnil - empty, read-only backend;
+  nntodo - manage to-do items;
+  spam-stat - spam-detector based on statistics.
+ .
+ See /usr/share/doc/gnus-bonus-el/README.Debian for a short description
+ of all files.
+
+Package: devscripts-el
+Architecture: all
+Depends: emacs23 | emacsen, bash (>= 2.05a), devscripts, dpkg-dev-el, apel, ${misc:Depends}
+Recommends: elserv
+Description: Emacs wrappers for the commands in devscripts
+ This package contains:
+  devscripts - wrappers around the debuild, debc and debi commands;
+  pbuilder-log-view - wrappers around viewing pbuilder logs;
+  pbuilder - wrappers around pbuilder
+ .
+ See /usr/share/doc/devscripts-el/README.Debian for a short description.
+
+Package: debian-el
+Architecture: all
+Depends: emacs23 | emacsen, reportbug (>= 1.41.1), ${misc:Depends}, dpkg (>= 1.15.4) | install-info, bzip2, file
+Recommends: wget, dlocate, groff-base
+Suggests: gnus
+Replaces: debbugs-el, debview
+Provides: debbugs-el, debview
+Section: utils
+Description: Emacs helpers specific to Debian users
+ This package contains:
+ .
+  apt-sources - major mode for editing Debian sources.list files;
+  apt-utils - interface to APT (Debian package management);
+  debian-bug - an Emacs command to submit a bug report;
+  deb-view - view contents of Debian package, similarly to tar-mode;
+  gnus-BTS - provides buttons for bug numbers seen in Gnus messages;
+  preseed - major mode for editing debian-installer preseed files.
+ .
+ See /usr/share/doc/debian-el/README.Debian for a short description of
+ all files, or the Info node `debian-el' for details.
+
+Package: dpkg-dev-el
+Architecture: all
+Depends: emacs23 | emacsen, debian-el (>= 24.0-1), ${misc:Depends}
+Suggests: dpkg-dev
+Recommends: wget
+Conflicts: dpkg-dev (<< 1.7.2)
+Section: utils
+Description: Emacs helpers specific to Debian development
+ This package contains:
+ .
+  debian-bts-control - builds control at bugs.debian.org email messages;
+  debian-changelog-mode - a helper mode for Debian changelogs;
+  debian-control-mode - a helper mode for debian/control files;
+  debian-copyright - major mode for Debian package copyright files;
[...11495 lines suppressed...]
+ ;;; ChangeLog:
+ 
++;; 2004-11-24 Peter S Galbraith <psg at debian.org>
++;;  Debian bug 267637 fix: changes to outline-regexp should be buffer-local.
++;;  Thanks to Daniel Skarda <0rfelyus at hobitin.ucw.cz> for pointing it out.
++
+ ;; 1.2 - Fixed bug in menu (todoo-show->todoo)
+ ;;       Fixed bug when deleting window in todoo-save-and-exit
+ ;;       Added early sub-item support (might be buggy, but still
+@@ -512,10 +516,11 @@
+   (make-local-variable 'font-lock-defaults)
+   (setq font-lock-defaults '(todoo-font-lock-keywords t))
+ 
+-  (setq outline-regexp (concat "^\\(" (regexp-quote todoo-item-marker) " \\|"
+-			       (regexp-quote todoo-item-marker-assigned) 
+-			       " \\|[ ]*" (regexp-quote todoo-sub-item-marker)
+-			       " \\)"))
++  (set (make-local-variable 'outline-regexp)
++        (concat "^\\(" (regexp-quote todoo-item-marker) " \\|"
++                (regexp-quote todoo-item-marker-assigned) 
++                " \\|[ ]*" (regexp-quote todoo-sub-item-marker)
++                " \\)"))
+ 
+   (outline-minor-mode 1)
+ 
--- emacs-goodies-el-31.2.orig/debian/patches/00list
+++ emacs-goodies-el-31.2/debian/patches/00list
@@ -0,0 +1,48 @@
+3_bar-cursor-customize
+5_highlight-beyond-fill-column
+6_diminish-defcustom
+8_whitespace_rename
+9_whitespace_enable_custom
+9_missing_provide
+50_bar-cursor_bug331430
+50_browse-kill-ring_bug224751
+50_ctypes
+50_coffee_no-autoload
+50_color-theme_custom
+50_dedicated
+50_dict_bug301293
+50_edit-env_autoload
+51_edit-env_copy-list
+50_filladapt_bug420845
+50_gnus-BTS
+51_gnus-BTS_bug363161
+52_gnus-BTS_bug218286
+50_gnus-filterhist
+50_gnus-pers
+51_gnus-pers
+52_gnus-pers
+53_gnus-pers
+54_gnus-pers_bug384209
+55_gnus-pers_bug263371
+50_joc-toggle-case
+50_joc-toggle-buffer
+50_lcomp
+50_maplev_bug528868
+50_marker-visit_autoloads
+50_newsticker_non-fatal_xml
+50_session_enable_custom
+51_session_autoload
+50_silly-mail
+50_slang-mode_bug336352
+50_protbuf_custom_and_toggle
+50_table-add-to-text-mode-hook
+50_todoo_bug220718
+51_todoo_bug267637
+52_todoo_bug414781
+53_todoo_bug438964
+50_setnu
+50_projects
+50_markdown_autoload
+50_pod_autoload
+50_quack_autoload
+50_vm-bogofilter
--- emacs-goodies-el-31.2.orig/debian/patches/9_missing_provide.dpatch
+++ emacs-goodies-el-31.2/debian/patches/9_missing_provide.dpatch
@@ -0,0 +1,44 @@
+#!/bin/sh -e
+## 9_missing_provide.dpatch.dpatch by Peter S Galbraith <psg at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/align-string.el emacs-goodies-el/elisp/emacs-goodies-el/align-string.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/align-string.el	2001-11-08 07:26:56.000000000 -0500
++++ emacs-goodies-el/elisp/emacs-goodies-el/align-string.el	2009-09-03 09:53:49.000000000 -0400
+@@ -98,3 +98,5 @@
+ 	  (setq i (1+ i)))))
+     ;; Clear end marker.
+     (set-marker end nil)))
++
++(provide 'align-string)
++;;; align-string.el ends here
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/cyclebuffer.el emacs-goodies-el/elisp/emacs-goodies-el/cyclebuffer.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/cyclebuffer.el	2009-07-17 16:53:08.000000000 -0400
++++ emacs-goodies-el/elisp/emacs-goodies-el/cyclebuffer.el	2009-09-03 09:52:08.000000000 -0400
+@@ -105,3 +105,5 @@
+ visited buffers."
+   (interactive)
+   (cyclebuffer-forward -1))
++
++(provide 'cyclebuffer)
--- emacs-goodies-el-31.2.orig/debian/patches/52_todoo_bug414781.dpatch
+++ emacs-goodies-el-31.2/debian/patches/52_todoo_bug414781.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_todoo_bug414781.dpatch by  <psg at mixed.dyndns.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/todoo.el emacs-goodies-el/elisp/emacs-goodies-el/todoo.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/todoo.el	2007-05-14 19:17:52.000000000 -0400
++++ emacs-goodies-el/elisp/emacs-goodies-el/todoo.el	2007-05-14 19:20:51.000000000 -0400
+@@ -57,6 +57,11 @@
+ 
+ ;;; ChangeLog:
+ 
++;; 2007-05-14 Peter S Galbraith <psg at debian.org>
++;;  Comment out clobbering of outline-mode-menu-bar-map key entries.
++;;  This is far too aggressive.  A much better fix would be to undefine the
++;;  keys for todoo-mode-map.  Thanks to Simon Pepping (Closes #144781).
++
+ ;; 2004-11-24 Peter S Galbraith <psg at debian.org>
+ ;;  Debian bug 267637 fix: changes to outline-regexp should be buffer-local.
+ ;;  Thanks to Daniel Skarda <0rfelyus at hobitin.ucw.cz> for pointing it out.
+@@ -524,9 +529,9 @@
+ 
+   (outline-minor-mode 1)
+ 
+-  (define-key outline-mode-menu-bar-map [headings] 'undefined)
+-  (define-key outline-mode-menu-bar-map [hide] 'undefined)
+-  (define-key outline-mode-menu-bar-map [show] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [headings] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [hide] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [show] 'undefined)
+ 
+   (if todoo-collapse-items
+       (hide-body))
--- emacs-goodies-el-31.2.orig/debian/patches/50_edit-env_autoload.dpatch
+++ emacs-goodies-el-31.2/debian/patches/50_edit-env_autoload.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_edit-env_autoload.dpatch by Peter S Galbraith <psg at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add autoload.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/psg/emacs/emacs-goodies-el/newfiles/emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el
+--- /home/psg/emacs/emacs-goodies-el/newfiles/emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el	2003-11-12 20:17:21.000000000 -0500
++++ emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el	2003-11-14 15:00:01.000000000 -0500
+@@ -111,6 +111,7 @@
+ 	       (list (widget-get widget 'environment-variable-name)
+ 		     widget)))
+   
++;;;###autoload
+ (defun edit-env ()
+   "Display, edit, delete and add environment variables."
+   (interactive)


--- NEW FILE emacs-goodies.spec ---
%global pkg emacs-goodies
%global pkgname Emacs-goodies
%global goodies_dir %{buildroot}%{emacs_lispdir}/goodies/
%global gnus_dir %{buildroot}%{emacs_lispdir}/gnus-bonus/
%global installinfo /sbin/install-info

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif


Name:		%{pkg}
Version:	31.2
Release:	3%{?dist}
Summary:	Miscellaneous add-ons for Emacs

Group:		Applications/Editors
License:	GPLv2+ and GPLv3
URL:		http://packages.debian.org/sid/lisp/emacs-goodies-el
Source0:	http://ftp.at.debian.org/debian/pool/main/e/emacs-goodies-el/emacs-goodies-el_31.2.orig.tar.gz
#Patch which adjusts debian specific information to fedora in texi file
Patch0:		emacs-goodies-el.texi.patch
#Upstream patch http://ftp.de.debian.org/debian/pool/main/e/emacs-goodies-el/emacs-goodies-el_31.2-1.diff.gz
Patch1:		emacs-goodies-el_31.2-1.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el texinfo
Requires:	emacs(bin) >= %{emacs_version}
		
%description
This is %{pkgname} %{version}, provides add-ons for GNU Emacs and gnus.

%package el
Summary:	Elisp source files for %{pkgname}
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%setup -q -n %{pkg}-el-%{version}
%patch0 -p1 -b .fix
%patch1 -p1
%{__cp} debian/patches/* .
while read -r line
do
	patch -p1 <$line.dpatch
done < 00list
%{__rm} -rf elisp/debian-el/
%{__rm} -rf elisp/dpkg-dev-el/
%{__rm} -rf elisp/devscripts-el/

%build
%{__mkdir} -p elisp/%{pkg}-el/info
cd elisp/%{pkg}-el/
%{__chmod} +x %{pkg}-loaddefs.make
./%{pkg}-loaddefs.make
emacs --no-site-file --batch --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile *.el
makeinfo emacs-goodies-el.texi
iconv -f iso8859-1 -t utf-8 info/emacs-goodies > info/emacs-goodies.utf
%{__mv} info/emacs-goodies.utf info/emacs-goodies
cd ../gnus-bonus-el/
emacs --no-site-file --batch --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile *.el

%install
rm -rf %{buildroot}
%{__install} -pm 755 -d %{goodies_dir}
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}
%{__install} -pm 644 elisp/%{pkg}-el/%{pkg}-loaddefs.el %{buildroot}%{emacs_startdir}
%{__install} -pm 644 elisp/%{pkg}-el/*.elc %{goodies_dir}
%{__install} -pm 644 elisp/%{pkg}-el/*.el %{goodies_dir}
%{__install} -pm 755 -d %{gnus_dir}
%{__install} -pm 644 elisp/gnus-bonus-el/*.elc %{gnus_dir}
%{__install} -pm 644 elisp/gnus-bonus-el/*.el %{gnus_dir}
%{__install} -pm 755 -d %{buildroot}%{_infodir}/
%{__install} -pm 644 elisp/%{pkg}-el/info/%{pkg} %{buildroot}%{_infodir}/

%clean
%{__rm} -rf %{buildroot}


%post
%{installinfo} %{_infodir}/%{pkg} %{_infodir}/dir


%preun
if [ "$1" = 0 ]; then
    %{installinfo} --delete %{_infodir}/%{pkg} %{_infodir}/dir
fi


%files
%defattr(-,root,root,-)
%{emacs_lispdir}/goodies/*.elc
%{emacs_startdir}/emacs-goodies-loaddefs.el
%{emacs_lispdir}/gnus-bonus/*.elc
%{_infodir}/%{pkg}.gz
%dir %{emacs_lispdir}/goodies
%dir %{emacs_lispdir}/gnus-bonus

%files el
%defattr(-,root,root,-)
%doc COPYING-GPL-v2 COPYING-GPL-v3
%{emacs_lispdir}/goodies/*.el
%{emacs_lispdir}/gnus-bonus/*.el

%changelog
* Wed Dec 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-3
- License adjusted to GPLv2+ and GPLv3

* Mon Dec 14 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-2
- Comment on  patches added

* Fri Dec 4 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-1
- Updated to version 31.2-1

* Thu Nov 26 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.1-1
- Updated to version 31.1-1

* Sun Nov 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.11-1
- Updated to version 30.11-1

* Fri Oct 30 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.8-2
- Upstream patches are applied

* Thu Oct 22 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.8-1
- Updated to 30.8-1
- License corrected to GPLv2+

* Tue Sep 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.5-1
- Initial release 30.5-1


--- NEW FILE import.log ---
emacs-goodies-31_2-3_fc12:F-11:emacs-goodies-31.2-3.fc12.src.rpm:1261534559


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-goodies/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:07:02 -0000	1.1
+++ .cvsignore	23 Dec 2009 02:17:47 -0000	1.2
@@ -0,0 +1 @@
+emacs-goodies-el_31.2.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-goodies/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:07:02 -0000	1.1
+++ sources	23 Dec 2009 02:17:47 -0000	1.2
@@ -0,0 +1 @@
+ec409b4628c2c9a4f9789cb7fb570271  emacs-goodies-el_31.2.orig.tar.gz



From sagarun at fedoraproject.org  Wed Dec 23 02:23:30 2009
From: sagarun at fedoraproject.org (Arun SAG)
Date: Wed, 23 Dec 2009 02:23:30 +0000 (UTC)
Subject: rpms/emacs-goodies/F-12 emacs-goodies-el.texi.patch, NONE,
	1.1 emacs-goodies-el_31.2-1.diff, NONE, 1.1 emacs-goodies.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223022330.B9F4411C00E9@cvs1.fedora.phx.redhat.com>

Author: sagarun

Update of /cvs/pkgs/rpms/emacs-goodies/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9189/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-goodies-el.texi.patch emacs-goodies-el_31.2-1.diff 
	emacs-goodies.spec import.log 
Log Message:
New package emacs goodies


emacs-goodies-el.texi.patch:
 emacs-goodies-el.texi |   50 ++++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

--- NEW FILE emacs-goodies-el.texi.patch ---
diff -up ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix ./elisp/emacs-goodies-el/emacs-goodies-el.texi
--- ./elisp/emacs-goodies-el/emacs-goodies-el.texi.fix	2009-12-04 08:05:29.000000000 +0530
+++ ./elisp/emacs-goodies-el/emacs-goodies-el.texi	2009-12-04 09:03:31.000000000 +0530
@@ -3,14 +3,14 @@
 
 @c $Id: emacs-goodies-el.texi,v 1.85 2009-12-03 03:55:59 psg Exp $
 @c %**start of header
- at setfilename info/emacs-goodies-el
- at settitle Emacs-Goodies-el
+ at setfilename info/emacs-goodies
+ at settitle Emacs-Goodies
 @documentencoding ISO-8859-1
 @c %**end of header
 
 @dircategory Emacs
 @direntry
-* Emacs-Goodies-el: (emacs-goodies-el). Miscellaneous add-ons for Emacs
+* Emacs-Goodies: (emacs-goodies). Miscellaneous add-ons for Emacs
 @end direntry
 
 @c Version variables.
@@ -19,27 +19,25 @@
 
 @ifinfo
 This is Edition @value{EDITION}, last updated @value{UPDATED}, of
- at cite{Emacs-Goodies-el}.
+ at cite{Emacs-Goodies}.
 @end ifinfo
 
 @titlepage
- at title Emacs-Goodies-el: Miscellaneous add-ons for Emacs
+ at title Emacs-Goodies: Miscellaneous add-ons for Emacs
 @subtitle A manual for what's in this package.
 @author Peter S. Galbraith
 @end titlepage
 
 @node Top, align-string, (dir), (dir)
- at top The Emacs-Goodies-el Package Setup
+ at top The Emacs-Goodies Package Setup
 
-This manual describes the Emacs-Goodies-el package and its setup.  A
-quick descriptions of elisp files contained in this package can be found
-in the file @file{/usr/share/doc/emacs-goodies-el/README.Debian.gz}.
+This manual describes the emacs-goodies package and its setup.
 
 All packaged files are installed, setup and ready to use if they don't
 override standard Emacs commands, modes, or settings.
 
 Some extra package installation and setup is done if you customize the
-variable @code{emacs-goodies-el-defaults} to t (its aggressive state).
+variable @code{emacs-goodies-defaults} to t (its aggressive state).
 These will override standard Emacs defaults, but in a good
 (uncontroversial) way.  The affected packages are currently only:
 @ref{ff-paths}, @ref{home-end} and @ref{ibuffer}.  Packages which
@@ -49,7 +47,7 @@ require activation in order to function 
 To customize setup of all customizable packages on a finer-grain
 basis, do:
 @example
- at kbd{M-x} customize-group @key{RET} emacs-goodies-el @key{RET}
+ at kbd{M-x} customize-group @key{RET} emacs-goodies @key{RET}
 @end example
 
 In the following document, when we speak of customizing a variable, we
@@ -58,7 +56,7 @@ mean to use the Emacs custom interface, 
 @kbd{M-x} customize-variable @key{RET} some-variable @key{RET}
 @end example
 When we speak of customizing a group, it's as the example above for the
-group @code{emacs-goodies-el}.
+group @code{emacs-goodies}.
 
 The following files are documented so far.  Eventually, all files will
 be documented.
@@ -190,7 +188,7 @@ table - Create and edit WYSIWYG text bas
 @end menu
 
 This work compiles GPL'ed documentation from the various elisp files
-in /usr/share/emacs/site-lisp/emacs-goodies-el/.  As a derived work
+in /usr/share/emacs/site-lisp/emacs-goodies/.  As a derived work
 from GPL'ed works, this text is also licensed under the GPL V2 (See
 /usr/share/common-licenses/GPL-2) and is edited by Peter S. Galbraith
 @email{psg@@debian.org}.
@@ -200,7 +198,7 @@ section for usage, but be advised that I
 because I intend to change it.
 
 @table @samp
- at item /usr/share/emacs/site-lisp/emacs-goodies-el/initsplit.el
+ at item /usr/share/emacs/site-lisp/emacs-goodies/initsplit.el
 code to split customizations into different files
 @end table
 
@@ -316,7 +314,7 @@ easily though only globally (hence the q
 
 To enable it, customize the variable @code{bar-cursor-mode}.
 
-It is also listed when you customize the group @code{emacs-goodies-el}.
+It is also listed when you customize the group @code{emacs-goodies}.
 
 @node boxquote, browse-huge-tar, bar-cursor, Top
 @chapter boxquote - Quote text with a semi-box.
@@ -399,7 +397,7 @@ Here is code (from him) to do this:
 (ad-activate 'yank-pop)
 @end example
 
-(The emacs-goodies-el package could add a customizable variable to
+(The emacs-goodies package could add a customizable variable to
 set this up.  Ask if this would be useful. - @email{psg@@debian.org})
 
 Note that the command keeps track of the last window displayed to
@@ -474,12 +472,12 @@ You can probably guess how coffee.el cam
 everything but make coffee ...yadda yadda ...
 @end quotation
 
-To do anything at all on emacs21, coffee requires the Debian packages
+To do anything at all on emacs21, coffee requires the packages
 @file{w3-el} and @file{w3-url-e21} to be installed.  Then it will
 prompt for coffee and sweetener type.  Then @code{url-retrieve} will
 fail since it doesn't really support the coffee URL type.  So...
 this package is really an elaborate joke.  Because of this, it's
-longer autoloaded in Debian.  To try, do:
+longer autoloaded.  To try, do:
 
 @example
 M-x load-library coffee
@@ -610,7 +608,7 @@ by default.
 
 @noindent Author: Anders Lindgren <andersl@@andersl.com>
 
-To activate this package in the Debian emacs-goodies-el package,
+To activate this package in emacs-goodies package,
 customize the group @code{ctypes}, toggle on the variable
 @code{ctypes-install} and save for future seesions.  This will enable
 the package.  Then start by using @command{ctypes-buffer} in a C file.
@@ -944,7 +942,7 @@ customisation variables described below.
 @key{C-c d w} for running wordinspect GUI dict client.
 @end itemize
 
-The Debian emacs-goodies-el package doesn't setup these keys by
+The  emacs-goodies package doesn't setup these keys by
 default.  The first time you use @code{dict} in a session you must do
 so manually with @code{M-x dict}.  Thereafter the keybindings will
 work.  If someone requests it, a customization variable could be added
@@ -1192,7 +1190,7 @@ To use it, customize the variable @code{
 To also enable ffap, customize the variable @code{ff-paths-use-ffap}.
 
 Both of the above are enabled if you customize the variable
- at code{emacs-goodies-el-defaults} to t (its aggressive state).
+ at code{emacs-goodies-defaults} to t (its aggressive state).
 
 You may alter various settings of @code{ff-paths} using the
 customization group @code{ff-paths}.
@@ -2192,7 +2190,7 @@ configuration:
 Remember, you can switch between formats using
 @code{ibuffer-switch-format}, bound to @key{`} by default.
 
-In emacs-goodies-el, you can use the customize interface to bind
+In emacs-goodies, you can use the customize interface to bind
 @code{ibuffer} to @key{\C-x\C-b} by customizing the variable
 @code{ibuffer-enable}.
 
@@ -2794,7 +2792,7 @@ or insert the following snippet of code 
  (add-to-list 'auto-mode-alist '("\\.m$" . matlab-mode))
 @end example
 
-or, in Debian, customize the variable @code{matlab-auto-mode} to
+or, customize the variable @code{matlab-auto-mode} to
 associated the .m file extention to matlab-mode.
 
 Additional features include auto-fill including auto-additions of
@@ -3259,7 +3257,7 @@ never modified, and you can see the raw 
 You may customize some aspects of this package using @command{M-x
 customize-group rfcview}.
 
-The emacs-goodies-el package sets up Emacs to enter
+The emacs-goodies package sets up Emacs to enter
 @command{rfcview-mode} automatically when reading such a file (as
 recognised by the filename).
 
@@ -3473,10 +3471,6 @@ Or alternatively, customize the group @c
 the variable @code{shell-command-completion-mode} and save the setting
 for future sessions.
 
-Note that setup has changed since Debian sarge for which the function
-to call was @code{shell-command-activate-advices} and the variable to
-customize was @code{shell-command-enable-completions}.
-
 @node show-wspace, slang-mode, shell-command, Top
 @chapter show-wspace - highlight whitespaces of various kinds.
 

emacs-goodies-el_31.2-1.diff:
 README.Debian                                 |  341 +++
 README.source                                 |    7 
 changelog                                     | 2550 ++++++++++++++++++++++++++
 compat                                        |    1 
 control                                       |  197 ++
 debbugs-el.copyright                          |    7 
 debian-el.README.Debian                       |   35 
 debian-el.copyright                           |   94 
 debian-el.emacsen-install.in                  |   35 
 debian-el.emacsen-remove.in                   |    5 
 debian-el.emacsen-startup                     |   18 
 debian-el.install                             |    8 
 debian-el.postinst                            |   21 
 debview.copyright                             |    7 
 debview.emacsen-startup                       |    4 
 devscripts-el.README.Debian                   |   36 
 devscripts-el.copyright                       |   23 
 devscripts-el.emacsen-install.in              |   23 
 devscripts-el.emacsen-remove.in               |    5 
 devscripts-el.emacsen-startup                 |   35 
 devscripts-el.install                         |    3 
 dpkg-dev-el.README.Debian                     |   35 
 dpkg-dev-el.copyright                         |   87 
 dpkg-dev-el.emacsen-install.in                |   23 
 dpkg-dev-el.emacsen-remove.in                 |    5 
 dpkg-dev-el.emacsen-startup                   |   18 
 dpkg-dev-el.install                           |    7 
 emacs-goodies-el.copyright                    | 1241 ++++++++++++
 emacs-goodies-el.emacsen-install.in           |   27 
 emacs-goodies-el.emacsen-remove.in            |    5 
 emacs-goodies-el.emacsen-startup              |   19 
 emacs-goodies-el.install                      |   86 
 emacsen-install.template                      |  108 +
 emacsen-remove.template                       |   10 
 gnus-bonus-el.README.Debian                   |   58 
 gnus-bonus-el.copyright                       |  159 +
 gnus-bonus-el.emacsen-install.in              |   27 
 gnus-bonus-el.emacsen-remove.in               |    5 
 gnus-bonus-el.emacsen-startup                 |   42 
 gnus-bonus-el.install                         |   10 
 patches/00list                                |   48 
 patches/3_bar-cursor-customize.dpatch         |  186 +
 patches/50_bar-cursor_bug331430.dpatch        |   19 
 patches/50_browse-kill-ring_bug224751.dpatch  |   40 
 patches/50_coffee_no-autoload.dpatch          |   36 
 patches/50_color-theme_custom.dpatch          |  272 ++
 patches/50_ctypes.dpatch                      |  322 +++
 patches/50_dedicated.dpatch                   |   77 
 patches/50_dict_bug301293.dpatch              |   46 
 patches/50_edit-env_autoload.dpatch           |   36 
 patches/50_filladapt_bug420845.dpatch         |   27 
 patches/50_gnus-BTS.dpatch                    |  192 +
 patches/50_gnus-filterhist.dpatch             |   41 
 patches/50_gnus-pers.dpatch                   |  173 +
 patches/50_joc-toggle-buffer.dpatch           |   99 +
 patches/50_joc-toggle-case.dpatch             |  211 ++
 patches/50_lcomp.dpatch                       |  156 +
 patches/50_maplev_bug528868.dpatch            |   22 
 patches/50_markdown_autoload.dpatch           |   18 
 patches/50_marker-visit_autoloads.dpatch      |   52 
 patches/50_newsticker_non-fatal_xml.dpatch    |   46 
 patches/50_pod_autoload.dpatch                |   18 
 patches/50_projects.dpatch                    |  220 ++
 patches/50_protbuf_custom_and_toggle.dpatch   |  185 +
 patches/50_quack_autoload.dpatch              |  106 +
 patches/50_session_enable_custom.dpatch       |   71 
 patches/50_setnu.dpatch                       |  253 ++
 patches/50_silly-mail.dpatch                  | 1105 +++++++++++
 patches/50_slang-mode_bug336352.dpatch        |   19 
 patches/50_table-add-to-text-mode-hook.dpatch |   55 
 patches/50_todoo_bug220718.dpatch             |   50 
 patches/50_vm-bogofilter.dpatch               |  225 ++
 patches/51_edit-env_copy-list.dpatch          |   36 
 patches/51_gnus-BTS_bug363161.dpatch          |   40 
 patches/51_gnus-pers.dpatch                   |   36 
 patches/51_session_autoload.dpatch            |   36 
 patches/51_todoo_bug267637.dpatch             |   55 
 patches/52_gnus-BTS_bug218286.dpatch          |   66 
 patches/52_gnus-pers.dpatch                   |   38 
 patches/52_todoo_bug414781.dpatch             |   35 
 patches/53_gnus-pers.dpatch                   |   98 
 patches/53_todoo_bug438964.dpatch             |   55 
 patches/54_gnus-pers_bug384209.dpatch         |  150 +
 patches/55_gnus-pers_bug263371.dpatch         |   36 
 patches/5_highlight-beyond-fill-column.dpatch |  205 ++
 patches/6_diminish-defcustom.dpatch           |  177 +
 patches/8_whitespace_rename.dpatch            |  131 +
 patches/9_missing_provide.dpatch              |   44 
 patches/9_whitespace_enable_custom.dpatch     |  226 ++
 rules                                         |   63 
 vm-bonus-el.README.Debian                     |  111 +
 vm-bonus-el.copyright                         |   44 
 vm-bonus-el.emacsen-install.in                |   20 
 vm-bonus-el.emacsen-remove.in                 |    5 
 vm-bonus-el.emacsen-startup                   |   45 
 vm-bonus-el.install                           |    1 
 96 files changed, 11606 insertions(+)

--- NEW FILE emacs-goodies-el_31.2-1.diff ---
--- emacs-goodies-el-31.2.orig/debian/emacsen-remove.template
+++ emacs-goodies-el-31.2/debian/emacsen-remove.template
@@ -0,0 +1,10 @@
+
+if [ ${FLAVOR} != emacs ]; then
+    if test -x /usr/sbin/install-info-altdir; then
+        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
+    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
--- emacs-goodies-el-31.2.orig/debian/compat
+++ emacs-goodies-el-31.2/debian/compat
@@ -0,0 +1 @@
+7
--- emacs-goodies-el-31.2.orig/debian/control
+++ emacs-goodies-el-31.2/debian/control
@@ -0,0 +1,197 @@
+Source: emacs-goodies-el
+Section: editors
+Priority: optional
+Maintainer: Peter S Galbraith <psg at debian.org>
+Build-Depends: debhelper (>= 7), dpatch (>=1.5)
+Build-Depends-Indep: texinfo
+Standards-Version: 3.8.3
+Vcs-Cvs: :pserver:anonymous at cvs.alioth.debian.org:/cvsroot/pkg-goodies-el emacs-goodies-el
+Vcs-Browser: http://alioth.debian.org/scm/viewvc.php/?root=pkg-goodies-el
+
+Package: emacs-goodies-el
+Architecture: all
+Depends: emacs23 | emacsen, bash (>= 2.05a) | bash-static, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Recommends: dict, wget, perl-doc
+Replaces: emacs-goodies-extra-el
+Provides: emacs-goodies-extra-el
+Description: Miscellaneous add-ons for Emacs
+ This package contains:
+  align-string - align string components over several lines;
+  all - edit all lines matching a given regexp;
+  apache-mode - major mode for editing Apache configuration files;
+  ascii - ASCII code display for character under point;
+  auto-fill-inhibit - finer grained control over auto-fill-mode;
+  bar-cursor - change your cursor to a bar instead of a block;
+  boxquote - quote texts in nice boxes;
+  browse-huge-tar - browse tar files without reading them into memory;
+  browse-kill-ring - browse, search, modify the kill ring;
+  clipper - save strings of data for further use;
+  coffee - now Emacs can even brew coffee;
+  color-theme - changes the colors used within Emacs;
+  csv-mode - major mode for comma-separated value files;
+  ctypes - enhanced Font lock support for custom defined types;
+  cua - emulate CUA key bindings (C-z undo, C-x cut, C-c copy, C-v paste);
+  cyclebuffer - select buffer by cycling through;
+  cwebm - a modified CWEB/WEB modified mode;
+  dedicated - make a window dedicated to a single buffer;
+  df - display in the mode line space left on devices;
+  dict - wrapper around the 'dict' command. (Depends on bash and dict)
+  diminish - shorten or erase modeline presence of minor modes;
+  dirvars - provides directory-wide local variables;
+  edit-env - display, edit, delete and add environment variables;
+  egocentric - highlight your name inside emacs buffers;
+  ff-paths - $PATH-like searching in C-x C-f;
+  filladapt - enhances Emacs's built-in adaptive fill;
+  floatbg - slowly modify background color;
+  framepop - display temporary buffers in a dedicated frame;
+  highlight-beyond-fill-column - highlight lines that are too long;
+  highlight-completion - highlight completions in the minibuffer;
+  highlight-current-line - highlight line where the cursor is;
+  home-end - alternative Home and End commands;
+  htmlize - HTML-ize font-lock buffers;
+  initsplit - split customizations into different files;
+  joc-toggle-buffer - fast switching between two buffers;
+  joc-toggle-case - a set of functions to toggle the case of characters;
+  keydef - a simpler way to define key mappings;
+  keywiz - Emacs key sequence quiz;
+  lcomp - list-completion hacks;
+  maplev - major mode for Maple;
+  map-lines - map a command over lines matching a regexp;
+  markdown-mode - major mode for editing Markdown files;
+  marker-visit - navigate through a buffer's marks in order;
+  matlab - major mode for MatLab dot-m files;
+  minibuf-electric -  electric minibuffer behavior from XEmacs;
+  minibuffer-complete-cycle - cycle through the *Completions* buffer;
+  mutt-alias - lookup and insert the expansion of mutt mail aliases;
+  muttrc-mode - major mode for editing Mutt config files;
+  obfusurl - obfuscate an URL;
+  pack-windows - resize all windows to display as much info as possible;
+  perldoc - show help for Perl functions and modules. (Depends on perl-doc)
+  pod-mode - major mode for editing POD files
+  projects - create project-based meaningful buffer names;
+  prot-buf - protect buffers from accidental killing;
+  protocols - perform lookups in /etc/protocols;
+  quack - enhanced support for editing and running Scheme code;
+  rfcview - view IETF RFCs with readability-improved formatting;
+  services - perform lookups in /etc/services;
+  session - saves settings between Emacs invocations and visits to a file;
+  setnu - setnu-mode, a vi-style line number mode;
+  shell-command - enables tab-completion for shell-command;
+  show-wspace - highlight whitespaces of various kinds;
+  silly-mail - generate bozotic mail headers;
+  slang-mode.el - a major-mode for editing S-Lang scripts;
+  sys-apropos - interface for the *nix apropos command;
+  tabbar - Display a tab bar in the header line;
+  tail - "tail -f" a file or a command from within Emacs;
+  tc - cite text with proper filling;
+  thinks - quote texts in cartoon-like think bubbles;
+  tlc - major mode for editing Target Language Compiler scripts;
+  tld - explain top-level domain names;
+  todoo - major mode for editing TODO files;
+  toggle-option - easily toggle frequently toggled options;
+  twiddle - mode line hacks to keep you awake;
+  under - underline a region with ^ characters;
+  wdired - rename files editing their names in dired buffers;
+  xrdb-mode - mode for editing X resource database files.
+ .
+ As well as some packages included or superseded in emacs22 and emacs23 for
+ use in other flavors:
+  cfengine - major mode for editing cfengine scripts;
+  ibuffer - advanced replacement for the `buffer-menu';
+  ido - a faster way to switch buffers and get files;
+  newsticker - a newsticker for Emacs. (Depends on wget)
+  nuke-trailing-whitespace - kill the trailing blanks at end of lines;
+  table - create and edit WYSIWYG text based embedded tables;
+ .
+ See /usr/share/doc/emacs-goodies-el/README.Debian.gz for a short
+ description of all files, or the Info node `emacs-goodies-el' for details.
+
+Package: gnus-bonus-el
+Architecture: all
+Depends: emacs23 | emacsen, gnus | emacs23 | emacs22 | emacs21 | xemacs21 | emacs-snapshot, ${misc:Depends}
+Section: news
+Description: Miscellaneous add-ons for Gnus
+ This package contains a few Emacs-Lisp files, obtained from various
+ sources, including the gnu.emacs.sources newsgroup and a few
+ websites, that provide various functions to Gnus, the Emacs mail and
+ news reader.
+ .
+ This package contains:
+  gnus-eyecandy - enhance the group buffer by adding icons.
+  gnus-filterhist - add a buffer which display the message filtering
+  gnus-junk - semi-automatic replies to junk e-mails;
+  gnus-pers - an alternative to gnus-posting-styles.
+  message-x - customizable completion in message headers;
+  nnir - searchable mail backend;
+  nnnil - empty, read-only backend;
+  nntodo - manage to-do items;
+  spam-stat - spam-detector based on statistics.
+ .
+ See /usr/share/doc/gnus-bonus-el/README.Debian for a short description
+ of all files.
+
+Package: devscripts-el
+Architecture: all
+Depends: emacs23 | emacsen, bash (>= 2.05a), devscripts, dpkg-dev-el, apel, ${misc:Depends}
+Recommends: elserv
+Description: Emacs wrappers for the commands in devscripts
+ This package contains:
+  devscripts - wrappers around the debuild, debc and debi commands;
+  pbuilder-log-view - wrappers around viewing pbuilder logs;
+  pbuilder - wrappers around pbuilder
+ .
+ See /usr/share/doc/devscripts-el/README.Debian for a short description.
+
+Package: debian-el
+Architecture: all
+Depends: emacs23 | emacsen, reportbug (>= 1.41.1), ${misc:Depends}, dpkg (>= 1.15.4) | install-info, bzip2, file
+Recommends: wget, dlocate, groff-base
+Suggests: gnus
+Replaces: debbugs-el, debview
+Provides: debbugs-el, debview
+Section: utils
+Description: Emacs helpers specific to Debian users
+ This package contains:
+ .
+  apt-sources - major mode for editing Debian sources.list files;
+  apt-utils - interface to APT (Debian package management);
+  debian-bug - an Emacs command to submit a bug report;
+  deb-view - view contents of Debian package, similarly to tar-mode;
+  gnus-BTS - provides buttons for bug numbers seen in Gnus messages;
+  preseed - major mode for editing debian-installer preseed files.
+ .
+ See /usr/share/doc/debian-el/README.Debian for a short description of
+ all files, or the Info node `debian-el' for details.
+
+Package: dpkg-dev-el
+Architecture: all
+Depends: emacs23 | emacsen, debian-el (>= 24.0-1), ${misc:Depends}
+Suggests: dpkg-dev
+Recommends: wget
+Conflicts: dpkg-dev (<< 1.7.2)
+Section: utils
+Description: Emacs helpers specific to Debian development
+ This package contains:
+ .
+  debian-bts-control - builds control at bugs.debian.org email messages;
+  debian-changelog-mode - a helper mode for Debian changelogs;
+  debian-control-mode - a helper mode for debian/control files;
+  debian-copyright - major mode for Debian package copyright files;
[...11495 lines suppressed...]
+ ;;; ChangeLog:
+ 
++;; 2004-11-24 Peter S Galbraith <psg at debian.org>
++;;  Debian bug 267637 fix: changes to outline-regexp should be buffer-local.
++;;  Thanks to Daniel Skarda <0rfelyus at hobitin.ucw.cz> for pointing it out.
++
+ ;; 1.2 - Fixed bug in menu (todoo-show->todoo)
+ ;;       Fixed bug when deleting window in todoo-save-and-exit
+ ;;       Added early sub-item support (might be buggy, but still
+@@ -512,10 +516,11 @@
+   (make-local-variable 'font-lock-defaults)
+   (setq font-lock-defaults '(todoo-font-lock-keywords t))
+ 
+-  (setq outline-regexp (concat "^\\(" (regexp-quote todoo-item-marker) " \\|"
+-			       (regexp-quote todoo-item-marker-assigned) 
+-			       " \\|[ ]*" (regexp-quote todoo-sub-item-marker)
+-			       " \\)"))
++  (set (make-local-variable 'outline-regexp)
++        (concat "^\\(" (regexp-quote todoo-item-marker) " \\|"
++                (regexp-quote todoo-item-marker-assigned) 
++                " \\|[ ]*" (regexp-quote todoo-sub-item-marker)
++                " \\)"))
+ 
+   (outline-minor-mode 1)
+ 
--- emacs-goodies-el-31.2.orig/debian/patches/00list
+++ emacs-goodies-el-31.2/debian/patches/00list
@@ -0,0 +1,48 @@
+3_bar-cursor-customize
+5_highlight-beyond-fill-column
+6_diminish-defcustom
+8_whitespace_rename
+9_whitespace_enable_custom
+9_missing_provide
+50_bar-cursor_bug331430
+50_browse-kill-ring_bug224751
+50_ctypes
+50_coffee_no-autoload
+50_color-theme_custom
+50_dedicated
+50_dict_bug301293
+50_edit-env_autoload
+51_edit-env_copy-list
+50_filladapt_bug420845
+50_gnus-BTS
+51_gnus-BTS_bug363161
+52_gnus-BTS_bug218286
+50_gnus-filterhist
+50_gnus-pers
+51_gnus-pers
+52_gnus-pers
+53_gnus-pers
+54_gnus-pers_bug384209
+55_gnus-pers_bug263371
+50_joc-toggle-case
+50_joc-toggle-buffer
+50_lcomp
+50_maplev_bug528868
+50_marker-visit_autoloads
+50_newsticker_non-fatal_xml
+50_session_enable_custom
+51_session_autoload
+50_silly-mail
+50_slang-mode_bug336352
+50_protbuf_custom_and_toggle
+50_table-add-to-text-mode-hook
+50_todoo_bug220718
+51_todoo_bug267637
+52_todoo_bug414781
+53_todoo_bug438964
+50_setnu
+50_projects
+50_markdown_autoload
+50_pod_autoload
+50_quack_autoload
+50_vm-bogofilter
--- emacs-goodies-el-31.2.orig/debian/patches/9_missing_provide.dpatch
+++ emacs-goodies-el-31.2/debian/patches/9_missing_provide.dpatch
@@ -0,0 +1,44 @@
+#!/bin/sh -e
+## 9_missing_provide.dpatch.dpatch by Peter S Galbraith <psg at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/align-string.el emacs-goodies-el/elisp/emacs-goodies-el/align-string.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/align-string.el	2001-11-08 07:26:56.000000000 -0500
++++ emacs-goodies-el/elisp/emacs-goodies-el/align-string.el	2009-09-03 09:53:49.000000000 -0400
+@@ -98,3 +98,5 @@
+ 	  (setq i (1+ i)))))
+     ;; Clear end marker.
+     (set-marker end nil)))
++
++(provide 'align-string)
++;;; align-string.el ends here
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/cyclebuffer.el emacs-goodies-el/elisp/emacs-goodies-el/cyclebuffer.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/cyclebuffer.el	2009-07-17 16:53:08.000000000 -0400
++++ emacs-goodies-el/elisp/emacs-goodies-el/cyclebuffer.el	2009-09-03 09:52:08.000000000 -0400
+@@ -105,3 +105,5 @@
+ visited buffers."
+   (interactive)
+   (cyclebuffer-forward -1))
++
++(provide 'cyclebuffer)
--- emacs-goodies-el-31.2.orig/debian/patches/52_todoo_bug414781.dpatch
+++ emacs-goodies-el-31.2/debian/patches/52_todoo_bug414781.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_todoo_bug414781.dpatch by  <psg at mixed.dyndns.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad emacs-goodies-el~/elisp/emacs-goodies-el/todoo.el emacs-goodies-el/elisp/emacs-goodies-el/todoo.el
+--- emacs-goodies-el~/elisp/emacs-goodies-el/todoo.el	2007-05-14 19:17:52.000000000 -0400
++++ emacs-goodies-el/elisp/emacs-goodies-el/todoo.el	2007-05-14 19:20:51.000000000 -0400
+@@ -57,6 +57,11 @@
+ 
+ ;;; ChangeLog:
+ 
++;; 2007-05-14 Peter S Galbraith <psg at debian.org>
++;;  Comment out clobbering of outline-mode-menu-bar-map key entries.
++;;  This is far too aggressive.  A much better fix would be to undefine the
++;;  keys for todoo-mode-map.  Thanks to Simon Pepping (Closes #144781).
++
+ ;; 2004-11-24 Peter S Galbraith <psg at debian.org>
+ ;;  Debian bug 267637 fix: changes to outline-regexp should be buffer-local.
+ ;;  Thanks to Daniel Skarda <0rfelyus at hobitin.ucw.cz> for pointing it out.
+@@ -524,9 +529,9 @@
+ 
+   (outline-minor-mode 1)
+ 
+-  (define-key outline-mode-menu-bar-map [headings] 'undefined)
+-  (define-key outline-mode-menu-bar-map [hide] 'undefined)
+-  (define-key outline-mode-menu-bar-map [show] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [headings] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [hide] 'undefined)
++  ;;(define-key outline-mode-menu-bar-map [show] 'undefined)
+ 
+   (if todoo-collapse-items
+       (hide-body))
--- emacs-goodies-el-31.2.orig/debian/patches/50_edit-env_autoload.dpatch
+++ emacs-goodies-el-31.2/debian/patches/50_edit-env_autoload.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_edit-env_autoload.dpatch by Peter S Galbraith <psg at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add autoload.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/psg/emacs/emacs-goodies-el/newfiles/emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el
+--- /home/psg/emacs/emacs-goodies-el/newfiles/emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el	2003-11-12 20:17:21.000000000 -0500
++++ emacs-goodies-el/elisp/emacs-goodies-el/edit-env.el	2003-11-14 15:00:01.000000000 -0500
+@@ -111,6 +111,7 @@
+ 	       (list (widget-get widget 'environment-variable-name)
+ 		     widget)))
+   
++;;;###autoload
+ (defun edit-env ()
+   "Display, edit, delete and add environment variables."
+   (interactive)


--- NEW FILE emacs-goodies.spec ---
%global pkg emacs-goodies
%global pkgname Emacs-goodies
%global goodies_dir %{buildroot}%{emacs_lispdir}/goodies/
%global gnus_dir %{buildroot}%{emacs_lispdir}/gnus-bonus/
%global installinfo /sbin/install-info

%if %($(pkg-config emacs) ; echo $?)
%global emacs_version 21.1
%global emacs_lispdir %{_datadir}/emacs/site-lisp
%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%global emacs_version %(pkg-config emacs --modversion)
%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif


Name:		%{pkg}
Version:	31.2
Release:	3%{?dist}
Summary:	Miscellaneous add-ons for Emacs

Group:		Applications/Editors
License:	GPLv2+ and GPLv3
URL:		http://packages.debian.org/sid/lisp/emacs-goodies-el
Source0:	http://ftp.at.debian.org/debian/pool/main/e/emacs-goodies-el/emacs-goodies-el_31.2.orig.tar.gz
#Patch which adjusts debian specific information to fedora in texi file
Patch0:		emacs-goodies-el.texi.patch
#Upstream patch http://ftp.de.debian.org/debian/pool/main/e/emacs-goodies-el/emacs-goodies-el_31.2-1.diff.gz
Patch1:		emacs-goodies-el_31.2-1.diff
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	emacs emacs-el texinfo
Requires:	emacs(bin) >= %{emacs_version}
		
%description
This is %{pkgname} %{version}, provides add-ons for GNU Emacs and gnus.

%package el
Summary:	Elisp source files for %{pkgname}
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

%description el
This package contains the elisp source files for 
use with %{pkgname}.

%prep
%setup -q -n %{pkg}-el-%{version}
%patch0 -p1 -b .fix
%patch1 -p1
%{__cp} debian/patches/* .
while read -r line
do
	patch -p1 <$line.dpatch
done < 00list
%{__rm} -rf elisp/debian-el/
%{__rm} -rf elisp/dpkg-dev-el/
%{__rm} -rf elisp/devscripts-el/

%build
%{__mkdir} -p elisp/%{pkg}-el/info
cd elisp/%{pkg}-el/
%{__chmod} +x %{pkg}-loaddefs.make
./%{pkg}-loaddefs.make
emacs --no-site-file --batch --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile *.el
makeinfo emacs-goodies-el.texi
iconv -f iso8859-1 -t utf-8 info/emacs-goodies > info/emacs-goodies.utf
%{__mv} info/emacs-goodies.utf info/emacs-goodies
cd ../gnus-bonus-el/
emacs --no-site-file --batch --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile *.el

%install
rm -rf %{buildroot}
%{__install} -pm 755 -d %{goodies_dir}
%{__install} -pm 755 -d %{buildroot}%{emacs_startdir}
%{__install} -pm 644 elisp/%{pkg}-el/%{pkg}-loaddefs.el %{buildroot}%{emacs_startdir}
%{__install} -pm 644 elisp/%{pkg}-el/*.elc %{goodies_dir}
%{__install} -pm 644 elisp/%{pkg}-el/*.el %{goodies_dir}
%{__install} -pm 755 -d %{gnus_dir}
%{__install} -pm 644 elisp/gnus-bonus-el/*.elc %{gnus_dir}
%{__install} -pm 644 elisp/gnus-bonus-el/*.el %{gnus_dir}
%{__install} -pm 755 -d %{buildroot}%{_infodir}/
%{__install} -pm 644 elisp/%{pkg}-el/info/%{pkg} %{buildroot}%{_infodir}/

%clean
%{__rm} -rf %{buildroot}


%post
%{installinfo} %{_infodir}/%{pkg} %{_infodir}/dir


%preun
if [ "$1" = 0 ]; then
    %{installinfo} --delete %{_infodir}/%{pkg} %{_infodir}/dir
fi


%files
%defattr(-,root,root,-)
%{emacs_lispdir}/goodies/*.elc
%{emacs_startdir}/emacs-goodies-loaddefs.el
%{emacs_lispdir}/gnus-bonus/*.elc
%{_infodir}/%{pkg}.gz
%dir %{emacs_lispdir}/goodies
%dir %{emacs_lispdir}/gnus-bonus

%files el
%defattr(-,root,root,-)
%doc COPYING-GPL-v2 COPYING-GPL-v3
%{emacs_lispdir}/goodies/*.el
%{emacs_lispdir}/gnus-bonus/*.el

%changelog
* Wed Dec 16 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-3
- License adjusted to GPLv2+ and GPLv3

* Mon Dec 14 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-2
- Comment on  patches added

* Fri Dec 4 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.2-1
- Updated to version 31.2-1

* Thu Nov 26 2009 Arun SAG <sagarun [AT] gmail dot com> - 31.1-1
- Updated to version 31.1-1

* Sun Nov 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.11-1
- Updated to version 30.11-1

* Fri Oct 30 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.8-2
- Upstream patches are applied

* Thu Oct 22 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.8-1
- Updated to 30.8-1
- License corrected to GPLv2+

* Tue Sep 15 2009 Arun SAG <sagarun [AT] gmail dot com> - 30.5-1
- Initial release 30.5-1


--- NEW FILE import.log ---
emacs-goodies-31_2-3_fc12:F-12:emacs-goodies-31.2-3.fc12.src.rpm:1261534760


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-goodies/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:07:02 -0000	1.1
+++ .cvsignore	23 Dec 2009 02:23:30 -0000	1.2
@@ -0,0 +1 @@
+emacs-goodies-el_31.2.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-goodies/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:07:02 -0000	1.1
+++ sources	23 Dec 2009 02:23:30 -0000	1.2
@@ -0,0 +1 @@
+ec409b4628c2c9a4f9789cb7fb570271  emacs-goodies-el_31.2.orig.tar.gz



From kwright at fedoraproject.org  Wed Dec 23 05:40:19 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 05:40:19 +0000 (UTC)
Subject: rpms/pki-util/devel import.log, NONE, 1.1 pki-util.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223054020.070D011C00E6@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22318/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-util.spec 
Log Message:
building in rawhide



--- NEW FILE import.log ---
pki-util-1_3_0-4_fc13:HEAD:pki-util-1.3.0-4.fc13.src.rpm:1261546789


--- NEW FILE pki-util.spec ---
Name:           pki-util
Version:        1.3.0
Release:        4%{?dist}
Summary:        Dogtag Certificate System - PKI Utility Framework
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils
BuildRequires:  jss >= 4.2.6
BuildRequires:  ldapjdk
BuildRequires:  osutil
BuildRequires:  xerces-j2

Requires:       java >= 1:1.6.0
Requires:       jpackage-utils
Requires:       jss >= 4.2.6
Requires:       ldapjdk

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag PKI Utility Framework is required by the following four
Dogtag PKI subsystems:

    the Dogtag Certificate Authority,
    the Dogtag Data Recovery Manager,
    the Dogtag Online Certificate Status Protocol Manager, and
    the Dogtag Token Key Service.

%package javadoc
Summary:    Dogtag Certificate System - PKI Utility Framework Javadocs
Group:      Documentation

Requires:   %{name} = %{version}-%{release}

%description javadoc
Dogtag Certificate System - PKI Utility Framework Javadocs

This documentation pertains exclusively to version %{version} of
the Dogtag PKI Utility Framework.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="pki" \
    -Dproduct="util" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}
cd %{buildroot}%{_javadir}/pki
mv cmsutil.jar cmsutil-%{version}.jar
ln -s cmsutil-%{version}.jar cmsutil.jar
mv nsutil.jar nsutil-%{version}.jar
ln -s nsutil-%{version}.jar nsutil.jar

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/pki/

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
- Removed 'with exceptions' from License

* Tue Nov 24 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #521989 - packaging for Fedora Dogtag
- Use "_javadir" macro when appropriate

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #521989 - packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #521989 - packaging for Fedora Dogtag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Dec 2009 17:41:47 -0000	1.1
+++ .cvsignore	23 Dec 2009 05:40:19 -0000	1.2
@@ -0,0 +1 @@
+pki-util-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Dec 2009 17:41:47 -0000	1.1
+++ sources	23 Dec 2009 05:40:19 -0000	1.2
@@ -0,0 +1 @@
+b103c5125e1ad36414300c53cef4a7a1  pki-util-1.3.0.tar.gz



From pnemade at fedoraproject.org  Wed Dec 23 06:06:00 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Wed, 23 Dec 2009 06:06:00 +0000 (UTC)
Subject: rpms/iok/EL-5 iok.spec,1.6,1.7
Message-ID: <20091223060601.2585511C00E6@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25384

Modified Files:
	iok.spec 
Log Message:
* Wed Dec 23 2009 Parag Nemade <panemade AT gmail.com>- 1.3.7-2
- Remove --copy--generic-name-to-name as its not working on EL5




Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/EL-5/iok.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- iok.spec	25 Sep 2009 07:30:11 -0000	1.6
+++ iok.spec	23 Dec 2009 06:05:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           iok
 Version:        1.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
 License:        GPLv2+
@@ -30,7 +30,6 @@ make install DESTDIR=%{buildroot} INSTAL
 
 desktop-file-install --vendor fedora \
     --delete-original \
-    --copy-generic-name-to-name \
     --dir %{buildroot}/%{_datadir}/applications/ \
      %{buildroot}%{_datadir}/applications/%{name}.desktop
 
@@ -49,6 +48,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 23 2009 Parag Nemade <panemade AT gmail.com>- 1.3.7-2
+- Remove --copy--generic-name-to-name as its not working on EL5
+
 * Fri Sep 11 2009 Parag Nemade <panemade at gmail.com>- 1.3.7-1
 - Update to Next release 1.3.7
 



From nb at fedoraproject.org  Wed Dec 23 06:06:19 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed, 23 Dec 2009 06:06:19 +0000 (UTC)
Subject: rpms/spamassassin/F-12 .cvsignore, 1.54, 1.55 sources, 1.53,
	1.54 spamassassin.spec, 1.133, 1.134
Message-ID: <20091223060619.9DC4A11C00E6@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/spamassassin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25478

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
3.3.0-rc1.proposed2 with fixed spamc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	19 Dec 2009 04:09:23 -0000	1.54
+++ .cvsignore	23 Dec 2009 06:06:18 -0000	1.55
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
-Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2
+Mail-SpamAssassin-3.3.0-beta1.tar.bz2
+Mail-SpamAssassin-rules-3.3.0-beta1.r886683.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	19 Dec 2009 04:09:23 -0000	1.53
+++ sources	23 Dec 2009 06:06:19 -0000	1.54
@@ -1,2 +1,2 @@
-0bf1e2c0fc70dc05104acec8a723cbdb  Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz
-fabccde7f09dcdf4c06afbd4cc0687c2  Mail-SpamAssassin-3.3.0-rc1.proposed1.tar.bz2
+41a68daf1bae2ded652a74c77b1fb498  Mail-SpamAssassin-3.3.0-rc1.proposed2.tar.bz2
+a7f03934e048ad6f277b55e95ed8e3ca  Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-12/spamassassin.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- spamassassin.spec	19 Dec 2009 04:09:23 -0000	1.133
+++ spamassassin.spec	23 Dec 2009 06:06:19 -0000	1.134
@@ -54,13 +54,13 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename rc1
-%define proposed .proposed1
-Release: 0.23.%{prename}%{?dist}
+%define proposed .proposed2
+Release: 0.26.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r892385.tgz 
+Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -261,6 +261,13 @@ fi
 exit 0
 
 %changelog
+* Mon Dec 21 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.26.rc1
+- 3.3.0-rc1.proposed2 with fixed spamc
+
+* Mon Dec 21 2009 Nick Bebout <nb at fedoraproject.org> - 3.3.0-0.24.beta1
+- Revert to beta1 to fix major error where spamc does nothing and mail
+  is lost into black hole.
+
 * Fri Dec 18 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.23.rc1
 - 3.3.0-rc1
 - Bug #103401: portreserve protect spamd port 783 on F-10+



From pmatilai at fedoraproject.org  Wed Dec 23 08:49:05 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Wed, 23 Dec 2009 08:49:05 +0000 (UTC)
Subject: rpms/rpm/F-11 rpm-4.7.1-bugurl.patch, NONE,
	1.1 rpm-4.7.1-chmod-test.patch, NONE,
	1.1 rpm-4.7.1-pgp-subkeys.patch, NONE,
	1.1 rpm-4.7.1-python-types.patch, NONE,
	1.1 rpm-4.7.1-rpmfc-data.patch, NONE,
	1.1 rpm-4.7.1-sign-passcheck.patch, NONE, 1.1 rpm.spec, 1.355,
	1.356 sources, 1.143, 1.144 rpm-4.7.1-abs-filelist.patch, 1.1,
	NONE rpm-4.7.1-chroot-env-paths.patch, 1.1,
	NONE rpm-4.7.1-chroot-remove-env.patch, 1.1,
	NONE rpm-4.7.1-debug-perms.patch, 1.1,
	NONE rpm-4.7.1-duplicate-deps.patch, 1.1,
	NONE rpm-4.7.1-filedep-dnevr.patch, 1.1,
	NONE rpm-4.7.1-perl-heredoc.patch, 1.1,
	NONE rpm-4.7.1-rpm2cpio-init.patch, 1.1, NONE
Message-ID: <20091223084905.4ABD911C00E6@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8796

Modified Files:
	rpm.spec sources 
Added Files:
	rpm-4.7.1-bugurl.patch rpm-4.7.1-chmod-test.patch 
	rpm-4.7.1-pgp-subkeys.patch rpm-4.7.1-python-types.patch 
	rpm-4.7.1-rpmfc-data.patch rpm-4.7.1-sign-passcheck.patch 
Removed Files:
	rpm-4.7.1-abs-filelist.patch rpm-4.7.1-chroot-env-paths.patch 
	rpm-4.7.1-chroot-remove-env.patch rpm-4.7.1-debug-perms.patch 
	rpm-4.7.1-duplicate-deps.patch rpm-4.7.1-filedep-dnevr.patch 
	rpm-4.7.1-perl-heredoc.patch rpm-4.7.1-rpm2cpio-init.patch 
Log Message:
- update to 4.7.2 (http://rpm.org/wiki/Releases/4.7.2)
- fix posix chmod test to unbreak %%fixperms macro (#543035)
- avoid looking into OpenPGP subkeys (#436812)
- dont fail build on unrecognized non-executable files (#532489)
- fix password check result when gpg is missing (#496754)
- permit python to handle 64bit integer types from headers
- all header integer types are unsigned, match this in python too
- return python long objects where ints are not sufficient (#531243)
- enable posix capability + acl verification support
- add bugurl tag to have it across supported releases


rpm-4.7.1-bugurl.patch:
 build/files.c         |    1 +
 build/parsePreamble.c |    4 ++++
 lib/rpmtag.h          |    1 +
 macros.in             |    6 ++++++
 tests/rpmgeneral.at   |    1 +
 tests/rpmtests        |    1 +
 6 files changed, 14 insertions(+)

--- NEW FILE rpm-4.7.1-bugurl.patch ---
diff -up rpm-4.7.1/build/files.c.bugurl rpm-4.7.1/build/files.c
--- rpm-4.7.1/build/files.c.bugurl	2009-07-21 09:42:51.000000000 +0300
+++ rpm-4.7.1/build/files.c	2009-09-15 11:37:45.000000000 +0300
@@ -1977,6 +1977,7 @@ static const rpmTag sourceTags[] = {
     RPMTAG_CHANGELOGNAME,
     RPMTAG_CHANGELOGTEXT,
     RPMTAG_URL,
+    RPMTAG_BUGURL,
     HEADER_I18NTABLE,
     0
 };
diff -up rpm-4.7.1/build/parsePreamble.c.bugurl rpm-4.7.1/build/parsePreamble.c
--- rpm-4.7.1/build/parsePreamble.c.bugurl	2009-06-23 14:40:57.000000000 +0300
+++ rpm-4.7.1/build/parsePreamble.c	2009-09-15 11:37:45.000000000 +0300
@@ -32,6 +32,7 @@ static const rpmTag copyTagsDuringParse[
     RPMTAG_CHANGELOGTEXT,
     RPMTAG_PREFIXES,
     RPMTAG_DISTTAG,
+    RPMTAG_BUGURL,
     0
 };
 
@@ -307,6 +308,7 @@ static struct optionalTag {
     { RPMTAG_PACKAGER,		"%{packager}" },
     { RPMTAG_DISTRIBUTION,	"%{distribution}" },
     { RPMTAG_DISTURL,		"%{disturl}" },
+    { RPMTAG_BUGURL,		"%{bugurl}" },
     { -1, NULL }
 };
 
@@ -501,6 +503,7 @@ static int handlePreambleTag(rpmSpec spe
 	}
     case RPMTAG_URL:
     case RPMTAG_DISTTAG:
+    case RPMTAG_BUGURL:
 	SINGLE_TOKEN_ONLY;
 	/* These macros are for backward compatibility */
 	if (tag == RPMTAG_VERSION) {
@@ -734,6 +737,7 @@ static struct PreambleRec_s preambleList
     {RPMTAG_AUTOPROV,		0, 0, 0, "autoprov"},
     {RPMTAG_DOCDIR,		0, 0, 0, "docdir"},
     {RPMTAG_DISTTAG,		0, 0, 0, "disttag"},
+    {RPMTAG_BUGURL,		0, 0, 0, "bugurl"},
    	/* LCL: can't add null annotation */
     {0, 0, 0, 0, 0}
 };
diff -up rpm-4.7.1/lib/rpmtag.h.bugurl rpm-4.7.1/lib/rpmtag.h
--- rpm-4.7.1/lib/rpmtag.h.bugurl	2009-06-23 14:40:57.000000000 +0300
+++ rpm-4.7.1/lib/rpmtag.h	2009-09-15 11:37:45.000000000 +0300
@@ -282,6 +282,7 @@ typedef enum rpmTag_e {
     RPMTAG_LONGSIZE		= 5009, /* l */
     RPMTAG_FILECAPS		= 5010, /* s[] */
     RPMTAG_FILEDIGESTALGO	= 5011, /* i file digest algorithm */
+    RPMTAG_BUGURL		= 5012, /* s */
 
     RPMTAG_FIRSTFREE_TAG	/*!< internal */
 } rpmTag;
diff -up rpm-4.7.1/macros.in.bugurl rpm-4.7.1/macros.in
--- rpm-4.7.1/macros.in.bugurl	2009-09-15 11:37:45.000000000 +0300
+++ rpm-4.7.1/macros.in	2009-09-15 11:37:45.000000000 +0300
@@ -264,6 +264,12 @@ package or when debugging this package.\
 #
 #%disturl
 
+#	Configurable bug URL, same as BugURL: tag in a specfile.
+#	The URL will be used to supply reliable information to where
+#	to file bugs.
+#
+#%bugurl
+
 #	Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
 #	marked as %doc should be installed.
 #%_excludedocs
diff -up rpm-4.7.1/tests/rpmgeneral.at.bugurl rpm-4.7.1/tests/rpmgeneral.at
--- rpm-4.7.1/tests/rpmgeneral.at.bugurl	2009-06-23 14:40:59.000000000 +0300
+++ rpm-4.7.1/tests/rpmgeneral.at	2009-09-15 11:37:45.000000000 +0300
@@ -71,6 +71,7 @@ AT_CHECK([run rpm --querytags],[0],
 [ARCH
 ARCHIVESIZE
 BASENAMES
+BUGURL
 BUILDARCHS
 BUILDHOST
 BUILDTIME
diff -up rpm-4.7.1/tests/rpmtests.bugurl rpm-4.7.1/tests/rpmtests
--- rpm-4.7.1/tests/rpmtests.bugurl	2009-09-15 11:38:00.000000000 +0300
+++ rpm-4.7.1/tests/rpmtests	2009-09-15 11:38:10.000000000 +0300
@@ -2165,6 +2165,7 @@ at_func_diff_devnull "$at_stderr" || at_
 echo >>"$at_stdout"; $as_echo "ARCH
 ARCHIVESIZE
 BASENAMES
+BUGURL
 BUILDARCHS
 BUILDHOST
 BUILDTIME

rpm-4.7.1-chmod-test.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-chmod-test.patch ---
commit 545304577f0ac82b2e4c1caa97f02d87f41324f7
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Dec 2 15:30:27 2009 +0200

    Fix the posix chown test for selinux enabled systems (RhBug:543035)
    - on selinux enabled systems, 'ls -l' mode string is longer than
      expected here, just trim the ls output to our expected length
    (cherry picked from commit 46d1ba04483af09590ed070186a1be10b57c5977)

diff --git a/configure.ac b/configure.ac
index 967566c..2274080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_MSG_CHECKING(POSIX chmod)
 touch foo.chmodtest
 chmod 744 foo.chmodtest
 chmod +X foo.chmodtest 2>/dev/null
-a=`ls -l foo.chmodtest | awk '{print $1}'`
+a=`ls -l foo.chmodtest | awk '{print substr($1,1,10)}'`
 rm -f foo.chmodtest
 if test "$a" = "-rwxr-xr-x"; then
     AC_MSG_RESULT(yes)

rpm-4.7.1-pgp-subkeys.patch:
 rpmpgp.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE rpm-4.7.1-pgp-subkeys.patch ---
commit 6eeb0bb06466d9eb75eb55efd514d3ecfe089042
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Nov 25 15:07:17 2009 +0200

    We can't handle OpenPGP subkeys or secret keys, so dont even try
    - parsing subkeys ends up overwriting data in the main key, causing
      bogus signature checking failures
    - this is the final missing piece of RhBug:436812, short of adding
      proper support for subkeys (maybe someday...)
    (cherry picked from commit 98213fc4192c7af07037a0f3e9cce9e3b8509c02)

diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index d7bbb5e..f76fc2b 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -1190,11 +1190,6 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft,
 	    else
 		memset(_digp->signid, 0, sizeof(_digp->signid));
 	}
-    case PGPTAG_PUBLIC_SUBKEY:
-	rc = pgpPrtKey(tag, h, hlen, _dig, _digp);
-	break;
-    case PGPTAG_SECRET_KEY:
-    case PGPTAG_SECRET_SUBKEY:
 	rc = pgpPrtKey(tag, h, hlen, _dig, _digp);
 	break;
     case PGPTAG_USER_ID:
@@ -1205,6 +1200,9 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft,
 	rc = pgpPrtComment(tag, h, hlen);
 	break;
 
+    case PGPTAG_PUBLIC_SUBKEY:
+    case PGPTAG_SECRET_KEY:
+    case PGPTAG_SECRET_SUBKEY:
     case PGPTAG_RESERVED:
     case PGPTAG_PUBLIC_SESSION_KEY:
     case PGPTAG_SYMMETRIC_SESSION_KEY:

rpm-4.7.1-python-types.patch:
 header-py.c |   26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

--- NEW FILE rpm-4.7.1-python-types.patch ---
diff --git a/python/header-py.c b/python/header-py.c
index 8ec2cb4..9c9b1e2 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -152,6 +152,7 @@ static PyObject * hdrKeyList(hdrObject * s)
 
 	switch (rpmtdType(td)) {
 	case RPM_BIN_TYPE:
+	case RPM_INT64_TYPE:
 	case RPM_INT32_TYPE:
 	case RPM_CHAR_TYPE:
 	case RPM_INT8_TYPE:
@@ -386,17 +387,30 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
 	o = PyString_FromStringAndSize(data, count);
 	break;
 
+    case RPM_INT64_TYPE:
+	if (count != 1 || forceArray) {
+	    metao = PyList_New(0);
+	    for (i = 0; i < count; i++) {
+		o = PyLong_FromUnsignedLongLong(((uint64_t *) data)[i]);
+		PyList_Append(metao, o);
+		Py_DECREF(o);
+	    }
+	    o = metao;
+	} else {
+	    o = PyLong_FromUnsignedLongLong(*((uint64_t *) data));
+	}
+	break;
     case RPM_INT32_TYPE:
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
-		o = PyInt_FromLong(((int *) data)[i]);
+		o = PyLong_FromLong(((uint32_t *) data)[i]);
 		PyList_Append(metao, o);
 		Py_DECREF(o);
 	    }
 	    o = metao;
 	} else {
-	    o = PyInt_FromLong(*((int *) data));
+	    o = PyLong_FromLong(*((uint32_t *) data));
 	}
 	break;
 
@@ -405,13 +419,13 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
-		o = PyInt_FromLong(((char *) data)[i]);
+		o = PyInt_FromLong(((uint8_t *) data)[i]);
 		PyList_Append(metao, o);
 		Py_DECREF(o);
 	    }
 	    o = metao;
 	} else {
-	    o = PyInt_FromLong(*((char *) data));
+	    o = PyInt_FromLong(*((uint8_t *) data));
 	}
 	break;
 
@@ -419,13 +433,13 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
-		o = PyInt_FromLong(((short *) data)[i]);
+		o = PyInt_FromLong(((uint16_t *) data)[i]);
 		PyList_Append(metao, o);
 		Py_DECREF(o);
 	    }
 	    o = metao;
 	} else {
-	    o = PyInt_FromLong(*((short *) data));
+	    o = PyInt_FromLong(*((uint16_t *) data));
 	}
 	break;
 

rpm-4.7.1-rpmfc-data.patch:
 rpmfc.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.7.1-rpmfc-data.patch ---
commit fa9fcc89146f08bce3b51d96d0ec9d4175db6978
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Thu Nov 26 10:22:41 2009 +0200

    Dont fail build on unrecognized non-executable files (ticket #105)
    - Generally only executable files are critical for dependency extraction,
      whereas oddball application data files can cause unnecessary build
      failure due to libmagic misdetections etc, so just let non-executables
      pass with a warning and mark them as unknown data
    (cherry picked from commit cfcd1f9bd98d5d0fc46a84931984efec3b9d47e2)

diff --git a/build/rpmfc.c b/build/rpmfc.c
index bcb5383..e4ba6b2 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1245,6 +1245,7 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
     for (fc->ix = 0; fc->ix < fc->nfiles; fc->ix++) {
 	const char * ftype;
 	rpm_mode_t mode = (fmode ? fmode[fc->ix] : 0);
+	int is_executable = (mode & (S_IXUSR|S_IXGRP|S_IXOTH));
 
 	s = argv[fc->ix];
 	slen = strlen(s);
@@ -1277,11 +1278,16 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
 		ftype = magic_file(ms, s);
 
 	    if (ftype == NULL) {
-		rpmlog(RPMLOG_ERR, 
+		rpmlog(is_executable ? RPMLOG_ERR : RPMLOG_WARNING, 
 		       _("Recognition of file \"%s\" failed: mode %06o %s\n"),
 		       s, mode, magic_error(ms));
-		magic_close(ms);
-		return RPMRC_FAIL;
+		/* only executable files are critical to dep extraction */
+		if (is_executable) {
+		    magic_close(ms);
+		    return RPMRC_FAIL;
+		}
+		/* unrecognized non-executables get treated as "data" */
+		ftype = "data";
 	    }
 	}
 

rpm-4.7.1-sign-passcheck.patch:
 signature.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-sign-passcheck.patch ---
commit 31c5e0f9b7b09661611b50d84d26ba47ce97fffe
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Nov 25 16:42:43 2009 +0200

    Fix signature password checking result on abnormal conditions (RhBug:496754)
    - Execve() failure wasn't returning an error code, causing rpm to
      think the password was ok when we couldn't even try verifying
    - Stricter return code checking from the password checking child:
      the password can only be ok if the child exits with WIFEXITED() *and*
      WIFEXITCODE() of 0. Also WIFEXITCODE() should only be called if
      WIFEXITED() returns true.
    (cherry picked from commit 2b41860984f0c4ebba5ebce93a18c9c0ca5e1065)

diff --git a/lib/signature.c b/lib/signature.c
index a501f3e..a2eaf9b 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -883,6 +883,7 @@ static int checkPassPhrase(const char * passPhrase, const rpmSigTag sigTag)
 
 	    rpmlog(RPMLOG_ERR, _("Could not exec %s: %s\n"), "gpg",
 			strerror(errno));
+	    _exit(EXIT_FAILURE);
 	}   break;
 	case RPMSIGTAG_RSA:
 	case RPMSIGTAG_PGP5:	/* XXX legacy */
@@ -932,7 +933,7 @@ static int checkPassPhrase(const char * passPhrase, const rpmSigTag sigTag)
 
     (void) waitpid(pid, &status, 0);
 
-    return ((!WIFEXITED(status) || WEXITSTATUS(status)) ? 1 : 0);
+    return ((WIFEXITED(status) && WEXITSTATUS(status) == 0)) ? 0 : 1;
 }
 
 char * rpmGetPassPhrase(const char * prompt, const rpmSigTag sigTag)


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/rpm.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -p -r1.355 -r1.356
--- rpm.spec	8 Oct 2009 09:48:24 -0000	1.355
+++ rpm.spec	23 Dec 2009 08:49:03 -0000	1.356
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -43,18 +43,16 @@ Patch2: rpm-4.5.90-gstreamer-provides.pa
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
-Patch200: rpm-4.7.1-abs-filelist.patch
-Patch201: rpm-4.7.1-debug-perms.patch
-Patch202: rpm-4.7.1-duplicate-deps.patch
-Patch203: rpm-4.7.1-chroot-env-paths.patch
-Patch204: rpm-4.7.1-rpm2cpio-init.patch
-Patch205: rpm-4.7.1-filedep-dnevr.patch
-Patch206: rpm-4.7.1-chroot-remove-env.patch
-Patch207: rpm-4.7.1-perl-heredoc.patch
+Patch200: rpm-4.7.1-bugurl.patch
+Patch201: rpm-4.7.0-extra-provides.patch
+Patch202: rpm-4.7.1-pgp-subkeys.patch
+Patch203: rpm-4.7.1-sign-passcheck.patch
+Patch204: rpm-4.7.1-rpmfc-data.patch
+Patch205: rpm-4.7.1-chmod-test.patch
+Patch206: rpm-4.7.1-python-types.patch
 
 # These are not yet upstream
-Patch300: rpm-4.7.0-extra-provides.patch
-Patch301: rpm-4.6.0-niagara.patch
+Patch300: rpm-4.6.0-niagara.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -95,14 +93,17 @@ BuildRequires: ncurses-devel
 BuildRequires: bzip2-devel >= 0.9.0c-2
 BuildRequires: python-devel >= 2.2
 BuildRequires: lua-devel >= 5.1
+BuildRequires: libcap-devel
+BuildRequires: libacl-devel
 %if %{with xz}
 BuildRequires: xz-devel >= 4.999.8
 %endif
 %if %{with sqlite}
 BuildRequires: sqlite-devel
 %endif
+# XXX temporarily for chmod-test patch
+BuildRequires: autoconf automake
 # Not enabling these yet
-# BuildRequires: libcap-devel libacl-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -118,6 +119,9 @@ Summary:  Libraries for manipulating RPM
 Group: Development/Libraries
 License: GPLv2+ and LGPLv2+ with exceptions
 Requires: rpm = %{version}-%{release}
+# librpm uses cap_compare, introduced sometimes between libcap 2.10 and 2.16.
+# A manual require is needed, see #505596
+Requires: libcap >= 2.16
 
 %description libs
 This package contains the RPM shared libraries.
@@ -192,17 +196,15 @@ that will manipulate RPM packages and da
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
-%patch200 -p1 -b .abs-filelist
-%patch201 -p1 -b .debug-perms
-%patch202 -p1 -b .duplicate-deps
-%patch203 -p1 -b .chroot-env-paths
-%patch204 -p1 -b .rpm2cpio.init
-%patch205 -p1 -b .filedep-dnevr
-%patch206 -p1 -b .chroot-remove-env
-%patch207 -p1 -b .perl-heredoc
+%patch200 -p1 -b .bugurl
+%patch201 -p1 -b .extra-prov
+%patch202 -p1 -b .pgp-subkey
+%patch203 -p1 -b .sign-passcheck
+%patch204 -p1 -b .rpmfc-data
+%patch205 -p1 -b .chmod-test
+%patch206 -p1 -b .python-types
 
-%patch300 -p1 -b .extra-prov
-%patch301 -p1 -b .niagara
+%patch300 -p1 -b .niagara
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -229,6 +231,8 @@ export CPPFLAGS CFLAGS LDFLAGS
     %{?with_sqlite: --enable-sqlite3} \
     --with-lua \
     --with-selinux \
+    --with-cap \
+    --with-acl \
     --enable-python
 
 make %{?_smp_mflags}
@@ -410,6 +414,18 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Dec 08 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.2-1
+- update to 4.7.2 (http://rpm.org/wiki/Releases/4.7.2)
+- fix posix chmod test to unbreak %%fixperms macro (#543035)
+- avoid looking into OpenPGP subkeys (#436812)
+- dont fail build on unrecognized non-executable files (#532489)
+- fix password check result when gpg is missing (#496754)
+- permit python to handle 64bit integer types from headers
+- all header integer types are unsigned, match this in python too
+- return python long objects where ints are not sufficient (#531243)
+- enable posix capability + acl verification support
+- add bugurl tag to have it across supported releases
+
 * Thu Oct 08 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-3
 - use relative paths within db environment (related to #507309, #507309...)
 - remove db environment on close in chrooted operation (related to above)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- sources	23 Jul 2009 06:54:08 -0000	1.143
+++ sources	23 Dec 2009 08:49:04 -0000	1.144
@@ -1 +1 @@
-e1abe3bcf6514a319a3803d2cf3bf83b  rpm-4.7.1.tar.bz2
+224715646325df4cd3904e3ac9e16186  rpm-4.7.2.tar.bz2


--- rpm-4.7.1-abs-filelist.patch DELETED ---


--- rpm-4.7.1-chroot-env-paths.patch DELETED ---


--- rpm-4.7.1-chroot-remove-env.patch DELETED ---


--- rpm-4.7.1-debug-perms.patch DELETED ---


--- rpm-4.7.1-duplicate-deps.patch DELETED ---


--- rpm-4.7.1-filedep-dnevr.patch DELETED ---


--- rpm-4.7.1-perl-heredoc.patch DELETED ---


--- rpm-4.7.1-rpm2cpio-init.patch DELETED ---



From pmatilai at fedoraproject.org  Wed Dec 23 08:52:32 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Wed, 23 Dec 2009 08:52:32 +0000 (UTC)
Subject: rpms/rpm/F-11 rpm.spec,1.356,1.357
Message-ID: <20091223085232.16E7911C00E6@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9240

Modified Files:
	rpm.spec 
Log Message:
- eww, remember to bump the version too



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/rpm.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -p -r1.356 -r1.357
--- rpm.spec	23 Dec 2009 08:49:03 -0000	1.356
+++ rpm.spec	23 Dec 2009 08:52:31 -0000	1.357
@@ -15,7 +15,7 @@
 
 %define rpmhome /usr/lib/rpm
 
-%define rpmver 4.7.1
+%define rpmver 4.7.2
 %define snapver {nil}
 %define srcver %{rpmver}
 



From leigh123linux at fedoraproject.org  Wed Dec 23 09:09:56 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 23 Dec 2009 09:09:56 +0000 (UTC)
Subject: File qbittorrent-2.0.3.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091223090956.83BC010F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qbittorrent:

f8ec0485a859d2532d53c9f35826c8f6  qbittorrent-2.0.3.tar.gz



From leigh123linux at fedoraproject.org  Wed Dec 23 09:12:35 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 23 Dec 2009 09:12:35 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 .cvsignore, 1.20, 1.21 gcc.patch, 1.1,
	1.2 qbittorrent.spec, 1.44, 1.45 sources, 1.22, 1.23
Message-ID: <20091223091235.953E511C00E6@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11375

Modified Files:
	.cvsignore gcc.patch qbittorrent.spec sources 
Log Message:
* Wed Dec 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.3-1
- update to 2.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	14 Dec 2009 10:06:00 -0000	1.20
+++ .cvsignore	23 Dec 2009 09:12:34 -0000	1.21
@@ -1 +1 @@
-qbittorrent-2.0.1.tar.gz
+qbittorrent-2.0.3.tar.gz

gcc.patch:
 src.pro |    1 +
 1 file changed, 1 insertion(+)

Index: gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/gcc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc.patch	18 Dec 2009 16:23:26 -0000	1.1
+++ gcc.patch	23 Dec 2009 09:12:35 -0000	1.2
@@ -7,7 +7,7 @@ diff -up qbittorrent-2.0.2/src/src.pro.n
  
 +QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
  # Update this VERSION for each release
- DEFINES += VERSION=\\\"v2.0.2\\\"
+ DEFINES += VERSION=\\\"v2.0.3\\\"
  DEFINES += VERSION_MAJOR=2
 
 


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- qbittorrent.spec	18 Dec 2009 16:23:26 -0000	1.44
+++ qbittorrent.spec	23 Dec 2009 09:12:35 -0000	1.45
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.0.2
+Version: 2.0.3
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Wed Dec 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.3-1
+- update to 2.0.3
+
 * Fri Dec 18 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-1
 - update to 2.0.2
 - add gcc patch to fix #548491


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	18 Dec 2009 16:23:26 -0000	1.22
+++ sources	23 Dec 2009 09:12:35 -0000	1.23
@@ -1 +1 @@
-94dfa2a217ea3b0829e2366558246563  qbittorrent-2.0.2.tar.gz
+f8ec0485a859d2532d53c9f35826c8f6  qbittorrent-2.0.3.tar.gz



From petersen at fedoraproject.org  Wed Dec 23 09:16:01 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 23 Dec 2009 09:16:01 +0000 (UTC)
Subject: rpms/m17n-db/devel m17n-db.spec,1.102,1.103
Message-ID: <20091223091601.D725511C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/m17n-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11895

Modified Files:
	m17n-db.spec 
Log Message:
separate .flt files to flt subpackage for m17n-lib-flt


Index: m17n-db.spec
===================================================================
RCS file: /cvs/extras/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- m17n-db.spec	18 Dec 2009 04:17:45 -0000	1.102
+++ m17n-db.spec	23 Dec 2009 09:16:01 -0000	1.103
@@ -1,7 +1,7 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.5.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
@@ -50,6 +50,16 @@ Requires: %{name} = %{version}-%{release
 m17n-db common files for Chinese, Japanese and Korean input maps.
 
 
+%package flt
+Summary:  m17n Font Layout Text data files
+Group:    System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description flt
+Font Layout Text rendering datafiles used by
+m17n-lib's flt library for complex text layout.
+
+
 %package generic
 Summary:  Generic m17n-db input maps
 Group:    System Environment/Libraries
@@ -193,7 +203,6 @@ rm -rf $RPM_BUILD_ROOT
 # include translations
 %files datafiles -f %{name}.lang
 %defattr(-,root,root)
-%{_datadir}/m17n/*.flt
 %{_datadir}/m17n/*.fst
 %{_datadir}/m17n/*.map
 %{_datadir}/m17n/*.tab
@@ -209,6 +218,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_datadir}/m17n/cjk-*.mim
 
+%files flt
+%defattr(-,root,root)
+%{_datadir}/m17n/*.flt
+
 %files generic
 %defattr(-,root,root)
 %{_datadir}/m17n/ispell.mim
@@ -218,7 +231,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/m17n/unicode.mim
 %{_datadir}/m17n/icons/unicode.png
 
+
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.5.5-3
+- separate .flt files to flt subpackage for m17n-lib-flt
+
 * Fri Dec 18 2009 Jens Petersen <petersen at redhat.com> - 1.5.5-2
 - add common-cjk option to mk_pkg for zh and ko
 - use mk_pkg for zh, el, ka, ug



From leigh123linux at fedoraproject.org  Wed Dec 23 09:19:40 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 23 Dec 2009 09:19:40 +0000 (UTC)
Subject: File qbittorrent-2.1.0beta2.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091223091940.AE4B610F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qbittorrent:

591cc85bba43f95a3b1ccecbaa5051b5  qbittorrent-2.1.0beta2.tar.gz



From leigh123linux at fedoraproject.org  Wed Dec 23 09:20:15 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 23 Dec 2009 09:20:15 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.34, 1.35 gcc.patch, 1.2,
	1.3 qbittorrent.spec, 1.60, 1.61 sources, 1.35, 1.36
Message-ID: <20091223092015.EC17F11C00E6@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12375

Modified Files:
	.cvsignore gcc.patch qbittorrent.spec sources 
Log Message:
* Wed Dec 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.2.beta1
- update to 2.1.0beta2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	20 Dec 2009 13:55:06 -0000	1.34
+++ .cvsignore	23 Dec 2009 09:20:15 -0000	1.35
@@ -1 +1 @@
-qbittorrent-2.1.0beta1.tar.gz
+qbittorrent-2.1.0beta2.tar.gz

gcc.patch:
 src.pro |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/gcc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcc.patch	20 Dec 2009 13:55:06 -0000	1.2
+++ gcc.patch	23 Dec 2009 09:20:15 -0000	1.3
@@ -16,6 +16,6 @@ diff -up qbittorrent-2.0.2/src/src.pro.n
  
 +QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
  # Update this VERSION for each release
- DEFINES += VERSION=\\\"v2.1.0beta1\\\"
+ DEFINES += VERSION=\\\"v2.1.0beta2\\\"
  DEFINES += VERSION_MAJOR=2
 


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- qbittorrent.spec	20 Dec 2009 13:55:06 -0000	1.60
+++ qbittorrent.spec	23 Dec 2009 09:20:15 -0000	1.61
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.1.0
-Release: 0.1.beta1%{?dist}
+Release: 0.2.beta2%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -11,7 +11,7 @@ Release: 0.1.beta1%{?dist}
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 #Source0:  %{name}-%{svn_rev}svn.tar.gz
 #Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
-Source0: http://downloads.sf.net/qbittorrent/files/qbittorrent-unstable/%{name}-%{version}beta1.tar.gz
+Source0: http://downloads.sf.net/qbittorrent/files/qbittorrent-unstable/%{name}-%{version}beta2.tar.gz
 # https://bugzilla.redhat.com/show_bug.cgi?id=548491
 Patch1:  gcc.patch
 
@@ -34,7 +34,7 @@ A Bittorrent client using rb_libtorrent 
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q -n %{name}-%{version}beta1
+%setup -q -n %{name}-%{version}beta2
 %patch1 -p1 -b .gcc
 
 %build
@@ -77,6 +77,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Wed Dec 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.2.beta1
+- update to 2.1.0beta2
+
 * Sun Dec 20 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.1.beta1
 - update to 2.1.0beta1
 - disable extra debugging to gcc patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	20 Dec 2009 13:55:06 -0000	1.35
+++ sources	23 Dec 2009 09:20:15 -0000	1.36
@@ -1 +1 @@
-72d7efc5fd38aea6faee9a8d11ee0131  qbittorrent-2.1.0beta1.tar.gz
+591cc85bba43f95a3b1ccecbaa5051b5  qbittorrent-2.1.0beta2.tar.gz



From sharkcz at fedoraproject.org  Wed Dec 23 09:21:32 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 09:21:32 +0000 (UTC)
Subject: File garmindev-0.3.1.tar.gz uploaded to lookaside cache by sharkcz
Message-ID: <20091223092132.DC32A10F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for garmindev:

41cf6aceaecd533c2a319405e84419a6  garmindev-0.3.1.tar.gz



From sharkcz at fedoraproject.org  Wed Dec 23 09:25:16 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 09:25:16 +0000 (UTC)
Subject: rpms/garmindev/devel .cvsignore, 1.5, 1.6 garmindev.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091223092516.3347211C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/garmindev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12965

Modified Files:
	.cvsignore garmindev.spec sources 
Log Message:
* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.3.1-1
- update to version 0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Jul 2009 12:05:09 -0000	1.5
+++ .cvsignore	23 Dec 2009 09:25:15 -0000	1.6
@@ -1 +1 @@
-garmindev-0.3.0.tar.gz
+garmindev-0.3.1.tar.gz


Index: garmindev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/devel/garmindev.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- garmindev.spec	24 Jul 2009 23:31:17 -0000	1.6
+++ garmindev.spec	23 Dec 2009 09:25:16 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           garmindev
-Version:        0.3.0
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        Drivers for communication with Garmin GPS devices
 
 Group:          System Environment/Libraries
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.qlandkarte.org
 Source0:        http://downloads.sourceforge.net/qlandkartegt/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{name}(interface) = 1.16
+Provides:       %{name}(interface) = 1.17
 
 BuildRequires:  cmake libusb-devel
 
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.3.1-1
+- update to version 0.3.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jul 2009 12:05:09 -0000	1.5
+++ sources	23 Dec 2009 09:25:16 -0000	1.6
@@ -1 +1 @@
-f6f3a4d945e9c6b0d03e8bdb453603dc  garmindev-0.3.0.tar.gz
+41cf6aceaecd533c2a319405e84419a6  garmindev-0.3.1.tar.gz



From sharkcz at fedoraproject.org  Wed Dec 23 09:26:36 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 09:26:36 +0000 (UTC)
Subject: rpms/garmindev/F-12 .cvsignore, 1.5, 1.6 garmindev.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091223092636.1E70F11C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/garmindev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13153

Modified Files:
	.cvsignore garmindev.spec sources 
Log Message:
* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.3.1-1
- update to version 0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Jul 2009 12:05:09 -0000	1.5
+++ .cvsignore	23 Dec 2009 09:26:35 -0000	1.6
@@ -1 +1 @@
-garmindev-0.3.0.tar.gz
+garmindev-0.3.1.tar.gz


Index: garmindev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/F-12/garmindev.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- garmindev.spec	24 Jul 2009 23:31:17 -0000	1.6
+++ garmindev.spec	23 Dec 2009 09:26:35 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           garmindev
-Version:        0.3.0
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        Drivers for communication with Garmin GPS devices
 
 Group:          System Environment/Libraries
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.qlandkarte.org
 Source0:        http://downloads.sourceforge.net/qlandkartegt/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{name}(interface) = 1.16
+Provides:       %{name}(interface) = 1.17
 
 BuildRequires:  cmake libusb-devel
 
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.3.1-1
+- update to version 0.3.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jul 2009 12:05:09 -0000	1.5
+++ sources	23 Dec 2009 09:26:35 -0000	1.6
@@ -1 +1 @@
-f6f3a4d945e9c6b0d03e8bdb453603dc  garmindev-0.3.0.tar.gz
+41cf6aceaecd533c2a319405e84419a6  garmindev-0.3.1.tar.gz



From sharkcz at fedoraproject.org  Wed Dec 23 09:27:35 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 09:27:35 +0000 (UTC)
Subject: rpms/garmindev/F-11 .cvsignore, 1.5, 1.6 garmindev.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20091223092735.7765911C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/garmindev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13332

Modified Files:
	.cvsignore garmindev.spec sources 
Log Message:
* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.3.1-1
- update to version 0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Jul 2009 13:10:12 -0000	1.5
+++ .cvsignore	23 Dec 2009 09:27:35 -0000	1.6
@@ -1 +1 @@
-garmindev-0.3.0.tar.gz
+garmindev-0.3.1.tar.gz


Index: garmindev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/F-11/garmindev.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- garmindev.spec	20 Jul 2009 13:10:13 -0000	1.5
+++ garmindev.spec	23 Dec 2009 09:27:35 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           garmindev
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        Drivers for communication with Garmin GPS devices
 
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.qlandkarte.org
 Source0:        http://downloads.sourceforge.net/qlandkartegt/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{name}(interface) = 1.16
+Provides:       %{name}(interface) = 1.17
 
 BuildRequires:  cmake libusb-devel
 
@@ -53,6 +53,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.3.1-1
+- update to version 0.3.1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 20 2009 Dan Hor?k <dan[at]danny.cz> 0.3.0-1
 - update to version 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jul 2009 13:10:13 -0000	1.5
+++ sources	23 Dec 2009 09:27:35 -0000	1.6
@@ -1 +1 @@
-f6f3a4d945e9c6b0d03e8bdb453603dc  garmindev-0.3.0.tar.gz
+41cf6aceaecd533c2a319405e84419a6  garmindev-0.3.1.tar.gz



From sharkcz at fedoraproject.org  Wed Dec 23 09:28:21 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 09:28:21 +0000 (UTC)
Subject: rpms/garmindev/EL-5 .cvsignore, 1.4, 1.5 garmindev.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20091223092821.D1CC211C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/garmindev/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13489

Modified Files:
	.cvsignore garmindev.spec sources 
Log Message:
* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.3.1-1
- update to version 0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Sep 2009 09:24:16 -0000	1.4
+++ .cvsignore	23 Dec 2009 09:28:21 -0000	1.5
@@ -1 +1 @@
-garmindev-0.3.0.tar.gz
+garmindev-0.3.1.tar.gz


Index: garmindev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/EL-5/garmindev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- garmindev.spec	23 Sep 2009 09:24:16 -0000	1.3
+++ garmindev.spec	23 Dec 2009 09:28:21 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           garmindev
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        Drivers for communication with Garmin GPS devices
 
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.qlandkarte.org
 Source0:        http://downloads.sourceforge.net/qlandkartegt/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{name}(interface) = 1.16
+Provides:       %{name}(interface) = 1.17
 
 BuildRequires:  cmake libusb-devel
 
@@ -53,6 +53,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.3.1-1
+- update to version 0.3.1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 20 2009 Dan Hor?k <dan[at]danny.cz> 0.3.0-1
 - update to version 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/garmindev/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Sep 2009 09:24:16 -0000	1.4
+++ sources	23 Dec 2009 09:28:21 -0000	1.5
@@ -1 +1 @@
-f6f3a4d945e9c6b0d03e8bdb453603dc  garmindev-0.3.0.tar.gz
+41cf6aceaecd533c2a319405e84419a6  garmindev-0.3.1.tar.gz



From iefremov at fedoraproject.org  Wed Dec 23 09:31:39 2009
From: iefremov at fedoraproject.org (iefremov)
Date: Wed, 23 Dec 2009 09:31:39 +0000 (UTC)
Subject: File ugene-1.6.0.tar.gz uploaded to lookaside cache by iefremov
Message-ID: <20091223093139.B033A10F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ugene:

1ee200e1eb3e556796224b8830707f6b  ugene-1.6.0.tar.gz



From pghmcfc at fedoraproject.org  Wed Dec 23 09:34:43 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 23 Dec 2009 09:34:43 +0000 (UTC)
Subject: File MailTools-2.05.tar.gz uploaded to lookaside cache by pghmcfc
Message-ID: <20091223093443.95F8310F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-MailTools:

86a51c5a81a55e555c7a84dfdf6ab270  MailTools-2.05.tar.gz



From caolanm at fedoraproject.org  Wed Dec 23 09:36:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 23 Dec 2009 09:36:18 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2110,1.2111
Message-ID: <20091223093618.9D0F811C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14413

Modified Files:
	openoffice.org.spec 
Log Message:
add/tweak requires


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2110
retrieving revision 1.2111
diff -u -p -r1.2110 -r1.2111
--- openoffice.org.spec	22 Dec 2009 20:48:29 -0000	1.2110
+++ openoffice.org.spec	23 Dec 2009 09:36:17 -0000	1.2111
@@ -204,6 +204,7 @@ Summary: Python support for OpenOffice.o
 Group: Development/Libraries
 Obsoletes: openoffice.org2-pyuno < 1:3.0.0
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: python
 Requires(pre):    openoffice.org-core
 Requires(post):   openoffice.org-core
@@ -219,7 +220,7 @@ framework to be written in python.
 Summary: Database GUI libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-calc = %{epoch}:%{version}-%{release}
+Requires: %{name}-calc-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: hsqldb, postgresql-jdbc
 
@@ -369,6 +370,7 @@ mathematical symbols. 
 Summary: Word Processor libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: libwpd >= 0.8.0
 
 %description writer-core
@@ -435,6 +437,7 @@ The BrOffice.org Spreadsheet application
 Summary: Drawing libraries for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-graphicfilter = %{epoch}:%{version}-%{release}
 
 %description draw-core
@@ -465,6 +468,7 @@ The BrOffice.org Drawing Application.
 %package impress-core
 Summary: Presentation libraries for OpenOffice.org
 Group: Applications/Productivity
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description impress-core
@@ -495,6 +499,7 @@ The BrOffice.org Presentation Applicatio
 %package math-core
 Summary: Equation editor libraries for OpenOffice.org
 Group: Applications/Productivity
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description math-core 
@@ -523,6 +528,7 @@ The BrOffice.org Equation Editor Applica
 %package graphicfilter
 Summary: OpenOffice.org Extra Graphic filters
 Group: Applications/Productivity
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org2-graphicfilter < 1:3.0.0
 
@@ -560,6 +566,7 @@ update-desktop-database %{_datadir}/appl
 Summary: Testtools for OpenOffice.org
 Group: Development/Libraries
 Obsoletes: openoffice.org2-testtools < 1:3.0.0
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-writer = %{epoch}:%{version}-%{release}
 Requires: %{name}-calc = %{epoch}:%{version}-%{release}
@@ -622,6 +629,7 @@ OpenOffice.org.
 %package headless
 Summary: OpenOffice.org Headless plugin
 Group: Development/Libraries
+Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description headless



From pghmcfc at fedoraproject.org  Wed Dec 23 09:37:09 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 23 Dec 2009 09:37:09 +0000 (UTC)
Subject: rpms/perl-MailTools/devel .cvsignore, 1.14, 1.15 perl-MailTools.spec, 
	1.32, 1.33 sources, 1.14, 1.15
Message-ID: <20091223093709.7ED6E11C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-MailTools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14613

Modified Files:
	.cvsignore perl-MailTools.spec sources 
Log Message:
Update to 2.05


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MailTools/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	30 Jul 2008 11:08:27 -0000	1.14
+++ .cvsignore	23 Dec 2009 09:37:09 -0000	1.15
@@ -1 +1 @@
-MailTools-2.04.tar.gz
+MailTools-2.05.tar.gz


Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- perl-MailTools.spec	7 Dec 2009 04:25:20 -0000	1.32
+++ perl-MailTools.spec	23 Dec 2009 09:37:09 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:	Various mail-related perl modules
 Name:		perl-MailTools
-Version:	2.04
-Release:	4%{?dist}
+Version:	2.05
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/MailTools/
@@ -41,7 +41,7 @@ cd -
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 
 %check
@@ -54,23 +54,67 @@ cd -
 %defattr(-,root,root,-)
 %doc ChangeLog README* examples/
 %dir %{perl_vendorlib}/Mail/
-%doc %{perl_vendorlib}/Mail/*.pod
-%{perl_vendorlib}/Mail/*.pm
 %dir %{perl_vendorlib}/Mail/Field/
-%doc %{perl_vendorlib}/Mail/Field/*.pod
-%{perl_vendorlib}/Mail/Field/*.pm
 %dir %{perl_vendorlib}/Mail/Mailer/
-%{perl_vendorlib}/Mail/Mailer/*.pm
-%{_mandir}/man3/Mail::*.3pm*
+%doc %{perl_vendorlib}/Mail/Address.pod
+%doc %{perl_vendorlib}/Mail/Cap.pod
+%doc %{perl_vendorlib}/Mail/Field.pod
+%doc %{perl_vendorlib}/Mail/Field/AddrList.pod
+%doc %{perl_vendorlib}/Mail/Field/Date.pod
+%doc %{perl_vendorlib}/Mail/Field/Generic.pod
+%doc %{perl_vendorlib}/Mail/Filter.pod
+%doc %{perl_vendorlib}/Mail/Header.pod
+%doc %{perl_vendorlib}/Mail/Internet.pod
+%doc %{perl_vendorlib}/Mail/Mailer.pod
+%doc %{perl_vendorlib}/Mail/Send.pod
+%doc %{perl_vendorlib}/Mail/Util.pod
+%{perl_vendorlib}/Mail/Address.pm
+%{perl_vendorlib}/Mail/Cap.pm
+%{perl_vendorlib}/Mail/Filter.pm
+%{perl_vendorlib}/Mail/Header.pm
+%{perl_vendorlib}/Mail/Internet.pm
+%{perl_vendorlib}/Mail/Field.pm
+%{perl_vendorlib}/Mail/Mailer.pm
+%{perl_vendorlib}/Mail/Send.pm
+%{perl_vendorlib}/Mail/Util.pm
+%{perl_vendorlib}/Mail/Field/AddrList.pm
+%{perl_vendorlib}/Mail/Field/Date.pm
+%{perl_vendorlib}/Mail/Field/Generic.pm
+%{perl_vendorlib}/Mail/Mailer/qmail.pm
+%{perl_vendorlib}/Mail/Mailer/rfc822.pm
+%{perl_vendorlib}/Mail/Mailer/sendmail.pm
+%{perl_vendorlib}/Mail/Mailer/smtp.pm
+%{perl_vendorlib}/Mail/Mailer/testfile.pm
+%{_mandir}/man3/Mail::Address.3pm*
+%{_mandir}/man3/Mail::Cap.3pm*
+%{_mandir}/man3/Mail::Field.3pm*
+%{_mandir}/man3/Mail::Field::AddrList.3pm*
+%{_mandir}/man3/Mail::Field::Date.3pm*
+%{_mandir}/man3/Mail::Field::Generic.3pm*
+%{_mandir}/man3/Mail::Filter.3pm*
+%{_mandir}/man3/Mail::Header.3pm*
+%{_mandir}/man3/Mail::Internet.3pm*
+%{_mandir}/man3/Mail::Mailer.3pm*
+%{_mandir}/man3/Mail::Send.3pm*
+%{_mandir}/man3/Mail::Util.3pm*
 
 %changelog
-* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.04-4
-- rebuild against perl 5.10.1
+* Mon Dec 21 2009 Paul Howarth <paul at city-fan.org> 2.05-1
+- Update to 2.05
+  - Fix de-ref error when index out of range in Mail::Header::get()
+  - Repair fixed selection of smtp for non-unix systems
+  - Do not run pod.t in devel environment
+  - Set default output filename for Mail::Mailer::testfile::PRINT
+  - Warn when no mailers were found (CPAN RT#52901)
+- Tidy up %%files list
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04-3
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> 2.04-4
+- Rebuild against perl 5.10.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04-2
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Jul 30 2008 Paul Howarth <paul at city-fan.org> 2.04-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MailTools/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	30 Jul 2008 11:08:27 -0000	1.14
+++ sources	23 Dec 2009 09:37:09 -0000	1.15
@@ -1 +1 @@
-d21ea4f375d1e5f3da6b0a4e8ba1e2c6  MailTools-2.04.tar.gz
+86a51c5a81a55e555c7a84dfdf6ab270  MailTools-2.05.tar.gz



From caolanm at fedoraproject.org  Wed Dec 23 09:41:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 23 Dec 2009 09:41:37 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2111,1.2112
Message-ID: <20091223094137.236AE11C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15437

Modified Files:
	openoffice.org.spec 
Log Message:
make these site-arch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2111
retrieving revision 1.2112
diff -u -p -r1.2111 -r1.2112
--- openoffice.org.spec	23 Dec 2009 09:36:17 -0000	1.2111
+++ openoffice.org.spec	23 Dec 2009 09:41:36 -0000	1.2112
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 8
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -132,7 +132,7 @@ Patch54: openoffice.org-3.2.0.ooo106502.
 Patch55: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 Patch56: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
 
-%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
 %define ureinstdir %{baseinstdir}/ure
@@ -2140,8 +2140,8 @@ find $RPM_BUILD_ROOT/%{brinstdir} -type 
 %endif
 
 # move python bits into site-packages
-mkdir -p $RPM_BUILD_ROOT/%{python_py_sitearch}
-pushd $RPM_BUILD_ROOT/%{python_py_sitearch}
+mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}
+pushd $RPM_BUILD_ROOT/%{python_sitearch}
 echo "import sys, os" > uno.py
 echo "sys.path.append('%{basisinstdir}/program')" >> uno.py
 echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{oooinstdir}/program/fundamentalrc')" >> uno.py
@@ -4035,8 +4035,8 @@ update-desktop-database %{_datadir}/appl
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
-%{python_py_sitearch}/uno.py*
-%{python_py_sitearch}/unohelper.py*
+%{python_sitearch}/uno.py*
+%{python_sitearch}/unohelper.py*
 %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
 
 %pre pyuno
@@ -4176,6 +4176,9 @@ fi
 %endif
 
 %changelog
+* Wed Dec 23 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-8.3
+- python bits should be site-arch
+
 * Tue Dec 22 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-8.2
 - Resolves: rhbz#545824 bustage in writer with emboldened fonts
 



From petersen at fedoraproject.org  Wed Dec 23 09:44:36 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 23 Dec 2009 09:44:36 +0000 (UTC)
Subject: rpms/m17n-lib/devel m17n-lib.spec, 1.27, 1.28 internal-flt.h, 1.1,
	NONE m17n-lib-nobuild-examples.patch, 1.2, NONE
Message-ID: <20091223094436.B28B611C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/m17n-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15730

Modified Files:
	m17n-lib.spec 
Removed Files:
	internal-flt.h m17n-lib-nobuild-examples.patch 
Log Message:
- add bcond for otf, anthy, and gui
- subpackage flt for emacs, etc
- add subpackages for anthy and ispell modules
- disable new gui subpackage (and hence ispell)




Index: m17n-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/m17n-lib/devel/m17n-lib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- m17n-lib.spec	18 Aug 2009 08:52:22 -0000	1.27
+++ m17n-lib.spec	23 Dec 2009 09:44:36 -0000	1.28
@@ -1,11 +1,13 @@
-# set to 1 to build with GUI and OpenType Font support
-%define with_gui 0
-# set to 1 to build examples (including anthy support)
-%define with_examples 0
+%bcond_without otf
+
+# note this duplicates native anthy IMEs
+%bcond_without anthy
+# use --with gui to build GUI library
+%bcond_with gui
 
 Name:    m17n-lib
 Version:  1.5.5
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  Multilingual text library
 
 Group:    System Environment/Libraries
@@ -13,52 +15,79 @@ License:  LGPLv2
 URL:    http://www.m17n.org/m17n-lib/index.html
 Source0:  http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if %{with_gui}
-BuildRequires:  libxml2-devel, xorg-x11-devel
-BuildRequires:  freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0
-BuildRequires:  libotf-devel >= %{libotf_version}
-%else
-BuildRequires:  autoconf
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-%endif
-%if %{with_examples}
+BuildRequires:  m17n-db-devel = %{version}
+%if %{with anthy}
 BuildRequires:  anthy-devel
 %endif
-Requires:  m17n-db >= 1.4.0
-Patch2:    m17n-lib-nobuild-examples.patch
+%if %{with gui}
+BuildRequires:  libxml2-devel, libXft-devel, fontconfig-devel
+BuildRequires:  freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0, libXaw-devel
+# ispell seems to depend on gui
+BuildRequires:  aspell
+%endif
+%if %{with otf}
+BuildRequires:  libotf-devel
+%endif
+Requires:  m17n-db = %{version}
 
 %description
 m17n-lib is a multilingual text library used primarily to allow
 the input of many languages with the input table maps from m17n-db.
 
+The package provides the core and input method backend libraries.
+
+%package  anthy
+Summary:  Anthy module for m17n
+Group:    System Environment/Libraries
+
+%description anthy
+Anthy module for %{name} allows ja-anthy.mim to support input conversion.
+
 
 %package  devel
 Summary:  m17n-lib development files
 Group:    Development/Libraries
 Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}-flt = %{version}-%{release}
+Requires:  %{name}-anthy = %{version}-%{release}
 
 %description devel
 Development files for %{name}.
 
 
-%prep
-%setup -q
+%package  flt
+Summary:  m17n Font Layout Library
+Group:    System Environment/Libraries
+Requires: m17n-db-flt
+
+%description flt
+Font layout library for complex text rendering.
 
-%if ! %{with_examples}
-%patch2 -p1 -b .examples
+
+%if %{with gui}
+%package  gui
+Summary:  m17n GUI Library
+Group:    System Environment/Libraries
+Requires: m17n-db-datafiles
+
+%description gui
+M17n GUI widget library.
+
+
+%package  ispell
+Summary:  Spelling module for m17n
+Group:    System Environment/Libraries
+
+%description ispell
+Ispell module for m17n input.
 %endif
-# patch2 touches Makefile.am
-autoreconf
+
+
+%prep
+%setup -q
 
 %build
-%configure --disable-static \
-%if ! %{with_gui}
-  --without-gui
-%else
-  %{nil}
-%endif
+%configure --disable-static %{!?with_gui:--without-gui}
 make
 
 
@@ -67,9 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
 
 # remove unneeded files
-rm $RPM_BUILD_ROOT%{_bindir}/m17n-config
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+%if %{without anthy}
+rm $RPM_BUILD_ROOT%{_libdir}/libmimx-anthy*
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,18 +116,51 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS
-%{_libdir}/lib*.so.*
+%{_bindir}/m17n-conv
+%{_libdir}/libm17n.so.*
+%{_libdir}/libm17n-core.so.*
+
+%files anthy
+%defattr(-,root,root)
+%{_libdir}/libmimx-anthy.so.*
 
 %files devel
 %defattr(-,root,root)
 %doc ChangeLog README
+%{_bindir}/m17n-config
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+%files flt
+%defattr(-,root,root)
+%{_libdir}/libm17n-flt.so.*
+
+%if %{with gui}
+%files gui
+%defattr(-,root,root)
+%{_bindir}/m17n-date
+%{_bindir}/m17n-dump
+%{_bindir}/m17n-edit
+%{_bindir}/m17n-view
+%{_libdir}/libm17n-X.so.*
+%{_libdir}/libm17n-gd.so.*
+%{_libdir}/libm17n-gui.so.*
+
+%files ispell
+%defattr(-,root,root)
+%{_libdir}/libmimx-ispell.so.*
+%endif
+
 
 %changelog
-* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.5.5-2
+- add bcond for otf, anthy, and gui
+- subpackage flt for emacs, etc
+- add subpackages for anthy and ispell modules
+- disable new gui subpackage (and hence ispell)
+
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> - 1.5.5-1
 - update to new upstream release 1.5.5
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.4-2


--- internal-flt.h DELETED ---


--- m17n-lib-nobuild-examples.patch DELETED ---



From sharkcz at fedoraproject.org  Wed Dec 23 10:09:15 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 10:09:15 +0000 (UTC)
Subject: File qlandkartegt-0.16.1.tar.gz uploaded to lookaside cache by sharkcz
Message-ID: <20091223100915.22D6B10F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qlandkartegt:

d6859250f34264ab73af2ca8a8e83c21  qlandkartegt-0.16.1.tar.gz



From sharkcz at fedoraproject.org  Wed Dec 23 10:46:34 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 10:46:34 +0000 (UTC)
Subject: rpms/qlandkartegt/devel .cvsignore, 1.12,
	1.13 qlandkartegt-0.16.0-nogtkstyle.patch, 1.1,
	1.2 qlandkartegt.spec, 1.15, 1.16 sources, 1.12, 1.13
Message-ID: <20091223104635.1B4ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21900

Modified Files:
	.cvsignore qlandkartegt-0.16.0-nogtkstyle.patch 
	qlandkartegt.spec sources 
Log Message:
* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.16.1-1
- update to 0.16.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Oct 2009 16:06:35 -0000	1.12
+++ .cvsignore	23 Dec 2009 10:46:34 -0000	1.13
@@ -1 +1 @@
-qlandkartegt-0.16.0.tar.gz
+qlandkartegt-0.16.1.tar.gz

qlandkartegt-0.16.0-nogtkstyle.patch:
 main.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: qlandkartegt-0.16.0-nogtkstyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/qlandkartegt-0.16.0-nogtkstyle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qlandkartegt-0.16.0-nogtkstyle.patch	28 Oct 2009 16:06:35 -0000	1.1
+++ qlandkartegt-0.16.0-nogtkstyle.patch	23 Dec 2009 10:46:34 -0000	1.2
@@ -1,11 +1,24 @@
-diff -Nrup qlandkartegt-0.16.0.orig/src/main.cpp qlandkartegt-0.16.0/src/main.cpp
---- qlandkartegt-0.16.0.orig/src/main.cpp	2009-10-26 22:19:47.000000000 +0100
-+++ qlandkartegt-0.16.0/src/main.cpp	2009-10-27 09:40:14.000000000 +0100
-@@ -61,6 +61,7 @@ int main(int argc, char ** argv)
+From af48b5558da8d187536d140a618c39dc1428f1d9 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Wed, 23 Dec 2009 10:52:40 +0100
+Subject: [PATCH] manually set style to workaround rhbz#498111
+
+---
+ src/main.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index b2a5bd2..bb10ea4 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -145,6 +145,7 @@ int main(int argc, char ** argv)
  #ifndef WIN32
      setenv("LC_NUMERIC","C",1);
  #endif
 +    QApplication::setStyle("cleanlooks");
      QApplication theApp(argc,argv);
- 
- #ifdef ENABLE_TRANSLATION
+     processOptions();
+     qInstallMsgHandler(myMessageOutput);
+-- 
+1.6.3.3
+


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/qlandkartegt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qlandkartegt.spec	25 Nov 2009 00:35:34 -0000	1.15
+++ qlandkartegt.spec	23 Dec 2009 10:46:34 -0000	1.16
@@ -1,6 +1,6 @@
 Name: qlandkartegt
-Version: 0.16.0
-Release: 3%{?dist}
+Version: 0.16.1
+Release: 1%{?dist}
 Summary: GPS device mapping tool
 
 Group: Applications/Communications
@@ -10,7 +10,7 @@ Source0: http://downloads.sourceforge.ne
 # temporary fix until http://bugzilla.redhat.com/show_bug.cgi?id=498111 is resolved
 Patch0: %{name}-0.16.0-nogtkstyle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: garmindev(interface) = 1.16
+Requires: garmindev(interface) = 1.17
 
 BuildRequires: cmake qt4-devel proj-devel gdal-devel desktop-file-utils
 BuildRequires: libexif-devel
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.16.1-1
+- update to 0.16.1
+
 * Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.16.0-3
 - Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Oct 2009 16:06:36 -0000	1.12
+++ sources	23 Dec 2009 10:46:34 -0000	1.13
@@ -1 +1 @@
-9af694894fe74c3f64971fcfc4055bbf  qlandkartegt-0.16.0.tar.gz
+d6859250f34264ab73af2ca8a8e83c21  qlandkartegt-0.16.1.tar.gz



From sharkcz at fedoraproject.org  Wed Dec 23 10:52:01 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 10:52:01 +0000 (UTC)
Subject: rpms/qlandkartegt/F-12 .cvsignore, 1.12,
	1.13 qlandkartegt-0.16.0-nogtkstyle.patch, 1.1,
	1.2 qlandkartegt.spec, 1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20091223105201.9633C11C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22581

Modified Files:
	.cvsignore qlandkartegt-0.16.0-nogtkstyle.patch 
	qlandkartegt.spec sources 
Log Message:
* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.16.1-1
- update to 0.16.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Oct 2009 10:03:49 -0000	1.12
+++ .cvsignore	23 Dec 2009 10:52:01 -0000	1.13
@@ -1 +1 @@
-qlandkartegt-0.16.0.tar.gz
+qlandkartegt-0.16.1.tar.gz

qlandkartegt-0.16.0-nogtkstyle.patch:
 main.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: qlandkartegt-0.16.0-nogtkstyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-12/qlandkartegt-0.16.0-nogtkstyle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qlandkartegt-0.16.0-nogtkstyle.patch	29 Oct 2009 10:03:49 -0000	1.1
+++ qlandkartegt-0.16.0-nogtkstyle.patch	23 Dec 2009 10:52:01 -0000	1.2
@@ -1,11 +1,24 @@
-diff -Nrup qlandkartegt-0.16.0.orig/src/main.cpp qlandkartegt-0.16.0/src/main.cpp
---- qlandkartegt-0.16.0.orig/src/main.cpp	2009-10-26 22:19:47.000000000 +0100
-+++ qlandkartegt-0.16.0/src/main.cpp	2009-10-27 09:40:14.000000000 +0100
-@@ -61,6 +61,7 @@ int main(int argc, char ** argv)
+From af48b5558da8d187536d140a618c39dc1428f1d9 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Wed, 23 Dec 2009 10:52:40 +0100
+Subject: [PATCH] manually set style to workaround rhbz#498111
+
+---
+ src/main.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index b2a5bd2..bb10ea4 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -145,6 +145,7 @@ int main(int argc, char ** argv)
  #ifndef WIN32
      setenv("LC_NUMERIC","C",1);
  #endif
 +    QApplication::setStyle("cleanlooks");
      QApplication theApp(argc,argv);
- 
- #ifdef ENABLE_TRANSLATION
+     processOptions();
+     qInstallMsgHandler(myMessageOutput);
+-- 
+1.6.3.3
+


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-12/qlandkartegt.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- qlandkartegt.spec	6 Nov 2009 12:30:10 -0000	1.14
+++ qlandkartegt.spec	23 Dec 2009 10:52:01 -0000	1.15
@@ -1,6 +1,6 @@
 Name: qlandkartegt
-Version: 0.16.0
-Release: 2%{?dist}
+Version: 0.16.1
+Release: 1%{?dist}
 Summary: GPS device mapping tool
 
 Group: Applications/Communications
@@ -10,7 +10,7 @@ Source0: http://downloads.sourceforge.ne
 # temporary fix until http://bugzilla.redhat.com/show_bug.cgi?id=498111 is resolved
 Patch0: %{name}-0.16.0-nogtkstyle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: garmindev(interface) = 1.16
+Requires: garmindev(interface) = 1.17
 
 BuildRequires: cmake qt4-devel proj-devel gdal-devel desktop-file-utils
 BuildRequires: libexif-devel
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.16.1-1
+- update to 0.16.1
+
 * Fri Nov  6 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-2
 - don't build the 3rd party stuff as shared libraries
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Oct 2009 10:03:49 -0000	1.12
+++ sources	23 Dec 2009 10:52:01 -0000	1.13
@@ -1 +1 @@
-9af694894fe74c3f64971fcfc4055bbf  qlandkartegt-0.16.0.tar.gz
+d6859250f34264ab73af2ca8a8e83c21  qlandkartegt-0.16.1.tar.gz



From sharkcz at fedoraproject.org  Wed Dec 23 11:05:32 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 23 Dec 2009 11:05:32 +0000 (UTC)
Subject: rpms/qlandkartegt/F-11 .cvsignore, 1.12,
	1.13 qlandkartegt-0.16.0-nogtkstyle.patch, 1.1,
	1.2 qlandkartegt.spec, 1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20091223110532.AC33B11C00E6@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24737

Modified Files:
	.cvsignore qlandkartegt-0.16.0-nogtkstyle.patch 
	qlandkartegt.spec sources 
Log Message:
* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.16.1-1
- update to 0.16.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Oct 2009 10:05:56 -0000	1.12
+++ .cvsignore	23 Dec 2009 11:05:32 -0000	1.13
@@ -1 +1 @@
-qlandkartegt-0.16.0.tar.gz
+qlandkartegt-0.16.1.tar.gz

qlandkartegt-0.16.0-nogtkstyle.patch:
 main.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: qlandkartegt-0.16.0-nogtkstyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/qlandkartegt-0.16.0-nogtkstyle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qlandkartegt-0.16.0-nogtkstyle.patch	29 Oct 2009 10:05:56 -0000	1.1
+++ qlandkartegt-0.16.0-nogtkstyle.patch	23 Dec 2009 11:05:32 -0000	1.2
@@ -1,11 +1,24 @@
-diff -Nrup qlandkartegt-0.16.0.orig/src/main.cpp qlandkartegt-0.16.0/src/main.cpp
---- qlandkartegt-0.16.0.orig/src/main.cpp	2009-10-26 22:19:47.000000000 +0100
-+++ qlandkartegt-0.16.0/src/main.cpp	2009-10-27 09:40:14.000000000 +0100
-@@ -61,6 +61,7 @@ int main(int argc, char ** argv)
+From af48b5558da8d187536d140a618c39dc1428f1d9 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Wed, 23 Dec 2009 10:52:40 +0100
+Subject: [PATCH] manually set style to workaround rhbz#498111
+
+---
+ src/main.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index b2a5bd2..bb10ea4 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -145,6 +145,7 @@ int main(int argc, char ** argv)
  #ifndef WIN32
      setenv("LC_NUMERIC","C",1);
  #endif
 +    QApplication::setStyle("cleanlooks");
      QApplication theApp(argc,argv);
- 
- #ifdef ENABLE_TRANSLATION
+     processOptions();
+     qInstallMsgHandler(myMessageOutput);
+-- 
+1.6.3.3
+


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/qlandkartegt.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- qlandkartegt.spec	6 Nov 2009 12:31:33 -0000	1.14
+++ qlandkartegt.spec	23 Dec 2009 11:05:32 -0000	1.15
@@ -1,6 +1,6 @@
 Name: qlandkartegt
-Version: 0.16.0
-Release: 2%{?dist}
+Version: 0.16.1
+Release: 1%{?dist}
 Summary: GPS device mapping tool
 
 Group: Applications/Communications
@@ -10,7 +10,7 @@ Source0: http://downloads.sourceforge.ne
 # temporary fix until http://bugzilla.redhat.com/show_bug.cgi?id=498111 is resolved
 Patch0: %{name}-0.16.0-nogtkstyle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: garmindev(interface) = 1.16
+Requires: garmindev(interface) = 1.17
 
 BuildRequires: cmake qt4-devel proj-devel gdal-devel desktop-file-utils
 BuildRequires: libexif-devel
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 23 2009 Dan Hor?k <dan[at]danny.cz> 0.16.1-1
+- update to 0.16.1
+
 * Fri Nov  6 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-2
 - don't build the 3rd party stuff as shared libraries
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Oct 2009 10:05:56 -0000	1.12
+++ sources	23 Dec 2009 11:05:32 -0000	1.13
@@ -1 +1 @@
-9af694894fe74c3f64971fcfc4055bbf  qlandkartegt-0.16.0.tar.gz
+d6859250f34264ab73af2ca8a8e83c21  qlandkartegt-0.16.1.tar.gz



From akurtakov at fedoraproject.org  Wed Dec 23 11:07:38 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 11:07:38 +0000 (UTC)
Subject: File plexus-i18n-1.0-beta-10-src.tar.bz2 uploaded to lookaside cache
	by akurtakov
Message-ID: <20091223110738.C729310F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for plexus-i18n:

203d01844ef13facf5e52afeff9f93c6  plexus-i18n-1.0-beta-10-src.tar.bz2



From akurtakov at fedoraproject.org  Wed Dec 23 11:09:36 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 11:09:36 +0000 (UTC)
Subject: rpms/plexus-i18n/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 plexus-i18n.spec, 1.7, 1.8 plexus-i18n-1.0-jpp-depmap.xml,
	1.1, NONE plexus-i18n-1.0-project.xml, 1.1,
	NONE plexus-i18n-settings.xml, 1.1, NONE
Message-ID: <20091223110936.8D11F11C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-i18n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25736/devel

Modified Files:
	.cvsignore sources plexus-i18n.spec 
Removed Files:
	plexus-i18n-1.0-jpp-depmap.xml plexus-i18n-1.0-project.xml 
	plexus-i18n-settings.xml 
Log Message:
- Update to beta 10.
- Drop gcj and fix BRs.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-i18n/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Mar 2007 21:59:32 -0000	1.2
+++ .cvsignore	23 Dec 2009 11:09:36 -0000	1.3
@@ -1 +1,2 @@
 plexus-i18n-1.0-beta-6-src.tar.gz
+plexus-i18n-1.0-beta-10-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-i18n/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Mar 2007 21:59:32 -0000	1.2
+++ sources	23 Dec 2009 11:09:36 -0000	1.3
@@ -1 +1 @@
-37d0050c62c1ceb49a50420a8ee0dff8  plexus-i18n-1.0-beta-6-src.tar.gz
+203d01844ef13facf5e52afeff9f93c6  plexus-i18n-1.0-beta-10-src.tar.bz2


Index: plexus-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-i18n/devel/plexus-i18n.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- plexus-i18n.spec	26 Jul 2009 18:55:41 -0000	1.7
+++ plexus-i18n.spec	23 Dec 2009 11:09:36 -0000	1.8
@@ -29,32 +29,26 @@
 #
 
 %define with_maven 1
-%define gcj_support 0
 %define parent plexus
 %define subname i18n
 
 Name:           plexus-i18n
 Version:        1.0
-Release:        0.b6.5.3%{?dist}.3
+Release:        0.b10.1%{?dist}
 Epoch:          0
 Summary:        Plexus I18N Component
 License:        ASL 2.0
 Group:          Development/Java
-URL:            http://plexus.codehaus.org/
-Source0:        plexus-i18n-1.0-beta-6-src.tar.gz
-# svn export http://svn.codehaus.org/plexus/tags/plexus-i18n-1.0-beta-6svn export http://svn.plexus.codehaus.org/plexus/tags/plexus-i18n-1.0-beta-6
-# tar czf plexus-i18n-1.0-beta-6-src.tar.gz plexus-i18n-1.0-beta-6/
+URL:           http://plexus.codehaus.org/plexus-components/plexus-i18n
+Source0:        plexus-i18n-1.0-beta-10-src.tar.bz2
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-i18n-1.0-beta-10/
+# tar cjf plexus-i18n-1.0-beta-10-src.tar.bz2 plexus-i18n-1.0-beta-10/
 Source1:        plexus-i18n-1.0-build.xml
-Source2:        plexus-i18n-1.0-project.xml
-Source3:        plexus-i18n-settings.xml
-Source4:        plexus-i18n-1.0-jpp-depmap.xml
 Source5:        plexus-i18n-1.0-plexus-components.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 %if %{with_maven}
@@ -63,9 +57,10 @@ BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-release
 BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  maven-doxia-sitetools
 BuildRequires:  plexus-maven-plugin
 %endif
 BuildRequires:  classworlds >= 0:1.1
@@ -77,12 +72,6 @@ Requires:  plexus-utils 
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
-
 %description
 The Plexus project seeks to create end-to-end developer tools for 
 writing applications. At the core is the container, which can be 
@@ -101,23 +90,15 @@ Javadoc for %{name}.
 
 
 %prep
-%setup -q -n plexus-i18n-1.0-beta-6
+%setup -q -n plexus-i18n-1.0-beta-10
 for j in $(find . -name "*.jar"); do
         mv $j $j.no
 done
 cp %{SOURCE1} build.xml
-cp %{SOURCE2} project.xml
 mkdir -p src/main/resources/META-INF/plexus
-cp %{SOURCE3} settings.xml
 
 %build
 %if %{with_maven}
-sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
-sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
@@ -126,9 +107,7 @@ ln -s %{_javadir} external_repo/JPP
 
 mvn-jpp \
         -e \
-        -s $(pwd)/settings.xml \
         -Dmaven2.jpp.mode=true \
-        -Dmaven2.jpp.depmap.file=%{SOURCE4} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
 
@@ -147,7 +126,7 @@ ant jar javadoc
 mkdir -p META-INF/plexus META-INF/maven/org.codehaus.plexus/plexus-i18n/
 cp %{SOURCE5} META-INF/plexus/components.xml
 cp pom.xml META-INF/maven/org.codehaus.plexus/plexus-i18n/
-jar uvf target/%{name}-%{version}-beta-6.jar META-INF
+jar uvf target/%{name}-%{version}-beta-10.jar META-INF
 rm -rf META-INF
 
 %endif
@@ -156,7 +135,7 @@ rm -rf META-INF
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{version}-beta-6.jar \
+install -pm 644 target/%{name}-%{version}-beta-10.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/i18n-%{version}.jar
 %add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
 
@@ -179,30 +158,14 @@ cp -pr target/docs/apidocs/* $RPM_BUILD_
 %endif
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(-,root,root,-)
@@ -211,10 +174,6 @@ fi
 %{_datadir}/maven2/poms/*
 %endif
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -222,6 +181,10 @@ fi
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.b10.1
+- Update to beta 10.
+- Drop gcj and fix BRs.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.b6.5.3.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -264,4 +227,3 @@ fi
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b6.1jpp
 - First JPackage build
-


--- plexus-i18n-1.0-jpp-depmap.xml DELETED ---


--- plexus-i18n-1.0-project.xml DELETED ---


--- plexus-i18n-settings.xml DELETED ---



From twaugh at fedoraproject.org  Wed Dec 23 11:11:36 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 11:11:36 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3425.patch, 1.2, 1.3 cups.spec, 1.567,
	1.568 cups-delete-active-printer.patch, 1.1, NONE
Message-ID: <20091223111136.485C111C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26218

Modified Files:
	cups-str3425.patch cups.spec 
Removed Files:
	cups-delete-active-printer.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
- Fixed patch for STR #3425 again by adding in back-ported change from
  svn revision 8929 (bug #549899).  No longer need
  delete-active-printer patch.


cups-str3425.patch:
 job.c  |   10 ++++------
 main.c |   21 +++++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3425.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cups-str3425.patch	19 Dec 2009 13:03:29 -0000	1.2
+++ cups-str3425.patch	23 Dec 2009 11:11:36 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
---- cups-1.4.2/scheduler/job.c.str3425	2009-12-19 12:12:18.346037032 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-19 12:12:35.806163016 +0000
+--- cups-1.4.2/scheduler/job.c.str3425	2009-12-23 11:00:06.070056898 +0000
++++ cups-1.4.2/scheduler/job.c	2009-12-23 11:02:22.889056232 +0000
 @@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
        if (purge)
  	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
@@ -33,9 +33,18 @@ diff -up cups-1.4.2/scheduler/job.c.str3
  	break;
    }
  
+@@ -2507,7 +2505,7 @@ cupsdSetJobState(
+   * Finalize the job immediately if we forced things...
+   */
+ 
+-  if (action == CUPSD_JOB_FORCE)
++  if (action >= CUPSD_JOB_FORCE && job->printer)
+     finalize_job(job);
+ 
+  /*
 diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
---- cups-1.4.2/scheduler/main.c.str3425	2009-12-19 12:12:18.221037105 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-19 12:12:18.434038283 +0000
+--- cups-1.4.2/scheduler/main.c.str3425	2009-12-23 11:00:05.687056970 +0000
++++ cups-1.4.2/scheduler/main.c	2009-12-23 11:00:06.156057773 +0000
 @@ -389,7 +389,7 @@ main(int  argc,				/* I - Number of comm
      * parent's file descriptors to be blocking.  This is a workaround for a
      * limitation of userland libpthread on OpenBSD.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -p -r1.567 -r1.568
--- cups.spec	22 Dec 2009 17:05:44 -0000	1.567
+++ cups.spec	23 Dec 2009 11:11:36 -0000	1.568
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -73,9 +73,8 @@ Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
-Patch49: cups-delete-active-printer.patch
-Patch50: cups-gnutls-gcrypt-threads.patch
-Patch51: cups-str3458.patch
+Patch49: cups-gnutls-gcrypt-threads.patch
+Patch50: cups-str3458.patch
 
 Patch100: cups-lspp.patch
 
@@ -254,9 +253,8 @@ module. 
 %patch46 -p1 -b .str3425
 %patch47 -p1 -b .str3428
 %patch48 -p1 -b .str3431
-%patch49 -p1 -b .delete-active-printer
-%patch50 -p1 -b .gnutls-gcrypt-threads
-%patch51 -p1 -b .str3458
+%patch49 -p1 -b .gnutls-gcrypt-threads
+%patch50 -p1 -b .str3458
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -555,6 +553,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
+- Fixed patch for STR #3425 again by adding in back-ported change from
+  svn revision 8929 (bug #549899).  No longer need
+  delete-active-printer patch.
+
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
 - Fixed ipp authentication for servers requiring authentication for
   IPP-Get-Printer-Attributes (bug #548873, STR #3458).


--- cups-delete-active-printer.patch DELETED ---



From twaugh at fedoraproject.org  Wed Dec 23 11:18:31 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 11:18:31 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3425.patch, 1.2, 1.3 cups.spec, 1.560,
	1.561 cups-delete-active-printer.patch, 1.1, NONE
Message-ID: <20091223111831.F308A11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27452

Modified Files:
	cups-str3425.patch cups.spec 
Removed Files:
	cups-delete-active-printer.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
- Fixed patch for STR #3425 again by adding in back-ported change from
  svn revision 8929 (bug #549899).  No longer need
  delete-active-printer patch.


cups-str3425.patch:
 job.c  |   10 ++++------
 main.c |   21 +++++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-str3425.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cups-str3425.patch	19 Dec 2009 13:03:19 -0000	1.2
+++ cups-str3425.patch	23 Dec 2009 11:18:31 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
---- cups-1.4.2/scheduler/job.c.str3425	2009-12-19 12:12:18.346037032 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-19 12:12:35.806163016 +0000
+--- cups-1.4.2/scheduler/job.c.str3425	2009-12-23 11:00:06.070056898 +0000
++++ cups-1.4.2/scheduler/job.c	2009-12-23 11:02:22.889056232 +0000
 @@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
        if (purge)
  	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
@@ -33,9 +33,18 @@ diff -up cups-1.4.2/scheduler/job.c.str3
  	break;
    }
  
+@@ -2507,7 +2505,7 @@ cupsdSetJobState(
+   * Finalize the job immediately if we forced things...
+   */
+ 
+-  if (action == CUPSD_JOB_FORCE)
++  if (action >= CUPSD_JOB_FORCE && job->printer)
+     finalize_job(job);
+ 
+  /*
 diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
---- cups-1.4.2/scheduler/main.c.str3425	2009-12-19 12:12:18.221037105 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-19 12:12:18.434038283 +0000
+--- cups-1.4.2/scheduler/main.c.str3425	2009-12-23 11:00:05.687056970 +0000
++++ cups-1.4.2/scheduler/main.c	2009-12-23 11:00:06.156057773 +0000
 @@ -389,7 +389,7 @@ main(int  argc,				/* I - Number of comm
      * parent's file descriptors to be blocking.  This is a workaround for a
      * limitation of userland libpthread on OpenBSD.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -p -r1.560 -r1.561
--- cups.spec	22 Dec 2009 17:04:19 -0000	1.560
+++ cups.spec	23 Dec 2009 11:18:31 -0000	1.561
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -74,9 +74,8 @@ Patch59: cups-str3436.patch
 Patch60: cups-str3425.patch
 Patch61: cups-str3428.patch
 Patch62: cups-str3431.patch
-Patch63: cups-delete-active-printer.patch
-Patch64: cups-gnutls-gcrypt-threads.patch
-Patch65: cups-str3458.patch
+Patch63: cups-gnutls-gcrypt-threads.patch
+Patch64: cups-str3458.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -255,9 +254,8 @@ module. 
 %patch60 -p1 -b .str3425
 %patch61 -p1 -b .str3428
 %patch62 -p1 -b .str3431
-%patch63 -p1 -b .delete-active-printer
-%patch64 -p1 -b .gnutls-gcrypt-threads
-%patch65 -p1 -b .str3458
+%patch63 -p1 -b .gnutls-gcrypt-threads
+%patch64 -p1 -b .str3458
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -549,6 +547,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
+- Fixed patch for STR #3425 again by adding in back-ported change from
+  svn revision 8929 (bug #549899).  No longer need
+  delete-active-printer patch.
+
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
 - Fixed ipp authentication for servers requiring authentication for
   IPP-Get-Printer-Attributes (bug #548873, STR #3458).


--- cups-delete-active-printer.patch DELETED ---



From akurtakov at fedoraproject.org  Wed Dec 23 11:19:49 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 11:19:49 +0000 (UTC)
Subject: rpms/plexus-i18n/devel plexus-i18n.spec,1.8,1.9
Message-ID: <20091223111949.57A4D11C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-i18n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28023/devel

Modified Files:
	plexus-i18n.spec 
Log Message:
BR java-devel 1.6.0.


Index: plexus-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-i18n/devel/plexus-i18n.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- plexus-i18n.spec	23 Dec 2009 11:09:36 -0000	1.8
+++ plexus-i18n.spec	23 Dec 2009 11:19:49 -0000	1.9
@@ -34,7 +34,7 @@
 
 Name:           plexus-i18n
 Version:        1.0
-Release:        0.b10.1%{?dist}
+Release:        0.b10.2%{?dist}
 Epoch:          0
 Summary:        Plexus I18N Component
 License:        ASL 2.0
@@ -51,6 +51,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
+BuildRequires:  java-devel >= 1.6.0
 %if %{with_maven}
 BuildRequires:  maven2 >= 2.0.4-10jpp
 BuildRequires:  maven2-plugin-compiler
@@ -181,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.b10.2
+- BR java-devel 1.6.0.
+
 * Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.b10.1
 - Update to beta 10.
 - Drop gcj and fix BRs.



From twaugh at fedoraproject.org  Wed Dec 23 11:19:51 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 11:19:51 +0000 (UTC)
Subject: rpms/cups/devel cups-str3425.patch, 1.2, 1.3 cups.spec, 1.570,
	1.571 cups-delete-active-printer.patch, 1.1, NONE
Message-ID: <20091223111951.4524411C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28038

Modified Files:
	cups-str3425.patch cups.spec 
Removed Files:
	cups-delete-active-printer.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-21
- Fixed patch for STR #3425 again by adding in back-ported change from
  svn revision 8929 (bug #549899).  No longer need
  delete-active-printer patch.


cups-str3425.patch:
 job.c  |   10 ++++------
 main.c |   21 +++++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3425.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cups-str3425.patch	19 Dec 2009 13:03:41 -0000	1.2
+++ cups-str3425.patch	23 Dec 2009 11:19:51 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
---- cups-1.4.2/scheduler/job.c.str3425	2009-12-19 12:12:18.346037032 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-19 12:12:35.806163016 +0000
+--- cups-1.4.2/scheduler/job.c.str3425	2009-12-23 11:00:06.070056898 +0000
++++ cups-1.4.2/scheduler/job.c	2009-12-23 11:02:22.889056232 +0000
 @@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
        if (purge)
  	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
@@ -33,9 +33,18 @@ diff -up cups-1.4.2/scheduler/job.c.str3
  	break;
    }
  
+@@ -2507,7 +2505,7 @@ cupsdSetJobState(
+   * Finalize the job immediately if we forced things...
+   */
+ 
+-  if (action == CUPSD_JOB_FORCE)
++  if (action >= CUPSD_JOB_FORCE && job->printer)
+     finalize_job(job);
+ 
+  /*
 diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
---- cups-1.4.2/scheduler/main.c.str3425	2009-12-19 12:12:18.221037105 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-19 12:12:18.434038283 +0000
+--- cups-1.4.2/scheduler/main.c.str3425	2009-12-23 11:00:05.687056970 +0000
++++ cups-1.4.2/scheduler/main.c	2009-12-23 11:00:06.156057773 +0000
 @@ -389,7 +389,7 @@ main(int  argc,				/* I - Number of comm
      * parent's file descriptors to be blocking.  This is a workaround for a
      * limitation of userland libpthread on OpenBSD.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -p -r1.570 -r1.571
--- cups.spec	22 Dec 2009 17:06:04 -0000	1.570
+++ cups.spec	23 Dec 2009 11:19:51 -0000	1.571
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -71,9 +71,8 @@ Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
-Patch49: cups-delete-active-printer.patch
-Patch50: cups-gnutls-gcrypt-threads.patch
-Patch51: cups-str3458.patch
+Patch49: cups-gnutls-gcrypt-threads.patch
+Patch50: cups-str3458.patch
 
 Patch100: cups-lspp.patch
 
@@ -252,9 +251,8 @@ module. 
 %patch46 -p1 -b .str3425
 %patch47 -p1 -b .str3428
 %patch48 -p1 -b .str3431
-%patch49 -p1 -b .delete-active-printer
-%patch50 -p1 -b .gnutls-gcrypt-threads
-%patch51 -p1 -b .str3458
+%patch49 -p1 -b .gnutls-gcrypt-threads
+%patch50 -p1 -b .str3458
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -545,6 +543,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-21
+- Fixed patch for STR #3425 again by adding in back-ported change from
+  svn revision 8929 (bug #549899).  No longer need
+  delete-active-printer patch.
+
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
 - Fixed ipp authentication for servers requiring authentication for
   IPP-Get-Printer-Attributes (bug #548873, STR #3458).


--- cups-delete-active-printer.patch DELETED ---



From iefremov at fedoraproject.org  Wed Dec 23 11:36:46 2009
From: iefremov at fedoraproject.org (iefremov)
Date: Wed, 23 Dec 2009 11:36:46 +0000 (UTC)
Subject: rpms/ugene/devel .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 ugene.spec,
	1.8, 1.9
Message-ID: <20091223113646.92DAA11C00E6@cvs1.fedora.phx.redhat.com>

Author: iefremov

Update of /cvs/pkgs/rpms/ugene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30841

Modified Files:
	.cvsignore sources ugene.spec 
Log Message:
Update to 1.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Jul 2009 13:18:59 -0000	1.4
+++ .cvsignore	23 Dec 2009 11:36:44 -0000	1.5
@@ -1 +1 @@
-ugene-1.5.1.tar.gz
+ugene-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Jul 2009 13:18:59 -0000	1.5
+++ sources	23 Dec 2009 11:36:44 -0000	1.6
@@ -1 +1 @@
-082534460b4601c8e9ee64f07a56f164  ugene-1.5.1.tar.gz
+1ee200e1eb3e556796224b8830707f6b  ugene-1.6.0.tar.gz


Index: ugene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ugene/devel/ugene.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ugene.spec	27 Jul 2009 06:28:44 -0000	1.8
+++ ugene.spec	23 Dec 2009 11:36:45 -0000	1.9
@@ -1,6 +1,6 @@
 Name:    ugene
 Summary: Integrated bioinformatics toolkit
-Version: 1.5.1
+Version: 1.6.0
 Release: 2%{?dist}
 #The entire source code is GPLv2+ except:
 #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %doc COPYRIGHT LICENSE
 
 %changelog
+* Wed Dec 23 2009 Ivan Efremov <iefremov at unipro.ru> - 1.6.0-1 
+- Upstream version change
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sergiopr at fedoraproject.org  Wed Dec 23 11:40:04 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 11:40:04 +0000 (UTC)
Subject: rpms/funtools/devel funtools.spec,1.16,1.17
Message-ID: <20091223114004.2A08411C00E6@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/funtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31674

Modified Files:
	funtools.spec 
Log Message:
* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-1
- New upstream source



Index: funtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/devel/funtools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- funtools.spec	24 Jul 2009 23:17:43 -0000	1.16
+++ funtools.spec	23 Dec 2009 11:40:03 -0000	1.17
@@ -2,17 +2,14 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name: funtools
-Version: 1.4.0
-Release: 11%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: FITS library and utilities
 
-# Upstream version
-%define upversion 1.4.0
-
 Group: Applications/Engineering
 License: LGPLv2+
 URL: http://hea-www.harvard.edu/RD/funtools/
-Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{upversion}.tar.gz
+Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{version}.tar.gz
 Patch0: funtools-makefile.patch
 Patch1: funtools-wcs.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -46,8 +43,6 @@ Summary: A general purpose FITS library
 Group: System Environment/Libraries
 Obsoletes: funtools < 1.4.0-2
 %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
 
 %package tcl
@@ -59,7 +54,7 @@ Provides: tcl-funtools = %{version}-%{re
 This package contains the %{name} TCL interface
 
 %prep
-%setup -q -n %{name}-%{upversion}
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
 
@@ -67,24 +62,24 @@ This package contains the %{name} TCL in
 %configure --enable-shared=link --with-wcslib=%{_libdir}/libwcs.so \
         --with-zlib=%{_libdir}/libz.so --with-tcl=%{_libdir} --enable-dl
 # Parallel build does not work currently
-%{__make} EXTRA_LIBS="-lwcs -lz -ldl"
-%{__make} shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl"
+make EXTRA_LIBS="-lwcs -lz -ldl"
+make shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl"
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install
+rm -rf %{buildroot}
+make INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install
 mv %{buildroot}/%{_bindir}/funtools.ds9 %{buildroot}/%{_datadir}/funtools
 mv %{buildroot}/%{_bindir}/funcalc.sed %{buildroot}/%{_datadir}/funtools
 # Bug #329741
-%{__install} -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy
+install -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy
 # Tcl
-%{__mkdir_p} %{buildroot}%{tcl_sitearch}/tclfuntools
-%{__cp} -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclfuntools
-%{__mv} %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclfuntools
+mkdir -p %{buildroot}%{tcl_sitearch}/tclfuntools
+cp -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclfuntools
+mv %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclfuntools
 
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
@@ -105,6 +100,7 @@ mv %{buildroot}/%{_bindir}/funcalc.sed %
 %files tcl
 %defattr(-,root,root,-)
 %{tcl_sitearch}/tclfuntools
+%{_mandir}/mann/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -115,19 +111,21 @@ mv %{buildroot}/%{_bindir}/funcalc.sed %
 %exclude %{_libdir}/*.a
 %{_includedir}/*
 %{_mandir}/man3/*
-%{_mandir}/mann/*
 
 %changelog
+* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-1
+- New upstream source
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Feb 19 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-9
+* Tue Feb 19 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-9
 - Catching up the soname revertion in wcstools-devel
 
-* Fri Feb 13 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-8
+* Fri Feb 13 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-8
 - Using wcstools-devel instead of libwcs-devel
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.0-7



From sergiopr at fedoraproject.org  Wed Dec 23 11:44:27 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 11:44:27 +0000 (UTC)
Subject: File funtools-1.4.4.tar.gz uploaded to lookaside cache by sergiopr
Message-ID: <20091223114427.7881F10F8D1@bastion.fedoraproject.org>

A file has been added to the lookaside cache for funtools:

d717724bd530463ff154042a85015cf4  funtools-1.4.4.tar.gz



From sergiopr at fedoraproject.org  Wed Dec 23 11:45:34 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 11:45:34 +0000 (UTC)
Subject: rpms/funtools/devel .cvsignore, 1.5, 1.6 funtools.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <20091223114534.D658E11C00E6@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/funtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32711

Modified Files:
	.cvsignore funtools.spec sources 
Log Message:
* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-2
- EVR bump



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Aug 2007 14:01:09 -0000	1.5
+++ .cvsignore	23 Dec 2009 11:45:33 -0000	1.6
@@ -1 +1 @@
-funtools-1.4.0.tar.gz
+funtools-1.4.4.tar.gz


Index: funtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/devel/funtools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- funtools.spec	23 Dec 2009 11:40:03 -0000	1.17
+++ funtools.spec	23 Dec 2009 11:45:34 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name: funtools
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: FITS library and utilities
 
 Group: Applications/Engineering
@@ -113,6 +113,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-2
+- EVR bump
+
 * Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-1
 - New upstream source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Aug 2007 14:01:09 -0000	1.5
+++ sources	23 Dec 2009 11:45:34 -0000	1.6
@@ -1 +1 @@
-8079d723e1424141c3f2bc4ea9b323db  funtools-1.4.0.tar.gz
+d717724bd530463ff154042a85015cf4  funtools-1.4.4.tar.gz



From sergiopr at fedoraproject.org  Wed Dec 23 11:59:16 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 11:59:16 +0000 (UTC)
Subject: rpms/funtools/F-12 funtools.spec,1.16,1.17 sources,1.5,1.6
Message-ID: <20091223115917.1073211C00E6@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/funtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2472

Modified Files:
	funtools.spec sources 
Log Message:
* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-1
- New upstream source



Index: funtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/F-12/funtools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- funtools.spec	24 Jul 2009 23:17:43 -0000	1.16
+++ funtools.spec	23 Dec 2009 11:59:15 -0000	1.17
@@ -2,17 +2,14 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name: funtools
-Version: 1.4.0
-Release: 11%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Summary: FITS library and utilities
 
-# Upstream version
-%define upversion 1.4.0
-
 Group: Applications/Engineering
 License: LGPLv2+
 URL: http://hea-www.harvard.edu/RD/funtools/
-Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{upversion}.tar.gz
+Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{version}.tar.gz
 Patch0: funtools-makefile.patch
 Patch1: funtools-wcs.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -46,8 +43,6 @@ Summary: A general purpose FITS library
 Group: System Environment/Libraries
 Obsoletes: funtools < 1.4.0-2
 %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
 
 %package tcl
@@ -59,7 +54,7 @@ Provides: tcl-funtools = %{version}-%{re
 This package contains the %{name} TCL interface
 
 %prep
-%setup -q -n %{name}-%{upversion}
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
 
@@ -67,24 +62,24 @@ This package contains the %{name} TCL in
 %configure --enable-shared=link --with-wcslib=%{_libdir}/libwcs.so \
         --with-zlib=%{_libdir}/libz.so --with-tcl=%{_libdir} --enable-dl
 # Parallel build does not work currently
-%{__make} EXTRA_LIBS="-lwcs -lz -ldl"
-%{__make} shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl"
+make EXTRA_LIBS="-lwcs -lz -ldl"
+make shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl"
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install
+rm -rf %{buildroot}
+make INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install
 mv %{buildroot}/%{_bindir}/funtools.ds9 %{buildroot}/%{_datadir}/funtools
 mv %{buildroot}/%{_bindir}/funcalc.sed %{buildroot}/%{_datadir}/funtools
 # Bug #329741
-%{__install} -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy
+install -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy
 # Tcl
-%{__mkdir_p} %{buildroot}%{tcl_sitearch}/tclfuntools
-%{__cp} -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclfuntools
-%{__mv} %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclfuntools
+mkdir -p %{buildroot}%{tcl_sitearch}/tclfuntools
+cp -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclfuntools
+mv %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclfuntools
 
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
@@ -105,6 +100,7 @@ mv %{buildroot}/%{_bindir}/funcalc.sed %
 %files tcl
 %defattr(-,root,root,-)
 %{tcl_sitearch}/tclfuntools
+%{_mandir}/mann/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -115,19 +111,21 @@ mv %{buildroot}/%{_bindir}/funcalc.sed %
 %exclude %{_libdir}/*.a
 %{_includedir}/*
 %{_mandir}/man3/*
-%{_mandir}/mann/*
 
 %changelog
+* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4.4-1
+- New upstream source
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Feb 19 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-9
+* Tue Feb 19 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-9
 - Catching up the soname revertion in wcstools-devel
 
-* Fri Feb 13 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-8
+* Fri Feb 13 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-8
 - Using wcstools-devel instead of libwcs-devel
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.0-7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Aug 2007 14:01:09 -0000	1.5
+++ sources	23 Dec 2009 11:59:16 -0000	1.6
@@ -1 +1 @@
-8079d723e1424141c3f2bc4ea9b323db  funtools-1.4.0.tar.gz
+d717724bd530463ff154042a85015cf4  funtools-1.4.4.tar.gz



From pghmcfc at fedoraproject.org  Wed Dec 23 12:15:21 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 23 Dec 2009 12:15:21 +0000 (UTC)
Subject: File TimeDate-1.20.tar.gz uploaded to lookaside cache by pghmcfc
Message-ID: <20091223121521.4AF0710F8D3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-TimeDate:

7da7452bce4c684e4238e6d09b390200  TimeDate-1.20.tar.gz



From pghmcfc at fedoraproject.org  Wed Dec 23 12:18:15 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 23 Dec 2009 12:18:15 +0000 (UTC)
Subject: rpms/perl-TimeDate/devel .cvsignore, 1.4, 1.5 perl-TimeDate.spec, 1.18,
	1.19 sources, 1.4, 1.5
Message-ID: <20091223121816.0707411C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-TimeDate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5793

Modified Files:
	.cvsignore perl-TimeDate.spec sources 
Log Message:
update to 1.20; recode documentation as UTF-8; fix bogus exec permissions to placate rpmlint


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TimeDate/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 10:21:21 -0000	1.4
+++ .cvsignore	23 Dec 2009 12:18:14 -0000	1.5
@@ -1 +1 @@
-TimeDate-1.16.tar.gz
+TimeDate-1.20.tar.gz


Index: perl-TimeDate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TimeDate/devel/perl-TimeDate.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-TimeDate.spec	4 Dec 2009 02:34:16 -0000	1.18
+++ perl-TimeDate.spec	23 Dec 2009 12:18:15 -0000	1.19
@@ -1,18 +1,18 @@
 Name:           perl-TimeDate
-Version:        1.16
+Version:        1.20
 Epoch:          1
-Release: 	12%{?dist}
+Release:        1%{?dist}
 Summary:        A Perl module for time and date manipulation
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/TimeDate/
-Source0:   http://www.cpan.org/authors/id/G/GB/GBARR/TimeDate-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GB/GBARR/TimeDate-%{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))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module includes a number of smaller modules suited for
@@ -25,6 +25,13 @@ textual representations of points in tim
 %prep
 %setup -q -n TimeDate-%{version}
 
+# ChangeLog is ISO-8859-1 encoded
+iconv -f iso-8859-1 -t utf8 < ChangeLog > ChangeLog.utf8
+mv ChangeLog.utf8 ChangeLog
+
+# Bogus exec permissions on some language modules
+chmod -x lib/Date/Language/{Russian_cp1251,Russian_koi8r,Turkish}.pm
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -33,7 +40,7 @@ make %{?_smp_mflags}
 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 ';'
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} ';' 2>/dev/null
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
@@ -42,7 +49,6 @@ make test
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files 
 %defattr(-,root,root,-)
 %{perl_vendorlib}/Date/
@@ -51,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 23 2009 Paul Howarth <paul at city-fan.org> - 1:1.20-1
+- update to 1.20
+- recode documentation as UTF-8
+- fix bogus exec permissions to placate rpmlint
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.16-12
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TimeDate/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Sep 2004 10:21:21 -0000	1.4
+++ sources	23 Dec 2009 12:18:15 -0000	1.5
@@ -1 +1 @@
-b3cc35a7cabd106ac8829d2f2ff4bd9d  TimeDate-1.16.tar.gz
+7da7452bce4c684e4238e6d09b390200  TimeDate-1.20.tar.gz



From mmaslano at fedoraproject.org  Wed Dec 23 12:29:20 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 23 Dec 2009 12:29:20 +0000 (UTC)
Subject: File File-Next-1.06.tar.gz uploaded to lookaside cache by mmaslano
Message-ID: <20091223122920.9AB6410F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-File-Next:

8d901b18e40c477acd18a6ea0fd7de64  File-Next-1.06.tar.gz



From mmaslano at fedoraproject.org  Wed Dec 23 12:32:23 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 23 Dec 2009 12:32:23 +0000 (UTC)
Subject: rpms/perl-File-Next/devel .cvsignore, 1.4, 1.5 perl-File-Next.spec,
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091223123223.66B0211C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-File-Next/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8119

Modified Files:
	.cvsignore perl-File-Next.spec sources 
Log Message:
* Wed Dec 23 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.06-1
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Next/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Jan 2008 20:03:07 -0000	1.4
+++ .cvsignore	23 Dec 2009 12:32:22 -0000	1.5
@@ -1 +1 @@
-File-Next-1.02.tar.gz
+File-Next-1.06.tar.gz


Index: perl-File-Next.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Next/devel/perl-File-Next.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-File-Next.spec	7 Dec 2009 01:20:12 -0000	1.8
+++ perl-File-Next.spec	23 Dec 2009 12:32:23 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-File-Next
-Version:        1.02
-Release:        5%{?dist}
+Version:        1.06
+Release:        1%{?dist}
 Summary:        File::Next Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec 23 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.06-1
+- update
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.02-5
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Next/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Jan 2008 20:03:07 -0000	1.4
+++ sources	23 Dec 2009 12:32:23 -0000	1.5
@@ -1 +1 @@
-ad2800827fd053f556e5e18fe9d50202  File-Next-1.02.tar.gz
+8d901b18e40c477acd18a6ea0fd7de64  File-Next-1.06.tar.gz



From kkofler at fedoraproject.org  Wed Dec 23 12:32:38 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 23 Dec 2009 12:32:38 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.361,1.362
Message-ID: <20091223123238.D19C311C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8237/devel

Modified Files:
	qt.spec 
Log Message:
* Wed Dec 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.0-3
- disable QtWebKit JavaScript JIT again, incompatible with SELinux (#549994)


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -p -r1.361 -r1.362
--- qt.spec	5 Dec 2009 04:24:35 -0000	1.361
+++ qt.spec	23 Dec 2009 12:32:38 -0000	1.362
@@ -13,7 +13,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -403,8 +403,7 @@ Qt libraries used for drawing widgets an
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
 %patch22 -p1 -b .system_ca_certificates
-## FIXME: I think this one can be replaced with ./configure -no-javascript-jit
-## test first if it's still needed
+## FIXME: ./configure -no-javascript-jit should be sufficient, check
 #patch23 -p1 -b .javascriptcore-disable-jit
 %patch51 -p1 -b .qdoc3
 ## FIXME: port patch
@@ -507,6 +506,7 @@ done
   %{?phonon} %{!?phonon:-no-phonon} \
   %{?phonon_backend} \
   %{?no_pch} \
+  -no-javascript-jit \
   -sm \
   -stl \
   -system-libmng \
@@ -1019,6 +1019,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.0-3
+- disable QtWebKit JavaScript JIT again, incompatible with SELinux (#549994)
+
 * Sat Dec 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.0-2
 - own %%{_qt4_plugindir}/gui_platform
 



From mmaslano at fedoraproject.org  Wed Dec 23 12:45:23 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 23 Dec 2009 12:45:23 +0000 (UTC)
Subject: File Text-FindIndent-0.06.tar.gz uploaded to lookaside cache by
	mmaslano
Message-ID: <20091223124523.3662210F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-Text-FindIndent:

cafaae89fdf3dfeecf7c1ba9ab434c7a  Text-FindIndent-0.06.tar.gz



From mmaslano at fedoraproject.org  Wed Dec 23 12:46:46 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 23 Dec 2009 12:46:46 +0000 (UTC)
Subject: rpms/perl-Text-FindIndent/devel .cvsignore, 1.2,
	1.3 perl-Text-FindIndent.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20091223124646.B0B4F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Text-FindIndent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10570

Modified Files:
	.cvsignore perl-Text-FindIndent.spec sources 
Log Message:
* Wed Dec 23 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.06-1
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FindIndent/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Dec 2008 08:20:06 -0000	1.2
+++ .cvsignore	23 Dec 2009 12:46:46 -0000	1.3
@@ -1 +1 @@
-Text-FindIndent-0.03.tar.gz
+Text-FindIndent-0.06.tar.gz


Index: perl-Text-FindIndent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FindIndent/devel/perl-Text-FindIndent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Text-FindIndent.spec	4 Dec 2009 02:20:21 -0000	1.4
+++ perl-Text-FindIndent.spec	23 Dec 2009 12:46:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Text-FindIndent
-Version:        0.03
-Release:        4%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Heuristically determine the indent style
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec 23 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.06-1
+- update
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.03-4
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-FindIndent/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Dec 2008 08:20:06 -0000	1.2
+++ sources	23 Dec 2009 12:46:46 -0000	1.3
@@ -1 +1 @@
-a63c27a1380aae2a19674597587b7ea9  Text-FindIndent-0.03.tar.gz
+cafaae89fdf3dfeecf7c1ba9ab434c7a  Text-FindIndent-0.06.tar.gz



From mmaslano at fedoraproject.org  Wed Dec 23 12:50:48 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 23 Dec 2009 12:50:48 +0000 (UTC)
Subject: File Wx-Perl-ProcessStream-0.22.tar.gz uploaded to lookaside cache by
	mmaslano
Message-ID: <20091223125048.2AAFB10F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-Wx-Perl-ProcessStream:

671f75dd6e30e278eac0a8d8f82bf4d9  Wx-Perl-ProcessStream-0.22.tar.gz



From mmaslano at fedoraproject.org  Wed Dec 23 12:51:07 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 23 Dec 2009 12:51:07 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-ProcessStream/devel .cvsignore, 1.2,
	1.3 perl-Wx-Perl-ProcessStream.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20091223125107.C3C7211C032A@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Wx-Perl-ProcessStream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11292

Modified Files:
	.cvsignore perl-Wx-Perl-ProcessStream.spec sources 
Log Message:
* Wed Dec 23 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.22-1
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-ProcessStream/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 06:59:21 -0000	1.2
+++ .cvsignore	23 Dec 2009 12:51:07 -0000	1.3
@@ -1 +1 @@
-Wx-Perl-ProcessStream-0.11.tar.gz
+Wx-Perl-ProcessStream-0.22.tar.gz


Index: perl-Wx-Perl-ProcessStream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-ProcessStream/devel/perl-Wx-Perl-ProcessStream.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Wx-Perl-ProcessStream.spec	7 Dec 2009 06:43:08 -0000	1.4
+++ perl-Wx-Perl-ProcessStream.spec	23 Dec 2009 12:51:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Wx-Perl-ProcessStream
-Version:        0.11
-Release:        4%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Access IO of external processes via events
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Dec 23 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.22-1
+- update
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.11-4
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-ProcessStream/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2008 06:59:21 -0000	1.2
+++ sources	23 Dec 2009 12:51:07 -0000	1.3
@@ -1 +1 @@
-7ffa12945306fc2322b791de4455b35a  Wx-Perl-ProcessStream-0.11.tar.gz
+671f75dd6e30e278eac0a8d8f82bf4d9  Wx-Perl-ProcessStream-0.22.tar.gz



From mmaslano at fedoraproject.org  Wed Dec 23 12:58:47 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 23 Dec 2009 12:58:47 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-ProcessStream/devel perl-Wx-Perl-ProcessStream.spec,
	1.5, 1.6
Message-ID: <20091223125847.3DB8511C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Wx-Perl-ProcessStream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12513

Modified Files:
	perl-Wx-Perl-ProcessStream.spec 
Log Message:
missing BR.



Index: perl-Wx-Perl-ProcessStream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-ProcessStream/devel/perl-Wx-Perl-ProcessStream.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Wx-Perl-ProcessStream.spec	23 Dec 2009 12:51:07 -0000	1.5
+++ perl-Wx-Perl-ProcessStream.spec	23 Dec 2009 12:58:47 -0000	1.6
@@ -11,6 +11,7 @@ BuildArch:      noarch
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Wx) >= 0.5
+BuildRequires:  perl(Archive::Tar)
 Requires:       perl(Wx) >= 0.5
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 



From dwalsh at fedoraproject.org  Wed Dec 23 13:02:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 23 Dec 2009 13:02:28 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.45,
	1.46 modules-targeted.conf, 1.154, 1.155 policy-F13.patch, 1.22,
	1.23 selinux-policy.spec, 1.947, 1.948
Message-ID: <20091223130228.5D6DE11C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13115

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F13.patch 
	selinux-policy.spec 
Log Message:
* Wed Dec 23 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-4
- Cleanups from dgrift



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- modules-minimum.conf	22 Dec 2009 17:16:45 -0000	1.45
+++ modules-minimum.conf	23 Dec 2009 13:02:26 -0000	1.46
@@ -2019,7 +2019,7 @@ cgroup = module
 # Layer: services
 # Module: denyhosts
 #
-#  script to help thwart ssh server attacks
+# script to help thwart ssh server attacks
 # 
 denyhosts = module
 


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- modules-targeted.conf	22 Dec 2009 17:16:45 -0000	1.154
+++ modules-targeted.conf	23 Dec 2009 13:02:26 -0000	1.155
@@ -2019,7 +2019,7 @@ cgroup = module
 # Layer: services
 # Module: denyhosts
 #
-#  script to help thwart ssh server attacks
+# script to help thwart ssh server attacks
 # 
 denyhosts = module
 

policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  340 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  370 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  195 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  122 ++
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   35 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   35 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   22 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   51 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   90 +
 policy/modules/services/denyhosts.te      |   72 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   25 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   34 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   50 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   18 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   66 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  284 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  353 ++++++
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  299 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  197 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   10 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   15 
 377 files changed, 19985 insertions(+), 2756 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- policy-F13.patch	22 Dec 2009 22:10:25 -0000	1.22
+++ policy-F13.patch	23 Dec 2009 13:02:27 -0000	1.23
@@ -6274,7 +6274,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.7.5/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/kernel/domain.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/domain.te	2009-12-23 07:50:49.000000000 -0500
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -6969,7 +6969,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.7.5/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.if	2009-12-22 10:30:40.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.if	2009-12-23 07:46:46.000000000 -0500
 @@ -906,7 +906,7 @@
  		type cifs_t;
  	')
@@ -7014,33 +7014,13 @@ diff --exclude-from=exclude -N -u -r nsa
  #########################################
  ## <summary>
  ##	Read named sockets on a NFS filesystem.
-@@ -4181,3 +4200,216 @@
+@@ -4181,3 +4200,175 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
 +
 +########################################
 +## <summary>
-+##	Search dirs on cgroup
-+##	file systems.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`fs_search_cgroup_dirs', `
-+	gen_require(`
-+		type cgroup_t;
-+
-+	')
-+
-+	allow $1 cgroup_t:dir search;
-+')
-+
-+########################################
-+## <summary>
 +##      list dirs on cgroup
 +##      file systems.
 +## </summary>
@@ -7080,25 +7060,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +########################################
 +## <summary>
-+##      create dirs on cgroup
-+##      file systems.
-+## </summary>
-+## <param name="domain">
-+##      <summary>
-+##      Domain allowed access.
-+##      </summary>
-+## </param>
-+#
-+interface(`fs_create_cgroup_dirs', `
-+        gen_require(`
-+                type cgroup_t;
-+	')
-+
-+	create_dirs_pattern($1, cgroup_t, cgroup_t)
-+')
-+
-+########################################
-+## <summary>
 +##	Manage dirs on cgroup file systems.
 +## </summary>
 +## <param name="domain">
@@ -7207,7 +7168,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +
 +	setattr_files_pattern($1, cgroup_t, cgroup_t)
-+	fs_search_cgroup_dirs($1)
 +')
 +
 +########################################
@@ -7228,7 +7188,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +
 +	write_files_pattern($1, cgroup_t, cgroup_t)
-+	fs_search_cgroup_dirs($1)
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.7.5/policy/modules/kernel/filesystem.te
@@ -9716,7 +9675,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	All of the rules required to administrate 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.7.5/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/abrt.te	2009-12-22 08:42:16.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/abrt.te	2009-12-23 07:13:38.000000000 -0500
 @@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -9764,7 +9723,7 @@ diff --exclude-from=exclude -N -u -r nsa
  files_pid_filetrans(abrt_t, abrt_var_run_t, { file dir })
  
  kernel_read_ring_buffer(abrt_t)
-@@ -75,18 +90,34 @@
+@@ -75,18 +90,35 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -9795,11 +9754,12 @@ diff --exclude-from=exclude -N -u -r nsa
  fs_getattr_all_fs(abrt_t)
  fs_getattr_all_dirs(abrt_t)
 +fs_read_fusefs_files(abrt_t)
++fs_read_nfs_files(abrt_t)
 +fs_search_all(abrt_t)
  
  sysnet_read_config(abrt_t)
  
-@@ -96,22 +127,92 @@
+@@ -96,22 +128,92 @@
  miscfiles_read_certs(abrt_t)
  miscfiles_read_localization(abrt_t)
  
@@ -14634,8 +14594,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +/var/log/denyhosts(/.*)?					gen_context(system_u:object_r:denyhosts_var_log_t, s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.if serefpolicy-3.7.5/policy/modules/services/denyhosts.if
 --- nsaserefpolicy/policy/modules/services/denyhosts.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/denyhosts.if	2009-12-22 17:05:58.000000000 -0500
-@@ -0,0 +1,91 @@
++++ serefpolicy-3.7.5/policy/modules/services/denyhosts.if	2009-12-23 07:48:54.000000000 -0500
+@@ -0,0 +1,90 @@
 +## <summary>Deny Hosts.</summary>
 +## <desc>
 +##	<p>
@@ -14666,7 +14626,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +########################################
 +## <summary>
-+##	Execute ksmtuned server in the ksmtuned domain.
++##	Execute denyhost server in the denyhost domain.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -14708,8 +14668,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	allow $1 denyhosts_t:process { ptrace signal_perms getattr };
 +	read_files_pattern($1, denyhosts_t, denyhosts_t)
 +	        
-+	files_list_pids($1)
-+	admin_pattern($1, denyhosts_var_run_t)
++	admin_pattern($1, denyhosts_var_lib_t)
 +
 +	logging_search_logs($1)
 +	admin_pattern($1, denyhosts_var_log_t)
@@ -14729,8 +14688,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/denyhosts.te serefpolicy-3.7.5/policy/modules/services/denyhosts.te
 --- nsaserefpolicy/policy/modules/services/denyhosts.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/denyhosts.te	2009-12-22 10:34:58.000000000 -0500
-@@ -0,0 +1,71 @@
++++ serefpolicy-3.7.5/policy/modules/services/denyhosts.te	2009-12-23 07:47:53.000000000 -0500
+@@ -0,0 +1,72 @@
 +
 +policy_module(denyhosts, 1.0.0) 
 +
@@ -14798,6 +14757,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +miscfiles_read_localization(denyhosts_t)
 +
 +sysnet_manage_config(denyhosts_t)
++sysnet_etc_filetrans_config(denyhosts_t)
 +
 +optional_policy(`
 +	cron_system_entry(denyhosts_t, denyhosts_exec_t)
@@ -16182,13 +16142,13 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.fc serefpolicy-3.7.5/policy/modules/services/ksmtuned.fc
 --- nsaserefpolicy/policy/modules/services/ksmtuned.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/ksmtuned.fc	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/ksmtuned.fc	2009-12-23 07:41:58.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ksmtuned	--	gen_context(system_u:object_r:ksmtuned_initrc_exec_t,s0)
 +
 +/usr/sbin/ksmtuned	--	gen_context(system_u:object_r:ksmtuned_exec_t,s0)
 +
-+/var/run/ksmtune\.pid		--	gen_context(system_u:object_r:ntpd_var_run_t,s0)
++/var/run/ksmtune\.pid		--	gen_context(system_u:object_r:ksmtuned_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.if serefpolicy-3.7.5/policy/modules/services/ksmtuned.if
 --- nsaserefpolicy/policy/modules/services/ksmtuned.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.7.5/policy/modules/services/ksmtuned.if	2009-12-21 13:07:09.000000000 -0500
@@ -28985,7 +28945,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +permissive kdump_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.7.5/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-22 08:51:29.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-23 07:33:05.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -29201,7 +29161,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +316,111 @@
+@@ -307,10 +316,114 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -29313,6 +29273,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +/opt/VirtualBox(/.*)?/VBox.*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/usr/lib(64)?/chromium-browser/.*\.so 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/local/zend/lib/apache2/libphp5\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/python.*/site-packages/pymedia/muxer\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.7.5/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/system/libraries.if	2009-12-21 13:07:09.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.947
retrieving revision 1.948
diff -u -p -r1.947 -r1.948
--- selinux-policy.spec	22 Dec 2009 17:16:13 -0000	1.947
+++ selinux-policy.spec	23 Dec 2009 13:02:27 -0000	1.948
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.7.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Dec 23 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-4
+- Cleanups from dgrift
+
 * Tue Dec 22 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-3
 - Add back xserver_manage_home_fonts
 



From djuran at fedoraproject.org  Wed Dec 23 13:20:48 2009
From: djuran at fedoraproject.org (David Juran)
Date: Wed, 23 Dec 2009 13:20:48 +0000 (UTC)
Subject: rpms/libssh2/EL-5 libssh2-0.18-padding.patch, NONE, 1.1 libssh2.spec, 
	1.5, 1.6
Message-ID: <20091223132048.C4FA011C00E6@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/libssh2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15726

Modified Files:
	libssh2.spec 
Added Files:
	libssh2-0.18-padding.patch 
Log Message:
- fix incorrect padding (Bz 539444)


libssh2-0.18-padding.patch:
 libgcrypt.c |   30 ++++++------------------------
 openssl.c   |   15 ++++++++++-----
 2 files changed, 16 insertions(+), 29 deletions(-)

--- NEW FILE libssh2-0.18-padding.patch ---
From: Peter Stuge <peter at stuge.se>
Date: Sun, 6 Dec 2009 06:20:58 +0000 (+0100)
Subject: Fix padding in ssh-dss signature blob encoding
X-Git-Url: http://git.libssh2.org//gitweb.cgi?p=libssh2.git;a=commitdiff_plain;h=1aba38cd7d2658146675ce1737e5090f879f3068

Fix padding in ssh-dss signature blob encoding

DSA signatures consist of two 160-bit integers called r and s. In ssh-dss
signature blobs r and s are stored directly after each other in binary
representation, making up a 320-bit (40 byte) string. (See RFC4253 p14.)

The crypto wrappers in libssh2 would either pack r and s incorrectly, or
fail, when at least one integer was small enough to be stored in 19 bytes
or less.

The patch ensures that r and s are always stored as two 160 bit numbers.
---

diff --git a/src/libgcrypt.c b/src/libgcrypt.c
index ba00284..b06be42 100644
--- a/src/libgcrypt.c
+++ b/src/libgcrypt.c
@@ -424,6 +424,8 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
         return -1;
     }
 
+    memset(sig, 0, 40);
+
 /* Extract R. */
 
     data = gcry_sexp_find_token(sig_sexp, "r", 0);
@@ -433,22 +435,12 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
     }
 
     tmp = gcry_sexp_nth_data(data, 1, &size);
-    if (!tmp) {
-        ret = -1;
-        goto out;
-    }
-
-    if (tmp[0] == '\0') {
-        tmp++;
-        size--;
-    }
-
-    if (size != 20) {
+    if (!tmp || size < 1 || size > 20) {
         ret = -1;
         goto out;
     }
 
-    memcpy(sig, tmp, 20);
+    memcpy(sig + (20 - size), tmp, size);
 
     gcry_sexp_release(data);
 
@@ -461,22 +453,12 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
     }
 
     tmp = gcry_sexp_nth_data(data, 1, &size);
-    if (!tmp) {
-        ret = -1;
-        goto out;
-    }
-
-    if (tmp[0] == '\0') {
-        tmp++;
-        size--;
-    }
-
-    if (size != 20) {
+    if (!tmp || size < 1 || size > 20) {
         ret = -1;
         goto out;
     }
 
-    memcpy(sig + 20, tmp, 20);
+    memcpy(sig + 20 + (20 - size), tmp, size);
 
     ret = 0;
   out:
diff --git a/src/openssl.c b/src/openssl.c
index 250ea63..000c9ec 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -420,7 +420,7 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
                        unsigned long hash_len, unsigned char *signature)
 {
     DSA_SIG *sig;
-    int r_len, s_len, rs_pad;
+    int r_len, s_len;
     (void) hash_len;
 
     sig = DSA_do_sign(hash, SHA_DIGEST_LENGTH, dsactx);
@@ -429,15 +429,20 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
     }
 
     r_len = BN_num_bytes(sig->r);
+    if (r_len < 1 || r_len > 20) {
+        DSA_SIG_free(sig);
+        return -1;
+    }
     s_len = BN_num_bytes(sig->s);
-    rs_pad = (2 * SHA_DIGEST_LENGTH) - (r_len + s_len);
-    if (rs_pad < 0) {
+    if (s_len < 1 || s_len > 20) {
         DSA_SIG_free(sig);
         return -1;
     }
 
-    BN_bn2bin(sig->r, signature + rs_pad);
-    BN_bn2bin(sig->s, signature + rs_pad + r_len);
+    memset(signature, 0, 40);
+
+    BN_bn2bin(sig->r, signature + (20 - r_len));
+    BN_bn2bin(sig->s, signature + 20 + (20 - s_len));
 
     DSA_SIG_free(sig);


Index: libssh2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libssh2/EL-5/libssh2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libssh2.spec	15 Jul 2008 14:10:53 -0000	1.5
+++ libssh2.spec	23 Dec 2009 13:20:47 -0000	1.6
@@ -1,12 +1,15 @@
 Name:           libssh2
 Version:        0.18
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A library implementing the SSH2 protocol
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.libssh2.org/
 Source0:        http://downloads.sourceforge.net/libssh2/%{name}-%{version}.tar.gz
+
+Patch0:		libssh2-0.18-padding.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -42,6 +45,8 @@ developing applications that use %{name}
 %prep
 %setup -q
 
+%patch0 -p1 -b .padding
+
 # make sure things are UTF-8...
 for i in ChangeLog NEWS ; do
     iconv --from=ISO-8859-1 --to=UTF-8 $i > new
@@ -94,6 +99,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec 22 2009 David Juran <djuran at redhat.com> - 0.18-10
+- fix incorrect padding (Bz 539444)
+
 * Tue Jul 15 2008 David Juran <djuran at redhat.com> - 0.18-9
 - Tagging sillyness
 



From djuran at fedoraproject.org  Wed Dec 23 13:22:44 2009
From: djuran at fedoraproject.org (David Juran)
Date: Wed, 23 Dec 2009 13:22:44 +0000 (UTC)
Subject: rpms/libssh2/EL-4 libssh2-0.18-padding.patch, NONE, 1.1 libssh2.spec, 
	1.6, 1.7
Message-ID: <20091223132244.684CD11C00E6@cvs1.fedora.phx.redhat.com>

Author: djuran

Update of /cvs/pkgs/rpms/libssh2/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16133

Modified Files:
	libssh2.spec 
Added Files:
	libssh2-0.18-padding.patch 
Log Message:
- fix incorrect padding (Bz 539444)


libssh2-0.18-padding.patch:
 libgcrypt.c |   30 ++++++------------------------
 openssl.c   |   15 ++++++++++-----
 2 files changed, 16 insertions(+), 29 deletions(-)

--- NEW FILE libssh2-0.18-padding.patch ---
From: Peter Stuge <peter at stuge.se>
Date: Sun, 6 Dec 2009 06:20:58 +0000 (+0100)
Subject: Fix padding in ssh-dss signature blob encoding
X-Git-Url: http://git.libssh2.org//gitweb.cgi?p=libssh2.git;a=commitdiff_plain;h=1aba38cd7d2658146675ce1737e5090f879f3068

Fix padding in ssh-dss signature blob encoding

DSA signatures consist of two 160-bit integers called r and s. In ssh-dss
signature blobs r and s are stored directly after each other in binary
representation, making up a 320-bit (40 byte) string. (See RFC4253 p14.)

The crypto wrappers in libssh2 would either pack r and s incorrectly, or
fail, when at least one integer was small enough to be stored in 19 bytes
or less.

The patch ensures that r and s are always stored as two 160 bit numbers.
---

diff --git a/src/libgcrypt.c b/src/libgcrypt.c
index ba00284..b06be42 100644
--- a/src/libgcrypt.c
+++ b/src/libgcrypt.c
@@ -424,6 +424,8 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
         return -1;
     }
 
+    memset(sig, 0, 40);
+
 /* Extract R. */
 
     data = gcry_sexp_find_token(sig_sexp, "r", 0);
@@ -433,22 +435,12 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
     }
 
     tmp = gcry_sexp_nth_data(data, 1, &size);
-    if (!tmp) {
-        ret = -1;
-        goto out;
-    }
-
-    if (tmp[0] == '\0') {
-        tmp++;
-        size--;
-    }
-
-    if (size != 20) {
+    if (!tmp || size < 1 || size > 20) {
         ret = -1;
         goto out;
     }
 
-    memcpy(sig, tmp, 20);
+    memcpy(sig + (20 - size), tmp, size);
 
     gcry_sexp_release(data);
 
@@ -461,22 +453,12 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
     }
 
     tmp = gcry_sexp_nth_data(data, 1, &size);
-    if (!tmp) {
-        ret = -1;
-        goto out;
-    }
-
-    if (tmp[0] == '\0') {
-        tmp++;
-        size--;
-    }
-
-    if (size != 20) {
+    if (!tmp || size < 1 || size > 20) {
         ret = -1;
         goto out;
     }
 
-    memcpy(sig + 20, tmp, 20);
+    memcpy(sig + 20 + (20 - size), tmp, size);
 
     ret = 0;
   out:
diff --git a/src/openssl.c b/src/openssl.c
index 250ea63..000c9ec 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -420,7 +420,7 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
                        unsigned long hash_len, unsigned char *signature)
 {
     DSA_SIG *sig;
-    int r_len, s_len, rs_pad;
+    int r_len, s_len;
     (void) hash_len;
 
     sig = DSA_do_sign(hash, SHA_DIGEST_LENGTH, dsactx);
@@ -429,15 +429,20 @@ _libssh2_dsa_sha1_sign(libssh2_dsa_ctx * dsactx,
     }
 
     r_len = BN_num_bytes(sig->r);
+    if (r_len < 1 || r_len > 20) {
+        DSA_SIG_free(sig);
+        return -1;
+    }
     s_len = BN_num_bytes(sig->s);
-    rs_pad = (2 * SHA_DIGEST_LENGTH) - (r_len + s_len);
-    if (rs_pad < 0) {
+    if (s_len < 1 || s_len > 20) {
         DSA_SIG_free(sig);
         return -1;
     }
 
-    BN_bn2bin(sig->r, signature + rs_pad);
-    BN_bn2bin(sig->s, signature + rs_pad + r_len);
+    memset(signature, 0, 40);
+
+    BN_bn2bin(sig->r, signature + (20 - r_len));
+    BN_bn2bin(sig->s, signature + 20 + (20 - s_len));
 
     DSA_SIG_free(sig);


Index: libssh2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libssh2/EL-4/libssh2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libssh2.spec	15 Jul 2008 13:37:33 -0000	1.6
+++ libssh2.spec	23 Dec 2009 13:22:44 -0000	1.7
@@ -1,12 +1,15 @@
 Name:           libssh2
 Version:        0.18
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A library implementing the SSH2 protocol
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.libssh2.org/
 Source0:        http://downloads.sourceforge.net/libssh2/%{name}-%{version}.tar.gz
+
+Patch0:		libssh2-0.18-padding.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -42,6 +45,8 @@ developing applications that use %{name}
 %prep
 %setup -q
 
+%patch0 -p1 -b .padding
+
 # make sure things are UTF-8...
 for i in ChangeLog NEWS ; do
     iconv --from=ISO-8859-1 --to=UTF-8 $i > new
@@ -94,6 +99,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec 22 2009 David Juran <djuran at redhat.com> - 0.18-10
+- fix incorrect padding (Bz 539444)
+
 * Tue Jul 15 2008 David Juran <djuran at redhat.com> - 0.18-9
 - Tagging sillyness
 



From pkgdb at fedoraproject.org  Wed Dec 23 13:43:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:43:40 +0000
Subject: [pkgdb] python-daemon: tomspur has given up watchbugzilla
Message-ID: <20091223134340.005AE10F8CD@bastion.fedoraproject.org>

tomspur has given up the watchbugzilla acl on python-daemon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:43:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:43:42 +0000
Subject: [pkgdb] python-daemon: tomspur has given up watchcommits
Message-ID: <20091223134342.0BEBC10F8D1@bastion.fedoraproject.org>

tomspur has given up the watchcommits acl on python-daemon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:43:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:43:43 +0000
Subject: [pkgdb] python-daemon: tomspur has requested commit
Message-ID: <20091223134344.2853710F8CD@bastion.fedoraproject.org>

tomspur has requested the commit acl on python-daemon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:44:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:44:10 +0000
Subject: [pkgdb] python-daemon: tomspur has given up watchbugzilla
Message-ID: <20091223134356.61FED10F8B3@bastion.fedoraproject.org>

tomspur has given up the watchbugzilla acl on python-daemon (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:43:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:43:57 +0000
Subject: [pkgdb] python-daemon: tomspur has given up watchcommits
Message-ID: <20091223134356.D6A2810F8CD@bastion.fedoraproject.org>

tomspur has given up the watchcommits acl on python-daemon (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:43:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:43:58 +0000
Subject: [pkgdb] python-daemon: tomspur has requested commit
Message-ID: <20091223134358.5372510F8DE@bastion.fedoraproject.org>

tomspur has requested the commit acl on python-daemon (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:44:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:44:03 +0000
Subject: [pkgdb] python-daemon: tomspur has given up watchbugzilla
Message-ID: <20091223134402.A46BF10F8D6@bastion.fedoraproject.org>

tomspur has given up the watchbugzilla acl on python-daemon (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:44:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:44:03 +0000
Subject: [pkgdb] python-daemon: tomspur has given up watchcommits
Message-ID: <20091223134404.1FBF710F8D4@bastion.fedoraproject.org>

tomspur has given up the watchcommits acl on python-daemon (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:44:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:44:06 +0000
Subject: [pkgdb] python-daemon: tomspur has requested commit
Message-ID: <20091223134405.DEBA510F8B3@bastion.fedoraproject.org>

tomspur has requested the commit acl on python-daemon (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:44:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:44:12 +0000
Subject: [pkgdb] python-daemon: tomspur has given up watchbugzilla
Message-ID: <20091223134412.9067910F8CB@bastion.fedoraproject.org>

tomspur has given up the watchbugzilla acl on python-daemon (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:44:31 +0000
Subject: [pkgdb] python-daemon: tomspur has given up watchcommits
Message-ID: <20091223134418.5F9BB10F8BC@bastion.fedoraproject.org>

tomspur has given up the watchcommits acl on python-daemon (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:44:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:44:18 +0000
Subject: [pkgdb] python-daemon: tomspur has requested commit
Message-ID: <20091223134418.BC91010F8D4@bastion.fedoraproject.org>

tomspur has requested the commit acl on python-daemon (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:50:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:50:54 +0000
Subject: [pkgdb] python-daemon had acl change status
Message-ID: <20091223135054.BD1AD10F8BF@bastion.fedoraproject.org>

kushal has set the commit acl on python-daemon (Fedora devel) to Approved for tomspur

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:50:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:50:55 +0000
Subject: [pkgdb] python-daemon had acl change status
Message-ID: <20091223135055.4C9B610F8CD@bastion.fedoraproject.org>

kushal has set the commit acl on python-daemon (Fedora 11) to Approved for tomspur

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:50:59 +0000
Subject: [pkgdb] python-daemon had acl change status
Message-ID: <20091223135059.67F9E10F8CB@bastion.fedoraproject.org>

kushal has set the commit acl on python-daemon (Fedora 12) to Approved for tomspur

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Wed Dec 23 13:51:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 13:51:04 +0000
Subject: [pkgdb] python-daemon had acl change status
Message-ID: <20091223135104.DD50810F8CD@bastion.fedoraproject.org>

kushal has set the commit acl on python-daemon (Fedora EPEL 5) to Approved for tomspur

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-daemon



From pghmcfc at fedoraproject.org  Wed Dec 23 14:03:03 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 23 Dec 2009 14:03:03 +0000 (UTC)
Subject: rpms/pptp/EL-5 pptp-1.7.2-compat.patch, NONE,
	1.1 pptp-1.7.2-ip-path.patch, NONE,
	1.1 pptp-1.7.2-makedeps.patch, NONE,
	1.1 pptp-1.7.2-pptpsetup-encrypt.patch, NONE,
	1.1 pptp-1.7.2-pptpsetup-mppe.patch, NONE,
	1.1 pptp-1.7.2-pptpsetup.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 pptp.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091223140303.4E2B611C00E6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/pptp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21823

Modified Files:
	.cvsignore pptp.spec sources 
Added Files:
	pptp-1.7.2-compat.patch pptp-1.7.2-ip-path.patch 
	pptp-1.7.2-makedeps.patch pptp-1.7.2-pptpsetup-encrypt.patch 
	pptp-1.7.2-pptpsetup-mppe.patch pptp-1.7.2-pptpsetup.patch 
Log Message:
Update to 1.7.2 (#547396)

pptp-1.7.2-compat.patch:
 pptp.c        |    8 ++++----
 pptp_compat.c |    5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE pptp-1.7.2-compat.patch ---
Index: pptp_compat.c
===================================================================
RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- pptp_compat.c	19 Feb 2008 21:43:28 -0000	1.1
+++ pptp_compat.c	25 Jul 2008 00:13:56 -0000	1.3
@@ -7,14 +7,15 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <stropts.h>
 #include <stdlib.h>
+#if defined (__SVR4) && defined (__sun) /* Solaris */
+#include <stropts.h>
+#endif
 #include <strings.h>
 #include "pptp_compat.h"
 #include <stdio.h>
 #include "util.h"
 
-
 #if defined (__SVR4) && defined (__sun) /* Solaris */
 /*
  * daemon implementation from uClibc
Index: pptp.c
===================================================================
RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v
retrieving revision 1.49
retrieving revision 1.51
diff -u -r1.49 -r1.51
--- pptp.c	14 May 2008 06:32:52 -0000	1.49
+++ pptp.c	24 Jul 2008 05:53:05 -0000	1.51
@@ -61,9 +61,8 @@
 #include "version.h"
 #if defined(__linux__)
 #include <sys/prctl.h>
-#else
-#include "inststr.h"
 #endif
+#include "inststr.h"
 #include "util.h"
 #include "pptp_quirks.h"
 #include "pqueue.h"
@@ -129,7 +128,7 @@
 }
 
 #if defined (__SVR4) && defined (__sun)
-struct in_addr localbind = { INADDR_ANY };
+struct in_addr localbind = { .s_addr = INADDR_ANY };
 #else
 struct in_addr localbind = { INADDR_NONE };
 #endif
@@ -183,6 +182,7 @@
     struct in_addr inetaddr;
     volatile int callmgr_sock = -1;
     char ttydev[PATH_MAX];
+    char *tty_name;
     int pty_fd, tty_fd, gre_fd, rc;
     volatile pid_t parent_pid, child_pid;
     u_int16_t call_id, peer_call_id;
@@ -391,7 +391,7 @@
         file2fd("/dev/null", "wb", STDERR_FILENO);
     }
 
-    char *tty_name = ttyname(tty_fd);
+    tty_name = ttyname(tty_fd);
     snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
               tty_name ? tty_name : "(null)");
 #ifdef PR_SET_NAME

pptp-1.7.2-ip-path.patch:
 Makefile  |    8 +++-
 routing.c |  116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 116 insertions(+), 8 deletions(-)

--- NEW FILE pptp-1.7.2-ip-path.patch ---
Index: routing.c
===================================================================
RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v
retrieving revision 1.1
diff -u -r1.1 routing.c
--- routing.c	2 Aug 2006 07:07:37 -0000	1.1
+++ routing.c	25 Mar 2009 13:58:28 -0000
@@ -23,9 +23,26 @@
 #include <stdio.h>
 #include <string.h>
 #include "routing.h"
+#include "config.h"
 
+#if defined (__SVR4) && defined (__sun) /* Solaris */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include "util.h"
+/* PF_ROUTE socket*/
+int rts; 
+/* Destination and gateway addresses */
+struct sockaddr_in rdst, rgw;
+/* Request sequence */
+int rseq;
+int dorouting;
+#else /* Solaris */
 /* route to the server */
 char *route;
+#endif /* Solaris */
 
 /*
 
@@ -54,26 +71,113 @@
 */
 
 void routing_init(char *ip) {
+#if defined (__SVR4) && defined (__sun) /* Solaris */
+  rdst.sin_family = AF_INET;
+  if ( ! inet_pton(AF_INET, ip, &rdst.sin_addr) ) {
+    log("Cannot convert address: %s", strerror(errno));
+    return;
+  }
+
+  if ( (rts = socket(PF_ROUTE, SOCK_RAW, AF_INET )) < 0 ) {
+    log("Cannot open routing socket: %s", strerror(errno));
+    return;
+  }
+
+  struct rt_msg rtm = {
+    .hdr.rtm_msglen = sizeof(struct rt_msg),
+    .hdr.rtm_version = RTM_VERSION,
+    .hdr.rtm_type = RTM_GET,
+    .hdr.rtm_addrs = RTA_DST,
+    .hdr.rtm_pid = getpid(),
+    .hdr.rtm_seq = ++rseq,
+    .addrs[RTAX_DST] = rdst
+  };
+
+  if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
+    log("Error writing to routing socket: %s", strerror(errno));
+    close(rts);
+    return;
+  }
+
+  while ( read(rts, &rtm, sizeof(struct rt_msg)) > 0 )
+    if ( rtm.hdr.rtm_pid == getpid() && rtm.hdr.rtm_seq == rseq) {
+      /* Check if host route already present */
+      if ( ( rtm.hdr.rtm_flags & RTF_HOST ) != RTF_HOST ) {
+        rgw = rtm.addrs[RTAX_GATEWAY];
+        dorouting = 1;
+      }
+      break;
+    }
+#else /* Solaris */ 
   char buf[256];
-  snprintf(buf, 255, "/bin/ip route get %s", ip);
-  FILE *p = popen(buf, "r");
+  FILE *p;
+
+  snprintf(buf, 255, "%s route get %s", IP_BINARY, ip);
+  p = popen(buf, "r");
   fgets(buf, 255, p);
   /* TODO: check for failure of fgets */
   route = strdup(buf);
   pclose(p);
   /* TODO: check for failure of command */
+#endif /* Solaris */
 }
 
 void routing_start() {
+#if defined (__SVR4) && defined (__sun) /* Solaris */
+  if ( ! dorouting )
+     return;
+
+  struct rt_msg rtm = {
+    .hdr.rtm_msglen = sizeof(struct rt_msg),
+    .hdr.rtm_version = RTM_VERSION,
+    .hdr.rtm_type = RTM_ADD,
+    .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC,
+    .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY,
+    .hdr.rtm_pid = getpid(),
+    .hdr.rtm_seq = ++rseq,
+    .addrs[RTAX_DST] = rdst,
+    .addrs[RTAX_GATEWAY] = rgw
+  };
+
+  if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
+    log("Error adding route: %s", strerror(errno));
+  }
+#else /* Solaris */
   char buf[256];
-  snprintf(buf, 255, "/bin/ip route replace %s", route);
-  FILE *p = popen(buf, "r");
+  FILE *p;
+
+  snprintf(buf, 255, "%s route replace %s", IP_BINARY, route);
+  p = popen(buf, "r");
   pclose(p);
+#endif /* Solaris */
 }
 
 void routing_end() {
+#if defined (__SVR4) && defined (__sun) /* Solaris */
+  if ( ! dorouting)
+    return;
+
+  struct rt_msg rtm = {
+    .hdr.rtm_msglen = sizeof(struct rt_msg),
+    .hdr.rtm_version = RTM_VERSION,
+    .hdr.rtm_type = RTM_DELETE,
+    .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC,
+    .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY,
+    .hdr.rtm_pid = getpid(),
+    .hdr.rtm_seq = ++rseq,
+    .addrs[RTAX_DST] = rdst,
+    .addrs[RTAX_GATEWAY] = rgw
+  };
+
+  if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) {
+    log("Error deleting route: %s", strerror(errno));
+  }
+#else /* Solaris */
   char buf[256];
-  snprintf(buf, 255, "/bin/ip route delete %s", route);
-  FILE *p = popen(buf, "r");
+  FILE *p;
+
+  snprintf(buf, 255, "%s route delete %s", IP_BINARY, route);
+  p = popen(buf, "r");
   pclose(p);
+#endif /* Solaris */
 }
Index: Makefile
===================================================================
RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v
retrieving revision 1.47
retrieving revision 1.49
diff -u -r1.47 -r1.49
--- Makefile	14 May 2008 06:32:52 -0000	1.47
+++ Makefile	24 Jul 2008 05:37:47 -0000	1.49
@@ -1,10 +1,13 @@
-# $Id: Makefile,v 1.47 2008/05/14 06:32:52 quozl Exp $
+# $Id: Makefile,v 1.49 2008/07/24 05:37:47 quozl Exp $
 VERSION=1.7.2
 RELEASE=
 
 #################################################################
-# CHANGE THIS LINE to point to the location of your pppd binary.
+# CHANGE THIS LINE to point to the location of binaries
 PPPD = /usr/sbin/pppd
+# Solaris
+# PPPD = /usr/bin/pppd
+IP = /bin/ip
 #################################################################
 
 BINDIR=$(DESTDIR)/usr/sbin
@@ -47,6 +52,7 @@
 	echo "/* text added by Makefile target config.h */" > config.h
 	echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
 	echo "#define PPPD_BINARY \"$(PPPD)\"" >> config.h
+	echo "#define IP_BINARY \"$(IP)\"" >> config.h
 
 vector_test: vector_test.o vector.o
 	$(CC) -o vector_test vector_test.o vector.o

pptp-1.7.2-makedeps.patch:
 Makefile |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

--- NEW FILE pptp-1.7.2-makedeps.patch ---
Index: Makefile
===================================================================
RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v
retrieving revision 1.47
retrieving revision 1.49
diff -u -r1.47 -r1.49
--- Makefile	14 May 2008 06:32:52 -0000	1.47
+++ Makefile	24 Jul 2008 05:37:47 -0000	1.49
@@ -96,3 +102,71 @@
 release:
 	cp pptp_$(VERSION)-0_i386.deb $(WEB)
 	cd $(WEB);make
+
+# The following include file dependencies were generated using
+# "makedepend -w0 *.c", then manually removing out of tree entries.
+# DO NOT DELETE
+
+dirutil.o: dirutil.h
+orckit_quirks.o: pptp_msg.h
+orckit_quirks.o: pptp_compat.h
+orckit_quirks.o: pptp_options.h
+orckit_quirks.o: pptp_ctrl.h
+orckit_quirks.o: util.h
+ppp_fcs.o: ppp_fcs.h
+ppp_fcs.o: pptp_compat.h
+pptp.o: config.h
+pptp.o: pptp_callmgr.h
+pptp.o: pptp_gre.h
+pptp.o: pptp_compat.h
+pptp.o: version.h
+pptp.o: inststr.h
+pptp.o: util.h
+pptp.o: pptp_quirks.h
+pptp.o: pptp_msg.h
+pptp.o: pptp_ctrl.h
+pptp.o: pqueue.h
+pptp.o: pptp_options.h
+pptp_callmgr.o: pptp_callmgr.h
+pptp_callmgr.o: pptp_ctrl.h
+pptp_callmgr.o: pptp_compat.h
+pptp_callmgr.o: pptp_msg.h
+pptp_callmgr.o: dirutil.h
+pptp_callmgr.o: vector.h
+pptp_callmgr.o: util.h
+pptp_callmgr.o: routing.h
+pptp_compat.o: pptp_compat.h
+pptp_compat.o: util.h
+pptp_ctrl.o: pptp_msg.h
+pptp_ctrl.o: pptp_compat.h
+pptp_ctrl.o: pptp_ctrl.h
+pptp_ctrl.o: pptp_options.h
+pptp_ctrl.o: vector.h
+pptp_ctrl.o: util.h
+pptp_ctrl.o: pptp_quirks.h
+pptp_gre.o: ppp_fcs.h
+pptp_gre.o: pptp_compat.h
+pptp_gre.o: pptp_msg.h
+pptp_gre.o: pptp_gre.h
+pptp_gre.o: util.h
+pptp_gre.o: pqueue.h
+pptp_gre.o: test.h
+pptp_quirks.o: orckit_quirks.h
+pptp_quirks.o: pptp_options.h
+pptp_quirks.o: pptp_ctrl.h
+pptp_quirks.o: pptp_compat.h
+pptp_quirks.o: pptp_msg.h
+pptp_quirks.o: pptp_quirks.h
+pqueue.o: util.h
+pqueue.o: pqueue.h
+routing.o: routing.h
+test.o: util.h
+test.o: test.h
+util.o: util.h
+vector.o: pptp_ctrl.h
+vector.o: pptp_compat.h
+vector.o: vector.h
+vector_test.o: vector.h
+vector_test.o: pptp_ctrl.h
+vector_test.o: pptp_compat.h
+version.o: config.h

pptp-1.7.2-pptpsetup-encrypt.patch:
 pptpsetup |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE pptp-1.7.2-pptpsetup-encrypt.patch ---
--- pptpsetup	2009-06-01 14:30:36.000000000 +0100
+++ pptpsetup	2009-06-01 14:36:39.000000000 +0100
@@ -43,12 +43,13 @@
 sub create {
     my $TUNNEL = shift;
 
-    # system checking
-    &Check_MPPE_in_kernel
-        or die "$0: couldn't find MPPE support in kernel.\n";
-
-    &Check_MPPE_in_pppd
-        or die "$0: couldn't find MPPE support in pppd.\n";
+    # if encryption is requested, check for support in kernel and pppd
+    if ( $ENCRYPT ) {
+        &Check_MPPE_in_kernel
+            or die "$0: couldn't find MPPE support in kernel.\n";
+        &Check_MPPE_in_pppd
+            or die "$0: couldn't find MPPE support in pppd.\n";
+    }
 
     # input validation
     ($TUNNEL) = $TUNNEL =~ m{^(\w+)$}

pptp-1.7.2-pptpsetup-mppe.patch:
 pptpsetup |   31 -------------------------------
 1 file changed, 31 deletions(-)

--- NEW FILE pptp-1.7.2-pptpsetup-mppe.patch ---
--- pptp-1.7.2/pptpsetup	2009-06-01 15:18:25.000000000 +0100
+++ pptp-1.7.2/pptpsetup	2009-06-01 15:19:25.000000000 +0100
@@ -43,14 +43,6 @@
 sub create {
     my $TUNNEL = shift;
 
-    # if encryption is requested, check for support in kernel and pppd
-    if ( $ENCRYPT ) {
-        &Check_MPPE_in_kernel
-            or die "$0: couldn't find MPPE support in kernel.\n";
-        &Check_MPPE_in_pppd
-            or die "$0: couldn't find MPPE support in pppd.\n";
-    }
-
     # input validation
     ($TUNNEL) = $TUNNEL =~ m{^(\w+)$}
       or die "$0: invalid tunnel name.\nTry '$0 --help' for more information.\n";
@@ -180,29 +172,6 @@
     exit;
 }
 
-### AUXILIAR SUBS ###
-
-sub Check_MPPE_in_kernel {
-    my $command = q/modprobe ppp-compress-18/;
-    if (system( $command ) == 0) {
-        # no error!
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-sub Check_MPPE_in_pppd {
-    my $command = q/strings `which pppd`|grep -i mppe|wc --lines/;
-    my $answer  = `$command`;
-    if ($answer > 0) {
-        # ok!
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
 __END__
 
 =head1 NAME

pptp-1.7.2-pptpsetup.patch:
 pptpsetup |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE pptp-1.7.2-pptpsetup.patch ---
Index: pptpsetup
===================================================================
RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v
retrieving revision 1.4
diff -u -r1.4 pptpsetup
--- pptpsetup	2 Aug 2006 07:02:47 -0000	1.4
+++ pptpsetup	25 Mar 2009 13:41:37 -0000
@@ -154,6 +154,7 @@
 
     # delete entry from chap-secrets
     my $chap_file = '/etc/ppp/chap-secrets';
+    my $mode = (stat($chap_file))[2] & 07777;
 
     open( FILE, $chap_file )
         or die "$0: can't read '$chap_file': $!\n";
@@ -171,6 +172,7 @@
     # write new chap-secrets
     open( FILE, ">$chap_file" )
         or die "$0: can't write '$chap_file': $!\n";
+    chmod $mode, $chap_file;
     print FILE $new_chap;
     close FILE;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pptp/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Feb 2006 12:46:24 -0000	1.4
+++ .cvsignore	23 Dec 2009 14:03:02 -0000	1.5
@@ -1 +1 @@
-pptp-1.7.1.tar.gz
+pptp-1.7.2.tar.gz


Index: pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pptp/EL-5/pptp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pptp.spec	22 Apr 2008 17:44:19 -0000	1.8
+++ pptp.spec	23 Dec 2009 14:03:03 -0000	1.9
@@ -1,25 +1,62 @@
 Name:		pptp
-Version:	1.7.1
-Release:	4%{?dist}
+Version:	1.7.2
+Release:	8%{?dist}
 Summary:	Point-to-Point Tunneling Protocol (PPTP) Client
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://pptpclient.sourceforge.net/
 Source0:	http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz
+Patch0:		pptp-1.7.2-compat.patch
+Patch1:		pptp-1.7.2-ip-path.patch
+Patch2:		pptp-1.7.2-pptpsetup.patch
+Patch3:		pptp-1.7.2-makedeps.patch
+Patch4:		pptp-1.7.2-pptpsetup-encrypt.patch
+Patch5:		pptp-1.7.2-pptpsetup-mppe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	ppp >= 2.4.2
+Requires:	ppp >= 2.4.2, /sbin/ip
 
 %description
 Client for the proprietary Microsoft Point-to-Point Tunneling
 Protocol, PPTP. Allows connection to a PPTP based VPN as used
 by employers and some cable and ADSL service providers.
 
+%package setup
+Summary:	PPTP Tunnel Configuration Script
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+
+%description setup
+This package provides a simple configuration script for setting up PPTP
+tunnels.
+
 %prep
 %setup -q
-%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile
+
+# Remove reference to stropts.h, not shipped in F9 onwards (applied upstream)
+%patch0 -p0 -b .compat
+
+# Make location of "ip" binary build-time configurable (applied upstream)
+%patch1 -p0 -b .ip-path
+
+# Retain permissions on /etc/ppp/chap-secrets (#492090, applied upstream)
+%patch2 -p0 -b .bz492090
+
+# Fix Makefile dependencies to support parallel make (applied upstream)
+%patch3 -p0 -b .makedeps
+
+# Don't check for MPPE capability in kernel or pppd unless we're creating a
+# tunnel that requires encryption (applied upstream)
+%patch4 -p0 -b .encrypt
+
+# Don't check for MPPE capability in kernel and pppd at all because current
+# Fedora releases and EL >= 5 include MPPE support out of the box (#502967)
+%patch5 -p1 -b .mppe
+
+# Pacify rpmlint
+%{__perl} -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile
 
 %build
-%{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}"
+%{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}" IP=/sbin/ip
 
 %install
 %{__rm} -rf %{buildroot}
@@ -40,7 +77,46 @@ by employers and some cable and ADSL ser
 # Fedora ppp package hardcodes the directory name
 %config(noreplace) /etc/ppp/options.pptp
 
+%files setup
+%defattr(-,root,root,-)
+%{_sbindir}/pptpsetup
+%{_mandir}/man8/pptpsetup.8*
+
 %changelog
+* Thu Sep 24 2009 Paul Howarth <paul at city-fan.org> 1.7.2-8
+- Split pptpsetup into subpackage to avoid perl dependency (#524972)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun  1 2009 Paul Howarth <paul at city-fan.org> 1.7.2-6
+- Don't check for MPPE capability in kernel and pppd unless we're creating a
+  tunnel that requires encryption
+- Don't check for MPPE capability in kernel and pppd at all because current
+  Fedora releases and EL >= 5 include MPPE support out of the box (#502967)
+
+* Wed Mar 25 2009 Paul Howarth <paul at city-fan.org> 1.7.2-5
+- Retain permissions on /etc/ppp/chap-secrets when using pptpsetup (#492090)
+- Use upstream versions of patches
+- Re-enable parallel build; Makefile dependencies now fixed
+- Use perl rather than sed to edit Makefile, for spec compatibility with
+  ancient distro releases
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon May 19 2008 Paul Howarth <paul at city-fan.org> 1.7.2-3
+- Add dependency on /sbin/ip
+- Disable parallel make - object files are missing dependency on config.h
+
+* Mon May 19 2008 Paul Howarth <paul at city-fan.org> 1.7.2-2
+- Use /sbin/ip, not /bin/ip for routing
+
+* Wed May 14 2008 Paul Howarth <paul at city-fan.org> 1.7.2-1
+- Update to 1.7.2
+- New script and manpage: pptpsetup
+- Add patch to remove reference to stropts.h, not shipped in F9 onwards
+
 * Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1.7.1-4
 - Rebuild with gcc 4.3.0 for Fedora 9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pptp/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Feb 2006 12:46:24 -0000	1.4
+++ sources	23 Dec 2009 14:03:03 -0000	1.5
@@ -1 +1 @@
-b47735ba5d6d37dfdbccb85afc044ede  pptp-1.7.1.tar.gz
+4c3d19286a37459a632c7128c92a9857  pptp-1.7.2.tar.gz



From ingvar at fedoraproject.org  Wed Dec 23 14:07:56 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 23 Dec 2009 14:07:56 +0000 (UTC)
Subject: rpms/varnish/devel varnish.changes-2.0.6.patch, NONE, 1.1 varnish.spec,
	1.24, 1.25
Message-ID: <20091223140756.31E6011C00E6@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22575

Modified Files:
	varnish.spec 
Added Files:
	varnish.changes-2.0.6.patch 
Log Message:
- Added a test that enables jemalloc on ppc if the kernel is
  not a rhel5 kernel (as on redhat builders)
- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
- Added a patch that fixes broken changes-2.0.6.html in doc



varnish.changes-2.0.6.patch:
 changes-2.0.5-2.0.6.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.changes-2.0.6.patch ---
--- doc/changes-2.0.5-2.0.6.xml.orig	2009-12-23 11:42:58.168643121 +0100
+++ doc/changes-2.0.5-2.0.6.xml	2009-12-23 11:43:05.827643574 +0100
@@ -49,5 +49,5 @@
       <para>Document the <code>-C</code> option
       to <code>varnishd</code>.</para>
     </change>
-  <subsystem>
+  </subsystem>
 </group>


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- varnish.spec	21 Dec 2009 20:30:12 -0000	1.24
+++ varnish.spec	23 Dec 2009 14:07:55 -0000	1.25
@@ -1,12 +1,13 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.changes-2.0.6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -68,7 +69,8 @@ Varnish is a high-performance HTTP accel
 # Release tarballs would not need this
 #./autogen.sh
 
-%patch0 -p0
+%patch0
+%patch1
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -93,9 +95,12 @@ cp bin/varnishd/default.vcl etc/zope-plo
 # Remove "--disable static" if you want to build static libraries 
 # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
-%configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+	if [[ `uname -r` =~ "2.6.18-.*" ]]
+		then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+		else %configure --disable-static --localstatedir=/var/lib
+	fi
 %else
-%configure --disable-static --localstatedir=/var/lib
+	%configure --disable-static --localstatedir=/var/lib
 %endif
 
 # We have to remove rpath - not allowed in Fedora
@@ -124,6 +129,11 @@ tail -n +11 etc/default.vcl >> redhat/de
 	redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
 %endif
 
+# Fix for broken changes-2.0.6.html
+pushd doc
+%{__make} clean; %{__make}
+popd
+
 %check
 # rhel5 on ppc64 is just too strange
 %ifarch ppc64
@@ -132,6 +142,15 @@ tail -n +11 etc/default.vcl >> redhat/de
 	%endif
 %endif
 
+# The redhat ppc builders seem to have some ulimit problems?
+# These tests work on a rhel4 ppc/ppc64 instance outside the builders
+%ifarch ppc64 ppc
+	%if 0%{?rhel} == 4
+		rm bin/varnishtest/tests/c00031.vtc
+		rm bin/varnishtest/tests/r00387.vtc
+	%endif
+%endif
+
 LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo
 %{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
 
@@ -235,8 +254,16 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2
+- Added a test that enables jemalloc on ppc if the kernel is
+  not a rhel5 kernel (as on redhat builders)
+- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
+  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
+- Added a patch that fixes broken changes-2.0.6.html in doc
+
 * Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
 - New upstream release
+- Removed patches for libjemalloc, as they are added upstream
 
 * Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
 - New upstream release



From buc at fedoraproject.org  Wed Dec 23 14:11:54 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 23 Dec 2009 14:11:54 +0000 (UTC)
Subject: rpms/phpldapadmin/F-11 phpldapadmin-1.2.0.3-config.patch, NONE,
	1.1 phpldapadmin.spec, 1.18, 1.19 sources, 1.11,
	1.12 phpldapadmin-1.1.0.5-config.patch, 1.1, NONE
Message-ID: <20091223141154.D001811C00E6@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23193

Modified Files:
	phpldapadmin.spec sources 
Added Files:
	phpldapadmin-1.2.0.3-config.patch 
Removed Files:
	phpldapadmin-1.1.0.5-config.patch 
Log Message:
Upgrade to 1.2.0.4



phpldapadmin-1.2.0.3-config.patch:
 config.php |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE phpldapadmin-1.2.0.3-config.patch ---
diff -Nrbu phpldapadmin-1.2.0.3/config/config.php phpldapadmin-1.2.0.3-OK/config/config.php
--- phpldapadmin-1.2.0.3/config/config.php	2009-09-16 17:50:36.000000000 +0400
+++ phpldapadmin-1.2.0.3-OK/config/config.php	2009-09-16 17:48:19.000000000 +0400
@@ -72,6 +72,11 @@
    30 seconds or the setting of max_exection_time if this is null. */
 // $config->custom->session['timelimit'] = 30;
 
+// $config->custom->appearance['show_clear_password'] = false;
+
+// $config->custom->search['size_limit'] = 50;
+#  $config->custom->search['size_limit'] = 1000;
+
 /* Our local timezone
    This is to make sure that when we ask the system for the current time, we
    get the right local time. If this is not set, all time() calculations will
@@ -265,7 +270,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$servers->setValue('server','name','My LDAP Server');
+$servers->setValue('server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -359,6 +364,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $servers->setValue('appearance','password_hash','md5');
+$servers->setValue('appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -368,6 +374,7 @@
    your LDAP server requires you to login to perform searches, you can enter the
    DN to use when searching in 'bind_id' and 'bind_pass' above.
 // $servers->setValue('login','attr','dn');
+$servers->setValue('login','attr','uid');
 
 /* Base DNs to used for logins. If this value is not set, then the LDAP server
    Base DNs are used. */


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/F-11/phpldapadmin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- phpldapadmin.spec	9 Apr 2009 14:39:56 -0000	1.18
+++ phpldapadmin.spec	23 Dec 2009 14:11:54 -0000	1.19
@@ -1,12 +1,12 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 1.1.0.7
+Version: 1.2.0.4
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
-Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
-Patch0: phpldapadmin-1.1.0.5-config.patch
+Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tgz
+Patch0: phpldapadmin-1.2.0.3-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -41,7 +41,7 @@ cp config/config.php.example config/conf
 
 %build
 
-find . \( -name "*.orig" -o -name "*~" -o -name .cvsignore \) -print0 | \
+find . \( -name "*.orig" -o -name "*~" -o -name .gitignore \) -print0 | \
 								xargs -0 rm -f
 find . -type f -print0 | xargs -0 chmod -x
 
@@ -82,6 +82,7 @@ Alias /ldapadmin %{_datadir}/%{name}/htd
   Order Deny,Allow
   Deny from all
   Allow from 127.0.0.1
+  Allow from ::1
 </Directory>
 
 EOF
@@ -115,6 +116,10 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2.0.4-1
+- Upgrade to 1.2.0.4 . Fixes #549559
+- Allow local IPv6 address by default
+
 * Thu Apr  9 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.1.0.7-1
 - update to 1.1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Apr 2009 14:39:56 -0000	1.11
+++ sources	23 Dec 2009 14:11:54 -0000	1.12
@@ -1 +1 @@
-a9129f81b347e98c2b31552d1adc4b51  phpldapadmin-1.1.0.7.tar.gz
+a2d914e22c1b114738eca91c80c0d09c  phpldapadmin-1.2.0.4.tgz


--- phpldapadmin-1.1.0.5-config.patch DELETED ---



From sergiopr at fedoraproject.org  Wed Dec 23 14:26:57 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 14:26:57 +0000 (UTC)
Subject: File rst2pdf-0.12.3.tar.gz uploaded to lookaside cache by sergiopr
Message-ID: <20091223142657.C69D310F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rst2pdf:

7c6a879b6105eb369c9ec4324ca73167  rst2pdf-0.12.3.tar.gz



From sergiopr at fedoraproject.org  Wed Dec 23 14:27:26 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 14:27:26 +0000 (UTC)
Subject: rpms/rst2pdf/devel .cvsignore, 1.2, 1.3 rst2pdf.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091223142726.D727B11C00E6@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rst2pdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25578

Modified Files:
	.cvsignore rst2pdf.spec sources 
Log Message:
* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.3-1
- New upstream source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rst2pdf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Nov 2009 17:42:19 -0000	1.2
+++ .cvsignore	23 Dec 2009 14:27:25 -0000	1.3
@@ -1 +1 @@
-rst2pdf-0.12.2.tar.gz
+rst2pdf-0.12.3.tar.gz


Index: rst2pdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rst2pdf/devel/rst2pdf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rst2pdf.spec	14 Nov 2009 17:42:20 -0000	1.1
+++ rst2pdf.spec	23 Dec 2009 14:27:25 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: rst2pdf
-Version: 0.12.2
-Release: 2%{?dist}
+Version: 0.12.3
+Release: 1%{?dist}
 Summary: Tool for transforming reStructuredText to PDF
 License: MIT
 
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.3-1
+- New upstream source
+
 * Fri Nov 13 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.2-2
 - URL changed
 - Requires pygments


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rst2pdf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2009 17:42:20 -0000	1.2
+++ sources	23 Dec 2009 14:27:25 -0000	1.3
@@ -1 +1 @@
-72dc600974847d84299eb8d6cb3954ab  rst2pdf-0.12.2.tar.gz
+7c6a879b6105eb369c9ec4324ca73167  rst2pdf-0.12.3.tar.gz



From sergiopr at fedoraproject.org  Wed Dec 23 14:36:08 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 14:36:08 +0000 (UTC)
Subject: rpms/rst2pdf/F-12 rst2pdf.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091223143608.D651311C00E6@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rst2pdf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26789

Modified Files:
	rst2pdf.spec sources 
Log Message:
* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.3-1
- New upstream source



Index: rst2pdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rst2pdf/F-12/rst2pdf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rst2pdf.spec	14 Nov 2009 17:50:38 -0000	1.1
+++ rst2pdf.spec	23 Dec 2009 14:36:08 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: rst2pdf
-Version: 0.12.2
-Release: 2%{?dist}
+Version: 0.12.3
+Release: 1%{?dist}
 Summary: Tool for transforming reStructuredText to PDF
 License: MIT
 
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.3-1
+- New upstream source
+
 * Fri Nov 13 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.2-2
 - URL changed
 - Requires pygments


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rst2pdf/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2009 17:50:38 -0000	1.2
+++ sources	23 Dec 2009 14:36:08 -0000	1.3
@@ -1 +1 @@
-72dc600974847d84299eb8d6cb3954ab  rst2pdf-0.12.2.tar.gz
+7c6a879b6105eb369c9ec4324ca73167  rst2pdf-0.12.3.tar.gz



From sergiopr at fedoraproject.org  Wed Dec 23 14:37:26 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 14:37:26 +0000 (UTC)
Subject: rpms/rst2pdf/F-11 rst2pdf.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091223143726.757A711C00E6@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rst2pdf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27068

Modified Files:
	rst2pdf.spec sources 
Log Message:
* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.3-1
- New upstream source



Index: rst2pdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rst2pdf/F-11/rst2pdf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rst2pdf.spec	14 Nov 2009 18:19:47 -0000	1.1
+++ rst2pdf.spec	23 Dec 2009 14:37:26 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: rst2pdf
-Version: 0.12.2
-Release: 2%{?dist}
+Version: 0.12.3
+Release: 1%{?dist}
 Summary: Tool for transforming reStructuredText to PDF
 License: MIT
 
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Dec 23 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.3-1
+- New upstream source
+
 * Fri Nov 13 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.12.2-2
 - URL changed
 - Requires pygments


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rst2pdf/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Nov 2009 18:19:47 -0000	1.2
+++ sources	23 Dec 2009 14:37:26 -0000	1.3
@@ -1 +1 @@
-72dc600974847d84299eb8d6cb3954ab  rst2pdf-0.12.2.tar.gz
+7c6a879b6105eb369c9ec4324ca73167  rst2pdf-0.12.3.tar.gz



From petersen at fedoraproject.org  Wed Dec 23 14:42:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 23 Dec 2009 14:42:17 +0000 (UTC)
Subject: rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.10,
	1.11 ghc-rpm-macros.spec, 1.12, 1.13
Message-ID: <20091223144217.4AE2D11C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-rpm-macros/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27820

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
- add cabal_configure_dynamic
- add ghc_requires, ghc_doc_requires, ghc_prof_requires




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ghc-rpm-macros.ghc	15 Dec 2009 21:50:31 -0000	1.10
+++ ghc-rpm-macros.ghc	23 Dec 2009 14:42:16 -0000	1.11
@@ -3,6 +3,8 @@
 %cabal_configure \
 %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{ghcdocdir} --libsubdir='$compiler/$pkgid' %{?with_shared:--enable-shared}
 
+%cabal_configure_dynamic %cabal_configure --ghc-option=-dynamic
+
 %cabal_makefile \
 %cabal makefile -f cabal-rpm.mk \
 make -f cabal-rpm.mk %{_smp_mflags} \
@@ -40,3 +42,16 @@ echo '%{ghcdocdir}' >> %1-doc.files \
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/ghc-%(ghc --numeric-version)/package.conf.d \
 install --mode=0644 %{?pkg_name}%{!?pkg_name:%name}-%{version}.conf $RPM_BUILD_ROOT%{_libdir}/ghc-%{ghc_version}/package.conf.d
  
+%ghc_requires Requires:       ghc = %{ghc_version}\
+Requires(post): ghc = %{ghc_version}\
+Requires(postun): ghc = %{ghc_version}\
+%if %{with shared}\
+Requires:       ghc-%{?pkg_name}%{!?pkg_name:%name} = %{version}-%{release}\
+%endif
+
+%ghc_doc_requires Requires:       ghc-doc = %{ghc_version}\
+Requires(post): ghc-doc = %{ghc_version}\
+Requires(postun): ghc-doc = %{ghc_version}
+
+%ghc_prof_requires Requires:       ghc-prof = %{ghc_version}\
+Requires:       ghc-%{?pkg_name}%{!?pkg_name:%name}-devel = %{version}-%{release}


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ghc-rpm-macros.spec	15 Dec 2009 21:50:31 -0000	1.12
+++ ghc-rpm-macros.spec	23 Dec 2009 14:42:16 -0000	1.13
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.3.1
+Version:	0.4.0
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Jens Petersen <petersen at redhat.com> - 0.4.0-1
+- add cabal_configure_dynamic
+- add ghc_requires, ghc_doc_requires, ghc_prof_requires
+
 * Tue Dec 15 2009 Jens Petersen <petersen at redhat.com> - 0.3.1-1
 - use ghc_version_override to override ghc_version
 - fix pkg .conf filelist match



From sergiopr at fedoraproject.org  Wed Dec 23 14:50:46 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 14:50:46 +0000 (UTC)
Subject: File sextractor-2.8.6.tar.gz uploaded to lookaside cache by sergiopr
Message-ID: <20091223145046.74B2210F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sextractor:

6c2fc529cd89bdd11b1fbafc0866131c  sextractor-2.8.6.tar.gz



From sergiopr at fedoraproject.org  Wed Dec 23 14:51:28 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 23 Dec 2009 14:51:28 +0000 (UTC)
Subject: rpms/sextractor/devel sextractor-cflags.patch, NONE, 1.1 .cvsignore, 
	1.3, 1.4 sextractor-pointer-alias.patch, 1.1,
	1.2 sextractor.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <20091223145128.CCB5511C00E6@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/sextractor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29426

Modified Files:
	.cvsignore sextractor-pointer-alias.patch sextractor.spec 
	sources 
Added Files:
	sextractor-cflags.patch 
Log Message:
* Wed Aug 26 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.8.6-1
- New upstream source


sextractor-cflags.patch:
 configure |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE sextractor-cflags.patch ---
diff -ur sextractor-2.8.6/configure sextractor-2.8.6.new/configure
--- sextractor-2.8.6/configure	2009-04-09 15:30:14.000000000 +0200
+++ sextractor-2.8.6.new/configure	2009-08-26 16:39:05.000000000 +0200
@@ -2487,10 +2487,10 @@
 cclist="cc gcc"
 
 # Backup and reset the input CFLAGS and LDFLAGS
-mycflags="$CFLAGS"
-CFLAGS=""
-myldflags="$LDFLAGS"
-LDFLAGS=""
+#mycflags="$CFLAGS"
+#CFLAGS=""
+#myldflags="$LDFLAGS"
+#LDFLAGS=""
 
 # Provide special option for the Linux Intel C compiler
 { echo "$as_me:$LINENO: checking for Linux Intel C compiler mode" >&5
@@ -4358,8 +4358,8 @@
       rm -f conftest.*
     fi
     if test -n "$prog_cc_optim_flags"; then
-      CFLAGS="$CFLAGS $prog_cc_optim_flags"
-      LDFLAGS="$LDFLAGS $prog_ld_optim_flags"
+      prog_cc_optim_flags=""
+      prog_ld_optim_flags=""
     else
       prog_cc_optim_flags=""
       prog_ld_optim_flags=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sextractor/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Jul 2006 16:26:07 -0000	1.3
+++ .cvsignore	23 Dec 2009 14:51:27 -0000	1.4
@@ -1 +1 @@
-sextractor-2.5.0.tar.gz
+sextractor-2.8.6.tar.gz

sextractor-pointer-alias.patch:
 analyse.c |   83 ++++-----
 analyse.o |only
 astrom.c  |  519 ++++++++++++++++++++++++++++++--------------------------------
 astrom.o  |only
 growth.c  |   22 +-
 growth.o  |only
 pc.c      |   37 ++--
 pc.o      |only
 photom.c  |  186 +++++++++++-----------
 photom.o  |only
 psf.c     |   60 +++----
 psf.o     |only
 winpos.c  |   98 +++++------
 winpos.o  |only
 14 files changed, 501 insertions(+), 504 deletions(-)

Index: sextractor-pointer-alias.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sextractor/devel/sextractor-pointer-alias.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sextractor-pointer-alias.patch	26 Jul 2006 16:20:29 -0000	1.1
+++ sextractor-pointer-alias.patch	23 Dec 2009 14:51:28 -0000	1.2
@@ -1,16 +1,15 @@
-diff -ur sextractor-2.5.0.old/src/analyse.c sextractor-2.5.0/src/analyse.c
---- sextractor-2.5.0.old/src/analyse.c	2006-06-29 19:58:03.000000000 +0200
-+++ sextractor-2.5.0/src/analyse.c	2006-07-25 23:26:51.000000000 +0200
-@@ -41,7 +41,7 @@
+diff -ur sextractor-2.8.6/src/analyse.c sextractor-2.8.6.new/src/analyse.c
+--- sextractor-2.8.6/src/analyse.c	2009-01-29 14:51:59.000000000 +0100
++++ sextractor-2.8.6.new/src/analyse.c	2009-05-24 00:07:07.000000000 +0200
+@@ -42,7 +42,6 @@
  #include	"som.h"
  #include	"winpos.h"
  
 -static obj2struct	*obj2 = &outobj2;
-+/* static obj2struct	*obj2 = &outobj2; */
+ extern profitstruct	*theprofit;
  
  /********************************* analyse ***********************************/
- void  analyse(picstruct *field, picstruct *dfield, int objnb,
-@@ -403,11 +403,11 @@
+@@ -392,11 +391,11 @@
    obj = &objlist->obj[n];
  
  /* Current FITS extension */
@@ -25,7 +24,7 @@ diff -ur sextractor-2.5.0.old/src/analys
  
  /* Integer coordinates */
    ix=(int)(obj->mx+0.49999);
-@@ -415,11 +415,11 @@
+@@ -404,11 +403,11 @@
  
  /* Association */
    if (prefs.assoc_flag)
@@ -39,7 +38,7 @@ diff -ur sextractor-2.5.0.old/src/analys
    else
      selecflag = 1;
  
-@@ -450,9 +450,9 @@
+@@ -439,9 +438,9 @@
        pmx2+=temp;
        pmy2-=temp;
  
@@ -52,7 +51,7 @@ diff -ur sextractor-2.5.0.old/src/analys
        }
  
      if (FLAG(obj2.poserr_cxx))
-@@ -462,32 +462,32 @@
+@@ -451,28 +450,28 @@
        xm2 = obj->poserr_mx2;
        ym2 = obj->poserr_my2;
        xym = obj->poserr_mxy;
@@ -86,16 +85,10 @@ diff -ur sextractor-2.5.0.old/src/analys
 -    obj2->fluxerr_iso = sqrt(obj->fluxerr);
 +    outobj2.flux_iso = obj->flux;
 +    outobj2.fluxerr_iso = sqrt(obj->fluxerr);
-     if (FLAG(obj.flux_prof))
-       {
--      obj2->flux_prof = obj->flux_prof;
--      obj2->fluxerr_prof = sqrt(obj->fluxerr_prof);
-+      outobj2.flux_prof = obj->flux_prof;
-+      outobj2.fluxerr_prof = sqrt(obj->fluxerr_prof);
-       }
  
      if (FLAG(obj2.flux_isocor))
-@@ -526,14 +526,14 @@
+       computeisocorflux(field, obj);
+@@ -510,14 +509,14 @@
  
        if (FLAG(obj2.flux_auto))
          sexellips(check->pix, check->width, check->height,
@@ -114,7 +107,7 @@ diff -ur sextractor-2.5.0.old/src/analys
  	check->overlay, obj->flag&OBJ_CROWDED);
        }
  
-@@ -555,7 +555,7 @@
+@@ -539,7 +538,7 @@
          input[++j] = log10(obj->iso[i]? obj->iso[i]/fac2: 0.01);
        input[++j] = log10(fwhm);
        neurresp(input, &output);
@@ -123,9 +116,9 @@ diff -ur sextractor-2.5.0.old/src/analys
        }
  
  /*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-@@ -604,8 +604,8 @@
+@@ -588,8 +587,8 @@
        som_phot(thesom, obj->bkg, field->backsig,
-         (float)prefs.gain, obj->mx-ix, obj->my-iy,
+         (float)field->gain, obj->mx-ix, obj->my-iy,
          FLAG(obj2.vector_somfit)?outobj2.vector_somfit:NULL, -1.0);
 -      obj2->stderr_somfit = thesom->stderror;
 -      obj2->flux_somfit = thesom->amp;
@@ -134,7 +127,7 @@ diff -ur sextractor-2.5.0.old/src/analys
        outobj2.fluxerr_somfit = thesom->sigamp;
        }
  
-@@ -628,7 +628,7 @@
+@@ -609,7 +608,7 @@
          double_psf_fit(ppsf, field, wfield, obj, thepsf, dfield, dwfield);
        else
          psf_fit(thepsf, field, wfield, obj);
@@ -143,7 +136,7 @@ diff -ur sextractor-2.5.0.old/src/analys
        if (prefs.psfdisplay_type == PSFDISPLAY_SPLIT)
          {
          nsub = thepsfit->npsf;
-@@ -639,18 +639,18 @@
+@@ -620,18 +619,18 @@
          for (j=0; j<thepsfit->npsf; j++)
            {
            if (FLAG(obj2.x_psf) && j<prefs.psf_xsize)
@@ -169,7 +162,16 @@ diff -ur sextractor-2.5.0.old/src/analys
  		prefs.mag_zeropoint -2.5*log10(thepsfit->flux[j]) : 99.0;
            }
        }
-@@ -670,20 +670,20 @@
+@@ -639,7 +638,7 @@
+ /*----------------------------- Profile fitting -----------------------------*/
+     nsub = 1;
+     if (prefs.prof_flag)
+-      profit_fit(theprofit, field, wfield, obj, obj2);
++      profit_fit(theprofit, field, wfield, obj, &outobj2);
+ 
+ /*--- Express everything in magnitude units */
+     computemags(field, obj);
+@@ -659,20 +658,20 @@
        if (prefs.psf_flag && prefs.psfdisplay_type == PSFDISPLAY_SPLIT)
          {
          if (FLAG(obj2.x_psf))
@@ -198,7 +200,7 @@ diff -ur sextractor-2.5.0.old/src/analys
          if (j)
            obj->number = ++thecat.ntotal;
          }
-@@ -714,7 +714,7 @@
+@@ -722,7 +721,7 @@
        {
        if (prefs.somfit_flag && (check=prefs.check[CHECK_MAPSOM]))
          blankcheck(check, obj->blank, obj->subw, obj->subh,
@@ -207,181 +209,261 @@ diff -ur sextractor-2.5.0.old/src/analys
  
        }
      blankimage(field, obj->blank, obj->subw, obj->subh,
-diff -ur sextractor-2.5.0.old/src/astrom.c sextractor-2.5.0/src/astrom.c
---- sextractor-2.5.0.old/src/astrom.c	2006-07-13 19:13:09.000000000 +0200
-+++ sextractor-2.5.0/src/astrom.c	2006-07-25 23:27:21.000000000 +0200
-@@ -29,7 +29,7 @@
- #include	"astrom.h"
+Only in sextractor-2.8.6.new/src: analyse.o
+diff -ur sextractor-2.8.6/src/astrom.c sextractor-2.8.6.new/src/astrom.c
+--- sextractor-2.8.6/src/astrom.c	2009-01-29 14:52:00.000000000 +0100
++++ sextractor-2.8.6.new/src/astrom.c	2009-05-24 00:07:27.000000000 +0200
+@@ -30,7 +30,6 @@
+ #include	"fitswcs.h"
  #include	"wcs/tnx.h"
  
 -static obj2struct	*obj2 = &outobj2;
-+/* static obj2struct	*obj2 = &outobj2; */
  
  /****************************** initastrom **********************************/
  /*
-@@ -169,32 +169,32 @@
-     {
-     if (as->wcs_flag)
+@@ -99,46 +98,46 @@
+ /* If working with WCS, compute WORLD coordinates and local matrix */
+   if (FLAG(obj2.mxw))
+     {
+-    rawpos[0] = obj2->posx;
+-    rawpos[1] = obj2->posy;
++    rawpos[0] = outobj2.posx;
++    rawpos[1] = outobj2.posy;
+     raw_to_wcs(wcs, rawpos, wcspos);
+-    obj2->mxw = wcspos[0];
+-    obj2->myw = wcspos[1];
++    outobj2.mxw = wcspos[0];
++    outobj2.myw = wcspos[1];
+     if (lng != lat)
        {
--      wcspos = compute_wcs(field, obj2->posx, obj2->posy);
--      obj2->alphas = obj2->mxw = wcspos[0];
--      obj2->deltas = obj2->myw = wcspos[1];
-+      wcspos = compute_wcs(field, outobj2.posx, outobj2.posy);
-+      outobj2.alphas = outobj2.mxw = wcspos[0];
-+      outobj2.deltas = outobj2.myw = wcspos[1];
+-      obj2->alphas = lng<lat? obj2->mxw : obj2->myw;
+-      obj2->deltas = lng<lat? obj2->myw : obj2->mxw;
++      outobj2.alphas = lng<lat? outobj2.mxw : outobj2.myw;
++      outobj2.deltas = lng<lat? outobj2.myw : outobj2.mxw;
        if (FLAG(obj2.alpha2000))
          {
-         if (fabs(as->equinox-2000.0)>0.003)
-           precess(as->equinox, wcspos[0], wcspos[1],
+         if (fabs(wcs->equinox-2000.0)>0.003)
+           precess(wcs->equinox, wcspos[lng<lat?0:1], wcspos[lng<lat?1:0],
 -		2000.0, &obj2->alpha2000, &obj2->delta2000);
 +		2000.0, &outobj2.alpha2000, &outobj2.delta2000);
          else
            {
--          obj2->alpha2000 = obj2->mxw;
--          obj2->delta2000 = obj2->myw;
-+          outobj2.alpha2000 = outobj2.mxw;
-+          outobj2.delta2000 = outobj2.myw;
+-          obj2->alpha2000 = lng<lat? obj2->mxw : obj2->myw;
+-          obj2->delta2000 = lng<lat? obj2->myw : obj2->mxw;
++          outobj2.alpha2000 = lng<lat? outobj2.mxw : outobj2.myw;
++          outobj2.delta2000 = lng<lat? outobj2.myw : outobj2.mxw;
+           }
+         if (FLAG(obj2.dtheta2000))
+           {
+-          da = wcs->ap2000 - obj2->alpha2000;
++          da = wcs->ap2000 - outobj2.alpha2000;
+           dd = (sin(wcs->dp2000*DEG)
+-		-sin(obj2->delta2000*DEG)*sin(obj2->deltas*DEG))
+-		/(cos(obj2->delta2000*DEG)*cos(obj2->deltas*DEG));
++		-sin(outobj2.delta2000*DEG)*sin(outobj2.deltas*DEG))
++		/(cos(outobj2.delta2000*DEG)*cos(outobj2.deltas*DEG));
+           dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
+-          obj2->dtheta2000 = (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
++          outobj2.dtheta2000 = (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
            }
          if (FLAG(obj2.alpha1950))
--          j2b(as->equinox, obj2->alpha2000, obj2->delta2000,
+           {
+-          j2b(wcs->equinox, obj2->alpha2000, obj2->delta2000,
 -		&obj2->alpha1950, &obj2->delta1950);
-+          j2b(as->equinox, outobj2.alpha2000, outobj2.delta2000,
++          j2b(wcs->equinox, outobj2.alpha2000, outobj2.delta2000,
 +		&outobj2.alpha1950, &outobj2.delta1950);
+           if (FLAG(obj2.dtheta1950))
+             {
+-            da = wcs->ap1950 - obj2->alpha1950;
++            da = wcs->ap1950 - outobj2.alpha1950;
+             dd = (sin(wcs->dp1950*DEG)
+-		-sin(obj2->delta1950*DEG)*sin(obj2->deltas*DEG))
+-		/(cos(obj2->delta1950*DEG)*cos(obj2->deltas*DEG));
++		-sin(outobj2.delta1950*DEG)*sin(outobj2.deltas*DEG))
++		/(cos(outobj2.delta1950*DEG)*cos(outobj2.deltas*DEG));
+             dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
+-            obj2->dtheta1950 = (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
++            outobj2.dtheta1950 = (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
+            }
+           }
          }
-       }
-     else
+@@ -151,25 +150,25 @@
+     rawpos[0] = obj->peakx;
+     rawpos[1] = obj->peaky;
+     raw_to_wcs(wcs, rawpos, wcspos);
+-    obj2->peakxw = wcspos[0];
+-    obj2->peakyw = wcspos[1];
++    outobj2.peakxw = wcspos[0];
++    outobj2.peakyw = wcspos[1];
+     if (lng != lat)
        {
-        double	dx,dy;
- 
--      dx = obj2->posx - as->crpix[0];
--      dy = obj2->posy - as->crpix[1];
--      obj2->mxw = as->crval[0]+ lm[0]*dx + lm[1]*dy;	/* CDELT included! */
--      obj2->myw = as->crval[1]+ lm[2]*dx + lm[3]*dy;	/* CDELT included! */
-+      dx = outobj2.posx - as->crpix[0];
-+      dy = outobj2.posy - as->crpix[1];
-+      outobj2.mxw = as->crval[0]+ lm[0]*dx + lm[1]*dy;	/* CDELT included! */
-+      outobj2.myw = as->crval[1]+ lm[2]*dx + lm[3]*dy;	/* CDELT included! */
-       }
-     }
- 
-@@ -204,21 +204,21 @@
-     if (as->wcs_flag)
-       {
-       wcspos = compute_wcs(field, (double)obj->peakx, (double)obj->peaky);
--      obj2->peakalphas = obj2->peakxw = wcspos[0];
--      obj2->peakdeltas = obj2->peakyw = wcspos[1];
-+      outobj2.peakalphas = outobj2.peakxw = wcspos[0];
-+      outobj2.peakdeltas = outobj2.peakyw = wcspos[1];
+-      obj2->peakalphas = lng<lat? obj2->peakxw : obj2->peakyw;
+-      obj2->peakdeltas = lng<lat? obj2->peakyw : obj2->peakxw;
++      outobj2.peakalphas = lng<lat? outobj2.peakxw : outobj2.peakyw;
++      outobj2.peakdeltas = lng<lat? outobj2.peakyw : outobj2.peakxw;
        if (FLAG(obj2.peakalpha2000))
          {
-         if (fabs(as->equinox-2000.0)>0.003)
-           precess(as->equinox, wcspos[0], wcspos[1],
+         if (fabs(wcs->equinox-2000.0)>0.003)
+           precess(wcs->equinox, wcspos[lng<lat?0:1], wcspos[lng<lat?1:0],
 -		2000.0, &obj2->peakalpha2000, &obj2->peakdelta2000);
 +		2000.0, &outobj2.peakalpha2000, &outobj2.peakdelta2000);
          else
            {
--          obj2->peakalpha2000 = obj2->peakxw;
--          obj2->peakdelta2000 = obj2->peakyw;
-+          outobj2.peakalpha2000 = outobj2.peakxw;
-+          outobj2.peakdelta2000 = outobj2.peakyw;
+-          obj2->peakalpha2000 = lng<lat? obj2->peakxw : obj2->peakyw;
+-          obj2->peakdelta2000 = lng<lat? obj2->peakyw : obj2->peakxw;
++          outobj2.peakalpha2000 = lng<lat? outobj2.peakxw : outobj2.peakyw;
++          outobj2.peakdelta2000 = lng<lat? outobj2.peakyw : outobj2.peakxw;
            }
          if (FLAG(obj2.peakalpha1950))
--          j2b(as->equinox, obj2->peakalpha2000, obj2->peakdelta2000,
+-          j2b(wcs->equinox, obj2->peakalpha2000, obj2->peakdelta2000,
 -		&obj2->peakalpha1950, &obj2->peakdelta1950);
-+          j2b(as->equinox, outobj2.peakalpha2000, outobj2.peakdelta2000,
++          j2b(wcs->equinox, outobj2.peakalpha2000, outobj2.peakdelta2000,
 +		&outobj2.peakalpha1950, &outobj2.peakdelta1950);
          }
        }
-     else 
-@@ -227,8 +227,8 @@
- 
-       dx = obj->peakx - as->crpix[0];
-       dy = obj->peaky - as->crpix[1];
--      obj2->peakxw = as->crval[0]+ lm[0]*dx + lm[1]*dy;	/* CDELT included! */
--      obj2->peakyw = as->crval[1]+ lm[2]*dx + lm[3]*dy;	/* CDELT included! */
-+      outobj2.peakxw = as->crval[0]+ lm[0]*dx + lm[1]*dy;	/* CDELT included! */
-+      outobj2.peakyw = as->crval[1]+ lm[2]*dx + lm[3]*dy;	/* CDELT included! */
-       }
      }
- 
-@@ -237,32 +237,32 @@
-     {
-     if (as->wcs_flag)
+@@ -177,28 +176,28 @@
+ /* Idem for Windowed positions */
+   if (FLAG(obj2.winpos_xw))
+     {
+-    rawpos[0] = obj2->winpos_x;
+-    rawpos[1] = obj2->winpos_y;
++    rawpos[0] = outobj2.winpos_x;
++    rawpos[1] = outobj2.winpos_y;
+     raw_to_wcs(wcs, rawpos, wcspos);
+-    obj2->winpos_xw = wcspos[0];
+-    obj2->winpos_yw = wcspos[1];
++    outobj2.winpos_xw = wcspos[0];
++    outobj2.winpos_yw = wcspos[1];
+     if (lng != lat)
        {
--      wcspos = compute_wcs(field, obj2->winpos_x, obj2->winpos_y);
--      obj2->winpos_alphas = obj2->winpos_xw = wcspos[0];
--      obj2->winpos_deltas = obj2->winpos_yw = wcspos[1];
-+      wcspos = compute_wcs(field, outobj2.winpos_x, outobj2.winpos_y);
-+      outobj2.winpos_alphas = outobj2.winpos_xw = wcspos[0];
-+      outobj2.winpos_deltas = outobj2.winpos_yw = wcspos[1];
+-      obj2->winpos_alphas = lng<lat? obj2->winpos_xw : obj2->winpos_yw;
+-      obj2->winpos_deltas = lng<lat? obj2->winpos_yw : obj2->winpos_xw;
++      outobj2.winpos_alphas = lng<lat? outobj2.winpos_xw : outobj2.winpos_yw;
++      outobj2.winpos_deltas = lng<lat? outobj2.winpos_yw : outobj2.winpos_xw;
        if (FLAG(obj2.winpos_alpha2000))
          {
-         if (fabs(as->equinox-2000.0)>0.003)
-           precess(as->equinox, wcspos[0], wcspos[1],
+         if (fabs(wcs->equinox-2000.0)>0.003)
+           precess(wcs->equinox, wcspos[0], wcspos[1],
 -		2000.0, &obj2->winpos_alpha2000, &obj2->winpos_delta2000);
 +		2000.0, &outobj2.winpos_alpha2000, &outobj2.winpos_delta2000);
          else
            {
--          obj2->winpos_alpha2000 = obj2->winpos_xw;
--          obj2->winpos_delta2000 = obj2->winpos_yw;
-+          outobj2.winpos_alpha2000 = outobj2.winpos_xw;
-+          outobj2.winpos_delta2000 = outobj2.winpos_yw;
+-          obj2->winpos_alpha2000 = lng<lat? obj2->winpos_xw : obj2->winpos_yw;
+-          obj2->winpos_delta2000 = lng<lat? obj2->winpos_yw : obj2->winpos_xw;
++          outobj2.winpos_alpha2000 = lng<lat? outobj2.winpos_xw : outobj2.winpos_yw;
++          outobj2.winpos_delta2000 = lng<lat? outobj2.winpos_yw : outobj2.winpos_xw;
            }
          if (FLAG(obj2.winpos_alpha1950))
--          j2b(as->equinox, obj2->winpos_alpha2000, obj2->winpos_delta2000,
+-          j2b(wcs->equinox, obj2->winpos_alpha2000, obj2->winpos_delta2000,
 -		&obj2->winpos_alpha1950, &obj2->winpos_delta1950);
-+          j2b(as->equinox, outobj2.winpos_alpha2000, outobj2.winpos_delta2000,
++          j2b(wcs->equinox, outobj2.winpos_alpha2000, outobj2.winpos_delta2000,
 +		&outobj2.winpos_alpha1950, &outobj2.winpos_delta1950);
          }
        }
-     else
+     }
+@@ -206,28 +205,28 @@
+ /* Idem for Model-fitted positions */
+   if (FLAG(obj2.xw_prof))
+     {
+-    rawpos[0] = obj2->x_prof;
+-    rawpos[1] = obj2->y_prof;
++    rawpos[0] = outobj2.x_prof;
++    rawpos[1] = outobj2.y_prof;
+     raw_to_wcs(wcs, rawpos, wcspos);
+-    obj2->xw_prof = wcspos[0];
+-    obj2->yw_prof = wcspos[1];
++    outobj2.xw_prof = wcspos[0];
++    outobj2.yw_prof = wcspos[1];
+     if (lng != lat)
        {
-        double	dx,dy;
- 
--      dx = obj2->winpos_x - as->crpix[0];
--      dy = obj2->winpos_y - as->crpix[1];
--      obj2->winpos_xw = as->crval[0]+ lm[0]*dx + lm[1]*dy;/* CDELT included! */
--      obj2->winpos_yw = as->crval[1]+ lm[2]*dx + lm[3]*dy;/* CDELT included! */
-+      dx = outobj2.winpos_x - as->crpix[0];
-+      dy = outobj2.winpos_y - as->crpix[1];
-+      outobj2.winpos_xw = as->crval[0]+ lm[0]*dx + lm[1]*dy;/* CDELT included! */
-+      outobj2.winpos_yw = as->crval[1]+ lm[2]*dx + lm[3]*dy;/* CDELT included! */
+-      obj2->alphas_prof = lng<lat? obj2->xw_prof : obj2->yw_prof;
+-      obj2->deltas_prof = lng<lat? obj2->yw_prof : obj2->xw_prof;
++      outobj2.alphas_prof = lng<lat? outobj2.xw_prof : outobj2.yw_prof;
++      outobj2.deltas_prof = lng<lat? outobj2.yw_prof : outobj2.xw_prof;
+       if (FLAG(obj2.alpha2000_prof))
+         {
+         if (fabs(wcs->equinox-2000.0)>0.003)
+           precess(wcs->equinox, wcspos[0], wcspos[1],
+-		2000.0, &obj2->alpha2000_prof, &obj2->delta2000_prof);
++		2000.0, &outobj2.alpha2000_prof, &outobj2.delta2000_prof);
+         else
+           {
+-          obj2->alpha2000_prof = lng<lat? obj2->xw_prof : obj2->yw_prof;
+-          obj2->delta2000_prof = lng<lat? obj2->yw_prof : obj2->xw_prof;
++          outobj2.alpha2000_prof = lng<lat? outobj2.xw_prof : outobj2.yw_prof;
++          outobj2.delta2000_prof = lng<lat? outobj2.yw_prof : outobj2.xw_prof;
+           }
+         if (FLAG(obj2.alpha1950_prof))
+-          j2b(wcs->equinox, obj2->alpha2000_prof, obj2->delta2000_prof,
+-		&obj2->alpha1950_prof, &obj2->delta1950_prof);
++          j2b(wcs->equinox, outobj2.alpha2000_prof, outobj2.delta2000_prof,
++		&outobj2.alpha1950_prof, &outobj2.delta1950_prof);
+         }
        }
      }
- 
-@@ -271,11 +271,11 @@
-     {
-      double	dx,dy;
- 
--    dx = obj2->posx - 0.5;
--    dy = obj2->posy - 0.5;
--    obj2->mamaposx = (as->crval[1]+lm[2]*dx+lm[3]*dy)
-+    dx = outobj2.posx - 0.5;
-+    dy = outobj2.posy - 0.5;
-+    outobj2.mamaposx = (as->crval[1]+lm[2]*dx+lm[3]*dy)
- 			*(MAMA_CORFLEX+1.0);		/* CDELT included! */
--    obj2->mamaposy = (as->crval[0]+lm[0]*dx+lm[1]*dy);	/* CDELT included! */
-+    outobj2.mamaposy = (as->crval[0]+lm[0]*dx+lm[1]*dy);	/* CDELT included! */
+@@ -235,11 +234,11 @@
+ /* Custom coordinate system for the MAMA machine */
+   if (FLAG(obj2.mamaposx))
+     {
+-    rawpos[0] = obj2->posx - 0.5;
+-    rawpos[1] = obj2->posy - 0.5;
++    rawpos[0] = outobj2.posx - 0.5;
++    rawpos[1] = outobj2.posy - 0.5;
+     raw_to_wcs(wcs, rawpos, wcspos);
+-    obj2->mamaposx = wcspos[1]*(MAMA_CORFLEX+1.0);
+-    obj2->mamaposy = wcspos[0]*(MAMA_CORFLEX+1.0);
++    outobj2.mamaposx = wcspos[1]*(MAMA_CORFLEX+1.0);
++    outobj2.mamaposy = wcspos[0]*(MAMA_CORFLEX+1.0);
+     }
+ 
+   if (FLAG(obj2.mx2w)
+@@ -252,9 +251,9 @@
+ 		|| FLAG(obj2.fdnpixw)
+ 		|| FLAG(obj2.fwhmw))))
+     {
+-    rawpos[0] = obj2->posx;
+-    rawpos[1] = obj2->posy;
+-    pixscale2 = wcs_jacobian(wcs, rawpos, obj2->jacob);
++    rawpos[0] = outobj2.posx;
++    rawpos[1] = outobj2.posy;
++    pixscale2 = wcs_jacobian(wcs, rawpos, outobj2.jacob);
      }
  
  /* Express shape parameters in WORLD frame */
-@@ -291,12 +291,12 @@
-     astrom_winerrparam(field, obj);
+@@ -274,14 +273,14 @@
+     astrom_proferrparam(field, obj);
  
    if (FLAG(obj2.npixw))
--    obj2->npixw = obj->npix*as->pixscale*as->pixscale;
-+    outobj2.npixw = obj->npix*as->pixscale*as->pixscale;
+-    obj2->npixw = obj->npix * (prefs.pixel_scale?
++    outobj2.npixw = obj->npix * (prefs.pixel_scale?
+ 	field->pixscale/3600.0*field->pixscale/3600.0 : pixscale2);
    if (FLAG(obj2.fdnpixw))
--    obj2->fdnpixw = obj->fdnpix*as->pixscale*as->pixscale;
-+    outobj2.fdnpixw = obj->fdnpix*as->pixscale*as->pixscale;
+-    obj2->fdnpixw = obj->fdnpix * (prefs.pixel_scale?
++    outobj2.fdnpixw = obj->fdnpix * (prefs.pixel_scale?
+ 	field->pixscale/3600.0*field->pixscale/3600.0 : pixscale2);
  
    if (FLAG(obj2.fwhmw))
--    obj2->fwhmw = obj->fwhm*as->pixscale;
-+    outobj2.fwhmw = obj->fwhm*as->pixscale;
+-    obj2->fwhmw = obj->fwhm * (prefs.pixel_scale?
++    outobj2.fwhmw = obj->fwhm * (prefs.pixel_scale?
+ 	field->pixscale/3600.0 : sqrt(pixscale2));
  
    return;
-   }
-@@ -417,15 +417,15 @@
+@@ -307,36 +306,36 @@
+     lng = 0;
+     lat = 1;
+     }
+-  lm0 = obj2->jacob[lng+naxis*lng];
+-  lm1 = obj2->jacob[lat+naxis*lng];
+-  lm2 = obj2->jacob[lng+naxis*lat];
+-  lm3 = obj2->jacob[lat+naxis*lat];
++  lm0 = outobj2.jacob[lng+naxis*lng];
++  lm1 = outobj2.jacob[lat+naxis*lng];
++  lm2 = outobj2.jacob[lng+naxis*lat];
++  lm3 = outobj2.jacob[lat+naxis*lat];
+ 
+ 
+ /* All WORLD params based on 2nd order moments have to pass through here */
    dx2 = obj->mx2;
    dy2 = obj->my2;
    dxy = obj->mxy;
@@ -394,47 +476,30 @@ diff -ur sextractor-2.5.0.old/src/astrom
    temp=xm2-ym2;
    if (FLAG(obj2.thetaw))
      {
--    obj2->thetaw = (temp == 0.0)? (45.0) : (0.5*atan2(2.0 * xym,temp)/DEG);
-+    outobj2.thetaw = (temp == 0.0)? (45.0) : (0.5*atan2(2.0 * xym,temp)/DEG);
-     if (as->wcs_flag && FLAG(obj2.thetas))
--      obj2->thetas = obj2->thetaw + (obj2->thetaw>0.0?-90:90.0);
-+      outobj2.thetas = outobj2.thetaw + (outobj2.thetaw>0.0?-90:90.0);
+-    obj2->thetaw = fmod_m90_p90((temp == 0.0)?
++    outobj2.thetaw = fmod_m90_p90((temp == 0.0)?
+ 				(45.0) : (0.5*atan2(2.0 * xym,temp)/DEG));
  
  /*-- Compute position angles in J2000 or B1950 reference frame */
-     if (as->wcs_flag)
-@@ -434,23 +434,23 @@
- 
+     if (wcs->lng != wcs->lat)
+       {
+       if (FLAG(obj2.thetas))
+-        obj2->thetas = fmod_m90_p90(lng<lat?
+-				((obj2->thetaw>0.0?90:-90.0) - obj2->thetaw)
+-				: obj2->thetaw);
++        outobj2.thetas = fmod_m90_p90(lng<lat?
++				((outobj2.thetaw>0.0?90:-90.0) - outobj2.thetaw)
++				: outobj2.thetaw);
        if (FLAG(obj2.theta2000))
-         {
--        da = as->ap2000 - obj2->alpha2000;
-+        da = as->ap2000 - outobj2.alpha2000;
-         dd = (sin(as->dp2000*DEG)
--		-sin(obj2->delta2000*DEG)*sin(obj2->deltas*DEG))
--		/(cos(obj2->delta2000*DEG)*cos(obj2->deltas*DEG));
-+		-sin(outobj2.delta2000*DEG)*sin(outobj2.deltas*DEG))
-+		/(cos(outobj2.delta2000*DEG)*cos(outobj2.deltas*DEG));
-         dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
--        obj2->theta2000 = obj2->thetas
-+        outobj2.theta2000 = outobj2.thetas
- 		+ (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
-         }
- 
+-        obj2->theta2000 = fmod_m90_p90(obj2->thetas + obj2->dtheta2000);
++        outobj2.theta2000 = fmod_m90_p90(outobj2.thetas + outobj2.dtheta2000);
        if (FLAG(obj2.theta1950))
-         {
--        da = as->ap1950 - obj2->alpha1950;
-+        da = as->ap1950 - outobj2.alpha1950;
-         dd = (sin(as->dp1950*DEG)
--		-sin(obj2->delta1950*DEG)*sin(obj2->deltas*DEG))
--		/(cos(obj2->delta1950*DEG)*cos(obj2->deltas*DEG));
-+		-sin(outobj2.delta1950*DEG)*sin(outobj2.deltas*DEG))
-+		/(cos(outobj2.delta1950*DEG)*cos(outobj2.deltas*DEG));
-         dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
--        obj2->theta1950 = obj2->thetas
-+        outobj2.theta1950 = outobj2.thetas
- 		+ (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
-         }
+-        obj2->theta1950 = fmod_m90_p90(obj2->thetas + obj2->dtheta1950);
++        outobj2.theta1950 = fmod_m90_p90(outobj2.thetas + outobj2.dtheta1950);
        }
-@@ -460,9 +460,9 @@
+     }
+ 
+@@ -344,9 +343,9 @@
      {
      temp = sqrt(0.25*temp*temp+xym*xym);
      pm2 = 0.5*(xm2+ym2);
@@ -447,7 +512,7 @@ diff -ur sextractor-2.5.0.old/src/astrom
      }
  
    if (FLAG(obj2.cxxw))
-@@ -473,9 +473,9 @@
+@@ -357,9 +356,9 @@
        temp = 1e-6;
        xym *= 0.99999;
        }
@@ -460,8 +525,18 @@ diff -ur sextractor-2.5.0.old/src/astrom
      }
  
    return;
-@@ -510,19 +510,19 @@
-   lm3 = lm[lat+naxis*lat];
+@@ -385,35 +384,35 @@
+     lng = 0;
+     lat = 1;
+     }
+-  lm0 = obj2->jacob[lng+naxis*lng];
+-  lm1 = obj2->jacob[lat+naxis*lng];
+-  lm2 = obj2->jacob[lng+naxis*lat];
+-  lm3 = obj2->jacob[lat+naxis*lat];
++  lm0 = outobj2.jacob[lng+naxis*lng];
++  lm1 = outobj2.jacob[lat+naxis*lng];
++  lm2 = outobj2.jacob[lng+naxis*lat];
++  lm3 = outobj2.jacob[lat+naxis*lat];
  
  /* All WORLD params based on 2nd order moments have to pass through here */
 -  dx2 = obj2->win_mx2;
@@ -479,49 +554,30 @@ diff -ur sextractor-2.5.0.old/src/astrom
    temp=xm2-ym2;
    if (FLAG(obj2.win_thetaw))
      {
--    obj2->win_thetaw = (temp == 0.0)? (45.0) : (0.5*atan2(2.0*xym,temp)/DEG);
-+    outobj2.win_thetaw = (temp == 0.0)? (45.0) : (0.5*atan2(2.0*xym,temp)/DEG);
-     if (as->wcs_flag && FLAG(obj2.win_thetas))
--      obj2->win_thetas = obj2->win_thetaw +
--	(obj2->win_thetaw>0.0?-90:90.0);
-+      outobj2.win_thetas = outobj2.win_thetaw +
-+	(outobj2.win_thetaw>0.0?-90:90.0);
+-    obj2->win_thetaw = fmod_m90_p90((temp == 0.0)?
++    outobj2.win_thetaw = fmod_m90_p90((temp == 0.0)?
+ 			(45.0) : (0.5*atan2(2.0*xym,temp)/DEG));
  
  /*-- Compute position angles in J2000 or B1950 reference frame */
-     if (as->wcs_flag)
-@@ -531,23 +531,23 @@
- 
+     if (wcs->lng != wcs->lat)
+       {
+       if (FLAG(obj2.win_thetas))
+-        obj2->win_thetas = fmod_m90_p90(lng<lat?
+-			((obj2->win_thetaw>0.0?90:-90.0) - obj2->win_thetaw)
+-			: obj2->win_thetaw);
++        outobj2.win_thetas = fmod_m90_p90(lng<lat?
++			((outobj2.win_thetaw>0.0?90:-90.0) - outobj2.win_thetaw)
++			: outobj2.win_thetaw);
        if (FLAG(obj2.win_theta2000))
-         {
--        da = as->ap2000 - obj2->winpos_alpha2000;
-+        da = as->ap2000 - outobj2.winpos_alpha2000;
-         dd = (sin(as->dp2000*DEG)
--		-sin(obj2->winpos_delta2000*DEG)*sin(obj2->winpos_deltas*DEG))
--		/(cos(obj2->winpos_delta2000*DEG)*cos(obj2->winpos_deltas*DEG));
-+		-sin(outobj2.winpos_delta2000*DEG)*sin(outobj2.winpos_deltas*DEG))
-+		/(cos(outobj2.winpos_delta2000*DEG)*cos(outobj2.winpos_deltas*DEG));
-         dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
--        obj2->win_theta2000 = obj2->win_thetas
-+        outobj2.win_theta2000 = outobj2.win_thetas
- 		+ (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
-         }
- 
+-        obj2->win_theta2000 = fmod_m90_p90(obj2->win_thetas + obj2->dtheta2000);
++        outobj2.win_theta2000 = fmod_m90_p90(outobj2.win_thetas + outobj2.dtheta2000);
        if (FLAG(obj2.win_theta1950))
-         {
--        da = as->ap1950 - obj2->winpos_alpha1950;
-+        da = as->ap1950 - outobj2.winpos_alpha1950;
-         dd = (sin(as->dp1950*DEG)
--		-sin(obj2->winpos_delta1950*DEG)*sin(obj2->winpos_deltas*DEG))
--		/(cos(obj2->winpos_delta1950*DEG)*cos(obj2->winpos_deltas*DEG));
-+		-sin(outobj2.winpos_delta1950*DEG)*sin(outobj2.winpos_deltas*DEG))
-+		/(cos(outobj2.winpos_delta1950*DEG)*cos(outobj2.winpos_deltas*DEG));
-         dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
--        obj2->win_theta1950 = obj2->win_thetas
-+        outobj2.win_theta1950 = outobj2.win_thetas
- 		+ (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
-         }
+-        obj2->win_theta1950 = fmod_m90_p90(obj2->win_thetas + obj2->dtheta1950);
++        outobj2.win_theta1950 = fmod_m90_p90(outobj2.win_thetas + outobj2.dtheta1950);
        }
-@@ -557,9 +557,9 @@
+     }
+ 
+@@ -421,9 +420,9 @@
      {
      temp = sqrt(0.25*temp*temp+xym*xym);
      pm2 = 0.5*(xm2+ym2);
@@ -534,7 +590,7 @@ diff -ur sextractor-2.5.0.old/src/astrom
      }
  
    if (FLAG(obj2.win_cxxw))
-@@ -570,9 +570,9 @@
+@@ -434,9 +433,9 @@
        temp = 1e-6;
        xym *= 0.99999;
        }
@@ -547,7 +603,20 @@ diff -ur sextractor-2.5.0.old/src/astrom
      }
  
    return;
-@@ -610,16 +610,16 @@
+@@ -462,37 +461,37 @@
+     lng = 0;
+     lat = 1;
+     }
+-  lm0 = obj2->jacob[lng+naxis*lng];
+-  lm1 = obj2->jacob[lat+naxis*lng];
+-  lm2 = obj2->jacob[lng+naxis*lat];
+-  lm3 = obj2->jacob[lat+naxis*lat];
++  lm0 = outobj2.jacob[lng+naxis*lng];
++  lm1 = outobj2.jacob[lat+naxis*lng];
++  lm2 = outobj2.jacob[lng+naxis*lat];
++  lm3 = outobj2.jacob[lat+naxis*lat];
+ 
+ /* All WORLD params based on 2nd order moments have to pass through here */
    dx2 = obj->poserr_mx2;
    dy2 = obj->poserr_my2;
    dxy = obj->poserr_mxy;
@@ -560,49 +629,34 @@ diff -ur sextractor-2.5.0.old/src/astrom
    temp=xm2-ym2;
    if (FLAG(obj2.poserr_thetaw))
      {
--    obj2->poserr_thetaw = (temp==0.0)? (45.0):(0.5*atan2(2.0*xym,temp)/DEG);
-+    outobj2.poserr_thetaw = (temp==0.0)? (45.0):(0.5*atan2(2.0*xym,temp)/DEG);
-     if (as->wcs_flag && FLAG(obj2.poserr_thetas))
--      obj2->poserr_thetas = obj2->poserr_thetaw
--				+ (obj2->poserr_thetaw>0.0? -90:90.0);
-+      outobj2.poserr_thetas = outobj2.poserr_thetaw
-+				+ (outobj2.poserr_thetaw>0.0? -90:90.0);
+-    obj2->poserr_thetaw = fmod_m90_p90((temp==0.0)?
++    outobj2.poserr_thetaw = fmod_m90_p90((temp==0.0)?
+ 				(45.0):(0.5*atan2(2.0*xym,temp)/DEG));
  
  /*-- Compute position angles in J2000 or B1950 reference frame */
-     if (as->wcs_flag)
-@@ -628,23 +628,23 @@
- 
+     if (wcs->lng != wcs->lat)
+       {
+       if (FLAG(obj2.poserr_thetas))
+-        obj2->poserr_thetas = fmod_m90_p90(lng<lat?
+-		((obj2->poserr_thetaw>0.0?90:-90.0) - obj2->poserr_thetaw)
+-		: obj2->poserr_thetaw);
++        outobj2.poserr_thetas = fmod_m90_p90(lng<lat?
++		((outobj2.poserr_thetaw>0.0?90:-90.0) - outobj2.poserr_thetaw)
++		: outobj2.poserr_thetaw);
        if (FLAG(obj2.poserr_theta2000))
-         {
--        da = as->ap2000 - obj2->alpha2000;
-+        da = as->ap2000 - outobj2.alpha2000;
-         dd = (sin(as->dp2000*DEG)
--		-sin(obj2->delta2000*DEG)*sin(obj2->deltas*DEG))
--		/(cos(obj2->delta2000*DEG)*cos(obj2->deltas*DEG));
-+		-sin(outobj2.delta2000*DEG)*sin(outobj2.deltas*DEG))
-+		/(cos(outobj2.delta2000*DEG)*cos(outobj2.deltas*DEG));
-         dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
--        obj2->poserr_theta2000 = obj2->poserr_thetas
-+        outobj2.poserr_theta2000 = outobj2.poserr_thetas
- 		+ (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
-         }
- 
+-        obj2->poserr_theta2000 = fmod_m90_p90(obj2->poserr_thetas
+-				+ obj2->dtheta2000);
++        outobj2.poserr_theta2000 = fmod_m90_p90(outobj2.poserr_thetas
++				+ outobj2.dtheta2000);
        if (FLAG(obj2.poserr_theta1950))
-         {
--        da = as->ap1950 - obj2->alpha1950;
-+        da = as->ap1950 - outobj2.alpha1950;
-         dd = (sin(as->dp1950*DEG)
--		-sin(obj2->delta1950*DEG)*sin(obj2->deltas*DEG))
--		/(cos(obj2->delta1950*DEG)*cos(obj2->deltas*DEG));
-+		-sin(outobj2.delta1950*DEG)*sin(outobj2.deltas*DEG))
-+		/(cos(outobj2.delta1950*DEG)*cos(outobj2.deltas*DEG));
-         dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
--        obj2->poserr_theta1950 = obj2->poserr_thetas
-+        outobj2.poserr_theta1950 = outobj2.poserr_thetas
- 		+ (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
-         }
+-        obj2->poserr_theta1950 = fmod_m90_p90(obj2->poserr_thetas
+-				+ obj2->dtheta1950);
++        outobj2.poserr_theta1950 = fmod_m90_p90(outobj2.poserr_thetas
++				+ outobj2.dtheta1950);
        }
-@@ -654,8 +654,8 @@
+     }
+ 
+@@ -500,8 +499,8 @@
      {
      temp = sqrt(0.25*temp*temp+xym*xym);
      pm2 = 0.5*(xm2+ym2);
@@ -613,7 +667,7 @@ diff -ur sextractor-2.5.0.old/src/astrom
      }
  
    if (FLAG(obj2.poserr_cxxw))
-@@ -666,9 +666,9 @@
+@@ -512,9 +511,9 @@
        temp = 1e-6;
        xym *= 0.99999;
        }
@@ -626,8 +680,18 @@ diff -ur sextractor-2.5.0.old/src/astrom
      }
  
    return;
-@@ -703,19 +703,19 @@
-   lm3 = lm[lat+naxis*lat];
+@@ -540,37 +539,37 @@
+     lng = 0;
+     lat = 1;
+     }
+-  lm0 = obj2->jacob[lng+naxis*lng];
+-  lm1 = obj2->jacob[lat+naxis*lng];
+-  lm2 = obj2->jacob[lng+naxis*lat];
+-  lm3 = obj2->jacob[lat+naxis*lat];
++  lm0 = outobj2.jacob[lng+naxis*lng];
++  lm1 = outobj2.jacob[lat+naxis*lng];
++  lm2 = outobj2.jacob[lng+naxis*lat];
++  lm3 = outobj2.jacob[lat+naxis*lat];
  
  /* All WORLD params based on 2nd order moments have to pass through here */
 -  dx2 = obj2->winposerr_mx2;
@@ -645,49 +709,34 @@ diff -ur sextractor-2.5.0.old/src/astrom
    temp=xm2-ym2;
    if (FLAG(obj2.winposerr_thetaw))
      {
--    obj2->winposerr_thetaw = (temp==0.0)? (45.0):(0.5*atan2(2.0*xym,temp)/DEG);
-+    outobj2.winposerr_thetaw = (temp==0.0)? (45.0):(0.5*atan2(2.0*xym,temp)/DEG);
-     if (as->wcs_flag && FLAG(obj2.winposerr_thetas))
--      obj2->winposerr_thetas = obj2->winposerr_thetaw
--				+ (obj2->winposerr_thetaw>0.0? -90:90.0);
-+      outobj2.winposerr_thetas = outobj2.winposerr_thetaw
-+				+ (outobj2.winposerr_thetaw>0.0? -90:90.0);
+-    obj2->winposerr_thetaw = (fmod_m90_p90(temp==0.0)?
++    outobj2.winposerr_thetaw = (fmod_m90_p90(temp==0.0)?
+ 				(45.0):(0.5*atan2(2.0*xym,temp)/DEG));
  
  /*-- Compute position angles in J2000 or B1950 reference frame */
-     if (as->wcs_flag)
-@@ -724,23 +724,23 @@
- 
+     if (wcs->lng != wcs->lat)
+       {
+       if (FLAG(obj2.winposerr_thetas))
+-        obj2->winposerr_thetas = fmod_m90_p90(lng<lat?
+-		((obj2->winposerr_thetaw>0.0?90:-90.0) - obj2->winposerr_thetaw)
+-		: obj2->winposerr_thetaw);
++        outobj2.winposerr_thetas = fmod_m90_p90(lng<lat?
++		((outobj2.winposerr_thetaw>0.0?90:-90.0) - outobj2.winposerr_thetaw)
++		: outobj2.winposerr_thetaw);
        if (FLAG(obj2.winposerr_theta2000))
-         {
--        da = as->ap2000 - obj2->winpos_alpha2000;
-+        da = as->ap2000 - outobj2.winpos_alpha2000;
-         dd = (sin(as->dp2000*DEG)
--		-sin(obj2->winpos_delta2000*DEG)*sin(obj2->winpos_deltas*DEG))
--		/(cos(obj2->winpos_delta2000*DEG)*cos(obj2->winpos_deltas*DEG));
-+		-sin(outobj2.winpos_delta2000*DEG)*sin(outobj2.winpos_deltas*DEG))
-+		/(cos(outobj2.winpos_delta2000*DEG)*cos(outobj2.winpos_deltas*DEG));
-         dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
--        obj2->winposerr_theta2000 = obj2->winposerr_thetas
-+        outobj2.winposerr_theta2000 = outobj2.winposerr_thetas
- 		+ (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
-         }
- 
+-        obj2->winposerr_theta2000 = fmod_m90_p90(obj2->winposerr_thetas
+-				+ obj2->dtheta2000);
++        outobj2.winposerr_theta2000 = fmod_m90_p90(outobj2.winposerr_thetas
++				+ outobj2.dtheta2000);
        if (FLAG(obj2.winposerr_theta1950))
-         {
--        da = as->ap1950 - obj2->winpos_alpha1950;
-+        da = as->ap1950 - outobj2.winpos_alpha1950;
-         dd = (sin(as->dp1950*DEG)
--		-sin(obj2->winpos_delta1950*DEG)*sin(obj2->winpos_deltas*DEG))
--		/(cos(obj2->winpos_delta1950*DEG)*cos(obj2->winpos_deltas*DEG));
-+		-sin(outobj2.winpos_delta1950*DEG)*sin(outobj2.winpos_deltas*DEG))
-+		/(cos(outobj2.winpos_delta1950*DEG)*cos(outobj2.winpos_deltas*DEG));
-         dd = dd<1.0? (dd>-1.0?acos(dd)/DEG:180.0) : 0.0;
--        obj2->winposerr_theta1950 = obj2->winposerr_thetas
-+        outobj2.winposerr_theta1950 = outobj2.winposerr_thetas
- 		+ (((da>0.0 && da<180.0) || da<-180.0)?-dd:dd);
-         }
+-        obj2->winposerr_theta1950 = fmod_m90_p90(obj2->winposerr_thetas
+-				+ obj2->dtheta1950);
++        outobj2.winposerr_theta1950 = fmod_m90_p90(outobj2.winposerr_thetas
++				+ outobj2.dtheta1950);
        }
-@@ -750,8 +750,8 @@
+     }
+ 
+@@ -578,8 +577,8 @@
      {
      temp = sqrt(0.25*temp*temp+xym*xym);
      pm2 = 0.5*(xm2+ym2);
@@ -698,7 +747,7 @@ diff -ur sextractor-2.5.0.old/src/astrom
      }
  
    if (FLAG(obj2.winposerr_cxxw))
-@@ -762,9 +762,9 @@
+@@ -590,9 +589,9 @@
        temp = 1e-6;
        xym *= 0.99999;
        }
@@ -711,115 +760,367 @@ diff -ur sextractor-2.5.0.old/src/astrom
      }
  
    return;
-diff -ur sextractor-2.5.0.old/src/fits/fitsmisc.c sextractor-2.5.0/src/fits/fitsmisc.c
---- sextractor-2.5.0.old/src/fits/fitsmisc.c	2006-07-14 19:21:00.000000000 +0200
-+++ sextractor-2.5.0/src/fits/fitsmisc.c	2006-07-25 23:32:17.000000000 +0200
-@@ -114,48 +114,63 @@
- void    swapbytes(void *ptr, int nb, int n)
-   {
-    char *cp;
-+   char t;
-    int  j;
- 
--  cp = (char *)ptr;
-+   cp = (char *)ptr;
- 
--  if (nb&4)
--    {
--    for (j=n; j--; cp+=4)
--      {
--      cp[0] ^= (cp[3]^=(cp[0]^=cp[3]));
--      cp[1] ^= (cp[2]^=(cp[1]^=cp[2]));
--      }
--    return;
--    }
--
--  if (nb&2)
--    {
--    for (j=n; j--; cp+=2)
--      cp[0] ^= (cp[1]^=(cp[0]^=cp[1]));
--    return;
--    }
-+   if (nb == 4)
-+     {
-+      for (j=n; j--; cp+=4)
-+        {
-+         t = cp[0];
-+         cp[0] = cp[3];
-+         cp[3] = t;
-+         t = cp[1];
-+         cp[1] = cp[2];
-+         cp[2] = t;
-+        }
-+     }
-+   else if (nb == 2)
-+     {
-+      for (j=n; j--; cp+=2)
-+        {
-+         t = cp[0];
-+         cp[0] = cp[1];
-+         cp[1] = t;
-+        }
-+     }
-+   else if (nb == 8)
-+     {
-+      for (j=n; j--; cp+=8)
-+        {
-+         t = cp[0];
-+         cp[0] = cp[7];
-+         cp[7] = t;
-+         t = cp[1];
-+         cp[1] = cp[6];
-+         cp[6] = t;
-+         t = cp[2];
-+         cp[2] = cp[5];
-+         cp[5] = t;
-+         t = cp[3];
-+         cp[3] = cp[4];
-+         cp[4] = t;
-+        }
-+     }
-+   else if (nb == 1)
-+     {
-+      /* noop */
-+     }
- 
--  if (nb&1)
--    return;
--
--  if (nb&8)
--    {
--    for (j=n; j--; cp+=8)
--      {
--      cp[0] ^= (cp[7]^=(cp[0]^=cp[7]));
--      cp[1] ^= (cp[6]^=(cp[1]^=cp[6]));
--      cp[2] ^= (cp[5]^=(cp[2]^=cp[5]));
--      cp[3] ^= (cp[4]^=(cp[3]^=cp[4]));
--      }
--    return;
--    }
--
--  error(EXIT_FAILURE, "*Internal Error*: Unknown size in ", "swapbytes()");
-+   else
-+     error(EXIT_FAILURE, "*Internal Error*: Unknown size in ", "swapbytes()");
+@@ -618,37 +617,37 @@
+     lng = 0;
+     lat = 1;
+     }
+-  lm0 = obj2->jacob[lng+naxis*lng];
+-  lm1 = obj2->jacob[lat+naxis*lng];
+-  lm2 = obj2->jacob[lng+naxis*lat];
+-  lm3 = obj2->jacob[lat+naxis*lat];
++  lm0 = outobj2.jacob[lng+naxis*lng];
++  lm1 = outobj2.jacob[lat+naxis*lng];
++  lm2 = outobj2.jacob[lng+naxis*lat];
++  lm3 = outobj2.jacob[lat+naxis*lat];
+ 
+ /* All WORLD params based on 2nd order moments have to pass through here */
+-  dx2 = obj2->poserrmx2_prof;
+-  dy2 = obj2->poserrmy2_prof;
+-  dxy = obj2->poserrmxy_prof;
+-  obj2->poserrmx2w_prof = xm2 = lm0*lm0*dx2+lm1*lm1*dy2+lm0*lm1*dxy;
+-  obj2->poserrmy2w_prof = ym2 = lm2*lm2*dx2+lm3*lm3*dy2+lm2*lm3*dxy;
+-  obj2->poserrmxyw_prof = xym = lm0*lm2*dx2+lm1*lm3*dy2+(lm0*lm3+lm1*lm2)*dxy;
++  dx2 = outobj2.poserrmx2_prof;
++  dy2 = outobj2.poserrmy2_prof;
++  dxy = outobj2.poserrmxy_prof;
++  outobj2.poserrmx2w_prof = xm2 = lm0*lm0*dx2+lm1*lm1*dy2+lm0*lm1*dxy;
++  outobj2.poserrmy2w_prof = ym2 = lm2*lm2*dx2+lm3*lm3*dy2+lm2*lm3*dxy;
++  outobj2.poserrmxyw_prof = xym = lm0*lm2*dx2+lm1*lm3*dy2+(lm0*lm3+lm1*lm2)*dxy;
+   temp=xm2-ym2;
+   if (FLAG(obj2.poserrthetaw_prof))
+     {
+-    obj2->poserrthetaw_prof = (fmod_m90_p90(temp==0.0)?
++    outobj2.poserrthetaw_prof = (fmod_m90_p90(temp==0.0)?
+ 				(45.0):(0.5*atan2(2.0*xym,temp)/DEG));
+ 
+ /*-- Compute position angles in J2000 or B1950 reference frame */
+     if (wcs->lng != wcs->lat)
+       {
+       if (FLAG(obj2.poserrthetas_prof))
+-        obj2->poserrthetas_prof = fmod_m90_p90(lng<lat?
+-		((obj2->poserrthetaw_prof>0.0?90:-90.0)-obj2->poserrthetaw_prof)
+-		: obj2->poserrthetaw_prof);
++        outobj2.poserrthetas_prof = fmod_m90_p90(lng<lat?
++		((outobj2.poserrthetaw_prof>0.0?90:-90.0)-outobj2.poserrthetaw_prof)
++		: outobj2.poserrthetaw_prof);
+       if (FLAG(obj2.poserrtheta2000_prof))
+-        obj2->poserrtheta2000_prof = fmod_m90_p90(obj2->poserrthetas_prof
+-				+ obj2->dtheta2000);
++        outobj2.poserrtheta2000_prof = fmod_m90_p90(outobj2.poserrthetas_prof
++				+ outobj2.dtheta2000);
+       if (FLAG(obj2.poserrtheta1950_prof))
+-        obj2->poserrtheta1950_prof = fmod_m90_p90(obj2->poserrthetas_prof
+-				+ obj2->dtheta1950);
++        outobj2.poserrtheta1950_prof = fmod_m90_p90(outobj2.poserrthetas_prof
++				+ outobj2.dtheta1950);
+       }
+     }
+ 
+@@ -656,8 +655,8 @@
+     {
+     temp = sqrt(0.25*temp*temp+xym*xym);
+     pm2 = 0.5*(xm2+ym2);
+-    obj2->poserraw_prof = (float)sqrt(pm2+temp);
+-    obj2->poserrbw_prof = (float)sqrt(pm2-temp);
++    outobj2.poserraw_prof = (float)sqrt(pm2+temp);
++    outobj2.poserrbw_prof = (float)sqrt(pm2-temp);
+     }
+ 
+   if (FLAG(obj2.poserrcxxw_prof))
+@@ -668,9 +667,9 @@
+       temp = 1e-6;
+       xym *= 0.99999;
+       }
+-    obj2->poserrcxxw_prof = (float)(ym2/temp);
+-    obj2->poserrcyyw_prof = (float)(xm2/temp);
+-    obj2->poserrcxyw_prof = (float)(-2*xym/temp);
++    outobj2.poserrcxxw_prof = (float)(ym2/temp);
++    outobj2.poserrcyyw_prof = (float)(xm2/temp);
++    outobj2.poserrcxyw_prof = (float)(-2*xym/temp);
+     }
  
    return;
-   }
+@@ -696,178 +695,178 @@
+     lng = 0;
+     lat = 1;
+     }
+-  lm0 = obj2->jacob[lng+naxis*lng];
+-  lm1 = obj2->jacob[lat+naxis*lng];
+-  lm2 = obj2->jacob[lng+naxis*lat];
+-  lm3 = obj2->jacob[lat+naxis*lat];
++  lm0 = outobj2.jacob[lng+naxis*lng];
++  lm1 = outobj2.jacob[lat+naxis*lng];
++  lm2 = outobj2.jacob[lng+naxis*lat];
++  lm3 = outobj2.jacob[lat+naxis*lat];
+ 
+ /* Spheroid World coordinates */
+-  obj2->prof_spheroid_thetaerrw=obj2->prof_spheroid_thetaerr; /* quick & dirty*/
++  outobj2.prof_spheroid_thetaerrw=outobj2.prof_spheroid_thetaerr; /* quick & dirty*/
+   if (FLAG(obj2.prof_spheroid_reffw))
+     {
+-    ct = cos(obj2->prof_spheroid_theta*DEG);
+-    st = sin(obj2->prof_spheroid_theta*DEG);
+-    dx2 = obj2->prof_spheroid_reff*obj2->prof_spheroid_reff * (ct*ct
+-	+ st*st * obj2->prof_spheroid_aspect*obj2->prof_spheroid_aspect);
+-    dy2 = obj2->prof_spheroid_reff*obj2->prof_spheroid_reff * (st*st
+-	+ ct*ct * obj2->prof_spheroid_aspect*obj2->prof_spheroid_aspect);
+-    dxy = ct*st * obj2->prof_spheroid_reff*obj2->prof_spheroid_reff
+-	*(1.0 - obj2->prof_spheroid_aspect*obj2->prof_spheroid_aspect);
++    ct = cos(outobj2.prof_spheroid_theta*DEG);
++    st = sin(outobj2.prof_spheroid_theta*DEG);
++    dx2 = outobj2.prof_spheroid_reff*outobj2.prof_spheroid_reff * (ct*ct
++	+ st*st * outobj2.prof_spheroid_aspect*outobj2.prof_spheroid_aspect);
++    dy2 = outobj2.prof_spheroid_reff*outobj2.prof_spheroid_reff * (st*st
++	+ ct*ct * outobj2.prof_spheroid_aspect*outobj2.prof_spheroid_aspect);
++    dxy = ct*st * outobj2.prof_spheroid_reff*outobj2.prof_spheroid_reff
++	*(1.0 - outobj2.prof_spheroid_aspect*outobj2.prof_spheroid_aspect);
+     xm2 = lm0*lm0*dx2 + lm1*lm1*dy2 + lm0*lm1*dxy;
+     ym2 = lm2*lm2*dx2 + lm3*lm3*dy2 + lm2*lm3*dxy;
+     xym = lm0*lm2*dx2 + lm1*lm3*dy2 + (lm0*lm3+lm1*lm2)*dxy;
+     temp=xm2-ym2;
+     if (FLAG(obj2.prof_spheroid_thetaw))
+       {
+-      obj2->prof_spheroid_thetaw = fmod_m90_p90((temp == 0.0)?
++      outobj2.prof_spheroid_thetaw = fmod_m90_p90((temp == 0.0)?
+ 		(45.0) : (0.5*atan2(2.0 * xym,temp)/DEG));
+ 
+       if (wcs->lng != wcs->lat)
+         {
+         if (FLAG(obj2.prof_spheroid_thetas))
+-          obj2->prof_spheroid_thetas = fmod_m90_p90(lng<lat?
+-			((obj2->prof_spheroid_thetaw>0.0?90:-90.0)
+-				- obj2->prof_spheroid_thetaw)
+-			: obj2->prof_spheroid_thetaw);
++          outobj2.prof_spheroid_thetas = fmod_m90_p90(lng<lat?
++			((outobj2.prof_spheroid_thetaw>0.0?90:-90.0)
++				- outobj2.prof_spheroid_thetaw)
++			: outobj2.prof_spheroid_thetaw);
+         if (FLAG(obj2.prof_spheroid_theta2000))
+-          obj2->prof_spheroid_theta2000=fmod_m90_p90(obj2->prof_spheroid_thetas
+-					+ obj2->dtheta2000);
++          outobj2.prof_spheroid_theta2000=fmod_m90_p90(outobj2.prof_spheroid_thetas
++					+ outobj2.dtheta2000);
+         if (FLAG(obj2.prof_spheroid_theta1950))
+-          obj2->prof_spheroid_theta1950=fmod_m90_p90(obj2->prof_spheroid_thetas
+-					+ obj2->dtheta1950);
++          outobj2.prof_spheroid_theta1950=fmod_m90_p90(outobj2.prof_spheroid_thetas
++					+ outobj2.dtheta1950);
+         }
+       }
+     temp = sqrt(0.25*temp*temp+xym*xym);
+     pm2 = 0.5*(xm2+ym2);
+-    obj2->prof_spheroid_reffw = sqrt(pm2+temp);
+-    obj2->prof_spheroid_refferrw = obj2->prof_spheroid_reff > 0.0?
+-	obj2->prof_spheroid_refferr/obj2->prof_spheroid_reff
+-				*obj2->prof_spheroid_reffw
++    outobj2.prof_spheroid_reffw = sqrt(pm2+temp);
++    outobj2.prof_spheroid_refferrw = outobj2.prof_spheroid_reff > 0.0?
++	outobj2.prof_spheroid_refferr/outobj2.prof_spheroid_reff
++				*outobj2.prof_spheroid_reffw
+ 	: 0.0;
+-    obj2->prof_spheroid_aspectw = obj2->prof_spheroid_reffw>0.0?
+-				  sqrt(pm2-temp) / obj2->prof_spheroid_reffw
+-				: obj2->prof_spheroid_aspect;
+-    obj2->prof_spheroid_aspecterrw = obj2->prof_spheroid_aspect > 0.0?
+-	obj2->prof_spheroid_aspecterr/obj2->prof_spheroid_aspect
+-				*obj2->prof_spheroid_aspectw
++    outobj2.prof_spheroid_aspectw = outobj2.prof_spheroid_reffw>0.0?
++				  sqrt(pm2-temp) / outobj2.prof_spheroid_reffw
++				: outobj2.prof_spheroid_aspect;
++    outobj2.prof_spheroid_aspecterrw = outobj2.prof_spheroid_aspect > 0.0?
++	outobj2.prof_spheroid_aspecterr/outobj2.prof_spheroid_aspect
++				*outobj2.prof_spheroid_aspectw
+ 	: 0.0;
+     }
+ 
+ /* Disk World coordinates */
+-  obj2->prof_disk_thetaerrw = obj2->prof_disk_thetaerr; /* quick & dirty*/
++  outobj2.prof_disk_thetaerrw = outobj2.prof_disk_thetaerr; /* quick & dirty*/
+   if (FLAG(obj2.prof_disk_scalew))
+     {
+-    ct = cos(obj2->prof_disk_theta*DEG);
+-    st = sin(obj2->prof_disk_theta*DEG);
+-    dx2 = obj2->prof_disk_scale*obj2->prof_disk_scale * (ct*ct
+-	+ st*st * obj2->prof_disk_aspect*obj2->prof_disk_aspect);
+-    dy2 = obj2->prof_disk_scale*obj2->prof_disk_scale * (st*st
+-	+ ct*ct * obj2->prof_disk_aspect*obj2->prof_disk_aspect);
+-    dxy = ct*st * obj2->prof_disk_scale*obj2->prof_disk_scale
+-	*(1.0 - obj2->prof_disk_aspect*obj2->prof_disk_aspect);
++    ct = cos(outobj2.prof_disk_theta*DEG);
++    st = sin(outobj2.prof_disk_theta*DEG);
++    dx2 = outobj2.prof_disk_scale*outobj2.prof_disk_scale * (ct*ct
++	+ st*st * outobj2.prof_disk_aspect*outobj2.prof_disk_aspect);
++    dy2 = outobj2.prof_disk_scale*outobj2.prof_disk_scale * (st*st
++	+ ct*ct * outobj2.prof_disk_aspect*outobj2.prof_disk_aspect);
++    dxy = ct*st * outobj2.prof_disk_scale*outobj2.prof_disk_scale
++	*(1.0 - outobj2.prof_disk_aspect*outobj2.prof_disk_aspect);
+     xm2 = lm0*lm0*dx2 + lm1*lm1*dy2 + lm0*lm1*dxy;
+     ym2 = lm2*lm2*dx2 + lm3*lm3*dy2 + lm2*lm3*dxy;
+     xym = lm0*lm2*dx2 + lm1*lm3*dy2 + (lm0*lm3+lm1*lm2)*dxy;
+     temp=xm2-ym2;
+     if (FLAG(obj2.prof_disk_thetaw))
+       {
+-      obj2->prof_disk_thetaw = fmod_m90_p90((temp == 0.0)?
++      outobj2.prof_disk_thetaw = fmod_m90_p90((temp == 0.0)?
+ 		(45.0) : (0.5*atan2(2.0 * xym,temp)/DEG));
  
+ /*---- Compute position angles in J2000 or B1950 reference frame */
+       if (wcs->lng != wcs->lat)
+         {
+         if (FLAG(obj2.prof_disk_thetas))
+-          obj2->prof_disk_thetas = fmod_m90_p90(lng<lat?
+-			((obj2->prof_disk_thetaw>0.0?90:-90.0)
+-				- obj2->prof_disk_thetaw)
+-			: obj2->prof_disk_thetaw);
++          outobj2.prof_disk_thetas = fmod_m90_p90(lng<lat?
++			((outobj2.prof_disk_thetaw>0.0?90:-90.0)
++				- outobj2.prof_disk_thetaw)
++			: outobj2.prof_disk_thetaw);
+         if (FLAG(obj2.prof_disk_theta2000))
+-          obj2->prof_disk_theta2000 = fmod_m90_p90(obj2->prof_disk_thetas
+-					+ obj2->dtheta2000);
++          outobj2.prof_disk_theta2000 = fmod_m90_p90(outobj2.prof_disk_thetas
++					+ outobj2.dtheta2000);
+         if (FLAG(obj2.prof_disk_theta1950))
+-          obj2->prof_disk_theta1950 = fmod_m90_p90(obj2->prof_disk_thetas
+-					+ obj2->dtheta1950);
++          outobj2.prof_disk_theta1950 = fmod_m90_p90(outobj2.prof_disk_thetas
++					+ outobj2.dtheta1950);
+         }
+       }
+     temp = sqrt(0.25*temp*temp+xym*xym);
+     pm2 = 0.5*(xm2+ym2);
+-    obj2->prof_disk_scalew = sqrt(pm2+temp);
+-    obj2->prof_disk_scaleerrw = obj2->prof_disk_scale > 0.0?
+-	obj2->prof_disk_scaleerr/obj2->prof_disk_scale*obj2->prof_disk_scalew
++    outobj2.prof_disk_scalew = sqrt(pm2+temp);
++    outobj2.prof_disk_scaleerrw = outobj2.prof_disk_scale > 0.0?
++	outobj2.prof_disk_scaleerr/outobj2.prof_disk_scale*outobj2.prof_disk_scalew
+ 	: 0.0;
+-    obj2->prof_disk_aspectw = obj2->prof_disk_scalew>0.0?
+-				  sqrt(pm2-temp) / obj2->prof_disk_scalew
+-				: obj2->prof_disk_aspect;
+-    obj2->prof_disk_aspecterrw = obj2->prof_disk_aspect > 0.0?
+-	obj2->prof_disk_aspecterr/obj2->prof_disk_aspect*obj2->prof_disk_aspectw
++    outobj2.prof_disk_aspectw = outobj2.prof_disk_scalew>0.0?
++				  sqrt(pm2-temp) / outobj2.prof_disk_scalew
++				: outobj2.prof_disk_aspect;
++    outobj2.prof_disk_aspecterrw = outobj2.prof_disk_aspect > 0.0?
++	outobj2.prof_disk_aspecterr/outobj2.prof_disk_aspect*outobj2.prof_disk_aspectw
+ 	: 0.0;
+ /*-- Arms World coordinates */
+     if (FLAG(obj2.prof_arms_scalew))
+       {
+-      obj2->prof_arms_scalew = (obj2->prof_disk_scale > 0.0) ?
+-	  obj2->prof_arms_scale*obj2->prof_disk_scalew/obj2->prof_disk_scale
++      outobj2.prof_arms_scalew = (outobj2.prof_disk_scale > 0.0) ?
++	  outobj2.prof_arms_scale*outobj2.prof_disk_scalew/outobj2.prof_disk_scale
+ 	: 0.0;
+-      obj2->prof_arms_scaleerrw = (obj2->prof_arms_scale > 0.0) ?
+-	obj2->prof_arms_scaleerr/obj2->prof_arms_scale*obj2->prof_arms_scalew
++      outobj2.prof_arms_scaleerrw = (outobj2.prof_arms_scale > 0.0) ?
++	outobj2.prof_arms_scaleerr/outobj2.prof_arms_scale*outobj2.prof_arms_scalew
+ 	: 0.0;
+-      obj2->prof_arms_startw = (obj2->prof_disk_scale > 0.0) ?
+-	  obj2->prof_arms_start*obj2->prof_disk_scalew/obj2->prof_disk_scale
++      outobj2.prof_arms_startw = (outobj2.prof_disk_scale > 0.0) ?
++	  outobj2.prof_arms_start*outobj2.prof_disk_scalew/outobj2.prof_disk_scale
+ 	: 0.0;
+-      obj2->prof_arms_starterrw = (obj2->prof_arms_start > 0.0) ?
+-	obj2->prof_arms_starterr/obj2->prof_arms_start*obj2->prof_arms_startw
++      outobj2.prof_arms_starterrw = (outobj2.prof_arms_start > 0.0) ?
++	outobj2.prof_arms_starterr/outobj2.prof_arms_start*outobj2.prof_arms_startw
+ 	: 0.0;
+       }
+     }
  
-+
- /****** wstrncmp ***************************************************************
- PROTO	int wstrncmp(char *cs, char *ct, int n)
- PURPOSE	simple wildcard strcmp.
-diff -ur sextractor-2.5.0.old/src/growth.c sextractor-2.5.0/src/growth.c
---- sextractor-2.5.0.old/src/growth.c	2005-10-24 13:48:52.000000000 +0200
-+++ sextractor-2.5.0/src/growth.c	2006-07-25 23:27:35.000000000 +0200
+ /* Bar World coordinates */
+-  obj2->prof_bar_thetaerrw = obj2->prof_bar_thetaerr;
++  outobj2.prof_bar_thetaerrw = outobj2.prof_bar_thetaerr;
+   if (FLAG(obj2.prof_bar_lengthw))
+     {
+-    ct = cos(obj2->prof_bar_theta*DEG);
+-    st = sin(obj2->prof_bar_theta*DEG);
+-    dx2 = obj2->prof_bar_length*obj2->prof_bar_length * (ct*ct
+-	+ st*st * obj2->prof_bar_aspect*obj2->prof_bar_aspect);
+-    dy2 = obj2->prof_bar_length*obj2->prof_bar_length * (st*st
+-	+ ct*ct * obj2->prof_bar_aspect*obj2->prof_bar_aspect);
+-    dxy = ct*st * obj2->prof_bar_length*obj2->prof_bar_length
+-	*(1.0 - obj2->prof_bar_aspect*obj2->prof_bar_aspect);
++    ct = cos(outobj2.prof_bar_theta*DEG);
++    st = sin(outobj2.prof_bar_theta*DEG);
++    dx2 = outobj2.prof_bar_length*outobj2.prof_bar_length * (ct*ct
++	+ st*st * outobj2.prof_bar_aspect*outobj2.prof_bar_aspect);
++    dy2 = outobj2.prof_bar_length*outobj2.prof_bar_length * (st*st
++	+ ct*ct * outobj2.prof_bar_aspect*outobj2.prof_bar_aspect);
++    dxy = ct*st * outobj2.prof_bar_length*outobj2.prof_bar_length
++	*(1.0 - outobj2.prof_bar_aspect*outobj2.prof_bar_aspect);
+     xm2 = lm0*lm0*dx2 + lm1*lm1*dy2 + lm0*lm1*dxy;
+     ym2 = lm2*lm2*dx2 + lm3*lm3*dy2 + lm2*lm3*dxy;
+     xym = lm0*lm2*dx2 + lm1*lm3*dy2 + (lm0*lm3+lm1*lm2)*dxy;
+     temp=xm2-ym2;
+     if (FLAG(obj2.prof_bar_thetaw))
+       {
+-      obj2->prof_bar_thetaw = fmod_m90_p90((temp == 0.0)?
++      outobj2.prof_bar_thetaw = fmod_m90_p90((temp == 0.0)?
+ 		(45.0) : (0.5*atan2(2.0 * xym,temp)/DEG));
+ 
+ /*---- Compute position angles in J2000 or B1950 reference frame */
+       if (wcs->lng != wcs->lat)
+         {
+         if (FLAG(obj2.prof_bar_thetas))
+-          obj2->prof_bar_thetas = fmod_m90_p90(lng<lat?
+-			((obj2->prof_bar_thetaw>0.0?90:-90.0)
+-				- obj2->prof_bar_thetaw)
+-			: obj2->prof_bar_thetaw);
++          outobj2.prof_bar_thetas = fmod_m90_p90(lng<lat?
++			((outobj2.prof_bar_thetaw>0.0?90:-90.0)
++				- outobj2.prof_bar_thetaw)
++			: outobj2.prof_bar_thetaw);
+         if (FLAG(obj2.prof_bar_theta2000))
+-          obj2->prof_bar_theta2000 = fmod_m90_p90(obj2->prof_bar_thetas
+-					+ obj2->dtheta2000);
++          outobj2.prof_bar_theta2000 = fmod_m90_p90(outobj2.prof_bar_thetas
++					+ outobj2.dtheta2000);
+         if (FLAG(obj2.prof_bar_theta1950))
+-          obj2->prof_bar_theta1950 = fmod_m90_p90(obj2->prof_bar_thetas
+-					+ obj2->dtheta1950);
++          outobj2.prof_bar_theta1950 = fmod_m90_p90(outobj2.prof_bar_thetas
++					+ outobj2.dtheta1950);
+         }
+       }
+     temp = sqrt(0.25*temp*temp+xym*xym);
+     pm2 = 0.5*(xm2+ym2);
+-    obj2->prof_bar_lengthw = sqrt(pm2+temp);
+-    obj2->prof_bar_lengtherrw = obj2->prof_bar_length > 0.0?
+-	obj2->prof_bar_lengtherr/obj2->prof_bar_length*obj2->prof_bar_lengthw
++    outobj2.prof_bar_lengthw = sqrt(pm2+temp);
++    outobj2.prof_bar_lengtherrw = outobj2.prof_bar_length > 0.0?
++	outobj2.prof_bar_lengtherr/outobj2.prof_bar_length*outobj2.prof_bar_lengthw
+ 	: 0.0;
+-    obj2->prof_bar_aspectw = obj2->prof_bar_lengthw>0.0?
+-				  sqrt(pm2-temp) / obj2->prof_bar_lengthw
+-				: obj2->prof_bar_aspect;
+-    obj2->prof_bar_aspecterrw = obj2->prof_bar_aspect > 0.0?
+-	obj2->prof_bar_aspecterr/obj2->prof_bar_aspect*obj2->prof_bar_aspectw
++    outobj2.prof_bar_aspectw = outobj2.prof_bar_lengthw>0.0?
++				  sqrt(pm2-temp) / outobj2.prof_bar_lengthw
++				: outobj2.prof_bar_aspect;
++    outobj2.prof_bar_aspecterrw = outobj2.prof_bar_aspect > 0.0?
++	outobj2.prof_bar_aspecterr/outobj2.prof_bar_aspect*outobj2.prof_bar_aspectw
+ 	: 0.0;
+     }
+ 
+Only in sextractor-2.8.6.new/src: astrom.o
+diff -ur sextractor-2.8.6/src/growth.c sextractor-2.8.6.new/src/growth.c
+--- sextractor-2.8.6/src/growth.c	2009-01-29 14:52:00.000000000 +0100
++++ sextractor-2.8.6.new/src/growth.c	2009-05-24 00:07:56.000000000 +0200
 @@ -32,7 +32,7 @@
  
  static double	*growth;
  static int	ngrowth;
 -static obj2struct	*obj2 = &outobj2;
-+/* static obj2struct	*obj2 = &outobj2; */
++
  
  /******************************** initgrowth *********************************/
  /*
@@ -889,19 +1190,19 @@ diff -ur sextractor-2.5.0.old/src/growth
  		  	i + (tv - *(growtht-1))/dg
  			: i)
  		: (*growth !=0.0 ?tv/(*growth) : 0.0));
-diff -ur sextractor-2.5.0.old/src/pc.c sextractor-2.5.0/src/pc.c
---- sextractor-2.5.0.old/src/pc.c	2005-10-24 13:48:52.000000000 +0200
-+++ sextractor-2.5.0/src/pc.c	2006-07-25 23:27:45.000000000 +0200
-@@ -32,7 +32,7 @@
- #include	"poly.h"
+Only in sextractor-2.8.6.new/src: growth.o
+diff -ur sextractor-2.8.6/src/pc.c sextractor-2.8.6.new/src/pc.c
+--- sextractor-2.8.6/src/pc.c	2009-01-29 14:52:00.000000000 +0100
++++ sextractor-2.8.6.new/src/pc.c	2009-05-24 00:08:06.000000000 +0200
+@@ -32,7 +32,6 @@
+ #include	"wcs/poly.h"
  #include	"psf.h"
  
 -static  obj2struct	*obj2 = &outobj2;
-+/* static  obj2struct	*obj2 = &outobj2; */
  
  /****** pc_end ***************************************************************
  PROTO   void pc_end(pcstruct *pc)
-@@ -361,22 +361,22 @@
+@@ -361,22 +360,22 @@
  
  /*-- Copy the derived physical quantities to output parameters */
  /*-- (subject to changes) */
@@ -936,7 +1237,7 @@ diff -ur sextractor-2.5.0.old/src/pc.c s
        for (c=prefs.pc_vectorsize>npc?npc:prefs.pc_vectorsize; c--;)
          *(ppix++) = *(solt++);
        }
-@@ -397,9 +397,9 @@
+@@ -397,9 +396,9 @@
      xym += val**(mxyt++);
      }
  
@@ -949,7 +1250,7 @@ diff -ur sextractor-2.5.0.old/src/pc.c s
  
    if (FLAG(obj2.a_pc))
      {
-@@ -421,9 +421,9 @@
+@@ -421,9 +420,9 @@
      pmx2 += temp;
      pmy2 -= temp;
  
@@ -962,15 +1263,16 @@ diff -ur sextractor-2.5.0.old/src/pc.c s
      }
  
  /* CHECK-Images */
-diff -ur sextractor-2.5.0.old/src/photom.c sextractor-2.5.0/src/photom.c
---- sextractor-2.5.0.old/src/photom.c	2005-10-24 13:48:52.000000000 +0200
-+++ sextractor-2.5.0/src/photom.c	2006-07-25 23:27:55.000000000 +0200
+Only in sextractor-2.8.6.new/src: pc.o
+diff -ur sextractor-2.8.6/src/photom.c sextractor-2.8.6.new/src/photom.c
+--- sextractor-2.8.6/src/photom.c	2009-01-29 14:51:59.000000000 +0100
++++ sextractor-2.8.6.new/src/photom.c	2009-05-24 00:08:35.000000000 +0200
 @@ -27,7 +27,7 @@
  #include	"photom.h"
  #include	"plist.h"
  
 -static  obj2struct	*obj2 = &outobj2;
-+/* static  obj2struct	*obj2 = &outobj2; */
++
  
  /***************************** computeaperflux********************************/
  /*
@@ -1193,7 +1495,7 @@ diff -ur sextractor-2.5.0.old/src/photom
  			:99.0;
  
  /* Choose the ``best'' flux according to the local crowding */
-@@ -835,63 +835,63 @@
+@@ -835,107 +835,107 @@
      {
      if (obj->flag&OBJ_CROWDED)
        {
@@ -1239,7 +1541,7 @@ diff -ur sextractor-2.5.0.old/src/photom
 +			 1.086*outobj2.fluxerr_somfit/outobj2.flux_somfit
  			:99.0;
  
- /* Mag. PROFILE */
+ /* Mag. models */
    if (FLAG(obj2.mag_prof))
 -    obj2->mag_prof = obj2->flux_prof>0.0?
 -			 -2.5*log10(obj2->flux_prof) + prefs.mag_zeropoint
@@ -1253,6 +1555,70 @@ diff -ur sextractor-2.5.0.old/src/photom
 +			 1.086*outobj2.fluxerr_prof/outobj2.flux_prof
  			:99.0;
  
+   if (FLAG(obj2.prof_spheroid_mag))
+-    obj2->prof_spheroid_mag = obj2->prof_spheroid_flux>0.0?
+-			 -2.5*log10(obj2->prof_spheroid_flux)
++    outobj2.prof_spheroid_mag = outobj2.prof_spheroid_flux>0.0?
++			 -2.5*log10(outobj2.prof_spheroid_flux)
+ 			+ prefs.mag_zeropoint
+ 			:99.0;
+   if (FLAG(obj2.prof_spheroid_magerr))
+-    obj2->prof_spheroid_magerr = obj2->prof_spheroid_flux>0.0?
+-			 1.086*obj2->prof_spheroid_fluxerr
+-				/ obj2->prof_spheroid_flux
++    outobj2.prof_spheroid_magerr = outobj2.prof_spheroid_flux>0.0?
++			 1.086*outobj2.prof_spheroid_fluxerr
++				/ outobj2.prof_spheroid_flux
+ 			:99.0;
+ 
+   if (FLAG(obj2.prof_disk_mag))
+-    obj2->prof_disk_mag = obj2->prof_disk_flux>0.0?
+-			 -2.5*log10(obj2->prof_disk_flux)
++    outobj2.prof_disk_mag = outobj2.prof_disk_flux>0.0?
++			 -2.5*log10(outobj2.prof_disk_flux)
+ 			+ prefs.mag_zeropoint
+ 			:99.0;
+   if (FLAG(obj2.prof_disk_magerr))
+-    obj2->prof_disk_magerr = obj2->prof_disk_flux>0.0?
+-			 1.086*obj2->prof_disk_fluxerr
+-				/ obj2->prof_disk_flux
++    outobj2.prof_disk_magerr = outobj2.prof_disk_flux>0.0?
++			 1.086*outobj2.prof_disk_fluxerr
++				/ outobj2.prof_disk_flux
+ 			:99.0;
+ 
+   if (FLAG(obj2.prof_bar_mag))
+-    obj2->prof_bar_mag = obj2->prof_bar_flux>0.0?
+-			 -2.5*log10(obj2->prof_bar_flux)
++    outobj2.prof_bar_mag = outobj2.prof_bar_flux>0.0?
++			 -2.5*log10(outobj2.prof_bar_flux)
+ 			+ prefs.mag_zeropoint
+ 			:99.0;
+   if (FLAG(obj2.prof_bar_magerr))
+-    obj2->prof_bar_magerr = obj2->prof_bar_flux>0.0?
+-			 1.086*obj2->prof_bar_fluxerr
+-				/obj2->prof_bar_flux
++    outobj2.prof_bar_magerr = outobj2.prof_bar_flux>0.0?
++			 1.086*outobj2.prof_bar_fluxerr
++				/outobj2.prof_bar_flux
+ 			:99.0;
+ 
+   if (FLAG(obj2.prof_arms_mag))
+-    obj2->prof_arms_mag = obj2->prof_arms_flux>0.0?
+-			 -2.5*log10(obj2->prof_arms_flux)
++    outobj2.prof_arms_mag = outobj2.prof_arms_flux>0.0?
++			 -2.5*log10(outobj2.prof_arms_flux)
+ 			+ prefs.mag_zeropoint
+ 			:99.0;
+   if (FLAG(obj2.prof_arms_magerr))
+-    obj2->prof_arms_magerr = obj2->prof_arms_flux>0.0?
+-			 1.086*obj2->prof_arms_fluxerr
+-				/obj2->prof_arms_flux
++    outobj2.prof_arms_magerr = outobj2.prof_arms_flux>0.0?
++			 1.086*outobj2.prof_arms_fluxerr
++				/outobj2.prof_arms_flux
+ 			:99.0;
+ 
  /* Mag. WINdowed */
    if (FLAG(obj2.mag_win))
 -    obj2->mag_win = obj2->flux_win>0.0?
@@ -1281,7 +1647,7 @@ diff -ur sextractor-2.5.0.old/src/photom
  			:99.0;
  
  /* SB units */
-@@ -902,7 +902,7 @@
+@@ -946,7 +946,7 @@
  		: 99.0;
  
    if (FLAG(obj2.threshmu))
@@ -1290,19 +1656,20 @@ diff -ur sextractor-2.5.0.old/src/photom
  		-2.5*log10((obj->thresh)
  		 / (field->pixscale * field->pixscale)) + prefs.mag_zeropoint
  		: 99.0;
-diff -ur sextractor-2.5.0.old/src/psf.c sextractor-2.5.0/src/psf.c
---- sextractor-2.5.0.old/src/psf.c	2006-07-14 20:22:44.000000000 +0200
-+++ sextractor-2.5.0/src/psf.c	2006-07-25 23:36:58.000000000 +0200
-@@ -309,7 +309,7 @@
+Only in sextractor-2.8.6.new/src: photom.o
+diff -ur sextractor-2.8.6/src/psf.c sextractor-2.8.6.new/src/psf.c
+--- sextractor-2.8.6/src/psf.c	2009-01-29 14:52:00.000000000 +0100
++++ sextractor-2.8.6.new/src/psf.c	2009-05-24 00:10:31.000000000 +0200
+@@ -312,7 +312,7 @@
  		objstruct *obj)
  {
    checkstruct		*check;
 -  static obj2struct     *obj2 = &outobj2;
-+  /* static obj2struct     *obj2 = &outobj2; */
++  
    static double		x2[PSF_NPSFMAX],y2[PSF_NPSFMAX],xy[PSF_NPSFMAX],
  			deltax[PSF_NPSFMAX],
  			deltay[PSF_NPSFMAX],flux[PSF_NPSFMAX],
-@@ -349,8 +349,8 @@
+@@ -352,8 +352,8 @@
    thepsfit->npsf = 0;
    for (j=0; j<npsfmax; j++) 
      {
@@ -1313,7 +1680,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
        thepsfit->flux[j] = 0.0;
      }
  
-@@ -377,7 +377,7 @@
+@@ -380,7 +380,7 @@
     if (prefs.psf_flag==1)
        if (prefs.dpsf_flag!=1)
          if(!FLAG(obj2.fluxerr_psf))
@@ -1322,7 +1689,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
  
    QMALLOC(weighth, PIXTYPE, npix);
    QMALLOC(weight, double, npix);
-@@ -556,7 +556,7 @@
+@@ -559,7 +559,7 @@
                deltaxb[j] = deltax[j];
                deltayb[j] = deltay[j];
                fluxb[j] = flux[j];
@@ -1331,7 +1698,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
              }
          }
      }
-@@ -579,7 +579,7 @@
+@@ -582,7 +582,7 @@
  
        if (FLAG(obj2.poserrmx2_psf))
          {
@@ -1340,7 +1707,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
          }
        else
          var += 3*PSF_NA+3;  
-@@ -604,7 +604,7 @@
+@@ -607,7 +607,7 @@
                chi2 += pix*pix;
                if (chi2>1E29) chi2=1E28;
              }
@@ -1349,7 +1716,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
              chi2/((npix - 3*npsf)*obj->sigbkg*obj->sigbkg):999999;
  
          }
-@@ -623,7 +623,7 @@
+@@ -626,7 +626,7 @@
                chi2 += pix*pix;
                if (chi2>1E29) chi2=1E28;
              }
@@ -1358,16 +1725,16 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
  		chi2/((npix - 3*npsf)*obj->sigbkg*obj->sigbkg):999999;
  
          }
-@@ -755,7 +755,7 @@
+@@ -758,7 +758,7 @@
      ival,npsfmax;
    double *pvar;
    
 -    static obj2struct   *obj2 = &outobj2;
-+  /* static obj2struct   *obj2 = &outobj2; */
++  
    checkdata = NULL;                     /* To avoid gcc -Wall warnings */
    pdx = pdy =dx = dy = 0.0;
    ppixstep = 1.0/ppsf->pixstep;
-@@ -773,13 +773,13 @@
+@@ -776,13 +776,13 @@
    ppsfit->niter = 0;
    ppsfit->npsf = 0;
    if(!FLAG(obj2.fluxerr_psf))
@@ -1383,7 +1750,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
        pdeltax[j]= pdeltay[j]=psol[j]=  pwmat[j]=pflux[j]=0.0;
     
      }
-@@ -923,7 +923,7 @@
+@@ -926,7 +926,7 @@
          {
            svdvar(pvmat, pwmat, j, pcovmat);
            pvar = pcovmat;
@@ -1392,7 +1759,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
              sqrt(*pvar):99;
          }
      }
-@@ -940,7 +940,7 @@
+@@ -943,7 +943,7 @@
                chi2 += ppix*ppix;
                if (chi2>1E29) chi2=1E28;
              }
@@ -1401,7 +1768,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
              chi2/((npix - 3*npsf)*obj->sigbkg*obj->sigbkg):999999;
  
          }
-@@ -960,7 +960,7 @@
+@@ -963,7 +963,7 @@
                chi2 += ppix*ppix;
                if (chi2>1E29) chi2=1E28;
              }
@@ -1410,7 +1777,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
  		chi2/((npix - 3*npsf)*obj->sigbkg*obj->sigbkg):999999;
  
          }
-@@ -1192,11 +1192,11 @@
+@@ -1195,11 +1195,11 @@
    covab = *(++var);
    varb = *(var += PSF_NA);
    var += PSF_NA+1;
@@ -1425,7 +1792,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
                           +covab*(x2[j]*y2[j]+xy[j]*xy[j]))
      /(sol[0]*sol[0]);
    
-@@ -1205,19 +1205,19 @@
+@@ -1208,19 +1208,19 @@
      {
        double    pmx2,pmy2,temp,theta;
        
@@ -1452,7 +1819,7 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
      }
    
    /*------ ...Or ellipse parameters */
-@@ -1225,12 +1225,12 @@
+@@ -1228,12 +1228,12 @@
      {
        double    xm2,ym2, xym, temp;
        
@@ -1471,3 +1838,197 @@ diff -ur sextractor-2.5.0.old/src/psf.c 
      }
    return;
  }
+Only in sextractor-2.8.6.new/src: psf.o
+diff -ur sextractor-2.8.6/src/winpos.c sextractor-2.8.6.new/src/winpos.c
+--- sextractor-2.8.6/src/winpos.c	2009-01-29 14:52:00.000000000 +0100
++++ sextractor-2.8.6.new/src/winpos.c	2009-05-24 00:10:49.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include	"prefs.h"
+ #include	"winpos.h"
+ 
+-static  obj2struct	*obj2 = &outobj2;
++
+ 
+ /****** compute_winpos ********************************************************
+ PROTO	void compute_winpos(picstruct *field, picstruct *wfield,
+@@ -71,7 +71,7 @@
+   momentflag = FLAG(obj2.win_mx2) | FLAG(obj2.winposerr_mx2);
+   var = backnoise2 = field->backsig*field->backsig;
+   gain = field->gain;
+-  sig = obj2->hl_radius*2.0/2.35; /* From half-FWHM to sigma */
++  sig = outobj2.hl_radius*2.0/2.35; /* From half-FWHM to sigma */
+   twosig2 = 2.0*sig*sig;
+ 
+ /* Integration radius */
+@@ -99,8 +99,8 @@
+   offsetx = 0.5*(scalex-1.0);
+   offsety = 0.5*(scaley-1.0);
+ /* Use isophotal centroid as a first guess */
+-  mx = obj2->posx - 1.0;
+-  my = obj2->posy - 1.0;
++  mx = outobj2.posx - 1.0;
++  my = outobj2.posy - 1.0;
+ 
+   for (i=0; i<WINPOS_NITERMAX; i++)
+     {
+@@ -241,57 +241,57 @@
+   mx2 = mx2/tv - dxpos*dxpos;
+   my2 = my2/tv - dypos*dypos;
+   mxy = mxy/tv - dxpos*dypos;
+-  obj2->winpos_x = mx + 1.0;	/* The dreaded 1.0 FITS offset */
+-  obj2->winpos_y = my + 1.0; 	/* The dreaded 1.0 FITS offset */
+-  obj2->winpos_niter = i+1;
++  outobj2.winpos_x = mx + 1.0;	/* The dreaded 1.0 FITS offset */
++  outobj2.winpos_y = my + 1.0; 	/* The dreaded 1.0 FITS offset */
++  outobj2.winpos_niter = i+1;
+ 
+ /* WINdowed flux */
+   if (FLAG(obj2.flux_win))
+     {
+-    obj2->flux_win = tv;
+-    obj2->fluxerr_win = sqrt(esum);
++    outobj2.flux_win = tv;
++    outobj2.fluxerr_win = sqrt(esum);
+     }
+   temp2=mx2*my2-mxy*mxy;
+-  obj2->win_flag = (tv <= 0.0)*4 + (mx2 < 0.0 || my2 < 0.0)*2
++  outobj2.win_flag = (tv <= 0.0)*4 + (mx2 < 0.0 || my2 < 0.0)*2
+ 	+ (temp2<0.0);
+-  if (obj2->win_flag)
++  if (outobj2.win_flag)
+     {
+ /*--- Negative values: revert to isophotal estimates */
+     if (errflag)
+       {
+-      obj2->winposerr_mx2 = obj->poserr_mx2;
+-      obj2->winposerr_my2 = obj->poserr_my2;
+-      obj2->winposerr_mxy = obj->poserr_mxy;
++      outobj2.winposerr_mx2 = obj->poserr_mx2;
++      outobj2.winposerr_my2 = obj->poserr_my2;
++      outobj2.winposerr_mxy = obj->poserr_mxy;
+       if (FLAG(obj2.winposerr_a))
+         {
+-        obj2->winposerr_a = obj2->poserr_a;
+-        obj2->winposerr_b = obj2->poserr_b;
+-        obj2->winposerr_theta = obj2->poserr_theta;
++        outobj2.winposerr_a = outobj2.poserr_a;
++        outobj2.winposerr_b = outobj2.poserr_b;
++        outobj2.winposerr_theta = outobj2.poserr_theta;
+         }
+       if (FLAG(obj2.winposerr_cxx))
+         {
+-        obj2->winposerr_cxx = obj2->poserr_cxx;
+-        obj2->winposerr_cyy = obj2->poserr_cyy;
+-        obj2->winposerr_cxy = obj2->poserr_cxy;
++        outobj2.winposerr_cxx = outobj2.poserr_cxx;
++        outobj2.winposerr_cyy = outobj2.poserr_cyy;
++        outobj2.winposerr_cxy = outobj2.poserr_cxy;
+         }
+       }
+     if (momentflag)
+       {
+-      obj2->win_mx2 = obj->mx2;
+-      obj2->win_my2 = obj->my2;
+-      obj2->win_mxy = obj->mxy;
++      outobj2.win_mx2 = obj->mx2;
++      outobj2.win_my2 = obj->my2;
++      outobj2.win_mxy = obj->mxy;
+       if (FLAG(obj2.win_cxx))
+         {
+-        obj2->win_cxx = obj->cxx;
+-        obj2->win_cyy = obj->cyy;
+-        obj2->win_cxy = obj->cxy;
++        outobj2.win_cxx = obj->cxx;
++        outobj2.win_cyy = obj->cyy;
++        outobj2.win_cxy = obj->cxy;
+         }
+       if (FLAG(obj2.win_a))
+         {
+-        obj2->win_a = obj->a;
+-        obj2->win_b = obj->b;
+-        obj2->win_polar = obj2->polar;
+-        obj2->win_theta = obj->theta;
++        outobj2.win_a = obj->a;
++        outobj2.win_b = obj->b;
++        outobj2.win_polar = outobj2.polar;
++        outobj2.win_theta = obj->theta;
+         }
+       }
+     }
+@@ -311,9 +311,9 @@
+         emy2 += esum;
+         }
+ 
+-      obj2->winposerr_mx2 = emx2;
+-      obj2->winposerr_my2 = emy2;
+-      obj2->winposerr_mxy = emxy;
++      outobj2.winposerr_mx2 = emx2;
++      outobj2.winposerr_my2 = emy2;
++      outobj2.winposerr_mxy = emxy;
+ /*---- Error ellipse parameters */
+       if (FLAG(obj2.winposerr_a))
+         {
+@@ -329,18 +329,18 @@
+         pmx2+=temp;
+         pmy2-=temp;
+ 
+-        obj2->winposerr_a = (float)sqrt(pmx2);
+-        obj2->winposerr_b = (float)sqrt(pmy2);
+-        obj2->winposerr_theta = theta*180.0/PI;
++        outobj2.winposerr_a = (float)sqrt(pmx2);
++        outobj2.winposerr_b = (float)sqrt(pmy2);
++        outobj2.winposerr_theta = theta*180.0/PI;
+         }
+ 
+       if (FLAG(obj2.winposerr_cxx))
+         {
+          double	temp;
+ 
+-        obj2->winposerr_cxx = (float)(emy2/(temp=emx2*emy2-emxy*emxy));
+-        obj2->winposerr_cyy = (float)(emx2/temp);
+-        obj2->winposerr_cxy = (float)(-2*emxy/temp);
++        outobj2.winposerr_cxx = (float)(emy2/(temp=emx2*emy2-emxy*emxy));
++        outobj2.winposerr_cyy = (float)(emx2/temp);
++        outobj2.winposerr_cxy = (float)(-2*emxy/temp);
+         }
+       }
+ 
+@@ -353,15 +353,15 @@
+         my2 += 0.0833333;
+         temp2 = mx2*my2-mxy*mxy;
+         }
+-      obj2->win_mx2 = mx2;
+-      obj2->win_my2 = my2;
+-      obj2->win_mxy = mxy;
++      outobj2.win_mx2 = mx2;
++      outobj2.win_my2 = my2;
++      outobj2.win_mxy = mxy;
+ 
+       if (FLAG(obj2.win_cxx))
+         {
+-        obj2->win_cxx = (float)(my2/temp2);
+-        obj2->win_cyy = (float)(mx2/temp2);
+-        obj2->win_cxy = (float)(-2*mxy/temp2);
++        outobj2.win_cxx = (float)(my2/temp2);
++        outobj2.win_cyy = (float)(mx2/temp2);
++        outobj2.win_cxy = (float)(-2*mxy/temp2);
+         }
+ 
+       if (FLAG(obj2.win_a))
+@@ -373,11 +373,11 @@
+ 
+         temp = sqrt(0.25*temp*temp+mxy*mxy);
+         pmx2 = 0.5*(mx2+my2);
+-        obj2->win_a = (float)sqrt(pmx2 + temp);
+-        obj2->win_b = (float)sqrt(pmx2 - temp);
++        outobj2.win_a = (float)sqrt(pmx2 + temp);
++        outobj2.win_b = (float)sqrt(pmx2 - temp);
+         if (FLAG(obj2.win_polar))
+-          obj2->win_polar = temp / pmx2;
+-        obj2->win_theta = theta*180.0/PI;
++          outobj2.win_polar = temp / pmx2;
++        outobj2.win_theta = theta*180.0/PI;
+         }
+       }
+     }
+Only in sextractor-2.8.6.new/src: winpos.o


Index: sextractor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sextractor/devel/sextractor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sextractor.spec	27 Jul 2009 04:13:48 -0000	1.12
+++ sextractor.spec	23 Dec 2009 14:51:28 -0000	1.13
@@ -1,14 +1,16 @@
 Name: sextractor
-Version: 2.5.0
-Release: 9%{?dist}
+Version: 2.8.6
+Release: 1%{?dist}
 Summary: Extract catalogs of sources from astronomical images
 
 Group: Applications/Engineering
-License: GPLv2
-URL: http://terapix.iap.fr/soft/%{name}
+License: CeCILL
+URL: http://astromatic.iap.fr/software/%{name}
 Source0: ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/%{name}-%{version}.tar.gz
-Patch0: sextractor-pointer-alias.patch
+Patch0: sextractor-cflags.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: fftw-devel >= 3.1
+BuildRequires: atlas-devel >= 3.6.0
 
 %description
 SExtractor is a program that builds a catalogue of objects from an 
@@ -22,29 +24,30 @@ well on moderately crowded star fields.
 
 %build
 %configure
-
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{_datadir}/%{name}
-%{__install} -m 644 -p config/*.conv %{buildroot}%{_datadir}/%{name}
-%{__install} -m 644 -p config/default.nnw %{buildroot}%{_datadir}/%{name}
-
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_datadir}/%{name}
+install -m 644 -p config/*.conv %{buildroot}%{_datadir}/%{name}
+install -m 644 -p config/default.nnw %{buildroot}%{_datadir}/%{name}
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING HISTORY README THANKS doc/README.DOC doc/sextractor.pdf config/default.sex config/default.param
+%doc AUTHORS BUGS COPYRIGHT HISTORY README THANKS doc/README.DOC doc/sextractor.pdf config/default.sex config/default.param
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/manx/*
 %{_datadir}/%{name}/
 
 %changelog
+* Wed Aug 26 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.8.6-1
+- New upstream source
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -59,21 +62,28 @@ well on moderately crowded star fields.
 
 * Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-5.1
 - Rebuild for Fedora 8 to get the build-id
+
 * Tue Sep 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-5
 - Rebuilt for FC6.
+
 * Wed Jul 26 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-4
 - Patch to resolve pointer aliasing problems (bug #199700)
 - Removed -DXSL_URL flag, as the file sextractor.xsl does not exist yet
+
 * Mon Jul 24 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-3
 - Reverting optimization to -O2, it breaks debug infos
+
 * Fri Jul 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-2
 - fitsconv.c has correct permissions
 - changed optimization from -O2 to -O1 (bug #199700)
 - additional define allows VOTable output
+
 * Wed Jul 19 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-1
 - New upstream version 2.5.0
+
 * Tue Jun 20 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.4.4-2
 - Fixed executable permission in src/fits/fitsconv.c
 - default.sex and default.param moved to docs
+
 * Mon Jun 19 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.4.4-1
 - Initial spec file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sextractor/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Jul 2006 16:26:07 -0000	1.3
+++ sources	23 Dec 2009 14:51:28 -0000	1.4
@@ -1 +1 @@
-3dede44685b582ad5ee03f5b69423530  sextractor-2.5.0.tar.gz
+6c2fc529cd89bdd11b1fbafc0866131c  sextractor-2.8.6.tar.gz



From twaugh at fedoraproject.org  Wed Dec 23 14:55:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 14:55:54 +0000 (UTC)
Subject: rpms/system-config-printer/F-11 system-config-printer-typo.patch, NONE,
	1.1 system-config-printer.spec, 1.317, 1.318
Message-ID: <20091223145554.374ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30136

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-typo.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Fixed typo (bug #550096).


system-config-printer-typo.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-typo.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.typo system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.typo	2009-12-22 14:44:19.000000000 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2009-12-23 14:54:15.138689711 +0000
@@ -4564,7 +4564,7 @@ class NewPrinterGUI(GtkGUI):
                     not self.device.type in ("socket", "lpd", "ipp",
                                              "http", "https", "bluetooth")):
                     name = "%s %s" % (self.device.id_dict["MFG"], 
-                                      elf.device.id_dict["MDL"])
+                                      self.device.id_dict["MDL"])
                     descr = "%s %s" % (self.device.id_dict["MFG"],
                                        self.device.id_dict["MDL"])
             except:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- system-config-printer.spec	22 Dec 2009 15:05:49 -0000	1.317
+++ system-config-printer.spec	23 Dec 2009 14:55:53 -0000	1.318
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch1: system-config-printer-typo.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -62,6 +64,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .typo
 
 %build
 %configure
@@ -168,6 +171,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Fixed typo (bug #550096).
+
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
 - Updated pycups to 1.9.47.
 - 1.1.16:



From twaugh at fedoraproject.org  Wed Dec 23 14:56:53 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 14:56:53 +0000 (UTC)
Subject: rpms/system-config-printer/F-12 system-config-printer-typo.patch, NONE,
	1.1 system-config-printer.spec, 1.329, 1.330
Message-ID: <20091223145653.D616B11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30341

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-typo.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Fixed typo (bug #550096).


system-config-printer-typo.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-typo.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.typo system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.typo	2009-12-22 14:44:19.000000000 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2009-12-23 14:54:15.138689711 +0000
@@ -4564,7 +4564,7 @@ class NewPrinterGUI(GtkGUI):
                     not self.device.type in ("socket", "lpd", "ipp",
                                              "http", "https", "bluetooth")):
                     name = "%s %s" % (self.device.id_dict["MFG"], 
-                                      elf.device.id_dict["MDL"])
+                                      self.device.id_dict["MDL"])
                     descr = "%s %s" % (self.device.id_dict["MFG"],
                                        self.device.id_dict["MDL"])
             except:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -p -r1.329 -r1.330
--- system-config-printer.spec	22 Dec 2009 16:08:15 -0000	1.329
+++ system-config-printer.spec	23 Dec 2009 14:56:53 -0000	1.330
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
+Patch2: system-config-printer-typo.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
+%patch2 -p1 -b .typo
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -192,6 +194,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Fixed typo (bug #550096).
+
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
 - Updated pycups to 1.9.47.
 - 1.1.16:



From twaugh at fedoraproject.org  Wed Dec 23 14:58:02 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 14:58:02 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer-typo.patch,
	NONE, 1.1 system-config-printer.spec, 1.325, 1.326
Message-ID: <20091223145802.56F1A11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30547

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-typo.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Fixed typo (bug #550096).


system-config-printer-typo.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-typo.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.typo system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.typo	2009-12-22 14:44:19.000000000 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2009-12-23 14:54:15.138689711 +0000
@@ -4564,7 +4564,7 @@ class NewPrinterGUI(GtkGUI):
                     not self.device.type in ("socket", "lpd", "ipp",
                                              "http", "https", "bluetooth")):
                     name = "%s %s" % (self.device.id_dict["MFG"], 
-                                      elf.device.id_dict["MDL"])
+                                      self.device.id_dict["MDL"])
                     descr = "%s %s" % (self.device.id_dict["MFG"],
                                        self.device.id_dict["MDL"])
             except:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- system-config-printer.spec	22 Dec 2009 16:15:04 -0000	1.325
+++ system-config-printer.spec	23 Dec 2009 14:58:02 -0000	1.326
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
+Patch2: system-config-printer-typo.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
+%patch2 -p1 -b .typo
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -143,8 +145,8 @@ rm -rf %buildroot
 %{_datadir}/%{name}/AdvancedServerSettings.py*
 %{_datadir}/%{name}/asyncconn.py*
 %{_datadir}/%{name}/asyncipp.py*
-%{_datadir}/%{name}/asyncpk0.py*
 %{_datadir}/%{name}/asyncpk1.py*
+%{_datadir}/%{name}/asyncpk0.py*
 %{_datadir}/%{name}/authconn.py*
 %{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
@@ -192,6 +194,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Fixed typo (bug #550096).
+
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1
 - Updated pycups to 1.9.47.
 - 1.1.16:



From twaugh at fedoraproject.org  Wed Dec 23 15:02:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 15:02:05 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-driver-pre-selection.patch, NONE,
	1.1 system-config-printer.spec, 1.318, 1.319
Message-ID: <20091223150205.6856211C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31202

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-driver-pre-selection.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Pre-select correct driver when adding or changing a queue (bug #550075).
- Fixed typo (bug #550096).


system-config-printer-driver-pre-selection.patch:
 system-config-printer.py |   65 +++++++++++++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 21 deletions(-)

--- NEW FILE system-config-printer-driver-pre-selection.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.driver-pre-selection system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.driver-pre-selection	2009-12-23 15:00:02.129814424 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2009-12-23 15:00:27.228814932 +0000
@@ -3968,38 +3968,41 @@ class NewPrinterGUI(GtkGUI):
                     else:
                         self.auto_make = devid_dict["MFG"]
                         self.auto_model = devid_dict["MDL"]
+                        self.auto_driver = None
                 except:
                     self.auto_make = devid_dict["MFG"]
                     self.auto_model = devid_dict["MDL"]
+                    self.auto_driver = None
                 if not self.device or not self.device.id:
                     self.device.id = devid
                     self.device.id_dict = cupshelpers.parseDeviceID (devid)
                 self.mainapp.devid = ""
             elif ppd:
-                attr = ppd.findAttr("Manufacturer")
-                if attr:
-                    mfr = attr.value
+                attr = ppd.findAttr("NickName")
+                if not attr:
+                    attr = ppd.findAttr("ModelName")
+
+                if attr.value:
+                    mfgmdl = cupshelpers.ppds.ppdMakeModelSplit (attr.value)
+                    (self.auto_make, self.auto_model) = mfgmdl
+
+                    # Search for ppdname with that make-and-model
+                    self.loadPPDs ()
+                    ppds = self.ppds.getInfoFromModel (self.auto_make,
+                                                       self.auto_model)
+                    for ppd, info in ppds.iteritems ():
+                        if info.get ("ppd-make-and-model") == attr.value:
+                            self.auto_driver = ppd
+                            break
                 else:
-                    mfr = ""
-                makeandmodel = mfr
-                attr = ppd.findAttr("ModelName")
-                if not attr: attr = ppd.findAttr("ShortNickName")
-                if not attr: attr = ppd.findAttr("NickName")
-                if attr:
-                    if attr.value.startswith(mfr):
-                        makeandmodel = attr.value
-                    else:
-                        makeandmodel += ' ' + attr.value
-                else:
-                    makeandmodel = ''
-
-                (self.auto_make,
-                 self.auto_model) = \
-                 cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
+                    self.auto_make = None
+                    self.auto_model = None
+                    self.auto_driver = None
             else:
                 # Special CUPS names for a raw queue.
                 self.auto_make = 'Generic'
                 self.auto_model = 'Raw Queue'
+                self.auto_driver = None
 
             try:
                 if self.dialog_mode == "ppd":
@@ -4249,6 +4252,8 @@ class NewPrinterGUI(GtkGUI):
         if self.openprinting_query_handle != None:
             self.openprinting.cancelOperation (self.openprinting_query_handle)
             self.openprinting_query_handle = None
+
+        self.device = None
         return True
 
     def on_btnNPBack_clicked(self, widget):
@@ -4267,6 +4272,7 @@ class NewPrinterGUI(GtkGUI):
             self.busy (self.NewPrinterWindow)
             if page_nr == 1: # Device (first page)
                 self.auto_make, self.auto_model = None, None
+                self.auto_driver = None
                 self.device.uri = self.getDeviceURI()
                 if not self.install_hplip_plugin(self.device.uri):
                     self.on_NPCancel(None)
@@ -4434,6 +4440,7 @@ class NewPrinterGUI(GtkGUI):
                             cupshelpers.ppds.ppdMakeModelSplit (make_model)
                         self.auto_make = make
                         self.auto_model = model
+                        self.auto_driver = ppdname
                         if (status == self.ppds.STATUS_SUCCESS and \
                             self.dialog_mode != "ppd"):
                             self.exactdrivermatch = True
@@ -6414,7 +6421,17 @@ class NewPrinterGUI(GtkGUI):
         ppds = self.ppds.getInfoFromModel(pmake, pmodel)
 
         self.NPDrivers = self.ppds.orderPPDNamesByPreference(ppds.keys(),
-                                             self.jockey_installed_files) 
+                                             self.jockey_installed_files)
+        if self.auto_driver and self.device:
+            drivers = []
+            for driver in self.NPDrivers:
+                if driver == self.auto_driver:
+                    drivers.insert (0, driver)
+                else:
+                    drivers.append (driver)
+
+            self.NPDrivers = drivers
+
         for i in range (len(self.NPDrivers)):
             ppd = ppds[self.NPDrivers[i]]
             driver = ppd["ppd-make-and-model"]
@@ -6426,7 +6443,12 @@ class NewPrinterGUI(GtkGUI):
             except KeyError:
                 pass
 
-            if i == 0:
+            if not self.device and self.auto_driver == self.NPDrivers[i]:
+                iter = model.append ((driver + _(" (Current)"),))
+                path = model.get_path (iter)
+                self.tvNPDrivers.get_selection().select_path(path)
+                self.tvNPDrivers.scroll_to_cell(path, None, True, 0.5, 0.0)
+            elif self.device and i == 0:
                 iter = model.append ((driver + _(" (recommended)"),))
                 path = model.get_path (iter)
                 self.tvNPDrivers.get_selection().select_path(path)
@@ -6881,6 +6903,7 @@ class NewPrinterGUI(GtkGUI):
                 checkppd = ppd
 
         self.NewPrinterWindow.hide()
+        self.device = None
         self.mainapp.populateList()
 
         # Now select it.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- system-config-printer.spec	23 Dec 2009 14:55:53 -0000	1.318
+++ system-config-printer.spec	23 Dec 2009 15:02:04 -0000	1.319
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-typo.patch
+Patch2: system-config-printer-driver-pre-selection.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,6 +66,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .typo
+%patch2 -p1 -b .driver-pre-selection
 
 %build
 %configure
@@ -172,6 +174,7 @@ exit 0
 
 %changelog
 * Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Pre-select correct driver when adding or changing a queue (bug #550075).
 - Fixed typo (bug #550096).
 
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1



From twaugh at fedoraproject.org  Wed Dec 23 15:03:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 15:03:22 +0000 (UTC)
Subject: rpms/system-config-printer/F-12 system-config-printer.spec, 1.330,
	1.331
Message-ID: <20091223150322.3142511C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31429

Modified Files:
	system-config-printer.spec 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Pre-select correct driver when adding or changing a queue (bug #550075).



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -r1.330 -r1.331
--- system-config-printer.spec	23 Dec 2009 14:56:53 -0000	1.330
+++ system-config-printer.spec	23 Dec 2009 15:03:20 -0000	1.331
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-typo.patch
+Patch3: system-config-printer-driver-pre-selection.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -78,6 +79,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .typo
+%patch3 -p1 -b .driver-pre-selection
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -195,6 +197,7 @@ exit 0
 
 %changelog
 * Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Pre-select correct driver when adding or changing a queue (bug #550075).
 - Fixed typo (bug #550096).
 
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1



From twaugh at fedoraproject.org  Wed Dec 23 15:04:26 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 15:04:26 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-driver-pre-selection.patch, NONE, 1.1
Message-ID: <20091223150426.E07FC11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31665

Added Files:
	system-config-printer-driver-pre-selection.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Pre-select correct driver when adding or changing a queue (bug #550075).


system-config-printer-driver-pre-selection.patch:
 system-config-printer.py |   65 +++++++++++++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 21 deletions(-)

--- NEW FILE system-config-printer-driver-pre-selection.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.driver-pre-selection system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.driver-pre-selection	2009-12-23 15:00:02.129814424 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2009-12-23 15:00:27.228814932 +0000
@@ -3968,38 +3968,41 @@ class NewPrinterGUI(GtkGUI):
                     else:
                         self.auto_make = devid_dict["MFG"]
                         self.auto_model = devid_dict["MDL"]
+                        self.auto_driver = None
                 except:
                     self.auto_make = devid_dict["MFG"]
                     self.auto_model = devid_dict["MDL"]
+                    self.auto_driver = None
                 if not self.device or not self.device.id:
                     self.device.id = devid
                     self.device.id_dict = cupshelpers.parseDeviceID (devid)
                 self.mainapp.devid = ""
             elif ppd:
-                attr = ppd.findAttr("Manufacturer")
-                if attr:
-                    mfr = attr.value
+                attr = ppd.findAttr("NickName")
+                if not attr:
+                    attr = ppd.findAttr("ModelName")
+
+                if attr.value:
+                    mfgmdl = cupshelpers.ppds.ppdMakeModelSplit (attr.value)
+                    (self.auto_make, self.auto_model) = mfgmdl
+
+                    # Search for ppdname with that make-and-model
+                    self.loadPPDs ()
+                    ppds = self.ppds.getInfoFromModel (self.auto_make,
+                                                       self.auto_model)
+                    for ppd, info in ppds.iteritems ():
+                        if info.get ("ppd-make-and-model") == attr.value:
+                            self.auto_driver = ppd
+                            break
                 else:
-                    mfr = ""
-                makeandmodel = mfr
-                attr = ppd.findAttr("ModelName")
-                if not attr: attr = ppd.findAttr("ShortNickName")
-                if not attr: attr = ppd.findAttr("NickName")
-                if attr:
-                    if attr.value.startswith(mfr):
-                        makeandmodel = attr.value
-                    else:
-                        makeandmodel += ' ' + attr.value
-                else:
-                    makeandmodel = ''
-
-                (self.auto_make,
-                 self.auto_model) = \
-                 cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
+                    self.auto_make = None
+                    self.auto_model = None
+                    self.auto_driver = None
             else:
                 # Special CUPS names for a raw queue.
                 self.auto_make = 'Generic'
                 self.auto_model = 'Raw Queue'
+                self.auto_driver = None
 
             try:
                 if self.dialog_mode == "ppd":
@@ -4249,6 +4252,8 @@ class NewPrinterGUI(GtkGUI):
         if self.openprinting_query_handle != None:
             self.openprinting.cancelOperation (self.openprinting_query_handle)
             self.openprinting_query_handle = None
+
+        self.device = None
         return True
 
     def on_btnNPBack_clicked(self, widget):
@@ -4267,6 +4272,7 @@ class NewPrinterGUI(GtkGUI):
             self.busy (self.NewPrinterWindow)
             if page_nr == 1: # Device (first page)
                 self.auto_make, self.auto_model = None, None
+                self.auto_driver = None
                 self.device.uri = self.getDeviceURI()
                 if not self.install_hplip_plugin(self.device.uri):
                     self.on_NPCancel(None)
@@ -4434,6 +4440,7 @@ class NewPrinterGUI(GtkGUI):
                             cupshelpers.ppds.ppdMakeModelSplit (make_model)
                         self.auto_make = make
                         self.auto_model = model
+                        self.auto_driver = ppdname
                         if (status == self.ppds.STATUS_SUCCESS and \
                             self.dialog_mode != "ppd"):
                             self.exactdrivermatch = True
@@ -6414,7 +6421,17 @@ class NewPrinterGUI(GtkGUI):
         ppds = self.ppds.getInfoFromModel(pmake, pmodel)
 
         self.NPDrivers = self.ppds.orderPPDNamesByPreference(ppds.keys(),
-                                             self.jockey_installed_files) 
+                                             self.jockey_installed_files)
+        if self.auto_driver and self.device:
+            drivers = []
+            for driver in self.NPDrivers:
+                if driver == self.auto_driver:
+                    drivers.insert (0, driver)
+                else:
+                    drivers.append (driver)
+
+            self.NPDrivers = drivers
+
         for i in range (len(self.NPDrivers)):
             ppd = ppds[self.NPDrivers[i]]
             driver = ppd["ppd-make-and-model"]
@@ -6426,7 +6443,12 @@ class NewPrinterGUI(GtkGUI):
             except KeyError:
                 pass
 
-            if i == 0:
+            if not self.device and self.auto_driver == self.NPDrivers[i]:
+                iter = model.append ((driver + _(" (Current)"),))
+                path = model.get_path (iter)
+                self.tvNPDrivers.get_selection().select_path(path)
+                self.tvNPDrivers.scroll_to_cell(path, None, True, 0.5, 0.0)
+            elif self.device and i == 0:
                 iter = model.append ((driver + _(" (recommended)"),))
                 path = model.get_path (iter)
                 self.tvNPDrivers.get_selection().select_path(path)
@@ -6881,6 +6903,7 @@ class NewPrinterGUI(GtkGUI):
                 checkppd = ppd
 
         self.NewPrinterWindow.hide()
+        self.device = None
         self.mainapp.populateList()
 
         # Now select it.



From twaugh at fedoraproject.org  Wed Dec 23 15:04:44 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 15:04:44 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-driver-pre-selection.patch, NONE,
	1.1 system-config-printer.spec, 1.326, 1.327
Message-ID: <20091223150444.0CC7811C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31759

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-driver-pre-selection.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Pre-select correct driver when adding or changing a queue (bug #550075).


system-config-printer-driver-pre-selection.patch:
 system-config-printer.py |   65 +++++++++++++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 21 deletions(-)

--- NEW FILE system-config-printer-driver-pre-selection.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.driver-pre-selection system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.driver-pre-selection	2009-12-23 15:00:02.129814424 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2009-12-23 15:00:27.228814932 +0000
@@ -3968,38 +3968,41 @@ class NewPrinterGUI(GtkGUI):
                     else:
                         self.auto_make = devid_dict["MFG"]
                         self.auto_model = devid_dict["MDL"]
+                        self.auto_driver = None
                 except:
                     self.auto_make = devid_dict["MFG"]
                     self.auto_model = devid_dict["MDL"]
+                    self.auto_driver = None
                 if not self.device or not self.device.id:
                     self.device.id = devid
                     self.device.id_dict = cupshelpers.parseDeviceID (devid)
                 self.mainapp.devid = ""
             elif ppd:
-                attr = ppd.findAttr("Manufacturer")
-                if attr:
-                    mfr = attr.value
+                attr = ppd.findAttr("NickName")
+                if not attr:
+                    attr = ppd.findAttr("ModelName")
+
+                if attr.value:
+                    mfgmdl = cupshelpers.ppds.ppdMakeModelSplit (attr.value)
+                    (self.auto_make, self.auto_model) = mfgmdl
+
+                    # Search for ppdname with that make-and-model
+                    self.loadPPDs ()
+                    ppds = self.ppds.getInfoFromModel (self.auto_make,
+                                                       self.auto_model)
+                    for ppd, info in ppds.iteritems ():
+                        if info.get ("ppd-make-and-model") == attr.value:
+                            self.auto_driver = ppd
+                            break
                 else:
-                    mfr = ""
-                makeandmodel = mfr
-                attr = ppd.findAttr("ModelName")
-                if not attr: attr = ppd.findAttr("ShortNickName")
-                if not attr: attr = ppd.findAttr("NickName")
-                if attr:
-                    if attr.value.startswith(mfr):
-                        makeandmodel = attr.value
-                    else:
-                        makeandmodel += ' ' + attr.value
-                else:
-                    makeandmodel = ''
-
-                (self.auto_make,
-                 self.auto_model) = \
-                 cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
+                    self.auto_make = None
+                    self.auto_model = None
+                    self.auto_driver = None
             else:
                 # Special CUPS names for a raw queue.
                 self.auto_make = 'Generic'
                 self.auto_model = 'Raw Queue'
+                self.auto_driver = None
 
             try:
                 if self.dialog_mode == "ppd":
@@ -4249,6 +4252,8 @@ class NewPrinterGUI(GtkGUI):
         if self.openprinting_query_handle != None:
             self.openprinting.cancelOperation (self.openprinting_query_handle)
             self.openprinting_query_handle = None
+
+        self.device = None
         return True
 
     def on_btnNPBack_clicked(self, widget):
@@ -4267,6 +4272,7 @@ class NewPrinterGUI(GtkGUI):
             self.busy (self.NewPrinterWindow)
             if page_nr == 1: # Device (first page)
                 self.auto_make, self.auto_model = None, None
+                self.auto_driver = None
                 self.device.uri = self.getDeviceURI()
                 if not self.install_hplip_plugin(self.device.uri):
                     self.on_NPCancel(None)
@@ -4434,6 +4440,7 @@ class NewPrinterGUI(GtkGUI):
                             cupshelpers.ppds.ppdMakeModelSplit (make_model)
                         self.auto_make = make
                         self.auto_model = model
+                        self.auto_driver = ppdname
                         if (status == self.ppds.STATUS_SUCCESS and \
                             self.dialog_mode != "ppd"):
                             self.exactdrivermatch = True
@@ -6414,7 +6421,17 @@ class NewPrinterGUI(GtkGUI):
         ppds = self.ppds.getInfoFromModel(pmake, pmodel)
 
         self.NPDrivers = self.ppds.orderPPDNamesByPreference(ppds.keys(),
-                                             self.jockey_installed_files) 
+                                             self.jockey_installed_files)
+        if self.auto_driver and self.device:
+            drivers = []
+            for driver in self.NPDrivers:
+                if driver == self.auto_driver:
+                    drivers.insert (0, driver)
+                else:
+                    drivers.append (driver)
+
+            self.NPDrivers = drivers
+
         for i in range (len(self.NPDrivers)):
             ppd = ppds[self.NPDrivers[i]]
             driver = ppd["ppd-make-and-model"]
@@ -6426,7 +6443,12 @@ class NewPrinterGUI(GtkGUI):
             except KeyError:
                 pass
 
-            if i == 0:
+            if not self.device and self.auto_driver == self.NPDrivers[i]:
+                iter = model.append ((driver + _(" (Current)"),))
+                path = model.get_path (iter)
+                self.tvNPDrivers.get_selection().select_path(path)
+                self.tvNPDrivers.scroll_to_cell(path, None, True, 0.5, 0.0)
+            elif self.device and i == 0:
                 iter = model.append ((driver + _(" (recommended)"),))
                 path = model.get_path (iter)
                 self.tvNPDrivers.get_selection().select_path(path)
@@ -6881,6 +6903,7 @@ class NewPrinterGUI(GtkGUI):
                 checkppd = ppd
 
         self.NewPrinterWindow.hide()
+        self.device = None
         self.mainapp.populateList()
 
         # Now select it.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- system-config-printer.spec	23 Dec 2009 14:58:02 -0000	1.326
+++ system-config-printer.spec	23 Dec 2009 15:04:43 -0000	1.327
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-typo.patch
+Patch3: system-config-printer-driver-pre-selection.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -78,6 +79,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .typo
+%patch3 -p1 -b .driver-pre-selection
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -195,6 +197,7 @@ exit 0
 
 %changelog
 * Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Pre-select correct driver when adding or changing a queue (bug #550075).
 - Fixed typo (bug #550096).
 
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-1



From udushlivy at fedoraproject.org  Wed Dec 23 15:10:57 2009
From: udushlivy at fedoraproject.org (udushlivy)
Date: Wed, 23 Dec 2009 15:10:57 +0000 (UTC)
Subject: File poco-1.3.6-all-doc.tar.gz uploaded to lookaside cache by
	udushlivy
Message-ID: <20091223151057.DC7E510F8BF@bastion.fedoraproject.org>

A file has been added to the lookaside cache for poco:

a6abb9a02b0a7406194853d422d5fc28  poco-1.3.6-all-doc.tar.gz



From udushlivy at fedoraproject.org  Wed Dec 23 15:11:14 2009
From: udushlivy at fedoraproject.org (udushlivy)
Date: Wed, 23 Dec 2009 15:11:14 +0000 (UTC)
Subject: File poco-1.3.6p1-all.tar.bz2 uploaded to lookaside cache by udushlivy
Message-ID: <20091223151114.5F2D710F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for poco:

a03e5eb51b8ac3f57161645230750262  poco-1.3.6p1-all.tar.bz2



From udushlivy at fedoraproject.org  Wed Dec 23 15:11:58 2009
From: udushlivy at fedoraproject.org (udushlivy)
Date: Wed, 23 Dec 2009 15:11:58 +0000 (UTC)
Subject: rpms/poco/devel poco-1.3.6p1-syslibs.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 import.log, 1.1, 1.2 poco.spec, 1.1, 1.2 sources, 1.2,
	1.3 poco-1.3.5-syslibs.patch, 1.1, NONE
Message-ID: <20091223151158.762C911C00E6@cvs1.fedora.phx.redhat.com>

Author: udushlivy

Update of /cvs/pkgs/rpms/poco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv310/devel

Modified Files:
	.cvsignore import.log poco.spec sources 
Added Files:
	poco-1.3.6p1-syslibs.patch 
Removed Files:
	poco-1.3.5-syslibs.patch 
Log Message:
cvs-import, devel, 1.3.6p1-1

poco-1.3.6p1-syslibs.patch:
 Foundation/Makefile        |    1 -
 Foundation/src/Unicode.cpp |   41 ++++++++++++++++-------------------------
 Zip/src/ZipStream.cpp      |    2 +-
 3 files changed, 17 insertions(+), 27 deletions(-)

--- NEW FILE poco-1.3.6p1-syslibs.patch ---
diff -up poco-1.3.6p1-all/Foundation/Makefile.orig poco-1.3.6p1-all/Foundation/Makefile
--- poco-1.3.6p1-all/Foundation/Makefile.orig	2009-12-21 21:14:59.000000000 +0300
+++ poco-1.3.6p1-all/Foundation/Makefile	2009-12-23 14:35:20.457635607 +0300
@@ -43,7 +43,6 @@ pcre_objects = pcre_chartables pcre_comp
 pcre_utf8_objects = pcre_ucd pcre_tables
 
 ifdef POCO_UNBUNDLED
-	objects += $(pcre_utf8_objects) 
 	SYSLIBS += -lpcre -lz
 else
 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
diff -up poco-1.3.6p1-all/Foundation/src/Unicode.cpp.orig poco-1.3.6p1-all/Foundation/src/Unicode.cpp
--- poco-1.3.6p1-all/Foundation/src/Unicode.cpp.orig	2009-12-21 21:14:59.000000000 +0300
+++ poco-1.3.6p1-all/Foundation/src/Unicode.cpp	2009-12-23 14:27:26.168636009 +0300
@@ -37,56 +37,47 @@
 #include "Poco/Unicode.h"
 
 
-extern "C"
-{
-#include "pcre_config.h"
-#include "pcre_internal.h"
-}
+#include <wctype.h>
+#include <locale.h>
 
 
 namespace Poco {
 
 
-void Unicode::properties(int ch, CharacterProperties& props)
-{
-	const ucd_record* ucd = GET_UCD(ch);
-	props.category = static_cast<CharacterCategory>(_pcre_ucp_gentype[ucd->chartype]);
-	props.type     = static_cast<CharacterType>(ucd->chartype);
-	props.script   = static_cast<Script>(ucd->script);
+//void Unicode::properties(int ch, CharacterProperties& props)
+//{
+//}
+
+
+locale_t get_ctype_locale() {
+	static locale_t locale= NULL;
+	if(!locale)
+		locale= newlocale(LC_CTYPE_MASK, "en_US.UTF-8", NULL);
+	return locale;
 }
 
 	
 bool Unicode::isLower(int ch)
 {
-	CharacterProperties props;
-	properties(ch, props);
-	return props.category == UCP_LETTER && props.type == UCP_LOWER_CASE_LETTER;
+	return iswlower_l(ch, get_ctype_locale());
 }
 
 	
 bool Unicode::isUpper(int ch)
 {
-	CharacterProperties props;
-	properties(ch, props);
-	return props.category == UCP_LETTER && props.type == UCP_UPPER_CASE_LETTER;
+	return iswupper_l(ch, get_ctype_locale());
 }
 
 	
 int Unicode::toLower(int ch)
 {
-	if (isUpper(ch))
-		return static_cast<int>(UCD_OTHERCASE(static_cast<unsigned>(ch)));
-	else
-		return ch;
+	return towlower_l(ch, get_ctype_locale());
 }
 
 
 int Unicode::toUpper(int ch)
 {
-	if (isLower(ch))
-		return static_cast<int>(UCD_OTHERCASE(static_cast<unsigned>(ch)));
-	else
-		return ch;
+	return towupper_l(ch, get_ctype_locale());
 }
 
 
diff -up poco-1.3.6p1-all/Zip/src/ZipStream.cpp.orig poco-1.3.6p1-all/Zip/src/ZipStream.cpp
--- poco-1.3.6p1-all/Zip/src/ZipStream.cpp.orig	2009-12-21 21:15:03.000000000 +0300
+++ poco-1.3.6p1-all/Zip/src/ZipStream.cpp	2009-12-23 14:54:03.101635883 +0300
@@ -35,7 +35,7 @@
 
 
 #include "Poco/Zip/ZipStream.h"
-#include "Poco/zlib.h"
+#include <zlib.h>
 #include "Poco/Zip/ZipArchive.h"
 #include "Poco/Zip/AutoDetectStream.h"
 #include "Poco/Zip/PartialStream.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Nov 2009 13:38:10 -0000	1.2
+++ .cvsignore	23 Dec 2009 15:11:56 -0000	1.3
@@ -1,2 +1,2 @@
-poco-1.3.5-all.tar.bz2
-poco-1.3.5-doc.tar.gz
+poco-1.3.6-all-doc.tar.gz
+poco-1.3.6p1-all.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Nov 2009 13:38:10 -0000	1.1
+++ import.log	23 Dec 2009 15:11:57 -0000	1.2
@@ -1 +1,2 @@
 poco-1_3_5-8_fc12:HEAD:poco-1.3.5-8.fc12.src.rpm:1259328377
+poco-1_3_6p1-1_fc12:HEAD:poco-1.3.6p1-1.fc12.src.rpm:1261581073


Index: poco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/poco.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- poco.spec	27 Nov 2009 13:38:10 -0000	1.1
+++ poco.spec	23 Dec 2009 15:11:57 -0000	1.2
@@ -1,7 +1,11 @@
 
+%define poco_src_version 1.3.6p1
+%define poco_doc_version 1.3.6
+%define poco_rpm_release 1
+
 Name:             poco
-Version:          1.3.5
-Release:          8%{?dist}
+Version:          %{poco_src_version}
+Release:          %{poco_rpm_release}%{?dist}
 Summary:          C++ class libraries for network-centric applications
 
 Group:            Development/Libraries
@@ -9,11 +13,11 @@ License:          Boost
 URL:              http://pocoproject.org
 
 Source0:          http://downloads.sourceforge.net/poco/poco-%{version}-all.tar.bz2
-Source1:          http://downloads.sourceforge.net/poco/poco-%{version}-doc.tar.gz
+Source1:          http://downloads.sourceforge.net/poco/poco-%{poco_doc_version}-all-doc.tar.gz
 
 # This patch updates makefiles and sources in order to exclude the 
 # bundled versions of the system libraries from the build process.
-Patch0:           poco-1.3.5-syslibs.patch
+Patch0:           poco-1.3.6p1-syslibs.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,11 +38,11 @@ including the standard library.
 
 %prep
 %setup -q -n poco-%{version}-all -a1
-/bin/chmod -R a-x+X poco-%{version}-doc
+/bin/chmod -R a-x+X poco-%{poco_doc_version}-all-doc
 /bin/sed -i.orig -e 's|$(INSTALLDIR)/lib\b|$(INSTALLDIR)/%{_lib}|g' Makefile
 /bin/sed -i.orig -e 's|ODBCLIBDIR = /usr/lib\b|ODBCLIBDIR = %{_libdir}|g' Data/ODBC/Makefile Data/ODBC/testsuite/Makefile
 /bin/sed -i.orig -e 's|flags=""|flags="%{optflags}"|g' configure
-rm -f Crypto/include/Poco/.*DS_Store
+/bin/sed -i.orig -e 's|SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)|SHAREDOPT_LINK  =|g' build/config/Linux
 rm -f Foundation/src/MSG00001.bin
 %patch0 -p1 -b .orig
 rm -f Foundation/include/Poco/zconf.h
@@ -87,7 +91,7 @@ rm -f XML/src/xmltok_impl.h
 rm -f XML/src/xmltok_ns.c
 
 %build
-%configure --include-path=%{_includedir}/libiodbc --library-path=%{_libdir}/mysql
+%configure --unbundled --include-path=%{_includedir}/libiodbc --library-path=%{_libdir}/mysql
 make %{?_smp_mflags} STRIP=/bin/true
 
 %install
@@ -273,6 +277,18 @@ class libraries for network-centric appl
 %defattr(-, root, root, -)
 %{_libdir}/libPocoZip.so.*
 
+%package          pagecompiler
+Summary:          The PageCompiler POCO component
+Group:            System Environment/Libraries
+
+%description pagecompiler
+This package contains the PageCompiler component of POCO. (POCO is a 
+set of C++ class libraries for network-centric applications.)
+
+%files pagecompiler
+%defattr(-, root, root, -)
+%{_bindir}/cpspc
+
 %package          debug
 Summary:          Debug builds of the POCO libraries
 Group:            Development/Libraries
@@ -298,6 +314,7 @@ application testing purposes.
 %{_libdir}/libPocoODBCd.so.*
 %{_libdir}/libPocoMySQLd.so.*
 %{_libdir}/libPocoZipd.so.*
+%{_bindir}/cpspcd
 
 %package          devel
 Summary:          Headers for developing programs that will use POCO
@@ -315,6 +332,7 @@ Requires:         poco-sqlite = %{versio
 Requires:         poco-odbc = %{version}-%{release}
 Requires:         poco-mysql = %{version}-%{release}
 Requires:         poco-zip = %{version}-%{release}
+Requires:         poco-pagecompiler = %{version}-%{release}
 
 %description devel
 The POCO C++ Libraries (POCO stands for POrtable COmponents) 
@@ -369,9 +387,17 @@ HTML format.
 
 %files doc
 %defattr(-, root, root, -)
-%doc poco-%{version}-doc/*
+%doc poco-%{poco_doc_version}-all-doc/*
 
 %changelog
+* Wed Dec 23 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.6p1-1
+- The package was upgraded for the use of POCO version 1.3.6p1.
+- A new binary package (poco-pagecompiler) is now produced by the 
+rpmbuild process.
+- The syslibs patch was considerably simplified (based on a new 
+"configure" script option which was introduced by POCO developers for 
+the maintainers of the POCO Debian package).
+
 * Tue Nov 17 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-8
 - The "make" invocation command in the %%build section was modified to 
 skip premature symbol stripping from retail libraries.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Nov 2009 13:38:10 -0000	1.2
+++ sources	23 Dec 2009 15:11:57 -0000	1.3
@@ -1,2 +1,2 @@
-b36fc66e39560dd985d4ae4bc8011be8  poco-1.3.5-all.tar.bz2
-357fbbb4f31921ebe7dc49a1b6b5742c  poco-1.3.5-doc.tar.gz
+a6abb9a02b0a7406194853d422d5fc28  poco-1.3.6-all-doc.tar.gz
+a03e5eb51b8ac3f57161645230750262  poco-1.3.6p1-all.tar.bz2


--- poco-1.3.5-syslibs.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Dec 23 15:12:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 15:12:00 +0000
Subject: [pkgdb] cvsps ownership updated
Message-ID: <20091223151200.242E810F8CB@bastion.fedoraproject.org>

Package cvsps in Fedora 7 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsps



From pkgdb at fedoraproject.org  Wed Dec 23 15:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 15:12:02 +0000
Subject: [pkgdb] cvsps ownership updated
Message-ID: <20091223151202.E837F10F8BF@bastion.fedoraproject.org>

Package cvsps in Fedora 4 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsps



From pkgdb at fedoraproject.org  Wed Dec 23 15:12:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 15:12:17 +0000
Subject: [pkgdb] cvsps ownership updated
Message-ID: <20091223151203.DAE4C10F8BF@bastion.fedoraproject.org>

Package cvsps in Fedora 3 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsps



From pkgdb at fedoraproject.org  Wed Dec 23 15:12:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 15:12:05 +0000
Subject: [pkgdb] cvsps ownership updated
Message-ID: <20091223151204.BE69410F8BC@bastion.fedoraproject.org>

Package cvsps in Fedora 5 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsps



From pkgdb at fedoraproject.org  Wed Dec 23 15:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 15:12:06 +0000
Subject: [pkgdb] cvsps ownership updated
Message-ID: <20091223151206.00F4910F8CB@bastion.fedoraproject.org>

Package cvsps in Fedora 6 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsps



From pkgdb at fedoraproject.org  Wed Dec 23 15:12:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 15:12:09 +0000
Subject: [pkgdb] cvsps ownership updated
Message-ID: <20091223151209.C26E310F8BC@bastion.fedoraproject.org>

Package cvsps in Fedora 8 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsps



From pkgdb at fedoraproject.org  Wed Dec 23 15:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 15:12:16 +0000
Subject: [pkgdb] cvsps ownership updated
Message-ID: <20091223151216.0168B10F8CB@bastion.fedoraproject.org>

Package cvsps in Fedora 9 is now owned by salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsps



From pkgdb at fedoraproject.org  Wed Dec 23 15:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 15:12:16 +0000
Subject: [pkgdb] cvsps ownership updated
Message-ID: <20091223151216.AF38810F8D4@bastion.fedoraproject.org>

Package cvsps in Fedora 10 is now owned by salimma

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsps



From mtasaka at fedoraproject.org  Wed Dec 23 15:16:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 23 Dec 2009 15:16:01 +0000 (UTC)
Subject: File uget-1.5.0.1.tar.gz uploaded to lookaside cache by mtasaka
Message-ID: <20091223151601.77B9710F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for uget:

707ebf0d45d1b670194b262bbad6704f  uget-1.5.0.1.tar.gz



From mtasaka at fedoraproject.org  Wed Dec 23 15:17:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 23 Dec 2009 15:17:14 +0000 (UTC)
Subject: rpms/uget/F-11 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 uget.spec, 
	1.13, 1.14
Message-ID: <20091223151714.4AC8911C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/uget/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1579/F-11

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0.1-1
- 1.5.0.1 (which should fix bug 546289)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Oct 2009 09:12:02 -0000	1.12
+++ .cvsignore	23 Dec 2009 15:17:14 -0000	1.13
@@ -1 +1 @@
-uget-1.5.0.tar.gz
+uget-1.5.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Oct 2009 09:12:02 -0000	1.12
+++ sources	23 Dec 2009 15:17:14 -0000	1.13
@@ -1 +1 @@
-abfb0b31fbcd5d821872d621e3619536  uget-1.5.0.tar.gz
+707ebf0d45d1b670194b262bbad6704f  uget-1.5.0.1.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/uget.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- uget.spec	2 Oct 2009 09:12:02 -0000	1.13
+++ uget.spec	23 Dec 2009 15:17:14 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.5.0
+Version:	1.5.0.1
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -16,11 +16,8 @@ BuildRequires:	intltool
 BuildRequires:	libcurl-devel
 BuildRequires:	libnotify-devel
 
-%if 0%{?fedora} >= 11
-# Let's obsolete urlgfe on F-11+
 Obsoletes:	urlgfe < 1.0.4
 Provides:	urlgfe = %{name}-%{version}
-%endif
 
 %description
 Uget is a download manager that allows you to import downloads
@@ -78,7 +75,10 @@ exit 0
 %{_datadir}/sounds/%{name}/
 
 %changelog
-* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0.1-1
+- 1.5.0.1 (which should fix bug 546289)
+
+* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0-1
 - 1.5.0
 
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1



From mtasaka at fedoraproject.org  Wed Dec 23 15:17:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 23 Dec 2009 15:17:14 +0000 (UTC)
Subject: rpms/uget/F-12 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 uget.spec, 
	1.15, 1.16
Message-ID: <20091223151714.8904011C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/uget/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1579/F-12

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0.1-1
- 1.5.0.1 (which should fix bug 546289)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Oct 2009 09:12:02 -0000	1.12
+++ .cvsignore	23 Dec 2009 15:17:14 -0000	1.13
@@ -1 +1 @@
-uget-1.5.0.tar.gz
+uget-1.5.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Oct 2009 09:12:02 -0000	1.12
+++ sources	23 Dec 2009 15:17:14 -0000	1.13
@@ -1 +1 @@
-abfb0b31fbcd5d821872d621e3619536  uget-1.5.0.tar.gz
+707ebf0d45d1b670194b262bbad6704f  uget-1.5.0.1.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-12/uget.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- uget.spec	2 Oct 2009 09:12:02 -0000	1.15
+++ uget.spec	23 Dec 2009 15:17:14 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.5.0
+Version:	1.5.0.1
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -16,11 +16,8 @@ BuildRequires:	intltool
 BuildRequires:	libcurl-devel
 BuildRequires:	libnotify-devel
 
-%if 0%{?fedora} >= 11
-# Let's obsolete urlgfe on F-11+
 Obsoletes:	urlgfe < 1.0.4
 Provides:	urlgfe = %{name}-%{version}
-%endif
 
 %description
 Uget is a download manager that allows you to import downloads
@@ -78,7 +75,10 @@ exit 0
 %{_datadir}/sounds/%{name}/
 
 %changelog
-* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0.1-1
+- 1.5.0.1 (which should fix bug 546289)
+
+* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0-1
 - 1.5.0
 
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1



From mtasaka at fedoraproject.org  Wed Dec 23 15:17:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 23 Dec 2009 15:17:14 +0000 (UTC)
Subject: rpms/uget/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 uget.spec, 
	1.15, 1.16
Message-ID: <20091223151714.CA4EA11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/uget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1579/devel

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0.1-1
- 1.5.0.1 (which should fix bug 546289)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Oct 2009 09:12:02 -0000	1.12
+++ .cvsignore	23 Dec 2009 15:17:14 -0000	1.13
@@ -1 +1 @@
-uget-1.5.0.tar.gz
+uget-1.5.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Oct 2009 09:12:02 -0000	1.12
+++ sources	23 Dec 2009 15:17:14 -0000	1.13
@@ -1 +1 @@
-abfb0b31fbcd5d821872d621e3619536  uget-1.5.0.tar.gz
+707ebf0d45d1b670194b262bbad6704f  uget-1.5.0.1.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/uget.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- uget.spec	2 Oct 2009 09:12:02 -0000	1.15
+++ uget.spec	23 Dec 2009 15:17:14 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.5.0
+Version:	1.5.0.1
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -16,11 +16,8 @@ BuildRequires:	intltool
 BuildRequires:	libcurl-devel
 BuildRequires:	libnotify-devel
 
-%if 0%{?fedora} >= 11
-# Let's obsolete urlgfe on F-11+
 Obsoletes:	urlgfe < 1.0.4
 Provides:	urlgfe = %{name}-%{version}
-%endif
 
 %description
 Uget is a download manager that allows you to import downloads
@@ -78,7 +75,10 @@ exit 0
 %{_datadir}/sounds/%{name}/
 
 %changelog
-* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
+* Wed Dec 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0.1-1
+- 1.5.0.1 (which should fix bug 546289)
+
+* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0-1
 - 1.5.0
 
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1



From scop at fedoraproject.org  Wed Dec 23 15:19:03 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 23 Dec 2009 15:19:03 +0000 (UTC)
Subject: rpms/cvsps/F-12 cvsps-2.2b1-diff-opts.patch, NONE, 1.1 cvsps.spec,
	1.11, 1.12
Message-ID: <20091223151903.3E64011C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cvsps/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2137/F-12

Modified Files:
	cvsps.spec 
Added Files:
	cvsps-2.2b1-diff-opts.patch 
Log Message:
* Tue Dec 22 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.5.b1
- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
- Use patch instead of sed for man page fixes.


cvsps-2.2b1-diff-opts.patch:
 cvsps.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cvsps-2.2b1-diff-opts.patch ---
diff -up cvsps-2.2b1/cvsps.1.orig cvsps-2.2b1/cvsps.1
--- cvsps-2.2b1/cvsps.1.orig	2009-12-22 21:16:20.000000000 +0200
+++ cvsps-2.2b1/cvsps.1	2009-12-22 21:16:25.000000000 +0200
@@ -83,7 +83,7 @@ some hacks which are not generally appli
 disable the use of rlog internally.  Note: rlog is
 required for stable PatchSet numbering.  Use with care.
 .TP
-.B \-\-diffs\-opts <option string>
+.B \-\-diff\-opts <option string>
 send a custom set of options to diff, for example to increase
 the number of context lines, or change the diff format.
 .TP


Index: cvsps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsps/F-12/cvsps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- cvsps.spec	6 Aug 2009 18:41:58 -0000	1.11
+++ cvsps.spec	23 Dec 2009 15:19:03 -0000	1.12
@@ -2,20 +2,22 @@
 
 Name:           cvsps
 Version:        2.2
-Release:        0.4.%{prever}%{?dist}
+Release:        0.5.%{prever}%{?dist}
 Summary:        Patchset tool for CVS
 
 Group:          Development/Tools
 License:        GPL+
 URL:            http://www.cobite.com/cvsps/
 Source0:        http://www.cobite.com/cvsps/%{name}-%{version}%{prever}.tar.gz
-# #516083
+# https://bugzilla.redhat.com/516083
 Patch0:         %{name}-2.2b1-dynamic-logbuf.patch
+Patch1:         %{name}-2.2b1-diff-opts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
-# Requires cvs only with --no-cvs-direct, but I cannot imagine this dep
-# being a problem on systems where cvsps will be installed...
+# Strictly speaking, requires cvs only with --no-cvs-direct (which is
+# the default as of 2.2b1), but this shouldn't be a problem on systems
+# where cvsps will be installed.
 Requires(hint): cvs
 
 %description
@@ -31,11 +33,11 @@ changes were committed 'atomically' to t
 %prep
 %setup -q -n %{name}-%{version}%{prever}
 %patch0 -p1
-sed -i -e 's/diffs\\-opts/diff\\-opts/' cvsps.1
+%patch1 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS -DLINUX" make %{?_smp_mflags}
 
 
 %install
@@ -55,7 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
+* Tue Dec 22 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.5.b1
+- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
+- Use patch instead of sed for man page fixes.
+
+* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
 - Apply David D. Kilzer's dynamic log buffer allocation patch (#516083,
   Andreas Schwab).
 - Use %%global instead of %%define.
@@ -66,30 +72,30 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.2.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jun 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.1.b1
+* Sat Jun 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.1.b1
 - 2.2b1.
 
-* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.1-6
+* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.1-6
 - Change cvs dependency to a Requires(hint).
 - Fix typo in man page.
 
-* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1-5
+* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1-5
 - License: GPL+
 
-* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-4
+* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-4
 - Rebuild.
 
-* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-3
+* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-3
 - Rebuild.
 
-* Fri May 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.1-2
+* Fri May 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.1-2
 - 2.1.
 
-* Sun Mar 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.0-0.2.rc1
+* Sun Mar 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.0-0.2.rc1
 - Drop 0.fdr and Epoch: 0.
 
-* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
+* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
 - Remove #---- section markers.
 
-* Fri Jul  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
+* Fri Jul  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
 - First build.



From scop at fedoraproject.org  Wed Dec 23 15:19:02 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 23 Dec 2009 15:19:02 +0000 (UTC)
Subject: rpms/cvsps/F-11 cvsps-2.2b1-diff-opts.patch, NONE, 1.1 cvsps.spec,
	1.10, 1.11
Message-ID: <20091223151902.EDEB611C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cvsps/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2137/F-11

Modified Files:
	cvsps.spec 
Added Files:
	cvsps-2.2b1-diff-opts.patch 
Log Message:
* Tue Dec 22 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.5.b1
- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
- Use patch instead of sed for man page fixes.


cvsps-2.2b1-diff-opts.patch:
 cvsps.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cvsps-2.2b1-diff-opts.patch ---
diff -up cvsps-2.2b1/cvsps.1.orig cvsps-2.2b1/cvsps.1
--- cvsps-2.2b1/cvsps.1.orig	2009-12-22 21:16:20.000000000 +0200
+++ cvsps-2.2b1/cvsps.1	2009-12-22 21:16:25.000000000 +0200
@@ -83,7 +83,7 @@ some hacks which are not generally appli
 disable the use of rlog internally.  Note: rlog is
 required for stable PatchSet numbering.  Use with care.
 .TP
-.B \-\-diffs\-opts <option string>
+.B \-\-diff\-opts <option string>
 send a custom set of options to diff, for example to increase
 the number of context lines, or change the diff format.
 .TP


Index: cvsps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsps/F-11/cvsps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cvsps.spec	6 Aug 2009 19:01:57 -0000	1.10
+++ cvsps.spec	23 Dec 2009 15:19:02 -0000	1.11
@@ -2,20 +2,22 @@
 
 Name:           cvsps
 Version:        2.2
-Release:        0.4.%{prever}%{?dist}
+Release:        0.5.%{prever}%{?dist}
 Summary:        Patchset tool for CVS
 
 Group:          Development/Tools
 License:        GPL+
 URL:            http://www.cobite.com/cvsps/
 Source0:        http://www.cobite.com/cvsps/%{name}-%{version}%{prever}.tar.gz
-# #516083
+# https://bugzilla.redhat.com/516083
 Patch0:         %{name}-2.2b1-dynamic-logbuf.patch
+Patch1:         %{name}-2.2b1-diff-opts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
-# Requires cvs only with --no-cvs-direct, but I cannot imagine this dep
-# being a problem on systems where cvsps will be installed...
+# Strictly speaking, requires cvs only with --no-cvs-direct (which is
+# the default as of 2.2b1), but this shouldn't be a problem on systems
+# where cvsps will be installed.
 Requires(hint): cvs
 
 %description
@@ -31,11 +33,11 @@ changes were committed 'atomically' to t
 %prep
 %setup -q -n %{name}-%{version}%{prever}
 %patch0 -p1
-sed -i -e 's/diffs\\-opts/diff\\-opts/' cvsps.1
+%patch1 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS -DLINUX" make %{?_smp_mflags}
 
 
 %install
@@ -55,7 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
+* Tue Dec 22 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.5.b1
+- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
+- Use patch instead of sed for man page fixes.
+
+* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
 - Apply David D. Kilzer's dynamic log buffer allocation patch (#516083,
   Andreas Schwab).
 - Use %%global instead of %%define.
@@ -66,30 +72,30 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.2.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jun 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.1.b1
+* Sat Jun 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.1.b1
 - 2.2b1.
 
-* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.1-6
+* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.1-6
 - Change cvs dependency to a Requires(hint).
 - Fix typo in man page.
 
-* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1-5
+* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1-5
 - License: GPL+
 
-* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-4
+* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-4
 - Rebuild.
 
-* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-3
+* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-3
 - Rebuild.
 
-* Fri May 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.1-2
+* Fri May 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.1-2
 - 2.1.
 
-* Sun Mar 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.0-0.2.rc1
+* Sun Mar 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.0-0.2.rc1
 - Drop 0.fdr and Epoch: 0.
 
-* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
+* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
 - Remove #---- section markers.
 
-* Fri Jul  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
+* Fri Jul  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
 - First build.



From toshio at fedoraproject.org  Wed Dec 23 15:22:05 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 23 Dec 2009 15:22:05 +0000 (UTC)
Subject: rpms/transifex/devel transifex.spec,1.13,1.14
Message-ID: <20091223152205.37D9B11C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/transifex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30772

Modified Files:
	transifex.spec 
Log Message:

* Wed Dec 23 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.3-4
- BR python-sqlite2 in EPEL.



Index: transifex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transifex/devel/transifex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- transifex.spec	22 Dec 2009 18:02:00 -0000	1.13
+++ transifex.spec	23 Dec 2009 15:22:05 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:       transifex
 Version:    0.7.3
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
@@ -19,6 +19,9 @@ BuildRequires:  Django django-contact-fo
 BuildRequires:  django-notification django-profile Django-south django-piston
 BuildRequires:  django-authority 
 #BuildRequires:  django-authority django-filter django-sorting
+%if 0%{?rhel} <= 5
+BuildRequires: python-sqlite2
+%endif
 
 Requires:   mercurial >= 1.3 python-urlgrabber intltool >= 0.37.1
 Requires:   python-markdown python-pygments python-polib >= 0.4.2
@@ -201,6 +204,9 @@ fi
 %dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
 
 %changelog
+* Wed Dec 23 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.3-4
+- BR python-sqlite2 in EPEL.
+
 * Tue Dec 22 2009 Diego B?rigo Zacar?o <diegobz at indifex.com> - 0.7.3-3
 - Django-south seems to raise a specific NotImplementedError exception 
   for some migration operations using SQLite. Dropped database creation. 



From tbzatek at fedoraproject.org  Wed Dec 23 15:23:45 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 23 Dec 2009 15:23:45 +0000 (UTC)
Subject: rpms/tuxcmd/F-12 tuxcmd-0.6.72-copy-same-source-target.patch, NONE,
	1.1 tuxcmd.spec, 1.18, 1.19
Message-ID: <20091223152345.2F18E11C00E6@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3225

Modified Files:
	tuxcmd.spec 
Added Files:
	tuxcmd-0.6.72-copy-same-source-target.patch 
Log Message:
* Wed Dec 23 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091027.2
- Don't prevent copying files when src == dest across different engines


tuxcmd-0.6.72-copy-same-source-target.patch:
 UCore.pas |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tuxcmd-0.6.72-copy-same-source-target.patch ---
>From 9e4a6521a9ea3310437962d6708cf814fafc70d1 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Thu, 19 Nov 2009 17:57:32 +0100
Subject: [PATCH] Don't prevent copying files when src == dest across different engines

This is really weird test, probably leftover from non-VFS era.
The whole copy operation needs rewrite, just another reason.
---
 UCore.pas |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/UCore.pas b/UCore.pas
index 89af1a2..b812ca0 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -1357,7 +1357,8 @@ begin
           ErrorHappened := True;
           Break;
         end;
-        if s <> string(PDataItemSL(List[i])^.FName) then
+// * FIXME: why the hell we had something like this here??
+//      if s <> string(PDataItemSL(List[i])^.FName) then
           if not HandleCopy(List[i], s) then begin
             ErrorHappened := True;
             Break;
-- 
1.6.5.5



Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/F-12/tuxcmd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- tuxcmd.spec	27 Oct 2009 10:27:01 -0000	1.18
+++ tuxcmd.spec	23 Dec 2009 15:23:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.69
-Release:        git20091027.1%{?dist}
+Release:        git20091027.2%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -23,6 +23,9 @@ BuildRequires: desktop-file-utils
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
+# from upstream
+Patch5: tuxcmd-0.6.72-copy-same-source-target.patch
+
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -61,6 +64,7 @@ This package contains networking GVFS mo
 %setup -q -b 1
 
 %patch4 -p1 -b .disable-smartlinking
+%patch5 -p1 -b .copy-equal-src-target
 
 %build
 
@@ -135,6 +139,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091027.2
+- Don't prevent copying files when src == dest across different engines
+
 * Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091027.1
 - Rebase to latest git
 - Enable PowerPC architectures



From scop at fedoraproject.org  Wed Dec 23 15:25:44 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 23 Dec 2009 15:25:44 +0000 (UTC)
Subject: rpms/cvsps/EL-5 cvsps-2.2b1-diff-opts.patch, NONE, 1.1 cvsps.spec, 1.6,
	1.7
Message-ID: <20091223152544.C222111C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cvsps/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3666

Modified Files:
	cvsps.spec 
Added Files:
	cvsps-2.2b1-diff-opts.patch 
Log Message:
* Wed Dec 23 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1-7
- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
- Fix typo in man page.


cvsps-2.2b1-diff-opts.patch:
 cvsps.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cvsps-2.2b1-diff-opts.patch ---
diff -up cvsps-2.2b1/cvsps.1.orig cvsps-2.2b1/cvsps.1
--- cvsps-2.2b1/cvsps.1.orig	2009-12-22 21:16:20.000000000 +0200
+++ cvsps-2.2b1/cvsps.1	2009-12-22 21:16:25.000000000 +0200
@@ -83,7 +83,7 @@ some hacks which are not generally appli
 disable the use of rlog internally.  Note: rlog is
 required for stable PatchSet numbering.  Use with care.
 .TP
-.B \-\-diffs\-opts <option string>
+.B \-\-diff\-opts <option string>
 send a custom set of options to diff, for example to increase
 the number of context lines, or change the diff format.
 .TP


Index: cvsps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsps/EL-5/cvsps.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cvsps.spec	27 Aug 2007 18:04:50 -0000	1.6
+++ cvsps.spec	23 Dec 2009 15:25:44 -0000	1.7
@@ -1,17 +1,19 @@
 Name:           cvsps
 Version:        2.1
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Patchset tool for CVS
 
 Group:          Development/Tools
 License:        GPL+
 URL:            http://www.cobite.com/cvsps/
 Source0:        http://www.cobite.com/cvsps/%{name}-%{version}.tar.gz
+Patch1:         %{name}-2.2b1-diff-opts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
-# Requires cvs only with --no-cvs-direct, but I cannot imagine this dep
-# being a problem on systems where cvsps will be installed...
+# Strictly speaking, requires cvs only with --no-cvs-direct (which is
+# the default as of 2.1), but this shouldn't be a problem on systems
+# where cvsps will be installed.
 Requires:       cvs
 
 %description
@@ -26,16 +28,16 @@ changes were committed 'atomically' to t
 
 %prep
 %setup -q
+%patch1 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS -DLINUX" make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 cvsps $RPM_BUILD_ROOT%{_bindir}/cvsps
-install -Dpm 644 cvsps.1 $RPM_BUILD_ROOT%{_mandir}/man1/cvsps.1
+make install prefix=$RPM_BUILD_ROOT%{_prefix}
 
 
 %clean
@@ -50,23 +52,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1-5
+* Wed Dec 23 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1-7
+- Build with -DLINUX to fix --cvs-direct on 64-bit platforms (#539765).
+- Fix typo in man page.
+
+* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.1-5
 - License: GPL+
 
-* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-4
+* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-4
 - Rebuild.
 
-* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-3
+* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.1-3
 - Rebuild.
 
-* Fri May 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.1-2
+* Fri May 27 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.1-2
 - 2.1.
 
-* Sun Mar 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.0-0.2.rc1
+* Sun Mar 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.0-0.2.rc1
 - Drop 0.fdr and Epoch: 0.
 
-* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
+* Sun Sep 14 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.2.rc1
 - Remove #---- section markers.
 
-* Fri Jul  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
+* Fri Jul  4 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.0-0.fdr.0.1.rc1
 - First build.



From veillard at fedoraproject.org  Wed Dec 23 15:32:43 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 23 Dec 2009 15:32:43 +0000 (UTC)
Subject: File libvirt-0.7.5.tar.gz uploaded to lookaside cache by veillard
Message-ID: <20091223153243.59FE310F8BC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libvirt:

06eedba78d4848cede7ab1a6e48f6df9  libvirt-0.7.5.tar.gz



From veillard at fedoraproject.org  Wed Dec 23 15:40:22 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 23 Dec 2009 15:40:22 +0000 (UTC)
Subject: rpms/libvirt/devel .cvsignore, 1.50, 1.51 libvirt.spec, 1.201,
	1.202 sources, 1.52, 1.53
Message-ID: <20091223154022.1D4A611C00E6@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6037

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Upstream release of 0.7.5, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	20 Nov 2009 18:59:17 -0000	1.50
+++ .cvsignore	23 Dec 2009 15:40:21 -0000	1.51
@@ -14,3 +14,4 @@ libvirt-0.7.1.tar.gz
 libvirt-0.7.2.tar.gz
 libvirt-0.7.3.tar.gz
 libvirt-0.7.4.tar.gz
+libvirt-0.7.5.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- libvirt.spec	20 Nov 2009 18:59:18 -0000	1.201
+++ libvirt.spec	23 Dec 2009 15:40:21 -0000	1.202
@@ -60,6 +60,7 @@
 %define with_netcf         0%{!?_without_netcf:0}
 %define with_udev          0%{!?_without_udev:0}
 %define with_hal           0%{!?_without_hal:0}
+%define with_yajl          0%{!?_without_yajl:0}
 
 # Non-server/HV driver defaults which are always enabled
 %define with_python        0%{!?_without_python:1}
@@ -141,6 +142,11 @@
 %define with_hal       0%{!?_without_hal:%{server_drivers}}
 %endif
 
+# Enable yajl library for JSON mode with QEMU
+%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
+%define with_yajl     0%{!?_without_yajl:%{server_drivers}}
+%endif
+
 # Force QEMU to run as non-root
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %define qemu_user  qemu
@@ -162,7 +168,7 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.7.4
+Version: 0.7.5
 Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
@@ -257,6 +263,9 @@ BuildRequires: hal-devel
 BuildRequires: libudev-devel >= 145
 BuildRequires: libpciaccess-devel >= 0.10.9
 %endif
+%if %{with_yajl}
+BuildRequires: yajl-devel
+%endif
 %if %{with_avahi}
 BuildRequires: avahi-devel
 %endif
@@ -495,6 +504,10 @@ of recent versions of Linux (and other O
 %define _without_udev --without-udev
 %endif
 
+%if ! %{with_yajl}
+%define _without_yajl --without-yajl
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -522,6 +535,7 @@ of recent versions of Linux (and other O
            %{?_without_selinux} \
            %{?_without_hal} \
            %{?_without_udev} \
+           %{?_without_yajl} \
            --with-qemu-user=%{qemu_user} \
            --with-qemu-group=%{qemu_group} \
            --with-init-script=redhat \
@@ -763,6 +777,8 @@ fi
 %{_datadir}/libvirt/schemas/secret.rng
 %{_datadir}/libvirt/schemas/storageencryption.rng
 
+%{_datadir}/libvirt/cpu_map.xml
+
 %if %{with_sasl}
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 %endif
@@ -802,6 +818,13 @@ fi
 %endif
 
 %changelog
+* Wed Dec 23 2009 Daniel Veillard <veillard at redhat.com> - 0.7.5-1
+- Add new API virDomainMemoryStats
+- Public API and domain extension for CPU flags
+- vbox: Add support for version 3.1
+- Support QEMU's virtual FAT block device driver
+- a lot of fixes
+
 * Fri Nov 20 2009 Daniel Veillard <veillard at redhat.com> - 0.7.4-1
 - upstream release of 0.7.4
 - udev node device backend


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	20 Nov 2009 18:59:18 -0000	1.52
+++ sources	23 Dec 2009 15:40:21 -0000	1.53
@@ -1 +1 @@
-1645975662a326969d2f42d5c04574aa  libvirt-0.7.4.tar.gz
+06eedba78d4848cede7ab1a6e48f6df9  libvirt-0.7.5.tar.gz



From veillard at fedoraproject.org  Wed Dec 23 15:56:25 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 23 Dec 2009 15:56:25 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.202,1.203
Message-ID: <20091223155625.E2ABC11C00E6@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8263

Modified Files:
	libvirt.spec 
Log Message:
Fix a problem in spec file, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- libvirt.spec	23 Dec 2009 15:40:21 -0000	1.202
+++ libvirt.spec	23 Dec 2009 15:56:25 -0000	1.203
@@ -710,9 +710,6 @@ fi
 %if %{with_network}
 %dir %{_localstatedir}/run/libvirt/network/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
 %endif
 
 %if %{with_qemu}



From twaugh at fedoraproject.org  Wed Dec 23 16:15:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 16:15:22 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-foomatic-recommended.patch, NONE,
	1.1 system-config-printer.spec, 1.319, 1.320
Message-ID: <20091223161522.AE0CF11C025E@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10708

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-foomatic-recommended.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Prefer foomatic-recommended drivers (bug #550108).


system-config-printer-foomatic-recommended.patch:
 ppds.py |   27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-foomatic-recommended.patch ---
diff -up system-config-printer-1.1.16/cupshelpers/ppds.py.foomatic-recommended system-config-printer-1.1.16/cupshelpers/ppds.py
--- system-config-printer-1.1.16/cupshelpers/ppds.py.foomatic-recommended	2009-12-22 14:27:37.000000000 +0000
+++ system-config-printer-1.1.16/cupshelpers/ppds.py	2009-12-23 16:13:13.234214808 +0000
@@ -248,14 +248,25 @@ def _getDriverType (ppdname, ppds=None):
         # Foomatic (generated) -- but which driver?
         if ppdname.find ("Generic")!= -1:
             return DRIVER_TYPE_FOOMATIC_GENERIC
-        if (ppds != None and
-            ppds.getInfoFromPPDName (ppdname).\
-            get ('ppd-make-and-model', '').find ("(recommended)") != -1):
-            if ppds.getInfoFromPPDName (ppdname).\
-               get ('ppd-make-and-model', '').find ("Postscript") != -1:
-                return DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT
-            else:
-                return DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT
+        if ppds != None:
+            info = ppds.getInfoFromPPDName (ppdname)
+            device_id = info.get ('ppd-device-id', '')
+            id_dict = parseDeviceID (device_id)
+            drv = id_dict.get ('DRV', '')
+            drvfields = dict()
+            for field in drv.split (','):
+                if len (field) == 0:
+                    continue
+                key = field[0]
+                drvfields[key] = field[1:]
+
+            ppd_make_and_model = info.get ('ppd-make-and-model', '')
+            if (drvfields.get ('R', '0') == '1' or
+                ppd_make_and_model.find ("(recommended)") != -1):
+                if ppd_make_and_model.find ("Postscript") != -1:
+                    return DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT
+                else:
+                    return DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT
         if ppdname.find ("-Postscript")!= -1:
             return DRIVER_TYPE_FOOMATIC_PS
         if ppdname.find ("-hpijs") != -1:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- system-config-printer.spec	23 Dec 2009 15:02:04 -0000	1.319
+++ system-config-printer.spec	23 Dec 2009 16:15:21 -0000	1.320
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-typo.patch
 Patch2: system-config-printer-driver-pre-selection.patch
+Patch3: system-config-printer-foomatic-recommended.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -67,6 +68,7 @@ the configuration tool.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .typo
 %patch2 -p1 -b .driver-pre-selection
+%patch3 -p1 -b .foomatic-recommended
 
 %build
 %configure
@@ -174,6 +176,7 @@ exit 0
 
 %changelog
 * Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Prefer foomatic-recommended drivers (bug #550108).
 - Pre-select correct driver when adding or changing a queue (bug #550075).
 - Fixed typo (bug #550096).
 



From twaugh at fedoraproject.org  Wed Dec 23 16:16:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 16:16:22 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-foomatic-recommended.patch, NONE,
	1.1 system-config-printer.spec, 1.331, 1.332
Message-ID: <20091223161622.B54A011C025E@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10985

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-foomatic-recommended.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Prefer foomatic-recommended drivers (bug #550108).


system-config-printer-foomatic-recommended.patch:
 ppds.py |   27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-foomatic-recommended.patch ---
diff -up system-config-printer-1.1.16/cupshelpers/ppds.py.foomatic-recommended system-config-printer-1.1.16/cupshelpers/ppds.py
--- system-config-printer-1.1.16/cupshelpers/ppds.py.foomatic-recommended	2009-12-22 14:27:37.000000000 +0000
+++ system-config-printer-1.1.16/cupshelpers/ppds.py	2009-12-23 16:13:13.234214808 +0000
@@ -248,14 +248,25 @@ def _getDriverType (ppdname, ppds=None):
         # Foomatic (generated) -- but which driver?
         if ppdname.find ("Generic")!= -1:
             return DRIVER_TYPE_FOOMATIC_GENERIC
-        if (ppds != None and
-            ppds.getInfoFromPPDName (ppdname).\
-            get ('ppd-make-and-model', '').find ("(recommended)") != -1):
-            if ppds.getInfoFromPPDName (ppdname).\
-               get ('ppd-make-and-model', '').find ("Postscript") != -1:
-                return DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT
-            else:
-                return DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT
+        if ppds != None:
+            info = ppds.getInfoFromPPDName (ppdname)
+            device_id = info.get ('ppd-device-id', '')
+            id_dict = parseDeviceID (device_id)
+            drv = id_dict.get ('DRV', '')
+            drvfields = dict()
+            for field in drv.split (','):
+                if len (field) == 0:
+                    continue
+                key = field[0]
+                drvfields[key] = field[1:]
+
+            ppd_make_and_model = info.get ('ppd-make-and-model', '')
+            if (drvfields.get ('R', '0') == '1' or
+                ppd_make_and_model.find ("(recommended)") != -1):
+                if ppd_make_and_model.find ("Postscript") != -1:
+                    return DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT
+                else:
+                    return DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT
         if ppdname.find ("-Postscript")!= -1:
             return DRIVER_TYPE_FOOMATIC_PS
         if ppdname.find ("-hpijs") != -1:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -r1.331 -r1.332
--- system-config-printer.spec	23 Dec 2009 15:03:20 -0000	1.331
+++ system-config-printer.spec	23 Dec 2009 16:16:22 -0000	1.332
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-typo.patch
 Patch3: system-config-printer-driver-pre-selection.patch
+Patch4: system-config-printer-foomatic-recommended.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -80,6 +81,7 @@ printers.
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .typo
 %patch3 -p1 -b .driver-pre-selection
+%patch4 -p1 -b .foomatic-recommended
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -197,6 +199,7 @@ exit 0
 
 %changelog
 * Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Prefer foomatic-recommended drivers (bug #550108).
 - Pre-select correct driver when adding or changing a queue (bug #550075).
 - Fixed typo (bug #550096).
 



From twaugh at fedoraproject.org  Wed Dec 23 16:17:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 23 Dec 2009 16:17:14 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-foomatic-recommended.patch, NONE,
	1.1 system-config-printer.spec, 1.327, 1.328
Message-ID: <20091223161714.1B47611C025E@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11328

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-foomatic-recommended.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
- Prefer foomatic-recommended drivers (bug #550108).


system-config-printer-foomatic-recommended.patch:
 ppds.py |   27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-foomatic-recommended.patch ---
diff -up system-config-printer-1.1.16/cupshelpers/ppds.py.foomatic-recommended system-config-printer-1.1.16/cupshelpers/ppds.py
--- system-config-printer-1.1.16/cupshelpers/ppds.py.foomatic-recommended	2009-12-22 14:27:37.000000000 +0000
+++ system-config-printer-1.1.16/cupshelpers/ppds.py	2009-12-23 16:13:13.234214808 +0000
@@ -248,14 +248,25 @@ def _getDriverType (ppdname, ppds=None):
         # Foomatic (generated) -- but which driver?
         if ppdname.find ("Generic")!= -1:
             return DRIVER_TYPE_FOOMATIC_GENERIC
-        if (ppds != None and
-            ppds.getInfoFromPPDName (ppdname).\
-            get ('ppd-make-and-model', '').find ("(recommended)") != -1):
-            if ppds.getInfoFromPPDName (ppdname).\
-               get ('ppd-make-and-model', '').find ("Postscript") != -1:
-                return DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT
-            else:
-                return DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT
+        if ppds != None:
+            info = ppds.getInfoFromPPDName (ppdname)
+            device_id = info.get ('ppd-device-id', '')
+            id_dict = parseDeviceID (device_id)
+            drv = id_dict.get ('DRV', '')
+            drvfields = dict()
+            for field in drv.split (','):
+                if len (field) == 0:
+                    continue
+                key = field[0]
+                drvfields[key] = field[1:]
+
+            ppd_make_and_model = info.get ('ppd-make-and-model', '')
+            if (drvfields.get ('R', '0') == '1' or
+                ppd_make_and_model.find ("(recommended)") != -1):
+                if ppd_make_and_model.find ("Postscript") != -1:
+                    return DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT
+                else:
+                    return DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT
         if ppdname.find ("-Postscript")!= -1:
             return DRIVER_TYPE_FOOMATIC_PS
         if ppdname.find ("-hpijs") != -1:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- system-config-printer.spec	23 Dec 2009 15:04:43 -0000	1.327
+++ system-config-printer.spec	23 Dec 2009 16:17:13 -0000	1.328
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-typo.patch
 Patch3: system-config-printer-driver-pre-selection.patch
+Patch4: system-config-printer-foomatic-recommended.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -80,6 +81,7 @@ printers.
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .typo
 %patch3 -p1 -b .driver-pre-selection
+%patch4 -p1 -b .foomatic-recommended
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -197,6 +199,7 @@ exit 0
 
 %changelog
 * Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
+- Prefer foomatic-recommended drivers (bug #550108).
 - Pre-select correct driver when adding or changing a queue (bug #550075).
 - Fixed typo (bug #550096).
 



From chitlesh at fedoraproject.org  Wed Dec 23 16:44:32 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 23 Dec 2009 16:44:32 +0000 (UTC)
Subject: File fped-0.tar.bz2 uploaded to lookaside cache by chitlesh
Message-ID: <20091223164432.46C6510F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fped:

1a90f2c21c1ac7db88c8f7ca017351de  fped-0.tar.bz2



From chitlesh at fedoraproject.org  Wed Dec 23 16:46:34 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 23 Dec 2009 16:46:34 +0000 (UTC)
Subject: rpms/fped/F-11 fped.spec,1.1,1.2 import.log,1.1,1.2 sources,1.2,1.3
Message-ID: <20091223164634.7362211C025E@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/fped/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15087/F-11

Modified Files:
	fped.spec import.log sources 
Log Message:
rev 5760


Index: fped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-11/fped.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fped.spec	1 Oct 2009 05:05:38 -0000	1.1
+++ fped.spec	23 Dec 2009 16:46:33 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           fped
 Version:        0
-Release:        0.1.r5664%{?dist}
+Release:        0.2.r5760%{?dist}
 Summary:        A footprint editor used by openmoko developers
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://openmoko.org
 # grabbed from svn
-# svn export -r 5664 http://svn.openmoko.org/trunk/eda/fped fped-0
+# svn export -r 5760 http://svn.openmoko.org/trunk/eda/fped fped-0
 # tar cjf fped-0.tar.bz2 fped-0
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@ BuildRequires:  flex
 BuildRequires:  transfig
 BuildRequires:  netpbm-progs
 BuildRequires:  ImageMagick
-     
+
 
 %description
 fped is an editor that allows the interactive creation of footprints of
@@ -38,10 +38,6 @@ that can be performed through the GUI.
   -e "s|\$(PREFIX)/bin/|\$(DESTDIR)\$(PREFIX)/bin/|g" \
   -e "s|install -m|install -pm|" \
   -e "s|CFLAGS = |CFLAGS = %{optflags} |g" Makefile
-  
-# footprints as examples
-mkdir -p footprints
-cp -p *.fpd footprints/
 
 %build
 # Make verbose
@@ -64,11 +60,17 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README TODO gui.html manual/
-%doc footprints/
+%doc examples
 %{_bindir}/%{name}
 
 
 %changelog
+* Wed Dec 23 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.2.r5760
+- new upstream snapshot
+
+* Wed Sep 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.1.r5746
+- multiple fixes with respect to the x and y coordinates
+
 * Wed Sep 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.1.r5664
 - changed release tag to 0.1 and added instructions to download the sources.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Oct 2009 05:05:38 -0000	1.1
+++ import.log	23 Dec 2009 16:46:33 -0000	1.2
@@ -1 +1,2 @@
 fped-0-0_1_r5664_fc11:F-11:fped-0-0.1.r5664.fc11.src.rpm:1254373369
+fped-0-0_2_r5760_fc12:F-11:fped-0-0.2.r5760.fc12.src.rpm:1261586684


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 05:05:38 -0000	1.2
+++ sources	23 Dec 2009 16:46:34 -0000	1.3
@@ -1 +1 @@
-d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2
+1a90f2c21c1ac7db88c8f7ca017351de  fped-0.tar.bz2



From chitlesh at fedoraproject.org  Wed Dec 23 16:49:13 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 23 Dec 2009 16:49:13 +0000 (UTC)
Subject: rpms/fped/F-12 fped.spec,1.1,1.2 import.log,1.1,1.2 sources,1.2,1.3
Message-ID: <20091223164913.73EAE11C00EF@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/fped/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16051/F-12

Modified Files:
	fped.spec import.log sources 
Log Message:
rev 5760


Index: fped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-12/fped.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fped.spec	1 Oct 2009 05:24:13 -0000	1.1
+++ fped.spec	23 Dec 2009 16:49:13 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           fped
 Version:        0
-Release:        0.1.r5664%{?dist}
+Release:        0.2.r5760%{?dist}
 Summary:        A footprint editor used by openmoko developers
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://openmoko.org
 # grabbed from svn
-# svn export -r 5664 http://svn.openmoko.org/trunk/eda/fped fped-0
+# svn export -r 5760 http://svn.openmoko.org/trunk/eda/fped fped-0
 # tar cjf fped-0.tar.bz2 fped-0
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@ BuildRequires:  flex
 BuildRequires:  transfig
 BuildRequires:  netpbm-progs
 BuildRequires:  ImageMagick
-     
+
 
 %description
 fped is an editor that allows the interactive creation of footprints of
@@ -38,10 +38,6 @@ that can be performed through the GUI.
   -e "s|\$(PREFIX)/bin/|\$(DESTDIR)\$(PREFIX)/bin/|g" \
   -e "s|install -m|install -pm|" \
   -e "s|CFLAGS = |CFLAGS = %{optflags} |g" Makefile
-  
-# footprints as examples
-mkdir -p footprints
-cp -p *.fpd footprints/
 
 %build
 # Make verbose
@@ -64,11 +60,17 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README TODO gui.html manual/
-%doc footprints/
+%doc examples
 %{_bindir}/%{name}
 
 
 %changelog
+* Wed Dec 23 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.2.r5760
+- new upstream snapshot
+
+* Wed Sep 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.1.r5746
+- multiple fixes with respect to the x and y coordinates
+
 * Wed Sep 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.1.r5664
 - changed release tag to 0.1 and added instructions to download the sources.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Oct 2009 05:24:13 -0000	1.1
+++ import.log	23 Dec 2009 16:49:13 -0000	1.2
@@ -1 +1,2 @@
 fped-0-0_1_r5664_fc11:F-12:fped-0-0.1.r5664.fc11.src.rpm:1254374632
+fped-0-0_2_r5760_fc12:F-12:fped-0-0.2.r5760.fc12.src.rpm:1261586805


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 05:24:13 -0000	1.2
+++ sources	23 Dec 2009 16:49:13 -0000	1.3
@@ -1 +1 @@
-d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2
+1a90f2c21c1ac7db88c8f7ca017351de  fped-0.tar.bz2



From chitlesh at fedoraproject.org  Wed Dec 23 16:53:59 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 23 Dec 2009 16:53:59 +0000 (UTC)
Subject: rpms/fped/devel fped.spec,1.1,1.2 import.log,1.1,1.2 sources,1.2,1.3
Message-ID: <20091223165359.22E4011C00EF@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/fped/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16755/devel

Modified Files:
	fped.spec import.log sources 
Log Message:
rev 5760


Index: fped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fped/devel/fped.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fped.spec	1 Oct 2009 05:21:02 -0000	1.1
+++ fped.spec	23 Dec 2009 16:53:58 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           fped
 Version:        0
-Release:        0.1.r5664%{?dist}
+Release:        0.2.r5760%{?dist}
 Summary:        A footprint editor used by openmoko developers
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://openmoko.org
 # grabbed from svn
-# svn export -r 5664 http://svn.openmoko.org/trunk/eda/fped fped-0
+# svn export -r 5760 http://svn.openmoko.org/trunk/eda/fped fped-0
 # tar cjf fped-0.tar.bz2 fped-0
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@ BuildRequires:  flex
 BuildRequires:  transfig
 BuildRequires:  netpbm-progs
 BuildRequires:  ImageMagick
-     
+
 
 %description
 fped is an editor that allows the interactive creation of footprints of
@@ -38,10 +38,6 @@ that can be performed through the GUI.
   -e "s|\$(PREFIX)/bin/|\$(DESTDIR)\$(PREFIX)/bin/|g" \
   -e "s|install -m|install -pm|" \
   -e "s|CFLAGS = |CFLAGS = %{optflags} |g" Makefile
-  
-# footprints as examples
-mkdir -p footprints
-cp -p *.fpd footprints/
 
 %build
 # Make verbose
@@ -64,11 +60,17 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README TODO gui.html manual/
-%doc footprints/
+%doc examples
 %{_bindir}/%{name}
 
 
 %changelog
+* Wed Dec 23 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.2.r5760
+- new upstream snapshot
+
+* Wed Sep 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.1.r5746
+- multiple fixes with respect to the x and y coordinates
+
 * Wed Sep 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.1.r5664
 - changed release tag to 0.1 and added instructions to download the sources.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fped/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Oct 2009 05:21:02 -0000	1.1
+++ import.log	23 Dec 2009 16:53:58 -0000	1.2
@@ -1 +1,2 @@
 fped-0-0_1_r5664_fc11:HEAD:fped-0-0.1.r5664.fc11.src.rpm:1254374163
+fped-0-0_2_r5760_fc12:HEAD:fped-0-0.2.r5760.fc12.src.rpm:1261587011


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 05:21:02 -0000	1.2
+++ sources	23 Dec 2009 16:53:58 -0000	1.3
@@ -1 +1 @@
-d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2
+1a90f2c21c1ac7db88c8f7ca017351de  fped-0.tar.bz2



From chitlesh at fedoraproject.org  Wed Dec 23 16:58:42 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 23 Dec 2009 16:58:42 +0000 (UTC)
Subject: rpms/fped/EL-5 fped.spec,1.1,1.2 import.log,1.1,1.2 sources,1.2,1.3
Message-ID: <20091223165842.2154711C00EF@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/fped/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17416/EL-5

Modified Files:
	fped.spec import.log sources 
Log Message:
rev 5760


Index: fped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fped/EL-5/fped.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fped.spec	1 Oct 2009 05:12:29 -0000	1.1
+++ fped.spec	23 Dec 2009 16:58:41 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           fped
 Version:        0
-Release:        0.1.r5664%{?dist}
+Release:        0.2.r5760%{?dist}
 Summary:        A footprint editor used by openmoko developers
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://openmoko.org
 # grabbed from svn
-# svn export -r 5664 http://svn.openmoko.org/trunk/eda/fped fped-0
+# svn export -r 5760 http://svn.openmoko.org/trunk/eda/fped fped-0
 # tar cjf fped-0.tar.bz2 fped-0
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@ BuildRequires:  flex
 BuildRequires:  transfig
 BuildRequires:  netpbm-progs
 BuildRequires:  ImageMagick
-     
+
 
 %description
 fped is an editor that allows the interactive creation of footprints of
@@ -38,10 +38,6 @@ that can be performed through the GUI.
   -e "s|\$(PREFIX)/bin/|\$(DESTDIR)\$(PREFIX)/bin/|g" \
   -e "s|install -m|install -pm|" \
   -e "s|CFLAGS = |CFLAGS = %{optflags} |g" Makefile
-  
-# footprints as examples
-mkdir -p footprints
-cp -p *.fpd footprints/
 
 %build
 # Make verbose
@@ -64,11 +60,17 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README TODO gui.html manual/
-%doc footprints/
+%doc examples
 %{_bindir}/%{name}
 
 
 %changelog
+* Wed Dec 23 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.2.r5760
+- new upstream snapshot
+
+* Wed Sep 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.1.r5746
+- multiple fixes with respect to the x and y coordinates
+
 * Wed Sep 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-0.1.r5664
 - changed release tag to 0.1 and added instructions to download the sources.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fped/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Oct 2009 05:12:29 -0000	1.1
+++ import.log	23 Dec 2009 16:58:41 -0000	1.2
@@ -1 +1,2 @@
 fped-0-0_1_r5664_fc11:EL-5:fped-0-0.1.r5664.fc11.src.rpm:1254373679
+fped-0-0_2_r5760_fc12:EL-5:fped-0-0.2.r5760.fc12.src.rpm:1261587349


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 05:12:29 -0000	1.2
+++ sources	23 Dec 2009 16:58:41 -0000	1.3
@@ -1 +1 @@
-d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2
+1a90f2c21c1ac7db88c8f7ca017351de  fped-0.tar.bz2



From kkofler at fedoraproject.org  Wed Dec 23 17:01:29 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 23 Dec 2009 17:01:29 +0000 (UTC)
Subject: rpms/qt/devel qt.spec, 1.362,
	1.363 qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch,
	1.1, NONE
Message-ID: <20091223170129.3B6E311C00EF@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17910/devel

Modified Files:
	qt.spec 
Removed Files:
	qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch 
Log Message:
Remove obsolete patch, now handled by a configure option.


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -p -r1.362 -r1.363
--- qt.spec	23 Dec 2009 12:32:38 -0000	1.362
+++ qt.spec	23 Dec 2009 17:01:29 -0000	1.363
@@ -47,9 +47,6 @@ Patch21: qt-everywhere-opensource-src-4.
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
 Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
 Requires: ca-certificates
-# disable JavaScriptCore JIT as it crashes with SE Linux
-# http://bugzilla.redhat.com/527079
-Patch23: qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -403,8 +400,6 @@ Qt libraries used for drawing widgets an
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
 %patch22 -p1 -b .system_ca_certificates
-## FIXME: ./configure -no-javascript-jit should be sufficient, check
-#patch23 -p1 -b .javascriptcore-disable-jit
 %patch51 -p1 -b .qdoc3
 ## FIXME: port patch
 #patch52 -p1 -b .sparc64


--- qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch DELETED ---



From sdz at fedoraproject.org  Wed Dec 23 17:21:49 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:21:49 +0000 (UTC)
Subject: File sugar-toolkit-0.87.2.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091223172149.A896F10F8D3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar-toolkit:

c8e3bb2c8d4984ca8d28a9beaeb33886  sugar-toolkit-0.87.2.tar.bz2



From sdz at fedoraproject.org  Wed Dec 23 17:23:01 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:23:01 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.42, 1.43 sources, 1.46,
	1.47 sugar-toolkit.spec, 1.61, 1.62
Message-ID: <20091223172301.6FC5511C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20865

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	1 Dec 2009 14:22:33 -0000	1.42
+++ .cvsignore	23 Dec 2009 17:23:01 -0000	1.43
@@ -1 +1 @@
-sugar-toolkit-0.87.1.tar.bz2
+sugar-toolkit-0.87.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	1 Dec 2009 14:22:33 -0000	1.46
+++ sources	23 Dec 2009 17:23:01 -0000	1.47
@@ -1 +1 @@
-904b2c25bd052c4e02cc0d799b7dbf44  sugar-toolkit-0.87.1.tar.bz2
+c8e3bb2c8d4984ca8d28a9beaeb33886  sugar-toolkit-0.87.2.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sugar-toolkit.spec	18 Dec 2009 08:46:02 -0000	1.61
+++ sugar-toolkit.spec	23 Dec 2009 17:23:01 -0000	1.62
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.87.1
-Release: 2%{?dist}
+Version: 0.87.2
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Dec 23 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.2-1
+- New upstream release
+
 * Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.87.1-2
 - Remove libtool archives
 



From sdz at fedoraproject.org  Wed Dec 23 17:25:40 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:25:40 +0000 (UTC)
Subject: File sugar-datastore-0.87.2.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091223172540.8E1C710F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar-datastore:

4eaca60ec8735afcf257f13189fde96d  sugar-datastore-0.87.2.tar.bz2



From sdz at fedoraproject.org  Wed Dec 23 17:26:38 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:26:38 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 sugar-datastore.spec, 1.25, 1.26
Message-ID: <20091223172639.02C3E11C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21452

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	1 Dec 2009 21:27:46 -0000	1.18
+++ .cvsignore	23 Dec 2009 17:26:38 -0000	1.19
@@ -1 +1 @@
-sugar-datastore-0.87.1.tar.bz2
+sugar-datastore-0.87.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	1 Dec 2009 21:27:46 -0000	1.18
+++ sources	23 Dec 2009 17:26:38 -0000	1.19
@@ -1 +1 @@
-a169c6739642f20acd8074c3dac0d608  sugar-datastore-0.87.1.tar.bz2
+4eaca60ec8735afcf257f13189fde96d  sugar-datastore-0.87.2.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sugar-datastore.spec	18 Dec 2009 09:16:18 -0000	1.25
+++ sugar-datastore.spec	23 Dec 2009 17:26:38 -0000	1.26
@@ -4,8 +4,8 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.87.1
-Release: 2%{?dist}
+Version: 0.87.2
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
 Summary: Sugar Datastore
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Wed Dec 23 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.2-1
+- New upstream release
+
 * Fri Dec 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.87.1-2
 - Remove libtool archives
 



From sdz at fedoraproject.org  Wed Dec 23 17:28:11 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:28:11 +0000 (UTC)
Subject: File sugar-0.87.2.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091223172811.50CAA10F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar:

11afabde49be112057904893f1d1c0a5  sugar-0.87.2.tar.bz2



From sdz at fedoraproject.org  Wed Dec 23 17:29:45 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:29:45 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.48, 1.49 sources, 1.50, 1.51 sugar.spec,
	1.80, 1.81
Message-ID: <20091223172945.96DAA11C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22029

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	1 Dec 2009 14:50:18 -0000	1.48
+++ .cvsignore	23 Dec 2009 17:29:45 -0000	1.49
@@ -1 +1 @@
-sugar-0.87.1.tar.bz2
+sugar-0.87.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	1 Dec 2009 14:50:18 -0000	1.50
+++ sources	23 Dec 2009 17:29:45 -0000	1.51
@@ -1 +1 @@
-31d123dff7ddfb18134537ca9d40fc66  sugar-0.87.1.tar.bz2
+11afabde49be112057904893f1d1c0a5  sugar-0.87.2.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sugar.spec	1 Dec 2009 14:50:18 -0000	1.80
+++ sugar.spec	23 Dec 2009 17:29:45 -0000	1.81
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.87.1
+Version: 0.87.2
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -148,6 +148,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Wed Dec 23 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.2-1
+- New upstream release
+
 * Tue Dec 01 2009 Sebastian Dziallas <sebastian at when.com> - 0.87.1-1
 - New upstream release
 - Make this noarch again



From ingvar at fedoraproject.org  Wed Dec 23 17:31:25 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 23 Dec 2009 17:31:25 +0000 (UTC)
Subject: rpms/varnish/F-12 varnish.spec,1.24,1.25
Message-ID: <20091223173125.290BE11C00EF@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22394

Modified Files:
	varnish.spec 
Log Message:
- Added a test that enables jemalloc on ppc if the kernel is
  not a rhel5 kernel (as on redhat builders)
- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
- Added a patch that fixes broken changes-2.0.6.html in doc




Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-12/varnish.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- varnish.spec	21 Dec 2009 21:58:31 -0000	1.24
+++ varnish.spec	23 Dec 2009 17:31:24 -0000	1.25
@@ -1,12 +1,13 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.changes-2.0.6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -68,7 +69,8 @@ Varnish is a high-performance HTTP accel
 # Release tarballs would not need this
 #./autogen.sh
 
-%patch0 -p0
+%patch0
+%patch1
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -93,9 +95,12 @@ cp bin/varnishd/default.vcl etc/zope-plo
 # Remove "--disable static" if you want to build static libraries 
 # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
-%configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+	if [[ `uname -r` =~ "2.6.18-.*" ]]
+		then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+		else %configure --disable-static --localstatedir=/var/lib
+	fi
 %else
-%configure --disable-static --localstatedir=/var/lib
+	%configure --disable-static --localstatedir=/var/lib
 %endif
 
 # We have to remove rpath - not allowed in Fedora
@@ -124,6 +129,11 @@ tail -n +11 etc/default.vcl >> redhat/de
 	redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
 %endif
 
+# Fix for broken changes-2.0.6.html
+pushd doc
+%{__make} clean; %{__make}
+popd
+
 %check
 # rhel5 on ppc64 is just too strange
 %ifarch ppc64
@@ -132,6 +142,15 @@ tail -n +11 etc/default.vcl >> redhat/de
 	%endif
 %endif
 
+# The redhat ppc builders seem to have some ulimit problems?
+# These tests work on a rhel4 ppc/ppc64 instance outside the builders
+%ifarch ppc64 ppc
+	%if 0%{?rhel} == 4
+		rm bin/varnishtest/tests/c00031.vtc
+		rm bin/varnishtest/tests/r00387.vtc
+	%endif
+%endif
+
 LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo
 %{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
 
@@ -235,7 +254,14 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Thu Dec 17 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
+* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2
+- Added a test that enables jemalloc on ppc if the kernel is
+  not a rhel5 kernel (as on redhat builders)
+- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
+  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
+- Added a patch that fixes broken changes-2.0.6.html in doc
+
+* Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
 - New upstream release
 - Removed patches for libjemalloc, as they are added upstream
 



From ingvar at fedoraproject.org  Wed Dec 23 17:34:48 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 23 Dec 2009 17:34:48 +0000 (UTC)
Subject: rpms/varnish/F-12 varnish.changes-2.0.6.patch,NONE,1.1
Message-ID: <20091223173448.0BB1F11C00EF@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22963

Added Files:
	varnish.changes-2.0.6.patch 
Log Message:
fixes broken changelog

varnish.changes-2.0.6.patch:
 changes-2.0.5-2.0.6.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.changes-2.0.6.patch ---
--- doc/changes-2.0.5-2.0.6.xml.orig	2009-12-23 11:42:58.168643121 +0100
+++ doc/changes-2.0.5-2.0.6.xml	2009-12-23 11:43:05.827643574 +0100
@@ -49,5 +49,5 @@
       <para>Document the <code>-C</code> option
       to <code>varnishd</code>.</para>
     </change>
-  <subsystem>
+  </subsystem>
 </group>



From sdz at fedoraproject.org  Wed Dec 23 17:41:12 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:41:12 +0000 (UTC)
Subject: File Jukebox-13.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091223174112.84B9310F8D4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar-jukebox:

fe25306a7ddcb13a416a87b755ce0dcb  Jukebox-13.tar.bz2



From sdz at fedoraproject.org  Wed Dec 23 17:41:59 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:41:59 +0000 (UTC)
Subject: rpms/sugar-jukebox/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 sugar-jukebox.spec, 1.9, 1.10
Message-ID: <20091223174159.4D08C11C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-jukebox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23990

Modified Files:
	.cvsignore sources sugar-jukebox.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	16 Jun 2009 13:38:26 -0000	1.6
+++ .cvsignore	23 Dec 2009 17:41:58 -0000	1.7
@@ -1 +1 @@
-Jukebox-11.tar.bz2
+Jukebox-13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Jun 2009 13:38:26 -0000	1.6
+++ sources	23 Dec 2009 17:41:59 -0000	1.7
@@ -1 +1 @@
-8bc2edc0a2d50f36de16842fe06f9e29  Jukebox-11.tar.bz2
+fe25306a7ddcb13a416a87b755ce0dcb  Jukebox-13.tar.bz2


Index: sugar-jukebox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-jukebox/devel/sugar-jukebox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sugar-jukebox.spec	14 Dec 2009 12:03:37 -0000	1.9
+++ sugar-jukebox.spec	23 Dec 2009 17:41:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		sugar-jukebox
-Version:	11
-Release:	3%{?dist}
+Version:	13
+Release:	1%{?dist}
 Summary:	Media player activity for Sugar
 
 Group:		Sugar/Activities
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 23 2009 Sebastian Dziallas <sebastian at when.com> - 13-1
+- New upstream release
+
 * Mon Dec 14 2009 Peter Robinson <pbrobinson at gmail.com> - 11-3
 - Add buildreq gettext to fix build issues on F-12/rawhide - fixes # 538871
 



From sdz at fedoraproject.org  Wed Dec 23 17:46:34 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:46:34 +0000 (UTC)
Subject: File Read-78.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091223174634.4193C10F8D4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar-read:

56149150047f350a09047eccc7f420de  Read-78.tar.bz2



From sdz at fedoraproject.org  Wed Dec 23 17:47:24 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 17:47:24 +0000 (UTC)
Subject: rpms/sugar-read/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 sugar-read.spec, 1.6, 1.7
Message-ID: <20091223174724.4CC7E11C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-read/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24901

Modified Files:
	.cvsignore sources sugar-read.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Oct 2009 13:31:43 -0000	1.6
+++ .cvsignore	23 Dec 2009 17:47:24 -0000	1.7
@@ -1 +1 @@
-Read-76.tar.bz2
+Read-78.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Oct 2009 13:31:44 -0000	1.6
+++ sources	23 Dec 2009 17:47:24 -0000	1.7
@@ -1 +1 @@
-e07abfe5402ff1df4e079ed8392cd50f  Read-76.tar.bz2
+56149150047f350a09047eccc7f420de  Read-78.tar.bz2


Index: sugar-read.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sugar-read.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sugar-read.spec	11 Oct 2009 13:31:44 -0000	1.6
+++ sugar-read.spec	23 Dec 2009 17:47:24 -0000	1.7
@@ -1,5 +1,5 @@
 Name: sugar-read
-Version: 76
+Version: 78
 Release: 1%{?dist}
 Summary: A document reader for Sugar
 Group: Sugar/Activities
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 23 2009 Sebastian Dziallas <sebastian at when.com> - 78-1
+- New upstream release
+
 * Sun Oct 11 2009 Sebastian Dziallas <sebastian at when.com> - 76-1
 - Fix pagination for IA Epubs
 - Updated Vietnamese translations



From jspaleta at fedoraproject.org  Wed Dec 23 18:01:46 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Wed, 23 Dec 2009 18:01:46 +0000 (UTC)
Subject: rpms/istanbul/devel istanbul-save_window.patch, NONE,
	1.1 istanbul.spec, 1.20, 1.21
Message-ID: <20091223180146.60D9611C00EF@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/istanbul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27086

Modified Files:
	istanbul.spec 
Added Files:
	istanbul-save_window.patch 
Log Message:
* Fri Dec 18 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-13
- Initial patch provided by Colin Walters and Dave Malcolm to address bug 543278 
* Wed Nov 25 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-12
- Patch for exception handling to prevent crash, bug 541003


istanbul-save_window.patch:
 istanbul-save_window.patch |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE istanbul-save_window.patch ---
--- ./istanbul/main/save_window.py	2009-12-18 12:20:38.027242576 -0500
+++ ./istanbul-save_window.patch	2009-12-18 13:12:13.024243540 -0500
@@ -35,8 +35,13 @@ class VideoWidget(gtk.DrawingArea):
     def __init__(self):
         gtk.DrawingArea.__init__(self)
         self.imagesink = None
+        self._xid = None
         self.unset_flags(gtk.DOUBLE_BUFFERED)
 
+    def do_realize(self):
+        Gtk.DrawingArea.do_realize(self)
+        self._xid = self.window.xid
+
     def do_expose_event(self, event):
         if self.imagesink:
             self.imagesink.expose()
@@ -45,9 +50,9 @@ class VideoWidget(gtk.DrawingArea):
             return True
 
     def set_sink(self, sink):
-        assert self.window.xid
+        assert self._xid is not None
         self.imagesink = sink
-        self.imagesink.set_xwindow_id(self.window.xid)
+        self.imagesink.set_xwindow_id(self._xid)
 
 class SaveWindow(gtk.Window):
     UPDATE_INTERVAL = 500



Index: istanbul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/istanbul/devel/istanbul.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- istanbul.spec	26 Nov 2009 07:11:05 -0000	1.20
+++ istanbul.spec	23 Dec 2009 18:01:46 -0000	1.21
@@ -7,7 +7,7 @@
 Summary: Desktop Session Recorder 
 Name: istanbul 
 Version: 0.2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://live.gnome.org/Istanbul 
@@ -15,6 +15,7 @@ Source: http://zaheer.merali.org/istanbu
 Patch0: istanbul-configure.patch
 Patch1: istanbul-screencast.patch
 Patch2: istanbul-URI_exception.patch
+Patch3: istanbul-save_window.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: pygtk2 >= %{pygtk2_version}
@@ -54,6 +55,7 @@ playback.
 %setup -q
 %patch0
 %patch1
+%patch3
 %build
 #aclocal
 #automake
@@ -115,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 #%{python_sitelib}/%{name}/extern/pytrayicon/*.so*
 
 %changelog
+* Fri Dec 18 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-13
+- Initial patch provided by Colin Walters and Dave Malcolm to address bug 543278 
 * Wed Nov 25 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-12
 - Patch for exception handling to prevent crash, bug 541003
 



From ingvar at fedoraproject.org  Wed Dec 23 18:10:39 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 23 Dec 2009 18:10:39 +0000 (UTC)
Subject: rpms/varnish/F-11 varnish.changes-2.0.6.patch, NONE, 1.1 varnish.spec,
	1.22, 1.23
Message-ID: <20091223181039.A459111C00EF@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28552

Modified Files:
	varnish.spec 
Added Files:
	varnish.changes-2.0.6.patch 
Log Message:
- Added a test that enables jemalloc on ppc if the kernel is
  not a rhel5 kernel (as on redhat builders)
- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
- Added a patch that fixes broken changes-2.0.6.html in doc



varnish.changes-2.0.6.patch:
 changes-2.0.5-2.0.6.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.changes-2.0.6.patch ---
--- doc/changes-2.0.5-2.0.6.xml.orig	2009-12-23 11:42:58.168643121 +0100
+++ doc/changes-2.0.5-2.0.6.xml	2009-12-23 11:43:05.827643574 +0100
@@ -49,5 +49,5 @@
       <para>Document the <code>-C</code> option
       to <code>varnishd</code>.</para>
     </change>
-  <subsystem>
+  </subsystem>
 </group>


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-11/varnish.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- varnish.spec	21 Dec 2009 22:01:31 -0000	1.22
+++ varnish.spec	23 Dec 2009 18:10:39 -0000	1.23
@@ -1,12 +1,13 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.changes-2.0.6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -68,7 +69,8 @@ Varnish is a high-performance HTTP accel
 # Release tarballs would not need this
 #./autogen.sh
 
-%patch0 -p0
+%patch0
+%patch1
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -93,9 +95,12 @@ cp bin/varnishd/default.vcl etc/zope-plo
 # Remove "--disable static" if you want to build static libraries 
 # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
-%configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+	if [[ `uname -r` =~ "2.6.18-.*" ]]
+		then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+		else %configure --disable-static --localstatedir=/var/lib
+	fi
 %else
-%configure --disable-static --localstatedir=/var/lib
+	%configure --disable-static --localstatedir=/var/lib
 %endif
 
 # We have to remove rpath - not allowed in Fedora
@@ -124,6 +129,11 @@ tail -n +11 etc/default.vcl >> redhat/de
 	redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
 %endif
 
+# Fix for broken changes-2.0.6.html
+pushd doc
+%{__make} clean; %{__make}
+popd
+
 %check
 # rhel5 on ppc64 is just too strange
 %ifarch ppc64
@@ -132,6 +142,15 @@ tail -n +11 etc/default.vcl >> redhat/de
 	%endif
 %endif
 
+# The redhat ppc builders seem to have some ulimit problems?
+# These tests work on a rhel4 ppc/ppc64 instance outside the builders
+%ifarch ppc64 ppc
+	%if 0%{?rhel} == 4
+		rm bin/varnishtest/tests/c00031.vtc
+		rm bin/varnishtest/tests/r00387.vtc
+	%endif
+%endif
+
 LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo
 %{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
 
@@ -235,8 +254,16 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2
+- Added a test that enables jemalloc on ppc if the kernel is
+  not a rhel5 kernel (as on redhat builders)
+- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
+  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
+- Added a patch that fixes broken changes-2.0.6.html in doc
+
 * Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
 - New upstream release
+- Removed patches for libjemalloc, as they are added upstream
 
 * Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
 - New upstream release



From dcbw at fedoraproject.org  Wed Dec 23 18:17:55 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 23 Dec 2009 18:17:55 +0000 (UTC)
Subject: File NetworkManager-0.7.2.git20091223.tar.bz2 uploaded to lookaside
	cache by dcbw
Message-ID: <20091223181755.5A0A310F8D4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for NetworkManager:

b6a326886a429673b7c9a94d3f1f504f  NetworkManager-0.7.2.git20091223.tar.bz2



From dcbw at fedoraproject.org  Wed Dec 23 18:18:11 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 23 Dec 2009 18:18:11 +0000 (UTC)
Subject: File network-manager-applet-0.7.2.git20091223.tar.bz2 uploaded to
	lookaside cache by dcbw
Message-ID: <20091223181811.30F8A10F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for NetworkManager:

f02780d9462a20fbca93a95870f47824  network-manager-applet-0.7.2.git20091223.tar.bz2



From dcbw at fedoraproject.org  Wed Dec 23 18:20:27 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 23 Dec 2009 18:20:27 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 .cvsignore, 1.110, 1.111 NetworkManager.spec,
	1.284, 1.285 nm-applet-internal-buildfixes.patch, 1.12,
	1.13 sources, 1.151, 1.152
Message-ID: <20091223182027.A37BE11C00EF@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30533

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Log Message:
* Wed Dec 23 2009 Dan Williams <dcbw at redhat.com> - 0.7.2-2.git20091223
- nm: allow more connect time for 'hso' mobile broadband devices (rh #514827)
- nm: fix reconnections on some Option 'hso' devices
- nm: add support for more ZTE mobile broadband devices
- ifcfg-rh: treat MODE=AUTO as infrastructure mode
- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
- ifcfg-rh: add support for reading and writing routes files (rh #507307)
- applet: fix potential leakage of secrets onto the system bus (rh #546115) (CVE-2009-4145)
- applet: fix possible connections to spoofed WPA Enterprise networks (rh #546793) (CVE-2009-4144)
- applet: add "Disable Notifications" option
- applet: fix blank notification with certain characters



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- .cvsignore	23 Nov 2009 21:46:34 -0000	1.110
+++ .cvsignore	23 Dec 2009 18:20:27 -0000	1.111
@@ -167,3 +167,5 @@ NetworkManager-0.7.1.998.tar.bz2
 network-manager-applet-0.7.1.998.tar.bz2
 NetworkManager-0.7.2.tar.bz2
 network-manager-applet-0.7.2.tar.bz2
+NetworkManager-0.7.2.git20091223.tar.bz2
+network-manager-applet-0.7.2.git20091223.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- NetworkManager.spec	23 Nov 2009 21:46:34 -0000	1.284
+++ NetworkManager.spec	23 Dec 2009 18:20:27 -0000	1.285
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
+%define snapshot .git20091223
+%define applet_snapshot .git20091223
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.2
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -347,6 +347,18 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Dec 23 2009 Dan Williams <dcbw at redhat.com> - 0.7.2-2.git20091223
+- nm: allow more connect time for 'hso' mobile broadband devices (rh #514827)
+- nm: fix reconnections on some Option 'hso' devices
+- nm: add support for more ZTE mobile broadband devices
+- ifcfg-rh: treat MODE=AUTO as infrastructure mode
+- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
+- ifcfg-rh: add support for reading and writing routes files (rh #507307)
+- applet: fix potential leakage of secrets onto the system bus (rh #546115) (CVE-2009-4145)
+- applet: fix possible connections to spoofed WPA Enterprise networks (rh #546793) (CVE-2009-4144)
+- applet: add "Disable Notifications" option
+- applet: fix blank notification with certain characters
+
 * Mon Nov 23 2009 Dan Williams <dcbw at redhat.com> - 0.7.2
 - nm: fix VPN crash with NULL secrets (rh #532084)
 - nm: validate pidfile and quit early if NM is already running (rh #517362)

nm-applet-internal-buildfixes.patch:
 configure.ac                      |    4 ----
 src/Makefile.am                   |    8 +++++++-
 src/connection-editor/Makefile.am |    9 ++++++++-
 src/gconf-helpers/Makefile.am     |    8 +++++++-
 src/utils/Makefile.am             |    9 ++++++++-
 src/wireless-security/Makefile.am |    8 +++++++-
 6 files changed, 37 insertions(+), 9 deletions(-)

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nm-applet-internal-buildfixes.patch	23 Nov 2009 21:46:34 -0000	1.12
+++ nm-applet-internal-buildfixes.patch	23 Dec 2009 18:20:27 -0000	1.13
@@ -5,10 +5,10 @@ diff -up NetworkManager-0.7.2/network-ma
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.10
--		 NetworkManager >= 0.7.1.998
--		 libnm_glib >= 0.7.1.998
--		 libnm-util >= 0.7.1.998
--		 libnm_glib_vpn >= 0.7.1.998
+-		 NetworkManager >= 0.7.2
+-		 libnm_glib >= 0.7.2
+-		 libnm-util >= 0.7.2
+-		 libnm_glib_vpn >= 0.7.2
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- sources	23 Nov 2009 21:46:34 -0000	1.151
+++ sources	23 Dec 2009 18:20:27 -0000	1.152
@@ -1,2 +1,2 @@
-c370650d7f88495fa00e470557316432  NetworkManager-0.7.2.tar.bz2
-820927582d1170c9d8cc0db3cbe80c96  network-manager-applet-0.7.2.tar.bz2
+b6a326886a429673b7c9a94d3f1f504f  NetworkManager-0.7.2.git20091223.tar.bz2
+f02780d9462a20fbca93a95870f47824  network-manager-applet-0.7.2.git20091223.tar.bz2



From ingvar at fedoraproject.org  Wed Dec 23 18:29:36 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 23 Dec 2009 18:29:36 +0000 (UTC)
Subject: rpms/varnish/EL-5 varnish.changes-2.0.6.patch, NONE, 1.1 varnish.spec,
	1.11, 1.12
Message-ID: <20091223182936.97B1D11C00EF@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32171

Modified Files:
	varnish.spec 
Added Files:
	varnish.changes-2.0.6.patch 
Log Message:
- Added a test that enables jemalloc on ppc if the kernel is
  not a rhel5 kernel (as on redhat builders)
- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
- Added a patch that fixes broken changes-2.0.6.html in doc



varnish.changes-2.0.6.patch:
 changes-2.0.5-2.0.6.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.changes-2.0.6.patch ---
--- doc/changes-2.0.5-2.0.6.xml.orig	2009-12-23 11:42:58.168643121 +0100
+++ doc/changes-2.0.5-2.0.6.xml	2009-12-23 11:43:05.827643574 +0100
@@ -49,5 +49,5 @@
       <para>Document the <code>-C</code> option
       to <code>varnishd</code>.</para>
     </change>
-  <subsystem>
+  </subsystem>
 </group>


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/varnish.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- varnish.spec	21 Dec 2009 22:12:06 -0000	1.11
+++ varnish.spec	23 Dec 2009 18:29:36 -0000	1.12
@@ -1,12 +1,13 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.changes-2.0.6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -68,7 +69,8 @@ Varnish is a high-performance HTTP accel
 # Release tarballs would not need this
 #./autogen.sh
 
-%patch0 -p0
+%patch0
+%patch1
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -93,9 +95,12 @@ cp bin/varnishd/default.vcl etc/zope-plo
 # Remove "--disable static" if you want to build static libraries 
 # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
-%configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+	if [[ `uname -r` =~ "2.6.18-.*" ]]
+		then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+		else %configure --disable-static --localstatedir=/var/lib
+	fi
 %else
-%configure --disable-static --localstatedir=/var/lib
+	%configure --disable-static --localstatedir=/var/lib
 %endif
 
 # We have to remove rpath - not allowed in Fedora
@@ -124,6 +129,11 @@ tail -n +11 etc/default.vcl >> redhat/de
 	redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
 %endif
 
+# Fix for broken changes-2.0.6.html
+pushd doc
+%{__make} clean; %{__make}
+popd
+
 %check
 # rhel5 on ppc64 is just too strange
 %ifarch ppc64
@@ -132,6 +142,15 @@ tail -n +11 etc/default.vcl >> redhat/de
 	%endif
 %endif
 
+# The redhat ppc builders seem to have some ulimit problems?
+# These tests work on a rhel4 ppc/ppc64 instance outside the builders
+%ifarch ppc64 ppc
+	%if 0%{?rhel} == 4
+		rm bin/varnishtest/tests/c00031.vtc
+		rm bin/varnishtest/tests/r00387.vtc
+	%endif
+%endif
+
 LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo
 %{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
 
@@ -235,7 +254,14 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Thu Dec 17 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
+* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2
+- Added a test that enables jemalloc on ppc if the kernel is
+  not a rhel5 kernel (as on redhat builders)
+- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
+  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
+- Added a patch that fixes broken changes-2.0.6.html in doc
+
+* Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
 - New upstream release
 - Removed patches for libjemalloc, as they are added upstream
 



From ingvar at fedoraproject.org  Wed Dec 23 18:34:31 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 23 Dec 2009 18:34:31 +0000 (UTC)
Subject: rpms/varnish/EL-4 varnish.changes-2.0.6.patch, NONE, 1.1 varnish.spec,
	1.21, 1.22
Message-ID: <20091223183431.C74E211C00EF@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv812

Modified Files:
	varnish.spec 
Added Files:
	varnish.changes-2.0.6.patch 
Log Message:
- Added a test that enables jemalloc on ppc if the kernel is
  not a rhel5 kernel (as on redhat builders)
- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
- Added a patch that fixes broken changes-2.0.6.html in doc



varnish.changes-2.0.6.patch:
 changes-2.0.5-2.0.6.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.changes-2.0.6.patch ---
--- doc/changes-2.0.5-2.0.6.xml.orig	2009-12-23 11:42:58.168643121 +0100
+++ doc/changes-2.0.5-2.0.6.xml	2009-12-23 11:43:05.827643574 +0100
@@ -49,5 +49,5 @@
       <para>Document the <code>-C</code> option
       to <code>varnishd</code>.</para>
     </change>
-  <subsystem>
+  </subsystem>
 </group>


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-4/varnish.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- varnish.spec	21 Dec 2009 22:14:03 -0000	1.21
+++ varnish.spec	23 Dec 2009 18:34:31 -0000	1.22
@@ -1,12 +1,13 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.changes-2.0.6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -68,7 +69,8 @@ Varnish is a high-performance HTTP accel
 # Release tarballs would not need this
 #./autogen.sh
 
-%patch0 -p0
+%patch0
+%patch1
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -93,9 +95,12 @@ cp bin/varnishd/default.vcl etc/zope-plo
 # Remove "--disable static" if you want to build static libraries 
 # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
-%configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+	if [[ `uname -r` =~ "2.6.18-.*" ]]
+		then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+		else %configure --disable-static --localstatedir=/var/lib
+	fi
 %else
-%configure --disable-static --localstatedir=/var/lib
+	%configure --disable-static --localstatedir=/var/lib
 %endif
 
 # We have to remove rpath - not allowed in Fedora
@@ -124,6 +129,11 @@ tail -n +11 etc/default.vcl >> redhat/de
 	redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
 %endif
 
+# Fix for broken changes-2.0.6.html
+pushd doc
+%{__make} clean; %{__make}
+popd
+
 %check
 # rhel5 on ppc64 is just too strange
 %ifarch ppc64
@@ -132,6 +142,15 @@ tail -n +11 etc/default.vcl >> redhat/de
 	%endif
 %endif
 
+# The redhat ppc builders seem to have some ulimit problems?
+# These tests work on a rhel4 ppc/ppc64 instance outside the builders
+%ifarch ppc64 ppc
+	%if 0%{?rhel} == 4
+		rm bin/varnishtest/tests/c00031.vtc
+		rm bin/varnishtest/tests/r00387.vtc
+	%endif
+%endif
+
 LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo
 %{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
 
@@ -235,8 +254,16 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2
+- Added a test that enables jemalloc on ppc if the kernel is
+  not a rhel5 kernel (as on redhat builders)
+- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
+  on the Red Hat ppc builders (but works on my rhel4 ppc instance)
+- Added a patch that fixes broken changes-2.0.6.html in doc
+
 * Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
 - New upstream release
+- Removed patches for libjemalloc, as they are added upstream
 
 * Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
 - New upstream release



From dwalsh at fedoraproject.org  Wed Dec 23 18:37:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 23 Dec 2009 18:37:23 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch, 1.23,
	1.24 selinux-policy.spec, 1.948, 1.949
Message-ID: <20091223183723.6459C11C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1307

Modified Files:
	policy-F13.patch selinux-policy.spec 
Log Message:
* Wed Dec 23 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-4
- Cleanups from dgrift


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   61 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  342 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   32 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  370 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  213 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  122 ++
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   35 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   35 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   19 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   22 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   52 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   90 +
 policy/modules/services/denyhosts.te      |   72 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   25 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   48 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   50 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   20 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  284 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  353 ++++++
 policy/modules/services/xserver.te        |  364 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  163 ++
 policy/modules/system/init.te             |  299 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   27 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  198 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   12 
 policy/support/obj_perm_sets.spt          |   20 
 policy/users                              |   15 
 377 files changed, 20020 insertions(+), 2763 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- policy-F13.patch	23 Dec 2009 13:02:27 -0000	1.23
+++ policy-F13.patch	23 Dec 2009 18:37:22 -0000	1.24
@@ -4657,8 +4657,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.te serefpolicy-3.7.5/policy/modules/apps/sambagui.te
 --- nsaserefpolicy/policy/modules/apps/sambagui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/apps/sambagui.te	2009-12-21 13:07:09.000000000 -0500
-@@ -0,0 +1,60 @@
++++ serefpolicy-3.7.5/policy/modules/apps/sambagui.te	2009-12-23 12:39:59.000000000 -0500
+@@ -0,0 +1,61 @@
 +policy_module(sambagui,1.0.0)
 +
 +########################################
@@ -4675,6 +4675,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +# system-config-samba local policy
 +#
 +
++allow sambagui_t self:capability dac_override;  
 +allow sambagui_t self:fifo_file rw_fifo_file_perms;
 +allow sambagui_t self:unix_dgram_socket create_socket_perms;
 +
@@ -4952,8 +4953,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.7.5/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/apps/sandbox.te	2009-12-21 14:43:49.000000000 -0500
-@@ -0,0 +1,340 @@
++++ serefpolicy-3.7.5/policy/modules/apps/sandbox.te	2009-12-23 12:55:41.000000000 -0500
+@@ -0,0 +1,342 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -5196,6 +5197,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +allow sandbox_web_client_t self:dbus { acquire_svc send_msg };
 +allow sandbox_web_client_t self:netlink_selinux_socket create_socket_perms;
 +
++kernel_dontaudit_search_kernel_sysctl(sandbox_web_client_t)
++
 +dev_read_rand(sandbox_web_client_t)
 +
 +# Browse the web, connect to printer
@@ -6455,7 +6458,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.7.5/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/kernel/files.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/files.if	2009-12-23 12:48:27.000000000 -0500
 @@ -932,10 +932,8 @@
  	relabel_lnk_files_pattern($1, { file_type $2 }, { file_type $2 })
  	relabel_fifo_files_pattern($1, { file_type $2 }, { file_type $2 })
@@ -6969,7 +6972,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.7.5/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.if	2009-12-23 07:46:46.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.if	2009-12-23 08:58:51.000000000 -0500
 @@ -906,7 +906,7 @@
  		type cifs_t;
  	')
@@ -7014,7 +7017,32 @@ diff --exclude-from=exclude -N -u -r nsa
  #########################################
  ## <summary>
  ##	Read named sockets on a NFS filesystem.
-@@ -4181,3 +4200,175 @@
+@@ -3684,6 +3703,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Search the XENFS filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_search_xenfs',`
++	gen_require(`
++		type xenfs_t;
++	')
++
++	allow $1 xenfs_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
+ ##	Mount a XENFS filesystem.
+ ## </summary>
+ ## <param name="domain">
+@@ -4181,3 +4218,175 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
@@ -12576,7 +12604,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cgroup.fc serefpolicy-3.7.5/policy/modules/services/cgroup.fc
 --- nsaserefpolicy/policy/modules/services/cgroup.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/cgroup.fc	2009-12-22 11:06:28.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/cgroup.fc	2009-12-23 13:32:50.000000000 -0500
 @@ -0,0 +1,7 @@
 +/etc/rc\.d/init\.d/cgconfig	-- gen_context(system_u:object_r:cgconfig_initrc_exec_t, s0)
 +/etc/rc\.d/init\.d/cgred	-- gen_context(system_u:object_r:cgred_initrc_exec_t, s0)
@@ -14100,7 +14128,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/usr/local/linuxprinter/ppd(/.*)?      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.7.5/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/cups.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/cups.te	2009-12-23 12:11:21.000000000 -0500
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -14162,7 +14190,15 @@ diff --exclude-from=exclude -N -u -r nsa
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_bind_all_rpc_ports(cupsd_t)
-@@ -250,6 +262,7 @@
+@@ -191,6 +203,7 @@
+ 
+ fs_getattr_all_fs(cupsd_t)
+ fs_search_auto_mountpoints(cupsd_t)
++fs_search_fusefs(cupsd_t)
+ fs_read_anon_inodefs_files(cupsd_t)
+ 
+ mls_file_downgrade(cupsd_t)
+@@ -250,6 +263,7 @@
  miscfiles_read_localization(cupsd_t)
  # invoking ghostscript needs to read fonts
  miscfiles_read_fonts(cupsd_t)
@@ -14170,7 +14206,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  seutil_read_config(cupsd_t)
  sysnet_exec_ifconfig(cupsd_t)
-@@ -317,6 +330,10 @@
+@@ -317,6 +331,10 @@
  ')
  
  optional_policy(`
@@ -14181,7 +14217,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	udev_read_db(cupsd_t)
  ')
  
-@@ -327,7 +344,7 @@
+@@ -327,7 +345,7 @@
  
  allow cupsd_config_t self:capability { chown dac_override sys_tty_config };
  dontaudit cupsd_config_t self:capability sys_tty_config;
@@ -14190,7 +14226,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
  allow cupsd_config_t self:unix_stream_socket create_socket_perms;
  allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
-@@ -378,6 +395,8 @@
+@@ -378,6 +396,8 @@
  dev_read_rand(cupsd_config_t)
  dev_rw_generic_usb_dev(cupsd_config_t)
  
@@ -14199,7 +14235,7 @@ diff --exclude-from=exclude -N -u -r nsa
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
  
-@@ -407,6 +426,7 @@
+@@ -407,6 +427,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
  userdom_dontaudit_search_user_home_dirs(cupsd_config_t)
@@ -14207,7 +14243,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  cups_stream_connect(cupsd_config_t)
  
-@@ -419,12 +439,15 @@
+@@ -419,12 +440,15 @@
  ')
  
  optional_policy(`
@@ -14225,7 +14261,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  	optional_policy(`
  		hal_dbus_chat(cupsd_config_t)
-@@ -446,6 +469,10 @@
+@@ -446,6 +470,10 @@
  ')
  
  optional_policy(`
@@ -14236,7 +14272,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	rpm_read_db(cupsd_config_t)
  ')
  
-@@ -457,6 +484,10 @@
+@@ -457,6 +485,10 @@
  	udev_read_db(cupsd_config_t)
  ')
  
@@ -14247,7 +14283,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
  #
  # Cups lpd support
-@@ -542,6 +573,8 @@
+@@ -542,6 +574,8 @@
  manage_dirs_pattern(cups_pdf_t, cups_pdf_tmp_t, cups_pdf_tmp_t)
  files_tmp_filetrans(cups_pdf_t, cups_pdf_tmp_t, { file dir })
  
@@ -14256,7 +14292,7 @@ diff --exclude-from=exclude -N -u -r nsa
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -556,11 +589,15 @@
+@@ -556,11 +590,15 @@
  miscfiles_read_fonts(cups_pdf_t)
  
  userdom_home_filetrans_user_home_dir(cups_pdf_t)
@@ -14272,7 +14308,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(cups_pdf_t)
-@@ -601,6 +638,9 @@
+@@ -601,6 +639,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -14282,7 +14318,7 @@ diff --exclude-from=exclude -N -u -r nsa
  manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t)
  files_tmp_filetrans(hplip_t, hplip_tmp_t, fifo_file )
  
-@@ -627,6 +667,7 @@
+@@ -627,6 +668,7 @@
  corenet_tcp_connect_ipp_port(hplip_t)
  corenet_sendrecv_hplip_client_packets(hplip_t)
  corenet_receive_hplip_server_packets(hplip_t)
@@ -14954,7 +14990,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.7.5/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/dovecot.te	2009-12-22 15:39:45.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/dovecot.te	2009-12-23 12:49:57.000000000 -0500
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -14964,10 +15000,15 @@ diff --exclude-from=exclude -N -u -r nsa
  allow dovecot_t self:fifo_file rw_fifo_file_perms;
  allow dovecot_t self:tcp_socket create_stream_socket_perms;
  allow dovecot_t self:unix_dgram_socket create_socket_perms;
-@@ -73,8 +73,9 @@
+@@ -73,8 +73,14 @@
  
  can_exec(dovecot_t, dovecot_exec_t)
  
++# Allow dovecot to create and read SSL parameters file
++manage_files_pattern(dovecot_t, dovecot_var_lib_t, dovecot_var_lib_t)
++files_search_var_lib(dovecot_t)
++files_read_var_symlinks(dovecot_t)
++
 +manage_dirs_pattern(dovecot_t, dovecot_var_log_t, dovecot_var_log_t)
  manage_files_pattern(dovecot_t, dovecot_var_log_t, dovecot_var_log_t)
 -logging_log_filetrans(dovecot_t, dovecot_var_log_t, file)
@@ -14975,7 +15016,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  manage_dirs_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
  manage_files_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
-@@ -103,6 +104,7 @@
+@@ -103,6 +109,7 @@
  dev_read_urand(dovecot_t)
  
  fs_getattr_all_fs(dovecot_t)
@@ -14983,7 +15024,7 @@ diff --exclude-from=exclude -N -u -r nsa
  fs_search_auto_mountpoints(dovecot_t)
  fs_list_inotifyfs(dovecot_t)
  
-@@ -142,6 +144,10 @@
+@@ -142,6 +149,10 @@
  ')
  
  optional_policy(`
@@ -14994,7 +15035,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	seutil_sigchld_newrole(dovecot_t)
  ')
  
-@@ -159,7 +165,7 @@
+@@ -159,7 +170,7 @@
  #
  
  allow dovecot_auth_t self:capability { chown dac_override setgid setuid };
@@ -15003,6 +15044,30 @@ diff --exclude-from=exclude -N -u -r nsa
  allow dovecot_auth_t self:fifo_file rw_fifo_file_perms;
  allow dovecot_auth_t self:unix_dgram_socket create_socket_perms;
  allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms;
+@@ -172,11 +183,6 @@
+ manage_files_pattern(dovecot_auth_t, dovecot_auth_tmp_t, dovecot_auth_tmp_t)
+ files_tmp_filetrans(dovecot_auth_t, dovecot_auth_tmp_t, { file dir })
+ 
+-# Allow dovecot to create and read SSL parameters file
+-manage_files_pattern(dovecot_t, dovecot_var_lib_t, dovecot_var_lib_t)
+-files_search_var_lib(dovecot_t)
+-files_read_var_symlinks(dovecot_t)
+-
+ allow dovecot_auth_t dovecot_var_run_t:dir list_dir_perms;
+ manage_sock_files_pattern(dovecot_auth_t, dovecot_var_run_t, dovecot_var_run_t)
+ dovecot_stream_connect_auth(dovecot_auth_t)
+@@ -197,9 +203,9 @@
+ files_search_pids(dovecot_auth_t)
+ files_read_usr_files(dovecot_auth_t)
+ files_read_usr_symlinks(dovecot_auth_t)
++files_read_var_lib_files(dovecot_auth_t)
+ files_search_tmp(dovecot_auth_t)
+-files_read_var_lib_files(dovecot_t)
+-
++files_search_var_log(dovecot_auth_t)
+ init_rw_utmp(dovecot_auth_t)
+ 
+ miscfiles_read_localization(dovecot_auth_t)
 @@ -220,15 +226,23 @@
  ')
  
@@ -16761,7 +16826,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Send a generic signal to MySQL.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.7.5/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/mysql.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/mysql.te	2009-12-23 12:06:39.000000000 -0500
 @@ -1,6 +1,13 @@
  
  policy_module(mysql, 1.11.1)
@@ -16788,7 +16853,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ifdef(`distro_redhat',`
  	# because Fedora has the sock_file in the database directory
  	type_transition mysqld_t mysqld_db_t:sock_file mysqld_var_run_t;
-@@ -131,20 +143,22 @@
+@@ -131,20 +143,24 @@
  # Local mysqld_safe policy
  #
  
@@ -16806,6 +16871,8 @@ diff --exclude-from=exclude -N -u -r nsa
  
  domain_read_all_domains_state(mysqld_safe_t)
  
++files_dontaudit_search_all_mountpoints(mysqld_safe_t)
++
  logging_log_filetrans(mysqld_safe_t, mysqld_log_t, file)
  
  kernel_read_system_state(mysqld_safe_t)
@@ -19336,7 +19403,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.7.5/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/policykit.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/policykit.te	2009-12-23 12:07:18.000000000 -0500
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
@@ -19354,7 +19421,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  policykit_domtrans_auth(policykit_t)
  
-@@ -57,32 +58,52 @@
+@@ -57,10 +58,14 @@
  manage_files_pattern(policykit_t, policykit_var_run_t, policykit_var_run_t)
  files_pid_filetrans(policykit_t, policykit_var_run_t, { file dir })
  
@@ -19363,12 +19430,13 @@ diff --exclude-from=exclude -N -u -r nsa
  
  files_read_etc_files(policykit_t)
  files_read_usr_files(policykit_t)
- 
-+fs_list_inotifyfs(policykit_t)
++files_dontaudit_search_all_mountpoints(policykit_t)
 +
++fs_list_inotifyfs(policykit_t)
+ 
  auth_use_nsswitch(policykit_t)
  
- logging_send_syslog_msg(policykit_t)
+@@ -68,21 +73,38 @@
  
  miscfiles_read_localization(policykit_t)
  
@@ -19411,7 +19479,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -92,21 +113,25 @@
+@@ -92,21 +114,25 @@
  manage_files_pattern(policykit_auth_t, policykit_var_run_t, policykit_var_run_t)
  files_pid_filetrans(policykit_auth_t, policykit_var_run_t, { file dir })
  
@@ -19440,7 +19508,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -119,6 +144,14 @@
+@@ -119,6 +145,14 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -19455,7 +19523,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
  #
  # polkit_grant local policy
-@@ -126,7 +159,8 @@
+@@ -126,7 +160,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -19465,7 +19533,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow policykit_grant_t self:unix_dgram_socket create_socket_perms;
  allow policykit_grant_t self:unix_stream_socket create_stream_socket_perms;
  
-@@ -156,9 +190,12 @@
+@@ -156,9 +191,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -19479,7 +19547,7 @@ diff --exclude-from=exclude -N -u -r nsa
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -170,7 +207,8 @@
+@@ -170,7 +208,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -26477,7 +26545,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.7.5/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/xserver.te	2009-12-22 09:44:04.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/xserver.te	2009-12-23 09:07:52.000000000 -0500
 @@ -36,6 +36,13 @@
  
  ## <desc>
@@ -26903,12 +26971,12 @@ diff --exclude-from=exclude -N -u -r nsa
  
  logging_read_generic_logs(xdm_t)
  
-+miscfiles_manage_fonts_cache(xserver_t)
 +miscfiles_search_man_pages(xdm_t)
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
 -
 -sysnet_read_config(xdm_t)
++miscfiles_manage_fonts_cache(xdm_t)
 +miscfiles_manage_localization(xdm_t)
 +miscfiles_read_hwdata(xdm_t)
  
@@ -28945,7 +29013,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +permissive kdump_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.7.5/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-23 07:33:05.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-23 12:43:23.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -29161,7 +29229,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +316,114 @@
+@@ -307,10 +316,115 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -29276,6 +29344,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/usr/local/zend/lib/apache2/libphp5\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/usr/lib(64)?/python.*/site-packages/pymedia/muxer\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/local/games/darwinia/lib/libSDL.*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.7.5/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/system/libraries.if	2009-12-21 13:07:09.000000000 -0500
@@ -34735,7 +34804,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.5/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/xen.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/xen.te	2009-12-23 08:58:19.000000000 -0500
 @@ -85,6 +85,7 @@
  type xenconsoled_t;
  type xenconsoled_exec_t;
@@ -34752,7 +34821,16 @@ diff --exclude-from=exclude -N -u -r nsa
  
  storage_raw_read_fixed_disk(xend_t)
  storage_raw_write_fixed_disk(xend_t)
-@@ -421,6 +423,12 @@
+@@ -340,6 +342,8 @@
+ 
+ files_read_usr_files(xenstored_t)
+ 
++fs_search_xenfs(xenstored_t)
++
+ storage_raw_read_fixed_disk(xenstored_t)
+ storage_raw_write_fixed_disk(xenstored_t)
+ storage_raw_read_removable_device(xenstored_t)
+@@ -421,6 +425,12 @@
  xen_stream_connect_xenstore(xm_t)
  
  optional_policy(`
@@ -34765,7 +34843,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	virt_manage_images(xm_t)
  	virt_stream_connect(xm_t)
  ')
-@@ -438,6 +446,8 @@
+@@ -438,6 +448,8 @@
  	fs_manage_xenfs_dirs(xm_ssh_t)
  	fs_manage_xenfs_files(xm_ssh_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.948
retrieving revision 1.949
diff -u -p -r1.948 -r1.949
--- selinux-policy.spec	23 Dec 2009 13:02:27 -0000	1.948
+++ selinux-policy.spec	23 Dec 2009 18:37:23 -0000	1.949
@@ -1,4 +1,4 @@
-%define distro redhat
+t%define distro redhat
 %define polyinstatiate n
 %define monolithic n
 %if %{?BUILD_TARGETED:0}%{!?BUILD_TARGETED:1}
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.7.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz



From dwalsh at fedoraproject.org  Wed Dec 23 18:39:12 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 23 Dec 2009 18:39:12 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.949,1.950
Message-ID: <20091223183912.5F38611C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/pkgs/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1708

Modified Files:
	selinux-policy.spec 
Log Message:
* Wed Dec 23 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-4
- Cleanups from dgrift



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.949
retrieving revision 1.950
diff -u -p -r1.949 -r1.950
--- selinux-policy.spec	23 Dec 2009 18:37:23 -0000	1.949
+++ selinux-policy.spec	23 Dec 2009 18:39:12 -0000	1.950
@@ -1,4 +1,4 @@
-t%define distro redhat
+%define distro redhat
 %define polyinstatiate n
 %define monolithic n
 %if %{?BUILD_TARGETED:0}%{!?BUILD_TARGETED:1}



From dwalsh at fedoraproject.org  Wed Dec 23 18:42:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 23 Dec 2009 18:42:32 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.160,
	1.161 selinux-policy.spec, 1.987, 1.988
Message-ID: <20091223184232.3AC6611C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2279

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Dec 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-64
- Update to Rawhide filesystem.if file
- Allow abrt to read nfs
- Allow cups to search fusefs
- Allow dovecot_auth to search var_log
- Fix label on ksmtuned.pid
- Dontaudit policykit looking at mount points
- Allow xdm to manage /var/cache/fontconfig
- Allow xenstored to search xenfs


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    2 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   82 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  188 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  189 +++
 policy/modules/apps/sandbox.te            |  338 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   49 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   50 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  475 ++++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  423 +++++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  442 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   69 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  120 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  457 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   36 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   18 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   53 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   35 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   53 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   18 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   25 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  118 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   32 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   68 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   16 
 policy/modules/services/prelude.te        |    3 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   91 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   87 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    1 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   60 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  285 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  665 ++++++++++-
 policy/modules/services/xserver.te        |  384 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  184 +++
 policy/modules/system/init.te             |  292 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   78 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   23 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  195 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   93 +
 policy/modules/system/miscfiles.te        |    5 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   83 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  114 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1702 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  146 ++
 policy/support/obj_perm_sets.spt          |   31 
 policy/users                              |   13 
 413 files changed, 21983 insertions(+), 2838 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- policy-F12.patch	22 Dec 2009 21:23:31 -0000	1.160
+++ policy-F12.patch	23 Dec 2009 18:42:31 -0000	1.161
@@ -4816,7 +4816,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.te serefpolicy-3.6.32/policy/modules/apps/sambagui.te
 --- nsaserefpolicy/policy/modules/apps/sambagui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sambagui.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/sambagui.te	2009-12-23 12:39:44.000000000 -0500
 @@ -0,0 +1,60 @@
 +policy_module(sambagui,1.0.0)
 +
@@ -4833,7 +4833,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +# system-config-samba local policy
 +#
-+
++allow sambagui_t self:capability dac_override;  
 +allow sambagui_t self:fifo_file rw_fifo_file_perms;
 +allow sambagui_t self:unix_dgram_socket create_socket_perms;
 +
@@ -5078,8 +5078,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.6.32/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-12-21 14:31:10.000000000 -0500
-@@ -0,0 +1,336 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-12-23 12:55:36.000000000 -0500
+@@ -0,0 +1,338 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -5318,6 +5318,8 @@ diff -b -B --ignore-all-space --exclude-
 +allow sandbox_web_client_t self:dbus { acquire_svc send_msg };
 +allow sandbox_web_client_t self:netlink_selinux_socket create_socket_perms;
 +
++kernel_dontaudit_search_kernel_sysctl(sandbox_web_client_t)
++
 +dev_read_rand(sandbox_web_client_t)
 +
 +# Browse the web, connect to printer
@@ -7015,7 +7017,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.32/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/domain.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/domain.te	2009-12-23 07:51:15.000000000 -0500
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -7875,22 +7877,13 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.32/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-12-18 15:27:02.000000000 -0500
-@@ -290,7 +290,7 @@
- 
- ########################################
- ## <summary>
--##	Read and write files on anon_inodefs
-+##	Dontaudit Read and write files on anon_inodefs
- ##	file systems.
- ## </summary>
- ## <param name="domain">
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-12-23 12:11:00.000000000 -0500
 @@ -310,6 +310,26 @@
  
  ########################################
  ## <summary>
-+##	Dontaudit Read and write files on anon_inodefs
-+##	file systems.
++##	Do not audit attempts to read or write files on
++##	anon_inodefs file systems.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -7904,7 +7897,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	')
 +
-+	dontaudit $1 anon_inodefs_t:file { read write };  
++	dontaudit $1 anon_inodefs_t:file rw_file_perms;
 +')
 +
 +########################################
@@ -7927,40 +7920,40 @@ diff -b -B --ignore-all-space --exclude-
  
 +#######################################
 +## <summary>
-+##      Create, read, write, and delete dirs
-+##      on a configfs filesystem.
++##	Create, read, write, and delete dirs
++##	on a configfs filesystem.
 +## </summary>
 +## <param name="domain">
-+##      <summary>
-+##      Domain allowed access.
-+##      </summary>
++##	<summary>
++##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
 +interface(`fs_manage_configfs_dirs',`
-+        gen_require(`
-+                type configfs_t;
-+        ')
++	gen_require(`
++		type configfs_t;
++	')
 +
-+        manage_dirs_pattern($1,configfs_t,configfs_t)
++	manage_dirs_pattern($1, configfs_t, configfs_t)
 +')
 +
 +#######################################
 +## <summary>
-+##      Create, read, write, and delete files
-+##      on a configfs filesystem.
++##	Create, read, write, and delete files
++##	on a configfs filesystem.
 +## </summary>
 +## <param name="domain">
-+##      <summary>
-+##      Domain allowed access.
-+##      </summary>
++##	<summary>
++##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
 +interface(`fs_manage_configfs_files',`
-+        gen_require(`
-+                type configfs_t;
-+        ')
++	gen_require(`
++		type configfs_t;
++	')
 +
-+        manage_files_pattern($1,configfs_t,configfs_t)
++	manage_files_pattern($1, configfs_t, configfs_t)
 +')
 +
  ########################################
@@ -8061,7 +8054,7 @@ diff -b -B --ignore-all-space --exclude-
 +		type nfsd_fs_t;
 +	')
 +
-+	allow $1 nfsd_fs_t:file getattr;
++	getattr_files_pattern($1, nfsd_fs_t, nfsd_fs_t)
 +')
 +
 +########################################
@@ -8069,34 +8062,29 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write NFS server files.
  ## </summary>
  ## <param name="domain">
-@@ -3971,3 +4102,159 @@
- 	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
- 	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
- ')
-+
-+########################################
-+## <summary>
-+##	Do not audit attempts to read
-+##	dirs on a CIFS or SMB filesystem.
+@@ -3572,6 +3703,122 @@
+ 
+ ########################################
+ ## <summary>
++##	Mount a XENFS filesystem.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
-+##	Domain to not audit.
++##	Domain allowed access.
 +##	</summary>
 +## </param>
 +#
-+interface(`fs_dontaudit_list_cifs_dirs',`
++interface(`fs_mount_xenfs',`
 +	gen_require(`
-+		type cifs_t;
++		type xenfs_t;
 +	')
 +
-+	dontaudit $1 cifs_t:dir list_dir_perms;
++	allow $1 xenfs_t:filesystem mount;
 +')
 +
-+
 +########################################
 +## <summary>
-+##	Mount a XENFS filesystem.
++##	Search the XENFS filesystem.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -8104,12 +8092,12 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`fs_mount_xenfs',`
++interface(`fs_search_xenfs',`
 +	gen_require(`
 +		type xenfs_t;
 +	')
 +
-+	allow $1 xenfs_t:filesystem mount;
++	allow $1 xenfs_t:dir search_dir_perms;
 +')
 +
 +########################################
@@ -8194,6 +8182,55 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
+ ##	Mount all filesystems.
+ ## </summary>
+ ## <param name="domain">
+@@ -3971,3 +4218,175 @@
+ 	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
+ 	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
+ ')
++
++########################################
++## <summary>
++##      list dirs on cgroup
++##      file systems.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`fs_list_cgroup_dirs', `
++        gen_require(`
++                type cgroup_t;
++
++        ')
++
++        list_dirs_pattern($1, cgroup_t, cgroup_t)
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to read
++##	dirs on a CIFS or SMB filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`fs_dontaudit_list_cifs_dirs',`
++	gen_require(`
++		type cifs_t;
++	')
++
++	dontaudit $1 cifs_t:dir list_dir_perms;
++')
++
++########################################
++## <summary>
 +##	Manage dirs on cgroup file systems.
 +## </summary>
 +## <param name="domain">
@@ -8229,6 +8266,101 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	rw_files_pattern($1, cgroup_t, cgroup_t)
 +')
++########################################
++## <summary>
++##	Mount a cgroup filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_mount_cgroup_fs', `
++	gen_require(`
++		type cgroup_t;
++	')
++
++	allow $1 cgroup_t:filesystem mount;
++')
++
++########################################
++## <summary>
++##	Remount a cgroup filesystem  This allows
++##	some mount options to be changed.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_remount_cgroup_fs', `
++	gen_require(`
++		type cgroup_t;
++	')
++
++	allow $1 cgroup_t:filesystem remount;
++')
++
++########################################
++## <summary>
++##	Unmount a cgroup file system.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_unmount_cgroup_fs', `
++	gen_require(`
++		type cgroup_t;
++	')
++
++	allow $1 cgroup_t:filesystem unmount;
++')
++
++########################################
++## <summary>
++##	Set attributes of files on cgroup
++##	file systems.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_setattr_cgroup_files',`
++	gen_require(`
++		type cgroup_t;
++
++	')
++
++	setattr_files_pattern($1, cgroup_t, cgroup_t)
++')
++
++########################################
++## <summary>
++##	Write files on cgroup
++##	file systems.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_write_cgroup_files', `
++	gen_require(`
++		type cgroup_t;
++
++	')
++
++	write_files_pattern($1, cgroup_t, cgroup_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.6.32/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.te	2009-12-17 11:20:45.000000000 -0500
@@ -8308,7 +8440,7 @@ diff -b -B --ignore-all-space --exclude-
  # Rules for all filesystem types
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.32/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/kernel.if	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/kernel.if	2009-12-23 12:55:00.000000000 -0500
 @@ -485,6 +485,25 @@
  
  ########################################
@@ -10901,7 +11033,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-22 08:42:28.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-23 07:13:32.000000000 -0500
 @@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -10949,7 +11081,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(abrt_t, abrt_var_run_t, { file dir })
  
  kernel_read_ring_buffer(abrt_t)
-@@ -75,18 +90,34 @@
+@@ -75,18 +90,35 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -10980,11 +11112,12 @@ diff -b -B --ignore-all-space --exclude-
  fs_getattr_all_fs(abrt_t)
  fs_getattr_all_dirs(abrt_t)
 +fs_read_fusefs_files(abrt_t)
++fs_read_nfs_files(abrt_t)
 +fs_search_all(abrt_t)
  
  sysnet_read_config(abrt_t)
  
-@@ -96,22 +127,90 @@
+@@ -96,22 +128,90 @@
  miscfiles_read_certs(abrt_t)
  miscfiles_read_localization(abrt_t)
  
@@ -15219,7 +15352,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/local/linuxprinter/ppd(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.32/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-12-23 12:11:24.000000000 -0500
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -15281,7 +15414,15 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_bind_all_rpc_ports(cupsd_t)
-@@ -232,6 +244,7 @@
+@@ -191,6 +203,7 @@
+ 
+ fs_getattr_all_fs(cupsd_t)
+ fs_search_auto_mountpoints(cupsd_t)
++fs_search_fusefs(cupsd_t)
+ fs_read_anon_inodefs_files(cupsd_t)
+ 
+ mls_file_downgrade(cupsd_t)
+@@ -232,6 +245,7 @@
  selinux_compute_access_vector(cupsd_t)
  selinux_validate_context(cupsd_t)
  
@@ -15289,7 +15430,7 @@ diff -b -B --ignore-all-space --exclude-
  init_exec_script_files(cupsd_t)
  init_read_utmp(cupsd_t)
  
-@@ -250,6 +263,7 @@
+@@ -250,6 +264,7 @@
  miscfiles_read_localization(cupsd_t)
  # invoking ghostscript needs to read fonts
  miscfiles_read_fonts(cupsd_t)
@@ -15297,7 +15438,7 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(cupsd_t)
  sysnet_exec_ifconfig(cupsd_t)
-@@ -317,6 +331,10 @@
+@@ -317,6 +332,10 @@
  ')
  
  optional_policy(`
@@ -15308,7 +15449,7 @@ diff -b -B --ignore-all-space --exclude-
  	udev_read_db(cupsd_t)
  ')
  
-@@ -327,7 +345,7 @@
+@@ -327,7 +346,7 @@
  
  allow cupsd_config_t self:capability { chown dac_override sys_tty_config };
  dontaudit cupsd_config_t self:capability sys_tty_config;
@@ -15317,7 +15458,7 @@ diff -b -B --ignore-all-space --exclude-
  allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
  allow cupsd_config_t self:unix_stream_socket create_socket_perms;
  allow cupsd_config_t self:unix_dgram_socket create_socket_perms;
-@@ -378,6 +396,8 @@
+@@ -378,6 +397,8 @@
  dev_read_rand(cupsd_config_t)
  dev_rw_generic_usb_dev(cupsd_config_t)
  
@@ -15326,7 +15467,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
  
-@@ -407,6 +427,7 @@
+@@ -407,6 +428,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
  userdom_dontaudit_search_user_home_dirs(cupsd_config_t)
@@ -15334,7 +15475,7 @@ diff -b -B --ignore-all-space --exclude-
  
  cups_stream_connect(cupsd_config_t)
  
-@@ -419,12 +440,15 @@
+@@ -419,12 +441,15 @@
  ')
  
  optional_policy(`
@@ -15352,7 +15493,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		hal_dbus_chat(cupsd_config_t)
-@@ -446,6 +470,10 @@
+@@ -446,6 +471,10 @@
  ')
  
  optional_policy(`
@@ -15363,7 +15504,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_read_db(cupsd_config_t)
  ')
  
-@@ -457,6 +485,10 @@
+@@ -457,6 +486,10 @@
  	udev_read_db(cupsd_config_t)
  ')
  
@@ -15374,7 +15515,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Cups lpd support
-@@ -542,6 +574,8 @@
+@@ -542,6 +575,8 @@
  manage_dirs_pattern(cups_pdf_t, cups_pdf_tmp_t, cups_pdf_tmp_t)
  files_tmp_filetrans(cups_pdf_t, cups_pdf_tmp_t, { file dir })
  
@@ -15383,7 +15524,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -556,11 +590,15 @@
+@@ -556,11 +591,15 @@
  miscfiles_read_fonts(cups_pdf_t)
  
  userdom_home_filetrans_user_home_dir(cups_pdf_t)
@@ -15399,7 +15540,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(cups_pdf_t)
-@@ -601,6 +639,9 @@
+@@ -601,6 +640,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -15409,7 +15550,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t)
  files_tmp_filetrans(hplip_t, hplip_tmp_t, fifo_file )
  
-@@ -627,6 +668,7 @@
+@@ -627,6 +669,7 @@
  corenet_tcp_connect_ipp_port(hplip_t)
  corenet_sendrecv_hplip_client_packets(hplip_t)
  corenet_receive_hplip_server_packets(hplip_t)
@@ -15973,7 +16114,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.6.32/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-22 15:39:34.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-12-23 12:50:16.000000000 -0500
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -16046,7 +16187,15 @@ diff -b -B --ignore-all-space --exclude-
  allow dovecot_deliver_t dovecot_etc_t:file read_file_perms;
  allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms;
  
-@@ -260,3 +274,18 @@
+@@ -247,6 +261,7 @@
+ dovecot_stream_connect_auth(dovecot_deliver_t)
+ 
+ files_search_tmp(dovecot_deliver_t)
++files_search_var_log(dovecot_auth_t)
+ 
+ fs_getattr_all_fs(dovecot_deliver_t)
+ 
+@@ -260,3 +275,17 @@
  optional_policy(`
  	mta_manage_spool(dovecot_deliver_t)
  ')
@@ -16064,7 +16213,6 @@ diff -b -B --ignore-all-space --exclude-
 +	fs_manage_cifs_files(dovecot_t)
 +	fs_manage_cifs_symlinks(dovecot_t)
 +')
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.6.32/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/exim.te	2009-12-17 11:20:45.000000000 -0500
@@ -17271,13 +17419,13 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(kerneloops_t, kerneloops_tmp_t, kerneloops_tmp_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.fc serefpolicy-3.6.32/policy/modules/services/ksmtuned.fc
 --- nsaserefpolicy/policy/modules/services/ksmtuned.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/ksmtuned.fc	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/ksmtuned.fc	2009-12-23 07:41:19.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ksmtuned	--	gen_context(system_u:object_r:ksmtuned_initrc_exec_t,s0)
 +
 +/usr/sbin/ksmtuned	--	gen_context(system_u:object_r:ksmtuned_exec_t,s0)
 +
-+/var/run/ksmtune\.pid		--	gen_context(system_u:object_r:ntpd_var_run_t,s0)
++/var/run/ksmtune\.pid		--	gen_context(system_u:object_r:ksmtuned_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.if serefpolicy-3.6.32/policy/modules/services/ksmtuned.if
 --- nsaserefpolicy/policy/modules/services/ksmtuned.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/services/ksmtuned.if	2009-12-17 11:20:45.000000000 -0500
@@ -17917,7 +18065,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send a generic signal to MySQL.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.6.32/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/mysql.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/mysql.te	2009-12-23 12:06:27.000000000 -0500
 @@ -1,6 +1,13 @@
  
  policy_module(mysql, 1.11.0)
@@ -20519,7 +20667,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.6.32/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-12-23 12:07:34.000000000 -0500
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
@@ -20537,13 +20685,14 @@ diff -b -B --ignore-all-space --exclude-
  
  policykit_domtrans_auth(policykit_t)
  
-@@ -57,32 +58,53 @@
+@@ -57,32 +58,54 @@
  manage_files_pattern(policykit_t, policykit_var_run_t, policykit_var_run_t)
  files_pid_filetrans(policykit_t, policykit_var_run_t, { file dir })
  
 +kernel_read_system_state(policykit_t)
  kernel_read_kernel_sysctls(policykit_t)
  
++files_dontaudit_search_all_mountpoints(policykit_t)
  files_read_etc_files(policykit_t)
  files_read_usr_files(policykit_t)
  
@@ -20595,7 +20744,7 @@ diff -b -B --ignore-all-space --exclude-
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -92,21 +114,25 @@
+@@ -92,21 +115,25 @@
  manage_files_pattern(policykit_auth_t, policykit_var_run_t, policykit_var_run_t)
  files_pid_filetrans(policykit_auth_t, policykit_var_run_t, { file dir })
  
@@ -20624,7 +20773,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -119,6 +145,14 @@
+@@ -119,6 +146,14 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -20639,7 +20788,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_grant local policy
-@@ -126,7 +160,8 @@
+@@ -126,7 +161,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -20649,7 +20798,7 @@ diff -b -B --ignore-all-space --exclude-
  allow policykit_grant_t self:unix_dgram_socket create_socket_perms;
  allow policykit_grant_t self:unix_stream_socket create_stream_socket_perms;
  
-@@ -156,9 +191,12 @@
+@@ -156,9 +192,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -20663,7 +20812,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -170,7 +208,8 @@
+@@ -170,7 +209,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -28585,7 +28734,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-21 17:51:39.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-23 09:07:45.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -29006,7 +29155,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -460,10 +565,12 @@
+@@ -460,10 +565,13 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -29016,12 +29165,13 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_fonts(xdm_t)
 -
 -sysnet_read_config(xdm_t)
++miscfiles_manage_fonts_cache(xdm_t)
 +miscfiles_manage_localization(xdm_t)
 +miscfiles_read_hwdata(xdm_t)
  
  userdom_dontaudit_use_unpriv_user_fds(xdm_t)
  userdom_create_all_users_keys(xdm_t)
-@@ -472,6 +579,10 @@
+@@ -472,6 +580,10 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -29032,7 +29182,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -504,10 +615,12 @@
+@@ -504,10 +616,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -29045,7 +29195,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -515,12 +628,47 @@
+@@ -515,12 +629,47 @@
  ')
  
  optional_policy(`
@@ -29093,7 +29243,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -535,6 +683,7 @@
+@@ -535,6 +684,7 @@
  optional_policy(`
  	# Do not audit attempts to check whether user root has email
  	mta_dontaudit_getattr_spool_files(xdm_t)
@@ -29101,7 +29251,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -542,6 +691,39 @@
+@@ -542,6 +692,39 @@
  ')
  
  optional_policy(`
@@ -29141,7 +29291,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +732,9 @@
+@@ -550,8 +733,9 @@
  ')
  
  optional_policy(`
@@ -29153,7 +29303,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +743,6 @@
+@@ -560,7 +744,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -29161,7 +29311,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +753,10 @@
+@@ -571,6 +754,10 @@
  ')
  
  optional_policy(`
@@ -29172,7 +29322,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +773,9 @@
+@@ -587,10 +774,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -29184,7 +29334,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -602,9 +787,12 @@
+@@ -602,9 +788,12 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -29197,7 +29347,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +804,14 @@
+@@ -616,13 +805,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -29213,7 +29363,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,9 +824,19 @@
+@@ -635,9 +825,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -29233,7 +29383,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +870,6 @@
+@@ -671,7 +871,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -29241,7 +29391,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -681,9 +879,12 @@
+@@ -681,9 +880,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -29255,7 +29405,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +899,12 @@
+@@ -698,8 +900,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -29268,7 +29418,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +926,8 @@
+@@ -721,6 +927,8 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -29277,7 +29427,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +950,7 @@
+@@ -743,7 +951,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -29286,7 +29436,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +982,20 @@
+@@ -775,12 +983,20 @@
  ')
  
  optional_policy(`
@@ -29308,7 +29458,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,12 +1022,12 @@
+@@ -807,12 +1023,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -29325,7 +29475,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Run xkbcomp.
  allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -828,9 +1043,14 @@
+@@ -828,9 +1044,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -29340,7 +29490,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -845,11 +1065,14 @@
+@@ -845,11 +1066,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -29356,7 +29506,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1105,8 @@
+@@ -882,6 +1106,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -29365,7 +29515,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1131,8 @@
+@@ -906,6 +1132,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -29374,7 +29524,7 @@ diff -b -B --ignore-all-space --exclude-
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -973,17 +1200,49 @@
+@@ -973,17 +1201,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -31475,7 +31625,7 @@ diff -b -B --ignore-all-space --exclude-
 +permissive kdump_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-22 08:51:17.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-23 12:43:17.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -31683,7 +31833,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +309,115 @@
+@@ -307,10 +309,117 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -31799,6 +31949,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/nmm/liba52\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/usr/lib(64)?/chromium-browser/.*\.so 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/python.*/site-packages/pymedia/muxer\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/local/games/darwinia/lib/libSDL.*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.6.32/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-12-17 11:20:47.000000000 -0500
@@ -32350,22 +32502,49 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-3.6.32/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/miscfiles.fc	2009-12-17 11:20:47.000000000 -0500
-@@ -41,6 +41,7 @@
- 
++++ serefpolicy-3.6.32/policy/modules/system/miscfiles.fc	2009-12-23 09:06:30.000000000 -0500
+@@ -42,6 +42,7 @@
  /usr/man(/.*)?			gen_context(system_u:object_r:man_t,s0)
  
-+/usr/share/X11/fonts(/.*)?	gen_context(system_u:object_r:fonts_t,s0)
  /usr/share/fonts(/.*)?		gen_context(system_u:object_r:fonts_t,s0)
++/usr/share/X11/fonts(/.*)?	gen_context(system_u:object_r:fonts_t,s0)
  /usr/share/ghostscript/fonts(/.*)? gen_context(system_u:object_r:fonts_t,s0)
  /usr/share/locale(/.*)?		gen_context(system_u:object_r:locale_t,s0)
+ /usr/share/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
+@@ -70,7 +71,7 @@
+ 
+ /var/lib/texmf(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
+ 
+-/var/cache/fontconfig(/.*)?	gen_context(system_u:object_r:fonts_t,s0)
++/var/cache/fontconfig(/.*)?	gen_context(system_u:object_r:fonts_cache_t,s0)
+ /var/cache/fonts(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
+ /var/cache/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-3.6.32/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/miscfiles.if	2009-12-17 11:20:47.000000000 -0500
-@@ -87,6 +87,45 @@
++++ serefpolicy-3.6.32/policy/modules/system/miscfiles.if	2009-12-23 09:06:09.000000000 -0500
+@@ -73,7 +73,8 @@
+ #
+ interface(`miscfiles_read_fonts',`
+ 	gen_require(`
+-		type fonts_t;
++		type fonts_t, fonts_cache_t;
++
+ 	')
  
- ########################################
- ## <summary>
+ 	# cjp: fonts can be in either of these dirs
+@@ -83,6 +84,49 @@
+ 	allow $1 fonts_t:dir list_dir_perms;
+ 	read_files_pattern($1, fonts_t, fonts_t)
+ 	read_lnk_files_pattern($1, fonts_t, fonts_t)
++
++	allow $1 fonts_cache_t:dir list_dir_perms;
++	read_files_pattern($1, fonts_cache_t, fonts_cache_t)
++	read_lnk_files_pattern($1, fonts_cache_t, fonts_cache_t)
++')
++
++########################################
++## <summary>
 +##	Set the attributes on a fonts directory.
 +## </summary>
 +## <param name="domain">
@@ -32401,14 +32580,43 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	dontaudit $1 fonts_t:dir setattr;
+ ')
+ 
+ ########################################
+@@ -128,6 +172,32 @@
+ 	manage_dirs_pattern($1, fonts_t, fonts_t)
+ 	manage_files_pattern($1, fonts_t, fonts_t)
+ 	manage_lnk_files_pattern($1, fonts_t, fonts_t)
++	miscfiles_manage_fonts_cache($1)
 +')
 +
 +########################################
 +## <summary>
- ##	Do not audit attempts to write fonts.
- ## </summary>
- ## <param name="domain">
-@@ -255,6 +294,25 @@
++##	Create, read, write, and delete fonts cache.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`miscfiles_manage_fonts_cache',`
++	gen_require(`
++		type fonts_t;
++	')
++
++	# cjp: fonts can be in either of these dirs
++	files_search_usr($1)
++	libs_search_lib($1)
++
++	manage_dirs_pattern($1, fonts_cache_t, fonts_cache_t)
++	manage_files_pattern($1, fonts_cache_t, fonts_cache_t)
++	manage_lnk_files_pattern($1, fonts_cache_t, fonts_cache_t)
+ ')
+ 
+ ########################################
+@@ -255,6 +325,25 @@
  
  ########################################
  ## <summary>
@@ -32434,7 +32642,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to search man pages.
  ## </summary>
  ## <param name="domain">
-@@ -268,7 +326,7 @@
+@@ -268,7 +357,7 @@
  		type man_t;
  	')
  
@@ -32445,7 +32653,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.te serefpolicy-3.6.32/policy/modules/system/miscfiles.te
 --- nsaserefpolicy/policy/modules/system/miscfiles.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/miscfiles.te	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/miscfiles.te	2009-12-23 09:05:40.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -policy_module(miscfiles, 1.7.0)
@@ -32453,6 +32661,16 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
+@@ -19,6 +19,9 @@
+ type fonts_t;
+ files_type(fonts_t)
+ 
++type fonts_cache_t;
++files_type(fonts_cache_t)
++
+ #
+ # type for /usr/share/hwdata
+ #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.fc serefpolicy-3.6.32/policy/modules/system/modutils.fc
 --- nsaserefpolicy/policy/modules/system/modutils.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/modutils.fc	2009-12-17 11:20:47.000000000 -0500
@@ -35283,7 +35501,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-21 14:36:02.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-23 07:52:17.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -36329,7 +36547,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,58 +1086,68 @@
+@@ -953,58 +1086,70 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -36346,12 +36564,7 @@ diff -b -B --ignore-all-space --exclude-
  
 -	ifndef(`enable_mls',`
 -		fs_exec_noxattr($1_t)
-+	# Allow users to run TCP servers (bind to ports and accept connection from
-+	# the same domain and outside users) disabling this forces FTP passive mode
-+	# and may change other protocols
-+	tunable_policy(`user_tcp_server',`
-+		corenet_tcp_bind_all_unreserved_ports($1_usertype)
-+	')
++	fs_list_cgroup_dirs($1_usertype)
  
 -		tunable_policy(`user_rw_noexattrfile',`
 -			fs_manage_noxattr_fs_files($1_t)
@@ -36361,12 +36574,15 @@ diff -b -B --ignore-all-space --exclude-
 -			storage_raw_write_removable_device($1_t)
 -		',`
 -			storage_raw_read_removable_device($1_t)
-+	optional_policy(`
-+		cdrecord_role($1_r, $1_t)
++	# Allow users to run TCP servers (bind to ports and accept connection from
++	# the same domain and outside users) disabling this forces FTP passive mode
++	# and may change other protocols
++	tunable_policy(`user_tcp_server',`
++		corenet_tcp_bind_all_unreserved_ports($1_usertype)
  		')
 +
 +	optional_policy(`
-+		cron_role($1_r, $1_t)
++		cdrecord_role($1_r, $1_t)
  	')
  
 -	tunable_policy(`user_dmesg',`
@@ -36374,7 +36590,7 @@ diff -b -B --ignore-all-space --exclude-
 -	',`
 -		kernel_dontaudit_read_ring_buffer($1_t)
 +	optional_policy(`
-+		games_rw_data($1_usertype)
++		cron_role($1_r, $1_t)
  	')
  
 -	# Allow users to run TCP servers (bind to ports and accept connection from
@@ -36384,28 +36600,32 @@ diff -b -B --ignore-all-space --exclude-
 -		corenet_tcp_bind_generic_node($1_t)
 -		corenet_tcp_bind_generic_port($1_t)
 +	optional_policy(`
-+		gpg_role($1_r, $1_usertype)
++		games_rw_data($1_usertype)
  	')
  
  	optional_policy(`
 -		netutils_run_ping_cond($1_t,$1_r)
 -		netutils_run_traceroute_cond($1_t,$1_r)
-+		gpm_stream_connect($1_usertype)
++		gpg_role($1_r, $1_usertype)
  	')
  
  	optional_policy(`
 -		postgresql_role($1_r,$1_t)
-+		execmem_role_template($1, $1_r, $1_t)
++		gpm_stream_connect($1_usertype)
  	')
  
 -	# Run pppd in pppd_t by default for user
  	optional_policy(`
 -		ppp_run_cond($1_t,$1_r)
-+		java_role_template($1, $1_r, $1_t)
++		execmem_role_template($1, $1_r, $1_t)
  	')
  
  	optional_policy(`
 -		setroubleshoot_stream_connect($1_t)
++		java_role_template($1, $1_r, $1_t)
++	')
++
++	optional_policy(`
 +		mono_role_template($1, $1_r, $1_t)
 +	')
 +
@@ -36428,7 +36648,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1183,7 @@
+@@ -1040,7 +1185,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -36437,7 +36657,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1192,7 @@
+@@ -1049,8 +1194,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -36447,7 +36667,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1217,9 @@
+@@ -1075,6 +1219,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -36457,7 +36677,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1089,6 +1234,7 @@
+@@ -1089,6 +1236,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -36465,7 +36685,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1242,6 @@
+@@ -1096,8 +1244,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -36474,7 +36694,7 @@ diff -b -B --ignore-all-space --exclude-
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1124,12 +1268,11 @@
+@@ -1124,12 +1270,11 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -36489,7 +36709,7 @@ diff -b -B --ignore-all-space --exclude-
  	term_use_all_terms($1_t)
  
  	auth_getattr_shadow($1_t)
-@@ -1152,20 +1295,6 @@
+@@ -1152,20 +1297,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -36510,7 +36730,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1340,7 @@
+@@ -1211,6 +1342,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -36518,7 +36738,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1406,15 @@
+@@ -1276,11 +1408,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -36534,7 +36754,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1525,13 @@
+@@ -1391,12 +1527,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -36549,7 +36769,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1564,14 @@
+@@ -1429,6 +1566,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -36564,7 +36784,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1587,11 @@
+@@ -1444,9 +1589,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -36576,7 +36796,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1648,42 @@
+@@ -1503,6 +1650,42 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -36619,7 +36839,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1758,8 @@
+@@ -1577,6 +1760,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -36628,7 +36848,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1619,6 +1802,24 @@
+@@ -1619,6 +1804,24 @@
  
  ########################################
  ## <summary>
@@ -36653,7 +36873,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to set the
  ##	attributes of user home files.
  ## </summary>
-@@ -1670,6 +1871,7 @@
+@@ -1670,6 +1873,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -36661,7 +36881,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1686,11 +1888,11 @@
+@@ -1686,11 +1890,11 @@
  #
  interface(`userdom_dontaudit_read_user_home_content_files',`
  	gen_require(`
@@ -36676,7 +36896,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1797,19 +1999,32 @@
+@@ -1797,19 +2001,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -36716,7 +36936,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2059,7 @@
+@@ -1844,6 +2061,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -36724,7 +36944,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2196,7 +2412,7 @@
+@@ -2196,7 +2414,7 @@
  
  ########################################
  ## <summary>
@@ -36733,7 +36953,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	temporary files.
  ## </summary>
  ## <param name="domain">
-@@ -2205,21 +2421,40 @@
+@@ -2205,17 +2423,36 @@
  ##	</summary>
  ## </param>
  #
@@ -36752,10 +36972,9 @@ diff -b -B --ignore-all-space --exclude-
 -##	Read user temporary symbolic links.
 +##	Do not audit attempts to manage users
 +##	temporary files.
- ## </summary>
- ## <param name="domain">
- ##	<summary>
--##	Domain allowed access.
++## </summary>
++## <param name="domain">
++##	<summary>
 +##	Domain to not audit.
 +##	</summary>
 +## </param>
@@ -36771,14 +36990,10 @@ diff -b -B --ignore-all-space --exclude-
 +########################################
 +## <summary>
 +##	Read user temporary symbolic links.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
- ##	</summary>
- ## </param>
- #
-@@ -2276,6 +2511,46 @@
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2276,6 +2513,46 @@
  ########################################
  ## <summary>
  ##	Create, read, write, and delete user
@@ -36825,7 +37040,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	temporary symbolic links.
  ## </summary>
  ## <param name="domain">
-@@ -2391,7 +2666,7 @@
+@@ -2391,7 +2668,7 @@
  
  ########################################
  ## <summary>
@@ -36834,7 +37049,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2399,19 +2674,20 @@
+@@ -2399,19 +2676,20 @@
  ##	</summary>
  ## </param>
  #
@@ -36858,7 +37073,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2419,7 +2695,7 @@
+@@ -2419,7 +2697,7 @@
  ##	</summary>
  ## </param>
  #
@@ -36867,7 +37082,7 @@ diff -b -B --ignore-all-space --exclude-
  	gen_require(`
  		type user_tmpfs_t;
  	')
-@@ -2430,6 +2706,26 @@
+@@ -2430,6 +2708,26 @@
  	fs_search_tmpfs($1)
  ')
  
@@ -36894,7 +37109,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Get the attributes of a user domain tty.
-@@ -2749,7 +3045,7 @@
+@@ -2749,7 +3047,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -36903,7 +37118,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +3061,33 @@
+@@ -2765,11 +3063,33 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -36939,7 +37154,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3215,43 @@
+@@ -2897,7 +3217,43 @@
  		type user_tmp_t;
  	')
  
@@ -36984,7 +37199,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3288,7 @@
+@@ -2934,6 +3290,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -36992,7 +37207,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3419,656 @@
+@@ -3064,3 +3421,656 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -37844,7 +38059,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.32/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-12-23 08:59:21.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -38032,7 +38247,16 @@ diff -b -B --ignore-all-space --exclude-
  kernel_write_xen_state(xenstored_t)
  kernel_read_xen_state(xenstored_t)
  
-@@ -304,6 +351,7 @@
+@@ -282,6 +329,8 @@
+ 
+ files_read_usr_files(xenstored_t)
+ 
++fs_search_xenfs(xenstored_t)
++
+ storage_raw_read_fixed_disk(xenstored_t)
+ storage_raw_write_fixed_disk(xenstored_t)
+ storage_raw_read_removable_device(xenstored_t)
+@@ -304,6 +353,7 @@
  #
  
  allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
@@ -38040,7 +38264,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # internal communication is often done using fifo and unix sockets.
  allow xm_t self:fifo_file rw_fifo_file_perms;
-@@ -312,24 +360,29 @@
+@@ -312,24 +362,29 @@
  
  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)
@@ -38071,7 +38295,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_runtime_files(xm_t)
  files_read_usr_files(xm_t)
-@@ -339,15 +392,76 @@
+@@ -339,15 +394,76 @@
  
  storage_raw_read_fixed_disk(xm_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -p -r1.987 -r1.988
--- selinux-policy.spec	22 Dec 2009 21:23:32 -0000	1.987
+++ selinux-policy.spec	23 Dec 2009 18:42:31 -0000	1.988
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 63%{?dist}
+Release: 64%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,7 +449,18 @@ exit 0
 %endif
 
 %changelog
-* Tue Dec 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-63
+* Wed Dec 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-64
+- Update to Rawhide filesystem.if file
+- Allow abrt to read nfs
+- Allow cups to search fusefs
+- Allow dovecot_auth to search var_log
+- Fix label on ksmtuned.pid
+- Dontaudit policykit looking at mount points
+- Allow xdm to manage /var/cache/fontconfig
+- Allow xenstored to search xenfs
+
+
+* Tue Dec 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-63
 - Allow sendmail setpgid
 - Allow dovecot to read nfs homedirs
 



From dcbw at fedoraproject.org  Wed Dec 23 18:52:22 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 23 Dec 2009 18:52:22 +0000 (UTC)
Subject: File NetworkManager-0.7.2.git20091223.tar.bz2 uploaded to lookaside
	cache by dcbw
Message-ID: <20091223185222.3DE0F10F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for NetworkManager:

24c2a86cfbc27f99e5c5f056787ee497  NetworkManager-0.7.2.git20091223.tar.bz2



From jussilehtola at fedoraproject.org  Wed Dec 23 18:52:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 23 Dec 2009 18:52:23 +0000 (UTC)
Subject: File jmol-11.8.14-full.tar.gz uploaded to lookaside cache by
	jussilehtola
Message-ID: <20091223185223.78C0E10F8D4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for jmol:

c59f2db61859bb2eddab51c3e145b1f7  jmol-11.8.14-full.tar.gz



From jussilehtola at fedoraproject.org  Wed Dec 23 18:52:26 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 23 Dec 2009 18:52:26 +0000 (UTC)
Subject: File Jmol_icon_128.png uploaded to lookaside cache by jussilehtola
Message-ID: <20091223185226.1A92010F8DA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for jmol:

75268c66c9afac86a59d6348745dd1e4  Jmol_icon_128.png



From dcbw at fedoraproject.org  Wed Dec 23 18:52:38 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 23 Dec 2009 18:52:38 +0000 (UTC)
Subject: File network-manager-applet-0.7.2.git20091223.tar.bz2 uploaded to
	lookaside cache by dcbw
Message-ID: <20091223185238.2103610F8D4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for NetworkManager:

28c86782888b6ae5972b95458839817d  network-manager-applet-0.7.2.git20091223.tar.bz2



From dcbw at fedoraproject.org  Wed Dec 23 18:53:39 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 23 Dec 2009 18:53:39 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 sources,1.152,1.153
Message-ID: <20091223185339.2B4FC11C00EF@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4193

Modified Files:
	sources 
Log Message:
Add new tarballs with correct dates that aren't from the future and thus will build in koji



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- sources	23 Dec 2009 18:20:27 -0000	1.152
+++ sources	23 Dec 2009 18:53:39 -0000	1.153
@@ -1,2 +1,2 @@
-b6a326886a429673b7c9a94d3f1f504f  NetworkManager-0.7.2.git20091223.tar.bz2
-f02780d9462a20fbca93a95870f47824  network-manager-applet-0.7.2.git20091223.tar.bz2
+24c2a86cfbc27f99e5c5f056787ee497  NetworkManager-0.7.2.git20091223.tar.bz2
+28c86782888b6ae5972b95458839817d  network-manager-applet-0.7.2.git20091223.tar.bz2



From jussilehtola at fedoraproject.org  Wed Dec 23 18:53:58 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 23 Dec 2009 18:53:58 +0000 (UTC)
Subject: rpms/jmol/devel jmol-11.8.14-dontsign.patch, NONE,
	1.1 jmol-11.8.14-fedorabuild.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 jmol.spec, 1.15, 1.16 sources, 1.7,
	1.8 jmol-11.8-fedorabuild.patch, 1.1, NONE
Message-ID: <20091223185358.9AB0711C00EF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4457

Modified Files:
	.cvsignore jmol.spec sources 
Added Files:
	jmol-11.8.14-dontsign.patch jmol-11.8.14-fedorabuild.patch 
Removed Files:
	jmol-11.8-fedorabuild.patch 
Log Message:
Update to 11.8.14, switch to using stable release tarballs.

jmol-11.8.14-dontsign.patch:
 build.xml |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE jmol-11.8.14-dontsign.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-23 20:20:36.116683801 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:29:48.147621634 +0200
@@ -389,12 +389,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
+   <!-- <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
              signedjar="${jmol.build.dir}/Jmol.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsigned.jar"/>-->
     <jar destfile="${jmol.build.dir}/JmolUnsignedF.jar"
          manifest="manifest/applicationData.txt">
       <fileset dir="${classes.dir}" >
@@ -423,12 +423,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" />
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
+    <!--<signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
              signedjar="${jmol.build.dir}/JmolData.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>-->
     <copy todir="${jmol.build.dir}">
       <fileset dir=".">
         <include name="jmol" />
@@ -455,11 +455,11 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
     </jar>
 
-  	<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
+  	<!--<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
              signedjar="${jmol.build.dir}/Jvxl.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
              storepass="selfSignedCertificate" alias="selfSignedCertificate" />
-    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
+    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>-->
 
   </target>
 

jmol-11.8.14-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8.14-fedorabuild.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-22 08:47:38.000000000 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:19:02.940613996 +0200
@@ -20,7 +20,7 @@
   <property name="jvxl_version" value="0.1" />
 
   <property name="tests.source.dir" value="source-tests" />
-  <property name="lib.dir" value="jars" />
+  <property name="lib.dir" value="/usr/share/java" />
   <property name="plugin.dir" value="plugin-jars" />
   <property name="appjars.dir" value="build/appjars" />
   <property name="classes.dir" value="build/classes" />
@@ -34,9 +34,9 @@
   <property name="jmol.build.dir" value="build" />
   <property name="docbook-xsl" value="docbook-xsl-1.74.0" />
   <property name="docbook-xml" value="docbook-xml-4.4" />
-  <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
-  <property name="itext.jar" value="itext-1.4.5.jar" />
-  <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
+  <property name="vecmath.jar" value="vecmath.jar" />
+  <property name="itext.jar" value="itext.jar" />
+  <property name="commons-cli.jar" value="commons-cli.jar" />
 
   <!-- you can set this by defining it in ~/.jmol.build.properties -->
   <property name="keystore.name" value="Must be set by user." />


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Oct 2009 15:51:15 -0000	1.7
+++ .cvsignore	23 Dec 2009 18:53:58 -0000	1.8
@@ -1 +1,2 @@
-jmol-11.8.11581svn.tar.bz2
+jmol-11.8.14-full.tar.gz
+Jmol_icon_128.png


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/jmol.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- jmol.spec	2 Oct 2009 16:15:23 -0000	1.15
+++ jmol.spec	23 Dec 2009 18:53:58 -0000	1.16
@@ -1,27 +1,20 @@
-%define svnrel 11581
-
 Name:		jmol
-Version:	11.8
-Release:	1.%{svnrel}svn%{?dist}
+Version:	11.8.14
+Release:	1%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
 URL:		http://jmol.sourceforge.net
 BuildArch:	noarch
-
-# The official release package doesn't have support for building the jar files,
-# so we use SVN instead.
-
-# The source package has been created from SVN sources:
-# svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_8/Jmol
-# tar jcf jmol-%{version}.%{svnrel}svn.tar.bz2 Jmol
-Source0:	%{name}-%{version}.%{svnrel}svn.tar.bz2
+Source0:	http://downloads.sourceforge.net/project/jmol/Jmol/Version%2011.8/Version%20%{version}/jmol-%{version}-full.tar.gz
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
 Source1:	Jmol_icon_128.png
 # Patch to get Jmol to build in Fedora
-Patch0:		jmol-11.8-fedorabuild.patch
+Patch0:		jmol-11.8.14-fedorabuild.patch
 # Patch to change jar file location to %{_javadir}
 Patch1:		jmol-11.8-jarlocation.patch 
+# Don't try to sign jars
+Patch2:		jmol-11.8.14-dontsign.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,15 +56,25 @@ The documentation for %{name}.
 
 
 %prep
-%setup -q -n Jmol
+%setup -q
 %patch0 -p1 -b .fedorabuild
 %patch1 -p1 -b .jarlocation
+%patch2 -p1 -b .nosign
+
+# Remove binaries
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
+rm -f jars/*
 
 # Remove executable permissions from documentation
-chmod 644 README.txt
-chmod 644 COPYRIGHT.txt
+find -name "*.txt" -exec chmod 644 {} \;
+# Fix EOL encoding
+for doc in README.txt COPYRIGHT.txt LICENSE.txt; do
+ sed "s|\r||g" $doc > $doc.new && \
+ touch -r $doc $doc.new && \
+ mv $doc.new $doc
+done
+
 
 # Make desktop file
 cat > jmol.desktop << EOF
@@ -92,7 +95,7 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/Jmol.jar %{buildroot}%{_javadir}/Jmol.jar
+install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_javadir}/Jmol.jar
 install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_javadir}/JmolApplet.jar
 install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
@@ -124,6 +127,11 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Wed Dec 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8.14-1
+- Build from stable release tarballs works now, switch to using stable
+  releases.
+- Update to 11.8.14.
+
 * Fri Oct 02 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11581
 - Switch back to tar.bz2 source since xz doesn't work in EL-5.
 - Update to svn revision 11581.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Oct 2009 15:51:15 -0000	1.7
+++ sources	23 Dec 2009 18:53:58 -0000	1.8
@@ -1 +1,2 @@
-af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2
+c59f2db61859bb2eddab51c3e145b1f7  jmol-11.8.14-full.tar.gz
+75268c66c9afac86a59d6348745dd1e4  Jmol_icon_128.png


--- jmol-11.8-fedorabuild.patch DELETED ---



From jussilehtola at fedoraproject.org  Wed Dec 23 19:06:28 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 23 Dec 2009 19:06:28 +0000 (UTC)
Subject: rpms/jmol/F-12 jmol-11.8.14-dontsign.patch, NONE,
	1.1 jmol-11.8.14-fedorabuild.patch, NONE, 1.1 jmol.spec, 1.13,
	1.14 sources, 1.6, 1.7 Jmol_icon_128.png, 1.1,
	NONE jmol-11.8-fedorabuild.patch, 1.1, NONE
Message-ID: <20091223190628.E1FA411C00EF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6216

Modified Files:
	jmol.spec sources 
Added Files:
	jmol-11.8.14-dontsign.patch jmol-11.8.14-fedorabuild.patch 
Removed Files:
	Jmol_icon_128.png jmol-11.8-fedorabuild.patch 
Log Message:
Update to 11.8.14.

jmol-11.8.14-dontsign.patch:
 build.xml |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE jmol-11.8.14-dontsign.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-23 20:20:36.116683801 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:29:48.147621634 +0200
@@ -389,12 +389,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
+   <!-- <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
              signedjar="${jmol.build.dir}/Jmol.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsigned.jar"/>-->
     <jar destfile="${jmol.build.dir}/JmolUnsignedF.jar"
          manifest="manifest/applicationData.txt">
       <fileset dir="${classes.dir}" >
@@ -423,12 +423,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" />
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
+    <!--<signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
              signedjar="${jmol.build.dir}/JmolData.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>-->
     <copy todir="${jmol.build.dir}">
       <fileset dir=".">
         <include name="jmol" />
@@ -455,11 +455,11 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
     </jar>
 
-  	<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
+  	<!--<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
              signedjar="${jmol.build.dir}/Jvxl.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
              storepass="selfSignedCertificate" alias="selfSignedCertificate" />
-    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
+    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>-->
 
   </target>
 

jmol-11.8.14-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8.14-fedorabuild.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-22 08:47:38.000000000 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:19:02.940613996 +0200
@@ -20,7 +20,7 @@
   <property name="jvxl_version" value="0.1" />
 
   <property name="tests.source.dir" value="source-tests" />
-  <property name="lib.dir" value="jars" />
+  <property name="lib.dir" value="/usr/share/java" />
   <property name="plugin.dir" value="plugin-jars" />
   <property name="appjars.dir" value="build/appjars" />
   <property name="classes.dir" value="build/classes" />
@@ -34,9 +34,9 @@
   <property name="jmol.build.dir" value="build" />
   <property name="docbook-xsl" value="docbook-xsl-1.74.0" />
   <property name="docbook-xml" value="docbook-xml-4.4" />
-  <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
-  <property name="itext.jar" value="itext-1.4.5.jar" />
-  <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
+  <property name="vecmath.jar" value="vecmath.jar" />
+  <property name="itext.jar" value="itext.jar" />
+  <property name="commons-cli.jar" value="commons-cli.jar" />
 
   <!-- you can set this by defining it in ~/.jmol.build.properties -->
   <property name="keystore.name" value="Must be set by user." />


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-12/jmol.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- jmol.spec	27 Sep 2009 08:53:51 -0000	1.13
+++ jmol.spec	23 Dec 2009 19:06:28 -0000	1.14
@@ -1,41 +1,33 @@
-%define svnrel 11564
-
 Name:		jmol
-Version:	11.8
-Release:	1.%{svnrel}svn%{?dist}
+Version:	11.8.14
+Release:	1%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
 URL:		http://jmol.sourceforge.net
 BuildArch:	noarch
-
-# The official release package doesn't have support for building the jar files,
-# so we use SVN instead.
-
-# The source package has been created from SVN sources:
-# svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_6/Jmol
-# tar cvf jmol-%{name}-%{version}.%{svnrel}.tar
-# xz %{name}-%{version}.%{svnrel}.tar
-Source0:	%{name}-%{version}.%{svnrel}.tar.xz
+Source0:	http://downloads.sourceforge.net/project/jmol/Jmol/Version%2011.8/Version%20%{version}/jmol-%{version}-full.tar.gz
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
 Source1:	Jmol_icon_128.png
 # Patch to get Jmol to build in Fedora
-Patch0:		jmol-11.8-fedorabuild.patch
+Patch0:		jmol-11.8.14-fedorabuild.patch
+# Patch to change jar file location to %{_javadir}
+Patch1:		jmol-11.8-jarlocation.patch 
+# Don't try to sign jars
+Patch2:		jmol-11.8.14-dontsign.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ant, ant-contrib
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
+BuildRequires:	itext
+BuildRequires:	jakarta-commons-cli
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 # For javax.vecmath
 BuildRequires:	vecmath
 
-%if 0%{?rhel} == 5
-BuildRequires:	xz
-%endif
-
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
 
@@ -48,6 +40,7 @@ and researchers in chemistry and biochem
 Summary:	Javadocs for %{name}
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
+Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -63,14 +56,25 @@ The documentation for %{name}.
 
 
 %prep
-%setup -q -n Jmol
+%setup -q
 %patch0 -p1 -b .fedorabuild
+%patch1 -p1 -b .jarlocation
+%patch2 -p1 -b .nosign
+
+# Remove binaries
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
+rm -f jars/*
 
 # Remove executable permissions from documentation
-chmod 644 README.txt
-chmod 644 COPYRIGHT.txt
+find -name "*.txt" -exec chmod 644 {} \;
+# Fix EOL encoding
+for doc in README.txt COPYRIGHT.txt LICENSE.txt; do
+ sed "s|\r||g" $doc > $doc.new && \
+ touch -r $doc $doc.new && \
+ mv $doc.new $doc
+done
+
 
 # Make desktop file
 cat > jmol.desktop << EOF
@@ -82,7 +86,7 @@ Exec=jmol
 Icon=jmol
 Terminal=false
 Type=Application
-Categories=Education;Science;
+Categories=Education;Science;Chemistry;Physics;DataVisualization;
 EOF
 
 %build
@@ -91,7 +95,7 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/Jmol.jar %{buildroot}%{_javadir}/Jmol.jar
+install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_javadir}/Jmol.jar
 install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_javadir}/JmolApplet.jar
 install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
@@ -123,6 +127,15 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Wed Dec 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8.14-1
+- Build from stable release tarballs works now, switch to using stable
+  releases.
+- Update to 11.8.14.
+
+* Fri Oct 02 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11581
+- Switch back to tar.bz2 source since xz doesn't work in EL-5.
+- Update to svn revision 11581.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11564
 - Update to 11.8 series, svn revision 11564.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Sep 2009 23:48:45 -0000	1.6
+++ sources	23 Dec 2009 19:06:28 -0000	1.7
@@ -1 +1,2 @@
-3f772a8fe552f9bcedca0d071be1e496  jmol-11.8.11564.tar.xz
+c59f2db61859bb2eddab51c3e145b1f7  jmol-11.8.14-full.tar.gz
+75268c66c9afac86a59d6348745dd1e4  Jmol_icon_128.png


--- jmol-11.8-fedorabuild.patch DELETED ---



From jussilehtola at fedoraproject.org  Wed Dec 23 19:08:41 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 23 Dec 2009 19:08:41 +0000 (UTC)
Subject: rpms/jmol/F-12 jmol-11.8-jarlocation.patch,NONE,1.1
Message-ID: <20091223190841.176A111C00EF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6660

Added Files:
	jmol-11.8-jarlocation.patch 
Log Message:
Update to 11.8.14.

jmol-11.8-jarlocation.patch:
 jmol |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

--- NEW FILE jmol-11.8-jarlocation.patch ---
diff -up Jmol/jmol.orig Jmol/jmol
--- Jmol/jmol.orig	2006-08-28 15:58:20.000000000 +0300
+++ Jmol/jmol	2009-09-27 11:55:14.126801748 +0300
@@ -7,14 +7,5 @@ while [ `echo $1 | egrep '^-D|^-m' | wc 
 	shift
 done
 
-if [ -f ./Jmol.jar ] ; then
-  jarpath=./Jmol.jar
-elif [ -f $JMOL_HOME/Jmol.jar ] ; then
-  jarpath=$JMOL_HOME/Jmol.jar
-elif [ -f /usr/share/jmol/Jmol.jar ] ; then
-  jarpath=/usr/share/jmol/Jmol.jar
-else
-  echo Jmol.jar not found
-  exit
-fi
+jarpath=/usr/share/java/Jmol.jar
 $command -Xmx512m -jar $jarpath $@



From jussilehtola at fedoraproject.org  Wed Dec 23 19:10:05 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 23 Dec 2009 19:10:05 +0000 (UTC)
Subject: rpms/jmol/F-11 jmol-11.8.14-dontsign.patch, NONE,
	1.1 jmol-11.8.14-fedorabuild.patch, NONE, 1.1 jmol.spec, 1.10,
	1.11 sources, 1.6, 1.7 Jmol_icon_128.png, 1.1,
	NONE jmol-11.8-fedorabuild.patch, 1.1, NONE
Message-ID: <20091223191005.2DA0111C00EF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6968

Modified Files:
	jmol.spec sources 
Added Files:
	jmol-11.8.14-dontsign.patch jmol-11.8.14-fedorabuild.patch 
Removed Files:
	Jmol_icon_128.png jmol-11.8-fedorabuild.patch 
Log Message:
Update to 11.8.14.

jmol-11.8.14-dontsign.patch:
 build.xml |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE jmol-11.8.14-dontsign.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-23 20:20:36.116683801 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:29:48.147621634 +0200
@@ -389,12 +389,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
+   <!-- <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
              signedjar="${jmol.build.dir}/Jmol.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsigned.jar"/>-->
     <jar destfile="${jmol.build.dir}/JmolUnsignedF.jar"
          manifest="manifest/applicationData.txt">
       <fileset dir="${classes.dir}" >
@@ -423,12 +423,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" />
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
+    <!--<signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
              signedjar="${jmol.build.dir}/JmolData.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>-->
     <copy todir="${jmol.build.dir}">
       <fileset dir=".">
         <include name="jmol" />
@@ -455,11 +455,11 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
     </jar>
 
-  	<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
+  	<!--<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
              signedjar="${jmol.build.dir}/Jvxl.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
              storepass="selfSignedCertificate" alias="selfSignedCertificate" />
-    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
+    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>-->
 
   </target>
 

jmol-11.8.14-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8.14-fedorabuild.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-22 08:47:38.000000000 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:19:02.940613996 +0200
@@ -20,7 +20,7 @@
   <property name="jvxl_version" value="0.1" />
 
   <property name="tests.source.dir" value="source-tests" />
-  <property name="lib.dir" value="jars" />
+  <property name="lib.dir" value="/usr/share/java" />
   <property name="plugin.dir" value="plugin-jars" />
   <property name="appjars.dir" value="build/appjars" />
   <property name="classes.dir" value="build/classes" />
@@ -34,9 +34,9 @@
   <property name="jmol.build.dir" value="build" />
   <property name="docbook-xsl" value="docbook-xsl-1.74.0" />
   <property name="docbook-xml" value="docbook-xml-4.4" />
-  <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
-  <property name="itext.jar" value="itext-1.4.5.jar" />
-  <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
+  <property name="vecmath.jar" value="vecmath.jar" />
+  <property name="itext.jar" value="itext.jar" />
+  <property name="commons-cli.jar" value="commons-cli.jar" />
 
   <!-- you can set this by defining it in ~/.jmol.build.properties -->
   <property name="keystore.name" value="Must be set by user." />


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-11/jmol.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- jmol.spec	2 Oct 2009 16:26:41 -0000	1.10
+++ jmol.spec	23 Dec 2009 19:10:05 -0000	1.11
@@ -1,27 +1,20 @@
-%define svnrel 11581
-
 Name:		jmol
-Version:	11.8
-Release:	1.%{svnrel}svn%{?dist}
+Version:	11.8.14
+Release:	1%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
 URL:		http://jmol.sourceforge.net
 BuildArch:	noarch
-
-# The official release package doesn't have support for building the jar files,
-# so we use SVN instead.
-
-# The source package has been created from SVN sources:
-# svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_8/Jmol
-# tar jcf jmol-%{version}.%{svnrel}svn.tar.bz2 Jmol
-Source0:	%{name}-%{version}.%{svnrel}svn.tar.bz2
+Source0:	http://downloads.sourceforge.net/project/jmol/Jmol/Version%2011.8/Version%20%{version}/jmol-%{version}-full.tar.gz
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
 Source1:	Jmol_icon_128.png
 # Patch to get Jmol to build in Fedora
-Patch0:		jmol-11.8-fedorabuild.patch
+Patch0:		jmol-11.8.14-fedorabuild.patch
 # Patch to change jar file location to %{_javadir}
 Patch1:		jmol-11.8-jarlocation.patch 
+# Don't try to sign jars
+Patch2:		jmol-11.8.14-dontsign.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,15 +56,25 @@ The documentation for %{name}.
 
 
 %prep
-%setup -q -n Jmol
+%setup -q
 %patch0 -p1 -b .fedorabuild
 %patch1 -p1 -b .jarlocation
+%patch2 -p1 -b .nosign
+
+# Remove binaries
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
+rm -f jars/*
 
 # Remove executable permissions from documentation
-chmod 644 README.txt
-chmod 644 COPYRIGHT.txt
+find -name "*.txt" -exec chmod 644 {} \;
+# Fix EOL encoding
+for doc in README.txt COPYRIGHT.txt LICENSE.txt; do
+ sed "s|\r||g" $doc > $doc.new && \
+ touch -r $doc $doc.new && \
+ mv $doc.new $doc
+done
+
 
 # Make desktop file
 cat > jmol.desktop << EOF
@@ -92,7 +95,7 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/Jmol.jar %{buildroot}%{_javadir}/Jmol.jar
+install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_javadir}/Jmol.jar
 install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_javadir}/JmolApplet.jar
 install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
@@ -124,6 +127,11 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Wed Dec 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8.14-1
+- Build from stable release tarballs works now, switch to using stable
+  releases.
+- Update to 11.8.14.
+
 * Fri Oct 02 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11581
 - Switch back to tar.bz2 source since xz doesn't work in EL-5.
 - Update to svn revision 11581.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Oct 2009 16:26:41 -0000	1.6
+++ sources	23 Dec 2009 19:10:05 -0000	1.7
@@ -1 +1,2 @@
-af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2
+c59f2db61859bb2eddab51c3e145b1f7  jmol-11.8.14-full.tar.gz
+75268c66c9afac86a59d6348745dd1e4  Jmol_icon_128.png


--- jmol-11.8-fedorabuild.patch DELETED ---



From jussilehtola at fedoraproject.org  Wed Dec 23 19:10:48 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 23 Dec 2009 19:10:48 +0000 (UTC)
Subject: rpms/jmol/EL-5 jmol-11.8.14-dontsign.patch, NONE,
	1.1 jmol-11.8.14-fedorabuild.patch, NONE, 1.1 jmol.spec, 1.9,
	1.10 sources, 1.5, 1.6 Jmol_icon_128.png, 1.1,
	NONE jmol-11.8-fedorabuild.patch, 1.1, NONE
Message-ID: <20091223191048.B54ED11C00EF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7219

Modified Files:
	jmol.spec sources 
Added Files:
	jmol-11.8.14-dontsign.patch jmol-11.8.14-fedorabuild.patch 
Removed Files:
	Jmol_icon_128.png jmol-11.8-fedorabuild.patch 
Log Message:
Update to 11.8.14.

jmol-11.8.14-dontsign.patch:
 build.xml |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE jmol-11.8.14-dontsign.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-23 20:20:36.116683801 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:29:48.147621634 +0200
@@ -389,12 +389,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
+   <!-- <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
              signedjar="${jmol.build.dir}/Jmol.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsigned.jar"/>-->
     <jar destfile="${jmol.build.dir}/JmolUnsignedF.jar"
          manifest="manifest/applicationData.txt">
       <fileset dir="${classes.dir}" >
@@ -423,12 +423,12 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" />
       <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
     </jar>
-    <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
+    <!--<signjar jar="${jmol.build.dir}/JmolUnsignedF.jar"
              signedjar="${jmol.build.dir}/JmolData.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
-             storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+             storepass="selfSignedCertificate" alias="selfSignedCertificate" />-->
     <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
-    <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>
+    <!--<delete file="${jmol.build.dir}/JmolUnsignedF.jar"/>-->
     <copy todir="${jmol.build.dir}">
       <fileset dir=".">
         <include name="jmol" />
@@ -455,11 +455,11 @@ support for assertions (which were intro
       <fileset dir="${appjars.dir}" includes="**/*"/>
     </jar>
 
-  	<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
+  	<!--<signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
              signedjar="${jmol.build.dir}/Jvxl.jar"
              keystore="selfSignedCertificate/selfSignedCertificate.store"
              storepass="selfSignedCertificate" alias="selfSignedCertificate" />
-    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
+    <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>-->
 
   </target>
 

jmol-11.8.14-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8.14-fedorabuild.patch ---
diff -up jmol-11.8.14/build.xml.orig jmol-11.8.14/build.xml
--- jmol-11.8.14/build.xml.orig	2009-12-22 08:47:38.000000000 +0200
+++ jmol-11.8.14/build.xml	2009-12-23 20:19:02.940613996 +0200
@@ -20,7 +20,7 @@
   <property name="jvxl_version" value="0.1" />
 
   <property name="tests.source.dir" value="source-tests" />
-  <property name="lib.dir" value="jars" />
+  <property name="lib.dir" value="/usr/share/java" />
   <property name="plugin.dir" value="plugin-jars" />
   <property name="appjars.dir" value="build/appjars" />
   <property name="classes.dir" value="build/classes" />
@@ -34,9 +34,9 @@
   <property name="jmol.build.dir" value="build" />
   <property name="docbook-xsl" value="docbook-xsl-1.74.0" />
   <property name="docbook-xml" value="docbook-xml-4.4" />
-  <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
-  <property name="itext.jar" value="itext-1.4.5.jar" />
-  <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
+  <property name="vecmath.jar" value="vecmath.jar" />
+  <property name="itext.jar" value="itext.jar" />
+  <property name="commons-cli.jar" value="commons-cli.jar" />
 
   <!-- you can set this by defining it in ~/.jmol.build.properties -->
   <property name="keystore.name" value="Must be set by user." />


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/EL-5/jmol.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- jmol.spec	2 Oct 2009 16:26:40 -0000	1.9
+++ jmol.spec	23 Dec 2009 19:10:48 -0000	1.10
@@ -1,27 +1,20 @@
-%define svnrel 11581
-
 Name:		jmol
-Version:	11.8
-Release:	1.%{svnrel}svn%{?dist}
+Version:	11.8.14
+Release:	1%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
 URL:		http://jmol.sourceforge.net
 BuildArch:	noarch
-
-# The official release package doesn't have support for building the jar files,
-# so we use SVN instead.
-
-# The source package has been created from SVN sources:
-# svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_8/Jmol
-# tar jcf jmol-%{version}.%{svnrel}svn.tar.bz2 Jmol
-Source0:	%{name}-%{version}.%{svnrel}svn.tar.bz2
+Source0:	http://downloads.sourceforge.net/project/jmol/Jmol/Version%2011.8/Version%20%{version}/jmol-%{version}-full.tar.gz
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
 Source1:	Jmol_icon_128.png
 # Patch to get Jmol to build in Fedora
-Patch0:		jmol-11.8-fedorabuild.patch
+Patch0:		jmol-11.8.14-fedorabuild.patch
 # Patch to change jar file location to %{_javadir}
 Patch1:		jmol-11.8-jarlocation.patch 
+# Don't try to sign jars
+Patch2:		jmol-11.8.14-dontsign.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,15 +56,25 @@ The documentation for %{name}.
 
 
 %prep
-%setup -q -n Jmol
+%setup -q
 %patch0 -p1 -b .fedorabuild
 %patch1 -p1 -b .jarlocation
+%patch2 -p1 -b .nosign
+
+# Remove binaries
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
+rm -f jars/*
 
 # Remove executable permissions from documentation
-chmod 644 README.txt
-chmod 644 COPYRIGHT.txt
+find -name "*.txt" -exec chmod 644 {} \;
+# Fix EOL encoding
+for doc in README.txt COPYRIGHT.txt LICENSE.txt; do
+ sed "s|\r||g" $doc > $doc.new && \
+ touch -r $doc $doc.new && \
+ mv $doc.new $doc
+done
+
 
 # Make desktop file
 cat > jmol.desktop << EOF
@@ -92,7 +95,7 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/Jmol.jar %{buildroot}%{_javadir}/Jmol.jar
+install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_javadir}/Jmol.jar
 install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_javadir}/JmolApplet.jar
 install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
@@ -124,6 +127,11 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Wed Dec 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8.14-1
+- Build from stable release tarballs works now, switch to using stable
+  releases.
+- Update to 11.8.14.
+
 * Fri Oct 02 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.8-1.11581
 - Switch back to tar.bz2 source since xz doesn't work in EL-5.
 - Update to svn revision 11581.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Oct 2009 16:26:40 -0000	1.5
+++ sources	23 Dec 2009 19:10:48 -0000	1.6
@@ -1 +1,2 @@
-af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2
+c59f2db61859bb2eddab51c3e145b1f7  jmol-11.8.14-full.tar.gz
+75268c66c9afac86a59d6348745dd1e4  Jmol_icon_128.png


--- jmol-11.8-fedorabuild.patch DELETED ---



From ingvar at fedoraproject.org  Wed Dec 23 19:17:42 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 23 Dec 2009 19:17:42 +0000 (UTC)
Subject: rpms/varnish/F-12 varnish.spec,1.25,1.26
Message-ID: <20091223191742.40FD511C00EF@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8247

Modified Files:
	varnish.spec 
Log Message:
Forgot to commit a patch. Bump release for rebuild.


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-12/varnish.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- varnish.spec	23 Dec 2009 17:31:24 -0000	1.25
+++ varnish.spec	23 Dec 2009 19:17:42 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.6
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -254,7 +254,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2
+* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2.1
 - Added a test that enables jemalloc on ppc if the kernel is
   not a rhel5 kernel (as on redhat builders)
 - Removed tests c00031.vtc and r00387on rhel4/ppc as they fail



From ingvar at fedoraproject.org  Wed Dec 23 19:32:13 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Wed, 23 Dec 2009 19:32:13 +0000 (UTC)
Subject: rpms/varnish/F-12 varnish.spec,1.26,1.27
Message-ID: <20091223193213.203C511C00EF@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10352

Modified Files:
	varnish.spec 
Log Message:
Forgot to commit a patch. Bump release for rebuild.


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-12/varnish.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- varnish.spec	23 Dec 2009 19:17:42 -0000	1.26
+++ varnish.spec	23 Dec 2009 19:32:12 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.6
-Release: 2.1%{?dist}
+Release: 2.2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -254,7 +254,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2.1
+* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2.2
 - Added a test that enables jemalloc on ppc if the kernel is
   not a rhel5 kernel (as on redhat builders)
 - Removed tests c00031.vtc and r00387on rhel4/ppc as they fail



From clumens at fedoraproject.org  Wed Dec 23 19:37:42 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 23 Dec 2009 19:37:42 +0000 (UTC)
Subject: File anaconda-13.13.tar.bz2 uploaded to lookaside cache by clumens
Message-ID: <20091223193742.E787F10F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for anaconda:

59f78d8d56d3d5a48b8bf456ecfd485b  anaconda-13.13.tar.bz2



From clumens at fedoraproject.org  Wed Dec 23 19:38:06 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 23 Dec 2009 19:38:06 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.687, 1.688 anaconda.spec, 1.837,
	1.838 sources, 1.821, 1.822
Message-ID: <20091223193806.B84EA11C00EF@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11236

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -p -r1.687 -r1.688
--- .cvsignore	19 Dec 2009 01:33:46 -0000	1.687
+++ .cvsignore	23 Dec 2009 19:38:06 -0000	1.688
@@ -1 +1,2 @@
 anaconda-13.12.tar.bz2
+anaconda-13.13.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -p -r1.837 -r1.838
--- anaconda.spec	19 Dec 2009 01:33:46 -0000	1.837
+++ anaconda.spec	23 Dec 2009 19:38:06 -0000	1.838
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.12
+Version: 13.13
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -217,6 +217,20 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Dec 23 2009 Chris Lumens <clumens at redhat.com> - 13.13-1
+- lsreipl from s390-utils uses incorrect path (hamzy).
+- fix for a bug in 05ce88b2 that split one line over several in program.log
+  (akozumpl)
+- Dump the initial and final state of the system's storage devices. (dlehman)
+- Add a "dict" attribute to Device and DeviceFormat classes. (dlehman)
+- Sort Storage.devices by name (not path) for consistency. (dlehman)
+- Put fsprofile support back in. (dlehman)
+- Fix reset of lvm filtering (#527711) (rvykydal)
+- Fix bootloader driveorder dialog. (rvykydal)
+- Fix selection of default boot target in UI (#548695) (rvykydal)
+- 'cleardiskssel' typos that made it impossible to run text install.
+  (akozumpl)
+
 * Fri Dec 18 2009 David Cantrell <dcantrell at redhat.com> - 13.12-1
 - Use the per-disk flag to disable cylinder alignment for msdos disklabels.
   (dlehman)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.821
retrieving revision 1.822
diff -u -p -r1.821 -r1.822
--- sources	19 Dec 2009 01:33:46 -0000	1.821
+++ sources	23 Dec 2009 19:38:06 -0000	1.822
@@ -1 +1 @@
-a1fa9c042368958be47c727154267283  anaconda-13.12.tar.bz2
+59f78d8d56d3d5a48b8bf456ecfd485b  anaconda-13.13.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec 23 19:39:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:39:19 +0000
Subject: [pkgdb] plexus-interpolation summary updated by ausil
Message-ID: <20091223193919.7B61010F8D9@bastion.fedoraproject.org>

ausil set package plexus-interpolation summary to Plexus Interpolation API

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/plexus-interpolation



From pkgdb at fedoraproject.org  Wed Dec 23 19:39:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:39:33 +0000
Subject: [pkgdb] plexus-interpolation was added for akurtakov
Message-ID: <20091223193919.9649210F8CB@bastion.fedoraproject.org>

ausil has added Package plexus-interpolation with summary Plexus Interpolation API
ausil has approved Package plexus-interpolation
ausil has added a Fedora devel branch for plexus-interpolation with an owner of akurtakov
ausil has approved plexus-interpolation in Fedora devel
ausil has approved Package plexus-interpolation
ausil has set commit to Approved for 107427 on plexus-interpolation (Fedora devel)
ausil has set checkout to Approved for 107427 on plexus-interpolation (Fedora devel)
ausil has set build to Approved for 107427 on plexus-interpolation (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/plexus-interpolation



From ausil at fedoraproject.org  Wed Dec 23 19:39:28 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:39:28 +0000 (UTC)
Subject: rpms/plexus-interpolation - New directory
Message-ID: <20091223193928.280E611C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-interpolation
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11572/rpms/plexus-interpolation

Log Message:
Directory /cvs/pkgs/rpms/plexus-interpolation added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:39:28 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:39:28 +0000 (UTC)
Subject: rpms/plexus-interpolation/devel - New directory
Message-ID: <20091223193928.4715E11C01EA@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-interpolation/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11572/rpms/plexus-interpolation/devel

Log Message:
Directory /cvs/pkgs/rpms/plexus-interpolation/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:39:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:39:36 +0000 (UTC)
Subject: rpms/plexus-interpolation Makefile,NONE,1.1
Message-ID: <20091223193936.0FF0B11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-interpolation
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11572/rpms/plexus-interpolation

Added Files:
	Makefile 
Log Message:
Setup of module plexus-interpolation


--- NEW FILE Makefile ---
# Top level Makefile for module plexus-interpolation
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:39:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:39:36 +0000 (UTC)
Subject: rpms/plexus-interpolation/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091223193936.7373811C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-interpolation/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11572/rpms/plexus-interpolation/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module plexus-interpolation


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: plexus-interpolation
# $Id: Makefile,v 1.1 2009/12/23 19:39:36 ausil Exp $
NAME := plexus-interpolation
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:40:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:40:05 +0000
Subject: [pkgdb] plexus-io was added for akurtakov
Message-ID: <20091223194005.9826A10F8D4@bastion.fedoraproject.org>

ausil has added Package plexus-io with summary Plexus IO Components
ausil has approved Package plexus-io
ausil has added a Fedora devel branch for plexus-io with an owner of akurtakov
ausil has approved plexus-io in Fedora devel
ausil has approved Package plexus-io
ausil has set commit to Approved for 107427 on plexus-io (Fedora devel)
ausil has set checkout to Approved for 107427 on plexus-io (Fedora devel)
ausil has set build to Approved for 107427 on plexus-io (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/plexus-io



From pkgdb at fedoraproject.org  Wed Dec 23 19:40:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:40:06 +0000
Subject: [pkgdb] plexus-io summary updated by ausil
Message-ID: <20091223194006.6CB8A10F8DA@bastion.fedoraproject.org>

ausil set package plexus-io summary to Plexus IO Components

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/plexus-io



From ausil at fedoraproject.org  Wed Dec 23 19:40:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:40:14 +0000 (UTC)
Subject: rpms/plexus-io - New directory
Message-ID: <20091223194014.10C7511C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-io
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11786/rpms/plexus-io

Log Message:
Directory /cvs/pkgs/rpms/plexus-io added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:40:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:40:14 +0000 (UTC)
Subject: rpms/plexus-io/devel - New directory
Message-ID: <20091223194014.2C61B11C0382@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-io/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11786/rpms/plexus-io/devel

Log Message:
Directory /cvs/pkgs/rpms/plexus-io/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:40:21 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:40:21 +0000 (UTC)
Subject: rpms/plexus-io Makefile,NONE,1.1
Message-ID: <20091223194021.C8BBE11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-io
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11786/rpms/plexus-io

Added Files:
	Makefile 
Log Message:
Setup of module plexus-io


--- NEW FILE Makefile ---
# Top level Makefile for module plexus-io
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:40:22 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:40:22 +0000 (UTC)
Subject: rpms/plexus-io/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091223194022.6B51711C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-io/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst11786/rpms/plexus-io/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module plexus-io


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: plexus-io
# $Id: Makefile,v 1.1 2009/12/23 19:40:21 ausil Exp $
NAME := plexus-io
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:41:11 +0000
Subject: [pkgdb] bluemodem was added for fab
Message-ID: <20091223194111.592DF10F8D3@bastion.fedoraproject.org>

ausil has added Package bluemodem with summary A bluetooth modem configuration utility
ausil has approved Package bluemodem
ausil has added a Fedora devel branch for bluemodem with an owner of fab
ausil has approved bluemodem in Fedora devel
ausil has approved Package bluemodem
ausil has set commit to Approved for 107427 on bluemodem (Fedora devel)
ausil has set checkout to Approved for 107427 on bluemodem (Fedora devel)
ausil has set build to Approved for 107427 on bluemodem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluemodem



From pkgdb at fedoraproject.org  Wed Dec 23 19:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:41:13 +0000
Subject: [pkgdb] bluemodem (Fedora, 12) updated by ausil
Message-ID: <20091223194112.D6C3310F8DA@bastion.fedoraproject.org>

ausil added a Fedora 12 branch for bluemodem
ausil has set commit to Approved for 107427 on bluemodem (Fedora 12)
ausil has set checkout to Approved for 107427 on bluemodem (Fedora 12)
ausil has set build to Approved for 107427 on bluemodem (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluemodem



From pkgdb at fedoraproject.org  Wed Dec 23 19:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:41:13 +0000
Subject: [pkgdb] bluemodem summary updated by ausil
Message-ID: <20091223194112.BA23710F8D9@bastion.fedoraproject.org>

ausil set package bluemodem summary to A bluetooth modem configuration utility

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluemodem



From pkgdb at fedoraproject.org  Wed Dec 23 19:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:41:13 +0000
Subject: [pkgdb] bluemodem (Fedora, 11) updated by ausil
Message-ID: <20091223194112.E3CAC10F8DD@bastion.fedoraproject.org>

ausil added a Fedora 11 branch for bluemodem
ausil has set commit to Approved for 107427 on bluemodem (Fedora 11)
ausil has set checkout to Approved for 107427 on bluemodem (Fedora 11)
ausil has set build to Approved for 107427 on bluemodem (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluemodem



From ausil at fedoraproject.org  Wed Dec 23 19:41:21 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:41:21 +0000 (UTC)
Subject: rpms/bluemodem - New directory
Message-ID: <20091223194121.121E111C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bluemodem
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZ12062/rpms/bluemodem

Log Message:
Directory /cvs/pkgs/rpms/bluemodem added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:41:21 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:41:21 +0000 (UTC)
Subject: rpms/bluemodem/devel - New directory
Message-ID: <20091223194121.45C6811C01EA@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bluemodem/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZ12062/rpms/bluemodem/devel

Log Message:
Directory /cvs/pkgs/rpms/bluemodem/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:41:29 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:41:29 +0000 (UTC)
Subject: rpms/bluemodem Makefile,NONE,1.1
Message-ID: <20091223194129.087D411C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bluemodem
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZ12062/rpms/bluemodem

Added Files:
	Makefile 
Log Message:
Setup of module bluemodem


--- NEW FILE Makefile ---
# Top level Makefile for module bluemodem
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:41:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:41:30 +0000 (UTC)
Subject: rpms/bluemodem/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091223194130.7301A11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bluemodem/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsZ12062/rpms/bluemodem/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bluemodem


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bluemodem
# $Id: Makefile,v 1.1 2009/12/23 19:41:29 ausil Exp $
NAME := bluemodem
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:42:27 +0000
Subject: [pkgdb] python-minimock summary updated by ausil
Message-ID: <20091223194227.14D6410F8DB@bastion.fedoraproject.org>

ausil set package python-minimock summary to The simplest possible mock library

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-minimock



From pkgdb at fedoraproject.org  Wed Dec 23 19:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:42:26 +0000
Subject: [pkgdb] python-minimock was added for tomspur
Message-ID: <20091223194226.5B23910F8D3@bastion.fedoraproject.org>

ausil has added Package python-minimock with summary The simplest possible mock library
ausil has approved Package python-minimock
ausil has added a Fedora devel branch for python-minimock with an owner of tomspur
ausil has approved python-minimock in Fedora devel
ausil has approved Package python-minimock
ausil has set commit to Approved for 107427 on python-minimock (Fedora devel)
ausil has set checkout to Approved for 107427 on python-minimock (Fedora devel)
ausil has set build to Approved for 107427 on python-minimock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-minimock



From ausil at fedoraproject.org  Wed Dec 23 19:42:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:42:36 +0000 (UTC)
Subject: rpms/python-minimock/devel - New directory
Message-ID: <20091223194236.3D3E911C01EA@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/python-minimock/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvso12388/rpms/python-minimock/devel

Log Message:
Directory /cvs/pkgs/rpms/python-minimock/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:42:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:42:36 +0000 (UTC)
Subject: rpms/python-minimock - New directory
Message-ID: <20091223194236.13EBE11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/python-minimock
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvso12388/rpms/python-minimock

Log Message:
Directory /cvs/pkgs/rpms/python-minimock added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:42:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:42:43 +0000 (UTC)
Subject: rpms/python-minimock Makefile,NONE,1.1
Message-ID: <20091223194243.BB32411C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/python-minimock
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvso12388/rpms/python-minimock

Added Files:
	Makefile 
Log Message:
Setup of module python-minimock


--- NEW FILE Makefile ---
# Top level Makefile for module python-minimock
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:42:44 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:42:44 +0000 (UTC)
Subject: rpms/python-minimock/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091223194244.0BB4F11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/python-minimock/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvso12388/rpms/python-minimock/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-minimock


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-minimock
# $Id: Makefile,v 1.1 2009/12/23 19:42:43 ausil Exp $
NAME := python-minimock
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:43:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:43:16 +0000
Subject: [pkgdb] crun was added for splinux
Message-ID: <20091223194315.D707010F8D9@bastion.fedoraproject.org>

ausil has added Package crun with summary Lightweight, easy to use, simpler cron-like tool
ausil has approved Package crun
ausil has added a Fedora devel branch for crun with an owner of splinux
ausil has approved crun in Fedora devel
ausil has approved Package crun
ausil has set commit to Approved for 107427 on crun (Fedora devel)
ausil has set checkout to Approved for 107427 on crun (Fedora devel)
ausil has set build to Approved for 107427 on crun (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/crun



From pkgdb at fedoraproject.org  Wed Dec 23 19:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:43:15 +0000
Subject: [pkgdb] crun summary updated by ausil
Message-ID: <20091223194316.91DDC10F8DB@bastion.fedoraproject.org>

ausil set package crun summary to Lightweight, easy to use, simpler cron-like tool

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/crun



From pkgdb at fedoraproject.org  Wed Dec 23 19:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:43:15 +0000
Subject: [pkgdb] crun (Fedora, 12) updated by ausil
Message-ID: <20091223194316.C26F810F8D9@bastion.fedoraproject.org>

ausil added a Fedora 12 branch for crun
ausil has set commit to Approved for 107427 on crun (Fedora 12)
ausil has set checkout to Approved for 107427 on crun (Fedora 12)
ausil has set build to Approved for 107427 on crun (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/crun



From pkgdb at fedoraproject.org  Wed Dec 23 19:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:43:15 +0000
Subject: [pkgdb] crun (Fedora, 11) updated by ausil
Message-ID: <20091223194316.D90FB10F8E2@bastion.fedoraproject.org>

ausil added a Fedora 11 branch for crun
ausil has set commit to Approved for 107427 on crun (Fedora 11)
ausil has set checkout to Approved for 107427 on crun (Fedora 11)
ausil has set build to Approved for 107427 on crun (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/crun



From ausil at fedoraproject.org  Wed Dec 23 19:43:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:43:27 +0000 (UTC)
Subject: rpms/crun - New directory
Message-ID: <20091223194327.113F311C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/crun
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ12589/rpms/crun

Log Message:
Directory /cvs/pkgs/rpms/crun added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:43:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:43:27 +0000 (UTC)
Subject: rpms/crun/devel - New directory
Message-ID: <20091223194327.2B7F411C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/crun/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ12589/rpms/crun/devel

Log Message:
Directory /cvs/pkgs/rpms/crun/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:43:34 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:43:34 +0000 (UTC)
Subject: rpms/crun Makefile,NONE,1.1
Message-ID: <20091223194334.A3DE811C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/crun
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ12589/rpms/crun

Added Files:
	Makefile 
Log Message:
Setup of module crun


--- NEW FILE Makefile ---
# Top level Makefile for module crun
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:43:34 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:43:34 +0000 (UTC)
Subject: rpms/crun/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091223194334.CCA8C11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/crun/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsQ12589/rpms/crun/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crun


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: crun
# $Id: Makefile,v 1.1 2009/12/23 19:43:34 ausil Exp $
NAME := crun
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:44:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:44:22 +0000
Subject: [pkgdb] mingw32-libzip was added for adsllc
Message-ID: <20091223194422.D165B10F8D3@bastion.fedoraproject.org>

ausil has added Package mingw32-libzip with summary MinGW port of the C library for manipulating zip archives.
ausil has approved Package mingw32-libzip
ausil has added a Fedora devel branch for mingw32-libzip with an owner of adsllc
ausil has approved mingw32-libzip in Fedora devel
ausil has approved Package mingw32-libzip
ausil has set commit to Approved for 107427 on mingw32-libzip (Fedora devel)
ausil has set checkout to Approved for 107427 on mingw32-libzip (Fedora devel)
ausil has set build to Approved for 107427 on mingw32-libzip (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libzip



From pkgdb at fedoraproject.org  Wed Dec 23 19:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:44:45 +0000
Subject: [pkgdb] mingw32-libzip summary updated by ausil
Message-ID: <20091223194431.CBC8310F8DA@bastion.fedoraproject.org>

ausil set package mingw32-libzip summary to MinGW port of the C library for manipulating zip archives.

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libzip



From pkgdb at fedoraproject.org  Wed Dec 23 19:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:44:45 +0000
Subject: [pkgdb] mingw32-libzip (Fedora, 12) updated by ausil
Message-ID: <20091223194432.E038B10F8CB@bastion.fedoraproject.org>

ausil added a Fedora 12 branch for mingw32-libzip
ausil has set commit to Approved for 107427 on mingw32-libzip (Fedora 12)
ausil has set checkout to Approved for 107427 on mingw32-libzip (Fedora 12)
ausil has set build to Approved for 107427 on mingw32-libzip (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libzip



From pkgdb at fedoraproject.org  Wed Dec 23 19:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:44:45 +0000
Subject: [pkgdb] mingw32-libzip (Fedora, 11) updated by ausil
Message-ID: <20091223194433.E0FE510F8CB@bastion.fedoraproject.org>

ausil added a Fedora 11 branch for mingw32-libzip
ausil has set commit to Approved for 107427 on mingw32-libzip (Fedora 11)
ausil has set checkout to Approved for 107427 on mingw32-libzip (Fedora 11)
ausil has set build to Approved for 107427 on mingw32-libzip (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libzip



From ausil at fedoraproject.org  Wed Dec 23 19:44:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:44:39 +0000 (UTC)
Subject: rpms/mingw32-libzip - New directory
Message-ID: <20091223194439.1515D11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mingw32-libzip
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsh12962/rpms/mingw32-libzip

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libzip added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:44:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:44:39 +0000 (UTC)
Subject: rpms/mingw32-libzip/devel - New directory
Message-ID: <20091223194439.2C07C11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mingw32-libzip/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsh12962/rpms/mingw32-libzip/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libzip/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:44:46 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:44:46 +0000 (UTC)
Subject: rpms/mingw32-libzip Makefile,NONE,1.1
Message-ID: <20091223194446.AC84D11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mingw32-libzip
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsh12962/rpms/mingw32-libzip

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libzip


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libzip
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:44:47 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:44:47 +0000 (UTC)
Subject: rpms/mingw32-libzip/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091223194447.043F611C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mingw32-libzip/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsh12962/rpms/mingw32-libzip/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libzip


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libzip
# $Id: Makefile,v 1.1 2009/12/23 19:44:46 ausil Exp $
NAME := mingw32-libzip
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:46:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:46:19 +0000
Subject: [pkgdb] rubygem-thor was added for mkent
Message-ID: <20091223194619.30CB110F8D3@bastion.fedoraproject.org>

ausil has added Package rubygem-thor with summary Scripting framework that replaces rake, sake and rubigen
ausil has approved Package rubygem-thor
ausil has added a Fedora devel branch for rubygem-thor with an owner of mkent
ausil has approved rubygem-thor in Fedora devel
ausil has approved Package rubygem-thor
ausil has set commit to Approved for 107427 on rubygem-thor (Fedora devel)
ausil has set checkout to Approved for 107427 on rubygem-thor (Fedora devel)
ausil has set build to Approved for 107427 on rubygem-thor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-thor



From pkgdb at fedoraproject.org  Wed Dec 23 19:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:46:20 +0000
Subject: [pkgdb] rubygem-thor summary updated by ausil
Message-ID: <20091223194619.E096E10F8D9@bastion.fedoraproject.org>

ausil set package rubygem-thor summary to Scripting framework that replaces rake, sake and rubigen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-thor



From pkgdb at fedoraproject.org  Wed Dec 23 19:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:46:20 +0000
Subject: [pkgdb] rubygem-thor (Fedora, 12) updated by ausil
Message-ID: <20091223194619.EE65F10F8DD@bastion.fedoraproject.org>

ausil added a Fedora 12 branch for rubygem-thor
ausil has set commit to Approved for 107427 on rubygem-thor (Fedora 12)
ausil has set checkout to Approved for 107427 on rubygem-thor (Fedora 12)
ausil has set build to Approved for 107427 on rubygem-thor (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-thor



From pkgdb at fedoraproject.org  Wed Dec 23 19:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:46:20 +0000
Subject: [pkgdb] rubygem-thor (Fedora, 11) updated by ausil
Message-ID: <20091223194620.05CFD10F8E2@bastion.fedoraproject.org>

ausil added a Fedora 11 branch for rubygem-thor
ausil has set commit to Approved for 107427 on rubygem-thor (Fedora 11)
ausil has set checkout to Approved for 107427 on rubygem-thor (Fedora 11)
ausil has set build to Approved for 107427 on rubygem-thor (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-thor



From ausil at fedoraproject.org  Wed Dec 23 19:46:28 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:46:28 +0000 (UTC)
Subject: rpms/rubygem-thor - New directory
Message-ID: <20091223194628.16EC311C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rubygem-thor
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE13364/rpms/rubygem-thor

Log Message:
Directory /cvs/pkgs/rpms/rubygem-thor added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:46:28 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:46:28 +0000 (UTC)
Subject: rpms/rubygem-thor/devel - New directory
Message-ID: <20091223194628.2B76611C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rubygem-thor/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE13364/rpms/rubygem-thor/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-thor/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:46:35 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:46:35 +0000 (UTC)
Subject: rpms/rubygem-thor Makefile,NONE,1.1
Message-ID: <20091223194635.BECEF11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rubygem-thor
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE13364/rpms/rubygem-thor

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-thor


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-thor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:46:35 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:46:35 +0000 (UTC)
Subject: rpms/rubygem-thor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091223194635.EE87E11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/rubygem-thor/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsE13364/rpms/rubygem-thor/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-thor


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-thor
# $Id: Makefile,v 1.1 2009/12/23 19:46:35 ausil Exp $
NAME := rubygem-thor
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:46:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:46:52 +0000
Subject: [pkgdb] dmenu summary updated by ausil
Message-ID: <20091223194651.E5B1010F8D4@bastion.fedoraproject.org>

ausil set package dmenu summary to Generic menu for X

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmenu



From pkgdb at fedoraproject.org  Wed Dec 23 19:46:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:46:52 +0000
Subject: [pkgdb] dmenu (Fedora, 12) updated by ausil
Message-ID: <20091223194651.F329810F8DD@bastion.fedoraproject.org>

ausil added a Fedora 12 branch for dmenu
ausil has set commit to Approved for 107427 on dmenu (Fedora 12)
ausil has set checkout to Approved for 107427 on dmenu (Fedora 12)
ausil has set build to Approved for 107427 on dmenu (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmenu



From pkgdb at fedoraproject.org  Wed Dec 23 19:47:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:47:05 +0000
Subject: [pkgdb] dmenu was added for cassmodiah
Message-ID: <20091223194652.695BB10F8DE@bastion.fedoraproject.org>

ausil has added Package dmenu with summary Generic menu for X
ausil has approved Package dmenu
ausil has added a Fedora devel branch for dmenu with an owner of cassmodiah
ausil has approved dmenu in Fedora devel
ausil has approved Package dmenu
ausil has set commit to Approved for 107427 on dmenu (Fedora devel)
ausil has set checkout to Approved for 107427 on dmenu (Fedora devel)
ausil has set build to Approved for 107427 on dmenu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmenu



From ausil at fedoraproject.org  Wed Dec 23 19:47:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:47:00 +0000 (UTC)
Subject: rpms/dmenu - New directory
Message-ID: <20091223194700.154DF11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dmenu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsW13618/rpms/dmenu

Log Message:
Directory /cvs/pkgs/rpms/dmenu added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:47:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:47:00 +0000 (UTC)
Subject: rpms/dmenu/devel - New directory
Message-ID: <20091223194700.2B8CF11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dmenu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsW13618/rpms/dmenu/devel

Log Message:
Directory /cvs/pkgs/rpms/dmenu/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:47:07 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:47:07 +0000 (UTC)
Subject: rpms/dmenu Makefile,NONE,1.1
Message-ID: <20091223194707.CE90611C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dmenu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsW13618/rpms/dmenu

Added Files:
	Makefile 
Log Message:
Setup of module dmenu


--- NEW FILE Makefile ---
# Top level Makefile for module dmenu
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:47:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:47:08 +0000 (UTC)
Subject: rpms/dmenu/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091223194708.075AF11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dmenu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsW13618/rpms/dmenu/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dmenu


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dmenu
# $Id: Makefile,v 1.1 2009/12/23 19:47:07 ausil Exp $
NAME := dmenu
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:47:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:47:52 +0000
Subject: [pkgdb] gummi was added for fab
Message-ID: <20091223194752.0D67210F8D9@bastion.fedoraproject.org>

ausil has added Package gummi with summary A simple LaTeX editor
ausil has approved Package gummi
ausil has added a Fedora devel branch for gummi with an owner of fab
ausil has approved gummi in Fedora devel
ausil has approved Package gummi
ausil has set commit to Approved for 107427 on gummi (Fedora devel)
ausil has set checkout to Approved for 107427 on gummi (Fedora devel)
ausil has set build to Approved for 107427 on gummi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gummi



From pkgdb at fedoraproject.org  Wed Dec 23 19:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:47:53 +0000
Subject: [pkgdb] gummi summary updated by ausil
Message-ID: <20091223194752.DDB4D10F8DA@bastion.fedoraproject.org>

ausil set package gummi summary to A simple LaTeX editor

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gummi



From pkgdb at fedoraproject.org  Wed Dec 23 19:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:47:53 +0000
Subject: [pkgdb] gummi (Fedora, 12) updated by ausil
Message-ID: <20091223194753.022B510F8DE@bastion.fedoraproject.org>

ausil added a Fedora 12 branch for gummi
ausil has set commit to Approved for 107427 on gummi (Fedora 12)
ausil has set checkout to Approved for 107427 on gummi (Fedora 12)
ausil has set build to Approved for 107427 on gummi (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gummi



From pkgdb at fedoraproject.org  Wed Dec 23 19:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:47:53 +0000
Subject: [pkgdb] gummi (Fedora, 11) updated by ausil
Message-ID: <20091223194753.2BFD710F8E5@bastion.fedoraproject.org>

ausil added a Fedora 11 branch for gummi
ausil has set commit to Approved for 107427 on gummi (Fedora 11)
ausil has set checkout to Approved for 107427 on gummi (Fedora 11)
ausil has set build to Approved for 107427 on gummi (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gummi



From ausil at fedoraproject.org  Wed Dec 23 19:48:01 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:48:01 +0000 (UTC)
Subject: rpms/gummi - New directory
Message-ID: <20091223194801.18B6611C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gummi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT13873/rpms/gummi

Log Message:
Directory /cvs/pkgs/rpms/gummi added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:48:01 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:48:01 +0000 (UTC)
Subject: rpms/gummi/devel - New directory
Message-ID: <20091223194801.2D1E211C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gummi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT13873/rpms/gummi/devel

Log Message:
Directory /cvs/pkgs/rpms/gummi/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:48:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:48:08 +0000 (UTC)
Subject: rpms/gummi Makefile,NONE,1.1
Message-ID: <20091223194808.C31CB11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gummi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT13873/rpms/gummi

Added Files:
	Makefile 
Log Message:
Setup of module gummi


--- NEW FILE Makefile ---
# Top level Makefile for module gummi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:48:09 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:48:09 +0000 (UTC)
Subject: rpms/gummi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091223194809.58C5C11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gummi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT13873/rpms/gummi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gummi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gummi
# $Id: Makefile,v 1.1 2009/12/23 19:48:09 ausil Exp $
NAME := gummi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:49:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:49:26 +0000
Subject: [pkgdb] ReviewBoard was added for sgallagh
Message-ID: <20091223194925.B08A210F8D3@bastion.fedoraproject.org>

ausil has added Package ReviewBoard with summary Web-based code review tool
ausil has approved Package ReviewBoard
ausil has added a Fedora devel branch for ReviewBoard with an owner of sgallagh
ausil has approved ReviewBoard in Fedora devel
ausil has approved Package ReviewBoard
ausil has set commit to Approved for 107427 on ReviewBoard (Fedora devel)
ausil has set checkout to Approved for 107427 on ReviewBoard (Fedora devel)
ausil has set build to Approved for 107427 on ReviewBoard (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 19:49:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:49:27 +0000
Subject: [pkgdb] ReviewBoard summary updated by ausil
Message-ID: <20091223194926.DAB6510F8D9@bastion.fedoraproject.org>

ausil set package ReviewBoard summary to Web-based code review tool

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 19:49:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:49:27 +0000
Subject: [pkgdb] ReviewBoard (Fedora, devel) updated by ausil
Message-ID: <20091223194926.EF15910F8E2@bastion.fedoraproject.org>

ausil approved watchbugzilla on ReviewBoard (Fedora devel) for dmalcolm
ausil approved watchcommits on ReviewBoard (Fedora devel) for dmalcolm
ausil approved commit on ReviewBoard (Fedora devel) for dmalcolm
ausil approved build on ReviewBoard (Fedora devel) for dmalcolm
ausil approved approveacls on ReviewBoard (Fedora devel) for dmalcolm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 19:49:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:49:27 +0000
Subject: [pkgdb] ReviewBoard (Fedora, 12) updated by ausil
Message-ID: <20091223194926.F26F510F8E5@bastion.fedoraproject.org>

ausil added a Fedora 12 branch for ReviewBoard
ausil has set commit to Approved for 107427 on ReviewBoard (Fedora 12)
ausil has set checkout to Approved for 107427 on ReviewBoard (Fedora 12)
ausil has set build to Approved for 107427 on ReviewBoard (Fedora 12)
ausil approved watchbugzilla on ReviewBoard (Fedora 12) for dmalcolm
ausil approved watchcommits on ReviewBoard (Fedora 12) for dmalcolm
ausil approved commit on ReviewBoard (Fedora 12) for dmalcolm
ausil approved build on ReviewBoard (Fedora 12) for dmalcolm
ausil approved approveacls on ReviewBoard (Fedora 12) for dmalcolm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From ausil at fedoraproject.org  Wed Dec 23 19:49:35 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:49:35 +0000 (UTC)
Subject: rpms/ReviewBoard - New directory
Message-ID: <20091223194935.1730811C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ReviewBoard
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj14480/rpms/ReviewBoard

Log Message:
Directory /cvs/pkgs/rpms/ReviewBoard added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:49:35 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:49:35 +0000 (UTC)
Subject: rpms/ReviewBoard/devel - New directory
Message-ID: <20091223194935.2B77A11C0382@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ReviewBoard/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj14480/rpms/ReviewBoard/devel

Log Message:
Directory /cvs/pkgs/rpms/ReviewBoard/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:49:42 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:49:42 +0000 (UTC)
Subject: rpms/ReviewBoard/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091223194942.D1C9511C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ReviewBoard/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj14480/rpms/ReviewBoard/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ReviewBoard


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ReviewBoard
# $Id: Makefile,v 1.1 2009/12/23 19:49:42 ausil Exp $
NAME := ReviewBoard
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ausil at fedoraproject.org  Wed Dec 23 19:49:42 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:49:42 +0000 (UTC)
Subject: rpms/ReviewBoard Makefile,NONE,1.1
Message-ID: <20091223194942.A5A1311C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ReviewBoard
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsj14480/rpms/ReviewBoard

Added Files:
	Makefile 
Log Message:
Setup of module ReviewBoard


--- NEW FILE Makefile ---
# Top level Makefile for module ReviewBoard
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Dec 23 19:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:50:27 +0000
Subject: [pkgdb] pki-setup was added for kwright
Message-ID: <20091223195027.453AC10F8DD@bastion.fedoraproject.org>

ausil has added Package pki-setup with summary The Dogtag PKI Setup Framework
ausil has approved Package pki-setup
ausil has added a Fedora devel branch for pki-setup with an owner of kwright
ausil has approved pki-setup in Fedora devel
ausil has approved Package pki-setup
ausil has set commit to Approved for 107427 on pki-setup (Fedora devel)
ausil has set checkout to Approved for 107427 on pki-setup (Fedora devel)
ausil has set build to Approved for 107427 on pki-setup (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-setup



From pkgdb at fedoraproject.org  Wed Dec 23 19:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:50:27 +0000
Subject: [pkgdb] pki-setup summary updated by ausil
Message-ID: <20091223195028.A7CF010F8DA@bastion.fedoraproject.org>

ausil set package pki-setup summary to The Dogtag PKI Setup Framework

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-setup



From pkgdb at fedoraproject.org  Wed Dec 23 19:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:50:27 +0000
Subject: [pkgdb] pki-setup (Fedora, 12) updated by ausil
Message-ID: <20091223195028.B99C710F8D9@bastion.fedoraproject.org>

ausil added a Fedora 12 branch for pki-setup
ausil has set commit to Approved for 107427 on pki-setup (Fedora 12)
ausil has set checkout to Approved for 107427 on pki-setup (Fedora 12)
ausil has set build to Approved for 107427 on pki-setup (Fedora 12)
ausil approved watchbugzilla on pki-setup (Fedora 12) for ausil
ausil approved watchcommits on pki-setup (Fedora 12) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-setup



From pkgdb at fedoraproject.org  Wed Dec 23 19:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:50:27 +0000
Subject: [pkgdb] pki-setup (Fedora, 11) updated by ausil
Message-ID: <20091223195028.D7E1910F8E6@bastion.fedoraproject.org>

ausil added a Fedora 11 branch for pki-setup
ausil has set commit to Approved for 107427 on pki-setup (Fedora 11)
ausil has set checkout to Approved for 107427 on pki-setup (Fedora 11)
ausil has set build to Approved for 107427 on pki-setup (Fedora 11)
ausil approved watchbugzilla on pki-setup (Fedora 11) for ausil
ausil approved watchcommits on pki-setup (Fedora 11) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-setup



From pkgdb at fedoraproject.org  Wed Dec 23 19:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:50:27 +0000
Subject: [pkgdb] pki-setup (Fedora EPEL, 5) updated by ausil
Message-ID: <20091223195028.ED93810F8EC@bastion.fedoraproject.org>

ausil added a Fedora EPEL 5 branch for pki-setup
ausil has set commit to Approved for 107427 on pki-setup (Fedora EPEL 5)
ausil has set checkout to Approved for 107427 on pki-setup (Fedora EPEL 5)
ausil has set build to Approved for 107427 on pki-setup (Fedora EPEL 5)
ausil approved watchbugzilla on pki-setup (Fedora EPEL 5) for ausil
ausil approved watchcommits on pki-setup (Fedora EPEL 5) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-setup



From pkgdb at fedoraproject.org  Wed Dec 23 19:50:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:50:27 +0000
Subject: [pkgdb] pki-setup (Fedora, devel) updated by ausil
Message-ID: <20091223195028.E9A0D10F8EA@bastion.fedoraproject.org>

ausil approved watchbugzilla on pki-setup (Fedora devel) for ausil
ausil approved watchcommits on pki-setup (Fedora devel) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-setup



From ausil at fedoraproject.org  Wed Dec 23 19:50:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:50:40 +0000 (UTC)
Subject: rpms/pki-setup - New directory
Message-ID: <20091223195040.168F211C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pki-setup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsF14810/rpms/pki-setup

Log Message:
Directory /cvs/pkgs/rpms/pki-setup added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:50:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:50:40 +0000 (UTC)
Subject: rpms/pki-setup/devel - New directory
Message-ID: <20091223195040.2FCD311C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pki-setup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsF14810/rpms/pki-setup/devel

Log Message:
Directory /cvs/pkgs/rpms/pki-setup/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:50:47 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:50:47 +0000 (UTC)
Subject: rpms/pki-setup Makefile,NONE,1.1
Message-ID: <20091223195047.C8A3C11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pki-setup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsF14810/rpms/pki-setup

Added Files:
	Makefile 
Log Message:
Setup of module pki-setup


--- NEW FILE Makefile ---
# Top level Makefile for module pki-setup
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:50:47 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:50:47 +0000 (UTC)
Subject: rpms/pki-setup/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091223195047.ED24711C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pki-setup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsF14810/rpms/pki-setup/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pki-setup


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pki-setup
# $Id: Makefile,v 1.1 2009/12/23 19:50:47 ausil Exp $
NAME := pki-setup
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:51:21 +0000
Subject: [pkgdb] at-spi2-core was added for mclasen
Message-ID: <20091223195120.ED5CD10F8D4@bastion.fedoraproject.org>

ausil has added Package at-spi2-core with summary Protocol definitions and daemon for D-Bus at-spi
ausil has approved Package at-spi2-core
ausil has added a Fedora devel branch for at-spi2-core with an owner of mclasen
ausil has approved at-spi2-core in Fedora devel
ausil has approved Package at-spi2-core
ausil has set commit to Approved for 107427 on at-spi2-core (Fedora devel)
ausil has set checkout to Approved for 107427 on at-spi2-core (Fedora devel)
ausil has set build to Approved for 107427 on at-spi2-core (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/at-spi2-core



From pkgdb at fedoraproject.org  Wed Dec 23 19:51:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:51:20 +0000
Subject: [pkgdb] at-spi2-core summary updated by ausil
Message-ID: <20091223195121.A6D9810F8DA@bastion.fedoraproject.org>

ausil set package at-spi2-core summary to Protocol definitions and daemon for D-Bus at-spi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/at-spi2-core



From ausil at fedoraproject.org  Wed Dec 23 19:51:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:51:31 +0000 (UTC)
Subject: rpms/at-spi2-core - New directory
Message-ID: <20091223195131.1756F11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/at-spi2-core
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst15171/rpms/at-spi2-core

Log Message:
Directory /cvs/pkgs/rpms/at-spi2-core added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:51:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:51:31 +0000 (UTC)
Subject: rpms/at-spi2-core/devel - New directory
Message-ID: <20091223195131.30DB911C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/at-spi2-core/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst15171/rpms/at-spi2-core/devel

Log Message:
Directory /cvs/pkgs/rpms/at-spi2-core/devel added to the repository




From ausil at fedoraproject.org  Wed Dec 23 19:51:38 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:51:38 +0000 (UTC)
Subject: rpms/at-spi2-core Makefile,NONE,1.1
Message-ID: <20091223195138.A4B9411C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/at-spi2-core
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst15171/rpms/at-spi2-core

Added Files:
	Makefile 
Log Message:
Setup of module at-spi2-core


--- NEW FILE Makefile ---
# Top level Makefile for module at-spi2-core
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From ausil at fedoraproject.org  Wed Dec 23 19:51:38 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 23 Dec 2009 19:51:38 +0000 (UTC)
Subject: rpms/at-spi2-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091223195138.E18AB11C00EF@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/at-spi2-core/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvst15171/rpms/at-spi2-core/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module at-spi2-core


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: at-spi2-core
# $Id: Makefile,v 1.1 2009/12/23 19:51:38 ausil Exp $
NAME := at-spi2-core
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Dec 23 19:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 19:53:15 +0000
Subject: [pkgdb] rfkill EL-5 cloned from devel
Message-ID: <20091223195314.E46F610F8D3@bastion.fedoraproject.org>

ausil cloned rfkill EL-5 from devel

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rfkill



From tomspur at fedoraproject.org  Wed Dec 23 19:59:14 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 19:59:14 +0000 (UTC)
Subject: File MiniMock-1.2.5.tar.gz uploaded to lookaside cache by tomspur
Message-ID: <20091223195914.ADB4B10F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-minimock:

404ad9b0b2052686dee28936403aa3e7  MiniMock-1.2.5.tar.gz



From tomspur at fedoraproject.org  Wed Dec 23 20:00:24 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 20:00:24 +0000 (UTC)
Subject: rpms/python-minimock/devel import.log, NONE, 1.1 python-minimock.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223200024.D71D711C00EF@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-minimock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16386/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-minimock.spec 
Log Message:
Initial import (#544581)



--- NEW FILE import.log ---
python-minimock-1_2_5-1_fc12:HEAD:python-minimock-1.2.5-1.fc12.src.rpm:1261598362


--- NEW FILE python-minimock.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-minimock
Version:        1.2.5
Release:        1%{?dist}
Summary:        The simplest possible mock library

Group:          Development/Tools
License:        MIT
URL:            http://pypi.python.org/pypi/MiniMock
Source0:        http://pypi.python.org/packages/source/M/MiniMock/MiniMock-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools

%description
minimock is a simple library for doing Mock objects with doctest.


%prep
%setup -q -n MiniMock-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/*
%{python_sitelib}/*


%changelog
* Thu Dec 22 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.2.5-1
- correct URL
- update to new version

* Sat Dec 5 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.0-1
- Initial creation for review


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-minimock/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:42:43 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:00:24 -0000	1.2
@@ -0,0 +1 @@
+MiniMock-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-minimock/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:42:43 -0000	1.1
+++ sources	23 Dec 2009 20:00:24 -0000	1.2
@@ -0,0 +1 @@
+404ad9b0b2052686dee28936403aa3e7  MiniMock-1.2.5.tar.gz



From cassmodiah at fedoraproject.org  Wed Dec 23 20:12:44 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Wed, 23 Dec 2009 20:12:44 +0000 (UTC)
Subject: File dmenu-4.0.tar.gz uploaded to lookaside cache by cassmodiah
Message-ID: <20091223201244.813C810F8D4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for dmenu:

66e761a653930cc8a21614ba9fedf903  dmenu-4.0.tar.gz



From pkgdb at fedoraproject.org  Wed Dec 23 20:13:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 20:13:28 +0000
Subject: [pkgdb] ReviewBoard: dyoung has requested commit
Message-ID: <20091223201327.D7D6A10F8DB@bastion.fedoraproject.org>

dyoung has requested the commit acl on ReviewBoard (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 20:13:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 20:13:29 +0000
Subject: [pkgdb] ReviewBoard: dyoung has requested commit
Message-ID: <20091223201330.B1A8B10F8DB@bastion.fedoraproject.org>

dyoung has requested the commit acl on ReviewBoard (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 20:13:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 20:13:43 +0000
Subject: [pkgdb] ReviewBoard: dyoung has given up watchcommits
Message-ID: <20091223201342.940EC10F8DA@bastion.fedoraproject.org>

dyoung has given up the watchcommits acl on ReviewBoard (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 20:13:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 20:13:45 +0000
Subject: [pkgdb] ReviewBoard: dyoung has given up watchbugzilla
Message-ID: <20091223201344.D8E4210F8DA@bastion.fedoraproject.org>

dyoung has given up the watchbugzilla acl on ReviewBoard (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 20:13:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 20:13:46 +0000
Subject: [pkgdb] ReviewBoard: dyoung has given up watchbugzilla
Message-ID: <20091223201346.AE74210F8DB@bastion.fedoraproject.org>

dyoung has given up the watchbugzilla acl on ReviewBoard (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 20:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 20:14:03 +0000
Subject: [pkgdb] ReviewBoard: dyoung has given up watchcommits
Message-ID: <20091223201350.9BD9A10F8DB@bastion.fedoraproject.org>

dyoung has given up the watchcommits acl on ReviewBoard (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From cassmodiah at fedoraproject.org  Wed Dec 23 20:13:52 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Wed, 23 Dec 2009 20:13:52 +0000 (UTC)
Subject: rpms/dmenu/devel dmenu-4.0-makefile.patch, NONE, 1.1 dmenu.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223201352.552B811C00EF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/dmenu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18696/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dmenu-4.0-makefile.patch dmenu.spec import.log 
Log Message:
initial import


dmenu-4.0-makefile.patch:
 config.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE dmenu-4.0-makefile.patch ---
--- dmenu-4.0/config.mk	2009-04-18 13:50:04.000000000 +0200
+++ dmenu-4.0/config.mk.new	2009-04-19 21:50:29.000000000 +0200
@@ -20,8 +20,9 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 
 
 # flags
 CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+OPTFLAGS = -Os
+CFLAGS = -std=c99 -pedantic -Wall ${OPTFLAGS} ${INCS} ${CPPFLAGS}
+LDFLAGS = ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"


--- NEW FILE dmenu.spec ---
Name:           dmenu
Version:        4.0
Release:        2%{?dist}
Summary:        Generic menu for X

Group:          User Interface/Desktops
License:        MIT
URL:            http://www.suckless.org/programs/dmenu.html
Source0:        http://code.suckless.org/dl/tools/%{name}-%{version}.tar.gz
Patch0:         dmenu-4.0-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libX11-devel
BuildRequires:  libXinerama-devel
Requires:       terminus-fonts


%description
Dynamic menu is a generic menu for X, originally designed for dwm. It manages
huge amounts (up to 10.000 and more) of user defined menu items efficiently.


%prep
%setup -q
%patch0 -p1 -b .makefile
sed -i -e 's|\t@|\t|' Makefile


%build
make \
    X11INC=%{_includedir} \
    X11LIB=%{_libdir} \
    OPTFLAGS="%{optflags}"


%install
rm -rf %{buildroot}
make install \
     DESTDIR=%{buildroot} \
     PREFIX=%{_prefix} \
     MANPREFIX=%{_mandir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}*
%{_mandir}/man*/%{name}.*


%changelog
* Sat Dec 12 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 4.0-2
- merged with the spec-file of Jan Blazek

* Thu Oct 15 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 4.0-1
- Initial Package Build


--- NEW FILE import.log ---
dmenu-4_0-2_fc12:HEAD:dmenu-4.0-2.fc12.src.rpm:1261599149


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dmenu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:47:07 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:13:51 -0000	1.2
@@ -0,0 +1 @@
+dmenu-4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmenu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:47:07 -0000	1.1
+++ sources	23 Dec 2009 20:13:52 -0000	1.2
@@ -0,0 +1 @@
+66e761a653930cc8a21614ba9fedf903  dmenu-4.0.tar.gz



From cassmodiah at fedoraproject.org  Wed Dec 23 20:13:54 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Wed, 23 Dec 2009 20:13:54 +0000 (UTC)
Subject: rpms/dmenu/F-12 dmenu-4.0-makefile.patch, NONE, 1.1 dmenu.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223201354.E328611C00EF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/dmenu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18718/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	dmenu-4.0-makefile.patch dmenu.spec import.log 
Log Message:
initial import


dmenu-4.0-makefile.patch:
 config.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE dmenu-4.0-makefile.patch ---
--- dmenu-4.0/config.mk	2009-04-18 13:50:04.000000000 +0200
+++ dmenu-4.0/config.mk.new	2009-04-19 21:50:29.000000000 +0200
@@ -20,8 +20,9 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 
 
 # flags
 CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+OPTFLAGS = -Os
+CFLAGS = -std=c99 -pedantic -Wall ${OPTFLAGS} ${INCS} ${CPPFLAGS}
+LDFLAGS = ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"


--- NEW FILE dmenu.spec ---
Name:           dmenu
Version:        4.0
Release:        2%{?dist}
Summary:        Generic menu for X

Group:          User Interface/Desktops
License:        MIT
URL:            http://www.suckless.org/programs/dmenu.html
Source0:        http://code.suckless.org/dl/tools/%{name}-%{version}.tar.gz
Patch0:         dmenu-4.0-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libX11-devel
BuildRequires:  libXinerama-devel
Requires:       terminus-fonts


%description
Dynamic menu is a generic menu for X, originally designed for dwm. It manages
huge amounts (up to 10.000 and more) of user defined menu items efficiently.


%prep
%setup -q
%patch0 -p1 -b .makefile
sed -i -e 's|\t@|\t|' Makefile


%build
make \
    X11INC=%{_includedir} \
    X11LIB=%{_libdir} \
    OPTFLAGS="%{optflags}"


%install
rm -rf %{buildroot}
make install \
     DESTDIR=%{buildroot} \
     PREFIX=%{_prefix} \
     MANPREFIX=%{_mandir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}*
%{_mandir}/man*/%{name}.*


%changelog
* Sat Dec 12 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 4.0-2
- merged with the spec-file of Jan Blazek

* Thu Oct 15 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 4.0-1
- Initial Package Build


--- NEW FILE import.log ---
dmenu-4_0-2_fc12:F-12:dmenu-4.0-2.fc12.src.rpm:1261599152


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dmenu/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:47:07 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:13:54 -0000	1.2
@@ -0,0 +1 @@
+dmenu-4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmenu/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:47:07 -0000	1.1
+++ sources	23 Dec 2009 20:13:54 -0000	1.2
@@ -0,0 +1 @@
+66e761a653930cc8a21614ba9fedf903  dmenu-4.0.tar.gz



From pkgdb at fedoraproject.org  Wed Dec 23 20:17:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 20:17:01 +0000
Subject: [pkgdb] ReviewBoard had acl change status
Message-ID: <20091223201702.54F0610F8DA@bastion.fedoraproject.org>

dmalcolm has set the commit acl on ReviewBoard (Fedora devel) to Approved for dyoung

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From pkgdb at fedoraproject.org  Wed Dec 23 20:17:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 20:17:04 +0000
Subject: [pkgdb] ReviewBoard had acl change status
Message-ID: <20091223201704.57D8D10F8DF@bastion.fedoraproject.org>

dmalcolm has set the commit acl on ReviewBoard (Fedora 12) to Approved for dyoung

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ReviewBoard



From tomspur at fedoraproject.org  Wed Dec 23 20:18:16 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 20:18:16 +0000 (UTC)
Subject: rpms/python-daemon/devel python-daemon.spec,1.3,1.4
Message-ID: <20091223201816.601F611C00EF@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19514

Modified Files:
	python-daemon.spec 
Log Message:
- add missing BR: minimock and lockfile -> testsuite works again
- remove patch, use sed instead



Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/python-daemon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-daemon.spec	7 Oct 2009 19:24:34 -0000	1.3
+++ python-daemon.spec	23 Dec 2009 20:18:15 -0000	1.4
@@ -3,18 +3,18 @@
 
 Name:           python-daemon
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library to implement a well-behaved Unix daemon process
 
 Group:          Development/Languages
 License:        Python
 URL:            http://pypi.python.org/pypi/python-daemon/
 Source0:        http://pypi.python.org/packages/source/p/python-daemon/%{name}-%{version}.tar.gz
-Patch0:         version_info_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
+BuildRequires:  python-lockfile python-minimock
 
 %description
 This library implements the well-behaved daemon specification of PEP 3143,
@@ -23,8 +23,7 @@ This library implements the well-behaved
 %prep
 %setup -q
 
-%patch0 -p1
-
+sed -i -e '/^#!\//, 1d' daemon/version/version_info.py
 
 
 %build
@@ -40,8 +39,8 @@ rm -fr %{buildroot}%{python_sitelib}/tes
 rm -rf %{buildroot}
 
 # Test suite requires minimock and lockfile
-#%check
-#PYTHONPATH=$(pwd) nosetest
+%check
+PYTHONPATH=$(pwd) nosetests
 
 %files
 %defattr(-,root,root,-)
@@ -50,6 +49,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/python_daemon-%{version}-py%{pyver}.egg-info/
 
 %changelog
+* Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.1-2
+- add missing BR: minimock and lockfile -> testsuite works again
+- remove patch, use sed instead
+
 * Wed Oct 07 2009 Luke Macken <lmacken at redhat.com> - 1.5.1-1
 - Update to 1.5.1
 - Remove conflicting files (#512760)



From tomspur at fedoraproject.org  Wed Dec 23 20:24:31 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 20:24:31 +0000 (UTC)
Subject: File python-daemon-1.5.2.tar.gz uploaded to lookaside cache by tomspur
Message-ID: <20091223202431.CC23010F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-daemon:

3c876e2bef46171d4cccf4f74823a638  python-daemon-1.5.2.tar.gz



From tomspur at fedoraproject.org  Wed Dec 23 20:24:31 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 20:24:31 +0000 (UTC)
Subject: File python-daemon-1.5.2.tar.gz uploaded to lookaside cache by tomspur
Message-ID: <20091223202431.CC23010F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-daemon:

3c876e2bef46171d4cccf4f74823a638  python-daemon-1.5.2.tar.gz



From tomspur at fedoraproject.org  Wed Dec 23 20:25:07 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 20:25:07 +0000 (UTC)
Subject: rpms/python-daemon/devel .cvsignore, 1.3, 1.4 python-daemon.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20091223202507.B9EEB11C00EF@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20926

Modified Files:
	.cvsignore python-daemon.spec sources 
Log Message:
update to 1.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 19:27:27 -0000	1.3
+++ .cvsignore	23 Dec 2009 20:25:07 -0000	1.4
@@ -1 +1 @@
-python-daemon-1.5.1.tar.gz
+python-daemon-1.5.2.tar.gz


Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/python-daemon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-daemon.spec	23 Dec 2009 20:18:15 -0000	1.4
+++ python-daemon.spec	23 Dec 2009 20:25:07 -0000	1.5
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-daemon
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.5.2
+Release:        1%{?dist}
 Summary:        Library to implement a well-behaved Unix daemon process
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@ PYTHONPATH=$(pwd) nosetests
 %{python_sitelib}/python_daemon-%{version}-py%{pyver}.egg-info/
 
 %changelog
+* Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.2-1
+- update to 1.5.2
+
 * Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.1-2
 - add missing BR: minimock and lockfile -> testsuite works again
 - remove patch, use sed instead


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Oct 2009 19:27:27 -0000	1.3
+++ sources	23 Dec 2009 20:25:07 -0000	1.4
@@ -1 +1 @@
-46abde3f848aaaed0df3b1fe938234f0  python-daemon-1.5.1.tar.gz
+3c876e2bef46171d4cccf4f74823a638  python-daemon-1.5.2.tar.gz



From kwright at fedoraproject.org  Wed Dec 23 20:30:23 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 20:30:23 +0000 (UTC)
Subject: File pki-setup-1.3.0.tar.gz uploaded to lookaside cache by kwright
Message-ID: <20091223203023.A5C0C10F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for pki-setup:

3abe73346f239f9db64dc481fbb58aad  pki-setup-1.3.0.tar.gz



From kwright at fedoraproject.org  Wed Dec 23 20:31:16 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 20:31:16 +0000 (UTC)
Subject: rpms/pki-setup/F-11 import.log, NONE, 1.1 pki-setup.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223203116.D33DB11C00EF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-setup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21859/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-setup.spec 
Log Message:
dogtag build for fedora see: 521993



--- NEW FILE import.log ---
pki-setup-1_3_0-6_fc11:F-11:pki-setup-1.3.0-6.fc11.src.rpm:1261600223


--- NEW FILE pki-setup.spec ---
Name:           pki-setup
Version:        1.3.0
Release:        6%{?dist}
Summary:        Dogtag Certificate system - PKI Instance Creation and Removal Scripts
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Requires:       policycoreutils
%{?fc11:Requires: policycoreutils-python}
%{?fc12:Requires: policycoreutils-python}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Public Key Infrastructure (PKI) setup scripts used to create and remove
instances from Dogtag PKI deployments.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="pki" \
    -Dproduct="setup" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

## remove unwanted files
rm -rf %{buildroot}%{_bindir}/pkihost

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/*
%{_datadir}/pki/

%changelog
* Wed Dec 23 2009 Kevin Wright <kwright at redhat.com> 1.3.0-6
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Removed Requires for all perl packages
- Removed Requires for pki-native-tools

* Mon Dec 14 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-5
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Bugzilla Bug #529070 -  rpm packaging problems (cannot reinstall correctly) 
- Removed 'with exceptions' from License
- Removed 'Requires: perl >= 5.8.0'

* Mon Dec 7 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-4
- Bugzilla Bug #528556 -  policycoreutils-python (semanage) prerequisite
  missing from rpm
- Added "conditional" support for Fedora 11
- Added "conditional" support for Fedora 12

* Mon Nov 16 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #533518 -  Remove "pkihost" script from pki-setup . . .

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #521993 - packaging for Fedora Dogtag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-setup/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:50:47 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:31:16 -0000	1.2
@@ -0,0 +1 @@
+pki-setup-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-setup/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:50:47 -0000	1.1
+++ sources	23 Dec 2009 20:31:16 -0000	1.2
@@ -0,0 +1 @@
+3abe73346f239f9db64dc481fbb58aad  pki-setup-1.3.0.tar.gz



From kwright at fedoraproject.org  Wed Dec 23 20:42:41 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 20:42:41 +0000 (UTC)
Subject: rpms/pki-setup/F-12 import.log, NONE, 1.1 pki-setup.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223204241.E0B1611C00EF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-setup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23534/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-setup.spec 
Log Message:
dogtag build for fedora see: 521993



--- NEW FILE import.log ---
pki-setup-1_3_0-6_fc12:F-12:pki-setup-1.3.0-6.fc12.src.rpm:1261600938


--- NEW FILE pki-setup.spec ---
Name:           pki-setup
Version:        1.3.0
Release:        6%{?dist}
Summary:        Dogtag Certificate system - PKI Instance Creation and Removal Scripts
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Requires:       policycoreutils
%{?fc11:Requires: policycoreutils-python}
%{?fc12:Requires: policycoreutils-python}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Public Key Infrastructure (PKI) setup scripts used to create and remove
instances from Dogtag PKI deployments.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="pki" \
    -Dproduct="setup" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

## remove unwanted files
rm -rf %{buildroot}%{_bindir}/pkihost

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/*
%{_datadir}/pki/

%changelog
* Wed Dec 23 2009 Kevin Wright <kwright at redhat.com> 1.3.0-6
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Removed Requires for all perl packages
- Removed Requires for pki-native-tools

* Mon Dec 14 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-5
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Bugzilla Bug #529070 -  rpm packaging problems (cannot reinstall correctly) 
- Removed 'with exceptions' from License
- Removed 'Requires: perl >= 5.8.0'

* Mon Dec 7 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-4
- Bugzilla Bug #528556 -  policycoreutils-python (semanage) prerequisite
  missing from rpm
- Added "conditional" support for Fedora 11
- Added "conditional" support for Fedora 12

* Mon Nov 16 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #533518 -  Remove "pkihost" script from pki-setup . . .

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #521993 - packaging for Fedora Dogtag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-setup/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:50:47 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:42:41 -0000	1.2
@@ -0,0 +1 @@
+pki-setup-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-setup/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:50:47 -0000	1.1
+++ sources	23 Dec 2009 20:42:41 -0000	1.2
@@ -0,0 +1 @@
+3abe73346f239f9db64dc481fbb58aad  pki-setup-1.3.0.tar.gz



From kwright at fedoraproject.org  Wed Dec 23 20:45:00 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 20:45:00 +0000 (UTC)
Subject: rpms/pki-setup/EL-5 import.log, NONE, 1.1 pki-setup.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223204500.14AE011C00EF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-setup/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24153/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-setup.spec 
Log Message:
dogtag build for fedora see: 521993



--- NEW FILE import.log ---
pki-setup-1_3_0-6_el5:EL-5:pki-setup-1.3.0-6.el5.src.rpm:1261601077


--- NEW FILE pki-setup.spec ---
Name:           pki-setup
Version:        1.3.0
Release:        6%{?dist}
Summary:        Dogtag Certificate system - PKI Instance Creation and Removal Scripts
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Requires:       policycoreutils
%{?fc11:Requires: policycoreutils-python}
%{?fc12:Requires: policycoreutils-python}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Public Key Infrastructure (PKI) setup scripts used to create and remove
instances from Dogtag PKI deployments.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="pki" \
    -Dproduct="setup" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

## remove unwanted files
rm -rf %{buildroot}%{_bindir}/pkihost

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/*
%{_datadir}/pki/

%changelog
* Wed Dec 23 2009 Kevin Wright <kwright at redhat.com> 1.3.0-6
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Removed Requires for all perl packages
- Removed Requires for pki-native-tools

* Mon Dec 14 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-5
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Bugzilla Bug #529070 -  rpm packaging problems (cannot reinstall correctly) 
- Removed 'with exceptions' from License
- Removed 'Requires: perl >= 5.8.0'

* Mon Dec 7 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-4
- Bugzilla Bug #528556 -  policycoreutils-python (semanage) prerequisite
  missing from rpm
- Added "conditional" support for Fedora 11
- Added "conditional" support for Fedora 12

* Mon Nov 16 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #533518 -  Remove "pkihost" script from pki-setup . . .

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #521993 - packaging for Fedora Dogtag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-setup/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:50:47 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:44:59 -0000	1.2
@@ -0,0 +1 @@
+pki-setup-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-setup/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:50:47 -0000	1.1
+++ sources	23 Dec 2009 20:44:59 -0000	1.2
@@ -0,0 +1 @@
+3abe73346f239f9db64dc481fbb58aad  pki-setup-1.3.0.tar.gz



From adsllc at fedoraproject.org  Wed Dec 23 20:46:26 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Wed, 23 Dec 2009 20:46:26 +0000 (UTC)
Subject: File libzip-0.9.tar.gz uploaded to lookaside cache by adsllc
Message-ID: <20091223204626.71C2B10F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mingw32-libzip:

5b753dfe336f6fe87b0e698b382c3071  libzip-0.9.tar.gz



From adsllc at fedoraproject.org  Wed Dec 23 20:46:57 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Wed, 23 Dec 2009 20:46:57 +0000 (UTC)
Subject: rpms/mingw32-libzip/devel import.log, NONE, 1.1 mingw32-libzip.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223204657.A2C3C11C00EF@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/mingw32-libzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24603/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libzip.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
mingw32-libzip-0_9-2_fc12:HEAD:mingw32-libzip-0.9-2.fc12.src.rpm:1261601186


--- NEW FILE mingw32-libzip.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global nativename libzip

Name:           mingw32-%{nativename}
Version:        0.9
Release:        2%{?dist}
Summary:        C library for reading, creating, and modifying zip archives

Group:          System Environment/Libraries
License:        BSD
URL:            http://www.nih.at/libzip/index.html
Source0:        http://www.nih.at/libzip/%{nativename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  libtool
BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib >= 1.1.2

%description
libzip is a C library for reading, creating, and modifying zip archives. Files
can be added from data buffers, files, or compressed data copied directly from 
other zip archives. Changes made without closing the archive can be reverted. 
The API is documented by man pages.

%prep
%setup -q -n %{nativename}-%{version}

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

#Remove files we don't need
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS README THANKS TODO
%{_mingw32_bindir}/zipcmp.exe
%{_mingw32_bindir}/zipmerge.exe
%{_mingw32_bindir}/ziptorrent.exe
%{_mingw32_bindir}/*.dll
%{_mingw32_libdir}/libzip.dll.a
%{_mingw32_libdir}/pkgconfig/libzip.pc
%{_mingw32_includedir}/*.h

%changelog
* Tue Dec 22 2009 David Ludlow <dave at adsllc.com> - 0.9-2
- Prevent owning a directory that is not mine to own

* Tue Dec 22 2009 David Ludlow <dave at adsllc.com> - 0.9-1
- Initial creation of mingw32 package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libzip/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:44:46 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:46:57 -0000	1.2
@@ -0,0 +1 @@
+libzip-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libzip/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:44:46 -0000	1.1
+++ sources	23 Dec 2009 20:46:57 -0000	1.2
@@ -0,0 +1 @@
+5b753dfe336f6fe87b0e698b382c3071  libzip-0.9.tar.gz



From adsllc at fedoraproject.org  Wed Dec 23 20:47:51 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Wed, 23 Dec 2009 20:47:51 +0000 (UTC)
Subject: rpms/mingw32-libzip/F-12 import.log, NONE, 1.1 mingw32-libzip.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223204751.6E18211C00EF@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/mingw32-libzip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24991/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libzip.spec 
Log Message:
Initial F-12 import



--- NEW FILE import.log ---
mingw32-libzip-0_9-2_fc12:F-12:mingw32-libzip-0.9-2.fc12.src.rpm:1261601241


--- NEW FILE mingw32-libzip.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global nativename libzip

Name:           mingw32-%{nativename}
Version:        0.9
Release:        2%{?dist}
Summary:        C library for reading, creating, and modifying zip archives

Group:          System Environment/Libraries
License:        BSD
URL:            http://www.nih.at/libzip/index.html
Source0:        http://www.nih.at/libzip/%{nativename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  libtool
BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib >= 1.1.2

%description
libzip is a C library for reading, creating, and modifying zip archives. Files
can be added from data buffers, files, or compressed data copied directly from 
other zip archives. Changes made without closing the archive can be reverted. 
The API is documented by man pages.

%prep
%setup -q -n %{nativename}-%{version}

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

#Remove files we don't need
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS README THANKS TODO
%{_mingw32_bindir}/zipcmp.exe
%{_mingw32_bindir}/zipmerge.exe
%{_mingw32_bindir}/ziptorrent.exe
%{_mingw32_bindir}/*.dll
%{_mingw32_libdir}/libzip.dll.a
%{_mingw32_libdir}/pkgconfig/libzip.pc
%{_mingw32_includedir}/*.h

%changelog
* Tue Dec 22 2009 David Ludlow <dave at adsllc.com> - 0.9-2
- Prevent owning a directory that is not mine to own

* Tue Dec 22 2009 David Ludlow <dave at adsllc.com> - 0.9-1
- Initial creation of mingw32 package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libzip/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:44:46 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:47:51 -0000	1.2
@@ -0,0 +1 @@
+libzip-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libzip/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:44:46 -0000	1.1
+++ sources	23 Dec 2009 20:47:51 -0000	1.2
@@ -0,0 +1 @@
+5b753dfe336f6fe87b0e698b382c3071  libzip-0.9.tar.gz



From adsllc at fedoraproject.org  Wed Dec 23 20:48:40 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Wed, 23 Dec 2009 20:48:40 +0000 (UTC)
Subject: rpms/mingw32-libzip/F-11 import.log, NONE, 1.1 mingw32-libzip.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223204840.2F42011C00EF@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/mingw32-libzip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25284/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libzip.spec 
Log Message:
Initial F-11 import



--- NEW FILE import.log ---
mingw32-libzip-0_9-2_fc12:F-11:mingw32-libzip-0.9-2.fc12.src.rpm:1261601291


--- NEW FILE mingw32-libzip.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

%global nativename libzip

Name:           mingw32-%{nativename}
Version:        0.9
Release:        2%{?dist}
Summary:        C library for reading, creating, and modifying zip archives

Group:          System Environment/Libraries
License:        BSD
URL:            http://www.nih.at/libzip/index.html
Source0:        http://www.nih.at/libzip/%{nativename}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  libtool
BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib >= 1.1.2

%description
libzip is a C library for reading, creating, and modifying zip archives. Files
can be added from data buffers, files, or compressed data copied directly from 
other zip archives. Changes made without closing the archive can be reverted. 
The API is documented by man pages.

%prep
%setup -q -n %{nativename}-%{version}

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

#Remove files we don't need
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS NEWS README THANKS TODO
%{_mingw32_bindir}/zipcmp.exe
%{_mingw32_bindir}/zipmerge.exe
%{_mingw32_bindir}/ziptorrent.exe
%{_mingw32_bindir}/*.dll
%{_mingw32_libdir}/libzip.dll.a
%{_mingw32_libdir}/pkgconfig/libzip.pc
%{_mingw32_includedir}/*.h

%changelog
* Tue Dec 22 2009 David Ludlow <dave at adsllc.com> - 0.9-2
- Prevent owning a directory that is not mine to own

* Tue Dec 22 2009 David Ludlow <dave at adsllc.com> - 0.9-1
- Initial creation of mingw32 package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libzip/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:44:46 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:48:40 -0000	1.2
@@ -0,0 +1 @@
+libzip-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libzip/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:44:46 -0000	1.1
+++ sources	23 Dec 2009 20:48:40 -0000	1.2
@@ -0,0 +1 @@
+5b753dfe336f6fe87b0e698b382c3071  libzip-0.9.tar.gz



From rdieter at fedoraproject.org  Wed Dec 23 20:56:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 20:56:15 +0000 (UTC)
Subject: File kdebindings-4.3.85.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091223205615.98CF010F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kdebindings:

86fbd7d6038ed34bd701f05217ee7d87  kdebindings-4.3.85.tar.bz2



From kwright at fedoraproject.org  Wed Dec 23 20:56:18 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 20:56:18 +0000 (UTC)
Subject: rpms/pki-setup/devel import.log, NONE, 1.1 pki-setup.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223205618.F2A3B11C00EF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24810/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-setup.spec 
Log Message:
dogtag build for fedora see: 521993



--- NEW FILE import.log ---
pki-setup-1_3_0-6_fc13:HEAD:pki-setup-1.3.0-6.fc13.src.rpm:1261601207


--- NEW FILE pki-setup.spec ---
Name:           pki-setup
Version:        1.3.0
Release:        6%{?dist}
Summary:        Dogtag Certificate system - PKI Instance Creation and Removal Scripts
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Requires:       policycoreutils
%{?fc11:Requires: policycoreutils-python}
%{?fc12:Requires: policycoreutils-python}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Public Key Infrastructure (PKI) setup scripts used to create and remove
instances from Dogtag PKI deployments.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="pki" \
    -Dproduct="setup" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

## remove unwanted files
rm -rf %{buildroot}%{_bindir}/pkihost

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/*
%{_datadir}/pki/

%changelog
* Wed Dec 23 2009 Kevin Wright <kwright at redhat.com> 1.3.0-6
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Removed Requires for all perl packages
- Removed Requires for pki-native-tools

* Mon Dec 14 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-5
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Bugzilla Bug #529070 -  rpm packaging problems (cannot reinstall correctly) 
- Removed 'with exceptions' from License
- Removed 'Requires: perl >= 5.8.0'

* Mon Dec 7 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-4
- Bugzilla Bug #528556 -  policycoreutils-python (semanage) prerequisite
  missing from rpm
- Added "conditional" support for Fedora 11
- Added "conditional" support for Fedora 12

* Mon Nov 16 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #533518 -  Remove "pkihost" script from pki-setup . . .

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #521993 - packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #521993 - packaging for Fedora Dogtag


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-setup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:50:47 -0000	1.1
+++ .cvsignore	23 Dec 2009 20:56:18 -0000	1.2
@@ -0,0 +1 @@
+pki-setup-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-setup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:50:47 -0000	1.1
+++ sources	23 Dec 2009 20:56:18 -0000	1.2
@@ -0,0 +1 @@
+3abe73346f239f9db64dc481fbb58aad  pki-setup-1.3.0.tar.gz



From rdieter at fedoraproject.org  Wed Dec 23 20:57:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 23 Dec 2009 20:57:50 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec, 1.284, 1.285 sources, 1.77, 
	1.78 kdebindings-4.3.85-fix-build.patch, 1.4, NONE
Message-ID: <20091223205750.935CC11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27337

Modified Files:
	kdebindings.spec sources 
Removed Files:
	kdebindings-4.3.85-fix-build.patch 
Log Message:
* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
- tarball respin, includes build-fix'es



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- kdebindings.spec	19 Dec 2009 14:09:33 -0000	1.284
+++ kdebindings.spec	23 Dec 2009 20:57:50 -0000	1.285
@@ -54,7 +54,7 @@
 
 Name: kdebindings
 Version: 4.3.85
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -70,11 +70,6 @@ Patch0:  kdebindings-4.3.85-qyoto_no_exa
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
 Patch1:  kdebindings-4.3.75-no-rpath.patch
-# fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
-# also fix its build (missing #include <nepomuk/resourcetypeterm.h>)
-# (subset of http://websvn.kde.org/?view=revision&revision=1063412)
-# also fix phpqt_internals.cpp for the current smoke.h
-Patch2:  kdebindings-4.3.85-fix-build.patch
 ## upstream patches
 
 BuildRequires:  akonadi-devel >= %{akonadi_version} 
@@ -281,7 +276,6 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
 %patch0 -p1 -b .qyoto_no_examples
-%patch2 -p1 -b .fix-build
 
 # upstream patches
 
@@ -551,6 +545,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
+- tarball respin, includes build-fix'es
+
 * Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
 - fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
 - fix its build (missing #include <nepomuk/resourcetypeterm.h>)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	18 Dec 2009 16:51:36 -0000	1.77
+++ sources	23 Dec 2009 20:57:50 -0000	1.78
@@ -1 +1 @@
-6c25d465c2544a199273975686ea8285  kdebindings-4.3.85.tar.bz2
+86fbd7d6038ed34bd701f05217ee7d87  kdebindings-4.3.85.tar.bz2


--- kdebindings-4.3.85-fix-build.patch DELETED ---



From akurtakov at fedoraproject.org  Wed Dec 23 21:06:08 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 21:06:08 +0000 (UTC)
Subject: File plexus-io-1.0-alpha-5.tar.bz2 uploaded to lookaside cache by
	akurtakov
Message-ID: <20091223210608.8C8C710F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for plexus-io:

2e17dcd94ebdd064dc4d0b01e90bc5ff  plexus-io-1.0-alpha-5.tar.bz2



From akurtakov at fedoraproject.org  Wed Dec 23 21:07:32 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 21:07:32 +0000 (UTC)
Subject: rpms/plexus-io/devel plexus-io.spec, NONE, 1.1 sources, 1.1,
	1.2 .cvsignore, 1.1, 1.2
Message-ID: <20091223210732.C823711C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-io/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29151/devel

Modified Files:
	sources .cvsignore 
Added Files:
	plexus-io.spec 
Log Message:
Initial import.


--- NEW FILE plexus-io.spec ---
Name:           plexus-io
Version:        1.0
Release:        0.2.a5%{?dist}
Summary:        Plexus IO Components

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://plexus.codehaus.org/plexus-components/plexus-io
#svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-1.0-alpha-5/
#tar cjf plexus-io-1.0-alpha-5.tar.bz2 plexus-io-1.0-alpha-5/      
Source0:        plexus-io-1.0-alpha-5.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: java-devel >= 1:1.6.0 
BuildRequires:  jpackage-utils

BuildRequires: plexus-utils
BuildRequires: plexus-container-default
BuildRequires: maven2
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-maven-plugin
Requires:  jpackage-utils
Requires: plexus-utils
Requires: plexus-container-default

Requires(post): jpackage-utils
Requires(postun): jpackage-utils

%description
Plexus IO is a set of plexus components, which are designed for use
in I/O operations. 

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.


%prep
%setup -q -n %{name}-1.0-alpha-5

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/plexus
install -m 644 target/%{name}-1.0-alpha-5.jar   %{buildroot}%{_javadir}/plexus/io-1.0.jar

(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/plexus io

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc NOTICE.txt
%{_javadir}/plexus/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.2.a5
- Fix review comments.

* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.1.a5.1
- Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-io/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:40:22 -0000	1.1
+++ sources	23 Dec 2009 21:07:32 -0000	1.2
@@ -0,0 +1 @@
+2e17dcd94ebdd064dc4d0b01e90bc5ff  plexus-io-1.0-alpha-5.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-io/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:40:21 -0000	1.1
+++ .cvsignore	23 Dec 2009 21:07:32 -0000	1.2
@@ -0,0 +1 @@
+plexus-io-1.0-alpha-5.tar.bz2



From akurtakov at fedoraproject.org  Wed Dec 23 21:10:24 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 21:10:24 +0000 (UTC)
Subject: File plexus-interpolation-1.13.tar.bz2 uploaded to lookaside cache by
	akurtakov
Message-ID: <20091223211024.A7DF210F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for plexus-interpolation:

f47ea8c8a53a0be53c55f5a16e8615ff  plexus-interpolation-1.13.tar.bz2



From myoung at fedoraproject.org  Wed Dec 23 21:12:59 2009
From: myoung at fedoraproject.org (myoung)
Date: Wed, 23 Dec 2009 21:12:59 +0000 (UTC)
Subject: rpms/kernel/devel drm-edid-9340d8cf.patch, NONE,
	1.1.2.1 patch-2.6.31.9.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.1014.2.35, 1.1014.2.36 drm-next-b390f944.patch, 1.1.2.1,
	1.1.2.2 drm-nouveau.patch, 1.8.6.25, 1.8.6.26 kernel.spec,
	1.1294.2.81, 1.1294.2.82 sources, 1.976.2.36,
	1.976.2.37 upstream, 1.888.2.35, 1.888.2.36 xen.pvops.patch,
	1.1.2.51, 1.1.2.52 crypto-via-padlock-fix-nano-aes.patch,
	1.1.2.1, NONE drm-conservative-fallback-modes.patch, 1.1.2.1,
	NONE drm-default-mode.patch, 1.1.2.1,
	NONE drm-edid-header-fixup.patch, 1.1.2.1,
	NONE drm-edid-retry.patch, 1.1.2.2,
	NONE drm-i915-fix-sync-to-vbl-when-vga-is-off.patch, 1.1.2.2,
	NONE highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch,
	1.1.2.1,
	NONE highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch,
	1.1.2.1, NONE highmem-fix-arm-powerpc-kmap_types.patch, 1.1.2.1,
	NONE ipv4-fix-null-ptr-deref-in-ip_fragment.patch, 1.1.2.1,
	NONE patch-2.6.31.6.bz2.sign, 1.1.2.1, NONE
Message-ID: <20091223211259.1EDB011C00EF@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29514

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore drm-next-b390f944.patch drm-nouveau.patch 
	kernel.spec sources upstream xen.pvops.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-edid-9340d8cf.patch patch-2.6.31.9.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	crypto-via-padlock-fix-nano-aes.patch 
	drm-conservative-fallback-modes.patch drm-default-mode.patch 
	drm-edid-header-fixup.patch drm-edid-retry.patch 
	drm-i915-fix-sync-to-vbl-when-vga-is-off.patch 
	highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch 
	highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch 
	highmem-fix-arm-powerpc-kmap_types.patch 
	ipv4-fix-null-ptr-deref-in-ip_fragment.patch 
	patch-2.6.31.6.bz2.sign 
Log Message:
Update pvops to latest patch and 2.6.31.9


drm-edid-9340d8cf.patch:
 drivers/gpu/drm/drm_edid.c  |  334 +++++++++++++++++++++++++++-----------------
 drivers/gpu/drm/drm_modes.c |   28 +++
 include/drm/drm_crtc.h      |    7 
 include/drm/drm_edid.h      |    9 +
 4 files changed, 249 insertions(+), 129 deletions(-)

--- NEW FILE drm-edid-9340d8cf.patch ---
>From 79766d79dbe27a7eb0543db95202318a6f1491d0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 16 Dec 2009 15:12:41 -0500
Subject: [PATCH] drm/modes: Sync with Linus.

1bd049f Merge branch 'drm-core-next' into drm-linus
9340d8c drm/edid: Decode 3-byte CVT codes from EDID 1.4
2dbdc52 drm/edid: Add new detailed block types from EDID 1.4
07a5e63 drm/edid: Add DMT modes to the pool if the monitor is GTF-capable
7ac96a9 drm/modes: Add drm_mode_hsync()
9cf0097 drm/edid: Unify detailed block parsing between base and extension blocks
7064fef drm: work around EDIDs with bad htotal/vtotal values
862b89c drm/edid: Fix up partially corrupted headers
47ee4cc drm/edid: Retry EDID fetch up to four times
f985ded drm/modes: Limit fallback modes to 60Hz
---
 drivers/gpu/drm/drm_edid.c  |  334 +++++++++++++++++++++++++++----------------
 drivers/gpu/drm/drm_modes.c |   28 ++++-
 include/drm/drm_crtc.h      |    7 +-
 include/drm/drm_edid.h      |    8 +
 4 files changed, 249 insertions(+), 128 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 6ce18a2..4270ba6 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -123,18 +123,20 @@ static const u8 edid_header[] = {
  */
 static bool edid_is_valid(struct edid *edid)
 {
-	int i;
+	int i, score = 0;
 	u8 csum = 0;
 	u8 *raw_edid = (u8 *)edid;
 
-	if (memcmp(edid->header, edid_header, sizeof(edid_header)))
-		goto bad;
-	if (edid->version != 1) {
-		DRM_ERROR("EDID has major version %d, instead of 1\n", edid->version);
+	for (i = 0; i < sizeof(edid_header); i++)
+		if (raw_edid[i] == edid_header[i])
+			score++;
+
+	if (score == 8) ;
+	else if (score >= 6) {
+		DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");
+		memcpy(raw_edid, edid_header, sizeof(edid_header));
+	} else
 		goto bad;
-	}
-	if (edid->revision > 4)
-		DRM_DEBUG("EDID minor > 4, assuming backward compatibility\n");
 
 	for (i = 0; i < EDID_LENGTH; i++)
 		csum += raw_edid[i];
@@ -143,6 +145,14 @@ static bool edid_is_valid(struct edid *edid)
 		goto bad;
 	}
 
+	if (edid->version != 1) {
+		DRM_ERROR("EDID has major version %d, instead of 1\n", edid->version);
+		goto bad;
+	}
+
+	if (edid->revision > 4)
+		DRM_DEBUG("EDID minor > 4, assuming backward compatibility\n");
+
 	return 1;
 
 bad:
@@ -481,16 +491,17 @@ static struct drm_display_mode drm_dmt_modes[] = {
 		   3048, 3536, 0, 1600, 1603, 1609, 1682, 0,
 		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) },
 };
+static const int drm_num_dmt_modes =
+	sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode);
 
 static struct drm_display_mode *drm_find_dmt(struct drm_device *dev,
 			int hsize, int vsize, int fresh)
 {
-	int i, count;
+	int i;
 	struct drm_display_mode *ptr, *mode;
 
-	count = sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode);
 	mode = NULL;
-	for (i = 0; i < count; i++) {
+	for (i = 0; i < drm_num_dmt_modes; i++) {
 		ptr = &drm_dmt_modes[i];
 		if (hsize == ptr->hdisplay &&
 			vsize == ptr->vdisplay &&
@@ -659,6 +670,12 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 	if (mode->vsync_end > mode->vtotal)
 		mode->vtotal = mode->vsync_end + 1;
 
+	/* Some EDIDs have bogus h/vtotal values */
+	if (mode->hsync_end > mode->htotal)
+		mode->htotal = mode->hsync_end + 1;
+	if (mode->vsync_end > mode->vtotal)
+		mode->vtotal = mode->vsync_end + 1;
+
 	drm_mode_set_name(mode);
 
 	if (pt->misc & DRM_EDID_PT_INTERLACED)
@@ -825,8 +842,165 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
 	return modes;
 }
 
+/*
+ * XXX fix this for:
+ * - GTF secondary curve formula
+ * - EDID 1.4 range offsets
+ * - CVT extended bits
+ */
+static bool
+mode_in_range(struct drm_display_mode *mode, struct detailed_timing *timing)
+{
+	struct detailed_data_monitor_range *range;
+	int hsync, vrefresh;
+
+	range = &timing->data.other_data.data.range;
+
+	hsync = drm_mode_hsync(mode);
+	vrefresh = drm_mode_vrefresh(mode);
+
+	if (hsync < range->min_hfreq_khz || hsync > range->max_hfreq_khz)
+		return false;
+
+	if (vrefresh < range->min_vfreq || vrefresh > range->max_vfreq)
+		return false;
+
+	if (range->pixel_clock_mhz && range->pixel_clock_mhz != 0xff) {
+		/* be forgiving since it's in units of 10MHz */
+		int max_clock = range->pixel_clock_mhz * 10 + 9;
+		max_clock *= 1000;
+		if (mode->clock > max_clock)
+			return false;
+	}
+
+	return true;
+}
+
+/*
+ * XXX If drm_dmt_modes ever regrows the CVT-R modes (and it will) this will
+ * need to account for them.
+ */
+static int drm_gtf_modes_for_range(struct drm_connector *connector,
+				   struct detailed_timing *timing)
+{
+	int i, modes = 0;
+	struct drm_display_mode *newmode;
+	struct drm_device *dev = connector->dev;
+
+	for (i = 0; i < drm_num_dmt_modes; i++) {
+		if (mode_in_range(drm_dmt_modes + i, timing)) {
+			newmode = drm_mode_duplicate(dev, &drm_dmt_modes[i]);
+			if (newmode) {
+				drm_mode_probed_add(connector, newmode);
+				modes++;
+			}
+		}
+	}
+
+	return modes;
+}
+
+static int drm_cvt_modes(struct drm_connector *connector,
+			 struct detailed_timing *timing)
+{
+	int i, j, modes = 0;
+	struct drm_display_mode *newmode;
+	struct drm_device *dev = connector->dev;
+	struct cvt_timing *cvt;
+	const int rates[] = { 60, 85, 75, 60, 50 };
+
+	for (i = 0; i < 4; i++) {
+		int width, height;
+		cvt = &(timing->data.other_data.data.cvt[i]);
+
+		height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 8) + 1) * 2;
+		switch (cvt->code[1] & 0xc0) {
+		case 0x00:
+			width = height * 4 / 3;
+			break;
+		case 0x40:
+			width = height * 16 / 9;
+			break;
+		case 0x80:
+			width = height * 16 / 10;
+			break;
+		case 0xc0:
+			width = height * 15 / 9;
+			break;
+		}
+
+		for (j = 1; j < 5; j++) {
+			if (cvt->code[2] & (1 << j)) {
+				newmode = drm_cvt_mode(dev, width, height,
+						       rates[j], j == 0,
+						       false, false);
+				if (newmode) {
+					drm_mode_probed_add(connector, newmode);
+					modes++;
+				}
+			}
+		}
+	}
+
+	return modes;
+}
+
+static int add_detailed_modes(struct drm_connector *connector,
+			      struct detailed_timing *timing,
+			      struct edid *edid, u32 quirks, int preferred)
+{
+	int i, modes = 0;
+	struct detailed_non_pixel *data = &timing->data.other_data;
+	int timing_level = standard_timing_level(edid);
+	int gtf = (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF);
+	struct drm_display_mode *newmode;
+	struct drm_device *dev = connector->dev;
+
+	if (timing->pixel_clock) {
+		newmode = drm_mode_detailed(dev, edid, timing, quirks);
+		if (!newmode)
+			return 0;
+
+		if (preferred)
+			newmode->type |= DRM_MODE_TYPE_PREFERRED;
+
+		drm_mode_probed_add(connector, newmode);
+		return 1;
+	}
+
+	/* other timing types */
+	switch (data->type) {
+	case EDID_DETAIL_MONITOR_RANGE:
+		if (gtf)
+			modes += drm_gtf_modes_for_range(connector, timing);
+		break;
+	case EDID_DETAIL_STD_MODES:
+		/* Six modes per detailed section */
+		for (i = 0; i < 6; i++) {
+			struct std_timing *std;
+			struct drm_display_mode *newmode;
+
+			std = &data->data.timings[i];
+			newmode = drm_mode_std(dev, std, edid->revision,
+					       timing_level);
+			if (newmode) {
+				drm_mode_probed_add(connector, newmode);
+				modes++;
+			}
+		}
+		break;
+	case EDID_DETAIL_CVT_3BYTE:
+		modes += drm_cvt_modes(connector, timing);
+		break;
+	default:
+		break;
+	}
+
+	return modes;
+}
+
 /**
- * add_detailed_modes - get detailed mode info from EDID data
+ * add_detailed_info - get detailed mode info from EDID data
  * @connector: attached connector
  * @edid: EDID block to scan
  * @quirks: quirks to apply
@@ -837,67 +1011,24 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
 static int add_detailed_info(struct drm_connector *connector,
 			     struct edid *edid, u32 quirks)
 {
-	struct drm_device *dev = connector->dev;
-	int i, j, modes = 0;
-	int timing_level;
-
-	timing_level = standard_timing_level(edid);
+	int i, modes = 0;
 
 	for (i = 0; i < EDID_DETAILED_TIMINGS; i++) {
 		struct detailed_timing *timing = &edid->detailed_timings[i];
-		struct detailed_non_pixel *data = &timing->data.other_data;
-		struct drm_display_mode *newmode;
+		int preferred = (i == 0) && (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING);
 
-		/* X server check is version 1.1 or higher */
-		if (edid->version == 1 && edid->revision >= 1 &&
-		    !timing->pixel_clock) {
-			/* Other timing or info */
-			switch (data->type) {
-			case EDID_DETAIL_MONITOR_SERIAL:
-				break;
-			case EDID_DETAIL_MONITOR_STRING:
-				break;
-			case EDID_DETAIL_MONITOR_RANGE:
-				/* Get monitor range data */
-				break;
-			case EDID_DETAIL_MONITOR_NAME:
-				break;
-			case EDID_DETAIL_MONITOR_CPDATA:
-				break;
-			case EDID_DETAIL_STD_MODES:
-				for (j = 0; j < 6; i++) {
-					struct std_timing *std;
-					struct drm_display_mode *newmode;
-
-					std = &data->data.timings[j];
-					newmode = drm_mode_std(dev, std,
-							       edid->revision,
-							       timing_level);
-					if (newmode) {
-						drm_mode_probed_add(connector, newmode);
-						modes++;
-					}
-				}
-				break;
-			default:
-				break;
-			}
-		} else {
-			newmode = drm_mode_detailed(dev, edid, timing, quirks);
-			if (!newmode)
-				continue;
-
-			/* First detailed mode is preferred */
-			if (i == 0 && (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING))
-				newmode->type |= DRM_MODE_TYPE_PREFERRED;
-			drm_mode_probed_add(connector, newmode);
+		/* In 1.0, only timings are allowed */
+		if (!timing->pixel_clock && edid->version == 1 &&
+			edid->revision == 0)
+			continue;
 
-			modes++;
-		}
+		modes += add_detailed_modes(connector, timing, edid, quirks,
+					    preferred);
 	}
 
 	return modes;
 }
+
 /**
  * add_detailed_mode_eedid - get detailed mode info from addtional timing
  * 			EDID block
@@ -911,12 +1042,9 @@ static int add_detailed_info(struct drm_connector *connector,
 static int add_detailed_info_eedid(struct drm_connector *connector,
 			     struct edid *edid, u32 quirks)
 {
-	struct drm_device *dev = connector->dev;
-	int i, j, modes = 0;
+	int i, modes = 0;
 	char *edid_ext = NULL;
 	struct detailed_timing *timing;
-	struct detailed_non_pixel *data;
-	struct drm_display_mode *newmode;
 	int edid_ext_num;
 	int start_offset, end_offset;
 	int timing_level;
@@ -967,51 +1095,7 @@ static int add_detailed_info_eedid(struct drm_connector *connector,
 	for (i = start_offset; i < end_offset;
 			i += sizeof(struct detailed_timing)) {
 		timing = (struct detailed_timing *)(edid_ext + i);
-		data = &timing->data.other_data;
-		/* Detailed mode timing */
-		if (timing->pixel_clock) {
-			newmode = drm_mode_detailed(dev, edid, timing, quirks);
-			if (!newmode)
-				continue;
-
-			drm_mode_probed_add(connector, newmode);
-
-			modes++;
-			continue;
-		}
-
-		/* Other timing or info */
-		switch (data->type) {
-		case EDID_DETAIL_MONITOR_SERIAL:
-			break;
-		case EDID_DETAIL_MONITOR_STRING:
-			break;
-		case EDID_DETAIL_MONITOR_RANGE:
-			/* Get monitor range data */
-			break;
-		case EDID_DETAIL_MONITOR_NAME:
-			break;
-		case EDID_DETAIL_MONITOR_CPDATA:
-			break;
-		case EDID_DETAIL_STD_MODES:
-			/* Five modes per detailed section */
-			for (j = 0; j < 5; i++) {
-				struct std_timing *std;
-				struct drm_display_mode *newmode;
-
-				std = &data->data.timings[j];
-				newmode = drm_mode_std(dev, std,
-						       edid->revision,
-						       timing_level);
-				if (newmode) {
-					drm_mode_probed_add(connector, newmode);
-					modes++;
-				}
-			}
-			break;
-		default:
-			break;
-		}
+		modes += add_detailed_modes(connector, timing, edid, quirks, 0);
 	}
 
 	return modes;
@@ -1057,19 +1141,19 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
 			     struct i2c_adapter *adapter,
 			     char *buf, int len)
 {
-	int ret;
+	int i;
 
-	ret = drm_do_probe_ddc_edid(adapter, buf, len);
-	if (ret != 0) {
-		goto end;
-	}
-	if (!edid_is_valid((struct edid *)buf)) {
-		dev_warn(&connector->dev->pdev->dev, "%s: EDID invalid.\n",
-			 drm_get_connector_name(connector));
-		ret = -1;
+	for (i = 0; i < 4; i++) {
+		if (drm_do_probe_ddc_edid(adapter, buf, len))
+			return -1;
+		if (edid_is_valid((struct edid *)buf))
+			return 0;
 	}
-end:
-	return ret;
+
+	/* repeated checksum failures; warn, but carry on */
+	dev_warn(&connector->dev->pdev->dev, "%s: EDID invalid.\n",
+		 drm_get_connector_name(connector));
+	return -1;
 }
 
 /**
@@ -1287,6 +1371,8 @@ int drm_add_modes_noedid(struct drm_connector *connector,
 					ptr->vdisplay > vdisplay)
 				continue;
 		}
+		if (drm_mode_vrefresh(ptr) > 61)
+			continue;
 		mode = drm_mode_duplicate(dev, ptr);
 		if (mode) {
 			drm_mode_probed_add(connector, mode);
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 51f6772..6d81a02 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -553,6 +553,32 @@ int drm_mode_height(struct drm_display_mode *mode)
 }
 EXPORT_SYMBOL(drm_mode_height);
 
+/** drm_mode_hsync - get the hsync of a mode
+ * @mode: mode
+ *
+ * LOCKING:
+ * None.
+ *
+ * Return @modes's hsync rate in kHz, rounded to the nearest int.
+ */
+int drm_mode_hsync(struct drm_display_mode *mode)
+{
+	unsigned int calc_val;
+
+	if (mode->hsync)
+		return mode->hsync;
+
+	if (mode->htotal < 0)
+		return 0;
+
+	calc_val = (mode->clock * 1000) / mode->htotal; /* hsync in Hz */
+	calc_val += 500;				/* round to 1000Hz */
+	calc_val /= 1000;				/* truncate to kHz */
+
+	return calc_val;
+}
+EXPORT_SYMBOL(drm_mode_hsync);
+
 /**
  * drm_mode_vrefresh - get the vrefresh of a mode
  * @mode: mode
@@ -560,7 +586,7 @@ EXPORT_SYMBOL(drm_mode_height);
  * LOCKING:
  * None.
  *
- * Return @mode's vrefresh rate or calculate it if necessary.
+ * Return @mode's vrefresh rate in Hz or calculate it if necessary.
  *
  * FIXME: why is this needed?  shouldn't vrefresh be set already?
  *
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index b69347b..3a43ab8 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -123,7 +123,7 @@ struct drm_display_mode {
 	int type;
 
 	/* Proposed mode values */
-	int clock;
+	int clock;		/* in kHz */
 	int hdisplay;
 	int hsync_start;
 	int hsync_end;
@@ -164,8 +164,8 @@ struct drm_display_mode {
 	int *private;
 	int private_flags;
 
-	int vrefresh;
-	float hsync;
+	int vrefresh;		/* in Hz */
+	int hsync;		/* in kHz */
 };
 
 enum drm_connector_status {
@@ -667,6 +667,7 @@ extern void drm_mode_validate_size(struct drm_device *dev,
 extern void drm_mode_prune_invalid(struct drm_device *dev,
 				   struct list_head *mode_list, bool verbose);
 extern void drm_mode_sort(struct list_head *mode_list);
+extern int drm_mode_hsync(struct drm_display_mode *mode);
 extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 7d6c9a2..d33c3e0 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -106,6 +106,10 @@ struct detailed_data_color_point {
 	u8 wpindex2[3];
 } __attribute__((packed));
 
+struct cvt_timing {
+	u8 code[3];
+} __attribute__((packed));
+
 struct detailed_non_pixel {
 	u8 pad1;
 	u8 type; /* ff=serial, fe=string, fd=monitor range, fc=monitor name
@@ -117,9 +121,13 @@ struct detailed_non_pixel {
 		struct detailed_data_monitor_range range;
 		struct detailed_data_wpindex color;
 		struct std_timing timings[5];
+		struct cvt_timing cvt[4];
 	} data;
 } __attribute__((packed));
 
+#define EDID_DETAIL_EST_TIMINGS 0xf7
+#define EDID_DETAIL_CVT_3BYTE 0xf8
+#define EDID_DETAIL_COLOR_MGMT_DATA 0xf9
 #define EDID_DETAIL_STD_MODES 0xfa
 #define EDID_DETAIL_MONITOR_CPDATA 0xfb
 #define EDID_DETAIL_MONITOR_NAME 0xfc
-- 
1.6.5.2



--- NEW FILE patch-2.6.31.9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBLLA7XyGugalF9Dw4RAsWbAKCIXZ1bJteyy0TSZAW1tG5ZcQz9xgCZAXRu
AvTHZFwVuh79gXhjYhsTB08=
=Yo18
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.35
retrieving revision 1.1014.2.36
diff -u -p -r1.1014.2.35 -r1.1014.2.36
--- .cvsignore	12 Nov 2009 23:01:03 -0000	1.1014.2.35
+++ .cvsignore	23 Dec 2009 21:12:33 -0000	1.1014.2.36
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.6.bz2
+patch-2.6.31.9.bz2

drm-next-b390f944.patch:
 b/drivers/gpu/drm/Kconfig                         |   18 
 b/drivers/gpu/drm/Makefile                        |    8 
 b/drivers/gpu/drm/drm_bufs.c                      |    4 
 b/drivers/gpu/drm/drm_cache.c                     |   46 
 b/drivers/gpu/drm/drm_crtc.c                      |   78 
 b/drivers/gpu/drm/drm_crtc_helper.c               |  308 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  542 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 | 1030 
 b/drivers/gpu/drm/drm_gem.c                       |   13 
 b/drivers/gpu/drm/drm_mm.c                        |   30 
 b/drivers/gpu/drm/drm_modes.c                     |  434 
 b/drivers/gpu/drm/drm_proc.c                      |   17 
 b/drivers/gpu/drm/drm_sysfs.c                     |   28 
 b/drivers/gpu/drm/i915/Makefile                   |    2 
 b/drivers/gpu/drm/i915/i915_debugfs.c             |  445 
 b/drivers/gpu/drm/i915/i915_dma.c                 |  100 
 b/drivers/gpu/drm/i915/i915_drv.c                 |    9 
 b/drivers/gpu/drm/i915/i915_drv.h                 |   62 
 b/drivers/gpu/drm/i915/i915_gem.c                 |   14 
 b/drivers/gpu/drm/i915/i915_gem_tiling.c          |   65 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  139 
 b/drivers/gpu/drm/i915/i915_suspend.c             |    4 
 b/drivers/gpu/drm/i915/intel_bios.c               |    8 
 b/drivers/gpu/drm/i915/intel_crt.c                |   28 
 b/drivers/gpu/drm/i915/intel_display.c            |  608 
 b/drivers/gpu/drm/i915/intel_drv.h                |    9 
 b/drivers/gpu/drm/i915/intel_fb.c                 |  748 
 b/drivers/gpu/drm/i915/intel_i2c.c                |    8 
 b/drivers/gpu/drm/i915/intel_lvds.c               |   22 
 b/drivers/gpu/drm/i915/intel_sdvo.c               |  239 
 b/drivers/gpu/drm/i915/intel_tv.c                 |   30 
 b/drivers/gpu/drm/mga/mga_dma.c                   |    4 
 b/drivers/gpu/drm/mga/mga_drv.h                   |    1 
 b/drivers/gpu/drm/mga/mga_warp.c                  |  180 
 b/drivers/gpu/drm/r128/r128_cce.c                 |  116 
 b/drivers/gpu/drm/r128/r128_drv.h                 |    8 
 b/drivers/gpu/drm/r128/r128_state.c               |   36 
 b/drivers/gpu/drm/radeon/.gitignore               |    3 
 b/drivers/gpu/drm/radeon/Kconfig                  |    1 
 b/drivers/gpu/drm/radeon/Makefile                 |   43 
 b/drivers/gpu/drm/radeon/atom.c                   |    1 
 b/drivers/gpu/drm/radeon/atombios.h               |   13 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  366 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1768 +
 b/drivers/gpu/drm/radeon/r100_track.h             |  183 
 b/drivers/gpu/drm/radeon/r100d.h                  |  714 
 b/drivers/gpu/drm/radeon/r200.c                   |  454 
 b/drivers/gpu/drm/radeon/r300.c                   |  985 
 b/drivers/gpu/drm/radeon/r300d.h                  |  306 
 b/drivers/gpu/drm/radeon/r420.c                   |  305 
 b/drivers/gpu/drm/radeon/r420d.h                  |  249 
 b/drivers/gpu/drm/radeon/r500_reg.h               |   12 
 b/drivers/gpu/drm/radeon/r520.c                   |  286 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1847 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  858 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  805 
 b/drivers/gpu/drm/radeon/r600_blit_shaders.c      | 1072 +
 b/drivers/gpu/drm/radeon/r600_blit_shaders.h      |   14 
 b/drivers/gpu/drm/radeon/r600_cp.c                |  541 
 b/drivers/gpu/drm/radeon/r600_cs.c                |  783 
 b/drivers/gpu/drm/radeon/r600d.h                  |  667 
 b/drivers/gpu/drm/radeon/radeon.h                 |  454 
 b/drivers/gpu/drm/radeon/radeon_agp.c             |   12 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  386 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  434 
 b/drivers/gpu/drm/radeon/radeon_benchmark.c       |    4 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   46 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   28 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |  717 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  751 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  104 
 b/drivers/gpu/drm/radeon/radeon_cursor.c          |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  352 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  193 
 b/drivers/gpu/drm/radeon/radeon_drv.c             |   28 
 b/drivers/gpu/drm/radeon/radeon_drv.h             |  216 
 b/drivers/gpu/drm/radeon/radeon_encoders.c        |  309 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  700 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |   29 
 b/drivers/gpu/drm/radeon/radeon_gem.c             |   10 
 b/drivers/gpu/drm/radeon/radeon_i2c.c             |  109 
 b/drivers/gpu/drm/radeon/radeon_ioc32.c           |   15 
 b/drivers/gpu/drm/radeon/radeon_irq.c             |   18 
 b/drivers/gpu/drm/radeon/radeon_irq_kms.c         |   16 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |  152 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  505 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |  170 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   28 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_pm.c              |   65 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |  126 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_test.c            |    6 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |  101 
 b/drivers/gpu/drm/radeon/reg_srcs/r100            |  105 
 b/drivers/gpu/drm/radeon/reg_srcs/r200            |  184 
 b/drivers/gpu/drm/radeon/reg_srcs/r300            |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rn50            |   30 
 b/drivers/gpu/drm/radeon/reg_srcs/rs600           |  729 
 b/drivers/gpu/drm/radeon/reg_srcs/rv515           |  486 
 b/drivers/gpu/drm/radeon/rs100d.h                 |   40 
 b/drivers/gpu/drm/radeon/rs400.c                  |  331 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  610 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  359 
 b/drivers/gpu/drm/radeon/rs690d.h                 |  307 
 b/drivers/gpu/drm/radeon/rv200d.h                 |   36 
 b/drivers/gpu/drm/radeon/rv250d.h                 |  123 
 b/drivers/gpu/drm/radeon/rv350d.h                 |   52 
 b/drivers/gpu/drm/radeon/rv515.c                  |  882 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1063 -
 b/drivers/gpu/drm/radeon/rv770d.h                 |  346 
 b/drivers/gpu/drm/ttm/ttm_bo.c                    |  295 
 b/drivers/gpu/drm/ttm/ttm_bo_util.c               |    4 
 b/drivers/gpu/drm/ttm/ttm_global.c                |    6 
 b/drivers/gpu/drm/ttm/ttm_memory.c                |  508 
 b/drivers/gpu/drm/ttm/ttm_module.c                |   58 
 b/drivers/gpu/drm/ttm/ttm_tt.c                    |  105 
 b/drivers/video/fbmem.c                           |    2 
 b/firmware/Makefile                               |   16 
 b/firmware/WHENCE                                 |  121 
 b/firmware/matrox/g200_warp.H16                   |   28 
 b/firmware/matrox/g400_warp.H16                   |   44 
 b/firmware/r128/r128_cce.bin.ihex                 |  129 
 b/firmware/radeon/R100_cp.bin.ihex                |  130 
 b/firmware/radeon/R200_cp.bin.ihex                |  130 
 b/firmware/radeon/R300_cp.bin.ihex                |  130 
 b/firmware/radeon/R420_cp.bin.ihex                |  130 
 b/firmware/radeon/R520_cp.bin.ihex                |  130 
 b/firmware/radeon/R600_me.bin.ihex                | 1345 +
 b/firmware/radeon/R600_pfp.bin.ihex               |  145 
 b/firmware/radeon/RS600_cp.bin.ihex               |  130 
 b/firmware/radeon/RS690_cp.bin.ihex               |  130 
 b/firmware/radeon/RS780_me.bin.ihex               | 1345 +
 b/firmware/radeon/RS780_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV610_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV610_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV620_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV620_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV630_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV630_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV635_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV635_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV670_me.bin.ihex               | 1345 +
 b/firmware/radeon/RV670_pfp.bin.ihex              |  145 
 b/firmware/radeon/RV710_me.bin.ihex               |  341 
 b/firmware/radeon/RV710_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV730_me.bin.ihex               |  341 
 b/firmware/radeon/RV730_pfp.bin.ihex              |  213 
 b/firmware/radeon/RV770_me.bin.ihex               |  341 
 b/firmware/radeon/RV770_pfp.bin.ihex              |  213 
 b/include/drm/drmP.h                              |   54 
 b/include/drm/drm_cache.h                         |   38 
 b/include/drm/drm_crtc.h                          |   28 
 b/include/drm/drm_crtc_helper.h                   |   10 
 b/include/drm/drm_encoder_slave.h                 |  162 
 b/include/drm/drm_fb_helper.h                     |  111 
 b/include/drm/drm_mm.h                            |    7 
 b/include/drm/drm_mode.h                          |   11 
 b/include/drm/drm_pciids.h                        |    4 
 b/include/drm/drm_sysfs.h                         |   12 
 b/include/drm/radeon_drm.h                        |   12 
 b/include/drm/ttm/ttm_bo_api.h                    |   13 
 b/include/drm/ttm/ttm_bo_driver.h                 |   94 
 b/include/drm/ttm/ttm_memory.h                    |   43 
 b/include/drm/ttm/ttm_module.h                    |    2 
 drivers/gpu/drm/i915/i915_gem_debugfs.c           |  396 
 drivers/gpu/drm/mga/mga_ucode.h                   |11645 ----------
 drivers/gpu/drm/radeon/r300.h                     |   36 
 drivers/gpu/drm/radeon/r600_microcode.h           |23297 ----------------------
 drivers/gpu/drm/radeon/radeon_microcode.h         | 1844 -
 drivers/gpu/drm/radeon/radeon_share.h             |   39 
 drivers/gpu/drm/radeon/rs690r.h                   |   99 
 drivers/gpu/drm/radeon/rs780.c                    |  102 
 drivers/gpu/drm/radeon/rv515r.h                   |  170 
 189 files changed, 42492 insertions(+), 44061 deletions(-)

Index: drm-next-b390f944.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/drm-next-b390f944.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- drm-next-b390f944.patch	9 Dec 2009 21:44:00 -0000	1.1.2.1
+++ drm-next-b390f944.patch	23 Dec 2009 21:12:33 -0000	1.1.2.2
@@ -1,5 +1,5 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..e4d971c 100644
+index 012cf1f..bdcfedc 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
 @@ -18,6 +18,14 @@ menuconfig DRM
@@ -37,10 +37,10 @@ index 39b393d..e4d971c 100644
  	help
  	  Choose this option if you have an ATI Radeon graphics card.  There
  	  are both PCI and AGP versions.  You don't need to choose this to
-@@ -82,11 +92,10 @@ config DRM_I830
- config DRM_I915
+@@ -83,11 +93,10 @@ config DRM_I915
  	tristate "i915 driver"
  	depends on AGP_INTEL
+ 	select SHMEM
 +	select DRM_KMS_HELPER
  	select FB_CFB_FILLRECT
  	select FB_CFB_COPYAREA
@@ -50,7 +50,7 @@ index 39b393d..e4d971c 100644
  	# i915 depends on ACPI_VIDEO when ACPI is enabled
  	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
  	select VIDEO_OUTPUT_CONTROL if ACPI
-@@ -116,6 +125,7 @@ endchoice
+@@ -117,6 +126,7 @@ endchoice
  config DRM_MGA
  	tristate "Matrox g200/g400"
  	depends on DRM
@@ -986,7 +986,7 @@ index b39d7bf..a75ca63 100644
  	DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
  	DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_rmmap_ioctl, DRM_AUTH),
 diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
-index 7f2728b..b54ba63 100644
+index 55fb98d..6ce18a2 100644
 --- a/drivers/gpu/drm/drm_edid.c
 +++ b/drivers/gpu/drm/drm_edid.c
 @@ -60,6 +60,12 @@
@@ -1383,29 +1383,7 @@ index 7f2728b..b54ba63 100644
  	mode = drm_mode_create(dev);
  	if (!mode)
  		return NULL;
-@@ -333,6 +653,21 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
- 	mode->vsync_end = mode->vsync_start + vsync_pulse_width;
- 	mode->vtotal = mode->vdisplay + vblank;
- 
-+	/* perform the basic check for the detailed timing */
-+	if (mode->hsync_end > mode->htotal ||
-+		mode->vsync_end > mode->vtotal) {
-+		drm_mode_destroy(dev, mode);
-+		DRM_DEBUG_KMS("Incorrect detailed timing. "
-+				"Sync is beyond the blank.\n");
-+		return NULL;
-+	}
-+
-+	/* Some EDIDs have bogus h/vtotal values */
-+	if (mode->hsync_end > mode->htotal)
-+		mode->htotal = mode->hsync_end + 1;
-+	if (mode->vsync_end > mode->vtotal)
-+		mode->vtotal = mode->vsync_end + 1;
-+
- 	drm_mode_set_name(mode);
- 
- 	if (pt->misc & DRM_EDID_PT_INTERLACED)
-@@ -451,6 +786,19 @@ static int add_established_modes(struct drm_connector *connector, struct edid *e
+@@ -457,6 +777,19 @@ static int add_established_modes(struct drm_connector *connector, struct edid *e
  
  	return modes;
  }
@@ -1425,7 +1403,7 @@ index 7f2728b..b54ba63 100644
  
  /**
   * add_standard_modes - get std. modes from EDID and add them
-@@ -463,6 +811,9 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
+@@ -469,6 +802,9 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
  {
  	struct drm_device *dev = connector->dev;
  	int i, modes = 0;
@@ -1435,7 +1413,7 @@ index 7f2728b..b54ba63 100644
  
  	for (i = 0; i < EDID_STD_TIMINGS; i++) {
  		struct std_timing *t = &edid->standard_timings[i];
-@@ -472,7 +823,8 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
+@@ -478,7 +814,8 @@ static int add_standard_modes(struct drm_connector *connector, struct edid *edid
  		if (t->hsize == 1 && t->vfreq_aspect == 1)
  			continue;
  
@@ -1445,7 +1423,7 @@ index 7f2728b..b54ba63 100644
  		if (newmode) {
  			drm_mode_probed_add(connector, newmode);
  			modes++;
-@@ -496,6 +848,9 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -502,6 +839,9 @@ static int add_detailed_info(struct drm_connector *connector,
  {
  	struct drm_device *dev = connector->dev;
  	int i, j, modes = 0;
@@ -1455,7 +1433,7 @@ index 7f2728b..b54ba63 100644
  
  	for (i = 0; i < EDID_DETAILED_TIMINGS; i++) {
  		struct detailed_timing *timing = &edid->detailed_timings[i];
-@@ -519,13 +874,14 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -525,13 +865,14 @@ static int add_detailed_info(struct drm_connector *connector,
  			case EDID_DETAIL_MONITOR_CPDATA:
  				break;
  			case EDID_DETAIL_STD_MODES:
@@ -1473,7 +1451,7 @@ index 7f2728b..b54ba63 100644
  					if (newmode) {
  						drm_mode_probed_add(connector, newmode);
  						modes++;
-@@ -551,6 +907,124 @@ static int add_detailed_info(struct drm_connector *connector,
+@@ -557,6 +898,124 @@ static int add_detailed_info(struct drm_connector *connector,
  
  	return modes;
  }
@@ -1598,7 +1576,7 @@ index 7f2728b..b54ba63 100644
  
  #define DDC_ADDR 0x50
  /**
-@@ -584,7 +1058,6 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
+@@ -590,7 +1049,6 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
  	if (i2c_transfer(adapter, msgs, 2) == 2)
  		return 0;
  
@@ -1606,7 +1584,7 @@ index 7f2728b..b54ba63 100644
  	return -1;
  }
  EXPORT_SYMBOL(drm_do_probe_ddc_edid);
-@@ -597,8 +1070,6 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
+@@ -603,8 +1061,6 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
  
  	ret = drm_do_probe_ddc_edid(adapter, buf, len);
  	if (ret != 0) {
@@ -1615,7 +1593,7 @@ index 7f2728b..b54ba63 100644
  		goto end;
  	}
  	if (!edid_is_valid((struct edid *)buf)) {
-@@ -610,7 +1081,6 @@ end:
+@@ -616,7 +1072,6 @@ end:
  	return ret;
  }
  
@@ -1623,7 +1601,7 @@ index 7f2728b..b54ba63 100644
  /**
   * drm_get_edid - get EDID data, if available
   * @connector: connector we're probing
-@@ -763,6 +1233,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
+@@ -769,6 +1224,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
  	num_modes += add_established_modes(connector, edid);
  	num_modes += add_standard_modes(connector, edid);
  	num_modes += add_detailed_info(connector, edid, quirks);
@@ -1631,7 +1609,7 @@ index 7f2728b..b54ba63 100644
  
  	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
  		edid_fixup_preferred(connector, quirks);
-@@ -788,3 +1259,49 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
+@@ -794,3 +1250,49 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
  	return num_modes;
  }
  EXPORT_SYMBOL(drm_add_edid_modes);
@@ -4341,7 +4319,7 @@ index c078d99..e8cf18d 100644
  	.gem_init_object = i915_gem_init_object,
  	.gem_free_object = i915_gem_free_object,
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 5b4f87e..77ed060 100644
+index 88b3eff..e5f20e4 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -85,7 +85,6 @@ struct drm_i915_gem_phys_object {
@@ -4465,7 +4443,7 @@ index 5b4f87e..77ed060 100644
  extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  
  #define IS_I830(dev) ((dev)->pci_device == 0x3577)
-@@ -903,6 +912,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -905,6 +914,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  /* dsparb controlled by hw only */
  #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
  
@@ -5095,10 +5073,10 @@ index e774a4a..200e398 100644
  	}
  
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 7ebc84c..6c89f2f 100644
+index 9431a72..42c1709 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -565,6 +565,27 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -573,6 +573,27 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
  
  			I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
  			I915_READ(PORT_HOTPLUG_STAT);
@@ -5127,7 +5105,7 @@ index 7ebc84c..6c89f2f 100644
  
  		I915_WRITE(IIR, iir);
 diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index 106a1ae..268d272 100644
+index c017fa1..1cd645e 100644
 --- a/drivers/gpu/drm/i915/i915_reg.h
 +++ b/drivers/gpu/drm/i915/i915_reg.h
 @@ -55,7 +55,7 @@
@@ -5393,7 +5371,7 @@ index 5ae4c1a..212e227 100644
  
  static int intel_crt_mode_valid(struct drm_connector *connector,
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 8b5af29..a865af5 100644
+index 318ba47..4c28f17 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -38,6 +38,7 @@
@@ -5639,7 +5617,7 @@ index 8b5af29..a865af5 100644
  }
  
  static void intel_crtc_prepare (struct drm_crtc *crtc)
-@@ -2079,6 +2138,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
+@@ -2080,6 +2139,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
  	return size;
  }
  
@@ -5658,7 +5636,7 @@ index 8b5af29..a865af5 100644
  static void i965_update_wm(struct drm_device *dev)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -2130,7 +2201,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
+@@ -2131,7 +2202,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
  	cwm = 2;
  
  	/* Calc sr entries for one plane configs */
@@ -5668,7 +5646,7 @@ index 8b5af29..a865af5 100644
  		/* self-refresh has much higher latency */
  		const static int sr_latency_ns = 6000;
  
-@@ -2145,8 +2217,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
+@@ -2146,8 +2218,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
  		srwm = total_size - sr_entries;
  		if (srwm < 0)
  			srwm = 1;
@@ -5678,7 +5656,7 @@ index 8b5af29..a865af5 100644
  	}
  
  	DRM_DEBUG("Setting FIFO watermarks - A: %d, B: %d, C: %d, SR %d\n",
-@@ -2220,9 +2291,6 @@ static void intel_update_watermarks(struct drm_device *dev)
+@@ -2221,9 +2292,6 @@ static void intel_update_watermarks(struct drm_device *dev)
  	unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
  	int enabled = 0, pixel_size = 0;
  
@@ -5688,7 +5666,7 @@ index 8b5af29..a865af5 100644
  	/* Get the clock config from both planes */
  	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
  		intel_crtc = to_intel_crtc(crtc);
-@@ -2255,7 +2323,9 @@ static void intel_update_watermarks(struct drm_device *dev)
+@@ -2256,7 +2324,9 @@ static void intel_update_watermarks(struct drm_device *dev)
  	else if (IS_IGD(dev))
  		igd_disable_cxsr(dev);
  
@@ -5699,7 +5677,7 @@ index 8b5af29..a865af5 100644
  		i965_update_wm(dev);
  	else if (IS_I9XX(dev) || IS_MOBILE(dev))
  		i9xx_update_wm(dev, planea_clock, planeb_clock, sr_hdisplay,
-@@ -2289,9 +2359,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2290,9 +2360,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  	int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
  	int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
  	int refclk, num_outputs = 0;
@@ -5712,7 +5690,7 @@ index 8b5af29..a865af5 100644
  	bool is_crt = false, is_lvds = false, is_tv = false, is_dp = false;
  	bool is_edp = false;
  	struct drm_mode_config *mode_config = &dev->mode_config;
-@@ -2374,6 +2444,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2375,6 +2445,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  		return -EINVAL;
  	}
  
@@ -5727,8 +5705,8 @@ index 8b5af29..a865af5 100644
  	/* SDVO TV has fixed PLL values depend on its clock range,
  	   this mirrors vbios setting. */
  	if (is_sdvo && is_tv) {
-@@ -2419,10 +2497,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
- 				  link_bw, &m_n);
+@@ -2482,10 +2560,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+ 		}
  	}
  
 -	if (IS_IGD(dev))
@@ -5747,7 +5725,7 @@ index 8b5af29..a865af5 100644
  
  	if (!IS_IGDNG(dev))
  		dpll = DPLL_VGA_MODE_DIS;
-@@ -2451,6 +2536,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2514,6 +2599,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  			/* also FPA1 */
  			if (IS_IGDNG(dev))
  				dpll |= (1 << (clock.p1 - 1)) << DPLL_FPA1_P1_POST_DIV_SHIFT;
@@ -5756,7 +5734,7 @@ index 8b5af29..a865af5 100644
  		}
  		switch (clock.p2) {
  		case 5:
-@@ -2598,6 +2685,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2661,6 +2748,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  		udelay(150);
  	}
  
@@ -5779,7 +5757,7 @@ index 8b5af29..a865af5 100644
  	I915_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) |
  		   ((adjusted_mode->crtc_htotal - 1) << 16));
  	I915_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) |
-@@ -2800,10 +2903,16 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
+@@ -2863,10 +2966,16 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
  	struct drm_device *dev = crtc->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -5796,7 +5774,7 @@ index 8b5af29..a865af5 100644
  	if (x < 0) {
  		temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
  		x = -x;
-@@ -2834,6 +2943,16 @@ void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
+@@ -2897,6 +3006,16 @@ void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
  	intel_crtc->lut_b[regno] = blue >> 8;
  }
  
@@ -5813,7 +5791,7 @@ index 8b5af29..a865af5 100644
  static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
  				 u16 *blue, uint32_t size)
  {
-@@ -3101,12 +3220,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
+@@ -3164,12 +3283,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
  	return mode;
  }
  
@@ -6135,7 +6113,7 @@ index 8b5af29..a865af5 100644
  	drm_crtc_cleanup(crtc);
  	kfree(intel_crtc);
  }
-@@ -3118,6 +3544,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
+@@ -3181,6 +3607,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
  	.mode_set_base = intel_pipe_set_base,
  	.prepare = intel_crtc_prepare,
  	.commit = intel_crtc_commit,
@@ -6143,7 +6121,7 @@ index 8b5af29..a865af5 100644
  };
  
  static const struct drm_crtc_funcs intel_crtc_funcs = {
-@@ -3153,15 +3580,10 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+@@ -3216,15 +3643,10 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
  	intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
  	drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
  
@@ -6162,7 +6140,7 @@ index 8b5af29..a865af5 100644
  }
  
  int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
-@@ -3169,30 +3591,26 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
+@@ -3232,30 +3654,26 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data;
@@ -6201,7 +6179,7 @@ index 8b5af29..a865af5 100644
  }
  
  struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
-@@ -3393,8 +3811,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
+@@ -3456,8 +3874,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
  	.fb_changed = intelfb_probe,
  };
  
@@ -6258,7 +6236,7 @@ index 8b5af29..a865af5 100644
  	int num_pipe;
  	int i;
  
-@@ -3429,15 +3895,47 @@ void intel_modeset_init(struct drm_device *dev)
+@@ -3492,15 +3958,47 @@ void intel_modeset_init(struct drm_device *dev)
  	DRM_DEBUG("%d display pipe%s available.\n",
  		  num_pipe, num_pipe > 1 ? "s" : "");
  
@@ -6341,7 +6319,7 @@ index 26a6227..dcfc53c 100644
  extern int intel_framebuffer_create(struct drm_device *dev,
  				    struct drm_mode_fb_cmd *mode_cmd,
 diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
-index 1d30802..2b0fe54 100644
+index 75a9b83..2b0fe54 100644
 --- a/drivers/gpu/drm/i915/intel_fb.c
 +++ b/drivers/gpu/drm/i915/intel_fb.c
 @@ -39,339 +39,36 @@
@@ -6426,7 +6404,7 @@ index 1d30802..2b0fe54 100644
 -	struct drm_framebuffer *fb = &intel_fb->base;
 -	int depth;
 -
--	if (var->pixclock == -1 || !var->pixclock)
+-	if (var->pixclock != 0)
 -		return -EINVAL;
 -
 -	/* Need to resize the fb object !!! */
@@ -6517,7 +6495,7 @@ index 1d30802..2b0fe54 100644
 -
 -	DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
 -
--	if (var->pixclock != -1) {
+-	if (var->pixclock != 0) {
 -
 -		DRM_ERROR("PIXEL CLOCK SET\n");
 -		return -EINVAL;
@@ -6941,7 +6919,7 @@ index 1d30802..2b0fe54 100644
 -	par->crtc_count = 1;
 -
 -	if (new_fb) {
--		info->var.pixclock = -1;
+-		info->var.pixclock = 0;
 -		if (register_framebuffer(info) < 0)
 -			return -EINVAL;
 -	} else
@@ -7095,7 +7073,7 @@ index 1d30802..2b0fe54 100644
 -	par->crtc_count = crtc_count;
 -
 -	if (new_fb) {
--		info->var.pixclock = -1;
+-		info->var.pixclock = 0;
 -		if (register_framebuffer(info) < 0)
 -			return -EINVAL;
 -	} else
@@ -64808,7 +64786,7 @@ index 0000000..797972e
 +};
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
-index ec383ed..cb2f16a 100644
+index f1d6d3d..fc5101a 100644
 --- a/drivers/gpu/drm/radeon/radeon_fb.c
 +++ b/drivers/gpu/drm/radeon/radeon_fb.c
 @@ -28,15 +28,7 @@
@@ -64910,7 +64888,7 @@ index ec383ed..cb2f16a 100644
 -	struct drm_framebuffer *fb = &rfb->base;
 -	int depth;
 -
--	if (var->pixclock == -1 || !var->pixclock) {
+-	if (var->pixclock != 0) {
 -		return -EINVAL;
 -	}
 -	/* Need to resize the fb object !!! */
@@ -65024,7 +65002,7 @@ index ec383ed..cb2f16a 100644
 -	int ret;
 -	int i;
 -
--	if (var->pixclock != -1) {
+-	if (var->pixclock != 0) {
 -		DRM_ERROR("PIXEL CLCOK SET\n");
 -		return -EINVAL;
 -	}
@@ -65457,7 +65435,7 @@ index ec383ed..cb2f16a 100644
  	fb->fbdev = info;
  	rfbdev->rfb = rfb;
  	rfbdev->rdev = rdev;
-@@ -726,148 +303,33 @@ out:
+@@ -726,148 +303,34 @@ out:
  	return ret;
  }
  
@@ -65567,7 +65545,7 @@ index ec383ed..cb2f16a 100644
 -	rfbdev->crtc_count = crtc_count;
 -
 -	if (new_fb) {
--		info->var.pixclock = -1;
+-		info->var.pixclock = 0;
 -		if (register_framebuffer(info) < 0)
 -			return -EINVAL;
 -	} else {
@@ -65584,7 +65562,7 @@ index ec383ed..cb2f16a 100644
 -	panic_mode = *modeset;
 -	atomic_notifier_chain_register(&panic_notifier_list, &paniced);
 -	printk(KERN_INFO "registered panic notifier\n");
--
+ 
  	return 0;
  }
  
@@ -65622,7 +65600,7 @@ index ec383ed..cb2f16a 100644
  
  int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
  {
-@@ -880,16 +342,17 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
+@@ -880,16 +343,17 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
  	}
  	info = fb->fbdev;
  	if (info) {
@@ -95950,7 +95928,7 @@ index ae304cc..1f90841 100644
  struct drm_mode_get_connector {
  
 diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
-index 8535084..923361b 100644
+index 3f6e545..e6f3b12 100644
 --- a/include/drm/drm_pciids.h
 +++ b/include/drm/drm_pciids.h
 @@ -80,7 +80,7 @@

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   56 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  536 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  468 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  344 
 drivers/gpu/drm/nouveau/Makefile            |   30 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 6050 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  289 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  661 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  478 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  468 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  812 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   54 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  155 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  157 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1270 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  382 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   47 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  976 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1080 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  455 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  257 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  702 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  583 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  196 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  321 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  919 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1002 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  528 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  621 
 drivers/gpu/drm/nouveau/nv04_display.c      |  293 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  316 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  271 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  579 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  208 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  305 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  260 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  892 
 drivers/gpu/drm/nouveau/nv17_gpio.c         |   92 
 drivers/gpu/drm/nouveau/nv17_tv.c           |  681 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  780 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  314 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2915 +++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  769 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  156 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  304 
 drivers/gpu/drm/nouveau/nv50_display.c      | 1012 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  273 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  494 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  470 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |26832 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  509 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  269 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  220 
 85 files changed, 64781 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.25
retrieving revision 1.8.6.26
diff -u -p -r1.8.6.25 -r1.8.6.26
--- drm-nouveau.patch	9 Dec 2009 21:44:01 -0000	1.8.6.25
+++ drm-nouveau.patch	23 Dec 2009 21:12:34 -0000	1.8.6.26
@@ -84,10 +84,10 @@ index 0000000..6d2abaf
 +obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
 new file mode 100644
-index 0000000..9422a74
+index 0000000..81681a0
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_drv.c
-@@ -0,0 +1,531 @@
+@@ -0,0 +1,536 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -498,6 +498,11 @@ index 0000000..9422a74
 +
 +	ch7006_info(client, "Detected version ID: %x\n", val);
 +
++	/* I don't know what this is for, but otherwise I get no
++	 * signal.
++	 */
++	ch7006_write(client, 0x3d, 0x0);
++
 +	return 0;
 +
 +fail:
@@ -621,10 +626,10 @@ index 0000000..9422a74
 +module_exit(ch7006_exit);
 diff --git a/drivers/gpu/drm/i2c/ch7006_mode.c b/drivers/gpu/drm/i2c/ch7006_mode.c
 new file mode 100644
-index 0000000..87f5445
+index 0000000..e447dfb
 --- /dev/null
 +++ b/drivers/gpu/drm/i2c/ch7006_mode.c
-@@ -0,0 +1,473 @@
+@@ -0,0 +1,468 @@
 +/*
 + * Copyright (C) 2009 Francisco Jerez.
 + * All Rights Reserved.
@@ -1054,11 +1059,6 @@ index 0000000..87f5445
 +	ch7006_load_reg(client, state, CH7006_SUBC_INC7);
 +	ch7006_load_reg(client, state, CH7006_PLL_CONTROL);
 +	ch7006_load_reg(client, state, CH7006_CALC_SUBC_INC0);
-+
-+	/* I don't know what this is for, but otherwise I get no
-+	 * signal.
-+	 */
-+	ch7006_write(client, 0x3d, 0x0);
 +}
 +
 +void ch7006_state_save(struct i2c_client *client,
@@ -8129,10 +8129,10 @@ index 0000000..1d5f10b
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
 new file mode 100644
-index 0000000..8d1383a
+index 0000000..f067fc3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -0,0 +1,663 @@
+@@ -0,0 +1,661 @@
 +/*
 + * Copyright 2007 Dave Airlied
 + * All Rights Reserved.
@@ -8572,11 +8572,8 @@ index 0000000..8d1383a
 +	int ret;
 +
 +	chan = nvbo->channel;
-+	if (!chan || nvbo->tile_flags || nvbo->no_vm) {
++	if (!chan || nvbo->tile_flags || nvbo->no_vm)
 +		chan = dev_priv->channel;
-+		if (!chan)
-+			return -EINVAL;
-+	}
 +
 +	src_offset = old_mem->mm_node->start << PAGE_SHIFT;
 +	dst_offset = new_mem->mm_node->start << PAGE_SHIFT;
@@ -8733,7 +8730,8 @@ index 0000000..8d1383a
 +			return ret;
 +	}
 +
-+	if (dev_priv->init_state != NOUVEAU_CARD_INIT_DONE)
++	if (dev_priv->init_state != NOUVEAU_CARD_INIT_DONE ||
++	    !dev_priv->channel)
 +		return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
 +
 +	if (old_mem->mem_type == TTM_PL_SYSTEM && !bo->ttm) {
@@ -11392,7 +11390,7 @@ index 0000000..04e85d8
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
 new file mode 100644
-index 0000000..d8de3f6
+index 0000000..e0e8e84
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
 @@ -0,0 +1,413 @@
@@ -11675,7 +11673,7 @@ index 0000000..d8de3f6
 +
 +		for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
 +			chan = dev_priv->fifos[i];
-+			if (!chan)
++			if (!chan || !chan->pushbuf_bo)
 +				continue;
 +
 +			for (j = 0; j < NOUVEAU_DMA_SKIPS; j++)
@@ -13212,10 +13210,10 @@ index 0000000..4a3f31a
 +#endif /* __NOUVEAU_FB_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 new file mode 100644
-index 0000000..36e8c5e
+index 0000000..d860bdc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
-@@ -0,0 +1,380 @@
+@@ -0,0 +1,382 @@
 +/*
 + * Copyright ? 2007 David Airlie
 + *
@@ -13276,7 +13274,7 @@ index 0000000..36e8c5e
 +	struct nouveau_channel *chan = dev_priv->channel;
 +	int ret, i;
 +
-+	if (!chan->accel_done ||
++	if (!chan || !chan->accel_done ||
 +	    info->state != FBINFO_STATE_RUNNING ||
 +	    info->flags & FBINFO_HWACCEL_DISABLED)
 +		return 0;
@@ -13536,14 +13534,16 @@ index 0000000..36e8c5e
 +	par->nouveau_fb = nouveau_fb;
 +	par->dev = dev;
 +
-+	switch (dev_priv->card_type) {
-+	case NV_50:
-+		nv50_fbcon_accel_init(info);
-+		break;
-+	default:
-+		nv04_fbcon_accel_init(info);
-+		break;
-+	};
++	if (dev_priv->channel) {
++		switch (dev_priv->card_type) {
++		case NV_50:
++			nv50_fbcon_accel_init(info);
++			break;
++		default:
++			nv04_fbcon_accel_init(info);
++			break;
++		};
++	}
 +
 +	nouveau_fbcon_zfill(dev);
 +
@@ -20760,10 +20760,10 @@ index 0000000..4c7f1e4
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..0de87b8
+index 0000000..27c4d48
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,865 @@
+@@ -0,0 +1,919 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -20790,11 +20790,12 @@ index 0000000..0de87b8
 + */
 +
 +#include <linux/swab.h>
-+
 +#include "drmP.h"
 +#include "drm.h"
 +#include "drm_sarea.h"
 +#include "drm_crtc_helper.h"
++#include <linux/vgaarb.h>
++
 +#include "nouveau_drv.h"
 +#include "nouveau_drm.h"
 +#include "nv50_display.h"
@@ -21098,12 +21099,67 @@ index 0000000..0de87b8
 +	return 0;
 +}
 +
++static unsigned int
++nouveau_vga_set_decode(void *priv, bool state)
++{
++	if (state)
++		return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
++		       VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
++	else
++		return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
++}
++
++static int
++nouveau_card_init_channel(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nouveau_gpuobj *gpuobj;
++	int ret;
++
++	ret = nouveau_channel_alloc(dev, &dev_priv->channel,
++				    (struct drm_file *)-2,
++				    NvDmaFB, NvDmaTT);
++	if (ret)
++		return ret;
++
++	gpuobj = NULL;
++	ret = nouveau_gpuobj_dma_new(dev_priv->channel, NV_CLASS_DMA_IN_MEMORY,
++				     0, nouveau_mem_fb_amount(dev),
++				     NV_DMA_ACCESS_RW, NV_DMA_TARGET_VIDMEM,
++				     &gpuobj);
++	if (ret)
++		goto out_err;
++
++	ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, NvDmaVRAM,
++				     gpuobj, NULL);
++	if (ret)
++		goto out_err;
++
++	gpuobj = NULL;
++	ret = nouveau_gpuobj_gart_dma_new(dev_priv->channel, 0,
++					  dev_priv->gart_info.aper_size,
++					  NV_DMA_ACCESS_RW, &gpuobj, NULL);
++	if (ret)
++		goto out_err;
++
++	ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, NvDmaGART,
++				     gpuobj, NULL);
++	if (ret)
++		goto out_err;
++
++	return 0;
++out_err:
++	nouveau_gpuobj_del(dev, &gpuobj);
++	nouveau_channel_free(dev_priv->channel);
++	dev_priv->channel = NULL;
++	return ret;
++}
++
 +int
 +nouveau_card_init(struct drm_device *dev)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_engine *engine;
-+	struct nouveau_gpuobj *gpuobj;
 +	int ret;
 +
 +	NV_DEBUG(dev, "prev state = %d\n", dev_priv->init_state);
@@ -21111,10 +21167,12 @@ index 0000000..0de87b8
 +	if (dev_priv->init_state == NOUVEAU_CARD_INIT_DONE)
 +		return 0;
 +
++	vga_client_register(dev->pdev, dev, NULL, nouveau_vga_set_decode);
++
 +	/* Initialise internal driver API hooks */
 +	ret = nouveau_init_engine_ptrs(dev);
 +	if (ret)
-+		return ret;
++		goto out;
 +	engine = &dev_priv->engine;
 +	dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED;
 +
@@ -21122,12 +21180,12 @@ index 0000000..0de87b8
 +	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +		ret = nouveau_bios_init(dev);
 +		if (ret)
-+			return ret;
++			goto out;
 +	}
 +
 +	ret = nouveau_gpuobj_early_init(dev);
 +	if (ret)
-+		return ret;
++		goto out_bios;
 +
 +	/* Initialise instance memory, must happen before mem_init so we
 +	 * know exactly how much VRAM we're able to use for "normal"
@@ -21135,100 +21193,68 @@ index 0000000..0de87b8
 +	 */
 +	ret = engine->instmem.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_gpuobj_early;
 +
 +	/* Setup the memory manager */
 +	ret = nouveau_mem_init(dev);
 +	if (ret)
-+		return ret;
++		goto out_instmem;
 +
 +	ret = nouveau_gpuobj_init(dev);
 +	if (ret)
-+		return ret;
++		goto out_mem;
 +
 +	/* PMC */
 +	ret = engine->mc.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_gpuobj;
 +
 +	/* PTIMER */
 +	ret = engine->timer.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_mc;
 +
 +	/* PFB */
 +	ret = engine->fb.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_timer;
 +
 +	/* PGRAPH */
 +	ret = engine->graph.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_fb;
 +
 +	/* PFIFO */
 +	ret = engine->fifo.init(dev);
 +	if (ret)
-+		return ret;
++		goto out_graph;
 +
 +	/* this call irq_preinstall, register irq handler and
 +	 * call irq_postinstall
 +	 */
 +	ret = drm_irq_install(dev);
 +	if (ret)
-+		return ret;
++		goto out_fifo;
 +
 +	ret = drm_vblank_init(dev, 0);
 +	if (ret)
-+		return ret;
++		goto out_irq;
 +
 +	/* what about PVIDEO/PCRTC/PRAMDAC etc? */
 +
-+	ret = nouveau_channel_alloc(dev, &dev_priv->channel,
-+				    (struct drm_file *)-2,
-+				    NvDmaFB, NvDmaTT);
-+	if (ret)
-+		return ret;
-+
-+	gpuobj = NULL;
-+	ret = nouveau_gpuobj_dma_new(dev_priv->channel, NV_CLASS_DMA_IN_MEMORY,
-+				     0, nouveau_mem_fb_amount(dev),
-+				     NV_DMA_ACCESS_RW, NV_DMA_TARGET_VIDMEM,
-+				     &gpuobj);
-+	if (ret)
-+		return ret;
-+
-+	ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, NvDmaVRAM,
-+				     gpuobj, NULL);
-+	if (ret) {
-+		nouveau_gpuobj_del(dev, &gpuobj);
-+		return ret;
-+	}
-+
-+	gpuobj = NULL;
-+	ret = nouveau_gpuobj_gart_dma_new(dev_priv->channel, 0,
-+					  dev_priv->gart_info.aper_size,
-+					  NV_DMA_ACCESS_RW, &gpuobj, NULL);
-+	if (ret)
-+		return ret;
-+
-+	ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, NvDmaGART,
-+				     gpuobj, NULL);
-+	if (ret) {
-+		nouveau_gpuobj_del(dev, &gpuobj);
-+		return ret;
++	if (!engine->graph.accel_blocked) {
++		ret = nouveau_card_init_channel(dev);
++		if (ret)
++			goto out_irq;
 +	}
 +
 +	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-+		if (dev_priv->card_type >= NV_50) {
++		if (dev_priv->card_type >= NV_50)
 +			ret = nv50_display_create(dev);
-+			if (ret)
-+				return ret;
-+		} else {
++		else
 +			ret = nv04_display_create(dev);
-+			if (ret)
-+				return ret;
-+		}
++		if (ret)
++			goto out_irq;
 +	}
 +
 +	ret = nouveau_backlight_init(dev);
@@ -21241,6 +21267,32 @@ index 0000000..0de87b8
 +		drm_helper_initial_config(dev);
 +
 +	return 0;
++
++out_irq:
++	drm_irq_uninstall(dev);
++out_fifo:
++	engine->fifo.takedown(dev);
++out_graph:
++	engine->graph.takedown(dev);
++out_fb:
++	engine->fb.takedown(dev);
++out_timer:
++	engine->timer.takedown(dev);
++out_mc:
++	engine->mc.takedown(dev);
++out_gpuobj:
++	nouveau_gpuobj_takedown(dev);
++out_mem:
++	nouveau_mem_close(dev);
++out_instmem:
++	engine->instmem.takedown(dev);
++out_gpuobj_early:
++	nouveau_gpuobj_late_takedown(dev);
++out_bios:
++	nouveau_bios_takedown(dev);
++out:
++	vga_client_register(dev->pdev, NULL, NULL, NULL);
++	return ret;
 +}
 +
 +static void nouveau_card_takedown(struct drm_device *dev)
@@ -21279,6 +21331,8 @@ index 0000000..0de87b8
 +		nouveau_gpuobj_late_takedown(dev);
 +		nouveau_bios_takedown(dev);
 +
++		vga_client_register(dev->pdev, NULL, NULL, NULL);
++
 +		dev_priv->init_state = NOUVEAU_CARD_INIT_DOWN;
 +	}
 +}
@@ -24938,7 +24992,7 @@ index 0000000..0c3cd53
 +
 diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
 new file mode 100644
-index 0000000..396ee92
+index 0000000..d561d77
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv04_graph.c
 @@ -0,0 +1,579 @@
@@ -25487,7 +25541,7 @@ index 0000000..396ee92
 +
 +	nv_wi32(dev, instance, tmp);
 +	nv_wr32(dev, NV04_PGRAPH_CTX_SWITCH1, tmp);
-+	nv_wr32(dev, NV04_PGRAPH_CTX_CACHE1 + subc, tmp);
++	nv_wr32(dev, NV04_PGRAPH_CTX_CACHE1 + (subc<<2), tmp);
 +	return 0;
 +}
 +
@@ -30035,10 +30089,10 @@ index 0000000..b4f19cc
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
 new file mode 100644
-index 0000000..76c6f21
+index 0000000..b946e43
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv40_graph.c
-@@ -0,0 +1,2240 @@
+@@ -0,0 +1,2915 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -31480,6 +31534,655 @@ index 0000000..76c6f21
 +		nv_wo32(dev, ctx, i/4, 0x3f800000);
 +}
 +
++static void
++nv63_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
++{
++	int i;
++
++	nv_wo32(dev, ctx, 0x00000/4, ctx->im_pramin->start);
++	nv_wo32(dev, ctx, 0x00020/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x00024/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00174/4, 0x00040000);
++	nv_wo32(dev, ctx, 0x00184/4, 0x55555555);
++	nv_wo32(dev, ctx, 0x00188/4, 0x55555555);
++	nv_wo32(dev, ctx, 0x0018c/4, 0x55555555);
++	nv_wo32(dev, ctx, 0x00190/4, 0x55555555);
++	nv_wo32(dev, ctx, 0x001b4/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x001b8/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x001d8/4, 0x20010001);
++	nv_wo32(dev, ctx, 0x001dc/4, 0x0f73ef00);
++	nv_wo32(dev, ctx, 0x001e4/4, 0x02008821);
++	nv_wo32(dev, ctx, 0x00214/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00218/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x0021c/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00220/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00224/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00228/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x0022c/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00230/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00234/4, 0x00000040);
++	nv_wo32(dev, ctx, 0x00238/4, 0x00000040);
++	nv_wo32(dev, ctx, 0x0023c/4, 0x00000040);
++	nv_wo32(dev, ctx, 0x00244/4, 0x00000040);
++	nv_wo32(dev, ctx, 0x00390/4, 0x0b0b0b0c);
++	nv_wo32(dev, ctx, 0x003bc/4, 0x00001010);
++	nv_wo32(dev, ctx, 0x003c8/4, 0x00000111);
++	nv_wo32(dev, ctx, 0x003cc/4, 0x00080060);
++	nv_wo32(dev, ctx, 0x003e8/4, 0x00000080);
++	nv_wo32(dev, ctx, 0x003ec/4, 0xffff0000);
++	nv_wo32(dev, ctx, 0x003f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00404/4, 0x46400000);
++	nv_wo32(dev, ctx, 0x00414/4, 0xffff0000);
++	nv_wo32(dev, ctx, 0x00420/4, 0x0fff0000);
++	nv_wo32(dev, ctx, 0x00424/4, 0x0fff0000);
++	nv_wo32(dev, ctx, 0x0042c/4, 0x00011100);
++	nv_wo32(dev, ctx, 0x00448/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x0044c/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00450/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00454/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00458/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x0045c/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00460/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00464/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00468/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x0046c/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00470/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00474/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00478/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x0047c/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00480/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00484/4, 0x07ff0000);
++	nv_wo32(dev, ctx, 0x00490/4, 0x4b7fffff);
++	nv_wo32(dev, ctx, 0x004b8/4, 0x30201000);
++	nv_wo32(dev, ctx, 0x004bc/4, 0x70605040);
++	nv_wo32(dev, ctx, 0x004c0/4, 0xb8a89888);
++	nv_wo32(dev, ctx, 0x004c4/4, 0xf8e8d8c8);
++	nv_wo32(dev, ctx, 0x004d8/4, 0x40100000);
++	nv_wo32(dev, ctx, 0x004f4/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x00528/4, 0x435185d6);
++	nv_wo32(dev, ctx, 0x0052c/4, 0x2155b699);
++	nv_wo32(dev, ctx, 0x00530/4, 0xfedcba98);
++	nv_wo32(dev, ctx, 0x00534/4, 0x00000098);
++	nv_wo32(dev, ctx, 0x00544/4, 0xffffffff);
++	nv_wo32(dev, ctx, 0x00548/4, 0x00ff7000);
++	nv_wo32(dev, ctx, 0x0054c/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x0055c/4, 0x00ff0000);
++	nv_wo32(dev, ctx, 0x00598/4, 0x00ffff00);
++	nv_wo32(dev, ctx, 0x005dc/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005e0/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005e4/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005e8/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005ec/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005f0/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005f4/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005f8/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x005fc/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00600/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00604/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00608/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x0060c/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00610/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00614/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x00618/4, 0x00018488);
++	nv_wo32(dev, ctx, 0x0061c/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00620/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00624/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00628/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x0062c/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00630/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00634/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00638/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x0063c/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00640/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00644/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00648/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x0064c/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00650/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00654/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x00658/4, 0x00028202);
++	nv_wo32(dev, ctx, 0x0069c/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006a0/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006a4/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006a8/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006ac/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006b0/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006b4/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006b8/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006bc/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006c0/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006c4/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006c8/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006cc/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006d0/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006d4/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006d8/4, 0x0000aae4);
++	nv_wo32(dev, ctx, 0x006dc/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006e0/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006e4/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006e8/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006ec/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006f0/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006f4/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006f8/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x006fc/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00700/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00704/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00708/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x0070c/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00710/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00714/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x00718/4, 0x01012000);
++	nv_wo32(dev, ctx, 0x0071c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00720/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00724/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00728/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0072c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00730/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00734/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00738/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0073c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00740/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00744/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00748/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0074c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00750/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00754/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00758/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0079c/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007a0/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007a4/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007a8/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007ac/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007b0/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007b4/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007b8/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007bc/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007c0/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007c4/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007c8/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007cc/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007d0/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007d4/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x007d8/4, 0x00100008);
++	nv_wo32(dev, ctx, 0x0082c/4, 0x0001bc80);
++	nv_wo32(dev, ctx, 0x00830/4, 0x0001bc80);
++	nv_wo32(dev, ctx, 0x00834/4, 0x0001bc80);
++	nv_wo32(dev, ctx, 0x00838/4, 0x0001bc80);
++	nv_wo32(dev, ctx, 0x0083c/4, 0x00000202);
++	nv_wo32(dev, ctx, 0x00840/4, 0x00000202);
++	nv_wo32(dev, ctx, 0x00844/4, 0x00000202);
++	nv_wo32(dev, ctx, 0x00848/4, 0x00000202);
++	nv_wo32(dev, ctx, 0x0085c/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x00860/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x00864/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x00868/4, 0x00000008);
++	nv_wo32(dev, ctx, 0x0087c/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00880/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00884/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x00888/4, 0x00080008);
++	nv_wo32(dev, ctx, 0x0089c/4, 0x00000002);
++	nv_wo32(dev, ctx, 0x008b0/4, 0x00000020);
++	nv_wo32(dev, ctx, 0x008b4/4, 0x030c30c3);
++	nv_wo32(dev, ctx, 0x008b8/4, 0x00011001);
++	nv_wo32(dev, ctx, 0x008c4/4, 0x3e020200);
++	nv_wo32(dev, ctx, 0x008c8/4, 0x00ffffff);
++	nv_wo32(dev, ctx, 0x008cc/4, 0x0c103f00);
++	nv_wo32(dev, ctx, 0x008d8/4, 0x00040000);
++	nv_wo32(dev, ctx, 0x00910/4, 0x00008100);
++	nv_wo32(dev, ctx, 0x0099c/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x009e0/4, 0x00001001);
++	nv_wo32(dev, ctx, 0x009e8/4, 0x00000003);
++	nv_wo32(dev, ctx, 0x009ec/4, 0x00888001);
++	nv_wo32(dev, ctx, 0x00a50/4, 0x00000005);
++	nv_wo32(dev, ctx, 0x00a5c/4, 0x0000ffff);
++	nv_wo32(dev, ctx, 0x00a78/4, 0x00005555);
++	nv_wo32(dev, ctx, 0x00a7c/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00a84/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x00f48/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f50/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f58/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f60/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f68/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f70/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f78/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f80/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f88/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f90/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00f98/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fa0/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fa8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fb0/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fb8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x00fc0/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x02d08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02d98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02db0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02dc8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02de0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02df8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e10/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e28/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e40/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e58/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e70/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02e88/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02ea0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02eb8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02ed0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02ee8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02f90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02fa8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02fc0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02fd8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x02ff0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03008/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03020/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03038/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03050/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03068/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03080/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03098/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x030b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x030c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x030e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x030f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03110/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03128/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03140/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03158/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03170/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03188/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x031a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x031b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x031d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x031e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03200/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03218/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03230/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03248/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03260/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03278/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03290/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x032a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x032c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x032d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x032f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03308/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03320/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03338/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03350/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03368/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03380/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03398/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x033b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x033c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x033e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x033f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03410/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03428/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03440/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03458/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03470/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03488/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x034a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x034b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x034d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x034e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03500/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03518/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03530/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03548/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03560/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03578/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03590/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x035a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x035c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x035d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x035f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03608/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03620/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03638/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03650/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03668/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03680/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03698/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x036b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x036c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x036e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x036f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03710/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03728/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03740/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03758/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03770/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03788/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x037a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x037b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x037d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x037e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03800/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03818/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03830/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03848/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03860/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03878/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03890/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x038a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x038c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x038d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x038f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03908/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03920/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03938/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03950/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03968/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03980/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03998/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x039b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x039c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x039e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x039f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a10/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a28/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a40/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a58/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a70/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03a88/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03aa0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ab8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ad0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ae8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03b90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ba8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03bc0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03bd8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03bf0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03c98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03cb0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03cc8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ce0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03cf8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d10/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d28/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d40/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d58/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d70/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03d88/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03da0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03db8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03dd0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03de8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03e90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ea8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ec0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ed8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ef0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03f98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03fb0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03fc8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03fe0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x03ff8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04010/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04028/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04040/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04058/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04070/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04088/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x040a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x040b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x040d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x040e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04100/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04118/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04130/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04148/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04160/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04178/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04190/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x041a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x041c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x041d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x041f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04208/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04220/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04238/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04250/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04268/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04280/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04298/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x042b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x042c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x042e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x042f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04310/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04328/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04340/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04358/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04370/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04388/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x043a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x043b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x043d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x043e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04400/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04418/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04430/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04448/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04460/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04478/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04490/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x044a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x044c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x044d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x044f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04508/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04520/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04538/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04550/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04568/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04580/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04598/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x045b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x045c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x045e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x045f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04610/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04628/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04640/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04658/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04670/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04688/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x046a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x046b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x046d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x046e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04700/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04718/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04730/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04748/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04760/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04778/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04790/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x047a8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x047c0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x047d8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x047f0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04808/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04820/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04838/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04850/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04868/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04880/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04898/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x048b0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x048c8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x048e0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x048f8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04910/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04928/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04940/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04958/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04970/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04988/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x049a0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x049b8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x049d0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x049e8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04a90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04aa8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ac0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ad8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04af0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04b98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04bb0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04bc8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04be0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04bf8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c10/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c28/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c40/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c58/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c70/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04c88/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ca0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04cb8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04cd0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ce8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d00/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d18/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d30/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d48/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d60/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d78/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04d90/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04da8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04dc0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04dd8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04df0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e08/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e20/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e38/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e50/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e68/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e80/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04e98/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04eb0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ec8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ee0/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04ef8/4, 0x00000001);
++	nv_wo32(dev, ctx, 0x04f08/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f18/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f28/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f38/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f48/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f58/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f68/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f78/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f88/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04f98/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fa8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fb8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fc8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fd8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04fe8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x04ff8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05008/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05018/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05028/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05038/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05048/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05058/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05068/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05078/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05088/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05098/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050a8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050b8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050c8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050d8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050e8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x050f8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05108/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05118/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05128/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05138/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05148/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05158/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05168/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05178/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05188/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05198/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051a8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051b8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051c8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051d8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051e8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x051f8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05208/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05218/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05228/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05238/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05248/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05258/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05268/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05278/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05288/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x05298/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052a8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052b8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052c8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052d8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052e8/4, 0x3f800000);
++	nv_wo32(dev, ctx, 0x052f8/4, 0x3f800000);
++}
++
 +struct nouveau_channel *
 +nv40_graph_channel(struct drm_device *dev)
 +{
@@ -31552,6 +32255,9 @@ index 0000000..76c6f21
 +	case 0x4e:
 +		ctx_init = nv4e_graph_context_init;
 +		break;
++	case 0x63:
++		ctx_init = nv63_graph_context_init;
++		break;
 +	default:
 +		ctx_init = nv40_graph_context_init;
 +		break;
@@ -32000,6 +32706,26 @@ index 0000000..76c6f21
 +	~0
 +};
 +
++static uint32_t nv63_ctxprog[] = {
++	0x00401164, 0x00401105, 0x00400565, 0x00400706, 0x00406068, 0x00500060,
++	0x00600007, 0x00500060, 0x00700000, 0x00910880, 0x00901ffe, 0x01940000,
++	0x00200020, 0x0060000b, 0x00500069, 0x0060000c, 0x00401268, 0x00700080,
++	0x00200008, 0x0060000a, 0x00104029, 0x001e8051, 0x001040c5, 0x00128100,
++	0x00128120, 0x0014c140, 0x00118158, 0x0011415f, 0x0010c1c4, 0x001041c9,
++	0x0010c1dc, 0x00150210, 0x0012c225, 0x00108238, 0x0010823e, 0x0010427e,
++	0x00200049, 0x00100280, 0x00110400, 0x00105401, 0x00104d10, 0x00500060,
++	0x00405de6, 0x00148653, 0x00104668, 0x0010c66d, 0x00120682, 0x0011068b,
++	0x00168691, 0x001046ae, 0x001046b0, 0x001206b4, 0x001046c4, 0x001146c6,
++	0x001646cc, 0x001046e5, 0x001206e6, 0x001246f0, 0x002000c0, 0x00100700,
++	0x0010c3d7, 0x001043e1, 0x00500060, 0x00104800, 0x00108901, 0x00104910,
++	0x00124920, 0x0017c940, 0x00140965, 0x00144a00, 0x00104a11, 0x00108a14,
++	0x00110b00, 0x00110b04, 0x00120b08, 0x00134b2c, 0x0010cd00, 0x0010cd04,
++	0x00104d08, 0x00104d80, 0x00104e00, 0x00104f06, 0x0012d600, 0x00105c00,
++	0x00300000, 0x00200080, 0x00405800, 0x00200084, 0x00800001, 0x00200332,
++	0x0060000a, 0x00201320, 0x00800029, 0x00400200, 0x00406005, 0x00600009,
++	0x00700005, 0x00700006, 0x0060000e, ~0
++};
++
 +/*
 + * G70		0x47
 + * G71		0x49
@@ -32059,6 +32785,9 @@ index 0000000..76c6f21
 +	case 0x4e:
 +		ctxprog = nv4e_ctxprog;
 +		break;
++	case 0x63:
++		ctxprog = nv63_ctxprog;
++		break;
 +	default:
 +		NV_ERROR(dev, "Context program for 0x%02x unavailable\n",
 +			 dev_priv->chipset);
@@ -33572,10 +34301,10 @@ index 0000000..fb5838e
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
 new file mode 100644
-index 0000000..dd4bff2
+index 0000000..281e65c
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_display.c
-@@ -0,0 +1,998 @@
+@@ -0,0 +1,1012 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -34197,11 +34926,8 @@ index 0000000..dd4bff2
 +	 */
 +	NV_DEBUG(dev, "0x610030: 0x%08x\n", unk30);
 +	head = ffs((unk30 >> 9) & 3) - 1;
-+	if (head < 0) {
-+		NV_ERROR(dev, "no active heads: 0x%08x\n",
-+						nv_rd32(dev, 0x610030));
++	if (head < 0)
 +		return -EINVAL;
-+	}
 +
 +	/* This assumes CRTCs are never bound to multiple encoders, which
 +	 * should be the case.
@@ -34271,9 +34997,21 @@ index 0000000..dd4bff2
 +			   int pxclk)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nouveau_connector *nv_connector = NULL;
++	struct drm_encoder *encoder;
 +	struct nvbios *bios = &dev_priv->VBIOS;
 +	uint32_t mc, script = 0, or;
 +
++	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
++		struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
++
++		if (nv_encoder->dcb != dcbent)
++			continue;
++
++		nv_connector = nouveau_encoder_connector_get(nv_encoder);
++		break;
++	}
++
 +	or = ffs(dcbent->or) - 1;
 +	mc = nv50_display_mode_ctrl(dev, dcbent->type != OUTPUT_ANALOG, or);
 +	switch (dcbent->type) {
@@ -34292,6 +35030,11 @@ index 0000000..dd4bff2
 +			} else
 +			if (bios->fp.strapless_is_24bit & 1)
 +				script |= 0x0200;
++
++			if (nv_connector && nv_connector->edid &&
++			    (nv_connector->edid->revision >= 4) &&
++			    (nv_connector->edid->input & 0x70) >= 0x20)
++				script |= 0x0200;
 +		}
 +
 +		if (nouveau_uscript_lvds >= 0) {
@@ -35026,7 +35769,7 @@ index 0000000..6bcc6d3
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..77ae1aa
+index 0000000..b728228
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
 @@ -0,0 +1,494 @@
@@ -35448,7 +36191,7 @@ index 0000000..77ae1aa
 +	NV_DEBUG(dev, "\n");
 +
 +	chid = pfifo->channel_id(dev);
-+	if (chid < 0 || chid >= dev_priv->engine.fifo.channels)
++	if (chid < 1 || chid >= dev_priv->engine.fifo.channels - 1)
 +		return 0;
 +
 +	chan = dev_priv->fifos[chid];


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.81
retrieving revision 1.1294.2.82
diff -u -p -r1.1294.2.81 -r1.1294.2.82
--- kernel.spec	9 Dec 2009 21:44:04 -0000	1.1294.2.81
+++ kernel.spec	23 Dec 2009 21:12:36 -0000	1.1294.2.82
@@ -41,7 +41,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 9
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -715,21 +715,17 @@ Patch1586: linux-2.6-virtio_blk-add-supp
 # nouveau + drm fixes
 Patch1810: kms-offb-handoff.patch
 Patch1812: drm-next-b390f944.patch
-Patch1813: drm-radeon-pm.patch
-Patch1814: drm-nouveau.patch
-Patch1818: drm-i915-resume-force-mode.patch
+Patch1813: drm-edid-9340d8cf.patch
+
+Patch1820: drm-radeon-pm.patch
+Patch1821: drm-nouveau.patch
+Patch1822: drm-i915-resume-force-mode.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
-Patch1827: drm-i915-fix-tvmode-oops.patch
-Patch1831: drm-conservative-fallback-modes.patch
-Patch1832: drm-edid-retry.patch
-Patch1834: drm-edid-header-fixup.patch
-Patch1835: drm-default-mode.patch
-Patch1837: drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 Patch1839: drm-radeon-misc-fixes.patch
-Patch1840: drm-radeon-rv410-test-fix.patch
+#Patch1840: drm-radeon-rv410-test-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -796,8 +792,6 @@ Patch14101: improve-resource-counter-sca
 Patch14420: perf-events-fix-swevent-hrtimer-sampling.patch
 Patch14421: perf-events-dont-generate-events-for-the-idle-task.patch
 
-Patch14430: crypto-via-padlock-fix-nano-aes.patch
-
 # tg3 fixes (#527209)
 Patch14451: tg3-01-delay-mdio-bus-init-until-fw-finishes.patch
 Patch14452: tg3-02-fix-tso-test-against-wrong-flags-var.patch
@@ -806,18 +800,8 @@ Patch14454: tg3-04-prevent-tx-bd-corrupt
 Patch14455: tg3-05-assign-flags-to-fixes-in-start_xmit_dma_bug.patch
 Patch14456: tg3-06-fix-5906-transmit-hangs.patch
 
-Patch14460: highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
-Patch14461: highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
-Patch14462: highmem-fix-arm-powerpc-kmap_types.patch
-
 Patch14463: dlm-fix-connection-close-handling.patch
 
-# rhbz#544144 [bbf31bf18d34caa87dd01f08bf713635593697f2]
-Patch14464: ipv4-fix-null-ptr-deref-in-ip_fragment.patch
-
-# rhbz#544471
-Patch14465: ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
-
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
 Patch19999: xen.pvops.post.patch
@@ -1439,12 +1423,9 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 # Nouveau DRM + drm fixes
 ApplyPatch kms-offb-handoff.patch
 ApplyPatch drm-next-b390f944.patch
+ApplyPatch drm-edid-9340d8cf.patch
 ApplyPatch drm-radeon-misc-fixes.patch
-ApplyPatch drm-radeon-rv410-test-fix.patch
-ApplyPatch drm-conservative-fallback-modes.patch
-ApplyPatch drm-edid-retry.patch
-ApplyPatch drm-edid-header-fixup.patch
-ApplyPatch drm-default-mode.patch
+#ApplyPatch drm-radeon-rv410-test-fix.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1454,8 +1435,6 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 ApplyPatch drm-intel-no-tv-hotplug.patch
-ApplyPatch drm-i915-fix-tvmode-oops.patch
-ApplyPatch drm-i915-fix-sync-to-vbl-when-vga-is-off.patch
 #ApplyPatch drm-disable-r600-aspm.patch
 
 # VGA arb + drm
@@ -1498,9 +1477,6 @@ ApplyPatch improve-resource-counter-scal
 ApplyPatch perf-events-fix-swevent-hrtimer-sampling.patch
 ApplyPatch perf-events-dont-generate-events-for-the-idle-task.patch
 
-# Fix oops in padlock
-ApplyPatch crypto-via-padlock-fix-nano-aes.patch
-
 # tg3 fixes (#527209)
 ApplyPatch tg3-01-delay-mdio-bus-init-until-fw-finishes.patch
 ApplyPatch tg3-02-fix-tso-test-against-wrong-flags-var.patch
@@ -1518,18 +1494,8 @@ ApplyPatch sched-retune-scheduler-latenc
 # fix wakeup latency
 ApplyPatch sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
 
-ApplyPatch highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
-ApplyPatch highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
-ApplyPatch highmem-fix-arm-powerpc-kmap_types.patch
-
 ApplyPatch dlm-fix-connection-close-handling.patch
 
-# rhbz#544144
-ApplyPatch ipv4-fix-null-ptr-deref-in-ip_fragment.patch
-
-# rhbz#544471
-ApplyPatch ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch
-
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
 ApplyPatch xen.pvops.post.patch
@@ -2182,6 +2148,44 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 23 2009 Michael Young <m.a.young at durham.ac.uk>
+- update to latest pvops patch
+
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 2.6.31.9-174
+- revert rv410 fix broke some things
+
+* Mon Dec 21 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.9-173
+- nouveau: fix dim panel issues on certain laptops (rh#547554)
+- nouveau: fix some issues when running without ctxprogs
+- nouveau: fix error handling in init paths
+- nouveau: add vga arbitration hooks
+- nouveau: fix nv04 sw methods
+
+* Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.9-172
+- stable update 2.6.31.9
+
+* Thu Dec 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.8-171
+- drm-nouveau.patch: add support for GF7100 (NV63)
+
+* Wed Dec 16 2009 Adam Jackson <ajax at redhat.com>
+- drm-edid-9340d8cf.patch: Sync DRM EDID with Linus master.
+- drm-conservative-fallback-modes.patch, drm-edid-retry.patch,
+  drm-edid-header-fixup.patch, drm-default-mode.patch: Drop, merged into
+  the above.
+
+* Mon Dec 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.8-169
+- 2.6.31.8
+
+* Thu Dec 10 2009 Kyle McMartin <kyle at redhat.com>
+- ipv4-fix-null-ptr-deref-in-ip_fragment.patch: upstream.
+- nuke highmem patches now in stable.
+- crypto-via-padlock-fix-nano-aes.patch: upstream.
+- fix up drm-next-$sha.patch
+
+* Wed Dec 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.6-167
+- Linux 2.6.31.7
+- NOTE: drm patch still needs fixing.
+
 * Wed Dec 09 2009 Michael Young <m.a.young at durham.ac.uk>
 - update to latest pvops patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.36
retrieving revision 1.976.2.37
diff -u -p -r1.976.2.36 -r1.976.2.37
--- sources	12 Nov 2009 23:01:10 -0000	1.976.2.36
+++ sources	23 Dec 2009 21:12:37 -0000	1.976.2.37
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-89802830db41e517cdf0954145f73337  patch-2.6.31.6.bz2
+819f1552906be755b53154fd570866eb  patch-2.6.31.9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.35
retrieving revision 1.888.2.36
diff -u -p -r1.888.2.35 -r1.888.2.36
--- upstream	12 Nov 2009 23:01:10 -0000	1.888.2.35
+++ upstream	23 Dec 2009 21:12:37 -0000	1.888.2.36
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.6.bz2
+patch-2.6.31.9.bz2

xen.pvops.patch:
 arch/x86/Kconfig                                     |   14 
 arch/x86/Makefile                                    |    2 
 arch/x86/include/asm/agp.h                           |   17 
 arch/x86/include/asm/e820.h                          |    2 
 arch/x86/include/asm/fixmap.h                        |   25 
 arch/x86/include/asm/hpet.h                          |    2 
 arch/x86/include/asm/i387.h                          |    1 
 arch/x86/include/asm/io.h                            |   15 
 arch/x86/include/asm/io_apic.h                       |    7 
 arch/x86/include/asm/microcode.h                     |    9 
 arch/x86/include/asm/mmu.h                           |    3 
 arch/x86/include/asm/paravirt.h                      |  720 --------
 arch/x86/include/asm/paravirt_types.h                |  724 ++++++++
 arch/x86/include/asm/pci.h                           |    9 
 arch/x86/include/asm/pci_x86.h                       |    2 
 arch/x86/include/asm/pgtable.h                       |    6 
 arch/x86/include/asm/processor.h                     |    4 
 arch/x86/include/asm/pvclock.h                       |    6 
 arch/x86/include/asm/syscalls.h                      |    8 
 arch/x86/include/asm/tlbflush.h                      |    6 
 arch/x86/include/asm/vgtod.h                         |   64 
 arch/x86/include/asm/vsyscall.h                      |   32 
 arch/x86/include/asm/xen/hypercall.h                 |   44 
 arch/x86/include/asm/xen/interface.h                 |    8 
 arch/x86/include/asm/xen/interface_32.h              |    5 
 arch/x86/include/asm/xen/interface_64.h              |   13 
 arch/x86/include/asm/xen/iommu.h                     |   12 
 arch/x86/include/asm/xen/page.h                      |   16 
 arch/x86/include/asm/xen/pci.h                       |   95 +
 arch/x86/include/asm/xen/swiotlb.h                   |   10 
 arch/x86/kernel/Makefile                             |    6 
 arch/x86/kernel/acpi/boot.c                          |   18 
 arch/x86/kernel/acpi/processor.c                     |   14 
 arch/x86/kernel/acpi/sleep.c                         |    2 
 arch/x86/kernel/apic/io_apic.c                       |   68 
 arch/x86/kernel/cpu/mtrr/Makefile                    |    1 
 arch/x86/kernel/cpu/mtrr/amd.c                       |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c                   |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c                     |    6 
 arch/x86/kernel/cpu/mtrr/generic.c                   |   10 
 arch/x86/kernel/cpu/mtrr/main.c                      |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h                      |   11 
 arch/x86/kernel/cpu/mtrr/xen.c                       |  104 +
 arch/x86/kernel/e820.c                               |   30 
 arch/x86/kernel/hpet.c                               |    8 
 arch/x86/kernel/ioport.c                             |   40 
 arch/x86/kernel/kvmclock.c                           |    7 
 arch/x86/kernel/ldt.c                                |    3 
 arch/x86/kernel/microcode_core.c                     |    5 
 arch/x86/kernel/microcode_xen.c                      |  200 ++
 arch/x86/kernel/paravirt.c                           |    1 
 arch/x86/kernel/pci-dma.c                            |    6 
 arch/x86/kernel/pci-swiotlb.c                        |   25 
 arch/x86/kernel/process.c                            |   27 
 arch/x86/kernel/process_32.c                         |   27 
 arch/x86/kernel/process_64.c                         |   33 
 arch/x86/kernel/pvclock.c                            |  190 +-
 arch/x86/kernel/setup.c                              |    4 
 arch/x86/kernel/traps.c                              |   33 
 arch/x86/kernel/tsc.c                                |    4 
 arch/x86/kernel/vsyscall_64.c                        |   91 -
 arch/x86/mm/Makefile                                 |    7 
 arch/x86/mm/gup.c                                    |    5 
 arch/x86/mm/init_32.c                                |   42 
 arch/x86/mm/ioremap.c                                |   72 
 arch/x86/mm/pat.c                                    |    2 
 arch/x86/mm/pgtable.c                                |   18 
 arch/x86/mm/physaddr.c                               |   70 
 arch/x86/mm/physaddr.h                               |   10 
 arch/x86/mm/tlb.c                                    |   35 
 arch/x86/pci/Makefile                                |    1 
 arch/x86/pci/common.c                                |   18 
 arch/x86/pci/i386.c                                  |    3 
 arch/x86/pci/init.c                                  |    6 
 arch/x86/pci/xen.c                                   |   66 
 arch/x86/vdso/vclock_gettime.c                       |   46 
 arch/x86/vdso/vgetcpu.c                              |   17 
 arch/x86/xen/Kconfig                                 |   38 
 arch/x86/xen/Makefile                                |    5 
 arch/x86/xen/apic.c                                  |   57 
 arch/x86/xen/enlighten.c                             |  120 +
 arch/x86/xen/grant-table.c                           |   38 
 arch/x86/xen/mmu.c                                   |  493 +++++
 arch/x86/xen/pci-swiotlb.c                           |  999 +++++++++++
 arch/x86/xen/pci.c                                   |  231 ++
 arch/x86/xen/setup.c                                 |  115 +
 arch/x86/xen/smp.c                                   |   12 
 arch/x86/xen/suspend.c                               |   17 
 arch/x86/xen/time.c                                  |   68 
 arch/x86/xen/vga.c                                   |   67 
 arch/x86/xen/xen-asm_64.S                            |    4 
 arch/x86/xen/xen-ops.h                               |   29 
 block/blk-core.c                                     |    2 
 drivers/acpi/acpi_memhotplug.c                       |   19 
 drivers/acpi/acpica/hwsleep.c                        |   17 
 drivers/acpi/processor_core.c                        |  346 +++
 drivers/acpi/processor_idle.c                        |  102 +
 drivers/acpi/processor_perflib.c                     |  120 +
 drivers/acpi/sleep.c                                 |   19 
 drivers/block/Kconfig                                |    1 
 drivers/block/xen-blkfront.c                         |   14 
 drivers/char/agp/intel-agp.c                         |   17 
 drivers/char/hvc_xen.c                               |  120 +
 drivers/gpu/drm/drm_drv.c                            |    2 
 drivers/gpu/drm/drm_gem.c                            |    2 
 drivers/gpu/drm/drm_scatter.c                        |   67 
 drivers/gpu/drm/ttm/ttm_bo_vm.c                      |    2 
 drivers/input/Kconfig                                |    1 
 drivers/input/xen-kbdfront.c                         |    2 
 drivers/net/Kconfig                                  |  174 ++
 drivers/net/Makefile                                 |    2 
 drivers/net/imq.c                                    |  594 ++++++
 drivers/net/xen-netchannel2/Makefile                 |   25 
 drivers/net/xen-netchannel2/autobypass.c             |  316 +++
 drivers/net/xen-netchannel2/bypass.c                 |  823 +++++++++
 drivers/net/xen-netchannel2/bypassee.c               |  803 +++++++++
 drivers/net/xen-netchannel2/chan.c                   |  843 +++++++++
 drivers/net/xen-netchannel2/netback2.c               |  482 +++++
 drivers/net/xen-netchannel2/netchan2.c               |   32 
 drivers/net/xen-netchannel2/netchannel2_core.h       |  796 +++++++++
 drivers/net/xen-netchannel2/netchannel2_endpoint.h   |   63 
 drivers/net/xen-netchannel2/netchannel2_uspace.h     |   17 
 drivers/net/xen-netchannel2/netfront2.c              |  514 +++++
 drivers/net/xen-netchannel2/offload.c                |  181 ++
 drivers/net/xen-netchannel2/poll.c                   |   59 
 drivers/net/xen-netchannel2/receiver_map.c           |  787 +++++++++
 drivers/net/xen-netchannel2/recv_packet.c            |  333 +++
 drivers/net/xen-netchannel2/rscb.c                   |  435 +++++
 drivers/net/xen-netchannel2/tools/destroy_bypass.c   |   25 
 drivers/net/xen-netchannel2/tools/establish_bypass.c |   31 
 drivers/net/xen-netchannel2/util.c                   |  241 ++
 drivers/net/xen-netchannel2/xmit_packet.c            |  374 ++++
 drivers/net/xen-netfront.c                           |   10 
 drivers/pci/Kconfig                                  |    9 
 drivers/pci/Makefile                                 |    4 
 drivers/pci/bus.c                                    |    1 
 drivers/pci/msi.c                                    |    5 
 drivers/pci/setup-res.c                              |    1 
 drivers/pci/xen-iommu.c                              |  274 +++
 drivers/pci/xen-pcifront.c                           | 1158 +++++++++++++
 drivers/video/Kconfig                                |    1 
 drivers/video/broadsheetfb.c                         |    2 
 drivers/video/fb_defio.c                             |    4 
 drivers/video/hecubafb.c                             |    2 
 drivers/video/metronomefb.c                          |    2 
 drivers/video/xen-fbfront.c                          |    4 
 drivers/xen/Kconfig                                  |  125 +
 drivers/xen/Makefile                                 |   28 
 drivers/xen/acpi.c                                   |   23 
 drivers/xen/acpi_processor.c                         |  411 ++++
 drivers/xen/balloon.c                                |  325 ++-
 drivers/xen/biomerge.c                               |   14 
 drivers/xen/blkback/Makefile                         |    3 
 drivers/xen/blkback/blkback-pagemap.c                |  104 +
 drivers/xen/blkback/blkback-pagemap.h                |   20 
 drivers/xen/blkback/blkback.c                        |  673 +++++++
 drivers/xen/blkback/common.h                         |  143 +
 drivers/xen/blkback/interface.c                      |  186 ++
 drivers/xen/blkback/vbd.c                            |  118 +
 drivers/xen/blkback/xenbus.c                         |  541 ++++++
 drivers/xen/blktap/Makefile                          |    3 
 drivers/xen/blktap/blktap.h                          |  243 ++
 drivers/xen/blktap/control.c                         |  283 +++
 drivers/xen/blktap/device.c                          | 1140 +++++++++++++
 drivers/xen/blktap/request.c                         |  298 +++
 drivers/xen/blktap/ring.c                            |  615 +++++++
 drivers/xen/blktap/sysfs.c                           |  452 +++++
 drivers/xen/blktap/wait_queue.c                      |   40 
 drivers/xen/events.c                                 |  491 +++++
 drivers/xen/evtchn.c                                 |   82 
 drivers/xen/features.c                               |    2 
 drivers/xen/gntdev.c                                 |  625 +++++++
 drivers/xen/grant-table.c                            |  491 +++++
 drivers/xen/live_maps.c                              |   61 
 drivers/xen/manage.c                                 |   31 
 drivers/xen/mce.c                                    |  213 ++
 drivers/xen/netback/Makefile                         |    3 
 drivers/xen/netback/common.h                         |  223 ++
 drivers/xen/netback/interface.c                      |  401 ++++
 drivers/xen/netback/netback.c                        | 1650 +++++++++++++++++++
 drivers/xen/netback/xenbus.c                         |  470 +++++
 drivers/xen/pci.c                                    |  124 +
 drivers/xen/pciback/Makefile                         |   17 
 drivers/xen/pciback/conf_space.c                     |  435 +++++
 drivers/xen/pciback/conf_space.h                     |  126 +
 drivers/xen/pciback/conf_space_capability.c          |   66 
 drivers/xen/pciback/conf_space_capability.h          |   26 
 drivers/xen/pciback/conf_space_capability_msi.c      |   84 
 drivers/xen/pciback/conf_space_capability_pm.c       |  113 +
 drivers/xen/pciback/conf_space_capability_vpd.c      |   40 
 drivers/xen/pciback/conf_space_header.c              |  318 +++
 drivers/xen/pciback/conf_space_quirks.c              |  140 +
 drivers/xen/pciback/conf_space_quirks.h              |   35 
 drivers/xen/pciback/controller.c                     |  442 +++++
 drivers/xen/pciback/passthrough.c                    |  178 ++
 drivers/xen/pciback/pci_stub.c                       | 1285 ++++++++++++++
 drivers/xen/pciback/pciback.h                        |  133 +
 drivers/xen/pciback/pciback_ops.c                    |  130 +
 drivers/xen/pciback/slot.c                           |  191 ++
 drivers/xen/pciback/vpci.c                           |  244 ++
 drivers/xen/pciback/xenbus.c                         |  722 ++++++++
 drivers/xen/pcpu.c                                   |  420 ++++
 drivers/xen/xen_acpi_memhotplug.c                    |  209 ++
 drivers/xen/xenbus/Makefile                          |    5 
 drivers/xen/xenbus/xenbus_client.c                   |   15 
 drivers/xen/xenbus/xenbus_comms.c                    |    1 
 drivers/xen/xenbus/xenbus_probe.c                    |  384 +---
 drivers/xen/xenbus/xenbus_probe.h                    |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c            |  298 +++
 drivers/xen/xenbus/xenbus_probe_frontend.c           |  292 +++
 drivers/xen/xenbus/xenbus_xs.c                       |  187 ++
 drivers/xen/xenfs/Makefile                           |    3 
 drivers/xen/xenfs/privcmd.c                          |  403 ++++
 drivers/xen/xenfs/super.c                            |   98 +
 drivers/xen/xenfs/xenfs.h                            |    3 
 drivers/xen/xenfs/xenstored.c                        |   67 
 include/acpi/acpi_drivers.h                          |   20 
 include/acpi/processor.h                             |   17 
 include/asm-generic/pci.h                            |    2 
 include/drm/drmP.h                                   |    2 
 include/linux/fb.h                                   |    1 
 include/linux/imq.h                                  |   13 
 include/linux/interrupt.h                            |    1 
 include/linux/mm.h                                   |   15 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter/xt_IMQ.h                     |    9 
 include/linux/netfilter_ipv4/ipt_IMQ.h               |   10 
 include/linux/netfilter_ipv6/ip6t_IMQ.h              |   10 
 include/linux/page-flags.h                           |   18 
 include/linux/sched.h                                |   15 
 include/linux/skbuff.h                               |   22 
 include/linux/swiotlb.h                              |    1 
 include/net/netfilter/nf_queue.h                     |   12 
 include/xen/Kbuild                                   |    1 
 include/xen/acpi.h                                   |   75 
 include/xen/balloon.h                                |    8 
 include/xen/blkif.h                                  |  123 +
 include/xen/events.h                                 |   32 
 include/xen/gntdev.h                                 |  119 +
 include/xen/grant_table.h                            |   80 
 include/xen/interface/grant_table.h                  |  195 ++
 include/xen/interface/io/netchannel2.h               |  342 +++
 include/xen/interface/io/pciif.h                     |  124 +
 include/xen/interface/io/ring.h                      |    3 
 include/xen/interface/io/uring.h                     |  426 ++++
 include/xen/interface/io/xenbus.h                    |    8 
 include/xen/interface/memory.h                       |   92 +
 include/xen/interface/physdev.h                      |   51 
 include/xen/interface/platform.h                     |  381 ++++
 include/xen/interface/vcpu.h                         |   41 
 include/xen/interface/xen-mca.h                      |  429 ++++
 include/xen/interface/xen.h                          |   45 
 include/xen/live_maps.h                              |  165 +
 include/xen/pcpu.h                                   |   30 
 include/xen/privcmd.h                                |   80 
 include/xen/swiotlb.h                                |  102 +
 include/xen/xen-ops.h                                |   11 
 include/xen/xenbus.h                                 |    4 
 kernel/irq/manage.c                                  |    3 
 kernel/sched.c                                       |   14 
 lib/swiotlb.c                                        |    5 
 mm/memory.c                                          |   42 
 mm/mmap.c                                            |   12 
 mm/page_alloc.c                                      |   14 
 net/core/dev.c                                       |   13 
 net/core/skbuff.c                                    |   96 +
 net/netfilter/Kconfig                                |   12 
 net/netfilter/Makefile                               |    1 
 net/netfilter/nf_queue.c                             |   52 
 net/netfilter/xt_IMQ.c                               |   73 
 270 files changed, 35294 insertions(+), 1850 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1.2.51 -r 1.1.2.52 xen.pvops.patchIndex: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.51
retrieving revision 1.1.2.52
diff -u -p -r1.1.2.51 -r1.1.2.52
--- xen.pvops.patch	9 Dec 2009 21:44:05 -0000	1.1.2.51
+++ xen.pvops.patch	23 Dec 2009 21:12:37 -0000	1.1.2.52
@@ -2317,10 +2317,10 @@ index 018a0a4..f334014 100644
  unsigned long arbitrary_virt_to_mfn(void *vaddr);
 diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
 new file mode 100644
-index 0000000..6c022c8
+index 0000000..2fc9176
 --- /dev/null
 +++ b/arch/x86/include/asm/xen/pci.h
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,95 @@
 +#ifndef _ASM_X86_XEN_PCI_H
 +#define _ASM_X86_XEN_PCI_H
 +
@@ -2331,6 +2331,11 @@ index 0000000..6c022c8
 +			int type, int pirq_override);
 +int xen_destroy_irq(int irq);
 +void xen_teardown_msi_dev(struct pci_dev *dev);
++
++int xen_find_device_domain_owner(struct pci_dev *dev);
++int xen_register_device_domain_owner(struct pci_dev *dev, domid_t domain);
++int xen_unregister_device_domain_owner(struct pci_dev *dev);
++
 +#else
 +static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
 +{
@@ -2347,6 +2352,19 @@ index 0000000..6c022c8
 +{
 +	return -1;
 +}
++static inline int xen_find_device_domain_owner(struct pci_dev *dev)
++{
++	return -1;
++}
++static inline int xen_register_device_domain_owner(struct pci_dev *dev,
++						   domid_t domain)
++{
++ 	return -1;
++}
++static inline int xen_unregister_device_domain_owner(struct pci_dev *dev)
++{
++ 	return -1;
++}
 +static inline void xen_teardown_msi_dev(struct pci_dev *dev) { }
 +#endif
 +
@@ -2358,25 +2376,44 @@ index 0000000..6c022c8
 +	return -1;
 +}
 +#endif
-+#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN_PCIDEV_FRONTEND)
-+/* Defined in drivers/pci/xen-pcifront.c */
-+int pci_frontend_enable_msi(struct pci_dev *dev, int **vectors);
-+void pci_frontend_disable_msi(struct pci_dev *dev);
-+int pci_frontend_enable_msix(struct pci_dev *dev,
-+			     int **vectors, int nvec);
-+void pci_frontend_disable_msix(struct pci_dev *dev);
-+#else
-+static inline int pci_frontend_enable_msi(struct pci_dev *dev, int **vectors)
++#if defined(CONFIG_PCI_MSI)
++
++/* The drivers/pci/xen-pcifront.c sets this structure to
++ * its own functions.
++ */
++struct xen_pci_frontend_ops {
++	int (*enable_msi)(struct pci_dev *dev, int **vectors);
++	void (*disable_msi)(struct pci_dev *dev);
++	int (*enable_msix)(struct pci_dev *dev, int **vectors, int nvec);
++	void (*disable_msix)(struct pci_dev *dev);
++};
++
++extern struct xen_pci_frontend_ops *xen_pci_frontend;
++	
++static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev,
++					      int **vectors)
 +{
++	if (xen_pci_frontend && xen_pci_frontend->enable_msi)
++		return xen_pci_frontend->enable_msi(dev, vectors);
 +	return -1;
 +}
-+static inline void pci_frontend_disable_msi(struct pci_dev *dev) { }
-+static inline int pci_frontend_enable_msix(struct pci_dev *dev,
-+					   int **vectors, int nvec)
++static inline void xen_pci_frontend_disable_msi(struct pci_dev *dev)
++{
++	if (xen_pci_frontend && xen_pci_frontend->disable_msi)
++			xen_pci_frontend->disable_msi(dev);
++}
++static inline int xen_pci_frontend_enable_msix(struct pci_dev *dev,
++					       int **vectors, int nvec)
 +{
++	if (xen_pci_frontend && xen_pci_frontend->enable_msix)
++		return xen_pci_frontend->enable_msix(dev, vectors, nvec);
 +	return -1;
 +}
-+static inline void pci_frontend_disable_msix(struct pci_dev *dev) { }
++static inline void xen_pci_frontend_disable_msix(struct pci_dev *dev)
++{
++	if (xen_pci_frontend && xen_pci_frontend->disable_msix)
++			xen_pci_frontend->disable_msix(dev);
++}
 +#endif
 +#endif	/* _ASM_X86_XEN_PCI_H */
 diff --git a/arch/x86/include/asm/xen/swiotlb.h b/arch/x86/include/asm/xen/swiotlb.h
@@ -2483,7 +2520,7 @@ index 6b8ca3a..d47c54f 100644
  
  	set_fixmap_nocache(FIX_APIC_BASE, address);
 diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
-index d296f4a..05ef6a6 100644
+index d85d1b2..8c9526d 100644
 --- a/arch/x86/kernel/acpi/processor.c
 +++ b/arch/x86/kernel/acpi/processor.c
 @@ -11,6 +11,7 @@
@@ -2494,7 +2531,7 @@ index d296f4a..05ef6a6 100644
  
  static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
  {
-@@ -87,6 +88,19 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
+@@ -88,6 +89,19 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
  
  EXPORT_SYMBOL(arch_acpi_processor_init_pdc);
  
@@ -3400,7 +3437,7 @@ index 70ec9b9..cef3d70 100644
  
  	.start_context_switch = paravirt_nop,
 diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
-index 1a041bc..1101a9f 100644
+index 953667c..1aee23d 100644
 --- a/arch/x86/kernel/pci-dma.c
 +++ b/arch/x86/kernel/pci-dma.c
 @@ -10,6 +10,8 @@
@@ -3872,7 +3909,7 @@ index 03801f2..1b5d3e8 100644
 +
 +#endif	/* CONFIG_PARAVIRT_CLOCK_VSYSCALL */
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 63f32d2..86bef0f 100644
+index 860ed56..060cebe 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -87,6 +87,7 @@
@@ -3883,7 +3920,7 @@ index 63f32d2..86bef0f 100644
  
  #include <asm/system.h>
  #include <asm/vsyscall.h>
-@@ -944,6 +945,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -945,6 +946,9 @@ void __init setup_arch(char **cmdline_p)
  
  	initmem_init(0, max_pfn);
  
@@ -5240,7 +5277,7 @@ index 49ba9b5..77af9e9 100644
  	apply_to_page_range(&init_mm, (unsigned long)shared,
  			    PAGE_SIZE * nr_gframes, unmap_pte_fn, NULL);
 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index 4ceb285..5e48a6a 100644
+index 4ceb285..6838004 100644
 --- a/arch/x86/xen/mmu.c
 +++ b/arch/x86/xen/mmu.c
 @@ -50,7 +50,9 @@
@@ -5463,7 +5500,7 @@ index 4ceb285..5e48a6a 100644
  		xen_pgd_unpin(mm);
  
  	spin_unlock(&mm->page_table_lock);
-@@ -1285,6 +1404,13 @@ static void xen_flush_tlb_single(unsigned long addr)
+@@ -1285,12 +1404,19 @@ static void xen_flush_tlb_single(unsigned long addr)
  	preempt_enable();
  }
  
@@ -5477,6 +5514,13 @@ index 4ceb285..5e48a6a 100644
  static void xen_flush_tlb_others(const struct cpumask *cpus,
  				 struct mm_struct *mm, unsigned long va)
  {
+ 	struct {
+ 		struct mmuext_op op;
+-		DECLARE_BITMAP(mask, NR_CPUS);
++		DECLARE_BITMAP(mask, num_processors);
+ 	} *args;
+ 	struct multicall_space mcs;
+ 
 @@ -1414,6 +1540,13 @@ static int xen_pgd_alloc(struct mm_struct *mm)
  	return ret;
  }
@@ -5918,10 +5962,10 @@ index 4ceb285..5e48a6a 100644
  static struct dentry *d_mmu_debug;
 diff --git a/arch/x86/xen/pci-swiotlb.c b/arch/x86/xen/pci-swiotlb.c
 new file mode 100644
-index 0000000..ecdbfe2
+index 0000000..6195eb9
 --- /dev/null
 +++ b/arch/x86/xen/pci-swiotlb.c
-@@ -0,0 +1,997 @@
+@@ -0,0 +1,999 @@
 +/*
 + * Dynamic DMA mapping support.
[...1790 lines suppressed...]
  static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 45b67d9..968c53c 100644
+index 4637dce..4aefeb3 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
-@@ -1360,7 +1360,7 @@ extern int drm_vma_info(struct seq_file *m, void *data);
+@@ -1361,7 +1361,7 @@ extern int drm_vma_info(struct seq_file *m, void *data);
  #endif
  
  				/* Scatter Gather Support (drm_scatter.h) */
@@ -37925,7 +38448,7 @@ index e2e5ce5..ca67e2b 100644
  {
  	int ret = test_bit(PG_uptodate, &(page)->flags);
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 0f1ea4a..8dabc37 100644
+index d3e910b..427a179 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -141,6 +141,21 @@ extern unsigned long nr_iowait(void);
@@ -37951,7 +38474,7 @@ index 0f1ea4a..8dabc37 100644
  
  struct seq_file;
 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index f2c69a2..e2884b4 100644
+index ff06fb2..0e000f2 100644
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 @@ -29,6 +29,9 @@
@@ -38007,7 +38530,7 @@ index f2c69a2..e2884b4 100644
  static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
  {
  	return (struct dst_entry *)skb->_skb_dst;
-@@ -1974,6 +1992,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
+@@ -1976,6 +1994,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
  	dst->nfct_reasm = src->nfct_reasm;
  	nf_conntrack_get_reasm(src->nfct_reasm);
  #endif
@@ -38068,10 +38591,10 @@ index 4e65c16..84ad8f0 100644
 +header-y += privcmd.h
 diff --git a/include/xen/acpi.h b/include/xen/acpi.h
 new file mode 100644
-index 0000000..8506688
+index 0000000..24f0bfb
 --- /dev/null
 +++ b/include/xen/acpi.h
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,75 @@
 +#ifndef _XEN_ACPI_H
 +#define _XEN_ACPI_H
 +
@@ -38115,6 +38638,10 @@ index 0000000..8506688
 +#define HOTPLUG_TYPE_ADD	0
 +#define HOTPLUG_TYPE_REMOVE	1
 +
++#if defined(CONFIG_ACPI_HOTPLUG_MEMORY) || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
++int xen_hotadd_memory(struct acpi_memory_device *mem_device);
++#endif
++
 +#if defined(CONFIG_ACPI_PROCESSOR_XEN) || defined(CONFIG_ACPI_PROCESSOR_XEN_MODULE)
 +
 +struct processor_cntl_xen_ops {
@@ -38124,20 +38651,12 @@ index 0000000..8506688
 +	int (*hotplug)(struct acpi_processor *pr, int type);
 +};
 +
-+extern int processor_cntl_xen(void);
-+extern int processor_cntl_xen_pm(void);
-+extern int processor_cntl_xen_pmperf(void);
-+extern int processor_cntl_xen_pmthr(void);
 +extern int processor_cntl_xen_notify(struct acpi_processor *pr,
 +			int event, int type);
 +extern int processor_cntl_xen_power_cache(int cpu, int cx,
 +		struct acpi_power_register *reg);
 +#else
 +
-+static inline int processor_cntl_xen(void) { return 0; }
-+static inline int processor_cntl_xen_pm(void) { return 0; }
-+static inline int processor_cntl_xen_pmperf(void) { return 0; }
-+static inline int processor_cntl_xen_pmthr(void) { return 0; }
 +static inline int processor_cntl_xen_notify(struct acpi_processor *pr,
 +			int event, int type)
 +{
@@ -40005,10 +40524,10 @@ index cd69391..ac5de37 100644
   * hypercall since 0x00030202.
 diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h
 new file mode 100644
-index 0000000..14df81d
+index 0000000..17ae622
 --- /dev/null
 +++ b/include/xen/interface/platform.h
-@@ -0,0 +1,363 @@
+@@ -0,0 +1,381 @@
 +/******************************************************************************
 + * platform.h
 + *
@@ -40348,6 +40867,22 @@ index 0000000..14df81d
 +typedef struct xenpf_cpu_ol xenpf_cpu_ol_t;
 +DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol_t);
 +
++#define XENPF_cpu_hotadd    58
++struct xenpf_cpu_hotadd {
++	uint32_t apic_id;
++	uint32_t acpi_id;
++	uint32_t pxm;
++};
++
++
++#define XENPF_mem_hotadd    59
++struct xenpf_mem_hotadd {
++	uint64_t spfn;
++	uint64_t epfn;
++	uint32_t pxm;
++	uint32_t flags;
++};
++
 +struct xen_platform_op {
 +	uint32_t cmd;
 +	uint32_t interface_version; /* XENPF_INTERFACE_VERSION */
@@ -40365,6 +40900,8 @@ index 0000000..14df81d
 +		struct xenpf_set_processor_pminfo set_pminfo;
 +		struct xenpf_pcpuinfo          pcpu_info;
 +		struct xenpf_cpu_ol            cpu_ol;
++		struct xenpf_cpu_hotadd        cpu_add;
++		struct xenpf_mem_hotadd        mem_add;
 +		uint8_t                        pad[128];
 +	} u;
 +};
@@ -41393,7 +41930,7 @@ index 0ec9ed8..07a11dc 100644
  		desc->status |= IRQ_SUSPENDED;
  	}
 diff --git a/kernel/sched.c b/kernel/sched.c
-index 1b59e26..3982e8e 100644
+index 81ede13..6318600 100644
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
 @@ -1951,6 +1951,12 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)
@@ -41578,7 +42115,7 @@ index cbb7cb3..8118015 100644
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 0b3c6cb..49ec6c9 100644
+index 957b551..dedf237 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -566,6 +566,13 @@ static void __free_pages_ok(struct page *page, unsigned int order)
@@ -41610,7 +42147,7 @@ index 0b3c6cb..49ec6c9 100644
  		page->mapping = NULL;
  	if (free_pages_check(page))
 diff --git a/net/core/dev.c b/net/core/dev.c
-index a2f575b..55321e4 100644
+index 4225097..26a86a6 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
 @@ -96,6 +96,9 @@
@@ -41623,7 +42160,7 @@ index a2f575b..55321e4 100644
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
-@@ -1686,7 +1689,11 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
+@@ -1687,7 +1690,11 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
  	int rc;
  
  	if (likely(!skb->next)) {
@@ -41636,7 +42173,7 @@ index a2f575b..55321e4 100644
  			dev_queue_xmit_nit(skb, dev);
  
  		if (netif_needs_gso(dev, skb)) {
-@@ -1771,8 +1778,7 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)
+@@ -1772,8 +1779,7 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)
  }
  EXPORT_SYMBOL(skb_tx_hash);
  
@@ -41646,7 +42183,7 @@ index a2f575b..55321e4 100644
  {
  	const struct net_device_ops *ops = dev->netdev_ops;
  	u16 queue_index = 0;
-@@ -1785,6 +1791,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
+@@ -1786,6 +1792,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
  	skb_set_queue_mapping(skb, queue_index);
  	return netdev_get_tx_queue(dev, queue_index);
  }
@@ -41655,7 +42192,7 @@ index a2f575b..55321e4 100644
  /**
   *	dev_queue_xmit - transmit a buffer
 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 9e0597d..98e73ff 100644
+index 79ae895..f1b6b41 100644
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
 @@ -72,6 +72,9 @@
@@ -41775,7 +42312,7 @@ index 9e0597d..98e73ff 100644
  	new->local_df		= old->local_df;
  	new->pkt_type		= old->pkt_type;
  	new->ip_summed		= old->ip_summed;
-@@ -2778,6 +2867,13 @@ void __init skb_init(void)
+@@ -2779,6 +2868,13 @@ void __init skb_init(void)
  						0,
  						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
  						NULL);


--- crypto-via-padlock-fix-nano-aes.patch DELETED ---


--- drm-conservative-fallback-modes.patch DELETED ---


--- drm-default-mode.patch DELETED ---


--- drm-edid-header-fixup.patch DELETED ---


--- drm-edid-retry.patch DELETED ---


--- drm-i915-fix-sync-to-vbl-when-vga-is-off.patch DELETED ---


--- highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch DELETED ---


--- highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch DELETED ---


--- highmem-fix-arm-powerpc-kmap_types.patch DELETED ---


--- ipv4-fix-null-ptr-deref-in-ip_fragment.patch DELETED ---


--- patch-2.6.31.6.bz2.sign DELETED ---



From akurtakov at fedoraproject.org  Wed Dec 23 21:17:23 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 21:17:23 +0000 (UTC)
Subject: rpms/plexus-interpolation/devel plexus-interpolation.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223211723.2565E11C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-interpolation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31243/devel

Modified Files:
	.cvsignore sources 
Added Files:
	plexus-interpolation.spec 
Log Message:
Initial import.


--- NEW FILE plexus-interpolation.spec ---
Name:           plexus-interpolation
Version:        1.13
Release:        2%{?dist}
Summary:        Plexus Interpolation API

Group:          Development/Libraries
License:        ASL 2.0 and ASL 1.1 and MIT
URL:            http://plexus.codehaus.org/plexus-components/plexus-interpolation
#svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interpolation-1.13/
#tar cjf plexus-interpolation-1.13.tar.bz2 plexus-interpolation-1.13/
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: java-devel
BuildRequires: junit
BuildRequires: maven2
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-maven-plugin

%description
Plexus interpolator is the outgrowth of multiple iterations of development
focused on providing a more modular, flexible interpolation framework for 
the expression language style commonly seen in Maven, Plexus, and other 
related projects.

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.


%prep
%setup -q 

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/plexus
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/interpolation-%{version}.jar

(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap org.codehaus.plexus plexus-interpolation %{version} JPP/plexus interpolation

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/plexus/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1.13-2
- Fix review comments.

* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1.13-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-interpolation/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:39:36 -0000	1.1
+++ .cvsignore	23 Dec 2009 21:17:22 -0000	1.2
@@ -0,0 +1 @@
+plexus-interpolation-1.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-interpolation/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:39:36 -0000	1.1
+++ sources	23 Dec 2009 21:17:23 -0000	1.2
@@ -0,0 +1 @@
+f47ea8c8a53a0be53c55f5a16e8615ff  plexus-interpolation-1.13.tar.bz2



From akurtakov at fedoraproject.org  Wed Dec 23 21:25:04 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 21:25:04 +0000 (UTC)
Subject: File maven-archiver-2.4-src.tar.bz2 uploaded to lookaside cache by
	akurtakov
Message-ID: <20091223212504.2711110F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for maven-archiver:

68294b974653b0cf6392a5bc91a56a57  maven-archiver-2.4-src.tar.bz2



From akurtakov at fedoraproject.org  Wed Dec 23 21:27:59 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 21:27:59 +0000 (UTC)
Subject: rpms/maven-archiver/devel sources, 1.2, 1.3 maven-archiver.spec, 1.2, 
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <20091223212759.BDCD511C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv584/devel

Modified Files:
	sources maven-archiver.spec .cvsignore 
Log Message:
Update to 2.4.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-archiver/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Sep 2009 07:47:00 -0000	1.2
+++ sources	23 Dec 2009 21:27:59 -0000	1.3
@@ -1 +1 @@
-f8677c83f40badb5b81e1ae5c6fe4d69  maven-archiver-2.2-src.tgz
+68294b974653b0cf6392a5bc91a56a57  maven-archiver-2.4-src.tar.bz2


Index: maven-archiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-archiver/devel/maven-archiver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- maven-archiver.spec	21 Dec 2009 16:29:47 -0000	1.2
+++ maven-archiver.spec	23 Dec 2009 21:27:59 -0000	1.3
@@ -31,8 +31,8 @@
 %define namedversion 1.0-alpha-7
 
 Name:           maven-archiver
-Version:        2.2
-Release:        3%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Maven Archiver
 License:        ASL 2.0
@@ -40,11 +40,10 @@ Group:          Development/Libraries
 URL:            http://maven.apache.org/
 
 # svn export \
-# https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.2 \
+# https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.4 \
 # maven-archiver
-# Note: Exported revision 776866.
-# tar czf maven-archiver-2.2-src.tgz maven-archiver/
-Source0:        %{name}-%{version}-src.tgz
+# tar cjf maven-archiver-2.4-src.tar.bz2 maven-archiver/
+Source0:        %{name}-%{version}-src.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,10 +59,15 @@ BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-site
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  maven-doxia-sitetools
+BuildRequires:  plexus-interpolation
 BuildRequires:  plexus-archiver >= 1.0-0.1.a7
+BuildRequires:  plexus-utils
 
 Requires:       maven2 >= 0:2.0.4-9
 Requires:       plexus-archiver >= 1.0-0.1.a7
+Requires:       plexus-interpolation
+Requires:       plexus-utils
 
 Requires(post):   jpackage-utils >= 0:1.7.2
 Requires(postun): jpackage-utils >= 0:1.7.2
@@ -90,6 +94,7 @@ mkdir -p $MAVEN_REPO_LOCAL
 mvn-jpp \
     -e \
     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+    -Dmaven.test.failure.ignore=true \
     install javadoc:javadoc
 
 
@@ -128,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.4-1
+- Update to 2.4.
+
 * Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.2-3
 - BR maven-surefire-provider-junit.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-archiver/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Sep 2009 07:47:01 -0000	1.2
+++ .cvsignore	23 Dec 2009 21:27:59 -0000	1.3
@@ -1 +1,2 @@
 maven-archiver-2.2-src.tgz
+maven-archiver-2.4-src.tar.bz2



From tomspur at fedoraproject.org  Wed Dec 23 21:34:22 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 21:34:22 +0000 (UTC)
Subject: rpms/python-daemon/devel python-daemon.spec,1.5,1.6
Message-ID: <20091223213422.974C811C00EF@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1783

Modified Files:
	python-daemon.spec 
Log Message:
add missing BR: python-nose


Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/python-daemon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-daemon.spec	23 Dec 2009 20:25:07 -0000	1.5
+++ python-daemon.spec	23 Dec 2009 21:34:22 -0000	1.6
@@ -14,7 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
-BuildRequires:  python-lockfile python-minimock
+BuildRequires:  python-nose python-lockfile python-minimock
 
 %description
 This library implements the well-behaved daemon specification of PEP 3143,
@@ -50,6 +50,7 @@ PYTHONPATH=$(pwd) nosetests
 
 %changelog
 * Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.2-1
+- add missing BR: python-nose
 - update to 1.5.2
 
 * Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.1-2



From arbiter at fedoraproject.org  Wed Dec 23 21:39:05 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Wed, 23 Dec 2009 21:39:05 +0000 (UTC)
Subject: File cherokee-0.99.37.tar.gz uploaded to lookaside cache by arbiter
Message-ID: <20091223213905.30D8010F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cherokee:

05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz



From arbiter at fedoraproject.org  Wed Dec 23 21:39:54 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Wed, 23 Dec 2009 21:39:54 +0000 (UTC)
Subject: rpms/cherokee/devel .cvsignore, 1.15, 1.16 cherokee.spec, 1.25,
	1.26 sources, 1.15, 1.16
Message-ID: <20091223213954.3FFC811C00EF@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2717

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
- 0.99.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	3 Dec 2009 15:15:52 -0000	1.15
+++ .cvsignore	23 Dec 2009 21:39:54 -0000	1.16
@@ -1 +1 @@
-cherokee-0.99.31.tar.gz
+cherokee-0.99.37.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- cherokee.spec	3 Dec 2009 15:15:52 -0000	1.25
+++ cherokee.spec	23 Dec 2009 21:39:54 -0000	1.26
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.31
+Version:        0.99.37
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
+- 0.99.37
+
 * Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
 - New upstream release: 0.99.31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	3 Dec 2009 15:15:52 -0000	1.15
+++ sources	23 Dec 2009 21:39:54 -0000	1.16
@@ -1 +1 @@
-e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz
+05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz



From chkr at fedoraproject.org  Wed Dec 23 21:40:38 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 23 Dec 2009 21:40:38 +0000 (UTC)
Subject: File mono-2.4.3.tar.bz2 uploaded to lookaside cache by chkr
Message-ID: <20091223214038.5965610F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mono:

32d76ff066a5c69f40ee0e5c6229be01  mono-2.4.3.tar.bz2



From tomspur at fedoraproject.org  Wed Dec 23 21:41:20 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 21:41:20 +0000 (UTC)
Subject: rpms/python-daemon/devel python-daemon.spec,1.6,1.7
Message-ID: <20091223214120.D1CA111C00EF@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3105

Modified Files:
	python-daemon.spec 
Log Message:
no file "TODO" in upstream tarball anymore


Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/python-daemon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-daemon.spec	23 Dec 2009 21:34:22 -0000	1.6
+++ python-daemon.spec	23 Dec 2009 21:41:20 -0000	1.7
@@ -44,7 +44,7 @@ PYTHONPATH=$(pwd) nosetests
 
 %files
 %defattr(-,root,root,-)
-%doc TODO LICENSE.PSF-2
+%doc LICENSE.PSF-2
 %{python_sitelib}/daemon/
 %{python_sitelib}/python_daemon-%{version}-py%{pyver}.egg-info/
 



From sdz at fedoraproject.org  Wed Dec 23 21:47:27 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 21:47:27 +0000 (UTC)
Subject: File TurtleArt-81.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091223214727.2332A10F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar-turtleart:

6f8485f1eaa609a7556530c747bbe827  TurtleArt-81.tar.bz2



From tomspur at fedoraproject.org  Wed Dec 23 21:50:07 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Wed, 23 Dec 2009 21:50:07 +0000 (UTC)
Subject: rpms/python-daemon/devel python-daemon.spec,1.7,1.8
Message-ID: <20091223215007.38B4C11C00EF@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4632

Modified Files:
	python-daemon.spec 
Log Message:
add python-lockfile as R (bug #513546)


Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/python-daemon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-daemon.spec	23 Dec 2009 21:41:20 -0000	1.7
+++ python-daemon.spec	23 Dec 2009 21:50:07 -0000	1.8
@@ -15,6 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
 BuildRequires:  python-nose python-lockfile python-minimock
+Requires:       python-lockfile
 
 %description
 This library implements the well-behaved daemon specification of PEP 3143,
@@ -51,6 +52,7 @@ PYTHONPATH=$(pwd) nosetests
 %changelog
 * Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.2-1
 - add missing BR: python-nose
+- also add lockfile as R (bug #513546)
 - update to 1.5.2
 
 * Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.1-2



From chkr at fedoraproject.org  Wed Dec 23 21:51:02 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 23 Dec 2009 21:51:02 +0000 (UTC)
Subject: rpms/mono/F-12 lc, NONE, 1.1 mono.snk, NONE, 1.1 .cvsignore, 1.44,
	1.45 mono.spec, 1.140, 1.141 sources, 1.57, 1.58
Message-ID: <20091223215102.43D8A11C00EF@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/mono/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4993

Modified Files:
	.cvsignore mono.spec sources 
Added Files:
	lc mono.snk 
Log Message:
* Wed Dec 23 2009 Christian Krause <chkr at fedoraproject.org> - 2.4.3-1
- Update to 2.4.3
- Drop mono-242-metadata-appconf.patch (fixed upstream)
- package mono.snk for packages without bundled keys to use
- put mono.snk in /etc/pki/mono/
- package /etc/pki/mono/* in mono-devel
- change %gac_dll macro to be more specific about the files to package
  (necessary to correctly select all files for the moonlight subpackage
  without any dangling symlinks)



--- NEW FILE lc ---
#!/bin/sh
exec /usr/bin/mono $MONO_OPTIONS `/usr/bin/monodir`/2.0/lc.exe "$@"


--- NEW FILE mono.snk ---

?&??B?O???r????Fn??	??L?}r??
?IE??*z]?oRn?l??{Ma2?,Yd???~?????Da`}????aTP????`??&??)??r??Hxw????a+?T????LG2p+??F?8J??}^pn???#????9??;?2Cg?D??&1d?!?/Wx}????p?2B???B?	H>?4-?"??5\ ?Z?J?7???T??.?<?"-!__)}?????MMr???0n??c?
*?m???9X?H??$N???t?@?q??C??&0?Q?1?'-s???cv1*<O
/p?euS?r?"????7?n????u?(^??4m??p>/ ^S??7?qG??1|+?J>?-Y??7?.}n?HuH?$??H??l?H?????J?f
lO?????E??7]R?`>lW????
?????_??4?I??????????p???o?y???E}??A?5&??c??XL??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-12/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	29 Jul 2009 22:22:57 -0000	1.44
+++ .cvsignore	23 Dec 2009 21:51:02 -0000	1.45
@@ -1 +1 @@
-mono-2.4.2.3.tar.bz2
+mono-2.4.3.tar.bz2


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-12/mono.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- mono.spec	25 Aug 2009 07:02:01 -0000	1.140
+++ mono.spec	23 Dec 2009 21:51:02 -0000	1.141
@@ -1,8 +1,8 @@
 #%define svnver 138447
 
 Name:           mono
-Version:        2.4.2.3
-Release:        2%{?dist}
+Version:        2.4.3
+Release:        1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -10,8 +10,14 @@ License:        MIT
 URL:            http://www.mono-project.com/Main_Page
 # Prereleases are available here
 # http://mono.ximian.com/monobuild/preview/sources-preview/
-Source0:        http://mono.ximian.com/monobuild/snapshot/sources-trunk/%name-%version.tar.bz2
+Source0:        http://ftp.novell.com/pub/mono/sources/mono/%name-%version.tar.bz2
 Source1:        monodir.c
+# This key was generated by Tom "spot" Callaway <tcallawa at redhat.com> on Dec 1, 2009
+# by running the following command:
+# sn -k mono.snk
+# You should not regenerate this unless you have a really, really, really good reason.
+Source2:        mono.snk
+Source3:        lc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison 
@@ -46,7 +52,6 @@ Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.0-metadata-makefile.patch
 Patch6: mono-242-libgdiplusconfig.patch
 Patch7: mono-22-libdir.patch
-Patch8: mono-242-metadata-appconf.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -272,11 +277,9 @@ Requires:       mono-core = %{version}-%
 mono-moonlight are all the parts required for moonlight compilation
 
 %define monodir %{_libdir}/mono
-%define gac_dll(dll)  %{monodir}/gac/%{1} \
-  %{monodir}/?.0/%{1}.dll \
-  %{nil}
-%define moon_dll(dll) %{monodir}/gac/%{1} \
-  %{monodir}/2.1/%{1}.dll \
+%define gac_dll(mv, gv, name) %dir %{monodir}/gac/%{3} \
+  %{monodir}/gac/%{3}/%{2} \
+  %{monodir}/%{1}/%{3}.dll \
   %{nil}
 %define mono_bin(bin) %{_bindir}/%{1} \
   %{monodir}/?.0/%{1}.exe \
@@ -300,8 +303,7 @@ mono-moonlight are all the parts require
 %patch3 -p1 -b .uselibdir
 %patch4 -p1 -b .monoservice
 %patch5 -p1 -b .metadata-makefile
-%patch8 -p1 -b .metadata-appconf
-%patch6 -p1 -b .libgdiplus
+%patch6 -p1 -F 2 -b .libgdiplus
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
@@ -338,6 +340,12 @@ make
 make DESTDIR=%{buildroot} install
 install monodir %{buildroot}%{_bindir}
 
+# copy the mono.snk key into /etc/pki/mono
+mkdir -p %{buildroot}%{_sysconfdir}/pki/mono
+install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
+
+install -m 755 %{SOURCE3} %{buildroot}%{_bindir}/
+
 %{__rm} %{buildroot}%{_libdir}/*.la
 %{__rm} %{buildroot}%{_libdir}/*.a
 
@@ -394,7 +402,7 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin mozroots
 %mono_bin setreg
 %mono_bin sn
-%{monodir}/2.0/System.Xml.Linq.dll
+%mono_bin lc
 %{_libdir}/libmono.so.*
 %{_libdir}/libmono-profiler-logging.so.*
 %{_mandir}/man1/certmgr.1.gz
@@ -414,33 +422,36 @@ install monodir %{buildroot}%{_bindir}
 %dir %{monodir}/3.5
 %dir %{monodir}/gac
 %dir %{monodir}/compat-*
-%gac_dll Commons.Xml.Relaxng
-%gac_dll I18N
-%gac_dll I18N.West
-%gac_dll ICSharpCode.SharpZipLib
+%gac_dll ?.0 * Commons.Xml.Relaxng
+%gac_dll ?.0 * I18N
+%gac_dll ?.0 * I18N.West
+%gac_dll ?.0 * ICSharpCode.SharpZipLib
 %{monodir}/compat-*/ICSharpCode.SharpZipLib.dll
 %{monodir}/gac/Mono.Cecil
 %{monodir}/gac/Mono.Cecil.Mdb
-%gac_dll cscompmgd
-%gac_dll CustomMarshalers
-%gac_dll Microsoft.VisualC
-%gac_dll Mono.C5
-%gac_dll Mono.Cairo
-%gac_dll Mono.CompilerServices.SymbolWriter
-%gac_dll Mono.CSharp
-%gac_dll System.Drawing
-%gac_dll Mono.GetOptions
-%gac_dll Mono.Management
-%gac_dll Mono.Posix
-%gac_dll Mono.Security
-%gac_dll Mono.Simd
-%gac_dll OpenSystem.C
-%gac_dll System
-%gac_dll System.Configuration
-%gac_dll System.Core
-%gac_dll System.Security
-%gac_dll System.Xml
-%{monodir}/gac/System.Xml.Linq
+%gac_dll ?.0 * cscompmgd
+%gac_dll ?.0 * CustomMarshalers
+%gac_dll ?.0 * Microsoft.VisualC
+%gac_dll ?.0 * Mono.C5
+%gac_dll ?.0 * Mono.Cairo
+%gac_dll 1.0 1.0* Mono.CompilerServices.SymbolWriter
+%gac_dll 2.0 2.0.0* Mono.CompilerServices.SymbolWriter
+%gac_dll ?.0 * Mono.CSharp
+%gac_dll ?.0 * System.Drawing
+%gac_dll ?.0 * Mono.GetOptions
+%gac_dll ?.0 * Mono.Management
+%gac_dll ?.0 * Mono.Posix
+%gac_dll ?.0 * Mono.Security
+%gac_dll ?.0 * Mono.Simd
+%gac_dll ?.0 * OpenSystem.C
+%gac_dll 1.0 1.0* System
+%gac_dll 2.0 2.0.0* System
+%gac_dll ?.0 * System.Configuration
+%gac_dll ?.0 3.5.0* System.Core
+%gac_dll ?.0 * System.Security
+%gac_dll 1.0 1.0* System.Xml
+%gac_dll 2.0 2.0.0* System.Xml
+%gac_dll 2.0 3.5* System.Xml.Linq
 %{monodir}/?.0/mscorlib.dll
 %{monodir}/?.0/mscorlib.dll.mdb
 %dir %{_sysconfdir}/mono
@@ -455,6 +466,7 @@ install monodir %{buildroot}%{_bindir}
 
 %files devel
 %defattr(-,root,root,-)
+%{_sysconfdir}/pki/mono/
 %{_bindir}/mono-api-*
 %{monodir}/?.0/mono-api-info*
 %{_bindir}/monodis
@@ -504,6 +516,7 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/dtd2xsd.1.gz
 %{_mandir}/man1/genxs.1.gz
 %{_mandir}/man1/ilasm.1.gz
+%{_mandir}/man1/lc.1.gz
 %{_mandir}/man1/macpack.1.gz
 %{_mandir}/man1/makecert.1.gz
 %{_mandir}/man1/mkbundle.1.gz
@@ -518,16 +531,18 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/secutil.1.gz
 %{_mandir}/man1/sgen.1.gz
 %{_mandir}/man1/signcode.1.gz
-%gac_dll PEAPI
-%gac_dll Microsoft.Build.Engine
-%gac_dll Microsoft.Build.Framework
-%gac_dll Microsoft.Build.Tasks
-%gac_dll Microsoft.Build.Utilities
+%{_mandir}/man1/xbuild.1.gz
+%gac_dll ?.0 * PEAPI
+%gac_dll ?.0 * Microsoft.Build.Engine
+%gac_dll ?.0 * Microsoft.Build.Framework
+%gac_dll ?.0 * Microsoft.Build.Tasks
+%gac_dll ?.0 * Microsoft.Build.Utilities
 %{monodir}/2.0/MSBuild
 %{monodir}/2.0/Microsoft.Build.xsd
 %{monodir}/2.0/Microsoft.*.targets
 %{monodir}/2.0/Microsoft.Common.tasks
 %{monodir}/2.0/xbuild.rsp
+%{monodir}/xbuild
 %{_bindir}/monograph
 %{_libdir}/libmono-profiler-aot.*
 %{_libdir}/libmono-profiler-cov.*
@@ -554,29 +569,29 @@ install monodir %{buildroot}%{_bindir}
 %defattr(-,root,root,-)
 %{_libdir}/mono/2.1/*.mdb
 %{_libdir}/mono/2.1/smcs.exe
-%{_libdir}/mono/2.1/Mono.CompilerServices.SymbolWriter.dll
-%{_libdir}/mono/2.1/System.Core.dll
-%{_libdir}/mono/2.1/System.Runtime.Serialization.dll
-%{_libdir}/mono/2.1/System.ServiceModel.Web.dll
-%{_libdir}/mono/2.1/System.ServiceModel.dll
-%{_libdir}/mono/2.1/System.Xml.Linq.dll
-%{_libdir}/mono/2.1/System.Xml.dll
-%{_libdir}/mono/2.1/System.dll
-%{_libdir}/mono/2.1/mscorlib.dll
-%moon_dll System.Net
+%gac_dll 2.1 2.0.5* Mono.CompilerServices.SymbolWriter
+%gac_dll 2.1 2.0.5* System.Net
+%gac_dll 2.1 2.0.5* System.Xml
+%gac_dll 2.1 2.0.5* System.Xml.Linq
+%gac_dll 2.1 2.0.5* System.Core
+%gac_dll 2.1 2.0.5* System.Runtime.Serialization
+%gac_dll 2.1 2.0.5* System.ServiceModel.Web
+%gac_dll 2.1 2.0.5* System.ServiceModel
+%gac_dll 2.1 2.0.5* System
+%{_libdir}/mono/2.1/mscorlib*
 
 %files nunit
 %defattr(-,root,root,-)
 %mono_bin_1 nunit-console nunit-console
 %mono_bin_2 nunit-console2 nunit-console
-%gac_dll nunit.core
-%gac_dll nunit.framework
-%gac_dll nunit.util
-%gac_dll nunit.mocks
-%gac_dll nunit-console-runner
-%gac_dll nunit.core.extensions
-%gac_dll nunit.core.interfaces
-%gac_dll nunit.framework.extensions
+%gac_dll ?.0 * nunit.core
+%gac_dll ?.0 * nunit.framework
+%gac_dll ?.0 * nunit.util
+%gac_dll ?.0 * nunit.mocks
+%gac_dll ?.0 * nunit-console-runner
+%gac_dll ?.0 * nunit.core.extensions
+%gac_dll ?.0 * nunit.core.interfaces
+%gac_dll ?.0 * nunit.framework.extensions
 
 %files nunit-devel
 %defattr(-,root,root,-)
@@ -584,15 +599,15 @@ install monodir %{buildroot}%{_bindir}
 
 %files locale-extras
 %defattr(-,root,root,-)
-%gac_dll I18N.MidEast
-%gac_dll I18N.Rare
-%gac_dll I18N.CJK
-%gac_dll I18N.Other
+%gac_dll ?.0 * I18N.MidEast
+%gac_dll ?.0 * I18N.Rare
+%gac_dll ?.0 * I18N.CJK
+%gac_dll ?.0 * I18N.Other
 
 %files jscript
 %defattr(-,root,root,-)
 %mono_bin mjs
-%gac_dll Microsoft.JScript
+%gac_dll ?.0 * Microsoft.JScript
 
 %files extras
 %defattr(-,root,root,-)
@@ -600,40 +615,40 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin_1 mono-service mono-service
 %mono_bin_2 mono-service2 mono-service
 %{monodir}/gac/mono-service
-%gac_dll System.Configuration.Install
-%gac_dll System.Management
-%gac_dll System.Messaging
-%gac_dll System.ServiceProcess
-%gac_dll Microsoft.Vsa
-%gac_dll Mono.Messaging.RabbitMQ
-%gac_dll Mono.Messaging
-%gac_dll RabbitMQ.Client
+%gac_dll ?.0 * System.Configuration.Install
+%gac_dll ?.0 * System.Management
+%gac_dll ?.0 * System.Messaging
+%gac_dll ?.0 * System.ServiceProcess
+%gac_dll ?.0 * Microsoft.Vsa
+%gac_dll ?.0 * Mono.Messaging.RabbitMQ
+%gac_dll ?.0 * Mono.Messaging
+%gac_dll ?.0 * RabbitMQ.Client
 
 %files wcf
 %defattr(-, root, root, -)
-%gac_dll System.IdentityModel
-%gac_dll System.IdentityModel.Selectors
-%gac_dll System.Runtime.Serialization
-%gac_dll System.ServiceModel
-%gac_dll System.ServiceModel.Web
+%gac_dll ?.0 * System.IdentityModel
+%gac_dll ?.0 * System.IdentityModel.Selectors
+%gac_dll 2.0 3.0* System.Runtime.Serialization
+%gac_dll ?.0 3.0* System.ServiceModel
+%gac_dll 2.0 3.0* System.ServiceModel.Web
 
 %files web
 %defattr(-,root,root,-)
-%gac_dll Mono.Http
-%gac_dll Mono.Web
-%gac_dll System.ComponentModel.DataAnnotations
-%gac_dll System.Runtime.Remoting
-%gac_dll System.Runtime.Serialization.Formatters.Soap
-%gac_dll System.Web
-%gac_dll System.Web.Abstractions
-%gac_dll System.Web.DynamicData
-%gac_dll System.Web.Extensions
-%gac_dll System.Web.Extensions.Design
+%gac_dll ?.0 * Mono.Http
+%gac_dll ?.0 * Mono.Web
+%gac_dll ?.0 * System.ComponentModel.DataAnnotations
+%gac_dll ?.0 * System.Runtime.Remoting
+%gac_dll ?.0 * System.Runtime.Serialization.Formatters.Soap
+%gac_dll ?.0 * System.Web
+%gac_dll ?.0 * System.Web.Abstractions
+%gac_dll ?.0 * System.Web.DynamicData
+%gac_dll ?.0 * System.Web.Extensions
+%gac_dll ?.0 * System.Web.Extensions.Design
 %{monodir}/compat-2.0/System.Web.Extensions*dll
 %{monodir}/3.5/System.Web.Extensions*
-%gac_dll System.Web.Mvc
-%gac_dll System.Web.Routing
-%gac_dll System.Web.Services
+%gac_dll ?.0 * System.Web.Mvc
+%gac_dll ?.0 * System.Web.Routing
+%gac_dll ?.0 * System.Web.Services
 %mono_bin disco
 %mono_bin mconfig
 %mono_bin soapsuds
@@ -660,73 +675,73 @@ install monodir %{buildroot}%{_bindir}
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/mono.web.pc
 %{_libdir}/pkgconfig/system.web.extensions_1.0.pc
+%{_libdir}/pkgconfig/system.web.mvc.pc
 %{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
 
 %files winforms
 %defattr(-,root,root,-)
-%gac_dll Accessibility
-%gac_dll System.Design
-%gac_dll System.Drawing.Design
-%gac_dll System.Windows.Forms
+%gac_dll ?.0 * Accessibility
+%gac_dll ?.0 * System.Design
+%gac_dll ?.0 * System.Drawing.Design
+%gac_dll ?.0 * System.Windows.Forms
 # Put here temporarily to break dependency issues
 # (cf. openSUSE packaging). Will be fixed post 1.2.5
-%gac_dll Mono.WebBrowser
+%gac_dll ?.0 * Mono.WebBrowser
 
 %files data
 %defattr(-,root,root,-)
 %mono_bin sqlsharp
 %{_mandir}/man1/sqlsharp.1.gz
-%gac_dll System.Data
-%gac_dll System.Data.DataSetExtensions
-%gac_dll System.Data.Linq
-%gac_dll Mono.Data
-%gac_dll Mono.Data.Tds
-%gac_dll Mono.Data.TdsClient
-%gac_dll System.EnterpriseServices
-%gac_dll Novell.Directory.Ldap
-%gac_dll System.DirectoryServices
-%gac_dll System.Transactions
+%gac_dll ?.0 * System.Data
+%gac_dll ?.0 * System.Data.DataSetExtensions
+%gac_dll 2.0 * System.Data.Linq
+%gac_dll ?.0 * Mono.Data
+%gac_dll ?.0 * Mono.Data.Tds
+%gac_dll ?.0 * Mono.Data.TdsClient
+%gac_dll ?.0 * System.EnterpriseServices
+%gac_dll ?.0 * Novell.Directory.Ldap
+%gac_dll ?.0 * System.DirectoryServices
+%gac_dll ?.0 * System.Transactions
 
 %files data-sqlite
 %defattr(-,root,root,-)
-%gac_dll Mono.Data.SqliteClient
-%gac_dll Mono.Data.Sqlite
+%gac_dll ?.0 * Mono.Data.SqliteClient
+%gac_dll ?.0 * Mono.Data.Sqlite
 
 %files data-sybase
 %defattr(-,root,root,-)
-%gac_dll Mono.Data.SybaseClient
+%gac_dll ?.0 * Mono.Data.SybaseClient
 
 %files data-oracle
 %defattr(-,root,root,-)
-%gac_dll System.Data.OracleClient
+%gac_dll ?.0 * System.Data.OracleClient
 
 %files data-postgresql
 %defattr(-,root,root,-)
-%gac_dll Npgsql
+%gac_dll ?.0 * Npgsql
 
 %files data-firebird
 %defattr(-,root,root,-)
-%gac_dll FirebirdSql.Data.Firebird
+%gac_dll ?.0 * FirebirdSql.Data.Firebird
 
 %files -n bytefx-data-mysql
 %defattr(-,root,root,-)
-%gac_dll ByteFX.Data
+%gac_dll ?.0 * ByteFX.Data
 
 %files -n ibm-data-db2
 %defattr(-,root,root,-)
-%gac_dll IBM.Data.DB2
+%gac_dll ?.0 * IBM.Data.DB2
 
 %files -n monodoc
 %defattr(-, root, root)
 %{_libdir}/mono/gac/monodoc
 %{_libdir}/monodoc/*
-%{_libdir}/mono/monodoc/monodoc.dll
+%{_libdir}/mono/monodoc
 %mono_bin mdoc
 %mono_bin mod
 %{_bindir}/mdoc-*
 %{_bindir}/mdass*
 %{_bindir}/mdval*
-%{_bindir}/mod
 %{_bindir}/monodoc*
 %{_mandir}/man1/md*
 %{_mandir}/man1/monodoc*
@@ -737,6 +752,16 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Wed Dec 23 2009 Christian Krause <chkr at fedoraproject.org> - 2.4.3-1
+- Update to 2.4.3
+- Drop mono-242-metadata-appconf.patch (fixed upstream)
+- package mono.snk for packages without bundled keys to use
+- put mono.snk in /etc/pki/mono/
+- package /etc/pki/mono/* in mono-devel
+- change %%gac_dll macro to be more specific about the files to package
+  (necessary to correctly select all files for the moonlight subpackage
+  without any dangling symlinks)
+
 * Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 2.4.2.3-2
 - Rearrange assemblies to properly fix bz 434709:
   * mono-core can now be installed on its own, no longer pulling in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-12/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	29 Jul 2009 22:22:57 -0000	1.57
+++ sources	23 Dec 2009 21:51:02 -0000	1.58
@@ -1 +1 @@
-696f25afc8453cd0d1c78de6e905dcf2  mono-2.4.2.3.tar.bz2
+32d76ff066a5c69f40ee0e5c6229be01  mono-2.4.3.tar.bz2



From sdz at fedoraproject.org  Wed Dec 23 21:52:43 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 23 Dec 2009 21:52:43 +0000 (UTC)
Subject: rpms/sugar-turtleart/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 sugar-turtleart.spec, 1.12, 1.13
Message-ID: <20091223215243.AC5B211C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-turtleart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5317

Modified Files:
	.cvsignore sources sugar-turtleart.spec 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	14 Sep 2009 16:49:49 -0000	1.10
+++ .cvsignore	23 Dec 2009 21:52:43 -0000	1.11
@@ -1 +1 @@
-TurtleArt-65.tar.bz2
+TurtleArt-81.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	14 Sep 2009 16:49:49 -0000	1.10
+++ sources	23 Dec 2009 21:52:43 -0000	1.11
@@ -1 +1 @@
-7b392815c01892999b914f0aa29349e4  TurtleArt-65.tar.bz2
+6f8485f1eaa609a7556530c747bbe827  TurtleArt-81.tar.bz2


Index: sugar-turtleart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/devel/sugar-turtleart.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sugar-turtleart.spec	14 Sep 2009 16:49:49 -0000	1.12
+++ sugar-turtleart.spec	23 Dec 2009 21:52:43 -0000	1.13
@@ -1,5 +1,5 @@
 Name: sugar-turtleart
-Version: 65
+Version: 81
 Release: 1%{?dist}
 Summary: Turtle Art activity for sugar
 
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 23 2009 Sebastian Dziallas <sebastian at when.com> - 81-1
+- New upstream release
+
 * Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 65-1
 - new toolbar design
 - added help toolbar



From akurtakov at fedoraproject.org  Wed Dec 23 21:53:14 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 21:53:14 +0000 (UTC)
Subject: File plexus-archiver-1.0-alpha-12-src.tar.bz2 uploaded to lookaside
	cache by akurtakov
Message-ID: <20091223215314.7CFFE10F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for plexus-archiver:

3f756befd4d0d9fa12a4f10e510de563  plexus-archiver-1.0-alpha-12-src.tar.bz2



From akurtakov at fedoraproject.org  Wed Dec 23 21:54:06 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 21:54:06 +0000 (UTC)
Subject: rpms/plexus-archiver/devel plexus-archiver.spec, 1.6, 1.7 sources, 1.3,
	1.4 .cvsignore, 1.2, 1.3
Message-ID: <20091223215406.9A64211C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5702/devel

Modified Files:
	plexus-archiver.spec sources .cvsignore 
Log Message:
Update to alpha 12.


Index: plexus-archiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-archiver/devel/plexus-archiver.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- plexus-archiver.spec	26 Jul 2009 18:54:00 -0000	1.6
+++ plexus-archiver.spec	23 Dec 2009 21:54:06 -0000	1.7
@@ -28,46 +28,47 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%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 namedversion 1.0-alpha-7
+%define namedversion 1.0-alpha-12
 
 Name:           plexus-archiver
 Version:        1.0
-Release:        0.4.a7.1.2%{?dist}
+Release:        0.4.a12.1%{?dist}
 Epoch:          0
 Summary:        Plexus Archiver Component
 License:        MIT and ASL 2.0
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
-Source0:        plexus-archiver-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-archiver-%{namedversion} plexus-archiver
-# tar czvf plexus-archiver-src.tar.gz plexus-archiver
+Source0:        plexus-archiver-%{namedversion}-src.tar.bz2
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-archiver-1.0-alpha-12/
+# tar cjvf plexus-archiver-1.0-alpha-12-src.tar.bz2 plexus-archiver-1.0-alpha-12/
 Source1:        plexus-archiver-1.0-build.xml
 Source2:        plexus-archiver-1.0-project.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  classworlds >= 0:1.1
 BuildRequires:  plexus-container-default 
 BuildRequires:  plexus-utils 
+BuildRequires:  plexus-io
+BuildRequires: maven2
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-doxia-sitetools
+BuildRequires: plexus-maven-plugin
 Requires:       classworlds >= 0:1.1
 Requires:       plexus-container-default 
 Requires:       plexus-utils 
 Requires:       jpackage-utils
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
+Requires:       plexus-io
 
 %description
 The Plexus project seeks to create end-to-end developer tools for 
@@ -87,71 +88,55 @@ Javadoc for %{name}.
 
 
 %prep
-%setup -q -n plexus-archiver
-cp %{SOURCE1} build.xml
-cp %{SOURCE2} project.xml
+%setup -q -n plexus-archiver-%{namedversion}
 
-%build
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-plexus/container-default \
-plexus/utils \
+mkdir external_repo
+ln -s %{_javadir} external_repo/JPP
 
-ant jar javadoc
+%build
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mvn-jpp \
+        -e \
+        -Dmaven2.jpp.mode=true \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        install javadoc:javadoc
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{version}-alpha-3.jar \
+install -pm 644 target/%{name}-%{namedversion}.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/archiver-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
                   do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/archiver-1.0.jar.*
-%endif
-
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a12.1
+- Update to alpha 12.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a7.1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -181,4 +166,3 @@ fi
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a3.1jpp
 - First JPackage build
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-archiver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Jan 2008 16:45:12 -0000	1.3
+++ sources	23 Dec 2009 21:54:06 -0000	1.4
@@ -1 +1 @@
-008484d8d2224cb562b01216d4154756  plexus-archiver-src.tar.gz
+3f756befd4d0d9fa12a4f10e510de563  plexus-archiver-1.0-alpha-12-src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-archiver/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Mar 2007 14:55:00 -0000	1.2
+++ .cvsignore	23 Dec 2009 21:54:06 -0000	1.3
@@ -1 +1,2 @@
 plexus-archiver-src.tar.gz
+plexus-archiver-1.0-alpha-12-src.tar.bz2



From arbiter at fedoraproject.org  Wed Dec 23 21:55:40 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Wed, 23 Dec 2009 21:55:40 +0000 (UTC)
Subject: rpms/cherokee/F-12 .cvsignore, 1.14, 1.15 cherokee.spec, 1.25,
	1.26 sources, 1.15, 1.16
Message-ID: <20091223215540.624E611C00EF@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6019

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
- 0.99.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	3 Dec 2009 15:16:21 -0000	1.14
+++ .cvsignore	23 Dec 2009 21:55:40 -0000	1.15
@@ -1 +1 @@
-cherokee-0.99.31.tar.gz
+cherokee-0.99.37.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/cherokee.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- cherokee.spec	3 Dec 2009 15:16:21 -0000	1.25
+++ cherokee.spec	23 Dec 2009 21:55:40 -0000	1.26
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.31
+Version:        0.99.37
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
+- 0.99.37
+
 * Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
 - New upstream release: 0.99.31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	3 Dec 2009 15:16:21 -0000	1.15
+++ sources	23 Dec 2009 21:55:40 -0000	1.16
@@ -1 +1 @@
-e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz
+05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz



From arbiter at fedoraproject.org  Wed Dec 23 21:55:58 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Wed, 23 Dec 2009 21:55:58 +0000 (UTC)
Subject: rpms/cherokee/F-11 .cvsignore, 1.13, 1.14 cherokee.spec, 1.19,
	1.20 sources, 1.13, 1.14
Message-ID: <20091223215558.292EC11C00EF@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6175

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
- 0.99.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Dec 2009 15:16:07 -0000	1.13
+++ .cvsignore	23 Dec 2009 21:55:58 -0000	1.14
@@ -1 +1 @@
-cherokee-0.99.31.tar.gz
+cherokee-0.99.37.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/cherokee.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cherokee.spec	3 Dec 2009 15:16:07 -0000	1.19
+++ cherokee.spec	23 Dec 2009 21:55:58 -0000	1.20
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.31
+Version:        0.99.37
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
+- 0.99.37
+
 * Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
 - New upstream release: 0.99.31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Dec 2009 15:16:07 -0000	1.13
+++ sources	23 Dec 2009 21:55:58 -0000	1.14
@@ -1 +1 @@
-e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz
+05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz



From arbiter at fedoraproject.org  Wed Dec 23 21:56:08 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Wed, 23 Dec 2009 21:56:08 +0000 (UTC)
Subject: rpms/cherokee/EL-5 .cvsignore, 1.13, 1.14 cherokee.spec, 1.16,
	1.17 sources, 1.13, 1.14
Message-ID: <20091223215608.B4C9E11C00EF@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6267

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
- 0.99.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Dec 2009 15:17:32 -0000	1.13
+++ .cvsignore	23 Dec 2009 21:56:08 -0000	1.14
@@ -1 +1 @@
-cherokee-0.99.31.tar.gz
+cherokee-0.99.37.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/cherokee.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- cherokee.spec	3 Dec 2009 15:17:32 -0000	1.16
+++ cherokee.spec	23 Dec 2009 21:56:08 -0000	1.17
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.31
+Version:        0.99.37
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
+- 0.99.37
+
 * Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
 - New upstream release: 0.99.31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Dec 2009 15:17:32 -0000	1.13
+++ sources	23 Dec 2009 21:56:08 -0000	1.14
@@ -1 +1 @@
-e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz
+05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz



From linville at fedoraproject.org  Wed Dec 23 21:59:20 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 23 Dec 2009 21:59:20 +0000 (UTC)
Subject: rpms/rfkill/EL-5 rfkill-rhel5-sysfs-path-fix.patch, NONE,
	1.1 rfkill.spec, 1.3, 1.4
Message-ID: <20091223215920.EF44B11C00EF@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/rfkill/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6991

Modified Files:
	rfkill.spec 
Added Files:
	rfkill-rhel5-sysfs-path-fix.patch 
Log Message:
Use correct sysfs path in EL-5 for looking-up device names

rfkill-rhel5-sysfs-path-fix.patch:
 rfkill.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rfkill-rhel5-sysfs-path-fix.patch ---
diff -up rfkill-0.3/rfkill.c.orig rfkill-0.3/rfkill.c
--- rfkill-0.3/rfkill.c.orig	2009-12-23 16:18:34.000000000 -0500
+++ rfkill-0.3/rfkill.c	2009-12-23 16:18:48.000000000 -0500
@@ -70,7 +70,7 @@ static const char *get_name(__u32 idx)
 	int fd;
 
 	snprintf(filename, sizeof(filename) - 1,
-				"/sys/class/rfkill/rfkill%u/name", idx);
+				"/sys/bus/rfkill/devices/rfkill%u/name", idx);
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0)


Index: rfkill.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rfkill/EL-5/rfkill.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rfkill.spec	29 Sep 2009 17:58:36 -0000	1.3
+++ rfkill.spec	23 Dec 2009 21:59:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rfkill
 Version:        0.3
-Release:        3%{?dist}
+Release:        3.1%{?dist}
 Summary:        A tool for enabling and disabling wireless devices
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ Source0:        http://wireless.kernel.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         rfkill-default-install-to-PREFIX-sbin.patch
+Patch1:         rfkill-rhel5-sysfs-path-fix.patch
 
 %description
 rfkill is a simple tool for accessing the Linux rfkill device interface,
@@ -19,6 +20,7 @@ WLAN, Bluetooth and mobile broadband.
 %prep
 %setup -q
 %patch0 -p 1
+%patch1 -p 1
 
 
 %build
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 23 2009 John W. Linville <linville at tuxdriver.com> 0.3-3.1
+- Use correct sysfs path in EL-5 for looking-up device names
+
 * Tue Sep 29 2009 John W. Linville <linville at tuxdriver.com> 0.3-3
 - Install binary into /sbin to enable use during boot
 



From akurtakov at fedoraproject.org  Wed Dec 23 22:08:43 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 22:08:43 +0000 (UTC)
Subject: rpms/plexus-archiver/devel plexus-archiver.spec,1.7,1.8
Message-ID: <20091223220843.9FABD11C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8803/devel

Modified Files:
	plexus-archiver.spec 
Log Message:
- Ignore test failures.


Index: plexus-archiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-archiver/devel/plexus-archiver.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- plexus-archiver.spec	23 Dec 2009 21:54:06 -0000	1.7
+++ plexus-archiver.spec	23 Dec 2009 22:08:43 -0000	1.8
@@ -32,7 +32,7 @@
 
 Name:           plexus-archiver
 Version:        1.0
-Release:        0.4.a12.1%{?dist}
+Release:        0.4.a12.2%{?dist}
 Epoch:          0
 Summary:        Plexus Archiver Component
 License:        MIT and ASL 2.0
@@ -99,6 +99,7 @@ mvn-jpp \
         -e \
         -Dmaven2.jpp.mode=true \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven.test.failure.skip=true \
         install javadoc:javadoc
 
 
@@ -134,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 24 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a12.2
+- Ignore test failures.
+
 * Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a12.1
 - Update to alpha 12.
 



From arbiter at fedoraproject.org  Wed Dec 23 21:56:24 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Wed, 23 Dec 2009 21:56:24 +0000 (UTC)
Subject: rpms/cherokee/EL-4 .cvsignore, 1.11, 1.12 cherokee.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <20091223215624.2CC6311C00EF@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6475

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
- 0.99.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Dec 2009 16:50:08 -0000	1.11
+++ .cvsignore	23 Dec 2009 21:56:23 -0000	1.12
@@ -1 +1 @@
-cherokee-0.99.31.tar.gz
+cherokee-0.99.37.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/cherokee.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cherokee.spec	3 Dec 2009 16:50:08 -0000	1.15
+++ cherokee.spec	23 Dec 2009 21:56:23 -0000	1.16
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.31
+Version:        0.99.37
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
+- 0.99.37
+
 * Thu Dec  3 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.31-1
 - New upstream release: 0.99.31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Dec 2009 16:50:08 -0000	1.11
+++ sources	23 Dec 2009 21:56:24 -0000	1.12
@@ -1 +1 @@
-e10556941a4fd03a0dde5bc7ee3a60f6  cherokee-0.99.31.tar.gz
+05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz



From akurtakov at fedoraproject.org  Wed Dec 23 22:24:44 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 23 Dec 2009 22:24:44 +0000 (UTC)
Subject: rpms/plexus-archiver/devel plexus-archiver.spec,1.8,1.9
Message-ID: <20091223222444.E3E3311C00EF@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12461/devel

Modified Files:
	plexus-archiver.spec 
Log Message:
Really ignore test failures.


Index: plexus-archiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-archiver/devel/plexus-archiver.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- plexus-archiver.spec	23 Dec 2009 22:08:43 -0000	1.8
+++ plexus-archiver.spec	23 Dec 2009 22:24:44 -0000	1.9
@@ -32,7 +32,7 @@
 
 Name:           plexus-archiver
 Version:        1.0
-Release:        0.4.a12.2%{?dist}
+Release:        0.4.a12.3%{?dist}
 Epoch:          0
 Summary:        Plexus Archiver Component
 License:        MIT and ASL 2.0
@@ -99,7 +99,7 @@ mvn-jpp \
         -e \
         -Dmaven2.jpp.mode=true \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven.test.failure.skip=true \
+        -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
 
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 24 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a12.3
+- Really ignore test failures.
+
 * Thu Dec 24 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a12.2
 - Ignore test failures.
 



From kwright at fedoraproject.org  Wed Dec 23 22:25:22 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 22:25:22 +0000 (UTC)
Subject: rpms/symkey/devel import.log, NONE, 1.1 symkey.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223222522.B690511C00EF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/symkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12571/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log symkey.spec 
Log Message:
rawhide build of symkey: see 522272



--- NEW FILE import.log ---
symkey-1_3_0-4_fc13:HEAD:symkey-1.3.0-4.fc13.src.rpm:1261607029


--- NEW FILE symkey.spec ---
Name:           symkey
Version:        1.3.0
Release:        4%{?dist}
Summary:        Symmetric Key JNI Package
URL:            http://pki.fedoraproject.org/
License:        GPLv2 with exceptions
Group:          System Environment/Libraries

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant
BuildRequires:  bash
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils
BuildRequires:  jss >= 4.2.6
BuildRequires:  nspr-devel >= 4.6.99
BuildRequires:  nss-devel >= 3.12.3.99
BuildRequires:  pkgconfig

Requires:       java >= 1:1.6.0
Requires:       jpackage-utils
Requires:       jss >= 4.2.6
Requires:       nss >= 3.12.3.99

#rhel has no java on ppc
%if 0%{?rhel}
ExcludeArch:    ppc
%endif

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
The Symmetric Key Java Native Interface (JNI) package supplies various native
symmetric key operations to Java programs.

%prep

%setup -q -n %{name}-%{version}

%build
ant \
    -Dproduct.ui.flavor.prefix="" \
    -Dproduct.prefix="" \
    -Dproduct="%{name}" \
    -Dversion="%{version}"
%configure \
%ifarch ppc64 s390x sparc64 x86_64
    --enable-64bit \
%endif
    --libdir=%{_libdir}
make

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

## rearrange files to be in the desired native packaging layout
mkdir -p %{buildroot}%{_libdir}/%{name}/
mv %{buildroot}/opt/java/%{name}.jar %{buildroot}%{_libdir}/%{name}/%{name}-%{version}.jar
mv %{buildroot}%{_libdir}/lib%{name}.so %{buildroot}%{_libdir}/%{name}/lib%{name}.so
mkdir -p %{buildroot}%{_jnidir}/
cd %{buildroot}%{_jnidir} ; ln -s %{_libdir}/%{name}/%{name}-%{version}.jar %{name}.jar

## remove unwanted files
rm -rf %{buildroot}/opt
rm -rf %{buildroot}%{_libdir}/lib%{name}.la

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_jnidir}/*
%{_libdir}/%{name}/

%changelog
* Fri Nov 20 2009 Kevin Wright <kwright at redhat.com> - 1.3.0-4
- no java on rhel ppc
* Fri Oct 30 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #522272 -  New Package for Dogtag PKI: symkey
- Removed LICENSE logic from installation section
- Take ownership of library directory
* Tue Oct 27 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522272 -  New Package for Dogtag PKI: symkey
- Complied with Fedora JNI packaging logic
* Mon Oct 12 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
- Bugzilla Bug #522272 -  New Package for Dogtag PKI: symkey


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/symkey/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Nov 2009 21:33:45 -0000	1.1
+++ .cvsignore	23 Dec 2009 22:25:22 -0000	1.2
@@ -0,0 +1 @@
+symkey-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/symkey/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Nov 2009 21:33:45 -0000	1.1
+++ sources	23 Dec 2009 22:25:22 -0000	1.2
@@ -0,0 +1 @@
+2337f0f8acda7e259d12836daf0ad165  symkey-1.3.0.tar.gz



From jcwillia at fedoraproject.org  Wed Dec 23 22:39:17 2009
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Wed, 23 Dec 2009 22:39:17 +0000 (UTC)
Subject: File mock-1.0.2.tar.gz uploaded to lookaside cache by jcwillia
Message-ID: <20091223223917.0682610F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mock:

61734975671680f6f8c4cab3f10f38e8  mock-1.0.2.tar.gz



From jcwillia at fedoraproject.org  Wed Dec 23 22:39:52 2009
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Wed, 23 Dec 2009 22:39:52 +0000 (UTC)
Subject: rpms/mock/devel .cvsignore, 1.55, 1.56 mock.spec, 1.82, 1.83 sources, 
	1.58, 1.59
Message-ID: <20091223223952.B295E11C00EF@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15459

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
- removed output of gethostname() in IPv4 localhost entry as this
  caused koji problems and cause 'localhost' to be put into generated
  rpms, rather than the output of hostname
- add code to setup /dev/pts differently on EL* than on FC* hosts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	26 Nov 2009 05:09:20 -0000	1.55
+++ .cvsignore	23 Dec 2009 22:39:52 -0000	1.56
@@ -1 +1 @@
-mock-1.0.1.tar.gz
+mock-1.0.2.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/devel/mock.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- mock.spec	26 Nov 2009 05:09:21 -0000	1.82
+++ mock.spec	23 Dec 2009 22:39:52 -0000	1.83
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 1
 %define minor 0
-%define sub 1
+%define sub 2
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -97,6 +97,13 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
+- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
+- removed output of gethostname() in IPv4 localhost entry as this
+  caused koji problems and cause 'localhost' to be put into generated
+  rpms, rather than the output of hostname
+- add code to setup /dev/pts differently on EL* than on FC* hosts
+
 * Wed Nov 25 2009 Clark Williams <williams at redhat.com>- 1.0.1-1
 - Patch from Paul Howarth to fix intermittent problems generating
   root cache tarball (BZ# 540997)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	26 Nov 2009 05:09:21 -0000	1.58
+++ sources	23 Dec 2009 22:39:52 -0000	1.59
@@ -1 +1 @@
-0653b0ef6ee55b44f99dbb565e9d309f  mock-1.0.1.tar.gz
+61734975671680f6f8c4cab3f10f38e8  mock-1.0.2.tar.gz



From jcwillia at fedoraproject.org  Wed Dec 23 22:41:28 2009
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Wed, 23 Dec 2009 22:41:28 +0000 (UTC)
Subject: rpms/mock/F-12 .cvsignore, 1.55, 1.56 mock.spec, 1.82, 1.83 sources, 
	1.58, 1.59
Message-ID: <20091223224128.8FE3011C00EF@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15834

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
- removed output of gethostname() in IPv4 localhost entry as this
  caused koji problems and cause 'localhost' to be put into generated
  rpms, rather than the output of hostname
- add code to setup /dev/pts differently on EL* than on FC* hosts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-12/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	26 Nov 2009 05:14:02 -0000	1.55
+++ .cvsignore	23 Dec 2009 22:41:28 -0000	1.56
@@ -1 +1 @@
-mock-1.0.1.tar.gz
+mock-1.0.2.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-12/mock.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- mock.spec	26 Nov 2009 05:14:02 -0000	1.82
+++ mock.spec	23 Dec 2009 22:41:28 -0000	1.83
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 1
 %define minor 0
-%define sub 1
+%define sub 2
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -97,6 +97,13 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
+- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
+- removed output of gethostname() in IPv4 localhost entry as this
+  caused koji problems and cause 'localhost' to be put into generated
+  rpms, rather than the output of hostname
+- add code to setup /dev/pts differently on EL* than on FC* hosts
+
 * Wed Nov 25 2009 Clark Williams <williams at redhat.com>- 1.0.1-1
 - Patch from Paul Howarth to fix intermittent problems generating
   root cache tarball (BZ# 540997)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-12/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	26 Nov 2009 05:14:02 -0000	1.58
+++ sources	23 Dec 2009 22:41:28 -0000	1.59
@@ -1 +1 @@
-0653b0ef6ee55b44f99dbb565e9d309f  mock-1.0.1.tar.gz
+61734975671680f6f8c4cab3f10f38e8  mock-1.0.2.tar.gz



From jspaleta at fedoraproject.org  Wed Dec 23 22:44:30 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Wed, 23 Dec 2009 22:44:30 +0000 (UTC)
Subject: rpms/istanbul/F-12 istanbul-save_window.patch, NONE, 1.1 istanbul.spec,
	1.20, 1.21
Message-ID: <20091223224430.9E37411C00EF@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/istanbul/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16434

Modified Files:
	istanbul.spec 
Added Files:
	istanbul-save_window.patch 
Log Message:
* Fri Dec 18 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-13
- Initial patch provided by Colin Walters and Dave Malcolm to address bug 543278 
* Wed Nov 25 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-12
- Patch for exception handling to prevent crash, bug 541003


istanbul-save_window.patch:
 istanbul-save_window.patch |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE istanbul-save_window.patch ---
--- ./istanbul/main/save_window.py	2009-12-18 12:20:38.027242576 -0500
+++ ./istanbul-save_window.patch	2009-12-18 13:12:13.024243540 -0500
@@ -35,8 +35,13 @@ class VideoWidget(gtk.DrawingArea):
     def __init__(self):
         gtk.DrawingArea.__init__(self)
         self.imagesink = None
+        self._xid = None
         self.unset_flags(gtk.DOUBLE_BUFFERED)
 
+    def do_realize(self):
+        Gtk.DrawingArea.do_realize(self)
+        self._xid = self.window.xid
+
     def do_expose_event(self, event):
         if self.imagesink:
             self.imagesink.expose()
@@ -45,9 +50,9 @@ class VideoWidget(gtk.DrawingArea):
             return True
 
     def set_sink(self, sink):
-        assert self.window.xid
+        assert self._xid is not None
         self.imagesink = sink
-        self.imagesink.set_xwindow_id(self.window.xid)
+        self.imagesink.set_xwindow_id(self._xid)
 
 class SaveWindow(gtk.Window):
     UPDATE_INTERVAL = 500



Index: istanbul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/istanbul/F-12/istanbul.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- istanbul.spec	26 Nov 2009 07:21:32 -0000	1.20
+++ istanbul.spec	23 Dec 2009 22:44:30 -0000	1.21
@@ -7,7 +7,7 @@
 Summary: Desktop Session Recorder 
 Name: istanbul 
 Version: 0.2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://live.gnome.org/Istanbul 
@@ -15,6 +15,7 @@ Source: http://zaheer.merali.org/istanbu
 Patch0: istanbul-configure.patch
 Patch1: istanbul-screencast.patch
 Patch2: istanbul-URI_exception.patch
+Patch3: istanbul-save_window.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: pygtk2 >= %{pygtk2_version}
@@ -54,6 +55,7 @@ playback.
 %setup -q
 %patch0
 %patch1
+%patch3
 %build
 #aclocal
 #automake
@@ -115,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 #%{python_sitelib}/%{name}/extern/pytrayicon/*.so*
 
 %changelog
+* Fri Dec 18 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-13
+- Initial patch provided by Colin Walters and Dave Malcolm to address bug 543278 
 * Wed Nov 25 2009 Jef Spaleta <jspaleta[AT]fedoraproject[DOT]org> - 0.2.2-12
 - Patch for exception handling to prevent crash, bug 541003
 



From jcwillia at fedoraproject.org  Wed Dec 23 22:44:32 2009
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Wed, 23 Dec 2009 22:44:32 +0000 (UTC)
Subject: rpms/mock/F-11 .cvsignore, 1.55, 1.56 mock.spec, 1.83, 1.84 sources, 
	1.58, 1.59
Message-ID: <20091223224432.6FE7411C00EF@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16448

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
- removed output of gethostname() in IPv4 localhost entry as this
  caused koji problems and cause 'localhost' to be put into generated
  rpms, rather than the output of hostname
- add code to setup /dev/pts differently on EL* than on FC* hosts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-11/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	26 Nov 2009 05:14:58 -0000	1.55
+++ .cvsignore	23 Dec 2009 22:44:32 -0000	1.56
@@ -1 +1 @@
-mock-1.0.1.tar.gz
+mock-1.0.2.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-11/mock.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- mock.spec	26 Nov 2009 05:14:58 -0000	1.83
+++ mock.spec	23 Dec 2009 22:44:32 -0000	1.84
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 1
 %define minor 0
-%define sub 1
+%define sub 2
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -97,6 +97,13 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
+- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
+- removed output of gethostname() in IPv4 localhost entry as this
+  caused koji problems and cause 'localhost' to be put into generated
+  rpms, rather than the output of hostname
+- add code to setup /dev/pts differently on EL* than on FC* hosts
+
 * Wed Nov 25 2009 Clark Williams <williams at redhat.com>- 1.0.1-1
 - Patch from Paul Howarth to fix intermittent problems generating
   root cache tarball (BZ# 540997)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-11/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	26 Nov 2009 05:14:58 -0000	1.58
+++ sources	23 Dec 2009 22:44:32 -0000	1.59
@@ -1 +1 @@
-0653b0ef6ee55b44f99dbb565e9d309f  mock-1.0.1.tar.gz
+61734975671680f6f8c4cab3f10f38e8  mock-1.0.2.tar.gz



From jcwillia at fedoraproject.org  Wed Dec 23 22:46:11 2009
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Wed, 23 Dec 2009 22:46:11 +0000 (UTC)
Subject: rpms/mock/EL-5 .cvsignore, 1.23, 1.24 mock.spec, 1.44, 1.45 sources, 
	1.26, 1.27
Message-ID: <20091223224611.665E411C00EF@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16925

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
- removed output of gethostname() in IPv4 localhost entry as this
  caused koji problems and cause 'localhost' to be put into generated
  rpms, rather than the output of hostname
- add code to setup /dev/pts differently on EL* than on FC* hosts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	26 Nov 2009 05:20:52 -0000	1.23
+++ .cvsignore	23 Dec 2009 22:46:11 -0000	1.24
@@ -1 +1 @@
-mock-1.0.1.tar.gz
+mock-1.0.2.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- mock.spec	21 Dec 2009 16:44:34 -0000	1.44
+++ mock.spec	23 Dec 2009 22:46:11 -0000	1.45
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 1
 %define minor 0
-%define sub 1
+%define sub 2
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -11,11 +11,10 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 1%{?dist}.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
-Patch0: 0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch
 URL: http://fedoraproject.org/wiki/Projects/Mock
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -28,7 +27,6 @@ Mock takes a srpm and builds it in a chr
 
 %prep
 %setup -q
-%patch0 -p1 
 %if "%{?dist}" == ".fc8"
 pushd etc/mock
 sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \
@@ -99,12 +97,12 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
-* Mon Dec 21 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1.2
-- /dev/ptmx needs 0666 perms
-
-* Fri Dec 18 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.1-1.1
-- patch to create /dev/ptmx rather than symlink it the symlink
-- is broken on EL-5
+* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
+- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
+- removed output of gethostname() in IPv4 localhost entry as this
+  caused koji problems and cause 'localhost' to be put into generated
+  rpms, rather than the output of hostname
+- add code to setup /dev/pts differently on EL* than on FC* hosts
 
 * Wed Nov 25 2009 Clark Williams <williams at redhat.com>- 1.0.1-1
 - Patch from Paul Howarth to fix intermittent problems generating


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	26 Nov 2009 05:20:52 -0000	1.26
+++ sources	23 Dec 2009 22:46:11 -0000	1.27
@@ -1 +1 @@
-0653b0ef6ee55b44f99dbb565e9d309f  mock-1.0.1.tar.gz
+61734975671680f6f8c4cab3f10f38e8  mock-1.0.2.tar.gz



From jcwillia at fedoraproject.org  Wed Dec 23 22:51:40 2009
From: jcwillia at fedoraproject.org (John Clark Williams)
Date: Wed, 23 Dec 2009 22:51:40 +0000 (UTC)
Subject: rpms/mock/EL-4 .cvsignore, 1.19, 1.20 mock.spec, 1.36, 1.37 sources, 
	1.22, 1.23
Message-ID: <20091223225140.C165011C00EF@cvs1.fedora.phx.redhat.com>

Author: jcwillia

Update of /cvs/pkgs/rpms/mock/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17836

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
- removed output of gethostname() in IPv4 localhost entry as this
  caused koji problems and cause 'localhost' to be put into generated
  rpms, rather than the output of hostname
- add code to setup /dev/pts differently on EL* than on FC* hosts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-4/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	26 Nov 2009 05:28:34 -0000	1.19
+++ .cvsignore	23 Dec 2009 22:51:40 -0000	1.20
@@ -1 +1 @@
-mock-1.0.1.tar.gz
+mock-1.0.2.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-4/mock.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- mock.spec	26 Nov 2009 05:28:34 -0000	1.36
+++ mock.spec	23 Dec 2009 22:51:40 -0000	1.37
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 1
 %define minor 0
-%define sub 1
+%define sub 2
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -97,6 +97,13 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Wed Dec 23 2009 Clark Williams <williams at redhat.com>- 1.0.2-1
+- added IPv6 localhost entry for default /etc/hosts (BZ# 545435)
+- removed output of gethostname() in IPv4 localhost entry as this
+  caused koji problems and cause 'localhost' to be put into generated
+  rpms, rather than the output of hostname
+- add code to setup /dev/pts differently on EL* than on FC* hosts
+
 * Wed Nov 25 2009 Clark Williams <williams at redhat.com>- 1.0.1-1
 - Patch from Paul Howarth to fix intermittent problems generating
   root cache tarball (BZ# 540997)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/EL-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	26 Nov 2009 05:28:34 -0000	1.22
+++ sources	23 Dec 2009 22:51:40 -0000	1.23
@@ -1 +1 @@
-0653b0ef6ee55b44f99dbb565e9d309f  mock-1.0.1.tar.gz
+61734975671680f6f8c4cab3f10f38e8  mock-1.0.2.tar.gz



From mschwendt at fedoraproject.org  Wed Dec 23 23:04:19 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 23 Dec 2009 23:04:19 +0000 (UTC)
Subject: rpms/mcs/devel libmcs-0.7.1-sysconfdir.patch, NONE, 1.1 mcs.spec, 1.13,
	1.14
Message-ID: <20091223230419.9F1C611C00EF@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/mcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19681

Modified Files:
	mcs.spec 
Added Files:
	libmcs-0.7.1-sysconfdir.patch 
Log Message:
* Wed Dec 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-6
- Add --disable-kconfig to fix build requirements usage (#529696).
  The kconfig backend has never been built or included before.
- Fix MCS_SYSCONFDIR build config value, so /etc/mcs-backend file is found.
  Don't provide a default site-wide config file anymore. Making it default
  to "gconf" would switch backends for everyone from "default".


libmcs-0.7.1-sysconfdir.patch:
 buildsys.mk.in |    1 +
 extra.mk.in    |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE libmcs-0.7.1-sysconfdir.patch ---
diff -Nur libmcs-0.7.1-orig/buildsys.mk.in libmcs-0.7.1/buildsys.mk.in
--- libmcs-0.7.1-orig/buildsys.mk.in	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/buildsys.mk.in	2009-12-23 23:40:12.000000000 +0100
@@ -65,6 +65,7 @@
 includesubdir ?= ${PACKAGE}
 mandir = @mandir@
 mansubdir ?= man1
+sysconfdir = @sysconfdir@
 
 OBJS1 = ${SRCS:.c=.o}
 OBJS2 = ${OBJS1:.cc=.o}
diff -Nur libmcs-0.7.1-orig/extra.mk.in libmcs-0.7.1/extra.mk.in
--- libmcs-0.7.1-orig/extra.mk.in	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/extra.mk.in	2009-12-23 23:40:26.000000000 +0100
@@ -7,3 +7,4 @@
 KCONFIG_FLAGS = @KCONFIG_FLAGS@
 KCONFIG_LIBS = @KCONFIG_LIBS@
 plugindir = ${libdir}/mcs
+MCS_SYSCONFDIR = ${sysconfdir}


Index: mcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcs/devel/mcs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mcs.spec	25 Jul 2009 11:55:19 -0000	1.13
+++ mcs.spec	23 Dec 2009 23:04:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mcs
 Version:        0.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Configuration file abstraction system
 
 Group:          Applications/System
@@ -10,10 +10,14 @@ License:        BSD
 URL:            http://atheme.org
 
 Source0:        http://distfiles.atheme.org/libmcs-%{version}.tgz
+Patch0: libmcs-0.7.1-sysconfdir.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  GConf2-devel
 BuildRequires:  libmowgli-devel >= 0.4.0
+BuildRequires:  GConf2-devel
+# would be needed for kconfig support
+#BuildRequires:  kdelibs-devel
 
 %description
 mcs is a library and set of userland tools which abstract the storage of
@@ -77,10 +81,11 @@ This package contains the files necessar
 
 %prep
 %setup -q -n libmcs-%{version}
+%patch0 -p1 -b .sysconfdir
 
 # Make the build system more verbose
-perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
-#sed -i '\,^.SILENT:,d' buildsys.mk.in
+#perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
+sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 # The build generates a wrong SONAME, fix it.
 perl -pi -e "s/-soname=.*'/-soname=\\\$\{LIB\}.\\\$\{LIB_MAJOR\}'/" configure
@@ -88,6 +93,7 @@ perl -pi -e "s/-soname=.*'/-soname=\\\$\
 %build
 %configure \
     --enable-gconf \
+    --disable-kconfig \
     --disable-dependency-tracking
 
 make %{?_smp_mflags}
@@ -97,10 +103,10 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-echo "gconf" > $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
-chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
-
+# Example for a default site-wide storage backend setting:
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+#echo "gconf" > $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
+#chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
 
 
 %clean
@@ -118,17 +124,24 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
-%config(noreplace) %{_sysconfdir}/mcs-backend
+#%config(noreplace) %{_sysconfdir}/mcs-backend
 %{_libdir}/*.so.*
 %{_libdir}/mcs
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
-%{_includedir}/libmcs
+%{_includedir}/libmcs/
 %{_libdir}/pkgconfig/libmcs.pc
 
 %changelog
+* Wed Dec 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-6
+- Add --disable-kconfig to fix build requirements usage (#529696).
+  The kconfig backend has never been built or included before.
+- Fix MCS_SYSCONFDIR build config value, so /etc/mcs-backend file is found.
+  Don't provide a default site-wide config file anymore. Making it default
+  to "gconf" would switch backends for everyone from "default".
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Wed Dec 23 23:14:00 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 23 Dec 2009 23:14:00 +0000 (UTC)
Subject: rpms/mcs/devel libmcs-0.7.1-walk.patch,NONE,1.1 mcs.spec,1.14,1.15
Message-ID: <20091223231400.E390D11C00EF@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/mcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21141

Modified Files:
	mcs.spec 
Added Files:
	libmcs-0.7.1-walk.patch 
Log Message:
* Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-7
- Fix floating point exception in mcs-walk-config tool.


libmcs-0.7.1-walk.patch:
 mcs_walk_config.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libmcs-0.7.1-walk.patch ---
diff -Nur libmcs-0.7.1-orig/src/tools/mcs-walk-config/mcs_walk_config.c libmcs-0.7.1/src/tools/mcs-walk-config/mcs_walk_config.c
--- libmcs-0.7.1-orig/src/tools/mcs-walk-config/mcs_walk_config.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/tools/mcs-walk-config/mcs_walk_config.c	2009-12-24 00:10:01.000000000 +0100
@@ -37,7 +37,7 @@
 {
 	mcs_handle_t *h;
 	mowgli_queue_t *groups, *i;
-	int entries = 0, sections = 0;
+	int entries = 0, sections = 0, avgentries = 0;
 
 	if (argc < 2)
 	{
@@ -75,8 +75,9 @@
 	mowgli_queue_destroy(groups);
 	mcs_fini();
 
+    avgentries = sections ? (entries/sections) : 0;
 	printf("\n%d entries across %d groups, average %d entries per group\n",
-		entries, sections, entries / sections);
+		entries, sections, avgentries);
 
 	return 0;
 }


Index: mcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcs/devel/mcs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mcs.spec	23 Dec 2009 23:04:19 -0000	1.14
+++ mcs.spec	23 Dec 2009 23:14:00 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mcs
 Version:        0.7.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Configuration file abstraction system
 
 Group:          Applications/System
@@ -11,6 +11,7 @@ URL:            http://atheme.org
 
 Source0:        http://distfiles.atheme.org/libmcs-%{version}.tgz
 Patch0: libmcs-0.7.1-sysconfdir.patch
+Patch1: libmcs-0.7.1-walk.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -82,6 +83,7 @@ This package contains the files necessar
 %prep
 %setup -q -n libmcs-%{version}
 %patch0 -p1 -b .sysconfdir
+%patch1 -p1 -b .walk
 
 # Make the build system more verbose
 #perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
@@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libmcs.pc
 
 %changelog
+* Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-7
+- Fix floating point exception in mcs-walk-config tool.
+
 * Wed Dec 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-6
 - Add --disable-kconfig to fix build requirements usage (#529696).
   The kconfig backend has never been built or included before.



From pkgdb at fedoraproject.org  Wed Dec 23 23:26:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:26:49 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223232648.EC5AB10F8DD@bastion.fedoraproject.org>

kantrn has set the watchcommits acl on python-olpcgames (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:26:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:26:49 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223232648.D9B0610F8CD@bastion.fedoraproject.org>

kantrn has set the watchbugzilla acl on python-olpcgames (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:26:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:26:51 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223232650.B694210F8CD@bastion.fedoraproject.org>

kantrn has set the commit acl on python-olpcgames (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:26:50 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223232651.9C2C910F8CB@bastion.fedoraproject.org>

kantrn has set the approveacls acl on python-olpcgames (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:26:59 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223232658.A711710F8CB@bastion.fedoraproject.org>

kantrn has set the commit acl on python-olpcgames (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:27:00 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223232659.B0C1410F8CD@bastion.fedoraproject.org>

kantrn has set the approveacls acl on python-olpcgames (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:27:00 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223232700.12D8C10F8DD@bastion.fedoraproject.org>

kantrn has set the watchcommits acl on python-olpcgames (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:27:14 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223232700.C654410F8DF@bastion.fedoraproject.org>

kantrn has set the watchbugzilla acl on python-olpcgames (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:03 +0000
Subject: [pkgdb] python-olpcgames: sdz has given up watchcommits
Message-ID: <20091223233203.211DC10F8DA@bastion.fedoraproject.org>

sdz has given up the watchcommits acl on python-olpcgames (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:04 +0000
Subject: [pkgdb] python-olpcgames: sdz has requested commit
Message-ID: <20091223233203.E867F10F8DF@bastion.fedoraproject.org>

sdz has requested the commit acl on python-olpcgames (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:06 +0000
Subject: [pkgdb] python-olpcgames: sdz has requested approveacls
Message-ID: <20091223233206.399C910F8DC@bastion.fedoraproject.org>

sdz has requested the approveacls acl on python-olpcgames (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:21 +0000
Subject: [pkgdb] python-olpcgames: sdz has given up watchbugzilla
Message-ID: <20091223233209.05EFB10F8DE@bastion.fedoraproject.org>

sdz has given up the watchbugzilla acl on python-olpcgames (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:26 +0000
Subject: [pkgdb] python-olpcgames: sdz has given up watchcommits
Message-ID: <20091223233227.340F910F8DD@bastion.fedoraproject.org>

sdz has given up the watchcommits acl on python-olpcgames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:28 +0000
Subject: [pkgdb] python-olpcgames: sdz has requested commit
Message-ID: <20091223233227.E6E2A10F8E2@bastion.fedoraproject.org>

sdz has requested the commit acl on python-olpcgames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:28 +0000
Subject: [pkgdb] python-olpcgames: sdz has requested approveacls
Message-ID: <20091223233228.8040C10F8DC@bastion.fedoraproject.org>

sdz has requested the approveacls acl on python-olpcgames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:44 +0000
Subject: [pkgdb] python-olpcgames: sdz has given up watchbugzilla
Message-ID: <20091223233231.3E0BB10F8DC@bastion.fedoraproject.org>

sdz has given up the watchbugzilla acl on python-olpcgames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:50 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223233250.B2C8110F8D9@bastion.fedoraproject.org>

kantrn has set the approveacls acl on python-olpcgames (Fedora devel) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:59 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223233259.0156A10F8DB@bastion.fedoraproject.org>

kantrn has set the approveacls acl on python-olpcgames (Fedora 10) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:46 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223233247.6EC3210F8DF@bastion.fedoraproject.org>

kantrn has set the commit acl on python-olpcgames (Fedora devel) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Wed Dec 23 23:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 23 Dec 2009 23:32:57 +0000
Subject: [pkgdb] python-olpcgames had acl change status
Message-ID: <20091223233257.1243810F8CD@bastion.fedoraproject.org>

kantrn has set the commit acl on python-olpcgames (Fedora 10) to Approved for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From kwright at fedoraproject.org  Wed Dec 23 23:36:48 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 23:36:48 +0000 (UTC)
Subject: rpms/dogtag-pki-common-ui/devel dogtag-pki-common-ui.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223233648.299ED11C00EF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-common-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24243/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dogtag-pki-common-ui.spec import.log 
Log Message:
rawhide build of dogtag packages: 522204



--- NEW FILE dogtag-pki-common-ui.spec ---
Name:           dogtag-pki-common-ui
Version:        1.3.0
Release:        3%{?dist}
Summary:        Dogtag Certificate System - PKI Common Framework User Interface
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Provides:       pki-common-ui = %{version}.%{release}

Obsoletes:      pki-common-ui < %{version}.%{release}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag PKI Common Framework User Interface contains the graphical
user interface for the Dogtag PKI Common Framework.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="dogtag" \
    -Dproduct.prefix="pki" \
    -Dproduct="common-ui" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/pki/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-3
- Removed 'with exceptions' from License
- Removed Requires bash

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI


--- NEW FILE import.log ---
dogtag-pki-common-ui-1_3_0-3_fc13:HEAD:dogtag-pki-common-ui-1.3.0-3.fc13.src.rpm:1261611352


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-common-ui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:07:59 -0000	1.1
+++ .cvsignore	23 Dec 2009 23:36:47 -0000	1.2
@@ -0,0 +1 @@
+dogtag-pki-common-ui-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-common-ui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:07:59 -0000	1.1
+++ sources	23 Dec 2009 23:36:47 -0000	1.2
@@ -0,0 +1 @@
+edf2aa764eb45df1b788a233b35a119c  dogtag-pki-common-ui-1.3.0.tar.gz



From kwright at fedoraproject.org  Wed Dec 23 23:45:14 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 23:45:14 +0000 (UTC)
Subject: rpms/dogtag-pki-ca-ui/devel dogtag-pki-ca-ui.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091223234514.3F26F11C00EF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25652/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dogtag-pki-ca-ui.spec import.log 
Log Message:
522208 - New Package for Dogtag



--- NEW FILE dogtag-pki-ca-ui.spec ---
Name:           dogtag-pki-ca-ui
Version:        1.3.0
Release:        3%{?dist}
Summary:        Dogtag Certificate System - Certificate Authority User Interface
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant

Requires:       bash

Provides:       pki-ca-ui = %{version}-%{release}

Obsoletes:      pki-ca-ui < %{version}-%{release}

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

The Dogtag Certificate Authority User Interface contains the graphical
user interface for the Dogtag Certificate Authority.

%prep

%setup -q

%build
ant \
    -Dproduct.ui.flavor.prefix="dogtag" \
    -Dproduct.prefix="pki" \
    -Dproduct="ca-ui" \
    -Dversion="%{version}"

%install
rm -rf %{buildroot}
cd dist/binary
unzip %{name}-%{version}.zip -d %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/pki/

%changelog
* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.0-3
- Removed 'with exceptions' from License

* Mon Nov 2 2009 Ade Lee <alee at redhat.com> 1.3.0-2
- Bugzilla Bug #522208 - Packaging for Fedora Dogtag
- Take ownership of directories

* Tue Oct 13 2009 Ade Lee <alee at redhat.com> 1.3.0-1
- Bugzilla Bug #522208 - Packaging for Fedora Dogtag


--- NEW FILE import.log ---
dogtag-pki-ca-ui-1_3_0-3_fc13:HEAD:dogtag-pki-ca-ui-1.3.0-3.fc13.src.rpm:1261611825


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 20:11:04 -0000	1.1
+++ .cvsignore	23 Dec 2009 23:45:13 -0000	1.2
@@ -0,0 +1 @@
+dogtag-pki-ca-ui-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 20:11:04 -0000	1.1
+++ sources	23 Dec 2009 23:45:14 -0000	1.2
@@ -0,0 +1 @@
+b21ff73c94c25c482d968e9eafa74dbc  dogtag-pki-ca-ui-1.3.0.tar.gz



From kwright at fedoraproject.org  Wed Dec 23 23:55:55 2009
From: kwright at fedoraproject.org (kwright)
Date: Wed, 23 Dec 2009 23:55:55 +0000 (UTC)
Subject: rpms/pki-native-tools/devel import.log, NONE,
	1.1 pki-native-tools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091223235555.B09FC11C00EF@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/pki-native-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27650/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pki-native-tools.spec 
Log Message:
522895 - New Package for Dogtag PKI: pki-native-tools



--- NEW FILE import.log ---
pki-native-tools-1_3_0-4_fc13:HEAD:pki-native-tools-1.3.0-4.fc13.src.rpm:1261612507


--- NEW FILE pki-native-tools.spec ---
Name:           pki-native-tools
Version:        1.3.0
Release:        4%{?dist}
Summary:        Dogtag Certificate System - Native Tools
URL:            http://pki.fedoraproject.org/
License:        GPLv2
Group:          System Environment/Base

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cyrus-sasl-devel
BuildRequires:  mozldap-devel
BuildRequires:  nspr-devel >= 4.6.99
BuildRequires:  nss-devel >= 3.12.3.99
BuildRequires:  svrcore-devel

Requires:       mozldap-tools
Requires:       nss >= 3.12.3.99
Requires:       nss-tools >= 3.12.3.99

Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz

%description
Dogtag Certificate System is an enterprise software system designed
to manage enterprise Public Key Infrastructure (PKI) deployments.

These platform-dependent PKI executables are used to help make
Dogtag Certificate System into a more complete and robust PKI solution.

%prep

%setup -q -n %{name}-%{version}

%build
%configure \
%ifarch ppc64 s390x sparc64 x86_64
    --enable-64bit \
%endif
    --libdir=%{_libdir}
make

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

## rearrange files to be in the desired native packaging layout
mkdir -p %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}/opt/conf/*      %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}/opt/samples/*   %{buildroot}%{_libdir}/pki/native-tools
cp -p %{buildroot}%{_libexecdir}/* %{buildroot}%{_libdir}/pki/native-tools

# create wrappers
for wrapper in bulkissuance p7tool revoker setpin sslget tkstool
do
    sed -e "s|\[PKI_PRODUCT\]|pki|g"            \
        -e "s|\[PKI_SUBSYSTEM\]|native-tools|g" \
        -e "s|\[PKI_COMMAND\]|${wrapper}|g" \
        %{buildroot}/opt/templates/pki_subsystem_command_wrapper > %{buildroot}%{_bindir}/${wrapper} ;
done

## remove unwanted files
rm -rf %{buildroot}/opt
rm -rf %{buildroot}%{_libexecdir}
rm -rf %{buildroot}%{_datadir}/pki

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE doc/README
%{_bindir}/*
%{_libdir}/pki

%changelog
* Fri Dec 11 2009 Kevin Wright <kwright at redhat.com> 1.3.0-4
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- fixed several issues with the spec file:
- Removed BuildRequires bash, Requires perl
- Removed 'with exceptions' from License

* Tue Nov 10 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- Moved contents of 'setup_package' to spec file

* Mon Nov 2 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools
- Prepended directory path in front of setup_package

* Mon Oct 12 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
- Bugzilla Bug #522895 -  New Package for Dogtag PKI: native-tools


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pki-native-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Dec 2009 05:32:24 -0000	1.1
+++ .cvsignore	23 Dec 2009 23:55:54 -0000	1.2
@@ -0,0 +1 @@
+pki-native-tools-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pki-native-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Dec 2009 05:32:24 -0000	1.1
+++ sources	23 Dec 2009 23:55:54 -0000	1.2
@@ -0,0 +1 @@
+c3df617e17f9b09b82d0d4d96bba295c  pki-native-tools-1.3.0.tar.gz



From whot at fedoraproject.org  Wed Dec 23 23:56:31 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 23 Dec 2009 23:56:31 +0000 (UTC)
Subject: rpms/xorg-x11-drv-wacom/F-12 xorg-x11-drv-wacom.spec,1.5,1.6
Message-ID: <20091223235631.6C91D11C00EF@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27865

Modified Files:
	xorg-x11-drv-wacom.spec 
Log Message:
* Thu Dec 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.3-1
- wacom 0.10.3
- Update files, Requires and BuildRequires for xsetwacom.



Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/xorg-x11-drv-wacom.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xorg-x11-drv-wacom.spec	6 Dec 2009 23:34:19 -0000	1.5
+++ xorg-x11-drv-wacom.spec	23 Dec 2009 23:56:31 -0000	1.6
@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
-Version:    0.10.2
-Release:    2%{?dist}
+Version:    0.10.3
+Release:    1%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -18,9 +18,11 @@ ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.7.0
 BuildRequires: xorg-x11-util-macros >= 1.3.0
+BuildRequires: libX11-devel libXi-devel
 
 Requires:  xorg-x11-server-Xorg >= 1.7.0
 Requires:  hal
+Requires:  libX11 libXi
 
 Provides:  linuxwacom = %{version}-%{release}
 Obsoletes: linuxwacom <= 0.8.4.3
@@ -56,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/wacom_drv.so
 %{_mandir}/man4/wacom.4*
 %{_datadir}/hal/fdi/policy/20thirdparty/10-wacom.fdi
-
+%{_bindir}/xsetwacom
 
 %package devel
 Summary:    Xorg X11 wacom input driver development package
@@ -78,6 +80,10 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Thu Dec 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.3-1
+- wacom 0.10.3
+- Update files, Requires and BuildRequires for xsetwacom.
+
 * Mon Dec 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.2-2
 - xorg-x11-drv-wacom-devel provides linuxwacom-devel: resolves
   updates-testing conflict between new linuxwacom and xorg-x11-drv-wacom



From whot at fedoraproject.org  Thu Dec 24 00:16:18 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 24 Dec 2009 00:16:18 +0000 (UTC)
Subject: File xf86-input-wacom-0.10.3.tar.bz2 uploaded to lookaside cache by
	whot
Message-ID: <20091224001618.C267810F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xorg-x11-drv-wacom:

0404e5ada4364135d2935164940cd1e4  xf86-input-wacom-0.10.3.tar.bz2



From whot at fedoraproject.org  Thu Dec 24 00:17:58 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 24 Dec 2009 00:17:58 +0000 (UTC)
Subject: rpms/xorg-x11-drv-wacom/F-12 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xorg-x11-drv-wacom.spec, 1.6, 1.7
Message-ID: <20091224001758.BBCC511C00EF@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30973

Modified Files:
	.cvsignore sources xorg-x11-drv-wacom.spec 
Log Message:
* Thu Dec 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.3-2
- Add the tarball...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Dec 2009 03:53:27 -0000	1.4
+++ .cvsignore	24 Dec 2009 00:17:58 -0000	1.5
@@ -1 +1 @@
-xf86-input-wacom-0.10.2.tar.bz2
+xf86-input-wacom-0.10.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Dec 2009 03:53:28 -0000	1.4
+++ sources	24 Dec 2009 00:17:58 -0000	1.5
@@ -1 +1 @@
-86e5a1446d15bd47cd302a18033bb5e8  xf86-input-wacom-0.10.2.tar.bz2
+0404e5ada4364135d2935164940cd1e4  xf86-input-wacom-0.10.3.tar.bz2


Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/xorg-x11-drv-wacom.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xorg-x11-drv-wacom.spec	23 Dec 2009 23:56:31 -0000	1.6
+++ xorg-x11-drv-wacom.spec	24 Dec 2009 00:17:58 -0000	1.7
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -80,6 +80,9 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Thu Dec 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.3-2
+- Add the tarball...
+
 * Thu Dec 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.3-1
 - wacom 0.10.3
 - Update files, Requires and BuildRequires for xsetwacom.



From mclasen at fedoraproject.org  Thu Dec 24 01:40:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Dec 2009 01:40:32 +0000 (UTC)
Subject: File shotwell-0.4.0.tar.bz2 uploaded to lookaside cache by mclasen
Message-ID: <20091224014032.EDDCC10F8AB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for shotwell:

40d957febf23f15e6e59148b983ac300  shotwell-0.4.0.tar.bz2



From mclasen at fedoraproject.org  Thu Dec 24 01:50:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 24 Dec 2009 01:50:03 +0000 (UTC)
Subject: rpms/shotwell/devel .cvsignore, 1.5, 1.6 shotwell.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <20091224015003.9A45211C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11213

Modified Files:
	.cvsignore shotwell.spec sources 
Log Message:
0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Dec 2009 17:59:45 -0000	1.5
+++ .cvsignore	24 Dec 2009 01:50:03 -0000	1.6
@@ -1 +1 @@
-shotwell-0.4.0+branch.tar.bz2
+shotwell-0.4.0.tar.bz2


Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- shotwell.spec	18 Dec 2009 18:23:28 -0000	1.14
+++ shotwell.spec	24 Dec 2009 01:50:03 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           shotwell
 Version:        0.4.0
-Release:        0.1.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -10,11 +10,7 @@ Group:          Applications/Multimedia
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
-#Source0:        http://www.yorba.org/download/shotwell/0.3/shotwell-%{version}.tar.bz2
-# svn co svn://svn.yorba.org/shotwell/branches/shotwell-0.4, make dist
-Source:         shotwell-0.4.0+branch.tar.bz2
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://www.yorba.org/download/shotwell/0.4/shotwell-%{version}.tar.bz2
 
 BuildRequires:  gtk2-devel
 BuildRequires:  GConf2-devel
@@ -38,8 +34,7 @@ environment. It allows you to import pho
 them, and share them with others.
 
 %prep
-%setup -q -n shotwell-0.4.0+branch
-#%patch0 -p1 -b .prefixly-correct
+%setup -q
 
 %build
 ./configure --prefix=/usr --disable-schemas-install
@@ -102,7 +97,12 @@ gtk-update-icon-cache --quiet %{_datadir
 
 
 %changelog
+* Wed Dec 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-1
+- Update to 0.4.0
+
 * Fri Dec 18 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-0.1.20091218svn
+- 0.4 snapshot
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.2-1
 - Update to 0.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Dec 2009 17:59:45 -0000	1.5
+++ sources	24 Dec 2009 01:50:03 -0000	1.6
@@ -1 +1 @@
-04a137ae4b30f394ca38c9651555a474  shotwell-0.4.0+branch.tar.bz2
+40d957febf23f15e6e59148b983ac300  shotwell-0.4.0.tar.bz2



From rdieter at fedoraproject.org  Thu Dec 24 02:23:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Dec 2009 02:23:05 +0000 (UTC)
Subject: File kde-settings-4.4-4.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091224022305.33DC010F8AB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kde-settings:

81ae3bbf0fe3c2e7a633f83cd6e9a1fa  kde-settings-4.4-4.tar.bz2



From rdieter at fedoraproject.org  Thu Dec 24 02:23:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Dec 2009 02:23:29 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.70, 1.71 kde-settings.spec, 1.99,
	1.100 sources, 1.72, 1.73
Message-ID: <20091224022329.DF0B011C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15807

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-4
- enable nepomuk, with some conservative defaults (#549436)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	1 Dec 2009 19:35:15 -0000	1.70
+++ .cvsignore	24 Dec 2009 02:23:29 -0000	1.71
@@ -1 +1 @@
-kde-settings-4.4-3.tar.bz2
+kde-settings-4.4-4.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- kde-settings.spec	1 Dec 2009 19:35:15 -0000	1.99
+++ kde-settings.spec	24 Dec 2009 02:23:29 -0000	1.100
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F13 ONLY!
 
-%define rel 3
+%define rel 4
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -160,6 +160,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-4
+- enable nepomuk, with some conservative defaults (#549436)
+
 * Tue Dec 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-3
 - kdmrc: ServerArgsLocal=-nr , for better transition from plymouth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	1 Dec 2009 19:35:15 -0000	1.72
+++ sources	24 Dec 2009 02:23:29 -0000	1.73
@@ -1 +1 @@
-bc7a9808f1fa21d60ffbd2ffec212bed  kde-settings-4.4-3.tar.bz2
+81ae3bbf0fe3c2e7a633f83cd6e9a1fa  kde-settings-4.4-4.tar.bz2



From lkundrak at fedoraproject.org  Thu Dec 24 02:56:26 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 24 Dec 2009 02:56:26 +0000 (UTC)
Subject: rpms/synfigstudio/devel synfigstudio-0.62.00-cflags.patch, NONE,
	1.1 synfigstudio.spec, 1.1, 1.2
Message-ID: <20091224025626.2796411C00EF@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfigstudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19886

Modified Files:
	synfigstudio.spec 
Added Files:
	synfigstudio-0.62.00-cflags.patch 
Log Message:
* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
- Fix optflags use (Ville Skytt?, #549420)


synfigstudio-0.62.00-cflags.patch:
 configure.ac |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE synfigstudio-0.62.00-cflags.patch ---
Do not cripple the CFLAGS, while removing debugging
information and adding arbitrary flags.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp synfigstudio-0.62.00/configure.ac synfigstudio-0.62.00.fixed/configure.ac
--- synfigstudio-0.62.00/configure.ac	2009-10-12 11:33:44.000000000 +0200
+++ synfigstudio-0.62.00.fixed/configure.ac	2009-12-24 03:16:09.977442048 +0100
@@ -31,7 +31,7 @@ AC_PROG_INSTALL
 AC_LANG([C++])
 
 
-AC_ARG_DEBUG
+#AC_ARG_DEBUG
 
 case "$debug" in
 	yes)
@@ -39,11 +39,11 @@ case "$debug" in
 	;;
 esac
 
-AC_ARG_OPTIMIZATION
-AC_ARG_WARNINGS
-AC_ARG_PROFILE_ARCS
-AC_ARG_BRANCH_PROBABILITIES
-AC_ARG_PROFILING
+#AC_ARG_OPTIMIZATION
+#AC_ARG_WARNINGS
+#AC_ARG_PROFILE_ARCS
+#AC_ARG_BRANCH_PROBABILITIES
+#AC_ARG_PROFILING
 
 AC_ARG_ENABLE(g5opt,[
   --enable-g5opt           enable optimizations specific to G5 proc],[


Index: synfigstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfigstudio/devel/synfigstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synfigstudio.spec	7 Dec 2009 22:59:59 -0000	1.1
+++ synfigstudio.spec	24 Dec 2009 02:56:25 -0000	1.2
@@ -1,18 +1,20 @@
 Name:           synfigstudio
 Version:        0.62.00
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Vector-based 2D animation studio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://synfig.org/
 Source0:        http://download.sourceforge.net/synfig/%{name}-%{version}.tar.gz
+Patch0:         synfigstudio-0.62.00-cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  synfig-devel
 BuildRequires:  ETL-devel >= 0.04.13
 BuildRequires:  gtkmm24-devel
+BuildRequires:  autoconf
 
 %description
 Synfig Animation Studio is a powerful, industrial-strength vector-based
@@ -39,9 +41,11 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1 -b .cflags
 
 
 %build
+autoconf
 %configure
 make %{?_smp_mflags}
 
@@ -95,8 +99,11 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
+- Fix optflags use (Ville Skytt?, #549420)
+
 * Tue Nov 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
-- Initial packaging attempt
+- Bump version
 
 * Fri Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.61.09-1
 - Initial packaging attempt



From rdieter at fedoraproject.org  Thu Dec 24 03:29:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Dec 2009 03:29:48 +0000 (UTC)
Subject: rpms/qgis/devel qgis-1.0.2-sip49.patch,NONE,1.1 qgis.spec,1.40,1.41
Message-ID: <20091224032948.6DAC211C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24016

Modified Files:
	qgis.spec 
Added Files:
	qgis-1.0.2-sip49.patch 
Log Message:
* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-4
- qgis rebuild for sip-4.9.x (#538119)


qgis-1.0.2-sip49.patch:
 conversions.sip |   70 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

--- NEW FILE qgis-1.0.2-sip49.patch ---
diff -Naur qgis-1.0.2-orig/python/core/conversions.sip qgis-1.0.2/python/core/conversions.sip
--- qgis-1.0.2-orig/python/core/conversions.sip	2008-08-20 02:55:54.000000000 -0400
+++ qgis-1.0.2/python/core/conversions.sip	2009-12-23 10:29:42.819937299 -0500
@@ -77,17 +77,17 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
     QVector<TYPE> * t = reinterpret_cast< QVector<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete ql;
       return 0;
     }
     ql->append(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = ql;
@@ -153,17 +153,17 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
     QVector<QVector<TYPE> > * t = reinterpret_cast< QVector< QVector<TYPE> > * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete ql;
       return 0;
     }
     ql->append(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = ql;
@@ -243,7 +243,7 @@
     TYPE *t = new TYPE(*it);
     PyObject *tobj;
 
-    if ((tobj = sipConvertFromNewInstance(t, sipClass_TYPE, sipTransferObj)) == NULL)
+    if ((tobj = sipConvertFromNewInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj)) == NULL)
     {
       Py_DECREF(l);
       delete t;
@@ -263,7 +263,7 @@
       return 0;
 
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-      if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, SIP_NOT_NONE))
+      if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), SIP_NOT_NONE))
         return 0;
 
     return 1;
@@ -274,16 +274,16 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    TYPE* t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    TYPE* t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete qset;
       return 0;
     }
     qset->insert(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = qset;
@@ -364,7 +364,7 @@
       Py_ssize_t j = 0;
       while (PyDict_Next(tobj, &j, &kobj2, &tobj2))
       {
-        if (!sipCanConvertToInstance(tobj2, sipClass_TYPE, SIP_NOT_NONE))
+        if (!sipCanConvertToInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), SIP_NOT_NONE))
           return 0;
       }
       
@@ -391,17 +391,17 @@
       int k2 = PyInt_AsLong(kobj2);
       int state;
       
-      TYPE* fa = reinterpret_cast<TYPE*>(sipConvertToInstance(tobj2, sipClass_TYPE, sipTransferObj,SIP_NOT_NONE,&state,sipIsErr));
+      TYPE* fa = reinterpret_cast<TYPE*>(sipConvertToInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj,SIP_NOT_NONE,&state,sipIsErr));
       
       if (*sipIsErr)
       {
-        sipReleaseInstance(tobj2, sipClass_TYPE, state);
+        sipReleaseInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
         delete qm;
         return 0;
       }
       
       qm2.insert(k2, *fa);
-      sipReleaseInstance(tobj2, sipClass_TYPE, state);
+      sipReleaseInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
     }
     qm->insert(k, qm2);
   }
@@ -432,7 +432,7 @@
     {
         QString *t1 = new QString(i.key());
 
-        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_QString, sipTransferObj);
+        PyObject *t1obj = sipConvertFromNewInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), sipTransferObj);
         PyObject *t2obj = PyInt_FromLong( (long) i.value() );
 
         if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
@@ -478,7 +478,7 @@
 
         while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
         {
-            if (!sipCanConvertToInstance(t1obj, sipClass_QString, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), SIP_NOT_NONE))
                 return 0;
         } 
 
@@ -491,19 +491,19 @@
     {
         int state;
 
-        QString *t1 = reinterpret_cast<QString *>(sipConvertToInstance(t1obj, sipClass_QString, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+        QString *t1 = reinterpret_cast<QString *>(sipConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
         QVariant::Type t2 = (QVariant::Type) PyInt_AsLong(t1obj);
 
         if (*sipIsErr)
         {
-            sipReleaseInstance(t1, sipClass_QString, state);
+            sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), state);
             delete qm;
             return 0;
         }
 
         qm->insert(*t1, t2);
 
-        sipReleaseInstance(t1, sipClass_QString, state);
+        sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), state);
     }
  
     *sipCppPtr = qm;
@@ -534,8 +534,8 @@
         TYPE1 *t1 = new TYPE1(i.key());
         TYPE2 *t2 = i.value();
 
-        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
-        PyObject *t2obj = sipConvertFromInstance(t2, sipClass_TYPE2, sipTransferObj);
+        PyObject *t1obj = sipConvertFromNewInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), sipTransferObj);
+        PyObject *t2obj = sipConvertFromInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj);
 
         if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
         {
@@ -579,10 +579,10 @@
 
         while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
         {
-            if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), SIP_NOT_NONE))
                 return 0;
 
-            if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t2obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), SIP_NOT_NONE))
                 return 0;
         } 
 
@@ -595,13 +595,13 @@
     {
         int state1, state2;
 
-        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
-        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
+        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
+        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
  
         if (*sipIsErr)
         {
-            sipReleaseInstance(t1, sipClass_TYPE1, state1);
-            sipReleaseInstance(t2, sipClass_TYPE2, state2);
+            sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), state1);
+            sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
 
             delete qm;
             return 0;
@@ -609,8 +609,8 @@
 
         qm->insert(*t1, t2);
 
-        sipReleaseInstance(t1, sipClass_TYPE1, state1);
-        sipReleaseInstance(t2, sipClass_TYPE2, state2);
+        sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), state1);
+        sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
     }
  
     *sipCppPtr = qm;
@@ -642,7 +642,7 @@
       const double t1 = i.key();
       TYPE2 * t2 = &i.value();
       PyObject *t1obj = PyFloat_FromDouble(t1);
-      PyObject *t2obj = sipConvertFromInstance(t2, sipClass_TYPE2, sipTransferObj);
+      PyObject *t2obj = sipConvertFromInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj);
       if (PyDict_GetItem(d, t1obj) == NULL) {
        PyObject *lst = PyList_New(0);
        PyDict_SetItem(d, t1obj, lst);
@@ -695,7 +695,7 @@
         {
          for (int i = 0; i < PyList_GET_SIZE(t2obj); ++i) {
            if (!sipCanConvertToInstance(PyList_GET_ITEM(t2obj, i),
-                                        sipClass_TYPE2, SIP_NOT_NONE))
+                                        (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), SIP_NOT_NONE))
              return 0;
          }
         }
@@ -712,7 +712,7 @@
          TYPE2 *t2 =
            reinterpret_cast<TYPE2 *>(sipConvertToInstance(PyList_GET_ITEM(t2obj,
                                                                           i),
-                                                          sipClass_TYPE2,
+                                                          (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2),
                                                           sipTransferObj,
                                                           SIP_NOT_NONE,
                                                           &state2,
@@ -720,7 +720,7 @@
 
          if (*sipIsErr)
            {
-             sipReleaseInstance(t2, sipClass_TYPE2, state2);
+             sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
 
              delete qm;
              return 0;
@@ -728,7 +728,7 @@
 
          qm->insert(k, *t2);
 
-         sipReleaseInstance(t2, sipClass_TYPE2, state2);
+         sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
        }
     }
 


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- qgis.spec	4 Dec 2009 18:36:51 -0000	1.40
+++ qgis.spec	24 Dec 2009 03:29:48 -0000	1.41
@@ -1,9 +1,8 @@
-%define qt4_bindir %{_libdir}/qt4/bin
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: qgis
 Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A user friendly Open Source Geographic Information System
 
 Group: Applications/Engineering
@@ -13,6 +12,10 @@ Source0: http://download.osgeo.org/qgis/
 Source1: %{name}.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://trac.osgeo.org/qgis/ticket/1959
+Patch100: qgis-1.0.2-sip49.patch
+
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: qt4-devel
@@ -102,6 +105,8 @@ Addtional theme for qgis - nkids
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch100 -p1 -b .sip49
+
 # fix spurious executable bits
 %{__chmod} -x \
 	./src/app/legend/qgslegend.h \
@@ -126,12 +131,13 @@ done
 	-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
 	-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
 	.
-make VERBOSE=1 %{?_smp_mflags}
+
+make %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-make VERBOSE=1 DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
 # remove rpath from files
 chrpath --delete \
@@ -246,12 +252,18 @@ desktop-file-install --vendor="fedora" \
 
 
 %changelog
+* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-4
+- qgis rebuild for sip-4.9.x (#538119)
+
 * Fri Dec 04 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.0.2-3
 - Rebuild for new Geos.
 
 * Tue Nov 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-2 
 - -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api (#538119) 
 
+* Thu Oct 22 2009 Alex Lancaster <alexlan[AT] fedoraproject org> - 1.0.2-1.1
+- Rebuilt to fix python problem (#518121)
+
 * Thu Jul 30 2009 Douglas E. Warner <silfreed at silfreed.net> 1.0.2-1
 - updating for 1.0.2
 - moving libqgispython.so to python subpackage for bug#507381



From lkundrak at fedoraproject.org  Thu Dec 24 03:29:49 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 24 Dec 2009 03:29:49 +0000 (UTC)
Subject: rpms/synfig/devel synfig-0.62.00-ltld.patch, NONE, 1.1 synfig.spec,
	1.3, 1.4
Message-ID: <20091224032949.E678911C00EF@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24030

Modified Files:
	synfig.spec 
Added Files:
	synfig-0.62.00-ltld.patch 
Log Message:
* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-3
- Actually apply the optflags patch
- Drop bundled libltdl


synfig-0.62.00-ltld.patch:
 Makefile.am  |   15 +--------------
 configure.ac |    7 ++-----
 2 files changed, 3 insertions(+), 19 deletions(-)

--- NEW FILE synfig-0.62.00-ltld.patch ---
Do not use bundled LTDL.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp synfig-0.62.00/configure.ac synfig-0.62.00.fixed/configure.ac
--- synfig-0.62.00/configure.ac	2009-12-24 04:08:29.140458700 +0100
+++ synfig-0.62.00.fixed/configure.ac	2009-12-24 03:09:32.228444125 +0100
@@ -85,8 +85,8 @@ AC_LIBTOOL_DLOPEN
 AC_DISABLE_STATIC
 AC_ENABLE_SHARED
 AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-AC_LIBTOOL_PATCH
+#AC_SUBST(LIBTOOL_DEPS)
+#AC_LIBTOOL_PATCH
 
 #if [[ "$LIBTOOL_PATCH_SED""x" != "x" ]] ; then {
 #	printf "Patching libtool... "
@@ -622,9 +622,6 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
-# this line is required for libtool 1.5.26 but must not be present for libtool 2.2.4...
-AC_CONFIG_SUBDIRS(libltdl)
-
 CONFIG_LIBS="-lsynfig"
 CONFIG_CFLAGS="$CONFIG_CFLAGS"
 AC_SUBST(CONFIG_LIBS)
diff -urp synfig-0.62.00/Makefile.am synfig-0.62.00.fixed/Makefile.am
--- synfig-0.62.00/Makefile.am	2009-10-12 11:33:44.000000000 +0200
+++ synfig-0.62.00.fixed/Makefile.am	2009-12-24 03:10:14.522447795 +0100
@@ -26,23 +26,10 @@ MAINTAINERCLEANFILES = \
 	config.status \
 	.doc_stamp \
 	.DS_Store \
-	include/etl_profile.h.in \
-	libltdl/COPYING.LIB \
-	libltdl/Makefile.in \
-	libltdl/acinclude.m4 \
-	libltdl/config-h.in \
-	libltdl/configure.in \
-	libltdl/ltdl.h \
-	libltdl/Makefile.am \
-	libltdl/README \
-	libltdl/aclocal.m4 \
-	libltdl/configure \
-	libltdl/ltdl.c \
-	libltdl/stamp-h.in
+	include/etl_profile.h.in
 
 
 SUBDIRS = \
-	libltdl \
 	build_tools \
 	src \
 	examples \


Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/devel/synfig.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- synfig.spec	20 Dec 2009 12:14:38 -0000	1.3
+++ synfig.spec	24 Dec 2009 03:29:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://synfig.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         synfig-0.61.09-optflags.patch
+Patch1:         synfig-0.62.00-ltld.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ETL-devel >= 0.04.13
@@ -22,6 +23,7 @@ BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libmng-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  autoconf automake gettext-devel
 # FIXME: Lack of this causes synfig to segfault
 Requires:       urw-fonts
 
@@ -58,9 +60,14 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .ltdl
+rm -rf libltdl
 
 
 %build
+aclocal -I m4
+automake
+autoconf -i --force
 %configure --disable-static --with-imagemagick --with-magickpp \
         --without-libavcodec
 %if 0%{?fedora} >= 10
@@ -110,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-3
+- Actually apply the optflags patch
+- Drop bundled libltdl
+
 * Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
 - Work around a segfault w/o urw-fonts
 



From rdieter at fedoraproject.org  Thu Dec 24 03:44:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Dec 2009 03:44:33 +0000 (UTC)
Subject: rpms/qgis/F-11 qgis-1.0.2-sip49.patch,NONE,1.1 qgis.spec,1.39,1.40
Message-ID: <20091224034433.51FA011C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qgis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25908

Modified Files:
	qgis.spec 
Added Files:
	qgis-1.0.2-sip49.patch 
Log Message:
* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-4
- qgis rebuild for sip-4.9.x (#538119)


qgis-1.0.2-sip49.patch:
 conversions.sip |   70 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

--- NEW FILE qgis-1.0.2-sip49.patch ---
diff -Naur qgis-1.0.2-orig/python/core/conversions.sip qgis-1.0.2/python/core/conversions.sip
--- qgis-1.0.2-orig/python/core/conversions.sip	2008-08-20 02:55:54.000000000 -0400
+++ qgis-1.0.2/python/core/conversions.sip	2009-12-23 10:29:42.819937299 -0500
@@ -77,17 +77,17 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
     QVector<TYPE> * t = reinterpret_cast< QVector<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete ql;
       return 0;
     }
     ql->append(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = ql;
@@ -153,17 +153,17 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
     QVector<QVector<TYPE> > * t = reinterpret_cast< QVector< QVector<TYPE> > * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete ql;
       return 0;
     }
     ql->append(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = ql;
@@ -243,7 +243,7 @@
     TYPE *t = new TYPE(*it);
     PyObject *tobj;
 
-    if ((tobj = sipConvertFromNewInstance(t, sipClass_TYPE, sipTransferObj)) == NULL)
+    if ((tobj = sipConvertFromNewInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj)) == NULL)
     {
       Py_DECREF(l);
       delete t;
@@ -263,7 +263,7 @@
       return 0;
 
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-      if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, SIP_NOT_NONE))
+      if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), SIP_NOT_NONE))
         return 0;
 
     return 1;
@@ -274,16 +274,16 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    TYPE* t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    TYPE* t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete qset;
       return 0;
     }
     qset->insert(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = qset;
@@ -364,7 +364,7 @@
       Py_ssize_t j = 0;
       while (PyDict_Next(tobj, &j, &kobj2, &tobj2))
       {
-        if (!sipCanConvertToInstance(tobj2, sipClass_TYPE, SIP_NOT_NONE))
+        if (!sipCanConvertToInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), SIP_NOT_NONE))
           return 0;
       }
       
@@ -391,17 +391,17 @@
       int k2 = PyInt_AsLong(kobj2);
       int state;
       
-      TYPE* fa = reinterpret_cast<TYPE*>(sipConvertToInstance(tobj2, sipClass_TYPE, sipTransferObj,SIP_NOT_NONE,&state,sipIsErr));
+      TYPE* fa = reinterpret_cast<TYPE*>(sipConvertToInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj,SIP_NOT_NONE,&state,sipIsErr));
       
       if (*sipIsErr)
       {
-        sipReleaseInstance(tobj2, sipClass_TYPE, state);
+        sipReleaseInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
         delete qm;
         return 0;
       }
       
       qm2.insert(k2, *fa);
-      sipReleaseInstance(tobj2, sipClass_TYPE, state);
+      sipReleaseInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
     }
     qm->insert(k, qm2);
   }
@@ -432,7 +432,7 @@
     {
         QString *t1 = new QString(i.key());
 
-        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_QString, sipTransferObj);
+        PyObject *t1obj = sipConvertFromNewInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), sipTransferObj);
         PyObject *t2obj = PyInt_FromLong( (long) i.value() );
 
         if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
@@ -478,7 +478,7 @@
 
         while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
         {
-            if (!sipCanConvertToInstance(t1obj, sipClass_QString, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), SIP_NOT_NONE))
                 return 0;
         } 
 
@@ -491,19 +491,19 @@
     {
         int state;
 
-        QString *t1 = reinterpret_cast<QString *>(sipConvertToInstance(t1obj, sipClass_QString, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+        QString *t1 = reinterpret_cast<QString *>(sipConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
         QVariant::Type t2 = (QVariant::Type) PyInt_AsLong(t1obj);
 
         if (*sipIsErr)
         {
-            sipReleaseInstance(t1, sipClass_QString, state);
+            sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), state);
             delete qm;
             return 0;
         }
 
         qm->insert(*t1, t2);
 
-        sipReleaseInstance(t1, sipClass_QString, state);
+        sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), state);
     }
  
     *sipCppPtr = qm;
@@ -534,8 +534,8 @@
         TYPE1 *t1 = new TYPE1(i.key());
         TYPE2 *t2 = i.value();
 
-        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
-        PyObject *t2obj = sipConvertFromInstance(t2, sipClass_TYPE2, sipTransferObj);
+        PyObject *t1obj = sipConvertFromNewInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), sipTransferObj);
+        PyObject *t2obj = sipConvertFromInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj);
 
         if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
         {
@@ -579,10 +579,10 @@
 
         while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
         {
-            if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), SIP_NOT_NONE))
                 return 0;
 
-            if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t2obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), SIP_NOT_NONE))
                 return 0;
         } 
 
@@ -595,13 +595,13 @@
     {
         int state1, state2;
 
-        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
-        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
+        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
+        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
  
         if (*sipIsErr)
         {
-            sipReleaseInstance(t1, sipClass_TYPE1, state1);
-            sipReleaseInstance(t2, sipClass_TYPE2, state2);
+            sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), state1);
+            sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
 
             delete qm;
             return 0;
@@ -609,8 +609,8 @@
 
         qm->insert(*t1, t2);
 
-        sipReleaseInstance(t1, sipClass_TYPE1, state1);
-        sipReleaseInstance(t2, sipClass_TYPE2, state2);
+        sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), state1);
+        sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
     }
  
     *sipCppPtr = qm;
@@ -642,7 +642,7 @@
       const double t1 = i.key();
       TYPE2 * t2 = &i.value();
       PyObject *t1obj = PyFloat_FromDouble(t1);
-      PyObject *t2obj = sipConvertFromInstance(t2, sipClass_TYPE2, sipTransferObj);
+      PyObject *t2obj = sipConvertFromInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj);
       if (PyDict_GetItem(d, t1obj) == NULL) {
        PyObject *lst = PyList_New(0);
        PyDict_SetItem(d, t1obj, lst);
@@ -695,7 +695,7 @@
         {
          for (int i = 0; i < PyList_GET_SIZE(t2obj); ++i) {
            if (!sipCanConvertToInstance(PyList_GET_ITEM(t2obj, i),
-                                        sipClass_TYPE2, SIP_NOT_NONE))
+                                        (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), SIP_NOT_NONE))
              return 0;
          }
         }
@@ -712,7 +712,7 @@
          TYPE2 *t2 =
            reinterpret_cast<TYPE2 *>(sipConvertToInstance(PyList_GET_ITEM(t2obj,
                                                                           i),
-                                                          sipClass_TYPE2,
+                                                          (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2),
                                                           sipTransferObj,
                                                           SIP_NOT_NONE,
                                                           &state2,
@@ -720,7 +720,7 @@
 
          if (*sipIsErr)
            {
-             sipReleaseInstance(t2, sipClass_TYPE2, state2);
+             sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
 
              delete qm;
              return 0;
@@ -728,7 +728,7 @@
 
          qm->insert(k, *t2);
 
-         sipReleaseInstance(t2, sipClass_TYPE2, state2);
+         sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
        }
     }
 


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-11/qgis.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- qgis.spec	19 Nov 2009 18:57:13 -0000	1.39
+++ qgis.spec	24 Dec 2009 03:44:33 -0000	1.40
@@ -1,9 +1,8 @@
-%define qt4_bindir %{_libdir}/qt4/bin
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: qgis
 Version: 1.0.2
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: A user friendly Open Source Geographic Information System
 
 Group: Applications/Engineering
@@ -13,6 +12,10 @@ Source0: http://download.osgeo.org/qgis/
 Source1: %{name}.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://trac.osgeo.org/qgis/ticket/1959
+Patch100: qgis-1.0.2-sip49.patch
+
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: qt4-devel
@@ -102,6 +105,8 @@ Addtional theme for qgis - nkids
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch100 -p1 -b .sip49
+
 # fix spurious executable bits
 %{__chmod} -x \
 	./src/app/legend/qgslegend.h \
@@ -126,12 +131,13 @@ done
 	-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
 	-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
 	.
-make VERBOSE=1 %{?_smp_mflags}
+
+make %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-make VERBOSE=1 DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
 # remove rpath from files
 chrpath --delete \
@@ -246,6 +252,12 @@ desktop-file-install --vendor="fedora" \
 
 
 %changelog
+* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-4
+- qgis rebuild for sip-4.9.x (#538119)
+
+* Fri Dec 04 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.0.2-3
+- Rebuild for new Geos.
+
 * Tue Nov 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-2 
 - -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api (#538119) 
 



From rdieter at fedoraproject.org  Thu Dec 24 03:45:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 24 Dec 2009 03:45:33 +0000 (UTC)
Subject: rpms/qgis/F-12 qgis-1.0.2-sip49.patch,NONE,1.1 qgis.spec,1.39,1.40
Message-ID: <20091224034533.2509D11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qgis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26168

Modified Files:
	qgis.spec 
Added Files:
	qgis-1.0.2-sip49.patch 
Log Message:
* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-4
- qgis rebuild for sip-4.9.x (#538119)


qgis-1.0.2-sip49.patch:
 conversions.sip |   70 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

--- NEW FILE qgis-1.0.2-sip49.patch ---
diff -Naur qgis-1.0.2-orig/python/core/conversions.sip qgis-1.0.2/python/core/conversions.sip
--- qgis-1.0.2-orig/python/core/conversions.sip	2008-08-20 02:55:54.000000000 -0400
+++ qgis-1.0.2/python/core/conversions.sip	2009-12-23 10:29:42.819937299 -0500
@@ -77,17 +77,17 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
     QVector<TYPE> * t = reinterpret_cast< QVector<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete ql;
       return 0;
     }
     ql->append(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = ql;
@@ -153,17 +153,17 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
     QVector<QVector<TYPE> > * t = reinterpret_cast< QVector< QVector<TYPE> > * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qvector_qgspoint, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete ql;
       return 0;
     }
     ql->append(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = ql;
@@ -243,7 +243,7 @@
     TYPE *t = new TYPE(*it);
     PyObject *tobj;
 
-    if ((tobj = sipConvertFromNewInstance(t, sipClass_TYPE, sipTransferObj)) == NULL)
+    if ((tobj = sipConvertFromNewInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj)) == NULL)
     {
       Py_DECREF(l);
       delete t;
@@ -263,7 +263,7 @@
       return 0;
 
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-      if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, SIP_NOT_NONE))
+      if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), SIP_NOT_NONE))
         return 0;
 
     return 1;
@@ -274,16 +274,16 @@
   for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
   {
     int state;
-    TYPE* t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    TYPE* t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 
     if (*sipIsErr)
     {
-      sipReleaseInstance(t, sipClass_TYPE, state);
+      sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
       delete qset;
       return 0;
     }
     qset->insert(*t);
-    sipReleaseInstance(t, sipClass_TYPE, state);
+    sipReleaseInstance(t, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
   }
 
   *sipCppPtr = qset;
@@ -364,7 +364,7 @@
       Py_ssize_t j = 0;
       while (PyDict_Next(tobj, &j, &kobj2, &tobj2))
       {
-        if (!sipCanConvertToInstance(tobj2, sipClass_TYPE, SIP_NOT_NONE))
+        if (!sipCanConvertToInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), SIP_NOT_NONE))
           return 0;
       }
       
@@ -391,17 +391,17 @@
       int k2 = PyInt_AsLong(kobj2);
       int state;
       
-      TYPE* fa = reinterpret_cast<TYPE*>(sipConvertToInstance(tobj2, sipClass_TYPE, sipTransferObj,SIP_NOT_NONE,&state,sipIsErr));
+      TYPE* fa = reinterpret_cast<TYPE*>(sipConvertToInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), sipTransferObj,SIP_NOT_NONE,&state,sipIsErr));
       
       if (*sipIsErr)
       {
-        sipReleaseInstance(tobj2, sipClass_TYPE, state);
+        sipReleaseInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
         delete qm;
         return 0;
       }
       
       qm2.insert(k2, *fa);
-      sipReleaseInstance(tobj2, sipClass_TYPE, state);
+      sipReleaseInstance(tobj2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE), state);
     }
     qm->insert(k, qm2);
   }
@@ -432,7 +432,7 @@
     {
         QString *t1 = new QString(i.key());
 
-        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_QString, sipTransferObj);
+        PyObject *t1obj = sipConvertFromNewInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), sipTransferObj);
         PyObject *t2obj = PyInt_FromLong( (long) i.value() );
 
         if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
@@ -478,7 +478,7 @@
 
         while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
         {
-            if (!sipCanConvertToInstance(t1obj, sipClass_QString, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), SIP_NOT_NONE))
                 return 0;
         } 
 
@@ -491,19 +491,19 @@
     {
         int state;
 
-        QString *t1 = reinterpret_cast<QString *>(sipConvertToInstance(t1obj, sipClass_QString, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+        QString *t1 = reinterpret_cast<QString *>(sipConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
         QVariant::Type t2 = (QVariant::Type) PyInt_AsLong(t1obj);
 
         if (*sipIsErr)
         {
-            sipReleaseInstance(t1, sipClass_QString, state);
+            sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), state);
             delete qm;
             return 0;
         }
 
         qm->insert(*t1, t2);
 
-        sipReleaseInstance(t1, sipClass_QString, state);
+        sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString), state);
     }
  
     *sipCppPtr = qm;
@@ -534,8 +534,8 @@
         TYPE1 *t1 = new TYPE1(i.key());
         TYPE2 *t2 = i.value();
 
-        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
-        PyObject *t2obj = sipConvertFromInstance(t2, sipClass_TYPE2, sipTransferObj);
+        PyObject *t1obj = sipConvertFromNewInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), sipTransferObj);
+        PyObject *t2obj = sipConvertFromInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj);
 
         if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
         {
@@ -579,10 +579,10 @@
 
         while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
         {
-            if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), SIP_NOT_NONE))
                 return 0;
 
-            if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
+            if (!sipCanConvertToInstance(t2obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), SIP_NOT_NONE))
                 return 0;
         } 
 
@@ -595,13 +595,13 @@
     {
         int state1, state2;
 
-        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
-        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
+        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
+        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
  
         if (*sipIsErr)
         {
-            sipReleaseInstance(t1, sipClass_TYPE1, state1);
-            sipReleaseInstance(t2, sipClass_TYPE2, state2);
+            sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), state1);
+            sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
 
             delete qm;
             return 0;
@@ -609,8 +609,8 @@
 
         qm->insert(*t1, t2);
 
-        sipReleaseInstance(t1, sipClass_TYPE1, state1);
-        sipReleaseInstance(t2, sipClass_TYPE2, state2);
+        sipReleaseInstance(t1, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE1), state1);
+        sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
     }
  
     *sipCppPtr = qm;
@@ -642,7 +642,7 @@
       const double t1 = i.key();
       TYPE2 * t2 = &i.value();
       PyObject *t1obj = PyFloat_FromDouble(t1);
-      PyObject *t2obj = sipConvertFromInstance(t2, sipClass_TYPE2, sipTransferObj);
+      PyObject *t2obj = sipConvertFromInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), sipTransferObj);
       if (PyDict_GetItem(d, t1obj) == NULL) {
        PyObject *lst = PyList_New(0);
        PyDict_SetItem(d, t1obj, lst);
@@ -695,7 +695,7 @@
         {
          for (int i = 0; i < PyList_GET_SIZE(t2obj); ++i) {
            if (!sipCanConvertToInstance(PyList_GET_ITEM(t2obj, i),
-                                        sipClass_TYPE2, SIP_NOT_NONE))
+                                        (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), SIP_NOT_NONE))
              return 0;
          }
         }
@@ -712,7 +712,7 @@
          TYPE2 *t2 =
            reinterpret_cast<TYPE2 *>(sipConvertToInstance(PyList_GET_ITEM(t2obj,
                                                                           i),
-                                                          sipClass_TYPE2,
+                                                          (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2),
                                                           sipTransferObj,
                                                           SIP_NOT_NONE,
                                                           &state2,
@@ -720,7 +720,7 @@
 
          if (*sipIsErr)
            {
-             sipReleaseInstance(t2, sipClass_TYPE2, state2);
+             sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
 
              delete qm;
              return 0;
@@ -728,7 +728,7 @@
 
          qm->insert(k, *t2);
 
-         sipReleaseInstance(t2, sipClass_TYPE2, state2);
+         sipReleaseInstance(t2, (sipWrapperType *) sipTypeAsPyTypeObject (sipType_TYPE2), state2);
        }
     }
 


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-12/qgis.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- qgis.spec	19 Nov 2009 18:56:01 -0000	1.39
+++ qgis.spec	24 Dec 2009 03:45:33 -0000	1.40
@@ -1,9 +1,8 @@
-%define qt4_bindir %{_libdir}/qt4/bin
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: qgis
 Version: 1.0.2
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: A user friendly Open Source Geographic Information System
 
 Group: Applications/Engineering
@@ -13,6 +12,10 @@ Source0: http://download.osgeo.org/qgis/
 Source1: %{name}.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://trac.osgeo.org/qgis/ticket/1959
+Patch100: qgis-1.0.2-sip49.patch
+
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: qt4-devel
@@ -102,6 +105,8 @@ Addtional theme for qgis - nkids
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch100 -p1 -b .sip49
+
 # fix spurious executable bits
 %{__chmod} -x \
 	./src/app/legend/qgslegend.h \
@@ -126,12 +131,13 @@ done
 	-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
 	-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
 	.
-make VERBOSE=1 %{?_smp_mflags}
+
+make %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-make VERBOSE=1 DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
 # remove rpath from files
 chrpath --delete \
@@ -246,9 +252,18 @@ desktop-file-install --vendor="fedora" \
 
 
 %changelog
+* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-4
+- qgis rebuild for sip-4.9.x (#538119)
+
+* Fri Dec 04 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.0.2-3
+- Rebuild for new Geos.
+
 * Tue Nov 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-2 
 - -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api (#538119) 
 
+* Thu Oct 22 2009 Alex Lancaster <alexlan[AT] fedoraproject org> - 1.0.2-1.1
+- Rebuilt to fix python problem (#518121)
+
 * Thu Jul 30 2009 Douglas E. Warner <silfreed at silfreed.net> 1.0.2-1
 - updating for 1.0.2
 - moving libqgispython.so to python subpackage for bug#507381



From tagoh at fedoraproject.org  Thu Dec 24 06:20:57 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 24 Dec 2009 06:20:57 +0000 (UTC)
Subject: rpms/man-pages-ja/devel man-pages-ja-486655-mkfs.8.patch, NONE,
	1.1 man-pages-ja-509048-less.1.patch, NONE,
	1.1 man-pages-ja-515467-strings.1.patch, NONE,
	1.1 man-pages-ja-527638-chgrp.1.patch, NONE,
	1.1 man-pages-ja-537103-ip.7.patch, NONE,
	1.1 man-pages-ja-fix-configure.perl.patch, NONE,
	1.1 man-pages-ja-fix-mdoc.patch, NONE, 1.1 man-pages-ja.spec,
	1.75, 1.76 man-pages-ja-20010515-rh.patch, 1.1,
	NONE man-pages-ja-20011115-fixpipe.patch, 1.1,
	NONE man-pages-ja-20030415-utf8.patch, 1.1,
	NONE man-pages-ja-fix-uninitialized-value.patch, 1.1,
	NONE man-pages-ja-fixpipe.patch, 1.1,
	NONE man-pages-ja-timestamp.patch, 1.1, NONE
Message-ID: <20091224062058.151F611C00E6@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/man-pages-ja/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2189

Modified Files:
	man-pages-ja.spec 
Added Files:
	man-pages-ja-486655-mkfs.8.patch 
	man-pages-ja-509048-less.1.patch 
	man-pages-ja-515467-strings.1.patch 
	man-pages-ja-527638-chgrp.1.patch 
	man-pages-ja-537103-ip.7.patch 
	man-pages-ja-fix-configure.perl.patch 
	man-pages-ja-fix-mdoc.patch 
Removed Files:
	man-pages-ja-20010515-rh.patch 
	man-pages-ja-20011115-fixpipe.patch 
	man-pages-ja-20030415-utf8.patch 
	man-pages-ja-fix-uninitialized-value.patch 
	man-pages-ja-fixpipe.patch man-pages-ja-timestamp.patch 
Log Message:
* Thu Dec 24 2009 Akira TAGOH <tagoh at redhat.com> - 20091215-1
- updates to 20091215.
- apply some patches to correct typos:
  - man-pages-ja-486655-mkfs.8.patch
  - man-pages-ja-509048-less.1.patch
  - man-pages-ja-515467-strings.1.patch
  - man-pages-ja-527638-chgrp.1.patch
  - man-pages-ja-537103-ip.7.patch
  - man-pages-ja-fix-mdoc.patch
- clean up the spec file.

man-pages-ja-486655-mkfs.8.patch:
 mkfs.8 |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE man-pages-ja-486655-mkfs.8.patch ---
--- man-pages-ja-20060815/manual/util-linux/man8/mkfs.8.orig	2009-02-20 15:50:00.000000000 -0500
+++ man-pages-ja-20060815/manual/util-linux/man8/mkfs.8	2009-02-20 15:49:55.000000000 -0500
@@ -32,8 +32,6 @@
 .I filesys
 ??????????????????????????????????????????
 .RI ( /dev/hda1 , /dev/sdb2
-????) ??????????????????????
-.RI ( / , /usr , /home
 ????) ????????
 .I blocks
 ??????????????????????????????????????????????

man-pages-ja-509048-less.1.patch:
 less.1 |  268 +++++++++++++++++------------------------------------------------
 1 file changed, 74 insertions(+), 194 deletions(-)

--- NEW FILE man-pages-ja-509048-less.1.patch ---
--- man-pages-ja-20060815.orig/manual/GNU_less/man1/less.1	2006-08-15 00:07:06.000000000 +0900
+++ man-pages-ja-20060815/manual/GNU_less/man1/less.1	2009-11-17 17:53:46.000000000 +0900
@@ -34,17 +34,15 @@
 .br
 .B "less --version"
 .br
-.B "less [-[+]aBcCdeEfgGiImMnNqQrsSuUVWwXZ]"
+.B "less [-[+]aBcCdeEfFgGiIJKLmMnNqQrRsSuUVwWX~]"
 .br
-.B "     [-b \fIbufs\fP] [-h \fIlines\fP] [-j \fIline\fP] [-k \fIkeyfile\fP]"
+.B "     [-b \fIspace\fP] [-h \fIlines\fP] [-j \fIline\fP] [-k \fIkeyfile\fP]"
 .br
-.B "     [-K \fIcharacter set\fP] [-{oO} \fIlogfile\fP]"
+.B "     [-{oO} \fIlogfile\fP] [-p \fIpattern\fP] [-P \fIprompt\fP] [-t \fItag\fP]"
 .br
-.B "     [-p \fIpattern\fP] [-P \fIprompt\fP] [-t \fItag\fP]"
+.B "     [-T \fItagsfile\fP] [-x \fItab\fP,...] [-y \fIlines\fP] [-[z] \fIlines\fP]"
 .br
-.B "     [-T \fItagsfile\fP] [-x \fItab\fP] [-y \fIlines\fP] [-[z] \fIlines\fP]"
-.br
-.B "     [+[+]\fIcmd\fP] [--] [\fIfilename\fP]..."
+.B "     [-# \fIshift\fP] [+[+]\fIcmd\fP] [--] [\fIfilename\fP]..."
 .br
 (??????????????????????????????????????????
 ??????????????????????????????????????)
@@ -297,17 +295,16 @@
 ???? N ???????????????????????? N ??????????????????????????
 .IP ":d"
 ????????????????????????????????????????????
+.IP t
+???????????? 1 ??????????????????????????????????????????????????
+???????????????????? -t ??????????????????
+.IP T
+???????????? 1 ??????????????????????????????????????????????????
 .IP "= ?????? ^G ?????? :f"
 ??????????????????????????????????????
 ????????????????????????????????????????????????????????????????
 ????????????????????????????????????????????????
 ????????????????????????????????????????????????
-.IP "@"
-??????????????????????????????????????????????????????
-????????
-.I less
-??????(???????? JLESSCHARSET ??????????) ??????????, japanese, ujis, sjis,
-iso8, noconv, none ?????? 7 ??????????????????????????
 .IP \-
 ???????????????????????????? (??????????????????????) ???????? 1 ????
 ??????????????????????
@@ -411,7 +408,7 @@
 ??????????????????????????????????????????????
 ????????--Quit-at-eof ?? --QUIT-AT-EOF ??????????
 .PP
-???????? "LESS" ?? "JLESS" ????????????????????????????????
+???????? "LESS" ????????????????????????????????
 ????????
 .I less
 ???????????????? "less -options ..." ??????????????????????????????
@@ -431,8 +428,8 @@
 ???????????????? 2 ??????????????????????????????????????????
 .sp
 ????????????????????????????????????????????????????
-?????????????????????????????????? LESS ?????? JLESS ??????????????
-?????????????????????????????? LESS ?????? JLESS ????????????
+?????????????????????????????????? LESS ??????????????
+?????????????????????????????? LESS ????????????
 ???????????????????????? "\-+" ??????????????
 ??????????????????????????????????????????????????????????
 .sp
@@ -567,10 +564,18 @@
 ??????????????????????
 .I lesskey
 ????????????????????????
-.IP -K\fIcharset\fP
+.IP "-K ?????? --quit-on-intr"
+???????????????? (?????? ^C) ??????????????????????
+.I less
+??????????????????????????????????????????????????????
 .I less
-???????????? JLESSCHARSET ???????? LESSCHARSET ????????????????
-????????????????????????????????????????????????????????
+??????????????????????????????????????
+.IP "-L ?????? --no-lessopen"
+???????? LESSOPEN ?????????? (????????????????????????????????????????????)??
+????????????????
+.I less
+????????????????????????????????????????????????????????????
+????????????????????????????????????????
 .IP "-m ?????? --long-prompt"
 .I less
 ????(\fImore\fP ????????) ????????????????????????????????????????????
@@ -625,8 +630,8 @@
 ??????????????????????
 .I less
 ????????????????????????????????????????????
-???????? LESS ?????? JLESS ????????????
-???????????????????????????????? LESS ?????? JLESS ??????
+???????? LESS ????????????
+???????????????????????????????? LESS ??????
 ????????????????????????????????
 ??????????????????????????????????????????????????
 -Ps ?????????????????????????????????????????????? (????) ????????????
@@ -731,13 +736,20 @@
 ????????????????????????????????????????
 ?????????? (??) ??????????????????????
 ??????????????????????????????????????????????????????????????????????????????
-.IP "-x\fIn\fP ?????? --tabs=\fIn\fP"
-?????????????? \fIn\fP ????????????????
+.IP "-x\fIn\fP,... ?????? --tabs=\fIn\fP,..."
+?????????????? \fIn\fP ????????????????\fIn\fP ????????????????????????????
+\fIn\fP ????????????????????????????????????????????????????????????????????????????
+??????????????????????????????????????????????????????????????????????????
+\fI\-x9,17\fP ?? 9, 17, 25, 33 ????????????????????????????????
 \fIn\fP ?????????????? 8 ????????
 .IP "-X ?????? --no-init"
 ????????termcap ??????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????????????????
 ????????????????????
+.IP "--no-keypad"
+????????keypad ??????????????????????????????????????????????????
+?????????????????????????? keypad ??????????????????????????????????????????????
+????????????????????
 .IP "-y\fIn\fP ?????? --max-forw-scroll=\fIn\fP"
 ??????????????????????????????
 ??????\fIn\fP ????????????????????????????????????????
@@ -760,10 +772,6 @@
 ???????????? 20 ????????????????????????????????
 ???????????????????? 40 ????????????????????????
 ?????????????????????????????? 36 ????????????????
-.IP -Z
-???????? JLESSCHARSET ?? "japanese" ??????????????????????
-UJIS ?????? SJIS ????????????????????
-????????????????SJIS ?????? UJIS ????????????????
 .IP -"\fIcc\fP\ or\ --quotes=\fIcc\fP
 ????????????????????????????????????
 ??????????????????????????????????????????????????????????????????????????
@@ -1051,14 +1059,7 @@
 .PP
 ????????????????????????????????????????????????????????????????????????????
 ??????????????????????????????????
-???????? JLESSCHARSET ?? LESSCHARSET ????????????????????????????????????
-.I less
-?????????????????????? 2 ????????????????????????????
-???????? JLESSCHARSET ????????????????????
-?????????????????? LESSCHARSET ??????????????????????????????????
-????????????????????????
-.I less
-????????????????????????????
+???????? LESSCHARSET ????????????????????????????????????
 ????????????????????????????????????????
 .IP ascii
 BS, TAB, NL, CR, formfeed ??????????????????
@@ -1068,159 +1069,22 @@
 160 ???? 255 ??????????????????????????????????????????ASCII ??????????????
 .IP latin1
 iso8859 ????????
+.IP latin9
+iso8859 ????????
 .IP dos
 MS-DOS ??????????????????????????
 .IP ebcdic
 EBCDIC ??????????????????????
+.IP IBM-1047
+OS/390 Unix?????????????????? EBCDIC ???????????????????????????? latin1 ????????????????LESSCHARSET=IBM-1047 ???????? LC_CTYPE=en_US ??????????????????????????????????????????????????????????
 .IP koi8-r
 ??????????????????????????????
 .IP next
 NeXT ????????????????????????????????
 .IP utf-8
 ISO 10646 ???????????? UTF-8 ????????????????????????????
-.PP
-JLESSCHARSET ????????????????????????????????
-.IP iso7
-7 ???????????????? ISO 2022 ????????????????????????????????
-128 ???? 225 ????????????????????????????????????????
-.I less
-????????????????ISO 2022 ?? level 3 ????????
-.IP iso8
-8 ???????????????? ISO 2022 ????????????????????????????????
-.I less
-????????????????ISO 2022 ?? level 3 ????????
-.IP jis
-7 ???????????????? ISO 2022 ??????????????????????????????????????
-.IP ujis
-?????? 32 ???? 127 ????????????????ASCII ??????????????????
-?????? 162 ???? 254 ????????????????JISX 0208 ????????????
-JISX 0201 ????????????????????UJIS ??????????????????
-JISX 0212 ??????????????????????
-????????????????????????????????????????
-.IP euc
-ujis ????????
-.IP sjis
-?????? 32 ???? 127 ????????????????ASCII ??????????????????
-?????? 128 ???? 252 ????????????????
-JISX 0208 ???????????? JISX 0201 ??????????????????????????????
-????????????????????????????????????????
-.IP japanese
-??????????????????????????????jis, ujis, sjis ????????????
-.I less
-?? jis ????????????????
-.PP
-?????????????????????????????????? (??????????????????) ????????????
-????????
-.I less
-????????????????????????????????????????????????????????????????????????
-???????????????????????????? JLESSCHARSET ??????????????????
-.IP ujis-iso7
-?????? ujis ?? iso7 ????????????
-.I less
-?? iso7 ????????????????
-.IP euc-iso7
-ujis-iso7 ????????
-.IP sjis-iso7
-?????? sjis ?? iso7 ????????????
-.I less
-?? iso7 ????????????????
-.IP ujis-jis
-?????? ujis ?? jis ????????????
-.I less
-?? jis ????????????????
-.IP euc-jis
-ujis-jis ????????
-.IP sjis-jis
-?????? sjis ?? jis ????????????
-.I less
-?? jis ????????????????
-.IP jis-ujis
-?????? jis ?? ujis ????????????
-.I less
-?? ujis ????????????????
-.IP jis-euc
-jis-ujis ????????
-.IP jis-sjis
-?????? jis ?? sjis ????????????
-.I less
-?? sjis ????????????????
-.IP japanese-iso7
-?????? japanese ?? iso7 ????????????
-.I less
-?? iso7 ????????????????
-.IP japanese-jis
-?????? japanese ????????????
-.I less
-?? jis ????????????????
-japanese ????????
-.IP japanese-ujis
-?????? japanese ????????????
-.I less
-?? ujis ????????????????
-.IP japanese-euc
-japanese-ujis ????????
-.IP japanese-sjis
-?????? japanese ????????????
-.I less
-?? sjis ????????????????
-.IP ujis-sjis
-?????? ujis ????????????
-.I less
-?? sjis ????????????????
-.IP euc-sjis
-ujis-sjis ????????
-.IP sjis-ujis
-?????? sjis ????????????
-.I less
-?? ujis ????????????????
-.IP sjis-euc
-sjis-ujis ????????
-.PP
-???????????????????????????????????????????? LANG ??????????????????
-"ja_JP" ????????"japan" ???????????????? LANG ????????????
-.I less
-????????????????????????????????????????????????????????
-???????? LANG ????????????????????????????????????????????
-.PP
-ISO 2022 ????????????????????????????????????????????
-??????????????????????4????????????????????????????
-???????? JLESSPLANESET ??????????????????????????????????????
-???????? JLESSPLANESET ????"japanese", "ujis", "euc" ????????
-.I less
-????g1 ?????????? JISX 0208??g2 ?????????? JISX 0201 ??????????
-g3 ?????????? JISX 0212 ????????????
-???????? JLESSPLANESET ????"latin1", "latin2", "latin3", "latin4",
-"greek", "alabic", "hebrew", "cyrillic", "latin5" ????????
-.I less 
-????g1 ?????????? ISO 8859 ??????????????????
-????????????????
-.I less 
-???????????? JLESSPLANESET ??
-????????????????????????????????????????????????????????????????
-??????????JLESSPLANESET ???????? "\\e" ??????????????????????????????????
-.PP
-.I less
-????ISO 2022 ??????????????????????????????????????????
-??????????????????????????????????????????????
-??????????????????????????????????????????????????????????????
-????????
-.I less
-??????????????????????????????????
-'^[(', '^[-', '^[$(', '^[$-', '^N', '^O' ????????
-6 ????????????????????????????????????????
-????????
-.I less
-??????????????????????????????????????????????????????????????
-.PP
-??????????????????????????????????????????????????
-???????? JLESSKEYCHARSET ????????????????????????????????????????????
-JLESSKEYCHARSET ???????????????????????????????? JLESSCHARSET 
-??????????????
-.PP
-LESSCHARSET ????????????????????????????????
-???????????????????????? latin1 ????????
-???????????????? LC_ALL, LC_CTYPE, LANG ????????????
-"UTF-8" ???????????????????????????????????????????????? utf-8 ????????
+.IP windows
+Microsoft Windows??????????????????????????????(cp1251)
 .PP
 ????????????????????
 LESSCHARSET ??????????????????????????????????????????
@@ -1250,6 +1114,9 @@
 .br
 	\ \ \ \ \ \ 	9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b.
 .br
+	IBM-1047	4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc
+	\ \ \ \ \ \	191.b
+.br
 	iso8859	8bcccbcc18b95.33b.
 .br
 	koi8-r	8bcccbcc18b95.b128.
@@ -1258,14 +1125,22 @@
 .br
 	next\ \ 	8bcccbcc18b95.bb125.bb
 .PP
-LESSCHARSET ?? LESSCHARDEF ????????????????????????????????????
-??????????
+LESSCHARSET ?? LESSCHARDEF ????????????????????????????????????LC_ALL, LC_CTYPE ????????
+LANG ?????????? "UTF-8", "UTF8", "utf-8" ???????? "utf8" ????????????????????????
+?????????????????????? utf-8 ????????
+.PP
+??????????????????????????????????????
 .I setlocale
 ??????????????????????????????????????
 .I less
 ?????????????????????????? setlocale ????????????
 setlocale ?????????? LANG ???????? LC_CTYPE ??????????????
 .PP
+????????????
+.I setlocale
+????????????????????????????????????????????????????????????????
+latin1 ????????
+.PP
 ???????????????????????????????????????? (????????) ????????????
 ???????????????????????????????? (control-A ?? ^A ????????????) 
 ????????????????????????????
@@ -1281,7 +1156,19 @@
 (% ?? x, X, o, d ????) ????????????????????
 LESSBINFMT ?? "*u[%x]" ????????????????????????????
 ???????????????? 16 ????????????????????????????
-LESSBINFMT ??????????????????????????????????????"*s<%X>" ??????????????????
+LESSBINFMT ??????????????????????????????????????"*s<%02X>" ????????
+????: LESSBINFMT ????????????????????????????31????????????????????????????
+.PP
+???????????? utf-8 ???????????????? LESSUTFBINFMT ?? LESSBINFMT ????????????????????
+???????????????????????????????????? Unicode ??????????????????????????????
+(??????????????????????????????????)???????????????? "<U+%04lX>" ????????
+LESSUTFBINFMT ?? LESSBINFMT ?????????????? ("*x") ????????????????????????????
+????????????????????????????????; LESSUTFBINFMT ?? LESSBINFMT ??????????????????????????????
+????????????????????????????????????
+UTF-8 ???????????????????????????????? (????????????????????????????????
+????????????????non-shortest form????????????????????????????????????????????????stray trailing ??????????)
+?? LESSBINFMT ???????????????????????????? UTF-8 ????????????????????????????????????
+??????????????????
 
 .SH "??????????"
 -P ????????????????????????????????????????????????????????????????
@@ -1312,7 +1199,7 @@
 .IP "%E"
 ?????????????? (???????? VISUAL??VISUAL ????????????????????????
 ???????? EDITOR) ??????????????????
-????????JLESSEDIT ??????????????????????????
+????????LESSEDIT ??????????????????????????
 .IP "%f"
 ??????????????????????????????????????
 .IP "%i"
@@ -1339,9 +1226,6 @@
 ??????????????????????????????????????????????????
 .IP "%x"
 ??????????????????????????????????????????????????????????
-.IP "%K"
-???????????????????????????????????? ASCII ????????????????
-?? ASCII ??????????????????????????????
 .PP
 ??????(????????????????????????????????????????????????????) 
 ????????????????????????????????????????????????????????????
@@ -1516,23 +1400,14 @@
 .IP LESS
 .I less
 ??????????????????????????????
-.IP JLESS
-???????? LESS ????????
 .IP LESSANSIENDCHARS
 ANSI ???????????????????????????????????????? (???????????? "m")??
 .IP LESSBINFMT
 ??????????????????????????????????????????????????????????????????????
 .IP LESSCHARDEF
 ??????????????????????
-.IP JLESSCHARSET
-??????????????????????????????????????????
 .IP LESSCHARSET
-JLESSCHARSET ??????????????????????????
 ??????????????????????????????????????????
-.IP JLESSKEYCHARSET
-????????????????????????????????????????????????????????????????
-.IP JLESSPLANESET
-???????????????????? ISO 2022 ????????????????????????????????????????????????
 .IP LESSCLOSE
 (????????????) ????????????????????????????????????????????????????
 .IP LESSECHO
@@ -1542,6 +1417,11 @@
 .IP LESSEDIT
 (v ??????????????????) ??????????????????????????????
 ????????????????????????????????????????
+.IP LESSGLOBALTAGS
+?????????????????????????? -t ????????????????????????????????????
+.I global
+(1) ???????????????????????????????????????????? "global" ??????????????????
+??????????????????????????????????????????????????
 .IP LESSKEY
 ???????????? lesskey(1) ????????????????
 .IP LESSKEY_SYSTEM

man-pages-ja-515467-strings.1.patch:
 strings.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-ja-515467-strings.1.patch ---
--- man-pages-ja-20060815.orig/manual/GNU_binutils/man1/strings.1	2006-08-15 00:07:05.000000000 +0900
+++ man-pages-ja-20060815/manual/GNU_binutils/man1/strings.1	2009-11-13 18:42:32.000000000 +0900
@@ -91,7 +91,7 @@
 .TP
 .B "\-\fImin\-len\fP"
 .TP
-.B "\-bytes=\fImin\-len\fP"
+.B "\-\-bytes=\fImin\-len\fP"
 .I min\-len
 ???????????????????????????????????????????????????????? 4??
 

man-pages-ja-527638-chgrp.1.patch:
 chgrp.1 |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE man-pages-ja-527638-chgrp.1.patch ---
--- man-pages-ja-20060815/manual/gnumaniak/man1/chgrp.1.original	2009-10-07 09:53:07.000000000 +0900
+++ man-pages-ja-20060815/manual/gnumaniak/man1/chgrp.1	2009-10-07 09:52:11.000000000 +0900
@@ -45,14 +45,13 @@
 ????????????????????????????????????????
 .TP
 .B "\-\-dereference"
-??????????????????????????????????????????????????????????????
+??????????????????????????????????????????????????????????????????????????????????????
 .TP
 .B "\-f, \-\-silent, \-\-quiet"
 ??????????????????????????????????????????????????????????????????????????
 .TP
 .B "\-h, \-\-no\-dereference"
 ????????????????????????????????????????????????????????????
-????????????????????????
 .B lchown (2)
 ??????????????????????????????????????\fBchown\fR ????????????
 ??????????????????????????????????????????????????????

man-pages-ja-537103-ip.7.patch:
 ip.7 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-ja-537103-ip.7.patch ---
--- man-pages-ja-20060815.orig/manual/LDP_man-pages/man7/ip.7	2006-08-15 00:07:11.000000000 +0900
+++ man-pages-ja-20060815/manual/LDP_man-pages/man7/ip.7	2009-11-13 18:56:28.000000000 +0900
@@ -662,7 +662,7 @@
 ????????
 .I ip_mreqn
 ??????
-.I ip_mreq
+.I in_addr
 ??????????????
 .IP
 ??????????????????????????????????????

man-pages-ja-fix-configure.perl.patch:
 configure.perl |   45 +++++++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 12 deletions(-)

--- NEW FILE man-pages-ja-fix-configure.perl.patch ---
diff -pruN man-pages-ja-20091215.orig/script/configure.perl man-pages-ja-20091215/script/configure.perl
--- man-pages-ja-20091215.orig/script/configure.perl	2002-08-31 04:27:01.000000000 +0900
+++ man-pages-ja-20091215/script/configure.perl	2009-12-24 15:09:50.000000000 +0900
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+use IO::Handle;
 use Env qw (PATH LANG);
 use strict 'vars';
 
@@ -11,6 +12,13 @@ my ($MANROOT, $PACK, $OWNER, $GROUP,
 my $PKGLIST = "script/pkgs.list";
 my @pack_method = ("none", "gzip", "bzip2", "compress");
 my $podsec = "1";
+my @stdin;
+my $pipeflag = 0;
+
+if ( -p STDIN ) {
+    $pipeflag = 1;
+    @stdin = STDIN->getlines;
+}
 
 #
 # ????????????????
@@ -21,7 +29,7 @@ print "(just Return if you accept defaul
 do{
     $MANROOT = "/usr/share/man/$LANG";
     print "   Install directory   [$MANROOT] ?: ";
-    $ans = <STDIN>; chomp $ans;
+    $ans = &get_from_stdin; chomp $ans;
     if ($ans ne "") {$MANROOT = $ans;}
 
     print "   compress manual with..\n";
@@ -29,19 +37,19 @@ do{
 	print "      $i: $pack_method[$i]\n";
     }
     print "   select [0..$#pack_method] : ";
-    $ans = <STDIN>; chomp $ans;
+    $ans = &get_from_stdin; chomp $ans;
     if  ($ans eq "") {$ans = 0;}
     if ($ans < 0 || $ans > $#pack_method) {$PACK = $pack_method[0]}
     else {$PACK = $pack_method[$ans]}
 
     $OWNER = "root";
     print "   uname of page owner [$OWNER] ?: ";
-    $ans = <STDIN>; chomp $ans;
+    $ans = &get_from_stdin; chomp $ans;
     if ($ans ne "") {$OWNER = $ans;}
 
     $GROUP = "root";
     print "   group of page owner [$GROUP] ?: ";
-    $ans = <STDIN>; chomp $ans;
+    $ans = &get_from_stdin; chomp $ans;
     if ($ans ne "") {$GROUP = $ans;}
 
     print "\n";
@@ -51,7 +59,7 @@ do{
     print "\n";
     do {
 	print "All OK? (Yes, [C]ontinue / No, [R]eselect) : ";
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
     } until ($ans =~ /^[yYnNcCrR]/);
 
 } until ($ans =~ /^[yYcC]/);
@@ -90,14 +98,14 @@ do{
     for $i (0 .. $#pl){
 	my $qstr = ($main::pw{$pl[$i]} > -1) ? "[Y/n]" : "[y/N]";
 	printf "   [%2d/%2d] %-15s %s ?: ", $i, $#pl, $pl[$i], $qstr;
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
 	if ($ans =~ /[Yy].*/) { $main::pw{$pl[$i]} = $i;}
 	if ($ans =~ /[Nn].*/) { $main::pw{$pl[$i]} = -1;}
     }
 
     do {
 	print "All OK? (Yes, [C]ontinue / No, [R]eselect) : ";
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
     } until ($ans =~ /[yYnNcCrR].*/);
 
 } until ($ans =~ /^[yYcC]/);
@@ -111,6 +119,7 @@ while(<TL>) {
     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;}
@@ -161,7 +170,7 @@ do{
 	}
 	print "   Which to install? (0..$cf) : ";
 
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
 	if ($ans eq "") {$ans = 0};
 	if ($ans < 0 || $ans > $cf) { $ans = 0 };
 
@@ -176,7 +185,7 @@ do{
 
     do {
 	print "All OK? (Yes, [C]ontinue / No, [R]eselect) : ";
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
     } until ($ans =~ /^[yYnNcCrR]/);
 
 } until ($ans =~ /^[yYcC]/);
@@ -191,10 +200,8 @@ open (ISS, ">installman.sh") || die "can
 print ISS "#!/bin/sh\n";
 
 print ISS "mkdir -p $MANROOT;";
-print ISS "chown $OWNER.$GROUP $MANROOT\n";
 for $i (1..9){
     print ISS "mkdir -p $MANROOT/man$i;";
-    print ISS "chown $OWNER.$GROUP $MANROOT/man$i\n";
 }
 print ISS "\n";
 
@@ -205,7 +212,10 @@ foreach my $key (sort keys %ppage) {
     my $mandst = "$MANROOT/man$sec";
 
     print ISS "echo -n install $pkg: $name.$sec .. \n";
-    print ISS "install -o $OWNER -g $GROUP -m 644 $mansrc $mandst\n";
+    print ISS "install -p -m 644 $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 || exit 1\n";
 
     if ($PACK ne "none"){
 	print ISS "echo -n $PACK .. \n";
@@ -231,3 +241,14 @@ sub by_sec_name {
 	($af[2] <=> $bf[2]) || ($af[1] cmp $bf[1]);
 }
 
+sub get_from_stdin {
+    my $retval;
+
+    if ( $pipeflag ) {
+        $retval = shift (@stdin);
+    } else {
+        $retval = scalar (<STDIN>);
+    }
+    return $retval;
+}
+

man-pages-ja-fix-mdoc.patch:
 translation_list |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE man-pages-ja-fix-mdoc.patch ---
--- man-pages-ja-20060815.orig/manual/GNU_groff/translation_list	2006-08-15 00:07:02.000000000 +0900
+++ man-pages-ja-20060815/manual/GNU_groff/translation_list	2009-11-18 17:07:09.000000000 +0900
@@ -29,7 +29,6 @@
 ??:GNU groff:1.17.2:2000/05/24:groff:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 ??:GNU groff:1.17.2:2000/05/19:groff_char:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 ??:GNU groff:1.17.2:2000/05/22:groff_man:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
-??:GNU groff:1.17.2:1997/11/24:mdoc:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 ??:GNU groff:1.17.2:2000/02/06:groff_me:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 ??:GNU groff:1.17.2:2000/06/05:groff_mm:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 ??:GNU groff:1.17.2:2000/02/22:groff_mmse:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- man-pages-ja.spec	10 Nov 2009 05:51:55 -0000	1.75
+++ man-pages-ja.spec	24 Dec 2009 06:20:56 -0000	1.76
@@ -1,7 +1,5 @@
-%define	use_utf8	1
-
 Name: man-pages-ja
-Version: 20091015
+Version: 20091215
 Release: 1%{?dist}
 # Actual license for each Japanese manpages is the same to the original English manpages' license.
 License: Freely redistributable without restriction
@@ -11,14 +9,10 @@ URL: http://www.linux.or.jp/JM/
 
 Source: http://www.linux.or.jp/JM/%{name}-%{version}.tar.gz
 Source1: rh-man-pages-ja.pl
-Patch: man-pages-ja-20010515-rh.patch
-Patch1: man-pages-ja-fixpipe.patch
-Patch2: man-pages-ja-20030415-utf8.patch
+Patch0: man-pages-ja-fix-configure.perl.patch
 Patch9: man-pages-ja-20060815-204667-nfs.5.patch
 Patch11: man-pages-ja-20060815-178955-at.1.patch
 Patch12: man-pages-ja-missing-pkglist.patch
-Patch13: man-pages-ja-fix-uninitialized-value.patch
-Patch14: man-pages-ja-timestamp.patch
 Patch15: man-pages-ja-358081-sysctl-warn.patch
 Patch16: man-pages-ja-connect.2.patch
 Patch18: man-pages-ja-433692-printf.1.patch
@@ -32,6 +26,12 @@ Patch25: man-pages-ja-454419-echo.1.patc
 Patch26: man-pages-ja-457361-wall.1.patch
 Patch27: man-pages-ja-20090615-vmstat.8.patch
 Patch28: man-pages-ja-493783-edquota.8.patch
+Patch29: man-pages-ja-486655-mkfs.8.patch
+Patch30: man-pages-ja-509048-less.1.patch
+Patch31: man-pages-ja-515467-strings.1.patch
+Patch32: man-pages-ja-527638-chgrp.1.patch
+Patch33: man-pages-ja-537103-ip.7.patch
+Patch34: man-pages-ja-fix-mdoc.patch
 
 Summary: Japanese man (manual) pages from the Japanese Manual Project
 Group: Documentation
@@ -40,29 +40,29 @@ Japanese Manual pages, translated by JM-
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .jp
-%patch1 -p1 -b .pipe
-%if %{use_utf8}
-%patch2 -p1 -b .utf8
-%endif
-%patch9 -p1 -b .nfs
-%patch11 -p1 -b .at
-%patch12 -p1 -b .pkglist
-%patch13 -p1 -b .uninitval
-%patch14 -p1 -b .timestamp
-%patch15 -p1 -b .sysctl
-%patch16 -p1 -b .connect
-%patch18 -p1 -b .printf
-%patch19 -p1 -b .bash-continue
-%patch20 -p1 -b .bash-suspend
-%patch21 -p1 -b .top
-%patch22 -p1 -b .bash-source
-%patch23 -p1 -b .sysctl
-%patch24 -p1 -b .bash-hex
-%patch25 -p1 -b .echo
-%patch26 -p1 -b .wall
-%patch27 -p1 -b .vmstat
-%patch28 -p1 -b .edquota
+%patch0 -p1 -b .0-configure.perl
+%patch9 -p1 -b .9-nfs
+%patch11 -p1 -b .11-at
+%patch12 -p1 -b .12-pkglist
+%patch15 -p1 -b .15-sysctl
+%patch16 -p1 -b .16-connect
+%patch18 -p1 -b .18-printf
+%patch19 -p1 -b .19-bash-continue
+%patch20 -p1 -b .20-bash-suspend
+%patch21 -p1 -b .21-top
+%patch22 -p1 -b .22-bash-source
+%patch23 -p1 -b .23-sysctl
+%patch24 -p1 -b .24-bash-hex
+%patch25 -p1 -b .25-echo
+%patch26 -p1 -b .26-wall
+%patch27 -p1 -b .27-vmstat
+%patch28 -p1 -b .28-edquota
+%patch29 -p1 -b .29-mkfs
+%patch30 -p1 -b .30-less
+%patch31 -p1 -b .31-strings
+%patch32 -p1 -b .32-chgrp
+%patch33 -p1 -b .33-ip
+%patch34 -p1 -b .34-mdoc
 
 %build
 perl %{SOURCE1} '$DESTDIR' | make
@@ -80,38 +80,22 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man8/
 # fix su(1) man page.
 if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 ]; then
 	rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/su.1*
-%if %{use_utf8}
 	iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/su.1
-%else
-	cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/
-%endif
 fi
 # fix kill(1) man page.
 if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 ]; then
 	rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/kill.1*
-%if %{use_utf8}
 	iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/kill.1
-%else
-	cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/
-%endif
 fi
 # fix chown(1) man page.
 if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_fileutils/man1/chown.1 ]; then
 	rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/chown.1*
-%if %{use_utf8}
 	iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_fileutils/man1/chown.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/chown.1
-%else
-	cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_fileutils/man1/chown.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/
-%endif
 fi
 # fix hostname(1) man page.
 if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/net-tools/man1/hostname.1 ]; then
 	rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/hostname.1*
-%if %{use_utf8}
 	iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/net-tools/man1/hostname.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/hostname.1
-%else
-	cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/net-tools/man1/hostname.1 $RPM_BUILD_ROOT%{_Mandir}/ja/man1/
-%endif
 fi
 # For Bug#128612
 mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.telned.8.gz $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.telnetd.8.gz
@@ -125,11 +109,7 @@ for i in `find -type f -name translation
 	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
 )
@@ -144,6 +124,17 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Akira TAGOH <tagoh at redhat.com> - 20091215-1
+- updates to 20091215.
+- apply some patches to correct typos:
+  - man-pages-ja-486655-mkfs.8.patch
+  - man-pages-ja-509048-less.1.patch
+  - man-pages-ja-515467-strings.1.patch
+  - man-pages-ja-527638-chgrp.1.patch
+  - man-pages-ja-537103-ip.7.patch
+  - man-pages-ja-fix-mdoc.patch
+- clean up the spec file.
+
 * Tue Nov 10 2009 Akira TAGOH <tagoh at redhat.com> - 20091015-1
 - updates to 20091015.
 - use the corect man page for hostname(1).


--- man-pages-ja-20010515-rh.patch DELETED ---


--- man-pages-ja-20011115-fixpipe.patch DELETED ---


--- man-pages-ja-20030415-utf8.patch DELETED ---


--- man-pages-ja-fix-uninitialized-value.patch DELETED ---


--- man-pages-ja-fixpipe.patch DELETED ---


--- man-pages-ja-timestamp.patch DELETED ---



From tagoh at fedoraproject.org  Thu Dec 24 06:24:16 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 24 Dec 2009 06:24:16 +0000 (UTC)
Subject: File man-pages-ja-20091215.tar.gz uploaded to lookaside cache by tagoh
Message-ID: <20091224062416.BCCD410F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for man-pages-ja:

360b43ad87ea0d015d6a366600ef9c8f  man-pages-ja-20091215.tar.gz



From tagoh at fedoraproject.org  Thu Dec 24 06:25:17 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 24 Dec 2009 06:25:17 +0000 (UTC)
Subject: rpms/man-pages-ja/devel .cvsignore,1.63,1.64 sources,1.62,1.63
Message-ID: <20091224062517.5E66311C00E6@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/man-pages-ja/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2730

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	10 Nov 2009 05:51:54 -0000	1.63
+++ .cvsignore	24 Dec 2009 06:25:17 -0000	1.64
@@ -50,3 +50,4 @@ man-pages-ja-20090215.tar.gz
 man-pages-ja-20090615.tar.gz
 man-pages-ja-20090715.tar.gz
 man-pages-ja-20091015.tar.gz
+man-pages-ja-20091215.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	10 Nov 2009 05:51:55 -0000	1.62
+++ sources	24 Dec 2009 06:25:17 -0000	1.63
@@ -1 +1 @@
-f3981817235748ffd7b0e1c5768342f2  man-pages-ja-20091015.tar.gz
+360b43ad87ea0d015d6a366600ef9c8f  man-pages-ja-20091215.tar.gz



From mtasaka at fedoraproject.org  Thu Dec 24 06:38:05 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 24 Dec 2009 06:38:05 +0000 (UTC)
Subject: File jd-2.5.5-svn3257_trunk.tgz uploaded to lookaside cache by mtasaka
Message-ID: <20091224063805.BC61610F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for jd:

7a9fe5c0fb630d7b9777ad5d5d7fcb7e  jd-2.5.5-svn3257_trunk.tgz



From mtasaka at fedoraproject.org  Thu Dec 24 06:38:45 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 24 Dec 2009 06:38:45 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.408, 1.409 jd.spec, 1.470, 1.471 sources, 
	1.409, 1.410
Message-ID: <20091224063845.CAD2F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4469

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Dec 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3257



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- .cvsignore	20 Dec 2009 14:47:07 -0000	1.408
+++ .cvsignore	24 Dec 2009 06:38:44 -0000	1.409
@@ -1 +1 @@
-jd-2.5.5-beta091220.tgz
+jd-2.5.5-svn3257_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -p -r1.470 -r1.471
--- jd.spec	20 Dec 2009 14:47:07 -0000	1.470
+++ jd.spec	24 Dec 2009 06:38:44 -0000	1.471
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        beta091220
+%define         strtag        svn3257_trunk
 %define         repoid        44986
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Dec 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3257
+
 * Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
 - 2.5.5 beta 091220
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- sources	20 Dec 2009 14:47:07 -0000	1.409
+++ sources	24 Dec 2009 06:38:44 -0000	1.410
@@ -1 +1 @@
-3f2c9e853bfde93d963a1d3ca54cb945  jd-2.5.5-beta091220.tgz
+7a9fe5c0fb630d7b9777ad5d5d7fcb7e  jd-2.5.5-svn3257_trunk.tgz



From pkgdb at fedoraproject.org  Thu Dec 24 06:58:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:58:07 +0000
Subject: [pkgdb] jconvolver was added for oget
Message-ID: <20091224065807.882EA10F8CB@bastion.fedoraproject.org>

kevin has added Package jconvolver with summary Real-time Convolution Engine
kevin has approved Package jconvolver
kevin has added a Fedora devel branch for jconvolver with an owner of oget
kevin has approved jconvolver in Fedora devel
kevin has approved Package jconvolver
kevin has set commit to Approved for 107427 on jconvolver (Fedora devel)
kevin has set checkout to Approved for 107427 on jconvolver (Fedora devel)
kevin has set build to Approved for 107427 on jconvolver (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jconvolver



From pkgdb at fedoraproject.org  Thu Dec 24 06:58:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:58:07 +0000
Subject: [pkgdb] jconvolver summary updated by kevin
Message-ID: <20091224065808.EE4DF10F8CB@bastion.fedoraproject.org>

kevin set package jconvolver summary to Real-time Convolution Engine

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jconvolver



From pkgdb at fedoraproject.org  Thu Dec 24 06:58:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:58:07 +0000
Subject: [pkgdb] jconvolver (Fedora, 11) updated by kevin
Message-ID: <20091224065809.15DF310F8D8@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for jconvolver
kevin has set commit to Approved for 107427 on jconvolver (Fedora 11)
kevin has set checkout to Approved for 107427 on jconvolver (Fedora 11)
kevin has set build to Approved for 107427 on jconvolver (Fedora 11)
kevin approved watchbugzilla on jconvolver (Fedora 11) for nando
kevin approved watchcommits on jconvolver (Fedora 11) for nando
kevin approved commit on jconvolver (Fedora 11) for nando
kevin approved build on jconvolver (Fedora 11) for nando
kevin approved approveacls on jconvolver (Fedora 11) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jconvolver



From pkgdb at fedoraproject.org  Thu Dec 24 06:58:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:58:07 +0000
Subject: [pkgdb] jconvolver (Fedora, 12) updated by kevin
Message-ID: <20091224065809.24F9C10F8DD@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for jconvolver
kevin has set commit to Approved for 107427 on jconvolver (Fedora 12)
kevin has set checkout to Approved for 107427 on jconvolver (Fedora 12)
kevin has set build to Approved for 107427 on jconvolver (Fedora 12)
kevin approved watchbugzilla on jconvolver (Fedora 12) for nando
kevin approved watchcommits on jconvolver (Fedora 12) for nando
kevin approved commit on jconvolver (Fedora 12) for nando
kevin approved build on jconvolver (Fedora 12) for nando
kevin approved approveacls on jconvolver (Fedora 12) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jconvolver



From pkgdb at fedoraproject.org  Thu Dec 24 06:58:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:58:07 +0000
Subject: [pkgdb] jconvolver (Fedora, devel) updated by kevin
Message-ID: <20091224065809.34A1D10F8E2@bastion.fedoraproject.org>

kevin approved watchbugzilla on jconvolver (Fedora devel) for nando
kevin approved watchcommits on jconvolver (Fedora devel) for nando
kevin approved commit on jconvolver (Fedora devel) for nando
kevin approved build on jconvolver (Fedora devel) for nando
kevin approved approveacls on jconvolver (Fedora devel) for nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jconvolver



From kevin at fedoraproject.org  Thu Dec 24 06:58:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 06:58:23 +0000 (UTC)
Subject: rpms/jconvolver - New directory
Message-ID: <20091224065823.2FB2D11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jconvolver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsom6739/rpms/jconvolver

Log Message:
Directory /cvs/pkgs/rpms/jconvolver added to the repository




From kevin at fedoraproject.org  Thu Dec 24 06:58:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 06:58:23 +0000 (UTC)
Subject: rpms/jconvolver/devel - New directory
Message-ID: <20091224065823.57AA711C018B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jconvolver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsom6739/rpms/jconvolver/devel

Log Message:
Directory /cvs/pkgs/rpms/jconvolver/devel added to the repository




From kevin at fedoraproject.org  Thu Dec 24 06:58:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 06:58:31 +0000 (UTC)
Subject: rpms/jconvolver Makefile,NONE,1.1
Message-ID: <20091224065831.04FC311C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jconvolver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsom6739/rpms/jconvolver

Added Files:
	Makefile 
Log Message:
Setup of module jconvolver


--- NEW FILE Makefile ---
# Top level Makefile for module jconvolver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec 24 06:58:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 06:58:31 +0000 (UTC)
Subject: rpms/jconvolver/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091224065831.41D2A11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jconvolver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsom6739/rpms/jconvolver/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jconvolver


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jconvolver
# $Id: Makefile,v 1.1 2009/12/24 06:58:31 kevin Exp $
NAME := jconvolver
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec 24 06:59:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:59:14 +0000
Subject: [pkgdb] python-zdaemon was added for konradm
Message-ID: <20091224065914.2EBF610F8CC@bastion.fedoraproject.org>

kevin has added Package python-zdaemon with summary Python Daemon Process Control Library
kevin has approved Package python-zdaemon
kevin has added a Fedora devel branch for python-zdaemon with an owner of konradm
kevin has approved python-zdaemon in Fedora devel
kevin has approved Package python-zdaemon
kevin has set commit to Approved for 107427 on python-zdaemon (Fedora devel)
kevin has set checkout to Approved for 107427 on python-zdaemon (Fedora devel)
kevin has set build to Approved for 107427 on python-zdaemon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-zdaemon



From pkgdb at fedoraproject.org  Thu Dec 24 06:59:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:59:37 +0000
Subject: [pkgdb] python-zdaemon summary updated by kevin
Message-ID: <20091224065923.B195F10F8A8@bastion.fedoraproject.org>

kevin set package python-zdaemon summary to Python Daemon Process Control Library

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-zdaemon



From pkgdb at fedoraproject.org  Thu Dec 24 06:59:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:59:37 +0000
Subject: [pkgdb] python-zdaemon (Fedora, 11) updated by kevin
Message-ID: <20091224065924.BC71110F8CB@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for python-zdaemon
kevin has set commit to Approved for 107427 on python-zdaemon (Fedora 11)
kevin has set checkout to Approved for 107427 on python-zdaemon (Fedora 11)
kevin has set build to Approved for 107427 on python-zdaemon (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-zdaemon



From pkgdb at fedoraproject.org  Thu Dec 24 06:59:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 06:59:37 +0000
Subject: [pkgdb] python-zdaemon (Fedora, 12) updated by kevin
Message-ID: <20091224065925.CB2F010F8A8@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for python-zdaemon
kevin has set commit to Approved for 107427 on python-zdaemon (Fedora 12)
kevin has set checkout to Approved for 107427 on python-zdaemon (Fedora 12)
kevin has set build to Approved for 107427 on python-zdaemon (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-zdaemon



From kevin at fedoraproject.org  Thu Dec 24 06:59:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 06:59:41 +0000 (UTC)
Subject: rpms/python-zdaemon/devel - New directory
Message-ID: <20091224065941.2E56211C025E@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-zdaemon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsHn7178/rpms/python-zdaemon/devel

Log Message:
Directory /cvs/pkgs/rpms/python-zdaemon/devel added to the repository




From kevin at fedoraproject.org  Thu Dec 24 06:59:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 06:59:41 +0000 (UTC)
Subject: rpms/python-zdaemon - New directory
Message-ID: <20091224065941.131F111C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-zdaemon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsHn7178/rpms/python-zdaemon

Log Message:
Directory /cvs/pkgs/rpms/python-zdaemon added to the repository




From kevin at fedoraproject.org  Thu Dec 24 06:59:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 06:59:48 +0000 (UTC)
Subject: rpms/python-zdaemon Makefile,NONE,1.1
Message-ID: <20091224065948.D609111C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-zdaemon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsHn7178/rpms/python-zdaemon

Added Files:
	Makefile 
Log Message:
Setup of module python-zdaemon


--- NEW FILE Makefile ---
# Top level Makefile for module python-zdaemon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec 24 06:59:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 06:59:49 +0000 (UTC)
Subject: rpms/python-zdaemon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091224065949.2C95B11C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-zdaemon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsHn7178/rpms/python-zdaemon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-zdaemon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-zdaemon
# $Id: Makefile,v 1.1 2009/12/24 06:59:48 kevin Exp $
NAME := python-zdaemon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec 24 07:00:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:00:20 +0000
Subject: [pkgdb] python-minimock (Fedora, 11) updated by kevin
Message-ID: <20091224070020.3092210F8CB@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for python-minimock
kevin has set commit to Approved for 107427 on python-minimock (Fedora 11)
kevin has set checkout to Approved for 107427 on python-minimock (Fedora 11)
kevin has set build to Approved for 107427 on python-minimock (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-minimock



From pkgdb at fedoraproject.org  Thu Dec 24 07:00:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:00:20 +0000
Subject: [pkgdb] python-minimock (Fedora EPEL, 5) updated by kevin
Message-ID: <20091224070020.3DC0A10F8D0@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for python-minimock
kevin has set commit to Approved for 107427 on python-minimock (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-minimock (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-minimock (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-minimock



From pkgdb at fedoraproject.org  Thu Dec 24 07:00:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:00:20 +0000
Subject: [pkgdb] python-minimock (Fedora, 12) updated by kevin
Message-ID: <20091224070020.4803510F8DA@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for python-minimock
kevin has set commit to Approved for 107427 on python-minimock (Fedora 12)
kevin has set checkout to Approved for 107427 on python-minimock (Fedora 12)
kevin has set build to Approved for 107427 on python-minimock (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-minimock



From pkgdb at fedoraproject.org  Thu Dec 24 07:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:02:47 +0000
Subject: [pkgdb] python-olpcgames (Fedora, 11) updated by kevin
Message-ID: <20091224070247.2DCF910F8CC@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for python-olpcgames
kevin has set commit to Approved for 107427 on python-olpcgames (Fedora 11)
kevin has set checkout to Approved for 107427 on python-olpcgames (Fedora 11)
kevin has set build to Approved for 107427 on python-olpcgames (Fedora 11)
kevin changed owner of python-olpcgames in Fedora 11 to kantrn
kevin approved watchbugzilla on python-olpcgames (Fedora 11) for fab
kevin approved watchcommits on python-olpcgames (Fedora 11) for fab
kevin approved commit on python-olpcgames (Fedora 11) for fab
kevin approved build on python-olpcgames (Fedora 11) for fab
kevin approved approveacls on python-olpcgames (Fedora 11) for fab
kevin approved watchbugzilla on python-olpcgames (Fedora 11) for sdz
kevin approved watchcommits on python-olpcgames (Fedora 11) for sdz
kevin approved commit on python-olpcgames (Fedora 11) for sdz
kevin approved build on python-olpcgames (Fedora 11) for sdz
kevin approved approveacls on python-olpcgames (Fedora 11) for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Thu Dec 24 07:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:02:47 +0000
Subject: [pkgdb] python-olpcgames (Fedora, 12) updated by kevin
Message-ID: <20091224070247.5112010F8DF@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for python-olpcgames
kevin has set commit to Approved for 107427 on python-olpcgames (Fedora 12)
kevin has set checkout to Approved for 107427 on python-olpcgames (Fedora 12)
kevin has set build to Approved for 107427 on python-olpcgames (Fedora 12)
kevin changed owner of python-olpcgames in Fedora 12 to kantrn
kevin approved watchbugzilla on python-olpcgames (Fedora 12) for fab
kevin approved watchcommits on python-olpcgames (Fedora 12) for fab
kevin approved commit on python-olpcgames (Fedora 12) for fab
kevin approved build on python-olpcgames (Fedora 12) for fab
kevin approved approveacls on python-olpcgames (Fedora 12) for fab
kevin approved watchbugzilla on python-olpcgames (Fedora 12) for sdz
kevin approved watchcommits on python-olpcgames (Fedora 12) for sdz
kevin approved commit on python-olpcgames (Fedora 12) for sdz
kevin approved build on python-olpcgames (Fedora 12) for sdz
kevin approved approveacls on python-olpcgames (Fedora 12) for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Thu Dec 24 07:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:02:47 +0000
Subject: [pkgdb] python-olpcgames (Fedora, devel) updated by kevin
Message-ID: <20091224070247.409FF10F8DA@bastion.fedoraproject.org>

kevin changed owner of python-olpcgames in Fedora devel to kantrn
kevin approved watchbugzilla on python-olpcgames (Fedora devel) for fab
kevin approved watchcommits on python-olpcgames (Fedora devel) for fab
kevin approved commit on python-olpcgames (Fedora devel) for fab
kevin approved build on python-olpcgames (Fedora devel) for fab
kevin approved approveacls on python-olpcgames (Fedora devel) for fab
kevin approved watchbugzilla on python-olpcgames (Fedora devel) for sdz
kevin approved watchcommits on python-olpcgames (Fedora devel) for sdz
kevin approved commit on python-olpcgames (Fedora devel) for sdz
kevin approved build on python-olpcgames (Fedora devel) for sdz
kevin approved approveacls on python-olpcgames (Fedora devel) for sdz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Thu Dec 24 07:04:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:04:29 +0000
Subject: [pkgdb] invulgotracker was added for taljurf
Message-ID: <20091224070429.770E710F8CC@bastion.fedoraproject.org>

kevin has added Package invulgotracker with summary Tasks & projects tracking tool
kevin has approved Package invulgotracker
kevin has added a Fedora devel branch for invulgotracker with an owner of taljurf
kevin has approved invulgotracker in Fedora devel
kevin has approved Package invulgotracker
kevin has set commit to Approved for 107427 on invulgotracker (Fedora devel)
kevin has set checkout to Approved for 107427 on invulgotracker (Fedora devel)
kevin has set build to Approved for 107427 on invulgotracker (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invulgotracker



From pkgdb at fedoraproject.org  Thu Dec 24 07:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:04:32 +0000
Subject: [pkgdb] invulgotracker summary updated by kevin
Message-ID: <20091224070431.8F66410F8CC@bastion.fedoraproject.org>

kevin set package invulgotracker summary to Tasks & projects tracking tool

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invulgotracker



From pkgdb at fedoraproject.org  Thu Dec 24 07:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:04:32 +0000
Subject: [pkgdb] invulgotracker (Fedora, 11) updated by kevin
Message-ID: <20091224070431.9932910F8D2@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for invulgotracker
kevin has set commit to Approved for 107427 on invulgotracker (Fedora 11)
kevin has set checkout to Approved for 107427 on invulgotracker (Fedora 11)
kevin has set build to Approved for 107427 on invulgotracker (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invulgotracker



From pkgdb at fedoraproject.org  Thu Dec 24 07:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:04:32 +0000
Subject: [pkgdb] invulgotracker (Fedora, 12) updated by kevin
Message-ID: <20091224070431.A592F10F8DC@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for invulgotracker
kevin has set commit to Approved for 107427 on invulgotracker (Fedora 12)
kevin has set checkout to Approved for 107427 on invulgotracker (Fedora 12)
kevin has set build to Approved for 107427 on invulgotracker (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/invulgotracker



From kevin at fedoraproject.org  Thu Dec 24 07:04:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 07:04:48 +0000 (UTC)
Subject: rpms/invulgotracker/devel - New directory
Message-ID: <20091224070448.449EE11C025E@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/invulgotracker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAp8162/rpms/invulgotracker/devel

Log Message:
Directory /cvs/pkgs/rpms/invulgotracker/devel added to the repository




From kevin at fedoraproject.org  Thu Dec 24 07:04:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 07:04:48 +0000 (UTC)
Subject: rpms/invulgotracker - New directory
Message-ID: <20091224070448.1413711C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/invulgotracker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAp8162/rpms/invulgotracker

Log Message:
Directory /cvs/pkgs/rpms/invulgotracker added to the repository




From kevin at fedoraproject.org  Thu Dec 24 07:04:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 07:04:55 +0000 (UTC)
Subject: rpms/invulgotracker Makefile,NONE,1.1
Message-ID: <20091224070455.C91A111C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/invulgotracker
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAp8162/rpms/invulgotracker

Added Files:
	Makefile 
Log Message:
Setup of module invulgotracker


--- NEW FILE Makefile ---
# Top level Makefile for module invulgotracker
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Dec 24 07:04:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 24 Dec 2009 07:04:56 +0000 (UTC)
Subject: rpms/invulgotracker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091224070456.5FE5311C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/invulgotracker/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAp8162/rpms/invulgotracker/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module invulgotracker


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: invulgotracker
# $Id: Makefile,v 1.1 2009/12/24 07:04:56 kevin Exp $
NAME := invulgotracker
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:35 +0000
Subject: [pkgdb] pki-native-tools summary updated by kevin
Message-ID: <20091224070621.CB6B010F8CC@bastion.fedoraproject.org>

kevin set package pki-native-tools summary to The Dogtag PKI Java Tools

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:36 +0000
Subject: [pkgdb] pki-native-tools (Fedora, 11) updated by kevin
Message-ID: <20091224070622.DFBB510F8DA@bastion.fedoraproject.org>

kevin changed owner of pki-native-tools in Fedora 11 to kwright
kevin approved watchbugzilla on pki-native-tools (Fedora 11) for ausil
kevin approved watchcommits on pki-native-tools (Fedora 11) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:36 +0000
Subject: [pkgdb] pki-native-tools (Fedora, 12) updated by kevin
Message-ID: <20091224070622.7C92310F8CB@bastion.fedoraproject.org>

kevin changed owner of pki-native-tools in Fedora 12 to kwright
kevin approved watchbugzilla on pki-native-tools (Fedora 12) for ausil
kevin approved watchcommits on pki-native-tools (Fedora 12) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:36 +0000
Subject: [pkgdb] pki-native-tools (Fedora, devel) updated by kevin
Message-ID: <20091224070623.9D1F910F8DA@bastion.fedoraproject.org>

kevin changed owner of pki-native-tools in Fedora devel to kwright
kevin approved watchbugzilla on pki-native-tools (Fedora devel) for ausil
kevin approved watchcommits on pki-native-tools (Fedora devel) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:36 +0000
Subject: [pkgdb] pki-native-tools (Fedora EPEL, 5) updated by kevin
Message-ID: <20091224070624.02ED510F8CD@bastion.fedoraproject.org>

kevin changed owner of pki-native-tools in Fedora EPEL 5 to kwright
kevin approved watchbugzilla on pki-native-tools (Fedora EPEL 5) for ausil
kevin approved watchcommits on pki-native-tools (Fedora EPEL 5) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:47 +0000
Subject: [pkgdb] pki-native-tools summary updated by kevin
Message-ID: <20091224070648.4E24C10F8CD@bastion.fedoraproject.org>

kevin set package pki-native-tools summary to The Dogtag PKI Native Tools

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:47 +0000
Subject: [pkgdb] pki-native-tools (Fedora, 12) updated by kevin
Message-ID: <20091224070648.69A3710F8D2@bastion.fedoraproject.org>

kevin changed owner of pki-native-tools in Fedora 12 to kwright
kevin approved watchbugzilla on pki-native-tools (Fedora 12) for ausil
kevin approved watchcommits on pki-native-tools (Fedora 12) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:47 +0000
Subject: [pkgdb] pki-native-tools (Fedora, devel) updated by kevin
Message-ID: <20091224070648.8D9B510F8E0@bastion.fedoraproject.org>

kevin changed owner of pki-native-tools in Fedora devel to kwright
kevin approved watchbugzilla on pki-native-tools (Fedora devel) for ausil
kevin approved watchcommits on pki-native-tools (Fedora devel) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:47 +0000
Subject: [pkgdb] pki-native-tools (Fedora, 11) updated by kevin
Message-ID: <20091224070648.7A02410F8DB@bastion.fedoraproject.org>

kevin changed owner of pki-native-tools in Fedora 11 to kwright
kevin approved watchbugzilla on pki-native-tools (Fedora 11) for ausil
kevin approved watchcommits on pki-native-tools (Fedora 11) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From pkgdb at fedoraproject.org  Thu Dec 24 07:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:06:47 +0000
Subject: [pkgdb] pki-native-tools (Fedora EPEL, 5) updated by kevin
Message-ID: <20091224070648.9768810F8E3@bastion.fedoraproject.org>

kevin changed owner of pki-native-tools in Fedora EPEL 5 to kwright
kevin approved watchbugzilla on pki-native-tools (Fedora EPEL 5) for ausil
kevin approved watchcommits on pki-native-tools (Fedora EPEL 5) for ausil

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pki-native-tools



From oget at fedoraproject.org  Thu Dec 24 07:18:39 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 07:18:39 +0000 (UTC)
Subject: File jconvolver-0.8.4.tar.bz2 uploaded to lookaside cache by oget
Message-ID: <20091224071839.1A4B110F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for jconvolver:

2012f34f47bc7b2337d61d4a54c0f0a8  jconvolver-0.8.4.tar.bz2



From oget at fedoraproject.org  Thu Dec 24 07:19:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 07:19:06 +0000 (UTC)
Subject: rpms/jconvolver/devel import.log, NONE, 1.1 jconvolver.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091224071906.72C3A11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jconvolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9911/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jconvolver.spec 
Log Message:
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.8.4-2
- Don't bundle the reverbs until we hear from the author about the license

* Wed Dec 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.8.4-1
- update version to 0.8.4
- software name changed from jconv to jconvolver
- drop libsndfile patch. not needed anymore




--- NEW FILE import.log ---
jconvolver-0_8_4-2_fc12:HEAD:jconvolver-0.8.4-2.fc12.src.rpm:1261639115


--- NEW FILE jconvolver.spec ---
Summary:       Real-time Convolution Engine
Name:          jconvolver
Version:       0.8.4
Release:       2%{?dist}
License:       GPLv2+
Group:         Applications/Multimedia
URL:           http://www.kokkinizita.net/linuxaudio/
Source0:       http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
# Demo reverbs
# Don't bundle until license is cleared up
#Source1:       http://www.kokkinizita.net/linuxaudio/downloads/%{name}-reverbs.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Obsoletes:     jace <= 0.2.0
Provides:      jace = %{version}-%{release}
Obsoletes:     jconv <= 0.8.1
Provides:      jconv = %{version}-%{release}


BuildRequires: clthreads-devel 
BuildRequires: fftw-devel 
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libsndfile-devel 
BuildRequires: zita-convolver-devel

%description
Jconvolver is a real-time convolution engine. It can execute up to a 64 by 64
convolution matrix (i.e. 4096 simultaneous convolutions) as long as your CPU(s)
can handle the load. It is designed to be efficient also for sparse (e.g.
diagonal) matrices. Unused matrix elements do not take any CPY time.

%prep
#setup -q -a 1
%setup -q

# fix paths of configuration files
find config-files/ -name \*.conf \
  -exec sed -i -e "s|/audio/reverbs|%{_datadir}/%{name}/reverbs|g" {} \; \
  -exec sed -i -e "s|^#/cd |/cd |g" {} \;

# Force Fedora's optflags
sed -i 's|-O3|%{optflags}|' source/Makefile

%build
make %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_lib} -C source

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
make install PREFIX=%{buildroot}%{_prefix} LIBDIR=%{_lib} -C source

# install configuration files and demo reverbs
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -a config-files/* %{buildroot}%{_datadir}/%{name}
#cp -a reverbs/ %%{buildroot}%%{_datadir}/%%{name}/

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS README* COPYING
%{_bindir}/*
%{_datadir}/%{name}/

%changelog
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.8.4-2
- Don't bundle the reverbs until we hear from the author about the license

* Wed Dec 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.8.4-1
- update version to 0.8.4
- software name changed from jconv to jconvolver
- drop libsndfile patch. not needed anymore

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue May 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.8.1-1
- update version to 0.8.1
- prepare package for Fedora submission (SPEC file from PlanetCCRMA)

* Sat Mar 21 2009 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.8.0-2
- fix typo in uhjenc.conf

* Sat Mar 21 2009 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.8.0-1
- updated to 0.8.0, include new extended demo reverb files
- move configuration and examples to /usr/share/jconv/

* Wed Oct 29 2008 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.0-1
- package renamed to jconv from jace, now uses the zita-convolver library
- upgrade to jconv 0.2.0

* Wed Sep  5 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.0-1
- update to 0.2.0
- add springreverb.wav

* Thu Apr 19 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- update to 0.1.0

* Sun Apr  1 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.4-2
- update to 0.0.4
- include lucia.wav example impulse response
- tweak demo configuration files to point to the doc directory

* Tue Dec 12 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.3-2
- build on fc6

* Sat May 13 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.8-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jconvolver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Dec 2009 06:58:31 -0000	1.1
+++ .cvsignore	24 Dec 2009 07:19:05 -0000	1.2
@@ -0,0 +1 @@
+jconvolver-0.8.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jconvolver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Dec 2009 06:58:31 -0000	1.1
+++ sources	24 Dec 2009 07:19:06 -0000	1.2
@@ -0,0 +1 @@
+2012f34f47bc7b2337d61d4a54c0f0a8  jconvolver-0.8.4.tar.bz2



From oget at fedoraproject.org  Thu Dec 24 07:23:21 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 07:23:21 +0000 (UTC)
Subject: rpms/jconv/devel dead.package, NONE, 1.1 jconv-noambisonics.patch, 1.1,
	NONE jconv.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20091224072321.BFBB311C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jconv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10466

Added Files:
	dead.package 
Removed Files:
	jconv-noambisonics.patch jconv.spec sources 
Log Message:
jconv package orphaned due to name change to jconvolver. bye bye jconv.



--- NEW FILE dead.package ---
orphaned due to name change to jconvolver

--- jconv-noambisonics.patch DELETED ---


--- jconv.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Thu Dec 24 07:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:26:56 +0000
Subject: [pkgdb] jconv ownership updated
Message-ID: <20091224072642.53E8810F8CC@bastion.fedoraproject.org>

Package jconv in Fedora devel is now owned by nando

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jconv



From pkgdb at fedoraproject.org  Thu Dec 24 07:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 07:26:56 +0000
Subject: [pkgdb] jconv (un)retirement
Message-ID: <20091224072643.5823F10F8CC@bastion.fedoraproject.org>

Package jconv in Fedora devel has been retired by oget

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jconv



From oget at fedoraproject.org  Thu Dec 24 07:43:18 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 07:43:18 +0000 (UTC)
Subject: File guitarix-0.05.5-1.tar.bz2 uploaded to lookaside cache by oget
Message-ID: <20091224074318.65E2D10F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for guitarix:

4ffdd87871823562282a16975090d7e2  guitarix-0.05.5-1.tar.bz2



From oget at fedoraproject.org  Thu Dec 24 07:45:01 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 07:45:01 +0000 (UTC)
Subject: rpms/guitarix/devel guitarix-midiout.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 guitarix.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091224074502.24C4F11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/guitarix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13145

Modified Files:
	.cvsignore guitarix.spec sources 
Added Files:
	guitarix-midiout.patch 
Log Message:
* Thu Dec 24 2009 Orcan Ogetbil <orcan at desitter> - 0.05.5-1
- Update to 0.05.5
- Add Requires: qjackctl. RHBZ #549566


guitarix-midiout.patch:
 gx_engine.cpp            |    8 ++++----
 gx_engine_midi.cpp       |    4 ++--
 gx_gui_helpers.cpp       |   27 +++++++++++++++++++++++++++
 headers/gx_gui_helpers.h |    1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

--- NEW FILE guitarix-midiout.patch ---
--- trunk/src/gx_engine.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_engine.cpp	2009/12/16 19:36:03	434
@@ -533,11 +533,11 @@
   /* --- adding rest of engine class by file inclusion for readability --- */
 
   /* MIDI engine */
-#ifdef USE_RINGBUFFER
-#include "gx_engine_midi_ringbuf.cpp"
-#else
+//#ifdef USE_RINGBUFFER
+//#include "gx_engine_midi_ringbuf.cpp"
+//#else
 #include "gx_engine_midi.cpp"
-#endif
+//#endif
 
   /* audio engine */
 #include "gx_engine_audio.cpp"
--- trunk/src/gx_engine_midi.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_engine_midi.cpp	2009/12/16 19:36:03	434
@@ -411,8 +411,8 @@
                       if(Beat_is < rms)Beat_is += 2;
                       //Beat_is = rms;
                       send+=step;
-                      if (fcheckbox10 == 1.0) send1+=step;
-                      if (fcheckbox11 == 1.0) send2+=step;
+                      if (fcheckbox10 ) send1+=step;
+                      if (fcheckbox11 ) send2+=step;
                     }
                  // else weg +=step;
                 }
--- trunk/src/gx_gui_helpers.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_gui_helpers.cpp	2009/12/16 19:36:03	434
@@ -1525,6 +1525,33 @@
       return FALSE;
     }
 
+    gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
+    {
+      if (int(float(gx_current_skin)==1))
+        {
+      GdkColor colorGreen;
+      gdk_color_parse("#000000", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
+      gdk_color_parse("#111111", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
+      gdk_color_parse("#222222", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
+      gdk_color_parse("#333333", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
+        }
+        else{
+           GdkColor colorGreen;
+      gdk_color_parse("#a6a9aa", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
+      gdk_color_parse("#ffffff", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
+      gdk_color_parse("#ffffff", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
+      gdk_color_parse("#a6a9aa", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
+        }
+      return FALSE;
+    }
 
     gboolean box7_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
     {
--- trunk/src/headers/gx_gui_helpers.h	2009/12/13 09:24:02	433
+++ trunk/src/headers/gx_gui_helpers.h	2009/12/16 19:36:03	434
@@ -44,6 +44,7 @@
   gboolean box2_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
   gboolean box1_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
   gboolean box_expose (GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
+  gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
 
   /* guitarix skin related functions */
   unsigned int gx_fetch_available_skins();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Jul 2009 02:15:36 -0000	1.4
+++ .cvsignore	24 Dec 2009 07:44:59 -0000	1.5
@@ -1 +1 @@
-guitarix-0.05.0-1.tar.bz2
+guitarix-0.05.5-1.tar.bz2


Index: guitarix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/devel/guitarix.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- guitarix.spec	5 Aug 2009 23:33:10 -0000	1.5
+++ guitarix.spec	24 Dec 2009 07:45:00 -0000	1.6
@@ -1,11 +1,14 @@
 Name:           guitarix
-Version:        0.05.0
-Release:        2%{?dist}
+Version:        0.05.5
+Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}-1/%{name}-%{version}-1.tar.bz2
+# From upstream trunk:
+# http://guitarix.svn.sourceforge.net/viewvc/guitarix?view=rev&revision=434
+Patch0:         %{name}-midiout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -18,6 +21,7 @@ BuildRequires:  libsndfile-devel
 Requires:       jack_capture
 Requires:       jconv
 Requires:       ladspa
+Requires:       qjackctl
 Requires:       vorbis-tools
 
 %description
@@ -37,12 +41,7 @@ all channels.
 
 %prep
 %setup -q -n %{name}-%{version}-1
-
-# Correct libdir path
-sed -i 's|lib/|%{_lib}/|' wscript
-
-# Comply with freedesktop standards
-sed -i 's|\.png||' %{name}.desktop
+%patch0 -p1 -b .midiout
 
 %build
 ./waf -vvv configure --prefix=%{_prefix} --cxxflags="%{optflags}" --ladspadir=%{_libdir}/ladspa
@@ -58,9 +57,6 @@ desktop-file-install                    
 %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 
-%check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-
 %clean
 rm -rf %{buildroot}
 
@@ -76,6 +72,10 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Thu Dec 24 2009 Orcan Ogetbil <orcan at desitter> - 0.05.5-1
+- Update to 0.05.5
+- Add Requires: qjackctl. RHBZ #549566
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.05.0-2
 - Update .desktop file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Jul 2009 02:15:37 -0000	1.4
+++ sources	24 Dec 2009 07:45:00 -0000	1.5
@@ -1 +1 @@
-9f2543abbaca3af59bde0ec0ade15658  guitarix-0.05.0-1.tar.bz2
+4ffdd87871823562282a16975090d7e2  guitarix-0.05.5-1.tar.bz2



From oget at fedoraproject.org  Thu Dec 24 07:46:03 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 07:46:03 +0000 (UTC)
Subject: rpms/guitarix/F-12 guitarix-midiout.patch, NONE, 1.1 .cvsignore, 1.4, 
	1.5 guitarix.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091224074603.5BF5811C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/guitarix/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13422

Modified Files:
	.cvsignore guitarix.spec sources 
Added Files:
	guitarix-midiout.patch 
Log Message:
* Thu Dec 24 2009 Orcan Ogetbil <orcan at desitter> - 0.05.5-1
- Update to 0.05.5
- Add Requires: qjackctl. RHBZ #549566


guitarix-midiout.patch:
 gx_engine.cpp            |    8 ++++----
 gx_engine_midi.cpp       |    4 ++--
 gx_gui_helpers.cpp       |   27 +++++++++++++++++++++++++++
 headers/gx_gui_helpers.h |    1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

--- NEW FILE guitarix-midiout.patch ---
--- trunk/src/gx_engine.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_engine.cpp	2009/12/16 19:36:03	434
@@ -533,11 +533,11 @@
   /* --- adding rest of engine class by file inclusion for readability --- */
 
   /* MIDI engine */
-#ifdef USE_RINGBUFFER
-#include "gx_engine_midi_ringbuf.cpp"
-#else
+//#ifdef USE_RINGBUFFER
+//#include "gx_engine_midi_ringbuf.cpp"
+//#else
 #include "gx_engine_midi.cpp"
-#endif
+//#endif
 
   /* audio engine */
 #include "gx_engine_audio.cpp"
--- trunk/src/gx_engine_midi.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_engine_midi.cpp	2009/12/16 19:36:03	434
@@ -411,8 +411,8 @@
                       if(Beat_is < rms)Beat_is += 2;
                       //Beat_is = rms;
                       send+=step;
-                      if (fcheckbox10 == 1.0) send1+=step;
-                      if (fcheckbox11 == 1.0) send2+=step;
+                      if (fcheckbox10 ) send1+=step;
+                      if (fcheckbox11 ) send2+=step;
                     }
                  // else weg +=step;
                 }
--- trunk/src/gx_gui_helpers.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_gui_helpers.cpp	2009/12/16 19:36:03	434
@@ -1525,6 +1525,33 @@
       return FALSE;
     }
 
+    gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
+    {
+      if (int(float(gx_current_skin)==1))
+        {
+      GdkColor colorGreen;
+      gdk_color_parse("#000000", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
+      gdk_color_parse("#111111", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
+      gdk_color_parse("#222222", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
+      gdk_color_parse("#333333", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
+        }
+        else{
+           GdkColor colorGreen;
+      gdk_color_parse("#a6a9aa", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
+      gdk_color_parse("#ffffff", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
+      gdk_color_parse("#ffffff", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
+      gdk_color_parse("#a6a9aa", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
+        }
+      return FALSE;
+    }
 
     gboolean box7_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
     {
--- trunk/src/headers/gx_gui_helpers.h	2009/12/13 09:24:02	433
+++ trunk/src/headers/gx_gui_helpers.h	2009/12/16 19:36:03	434
@@ -44,6 +44,7 @@
   gboolean box2_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
   gboolean box1_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
   gboolean box_expose (GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
+  gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
 
   /* guitarix skin related functions */
   unsigned int gx_fetch_available_skins();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Jul 2009 02:15:36 -0000	1.4
+++ .cvsignore	24 Dec 2009 07:46:02 -0000	1.5
@@ -1 +1 @@
-guitarix-0.05.0-1.tar.bz2
+guitarix-0.05.5-1.tar.bz2


Index: guitarix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/F-12/guitarix.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- guitarix.spec	5 Aug 2009 23:33:10 -0000	1.5
+++ guitarix.spec	24 Dec 2009 07:46:03 -0000	1.6
@@ -1,11 +1,14 @@
 Name:           guitarix
-Version:        0.05.0
-Release:        2%{?dist}
+Version:        0.05.5
+Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}-1/%{name}-%{version}-1.tar.bz2
+# From upstream trunk:
+# http://guitarix.svn.sourceforge.net/viewvc/guitarix?view=rev&revision=434
+Patch0:         %{name}-midiout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -18,6 +21,7 @@ BuildRequires:  libsndfile-devel
 Requires:       jack_capture
 Requires:       jconv
 Requires:       ladspa
+Requires:       qjackctl
 Requires:       vorbis-tools
 
 %description
@@ -37,12 +41,7 @@ all channels.
 
 %prep
 %setup -q -n %{name}-%{version}-1
-
-# Correct libdir path
-sed -i 's|lib/|%{_lib}/|' wscript
-
-# Comply with freedesktop standards
-sed -i 's|\.png||' %{name}.desktop
+%patch0 -p1 -b .midiout
 
 %build
 ./waf -vvv configure --prefix=%{_prefix} --cxxflags="%{optflags}" --ladspadir=%{_libdir}/ladspa
@@ -58,9 +57,6 @@ desktop-file-install                    
 %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 
-%check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-
 %clean
 rm -rf %{buildroot}
 
@@ -76,6 +72,10 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Thu Dec 24 2009 Orcan Ogetbil <orcan at desitter> - 0.05.5-1
+- Update to 0.05.5
+- Add Requires: qjackctl. RHBZ #549566
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.05.0-2
 - Update .desktop file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Jul 2009 02:15:37 -0000	1.4
+++ sources	24 Dec 2009 07:46:03 -0000	1.5
@@ -1 +1 @@
-9f2543abbaca3af59bde0ec0ade15658  guitarix-0.05.0-1.tar.bz2
+4ffdd87871823562282a16975090d7e2  guitarix-0.05.5-1.tar.bz2



From oget at fedoraproject.org  Thu Dec 24 07:46:59 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 07:46:59 +0000 (UTC)
Subject: rpms/guitarix/F-11 guitarix-midiout.patch, NONE, 1.1 .cvsignore, 1.4, 
	1.5 guitarix.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091224074659.2F9AA11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/guitarix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13693

Modified Files:
	.cvsignore guitarix.spec sources 
Added Files:
	guitarix-midiout.patch 
Log Message:
* Thu Dec 24 2009 Orcan Ogetbil <orcan at desitter> - 0.05.5-1
- Update to 0.05.5
- Add Requires: qjackctl. RHBZ #549566


guitarix-midiout.patch:
 gx_engine.cpp            |    8 ++++----
 gx_engine_midi.cpp       |    4 ++--
 gx_gui_helpers.cpp       |   27 +++++++++++++++++++++++++++
 headers/gx_gui_helpers.h |    1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

--- NEW FILE guitarix-midiout.patch ---
--- trunk/src/gx_engine.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_engine.cpp	2009/12/16 19:36:03	434
@@ -533,11 +533,11 @@
   /* --- adding rest of engine class by file inclusion for readability --- */
 
   /* MIDI engine */
-#ifdef USE_RINGBUFFER
-#include "gx_engine_midi_ringbuf.cpp"
-#else
+//#ifdef USE_RINGBUFFER
+//#include "gx_engine_midi_ringbuf.cpp"
+//#else
 #include "gx_engine_midi.cpp"
-#endif
+//#endif
 
   /* audio engine */
 #include "gx_engine_audio.cpp"
--- trunk/src/gx_engine_midi.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_engine_midi.cpp	2009/12/16 19:36:03	434
@@ -411,8 +411,8 @@
                       if(Beat_is < rms)Beat_is += 2;
                       //Beat_is = rms;
                       send+=step;
-                      if (fcheckbox10 == 1.0) send1+=step;
-                      if (fcheckbox11 == 1.0) send2+=step;
+                      if (fcheckbox10 ) send1+=step;
+                      if (fcheckbox11 ) send2+=step;
                     }
                  // else weg +=step;
                 }
--- trunk/src/gx_gui_helpers.cpp	2009/12/13 09:24:02	433
+++ trunk/src/gx_gui_helpers.cpp	2009/12/16 19:36:03	434
@@ -1525,6 +1525,33 @@
       return FALSE;
     }
 
+    gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
+    {
+      if (int(float(gx_current_skin)==1))
+        {
+      GdkColor colorGreen;
+      gdk_color_parse("#000000", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
+      gdk_color_parse("#111111", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
+      gdk_color_parse("#222222", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
+      gdk_color_parse("#333333", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
+        }
+        else{
+           GdkColor colorGreen;
+      gdk_color_parse("#a6a9aa", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
+      gdk_color_parse("#ffffff", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
+      gdk_color_parse("#ffffff", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
+      gdk_color_parse("#a6a9aa", &colorGreen);
+      gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
+        }
+      return FALSE;
+    }
 
     gboolean box7_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
     {
--- trunk/src/headers/gx_gui_helpers.h	2009/12/13 09:24:02	433
+++ trunk/src/headers/gx_gui_helpers.h	2009/12/16 19:36:03	434
@@ -44,6 +44,7 @@
   gboolean box2_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
   gboolean box1_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
   gboolean box_expose (GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
+  gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
 
   /* guitarix skin related functions */
   unsigned int gx_fetch_available_skins();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Jul 2009 02:25:55 -0000	1.4
+++ .cvsignore	24 Dec 2009 07:46:58 -0000	1.5
@@ -1 +1 @@
-guitarix-0.05.0-1.tar.bz2
+guitarix-0.05.5-1.tar.bz2


Index: guitarix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/F-11/guitarix.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- guitarix.spec	28 Jul 2009 02:25:55 -0000	1.3
+++ guitarix.spec	24 Dec 2009 07:46:58 -0000	1.4
@@ -1,11 +1,14 @@
 Name:           guitarix
-Version:        0.05.0
+Version:        0.05.5
 Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}-1/%{name}-%{version}-1.tar.bz2
+# From upstream trunk:
+# http://guitarix.svn.sourceforge.net/viewvc/guitarix?view=rev&revision=434
+Patch0:         %{name}-midiout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -18,6 +21,7 @@ BuildRequires:  libsndfile-devel
 Requires:       jack_capture
 Requires:       jconv
 Requires:       ladspa
+Requires:       qjackctl
 Requires:       vorbis-tools
 
 %description
@@ -37,12 +41,7 @@ all channels.
 
 %prep
 %setup -q -n %{name}-%{version}-1
-
-# Correct libdir path
-sed -i 's|lib/|%{_lib}/|' wscript
-
-# Comply with freedesktop standards
-sed -i 's|\.png||' %{name}.desktop
+%patch0 -p1 -b .midiout
 
 %build
 ./waf -vvv configure --prefix=%{_prefix} --cxxflags="%{optflags}" --ladspadir=%{_libdir}/ladspa
@@ -52,8 +51,11 @@ sed -i 's|\.png||' %{name}.desktop
 rm -rf %{buildroot}
 ./waf -vvv install --destdir="%{buildroot}"
 
-%check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-install                                    \
+--add-category="X-DigitalProcessing"                    \
+--dir=%{buildroot}%{_datadir}/applications              \
+%{buildroot}/%{_datadir}/applications/%{name}.desktop
+
 
 %clean
 rm -rf %{buildroot}
@@ -70,6 +72,13 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Thu Dec 24 2009 Orcan Ogetbil <orcan at desitter> - 0.05.5-1
+- Update to 0.05.5
+- Add Requires: qjackctl. RHBZ #549566
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.05.0-2
+- Update .desktop file
+
 * Mon Jul 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.05.0-1
 - Update to 0.05.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Jul 2009 02:25:55 -0000	1.4
+++ sources	24 Dec 2009 07:46:59 -0000	1.5
@@ -1 +1 @@
-9f2543abbaca3af59bde0ec0ade15658  guitarix-0.05.0-1.tar.bz2
+4ffdd87871823562282a16975090d7e2  guitarix-0.05.5-1.tar.bz2



From belegdol at fedoraproject.org  Thu Dec 24 08:01:31 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Thu, 24 Dec 2009 08:01:31 +0000 (UTC)
Subject: rpms/EMBOSS/F-12 EMBOSS-6.1.0-rebuild.patch, NONE, 1.1 jemboss.desktop,
	NONE, 1.1 .cvsignore, 1.2, 1.3 EMBOSS.spec, 1.1,
	1.2 README.fixes, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091224080131.7930011C00E6@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15608

Modified Files:
	.cvsignore EMBOSS.spec README.fixes sources 
Added Files:
	EMBOSS-6.1.0-rebuild.patch jemboss.desktop 
Log Message:
* Sun Dec 13 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-6
- Added the upstream 1-3 patch
- Fixed bogus Patch3 description
- Jemboss is still disabled, but some improvements have been made
  - Backported patch enabling jemboss rebuild from CVS
  - Added ant and jpackage-utils to BuildRequires
  - Made java-devel dependency versioned
  - Switched to build-jar-repository to fill the dependencies
  - Replaced versioned log4j calls with latest version
  - Renamed EMBOSS-java to jemboss
  - Added a desktop entry for jemboss from Debian


EMBOSS-6.1.0-rebuild.patch:
 Makefile.am |    5 +++++
 Makefile.in |   31 +++++++++++++++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)

--- NEW FILE EMBOSS-6.1.0-rebuild.patch ---
--- jemboss/lib/Makefile.am.rebuild	2009-06-30 10:33:58.000000000 +0200
+++ jemboss/lib/Makefile.am	2009-10-21 07:56:01.000000000 +0200
@@ -1,5 +1,10 @@
 SUBDIRS = axis
 
+all-local:
+if EHAVEANT
+	ant -f ../build.xml package -Demboss.data=../emboss/data -Dname=client -Djar.dir=lib -Dnotformemboss=yes;
+endif
+
 # The install-exec-hook is for the case where a client.jar has
 # been created by the 'ant' packaging for a standalone Jemboss.
 # In that case it needs to be copied to the install dir.
--- jemboss/lib/Makefile.in.rebuild	2009-07-15 01:16:01.000000000 +0200
+++ jemboss/lib/Makefile.in	2009-10-21 07:56:46.000000000 +0200
@@ -507,7 +507,7 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA)
+all-am: Makefile $(DATA) all-local
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
@@ -609,21 +609,24 @@
 	install-am install-exec-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgdataDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-pkgdataDATA
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgdataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-pkgdataDATA
 
 
+all-local:
+ at EHAVEANT_TRUE@	ant -f ../build.xml package -Demboss.data=../emboss/data -Dname=client -Djar.dir=lib -Dnotformemboss=yes;
+
 # The install-exec-hook is for the case where a client.jar has
 # been created by the 'ant' packaging for a standalone Jemboss.
 # In that case it needs to be copied to the install dir.


--- NEW FILE jemboss.desktop ---
[Desktop Entry]
Version=1.0
Terminal=false
Icon=jemboss
Exec=runJemboss.csh
Name=Jemboss
GenericName=GUI for EMBOSS
Comment=Graphical user interface for the European Molecular Biology Open Software Suite.
Type=Application
Categories=Biology;Science;Education;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Oct 2009 22:49:35 -0000	1.2
+++ .cvsignore	24 Dec 2009 08:01:31 -0000	1.3
@@ -1,2 +1,2 @@
 EMBOSS-6.1.0.tar.gz
-patch-1-2.gz
+patch-1-3.gz


Index: EMBOSS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-12/EMBOSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- EMBOSS.spec	17 Oct 2009 22:49:35 -0000	1.1
+++ EMBOSS.spec	24 Dec 2009 08:01:31 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           EMBOSS
 Version:        6.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The European Molecular Biology Open Software Suite
 
 Group:          Applications/Engineering
@@ -13,22 +13,28 @@ License:        GPLv2+
 URL:            http://emboss.sf.net/
 Source0:        ftp://emboss.open-bio.org/pub/EMBOSS/%{name}-%{version}.tar.gz
 Source1:        README.fixes
+Source2:        jemboss.desktop
 #Upstream patch
-Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-2.gz
+Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-3.gz
 #Use system-wide pcre. Sent upstream.
 Patch1:         %{name}-system-pcre.patch
 #Fedora-specific. Not sent upstream.
 Patch2:         %{name}-fedora.patch
-#Add missing destdir. Sent upstream.
+#Remove extra destdir. Sent upstream.
 Patch3:         %{name}-6.1.0-destdir.patch
+#Patch ensuring jemboss rebuild backported from CVS
+Patch4:         %{name}-6.1.0-rebuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  ant
+BuildRequires:  desktop-file-utils
 BuildRequires:  gd-devel
-#BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils
 BuildRequires:  pam-devel
 BuildRequires:  pcre-devel
-#BuildRequires:  axis classpathx-jaf jakarta-commons-discovery
-#BuildRequires:  jakarta-commons-logging log4j wsdl4j
+BuildRequires:  axis jaf javamail jakarta-commons-discovery jakarta-commons-logging
+BuildRequires:  log4j regexp servlet xerces-j2 wsdl4j
 
 %description
 EMBOSS is a new, free Open Source software analysis package specially
@@ -64,14 +70,16 @@ The %{name}-libs package includes the dy
 necessary for %{name}.
 
 
-#%package java
+#%package -n jemboss
 #Summary:        Java interface to %{name}
 #Group:          Applications/Engineering
 #Requires:       %{name} = %{version}-%{release}
-#Requires:       axis classpathx-jaf jakarta-commons-discovery
-#Requires:       jakarta-commons-logging log4j wsdl4j
+#Requires:       java >= 1:1.6.0
+#Requires:       jpackage-utils    
+#Requires:       axis jaf javamail jakarta-commons-discovery jakarta-commons-logging
+#Requires:       log4j regexp servlet xerces-j2 wsdl4j
 
-#%description java
+#%description -n jemboss
 #Jemboss is a Java interface to EMBOSS, developed at
 #the HGMP-RC and in close collaboration with the EMBOSS
 #development team. It is distributed as part of the EMBOSS
@@ -87,6 +95,7 @@ necessary for %{name}.
 %patch1 -p1 -b .pcre
 %patch2 -p0 -b .fedora
 %patch3 -p0 -b .destdir
+%patch4 -p0 -b .jemboss-rebuild
 
 #install the patch readme
 install -pm 644 %{SOURCE1} README.fixes
@@ -94,30 +103,29 @@ install -pm 644 %{SOURCE1} README.fixes
 #these files were executable for some reason
 chmod 644 emboss/prettyplot.c emboss/polydot.c emboss/supermatcher.c
 
+#use newer log4j version
+sed -i "s at log4j-1.2.8@log4j-1.2.14@" \
+    jemboss/lib/axis/Makefile.am \
+    jemboss/lib/axis/Makefile.in \
+    jemboss/utils/makeFileManagerJNLP.sh \
+    jemboss/utils/makeJNLP.sh
+
 #use system java libraries
-#pushd jemboss/lib
-#rm activation.jar;
-#ln -s %{_javadir}/activation.jar activation.jar;
-#pushd axis
-#for i in axis-ant axis jaxrpc saaj;
-#do
-#    rm $i.jar;
-#    ln -s %{_javadir}/axis/$i.jar $i.jar;
-#done
-#for i in commons-discovery commons-logging wsdl4j;
-#do
-#    rm $i.jar;
-#    ln -s %{_javadir}/$i.jar $i.jar;
-#done
-#rm log4j-1.2.8.jar
-#ln -s %{_javadir}/log4j.jar log4j-1.2.8.jar
-#popd
-#popd
+rm jemboss/lib/{activation,client,jakarta-regexp-1.2,mail,xerces}.jar
+build-jar-repository -s -p jemboss/lib activation regexp javamail xerces-j2
+mv jemboss/lib/regexp.jar jemboss/lib/jakarta-regexp-1.2.jar
+mv jemboss/lib/javamail.jar jemboss/lib/mail.jar
+mv jemboss/lib/xerces-j2.jar jemboss/lib/xerces.jar
+rm jemboss/lib/axis/*.jar
+build-jar-repository -s -p jemboss/lib/axis axis/axis-ant axis/axis axis/jaxrpc axis/saaj commons-discovery commons-logging log4j-1.2.14 servlet wsdl4j
+for i in axis axis-ant jaxrpc saaj;
+do
+mv jemboss/lib/axis/axis_$i.jar jemboss/lib/axis/$i.jar;
+done
 
 
 %build
 %configure \
-  --without-java \
   --disable-static \
   --with-x \
   --with-auth \
@@ -126,6 +134,9 @@ chmod 644 emboss/prettyplot.c emboss/pol
 %ifarch ppc64 sparc64 x86_64
   --enable-64 \
 %endif
+  --with-java=/usr/lib/jvm/java/include \
+  --with-javaos=/usr/lib/jvm/java/include/linux \
+
 
 %{__make} %{?_smp_mflags}
 
@@ -169,6 +180,11 @@ popd
 #rename conflicting binaries
 mv $RPM_BUILD_ROOT%{_bindir}/chaos $RPM_BUILD_ROOT%{_bindir}/em_chaos
 
+#install the desktop file
+#desktop-file-install                                    \
+#--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+#%{SOURCE2}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -196,20 +212,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_includedir}/EMBOSS
 
+
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
 
-#%files java
+#%files -n jemboss
 #%defattr(-,root,root,-)
 #%doc jemboss/README jemboss/resources jemboss/api
 #%{_bindir}/runJemboss.csh
 #%{_bindir}/jembossctl
+#%{_datadir}/applications/jemboss.desktop
 #%{_datadir}/EMBOSS/jemboss
 
 
 %changelog
+* Sun Dec 13 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-6
+- Added the upstream 1-3 patch
+- Fixed bogus Patch3 description
+- Jemboss is still disabled, but some improvements have been made
+  - Backported patch enabling jemboss rebuild from CVS
+  - Added ant and jpackage-utils to BuildRequires
+  - Made java-devel dependency versioned
+  - Switched to build-jar-repository to fill the dependencies
+  - Replaced versioned log4j calls with latest version
+  - Renamed EMBOSS-java to jemboss
+  - Added a desktop entry for jemboss from Debian
+
 * Sat Oct 17 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-5
 - Added comments explaining the purpose of each patch
 


Index: README.fixes
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-12/README.fixes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.fixes	17 Oct 2009 22:49:36 -0000	1.1
+++ README.fixes	24 Dec 2009 08:01:31 -0000	1.2
@@ -30,3 +30,79 @@ Fix 2. EMBOSS-6.1.0/ajax/ajmem.h
              This fixes a bug in processing SwissProt complex descriptions.
              Fix definition of AJRESIZE0 macro.
 	     Fix processing of first match in a profile alignment (prophet).
+
+Fix 3. EMBOSS-6.1.0/ajax/ajfeat.c
+       EMBOSS-6.1.0/ajax/ajfeat.h
+       EMBOSS-6.1.0/ajax/ajgraph.c
+       EMBOSS-6.1.0/ajax/ajmath.c
+       EMBOSS-6.1.0/ajax/ajseq.c
+       EMBOSS-6.1.0/ajax/ajseqread.c
+       EMBOSS-6.1.0/ajax/ajseqwrite.c
+       EMBOSS-6.1.0/nucleus/embmisc.c
+       EMBOSS-6.1.0/nucleus/embmisc.h
+       EMBOSS-6.1.0/nucleus/embpat.c
+       EMBOSS-6.1.0/emboss/coderet.c
+       EMBOSS-6.1.0/emboss/extractfeat.c
+       EMBOSS-6.1.0/emboss/notseq.c
+       EMBOSS-6.1.0/emboss/prettyplot.c
+       EMBOSS-6.1.0/emboss/seqmatchall.c
+       EMBOSS-6.1.0/emboss/showfeat.c
+       EMBOSS-6.1.0/emboss/showpep.c
+       EMBOSS-6.1.0/emboss/showseq.c
+       EMBOSS-6.1.0/emboss/twofeat.c
+       EMBOSS-6.1.0/jemboss/utils/install-jemboss-server.sh
+       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/server/AppendToLogFileThread.java
+       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/server/JembossAuthServer.java
+
+02-Dec-2009: Fixes problems with extractfeat. The fix includes cleaner
+             definitions of functions used to match feature tags and
+             feature types which result in minor updates to 6 other
+             applications.
+
+             Extractfeat in previous versions used its own text parser
+             to extract feature data from only a limited set of
+             formats. In release 6.1.0 it was replaced by the standard
+             EMBOSS feature table. With no options set, extractfeat
+             rejected all features (type '*' was needed to extract
+             features). Extractfeat default settings now extract all
+             features from an entry.
+
+             Features on the reverse strand were incorrectly processed
+             (an effect caused by some of the old extractfeat code
+             remaining). Reverse strand features are now correctly
+             parsed, including both "join(complement())" and
+             "complement(join())" syntax in EMBL/GenBank/DDBJ feature
+             tables.
+
+             Fixes an issue in GenBank parsing where the ORIGIN line is absent.
+
+             Fixes scaling errors in prettyplot, especially in mEMBOSS
+             when plotting to a window on screen (the default
+             output). The plplot library does not report the true
+             width and height for several devices. The assumptions in
+             prettyplot depend on reasonable size estimates. Release
+             6.2.0 will have further corrections to plplot device
+             scaling.
+
+	     Fixes the counting of non-coding features in coderet.
+
+	     Fixes a seqmatchall error for short sequences with perfect matches
+
+	     When reverse-complementing sequences, also reverses
+	     the quality scores.
+
+	     Allows '-' in format names in the USA syntax, to allow
+	     fastq-sanger fastq-illumina and fastq-solexa format names
+	     to be used.
+
+	     When reading protein sequences, a sequence with only a
+	     stop is now recognized as empty (zero length) after
+	     processing ambiguity codes and stops.
+
+	     Fixes a problem writing features in PIR format when the
+	     feature table is empty, for example a report file with no hits.
+
+	     Fixes a dependency on 'ant' to install a Jemboss server.
+
+	     Fixes a problem in logging Jemboss info/error messages.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Oct 2009 22:49:36 -0000	1.2
+++ sources	24 Dec 2009 08:01:31 -0000	1.3
@@ -1,2 +1,2 @@
 6c5163c571bc0be94d64420ce0d71824  EMBOSS-6.1.0.tar.gz
-faec6ddd399ef243f4d6ffbcc878b009  patch-1-2.gz
+4a5f96d849409fdecf39e92380e5381e  patch-1-3.gz



From belegdol at fedoraproject.org  Thu Dec 24 08:15:08 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Thu, 24 Dec 2009 08:15:08 +0000 (UTC)
Subject: rpms/EMBOSS/F-11 EMBOSS-6.1.0-rebuild.patch, NONE, 1.1 jemboss.desktop,
	NONE, 1.1 .cvsignore, 1.2, 1.3 README.fixes, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091224081508.45A6411C00E6@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17220

Modified Files:
	.cvsignore README.fixes sources 
Added Files:
	EMBOSS-6.1.0-rebuild.patch jemboss.desktop 
Log Message:
* Sat Oct 17 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-5
- Added comments explaining the purpose of each patch


EMBOSS-6.1.0-rebuild.patch:
 Makefile.am |    5 +++++
 Makefile.in |   31 +++++++++++++++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)

--- NEW FILE EMBOSS-6.1.0-rebuild.patch ---
--- jemboss/lib/Makefile.am.rebuild	2009-06-30 10:33:58.000000000 +0200
+++ jemboss/lib/Makefile.am	2009-10-21 07:56:01.000000000 +0200
@@ -1,5 +1,10 @@
 SUBDIRS = axis
 
+all-local:
+if EHAVEANT
+	ant -f ../build.xml package -Demboss.data=../emboss/data -Dname=client -Djar.dir=lib -Dnotformemboss=yes;
+endif
+
 # The install-exec-hook is for the case where a client.jar has
 # been created by the 'ant' packaging for a standalone Jemboss.
 # In that case it needs to be copied to the install dir.
--- jemboss/lib/Makefile.in.rebuild	2009-07-15 01:16:01.000000000 +0200
+++ jemboss/lib/Makefile.in	2009-10-21 07:56:46.000000000 +0200
@@ -507,7 +507,7 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA)
+all-am: Makefile $(DATA) all-local
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
@@ -609,21 +609,24 @@
 	install-am install-exec-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgdataDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-pkgdataDATA
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgdataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-pkgdataDATA
 
 
+all-local:
+ at EHAVEANT_TRUE@	ant -f ../build.xml package -Demboss.data=../emboss/data -Dname=client -Djar.dir=lib -Dnotformemboss=yes;
+
 # The install-exec-hook is for the case where a client.jar has
 # been created by the 'ant' packaging for a standalone Jemboss.
 # In that case it needs to be copied to the install dir.


--- NEW FILE jemboss.desktop ---
[Desktop Entry]
Version=1.0
Terminal=false
Icon=jemboss
Exec=runJemboss.csh
Name=Jemboss
GenericName=GUI for EMBOSS
Comment=Graphical user interface for the European Molecular Biology Open Software Suite.
Type=Application
Categories=Biology;Science;Education;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Oct 2009 22:50:58 -0000	1.2
+++ .cvsignore	24 Dec 2009 08:15:07 -0000	1.3
@@ -1,2 +1,2 @@
 EMBOSS-6.1.0.tar.gz
-patch-1-2.gz
+patch-1-3.gz


Index: README.fixes
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-11/README.fixes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.fixes	17 Oct 2009 22:50:58 -0000	1.1
+++ README.fixes	24 Dec 2009 08:15:08 -0000	1.2
@@ -30,3 +30,79 @@ Fix 2. EMBOSS-6.1.0/ajax/ajmem.h
              This fixes a bug in processing SwissProt complex descriptions.
              Fix definition of AJRESIZE0 macro.
 	     Fix processing of first match in a profile alignment (prophet).
+
+Fix 3. EMBOSS-6.1.0/ajax/ajfeat.c
+       EMBOSS-6.1.0/ajax/ajfeat.h
+       EMBOSS-6.1.0/ajax/ajgraph.c
+       EMBOSS-6.1.0/ajax/ajmath.c
+       EMBOSS-6.1.0/ajax/ajseq.c
+       EMBOSS-6.1.0/ajax/ajseqread.c
+       EMBOSS-6.1.0/ajax/ajseqwrite.c
+       EMBOSS-6.1.0/nucleus/embmisc.c
+       EMBOSS-6.1.0/nucleus/embmisc.h
+       EMBOSS-6.1.0/nucleus/embpat.c
+       EMBOSS-6.1.0/emboss/coderet.c
+       EMBOSS-6.1.0/emboss/extractfeat.c
+       EMBOSS-6.1.0/emboss/notseq.c
+       EMBOSS-6.1.0/emboss/prettyplot.c
+       EMBOSS-6.1.0/emboss/seqmatchall.c
+       EMBOSS-6.1.0/emboss/showfeat.c
+       EMBOSS-6.1.0/emboss/showpep.c
+       EMBOSS-6.1.0/emboss/showseq.c
+       EMBOSS-6.1.0/emboss/twofeat.c
+       EMBOSS-6.1.0/jemboss/utils/install-jemboss-server.sh
+       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/server/AppendToLogFileThread.java
+       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/server/JembossAuthServer.java
+
+02-Dec-2009: Fixes problems with extractfeat. The fix includes cleaner
+             definitions of functions used to match feature tags and
+             feature types which result in minor updates to 6 other
+             applications.
+
+             Extractfeat in previous versions used its own text parser
+             to extract feature data from only a limited set of
+             formats. In release 6.1.0 it was replaced by the standard
+             EMBOSS feature table. With no options set, extractfeat
+             rejected all features (type '*' was needed to extract
+             features). Extractfeat default settings now extract all
+             features from an entry.
+
+             Features on the reverse strand were incorrectly processed
+             (an effect caused by some of the old extractfeat code
+             remaining). Reverse strand features are now correctly
+             parsed, including both "join(complement())" and
+             "complement(join())" syntax in EMBL/GenBank/DDBJ feature
+             tables.
+
+             Fixes an issue in GenBank parsing where the ORIGIN line is absent.
+
+             Fixes scaling errors in prettyplot, especially in mEMBOSS
+             when plotting to a window on screen (the default
+             output). The plplot library does not report the true
+             width and height for several devices. The assumptions in
+             prettyplot depend on reasonable size estimates. Release
+             6.2.0 will have further corrections to plplot device
+             scaling.
+
+	     Fixes the counting of non-coding features in coderet.
+
+	     Fixes a seqmatchall error for short sequences with perfect matches
+
+	     When reverse-complementing sequences, also reverses
+	     the quality scores.
+
+	     Allows '-' in format names in the USA syntax, to allow
+	     fastq-sanger fastq-illumina and fastq-solexa format names
+	     to be used.
+
+	     When reading protein sequences, a sequence with only a
+	     stop is now recognized as empty (zero length) after
+	     processing ambiguity codes and stops.
+
+	     Fixes a problem writing features in PIR format when the
+	     feature table is empty, for example a report file with no hits.
+
+	     Fixes a dependency on 'ant' to install a Jemboss server.
+
+	     Fixes a problem in logging Jemboss info/error messages.
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Oct 2009 22:50:58 -0000	1.2
+++ sources	24 Dec 2009 08:15:08 -0000	1.3
@@ -1,2 +1,2 @@
 6c5163c571bc0be94d64420ce0d71824  EMBOSS-6.1.0.tar.gz
-faec6ddd399ef243f4d6ffbcc878b009  patch-1-2.gz
+4a5f96d849409fdecf39e92380e5381e  patch-1-3.gz



From belegdol at fedoraproject.org  Thu Dec 24 08:16:54 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Thu, 24 Dec 2009 08:16:54 +0000 (UTC)
Subject: rpms/EMBOSS/F-11 EMBOSS.spec,1.1,1.2
Message-ID: <20091224081655.037A311C00E6@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17506

Modified Files:
	EMBOSS.spec 
Log Message:
Commit the spec as well


Index: EMBOSS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-11/EMBOSS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- EMBOSS.spec	17 Oct 2009 22:50:58 -0000	1.1
+++ EMBOSS.spec	24 Dec 2009 08:16:54 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           EMBOSS
 Version:        6.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The European Molecular Biology Open Software Suite
 
 Group:          Applications/Engineering
@@ -13,22 +13,28 @@ License:        GPLv2+
 URL:            http://emboss.sf.net/
 Source0:        ftp://emboss.open-bio.org/pub/EMBOSS/%{name}-%{version}.tar.gz
 Source1:        README.fixes
+Source2:        jemboss.desktop
 #Upstream patch
-Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-2.gz
+Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-3.gz
 #Use system-wide pcre. Sent upstream.
 Patch1:         %{name}-system-pcre.patch
 #Fedora-specific. Not sent upstream.
 Patch2:         %{name}-fedora.patch
-#Add missing destdir. Sent upstream.
+#Remove extra destdir. Sent upstream.
 Patch3:         %{name}-6.1.0-destdir.patch
+#Patch ensuring jemboss rebuild backported from CVS
+Patch4:         %{name}-6.1.0-rebuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  ant
+BuildRequires:  desktop-file-utils
 BuildRequires:  gd-devel
-#BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils
 BuildRequires:  pam-devel
 BuildRequires:  pcre-devel
-#BuildRequires:  axis classpathx-jaf jakarta-commons-discovery
-#BuildRequires:  jakarta-commons-logging log4j wsdl4j
+BuildRequires:  axis jaf javamail jakarta-commons-discovery jakarta-commons-logging
+BuildRequires:  log4j regexp servlet xerces-j2 wsdl4j
 
 %description
 EMBOSS is a new, free Open Source software analysis package specially
@@ -64,14 +70,16 @@ The %{name}-libs package includes the dy
 necessary for %{name}.
 
 
-#%package java
+#%package -n jemboss
 #Summary:        Java interface to %{name}
 #Group:          Applications/Engineering
 #Requires:       %{name} = %{version}-%{release}
-#Requires:       axis classpathx-jaf jakarta-commons-discovery
-#Requires:       jakarta-commons-logging log4j wsdl4j
+#Requires:       java >= 1:1.6.0
+#Requires:       jpackage-utils    
+#Requires:       axis jaf javamail jakarta-commons-discovery jakarta-commons-logging
+#Requires:       log4j regexp servlet xerces-j2 wsdl4j
 
-#%description java
+#%description -n jemboss
 #Jemboss is a Java interface to EMBOSS, developed at
 #the HGMP-RC and in close collaboration with the EMBOSS
 #development team. It is distributed as part of the EMBOSS
@@ -87,6 +95,7 @@ necessary for %{name}.
 %patch1 -p1 -b .pcre
 %patch2 -p0 -b .fedora
 %patch3 -p0 -b .destdir
+%patch4 -p0 -b .jemboss-rebuild
 
 #install the patch readme
 install -pm 644 %{SOURCE1} README.fixes
@@ -94,30 +103,29 @@ install -pm 644 %{SOURCE1} README.fixes
 #these files were executable for some reason
 chmod 644 emboss/prettyplot.c emboss/polydot.c emboss/supermatcher.c
 
+#use newer log4j version
+sed -i "s at log4j-1.2.8@log4j-1.2.14@" \
+    jemboss/lib/axis/Makefile.am \
+    jemboss/lib/axis/Makefile.in \
+    jemboss/utils/makeFileManagerJNLP.sh \
+    jemboss/utils/makeJNLP.sh
+
 #use system java libraries
-#pushd jemboss/lib
-#rm activation.jar;
-#ln -s %{_javadir}/activation.jar activation.jar;
-#pushd axis
-#for i in axis-ant axis jaxrpc saaj;
-#do
-#    rm $i.jar;
-#    ln -s %{_javadir}/axis/$i.jar $i.jar;
-#done
-#for i in commons-discovery commons-logging wsdl4j;
-#do
-#    rm $i.jar;
-#    ln -s %{_javadir}/$i.jar $i.jar;
-#done
-#rm log4j-1.2.8.jar
-#ln -s %{_javadir}/log4j.jar log4j-1.2.8.jar
-#popd
-#popd
+rm jemboss/lib/{activation,client,jakarta-regexp-1.2,mail,xerces}.jar
+build-jar-repository -s -p jemboss/lib activation regexp javamail xerces-j2
+mv jemboss/lib/regexp.jar jemboss/lib/jakarta-regexp-1.2.jar
+mv jemboss/lib/javamail.jar jemboss/lib/mail.jar
+mv jemboss/lib/xerces-j2.jar jemboss/lib/xerces.jar
+rm jemboss/lib/axis/*.jar
+build-jar-repository -s -p jemboss/lib/axis axis/axis-ant axis/axis axis/jaxrpc axis/saaj commons-discovery commons-logging log4j-1.2.14 servlet wsdl4j
+for i in axis axis-ant jaxrpc saaj;
+do
+mv jemboss/lib/axis/axis_$i.jar jemboss/lib/axis/$i.jar;
+done
 
 
 %build
 %configure \
-  --without-java \
   --disable-static \
   --with-x \
   --with-auth \
@@ -126,6 +134,9 @@ chmod 644 emboss/prettyplot.c emboss/pol
 %ifarch ppc64 sparc64 x86_64
   --enable-64 \
 %endif
+  --with-java=/usr/lib/jvm/java/include \
+  --with-javaos=/usr/lib/jvm/java/include/linux \
+
 
 %{__make} %{?_smp_mflags}
 
@@ -169,6 +180,11 @@ popd
 #rename conflicting binaries
 mv $RPM_BUILD_ROOT%{_bindir}/chaos $RPM_BUILD_ROOT%{_bindir}/em_chaos
 
+#install the desktop file
+#desktop-file-install                                    \
+#--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+#%{SOURCE2}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -196,20 +212,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_includedir}/EMBOSS
 
+
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
 
-#%files java
+#%files -n jemboss
 #%defattr(-,root,root,-)
 #%doc jemboss/README jemboss/resources jemboss/api
 #%{_bindir}/runJemboss.csh
 #%{_bindir}/jembossctl
+#%{_datadir}/applications/jemboss.desktop
 #%{_datadir}/EMBOSS/jemboss
 
 
 %changelog
+* Sun Dec 13 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-6
+- Added the upstream 1-3 patch
+- Fixed bogus Patch3 description
+- Jemboss is still disabled, but some improvements have been made
+  - Backported patch enabling jemboss rebuild from CVS
+  - Added ant and jpackage-utils to BuildRequires
+  - Made java-devel dependency versioned
+  - Switched to build-jar-repository to fill the dependencies
+  - Replaced versioned log4j calls with latest version
+  - Renamed EMBOSS-java to jemboss
+  - Added a desktop entry for jemboss from Debian
+
 * Sat Oct 17 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-5
 - Added comments explaining the purpose of each patch
 



From pravins at fedoraproject.org  Thu Dec 24 09:30:27 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 09:30:27 +0000 (UTC)
Subject: rpms/lohit-assamese-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-assamese-fonts.spec, 1.2, 1.3
Message-ID: <20091224093027.3115D11C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-assamese-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25955

Modified Files:
	lohit-assamese-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 24 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixes bug 548686 and 549319


bug-549319.patch:
 66-lohit-assamese.conf |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-assamese-2.4.3/66-lohit-assamese.conf lohit-assamese-2.4.3_mod/66-lohit-assamese.conf
--- lohit-assamese-2.4.3/66-lohit-assamese.conf	2009-09-09 15:18:33.000000000 +0530
+++ lohit-assamese-2.4.3_mod/66-lohit-assamese.conf	2009-12-21 14:21:14.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Assamese</string>
   </edit>
 </match>
@@ -19,4 +19,3 @@
   </default>
 </alias>
 </fontconfig>
-


Index: lohit-assamese-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-assamese-fonts/devel/lohit-assamese-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-assamese-fonts.spec	25 Sep 2009 11:49:53 -0000	1.2
+++ lohit-assamese-fonts.spec	24 Dec 2009 09:30:27 -0000	1.3
@@ -5,11 +5,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Assamese font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        http://pravins.fedorapeople.org/lohit/assamese/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -17,6 +17,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -25,6 +26,7 @@ This package provides a free Assamese tr
 
 %prep
 %setup -q -n %{fontname}-%{version} 
+%patch1 -p1 -b .1-fix-font-conf
 
 
 %build
@@ -55,6 +57,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixes bug 548686 and 549319
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 



From pravins at fedoraproject.org  Thu Dec 24 09:50:53 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 09:50:53 +0000 (UTC)
Subject: rpms/lohit-bengali-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-bengali-fonts.spec, 1.3, 1.4
Message-ID: <20091224095053.7A8EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-bengali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28276

Modified Files:
	lohit-bengali-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-4
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-bengali.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-bengali-2.4.3/66-lohit-bengali.conf lohit-bengali-2.4.3_mod/66-lohit-bengali.conf
--- lohit-bengali-2.4.3/66-lohit-bengali.conf	2009-09-09 15:18:33.000000000 +0530
+++ lohit-bengali-2.4.3_mod/66-lohit-bengali.conf	2009-12-23 19:31:52.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Bengali</string>
   </edit>
 </match>


Index: lohit-bengali-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-bengali-fonts/devel/lohit-bengali-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lohit-bengali-fonts.spec	25 Sep 2009 12:21:13 -0000	1.3
+++ lohit-bengali-fonts.spec	24 Dec 2009 09:50:53 -0000	1.4
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free Bengali font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        http://pravins.fedorapeople.org/lohit/bengali/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Bengali tru
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -53,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-4
+- fixed bug 548686, license field
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
 - updated specs
 	



From pravins at fedoraproject.org  Thu Dec 24 09:53:14 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 09:53:14 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-gujarati-fonts.spec, 1.3, 1.4
Message-ID: <20091224095314.BD9D611C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-gujarati-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28658

Modified Files:
	lohit-gujarati-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-4
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-gujarati.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-gujarati-2.4.4/66-lohit-gujarati.conf lohit-gujarati-2.4.4_mod/66-lohit-gujarati.conf
--- lohit-gujarati-2.4.4/66-lohit-gujarati.conf	2009-10-28 17:17:03.000000000 +0530
+++ lohit-gujarati-2.4.4_mod/66-lohit-gujarati.conf	2009-12-23 19:36:49.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Gujarati</string>
   </edit>
 </match>


Index: lohit-gujarati-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/devel/lohit-gujarati-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lohit-gujarati-fonts.spec	28 Oct 2009 12:11:46 -0000	1.3
+++ lohit-gujarati-fonts.spec	24 Dec 2009 09:53:14 -0000	1.4
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Gujarati font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,10 +24,10 @@ This package provides a free Gujarati tr
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
-./generate.pe *.sfd
+make
 
 %install
 rm -fr %{buildroot}
@@ -53,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-4
+- fixed bug 548686, license field
+
 * Wed Oct 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
 - upstream release wuth bugfix 529637
 - update in upstream url



From pravins at fedoraproject.org  Thu Dec 24 09:55:37 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 09:55:37 +0000 (UTC)
Subject: rpms/lohit-hindi-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-hindi-fonts.spec, 1.2, 1.3
Message-ID: <20091224095537.260D611C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-hindi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29056

Modified Files:
	lohit-hindi-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-hindi.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-hindi-2.4.3/66-lohit-hindi.conf lohit-hindi-2.4.3_mod/66-lohit-hindi.conf
--- lohit-hindi-2.4.3/66-lohit-hindi.conf	2009-09-09 15:18:33.000000000 +0530
+++ lohit-hindi-2.4.3_mod/66-lohit-hindi.conf	2009-12-23 19:39:21.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Hindi</string>
   </edit>
 </match>


Index: lohit-hindi-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-hindi-fonts/devel/lohit-hindi-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-hindi-fonts.spec	25 Sep 2009 11:46:51 -0000	1.2
+++ lohit-hindi-fonts.spec	24 Dec 2009 09:55:37 -0000	1.3
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Hindi font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        http://pravins.fedorapeople.org/lohit/hindi/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Hindi truet
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -52,6 +53,9 @@ rm -fr %{buildroot}
 %doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 



From pravins at fedoraproject.org  Thu Dec 24 09:57:40 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 09:57:40 +0000 (UTC)
Subject: rpms/lohit-kannada-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-kannada-fonts.spec, 1.3, 1.4
Message-ID: <20091224095740.A1DEF11C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-kannada-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29444

Modified Files:
	lohit-kannada-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-kannada.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-kannada-2.4.4/66-lohit-kannada.conf lohit-kannada-2.4.4_mod/66-lohit-kannada.conf
--- lohit-kannada-2.4.4/66-lohit-kannada.conf	2009-09-21 16:14:27.000000000 +0530
+++ lohit-kannada-2.4.4_mod/66-lohit-kannada.conf	2009-12-23 19:41:09.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Kannada</string>
   </edit>
 </match>


Index: lohit-kannada-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kannada-fonts/devel/lohit-kannada-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lohit-kannada-fonts.spec	25 Sep 2009 11:56:34 -0000	1.3
+++ lohit-kannada-fonts.spec	24 Dec 2009 09:57:40 -0000	1.4
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Kannada font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Kannada tru
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 make
@@ -53,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-2
 - updated specs
 



From pravins at fedoraproject.org  Thu Dec 24 09:59:57 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 09:59:57 +0000 (UTC)
Subject: rpms/lohit-kashmiri-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-kashmiri-fonts.spec, 1.2, 1.3
Message-ID: <20091224095957.2796A11C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29802

Modified Files:
	lohit-kashmiri-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field
- corrected source url


bug-549319.patch:
 66-lohit-kashmiri at devanagari.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-kashmiri-2.4.3/66-lohit-kashmiri at devanagari.conf lohit-kashmiri-2.4.3_mod/66-lohit-kashmiri at devanagari.conf
--- lohit-kashmiri-2.4.3/66-lohit-kashmiri at devanagari.conf	2009-09-09 15:18:35.000000000 +0530
+++ lohit-kashmiri-2.4.3_mod/66-lohit-kashmiri at devanagari.conf	2009-12-23 19:43:23.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Kashmiri</string>
   </edit>
 </match>


Index: lohit-kashmiri-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-kashmiri-fonts/devel/lohit-kashmiri-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-kashmiri-fonts.spec	25 Sep 2009 11:58:02 -0000	1.2
+++ lohit-kashmiri-fonts.spec	24 Dec 2009 09:59:57 -0000	1.3
@@ -3,18 +3,19 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Kashmiri Devanagari Script Font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
+Source0:        http://pravins.fedorapeople.org/lohit/kashmiri/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Kashmiri de
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -53,6 +54,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+- corrected source url
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	



From pravins at fedoraproject.org  Thu Dec 24 10:15:09 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:15:09 +0000 (UTC)
Subject: rpms/lohit-konkani-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-konkani-fonts.spec, 1.2, 1.3
Message-ID: <20091224101509.B81F111C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-konkani-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31589

Modified Files:
	lohit-konkani-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-konkani.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-konkani-2.4.3/66-lohit-konkani.conf lohit-konkani-2.4.3_mod/66-lohit-konkani.conf
--- lohit-konkani-2.4.3/66-lohit-konkani.conf	2009-09-09 15:18:34.000000000 +0530
+++ lohit-konkani-2.4.3_mod/66-lohit-konkani.conf	2009-12-23 19:49:30.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Konkani</string>
   </edit>
 </match>


Index: lohit-konkani-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-konkani-fonts/devel/lohit-konkani-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-konkani-fonts.spec	25 Sep 2009 11:59:47 -0000	1.2
+++ lohit-konkani-fonts.spec	24 Dec 2009 10:15:09 -0000	1.3
@@ -4,11 +4,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Konkani Font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        http://pravins.fedorapeople.org/lohit/konkani/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -16,6 +16,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -24,7 +25,7 @@ This package provides a free Konkani tru
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -54,6 +55,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	



From pravins at fedoraproject.org  Thu Dec 24 10:20:04 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:20:04 +0000 (UTC)
Subject: rpms/lohit-maithili-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-maithili-fonts.spec, 1.2, 1.3
Message-ID: <20091224102004.CD99411C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-maithili-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32217

Modified Files:
	lohit-maithili-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field
- corrected source link


bug-549319.patch:
 66-lohit-maithili.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-maithili-2.4.3/66-lohit-maithili.conf lohit-maithili-2.4.3_mod/66-lohit-maithili.conf
--- lohit-maithili-2.4.3/66-lohit-maithili.conf	2009-09-09 15:18:34.000000000 +0530
+++ lohit-maithili-2.4.3_mod/66-lohit-maithili.conf	2009-12-23 19:52:49.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Maithili</string>
   </edit>
 </match>


Index: lohit-maithili-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-maithili-fonts/devel/lohit-maithili-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-maithili-fonts.spec	25 Sep 2009 12:02:01 -0000	1.2
+++ lohit-maithili-fonts.spec	24 Dec 2009 10:20:04 -0000	1.3
@@ -3,18 +3,19 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Maithili font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
+Source0:        http://pravins.fedorapeople.org/lohit/maithili/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Maithili tr
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -53,6 +54,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+- corrected source link
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	



From pravins at fedoraproject.org  Thu Dec 24 10:23:02 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:23:02 +0000 (UTC)
Subject: rpms/lohit-malayalam-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-malayalam-fonts.spec, 1.4, 1.5
Message-ID: <20091224102302.B5B2111C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-malayalam-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32668

Modified Files:
	lohit-malayalam-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-4
- fixed bug 548686, license field


bug-549319.patch:
 67-lohit-malayalam.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-malayalam-2.4.4/67-lohit-malayalam.conf lohit-malayalam-2.4.4_mod/67-lohit-malayalam.conf
--- lohit-malayalam-2.4.4/67-lohit-malayalam.conf	2009-09-21 16:14:28.000000000 +0530
+++ lohit-malayalam-2.4.4_mod/67-lohit-malayalam.conf	2009-12-23 19:55:13.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Malayalam</string>
   </edit>
 </match>


Index: lohit-malayalam-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-malayalam-fonts/devel/lohit-malayalam-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lohit-malayalam-fonts.spec	9 Dec 2009 06:52:45 -0000	1.4
+++ lohit-malayalam-fonts.spec	24 Dec 2009 10:23:02 -0000	1.5
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free Malayalam font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Malayalam t
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 make
@@ -51,6 +52,9 @@ rm -fr %{buildroot}
 %doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-4
+- fixed bug 548686, license field
+
 * Wed Dec 09 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-3
 - bugfix 520041
 



From roma at fedoraproject.org  Thu Dec 24 10:26:37 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Thu, 24 Dec 2009 10:26:37 +0000 (UTC)
Subject: rpms/fmtools/F-12 tkradio.py, NONE, 1.1 fmtools.desktop, 1.1,
	1.2 fmtools.spec, 1.6, 1.7 import.log, 1.1, 1.2 tkradio, 1.1,
	1.2 tkradio-mute, 1.1, 1.2
Message-ID: <20091224102637.225C011C00E6@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/fmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv730/F-12

Modified Files:
	fmtools.desktop fmtools.spec import.log tkradio tkradio-mute 
Added Files:
	tkradio.py 
Log Message:
added tkradio.py


--- NEW FILE tkradio.py ---
#!/usr/bin/env python
# Paulo Roma - simple tkinter interface for fmtools
# Date: 23/12/2009
# The radio is turned off on exit.

from Tkinter import *
import Tkinter
import os, sys

# These are stations in the Rio de Janeiro area. 
# Customize for your own locale.

stations = [["MPB",          "90.3"],
            ["CBN",          "92.5"],
            ["Band News",    "94.9"],
            ["PARADISO",     "95.7"],
            ["Nativa",       "96.5"],
            ["98 FM",        "98.0"],
            ["MEC",          "98.9"],
            ["JB FM",        "99.7"],
            ["O Dia",        "100.5"],
            ["Transamerica", "101.3"],
            ["Joven Pan",    "102.1"],
            ["Oi",           "102.9"],
            ["Antena1",      "103.7"]]

radbut  = "95.7"      # default radio frequency
volume  = 100         # initial volume [0,100]
state   = False

def radio ( cmd ):
    """Send the given command to the radio."""

    os.system("fm "+cmd)

def setstation():
    "Set the station chosen via Radio Button."""

    radio ( station.get() )
    freq.delete(0, END)
    freq.insert(0,station.get())

def quit():
    """Quit the radio."""

    radio ("off")
    sys.exit ( 0 )

def mute():
    """Mute/Unmute the radio."""

    global state

    if ( not state ):
        radio ("off")
        state = True 
        btmute.set ( "On" )
        btm.config(state=ACTIVE)
    else:
        radio ("on")
        state = False
        btmute.set ( "Off" )
        btm.config(state=NORMAL)

def on_move(value=0):
    """Use slider position to set the volume."""

    v = scale.get()
    os.system("amixer -q -c 0 set PCM "+str(v)+"%")

def enter ():
    "Enter a new frequency."""

    radio (freq.get())

def readStations ( ):
    """Read the station file."""

    path = os.environ.get("HOME")
    fname = path+"/.radiostations"
    if ( not fname ):
         fname = path+"/.fmrc"

    lst = []
    if ( fname ):
       textf = open(fname, 'r')

       for line in textf:
           l=line.split(None)
           st = [l[0].replace("_"," "),l[1]]
           lst.append ( st )
       textf.close()
    return lst

def main (argv=None):
    """Main program."""

    global scale, station, btmute, btm, freq

    if argv is None:
       argv = sys.argv

    mw = Tk()
    # do not resize the radio
    mw.resizable(False,False)

    station = StringVar()
    station.set ( radbut )

    btmute = StringVar()
    btmute.set ( "Off" )

    top = Frame(); top.pack()
    bot = Frame(); bot.pack()
    mw.title ("tkradio")

    s = readStations ( )
    if ( s ):
         stations = s

    # make tuner buttons
    for st in stations:
        Radiobutton(bot,text=st[0],value=st[1],variable=station,command=setstation).pack(anchor=W)

    scale = Scale(top, from_=0, to=100, orient=HORIZONTAL, command=on_move, bd=0,
                  sliderlength=10, width=5, showvalue=0)
    scale.pack(side='top')
    scale.set(volume)

    # the current radio frequency
    Button(top,text="Enter", command = enter).pack(side="bottom")
    freq=Entry(top,font="Arial 24",width=5,justify=CENTER)
    freq.insert(0,station.get())
    freq.pack(side="bottom")

    # create quit and mute buttons
    Button(top,text="Exit", command = quit).pack(side="right")
    btm=Button(top,text="Off", command = mute, textvariable = btmute)
    btm.pack(side="left")

    # turn the radio on
    setstation()
    radio ("on")

    top.mainloop()

try:
  if __name__=="__main__":
     sys.exit(main())
except:
     radio ("off")
     sys.exit(1)


Index: fmtools.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fmtools.desktop	21 Dec 2009 11:22:43 -0000	1.1
+++ fmtools.desktop	24 Dec 2009 10:26:36 -0000	1.2
@@ -1,8 +1,7 @@
-
 [Desktop Entry]
 Name=tkradio
 Comment=Tcl/Tk wrapper for fmtools
-Exec=tkradio-mute.tcl
+Exec=tkradio.py
 Icon=radio
 Terminal=0
 Type=Application
@@ -10,4 +9,3 @@ StartupNotify=false
 StartupWMClass=tkradio
 Encoding=UTF-8
 Categories=Application;AudioVideo;
-X-Desktop-File-Install-Version=0.15


Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fmtools.spec	21 Dec 2009 11:22:43 -0000	1.6
+++ fmtools.spec	24 Dec 2009 10:26:36 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Simple Video for Linux radio card programs
 Name:    fmtools
 Version: 2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.stanford.edu/~blp/fmtools/
@@ -12,6 +12,7 @@ Source2: http://www.stanford.edu/~blp/fm
 Source3: http://www.stanford.edu/~blp/fmtools/tkradio-mute
 Source4: fmtools.desktop
 Source5: radio.png
+Source6: tkradio.py
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,17 +36,17 @@ frequency and volume specified in $HOME/
 or the volume given on the command line.
 
 %package tkradio
-Summary:       Tcl/Tk wrapper for fmtools
+Summary:       Python/Tk wrapper for fmtools
 Group:         Applications/Multimedia
 BuildRequires: desktop-file-utils
 Requires:      %{name} = %{version}
-Requires:      tk, alsa-utils
+Requires:      python, tk, alsa-utils
 BuildArch:     noarch
 
 %description tkradio
-This package contains wrappers for providing a GUI to %{name}.
-The stations are currently hard coded, but it is easy to change 
-them with a simple text editor. 
+This package provides a GUI for %{name}.
+The stations are read from the same files used by fmcontrol:
+$HOME/.fmrc or $HOME/.radiostations.
 
 %prep
 %setup -q -a1
@@ -63,6 +64,7 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/tkradio.tcl
 install -pm 0755 %{SOURCE3} %{buildroot}%{_bindir}/tkradio-mute.tcl
+install -pm 0755 %{SOURCE6} %{buildroot}%{_bindir}/tkradio.py
 install -pm 0755 fmcontrol/fmcontrol %{buildroot}%{_bindir}
 install -pm 0644 fmcontrol/README README.fmcontrol
 
@@ -87,12 +89,16 @@ rm -rf %{buildroot}
 
 %files tkradio
 %defattr(-,root,root,-)
-%{_bindir}/tkradio*.tcl
+%{_bindir}/tkradio*
 %{_datadir}/applications/fmtools.desktop
 %{_datadir}/pixmaps/radio.png
 
 %changelog
 
+* Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-4
+- Include tkradio.py
+- Fixed fmtools.desktop
+
 * Sun Dec 20 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-3
 - Packaging tkradio separately.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	21 Dec 2009 11:22:43 -0000	1.1
+++ import.log	24 Dec 2009 10:26:36 -0000	1.2
@@ -1 +1,2 @@
 fmtools-2_0-3_fc12:F-12:fmtools-2.0-3.fc12.src.rpm:1261394532
+fmtools-2_0-4_fc12:F-12:fmtools-2.0-4.fc12.src.rpm:1261650364


Index: tkradio
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/tkradio,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tkradio	21 Dec 2009 11:22:43 -0000	1.1
+++ tkradio	24 Dec 2009 10:26:36 -0000	1.2
@@ -54,7 +54,7 @@ proc setstation {} {
 #   roma 20091221
 #   eval exec fm [lindex $stations [expr $radbut*2+1]] $volume
     eval exec fm [lindex $stations [expr $radbut*2+1]]
-    eval exec amixer -c 0 set PCM $volume%
+    eval exec amixer -q -c 0 set PCM $volume%
     .stn configure -state normal
     .stn delete 0 end
     .stn insert 0  [lindex $stations [expr $radbut*2+1]]


Index: tkradio-mute
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/tkradio-mute,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tkradio-mute	21 Dec 2009 11:22:43 -0000	1.1
+++ tkradio-mute	24 Dec 2009 10:26:36 -0000	1.2
@@ -60,7 +60,7 @@ proc setstation {} {
 #   roma 20091221
 #   eval exec fm [lindex $stations [expr $radbut*2+1]] $volume
     eval exec fm [lindex $stations [expr $radbut*2+1]]
-    eval exec amixer -c 0 set PCM $volume%
+    eval exec amixer -q -c 0 set PCM $volume%
     .stn configure -state normal
     .stn delete 0 end
     .stn insert 0  [lindex $stations [expr $radbut*2+1]]



From pravins at fedoraproject.org  Thu Dec 24 10:28:18 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:28:18 +0000 (UTC)
Subject: rpms/lohit-marathi-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-marathi-fonts.spec, 1.2, 1.3
Message-ID: <20091224102818.09B7011C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-marathi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1011

Modified Files:
	lohit-marathi-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-marathi.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-marathi-2.4.3/66-lohit-marathi.conf lohit-marathi-2.4.3_mod/66-lohit-marathi.conf
--- lohit-marathi-2.4.3/66-lohit-marathi.conf	2009-09-09 15:18:34.000000000 +0530
+++ lohit-marathi-2.4.3_mod/66-lohit-marathi.conf	2009-12-23 19:57:30.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Marathi</string>
   </edit>
 </match>


Index: lohit-marathi-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-marathi-fonts/devel/lohit-marathi-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-marathi-fonts.spec	25 Sep 2009 12:05:19 -0000	1.2
+++ lohit-marathi-fonts.spec	24 Dec 2009 10:28:17 -0000	1.3
@@ -5,11 +5,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Marathi font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        http://pravins.fedorapeople.org/lohit/marathi/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -17,6 +17,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -25,7 +26,7 @@ This package provides a free Marathi tru
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -54,6 +55,9 @@ rm -fr %{buildroot}
 %doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	



From pravins at fedoraproject.org  Thu Dec 24 10:30:11 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:30:11 +0000 (UTC)
Subject: rpms/lohit-nepali-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-nepali-fonts.spec, 1.2, 1.3
Message-ID: <20091224103011.454BE11C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-nepali-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1635

Modified Files:
	lohit-nepali-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field


bug-549319.patch:
 67-lohit-nepali.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-nepali-2.4.3/67-lohit-nepali.conf lohit-nepali-2.4.3_mod/67-lohit-nepali.conf
--- lohit-nepali-2.4.3/67-lohit-nepali.conf	2009-09-09 15:18:35.000000000 +0530
+++ lohit-nepali-2.4.3_mod/67-lohit-nepali.conf	2009-12-23 20:02:23.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Nepali</string>
   </edit>
 </match>


Index: lohit-nepali-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-nepali-fonts/devel/lohit-nepali-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-nepali-fonts.spec	25 Sep 2009 12:07:00 -0000	1.2
+++ lohit-nepali-fonts.spec	24 Dec 2009 10:30:11 -0000	1.3
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Nepali font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        http://pravins.fedorapeople.org/lohit/nepali/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Nepali true
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -53,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 



From taljurf at fedoraproject.org  Thu Dec 24 10:30:19 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 24 Dec 2009 10:30:19 +0000 (UTC)
Subject: File invulgotracker-0.61.tar.gz uploaded to lookaside cache by taljurf
Message-ID: <20091224103019.51D5110F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for invulgotracker:

cd1bb347722ce53ffa644d3c7d932fd5  invulgotracker-0.61.tar.gz



From pravins at fedoraproject.org  Thu Dec 24 10:32:18 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:32:18 +0000 (UTC)
Subject: rpms/lohit-oriya-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-oriya-fonts.spec, 1.2, 1.3
Message-ID: <20091224103218.113B111C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-oriya-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2510

Modified Files:
	lohit-oriya-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field
- corrected source url


bug-549319.patch:
 66-lohit-oriya.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-oriya-2.4.3/66-lohit-oriya.conf lohit-oriya-2.4.3_mod/66-lohit-oriya.conf
--- lohit-oriya-2.4.3/66-lohit-oriya.conf	2009-09-09 15:18:34.000000000 +0530
+++ lohit-oriya-2.4.3_mod/66-lohit-oriya.conf	2009-12-23 20:07:48.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Oriya</string>
   </edit>
 </match>


Index: lohit-oriya-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-oriya-fonts/devel/lohit-oriya-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-oriya-fonts.spec	25 Sep 2009 12:09:19 -0000	1.2
+++ lohit-oriya-fonts.spec	24 Dec 2009 10:32:17 -0000	1.3
@@ -3,18 +3,19 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Oriya Font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/Oriya/%{fontname}-%{version}.tar.gz
+Source0:        http://pravins.fedorapeople.org/lohit/oriya/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Oriya truet
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -53,6 +54,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+- corrected source url
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	



From pravins at fedoraproject.org  Thu Dec 24 10:37:08 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:37:08 +0000 (UTC)
Subject: rpms/lohit-punjabi-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-punjabi-fonts.spec, 1.2, 1.3
Message-ID: <20091224103708.E1F9111C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-punjabi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3177

Modified Files:
	lohit-punjabi-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-punjabi.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-punjabi-2.4.3/66-lohit-punjabi.conf lohit-punjabi-2.4.3_mod/66-lohit-punjabi.conf
--- lohit-punjabi-2.4.3/66-lohit-punjabi.conf	2009-09-09 15:18:34.000000000 +0530
+++ lohit-punjabi-2.4.3_mod/66-lohit-punjabi.conf	2009-12-23 20:12:27.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Punjabi</string>
   </edit>
 </match>


Index: lohit-punjabi-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-punjabi-fonts/devel/lohit-punjabi-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-punjabi-fonts.spec	25 Sep 2009 12:11:02 -0000	1.2
+++ lohit-punjabi-fonts.spec	24 Dec 2009 10:37:08 -0000	1.3
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Punjabi font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        http://pravins.fedorapeople.org/lohit/punjabi/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Punjabi tru
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -53,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	



From llaumgui at fedoraproject.org  Thu Dec 24 10:40:17 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:40:17 +0000 (UTC)
Subject: File Base-1.8.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091224104017.33CA910F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-ezc-Base:

f00eb71187ef9903bd1c2f7cdae3216a  Base-1.8.tgz



From pravins at fedoraproject.org  Thu Dec 24 10:41:14 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:41:14 +0000 (UTC)
Subject: rpms/lohit-sindhi-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-sindhi-fonts.spec, 1.2, 1.3
Message-ID: <20091224104114.E3C4911C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-sindhi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3918

Modified Files:
	lohit-sindhi-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-sindhi at devanagari.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-sindhi-2.4.3/66-lohit-sindhi at devanagari.conf lohit-sindhi-2.4.3_mod/66-lohit-sindhi at devanagari.conf
--- lohit-sindhi-2.4.3/66-lohit-sindhi at devanagari.conf	2009-09-09 15:18:35.000000000 +0530
+++ lohit-sindhi-2.4.3_mod/66-lohit-sindhi at devanagari.conf	2009-12-23 20:37:02.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Sindhi</string>
   </edit>
 </match>


Index: lohit-sindhi-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-sindhi-fonts/devel/lohit-sindhi-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-sindhi-fonts.spec	25 Sep 2009 12:13:14 -0000	1.2
+++ lohit-sindhi-fonts.spec	24 Dec 2009 10:41:14 -0000	1.3
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Sindhi font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        http://pravins.fedorapeople.org/lohit/sindhi/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Sindhi true
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 ./generate.pe *.sfd
@@ -53,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-3
+- fixed bug 548686, license field
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	



From llaumgui at fedoraproject.org  Thu Dec 24 10:42:08 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:42:08 +0000 (UTC)
Subject: rpms/php-ezc-Base/devel .cvsignore, 1.3, 1.4 php-ezc-Base.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <20091224104208.1E89E11C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4138/devel

Modified Files:
	.cvsignore php-ezc-Base.spec sources 
Log Message:
Upstream 1.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jun 2009 17:52:17 -0000	1.3
+++ .cvsignore	24 Dec 2009 10:42:07 -0000	1.4
@@ -1 +1 @@
-Base-1.7.tgz
+Base-1.8.tgz


Index: php-ezc-Base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/devel/php-ezc-Base.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Base.spec	26 Jul 2009 18:00:39 -0000	1.3
+++ php-ezc-Base.spec	24 Dec 2009 10:42:08 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Base
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Provides the basic infrastructure that all packages rely on
 
 Group:          Development/Libraries
@@ -32,8 +32,8 @@ Therefore every component relies on this
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -44,23 +44,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -87,17 +87,20 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.8-1
+- upstream 1.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jun 29 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
-- Update to 1.7
+- upstream 1.7
 
 * Sun Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-2
 - Add owner to %%{pear_phpdir}/ezc and %%{pear_phpdir}/ezc/autoload
 
 * Mon Feb 09 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-1
-- Update to 1.6.1
+- upstream 1.6.1
 
 * Thu Feb 03 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2009 17:52:17 -0000	1.3
+++ sources	24 Dec 2009 10:42:08 -0000	1.4
@@ -1 +1 @@
-7ac3d6a7fa119dd4e895ce5fb216dc75  Base-1.7.tgz
+f00eb71187ef9903bd1c2f7cdae3216a  Base-1.8.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 10:42:07 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:42:07 +0000 (UTC)
Subject: rpms/php-ezc-Base/F-11 .cvsignore, 1.3, 1.4 php-ezc-Base.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091224104207.B83C111C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4138/F-11

Modified Files:
	.cvsignore php-ezc-Base.spec sources 
Log Message:
Upstream 1.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jun 2009 17:52:26 -0000	1.3
+++ .cvsignore	24 Dec 2009 10:42:07 -0000	1.4
@@ -1 +1 @@
-Base-1.7.tgz
+Base-1.8.tgz


Index: php-ezc-Base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/F-11/php-ezc-Base.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Base.spec	29 Jun 2009 17:52:26 -0000	1.2
+++ php-ezc-Base.spec	24 Dec 2009 10:42:07 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Base
-Version:        1.7
+Version:        1.8
 Release:        1%{?dist}
 Summary:        Provides the basic infrastructure that all packages rely on
 
@@ -32,8 +32,8 @@ Therefore every component relies on this
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -44,23 +44,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -87,14 +87,20 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.8-1
+- upstream 1.8
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 29 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
-- Update to 1.7
+- upstream 1.7
 
 * Sun Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-2
 - Add owner to %%{pear_phpdir}/ezc and %%{pear_phpdir}/ezc/autoload
 
 * Mon Feb 09 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-1
-- Update to 1.6.1
+- upstream 1.6.1
 
 * Thu Feb 03 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2009 17:52:26 -0000	1.3
+++ sources	24 Dec 2009 10:42:07 -0000	1.4
@@ -1 +1 @@
-7ac3d6a7fa119dd4e895ce5fb216dc75  Base-1.7.tgz
+f00eb71187ef9903bd1c2f7cdae3216a  Base-1.8.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 10:42:07 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:42:07 +0000 (UTC)
Subject: rpms/php-ezc-Base/F-12 .cvsignore, 1.3, 1.4 php-ezc-Base.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091224104207.EA2B411C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4138/F-12

Modified Files:
	.cvsignore php-ezc-Base.spec sources 
Log Message:
Upstream 1.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jun 2009 17:52:17 -0000	1.3
+++ .cvsignore	24 Dec 2009 10:42:07 -0000	1.4
@@ -1 +1 @@
-Base-1.7.tgz
+Base-1.8.tgz


Index: php-ezc-Base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/F-12/php-ezc-Base.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Base.spec	26 Jul 2009 18:00:39 -0000	1.3
+++ php-ezc-Base.spec	24 Dec 2009 10:42:07 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Base
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Provides the basic infrastructure that all packages rely on
 
 Group:          Development/Libraries
@@ -32,8 +32,8 @@ Therefore every component relies on this
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -44,23 +44,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -87,17 +87,20 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.8-1
+- upstream 1.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jun 29 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
-- Update to 1.7
+- upstream 1.7
 
 * Sun Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-2
 - Add owner to %%{pear_phpdir}/ezc and %%{pear_phpdir}/ezc/autoload
 
 * Mon Feb 09 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-1
-- Update to 1.6.1
+- upstream 1.6.1
 
 * Thu Feb 03 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Base/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2009 17:52:17 -0000	1.3
+++ sources	24 Dec 2009 10:42:07 -0000	1.4
@@ -1 +1 @@
-7ac3d6a7fa119dd4e895ce5fb216dc75  Base-1.7.tgz
+f00eb71187ef9903bd1c2f7cdae3216a  Base-1.8.tgz



From pravins at fedoraproject.org  Thu Dec 24 10:43:20 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:43:20 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-tamil-fonts.spec, 1.5, 1.6
Message-ID: <20091224104320.277F511C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-tamil-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4424

Modified Files:
	lohit-tamil-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-2
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-tamil.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-tamil-2.4.5/66-lohit-tamil.conf lohit-tamil-2.4.5_mod/66-lohit-tamil.conf
--- lohit-tamil-2.4.5/66-lohit-tamil.conf	2009-11-24 18:44:14.000000000 +0530
+++ lohit-tamil-2.4.5_mod/66-lohit-tamil.conf	2009-12-23 20:40:07.000000000 +0530
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Tamil</string>
   </edit>
 </match>


Index: lohit-tamil-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/devel/lohit-tamil-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lohit-tamil-fonts.spec	24 Nov 2009 13:24:27 -0000	1.5
+++ lohit-tamil-fonts.spec	24 Dec 2009 10:43:20 -0000	1.6
@@ -3,11 +3,12 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Tamil font
 
 Group:          User Interface/X
 License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +16,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +25,7 @@ This package provides a free Tamil truet
 
 %prep
 %setup -q -n %{fontname}-%{version}
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 make
@@ -53,6 +55,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-2
+- fixed bug 548686, license field
+
 * Tue Nov 24 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-1
 - upstream new release
 



From pravins at fedoraproject.org  Thu Dec 24 10:45:42 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:45:42 +0000 (UTC)
Subject: rpms/lohit-tamil-fonts/devel lohit-tamil-fonts.spec,1.6,1.7
Message-ID: <20091224104542.D5C7211C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-tamil-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4789

Modified Files:
	lohit-tamil-fonts.spec 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-2
- fixed bug 548686, license field



Index: lohit-tamil-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-tamil-fonts/devel/lohit-tamil-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lohit-tamil-fonts.spec	24 Dec 2009 10:43:20 -0000	1.6
+++ lohit-tamil-fonts.spec	24 Dec 2009 10:45:42 -0000	1.7
@@ -7,7 +7,6 @@ Release:        2%{?dist}
 Summary:        Free Tamil font
 
 Group:          User Interface/X
-License:        GPLv2
 License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz



From llaumgui at fedoraproject.org  Thu Dec 24 10:48:21 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:48:21 +0000 (UTC)
Subject: File Archive-1.4.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091224104821.15AB910F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-ezc-Archive:

0a0bda8f20412a4f8c356fea25f3cbcb  Archive-1.4.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 10:57:11 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:57:11 +0000 (UTC)
Subject: rpms/php-ezc-Archive/F-9 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091224105711.7F5A111C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Archive/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6453/F-9

Modified Files:
	.cvsignore sources 
Log Message:
Upstream 1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 May 2009 10:40:36 -0000	1.2
+++ .cvsignore	24 Dec 2009 10:57:11 -0000	1.3
@@ -1 +1 @@
-Archive-1.3.3.tgz
+Archive-1.3.4.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 May 2009 10:40:36 -0000	1.2
+++ sources	24 Dec 2009 10:57:11 -0000	1.3
@@ -1 +1 @@
-0400c9d03f8a3bba4ec3093428e7ef2a  Archive-1.3.3.tgz
+296c4bb993e7938186c53e7d6e56496b  Archive-1.3.4.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 10:57:11 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:57:11 +0000 (UTC)
Subject: rpms/php-ezc-Archive/F-12 .cvsignore, 1.3, 1.4 php-ezc-Archive.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091224105711.589A711C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Archive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6453/F-12

Modified Files:
	.cvsignore php-ezc-Archive.spec sources 
Log Message:
Upstream 1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Oct 2009 10:59:16 -0000	1.3
+++ .cvsignore	24 Dec 2009 10:57:11 -0000	1.4
@@ -1 +1 @@
-Archive-1.3.4.tgz
+Archive-1.4.tgz


Index: php-ezc-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-12/php-ezc-Archive.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Archive.spec	12 Oct 2009 10:59:16 -0000	1.3
+++ php-ezc-Archive.spec	24 Dec 2009 10:57:11 -0000	1.4
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Archive
-Version:        1.3.4
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Create, modify, and extract archive files of various formats
 
@@ -18,7 +18,7 @@ BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
 Requires:       php-posix
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -33,8 +33,8 @@ the flavours: ustar, v7, pax, and gnu) a
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,23 +45,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -86,14 +86,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4-1
+- Upstream 1.4
+
 * Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
-- Update to 1.3.4
+- Upstream 1.3.4
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.3-1
-- Update to 1.3.3
+- Upstream 1.3.3
 
 * Sun Mar 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-2
 - Add php-posix in requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Oct 2009 10:59:16 -0000	1.3
+++ sources	24 Dec 2009 10:57:11 -0000	1.4
@@ -1 +1 @@
-296c4bb993e7938186c53e7d6e56496b  Archive-1.3.4.tgz
+0a0bda8f20412a4f8c356fea25f3cbcb  Archive-1.4.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 10:57:11 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:57:11 +0000 (UTC)
Subject: rpms/php-ezc-Archive/F-11 .cvsignore, 1.3, 1.4 php-ezc-Archive.spec, 
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091224105711.30F9211C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Archive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6453/F-11

Modified Files:
	.cvsignore php-ezc-Archive.spec sources 
Log Message:
Upstream 1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Oct 2009 10:59:14 -0000	1.3
+++ .cvsignore	24 Dec 2009 10:57:10 -0000	1.4
@@ -1 +1 @@
-Archive-1.3.4.tgz
+Archive-1.4.tgz


Index: php-ezc-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-11/php-ezc-Archive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Archive.spec	12 Oct 2009 10:59:15 -0000	1.2
+++ php-ezc-Archive.spec	24 Dec 2009 10:57:11 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Archive
-Version:        1.3.4
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Create, modify, and extract archive files of various formats
 
@@ -18,7 +18,7 @@ BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
 Requires:       php-posix
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -33,8 +33,8 @@ the flavours: ustar, v7, pax, and gnu) a
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,23 +45,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -86,14 +86,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4-1
+- Upstream 1.4
+
 * Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
-- Update to 1.3.4
+- Upstream 1.3.4
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.3-1
-- Update to 1.3.3
+- Upstream 1.3.3
 
 * Sun Mar 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-2
 - Add php-posix in requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Oct 2009 10:59:15 -0000	1.3
+++ sources	24 Dec 2009 10:57:11 -0000	1.4
@@ -1 +1 @@
-296c4bb993e7938186c53e7d6e56496b  Archive-1.3.4.tgz
+0a0bda8f20412a4f8c356fea25f3cbcb  Archive-1.4.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 10:57:11 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:57:11 +0000 (UTC)
Subject: rpms/php-ezc-Archive/devel .cvsignore, 1.3, 1.4 php-ezc-Archive.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091224105711.AD90111C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Archive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6453/devel

Modified Files:
	.cvsignore php-ezc-Archive.spec sources 
Log Message:
Upstream 1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Oct 2009 10:59:06 -0000	1.3
+++ .cvsignore	24 Dec 2009 10:57:11 -0000	1.4
@@ -1 +1 @@
-Archive-1.3.4.tgz
+Archive-1.4.tgz


Index: php-ezc-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/devel/php-ezc-Archive.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Archive.spec	12 Oct 2009 10:59:06 -0000	1.3
+++ php-ezc-Archive.spec	24 Dec 2009 10:57:11 -0000	1.4
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Archive
-Version:        1.3.4
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Create, modify, and extract archive files of various formats
 
@@ -18,7 +18,7 @@ BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
 Requires:       php-posix
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -33,8 +33,8 @@ the flavours: ustar, v7, pax, and gnu) a
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,23 +45,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -86,14 +86,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4-1
+- Upstream 1.4
+
 * Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
-- Update to 1.3.4
+- Upstream 1.3.4
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.3-1
-- Update to 1.3.3
+- Upstream 1.3.3
 
 * Sun Mar 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.2-2
 - Add php-posix in requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Oct 2009 10:59:06 -0000	1.3
+++ sources	24 Dec 2009 10:57:11 -0000	1.4
@@ -1 +1 @@
-296c4bb993e7938186c53e7d6e56496b  Archive-1.3.4.tgz
+0a0bda8f20412a4f8c356fea25f3cbcb  Archive-1.4.tgz



From pravins at fedoraproject.org  Thu Dec 24 10:57:44 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Thu, 24 Dec 2009 10:57:44 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts/devel bug-549319.patch, NONE,
	1.1 lohit-telugu-fonts.spec, 1.4, 1.5
Message-ID: <20091224105744.CEA1311C00E6@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-telugu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6646

Modified Files:
	lohit-telugu-fonts.spec 
Added Files:
	bug-549319.patch 
Log Message:
* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-2
- fixed bug 548686, license field


bug-549319.patch:
 66-lohit-telugu.conf |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bug-549319.patch ---
diff -rup lohit-telugu-2.4.5/66-lohit-telugu.conf lohit-telugu-2.4.5_mod/66-lohit-telugu.conf
--- lohit-telugu-2.4.5/66-lohit-telugu.conf	2009-11-25 12:47:59.000000000 +0530
+++ lohit-telugu-2.4.5_mod/66-lohit-telugu.conf	2009-12-24 14:42:05.000000000 +0530
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <match>
@@ -8,7 +8,7 @@
   <test name="family">
     <string>sans-serif</string>
   </test>
-  <edit name="family" mode="prepend_first" binding="same">
+  <edit name="family" mode="prepend" binding="same">
     <string>Lohit Telugu</string>
   </edit>
 </match>


Index: lohit-telugu-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/lohit-telugu-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lohit-telugu-fonts.spec	25 Nov 2009 07:34:52 -0000	1.4
+++ lohit-telugu-fonts.spec	24 Dec 2009 10:57:44 -0000	1.5
@@ -3,11 +3,11 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Telugu font
 
 Group:          User Interface/X
-License:        GPLv2
+License:        GPLv2 with exceptions
 URL:            https://fedorahosted.org/lohit/
 Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,6 +15,7 @@ BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
+Patch1: bug-549319.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -23,7 +24,7 @@ This package provides a free Telugu true
 
 %prep
 %setup -q -n %{fontname}-%{version} 
-
+%patch1 -p1 -b .1-fix-font-conf
 
 %build
 make
@@ -53,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-2
+- fixed bug 548686, license field
+
 * Wed Nov 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-1
 - upstream new release
 - bug fix 531201



From llaumgui at fedoraproject.org  Thu Dec 24 10:58:22 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 10:58:22 +0000 (UTC)
Subject: File Cache-1.5.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091224105822.288F710F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-ezc-Cache:

75831eda88012844206e5e5de16f29c6  Cache-1.5.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 11:00:13 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 11:00:13 +0000 (UTC)
Subject: rpms/php-ezc-Cache/F-11 .cvsignore, 1.3, 1.4 php-ezc-Cache.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20091224110013.66E3411C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Cache/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7140/F-11

Modified Files:
	.cvsignore php-ezc-Cache.spec sources 
Log Message:
Upstream 1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 May 2009 06:03:01 -0000	1.3
+++ .cvsignore	24 Dec 2009 11:00:13 -0000	1.4
@@ -1 +1 @@
-Cache-1.4.1.tgz
+Cache-1.5.tgz


Index: php-ezc-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-11/php-ezc-Cache.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Cache.spec	12 May 2009 06:03:01 -0000	1.2
+++ php-ezc-Cache.spec	24 Dec 2009 11:00:13 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Cache
-Version:        1.4.1
+Version:        1.5
 Release:        1%{?dist}
 Summary:        Provides a collection of lightweight classes to cache different kinds of data
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -25,16 +25,17 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-A solution for caching, supporting multiple backends allowing you to specify
-the best performing solution for your caching-problem.
+The Cache package provides a collection of lightweight classes to cache
+different kinds of data. It provides a manager class, which takes care of
+instantiating and reusing caches.
 
 APC cache storage is available only if php-pecl-apc extension installed.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,27 +46,27 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # rpmlint (E): zero-length
-rm -f ./docdir/cache/content/dummy
-rm -f ./docdir/cache/templates/dummy
+%{__rm} -f ./docdir/cache/content/dummy
+%{__rm} -f ./docdir/cache/templates/dummy
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -90,8 +91,14 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
+- Upstream 1.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.1-1
-- Update to 1.4.1
+- Upstream 1.4.1
 
 * Thu Apr 23 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 May 2009 06:03:01 -0000	1.3
+++ sources	24 Dec 2009 11:00:13 -0000	1.4
@@ -1 +1 @@
-d0f0b55f3654c4e41af485ea311f1764  Cache-1.4.1.tgz
+75831eda88012844206e5e5de16f29c6  Cache-1.5.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 11:00:13 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 11:00:13 +0000 (UTC)
Subject: rpms/php-ezc-Cache/F-12 .cvsignore, 1.3, 1.4 php-ezc-Cache.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <20091224110013.8B83B11C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Cache/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7140/F-12

Modified Files:
	.cvsignore php-ezc-Cache.spec sources 
Log Message:
Upstream 1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 May 2009 06:03:02 -0000	1.3
+++ .cvsignore	24 Dec 2009 11:00:13 -0000	1.4
@@ -1 +1 @@
-Cache-1.4.1.tgz
+Cache-1.5.tgz


Index: php-ezc-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-12/php-ezc-Cache.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Cache.spec	26 Jul 2009 18:01:19 -0000	1.3
+++ php-ezc-Cache.spec	24 Dec 2009 11:00:13 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Cache
-Version:        1.4.1
-Release:        2%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Provides a collection of lightweight classes to cache different kinds of data
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -25,16 +25,17 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-A solution for caching, supporting multiple backends allowing you to specify
-the best performing solution for your caching-problem.
+The Cache package provides a collection of lightweight classes to cache
+different kinds of data. It provides a manager class, which takes care of
+instantiating and reusing caches.
 
 APC cache storage is available only if php-pecl-apc extension installed.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,27 +46,27 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # rpmlint (E): zero-length
-rm -f ./docdir/cache/content/dummy
-rm -f ./docdir/cache/templates/dummy
+%{__rm} -f ./docdir/cache/content/dummy
+%{__rm} -f ./docdir/cache/templates/dummy
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -90,11 +91,14 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
+- Upstream 1.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.1-1
-- Update to 1.4.1
+- Upstream 1.4.1
 
 * Thu Apr 23 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 May 2009 06:03:02 -0000	1.3
+++ sources	24 Dec 2009 11:00:13 -0000	1.4
@@ -1 +1 @@
-d0f0b55f3654c4e41af485ea311f1764  Cache-1.4.1.tgz
+75831eda88012844206e5e5de16f29c6  Cache-1.5.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 11:00:13 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 11:00:13 +0000 (UTC)
Subject: rpms/php-ezc-Cache/devel .cvsignore, 1.3, 1.4 php-ezc-Cache.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091224110013.B389711C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7140/devel

Modified Files:
	.cvsignore php-ezc-Cache.spec sources 
Log Message:
Upstream 1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 May 2009 06:03:02 -0000	1.3
+++ .cvsignore	24 Dec 2009 11:00:13 -0000	1.4
@@ -1 +1 @@
-Cache-1.4.1.tgz
+Cache-1.5.tgz


Index: php-ezc-Cache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/devel/php-ezc-Cache.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Cache.spec	26 Jul 2009 18:01:19 -0000	1.3
+++ php-ezc-Cache.spec	24 Dec 2009 11:00:13 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Cache
-Version:        1.4.1
-Release:        2%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Provides a collection of lightweight classes to cache different kinds of data
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -25,16 +25,17 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-A solution for caching, supporting multiple backends allowing you to specify
-the best performing solution for your caching-problem.
+The Cache package provides a collection of lightweight classes to cache
+different kinds of data. It provides a manager class, which takes care of
+instantiating and reusing caches.
 
 APC cache storage is available only if php-pecl-apc extension installed.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,27 +46,27 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # rpmlint (E): zero-length
-rm -f ./docdir/cache/content/dummy
-rm -f ./docdir/cache/templates/dummy
+%{__rm} -f ./docdir/cache/content/dummy
+%{__rm} -f ./docdir/cache/templates/dummy
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -90,11 +91,14 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
+- Upstream 1.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.1-1
-- Update to 1.4.1
+- Upstream 1.4.1
 
 * Thu Apr 23 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Cache/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 May 2009 06:03:02 -0000	1.3
+++ sources	24 Dec 2009 11:00:13 -0000	1.4
@@ -1 +1 @@
-d0f0b55f3654c4e41af485ea311f1764  Cache-1.4.1.tgz
+75831eda88012844206e5e5de16f29c6  Cache-1.5.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 11:06:08 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 11:06:08 +0000 (UTC)
Subject: File ConsoleTools-1.6.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091224110608.9169410F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-ezc-ConsoleTools:

397b0e0865a1ca0957f19feeb4d7e934  ConsoleTools-1.6.tgz



From sdz at fedoraproject.org  Thu Dec 24 11:06:35 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 24 Dec 2009 11:06:35 +0000 (UTC)
Subject: rpms/python-olpcgames/devel python-olpcgames.spec,1.1,1.2
Message-ID: <20091224110635.365C511C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-olpcgames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8682

Modified Files:
	python-olpcgames.spec 
Log Message:
fix issues according to the review



Index: python-olpcgames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/devel/python-olpcgames.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-olpcgames.spec	19 Dec 2009 14:34:11 -0000	1.1
+++ python-olpcgames.spec	24 Dec 2009 11:06:35 -0000	1.2
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           python-olpcgames
 Version:        1.6
-Release:        1
+Release:        2
 Summary:        Utilities for developing games on the OLPC platform
 
 Group:          Development/Languages
@@ -35,9 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 export DISPLAY=:0.0
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# set correct permissions for rpmlint
-chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/olpcgames/buildmanifest.py
- 
+# remove shebang to calm rpmlint down
+sed -i -e 1d $RPM_BUILD_ROOT%{python_sitelib}/olpcgames/buildmanifest.py
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 14 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-2
+- fix issues according to review
+
 * Sun Dec 13 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-1
 - update to version 1.6
 - spec file cleanups



From oget at fedoraproject.org  Thu Dec 24 11:07:42 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 11:07:42 +0000 (UTC)
Subject: File muse-1.0.tar.gz uploaded to lookaside cache by oget
Message-ID: <20091224110742.E44F010F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for muse:

177ce7bcad2dc93e733f0ace7cd99b2d  muse-1.0.tar.gz



From llaumgui at fedoraproject.org  Thu Dec 24 11:08:01 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 11:08:01 +0000 (UTC)
Subject: rpms/php-ezc-ConsoleTools/F-12 .cvsignore, 1.4,
	1.5 php-ezc-ConsoleTools.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091224110801.8532111C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-ConsoleTools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506/F-12

Modified Files:
	.cvsignore php-ezc-ConsoleTools.spec sources 
Log Message:
Upstream 1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jun 2009 18:15:11 -0000	1.4
+++ .cvsignore	24 Dec 2009 11:08:01 -0000	1.5
@@ -1 +1 @@
-ConsoleTools-1.5.2.tgz
+ConsoleTools-1.6.tgz


Index: php-ezc-ConsoleTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/F-12/php-ezc-ConsoleTools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-ezc-ConsoleTools.spec	26 Jul 2009 18:01:56 -0000	1.4
+++ php-ezc-ConsoleTools.spec	24 Dec 2009 11:08:01 -0000	1.5
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-ConsoleTools
-Version:        1.5.2
-Release:        2%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        A set of classes to do different actions with the console
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -25,15 +25,14 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-A set of classes to do different actions with the console (also called shell).
-It can render a progress bar, tables and a status bar and contains a class for
-parsing command line options.
+The ConsoleTools component provides several useful tools to build applications
+that run on a computer console (sometimes also called shell or command line).
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -44,23 +43,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -85,14 +84,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
+- Upstream 1.6
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jun 29 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.2-1
-- Update to 1.5.2
+- Upstream 1.5.2
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
-- Update to 1.5.1
+- Upstream 1.5.1
 
 * Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jun 2009 18:15:11 -0000	1.4
+++ sources	24 Dec 2009 11:08:01 -0000	1.5
@@ -1 +1 @@
-f05a6f5013ce39ae0096232d4b307d3c  ConsoleTools-1.5.2.tgz
+397b0e0865a1ca0957f19feeb4d7e934  ConsoleTools-1.6.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 11:08:01 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 11:08:01 +0000 (UTC)
Subject: rpms/php-ezc-ConsoleTools/devel .cvsignore, 1.4,
	1.5 php-ezc-ConsoleTools.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091224110801.B5A1911C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-ConsoleTools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506/devel

Modified Files:
	.cvsignore php-ezc-ConsoleTools.spec sources 
Log Message:
Upstream 1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jun 2009 18:15:11 -0000	1.4
+++ .cvsignore	24 Dec 2009 11:08:01 -0000	1.5
@@ -1 +1 @@
-ConsoleTools-1.5.2.tgz
+ConsoleTools-1.6.tgz


Index: php-ezc-ConsoleTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/devel/php-ezc-ConsoleTools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-ezc-ConsoleTools.spec	26 Jul 2009 18:01:56 -0000	1.4
+++ php-ezc-ConsoleTools.spec	24 Dec 2009 11:08:01 -0000	1.5
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-ConsoleTools
-Version:        1.5.2
-Release:        2%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        A set of classes to do different actions with the console
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -25,15 +25,14 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-A set of classes to do different actions with the console (also called shell).
-It can render a progress bar, tables and a status bar and contains a class for
-parsing command line options.
+The ConsoleTools component provides several useful tools to build applications
+that run on a computer console (sometimes also called shell or command line).
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -44,23 +43,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -85,14 +84,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
+- Upstream 1.6
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jun 29 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.2-1
-- Update to 1.5.2
+- Upstream 1.5.2
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
-- Update to 1.5.1
+- Upstream 1.5.1
 
 * Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jun 2009 18:15:11 -0000	1.4
+++ sources	24 Dec 2009 11:08:01 -0000	1.5
@@ -1 +1 @@
-f05a6f5013ce39ae0096232d4b307d3c  ConsoleTools-1.5.2.tgz
+397b0e0865a1ca0957f19feeb4d7e934  ConsoleTools-1.6.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 11:08:01 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 11:08:01 +0000 (UTC)
Subject: rpms/php-ezc-ConsoleTools/F-11 .cvsignore, 1.4,
	1.5 php-ezc-ConsoleTools.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091224110801.4F8B211C00E6@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-ConsoleTools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506/F-11

Modified Files:
	.cvsignore php-ezc-ConsoleTools.spec sources 
Log Message:
Upstream 1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jun 2009 18:15:15 -0000	1.4
+++ .cvsignore	24 Dec 2009 11:08:01 -0000	1.5
@@ -1 +1 @@
-ConsoleTools-1.5.2.tgz
+ConsoleTools-1.6.tgz


Index: php-ezc-ConsoleTools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/F-11/php-ezc-ConsoleTools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-ConsoleTools.spec	29 Jun 2009 18:15:15 -0000	1.3
+++ php-ezc-ConsoleTools.spec	24 Dec 2009 11:08:01 -0000	1.4
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-ConsoleTools
-Version:        1.5.2
+Version:        1.6
 Release:        1%{?dist}
 Summary:        A set of classes to do different actions with the console
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -25,15 +25,14 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-A set of classes to do different actions with the console (also called shell).
-It can render a progress bar, tables and a status bar and contains a class for
-parsing command line options.
+The ConsoleTools component provides several useful tools to build applications
+that run on a computer console (sometimes also called shell or command line).
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -44,23 +43,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -85,11 +84,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
+- Upstream 1.6
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 29 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.2-1
-- Update to 1.5.2
+- Upstream 1.5.2
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
-- Update to 1.5.1
+- Upstream 1.5.1
 
 * Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-ConsoleTools/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jun 2009 18:15:15 -0000	1.4
+++ sources	24 Dec 2009 11:08:01 -0000	1.5
@@ -1 +1 @@
-f05a6f5013ce39ae0096232d4b307d3c  ConsoleTools-1.5.2.tgz
+397b0e0865a1ca0957f19feeb4d7e934  ConsoleTools-1.6.tgz



From sdz at fedoraproject.org  Thu Dec 24 11:08:15 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 24 Dec 2009 11:08:15 +0000 (UTC)
Subject: rpms/python-olpcgames/F-12 import.log, 1.1, 1.2 python-olpcgames.spec,
	1.1, 1.2
Message-ID: <20091224110815.04A2611C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-olpcgames/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9621/F-12

Modified Files:
	import.log python-olpcgames.spec 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Dec 2009 14:34:11 -0000	1.1
+++ import.log	24 Dec 2009 11:08:14 -0000	1.2
@@ -1 +1,2 @@
 python-olpcgames-1_6-1:HEAD:python-olpcgames-1.6-1.src.rpm:1261233074
+python-olpcgames-1_6-2:F-12:python-olpcgames-1.6-2.src.rpm:1261652858


Index: python-olpcgames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/F-12/python-olpcgames.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-olpcgames.spec	19 Dec 2009 14:34:11 -0000	1.1
+++ python-olpcgames.spec	24 Dec 2009 11:08:14 -0000	1.2
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           python-olpcgames
 Version:        1.6
-Release:        1
+Release:        2
 Summary:        Utilities for developing games on the OLPC platform
 
 Group:          Development/Languages
@@ -35,9 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 export DISPLAY=:0.0
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# set correct permissions for rpmlint
-chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/olpcgames/buildmanifest.py
- 
+# remove shebang to calm rpmlint down
+sed -i -e 1d $RPM_BUILD_ROOT%{python_sitelib}/olpcgames/buildmanifest.py
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 14 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-2
+- fix issues according to review
+
 * Sun Dec 13 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-1
 - update to version 1.6
 - spec file cleanups



From sdz at fedoraproject.org  Thu Dec 24 11:09:30 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 24 Dec 2009 11:09:30 +0000 (UTC)
Subject: rpms/python-olpcgames/F-11 import.log, 1.1, 1.2 python-olpcgames.spec,
	1.1, 1.2
Message-ID: <20091224110930.5741B11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-olpcgames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9994/F-11

Modified Files:
	import.log python-olpcgames.spec 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Dec 2009 14:34:11 -0000	1.1
+++ import.log	24 Dec 2009 11:09:30 -0000	1.2
@@ -1 +1,2 @@
 python-olpcgames-1_6-1:HEAD:python-olpcgames-1.6-1.src.rpm:1261233074
+python-olpcgames-1_6-2:F-11:python-olpcgames-1.6-2.src.rpm:1261652934


Index: python-olpcgames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/F-11/python-olpcgames.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-olpcgames.spec	19 Dec 2009 14:34:11 -0000	1.1
+++ python-olpcgames.spec	24 Dec 2009 11:09:30 -0000	1.2
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           python-olpcgames
 Version:        1.6
-Release:        1
+Release:        2
 Summary:        Utilities for developing games on the OLPC platform
 
 Group:          Development/Languages
@@ -35,9 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 export DISPLAY=:0.0
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# set correct permissions for rpmlint
-chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/olpcgames/buildmanifest.py
- 
+# remove shebang to calm rpmlint down
+sed -i -e 1d $RPM_BUILD_ROOT%{python_sitelib}/olpcgames/buildmanifest.py
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 14 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-2
+- fix issues according to review
+
 * Sun Dec 13 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-1
 - update to version 1.6
 - spec file cleanups



From oget at fedoraproject.org  Thu Dec 24 11:10:45 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 11:10:45 +0000 (UTC)
Subject: rpms/muse/devel muse-destdir.patch, NONE, 1.1 muse-x86_64-sse.patch, 
	NONE, 1.1 sse_functions_64bit.s, NONE, 1.1 muse.spec, 1.7,
	1.8 sources, 1.6, 1.7 muse-glibc210.patch, 1.1, NONE
Message-ID: <20091224111045.AFAF811C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/muse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10554

Modified Files:
	muse.spec sources 
Added Files:
	muse-destdir.patch muse-x86_64-sse.patch sse_functions_64bit.s 
Removed Files:
	muse-glibc210.patch 
Log Message:
* Thu Dec 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-1
- Update to 1.0


muse-destdir.patch:
 share/scripts/Makefile.am |    6 +++---
 share/scripts/Makefile.in |    6 +++---
 utils/Makefile.am         |    4 ++--
 utils/Makefile.in         |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE muse-destdir.patch ---
diff -rupN muse-1.0.old/share/scripts/Makefile.am muse-1.0/share/scripts/Makefile.am
--- muse-1.0.old/share/scripts/Makefile.am	2009-12-21 10:37:20.000000000 -0500
+++ muse-1.0/share/scripts/Makefile.am	2009-12-24 04:19:27.000000000 -0500
@@ -5,7 +5,7 @@ EXTRA_DIST = DoNothing RemoveShortEvents
 #musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
 
 install-data-local: 
-	mkdir -p $(pkgdatadir)/scripts/
-	cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
-	chmod a+x $(pkgdatadir)/scripts/*
+	mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+	cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+	chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
 
diff -rupN muse-1.0.old/share/scripts/Makefile.in muse-1.0/share/scripts/Makefile.in
--- muse-1.0.old/share/scripts/Makefile.in	2009-12-21 10:37:44.000000000 -0500
+++ muse-1.0/share/scripts/Makefile.in	2009-12-24 04:19:43.000000000 -0500
@@ -389,9 +389,9 @@ uninstall-am: uninstall-info-am
 #musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
 
 install-data-local: 
-	mkdir -p $(pkgdatadir)/scripts/
-	cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
-	chmod a+x $(pkgdatadir)/scripts/*
+	mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+	cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+	chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
 # 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:
diff -rupN muse-1.0.old/utils/Makefile.am muse-1.0/utils/Makefile.am
--- muse-1.0.old/utils/Makefile.am	2009-12-21 10:37:20.000000000 -0500
+++ muse-1.0/utils/Makefile.am	2009-12-24 04:26:15.000000000 -0500
@@ -1,6 +1,6 @@
 EXTRA_DIST = muse-find-unused-wavs
 
 install-data-local:
-	cp $(EXTRA_DIST) $(bindir)/
-	chmod a+x $(bindir)/$(EXTRA_DIST) 
+	cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+	chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST) 
 
diff -rupN muse-1.0.old/utils/Makefile.in muse-1.0/utils/Makefile.in
--- muse-1.0.old/utils/Makefile.in	2009-12-21 10:37:45.000000000 -0500
+++ muse-1.0/utils/Makefile.in	2009-12-24 04:26:39.000000000 -0500
@@ -385,8 +385,8 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-	cp $(EXTRA_DIST) $(bindir)/
-	chmod a+x $(bindir)/$(EXTRA_DIST) 
+	cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+	chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST) 
 # 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:

muse-x86_64-sse.patch:
 dsp.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE muse-x86_64-sse.patch ---
--- muse-1.0.old/al/dsp.cpp	2009-12-21 10:37:17.000000000 -0500
+++ muse-1.0/al/dsp.cpp	2009-12-24 05:52:14.000000000 -0500
@@ -28,7 +28,7 @@ namespace AL {
 
 Dsp* dsp = 0;
 
-#ifdef __i386__
+#if defined(__i386__) || defined(__x86_64__)
 
 //---------------------------------------------------------
 //   DspSSE86
@@ -100,7 +100,7 @@ void initDsp()
         printf("Muse: __i386__ or __x86_64__ not defined. Using non-optimized memcpy for float buffer copying.\n");
 #endif
 
-#if defined(__i386__) && defined(USE_SSE)
+#if (defined(__i386__) || defined(__x86_64__)) && defined(USE_SSE)
       unsigned long useSSE = 0;
       if(debugMsg)
         printf("initDsp: __i386__ and USE_SSE defined\n");


***** Error reading new file: [Errno 2] No such file or directory: 'sse_functions_64bit.s'

Index: muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muse/devel/muse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- muse.spec	25 Jul 2009 15:25:37 -0000	1.7
+++ muse.spec	24 Dec 2009 11:10:45 -0000	1.8
@@ -1,41 +1,48 @@
-%global prerelease rc3
-
 Name:          muse
 Summary:       Midi/Audio Music Sequencer
 # Epoch is set to 1 for PlanetCCRMA compatibility.
 # See: https://fedoraproject.org/wiki/AudioCreation
 Epoch:         1
 Version:       1.0
-Release:       %{?prerelease:0.}7%{?prerelease:.%prerelease}%{?dist}.1
+Release:       1%{?dist}
 # synti/vam is GPLv2+
 # original freeverb plugin was public domain
 # some of the widgets are GPLv2
 # ladspa.h is LGPLv2+
 # givertcap (not built) is GPLv2
 # The rest, including the core of muse is distributed under GPL+
+# Source1 is GPLv2+
 License:       GPL+ and GPLv2 and GPLv2+ and LGPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.muse-sequencer.org/
-Source0:       http://downloads.sourceforge.net/lmuse/%{name}-%{version}%{?prerelease}.tar.gz
-# Fix: muse doesn't start on systems using glibc-2.10
-# https://sourceforge.net/tracker/?func=detail&aid=2819312&group_id=93414&atid=604222
-Patch0:        muse-glibc210.patch
+Source0:       http://downloads.sourceforge.net/project/lmuse/%{name}-%{version}/%{name}-%{version}/%{name}-%{version}.tar.gz
+# The following file and patches are sent upstream on Dec 24 2009:
+# http://sourceforge.net/mailarchive/forum.php?forum_name=lmuse-developer
+# Compilation of sse bits fail on x86_64. This file fixes the problem
+Source1:       sse_functions_64bit.s
+# Install utils and scripts into the destdir, or mock will fail
+Patch0:        muse-destdir.patch
+# Add missing condition on an #if to make the sse optimization effective
+Patch1:        muse-x86_64-sse.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-style-dsssl
 BuildRequires: doxygen
+BuildRequires: dssi-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: graphviz
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: lash-devel
 BuildRequires: libcap-devel
+BuildRequires: liblo-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libtool
 BuildRequires: openjade
 BuildRequires: pkgconfig
+BuildRequires: python-devel
 BuildRequires: qt3-devel
 BuildRequires: readline-devel
 
@@ -48,8 +55,9 @@ Jack and ALSA interfaces. MusE aims to b
 for Linux.
 
 %prep
-%setup -q -n %{name}-%{version}%{?prerelease}
-%patch0 -p1 -b .glibc210
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 # Fix encoding issues (upstream is informed):
 for f in README.de README.softsynth SECURITY synti/vam/README; do
@@ -58,13 +66,29 @@ for f in README.de README.softsynth SECU
    mv -f $f.tmp $f
 done
 
+# Detect python properly
+sed -i 's|locate \$ax_python_bin|echo %{_includedir}/python2.6|' configure
+
+# Fix compilaton of the sse bits
+%ifarch x86_64
+cp %{SOURCE1} al/dspSSE.cpp
+%endif
+
 %build
+%if 0%{?fedora} >= 12
+export CXX="g++ -fno-var-tracking-assignments"
+%endif
 %configure --disable-suid-build \
            --disable-suid-install \
            --with-docbook-stylesheets=%{_datadir}/sgml/docbook/dsssl-stylesheets \
            --disable-qttest \
            --with-qt-prefix=${QTDIR} \
            --enable-lash \
+%ifarch %qix86 x86_64
+           --enable-sse \
+%endif
+           --enable-python \
+           --enable-dssi \
            --enable-static=no 
 
 make %{?_smp_mflags}
@@ -141,12 +165,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc README* ReleaseNotes* SECURITY TODO* de
 %{_bindir}/%{name}
 %{_bindir}/grepmidi
+%{_bindir}/%{name}-find-unused-wavs
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
-%changelog
+%changelog 
+* Thu Dec 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-1
+- Update to 1.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-0.7.rc3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/muse/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Jun 2009 01:10:20 -0000	1.6
+++ sources	24 Dec 2009 11:10:45 -0000	1.7
@@ -1 +1 @@
-533a638539a85318034a2764740d11d9  muse-1.0rc3.tar.gz
+177ce7bcad2dc93e733f0ace7cd99b2d  muse-1.0.tar.gz


--- muse-glibc210.patch DELETED ---



From oget at fedoraproject.org  Thu Dec 24 11:15:41 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 11:15:41 +0000 (UTC)
Subject: rpms/muse/devel muse.spec,1.8,1.9
Message-ID: <20091224111541.BFD5C11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/muse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11263

Modified Files:
	muse.spec 
Log Message:
Fix typo about archs



Index: muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muse/devel/muse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- muse.spec	24 Dec 2009 11:10:45 -0000	1.8
+++ muse.spec	24 Dec 2009 11:15:41 -0000	1.9
@@ -84,7 +84,7 @@ export CXX="g++ -fno-var-tracking-assign
            --disable-qttest \
            --with-qt-prefix=${QTDIR} \
            --enable-lash \
-%ifarch %qix86 x86_64
+%ifarch %ix86 x86_64
            --enable-sse \
 %endif
            --enable-python \



From twaugh at fedoraproject.org  Thu Dec 24 11:30:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 24 Dec 2009 11:30:49 +0000 (UTC)
Subject: rpms/ghostscript/F-11 ghostscript-CVE-2009-4270.patch, NONE,
	1.1 ghostscript-vsnprintf.patch, NONE, 1.1 ghostscript.spec,
	1.193, 1.194
Message-ID: <20091224113049.7307511C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13013

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-CVE-2009-4270.patch ghostscript-vsnprintf.patch 
Log Message:
* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 8.70-2
- Fix debugging output from gdevcups (CVE-2009-4270, bug #540760).
- Harden ghostscript's debugging output functions (bug #540760).


ghostscript-CVE-2009-4270.patch:
 gdevcups.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ghostscript-CVE-2009-4270.patch ---
diff -up ghostscript-8.70/cups/gdevcups.c.gdevcups-debug ghostscript-8.70/cups/gdevcups.c
--- ghostscript-8.70/cups/gdevcups.c.gdevcups-debug	2009-05-20 23:30:48.000000000 +0100
+++ ghostscript-8.70/cups/gdevcups.c	2009-11-24 17:16:11.929250977 +0000
@@ -2816,11 +2816,11 @@ cups_put_params(gx_device     *pdev,	/* 
   } \
   else if (code == 0) \
   { \
-    dprintf2("DEBUG: Setting %s to \"%s\"...\n", sname, \
-             (char *)stringval.data); \
     strncpy(cups->header.name, (const char *)stringval.data, \
             stringval.size); \
     cups->header.name[stringval.size] = '\0'; \
+    dprintf2("DEBUG: Setting %s to \"%s\"...\n", sname, \
+             cups->header.name); \
   }
 
 #define intoption(name, sname, type) \

ghostscript-vsnprintf.patch:
 gsmisc.c                  |   14 +++++++-------
 gxttfb.c                  |    2 +-
 rinkj/rinkj-byte-stream.c |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE ghostscript-vsnprintf.patch ---
diff -up ghostscript-8.70/base/gsmisc.c.vsnprintf ghostscript-8.70/base/gsmisc.c
--- ghostscript-8.70/base/gsmisc.c.vsnprintf	2008-01-07 18:43:02.000000000 +0000
+++ ghostscript-8.70/base/gsmisc.c	2009-11-24 17:16:38.575250571 +0000
@@ -69,10 +69,10 @@ int outprintf(const gs_memory_t *mem, co
 
     va_start(args, fmt);
 
-    count = vsprintf(buf, fmt, args);
+    count = vsnprintf(buf, sizeof (buf), fmt, args);
     outwrite(mem, buf, count);
-    if (count >= PRINTF_BUF_LENGTH) {
-	count = sprintf(buf, 
+    if (count == -1 || count >= sizeof (buf)) {
+	count = snprintf(buf, sizeof (buf),
 	    "PANIC: printf exceeded %d bytes.  Stack has been corrupted.\n", 
 	    PRINTF_BUF_LENGTH);
 	outwrite(mem, buf, count);
@@ -89,10 +89,10 @@ int errprintf(const char *fmt, ...)
 
     va_start(args, fmt);
 
-    count = vsprintf(buf, fmt, args);
+    count = vsnprintf(buf, sizeof (buf), fmt, args);
     errwrite(buf, count);
-    if (count >= PRINTF_BUF_LENGTH) {
-	count = sprintf(buf, 
+    if (count == -1 || count >= sizeof (buf)) {
+	count = snprintf(buf, sizeof (buf),
 	    "PANIC: printf exceeded %d bytes.  Stack has been corrupted.\n", 
 	    PRINTF_BUF_LENGTH);
 	errwrite(buf, count);
@@ -236,7 +236,7 @@ int gs_throw_imp(const char *func, const
     va_list ap;
 
     va_start(ap, fmt);
-    vsprintf(msg, fmt, ap);
+    vsnprintf(msg, sizeof (msg), fmt, ap);
     msg[sizeof(msg) - 1] = 0;
     va_end(ap);
 
diff -up ghostscript-8.70/base/gxttfb.c.vsnprintf ghostscript-8.70/base/gxttfb.c
--- ghostscript-8.70/base/gxttfb.c.vsnprintf	2009-07-09 06:59:44.000000000 +0100
+++ ghostscript-8.70/base/gxttfb.c	2009-11-24 17:16:38.577250996 +0000
@@ -246,7 +246,7 @@ static int DebugPrint(ttfFont *ttf, cons
 
     if (gs_debug_c('Y')) {
 	va_start(args, fmt);
-	count = vsprintf(buf, fmt, args);
+	count = vsnprintf(buf, sizeof (buf), fmt, args);
 	/* NB: moved debug output from stdout to stderr
 	 */
 	errwrite(buf, count);
diff -up ghostscript-8.70/base/rinkj/rinkj-byte-stream.c.vsnprintf ghostscript-8.70/base/rinkj/rinkj-byte-stream.c
--- ghostscript-8.70/base/rinkj/rinkj-byte-stream.c.vsnprintf	2008-04-04 02:02:16.000000000 +0100
+++ ghostscript-8.70/base/rinkj/rinkj-byte-stream.c	2009-11-24 17:16:38.577250996 +0000
@@ -43,7 +43,7 @@ rinkj_byte_stream_printf (RinkjByteStrea
   va_list ap;
 
   va_start (ap, fmt);
-  len = vsprintf (str, fmt, ap);
+  len = vsnprintf (str, sizeof (str), fmt, ap);
   va_end (ap);
   return rinkj_byte_stream_write (bs, str, len);
 }


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-11/ghostscript.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- ghostscript.spec	3 Aug 2009 17:39:55 -0000	1.193
+++ ghostscript.spec	24 Dec 2009 11:30:49 -0000	1.194
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and re
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -25,6 +25,8 @@ Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
 Patch8: ghostscript-jbig2dec-nullderef.patch
 Patch9: ghostscript-gs-executable.patch
+Patch10: ghostscript-CVE-2009-4270.patch
+Patch11: ghostscript-vsnprintf.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: xz
@@ -115,6 +117,12 @@ rm -rf libpng zlib jpeg jasper
 # Fix scripts so they don't get broken on install (bug #502550).
 %patch9 -p1 -b .gs-executable
 
+# Fix debugging output from gdevcups (bug #540760).
+%patch10 -p1 -b .CVE-2009-4270
+
+# Harden ghostscript's debugging output functions (bug #540760).
+%patch11 -p1 -b .vsnprintf
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -296,6 +304,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 8.70-2
+- Fix debugging output from gdevcups (CVE-2009-4270, bug #540760).
+- Harden ghostscript's debugging output functions (bug #540760).
+
 * Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 8.70-1
 - 8.70.
 - License has changed to GPLv3+.  Packages containing programs that



From twaugh at fedoraproject.org  Thu Dec 24 11:31:29 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 24 Dec 2009 11:31:29 +0000 (UTC)
Subject: rpms/ghostscript/F-12 ghostscript-CVE-2009-4270.patch, NONE,
	1.1 ghostscript-vsnprintf.patch, NONE, 1.1 ghostscript.spec,
	1.193, 1.194
Message-ID: <20091224113129.38BA811C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13272

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-CVE-2009-4270.patch ghostscript-vsnprintf.patch 
Log Message:
* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 8.70-2
- Fix debugging output from gdevcups (CVE-2009-4270, bug #540760).
- Harden ghostscript's debugging output functions (bug #540760).


ghostscript-CVE-2009-4270.patch:
 gdevcups.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ghostscript-CVE-2009-4270.patch ---
diff -up ghostscript-8.70/cups/gdevcups.c.gdevcups-debug ghostscript-8.70/cups/gdevcups.c
--- ghostscript-8.70/cups/gdevcups.c.gdevcups-debug	2009-05-20 23:30:48.000000000 +0100
+++ ghostscript-8.70/cups/gdevcups.c	2009-11-24 17:16:11.929250977 +0000
@@ -2816,11 +2816,11 @@ cups_put_params(gx_device     *pdev,	/* 
   } \
   else if (code == 0) \
   { \
-    dprintf2("DEBUG: Setting %s to \"%s\"...\n", sname, \
-             (char *)stringval.data); \
     strncpy(cups->header.name, (const char *)stringval.data, \
             stringval.size); \
     cups->header.name[stringval.size] = '\0'; \
+    dprintf2("DEBUG: Setting %s to \"%s\"...\n", sname, \
+             cups->header.name); \
   }
 
 #define intoption(name, sname, type) \

ghostscript-vsnprintf.patch:
 gsmisc.c                  |   14 +++++++-------
 gxttfb.c                  |    2 +-
 rinkj/rinkj-byte-stream.c |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE ghostscript-vsnprintf.patch ---
diff -up ghostscript-8.70/base/gsmisc.c.vsnprintf ghostscript-8.70/base/gsmisc.c
--- ghostscript-8.70/base/gsmisc.c.vsnprintf	2008-01-07 18:43:02.000000000 +0000
+++ ghostscript-8.70/base/gsmisc.c	2009-11-24 17:16:38.575250571 +0000
@@ -69,10 +69,10 @@ int outprintf(const gs_memory_t *mem, co
 
     va_start(args, fmt);
 
-    count = vsprintf(buf, fmt, args);
+    count = vsnprintf(buf, sizeof (buf), fmt, args);
     outwrite(mem, buf, count);
-    if (count >= PRINTF_BUF_LENGTH) {
-	count = sprintf(buf, 
+    if (count == -1 || count >= sizeof (buf)) {
+	count = snprintf(buf, sizeof (buf),
 	    "PANIC: printf exceeded %d bytes.  Stack has been corrupted.\n", 
 	    PRINTF_BUF_LENGTH);
 	outwrite(mem, buf, count);
@@ -89,10 +89,10 @@ int errprintf(const char *fmt, ...)
 
     va_start(args, fmt);
 
-    count = vsprintf(buf, fmt, args);
+    count = vsnprintf(buf, sizeof (buf), fmt, args);
     errwrite(buf, count);
-    if (count >= PRINTF_BUF_LENGTH) {
-	count = sprintf(buf, 
+    if (count == -1 || count >= sizeof (buf)) {
+	count = snprintf(buf, sizeof (buf),
 	    "PANIC: printf exceeded %d bytes.  Stack has been corrupted.\n", 
 	    PRINTF_BUF_LENGTH);
 	errwrite(buf, count);
@@ -236,7 +236,7 @@ int gs_throw_imp(const char *func, const
     va_list ap;
 
     va_start(ap, fmt);
-    vsprintf(msg, fmt, ap);
+    vsnprintf(msg, sizeof (msg), fmt, ap);
     msg[sizeof(msg) - 1] = 0;
     va_end(ap);
 
diff -up ghostscript-8.70/base/gxttfb.c.vsnprintf ghostscript-8.70/base/gxttfb.c
--- ghostscript-8.70/base/gxttfb.c.vsnprintf	2009-07-09 06:59:44.000000000 +0100
+++ ghostscript-8.70/base/gxttfb.c	2009-11-24 17:16:38.577250996 +0000
@@ -246,7 +246,7 @@ static int DebugPrint(ttfFont *ttf, cons
 
     if (gs_debug_c('Y')) {
 	va_start(args, fmt);
-	count = vsprintf(buf, fmt, args);
+	count = vsnprintf(buf, sizeof (buf), fmt, args);
 	/* NB: moved debug output from stdout to stderr
 	 */
 	errwrite(buf, count);
diff -up ghostscript-8.70/base/rinkj/rinkj-byte-stream.c.vsnprintf ghostscript-8.70/base/rinkj/rinkj-byte-stream.c
--- ghostscript-8.70/base/rinkj/rinkj-byte-stream.c.vsnprintf	2008-04-04 02:02:16.000000000 +0100
+++ ghostscript-8.70/base/rinkj/rinkj-byte-stream.c	2009-11-24 17:16:38.577250996 +0000
@@ -43,7 +43,7 @@ rinkj_byte_stream_printf (RinkjByteStrea
   va_list ap;
 
   va_start (ap, fmt);
-  len = vsprintf (str, fmt, ap);
+  len = vsnprintf (str, sizeof (str), fmt, ap);
   va_end (ap);
   return rinkj_byte_stream_write (bs, str, len);
 }


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-12/ghostscript.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- ghostscript.spec	3 Aug 2009 17:27:32 -0000	1.193
+++ ghostscript.spec	24 Dec 2009 11:31:29 -0000	1.194
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and re
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -25,6 +25,8 @@ Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
 Patch8: ghostscript-jbig2dec-nullderef.patch
 Patch9: ghostscript-gs-executable.patch
+Patch10: ghostscript-CVE-2009-4270.patch
+Patch11: ghostscript-vsnprintf.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: xz
@@ -115,6 +117,12 @@ rm -rf libpng zlib jpeg jasper
 # Fix scripts so they don't get broken on install (bug #502550).
 %patch9 -p1 -b .gs-executable
 
+# Fix debugging output from gdevcups (bug #540760).
+%patch10 -p1 -b .CVE-2009-4270
+
+# Harden ghostscript's debugging output functions (bug #540760).
+%patch11 -p1 -b .vsnprintf
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -296,6 +304,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 8.70-2
+- Fix debugging output from gdevcups (CVE-2009-4270, bug #540760).
+- Harden ghostscript's debugging output functions (bug #540760).
+
 * Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 8.70-1
 - 8.70.
 - License has changed to GPLv3+.  Packages containing programs that



From twaugh at fedoraproject.org  Thu Dec 24 11:31:50 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 24 Dec 2009 11:31:50 +0000 (UTC)
Subject: rpms/ghostscript/devel ghostscript-CVE-2009-4270.patch, NONE,
	1.1 ghostscript-vsnprintf.patch, NONE, 1.1 ghostscript.spec,
	1.194, 1.195
Message-ID: <20091224113150.6ED8B11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13427

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-CVE-2009-4270.patch ghostscript-vsnprintf.patch 
Log Message:
* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 8.70-3
- Fix debugging output from gdevcups (CVE-2009-4270, bug #540760).
- Harden ghostscript's debugging output functions (bug #540760).


ghostscript-CVE-2009-4270.patch:
 gdevcups.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ghostscript-CVE-2009-4270.patch ---
diff -up ghostscript-8.70/cups/gdevcups.c.gdevcups-debug ghostscript-8.70/cups/gdevcups.c
--- ghostscript-8.70/cups/gdevcups.c.gdevcups-debug	2009-05-20 23:30:48.000000000 +0100
+++ ghostscript-8.70/cups/gdevcups.c	2009-11-24 17:16:11.929250977 +0000
@@ -2816,11 +2816,11 @@ cups_put_params(gx_device     *pdev,	/* 
   } \
   else if (code == 0) \
   { \
-    dprintf2("DEBUG: Setting %s to \"%s\"...\n", sname, \
-             (char *)stringval.data); \
     strncpy(cups->header.name, (const char *)stringval.data, \
             stringval.size); \
     cups->header.name[stringval.size] = '\0'; \
+    dprintf2("DEBUG: Setting %s to \"%s\"...\n", sname, \
+             cups->header.name); \
   }
 
 #define intoption(name, sname, type) \

ghostscript-vsnprintf.patch:
 gsmisc.c                  |   14 +++++++-------
 gxttfb.c                  |    2 +-
 rinkj/rinkj-byte-stream.c |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE ghostscript-vsnprintf.patch ---
diff -up ghostscript-8.70/base/gsmisc.c.vsnprintf ghostscript-8.70/base/gsmisc.c
--- ghostscript-8.70/base/gsmisc.c.vsnprintf	2008-01-07 18:43:02.000000000 +0000
+++ ghostscript-8.70/base/gsmisc.c	2009-11-24 17:16:38.575250571 +0000
@@ -69,10 +69,10 @@ int outprintf(const gs_memory_t *mem, co
 
     va_start(args, fmt);
 
-    count = vsprintf(buf, fmt, args);
+    count = vsnprintf(buf, sizeof (buf), fmt, args);
     outwrite(mem, buf, count);
-    if (count >= PRINTF_BUF_LENGTH) {
-	count = sprintf(buf, 
+    if (count == -1 || count >= sizeof (buf)) {
+	count = snprintf(buf, sizeof (buf),
 	    "PANIC: printf exceeded %d bytes.  Stack has been corrupted.\n", 
 	    PRINTF_BUF_LENGTH);
 	outwrite(mem, buf, count);
@@ -89,10 +89,10 @@ int errprintf(const char *fmt, ...)
 
     va_start(args, fmt);
 
-    count = vsprintf(buf, fmt, args);
+    count = vsnprintf(buf, sizeof (buf), fmt, args);
     errwrite(buf, count);
-    if (count >= PRINTF_BUF_LENGTH) {
-	count = sprintf(buf, 
+    if (count == -1 || count >= sizeof (buf)) {
+	count = snprintf(buf, sizeof (buf),
 	    "PANIC: printf exceeded %d bytes.  Stack has been corrupted.\n", 
 	    PRINTF_BUF_LENGTH);
 	errwrite(buf, count);
@@ -236,7 +236,7 @@ int gs_throw_imp(const char *func, const
     va_list ap;
 
     va_start(ap, fmt);
-    vsprintf(msg, fmt, ap);
+    vsnprintf(msg, sizeof (msg), fmt, ap);
     msg[sizeof(msg) - 1] = 0;
     va_end(ap);
 
diff -up ghostscript-8.70/base/gxttfb.c.vsnprintf ghostscript-8.70/base/gxttfb.c
--- ghostscript-8.70/base/gxttfb.c.vsnprintf	2009-07-09 06:59:44.000000000 +0100
+++ ghostscript-8.70/base/gxttfb.c	2009-11-24 17:16:38.577250996 +0000
@@ -246,7 +246,7 @@ static int DebugPrint(ttfFont *ttf, cons
 
     if (gs_debug_c('Y')) {
 	va_start(args, fmt);
-	count = vsprintf(buf, fmt, args);
+	count = vsnprintf(buf, sizeof (buf), fmt, args);
 	/* NB: moved debug output from stdout to stderr
 	 */
 	errwrite(buf, count);
diff -up ghostscript-8.70/base/rinkj/rinkj-byte-stream.c.vsnprintf ghostscript-8.70/base/rinkj/rinkj-byte-stream.c
--- ghostscript-8.70/base/rinkj/rinkj-byte-stream.c.vsnprintf	2008-04-04 02:02:16.000000000 +0100
+++ ghostscript-8.70/base/rinkj/rinkj-byte-stream.c	2009-11-24 17:16:38.577250996 +0000
@@ -43,7 +43,7 @@ rinkj_byte_stream_printf (RinkjByteStrea
   va_list ap;
 
   va_start (ap, fmt);
-  len = vsprintf (str, fmt, ap);
+  len = vsnprintf (str, sizeof (str), fmt, ap);
   va_end (ap);
   return rinkj_byte_stream_write (bs, str, len);
 }


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- ghostscript.spec	15 Oct 2009 12:52:20 -0000	1.194
+++ ghostscript.spec	24 Dec 2009 11:31:50 -0000	1.195
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and re
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -26,6 +26,8 @@ Patch7: ghostscript-pksmraw.patch
 Patch8: ghostscript-jbig2dec-nullderef.patch
 Patch9: ghostscript-gs-executable.patch
 Patch10: ghostscript-cups-filters.patch
+Patch11: ghostscript-CVE-2009-4270.patch
+Patch12: ghostscript-vsnprintf.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: xz
@@ -128,6 +130,12 @@ rm -rf libpng zlib jpeg jasper
 # Install CUPS filter convs files in the correct place.
 %patch10 -p1 -b .cups-filters
 
+# Fix debugging output from gdevcups (bug #540760).
+%patch11 -p1 -b .CVE-2009-4270
+
+# Harden ghostscript's debugging output functions (bug #540760).
+%patch12 -p1 -b .vsnprintf
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -309,6 +317,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 8.70-3
+- Fix debugging output from gdevcups (CVE-2009-4270, bug #540760).
+- Harden ghostscript's debugging output functions (bug #540760).
+
 * Thu Oct 15 2009 Tim Waugh <twaugh at redhat.com> 8.70-2
 - New cups sub-package for pstoraster/pdftoraster/pstopxl.
 



From oget at fedoraproject.org  Thu Dec 24 11:38:44 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 11:38:44 +0000 (UTC)
Subject: rpms/muse/devel muse.spec,1.9,1.10
Message-ID: <20091224113844.C6DA111C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/muse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14449

Modified Files:
	muse.spec 
Log Message:
disable sse bits on ix86



Index: muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muse/devel/muse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- muse.spec	24 Dec 2009 11:15:41 -0000	1.9
+++ muse.spec	24 Dec 2009 11:38:44 -0000	1.10
@@ -75,6 +75,7 @@ cp %{SOURCE1} al/dspSSE.cpp
 %endif
 
 %build
+# Work around the gcc bug RHBZ#531218
 %if 0%{?fedora} >= 12
 export CXX="g++ -fno-var-tracking-assignments"
 %endif
@@ -84,7 +85,7 @@ export CXX="g++ -fno-var-tracking-assign
            --disable-qttest \
            --with-qt-prefix=${QTDIR} \
            --enable-lash \
-%ifarch %ix86 x86_64
+%ifarch x86_64
            --enable-sse \
 %endif
            --enable-python \



From rineau at fedoraproject.org  Thu Dec 24 11:39:16 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Thu, 24 Dec 2009 11:39:16 +0000 (UTC)
Subject: File CGAL-3.5.1.tar.gz uploaded to lookaside cache by rineau
Message-ID: <20091224113916.EDC5710F8CE@bastion.fedoraproject.org>

A file has been added to the lookaside cache for CGAL:

fca4e12d47853d694483a66ee165c390  CGAL-3.5.1.tar.gz



From sdz at fedoraproject.org  Thu Dec 24 11:43:51 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 24 Dec 2009 11:43:51 +0000 (UTC)
Subject: rpms/python-olpcgames/devel python-olpcgames.spec,1.2,1.3
Message-ID: <20091224114351.8D26C11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-olpcgames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15180

Modified Files:
	python-olpcgames.spec 
Log Message:
make sure to use dist tag



Index: python-olpcgames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/devel/python-olpcgames.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-olpcgames.spec	24 Dec 2009 11:06:35 -0000	1.2
+++ python-olpcgames.spec	24 Dec 2009 11:43:51 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-olpcgames
 Version:        1.6
-Release:        2
+Release:        3%{?dist}
 Summary:        Utilities for developing games on the OLPC platform
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-3
+- make sure to use dist tag
+
 * Thu Dec 14 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-2
 - fix issues according to review
 



From rineau at fedoraproject.org  Thu Dec 24 11:44:57 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Thu, 24 Dec 2009 11:44:57 +0000 (UTC)
Subject: rpms/CGAL/devel .cvsignore, 1.7, 1.8 CGAL.spec, 1.30, 1.31 sources,
	1.7, 1.8
Message-ID: <20091224114457.A546411C00E6@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15450

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Thu Dec 24 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5.1-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Oct 2009 16:35:06 -0000	1.7
+++ .cvsignore	24 Dec 2009 11:44:57 -0000	1.8
@@ -1 +1 @@
-CGAL-3.5.tar.gz
+CGAL-3.5.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- CGAL.spec	24 Nov 2009 22:18:12 -0000	1.30
+++ CGAL.spec	24 Dec 2009 11:44:57 -0000	1.31
@@ -2,14 +2,14 @@
 %define qt_version 4.2
 
 Name:           CGAL
-Version:        3.5
-Release:        3%{?dist}
+Version:        3.5.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
 License:        QPL and LGPLv2 and LGPLv2+
 URL:            http://www.cgal.org/
-Source0:        http://gforge.inria.fr/frs/download.php/24197/CGAL-3.5.tar.gz
+Source0:        http://gforge.inria.fr/frs/download.php/25109/CGAL-3.5.1.tar.gz
 Source10:       CGAL-README.Fedora
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,9 +64,6 @@ chmod a-x demo/Circular_kernel_2/Circula
 # Install README.Fedora here, to include it in %doc
 install -p -m 644 %{SOURCE10} ./README.Fedora
 
-# remove the shipped copy of FindBoost.cmake (see bug #532431)
-rm cmake/modules/FindBoost.cmake
-
 %build
 mkdir build
 pushd build
@@ -103,7 +100,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.4
-%{_libdir}/libCGAL*.so.4.0.0
+%{_libdir}/libCGAL*.so.4.0.1
 
 
 %files devel
@@ -125,6 +122,9 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
 
 %changelog
+* Thu Dec 24 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5.1-1
+- New upstream release
+
 * Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5-3
 - Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Oct 2009 16:35:07 -0000	1.7
+++ sources	24 Dec 2009 11:44:57 -0000	1.8
@@ -1 +1 @@
-c14d142780d07e3d05dea2f54dd7ae53  CGAL-3.5.tar.gz
+fca4e12d47853d694483a66ee165c390  CGAL-3.5.1.tar.gz



From sdz at fedoraproject.org  Thu Dec 24 11:47:12 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 24 Dec 2009 11:47:12 +0000 (UTC)
Subject: rpms/python-olpcgames/F-12 python-olpcgames.spec,1.2,1.3
Message-ID: <20091224114712.645EE11C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-olpcgames/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15798

Modified Files:
	python-olpcgames.spec 
Log Message:
make sure to use dist tag



Index: python-olpcgames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/F-12/python-olpcgames.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-olpcgames.spec	24 Dec 2009 11:08:14 -0000	1.2
+++ python-olpcgames.spec	24 Dec 2009 11:47:12 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-olpcgames
 Version:        1.6
-Release:        2
+Release:        3%{?dist}
 Summary:        Utilities for developing games on the OLPC platform
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-3
+- make sure to use dist tag
+
 * Thu Dec 14 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-2
 - fix issues according to review
 



From sdz at fedoraproject.org  Thu Dec 24 11:48:38 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 24 Dec 2009 11:48:38 +0000 (UTC)
Subject: rpms/python-olpcgames/F-11 python-olpcgames.spec,1.2,1.3
Message-ID: <20091224114838.7155711C00E6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-olpcgames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16119

Modified Files:
	python-olpcgames.spec 
Log Message:
make sure to use dist tag



Index: python-olpcgames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-olpcgames/F-11/python-olpcgames.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-olpcgames.spec	24 Dec 2009 11:09:30 -0000	1.2
+++ python-olpcgames.spec	24 Dec 2009 11:48:38 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-olpcgames
 Version:        1.6
-Release:        2
+Release:        3%{?dist}
 Summary:        Utilities for developing games on the OLPC platform
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-3
+- make sure to use dist tag
+
 * Thu Dec 14 2009 Sebastian Dziallas <sebastian at when.com> - 1.6-2
 - fix issues according to review
 



From oget at fedoraproject.org  Thu Dec 24 11:54:27 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 11:54:27 +0000 (UTC)
Subject: rpms/muse/F-12 muse-destdir.patch, NONE, 1.1 muse-x86_64-sse.patch,
	NONE, 1.1 sse_functions_64bit.s, NONE, 1.1 muse.spec, 1.7,
	1.8 sources, 1.6, 1.7 muse-glibc210.patch, 1.1, NONE
Message-ID: <20091224115427.3CE5611C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/muse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17103

Modified Files:
	muse.spec sources 
Added Files:
	muse-destdir.patch muse-x86_64-sse.patch sse_functions_64bit.s 
Removed Files:
	muse-glibc210.patch 
Log Message:
* Thu Dec 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-1
- Update to 1.0


muse-destdir.patch:
 share/scripts/Makefile.am |    6 +++---
 share/scripts/Makefile.in |    6 +++---
 utils/Makefile.am         |    4 ++--
 utils/Makefile.in         |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE muse-destdir.patch ---
diff -rupN muse-1.0.old/share/scripts/Makefile.am muse-1.0/share/scripts/Makefile.am
--- muse-1.0.old/share/scripts/Makefile.am	2009-12-21 10:37:20.000000000 -0500
+++ muse-1.0/share/scripts/Makefile.am	2009-12-24 04:19:27.000000000 -0500
@@ -5,7 +5,7 @@ EXTRA_DIST = DoNothing RemoveShortEvents
 #musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
 
 install-data-local: 
-	mkdir -p $(pkgdatadir)/scripts/
-	cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
-	chmod a+x $(pkgdatadir)/scripts/*
+	mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+	cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+	chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
 
diff -rupN muse-1.0.old/share/scripts/Makefile.in muse-1.0/share/scripts/Makefile.in
--- muse-1.0.old/share/scripts/Makefile.in	2009-12-21 10:37:44.000000000 -0500
+++ muse-1.0/share/scripts/Makefile.in	2009-12-24 04:19:43.000000000 -0500
@@ -389,9 +389,9 @@ uninstall-am: uninstall-info-am
 #musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
 
 install-data-local: 
-	mkdir -p $(pkgdatadir)/scripts/
-	cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
-	chmod a+x $(pkgdatadir)/scripts/*
+	mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+	cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+	chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
 # 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:
diff -rupN muse-1.0.old/utils/Makefile.am muse-1.0/utils/Makefile.am
--- muse-1.0.old/utils/Makefile.am	2009-12-21 10:37:20.000000000 -0500
+++ muse-1.0/utils/Makefile.am	2009-12-24 04:26:15.000000000 -0500
@@ -1,6 +1,6 @@
 EXTRA_DIST = muse-find-unused-wavs
 
 install-data-local:
-	cp $(EXTRA_DIST) $(bindir)/
-	chmod a+x $(bindir)/$(EXTRA_DIST) 
+	cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+	chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST) 
 
diff -rupN muse-1.0.old/utils/Makefile.in muse-1.0/utils/Makefile.in
--- muse-1.0.old/utils/Makefile.in	2009-12-21 10:37:45.000000000 -0500
+++ muse-1.0/utils/Makefile.in	2009-12-24 04:26:39.000000000 -0500
@@ -385,8 +385,8 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-	cp $(EXTRA_DIST) $(bindir)/
-	chmod a+x $(bindir)/$(EXTRA_DIST) 
+	cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+	chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST) 
 # 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:

muse-x86_64-sse.patch:
 dsp.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE muse-x86_64-sse.patch ---
--- muse-1.0.old/al/dsp.cpp	2009-12-21 10:37:17.000000000 -0500
+++ muse-1.0/al/dsp.cpp	2009-12-24 05:52:14.000000000 -0500
@@ -28,7 +28,7 @@ namespace AL {
 
 Dsp* dsp = 0;
 
-#ifdef __i386__
+#if defined(__i386__) || defined(__x86_64__)
 
 //---------------------------------------------------------
 //   DspSSE86
@@ -100,7 +100,7 @@ void initDsp()
         printf("Muse: __i386__ or __x86_64__ not defined. Using non-optimized memcpy for float buffer copying.\n");
 #endif
 
-#if defined(__i386__) && defined(USE_SSE)
+#if (defined(__i386__) || defined(__x86_64__)) && defined(USE_SSE)
       unsigned long useSSE = 0;
       if(debugMsg)
         printf("initDsp: __i386__ and USE_SSE defined\n");


***** Error reading new file: [Errno 2] No such file or directory: 'sse_functions_64bit.s'

Index: muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muse/F-12/muse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- muse.spec	25 Jul 2009 15:25:37 -0000	1.7
+++ muse.spec	24 Dec 2009 11:54:27 -0000	1.8
@@ -1,41 +1,48 @@
-%global prerelease rc3
-
 Name:          muse
 Summary:       Midi/Audio Music Sequencer
 # Epoch is set to 1 for PlanetCCRMA compatibility.
 # See: https://fedoraproject.org/wiki/AudioCreation
 Epoch:         1
 Version:       1.0
-Release:       %{?prerelease:0.}7%{?prerelease:.%prerelease}%{?dist}.1
+Release:       1%{?dist}
 # synti/vam is GPLv2+
 # original freeverb plugin was public domain
 # some of the widgets are GPLv2
 # ladspa.h is LGPLv2+
 # givertcap (not built) is GPLv2
 # The rest, including the core of muse is distributed under GPL+
+# Source1 is GPLv2+
 License:       GPL+ and GPLv2 and GPLv2+ and LGPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.muse-sequencer.org/
-Source0:       http://downloads.sourceforge.net/lmuse/%{name}-%{version}%{?prerelease}.tar.gz
-# Fix: muse doesn't start on systems using glibc-2.10
-# https://sourceforge.net/tracker/?func=detail&aid=2819312&group_id=93414&atid=604222
-Patch0:        muse-glibc210.patch
+Source0:       http://downloads.sourceforge.net/project/lmuse/%{name}-%{version}/%{name}-%{version}/%{name}-%{version}.tar.gz
+# The following file and patches are sent upstream on Dec 24 2009:
+# http://sourceforge.net/mailarchive/forum.php?forum_name=lmuse-developer
+# Compilation of sse bits fail on x86_64. This file fixes the problem
+Source1:       sse_functions_64bit.s
+# Install utils and scripts into the destdir, or mock will fail
+Patch0:        muse-destdir.patch
+# Add missing condition on an #if to make the sse optimization effective
+Patch1:        muse-x86_64-sse.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-style-dsssl
 BuildRequires: doxygen
+BuildRequires: dssi-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: graphviz
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: lash-devel
 BuildRequires: libcap-devel
+BuildRequires: liblo-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libtool
 BuildRequires: openjade
 BuildRequires: pkgconfig
+BuildRequires: python-devel
 BuildRequires: qt3-devel
 BuildRequires: readline-devel
 
@@ -48,8 +55,9 @@ Jack and ALSA interfaces. MusE aims to b
 for Linux.
 
 %prep
-%setup -q -n %{name}-%{version}%{?prerelease}
-%patch0 -p1 -b .glibc210
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 # Fix encoding issues (upstream is informed):
 for f in README.de README.softsynth SECURITY synti/vam/README; do
@@ -58,13 +66,30 @@ for f in README.de README.softsynth SECU
    mv -f $f.tmp $f
 done
 
+# Detect python properly
+sed -i 's|locate \$ax_python_bin|echo %{_includedir}/python2.6|' configure
+
+# Fix compilaton of the sse bits
+%ifarch x86_64
+cp %{SOURCE1} al/dspSSE.cpp
+%endif
+
 %build
+# Work around the gcc bug RHBZ#531218
+%if 0%{?fedora} >= 12
+export CXX="g++ -fno-var-tracking-assignments"
+%endif
 %configure --disable-suid-build \
            --disable-suid-install \
            --with-docbook-stylesheets=%{_datadir}/sgml/docbook/dsssl-stylesheets \
            --disable-qttest \
            --with-qt-prefix=${QTDIR} \
            --enable-lash \
+%ifarch x86_64
+           --enable-sse \
+%endif
+           --enable-python \
+           --enable-dssi \
            --enable-static=no 
 
 make %{?_smp_mflags}
@@ -141,12 +166,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc README* ReleaseNotes* SECURITY TODO* de
 %{_bindir}/%{name}
 %{_bindir}/grepmidi
+%{_bindir}/%{name}-find-unused-wavs
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
-%changelog
+%changelog 
+* Thu Dec 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-1
+- Update to 1.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-0.7.rc3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/muse/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Jun 2009 01:10:20 -0000	1.6
+++ sources	24 Dec 2009 11:54:27 -0000	1.7
@@ -1 +1 @@
-533a638539a85318034a2764740d11d9  muse-1.0rc3.tar.gz
+177ce7bcad2dc93e733f0ace7cd99b2d  muse-1.0.tar.gz


--- muse-glibc210.patch DELETED ---



From roma at fedoraproject.org  Thu Dec 24 11:55:00 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Thu, 24 Dec 2009 11:55:00 +0000 (UTC)
Subject: rpms/fmtools/F-12 fmtools.spec, 1.7, 1.8 import.log, 1.2,
	1.3 tkradio.py, 1.1, 1.2
Message-ID: <20091224115500.B0D4C11C00E6@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/fmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17221/F-12

Modified Files:
	fmtools.spec import.log tkradio.py 
Log Message:
fixed dependencies


Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fmtools.spec	24 Dec 2009 10:26:36 -0000	1.7
+++ fmtools.spec	24 Dec 2009 11:55:00 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Simple Video for Linux radio card programs
 Name:    fmtools
 Version: 2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.stanford.edu/~blp/fmtools/
@@ -40,7 +40,7 @@ Summary:       Python/Tk wrapper for fmt
 Group:         Applications/Multimedia
 BuildRequires: desktop-file-utils
 Requires:      %{name} = %{version}
-Requires:      python, tk, alsa-utils
+Requires:      python, tkinter, alsa-utils
 BuildArch:     noarch
 
 %description tkradio
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-5
+- Replaced BR tk for tkinter.
+
 * Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-4
 - Include tkradio.py
 - Fixed fmtools.desktop


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Dec 2009 10:26:36 -0000	1.2
+++ import.log	24 Dec 2009 11:55:00 -0000	1.3
@@ -1,2 +1,3 @@
 fmtools-2_0-3_fc12:F-12:fmtools-2.0-3.fc12.src.rpm:1261394532
 fmtools-2_0-4_fc12:F-12:fmtools-2.0-4.fc12.src.rpm:1261650364
+fmtools-2_0-5_fc12:F-12:fmtools-2.0-5.fc12.src.rpm:1261655654


Index: tkradio.py
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/tkradio.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tkradio.py	24 Dec 2009 10:26:36 -0000	1.1
+++ tkradio.py	24 Dec 2009 11:55:00 -0000	1.2
@@ -78,11 +78,11 @@ def readStations ( ):
 
     path = os.environ.get("HOME")
     fname = path+"/.radiostations"
-    if ( not fname ):
+    if ( not os.path.exists (fname) ):
          fname = path+"/.fmrc"
 
     lst = []
-    if ( fname ):
+    if ( os.path.exists (fname) ):
        textf = open(fname, 'r')
 
        for line in textf:
@@ -115,11 +115,11 @@ def main (argv=None):
     mw.title ("tkradio")
 
     s = readStations ( )
-    if ( s ):
-         stations = s
+    if ( not s ):
+         s = stations
 
     # make tuner buttons
-    for st in stations:
+    for st in s:
         Radiobutton(bot,text=st[0],value=st[1],variable=station,command=setstation).pack(anchor=W)
 
     scale = Scale(top, from_=0, to=100, orient=HORIZONTAL, command=on_move, bd=0,
@@ -147,6 +147,6 @@ def main (argv=None):
 try:
   if __name__=="__main__":
      sys.exit(main())
-except:
+except KeyboardInterrupt:
      radio ("off")
-     sys.exit(1)
+     sys.exit('Bye, bye')



From oget at fedoraproject.org  Thu Dec 24 11:57:49 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 11:57:49 +0000 (UTC)
Subject: rpms/muse/F-11 muse-destdir.patch, NONE, 1.1 muse-x86_64-sse.patch,
	NONE, 1.1 sse_functions_64bit.s, NONE, 1.1 muse.spec, 1.6,
	1.7 sources, 1.6, 1.7 muse-glibc210.patch, 1.1, NONE
Message-ID: <20091224115749.EC3CE11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/muse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17882

Modified Files:
	muse.spec sources 
Added Files:
	muse-destdir.patch muse-x86_64-sse.patch sse_functions_64bit.s 
Removed Files:
	muse-glibc210.patch 
Log Message:
* Thu Dec 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-1
- Update to 1.0


muse-destdir.patch:
 share/scripts/Makefile.am |    6 +++---
 share/scripts/Makefile.in |    6 +++---
 utils/Makefile.am         |    4 ++--
 utils/Makefile.in         |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE muse-destdir.patch ---
diff -rupN muse-1.0.old/share/scripts/Makefile.am muse-1.0/share/scripts/Makefile.am
--- muse-1.0.old/share/scripts/Makefile.am	2009-12-21 10:37:20.000000000 -0500
+++ muse-1.0/share/scripts/Makefile.am	2009-12-24 04:19:27.000000000 -0500
@@ -5,7 +5,7 @@ EXTRA_DIST = DoNothing RemoveShortEvents
 #musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
 
 install-data-local: 
-	mkdir -p $(pkgdatadir)/scripts/
-	cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
-	chmod a+x $(pkgdatadir)/scripts/*
+	mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+	cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+	chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
 
diff -rupN muse-1.0.old/share/scripts/Makefile.in muse-1.0/share/scripts/Makefile.in
--- muse-1.0.old/share/scripts/Makefile.in	2009-12-21 10:37:44.000000000 -0500
+++ muse-1.0/share/scripts/Makefile.in	2009-12-24 04:19:43.000000000 -0500
@@ -389,9 +389,9 @@ uninstall-am: uninstall-info-am
 #musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
 
 install-data-local: 
-	mkdir -p $(pkgdatadir)/scripts/
-	cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
-	chmod a+x $(pkgdatadir)/scripts/*
+	mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+	cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+	chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
 # 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:
diff -rupN muse-1.0.old/utils/Makefile.am muse-1.0/utils/Makefile.am
--- muse-1.0.old/utils/Makefile.am	2009-12-21 10:37:20.000000000 -0500
+++ muse-1.0/utils/Makefile.am	2009-12-24 04:26:15.000000000 -0500
@@ -1,6 +1,6 @@
 EXTRA_DIST = muse-find-unused-wavs
 
 install-data-local:
-	cp $(EXTRA_DIST) $(bindir)/
-	chmod a+x $(bindir)/$(EXTRA_DIST) 
+	cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+	chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST) 
 
diff -rupN muse-1.0.old/utils/Makefile.in muse-1.0/utils/Makefile.in
--- muse-1.0.old/utils/Makefile.in	2009-12-21 10:37:45.000000000 -0500
+++ muse-1.0/utils/Makefile.in	2009-12-24 04:26:39.000000000 -0500
@@ -385,8 +385,8 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-	cp $(EXTRA_DIST) $(bindir)/
-	chmod a+x $(bindir)/$(EXTRA_DIST) 
+	cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+	chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST) 
 # 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:

muse-x86_64-sse.patch:
 dsp.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE muse-x86_64-sse.patch ---
--- muse-1.0.old/al/dsp.cpp	2009-12-21 10:37:17.000000000 -0500
+++ muse-1.0/al/dsp.cpp	2009-12-24 05:52:14.000000000 -0500
@@ -28,7 +28,7 @@ namespace AL {
 
 Dsp* dsp = 0;
 
-#ifdef __i386__
+#if defined(__i386__) || defined(__x86_64__)
 
 //---------------------------------------------------------
 //   DspSSE86
@@ -100,7 +100,7 @@ void initDsp()
         printf("Muse: __i386__ or __x86_64__ not defined. Using non-optimized memcpy for float buffer copying.\n");
 #endif
 
-#if defined(__i386__) && defined(USE_SSE)
+#if (defined(__i386__) || defined(__x86_64__)) && defined(USE_SSE)
       unsigned long useSSE = 0;
       if(debugMsg)
         printf("initDsp: __i386__ and USE_SSE defined\n");


***** Error reading new file: [Errno 2] No such file or directory: 'sse_functions_64bit.s'

Index: muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muse/F-11/muse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- muse.spec	17 Jul 2009 06:32:11 -0000	1.6
+++ muse.spec	24 Dec 2009 11:57:49 -0000	1.7
@@ -1,41 +1,48 @@
-%global prerelease rc3
-
 Name:          muse
 Summary:       Midi/Audio Music Sequencer
 # Epoch is set to 1 for PlanetCCRMA compatibility.
 # See: https://fedoraproject.org/wiki/AudioCreation
 Epoch:         1
 Version:       1.0
-Release:       %{?prerelease:0.}7%{?prerelease:.%prerelease}%{?dist}
+Release:       1%{?dist}
 # synti/vam is GPLv2+
 # original freeverb plugin was public domain
 # some of the widgets are GPLv2
 # ladspa.h is LGPLv2+
 # givertcap (not built) is GPLv2
 # The rest, including the core of muse is distributed under GPL+
+# Source1 is GPLv2+
 License:       GPL+ and GPLv2 and GPLv2+ and LGPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.muse-sequencer.org/
-Source0:       http://downloads.sourceforge.net/lmuse/%{name}-%{version}%{?prerelease}.tar.gz
-# Fix: muse doesn't start on systems using glibc-2.10
-# https://sourceforge.net/tracker/?func=detail&aid=2819312&group_id=93414&atid=604222
-Patch0:        muse-glibc210.patch
+Source0:       http://downloads.sourceforge.net/project/lmuse/%{name}-%{version}/%{name}-%{version}/%{name}-%{version}.tar.gz
+# The following file and patches are sent upstream on Dec 24 2009:
+# http://sourceforge.net/mailarchive/forum.php?forum_name=lmuse-developer
+# Compilation of sse bits fail on x86_64. This file fixes the problem
+Source1:       sse_functions_64bit.s
+# Install utils and scripts into the destdir, or mock will fail
+Patch0:        muse-destdir.patch
+# Add missing condition on an #if to make the sse optimization effective
+Patch1:        muse-x86_64-sse.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-style-dsssl
 BuildRequires: doxygen
+BuildRequires: dssi-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: graphviz
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: lash-devel
 BuildRequires: libcap-devel
+BuildRequires: liblo-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libtool
 BuildRequires: openjade
 BuildRequires: pkgconfig
+BuildRequires: python-devel
 BuildRequires: qt3-devel
 BuildRequires: readline-devel
 
@@ -48,8 +55,9 @@ Jack and ALSA interfaces. MusE aims to b
 for Linux.
 
 %prep
-%setup -q -n %{name}-%{version}%{?prerelease}
-%patch0 -p1 -b .glibc210
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 # Fix encoding issues (upstream is informed):
 for f in README.de README.softsynth SECURITY synti/vam/README; do
@@ -58,13 +66,30 @@ for f in README.de README.softsynth SECU
    mv -f $f.tmp $f
 done
 
+# Detect python properly
+sed -i 's|locate \$ax_python_bin|echo %{_includedir}/python2.6|' configure
+
+# Fix compilaton of the sse bits
+%ifarch x86_64
+cp %{SOURCE1} al/dspSSE.cpp
+%endif
+
 %build
+# Work around the gcc bug RHBZ#531218
+%if 0%{?fedora} >= 12
+export CXX="g++ -fno-var-tracking-assignments"
+%endif
 %configure --disable-suid-build \
            --disable-suid-install \
            --with-docbook-stylesheets=%{_datadir}/sgml/docbook/dsssl-stylesheets \
            --disable-qttest \
            --with-qt-prefix=${QTDIR} \
            --enable-lash \
+%ifarch x86_64
+           --enable-sse \
+%endif
+           --enable-python \
+           --enable-dssi \
            --enable-static=no 
 
 make %{?_smp_mflags}
@@ -141,12 +166,19 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc README* ReleaseNotes* SECURITY TODO* de
 %{_bindir}/%{name}
 %{_bindir}/grepmidi
+%{_bindir}/%{name}-find-unused-wavs
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog 
+* Thu Dec 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-1
+- Update to 1.0
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-0.7.rc3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-0.7.rc3
 - Bugfix: muse doesn't start properly on x86_64 on F-11+. Backport glibc-2.10 patch from trunk
 - Remove BR: e2fsprogs-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/muse/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Jun 2009 01:12:54 -0000	1.6
+++ sources	24 Dec 2009 11:57:49 -0000	1.7
@@ -1 +1 @@
-533a638539a85318034a2764740d11d9  muse-1.0rc3.tar.gz
+177ce7bcad2dc93e733f0ace7cd99b2d  muse-1.0.tar.gz


--- muse-glibc210.patch DELETED ---



From rineau at fedoraproject.org  Thu Dec 24 11:58:26 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Thu, 24 Dec 2009 11:58:26 +0000 (UTC)
Subject: rpms/CGAL/F-12 .cvsignore, 1.7, 1.8 CGAL.spec, 1.29, 1.30 sources, 1.7,
	1.8
Message-ID: <20091224115826.AEF3111C00E6@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18031

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Thu Dec 24 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5.1-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Oct 2009 16:35:06 -0000	1.7
+++ .cvsignore	24 Dec 2009 11:58:26 -0000	1.8
@@ -1 +1 @@
-CGAL-3.5.tar.gz
+CGAL-3.5.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-12/CGAL.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- CGAL.spec	2 Nov 2009 17:41:04 -0000	1.29
+++ CGAL.spec	24 Dec 2009 11:58:26 -0000	1.30
@@ -2,14 +2,14 @@
 %define qt_version 4.2
 
 Name:           CGAL
-Version:        3.5
-Release:        2%{?dist}
+Version:        3.5.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
 License:        QPL and LGPLv2 and LGPLv2+
 URL:            http://www.cgal.org/
-Source0:        http://gforge.inria.fr/frs/download.php/24197/CGAL-3.5.tar.gz
+Source0:        http://gforge.inria.fr/frs/download.php/25109/CGAL-3.5.1.tar.gz
 Source10:       CGAL-README.Fedora
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,9 +64,6 @@ chmod a-x demo/Circular_kernel_2/Circula
 # Install README.Fedora here, to include it in %doc
 install -p -m 644 %{SOURCE10} ./README.Fedora
 
-# remove the shipped copy of FindBoost.cmake (see bug #532431)
-rm cmake/modules/FindBoost.cmake
-
 %build
 mkdir build
 pushd build
@@ -103,7 +100,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.4
-%{_libdir}/libCGAL*.so.4.0.0
+%{_libdir}/libCGAL*.so.4.0.1
 
 
 %files devel
@@ -125,6 +122,12 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
 
 %changelog
+* Thu Dec 24 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5.1-1
+- New upstream release
+
+* Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5-3
+- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
+
 * Mon Nov  2 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5-2
 - Use system's FindBoost macro instead of a copy from CGAL (bug #532431).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Oct 2009 16:35:06 -0000	1.7
+++ sources	24 Dec 2009 11:58:26 -0000	1.8
@@ -1 +1 @@
-c14d142780d07e3d05dea2f54dd7ae53  CGAL-3.5.tar.gz
+fca4e12d47853d694483a66ee165c390  CGAL-3.5.1.tar.gz



From caolanm at fedoraproject.org  Thu Dec 24 12:01:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 24 Dec 2009 12:01:20 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2112,1.2113
Message-ID: <20091224120120.6C0B711C00E6@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18576

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#489489 enable Romanian translations


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2112
retrieving revision 1.2113
diff -u -p -r1.2112 -r1.2113
--- openoffice.org.spec	23 Dec 2009 09:41:36 -0000	1.2112
+++ openoffice.org.spec	24 Dec 2009 12:01:20 -0000	1.2113
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 8
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -28,7 +28,7 @@
 %define jdk_link_ver 1.4.2
 
 %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 pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta th tr ve xh zh-CN zh-TW zu ns tn ts as mr ml or te ur kn uk mai
+%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta th tr ve xh zh-CN zh-TW zu ns tn ts as mr ml or te ur kn uk mai ro
 %else
 %define langpack_langs en-US
 %endif
@@ -647,7 +647,7 @@ Obsoletes: openoffice.org-langpack-af < 
 Obsoletes: openoffice.org2-langpack-af_ZA < 1:3.0.0
 
 %description langpack-af_ZA
-Provides additional afrikaans translations and resources for OpenOffice.org.
+Provides additional Afrikaans translations and resources for OpenOffice.org.
 
 %package langpack-ar
 Summary: Arabic language pack for OpenOffice.org
@@ -658,7 +658,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-ar < 1:3.0.0
 
 %description langpack-ar
-Provides additional arabic translations and resources for OpenOffice.org.
+Provides additional Arabic translations and resources for OpenOffice.org.
 
 %package langpack-bg_BG
 Summary: Bulgarian language pack for OpenOffice.org
@@ -670,7 +670,7 @@ Obsoletes: openoffice.org-langpack-bg < 
 Obsoletes: openoffice.org2-langpack-bg_BG < 1:3.0.0
 
 %description langpack-bg_BG
-Provides additional bulgarian translations and resources for OpenOffice.org.
+Provides additional Bulgarian translations and resources for OpenOffice.org.
 
 %package langpack-bn
 Summary: Bengali language pack for OpenOffice.org
@@ -683,7 +683,7 @@ Obsoletes: openoffice.org-langpack-bn_IN
 Obsoletes: openoffice.org2-langpack-bn < 1:3.0.0
 
 %description langpack-bn
-Provides additional bengali translations and resources for OpenOffice.org.
+Provides additional Bengali translations and resources for OpenOffice.org.
 
 %package langpack-ca_ES
 Summary: Catalan language pack for OpenOffice.org
@@ -695,7 +695,7 @@ Obsoletes: openoffice.org-langpack-ca < 
 Obsoletes: openoffice.org2-langpack-ca_ES < 1:3.0.0
 
 %description langpack-ca_ES
-Provides additional catalan translations and resources for OpenOffice.org.
+Provides additional Catalan translations and resources for OpenOffice.org.
 
 %package langpack-cs_CZ
 Summary: Czech language pack for OpenOffice.org
@@ -707,7 +707,7 @@ Obsoletes: openoffice.org-langpack-cs < 
 Obsoletes: openoffice.org2-langpack-cs_CZ < 1:3.0.0
 
 %description langpack-cs_CZ
-Provides additional czech translations and resources for OpenOffice.org.
+Provides additional Czech translations and resources for OpenOffice.org.
 
 %package langpack-cy_GB
 Summary: Welsh language pack for OpenOffice.org
@@ -720,7 +720,7 @@ Obsoletes: openoffice.org2-langpack-cy_G
 
 
 %description langpack-cy_GB
-Provides additional welsh translations and resources for OpenOffice.org.
+Provides additional Welsh translations and resources for OpenOffice.org.
 
 %package langpack-da_DK
 Summary: Danish language pack for OpenOffice.org
@@ -733,7 +733,7 @@ Obsoletes: openoffice.org2-langpack-da_D
 
 
 %description langpack-da_DK
-Provides additional danish translations and resources for OpenOffice.org.
+Provides additional Danish translations and resources for OpenOffice.org.
 
 %package langpack-de
 Summary: German language pack for OpenOffice.org
@@ -745,7 +745,7 @@ Obsoletes: openoffice.org2-langpack-de <
 
 
 %description langpack-de
-Provides additional german translations and resources for OpenOffice.org.
+Provides additional German translations and resources for OpenOffice.org.
 
 %package langpack-el_GR
 Summary: Greek language pack for OpenOffice.org
@@ -758,7 +758,7 @@ Obsoletes: openoffice.org2-langpack-el_G
 
 
 %description langpack-el_GR
-Provides additional greek translations and resources for OpenOffice.org.
+Provides additional Greek translations and resources for OpenOffice.org.
 
 %package langpack-en
 Summary: English language pack for OpenOffice.org
@@ -778,7 +778,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-es < 1:3.0.0
 
 %description langpack-es
-Provides additional spanish translations and resources for OpenOffice.org.
+Provides additional Spanish translations and resources for OpenOffice.org.
 
 %package langpack-et_EE
 Summary: Estonian language pack for OpenOffice.org
@@ -790,7 +790,7 @@ Obsoletes: openoffice.org-langpack-et < 
 Obsoletes: openoffice.org2-langpack-et_EE < 1:3.0.0
 
 %description langpack-et_EE
-Provides additional estonian translations and resources for OpenOffice.org.
+Provides additional Estonian translations and resources for OpenOffice.org.
 
 %package langpack-eu_ES
 Summary: Basque language pack for OpenOffice.org
@@ -802,7 +802,7 @@ Obsoletes: openoffice.org-langpack-eu < 
 Obsoletes: openoffice.org2-langpack-eu_ES < 1:3.0.0
 
 %description langpack-eu_ES
-Provides additional basque translations and resources for OpenOffice.org.
+Provides additional Basque translations and resources for OpenOffice.org.
 
 %package langpack-fi_FI
 Summary: Finnish language pack for OpenOffice.org
@@ -814,7 +814,7 @@ Obsoletes: openoffice.org-langpack-fi < 
 Obsoletes: openoffice.org2-langpack-fi_FI < 1:3.0.0
 
 %description langpack-fi_FI
-Provides additional finish translations and resources for OpenOffice.org.
+Provides additional Finnish translations and resources for OpenOffice.org.
 
 %package langpack-fr
 Summary: French language pack for OpenOffice.org
@@ -825,7 +825,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-fr < 1:3.0.0
 
 %description langpack-fr
-Provides additional french translations and resources for OpenOffice.org.
+Provides additional French translations and resources for OpenOffice.org.
 
 %package langpack-ga_IE
 Summary: Irish language pack for OpenOffice.org
@@ -835,7 +835,7 @@ Requires: hunspell-ga, hyphen-ga, mythes
 Obsoletes: openoffice.org2-langpack-ga_IE < 1:3.0.0
 
 %description langpack-ga_IE
-Provides additional irish translations and resources for OpenOffice.org.
+Provides additional Irish translations and resources for OpenOffice.org.
 
 %package langpack-gl_ES
 Summary: Galician language pack for OpenOffice.org
@@ -847,7 +847,7 @@ Obsoletes: openoffice.org-langpack-gl < 
 Obsoletes: openoffice.org2-langpack-gl_ES < 1:3.0.0
 
 %description langpack-gl_ES
-Provides additional galician translations and resources for OpenOffice.org.
+Provides additional Galician translations and resources for OpenOffice.org.
 
 %package langpack-gu_IN
 Summary: Gujarati language pack for OpenOffice.org
@@ -859,7 +859,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-gu_IN < 1:3.0.0
 
 %description langpack-gu_IN
-Provides additional gujarati translations and resources for OpenOffice.or.
+Provides additional Gujarati translations and resources for OpenOffice.or.
 
 %package langpack-pa
 Summary: Punjabi language pack for OpenOffice.org
@@ -872,7 +872,7 @@ Obsoletes: openoffice.org-langpack-pa_IN
 Obsoletes: openoffice.org2-langpack-pa_IN < 1:3.0.0
 
 %description langpack-pa
-Provides additional punjabi translations and resources for OpenOffice.org.
+Provides additional Punjabi translations and resources for OpenOffice.org.
 
 %package langpack-he_IL
 Summary: Hebrew language pack for OpenOffice.org
@@ -885,7 +885,7 @@ Obsoletes: openoffice.org-langpack-he < 
 Obsoletes: openoffice.org2-langpack-he_IL < 1:3.0.0
 
 %description langpack-he_IL
-Provides additional hebrew translations and resources for OpenOffice.org.
+Provides additional Hebrew translations and resources for OpenOffice.org.
 
 %package langpack-hi_IN
 Summary: Hindi language pack for OpenOffice.org
@@ -898,7 +898,7 @@ Obsoletes: openoffice.org-langpack-hi-IN
 Obsoletes: openoffice.org2-langpack-hi_IN < 1:3.0.0
 
 %description langpack-hi_IN
-Provides additional hindi translations and resources for OpenOffice.org.
+Provides additional Hindi translations and resources for OpenOffice.org.
 
 %package langpack-hu_HU
 Summary: Hungarian language pack for OpenOffice.org
@@ -910,7 +910,7 @@ Obsoletes: openoffice.org-langpack-hu < 
 Obsoletes: openoffice.org2-langpack-hu_HU < 1:3.0.0
 
 %description langpack-hu_HU
-Provides additional hungarian translations and resources for OpenOffice.org.
+Provides additional Hungarian translations and resources for OpenOffice.org.
 
 %package langpack-hr_HR
 Summary: Croatian language pack for OpenOffice.org
@@ -922,7 +922,7 @@ Obsoletes: openoffice.org-langpack-hr < 
 Obsoletes: openoffice.org2-langpack-hr_HR < 1:3.0.0
 
 %description langpack-hr_HR
-Provides additional croatian translations and resources for OpenOffice.org.
+Provides additional Croatian translations and resources for OpenOffice.org.
 
 %package langpack-it
 Summary: Italian language pack for OpenOffice.org
@@ -933,7 +933,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-it < 1:3.0.0
 
 %description langpack-it
-Provides additional italian translations and resources for OpenOffice.org.
+Provides additional Italian translations and resources for OpenOffice.org.
 
 %package langpack-ja_JP
 Summary: Japanese language pack for OpenOffice.org
@@ -946,7 +946,7 @@ Obsoletes: openoffice.org-langpack-ja < 
 Obsoletes: openoffice.org2-langpack-ja_JP < 1:3.0.0
 
 %description langpack-ja_JP
-Provides additional japanese translations and resources for OpenOffice.org.
+Provides additional Japanese translations and resources for OpenOffice.org.
 
 %package langpack-ko_KR
 Summary: Korean language pack for OpenOffice.org
@@ -959,7 +959,7 @@ Obsoletes: openoffice.org-langpack-ko < 
 Obsoletes: openoffice.org2-langpack-ko_KR < 1:3.0.0
 
 %description langpack-ko_KR
-Provides additional korean translations and resources for OpenOffice.org.
+Provides additional Korean translations and resources for OpenOffice.org.
 
 %package langpack-lt_LT
 Summary: Lithuanian language pack for OpenOffice.org
@@ -971,7 +971,7 @@ Obsoletes: openoffice.org-langpack-lt < 
 Obsoletes: openoffice.org2-langpack-lt_LT < 1:3.0.0
 
 %description langpack-lt_LT
-Provides additional lithuanian translations and resources for OpenOffice.org.
+Provides additional Lithuanian translations and resources for OpenOffice.org.
 
 %package langpack-ms_MY
 Summary: Malay language pack for OpenOffice.org
@@ -983,7 +983,7 @@ Obsoletes: openoffice.org-langpack-ms < 
 Obsoletes: openoffice.org2-langpack-ms_MY < 1:3.0.0
 
 %description langpack-ms_MY
-Provides additional malay translations and resources for OpenOffice.org.
+Provides additional Malay translations and resources for OpenOffice.org.
 
 %package langpack-nb_NO
 Summary: Bokmal language pack for OpenOffice.org
@@ -995,7 +995,7 @@ Obsoletes: openoffice.org-langpack-nb < 
 Obsoletes: openoffice.org2-langpack-nb_NO < 1:3.0.0
 
 %description langpack-nb_NO
-Provides additional bokmal translations and resources for OpenOffice.org.
+Provides additional Bokmal translations and resources for OpenOffice.org.
 
 %package langpack-nl
 Summary: Dutch language pack for OpenOffice.org
@@ -1006,7 +1006,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-nl < 1:3.0.0
 
 %description langpack-nl
-Provides additional dutch translations and resources for OpenOffice.org.
+Provides additional Dutch translations and resources for OpenOffice.org.
 
 %package langpack-nn_NO
 Summary: Nynorsk language pack for OpenOffice.org
@@ -1018,7 +1018,7 @@ Obsoletes: openoffice.org-langpack-nn < 
 Obsoletes: openoffice.org2-langpack-nn_NO < 1:3.0.0
 
 %description langpack-nn_NO
-Provides additional nynorsk translations and resources for OpenOffice.org.
+Provides additional Nynorsk translations and resources for OpenOffice.org.
 
 %package langpack-nr_ZA
 Summary: Southern Ndebele language pack for OpenOffice.org
@@ -1040,7 +1040,7 @@ Obsoletes: openoffice.org-langpack-pl < 
 Obsoletes: openoffice.org2-langpack-pl_PL < 1:3.0.0
 
 %description langpack-pl_PL
-Provides additional polish translations and resources for OpenOffice.org.
+Provides additional Polish translations and resources for OpenOffice.org.
 
 %package langpack-pt_PT
 Summary: Portuguese language pack for OpenOffice.org
@@ -1052,7 +1052,7 @@ Obsoletes: openoffice.org-langpack-pt < 
 Obsoletes: openoffice.org2-langpack-pt_PT < 1:3.0.0
 
 %description langpack-pt_PT
-Provides additional portuguese translations and resources for OpenOffice.org.
+Provides additional Portuguese translations and resources for OpenOffice.org.
 
 %package langpack-pt_BR
 Summary: Brazilian Portuguese language pack for OpenOffice.org
@@ -1064,7 +1064,7 @@ Obsoletes: openoffice.org-langpack-pt-BR
 Obsoletes: openoffice.org2-langpack-pt_BR < 1:3.0.0
 
 %description langpack-pt_BR
-Provides additional brazilian portuguese translations and resources for 
+Provides additional Brazilian Portuguese translations and resources for 
 OpenOffice.org.
 
 %package langpack-ru
@@ -1076,7 +1076,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-ru < 1:3.0.0
 
 %description langpack-ru
-Provides additional russian translations and resources for OpenOffice.org.
+Provides additional Russian translations and resources for OpenOffice.org.
 
 %package langpack-sk_SK
 Summary: Slovak language pack for OpenOffice.org
@@ -1088,7 +1088,7 @@ Obsoletes: openoffice.org-langpack-sk < 
 Obsoletes: openoffice.org2-langpack-sk_SK < 1:3.0.0
 
 %description langpack-sk_SK
-Provides additional slovak translations and resources for OpenOffice.org.
+Provides additional Slovak translations and resources for OpenOffice.org.
 
 %package langpack-sl_SI
 Summary: Slovenian language pack for OpenOffice.org
@@ -1100,7 +1100,7 @@ Obsoletes: openoffice.org-langpack-sl < 
 Obsoletes: openoffice.org2-langpack-sl_SI < 1:3.0.0
 
 %description langpack-sl_SI
-Provides additional slovenian translations and resources for OpenOffice.org.
+Provides additional Slovenian translations and resources for OpenOffice.org.
 
 %package langpack-sr
 Summary: Serbian language pack for OpenOffice.org
@@ -1111,7 +1111,7 @@ Obsoletes: openoffice.org-langpack-sr_CS
 Obsoletes: openoffice.org2-langpack-sr_CS < 1:3.0.0
 
 %description langpack-sr
-Provides additional serbian translations and resources for OpenOffice.org.
+Provides additional Serbian translations and resources for OpenOffice.org.
 
 %package langpack-ss_ZA
 Summary: Swati language pack for OpenOffice.org
@@ -1120,7 +1120,7 @@ Requires: %{name}-core = %{epoch}:%{vers
 Requires: hunspell-ss
 
 %description langpack-ss_ZA
-Provides additional swati translations and resources for OpenOffice.org.
+Provides additional Swati translations and resources for OpenOffice.org.
 
 %package langpack-st_ZA
 Summary: Southern Sotho language pack for OpenOffice.org
@@ -1141,7 +1141,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-sv < 1:3.0.0
 
 %description langpack-sv
-Provides additional swedish translations and resources for OpenOffice.org.
+Provides additional Swedish translations and resources for OpenOffice.org.
 
 %package langpack-ta_IN
 Summary: Tamil language pack for OpenOffice.org
@@ -1153,7 +1153,7 @@ Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-ta_IN < 1:3.0.0
 
 %description langpack-ta_IN
-Provides additional tamil translations and resources for OpenOffice.org.
+Provides additional Tamil translations and resources for OpenOffice.org.
 
 %package langpack-th_TH
 Summary: Thai language pack for OpenOffice.org
@@ -1166,7 +1166,7 @@ Obsoletes: openoffice.org-langpack-th < 
 Obsoletes: openoffice.org2-langpack-th_TH < 1:3.0.0
 
 %description langpack-th_TH
-Provides additional thai translations and resources for OpenOffice.org.
+Provides additional Thai translations and resources for OpenOffice.org.
 
 %package langpack-nso_ZA
 Summary: Northern Sotho language pack for OpenOffice.org
@@ -1188,7 +1188,7 @@ Obsoletes: openoffice.org-langpack-tn < 
 Obsoletes: openoffice.org2-langpack-tn_ZA < 1:3.0.0
 
 %description langpack-tn_ZA
-Provides additional tswana translations and resources for OpenOffice.org.
+Provides additional Tswana translations and resources for OpenOffice.org.
 
 %package langpack-ts_ZA
 Summary: Tsonga language pack for OpenOffice.org
@@ -1199,7 +1199,7 @@ Obsoletes: openoffice.org-langpack-ts < 
 Obsoletes: openoffice.org2-langpack-ts_ZA < 1:3.0.0
 
 %description langpack-ts_ZA
-Provides additional tsonga translations and resources for OpenOffice.org.
+Provides additional Tsonga translations and resources for OpenOffice.org.
 
 %package langpack-tr_TR
 Summary: Turkish language pack for OpenOffice.org
@@ -1211,7 +1211,7 @@ Obsoletes: openoffice.org-langpack-tr < 
 Obsoletes: openoffice.org2-langpack-tr < 1:3.0.0
 
 %description langpack-tr_TR
-Provides additional turkish translations and resources for OpenOffice.org.
+Provides additional Turkish translations and resources for OpenOffice.org.
 
 %package langpack-ve_ZA
 Summary: Venda language pack for OpenOffice.org
@@ -1220,7 +1220,7 @@ Requires: %{name}-core = %{epoch}:%{vers
 Requires: hunspell-ve
 
 %description langpack-ve_ZA
-Provides additional venda translations and resources for OpenOffice.org.
+Provides additional Venda translations and resources for OpenOffice.org.
 
 %package langpack-xh_ZA
 Summary: Xhosa language pack for OpenOffice.org
@@ -1229,7 +1229,7 @@ Requires: %{name}-core = %{epoch}:%{vers
 Requires: hunspell-xh
 
 %description langpack-xh_ZA
-Provides additional xhosa translations and resources for OpenOffice.org.
+Provides additional Xhosa translations and resources for OpenOffice.org.
 
 %package langpack-zh_CN
 Summary: Simplified Chinese language pack for OpenOffice.org
@@ -1242,7 +1242,7 @@ Obsoletes: openoffice.org-langpack-zh-CN
 Obsoletes: openoffice.org2-langpack-zh_CN < 1:3.0.0
 
 %description langpack-zh_CN
-Provides additional simplified chinese translations and resources for 
+Provides additional Simplified Chinese translations and resources for 
 OpenOffice.org.
 
 %package langpack-zh_TW
@@ -1256,7 +1256,7 @@ Obsoletes: openoffice.org-langpack-zh-TW
 Obsoletes: openoffice.org2-langpack-zh_TW < 1:3.0.0
 
 %description langpack-zh_TW
-Provides additional traditional chinese translations and resources for 
+Provides additional Traditional Chinese translations and resources for 
 OpenOffice.org.
 
 %package langpack-zu_ZA
@@ -1269,7 +1269,7 @@ Obsoletes: openoffice.org-langpack-zu < 
 Obsoletes: openoffice.org2-langpack-zu_ZA < 1:3.0.0
 
 %description langpack-zu_ZA
-Provides additional zulu translations and resources for OpenOffice.org.
+Provides additional Zulu translations and resources for OpenOffice.org.
 
 %package langpack-as_IN
 Summary: Assamese language pack for OpenOffice.org
@@ -1280,7 +1280,7 @@ Requires: lohit-bengali-fonts
 Obsoletes: openoffice.org2-langpack-as_IN < 1:3.0.0
 
 %description langpack-as_IN
-Provides additional assamese translations and resources for OpenOffice.org.
+Provides additional Assamese translations and resources for OpenOffice.org.
 
 %package langpack-mr_IN
 Summary: Marathi language pack for OpenOffice.org
@@ -1291,7 +1291,7 @@ Requires: lohit-marathi-fonts
 Obsoletes: openoffice.org2-langpack-mr_IN < 1:3.0.0
 
 %description langpack-mr_IN
-Provides additional marathi translations and resources for OpenOffice.org.
+Provides additional Marathi translations and resources for OpenOffice.org.
 
 %package langpack-ml_IN
 Summary: Malayalam language pack for OpenOffice.org
@@ -1302,7 +1302,7 @@ Requires: smc-meera-fonts
 Obsoletes: openoffice.org2-langpack-ml_IN < 1:3.0.0
 
 %description langpack-ml_IN
-Provides additional malayalam translations and resources for OpenOffice.org.
+Provides additional Malayalam translations and resources for OpenOffice.org.
 
 %package langpack-or_IN
 Summary: Oriya language pack for OpenOffice.org
@@ -1313,7 +1313,7 @@ Requires: lohit-oriya-fonts
 Obsoletes: openoffice.org2-langpack-or_IN < 1:3.0.0
 
 %description langpack-or_IN
-Provides additional oriya translations and resources for OpenOffice.org.
+Provides additional Oriya translations and resources for OpenOffice.org.
 
 %package langpack-te_IN
 Summary: Telugu language pack for OpenOffice.org
@@ -1324,7 +1324,7 @@ Requires: lohit-telugu-fonts
 Obsoletes: openoffice.org2-langpack-te_IN < 1:3.0.0
 
 %description langpack-te_IN
-Provides additional telugu translations and resources for OpenOffice.org.
+Provides additional Telugu translations and resources for OpenOffice.org.
 
 %package langpack-ur
 Summary: Urdu language pack for OpenOffice.org
@@ -1335,7 +1335,7 @@ Requires: hunspell-ur
 Obsoletes: openoffice.org2-langpack-ur < 1:3.0.0
 
 %description langpack-ur
-Provides additional urdu translations and resources for OpenOffice.org.
+Provides additional Urdu translations and resources for OpenOffice.org.
 
 %package langpack-kn_IN
 Summary: Kannada language pack for OpenOffice.org
@@ -1346,7 +1346,7 @@ Requires: lohit-kannada-fonts
 Obsoletes: openoffice.org2-langpack-kn_IN < 1:3.0.0
 
 %description langpack-kn_IN
-Provides additional kannada translations and resources for OpenOffice.org.
+Provides additional Kannada translations and resources for OpenOffice.org.
 
 %package langpack-dz
 Summary: Dzongkha language pack for OpenOffice.org
@@ -1355,7 +1355,7 @@ Requires: %{name}-core = %{epoch}:%{vers
 Requires: jomolhari-fonts
 
 %description langpack-dz
-Provides additional dzongkha translations and resources for OpenOffice.org.
+Provides additional Dzongkha translations and resources for OpenOffice.org.
 
 %package langpack-uk
 Summary: Ukrainian language pack for OpenOffice.org
@@ -1373,8 +1373,16 @@ Requires: %{name}-core = %{epoch}:%{vers
 Requires: lohit-maithili-fonts
 
 %description langpack-mai_IN
-Provides additional maithili translations and resources for OpenOffice.org.
+Provides additional Maithili translations and resources for OpenOffice.org.
 
+%package langpack-ro
+Summary: Romanian language pack for OpenOffice.org
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-ro, hyphen-ro, mythes-ro
+
+%description langpack-ro
+Provides additional Romanian translations and resources for OpenOffice.org.
 
 %package -n autocorr-en
 Summary: English autocorrection rules
@@ -2083,6 +2091,7 @@ st	help	western		ss	help	western \
 nr	help	western		ns	help	western	\
 dz      help    ctl		uk	help	western \
 sh	help	western		mai  	help	western \
+ro	nohelp	western
 )
 
 tar xzf %{SOURCE7}
@@ -2428,6 +2437,7 @@ rm -rf $RPM_BUILD_ROOT
 %files langpack-dz	-f dz.filelist
 %files langpack-uk	-f uk.filelist
 %files langpack-mai_IN	-f mai.filelist
+%files langpack-ro	-f ro.filelist
 %endif
 
 %files core
@@ -4176,6 +4186,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 24 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-8.4
+- Resolves: rhbz#489489 enable Romanian translations
+
 * Wed Dec 23 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-8.3
 - python bits should be site-arch
 



From peter at fedoraproject.org  Thu Dec 24 12:04:28 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Dec 2009 12:04:28 +0000 (UTC)
Subject: File ejabberd-2.1.1.tar.gz uploaded to lookaside cache by peter
Message-ID: <20091224120428.AF34510F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ejabberd:

8a2b9925fc2790d0594a8d3b37183537  ejabberd-2.1.1.tar.gz



From peter at fedoraproject.org  Thu Dec 24 12:05:22 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Dec 2009 12:05:22 +0000 (UTC)
Subject: rpms/ejabberd/devel .cvsignore, 1.15, 1.16 ejabberd.spec, 1.48,
	1.49 import.log, 1.16, 1.17 sources, 1.17,
	1.18 ejabberd-captcha-bashism.patch, 1.1,
	NONE ejabberd-http-poll-web-page.patch, 1.1,
	NONE ejabberd-piefxis-vhost-export.patch, 1.1,
	NONE ejabberd-vcard-reqs-forwarding.patch, 1.1, NONE
Message-ID: <20091224120522.07EEC11C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19558/devel

Modified Files:
	.cvsignore ejabberd.spec import.log sources 
Removed Files:
	ejabberd-captcha-bashism.patch 
	ejabberd-http-poll-web-page.patch 
	ejabberd-piefxis-vhost-export.patch 
	ejabberd-vcard-reqs-forwarding.patch 
Log Message:
Ver. 2.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Nov 2009 08:01:18 -0000	1.15
+++ .cvsignore	24 Dec 2009 12:05:21 -0000	1.16
@@ -1 +1 @@
-ejabberd-2.1.0.tar.gz
+ejabberd-2.1.1.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ejabberd.spec	10 Dec 2009 19:01:41 -0000	1.48
+++ ejabberd.spec	24 Dec 2009 12:05:21 -0000	1.49
@@ -11,8 +11,8 @@
 %endif
 
 Name:           ejabberd
-Version:        2.1.0
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -47,23 +47,8 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
 # fixed delays in s2s connections
 Patch8: ejabberd-fixed_delays_in_s2s.patch
-# captcha.sh uses some BASH-specific variables
-# see https://support.process-one.net/browse/EJAB-1105
-Patch9: ejabberd-captcha-bashism.patch
 # Introducing mod_admin_extra
 Patch10: ejabberd-mod_admin_extra.patch
-# Fixed long-standing bug with RFC 3920 violation
-# see https://support.process-one.net/browse/EJAB-1045
-Patch11: ejabberd-vcard-reqs-forwarding.patch
-# Generates a human-readable XHTML page which is returned
-# when a user tries to browse the HTTP-poll URL configured
-# for the server (a common mistake).
-# see https://support.process-one.net/browse/EJAB-1106
-Patch12: ejabberd-http-poll-web-page.patch
-# This patch enables generation of the main XML file
-# when exporting data of a virtual host into PIEFXIS format.
-# see https://support.process-one.net/browse/EJAB-1098
-Patch13: ejabberd-piefxis-vhost-export.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -177,11 +162,7 @@ fi
 %patch3 -p0 -b .pam_name
 %patch5 -p0 -b .mod_ctlextra
 %patch8 -p0 -b .s2s
-%patch9 -p1 -b .bashism
 %patch10 -p1 -b .mod_admin_extra
-%patch11 -p1 -b .vcard_rfc_violation
-%patch12 -p1 -b .xhtml
-%patch13 -p1 -b .piefxis
 
 dos2unix src/odbc/mssql2000.sql
 
@@ -346,11 +327,16 @@ rm -rf %{buildroot}
 %doc doc/release_notes_2.0.4.txt
 %doc doc/release_notes_2.0.5.txt
 %doc doc/release_notes_2.1.0.txt
+%doc doc/release_notes_2.1.1.txt
 %doc doc/webadmmain.png
 %doc doc/webadmmainru.png
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Dec 24 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.1-1
+- Ver. 2.1.1
+- Dropped patches 9,11,12,13 (accepted upstream)
+
 * Thu Dec 10 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-2
 - DB backups are made on every upgrade/uninstall
 - Fixed installation of captcha.sh example helper


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	10 Dec 2009 19:01:41 -0000	1.16
+++ import.log	24 Dec 2009 12:05:21 -0000	1.17
@@ -14,3 +14,4 @@ ejabberd-2_0_5-8_fc11:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-10_fc11:HEAD:ejabberd-2.0.5-10.fc11.src.rpm:1257428310
 ejabberd-2_1_0-1_fc12:HEAD:ejabberd-2.1.0-1.fc12.src.rpm:1258790332
 ejabberd-2_1_0-2_fc12:HEAD:ejabberd-2.1.0-2.fc12.src.rpm:1260471420
+ejabberd-2_1_1-1_fc12:HEAD:ejabberd-2.1.1-1.fc12.src.rpm:1261656263


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Nov 2009 08:01:19 -0000	1.17
+++ sources	24 Dec 2009 12:05:21 -0000	1.18
@@ -1 +1 @@
-373be6e99acf7c930ab85531489c63c4  ejabberd-2.1.0.tar.gz
+8a2b9925fc2790d0594a8d3b37183537  ejabberd-2.1.1.tar.gz


--- ejabberd-captcha-bashism.patch DELETED ---


--- ejabberd-http-poll-web-page.patch DELETED ---


--- ejabberd-piefxis-vhost-export.patch DELETED ---


--- ejabberd-vcard-reqs-forwarding.patch DELETED ---



From oget at fedoraproject.org  Thu Dec 24 12:05:31 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 12:05:31 +0000 (UTC)
Subject: rpms/mscore/devel mscore-arm-buildfix.patch, NONE,
	1.1 mscore-use-default-soundfont.patch, 1.2, 1.3 mscore.spec,
	1.5, 1.6 mscore-use-pclite-soundfont.patch, 1.2, NONE
Message-ID: <20091224120531.82A7411C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19633

Modified Files:
	mscore-use-default-soundfont.patch mscore.spec 
Added Files:
	mscore-arm-buildfix.patch 
Removed Files:
	mscore-use-pclite-soundfont.patch 
Log Message:
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
- Add default soundfont support for exported audio files
- Rebuild against new libsndfile for additional functionality
- Drop F-10 related bits from specfile
- Make fonts subpackage noarch
- Fix build failure on arm architecture


mscore-arm-buildfix.patch:
 barline.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mscore-arm-buildfix.patch ---
--- mscore-0.9.5.old/mscore/mscore/barline.cpp	2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/barline.cpp	2009-12-22 08:42:39.000000000 -0500
@@ -96,7 +96,7 @@ void BarLine::draw(QPainter& p) const
       {
       qreal lw = point(score()->styleS(ST_barWidth));
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
 
       QPen pen(p.pen());
       pen.setWidthF(lw);
@@ -274,7 +274,7 @@ void BarLine::read(QDomElement e)
 QRectF BarLine::bbox() const
       {
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       Spatium w = score()->styleS(ST_barWidth);
       qreal dw  = 0.0;
 
@@ -366,7 +366,7 @@ void BarLine::updateGrips(int* grips, QR
       *grips   = 1;
       qreal lw = point(score()->styleS(ST_barWidth));
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       grip[0].translate(QPointF(lw * .5, y2) + canvasPos());
       }
 
@@ -413,7 +413,7 @@ void BarLine::editDrag(int, const QPoint
 void BarLine::endEditDrag()
       {
       double y1, h2;
-      getY(&y1, &h2);
+      getY((double*)&y1, (double*)&h2);
       yoff      = 0.0;
       qreal ay1 = canvasPos().y();
       qreal ay2 = ay1 + h2;

mscore-use-default-soundfont.patch:
 exportaudio.cpp |    4 ++--
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore-use-default-soundfont.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mscore-use-default-soundfont.patch	22 Aug 2009 01:27:15 -0000	1.2
+++ mscore-use-default-soundfont.patch	24 Dec 2009 12:05:31 -0000	1.3
@@ -1,6 +1,21 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/exportaudio.cpp mscore-0.9.5/mscore/mscore/exportaudio.cpp
+--- mscore-0.9.5.old/mscore/mscore/exportaudio.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/exportaudio.cpp	2009-12-22 08:17:53.000000000 -0500
+@@ -49,9 +49,9 @@ bool Score::saveAudio(const QString& nam
+             p = QString(getenv("DEFAULT_SOUNDFONT"));
+       if (p.isEmpty()) {
+             //
+-            // fallback to integrated soundfont
++            // fallback to default soundfont
+             //
+-            p = ":/data/piano1.sf2";
++	    p = INSTPREFIX "/share/soundfonts/default.sf2";
+             }
+       bool rv = synth->loadSoundFont(p);
+       if (!rv) {
 diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
 --- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-12-22 08:15:49.000000000 -0500
 @@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
@@ -12,7 +27,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        <file>data/undo.svg</file>
 diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
 --- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-12-22 08:15:49.000000000 -0500
 @@ -142,7 +142,7 @@ void Preferences::init()
  
        enableMidiInput    = true;
@@ -33,7 +48,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
 diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
 --- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-12-22 08:15:49.000000000 -0500
 @@ -221,9 +221,9 @@ bool Seq::init()
                    p = QString(getenv("DEFAULT_SOUNDFONT"));
              if (p.isEmpty()) {


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mscore.spec	22 Aug 2009 01:27:15 -0000	1.5
+++ mscore.spec	24 Dec 2009 12:05:31 -0000	1.6
@@ -1,15 +1,15 @@
 %global fontfamilyname %{name}
 %global majorver -0.9
-%if 0%{?fedora} >= 12
-%global fontpackagename fonts
+%if 0%{?fedora} > 11
+%global buildflags %{optflags} -fno-var-tracking-assignments
 %else
-%global fontpackagename %{fontfamilyname}-fonts
+%global buildflags %{optflags}
 %endif
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       0.9.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -36,8 +36,9 @@ Patch1:        %{name}-no-awl-plugin.pat
 # inform the users about the existence of different choices for common files.
 # The font files need to be separated due to the font packaging guidelines.
 Patch2:        %{name}-separate-commonfiles.patch
-# On Fedora < 11 there is no default soundfont
-Patch10:       %{name}-use-pclite-soundfont.patch
+# qreal is float on arm. getY() expects double:
+# http://www.musescore.org/en/node/3726
+Patch3:        %{name}-arm-buildfix.patch
 # Use Fedora's default soundfont instead of the removed one:
 Patch11:       %{name}-use-default-soundfont.patch
 
@@ -47,46 +48,20 @@ BuildRequires: alsa-lib-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libsndfile-devel >= 1.0.19
 BuildRequires: portaudio-devel
 BuildRequires: qt4-devel
 
-# Fonts related:
-BuildRequires: fontforge
-BuildRequires: fontpackages-devel
-BuildRequires: t1utils
-BuildRequires: texlive
-%if 0%{?fedora} >= 11
-BuildRequires: tex-cm-lgc
-%else
-BuildRequires: tetex-font-cm-lgc
-%endif
-
-# Fedora 10&11's libsndfile is too old :(
-%if 0%{?fedora} >= 12
-BuildRequires: libsndfile-devel >= 1.0.19
-%endif
-
-# fontpackages-1.21 has different behavior
-%if 0%{?fedora} >= 12
 Requires:      %{name}-fonts = %{version}-%{release}
-%else
-Requires:      %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
-%endif
+Requires:      soundfont2-default
+# For scripting
+Requires:      qtscriptbindings
+
 
 # Doxygen documentation is huge and it is for musescore development only. 
 # Hence we don't build it for now. Otherwise it needs:
 # BuildRequires: graphviz doxygen texlive-latex texlive-dvips
 
-# On Fedora < 11 there is no default soundfont
-%if 0%{?fedora} >= 11
-Requires:      soundfont2-default
-%else
-Requires:      PersonalCopy-Lite-soundfont
-%endif
-
-# For scripting
-Requires:      qtscriptbindings
-
 Provides:      musescore = %{name}-%{version}-%{release}
 
 %description
@@ -101,19 +76,22 @@ highlights:
     * Import and export of MusicXML and Standard MIDI Files (SMF)
     * Available in 12 languages
 
-# fontpackages-1.21 has different behavior
-%package %{fontpackagename}
+%package fonts
 Summary:       MuseScore fonts
 Group:         User Interface/X
 License:       GPL+ with exceptions and OFL
 Requires:      fontpackages-filesystem
-%if "%{fontpackagename}" == "fonts"
+BuildArch:     noarch
+BuildRequires: fontforge
+BuildRequires: fontpackages-devel
+BuildRequires: t1utils
+BuildRequires: texlive
+BuildRequires: tex-cm-lgc
 # Note: this line should be updated carefully on each update:
-Obsoletes:     mscore-mscore-fonts < 0.9.5-1
+Obsoletes:     mscore-mscore-fonts < 0.9.5-2
 Provides:      mscore-mscore-fonts = %{version}-%{release}
-%endif
 
-%description %{fontpackagename}
+%description fonts
 MuseScore is a free cross platform WYSIWYG music notation program.
 
 This package contains the musical notation fonts for use of MuseScore.
@@ -121,20 +99,19 @@ This package contains the musical notati
 %prep
 %setup -q 
 
-%if 0%{?fedora} < 11
-%patch10 -p1 -b .pclite.soundfont
-%else
 %patch11 -p1 -b .default.soundfont
-%endif
 %patch1 -p1 -b .noawlplugin
 %patch2 -p1 -b .separatecommon
+%patch3 -p1 -b .arm
 
 # Remove the precompiled binary
 rm mscore/rtf2html/rtf2html
 
+
+
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
-find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags} -fno-var-tracking-assignments|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags} -fno-var-tracking-assignments|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|scriptgen||' %{name}/CMakeLists.txt
@@ -153,11 +130,6 @@ rm -f %{name}/%{name}/fonts/*.ttf
 # Fix GenericName
 sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
 
-# Fedora 10&11's libsndfile is too old :(
-%if 0%{?fedora} < 12
-sed -i 's|HAS_AUDIOFILE TRUE|HAS_AUDIOFILE FALSE|' %{name}/CMakeLists.txt
-%endif
-
 # Disable rpath
 sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
 
@@ -166,7 +138,7 @@ sed -i '/rpath/d' %{name}/%{name}/CMakeL
 mkdir build
 pushd build
    export PATH=${PATH}:%{_libdir}/qt4/bin
-   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{optflags}" ../mscore
+   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{buildflags}" ../mscore
    make lupdate %{?_smp_flags}
    make lrelease %{?_smp_flags}
    make %{?_smp_flags} VERBOSE=1
@@ -266,14 +238,17 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/*
 
-# fontpackages-1.21 has different behavior
-%if "%{fontpackagename}" == "fonts"
 %_font_pkg %{fontfamilyname}*.ttf
-%else
-%_font_pkg -n %{fontfamilyname} %{fontfamilyname}*.ttf
-%endif
+
 
 %changelog
+* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
+- Add default soundfont support for exported audio files
+- Rebuild against new libsndfile for additional functionality
+- Drop F-10 related bits from specfile
+- Make fonts subpackage noarch
+- Fix build failure on arm architecture
+
 * Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
 - Update to 0.9.5
 


--- mscore-use-pclite-soundfont.patch DELETED ---



From oget at fedoraproject.org  Thu Dec 24 12:08:19 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 12:08:19 +0000 (UTC)
Subject: rpms/mscore/F-12 mscore-arm-buildfix.patch, NONE,
	1.1 mscore-use-default-soundfont.patch, 1.2, 1.3 mscore.spec,
	1.5, 1.6 mscore-use-pclite-soundfont.patch, 1.2, NONE
Message-ID: <20091224120819.EF4E211C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20303

Modified Files:
	mscore-use-default-soundfont.patch mscore.spec 
Added Files:
	mscore-arm-buildfix.patch 
Removed Files:
	mscore-use-pclite-soundfont.patch 
Log Message:
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
- Add default soundfont support for exported audio files
- Rebuild against new libsndfile for additional functionality
- Drop F-10 related bits from specfile
- Make fonts subpackage noarch
- Fix build failure on arm architecture


mscore-arm-buildfix.patch:
 barline.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mscore-arm-buildfix.patch ---
--- mscore-0.9.5.old/mscore/mscore/barline.cpp	2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/barline.cpp	2009-12-22 08:42:39.000000000 -0500
@@ -96,7 +96,7 @@ void BarLine::draw(QPainter& p) const
       {
       qreal lw = point(score()->styleS(ST_barWidth));
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
 
       QPen pen(p.pen());
       pen.setWidthF(lw);
@@ -274,7 +274,7 @@ void BarLine::read(QDomElement e)
 QRectF BarLine::bbox() const
       {
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       Spatium w = score()->styleS(ST_barWidth);
       qreal dw  = 0.0;
 
@@ -366,7 +366,7 @@ void BarLine::updateGrips(int* grips, QR
       *grips   = 1;
       qreal lw = point(score()->styleS(ST_barWidth));
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       grip[0].translate(QPointF(lw * .5, y2) + canvasPos());
       }
 
@@ -413,7 +413,7 @@ void BarLine::editDrag(int, const QPoint
 void BarLine::endEditDrag()
       {
       double y1, h2;
-      getY(&y1, &h2);
+      getY((double*)&y1, (double*)&h2);
       yoff      = 0.0;
       qreal ay1 = canvasPos().y();
       qreal ay2 = ay1 + h2;

mscore-use-default-soundfont.patch:
 exportaudio.cpp |    4 ++--
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-12/mscore-use-default-soundfont.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mscore-use-default-soundfont.patch	22 Aug 2009 01:27:15 -0000	1.2
+++ mscore-use-default-soundfont.patch	24 Dec 2009 12:08:19 -0000	1.3
@@ -1,6 +1,21 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/exportaudio.cpp mscore-0.9.5/mscore/mscore/exportaudio.cpp
+--- mscore-0.9.5.old/mscore/mscore/exportaudio.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/exportaudio.cpp	2009-12-22 08:17:53.000000000 -0500
+@@ -49,9 +49,9 @@ bool Score::saveAudio(const QString& nam
+             p = QString(getenv("DEFAULT_SOUNDFONT"));
+       if (p.isEmpty()) {
+             //
+-            // fallback to integrated soundfont
++            // fallback to default soundfont
+             //
+-            p = ":/data/piano1.sf2";
++	    p = INSTPREFIX "/share/soundfonts/default.sf2";
+             }
+       bool rv = synth->loadSoundFont(p);
+       if (!rv) {
 diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
 --- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-12-22 08:15:49.000000000 -0500
 @@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
@@ -12,7 +27,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        <file>data/undo.svg</file>
 diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
 --- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-12-22 08:15:49.000000000 -0500
 @@ -142,7 +142,7 @@ void Preferences::init()
  
        enableMidiInput    = true;
@@ -33,7 +48,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
 diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
 --- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-12-22 08:15:49.000000000 -0500
 @@ -221,9 +221,9 @@ bool Seq::init()
                    p = QString(getenv("DEFAULT_SOUNDFONT"));
              if (p.isEmpty()) {


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-12/mscore.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mscore.spec	22 Aug 2009 01:27:15 -0000	1.5
+++ mscore.spec	24 Dec 2009 12:08:19 -0000	1.6
@@ -1,15 +1,15 @@
 %global fontfamilyname %{name}
 %global majorver -0.9
-%if 0%{?fedora} >= 12
-%global fontpackagename fonts
+%if 0%{?fedora} > 11
+%global buildflags %{optflags} -fno-var-tracking-assignments
 %else
-%global fontpackagename %{fontfamilyname}-fonts
+%global buildflags %{optflags}
 %endif
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       0.9.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -36,8 +36,9 @@ Patch1:        %{name}-no-awl-plugin.pat
 # inform the users about the existence of different choices for common files.
 # The font files need to be separated due to the font packaging guidelines.
 Patch2:        %{name}-separate-commonfiles.patch
-# On Fedora < 11 there is no default soundfont
-Patch10:       %{name}-use-pclite-soundfont.patch
+# qreal is float on arm. getY() expects double:
+# http://www.musescore.org/en/node/3726
+Patch3:        %{name}-arm-buildfix.patch
 # Use Fedora's default soundfont instead of the removed one:
 Patch11:       %{name}-use-default-soundfont.patch
 
@@ -47,46 +48,20 @@ BuildRequires: alsa-lib-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libsndfile-devel >= 1.0.19
 BuildRequires: portaudio-devel
 BuildRequires: qt4-devel
 
-# Fonts related:
-BuildRequires: fontforge
-BuildRequires: fontpackages-devel
-BuildRequires: t1utils
-BuildRequires: texlive
-%if 0%{?fedora} >= 11
-BuildRequires: tex-cm-lgc
-%else
-BuildRequires: tetex-font-cm-lgc
-%endif
-
-# Fedora 10&11's libsndfile is too old :(
-%if 0%{?fedora} >= 12
-BuildRequires: libsndfile-devel >= 1.0.19
-%endif
-
-# fontpackages-1.21 has different behavior
-%if 0%{?fedora} >= 12
 Requires:      %{name}-fonts = %{version}-%{release}
-%else
-Requires:      %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
-%endif
+Requires:      soundfont2-default
+# For scripting
+Requires:      qtscriptbindings
+
 
 # Doxygen documentation is huge and it is for musescore development only. 
 # Hence we don't build it for now. Otherwise it needs:
 # BuildRequires: graphviz doxygen texlive-latex texlive-dvips
 
-# On Fedora < 11 there is no default soundfont
-%if 0%{?fedora} >= 11
-Requires:      soundfont2-default
-%else
-Requires:      PersonalCopy-Lite-soundfont
-%endif
-
-# For scripting
-Requires:      qtscriptbindings
-
 Provides:      musescore = %{name}-%{version}-%{release}
 
 %description
@@ -101,19 +76,22 @@ highlights:
     * Import and export of MusicXML and Standard MIDI Files (SMF)
     * Available in 12 languages
 
-# fontpackages-1.21 has different behavior
-%package %{fontpackagename}
+%package fonts
 Summary:       MuseScore fonts
 Group:         User Interface/X
 License:       GPL+ with exceptions and OFL
 Requires:      fontpackages-filesystem
-%if "%{fontpackagename}" == "fonts"
+BuildArch:     noarch
+BuildRequires: fontforge
+BuildRequires: fontpackages-devel
+BuildRequires: t1utils
+BuildRequires: texlive
+BuildRequires: tex-cm-lgc
 # Note: this line should be updated carefully on each update:
-Obsoletes:     mscore-mscore-fonts < 0.9.5-1
+Obsoletes:     mscore-mscore-fonts < 0.9.5-2
 Provides:      mscore-mscore-fonts = %{version}-%{release}
-%endif
 
-%description %{fontpackagename}
+%description fonts
 MuseScore is a free cross platform WYSIWYG music notation program.
 
 This package contains the musical notation fonts for use of MuseScore.
@@ -121,20 +99,19 @@ This package contains the musical notati
 %prep
 %setup -q 
 
-%if 0%{?fedora} < 11
-%patch10 -p1 -b .pclite.soundfont
-%else
 %patch11 -p1 -b .default.soundfont
-%endif
 %patch1 -p1 -b .noawlplugin
 %patch2 -p1 -b .separatecommon
+%patch3 -p1 -b .arm
 
 # Remove the precompiled binary
 rm mscore/rtf2html/rtf2html
 
+
+
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
-find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags} -fno-var-tracking-assignments|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags} -fno-var-tracking-assignments|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|scriptgen||' %{name}/CMakeLists.txt
@@ -153,11 +130,6 @@ rm -f %{name}/%{name}/fonts/*.ttf
 # Fix GenericName
 sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
 
-# Fedora 10&11's libsndfile is too old :(
-%if 0%{?fedora} < 12
-sed -i 's|HAS_AUDIOFILE TRUE|HAS_AUDIOFILE FALSE|' %{name}/CMakeLists.txt
-%endif
-
 # Disable rpath
 sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
 
@@ -166,7 +138,7 @@ sed -i '/rpath/d' %{name}/%{name}/CMakeL
 mkdir build
 pushd build
    export PATH=${PATH}:%{_libdir}/qt4/bin
-   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{optflags}" ../mscore
+   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{buildflags}" ../mscore
    make lupdate %{?_smp_flags}
    make lrelease %{?_smp_flags}
    make %{?_smp_flags} VERBOSE=1
@@ -266,14 +238,17 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/*
 
-# fontpackages-1.21 has different behavior
-%if "%{fontpackagename}" == "fonts"
 %_font_pkg %{fontfamilyname}*.ttf
-%else
-%_font_pkg -n %{fontfamilyname} %{fontfamilyname}*.ttf
-%endif
+
 
 %changelog
+* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
+- Add default soundfont support for exported audio files
+- Rebuild against new libsndfile for additional functionality
+- Drop F-10 related bits from specfile
+- Make fonts subpackage noarch
+- Fix build failure on arm architecture
+
 * Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
 - Update to 0.9.5
 


--- mscore-use-pclite-soundfont.patch DELETED ---



From peter at fedoraproject.org  Thu Dec 24 12:08:45 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Dec 2009 12:08:45 +0000 (UTC)
Subject: rpms/ejabberd/F-12 .cvsignore, 1.15, 1.16 ejabberd.spec, 1.48,
	1.49 import.log, 1.16, 1.17 sources, 1.17,
	1.18 ejabberd-captcha-bashism.patch, 1.1,
	NONE ejabberd-http-poll-web-page.patch, 1.1,
	NONE ejabberd-piefxis-vhost-export.patch, 1.1,
	NONE ejabberd-vcard-reqs-forwarding.patch, 1.1, NONE
Message-ID: <20091224120845.197FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20456/F-12

Modified Files:
	.cvsignore ejabberd.spec import.log sources 
Removed Files:
	ejabberd-captcha-bashism.patch 
	ejabberd-http-poll-web-page.patch 
	ejabberd-piefxis-vhost-export.patch 
	ejabberd-vcard-reqs-forwarding.patch 
Log Message:
Ver. 2.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Nov 2009 08:02:50 -0000	1.15
+++ .cvsignore	24 Dec 2009 12:08:44 -0000	1.16
@@ -1 +1 @@
-ejabberd-2.1.0.tar.gz
+ejabberd-2.1.1.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ejabberd.spec	10 Dec 2009 19:09:42 -0000	1.48
+++ ejabberd.spec	24 Dec 2009 12:08:44 -0000	1.49
@@ -11,8 +11,8 @@
 %endif
 
 Name:           ejabberd
-Version:        2.1.0
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -47,23 +47,8 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
 # fixed delays in s2s connections
 Patch8: ejabberd-fixed_delays_in_s2s.patch
-# captcha.sh uses some BASH-specific variables
-# see https://support.process-one.net/browse/EJAB-1105
-Patch9: ejabberd-captcha-bashism.patch
 # Introducing mod_admin_extra
 Patch10: ejabberd-mod_admin_extra.patch
-# Fixed long-standing bug with RFC 3920 violation
-# see https://support.process-one.net/browse/EJAB-1045
-Patch11: ejabberd-vcard-reqs-forwarding.patch
-# Generates a human-readable XHTML page which is returned
-# when a user tries to browse the HTTP-poll URL configured
-# for the server (a common mistake).
-# see https://support.process-one.net/browse/EJAB-1106
-Patch12: ejabberd-http-poll-web-page.patch
-# This patch enables generation of the main XML file
-# when exporting data of a virtual host into PIEFXIS format.
-# see https://support.process-one.net/browse/EJAB-1098
-Patch13: ejabberd-piefxis-vhost-export.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -177,11 +162,7 @@ fi
 %patch3 -p0 -b .pam_name
 %patch5 -p0 -b .mod_ctlextra
 %patch8 -p0 -b .s2s
-%patch9 -p1 -b .bashism
 %patch10 -p1 -b .mod_admin_extra
-%patch11 -p1 -b .vcard_rfc_violation
-%patch12 -p1 -b .xhtml
-%patch13 -p1 -b .piefxis
 
 dos2unix src/odbc/mssql2000.sql
 
@@ -346,11 +327,16 @@ rm -rf %{buildroot}
 %doc doc/release_notes_2.0.4.txt
 %doc doc/release_notes_2.0.5.txt
 %doc doc/release_notes_2.1.0.txt
+%doc doc/release_notes_2.1.1.txt
 %doc doc/webadmmain.png
 %doc doc/webadmmainru.png
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Dec 24 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.1-1
+- Ver. 2.1.1
+- Dropped patches 9,11,12,13 (accepted upstream)
+
 * Thu Dec 10 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-2
 - DB backups are made on every upgrade/uninstall
 - Fixed installation of captcha.sh example helper


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	10 Dec 2009 19:09:42 -0000	1.16
+++ import.log	24 Dec 2009 12:08:44 -0000	1.17
@@ -14,3 +14,4 @@ ejabberd-2_0_5-8_fc11:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-10_fc11:F-12:ejabberd-2.0.5-10.fc11.src.rpm:1257428464
 ejabberd-2_1_0-1_fc12:F-12:ejabberd-2.1.0-1.fc12.src.rpm:1258790540
 ejabberd-2_1_0-2_fc12:F-12:ejabberd-2.1.0-2.fc12.src.rpm:1260472047
+ejabberd-2_1_1-1_fc12:F-12:ejabberd-2.1.1-1.fc12.src.rpm:1261656365


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Nov 2009 08:02:52 -0000	1.17
+++ sources	24 Dec 2009 12:08:45 -0000	1.18
@@ -1 +1 @@
-373be6e99acf7c930ab85531489c63c4  ejabberd-2.1.0.tar.gz
+8a2b9925fc2790d0594a8d3b37183537  ejabberd-2.1.1.tar.gz


--- ejabberd-captcha-bashism.patch DELETED ---


--- ejabberd-http-poll-web-page.patch DELETED ---


--- ejabberd-piefxis-vhost-export.patch DELETED ---


--- ejabberd-vcard-reqs-forwarding.patch DELETED ---



From oget at fedoraproject.org  Thu Dec 24 12:09:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 12:09:30 +0000 (UTC)
Subject: rpms/mscore/F-11 mscore-arm-buildfix.patch, NONE,
	1.1 mscore-use-default-soundfont.patch, 1.2, 1.3 mscore.spec,
	1.3, 1.4 mscore-use-pclite-soundfont.patch, 1.2, NONE
Message-ID: <20091224120930.DD82811C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20754

Modified Files:
	mscore-use-default-soundfont.patch mscore.spec 
Added Files:
	mscore-arm-buildfix.patch 
Removed Files:
	mscore-use-pclite-soundfont.patch 
Log Message:
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
- Add default soundfont support for exported audio files
- Rebuild against new libsndfile for additional functionality
- Drop F-10 related bits from specfile
- Make fonts subpackage noarch
- Fix build failure on arm architecture


mscore-arm-buildfix.patch:
 barline.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mscore-arm-buildfix.patch ---
--- mscore-0.9.5.old/mscore/mscore/barline.cpp	2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/barline.cpp	2009-12-22 08:42:39.000000000 -0500
@@ -96,7 +96,7 @@ void BarLine::draw(QPainter& p) const
       {
       qreal lw = point(score()->styleS(ST_barWidth));
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
 
       QPen pen(p.pen());
       pen.setWidthF(lw);
@@ -274,7 +274,7 @@ void BarLine::read(QDomElement e)
 QRectF BarLine::bbox() const
       {
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       Spatium w = score()->styleS(ST_barWidth);
       qreal dw  = 0.0;
 
@@ -366,7 +366,7 @@ void BarLine::updateGrips(int* grips, QR
       *grips   = 1;
       qreal lw = point(score()->styleS(ST_barWidth));
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       grip[0].translate(QPointF(lw * .5, y2) + canvasPos());
       }
 
@@ -413,7 +413,7 @@ void BarLine::editDrag(int, const QPoint
 void BarLine::endEditDrag()
       {
       double y1, h2;
-      getY(&y1, &h2);
+      getY((double*)&y1, (double*)&h2);
       yoff      = 0.0;
       qreal ay1 = canvasPos().y();
       qreal ay2 = ay1 + h2;

mscore-use-default-soundfont.patch:
 exportaudio.cpp |    4 ++--
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore-use-default-soundfont.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mscore-use-default-soundfont.patch	22 Aug 2009 01:23:50 -0000	1.2
+++ mscore-use-default-soundfont.patch	24 Dec 2009 12:09:30 -0000	1.3
@@ -1,6 +1,21 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/exportaudio.cpp mscore-0.9.5/mscore/mscore/exportaudio.cpp
+--- mscore-0.9.5.old/mscore/mscore/exportaudio.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/exportaudio.cpp	2009-12-22 08:17:53.000000000 -0500
+@@ -49,9 +49,9 @@ bool Score::saveAudio(const QString& nam
+             p = QString(getenv("DEFAULT_SOUNDFONT"));
+       if (p.isEmpty()) {
+             //
+-            // fallback to integrated soundfont
++            // fallback to default soundfont
+             //
+-            p = ":/data/piano1.sf2";
++	    p = INSTPREFIX "/share/soundfonts/default.sf2";
+             }
+       bool rv = synth->loadSoundFont(p);
+       if (!rv) {
 diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
 --- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-12-22 08:15:49.000000000 -0500
 @@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
@@ -12,7 +27,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        <file>data/undo.svg</file>
 diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
 --- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-12-22 08:15:49.000000000 -0500
 @@ -142,7 +142,7 @@ void Preferences::init()
  
        enableMidiInput    = true;
@@ -33,7 +48,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
 diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
 --- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-12-22 08:15:49.000000000 -0500
 @@ -221,9 +221,9 @@ bool Seq::init()
                    p = QString(getenv("DEFAULT_SOUNDFONT"));
              if (p.isEmpty()) {


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mscore.spec	22 Aug 2009 01:23:50 -0000	1.3
+++ mscore.spec	24 Dec 2009 12:09:30 -0000	1.4
@@ -1,15 +1,15 @@
 %global fontfamilyname %{name}
 %global majorver -0.9
-%if 0%{?fedora} >= 12
-%global fontpackagename fonts
+%if 0%{?fedora} > 11
+%global buildflags %{optflags} -fno-var-tracking-assignments
 %else
-%global fontpackagename %{fontfamilyname}-fonts
+%global buildflags %{optflags}
 %endif
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       0.9.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -36,8 +36,9 @@ Patch1:        %{name}-no-awl-plugin.pat
 # inform the users about the existence of different choices for common files.
 # The font files need to be separated due to the font packaging guidelines.
 Patch2:        %{name}-separate-commonfiles.patch
-# On Fedora < 11 there is no default soundfont
-Patch10:       %{name}-use-pclite-soundfont.patch
+# qreal is float on arm. getY() expects double:
+# http://www.musescore.org/en/node/3726
+Patch3:        %{name}-arm-buildfix.patch
 # Use Fedora's default soundfont instead of the removed one:
 Patch11:       %{name}-use-default-soundfont.patch
 
@@ -47,46 +48,20 @@ BuildRequires: alsa-lib-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libsndfile-devel >= 1.0.19
 BuildRequires: portaudio-devel
 BuildRequires: qt4-devel
 
-# Fonts related:
-BuildRequires: fontforge
-BuildRequires: fontpackages-devel
-BuildRequires: t1utils
-BuildRequires: texlive
-%if 0%{?fedora} >= 11
-BuildRequires: tex-cm-lgc
-%else
-BuildRequires: tetex-font-cm-lgc
-%endif
-
-# Fedora 10&11's libsndfile is too old :(
-%if 0%{?fedora} >= 12
-BuildRequires: libsndfile-devel >= 1.0.19
-%endif
-
-# fontpackages-1.21 has different behavior
-%if 0%{?fedora} >= 12
 Requires:      %{name}-fonts = %{version}-%{release}
-%else
-Requires:      %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
-%endif
+Requires:      soundfont2-default
+# For scripting
+Requires:      qtscriptbindings
+
 
 # Doxygen documentation is huge and it is for musescore development only. 
 # Hence we don't build it for now. Otherwise it needs:
 # BuildRequires: graphviz doxygen texlive-latex texlive-dvips
 
-# On Fedora < 11 there is no default soundfont
-%if 0%{?fedora} >= 11
-Requires:      soundfont2-default
-%else
-Requires:      PersonalCopy-Lite-soundfont
-%endif
-
-# For scripting
-Requires:      qtscriptbindings
-
 Provides:      musescore = %{name}-%{version}-%{release}
 
 %description
@@ -101,19 +76,22 @@ highlights:
     * Import and export of MusicXML and Standard MIDI Files (SMF)
     * Available in 12 languages
 
-# fontpackages-1.21 has different behavior
-%package %{fontpackagename}
+%package fonts
 Summary:       MuseScore fonts
 Group:         User Interface/X
 License:       GPL+ with exceptions and OFL
 Requires:      fontpackages-filesystem
-%if "%{fontpackagename}" == "fonts"
+BuildArch:     noarch
+BuildRequires: fontforge
+BuildRequires: fontpackages-devel
+BuildRequires: t1utils
+BuildRequires: texlive
+BuildRequires: tex-cm-lgc
 # Note: this line should be updated carefully on each update:
-Obsoletes:     mscore-mscore-fonts < 0.9.5-1
+Obsoletes:     mscore-mscore-fonts < 0.9.5-2
 Provides:      mscore-mscore-fonts = %{version}-%{release}
-%endif
 
-%description %{fontpackagename}
+%description fonts
 MuseScore is a free cross platform WYSIWYG music notation program.
 
 This package contains the musical notation fonts for use of MuseScore.
@@ -121,20 +99,19 @@ This package contains the musical notati
 %prep
 %setup -q 
 
-%if 0%{?fedora} < 11
-%patch10 -p1 -b .pclite.soundfont
-%else
 %patch11 -p1 -b .default.soundfont
-%endif
 %patch1 -p1 -b .noawlplugin
 %patch2 -p1 -b .separatecommon
+%patch3 -p1 -b .arm
 
 # Remove the precompiled binary
 rm mscore/rtf2html/rtf2html
 
+
+
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
-find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags} -fno-var-tracking-assignments|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags} -fno-var-tracking-assignments|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|scriptgen||' %{name}/CMakeLists.txt
@@ -153,11 +130,6 @@ rm -f %{name}/%{name}/fonts/*.ttf
 # Fix GenericName
 sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
 
-# Fedora 10&11's libsndfile is too old :(
-%if 0%{?fedora} < 12
-sed -i 's|HAS_AUDIOFILE TRUE|HAS_AUDIOFILE FALSE|' %{name}/CMakeLists.txt
-%endif
-
 # Disable rpath
 sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
 
@@ -166,7 +138,7 @@ sed -i '/rpath/d' %{name}/%{name}/CMakeL
 mkdir build
 pushd build
    export PATH=${PATH}:%{_libdir}/qt4/bin
-   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{optflags}" ../mscore
+   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{buildflags}" ../mscore
    make lupdate %{?_smp_flags}
    make lrelease %{?_smp_flags}
    make %{?_smp_flags} VERBOSE=1
@@ -266,14 +238,17 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/*
 
-# fontpackages-1.21 has different behavior
-%if "%{fontpackagename}" == "fonts"
 %_font_pkg %{fontfamilyname}*.ttf
-%else
-%_font_pkg -n %{fontfamilyname} %{fontfamilyname}*.ttf
-%endif
+
 
 %changelog
+* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
+- Add default soundfont support for exported audio files
+- Rebuild against new libsndfile for additional functionality
+- Drop F-10 related bits from specfile
+- Make fonts subpackage noarch
+- Fix build failure on arm architecture
+
 * Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
 - Update to 0.9.5
 


--- mscore-use-pclite-soundfont.patch DELETED ---



From peter at fedoraproject.org  Thu Dec 24 12:16:19 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 24 Dec 2009 12:16:19 +0000 (UTC)
Subject: rpms/ejabberd/F-11 .cvsignore, 1.15, 1.16 ejabberd.spec, 1.42,
	1.43 import.log, 1.15, 1.16 sources, 1.17,
	1.18 ejabberd-captcha-bashism.patch, 1.1,
	NONE ejabberd-http-poll-web-page.patch, 1.1,
	NONE ejabberd-piefxis-vhost-export.patch, 1.1,
	NONE ejabberd-vcard-reqs-forwarding.patch, 1.1, NONE
Message-ID: <20091224121619.F1E6211C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21719/F-11

Modified Files:
	.cvsignore ejabberd.spec import.log sources 
Removed Files:
	ejabberd-captcha-bashism.patch 
	ejabberd-http-poll-web-page.patch 
	ejabberd-piefxis-vhost-export.patch 
	ejabberd-vcard-reqs-forwarding.patch 
Log Message:
Ver. 2.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Nov 2009 08:04:46 -0000	1.15
+++ .cvsignore	24 Dec 2009 12:16:19 -0000	1.16
@@ -1 +1 @@
-ejabberd-2.1.0.tar.gz
+ejabberd-2.1.1.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- ejabberd.spec	10 Dec 2009 19:11:12 -0000	1.42
+++ ejabberd.spec	24 Dec 2009 12:16:19 -0000	1.43
@@ -11,8 +11,8 @@
 %endif
 
 Name:           ejabberd
-Version:        2.1.0
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -47,23 +47,8 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
 # fixed delays in s2s connections
 Patch8: ejabberd-fixed_delays_in_s2s.patch
-# captcha.sh uses some BASH-specific variables
-# see https://support.process-one.net/browse/EJAB-1105
-Patch9: ejabberd-captcha-bashism.patch
 # Introducing mod_admin_extra
 Patch10: ejabberd-mod_admin_extra.patch
-# Fixed long-standing bug with RFC 3920 violation
-# see https://support.process-one.net/browse/EJAB-1045
-Patch11: ejabberd-vcard-reqs-forwarding.patch
-# Generates a human-readable XHTML page which is returned
-# when a user tries to browse the HTTP-poll URL configured
-# for the server (a common mistake).
-# see https://support.process-one.net/browse/EJAB-1106
-Patch12: ejabberd-http-poll-web-page.patch
-# This patch enables generation of the main XML file
-# when exporting data of a virtual host into PIEFXIS format.
-# see https://support.process-one.net/browse/EJAB-1098
-Patch13: ejabberd-piefxis-vhost-export.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -177,11 +162,7 @@ fi
 %patch3 -p0 -b .pam_name
 %patch5 -p0 -b .mod_ctlextra
 %patch8 -p0 -b .s2s
-%patch9 -p1 -b .bashism
 %patch10 -p1 -b .mod_admin_extra
-%patch11 -p1 -b .vcard_rfc_violation
-%patch12 -p1 -b .xhtml
-%patch13 -p1 -b .piefxis
 
 dos2unix src/odbc/mssql2000.sql
 
@@ -346,11 +327,16 @@ rm -rf %{buildroot}
 %doc doc/release_notes_2.0.4.txt
 %doc doc/release_notes_2.0.5.txt
 %doc doc/release_notes_2.1.0.txt
+%doc doc/release_notes_2.1.1.txt
 %doc doc/webadmmain.png
 %doc doc/webadmmainru.png
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Dec 24 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.1-1
+- Ver. 2.1.1
+- Dropped patches 9,11,12,13 (accepted upstream)
+
 * Thu Dec 10 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-2
 - DB backups are made on every upgrade/uninstall
 - Fixed installation of captcha.sh example helper


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	10 Dec 2009 19:11:12 -0000	1.15
+++ import.log	24 Dec 2009 12:16:19 -0000	1.16
@@ -13,3 +13,4 @@ ejabberd-2_0_5-6_fc11:F-11:ejabberd-2.0.
 ejabberd-2_0_5-8_fc11:F-11:ejabberd-2.0.5-8.fc11.src.rpm:1252493180
 ejabberd-2_1_0-1_fc12:F-11:ejabberd-2.1.0-1.fc12.src.rpm:1258790645
 ejabberd-2_1_0-2_fc12:F-11:ejabberd-2.1.0-2.fc12.src.rpm:1260472235
+ejabberd-2_1_1-1_fc12:F-11:ejabberd-2.1.1-1.fc12.src.rpm:1261656564


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Nov 2009 08:04:48 -0000	1.17
+++ sources	24 Dec 2009 12:16:19 -0000	1.18
@@ -1 +1 @@
-373be6e99acf7c930ab85531489c63c4  ejabberd-2.1.0.tar.gz
+8a2b9925fc2790d0594a8d3b37183537  ejabberd-2.1.1.tar.gz


--- ejabberd-captcha-bashism.patch DELETED ---


--- ejabberd-http-poll-web-page.patch DELETED ---


--- ejabberd-piefxis-vhost-export.patch DELETED ---


--- ejabberd-vcard-reqs-forwarding.patch DELETED ---



From twaugh at fedoraproject.org  Thu Dec 24 12:32:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 24 Dec 2009 12:32:59 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.571,1.572
Message-ID: <20091224123259.C3C0011C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23934

Modified Files:
	cups.spec 
Log Message:
* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-22
- Removed use of prereq and buildprereq.
- Fixed use of '%' in changelog.
- Versioned explicit obsoletes/provides.
- Use tabs throughout.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -p -r1.571 -r1.572
--- cups.spec	23 Dec 2009 11:19:51 -0000	1.571
+++ cups.spec	24 Dec 2009 12:32:59 -0000	1.572
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -82,16 +82,16 @@ Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-PreReq: /sbin/chkconfig /sbin/service
+Requires: /sbin/chkconfig /sbin/service
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 %if %use_alternatives
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
-Prereq: /usr/sbin/alternatives
+Requires: /usr/sbin/alternatives
 %endif
 
 # Unconditionally obsolete LPRng so that upgrades work properly.
-Obsoletes: lpd lpr LPRng <= 3.8.15-3
-Provides: lpd lpr
+Obsoletes: lpd <= 3.8.15, lpr <= 3.8.15-3, LPRng <= 3.8.15-3
+Provides: lpd = 3.8.15-4, lpr = 3.8.15-4
 
 Obsoletes: cupsddk < 1.2.3-7
 Provides: cupsddk = 1.2.3-7
@@ -101,8 +101,8 @@ Provides: cupsddk-drivers = 1.2.3-7
 # kdelibs conflict for bug #192585.
 Conflicts: kdelibs < 6:3.5.2-6
 
-BuildPrereq: pam-devel pkgconfig
-BuildPrereq: gnutls-devel libacl-devel
+BuildRequires: pam-devel pkgconfig
+BuildRequires: gnutls-devel libacl-devel
 BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
 BuildRequires: php-devel, pcre-devel
@@ -114,14 +114,14 @@ BuildRequires: avahi-devel
 BuildRequires: poppler-utils
 
 %if %lspp
-BuildPrereq: libselinux-devel >= 1.23
-BuildPrereq: audit-libs-devel >= 1.1
+BuildRequires: libselinux-devel >= 1.23
+BuildRequires: audit-libs-devel >= 1.1
 %endif
 
 # -fstack-protector-all requires GCC 4.0.1
 BuildRequires: gcc >= 4.0.1
 
-BuildPrereq: dbus-devel >= 0.90
+BuildRequires: dbus-devel >= 0.90
 Requires: dbus >= 0.90
 
 # Requires tmpwatch for the cron.daily script (bug #218901).
@@ -408,7 +408,7 @@ if [ "$1" = "0" ]; then
 	/sbin/service cups stop > /dev/null 2>&1
 	/sbin/chkconfig --del cups
 %if %use_alternatives
-        /usr/sbin/alternatives --remove print %{_bindir}/lpr.cups
+	/usr/sbin/alternatives --remove print %{_bindir}/lpr.cups
 %endif
 fi
 exit 0
@@ -543,6 +543,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-22
+- Removed use of prereq and buildprereq.
+- Fixed use of '%%' in changelog.
+- Versioned explicit obsoletes/provides.
+- Use tabs throughout.
+
 * Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-21
 - Fixed patch for STR #3425 again by adding in back-ported change from
   svn revision 8929 (bug #549899).  No longer need
@@ -2048,7 +2054,7 @@ rm -rf $RPM_BUILD_ROOT
 - Start cupsd before nfs server processes (bug #97767).
 
 * Tue Jun 17 2003 Tim Waugh <twaugh at redhat.com> 1:1.1.19-7
-- Add some %if %use_dbus / %endif's to make it compile without dbus
+- Add some %%if %%use_dbus / %%endif's to make it compile without dbus
   (bug #97397).  Patch from Jos Vos.
 
 * Mon Jun 16 2003 Tim Waugh <twaugh at redhat.com> 1:1.1.19-6
@@ -2267,8 +2273,8 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Feb 28 2002 Bill Nottingham <notting at redhat.com> 1.1.14-7
 - lpc man page is alternative too
-- run ldconfig in -libs %post/%postun, not main
-- remove alternatives in %preun
+- run ldconfig in -libs %%post/%%postun, not main
+- remove alternatives in %%preun
 
 * Wed Feb 27 2002 Bill Nottingham <notting at redhat.com> 1.1.14-6
 - don't source /etc/sysconfig/network in cups.init, we don't use any
@@ -2360,7 +2366,7 @@ rm -rf $RPM_BUILD_ROOT
 - rebuilt against libpng-1.0.8
 
 * Tue Aug 01 2000 Than Ngo <than at redhat.de>
-- fix permission, add missing ldconfig in %post and %postun (Bug #14963)
+- fix permission, add missing ldconfig in %%post and %%postun (Bug #14963)
 
 * Sat Jul 29 2000 Bernhard Rosenkraenzer <bero at redhat.com>
 - 1.1.1 (this has some major bugfixes)



From twaugh at fedoraproject.org  Thu Dec 24 12:34:27 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 24 Dec 2009 12:34:27 +0000 (UTC)
Subject: rpms/ghostscript/devel ghostscript.spec,1.195,1.196
Message-ID: <20091224123427.492D811C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24505

Modified Files:
	ghostscript.spec 
Log Message:
* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 8.70-3
- Don't ship libtool la files (bug #542674).



Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- ghostscript.spec	24 Dec 2009 11:31:50 -0000	1.195
+++ ghostscript.spec	24 Dec 2009 12:34:27 -0000	1.196
@@ -233,8 +233,9 @@ install -m0644 %{SOURCE4} $RPM_BUILD_ROO
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/ghostscript
 install -m0644 base/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 
-# Don't ship pkgconfig files.
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc
+# Don't ship pkgconfig or libtool la files.
+rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc \
+	$RPM_BUILD_ROOT%{_libdir}/libijs.la
 
 # Don't ship ijs example client or server
 rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_{client,server}_example
@@ -313,11 +314,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/ijs/*
 %{_bindir}/ijs-config
 %{_libdir}/libijs.so
-%{_libdir}/libijs.*a
+%{_libdir}/libijs.a
 %{_libdir}/libgs.so
 
 %changelog
 * Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 8.70-3
+- Don't ship libtool la files (bug #542674).
 - Fix debugging output from gdevcups (CVE-2009-4270, bug #540760).
 - Harden ghostscript's debugging output functions (bug #540760).
 



From oget at fedoraproject.org  Thu Dec 24 12:39:00 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 12:39:00 +0000 (UTC)
Subject: rpms/mscore/devel mscore.spec,1.6,1.7
Message-ID: <20091224123900.30A6411C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25191

Modified Files:
	mscore.spec 
Log Message:
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-3
- Fix build flags on F-11



Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mscore.spec	24 Dec 2009 12:05:31 -0000	1.6
+++ mscore.spec	24 Dec 2009 12:39:00 -0000	1.7
@@ -9,7 +9,7 @@
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       0.9.5
-Release:       2%{?dist}
+Release:       3%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -110,8 +110,8 @@ rm mscore/rtf2html/rtf2html
 
 
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags} -fno-var-tracking-assignments|' {} \;
-find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags} -fno-var-tracking-assignments|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags}|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|scriptgen||' %{name}/CMakeLists.txt
@@ -242,6 +242,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-3
+- Fix build flags on F-11
+
 * Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
 - Add default soundfont support for exported audio files
 - Rebuild against new libsndfile for additional functionality



From oget at fedoraproject.org  Thu Dec 24 12:39:39 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 12:39:39 +0000 (UTC)
Subject: rpms/mscore/F-12 mscore.spec,1.6,1.7
Message-ID: <20091224123939.53BCD11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25408

Modified Files:
	mscore.spec 
Log Message:
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-3
- Fix build flags on F-11



Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-12/mscore.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mscore.spec	24 Dec 2009 12:08:19 -0000	1.6
+++ mscore.spec	24 Dec 2009 12:39:39 -0000	1.7
@@ -9,7 +9,7 @@
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       0.9.5
-Release:       2%{?dist}
+Release:       3%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -110,8 +110,8 @@ rm mscore/rtf2html/rtf2html
 
 
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags} -fno-var-tracking-assignments|' {} \;
-find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags} -fno-var-tracking-assignments|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags}|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|scriptgen||' %{name}/CMakeLists.txt
@@ -242,6 +242,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-3
+- Fix build flags on F-11
+
 * Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
 - Add default soundfont support for exported audio files
 - Rebuild against new libsndfile for additional functionality



From oget at fedoraproject.org  Thu Dec 24 12:40:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 24 Dec 2009 12:40:06 +0000 (UTC)
Subject: rpms/mscore/F-11 mscore.spec,1.4,1.5
Message-ID: <20091224124006.742FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25595

Modified Files:
	mscore.spec 
Log Message:
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-3
- Fix build flags on F-11



Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mscore.spec	24 Dec 2009 12:09:30 -0000	1.4
+++ mscore.spec	24 Dec 2009 12:40:06 -0000	1.5
@@ -9,7 +9,7 @@
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       0.9.5
-Release:       2%{?dist}
+Release:       3%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -110,8 +110,8 @@ rm mscore/rtf2html/rtf2html
 
 
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags} -fno-var-tracking-assignments|' {} \;
-find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags} -fno-var-tracking-assignments|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags}|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|scriptgen||' %{name}/CMakeLists.txt
@@ -242,6 +242,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-3
+- Fix build flags on F-11
+
 * Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
 - Add default soundfont support for exported audio files
 - Rebuild against new libsndfile for additional functionality



From hadess at fedoraproject.org  Thu Dec 24 13:03:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 24 Dec 2009 13:03:18 +0000 (UTC)
Subject: rpms/gstreamer/F-12 gstreamer-vis-stop.patch, NONE, 1.1 gstreamer.spec,
	1.111, 1.112
Message-ID: <20091224130318.7029511C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28322

Modified Files:
	gstreamer.spec 
Added Files:
	gstreamer-vis-stop.patch 
Log Message:
* Thu Dec 24 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25.1-3
- Fix visualisations hanging when seeking


gstreamer-vis-stop.patch:
 gstbin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gstreamer-vis-stop.patch ---
commit f44d8c31de98a1521be1092f163a987eff0fd799
Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Fri Dec 11 16:26:00 2009 +0100

    bin: never skip a state change to PLAYING
    
    Never skip the state change to playing, even if the element is already in the
    right state. We need this because we also distribute the base_time while doing
    the state change and skipping this step would leave some elements without a new
    base_time.
    
    Fixes #600313

diff --git a/gst/gstbin.c b/gst/gstbin.c
index cef35b9..039aca1 100644
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -2073,7 +2073,7 @@ gst_bin_element_set_state (GstBin * bin, GstElement * element,
 
   /* Try not to change the state of elements that are already in the state we're
    * going to */
-  if (!(child_pending != GST_STATE_VOID_PENDING ||
+  if (!(next == GST_STATE_PLAYING || child_pending != GST_STATE_VOID_PENDING ||
           (child_pending == GST_STATE_VOID_PENDING &&
               ((pending > child_current && next > child_current) ||
                   (pending < child_current && next < child_current)))))


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-12/gstreamer.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- gstreamer.spec	30 Nov 2009 14:54:48 -0000	1.111
+++ gstreamer.spec	24 Dec 2009 13:03:17 -0000	1.112
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.25.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -46,6 +46,8 @@ Source1:	gstreamer.prov
 Source2:	macros.gstreamer
 # https://bugzilla.gnome.org/show_bug.cgi?id=595958
 Patch2:		0001-basesink-fix-position-reporting.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=600313
+Patch3:		gstreamer-vis-stop.patch
 
 ### documentation requirements
 BuildRequires:  python2
@@ -113,6 +115,7 @@ with different major/minor versions of G
 
 %patch1 -p1 -b .rpm-provides
 %patch2 -p1 -b .stepping-position
+%patch3 -p1 -b .vis-stop
 
 %build
 # 0.10.0: manuals do not build due to an openjade error; disable for now
@@ -223,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Thu Dec 24 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25.1-3
+- Fix visualisations hanging when seeking
+
 * Mon Nov 30 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25.1-2
 - Fix position reporting when using stepping
 



From mtasaka at fedoraproject.org  Thu Dec 24 13:07:37 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 24 Dec 2009 13:07:37 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.418, 1.419 jd.spec, 1.482, 1.483 sources, 
	1.419, 1.420
Message-ID: <20091224130737.0ECC011C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29139

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Dec 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3257



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- .cvsignore	20 Dec 2009 14:47:07 -0000	1.418
+++ .cvsignore	24 Dec 2009 13:07:36 -0000	1.419
@@ -1 +1 @@
-jd-2.5.5-beta091220.tgz
+jd-2.5.5-svn3257_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -p -r1.482 -r1.483
--- jd.spec	20 Dec 2009 14:47:07 -0000	1.482
+++ jd.spec	24 Dec 2009 13:07:36 -0000	1.483
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        beta091220
+%define         strtag        svn3257_trunk
 %define         repoid        44986
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Dec 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3257
+
 * Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
 - 2.5.5 beta 091220
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -p -r1.419 -r1.420
--- sources	20 Dec 2009 14:47:07 -0000	1.419
+++ sources	24 Dec 2009 13:07:36 -0000	1.420
@@ -1 +1 @@
-3f2c9e853bfde93d963a1d3ca54cb945  jd-2.5.5-beta091220.tgz
+7a9fe5c0fb630d7b9777ad5d5d7fcb7e  jd-2.5.5-svn3257_trunk.tgz



From tmz at fedoraproject.org  Thu Dec 24 13:35:52 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Thu, 24 Dec 2009 13:35:52 +0000 (UTC)
Subject: File git-1.6.6.tar.bz2 uploaded to lookaside cache by tmz
Message-ID: <20091224133552.CC17C10F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for git:

25e4bcdc528b3ffadc6e59908a513881  git-1.6.6.tar.bz2



From tmz at fedoraproject.org  Thu Dec 24 13:38:48 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Thu, 24 Dec 2009 13:38:48 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.87, 1.88 git.spec, 1.102, 1.103 sources, 
	1.87, 1.88
Message-ID: <20091224133848.12B6111C00E6@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv480

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	7 Dec 2009 15:11:59 -0000	1.87
+++ .cvsignore	24 Dec 2009 13:38:47 -0000	1.88
@@ -1 +1 @@
-git-1.6.5.5.tar.bz2
+git-1.6.6.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- git.spec	7 Dec 2009 15:11:59 -0000	1.102
+++ git.spec	24 Dec 2009 13:38:47 -0000	1.103
@@ -6,7 +6,7 @@
 %endif
 
 Name:           git
-Version:        1.6.5.5
+Version:        1.6.6
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -427,6 +427,12 @@ rm -rf %{buildroot}
 # No files for you!
 
 %changelog
+* Wed Dec 23 2009 Todd Zullinger <tmz at pobox.com> - 1.6.6-1
+- git-1.6.6
+
+* Fri Dec 11 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.6-1
+- git-1.6.5.6
+
 * Sun Dec 06 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.5-1
 - git-1.6.5.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	7 Dec 2009 15:11:59 -0000	1.87
+++ sources	24 Dec 2009 13:38:47 -0000	1.88
@@ -1 +1 @@
-fd575f22e67adbea1d17e5bc66a80f8d  git-1.6.5.5.tar.bz2
+25e4bcdc528b3ffadc6e59908a513881  git-1.6.6.tar.bz2



From twaugh at fedoraproject.org  Thu Dec 24 14:04:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 24 Dec 2009 14:04:59 +0000 (UTC)
Subject: rpms/patch/F-12 patch-best-name.patch,NONE,1.1 patch.spec,1.41,1.42
Message-ID: <20091224140459.B36B911C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/patch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3823

Modified Files:
	patch.spec 
Added Files:
	patch-best-name.patch 
Log Message:
* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 2.6-2
- Applied upstream patch to prevent incorrect filename being chosen
  when adding a new file (bug #549122).


patch-best-name.patch:
 pch.c |   39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

--- NEW FILE patch-best-name.patch ---
--- patch-2.6/src/pch.c	2009-11-02 19:09:57.000000000 +0000
+++ patch-2.6-4-ge2218ac/src/pch.c	2009-12-22 23:03:27.000000000 +0000
@@ -195,23 +195,22 @@
 }
 
 static bool
-maybe_reverse (char const *name, bool nonexistent, bool empty)
+maybe_reverse (char const *name, bool nonexistent, bool is_empty)
 {
-  bool is_empty = nonexistent || empty;
-  bool r;
+  bool looks_reversed = (! is_empty) < p_says_nonexistent[reverse ^ is_empty];
 
-  r = (! is_empty) < p_says_nonexistent[reverse ^ is_empty]
-      && ok_to_reverse ("The next patch%s would %s the file %s,\nwhich %s!",
-			reverse ? ", when reversed," : "",
-			(nonexistent ? "delete"
-			 : empty ? "empty out"
-			 : "create"),
-			quotearg (name),
-			(nonexistent ? "does not exist"
-			 : empty ? "is already empty"
-			 : "already exists"));
-  reverse ^= r;
-  return r;
+  if (looks_reversed)
+    reverse ^=
+      ok_to_reverse ("The next patch%s would %s the file %s,\nwhich %s!",
+		     reverse ? ", when reversed," : "",
+		     (nonexistent ? "delete"
+		      : is_empty ? "empty out"
+		      : "create"),
+		     quotearg (name),
+		     (nonexistent ? "does not exist"
+		      : is_empty ? "is already empty"
+		      : "already exists"));
+  return looks_reversed;
 }
 
 /* True if the remainder of the patch file contains a diff of some sort. */
@@ -638,6 +637,7 @@
 
 	if (! posixly_correct)
 	  {
+	    /* The best of all existing files. */
 	    i = best_name (p_name, stat_errno);
 
 	    if (i == NONE && patch_get)
@@ -680,12 +680,10 @@
 		    }
 	      }
 
-	    if (i != NONE && st[i].st_size > 0)
-	      i0 = i;
 	    if (i0 != NONE
-		&& ! maybe_reverse (p_name[i0], i == NONE,
-				    i == NONE || st[i].st_size == 0))
-	      i = i0;
+	        && maybe_reverse (p_name[i0], i == NONE,
+				  i == NONE || st[i].st_size == 0))
+		i = i0;
 
 	    if (i == NONE && p_says_nonexistent[reverse])
 	      {
@@ -706,6 +704,7 @@
 		  if (p_name[i])
 		    distance_from_minimum[i] = newdirs[i] - newdirs_min;
 
+		/* The best of the filenames which create the fewest directories. */
 		i = best_name (p_name, distance_from_minimum);
 	      }
 	  }


Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-12/patch.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- patch.spec	16 Nov 2009 17:08:44 -0000	1.41
+++ patch.spec	24 Dec 2009 14:04:58 -0000	1.42
@@ -1,12 +1,13 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
 Patch1: patch-2.5.4-sigsegv.patch
+Patch2: patch-best-name.patch
 Patch100: patch-selinux.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +26,7 @@ applications.
 %prep
 %setup -q
 %patch1 -p1 -b .sigsegv
+%patch2 -p1 -b .best-name
 %patch100 -p1 -b .selinux
 
 %build
@@ -55,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 2.6-2
+- Applied upstream patch to prevent incorrect filename being chosen
+  when adding a new file (bug #549122).
+
 * Mon Nov 16 2009 Tim Waugh <twaugh at redhat.com> 2.6-1
 - 2.6.  No longer need stderr, suffix, stripcr, parse, allow-spaces,
   ifdef, program_name, or posix-backup patches.



From twaugh at fedoraproject.org  Thu Dec 24 14:05:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 24 Dec 2009 14:05:43 +0000 (UTC)
Subject: rpms/patch/F-11 patch-best-name.patch,NONE,1.1 patch.spec,1.40,1.41
Message-ID: <20091224140543.153CC11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/patch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4059

Modified Files:
	patch.spec 
Added Files:
	patch-best-name.patch 
Log Message:
* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 2.6-2
- Applied upstream patch to prevent incorrect filename being chosen
  when adding a new file (bug #549122).


patch-best-name.patch:
 pch.c |   39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

--- NEW FILE patch-best-name.patch ---
--- patch-2.6/src/pch.c	2009-11-02 19:09:57.000000000 +0000
+++ patch-2.6-4-ge2218ac/src/pch.c	2009-12-22 23:03:27.000000000 +0000
@@ -195,23 +195,22 @@
 }
 
 static bool
-maybe_reverse (char const *name, bool nonexistent, bool empty)
+maybe_reverse (char const *name, bool nonexistent, bool is_empty)
 {
-  bool is_empty = nonexistent || empty;
-  bool r;
+  bool looks_reversed = (! is_empty) < p_says_nonexistent[reverse ^ is_empty];
 
-  r = (! is_empty) < p_says_nonexistent[reverse ^ is_empty]
-      && ok_to_reverse ("The next patch%s would %s the file %s,\nwhich %s!",
-			reverse ? ", when reversed," : "",
-			(nonexistent ? "delete"
-			 : empty ? "empty out"
-			 : "create"),
-			quotearg (name),
-			(nonexistent ? "does not exist"
-			 : empty ? "is already empty"
-			 : "already exists"));
-  reverse ^= r;
-  return r;
+  if (looks_reversed)
+    reverse ^=
+      ok_to_reverse ("The next patch%s would %s the file %s,\nwhich %s!",
+		     reverse ? ", when reversed," : "",
+		     (nonexistent ? "delete"
+		      : is_empty ? "empty out"
+		      : "create"),
+		     quotearg (name),
+		     (nonexistent ? "does not exist"
+		      : is_empty ? "is already empty"
+		      : "already exists"));
+  return looks_reversed;
 }
 
 /* True if the remainder of the patch file contains a diff of some sort. */
@@ -638,6 +637,7 @@
 
 	if (! posixly_correct)
 	  {
+	    /* The best of all existing files. */
 	    i = best_name (p_name, stat_errno);
 
 	    if (i == NONE && patch_get)
@@ -680,12 +680,10 @@
 		    }
 	      }
 
-	    if (i != NONE && st[i].st_size > 0)
-	      i0 = i;
 	    if (i0 != NONE
-		&& ! maybe_reverse (p_name[i0], i == NONE,
-				    i == NONE || st[i].st_size == 0))
-	      i = i0;
+	        && maybe_reverse (p_name[i0], i == NONE,
+				  i == NONE || st[i].st_size == 0))
+		i = i0;
 
 	    if (i == NONE && p_says_nonexistent[reverse])
 	      {
@@ -706,6 +704,7 @@
 		  if (p_name[i])
 		    distance_from_minimum[i] = newdirs[i] - newdirs_min;
 
+		/* The best of the filenames which create the fewest directories. */
 		i = best_name (p_name, distance_from_minimum);
 	      }
 	  }


Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-11/patch.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- patch.spec	16 Nov 2009 17:34:38 -0000	1.40
+++ patch.spec	24 Dec 2009 14:05:42 -0000	1.41
@@ -1,12 +1,13 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
 Patch1: patch-2.5.4-sigsegv.patch
+Patch2: patch-best-name.patch
 Patch100: patch-selinux.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +26,7 @@ applications.
 %prep
 %setup -q
 %patch1 -p1 -b .sigsegv
+%patch2 -p1 -b .best-name
 %patch100 -p1 -b .selinux
 
 %build
@@ -55,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 2.6-2
+- Applied upstream patch to prevent incorrect filename being chosen
+  when adding a new file (bug #549122).
+
 * Mon Nov 16 2009 Tim Waugh <twaugh at redhat.com> 2.6-1
 - 2.6.  No longer need stderr, suffix, stripcr, parse, allow-spaces,
   ifdef, program_name, or posix-backup patches.



From twaugh at fedoraproject.org  Thu Dec 24 14:06:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 24 Dec 2009 14:06:35 +0000 (UTC)
Subject: rpms/patch/devel patch-best-name.patch,NONE,1.1 patch.spec,1.41,1.42
Message-ID: <20091224140635.4DFF311C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4348

Modified Files:
	patch.spec 
Added Files:
	patch-best-name.patch 
Log Message:
* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 2.6-2
- Applied upstream patch to prevent incorrect filename being chosen
  when adding a new file (bug #549122).


patch-best-name.patch:
 pch.c |   39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

--- NEW FILE patch-best-name.patch ---
--- patch-2.6/src/pch.c	2009-11-02 19:09:57.000000000 +0000
+++ patch-2.6-4-ge2218ac/src/pch.c	2009-12-22 23:03:27.000000000 +0000
@@ -195,23 +195,22 @@
 }
 
 static bool
-maybe_reverse (char const *name, bool nonexistent, bool empty)
+maybe_reverse (char const *name, bool nonexistent, bool is_empty)
 {
-  bool is_empty = nonexistent || empty;
-  bool r;
+  bool looks_reversed = (! is_empty) < p_says_nonexistent[reverse ^ is_empty];
 
-  r = (! is_empty) < p_says_nonexistent[reverse ^ is_empty]
-      && ok_to_reverse ("The next patch%s would %s the file %s,\nwhich %s!",
-			reverse ? ", when reversed," : "",
-			(nonexistent ? "delete"
-			 : empty ? "empty out"
-			 : "create"),
-			quotearg (name),
-			(nonexistent ? "does not exist"
-			 : empty ? "is already empty"
-			 : "already exists"));
-  reverse ^= r;
-  return r;
+  if (looks_reversed)
+    reverse ^=
+      ok_to_reverse ("The next patch%s would %s the file %s,\nwhich %s!",
+		     reverse ? ", when reversed," : "",
+		     (nonexistent ? "delete"
+		      : is_empty ? "empty out"
+		      : "create"),
+		     quotearg (name),
+		     (nonexistent ? "does not exist"
+		      : is_empty ? "is already empty"
+		      : "already exists"));
+  return looks_reversed;
 }
 
 /* True if the remainder of the patch file contains a diff of some sort. */
@@ -638,6 +637,7 @@
 
 	if (! posixly_correct)
 	  {
+	    /* The best of all existing files. */
 	    i = best_name (p_name, stat_errno);
 
 	    if (i == NONE && patch_get)
@@ -680,12 +680,10 @@
 		    }
 	      }
 
-	    if (i != NONE && st[i].st_size > 0)
-	      i0 = i;
 	    if (i0 != NONE
-		&& ! maybe_reverse (p_name[i0], i == NONE,
-				    i == NONE || st[i].st_size == 0))
-	      i = i0;
+	        && maybe_reverse (p_name[i0], i == NONE,
+				  i == NONE || st[i].st_size == 0))
+		i = i0;
 
 	    if (i == NONE && p_says_nonexistent[reverse])
 	      {
@@ -706,6 +704,7 @@
 		  if (p_name[i])
 		    distance_from_minimum[i] = newdirs[i] - newdirs_min;
 
+		/* The best of the filenames which create the fewest directories. */
 		i = best_name (p_name, distance_from_minimum);
 	      }
 	  }


Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/patch.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- patch.spec	16 Nov 2009 10:05:01 -0000	1.41
+++ patch.spec	24 Dec 2009 14:06:35 -0000	1.42
@@ -1,12 +1,13 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
 Patch1: patch-2.5.4-sigsegv.patch
+Patch2: patch-best-name.patch
 Patch100: patch-selinux.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +26,7 @@ applications.
 %prep
 %setup -q
 %patch1 -p1 -b .sigsegv
+%patch2 -p1 -b .best-name
 %patch100 -p1 -b .selinux
 
 %build
@@ -55,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 2.6-2
+- Applied upstream patch to prevent incorrect filename being chosen
+  when adding a new file (bug #549122).
+
 * Mon Nov 16 2009 Tim Waugh <twaugh at redhat.com> 2.6-1
 - 2.6.  No longer need stderr, suffix, stripcr, parse, allow-spaces,
   ifdef, program_name, or posix-backup patches.



From pkgdb at fedoraproject.org  Thu Dec 24 14:19:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:19:29 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224141928.DBCBC10F8CB@bastion.fedoraproject.org>

ertzing has set the watchbugzilla acl on mcs (Fedora devel) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:19:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:19:31 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224141930.B387810F8CB@bastion.fedoraproject.org>

ertzing has set the watchcommits acl on mcs (Fedora devel) to Obsolete for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:19:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:19:33 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224141932.96B3010F8CD@bastion.fedoraproject.org>

ertzing has set the watchcommits acl on mcs (Fedora devel) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:19:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:19:36 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224141935.4FE9110F8D0@bastion.fedoraproject.org>

ertzing has set the commit acl on mcs (Fedora devel) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:19:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:19:36 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224141937.9DF2D10F8D2@bastion.fedoraproject.org>

ertzing has set the approveacls acl on mcs (Fedora devel) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:19:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:19:42 +0000
Subject: [pkgdb] mcs ownership updated
Message-ID: <20091224141942.1632610F8D5@bastion.fedoraproject.org>

Package mcs in Fedora devel is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:19:55 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224141957.2A51110F8D5@bastion.fedoraproject.org>

ertzing has set the watchbugzilla acl on mcs (Fedora 10) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:16 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142002.4894210F8D8@bastion.fedoraproject.org>

ertzing has set the watchcommits acl on mcs (Fedora 10) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:04 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142003.EDBFF10F8D8@bastion.fedoraproject.org>

ertzing has set the commit acl on mcs (Fedora 10) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:06 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142006.7B08A10F8D8@bastion.fedoraproject.org>

ertzing has set the approveacls acl on mcs (Fedora 10) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:10 +0000
Subject: [pkgdb] mcs ownership updated
Message-ID: <20091224142009.3C32C10F8DC@bastion.fedoraproject.org>

Package mcs in Fedora 10 is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:36 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142021.8AA8110F8E0@bastion.fedoraproject.org>

ertzing has set the watchbugzilla acl on mcs (Fedora 11) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:23 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142023.8588810F8E3@bastion.fedoraproject.org>

ertzing has set the watchcommits acl on mcs (Fedora 11) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:44 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142029.D655010F8D0@bastion.fedoraproject.org>

ertzing has set the commit acl on mcs (Fedora 11) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:31 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142030.E803E10F8DF@bastion.fedoraproject.org>

ertzing has set the approveacls acl on mcs (Fedora 11) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:33 +0000
Subject: [pkgdb] mcs ownership updated
Message-ID: <20091224142033.36B1E10F8E2@bastion.fedoraproject.org>

Package mcs in Fedora 11 is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:37 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142038.89B2910F8E3@bastion.fedoraproject.org>

ertzing has set the watchbugzilla acl on mcs (Fedora 12) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:41 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142041.080BD10F8E3@bastion.fedoraproject.org>

ertzing has set the watchcommits acl on mcs (Fedora 12) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:43 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142043.4C43610F8E3@bastion.fedoraproject.org>

ertzing has set the commit acl on mcs (Fedora 12) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:46 +0000
Subject: [pkgdb] mcs had acl change status
Message-ID: <20091224142045.5064110F8E3@bastion.fedoraproject.org>

ertzing has set the approveacls acl on mcs (Fedora 12) to Approved for mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From pkgdb at fedoraproject.org  Thu Dec 24 14:20:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 14:20:46 +0000
Subject: [pkgdb] mcs ownership updated
Message-ID: <20091224142047.5727B10F8E4@bastion.fedoraproject.org>

Package mcs in Fedora 12 is now owned by mschwendt

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mcs



From kyle at fedoraproject.org  Thu Dec 24 16:16:13 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 24 Dec 2009 16:16:13 +0000 (UTC)
Subject: rpms/kernel/F-11 fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch, NONE, 
	1.1 kernel.spec, 1.1783, 1.1784
Message-ID: <20091224161613.AFA1C11C00CF@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22403

Modified Files:
	kernel.spec 
Added Files:
	fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch 
Log Message:
* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-105
- fuse: fix kunmap in fuse_ioctl_copy_user, #549400


fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch:
 file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch ---
From: Jens Axboe <jens.axboe at oracle.com>
Date: Tue, 3 Nov 2009 10:40:44 +0000 (+0100)
Subject: fuse: fix kunmap in fuse_ioctl_copy_user
X-Git-Tag: v2.6.32-rc7~67^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0bd87182d3ab18a32a8e9175d3f68754c58e3432

fuse: fix kunmap in fuse_ioctl_copy_user

Looks like another victim of the confusing kmap() vs kmap_atomic() API
differences.

Reported-by: Todor Gyumyushev <yodor1 at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Tejun Heo <tj at kernel.org>
Cc: stable at kernel.org
---

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 5887a63..c18913a 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1600,7 +1600,7 @@ static int fuse_ioctl_copy_user(struct page **pages, struct iovec *iov,
 			kaddr += copy;
 		}
 
-		kunmap(map);
+		kunmap(page);
 	}
 
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1783
retrieving revision 1.1784
diff -u -p -r1.1783 -r1.1784
--- kernel.spec	9 Dec 2009 01:28:18 -0000	1.1783
+++ kernel.spec	24 Dec 2009 16:16:11 -0000	1.1784
@@ -841,6 +841,9 @@ Patch16470: sata_nv-use-hardreset-only-f
 # rhbz#538734 (CVE-tbd) [f60311d5f7670d9539b424e4ed8b5c0872fc9e83]
 Patch16471: fuse-prevent-fuse_put_request-in-invalid-ptr.patch
 
+# rhbz#549400 [0bd87182d3ab18a32a8e9175d3f68754c58e3432]
+Patch16472: fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1580,6 +1583,9 @@ ApplyPatch sata_nv-make-sure-link-is-bro
 
 ApplyPatch fuse-prevent-fuse_put_request-in-invalid-ptr.patch
 
+# rhbz#549400 [0bd87182d3ab18a32a8e9175d3f68754c58e3432]
+ApplyPatch fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2168,6 +2174,9 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-105
+- fuse: fix kunmap in fuse_ioctl_copy_user, #549400
+
 * Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.10-104
 - Copy fix for #540580 from F-12.
 



From llaumgui at fedoraproject.org  Thu Dec 24 16:32:02 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:32:02 +0000 (UTC)
Subject: File Feed-1.3.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091224163202.9A6D410F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-ezc-Feed:

cd9af03a7b7ac3fe4c865a935d378af3  Feed-1.3.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:34:19 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:34:19 +0000 (UTC)
Subject: rpms/php-ezc-Feed/F-11 .cvsignore, 1.2, 1.3 php-ezc-Feed.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091224163419.A232C11C00CF@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Feed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25166/F-11

Modified Files:
	.cvsignore php-ezc-Feed.spec sources 
Log Message:
Upstream 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Aug 2009 09:24:30 -0000	1.2
+++ .cvsignore	24 Dec 2009 16:34:19 -0000	1.3
@@ -1 +1 @@
-Feed-1.2.1.tgz
+Feed-1.3.tgz


Index: php-ezc-Feed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-11/php-ezc-Feed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-Feed.spec	23 Aug 2009 09:24:30 -0000	1.1
+++ php-ezc-Feed.spec	24 Dec 2009 16:34:19 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Feed
-Version:        1.2.1
+Version:        1.3
 Release:        1%{?dist}
 Summary:        This component handles parsing and creating RSS1, RSS2 and ATOM feeds
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.1.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -31,8 +31,8 @@ support for different feed modules (dc, 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -43,23 +43,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -84,5 +84,8 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3-1
+- Upstream 1.3
+
 * Tue Jul 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.1-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Aug 2009 09:24:30 -0000	1.2
+++ sources	24 Dec 2009 16:34:19 -0000	1.3
@@ -1 +1 @@
-1e707631a20b2a393c87d594a89dd685  Feed-1.2.1.tgz
+cd9af03a7b7ac3fe4c865a935d378af3  Feed-1.3.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:34:19 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:34:19 +0000 (UTC)
Subject: rpms/php-ezc-Feed/F-12 .cvsignore, 1.2, 1.3 php-ezc-Feed.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091224163419.B657011C018B@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Feed/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25166/F-12

Modified Files:
	.cvsignore php-ezc-Feed.spec sources 
Log Message:
Upstream 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Aug 2009 09:24:22 -0000	1.2
+++ .cvsignore	24 Dec 2009 16:34:19 -0000	1.3
@@ -1 +1 @@
-Feed-1.2.1.tgz
+Feed-1.3.tgz


Index: php-ezc-Feed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-12/php-ezc-Feed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-Feed.spec	23 Aug 2009 09:24:22 -0000	1.1
+++ php-ezc-Feed.spec	24 Dec 2009 16:34:19 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Feed
-Version:        1.2.1
+Version:        1.3
 Release:        1%{?dist}
 Summary:        This component handles parsing and creating RSS1, RSS2 and ATOM feeds
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.1.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -31,8 +31,8 @@ support for different feed modules (dc, 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -43,23 +43,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -84,5 +84,8 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3-1
+- Upstream 1.3
+
 * Tue Jul 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.1-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Aug 2009 09:24:22 -0000	1.2
+++ sources	24 Dec 2009 16:34:19 -0000	1.3
@@ -1 +1 @@
-1e707631a20b2a393c87d594a89dd685  Feed-1.2.1.tgz
+cd9af03a7b7ac3fe4c865a935d378af3  Feed-1.3.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:34:19 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:34:19 +0000 (UTC)
Subject: rpms/php-ezc-Feed/devel .cvsignore, 1.2, 1.3 php-ezc-Feed.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20091224163419.D698711C00CF@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Feed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25166/devel

Modified Files:
	.cvsignore php-ezc-Feed.spec sources 
Log Message:
Upstream 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Aug 2009 09:24:22 -0000	1.2
+++ .cvsignore	24 Dec 2009 16:34:19 -0000	1.3
@@ -1 +1 @@
-Feed-1.2.1.tgz
+Feed-1.3.tgz


Index: php-ezc-Feed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/devel/php-ezc-Feed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-Feed.spec	23 Aug 2009 09:24:22 -0000	1.1
+++ php-ezc-Feed.spec	24 Dec 2009 16:34:19 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Feed
-Version:        1.2.1
+Version:        1.3
 Release:        1%{?dist}
 Summary:        This component handles parsing and creating RSS1, RSS2 and ATOM feeds
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.1.1
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -31,8 +31,8 @@ support for different feed modules (dc, 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -43,23 +43,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -84,5 +84,8 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3-1
+- Upstream 1.3
+
 * Tue Jul 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.1-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Aug 2009 09:24:22 -0000	1.2
+++ sources	24 Dec 2009 16:34:19 -0000	1.3
@@ -1 +1 @@
-1e707631a20b2a393c87d594a89dd685  Feed-1.2.1.tgz
+cd9af03a7b7ac3fe4c865a935d378af3  Feed-1.3.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:39:34 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:39:34 +0000 (UTC)
Subject: File Mail-1.7.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091224163934.41F5210F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-ezc-Mail:

c3062b68b48d7db623354f4900409e66  Mail-1.7.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:41:25 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:41:25 +0000 (UTC)
Subject: rpms/php-ezc-Mail/F-12 .cvsignore, 1.4, 1.5 php-ezc-Mail.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20091224164125.4CCF211C00CF@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Mail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26579/F-12

Modified Files:
	.cvsignore php-ezc-Mail.spec sources 
Log Message:
Upstream 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Jun 2009 20:32:18 -0000	1.4
+++ .cvsignore	24 Dec 2009 16:41:25 -0000	1.5
@@ -1 +1 @@
-Mail-1.6.3.tgz
+Mail-1.7.tgz


Index: php-ezc-Mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-12/php-ezc-Mail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-ezc-Mail.spec	26 Jul 2009 18:03:03 -0000	1.4
+++ php-ezc-Mail.spec	24 Dec 2009 16:41:25 -0000	1.5
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Mail
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        Construct and/or parse Mail messages conforming to the mail standard
 
 Group:          Development/Libraries
@@ -19,7 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
 Requires:       php-mcrypt
 Requires:       php-pecl-Fileinfo
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -27,16 +27,18 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-The component allows you construct and/or parse Mail messages conforming to
-the mail standard. It has support for attachments, multipart messages and HTML
-mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to
-retrieve e-mail.
+The Mail component provides functionality to send, retrieve and parse mail
+messages. If you require an easy way to send a mail, use the ezcMailComposer
+class, which allows you to send HTML mails with images, attachments and an
+optional text part. If you require more advanced mail messages, you can build
+the complete message yourself using the ezcMailPart  derived classes. You can
+retrieve mail messages from different sources using the supported transports.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -47,26 +49,26 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # rpmlint (W): wrong-file-end-of-line-encoding
 sed -i -e 's|\r||g' ./docdir/tutorial/test-mail.mail
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -91,14 +93,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
+- Upstream 1.7
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Jun 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.3-1
-- Update to 1.6.3
+- Upstream 1.6.3
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.2-1
-- Update to 1.6.2
+- Upstream 1.6.2
 
 * Thu Apr 27 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-3
 - Requires php-pecl-Fileinfo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jun 2009 20:32:18 -0000	1.4
+++ sources	24 Dec 2009 16:41:25 -0000	1.5
@@ -1 +1 @@
-a49bffe0d742aecb5ab9762c31aca3ef  Mail-1.6.3.tgz
+c3062b68b48d7db623354f4900409e66  Mail-1.7.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:41:25 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:41:25 +0000 (UTC)
Subject: rpms/php-ezc-Mail/F-11 .cvsignore, 1.4, 1.5 php-ezc-Mail.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20091224164125.2A28211C00CF@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Mail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26579/F-11

Modified Files:
	.cvsignore php-ezc-Mail.spec sources 
Log Message:
Upstream 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Jun 2009 20:32:22 -0000	1.4
+++ .cvsignore	24 Dec 2009 16:41:24 -0000	1.5
@@ -1 +1 @@
-Mail-1.6.3.tgz
+Mail-1.7.tgz


Index: php-ezc-Mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-11/php-ezc-Mail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Mail.spec	30 Jun 2009 20:32:22 -0000	1.3
+++ php-ezc-Mail.spec	24 Dec 2009 16:41:24 -0000	1.4
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Mail
-Version:        1.6.3
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Construct and/or parse Mail messages conforming to the mail standard
 
@@ -19,7 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
 Requires:       php-mcrypt
 Requires:       php-pecl-Fileinfo
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -27,16 +27,18 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-The component allows you construct and/or parse Mail messages conforming to
-the mail standard. It has support for attachments, multipart messages and HTML
-mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to
-retrieve e-mail.
+The Mail component provides functionality to send, retrieve and parse mail
+messages. If you require an easy way to send a mail, use the ezcMailComposer
+class, which allows you to send HTML mails with images, attachments and an
+optional text part. If you require more advanced mail messages, you can build
+the complete message yourself using the ezcMailPart  derived classes. You can
+retrieve mail messages from different sources using the supported transports.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -47,26 +49,26 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # rpmlint (W): wrong-file-end-of-line-encoding
 sed -i -e 's|\r||g' ./docdir/tutorial/test-mail.mail
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -91,11 +93,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
+- Upstream 1.7
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.3-1
-- Update to 1.6.3
+- Upstream 1.6.3
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.2-1
-- Update to 1.6.2
+- Upstream 1.6.2
 
 * Thu Apr 27 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-3
 - Requires php-pecl-Fileinfo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jun 2009 20:32:22 -0000	1.4
+++ sources	24 Dec 2009 16:41:24 -0000	1.5
@@ -1 +1 @@
-a49bffe0d742aecb5ab9762c31aca3ef  Mail-1.6.3.tgz
+c3062b68b48d7db623354f4900409e66  Mail-1.7.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:41:25 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:41:25 +0000 (UTC)
Subject: rpms/php-ezc-Mail/devel .cvsignore, 1.4, 1.5 php-ezc-Mail.spec, 1.4, 
	1.5 sources, 1.4, 1.5
Message-ID: <20091224164125.74F4011C00CF@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26579/devel

Modified Files:
	.cvsignore php-ezc-Mail.spec sources 
Log Message:
Upstream 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Jun 2009 20:32:18 -0000	1.4
+++ .cvsignore	24 Dec 2009 16:41:25 -0000	1.5
@@ -1 +1 @@
-Mail-1.6.3.tgz
+Mail-1.7.tgz


Index: php-ezc-Mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/devel/php-ezc-Mail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-ezc-Mail.spec	26 Jul 2009 18:03:03 -0000	1.4
+++ php-ezc-Mail.spec	24 Dec 2009 16:41:25 -0000	1.5
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Mail
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        Construct and/or parse Mail messages conforming to the mail standard
 
 Group:          Development/Libraries
@@ -19,7 +19,7 @@ BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
 Requires:       php-mcrypt
 Requires:       php-pecl-Fileinfo
-Requires:       php-pear(%{channel}/Base) >= 1.6.1
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -27,16 +27,18 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-The component allows you construct and/or parse Mail messages conforming to
-the mail standard. It has support for attachments, multipart messages and HTML
-mail. It also interfaces with SMTP to send mail or IMAP, POP3 or mbox to
-retrieve e-mail.
+The Mail component provides functionality to send, retrieve and parse mail
+messages. If you require an easy way to send a mail, use the ezcMailComposer
+class, which allows you to send HTML mails with images, attachments and an
+optional text part. If you require more advanced mail messages, you can build
+the complete message yourself using the ezcMailPart  derived classes. You can
+retrieve mail messages from different sources using the supported transports.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -47,26 +49,26 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # rpmlint (W): wrong-file-end-of-line-encoding
 sed -i -e 's|\r||g' ./docdir/tutorial/test-mail.mail
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -91,14 +93,17 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
+- Upstream 1.7
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Jun 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.3-1
-- Update to 1.6.3
+- Upstream 1.6.3
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.2-1
-- Update to 1.6.2
+- Upstream 1.6.2
 
 * Thu Apr 27 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-3
 - Requires php-pecl-Fileinfo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Mail/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jun 2009 20:32:18 -0000	1.4
+++ sources	24 Dec 2009 16:41:25 -0000	1.5
@@ -1 +1 @@
-a49bffe0d742aecb5ab9762c31aca3ef  Mail-1.6.3.tgz
+c3062b68b48d7db623354f4900409e66  Mail-1.7.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:52:05 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:52:05 +0000 (UTC)
Subject: File PersistentObject-1.7.tgz uploaded to lookaside cache by llaumgui
Message-ID: <20091224165205.DF35510F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-ezc-PersistentObject:

5234a2fc85b2b6f4e3f518ac70b44c5a  PersistentObject-1.7.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:53:16 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:53:16 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/F-11 .cvsignore, 1.4,
	1.5 php-ezc-PersistentObject.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091224165316.B209B11C00CF@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28440/F-11

Modified Files:
	.cvsignore php-ezc-PersistentObject.spec sources 
Log Message:
Upstream 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Jun 2009 20:46:48 -0000	1.4
+++ .cvsignore	24 Dec 2009 16:53:16 -0000	1.5
@@ -1 +1 @@
-PersistentObject-1.6.tgz
+PersistentObject-1.7.tgz


Index: php-ezc-PersistentObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-11/php-ezc-PersistentObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-PersistentObject.spec	30 Jun 2009 20:46:48 -0000	1.3
+++ php-ezc-PersistentObject.spec	24 Dec 2009 16:53:16 -0000	1.4
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-PersistentObject
-Version:        1.6
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Allows you to store an arbitrary data structures to a fixed database table
 
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.7
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires:       php-pear(%{channel}/Database) >= 1.3
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -26,15 +26,16 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-This component allows you to store an arbitrary data structures to a fixed
-database table. The component provides all the functionality needed to fetch,
-list, delete etc these datastructures.
+The PersistentObject component provides object persistence for PHP 5 using a
+database. PersistentObject uses the Database component to provide database
+abstraction. It does not rely on code generation and does not force a specific
+inheritance structure to work.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,23 +46,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -86,14 +87,20 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
+- Upstream 1.7
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
-- Update to 1.6
+- Upstream 1.6
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.2-1
-- Update to 1.5.2
+- Upstream 1.5.2
 
 * Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
-- Update to 1.5.1
+- Upstream 1.5.1
 
 * Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jun 2009 20:46:48 -0000	1.4
+++ sources	24 Dec 2009 16:53:16 -0000	1.5
@@ -1 +1 @@
-80d1b839f34ca7251a2c2caa55c15ba8  PersistentObject-1.6.tgz
+5234a2fc85b2b6f4e3f518ac70b44c5a  PersistentObject-1.7.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:53:16 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:53:16 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/F-12 .cvsignore, 1.4,
	1.5 php-ezc-PersistentObject.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091224165316.D63C211C00CF@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28440/F-12

Modified Files:
	.cvsignore php-ezc-PersistentObject.spec sources 
Log Message:
Upstream 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Jun 2009 20:46:37 -0000	1.4
+++ .cvsignore	24 Dec 2009 16:53:16 -0000	1.5
@@ -1 +1 @@
-PersistentObject-1.6.tgz
+PersistentObject-1.7.tgz


Index: php-ezc-PersistentObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-12/php-ezc-PersistentObject.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-ezc-PersistentObject.spec	26 Jul 2009 18:03:20 -0000	1.4
+++ php-ezc-PersistentObject.spec	24 Dec 2009 16:53:16 -0000	1.5
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-PersistentObject
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        Allows you to store an arbitrary data structures to a fixed database table
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.7
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires:       php-pear(%{channel}/Database) >= 1.3
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -26,15 +26,16 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-This component allows you to store an arbitrary data structures to a fixed
-database table. The component provides all the functionality needed to fetch,
-list, delete etc these datastructures.
+The PersistentObject component provides object persistence for PHP 5 using a
+database. PersistentObject uses the Database component to provide database
+abstraction. It does not rely on code generation and does not force a specific
+inheritance structure to work.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,23 +46,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -86,17 +87,20 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
+- Upstream 1.7
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Jun 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
-- Update to 1.6
+- Upstream 1.6
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.2-1
-- Update to 1.5.2
+- Upstream 1.5.2
 
 * Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
-- Update to 1.5.1
+- Upstream 1.5.1
 
 * Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jun 2009 20:46:37 -0000	1.4
+++ sources	24 Dec 2009 16:53:16 -0000	1.5
@@ -1 +1 @@
-80d1b839f34ca7251a2c2caa55c15ba8  PersistentObject-1.6.tgz
+5234a2fc85b2b6f4e3f518ac70b44c5a  PersistentObject-1.7.tgz



From llaumgui at fedoraproject.org  Thu Dec 24 16:53:17 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 24 Dec 2009 16:53:17 +0000 (UTC)
Subject: rpms/php-ezc-PersistentObject/devel .cvsignore, 1.4,
	1.5 php-ezc-PersistentObject.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091224165317.0632311C00CF@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-PersistentObject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28440/devel

Modified Files:
	.cvsignore php-ezc-PersistentObject.spec sources 
Log Message:
Upstream 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Jun 2009 20:46:37 -0000	1.4
+++ .cvsignore	24 Dec 2009 16:53:16 -0000	1.5
@@ -1 +1 @@
-PersistentObject-1.6.tgz
+PersistentObject-1.7.tgz


Index: php-ezc-PersistentObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/devel/php-ezc-PersistentObject.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-ezc-PersistentObject.spec	26 Jul 2009 18:03:20 -0000	1.4
+++ php-ezc-PersistentObject.spec	24 Dec 2009 16:53:16 -0000	1.5
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-PersistentObject
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        Allows you to store an arbitrary data structures to a fixed database table
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.1
-Requires:       php-pear(%{channel}/Base) >= 1.7
+Requires:       php-pear(%{channel}/Base) >= 1.8
 Requires:       php-pear(%{channel}/Database) >= 1.3
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -26,15 +26,16 @@ Provides:       php-pear(%{channel}/%{pe
 
 
 %description
-This component allows you to store an arbitrary data structures to a fixed
-database table. The component provides all the functionality needed to fetch,
-list, delete etc these datastructures.
+The PersistentObject component provides object persistence for PHP 5 using a
+database. PersistentObject uses the Database component to provide database
+abstraction. It does not rely on code generation and does not force a specific
+inheritance structure to work.
 
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -45,23 +46,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -86,17 +87,20 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
+- Upstream 1.7
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Jun 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
-- Update to 1.6
+- Upstream 1.6
 
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.2-1
-- Update to 1.5.2
+- Upstream 1.5.2
 
 * Mon Mar 30 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
-- Update to 1.5.1
+- Upstream 1.5.1
 
 * Mon Mar 16 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-PersistentObject/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jun 2009 20:46:37 -0000	1.4
+++ sources	24 Dec 2009 16:53:16 -0000	1.5
@@ -1 +1 @@
-80d1b839f34ca7251a2c2caa55c15ba8  PersistentObject-1.6.tgz
+5234a2fc85b2b6f4e3f518ac70b44c5a  PersistentObject-1.7.tgz



From kyle at fedoraproject.org  Thu Dec 24 17:00:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 24 Dec 2009 17:00:52 +0000 (UTC)
Subject: rpms/kernel/devel drm-radeon-fix-crtc-vbl-update-for-r600.patch, NONE,
	1.1 kernel.spec, 1.1877, 1.1878
Message-ID: <20091224170052.91D5611C00CF@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29812

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-fix-crtc-vbl-update-for-r600.patch 
Log Message:
* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-15
- Add patch from dri-devel to fix vblanks on r600.
  [http://marc.info/?l=dri-devel&m=126137027403059&w=2]


drm-radeon-fix-crtc-vbl-update-for-r600.patch:
 atombios_crtc.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE drm-radeon-fix-crtc-vbl-update-for-r600.patch ---
--- linux-2.6.32.noarch/drivers/gpu/drm/radeon/atombios_crtc.c
+++ linux-2.6.32.noarch/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -249,13 +249,15 @@ void atombios_crtc_dpms(struct drm_crtc 
 		if (ASIC_IS_DCE3(rdev))
 			atombios_enable_crtc_memreq(crtc, 1);
 		atombios_blank_crtc(crtc, 0);
-		drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
+		if (rdev->family < CHIP_R600)
+			drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
 		radeon_crtc_load_lut(crtc);
 		break;
 	case DRM_MODE_DPMS_STANDBY:
 	case DRM_MODE_DPMS_SUSPEND:
 	case DRM_MODE_DPMS_OFF:
-		drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
+		if (rdev->family < CHIP_R600)
+			drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
 		atombios_blank_crtc(crtc, 1);
 		if (ASIC_IS_DCE3(rdev))
 			atombios_enable_crtc_memreq(crtc, 0);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1877
retrieving revision 1.1878
diff -u -p -r1.1877 -r1.1878
--- kernel.spec	19 Dec 2009 02:35:33 -0000	1.1877
+++ kernel.spec	24 Dec 2009 17:00:52 -0000	1.1878
@@ -695,6 +695,7 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1827: linux-2.6-intel-agp-clear-gtt.patch
+Patch1828: drm-radeon-fix-crtc-vbl-update-for-r600.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1323,6 +1324,7 @@ ApplyOptionalPatch drm-intel-next.patch
 #ApplyPatch drm-intel-pm.patch
 # Some BIOSes don't clear the whole GTT, and it causes IOMMU faults
 ApplyPatch linux-2.6-intel-agp-clear-gtt.patch
+ApplyPatch drm-radeon-fix-crtc-vbl-update-for-r600.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1995,6 +1997,10 @@ fi
 # and build.
 
 %changelog
+* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-15
+- Add patch from dri-devel to fix vblanks on r600.
+  [http://marc.info/?l=dri-devel&m=126137027403059&w=2]
+
 * Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-14
 - Linux 2.6.32.2
 - dropped upstream patches.



From cassmodiah at fedoraproject.org  Thu Dec 24 17:08:45 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 24 Dec 2009 17:08:45 +0000 (UTC)
Subject: rpms/hosts3d/EL-5 .cvsignore, 1.6, 1.7 hosts3d.spec, 1.8,
	1.9 import.log, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20091224170845.786BC11C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/hosts3d/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31147/EL-5

Modified Files:
	.cvsignore hosts3d.spec import.log sources 
Log Message:
1.03->1.07



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Sep 2009 20:32:45 -0000	1.6
+++ .cvsignore	24 Dec 2009 17:08:45 -0000	1.7
@@ -1 +1 @@
-hosts3d-1.03.tar.gz
+hosts3d-1.07.tar.gz


Index: hosts3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/EL-5/hosts3d.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- hosts3d.spec	2 Sep 2009 20:32:45 -0000	1.8
+++ hosts3d.spec	24 Dec 2009 17:08:45 -0000	1.9
@@ -1,5 +1,5 @@
 Name:            hosts3d
-Version:         1.03
+Version:         1.07
 Release:         1%{?dist}
 Summary:         3D real-time network visualiser
 
@@ -90,11 +90,23 @@ rm -rf %{buildroot}
 
 %files sampler
 %defattr(-,root,root,-)
-%{_sbindir}/hsen
-%{_mandir}/man8/hsen.*
+%{_bindir}/hsen
+%{_mandir}/man*/hsen.*
 
 
 %changelog
+* Fri Dec 11 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.07-1
+- New upstream release
+
+* Fri Nov 20 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.06-1
+- New upstream release
+
+* Thu Oct 22 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.05-1
+- New upstream release
+
+* Mon Oct 05 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.04-1
+- New upstream release
+
 * Wed Sep 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.03-1
 - New upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/EL-5/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	2 Sep 2009 20:32:45 -0000	1.8
+++ import.log	24 Dec 2009 17:08:45 -0000	1.9
@@ -6,3 +6,4 @@ hosts3d-0_98-1_fc10:EL-5:hosts3d-0.98-1.
 hosts3d-0_99-1_el5:EL-5/:hosts3d-0.99-1.el5.src.rpm:1244058073
 hosts3d-1_00-1_fc11:EL-5:hosts3d-1.00-1.fc11.src.rpm:1246981524
 hosts3d-1_03-1_fc11:EL-5:hosts3d-1.03-1.fc11.src.rpm:1251923525
+hosts3d-1_07-1_el5:EL-5:hosts3d-1.07-1.el5.src.rpm:1261674379


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hosts3d/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Sep 2009 20:32:45 -0000	1.6
+++ sources	24 Dec 2009 17:08:45 -0000	1.7
@@ -1 +1 @@
-41940217169e4009bcd78948446f69ee  hosts3d-1.03.tar.gz
+4791c45d8ba8652f4a7a2376d6faddea  hosts3d-1.07.tar.gz



From pkgdb at fedoraproject.org  Thu Dec 24 17:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 24 Dec 2009 17:21:14 +0000
Subject: [pkgdb] chkfontpath ownership updated
Message-ID: <20091224172114.9314C10F8CD@bastion.fedoraproject.org>

Package chkfontpath in Fedora devel is now owned by pfj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chkfontpath



From pfj at fedoraproject.org  Thu Dec 24 17:27:49 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Thu, 24 Dec 2009 17:27:49 +0000 (UTC)
Subject: rpms/chkfontpath/devel Makefile, 1.3, 1.4 chkfontpath.spec, 1.18,
	1.19 import.log, NONE, 1.1 sources, 1.9, 1.10 dead.package, 1.1, NONE
Message-ID: <20091224172749.EDAEC11C00CF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/chkfontpath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2240/devel

Added Files:
	Makefile chkfontpath.spec import.log sources 
Removed Files:
	dead.package 
Log Message:

Added the package back in - it's useful in some instances 



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	24 Dec 2009 17:27:49 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: chkfontpath
+# $Id$
+NAME := chkfontpath
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I 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: chkfontpath.spec
===================================================================
RCS file: chkfontpath.spec
diff -N chkfontpath.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ chkfontpath.spec	24 Dec 2009 17:27:49 -0000	1.19
@@ -0,0 +1,171 @@
+Summary: Simple interface for editing the font path for the X font server.
+Name: chkfontpath
+Version: 1.10.1
+Release: 3%{?dist}
+License: GPLv2
+Group: System Environment/Base
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+# Canonical CVS repository for in house upstream chkfontpath:
+#       cvs -d :ext:elvis.redhat.com:/usr/local/CVS co chkfontpath
+Source: %{name}-%{version}.tar.gz
+
+# Do not add Requires on XFree86-* or xorg-x11-* subpackages, because that
+# makes this package unnecessarily dependant on a specific X11
+# implementation.  Instead, use a virtual Requires, or depend on a file or
+# directory which will be present in one of the X11 implementation's file
+# lists, thus avoiding the problem.  See bugzilla #118469 for details.
+Requires: xfs
+Requires: /sbin/pidof
+
+%description 
+This is a simple command line utility for configuring the directories
+in the X font server's path.  It is mostly intended to be used
+'internally' by RPM when packages with fonts are added or removed, but
+it may be useful as a stand-alone utility in some instances.
+
+%prep
+%setup -q
+
+%build
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+
+%install
+make INSTROOT=$RPM_BUILD_ROOT BINDIR=%{_sbindir} MANDIR=%{_mandir} install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_sbindir}/*
+%{_mandir}/man8/*
+
+%changelog
+* Thu Dec 24 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.10.1-3
+- Rebuild
+
+* Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.10.1-2
+- Rebuild for build id
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10.1-1.1
+- rebuild
+
+* Thu Feb 16 2006 Mike A. Harris <mharris at redhat.com> 1.10.1-1
+- Implemented new --listfp option for bug (#153324).
+- Fix stderr output redirection bug in kill invocation (#176444).
+- Check return code from realloc() and exit on failure.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.10.0-4.2.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.10.0-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Feb 11 2005 Mike A. Harris <mharris at redhat.com> 1.10.0-4
+- Rebuilt with gcc 4 for FC4
+
+* Fri Feb 11 2005 Mike A. Harris <mharris at redhat.com> 1.10.0-3
+- Rebuilt for FC4
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com> 1.10.0-2
+- rebuilt
+
+* Tue Mar 16 2004 Mike A. Harris <mharris at redhat.com> 1.10.0-1
+- Change PreReq: XFree86-xfs to Requires: xfs, which is a virtual Provide
+  that is present in the xorg-x11 packaging, and in XFree86-4.3.0-64 and
+  later builds.  This is necessary in order to make packages not require a
+  specific X11 implementation unnecessarily.  (#118469)
+
+* Wed May 28 2003 Mike A. Harris <mharris at redhat.com> 1.9.10-1
+- Add patch from Uli, with some cosmetic cleanups to fix bug (#90942)
+
+* Tue May 20 2003 Bill Nottingham <notting at redhat.com> 1.9.9-1
+- don't forcibly strip binaries on make install
+
+* Fri May 16 2003 Mike A. Harris <mharris at redhat.com> 1.9.8-1
+- Fix serious problem where chkfontpath sends SIGUSR1 to PID 2 bug (#90999)
+- Replace hard coded xfs config file paths with constants
+- Implemented fatalerror() for displaying variadic error messages and bailing
+  with EXIT_FAILURE when "quiet" mode is not enabled, or silencing error
+  output and exiting with EXIT_SUCCESS when "quiet" mode is enabled.  Replaced
+  all conditionalized tests for quiet mode throughout the code, and changed
+  all critical error messages with calls to fatalerror()
+- Make restartXfs() more robust, with a fallback for if /proc isn't available.
+
+* Mon Feb 10 2003 Mike A. Harris <mharris at redhat.com> 1.9.7-1
+- Bump and rebuild in new environment as 1.9.7-1
+- Fixes for GNU extension usage isblank()
+
+* Tue May 21 2002 Mike A. Harris <mharris at redhat.com> 1.9.6-1
+- Bump and rebuild in new environment as 1.9.6-1
+
+* Thu Jan 18 2001 Preston Brown <pbrown at redhat.com>
+- document missing arguments (#24055) in man page
+- use popt to generate help text for the program
+
+* Thu Jan 18 2001 Nalin Dahyabhai <nalin at redhat.com>
+- #ifdef out some debugging code (#24054)
+- do a setlocale() before using ctype functions
+
+* Fri Jan 12 2001 Preston Brown <pbrown at redhat.com>
+- fixed up handling of catalogue line in situations where there is no
+  path listed on the first line (#10128)
+- fixed up handling when adding a directory to empty font path (#11108)
+- use fputs where more correct (#14286)
+
+* Tue Jul  4 2000 Matt Wilson <msw at redhat.com>
+- Prereq: XFree86-xfs to insure that it gets installed before
+  chkfontpath is.  This should promote XFree86-xfs to be installed
+  before any package that has a Prereq: on chkfontpath
+- Prereq: /sbin/pidof (even though a Requires: should be sufficient)
+
+* Mon Jun 12 2000 Preston Brown <pbrown at redhat.com>
+- FHS macros
+
+* Wed May 17 2000 Matt Wilson <msw at redhat.com>
+- rebuilt to get rid of broken deps
+
+* Thu Feb 03 2000 Preston Brown <pbrown at redhat.com>
+- rebuild to gzip man page, update description.
+
+* Mon Oct 18 1999 Preston Brown <pbrown at redhat.com>
+- patches from JJ understand :unscaled automatically, no longer necessary
+  to specify manually on the cmd line
+- tries to keep specific font groups together much harder.
+
+* Mon Sep 27 1999 Preston Brown <pbrown at redhat.com>
+- incorporated patches to deal with :unscaled font dir entries, and
+  add a --first flag to add the path at the beginning instead of the end.
+- minor cleanups
+
+* Fri Aug 15 1999 Preston Brown <pbrown at redhat.com>
+- fixed up basename
+- default to list, not help
+- if trailing slash '/' is appended to paths given, strip it off
+
+* Wed Apr 14 1999 Preston Brown <pbrown at redhat.com>
+- preserve permissions on config file
+
+* Thu Apr 07 1999 Preston Brown <pbrown at redhat.com>
+- if /proc isn't mounted, don't do a killall
+
+* Tue Mar 30 1999 Preston Brown <pbrown at redhat.com>
+- don't use psmisc, use pidof from SysVinit
+
+* Fri Mar 12 1999 Preston Brown <pbrown at redhat.com>
+- made psmisc a requirement.
+
+* Tue Mar 09 1999 Preston Brown <pbrown at redhat.com>
+- added "quiet" option.
+
+* Wed Feb 24 1999 Preston Brown <pbrown at redhat.com>
+- injected new group / description.
+
+* Tue Feb 16 1999 Preston Brown <pbrown at redhat.com>
+- important fix - kill font server with USR1 instead of HUP.
+
+* Mon Feb 15 1999 Preston Brown <pbrown at redhat.com>
+- initial spec file


--- NEW FILE import.log ---
chkfontpath-1_10_1-3_fc13:HEAD:chkfontpath-1.10.1-3.fc13.src.rpm:1261675391


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	24 Dec 2009 17:27:49 -0000	1.10
@@ -0,0 +1 @@
+e216cfc446f4112b80bd8e79bae025f1  chkfontpath-1.10.1.tar.gz


--- dead.package DELETED ---



From konradm at fedoraproject.org  Thu Dec 24 17:57:02 2009
From: konradm at fedoraproject.org (konradm)
Date: Thu, 24 Dec 2009 17:57:02 +0000 (UTC)
Subject: File zdaemon-2.0.4.tar.gz uploaded to lookaside cache by konradm
Message-ID: <20091224175702.B2E5D10F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-zdaemon:

7d358297df480abe93b6565fc0213c34  zdaemon-2.0.4.tar.gz



From konradm at fedoraproject.org  Thu Dec 24 18:00:07 2009
From: konradm at fedoraproject.org (konradm)
Date: Thu, 24 Dec 2009 18:00:07 +0000 (UTC)
Subject: rpms/python-zdaemon/devel import.log, NONE, 1.1 python-zdaemon.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091224180007.8009F11C03B8@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-zdaemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6602/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-zdaemon.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
python-zdaemon-2_0_4-2_fc11:HEAD:python-zdaemon-2.0.4-2.fc11.src.rpm:1261677416


--- NEW FILE python-zdaemon.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-zdaemon
Version:        2.0.4
Release:        2%{?dist}
Summary:        Python Daemon Process Control Library
Group:          Development/Languages
License:        ZPLv2.1
URL:            http://pypi.python.org/pypi/zdaemon/
Source0:        http://pypi.python.org/packages/source/z/zdaemon/zdaemon-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  python-zope-testing
BuildRequires:  python-ZConfig
Requires:       python-ZConfig


%description
Daemon process control library and tools for Unix-bases systems.


%prep
%setup -q -n zdaemon-%{version}
sed -i '1,1d' src/zdaemon/zdctl.py
sed -i '1,1d' src/zdaemon/zdrun.py
sed -i '1,1d' src/zdaemon/tests/nokill.py


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%check
export PYTHONPATH="$PYTHONPATH:$RPM_BUILD_ROOT%{python_sitelib}"
%{__python} build/lib/zdaemon/tests/tests.py

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt README.txt
%{python_sitelib}/zdaemon
%{python_sitelib}/zdaemon-%{version}-py?.?.egg-info
%{_bindir}/zdaemon


%changelog
* Fri Oct 16 2009 Conrad Meyer <konrad at tylerc.org> - 2.0.4-2
- Add BR on python-setuptools.

* Wed Apr 22 2009 Conrad Meyer <konrad at tylerc.org> - 2.0.4-1
- Bump to 2.0.4.

* Mon Dec 15 2008 Conrad Meyer <konrad at tylerc.org> - 2.0.2-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zdaemon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Dec 2009 06:59:48 -0000	1.1
+++ .cvsignore	24 Dec 2009 18:00:07 -0000	1.2
@@ -0,0 +1 @@
+zdaemon-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zdaemon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Dec 2009 06:59:49 -0000	1.1
+++ sources	24 Dec 2009 18:00:07 -0000	1.2
@@ -0,0 +1 @@
+7d358297df480abe93b6565fc0213c34  zdaemon-2.0.4.tar.gz



From cassmodiah at fedoraproject.org  Thu Dec 24 18:08:57 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 24 Dec 2009 18:08:57 +0000 (UTC)
Subject: File teeworlds-0.5.2-src.tar.gz uploaded to lookaside cache by
	cassmodiah
Message-ID: <20091224180857.C7E9210F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for teeworlds:

f605f6df9f1714dcda4cba1d281cc757  teeworlds-0.5.2-src.tar.gz



From cassmodiah at fedoraproject.org  Thu Dec 24 18:10:16 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 24 Dec 2009 18:10:16 +0000 (UTC)
Subject: rpms/teeworlds/devel teeworlds-0.5.2-extlibs.patch, NONE,
	1.1 teeworlds-0.5.2-optflags.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 import.log, 1.1, 1.2 sources, 1.5, 1.6 teeworlds.spec, 1.5,
	1.6 teeworlds-0.5.1-extlibs.patch, 1.1,
	NONE teeworlds-0.5.1-optflags.patch, 1.1, NONE
Message-ID: <20091224181016.7031711C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8389/devel

Modified Files:
	.cvsignore import.log sources teeworlds.spec 
Added Files:
	teeworlds-0.5.2-extlibs.patch teeworlds-0.5.2-optflags.patch 
Removed Files:
	teeworlds-0.5.1-extlibs.patch teeworlds-0.5.1-optflags.patch 
Log Message:
0.5.1 -> 0.5.2


teeworlds-0.5.2-extlibs.patch:
 default.bam                   |   27 +++++++++++++++++++++++++--
 src/engine/client/ec_gfx.c    |    2 +-
 src/engine/client/ec_snd.c    |   26 +++++---------------------
 src/tools/dilate.c            |    5 ++++-
 src/tools/tileset_borderfix.c |    5 ++++-
 5 files changed, 39 insertions(+), 26 deletions(-)

--- NEW FILE teeworlds-0.5.2-extlibs.patch ---
diff -Naur teeworlds-0.5.2-src.orig/default.bam teeworlds-0.5.2-src/default.bam
--- teeworlds-0.5.2-src.orig/default.bam	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/default.bam	2009-12-24 18:57:43.000000000 +0100
@@ -7,6 +7,8 @@
 config:Add(OptFindCompiler())
 config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
 config:Add(OptFindLibrary("zlib", "zlib.h", false))
+config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false))
+config:Add(OptFindLibrary("pnglite", "sys/types.h", false))
 config:Add(SDL.OptFind("sdl", true))
 config:Finalize("config.bam")
 
@@ -151,8 +153,29 @@
 	end
 
 	-- build the small libraries
-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+	-- compile wavpack if needed
+	if config.wavpack.value == 1 then
+		settings.link.libs:Add("wavpack")
+		if config.wavpack.include_path then
+			settings.cc.includes:Add(config.wavpack.include_path)
+		end
+		wavpack = {}
+	else
+		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+		settings.cc.includes:Add("src/engine/external")
+	end
+
+	-- compile pnglite if needed
+	if config.pnglite.value == 1 then
+		settings.link.libs:Add("pnglite")
+		if config.pnglite.include_path then
+			settings.cc.includes:Add(config.pnglite.include_path)
+		end
+		pnglite = {}
+	else
+		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+		settings.cc.includes:Add("src/engine/external/pnglite")
+	end
 	
 	-- build game components
 	engine_settings = settings:Copy()
diff -Naur teeworlds-0.5.2-src.orig/src/engine/client/ec_gfx.c teeworlds-0.5.2-src/src/engine/client/ec_gfx.c
--- teeworlds-0.5.2-src.orig/src/engine/client/ec_gfx.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/engine/client/ec_gfx.c	2009-12-24 18:57:43.000000000 +0100
@@ -18,7 +18,7 @@
 #endif
 
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 #include <engine/e_client_interface.h>
 #include <engine/e_engine.h>
diff -Naur teeworlds-0.5.2-src.orig/src/engine/client/ec_snd.c teeworlds-0.5.2-src/src/engine/client/ec_snd.c
--- teeworlds-0.5.2-src.orig/src/engine/client/ec_snd.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/engine/client/ec_snd.c	2009-12-24 18:57:43.000000000 +0100
@@ -6,7 +6,7 @@
 
 #include "SDL.h"
 
-#include <engine/external/wavpack/wavpack.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -358,19 +358,12 @@
 	snd->num_frames = num_frames;
 }
 
-
-static IOHANDLE file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return io_read(file, buffer, size);
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
 	int sid = -1;
 	char error[100];
+	char completefilename[512];
 	WavpackContext *context;
 	
 	/* don't waste memory on sound when we are stress testing */
@@ -381,19 +374,13 @@
 	if(!sound_enabled)
 		return 1;
 
-	file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ);
+	context = WavpackOpenFileInput(completefilename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -410,7 +397,7 @@
 
 		if(snd->channels > 2)
 		{
-			dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", filename);
+			dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error);
 			return -1;
 		}
 
@@ -448,9 +435,6 @@
 		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
 	}
 
-	io_close(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -Naur teeworlds-0.5.2-src.orig/src/tools/dilate.c teeworlds-0.5.2-src/src/tools/dilate.c
--- teeworlds-0.5.2-src.orig/src/tools/dilate.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/tools/dilate.c	2009-12-24 18:57:43.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -Naur teeworlds-0.5.2-src.orig/src/tools/tileset_borderfix.c teeworlds-0.5.2-src/src/tools/tileset_borderfix.c
--- teeworlds-0.5.2-src.orig/src/tools/tileset_borderfix.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/tools/tileset_borderfix.c	2009-12-24 18:57:43.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {

teeworlds-0.5.2-optflags.patch:
 default.bam |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE teeworlds-0.5.2-optflags.patch ---
diff -Naur teeworlds-0.5.2-src.orig/default.bam teeworlds-0.5.2-src/default.bam
--- teeworlds-0.5.2-src.orig/default.bam	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/default.bam	2009-12-24 18:55:37.000000000 +0100
@@ -106,6 +106,9 @@
 function build(settings)
 	--settings.objdir = Path("objs")
 	settings.cc.Output = Intermediate_Output
+	settings.cc.flags:Add(os.getenv ('CFLAGS'))
+	settings.cc.flags:Add(os.getenv ('CPPFLAGS'))
+	settings.cc.flags:Add(os.getenv ('LDFLAGS'))
 
 	if config.compiler.value == "cl" then
 		settings.cc.flags:Add("/wd4244")


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Mar 2009 16:05:31 -0000	1.5
+++ .cvsignore	24 Dec 2009 18:10:16 -0000	1.6
@@ -1 +1 @@
-teeworlds-0.5.1-src.tar.gz
+teeworlds-0.5.2-src.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Mar 2009 16:05:31 -0000	1.1
+++ import.log	24 Dec 2009 18:10:16 -0000	1.2
@@ -1 +1,2 @@
 teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659
+teeworlds-0_5_2-1_fc12:HEAD:teeworlds-0.5.2-1.fc12.src.rpm:1261678124


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Mar 2009 16:05:31 -0000	1.5
+++ sources	24 Dec 2009 18:10:16 -0000	1.6
@@ -1 +1 @@
-5f96e73ff4c3d552de55902da9255606  teeworlds-0.5.1-src.tar.gz
+f605f6df9f1714dcda4cba1d281cc757  teeworlds-0.5.2-src.tar.gz


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/teeworlds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- teeworlds.spec	27 Jul 2009 05:42:38 -0000	1.5
+++ teeworlds.spec	24 Dec 2009 18:10:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           teeworlds
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.5.2
+Release:        1%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
 Group:          Amusements/Games
@@ -9,12 +9,12 @@ URL:            http://www.teeworlds.com
 Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
 Source1:        %{name}.png
 Source2:        %{name}.desktop
-Patch1:         %{name}-0.5.1-extlibs.patch
-Patch2:         %{name}-0.5.1-optflags.patch
+Patch1:         %{name}-0.5.2-extlibs.patch
+Patch2:         %{name}-0.5.2-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mesa-libGLU-devel
-BuildRequires:  bam >= 0.2.0
+BuildRequires:  bam
 BuildRequires:  python-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -55,13 +55,13 @@ rm -rf src/engine/external
 %patch1 -p1
 %patch2 -p1
 
-iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
-touch -c -r readme.txt readme.txt.utf8
-mv readme.txt.utf8 readme.txt
-
-iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
-touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
-mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
+#iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
+#touch -c -r readme.txt readme.txt.utf8
+#mv readme.txt.utf8 readme.txt
+
+#iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
+#touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
+#mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
 
 %build
 CFLAGS="%{optflags}" bam -v release
@@ -117,6 +117,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- teeworlds-0.5.1-extlibs.patch DELETED ---


--- teeworlds-0.5.1-optflags.patch DELETED ---



From cassmodiah at fedoraproject.org  Thu Dec 24 18:10:18 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 24 Dec 2009 18:10:18 +0000 (UTC)
Subject: rpms/teeworlds/F-12 teeworlds-0.5.2-extlibs.patch, NONE,
	1.1 teeworlds-0.5.2-optflags.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 import.log, 1.1, 1.2 sources, 1.5, 1.6 teeworlds.spec, 1.5,
	1.6 teeworlds-0.5.1-extlibs.patch, 1.1,
	NONE teeworlds-0.5.1-optflags.patch, 1.1, NONE
Message-ID: <20091224181018.D4E8911C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/teeworlds/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8403/F-12

Modified Files:
	.cvsignore import.log sources teeworlds.spec 
Added Files:
	teeworlds-0.5.2-extlibs.patch teeworlds-0.5.2-optflags.patch 
Removed Files:
	teeworlds-0.5.1-extlibs.patch teeworlds-0.5.1-optflags.patch 
Log Message:
0.5.1 -> 0.5.2


teeworlds-0.5.2-extlibs.patch:
 default.bam                   |   27 +++++++++++++++++++++++++--
 src/engine/client/ec_gfx.c    |    2 +-
 src/engine/client/ec_snd.c    |   26 +++++---------------------
 src/tools/dilate.c            |    5 ++++-
 src/tools/tileset_borderfix.c |    5 ++++-
 5 files changed, 39 insertions(+), 26 deletions(-)

--- NEW FILE teeworlds-0.5.2-extlibs.patch ---
diff -Naur teeworlds-0.5.2-src.orig/default.bam teeworlds-0.5.2-src/default.bam
--- teeworlds-0.5.2-src.orig/default.bam	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/default.bam	2009-12-24 18:57:43.000000000 +0100
@@ -7,6 +7,8 @@
 config:Add(OptFindCompiler())
 config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
 config:Add(OptFindLibrary("zlib", "zlib.h", false))
+config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false))
+config:Add(OptFindLibrary("pnglite", "sys/types.h", false))
 config:Add(SDL.OptFind("sdl", true))
 config:Finalize("config.bam")
 
@@ -151,8 +153,29 @@
 	end
 
 	-- build the small libraries
-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+	-- compile wavpack if needed
+	if config.wavpack.value == 1 then
+		settings.link.libs:Add("wavpack")
+		if config.wavpack.include_path then
+			settings.cc.includes:Add(config.wavpack.include_path)
+		end
+		wavpack = {}
+	else
+		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+		settings.cc.includes:Add("src/engine/external")
+	end
+
+	-- compile pnglite if needed
+	if config.pnglite.value == 1 then
+		settings.link.libs:Add("pnglite")
+		if config.pnglite.include_path then
+			settings.cc.includes:Add(config.pnglite.include_path)
+		end
+		pnglite = {}
+	else
+		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+		settings.cc.includes:Add("src/engine/external/pnglite")
+	end
 	
 	-- build game components
 	engine_settings = settings:Copy()
diff -Naur teeworlds-0.5.2-src.orig/src/engine/client/ec_gfx.c teeworlds-0.5.2-src/src/engine/client/ec_gfx.c
--- teeworlds-0.5.2-src.orig/src/engine/client/ec_gfx.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/engine/client/ec_gfx.c	2009-12-24 18:57:43.000000000 +0100
@@ -18,7 +18,7 @@
 #endif
 
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 #include <engine/e_client_interface.h>
 #include <engine/e_engine.h>
diff -Naur teeworlds-0.5.2-src.orig/src/engine/client/ec_snd.c teeworlds-0.5.2-src/src/engine/client/ec_snd.c
--- teeworlds-0.5.2-src.orig/src/engine/client/ec_snd.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/engine/client/ec_snd.c	2009-12-24 18:57:43.000000000 +0100
@@ -6,7 +6,7 @@
 
 #include "SDL.h"
 
-#include <engine/external/wavpack/wavpack.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -358,19 +358,12 @@
 	snd->num_frames = num_frames;
 }
 
-
-static IOHANDLE file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return io_read(file, buffer, size);
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
 	int sid = -1;
 	char error[100];
+	char completefilename[512];
 	WavpackContext *context;
 	
 	/* don't waste memory on sound when we are stress testing */
@@ -381,19 +374,13 @@
 	if(!sound_enabled)
 		return 1;
 
-	file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ);
+	context = WavpackOpenFileInput(completefilename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -410,7 +397,7 @@
 
 		if(snd->channels > 2)
 		{
-			dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", filename);
+			dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error);
 			return -1;
 		}
 
@@ -448,9 +435,6 @@
 		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
 	}
 
-	io_close(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -Naur teeworlds-0.5.2-src.orig/src/tools/dilate.c teeworlds-0.5.2-src/src/tools/dilate.c
--- teeworlds-0.5.2-src.orig/src/tools/dilate.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/tools/dilate.c	2009-12-24 18:57:43.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -Naur teeworlds-0.5.2-src.orig/src/tools/tileset_borderfix.c teeworlds-0.5.2-src/src/tools/tileset_borderfix.c
--- teeworlds-0.5.2-src.orig/src/tools/tileset_borderfix.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/tools/tileset_borderfix.c	2009-12-24 18:57:43.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {

teeworlds-0.5.2-optflags.patch:
 default.bam |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE teeworlds-0.5.2-optflags.patch ---
diff -Naur teeworlds-0.5.2-src.orig/default.bam teeworlds-0.5.2-src/default.bam
--- teeworlds-0.5.2-src.orig/default.bam	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/default.bam	2009-12-24 18:55:37.000000000 +0100
@@ -106,6 +106,9 @@
 function build(settings)
 	--settings.objdir = Path("objs")
 	settings.cc.Output = Intermediate_Output
+	settings.cc.flags:Add(os.getenv ('CFLAGS'))
+	settings.cc.flags:Add(os.getenv ('CPPFLAGS'))
+	settings.cc.flags:Add(os.getenv ('LDFLAGS'))
 
 	if config.compiler.value == "cl" then
 		settings.cc.flags:Add("/wd4244")


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Mar 2009 16:05:31 -0000	1.5
+++ .cvsignore	24 Dec 2009 18:10:18 -0000	1.6
@@ -1 +1 @@
-teeworlds-0.5.1-src.tar.gz
+teeworlds-0.5.2-src.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Mar 2009 16:05:31 -0000	1.1
+++ import.log	24 Dec 2009 18:10:18 -0000	1.2
@@ -1 +1,2 @@
 teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659
+teeworlds-0_5_2-1_fc12:F-12:teeworlds-0.5.2-1.fc12.src.rpm:1261678125


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Mar 2009 16:05:31 -0000	1.5
+++ sources	24 Dec 2009 18:10:18 -0000	1.6
@@ -1 +1 @@
-5f96e73ff4c3d552de55902da9255606  teeworlds-0.5.1-src.tar.gz
+f605f6df9f1714dcda4cba1d281cc757  teeworlds-0.5.2-src.tar.gz


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-12/teeworlds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- teeworlds.spec	27 Jul 2009 05:42:38 -0000	1.5
+++ teeworlds.spec	24 Dec 2009 18:10:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           teeworlds
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.5.2
+Release:        1%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
 Group:          Amusements/Games
@@ -9,12 +9,12 @@ URL:            http://www.teeworlds.com
 Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
 Source1:        %{name}.png
 Source2:        %{name}.desktop
-Patch1:         %{name}-0.5.1-extlibs.patch
-Patch2:         %{name}-0.5.1-optflags.patch
+Patch1:         %{name}-0.5.2-extlibs.patch
+Patch2:         %{name}-0.5.2-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mesa-libGLU-devel
-BuildRequires:  bam >= 0.2.0
+BuildRequires:  bam
 BuildRequires:  python-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -55,13 +55,13 @@ rm -rf src/engine/external
 %patch1 -p1
 %patch2 -p1
 
-iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
-touch -c -r readme.txt readme.txt.utf8
-mv readme.txt.utf8 readme.txt
-
-iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
-touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
-mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
+#iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
+#touch -c -r readme.txt readme.txt.utf8
+#mv readme.txt.utf8 readme.txt
+
+#iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
+#touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
+#mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
 
 %build
 CFLAGS="%{optflags}" bam -v release
@@ -117,6 +117,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- teeworlds-0.5.1-extlibs.patch DELETED ---


--- teeworlds-0.5.1-optflags.patch DELETED ---



From cassmodiah at fedoraproject.org  Thu Dec 24 18:10:21 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 24 Dec 2009 18:10:21 +0000 (UTC)
Subject: rpms/teeworlds/F-11 teeworlds-0.5.2-extlibs.patch, NONE,
	1.1 teeworlds-0.5.2-optflags.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 import.log, 1.1, 1.2 sources, 1.5, 1.6 teeworlds.spec, 1.4,
	1.5 teeworlds-0.5.1-extlibs.patch, 1.1,
	NONE teeworlds-0.5.1-optflags.patch, 1.1, NONE
Message-ID: <20091224181021.4B92611C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/teeworlds/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8444/F-11

Modified Files:
	.cvsignore import.log sources teeworlds.spec 
Added Files:
	teeworlds-0.5.2-extlibs.patch teeworlds-0.5.2-optflags.patch 
Removed Files:
	teeworlds-0.5.1-extlibs.patch teeworlds-0.5.1-optflags.patch 
Log Message:
0.5.1 -> 0.5.2


teeworlds-0.5.2-extlibs.patch:
 default.bam                   |   27 +++++++++++++++++++++++++--
 src/engine/client/ec_gfx.c    |    2 +-
 src/engine/client/ec_snd.c    |   26 +++++---------------------
 src/tools/dilate.c            |    5 ++++-
 src/tools/tileset_borderfix.c |    5 ++++-
 5 files changed, 39 insertions(+), 26 deletions(-)

--- NEW FILE teeworlds-0.5.2-extlibs.patch ---
diff -Naur teeworlds-0.5.2-src.orig/default.bam teeworlds-0.5.2-src/default.bam
--- teeworlds-0.5.2-src.orig/default.bam	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/default.bam	2009-12-24 18:57:43.000000000 +0100
@@ -7,6 +7,8 @@
 config:Add(OptFindCompiler())
 config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
 config:Add(OptFindLibrary("zlib", "zlib.h", false))
+config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false))
+config:Add(OptFindLibrary("pnglite", "sys/types.h", false))
 config:Add(SDL.OptFind("sdl", true))
 config:Finalize("config.bam")
 
@@ -151,8 +153,29 @@
 	end
 
 	-- build the small libraries
-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+	-- compile wavpack if needed
+	if config.wavpack.value == 1 then
+		settings.link.libs:Add("wavpack")
+		if config.wavpack.include_path then
+			settings.cc.includes:Add(config.wavpack.include_path)
+		end
+		wavpack = {}
+	else
+		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+		settings.cc.includes:Add("src/engine/external")
+	end
+
+	-- compile pnglite if needed
+	if config.pnglite.value == 1 then
+		settings.link.libs:Add("pnglite")
+		if config.pnglite.include_path then
+			settings.cc.includes:Add(config.pnglite.include_path)
+		end
+		pnglite = {}
+	else
+		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+		settings.cc.includes:Add("src/engine/external/pnglite")
+	end
 	
 	-- build game components
 	engine_settings = settings:Copy()
diff -Naur teeworlds-0.5.2-src.orig/src/engine/client/ec_gfx.c teeworlds-0.5.2-src/src/engine/client/ec_gfx.c
--- teeworlds-0.5.2-src.orig/src/engine/client/ec_gfx.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/engine/client/ec_gfx.c	2009-12-24 18:57:43.000000000 +0100
@@ -18,7 +18,7 @@
 #endif
 
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 #include <engine/e_client_interface.h>
 #include <engine/e_engine.h>
diff -Naur teeworlds-0.5.2-src.orig/src/engine/client/ec_snd.c teeworlds-0.5.2-src/src/engine/client/ec_snd.c
--- teeworlds-0.5.2-src.orig/src/engine/client/ec_snd.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/engine/client/ec_snd.c	2009-12-24 18:57:43.000000000 +0100
@@ -6,7 +6,7 @@
 
 #include "SDL.h"
 
-#include <engine/external/wavpack/wavpack.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -358,19 +358,12 @@
 	snd->num_frames = num_frames;
 }
 
-
-static IOHANDLE file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return io_read(file, buffer, size);
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
 	int sid = -1;
 	char error[100];
+	char completefilename[512];
 	WavpackContext *context;
 	
 	/* don't waste memory on sound when we are stress testing */
@@ -381,19 +374,13 @@
 	if(!sound_enabled)
 		return 1;
 
-	file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ);
+	context = WavpackOpenFileInput(completefilename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -410,7 +397,7 @@
 
 		if(snd->channels > 2)
 		{
-			dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", filename);
+			dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error);
 			return -1;
 		}
 
@@ -448,9 +435,6 @@
 		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
 	}
 
-	io_close(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -Naur teeworlds-0.5.2-src.orig/src/tools/dilate.c teeworlds-0.5.2-src/src/tools/dilate.c
--- teeworlds-0.5.2-src.orig/src/tools/dilate.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/tools/dilate.c	2009-12-24 18:57:43.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -Naur teeworlds-0.5.2-src.orig/src/tools/tileset_borderfix.c teeworlds-0.5.2-src/src/tools/tileset_borderfix.c
--- teeworlds-0.5.2-src.orig/src/tools/tileset_borderfix.c	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/tools/tileset_borderfix.c	2009-12-24 18:57:43.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {

teeworlds-0.5.2-optflags.patch:
 default.bam |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE teeworlds-0.5.2-optflags.patch ---
diff -Naur teeworlds-0.5.2-src.orig/default.bam teeworlds-0.5.2-src/default.bam
--- teeworlds-0.5.2-src.orig/default.bam	2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/default.bam	2009-12-24 18:55:37.000000000 +0100
@@ -106,6 +106,9 @@
 function build(settings)
 	--settings.objdir = Path("objs")
 	settings.cc.Output = Intermediate_Output
+	settings.cc.flags:Add(os.getenv ('CFLAGS'))
+	settings.cc.flags:Add(os.getenv ('CPPFLAGS'))
+	settings.cc.flags:Add(os.getenv ('LDFLAGS'))
 
 	if config.compiler.value == "cl" then
 		settings.cc.flags:Add("/wd4244")


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Mar 2009 16:05:31 -0000	1.5
+++ .cvsignore	24 Dec 2009 18:10:21 -0000	1.6
@@ -1 +1 @@
-teeworlds-0.5.1-src.tar.gz
+teeworlds-0.5.2-src.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Mar 2009 16:05:31 -0000	1.1
+++ import.log	24 Dec 2009 18:10:21 -0000	1.2
@@ -1 +1,2 @@
 teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659
+teeworlds-0_5_2-1_fc12:F-11:teeworlds-0.5.2-1.fc12.src.rpm:1261678128


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Mar 2009 16:05:31 -0000	1.5
+++ sources	24 Dec 2009 18:10:21 -0000	1.6
@@ -1 +1 @@
-5f96e73ff4c3d552de55902da9255606  teeworlds-0.5.1-src.tar.gz
+f605f6df9f1714dcda4cba1d281cc757  teeworlds-0.5.2-src.tar.gz


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/teeworlds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- teeworlds.spec	9 Mar 2009 16:05:31 -0000	1.4
+++ teeworlds.spec	24 Dec 2009 18:10:21 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           teeworlds
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
@@ -9,12 +9,12 @@ URL:            http://www.teeworlds.com
 Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
 Source1:        %{name}.png
 Source2:        %{name}.desktop
-Patch1:         %{name}-0.5.1-extlibs.patch
-Patch2:         %{name}-0.5.1-optflags.patch
+Patch1:         %{name}-0.5.2-extlibs.patch
+Patch2:         %{name}-0.5.2-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mesa-libGLU-devel
-BuildRequires:  bam >= 0.2.0
+BuildRequires:  bam
 BuildRequires:  python-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -55,13 +55,13 @@ rm -rf src/engine/external
 %patch1 -p1
 %patch2 -p1
 
-iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
-touch -c -r readme.txt readme.txt.utf8
-mv readme.txt.utf8 readme.txt
-
-iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
-touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
-mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
+#iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
+#touch -c -r readme.txt readme.txt.utf8
+#mv readme.txt.utf8 readme.txt
+
+#iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
+#touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
+#mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
 
 %build
 CFLAGS="%{optflags}" bam -v release
@@ -117,6 +117,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-1
+- New upstream release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 09 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.1-1
 - New upstream release
 


--- teeworlds-0.5.1-extlibs.patch DELETED ---


--- teeworlds-0.5.1-optflags.patch DELETED ---



From cassmodiah at fedoraproject.org  Thu Dec 24 18:35:29 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 24 Dec 2009 18:35:29 +0000 (UTC)
Subject: rpms/teeworlds/devel import.log,1.2,1.3 teeworlds.spec,1.6,1.7
Message-ID: <20091224183529.F1F0F11C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12114/devel

Modified Files:
	import.log teeworlds.spec 
Log Message:
add script to convert files from iso-8859-1 to utf8



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Dec 2009 18:10:16 -0000	1.2
+++ import.log	24 Dec 2009 18:35:29 -0000	1.3
@@ -1,2 +1,3 @@
 teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659
 teeworlds-0_5_2-1_fc12:HEAD:teeworlds-0.5.2-1.fc12.src.rpm:1261678124
+teeworlds-0_5_2-2_fc12:HEAD:teeworlds-0.5.2-2.fc12.src.rpm:1261679530


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/teeworlds.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- teeworlds.spec	24 Dec 2009 18:10:16 -0000	1.6
+++ teeworlds.spec	24 Dec 2009 18:35:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           teeworlds
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
 Group:          Amusements/Games
@@ -30,6 +30,7 @@ The game features cartoon-themed graphic
 and relies heavily on classic shooter weaponry and gameplay. 
 The controls are heavily inspired by the FPS genre of computer games. 
 
+
 %package        server
 Summary:        Server for %{name}
 Group:          Amusements/Games
@@ -39,6 +40,7 @@ Requires:       %{name}-data
 %description    server
 Data for %{name}, an online multi-player platform 2D shooter. 
 
+
 %package        data
 Summary:        Data-files for %{name}
 Group:          Amusements/Games
@@ -55,13 +57,13 @@ rm -rf src/engine/external
 %patch1 -p1
 %patch2 -p1
 
-#iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
-#touch -c -r readme.txt readme.txt.utf8
-#mv readme.txt.utf8 readme.txt
-
-#iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
-#touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
-#mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
+for f in ./readme.txt ./src/game/editor/array.hpp
+do
+  iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
+  touch -c -r $f $f.utf8
+  mv $f.utf8 $f
+done
+
 
 %build
 CFLAGS="%{optflags}" bam -v release
@@ -117,6 +119,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-2
+- convert iso files to utf8
+
 * Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-1
 - New upstream release
 



From cassmodiah at fedoraproject.org  Thu Dec 24 18:35:32 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 24 Dec 2009 18:35:32 +0000 (UTC)
Subject: rpms/teeworlds/F-12 import.log,1.2,1.3 teeworlds.spec,1.6,1.7
Message-ID: <20091224183532.962EB11C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/teeworlds/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12186/F-12

Modified Files:
	import.log teeworlds.spec 
Log Message:
add script to convert files from iso-8859-1 to utf8



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Dec 2009 18:10:18 -0000	1.2
+++ import.log	24 Dec 2009 18:35:32 -0000	1.3
@@ -1,2 +1,3 @@
 teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659
 teeworlds-0_5_2-1_fc12:F-12:teeworlds-0.5.2-1.fc12.src.rpm:1261678125
+teeworlds-0_5_2-2_fc12:F-12:teeworlds-0.5.2-2.fc12.src.rpm:1261679532


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-12/teeworlds.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- teeworlds.spec	24 Dec 2009 18:10:18 -0000	1.6
+++ teeworlds.spec	24 Dec 2009 18:35:32 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           teeworlds
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
 Group:          Amusements/Games
@@ -30,6 +30,7 @@ The game features cartoon-themed graphic
 and relies heavily on classic shooter weaponry and gameplay. 
 The controls are heavily inspired by the FPS genre of computer games. 
 
+
 %package        server
 Summary:        Server for %{name}
 Group:          Amusements/Games
@@ -39,6 +40,7 @@ Requires:       %{name}-data
 %description    server
 Data for %{name}, an online multi-player platform 2D shooter. 
 
+
 %package        data
 Summary:        Data-files for %{name}
 Group:          Amusements/Games
@@ -55,13 +57,13 @@ rm -rf src/engine/external
 %patch1 -p1
 %patch2 -p1
 
-#iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
-#touch -c -r readme.txt readme.txt.utf8
-#mv readme.txt.utf8 readme.txt
-
-#iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
-#touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
-#mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
+for f in ./readme.txt ./src/game/editor/array.hpp
+do
+  iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
+  touch -c -r $f $f.utf8
+  mv $f.utf8 $f
+done
+
 
 %build
 CFLAGS="%{optflags}" bam -v release
@@ -117,6 +119,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-2
+- convert iso files to utf8
+
 * Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-1
 - New upstream release
 



From cassmodiah at fedoraproject.org  Thu Dec 24 18:35:36 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 24 Dec 2009 18:35:36 +0000 (UTC)
Subject: rpms/teeworlds/F-11 import.log,1.2,1.3 teeworlds.spec,1.5,1.6
Message-ID: <20091224183536.29FE511C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/teeworlds/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12220/F-11

Modified Files:
	import.log teeworlds.spec 
Log Message:
add script to convert files from iso-8859-1 to utf8



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Dec 2009 18:10:21 -0000	1.2
+++ import.log	24 Dec 2009 18:35:35 -0000	1.3
@@ -1,2 +1,3 @@
 teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659
 teeworlds-0_5_2-1_fc12:F-11:teeworlds-0.5.2-1.fc12.src.rpm:1261678128
+teeworlds-0_5_2-2_fc12:F-11:teeworlds-0.5.2-2.fc12.src.rpm:1261679555


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/teeworlds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- teeworlds.spec	24 Dec 2009 18:10:21 -0000	1.5
+++ teeworlds.spec	24 Dec 2009 18:35:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           teeworlds
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
 Group:          Amusements/Games
@@ -30,6 +30,7 @@ The game features cartoon-themed graphic
 and relies heavily on classic shooter weaponry and gameplay. 
 The controls are heavily inspired by the FPS genre of computer games. 
 
+
 %package        server
 Summary:        Server for %{name}
 Group:          Amusements/Games
@@ -39,6 +40,7 @@ Requires:       %{name}-data
 %description    server
 Data for %{name}, an online multi-player platform 2D shooter. 
 
+
 %package        data
 Summary:        Data-files for %{name}
 Group:          Amusements/Games
@@ -55,13 +57,13 @@ rm -rf src/engine/external
 %patch1 -p1
 %patch2 -p1
 
-#iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
-#touch -c -r readme.txt readme.txt.utf8
-#mv readme.txt.utf8 readme.txt
-
-#iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
-#touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
-#mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
+for f in ./readme.txt ./src/game/editor/array.hpp
+do
+  iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
+  touch -c -r $f $f.utf8
+  mv $f.utf8 $f
+done
+
 
 %build
 CFLAGS="%{optflags}" bam -v release
@@ -117,6 +119,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-2
+- convert iso files to utf8
+
 * Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-1
 - New upstream release
 



From dwmw2 at fedoraproject.org  Thu Dec 24 18:56:44 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu, 24 Dec 2009 18:56:44 +0000 (UTC)
Subject: File exim-4.71.tar.bz2 uploaded to lookaside cache by dwmw2
Message-ID: <20091224185644.0C36210F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for exim:

f9c5a2d94b5bb132d06e2fff85bef75e  exim-4.71.tar.bz2



From dwmw2 at fedoraproject.org  Thu Dec 24 18:58:53 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu, 24 Dec 2009 18:58:53 +0000 (UTC)
Subject: File exim-html-4.71.tar.bz2 uploaded to lookaside cache by dwmw2
Message-ID: <20091224185853.1742710F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for exim-doc:

482dfebdc4502dfce1eeb8b1749b75c3  exim-html-4.71.tar.bz2



From dwmw2 at fedoraproject.org  Thu Dec 24 18:59:42 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu, 24 Dec 2009 18:59:42 +0000 (UTC)
Subject: File exim-pdf-4.71.tar.bz2 uploaded to lookaside cache by dwmw2
Message-ID: <20091224185942.2CC4010F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for exim-doc:

69a07c3fbfef5ca73b3c3aefb00125d9  exim-pdf-4.71.tar.bz2



From dwmw2 at fedoraproject.org  Thu Dec 24 19:00:14 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu, 24 Dec 2009 19:00:14 +0000 (UTC)
Subject: File exim-postscript-4.71.tar.bz2 uploaded to lookaside cache by dwmw2
Message-ID: <20091224190014.F3A5E10F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for exim-doc:

9aa0f1d13616e15550cf6371508ef1b4  exim-postscript-4.71.tar.bz2



From dwmw2 at fedoraproject.org  Thu Dec 24 19:00:25 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu, 24 Dec 2009 19:00:25 +0000 (UTC)
Subject: File exim-texinfo-4.71.tar.bz2 uploaded to lookaside cache by dwmw2
Message-ID: <20091224190025.AFE4210F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for exim-doc:

27d9bc3321854abfd8cb33dfb8c061a5  exim-texinfo-4.71.tar.bz2



From ndim at fedoraproject.org  Thu Dec 24 19:47:24 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Thu, 24 Dec 2009 19:47:24 +0000 (UTC)
Subject: File nted-1.9.13.tar.gz uploaded to lookaside cache by ndim
Message-ID: <20091224194724.2B38F10F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for nted:

144ee79c2b0b65be9d172d0c851db1dc  nted-1.9.13.tar.gz



From konradm at fedoraproject.org  Thu Dec 24 19:48:32 2009
From: konradm at fedoraproject.org (konradm)
Date: Thu, 24 Dec 2009 19:48:32 +0000 (UTC)
Subject: rpms/python-zdaemon/F-12 python-zdaemon.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091224194832.3041D11C00E6@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-zdaemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22330

Modified Files:
	.cvsignore sources 
Added Files:
	python-zdaemon.spec 
Log Message:
* Fri Oct 16 2009 Conrad Meyer <konrad at tylerc.org> - 2.0.4-2
- Add BR on python-setuptools.



--- NEW FILE python-zdaemon.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-zdaemon
Version:        2.0.4
Release:        2%{?dist}
Summary:        Python Daemon Process Control Library
Group:          Development/Languages
License:        ZPLv2.1
URL:            http://pypi.python.org/pypi/zdaemon/
Source0:        http://pypi.python.org/packages/source/z/zdaemon/zdaemon-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  python-zope-testing
BuildRequires:  python-ZConfig
Requires:       python-ZConfig


%description
Daemon process control library and tools for Unix-bases systems.


%prep
%setup -q -n zdaemon-%{version}
sed -i '1,1d' src/zdaemon/zdctl.py
sed -i '1,1d' src/zdaemon/zdrun.py
sed -i '1,1d' src/zdaemon/tests/nokill.py


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%check
export PYTHONPATH="$PYTHONPATH:$RPM_BUILD_ROOT%{python_sitelib}"
%{__python} build/lib/zdaemon/tests/tests.py

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt README.txt
%{python_sitelib}/zdaemon
%{python_sitelib}/zdaemon-%{version}-py?.?.egg-info
%{_bindir}/zdaemon


%changelog
* Fri Oct 16 2009 Conrad Meyer <konrad at tylerc.org> - 2.0.4-2
- Add BR on python-setuptools.

* Wed Apr 22 2009 Conrad Meyer <konrad at tylerc.org> - 2.0.4-1
- Bump to 2.0.4.

* Mon Dec 15 2008 Conrad Meyer <konrad at tylerc.org> - 2.0.2-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zdaemon/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Dec 2009 06:59:48 -0000	1.1
+++ .cvsignore	24 Dec 2009 19:48:31 -0000	1.2
@@ -0,0 +1 @@
+zdaemon-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zdaemon/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Dec 2009 06:59:49 -0000	1.1
+++ sources	24 Dec 2009 19:48:32 -0000	1.2
@@ -0,0 +1 @@
+7d358297df480abe93b6565fc0213c34  zdaemon-2.0.4.tar.gz



From konradm at fedoraproject.org  Thu Dec 24 19:48:59 2009
From: konradm at fedoraproject.org (konradm)
Date: Thu, 24 Dec 2009 19:48:59 +0000 (UTC)
Subject: rpms/python-zdaemon/F-11 python-zdaemon.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091224194859.5338411C00E6@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-zdaemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22507

Modified Files:
	.cvsignore sources 
Added Files:
	python-zdaemon.spec 
Log Message:
* Fri Oct 16 2009 Conrad Meyer <konrad at tylerc.org> - 2.0.4-2
- Add BR on python-setuptools.



--- NEW FILE python-zdaemon.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-zdaemon
Version:        2.0.4
Release:        2%{?dist}
Summary:        Python Daemon Process Control Library
Group:          Development/Languages
License:        ZPLv2.1
URL:            http://pypi.python.org/pypi/zdaemon/
Source0:        http://pypi.python.org/packages/source/z/zdaemon/zdaemon-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  python-zope-testing
BuildRequires:  python-ZConfig
Requires:       python-ZConfig


%description
Daemon process control library and tools for Unix-bases systems.


%prep
%setup -q -n zdaemon-%{version}
sed -i '1,1d' src/zdaemon/zdctl.py
sed -i '1,1d' src/zdaemon/zdrun.py
sed -i '1,1d' src/zdaemon/tests/nokill.py


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%check
export PYTHONPATH="$PYTHONPATH:$RPM_BUILD_ROOT%{python_sitelib}"
%{__python} build/lib/zdaemon/tests/tests.py

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt README.txt
%{python_sitelib}/zdaemon
%{python_sitelib}/zdaemon-%{version}-py?.?.egg-info
%{_bindir}/zdaemon


%changelog
* Fri Oct 16 2009 Conrad Meyer <konrad at tylerc.org> - 2.0.4-2
- Add BR on python-setuptools.

* Wed Apr 22 2009 Conrad Meyer <konrad at tylerc.org> - 2.0.4-1
- Bump to 2.0.4.

* Mon Dec 15 2008 Conrad Meyer <konrad at tylerc.org> - 2.0.2-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zdaemon/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Dec 2009 06:59:48 -0000	1.1
+++ .cvsignore	24 Dec 2009 19:48:59 -0000	1.2
@@ -0,0 +1 @@
+zdaemon-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zdaemon/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Dec 2009 06:59:49 -0000	1.1
+++ sources	24 Dec 2009 19:48:59 -0000	1.2
@@ -0,0 +1 @@
+7d358297df480abe93b6565fc0213c34  zdaemon-2.0.4.tar.gz



From konradm at fedoraproject.org  Thu Dec 24 19:58:02 2009
From: konradm at fedoraproject.org (konradm)
Date: Thu, 24 Dec 2009 19:58:02 +0000 (UTC)
Subject: rpms/python-ZConfig/F-11 python-ZConfig.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091224195802.7CEA511C00E6@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-ZConfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23874

Modified Files:
	.cvsignore sources 
Added Files:
	python-ZConfig.spec 
Log Message:
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



--- NEW FILE python-ZConfig.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-ZConfig
Version:        2.7.1
Release:        2%{?dist}
Summary:        Structured Configuration Library
Group:          Development/Languages
License:        ZPLv2.1
URL:            http://www.zope.org/Members/fdrake/zconfig/
Source0:        http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-zope-testing


%description
ZConfig is a configuration library intended for general use. It supports
a hierarchical schema-driven configuration model that allows a schema to
specify data conversion routines written in Python. ZConfig's model is
very different from the model supported by the ConfigParser module found
in Python's standard library, and is more suitable to
configuration-intensive applications.


%prep
%setup -q -n ZConfig-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


#%%check
#%{__python} setup.py test

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc NEWS.txt doc/zconfig.pdf
%{python_sitelib}/*
%{_bindir}/zconfig
%{_bindir}/zconfig_schema2html


%changelog
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Jun 18 2009 Conrad Meyer <konrad at tylerc.org> - 2.7.1-1
- New version.

* Sun Dec 14 2008 Conrad Meyer <konrad at tylerc.org> - 2.6.1-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ZConfig/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:23:01 -0000	1.1
+++ .cvsignore	24 Dec 2009 19:58:02 -0000	1.2
@@ -0,0 +1 @@
+ZConfig-2.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ZConfig/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Apr 2009 16:23:01 -0000	1.1
+++ sources	24 Dec 2009 19:58:02 -0000	1.2
@@ -0,0 +1 @@
+13216e1f7e4ab25782d3cf60451498fa  ZConfig-2.7.1.tar.gz



From ndim at fedoraproject.org  Thu Dec 24 20:04:05 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Thu, 24 Dec 2009 20:04:05 +0000 (UTC)
Subject: rpms/nted/devel .cvsignore, 1.16, 1.17 nted.spec, 1.24, 1.25 sources, 
	1.16, 1.17
Message-ID: <20091224200405.8756B11C00E6@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24874

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Thu Dec 24 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.13-1
- Update to 1.9.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	4 Dec 2009 18:19:00 -0000	1.16
+++ .cvsignore	24 Dec 2009 20:04:05 -0000	1.17
@@ -1 +1 @@
-nted-1.9.10.tar.gz
+nted-1.9.13.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nted.spec	4 Dec 2009 18:19:00 -0000	1.24
+++ nted.spec	24 Dec 2009 20:04:05 -0000	1.25
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.9.10
+Version:        1.9.13
 Release:        1%{?dist}
 Summary:        Musical score editor
 
@@ -124,6 +124,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.13-1
+- Update to 1.9.13
+
 * Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
 - Update to 1.9.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	4 Dec 2009 18:19:00 -0000	1.16
+++ sources	24 Dec 2009 20:04:05 -0000	1.17
@@ -1 +1 @@
-9d65b818a83a698d0d63bb3694d00ed3  nted-1.9.10.tar.gz
+144ee79c2b0b65be9d172d0c851db1dc  nted-1.9.13.tar.gz



From ndim at fedoraproject.org  Thu Dec 24 20:05:40 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Thu, 24 Dec 2009 20:05:40 +0000 (UTC)
Subject: rpms/nted/F-11 .cvsignore, 1.16, 1.17 nted.spec, 1.22, 1.23 sources, 
	1.16, 1.17
Message-ID: <20091224200540.6205211C00E6@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25215

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Thu Dec 24 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.13-1
- Update to 1.9.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	4 Dec 2009 18:20:34 -0000	1.16
+++ .cvsignore	24 Dec 2009 20:05:39 -0000	1.17
@@ -1 +1 @@
-nted-1.9.10.tar.gz
+nted-1.9.13.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/nted.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nted.spec	4 Dec 2009 18:20:34 -0000	1.22
+++ nted.spec	24 Dec 2009 20:05:39 -0000	1.23
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.9.10
+Version:        1.9.13
 Release:        1%{?dist}
 Summary:        Musical score editor
 
@@ -124,6 +124,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.13-1
+- Update to 1.9.13
+
 * Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
 - Update to 1.9.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	4 Dec 2009 18:20:34 -0000	1.16
+++ sources	24 Dec 2009 20:05:40 -0000	1.17
@@ -1 +1 @@
-9d65b818a83a698d0d63bb3694d00ed3  nted-1.9.10.tar.gz
+144ee79c2b0b65be9d172d0c851db1dc  nted-1.9.13.tar.gz



From ndim at fedoraproject.org  Thu Dec 24 20:05:40 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Thu, 24 Dec 2009 20:05:40 +0000 (UTC)
Subject: rpms/nted/F-12 .cvsignore, 1.16, 1.17 nted.spec, 1.24, 1.25 sources, 
	1.16, 1.17
Message-ID: <20091224200540.97CE411C02BB@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25227

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Thu Dec 24 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.13-1
- Update to 1.9.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	4 Dec 2009 18:20:34 -0000	1.16
+++ .cvsignore	24 Dec 2009 20:05:39 -0000	1.17
@@ -1 +1 @@
-nted-1.9.10.tar.gz
+nted-1.9.13.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/nted.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nted.spec	4 Dec 2009 18:20:34 -0000	1.24
+++ nted.spec	24 Dec 2009 20:05:40 -0000	1.25
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.9.10
+Version:        1.9.13
 Release:        1%{?dist}
 Summary:        Musical score editor
 
@@ -124,6 +124,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.13-1
+- Update to 1.9.13
+
 * Fri Dec  4 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.10-1
 - Update to 1.9.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	4 Dec 2009 18:20:34 -0000	1.16
+++ sources	24 Dec 2009 20:05:40 -0000	1.17
@@ -1 +1 @@
-9d65b818a83a698d0d63bb3694d00ed3  nted-1.9.10.tar.gz
+144ee79c2b0b65be9d172d0c851db1dc  nted-1.9.13.tar.gz



From dwmw2 at fedoraproject.org  Thu Dec 24 20:11:03 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Thu, 24 Dec 2009 20:11:03 +0000 (UTC)
Subject: rpms/exim/devel exim-4.71-dlopen-localscan.patch, NONE,
	1.1 exim-4.71-dynlookup.patch, NONE, 1.1 .cvsignore, 1.15,
	1.16 exim-4.50-config.patch, 1.9, 1.10 exim.spec, 1.70,
	1.71 sources, 1.15, 1.16 exim-4.52-dynamic-pcre.patch, 1.2,
	NONE exim-4.62-dlopen-localscan.patch, 1.4,
	NONE exim-4.69-dynlookup.patch, 1.2,
	NONE exim-4.69-expand-spamd.patch, 1.1, NONE
Message-ID: <20091224201103.4052611C00E6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26295

Modified Files:
	.cvsignore exim-4.50-config.patch exim.spec sources 
Added Files:
	exim-4.71-dlopen-localscan.patch exim-4.71-dynlookup.patch 
Removed Files:
	exim-4.52-dynamic-pcre.patch exim-4.62-dlopen-localscan.patch 
	exim-4.69-dynlookup.patch exim-4.69-expand-spamd.patch 
Log Message:
4.71

exim-4.71-dlopen-localscan.patch:
 EDITME            |   14 ++++
 config.h.defaults |    2 
 globals.c         |    3 
 globals.h         |    3 
 local_scan.c      |  165 ++++++++++++++++++++++++++++++++++++++----------------
 readconf.c        |    3 
 6 files changed, 143 insertions(+), 47 deletions(-)

--- NEW FILE exim-4.71-dlopen-localscan.patch ---
--- exim-4.71/src/globals.c.dl	2009-11-16 19:50:37.000000000 +0000
+++ exim-4.71/src/globals.c	2009-12-24 19:27:17.000000000 +0000
@@ -129,6 +129,9 @@ uschar *tls_verify_certificates= NULL;
 uschar *tls_verify_hosts       = NULL;
 #endif
 
+#ifdef DLOPEN_LOCAL_SCAN
+uschar *local_scan_path        = NULL;
+#endif
 
 /* Input-reading functions for messages, so we can use special ones for
 incoming TCP/IP. The defaults use stdin. We never need these for any
--- exim-4.71/src/config.h.defaults.dl	2009-11-16 19:50:36.000000000 +0000
+++ exim-4.71/src/config.h.defaults	2009-12-24 19:27:17.000000000 +0000
@@ -27,6 +27,8 @@ it's a default value. */
 
 #define AUTH_VARS                     3
 
+#define DLOPEN_LOCAL_SCAN
+
 #define BIN_DIRECTORY
 
 #define CONFIGURE_FILE
--- exim-4.71/src/readconf.c.dl	2009-11-16 19:50:37.000000000 +0000
+++ exim-4.71/src/readconf.c	2009-12-24 19:27:17.000000000 +0000
@@ -269,6 +269,9 @@ static optionlist optionlist_config[] = 
   { "local_from_prefix",        opt_stringptr,   &local_from_prefix },
   { "local_from_suffix",        opt_stringptr,   &local_from_suffix },
   { "local_interfaces",         opt_stringptr,   &local_interfaces },
+#ifdef DLOPEN_LOCAL_SCAN
+  { "local_scan_path",          opt_stringptr,   &local_scan_path },
+#endif
   { "local_scan_timeout",       opt_time,        &local_scan_timeout },
   { "local_sender_retain",      opt_bool,        &local_sender_retain },
   { "localhost_number",         opt_stringptr,   &host_number_string },
--- exim-4.71/src/local_scan.c.dl	2009-11-16 19:50:37.000000000 +0000
+++ exim-4.71/src/local_scan.c	2009-12-24 19:27:17.000000000 +0000
@@ -7,60 +7,131 @@
 /* Copyright (c) University of Cambridge 1995 - 2009 */
 /* See the file NOTICE for conditions of use and distribution. */
 
+#include "exim.h"
 
-/******************************************************************************
-This file contains a template local_scan() function that just returns ACCEPT.
-If you want to implement your own version, you should copy this file to, say
-Local/local_scan.c, and edit the copy. To use your version instead of the
-default, you must set
-
-LOCAL_SCAN_SOURCE=Local/local_scan.c
-
-in your Local/Makefile. This makes it easy to copy your version for use with
-subsequent Exim releases.
-
-For a full description of the API to this function, see the Exim specification.
-******************************************************************************/
-
-
-/* This is the only Exim header that you should include. The effect of
-including any other Exim header is not defined, and may change from release to
-release. Use only the documented interface! */
-
-#include "local_scan.h"
-
-
-/* This is a "do-nothing" version of a local_scan() function. The arguments
-are:
-
-  fd             The file descriptor of the open -D file, which contains the
-                   body of the message. The file is open for reading and
-                   writing, but modifying it is dangerous and not recommended.
-
-  return_text    A pointer to an unsigned char* variable which you can set in
-                   order to return a text string. It is initialized to NULL.
-
-The return values of this function are:
-
-  LOCAL_SCAN_ACCEPT
-                 The message is to be accepted. The return_text argument is
-                   saved in $local_scan_data.
-
-  LOCAL_SCAN_REJECT
-                 The message is to be rejected. The returned text is used
-                   in the rejection message.
-
-  LOCAL_SCAN_TEMPREJECT
-                 This specifies a temporary rejection. The returned text
-                   is used in the rejection message.
-*/
+#ifdef DLOPEN_LOCAL_SCAN
+#include <dlfcn.h>
+static int (*local_scan_fn)(int fd, uschar **return_text) = NULL;
+static int load_local_scan_library(void);
+#endif
 
 int
 local_scan(int fd, uschar **return_text)
 {
 fd = fd;                      /* Keep picky compilers happy */
 return_text = return_text;
-return LOCAL_SCAN_ACCEPT;
+#ifdef DLOPEN_LOCAL_SCAN
+/* local_scan_path is defined AND not the empty string */
+if (local_scan_path && *local_scan_path)
+  {
+  if (!local_scan_fn)
+    {
+    if (!load_local_scan_library())
+      {
+        char *base_msg , *error_msg , *final_msg ;
+        int final_length = -1 ;
+
+        base_msg=US"Local configuration error - local_scan() library failure\n";
+        error_msg = dlerror() ;
+
+        final_length = strlen(base_msg) + strlen(error_msg) + 1 ;
+        final_msg = (char*)malloc( final_length*sizeof(char) ) ;
+        *final_msg = '\0' ;
+
+        strcat( final_msg , base_msg ) ;
+        strcat( final_msg , error_msg ) ;
+
+        *return_text = final_msg ;
+      return LOCAL_SCAN_TEMPREJECT;
+      }
+    }
+    return local_scan_fn(fd, return_text);
+  }
+else
+#endif
+  return LOCAL_SCAN_ACCEPT;
+}
+
+#ifdef DLOPEN_LOCAL_SCAN
+
+static int load_local_scan_library(void)
+{
+/* No point in keeping local_scan_lib since we'll never dlclose() anyway */
+void *local_scan_lib = NULL;
+int (*local_scan_version_fn)(void);
+int vers_maj;
+int vers_min;
+
+local_scan_lib = dlopen(local_scan_path, RTLD_NOW);
+if (!local_scan_lib)
+  {
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - "
+    "message temporarily rejected");
+  return FALSE;
+  }
+
+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major");
+if (!local_scan_version_fn)
+  {
+  dlclose(local_scan_lib);
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
+    "local_scan_version_major() function - message temporarily rejected");
+  return FALSE;
+  }
+
+/* The major number is increased when the ABI is changed in a non
+   backward compatible way. */
+vers_maj = local_scan_version_fn();
+
+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor");
+if (!local_scan_version_fn)
+  {
+  dlclose(local_scan_lib);
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
+    "local_scan_version_minor() function - message temporarily rejected");
+  return FALSE;
+  }
+
+/* The minor number is increased each time a new feature is added (in a
+   way that doesn't break backward compatibility) -- Marc */
+vers_min = local_scan_version_fn();
+
+
+if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR)
+  {
+  dlclose(local_scan_lib);
+  local_scan_lib = NULL;
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major"
+    "version number, you need to recompile your module for this version"
+    "of exim (The module was compiled for version %d.%d and this exim provides"
+    "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
+    LOCAL_SCAN_ABI_VERSION_MINOR);
+  return FALSE;
+  }
+else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR)
+  {
+  dlclose(local_scan_lib);
+  local_scan_lib = NULL;
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor"
+    "version number, you need to recompile your module for this version"
+    "of exim (The module was compiled for version %d.%d and this exim provides"
+    "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
+    LOCAL_SCAN_ABI_VERSION_MINOR);
+  return FALSE;
+  }
+
+local_scan_fn = dlsym(local_scan_lib, "local_scan");
+if (!local_scan_fn)
+  {
+  dlclose(local_scan_lib);
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
+    "local_scan() function - message temporarily rejected");      
+  return FALSE;
+  }
+
+return TRUE;
 }
 
+#endif /* DLOPEN_LOCAL_SCAN */
+
 /* End of local_scan.c */
--- exim-4.71/src/globals.h.dl	2009-11-16 19:50:37.000000000 +0000
+++ exim-4.71/src/globals.h	2009-12-24 19:27:17.000000000 +0000
@@ -89,6 +89,9 @@ extern uschar *tls_verify_certificates;/
 extern uschar *tls_verify_hosts;       /* Mandatory client verification */
 #endif
 
+#ifdef DLOPEN_LOCAL_SCAN
+extern uschar *local_scan_path;        /* Path to local_scan() library */
+#endif
 
 /* Input-reading functions for messages, so we can use special ones for
 incoming TCP/IP. */
--- exim-4.71/src/EDITME.dl	2009-12-24 19:26:59.000000000 +0000
+++ exim-4.71/src/EDITME	2009-12-24 19:27:17.000000000 +0000
@@ -632,6 +632,20 @@ TLS_LIBS=-lssl -lcrypto
 
 
 #------------------------------------------------------------------------------
+# On systems which support dynamic loading of shared libraries, Exim can
+# load a local_scan function specified in its config file instead of having
+# to be recompiled with the desired local_scan function. For a full 
+# description of the API to this function, see the Exim specification.
+
+DLOPEN_LOCAL_SCAN=yes
+
+# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
+# linker flags.  Without it, the loaded .so won't be able to access any
+# functions from exim.
+
+LFLAGS=-rdynamic -ldl
+
+#------------------------------------------------------------------------------
 # The default distribution of Exim contains only the plain text form of the
 # documentation. Other forms are available separately. If you want to install
 # the documentation in "info" format, first fetch the Texinfo documentation

exim-4.71-dynlookup.patch:
 Makefile                   |    2 
 OS/Makefile-Base           |    1 
 scripts/Configure-Makefile |    2 
 scripts/MakeLinks          |    1 
 src/EDITME                 |   16 
 src/config.h.defaults      |    2 
 src/drtables.c             |  747 +++++++++++++--------------------------------
 src/exim.c                 |   38 +-
 src/expand.c               |    4 
 src/globals.c              |   15 
 src/globals.h              |    2 
 src/lookupapi.h            |   58 +++
 src/lookups/Makefile       |  231 ++++++++++++-
 src/lookups/cdb.c          |   29 +
 src/lookups/cdb.h          |   59 ---
 src/lookups/dbmdb.c        |   40 ++
 src/lookups/dbmdb.h        |   21 -
 src/lookups/dnsdb.c        |   23 +
 src/lookups/dnsdb.h        |   16 
 src/lookups/dsearch.c      |   27 +
 src/lookups/dsearch.h      |   18 -
 src/lookups/ibase.c        |   31 +
 src/lookups/ibase.h        |   18 -
 src/lookups/ldap.c         |   66 ++-
 src/lookups/ldap.h         |   11 
 src/lookups/lsearch.c      |   69 +++-
 src/lookups/lsearch.h      |   25 -
 src/lookups/mysql.c        |   43 +-
 src/lookups/mysql.h        |   18 -
 src/lookups/nis.c          |   48 +-
 src/lookups/nis.h          |   18 -
 src/lookups/nisplus.c      |   39 +-
 src/lookups/nisplus.h      |   17 -
 src/lookups/oracle.c       |   41 +-
 src/lookups/oracle.h       |   18 -
 src/lookups/passwd.c       |   23 +
 src/lookups/passwd.h       |   16 
 src/lookups/pgsql.c        |   41 +-
 src/lookups/pgsql.h        |   18 -
 src/lookups/spf.c          |   25 +
 src/lookups/spf.h          |   26 -
 src/lookups/sqlite.c       |   30 +
 src/lookups/sqlite.h       |   18 -
 src/lookups/testdb.c       |   23 +
 src/lookups/testdb.h       |   16 
 src/lookups/whoson.c       |   37 +-
 src/lookups/whoson.h       |   16 
 src/macros.h               |    2 
 src/search.c               |   22 -
 src/structs.h              |   29 -
 src/verify.c               |    2 
 51 files changed, 992 insertions(+), 1166 deletions(-)

--- NEW FILE exim-4.71-dynlookup.patch ---
diff -uNr exim-4.71/Makefile exim-4.71-dynlookup/Makefile
--- exim-4.71/Makefile	2009-11-16 19:50:36.000000000 +0000
+++ exim-4.71-dynlookup/Makefile	2009-12-24 19:54:45.000000000 +0000
@@ -81,7 +81,7 @@
 
 clean_exim:; cd build-$(buildname); \
 	 $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
-	routers/*.o routers/*.a transports/*.o transports/*.a
+	routers/*.o routers/*.a transports/*.o transports/*.a lookups/*.so
 
 distclean:; $(RM_COMMAND) -rf build-*
 
diff -uNr exim-4.71/OS/Makefile-Base exim-4.71-dynlookup/OS/Makefile-Base
--- exim-4.71/OS/Makefile-Base	2009-06-10 08:34:04.000000000 +0100
+++ exim-4.71-dynlookup/OS/Makefile-Base	2009-12-24 19:54:45.000000000 +0000
@@ -313,6 +313,7 @@
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o \
         route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
         store.o string.o tls.o tod.o transport.o tree.o verify.o \
+        lookups/lf_quote.o lookups/lf_check_file.o lookups/lf_sqlperform.o \
         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
 
diff -uNr exim-4.71/scripts/Configure-Makefile exim-4.71-dynlookup/scripts/Configure-Makefile
--- exim-4.71/scripts/Configure-Makefile	2009-11-20 21:22:20.000000000 +0000
+++ exim-4.71-dynlookup/scripts/Configure-Makefile	2009-12-24 19:54:45.000000000 +0000
@@ -107,7 +107,7 @@
             echo "# End of $f"
             echo ""
      fi
-done >> $mft || exit 1
+done | sed 's/^LOOKUP_/export LOOKUP_/' >> $mft || exit 1
 
 # See if there is a definition of EXIM_PERL in what we have built so far.
 # If so, run Perl to find the default values for PERL_CC, PERL_CCOPTS,
diff -uNr exim-4.71/scripts/MakeLinks exim-4.71-dynlookup/scripts/MakeLinks
--- exim-4.71/scripts/MakeLinks	2009-11-13 15:58:17.000000000 +0000
+++ exim-4.71-dynlookup/scripts/MakeLinks	2009-12-24 19:54:45.000000000 +0000
@@ -197,6 +197,7 @@
 ln -s ../src/osfunctions.h     osfunctions.h
 ln -s ../src/store.h           store.h
 ln -s ../src/structs.h         structs.h
+ln -s ../src/lookupapi.h       lookupapi.h
 
 ln -s ../src/acl.c             acl.c
 ln -s ../src/buildconfig.c     buildconfig.c
diff -uNr exim-4.71/src/config.h.defaults exim-4.71-dynlookup/src/config.h.defaults
--- exim-4.71/src/config.h.defaults	2009-11-16 19:50:36.000000000 +0000
+++ exim-4.71-dynlookup/src/config.h.defaults	2009-12-24 19:54:45.000000000 +0000
@@ -90,6 +90,8 @@
 #define LOOKUP_WILDLSEARCH
 #define LOOKUP_NWILDLSEARCH
 
+#define LOOKUP_MODULE_DIR
+
 #define MAX_FILTER_SIZE           (1024*1024)
 #define MAX_LOCALHOST_NUMBER        256
 #define MAX_INCLUDE_SIZE          (1024*1024)
diff -uNr exim-4.71/src/drtables.c exim-4.71-dynlookup/src/drtables.c
--- exim-4.71/src/drtables.c	2009-11-16 19:50:36.000000000 +0000
+++ exim-4.71-dynlookup/src/drtables.c	2009-12-24 19:54:45.000000000 +0000
@@ -10,6 +10,8 @@
 
 #include "exim.h"
 
+#include <dlfcn.h>
+#include <string.h>
 
 /* This module contains tables that define the lookup methods and drivers
 that are actually included in the binary. Its contents are controlled by
@@ -17,527 +19,8 @@
 all described in src/EDITME. */
 
 
-/* The OSF1 (Digital Unix) linker puts out a worrying warning if any sections
-contain no executable code. It says
-
-Warning: Linking some objects which contain exception information sections
-        and some which do not. This may cause fatal runtime exception handling
-        problems.
-
-As this may cause people to worry needlessly, include a dummy function here
-to stop the message from appearing. Make it call itself to stop picky compilers
-compilers complaining that it is unused, and put in a dummy argument to stop
-even pickier compilers complaining about infinite loops. */
-
-static void dummy(int x) { dummy(x-1); }
-
-
-/* Table of information about all possible lookup methods. The entries are
-always present, but the "open" and "find" functions are set to NULL for those
-that are not compiled into the binary. The "check" and "close" functions can
-be NULL for methods that don't need them. */
-
-#ifdef LOOKUP_CDB
-#include "lookups/cdb.h"
-#endif
-
-#ifdef LOOKUP_DBM
-#include "lookups/dbmdb.h"
-#endif
-
-#ifdef LOOKUP_DNSDB
-#include "lookups/dnsdb.h"
-#endif
-
-#ifdef LOOKUP_DSEARCH
-#include "lookups/dsearch.h"
-#endif
-
-#ifdef LOOKUP_IBASE
-#include "lookups/ibase.h"
-#endif
-
-#ifdef LOOKUP_LDAP
-#include "lookups/ldap.h"
-#endif
-
-#ifdef LOOKUP_LSEARCH
-#include "lookups/lsearch.h"
-#endif
-
-#ifdef LOOKUP_MYSQL
-#include "lookups/mysql.h"
-#endif
-
-#ifdef LOOKUP_NIS
-#include "lookups/nis.h"
-#endif
-
-#ifdef LOOKUP_NISPLUS
-#include "lookups/nisplus.h"
-#endif
-
-#ifdef LOOKUP_ORACLE
-#include "lookups/oracle.h"
-#endif
-
-#ifdef LOOKUP_PASSWD
-#include "lookups/passwd.h"
-#endif
-
-#ifdef LOOKUP_PGSQL
-#include "lookups/pgsql.h"
-#endif
-
-#ifdef EXPERIMENTAL_SPF
-#include "lookups/spf.h"
-#endif
-
-#ifdef LOOKUP_SQLITE
-#include "lookups/sqlite.h"
-#endif
-
-#ifdef LOOKUP_TESTDB
-#include "lookups/testdb.h"
-#endif
-
-#ifdef LOOKUP_WHOSON
-#include "lookups/whoson.h"
-#endif
-
-/* The second field in each item below is a set of bit flags:
-
-  lookup_querystyle     => this is a query-style lookup,
-                             else single-key (+ file) style
-  lookup_absfile        => an absolute file name is required,
-                             (for single-key style only)
-
-This list must be in alphabetical order of lookup name because it is
-searched by binary chop, having got rather large for the original linear
-searching. */
-
-lookup_info lookup_list[] = {
-
-/* cdb lookup in single file */
-
-  {
-  US"cdb",                       /* lookup name */
-  lookup_absfile,                /* uses absolute file name */
-#ifdef LOOKUP_CDB
-  cdb_open,                      /* open function */
-  cdb_check,                     /* check function */
-  cdb_find,                      /* find function */
-  cdb_close,                     /* close function */
-  NULL,                          /* no tidy function */
-  NULL                           /* no quoting function */
-#else
-  NULL, NULL, NULL, NULL, NULL, NULL /* lookup not present */
-#endif
-  },
-
-/* DBM file lookup; called "dbm" because that is the name in Exim,
-but the code is called dbmdb to avoid name clashes. */
-
-  {
-  US"dbm",                       /* lookup name */
-  lookup_absfile,                /* uses absolute file name */
-#ifdef LOOKUP_DBM
[...2829 lines suppressed...]
+static int
 whoson_find(void *handle, uschar *filename, uschar *query, int length,
   uschar **result, uschar **errmsg, BOOL *do_cache)
 {
@@ -77,6 +62,22 @@
   }
 }
 
-#endif  /* LOOKUP_WHOSON */
+static lookup_info _lookup_info = {
+  US"whoson",                    /* lookup name */
+  lookup_querystyle,             /* query-style lookup */
+  whoson_open,                   /* open function */
+  NULL,                          /* check function */
+  whoson_find,                   /* find function */
+  NULL,                          /* no close function */
+  NULL,                          /* no tidy function */
+  NULL                           /* no quoting function */
+};
+
+#ifdef DYNLOOKUP
+#define whoson_lookup_module_info _lookup_module_info
+#endif
+
+static lookup_info *_lookup_list[] = { &_lookup_info };
+lookup_module_info whoson_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 1 };
 
 /* End of lookups/whoson.c */
diff -uNr exim-4.71/src/lookups/whoson.h exim-4.71-dynlookup/src/lookups/whoson.h
--- exim-4.71/src/lookups/whoson.h	2009-11-16 19:50:38.000000000 +0000
+++ exim-4.71-dynlookup/src/lookups/whoson.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-/* $Cambridge: exim/exim-src/src/lookups/whoson.h,v 1.5 2009/11/16 19:50:38 nm4 Exp $ */
-
-/*************************************************
-*     Exim - an Internet mail transport agent    *
-*************************************************/
-
-/* Copyright (c) University of Cambridge 1995 - 2009 */
-/* See the file NOTICE for conditions of use and distribution. */
-
-/* Header for the whoson lookup */
-
-extern void *whoson_open(uschar *, uschar **);
-extern int   whoson_find(void *, uschar *, uschar *, int, uschar **, uschar **,
-               BOOL *);
-
-/* End of lookups/whoson.h */
diff -uNr exim-4.71/src/macros.h exim-4.71-dynlookup/src/macros.h
--- exim-4.71/src/macros.h	2009-11-16 19:50:37.000000000 +0000
+++ exim-4.71-dynlookup/src/macros.h	2009-12-24 19:54:55.000000000 +0000
@@ -96,7 +96,7 @@
 
 /* A macro to simplify testing bits in lookup types */
 
-#define mac_islookup(a,b) ((lookup_list[a].type & (b)) != 0)
+#define mac_islookup(a,b) ((lookup_list[a]->type & (b)) != 0)
 
 /* Debugging control */
 
diff -uNr exim-4.71/src/search.c exim-4.71-dynlookup/src/search.c
--- exim-4.71/src/search.c	2009-11-16 19:50:37.000000000 +0000
+++ exim-4.71-dynlookup/src/search.c	2009-12-24 19:54:55.000000000 +0000
@@ -71,7 +71,7 @@
 while (top > bot)
   {
   int mid = (top + bot)/2;
-  int c = Ustrncmp(name, lookup_list[mid].name, len);
+  int c = Ustrncmp(name, lookup_list[mid]->name, len);
 
   /* If c == 0 we have matched the incoming name with the start of the search
   type name. However, some search types are substrings of others (e.g. nis and
@@ -81,9 +81,9 @@
   are testing. By leaving c == 0 when the lengths are different, and doing a
   > 0 test below, this all falls out correctly. */
 
-  if (c == 0 && Ustrlen(lookup_list[mid].name) == len)
+  if (c == 0 && Ustrlen(lookup_list[mid]->name) == len)
     {
-    if (lookup_list[mid].find != NULL) return mid;
+    if (lookup_list[mid]->find != NULL) return mid;
     search_error_message  = string_sprintf("lookup type \"%.*s\" is not "
       "available (not in the binary - check buildtime LOOKUP configuration)",
       len, name);
@@ -237,8 +237,8 @@
 if (t->right != NULL) tidyup_subtree(t->right);
 if (c != NULL &&
     c->handle != NULL &&
-    lookup_list[c->search_type].close != NULL)
-  lookup_list[c->search_type].close(c->handle);
+    lookup_list[c->search_type]->close != NULL)
+  lookup_list[c->search_type]->close(c->handle);
 }
 
 
@@ -270,7 +270,7 @@
 /* Call the general tidyup entry for any drivers that have one. */
 
 for (i = 0; i < lookup_list_count; i++)
-  if (lookup_list[i].tidy != NULL) (lookup_list[i].tidy)();
+  if (lookup_list[i]->tidy != NULL) (lookup_list[i]->tidy)();
 
 if (search_reset_point != NULL) store_reset(search_reset_point);
 search_reset_point = NULL;
@@ -335,7 +335,7 @@
 void *handle;
 tree_node *t;
 search_cache *c;
-lookup_info *lk = lookup_list + search_type;
+lookup_info *lk = lookup_list[search_type];
 uschar keybuffer[256];
 int old_pool = store_pool;
 
@@ -388,7 +388,7 @@
       ((search_cache *)(open_bot->data.ptr))->down = NULL;
     else
       open_top = NULL;
-    ((lookup_list + c->search_type)->close)(c->handle);
+    ((lookup_list[c->search_type])->close)(c->handle);
     c->handle = NULL;
     open_filecount--;
     }
@@ -480,7 +480,7 @@
 
 DEBUG(D_lookup) debug_printf("internal_search_find: file=\"%s\"\n  "
   "type=%s key=\"%s\"\n", filename,
-  lookup_list[search_type].name, keystring);
+  lookup_list[search_type]->name, keystring);
 
 /* Insurance. If the keystring is empty, just fail. */
 
@@ -511,7 +511,7 @@
   like FAIL, except that search_find_defer is set so the caller can
   distinguish if necessary. */
 
-  if (lookup_list[search_type].find(c->handle, filename, keystring, keylength,
+  if (lookup_list[search_type]->find(c->handle, filename, keystring, keylength,
       &data, &search_error_message, &do_cache) == DEFER)
     {
     search_find_defer = TRUE;
@@ -622,7 +622,7 @@
 that opens real files. */
 
 if (open_top != (tree_node *)handle &&
-    lookup_list[t->name[0]-'0'].type == lookup_absfile)
+    lookup_list[t->name[0]-'0']->type == lookup_absfile)
   {
   search_cache *c = (search_cache *)(t->data.ptr);
   tree_node *up = c->up;
diff -uNr exim-4.71/src/structs.h exim-4.71-dynlookup/src/structs.h
--- exim-4.71/src/structs.h	2009-11-16 19:50:37.000000000 +0000
+++ exim-4.71-dynlookup/src/structs.h	2009-12-24 19:54:55.000000000 +0000
@@ -322,34 +322,7 @@
 
 /* Structure for holding information about a lookup type. */
 
-typedef struct lookup_info {
-  uschar *name;                   /* e.g. "lsearch" */
-  int type;                       /* query/singlekey/abs-file */
-  void *(*open)(                  /* open function */
-    uschar *,                     /* file name for those that have one */
-    uschar **);                   /* for error message */
-  BOOL (*check)(                  /* file checking function */
-    void *,                       /* handle */
-    uschar *,                     /* file name */
-    int,                          /* modemask for file checking */
-    uid_t *,                      /* owners for file checking */
-    gid_t *,                      /* owngroups for file checking */
-    uschar **);                   /* for error messages */
-  int (*find)(                    /* find function */
-    void *,                       /* handle */
-    uschar *,                     /* file name or NULL */
-    uschar *,                     /* key or query */
-    int,                          /* length of key or query */
-    uschar **,                    /* for returning answer */
-    uschar **,                    /* for error message */
-    BOOL *);                      /* to request cache cleanup */
-  void (*close)(                  /* close function */
-    void *);                      /* handle */
-  void (*tidy)(void);             /* tidy function */
-  uschar *(*quote)(               /* quoting function */
-    uschar *,                     /* string to quote */
-    uschar *);                    /* additional data from quote name */
-} lookup_info;
+#include "lookupapi.h"
 
 
 /* Structure for holding information about the configured authentication
diff -uNr exim-4.71/src/verify.c exim-4.71-dynlookup/src/verify.c
--- exim-4.71/src/verify.c	2009-11-16 19:50:37.000000000 +0000
+++ exim-4.71-dynlookup/src/verify.c	2009-12-24 19:54:55.000000000 +0000
@@ -2256,7 +2256,7 @@
     }
   else   /* Single-key style */
     {
-    int sep = (Ustrcmp(lookup_list[search_type].name, "iplsearch") == 0)?
+    int sep = (Ustrcmp(lookup_list[search_type]->name, "iplsearch") == 0)?
       ':' : '.';
     insize = host_aton(cb->host_address, incoming);
     host_mask(insize, incoming, mlen);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	3 Jan 2008 12:44:08 -0000	1.15
+++ .cvsignore	24 Dec 2009 20:11:02 -0000	1.16
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.69.tar.bz2
+exim-4.71.tar.bz2

exim-4.50-config.patch:
 scripts/Configure-Makefile |    2 
 src/EDITME                 |  102 +++++++++++++++++++++++----------------------
 2 files changed, 54 insertions(+), 50 deletions(-)

Index: exim-4.50-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim-4.50-config.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- exim-4.50-config.patch	13 Aug 2008 14:36:02 -0000	1.9
+++ exim-4.50-config.patch	24 Dec 2009 20:11:02 -0000	1.10
@@ -1,18 +1,5 @@
-diff -uNr exim-4.69.orig/scripts/Configure-Makefile exim-4.69/scripts/Configure-Makefile
---- exim-4.69.orig/scripts/Configure-Makefile	2005-09-19 15:42:31.000000000 +0100
-+++ exim-4.69/scripts/Configure-Makefile	2008-08-13 14:44:59.000000000 +0100
-@@ -131,7 +131,7 @@
- 
-   mv $mft $mftt
-   echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft
--  echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts`" >>$mft
-+  echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts` \$(CFLAGS)" >>$mft
-   echo "PERL_LIBS=`$PERL_COMMAND -MExtUtils::Embed -e ldopts`" >>$mft
-   echo "" >>$mft
-   cat $mftt >> $mft
-diff -uNr exim-4.69.orig/src/EDITME exim-4.69/src/EDITME
---- exim-4.69.orig/src/EDITME	2007-01-22 16:29:54.000000000 +0000
-+++ exim-4.69/src/EDITME	2008-08-13 14:44:59.000000000 +0100
+--- exim-4.71/src/EDITME.config	2009-11-20 12:18:19.000000000 +0000
++++ exim-4.71/src/EDITME	2009-12-24 19:02:19.000000000 +0000
 @@ -100,7 +100,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
@@ -22,7 +9,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
  # don't exist. It will also install a default runtime configuration if this
  # file does not exist.
  
@@ -31,7 +18,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  # In this case, Exim will use the first of them that exists when it is run.
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure
  # owner of a local mailbox.) Specifying these values as root is very strongly
  # discouraged.
  
@@ -40,7 +27,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  # If you specify EXIM_USER as a name, this is looked up at build time, and the
  # uid number is built into the binary. However, you can specify that this
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ EXIM_USER=
  # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
  # you want to use a group other than the default group for the given user.
  
@@ -49,7 +36,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -235,7 +235,7 @@
+@@ -235,7 +235,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -58,7 +45,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -244,9 +244,9 @@
+@@ -244,9 +244,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -71,15 +58,13 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -261,25 +261,28 @@
- LOOKUP_DBM=yes
+@@ -262,17 +262,20 @@ LOOKUP_DBM=yes
  LOOKUP_LSEARCH=yes
+ LOOKUP_DNSDB=yes
  
 -# LOOKUP_CDB=yes
--# LOOKUP_DNSDB=yes
 -# LOOKUP_DSEARCH=yes
 +LOOKUP_CDB=yes
-+LOOKUP_DNSDB=yes
 +LOOKUP_DSEARCH=yes
  # LOOKUP_IBASE=yes
 -# LOOKUP_LDAP=yes
@@ -103,15 +88,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  # LOOKUP_WHOSON=yes
  
  # These two settings are obsolete; all three lookups are compiled when
- # LOOKUP_LSEARCH is enabled. However, we retain these for backward
- # compatibility. Setting one forces LOOKUP_LSEARCH if it is not set.
- 
--# LOOKUP_WILDLSEARCH=yes
-+LOOKUP_WILDLSEARCH=yes
- # LOOKUP_NWILDLSEARCH=yes
- 
- 
-@@ -330,14 +333,14 @@
+@@ -343,14 +346,14 @@ EXIM_MONITOR=eximon.bin
  # and the MIME ACL. Please read the documentation to learn more about these
  # features.
  
@@ -128,7 +105,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  #------------------------------------------------------------------------------
  # Compiling Exim with experimental features. These are documented in
-@@ -473,11 +476,11 @@
+@@ -486,11 +489,11 @@ FIXED_NEVER_USERS=root
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -145,7 +122,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -494,7 +497,7 @@
+@@ -507,7 +510,7 @@ FIXED_NEVER_USERS=root
  # one that is set in the headers_charset option. The default setting is
  # defined by this setting:
  
@@ -154,7 +131,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  # If you are going to make use of $header_xxx expansions in your configuration
  # file, or if your users are going to use them in filter files, and the normal
-@@ -514,7 +517,7 @@
+@@ -527,7 +530,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # the Sieve filter support. For those OS where iconv() is known to be installed
  # as standard, the file in OS/Makefile-xxxx contains
  #
@@ -163,7 +140,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  #
  # If you are not using one of those systems, but have installed iconv(), you
  # need to uncomment that line above. In some cases, you may find that iconv()
-@@ -576,10 +579,11 @@
+@@ -589,10 +592,11 @@ HEADERS_CHARSET="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -177,7 +154,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -630,7 +634,7 @@
+@@ -643,7 +647,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -186,7 +163,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -643,7 +647,7 @@
+@@ -656,7 +660,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -195,7 +172,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -692,7 +696,7 @@
+@@ -705,7 +709,7 @@ EXICYCLOG_MAX=10
  # files. Both the name of the command and the suffix that it adds to files
  # need to be defined here. See also the EXICYCLOG_MAX configuration.
  
@@ -204,7 +181,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  COMPRESS_SUFFIX=gz
  
  
-@@ -700,7 +704,7 @@
+@@ -713,7 +717,7 @@ COMPRESS_SUFFIX=gz
  # If the exigrep utility is fed compressed log files, it tries to uncompress
  # them using this command.
  
@@ -213,7 +190,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -709,7 +713,7 @@
+@@ -722,7 +726,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
  # Perl costs quite a lot of resources. Only do this if you really need it.
  
@@ -222,7 +199,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -719,7 +723,7 @@
+@@ -732,7 +736,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # that the local_scan API is made available by the linker. You may also need
  # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
  
@@ -231,7 +208,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -729,7 +733,7 @@
+@@ -742,7 +746,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # support, which is intended for use in conjunction with the SMTP AUTH
  # facilities, is included only when requested by the following setting:
  
@@ -240,7 +217,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  # You probably need to add -lpam to EXTRALIBS, and in some releases of
  # GNU/Linux -ldl is also needed.
-@@ -797,7 +801,7 @@
+@@ -810,7 +814,7 @@ ZCAT_COMMAND=/usr/bin/zcat
  # group. Once you have installed saslauthd, you should arrange for it to be
  # started by root at boot time.
  
@@ -249,7 +226,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  
  #------------------------------------------------------------------------------
-@@ -810,9 +814,9 @@
+@@ -823,9 +827,9 @@ ZCAT_COMMAND=/usr/bin/zcat
  # You may well also have to specify a local "include" file and an additional
  # library for TCP wrappers, so you probably need something like this:
  #
@@ -262,7 +239,7 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  #
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -857,13 +861,13 @@
+@@ -870,13 +874,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # is "yes", as well as supporting line editing, a history of input lines in the
  # current run is maintained.
  
@@ -278,25 +255,28 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  ###############################################################################
  #              THINGS YOU ALMOST NEVER NEED TO MENTION                        #
-@@ -884,11 +888,12 @@
+@@ -897,13 +901,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
 -# CHOWN_COMMAND=/usr/bin/chown
 -# CHGRP_COMMAND=/usr/bin/chgrp
+-# CHMOD_COMMAND=/usr/bin/chmod
 -# MV_COMMAND=/bin/mv
 -# RM_COMMAND=/bin/rm
+-# TOUCH_COMMAND=/usr/bin/touch
 -# PERL_COMMAND=/usr/bin/perl
 +CHOWN_COMMAND=/bin/chown
 +CHGRP_COMMAND=/bin/chgrp
-+
-+MV_COMAND=/bin/mv
++CHMOD_COMMAND=/bin/chmod
++MV_COMMAND=/bin/mv
 +RM_COMMAND=/bin/rm
++TOUCH_COMMAND=/bin/touch
 +PERL_COMMAND=/usr/bin/perl
  
  
  #------------------------------------------------------------------------------
-@@ -1082,7 +1087,7 @@
+@@ -1097,7 +1101,7 @@ TMPDIR="/tmp"
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
@@ -305,3 +285,14 @@ diff -uNr exim-4.69.orig/src/EDITME exim
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
+--- exim-4.71/scripts/Configure-Makefile.config	2009-11-20 21:22:20.000000000 +0000
++++ exim-4.71/scripts/Configure-Makefile	2009-12-24 18:59:48.000000000 +0000
+@@ -137,7 +137,7 @@ if [ "${EXIM_PERL}" != "" ] ; then
+ 
+   mv $mft $mftt
+   echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft
+-  echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts`" >>$mft
++  echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts` \$(CFLAGS)" >>$mft
+   echo "PERL_LIBS=`$PERL_COMMAND -MExtUtils::Embed -e ldopts`" >>$mft
+   echo "" >>$mft
+   cat $mftt >> $mft


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- exim.spec	4 Dec 2009 02:06:41 -0000	1.70
+++ exim.spec	24 Dec 2009 20:11:03 -0000	1.71
@@ -11,8 +11,8 @@
 
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.69
-Release: 19%{?dist}
+Version: 4.71
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -44,17 +44,15 @@ Patch8: exim-4.24-libdir.patch
 Patch12: exim-4.33-cyrus.patch
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
-Patch15: exim-4.52-dynamic-pcre.patch
-Patch18: exim-4.62-dlopen-localscan.patch
+Patch18: exim-4.71-dlopen-localscan.patch
 Patch19: exim-4.63-procmail.patch
 Patch20: exim-4.63-allow-filter.patch
 Patch21: exim-4.63-localhost-is-local.patch
 Patch22: exim-4.66-greylist-conf.patch
 Patch23: exim-4.67-smarthost-config.patch
-Patch24: exim-4.69-dynlookup.patch
+Patch24: exim-4.71-dynlookup.patch
 Patch25: exim-4.69-dynlookup-config.patch
 Patch26: exim-4.69-strictaliasing.patch
-Patch27: exim-4.69-expand-spamd.patch
 
 Requires: /etc/pki/tls/certs /etc/pki/tls/private
 Requires: /etc/aliases
@@ -176,7 +174,6 @@ greylisting unconditional.
 %patch12 -p1 -b .cyrus
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
-%patch15 -p1 -b .pcre
 %patch18 -p1 -b .dl
 %patch19 -p1 -b .procmail
 %patch20 -p1 -b .filter
@@ -186,7 +183,6 @@ greylisting unconditional.
 %patch24 -p1 -b .dynlookup
 %patch25 -p1 -b .dynconfig
 %patch26 -p1 -b .strictaliasing
-%patch27 -p1 -b .expandspamd
 
 cp src/EDITME Local/Makefile
 sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
@@ -487,6 +483,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Thu Dec 24 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-20
+- Update to 4.71
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 4.69-19
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	3 Jan 2008 12:44:08 -0000	1.15
+++ sources	24 Dec 2009 20:11:03 -0000	1.16
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-6f29f073328c858d8554b08cc0c3c2be  exim-4.69.tar.bz2
+f9c5a2d94b5bb132d06e2fff85bef75e  exim-4.71.tar.bz2


--- exim-4.52-dynamic-pcre.patch DELETED ---


--- exim-4.62-dlopen-localscan.patch DELETED ---


--- exim-4.69-dynlookup.patch DELETED ---


--- exim-4.69-expand-spamd.patch DELETED ---



From edwintb at fedoraproject.org  Thu Dec 24 20:36:06 2009
From: edwintb at fedoraproject.org (edwintb)
Date: Thu, 24 Dec 2009 20:36:06 +0000 (UTC)
Subject: File bubblemon-2.0.15.tar.gz uploaded to lookaside cache by edwintb
Message-ID: <20091224203606.DF7B610F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-applet-bubblemon:

c79f04d72961e89e75afcfd38f4f0357  bubblemon-2.0.15.tar.gz



From edwintb at fedoraproject.org  Thu Dec 24 20:46:29 2009
From: edwintb at fedoraproject.org (edwintb)
Date: Thu, 24 Dec 2009 20:46:29 +0000 (UTC)
Subject: rpms/gnome-applet-bubblemon/devel gnome-applet-bubblemon.spec, 1.2,
	1.3
Message-ID: <20091224204629.B735211C00E6@cvs1.fedora.phx.redhat.com>

Author: edwintb

Update of /cvs/pkgs/rpms/gnome-applet-bubblemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31011

Modified Files:
	gnome-applet-bubblemon.spec 
Log Message:
Updated to version 2.0.15.



Index: gnome-applet-bubblemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-bubblemon/devel/gnome-applet-bubblemon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-applet-bubblemon.spec	25 Jul 2009 00:32:45 -0000	1.2
+++ gnome-applet-bubblemon.spec	24 Dec 2009 20:46:29 -0000	1.3
@@ -1,3 +1,5 @@
+# reviewed at https://bugzilla.redhat.com/show_bug.cgi?id=497525
+
 # In spite of this being the original version, a forked project already claimed
 # the name "bubblemon" in Fedora. We therefore use "gnome-applet-bubblemon" as
 # the package name.
@@ -5,8 +7,8 @@
 # number of times.
 
 Name:           gnome-applet-bubblemon
-Version:        2.0.14
-Release:        2%{?dist}
+Version:        2.0.15
+Release:        1%{?dist}
 Summary:        Bubbling Load Monitoring Applet for the GNOME Panel
 
 Group:          Applications/System
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Edwin ten Brink <fedora at tenbrink-bekkers.nl> - 2.0.15-1
+- Upgraded to 2.0.15, which fixes a crash which occurs in some locales.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lkundrak at fedoraproject.org  Thu Dec 24 20:53:46 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 24 Dec 2009 20:53:46 +0000 (UTC)
Subject: rpms/gant/devel gant.spec,1.3,1.4
Message-ID: <20091224205346.1081911C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32024

Modified Files:
	gant.spec 
Log Message:
* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-2
- Add manual
- Add bash completion configuration
- Add startup script



Index: gant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gant/devel/gant.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gant.spec	9 Dec 2009 20:24:13 -0000	1.3
+++ gant.spec	24 Dec 2009 20:53:45 -0000	1.4
@@ -11,13 +11,14 @@
 
 Name:           gant
 Version:        1.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Groovy-based build system that uses Ant tasks
 
 Group:          Development/Tools
 License:        ASL 2.0
 URL:            http://gant.codehaus.org/
 Source0:        http://dist.codehaus.org/gant/distributions/gant_src-%{version}.tgz
+Source1:        gant-script
 Patch0:         0001-Make-it-build-against-our-jars.patch
 Patch1:         0001-Fix-tests.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -33,6 +34,7 @@ BuildRequires:  ivy
 BuildRequires:  java-devel-openjdk
 BuildRequires:  jpackage-utils
 Requires:       jpackage-utils
+Requires:       groovy
 
 BuildArch:      noarch
 
@@ -63,6 +65,16 @@ install -d $RPM_BUILD_ROOT%{_javadir}
 install -p -m0644 target_gant/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m644 documentation/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -p -m644 scripts/bash_completion.d/%{name} \
+        $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/gant
+
 
 %check
 
@@ -77,7 +89,7 @@ mkdir -p .gant/cache
 ant %{build_jars} test
 
 # Ant always returns success, let us look at the test reports ourselves
-if FAILED=$(egrep -l 'errors="[^0]"|failures="[^0]"' \
+if FAILED=$(egrep -l 'errors="[^0]|failures="[^0]' \
         target_gant/test-reports/*.xml)
 then
         echo $FAILED |sed 's/\.xml/.txt/' |xargs cat
@@ -91,10 +103,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/*
 %{_javadir}/*.jar
+%{_mandir}/man1/%{name}.1*
+%config %{_sysconfdir}/bash_completion.d
 %doc README_Install.txt LICENCE.txt releaseNotes.txt
 
 
 %changelog
+* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-2
+- Add manual
+- Add bash completion configuration
+- Add startup script
+
 * Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-1
 - Initial packaging



From edwintb at fedoraproject.org  Thu Dec 24 20:54:16 2009
From: edwintb at fedoraproject.org (edwintb)
Date: Thu, 24 Dec 2009 20:54:16 +0000 (UTC)
Subject: rpms/gnome-applet-bubblemon/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091224205416.68DBE11C00E6@cvs1.fedora.phx.redhat.com>

Author: edwintb

Update of /cvs/pkgs/rpms/gnome-applet-bubblemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32107

Modified Files:
	.cvsignore sources 
Log Message:
Update to 2.0.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-bubblemon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 May 2009 13:33:30 -0000	1.2
+++ .cvsignore	24 Dec 2009 20:54:16 -0000	1.3
@@ -1 +1 @@
-bubblemon-2.0.14.tar.gz
+bubblemon-2.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-bubblemon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 May 2009 13:33:30 -0000	1.2
+++ sources	24 Dec 2009 20:54:16 -0000	1.3
@@ -1 +1 @@
-0cf41f9db728c4b4089b7438c1508137  bubblemon-2.0.14.tar.gz
+c79f04d72961e89e75afcfd38f4f0357  bubblemon-2.0.15.tar.gz



From edwintb at fedoraproject.org  Thu Dec 24 20:54:23 2009
From: edwintb at fedoraproject.org (edwintb)
Date: Thu, 24 Dec 2009 20:54:23 +0000 (UTC)
Subject: rpms/gnome-applet-bubblemon/F-12 gnome-applet-bubblemon.spec,1.2,1.3
Message-ID: <20091224205423.72CDA11C00E6@cvs1.fedora.phx.redhat.com>

Author: edwintb

Update of /cvs/pkgs/rpms/gnome-applet-bubblemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32135

Modified Files:
	gnome-applet-bubblemon.spec 
Log Message:
Update to 2.0.15.


Index: gnome-applet-bubblemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-bubblemon/F-12/gnome-applet-bubblemon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-applet-bubblemon.spec	25 Jul 2009 00:32:45 -0000	1.2
+++ gnome-applet-bubblemon.spec	24 Dec 2009 20:54:23 -0000	1.3
@@ -1,3 +1,5 @@
+# reviewed at https://bugzilla.redhat.com/show_bug.cgi?id=497525
+
 # In spite of this being the original version, a forked project already claimed
 # the name "bubblemon" in Fedora. We therefore use "gnome-applet-bubblemon" as
 # the package name.
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Edwin ten Brink <fedora at tenbrink-bekkers.nl> - 2.0.15-1
+- Upgraded to 2.0.15, which fixes a crash which occurs in some locales.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From edwintb at fedoraproject.org  Thu Dec 24 20:54:40 2009
From: edwintb at fedoraproject.org (edwintb)
Date: Thu, 24 Dec 2009 20:54:40 +0000 (UTC)
Subject: rpms/gnome-applet-bubblemon/F-11 gnome-applet-bubblemon.spec,1.1,1.2
Message-ID: <20091224205440.0C99D11C00E6@cvs1.fedora.phx.redhat.com>

Author: edwintb

Update of /cvs/pkgs/rpms/gnome-applet-bubblemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32213

Modified Files:
	gnome-applet-bubblemon.spec 
Log Message:
Update to 2.0.15.


Index: gnome-applet-bubblemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-bubblemon/F-11/gnome-applet-bubblemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-applet-bubblemon.spec	29 May 2009 13:36:34 -0000	1.1
+++ gnome-applet-bubblemon.spec	24 Dec 2009 20:54:39 -0000	1.2
@@ -1,3 +1,5 @@
+# reviewed at https://bugzilla.redhat.com/show_bug.cgi?id=497525
+
 # In spite of this being the original version, a forked project already claimed
 # the name "bubblemon" in Fedora. We therefore use "gnome-applet-bubblemon" as
 # the package name.
@@ -5,7 +7,7 @@
 # number of times.
 
 Name:           gnome-applet-bubblemon
-Version:        2.0.14
+Version:        2.0.15
 Release:        1%{?dist}
 Summary:        Bubbling Load Monitoring Applet for the GNOME Panel
 
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2009 Edwin ten Brink <fedora at tenbrink-bekkers.nl> - 2.0.15-1
+- Upgraded to 2.0.15, which fixes a crash which occurs in some locales.
+
 * Mon May 11 2009 Edwin ten Brink <edwin.ten.brink at gmail.com> - 2.0.14-1
 - Upgraded to version 2.0.14.
 



From edwintb at fedoraproject.org  Thu Dec 24 21:09:25 2009
From: edwintb at fedoraproject.org (edwintb)
Date: Thu, 24 Dec 2009 21:09:25 +0000 (UTC)
Subject: rpms/gnome-applet-bubblemon/F-12 gnome-applet-bubblemon.spec,1.3,1.4
Message-ID: <20091224210925.707D211C00E6@cvs1.fedora.phx.redhat.com>

Author: edwintb

Update of /cvs/pkgs/rpms/gnome-applet-bubblemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1938

Modified Files:
	gnome-applet-bubblemon.spec 
Log Message:
Update to 2.0.15.


Index: gnome-applet-bubblemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-bubblemon/F-12/gnome-applet-bubblemon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnome-applet-bubblemon.spec	24 Dec 2009 20:54:23 -0000	1.3
+++ gnome-applet-bubblemon.spec	24 Dec 2009 21:09:25 -0000	1.4
@@ -7,8 +7,8 @@
 # number of times.
 
 Name:           gnome-applet-bubblemon
-Version:        2.0.14
-Release:        2%{?dist}
+Version:        2.0.15
+Release:        1%{?dist}
 Summary:        Bubbling Load Monitoring Applet for the GNOME Panel
 
 Group:          Applications/System



From edwintb at fedoraproject.org  Thu Dec 24 21:15:32 2009
From: edwintb at fedoraproject.org (edwintb)
Date: Thu, 24 Dec 2009 21:15:32 +0000 (UTC)
Subject: rpms/gnome-applet-bubblemon/F-12 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091224211532.E875211C00E6@cvs1.fedora.phx.redhat.com>

Author: edwintb

Update of /cvs/pkgs/rpms/gnome-applet-bubblemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3204

Modified Files:
	.cvsignore sources 
Log Message:
Update to 2.0.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-bubblemon/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 May 2009 13:33:30 -0000	1.2
+++ .cvsignore	24 Dec 2009 21:15:32 -0000	1.3
@@ -1 +1 @@
-bubblemon-2.0.14.tar.gz
+bubblemon-2.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-bubblemon/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 May 2009 13:33:30 -0000	1.2
+++ sources	24 Dec 2009 21:15:32 -0000	1.3
@@ -1 +1 @@
-0cf41f9db728c4b4089b7438c1508137  bubblemon-2.0.14.tar.gz
+c79f04d72961e89e75afcfd38f4f0357  bubblemon-2.0.15.tar.gz



From taljurf at fedoraproject.org  Thu Dec 24 21:17:09 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 24 Dec 2009 21:17:09 +0000 (UTC)
Subject: rpms/invulgotracker/devel import.log, NONE, 1.1 invulgotracker.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091224211709.322F911C00E6@cvs1.fedora.phx.redhat.com>

Author: taljurf

Update of /cvs/pkgs/rpms/invulgotracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2641/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log invulgotracker.spec 
Log Message:
Initial import of invulgotracker. Review was done at
https://bugzilla.redhat.com/show_bug.cgi?id=528150




--- NEW FILE import.log ---
invulgotracker-0_61-1_fc13:HEAD:invulgotracker-0.61-1.fc13.src.rpm:1261688786


--- NEW FILE invulgotracker.spec ---
Name:           invulgotracker
Version:        0.61
Release:        1%{?dist}
Summary:        Tasks & projects tracking tool

Group:          Applications/Productivity
License:        GPLv3+
URL:            http://www.invulgo.dk/
Source0:        http://invulgotracker.googlecode.com/files/invulgotracker-%{version}.tar.gz
Patch0:         invulgotracker-0.60-icon-location.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext gtk2-devel intltool libglade2-devel libxml2-devel gnome-vfs2-devel desktop-file-utils
#Requires:       

%description
Simple application to track time usage on your tasks & projects.

%prep
%setup -q
#Remove extension from icon
sed -i 's|Icon=InvulgoTracker.png|Icon=InvulgoTracker|g' InvulgoTracker.desktop.in
#Place icon in pixmaps
%patch0 -p1 -b .orig


%build
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
%find_lang %{name}
# remove duplicate docs
rm -rf $RPM_BUILD_ROOT/%{_docdir}
desktop-file-install \
	--dir=%{buildroot}%{_datadir}/applications \
	--add-category="ProjectManagement" \
	%{buildroot}%{_datadir}/applications/InvulgoTracker.desktop

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang

%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_bindir}/invulgotracker
%{_datadir}/applications/InvulgoTracker.desktop
%{_datadir}/pixmaps/InvulgoTracker.png
%{_datadir}/invulgotracker/


%changelog
* Fri Dec 18 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.61-1
- Update to 0.61

* Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
- Update to 0.60

* Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
- Fixed desktop and icons

* Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
- Fixed some spec problems

* Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
- Update to 0.53.1

* Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Dec 2009 07:04:55 -0000	1.1
+++ .cvsignore	24 Dec 2009 21:17:09 -0000	1.2
@@ -0,0 +1 @@
+invulgotracker-0.61.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Dec 2009 07:04:56 -0000	1.1
+++ sources	24 Dec 2009 21:17:09 -0000	1.2
@@ -0,0 +1 @@
+cd1bb347722ce53ffa644d3c7d932fd5  invulgotracker-0.61.tar.gz



From mschwendt at fedoraproject.org  Thu Dec 24 21:22:26 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 24 Dec 2009 21:22:26 +0000 (UTC)
Subject: rpms/mcs/devel libmcs-0.7.1-util.patch,NONE,1.1 mcs.spec,1.15,1.16
Message-ID: <20091224212226.B16EB11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/mcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4104

Modified Files:
	mcs.spec 
Added Files:
	libmcs-0.7.1-util.patch 
Log Message:
* Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-8
- Apply safety fixes to string utility functions.


libmcs-0.7.1-util.patch:
 mcs_util.c |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

--- NEW FILE libmcs-0.7.1-util.patch ---
diff -Nur libmcs-0.7.1-orig/src/libmcs/mcs_util.c libmcs-0.7.1/src/libmcs/mcs_util.c
--- libmcs-0.7.1-orig/src/libmcs/mcs_util.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/libmcs/mcs_util.c	2009-12-24 18:26:15.000000000 +0100
@@ -56,7 +56,7 @@
  *
  * \param str The string to duplicate.
  * \param len The maximum allowed length of the string.
- * \return The length of the string or len, whichever is smaller.
+ * \return The pointer to a copy of the string. Free this with free().
  */
 char *
 mcs_strndup(const char *str, size_t len)
@@ -68,7 +68,7 @@
 		return NULL;
 
 	memcpy(out, str, nlen);
-	out[len] = '\0';
+	out[nlen] = '\0';
 
 	return out;
 }
@@ -146,16 +146,22 @@
 {
 	size_t dsize = strlen(dest);
 	size_t len = strlen(src);
-	size_t res = dsize + len;
+	size_t res;
 
 	dest += dsize;
 	count -= dsize;
 
-	if (len >= count)
-		len = count - 1;
-
+	if (len >= count) {
+        if (count>0) {
+            len = count - 1;
+        }
+        else {
+            len = 0;
+        }
+    }
 	memcpy(dest, src, len);
 	dest[len] = 0;
+    res = dsize + len;
 
 	return res;
 }
@@ -172,15 +178,16 @@
  */
 size_t mcs_strlcpy(char *dest, const char *src, size_t size)
 {
-	size_t ret = strlen(src);
+	size_t srclen = strlen(src);
+    size_t retlen = 0;
 
 	if (size != 0)
 	{
-		size_t len = (ret >= size) ? size - 1 : ret;
-		memcpy(dest, src, len);
-		dest[len] = '\0';
+		retlen = (srclen >= size) ? size - 1 : srclen;
+		memcpy(dest, src, retlen);
+		dest[retlen] = '\0';
 	}
 
-	return ret;
+	return retlen;
 }
 


Index: mcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcs/devel/mcs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mcs.spec	23 Dec 2009 23:14:00 -0000	1.15
+++ mcs.spec	24 Dec 2009 21:22:26 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mcs
 Version:        0.7.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Configuration file abstraction system
 
 Group:          Applications/System
@@ -10,8 +10,12 @@ License:        BSD
 URL:            http://atheme.org
 
 Source0:        http://distfiles.atheme.org/libmcs-%{version}.tgz
+# submitted upstream, build config fix
 Patch0: libmcs-0.7.1-sysconfdir.patch
+# submitted upstream, floating point exception fix
 Patch1: libmcs-0.7.1-walk.patch
+# submitted upstream, safety fixes in string utility functions
+Patch2: libmcs-0.7.1-util.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,6 +88,7 @@ This package contains the files necessar
 %setup -q -n libmcs-%{version}
 %patch0 -p1 -b .sysconfdir
 %patch1 -p1 -b .walk
+%patch2 -p1 -b .util
 
 # Make the build system more verbose
 #perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
@@ -137,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libmcs.pc
 
 %changelog
+* Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-8
+- Apply safety fixes to string utility functions.
+
 * Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-7
 - Fix floating point exception in mcs-walk-config tool.
 



From lkundrak at fedoraproject.org  Thu Dec 24 21:32:21 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu, 24 Dec 2009 21:32:21 +0000 (UTC)
Subject: rpms/gant/devel gant-script,NONE,1.1
Message-ID: <20091224213221.0B35311C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5373

Added Files:
	gant-script 
Log Message:
Add missing file


--- NEW FILE gant-script ---
#!/bin/sh
# 
# Gant startup script
# Lubomir Rintel <lkundrak at v3.sk>

BASE_JARS="$BASE_JARS gant"
CLASS=gant.Gant
. "$(dirname "$0")"/groovy



From jkratoch at fedoraproject.org  Thu Dec 24 22:39:37 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 24 Dec 2009 22:39:37 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-6.3-test-dtorfix-20050121.patch, 1.8,
	1.9 gdb-7.0-upstream.patch, 1.4, 1.5 gdb.spec, 1.405, 1.406
Message-ID: <20091224223937.2A4A311C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13349

Modified Files:
	gdb-6.3-test-dtorfix-20050121.patch gdb-7.0-upstream.patch 
	gdb.spec 
Log Message:
* Thu Dec 24 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-14.fc12
- testsuite: Fix constructortest.exp and expand-sals.exp for gcc-4.4.2-20.fc12.


gdb-6.3-test-dtorfix-20050121.patch:
 constructortest.cc  |   99 +++++++++++++++++++++++++++++++++++++
 constructortest.exp |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 236 insertions(+)

Index: gdb-6.3-test-dtorfix-20050121.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.3-test-dtorfix-20050121.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gdb-6.3-test-dtorfix-20050121.patch	27 Aug 2008 11:07:47 -0000	1.8
+++ gdb-6.3-test-dtorfix-20050121.patch	24 Dec 2009 22:39:35 -0000	1.9
@@ -129,7 +129,7 @@ Index: gdb/testsuite/ChangeLog
 +}
 --- 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,131 @@
+@@ -0,0 +1,137 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2005, 2007 Free Software Foundation, Inc.
@@ -179,8 +179,9 @@ Index: gdb/testsuite/ChangeLog
 +    gdb_suppress_tests
 +}
 +
-+# Break on the various forms of the A::A constructor
-+gdb_test "break A\:\:A" "Breakpoint 2 at .* \\(2 locations\\)" "breaking on A::A"
++# Break on the various forms of the A::A constructor.
++# " (2 locations)" is displayed depending on G++ version.
++gdb_test "break A\:\:A" "Breakpoint 2 at .*" "breaking on A::A"
 +        
 +# Verify that we break for the A constructor two times
 +# Once for new A and once for new B
@@ -206,7 +207,8 @@ Index: gdb/testsuite/ChangeLog
 +gdb_test "break 'A::A()'" "" "break in constructor A 2"
 +gdb_continue_to_breakpoint "First line A"
 +set second_line [gdb_get_line_number "Second line A"]
-+gdb_test "break $second_line" "Breakpoint .*, line $second_line. \\(2 locations\\)" "break by line in constructor"
++# " (2 locations)" is displayed depending on G++ version.
++gdb_test "break $second_line" "Breakpoint .*, line $second_line\\..*" "break by line in constructor"
 +gdb_continue_to_breakpoint "Second line A"
 +gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::A second line"
 +gdb_continue_to_breakpoint "Second line A"
@@ -217,7 +219,8 @@ Index: gdb/testsuite/ChangeLog
 +gdb_test "break 'A::~A()'" "" "break in constructor ~A 2"
 +gdb_continue_to_breakpoint "First line ~A"
 +set second_line_dtor [gdb_get_line_number "Second line ~A"]
-+gdb_test "break $second_line_dtor" "Breakpoint .*, line $second_line_dtor. \\(2 locations\\)" "break by line in destructor"
++# " (2 locations)" is displayed depending on G++ version.
++gdb_test "break $second_line_dtor" "Breakpoint .*, line $second_line_dtor\\..*" "break by line in destructor"
 +gdb_continue_to_breakpoint "Second line ~A"
 +gdb_test "bt" "#0.*A.*#1.*main.*" "Verify in in-charge A::~A second line"
 +# FIXME: Analyse this case better.
@@ -232,8 +235,10 @@ Index: gdb/testsuite/ChangeLog
 +gdb_load ${binfile}
 +runto_main
 +
++set define_line_dtor [gdb_get_line_number "Destructor C"]
 +# Break on the various forms of the C::~C destructor
-+gdb_test "break C\:\:~C" "Breakpoint .* \\(3 locations\\)" "breaking on C::~C"
++# " ([23] locations)" is displayed depending on G++ version.
++gdb_test "break C\:\:~C" "Breakpoint .*, line $define_line_dtor\\..*" "breaking on C::~C"
 +gdb_continue_to_breakpoint "First line ~C"
 +
 +# Verify that we can break by line number in a destructor and find
@@ -243,7 +248,8 @@ Index: gdb/testsuite/ChangeLog
 +delete_breakpoints
 +
 +set first_line_dtor [gdb_get_line_number "First line ~C"]
-+gdb_test "break $first_line_dtor" "Breakpoint .*, line $first_line_dtor. \\(3 locations\\)" "break by line in destructor"
++# " (3 locations)" is displayed depending on G++ version.
++gdb_test "break $first_line_dtor" "Breakpoint .*, line $first_line_dtor\\..*" "break by line in destructor"
 +
 +# Run to `main' where we begin our tests.
 +# Set the breakpoints first to test PIE multiple-PC BREAKPOINT_RE_SET.

gdb-7.0-upstream.patch:
 gdb/COPYING                              |  916 ++++++++++++++++++++---------
 gdb/ChangeLog                            |   75 ++
 gdb/amd64-tdep.c                         |    2 
 gdb/amd64fbsd-nat.c                      |    3 
 gdb/arm-tdep.c                           |  212 ++++++
 gdb/completer.c                          |    4 
 gdb/dbxread.c                            |    9 
 gdb/dcache.c                             |  139 +++-
 gdb/doc/ChangeLog                        |    4 
 gdb/doc/gpl.texi                         |  958 ++++++++++++++++++++-----------
 gdb/dwarf2-frame.c                       |    8 
 gdb/dwarf2read.c                         |    3 
 gdb/elfread.c                            |    3 
 gdb/objfiles.c                           |   16 
 gdb/score-tdep.c                         |   52 -
 gdb/score-tdep.h                         |   64 --
 gdb/testsuite/ChangeLog                  |   21 
 gdb/testsuite/gdb.base/bigcore.exp       |    2 
 gdb/testsuite/gdb.base/foll-fork.c       |    3 
 gdb/testsuite/gdb.base/foll-fork.exp     |    3 
 gdb/testsuite/gdb.base/structs.c         |    6 
 gdb/testsuite/gdb.base/structs.exp       |   62 +-
 src/gdb/doc/gdb.texinfo                  |   13 
 src/gdb/testsuite/gdb.base/default.exp   |    7 
 src/gdb/testsuite/gdb.cp/expand-sals.cc  |    2 
 src/gdb/testsuite/gdb.cp/expand-sals.exp |    6 
 26 files changed, 1785 insertions(+), 808 deletions(-)

Index: gdb-7.0-upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-7.0-upstream.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-7.0-upstream.patch	21 Dec 2009 11:26:47 -0000	1.4
+++ gdb-7.0-upstream.patch	24 Dec 2009 22:39:35 -0000	1.5
@@ -3175,3 +3175,49 @@ http://sourceware.org/ml/gdb-cvs/2009-09
  @end table
  
  On HP-UX systems, if you refer to a function or variable name that
+
+
+
+http://sourceware.org/ml/gdb-cvs/2009-12/msg00128.html
+
+### src/gdb/testsuite/ChangeLog	2009/12/23 23:18:08	1.2054
+### src/gdb/testsuite/ChangeLog	2009/12/24 21:57:06	1.2055
+## -1,3 +1,10 @@
++2009-12-24  Jan Kratochvil  <jan.kratochvil at redhat.com>
++
++	Fix compatibility with G++-4.5.
++	* gdb.cp/expand-sals.cc (main): Remove the "exit-line" comment.
++	* gdb.cp/expand-sals.exp: Remove breakpoint on "exit-line".
++	(uncaught return): Remove.
++
+ 2009-12-23  Jan Kratochvil  <jan.kratochvil at redhat.com>
+ 	    Phil Muldoon  <pmuldoon at redhat.com>
+ 
+--- src/gdb/testsuite/gdb.cp/expand-sals.cc	2009/05/11 15:05:56	1.1
++++ src/gdb/testsuite/gdb.cp/expand-sals.cc	2009/12/24 21:57:06	1.2
+@@ -49,5 +49,5 @@
+   A a;
+   B b;
+ 
+-  return 0;	/* exit-line */
++  return 0;
+ }
+--- src/gdb/testsuite/gdb.cp/expand-sals.exp	2009/05/11 15:05:56	1.1
++++ src/gdb/testsuite/gdb.cp/expand-sals.exp	2009/12/24 21:57:06	1.2
+@@ -23,8 +23,6 @@
+     return -1
+ }
+ 
+-gdb_breakpoint [gdb_get_line_number "exit-line"]
+-
+ gdb_breakpoint [gdb_get_line_number "func-line"]
+ gdb_continue_to_breakpoint "func" ".*func-line.*"
+ 
+@@ -52,7 +50,3 @@
+ 	 "bt from A"
+ 
+ gdb_continue_to_breakpoint "next caller func" ".*func-line.*"
+-
+-# Verify GDB really could not catch any other breakpoint location.
+-
+-gdb_continue_to_breakpoint "uncaught return" ".*exit-line.*"


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- gdb.spec	21 Dec 2009 22:46:49 -0000	1.405
+++ gdb.spec	24 Dec 2009 22:39:35 -0000	1.406
@@ -36,7 +36,7 @@ Version: 7.0
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 13%{?_with_upstream:.upstream}%{dist}
+Release: 14%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -978,6 +978,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 24 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-14.fc12
+- testsuite: Fix constructortest.exp and expand-sals.exp for gcc-4.4.2-20.fc12.
+
 * Mon Dec 21 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-13.fc12
 - [pie] Fix a race in testcase gdb.base/valgrind-db-attach.exp.
 - Fix regression by python on ia64 due to stale current frame.



From petersen at fedoraproject.org  Fri Dec 25 00:31:03 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 00:31:03 +0000 (UTC)
Subject: File cabal2spec-0.20.1.tar.gz uploaded to lookaside cache by petersen
Message-ID: <20091225003103.70B8510F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cabal2spec:

63e85e7e683b2d5fa28e2727d8105e3e  cabal2spec-0.20.1.tar.gz



From petersen at fedoraproject.org  Fri Dec 25 00:33:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 00:33:23 +0000 (UTC)
Subject: rpms/cabal2spec/devel .cvsignore, 1.13, 1.14 cabal2spec.spec, 1.16,
	1.17 sources, 1.13, 1.14
Message-ID: <20091225003323.E930511C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/cabal2spec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26995

Modified Files:
	.cvsignore cabal2spec.spec sources 
Log Message:
add support for shared libraries and updates for ghc-6.12:
- lib and binlib package now have shared library subpackages
- bin packages link dynamically (not binlib due to prof conflict)
- new common_summary and common_description simplify subpackaging
- library packages have debugging for stripping
- specify BR ghc-rpm-macros >= 0.4.0 for new macros:
  ghc_requires, ghc_doc_requires, ghc_prof_requires,
  cabal_pkg_conf (replaces ghc_gen_scripts and ghc_install_scripts),
  and "ghc-pkg recache" replaces ghc_register_pkg and ghc_unregister_pkg.
- cabal2spec version now appears in changelog




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cabal2spec/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	24 Nov 2009 09:26:37 -0000	1.13
+++ .cvsignore	25 Dec 2009 00:33:23 -0000	1.14
@@ -1 +1 @@
-cabal2spec-0.19.tar.gz
+cabal2spec-0.20.1.tar.gz


Index: cabal2spec.spec
===================================================================
RCS file: /cvs/extras/rpms/cabal2spec/devel/cabal2spec.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- cabal2spec.spec	24 Nov 2009 09:26:37 -0000	1.16
+++ cabal2spec.spec	25 Dec 2009 00:33:23 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		cabal2spec
-Version:	0.19
+Version:	0.20.1
 Release:	1%{?dist}
 Summary:	Tool for creating .spec files for Haskell Cabal Packages
 
@@ -38,6 +38,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 25 2009 Jens Petersen <petersen at redhat.com> - 0.20.1-1
+- add support for shared libraries and updates for ghc-6.12:
+- lib and binlib package now have shared library subpackages
+- bin packages link dynamically (not binlib due to prof conflict)
+- new common_summary and common_description simplify subpackaging
+- library packages have debugging for stripping
+- specify BR ghc-rpm-macros >= 0.4.0 for new macros:
+  ghc_requires, ghc_doc_requires, ghc_prof_requires,
+  cabal_pkg_conf (replaces ghc_gen_scripts and ghc_install_scripts),
+  and "ghc-pkg recache" replaces ghc_register_pkg and ghc_unregister_pkg.
+- cabal2spec version now appears in changelog
+
 * Tue Nov 24 2009 Jens Petersen <petersen at redhat.com> - 0.19-1
 - cabal2spec-diff: reverse diff file order
 - devel: don't provide ghc-<package>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cabal2spec/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	24 Nov 2009 09:26:38 -0000	1.13
+++ sources	25 Dec 2009 00:33:23 -0000	1.14
@@ -1 +1 @@
-f14a4542df08adb222f2944306f1819d  cabal2spec-0.19.tar.gz
+63e85e7e683b2d5fa28e2727d8105e3e  cabal2spec-0.20.1.tar.gz



From phuang at fedoraproject.org  Fri Dec 25 03:07:07 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 25 Dec 2009 03:07:07 +0000 (UTC)
Subject: File ibus-1.2.0.20091225.tar.gz uploaded to lookaside cache by phuang
Message-ID: <20091225030707.AFA1810F8B3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ibus:

7b31c204c88dfc72897fdd462eba11f7  ibus-1.2.0.20091225.tar.gz



From phuang at fedoraproject.org  Fri Dec 25 03:26:17 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 25 Dec 2009 03:26:17 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.48, 1.49 ibus.spec, 1.98, 1.99 sources, 
	1.54, 1.55 xinput-ibus, 1.8, 1.9
Message-ID: <20091225032617.79D8211C00CF@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12501

Modified Files:
	.cvsignore ibus.spec sources xinput-ibus 
Log Message:
Update to 1.2.0.20091225


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	16 Dec 2009 05:49:29 -0000	1.48
+++ .cvsignore	25 Dec 2009 03:26:17 -0000	1.49
@@ -1 +1 @@
-ibus-1.2.0.20091215.tar.gz
+ibus-1.2.0.20091225.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- ibus.spec	16 Dec 2009 05:49:30 -0000	1.98
+++ ibus.spec	25 Dec 2009 03:26:17 -0000	1.99
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20091215
+Version:    1.2.0.20091225
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -15,7 +15,6 @@ Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-# Source2:    icons.tar.gz
 # Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +42,7 @@ Requires:   iso-codes
 Requires:   dbus-python >= %{dbus_python_version}
 Requires:   im-chooser >= %{im_chooser_version}
 Requires:   GConf2 >= %{gconf2_version}
+Requires:   notify-python
 
 Requires(post):  desktop-file-utils
 Requires(postun):  desktop-file-utils
@@ -108,8 +108,7 @@ The ibus-devel-docs package contains dev
 %build
 %configure --disable-static \
            --disable-iso-codes-check \
-           --enable-gtk-doc \
-           --disable-qt4-immodule
+           --enable-gtk-doc
 # make -C po update-gmo
 make %{?_smp_mflags}
 
@@ -207,10 +206,6 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
 
-# %files qt
-# %defattr(-,root,root,-)
-# %{_libdir}/qt4/plugins/inputmethods/libibus.so
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
@@ -222,6 +217,12 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Dec 25 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001225-1
+- Update to 1.2.0.20091225
+- Fix bug 513895 - new IME does not show up in ibus-setup
+- Fix bug 531857 - applet order should correspond with preferences order
+- Fix bug 532856 - should not list already added input-methods in Add selector
+
 * Wed Dec 15 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001215-1
 - Update to 1.2.0.20091215
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	16 Dec 2009 05:49:30 -0000	1.54
+++ sources	25 Dec 2009 03:26:17 -0000	1.55
@@ -1 +1 @@
-caf5ed11233f0e8c4369d44e66b7beb5  ibus-1.2.0.20091215.tar.gz
+7b31c204c88dfc72897fdd462eba11f7  ibus-1.2.0.20091225.tar.gz


Index: xinput-ibus
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/xinput-ibus,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xinput-ibus	24 Oct 2009 03:46:02 -0000	1.8
+++ xinput-ibus	25 Dec 2009 03:26:17 -0000	1.9
@@ -1,7 +1,7 @@
 XIM=ibus
 XIM_PROGRAM="/usr/bin/ibus-daemon"
 ICON="/usr/share/icons/hicolor/scalable/apps/ibus.svg"
-XIM_ARGS="--xim"
+XIM_ARGS="--xim -j 60"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"
 GTK_IM_MODULE=ibus



From scop at fedoraproject.org  Fri Dec 25 08:11:14 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Fri, 25 Dec 2009 08:11:14 +0000 (UTC)
Subject: rpms/bash-completion/F-11 bash_completion.sh, NONE, 1.1 .cvsignore,
	1.15, 1.16 bash-completion.spec, 1.39, 1.40 sources, 1.15,
	1.16 bash-completion-1.0-bash4quoting-490322.patch, 1.1,
	NONE bash-completion-mock, 1.7, NONE bash-completion-repomanage,
	1.5, NONE
Message-ID: <20091225081114.3536B11C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31448

Modified Files:
	.cvsignore bash-completion.spec sources 
Added Files:
	bash_completion.sh 
Removed Files:
	bash-completion-1.0-bash4quoting-490322.patch 
	bash-completion-mock bash-completion-repomanage 
Log Message:
* Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
- Fix autoinstall of completions named other than the package (#546905).
- Use environment-modules upstream completion instead of ours if available.
- Autoinstall mysqladmin completion also on MySQL-client-community.

* Tue Nov 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-3
- Prepare for smooth coexistence with yum upstream completion.

* Sun Nov  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-2
- Use yum-utils completion instead of ours if available.

* Mon Oct 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-1
- Update to 1.1.
- bash 4 quoting fix, mock and repomanage completions included upstream.

* Sun Sep 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-5
- Use svn completion from subversion instead of ours if available (#496456).

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Sat Apr 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-3
- Do not install cowsay completion, an updated version is shipped with it.



--- NEW FILE bash_completion.sh ---
# Check for interactive bash and that we haven't already been sourced.
[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return

# Check for recent enough version of bash.
bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
  if [ -r /etc/bash_completion ]; then
    # Source completion code.
    . /etc/bash_completion
  fi
fi
unset bash bminor bmajor


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	6 Apr 2009 18:07:53 -0000	1.15
+++ .cvsignore	25 Dec 2009 08:11:13 -0000	1.16
@@ -1 +1,2 @@
-bash-completion-1.0.tar.gz
+bash-completion-1.1.tar.bz2
+CHANGES-1.1


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-11/bash-completion.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- bash-completion.spec	7 Apr 2009 19:04:22 -0000	1.39
+++ bash-completion.spec	25 Dec 2009 08:11:13 -0000	1.40
@@ -1,18 +1,18 @@
 Name:           bash-completion
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPLv2+
 URL:            http://bash-completion.alioth.debian.org/
-Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
-Source1:        %{name}-mock
-Source2:        %{name}-plague-client
-Source3:        %{name}-repomanage
-# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c
-Patch0:         %{name}-1.0-bash4quoting-490322.patch
+Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2
+Source1:        %{name}-plague-client
+# Sources 2 and 3 missing from upstream 1.1 tarball.
+Source2:        http://bash-completion.alioth.debian.org/files/CHANGES-1.1
+# http://git.debian.org/?p=bash-completion/bash-completion.git;a=blob_plain;f=bash_completion.sh;h=915960b614ef7644f9abaa99ed9ef0faa7ac5477;hb=HEAD
+Source3:        bash_completion.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -27,10 +27,40 @@ of the programmable completion feature o
 
 %prep
 %setup -q
-%patch0 -p1
-install -pm 644 %{SOURCE1} contrib/mock
-install -pm 644 %{SOURCE2} contrib/plague-client
-install -pm 644 %{SOURCE3} contrib/repomanage
+install -pm 644 %{SOURCE1} contrib/plague-client
+install -pm 644 %{SOURCE2} CHANGES
+install -pm 644 %{SOURCE3} bash_completion.sh
+
+# Updated completions shipped upstream:
+rm contrib/cowsay
+# subversion too, but only in >= 1.6.5-2
+# yum-utils (repomanage) too, but only in >= 1.1.24
+# yum too, but only in >= 3.2.25-2
+
+# Combine to per-package files:
+( echo ; cat contrib/update-alternatives ) >> contrib/chkconfig
+rm contrib/update-alternatives
+
+# Not applicable to Fedora and derivatives:
+rm contrib/apache2ctl
+rm contrib/apt-build
+rm contrib/aptitude
+rm contrib/cardctl
+rm contrib/dpkg
+rm contrib/dselect
+rm contrib/heimdal
+rm contrib/kldload
+rm contrib/lilo
+rm contrib/links
+rm contrib/pkg_install
+rm contrib/pkgtools
+rm contrib/portupgrade
+rm contrib/reportbug
+rm contrib/sysv-rc
+
+# Not handled due to other reasons (e.g. no known packages) (yet?):
+rm contrib/larch
+rm contrib/p4
 
 
 %build
@@ -38,16 +68,28 @@ install -pm 644 %{SOURCE3} contrib/repom
 
 %install
 rm -rf $RPM_BUILD_ROOT %{name}-ghosts.list
+
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
 install -pm 644 bash_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -pm 644 contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-cd contrib
+
+# Always installed (not triggered) completions for practically always
+# installed packages or non-triggerable common ones:
+for f in bash-builtins configure dd getent iconv rpm ; do
+    mv $RPM_BUILD_ROOT{%{_datadir}/%{name}/$f,%{_sysconfdir}/bash_completion.d}
+done
+
+d=$(pwd)
+# ghost list
+cd $RPM_BUILD_ROOT%{_datadir}/%{name}
 for f in * ; do
-  ln -s %{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-  echo "%ghost %{_sysconfdir}/bash_completion.d/$f" >> ../%{name}-ghosts.list
+    ln -s %{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+    echo "%ghost %{_sysconfdir}/bash_completion.d/$f" >> $d/%{name}-ghosts.list
 done
 cd -
 
@@ -56,206 +98,179 @@ cd -
 rm -rf $RPM_BUILD_ROOT
 
 
-%define do_triggerin() if [ ! -e %{_sysconfdir}/bash_completion.d/%1 ] ; then ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || : ; fi
-%define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
+# Note that this *must* be %%define, not %%global, otherwise the %%{?2}/%%{!?2}
+# conditional is apparently evaluated too early (at spec parse time when arg 2
+# is never defined)?
+%define bashcomp_trigger() \
+%triggerin -- %{?2}%{!?2:%1}\
+[ -e %{_sysconfdir}/bash_completion.d/%1 ] ||\
+    ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || :\
+%triggerun -- %{?2}%{!?2:%1}\
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :\
+%{nil}
+
+%bashcomp_trigger ant
+%bashcomp_trigger apt
+%bashcomp_trigger aptitude
+%bashcomp_trigger aspell
+%bashcomp_trigger autorpm
+%bashcomp_trigger bind-utils
+%bashcomp_trigger bitkeeper
+%bashcomp_trigger bittorrent
+%bashcomp_trigger bluez-utils bluez
+%bashcomp_trigger brctl bridge-utils
+%bashcomp_trigger bzip2
+%bashcomp_trigger cfengine
+%bashcomp_trigger chkconfig
+%bashcomp_trigger chsh util-linux-ng
+%bashcomp_trigger cksfv
+%bashcomp_trigger clisp
+%bashcomp_trigger cpan2dist perl-CPANPLUS
+%bashcomp_trigger cpio
+%bashcomp_trigger cups
+%bashcomp_trigger cvs
+%bashcomp_trigger dcop kdelibs3
+%bashcomp_trigger dhclient
+%bashcomp_trigger dict dictd
+%bashcomp_trigger dsniff
+%bashcomp_trigger findutils
+%bashcomp_trigger freeciv
+%bashcomp_trigger gcc
+%bashcomp_trigger gcl
+%bashcomp_trigger gdb
+%bashcomp_trigger genisoimage
+%bashcomp_trigger gkrellm
+%bashcomp_trigger gnatmake gcc-gnat
+%bashcomp_trigger gpg gnupg
+%bashcomp_trigger gpg2 gnupg2
+%bashcomp_trigger gzip
+%bashcomp_trigger imagemagick ImageMagick
+%bashcomp_trigger info
+%bashcomp_trigger ipmitool
+%bashcomp_trigger iptables
+%bashcomp_trigger isql unixODBC
+%bashcomp_trigger jar java-1.6.0-openjdk-devel
+%bashcomp_trigger java java-1.6.0-openjdk
+%bashcomp_trigger ldapvi
+%bashcomp_trigger lftp
+%bashcomp_trigger lisp cmucl
+%bashcomp_trigger lvm lvm2
+%bashcomp_trigger lzma xz-lzma-compat
+%bashcomp_trigger lzop
+%bashcomp_trigger mailman
+%bashcomp_trigger make
+%bashcomp_trigger man
+%bashcomp_trigger mc
+%bashcomp_trigger mcrypt
+%bashcomp_trigger mdadm
+%bashcomp_trigger minicom
+%bashcomp_trigger mkinitrd
+%bashcomp_trigger mock
+
+%triggerin -- environment-modules
+if [ -e %{_datadir}/Modules/init/bash_completion ] ; then
+    # Upstream completion in environment-modules >= 3.2.7
+    rm -f %{_sysconfdir}/bash_completion.d/modules || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/modules ] ; then
+    ln -s %{_datadir}/%{name}/modules %{_sysconfdir}/bash_completion.d || :
+fi
+%triggerun -- environment-modules
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/modules || :
+
+%bashcomp_trigger monodevelop
+%bashcomp_trigger mplayer
+%bashcomp_trigger msynctool
+%bashcomp_trigger mtx
+%bashcomp_trigger munin-node
+%bashcomp_trigger mutt
+%bashcomp_trigger mysqladmin mysql,MySQL-client-community
+%bashcomp_trigger ncftp
+%bashcomp_trigger net-tools
+%bashcomp_trigger ntpdate
+%bashcomp_trigger openldap openldap-clients
+%bashcomp_trigger openssl
+%bashcomp_trigger perl
+%bashcomp_trigger pine
+%bashcomp_trigger pkg-config pkgconfig
+%bashcomp_trigger plague-client
+%bashcomp_trigger postfix
+%bashcomp_trigger postgresql
+%bashcomp_trigger povray
+%bashcomp_trigger python
+%bashcomp_trigger qdbus qt
+%bashcomp_trigger qemu
+%bashcomp_trigger quota-tools quota
+%bashcomp_trigger rcs
+%bashcomp_trigger rdesktop
 
-# Not handled (yet?):
-# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray
+%triggerin -- yum-utils
+if [ -e %{_sysconfdir}/bash_completion.d/yum-utils.bash ] ; then
+    # Upstream completion in yum-utils >= 1.1.24
+    rm -f %{_sysconfdir}/bash_completion.d/repomanage || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/repomanage ] ; then
+    ln -s %{_datadir}/%{name}/repomanage %{_sysconfdir}/bash_completion.d || :
+fi
+%triggerun -- yum-utils
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/repomanage || :
 
-%triggerin -- bittorrent
-%do_triggerin bittorrent
-%triggerun -- bittorrent
-%do_triggerun bittorrent
-
-%triggerin -- bridge-utils
-%do_triggerin brctl
-%triggerun -- bridge-utils
-%do_triggerun brctl
-
-%triggerin -- cksfv
-%do_triggerin cksfv
-%triggerun -- cksfv
-%do_triggerun cksfv
-
-%triggerin -- clisp
-%do_triggerin clisp
-%triggerun -- clisp
-%do_triggerun clisp
-
-%triggerin -- cowsay
-%do_triggerin cowsay
-%triggerun -- cowsay
-%do_triggerun cowsay
-
-%triggerin -- dsniff
-%do_triggerin dsniff
-%triggerun -- dsniff
-%do_triggerun dsniff
-
-%triggerin -- freeciv
-%do_triggerin freeciv
-%triggerun -- freeciv
-%do_triggerun freeciv
-
-%triggerin -- gcc-gnat
-%do_triggerin gnatmake
-%triggerun -- gcc-gnat
-%do_triggerun gnatmake
-
-%triggerin -- gcl
-%do_triggerin gcl
-%triggerun -- gcl
-%do_triggerun gcl
-
-%triggerin -- gkrellm
-%do_triggerin gkrellm
-%triggerun -- gkrellm
-%do_triggerun gkrellm
-
-%triggerin -- gnupg2
-%do_triggerin gpg2
-%triggerun -- gnupg2
-%do_triggerun gpg2
-
-%triggerin -- lilypond
-%do_triggerin lilypond
-%triggerun -- lilypond
-%do_triggerun lilypond
-
-%triggerin -- lzma
-%do_triggerin lzma
-%triggerun -- lzma
-%do_triggerun lzma
-
-%triggerin -- lzop
-%do_triggerin lzop
-%triggerun -- lzop
-%do_triggerun lzop
-
-%triggerin -- mailman
-%do_triggerin mailman
-%triggerun -- mailman
-%do_triggerun mailman
-
-%triggerin -- mcrypt
-%do_triggerin mcrypt
-%triggerun -- mcrypt
-%do_triggerun mcrypt
-
-%triggerin -- minicom
-%do_triggerin minicom
-%triggerun -- minicom
-%do_triggerun minicom
-
-%triggerin -- mock
-%do_triggerin mock
-%triggerun -- mock
-%do_triggerun mock
-
-%triggerin -- monodevelop
-%do_triggerin monodevelop
-%triggerun -- monodevelop
-%do_triggerun monodevelop
-
-%triggerin -- mtx
-%do_triggerin mtx
-%triggerun -- mtx
-%do_triggerun mtx
-
-%triggerin -- net-tools
-%do_triggerin net-tools
-%triggerun -- net-tools
-%do_triggerun net-tools
-
-%triggerin -- openssh-clients
-%do_triggerin ssh
-%triggerun -- openssh-clients
-%do_triggerun ssh
-
-%triggerin -- perl-CPANPLUS
-%do_triggerin cpan2dist
-%triggerun -- perl-CPANPLUS
-%do_triggerun cpan2dist
-
-%triggerin -- perl-SVK
-%do_triggerin svk
-%triggerun -- perl-SVK
-%do_triggerun svk
-
-%triggerin -- plague-client
-%do_triggerin plague-client
-%triggerun -- plague-client
-%do_triggerun plague-client
-
-%triggerin -- qemu
-%do_triggerin qemu
-%triggerun -- qemu
-%do_triggerun qemu
-
-%triggerin -- quota
-%do_triggerin quota-tools
-%triggerun -- quota
-%do_triggerun quota-tools
-
-%triggerin -- qt
-%do_triggerin qdbus
-%triggerun -- qt
-%do_triggerun qdbus
-
-%triggerin -- rdesktop
-%do_triggerin rdesktop
-%triggerun -- rdesktop
-%do_triggerun rdesktop
-
-%triggerin -- ruby-ri
-%do_triggerin ri
-%triggerun -- ruby-ri
-%do_triggerun ri
-
-%triggerin -- sbcl
-%do_triggerin sbcl
-%triggerun -- sbcl
-%do_triggerun sbcl
-
-%triggerin -- sitecopy
-%do_triggerin sitecopy
-%triggerun -- sitecopy
-%do_triggerun sitecopy
-
-%triggerin -- snownews
-%do_triggerin snownews
-%triggerun -- snownews
-%do_triggerun snownews
+%bashcomp_trigger resolvconf
+%bashcomp_trigger rfkill
+%bashcomp_trigger ri ruby-ri
+%bashcomp_trigger rpcdebug nfs-utils
+%bashcomp_trigger rpmcheck
+%bashcomp_trigger rrdtool
+%bashcomp_trigger rsync
+%bashcomp_trigger samba samba-common
+%bashcomp_trigger sbcl
+%bashcomp_trigger screen
+%bashcomp_trigger shadow shadow-utils
+%bashcomp_trigger sitecopy
+%bashcomp_trigger smartctl smartmontools
+%bashcomp_trigger snownews
+%bashcomp_trigger ssh openssh-clients
+%bashcomp_trigger strace
 
 %triggerin -- subversion
-%do_triggerin _subversion
+if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
+    # Upstream completion in subversion >= 1.6.5-2
+    rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/_subversion ] ; then
+    ln -s %{_datadir}/%{name}/_subversion %{_sysconfdir}/bash_completion.d || :
+fi
 %triggerun -- subversion
-%do_triggerun _subversion
-
-%triggerin -- unace
-%do_triggerin unace
-%triggerun -- unace
-%do_triggerun unace
-
-%triggerin -- unixODBC
-%do_triggerin isql
-%triggerun -- unixODBC
-%do_triggerun isql
-
-%triggerin -- unrar
-%do_triggerin unrar
-%triggerun -- unrar
-%do_triggerun unrar
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
 
-%triggerin -- yum-utils
-%do_triggerin repomanage
-%triggerun -- yum-utils
-%do_triggerun repomanage
+%bashcomp_trigger svk perl-SVK
+%bashcomp_trigger sysctl procps
+%bashcomp_trigger tar
+%bashcomp_trigger tcpdump
+%bashcomp_trigger unace
+%bashcomp_trigger unrar
+%bashcomp_trigger vncviewer vnc
+%bashcomp_trigger vpnc
+%bashcomp_trigger wireless-tools
+%bashcomp_trigger wodim
+%bashcomp_trigger wvdial
+%bashcomp_trigger xhost xorg-x11-server-utils
+%bashcomp_trigger xm xen
+%bashcomp_trigger xmllint libxml2
+%bashcomp_trigger xmlwf expat
+%bashcomp_trigger xmms
+%bashcomp_trigger xrandr xorg-x11-server-utils
+%bashcomp_trigger xz
+%bashcomp_trigger yp-tools
+
+%triggerin -- yum
+if [ -e %{_sysconfdir}/bash_completion.d/yum.bash ] ; then
+    # Upstream completion in yum >= 3.2.25-2
+    rm -f %{_sysconfdir}/bash_completion.d/_yum || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/_yum ] ; then
+    ln -s %{_datadir}/%{name}/_yum %{_sysconfdir}/bash_completion.d || :
+fi
+%triggerun -- yum
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_yum || :
 
-%triggerin -- vnc
-%do_triggerin vncviewer
-%triggerun -- vnc
-%do_triggerun vncviewer
+%bashcomp_trigger yum-arch
 
 
 %files -f %{name}-ghosts.list
@@ -264,36 +279,66 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
+%{_sysconfdir}/bash_completion.d/bash-builtins
+%{_sysconfdir}/bash_completion.d/configure
+%{_sysconfdir}/bash_completion.d/dd
+%{_sysconfdir}/bash_completion.d/getent
+%{_sysconfdir}/bash_completion.d/iconv
+%{_sysconfdir}/bash_completion.d/rpm
 %{_datadir}/%{name}/
 
 
 %changelog
-* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-2
+* Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
+- Fix autoinstall of completions named other than the package (#546905).
+- Use environment-modules upstream completion instead of ours if available.
+- Autoinstall mysqladmin completion also on MySQL-client-community.
+
+* Tue Nov 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-3
+- Prepare for smooth coexistence with yum upstream completion.
+
+* Sun Nov  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-2
+- Use yum-utils completion instead of ours if available.
+
+* Mon Oct 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-1
+- Update to 1.1.
+- bash 4 quoting fix, mock and repomanage completions included upstream.
+
+* Sun Sep 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-5
+- Use svn completion from subversion instead of ours if available (#496456).
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Apr 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-3
+- Do not install cowsay completion, an updated version is shipped with it.
+
+* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-2
 - Apply upstream patch to fix quoting issues with bash 4.x (#490322).
 
-* Mon Apr  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-1
+* Mon Apr  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-1
 - 1.0.
 
-* Mon Mar 23 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
+* Mon Mar 23 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
 - Add dependency on coreutils for triggers (#490768).
 - Update and improve mock completion.
 
-* Sun Mar 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
+* Sun Mar 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
 - git snapshot f4f0984, fixes #484578 (another issue), #486998.
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Feb 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
+* Wed Feb 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
 - git snapshot 47d0c5b, fixes #484578.
 - lzop and repomanage completions included upstream.
 
-* Sun Jan 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
+* Sun Jan 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
 - r1252 snapshot; all patches applied upstream.
 - Do not install mercurial completion, an updated version is shipped with it.
 - Improve lzop and repomanage completion.
 
-* Tue Jan  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-1
+* Tue Jan  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-1
 - 20080705; new upstream at http://bash-completion.alioth.debian.org/
 - Perl, Debian, and scp patches applied upstream.
 - Patch to improve man completion: more sections, better filename handling.
@@ -301,10 +346,10 @@ rm -rf $RPM_BUILD_ROOT
 - Patch to fix and speed up rpm installed packages completion.
 - Update mock completion.
 
-* Thu Sep 25 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Sep 25 2008 Ville Skytt? <ville.skytta at iki.fi>
 - More Matroska associations (#463829, based on patch from Yanko Kaneti).
 
-* Thu Sep 11 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-13
+* Thu Sep 11 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-13
 - Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
   for getent and rpm --eval, better rpm backup file avoidance, lzma support.
 - Patch/unpatch to fix gzip and bzip2 options completion.
@@ -312,177 +357,177 @@ rm -rf $RPM_BUILD_ROOT
 - Add and trigger-install support for lzop.
 - Associate *.sqlite with sqlite3.
 
-* Wed Jul 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-12
+* Wed Jul 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-12
 - Fix plague-client completion install (#456355, Ricky Zhou).
 - Trigger-install support for sitecopy.
 
-* Tue Apr 29 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-11
+* Tue Apr 29 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-11
 - Media player association improvements (#444467).
 
-* Sat Feb 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-10
+* Sat Feb 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-10
 - Patch to fix filename completion with svn (#430059).
 - Trigger-install support for dsniff.
 - Drop disttag.
 
-* Mon Dec 31 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-8
+* Mon Dec 31 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-8
 - Associate VDR recording files with media players.
 - Update mock completion.
 
-* Fri Nov 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-7
+* Fri Nov 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-7
 - Add JPEG2000 extensions for display(1) (#304771).
 - Update mock completion.
 
-* Sat Sep 22 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-6
+* 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
+* Mon Aug 13 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-5
 - License: GPLv2+
 
 * Sun Jun 24 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> - 20060301-4
 - Update triggers to work with older versions of RPM
 
-* Wed Feb 28 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-3
+* Wed Feb 28 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-3
 - Fix scp with single quotes (#217178).
 - Borrow fix for bzip2 w/spaces, and apropos and whatis support from Debian.
 
-* Thu Aug 31 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060301-2
+* Thu Aug 31 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060301-2
 - Trigger-install support for gcl, lilypond, mercurial and svk.
 - Improve mock completion a bit.
 
-* Thu Mar  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060301-1
+* Thu Mar  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060301-1
 - 20060301, patches and profile.d scriptlet applied/included upstream.
 - Convert docs to UTF-8.
 
-* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 20050721-4
+* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 20050721-4
 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
 - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.
 
-* Sat Feb  4 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Feb  4 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).
 
-* Sun Jan  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 20050721-3
+* Sun Jan  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 20050721-3
 - Patch to hopefully fix quoting problems with bash 3.1 (#177056).
 
-* Mon Nov 28 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050721-2
+* Mon Nov 28 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050721-2
 - Work around potential login problem in profile.d snippet (#174355).
 
-* Sat Nov 26 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Nov 26 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Don't mark the main source file as %%config.
 - Make profile.d snippet non-executable (#35714) and noreplace.
 - Add mock, plague-client and repomanage completion.
 - Allow "cvs stat" completion.
 - Macroize trigger creation.
 
-* Fri Jul 22 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050721-1
+* Fri Jul 22 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050721-1
 - 20050721.
 
-* Wed Jul 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050720-1
+* Wed Jul 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050720-1
 - 20050720, all patches applied upstream.
 
-* Mon Jul 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050712-1
+* Mon Jul 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050712-1
 - 20050712.
 - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).
 - Add/fix support for some multimedia formats and players.
 - Fix tarball completion.
 
-* Sat Jan 22 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050121-2
+* Sat Jan 22 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050121-2
 - Update to 20050121.
 
-* Thu Jan 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050112-1
+* Thu Jan 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050112-1
 - Update to 20050112, openssl patch applied upstream.
 
-* Wed Jan  5 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050103-1
+* Wed Jan  5 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050103-1
 - Update to 20050103.
 
-* Sat Nov 27 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:20041017-5
+* Sat Nov 27 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:20041017-5
 - Change version scheme, bump release to provide Extras upgrade path.
 
-* Sat Nov  6 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.4.20041017
+* Sat Nov  6 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.4.20041017
 - Do the right thing with bash >= 3 too in profile.d snippet (bug 2228, thanks
   to Thorsten Leemhuis).
 
-* Mon Oct 18 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20041017
+* Mon Oct 18 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20041017
 - Update to 20041017, adds dhclient, lvm, and bittorrent completion.
 
-* Mon Jul 12 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040711
+* Mon Jul 12 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040711
 - Update to 20040711, patches applied upstream.
 
-* Sun Jul  4 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040704
+* Sun Jul  4 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040704
 - Update to 20040704.
 - Change to symlinked /etc/bash_completion.d snippets, add patch to read them.
 
-* Wed May 26 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040526
+* Wed May 26 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040526
 - Update to 20040526.
 
-* Thu Apr  1 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040331
+* Thu Apr  1 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040331
 - Add command-specific contrib snippet copying triggers.
 
-* Thu Apr  1 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040331
+* Thu Apr  1 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040331
 - Update to 20040331.
 
-* Sun Feb 15 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040214
+* Sun Feb 15 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040214
 - Update to 20040214.
 
-* Wed Feb 11 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040210
+* Wed Feb 11 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040210
 - Update to 20040210.
 
-* Fri Jan  2 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040101
+* Fri Jan  2 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040101
 - Update to 20040101.
 - Update %%description.
 
-* Sat Dec 27 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20031225
+* Sat Dec 27 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20031225
 - Update to 20031225.
 
-* Sat Dec 20 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20031215
+* Sat Dec 20 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20031215
 - Don't pull in *.rpm* from %%{_sysconfdir}/bash_completion.d.
 
-* Mon Dec 15 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031215
+* Mon Dec 15 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031215
 - Update to 20031215.
 
-* Sun Nov 30 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031125
+* Sun Nov 30 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031125
 - Update to 20031125.
 
-* Thu Nov 13 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031112
+* Thu Nov 13 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031112
 - Update to 20031112.
 
-* Wed Oct 22 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031022
+* Wed Oct 22 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031022
 - Update to 20031022.
 
-* Tue Oct  7 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031007
+* Tue Oct  7 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031007
 - Update to 20031007.
 
-* Tue Sep 30 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030929
+* Tue Sep 30 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030929
 - Update to 20030929.
 
-* Fri Sep 12 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030911
+* Fri Sep 12 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030911
 - Update to 20030911.
 
-* Thu Aug 21 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030821
+* Thu Aug 21 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030821
 - Update to 20030821.
 - Drop .nosrc.rpm patch, already applied upstream.
 
-* Sat Aug 16 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030811
+* Sat Aug 16 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030811
 - Update to 20030811.
 - Patch to make rpm --rebuild work with .nosrc.rpm's.
 
-* Sun Aug  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030803
+* Sun Aug  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030803
 - Update to 20030803.
 
-* Wed Jul 23 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030721
+* Wed Jul 23 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030721
 - Update to 20030721.
 
-* Sun Jul 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030713
+* Sun Jul 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030713
 - Update to 20030713.
 
-* Mon Jun 30 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030630
+* Mon Jun 30 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030630
 - Update to 20030630.
 
-* Sun Jun  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030607
+* Sun Jun  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030607
 - Update to 20030607.
 
-* Tue May 27 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030527
+* Tue May 27 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030527
 - Update to 20030527.
 
-* Sat May 24 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030505
+* Sat May 24 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030505
 - First build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	6 Apr 2009 18:07:53 -0000	1.15
+++ sources	25 Dec 2009 08:11:13 -0000	1.16
@@ -1 +1,2 @@
-cd1c5648272917fbe0eef4ba30bb93f4  bash-completion-1.0.tar.gz
+1b5ed247ed904d0a2ec6a6d2c5876c52  bash-completion-1.1.tar.bz2
+7daa098026ae41f6c51a3f03035218f3  CHANGES-1.1


--- bash-completion-1.0-bash4quoting-490322.patch DELETED ---


--- bash-completion-mock DELETED ---


--- bash-completion-repomanage DELETED ---



From scop at fedoraproject.org  Fri Dec 25 08:17:21 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Fri, 25 Dec 2009 08:17:21 +0000 (UTC)
Subject: File em8300-nofirmware-0.17.4.tar.gz uploaded to lookaside cache by
	scop
Message-ID: <20091225081721.E3ED310F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for em8300:

dbad0f9e15621d1e4b60c966852c760f  em8300-nofirmware-0.17.4.tar.gz



From scop at fedoraproject.org  Fri Dec 25 08:20:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Fri, 25 Dec 2009 08:20:15 +0000 (UTC)
Subject: rpms/em8300/F-12 .cvsignore, 1.20, 1.21 em8300.spec, 1.28,
	1.29 sources, 1.20, 1.21
Message-ID: <20091225082015.6FD7611C03B8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32674/F-12

Modified Files:
	.cvsignore em8300.spec sources 
Log Message:
* Fri Dec 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.4-1
- Update to 0.17.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	16 Jul 2009 19:06:04 -0000	1.20
+++ .cvsignore	25 Dec 2009 08:20:15 -0000	1.21
@@ -1 +1 @@
-em8300-nofirmware-0.17.3.tar.gz
+em8300-nofirmware-0.17.4.tar.gz


Index: em8300.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/F-12/em8300.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- em8300.spec	24 Jul 2009 22:02:21 -0000	1.28
+++ em8300.spec	25 Dec 2009 08:20:15 -0000	1.29
@@ -2,8 +2,8 @@
 #global prever  rc1
 
 Name:           em8300
-Version:        0.17.3
-Release:        2%{?prever:.%{prever}}%{?dist}
+Version:        0.17.4
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
@@ -141,6 +141,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Dec 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.4-1
+- Update to 0.17.4.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -150,69 +153,69 @@ gtk-update-icon-cache %{_datadir}/icons/
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Fri Feb 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.2-2
+* Fri Feb 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.2-2
 - Improve icon cache refresh scriptlets, move them to -utils where they belong.
 - Make -devel subpackage noarch when built with rpmbuild >= 4.6.0.
 
 * Sun Nov 09 2008 Felix Kaechele <felix at fetzig dot org> - 0.17.2-1
 - 0.17.2
 
-* Tue Oct 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.2-0.1.rc1
+* Tue Oct 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.2-0.1.rc1
 - 0.17.2-rc1.
 
-* Sun Sep 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-2
+* Sun Sep 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-2
 - Adapt to a couple of different alsa/cards dir locations.
 
-* Thu Aug 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-1
+* Thu Aug 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-1
 - 0.17.1.
 
-* Mon Jun  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.0-1
+* Mon Jun  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.0-1
 - 0.17.0.
 
-* Sat Apr 12 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.0-0.1.rc1
+* Sat Apr 12 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.0-0.1.rc1
 - 0.17.0-rc1.
 
-* Tue Feb  5 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.16.4-1
+* Tue Feb  5 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.16.4-1
 - 0.16.4.
 - Drop WSS patch, it no longer applies.
 - Prune pre-0.16.0 changelog entries.
 
-* Wed Nov 21 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-2
+* Wed Nov 21 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-2
 - Drop dependency on em8300-kmod.
 
-* Sat Aug 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-1
+* Sat Aug 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-1
 - 0.16.3.
 
-* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc3
+* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc3
 - 0.16.3-rc3.
 - License: GPLv2+
 
-* Fri Jul 20 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc2
+* Fri Jul 20 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc2
 - 0.16.3-rc2.
 
-* Wed Jul 11 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc1
+* Wed Jul 11 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc1
 - 0.16.3-rc1, fixes #241041.
 - Update icon cache and group handling to current guidelines/drafts.
 
-* Mon May  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.2-1
+* Mon May  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.2-1
 - 0.16.2.
 
-* Wed Apr  4 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.2-0.1.rc1
+* Wed Apr  4 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.2-0.1.rc1
 - 0.16.2-rc1.
 - Update examples in README-modprobe.conf.
 
-* Thu Mar  1 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.1-1
+* Thu Mar  1 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.1-1
 - 0.16.1.
 
-* Sat Feb 24 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.1-0.1.rc2
+* Sat Feb 24 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.1-0.1.rc2
 - 0.16.1-rc2.
 
-* Tue Dec 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-3
+* Tue Dec 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-3
 - Ship console.perms.d snippet uncommented (#206700 fixed).
 
-* Fri Dec 22 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-2
+* Fri Dec 22 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-2
 - Eliminate some file based dependencies.
 
-* Sun Nov 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-1
+* Sun Nov 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-1
 - 0.16.0.
 - Drop X-Fedora category from desktop entries.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	16 Jul 2009 19:06:04 -0000	1.20
+++ sources	25 Dec 2009 08:20:15 -0000	1.21
@@ -1 +1 @@
-6332ddd72e95b15546d1b57b1d21856a  em8300-nofirmware-0.17.3.tar.gz
+dbad0f9e15621d1e4b60c966852c760f  em8300-nofirmware-0.17.4.tar.gz



From scop at fedoraproject.org  Fri Dec 25 08:20:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Fri, 25 Dec 2009 08:20:15 +0000 (UTC)
Subject: rpms/em8300/devel .cvsignore, 1.20, 1.21 em8300.spec, 1.28,
	1.29 sources, 1.20, 1.21
Message-ID: <20091225082015.95AC411C03B8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32674/devel

Modified Files:
	.cvsignore em8300.spec sources 
Log Message:
* Fri Dec 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.4-1
- Update to 0.17.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	16 Jul 2009 19:06:04 -0000	1.20
+++ .cvsignore	25 Dec 2009 08:20:15 -0000	1.21
@@ -1 +1 @@
-em8300-nofirmware-0.17.3.tar.gz
+em8300-nofirmware-0.17.4.tar.gz


Index: em8300.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/em8300.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- em8300.spec	24 Jul 2009 22:02:21 -0000	1.28
+++ em8300.spec	25 Dec 2009 08:20:15 -0000	1.29
@@ -2,8 +2,8 @@
 #global prever  rc1
 
 Name:           em8300
-Version:        0.17.3
-Release:        2%{?prever:.%{prever}}%{?dist}
+Version:        0.17.4
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
@@ -141,6 +141,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Dec 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.4-1
+- Update to 0.17.4.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -150,69 +153,69 @@ gtk-update-icon-cache %{_datadir}/icons/
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Fri Feb 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.2-2
+* Fri Feb 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.2-2
 - Improve icon cache refresh scriptlets, move them to -utils where they belong.
 - Make -devel subpackage noarch when built with rpmbuild >= 4.6.0.
 
 * Sun Nov 09 2008 Felix Kaechele <felix at fetzig dot org> - 0.17.2-1
 - 0.17.2
 
-* Tue Oct 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.2-0.1.rc1
+* Tue Oct 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.2-0.1.rc1
 - 0.17.2-rc1.
 
-* Sun Sep 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-2
+* Sun Sep 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-2
 - Adapt to a couple of different alsa/cards dir locations.
 
-* Thu Aug 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-1
+* Thu Aug 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-1
 - 0.17.1.
 
-* Mon Jun  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.0-1
+* Mon Jun  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.0-1
 - 0.17.0.
 
-* Sat Apr 12 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.0-0.1.rc1
+* Sat Apr 12 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.17.0-0.1.rc1
 - 0.17.0-rc1.
 
-* Tue Feb  5 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.16.4-1
+* Tue Feb  5 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.16.4-1
 - 0.16.4.
 - Drop WSS patch, it no longer applies.
 - Prune pre-0.16.0 changelog entries.
 
-* Wed Nov 21 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-2
+* Wed Nov 21 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-2
 - Drop dependency on em8300-kmod.
 
-* Sat Aug 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-1
+* Sat Aug 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-1
 - 0.16.3.
 
-* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc3
+* Fri Aug 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc3
 - 0.16.3-rc3.
 - License: GPLv2+
 
-* Fri Jul 20 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc2
+* Fri Jul 20 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc2
 - 0.16.3-rc2.
 
-* Wed Jul 11 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc1
+* Wed Jul 11 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.3-0.1.rc1
 - 0.16.3-rc1, fixes #241041.
 - Update icon cache and group handling to current guidelines/drafts.
 
-* Mon May  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.2-1
+* Mon May  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.2-1
 - 0.16.2.
 
-* Wed Apr  4 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.2-0.1.rc1
+* Wed Apr  4 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.2-0.1.rc1
 - 0.16.2-rc1.
 - Update examples in README-modprobe.conf.
 
-* Thu Mar  1 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.1-1
+* Thu Mar  1 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.1-1
 - 0.16.1.
 
-* Sat Feb 24 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.1-0.1.rc2
+* Sat Feb 24 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.16.1-0.1.rc2
 - 0.16.1-rc2.
 
-* Tue Dec 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-3
+* Tue Dec 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-3
 - Ship console.perms.d snippet uncommented (#206700 fixed).
 
-* Fri Dec 22 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-2
+* Fri Dec 22 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-2
 - Eliminate some file based dependencies.
 
-* Sun Nov 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-1
+* Sun Nov 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.16.0-1
 - 0.16.0.
 - Drop X-Fedora category from desktop entries.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	16 Jul 2009 19:06:04 -0000	1.20
+++ sources	25 Dec 2009 08:20:15 -0000	1.21
@@ -1 +1 @@
-6332ddd72e95b15546d1b57b1d21856a  em8300-nofirmware-0.17.3.tar.gz
+dbad0f9e15621d1e4b60c966852c760f  em8300-nofirmware-0.17.4.tar.gz



From kwright at fedoraproject.org  Fri Dec 25 08:31:18 2009
From: kwright at fedoraproject.org (kwright)
Date: Fri, 25 Dec 2009 08:31:18 +0000 (UTC)
Subject: rpms/osutil/F-12 import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 osutil.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091225083118.12D6411C00E6@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/osutil/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1941/F-12

Modified Files:
	.cvsignore osutil.spec sources 
Added Files:
	import.log 
Log Message:
Removed 'with exceptions' from License



--- NEW FILE import.log ---
osutil-1_3_1-1_fc12:F-12:osutil-1.3.1-1.fc12.src.rpm:1261729832


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Nov 2009 20:00:57 -0000	1.2
+++ .cvsignore	25 Dec 2009 08:31:17 -0000	1.3
@@ -1 +1 @@
-osutil-1.3.0.tar.gz
+osutil-1.3.1.tar.gz


Index: osutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/F-12/osutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- osutil.spec	20 Nov 2009 20:00:57 -0000	1.1
+++ osutil.spec	25 Dec 2009 08:31:17 -0000	1.2
@@ -1,15 +1,14 @@
 Name:           osutil
-Version:        1.3.0
-Release:        3%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Operating System Utilities JNI Package
 URL:            http://pki.fedoraproject.org/
-License:        GPLv2 with exceptions
+License:        GPLv2
 Group:          System Environment/Libraries
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
-BuildRequires:  bash
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
 BuildRequires:  nspr-devel >= 4.6.99
@@ -68,12 +67,18 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/
 
 %changelog
+* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.1-1
+- Removed BuildRequires bash
+- Removed 'with exceptions' from License
+
 * Fri Oct 30 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil
 - Removed LICENSE logic from installation section
 - Take ownership of library directory
+
 * Tue Oct 27 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil
 - Complied with Fedora JNI packaging logic
+
 * Thu Oct 8 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Nov 2009 20:00:57 -0000	1.2
+++ sources	25 Dec 2009 08:31:17 -0000	1.3
@@ -1 +1 @@
-b7aa665877d0bb877c5488a9c2c00425  osutil-1.3.0.tar.gz
+3bbf5eec8347db610e3b927fe7e9c876  osutil-1.3.1.tar.gz



From kwright at fedoraproject.org  Fri Dec 25 08:51:20 2009
From: kwright at fedoraproject.org (kwright)
Date: Fri, 25 Dec 2009 08:51:20 +0000 (UTC)
Subject: rpms/osutil/devel import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 osutil.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091225085120.AB27F11C00E6@cvs1.fedora.phx.redhat.com>

Author: kwright

Update of /cvs/pkgs/rpms/osutil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4243/devel

Modified Files:
	.cvsignore osutil.spec sources 
Added Files:
	import.log 
Log Message:
Removed 'with exceptions' from License



--- NEW FILE import.log ---
osutil-1_3_1-1_fc13:HEAD:osutil-1.3.1-1.fc13.src.rpm:1261731021


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Nov 2009 20:04:27 -0000	1.2
+++ .cvsignore	25 Dec 2009 08:51:20 -0000	1.3
@@ -1 +1 @@
-osutil-1.3.0.tar.gz
+osutil-1.3.1.tar.gz


Index: osutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/devel/osutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- osutil.spec	20 Nov 2009 20:04:27 -0000	1.1
+++ osutil.spec	25 Dec 2009 08:51:20 -0000	1.2
@@ -1,15 +1,15 @@
 Name:           osutil
-Version:        1.3.0
-Release:        3%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Operating System Utilities JNI Package
 URL:            http://pki.fedoraproject.org/
-License:        GPLv2 with exceptions
+License:        GPLv2
 Group:          System Environment/Libraries
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  jna >= 3.0.9
 BuildRequires:  ant
-BuildRequires:  bash
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
 BuildRequires:  nspr-devel >= 4.6.99
@@ -68,12 +68,18 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/
 
 %changelog
+* Mon Dec 14 2009 Kevin Wright <kwright at redhat.com> 1.3.1-1
+- Removed BuildRequires bash
+- Removed 'with exceptions' from License
+
 * Fri Oct 30 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-3
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil
 - Removed LICENSE logic from installation section
 - Take ownership of library directory
+
 * Tue Oct 27 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil
 - Complied with Fedora JNI packaging logic
+
 * Thu Oct 8 2009 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
 - Bugzilla Bug #521983 -  New package for Dogtag PKI: osutil


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osutil/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Nov 2009 20:04:27 -0000	1.2
+++ sources	25 Dec 2009 08:51:20 -0000	1.3
@@ -1 +1 @@
-b7aa665877d0bb877c5488a9c2c00425  osutil-1.3.0.tar.gz
+3bbf5eec8347db610e3b927fe7e9c876  osutil-1.3.1.tar.gz



From scop at fedoraproject.org  Fri Dec 25 09:12:51 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Fri, 25 Dec 2009 09:12:51 +0000 (UTC)
Subject: File rackerhacker-MySQLTuner-perl-b2dfc87.tar.gz uploaded to
	lookaside cache by scop
Message-ID: <20091225091251.46DE210F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mysqltuner:

dfac7a81c7a56d66a994e57ba8428d08  rackerhacker-MySQLTuner-perl-b2dfc87.tar.gz



From scop at fedoraproject.org  Fri Dec 25 09:17:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Fri, 25 Dec 2009 09:17:04 +0000 (UTC)
Subject: rpms/mysqltuner/devel .cvsignore, 1.5, 1.6 mysqltuner.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20091225091704.219CD11C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mysqltuner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7261

Modified Files:
	.cvsignore mysqltuner.spec sources 
Log Message:
* Fri Dec 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-1
- Update to 1.1.1.
- Improve summary.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Jul 2009 19:11:38 -0000	1.5
+++ .cvsignore	25 Dec 2009 09:17:03 -0000	1.6
@@ -1 +1 @@
-mysqltuner-1.0.0.pl
+rackerhacker-MySQLTuner-perl-b2dfc87.tar.gz


Index: mysqltuner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/devel/mysqltuner.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mysqltuner.spec	25 Jul 2009 15:32:37 -0000	1.10
+++ mysqltuner.spec	25 Dec 2009 09:17:03 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           mysqltuner
-Version:        1.0.0
-Release:        2%{?dist}
-Summary:        MySQL high performance tuning script
+Version:        1.1.1
+Release:        1%{?dist}
+Summary:        MySQL configuration assistant
 
 Group:          Applications/Databases
 License:        GPLv3+
 URL:            http://mysqltuner.com/
-Source0:        http://mysqltuner.com/releases/mysqltuner-%{version}.pl
+# Source0: http://github.com/rackerhacker/MySQLTuner-perl/tarball/v1.1.1
+Source0:        rackerhacker-MySQLTuner-perl-b2dfc87.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,8 +22,7 @@ MySQL installation and the areas where i
 
 
 %prep
-%setup -q -c -T
-cp -p %{SOURCE0} ./mysqltuner.pl
+%setup -q -n %(basename %{SOURCE0} .tar.gz)
 
 
 %build
@@ -39,41 +39,46 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc LICENSE README
 %{_bindir}/mysqltuner
 
 
 %changelog
+* Fri Dec 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-1
+- Update to 1.1.1.
+- Improve summary.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Jul  1 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.0-1
+* Wed Jul  1 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.0-1
 - Update to 1.0.0.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.2.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Nov  4 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.0.0-0.1.rc1
+* Tue Nov  4 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.0.0-0.1.rc1
 - 1.0.0-rc1.
 
-* Thu Sep 11 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.9-1
+* Thu Sep 11 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.9-1
 - 0.9.9.
 - Update description.
 
-* Mon Jul 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.8-1
+* Mon Jul 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.8-1
 - 0.9.8, --checkversion patch applied upstream.
 
-* Sat Jun 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.1-4
+* Sat Jun 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.1-4
 - Don't warn if --skipversion is used (#452172).
 
-* Thu Jun 19 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.1-1
+* Thu Jun 19 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.1-1
 - 0.9.1.
 - Patch to not "phone home" by default (--skipversion -> --checkversion).
 
-* Sat Apr 12 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.0-1
+* Sat Apr 12 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9.0-1
 - 0.9.0.
 
-* Sun Mar  2 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.8.6-1
+* Sun Mar  2 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.8.6-1
 - 0.8.6.
 
-* Mon Feb 18 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.8.5-1
+* Mon Feb 18 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.8.5-1
 - 0.8.5.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	1 Jul 2009 19:11:38 -0000	1.6
+++ sources	25 Dec 2009 09:17:03 -0000	1.7
@@ -1 +1 @@
-de535154b7fb28e437ba412434ea535e  mysqltuner-1.0.0.pl
+dfac7a81c7a56d66a994e57ba8428d08  rackerhacker-MySQLTuner-perl-b2dfc87.tar.gz



From maxx at fedoraproject.org  Fri Dec 25 10:34:22 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Fri, 25 Dec 2009 10:34:22 +0000 (UTC)
Subject: File hamster-applet-2.29.4.tar.bz2 uploaded to lookaside cache by maxx
Message-ID: <20091225103422.7401010F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for hamster-applet:

74833216d02b8b54d09bdafef8a5325d  hamster-applet-2.29.4.tar.bz2



From maxx at fedoraproject.org  Fri Dec 25 10:52:07 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Fri, 25 Dec 2009 10:52:07 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.26, 1.27 hamster-applet.spec, 
	1.35, 1.36 sources, 1.26, 1.27
Message-ID: <20091225105207.1857A11C00E6@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17933

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Fri Dec 25 2009 Mads Villadsen <maxx at krakoa.dk> - 2.29.4-1
- Update to 2.29.4
- Rework some dependencies towards HalRemoval (https://fedoraproject.org/wiki/Features/HalRemoval)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	1 Dec 2009 14:35:28 -0000	1.26
+++ .cvsignore	25 Dec 2009 10:52:06 -0000	1.27
@@ -1 +1 @@
-hamster-applet-2.29.3.tar.bz2
+hamster-applet-2.29.4.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- hamster-applet.spec	1 Dec 2009 14:35:28 -0000	1.35
+++ hamster-applet.spec	25 Dec 2009 10:52:06 -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:           hamster-applet
-Version:        2.29.3
+Version:        2.29.4
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -20,7 +20,7 @@ BuildRequires:  control-center >= 2.19.4
 
 Requires:       hicolor-icon-theme
 Requires:       pygtk2, pygobject2, gnome-python2-applet, python-sqlite2
-Requires:       gnome-python2-gnome, gnome-python2-canvas, gnome-python2-gnomevfs
+Requires:       gnome-python2-gnome
 Requires:       gnome-python2-gconf, gnome-python2-evolution, pycairo
 # for /usr/share/control-center/keybindings
 Requires:       control-center-filesystem
@@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 25 2009 Mads Villadsen <maxx at krakoa.dk> - 2.29.4-1
+- Update to 2.29.4
+- Rework some dependencies towards HalRemoval (https://fedoraproject.org/wiki/Features/HalRemoval)
+
 * Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 2.29.3-1
 - Update to 2.29.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	1 Dec 2009 14:35:28 -0000	1.26
+++ sources	25 Dec 2009 10:52:06 -0000	1.27
@@ -1 +1 @@
-915c86c8a9ed933bb284f1fd180c2c21  hamster-applet-2.29.3.tar.bz2
+74833216d02b8b54d09bdafef8a5325d  hamster-applet-2.29.4.tar.bz2



From fschwarz at fedoraproject.org  Fri Dec 25 11:49:02 2009
From: fschwarz at fedoraproject.org (Felix Schwarz)
Date: Fri, 25 Dec 2009 11:49:02 +0000 (UTC)
Subject: rpms/trac/F-11 sources, 1.15, 1.16 trac.spec, 1.29, 1.30 .cvsignore, 
	1.15, 1.16
Message-ID: <20091225114902.4534611C00E6@cvs1.fedora.phx.redhat.com>

Author: fschwarz

Update of /cvs/pkgs/rpms/trac/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23635/F-11

Modified Files:
	sources trac.spec .cvsignore 
Log Message:
update to new upstream release trac 0.11.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	16 Jul 2009 22:54:49 -0000	1.15
+++ sources	25 Dec 2009 11:49:02 -0000	1.16
@@ -1 +1 @@
-a765087b22661cf4aa1520518cddecae  Trac-0.11.4.tar.gz
+f5a9542d81d3d50c3d9e46d8e2344f38  Trac-0.11.6.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac/F-11/trac.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- trac.spec	16 Jul 2009 22:54:49 -0000	1.29
+++ trac.spec	25 Dec 2009 11:49:02 -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:           trac
-Version:        0.11.4
+Version:        0.11.6
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_var}/www/cgi-bin/trac.fcgi
 
 %changelog
+* Fri Dec 25 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 0.11.6-1
+- New upstream release
+
 * Tue May 05 2009 Jesse Keating <jkeating at redhat.com> - 0.11.4-1
 - New upstream release to fix bugs and minor enhancements.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	16 Jul 2009 22:54:49 -0000	1.15
+++ .cvsignore	25 Dec 2009 11:49:02 -0000	1.16
@@ -1 +1 @@
-Trac-0.11.4.tar.gz
+Trac-0.11.6.tar.gz



From mschwendt at fedoraproject.org  Fri Dec 25 12:33:46 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 25 Dec 2009 12:33:46 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins-2.2-bluetooth.patch,
	1.1, 1.2 audacious-plugins.spec, 1.67, 1.68
Message-ID: <20091225123346.8C3B611C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28119

Modified Files:
	audacious-plugins-2.2-bluetooth.patch audacious-plugins.spec 
Log Message:
* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
- Let bluetooth plugin access "alsa-gapless" config values not "alsa"
  as it will be called in post-2.2.


audacious-plugins-2.2-bluetooth.patch:
 bluetooth.c |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

Index: audacious-plugins-2.2-bluetooth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins-2.2-bluetooth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.2-bluetooth.patch	19 Dec 2009 18:51:57 -0000	1.1
+++ audacious-plugins-2.2-bluetooth.patch	25 Dec 2009 12:33:45 -0000	1.2
@@ -62,7 +62,7 @@ diff -Nur audacious-plugins-2.2-orig/src
      /* switching back to default pcm device at cleanup */
      mcs_handle_t *cfgfile = aud_cfg_db_open();
 -    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "default");
-+    aud_cfg_db_set_string(cfgfile,"alsa","pcm", "default");
++    aud_cfg_db_set_string(cfgfile,"alsa-gapless","pcm", "default");
      aud_cfg_db_close(cfgfile);
 -
 +    }
@@ -76,7 +76,7 @@ diff -Nur audacious-plugins-2.2-orig/src
 +    pcmdev_modified = TRUE;
      mcs_handle_t *cfgfile = aud_cfg_db_open();
 -    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "audacious_bt");
-+    aud_cfg_db_set_string(cfgfile,"alsa","pcm", "audacious_bt");
++    aud_cfg_db_set_string(cfgfile,"alsa-gapless","pcm", "audacious_bt");
      aud_cfg_db_close(cfgfile);
  
      printf("play callback\n");


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- audacious-plugins.spec	19 Dec 2009 18:51:57 -0000	1.67
+++ audacious-plugins.spec	25 Dec 2009 12:33:45 -0000	1.68
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -257,6 +257,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
+- Let bluetooth plugin access "alsa-gapless" config values not "alsa"
+  as it will be called in post-2.2.
+
 * Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
 - Beat bluetooth plugin a bit.
 - Fix missing aud_cfg_db_close calls.



From mschwendt at fedoraproject.org  Fri Dec 25 12:34:29 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 25 Dec 2009 12:34:29 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.68,1.69
Message-ID: <20091225123429.8740E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28251

Modified Files:
	audacious-plugins.spec 
Log Message:
* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
- Let bluetooth plugin access "alsa-gapless" config values not "alsa"
  as it will be called in post-2.2.



Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- audacious-plugins.spec	25 Dec 2009 12:33:45 -0000	1.68
+++ audacious-plugins.spec	25 Dec 2009 12:34:29 -0000	1.69
@@ -29,7 +29,7 @@ Patch1: audacious-plugins-2.2-jack.patch
 Patch2: audacious-plugins-2.2-neon-request.patch
 # submitted upstream
 Patch3: audacious-plugins-2.2-cfg_db_close.patch
-#
+# submitted upstream
 Patch4: audacious-plugins-2.2-bluetooth.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}



From hadess at fedoraproject.org  Fri Dec 25 13:24:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 25 Dec 2009 13:24:59 +0000 (UTC)
Subject: File bluez-4.59.tar.gz uploaded to lookaside cache by hadess
Message-ID: <20091225132459.CE05E10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for bluez:

1c7cee215bc84656b1edee019cee78f5  bluez-4.59.tar.gz



From hadess at fedoraproject.org  Fri Dec 25 13:25:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 25 Dec 2009 13:25:18 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.52, 1.53 bluez.spec, 1.104,
	1.105 sources, 1.52, 1.53
Message-ID: <20091225132518.D95F511C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1184

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Fri Dec 25 2009 Bastien Nocera <bnocera at redhat.com> 4.59-1
- Update to 4.59



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	16 Nov 2009 09:56:37 -0000	1.52
+++ .cvsignore	25 Dec 2009 13:25:18 -0000	1.53
@@ -1 +1 @@
-bluez-4.58.tar.gz
+bluez-4.59.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- bluez.spec	16 Nov 2009 09:56:37 -0000	1.104
+++ bluez.spec	25 Dec 2009 13:25:18 -0000	1.105
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.58
+Version: 4.59
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -273,6 +273,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Fri Dec 25 2009 Bastien Nocera <bnocera at redhat.com> 4.59-1
+- Update to 4.59
+
 * Mon Nov 16 2009 Bastien Nocera <bnocera at redhat.com> 4.58-1
 - Update to 4.58
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	16 Nov 2009 09:56:37 -0000	1.52
+++ sources	25 Dec 2009 13:25:18 -0000	1.53
@@ -1 +1 @@
-858ce4c3d16b42542da9eb3f97c8ad23  bluez-4.58.tar.gz
+1c7cee215bc84656b1edee019cee78f5  bluez-4.59.tar.gz



From devrim at fedoraproject.org  Fri Dec 25 15:07:42 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 15:07:42 +0000 (UTC)
Subject: File pgpool-II-2.3.1.tar.gz uploaded to lookaside cache by devrim
Message-ID: <20091225150742.1617E10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for postgresql-pgpool-II:

032fc94eaa71ed99276234b7a110cdf5  pgpool-II-2.3.1.tar.gz



From pkgdb at fedoraproject.org  Fri Dec 25 15:13:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:13:48 +0000
Subject: [pkgdb] bam ownership updated
Message-ID: <20091225151347.B4CB710F8CE@bastion.fedoraproject.org>

Package bam in Fedora 12 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bam



From pkgdb at fedoraproject.org  Fri Dec 25 15:13:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:13:51 +0000
Subject: [pkgdb] bam ownership updated
Message-ID: <20091225151349.B478210F8CD@bastion.fedoraproject.org>

Package bam in Fedora 11 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bam



From pkgdb at fedoraproject.org  Fri Dec 25 15:13:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:13:49 +0000
Subject: [pkgdb] bam ownership updated
Message-ID: <20091225151351.18B7B10F8CE@bastion.fedoraproject.org>

Package bam in Fedora EPEL 5 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bam



From pkgdb at fedoraproject.org  Fri Dec 25 15:13:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:13:55 +0000
Subject: [pkgdb] bam ownership updated
Message-ID: <20091225151354.9126610F8CD@bastion.fedoraproject.org>

Package bam in Fedora 10 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bam



From pkgdb at fedoraproject.org  Fri Dec 25 15:13:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:13:56 +0000
Subject: [pkgdb] bam ownership updated
Message-ID: <20091225151355.D3F2910F8DA@bastion.fedoraproject.org>

Package bam in Fedora devel is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bam



From pkgdb at fedoraproject.org  Fri Dec 25 15:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:14:10 +0000
Subject: [pkgdb] bam ownership updated
Message-ID: <20091225151356.0760510F8DC@bastion.fedoraproject.org>

Package bam in Fedora 9 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bam



From pkgdb at fedoraproject.org  Fri Dec 25 15:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:14:32 +0000
Subject: [pkgdb] teeworlds ownership updated
Message-ID: <20091225151431.8531610F8CD@bastion.fedoraproject.org>

Package teeworlds in Fedora 9 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:14:33 +0000
Subject: [pkgdb] teeworlds ownership updated
Message-ID: <20091225151432.8D46B10F8D0@bastion.fedoraproject.org>

Package teeworlds in Fedora 10 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:14:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:14:47 +0000
Subject: [pkgdb] teeworlds ownership updated
Message-ID: <20091225151433.6FA0A10F8D0@bastion.fedoraproject.org>

Package teeworlds in Fedora devel is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:14:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:14:35 +0000
Subject: [pkgdb] teeworlds ownership updated
Message-ID: <20091225151433.C729410F8DA@bastion.fedoraproject.org>

Package teeworlds in Fedora 11 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:14:33 +0000
Subject: [pkgdb] teeworlds ownership updated
Message-ID: <20091225151434.EF7C710F7EA@bastion.fedoraproject.org>

Package teeworlds in Fedora 12 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:26:39 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchbugzilla
Message-ID: <20091225152639.364CD10F8CD@bastion.fedoraproject.org>

linuxdonald has given up the watchbugzilla acl on teeworlds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:26:39 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested approveacls
Message-ID: <20091225152641.9601D10F8CE@bastion.fedoraproject.org>

linuxdonald has requested the approveacls acl on teeworlds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:26:56 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchcommits
Message-ID: <20091225152642.02CA810F7EA@bastion.fedoraproject.org>

linuxdonald has given up the watchcommits acl on teeworlds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:26:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:26:45 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested commit
Message-ID: <20091225152644.9B5A510F8CD@bastion.fedoraproject.org>

linuxdonald has requested the commit acl on teeworlds (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:26:55 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchbugzilla
Message-ID: <20091225152654.09A5A10F8CD@bastion.fedoraproject.org>

linuxdonald has given up the watchbugzilla acl on teeworlds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:26:55 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchcommits
Message-ID: <20091225152654.84A8F10F8DB@bastion.fedoraproject.org>

linuxdonald has given up the watchcommits acl on teeworlds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:26:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:26:54 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested commit
Message-ID: <20091225152656.0E95310F8CD@bastion.fedoraproject.org>

linuxdonald has requested the commit acl on teeworlds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:26:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:26:58 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested approveacls
Message-ID: <20091225152658.50B6710F8CE@bastion.fedoraproject.org>

linuxdonald has requested the approveacls acl on teeworlds (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:04 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchbugzilla
Message-ID: <20091225152702.9872C10F8CD@bastion.fedoraproject.org>

linuxdonald has given up the watchbugzilla acl on teeworlds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:21 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchcommits
Message-ID: <20091225152707.3BE0510F7EA@bastion.fedoraproject.org>

linuxdonald has given up the watchcommits acl on teeworlds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:25 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested commit
Message-ID: <20091225152711.192F110F7EA@bastion.fedoraproject.org>

linuxdonald has requested the commit acl on teeworlds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:12 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested approveacls
Message-ID: <20091225152711.E9ABB10F8DA@bastion.fedoraproject.org>

linuxdonald has requested the approveacls acl on teeworlds (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:17 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchbugzilla
Message-ID: <20091225152717.055AA10F8CD@bastion.fedoraproject.org>

linuxdonald has given up the watchbugzilla acl on teeworlds (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:19 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchcommits
Message-ID: <20091225152718.7710F10F8CE@bastion.fedoraproject.org>

linuxdonald has given up the watchcommits acl on teeworlds (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:20 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested commit
Message-ID: <20091225152720.16BC610F8CD@bastion.fedoraproject.org>

linuxdonald has requested the commit acl on teeworlds (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:38 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested approveacls
Message-ID: <20091225152724.8087A10F7EA@bastion.fedoraproject.org>

linuxdonald has requested the approveacls acl on teeworlds (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:33 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchbugzilla
Message-ID: <20091225152732.C292710F8DA@bastion.fedoraproject.org>

linuxdonald has given up the watchbugzilla acl on teeworlds (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:34 +0000
Subject: [pkgdb] teeworlds: linuxdonald has given up watchcommits
Message-ID: <20091225152733.CD83B10F8CE@bastion.fedoraproject.org>

linuxdonald has given up the watchcommits acl on teeworlds (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:34 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested approveacls
Message-ID: <20091225152736.2DB0510F8CD@bastion.fedoraproject.org>

linuxdonald has requested the approveacls acl on teeworlds (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Fri Dec 25 15:27:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 25 Dec 2009 15:27:52 +0000
Subject: [pkgdb] teeworlds: linuxdonald has requested commit
Message-ID: <20091225152738.C1ECD10F7EA@bastion.fedoraproject.org>

linuxdonald has requested the commit acl on teeworlds (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From petersen at fedoraproject.org  Fri Dec 25 15:37:50 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 15:37:50 +0000 (UTC)
Subject: rpms/ghc-rpm-macros/F-12 ghc-rpm-macros.ghc, 1.5,
	1.6 ghc-rpm-macros.spec, 1.7, 1.8
Message-ID: <20091225153750.221E211C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-rpm-macros/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11370

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
- backport new macros from rawhide:
  - add ghc_requires, ghc_doc_requires, ghc_prof_requires
  - allow ghc_version_override to override ghc_version (for ghc)




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-12/ghc-rpm-macros.ghc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ghc-rpm-macros.ghc	8 Dec 2009 00:49:48 -0000	1.5
+++ ghc-rpm-macros.ghc	25 Dec 2009 15:37:49 -0000	1.6
@@ -11,7 +11,7 @@ make -f cabal-rpm.mk %{_smp_mflags} \
 %cabal_install %cabal copy --destdir=${RPM_BUILD_ROOT} -v
 
 %ghcdocdir %{_docdir}/ghc/libraries/%{?pkg_name}%{!?pkg_name:%{name}}
-%ghcpkgdir %{_libdir}/ghc-%(ghc --numeric-version)/%{?pkg_name}%{!?pkg_name:%name}-%{version}
+%ghcpkgdir %{_libdir}/ghc-%{ghc_version}/%{?pkg_name}%{!?pkg_name:%name}-%{version}
 
 %ghc_gen_filelists() \
 rm -f %1-devel.files %1-prof.files %1-doc.files \
@@ -35,6 +35,20 @@ echo '%{ghcdocdir}' >> %1-doc.files \
 
 %ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
-%ghc_version %(ghc --numeric-version)
+%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
 
 %ghc_pkg_ver() %(ghc-pkg list --global --simple-output %1|sed -e "s/.*%1-//")
+
+%ghc_requires Requires:       ghc = %{ghc_version}\
+Requires(post): ghc = %{ghc_version}\
+Requires(preun): ghc = %{ghc_version}\
+%if %{with shared}\
+Requires:       ghc-%{?pkg_name}%{!?pkg_name:%name} = %{version}-%{release}\
+%endif
+
+%ghc_doc_requires Requires:       ghc-doc = %{ghc_version}\
+Requires(post): ghc-doc = %{ghc_version}\
+Requires(postun): ghc-doc = %{ghc_version}
+
+%ghc_prof_requires Requires:       ghc-prof = %{ghc_version}\
+Requires:       ghc-%{?pkg_name}%{!?pkg_name:%name}-devel = %{version}-%{release}


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-rpm-macros/F-12/ghc-rpm-macros.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ghc-rpm-macros.spec	8 Dec 2009 00:49:48 -0000	1.7
+++ ghc-rpm-macros.spec	25 Dec 2009 15:37:49 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.2.5
+Version:	0.2.6
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Jens Petersen <petersen at redhat.com> - 0.2.6-1
+- backport:
+  - add ghc_requires, ghc_doc_requires, ghc_prof_requires
+  - allow ghc_version_override to override ghc_version (for ghc)
+
 * Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.5-1
 - make ghc_pkg_ver only return pkg version
 



From petersen at fedoraproject.org  Fri Dec 25 15:39:20 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 15:39:20 +0000 (UTC)
Subject: rpms/ghc-zlib/devel ghc-zlib.spec,1.17,1.18
Message-ID: <20091225153920.E5C3911C02C8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14670

Modified Files:
	ghc-zlib.spec 
Log Message:
- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0:
- use common_summary and common_description
- reenable debuginfo for stripping
- use ghc_requires, ghc_doc_requires, and ghc_prof_requires




Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/ghc-zlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ghc-zlib.spec	22 Dec 2009 09:12:01 -0000	1.17
+++ ghc-zlib.spec	25 Dec 2009 15:39:20 -0000	1.18
@@ -1,17 +1,28 @@
 %global pkg_name zlib
 
+%global common_summary Haskell compression and decompression library
+
+%global common_description This package provides a pure Haskell interface for compressing and\
+decompressing streams of data represented as lazy ByteStrings. It uses\
+the zlib C library so it has high performance. It supports the "zlib",\
+"gzip" and "raw" compression formats.\
+\
+It provides a convenient high level API suitable for most tasks.  For\
+the few cases where more control is needed, it provides access to the\
+full zlib feature set.
+
 %bcond_without doc
 %bcond_without prof
 %bcond_without shared
 
-# ghc does not emit debug information
-%global debug_package %{nil}
+# stripping produces smaller .so
+#%%global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        0.5.0.0
-Release:        11%{?dist}
-Summary:        Haskell compression and decompression library binding
+Release:        12%{?dist}
+Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
@@ -19,7 +30,7 @@ URL:            http://hackage.haskell.o
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
+BuildRequires:  ghc, ghc-rpm-macros >= 0.4.0
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -29,54 +40,47 @@ BuildRequires:  ghc-prof
 BuildRequires:  zlib-devel
 
 %description
-This package provides a pure Haskell interface for compressing and
-decompressing streams of data represented as lazy ByteStrings. It uses
-the zlib C library so it has high performance. It supports the "zlib",
-"gzip" and "raw" compression formats.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
+%endif
 
-It provides a convenient high level API suitable for most tasks.  For
-the few cases where more control is needed, it provides access to the
-full zlib feature set.
 
 %package devel
-Summary:        Haskell %{pkg_name} library development files
+Summary:        %{common_summary} development files
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(postun): ghc = %{ghc_version}
-%if %{with shared}
-Requires:       %{name} = %{version}-%{release}
-%endif
+%{?ghc_requires}
 Requires:       zlib-devel
 
 %description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the development files.
 
 
 %if %{with doc}
 %package doc
-Summary:        Documentation for %{name}
+Summary:        Documentation for %{common_summary}
 Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
+%{?ghc_doc_requires}
 
 %description doc
-This package contains development documentation files for the %{name} library.
+%{common_description}
+
+This package contains development documentation files.
 %endif
 
 
 %if %{with prof}
 %package prof
-Summary:        Profiling libraries for %{name}
+Summary:        Profiling libraries for %{common_summary}
 Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
+%{?ghc_prof_requires}
 
 %description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the profiling library.
 %endif
 
 
@@ -152,6 +156,12 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Jens Petersen <petersen at redhat.com> - 0.5.0.0-12
+- update to cabal2spec-0.20 and ghc-rpm-macros-0.4.0:
+- use common_summary and common_description
+- reenable debuginfo for stripping
+- use ghc_requires, ghc_doc_requires, and ghc_prof_requires
+
 * Tue Dec 22 2009 Jens Petersen <petersen at redhat.com>
 - fix base Group and devel Summary
 - only include docdir in devel if not shared build



From mtasaka at fedoraproject.org  Fri Dec 25 15:39:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 25 Dec 2009 15:39:56 +0000 (UTC)
Subject: File jd-2.5.5-rc091225.tgz uploaded to lookaside cache by mtasaka
Message-ID: <20091225153956.79EB510F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for jd:

bd8cea2f0e8c5957a8615e567ca1bb4c  jd-2.5.5-rc091225.tgz



From mtasaka at fedoraproject.org  Fri Dec 25 15:41:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 25 Dec 2009 15:41:28 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.418, 1.419 jd.spec, 1.481, 1.482 sources, 
	1.419, 1.420
Message-ID: <20091225154128.2672711C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15222/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
- 2.5.5 rc 091225



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- .cvsignore	20 Dec 2009 14:47:06 -0000	1.418
+++ .cvsignore	25 Dec 2009 15:41:27 -0000	1.419
@@ -1 +1 @@
-jd-2.5.5-beta091220.tgz
+jd-2.5.5-rc091225.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -p -r1.481 -r1.482
--- jd.spec	20 Dec 2009 14:47:07 -0000	1.481
+++ jd.spec	25 Dec 2009 15:41:27 -0000	1.482
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        beta091220
-%define         repoid        44986
+%define         strtag        rc091225
+%define         repoid        45087
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
+- 2.5.5 rc 091225
+
 * Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
 - 2.5.5 beta 091220
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -p -r1.419 -r1.420
--- sources	20 Dec 2009 14:47:07 -0000	1.419
+++ sources	25 Dec 2009 15:41:27 -0000	1.420
@@ -1 +1 @@
-3f2c9e853bfde93d963a1d3ca54cb945  jd-2.5.5-beta091220.tgz
+bd8cea2f0e8c5957a8615e567ca1bb4c  jd-2.5.5-rc091225.tgz



From mtasaka at fedoraproject.org  Fri Dec 25 15:41:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 25 Dec 2009 15:41:28 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.419, 1.420 jd.spec, 1.483, 1.484 sources, 
	1.420, 1.421
Message-ID: <20091225154128.5C57F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15222/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
- 2.5.5 rc 091225



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -p -r1.419 -r1.420
--- .cvsignore	24 Dec 2009 13:07:36 -0000	1.419
+++ .cvsignore	25 Dec 2009 15:41:28 -0000	1.420
@@ -1 +1 @@
-jd-2.5.5-svn3257_trunk.tgz
+jd-2.5.5-rc091225.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -p -r1.483 -r1.484
--- jd.spec	24 Dec 2009 13:07:36 -0000	1.483
+++ jd.spec	25 Dec 2009 15:41:28 -0000	1.484
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3257_trunk
-%define         repoid        44986
+%define         strtag        rc091225
+%define         repoid        45087
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Dec 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3257
+* Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
+- 2.5.5 rc 091225
 
 * Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
 - 2.5.5 beta 091220


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- sources	24 Dec 2009 13:07:36 -0000	1.420
+++ sources	25 Dec 2009 15:41:28 -0000	1.421
@@ -1 +1 @@
-7a9fe5c0fb630d7b9777ad5d5d7fcb7e  jd-2.5.5-svn3257_trunk.tgz
+bd8cea2f0e8c5957a8615e567ca1bb4c  jd-2.5.5-rc091225.tgz



From mtasaka at fedoraproject.org  Fri Dec 25 15:41:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 25 Dec 2009 15:41:28 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.409, 1.410 jd.spec, 1.471, 1.472 sources, 
	1.410, 1.411
Message-ID: <20091225154128.A578B11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15222/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
- 2.5.5 rc 091225



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- .cvsignore	24 Dec 2009 06:38:44 -0000	1.409
+++ .cvsignore	25 Dec 2009 15:41:28 -0000	1.410
@@ -1 +1 @@
-jd-2.5.5-svn3257_trunk.tgz
+jd-2.5.5-rc091225.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -p -r1.471 -r1.472
--- jd.spec	24 Dec 2009 06:38:44 -0000	1.471
+++ jd.spec	25 Dec 2009 15:41:28 -0000	1.472
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        svn3257_trunk
-%define         repoid        44986
+%define         strtag        rc091225
+%define         repoid        45087
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Dec 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3257
+* Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
+- 2.5.5 rc 091225
 
 * Sun Dec 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.3.beta091220
 - 2.5.5 beta 091220


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- sources	24 Dec 2009 06:38:44 -0000	1.410
+++ sources	25 Dec 2009 15:41:28 -0000	1.411
@@ -1 +1 @@
-7a9fe5c0fb630d7b9777ad5d5d7fcb7e  jd-2.5.5-svn3257_trunk.tgz
+bd8cea2f0e8c5957a8615e567ca1bb4c  jd-2.5.5-rc091225.tgz



From petersen at fedoraproject.org  Fri Dec 25 15:56:06 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 15:56:06 +0000 (UTC)
Subject: rpms/ghc-fgl/devel ghc-fgl.spec,1.2,1.3
Message-ID: <20091225155606.E27F411C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-fgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16974

Modified Files:
	ghc-fgl.spec 
Log Message:
- update for ghc-6.12.1: add shared library support
- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
- add common_summary and common_description




Index: ghc-fgl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-fgl/devel/ghc-fgl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-fgl.spec	24 Sep 2009 04:10:51 -0000	1.2
+++ ghc-fgl.spec	25 Dec 2009 15:56:06 -0000	1.3
@@ -1,26 +1,29 @@
 %global pkg_name fgl
 
+%global common_summary Haskell Functional Graph Library
+
+%global common_description Martin Erwig's Functional Graph Library.
+
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
-%global debug_package %{nil}
+#%%global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        5.4.2.2
-Release:        1%{?dist}
-Summary:        Haskell %{pkg_name} library
+Release:        2%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://web.engr.oregonstate.edu/~erwig/fgl/haskell/
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.4.0
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -29,45 +32,46 @@ BuildRequires:  ghc-prof
 %endif
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.  This
-is a library of types and functions for addressing graph problems.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
+%endif
 
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        %{common_summary} development files
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+%{?ghc_requires}
 
 %description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the development files.
 
 
 %if %{with doc}
 %package doc
-Summary:        Documentation for %{name}
+Summary:        Documentation for %{common_summary}
 Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
+%{?ghc_doc_requires}
 
 %description doc
-This package contains development documentation files for the %{name} library.
+%{common_description}
+
+This package contains development documentation files.
 %endif
 
 
 %if %{with prof}
 %package prof
-Summary:        Profiling libraries for %{name}
+Summary:        Profiling libraries for %{common_summary}
 Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
+%{?ghc_prof_requires}
 
 %description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the profiling library.
 %endif
 
 
@@ -81,13 +85,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -96,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -105,10 +108,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -119,9 +120,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -137,5 +147,10 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Jens Petersen <petersen at redhat.com> - 5.4.2.2-2
+- update for ghc-6.12.1: add shared library support
+- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
+- add common_summary and common_description
+
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 5.4.2.2-1
 - initial packaging for Fedora created by cabal2spec



From devrim at fedoraproject.org  Fri Dec 25 16:06:22 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 16:06:22 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-5 .cvsignore, 1.11,
	1.12 postgresql-pgpool-II.spec, 1.18, 1.19 sources, 1.12, 1.13
Message-ID: <20091225160622.5F63F11C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18641/EL-5

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.3.1
- Adjust order of startup and kill, per RH bugzilla #545739.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Dec 2009 21:46:22 -0000	1.11
+++ .cvsignore	25 Dec 2009 16:06:21 -0000	1.12
@@ -1 +1 @@
-pgpool-II-2.2.6.tar.gz
+pgpool-II-2.3.1.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/postgresql-pgpool-II.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- postgresql-pgpool-II.spec	1 Dec 2009 21:46:22 -0000	1.18
+++ postgresql-pgpool-II.spec	25 Dec 2009 16:06:22 -0000	1.19
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.6
+Version:	2.3.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2506/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -59,6 +59,9 @@ install -d %{buildroot}%{_sysconfdir}/%{
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pool_hba.conf
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-master-slave %{buildroot}%{_datadir}/%{short_name}/
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/
+
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -99,6 +102,8 @@ fi
 %{_mandir}/man8/pgpool*
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/system_db.sql
+%{_datadir}/%{short_name}/pgpool.conf.sample-master-slave  
+%{_datadir}/%{short_name}/pgpool.conf.sample-replication
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
@@ -112,6 +117,10 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Fri Dec 25 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.3.1-1
+- Update to 2.3.1
+- Adjust order of startup and kill, per RH bugzilla #545739.
+
 * Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
 - Update to 2.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Dec 2009 21:46:22 -0000	1.12
+++ sources	25 Dec 2009 16:06:22 -0000	1.13
@@ -1 +1 @@
-711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz
+032fc94eaa71ed99276234b7a110cdf5  pgpool-II-2.3.1.tar.gz



From devrim at fedoraproject.org  Fri Dec 25 16:06:22 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 16:06:22 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-11 .cvsignore, 1.14,
	1.15 postgresql-pgpool-II.spec, 1.37, 1.38 sources, 1.14, 1.15
Message-ID: <20091225160622.AE63F11C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18641/F-11

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.3.1
- Adjust order of startup and kill, per RH bugzilla #545739.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	1 Dec 2009 21:46:23 -0000	1.14
+++ .cvsignore	25 Dec 2009 16:06:22 -0000	1.15
@@ -1 +1 @@
-pgpool-II-2.2.6.tar.gz
+pgpool-II-2.3.1.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/postgresql-pgpool-II.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- postgresql-pgpool-II.spec	1 Dec 2009 21:46:23 -0000	1.37
+++ postgresql-pgpool-II.spec	25 Dec 2009 16:06:22 -0000	1.38
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.6
+Version:	2.3.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2506/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -59,6 +59,9 @@ install -d %{buildroot}%{_sysconfdir}/%{
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pool_hba.conf
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-master-slave %{buildroot}%{_datadir}/%{short_name}/
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/
+
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -99,6 +102,8 @@ fi
 %{_mandir}/man8/pgpool*
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/system_db.sql
+%{_datadir}/%{short_name}/pgpool.conf.sample-master-slave  
+%{_datadir}/%{short_name}/pgpool.conf.sample-replication
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
@@ -112,6 +117,10 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Fri Dec 25 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.3.1-1
+- Update to 2.3.1
+- Adjust order of startup and kill, per RH bugzilla #545739.
+
 * Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
 - Update to 2.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	1 Dec 2009 21:46:23 -0000	1.14
+++ sources	25 Dec 2009 16:06:22 -0000	1.15
@@ -1 +1 @@
-711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz
+032fc94eaa71ed99276234b7a110cdf5  pgpool-II-2.3.1.tar.gz



From devrim at fedoraproject.org  Fri Dec 25 16:06:22 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 16:06:22 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-12 .cvsignore, 1.14,
	1.15 postgresql-pgpool-II.spec, 1.38, 1.39 sources, 1.14, 1.15
Message-ID: <20091225160622.EC8C411C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18641/F-12

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.3.1
- Adjust order of startup and kill, per RH bugzilla #545739.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	1 Dec 2009 21:46:23 -0000	1.14
+++ .cvsignore	25 Dec 2009 16:06:22 -0000	1.15
@@ -1 +1 @@
-pgpool-II-2.2.6.tar.gz
+pgpool-II-2.3.1.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/postgresql-pgpool-II.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- postgresql-pgpool-II.spec	1 Dec 2009 21:46:24 -0000	1.38
+++ postgresql-pgpool-II.spec	25 Dec 2009 16:06:22 -0000	1.39
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.6
+Version:	2.3.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2506/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -59,6 +59,9 @@ install -d %{buildroot}%{_sysconfdir}/%{
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pool_hba.conf
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-master-slave %{buildroot}%{_datadir}/%{short_name}/
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/
+
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -99,6 +102,8 @@ fi
 %{_mandir}/man8/pgpool*
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/system_db.sql
+%{_datadir}/%{short_name}/pgpool.conf.sample-master-slave  
+%{_datadir}/%{short_name}/pgpool.conf.sample-replication
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
@@ -112,6 +117,10 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Fri Dec 25 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.3.1-1
+- Update to 2.3.1
+- Adjust order of startup and kill, per RH bugzilla #545739.
+
 * Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
 - Update to 2.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	1 Dec 2009 21:46:24 -0000	1.14
+++ sources	25 Dec 2009 16:06:22 -0000	1.15
@@ -1 +1 @@
-711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz
+032fc94eaa71ed99276234b7a110cdf5  pgpool-II-2.3.1.tar.gz



From devrim at fedoraproject.org  Fri Dec 25 16:06:23 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 16:06:23 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/devel .cvsignore, 1.14,
	1.15 postgresql-pgpool-II.spec, 1.38, 1.39 sources, 1.14, 1.15
Message-ID: <20091225160623.4344011C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18641/devel

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.3.1
- Adjust order of startup and kill, per RH bugzilla #545739.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	1 Dec 2009 21:46:24 -0000	1.14
+++ .cvsignore	25 Dec 2009 16:06:22 -0000	1.15
@@ -1 +1 @@
-pgpool-II-2.2.6.tar.gz
+pgpool-II-2.3.1.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/postgresql-pgpool-II.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- postgresql-pgpool-II.spec	1 Dec 2009 21:46:24 -0000	1.38
+++ postgresql-pgpool-II.spec	25 Dec 2009 16:06:23 -0000	1.39
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.6
+Version:	2.3.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2506/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -59,6 +59,9 @@ install -d %{buildroot}%{_sysconfdir}/%{
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pool_hba.conf
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-master-slave %{buildroot}%{_datadir}/%{short_name}/
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/
+
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -99,6 +102,8 @@ fi
 %{_mandir}/man8/pgpool*
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/system_db.sql
+%{_datadir}/%{short_name}/pgpool.conf.sample-master-slave  
+%{_datadir}/%{short_name}/pgpool.conf.sample-replication
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
@@ -112,6 +117,10 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Fri Dec 25 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.3.1-1
+- Update to 2.3.1
+- Adjust order of startup and kill, per RH bugzilla #545739.
+
 * Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
 - Update to 2.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	1 Dec 2009 21:46:24 -0000	1.14
+++ sources	25 Dec 2009 16:06:23 -0000	1.15
@@ -1 +1 @@
-711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz
+032fc94eaa71ed99276234b7a110cdf5  pgpool-II-2.3.1.tar.gz



From devrim at fedoraproject.org  Fri Dec 25 16:09:54 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 16:09:54 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-4 .cvsignore, 1.11,
	1.12 postgresql-pgpool-II.spec, 1.17, 1.18 sources, 1.12, 1.13
Message-ID: <20091225160954.6FA8411C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19465

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.3.1
- Adjust order of startup and kill, per RH bugzilla #545739.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Dec 2009 21:46:22 -0000	1.11
+++ .cvsignore	25 Dec 2009 16:09:53 -0000	1.12
@@ -1 +1 @@
-pgpool-II-2.2.6.tar.gz
+pgpool-II-2.3.1.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/postgresql-pgpool-II.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- postgresql-pgpool-II.spec	1 Dec 2009 21:46:22 -0000	1.17
+++ postgresql-pgpool-II.spec	25 Dec 2009 16:09:54 -0000	1.18
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.6
+Version:	2.3.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2506/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -59,6 +59,9 @@ install -d %{buildroot}%{_sysconfdir}/%{
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pool_hba.conf
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-master-slave %{buildroot}%{_datadir}/%{short_name}/
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/
+
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -99,6 +102,8 @@ fi
 %{_mandir}/man8/pgpool*
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/system_db.sql
+%{_datadir}/%{short_name}/pgpool.conf.sample-master-slave  
+%{_datadir}/%{short_name}/pgpool.conf.sample-replication1;5D
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
@@ -112,6 +117,10 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Fri Dec 25 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.3.1-1
+- Update to 2.3.1
+- Adjust order of startup and kill, per RH bugzilla #545739.
+
 * Tue Dec 1 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.2.6-1
 - Update to 2.2.6
 - Remove init script from all runlevels before uninstall. Per RH Bugzilla


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Dec 2009 21:46:22 -0000	1.12
+++ sources	25 Dec 2009 16:09:54 -0000	1.13
@@ -1 +1 @@
-711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz
+032fc94eaa71ed99276234b7a110cdf5  pgpool-II-2.3.1.tar.gz



From devrim at fedoraproject.org  Fri Dec 25 16:19:08 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 16:19:08 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-4 postgresql-pgpool-II.spec,1.18,1.19
Message-ID: <20091225161909.1732711C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20606

Modified Files:
	postgresql-pgpool-II.spec 
Log Message:
Fix fat-finger typo.



Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/postgresql-pgpool-II.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- postgresql-pgpool-II.spec	25 Dec 2009 16:09:54 -0000	1.18
+++ postgresql-pgpool-II.spec	25 Dec 2009 16:19:08 -0000	1.19
@@ -103,7 +103,7 @@ fi
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/system_db.sql
 %{_datadir}/%{short_name}/pgpool.conf.sample-master-slave  
-%{_datadir}/%{short_name}/pgpool.conf.sample-replication1;5D
+%{_datadir}/%{short_name}/pgpool.conf.sample-replication
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool



From roma at fedoraproject.org  Fri Dec 25 16:21:11 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Fri, 25 Dec 2009 16:21:11 +0000 (UTC)
Subject: rpms/fmtools/F-12 fmtools-videodev2.patch, NONE, 1.1 fmtools.spec, 1.8,
	1.9 import.log, 1.3, 1.4
Message-ID: <20091225162111.910C511C00E6@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/fmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20970/F-12

Modified Files:
	fmtools.spec import.log 
Added Files:
	fmtools-videodev2.patch 
Log Message:
patched for rhel5

fmtools-videodev2.patch:
 fmlib.h     |    4 
 videodev2.h | 1563 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1567 insertions(+)

--- NEW FILE fmtools-videodev2.patch ---
diff -Naur fmtools-2.0/fmlib.h fmtools-2.0-new/fmlib.h
--- fmtools-2.0/fmlib.h	2009-12-13 19:23:16.000000000 -0200
+++ fmtools-2.0-new/fmlib.h	2009-12-24 14:37:58.000000000 -0200
@@ -19,7 +19,11 @@
 #ifndef FMLIB_H
 #define FMLIB_H 1
 
+#ifdef __RHEL5_VIDEODEV2__
+#include <videodev2.h>
+#else
 #include <linux/videodev2.h>
+#endif
 #include <stdint.h>
 #include <stdbool.h>
 
diff -Naur fmtools-2.0/videodev2.h fmtools-2.0-new/videodev2.h
--- fmtools-2.0/videodev2.h	1969-12-31 21:00:00.000000000 -0300
+++ fmtools-2.0-new/videodev2.h	2009-12-24 14:38:32.000000000 -0200
@@ -0,0 +1,1563 @@
+/*
+ *  Video for Linux Two header file
+ *
+ *  Copyright (C) 1999-2007 the 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.
+ *
+ *  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.
+ *
+ *  Alternatively you can redistribute this file under the terms of the
+ *  BSD license as stated below:
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *  3. The names of its contributors may not be used to endorse or promote
+ *     products derived from this software without specific prior written
+ *     permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	Header file for v4l or V4L2 drivers and applications
+ * with public API.
+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
+ * no #if __KERNEL tests are allowed here
+ *
+ *	See http://linuxtv.org for more info
+ *
+ *	Author: Bill Dirks <bill at thedirks.org>
+ *		Justin Schoeman
+ *              Hans Verkuil <hverkuil at xs4all.nl>
+ *		et al.
+ */
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
+
+#ifdef __KERNEL__
+#include <linux/time.h>     /* need struct timeval */
+#else
+#include <sys/time.h>
+#endif
+/* #include <linux/compiler.h> */
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/*
+ * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
+ */
+#define VIDEO_MAX_FRAME               32
+
+#ifndef __KERNEL__
+
+/* These defines are V4L1 specific and should not be used with the V4L2 API!
+   They will be removed from this header in the future. */
+
+#define VID_TYPE_CAPTURE	1	/* Can capture */
+#define VID_TYPE_TUNER		2	/* Can tune */
+#define VID_TYPE_TELETEXT	4	/* Does teletext */
+#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
+#define VID_TYPE_CLIPPING	32	/* Can clip */
+#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
+#define VID_TYPE_SCALES		128	/* Scalable */
+#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
+#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
+#endif
+
+/*
+ *	M I S C E L L A N E O U S
+ */
+
+/*  Four-character-code (FOURCC) */
+#define v4l2_fourcc(a, b, c, d)\
+	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
+
+/*
+ *	E N U M S
+ */
+enum v4l2_field {
+	V4L2_FIELD_ANY           = 0, /* driver can choose from none,
+					 top, bottom, interlaced
+					 depending on whatever it thinks
+					 is approximate ... */
+	V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
+	V4L2_FIELD_TOP           = 2, /* top field only */
+	V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
+	V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
+	V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
+					 buffer, top-bottom order */
+	V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
+	V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
+					 separate buffers */
+	V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
+					 first and the top field is
+					 transmitted first */
+	V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
+					 first and the bottom field is
+					 transmitted first */
+};
+#define V4L2_FIELD_HAS_TOP(field)	\
+	((field) == V4L2_FIELD_TOP 	||\
+	 (field) == V4L2_FIELD_INTERLACED ||\
+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
+	 (field) == V4L2_FIELD_SEQ_TB	||\
+	 (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_BOTTOM(field)	\
+	((field) == V4L2_FIELD_BOTTOM 	||\
+	 (field) == V4L2_FIELD_INTERLACED ||\
+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
+	 (field) == V4L2_FIELD_SEQ_TB	||\
+	 (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_BOTH(field)	\
+	((field) == V4L2_FIELD_INTERLACED ||\
+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
+	 (field) == V4L2_FIELD_SEQ_TB ||\
+	 (field) == V4L2_FIELD_SEQ_BT)
+
+enum v4l2_buf_type {
+	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
+	V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
+	V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
+	V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
+	V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
+	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
+	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
+#if 1 /*KEEP*/
+	/* Experimental */
+	V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
+#endif
+	V4L2_BUF_TYPE_PRIVATE              = 0x80,
+};
+
+enum v4l2_ctrl_type {
+	V4L2_CTRL_TYPE_INTEGER	     = 1,
+	V4L2_CTRL_TYPE_BOOLEAN	     = 2,
+	V4L2_CTRL_TYPE_MENU	     = 3,
+	V4L2_CTRL_TYPE_BUTTON	     = 4,
+	V4L2_CTRL_TYPE_INTEGER64     = 5,
+	V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
+};
+
+enum v4l2_tuner_type {
+	V4L2_TUNER_RADIO	     = 1,
+	V4L2_TUNER_ANALOG_TV	     = 2,
+	V4L2_TUNER_DIGITAL_TV	     = 3,
+};
+
+enum v4l2_memory {
+	V4L2_MEMORY_MMAP             = 1,
+	V4L2_MEMORY_USERPTR          = 2,
+	V4L2_MEMORY_OVERLAY          = 3,
+};
+
+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
+enum v4l2_colorspace {
+	/* ITU-R 601 -- broadcast NTSC/PAL */
+	V4L2_COLORSPACE_SMPTE170M     = 1,
+
+	/* 1125-Line (US) HDTV */
+	V4L2_COLORSPACE_SMPTE240M     = 2,
+
+	/* HD and modern captures. */
+	V4L2_COLORSPACE_REC709        = 3,
+
+	/* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
+	V4L2_COLORSPACE_BT878         = 4,
+
+	/* These should be useful.  Assume 601 extents. */
+	V4L2_COLORSPACE_470_SYSTEM_M  = 5,
+	V4L2_COLORSPACE_470_SYSTEM_BG = 6,
+
+	/* I know there will be cameras that send this.  So, this is
+	 * unspecified chromaticities and full 0-255 on each of the
+	 * Y'CbCr components
+	 */
+	V4L2_COLORSPACE_JPEG          = 7,
+
+	/* For RGB colourspaces, this is probably a good start. */
+	V4L2_COLORSPACE_SRGB          = 8,
+};
+
+enum v4l2_priority {
+	V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
+	V4L2_PRIORITY_BACKGROUND  = 1,
+	V4L2_PRIORITY_INTERACTIVE = 2,
+	V4L2_PRIORITY_RECORD      = 3,
+	V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
+};
+
+struct v4l2_rect {
+	__s32   left;
+	__s32   top;
+	__s32   width;
+	__s32   height;
+};
+
+struct v4l2_fract {
+	__u32   numerator;
+	__u32   denominator;
+};
+
+/*
+ *	D R I V E R   C A P A B I L I T I E S
+ */
+struct v4l2_capability {
+	__u8	driver[16];	/* i.e. "bttv" */
+	__u8	card[32];	/* i.e. "Hauppauge WinTV" */
+	__u8	bus_info[32];	/* "PCI:" + pci_name(pci_dev) */
+	__u32   version;        /* should use KERNEL_VERSION() */
+	__u32	capabilities;	/* Device capabilities */
+	__u32	reserved[4];
+};
+
+/* Values for 'capabilities' field */
+#define V4L2_CAP_VIDEO_CAPTURE		0x00000001  /* Is a video capture device */
+#define V4L2_CAP_VIDEO_OUTPUT		0x00000002  /* Is a video output device */
+#define V4L2_CAP_VIDEO_OVERLAY		0x00000004  /* Can do video overlay */
+#define V4L2_CAP_VBI_CAPTURE		0x00000010  /* Is a raw VBI capture device */
+#define V4L2_CAP_VBI_OUTPUT		0x00000020  /* Is a raw VBI output device */
+#define V4L2_CAP_SLICED_VBI_CAPTURE	0x00000040  /* Is a sliced VBI capture device */
+#define V4L2_CAP_SLICED_VBI_OUTPUT	0x00000080  /* Is a sliced VBI output device */
+#define V4L2_CAP_RDS_CAPTURE		0x00000100  /* RDS data capture */
+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000200  /* Can do video output overlay */
+#define V4L2_CAP_HW_FREQ_SEEK		0x00000400  /* Can do hardware frequency seek  */
+
+#define V4L2_CAP_TUNER			0x00010000  /* has a tuner */
+#define V4L2_CAP_AUDIO			0x00020000  /* has audio support */
+#define V4L2_CAP_RADIO			0x00040000  /* is a radio device */
+
+#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
+#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
+#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
+
+/*
+ *	V I D E O   I M A G E   F O R M A T
+ */
+struct v4l2_pix_format {
+	__u32         		width;
+	__u32			height;
+	__u32			pixelformat;
+	enum v4l2_field  	field;
+	__u32            	bytesperline;	/* for padding, zero if unused */
+	__u32          		sizeimage;
+	enum v4l2_colorspace	colorspace;
+	__u32			priv;		/* private data, depends on pixelformat */
+};
+
+/*      Pixel format         FOURCC                        depth  Description  */
+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
+#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
+
+/* two planes -- one Y, one Cr + Cb interleaved  */
+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
+#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
+#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
+
+/*  The following formats are not defined in the V4L2 specification */
+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
+#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
+
+/* see http://www.siliconimaging.com/RGB%20Bayer.htm */
+#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
+/*
+ * 10bit raw bayer, expanded to 16 bits
+ * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
+ */
+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0')
+/* 10bit raw bayer DPCM compressed to 8 bits */
+#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
+
+/* compressed formats */
+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4    */
+
+/*  Vendor-specific formats   */
+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
+#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
+#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
+#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
+#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
+#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
+#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
+#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
+#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
+#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
+#define V4L2_PIX_FMT_SQ905C   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
+#define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
+#define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16  YVU 4:2:2     */
+
+/*
+ *	F O R M A T   E N U M E R A T I O N
+ */
+struct v4l2_fmtdesc {
+	__u32		    index;             /* Format number      */
+	enum v4l2_buf_type  type;              /* buffer type        */
+	__u32               flags;
+	__u8		    description[32];   /* Description string */
+	__u32		    pixelformat;       /* Format fourcc      */
+	__u32		    reserved[4];
+};
+
+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
+
+#if 1 /*KEEP*/
+	/* Experimental Frame Size and frame rate enumeration */
+/*
+ *	F R A M E   S I Z E   E N U M E R A T I O N
+ */
+enum v4l2_frmsizetypes {
+	V4L2_FRMSIZE_TYPE_DISCRETE	= 1,
+	V4L2_FRMSIZE_TYPE_CONTINUOUS	= 2,
+	V4L2_FRMSIZE_TYPE_STEPWISE	= 3,
+};
+
+struct v4l2_frmsize_discrete {
+	__u32			width;		/* Frame width [pixel] */
+	__u32			height;		/* Frame height [pixel] */
+};
+
+struct v4l2_frmsize_stepwise {
+	__u32			min_width;	/* Minimum frame width [pixel] */
+	__u32			max_width;	/* Maximum frame width [pixel] */
+	__u32			step_width;	/* Frame width step size [pixel] */
+	__u32			min_height;	/* Minimum frame height [pixel] */
+	__u32			max_height;	/* Maximum frame height [pixel] */
+	__u32			step_height;	/* Frame height step size [pixel] */
+};
+
+struct v4l2_frmsizeenum {
+	__u32			index;		/* Frame size number */
+	__u32			pixel_format;	/* Pixel format */
+	__u32			type;		/* Frame size type the device supports. */
+
+	union {					/* Frame size */
+		struct v4l2_frmsize_discrete	discrete;
+		struct v4l2_frmsize_stepwise	stepwise;
+	};
+
+	__u32   reserved[2];			/* Reserved space for future use */
+};
+
+/*
+ *	F R A M E   R A T E   E N U M E R A T I O N
+ */
+enum v4l2_frmivaltypes {
+	V4L2_FRMIVAL_TYPE_DISCRETE	= 1,
+	V4L2_FRMIVAL_TYPE_CONTINUOUS	= 2,
+	V4L2_FRMIVAL_TYPE_STEPWISE	= 3,
+};
+
+struct v4l2_frmival_stepwise {
+	struct v4l2_fract	min;		/* Minimum frame interval [s] */
+	struct v4l2_fract	max;		/* Maximum frame interval [s] */
+	struct v4l2_fract	step;		/* Frame interval step size [s] */
+};
+
+struct v4l2_frmivalenum {
+	__u32			index;		/* Frame format index */
+	__u32			pixel_format;	/* Pixel format */
+	__u32			width;		/* Frame width */
+	__u32			height;		/* Frame height */
+	__u32			type;		/* Frame interval type the device supports. */
+
+	union {					/* Frame interval */
+		struct v4l2_fract		discrete;
+		struct v4l2_frmival_stepwise	stepwise;
+	};
+
+	__u32	reserved[2];			/* Reserved space for future use */
+};
+#endif
+
+/*
+ *	T I M E C O D E
+ */
+struct v4l2_timecode {
+	__u32	type;
+	__u32	flags;
+	__u8	frames;
+	__u8	seconds;
+	__u8	minutes;
+	__u8	hours;
+	__u8	userbits[4];
+};
+
+/*  Type  */
+#define V4L2_TC_TYPE_24FPS		1
+#define V4L2_TC_TYPE_25FPS		2
+#define V4L2_TC_TYPE_30FPS		3
+#define V4L2_TC_TYPE_50FPS		4
+#define V4L2_TC_TYPE_60FPS		5
+
+/*  Flags  */
+#define V4L2_TC_FLAG_DROPFRAME		0x0001 /* "drop-frame" mode */
+#define V4L2_TC_FLAG_COLORFRAME		0x0002
+#define V4L2_TC_USERBITS_field		0x000C
+#define V4L2_TC_USERBITS_USERDEFINED	0x0000
+#define V4L2_TC_USERBITS_8BITCHARS	0x0008
+/* The above is based on SMPTE timecodes */
+
+struct v4l2_jpegcompression {
+	int quality;
+
+	int  APPn;              /* Number of APP segment to be written,
+				 * must be 0..15 */
+	int  APP_len;           /* Length of data in JPEG APPn segment */
+	char APP_data[60];      /* Data in the JPEG APPn segment. */
+
+	int  COM_len;           /* Length of data in JPEG COM segment */
+	char COM_data[60];      /* Data in JPEG COM segment */
+
+	__u32 jpeg_markers;     /* Which markers should go into the JPEG
+				 * output. Unless you exactly know what
+				 * you do, leave them untouched.
+				 * Inluding less markers will make the
+				 * resulting code smaller, but there will
+				 * be fewer aplications which can read it.
+				 * The presence of the APP and COM marker
+				 * is influenced by APP_len and COM_len
+				 * ONLY, not by this property! */
+
+#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
+#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
+#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
+#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
+#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
+					* allways use APP0 */
+};
+
+/*
+ *	M E M O R Y - M A P P I N G   B U F F E R S
+ */
+struct v4l2_requestbuffers {
+	__u32			count;
+	enum v4l2_buf_type      type;
+	enum v4l2_memory        memory;
+	__u32			reserved[2];
+};
+
+struct v4l2_buffer {
+	__u32			index;
+	enum v4l2_buf_type      type;
+	__u32			bytesused;
+	__u32			flags;
+	enum v4l2_field		field;
+	struct timeval		timestamp;
+	struct v4l2_timecode	timecode;
+	__u32			sequence;
+
+	/* memory location */
+	enum v4l2_memory        memory;
+	union {
+		__u32           offset;
+		unsigned long   userptr;
+	} m;
+	__u32			length;
+	__u32			input;
+	__u32			reserved;
+};
+
+/*  Flags for 'flags' field */
+#define V4L2_BUF_FLAG_MAPPED	0x0001  /* Buffer is mapped (flag) */
+#define V4L2_BUF_FLAG_QUEUED	0x0002	/* Buffer is queued for processing */
+#define V4L2_BUF_FLAG_DONE	0x0004	/* Buffer is ready */
+#define V4L2_BUF_FLAG_KEYFRAME	0x0008	/* Image is a keyframe (I-frame) */
+#define V4L2_BUF_FLAG_PFRAME	0x0010	/* Image is a P-frame */
+#define V4L2_BUF_FLAG_BFRAME	0x0020	/* Image is a B-frame */
+#define V4L2_BUF_FLAG_TIMECODE	0x0100	/* timecode field is valid */
+#define V4L2_BUF_FLAG_INPUT     0x0200  /* input field is valid */
+
+/*
+ *	O V E R L A Y   P R E V I E W
+ */
+struct v4l2_framebuffer {
+	__u32			capability;
+	__u32			flags;
+/* FIXME: in theory we should pass something like PCI device + memory
+ * region + offset instead of some physical address */
+	void                    *base;
+	struct v4l2_pix_format	fmt;
+};
+/*  Flags for the 'capability' field. Read only */
+#define V4L2_FBUF_CAP_EXTERNOVERLAY	0x0001
+#define V4L2_FBUF_CAP_CHROMAKEY		0x0002
+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
+#define V4L2_FBUF_CAP_BITMAP_CLIPPING	0x0008
+#define V4L2_FBUF_CAP_LOCAL_ALPHA	0x0010
+#define V4L2_FBUF_CAP_GLOBAL_ALPHA	0x0020
+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA	0x0040
+/*  Flags for the 'flags' field. */
+#define V4L2_FBUF_FLAG_PRIMARY		0x0001
+#define V4L2_FBUF_FLAG_OVERLAY		0x0002
+#define V4L2_FBUF_FLAG_CHROMAKEY	0x0004
+#define V4L2_FBUF_FLAG_LOCAL_ALPHA	0x0008
+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA	0x0010
+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA	0x0020
+
+struct v4l2_clip {
+	struct v4l2_rect        c;
+	struct v4l2_clip	*next;
+};
+
+struct v4l2_window {
+	struct v4l2_rect        w;
+	enum v4l2_field  	field;
+	__u32			chromakey;
+	struct v4l2_clip	*clips;
+	__u32			clipcount;
+	void			*bitmap;
+	__u8                    global_alpha;
+};
+
+/*
+ *	C A P T U R E   P A R A M E T E R S
+ */
+struct v4l2_captureparm {
+	__u32		   capability;	  /*  Supported modes */
+	__u32		   capturemode;	  /*  Current mode */
+	struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
+	__u32		   extendedmode;  /*  Driver-specific extensions */
+	__u32              readbuffers;   /*  # of buffers for read */
+	__u32		   reserved[4];
+};
+
+/*  Flags for 'capability' and 'capturemode' fields */
+#define V4L2_MODE_HIGHQUALITY	0x0001	/*  High quality imaging mode */
+#define V4L2_CAP_TIMEPERFRAME	0x1000	/*  timeperframe field is supported */
+
+struct v4l2_outputparm {
+	__u32		   capability;	 /*  Supported modes */
+	__u32		   outputmode;	 /*  Current mode */
+	struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
+	__u32		   extendedmode; /*  Driver-specific extensions */
+	__u32              writebuffers; /*  # of buffers for write */
+	__u32		   reserved[4];
+};
+
+/*
+ *	I N P U T   I M A G E   C R O P P I N G
+ */
+struct v4l2_cropcap {
+	enum v4l2_buf_type      type;
+	struct v4l2_rect        bounds;
+	struct v4l2_rect        defrect;
+	struct v4l2_fract       pixelaspect;
+};
+
+struct v4l2_crop {
+	enum v4l2_buf_type      type;
+	struct v4l2_rect        c;
+};
+
+/*
+ *      A N A L O G   V I D E O   S T A N D A R D
+ */
+
+typedef __u64 v4l2_std_id;
+
+/* one bit for each */
+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
+
+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
+
+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
+#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
+#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)
+
+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
+#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
+
+/* ATSC/HDTV */
+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
+
+/* FIXME:
+   Although std_id is 64 bits, there is an issue on PPC32 architecture that
+   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
+   this value to 32 bits.
+   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
+   it should work fine. However, if needed to add more than two standards,
+   v4l2-common.c should be fixed.
+ */
+
+/* some merged standards */
+#define V4L2_STD_MN	(V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
+#define V4L2_STD_B	(V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
+#define V4L2_STD_GH	(V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
+#define V4L2_STD_DK	(V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
+
+/* some common needed stuff */
+#define V4L2_STD_PAL_BG		(V4L2_STD_PAL_B		|\
+				 V4L2_STD_PAL_B1	|\
+				 V4L2_STD_PAL_G)
+#define V4L2_STD_PAL_DK		(V4L2_STD_PAL_D		|\
+				 V4L2_STD_PAL_D1	|\
+				 V4L2_STD_PAL_K)
+#define V4L2_STD_PAL		(V4L2_STD_PAL_BG	|\
+				 V4L2_STD_PAL_DK	|\
+				 V4L2_STD_PAL_H		|\
+				 V4L2_STD_PAL_I)
+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M	|\
+				 V4L2_STD_NTSC_M_JP     |\
+				 V4L2_STD_NTSC_M_KR)
+#define V4L2_STD_SECAM_DK      	(V4L2_STD_SECAM_D	|\
+				 V4L2_STD_SECAM_K	|\
+				 V4L2_STD_SECAM_K1)
+#define V4L2_STD_SECAM		(V4L2_STD_SECAM_B	|\
+				 V4L2_STD_SECAM_G	|\
+				 V4L2_STD_SECAM_H	|\
+				 V4L2_STD_SECAM_DK	|\
+				 V4L2_STD_SECAM_L       |\
+				 V4L2_STD_SECAM_LC)
+
+#define V4L2_STD_525_60		(V4L2_STD_PAL_M		|\
+				 V4L2_STD_PAL_60	|\
+				 V4L2_STD_NTSC		|\
+				 V4L2_STD_NTSC_443)
+#define V4L2_STD_625_50		(V4L2_STD_PAL		|\
+				 V4L2_STD_PAL_N		|\
+				 V4L2_STD_PAL_Nc	|\
+				 V4L2_STD_SECAM)
+#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
+				 V4L2_STD_ATSC_16_VSB)
+
+#define V4L2_STD_UNKNOWN        0
+#define V4L2_STD_ALL            (V4L2_STD_525_60	|\
+				 V4L2_STD_625_50)
+
+struct v4l2_standard {
+	__u32		     index;
+	v4l2_std_id          id;
+	__u8		     name[24];
+	struct v4l2_fract    frameperiod; /* Frames, not fields */
+	__u32		     framelines;
+	__u32		     reserved[4];
+};
+
+/*
+ *	V I D E O   I N P U T S
+ */
+struct v4l2_input {
+	__u32	     index;		/*  Which input */
+	__u8	     name[32];		/*  Label */
+	__u32	     type;		/*  Type of input */
+	__u32	     audioset;		/*  Associated audios (bitfield) */
+	__u32        tuner;             /*  Associated tuner */
+	v4l2_std_id  std;
+	__u32	     status;
+	__u32	     reserved[4];
+};
+
+/*  Values for the 'type' field */
+#define V4L2_INPUT_TYPE_TUNER		1
+#define V4L2_INPUT_TYPE_CAMERA		2
+
+/* field 'status' - general */
+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
+#define V4L2_IN_ST_NO_COLOR    0x00000004
+
+/* field 'status' - sensor orientation */
+/* If sensor is mounted upside down set both bits */
+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
+
+/* field 'status' - analog */
+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
+
+/* field 'status' - digital */
+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
+
+/* field 'status' - VCR and set-top box */
+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
+
+/*
+ *	V I D E O   O U T P U T S
+ */
+struct v4l2_output {
+	__u32	     index;		/*  Which output */
+	__u8	     name[32];		/*  Label */
+	__u32	     type;		/*  Type of output */
+	__u32	     audioset;		/*  Associated audios (bitfield) */
+	__u32	     modulator;         /*  Associated modulator */
+	v4l2_std_id  std;
+	__u32	     reserved[4];
+};
+/*  Values for the 'type' field */
+#define V4L2_OUTPUT_TYPE_MODULATOR		1
+#define V4L2_OUTPUT_TYPE_ANALOG			2
+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY	3
+
+/*
+ *	C O N T R O L S
+ */
+struct v4l2_control {
+	__u32		     id;
+	__s32		     value;
+};
+
+struct v4l2_ext_control {
+	__u32 id;
+	__u32 reserved2[2];
+	union {
+		__s32 value;
+		__s64 value64;
+		void *reserved;
+	};
+} __attribute__ ((packed));
+
+struct v4l2_ext_controls {
+	__u32 ctrl_class;
+	__u32 count;
+	__u32 error_idx;
+	__u32 reserved[2];
+	struct v4l2_ext_control *controls;
+};
+
+/*  Values for ctrl_class field */
+#define V4L2_CTRL_CLASS_USER 0x00980000	/* Old-style 'user' controls */
+#define V4L2_CTRL_CLASS_MPEG 0x00990000	/* MPEG-compression controls */
+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000	/* Camera class controls */
+
+#define V4L2_CTRL_ID_MASK      	  (0x0fffffff)
+#define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
+
+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
+struct v4l2_queryctrl {
+	__u32		     id;
+	enum v4l2_ctrl_type  type;
+	__u8		     name[32];	/* Whatever */
+	__s32		     minimum;	/* Note signedness */
+	__s32		     maximum;
+	__s32		     step;
+	__s32		     default_value;
+	__u32                flags;
+	__u32		     reserved[2];
+};
+
+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
+struct v4l2_querymenu {
+	__u32		id;
+	__u32		index;
+	__u8		name[32];	/* Whatever */
+	__u32		reserved;
+};
+
+/*  Control flags  */
+#define V4L2_CTRL_FLAG_DISABLED		0x0001
+#define V4L2_CTRL_FLAG_GRABBED		0x0002
+#define V4L2_CTRL_FLAG_READ_ONLY 	0x0004
+#define V4L2_CTRL_FLAG_UPDATE 		0x0008
+#define V4L2_CTRL_FLAG_INACTIVE 	0x0010
+#define V4L2_CTRL_FLAG_SLIDER 		0x0020
+#define V4L2_CTRL_FLAG_WRITE_ONLY 	0x0040
+
+/*  Query flag, to be ORed with the control ID */
+#define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
+
+/*  User-class control IDs defined by V4L2 */
+#define V4L2_CID_BASE			(V4L2_CTRL_CLASS_USER | 0x900)
+#define V4L2_CID_USER_BASE 		V4L2_CID_BASE
+/*  IDs reserved for driver specific controls */
+#define V4L2_CID_PRIVATE_BASE		0x08000000
+
+#define V4L2_CID_USER_CLASS 		(V4L2_CTRL_CLASS_USER | 1)
+#define V4L2_CID_BRIGHTNESS		(V4L2_CID_BASE+0)
+#define V4L2_CID_CONTRAST		(V4L2_CID_BASE+1)
+#define V4L2_CID_SATURATION		(V4L2_CID_BASE+2)
+#define V4L2_CID_HUE			(V4L2_CID_BASE+3)
+#define V4L2_CID_AUDIO_VOLUME		(V4L2_CID_BASE+5)
+#define V4L2_CID_AUDIO_BALANCE		(V4L2_CID_BASE+6)
+#define V4L2_CID_AUDIO_BASS		(V4L2_CID_BASE+7)
+#define V4L2_CID_AUDIO_TREBLE		(V4L2_CID_BASE+8)
+#define V4L2_CID_AUDIO_MUTE		(V4L2_CID_BASE+9)
+#define V4L2_CID_AUDIO_LOUDNESS		(V4L2_CID_BASE+10)
+#define V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11) /* Deprecated */
+#define V4L2_CID_AUTO_WHITE_BALANCE	(V4L2_CID_BASE+12)
+#define V4L2_CID_DO_WHITE_BALANCE	(V4L2_CID_BASE+13)
+#define V4L2_CID_RED_BALANCE		(V4L2_CID_BASE+14)
+#define V4L2_CID_BLUE_BALANCE		(V4L2_CID_BASE+15)
+#define V4L2_CID_GAMMA			(V4L2_CID_BASE+16)
+#define V4L2_CID_WHITENESS		(V4L2_CID_GAMMA) /* Deprecated */
+#define V4L2_CID_EXPOSURE		(V4L2_CID_BASE+17)
+#define V4L2_CID_AUTOGAIN		(V4L2_CID_BASE+18)
+#define V4L2_CID_GAIN			(V4L2_CID_BASE+19)
+#define V4L2_CID_HFLIP			(V4L2_CID_BASE+20)
+#define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)
+
+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
+#define V4L2_CID_HCENTER		(V4L2_CID_BASE+22)
+#define V4L2_CID_VCENTER		(V4L2_CID_BASE+23)
+
+#define V4L2_CID_POWER_LINE_FREQUENCY	(V4L2_CID_BASE+24)
+enum v4l2_power_line_frequency {
+	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,
+	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,
+	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,
+};
+#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)
+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)
+#define V4L2_CID_SHARPNESS			(V4L2_CID_BASE+27)
+#define V4L2_CID_BACKLIGHT_COMPENSATION 	(V4L2_CID_BASE+28)
+#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
+#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
+#define V4L2_CID_COLORFX			(V4L2_CID_BASE+31)
+enum v4l2_colorfx {
+	V4L2_COLORFX_NONE	= 0,
+	V4L2_COLORFX_BW		= 1,
+	V4L2_COLORFX_SEPIA	= 2,
+};
+
+/* last CID + 1 */
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+32)
+
+/*  MPEG-class control IDs defined by V4L2 */
+#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)
+#define V4L2_CID_MPEG_CLASS 			(V4L2_CTRL_CLASS_MPEG | 1)
+
+/*  MPEG streams */
+#define V4L2_CID_MPEG_STREAM_TYPE 		(V4L2_CID_MPEG_BASE+0)
+enum v4l2_mpeg_stream_type {
+	V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
+	V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
+	V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
+	V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
+	V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
+	V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
+};
+#define V4L2_CID_MPEG_STREAM_PID_PMT 		(V4L2_CID_MPEG_BASE+1)
+#define V4L2_CID_MPEG_STREAM_PID_AUDIO 		(V4L2_CID_MPEG_BASE+2)
+#define V4L2_CID_MPEG_STREAM_PID_VIDEO 		(V4L2_CID_MPEG_BASE+3)
+#define V4L2_CID_MPEG_STREAM_PID_PCR 		(V4L2_CID_MPEG_BASE+4)
+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO 	(V4L2_CID_MPEG_BASE+5)
+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO 	(V4L2_CID_MPEG_BASE+6)
+#define V4L2_CID_MPEG_STREAM_VBI_FMT 		(V4L2_CID_MPEG_BASE+7)
+enum v4l2_mpeg_stream_vbi_fmt {
+	V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
+	V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
+};
+
+/*  MPEG audio */
+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ 	(V4L2_CID_MPEG_BASE+100)
+enum v4l2_mpeg_audio_sampling_freq {
+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
+};
+#define V4L2_CID_MPEG_AUDIO_ENCODING 		(V4L2_CID_MPEG_BASE+101)
+enum v4l2_mpeg_audio_encoding {
+	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
+	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
+	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
+	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
+	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
+};
+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)
+enum v4l2_mpeg_audio_l1_bitrate {
+	V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
+	V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
+	V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
+	V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
+	V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
+	V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
+	V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
+	V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
+	V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
+	V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
+	V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
+	V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
+	V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
+	V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE 		(V4L2_CID_MPEG_BASE+103)
+enum v4l2_mpeg_audio_l2_bitrate {
+	V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
+	V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
+	V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
+	V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
+	V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
+	V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
+	V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
+	V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
+	V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
+	V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
+	V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
+	V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
+	V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
+	V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE 		(V4L2_CID_MPEG_BASE+104)
+enum v4l2_mpeg_audio_l3_bitrate {
+	V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
+	V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
+	V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
+	V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
+	V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
+	V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
+	V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
+	V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
+	V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
+	V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
+	V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
+	V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
+	V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
+	V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
+};
+#define V4L2_CID_MPEG_AUDIO_MODE 		(V4L2_CID_MPEG_BASE+105)
+enum v4l2_mpeg_audio_mode {
+	V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
+	V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
+	V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
+	V4L2_MPEG_AUDIO_MODE_MONO         = 3,
+};
+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION 	(V4L2_CID_MPEG_BASE+106)
+enum v4l2_mpeg_audio_mode_extension {
+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
+};
+#define V4L2_CID_MPEG_AUDIO_EMPHASIS 		(V4L2_CID_MPEG_BASE+107)
+enum v4l2_mpeg_audio_emphasis {
+	V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
+	V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
+	V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
+};
+#define V4L2_CID_MPEG_AUDIO_CRC 		(V4L2_CID_MPEG_BASE+108)
+enum v4l2_mpeg_audio_crc {
+	V4L2_MPEG_AUDIO_CRC_NONE  = 0,
+	V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
+};
+#define V4L2_CID_MPEG_AUDIO_MUTE 		(V4L2_CID_MPEG_BASE+109)
+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE		(V4L2_CID_MPEG_BASE+110)
+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE		(V4L2_CID_MPEG_BASE+111)
+enum v4l2_mpeg_audio_ac3_bitrate {
+	V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
+	V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
+};
+
+/*  MPEG video */
+#define V4L2_CID_MPEG_VIDEO_ENCODING 		(V4L2_CID_MPEG_BASE+200)
+enum v4l2_mpeg_video_encoding {
+	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
+	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
+	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
+};
+#define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)
+enum v4l2_mpeg_video_aspect {
+	V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
+	V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
+	V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
+	V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
+};
+#define V4L2_CID_MPEG_VIDEO_B_FRAMES 		(V4L2_CID_MPEG_BASE+202)
+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE 		(V4L2_CID_MPEG_BASE+203)
+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE 	(V4L2_CID_MPEG_BASE+204)
+#define V4L2_CID_MPEG_VIDEO_PULLDOWN 		(V4L2_CID_MPEG_BASE+205)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE 	(V4L2_CID_MPEG_BASE+206)
+enum v4l2_mpeg_video_bitrate_mode {
+	V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
+	V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_BITRATE 		(V4L2_CID_MPEG_BASE+207)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK 	(V4L2_CID_MPEG_BASE+208)
+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
+#define V4L2_CID_MPEG_VIDEO_MUTE 		(V4L2_CID_MPEG_BASE+210)
+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV 		(V4L2_CID_MPEG_BASE+211)
+
+/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
+#define V4L2_CID_MPEG_CX2341X_BASE 				(V4L2_CTRL_CLASS_MPEG | 0x1000)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+0)
+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+1)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+2)
+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+3)
+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+4)
+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+5)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE 		(V4L2_CID_MPEG_CX2341X_BASE+6)
+enum v4l2_mpeg_cx2341x_video_median_filter_type {
+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
+};
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM 	(V4L2_CID_MPEG_CX2341X_BASE+7)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+8)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM	(V4L2_CID_MPEG_CX2341X_BASE+9)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+10)
+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS 	(V4L2_CID_MPEG_CX2341X_BASE+11)
+
+/*  Camera class control IDs */
+#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)
+#define V4L2_CID_CAMERA_CLASS 		(V4L2_CTRL_CLASS_CAMERA | 1)
+
+#define V4L2_CID_EXPOSURE_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+1)
+enum  v4l2_exposure_auto_type {
+	V4L2_EXPOSURE_AUTO = 0,
+	V4L2_EXPOSURE_MANUAL = 1,
+	V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
+	V4L2_EXPOSURE_APERTURE_PRIORITY = 3
+};
+#define V4L2_CID_EXPOSURE_ABSOLUTE		(V4L2_CID_CAMERA_CLASS_BASE+2)
+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY		(V4L2_CID_CAMERA_CLASS_BASE+3)
+
+#define V4L2_CID_PAN_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+4)
+#define V4L2_CID_TILT_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+5)
+#define V4L2_CID_PAN_RESET			(V4L2_CID_CAMERA_CLASS_BASE+6)
+#define V4L2_CID_TILT_RESET			(V4L2_CID_CAMERA_CLASS_BASE+7)
+
+#define V4L2_CID_PAN_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+8)
+#define V4L2_CID_TILT_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+9)
+
+#define V4L2_CID_FOCUS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+10)
+#define V4L2_CID_FOCUS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+11)
+#define V4L2_CID_FOCUS_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+12)
+
+#define V4L2_CID_ZOOM_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+13)
+#define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
+#define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
+
+#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
+
+/*
+ *	T U N I N G
+ */
+struct v4l2_tuner {
+	__u32                   index;
+	__u8			name[32];
+	enum v4l2_tuner_type    type;
+	__u32			capability;
+	__u32			rangelow;
+	__u32			rangehigh;
+	__u32			rxsubchans;
+	__u32			audmode;
+	__s32			signal;
+	__s32			afc;
+	__u32			reserved[4];
+};
+
+struct v4l2_modulator {
+	__u32			index;
+	__u8			name[32];
+	__u32			capability;
+	__u32			rangelow;
+	__u32			rangehigh;
+	__u32			txsubchans;
+	__u32			reserved[4];
+};
+
+/*  Flags for the 'capability' field */
+#define V4L2_TUNER_CAP_LOW		0x0001
+#define V4L2_TUNER_CAP_NORM		0x0002
+#define V4L2_TUNER_CAP_STEREO		0x0010
+#define V4L2_TUNER_CAP_LANG2		0x0020
+#define V4L2_TUNER_CAP_SAP		0x0020
+#define V4L2_TUNER_CAP_LANG1		0x0040
+
+/*  Flags for the 'rxsubchans' field */
+#define V4L2_TUNER_SUB_MONO		0x0001
+#define V4L2_TUNER_SUB_STEREO		0x0002
+#define V4L2_TUNER_SUB_LANG2		0x0004
+#define V4L2_TUNER_SUB_SAP		0x0004
+#define V4L2_TUNER_SUB_LANG1		0x0008
+
+/*  Values for the 'audmode' field */
+#define V4L2_TUNER_MODE_MONO		0x0000
+#define V4L2_TUNER_MODE_STEREO		0x0001
+#define V4L2_TUNER_MODE_LANG2		0x0002
+#define V4L2_TUNER_MODE_SAP		0x0002
+#define V4L2_TUNER_MODE_LANG1		0x0003
+#define V4L2_TUNER_MODE_LANG1_LANG2	0x0004
+
+struct v4l2_frequency {
+	__u32		      tuner;
+	enum v4l2_tuner_type  type;
+	__u32		      frequency;
+	__u32		      reserved[8];
+};
+
+struct v4l2_hw_freq_seek {
+	__u32		      tuner;
+	enum v4l2_tuner_type  type;
+	__u32		      seek_upward;
+	__u32		      wrap_around;
+	__u32		      reserved[8];
+};
+
+/*
+ *	A U D I O
+ */
+struct v4l2_audio {
+	__u32	index;
+	__u8	name[32];
+	__u32	capability;
+	__u32	mode;
+	__u32	reserved[2];
+};
+
+/*  Flags for the 'capability' field */
+#define V4L2_AUDCAP_STEREO		0x00001
+#define V4L2_AUDCAP_AVL			0x00002
+
+/*  Flags for the 'mode' field */
+#define V4L2_AUDMODE_AVL		0x00001
+
+struct v4l2_audioout {
+	__u32	index;
+	__u8	name[32];
+	__u32	capability;
+	__u32	mode;
+	__u32	reserved[2];
+};
+
+/*
+ *	M P E G   S E R V I C E S
+ *
+ *	NOTE: EXPERIMENTAL API
+ */
+#if 1 /*KEEP*/
+#define V4L2_ENC_IDX_FRAME_I    (0)
+#define V4L2_ENC_IDX_FRAME_P    (1)
+#define V4L2_ENC_IDX_FRAME_B    (2)
+#define V4L2_ENC_IDX_FRAME_MASK (0xf)
+
+struct v4l2_enc_idx_entry {
+	__u64 offset;
+	__u64 pts;
+	__u32 length;
+	__u32 flags;
+	__u32 reserved[2];
+};
+
+#define V4L2_ENC_IDX_ENTRIES (64)
+struct v4l2_enc_idx {
+	__u32 entries;
+	__u32 entries_cap;
+	__u32 reserved[4];
+	struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
+};
+
+
+#define V4L2_ENC_CMD_START      (0)
+#define V4L2_ENC_CMD_STOP       (1)
+#define V4L2_ENC_CMD_PAUSE      (2)
+#define V4L2_ENC_CMD_RESUME     (3)
+
+/* Flags for V4L2_ENC_CMD_STOP */
+#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
+
+struct v4l2_encoder_cmd {
+	__u32 cmd;
+	__u32 flags;
+	union {
+		struct {
+			__u32 data[8];
+		} raw;
+	};
+};
+
+#endif
+
+
+/*
+ *	D A T A   S E R V I C E S   ( V B I )
+ *
+ *	Data services API by Michael Schimek
+ */
+
+/* Raw VBI */
+struct v4l2_vbi_format {
+	__u32	sampling_rate;		/* in 1 Hz */
+	__u32	offset;
+	__u32	samples_per_line;
+	__u32	sample_format;		/* V4L2_PIX_FMT_* */
+	__s32	start[2];
+	__u32	count[2];
+	__u32	flags;			/* V4L2_VBI_* */
+	__u32	reserved[2];		/* must be zero */
+};
+
+/*  VBI flags  */
+#define V4L2_VBI_UNSYNC		(1 << 0)
+#define V4L2_VBI_INTERLACED	(1 << 1)
+
+/* Sliced VBI
+ *
+ *    This implements is a proposal V4L2 API to allow SLICED VBI
+ * required for some hardware encoders. It should change without
+ * notice in the definitive implementation.
+ */
+
+struct v4l2_sliced_vbi_format {
+	__u16   service_set;
+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
+				 (equals frame lines 313-336 for 625 line video
+				  standards, 263-286 for 525 line standards) */
+	__u16   service_lines[2][24];
+	__u32   io_size;
+	__u32   reserved[2];            /* must be zero */
+};
+
+/* Teletext World System Teletext
+   (WST), defined on ITU-R BT.653-2 */
+#define V4L2_SLICED_TELETEXT_B          (0x0001)
+/* Video Program System, defined on ETS 300 231*/
+#define V4L2_SLICED_VPS                 (0x0400)
+/* Closed Caption, defined on EIA-608 */
+#define V4L2_SLICED_CAPTION_525         (0x1000)
+/* Wide Screen System, defined on ITU-R BT1119.1 */
+#define V4L2_SLICED_WSS_625             (0x4000)
+
+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
+
+struct v4l2_sliced_vbi_cap {
+	__u16   service_set;
+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
+				 (equals frame lines 313-336 for 625 line video
+				  standards, 263-286 for 525 line standards) */
+	__u16   service_lines[2][24];
+	enum v4l2_buf_type type;
+	__u32   reserved[3];    /* must be 0 */
+};
+
+struct v4l2_sliced_vbi_data {
+	__u32   id;
+	__u32   field;          /* 0: first field, 1: second field */
+	__u32   line;           /* 1-23 */
+	__u32   reserved;       /* must be 0 */
+	__u8    data[48];
+};
+
+/*
+ * Sliced VBI data inserted into MPEG Streams
+ */
+
+/*
+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
+ *
+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
+ * data
+ *
+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
+ * definitions are not included here.  See the MPEG-2 specifications for details
+ * on these headers.
+ */
+
+/* Line type IDs */
+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
+#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
+#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
+#define V4L2_MPEG_VBI_IVTV_VPS            (7)
+
+struct v4l2_mpeg_vbi_itv0_line {
+	__u8 id;	/* One of V4L2_MPEG_VBI_IVTV_* above */
+	__u8 data[42];	/* Sliced VBI data for the line */
+} __attribute__ ((packed));
+
+struct v4l2_mpeg_vbi_itv0 {
+	__le32 linemask[2]; /* Bitmasks of VBI service lines present */
+	struct v4l2_mpeg_vbi_itv0_line line[35];
+} __attribute__ ((packed));
+
+struct v4l2_mpeg_vbi_ITV0 {
+	struct v4l2_mpeg_vbi_itv0_line line[36];
+} __attribute__ ((packed));
+
+#define V4L2_MPEG_VBI_IVTV_MAGIC0	"itv0"
+#define V4L2_MPEG_VBI_IVTV_MAGIC1	"ITV0"
+
+struct v4l2_mpeg_vbi_fmt_ivtv {
+	__u8 magic[4];
+	union {
+		struct v4l2_mpeg_vbi_itv0 itv0;
+		struct v4l2_mpeg_vbi_ITV0 ITV0;
+	};
+} __attribute__ ((packed));
+
+/*
+ *	A G G R E G A T E   S T R U C T U R E S
+ */
+
+/*	Stream data format
+ */
+struct v4l2_format {
+	enum v4l2_buf_type type;
+	union {
+		struct v4l2_pix_format		pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
+		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
+		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
+		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
+		__u8	raw_data[200];                   /* user-defined */
+	} fmt;
+};
+
+
+/*	Stream type-dependent parameters
+ */
+struct v4l2_streamparm {
+	enum v4l2_buf_type type;
+	union {
+		struct v4l2_captureparm	capture;
+		struct v4l2_outputparm	output;
+		__u8	raw_data[200];  /* user-defined */
+	} parm;
+};
+
+/*
+ *	A D V A N C E D   D E B U G G I N G
+ *
+ *	NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
+ *	FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
+ */
+
+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
+
+#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
+#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
+#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
+
+struct v4l2_dbg_match {
+	__u32 type; /* Match type */
+	union {     /* Match this chip, meaning determined by type */
+		__u32 addr;
+		char name[32];
+	};
+} __attribute__ ((packed));
+
+struct v4l2_dbg_register {
+	struct v4l2_dbg_match match;
+	__u32 size;	/* register size in bytes */
+	__u64 reg;
+	__u64 val;
+} __attribute__ ((packed));
+
+/* VIDIOC_DBG_G_CHIP_IDENT */
+struct v4l2_dbg_chip_ident {
+	struct v4l2_dbg_match match;
+	__u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
+	__u32 revision;    /* chip revision, chip specific */
+} __attribute__ ((packed));
+
+/*
+ *	I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
+ *
+ */
+#define VIDIOC_QUERYCAP		 _IOR('V',  0, struct v4l2_capability)
+#define VIDIOC_RESERVED		  _IO('V',  1)
+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
+#define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
+#define VIDIOC_S_FMT		_IOWR('V',  5, struct v4l2_format)
+#define VIDIOC_REQBUFS		_IOWR('V',  8, struct v4l2_requestbuffers)
+#define VIDIOC_QUERYBUF		_IOWR('V',  9, struct v4l2_buffer)
+#define VIDIOC_G_FBUF		 _IOR('V', 10, struct v4l2_framebuffer)
+#define VIDIOC_S_FBUF		 _IOW('V', 11, struct v4l2_framebuffer)
+#define VIDIOC_OVERLAY		 _IOW('V', 14, int)
+#define VIDIOC_QBUF		_IOWR('V', 15, struct v4l2_buffer)
+#define VIDIOC_DQBUF		_IOWR('V', 17, struct v4l2_buffer)
+#define VIDIOC_STREAMON		 _IOW('V', 18, int)
+#define VIDIOC_STREAMOFF	 _IOW('V', 19, int)
+#define VIDIOC_G_PARM		_IOWR('V', 21, struct v4l2_streamparm)
+#define VIDIOC_S_PARM		_IOWR('V', 22, struct v4l2_streamparm)
+#define VIDIOC_G_STD		 _IOR('V', 23, v4l2_std_id)
+#define VIDIOC_S_STD		 _IOW('V', 24, v4l2_std_id)
+#define VIDIOC_ENUMSTD		_IOWR('V', 25, struct v4l2_standard)
+#define VIDIOC_ENUMINPUT	_IOWR('V', 26, struct v4l2_input)
+#define VIDIOC_G_CTRL		_IOWR('V', 27, struct v4l2_control)
+#define VIDIOC_S_CTRL		_IOWR('V', 28, struct v4l2_control)
+#define VIDIOC_G_TUNER		_IOWR('V', 29, struct v4l2_tuner)
+#define VIDIOC_S_TUNER		 _IOW('V', 30, struct v4l2_tuner)
+#define VIDIOC_G_AUDIO		 _IOR('V', 33, struct v4l2_audio)
+#define VIDIOC_S_AUDIO		 _IOW('V', 34, struct v4l2_audio)
+#define VIDIOC_QUERYCTRL	_IOWR('V', 36, struct v4l2_queryctrl)
+#define VIDIOC_QUERYMENU	_IOWR('V', 37, struct v4l2_querymenu)
+#define VIDIOC_G_INPUT		 _IOR('V', 38, int)
+#define VIDIOC_S_INPUT		_IOWR('V', 39, int)
+#define VIDIOC_G_OUTPUT		 _IOR('V', 46, int)
+#define VIDIOC_S_OUTPUT		_IOWR('V', 47, int)
+#define VIDIOC_ENUMOUTPUT	_IOWR('V', 48, struct v4l2_output)
+#define VIDIOC_G_AUDOUT		 _IOR('V', 49, struct v4l2_audioout)
+#define VIDIOC_S_AUDOUT		 _IOW('V', 50, struct v4l2_audioout)
+#define VIDIOC_G_MODULATOR	_IOWR('V', 54, struct v4l2_modulator)
+#define VIDIOC_S_MODULATOR	 _IOW('V', 55, struct v4l2_modulator)
+#define VIDIOC_G_FREQUENCY	_IOWR('V', 56, struct v4l2_frequency)
+#define VIDIOC_S_FREQUENCY	 _IOW('V', 57, struct v4l2_frequency)
+#define VIDIOC_CROPCAP		_IOWR('V', 58, struct v4l2_cropcap)
+#define VIDIOC_G_CROP		_IOWR('V', 59, struct v4l2_crop)
+#define VIDIOC_S_CROP		 _IOW('V', 60, struct v4l2_crop)
+#define VIDIOC_G_JPEGCOMP	 _IOR('V', 61, struct v4l2_jpegcompression)
+#define VIDIOC_S_JPEGCOMP	 _IOW('V', 62, struct v4l2_jpegcompression)
+#define VIDIOC_QUERYSTD      	 _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_TRY_FMT      	_IOWR('V', 64, struct v4l2_format)
+#define VIDIOC_ENUMAUDIO	_IOWR('V', 65, struct v4l2_audio)
+#define VIDIOC_ENUMAUDOUT	_IOWR('V', 66, struct v4l2_audioout)
+#define VIDIOC_G_PRIORITY        _IOR('V', 67, enum v4l2_priority)
+#define VIDIOC_S_PRIORITY        _IOW('V', 68, enum v4l2_priority)
+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
+#define VIDIOC_LOG_STATUS         _IO('V', 70)
+#define VIDIOC_G_EXT_CTRLS	_IOWR('V', 71, struct v4l2_ext_controls)
+#define VIDIOC_S_EXT_CTRLS	_IOWR('V', 72, struct v4l2_ext_controls)
+#define VIDIOC_TRY_EXT_CTRLS	_IOWR('V', 73, struct v4l2_ext_controls)
+#if 1 /*KEEP*/
+#define VIDIOC_ENUM_FRAMESIZES	_IOWR('V', 74, struct v4l2_frmsizeenum)
+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
+#endif
+
+#if 1 /*KEEP*/
+/* Experimental, meant for debugging, testing and internal use.
+   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
+   You must be root to use these ioctls. Never use these in applications! */
+#define	VIDIOC_DBG_S_REGISTER 	 _IOW('V', 79, struct v4l2_dbg_register)
+#define	VIDIOC_DBG_G_REGISTER 	_IOWR('V', 80, struct v4l2_dbg_register)
+
+/* Experimental, meant for debugging, testing and internal use.
+   Never use this ioctl in applications! */
+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
+#endif
+
+#define VIDIOC_S_HW_FREQ_SEEK	 _IOW('V', 82, struct v4l2_hw_freq_seek)
+/* Reminder: when adding new ioctls please add support for them to
+   drivers/media/video/v4l2-compat-ioctl32.c as well! */
+
+#ifdef __OLD_VIDIOC_
+/* for compatibility, will go away some day */
+#define VIDIOC_OVERLAY_OLD     	_IOWR('V', 14, int)
+#define VIDIOC_S_PARM_OLD      	 _IOW('V', 22, struct v4l2_streamparm)
+#define VIDIOC_S_CTRL_OLD      	 _IOW('V', 28, struct v4l2_control)
+#define VIDIOC_G_AUDIO_OLD     	_IOWR('V', 33, struct v4l2_audio)
+#define VIDIOC_G_AUDOUT_OLD    	_IOWR('V', 49, struct v4l2_audioout)
+#define VIDIOC_CROPCAP_OLD     	 _IOR('V', 58, struct v4l2_cropcap)
+#endif
+
+#define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
+
+#endif /* __LINUX_VIDEODEV2_H */


Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fmtools.spec	24 Dec 2009 11:55:00 -0000	1.8
+++ fmtools.spec	25 Dec 2009 16:21:11 -0000	1.9
@@ -1,12 +1,14 @@
+%bcond_with rhel
 Summary: Simple Video for Linux radio card programs
 Name:    fmtools
 Version: 2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.stanford.edu/~blp/fmtools/
 Source0: http://benpfaff.org/fmtools/fmtools/%{name}-%{version}.tar.gz
 Patch0:  fmtools.patch
+Patch1:  fmtools-videodev2.patch
 Source1: fmcontrol.tar.gz
 Source2: http://www.stanford.edu/~blp/fmtools/tkradio
 Source3: http://www.stanford.edu/~blp/fmtools/tkradio-mute
@@ -41,7 +43,7 @@ Group:         Applications/Multimedia
 BuildRequires: desktop-file-utils
 Requires:      %{name} = %{version}
 Requires:      python, tkinter, alsa-utils
-BuildArch:     noarch
+%{!?with_rhel:BuildArch: noarch}
 
 %description tkradio
 This package provides a GUI for %{name}.
@@ -51,13 +53,17 @@ $HOME/.fmrc or $HOME/.radiostations.
 %prep
 %setup -q -a1
 %patch0 -p1 -b .fmtools
+%patch1 -p1 -b .videodev2
 
 # Add shebang to fmcontrol
 sed -i '1i#!/bin/sh' fmcontrol/fmcontrol
 
 %build
 %configure
-make %{_smp_mflags}
+make %{_smp_mflags} \
+%if %{with rhel}
+     CFLAGS="$RPM_OPT_FLAGS -D__RHEL5_VIDEODEV2__"
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -95,6 +101,9 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Sun Dec 25 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-6
+- Patched videodev2 for RHEL5.
+
 * Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-5
 - Replaced BR tk for tkinter.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	24 Dec 2009 11:55:00 -0000	1.3
+++ import.log	25 Dec 2009 16:21:11 -0000	1.4
@@ -1,3 +1,4 @@
 fmtools-2_0-3_fc12:F-12:fmtools-2.0-3.fc12.src.rpm:1261394532
 fmtools-2_0-4_fc12:F-12:fmtools-2.0-4.fc12.src.rpm:1261650364
 fmtools-2_0-5_fc12:F-12:fmtools-2.0-5.fc12.src.rpm:1261655654
+fmtools-2_0-6_fc12:F-12:fmtools-2.0-6.fc12.src.rpm:1261758030



From petersen at fedoraproject.org  Fri Dec 25 16:21:58 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 16:21:58 +0000 (UTC)
Subject: rpms/ghc-fgl/devel ghc-fgl.spec,1.3,1.4
Message-ID: <20091225162158.01B8611C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-fgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21149

Modified Files:
	ghc-fgl.spec 
Log Message:
buildrequires ghc-mtl


Index: ghc-fgl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-fgl/devel/ghc-fgl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-fgl.spec	25 Dec 2009 15:56:06 -0000	1.3
+++ ghc-fgl.spec	25 Dec 2009 16:21:57 -0000	1.4
@@ -24,11 +24,14 @@ Source0:        http://hackage.haskell.o
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-rpm-macros >= 0.4.0
+BuildRequires:  ghc-mtl-devel
 %if %{with doc}
 BuildRequires:  ghc-doc
+BuildRequires:  ghc-mtl-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
+BuildRequires:  ghc-mtl-prof
 %endif
 
 %description
@@ -42,6 +45,7 @@ This package provides the shared library
 Summary:        %{common_summary} development files
 Group:          Development/Libraries
 %{?ghc_requires}
+Requires:       ghc-mtl-devel
 
 %description devel
 %{common_description}
@@ -54,6 +58,7 @@ This package contains the development fi
 Summary:        Documentation for %{common_summary}
 Group:          Development/Libraries
 %{?ghc_doc_requires}
+Requires:       ghc-mtl-doc
 
 %description doc
 %{common_description}
@@ -67,6 +72,7 @@ This package contains development docume
 Summary:        Profiling libraries for %{common_summary}
 Group:          Development/Libraries
 %{?ghc_prof_requires}
+Requires:       ghc-mtl-prof
 
 %description prof
 %{common_description}
@@ -151,6 +157,7 @@ fi
 - update for ghc-6.12.1: add shared library support
 - use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
 - add common_summary and common_description
+- buildrequires ghc-mtl
 
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 5.4.2.2-1
 - initial packaging for Fedora created by cabal2spec



From petersen at fedoraproject.org  Fri Dec 25 16:24:32 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 16:24:32 +0000 (UTC)
Subject: rpms/ghc-OpenGL/devel ghc-OpenGL.spec,1.5,1.6
Message-ID: <20091225162432.5338111C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-OpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21423

Modified Files:
	ghc-OpenGL.spec 
Log Message:
- update for ghc-6.12.1: add shared library support
- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
- add common_summary and common_description




Index: ghc-OpenGL.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-OpenGL/devel/ghc-OpenGL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ghc-OpenGL.spec	16 Sep 2009 09:30:12 -0000	1.5
+++ ghc-OpenGL.spec	25 Dec 2009 16:24:32 -0000	1.6
@@ -1,75 +1,79 @@
 %global pkg_name OpenGL
 
+%global common_summary Haskell %{pkg_name} library
+
+%global common_description Haskell bindings to the OpenGL graphics library.
+
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
-%global debug_package %{nil}
+#%%global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        2.2.1.1
-Release:        1%{?dist}
-Summary:        Haskell %{pkg_name} library
+Release:        2%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.haskell.org/haskellwiki/Opengl
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
-BuildRequires:  ghc-rpm-macros
-BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
+BuildRequires:  ghc, ghc-rpm-macros >= 0.4.0
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
 %endif
+BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.
-These provide bindings to the OpenGL graphics library.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
+%endif
 
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        %{common_summary} development files
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+%{?ghc_requires}
 Requires:       mesa-libGL-devel, mesa-libGLU-devel
 
 %description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the development files.
 
 
 %if %{with doc}
 %package doc
-Summary:        Documentation for %{name}
+Summary:        Documentation for %{common_summary}
 Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
+%{?ghc_doc_requires}
 
 %description doc
-This package contains development documentation files for the %{name} library.
+%{common_description}
+
+This package contains development documentation files.
 %endif
 
 
 %if %{with prof}
 %package prof
-Summary:        Profiling libraries for %{name}
+Summary:        Profiling libraries for %{common_summary}
 Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
+%{?ghc_prof_requires}
 
 %description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the profiling library.
 %endif
 
 
@@ -83,13 +87,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -98,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -107,10 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -121,9 +122,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -139,5 +149,10 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Jens Petersen <petersen at redhat.com> - 2.2.1.1-2
+- update for ghc-6.12.1: add shared library support
+- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
+- add common_summary and common_description
+
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.2.1.1-1
 - initial packaging for Fedora created by cabal2spec



From petersen at fedoraproject.org  Fri Dec 25 16:31:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 16:31:54 +0000 (UTC)
Subject: rpms/ghc-tar/devel ghc-tar.spec,1.3,1.4
Message-ID: <20091225163154.F1ABF11C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22543

Modified Files:
	ghc-tar.spec 
Log Message:
- update for ghc-6.12.1: add shared library support
- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
- add common_summary and common_description




Index: ghc-tar.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-tar/devel/ghc-tar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-tar.spec	28 Aug 2009 14:58:07 -0000	1.3
+++ ghc-tar.spec	25 Dec 2009 16:31:54 -0000	1.4
@@ -1,25 +1,28 @@
 %global pkg_name tar
 
+%global common_summary Haskell %{pkg_name} library
+
+%global common_description A Haskell %{pkg_name} library for ghc.
+
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
-%global debug_package %{nil}
+#%%global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        0.3.1.0
-Release:        1%{?dist}
-Summary:        Haskell %{pkg_name} library
+Release:        2%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.4.0
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -28,44 +31,46 @@ BuildRequires:  ghc-prof
 %endif
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
+%endif
 
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        %{common_summary} development files
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+%{?ghc_requires}
 
 %description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the development files.
 
 
 %if %{with doc}
 %package doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
+Summary:        Documentation for %{common_summary}
+Group:          Development/Libraries
+%{?ghc_doc_requires}
 
 %description doc
-This package contains development documentation files for the %{name} library.
+%{common_description}
+
+This package contains development documentation files.
 %endif
 
 
 %if %{with prof}
 %package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+Summary:        Profiling libraries for %{common_summary}
+Group:          Development/Libraries
+%{?ghc_prof_requires}
 
 %description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the profiling library.
 %endif
 
 
@@ -79,13 +84,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -94,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -103,10 +107,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -117,9 +119,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -135,6 +146,11 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Jens Petersen <petersen at redhat.com> - 0.3.1.0-2
+- update for ghc-6.12.1: add shared library support
+- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
+- add common_summary and common_description
+
 * Fri Aug 28 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.3.1.0-1
 - updated to latest upstream
 



From petersen at fedoraproject.org  Fri Dec 25 16:35:25 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 25 Dec 2009 16:35:25 +0000 (UTC)
Subject: rpms/ghc-GLUT/devel ghc-GLUT.spec,1.5,1.6
Message-ID: <20091225163525.8FC9611C00E6@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22979

Modified Files:
	ghc-GLUT.spec 
Log Message:
- update for ghc-6.12.1: add shared library support
- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
- add common_summary and common_description




Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/devel/ghc-GLUT.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ghc-GLUT.spec	14 Sep 2009 02:19:21 -0000	1.5
+++ ghc-GLUT.spec	25 Dec 2009 16:35:25 -0000	1.6
@@ -1,27 +1,31 @@
 %global pkg_name GLUT
 
+%global common_summary Haskell %{pkg_name} library
+
+%global common_description The Haskell %{pkg_name} library.\
+This is a set of bindings to the C %{pkg_name} library.
+
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
-%global debug_package %{nil}
+#%%global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        2.1.1.2
-Release:        2%{?dist}
-Summary:        Haskell %{pkg_name} library
+Release:        3%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.haskell.org/haskellwiki/Opengl
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  ghc, ghc-rpm-macros >= 0.4.0
 BuildRequires:  ghc-OpenGL-devel
-BuildRequires:  freeglut-devel
-BuildRequires:  ghc, ghc-rpm-macros
 %if %{with doc}
 BuildRequires:  ghc-doc
 BuildRequires:  ghc-OpenGL-doc
@@ -30,51 +34,53 @@ BuildRequires:  ghc-OpenGL-doc
 BuildRequires:  ghc-prof
 BuildRequires:  ghc-OpenGL-prof
 %endif
+BuildRequires:  freeglut-devel
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.
-This is a set of bindings to the C %{pkg_name} library.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
+%endif
 
 
 %package devel
-Summary:        Haskell %{pkg_name} library
+Summary:        %{common_summary} development files
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+%{?ghc_requires}
 Requires:       ghc-OpenGL-devel
 Requires:       freeglut-devel
 
 %description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the development files.
 
 
 %if %{with doc}
 %package doc
-Summary:        Documentation for %{name}
+Summary:        Documentation for %{common_summary}
 Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
+%{?ghc_doc_requires}
 Requires:       ghc-OpenGL-doc
 
 %description doc
-This package contains development documentation files for the %{name} library.
+%{common_description}
+
+This package contains development documentation files.
 %endif
 
 
 %if %{with prof}
 %package prof
-Summary:        Profiling libraries for %{name}
+Summary:        Profiling libraries for %{common_summary}
 Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
+%{?ghc_prof_requires}
 Requires:       ghc-OpenGL-prof
 
 %description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+
+This package contains the profiling library.
 %endif
 
 
@@ -88,13 +94,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -103,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -112,10 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -126,9 +129,18 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -144,6 +156,11 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-3
+- update for ghc-6.12.1: add shared library support
+- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
+- add common_summary and common_description
+
 * Mon Aug 31 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2
 - move BRs to source (base) package
 



From devrim at fedoraproject.org  Fri Dec 25 16:45:32 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 16:45:32 +0000 (UTC)
Subject: File mapserver-5.6.0.tar.gz uploaded to lookaside cache by devrim
Message-ID: <20091225164532.4DA0810F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mapserver:

14fe73a67fcc366025fdb678d9a7829d  mapserver-5.6.0.tar.gz



From devrim at fedoraproject.org  Fri Dec 25 16:47:21 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 25 Dec 2009 16:47:21 +0000 (UTC)
Subject: rpms/mapserver/devel .cvsignore, 1.13, 1.14 mapserver.spec, 1.35,
	1.36 sources, 1.15, 1.16
Message-ID: <20091225164722.006EA11C00E6@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24330

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
Update to 5.6.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Dec 2009 18:26:23 -0000	1.13
+++ .cvsignore	25 Dec 2009 16:47:21 -0000	1.14
@@ -1 +1 @@
-mapserver-5.6.0-rc1.tar.gz
+mapserver-5.6.0.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- mapserver.spec	4 Dec 2009 18:59:42 -0000	1.35
+++ mapserver.spec	25 Dec 2009 16:47:21 -0000	1.36
@@ -1,11 +1,11 @@
 Name:           mapserver
 Version:        5.6.0
-Release:        rc1_1%{?dist}
+Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
 URL:            http://mapserver.gis.umn.edu
-Source:         http://download.osgeo.org/mapserver/mapserver-%{version}-rc1.tar.gz
+Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd
 Requires:       bitstream-vera-sans-fonts
@@ -69,7 +69,7 @@ The Java/Mapscript extension provides fu
 within the Java programming language.
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 # fix spurious perm bits
 chmod -x tests/home.png
 chmod -x mapscript/php3/php_mapscript.c
@@ -239,6 +239,9 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Fri Dec 25 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.6.0-1
+- Update to 5.6.0
+
 * Fri Dec 4 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.6.0-rc1-1
 - Update to 5.6.0-rc1, which includes fixes described in:
   http://trac.osgeo.org/mapserver/browser/tags/rel-5-6-0-rc1/mapserver/HISTORY.TXT


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	4 Dec 2009 18:26:23 -0000	1.15
+++ sources	25 Dec 2009 16:47:21 -0000	1.16
@@ -1 +1 @@
-7dbf7151b75af8af87a67741f317bf2f  mapserver-5.6.0-rc1.tar.gz
+14fe73a67fcc366025fdb678d9a7829d  mapserver-5.6.0.tar.gz



From robert at fedoraproject.org  Fri Dec 25 17:03:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 25 Dec 2009 17:03:13 +0000 (UTC)
Subject: rpms/file/devel file.spec,1.113,1.114
Message-ID: <20091225170313.D906111C03B8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26132

Modified Files:
	file.spec 
Log Message:
removed broken install of example.py (%doc is much enough)



Index: file.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file/devel/file.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- file.spec	30 Nov 2009 11:05:17 -0000	1.113
+++ file.spec	25 Dec 2009 17:03:12 -0000	1.114
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -119,7 +119,6 @@ ln -s ../magic ${RPM_BUILD_ROOT}%{_datad
 cd python
 %{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}%{_datadir}/%{name}
-%{__install} -D example.py ${RPM_BUILD_ROOT}/%{_docdir}/python-magic-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -158,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec 25 2009 Robert Scheck <robert at fedoraproject.org> 5.03-17
+- removed broken install of example.py (%%doc is much enough)
+
 * Mon Nov 30 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-16
 - fixed the patch for multilib (#515767)
 



From lucilanga at fedoraproject.org  Fri Dec 25 17:29:05 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri, 25 Dec 2009 17:29:05 +0000 (UTC)
Subject: rpms/evolution-rss/F-12 evolution-rss-0.1.4-vers-detect.patch, NONE, 
	1.1 evolution-rss.spec, 1.45, 1.46
Message-ID: <20091225172905.4969B11C00E6@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29072

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-vers-detect.patch 
Log Message:
* Fri Dec 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-13
- upstream patch to fix evo version detection

evolution-rss-0.1.4-vers-detect.patch:
 configure.ac    |    2 +-
 m4/evolution.m4 |   19 +++++++++----------
 src/Makefile.am |    2 +-
 src/parser.c    |    5 +++++
 4 files changed, 16 insertions(+), 12 deletions(-)

--- NEW FILE evolution-rss-0.1.4-vers-detect.patch ---
diff -Naur evolution-rss-0.1.4/configure.ac evolution-rss-0.1.4-mod/configure.ac
--- evolution-rss-0.1.4/configure.ac	2009-08-25 15:13:05.000000000 +0300
+++ evolution-rss-0.1.4-mod/configure.ac	2009-12-25 18:26:07.000000000 +0200
@@ -35,7 +35,7 @@
 dnl locate libsoup flavour
 SOUP=
 PKG_CHECK_MODULES([LIBSOUP_24], libsoup-2.4, [SOUP=2.4], [SOUP=])
-if test "x$SOUP" != "x2.4" -a "$evolution_exec_int" -ge "22190"; then
+if test "x$SOUP" != "x2.4" -a "$evolution_version_int" -ge "22190"; then
 	AC_MSG_ERROR([libsoup-2.4 devel headers required])
 else
 if test "x$SOUP" != "x2.4"; then
diff -Naur evolution-rss-0.1.4/m4/evolution.m4 evolution-rss-0.1.4-mod/m4/evolution.m4
--- evolution-rss-0.1.4/m4/evolution.m4	2009-04-24 14:53:19.000000000 +0300
+++ evolution-rss-0.1.4-mod/m4/evolution.m4	2009-12-24 20:14:18.000000000 +0200
@@ -1,16 +1,16 @@
 #  Evoution RSS Reader Plugin
-#  Copyright (C) 2007-2008 Lucian Langa <cooly at gnome.eu.org> 
-#  
+#  Copyright (C) 2007-2008 Lucian Langa <cooly at gnome.eu.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 
+#  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
@@ -62,17 +62,16 @@
 fi
 AC_SUBST(EVOLUTION_VERSION)
 AC_MSG_RESULT($EVOLUTION_VERSION)
-AC_SUBST(EVOLUTION_BASE_VERSION)
 AC_SUBST(EVOLUTION_EXEC_VERSION)
 
-evolution_exec_int="$(echo "$EVOLUTION_EXEC_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')"
-if test "$evolution_exec_int" -ge "21100"; then
+evolution_version_int="$(echo "$EVOLUTION_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')"
+if test "$evolution_version_int" -ge "21100"; then
         AC_DEFINE_UNQUOTED(EVOLUTION_2_12,1, [evolution mail 2.12 present])
         AC_SUBST(EVOLUTION_2_12)
 fi
-AC_SUBST(evolution_exec_int)
+AC_SUBST(evolution_version_int)
 
-MINOR_VERSION="$(echo $EVOLUTION_EXEC_VERSION|cut -d. -f2|$AWK -F . '{print 1000 * [$]1}')"
+MINOR_VERSION="$(echo $EVOLUTION_VERSION|cut -d. -f2|$AWK -F . '{print 1000 * [$]1}')"
 AC_SUBST(MINOR_VERSION)
 
 dnl Evolution plugin install directory
diff -Naur evolution-rss-0.1.4/src/Makefile.am evolution-rss-0.1.4-mod/src/Makefile.am
--- evolution-rss-0.1.4/src/Makefile.am	2009-08-23 11:01:14.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/Makefile.am	2009-12-24 20:14:18.000000000 +0200
@@ -9,7 +9,7 @@
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""		\
 	-DLOCALEDIR="\"$(LOCALEDIR)\""				\
 	-DEVOLUTION_VERSION_STRING=\"$(EVOLUTION_EXEC_VERSION)\"\
-	-DEVOLUTION_VERSION=$(evolution_exec_int)		\
+	-DEVOLUTION_VERSION=$(evolution_version_int) 		\
 	-DDATASERVER_VERSION=$(DATASERVER_VERSION)		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"            	\
 	-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\"            	\
diff -Naur evolution-rss-0.1.4/src/parser.c evolution-rss-0.1.4-mod/src/parser.c
--- evolution-rss-0.1.4/src/parser.c	2009-12-25 18:15:28.000000000 +0200
+++ evolution-rss-0.1.4-mod/src/parser.c	2009-12-25 18:36:29.000000000 +0200
@@ -932,6 +932,11 @@
 		//handle multiple enclosures
 		encl = layer_find_innerelement(top, "enclosure", "url",	// RSS 2.0 Enclosure
 			layer_find_innerelement(top, "link", "enclosure", NULL)); 		// ATOM Enclosure
+		//handle screwed feeds that set url to "" (feed does not validate!)
+		if (encl && !strlen(encl)) {
+					g_free(encl);
+					encl = NULL;
+		}
 //		encl = layer_find_tag_prop(el->children, "media", "url",	// RSS 2.0 Enclosure
 //							NULL); 		// ATOM Enclosure
 		//we have to free this somehow


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- evolution-rss.spec	8 Dec 2009 18:14:25 -0000	1.45
+++ evolution-rss.spec	25 Dec 2009 17:29:04 -0000	1.46
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	12%{?dist}
+Release:	13%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -25,6 +25,7 @@ Patch5:		evolution-rss-0.1.4-empty-sourc
 Patch6:		evolution-rss-0.1.4-reject-empty-url.patch
 Patch7:		evolution-rss-0.1.4-opml-fix.patch
 Patch8:		evolution-rss-0.1.4-status-icon.patch
+Patch9:		evolution-rss-0.1.4-vers-detect.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -57,8 +58,11 @@ This is an evolution plugin which enable
 %patch6 -p1 -b .reject-empty-url
 %patch7 -p1 -b .opml-fix
 %patch8 -p1 -b .status-icon
+%patch9 -p1 -b .vers-detect
 
 %build
+autoconf
+automake
 %configure --with-primary-render=gecko
 make %{?_smp_mflags}
 
@@ -110,6 +114,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Fri Dec 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-13
+- upstream patch to fix evo version detection
+
 * Tue Dec 08 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-12
 - upstream patch to fix status icon crash
 



From robert at fedoraproject.org  Fri Dec 25 17:37:51 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 25 Dec 2009 17:37:51 +0000 (UTC)
Subject: rpms/memtest86+/devel memtest86+.spec,1.52,1.53
Message-ID: <20091225173751.D0C7211C00E6@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30106

Modified Files:
	memtest86+.spec 
Log Message:
Removed obsolete build requirement to compat-gcc-34 (#442285)



Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- memtest86+.spec	13 Oct 2009 18:58:40 -0000	1.52
+++ memtest86+.spec	25 Dec 2009 17:37:51 -0000	1.53
@@ -7,7 +7,7 @@
 
 Name:     memtest86+
 Version:  4.00
-Release:  2%{?dist}
+Release:  3%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -18,7 +18,6 @@ URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
 BuildRequires: %{_includedir}/gnu/stubs-32.h
-BuildRequires: compat-gcc-34
 Requires: /sbin/grubby sed coreutils
 ExclusiveArch: %{ix86} x86_64
 
@@ -84,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 25 2009 Robert Scheck <robert at fedoraproject.org> - 4.00-3
+- Removed obsolete build requirement to compat-gcc-34 (#442285)
+
 * Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
 - Fix memtest-setup on systems without a separate /boot
   filesystem (#528651)



From pbrobinson at fedoraproject.org  Fri Dec 25 17:55:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 25 Dec 2009 17:55:55 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.20,1.21
Message-ID: <20091225175555.2C10A11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32108

Modified Files:
	rygel.spec 
Log Message:
- fix changelog date


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- rygel.spec	22 Dec 2009 15:34:50 -0000	1.20
+++ rygel.spec	25 Dec 2009 17:55:53 -0000	1.21
@@ -94,7 +94,7 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
-* Tue Nov 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.8-1
+* Tue Dec 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.8-1
 - Update to 0.4.8
 
 * Sat Nov 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.6-1



From nb at fedoraproject.org  Fri Dec 25 19:45:12 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 25 Dec 2009 19:45:12 +0000 (UTC)
Subject: rpms/spamassassin/F-11 Makefile, 1.3, 1.4 sa-update.cronscript, 1.4, 
	1.5 sources, 1.42, 1.43 spamassassin.spec, 1.112, 1.113
Message-ID: <20091225194512.C755311C03AD@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/spamassassin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10645

Modified Files:
	Makefile sa-update.cronscript sources spamassassin.spec 
Log Message:
Upgrade to SpamAssassin 3.3.0-rc1




Index: sa-update.cronscript
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-11/sa-update.cronscript,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sa-update.cronscript	13 Feb 2007 20:58:07 -0000	1.4
+++ sa-update.cronscript	25 Dec 2009 19:45:11 -0000	1.5
@@ -1,5 +1,22 @@
 #!/bin/bash
+# *** DO NOT MODIFY THIS FILE ***
+# Edit /etc/cron.d/sa-update to enable nightly automatic updates
+# /etc/mail/spamassassin/sa-update-channels.txt 
+#     Specify custom channels here
+# /etc/mail/spamassassin/sa-update-keys.txt
+#     Specify trusted GPG keys for custom channels here
 
+# Sleep random amount of time before proceeding to avoid overwhelming the servers
 sleep $(expr $RANDOM % 7200)
-# Only restart spamd if sa-update returns 0, meaning it updated the rules
-/usr/bin/sa-update && /etc/init.d/spamassassin condrestart > /dev/null
+
+# sa-update must create keyring
+if [ ! -d /etc/mail/spamassassin/sa-update-keys ]; then
+    sa-update
+fi
+# Import SOUGHT key
+sa-update --import /usr/share/spamassassin/sought-pubkey.txt
+
+# Update rules with sa-update, restart spamd if rules were updated
+/usr/bin/sa-update --channelfile /etc/mail/spamassassin/sa-update-channels.txt \
+                   --gpgkeyfile  /etc/mail/spamassassin/sa-update-keys.txt     && \
+                   /etc/init.d/spamassassin condrestart > /dev/null


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	27 Jun 2008 14:17:32 -0000	1.42
+++ sources	25 Dec 2009 19:45:11 -0000	1.43
@@ -1 +1,2 @@
-695f9107b240383e48df8938f2de334e  Mail-SpamAssassin-3.2.5.tar.bz2
+41a68daf1bae2ded652a74c77b1fb498  Mail-SpamAssassin-3.3.0-rc1.proposed2.tar.bz2
+a7f03934e048ad6f277b55e95ed8e3ca  Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-11/spamassassin.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- spamassassin.spec	26 Feb 2009 02:17:23 -0000	1.112
+++ spamassassin.spec	25 Dec 2009 19:45:11 -0000	1.113
@@ -1,6 +1,8 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
 #%%define rhel 4
 
+#%define _source_filedigest_algorithm md5
+
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
 %{?!fedora:%define fedora 0}
@@ -14,16 +16,15 @@
 %define fedora 6
 %define dist .el5
 %endif
+%if 0%{?rhel} == 6
+%define fedora 12
+%define dist .el6
+%endif
 
 # Define variables to use in conditionals
-%define option_archive_tar 0
 %define option_ssl 0
 %define perl_devel 0
-
-# perl-Archive-Tar (FC2+, RHEL4.6+)
-%if 0%{?fedora} > 1
-%define option_archive_tar 1
-%endif
+%define dkim_deps  0
 
 # SSL and IPv6 (FC6+, RHEL5+)
 %if 0%{?fedora} > 5
@@ -35,17 +36,31 @@
 %define perl_devel 1
 %endif
 
+%if 0%{?fedora} >= 10
+# We use portreserve to prevent our TCP port being stolen.
+# Require the package here so that we know /etc/portreserve/ exists.
+Requires: portreserve
+%endif
+
+# Mail::DKIM by default (F11+)
+%if 0%{?fedora} >= 11
+%define dkim_deps 1
+%endif
+
 %define real_name Mail-SpamAssassin
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
-Version: 3.2.5
-Release: 5%{?dist}
+Version: 3.3.0
+%define prename rc1
+%define proposed .proposed2
+Release: 0.26.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
+Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -54,10 +69,12 @@ Source6: sa-update.logrotate
 Source7: sa-update.crontab
 Source8: sa-update.cronscript
 Source10: spamassassin-helper.sh
+Source11: sa-update-channels.txt
+Source12: sa-update-keys.txt
+Source13: sought-pubkey.txt
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-#Patch100: Mail-SpamAssassin-3.2.2-bug5574-setuid.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
@@ -68,6 +85,7 @@ BuildRequires: perl >= 2:5.8.0
 BuildRequires: perl(Net::DNS)
 BuildRequires: perl(Time::HiRes)
 BuildRequires: perl(HTML::Parser)
+BuildRequires: perl(NetAddr::IP)
 BuildRequires: openssl-devel
 
 Requires: perl(HTTP::Date)
@@ -75,16 +93,16 @@ Requires: perl(LWP::UserAgent)
 Requires: perl(Net::DNS)
 Requires: perl(Time::HiRes)
 Requires: perl(DB_File)
+Requires: perl(Encode::Detect)
 Requires: procmail
 Requires: gnupg
 
-# Hard requirement
+# Hard requirements
 BuildRequires: perl-HTML-Parser >= 3.43
 Requires: perl-HTML-Parser >= 3.43
-
-%if %{option_archive_tar}
+BuildRequires: perl(Archive::Tar)
 Requires: perl(Archive::Tar)
-%endif
+
 %if %{option_ssl}
 # Needed for spamc/spamd SSL
 Requires: perl(IO::Socket::SSL)
@@ -94,6 +112,12 @@ Requires: perl(IO::Socket::INET6)
 %if %{perl_devel}
 BuildRequires: perl-devel
 %endif
+# Mail::DKIM for F12+, works from RHEL5+ from EPEL5 but we don't require them
+%if %{dkim_deps}
+Requires: perl(Mail::DKIM)
+%endif
+
+
 
 Obsoletes: perl-Mail-SpamAssassin
 
@@ -119,7 +143,7 @@ To filter spam for all users, add that l
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-#%patch100 -p0
+
 # end of patches
 
 %build
@@ -152,12 +176,18 @@ install -m 0644 %{SOURCE6} %buildroot/et
 install -m 0644 %{SOURCE7} %buildroot/etc/cron.d/sa-update
 # installed mode 744 as non root users can't run it, but can read it.
 install -m 0744 %{SOURCE8} %buildroot%{_datadir}/spamassassin/sa-update.cron
+install -m 0644 %{SOURCE13} %buildroot%{_datadir}/spamassassin/
 
 [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
 
 find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 
+# Default rules from separate tarball
+cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
+tar xfvz %{SOURCE1}
+cd -
+
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
         grep -v perllocal.pod |
@@ -172,6 +202,14 @@ find $RPM_BUILD_ROOT%{perl_vendorlib}/* 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/spamassassin
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
 
+# sa-update channels and keys
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
+install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
+
+# Tell portreserve which port we want it to protect.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
+echo 783 > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/spamd
+
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
 %doc LICENSE NOTICE CREDITS Changes README TRADEMARK UPGRADE
@@ -184,6 +222,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 %dir %{_localstatedir}/run/spamassassin
 %dir %{_localstatedir}/lib/spamassassin
 %config(noreplace) %{_sysconfdir}/logrotate.d/sa-update
+%config(noreplace) %{_sysconfdir}/portreserve/spamd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -222,6 +261,57 @@ fi
 exit 0
 
 %changelog
+* Mon Dec 21 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.26.rc1
+- 3.3.0-rc1.proposed2 with fixed spamc
+
+* Mon Dec 21 2009 Nick Bebout <nb at fedoraproject.org> - 3.3.0-0.24.beta1
+- Revert to beta1 to fix major error where spamc does nothing and mail
+  is lost into black hole.
+
+* Fri Dec 18 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.23.rc1
+- 3.3.0-rc1
+- Bug #103401: portreserve protect spamd port 783 on F-10+
+
+* Thu Dec 03 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.21.beta1
+- 3.3.0-beta1
+
+* Fri Nov 20 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.20.svn882672
+- svn882672 snapshot
+
+* Thu Nov 12 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.19.svn816416
+- Encode::Detect is important to spamassassin
+
+* Thu Sep 24 2009 Warren Togami <wtogami at redhat.com> - 3.3.3-0.18.svn816416
+- Enable SOUGHT ruleset in nightly sa-update http://wiki.apache.org/spamassassin/SoughtRules
+  You must enable the sa-update cron job manually in /etc/cron.d/sa-update
+- Custom channels may be specified in these config files:
+      /etc/mail/spamassassin/sa-update-channels.txt
+      /etc/mail/spamassassin/sa-update-keys.txt
+
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.3-0.14.svn816416
+- 3.3.0 svn816416 snapshot, pre-alpha3
+  Upstream just fixed important bug SA#6206.  Many other bugs fixed since alpha2.
+
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.13.alpha2
+- F11+ requires Mail::DKIM
+
+* Sun Sep 13 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.12.alpha2
+- require perl(Mail::DKIM), useful due to USER_IN_DEF_DKIM_WL
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-0.6.alpha2
+- rebuilt with new openssl
+
+* Mon Aug 10 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.5.alpha1
+- 3.3.0-alpha2
+
+* Tue Jul 07 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.2.alpha1
+- Include default rules to prevent mass confusion and complaints.
+  You should really use sa-update though.  Really.
+  Edit /etc/cron.d/sa-update to automate it.
+
+* Mon Jul 06 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.1.alpha1
+- 3.3.0-alpha1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From nb at fedoraproject.org  Fri Dec 25 19:46:53 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 25 Dec 2009 19:46:53 +0000 (UTC)
Subject: rpms/spamassassin/F-11 sa-update-channels.txt, NONE,
	1.1 sa-update-keys.txt, NONE, 1.1 sought-pubkey.txt, NONE, 1.1
Message-ID: <20091225194653.426C111C00E6@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/spamassassin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10807

Added Files:
	sa-update-channels.txt sa-update-keys.txt sought-pubkey.txt 
Log Message:
Adding new files for SA 3.3.0


--- NEW FILE sa-update-channels.txt ---
updates.spamassassin.org
sought.rules.yerp.org


--- NEW FILE sa-update-keys.txt ---
# SOUGHT anti-fraud ruleset
6C6191E3


--- NEW FILE sought-pubkey.txt ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.1 (GNU/Linux)

mQGiBEa/l+YRBACC+uJfIThEoEWrNxdDD/1tAwb5L8v7H3gGt+LtuOwwn5ZU7XsT
s1DOok1oZVRnTQJYdlth7QlU9wqijwLEVzW1LDWnxXXKwPmlTlkcdGoBcb+cBbYI
miJ/TlAetvbprcZdROS4Ey31GjPRmWPPnVE2Xcwy+e4+RmnhqfZBmOaE7wCgo1GG
pkik2OPD1le4LGGOGHL5HiED/0TyvTiSS3NnUtoDFQAPrnezOCjxv8zMjYEnJs/I
h7uyIgHRsbB75cD2O1LWyO8Vz8r/snVuG35zcZagPf/7Tc9AJoaxVmCIk9DEmWZp
iuvqpMhwHAbNvY3jY2oKsDl1rNx0IIctoJwjXia99kvNTHK/Yz/HqhIyLModhiMB
aYYZA/wIdPOHGHaP5vjlbWBwGlRR9m0Rf4ob5sul8MjCyehOYcRVLwfOEfzX308v
0enOGnbbBKXU2QvA0Z068aBmJkJaaPhlIjZApQJDsb7pt6k8jMPj/Xpr779wAFQ8
IZC7Tw21OtqkjrUb3dZlEljrTwWNc6FVxuIidBBg7HCdP24WKLRESnVzdGluIE1h
c29uIFNpZ25pbmcgS2V5IChDb2RlIFNpZ25pbmcgT25seSkgPHNpZ25pbmdrZXlA
am1hc29uLm9yZz6IZAQTEQIAJAUCRr+X5gIbAwUJEswDAAYLCQgHAwIDFQIDAxYC
AQIeAQIXgAAKCRDchTQfbGGR4/GJAKCC6X6AF8nM+H00b/XeZl9vYihXBgCcDYuU
AtXjWWxndkneakmbnD0O4Z25BA0ERr+YdxAQAIYYUQHMzVsRAzpIRLfni0aeczrr
armwXMJ8y5p74lVLbJyQOjkQyIJWP80twrN8SjNyUFBr/52SlOPOuAbGZY1ZKpux
vkbsug2wWvkoj8xGjnexrSDahRgpNhf/otLRNTyUFZTM6mjZt0ItnYDl6xszY4kd
O5rVzjQuivNB4BsHcd8qQ7zVo9+VZ5R77iM4dtk6t5ycpXlAom5pD8qLb7ZzTVe0
SuhzOeynF51rwjS+wa3hzZisvJqZA5uJcAyYslgP1UTW+2e5wutSktSZmL/XnlEF
p86GPjAgDPL2Q0TgzVL6sPt0blNCyzOJrcBqBHrgZfraYgqtmGepLpk72q4VD23c
aV2wTqjnfJAsNR3y8jgVNwF8LpXtlbxrBByFRwEqsc/gzdMEnJ728XBDqT2IhZLY
maL/WxiDKNWD/Mae69HTyInIYgrfT7nJKDeKQA81+e5+UmqBVoi5/AICMlDm1DgR
gG6bbOXGhLVPh+gHjGG4Jdd/ZLedncUsjW9KyK261sqM3tSDSfgnF99w2/32ToFu
ChN8JOfQ6VZ7QbL1BWRtQWZ3tyauUUXmsrYDv1w1nx51MqxQdlitnmTRWaRW0GmD
b5XapJfSK+FiGXaynl3HHxHHpcUauX9zBa/LRp8oXiGPLfJEWmjWcGCyGZawASj3
pTTJUnbkYs0fUyUXAAQND/42mh8f3mTA+24I3lY4K8mxH9GSFgOkLoYwok8xL5Md
OUJAyvs34ixqvM2u560YJkegEO/xzg2abddfoqL8eNnjfvG3bI7KOCT+m+mM/5Cg
ul8XFSnHIEivuOXNtc/x/dwYSidKM8atkdpKtv++psd6hVbJQMfLlzf0S2QyiaGk
yXur/pM3A97lvkjAgvIKQt8NbJ/sITFlrN2TFxcbE8OED7LC4nBo54TJ1AxVsHlT
LB5XPKU8pBv0fABZrNKxf6a2iXx9jT9sSYdnb0y+hBjnoWZUNbhxo6jpAqt1quUy
buGWugvG8J75JvT6X+lwEEkg1lplmm+HuaFtegOqTUTKmffKduY+E00le+3Kh8gW
bLR8P1qp/xnxQxZJYcQ+mT4QsYpj6Pkcj0ON3NQO5wP6dr2UGhGcSzS2Cxv8TERN
7HSdFbFXQWPCekx+i7OjeRSY/XTUf2zYquPNP2oU0MjgnXhnkHq+6EaQPpM59fMd
MyLeOiUMOxpPOkeaAC8Ku0Oj2aZU/eyizuBDnhq1PAxBprSW5SSkxP4kz9BnA42x
tkMKMzzPohdfMIRI6zSu0chr76w2UeoViSsMtmWnR6qAXbQvzR+HHxhhB/Rzp6Gc
u9gybrv58IBkybn5ztST6NqgIgcQ/E7XIsB0Eooohfw+QiPlCdoghSxspbzwqcEZ
B4hPBBgRAgAPBQJGv5h3AhsMBQkSzAMAAAoJENyFNB9sYZHjUh0AnA3u5TNYHGLQ
DXLPP0qWHkTeOz8dAJ4wkrLBTaXz3CPCjoTdoBiQsNt3fw==
=nK43
-----END PGP PUBLIC KEY BLOCK-----



From mschwendt at fedoraproject.org  Fri Dec 25 21:14:52 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 25 Dec 2009 21:14:52 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.69,1.70
Message-ID: <20091225211452.E61CB11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19937

Modified Files:
	audacious-plugins.spec 
Log Message:
* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
- Remove BR libtimidity-devel as that plugin is no longer available.



Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- audacious-plugins.spec	25 Dec 2009 12:34:29 -0000	1.69
+++ audacious-plugins.spec	25 Dec 2009 21:14:51 -0000	1.70
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -46,7 +46,6 @@ BuildRequires: flac-devel
 BuildRequires: libmodplug-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: libshout-devel
-BuildRequires: libtimidity-devel
 BuildRequires: curl-devel
 BuildRequires: libbinio-devel
 BuildRequires: libcdio-devel
@@ -257,6 +256,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
+- Remove BR libtimidity-devel as that plugin is no longer available.
+
 * Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
 - Let bluetooth plugin access "alsa-gapless" config values not "alsa"
   as it will be called in post-2.2.



From cassmodiah at fedoraproject.org  Fri Dec 25 21:27:30 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 25 Dec 2009 21:27:30 +0000 (UTC)
Subject: File i3-3.d-bf1.tar.bz2 uploaded to lookaside cache by cassmodiah
Message-ID: <20091225212730.8DB5810F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for i3:

f2271064640d67c8a618c8c79451da75  i3-3.d-bf1.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 25 21:28:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Dec 2009 21:28:46 +0000 (UTC)
Subject: File kde-settings-4.4-5.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091225212846.3F46510F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kde-settings:

68913c1cc0368b77a810b17e4703b04b  kde-settings-4.4-5.tar.bz2



From cassmodiah at fedoraproject.org  Fri Dec 25 21:29:16 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 25 Dec 2009 21:29:16 +0000 (UTC)
Subject: rpms/i3/devel .cvsignore, 1.2, 1.3 i3.spec, 1.1, 1.2 import.log, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20091225212916.DE10D11C00E6@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21345/devel

Modified Files:
	.cvsignore i3.spec import.log sources 
Log Message:
3.d -> 3.d-bf1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/i3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Dec 2009 19:50:03 -0000	1.2
+++ .cvsignore	25 Dec 2009 21:29:16 -0000	1.3
@@ -1 +1 @@
-i3-3.d.tar.bz2
+i3-3.d-bf1.tar.bz2


Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/devel/i3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- i3.spec	2 Dec 2009 19:50:03 -0000	1.1
+++ i3.spec	25 Dec 2009 21:29:16 -0000	1.2
@@ -1,12 +1,14 @@
+%global upstream_version -bf1
+
 Name:           i3
 Version:        3.d
-Release:        1%{?dist}
+Release:        bf1_1%{?dist}
 Summary:        Improved tiling window manager
 
 Group:          User Interface/Desktops
 License:        BSD
 URL:            http://i3.zekjur.net
-Source0:        http://i3.zekjur.net/downloads/%{name}-%{version}.tar.bz2
+Source0:        http://i3.zekjur.net/downloads/%{name}-%{version}-bf1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xcb-util-devel
@@ -17,6 +19,7 @@ BuildRequires:  libxkbfile-devel
 BuildRequires:  libX11-devel
 BuildRequires:  bison
 BuildRequires:  flex
+Requires:       rxvt-unicode
 
 
 %description
@@ -31,7 +34,7 @@ Please be aware that i3 is primarily tar
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-bf1
 
 #####          I M P O R T A N T         #####
 ##### !!!! TO CHECK ON EVERY UPDATE !!!! #####
@@ -44,12 +47,15 @@ sed -e 's|CFLAGS += -Wunused|CFLAGS += -
 
 
 %build
+export CFLAGS
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+make install \
+     DESTDIR=%{buildroot} \
+     INSTALL="install -p"
 
 
 %clean
@@ -58,16 +64,19 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc GOALS LICENSE TODO
+%doc GOALS LICENSE RELEASE-NOTES-%{version}-bf1
 %{_bindir}/%{name}
 %{_bindir}/%{name}-input
 %{_bindir}/%{name}-msg
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/config
-%{_sysconfdir}/%{name}/welcome
+%config %{_sysconfdir}/%{name}/welcome
 %{_datadir}/xsessions/%{name}.desktop
 
 
 %changelog
+* Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-bf1_1
+- New upstream release
+
 * Wed Dec 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-1
 - Package build for Fedora


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/i3/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Dec 2009 19:50:03 -0000	1.1
+++ import.log	25 Dec 2009 21:29:16 -0000	1.2
@@ -1 +1,2 @@
 i3-3_d-1_fc12:HEAD:i3-3.d-1.fc12.src.rpm:1259783250
+i3-3_d-bf1_1_fc12:HEAD:i3-3.d-bf1_1.fc12.src.rpm:1261776426


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/i3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Dec 2009 19:50:03 -0000	1.2
+++ sources	25 Dec 2009 21:29:16 -0000	1.3
@@ -1 +1 @@
-dc648c0bbf711d6691c981f665c7c54c  i3-3.d.tar.bz2
+f2271064640d67c8a618c8c79451da75  i3-3.d-bf1.tar.bz2



From cassmodiah at fedoraproject.org  Fri Dec 25 21:29:19 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 25 Dec 2009 21:29:19 +0000 (UTC)
Subject: rpms/i3/F-12 .cvsignore, 1.2, 1.3 i3.spec, 1.1, 1.2 import.log, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20091225212919.8FFA211C00E6@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21359/F-12

Modified Files:
	.cvsignore i3.spec import.log sources 
Log Message:
3.d -> 3.d-bf1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Dec 2009 19:50:05 -0000	1.2
+++ .cvsignore	25 Dec 2009 21:29:19 -0000	1.3
@@ -1 +1 @@
-i3-3.d.tar.bz2
+i3-3.d-bf1.tar.bz2


Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/i3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- i3.spec	2 Dec 2009 19:50:05 -0000	1.1
+++ i3.spec	25 Dec 2009 21:29:19 -0000	1.2
@@ -1,12 +1,14 @@
+%global upstream_version -bf1
+
 Name:           i3
 Version:        3.d
-Release:        1%{?dist}
+Release:        bf1_1%{?dist}
 Summary:        Improved tiling window manager
 
 Group:          User Interface/Desktops
 License:        BSD
 URL:            http://i3.zekjur.net
-Source0:        http://i3.zekjur.net/downloads/%{name}-%{version}.tar.bz2
+Source0:        http://i3.zekjur.net/downloads/%{name}-%{version}-bf1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xcb-util-devel
@@ -17,6 +19,7 @@ BuildRequires:  libxkbfile-devel
 BuildRequires:  libX11-devel
 BuildRequires:  bison
 BuildRequires:  flex
+Requires:       rxvt-unicode
 
 
 %description
@@ -31,7 +34,7 @@ Please be aware that i3 is primarily tar
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-bf1
 
 #####          I M P O R T A N T         #####
 ##### !!!! TO CHECK ON EVERY UPDATE !!!! #####
@@ -44,12 +47,15 @@ sed -e 's|CFLAGS += -Wunused|CFLAGS += -
 
 
 %build
+export CFLAGS
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+make install \
+     DESTDIR=%{buildroot} \
+     INSTALL="install -p"
 
 
 %clean
@@ -58,16 +64,19 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc GOALS LICENSE TODO
+%doc GOALS LICENSE RELEASE-NOTES-%{version}-bf1
 %{_bindir}/%{name}
 %{_bindir}/%{name}-input
 %{_bindir}/%{name}-msg
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/config
-%{_sysconfdir}/%{name}/welcome
+%config %{_sysconfdir}/%{name}/welcome
 %{_datadir}/xsessions/%{name}.desktop
 
 
 %changelog
+* Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-bf1_1
+- New upstream release
+
 * Wed Dec 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-1
 - Package build for Fedora


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Dec 2009 19:50:05 -0000	1.1
+++ import.log	25 Dec 2009 21:29:19 -0000	1.2
@@ -1 +1,2 @@
 i3-3_d-1_fc12:F-12:i3-3.d-1.fc12.src.rpm:1259783250
+i3-3_d-bf1_1_fc12:F-12:i3-3.d-bf1_1.fc12.src.rpm:1261776428


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Dec 2009 19:50:05 -0000	1.2
+++ sources	25 Dec 2009 21:29:19 -0000	1.3
@@ -1 +1 @@
-dc648c0bbf711d6691c981f665c7c54c  i3-3.d.tar.bz2
+f2271064640d67c8a618c8c79451da75  i3-3.d-bf1.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 25 21:53:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Dec 2009 21:53:31 +0000 (UTC)
Subject: File kde-settings-4.4-6.tar.bz2 uploaded to lookaside cache by rdieter
Message-ID: <20091225215331.7600710F8CD@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kde-settings:

20c30eb68625b8c52413b31d98baac62  kde-settings-4.4-6.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 25 21:55:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Dec 2009 21:55:27 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.71, 1.72 kde-settings.spec,
	1.100, 1.101 sources, 1.73, 1.74
Message-ID: <20091225215527.C250411C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24514

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Fri Dec 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-6
- use qtcurve-gtk2 by default (#547700)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	24 Dec 2009 02:23:29 -0000	1.71
+++ .cvsignore	25 Dec 2009 21:55:27 -0000	1.72
@@ -1 +1 @@
-kde-settings-4.4-4.tar.bz2
+kde-settings-4.4-6.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- kde-settings.spec	24 Dec 2009 02:23:29 -0000	1.100
+++ kde-settings.spec	25 Dec 2009 21:55:27 -0000	1.101
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F13 ONLY!
 
-%define rel 4
+%define rel 6
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -160,6 +160,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Fri Dec 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-6
+- use qtcurve-gtk2 by default (#547700)
+
 * Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-4
 - enable nepomuk, with some conservative defaults (#549436)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	24 Dec 2009 02:23:29 -0000	1.73
+++ sources	25 Dec 2009 21:55:27 -0000	1.74
@@ -1 +1 @@
-81ae3bbf0fe3c2e7a633f83cd6e9a1fa  kde-settings-4.4-4.tar.bz2
+20c30eb68625b8c52413b31d98baac62  kde-settings-4.4-6.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 25 22:01:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Dec 2009 22:01:11 +0000 (UTC)
Subject: rpms/kcm-gtk/devel kcm-gtk.spec,1.3,1.4
Message-ID: <20091225220111.0AAF911C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kcm-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25320

Modified Files:
	kcm-gtk.spec 
Log Message:
* Fri Dec 25 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-3
- GTK2_RC_FILES handling moved to kde-settings (#547700)



Index: kcm-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/devel/kcm-gtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kcm-gtk.spec	20 Dec 2009 10:53:14 -0000	1.3
+++ kcm-gtk.spec	25 Dec 2009 22:01:10 -0000	1.4
@@ -1,10 +1,14 @@
 
 # Fedora package review: http://bugzilla.redhat.com/530342
 
+%if 0%{?fedora} && 0%{?fedora} < 13
+%define env_script 1
+%endif
+
 Summary: Configure the appearance of GTK apps in KDE 
 Name:    kcm-gtk 
 Version: 0.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
@@ -63,7 +67,7 @@ make install/fast DESTDIR=%{buildroot} -
 
 %find_lang kcm_gtk
 
-install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/kcm-gtk.sh
+%{?env_script:install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/kcm-gtk.sh}
 
 
 %clean
@@ -73,13 +77,16 @@ rm -rf %{buildroot} 
 %files -f kcm_gtk.lang
 %defattr(-,root,root,-)
 %doc Changelog COPYING
-%{_sysconfdir}/kde/env/kcm-gtk.sh
+%{?env_script:%{_sysconfdir}/kde/env/kcm-gtk.sh}
 %{_kde4_libdir}/kde4/kcm_gtk.so
 %{_kde4_iconsdir}/kcm_gtk.png
 %{_kde4_datadir}/kde4/services/kcmgtk.desktop
 
 
 %changelog
+* Fri Dec 25 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-3
+- GTK2_RC_FILES handling moved to kde-settings (#547700)
+
 * Sun Dec 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.3-2
 - fix missing umlauts and sharp s in the German translation
 



From epienbro at fedoraproject.org  Fri Dec 25 22:02:24 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 25 Dec 2009 22:02:24 +0000 (UTC)
Subject: File nntpgrab-0.5.90.tar.bz2 uploaded to lookaside cache by epienbro
Message-ID: <20091225220224.11D5C10F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for nntpgrab:

5ba5feb638e2d2ac5d896ffe8616668d  nntpgrab-0.5.90.tar.bz2



From epienbro at fedoraproject.org  Fri Dec 25 22:09:47 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 25 Dec 2009 22:09:47 +0000 (UTC)
Subject: rpms/nntpgrab/EL-5 .cvsignore, 1.22, 1.23 nntpgrab.spec, 1.39,
	1.40 sources, 1.25, 1.26
Message-ID: <20091225220947.855C811C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26460/EL-5

Modified Files:
	.cvsignore nntpgrab.spec sources 
Log Message:
Update to 0.5.90 (0.6 Beta 1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	19 Jul 2009 19:44:50 -0000	1.22
+++ .cvsignore	25 Dec 2009 22:09:46 -0000	1.23
@@ -1 +1 @@
-nntpgrab-0.5.1.tar.bz2
+nntpgrab-0.5.90.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/nntpgrab.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- nntpgrab.spec	19 Jul 2009 19:44:50 -0000	1.39
+++ nntpgrab.spec	25 Dec 2009 22:09:46 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.5.1
+Version: 0.5.90
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -29,14 +29,17 @@ BuildRequires:	dbus-devel
 BuildRequires:	intltool
 BuildRequires:	libsoup-devel
 BuildRequires:	par2cmdline
+BuildRequires:	NetworkManager-glib-devel
 %if 0%{?rhel} > 0
-BuildRequires:  pcre-devel
-BuildRequires:  curl-devel
-BuildRequires:  openssl-devel
+BuildRequires:	pcre-devel
+BuildRequires:	curl-devel
+BuildRequires:	openssl-devel
 %endif
 %if 0%{?fedora} > 0
-BuildRequires:  nss-devel
-BuildRequires:  nss_compat_ossl-devel
+BuildRequires:	libproxy-devel
+BuildRequires:	PolicyKit-gnome-devel
+BuildRequires:	nss-devel
+BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
 %endif
 
@@ -157,13 +160,17 @@ rm %{buildroot}%{_libdir}/nntpgrab/libnn
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0
 mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
 
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
-
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
 
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so.0
@@ -180,8 +187,9 @@ rm %{buildroot}%{_libdir}/libnntpgrab_ut
 rm %{buildroot}%{_libdir}/libnntpgrab_automation.la
 rm %{buildroot}%{_libdir}/libnntpgrab_gui_base.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.la
 
@@ -225,9 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/libnntpgrab_glue.so.0
 %{_libdir}/libnntpgrab_glue.so.0.0.0
 %dir %{_libdir}/nntpgrab
-%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
-%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
 %{_datadir}/pixmaps/nntpgrab.png
@@ -276,7 +285,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 %{_datadir}/nntpgrab/web
 
+
 %changelog
+* Fri Dec 25 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.90-1
+- Update to 0.5.90 (0.6 Beta 1)
+
 * Sun Jul 19 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.1-1
 - Update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	19 Jul 2009 19:44:50 -0000	1.25
+++ sources	25 Dec 2009 22:09:46 -0000	1.26
@@ -1 +1 @@
-e9b9f2e1f8882c7e93e4f2c7d6325f9d  nntpgrab-0.5.1.tar.bz2
+5ba5feb638e2d2ac5d896ffe8616668d  nntpgrab-0.5.90.tar.bz2



From epienbro at fedoraproject.org  Fri Dec 25 22:09:47 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 25 Dec 2009 22:09:47 +0000 (UTC)
Subject: rpms/nntpgrab/F-11 .cvsignore, 1.22, 1.23 nntpgrab.spec, 1.38,
	1.39 sources, 1.25, 1.26
Message-ID: <20091225220947.881FF11C01EA@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26460/F-11

Modified Files:
	.cvsignore nntpgrab.spec sources 
Log Message:
Update to 0.5.90 (0.6 Beta 1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	19 Jul 2009 19:44:51 -0000	1.22
+++ .cvsignore	25 Dec 2009 22:09:46 -0000	1.23
@@ -1 +1 @@
-nntpgrab-0.5.1.tar.bz2
+nntpgrab-0.5.90.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/nntpgrab.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- nntpgrab.spec	19 Jul 2009 19:44:51 -0000	1.38
+++ nntpgrab.spec	25 Dec 2009 22:09:46 -0000	1.39
@@ -1,6 +1,6 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.5.1
+Version: 0.5.90
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -29,14 +29,17 @@ BuildRequires:	dbus-devel
 BuildRequires:	intltool
 BuildRequires:	libsoup-devel
 BuildRequires:	par2cmdline
+BuildRequires:	NetworkManager-glib-devel
 %if 0%{?rhel} > 0
-BuildRequires:  pcre-devel
-BuildRequires:  curl-devel
-BuildRequires:  openssl-devel
+BuildRequires:	pcre-devel
+BuildRequires:	curl-devel
+BuildRequires:	openssl-devel
 %endif
 %if 0%{?fedora} > 0
-BuildRequires:  nss-devel
-BuildRequires:  nss_compat_ossl-devel
+BuildRequires:	libproxy-devel
+BuildRequires:	PolicyKit-gnome-devel
+BuildRequires:	nss-devel
+BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
 %endif
 
@@ -157,13 +160,17 @@ rm %{buildroot}%{_libdir}/nntpgrab/libnn
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0
 mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
 
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
-
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
 
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so.0
@@ -180,8 +187,9 @@ rm %{buildroot}%{_libdir}/libnntpgrab_ut
 rm %{buildroot}%{_libdir}/libnntpgrab_automation.la
 rm %{buildroot}%{_libdir}/libnntpgrab_gui_base.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.la
 
@@ -225,9 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/libnntpgrab_glue.so.0
 %{_libdir}/libnntpgrab_glue.so.0.0.0
 %dir %{_libdir}/nntpgrab
-%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
-%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
 %{_datadir}/pixmaps/nntpgrab.png
@@ -276,7 +285,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 %{_datadir}/nntpgrab/web
 
+
 %changelog
+* Fri Dec 25 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.90-1
+- Update to 0.5.90 (0.6 Beta 1)
+
 * Sun Jul 19 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.1-1
 - Update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	19 Jul 2009 19:44:51 -0000	1.25
+++ sources	25 Dec 2009 22:09:47 -0000	1.26
@@ -1 +1 @@
-e9b9f2e1f8882c7e93e4f2c7d6325f9d  nntpgrab-0.5.1.tar.bz2
+5ba5feb638e2d2ac5d896ffe8616668d  nntpgrab-0.5.90.tar.bz2



From epienbro at fedoraproject.org  Fri Dec 25 22:09:47 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 25 Dec 2009 22:09:47 +0000 (UTC)
Subject: rpms/nntpgrab/devel .cvsignore, 1.22, 1.23 nntpgrab.spec, 1.40,
	1.41 sources, 1.25, 1.26
Message-ID: <20091225220947.D1BE511C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26460/devel

Modified Files:
	.cvsignore nntpgrab.spec sources 
Log Message:
Update to 0.5.90 (0.6 Beta 1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	19 Jul 2009 19:44:51 -0000	1.22
+++ .cvsignore	25 Dec 2009 22:09:47 -0000	1.23
@@ -1 +1 @@
-nntpgrab-0.5.1.tar.bz2
+nntpgrab-0.5.90.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- nntpgrab.spec	18 Sep 2009 13:01:48 -0000	1.40
+++ nntpgrab.spec	25 Dec 2009 22:09:47 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.5.1
-Release: 3%{?dist}
+Version: 0.5.90
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
@@ -29,14 +29,17 @@ BuildRequires:	dbus-devel
 BuildRequires:	intltool
 BuildRequires:	libsoup-devel
 BuildRequires:	par2cmdline
+BuildRequires:	NetworkManager-glib-devel
 %if 0%{?rhel} > 0
-BuildRequires:  pcre-devel
-BuildRequires:  curl-devel
-BuildRequires:  openssl-devel
+BuildRequires:	pcre-devel
+BuildRequires:	curl-devel
+BuildRequires:	openssl-devel
 %endif
 %if 0%{?fedora} > 0
-BuildRequires:  nss-devel
-BuildRequires:  nss_compat_ossl-devel
+BuildRequires:	libproxy-devel
+BuildRequires:	PolicyKit-gnome-devel
+BuildRequires:	nss-devel
+BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
 %endif
 
@@ -157,13 +160,17 @@ rm %{buildroot}%{_libdir}/nntpgrab/libnn
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0
 mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
 
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
-
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
 
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so.0
@@ -180,8 +187,9 @@ rm %{buildroot}%{_libdir}/libnntpgrab_ut
 rm %{buildroot}%{_libdir}/libnntpgrab_automation.la
 rm %{buildroot}%{_libdir}/libnntpgrab_gui_base.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.la
 
@@ -225,9 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/libnntpgrab_glue.so.0
 %{_libdir}/libnntpgrab_glue.so.0.0.0
 %dir %{_libdir}/nntpgrab
-%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
-%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
 %{_datadir}/pixmaps/nntpgrab.png
@@ -276,7 +285,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 %{_datadir}/nntpgrab/web
 
+
 %changelog
+* Fri Dec 25 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.90-1
+- Update to 0.5.90 (0.6 Beta 1)
+
 * Fri Sep 18 2009 Caol?n McNamara <caolanm at redhat.com> - 0.5.1-3
 - rebuild for dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	19 Jul 2009 19:44:51 -0000	1.25
+++ sources	25 Dec 2009 22:09:47 -0000	1.26
@@ -1 +1 @@
-e9b9f2e1f8882c7e93e4f2c7d6325f9d  nntpgrab-0.5.1.tar.bz2
+5ba5feb638e2d2ac5d896ffe8616668d  nntpgrab-0.5.90.tar.bz2



From epienbro at fedoraproject.org  Fri Dec 25 22:09:47 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 25 Dec 2009 22:09:47 +0000 (UTC)
Subject: rpms/nntpgrab/F-12 .cvsignore, 1.22, 1.23 nntpgrab.spec, 1.40,
	1.41 sources, 1.25, 1.26
Message-ID: <20091225220947.8AFAA11C0382@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26460/F-12

Modified Files:
	.cvsignore nntpgrab.spec sources 
Log Message:
Update to 0.5.90 (0.6 Beta 1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	19 Jul 2009 19:44:51 -0000	1.22
+++ .cvsignore	25 Dec 2009 22:09:47 -0000	1.23
@@ -1 +1 @@
-nntpgrab-0.5.1.tar.bz2
+nntpgrab-0.5.90.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-12/nntpgrab.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- nntpgrab.spec	18 Sep 2009 13:01:48 -0000	1.40
+++ nntpgrab.spec	25 Dec 2009 22:09:47 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.5.1
-Release: 3%{?dist}
+Version: 0.5.90
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
@@ -29,14 +29,17 @@ BuildRequires:	dbus-devel
 BuildRequires:	intltool
 BuildRequires:	libsoup-devel
 BuildRequires:	par2cmdline
+BuildRequires:	NetworkManager-glib-devel
 %if 0%{?rhel} > 0
-BuildRequires:  pcre-devel
-BuildRequires:  curl-devel
-BuildRequires:  openssl-devel
+BuildRequires:	pcre-devel
+BuildRequires:	curl-devel
+BuildRequires:	openssl-devel
 %endif
 %if 0%{?fedora} > 0
-BuildRequires:  nss-devel
-BuildRequires:  nss_compat_ossl-devel
+BuildRequires:	libproxy-devel
+BuildRequires:	PolicyKit-gnome-devel
+BuildRequires:	nss-devel
+BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
 %endif
 
@@ -157,13 +160,17 @@ rm %{buildroot}%{_libdir}/nntpgrab/libnn
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0
 mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
 
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
-
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
 
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so.0
@@ -180,8 +187,9 @@ rm %{buildroot}%{_libdir}/libnntpgrab_ut
 rm %{buildroot}%{_libdir}/libnntpgrab_automation.la
 rm %{buildroot}%{_libdir}/libnntpgrab_gui_base.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.la
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.la
 
@@ -225,9 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/libnntpgrab_glue.so.0
 %{_libdir}/libnntpgrab_glue.so.0.0.0
 %dir %{_libdir}/nntpgrab
-%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
-%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
 %{_datadir}/pixmaps/nntpgrab.png
@@ -276,7 +285,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 %{_datadir}/nntpgrab/web
 
+
 %changelog
+* Fri Dec 25 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.90-1
+- Update to 0.5.90 (0.6 Beta 1)
+
 * Fri Sep 18 2009 Caol?n McNamara <caolanm at redhat.com> - 0.5.1-3
 - rebuild for dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	19 Jul 2009 19:44:51 -0000	1.25
+++ sources	25 Dec 2009 22:09:47 -0000	1.26
@@ -1 +1 @@
-e9b9f2e1f8882c7e93e4f2c7d6325f9d  nntpgrab-0.5.1.tar.bz2
+5ba5feb638e2d2ac5d896ffe8616668d  nntpgrab-0.5.90.tar.bz2



From rdieter at fedoraproject.org  Fri Dec 25 22:16:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Dec 2009 22:16:30 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.101,1.102
Message-ID: <20091225221630.1AFAF11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27608

Modified Files:
	kde-settings.spec 
Log Message:
fix %files



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- kde-settings.spec	25 Dec 2009 21:55:27 -0000	1.101
+++ kde-settings.spec	25 Dec 2009 22:16:29 -0000	1.102
@@ -127,6 +127,7 @@ touch --no-create %{_datadir}/kde-settin
 %config(noreplace) %{_sysconfdir}/profile.d/kde.*
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
+%{_sysconfdir}/kde/env/gtk2_rc_files.sh
 %if 0%{?fedora}
 %{_sysconfdir}/kde/env/fedora-bookmarks.sh
 %{_sysconfdir}/kde/shutdown/gpg-agent*.sh



From epienbro at fedoraproject.org  Fri Dec 25 22:22:14 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 25 Dec 2009 22:22:14 +0000 (UTC)
Subject: rpms/nntpgrab/EL-5 nntpgrab.spec,1.40,1.41
Message-ID: <20091225222214.F29EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28385

Modified Files:
	nntpgrab.spec 
Log Message:
EL-5 has an too old version of NetworkManager to get the NNTPGrab NetworkManager plugin operational



Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/nntpgrab.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- nntpgrab.spec	25 Dec 2009 22:09:46 -0000	1.40
+++ nntpgrab.spec	25 Dec 2009 22:22:14 -0000	1.41
@@ -168,9 +168,11 @@ rm %{buildroot}%{_libdir}/nntpgrab/libnn
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0
 mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 
+%if 0%{?fedora} > 0
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0
 mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+%endif
 
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so.0
@@ -235,7 +237,9 @@ rm -rf %{buildroot}
 %dir %{_libdir}/nntpgrab
 %{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
+%if 0%{?fedora} > 0
 %{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+%endif
 %{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so



From rdieter at fedoraproject.org  Fri Dec 25 22:23:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 25 Dec 2009 22:23:02 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.125,1.126
Message-ID: <20091225222302.3B86C11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28666

Modified Files:
	comps-f13.xml.in 
Log Message:
eol'd apollon,gift



Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- comps-f13.xml.in	22 Dec 2009 15:05:28 -0000	1.125
+++ comps-f13.xml.in	25 Dec 2009 22:23:01 -0000	1.126
@@ -2807,8 +2807,6 @@
       <packagereq type="optional">galeon</packagereq>
       <packagereq type="optional">gftp</packagereq>
       <packagereq type="optional">gg2</packagereq>
-      <packagereq type="optional">gift-gnutella</packagereq>
-      <packagereq type="optional">gift-openft</packagereq>
       <packagereq type="optional">gnash-plugin</packagereq>
       <packagereq type="optional">gnome-translate</packagereq>
       <packagereq type="optional">gnubiff</packagereq>
@@ -3761,7 +3759,6 @@
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
       <packagereq type="default">xsettings-kde</packagereq>
-      <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">bespin</packagereq>
       <packagereq type="optional">bibletime</packagereq>



From epienbro at fedoraproject.org  Fri Dec 25 22:29:12 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 25 Dec 2009 22:29:12 +0000 (UTC)
Subject: rpms/nntpgrab/EL-5 nntpgrab.spec,1.41,1.42
Message-ID: <20091225222912.7B2FF11C00E6@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29458

Modified Files:
	nntpgrab.spec 
Log Message:
Previous commit was incomplete



Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/EL-5/nntpgrab.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- nntpgrab.spec	25 Dec 2009 22:22:14 -0000	1.41
+++ nntpgrab.spec	25 Dec 2009 22:29:12 -0000	1.42
@@ -191,7 +191,9 @@ rm %{buildroot}%{_libdir}/libnntpgrab_gu
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.la
+%if 0%{?fedora} > 0
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.la
+%endif
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.la
 



From cassmodiah at fedoraproject.org  Fri Dec 25 23:10:38 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 25 Dec 2009 23:10:38 +0000 (UTC)
Subject: rpms/i3/devel i3.spec,1.2,1.3
Message-ID: <20091225231039.16D8D11C00E6@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4408

Modified Files:
	i3.spec 
Log Message:
* Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-1
- Correct version (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
- Add more documentation (generated with asciidoc)



Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/devel/i3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- i3.spec	25 Dec 2009 21:29:16 -0000	1.2
+++ i3.spec	25 Dec 2009 23:10:37 -0000	1.3
@@ -1,14 +1,14 @@
-%global upstream_version -bf1
+%global upstream_version 3.d-bf1
 
 Name:           i3
-Version:        3.d
-Release:        bf1_1%{?dist}
+Version:        3.d.bf1
+Release:        1%{?dist}
 Summary:        Improved tiling window manager
 
 Group:          User Interface/Desktops
 License:        BSD
 URL:            http://i3.zekjur.net
-Source0:        http://i3.zekjur.net/downloads/%{name}-%{version}-bf1.tar.bz2
+Source0:        http://i3.zekjur.net/downloads/%{name}-%{upstream_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xcb-util-devel
@@ -33,8 +33,19 @@ and has several measures to be very fast
 Please be aware that i3 is primarily targeted at advanced users and developers.
 
 
+%package doc
+Summary:        Documentation for %{name}
+Group:          Documentation
+BuildRequires:  asciidoc
+Requires:       %{name} = %{version}-%{release}
+
+
+%description doc
+Asciidoc generated documentations for %{name}.
+
+
 %prep
-%setup -q -n %{name}-%{version}-bf1
+%setup -q -n %{name}-%{upstream_version}
 
 #####          I M P O R T A N T         #####
 ##### !!!! TO CHECK ON EVERY UPDATE !!!! #####
@@ -47,8 +58,8 @@ sed -e 's|CFLAGS += -Wunused|CFLAGS += -
 
 
 %build
-export CFLAGS
 make %{?_smp_mflags}
+cd docs; make %{?_smp_mflags}
 
 
 %install
@@ -64,7 +75,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc GOALS LICENSE RELEASE-NOTES-%{version}-bf1
+%doc GOALS LICENSE RELEASE-NOTES-%{upstream_version}
 %{_bindir}/%{name}
 %{_bindir}/%{name}-input
 %{_bindir}/%{name}-msg
@@ -74,7 +85,16 @@ rm -rf %{buildroot}
 %{_datadir}/xsessions/%{name}.desktop
 
 
+%files doc
+%defattr(-,root,root,-)
+%doc docs/*.{html,png}
+
+
 %changelog
+* Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-1
+- Correct version (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
+- Add more documentation (generated with asciidoc)
+
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-bf1_1
 - New upstream release
 



From cassmodiah at fedoraproject.org  Fri Dec 25 23:10:55 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 25 Dec 2009 23:10:55 +0000 (UTC)
Subject: rpms/i3/F-12 i3.spec,1.2,1.3
Message-ID: <20091225231055.E521711C00E6@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4505

Modified Files:
	i3.spec 
Log Message:
* Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-1
- Correct version (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
- Add more documentation (generated with asciidoc)



Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/i3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- i3.spec	25 Dec 2009 21:29:19 -0000	1.2
+++ i3.spec	25 Dec 2009 23:10:55 -0000	1.3
@@ -1,14 +1,14 @@
-%global upstream_version -bf1
+%global upstream_version 3.d-bf1
 
 Name:           i3
-Version:        3.d
-Release:        bf1_1%{?dist}
+Version:        3.d.bf1
+Release:        1%{?dist}
 Summary:        Improved tiling window manager
 
 Group:          User Interface/Desktops
 License:        BSD
 URL:            http://i3.zekjur.net
-Source0:        http://i3.zekjur.net/downloads/%{name}-%{version}-bf1.tar.bz2
+Source0:        http://i3.zekjur.net/downloads/%{name}-%{upstream_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xcb-util-devel
@@ -33,8 +33,19 @@ and has several measures to be very fast
 Please be aware that i3 is primarily targeted at advanced users and developers.
 
 
+%package doc
+Summary:        Documentation for %{name}
+Group:          Documentation
+BuildRequires:  asciidoc
+Requires:       %{name} = %{version}-%{release}
+
+
+%description doc
+Asciidoc generated documentations for %{name}.
+
+
 %prep
-%setup -q -n %{name}-%{version}-bf1
+%setup -q -n %{name}-%{upstream_version}
 
 #####          I M P O R T A N T         #####
 ##### !!!! TO CHECK ON EVERY UPDATE !!!! #####
@@ -47,8 +58,8 @@ sed -e 's|CFLAGS += -Wunused|CFLAGS += -
 
 
 %build
-export CFLAGS
 make %{?_smp_mflags}
+cd docs; make %{?_smp_mflags}
 
 
 %install
@@ -64,7 +75,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc GOALS LICENSE RELEASE-NOTES-%{version}-bf1
+%doc GOALS LICENSE RELEASE-NOTES-%{upstream_version}
 %{_bindir}/%{name}
 %{_bindir}/%{name}-input
 %{_bindir}/%{name}-msg
@@ -74,7 +85,16 @@ rm -rf %{buildroot}
 %{_datadir}/xsessions/%{name}.desktop
 
 
+%files doc
+%defattr(-,root,root,-)
+%doc docs/*.{html,png}
+
+
 %changelog
+* Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-1
+- Correct version (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
+- Add more documentation (generated with asciidoc)
+
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-bf1_1
 - New upstream release
 



From dcbw at fedoraproject.org  Sat Dec 26 00:47:07 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat, 26 Dec 2009 00:47:07 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-libertas-crash.patch, NONE, 1.1 kernel.spec,
	1.1784, 1.1785
Message-ID: <20091226004707.D513D11C00E6@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17305

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libertas-crash.patch 
Log Message:
* Fri Dec 25 2009 Dan Williams <dcbw at redhat.com> 2.6.30.10-106
- libertas: fix crash on 64-bit platforms with >= 4GB RAM



linux-2.6-libertas-crash.patch:
 if_usb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-libertas-crash.patch ---
2.6.31-stable review patch.  If anyone has any objections, please let us know.

------------------
From: David Woodhouse <dwmw2 at infradead.org>

commit e9024a059f2c17fb2bfab212ee9d31511d7b8e57 upstream.

On a 64-bit kernel, skb->tail is an offset, not a pointer. The libertas
usb driver passes it to usb_fill_bulk_urb() anyway, causing interesting
crashes. Fix that by using skb->data instead.

This highlights a problem with usb_fill_bulk_urb(). It doesn't notice
when dma_map_single() fails and return the error to its caller as it
should. In fact it _can't_ currently return the error, since it returns
void.

So this problem was showing up only at unmap time, after we'd already
suffered memory corruption by doing DMA to a bogus address.

Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
Acked-by: David S. Miller <davem at davemloft.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 drivers/net/wireless/libertas/if_usb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -507,7 +507,7 @@ static int __if_usb_submit_rx_urb(struct
 	/* Fill the receive configuration URB and initialise the Rx call back */
 	usb_fill_bulk_urb(cardp->rx_urb, cardp->udev,
 			  usb_rcvbulkpipe(cardp->udev, cardp->ep_in),
-			  (void *) (skb->tail + (size_t) IPFIELD_ALIGN_OFFSET),
+			  skb->data + IPFIELD_ALIGN_OFFSET,
 			  MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, callbackfn,
 			  cardp);
 





Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1784
retrieving revision 1.1785
diff -u -p -r1.1784 -r1.1785
--- kernel.spec	24 Dec 2009 16:16:11 -0000	1.1784
+++ kernel.spec	26 Dec 2009 00:47:06 -0000	1.1785
@@ -844,6 +844,10 @@ Patch16471: fuse-prevent-fuse_put_reques
 # rhbz#549400 [0bd87182d3ab18a32a8e9175d3f68754c58e3432]
 Patch16472: fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch
 
+# fix libertas on 64-bit platforms with >= 4GB RAM
+# kernel commit e9024a059f2c17fb2bfab212ee9d31511d7b8e57
+Patch16473: linux-2.6-libertas-crash.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1586,6 +1590,9 @@ ApplyPatch fuse-prevent-fuse_put_request
 # rhbz#549400 [0bd87182d3ab18a32a8e9175d3f68754c58e3432]
 ApplyPatch fuse-fix-kunmap-in-fuse_ioctl_copy_user.patch
 
+# libertas 64-bit crash fix [e9024a059f2c17fb2bfab212ee9d31511d7b8e57]
+ApplyPatch linux-2.6-libertas-crash.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2174,6 +2181,9 @@ fi
 # and build.
 
 %changelog
+* Fri Dec 25 2009 Dan Williams <dcbw at redhat.com> 2.6.30.10-106
+- libertas: fix crash on 64-bit platforms with >= 4GB RAM
+
 * Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.30.10-105
 - fuse: fix kunmap in fuse_ioctl_copy_user, #549400
 



From donv at fedoraproject.org  Sat Dec 26 01:34:52 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 01:34:52 +0000 (UTC)
Subject: rpms/zfs-fuse/devel zfs-fuse.spec,1.21,1.22
Message-ID: <20091226013452.155F111C00E6@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22676

Modified Files:
	zfs-fuse.spec 
Log Message:
* Updated spec to refer to the new STABLE upstream version


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- zfs-fuse.spec	28 Nov 2009 00:10:35 -0000	1.21
+++ zfs-fuse.spec	26 Dec 2009 01:34:51 -0000	1.22
@@ -1,14 +1,13 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following command to generate the tarball:
-#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0-433snapshot.tar.bz2
-#   mv zfs-fuse-0.6.0-433snapshot.tar.bz2 zfs-fuse-0.6.0.tar.bz2
+#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
 Source02:         zfs-fuse.sysconfig
@@ -89,6 +88,9 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
+- Updated to upstream version 0.6.0 STABLE
+
 * Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 



From donv at fedoraproject.org  Sat Dec 26 01:38:30 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 01:38:30 +0000 (UTC)
Subject: File zfs-fuse-0.6.0.tar.bz2 uploaded to lookaside cache by donv
Message-ID: <20091226013830.8A1E610F8CB@bastion.fedoraproject.org>

A file has been added to the lookaside cache for zfs-fuse:

c0e1d0d3406f7a1ac203708e5ecdc6dd  zfs-fuse-0.6.0.tar.bz2



From donv at fedoraproject.org  Sat Dec 26 01:39:57 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 01:39:57 +0000 (UTC)
Subject: rpms/zfs-fuse/devel .cvsignore,1.5,1.6 sources,1.4,1.5
Message-ID: <20091226013957.B159811C00E6@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23575

Modified Files:
	.cvsignore sources 
Log Message:
* Added the new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Nov 2009 21:04:05 -0000	1.5
+++ .cvsignore	26 Dec 2009 01:39:57 -0000	1.6
@@ -1,2 +1 @@
 zfs-fuse-0.6.0.tar.bz2
-i386


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Nov 2009 21:03:28 -0000	1.4
+++ sources	26 Dec 2009 01:39:57 -0000	1.5
@@ -1 +1 @@
-f1815b7955bc0d11b703e14817e29878  zfs-fuse-0.6.0.tar.bz2
+c0e1d0d3406f7a1ac203708e5ecdc6dd  zfs-fuse-0.6.0.tar.bz2



From donv at fedoraproject.org  Sat Dec 26 01:40:53 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 01:40:53 +0000 (UTC)
Subject: rpms/zfs-fuse/devel .cvsignore,1.6,1.7
Message-ID: <20091226014053.2E5D611C00E6@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23768

Modified Files:
	.cvsignore 
Log Message:
* Added the new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Dec 2009 01:39:57 -0000	1.6
+++ .cvsignore	26 Dec 2009 01:40:53 -0000	1.7
@@ -1 +1,2 @@
 zfs-fuse-0.6.0.tar.bz2
+i386



From donv at fedoraproject.org  Sat Dec 26 01:55:10 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 01:55:10 +0000 (UTC)
Subject: rpms/zfs-fuse/F-12 sources,1.4,1.5 zfs-fuse.spec,1.16,1.17
Message-ID: <20091226015510.9DEFF11C00E6@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25844

Modified Files:
	sources zfs-fuse.spec 
Log Message:
* Added the new upstream 0.6.0 STABLE tarball


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Nov 2009 00:03:12 -0000	1.4
+++ sources	26 Dec 2009 01:55:10 -0000	1.5
@@ -1 +1 @@
-f1815b7955bc0d11b703e14817e29878  zfs-fuse-0.6.0.tar.bz2
+c0e1d0d3406f7a1ac203708e5ecdc6dd  zfs-fuse-0.6.0.tar.bz2


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- zfs-fuse.spec	29 Nov 2009 00:03:12 -0000	1.16
+++ zfs-fuse.spec	26 Dec 2009 01:55:10 -0000	1.17
@@ -1,14 +1,13 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following command to generate the tarball:
-#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0-433snapshot.tar.bz2
-#   mv zfs-fuse-0.6.0-433snapshot.tar.bz2 zfs-fuse-0.6.0.tar.bz2
+#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
 Source02:         zfs-fuse.sysconfig
@@ -89,6 +88,9 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
+- Updated to upstream version 0.6.0 STABLE
+
 * Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 



From donv at fedoraproject.org  Sat Dec 26 02:22:08 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 02:22:08 +0000 (UTC)
Subject: rpms/zfs-fuse/devel zfs-fuse.spec,1.22,1.23
Message-ID: <20091226022208.5479C11C00E6@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30209

Modified Files:
	zfs-fuse.spec 
Log Message:
* Removed automatic startup from installaiton script


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- zfs-fuse.spec	26 Dec 2009 01:34:51 -0000	1.22
+++ zfs-fuse.spec	26 Dec 2009 02:22:08 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          4%{?dist}
+Release:          5%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
@@ -58,8 +58,6 @@ scons install install_dir=%{buildroot}%{
 %post
 if [ $1 = 1 ] ; then
     /sbin/chkconfig --add %{name}
-    /sbin/chkconfig %{name} on
-    /sbin/service %{name} start >/dev/null 2>&1 || :
 fi
 
 %preun
@@ -88,6 +86,10 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-5
+- Removed chckconfig on and service start commands from install script
+  See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we
+
 * Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
 - Updated to upstream version 0.6.0 STABLE
 



From donv at fedoraproject.org  Sat Dec 26 02:30:07 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 02:30:07 +0000 (UTC)
Subject: rpms/zfs-fuse/F-12 zfs-fuse.spec,1.17,1.18
Message-ID: <20091226023007.18D3011C03E3@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31960

Modified Files:
	zfs-fuse.spec 
Log Message:
* Removed automatic startup from installation script


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- zfs-fuse.spec	26 Dec 2009 01:55:10 -0000	1.17
+++ zfs-fuse.spec	26 Dec 2009 02:30:06 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          4%{?dist}
+Release:          5%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
@@ -58,8 +58,6 @@ scons install install_dir=%{buildroot}%{
 %post
 if [ $1 = 1 ] ; then
     /sbin/chkconfig --add %{name}
-    /sbin/chkconfig %{name} on
-    /sbin/service %{name} start >/dev/null 2>&1 || :
 fi
 
 %preun
@@ -88,6 +86,10 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-5
+- Removed chckconfig on and service start commands from install script
+  See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we
+
 * Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
 - Updated to upstream version 0.6.0 STABLE
 



From emaldonado at fedoraproject.org  Sat Dec 26 05:08:34 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 26 Dec 2009 05:08:34 +0000 (UTC)
Subject: rpms/nss/devel 546221.patch,1.3,1.4
Message-ID: <20091226050834.BCD6011C00EF@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17804

Modified Files:
	546221.patch 
Log Message:
Fix a failed assertion caused by a typo introduced when adapting the patch for rhbz #546221

546221.patch:
 nsssysinit.c |   42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

Index: 546221.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/546221.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 546221.patch	20 Dec 2009 06:17:58 -0000	1.3
+++ 546221.patch	26 Dec 2009 05:08:33 -0000	1.4
@@ -26,7 +26,7 @@ diff -up nss-3.12.5/mozilla/security/nss
      }
  
 -    userdb  = getUserDB();
-+    userdb = getSystemDB();
++    sysdb = getSystemDB();
 +    userdb = getUserDB();
 +
 +    if (sysdb && !strcmp(filename, sysdb))



From emaldonado at fedoraproject.org  Sat Dec 26 05:14:22 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 26 Dec 2009 05:14:22 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.132,1.133
Message-ID: <20091226051422.358BE11C00EF@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19201

Modified Files:
	nss.spec 
Log Message:
Fix error introduced when adapting the 546221 patch


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- nss.spec	20 Dec 2009 06:17:58 -0000	1.132
+++ nss.spec	26 Dec 2009 05:14:22 -0000	1.133
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.9
+Release:          1%{?dist}.11
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -478,6 +478,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Fri Dec 25 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.11
+- Fix an error introduced when adapting the patch for
+  rhbz #546211
+
 * Sat Dec 19 2009 Elio maldonado<emaldona at redhat.com> - 3.12.5-1.9
 - Remove left over trace statements from nsssysinit patching
 



From bruno at fedoraproject.org  Sat Dec 26 08:12:07 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 26 Dec 2009 08:12:07 +0000 (UTC)
Subject: File colossus--20091225-4635.tar.gz uploaded to lookaside cache by
	bruno
Message-ID: <20091226081207.A1E8D10F842@bastion.fedoraproject.org>

A file has been added to the lookaside cache for colossus:

4e293f0496674fe28968658851d7ba05  colossus--20091225-4635.tar.gz



From bruno at fedoraproject.org  Sat Dec 26 08:12:58 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 26 Dec 2009 08:12:58 +0000 (UTC)
Subject: rpms/colossus/devel .cvsignore, 1.8, 1.9 colossus.spec, 1.10,
	1.11 import.log, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <20091226081258.DB29E11C00EF@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14637/devel

Modified Files:
	.cvsignore colossus.spec import.log sources 
Log Message:
Rebase to 0.10.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Oct 2009 00:34:57 -0000	1.8
+++ .cvsignore	26 Dec 2009 08:12:57 -0000	1.9
@@ -1 +1 @@
-colossus-0.9.3-20091015-4577.tar.gz
+colossus--20091225-4635.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/colossus.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- colossus.spec	17 Oct 2009 00:34:57 -0000	1.10
+++ colossus.spec	26 Dec 2009 08:12:58 -0000	1.11
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4577
-%define         revdate    20091015
-Version:        0.9.3
-%define         branch     %{version}
+%global         rev        4635
+%global         revdate    20091225
+Version:        0.10.0
+%global         branch     %()
 Release:        1%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
@@ -180,6 +180,14 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Sat Dec 26 2009 Bruno Wolff III <bruno at wolff.to> - 0.10.0-1
+- Rebase to 0.10.0
+- Fixed undo that reblocks a split
+- Fix AI crash
+- Enable public game server alpha feature
+- See http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+- Include post release typo fix as a patch
+
 * Fri Oct 16 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.3-1
 - Rebase to 0.9.3
 - Adjust script for grabbing source to be able to grab from branches


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	17 Oct 2009 00:34:57 -0000	1.7
+++ import.log	26 Dec 2009 08:12:58 -0000	1.8
@@ -5,3 +5,4 @@ colossus-0_9_0-1_20090810svn4482_fc11:HE
 colossus-0_9_1-1_20090817svn4489_fc11:HEAD:colossus-0.9.1-1.20090817svn4489.fc11.src.rpm:1250541173
 colossus-0_9_2-1_20090906svn4519_fc11:HEAD:colossus-0.9.2-1.20090906svn4519.fc11.src.rpm:1252255689
 colossus-0_9_3-1_fc12:HEAD:colossus-0.9.3-1.fc12.src.rpm:1255739650
+colossus-0_10_0-1_fc13:HEAD:colossus-0.10.0-1.fc13.src.rpm:1261815117


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Oct 2009 00:34:57 -0000	1.8
+++ sources	26 Dec 2009 08:12:58 -0000	1.9
@@ -1 +1 @@
-678d68e4c356c69987342d833dd702a0  colossus-0.9.3-20091015-4577.tar.gz
+4e293f0496674fe28968658851d7ba05  colossus--20091225-4635.tar.gz



From dwayne at fedoraproject.org  Sat Dec 26 08:56:20 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Sat, 26 Dec 2009 08:56:20 +0000 (UTC)
Subject: File virtaal-0.5.1.tar.bz2 uploaded to lookaside cache by dwayne
Message-ID: <20091226085620.6524910F842@bastion.fedoraproject.org>

A file has been added to the lookaside cache for virtaal:

a023c6e205879ca60f2fe05db777cade  virtaal-0.5.1.tar.bz2



From musuruan at fedoraproject.org  Sat Dec 26 09:15:28 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 26 Dec 2009 09:15:28 +0000 (UTC)
Subject: File fbzx-2.2.0-noroms.tar.bz2 uploaded to lookaside cache by musuruan
Message-ID: <20091226091528.A2D6710F849@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fbzx:

72cdded84fde15759d07a69699f3869b  fbzx-2.2.0-noroms.tar.bz2



From dwayne at fedoraproject.org  Sat Dec 26 09:15:52 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Sat, 26 Dec 2009 09:15:52 +0000 (UTC)
Subject: rpms/virtaal/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 virtaal.spec, 1.16, 1.17
Message-ID: <20091226091552.4096811C00EF@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24900

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Sat Dec 26 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.1-1
- Update to 0.5.1
   - Fixed URI-handling bug for opening files.
   - New translations: Chinese (Taiwan) and Lithuanian.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	3 Dec 2009 20:40:29 -0000	1.14
+++ .cvsignore	26 Dec 2009 09:15:51 -0000	1.15
@@ -1 +1 @@
-virtaal-0.5.0.tar.bz2
+virtaal-0.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	3 Dec 2009 20:40:29 -0000	1.14
+++ sources	26 Dec 2009 09:15:52 -0000	1.15
@@ -1 +1 @@
-36d6fd363f6e46ec949c3b5dbd268e66  virtaal-0.5.0.tar.bz2
+a023c6e205879ca60f2fe05db777cade  virtaal-0.5.1.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/virtaal.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- virtaal.spec	3 Dec 2009 20:40:29 -0000	1.16
+++ virtaal.spec	26 Dec 2009 09:15:52 -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:           virtaal
-Version:        0.5.0
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Localization and translation editor
 
@@ -160,6 +160,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 26 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.1-1
+- Update to 0.5.1
+   - Fixed URI-handling bug for opening files.
+   - New translations: Chinese (Taiwan) and Lithuanian.
+
 * Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
 - Update to 0.5.0 final
    - Correctly support Open-Tran for languages with regional modifiers



From musuruan at fedoraproject.org  Sat Dec 26 09:17:33 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 26 Dec 2009 09:17:33 +0000 (UTC)
Subject: rpms/fbzx/devel .cvsignore,1.2,1.3 fbzx.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091226091733.A3E0211C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25572

Modified Files:
	.cvsignore fbzx.spec sources 
Log Message:
* Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
- Updated to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Aug 2009 08:28:59 -0000	1.2
+++ .cvsignore	26 Dec 2009 09:17:33 -0000	1.3
@@ -1 +1 @@
-fbzx-2.1b-noroms.tar.bz2
+fbzx-2.2.0-noroms.tar.bz2


Index: fbzx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/devel/fbzx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fbzx.spec	15 Aug 2009 08:28:59 -0000	1.1
+++ fbzx.spec	26 Dec 2009 09:17:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fbzx
-Version:        2.1b
-Release:        2%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        A ZX Spectrum emulator for FrameBuffer
 
 Group:          Applications/Emulators
@@ -13,7 +13,7 @@ Source0:        %{name}-%{version}-norom
 # Therefore we use this script to remove them before shipping it. 
 # Download the upstream tarball and invoke this script while in 
 # the tarball's directory:
-# ./fbxz-generate-tarball.sh 2.1b
+# ./fbxz-generate-tarball.sh 2.2.0
 Source1:        %{name}-generate-tarball.sh
 Source2:        README_%{name}.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,9 +31,6 @@ the FrameBuffer or under X-Windows. 
 %prep
 %setup -q
 
-# Fix desktop file version
-sed -i -e "/^Version/s|2.1|1.0|" fbzx.desktop
-
 # Patch to use rpm optflags 
 sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile
 
@@ -68,6 +65,7 @@ install -p -m 644 %{name}.svg %{buildroo
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install \
   --vendor '' \
+  --remove-key Version \
   --add-category Emulator \
   --dir %{buildroot}%{_datadir}/applications \
   %{name}.desktop
@@ -105,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
+- Updated to new upstream release
+
 * Wed Aug 12 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-2
 - Icon is now installed into %%{_datadir}/icons/hicolor/scalable/apps
 - Added missing desktop-file-utils to BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Aug 2009 08:28:59 -0000	1.2
+++ sources	26 Dec 2009 09:17:33 -0000	1.3
@@ -1 +1 @@
-2976fed44540325511e9965e3f37d3b9  fbzx-2.1b-noroms.tar.bz2
+72cdded84fde15759d07a69699f3869b  fbzx-2.2.0-noroms.tar.bz2



From musuruan at fedoraproject.org  Sat Dec 26 09:24:46 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 26 Dec 2009 09:24:46 +0000 (UTC)
Subject: rpms/fbzx/F-12 .cvsignore,1.2,1.3 fbzx.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091226092446.C37D911C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27038

Modified Files:
	.cvsignore fbzx.spec sources 
Log Message:
* Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
- Updated to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Aug 2009 08:28:59 -0000	1.2
+++ .cvsignore	26 Dec 2009 09:24:46 -0000	1.3
@@ -1 +1 @@
-fbzx-2.1b-noroms.tar.bz2
+fbzx-2.2.0-noroms.tar.bz2


Index: fbzx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-12/fbzx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fbzx.spec	15 Aug 2009 08:28:59 -0000	1.1
+++ fbzx.spec	26 Dec 2009 09:24:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fbzx
-Version:        2.1b
-Release:        2%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        A ZX Spectrum emulator for FrameBuffer
 
 Group:          Applications/Emulators
@@ -13,7 +13,7 @@ Source0:        %{name}-%{version}-norom
 # Therefore we use this script to remove them before shipping it. 
 # Download the upstream tarball and invoke this script while in 
 # the tarball's directory:
-# ./fbxz-generate-tarball.sh 2.1b
+# ./fbxz-generate-tarball.sh 2.2.0
 Source1:        %{name}-generate-tarball.sh
 Source2:        README_%{name}.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,9 +31,6 @@ the FrameBuffer or under X-Windows. 
 %prep
 %setup -q
 
-# Fix desktop file version
-sed -i -e "/^Version/s|2.1|1.0|" fbzx.desktop
-
 # Patch to use rpm optflags 
 sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile
 
@@ -68,6 +65,7 @@ install -p -m 644 %{name}.svg %{buildroo
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install \
   --vendor '' \
+  --remove-key Version \
   --add-category Emulator \
   --dir %{buildroot}%{_datadir}/applications \
   %{name}.desktop
@@ -105,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
+- Updated to new upstream release
+
 * Wed Aug 12 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-2
 - Icon is now installed into %%{_datadir}/icons/hicolor/scalable/apps
 - Added missing desktop-file-utils to BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Aug 2009 08:28:59 -0000	1.2
+++ sources	26 Dec 2009 09:24:46 -0000	1.3
@@ -1 +1 @@
-2976fed44540325511e9965e3f37d3b9  fbzx-2.1b-noroms.tar.bz2
+72cdded84fde15759d07a69699f3869b  fbzx-2.2.0-noroms.tar.bz2



From musuruan at fedoraproject.org  Sat Dec 26 09:25:40 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 26 Dec 2009 09:25:40 +0000 (UTC)
Subject: rpms/fbzx/F-11 .cvsignore,1.2,1.3 fbzx.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091226092540.0B3BA11C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27283

Modified Files:
	.cvsignore fbzx.spec sources 
Log Message:
* Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
- Updated to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Aug 2009 08:35:15 -0000	1.2
+++ .cvsignore	26 Dec 2009 09:25:39 -0000	1.3
@@ -1 +1 @@
-fbzx-2.1b-noroms.tar.bz2
+fbzx-2.2.0-noroms.tar.bz2


Index: fbzx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-11/fbzx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fbzx.spec	15 Aug 2009 08:35:15 -0000	1.1
+++ fbzx.spec	26 Dec 2009 09:25:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fbzx
-Version:        2.1b
-Release:        2%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        A ZX Spectrum emulator for FrameBuffer
 
 Group:          Applications/Emulators
@@ -13,7 +13,7 @@ Source0:        %{name}-%{version}-norom
 # Therefore we use this script to remove them before shipping it. 
 # Download the upstream tarball and invoke this script while in 
 # the tarball's directory:
-# ./fbxz-generate-tarball.sh 2.1b
+# ./fbxz-generate-tarball.sh 2.2.0
 Source1:        %{name}-generate-tarball.sh
 Source2:        README_%{name}.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,9 +31,6 @@ the FrameBuffer or under X-Windows. 
 %prep
 %setup -q
 
-# Fix desktop file version
-sed -i -e "/^Version/s|2.1|1.0|" fbzx.desktop
-
 # Patch to use rpm optflags 
 sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile
 
@@ -68,6 +65,7 @@ install -p -m 644 %{name}.svg %{buildroo
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install \
   --vendor '' \
+  --remove-key Version \
   --add-category Emulator \
   --dir %{buildroot}%{_datadir}/applications \
   %{name}.desktop
@@ -105,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
+- Updated to new upstream release
+
 * Wed Aug 12 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-2
 - Icon is now installed into %%{_datadir}/icons/hicolor/scalable/apps
 - Added missing desktop-file-utils to BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Aug 2009 08:35:15 -0000	1.2
+++ sources	26 Dec 2009 09:25:39 -0000	1.3
@@ -1 +1 @@
-2976fed44540325511e9965e3f37d3b9  fbzx-2.1b-noroms.tar.bz2
+72cdded84fde15759d07a69699f3869b  fbzx-2.2.0-noroms.tar.bz2



From dwayne at fedoraproject.org  Sat Dec 26 09:31:55 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Sat, 26 Dec 2009 09:31:55 +0000 (UTC)
Subject: rpms/virtaal/F-12 .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 virtaal.spec, 1.16, 1.17
Message-ID: <20091226093155.E1C7611C00EF@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28461

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Sat Dec 26 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.1-1
- Update to 0.5.1
   - Fixed URI-handling bug for opening files.
   - New translations: Chinese (Taiwan) and Lithuanian.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Dec 2009 20:51:14 -0000	1.13
+++ .cvsignore	26 Dec 2009 09:31:55 -0000	1.14
@@ -1 +1 @@
-virtaal-0.5.0.tar.bz2
+virtaal-0.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Dec 2009 20:51:14 -0000	1.13
+++ sources	26 Dec 2009 09:31:55 -0000	1.14
@@ -1 +1 @@
-36d6fd363f6e46ec949c3b5dbd268e66  virtaal-0.5.0.tar.bz2
+a023c6e205879ca60f2fe05db777cade  virtaal-0.5.1.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/virtaal.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- virtaal.spec	3 Dec 2009 20:51:15 -0000	1.16
+++ virtaal.spec	26 Dec 2009 09:31:55 -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:           virtaal
-Version:        0.5.0
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Localization and translation editor
 
@@ -160,6 +160,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 26 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.1-1
+- Update to 0.5.1
+   - Fixed URI-handling bug for opening files.
+   - New translations: Chinese (Taiwan) and Lithuanian.
+
 * Thu Dec 3 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.5.0-1
 - Update to 0.5.0 final
    - Correctly support Open-Tran for languages with regional modifiers



From eseyman at fedoraproject.org  Sat Dec 26 11:06:49 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Sat, 26 Dec 2009 11:06:49 +0000 (UTC)
Subject: File CGI-Application-Plugin-DevPopup-1.04.tar.gz uploaded to
	lookaside cache by eseyman
Message-ID: <20091226110649.B104410F88E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-CGI-Application-Plugin-DevPopup:

a0acf6d2db33686a211221a3b1b5c1ad  CGI-Application-Plugin-DevPopup-1.04.tar.gz



From eseyman at fedoraproject.org  Sat Dec 26 11:11:18 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Sat, 26 Dec 2009 11:11:18 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DevPopup/devel .cvsignore, 1.3,
	1.4 perl-CGI-Application-Plugin-DevPopup.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20091226111118.2FA6011C00EF@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DevPopup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12138

Modified Files:
	.cvsignore perl-CGI-Application-Plugin-DevPopup.spec sources 
Log Message:
Update to 1.04


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DevPopup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Oct 2009 07:51:11 -0000	1.3
+++ .cvsignore	26 Dec 2009 11:11:17 -0000	1.4
@@ -1 +1 @@
-CGI-Application-Plugin-DevPopup-1.03.tar.gz
+CGI-Application-Plugin-DevPopup-1.04.tar.gz


Index: perl-CGI-Application-Plugin-DevPopup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DevPopup/devel/perl-CGI-Application-Plugin-DevPopup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-CGI-Application-Plugin-DevPopup.spec	7 Dec 2009 04:19:53 -0000	1.4
+++ perl-CGI-Application-Plugin-DevPopup.spec	26 Dec 2009 11:11:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-DevPopup
-Version:        1.03
-Release:        2%{?dist}
+Version:        1.04
+Release:        1%{?dist}
 Summary:        Runtime cgiapp info in a popup window
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Dec 26 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 1.04-1
+- Update to 1.04
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.03-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DevPopup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Oct 2009 07:51:12 -0000	1.3
+++ sources	26 Dec 2009 11:11:18 -0000	1.4
@@ -1 +1 @@
-323d298c84adf799eb206b0042e28908  CGI-Application-Plugin-DevPopup-1.03.tar.gz
+a0acf6d2db33686a211221a3b1b5c1ad  CGI-Application-Plugin-DevPopup-1.04.tar.gz



From scop at fedoraproject.org  Sat Dec 26 11:52:25 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 26 Dec 2009 11:52:25 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion-1.1-vncviewer.patch, NONE, 
	1.1 bash-completion.spec, 1.47, 1.48
Message-ID: <20091226115225.9DDBD11C00EF@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20134

Modified Files:
	bash-completion.spec 
Added Files:
	bash-completion-1.1-vncviewer.patch 
Log Message:
* Sat Dec 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-5
- Apply upstream post 1.1 generic vncviewer fixes.
- Autoinstall vncviewer completion also on tigervnc.
- Autoinstall chsh completion also on util-linux.


bash-completion-1.1-vncviewer.patch:
 vncviewer |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

--- NEW FILE bash-completion-1.1-vncviewer.patch ---
diff --git a/contrib/vncviewer b/contrib/vncviewer
index 1e6e3eb..d3e5c59 100644
--- a/contrib/vncviewer
+++ b/contrib/vncviewer
@@ -1,22 +1,27 @@
 # bash completion for vncviewer
 
 have vncviewer &&
-_vncviewer_bootstrap() {
+_vncviewer_bootstrap()
+{
     local fname
     case "$(_realcommand vncviewer)" in
-        # If `vncviewer' not installed, default file-dir completion
-        '') _filedir `_get_cword` ;;
         *xvnc4viewer)      fname=_xvnc4viewer    ;;
-        *tightvncviewer|*) fname=_tightvncviewer ;;
+        *tightvncviewer)   fname=_tightvncviewer ;;
+        *)                 fname=_vncviewer      ;;
     esac
-    if [ $fname ]; then
-        # Install real completion for subsequent completions
-        complete -F $fname vncviewer
-        $fname  # Generate completions once for now
-        unset -f _vncviewer_bootstrap
-    fi
+
+    # Install real completion for subsequent completions
+    complete -F $fname vncviewer
+    $fname  # Generate completions once for now
+    unset -f _vncviewer_bootstrap
 } &&
-complete -F _vncviewer_bootstrap vncviewer
+complete -F _vncviewer_bootstrap vncviewer &&
+_vncviewer()
+{
+    COMPREPLY=()
+    local cur=`_get_cword`
+    _known_hosts_real "$cur"
+}
 
 have tightvncviewer &&
 _tightvncviewer()


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- bash-completion.spec	15 Dec 2009 22:12:10 -0000	1.47
+++ bash-completion.spec	26 Dec 2009 11:52:25 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -13,6 +13,8 @@ Source1:        %{name}-plague-client
 Source2:        http://bash-completion.alioth.debian.org/files/CHANGES-1.1
 # http://git.debian.org/?p=bash-completion/bash-completion.git;a=blob_plain;f=bash_completion.sh;h=915960b614ef7644f9abaa99ed9ef0faa7ac5477;hb=HEAD
 Source3:        bash_completion.sh
+# From upstream post 1.1.
+Patch0:         %{name}-1.1-vncviewer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -27,6 +29,7 @@ of the programmable completion feature o
 
 %prep
 %setup -q
+%patch0 -p1
 install -pm 644 %{SOURCE1} contrib/plague-client
 install -pm 644 %{SOURCE2} CHANGES
 install -pm 644 %{SOURCE3} bash_completion.sh
@@ -122,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %bashcomp_trigger bzip2
 %bashcomp_trigger cfengine
 %bashcomp_trigger chkconfig
-%bashcomp_trigger chsh util-linux-ng
+%bashcomp_trigger chsh util-linux-ng,util-linux
 %bashcomp_trigger cksfv
 %bashcomp_trigger clisp
 %bashcomp_trigger cpan2dist perl-CPANPLUS
@@ -246,7 +249,7 @@ fi
 %bashcomp_trigger tcpdump
 %bashcomp_trigger unace
 %bashcomp_trigger unrar
-%bashcomp_trigger vncviewer vnc
+%bashcomp_trigger vncviewer tigervnc,vnc
 %bashcomp_trigger vpnc
 %bashcomp_trigger wireless-tools
 %bashcomp_trigger wodim
@@ -289,6 +292,11 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-5
+- Apply upstream post 1.1 generic vncviewer fixes.
+- Autoinstall vncviewer completion also on tigervnc.
+- Autoinstall chsh completion also on util-linux.
+
 * Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
 - Fix autoinstall of completions named other than the package (#546905).
 - Use environment-modules upstream completion instead of ours if available.



From scop at fedoraproject.org  Sat Dec 26 11:57:26 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 26 Dec 2009 11:57:26 +0000 (UTC)
Subject: rpms/bash-completion/EL-5 bash-completion-1.1-vncviewer.patch, NONE, 
	1.1 bash_completion.sh, NONE, 1.1 .cvsignore, 1.11,
	1.12 bash-completion.spec, 1.20, 1.21 sources, 1.11,
	1.12 bash-completion-1.0-bash4quoting-490322.patch, 1.1,
	NONE bash-completion-mock, 1.3, NONE bash-completion-repomanage,
	1.2, NONE
Message-ID: <20091226115727.0486511C00EF@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21233

Modified Files:
	.cvsignore bash-completion.spec sources 
Added Files:
	bash-completion-1.1-vncviewer.patch bash_completion.sh 
Removed Files:
	bash-completion-1.0-bash4quoting-490322.patch 
	bash-completion-mock bash-completion-repomanage 
Log Message:
* Sat Dec 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-5
- Apply upstream post 1.1 generic vncviewer fixes.
- Autoinstall vncviewer completion also on tigervnc.
- Autoinstall chsh completion also on util-linux.

* Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
- Fix autoinstall of completions named other than the package (#546905).
- Use environment-modules upstream completion instead of ours if available.
- Autoinstall mysqladmin completion also on MySQL-client-community.

* Tue Nov 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-3
- Prepare for smooth coexistence with yum upstream completion.

* Sun Nov  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-2
- Use yum-utils completion instead of ours if available.

* Mon Oct 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-1
- Update to 1.1.
- bash 4 quoting fix, mock and repomanage completions included upstream.

* Sun Sep 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-5
- Use svn completion from subversion instead of ours if available (#496456).

* Sat Apr 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-3
- Do not install cowsay completion, an updated version is shipped with it.


bash-completion-1.1-vncviewer.patch:
 vncviewer |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

--- NEW FILE bash-completion-1.1-vncviewer.patch ---
diff --git a/contrib/vncviewer b/contrib/vncviewer
index 1e6e3eb..d3e5c59 100644
--- a/contrib/vncviewer
+++ b/contrib/vncviewer
@@ -1,22 +1,27 @@
 # bash completion for vncviewer
 
 have vncviewer &&
-_vncviewer_bootstrap() {
+_vncviewer_bootstrap()
+{
     local fname
     case "$(_realcommand vncviewer)" in
-        # If `vncviewer' not installed, default file-dir completion
-        '') _filedir `_get_cword` ;;
         *xvnc4viewer)      fname=_xvnc4viewer    ;;
-        *tightvncviewer|*) fname=_tightvncviewer ;;
+        *tightvncviewer)   fname=_tightvncviewer ;;
+        *)                 fname=_vncviewer      ;;
     esac
-    if [ $fname ]; then
-        # Install real completion for subsequent completions
-        complete -F $fname vncviewer
-        $fname  # Generate completions once for now
-        unset -f _vncviewer_bootstrap
-    fi
+
+    # Install real completion for subsequent completions
+    complete -F $fname vncviewer
+    $fname  # Generate completions once for now
+    unset -f _vncviewer_bootstrap
 } &&
-complete -F _vncviewer_bootstrap vncviewer
+complete -F _vncviewer_bootstrap vncviewer &&
+_vncviewer()
+{
+    COMPREPLY=()
+    local cur=`_get_cword`
+    _known_hosts_real "$cur"
+}
 
 have tightvncviewer &&
 _tightvncviewer()


--- NEW FILE bash_completion.sh ---
# Check for interactive bash and that we haven't already been sourced.
[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return

# Check for recent enough version of bash.
bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
  if [ -r /etc/bash_completion ]; then
    # Source completion code.
    . /etc/bash_completion
  fi
fi
unset bash bminor bmajor


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Apr 2009 13:19:02 -0000	1.11
+++ .cvsignore	26 Dec 2009 11:57:26 -0000	1.12
@@ -1 +1,2 @@
-bash-completion-1.0.tar.gz
+bash-completion-1.1.tar.bz2
+CHANGES-1.1


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/bash-completion.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bash-completion.spec	13 Apr 2009 13:19:03 -0000	1.20
+++ bash-completion.spec	26 Dec 2009 11:57:26 -0000	1.21
@@ -1,18 +1,20 @@
 Name:           bash-completion
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        5%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPLv2+
 URL:            http://bash-completion.alioth.debian.org/
-Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
-Source1:        %{name}-mock
-Source2:        %{name}-plague-client
-Source3:        %{name}-repomanage
-# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c
-Patch0:         %{name}-1.0-bash4quoting-490322.patch
+Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2
+Source1:        %{name}-plague-client
+# Sources 2 and 3 missing from upstream 1.1 tarball.
+Source2:        http://bash-completion.alioth.debian.org/files/CHANGES-1.1
+# http://git.debian.org/?p=bash-completion/bash-completion.git;a=blob_plain;f=bash_completion.sh;h=915960b614ef7644f9abaa99ed9ef0faa7ac5477;hb=HEAD
+Source3:        bash_completion.sh
+# From upstream post 1.1.
+Patch0:         %{name}-1.1-vncviewer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,9 +30,40 @@ of the programmable completion feature o
 %prep
 %setup -q
 %patch0 -p1
-install -pm 644 %{SOURCE1} contrib/mock
-install -pm 644 %{SOURCE2} contrib/plague-client
-install -pm 644 %{SOURCE3} contrib/repomanage
+install -pm 644 %{SOURCE1} contrib/plague-client
+install -pm 644 %{SOURCE2} CHANGES
+install -pm 644 %{SOURCE3} bash_completion.sh
+
+# Updated completions shipped upstream:
+rm contrib/cowsay
+# subversion too, but only in >= 1.6.5-2
+# yum-utils (repomanage) too, but only in >= 1.1.24
+# yum too, but only in >= 3.2.25-2
+
+# Combine to per-package files:
+( echo ; cat contrib/update-alternatives ) >> contrib/chkconfig
+rm contrib/update-alternatives
+
+# Not applicable to Fedora and derivatives:
+rm contrib/apache2ctl
+rm contrib/apt-build
+rm contrib/aptitude
+rm contrib/cardctl
+rm contrib/dpkg
+rm contrib/dselect
+rm contrib/heimdal
+rm contrib/kldload
+rm contrib/lilo
+rm contrib/links
+rm contrib/pkg_install
+rm contrib/pkgtools
+rm contrib/portupgrade
+rm contrib/reportbug
+rm contrib/sysv-rc
+
+# Not handled due to other reasons (e.g. no known packages) (yet?):
+rm contrib/larch
+rm contrib/p4
 
 
 %build
@@ -38,16 +71,28 @@ install -pm 644 %{SOURCE3} contrib/repom
 
 %install
 rm -rf $RPM_BUILD_ROOT %{name}-ghosts.list
+
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
 install -pm 644 bash_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -pm 644 contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-cd contrib
+
+# Always installed (not triggered) completions for practically always
+# installed packages or non-triggerable common ones:
+for f in bash-builtins configure dd getent iconv rpm ; do
+    mv $RPM_BUILD_ROOT{%{_datadir}/%{name}/$f,%{_sysconfdir}/bash_completion.d}
+done
+
+d=$(pwd)
+# ghost list
+cd $RPM_BUILD_ROOT%{_datadir}/%{name}
 for f in * ; do
-  ln -s %{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-  echo "%ghost %{_sysconfdir}/bash_completion.d/$f" >> ../%{name}-ghosts.list
+    ln -s %{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+    echo "%ghost %{_sysconfdir}/bash_completion.d/$f" >> $d/%{name}-ghosts.list
 done
 cd -
 
@@ -56,206 +101,179 @@ cd -
 rm -rf $RPM_BUILD_ROOT
 
 
-%define do_triggerin() if [ ! -e %{_sysconfdir}/bash_completion.d/%1 ] ; then ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || : ; fi
-%define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
+# Note that this *must* be %%define, not %%global, otherwise the %%{?2}/%%{!?2}
+# conditional is apparently evaluated too early (at spec parse time when arg 2
+# is never defined)?
+%define bashcomp_trigger() \
+%triggerin -- %{?2}%{!?2:%1}\
+[ -e %{_sysconfdir}/bash_completion.d/%1 ] ||\
+    ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || :\
+%triggerun -- %{?2}%{!?2:%1}\
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :\
+%{nil}
+
+%bashcomp_trigger ant
+%bashcomp_trigger apt
+%bashcomp_trigger aptitude
+%bashcomp_trigger aspell
+%bashcomp_trigger autorpm
+%bashcomp_trigger bind-utils
+%bashcomp_trigger bitkeeper
+%bashcomp_trigger bittorrent
+%bashcomp_trigger bluez-utils bluez
+%bashcomp_trigger brctl bridge-utils
+%bashcomp_trigger bzip2
+%bashcomp_trigger cfengine
+%bashcomp_trigger chkconfig
+%bashcomp_trigger chsh util-linux-ng,util-linux
+%bashcomp_trigger cksfv
+%bashcomp_trigger clisp
+%bashcomp_trigger cpan2dist perl-CPANPLUS
+%bashcomp_trigger cpio
+%bashcomp_trigger cups
+%bashcomp_trigger cvs
+%bashcomp_trigger dcop kdelibs3
+%bashcomp_trigger dhclient
+%bashcomp_trigger dict dictd
+%bashcomp_trigger dsniff
+%bashcomp_trigger findutils
+%bashcomp_trigger freeciv
+%bashcomp_trigger gcc
+%bashcomp_trigger gcl
+%bashcomp_trigger gdb
+%bashcomp_trigger genisoimage
+%bashcomp_trigger gkrellm
+%bashcomp_trigger gnatmake gcc-gnat
+%bashcomp_trigger gpg gnupg
+%bashcomp_trigger gpg2 gnupg2
+%bashcomp_trigger gzip
+%bashcomp_trigger imagemagick ImageMagick
+%bashcomp_trigger info
+%bashcomp_trigger ipmitool
+%bashcomp_trigger iptables
+%bashcomp_trigger isql unixODBC
+%bashcomp_trigger jar java-1.6.0-openjdk-devel
+%bashcomp_trigger java java-1.6.0-openjdk
+%bashcomp_trigger ldapvi
+%bashcomp_trigger lftp
+%bashcomp_trigger lisp cmucl
+%bashcomp_trigger lvm lvm2
+%bashcomp_trigger lzma xz-lzma-compat
+%bashcomp_trigger lzop
+%bashcomp_trigger mailman
+%bashcomp_trigger make
+%bashcomp_trigger man
+%bashcomp_trigger mc
+%bashcomp_trigger mcrypt
+%bashcomp_trigger mdadm
+%bashcomp_trigger minicom
+%bashcomp_trigger mkinitrd
+%bashcomp_trigger mock
+
+%triggerin -- environment-modules
+if [ -e %{_datadir}/Modules/init/bash_completion ] ; then
+    # Upstream completion in environment-modules >= 3.2.7
+    rm -f %{_sysconfdir}/bash_completion.d/modules || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/modules ] ; then
+    ln -s %{_datadir}/%{name}/modules %{_sysconfdir}/bash_completion.d || :
+fi
+%triggerun -- environment-modules
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/modules || :
+
+%bashcomp_trigger monodevelop
+%bashcomp_trigger mplayer
+%bashcomp_trigger msynctool
+%bashcomp_trigger mtx
+%bashcomp_trigger munin-node
+%bashcomp_trigger mutt
+%bashcomp_trigger mysqladmin mysql,MySQL-client-community
+%bashcomp_trigger ncftp
+%bashcomp_trigger net-tools
+%bashcomp_trigger ntpdate
+%bashcomp_trigger openldap openldap-clients
+%bashcomp_trigger openssl
+%bashcomp_trigger perl
+%bashcomp_trigger pine
+%bashcomp_trigger pkg-config pkgconfig
+%bashcomp_trigger plague-client
+%bashcomp_trigger postfix
+%bashcomp_trigger postgresql
+%bashcomp_trigger povray
+%bashcomp_trigger python
+%bashcomp_trigger qdbus qt
+%bashcomp_trigger qemu
+%bashcomp_trigger quota-tools quota
+%bashcomp_trigger rcs
+%bashcomp_trigger rdesktop
 
-# Not handled (yet?):
-# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray
+%triggerin -- yum-utils
+if [ -e %{_sysconfdir}/bash_completion.d/yum-utils.bash ] ; then
+    # Upstream completion in yum-utils >= 1.1.24
+    rm -f %{_sysconfdir}/bash_completion.d/repomanage || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/repomanage ] ; then
+    ln -s %{_datadir}/%{name}/repomanage %{_sysconfdir}/bash_completion.d || :
+fi
+%triggerun -- yum-utils
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/repomanage || :
 
-%triggerin -- bittorrent
-%do_triggerin bittorrent
-%triggerun -- bittorrent
-%do_triggerun bittorrent
-
-%triggerin -- bridge-utils
-%do_triggerin brctl
-%triggerun -- bridge-utils
-%do_triggerun brctl
-
-%triggerin -- cksfv
-%do_triggerin cksfv
-%triggerun -- cksfv
-%do_triggerun cksfv
-
-%triggerin -- clisp
-%do_triggerin clisp
-%triggerun -- clisp
-%do_triggerun clisp
-
-%triggerin -- cowsay
-%do_triggerin cowsay
-%triggerun -- cowsay
-%do_triggerun cowsay
-
-%triggerin -- dsniff
-%do_triggerin dsniff
-%triggerun -- dsniff
-%do_triggerun dsniff
-
-%triggerin -- freeciv
-%do_triggerin freeciv
-%triggerun -- freeciv
-%do_triggerun freeciv
-
-%triggerin -- gcc-gnat
-%do_triggerin gnatmake
-%triggerun -- gcc-gnat
-%do_triggerun gnatmake
-
-%triggerin -- gcl
-%do_triggerin gcl
-%triggerun -- gcl
-%do_triggerun gcl
-
-%triggerin -- gkrellm
-%do_triggerin gkrellm
-%triggerun -- gkrellm
-%do_triggerun gkrellm
-
-%triggerin -- gnupg2
-%do_triggerin gpg2
-%triggerun -- gnupg2
-%do_triggerun gpg2
-
-%triggerin -- lilypond
-%do_triggerin lilypond
-%triggerun -- lilypond
-%do_triggerun lilypond
-
-%triggerin -- lzma
-%do_triggerin lzma
-%triggerun -- lzma
-%do_triggerun lzma
-
-%triggerin -- lzop
-%do_triggerin lzop
-%triggerun -- lzop
-%do_triggerun lzop
-
-%triggerin -- mailman
-%do_triggerin mailman
-%triggerun -- mailman
-%do_triggerun mailman
-
-%triggerin -- mcrypt
-%do_triggerin mcrypt
-%triggerun -- mcrypt
-%do_triggerun mcrypt
-
-%triggerin -- minicom
-%do_triggerin minicom
-%triggerun -- minicom
-%do_triggerun minicom
-
-%triggerin -- mock
-%do_triggerin mock
-%triggerun -- mock
-%do_triggerun mock
-
-%triggerin -- monodevelop
-%do_triggerin monodevelop
-%triggerun -- monodevelop
-%do_triggerun monodevelop
-
-%triggerin -- mtx
-%do_triggerin mtx
-%triggerun -- mtx
-%do_triggerun mtx
-
-%triggerin -- net-tools
-%do_triggerin net-tools
-%triggerun -- net-tools
-%do_triggerun net-tools
-
-%triggerin -- openssh-clients
-%do_triggerin ssh
-%triggerun -- openssh-clients
-%do_triggerun ssh
-
-%triggerin -- perl-CPANPLUS
-%do_triggerin cpan2dist
-%triggerun -- perl-CPANPLUS
-%do_triggerun cpan2dist
-
-%triggerin -- perl-SVK
-%do_triggerin svk
-%triggerun -- perl-SVK
-%do_triggerun svk
-
-%triggerin -- plague-client
-%do_triggerin plague-client
-%triggerun -- plague-client
-%do_triggerun plague-client
-
-%triggerin -- qemu
-%do_triggerin qemu
-%triggerun -- qemu
-%do_triggerun qemu
-
-%triggerin -- quota
-%do_triggerin quota-tools
-%triggerun -- quota
-%do_triggerun quota-tools
-
-%triggerin -- qt
-%do_triggerin qdbus
-%triggerun -- qt
-%do_triggerun qdbus
-
-%triggerin -- rdesktop
-%do_triggerin rdesktop
-%triggerun -- rdesktop
-%do_triggerun rdesktop
-
-%triggerin -- ruby-ri
-%do_triggerin ri
-%triggerun -- ruby-ri
-%do_triggerun ri
-
-%triggerin -- sbcl
-%do_triggerin sbcl
-%triggerun -- sbcl
-%do_triggerun sbcl
-
-%triggerin -- sitecopy
-%do_triggerin sitecopy
-%triggerun -- sitecopy
-%do_triggerun sitecopy
-
-%triggerin -- snownews
-%do_triggerin snownews
-%triggerun -- snownews
-%do_triggerun snownews
+%bashcomp_trigger resolvconf
+%bashcomp_trigger rfkill
+%bashcomp_trigger ri ruby-ri
+%bashcomp_trigger rpcdebug nfs-utils
+%bashcomp_trigger rpmcheck
+%bashcomp_trigger rrdtool
+%bashcomp_trigger rsync
+%bashcomp_trigger samba samba-common
+%bashcomp_trigger sbcl
+%bashcomp_trigger screen
+%bashcomp_trigger shadow shadow-utils
+%bashcomp_trigger sitecopy
+%bashcomp_trigger smartctl smartmontools
+%bashcomp_trigger snownews
+%bashcomp_trigger ssh openssh-clients
+%bashcomp_trigger strace
 
 %triggerin -- subversion
-%do_triggerin _subversion
+if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
+    # Upstream completion in subversion >= 1.6.5-2
+    rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/_subversion ] ; then
+    ln -s %{_datadir}/%{name}/_subversion %{_sysconfdir}/bash_completion.d || :
+fi
 %triggerun -- subversion
-%do_triggerun _subversion
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
 
-%triggerin -- unace
-%do_triggerin unace
-%triggerun -- unace
-%do_triggerun unace
-
-%triggerin -- unixODBC
-%do_triggerin isql
-%triggerun -- unixODBC
-%do_triggerun isql
-
-%triggerin -- unrar
-%do_triggerin unrar
-%triggerun -- unrar
-%do_triggerun unrar
+%bashcomp_trigger svk perl-SVK
+%bashcomp_trigger sysctl procps
+%bashcomp_trigger tar
+%bashcomp_trigger tcpdump
+%bashcomp_trigger unace
+%bashcomp_trigger unrar
+%bashcomp_trigger vncviewer tigervnc,vnc
+%bashcomp_trigger vpnc
+%bashcomp_trigger wireless-tools
+%bashcomp_trigger wodim
+%bashcomp_trigger wvdial
+%bashcomp_trigger xhost xorg-x11-server-utils
+%bashcomp_trigger xm xen
+%bashcomp_trigger xmllint libxml2
+%bashcomp_trigger xmlwf expat
+%bashcomp_trigger xmms
+%bashcomp_trigger xrandr xorg-x11-server-utils
+%bashcomp_trigger xz
+%bashcomp_trigger yp-tools
+
+%triggerin -- yum
+if [ -e %{_sysconfdir}/bash_completion.d/yum.bash ] ; then
+    # Upstream completion in yum >= 3.2.25-2
+    rm -f %{_sysconfdir}/bash_completion.d/_yum || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/_yum ] ; then
+    ln -s %{_datadir}/%{name}/_yum %{_sysconfdir}/bash_completion.d || :
+fi
+%triggerun -- yum
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_yum || :
 
-%triggerin -- yum-utils
-%do_triggerin repomanage
-%triggerun -- yum-utils
-%do_triggerun repomanage
-
-%triggerin -- vnc
-%do_triggerin vncviewer
-%triggerun -- vnc
-%do_triggerun vncviewer
+%bashcomp_trigger yum-arch
 
 
 %files -f %{name}-ghosts.list
@@ -264,36 +282,71 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
+%{_sysconfdir}/bash_completion.d/bash-builtins
+%{_sysconfdir}/bash_completion.d/configure
+%{_sysconfdir}/bash_completion.d/dd
+%{_sysconfdir}/bash_completion.d/getent
+%{_sysconfdir}/bash_completion.d/iconv
+%{_sysconfdir}/bash_completion.d/rpm
 %{_datadir}/%{name}/
 
 
 %changelog
-* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-2
+* Sat Dec 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-5
+- Apply upstream post 1.1 generic vncviewer fixes.
+- Autoinstall vncviewer completion also on tigervnc.
+- Autoinstall chsh completion also on util-linux.
+
+* Tue Dec 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-4
+- Fix autoinstall of completions named other than the package (#546905).
+- Use environment-modules upstream completion instead of ours if available.
+- Autoinstall mysqladmin completion also on MySQL-client-community.
+
+* Tue Nov 17 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-3
+- Prepare for smooth coexistence with yum upstream completion.
+
+* Sun Nov  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-2
+- Use yum-utils completion instead of ours if available.
+
+* Mon Oct 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-1
+- Update to 1.1.
+- bash 4 quoting fix, mock and repomanage completions included upstream.
+
+* Sun Sep 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-5
+- Use svn completion from subversion instead of ours if available (#496456).
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Apr 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-3
+- Do not install cowsay completion, an updated version is shipped with it.
+
+* Tue Apr  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-2
 - Apply upstream patch to fix quoting issues with bash 4.x (#490322).
 
-* Mon Apr  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-1
+* Mon Apr  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-1
 - 1.0.
 
-* Mon Mar 23 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
+* Mon Mar 23 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-4.20090314gitf4f0984
 - Add dependency on coreutils for triggers (#490768).
 - Update and improve mock completion.
 
-* Sun Mar 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
+* Sun Mar 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-3.20090314gitf4f0984
 - git snapshot f4f0984, fixes #484578 (another issue), #486998.
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080705-3.20090211git47d0c5b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Feb 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
+* Wed Feb 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-2.20090211git47d0c5b
 - git snapshot 47d0c5b, fixes #484578.
 - lzop and repomanage completions included upstream.
 
-* Sun Jan 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
+* Sun Jan 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
 - r1252 snapshot; all patches applied upstream.
 - Do not install mercurial completion, an updated version is shipped with it.
 - Improve lzop and repomanage completion.
 
-* Tue Jan  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-1
+* Tue Jan  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 20080705-1
 - 20080705; new upstream at http://bash-completion.alioth.debian.org/
 - Perl, Debian, and scp patches applied upstream.
 - Patch to improve man completion: more sections, better filename handling.
@@ -301,10 +354,10 @@ rm -rf $RPM_BUILD_ROOT
 - Patch to fix and speed up rpm installed packages completion.
 - Update mock completion.
 
-* Thu Sep 25 2008 Ville Skytt? <ville.skytta at iki.fi>
+* Thu Sep 25 2008 Ville Skytt? <ville.skytta at iki.fi>
 - More Matroska associations (#463829, based on patch from Yanko Kaneti).
 
-* Thu Sep 11 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-13
+* Thu Sep 11 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-13
 - Borrow/improve/adapt to Fedora some patches from Mandriva: improved support
   for getent and rpm --eval, better rpm backup file avoidance, lzma support.
 - Patch/unpatch to fix gzip and bzip2 options completion.
@@ -312,177 +365,177 @@ rm -rf $RPM_BUILD_ROOT
 - Add and trigger-install support for lzop.
 - Associate *.sqlite with sqlite3.
 
-* Wed Jul 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-12
+* Wed Jul 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-12
 - Fix plague-client completion install (#456355, Ricky Zhou).
 - Trigger-install support for sitecopy.
 
-* Tue Apr 29 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-11
+* Tue Apr 29 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-11
 - Media player association improvements (#444467).
 
-* Sat Feb 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-10
+* Sat Feb 23 2008 Ville Skytt? <ville.skytta at iki.fi> - 20060301-10
 - Patch to fix filename completion with svn (#430059).
 - Trigger-install support for dsniff.
 - Drop disttag.
 
-* Mon Dec 31 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-8
+* Mon Dec 31 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-8
 - Associate VDR recording files with media players.
 - Update mock completion.
 
-* Fri Nov 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-7
+* Fri Nov 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-7
 - Add JPEG2000 extensions for display(1) (#304771).
 - Update mock completion.
 
-* Sat Sep 22 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-6
+* 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
+* Mon Aug 13 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-5
 - License: GPLv2+
 
 * Sun Jun 24 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> - 20060301-4
 - Update triggers to work with older versions of RPM
 
-* Wed Feb 28 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-3
+* Wed Feb 28 2007 Ville Skytt? <ville.skytta at iki.fi> - 20060301-3
 - Fix scp with single quotes (#217178).
 - Borrow fix for bzip2 w/spaces, and apropos and whatis support from Debian.
 
-* Thu Aug 31 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060301-2
+* Thu Aug 31 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060301-2
 - Trigger-install support for gcl, lilypond, mercurial and svk.
 - Improve mock completion a bit.
 
-* Thu Mar  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060301-1
+* Thu Mar  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 20060301-1
 - 20060301, patches and profile.d scriptlet applied/included upstream.
 - Convert docs to UTF-8.
 
-* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 20050721-4
+* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 20050721-4
 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
 - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.
 
-* Sat Feb  4 2006 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Feb  4 2006 Ville Skytt? <ville.skytta at iki.fi>
 - Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).
 
-* Sun Jan  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 20050721-3
+* Sun Jan  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 20050721-3
 - Patch to hopefully fix quoting problems with bash 3.1 (#177056).
 
-* Mon Nov 28 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050721-2
+* Mon Nov 28 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050721-2
 - Work around potential login problem in profile.d snippet (#174355).
 
-* Sat Nov 26 2005 Ville Skytt? <ville.skytta at iki.fi>
+* Sat Nov 26 2005 Ville Skytt? <ville.skytta at iki.fi>
 - Don't mark the main source file as %%config.
 - Make profile.d snippet non-executable (#35714) and noreplace.
 - Add mock, plague-client and repomanage completion.
 - Allow "cvs stat" completion.
 - Macroize trigger creation.
 
-* Fri Jul 22 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050721-1
+* Fri Jul 22 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050721-1
 - 20050721.
 
-* Wed Jul 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050720-1
+* Wed Jul 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050720-1
 - 20050720, all patches applied upstream.
 
-* Mon Jul 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050712-1
+* Mon Jul 18 2005 Ville Skytt? <ville.skytta at iki.fi> - 20050712-1
 - 20050712.
 - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).
 - Add/fix support for some multimedia formats and players.
 - Fix tarball completion.
 
-* Sat Jan 22 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050121-2
+* Sat Jan 22 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050121-2
 - Update to 20050121.
 
-* Thu Jan 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050112-1
+* Thu Jan 13 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050112-1
 - Update to 20050112, openssl patch applied upstream.
 
-* Wed Jan  5 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050103-1
+* Wed Jan  5 2005 Ville Skytt? <ville.skytta at iki.fi> - 0:20050103-1
 - Update to 20050103.
 
-* Sat Nov 27 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:20041017-5
+* Sat Nov 27 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:20041017-5
 - Change version scheme, bump release to provide Extras upgrade path.
 
-* Sat Nov  6 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.4.20041017
+* Sat Nov  6 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.4.20041017
 - Do the right thing with bash >= 3 too in profile.d snippet (bug 2228, thanks
   to Thorsten Leemhuis).
 
-* Mon Oct 18 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20041017
+* Mon Oct 18 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20041017
 - Update to 20041017, adds dhclient, lvm, and bittorrent completion.
 
-* Mon Jul 12 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040711
+* Mon Jul 12 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040711
 - Update to 20040711, patches applied upstream.
 
-* Sun Jul  4 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040704
+* Sun Jul  4 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040704
 - Update to 20040704.
 - Change to symlinked /etc/bash_completion.d snippets, add patch to read them.
 
-* Wed May 26 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040526
+* Wed May 26 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040526
 - Update to 20040526.
 
-* Thu Apr  1 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040331
+* Thu Apr  1 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20040331
 - Add command-specific contrib snippet copying triggers.
 
-* Thu Apr  1 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040331
+* Thu Apr  1 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040331
 - Update to 20040331.
 
-* Sun Feb 15 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040214
+* Sun Feb 15 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040214
 - Update to 20040214.
 
-* Wed Feb 11 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040210
+* Wed Feb 11 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040210
 - Update to 20040210.
 
-* Fri Jan  2 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040101
+* Fri Jan  2 2004 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20040101
 - Update to 20040101.
 - Update %%description.
 
-* Sat Dec 27 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20031225
+* Sat Dec 27 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20031225
 - Update to 20031225.
 
-* Sat Dec 20 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20031215
+* Sat Dec 20 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20031215
 - Don't pull in *.rpm* from %%{_sysconfdir}/bash_completion.d.
 
-* Mon Dec 15 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031215
+* Mon Dec 15 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031215
 - Update to 20031215.
 
-* Sun Nov 30 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031125
+* Sun Nov 30 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031125
 - Update to 20031125.
 
-* Thu Nov 13 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031112
+* Thu Nov 13 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031112
 - Update to 20031112.
 
-* Wed Oct 22 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031022
+* Wed Oct 22 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031022
 - Update to 20031022.
 
-* Tue Oct  7 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031007
+* Tue Oct  7 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20031007
 - Update to 20031007.
 
-* Tue Sep 30 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030929
+* Tue Sep 30 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030929
 - Update to 20030929.
 
-* Fri Sep 12 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030911
+* Fri Sep 12 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030911
 - Update to 20030911.
 
-* Thu Aug 21 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030821
+* Thu Aug 21 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030821
 - Update to 20030821.
 - Drop .nosrc.rpm patch, already applied upstream.
 
-* Sat Aug 16 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030811
+* Sat Aug 16 2003 Ville Skytt? <ville.skytta at iki.fi> 0:0.0-0.fdr.1.20030811
 - Update to 20030811.
 - Patch to make rpm --rebuild work with .nosrc.rpm's.
 
-* Sun Aug  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030803
+* Sun Aug  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030803
 - Update to 20030803.
 
-* Wed Jul 23 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030721
+* Wed Jul 23 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030721
 - Update to 20030721.
 
-* Sun Jul 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030713
+* Sun Jul 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030713
 - Update to 20030713.
 
-* Mon Jun 30 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030630
+* Mon Jun 30 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030630
 - Update to 20030630.
 
-* Sun Jun  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030607
+* Sun Jun  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030607
 - Update to 20030607.
 
-* Tue May 27 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030527
+* Tue May 27 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030527
 - Update to 20030527.
 
-* Sat May 24 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030505
+* Sat May 24 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.0-0.fdr.1.20030505
 - First build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Apr 2009 13:19:03 -0000	1.11
+++ sources	26 Dec 2009 11:57:26 -0000	1.12
@@ -1 +1,2 @@
-cd1c5648272917fbe0eef4ba30bb93f4  bash-completion-1.0.tar.gz
+1b5ed247ed904d0a2ec6a6d2c5876c52  bash-completion-1.1.tar.bz2
+7daa098026ae41f6c51a3f03035218f3  CHANGES-1.1


--- bash-completion-1.0-bash4quoting-490322.patch DELETED ---


--- bash-completion-mock DELETED ---


--- bash-completion-repomanage DELETED ---



From robert at fedoraproject.org  Sat Dec 26 13:24:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 13:24:10 +0000 (UTC)
Subject: File vnstat-1.9.tar.gz uploaded to lookaside cache by robert
Message-ID: <20091226132410.26B9310F857@bastion.fedoraproject.org>

A file has been added to the lookaside cache for vnstat:

ebaf8352fa3674faea2fe2ce1001a38d  vnstat-1.9.tar.gz



From robert at fedoraproject.org  Sat Dec 26 13:26:11 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 13:26:11 +0000 (UTC)
Subject: rpms/vnstat/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 vnstat.spec, 
	1.15, 1.16
Message-ID: <20091226132611.45D4C11C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/vnstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5425

Modified Files:
	.cvsignore sources vnstat.spec 
Log Message:
- Upgrade to 1.9 and make rpmlint more silent
- Make %pre script with useradd more conform to guidelines
- Replace %{_initddir} macro for more easy EPEL support
- Preserve timestamps when using sed to manipulate files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vnstat/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Nov 2009 10:22:13 -0000	1.4
+++ .cvsignore	26 Dec 2009 13:26:10 -0000	1.5
@@ -1 +1 @@
-vnstat-1.8.tar.gz
+vnstat-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vnstat/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Nov 2009 10:22:13 -0000	1.4
+++ sources	26 Dec 2009 13:26:10 -0000	1.5
@@ -1 +1 @@
-99a30716b5013e7e249e500ee6ee2985  vnstat-1.8.tar.gz
+ebaf8352fa3674faea2fe2ce1001a38d  vnstat-1.9.tar.gz


Index: vnstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnstat/devel/vnstat.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- vnstat.spec	19 Nov 2009 10:36:29 -0000	1.15
+++ vnstat.spec	26 Dec 2009 13:26:10 -0000	1.16
@@ -1,13 +1,13 @@
 Summary: Console-based network traffic monitor
 Name: vnstat
-Version: 1.8
-Release: 7%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://humdi.net/vnstat/
 Source: http://humdi.net/vnstat/vnstat-%{version}.tar.gz
-Requires(pre): /usr/sbin/useradd
+Requires(pre): shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -23,13 +23,21 @@ be used without root permissions. See th
 
 %prep
 %setup -q
+
 # disable maximum bandwidth setting
-%{__sed} -i -e "s,MaxBandwidth 100,MaxBandwidth 0,g" cfg/vnstat.conf
+%{__sed} -e "s,MaxBandwidth 100,MaxBandwidth 0,g" \
+  cfg/vnstat.conf > cfg/vnstat.conf.new
+touch -r cfg/vnstat.conf{,.new}
+%{__mv} -f cfg/vnstat.conf{.new,}
+
 # no automatic runlevel
-%{__sed} -i -e "s,chkconfig: 2345 20 50,chkconfig: - 20 50," \
-            -e "s,Default-Start:     2 3 4 5,Default-Start:," \
-            -e "s,Default-Stop:      0 1 6,Default-Stop:," \
-  examples/init.d/fedora/vnstat
+%{__sed} -e "s,chkconfig: 2345 20 50,chkconfig: - 20 50," \
+         -e "s,Default-Start:     2 3 4 5,Default-Start:," \
+         -e "s,Default-Stop:      0 1 6,Default-Stop:," \
+  examples/init.d/fedora/vnstat > examples/init.d/fedora/vnstat.new
+touch -r examples/init.d/fedora/vnstat{,.new}
+%{__mv} -f examples/init.d/fedora/vnstat{.new,}
+
 # Use -p everywhere, -s nowhere
 %{__sed} -i -e "s,install \(-s \)\?,install -p ," Makefile
 
@@ -39,11 +47,12 @@ be used without root permissions. See th
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
-%{__mkdir_p} $RPM_BUILD_ROOT%{_initddir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__install} -p -m 755 examples/init.d/fedora/vnstat $RPM_BUILD_ROOT%{_initddir}
+%{__install} -p -m 755 examples/init.d/fedora/vnstat \
+  $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 %{__rm} -rf examples/init.d
 %{__chmod} 644 examples/vnstat.cgi
 %{__chmod} 644 examples/vnstat.cron
@@ -75,7 +84,7 @@ END
 VNSTAT_CONF=%{_sysconfdir}/sysconfig/%{name}
 
 if [ ! -f $VNSTAT_CONF ]; then
-	exit 0
+  exit 0
 fi
 
 . \$VNSTAT_CONF
@@ -87,8 +96,9 @@ END
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} \
-	-M -c "vnStat user" %{name} > /dev/null 2>&1 || :
+getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
+getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \
+  -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "vnStat user" %{name}
 
 %post
 /sbin/chkconfig --add vnstat || :
@@ -109,7 +119,7 @@ fi
 %doc CHANGES COPYING FAQ README INSTALL examples
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
-%{_initddir}/vnstat
+%{_sysconfdir}/rc.d/init.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_mandir}/man*/*
 %{_bindir}/vnstat
@@ -119,6 +129,12 @@ fi
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
 
 %changelog
+* Sat Dec 26 2009 Robert Scheck <robert at fedoraproject.org> - 1.9-1
+- Upgrade to 1.9 and make rpmlint more silent
+- Make %%pre script with useradd more conform to guidelines
+- Replace %%{_initddir} macro for more easy EPEL support
+- Preserve timestamps when using sed to manipulate files
+
 * Wed Nov 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.8-7
 - Prevent upstream build from stripping binaries before rpmbuild does it.
 



From jnovy at fedoraproject.org  Sat Dec 26 14:02:12 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat, 26 Dec 2009 14:02:12 +0000 (UTC)
Subject: File mc-4.7.0.tar.lzma uploaded to lookaside cache by jnovy
Message-ID: <20091226140212.1F70310F849@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mc:

f945a4767104534167ecb8dae7c23c06  mc-4.7.0.tar.lzma



From jnovy at fedoraproject.org  Sat Dec 26 14:04:10 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sat, 26 Dec 2009 14:04:10 +0000 (UTC)
Subject: rpms/mc/devel .cvsignore, 1.43, 1.44 mc.spec, 1.154, 1.155 sources,
	1.51, 1.52
Message-ID: <20091226140410.5CEE611C00EF@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13384

Modified Files:
	.cvsignore mc.spec sources 
Log Message:
* Sat Dec 26 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-1
- update to official 4.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	21 Dec 2009 16:31:14 -0000	1.43
+++ .cvsignore	26 Dec 2009 14:04:08 -0000	1.44
@@ -1 +1 @@
-mc-4.7.0-pre4-20091221git.tar.bz2
+mc-4.7.0.tar.lzma


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- mc.spec	21 Dec 2009 16:31:15 -0000	1.154
+++ mc.spec	26 Dec 2009 14:04:09 -0000	1.155
@@ -1,15 +1,14 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.9.pre4.20091221git%{?dist}
+Release:	1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
 # tarball created from git clone git://midnight-commander.org/git/mc.git
-Source0:	mc-%{version}-pre4-20091221git.tar.bz2
+Source0:	mc-%{version}.tar.lzma
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gettext cvs automake autoconf libtool
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel
 Requires:	dev >= 3.3-3
 
@@ -28,7 +27,6 @@ specific files.
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
-./autogen.sh
 %configure	--with-screen=slang \
 		--enable-charset \
 		--with-samba \
@@ -84,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Sat Dec 26 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-1
+- update to official 4.7.0
+
 * Mon Dec 21 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.9.pre4.20091221git
 - provide yum-repo.syntax (#549014)
 - avoid occasional crash while reading panels (#548987)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	21 Dec 2009 16:31:15 -0000	1.51
+++ sources	26 Dec 2009 14:04:09 -0000	1.52
@@ -1 +1 @@
-c03992e430a41d3e73faa6360979cadf  mc-4.7.0-pre4-20091221git.tar.bz2
+f945a4767104534167ecb8dae7c23c06  mc-4.7.0.tar.lzma



From rathann at fedoraproject.org  Sat Dec 26 14:25:14 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 26 Dec 2009 14:25:14 +0000 (UTC)
Subject: rpms/tachyon/devel tachyon-shared.patch, NONE, 1.1 tachyon.spec, 1.14,
	1.15
Message-ID: <20091226142514.23D6811C00EF@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tachyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17555

Modified Files:
	tachyon.spec 
Added Files:
	tachyon-shared.patch 
Log Message:
* Sat Dec 26 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.7-2
- drop LAM support
- add shared library (based on Debian patch)
- simplify some specfile constructs
- improve descriptions


tachyon-shared.patch:
 Makefile |   85 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

--- NEW FILE tachyon-shared.patch ---
diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile
--- tachyon/unix/Makefile.shared	2009-04-23 17:11:55.000000000 +0200
+++ tachyon/unix/Makefile	2009-12-26 14:48:12.000000000 +0100
@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon
 #
 # Name of raytracing library file to create
 #
-RAYLIB=${ARCHDIR}/libtachyon.a
+RAYLIB=${ARCHDIR}/libtachyon.so
 RAYLIBDIR=${ARCHDIR}
 
 #
@@ -254,124 +254,125 @@ RAYOBJS= ${OBJDIR}/api.o \
 	${OBJDIR}/tgafile.o \
 	${OBJDIR}/winbmp.o
 
+${RAYLIB} : VERSION=$(shell grep TACHYON_VERSION_STRING ../src/rtcommon.h | cut -d\" -f 2)
+${RAYLIB} : DIRNAME=tachyon-${VERSION}
 ${RAYLIB} : ${RAYOBJS}
-	rm -f ${RAYLIB}
-	${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS}
-	${RANLIB} ${RAYLIB}
+	${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS}
+	ln -s lib${DIRNAME}.so $@
 
 ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o
 
 ${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o
 
 ${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o
 
 ${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} 
-	${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o
 
 ${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h
-	${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o
 
 ${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o
 
 ${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o
 
 ${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o
 
 ${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o
 
 ${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o
 
 ${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o
 
 ${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h
-	${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o
 
 ${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o
 
 ${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o
 
 ${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o
 
 ${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o
 
 ${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o
 
 ${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o
 
 ${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o
 
 ${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o
 
 ${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o
 
 ${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h
-	${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o
 
 ${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o
 
 ${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o
 
 ${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o
 
 ${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o
 
 ${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o
 
 ${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o
 
 ${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o
 
 ${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o
 
 ${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o
 
 ${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h
-	${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o
 
 ${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o
 
 ${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o
 
 ${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o
 
 ${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o
 
 ${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS}
-	${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o
 
 ${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h
-	${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
 
 clean :
 	@echo "Cleaning object files, binaries etc."


Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tachyon.spec	21 Sep 2009 00:33:59 -0000	1.14
+++ tachyon.spec	26 Dec 2009 14:25:13 -0000	1.15
@@ -1,43 +1,47 @@
-%ifarch %{ix86} alpha ppc sparc
-%define target linux
-%endif
-%ifarch ppc64 sparc64 x86_64
+%ifarch alpha ppc64 sparc64 x86_64
 %define target linux-64
+%else
+%define target linux
 %endif
 
 %define variants thr thr-ogl
-%define mpi_variants lam lam-ogl
 
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
 Version: 0.98.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
 Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}/%{name}-%{version}.tar.gz
 # taken from Debian package
 Source1: %{name}.1
 Patch0: %{name}-rpm.patch
+Patch1: %{name}-shared.patch
 License: BSD with advertising
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: environment-modules
 BuildRequires: libGLU-devel
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
-BuildRequires: lam-devel
 BuildRequires: latex2html
 BuildRequires: %{_bindir}/dvips
 BuildRequires: %{_bindir}/latex
 BuildRequires: %{_bindir}/pdflatex
 
 %description
-A portable, high performance parallel ray tracing system supporting MPI
-and multithreaded implementations.  Tachyon is built as a C callable
+A portable, high performance parallel ray tracing system with
+multithreaded implementation.
+
+%package libs
+Summary: Parallel / Multiprocessor Ray Tracing System library
+Group: System Environment/Libraries
+
+%description libs
+A portable, high performance parallel ray tracing system with
+multithreaded implementation.  Tachyon is built as a C callable
 library, which can be used with the included demo programs or within
-your own application.  The distribution also includes a simple scene
-file parser front-end which reads a few different formats.
+your own application.
 
-This package contains pthread build.
+This package contains the shared library.
 
 %package gl
 Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
@@ -45,41 +49,19 @@ Group: Applications/Engineering
 Provides: %{name} = %{version}-%{release}
 
 %description gl
-A portable, high performance parallel ray tracing system supporting MPI
-and multithreaded implementations.  Tachyon is built as a C callable
-library, which can be used with the included demo programs or within
-your own application.  The distribution also includes a simple scene
-file parser front-end which reads a few different formats.
-
-This package contains pthread build with OpenGL display.
-
-%package lam
-Summary: Parallel / Multiprocessor Ray Tracing System
-Group: Applications/Engineering
-Provides: %{name} = %{version}-%{release}
+A portable, high performance parallel ray tracing system with
+multithreaded implementation.
 
-%description lam
-A portable, high performance parallel ray tracing system supporting MPI
-and multithreaded implementations.  Tachyon is built as a C callable
-library, which can be used with the included demo programs or within
-your own application.  The distribution also includes a simple scene
-file parser front-end which reads a few different formats.
-
-This package contains LAM build.
-
-%package lam-gl
-Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
-Group: Applications/Engineering
-Provides: %{name} = %{version}-%{release}
+This package contains OpenGL-enabled build.
 
-%description lam-gl
-A portable, high performance parallel ray tracing system supporting MPI
-and multithreaded implementations.  Tachyon is built as a C callable
-library, which can be used with the included demo programs or within
-your own application.  The distribution also includes a simple scene
-file parser front-end which reads a few different formats.
+%package devel
+Summary: Development files for tachyon
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
 
-This package contains LAM build with OpenGL display.
+%description devel
+This package contains development headers and libraries for developing
+with tachyon.
 
 %package docs
 Summary: Documentation and example scenes for tachyon
@@ -93,6 +75,7 @@ with tachyon.
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .r
+%patch1 -p1 -b .shared
 find . -name CVS | xargs %{__rm} -r
 # executable sources
 chmod 644 src/hash.{c,h}
@@ -106,11 +89,6 @@ pushd unix
 for variant in %{variants} ; do
   %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant
 done
-source /etc/profile.d/modules.sh
-module load lam-%{_arch}
-for variant in %{mpi_variants} ; do
-  %{__make} %{?_smp_mflags} OPTFLAGS="$CFLAGS $RPM_OPT_FLAGS" %{target}-$variant
-done
 popd
 
 pushd docs
@@ -119,38 +97,41 @@ popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon,%{_mandir}/man1}
-for variant in %{variants} %{mpi_variants} ; do
+mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},{%{_datadir},%{_includedir}}/tachyon,%{_mandir}/man1}
+for variant in %{variants} ; do
   install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant
 done
 rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
-%{__mv} docs/tachyon docs/html
+mkdir docs/html
+%{__cp} -pr docs/tachyon/*.{css,html,png} docs/html
 %{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/
 install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1
+%{__cp} -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/
+install -pm644 src/{hash,rtcommon,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Copyright README
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
-%files gl
+%files libs
 %defattr(644,root,root,755)
 %doc Copyright README
-%attr(755,root,root) %{_bindir}/%{name}-ogl
+%{_libdir}/libtachyon-%{version}.so
 
-%files lam
+%files gl
 %defattr(644,root,root,755)
-%doc Copyright README
-%attr(755,root,root) %{_bindir}/%{name}-lam
+%attr(755,root,root) %{_bindir}/%{name}-ogl
+%{_mandir}/man1/%{name}-ogl.1*
 
-%files lam-gl
+%files devel
 %defattr(644,root,root,755)
-%doc Copyright README
-%attr(755,root,root) %{_bindir}/%{name}-lam-ogl
+%{_includedir}/tachyon
+%{_libdir}/libtachyon.so
 
 %files docs
 %defattr(644,root,root,755)
@@ -158,6 +139,12 @@ install -pm644 %{SOURCE1} $RPM_BUILD_ROO
 %{_datadir}/tachyon
 
 %changelog
+* Sat Dec 26 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.7-2
+- drop LAM support
+- add shared library (based on Debian patch)
+- simplify some specfile constructs
+- improve descriptions
+
 * Sun Sep 20 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98.7-1
 - update to 0.98.7 release
 - simplify specfile ifdeffery and reduce patch size



From jgu at fedoraproject.org  Sat Dec 26 14:25:34 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 26 Dec 2009 14:25:34 +0000 (UTC)
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.38,1.39
Message-ID: <20091226142534.3E48811C00EF@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/pkgs/rpms/emacs-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17681

Modified Files:
	emacs-vm.spec 
Log Message:
* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-2
- Add -fno-var-tracking-assignments to CFLAGS to allow build to complete (gcc
  bug http://gcc.gnu.org/PR41371)



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- emacs-vm.spec	18 Dec 2009 23:12:41 -0000	1.38
+++ emacs-vm.spec	26 Dec 2009 14:25:34 -0000	1.39
@@ -17,7 +17,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: 8.0.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: https://launchpad.net/vm
@@ -58,7 +58,10 @@ package. It is not necessary to install 
 sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+# -fno-var-tracking-assignments added here to work around
+# http://gcc.gnu.org/PR41371 
+# Remove once this bug is fixed
+export CFLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
 %configure
 make
 
@@ -119,6 +122,10 @@ fi
 %{pkgdir}/*.el
 
 %changelog
+* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-2
+- Add -fno-var-tracking-assignments to CFLAGS to allow build to complete (gcc
+  bug http://gcc.gnu.org/PR41371)
+
 * Fri Dec 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-1
 - Update to 8.0.14
 - Drop old macros for emacspackaging and use _emacs macros



From jgu at fedoraproject.org  Sat Dec 26 14:26:29 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 26 Dec 2009 14:26:29 +0000 (UTC)
Subject: rpms/emacs-vm/F-12 emacs-vm.spec,1.38,1.39
Message-ID: <20091226142629.44C7411C00EF@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/pkgs/rpms/emacs-vm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18019

Modified Files:
	emacs-vm.spec 
Log Message:
* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-2
- Add -fno-var-tracking-assignments to CFLAGS to allow build to complete (gcc
  bug http://gcc.gnu.org/PR41371)



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/F-12/emacs-vm.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- emacs-vm.spec	18 Dec 2009 23:13:39 -0000	1.38
+++ emacs-vm.spec	26 Dec 2009 14:26:29 -0000	1.39
@@ -17,7 +17,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: 8.0.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: https://launchpad.net/vm
@@ -58,7 +58,10 @@ package. It is not necessary to install 
 sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+# -fno-var-tracking-assignments added here to work around
+# http://gcc.gnu.org/PR41371 
+# Remove once this bug is fixed
+export CFLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
 %configure
 make
 
@@ -119,6 +122,10 @@ fi
 %{pkgdir}/*.el
 
 %changelog
+* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-2
+- Add -fno-var-tracking-assignments to CFLAGS to allow build to complete (gcc
+  bug http://gcc.gnu.org/PR41371)
+
 * Fri Dec 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-1
 - Update to 8.0.14
 - Drop old macros for emacspackaging and use _emacs macros



From linuxdonald at fedoraproject.org  Sat Dec 26 14:44:44 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat, 26 Dec 2009 14:44:44 +0000 (UTC)
Subject: File openal-soft-3793919892e6d61e5fec3abeaaeebc3f2332be13.tar.gz
	uploaded to lookaside cache by linuxdonald
Message-ID: <20091226144444.1CB9E10F842@bastion.fedoraproject.org>

A file has been added to the lookaside cache for openal-soft:

c325850fcfee07d10dcba95467ef94ea  openal-soft-3793919892e6d61e5fec3abeaaeebc3f2332be13.tar.gz



From linuxdonald at fedoraproject.org  Sat Dec 26 14:45:48 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat, 26 Dec 2009 14:45:48 +0000 (UTC)
Subject: rpms/openal-soft/F-12 .cvsignore, 1.6, 1.7 openal-soft.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20091226144548.BE01F11C00EF@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22066

Modified Files:
	.cvsignore openal-soft.spec sources 
Log Message:
Update to an new openal-soft git version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Nov 2009 22:25:21 -0000	1.6
+++ .cvsignore	26 Dec 2009 14:45:48 -0000	1.7
@@ -1 +1 @@
-openal-soft-1.10.622.tar.bz2
+openal-soft-3793919892e6d61e5fec3abeaaeebc3f2332be13.tar.gz


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-12/openal-soft.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openal-soft.spec	10 Nov 2009 23:33:17 -0000	1.12
+++ openal-soft.spec	26 Dec 2009 14:45:48 -0000	1.13
@@ -1,12 +1,15 @@
+%global revision 3793919892e6d61e5fec3abeaaeebc3f2332be13
+
 Name:		openal-soft
 Version:	1.10.622
-Release:	2%{?dist}
+Release:	3.%{revision}git%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
-Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
+#http://repo.or.cz/w/openal-soft.git?a=snapshot;h=%{revision};sf=tgz 
+Source0:	openal-soft-%{revision}.tar.gz
 Patch1:		openal-soft.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,7 +43,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n openal-soft
 %patch1 -p0 -b .orig
 
 %build
@@ -76,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Sat Dec 26 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-3.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Updatet to an newer git version because of some pulseaudio fixes.
+
 * Tue Nov 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.10.622-2
 - add default config
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Nov 2009 22:25:22 -0000	1.6
+++ sources	26 Dec 2009 14:45:48 -0000	1.7
@@ -1 +1 @@
-d6324d0e7a4fd799e48e720c023fe1c0  openal-soft-1.10.622.tar.bz2
+c325850fcfee07d10dcba95467ef94ea  openal-soft-3793919892e6d61e5fec3abeaaeebc3f2332be13.tar.gz



From jgu at fedoraproject.org  Sat Dec 26 14:51:30 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 26 Dec 2009 14:51:30 +0000 (UTC)
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.39,1.40
Message-ID: <20091226145130.14E0611C00EF@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/pkgs/rpms/emacs-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23444

Modified Files:
	emacs-vm.spec 
Log Message:
* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.1.0-0.1.beta
- Update to 8.1.0 beta version



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- emacs-vm.spec	26 Dec 2009 14:25:34 -0000	1.39
+++ emacs-vm.spec	26 Dec 2009 14:51:29 -0000	1.40
@@ -16,12 +16,12 @@
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
-Version: 8.0.14
-Release: 2%{?dist}
+Version: 8.1.0
+Release: 0.1.beta%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: https://launchpad.net/vm
-Source0: http://launchpad.net/vm/8.0.x/%{version}/+download/vm-%{version}.tgz
+Source0: http://launchpad.net/vm/trunk/%{version}-beta/+download/vm-%{version}-beta.tgz
 
 Requires: emacs >= %{_emacs_version}
 Requires(pre): /sbin/install-info 
@@ -52,7 +52,7 @@ The %{name}-el package contains the elis
 package. It is not necessary to install this if you want to run vm.
 
 %prep
-%setup -q -n vm-%{version}
+%setup -q -n vm-%{version}-beta
 
 # Add missing entry for u-vm-color.el to lisp Makefile.in
 sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in
@@ -122,6 +122,9 @@ fi
 %{pkgdir}/*.el
 
 %changelog
+* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.1.0-0.1.beta
+- Update to 8.1.0 beta version
+
 * Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-2
 - Add -fno-var-tracking-assignments to CFLAGS to allow build to complete (gcc
   bug http://gcc.gnu.org/PR41371)



From jgu at fedoraproject.org  Sat Dec 26 15:16:42 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 26 Dec 2009 15:16:42 +0000 (UTC)
Subject: File vm-8.1.0-beta.tgz uploaded to lookaside cache by jgu
Message-ID: <20091226151642.6AD5E10F842@bastion.fedoraproject.org>

A file has been added to the lookaside cache for emacs-vm:

03eac8406630ea4cf85ee422a76f62b8  vm-8.1.0-beta.tgz



From jgu at fedoraproject.org  Sat Dec 26 15:17:39 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 26 Dec 2009 15:17:39 +0000 (UTC)
Subject: rpms/emacs-vm/devel .cvsignore,1.17,1.18 sources,1.17,1.18
Message-ID: <20091226151739.8FC4811C00EF@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/pkgs/rpms/emacs-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28788

Modified Files:
	.cvsignore sources 
Log Message:
Update sources file for vm-8.1.0-beta.tgz



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Dec 2009 23:12:41 -0000	1.17
+++ .cvsignore	26 Dec 2009 15:17:39 -0000	1.18
@@ -1 +1 @@
-vm-8.0.14.tgz
+vm-8.1.0-beta.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Dec 2009 23:12:41 -0000	1.17
+++ sources	26 Dec 2009 15:17:39 -0000	1.18
@@ -1 +1 @@
-35657d3d3dec1dcce5b31ac155e0cc4f  vm-8.0.14.tgz
+03eac8406630ea4cf85ee422a76f62b8  vm-8.1.0-beta.tgz



From robert at fedoraproject.org  Sat Dec 26 15:45:45 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 15:45:45 +0000 (UTC)
Subject: rpms/vnstat/devel vnstat-1.9-overflow.patch, NONE, 1.1 vnstat.spec,
	1.16, 1.17
Message-ID: <20091226154545.5243A11C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/vnstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2560

Modified Files:
	vnstat.spec 
Added Files:
	vnstat-1.9-overflow.patch 
Log Message:
Work around a buffer overflow in vnstati until 1.10 (#550635)


vnstat-1.9-overflow.patch:
 image.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vnstat-1.9-overflow.patch ---
Workaround by Teemu Toivola <tst at iki.fi> for vnstat <= 1.9, which solves
a buffer overflow in vnstati. See Red Hat Bugzilla ID #550635 for details.

--- vnstat-1.9/src/image.c		2009-09-10 19:15:56.000000000 +0200
+++ vnstat-1.9/src/image.c.overflow	2009-12-26 16:39:36.000000000 +0100
@@ -1398,7 +1398,7 @@
 
 char *getimagescale(uint64_t kb, int rate)
 {
-	static char buffer[6];
+	static char buffer[7];
 	uint32_t limit[3];
 	int unit;
 	


Index: vnstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnstat/devel/vnstat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- vnstat.spec	26 Dec 2009 13:26:10 -0000	1.16
+++ vnstat.spec	26 Dec 2009 15:45:45 -0000	1.17
@@ -1,12 +1,13 @@
 Summary: Console-based network traffic monitor
 Name: vnstat
 Version: 1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://humdi.net/vnstat/
 Source: http://humdi.net/vnstat/vnstat-%{version}.tar.gz
+Patch0: vnstat-1.9-overflow.patch
 Requires(pre): shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -23,6 +24,7 @@ be used without root permissions. See th
 
 %prep
 %setup -q
+%patch0 -p1 -b .overflow
 
 # disable maximum bandwidth setting
 %{__sed} -e "s,MaxBandwidth 100,MaxBandwidth 0,g" \
@@ -129,6 +131,9 @@ fi
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
 
 %changelog
+* Sat Dec 26 2009 Robert Scheck <robert at fedoraproject.org> - 1.9-2
+- Work around a buffer overflow in vnstati until 1.10 (#550635)
+
 * Sat Dec 26 2009 Robert Scheck <robert at fedoraproject.org> - 1.9-1
 - Upgrade to 1.9 and make rpmlint more silent
 - Make %%pre script with useradd more conform to guidelines



From jgu at fedoraproject.org  Sat Dec 26 15:58:22 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 26 Dec 2009 15:58:22 +0000 (UTC)
Subject: rpms/emacs-bbdb/devel emacs-bbdb.spec,1.6,1.7
Message-ID: <20091226155822.4F9AC11C00EF@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/pkgs/rpms/emacs-bbdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5598

Modified Files:
	emacs-bbdb.spec 
Log Message:
* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-4
- Update spec file to use macros installed with the emacs package rather than
  pkgconfig stuff
- Remove BuildRoot and rm -rf buildroot from install section



Index: emacs-bbdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-bbdb/devel/emacs-bbdb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- emacs-bbdb.spec	24 Jul 2009 22:03:10 -0000	1.6
+++ emacs-bbdb.spec	26 Dec 2009 15:58:22 -0000	1.7
@@ -1,15 +1,3 @@
-# If the emacs-el package has installed a pkgconfig file, use that to determine
-# install locations and Emacs version at build time, otherwise set defaults.
-%if %($(pkg-config emacs) ; echo $?)
-%define emacs_version 22.1
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
-%endif
-
 # Note on building bbdb with support for VM: if support for VM in bbdb is
 # required, then the source elisp for VM must be installed at build time. If
 # support for BBDB is required in VM, then the BBDB source elisp must be present
@@ -19,19 +7,19 @@
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define vmsupport 1
 
-%define lispdir %{emacs_lispdir}/bbdb
+%define lispdir %{_emacs_sitelispdir}/bbdb
 %define texdir %{_datadir}/texmf/tex/generic/bbdb
 	
 
 Name:           emacs-bbdb
 Version:        2.35
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:		1
 Summary:        A contact management utility for use with Emacs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bbdb.sourceforge.net/
-Requires:       emacs(bin) >= %{emacs_version}
+Requires:       emacs(bin) >= %{_emacs_version}
 
 Source0:        bbdb-2.35.tar.gz
 
@@ -40,8 +28,7 @@ Source0:        bbdb-2.35.tar.gz
 Patch0:		bbdb-2.35-fix_lisp_makefile.patch
 
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  emacs emacs-el texinfo-tex
+BuildRequires:  emacs texinfo-tex
 
 %if %{vmsupport}
 BuildRequires:  emacs-vm-el
@@ -87,7 +74,7 @@ done
 # Note --enable-developer simply gives more verbose output during building,
 # handy for debugging
 %if %{vmsupport}
-%configure --with-vm-dir=%{emacs_lispdir}/vm --enable-developer
+%configure --with-vm-dir=%{_emacs_sitelispdir}/vm --enable-developer
 %else
 %configure --enable-developer
 %endif
@@ -96,8 +83,6 @@ done
 make all
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # There is no usable install make rule - install by hand.
 install -d $RPM_BUILD_ROOT%{lispdir}
 install -p -m 0644 lisp/*.{elc,el} $RPM_BUILD_ROOT%{lispdir}
@@ -107,8 +92,8 @@ install -d $RPM_BUILD_ROOT%{_infodir}
 install -p -m 0644 texinfo/bbdb.info $RPM_BUILD_ROOT%{_infodir}
 
 # Create and install init file
-install -d $RPM_BUILD_ROOT%{emacs_startdir}
-cat > $RPM_BUILD_ROOT%{emacs_startdir}/bbdb-mode-init.el << EOF
+install -d $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+cat > $RPM_BUILD_ROOT%{_emacs_sitestartdir}/bbdb-mode-init.el << EOF
 (require 'bbdb-autoloads)
 EOF
 
@@ -138,7 +123,7 @@ fi
 %doc %{_infodir}/bbdb.info.gz
 %{lispdir}/*.elc
 %{texdir}/*.tex
-%{emacs_startdir}/bbdb-mode-init.el
+%{_emacs_sitestartdir}/bbdb-mode-init.el
 %dir %{lispdir}
 
 %files el 
@@ -146,6 +131,11 @@ fi
 %{lispdir}/*.el
 
 %changelog
+* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-4
+- Update spec file to use macros installed with the emacs package rather than
+  pkgconfig stuff
+- Remove BuildRoot and rm -rf buildroot from install section
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.35-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Sat Dec 26 16:08:44 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 26 Dec 2009 16:08:44 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.21,1.22
Message-ID: <20091226160844.125CC11C00EF@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7913

Modified Files:
	rygel.spec 
Log Message:
- update description


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- rygel.spec	25 Dec 2009 17:55:53 -0000	1.21
+++ rygel.spec	26 Dec 2009 16:08:43 -0000	1.22
@@ -1,7 +1,7 @@
 Name:           rygel
 Version:        0.4.8
-Release:        1%{?dist}
-Summary:        A UPnP v2 Media Server
+Release:        2%{?dist}
+Summary:        A collection of UPnP/DLNA services
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
@@ -24,7 +24,8 @@ BuildRequires: vala-devel
 BuildRequires: vala-tools
 
 %description
-Rygel is an implementation of the UPnP MediaServer V 2.0 specification that is 
+Rygel is a collection of UPnP/DLNA services implemented through a plug-in mechanism. 
+It includes an implementation of the UPnP MediaServer V 2.0 specification that is 
 specifically designed for GNOME. It is based on GUPnP and is written (mostly) 
 in Vala language. The project was previously known as gupnp-media-server. 
 
@@ -94,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Sat Dec 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.8-2
+- Update description
+
 * Tue Dec 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.8-1
 - Update to 0.4.8
 



From drago01 at fedoraproject.org  Sat Dec 26 16:34:36 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 16:34:36 +0000 (UTC)
Subject: rpms/compiz/F-12 compiz-0.8.2-icon-fix.patch, NONE,
	1.1 compiz-0.8.2-multiscreen-decorator.patch, NONE,
	1.1 compiz-0.8.2-wall.patch, 1.4, 1.5 compiz.spec, 1.190, 1.191
Message-ID: <20091226163436.A079111C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13653

Modified Files:
	compiz-0.8.2-wall.patch compiz.spec 
Added Files:
	compiz-0.8.2-icon-fix.patch 
	compiz-0.8.2-multiscreen-decorator.patch 
Log Message:
fix regression + other fixes

compiz-0.8.2-icon-fix.patch:
 window.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE compiz-0.8.2-icon-fix.patch ---
>From 4c7ffc4f1d82414a466fa0768d16fa96f30e3f7a Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann at web.de>
Date: Tue, 08 Dec 2009 10:28:30 +0000
Subject: Fix icon property reading if the icon pixmap has a depth of 1 bit.

---
diff --git a/src/window.c b/src/window.c
index 6e54470..90922d1 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5298,6 +5298,8 @@ readWindowIconHint (CompWindow *w)
 	{
 	    if (maskImage && !XGetPixel (maskImage, i, j))
 		*p++ = 0;
+	    else if (image->depth == 1)
+		*p++ = colors[k].pixel ? 0xffffffff : 0xff000000;
 	    else
 		*p++ = 0xff000000                             | /* alpha */
 		       (((colors[k].red >> 8) & 0xff) << 16)  | /* red */
--
cgit v0.8.2


compiz-0.8.2-multiscreen-decorator.patch:
 decoration.xml.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE compiz-0.8.2-multiscreen-decorator.patch ---
diff -upNr compiz-0.8.2.orign/metadata/decoration.xml.in compiz-0.8.2/metadata/decoration.xml.in
--- compiz-0.8.2.orign/metadata/decoration.xml.in	2009-02-15 10:10:23.000000000 +0100
+++ compiz-0.8.2/metadata/decoration.xml.in	2009-12-26 17:26:47.997385112 +0100
@@ -50,6 +50,7 @@
 	    <option name="command" type="string">
 		<_short>Command</_short>
 		<_long>Decorator command line that is executed if no decorator is already running</_long>
+		<default>gtk-window-decorator</default>
 	    </option>
 	    <option name="mipmap" type="bool">
 		<_short>Mipmap</_short>

compiz-0.8.2-wall.patch:
 metadata/Makefile.am   |    1 
 metadata/wall.xml.in   |  357 +++++++
 plugins/Makefile.am    |    7 
 plugins/wall.c         | 2216 +++++++++++++++++++++++++++++++++++++++++++++++++
 plugins/wall_options.c | 1936 ++++++++++++++++++++++++++++++++++++++++++
 plugins/wall_options.h |  375 ++++++++
 6 files changed, 4891 insertions(+), 1 deletion(-)

Index: compiz-0.8.2-wall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz-0.8.2-wall.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- compiz-0.8.2-wall.patch	30 Nov 2009 15:57:14 -0000	1.4
+++ compiz-0.8.2-wall.patch	26 Dec 2009 16:34:35 -0000	1.5
@@ -1,6 +1,6 @@
 diff -upNr compiz-0.8.2.orign/metadata/Makefile.am compiz-0.8.2/metadata/Makefile.am
 --- compiz-0.8.2.orign/metadata/Makefile.am	2009-02-15 10:11:43.000000000 +0100
-+++ compiz-0.8.2/metadata/Makefile.am	2009-07-11 10:36:15.265893844 +0200
++++ compiz-0.8.2/metadata/Makefile.am	2009-12-26 17:23:00.945580573 +0100
 @@ -31,6 +31,7 @@ xml_in_files =		   \
  	video.xml.in       \
  	water.xml.in       \
@@ -11,7 +11,7 @@ diff -upNr compiz-0.8.2.orign/metadata/M
  xml_DATA     = $(xml_files)
 diff -upNr compiz-0.8.2.orign/metadata/wall.xml.in compiz-0.8.2/metadata/wall.xml.in
 --- compiz-0.8.2.orign/metadata/wall.xml.in	1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/metadata/wall.xml.in	2009-03-05 04:36:21.000000000 +0100
++++ compiz-0.8.2/metadata/wall.xml.in	2009-12-26 17:23:00.945580573 +0100
 @@ -0,0 +1,357 @@
 +<?xml version="1.0"?>
 +<compiz>
@@ -372,7 +372,7 @@ diff -upNr compiz-0.8.2.orign/metadata/w
 +</compiz>
 diff -upNr compiz-0.8.2.orign/plugins/Makefile.am compiz-0.8.2/plugins/Makefile.am
 --- compiz-0.8.2.orign/plugins/Makefile.am	2009-02-15 10:10:23.000000000 +0100
-+++ compiz-0.8.2/plugins/Makefile.am	2009-07-11 10:19:29.303832241 +0200
++++ compiz-0.8.2/plugins/Makefile.am	2009-12-26 17:23:00.945580573 +0100
 @@ -74,6 +74,9 @@ libcommands_la_SOURCES = commands.c
  libgnomecompat_la_LDFLAGS = -module -avoid-version -no-undefined
  libgnomecompat_la_SOURCES = gnomecompat.c
@@ -403,8 +403,8 @@ diff -upNr compiz-0.8.2.orign/plugins/Ma
  	$(libinotify_module)	\
 diff -upNr compiz-0.8.2.orign/plugins/wall.c compiz-0.8.2/plugins/wall.c
 --- compiz-0.8.2.orign/plugins/wall.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/plugins/wall.c	2009-03-05 04:36:21.000000000 +0100
-@@ -0,0 +1,2215 @@
++++ compiz-0.8.2/plugins/wall.c	2009-12-26 17:23:54.400386828 +0100
+@@ -0,0 +1,2216 @@
 +/**
 + *
 + * Compiz wall plugin
@@ -2591,7 +2591,7 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
 +static Bool
 +wallInit (CompPlugin *p)
 +{
-+   dlopen ("libcairo.so.2", RTLD_LAZY);
++    dlopen ("libcairo.so.2", RTLD_LAZY);
 +    WallCorePrivateIndex = allocateCorePrivateIndex ();
 +    if (WallCorePrivateIndex < 0)
 +	return FALSE;
@@ -2623,7 +2623,7 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
 +}
 diff -upNr compiz-0.8.2.orign/plugins/wall_options.c compiz-0.8.2/plugins/wall_options.c
 --- compiz-0.8.2.orign/plugins/wall_options.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/plugins/wall_options.c	2009-07-10 23:02:20.185497000 +0200
++++ compiz-0.8.2/plugins/wall_options.c	2009-12-26 17:23:00.947534145 +0100
 @@ -0,0 +1,1936 @@
 +/*
 + * This file is autogenerated with bcop:
@@ -4563,7 +4563,7 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
 +
 diff -upNr compiz-0.8.2.orign/plugins/wall_options.h compiz-0.8.2/plugins/wall_options.h
 --- compiz-0.8.2.orign/plugins/wall_options.h	1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/plugins/wall_options.h	2009-07-10 23:02:18.076511000 +0200
++++ compiz-0.8.2/plugins/wall_options.h	2009-12-26 17:23:00.947534145 +0100
 @@ -0,0 +1,375 @@
 +/*
 + * This file is autogenerated with bcop:


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- compiz.spec	30 Nov 2009 19:20:10 -0000	1.190
+++ compiz.spec	26 Dec 2009 16:34:35 -0000	1.191
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        20%{?dist}
+Release:        21%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +76,10 @@ Patch128: compiz-0.8.2-keybinding-lables
 
 Patch129: compiz-0.8.2-unloadpluginfix.patch
 
+Patch130: compiz-0.8.2-multiscreen-decorator.patch
+
+Patch131: compiz-0.8.2-icon-fix.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -147,10 +151,8 @@ and other kde integration related stuff.
 %patch127 -p1 -b .unknown-key
 %patch128 -p1 -b .keybinding-lables
 %patch129 -p1 -b .unload-plugin
-
-#WTF?!
-cat plugins/wall.c | sed '$a\}' > plugins/wall.c
-
+%patch130 -p1 -b .multi-screen
+%patch131 -p1 -b .icon-fix
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -328,6 +330,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-21
+- Fix wall plugin regression
+- Fix decorator on multi screen setups (RH #546172)
+
 * Mon Nov 30 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-20
 - Fix unloading of certain plugins resulting into a crash
 - RH #531714



From drago01 at fedoraproject.org  Sat Dec 26 16:59:48 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 16:59:48 +0000 (UTC)
Subject: rpms/compiz-fusion-extras/F-12 compiz-fusion-extras.spec,1.31,1.32
Message-ID: <20091226165948.9C5B211C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19014

Modified Files:
	compiz-fusion-extras.spec 
Log Message:
 I don't want to play stupid tagging games


Index: compiz-fusion-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/F-12/compiz-fusion-extras.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- compiz-fusion-extras.spec	2 Dec 2009 20:10:24 -0000	1.31
+++ compiz-fusion-extras.spec	26 Dec 2009 16:59:48 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion-extras
 Version: 0.8.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Additional Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/compiz-*
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-5
+- Bump release
+
 * Tue Dec 01 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-4
 - Fix build
 



From drago01 at fedoraproject.org  Sat Dec 26 17:00:39 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 17:00:39 +0000 (UTC)
Subject: rpms/compiz-fusion/F-12 compiz-fusion.spec,1.54,1.55
Message-ID: <20091226170039.0A16111C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19276

Modified Files:
	compiz-fusion.spec 
Log Message:
I don't want to play stupid tagging games


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/F-12/compiz-fusion.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- compiz-fusion.spec	30 Nov 2009 16:05:04 -0000	1.54
+++ compiz-fusion.spec	26 Dec 2009 17:00:38 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion
 Version: 0.8.2      
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-6
+- Bump release
+
 * Mon Nov 30 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-5
 - Fix unloading of certain plugins resulting into a crash
 - RH #531714



From emaldonado at fedoraproject.org  Sat Dec 26 17:30:23 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 26 Dec 2009 17:30:23 +0000 (UTC)
Subject: rpms/nss/F-12 546221.patch,1.2,1.3
Message-ID: <20091226173023.5174911C00EF@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25745

Modified Files:
	546221.patch 
Log Message:
Fix assignment of the sytem db to the wrong variable

546221.patch:
 nsssysinit.c |   42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

Index: 546221.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss/F-12/546221.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 546221.patch	20 Dec 2009 06:36:20 -0000	1.2
+++ 546221.patch	26 Dec 2009 17:30:23 -0000	1.3
@@ -26,7 +26,7 @@ diff -up nss-3.12.5/mozilla/security/nss
      }
  
 -    userdb  = getUserDB();
-+    userdb = getSystemDB();
++    sysdb = getSystemDB();
 +    userdb = getUserDB();
 +
 +    if (sysdb && !strcmp(filename, sysdb))



From emaldonado at fedoraproject.org  Sat Dec 26 17:32:17 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 26 Dec 2009 17:32:17 +0000 (UTC)
Subject: rpms/nss/F-12 nss.spec,1.127,1.128
Message-ID: <20091226173217.E21B311C00EF@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26154

Modified Files:
	nss.spec 
Log Message:
Fix error introduced when adapting patch for 546211


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/F-12/nss.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- nss.spec	20 Dec 2009 06:36:21 -0000	1.127
+++ nss.spec	26 Dec 2009 17:32:17 -0000	1.128
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.10
+Release:          1%{?dist}.12
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -478,6 +478,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Dec 25 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.11
+- Fix an error introduced when adapting the patch for 546211
+
 * Sat Dec 19 2009 Elio maldonado<emaldona at redhat.com> - 3.12.5-1.10
 - Remove some left over trace statements from nsssysinit patching
 



From cchance at fedoraproject.org  Sat Dec 26 17:50:11 2009
From: cchance at fedoraproject.org (cchance)
Date: Sat, 26 Dec 2009 17:50:11 +0000 (UTC)
Subject: rpms/stardict/devel stardict.spec,1.67,1.68
Message-ID: <20091226175011.CDAC011C00EF@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29886

Modified Files:
	stardict.spec 
Log Message:
* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-20
- Disable netdict by default and set warning for security.




Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- stardict.spec	17 Dec 2009 06:27:29 -0000	1.67
+++ stardict.spec	26 Dec 2009 17:50:11 -0000	1.68
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	19%{?dist}
+Release:	20%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -14,9 +14,8 @@ Patch0:		stardict-3.0.1.gcc43.patch
 Patch1:		transparent_trayicon.patch
 Patch2:		stardict-3.0.1-10.gucharmap.patch
 Patch3:		stardict-3.0.1-13.bz441209.patch
-# Filed into upstream bugtracker at:
-# https://sourceforge.net/tracker/?func=detail&aid=2780881&group_id=80679&atid=560632
 Patch4:		stardict-3.0.1.gcc44.patch
+Patch5:         stardict-3.0.1-20.security.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
@@ -41,6 +40,7 @@ It has powerful features such as "Glob-s
 %patch2 -p1 -b .3-gucharmap
 %patch3 -p1 -b .4-bz441209
 %patch4 -b .5-gcc44
+%patch5 -p1 -b .6-netdict
 
 # Remove unneeded sigc++ header files to make it sure
 # that we are using system-wide libsigc++
@@ -107,6 +107,9 @@ if which scrollkeeper-update>/dev/null 2
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-20
+- Disable netdict by default and set warning for security.
+
 * Thu Dec 17 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-19
 - Resolves: rhbz#475904: Disabled espeak for instance as espeak has problems when it is built with pulseaudio.
 



From cchance at fedoraproject.org  Sat Dec 26 18:05:30 2009
From: cchance at fedoraproject.org (cchance)
Date: Sat, 26 Dec 2009 18:05:30 +0000 (UTC)
Subject: rpms/stardict/devel stardict-3.0.1-20.security.patch, NONE,
	1.1 stardict.spec, 1.68, 1.69
Message-ID: <20091226180530.F333B11C00EF@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv817

Modified Files:
	stardict.spec 
Added Files:
	stardict-3.0.1-20.security.patch 
Log Message:
* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-21
- rebuilt

* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-20
- Disable netdict by default and set warning for security.



stardict-3.0.1-20.security.patch:
 conf.cpp     |    2 +-
 prefsdlg.cpp |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE stardict-3.0.1-20.security.patch ---
diff -up stardict-3.0.1/src/conf.cpp.orig stardict-3.0.1/src/conf.cpp
--- stardict-3.0.1/src/conf.cpp.orig	2009-12-27 03:34:19.643362105 +1000
+++ stardict-3.0.1/src/conf.cpp	2009-12-27 03:34:35.408307165 +1000
@@ -52,7 +52,7 @@ AppConf::AppConf() : 
 #else
 	add_entry("/apps/stardict/preferences/dictionary/use_custom_font", false);
 #endif
-	add_entry("/apps/stardict/preferences/network/enable_netdict", true);
+	add_entry("/apps/stardict/preferences/network/enable_netdict", false);
 	// Default stardictd server.
 	add_entry("/apps/stardict/preferences/network/server", std::string(_("dict.stardict.org")));
 	add_entry("/apps/stardict/preferences/network/port", 2628);
diff -up stardict-3.0.1/src/prefsdlg.cpp.orig stardict-3.0.1/src/prefsdlg.cpp
--- stardict-3.0.1/src/prefsdlg.cpp.orig	2009-12-27 03:35:32.412305578 +1000
+++ stardict-3.0.1/src/prefsdlg.cpp	2009-12-27 03:36:47.272583142 +1000
@@ -1037,6 +1037,10 @@ void PrefsDlg::setup_network_netdict()
     GtkWidget *hbox1 = gtk_hbox_new(FALSE, 6);
     gtk_box_pack_start(GTK_BOX(hbox1),button,false,false,0);
     gtk_box_pack_start(GTK_BOX(vbox1),hbox1,false,false,0);
+
+    label = gtk_label_new(_("Warning: Requests to remote StarDict server are sent over the network in an unencrypted form. Do not enable this if you are translating sensitive documents."));
+    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+    gtk_box_pack_start(GTK_BOX(vbox1),label,false,false,0);
 }
 
 void PrefsDlg::on_setup_mainwin_searchWhileTyping_ckbutton_toggled(GtkToggleButton *button, PrefsDlg *oPrefsDlg)


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- stardict.spec	26 Dec 2009 17:50:11 -0000	1.68
+++ stardict.spec	26 Dec 2009 18:05:30 -0000	1.69
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	20%{?dist}
+Release:	21%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -107,6 +107,9 @@ if which scrollkeeper-update>/dev/null 2
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-21
+- rebuilt
+
 * Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-20
 - Disable netdict by default and set warning for security.
 



From remi at fedoraproject.org  Sat Dec 26 18:08:57 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 26 Dec 2009 18:08:57 +0000 (UTC)
Subject: File Log-1.11.6.tgz uploaded to lookaside cache by remi
Message-ID: <20091226180857.8896910F857@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-pear-Log:

a390fd9940e3c1785fd19341b543f135  Log-1.11.6.tgz



From remi at fedoraproject.org  Sat Dec 26 18:09:51 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 26 Dec 2009 18:09:51 +0000 (UTC)
Subject: rpms/php-pear-Log/devel .cvsignore, 1.17, 1.18 php-pear-Log.spec, 1.20,
	1.21 sources, 1.17, 1.18
Message-ID: <20091226180951.8A09211C00EF@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1870

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Log Message:
update to 1.11.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	8 Aug 2009 07:28:45 -0000	1.17
+++ .cvsignore	26 Dec 2009 18:09:51 -0000	1.18
@@ -1 +1 @@
-Log-1.11.5.tgz
+Log-1.11.6.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/devel/php-pear-Log.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- php-pear-Log.spec	8 Aug 2009 07:28:45 -0000	1.20
+++ php-pear-Log.spec	26 Dec 2009 18:09:51 -0000	1.21
@@ -4,7 +4,7 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.11.5
+Version:        1.11.6
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -84,7 +84,7 @@ lst=$(find %{buildroot}%{pear_phpdir} -e
 # For documentation purpose only
 # After install, as root :
 # pear run-tests -p Log
-# Should return (1.11.5)
+# Should return (1.11.6)
 # 19 PASSED TESTS
 # 2 SKIPPED TESTS
 
@@ -110,6 +110,9 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.6-1
+- update to 1.11.6
+
 * Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.5-1
 - update to 1.11.5
 - rename Log.xml to php-pear-Log.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	8 Aug 2009 07:28:45 -0000	1.17
+++ sources	26 Dec 2009 18:09:51 -0000	1.18
@@ -1 +1 @@
-832b1090f40789ff75f07a63b54930eb  Log-1.11.5.tgz
+a390fd9940e3c1785fd19341b543f135  Log-1.11.6.tgz



From drago01 at fedoraproject.org  Sat Dec 26 18:21:47 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 18:21:47 +0000 (UTC)
Subject: File fedora-setup-keyboard-0.6.tar.bz2 uploaded to lookaside cache by
	drago01
Message-ID: <20091226182147.4D0A410F842@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fedora-setup-keyboard:

da3bfaf0258f5a72142d6048a80b8b77  fedora-setup-keyboard-0.6.tar.bz2



From drago01 at fedoraproject.org  Sat Dec 26 18:23:34 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 18:23:34 +0000 (UTC)
Subject: rpms/fedora-setup-keyboard/devel .cvsignore, 1.4,
	1.5 fedora-setup-keyboard.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091226182334.EB0D811C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fedora-setup-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5395

Modified Files:
	.cvsignore fedora-setup-keyboard.spec sources 
Log Message:
0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Nov 2009 22:57:59 -0000	1.4
+++ .cvsignore	26 Dec 2009 18:23:34 -0000	1.5
@@ -1 +1 @@
-fedora-setup-keyboard-0.5.tar.bz2
+fedora-setup-keyboard-0.6.tar.bz2


Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/fedora-setup-keyboard.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fedora-setup-keyboard.spec	20 Nov 2009 22:57:59 -0000	1.8
+++ fedora-setup-keyboard.spec	26 Dec 2009 18:23:34 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		fedora-setup-keyboard
-Version:	0.5
+Version:	0.6
 Release:	1%{?dist}
 Summary:	Hal keyboard layout callout
 
@@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.6-1
+- 0.6 release
+- Fixes RH #545970
+
 * Fri Nov 20 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.5-1
 - Patch merged upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2009 22:57:59 -0000	1.4
+++ sources	26 Dec 2009 18:23:34 -0000	1.5
@@ -1 +1 @@
-61aaeb2520ba757b280aa5eb3395d5fd  fedora-setup-keyboard-0.5.tar.bz2
+da3bfaf0258f5a72142d6048a80b8b77  fedora-setup-keyboard-0.6.tar.bz2



From drago01 at fedoraproject.org  Sat Dec 26 18:24:58 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 18:24:58 +0000 (UTC)
Subject: rpms/fedora-setup-keyboard/F-12 .cvsignore, 1.3,
	1.4 fedora-setup-keyboard.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091226182458.61D4911C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fedora-setup-keyboard/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5857

Modified Files:
	.cvsignore fedora-setup-keyboard.spec sources 
Log Message:
0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Apr 2009 22:59:29 -0000	1.3
+++ .cvsignore	26 Dec 2009 18:24:58 -0000	1.4
@@ -1 +1 @@
-fedora-setup-keyboard-0.4.tar.bz2
+fedora-setup-keyboard-0.6.tar.bz2


Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-12/fedora-setup-keyboard.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fedora-setup-keyboard.spec	24 Jul 2009 22:38:36 -0000	1.6
+++ fedora-setup-keyboard.spec	26 Dec 2009 18:24:58 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		fedora-setup-keyboard
-Version:	0.4
-Release:	3%{?dist}
+Version:	0.6
+Release:	1%{?dist}
 Summary:	Hal keyboard layout callout
 
 Group:		Applications/System
@@ -45,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.6-1
+- 0.6 release
+- Fixes RH #545970
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2009 22:59:30 -0000	1.3
+++ sources	26 Dec 2009 18:24:58 -0000	1.4
@@ -1 +1 @@
-1a42b001f19e615aa81211fd35b6fc41  fedora-setup-keyboard-0.4.tar.bz2
+da3bfaf0258f5a72142d6048a80b8b77  fedora-setup-keyboard-0.6.tar.bz2



From cchance at fedoraproject.org  Sat Dec 26 18:30:27 2009
From: cchance at fedoraproject.org (cchance)
Date: Sat, 26 Dec 2009 18:30:27 +0000 (UTC)
Subject: rpms/stardict/F-12 stardict-3.0.1-20.security.patch, NONE,
	1.1 stardict.spec, 1.67, 1.68
Message-ID: <20091226183027.3CEF111C00EF@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/stardict/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7213

Modified Files:
	stardict.spec 
Added Files:
	stardict-3.0.1-20.security.patch 
Log Message:
* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-20
- Disable netdict by default and add warnings for such option.


stardict-3.0.1-20.security.patch:
 conf.cpp     |    2 +-
 prefsdlg.cpp |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE stardict-3.0.1-20.security.patch ---
diff -up stardict-3.0.1/src/conf.cpp.orig stardict-3.0.1/src/conf.cpp
--- stardict-3.0.1/src/conf.cpp.orig	2009-12-27 03:34:19.643362105 +1000
+++ stardict-3.0.1/src/conf.cpp	2009-12-27 03:34:35.408307165 +1000
@@ -52,7 +52,7 @@ AppConf::AppConf() : 
 #else
 	add_entry("/apps/stardict/preferences/dictionary/use_custom_font", false);
 #endif
-	add_entry("/apps/stardict/preferences/network/enable_netdict", true);
+	add_entry("/apps/stardict/preferences/network/enable_netdict", false);
 	// Default stardictd server.
 	add_entry("/apps/stardict/preferences/network/server", std::string(_("dict.stardict.org")));
 	add_entry("/apps/stardict/preferences/network/port", 2628);
diff -up stardict-3.0.1/src/prefsdlg.cpp.orig stardict-3.0.1/src/prefsdlg.cpp
--- stardict-3.0.1/src/prefsdlg.cpp.orig	2009-12-27 03:35:32.412305578 +1000
+++ stardict-3.0.1/src/prefsdlg.cpp	2009-12-27 03:36:47.272583142 +1000
@@ -1037,6 +1037,10 @@ void PrefsDlg::setup_network_netdict()
     GtkWidget *hbox1 = gtk_hbox_new(FALSE, 6);
     gtk_box_pack_start(GTK_BOX(hbox1),button,false,false,0);
     gtk_box_pack_start(GTK_BOX(vbox1),hbox1,false,false,0);
+
+    label = gtk_label_new(_("Warning: Requests to remote StarDict server are sent over the network in an unencrypted form. Do not enable this if you are translating sensitive documents."));
+    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+    gtk_box_pack_start(GTK_BOX(vbox1),label,false,false,0);
 }
 
 void PrefsDlg::on_setup_mainwin_searchWhileTyping_ckbutton_toggled(GtkToggleButton *button, PrefsDlg *oPrefsDlg)


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-12/stardict.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- stardict.spec	17 Dec 2009 06:25:34 -0000	1.67
+++ stardict.spec	26 Dec 2009 18:30:27 -0000	1.68
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	19%{?dist}
+Release:	20%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -14,20 +14,19 @@ Patch0:		stardict-3.0.1.gcc43.patch
 Patch1:		transparent_trayicon.patch
 Patch2:		stardict-3.0.1-10.gucharmap.patch
 Patch3:		stardict-3.0.1-13.bz441209.patch
-# Filed into upstream bugtracker at:
-# https://sourceforge.net/tracker/?func=detail&aid=2780881&group_id=80679&atid=560632
 Patch4:		stardict-3.0.1.gcc44.patch
+Patch5:         stardict-3.0.1-20.security.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
-#Requires: festival, speech-tools
+Requires: enchant, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
+#Requires: festival, speech-tools, espeak
 Requires(preun): GConf2
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
 BuildRequires: autoconf, automake, libtool
-BuildRequires: desktop-file-utils, enchant-devel, espeak-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
-#BuildRequires: festival-devel, speech-tools-devel
+BuildRequires: desktop-file-utils, enchant-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
+#BuildRequires: festival-devel, speech-tools-devel, espeak-devel
 
 %description
 StarDict is a Cross-Platform and international dictionary written in Gtk2.
@@ -41,6 +40,7 @@ It has powerful features such as "Glob-s
 %patch2 -p1 -b .3-gucharmap
 %patch3 -p1 -b .4-bz441209
 %patch4 -b .5-gcc44
+%patch5 -p1 -b .5-netdict
 
 # Remove unneeded sigc++ header files to make it sure
 # that we are using system-wide libsigc++
@@ -107,6 +107,9 @@ if which scrollkeeper-update>/dev/null 2
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-20
+- Disable netdict by default and add warnings for such option.
+
 * Thu Dec 17 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-19
 - Resolves: rhbz#475904: Disabled espeak for instance as espeak has problems when it is built with pulseaudio.
 



From drago01 at fedoraproject.org  Sat Dec 26 18:32:13 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 18:32:13 +0000 (UTC)
Subject: rpms/fedora-setup-keyboard/F-12 fsk-rhpl.patch, NONE,
	1.1 fedora-setup-keyboard.spec, 1.7, 1.8
Message-ID: <20091226183213.AA7E711C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fedora-setup-keyboard/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7754

Modified Files:
	fedora-setup-keyboard.spec 
Added Files:
	fsk-rhpl.patch 
Log Message:
fix build

fsk-rhpl.patch:
 get_layouts.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fsk-rhpl.patch ---
diff --git a/get_layouts.py b/get_layouts.py
index 7037a3c..38e9bc8 100644
--- a/get_layouts.py
+++ b/get_layouts.py
@@ -25,9 +25,9 @@
 """
 
 
-import system_config_keyboard.keyboard_models
+import rhpl.keyboard_models
 
-kbd_models = system_config_keyboard.keyboard_models.KeyboardModels().get_models()
+kbd_models = rhpl.keyboard_models.KeyboardModels().get_models()
 
 for key in kbd_models:
 	(layout, model, variant, options) = tuple(kbd_models.get(key, ['', '', '', '', ''])[1:])


Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-12/fedora-setup-keyboard.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fedora-setup-keyboard.spec	26 Dec 2009 18:24:58 -0000	1.7
+++ fedora-setup-keyboard.spec	26 Dec 2009 18:32:13 -0000	1.8
@@ -9,6 +9,7 @@ URL:		http://git.fedorahosted.org/git/fe
 Source0:	https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: fsk-rhpl.patch
 
 BuildRequires:	hal-devel
 BuildRequires:	glib2-devel
@@ -23,7 +24,7 @@ defined in /etc/sysconfig/keyboard.
 
 %prep
 %setup -q
-
+%patch1 -p1
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags}



From drago01 at fedoraproject.org  Sat Dec 26 18:34:35 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 18:34:35 +0000 (UTC)
Subject: rpms/fedora-setup-keyboard/F-11 fsk-rhpl.patch, NONE, 1.1 .cvsignore, 
	1.3, 1.4 fedora-setup-keyboard.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091226183435.B334811C00EF@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fedora-setup-keyboard/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8333

Modified Files:
	.cvsignore fedora-setup-keyboard.spec sources 
Added Files:
	fsk-rhpl.patch 
Log Message:
0.6 release

fsk-rhpl.patch:
 get_layouts.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fsk-rhpl.patch ---
diff --git a/get_layouts.py b/get_layouts.py
index 7037a3c..38e9bc8 100644
--- a/get_layouts.py
+++ b/get_layouts.py
@@ -25,9 +25,9 @@
 """
 
 
-import system_config_keyboard.keyboard_models
+import rhpl.keyboard_models
 
-kbd_models = system_config_keyboard.keyboard_models.KeyboardModels().get_models()
+kbd_models = rhpl.keyboard_models.KeyboardModels().get_models()
 
 for key in kbd_models:
 	(layout, model, variant, options) = tuple(kbd_models.get(key, ['', '', '', '', ''])[1:])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Apr 2009 22:59:29 -0000	1.3
+++ .cvsignore	26 Dec 2009 18:34:35 -0000	1.4
@@ -1 +1 @@
-fedora-setup-keyboard-0.4.tar.bz2
+fedora-setup-keyboard-0.6.tar.bz2


Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-11/fedora-setup-keyboard.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- fedora-setup-keyboard.spec	27 May 2009 15:39:10 -0000	1.5
+++ fedora-setup-keyboard.spec	26 Dec 2009 18:34:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		fedora-setup-keyboard
-Version:	0.4
-Release:	2%{?dist}
+Version:	0.6
+Release:	1%{?dist}
 Summary:	Hal keyboard layout callout
 
 Group:		Applications/System
@@ -9,6 +9,7 @@ URL:		http://git.fedorahosted.org/git/fe
 Source0:	https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: fsk-rhpl.patch
 
 BuildRequires:	hal-devel
 BuildRequires:	glib2-devel
@@ -23,7 +24,7 @@ defined in /etc/sysconfig/keyboard.
 
 %prep
 %setup -q
-
+%patch1 -p1
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags}
@@ -45,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.6-1
+- 0.6 release
+- Fixes RH #545970
+
 * Wed May 27 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.4-2
 - Rebuild to pick up rhpl changes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2009 22:59:30 -0000	1.3
+++ sources	26 Dec 2009 18:34:35 -0000	1.4
@@ -1 +1 @@
-1a42b001f19e615aa81211fd35b6fc41  fedora-setup-keyboard-0.4.tar.bz2
+da3bfaf0258f5a72142d6048a80b8b77  fedora-setup-keyboard-0.6.tar.bz2



From robert at fedoraproject.org  Sat Dec 26 18:34:59 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 18:34:59 +0000 (UTC)
Subject: File duplicity-0.6.06.tar.gz uploaded to lookaside cache by robert
Message-ID: <20091226183459.756C410F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for duplicity:

abbbbcde4af24efffbc218583d581453  duplicity-0.6.06.tar.gz



From donv at fedoraproject.org  Sat Dec 26 18:38:55 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 18:38:55 +0000 (UTC)
Subject: rpms/zfs-fuse/EL-5 sources,1.4,1.5 zfs-fuse.spec,1.21,1.22
Message-ID: <20091226183855.8985111C00EF@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9553/EL-5

Modified Files:
	sources zfs-fuse.spec 
Log Message:
* Updated F-11 and EL-5 branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Nov 2009 21:03:28 -0000	1.4
+++ sources	26 Dec 2009 18:38:55 -0000	1.5
@@ -1 +1 @@
-f1815b7955bc0d11b703e14817e29878  zfs-fuse-0.6.0.tar.bz2
+c0e1d0d3406f7a1ac203708e5ecdc6dd  zfs-fuse-0.6.0.tar.bz2


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- zfs-fuse.spec	28 Nov 2009 00:10:35 -0000	1.21
+++ zfs-fuse.spec	26 Dec 2009 18:38:55 -0000	1.22
@@ -1,14 +1,13 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          3%{?dist}
+Release:          5%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following command to generate the tarball:
-#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0-433snapshot.tar.bz2
-#   mv zfs-fuse-0.6.0-433snapshot.tar.bz2 zfs-fuse-0.6.0.tar.bz2
+#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
 Source02:         zfs-fuse.sysconfig
@@ -59,8 +58,6 @@ scons install install_dir=%{buildroot}%{
 %post
 if [ $1 = 1 ] ; then
     /sbin/chkconfig --add %{name}
-    /sbin/chkconfig %{name} on
-    /sbin/service %{name} start >/dev/null 2>&1 || :
 fi
 
 %preun
@@ -89,6 +86,13 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-5
+- Removed chckconfig on and service start commands from install script
+  See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we
+
+* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
+- Updated to upstream version 0.6.0 STABLE
+
 * Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 



From donv at fedoraproject.org  Sat Dec 26 18:38:55 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 18:38:55 +0000 (UTC)
Subject: rpms/zfs-fuse/F-11 sources,1.4,1.5 zfs-fuse.spec,1.15,1.16
Message-ID: <20091226183855.ABFD311C00EF@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9553/F-11

Modified Files:
	sources zfs-fuse.spec 
Log Message:
* Updated F-11 and EL-5 branches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Nov 2009 00:28:30 -0000	1.4
+++ sources	26 Dec 2009 18:38:55 -0000	1.5
@@ -1 +1 @@
-f1815b7955bc0d11b703e14817e29878  zfs-fuse-0.6.0.tar.bz2
+c0e1d0d3406f7a1ac203708e5ecdc6dd  zfs-fuse-0.6.0.tar.bz2


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/zfs-fuse.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- zfs-fuse.spec	29 Nov 2009 00:28:30 -0000	1.15
+++ zfs-fuse.spec	26 Dec 2009 18:38:55 -0000	1.16
@@ -1,14 +1,13 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          3%{?dist}
+Release:          5%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following command to generate the tarball:
-#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0-433snapshot.tar.bz2
-#   mv zfs-fuse-0.6.0-433snapshot.tar.bz2 zfs-fuse-0.6.0.tar.bz2
+#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
 Source02:         zfs-fuse.sysconfig
@@ -59,8 +58,6 @@ scons install install_dir=%{buildroot}%{
 %post
 if [ $1 = 1 ] ; then
     /sbin/chkconfig --add %{name}
-    /sbin/chkconfig %{name} on
-    /sbin/service %{name} start >/dev/null 2>&1 || :
 fi
 
 %preun
@@ -89,6 +86,13 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-5
+- Removed chckconfig on and service start commands from install script
+  See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we
+
+* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
+- Updated to upstream version 0.6.0 STABLE
+
 * Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 



From robert at fedoraproject.org  Sat Dec 26 18:45:00 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 18:45:00 +0000 (UTC)
Subject: rpms/duplicity/EL-4 .cvsignore, 1.12, 1.13 duplicity.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <20091226184500.8102D11C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11033/EL-4

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.06 (#550663)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Sep 2009 12:05:50 -0000	1.12
+++ .cvsignore	26 Dec 2009 18:45:00 -0000	1.13
@@ -1 +1 @@
-duplicity-0.6.05.tar.gz
+duplicity-0.6.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/duplicity.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- duplicity.spec	27 Sep 2009 12:05:50 -0000	1.21
+++ duplicity.spec	26 Dec 2009 18:45:00 -0000	1.22
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.6.05
+Version:        0.6.06
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sat Dec 26 2009 Robert Scheck <robert at fedoraproject.org> 0.6.06-1
+- Upgrade to 0.6.06 (#550663)
+
 * Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
 - Upgrade to 0.6.05 (#525940)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Sep 2009 12:05:51 -0000	1.12
+++ sources	26 Dec 2009 18:45:00 -0000	1.13
@@ -1 +1 @@
-d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz
+abbbbcde4af24efffbc218583d581453  duplicity-0.6.06.tar.gz



From robert at fedoraproject.org  Sat Dec 26 18:45:00 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 18:45:00 +0000 (UTC)
Subject: rpms/duplicity/F-11 .cvsignore, 1.14, 1.15 duplicity.spec, 1.28,
	1.29 sources, 1.14, 1.15
Message-ID: <20091226184500.C896B11C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11033/F-11

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.06 (#550663)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Sep 2009 11:57:10 -0000	1.14
+++ .cvsignore	26 Dec 2009 18:45:00 -0000	1.15
@@ -1 +1 @@
-duplicity-0.6.05.tar.gz
+duplicity-0.6.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-11/duplicity.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- duplicity.spec	27 Sep 2009 11:57:10 -0000	1.28
+++ duplicity.spec	26 Dec 2009 18:45:00 -0000	1.29
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.6.05
+Version:        0.6.06
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sat Dec 26 2009 Robert Scheck <robert at fedoraproject.org> 0.6.06-1
+- Upgrade to 0.6.06 (#550663)
+
 * Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
 - Upgrade to 0.6.05 (#525940)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Sep 2009 11:57:10 -0000	1.14
+++ sources	26 Dec 2009 18:45:00 -0000	1.15
@@ -1 +1 @@
-d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz
+abbbbcde4af24efffbc218583d581453  duplicity-0.6.06.tar.gz



From robert at fedoraproject.org  Sat Dec 26 18:45:00 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 18:45:00 +0000 (UTC)
Subject: rpms/duplicity/EL-5 .cvsignore, 1.13, 1.14 duplicity.spec, 1.25,
	1.26 sources, 1.13, 1.14
Message-ID: <20091226184500.A1A5511C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11033/EL-5

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.06 (#550663)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	27 Sep 2009 12:05:51 -0000	1.13
+++ .cvsignore	26 Dec 2009 18:45:00 -0000	1.14
@@ -1 +1 @@
-duplicity-0.6.05.tar.gz
+duplicity-0.6.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/duplicity.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- duplicity.spec	27 Sep 2009 12:05:51 -0000	1.25
+++ duplicity.spec	26 Dec 2009 18:45:00 -0000	1.26
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.6.05
+Version:        0.6.06
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sat Dec 26 2009 Robert Scheck <robert at fedoraproject.org> 0.6.06-1
+- Upgrade to 0.6.06 (#550663)
+
 * Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
 - Upgrade to 0.6.05 (#525940)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Sep 2009 12:05:51 -0000	1.13
+++ sources	26 Dec 2009 18:45:00 -0000	1.14
@@ -1 +1 @@
-d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz
+abbbbcde4af24efffbc218583d581453  duplicity-0.6.06.tar.gz



From robert at fedoraproject.org  Sat Dec 26 18:45:01 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 18:45:01 +0000 (UTC)
Subject: rpms/duplicity/F-12 .cvsignore, 1.15, 1.16 duplicity.spec, 1.30,
	1.31 sources, 1.15, 1.16
Message-ID: <20091226184501.19D4111C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11033/F-12

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.06 (#550663)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Sep 2009 11:53:47 -0000	1.15
+++ .cvsignore	26 Dec 2009 18:45:00 -0000	1.16
@@ -1 +1 @@
-duplicity-0.6.05.tar.gz
+duplicity-0.6.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-12/duplicity.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- duplicity.spec	27 Sep 2009 11:53:47 -0000	1.30
+++ duplicity.spec	26 Dec 2009 18:45:00 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.6.05
+Version:        0.6.06
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sat Dec 26 2009 Robert Scheck <robert at fedoraproject.org> 0.6.06-1
+- Upgrade to 0.6.06 (#550663)
+
 * Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
 - Upgrade to 0.6.05 (#525940)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	27 Sep 2009 11:53:47 -0000	1.15
+++ sources	26 Dec 2009 18:45:00 -0000	1.16
@@ -1 +1 @@
-d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz
+abbbbcde4af24efffbc218583d581453  duplicity-0.6.06.tar.gz



From robert at fedoraproject.org  Sat Dec 26 18:45:01 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 18:45:01 +0000 (UTC)
Subject: rpms/duplicity/devel .cvsignore, 1.15, 1.16 duplicity.spec, 1.30,
	1.31 sources, 1.15, 1.16
Message-ID: <20091226184501.45F9411C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11033/devel

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.6.06 (#550663)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Sep 2009 11:53:47 -0000	1.15
+++ .cvsignore	26 Dec 2009 18:45:01 -0000	1.16
@@ -1 +1 @@
-duplicity-0.6.05.tar.gz
+duplicity-0.6.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- duplicity.spec	27 Sep 2009 11:53:47 -0000	1.30
+++ duplicity.spec	26 Dec 2009 18:45:01 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.6.05
+Version:        0.6.06
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sat Dec 26 2009 Robert Scheck <robert at fedoraproject.org> 0.6.06-1
+- Upgrade to 0.6.06 (#550663)
+
 * Sun Sep 27 2009 Robert Scheck <robert at fedoraproject.org> 0.6.05-1
 - Upgrade to 0.6.05 (#525940)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	27 Sep 2009 11:53:47 -0000	1.15
+++ sources	26 Dec 2009 18:45:01 -0000	1.16
@@ -1 +1 @@
-d467f8e98b969b67eb7c1a7af158a147  duplicity-0.6.05.tar.gz
+abbbbcde4af24efffbc218583d581453  duplicity-0.6.06.tar.gz



From rathann at fedoraproject.org  Sat Dec 26 18:51:46 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 26 Dec 2009 18:51:46 +0000 (UTC)
Subject: File mkvtoolnix-3.0.0.tar.bz2 uploaded to lookaside cache by rathann
Message-ID: <20091226185146.0383410F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mkvtoolnix:

2e9373edd5a5523313d8f5bea3ee8f8e  mkvtoolnix-3.0.0.tar.bz2



From rathann at fedoraproject.org  Sat Dec 26 18:52:48 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 26 Dec 2009 18:52:48 +0000 (UTC)
Subject: rpms/mkvtoolnix/devel .cvsignore, 1.14, 1.15 mkvtoolnix.spec, 1.31,
	1.32 sources, 1.14, 1.15 mkvtoolnix-compile.patch, 1.3,
	NONE mkvtoolnix-noman.patch, 1.1, NONE
Message-ID: <20091226185248.85CFE11C00EF@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14017

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Removed Files:
	mkvtoolnix-compile.patch mkvtoolnix-noman.patch 
Log Message:
* Sat Dec 26 2009 Dominik Mierzejewski <rpm at greysector.net> 3.0.0-1
- updated to 3.0.0
- dropped upstream'd patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Dec 2009 02:01:50 -0000	1.14
+++ .cvsignore	26 Dec 2009 18:52:48 -0000	1.15
@@ -1 +1 @@
-mkvtoolnix-2.9.9.tar.bz2
+mkvtoolnix-3.0.0.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- mkvtoolnix.spec	6 Dec 2009 02:01:50 -0000	1.31
+++ mkvtoolnix.spec	26 Dec 2009 18:52:48 -0000	1.32
@@ -1,15 +1,12 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.9.9
+Version: 3.0.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
-Patch0: %{name}-noman.patch
-# https://www.bunkus.org/bugzilla/show_bug.cgi?id=446
-Patch1: %{name}-compile.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -44,8 +41,6 @@ This package contains the graphical inte
 
 %prep
 %setup -q
-%patch0 -p1 -b .noman
-%patch1 -p1 -b .compile
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -121,6 +116,10 @@ gtk-update-icon-cache --quiet %{_datadir
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Sat Dec 26 2009 Dominik Mierzejewski <rpm at greysector.net> 3.0.0-1
+- updated to 3.0.0
+- dropped upstream'd patches
+
 * Sun Dec 06 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.9-1
 - updated to 2.9.9
   * new CLI tool: mkvpropedit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	6 Dec 2009 02:01:50 -0000	1.14
+++ sources	26 Dec 2009 18:52:48 -0000	1.15
@@ -1 +1 @@
-4bad0301e94cc24ec8f847c84502ab4d  mkvtoolnix-2.9.9.tar.bz2
+2e9373edd5a5523313d8f5bea3ee8f8e  mkvtoolnix-3.0.0.tar.bz2


--- mkvtoolnix-compile.patch DELETED ---


--- mkvtoolnix-noman.patch DELETED ---



From robert at fedoraproject.org  Sat Dec 26 19:10:26 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 19:10:26 +0000 (UTC)
Subject: rpms/unicornscan/EL-4 unicornscan-0.4.7-config.patch, NONE,
	1.1 unicornscan-0.4.7-geoip.patch, NONE,
	1.1 unicornscan-0.4.7-lib64.patch, NONE,
	1.1 unicornscan-README.fedora, NONE,
	1.1 unicornscan-web-README.fedora, NONE, 1.1 unicornscan.conf,
	NONE, 1.1 unicornscan.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091226191026.E249C11C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/unicornscan/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18028/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	unicornscan-0.4.7-config.patch unicornscan-0.4.7-geoip.patch 
	unicornscan-0.4.7-lib64.patch unicornscan-README.fedora 
	unicornscan-web-README.fedora unicornscan.conf 
	unicornscan.spec 
Log Message:
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)
- Upgrade to 0.4.7
- Initial spec file for Fedora and Red Hat Enterprise Linux (spec
  file is based on a try by Robert E. Lee and Manuel Wolfshant)


unicornscan-0.4.7-config.patch:
 etc/modules.conf         |    9 +--------
 www-front-end/config.php |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE unicornscan-0.4.7-config.patch ---
--- unicornscan-0.4.7/etc/modules.conf			2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/etc/modules.conf.config		2009-12-05 20:34:31.000000000 +0100
@@ -1,16 +1,9 @@
 
 module "pgsqldb" {
-	dbconf:		"user=scan password=scanit! host=localhost dbname=scan";
+	dbconf:		"user=unicornscan password=scanit! host=localhost dbname=unicornscan";
 	logpacket:	"true";
 };
 
-module "mysqldb" {
-	username:	"scan";
-	password:	"scanit!";
-	hostname:	"localhost";
-	dbname:		"foo";
-};
-
 module "osdetect" {
 	/*	Stim	TCPFLG	TTL	DF	WS	TOS	Misc	*/
 	/* tcpopts		type	desc				*/
--- unicornscan-0.4.7/www-front-end/config.php		2007-11-27 11:23:35.000000000 +0100
+++ unicornscan-0.4.7/www-front-end/config.php.config	2009-12-05 20:35:13.000000000 +0100
@@ -4,16 +4,16 @@
 	define("config_master_include", 1);
 
 	// Web Server location stuff
-	$PHPLIB["uri_base"]="http://localhost/unicornscan/";		// http://vhost.domain.tld/something/
+	$PHPLIB["uri_base"]="/unicornscan/";				// http://vhost.domain.tld/something/
 
-	$PHPLIB["filesystem_base"]="/var/www/htdocs/unicornscan/";		// Base directory content is in
-	$PHPLIB["filesystem_phplib"]="/var/www/htdocs/unicornscan/lib/";	// Where phplib is
-	$PHPLIB["filesystem_temporary"]="/tmp/";			// Where can i write files to?
+	$PHPLIB["filesystem_base"]="/usr/share/unicornscan/";		// Base directory content is in
+	$PHPLIB["filesystem_phplib"]="/usr/share/unicornscan/lib/";	// Where phplib is
+	$PHPLIB["filesystem_temporary"]="/var/lib/unicornscan/web/";	// Where can i write files to?
 
 	// DataBase Variables
-	$PHPLIB["database_name"]="scan"; 		// change this for sure , its the database name
-	$PHPLIB["database_type"]="pgsql";		// pgsql, mysql, youll need the right class though
-	$PHPLIB["database_username"]="scan";
+	$PHPLIB["database_name"]="unicornscan";		// change this for sure , its the database name
+	$PHPLIB["database_type"]="pgsql";		// and something else isn't supported right now
+	$PHPLIB["database_username"]="unicornscan";
 	$PHPLIB["database_password"]="scanit!";
 	$PHPLIB["database_host"]="127.0.0.1";
 	$PHPLIB["database_db"]["default"]="";
@@ -24,6 +24,9 @@
 	// formclass2.php stuff
 	$PHPLIB["formclass_warnimage"]="exl.gif";			// warning image for invalid forms
 
+	// No PHP error reporting
+	error_reporting(0);
+
 } // Double Inclusion detection
 
 require("./lib/connect_todb.php");

unicornscan-0.4.7-geoip.patch:
 report.c |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE unicornscan-0.4.7-geoip.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which adds the
standard location of GeoIP data at Fedora in front of the original opening try. Unicornscan
upstream is expecting /etc/unicornscan/GeoIP.dat instead of /usr/share/GeoIP/GeoIP.dat by
default. This patch is looking for the existence of /usr/share/GeoIP/GeoIP.dat, otherwise
/etc/unicornscan/GeoIP.dat will be used to not break the standards from upstream, if patch
gets applied for a future unicornscan release.

--- unicornscan-0.4.7/src/scan_progs/report.c		2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/src/scan_progs/report.c.geoip	2009-11-17 13:16:04.000000000 +0100
@@ -68,9 +68,18 @@
 	report_t=rbinit(123);
 
 #ifdef HAVE_LIBGEOIP
-	gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
-	if (gi == NULL) {
-		ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+
+	if (access("/usr/share/GeoIP/GeoIP.dat", F_OK) == 0) {
+		gi=GeoIP_open("/usr/share/GeoIP/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip standard database `/usr/share/GeoIP/GeoIP.dat': %s", strerror(errno));
+		}
+	}
+	else {
+		gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+		}
 	}
 
 #endif

unicornscan-0.4.7-lib64.patch:
 configure    |    4 ++--
 configure.ac |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE unicornscan-0.4.7-lib64.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which
adds support for x86_64, ppc64 or other 64 bit architectures using /usr/lib64 for
their libraries. Having lib64 in front of lib is mandatory, as 64 bit systems are
likely to run with multi-lib, that means 32 bit libraries are parallel in use. If
you apply this patch, don't run autoconf > 2.6.3, as it will break, because whole
autotools stuff from upstream is unfortunately a bit broken.

--- unicornscan-0.4.7/configure.ac		2007-11-29 15:51:20.000000000 +0100
+++ unicornscan-0.4.7/configure.ac.lib64	2009-11-16 23:32:27.000000000 +0100
@@ -269,7 +269,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -331,7 +331,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then
--- unicornscan-0.4.7/configure			2007-12-18 16:26:12.000000000 +0100
+++ unicornscan-0.4.7/configure.lib64		2009-12-05 12:04:32.000000000 +0100
@@ -26275,7 +26275,7 @@
 echo "${ECHO_T}no" >&6; }
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -26438,7 +26438,7 @@
 echo "${ECHO_T}no" >&6; }
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then


--- NEW FILE unicornscan-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  The PostgreSQL service has to be up and running. Depending on the exact
    version of Fedora or Red Hat Enterprise Linux, on the first PostgreSQL
    startup, a "service postgresql initdb" is maybe required for initializing.

    [root at tux ~]# service postgresql start
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

2.  Switch to the PostgreSQL user.

    [root at tux ~]# su - postgres
    -bash-4.0$ 

3.  Create an own PostgreSQL database user for unicornscan. Don't forget to set
    a password, e.g. "scanit!" as it is used in all examples.

    -bash-4.0$ createuser --no-superuser --no-createrole --no-createdb --pwprompt unicornscan
    Enter password for new role:
    Enter it again:
    -bash-4.0$ 

4.  Create an own PostgreSQL database for unicornscan linked with the previous
    generated database user for unicornscan.

    -bash-4.0$ createdb --owner unicornscan unicornscan
    -bash-4.0$ 

5.  Switch back to the root user.

    -bash-4.0$ exit
    exit
    [root at tux ~]#

6.  Edit PostgreSQL client authentication file /var/lib/pgsql/data/pg_hba.conf
    file with a text editor, insert the following lines before the other already
    existing rules.

    # TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
    local   unicornscan unicornscan                       md5
    host    unicornscan unicornscan 127.0.0.1/32          md5
    host    unicornscan unicornscan ::1/128               md5

7.  Edit PostgreSQL server configuration in /var/lib/pgsql/data/postgresql.conf
    and set the configuration variable as follows:

    escape_string_warning = off

8.  Restart the PostgreSQL service to enable the previous performed changes.

    [root at tux ~]# service postgresql restart
    Stopping postgresql service:                               [  OK  ]
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

9.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-0.*/pgsql_schema.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]# 

10. Edit the unicornscan configuration file /etc/unicornscan/modules.conf and
    check or correct the PostgreSQL database connection settings.

    module "pgsqldb" {
            dbconf:         "user=unicornscan password=scanit! host=localhost dbname=unicornscan";
            logpacket:      "true";
    };

11. Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#


--- NEW FILE unicornscan-web-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  Follow the /usr/share/doc/unicornscan-0.*/README.fedora file, so that the
    PostgreSQL service is up and running already.

2.  Start (or restart) the Apache HTTP webserver, to ensure that configuration
    file for Apache gets active.

    [root at tux ~]# service httpd start
    Starting httpd:                                            [  OK  ]
    [root at tux ~]# 

3.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-web-0.*/session.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]#

4.  If you've got SELinux enabled, make sure, that SELinux allows Apache/PHP to
    connect to the PostgreSQL database. If you don't have SELinux enabled, just
    skip this step.

    setsebool -P httpd_can_network_connect_db=1

5.  Edit the unicornscan configuration file /etc/unicornscan/web.php and check
    or correct the PostgreSQL database connection settings.

    $PHPLIB["database_name"]="unicornscan";
    $PHPLIB["database_username"]="unicornscan";
    $PHPLIB["database_password"]="scanit!";
    $PHPLIB["database_host"]="127.0.0.1";

6.  Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#

7.  Open a webbrowser and switch to: http://localhost/unicornscan/


--- NEW FILE unicornscan.conf ---
#
# Scalable, accurate, flexible and efficient network probing
#

Alias /unicornscan /usr/share/unicornscan


--- NEW FILE unicornscan.spec ---
Summary:	Scalable, accurate, flexible and efficient network probing
Name:		unicornscan
Version:	0.4.7
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.unicornscan.org/
Source0:	http://www.unicornscan.org/releases/%{name}-%{version}-2.tar.bz2
Source1:	unicornscan.conf
Source2:	unicornscan-README.fedora
Source3:	unicornscan-web-README.fedora
Patch0:		unicornscan-0.4.7-lib64.patch
Patch1:		unicornscan-0.4.7-geoip.patch
Patch2:		unicornscan-0.4.7-config.patch
Requires(pre):	shadow-utils
BuildRequires:	flex, bison, %{_includedir}/pcap.h, %{_includedir}/ltdl.h
BuildRequires:	libdnet-devel, GeoIP-devel, postgresql-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unicornscan is an attempt at a user-land distributed TCP/IP stack. It is
intended to provide a researcher a superior interface for introducing a
stimulus into and measuring a response from a TCP/IP enabled device or
network. Although it currently has hundreds of individual features, a main
set of abilities include: Asynchronous stateless TCP scanning with all
variations of TCP flags, asynchronous stateless TCP banner grabbing,
asynchronous protocol specific UDP scanning (sending enough of a signature
to elicit a response), active and passive remote OS, application and
component identification by analyzing responses, PCAP file logging and
filtering, relational database output, custom module support, customized
data-set views.

%package web
Summary:	Web-based front-end for unicornscan database results
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}, php-pgsql, httpd
%if 0%{?fedora}%{?rhel} >= 6
BuildArch:	noarch
%endif

%description web
Unicornscan provides support to write results into a database. And with the
web-based front-end for unicornscan, which is written in PHP, these results
can be easily interpreted and visualized.

%prep
%setup -q
%patch0 -p1 -b .lib64
%patch1 -p1 -b .geoip
%patch2 -p1 -b .config

cp -pf %{SOURCE2} README.fedora
cp -pf %{SOURCE3} www-front-end/README.fedora

%build
# - _GNU_SOURCE is required for "ucred" from <bits/socket.h> via <sys/socket.h>
# - Use classical non-SELinux permission schema once SELinux Reference Policy is
#   including unicornscan support directly, maybe with Fedora 13 and/or RHEL 6
# - MySQL support is only available in ./configure as inside broken and disabled
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
%configure --localstatedir=%{_localstatedir}/lib --with-pgsql --with-listen-user=%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Remove the static library files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.a

# Correct permissions and timestamps
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/*
touch -c -r etc/modules.conf.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/modules.conf

# Install web files into destination
cp -af www-front-end $RPM_BUILD_ROOT%{_datadir}/%{name}/
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/attic
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{config.php.config,README.fedora,TODO}
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/{session.sql,.htaccess}

# Move configuration file to its place
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
touch -c -r www-front-end/config.php.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
ln -sf ../../..%{_sysconfdir}/%{name}/web.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php

# Install the apache configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

# Create temporary directory for packaging
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/web/

%pre
getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Unicornscan User" %{name}
exit 0

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README README.database README.fedora README.security
%doc THANKS TODO UDP_PAYLOADS_NEEDED docs/Unicornscan-Getting_Started.pdf
%doc src/output_modules/database/sql/pgsql_schema.sql src/parse/example_confs
%dir %{_sysconfdir}/%{name}
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/modules.conf
%config(noreplace) %{_sysconfdir}/%{name}/oui.txt
%config(noreplace) %{_sysconfdir}/%{name}/payloads.conf
%config(noreplace) %{_sysconfdir}/%{name}/ports.txt
%config(noreplace) %{_sysconfdir}/%{name}/unicorn.conf
%{_bindir}/fantaip
%{_bindir}/unibrow
%{_bindir}/unicfgtst
%{_bindir}/%{name}
%{_bindir}/us
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
# *.la files are referenced by the shared objects and required
%{_libdir}/%{name}/modules/httpexp.la
%{_libdir}/%{name}/modules/httpexp.so
%{_libdir}/%{name}/modules/http.la
%{_libdir}/%{name}/modules/http.so
%{_libdir}/%{name}/modules/ntalk.la
%{_libdir}/%{name}/modules/ntalk.so
%{_libdir}/%{name}/modules/osdetect.la
%{_libdir}/%{name}/modules/osdetect.so
%{_libdir}/%{name}/modules/pgsqldb.la
%{_libdir}/%{name}/modules/pgsqldb.so
%{_libdir}/%{name}/modules/rdns.la
%{_libdir}/%{name}/modules/rdns.so
%{_libdir}/%{name}/modules/sip.la
%{_libdir}/%{name}/modules/sip.so
%{_libdir}/%{name}/modules/upnp.la
%{_libdir}/%{name}/modules/upnp.so
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/unilisten
%{_libexecdir}/%{name}/unisend
%{_mandir}/man1/%{name}.1*
%dir %{_localstatedir}/lib/%{name}

%files web
%defattr(-,root,root,-)
%doc www-front-end/README.fedora www-front-end/lib/session.sql
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(640,apache,apache) %{_sysconfdir}/%{name}/web.php
%{_datadir}/%{name}
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/web

%changelog
* Sat Dec 05 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-2
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)

* Tue Nov 17 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-1
- Upgrade to 0.4.7
- Initial spec file for Fedora and Red Hat Enterprise Linux (spec
  file is based on a try by Robert E. Lee and Manuel Wolfshant)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:27:24 -0000	1.1
+++ .cvsignore	26 Dec 2009 19:10:26 -0000	1.2
@@ -0,0 +1 @@
+unicornscan-0.4.7-2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:27:25 -0000	1.1
+++ sources	26 Dec 2009 19:10:26 -0000	1.2
@@ -0,0 +1 @@
+4c5f272eb38c333c0094c32317edf758  unicornscan-0.4.7-2.tar.bz2



From robert at fedoraproject.org  Sat Dec 26 19:10:27 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 26 Dec 2009 19:10:27 +0000 (UTC)
Subject: rpms/unicornscan/EL-5 unicornscan-0.4.7-config.patch, NONE,
	1.1 unicornscan-0.4.7-geoip.patch, NONE,
	1.1 unicornscan-0.4.7-lib64.patch, NONE,
	1.1 unicornscan-README.fedora, NONE,
	1.1 unicornscan-web-README.fedora, NONE, 1.1 unicornscan.conf,
	NONE, 1.1 unicornscan.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091226191027.31DF511C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/unicornscan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18028/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	unicornscan-0.4.7-config.patch unicornscan-0.4.7-geoip.patch 
	unicornscan-0.4.7-lib64.patch unicornscan-README.fedora 
	unicornscan-web-README.fedora unicornscan.conf 
	unicornscan.spec 
Log Message:
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)
- Upgrade to 0.4.7
- Initial spec file for Fedora and Red Hat Enterprise Linux (spec
  file is based on a try by Robert E. Lee and Manuel Wolfshant)


unicornscan-0.4.7-config.patch:
 etc/modules.conf         |    9 +--------
 www-front-end/config.php |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

--- NEW FILE unicornscan-0.4.7-config.patch ---
--- unicornscan-0.4.7/etc/modules.conf			2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/etc/modules.conf.config		2009-12-05 20:34:31.000000000 +0100
@@ -1,16 +1,9 @@
 
 module "pgsqldb" {
-	dbconf:		"user=scan password=scanit! host=localhost dbname=scan";
+	dbconf:		"user=unicornscan password=scanit! host=localhost dbname=unicornscan";
 	logpacket:	"true";
 };
 
-module "mysqldb" {
-	username:	"scan";
-	password:	"scanit!";
-	hostname:	"localhost";
-	dbname:		"foo";
-};
-
 module "osdetect" {
 	/*	Stim	TCPFLG	TTL	DF	WS	TOS	Misc	*/
 	/* tcpopts		type	desc				*/
--- unicornscan-0.4.7/www-front-end/config.php		2007-11-27 11:23:35.000000000 +0100
+++ unicornscan-0.4.7/www-front-end/config.php.config	2009-12-05 20:35:13.000000000 +0100
@@ -4,16 +4,16 @@
 	define("config_master_include", 1);
 
 	// Web Server location stuff
-	$PHPLIB["uri_base"]="http://localhost/unicornscan/";		// http://vhost.domain.tld/something/
+	$PHPLIB["uri_base"]="/unicornscan/";				// http://vhost.domain.tld/something/
 
-	$PHPLIB["filesystem_base"]="/var/www/htdocs/unicornscan/";		// Base directory content is in
-	$PHPLIB["filesystem_phplib"]="/var/www/htdocs/unicornscan/lib/";	// Where phplib is
-	$PHPLIB["filesystem_temporary"]="/tmp/";			// Where can i write files to?
+	$PHPLIB["filesystem_base"]="/usr/share/unicornscan/";		// Base directory content is in
+	$PHPLIB["filesystem_phplib"]="/usr/share/unicornscan/lib/";	// Where phplib is
+	$PHPLIB["filesystem_temporary"]="/var/lib/unicornscan/web/";	// Where can i write files to?
 
 	// DataBase Variables
-	$PHPLIB["database_name"]="scan"; 		// change this for sure , its the database name
-	$PHPLIB["database_type"]="pgsql";		// pgsql, mysql, youll need the right class though
-	$PHPLIB["database_username"]="scan";
+	$PHPLIB["database_name"]="unicornscan";		// change this for sure , its the database name
+	$PHPLIB["database_type"]="pgsql";		// and something else isn't supported right now
+	$PHPLIB["database_username"]="unicornscan";
 	$PHPLIB["database_password"]="scanit!";
 	$PHPLIB["database_host"]="127.0.0.1";
 	$PHPLIB["database_db"]["default"]="";
@@ -24,6 +24,9 @@
 	// formclass2.php stuff
 	$PHPLIB["formclass_warnimage"]="exl.gif";			// warning image for invalid forms
 
+	// No PHP error reporting
+	error_reporting(0);
+
 } // Double Inclusion detection
 
 require("./lib/connect_todb.php");

unicornscan-0.4.7-geoip.patch:
 report.c |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE unicornscan-0.4.7-geoip.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which adds the
standard location of GeoIP data at Fedora in front of the original opening try. Unicornscan
upstream is expecting /etc/unicornscan/GeoIP.dat instead of /usr/share/GeoIP/GeoIP.dat by
default. This patch is looking for the existence of /usr/share/GeoIP/GeoIP.dat, otherwise
/etc/unicornscan/GeoIP.dat will be used to not break the standards from upstream, if patch
gets applied for a future unicornscan release.

--- unicornscan-0.4.7/src/scan_progs/report.c		2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/src/scan_progs/report.c.geoip	2009-11-17 13:16:04.000000000 +0100
@@ -68,9 +68,18 @@
 	report_t=rbinit(123);
 
 #ifdef HAVE_LIBGEOIP
-	gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
-	if (gi == NULL) {
-		ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+
+	if (access("/usr/share/GeoIP/GeoIP.dat", F_OK) == 0) {
+		gi=GeoIP_open("/usr/share/GeoIP/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip standard database `/usr/share/GeoIP/GeoIP.dat': %s", strerror(errno));
+		}
+	}
+	else {
+		gi=GeoIP_open(CONF_DIR "/GeoIP.dat", GEOIP_MEMORY_CACHE);
+		if (gi == NULL) {
+			ERR("error opening geoip database `%s/%s': %s", CONF_DIR, "/GeoIP.dat", strerror(errno));
+		}
 	}
 
 #endif

unicornscan-0.4.7-lib64.patch:
 configure    |    4 ++--
 configure.ac |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE unicornscan-0.4.7-lib64.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for unicornscan >= 0.4.7, which
adds support for x86_64, ppc64 or other 64 bit architectures using /usr/lib64 for
their libraries. Having lib64 in front of lib is mandatory, as 64 bit systems are
likely to run with multi-lib, that means 32 bit libraries are parallel in use. If
you apply this patch, don't run autoconf > 2.6.3, as it will break, because whole
autotools stuff from upstream is unfortunately a bit broken.

--- unicornscan-0.4.7/configure.ac		2007-11-29 15:51:20.000000000 +0100
+++ unicornscan-0.4.7/configure.ac.lib64	2009-11-16 23:32:27.000000000 +0100
@@ -269,7 +269,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -331,7 +331,7 @@
       AC_MSG_RESULT(no)
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then
--- unicornscan-0.4.7/configure			2007-12-18 16:26:12.000000000 +0100
+++ unicornscan-0.4.7/configure.lib64		2009-12-05 12:04:32.000000000 +0100
@@ -26275,7 +26275,7 @@
 echo "${ECHO_T}no" >&6; }
     fi
   else
-    for i in lib lib/mysql; do
+    for i in lib64 lib lib64/mysql lib/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -26438,7 +26438,7 @@
 echo "${ECHO_T}no" >&6; }
     fi
   else
-    for i in lib lib/postgresql; do
+    for i in lib64 lib lib64/postgresql lib/postgresql; do
       str="$PGSQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then


--- NEW FILE unicornscan-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  The PostgreSQL service has to be up and running. Depending on the exact
    version of Fedora or Red Hat Enterprise Linux, on the first PostgreSQL
    startup, a "service postgresql initdb" is maybe required for initializing.

    [root at tux ~]# service postgresql start
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

2.  Switch to the PostgreSQL user.

    [root at tux ~]# su - postgres
    -bash-4.0$ 

3.  Create an own PostgreSQL database user for unicornscan. Don't forget to set
    a password, e.g. "scanit!" as it is used in all examples.

    -bash-4.0$ createuser --no-superuser --no-createrole --no-createdb --pwprompt unicornscan
    Enter password for new role:
    Enter it again:
    -bash-4.0$ 

4.  Create an own PostgreSQL database for unicornscan linked with the previous
    generated database user for unicornscan.

    -bash-4.0$ createdb --owner unicornscan unicornscan
    -bash-4.0$ 

5.  Switch back to the root user.

    -bash-4.0$ exit
    exit
    [root at tux ~]#

6.  Edit PostgreSQL client authentication file /var/lib/pgsql/data/pg_hba.conf
    file with a text editor, insert the following lines before the other already
    existing rules.

    # TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
    local   unicornscan unicornscan                       md5
    host    unicornscan unicornscan 127.0.0.1/32          md5
    host    unicornscan unicornscan ::1/128               md5

7.  Edit PostgreSQL server configuration in /var/lib/pgsql/data/postgresql.conf
    and set the configuration variable as follows:

    escape_string_warning = off

8.  Restart the PostgreSQL service to enable the previous performed changes.

    [root at tux ~]# service postgresql restart
    Stopping postgresql service:                               [  OK  ]
    Starting postgresql service:                               [  OK  ]
    [root at tux ~]# 

9.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-0.*/pgsql_schema.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]# 

10. Edit the unicornscan configuration file /etc/unicornscan/modules.conf and
    check or correct the PostgreSQL database connection settings.

    module "pgsqldb" {
            dbconf:         "user=unicornscan password=scanit! host=localhost dbname=unicornscan";
            logpacket:      "true";
    };

11. Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#


--- NEW FILE unicornscan-web-README.fedora ---
Unicornscan and PostgreSQL
--------------------------

1.  Follow the /usr/share/doc/unicornscan-0.*/README.fedora file, so that the
    PostgreSQL service is up and running already.

2.  Start (or restart) the Apache HTTP webserver, to ensure that configuration
    file for Apache gets active.

    [root at tux ~]# service httpd start
    Starting httpd:                                            [  OK  ]
    [root at tux ~]# 

3.  Create the required tables for unicornscan inside of PostgreSQL database,
    there will be some error messages displayed after entering the password for
    psql. These error messages are normal and expected, because the SQL dump
    contains a SQL DROP of all tables before the SQL CREATE is performed.

    [root at tux ~]# psql --username unicornscan --password unicornscan < /usr/share/doc/unicornscan-web-0.*/session.sql
    Password for user unicornscan:
    [...]
    [root at tux ~]#

4.  If you've got SELinux enabled, make sure, that SELinux allows Apache/PHP to
    connect to the PostgreSQL database. If you don't have SELinux enabled, just
    skip this step.

    setsebool -P httpd_can_network_connect_db=1

5.  Edit the unicornscan configuration file /etc/unicornscan/web.php and check
    or correct the PostgreSQL database connection settings.

    $PHPLIB["database_name"]="unicornscan";
    $PHPLIB["database_username"]="unicornscan";
    $PHPLIB["database_password"]="scanit!";
    $PHPLIB["database_host"]="127.0.0.1";

6.  Perform a small sample scan and write the output to PostgreSQL database.

    [root at tux ~]# unicornscan www.google.com -e pgsqldb
    TCP open                    http[   80]         from 209.85.129.104  ttl 52
    TCP open                   https[  443]         from 209.85.129.104  ttl 52
    [root at tux ~]#

7.  Open a webbrowser and switch to: http://localhost/unicornscan/


--- NEW FILE unicornscan.conf ---
#
# Scalable, accurate, flexible and efficient network probing
#

Alias /unicornscan /usr/share/unicornscan


--- NEW FILE unicornscan.spec ---
Summary:	Scalable, accurate, flexible and efficient network probing
Name:		unicornscan
Version:	0.4.7
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Internet
URL:		http://www.unicornscan.org/
Source0:	http://www.unicornscan.org/releases/%{name}-%{version}-2.tar.bz2
Source1:	unicornscan.conf
Source2:	unicornscan-README.fedora
Source3:	unicornscan-web-README.fedora
Patch0:		unicornscan-0.4.7-lib64.patch
Patch1:		unicornscan-0.4.7-geoip.patch
Patch2:		unicornscan-0.4.7-config.patch
Requires(pre):	shadow-utils
BuildRequires:	flex, bison, %{_includedir}/pcap.h, %{_includedir}/ltdl.h
BuildRequires:	libdnet-devel, GeoIP-devel, postgresql-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unicornscan is an attempt at a user-land distributed TCP/IP stack. It is
intended to provide a researcher a superior interface for introducing a
stimulus into and measuring a response from a TCP/IP enabled device or
network. Although it currently has hundreds of individual features, a main
set of abilities include: Asynchronous stateless TCP scanning with all
variations of TCP flags, asynchronous stateless TCP banner grabbing,
asynchronous protocol specific UDP scanning (sending enough of a signature
to elicit a response), active and passive remote OS, application and
component identification by analyzing responses, PCAP file logging and
filtering, relational database output, custom module support, customized
data-set views.

%package web
Summary:	Web-based front-end for unicornscan database results
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}, php-pgsql, httpd
%if 0%{?fedora}%{?rhel} >= 6
BuildArch:	noarch
%endif

%description web
Unicornscan provides support to write results into a database. And with the
web-based front-end for unicornscan, which is written in PHP, these results
can be easily interpreted and visualized.

%prep
%setup -q
%patch0 -p1 -b .lib64
%patch1 -p1 -b .geoip
%patch2 -p1 -b .config

cp -pf %{SOURCE2} README.fedora
cp -pf %{SOURCE3} www-front-end/README.fedora

%build
# - _GNU_SOURCE is required for "ucred" from <bits/socket.h> via <sys/socket.h>
# - Use classical non-SELinux permission schema once SELinux Reference Policy is
#   including unicornscan support directly, maybe with Fedora 13 and/or RHEL 6
# - MySQL support is only available in ./configure as inside broken and disabled
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
%configure --localstatedir=%{_localstatedir}/lib --with-pgsql --with-listen-user=%{name}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Remove the static library files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.a

# Correct permissions and timestamps
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/*
touch -c -r etc/modules.conf.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/modules.conf

# Install web files into destination
cp -af www-front-end $RPM_BUILD_ROOT%{_datadir}/%{name}/
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/attic
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{config.php.config,README.fedora,TODO}
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/{session.sql,.htaccess}

# Move configuration file to its place
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
touch -c -r www-front-end/config.php.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.php
ln -sf ../../..%{_sysconfdir}/%{name}/web.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php

# Install the apache configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf

# Create temporary directory for packaging
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/web/

%pre
getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Unicornscan User" %{name}
exit 0

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README README.database README.fedora README.security
%doc THANKS TODO UDP_PAYLOADS_NEEDED docs/Unicornscan-Getting_Started.pdf
%doc src/output_modules/database/sql/pgsql_schema.sql src/parse/example_confs
%dir %{_sysconfdir}/%{name}
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/modules.conf
%config(noreplace) %{_sysconfdir}/%{name}/oui.txt
%config(noreplace) %{_sysconfdir}/%{name}/payloads.conf
%config(noreplace) %{_sysconfdir}/%{name}/ports.txt
%config(noreplace) %{_sysconfdir}/%{name}/unicorn.conf
%{_bindir}/fantaip
%{_bindir}/unibrow
%{_bindir}/unicfgtst
%{_bindir}/%{name}
%{_bindir}/us
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
# *.la files are referenced by the shared objects and required
%{_libdir}/%{name}/modules/httpexp.la
%{_libdir}/%{name}/modules/httpexp.so
%{_libdir}/%{name}/modules/http.la
%{_libdir}/%{name}/modules/http.so
%{_libdir}/%{name}/modules/ntalk.la
%{_libdir}/%{name}/modules/ntalk.so
%{_libdir}/%{name}/modules/osdetect.la
%{_libdir}/%{name}/modules/osdetect.so
%{_libdir}/%{name}/modules/pgsqldb.la
%{_libdir}/%{name}/modules/pgsqldb.so
%{_libdir}/%{name}/modules/rdns.la
%{_libdir}/%{name}/modules/rdns.so
%{_libdir}/%{name}/modules/sip.la
%{_libdir}/%{name}/modules/sip.so
%{_libdir}/%{name}/modules/upnp.la
%{_libdir}/%{name}/modules/upnp.so
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/unilisten
%{_libexecdir}/%{name}/unisend
%{_mandir}/man1/%{name}.1*
%dir %{_localstatedir}/lib/%{name}

%files web
%defattr(-,root,root,-)
%doc www-front-end/README.fedora www-front-end/lib/session.sql
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %attr(640,apache,apache) %{_sysconfdir}/%{name}/web.php
%{_datadir}/%{name}
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/web

%changelog
* Sat Dec 05 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-2
- Added unicornscan-web subpackage (#538190 #c3, Robert E. Lee)
- Updated the patch for 64 bit support in configure (#538190 #c6)

* Tue Nov 17 2009 Robert Scheck <robert at fedoraproject.org> 0.4.7-1
- Upgrade to 0.4.7
- Initial spec file for Fedora and Red Hat Enterprise Linux (spec
  file is based on a try by Robert E. Lee and Manuel Wolfshant)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Dec 2009 23:27:24 -0000	1.1
+++ .cvsignore	26 Dec 2009 19:10:26 -0000	1.2
@@ -0,0 +1 @@
+unicornscan-0.4.7-2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unicornscan/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Dec 2009 23:27:25 -0000	1.1
+++ sources	26 Dec 2009 19:10:26 -0000	1.2
@@ -0,0 +1 @@
+4c5f272eb38c333c0094c32317edf758  unicornscan-0.4.7-2.tar.bz2



From donv at fedoraproject.org  Sat Dec 26 19:27:54 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 19:27:54 +0000 (UTC)
Subject: rpms/zfs-fuse/devel zfs-fuse.spec,1.23,1.24
Message-ID: <20091226192754.566FB11C02A7@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21630

Modified Files:
	zfs-fuse.spec 
Log Message:
* Fixed typo


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- zfs-fuse.spec	26 Dec 2009 02:22:08 -0000	1.23
+++ zfs-fuse.spec	26 Dec 2009 19:27:54 -0000	1.24
@@ -86,20 +86,20 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
-* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-5
+* Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we
 
-* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
+* Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-4
 - Updated to upstream version 0.6.0 STABLE
 
-* Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
+* Mon Nov 30 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 
-* Sat Nov 28 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-2
+* Sat Nov 28 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-2
 - Corrected some KOJI build errors.
 
-* Fri Nov 27 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-1
+* Fri Nov 27 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-1
 - Updated to upstream version 0.6.0 BETA
 - Updated dependency to Fuse 2.8.0
 - Minor change in spec: Source0 to Source00 for consistency
@@ -113,12 +113,12 @@ fi
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-8.20081221
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
+* Sat Jan 24 2009 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-7.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
   Removed limits for the fuse process which could lead to a hung system
   or use lots of memory.
 
-* Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
+* Sun Dec 28 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-6.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
   http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52
 - Adds better wait at startup before mounting filesystems.
@@ -129,18 +129,18 @@ fi
 - Changed to start zfs-fuse right after installation.
 - Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.
 
-* Sun Dec 24 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-5.20081221
+* Sun Dec 24 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-5.20081221
 - Development tag.
 
-* Sun Dec 21 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-4.20081221
+* Sun Dec 21 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-4.20081221
 - Updated to upstream trunk of 2008-12-21
 - Added config file in /etc/sysconfig/zfs
 - Added config option ZFS_AUTOMOUNT=0|1 to mount filesystems at boot
 
-* Tue Nov 11 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-3.20081009
+* Tue Nov 11 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-3.20081009
 - Rebuild after import into Fedora build system.
 
-* Thu Oct 09 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-2.20081009
+* Thu Oct 09 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-2.20081009
 - Updated to upstream trunk of 2008-10-09
 - Adds changes to make zfs-fuse build out-of-the-box on Fedora 9,
   and removes the need for patches.



From donv at fedoraproject.org  Sat Dec 26 19:30:37 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 19:30:37 +0000 (UTC)
Subject: rpms/zfs-fuse/EL-5 zfs-fuse.spec,1.22,1.23
Message-ID: <20091226193037.2CF7011C02A7@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22089/EL-5

Modified Files:
	zfs-fuse.spec 
Log Message:
* Fixed typo


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- zfs-fuse.spec	26 Dec 2009 18:38:55 -0000	1.22
+++ zfs-fuse.spec	26 Dec 2009 19:30:37 -0000	1.23
@@ -86,20 +86,20 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
-* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-5
+* Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we
 
-* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
+* Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-4
 - Updated to upstream version 0.6.0 STABLE
 
-* Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
+* Mon Nov 30 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 
-* Sat Nov 28 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-2
+* Sat Nov 28 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-2
 - Corrected some KOJI build errors.
 
-* Fri Nov 27 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-1
+* Fri Nov 27 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-1
 - Updated to upstream version 0.6.0 BETA
 - Updated dependency to Fuse 2.8.0
 - Minor change in spec: Source0 to Source00 for consistency
@@ -113,12 +113,12 @@ fi
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-8.20081221
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
+* Sat Jan 24 2009 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-7.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
   Removed limits for the fuse process which could lead to a hung system
   or use lots of memory.
 
-* Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
+* Sun Dec 28 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-6.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
   http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52
 - Adds better wait at startup before mounting filesystems.
@@ -129,18 +129,18 @@ fi
 - Changed to start zfs-fuse right after installation.
 - Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.
 
-* Sun Dec 24 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-5.20081221
+* Sun Dec 24 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-5.20081221
 - Development tag.
 
-* Sun Dec 21 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-4.20081221
+* Sun Dec 21 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-4.20081221
 - Updated to upstream trunk of 2008-12-21
 - Added config file in /etc/sysconfig/zfs
 - Added config option ZFS_AUTOMOUNT=0|1 to mount filesystems at boot
 
-* Tue Nov 11 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-3.20081009
+* Tue Nov 11 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-3.20081009
 - Rebuild after import into Fedora build system.
 
-* Thu Oct 09 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-2.20081009
+* Thu Oct 09 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-2.20081009
 - Updated to upstream trunk of 2008-10-09
 - Adds changes to make zfs-fuse build out-of-the-box on Fedora 9,
   and removes the need for patches.



From donv at fedoraproject.org  Sat Dec 26 19:30:37 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 19:30:37 +0000 (UTC)
Subject: rpms/zfs-fuse/F-10 zfs-fuse.spec,1.7,1.8
Message-ID: <20091226193037.3D82711C02A7@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22089/F-10

Modified Files:
	zfs-fuse.spec 
Log Message:
* Fixed typo


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-10/zfs-fuse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- zfs-fuse.spec	29 Nov 2009 00:40:13 -0000	1.7
+++ zfs-fuse.spec	26 Dec 2009 19:30:37 -0000	1.8
@@ -89,13 +89,13 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
-* Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
+* Mon Nov 30 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 
-* Sat Nov 28 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-2
+* Sat Nov 28 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-2
 - Corrected some KOJI build errors.
 
-* Fri Nov 27 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-1
+* Fri Nov 27 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-1
 - Updated to upstream version 0.6.0 BETA
 - Updated dependency to Fuse 2.8.0
 - Minor change in spec: Source0 to Source00 for consistency
@@ -109,12 +109,12 @@ fi
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-8.20081221
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
+* Sat Jan 24 2009 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-7.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
   Removed limits for the fuse process which could lead to a hung system
   or use lots of memory.
 
-* Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
+* Sun Dec 28 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-6.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
   http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52
 - Adds better wait at startup before mounting filesystems.
@@ -125,18 +125,18 @@ fi
 - Changed to start zfs-fuse right after installation.
 - Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.
 
-* Sun Dec 24 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-5.20081221
+* Sun Dec 24 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-5.20081221
 - Development tag.
 
-* Sun Dec 21 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-4.20081221
+* Sun Dec 21 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-4.20081221
 - Updated to upstream trunk of 2008-12-21
 - Added config file in /etc/sysconfig/zfs
 - Added config option ZFS_AUTOMOUNT=0|1 to mount filesystems at boot
 
-* Tue Nov 11 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-3.20081009
+* Tue Nov 11 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-3.20081009
 - Rebuild after import into Fedora build system.
 
-* Thu Oct 09 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-2.20081009
+* Thu Oct 09 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-2.20081009
 - Updated to upstream trunk of 2008-10-09
 - Adds changes to make zfs-fuse build out-of-the-box on Fedora 9,
   and removes the need for patches.



From donv at fedoraproject.org  Sat Dec 26 19:30:37 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 19:30:37 +0000 (UTC)
Subject: rpms/zfs-fuse/F-12 zfs-fuse.spec,1.18,1.19
Message-ID: <20091226193037.75E1711C02A7@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22089/F-12

Modified Files:
	zfs-fuse.spec 
Log Message:
* Fixed typo


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- zfs-fuse.spec	26 Dec 2009 02:30:06 -0000	1.18
+++ zfs-fuse.spec	26 Dec 2009 19:30:37 -0000	1.19
@@ -86,20 +86,20 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
-* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-5
+* Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we
 
-* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
+* Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-4
 - Updated to upstream version 0.6.0 STABLE
 
-* Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
+* Mon Nov 30 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 
-* Sat Nov 28 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-2
+* Sat Nov 28 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-2
 - Corrected some KOJI build errors.
 
-* Fri Nov 27 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-1
+* Fri Nov 27 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-1
 - Updated to upstream version 0.6.0 BETA
 - Updated dependency to Fuse 2.8.0
 - Minor change in spec: Source0 to Source00 for consistency
@@ -113,12 +113,12 @@ fi
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-8.20081221
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
+* Sat Jan 24 2009 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-7.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
   Removed limits for the fuse process which could lead to a hung system
   or use lots of memory.
 
-* Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
+* Sun Dec 28 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-6.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
   http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52
 - Adds better wait at startup before mounting filesystems.
@@ -129,18 +129,18 @@ fi
 - Changed to start zfs-fuse right after installation.
 - Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.
 
-* Sun Dec 24 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-5.20081221
+* Sun Dec 24 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-5.20081221
 - Development tag.
 
-* Sun Dec 21 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-4.20081221
+* Sun Dec 21 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-4.20081221
 - Updated to upstream trunk of 2008-12-21
 - Added config file in /etc/sysconfig/zfs
 - Added config option ZFS_AUTOMOUNT=0|1 to mount filesystems at boot
 
-* Tue Nov 11 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-3.20081009
+* Tue Nov 11 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-3.20081009
 - Rebuild after import into Fedora build system.
 
-* Thu Oct 09 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-2.20081009
+* Thu Oct 09 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-2.20081009
 - Updated to upstream trunk of 2008-10-09
 - Adds changes to make zfs-fuse build out-of-the-box on Fedora 9,
   and removes the need for patches.



From donv at fedoraproject.org  Sat Dec 26 19:30:37 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Sat, 26 Dec 2009 19:30:37 +0000 (UTC)
Subject: rpms/zfs-fuse/F-11 zfs-fuse.spec,1.16,1.17
Message-ID: <20091226193037.5BDB711C02A7@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22089/F-11

Modified Files:
	zfs-fuse.spec 
Log Message:
* Fixed typo


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/zfs-fuse.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- zfs-fuse.spec	26 Dec 2009 18:38:55 -0000	1.16
+++ zfs-fuse.spec	26 Dec 2009 19:30:37 -0000	1.17
@@ -86,20 +86,20 @@ fi
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
-* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-5
+* Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we
 
-* Sat Dec 26 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-4
+* Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-4
 - Updated to upstream version 0.6.0 STABLE
 
-* Mon Nov 30 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-3
+* Mon Nov 30 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-3
 - Updated the home page URL to http://zfs-fuse.net/
 
-* Sat Nov 28 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-2
+* Sat Nov 28 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-2
 - Corrected some KOJI build errors.
 
-* Fri Nov 27 2009 Uwe Kubosh <uwe at kubosch.no> - 0.6.0-1
+* Fri Nov 27 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-1
 - Updated to upstream version 0.6.0 BETA
 - Updated dependency to Fuse 2.8.0
 - Minor change in spec: Source0 to Source00 for consistency
@@ -113,12 +113,12 @@ fi
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-8.20081221
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
+* Sat Jan 24 2009 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-7.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
   Removed limits for the fuse process which could lead to a hung system
   or use lots of memory.
 
-* Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
+* Sun Dec 28 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-6.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
   http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52
 - Adds better wait at startup before mounting filesystems.
@@ -129,18 +129,18 @@ fi
 - Changed to start zfs-fuse right after installation.
 - Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.
 
-* Sun Dec 24 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-5.20081221
+* Sun Dec 24 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-5.20081221
 - Development tag.
 
-* Sun Dec 21 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-4.20081221
+* Sun Dec 21 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-4.20081221
 - Updated to upstream trunk of 2008-12-21
 - Added config file in /etc/sysconfig/zfs
 - Added config option ZFS_AUTOMOUNT=0|1 to mount filesystems at boot
 
-* Tue Nov 11 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-3.20081009
+* Tue Nov 11 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-3.20081009
 - Rebuild after import into Fedora build system.
 
-* Thu Oct 09 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-2.20081009
+* Thu Oct 09 2008 Uwe Kubosch <uwe at kubosch.no> - 0.5.0-2.20081009
 - Updated to upstream trunk of 2008-10-09
 - Adds changes to make zfs-fuse build out-of-the-box on Fedora 9,
   and removes the need for patches.



From kdudka at fedoraproject.org  Sat Dec 26 20:06:53 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sat, 26 Dec 2009 20:06:53 +0000 (UTC)
Subject: rpms/acl/devel acl-2.2.49-setfacl-walk.patch, NONE, 1.1 acl.spec, 1.53,
	1.54
Message-ID: <20091226200653.6B8A211C018B@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/acl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27272

Modified Files:
	acl.spec 
Added Files:
	acl-2.2.49-setfacl-walk.patch 
Log Message:
- tweaked setfacl tree walk flags (#488674)

acl-2.2.49-setfacl-walk.patch:
 setfacl.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE acl-2.2.49-setfacl-walk.patch ---
diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
index 091b9cc..be34e69 100644
--- a/setfacl/setfacl.c
+++ b/setfacl/setfacl.c
@@ -76,7 +76,7 @@ struct option long_options[] = {
 const char *progname;
 const char *cmd_line_options, *cmd_line_spec;
 
-int walk_flags = WALK_TREE_DEREFERENCE;
+int walk_flags = WALK_TREE_DEREFERENCE_TOPLEVEL;
 int opt_recalculate;  /* recalculate mask entry (0=default, 1=yes, -1=no) */
 int opt_promote;  /* promote access ACL to default ACL */
 int opt_test;  /* do not write to the file system.
@@ -580,13 +580,14 @@ int main(int argc, char *argv[])
 				break;
 
 			case 'L':  /* follow symlinks */
-				walk_flags |= WALK_TREE_LOGICAL;
+				walk_flags |= WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE;
 				walk_flags &= ~WALK_TREE_PHYSICAL;
 				break;
 
 			case 'P':  /* do not follow symlinks */
 				walk_flags |= WALK_TREE_PHYSICAL;
-				walk_flags &= ~WALK_TREE_LOGICAL;
+				walk_flags &= ~(WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE |
+						WALK_TREE_DEREFERENCE_TOPLEVEL);
 				break;
 
 			case 't':  /* test mode */


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- acl.spec	20 Dec 2009 11:26:21 -0000	1.53
+++ acl.spec	26 Dec 2009 20:06:52 -0000	1.54
@@ -1,13 +1,14 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
+Patch2: acl-2.2.49-setfacl-walk.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -44,6 +45,7 @@ defined in POSIX 1003.1e draft standard 
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 autoconf
 
 %build
@@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Sat Dec 26 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-2
+- tweaked setfacl tree walk flags (#488674), thanks to Markus Steinborn
+
 * Sun Dec 20 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-1
 - new upstream bugfix release
 - big cleanup in patches



From drago01 at fedoraproject.org  Sat Dec 26 20:13:54 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 20:13:54 +0000 (UTC)
Subject: rpms/compiz/F-12 compiz-0.8.2-cairo-crash.patch, NONE, 1.1 compiz.spec,
	1.191, 1.192
Message-ID: <20091226201354.E779C11C018B@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28356

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.8.2-cairo-crash.patch 
Log Message:
fix crash

compiz-0.8.2-cairo-crash.patch:
 text.c |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

--- NEW FILE compiz-0.8.2-cairo-crash.patch ---
>From f101e9ed8771a3aa32de641b1a3bb43f208812c9 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann at web.de>
Date: Fri, 04 Sep 2009 06:10:13 +0000
Subject: Add protection against empty strings (cairo doesn't like 0x0 sized

surfaces).
---
diff --git a/text.c b/text.c
index 723772b..0c1ee7e 100644
--- a/text.c
+++ b/text.c
@@ -284,8 +284,13 @@ textUpdateSurface (CompScreen      *s,
     Display *dpy = s->display->display;
 
     cairo_surface_destroy (data->surface);
+    data->surface = NULL;
+
     cairo_destroy (data->cr);
+    data->cr = NULL;
+
     XFreePixmap (dpy, data->pixmap);
+    data->pixmap = None;
 
     return textInitCairo (s, data, width, height);
 }
@@ -392,7 +397,7 @@ textRenderText (CompScreen           *s,
     TextSurfaceData surface;
     CompTextData    *retval = NULL;
 
-    if (!text)
+    if (!text || !strlen (text))
 	return NULL;
 
     memset (&surface, 0, sizeof (TextSurfaceData));
@@ -448,7 +453,7 @@ textRenderWindowTitle (CompScreen           *s,
 		       const CompTextAttrib *attrib)
 {
     char         *text = NULL;
-    CompTextData *retval;
+    CompTextData *retval = NULL;
 
     if (withViewportNumber)
     {
@@ -480,11 +485,11 @@ textRenderWindowTitle (CompScreen           *s,
 	text = textGetWindowName (s->display, window);
     }
 
-    if (!text)
-	return NULL;
+    if (text && strlen (text))
+	retval = textRenderText (s, text, attrib);
 
-    retval = textRenderText (s, text, attrib);
-    free (text);
+    if (text)
+	free (text);
 
     return retval;
 }
--
cgit v0.8.2



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- compiz.spec	26 Dec 2009 16:34:35 -0000	1.191
+++ compiz.spec	26 Dec 2009 20:13:54 -0000	1.192
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        21%{?dist}
+Release:        22%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,6 +80,8 @@ Patch130: compiz-0.8.2-multiscreen-decor
 
 Patch131: compiz-0.8.2-icon-fix.patch
 
+Patch132: compiz-0.8.2-cairo-crash.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -153,6 +155,7 @@ and other kde integration related stuff.
 %patch129 -p1 -b .unload-plugin
 %patch130 -p1 -b .multi-screen
 %patch131 -p1 -b .icon-fix
+%patch132 -p1 -b .cairo-crash
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -330,6 +333,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-22
+- Fix crash (RH #542804)
+
 * Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-21
 - Fix wall plugin regression
 - Fix decorator on multi screen setups (RH #546172)



From kdudka at fedoraproject.org  Sat Dec 26 20:18:01 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sat, 26 Dec 2009 20:18:01 +0000 (UTC)
Subject: rpms/acl/F-12 acl-2.2.49-setfacl-walk.patch, NONE, 1.1 acl.spec, 1.53,
	1.54
Message-ID: <20091226201801.E34A311C018B@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/acl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29021

Modified Files:
	acl.spec 
Added Files:
	acl-2.2.49-setfacl-walk.patch 
Log Message:
- tweaked setfacl tree walk flags (#488674)

acl-2.2.49-setfacl-walk.patch:
 setfacl.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE acl-2.2.49-setfacl-walk.patch ---
diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
index 091b9cc..be34e69 100644
--- a/setfacl/setfacl.c
+++ b/setfacl/setfacl.c
@@ -76,7 +76,7 @@ struct option long_options[] = {
 const char *progname;
 const char *cmd_line_options, *cmd_line_spec;
 
-int walk_flags = WALK_TREE_DEREFERENCE;
+int walk_flags = WALK_TREE_DEREFERENCE_TOPLEVEL;
 int opt_recalculate;  /* recalculate mask entry (0=default, 1=yes, -1=no) */
 int opt_promote;  /* promote access ACL to default ACL */
 int opt_test;  /* do not write to the file system.
@@ -580,13 +580,14 @@ int main(int argc, char *argv[])
 				break;
 
 			case 'L':  /* follow symlinks */
-				walk_flags |= WALK_TREE_LOGICAL;
+				walk_flags |= WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE;
 				walk_flags &= ~WALK_TREE_PHYSICAL;
 				break;
 
 			case 'P':  /* do not follow symlinks */
 				walk_flags |= WALK_TREE_PHYSICAL;
-				walk_flags &= ~WALK_TREE_LOGICAL;
+				walk_flags &= ~(WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE |
+						WALK_TREE_DEREFERENCE_TOPLEVEL);
 				break;
 
 			case 't':  /* test mode */


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-12/acl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- acl.spec	20 Dec 2009 11:31:37 -0000	1.53
+++ acl.spec	26 Dec 2009 20:18:01 -0000	1.54
@@ -1,13 +1,14 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
+Patch2: acl-2.2.49-setfacl-walk.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -44,6 +45,7 @@ defined in POSIX 1003.1e draft standard 
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 autoconf
 
 %build
@@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Sat Dec 26 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-2
+- tweaked setfacl tree walk flags (#488674), thanks to Markus Steinborn
+
 * Sun Dec 20 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-1
 - new upstream bugfix release
 - big cleanup in patches



From kdudka at fedoraproject.org  Sat Dec 26 20:21:37 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sat, 26 Dec 2009 20:21:37 +0000 (UTC)
Subject: rpms/acl/F-11 acl-2.2.49-setfacl-walk.patch, NONE, 1.1 acl.spec, 1.52,
	1.53
Message-ID: <20091226202137.6267611C018B@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/acl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29693

Modified Files:
	acl.spec 
Added Files:
	acl-2.2.49-setfacl-walk.patch 
Log Message:
- tweaked setfacl tree walk flags (#488674)

acl-2.2.49-setfacl-walk.patch:
 setfacl.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE acl-2.2.49-setfacl-walk.patch ---
diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
index 091b9cc..be34e69 100644
--- a/setfacl/setfacl.c
+++ b/setfacl/setfacl.c
@@ -76,7 +76,7 @@ struct option long_options[] = {
 const char *progname;
 const char *cmd_line_options, *cmd_line_spec;
 
-int walk_flags = WALK_TREE_DEREFERENCE;
+int walk_flags = WALK_TREE_DEREFERENCE_TOPLEVEL;
 int opt_recalculate;  /* recalculate mask entry (0=default, 1=yes, -1=no) */
 int opt_promote;  /* promote access ACL to default ACL */
 int opt_test;  /* do not write to the file system.
@@ -580,13 +580,14 @@ int main(int argc, char *argv[])
 				break;
 
 			case 'L':  /* follow symlinks */
-				walk_flags |= WALK_TREE_LOGICAL;
+				walk_flags |= WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE;
 				walk_flags &= ~WALK_TREE_PHYSICAL;
 				break;
 
 			case 'P':  /* do not follow symlinks */
 				walk_flags |= WALK_TREE_PHYSICAL;
-				walk_flags &= ~WALK_TREE_LOGICAL;
+				walk_flags &= ~(WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE |
+						WALK_TREE_DEREFERENCE_TOPLEVEL);
 				break;
 
 			case 't':  /* test mode */


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-11/acl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- acl.spec	20 Dec 2009 11:35:48 -0000	1.52
+++ acl.spec	26 Dec 2009 20:21:37 -0000	1.53
@@ -1,13 +1,14 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
+Patch2: acl-2.2.49-setfacl-walk.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -44,6 +45,7 @@ defined in POSIX 1003.1e draft standard 
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 autoconf
 
 %build
@@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Sat Dec 26 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-2
+- tweaked setfacl tree walk flags (#488674), thanks to Markus Steinborn
+
 * Sun Dec 20 2009 Kamil Dudka <kdudka at redhat.com> 2.2.49-1
 - new upstream bugfix release
 - big cleanup in patches



From drago01 at fedoraproject.org  Sat Dec 26 20:24:41 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 26 Dec 2009 20:24:41 +0000 (UTC)
Subject: rpms/compiz/F-12 compiz.spec, 1.192,
	1.193 compiz-0.8.2-cairo-crash.patch, 1.1, NONE
Message-ID: <20091226202441.BAE6211C018B@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30532

Modified Files:
	compiz.spec 
Removed Files:
	compiz-0.8.2-cairo-crash.patch 
Log Message:
Revert patch; wrong package...


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- compiz.spec	26 Dec 2009 20:13:54 -0000	1.192
+++ compiz.spec	26 Dec 2009 20:24:41 -0000	1.193
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        22%{?dist}
+Release:        23%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,8 +80,6 @@ Patch130: compiz-0.8.2-multiscreen-decor
 
 Patch131: compiz-0.8.2-icon-fix.patch
 
-Patch132: compiz-0.8.2-cairo-crash.patch
-
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -155,7 +153,6 @@ and other kde integration related stuff.
 %patch129 -p1 -b .unload-plugin
 %patch130 -p1 -b .multi-screen
 %patch131 -p1 -b .icon-fix
-%patch132 -p1 -b .cairo-crash
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -333,6 +330,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-23
+- Revert patch; wrong package...
+
 * Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-22
 - Fix crash (RH #542804)
 


--- compiz-0.8.2-cairo-crash.patch DELETED ---



From rdieter at fedoraproject.org  Sat Dec 26 21:19:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 26 Dec 2009 21:19:39 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.560,1.561
Message-ID: <20091226211939.BD6A911C018B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5752

Modified Files:
	kdelibs.spec 
Log Message:
* Sat Dec 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-5
- move kdecmake,makekdewidgets manpages to -devel (#549947)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -p -r1.560 -r1.561
--- kdelibs.spec	19 Dec 2009 16:19:09 -0000	1.560
+++ kdelibs.spec	26 Dec 2009 21:19:39 -0000	1.561
@@ -6,7 +6,7 @@
 
 Summary: KDE Libraries
 Version: 4.3.85
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -361,7 +361,18 @@ rm -rf %{buildroot}
 %{_kde4_libexecdir}/*
 %{_kde4_libdir}/kde4/plugins/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
-%doc %{_mandir}/man*/*
+%{_mandir}/man1/checkXML.1*
+%{_mandir}/man1/kde4-config.1*
+%{_mandir}/man1/kjs.1*
+%{_mandir}/man1/kjscmd.1*
+%{_mandir}/man1/kross.1*
+%{_mandir}/man7/kdeoptions.7*
+%{_mandir}/man7/qtoptions.7*
+%{_mandir}/man8/kbuildsycoca4.8*
+%{_mandir}/man8/kcookiejar4.8*
+%{_mandir}/man8/kded4.8*
+%{_mandir}/man8/kdeinit4.8*
+%{_mandir}/man8/meinproc4.8*
 # kdelibs-common comes from here for fedora >= 9
 %if "%{name}" == "kdelibs"
 %exclude %{_kde4_configdir}/kdebug.areas
@@ -395,6 +406,8 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %doc KDE4PORTING.html
+%{_mandir}/man1/kdecmake.1*
+%{_mandir}/man1/makekdewidgets.1*
 %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_bindir}/makekdewidgets4
 %{_kde4_bindir}/kde4-doxygen.sh
@@ -412,6 +425,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-5
+- move kdecmake,makekdewidgets manpages to -devel (#549947)
+
 * Sat Dec 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
 - tarball respin
 



From pghmcfc at fedoraproject.org  Sat Dec 26 22:16:46 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Sat, 26 Dec 2009 22:16:46 +0000 (UTC)
Subject: File gtkwave-3.3.0.tar.gz uploaded to lookaside cache by pghmcfc
Message-ID: <20091226221646.22C0510F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gtkwave:

cfaa180de37100f3f9daa53d60df426b  gtkwave-3.3.0.tar.gz



From leigh123linux at fedoraproject.org  Sat Dec 26 22:26:17 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 26 Dec 2009 22:26:17 +0000 (UTC)
Subject: rpms/compizconfig-backend-gconf/F-12
	compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch,
	NONE, 1.1 compizconfig-backend-gconf.spec, 1.11, 1.12
Message-ID: <20091226222617.3421F11C018B@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/compizconfig-backend-gconf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15420

Modified Files:
	compizconfig-backend-gconf.spec 
Added Files:
	compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch 
Log Message:
* Sat Dec 26 2009 Leigh Scott <leigh123linux at googlemail.com> - 0.8.2-3
- add patch to fix keybindings. (bug #550691)


compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch:
 gconf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch ---
From: Danny Baumann <dannybaumann at web.de>
Date: Wed, 8 Apr 2009 18:30:16 +0000 (+0200)
Subject: Fix setting integration for screenshot and terminal commands.
X-Git-Tag: 0.8.4~4
X-Git-Url: http://gitweb.compiz.org/?p=fusion%2Fcompizconfig%2Fcompizconfig-backend-gconf;a=commitdiff_plain;h=f67aaea7e1161b221423d6015c38e6d7dd0af32d

Fix setting integration for screenshot and terminal commands.
---

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 8d104b3..cce63b1 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -351,11 +351,11 @@ const SpecialOption specialOptions[] = {
     {"rotate_right_window_key", "rotate", FALSE,
      METACITY "/window_keybindings/move_to_workspace_right", OptionKey},
 
-    {"command_screenshot", "core", FALSE,
+    {"command_screenshot", "gnomecompat", FALSE,
      METACITY "/keybinding_commands/command_screenshot", OptionString},
-    {"command_window_screenshot", "core", FALSE,
+    {"command_window_screenshot", "gnomecompat", FALSE,
      METACITY "/keybinding_commands/command_window_screenshot", OptionString},
-    {"command_terminal", "core", FALSE,
+    {"command_terminal", "gnomecompat", FALSE,
      "/desktop/gnome/applications/terminal/exec", OptionString},
 
     {"current_viewport", "thumbnail", TRUE,


Index: compizconfig-backend-gconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compizconfig-backend-gconf/F-12/compizconfig-backend-gconf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- compizconfig-backend-gconf.spec	24 Jul 2009 19:22:39 -0000	1.11
+++ compizconfig-backend-gconf.spec	26 Dec 2009 22:26:16 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           compizconfig-backend-gconf
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GConf backend for compizconfig
 
 Group:          System Environment/Libraries
@@ -14,9 +14,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  libcompizconfig-devel >= %{basever}, GConf2-devel
 BuildRequires:  intltool, libtool
 # backend-gconf requires the gconf schemas from compiz-gnome to work
-Requires:       compiz-gnome >= %{basever} 
-#Patch100:       compizconfig-backend-gconf-gcc43-buildfix.patch
-#Patch101:       compizconfig-backend-gconf-gcc43-buildfix2.patch
+Requires:       compiz-gnome >= %{basever}
+# upstream patches
+# http://gitweb.compiz.org/?p=fusion/compizconfig/compizconfig-backend-gconf;a=commitdiff;h=f67aaea7e1161b221423d6015c38e6d7dd0af32d
+Patch100:       compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch
+
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64 
@@ -31,8 +33,8 @@ This package contains the Gconf backend 
 
 %prep
 %setup -q
-#%patch100 -p1 -b .gcc43-buildfix
-#%patch101 -p1 -b .gcc43-buildfix2
+%patch100 -p1 -b .compizconfig-backend-gconf
+
 
 %build
 %configure --disable-static
@@ -53,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/compizconfig/backends/libgconf.so
 
 %changelog
+* Sat Dec 26 2009 Leigh Scott <leigh123linux at googlemail.com> - 0.8.2-3
+- add patch to fix keybindings. (bug #550691)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From leigh123linux at fedoraproject.org  Sat Dec 26 22:28:46 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 26 Dec 2009 22:28:46 +0000 (UTC)
Subject: rpms/compizconfig-backend-gconf/devel
	compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch,
	NONE, 1.1 compizconfig-backend-gconf.spec, 1.11, 1.12
Message-ID: <20091226222846.5AAE011C018B@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/compizconfig-backend-gconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15982

Modified Files:
	compizconfig-backend-gconf.spec 
Added Files:
	compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch 
Log Message:
* Sat Dec 26 2009 Leigh Scott <leigh123linux at googlemail.com> - 0.8.2-3
- add patch to fix keybindings. (bug #550691)


compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch:
 gconf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch ---
From: Danny Baumann <dannybaumann at web.de>
Date: Wed, 8 Apr 2009 18:30:16 +0000 (+0200)
Subject: Fix setting integration for screenshot and terminal commands.
X-Git-Tag: 0.8.4~4
X-Git-Url: http://gitweb.compiz.org/?p=fusion%2Fcompizconfig%2Fcompizconfig-backend-gconf;a=commitdiff_plain;h=f67aaea7e1161b221423d6015c38e6d7dd0af32d

Fix setting integration for screenshot and terminal commands.
---

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 8d104b3..cce63b1 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -351,11 +351,11 @@ const SpecialOption specialOptions[] = {
     {"rotate_right_window_key", "rotate", FALSE,
      METACITY "/window_keybindings/move_to_workspace_right", OptionKey},
 
-    {"command_screenshot", "core", FALSE,
+    {"command_screenshot", "gnomecompat", FALSE,
      METACITY "/keybinding_commands/command_screenshot", OptionString},
-    {"command_window_screenshot", "core", FALSE,
+    {"command_window_screenshot", "gnomecompat", FALSE,
      METACITY "/keybinding_commands/command_window_screenshot", OptionString},
-    {"command_terminal", "core", FALSE,
+    {"command_terminal", "gnomecompat", FALSE,
      "/desktop/gnome/applications/terminal/exec", OptionString},
 
     {"current_viewport", "thumbnail", TRUE,


Index: compizconfig-backend-gconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compizconfig-backend-gconf/devel/compizconfig-backend-gconf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- compizconfig-backend-gconf.spec	24 Jul 2009 19:22:39 -0000	1.11
+++ compizconfig-backend-gconf.spec	26 Dec 2009 22:28:46 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           compizconfig-backend-gconf
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GConf backend for compizconfig
 
 Group:          System Environment/Libraries
@@ -14,9 +14,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  libcompizconfig-devel >= %{basever}, GConf2-devel
 BuildRequires:  intltool, libtool
 # backend-gconf requires the gconf schemas from compiz-gnome to work
-Requires:       compiz-gnome >= %{basever} 
-#Patch100:       compizconfig-backend-gconf-gcc43-buildfix.patch
-#Patch101:       compizconfig-backend-gconf-gcc43-buildfix2.patch
+Requires:       compiz-gnome >= %{basever}
+# upstream patches
+# http://gitweb.compiz.org/?p=fusion/compizconfig/compizconfig-backend-gconf;a=commitdiff;h=f67aaea7e1161b221423d6015c38e6d7dd0af32d
+Patch100:       compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch
+
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64 
@@ -31,8 +33,8 @@ This package contains the Gconf backend 
 
 %prep
 %setup -q
-#%patch100 -p1 -b .gcc43-buildfix
-#%patch101 -p1 -b .gcc43-buildfix2
+%patch100 -p1 -b .compizconfig-backend-gconf
+
 
 %build
 %configure --disable-static
@@ -53,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/compizconfig/backends/libgconf.so
 
 %changelog
+* Sat Dec 26 2009 Leigh Scott <leigh123linux at googlemail.com> - 0.8.2-3
+- add patch to fix keybindings. (bug #550691)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kdudka at fedoraproject.org  Sat Dec 26 23:53:07 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sat, 26 Dec 2009 23:53:07 +0000 (UTC)
Subject: File nano-2.2.1.tar.gz uploaded to lookaside cache by kdudka
Message-ID: <20091226235307.CB01A10F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for nano:

12eb7808ab1b8df4d20e87df22c38143  nano-2.2.1.tar.gz



From kdudka at fedoraproject.org  Sat Dec 26 23:55:19 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sat, 26 Dec 2009 23:55:19 +0000 (UTC)
Subject: rpms/nano/devel .cvsignore, 1.12, 1.13 nano.spec, 1.36, 1.37 sources, 
	1.12, 1.13 nano-2.2.0-warnings.patch, 1.1, NONE
Message-ID: <20091226235519.9914611C018B@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29447

Modified Files:
	.cvsignore nano.spec sources 
Removed Files:
	nano-2.2.0-warnings.patch 
Log Message:
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Dec 2009 13:11:47 -0000	1.12
+++ .cvsignore	26 Dec 2009 23:55:18 -0000	1.13
@@ -1 +1 @@
-nano-2.2.0.tar.gz
+nano-2.2.1.tar.gz


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- nano.spec	2 Dec 2009 11:14:16 -0000	1.36
+++ nano.spec	26 Dec 2009 23:55:18 -0000	1.37
@@ -1,13 +1,12 @@
 Summary:         A small text editor
 Name:            nano
-Version:         2.2.0
+Version:         2.2.1
 Release:         1%{?dist}
 License:         GPLv3+
 Group:           Applications/Editors
 URL:             http://www.nano-editor.org
 Source:          http://www.nano-editor.org/dist/v2.2/%{name}-%{version}.tar.gz
 Source2:         nanorc
-Patch1:          nano-2.2.0-warnings.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   autoconf
 BuildRequires:   gettext-devel
@@ -23,9 +22,6 @@ GNU nano is a small and friendly text ed
 %prep
 %setup -q
 
-# applied upstream
-%patch1 -p1
-
 for f in doc/man/fr/{nano.1,nanorc.5,rnano.1} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.tmp $f && mv $f.tmp $f
   touch $f.html
@@ -83,6 +79,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Sun Dec 27 2009 Kamil Dudka <kdudka at redhat.com> - 2.2.1-1
+- new upstream release
+
 * Tue Dec 01 2009 Kamil Dudka <kdudka at redhat.com> - 2.2.0-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Dec 2009 13:11:47 -0000	1.12
+++ sources	26 Dec 2009 23:55:18 -0000	1.13
@@ -1 +1 @@
-b34ea8fac9563b0485f39a065b5893bf  nano-2.2.0.tar.gz
+12eb7808ab1b8df4d20e87df22c38143  nano-2.2.1.tar.gz


--- nano-2.2.0-warnings.patch DELETED ---



From pfj at fedoraproject.org  Sun Dec 27 00:16:31 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 27 Dec 2009 00:16:31 +0000 (UTC)
Subject: rpms/monodevelop/devel md-2.2-pc.patch, NONE, 1.1 import.log, 1.27,
	1.28 monodevelop.spec, 1.47, 1.48
Message-ID: <20091227001631.E5CFA11C018B@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32576/devel

Modified Files:
	import.log monodevelop.spec 
Added Files:
	md-2.2-pc.patch 
Log Message:

Patch monodevelop.pc to fix problems with the debugger plugin


md-2.2-pc.patch:
 monodevelop.pc-new.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE md-2.2-pc.patch ---
--- monodevelop-2.2/monodevelop.pc.in	2009-11-05 18:12:21.000000000 +0000
+++ monodevelop-2.2/monodevelop.pc-new.in	2009-12-26 23:39:25.000000000 +0000
@@ -10,4 +10,4 @@
 Name: MonoDevelop
 Description: Free .NET Development Environment
 Version: @VERSION@
-Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.Cecil.dll -r:${libdir}/bin/Mono.TextEditor.dll -r:${libdir}/bin/Mono.Debugging.dll
+Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.TextEditor.dll -r:${libdir}/bin/Mono.Debugging.dll


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- import.log	23 Dec 2009 00:44:28 -0000	1.27
+++ import.log	27 Dec 2009 00:16:31 -0000	1.28
@@ -25,3 +25,4 @@ monodevelop-2_1_0-1_fc12:HEAD:monodevelo
 monodevelop-2_1_0-3_fc12:HEAD:monodevelop-2.1.0-3.fc12.src.rpm:1254334217
 monodevelop-2_1_1-1_fc12:HEAD:monodevelop-2.1.1-1.fc12.src.rpm:1255980720
 monodevelop-2_2-1_fc13:HEAD:monodevelop-2.2-1.fc13.src.rpm:1261529035
+monodevelop-2_2-2_fc13:HEAD:monodevelop-2.2-2.fc13.src.rpm:1261872798


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- monodevelop.spec	23 Dec 2009 00:44:28 -0000	1.47
+++ monodevelop.spec	27 Dec 2009 00:16:31 -0000	1.48
@@ -6,7 +6,7 @@
 
 Name:           monodevelop
 Version:        2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -16,6 +16,7 @@ Source0:        http://ftp.novell.com/pu
 Patch0:         md-2.2-unbundle-cecil.patch
 Patch1:         %{name}-2.1.0-unbundle-nunit.patch
 Patch2:         %{name}-2.1.0-rmcecildeps.patch
+Patch3:		md-2.2-pc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel >= 2.4 mono-addins-devel >= 0.4 mono-nunit-devel
@@ -55,6 +56,7 @@ Development files for %{name}.
 %patch0 -p1 -b .unbundle-cecil
 %patch1 -p1 -b .unbundle-nunit
 %patch2 -p1 -b .rmcecildeps
+%patch3 -p1 -b .mono-cecil
 
 sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \
     -e 's!${exec_prefix}/lib!%{_libdir}!' configure
@@ -142,6 +144,9 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Sat Dec 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2
+- Patch monodevelop.pc file for more monocecil fixes
+
 * Tue Dec 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
 - Bump to 2.2 release
 - Fix unbundle-cecil patch



From pfj at fedoraproject.org  Sun Dec 27 00:17:38 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 27 Dec 2009 00:17:38 +0000 (UTC)
Subject: File monodevelop-debugger-mdb-2.2.tar.bz2 uploaded to lookaside cache
	by pfj
Message-ID: <20091227001738.372D910F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for monodevelop-debugger-mdb:

f537d5326dadb715cf499dc768f708dc  monodevelop-debugger-mdb-2.2.tar.bz2



From pfj at fedoraproject.org  Sun Dec 27 00:24:46 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 27 Dec 2009 00:24:46 +0000 (UTC)
Subject: rpms/monodevelop-debugger-mdb/devel md-debugger-mdb-2.2-cecil.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 monodevelop-debugger-mdb.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091227002446.5CC7211C018B@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1636/devel

Modified Files:
	.cvsignore import.log monodevelop-debugger-mdb.spec sources 
Added Files:
	md-debugger-mdb-2.2-cecil.patch 
Log Message:

Update to 2.2 release
Add patch to use system Mono.Cecil 


md-debugger-mdb-2.2-cecil.patch:
 Mono.Debugging.Backend.Mdb.AspNet/Makefile |    1 +
 Mono.Debugging.Backend.Mdb/Makefile        |    1 +
 Mono.Debugging.Server.Mdb/Makefile         |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE md-debugger-mdb-2.2-cecil.patch ---
--- monodevelop-debugger-mdb-2.2/Mono.Debugging.Backend.Mdb/Makefile	2009-11-05 18:11:36.000000000 +0000
+++ monodevelop-debugger-mdb-2.2/Mono.Debugging.Backend.Mdb/Makefile-new	2009-12-26 23:48:45.000000000 +0000
@@ -72,6 +72,7 @@
 	Mono.Posix \
 	-pkg:monodevelop \
 	-pkg:monodevelop-core-addins \
+	-r:../deps/Mono.Cecil \
 	System \
 	System.Data \
 	System.Runtime.Remoting \
--- monodevelop-debugger-mdb-2.2/Mono.Debugging.Backend.Mdb.AspNet/Makefile	2009-11-05 18:11:36.000000000 +0000
+++ monodevelop-debugger-mdb-2.2/Mono.Debugging.Backend.Mdb.AspNet/Makefile-new	2009-12-26 23:49:41.000000000 +0000
@@ -62,6 +62,7 @@
 	../build/DebuggerClient.dll \
 	-pkg:monodevelop \
 	-pkg:monodevelop-core-addins \
+	-r:../deps/Mono.Cecil \
 	System
 
 DLL_REFERENCES = 
--- monodevelop-debugger-mdb-2.2/Mono.Debugging.Server.Mdb/Makefile	2009-11-05 18:11:36.000000000 +0000
+++ monodevelop-debugger-mdb-2.2/Mono.Debugging.Server.Mdb/Makefile-new	2009-12-26 23:49:19.000000000 +0000
@@ -77,6 +77,7 @@
 	-pkg:mono-debugger \
 	-pkg:monodevelop \
 	-pkg:monodevelop-core-addins \
+	-r:../deps/Mono.Cecil \
 	System \
 	System.Core \
 	System.Data \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Sep 2009 20:47:40 -0000	1.3
+++ .cvsignore	27 Dec 2009 00:24:45 -0000	1.4
@@ -1 +1 @@
-monodevelop-debugger-mdb-2.1.0.tar.bz2
+monodevelop-debugger-mdb-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	13 Sep 2009 20:47:40 -0000	1.2
+++ import.log	27 Dec 2009 00:24:46 -0000	1.3
@@ -1,2 +1,3 @@
 monodevelop-debugger-mdb-2_0-1_fc10:HEAD:monodevelop-debugger-mdb-2.0-1.fc10.src.rpm:1246571076
 monodevelop-debugger-mdb-2_1_0-1_fc12:HEAD:monodevelop-debugger-mdb-2.1.0-1.fc12.src.rpm:1252874834
+monodevelop-debugger-mdb-2_2-2_fc13:HEAD:monodevelop-debugger-mdb-2.2-2.fc13.src.rpm:1261873414


Index: monodevelop-debugger-mdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/monodevelop-debugger-mdb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- monodevelop-debugger-mdb.spec	13 Sep 2009 20:47:40 -0000	1.3
+++ monodevelop-debugger-mdb.spec	27 Dec 2009 00:24:46 -0000	1.4
@@ -3,16 +3,17 @@
 
 Summary:        MonoDevelop Debugger Addin
 Name:           monodevelop-debugger-mdb
-Version:        2.1.0
-Release:        1%{?dist}
+Version:        2.2
+Release:        2%{?dist}
 License:        MIT
 Group:          Development/Tools
 Source:         http://www.monodevelop.com/Downloads/%{name}-%{version}.tar.bz2
 URL:            http://www.monodevelop.com
+Patch0:		md-debugger-mdb-2.2-cecil.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)  
-BuildRequires:  monodevelop = %{version} mono-devel >= 2.4 mono-debugger-devel >= 2.4 monodevelop-devel >= 2.1 mono-addins-devel
-Requires:       mono-debugger >= 2.0
-ExclusiveArch:  %ix86
+BuildRequires:  mono-devel >= 2.6 mono-debugger-devel >= 2.6 monodevelop-devel >= 2.2 mono-addins-devel 
+Requires:       mono-debugger >= 2.6 monodevelop >= 2.2
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x
 
 %description
 Mono Debugger Addin for MonoDevelop. 
@@ -33,9 +34,12 @@ The %{name}-devel package contains devel
 %prep
 %setup -q
 sed -i -e 's!@expanded_libdir@/@PACKAGE@/!%{assembly_path}!g' Mono.Debugging.Backend.Mdb/mono.debugging.backend.mdb.pc.in
+%patch0 -p1 -b .cecil
 
 %build
 ./configure --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir}
+mkdir -p deps
+cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll deps
 make
 
 %install
@@ -65,6 +69,14 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono.debugging.backend.mdb.pc
 
 %changelog
+* Sat Dec 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2
+- Change exclusivearch to reflect the archs for monodevelop
+- Rebuild against mono-debugger-2.6 release
+- Remove BR monodevelop
+
+* Wed Dec 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- Bump to 2.2 release
+
 * Sun Sep 13 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.1.0-0
 - Bump to 2.2 beta 1 mdb
 - Added AspNetDebugger dll


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Sep 2009 20:47:40 -0000	1.3
+++ sources	27 Dec 2009 00:24:46 -0000	1.4
@@ -1 +1 @@
-446b9a0498313016a26af2fd7e96d0bf  monodevelop-debugger-mdb-2.1.0.tar.bz2
+f537d5326dadb715cf499dc768f708dc  monodevelop-debugger-mdb-2.2.tar.bz2



From pfj at fedoraproject.org  Sun Dec 27 00:59:33 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 27 Dec 2009 00:59:33 +0000 (UTC)
Subject: rpms/mono-debugger/devel import.log, 1.14, 1.15 mono-debugger.spec,
	1.29, 1.30
Message-ID: <20091227005934.061C811C018B@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7526/devel

Modified Files:
	import.log mono-debugger.spec 
Log Message:

Update to 2.6 release
Remove sed magic - overkill and a pain here
Fix mono-debugger.pc.in file for 64 bit systems 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	23 Dec 2009 00:30:47 -0000	1.14
+++ import.log	27 Dec 2009 00:59:33 -0000	1.15
@@ -12,3 +12,4 @@ mono-debugger-2_4-8_fc11:HEAD:mono-debug
 mono-debugger-2_4_2-1_fc12:HEAD:mono-debugger-2.4.2-1.fc12.src.rpm:1245788313
 mono-debugger-2_4_2_1-1_fc12:HEAD:mono-debugger-2.4.2.1-1.fc12.src.rpm:1247178166
 mono-debugger-2_6-2_fc13:HEAD:mono-debugger-2.6-2.fc13.src.rpm:1261528169
+mono-debugger-2_6-3_fc13:HEAD:mono-debugger-2.6-3.fc13.src.rpm:1261875479


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- mono-debugger.spec	23 Dec 2009 00:30:47 -0000	1.29
+++ mono-debugger.spec	27 Dec 2009 00:59:33 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
@@ -40,15 +40,9 @@ rm -rf build/*.dll
 %patch1 -p1 -b .build
 %patch2 -p1 -b .doc
 
-#find . -name \*.in -or -name \*.am -or -name \*.pc.in \
-#       | while read f ;
-#         do
-#           sed -i -e 's!$(prefix)/lib!%{_libdir}!g' "$f" 
-#           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!g' "$f" ;
-#         done
-
 sed -i -e 's!/usr/lib!%{_libdir}!g' mono-debugger-frontend.pc.in
 sed -i -e 's!${prefix}/lib/!%{_libdir}/!g' mono-debugger-frontend.pc.in
+sed -i -e 's!${prefix}/lib/!%{_libdir}/!g' mono-debugger.pc.in
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
@@ -57,7 +51,7 @@ autoreconf -f -i -s
 
 %build
 %configure --disable-static --disable-dependency-tracking
-#%configure
+# remove smp_flags - race condition
 make 
 
 %install
@@ -90,8 +84,13 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
+* Sun Dec 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-3
+- Fix mono-debugger.pc.in file for x86_64
+
 * Wed Dec 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
 - Bump to 2.6 release
+- Remove sed magic - it was overkill
+- Remove smp_flags - race condition
 
 * Sat Oct 03 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
 - Bump to 2.6 preview 1



From mbarnes at fedoraproject.org  Sun Dec 27 01:03:51 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 27 Dec 2009 01:03:51 +0000 (UTC)
Subject: File openchange-0.9-COCHRANE.tar.gz uploaded to lookaside cache by
	mbarnes
Message-ID: <20091227010351.41FF310F841@bastion.fedoraproject.org>

A file has been added to the lookaside cache for openchange:

9dc6c91ea5d4afce4a5aa81215835b8b  openchange-0.9-COCHRANE.tar.gz



From mbarnes at fedoraproject.org  Sun Dec 27 01:21:47 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 27 Dec 2009 01:21:47 +0000 (UTC)
Subject: rpms/openchange/devel .cvsignore, 1.3,
	1.4 libmapi-0.8.2-libmapi-conflict.patch, 1.1,
	1.2 openchange.spec, 1.10, 1.11 sources, 1.3, 1.4
Message-ID: <20091227012147.D17C611C018B@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/openchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11558

Modified Files:
	.cvsignore libmapi-0.8.2-libmapi-conflict.patch 
	openchange.spec sources 
Log Message:

* Sat Dec 26 2009 Matthew Barnes <mbarnes at redhat.com> - 0.9-1
- Update to 0.9 (COCHRANE)
- Bump samba4 requirement to alpha10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 Mar 2009 14:56:51 -0000	1.3
+++ .cvsignore	27 Dec 2009 01:21:46 -0000	1.4
@@ -1 +1 @@
-libmapi-0.8.2-ROMULUS.tar.gz
+openchange-0.9-COCHRANE.tar.gz

libmapi-0.8.2-libmapi-conflict.patch:
 Makefile      |   58 +++++++++++++++++++++++++++++-----------------------------
 libmapi.pc.in |    2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

Index: libmapi-0.8.2-libmapi-conflict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/libmapi-0.8.2-libmapi-conflict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libmapi-0.8.2-libmapi-conflict.patch	29 Jun 2009 18:12:06 -0000	1.1
+++ libmapi-0.8.2-libmapi-conflict.patch	27 Dec 2009 01:21:46 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up libmapi-0.8.2-ROMULUS/libmapi.pc.in.libmapi-conflict libmapi-0.8.2-ROMULUS/libmapi.pc.in
---- libmapi-0.8.2-ROMULUS/libmapi.pc.in.libmapi-conflict	2009-06-29 13:58:55.000000000 -0400
-+++ libmapi-0.8.2-ROMULUS/libmapi.pc.in	2009-06-29 13:58:32.000000000 -0400
+diff -up openchange-0.9-COCHRANE/libmapi.pc.in.libmapi-conflict openchange-0.9-COCHRANE/libmapi.pc.in
+--- openchange-0.9-COCHRANE/libmapi.pc.in.libmapi-conflict	2009-08-05 15:20:11.000000000 -0400
++++ openchange-0.9-COCHRANE/libmapi.pc.in	2009-12-26 20:13:10.822358841 -0500
 @@ -8,7 +8,7 @@ datadir=@datadir@
  Name: MAPI
  Description: MAPI Protocol Implementation
@@ -9,32 +9,31 @@ diff -up libmapi-0.8.2-ROMULUS/libmapi.p
 +Libs: -L${libdir} -lmapi-openchange
  Libs.private: @LIBS@
  Cflags: -I${includedir}
- Requires: talloc dcerpc ndr ldb
-diff -up libmapi-0.8.2-ROMULUS/Makefile.libmapi-conflict libmapi-0.8.2-ROMULUS/Makefile
---- libmapi-0.8.2-ROMULUS/Makefile.libmapi-conflict	2009-06-29 13:49:38.000000000 -0400
-+++ libmapi-0.8.2-ROMULUS/Makefile	2009-06-29 13:58:09.000000000 -0400
-@@ -142,7 +142,7 @@ LIBMAPI_SO_VERSION = 0
+ Requires: talloc dcerpc ndr tevent
+diff -up openchange-0.9-COCHRANE/Makefile.libmapi-conflict openchange-0.9-COCHRANE/Makefile
+--- openchange-0.9-COCHRANE/Makefile.libmapi-conflict	2009-12-26 20:13:29.489377427 -0500
++++ openchange-0.9-COCHRANE/Makefile	2009-12-26 20:15:25.697350350 -0500
+@@ -146,7 +146,7 @@ LIBMAPI_SO_VERSION = 0
  libmapi:	idl					\
  		libmapi/version.h			\
  		libmapi/proto.h				\
 -		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)	
-+		libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
++		libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)	
  
  libmapi-install:	libmapi			\
  			libmapi-installpc	\
-@@ -179,8 +179,9 @@ endif
+@@ -188,8 +188,8 @@ endif
  	rm -f *~
  	rm -f */*~
  	rm -f */*/*~
 -	rm -f libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) \
 -		  libmapi.$(SHLIBEXT)
-+	rm -f libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
-+		  libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) \
++	rm -f libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) \
 +		  libmapi-openchange.$(SHLIBEXT)
  
  clean:: libmapi-clean
  
-@@ -197,8 +198,8 @@ libmapi-installpc:
+@@ -206,10 +206,10 @@ libmapi-installpc:
  libmapi-installlib:
  	@echo "[*] install: libmapi library"
  	$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -42,10 +41,13 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
 -	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT)
 +	$(INSTALL) -m 0755 libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
 +	ln -sf libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi-openchange.$(SHLIBEXT)
+ ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
+-	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
++	ln -sf libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ endif
  
  libmapi-installheader:
- 	@echo "[*] install: libmapi headers"
-@@ -232,7 +233,7 @@ libmapi-uninstallpc:
+@@ -244,7 +244,7 @@ libmapi-uninstallpc:
  	rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapi.pc
  
  libmapi-uninstalllib:
@@ -54,7 +56,7 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  
  libmapi-uninstallheader:
  	rm -rf $(DESTDIR)$(includedir)/libmapi
-@@ -243,7 +244,7 @@ libmapi-uninstallscript:
+@@ -255,7 +255,7 @@ libmapi-uninstallscript:
  	rm -f $(DESTDIR)$(datadir)/setup/profiles/oc_profiles*
  	rm -rf $(DESTDIR)$(datadir)/setup/profiles
  
@@ -63,12 +65,12 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	libmapi/IABContainer.po				\
  	libmapi/IProfAdmin.po				\
  	libmapi/IMAPIContainer.po			\
-@@ -285,10 +286,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION): 
+@@ -297,10 +297,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION): 
  	libmapi/socket/netif.po				\
  	libmapi/utf8_convert.yy.po
  	@echo "Linking $@"
--	@$(CC) $(DSOOPT) -Wl,-soname,libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
-+	@$(CC) $(DSOOPT) -Wl,-soname,libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
+-	@$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
++	@$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
  
  
 -libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
@@ -76,16 +78,16 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	ln -fs $< $@
  
  libmapi/version.h: VERSION
-@@ -399,7 +400,7 @@ libmapixx-test-clean:
+@@ -414,7 +414,7 @@ libmapixx-test-clean:
  clean:: libmapixx-tests-clean
  
  bin/libmapixx-test:	libmapi++/tests/test.cpp	\
 -		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +		libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking sample application $@"
- 	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
+ 	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
  
-@@ -412,7 +413,7 @@ libmapixx-attach-clean:
+@@ -427,7 +427,7 @@ libmapixx-attach-clean:
  	rm -f libmapi++/tests/*.o
  
  bin/libmapixx-attach: libmapi++/tests/attach_test.cpp	\
@@ -94,7 +96,16 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	@echo "Linking sample application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -431,14 +432,14 @@ libmapixx-messages-clean:
+@@ -436,7 +436,7 @@ clean:: libmapixx-attach-clean
+ libmapixx-exception: bin/libmapixx-exception
+  
+ bin/libmapixx-exception: libmapi++/tests/exception_test.cpp \
+-		  libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++		  libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking exception test application $@"
+ 	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
+ 
+@@ -458,14 +458,14 @@ libmapixx-messages-clean:
  	rm -f libmapi++/examples/*.o
  
  libmapi++/examples/foldertree: libmapi++/examples/foldertree.cpp	\
@@ -111,25 +122,25 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	@echo "Linking messages example application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -506,7 +507,7 @@ libmapiadmin-uninstallheader:
+@@ -537,7 +537,7 @@ libmapiadmin-uninstallheader:
  libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION):	\
  	libmapiadmin/mapiadmin_user.po		\
  	libmapiadmin/mapiadmin.po 		\
 -	libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +	libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) $(DSOOPT) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) 
+ 	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) 
  
-@@ -586,7 +587,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):	
+@@ -621,7 +621,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):	
  	libocpf/ocpf_dump.po			\
  	libocpf/ocpf_api.po			\
  	libocpf/ocpf_write.po			\
 -	libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +	libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) $(DSOOPT) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
+ 	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
  
-@@ -667,7 +668,7 @@ torture/openchange.$(SHLIBEXT):			\
+@@ -702,7 +702,7 @@ torture/openchange.$(SHLIBEXT):			\
  	torture/mapi_namedprops.po		\
  	torture/mapi_recipient.po		\
  	torture/openchange.po			\
@@ -138,43 +149,43 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	@echo "Linking $@"
  	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LIBS)
  
-@@ -800,7 +801,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
+@@ -837,7 +837,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
  							mapiproxy/libmapiproxy/openchangedb_property.po		\
  							mapiproxy/libmapiproxy/mapi_handles.po			\
  							mapiproxy/libmapiproxy/entryid.po			\
 -							libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +							libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
- 	@$(CC) -o $@ $(DSOOPT) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS)
+ 	@$(CC) -o $@ $(DSOOPT) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS)
  
  mapiproxy/libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION): libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
-@@ -1072,7 +1073,7 @@ clean:: openchangeclient-clean
+@@ -1127,7 +1127,7 @@ clean:: openchangeclient-clean
  
  bin/openchangeclient: 	utils/openchangeclient.o			\
  			utils/openchange-tools.o			\
 -			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)		\
-+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
++			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)		\
  			libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1099,7 +1100,7 @@ clean:: mapiprofile-clean
+ 	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
+@@ -1156,7 +1156,7 @@ clean:: mapiprofile-clean
  
  bin/mapiprofile: 	utils/mapiprofile.o 			\
  			utils/openchange-tools.o 		\
 -			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
+ 	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1125,7 +1126,7 @@ clean:: openchangepfadmin-clean
+@@ -1184,7 +1184,7 @@ clean:: openchangepfadmin-clean
  
  bin/openchangepfadmin:	utils/openchangepfadmin.o			\
  			utils/openchange-tools.o			\
 -			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) 		\
-+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
++			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) 		\
  			libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt			
-@@ -1153,7 +1154,7 @@ clean:: exchange2mbox-clean
+@@ -1216,7 +1216,7 @@ clean:: exchange2mbox-clean
  
  bin/exchange2mbox:	utils/exchange2mbox.o				\
  			utils/openchange-tools.o			\
@@ -183,25 +194,25 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt  $(MAGIC_LIBS)
  
-@@ -1186,7 +1187,7 @@ bin/exchange2ical:	utils/exchange2ical/e
- 			utils/exchange2ical/exchange2ical_property.o	\
- 			utils/exchange2ical/exchange2ical_utils.o	\
+@@ -1280,7 +1280,7 @@ bin/exchange2ical:	utils/exchange2ical_t
+ 			libexchange2ical/ical2exchange.o	\
+ 			libexchange2ical/ical2exchange_property.o	\
  			utils/openchange-tools.o			\
 -			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
+ 	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
  
-@@ -1236,7 +1237,7 @@ bin/mapitest:	utils/mapitest/mapitest.o	
- 		utils/mapitest/modules/module_noserver.o	\
+@@ -1336,7 +1336,7 @@ bin/mapitest:	utils/mapitest/mapitest.o	
  		utils/mapitest/modules/module_errorchecks.o	\
  		utils/mapitest/modules/module_lcid.o		\
+ 		utils/mapitest/modules/module_mapidump.o	\
 -		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)		
-+		libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
++		libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)		
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1285,7 +1286,7 @@ clean:: openchangemapidump-clean
+@@ -1391,7 +1391,7 @@ clean:: openchangemapidump-clean
  bin/openchangemapidump:	utils/backup/openchangemapidump.o		\
  			utils/backup/openchangebackup.o			\
  			utils/openchange-tools.o			\
@@ -210,7 +221,7 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1332,7 +1333,7 @@ locale_codepage-clean::
+@@ -1440,7 +1440,7 @@ locale_codepage-clean::
  
  clean:: locale_codepage-clean
  
@@ -219,7 +230,7 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1346,7 +1347,7 @@ pymapi: $(pythonscriptdir)/mapi.$(SHLIBE
+@@ -1454,7 +1454,7 @@ pymapi: $(pythonscriptdir)/mapi.$(SHLIBE
  
  pymapi/%: CFLAGS+=`$(PYTHON_CONFIG) --cflags` -fPIC
  
@@ -228,7 +239,7 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
  	$(CC) -o $@ $^ `$(PYTHON_CONFIG) --libs` $(DSOOPT)
  
  pymapi-install::
-@@ -1472,7 +1473,7 @@ clean::
+@@ -1580,7 +1580,7 @@ clean::
  
  test:: check
  


Index: openchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openchange.spec	23 Sep 2009 11:58:12 -0000	1.10
+++ openchange.spec	27 Dec 2009 01:21:46 -0000	1.11
@@ -1,21 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define samba4_version 4.0.0-1.alpha7
+%define samba4_version 4.0.0-1.alpha10
 %define talloc_version 1.2.0
-%define nickname ROMULUS
+%define nickname COCHRANE
 
 ### Abstract ###
 
 # Licensing Note: The code is GPLv3+ and the IDL files are public domain.
 
 Name: openchange
-Version: 0.8.2
-Release: 5%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
 URL: http://www.openchange.org/
-Source0: http://downloads.sourceforge.net/openchange/libmapi-%{version}-%{nickname}.tar.gz
+Source0: http://downloads.sourceforge.net/openchange/openchange-%{version}-%{nickname}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Build Dependencies ###
@@ -82,7 +82,7 @@ Requires: sqlite
 This package provides the server elements for OpenChange.
 
 %prep
-%setup -q -n libmapi-%{version}-%{nickname}
+%setup -q -n %{name}-%{version}-%{nickname}
 %patch1 -p1 -b .libmapi-conflict
 
 %build
@@ -153,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mapistore_backends/mapistore_sqlite3.so
 
 %changelog
+* Sat Dec 26 2009 Matthew Barnes <mbarnes at redhat.com> - 0.9-1
+- Update to 0.9 (COCHRANE)
+- Bump samba4 requirement to alpha10.
+
 * Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8.2-5
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Mar 2009 14:56:51 -0000	1.3
+++ sources	27 Dec 2009 01:21:46 -0000	1.4
@@ -1 +1 @@
-b956870860cd786a0793bd89783df185  libmapi-0.8.2-ROMULUS.tar.gz
+9dc6c91ea5d4afce4a5aa81215835b8b  openchange-0.9-COCHRANE.tar.gz



From rdieter at fedoraproject.org  Sun Dec 27 02:05:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Dec 2009 02:05:03 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.561,1.562
Message-ID: <20091227020503.C7B4011C018B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19139

Modified Files:
	kdelibs.spec 
Log Message:
polkit09 mods (ie, make buildable on f11)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -p -r1.561 -r1.562
--- kdelibs.spec	26 Dec 2009 21:19:39 -0000	1.561
+++ kdelibs.spec	27 Dec 2009 02:05:02 -0000	1.562
@@ -3,6 +3,13 @@
 %define phonon_ver 4.3.80
 %define soprano_ver 2.3.70
 %define strigi_ver 0.7
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+%define polkit_1 1
+%define polkit_qt_ver 0.95
+%else
+%define polkit_09 1
+%define polkit_qt_ver 0.9.2
+%endif
 
 Summary: KDE Libraries
 Version: 4.3.85
@@ -346,6 +353,9 @@ rm -rf %{buildroot}
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/system-services/*
+%if 0%{?polkit_09}
+%{_datadir}/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
+%endif
 %{_sysconfdir}/dbus-1/system.d/*
 %{_kde4_datadir}/mime/packages/kde.xml
 %{_kde4_sharedir}/kde4/services/*



From mbarnes at fedoraproject.org  Sun Dec 27 04:24:44 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 27 Dec 2009 04:24:44 +0000 (UTC)
Subject: File pygtk-2.17.0.tar.bz2 uploaded to lookaside cache by mbarnes
Message-ID: <20091227042444.F2D3810F838@bastion.fedoraproject.org>

A file has been added to the lookaside cache for pygtk2:

43d704343d7ca04a6e4ddd4fa73a3c55  pygtk-2.17.0.tar.bz2



From mbarnes at fedoraproject.org  Sun Dec 27 04:27:00 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 27 Dec 2009 04:27:00 +0000 (UTC)
Subject: rpms/pygtk2/devel .cvsignore, 1.45, 1.46 pygtk2.spec, 1.33,
	1.34 sources, 1.45, 1.46
Message-ID: <20091227042700.9010211C00CF@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9816

Modified Files:
	.cvsignore pygtk2.spec sources 
Log Message:

* Sat Dec 26 2009 Matthew Barnes <mbarnes at redhat.com> - 2.17.0-1.fc13
- Update to 2.17.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	23 Aug 2009 19:19:45 -0000	1.45
+++ .cvsignore	27 Dec 2009 04:26:58 -0000	1.46
@@ -1 +1 @@
-pygtk-2.16.0.tar.bz2
+pygtk-2.17.0.tar.bz2


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- pygtk2.spec	23 Aug 2009 19:19:45 -0000	1.33
+++ pygtk2.spec	27 Dec 2009 04:26:58 -0000	1.34
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for version 2.15.0
+# Last updated for version 2.17.0
 %define glib2_version		2.8.0
 %define pango_version		1.16.0
 %define gtk2_version		2.9.0
@@ -14,7 +14,7 @@
 ### Abstract ###
 
 Name: pygtk2
-Version: 2.16.0
+Version: 2.17.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -163,6 +163,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Sat Dec 26 2009 Matthew Barnes <mbarnes at redhat.com> - 2.17.0-1.fc13
+- Update to 2.17.0
+
 * Sun Aug 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.16.0-1.fc12
 - Update to 2.16.0
 - Remove patch for RH bug #511082 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	23 Aug 2009 19:19:46 -0000	1.45
+++ sources	27 Dec 2009 04:26:59 -0000	1.46
@@ -1 +1 @@
-bd0d437fefd6d5390f5d770a495cd50c  pygtk-2.16.0.tar.bz2
+43d704343d7ca04a6e4ddd4fa73a3c55  pygtk-2.17.0.tar.bz2



From thomasj at fedoraproject.org  Sun Dec 27 07:42:14 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Sun, 27 Dec 2009 07:42:14 +0000 (UTC)
Subject: File 101586-smooth-tasks-src-wip-2009-12-06.tar.bz2 uploaded to
	lookaside cache by thomasj
Message-ID: <20091227074214.27D5710F880@bastion.fedoraproject.org>

A file has been added to the lookaside cache for kde-plasma-smooth-tasks:

a9af58c3e9a639481d0d05266d572add  101586-smooth-tasks-src-wip-2009-12-06.tar.bz2



From thomasj at fedoraproject.org  Sun Dec 27 07:46:24 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Sun, 27 Dec 2009 07:46:24 +0000 (UTC)
Subject: rpms/kde-plasma-smooth-tasks/devel .cvsignore, 1.3,
	1.4 kde-plasma-smooth-tasks.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091227074625.0827511C00CF@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/kde-plasma-smooth-tasks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7623

Modified Files:
	.cvsignore kde-plasma-smooth-tasks.spec sources 
Log Message:
Update to new upstream release
* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091206
- NEW: also do middle click action on tooltip
- FIX: chinese translation by Weng Xuetian (hurricanek)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Nov 2009 21:51:49 -0000	1.3
+++ .cvsignore	27 Dec 2009 07:46:23 -0000	1.4
@@ -1 +1 @@
-101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+101586-smooth-tasks-src-wip-2009-12-06.tar.bz2


Index: kde-plasma-smooth-tasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/devel/kde-plasma-smooth-tasks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde-plasma-smooth-tasks.spec	30 Nov 2009 21:51:50 -0000	1.2
+++ kde-plasma-smooth-tasks.spec	27 Dec 2009 07:46:23 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		kde-plasma-smooth-tasks
 Version:	0.0.1
-Release:	0.1.wip20091126%{?dist}
+Release:	0.1.wip20091206%{?dist}
 Summary:	KDE taskbar replacement with window peeking ability
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.kde-look.org/content/show.php/Smooth+Tasks?content=101586
-Source0:	http://www.kde-look.org/CONTENT/content-files/101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+Source0:	http://www.kde-look.org/CONTENT/content-files/101586-smooth-tasks-src-wip-2009-12-06.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext, kdebase-workspace-devel
@@ -23,7 +23,7 @@ Even if this effect is not used you can 
 to activate the corresponding window.
 
 %prep
-%setup -q -n smooth-tasks-src-wip-2009-11-26
+%setup -q -n smooth-tasks-src-wip-2009-12-06
 ## Due to the name change this sed is needed for find-lang.
 sed -i 's,set(catalogname plasma_applet_smooth-tasks),set(catalogname kde-plasma-smooth-tasks),g' po/CMakeLists.txt
 
@@ -51,6 +51,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091206
+- NEW: also do middle click action on tooltip
+- FIX: chinese translation by Weng Xuetian (hurricanek)
+
 * Mon Nov 30 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091126
 - New upstream version.
 - FIX: taskbar getting stuck issue


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Nov 2009 21:51:50 -0000	1.3
+++ sources	27 Dec 2009 07:46:23 -0000	1.4
@@ -1 +1 @@
-b934d60ff29cd6180d1356fa835475d4  101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+a9af58c3e9a639481d0d05266d572add  101586-smooth-tasks-src-wip-2009-12-06.tar.bz2



From remi at fedoraproject.org  Sun Dec 27 07:55:00 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 27 Dec 2009 07:55:00 +0000 (UTC)
Subject: rpms/php-pear-Log/F-12 php-pear-Log.spec,1.20,1.21 sources,1.17,1.18
Message-ID: <20091227075500.3768A11C00CF@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Log/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9478

Modified Files:
	php-pear-Log.spec sources 
Log Message:
update to 1.11.6


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/F-12/php-pear-Log.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- php-pear-Log.spec	8 Aug 2009 07:28:45 -0000	1.20
+++ php-pear-Log.spec	27 Dec 2009 07:54:59 -0000	1.21
@@ -4,7 +4,7 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.11.5
+Version:        1.11.6
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -84,7 +84,7 @@ lst=$(find %{buildroot}%{pear_phpdir} -e
 # For documentation purpose only
 # After install, as root :
 # pear run-tests -p Log
-# Should return (1.11.5)
+# Should return (1.11.6)
 # 19 PASSED TESTS
 # 2 SKIPPED TESTS
 
@@ -110,6 +110,9 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.6-1
+- update to 1.11.6
+
 * Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.5-1
 - update to 1.11.5
 - rename Log.xml to php-pear-Log.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	8 Aug 2009 07:28:45 -0000	1.17
+++ sources	27 Dec 2009 07:54:59 -0000	1.18
@@ -1 +1 @@
-832b1090f40789ff75f07a63b54930eb  Log-1.11.5.tgz
+a390fd9940e3c1785fd19341b543f135  Log-1.11.6.tgz



From remi at fedoraproject.org  Sun Dec 27 07:56:12 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 27 Dec 2009 07:56:12 +0000 (UTC)
Subject: rpms/php-pear-Log/F-11 php-pear-Log.spec,1.19,1.20 sources,1.17,1.18
Message-ID: <20091227075612.5E41E11C00CF@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Log/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9777

Modified Files:
	php-pear-Log.spec sources 
Log Message:
update to 1.11.6


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/F-11/php-pear-Log.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- php-pear-Log.spec	8 Aug 2009 07:34:00 -0000	1.19
+++ php-pear-Log.spec	27 Dec 2009 07:56:12 -0000	1.20
@@ -4,7 +4,7 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.11.5
+Version:        1.11.6
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -84,7 +84,7 @@ lst=$(find %{buildroot}%{pear_phpdir} -e
 # For documentation purpose only
 # After install, as root :
 # pear run-tests -p Log
-# Should return (1.11.5)
+# Should return (1.11.6)
 # 19 PASSED TESTS
 # 2 SKIPPED TESTS
 
@@ -110,6 +110,9 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.6-1
+- update to 1.11.6
+
 * Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.5-1
 - update to 1.11.5
 - rename Log.xml to php-pear-Log.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	8 Aug 2009 07:34:00 -0000	1.17
+++ sources	27 Dec 2009 07:56:12 -0000	1.18
@@ -1 +1 @@
-832b1090f40789ff75f07a63b54930eb  Log-1.11.5.tgz
+a390fd9940e3c1785fd19341b543f135  Log-1.11.6.tgz



From thomasj at fedoraproject.org  Sun Dec 27 07:57:12 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Sun, 27 Dec 2009 07:57:12 +0000 (UTC)
Subject: rpms/kde-plasma-smooth-tasks/F-12 .cvsignore, 1.3,
	1.4 kde-plasma-smooth-tasks.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091227075712.B76B711C00CF@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/kde-plasma-smooth-tasks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10078

Modified Files:
	.cvsignore kde-plasma-smooth-tasks.spec sources 
Log Message:
Update to new upstream release
* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091206
- NEW: also do middle click action on tooltip
- FIX: chinese translation by Weng Xuetian (hurricanek)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Nov 2009 22:01:45 -0000	1.3
+++ .cvsignore	27 Dec 2009 07:57:12 -0000	1.4
@@ -1 +1 @@
-101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+101586-smooth-tasks-src-wip-2009-12-06.tar.bz2


Index: kde-plasma-smooth-tasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/F-12/kde-plasma-smooth-tasks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde-plasma-smooth-tasks.spec	30 Nov 2009 22:01:45 -0000	1.2
+++ kde-plasma-smooth-tasks.spec	27 Dec 2009 07:57:12 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		kde-plasma-smooth-tasks
 Version:	0.0.1
-Release:	0.1.wip20091126%{?dist}
+Release:	0.1.wip20091206%{?dist}
 Summary:	KDE taskbar replacement with window peeking ability
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.kde-look.org/content/show.php/Smooth+Tasks?content=101586
-Source0:	http://www.kde-look.org/CONTENT/content-files/101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+Source0:	http://www.kde-look.org/CONTENT/content-files/101586-smooth-tasks-src-wip-2009-12-06.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext, kdebase-workspace-devel
@@ -23,7 +23,7 @@ Even if this effect is not used you can 
 to activate the corresponding window.
 
 %prep
-%setup -q -n smooth-tasks-src-wip-2009-11-26
+%setup -q -n smooth-tasks-src-wip-2009-12-06
 ## Due to the name change this sed is needed for find-lang.
 sed -i 's,set(catalogname plasma_applet_smooth-tasks),set(catalogname kde-plasma-smooth-tasks),g' po/CMakeLists.txt
 
@@ -51,6 +51,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091206
+- NEW: also do middle click action on tooltip
+- FIX: chinese translation by Weng Xuetian (hurricanek)
+
 * Mon Nov 30 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091126
 - New upstream version.
 - FIX: taskbar getting stuck issue


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Nov 2009 22:01:45 -0000	1.3
+++ sources	27 Dec 2009 07:57:12 -0000	1.4
@@ -1 +1 @@
-b934d60ff29cd6180d1356fa835475d4  101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+a9af58c3e9a639481d0d05266d572add  101586-smooth-tasks-src-wip-2009-12-06.tar.bz2



From remi at fedoraproject.org  Sun Dec 27 07:57:43 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 27 Dec 2009 07:57:43 +0000 (UTC)
Subject: rpms/php-pear-Log/EL-5 php-pear-Log.spec,1.12,1.13 sources,1.12,1.13
Message-ID: <20091227075743.F107711C00CF@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Log/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10369

Modified Files:
	php-pear-Log.spec sources 
Log Message:
update to 1.11.6


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/EL-5/php-pear-Log.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- php-pear-Log.spec	8 Aug 2009 07:45:40 -0000	1.12
+++ php-pear-Log.spec	27 Dec 2009 07:57:43 -0000	1.13
@@ -4,7 +4,7 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.11.5
+Version:        1.11.6
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -84,7 +84,7 @@ lst=$(find %{buildroot}%{pear_phpdir} -e
 # For documentation purpose only
 # After install, as root :
 # pear run-tests -p Log
-# Should return (1.11.5)
+# Should return (1.11.6)
 # 19 PASSED TESTS
 # 2 SKIPPED TESTS
 
@@ -110,6 +110,9 @@ fi
 
 
 %changelog
+* Sat Dec 26 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.6-1
+- update to 1.11.6
+
 * Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.5-1
 - update to 1.11.5
 - rename Log.xml to php-pear-Log.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Log/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Aug 2009 07:45:40 -0000	1.12
+++ sources	27 Dec 2009 07:57:43 -0000	1.13
@@ -1 +1 @@
-832b1090f40789ff75f07a63b54930eb  Log-1.11.5.tgz
+a390fd9940e3c1785fd19341b543f135  Log-1.11.6.tgz



From thomasj at fedoraproject.org  Sun Dec 27 08:28:37 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Sun, 27 Dec 2009 08:28:37 +0000 (UTC)
Subject: rpms/kde-plasma-smooth-tasks/F-11 .cvsignore, 1.3,
	1.4 kde-plasma-smooth-tasks.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091227082837.4F46E11C00CF@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/kde-plasma-smooth-tasks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16088

Modified Files:
	.cvsignore kde-plasma-smooth-tasks.spec sources 
Log Message:
Update to new upstream release
* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091206
- NEW: also do middle click action on tooltip
- FIX: chinese translation by Weng Xuetian (hurricanek)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Nov 2009 22:13:32 -0000	1.3
+++ .cvsignore	27 Dec 2009 08:28:36 -0000	1.4
@@ -1 +1 @@
-101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+101586-smooth-tasks-src-wip-2009-12-06.tar.bz2


Index: kde-plasma-smooth-tasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/F-11/kde-plasma-smooth-tasks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde-plasma-smooth-tasks.spec	30 Nov 2009 22:13:32 -0000	1.2
+++ kde-plasma-smooth-tasks.spec	27 Dec 2009 08:28:36 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		kde-plasma-smooth-tasks
 Version:	0.0.1
-Release:	0.1.wip20091126%{?dist}
+Release:	0.1.wip20091206%{?dist}
 Summary:	KDE taskbar replacement with window peeking ability
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.kde-look.org/content/show.php/Smooth+Tasks?content=101586
-Source0:	http://www.kde-look.org/CONTENT/content-files/101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+Source0:	http://www.kde-look.org/CONTENT/content-files/101586-smooth-tasks-src-wip-2009-12-06.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext, kdebase-workspace-devel
@@ -23,7 +23,7 @@ Even if this effect is not used you can 
 to activate the corresponding window.
 
 %prep
-%setup -q -n smooth-tasks-src-wip-2009-11-26
+%setup -q -n smooth-tasks-src-wip-2009-12-06
 ## Due to the name change this sed is needed for find-lang.
 sed -i 's,set(catalogname plasma_applet_smooth-tasks),set(catalogname kde-plasma-smooth-tasks),g' po/CMakeLists.txt
 
@@ -51,6 +51,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091206
+- NEW: also do middle click action on tooltip
+- FIX: chinese translation by Weng Xuetian (hurricanek)
+
 * Mon Nov 30 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.0.1-0.1.wip20091126
 - New upstream version.
 - FIX: taskbar getting stuck issue


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-smooth-tasks/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Nov 2009 22:13:32 -0000	1.3
+++ sources	27 Dec 2009 08:28:36 -0000	1.4
@@ -1 +1 @@
-b934d60ff29cd6180d1356fa835475d4  101586-smooth-tasks-src-wip-2009-11-26.tar.bz2
+a9af58c3e9a639481d0d05266d572add  101586-smooth-tasks-src-wip-2009-12-06.tar.bz2



From thomasj at fedoraproject.org  Sun Dec 27 09:19:48 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Sun, 27 Dec 2009 09:19:48 +0000 (UTC)
Subject: File skrooge-0.5.5.tar.bz2 uploaded to lookaside cache by thomasj
Message-ID: <20091227091948.2504D10F88B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for skrooge:

631bd3138beec9f9a213103f4dcda95c  skrooge-0.5.5.tar.bz2



From thomasj at fedoraproject.org  Sun Dec 27 09:23:05 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Sun, 27 Dec 2009 09:23:05 +0000 (UTC)
Subject: rpms/skrooge/devel .cvsignore, 1.5, 1.6 skrooge.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20091227092305.6058C11C00CF@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26247

Modified Files:
	.cvsignore skrooge.spec sources 
Log Message:
* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.5-1
- Update to new upstream release
- Corrects a lot of bugs and problems. See the CHANGELOG for details.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Nov 2009 20:14:44 -0000	1.5
+++ .cvsignore	27 Dec 2009 09:23:04 -0000	1.6
@@ -1 +1 @@
-skrooge-0.5.4.tar.bz2
+skrooge-0.5.5.tar.bz2


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/skrooge.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- skrooge.spec	30 Nov 2009 20:14:44 -0000	1.9
+++ skrooge.spec	27 Dec 2009 09:23:05 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           skrooge
-Version:        0.5.4
+Version:        0.5.5
 Release:        1%{?dist}
 Summary:        Personal finances manager
 
@@ -117,13 +117,14 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.5-1
+- Update to new upstream release
+- Corrects a lot of bugs and problems. See the CHANGELOG for details.
+
 * Sun Nov 30 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.4-1
 - Update to new upstream version
 - Corrects a lot of bugs and problems. See the changelog for details.
 
-* Thu Nov 19 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.3-1.1
-- rebuild (for qt-4.6.0-rc1, f13+)
-
 * Sun Nov 01 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.3-1
 - Updated to new upstream version
 - Readded a -DCMAKE workaround (please keep it for now)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Nov 2009 20:14:44 -0000	1.6
+++ sources	27 Dec 2009 09:23:05 -0000	1.7
@@ -1 +1 @@
-f32f68d1fcdb9bd2ad1acc013e75cc06  skrooge-0.5.4.tar.bz2
+631bd3138beec9f9a213103f4dcda95c  skrooge-0.5.5.tar.bz2



From pfj at fedoraproject.org  Sun Dec 27 09:29:06 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 27 Dec 2009 09:29:06 +0000 (UTC)
Subject: rpms/mono-debugger/devel import.log, 1.15, 1.16 mono-debugger.spec,
	1.30, 1.31
Message-ID: <20091227092906.40DCC11C00CF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27333/devel

Modified Files:
	import.log mono-debugger.spec 
Log Message:

More x86_64 spec file fixes 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	27 Dec 2009 00:59:33 -0000	1.15
+++ import.log	27 Dec 2009 09:29:06 -0000	1.16
@@ -13,3 +13,4 @@ mono-debugger-2_4_2-1_fc12:HEAD:mono-deb
 mono-debugger-2_4_2_1-1_fc12:HEAD:mono-debugger-2.4.2.1-1.fc12.src.rpm:1247178166
 mono-debugger-2_6-2_fc13:HEAD:mono-debugger-2.6-2.fc13.src.rpm:1261528169
 mono-debugger-2_6-3_fc13:HEAD:mono-debugger-2.6-3.fc13.src.rpm:1261875479
+mono-debugger-2_6-4_fc13:HEAD:mono-debugger-2.6-4.fc13.src.rpm:1261906061


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mono-debugger.spec	27 Dec 2009 00:59:33 -0000	1.30
+++ mono-debugger.spec	27 Dec 2009 09:29:06 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
@@ -43,6 +43,9 @@ rm -rf build/*.dll
 sed -i -e 's!/usr/lib!%{_libdir}!g' mono-debugger-frontend.pc.in
 sed -i -e 's!${prefix}/lib/!%{_libdir}/!g' mono-debugger-frontend.pc.in
 sed -i -e 's!${prefix}/lib/!%{_libdir}/!g' mono-debugger.pc.in
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!g' Mono.Debugging.Server.Mdb/Makefile
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!g' Mono.Debugging.Backend.Mdb/Makefile
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!g' Mono.Debugging.Backend.Mdb.AspNet/Makefile
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
@@ -84,6 +87,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
+* Sun Dec 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-4
+- More x86_64 fixes
+
 * Sun Dec 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-3
 - Fix mono-debugger.pc.in file for x86_64
 



From thomasj at fedoraproject.org  Sun Dec 27 09:46:00 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Sun, 27 Dec 2009 09:46:00 +0000 (UTC)
Subject: rpms/skrooge/F-12 .cvsignore, 1.5, 1.6 skrooge.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <20091227094600.8562F11C00CF@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30508

Modified Files:
	.cvsignore skrooge.spec sources 
Log Message:
* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.5-1
- Update to new upstream release
- Corrects a lot of bugs and problems. See the CHANGELOG for details.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Nov 2009 20:31:45 -0000	1.5
+++ .cvsignore	27 Dec 2009 09:46:00 -0000	1.6
@@ -1 +1 @@
-skrooge-0.5.4.tar.bz2
+skrooge-0.5.5.tar.bz2


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/skrooge.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- skrooge.spec	30 Nov 2009 20:31:45 -0000	1.7
+++ skrooge.spec	27 Dec 2009 09:46:00 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           skrooge
-Version:        0.5.4
+Version:        0.5.5
 Release:        1%{?dist}
 Summary:        Personal finances manager
 
@@ -117,6 +117,10 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.5-1
+- Update to new upstream release
+- Corrects a lot of bugs and problems. See the CHANGELOG for details.
+
 * Sun Nov 30 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.4-1
 - Update to new upstream version
 - Corrects a lot of bugs and problems. See the changelog for details.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Nov 2009 20:31:45 -0000	1.6
+++ sources	27 Dec 2009 09:46:00 -0000	1.7
@@ -1 +1 @@
-f32f68d1fcdb9bd2ad1acc013e75cc06  skrooge-0.5.4.tar.bz2
+631bd3138beec9f9a213103f4dcda95c  skrooge-0.5.5.tar.bz2



From jussilehtola at fedoraproject.org  Sun Dec 27 09:46:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 09:46:59 +0000 (UTC)
Subject: File agedu-r8768.tar.gz uploaded to lookaside cache by jussilehtola
Message-ID: <20091227094659.BC94210F80B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for agedu:

2e2f811875a4a9c46bf65b7625700002  agedu-r8768.tar.gz



From musuruan at fedoraproject.org  Sun Dec 27 09:50:03 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 27 Dec 2009 09:50:03 +0000 (UTC)
Subject: File fbzx-2.3.0-noroms.tar.bz2 uploaded to lookaside cache by musuruan
Message-ID: <20091227095003.9A6E310F80B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fbzx:

67dd6d210c415a147ae4c4f44818359a  fbzx-2.3.0-noroms.tar.bz2



From jussilehtola at fedoraproject.org  Sun Dec 27 09:57:15 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 09:57:15 +0000 (UTC)
Subject: rpms/agedu/devel .cvsignore, 1.3, 1.4 agedu.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20091227095715.53BB311C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv418

Modified Files:
	.cvsignore agedu.spec sources 
Log Message:
Update to r8768.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Sep 2009 14:09:56 -0000	1.3
+++ .cvsignore	27 Dec 2009 09:57:15 -0000	1.4
@@ -1 +1 @@
-agedu-r8642.tar.gz
+agedu-r8768.tar.gz


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/devel/agedu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- agedu.spec	22 Sep 2009 14:09:57 -0000	1.3
+++ agedu.spec	27 Dec 2009 09:57:15 -0000	1.4
@@ -1,4 +1,4 @@
-%global rel r8642
+%global rel r8768
 
 Name:		agedu
 Version:	0
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8768
+- Update to upstream r8768.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
 - Update to upstream r8642.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 14:09:57 -0000	1.3
+++ sources	27 Dec 2009 09:57:15 -0000	1.4
@@ -1 +1 @@
-42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz
+2e2f811875a4a9c46bf65b7625700002  agedu-r8768.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 09:59:30 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 09:59:30 +0000 (UTC)
Subject: File cppcheck-1.39.tar.bz2 uploaded to lookaside cache by jussilehtola
Message-ID: <20091227095930.8AA0710F80B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cppcheck:

6174bb32926035bc4ccf57979c5cb13a  cppcheck-1.39.tar.bz2



From jussilehtola at fedoraproject.org  Sun Dec 27 09:59:46 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 09:59:46 +0000 (UTC)
Subject: rpms/cppcheck/devel .cvsignore, 1.5, 1.6 cppcheck.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20091227095946.12EC611C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv957

Modified Files:
	.cvsignore cppcheck.spec sources 
Log Message:
Update to 1.39.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Nov 2009 10:15:44 -0000	1.5
+++ .cvsignore	27 Dec 2009 09:59:45 -0000	1.6
@@ -1 +1 @@
-cppcheck-1.38.tar.bz2
+cppcheck-1.39.tar.bz2


Index: cppcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/devel/cppcheck.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cppcheck.spec	7 Nov 2009 10:15:44 -0000	1.5
+++ cppcheck.spec	27 Dec 2009 09:59:45 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		cppcheck
-Version:	1.38
+Version:	1.39
 Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.39-1
+- Update to 1.39.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.38-1
 - Update to 1.38.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Nov 2009 10:15:44 -0000	1.5
+++ sources	27 Dec 2009 09:59:45 -0000	1.6
@@ -1 +1 @@
-3de71fd04e0c05fd2cfc310fd8541218  cppcheck-1.38.tar.bz2
+6174bb32926035bc4ccf57979c5cb13a  cppcheck-1.39.tar.bz2



From jussilehtola at fedoraproject.org  Sun Dec 27 10:02:15 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 10:02:15 +0000 (UTC)
Subject: File GaussSum-2.2.0.tar.gz uploaded to lookaside cache by jussilehtola
Message-ID: <20091227100215.69CA110F80B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gausssum:

425ec0f8f746516ac4739404a3dd5083  GaussSum-2.2.0.tar.gz



From pfj at fedoraproject.org  Sun Dec 27 10:05:04 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 27 Dec 2009 10:05:04 +0000 (UTC)
Subject: rpms/monodevelop-debugger-mdb/devel import.log, 1.3,
	1.4 monodevelop-debugger-mdb.spec, 1.4, 1.5
Message-ID: <20091227100504.61ABD11C00CF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1929/devel

Modified Files:
	import.log monodevelop-debugger-mdb.spec 
Log Message:

64 bit build fixes 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	27 Dec 2009 00:24:46 -0000	1.3
+++ import.log	27 Dec 2009 10:05:04 -0000	1.4
@@ -1,3 +1,4 @@
 monodevelop-debugger-mdb-2_0-1_fc10:HEAD:monodevelop-debugger-mdb-2.0-1.fc10.src.rpm:1246571076
 monodevelop-debugger-mdb-2_1_0-1_fc12:HEAD:monodevelop-debugger-mdb-2.1.0-1.fc12.src.rpm:1252874834
 monodevelop-debugger-mdb-2_2-2_fc13:HEAD:monodevelop-debugger-mdb-2.2-2.fc13.src.rpm:1261873414
+monodevelop-debugger-mdb-2_2-3_fc13:HEAD:monodevelop-debugger-mdb-2.2-3.fc13.src.rpm:1261908206


Index: monodevelop-debugger-mdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/monodevelop-debugger-mdb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- monodevelop-debugger-mdb.spec	27 Dec 2009 00:24:46 -0000	1.4
+++ monodevelop-debugger-mdb.spec	27 Dec 2009 10:05:04 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:        MonoDevelop Debugger Addin
 Name:           monodevelop-debugger-mdb
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Group:          Development/Tools
 Source:         http://www.monodevelop.com/Downloads/%{name}-%{version}.tar.bz2
@@ -34,6 +34,9 @@ The %{name}-devel package contains devel
 %prep
 %setup -q
 sed -i -e 's!@expanded_libdir@/@PACKAGE@/!%{assembly_path}!g' Mono.Debugging.Backend.Mdb/mono.debugging.backend.mdb.pc.in
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!g' Mono.Debugging.Server.Mdb/Makefile
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!g' Mono.Debugging.Backend.Mdb/Makefile
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!g' Mono.Debugging.Backend.Mdb.AspNet/Makefile
 %patch0 -p1 -b .cecil
 
 %build
@@ -69,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono.debugging.backend.mdb.pc
 
 %changelog
+* Sun Dec 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-3
+- Fix for x86_64
+
 * Sat Dec 26 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2
 - Change exclusivearch to reflect the archs for monodevelop
 - Rebuild against mono-debugger-2.6 release



From jussilehtola at fedoraproject.org  Sun Dec 27 10:06:37 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 10:06:37 +0000 (UTC)
Subject: File Healpix_2.13a_2009Nov27.tar.gz uploaded to lookaside cache by
	jussilehtola
Message-ID: <20091227100637.EDB9D10F80B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for healpix:

391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 10:09:41 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 10:09:41 +0000 (UTC)
Subject: rpms/healpix/devel .cvsignore, 1.3, 1.4 healpix.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <20091227100941.3D72D11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2836

Modified Files:
	.cvsignore healpix.spec sources 
Log Message:
Update to 2.13a.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Sep 2009 14:03:09 -0000	1.3
+++ .cvsignore	27 Dec 2009 10:09:40 -0000	1.4
@@ -1 +1 @@
-Healpix_2.12a_2009Aug06a.tar.gz
+Healpix_2.13a_2009Nov27.tar.gz


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/healpix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- healpix.spec	26 Oct 2009 14:18:43 -0000	1.9
+++ healpix.spec	27 Dec 2009 10:09:41 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           healpix
-Version:        2.12a
+Version:        2.13a
 Release:        1%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
-Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_2.12a/Healpix_2.12a_2009Aug06a.tar.gz
+Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_%{version}/Healpix_%{version}_2009Nov27.tar.gz
 Source1:        healpix-f90test.sh
 Patch0:         healpix-2.12a-shlib.patch
 Patch1:         healpix-2.11c-gcc44.patch
@@ -315,6 +315,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.13a-1
+- Update to upstream 2.13a.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.12a-1
 - Update to upstream 2.12a.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 14:03:10 -0000	1.3
+++ sources	27 Dec 2009 10:09:41 -0000	1.4
@@ -1 +1 @@
-c014a059a9b533c749a8fc3b7d2a8ba1  Healpix_2.12a_2009Aug06a.tar.gz
+391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 10:13:32 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 10:13:32 +0000 (UTC)
Subject: rpms/gausssum/devel .cvsignore, 1.2, 1.3 gausssum-cclib.patch, 1.1,
	1.2 gausssum.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091227101332.1612F11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gausssum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3831

Modified Files:
	.cvsignore gausssum-cclib.patch gausssum.spec sources 
Log Message:
Update to 2.2.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 May 2009 06:24:04 -0000	1.2
+++ .cvsignore	27 Dec 2009 10:13:31 -0000	1.3
@@ -1 +1 @@
-GaussSum-2.1.6.tar.gz
+GaussSum-2.2.0.tar.gz

gausssum-cclib.patch:
 aboutbox.py       |    2 +-
 electrontrans.py  |    2 +-
 gausssumgui.py    |    2 +-
 preferencesbox.py |    2 +-
 utils.py          |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Index: gausssum-cclib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/devel/gausssum-cclib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gausssum-cclib.patch	4 May 2009 06:24:04 -0000	1.1
+++ gausssum-cclib.patch	27 Dec 2009 10:13:31 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up GaussSum-2.1.6/gausssum/aboutbox.py.orig GaussSum-2.1.6/gausssum/aboutbox.py
---- GaussSum-2.1.6/gausssum/aboutbox.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/aboutbox.py	2009-05-03 09:15:46.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/aboutbox.py.cclib GaussSum-2.2.0/gausssum/aboutbox.py
+--- GaussSum-2.2.0/gausssum/aboutbox.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/aboutbox.py	2009-12-27 12:11:08.843768337 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file
@@ -10,33 +10,33 @@ diff -up GaussSum-2.1.6/gausssum/aboutbo
  import os, sys
  if hasattr(sys, "frozen"): # i.e. if using py2exe
      installlocation = os.path.dirname(sys.executable)
-diff -up GaussSum-2.1.6/gausssum/electrontrans.py.orig GaussSum-2.1.6/gausssum/electrontrans.py
---- GaussSum-2.1.6/gausssum/electrontrans.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/electrontrans.py	2009-05-03 09:15:56.000000000 +0300
-@@ -4,7 +4,7 @@ import math
- import numpy
- import pdb
+diff -up GaussSum-2.2.0/gausssum/electrontrans.py.cclib GaussSum-2.2.0/gausssum/electrontrans.py
+--- GaussSum-2.2.0/gausssum/electrontrans.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/electrontrans.py	2009-12-27 12:11:31.276593400 +0200
+@@ -20,7 +20,7 @@ import numpy
+ import glob
+ 
  from gausssum.utils import GaussianSpectrum, levelname, percent
 -from gausssum.cclib.parser.utils import convertor
 +from cclib.parser.utils import convertor
  
  from Tkinter import *
  from gnupy import Gnuplot
-diff -up GaussSum-2.1.6/gausssum/gausssumgui.py.orig GaussSum-2.1.6/gausssum/gausssumgui.py
---- GaussSum-2.1.6/gausssum/gausssumgui.py.orig	2009-04-14 12:08:58.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/gausssumgui.py	2009-05-03 09:16:06.000000000 +0300
-@@ -22,7 +22,7 @@ import copy             # For deepcopy..
- import ConfigParser     # For writing the settings to an .ini file
+diff -up GaussSum-2.2.0/gausssum/gausssumgui.py.cclib GaussSum-2.2.0/gausssum/gausssumgui.py
+--- GaussSum-2.2.0/gausssum/gausssumgui.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/gausssumgui.py	2009-12-27 12:11:43.180622318 +0200
+@@ -23,7 +23,7 @@ import ConfigParser     # For writing th
  import logging
+ import glob
  
 -from gausssum.cclib.parser import ADF, GAMESS, Gaussian, ccopen
 +from cclib.parser import ADF, GAMESS, Gaussian, ccopen
  from gausssum.preferencesbox import PreferencesPopupBox
  from gausssum.aboutbox import AboutPopupBox
  from gausssum.popanalysis import Popanalysis
-diff -up GaussSum-2.1.6/gausssum/preferencesbox.py.orig GaussSum-2.1.6/gausssum/preferencesbox.py
---- GaussSum-2.1.6/gausssum/preferencesbox.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/preferencesbox.py	2009-05-03 09:16:20.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/preferencesbox.py.cclib GaussSum-2.2.0/gausssum/preferencesbox.py
+--- GaussSum-2.2.0/gausssum/preferencesbox.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/preferencesbox.py	2009-12-27 12:11:08.845768136 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file
@@ -46,9 +46,9 @@ diff -up GaussSum-2.1.6/gausssum/prefere
  from gausssum.plot import DisplayPlot
  from gausssum.gnupy import Gnuplot
  
-diff -up GaussSum-2.1.6/gausssum/utils.py.orig GaussSum-2.1.6/gausssum/utils.py
---- GaussSum-2.1.6/gausssum/utils.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/utils.py	2009-05-03 09:16:30.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/utils.py.cclib GaussSum-2.2.0/gausssum/utils.py
+--- GaussSum-2.2.0/gausssum/utils.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/utils.py	2009-12-27 12:11:08.846757866 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file


Index: gausssum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/devel/gausssum.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gausssum.spec	30 Jul 2009 22:42:34 -0000	1.3
+++ gausssum.spec	27 Dec 2009 10:13:31 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gausssum
-Version:	2.1.6
-Release:	5%{?dist}
+Version:	2.2.0
+Release:	1%{?dist}
 Summary:	A GUI application for analysis of output of quantum computations
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -33,7 +33,7 @@ optimisation, UV-Vis/IR/Raman spectra, M
 
 %prep
 %setup -q -n GaussSum-%{version}
-%patch0 -p1
+%patch0 -p1 -b .cclib
 # Change location of documentation
 sed 's|os.path.join(installlocation,"Docs","index.html")|"%{_docdir}/%{name}-%{version}/Docs/index.html"|g' \
  gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \
@@ -95,6 +95,9 @@ rm -rf %{buildroot} 
 %endif
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0.
+
 * Fri Jul 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.6-5
 - Fix a rather nasty packaging bug, BZ #514820 arising from missing
   BR: python-devel causing library to be placed in / instead of Python library.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 May 2009 06:24:04 -0000	1.2
+++ sources	27 Dec 2009 10:13:31 -0000	1.3
@@ -1 +1 @@
-80d0c796f1fc8d2959bb28a8e9f09d58  GaussSum-2.1.6.tar.gz
+425ec0f8f746516ac4739404a3dd5083  GaussSum-2.2.0.tar.gz



From kdudka at fedoraproject.org  Sun Dec 27 10:14:15 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Sun, 27 Dec 2009 10:14:15 +0000 (UTC)
Subject: rpms/elinks/devel elinks.spec,1.78,1.79
Message-ID: <20091227101415.0A95911C00CF@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4041

Modified Files:
	elinks.spec 
Log Message:
- add buildrequires for js-devel (#550717) and zlib-devel
- build support for 256 color terminal


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- elinks.spec	14 Dec 2009 15:28:28 -0000	1.78
+++ elinks.spec	27 Dec 2009 10:14:14 -0000	1.79
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.20.pre5%{?dist}
+Release:   0.21.pre5%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -12,13 +12,16 @@ Buildroot: %{_tmppath}/%{name}-%{version
 BuildRequires: automake
 BuildRequires: bzip2-devel
 BuildRequires: expat-devel
-BuildRequires: libidn-devel
+BuildRequires: gpm-devel
+BuildRequires: js-devel
 BuildRequires: krb5-devel
-BuildRequires: nss_compat_ossl-devel >= 0.9.3
+BuildRequires: libidn-devel
+BuildRequires: nss_compat_ossl-devel
+
+# nss-devel should be required by nss_compat_ossl-devel (#550770)
 BuildRequires: nss-devel
 BuildRequires: pkgconfig
-BuildRequires: gpm-devel
-Requires: zlib >= 1.2.0.2
+BuildRequires: zlib-devel
 Requires(preun): %{_sbindir}/alternatives
 Requires(post): coreutils
 Requires(post): %{_sbindir}/alternatives
@@ -77,7 +80,7 @@ quickly and swiftly displays Web pages.
 
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) -D_GNU_SOURCE"
 %configure %{?rescue:--without-gpm} --without-x --with-gssapi \
-  --enable-bittorrent --with-nss_compat_ossl
+  --enable-bittorrent --with-nss_compat_ossl --enable-256-colors
 make %{?_smp_mflags}
 
 %install
@@ -129,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 
 %changelog
+* Sun Dec 27 2009 Kamil Dudka <kdudka at redhat.com> 0.12-0.21.pre5
+- add buildrequires for js-devel (#550717) and zlib-devel
+- build support for 256 color terminal
+
 * Mon Dec 14 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.20.pre5
 - Add buildrequires for gpm-devel to enable gpm support(#547064)
 



From jussilehtola at fedoraproject.org  Sun Dec 27 10:15:49 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 10:15:49 +0000 (UTC)
Subject: rpms/gausssum/devel gausssum.spec,1.4,1.5
Message-ID: <20091227101549.AF1C211C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gausssum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4466

Modified Files:
	gausssum.spec 
Log Message:
Bump release; forgot to update cvs tree for F-13.


Index: gausssum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/devel/gausssum.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gausssum.spec	27 Dec 2009 10:13:31 -0000	1.4
+++ gausssum.spec	27 Dec 2009 10:15:49 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		gausssum
 Version:	2.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A GUI application for analysis of output of quantum computations
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -95,6 +95,9 @@ rm -rf %{buildroot} 
 %endif
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-2
+- Bump release.
+
 * Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-1
 - Update to 2.2.0.
 



From thomasj at fedoraproject.org  Sun Dec 27 10:24:08 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Sun, 27 Dec 2009 10:24:08 +0000 (UTC)
Subject: rpms/skrooge/F-11 .cvsignore, 1.5, 1.6 skrooge.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <20091227102408.3108611C00CF@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6190

Modified Files:
	.cvsignore skrooge.spec sources 
Log Message:
* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.5-1
- Update to new upstream release
- Corrects a lot of bugs and problems. See the CHANGELOG for details.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Nov 2009 20:48:44 -0000	1.5
+++ .cvsignore	27 Dec 2009 10:24:07 -0000	1.6
@@ -1 +1 @@
-skrooge-0.5.4.tar.bz2
+skrooge-0.5.5.tar.bz2


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/skrooge.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- skrooge.spec	30 Nov 2009 20:48:44 -0000	1.7
+++ skrooge.spec	27 Dec 2009 10:24:07 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           skrooge
-Version:        0.5.4
+Version:        0.5.5
 Release:        1%{?dist}
 Summary:        Personal finances manager
 
@@ -117,6 +117,10 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Sun Dec 27 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.5-1
+- Update to new upstream release
+- Corrects a lot of bugs and problems. See the CHANGELOG for details.
+
 * Sun Nov 30 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.4-1
 - Update to new upstream version
 - Corrects a lot of bugs and problems. See the changelog for details.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Nov 2009 20:48:44 -0000	1.6
+++ sources	27 Dec 2009 10:24:08 -0000	1.7
@@ -1 +1 @@
-f32f68d1fcdb9bd2ad1acc013e75cc06  skrooge-0.5.4.tar.bz2
+631bd3138beec9f9a213103f4dcda95c  skrooge-0.5.5.tar.bz2



From remi at fedoraproject.org  Sun Dec 27 10:34:37 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 27 Dec 2009 10:34:37 +0000 (UTC)
Subject: rpms/ocsinventory-agent/devel ocsinventory-agent.spec,1.17,1.18
Message-ID: <20091227103437.BD07211C00CF@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/ocsinventory-agent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8534

Modified Files:
	ocsinventory-agent.spec 
Log Message:
missing requires


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocsinventory-agent/devel/ocsinventory-agent.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ocsinventory-agent.spec	22 Dec 2009 19:04:16 -0000	1.17
+++ ocsinventory-agent.spec	27 Dec 2009 10:34:37 -0000	1.18
@@ -6,7 +6,7 @@ Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Version:   1.1.1
-Release:   1%{?dist}%{?ocstag:.%{ocstag}}
+Release:   2%{?dist}%{?ocstag:.%{ocstag}}
 
 #Source0:  http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:  http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
@@ -27,15 +27,24 @@ URL:       http://www.ocsinventory-ng.or
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl(Module::Install) perl(XML::Simple) perl(LWP) perl(Net::IP)
-BuildRequires: perl(Digest::MD5) perl(File::Temp) perl(XML::SAX)
+%if 0%{?rhel} != 3
+BuildRequires: perl(Module::Install) perl(XML::SAX)
+%endif
+BuildRequires: perl(XML::Simple) perl(LWP) perl(Net::IP)
+BuildRequires: perl(Digest::MD5) perl(File::Temp)
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  net-tools, pciutils
 Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly
 Requires:  perl(HTTP::Request) perl(Proc::Daemon)
-Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay)
+Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay) perl(Net::IP)
 Requires:  nmap monitor-edid which
-%if 0%{?rhel} == 4
+%if 0%{?rhel} == 3
+Requires:  perl(XML::Parser)
+%else
+Requires:  perl(XML::SAX)
+%endif
+%if 0%{?rhel}%{?fedora} <= 4
 Requires:  kernel-utils
 %else
 Requires:  smartmontools
@@ -49,6 +58,10 @@ Provides:  ocsinventory-client  = 1.02
 # use the following line when version is strictly above 1.01
 # ocsinventory-client = %{version}-%{release}
 
+%if 0%{?rhel} == 3
+%define perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%endif
+
 
 %description
 Open Computer and Software Inventory Next Generation is an application
@@ -199,6 +212,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Remi Collet <Fedora at famillecollet.com> 1.1.1-2
+- missing perl(Net::IP) requires (+ some EL3 stuff: yes, I know)
+
 * Tue Dec 22 2009 Remi Collet <Fedora at famillecollet.com> 1.1.1-1
 - update to 1.1.1
 



From rdieter at fedoraproject.org  Sun Dec 27 10:46:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Dec 2009 10:46:15 +0000 (UTC)
Subject: rpms/polkit-qt/devel polkit-qt.spec,1.5,1.6
Message-ID: <20091227104615.AB8B311C00CF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/polkit-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10986

Modified Files:
	polkit-qt.spec 
Log Message:
* Sun Dec 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.95-0.3.20091119svn
- Provides: polkit-qt-1(-devel) ...
- doc: make noarch



Index: polkit-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-qt/devel/polkit-qt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- polkit-qt.spec	9 Dec 2009 23:25:30 -0000	1.5
+++ polkit-qt.spec	27 Dec 2009 10:46:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name:            polkit-qt
 Version:         0.95
-Release:         0.2.20091119svn%{?dist}
+Release:         0.3.20091119svn%{?dist}
 Summary:         Qt bindings for PolicyKit
 
 Group:           System Environment/Libraries
@@ -21,6 +21,8 @@ BuildRequires:   doxygen
 
 Obsoletes:       polkit-qt-examples < 0.10
 
+Provides: polkit-qt-1 = %{version}-%{release}
+
 %description
 Polkit-qt is a library that lets developers use the PolicyKit API
 through a nice Qt-styled API.
@@ -28,7 +30,8 @@ through a nice Qt-styled API.
 %package devel
 Summary: Development files for PolicyKit Qt bindings
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Provides: polkit-qt-1-devel = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 Requires: polkit-devel
 %description devel
@@ -37,10 +40,11 @@ Requires: polkit-devel
 %package doc
 Summary: Doxygen documentation for the PolkitQt API
 Group: Documentation
-Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
 %description doc
 %{summary}.
 
+
 %prep
 %setup -q
 
@@ -95,6 +99,10 @@ rm -rf %{buildroot}
 %doc html/*
 
 %changelog
+* Sun Dec 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.95-0.3.20091119svn
+- Provides: polkit-qt-1(-devel) ...
+- doc: make noarch
+
 * Wed Dec 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  - 0.95-0.2.20091119svn
 - Obsoletes: polkit-qt-examples < 0.10 for upgrade path
 



From rdieter at fedoraproject.org  Sun Dec 27 10:47:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Dec 2009 10:47:51 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.332,1.333
Message-ID: <20091227104751.42E7511C00CF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11390

Modified Files:
	kdebase-workspace.spec 
Log Message:
polkit_09 buildfixes



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -p -r1.332 -r1.333
--- kdebase-workspace.spec	19 Dec 2009 05:17:19 -0000	1.332
+++ kdebase-workspace.spec	27 Dec 2009 10:47:51 -0000	1.333
@@ -1,6 +1,8 @@
 
-%if 0%{?fedora} && 0%{?fedora} < 12
-%define with_polkit_09 1
+%if 0%{?fedora} > 11 ||  0%{?rhel} > 5 
+%define polkit_1 1
+%else
+%define polkit_09 1
 %endif
 
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -53,7 +55,7 @@ Obsoletes: kdebase-workspace < 4.3.0-2
 # replace with polkit-kde when it's ready
 Requires: PolicyKit-authentication-agent
 
-%if ! 0%{?with_polkit_09}
+%if 0%{?polkit1}
 Obsoletes: PolicyKit-kde < %{version}-%{release}
 # if/when we actually create this one:
 #Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
@@ -92,7 +94,7 @@ BuildRequires: lm_sensors-devel
 %endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
-%if 0%{?with_polkit_09}
+%if 0%{?polkit_09}
 BuildRequires: polkit-qt-devel
 %endif
 BuildRequires: qimageblitz-devel
@@ -490,6 +492,7 @@ fi
 %{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasmaengineexplorer.1*
+
 %if 0%{?fedora}
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -505,7 +508,23 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 %exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
-%if 0%{?with_polkit_09}
+%if 0%{?polkit_09}
+%{_kde4_bindir}/kfontinst
+%{_kde4_bindir}/kfontview
+%{_kde4_libdir}/kde4/fontthumbnail.so
+%{_kde4_libdir}/kde4/kfontviewpart.so
+%{_kde4_libdir}/kde4/kio_fonts.so
+%{_kde4_libdir}/strigi/strigita_font.so
+%{_kde4_libexecdir}/fontinst
+%{_kde4_libexecdir}/fontinst_x11
+%{_kde4_libexecdir}/kfontprint
+%{_datadir}/PolicyKit/policy/org.kde.fontinst.policy
+%{_datadir}/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy
+%{_datadir}/PolicyKit/policy/org.kde.ksysguard.processlisthelper.policy
+%{_kde4_appsdir}/kfontinst/
+%{_kde4_appsdir}/kfontview/
+%{_kde4_appsdir}/konqsidebartng/virtual_folders/services/fonts.desktop
+
 # PolicyKit-kde
 %exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
@@ -516,7 +535,7 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
-%if 0%{?with_polkit_09}
+%if 0%{?polkit_09}
 %exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %endif
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
@@ -583,7 +602,7 @@ fi
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 %endif
 
-%if 0%{?with_polkit_09}
+%if 0%{?polkit_09}
 %files -n PolicyKit-kde
 %defattr(-,root,root,-)
 %{_kde4_bindir}/polkit-kde-authorization



From rdieter at fedoraproject.org  Sun Dec 27 10:53:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Dec 2009 10:53:38 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.562,1.563
Message-ID: <20091227105338.CEC7511C00CF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12532

Modified Files:
	kdelibs.spec 
Log Message:
* Sun Dec 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-6
- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -p -r1.562 -r1.563
--- kdelibs.spec	27 Dec 2009 02:05:02 -0000	1.562
+++ kdelibs.spec	27 Dec 2009 10:53:38 -0000	1.563
@@ -13,7 +13,7 @@
 
 Summary: KDE Libraries
 Version: 4.3.85
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -94,6 +94,10 @@ Patch26: kdelibs-4.3.3-khtml_svg_no_var_
 ## Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
+%if 0%{?fedora} && 0%{?fedora} < 13
+Conflicts: kdebase-workspace-libs < 4.3.80
+%endif
+
 BuildRequires: qt4-devel >= 4.6.0
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: xdg-utils
@@ -163,8 +167,12 @@ This package includes the common files f
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
 # stuff moved, help upgrade path
+%if 0%{?fedora} && 0%{?fedora} < 12
 Conflicts: kdebase-runtime < 4.2.90
-Conflicts: kdebase-workspace-devel < 4.2.90
+%endif
+%if 0%{?fedora} && 0%{?fedora} < 13
+Conflicts: kdebase-workspace-devel < 4.3.80
+%endif
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdelibs4-devel < %{version}-%{release}
@@ -435,6 +443,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-6
+- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80
+
 * Sat Dec 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-5
 - move kdecmake,makekdewidgets manpages to -devel (#549947)
 



From rrakus at fedoraproject.org  Sun Dec 27 11:14:16 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Sun, 27 Dec 2009 11:14:16 +0000 (UTC)
Subject: File bash-4.1-rc1.tar.gz uploaded to lookaside cache by rrakus
Message-ID: <20091227111416.4F65D10F892@bastion.fedoraproject.org>

A file has been added to the lookaside cache for bash:

fc8de7b0c715fe043129c9e347a5658c  bash-4.1-rc1.tar.gz



From rrakus at fedoraproject.org  Sun Dec 27 11:22:38 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Sun, 27 Dec 2009 11:22:38 +0000 (UTC)
Subject: rpms/bash/devel .cvsignore, 1.13, 1.14 bash-2.05a-interpreter.patch, 
	1.6, 1.7 bash-cond-rmatch.patch, 1.3, 1.4 bash-requires.patch,
	1.4, 1.5 bash.spec, 1.193, 1.194 sources, 1.16,
	1.17 bash-4.0-emacs.patch, 1.1, NONE bash40-001, 1.1,
	NONE bash40-002, 1.1, NONE bash40-003, 1.1, NONE bash40-004, 1.1,
	NONE bash40-005, 1.1, NONE bash40-006, 1.1, NONE bash40-007, 1.1,
	NONE bash40-008, 1.1, NONE bash40-009, 1.1, NONE bash40-010, 1.1,
	NONE bash40-011, 1.1, NONE bash40-012, 1.1, NONE bash40-013, 1.1,
	NONE bash40-014, 1.1, NONE bash40-015, 1.1, NONE bash40-016, 1.1,
	NONE bash40-017, 1.1, NONE bash40-018, 1.1, NONE bash40-019, 1.1,
	NONE bash40-020, 1.1, NONE bash40-021, 1.1, NONE bash40-022, 1.1,
	NONE bash40-023, 1.1, NONE bash40-024, 1.1, NONE bash40-025, 1.1,
	NONE bash40-026, 1.1, NONE bash40-027, 1.1, NONE bash40-028, 1.1,
	NONE bash40-029, 1.1, NONE bash40-030, 1.1, NONE bash40-031, 1.1,
	NONE bash40-032, 1.1, NONE bash40-033, 1.1, NONE bash40-034, 1.1,
	NONE bash40-035, 1.1, NONE
Message-ID: <20091227112238.E7A2E11C00CF@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/pkgs/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18105

Modified Files:
	.cvsignore bash-2.05a-interpreter.patch bash-cond-rmatch.patch 
	bash-requires.patch bash.spec sources 
Removed Files:
	bash-4.0-emacs.patch bash40-001 bash40-002 bash40-003 
	bash40-004 bash40-005 bash40-006 bash40-007 bash40-008 
	bash40-009 bash40-010 bash40-011 bash40-012 bash40-013 
	bash40-014 bash40-015 bash40-016 bash40-017 bash40-018 
	bash40-019 bash40-020 bash40-021 bash40-022 bash40-023 
	bash40-024 bash40-025 bash40-026 bash40-027 bash40-028 
	bash40-029 bash40-030 bash40-031 bash40-032 bash40-033 
	bash40-034 bash40-035 
Log Message:
Update to upstream 4.1-rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	24 Feb 2009 13:28:29 -0000	1.13
+++ .cvsignore	27 Dec 2009 11:22:37 -0000	1.14
@@ -1 +1 @@
-bash-4.0.tar.gz
+bash-4.1-rc1.tar.gz

bash-2.05a-interpreter.patch:
 config.h.in   |    6 ++
 configure.in  |    4 -
 execute_cmd.c |  144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 151 insertions(+), 3 deletions(-)

Index: bash-2.05a-interpreter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash-2.05a-interpreter.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bash-2.05a-interpreter.patch	26 Jan 2009 11:50:44 -0000	1.6
+++ bash-2.05a-interpreter.patch	27 Dec 2009 11:22:37 -0000	1.7
@@ -1,6 +1,50 @@
-diff -up bash-4.0/execute_cmd.c.interpreter bash-4.0/execute_cmd.c
---- bash-4.0/execute_cmd.c.interpreter	2009-01-04 20:32:29.000000000 +0100
-+++ bash-4.0/execute_cmd.c	2009-01-21 14:55:34.000000000 +0100
+diff -up bash-4.1-rc1/config.h.in.interpreter bash-4.1-rc1/config.h.in
+--- bash-4.1-rc1/config.h.in.interpreter	2009-12-26 22:44:46.000000000 +0100
++++ bash-4.1-rc1/config.h.in	2009-12-26 22:44:46.000000000 +0100
+@@ -695,6 +695,9 @@
+ /* Define if you have the pathconf function. */
+ #undef HAVE_PATHCONF
+ 
++/* Define if you have the pread function. */
++#undef HAVE_PREAD
++
+ /* Define if you have the putenv function.  */
+ #undef HAVE_PUTENV
+ 
+@@ -881,6 +884,9 @@
+ /* Define if you have the <dlfcn.h> header file.  */
+ #undef HAVE_DLFCN_H
+ 
++/* Define if you have the <elf.h> header file.  */
++#undef HAVE_ELF_H
++
+ /* Define if you have the <grp.h> header file.  */
+ #undef HAVE_GRP_H
+ 
+diff -up bash-4.1-rc1/configure.in.interpreter bash-4.1-rc1/configure.in
+--- bash-4.1-rc1/configure.in.interpreter	2009-12-12 21:43:18.000000000 +0100
++++ bash-4.1-rc1/configure.in	2009-12-26 22:46:19.000000000 +0100
+@@ -659,7 +659,7 @@ BASH_HEADER_INTTYPES
+ AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
+ 		 memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
+ 		 stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h \
+-		 syslog.h)
++		 syslog.h elf.h)
+ AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \
+ 		 sys/resource.h sys/param.h sys/socket.h sys/stat.h \
+ 		 sys/time.h sys/times.h sys/types.h sys/wait.h)
+@@ -723,7 +723,7 @@ dnl checks for system calls
+ AC_CHECK_FUNCS(dup2 eaccess fcntl getdtablesize getgroups gethostname \
+ 		getpagesize getpeername getrlimit getrusage gettimeofday \
+ 		kill killpg lstat readlink sbrk select setdtablesize \
+-		setitimer tcgetpgrp uname ulimit waitpid)
++		setitimer tcgetpgrp uname ulimit waitpid pread)
+ AC_REPLACE_FUNCS(rename)
+ 
+ dnl checks for c library functions
+diff -up bash-4.1-rc1/execute_cmd.c.interpreter bash-4.1-rc1/execute_cmd.c
+--- bash-4.1-rc1/execute_cmd.c.interpreter	2009-11-29 03:29:34.000000000 +0100
++++ bash-4.1-rc1/execute_cmd.c	2009-12-26 22:44:46.000000000 +0100
 @@ -41,6 +41,10 @@
  #  include <unistd.h>
  #endif
@@ -12,7 +56,7 @@ diff -up bash-4.0/execute_cmd.c.interpre
  #include "posixtime.h"
  
  #if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE)
-@@ -4601,13 +4605,21 @@ shell_execve (command, args, env)
+@@ -4805,13 +4809,21 @@ shell_execve (command, args, env)
  	{
  	  /* The file has the execute bits set, but the kernel refuses to
  	     run it for some reason.  See why. */
@@ -35,7 +79,7 @@ diff -up bash-4.0/execute_cmd.c.interpre
  	      interp = getinterp (sample, sample_len, (int *)NULL);
  	      ilen = strlen (interp);
  	      errno = i;
-@@ -4623,6 +4635,136 @@ shell_execve (command, args, env)
+@@ -4827,6 +4839,136 @@ shell_execve (command, args, env)
  	      return (EX_NOEXEC);
  	    }
  #endif
@@ -172,47 +216,3 @@ diff -up bash-4.0/execute_cmd.c.interpre
  	  errno = i;
  	  file_error (command);
  	}
-diff -up bash-4.0/config.h.in.interpreter bash-4.0/config.h.in
---- bash-4.0/config.h.in.interpreter	2009-01-21 14:55:34.000000000 +0100
-+++ bash-4.0/config.h.in	2009-01-21 14:55:34.000000000 +0100
-@@ -670,6 +670,9 @@
- /* Define if you have the pathconf function. */
- #undef HAVE_PATHCONF
- 
-+/* Define if you have the pread function. */
-+#undef HAVE_PREAD
-+
- /* Define if you have the putenv function.  */
- #undef HAVE_PUTENV
- 
-@@ -850,6 +853,9 @@
- /* Define if you have the <dlfcn.h> header file.  */
- #undef HAVE_DLFCN_H
- 
-+/* Define if you have the <elf.h> header file.  */
-+#undef HAVE_ELF_H
-+
- /* Define if you have the <grp.h> header file.  */
- #undef HAVE_GRP_H
- 
-diff -up bash-4.0/configure.in.interpreter bash-4.0/configure.in
---- bash-4.0/configure.in.interpreter	2009-01-06 17:51:58.000000000 +0100
-+++ bash-4.0/configure.in	2009-01-21 15:04:58.000000000 +0100
-@@ -649,7 +649,7 @@ BASH_HEADER_INTTYPES
- 
- AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
- 		 memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
--		 stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h)
-+		 stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h elf.h)
- AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \
- 		 sys/resource.h sys/param.h sys/socket.h sys/stat.h \
- 		 sys/time.h sys/times.h sys/types.h sys/wait.h)
-@@ -713,7 +713,7 @@ dnl checks for system calls
- AC_CHECK_FUNCS(dup2 eaccess fcntl getdtablesize getgroups gethostname \
- 		getpagesize getpeername getrlimit getrusage gettimeofday \
- 		kill killpg lstat readlink sbrk select setdtablesize \
--		setitimer tcgetpgrp uname ulimit waitpid)
-+		setitimer tcgetpgrp uname ulimit waitpid pread)
- AC_REPLACE_FUNCS(rename)
- 
- dnl checks for c library functions

bash-cond-rmatch.patch:
 execute_cmd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: bash-cond-rmatch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash-cond-rmatch.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bash-cond-rmatch.patch	5 Jun 2008 15:43:36 -0000	1.3
+++ bash-cond-rmatch.patch	27 Dec 2009 11:22:37 -0000	1.4
@@ -1,15 +1,13 @@
-diff -up bash-3.2/execute_cmd.c.cond-rmatch bash-3.2/execute_cmd.c
---- bash-3.2/execute_cmd.c.cond-rmatch	2008-06-05 17:21:20.000000000 +0200
-+++ bash-3.2/execute_cmd.c	2008-06-05 17:23:54.000000000 +0200
-@@ -2560,8 +2560,9 @@ execute_cond_node (cond)
-       arg1 = cond_expand_word (cond->left->op, 0);
-       if (arg1 == 0)
+diff -up bash-4.1-rc1/execute_cmd.c.cond_rmatch bash-4.1-rc1/execute_cmd.c
+--- bash-4.1-rc1/execute_cmd.c.cond_rmatch	2009-12-26 22:49:09.000000000 +0100
++++ bash-4.1-rc1/execute_cmd.c	2009-12-26 22:54:11.000000000 +0100
+@@ -3278,8 +3278,7 @@ execute_cond_node (cond)
  	arg1 = nullstr;
+       if (ignore)
+ 	comsub_ignore_return++;
 -      arg2 = cond_expand_word (cond->right->op,
 -			       (rmatch && shell_compatibility_level > 31) ? 2 : (patmatch ? 1 : 0));
-+
 +      arg2 = cond_expand_word (cond->right->op, patmatch ? 1 : 0);
-+
+       if (ignore)
+ 	comsub_ignore_return--;
        if (arg2 == 0)
- 	arg2 = nullstr;
- 

bash-requires.patch:
 builtins.h            |    2 ++
 builtins/mkbuiltins.c |   27 ++++++++++++++++++++++++++-
 doc/bash.1            |    7 +++++++
 doc/bashref.texi      |    7 +++++++
 eval.c                |    3 ++-
 execute_cmd.c         |   11 +++++++++--
 execute_cmd.h         |    2 ++
 make_cmd.c            |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 shell.c               |   10 ++++++++++
 9 files changed, 115 insertions(+), 4 deletions(-)

Index: bash-requires.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash-requires.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bash-requires.patch	26 Jan 2009 11:50:44 -0000	1.4
+++ bash-requires.patch	27 Dec 2009 11:22:37 -0000	1.5
@@ -1,57 +1,94 @@
-diff -up bash-4.0/shell.c.requires bash-4.0/shell.c
---- bash-4.0/shell.c.requires	2009-01-21 15:28:16.000000000 +0100
-+++ bash-4.0/shell.c	2009-01-21 15:28:16.000000000 +0100
-@@ -193,6 +193,9 @@ int have_devfd = 0;
- /* The name of the .(shell)rc file. */
- static char *bashrc_file = "~/.bashrc";
- 
-+/* Non-zero if we are finding the scripts requirements. */
-+int rpm_requires;
+diff -up bash-4.1-rc1/builtins.h.requires bash-4.1-rc1/builtins.h
+--- bash-4.1-rc1/builtins.h.requires	2009-01-04 20:32:23.000000000 +0100
++++ bash-4.1-rc1/builtins.h	2009-12-26 22:55:02.000000000 +0100
+@@ -41,6 +41,8 @@
+ #define SPECIAL_BUILTIN 0x08	/* This is a Posix `special' builtin. */
+ #define ASSIGNMENT_BUILTIN 0x10	/* This builtin takes assignment statements. */
+ #define POSIX_BUILTIN	0x20	/* This builtins is special in the Posix command search order. */
++#define REQUIRES_BUILTIN 0x40	/* This builtin requires other files. */
 +
- /* Non-zero means to act more like the Bourne shell on startup. */
- static int act_like_sh;
  
-@@ -251,6 +254,7 @@ static const struct {
-   { "posix", Int, &posixly_correct, (char **)0x0 },
-   { "protected", Int, &protected_mode, (char **)0x0 },
-   { "rcfile", Charp, (int *)0x0, &bashrc_file },
-+  { "rpm-requires", Int, &rpm_requires, (char **)0x0 },
- #if defined (RESTRICTED_SHELL)
-   { "restricted", Int, &restricted, (char **)0x0 },
- #endif
-@@ -479,6 +483,12 @@ main (argc, argv, env)
-   if (dump_translatable_strings)
-     read_but_dont_execute = 1;
+ #define BASE_INDENT	4
  
-+  if (rpm_requires)
-+    {
-+      read_but_dont_execute = 1;
-+      initialize_shell_builtins ();
-+    }
+diff -up bash-4.1-rc1/builtins/mkbuiltins.c.requires bash-4.1-rc1/builtins/mkbuiltins.c
+--- bash-4.1-rc1/builtins/mkbuiltins.c.requires	2009-01-04 20:32:23.000000000 +0100
++++ bash-4.1-rc1/builtins/mkbuiltins.c	2009-12-26 22:55:02.000000000 +0100
+@@ -69,9 +69,15 @@ extern char *strcpy ();
+ #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
+ 
+ /* Flag values that builtins can have. */
++/*  These flags are for the C code generator, 
++    the C which is produced (./builtin.c)
++    includes the flags definitions found 
++    in ../builtins.h */
+ #define BUILTIN_FLAG_SPECIAL	0x01
+ #define BUILTIN_FLAG_ASSIGNMENT 0x02
+ #define BUILTIN_FLAG_POSIX_BUILTIN 0x04
++#define BUILTIN_FLAG_REQUIRES	0x08
 +
-   if (running_setuid && privileged_mode == 0)
-     disable_priv_mode ();
  
-diff -up bash-4.0/doc/bashref.texi.requires bash-4.0/doc/bashref.texi
---- bash-4.0/doc/bashref.texi.requires	2009-01-21 15:28:16.000000000 +0100
-+++ bash-4.0/doc/bashref.texi	2009-01-21 15:28:16.000000000 +0100
-@@ -5253,6 +5253,13 @@ standard.  @xref{Bash POSIX Mode}, for a
- @item --restricted
- Make the shell a restricted shell (@pxref{The Restricted Shell}).
+ #define BASE_INDENT	4
  
-+ at item --rpm-requires
-+Produce the list of files that are required for the 
-+shell script to run.  This implies '-n' and is subject
-+to the same limitations as compile time error checking checking;
-+Backticks, [] tests,  and evals are not parsed so some 
-+dependencies may be missed.
+@@ -163,10 +169,18 @@ char *posix_builtins[] =
+   (char *)NULL
+ };
+ 
++/* The builtin commands that cause requirements on other files. */
++static char *requires_builtins[] =
++{
++  ".", "command", "exec", "source", "inlib",
++  (char *)NULL
++};
 +
- @item --verbose
- Equivalent to @option{-v}.  Print shell input lines as they're read.
+ /* Forward declarations. */
+ static int is_special_builtin ();
+ static int is_assignment_builtin ();
+ static int is_posix_builtin ();
++static int is_requires_builtin ();
+ 
+ #if !defined (HAVE_RENAME)
+ static int rename ();
+@@ -812,6 +826,9 @@ builtin_handler (self, defs, arg)
+     new->flags |= BUILTIN_FLAG_ASSIGNMENT;
+   if (is_posix_builtin (name))
+     new->flags |= BUILTIN_FLAG_POSIX_BUILTIN;
++  if (is_requires_builtin (name))
++    new->flags |= BUILTIN_FLAG_REQUIRES;
++
+ 
+   array_add ((char *)new, defs->builtins);
+   building_builtin = 1;
+@@ -1229,11 +1246,12 @@ write_builtins (defs, structfile, extern
+ 		  else
+ 		    fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
  
-diff -up bash-4.0/doc/bash.1.requires bash-4.0/doc/bash.1
---- bash-4.0/doc/bash.1.requires	2009-01-21 15:28:16.000000000 +0100
-+++ bash-4.0/doc/bash.1	2009-01-21 15:28:16.000000000 +0100
+-		  fprintf (structfile, "%s%s%s%s, %s_doc,\n",
++		  fprintf (structfile, "%s%s%s%s%s, %s_doc,\n",
+ 		    "BUILTIN_ENABLED | STATIC_BUILTIN",
+ 		    (builtin->flags & BUILTIN_FLAG_SPECIAL) ? " | SPECIAL_BUILTIN" : "",
+ 		    (builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " | ASSIGNMENT_BUILTIN" : "",
+ 		    (builtin->flags & BUILTIN_FLAG_POSIX_BUILTIN) ? " | POSIX_BUILTIN" : "",
++		    (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
+ 		    document_name (builtin));
+ 
+ 		  fprintf
+@@ -1581,6 +1599,13 @@ is_posix_builtin (name)
+   return (_find_in_table (name, posix_builtins));
+ }
+ 
++static int
++is_requires_builtin (name)
++     char *name;
++{
++  return (_find_in_table (name, requires_builtins));
++}
++
+ #if !defined (HAVE_RENAME)
+ static int
+ rename (from, to)
+diff -up bash-4.1-rc1/doc/bash.1.requires bash-4.1-rc1/doc/bash.1
+--- bash-4.1-rc1/doc/bash.1.requires	2009-12-26 22:55:02.000000000 +0100
++++ bash-4.1-rc1/doc/bash.1	2009-12-26 22:55:02.000000000 +0100
 @@ -231,6 +231,13 @@ The shell becomes restricted (see
  .B "RESTRICTED SHELL"
  below).
@@ -66,10 +103,95 @@ diff -up bash-4.0/doc/bash.1.requires ba
  .B \-\-verbose
  Equivalent to  \fB\-v\fP.
  .TP
-diff -up bash-4.0/make_cmd.c.requires bash-4.0/make_cmd.c
---- bash-4.0/make_cmd.c.requires	2009-01-04 20:32:38.000000000 +0100
-+++ bash-4.0/make_cmd.c	2009-01-21 15:28:16.000000000 +0100
-@@ -41,11 +41,15 @@
+diff -up bash-4.1-rc1/doc/bashref.texi.requires bash-4.1-rc1/doc/bashref.texi
+--- bash-4.1-rc1/doc/bashref.texi.requires	2009-12-26 22:55:02.000000000 +0100
++++ bash-4.1-rc1/doc/bashref.texi	2009-12-26 22:55:02.000000000 +0100
+@@ -5337,6 +5337,13 @@ standard.  @xref{Bash POSIX Mode}, for a
+ @item --restricted
+ Make the shell a restricted shell (@pxref{The Restricted Shell}).
+ 
++ at item --rpm-requires
++Produce the list of files that are required for the 
++shell script to run.  This implies '-n' and is subject
++to the same limitations as compile time error checking checking;
++Backticks, [] tests,  and evals are not parsed so some 
++dependencies may be missed.
++
+ @item --verbose
+ Equivalent to @option{-v}.  Print shell input lines as they're read.
+ 
+diff -up bash-4.1-rc1/eval.c.requires bash-4.1-rc1/eval.c
+--- bash-4.1-rc1/eval.c.requires	2009-01-04 20:32:26.000000000 +0100
++++ bash-4.1-rc1/eval.c	2009-12-26 22:55:02.000000000 +0100
+@@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi
+ extern int need_here_doc;
+ extern int current_command_number, current_command_line_count, line_number;
+ extern int expand_aliases;
++extern int rpm_requires;
+ 
+ static void send_pwd_to_eterm __P((void));
+ static sighandler alrm_catcher __P((int));
+@@ -136,7 +137,7 @@ reader_loop ()
+ 
+       if (read_command () == 0)
+ 	{
+-	  if (interactive_shell == 0 && read_but_dont_execute)
++	  if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires))
+ 	    {
+ 	      last_command_exit_value = EXECUTION_SUCCESS;
+ 	      dispose_command (global_command);
+diff -up bash-4.1-rc1/execute_cmd.c.requires bash-4.1-rc1/execute_cmd.c
+--- bash-4.1-rc1/execute_cmd.c.requires	2009-12-26 22:55:02.000000000 +0100
++++ bash-4.1-rc1/execute_cmd.c	2009-12-26 22:55:02.000000000 +0100
+@@ -501,6 +501,8 @@ async_redirect_stdin ()
+ 
+ #define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
+ 
++extern int rpm_requires;
++
+ /* Execute the command passed in COMMAND, perhaps doing it asynchrounously.
+    COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
+    ASYNCHROUNOUS, if non-zero, says to do this command in the background.
+@@ -532,8 +534,13 @@ execute_command_internal (command, async
+ #else
+   if (breaking || continuing)
+     return (last_command_exit_value);
+-  if (command == 0 || read_but_dont_execute)
++  if (command == 0 || (read_but_dont_execute && !rpm_requires))
+     return (EXECUTION_SUCCESS);
++  if (rpm_requires && command->type == cm_function_def)
++    return last_command_exit_value =
++      execute_intern_function (command->value.Function_def->name,
++                              command->value.Function_def->command);
++
+ #endif
+ 
+   QUIT;
+@@ -5061,7 +5068,7 @@ execute_intern_function (name, function)
+ 
+   if (check_identifier (name, posixly_correct) == 0)
+     {
+-      if (posixly_correct && interactive_shell == 0)
++      if (posixly_correct && interactive_shell == 0 && rpm_requires == 0)
+ 	{
+ 	  last_command_exit_value = EX_BADUSAGE;
+ 	  jump_to_top_level (ERREXIT);
+diff -up bash-4.1-rc1/execute_cmd.h.requires bash-4.1-rc1/execute_cmd.h
+--- bash-4.1-rc1/execute_cmd.h.requires	2009-01-16 22:20:15.000000000 +0100
++++ bash-4.1-rc1/execute_cmd.h	2009-12-26 22:55:02.000000000 +0100
+@@ -22,6 +22,8 @@
+ #define _EXECUTE_CMD_H_
+ 
+ #include "stdc.h"
++#include "variables.h"
++#include "command.h"
+ 
+ extern struct fd_bitmap *new_fd_bitmap __P((int));
+ extern void dispose_fd_bitmap __P((struct fd_bitmap *));
+diff -up bash-4.1-rc1/make_cmd.c.requires bash-4.1-rc1/make_cmd.c
+--- bash-4.1-rc1/make_cmd.c.requires	2009-09-11 23:26:12.000000000 +0200
++++ bash-4.1-rc1/make_cmd.c	2009-12-26 22:57:46.000000000 +0100
+@@ -42,11 +42,15 @@
  #include "flags.h"
  #include "make_cmd.h"
  #include "dispose_cmd.h"
@@ -85,9 +207,9 @@ diff -up bash-4.0/make_cmd.c.requires ba
  
  #if defined (JOB_CONTROL)
  #include "jobs.h"
-@@ -55,6 +59,10 @@
+@@ -56,6 +60,10 @@
  
- extern int line_number, current_command_line_count;
+ extern int line_number, current_command_line_count, parser_state;
  extern int last_command_exit_value;
 +extern int rpm_requires;
 +
@@ -96,7 +218,7 @@ diff -up bash-4.0/make_cmd.c.requires ba
  
  /* Object caching */
  sh_obj_cache_t wdcache = {0, 0, 0};
-@@ -810,6 +818,27 @@ make_coproc_command (name, command)
+@@ -820,6 +828,27 @@ make_coproc_command (name, command)
    return (make_command (cm_coproc, (SIMPLE_COM *)temp));
  }
  
@@ -124,7 +246,7 @@ diff -up bash-4.0/make_cmd.c.requires ba
  /* Reverse the word list and redirection list in the simple command
     has just been parsed.  It seems simpler to do this here the one
     time then by any other method that I can think of. */
-@@ -827,6 +856,27 @@ clean_simple_command (command)
+@@ -837,6 +866,27 @@ clean_simple_command (command)
  	REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
      }
  
@@ -149,162 +271,40 @@ diff -up bash-4.0/make_cmd.c.requires ba
 +      }
 +    } /*rpm_requires*/
 +
+   parser_state &= ~PST_REDIRLIST;
    return (command);
  }
+diff -up bash-4.1-rc1/shell.c.requires bash-4.1-rc1/shell.c
+--- bash-4.1-rc1/shell.c.requires	2009-12-26 22:55:02.000000000 +0100
++++ bash-4.1-rc1/shell.c	2009-12-26 22:55:02.000000000 +0100
+@@ -193,6 +193,9 @@ int have_devfd = 0;
+ /* The name of the .(shell)rc file. */
+ static char *bashrc_file = "~/.bashrc";
  
-diff -up bash-4.0/execute_cmd.c.requires bash-4.0/execute_cmd.c
---- bash-4.0/execute_cmd.c.requires	2009-01-21 15:28:16.000000000 +0100
-+++ bash-4.0/execute_cmd.c	2009-01-21 15:28:16.000000000 +0100
-@@ -497,6 +497,8 @@ async_redirect_stdin ()
- 
- #define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
- 
-+extern int rpm_requires;
-+
- /* Execute the command passed in COMMAND, perhaps doing it asynchrounously.
-    COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
-    ASYNCHROUNOUS, if non-zero, says to do this command in the background.
-@@ -528,8 +530,13 @@ execute_command_internal (command, async
- #else
-   if (breaking || continuing)
-     return (last_command_exit_value);
--  if (command == 0 || read_but_dont_execute)
-+  if (command == 0 || (read_but_dont_execute && !rpm_requires))
-     return (EXECUTION_SUCCESS);
-+  if (rpm_requires && command->type == cm_function_def)
-+    return last_command_exit_value =
-+      execute_intern_function (command->value.Function_def->name,
-+                              command->value.Function_def->command);
-+
- #endif
- 
-   QUIT;
-@@ -4859,7 +4866,7 @@ execute_intern_function (name, function)
- 
-   if (check_identifier (name, posixly_correct) == 0)
-     {
--      if (posixly_correct && interactive_shell == 0)
-+      if (posixly_correct && interactive_shell == 0 && rpm_requires == 0)
- 	{
- 	  last_command_exit_value = EX_BADUSAGE;
- 	  jump_to_top_level (ERREXIT);
-diff -up bash-4.0/execute_cmd.h.requires bash-4.0/execute_cmd.h
---- bash-4.0/execute_cmd.h.requires	2009-01-04 20:32:29.000000000 +0100
-+++ bash-4.0/execute_cmd.h	2009-01-21 15:28:16.000000000 +0100
-@@ -22,6 +22,8 @@
- #define _EXECUTE_CMD_H_
- 
- #include "stdc.h"
-+#include "variables.h"
-+#include "command.h"
- 
- extern struct fd_bitmap *new_fd_bitmap __P((int));
- extern void dispose_fd_bitmap __P((struct fd_bitmap *));
-diff -up bash-4.0/builtins.h.requires bash-4.0/builtins.h
---- bash-4.0/builtins.h.requires	2009-01-04 20:32:23.000000000 +0100
-+++ bash-4.0/builtins.h	2009-01-21 16:10:39.000000000 +0100
-@@ -41,6 +41,8 @@
- #define SPECIAL_BUILTIN 0x08	/* This is a Posix `special' builtin. */
- #define ASSIGNMENT_BUILTIN 0x10	/* This builtin takes assignment statements. */
- #define POSIX_BUILTIN	0x20	/* This builtins is special in the Posix command search order. */
-+#define REQUIRES_BUILTIN 0x40	/* This builtin requires other files. */
-+
- 
- #define BASE_INDENT	4
- 
-diff -up bash-4.0/eval.c.requires bash-4.0/eval.c
---- bash-4.0/eval.c.requires	2009-01-04 20:32:26.000000000 +0100
-+++ bash-4.0/eval.c	2009-01-21 15:28:16.000000000 +0100
-@@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi
- extern int need_here_doc;
- extern int current_command_number, current_command_line_count, line_number;
- extern int expand_aliases;
-+extern int rpm_requires;
- 
- static void send_pwd_to_eterm __P((void));
- static sighandler alrm_catcher __P((int));
-@@ -136,7 +137,7 @@ reader_loop ()
- 
-       if (read_command () == 0)
- 	{
--	  if (interactive_shell == 0 && read_but_dont_execute)
-+	  if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires))
- 	    {
- 	      last_command_exit_value = EXECUTION_SUCCESS;
- 	      dispose_command (global_command);
-diff -up bash-4.0/builtins/mkbuiltins.c.requires bash-4.0/builtins/mkbuiltins.c
---- bash-4.0/builtins/mkbuiltins.c.requires	2009-01-04 20:32:23.000000000 +0100
-+++ bash-4.0/builtins/mkbuiltins.c	2009-01-21 16:16:05.000000000 +0100
-@@ -69,9 +69,15 @@ extern char *strcpy ();
- #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
- 
- /* Flag values that builtins can have. */
-+/*  These flags are for the C code generator, 
-+    the C which is produced (./builtin.c)
-+    includes the flags definitions found 
-+    in ../builtins.h */
- #define BUILTIN_FLAG_SPECIAL	0x01
- #define BUILTIN_FLAG_ASSIGNMENT 0x02
- #define BUILTIN_FLAG_POSIX_BUILTIN 0x04
-+#define BUILTIN_FLAG_REQUIRES	0x08
++/* Non-zero if we are finding the scripts requirements. */
++int rpm_requires;
 +
+ /* Non-zero means to act more like the Bourne shell on startup. */
+ static int act_like_sh;
  
- #define BASE_INDENT	4
- 
-@@ -163,10 +169,18 @@ char *posix_builtins[] =
-   (char *)NULL
- };
- 
-+/* The builtin commands that cause requirements on other files. */
-+static char *requires_builtins[] =
-+{
-+  ".", "command", "exec", "source", "inlib",
-+  (char *)NULL
-+};
-+
- /* Forward declarations. */
- static int is_special_builtin ();
- static int is_assignment_builtin ();
- static int is_posix_builtin ();
-+static int is_requires_builtin ();
+@@ -251,6 +254,7 @@ static const struct {
+   { "posix", Int, &posixly_correct, (char **)0x0 },
+   { "protected", Int, &protected_mode, (char **)0x0 },
+   { "rcfile", Charp, (int *)0x0, &bashrc_file },
++  { "rpm-requires", Int, &rpm_requires, (char **)0x0 },
+ #if defined (RESTRICTED_SHELL)
+   { "restricted", Int, &restricted, (char **)0x0 },
+ #endif
+@@ -485,6 +489,12 @@ main (argc, argv, env)
+   if (dump_translatable_strings)
+     read_but_dont_execute = 1;
  
- #if !defined (HAVE_RENAME)
- static int rename ();
-@@ -812,6 +826,9 @@ builtin_handler (self, defs, arg)
-     new->flags |= BUILTIN_FLAG_ASSIGNMENT;
-   if (is_posix_builtin (name))
-     new->flags |= BUILTIN_FLAG_POSIX_BUILTIN;
-+  if (is_requires_builtin (name))
-+    new->flags |= BUILTIN_FLAG_REQUIRES;
++  if (rpm_requires)
++    {
++      read_but_dont_execute = 1;
++      initialize_shell_builtins ();
++    }
 +
+   if (running_setuid && privileged_mode == 0)
+     disable_priv_mode ();
  
-   array_add ((char *)new, defs->builtins);
-   building_builtin = 1;
-@@ -1229,11 +1246,12 @@ write_builtins (defs, structfile, extern
- 		  else
- 		    fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
- 
--		  fprintf (structfile, "%s%s%s%s, %s_doc,\n",
-+		  fprintf (structfile, "%s%s%s%s%s, %s_doc,\n",
- 		    "BUILTIN_ENABLED | STATIC_BUILTIN",
- 		    (builtin->flags & BUILTIN_FLAG_SPECIAL) ? " | SPECIAL_BUILTIN" : "",
- 		    (builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " | ASSIGNMENT_BUILTIN" : "",
- 		    (builtin->flags & BUILTIN_FLAG_POSIX_BUILTIN) ? " | POSIX_BUILTIN" : "",
-+		    (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
- 		    document_name (builtin));
- 
- 		  fprintf
-@@ -1581,6 +1599,13 @@ is_posix_builtin (name)
-   return (_find_in_table (name, posix_builtins));
- }
- 
-+static int
-+is_requires_builtin (name)
-+     char *name;
-+{
-+  return (_find_in_table (name, requires_builtins));
-+}
-+
- #if !defined (HAVE_RENAME)
- static int
- rename (from, to)


Index: bash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- bash.spec	11 Dec 2009 12:05:03 -0000	1.193
+++ bash.spec	27 Dec 2009 11:22:37 -0000	1.194
@@ -1,15 +1,16 @@
-#%define beta_tag rc1
-%define patchlevel .35
-%define baseversion 4.0
+%define beta_tag rc1
+%define patchleveltag .0
+%define baseversion 4.1
 
-Version: %{baseversion}%{patchlevel}
+Version: %{baseversion}%{?patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 2%{?dist}
+Release: 0.1.%{beta_tag}%{?dist}
 Group: System Environment/Shells
-License: GPLv2+
+License: GPLv3+
 Url: http://www.gnu.org/software/bash
-Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz
+#Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz
+Source0: ftp://ftp.cwru.edu/pub/bash/%{name}-%{baseversion}-%{beta_tag}.tar.gz
 
 # For now there isn't any doc
 #Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.gz
@@ -19,49 +20,12 @@ Source2: dot-bash_profile
 Source3: dot-bash_logout
 
 # Official upstream patches
-Patch001: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-001
-Patch002: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-002
-Patch003: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-003
-Patch004: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-004
-Patch005: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-005
-Patch006: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-006
-Patch007: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-007
-Patch008: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-008
-Patch009: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-009
-Patch010: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-010
-Patch011: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-011
-Patch012: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-012
-Patch013: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-013
-Patch014: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-014
-Patch015: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-015
-Patch016: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-016
-Patch017: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-017
-Patch018: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-018
-Patch019: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-019
-Patch020: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-020
-Patch021: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-021
-Patch022: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-022
-Patch023: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-023
-Patch024: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-024
-Patch025: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-025
-Patch026: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-026
-Patch027: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-027
-Patch028: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-028
-Patch029: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-029
-Patch030: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-030
-Patch031: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-031
-Patch032: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-032
-Patch033: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-033
-Patch034: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-034
-Patch035: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-035
-
 # Other patches
 Patch101: bash-2.02-security.patch
 Patch102: bash-2.03-paths.patch
 Patch103: bash-2.03-profile.patch
 Patch104: bash-2.05a-interpreter.patch
 Patch105: bash-2.05b-debuginfo.patch
-#Patch106: bash-2.05b-manso.patch
 Patch107: bash-2.05b-pgrp_sync.patch
 Patch108: bash-2.05b-readline-oom.patch
 Patch109: bash-2.05b-xcc.patch
@@ -78,9 +42,6 @@ Patch118: bash-tty-tests.patch
 # 484809, check if interp section is NOBITS
 Patch123: bash-4.0-nobits.patch
 
-# 530911, bash was segfaulting when TERM=eterm* and EMACS was unset
-Patch124: bash-4.0-emacs.patch
-
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -106,52 +67,15 @@ This package contains documentation file
 
 %prep
 #%setup -q -a 2
-%setup -q -n %{name}-%{baseversion}
+%setup -q -n %{name}-%{baseversion}-%{beta_tag}
 
 # Official upstream patches
-%patch001 -p0 -b .001
-%patch002 -p0 -b .002
-%patch003 -p0 -b .003
-%patch004 -p0 -b .004
-%patch005 -p0 -b .005
-%patch006 -p0 -b .006
-%patch007 -p0 -b .007
-%patch008 -p0 -b .008
-%patch009 -p0 -b .009
-%patch010 -p0 -b .010
-%patch011 -p0 -b .011
-%patch012 -p0 -b .012
-%patch013 -p0 -b .013
-%patch014 -p0 -b .014
-%patch015 -p0 -b .015
-%patch016 -p0 -b .016
-%patch017 -p0 -b .017
-%patch018 -p0 -b .018
-%patch019 -p0 -b .019
-%patch020 -p0 -b .020
-%patch021 -p0 -b .021
-%patch022 -p0 -b .022
-%patch023 -p0 -b .023
-%patch024 -p0 -b .024
-%patch025 -p0 -b .025
-%patch026 -p0 -b .026
-%patch027 -p0 -b .027
-%patch028 -p0 -b .028
-%patch029 -p0 -b .029
-%patch030 -p0 -b .030
-%patch031 -p0 -b .031
-%patch032 -p0 -b .032
-%patch033 -p0 -b .033
-#%patch034 -p0 -b .034
-#%patch035 -p0 -b .035
-
 # Other patches
 %patch101 -p1 -b .security
 %patch102 -p1 -b .paths
 %patch103 -p1 -b .profile
 %patch104 -p1 -b .interpreter
 %patch105 -p1 -b .debuginfo
-#%patch106 -p1 -b .manso
 %patch107 -p1 -b .pgrp_sync
 %patch108 -p1 -b .readline_oom
 %patch109 -p1 -b .xcc
@@ -164,7 +88,6 @@ This package contains documentation file
 %patch117 -p1 -b .setlocale
 %patch118 -p1 -b .tty_tests
 %patch123 -p1 -b .nobits
-%patch124 -p1 -b .emacs
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -332,6 +255,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Sun Dec 27 2009 Roman Rakus <rrakus at redhat.com> - 4.1-0.1.rc1
+- Upstream 4.1.rc1
+
 * Fri Dec 11 2009 Roman Rakus <rrakus at redhat.com> - 4.0.35-2
 - Don't segfault when TERM=eterm* and EMACS is unset (#530911)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	24 Feb 2009 13:28:29 -0000	1.16
+++ sources	27 Dec 2009 11:22:38 -0000	1.17
@@ -1 +1 @@
-a90a1b5a6db4838483f05438e05e8eb9  bash-4.0.tar.gz
+fc8de7b0c715fe043129c9e347a5658c  bash-4.1-rc1.tar.gz


--- bash-4.0-emacs.patch DELETED ---


--- bash40-001 DELETED ---


--- bash40-002 DELETED ---


--- bash40-003 DELETED ---


--- bash40-004 DELETED ---


--- bash40-005 DELETED ---


--- bash40-006 DELETED ---


--- bash40-007 DELETED ---


--- bash40-008 DELETED ---


--- bash40-009 DELETED ---


--- bash40-010 DELETED ---


--- bash40-011 DELETED ---


--- bash40-012 DELETED ---


--- bash40-013 DELETED ---


--- bash40-014 DELETED ---


--- bash40-015 DELETED ---


--- bash40-016 DELETED ---


--- bash40-017 DELETED ---


--- bash40-018 DELETED ---


--- bash40-019 DELETED ---


--- bash40-020 DELETED ---


--- bash40-021 DELETED ---


--- bash40-022 DELETED ---


--- bash40-023 DELETED ---


--- bash40-024 DELETED ---


--- bash40-025 DELETED ---


--- bash40-026 DELETED ---


--- bash40-027 DELETED ---


--- bash40-028 DELETED ---


--- bash40-029 DELETED ---


--- bash40-030 DELETED ---


--- bash40-031 DELETED ---


--- bash40-032 DELETED ---


--- bash40-033 DELETED ---


--- bash40-034 DELETED ---


--- bash40-035 DELETED ---



From kwizart at fedoraproject.org  Sun Dec 27 11:35:44 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 27 Dec 2009 11:35:44 +0000 (UTC)
Subject: File Test-Refcount-0.06.tar.gz uploaded to lookaside cache by kwizart
Message-ID: <20091227113544.A1AD610F80B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-Test-Refcount:

ea68fc8375bc36f49e2620356efde850  Test-Refcount-0.06.tar.gz



From ovasik at fedoraproject.org  Sun Dec 27 11:40:37 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Sun, 27 Dec 2009 11:40:37 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-selinux.patch, 1.64,
	1.65 coreutils.spec, 1.294, 1.295
Message-ID: <20091227114037.9EF3A11C00CF@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/pkgs/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21262

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
fix misc/selinux root-only test(#550494)

coreutils-selinux.patch:
 configure.ac       |    7 ++
 man/chcon.x        |    2 
 man/runcon.x       |    2 
 src/chcon.c        |    2 
 src/copy.c         |    2 
 src/copy.h         |    3 +
 src/cp.c           |   39 ++++++++++++-
 src/id.c           |    2 
 src/install.c      |   13 +++-
 src/ls.c           |  159 +++++++++++++++++++++++++++++++++++++++++++----------
 src/mkdir.c        |    1 
 src/mknod.c        |    2 
 src/mv.c           |    1 
 src/runcon.c       |    2 
 src/stat.c         |   81 ++++++++++++++++++---------
 tests/misc/selinux |    2 
 16 files changed, 255 insertions(+), 65 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- coreutils-selinux.patch	27 Nov 2009 13:24:09 -0000	1.64
+++ coreutils-selinux.patch	27 Dec 2009 11:40:37 -0000	1.65
@@ -802,7 +802,7 @@ diff -urNp coreutils-8.1-orig/tests/misc
  # inspect that context with both ls -Z and stat.
  for i in d f p; do
 -  c=`ls -dogZ $i|cut -d' ' -f3`; test x$c = x$ctx || fail=1
-+  c=`ls -dogZ $i|cut -d' ' -f5`; test x$c = x$ctx || fail=1
++  c=`ls -dogZ $i|cut -d' ' -f4`; test x$c = x$ctx || fail=1
    c=`stat --printf %C $i`; test x$c = x$ctx || fail=1
  done
  


Index: coreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- coreutils.spec	19 Dec 2009 08:42:03 -0000	1.294
+++ coreutils.spec	27 Dec 2009 11:40:37 -0000	1.295
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -331,6 +331,9 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Sun Dec 27 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-5
+- fix misc/selinux root-only test(#550494)
+
 * Sat Dec 19 2009 Ondrej Vasik <ovasik at redhat.com> - 8.2-4
 - bring back uname -p/-i functionality except of the
   athlon hack(#548834)



From kwizart at fedoraproject.org  Sun Dec 27 11:40:39 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 27 Dec 2009 11:40:39 +0000 (UTC)
Subject: rpms/perl-Test-Refcount/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 perl-Test-Refcount.spec, 1.2, 1.3
Message-ID: <20091227114039.E1F1511C00CF@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Test-Refcount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21238

Modified Files:
	.cvsignore sources perl-Test-Refcount.spec 
Log Message:

Update to 0.06



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Aug 2009 12:00:27 -0000	1.2
+++ .cvsignore	27 Dec 2009 11:40:39 -0000	1.3
@@ -1 +1 @@
-Test-Refcount-0.05.tar.gz
+Test-Refcount-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Aug 2009 12:00:27 -0000	1.2
+++ sources	27 Dec 2009 11:40:39 -0000	1.3
@@ -1 +1 @@
-657b089713b1283218590119faf12432  Test-Refcount-0.05.tar.gz
+ea68fc8375bc36f49e2620356efde850  Test-Refcount-0.06.tar.gz


Index: perl-Test-Refcount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/devel/perl-Test-Refcount.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Test-Refcount.spec	4 Dec 2009 02:13:36 -0000	1.2
+++ perl-Test-Refcount.spec	27 Dec 2009 11:40:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Test-Refcount
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Assert reference counts on objects
 
 Group:          Development/Libraries
@@ -46,8 +46,7 @@ find $RPM_BUILD_ROOT -type f -name .pack
 
 
 %check
-#Test fails rhbz#514942
-make test || :
+make test
 
 
 %clean
@@ -62,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 27 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.06-1
+- Update to 0.06
+- Remove workaround at make test for perl with debug - rhbz#514942
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 0.05-3
 - rebuild against perl 5.10.1
 



From rrakus at fedoraproject.org  Sun Dec 27 11:48:41 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Sun, 27 Dec 2009 11:48:41 +0000 (UTC)
Subject: rpms/bash/devel bash-bashbug.patch,1.3,1.4 bash.spec,1.194,1.195
Message-ID: <20091227114841.3355B11C00CF@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/pkgs/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22956

Modified Files:
	bash-bashbug.patch bash.spec 
Log Message:
Fixed patch for fuzz=0

bash-bashbug.patch:
 doc/bash.1       |    6 +-----
 doc/bashref.texi |    5 +----
 shell.c          |    1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

Index: bash-bashbug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash-bashbug.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bash-bashbug.patch	24 Feb 2009 13:28:29 -0000	1.3
+++ bash-bashbug.patch	27 Dec 2009 11:48:40 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up bash-4.0/doc/bash.1.bashbug bash-4.0/doc/bash.1
---- bash-4.0/doc/bash.1.bashbug	2009-02-18 15:13:56.000000000 -0500
-+++ bash-4.0/doc/bash.1	2009-02-23 10:56:00.000000000 -0500
-@@ -9344,7 +9344,7 @@ The latest version is always available f
+diff -up bash-4.1-rc1/doc/bash.1.bashbug bash-4.1-rc1/doc/bash.1
+--- bash-4.1-rc1/doc/bash.1.bashbug	2009-11-18 21:57:41.000000000 +0100
++++ bash-4.1-rc1/doc/bash.1	2009-12-27 12:42:31.000000000 +0100
+@@ -9519,7 +9519,7 @@ The latest version is always available f
  .PP
  Once you have determined that a bug actually exists, use the
  .I bashbug
@@ -10,7 +10,7 @@ diff -up bash-4.0/doc/bash.1.bashbug bas
  If you have a fix, you are encouraged to mail that as well!
  Suggestions and `philosophical' bug reports may be mailed
  to \fIbug-bash at gnu.org\fP or posted to the Usenet
-@@ -9366,10 +9366,6 @@ A description of the bug behaviour
+@@ -9541,10 +9541,6 @@ A description of the bug behaviour
  A short script or `recipe' which exercises the bug
  .PD
  .PP
@@ -21,11 +21,11 @@ diff -up bash-4.0/doc/bash.1.bashbug bas
  Comments and bug reports concerning
  this manual page should be directed to
  .IR chet at po.cwru.edu .
-diff -up bash-4.0/doc/bashref.texi.bashbug bash-4.0/doc/bashref.texi
---- bash-4.0/doc/bashref.texi.bashbug	2009-02-18 15:14:43.000000000 -0500
-+++ bash-4.0/doc/bashref.texi	2009-02-23 11:02:27.000000000 -0500
-@@ -7320,7 +7320,7 @@ The latest version of Bash is always ava
- @uref{ftp://ftp.gnu.org/pub/bash/}.
+diff -up bash-4.1-rc1/doc/bashref.texi.bashbug bash-4.1-rc1/doc/bashref.texi
+--- bash-4.1-rc1/doc/bashref.texi.bashbug	2009-10-29 03:23:32.000000000 +0100
++++ bash-4.1-rc1/doc/bashref.texi	2009-12-27 12:45:32.000000000 +0100
+@@ -7392,7 +7392,7 @@ The latest version of Bash is always ava
+ @uref{ftp://ftp.gnu.org/pub/gnu/bash/}.
  
  Once you have determined that a bug actually exists, use the
 - at code{bashbug} command to submit a bug report.
@@ -33,7 +33,7 @@ diff -up bash-4.0/doc/bashref.texi.bashb
  If you have a fix, you are encouraged to mail that as well!
  Suggestions and `philosophical' bug reports may be mailed
  to @email{bug-bash@@gnu.org} or posted to the Usenet
-@@ -7342,9 +7342,6 @@ to reproduce it.
+@@ -7414,9 +7414,6 @@ to reproduce it.
  @end itemize
  
  @noindent
@@ -43,10 +43,10 @@ diff -up bash-4.0/doc/bashref.texi.bashb
  Please send all reports concerning this manual to
  @email{chet.ramey@@case.edu}.
  
-diff -up bash-4.0/shell.c.bashbug bash-4.0/shell.c
---- bash-4.0/shell.c.bashbug	2009-01-04 14:32:41.000000000 -0500
-+++ bash-4.0/shell.c	2009-02-23 10:56:00.000000000 -0500
-@@ -1806,7 +1806,6 @@ show_shell_usage (fp, extra)
+diff -up bash-4.1-rc1/shell.c.bashbug bash-4.1-rc1/shell.c
+--- bash-4.1-rc1/shell.c.bashbug	2009-11-19 16:05:54.000000000 +0100
++++ bash-4.1-rc1/shell.c	2009-12-27 12:42:31.000000000 +0100
+@@ -1821,7 +1821,6 @@ show_shell_usage (fp, extra)
      {
        fprintf (fp, _("Type `%s -c \"help set\"' for more information about shell options.\n"), shell_name);
        fprintf (fp, _("Type `%s -c help' for more information about shell builtin commands.\n"), shell_name);


Index: bash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- bash.spec	27 Dec 2009 11:22:37 -0000	1.194
+++ bash.spec	27 Dec 2009 11:48:40 -0000	1.195
@@ -5,7 +5,7 @@
 Version: %{baseversion}%{?patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 0.1.%{beta_tag}%{?dist}
+Release: 0.2.%{beta_tag}%{?dist}
 Group: System Environment/Shells
 License: GPLv3+
 Url: http://www.gnu.org/software/bash
@@ -255,6 +255,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Sun Dec 27 2009 Roman Rakus <rrakus at redhat.com> - 4.1-0.2.rc1
+- Fixed patch for fuzz=0
+
 * Sun Dec 27 2009 Roman Rakus <rrakus at redhat.com> - 4.1-0.1.rc1
 - Upstream 4.1.rc1
 



From musuruan at fedoraproject.org  Sun Dec 27 11:52:20 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 27 Dec 2009 11:52:20 +0000 (UTC)
Subject: rpms/fbzx/devel .cvsignore,1.3,1.4 fbzx.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091227115220.4F7DB11C00CF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23687

Modified Files:
	.cvsignore fbzx.spec sources 
Log Message:
* Sun Dec 27 2009 Andrea Musuruane <musuruan at gmail.com> 2.3.0-1
- Updated to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Dec 2009 09:17:33 -0000	1.3
+++ .cvsignore	27 Dec 2009 11:52:20 -0000	1.4
@@ -1 +1 @@
-fbzx-2.2.0-noroms.tar.bz2
+fbzx-2.3.0-noroms.tar.bz2


Index: fbzx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/devel/fbzx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fbzx.spec	26 Dec 2009 09:17:33 -0000	1.2
+++ fbzx.spec	27 Dec 2009 11:52:20 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           fbzx
-Version:        2.2.0
+Version:        2.3.0
 Release:        1%{?dist}
 Summary:        A ZX Spectrum emulator for FrameBuffer
 
@@ -13,13 +13,14 @@ Source0:        %{name}-%{version}-norom
 # Therefore we use this script to remove them before shipping it. 
 # Download the upstream tarball and invoke this script while in 
 # the tarball's directory:
-# ./fbxz-generate-tarball.sh 2.2.0
+# ./fbxz-generate-tarball.sh 2.3.0
 Source1:        %{name}-generate-tarball.sh
 Source2:        README_%{name}.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
 
@@ -32,7 +33,7 @@ the FrameBuffer or under X-Windows. 
 %setup -q
 
 # Patch to use rpm optflags 
-sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile
+sed -i -e "s/^\(CC\ =\ gcc\) [^\`]*/\1 \$(CFLAGS) /" Makefile
 
 # Fix source file permissions
 chmod 644 z80free/Z80free.c
@@ -103,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Dec 27 2009 Andrea Musuruane <musuruan at gmail.com> 2.3.0-1
+- Updated to new upstream release
+
 * Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
 - Updated to new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Dec 2009 09:17:33 -0000	1.3
+++ sources	27 Dec 2009 11:52:20 -0000	1.4
@@ -1 +1 @@
-72cdded84fde15759d07a69699f3869b  fbzx-2.2.0-noroms.tar.bz2
+67dd6d210c415a147ae4c4f44818359a  fbzx-2.3.0-noroms.tar.bz2



From jussilehtola at fedoraproject.org  Sun Dec 27 11:55:13 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 11:55:13 +0000 (UTC)
Subject: File pcc-091227.tgz uploaded to lookaside cache by jussilehtola
Message-ID: <20091227115513.CB82B10F8C3@bastion.fedoraproject.org>

A file has been added to the lookaside cache for pcc:

4ee1bf4a118c04a743a9fff2e4b939bf  pcc-091227.tgz



From jussilehtola at fedoraproject.org  Sun Dec 27 11:55:17 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 11:55:17 +0000 (UTC)
Subject: File pcc-libs-091227.tgz uploaded to lookaside cache by jussilehtola
Message-ID: <20091227115517.20E6910F8B2@bastion.fedoraproject.org>

A file has been added to the lookaside cache for pcc:

7268e20a5d1ff9787424b8ba2a2dea7f  pcc-libs-091227.tgz



From musuruan at fedoraproject.org  Sun Dec 27 11:55:26 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 27 Dec 2009 11:55:26 +0000 (UTC)
Subject: rpms/fbzx/F-12 .cvsignore,1.3,1.4 fbzx.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091227115526.349A811C00CF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24267

Modified Files:
	.cvsignore fbzx.spec sources 
Log Message:
* Sun Dec 27 2009 Andrea Musuruane <musuruan at gmail.com> 2.3.0-1
- Updated to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Dec 2009 09:24:46 -0000	1.3
+++ .cvsignore	27 Dec 2009 11:55:25 -0000	1.4
@@ -1 +1 @@
-fbzx-2.2.0-noroms.tar.bz2
+fbzx-2.3.0-noroms.tar.bz2


Index: fbzx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-12/fbzx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fbzx.spec	26 Dec 2009 09:24:46 -0000	1.2
+++ fbzx.spec	27 Dec 2009 11:55:26 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           fbzx
-Version:        2.2.0
+Version:        2.3.0
 Release:        1%{?dist}
 Summary:        A ZX Spectrum emulator for FrameBuffer
 
@@ -13,13 +13,14 @@ Source0:        %{name}-%{version}-norom
 # Therefore we use this script to remove them before shipping it. 
 # Download the upstream tarball and invoke this script while in 
 # the tarball's directory:
-# ./fbxz-generate-tarball.sh 2.2.0
+# ./fbxz-generate-tarball.sh 2.3.0
 Source1:        %{name}-generate-tarball.sh
 Source2:        README_%{name}.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
 
@@ -32,7 +33,7 @@ the FrameBuffer or under X-Windows. 
 %setup -q
 
 # Patch to use rpm optflags 
-sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile
+sed -i -e "s/^\(CC\ =\ gcc\) [^\`]*/\1 \$(CFLAGS) /" Makefile
 
 # Fix source file permissions
 chmod 644 z80free/Z80free.c
@@ -103,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Dec 27 2009 Andrea Musuruane <musuruan at gmail.com> 2.3.0-1
+- Updated to new upstream release
+
 * Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
 - Updated to new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Dec 2009 09:24:46 -0000	1.3
+++ sources	27 Dec 2009 11:55:26 -0000	1.4
@@ -1 +1 @@
-72cdded84fde15759d07a69699f3869b  fbzx-2.2.0-noroms.tar.bz2
+67dd6d210c415a147ae4c4f44818359a  fbzx-2.3.0-noroms.tar.bz2



From musuruan at fedoraproject.org  Sun Dec 27 11:55:52 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 27 Dec 2009 11:55:52 +0000 (UTC)
Subject: rpms/fbzx/F-11 .cvsignore,1.3,1.4 fbzx.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091227115552.4274711C00CF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24379

Modified Files:
	.cvsignore fbzx.spec sources 
Log Message:
* Sun Dec 27 2009 Andrea Musuruane <musuruan at gmail.com> 2.3.0-1
- Updated to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Dec 2009 09:25:39 -0000	1.3
+++ .cvsignore	27 Dec 2009 11:55:51 -0000	1.4
@@ -1 +1 @@
-fbzx-2.2.0-noroms.tar.bz2
+fbzx-2.3.0-noroms.tar.bz2


Index: fbzx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-11/fbzx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fbzx.spec	26 Dec 2009 09:25:39 -0000	1.2
+++ fbzx.spec	27 Dec 2009 11:55:52 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           fbzx
-Version:        2.2.0
+Version:        2.3.0
 Release:        1%{?dist}
 Summary:        A ZX Spectrum emulator for FrameBuffer
 
@@ -13,13 +13,14 @@ Source0:        %{name}-%{version}-norom
 # Therefore we use this script to remove them before shipping it. 
 # Download the upstream tarball and invoke this script while in 
 # the tarball's directory:
-# ./fbxz-generate-tarball.sh 2.2.0
+# ./fbxz-generate-tarball.sh 2.3.0
 Source1:        %{name}-generate-tarball.sh
 Source2:        README_%{name}.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
 
@@ -32,7 +33,7 @@ the FrameBuffer or under X-Windows. 
 %setup -q
 
 # Patch to use rpm optflags 
-sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile
+sed -i -e "s/^\(CC\ =\ gcc\) [^\`]*/\1 \$(CFLAGS) /" Makefile
 
 # Fix source file permissions
 chmod 644 z80free/Z80free.c
@@ -103,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Dec 27 2009 Andrea Musuruane <musuruan at gmail.com> 2.3.0-1
+- Updated to new upstream release
+
 * Sat Dec 26 2009 Andrea Musuruane <musuruan at gmail.com> 2.2.0-1
 - Updated to new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Dec 2009 09:25:39 -0000	1.3
+++ sources	27 Dec 2009 11:55:52 -0000	1.4
@@ -1 +1 @@
-72cdded84fde15759d07a69699f3869b  fbzx-2.2.0-noroms.tar.bz2
+67dd6d210c415a147ae4c4f44818359a  fbzx-2.3.0-noroms.tar.bz2



From kwizart at fedoraproject.org  Sun Dec 27 12:08:51 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 27 Dec 2009 12:08:51 +0000 (UTC)
Subject: File libproxy-0.3.1.tar.bz2 uploaded to lookaside cache by kwizart
Message-ID: <20091227120851.4DF3710F88B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libproxy:

1745fe1bdf5beca1bf7269758f3906e8  libproxy-0.3.1.tar.bz2



From kwizart at fedoraproject.org  Sun Dec 27 12:10:05 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 27 Dec 2009 12:10:05 +0000 (UTC)
Subject: rpms/libproxy/devel libproxy.spec, 1.7, 1.8 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091227121005.6B6FC11C00CF@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26923

Modified Files:
	libproxy.spec .cvsignore sources 
Log Message:
Update to 0.3.1



Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libproxy.spec	19 Oct 2009 21:22:00 -0000	1.7
+++ libproxy.spec	27 Dec 2009 12:10:05 -0000	1.8
@@ -3,7 +3,7 @@
 %define gecko_version 1.9.1
 
 Name:           libproxy
-Version:        0.3.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
@@ -14,8 +14,6 @@ Source0:        http://libproxy.googleco
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
-Requires: libproxy-python = %{version}-%{release}
-Requires: libproxy-bin = %{version}-%{release}
 
 # gnome
 BuildRequires:  GConf2-devel
@@ -86,6 +84,14 @@ Provides:       %{name}-pac = %{version}
 %description    mozjs
 The %{name}-mozjs package contains the %{name} plugin for mozjs.
 
+%package        networkmanager
+Summary:        Plugin for %{name} and networkmanager
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}
+
+%description    networkmanager
+The %{name}-networkmanager package contains the %{name} plugin for networkmanager.
+
 %package        webkit
 Summary:        Plugin for %{name} and webkit
 Group:          System Environment/Libraries
@@ -145,7 +151,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/%{version}/modules/config_wpad.so
 %{_libdir}/%{name}/%{version}/modules/ignore_ip.so
 %{_libdir}/%{name}/%{version}/modules/ignore_domain.so
-%{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
 %{_libdir}/%{name}/%{version}/modules/wpad_dnsdevolution.so
 %{_libdir}/%{name}/%{version}/modules/wpad_dns.so
 
@@ -169,6 +174,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
 
+%file networkmanager
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
+
 %files webkit
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
@@ -181,6 +190,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 27 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.3.1-1
+- Update to 0.3.1
+- Avoid dependecies on -python and -bin subpackages
+- Create -networkmanager sub-package.
+
 * Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 0.3.0-1
 - Update to 0.3.0
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Oct 2009 21:20:20 -0000	1.3
+++ .cvsignore	27 Dec 2009 12:10:05 -0000	1.4
@@ -1 +1 @@
-libproxy-0.3.0.tar.gz
+libproxy-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Oct 2009 21:20:20 -0000	1.3
+++ sources	27 Dec 2009 12:10:05 -0000	1.4
@@ -1 +1 @@
-6ded75a6c6aef53be657ece207cc26c4  libproxy-0.3.0.tar.gz
+1745fe1bdf5beca1bf7269758f3906e8  libproxy-0.3.1.tar.bz2



From dsd at fedoraproject.org  Sun Dec 27 12:14:06 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Sun, 27 Dec 2009 12:14:06 +0000 (UTC)
Subject: File olpc-utils-1.0.15.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091227121406.CF6D010F892@bastion.fedoraproject.org>

A file has been added to the lookaside cache for olpc-utils:

beabe4b0de36fda95399aa7bd4363182  olpc-utils-1.0.15.tar.bz2



From dsd at fedoraproject.org  Sun Dec 27 12:16:00 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Sun, 27 Dec 2009 12:16:00 +0000 (UTC)
Subject: rpms/olpc-utils/devel .cvsignore, 1.14, 1.15 olpc-utils.spec, 1.24,
	1.25 sources, 1.16, 1.17
Message-ID: <20091227121600.9A57411C00CF@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28272

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	11 Dec 2009 15:49:00 -0000	1.14
+++ .cvsignore	27 Dec 2009 12:16:00 -0000	1.15
@@ -1 +1 @@
-olpc-utils-1.0.14.tar.bz2
+olpc-utils-1.0.15.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- olpc-utils.spec	11 Dec 2009 15:49:00 -0000	1.24
+++ olpc-utils.spec	27 Dec 2009 12:16:00 -0000	1.25
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.14
+Version:    1.0.15
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Sun Dec 27 2009 Daniel Drake <dsd at laptop.org> - 1.0.15-1
+- Bump to v1.0.15 to enable python optimizations
+
 * Fri Dec 11 2009 Daniel Drake <dsd at laptop.org> - 1.0.14-1
 - Bump to v1.0.14 for DDC config
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	11 Dec 2009 15:49:00 -0000	1.16
+++ sources	27 Dec 2009 12:16:00 -0000	1.17
@@ -1 +1 @@
-a50d7330e2cd9a5bffa42bca18007860  olpc-utils-1.0.14.tar.bz2
+beabe4b0de36fda95399aa7bd4363182  olpc-utils-1.0.15.tar.bz2



From kwizart at fedoraproject.org  Sun Dec 27 12:18:56 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 27 Dec 2009 12:18:56 +0000 (UTC)
Subject: rpms/libproxy/devel libproxy.spec,1.8,1.9
Message-ID: <20091227121856.AD9A211C00CF@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28819

Modified Files:
	libproxy.spec 
Log Message:
Fix typo



Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libproxy.spec	27 Dec 2009 12:10:05 -0000	1.8
+++ libproxy.spec	27 Dec 2009 12:18:56 -0000	1.9
@@ -174,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
 
-%file networkmanager
+%files networkmanager
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
 



From dsd at fedoraproject.org  Sun Dec 27 12:20:00 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Sun, 27 Dec 2009 12:20:00 +0000 (UTC)
Subject: rpms/olpc-utils/F-11 .cvsignore, 1.12, 1.13 olpc-utils.spec, 1.21,
	1.22 sources, 1.15, 1.16
Message-ID: <20091227122000.F2E6811C00CF@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29081

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
v1.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Dec 2009 15:50:07 -0000	1.12
+++ .cvsignore	27 Dec 2009 12:20:00 -0000	1.13
@@ -1 +1 @@
-olpc-utils-1.0.14.tar.bz2
+olpc-utils-1.0.15.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- olpc-utils.spec	11 Dec 2009 15:50:07 -0000	1.21
+++ olpc-utils.spec	27 Dec 2009 12:20:00 -0000	1.22
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.14
+Version:    1.0.15
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Sun Dec 27 2009 Daniel Drake <dsd at laptop.org> - 1.0.15-1
+- Bump to v1.0.15 to enable python optimizations
+
 * Fri Dec 11 2009 Daniel Drake <dsd at laptop.org> - 1.0.14-1
 - Bump to v1.0.14 for DDC config
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	11 Dec 2009 15:50:07 -0000	1.15
+++ sources	27 Dec 2009 12:20:00 -0000	1.16
@@ -1 +1 @@
-a50d7330e2cd9a5bffa42bca18007860  olpc-utils-1.0.14.tar.bz2
+beabe4b0de36fda95399aa7bd4363182  olpc-utils-1.0.15.tar.bz2



From deji at fedoraproject.org  Sun Dec 27 12:46:11 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 27 Dec 2009 12:46:11 +0000 (UTC)
Subject: rpms/scotch/F-11 scotch.spec,1.1,1.2
Message-ID: <20091227124611.EEF8F11C00CF@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/scotch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv528

Modified Files:
	scotch.spec 
Log Message:
* Sun Dec 27 2009 Deji Akingunola <dakingun at gmail.com> - 5.1.7-3
- Rebuild for mpich2 soname bump.



Index: scotch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scotch/F-11/scotch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scotch.spec	6 Nov 2009 23:21:48 -0000	1.1
+++ scotch.spec	27 Dec 2009 12:46:11 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Graph, mesh and hypergraph partitioning library
 Name:		scotch
 Version:	5.1.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	CeCILL-C
 Group:		Development/Libraries
 URL:		http://www.labri.fr/perso/pelegrin/scotch/
@@ -119,6 +119,9 @@ rm -rf %{buildroot}
 %{_libdir}/lib*scotch*.a
 
 %changelog
+* Sun Dec 27 2009 Deji Akingunola <dakingun at gmail.com> - 5.1.7-3
+- Rebuild for mpich2 soname bump.
+
 * Wed Nov 04 2009 Deji Akingunola <dakingun at gmail.com> - 5.1.7-2
 - Fix the Source url
 



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:04 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142101.D299C10F892@bastion.fedoraproject.org>

lkundrak has set the commit acl on teeworlds (Fedora devel) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:07 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142106.CBD6910F892@bastion.fedoraproject.org>

lkundrak has set the approveacls acl on teeworlds (Fedora 9) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:22 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142107.C967910F8CB@bastion.fedoraproject.org>

lkundrak has set the approveacls acl on teeworlds (Fedora devel) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:10 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142108.53EB010F8BA@bastion.fedoraproject.org>

lkundrak has set the commit acl on teeworlds (Fedora 9) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:07 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142110.DD04D10F8B2@bastion.fedoraproject.org>

lkundrak has set the commit acl on teeworlds (Fedora 10) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:29 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142115.495A510F892@bastion.fedoraproject.org>

lkundrak has set the approveacls acl on teeworlds (Fedora 10) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:16 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142116.1C97C10F8C3@bastion.fedoraproject.org>

lkundrak has set the approveacls acl on teeworlds (Fedora 11) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:18 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142117.1016810F8C4@bastion.fedoraproject.org>

lkundrak has set the commit acl on teeworlds (Fedora 11) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:21 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142119.543E310F8B4@bastion.fedoraproject.org>

lkundrak has set the commit acl on teeworlds (Fedora 12) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:38 +0000
Subject: [pkgdb] teeworlds had acl change status
Message-ID: <20091227142124.5F48F10F892@bastion.fedoraproject.org>

lkundrak has set the approveacls acl on teeworlds (Fedora 12) to Approved for linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:27 +0000
Subject: [pkgdb] teeworlds ownership updated
Message-ID: <20091227142126.AE7CC10F892@bastion.fedoraproject.org>

Package teeworlds in Fedora 9 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 14:21:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 14:21:39 +0000
Subject: [pkgdb] teeworlds ownership updated
Message-ID: <20091227142137.7E68910F8B2@bastion.fedoraproject.org>

Package teeworlds in Fedora 9 is now owned by lkundrak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From rdieter at fedoraproject.org  Sun Dec 27 14:38:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 27 Dec 2009 14:38:09 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.259,1.260
Message-ID: <20091227143809.300AA11C00CF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17239

Modified Files:
	kdepim.spec 
Log Message:
var tracking patch for affected releases only



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- kdepim.spec	22 Dec 2009 09:21:29 -0000	1.259
+++ kdepim.spec	27 Dec 2009 14:38:08 -0000	1.260
@@ -101,7 +101,9 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q -n kdepim-%{version}%{?alphatag}
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
 %patch2 -p1 -b .kmail_globalsettings_no_var_tracking
+%endif
 %patch3 -p1 -b .desktop-fixes
 
 



From jussilehtola at fedoraproject.org  Sun Dec 27 15:23:08 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:23:08 +0000 (UTC)
Subject: rpms/agedu/F-11 agedu.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091227152308.4287F11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24453/F-11

Modified Files:
	agedu.spec sources 
Log Message:
Update to r8768.


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/F-11/agedu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- agedu.spec	22 Sep 2009 14:29:29 -0000	1.2
+++ agedu.spec	27 Dec 2009 15:23:07 -0000	1.3
@@ -1,4 +1,4 @@
-%global rel r8642
+%global rel r8768
 
 Name:		agedu
 Version:	0
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8768
+- Update to upstream r8768.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
 - Update to upstream r8642.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 14:29:29 -0000	1.3
+++ sources	27 Dec 2009 15:23:08 -0000	1.4
@@ -1 +1 @@
-42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz
+2e2f811875a4a9c46bf65b7625700002  agedu-r8768.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:23:08 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:23:08 +0000 (UTC)
Subject: rpms/agedu/F-12 agedu.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20091227152308.6D19511C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24453/F-12

Modified Files:
	agedu.spec sources 
Log Message:
Update to r8768.


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/F-12/agedu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- agedu.spec	22 Sep 2009 14:09:57 -0000	1.3
+++ agedu.spec	27 Dec 2009 15:23:08 -0000	1.4
@@ -1,4 +1,4 @@
-%global rel r8642
+%global rel r8768
 
 Name:		agedu
 Version:	0
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8768
+- Update to upstream r8768.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
 - Update to upstream r8642.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 14:09:57 -0000	1.3
+++ sources	27 Dec 2009 15:23:08 -0000	1.4
@@ -1 +1 @@
-42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz
+2e2f811875a4a9c46bf65b7625700002  agedu-r8768.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:23:34 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:23:34 +0000 (UTC)
Subject: rpms/cppcheck/EL-5 cppcheck.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20091227152334.1BBDC11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24538/EL-5

Modified Files:
	cppcheck.spec sources 
Log Message:
Update to 1.39.


Index: cppcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/EL-5/cppcheck.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cppcheck.spec	7 Nov 2009 10:28:01 -0000	1.4
+++ cppcheck.spec	27 Dec 2009 15:23:33 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		cppcheck
-Version:	1.38
+Version:	1.39
 Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.39-1
+- Update to 1.39.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.38-1
 - Update to 1.38.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Nov 2009 10:28:01 -0000	1.5
+++ sources	27 Dec 2009 15:23:34 -0000	1.6
@@ -1 +1 @@
-3de71fd04e0c05fd2cfc310fd8541218  cppcheck-1.38.tar.bz2
+6174bb32926035bc4ccf57979c5cb13a  cppcheck-1.39.tar.bz2



From jussilehtola at fedoraproject.org  Sun Dec 27 15:23:34 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:23:34 +0000 (UTC)
Subject: rpms/cppcheck/F-11 cppcheck.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20091227152334.4075B11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24538/F-11

Modified Files:
	cppcheck.spec sources 
Log Message:
Update to 1.39.


Index: cppcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-11/cppcheck.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cppcheck.spec	7 Nov 2009 10:28:02 -0000	1.4
+++ cppcheck.spec	27 Dec 2009 15:23:34 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		cppcheck
-Version:	1.38
+Version:	1.39
 Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.39-1
+- Update to 1.39.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.38-1
 - Update to 1.38.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Nov 2009 10:28:02 -0000	1.5
+++ sources	27 Dec 2009 15:23:34 -0000	1.6
@@ -1 +1 @@
-3de71fd04e0c05fd2cfc310fd8541218  cppcheck-1.38.tar.bz2
+6174bb32926035bc4ccf57979c5cb13a  cppcheck-1.39.tar.bz2



From jussilehtola at fedoraproject.org  Sun Dec 27 15:23:34 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:23:34 +0000 (UTC)
Subject: rpms/cppcheck/F-12 cppcheck.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20091227152334.64A1411C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/cppcheck/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24538/F-12

Modified Files:
	cppcheck.spec sources 
Log Message:
Update to 1.39.


Index: cppcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-12/cppcheck.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cppcheck.spec	7 Nov 2009 10:28:02 -0000	1.5
+++ cppcheck.spec	27 Dec 2009 15:23:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		cppcheck
-Version:	1.38
+Version:	1.39
 Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.39-1
+- Update to 1.39.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.38-1
 - Update to 1.38.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cppcheck/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Nov 2009 10:28:02 -0000	1.5
+++ sources	27 Dec 2009 15:23:34 -0000	1.6
@@ -1 +1 @@
-3de71fd04e0c05fd2cfc310fd8541218  cppcheck-1.38.tar.bz2
+6174bb32926035bc4ccf57979c5cb13a  cppcheck-1.39.tar.bz2



From jussilehtola at fedoraproject.org  Sun Dec 27 15:24:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:24:59 +0000 (UTC)
Subject: rpms/gausssum/F-11 gausssum.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091227152459.72D9011C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gausssum/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24993/F-11

Modified Files:
	gausssum.spec sources 
Log Message:
Update to 2.2.0.


Index: gausssum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/F-11/gausssum.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gausssum.spec	30 Jul 2009 22:42:34 -0000	1.2
+++ gausssum.spec	27 Dec 2009 15:24:59 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gausssum
-Version:	2.1.6
-Release:	5%{?dist}
+Version:	2.2.0
+Release:	2%{?dist}
 Summary:	A GUI application for analysis of output of quantum computations
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -33,7 +33,7 @@ optimisation, UV-Vis/IR/Raman spectra, M
 
 %prep
 %setup -q -n GaussSum-%{version}
-%patch0 -p1
+%patch0 -p1 -b .cclib
 # Change location of documentation
 sed 's|os.path.join(installlocation,"Docs","index.html")|"%{_docdir}/%{name}-%{version}/Docs/index.html"|g' \
  gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \
@@ -95,6 +95,12 @@ rm -rf %{buildroot} 
 %endif
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-2
+- Bump release.
+
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0.
+
 * Fri Jul 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.6-5
 - Fix a rather nasty packaging bug, BZ #514820 arising from missing
   BR: python-devel causing library to be placed in / instead of Python library.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 May 2009 06:26:27 -0000	1.2
+++ sources	27 Dec 2009 15:24:59 -0000	1.3
@@ -1 +1 @@
-80d0c796f1fc8d2959bb28a8e9f09d58  GaussSum-2.1.6.tar.gz
+425ec0f8f746516ac4739404a3dd5083  GaussSum-2.2.0.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:24:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:24:59 +0000 (UTC)
Subject: rpms/gausssum/F-12 gausssum.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091227152459.9998911C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gausssum/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24993/F-12

Modified Files:
	gausssum.spec sources 
Log Message:
Update to 2.2.0.


Index: gausssum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/F-12/gausssum.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gausssum.spec	30 Jul 2009 22:42:34 -0000	1.3
+++ gausssum.spec	27 Dec 2009 15:24:59 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gausssum
-Version:	2.1.6
-Release:	5%{?dist}
+Version:	2.2.0
+Release:	2%{?dist}
 Summary:	A GUI application for analysis of output of quantum computations
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -33,7 +33,7 @@ optimisation, UV-Vis/IR/Raman spectra, M
 
 %prep
 %setup -q -n GaussSum-%{version}
-%patch0 -p1
+%patch0 -p1 -b .cclib
 # Change location of documentation
 sed 's|os.path.join(installlocation,"Docs","index.html")|"%{_docdir}/%{name}-%{version}/Docs/index.html"|g' \
  gausssum/gausssumgui.py > gausssum/gausssumgui.py.new && \
@@ -95,6 +95,12 @@ rm -rf %{buildroot} 
 %endif
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-2
+- Bump release.
+
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0.
+
 * Fri Jul 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.6-5
 - Fix a rather nasty packaging bug, BZ #514820 arising from missing
   BR: python-devel causing library to be placed in / instead of Python library.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 May 2009 06:24:04 -0000	1.2
+++ sources	27 Dec 2009 15:24:59 -0000	1.3
@@ -1 +1 @@
-80d0c796f1fc8d2959bb28a8e9f09d58  GaussSum-2.1.6.tar.gz
+425ec0f8f746516ac4739404a3dd5083  GaussSum-2.2.0.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:25:32 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:25:32 +0000 (UTC)
Subject: rpms/healpix/F-12 healpix.spec,1.8,1.9 sources,1.3,1.4
Message-ID: <20091227152532.CDCE011C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25100/F-12

Modified Files:
	healpix.spec sources 
Log Message:
Update to 2.13a.


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-12/healpix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- healpix.spec	22 Sep 2009 14:30:05 -0000	1.8
+++ healpix.spec	27 Dec 2009 15:25:32 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           healpix
-Version:        2.12a
+Version:        2.13a
 Release:        1%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
-Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_2.12a/Healpix_2.12a_2009Aug06a.tar.gz
+Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_%{version}/Healpix_%{version}_2009Nov27.tar.gz
 Source1:        healpix-f90test.sh
 Patch0:         healpix-2.12a-shlib.patch
 Patch1:         healpix-2.11c-gcc44.patch
@@ -86,7 +86,7 @@ This package contains the library for to
 %package -n c%{name}-devel
 Summary:        HEALPix C Bindings Library development files
 Group:          Development/Libraries
-Requires:       c%{name} = %{version}
+Requires:       c%{name} = %{version}-%{release}
 
 %description -n c%{name}-devel
 HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
@@ -315,6 +315,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.13a-1
+- Update to upstream 2.13a.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.12a-1
 - Update to upstream 2.12a.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 14:03:10 -0000	1.3
+++ sources	27 Dec 2009 15:25:32 -0000	1.4
@@ -1 +1 @@
-c014a059a9b533c749a8fc3b7d2a8ba1  Healpix_2.12a_2009Aug06a.tar.gz
+391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:25:32 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:25:32 +0000 (UTC)
Subject: rpms/healpix/F-11 healpix.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091227152532.9380711C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25100/F-11

Modified Files:
	healpix.spec sources 
Log Message:
Update to 2.13a.


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-11/healpix.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- healpix.spec	7 Apr 2009 08:44:37 -0000	1.2
+++ healpix.spec	27 Dec 2009 15:25:32 -0000	1.3
@@ -1,14 +1,14 @@
 Name:           healpix
-Version:        2.11c
-Release:        5%{?dist}
+Version:        2.13a
+Release:        1%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
-Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
+Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_%{version}/Healpix_%{version}_2009Nov27.tar.gz
 Source1:        healpix-f90test.sh
-Patch0:         healpix-2.11c-shlib.patch
+Patch0:         healpix-2.12a-shlib.patch
 Patch1:         healpix-2.11c-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +33,7 @@ hp_, e.g. anafast is now hp_anafast.
 Summary:        Healpix Fortran headers
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	gcc-gfortran
 
 %description devel
 This package contains the Fortran module files needed to compile against
@@ -85,7 +86,7 @@ This package contains the library for to
 %package -n c%{name}-devel
 Summary:        HEALPix C Bindings Library development files
 Group:          Development/Libraries
-Requires:       c%{name} = %{version}
+Requires:       c%{name} = %{version}-%{release}
 
 %description -n c%{name}-devel
 HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
@@ -106,7 +107,7 @@ rm test/README
 install -p -m 755 %{SOURCE1} runtest.sh
 
 # Remove patch backup from doc
-rm src/cxx/test/*.shlib
+rm -f src/cxx/test/*.shlib
 
 %build
 # Generic stuff
@@ -223,7 +224,9 @@ install -pm 0644 cxxinc/* $RPM_BUILD_ROO
 # Fortran stuff
 install -p f90bin/* $RPM_BUILD_ROOT%{_bindir}
 install -p f90lib/* $RPM_BUILD_ROOT%{_libdir}
-install -pm 0644 f90inc/* $RPM_BUILD_ROOT%{_includedir}/healpix
+# Modules contain API/ABI and thus architecture dependent
+mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/healpix
+install -pm 0644 f90inc/* $RPM_BUILD_ROOT%{_fmoddir}/healpix
 
 
 %clean
@@ -244,6 +247,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc COPYING READ_Copyrights_Licenses.txt test
 %{_bindir}/hp_alteralm
 %{_bindir}/hp_anafast
 %{_bindir}/hp_hotspot
@@ -256,18 +260,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hp_synfast
 %{_bindir}/hp_ud_grade
 %{_libdir}/libhealpix.so
-%{_libdir}/libhealpix_gif.so
-%doc COPYING READ_Copyrights_Licenses.txt test
+%{_libdir}/libhpxgif.so
 
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/healpix
-%{_includedir}/healpix/*.mod
+%{_fmoddir}/healpix/
 
 
 %files c++
 %defattr(-,root,root,-)
+%doc COPYING READ_Copyrights_Licenses.txt
 %{_bindir}/hp_alice2
 %{_bindir}/hp_alice_test
 %{_bindir}/hp_alm2map_cxx
@@ -293,15 +296,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files c++-devel
 %defattr(-,root,root,-)
+%doc src/cxx/test
 %dir %{_includedir}/healpix
 %{_includedir}/healpix/*.h
-%doc src/cxx/test
 
 
 %files -n chealpix
 %defattr(-,root,root,-)
-%{_libdir}/libchealpix.so
 %doc COPYING READ_Copyrights_Licenses.txt
+%{_libdir}/libchealpix.so
 
 
 %files -n chealpix-devel
@@ -312,6 +315,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.13a-1
+- Update to upstream 2.13a.
+
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.12a-1
+- Update to upstream 2.12a.
+
+* Mon Jul 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.11c-7
+- Move modules to %%{_fmoddir}.
+- Add missing documentation to -c++ package.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11c-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Apr 04 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-5
 - Minor style adjustments
 - Don't override sane gcc flags
@@ -320,14 +336,14 @@ rm -rf $RPM_BUILD_ROOT
 - mkdir with -p to allow short-circuit builds
 - Fix build with GCC 4.4
 
-* Sat Apr 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.11c-4
+* Sat Apr 04 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.11c-4
 - Review fixes.
 - Add C++ bindings, rename C++ and Fortran binaries (general names!).
 
 * Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
 - Build Fortran library as DSO
 
-* Thu Mar 26 2009 Jussi Lehtola <jussi.lehtola at helsinki.fi> - 2.11c-2
+* Thu Mar 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.11c-2
 - Add Fortran bindings.
 
 * Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Apr 2009 07:04:19 -0000	1.2
+++ sources	27 Dec 2009 15:25:32 -0000	1.3
@@ -1 +1 @@
-df220b09bf71b746cee7fdd21c2968e5  Healpix_2.11c_2009Feb19.tar.gz
+391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:27:42 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:27:42 +0000 (UTC)
Subject: rpms/healpix/EL-5 healpix-2.12a-shlib.patch, NONE, 1.1 healpix.spec, 
	1.2, 1.3 sources, 1.2, 1.3 healpix-2.11c-shlib.patch, 1.2, NONE
Message-ID: <20091227152742.7F9D611C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25630/EL-5

Modified Files:
	healpix.spec sources 
Added Files:
	healpix-2.12a-shlib.patch 
Removed Files:
	healpix-2.11c-shlib.patch 
Log Message:
Update to 2.13a.

healpix-2.12a-shlib.patch:
 cxx/Healpix_cxx/planck.make  |  108 ++++++++++++++++++-------------------------
 cxx/alice/planck.make        |   26 +++++-----
 cxx/config/rules.common      |   18 ++-----
 cxx/cxxsupport/planck.make   |   10 ++-
 cxx/libfftpack/planck.make   |    9 ++-
 f90/alteralm/Makefile        |    4 -
 f90/anafast/Makefile         |    4 -
 f90/hotspot/Makefile         |    4 -
 f90/lib/Makefile             |   15 +++++
 f90/map2gif/Makefile         |    4 -
 f90/median_filter/Makefile   |    4 -
 f90/mod/Makefile             |   13 ++++-
 f90/ngsims_full_sky/Makefile |    8 +--
 f90/plmgen/Makefile          |    4 -
 f90/smoothing/Makefile       |    4 -
 f90/synfast/Makefile         |    4 -
 f90/ud_grade/Makefile        |    4 -
 17 files changed, 128 insertions(+), 115 deletions(-)

--- NEW FILE healpix-2.12a-shlib.patch ---
diff -up Healpix_2.12a/src/cxx/alice/planck.make.shlib Healpix_2.12a/src/cxx/alice/planck.make
--- Healpix_2.12a/src/cxx/alice/planck.make.shlib	2009-01-08 18:19:58.000000000 +0200
+++ Healpix_2.12a/src/cxx/alice/planck.make	2009-09-22 17:20:30.316676863 +0300
@@ -20,28 +20,28 @@ test.o: alice_utils.h
 alice2.o: alice_usage.h OrthogonalSkyMap.h
 testOrthogonalSkyMap.o: OrthogonalSkyMap.h
 
-generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+generateTexture.o: 
 generateTexture: generateTexture.o
 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXX_EXTRALIBS)
 
-$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+$(ALICE2_OBJ):
+alice2: $(ALICE2_OBJ)
 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXX_EXTRALIBS)
 
-alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+alice_test: $(TEST_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
+	$(CXX_EXTRALIBS)	
 
-testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testSoSSkyMap: $(TESTSOS_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
+	$(CXX_EXTRALIBS)		
 
-testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testMollweideSkyMap: $(TESTMOL_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
+	$(CXX_EXTRALIBS)	
 	
-testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
+	$(CXX_EXTRALIBS)		
diff -up Healpix_2.12a/src/cxx/config/rules.common.shlib Healpix_2.12a/src/cxx/config/rules.common
--- Healpix_2.12a/src/cxx/config/rules.common.shlib	2008-02-19 12:58:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/config/rules.common	2009-09-22 17:20:30.316676863 +0300
@@ -1,10 +1,6 @@
 SRCROOT = $(LEVELS_SRC)
 BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
 PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
-BINDIR	= $(PREFIX)/bin
-INCDIR	= $(PREFIX)/include
-LIBDIR	= $(PREFIX)/lib
-DOCDIR	= $(SRCROOT)/doc
 
 # do not use any suffix rules
 .SUFFIXES:
@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
 prep:
 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
-	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
-	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
-	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
-	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
+	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
+	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
+	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
+	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
 
 $(SUBCLEAN):
 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
 subdir_clean: $(SUBCLEAN)
 
 install:
-	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
-	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
-	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
+	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
+	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
+	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
 
 install: $(BINARIES) $(LIBRARIES)
 $(BINARIES) $(LIBRARIES): $(OBJECTS)
diff -up Healpix_2.12a/src/cxx/cxxsupport/planck.make.shlib Healpix_2.12a/src/cxx/cxxsupport/planck.make
--- Healpix_2.12a/src/cxx/cxxsupport/planck.make.shlib	2008-02-19 12:58:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/cxxsupport/planck.make	2009-09-22 17:20:30.317676639 +0300
@@ -1,7 +1,6 @@
-TEMP1	= $(SRCROOT)/cxxsupport
 VPATH	= $(TEMP1) $(INCDIR)
 
-LIBRARIES= libcxxsupport.a
+LIBRARIES= libhealpix_cxxsupport.so
 
 HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
 SIMPARAMS_H := simparams.h $(CXXUTILS_H)
 PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
 ARR_H := arr.h $(CXXUTILS_H)
-FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
+FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
 VEC3_H := vec3.h
 ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
 POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
 
 libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
+
+.PHONY: libhealpix_cxxsupport.so
+libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
+	cp -p $@ $(DESTLIB)/
diff -up Healpix_2.12a/src/cxx/Healpix_cxx/planck.make.shlib Healpix_2.12a/src/cxx/Healpix_cxx/planck.make
--- Healpix_2.12a/src/cxx/Healpix_cxx/planck.make.shlib	2006-12-04 21:31:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/Healpix_cxx/planck.make	2009-09-22 17:20:30.318676626 +0300
@@ -1,21 +1,16 @@
-TEMP1	= $(SRCROOT)/Healpix_cxx
 VPATH	= $(TEMP1) $(LIBDIR)
 
-LIBRARIES= libhealpix_cxx.a
+LIBRARIES= libhealpix_cxx.so
 
 BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
 	  rotalm_cxx mult_alm
 
-SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
-	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
-	$(TEMP1)/powspec_fitsio.h \
-	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
-
-HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
-	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
-	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
-	$(SPHERE_HEADERS)
+SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
+	powspec_fitsio.h ylmgen.h alm_map_tools.h
+
+HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
+	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
 
 include $(PARAMFILE)
 
@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
 HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
 
-healpix_base.o: healpix_base.h libcxxsupport.a
-healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
-healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
-healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
-	libcxxsupport.a
-alm_fitsio.o: alm_fitsio.h alm.h \
-	libcxxsupport.a
-healpix_data_io.o: healpix_data_io.h libcxxsupport.a
-powspec_fitsio.o: powspec.h libcxxsupport.a
-powspec.o: powspec.h libcxxsupport.a
+healpix_base.o: healpix_base.h 
+healpix_base2.o: healpix_base.h healpix_base2.h 
+healpix_map.o: healpix_base.h healpix_map.h 
+healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
+alm_fitsio.o: alm_fitsio.h alm.h 
+healpix_data_io.o: healpix_data_io.h
+powspec_fitsio.o: powspec.h 
+powspec.o: powspec.h
 alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
-	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
-	libfftpack.a libcxxsupport.a
-alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
-alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
+	ylmgen.h alm_healpix_tools.h alm_map_tools.h
+alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
+alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
 
 libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
 
-syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+.PHONY: libhealpix_cxx.so
+libhealpix_cxx.so: $(HEALPIX_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
+	cp -p $@ $(DESTLIB)/
+
+
+syn_alm_cxx.o: libhealpix_cxx.so
 syn_alm_cxx: syn_alm_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
-	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
 
-alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+alm2map_cxx.o: libhealpix_cxx.so
 alm2map_cxx: alm2map_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
 
-anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+anafast_cxx.o: libhealpix_cxx.so
 anafast_cxx: anafast_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
 
-map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+map2tga.o: libhealpix_cxx.so
 map2tga: map2tga.o
-	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
 
-udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+udgrade_cxx.o: libhealpix_cxx.so
 udgrade_cxx: udgrade_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
 
-hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+hotspots_cxx.o: libhealpix_cxx.so
 hotspots_cxx: hotspots_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
 
-calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+calc_powspec.o: libhealpix_cxx.so
 calc_powspec: calc_powspec.o
-	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
 
-median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+median_filter.o: libhealpix_cxx.so
 median_filter: median_filter.o
-	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
 
-hpxtest.o: libhealpix_cxx.a libcxxsupport.a
+hpxtest.o: libhealpix_cxx.so
 hpxtest: hpxtest.o
-	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
 
-smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+smoothing_cxx.o: libhealpix_cxx.so
 smoothing_cxx: smoothing_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
 
-rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
+rotalm_cxx.o: libhealpix_cxxsupport.so
 rotalm_cxx: rotalm_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
 
-mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+mult_alm.o: libhealpix_cxx.so
 mult_alm: mult_alm.o
-	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
diff -up Healpix_2.12a/src/cxx/libfftpack/planck.make.shlib Healpix_2.12a/src/cxx/libfftpack/planck.make
--- Healpix_2.12a/src/cxx/libfftpack/planck.make.shlib	2006-01-26 11:25:58.000000000 +0200
+++ Healpix_2.12a/src/cxx/libfftpack/planck.make	2009-09-22 17:20:30.319676770 +0300
@@ -1,9 +1,7 @@
-TEMP1	= $(SRCROOT)/libfftpack
 VPATH	= $(TEMP1) $(INCDIR)
 
-LIBRARIES= libfftpack.a
+LIBRARIES= libhealpix_fft.so
 
-HEADERS= $(TEMP1)/ls_fft.h
 
 include $(PARAMFILE)
 
@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
 
 libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
+
+libhealpix_fft.so: $(FFTPACK_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
+	cp -p $@ $(DESTLIB)/
+	cp -p *.h $(DESTINC)/
diff -up Healpix_2.12a/src/f90/alteralm/Makefile.shlib Healpix_2.12a/src/f90/alteralm/Makefile
--- Healpix_2.12a/src/f90/alteralm/Makefile.shlib	2005-02-24 12:22:59.000000000 +0200
+++ Healpix_2.12a/src/f90/alteralm/Makefile	2009-09-22 17:20:30.319676770 +0300
@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/anafast/Makefile.shlib Healpix_2.12a/src/f90/anafast/Makefile
--- Healpix_2.12a/src/f90/anafast/Makefile.shlib	2005-02-16 06:55:38.000000000 +0200
+++ Healpix_2.12a/src/f90/anafast/Makefile	2009-09-22 17:20:30.319676770 +0300
@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/hotspot/Makefile.shlib Healpix_2.12a/src/f90/hotspot/Makefile
--- Healpix_2.12a/src/f90/hotspot/Makefile.shlib	2009-06-26 21:06:41.000000000 +0300
+++ Healpix_2.12a/src/f90/hotspot/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -31,8 +31,8 @@ obj 	= maxima_tools.o HotSpots.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
 
 # spell out dependencies to allow parallel compilation (make -j)
 HotSpots.o: maxima_tools.o
diff -up Healpix_2.12a/src/f90/lib/Makefile.shlib Healpix_2.12a/src/f90/lib/Makefile
--- Healpix_2.12a/src/f90/lib/Makefile.shlib	2009-07-10 16:32:45.000000000 +0300
+++ Healpix_2.12a/src/f90/lib/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -20,7 +20,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
 %.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-default: libhpxgif.a
+default: libhpxgif.so
 
 libhpxgif.a: $(allobj)
 	$(AR) libhpxgif.a $(allobj)
@@ -29,3 +29,16 @@ libhpxgif.a: $(allobj)
 	@for p in *.$(MOD); do \
 	cp $$p $(INCDIR)/; \
 	done
+
+# He's sick, he's sick, he's really really sick
+# he's sick, he's sick, he's really really sick
+# he's really really sick, he's really really sick
+# he's sick, he's sick.
+# -- Alice Cooper
+.PHONY: libhpxgif.so
+libhpxgif.so: $(allobj)
+	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
diff -up Healpix_2.12a/src/f90/map2gif/Makefile.shlib Healpix_2.12a/src/f90/map2gif/Makefile
--- Healpix_2.12a/src/f90/map2gif/Makefile.shlib	2009-07-10 16:32:45.000000000 +0300
+++ Healpix_2.12a/src/f90/map2gif/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -31,5 +31,5 @@ obj 	= map2gif.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libhpxgif.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj) $(LIBDIR)/libhealpix.so $(LIBDIR)/libhpxgif.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhpxgif -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/median_filter/Makefile.shlib Healpix_2.12a/src/f90/median_filter/Makefile
--- Healpix_2.12a/src/f90/median_filter/Makefile.shlib	2005-04-26 04:50:34.000000000 +0300
+++ Healpix_2.12a/src/f90/median_filter/Makefile	2009-09-22 17:20:30.321676604 +0300
@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/mod/Makefile.shlib Healpix_2.12a/src/f90/mod/Makefile
--- Healpix_2.12a/src/f90/mod/Makefile.shlib	2009-06-29 21:00:18.000000000 +0300
+++ Healpix_2.12a/src/f90/mod/Makefile	2009-09-22 17:20:30.321676604 +0300
@@ -33,7 +33,7 @@ obj7  = healpix_modules.o
 
 obj   = $(obj0) $(obj1) $(obj2) $(obj3) $(obj4) $(obj5) $(obj6) $(obj7)
 
-default: libhealpix.a 
+default: libhealpix.so
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
@@ -62,6 +62,17 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
 	cp $$p $(INCDIR)/; \
 	done
 
+# Umm, well, the copying. Curse you, crazy-minded scientists!
+.PHONY: libhealpix.so
+libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
+	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
+
+
+
 alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
 	@./gen_alm_code
 
diff -up Healpix_2.12a/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.12a/src/f90/ngsims_full_sky/Makefile
--- Healpix_2.12a/src/f90/ngsims_full_sky/Makefile.shlib	2009-06-26 21:06:41.000000000 +0300
+++ Healpix_2.12a/src/f90/ngsims_full_sky/Makefile	2009-09-22 17:27:00.892676992 +0300
@@ -29,11 +29,11 @@ obj2 	= $(subs)  sky_ng_sim_bin.o
 
 default: $(exec1) $(exec2)
 
-$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
+$(exec1): $(obj1) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
 
-$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
+$(exec2): $(obj2) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
 
 # spell out dependencies to allow parallel compilation (make -j)
 sub_ngpdf_powergauss.o: sky_sub.o
diff -up Healpix_2.12a/src/f90/plmgen/Makefile.shlib Healpix_2.12a/src/f90/plmgen/Makefile
--- Healpix_2.12a/src/f90/plmgen/Makefile.shlib	2004-08-25 04:27:24.000000000 +0300
+++ Healpix_2.12a/src/f90/plmgen/Makefile	2009-09-22 17:20:30.322676602 +0300
@@ -10,5 +10,5 @@ obj 	= plmgen.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/smoothing/Makefile.shlib Healpix_2.12a/src/f90/smoothing/Makefile
--- Healpix_2.12a/src/f90/smoothing/Makefile.shlib	2005-02-24 12:22:59.000000000 +0200
+++ Healpix_2.12a/src/f90/smoothing/Makefile	2009-09-22 17:20:30.322676602 +0300
@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/synfast/Makefile.shlib Healpix_2.12a/src/f90/synfast/Makefile
--- Healpix_2.12a/src/f90/synfast/Makefile.shlib	2005-02-16 06:55:38.000000000 +0200
+++ Healpix_2.12a/src/f90/synfast/Makefile	2009-09-22 17:20:30.323676731 +0300
@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/ud_grade/Makefile.shlib Healpix_2.12a/src/f90/ud_grade/Makefile
--- Healpix_2.12a/src/f90/ud_grade/Makefile.shlib	2005-06-03 12:44:52.000000000 +0300
+++ Healpix_2.12a/src/f90/ud_grade/Makefile	2009-09-22 17:20:30.323676731 +0300
@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/healpix.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- healpix.spec	7 Apr 2009 08:44:36 -0000	1.2
+++ healpix.spec	27 Dec 2009 15:27:42 -0000	1.3
@@ -1,14 +1,14 @@
 Name:           healpix
-Version:        2.11c
-Release:        5%{?dist}
+Version:        2.13a
+Release:        1%{?dist}
 Summary:        Hierarchical Equal Area isoLatitude Pixelization of a sphere
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
-Source0:        http://download.sourceforge.net/healpix/Healpix_2.11c_2009Feb19.tar.gz
+Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_%{version}/Healpix_%{version}_2009Nov27.tar.gz
 Source1:        healpix-f90test.sh
-Patch0:         healpix-2.11c-shlib.patch
+Patch0:         healpix-2.12a-shlib.patch
 Patch1:         healpix-2.11c-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +33,7 @@ hp_, e.g. anafast is now hp_anafast.
 Summary:        Healpix Fortran headers
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	gcc-gfortran
 
 %description devel
 This package contains the Fortran module files needed to compile against
@@ -85,7 +86,7 @@ This package contains the library for to
 %package -n c%{name}-devel
 Summary:        HEALPix C Bindings Library development files
 Group:          Development/Libraries
-Requires:       c%{name} = %{version}
+Requires:       c%{name} = %{version}-%{release}
 
 %description -n c%{name}-devel
 HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
@@ -106,7 +107,7 @@ rm test/README
 install -p -m 755 %{SOURCE1} runtest.sh
 
 # Remove patch backup from doc
-rm src/cxx/test/*.shlib
+rm -f src/cxx/test/*.shlib
 
 %build
 # Generic stuff
@@ -223,7 +224,9 @@ install -pm 0644 cxxinc/* $RPM_BUILD_ROO
 # Fortran stuff
 install -p f90bin/* $RPM_BUILD_ROOT%{_bindir}
 install -p f90lib/* $RPM_BUILD_ROOT%{_libdir}
-install -pm 0644 f90inc/* $RPM_BUILD_ROOT%{_includedir}/healpix
+# Modules contain API/ABI and thus architecture dependent
+mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/healpix
+install -pm 0644 f90inc/* $RPM_BUILD_ROOT%{_fmoddir}/healpix
 
 
 %clean
@@ -244,6 +247,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc COPYING READ_Copyrights_Licenses.txt test
 %{_bindir}/hp_alteralm
 %{_bindir}/hp_anafast
 %{_bindir}/hp_hotspot
@@ -256,18 +260,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hp_synfast
 %{_bindir}/hp_ud_grade
 %{_libdir}/libhealpix.so
-%{_libdir}/libhealpix_gif.so
-%doc COPYING READ_Copyrights_Licenses.txt test
+%{_libdir}/libhpxgif.so
 
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/healpix
-%{_includedir}/healpix/*.mod
+%{_fmoddir}/healpix/
 
 
 %files c++
 %defattr(-,root,root,-)
+%doc COPYING READ_Copyrights_Licenses.txt
 %{_bindir}/hp_alice2
 %{_bindir}/hp_alice_test
 %{_bindir}/hp_alm2map_cxx
@@ -293,15 +296,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files c++-devel
 %defattr(-,root,root,-)
+%doc src/cxx/test
 %dir %{_includedir}/healpix
 %{_includedir}/healpix/*.h
-%doc src/cxx/test
 
 
 %files -n chealpix
 %defattr(-,root,root,-)
-%{_libdir}/libchealpix.so
 %doc COPYING READ_Copyrights_Licenses.txt
+%{_libdir}/libchealpix.so
 
 
 %files -n chealpix-devel
@@ -312,6 +315,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.13a-1
+- Update to upstream 2.13a.
+
+* Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.12a-1
+- Update to upstream 2.12a.
+
+* Mon Jul 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.11c-7
+- Move modules to %%{_fmoddir}.
+- Add missing documentation to -c++ package.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11c-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Apr 04 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-5
 - Minor style adjustments
 - Don't override sane gcc flags
@@ -320,14 +336,14 @@ rm -rf $RPM_BUILD_ROOT
 - mkdir with -p to allow short-circuit builds
 - Fix build with GCC 4.4
 
-* Sat Apr 04 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 2.11c-4
+* Sat Apr 04 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.11c-4
 - Review fixes.
 - Add C++ bindings, rename C++ and Fortran binaries (general names!).
 
 * Fri Apr 03 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-3
 - Build Fortran library as DSO
 
-* Thu Mar 26 2009 Jussi Lehtola <jussi.lehtola at helsinki.fi> - 2.11c-2
+* Thu Mar 26 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.11c-2
 - Add Fortran bindings.
 
 * Wed Mar 25 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 2.11c-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Apr 2009 07:04:17 -0000	1.2
+++ sources	27 Dec 2009 15:27:42 -0000	1.3
@@ -1 +1 @@
-df220b09bf71b746cee7fdd21c2968e5  Healpix_2.11c_2009Feb19.tar.gz
+391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz


--- healpix-2.11c-shlib.patch DELETED ---



From jussilehtola at fedoraproject.org  Sun Dec 27 15:33:02 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:33:02 +0000 (UTC)
Subject: File Net-UPnP-1.4.2.tar.gz uploaded to lookaside cache by jussilehtola
Message-ID: <20091227153302.78BA410F8B2@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-Net-UPnP:

bc009fd76b565df40a70aca49af82a7d  Net-UPnP-1.4.2.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:34:21 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:34:21 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/devel .cvsignore, 1.2, 1.3 perl-Net-UPnP.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091227153421.CCC7C11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/perl-Net-UPnP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27284

Modified Files:
	.cvsignore perl-Net-UPnP.spec sources 
Log Message:
Update to 1.4.2. Fix rpm versioning with Epoch 1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Apr 2009 07:25:31 -0000	1.2
+++ .cvsignore	27 Dec 2009 15:34:21 -0000	1.3
@@ -1 +1 @@
-Net-UPnP-1.41.tar.gz
+Net-UPnP-1.4.2.tar.gz


Index: perl-Net-UPnP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/devel/perl-Net-UPnP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-UPnP.spec	7 Dec 2009 18:13:56 -0000	1.3
+++ perl-Net-UPnP.spec	27 Dec 2009 15:34:21 -0000	1.4
@@ -1,11 +1,12 @@
 Name:		perl-Net-UPnP
-Version:	1.41
-Release:	5%{?dist}
+Version:	1.4.2
+Epoch:		1
+Release:	1%{?dist}
 Summary:	Perl extension for UPnP
 License:	BSD
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Net-UPnP/
-Source0:	http://www.cpan.org/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker)
@@ -33,20 +34,20 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -55,18 +56,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.41-5
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1:1.4.2-1
+- Update to 1.4.2.
+- Fix spelling in rpm version: 1.4.1 instead of previous 1.41.
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4.1-5
 - rebuild against perl 5.10.1
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.41-4
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Apr 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
+* Wed Apr 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-3
 - Review fixes.
 
-* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-2
+* Sun Apr 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-2
 - Add missing BR: Test::More.
 
-* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-1
+* Sun Apr 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-1
 - Specfile autogenerated by cpanspec 1.77.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Apr 2009 07:25:31 -0000	1.2
+++ sources	27 Dec 2009 15:34:21 -0000	1.3
@@ -1 +1 @@
-7fec0b93c8f7bc62057e06852dd4b722  Net-UPnP-1.41.tar.gz
+bc009fd76b565df40a70aca49af82a7d  Net-UPnP-1.4.2.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:37:11 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:37:11 +0000 (UTC)
Subject: rpms/agedu/EL-4 agedu.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091227153711.BD55211C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28097/EL-4

Modified Files:
	agedu.spec sources 
Log Message:
Update to r8768.


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/EL-4/agedu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- agedu.spec	22 Sep 2009 14:32:45 -0000	1.2
+++ agedu.spec	27 Dec 2009 15:37:11 -0000	1.3
@@ -1,4 +1,4 @@
-%global rel r8642
+%global rel r8768
 
 Name:		agedu
 Version:	0
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8768
+- Update to upstream r8768.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
 - Update to upstream r8642.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 14:32:45 -0000	1.3
+++ sources	27 Dec 2009 15:37:11 -0000	1.4
@@ -1 +1 @@
-42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz
+2e2f811875a4a9c46bf65b7625700002  agedu-r8768.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:37:11 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:37:11 +0000 (UTC)
Subject: rpms/agedu/EL-5 agedu.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091227153711.D7A2611C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/agedu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28097/EL-5

Modified Files:
	agedu.spec sources 
Log Message:
Update to r8768.


Index: agedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/EL-5/agedu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- agedu.spec	22 Sep 2009 14:29:28 -0000	1.2
+++ agedu.spec	27 Dec 2009 15:37:11 -0000	1.3
@@ -1,4 +1,4 @@
-%global rel r8642
+%global rel r8768
 
 Name:		agedu
 Version:	0
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8768
+- Update to upstream r8768.
+
 * Tue Sep 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0-1.r8642
 - Update to upstream r8642.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/agedu/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 14:29:28 -0000	1.3
+++ sources	27 Dec 2009 15:37:11 -0000	1.4
@@ -1 +1 @@
-42d43f2fe9a6bae660c2bd118051c4a8  agedu-r8642.tar.gz
+2e2f811875a4a9c46bf65b7625700002  agedu-r8768.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:38:27 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:38:27 +0000 (UTC)
Subject: rpms/gausssum/F-11 gausssum-cclib.patch,1.1,1.2
Message-ID: <20091227153827.BD6E511C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gausssum/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28481/F-11

Modified Files:
	gausssum-cclib.patch 
Log Message:
Update to 2.2.0.

gausssum-cclib.patch:
 aboutbox.py       |    2 +-
 electrontrans.py  |    2 +-
 gausssumgui.py    |    2 +-
 preferencesbox.py |    2 +-
 utils.py          |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Index: gausssum-cclib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/F-11/gausssum-cclib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gausssum-cclib.patch	4 May 2009 06:26:27 -0000	1.1
+++ gausssum-cclib.patch	27 Dec 2009 15:38:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up GaussSum-2.1.6/gausssum/aboutbox.py.orig GaussSum-2.1.6/gausssum/aboutbox.py
---- GaussSum-2.1.6/gausssum/aboutbox.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/aboutbox.py	2009-05-03 09:15:46.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/aboutbox.py.cclib GaussSum-2.2.0/gausssum/aboutbox.py
+--- GaussSum-2.2.0/gausssum/aboutbox.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/aboutbox.py	2009-12-27 12:11:08.843768337 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file
@@ -10,33 +10,33 @@ diff -up GaussSum-2.1.6/gausssum/aboutbo
  import os, sys
  if hasattr(sys, "frozen"): # i.e. if using py2exe
      installlocation = os.path.dirname(sys.executable)
-diff -up GaussSum-2.1.6/gausssum/electrontrans.py.orig GaussSum-2.1.6/gausssum/electrontrans.py
---- GaussSum-2.1.6/gausssum/electrontrans.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/electrontrans.py	2009-05-03 09:15:56.000000000 +0300
-@@ -4,7 +4,7 @@ import math
- import numpy
- import pdb
+diff -up GaussSum-2.2.0/gausssum/electrontrans.py.cclib GaussSum-2.2.0/gausssum/electrontrans.py
+--- GaussSum-2.2.0/gausssum/electrontrans.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/electrontrans.py	2009-12-27 12:11:31.276593400 +0200
+@@ -20,7 +20,7 @@ import numpy
+ import glob
+ 
  from gausssum.utils import GaussianSpectrum, levelname, percent
 -from gausssum.cclib.parser.utils import convertor
 +from cclib.parser.utils import convertor
  
  from Tkinter import *
  from gnupy import Gnuplot
-diff -up GaussSum-2.1.6/gausssum/gausssumgui.py.orig GaussSum-2.1.6/gausssum/gausssumgui.py
---- GaussSum-2.1.6/gausssum/gausssumgui.py.orig	2009-04-14 12:08:58.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/gausssumgui.py	2009-05-03 09:16:06.000000000 +0300
-@@ -22,7 +22,7 @@ import copy             # For deepcopy..
- import ConfigParser     # For writing the settings to an .ini file
+diff -up GaussSum-2.2.0/gausssum/gausssumgui.py.cclib GaussSum-2.2.0/gausssum/gausssumgui.py
+--- GaussSum-2.2.0/gausssum/gausssumgui.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/gausssumgui.py	2009-12-27 12:11:43.180622318 +0200
+@@ -23,7 +23,7 @@ import ConfigParser     # For writing th
  import logging
+ import glob
  
 -from gausssum.cclib.parser import ADF, GAMESS, Gaussian, ccopen
 +from cclib.parser import ADF, GAMESS, Gaussian, ccopen
  from gausssum.preferencesbox import PreferencesPopupBox
  from gausssum.aboutbox import AboutPopupBox
  from gausssum.popanalysis import Popanalysis
-diff -up GaussSum-2.1.6/gausssum/preferencesbox.py.orig GaussSum-2.1.6/gausssum/preferencesbox.py
---- GaussSum-2.1.6/gausssum/preferencesbox.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/preferencesbox.py	2009-05-03 09:16:20.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/preferencesbox.py.cclib GaussSum-2.2.0/gausssum/preferencesbox.py
+--- GaussSum-2.2.0/gausssum/preferencesbox.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/preferencesbox.py	2009-12-27 12:11:08.845768136 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file
@@ -46,9 +46,9 @@ diff -up GaussSum-2.1.6/gausssum/prefere
  from gausssum.plot import DisplayPlot
  from gausssum.gnupy import Gnuplot
  
-diff -up GaussSum-2.1.6/gausssum/utils.py.orig GaussSum-2.1.6/gausssum/utils.py
---- GaussSum-2.1.6/gausssum/utils.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/utils.py	2009-05-03 09:16:30.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/utils.py.cclib GaussSum-2.2.0/gausssum/utils.py
+--- GaussSum-2.2.0/gausssum/utils.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/utils.py	2009-12-27 12:11:08.846757866 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file



From jussilehtola at fedoraproject.org  Sun Dec 27 15:38:27 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:38:27 +0000 (UTC)
Subject: rpms/gausssum/F-12 gausssum-cclib.patch,1.1,1.2
Message-ID: <20091227153827.E6E1511C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gausssum/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28481/F-12

Modified Files:
	gausssum-cclib.patch 
Log Message:
Update to 2.2.0.

gausssum-cclib.patch:
 aboutbox.py       |    2 +-
 electrontrans.py  |    2 +-
 gausssumgui.py    |    2 +-
 preferencesbox.py |    2 +-
 utils.py          |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Index: gausssum-cclib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gausssum/F-12/gausssum-cclib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gausssum-cclib.patch	4 May 2009 06:24:04 -0000	1.1
+++ gausssum-cclib.patch	27 Dec 2009 15:38:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up GaussSum-2.1.6/gausssum/aboutbox.py.orig GaussSum-2.1.6/gausssum/aboutbox.py
---- GaussSum-2.1.6/gausssum/aboutbox.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/aboutbox.py	2009-05-03 09:15:46.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/aboutbox.py.cclib GaussSum-2.2.0/gausssum/aboutbox.py
+--- GaussSum-2.2.0/gausssum/aboutbox.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/aboutbox.py	2009-12-27 12:11:08.843768337 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file
@@ -10,33 +10,33 @@ diff -up GaussSum-2.1.6/gausssum/aboutbo
  import os, sys
  if hasattr(sys, "frozen"): # i.e. if using py2exe
      installlocation = os.path.dirname(sys.executable)
-diff -up GaussSum-2.1.6/gausssum/electrontrans.py.orig GaussSum-2.1.6/gausssum/electrontrans.py
---- GaussSum-2.1.6/gausssum/electrontrans.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/electrontrans.py	2009-05-03 09:15:56.000000000 +0300
-@@ -4,7 +4,7 @@ import math
- import numpy
- import pdb
+diff -up GaussSum-2.2.0/gausssum/electrontrans.py.cclib GaussSum-2.2.0/gausssum/electrontrans.py
+--- GaussSum-2.2.0/gausssum/electrontrans.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/electrontrans.py	2009-12-27 12:11:31.276593400 +0200
+@@ -20,7 +20,7 @@ import numpy
+ import glob
+ 
  from gausssum.utils import GaussianSpectrum, levelname, percent
 -from gausssum.cclib.parser.utils import convertor
 +from cclib.parser.utils import convertor
  
  from Tkinter import *
  from gnupy import Gnuplot
-diff -up GaussSum-2.1.6/gausssum/gausssumgui.py.orig GaussSum-2.1.6/gausssum/gausssumgui.py
---- GaussSum-2.1.6/gausssum/gausssumgui.py.orig	2009-04-14 12:08:58.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/gausssumgui.py	2009-05-03 09:16:06.000000000 +0300
-@@ -22,7 +22,7 @@ import copy             # For deepcopy..
- import ConfigParser     # For writing the settings to an .ini file
+diff -up GaussSum-2.2.0/gausssum/gausssumgui.py.cclib GaussSum-2.2.0/gausssum/gausssumgui.py
+--- GaussSum-2.2.0/gausssum/gausssumgui.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/gausssumgui.py	2009-12-27 12:11:43.180622318 +0200
+@@ -23,7 +23,7 @@ import ConfigParser     # For writing th
  import logging
+ import glob
  
 -from gausssum.cclib.parser import ADF, GAMESS, Gaussian, ccopen
 +from cclib.parser import ADF, GAMESS, Gaussian, ccopen
  from gausssum.preferencesbox import PreferencesPopupBox
  from gausssum.aboutbox import AboutPopupBox
  from gausssum.popanalysis import Popanalysis
-diff -up GaussSum-2.1.6/gausssum/preferencesbox.py.orig GaussSum-2.1.6/gausssum/preferencesbox.py
---- GaussSum-2.1.6/gausssum/preferencesbox.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/preferencesbox.py	2009-05-03 09:16:20.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/preferencesbox.py.cclib GaussSum-2.2.0/gausssum/preferencesbox.py
+--- GaussSum-2.2.0/gausssum/preferencesbox.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/preferencesbox.py	2009-12-27 12:11:08.845768136 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file
@@ -46,9 +46,9 @@ diff -up GaussSum-2.1.6/gausssum/prefere
  from gausssum.plot import DisplayPlot
  from gausssum.gnupy import Gnuplot
  
-diff -up GaussSum-2.1.6/gausssum/utils.py.orig GaussSum-2.1.6/gausssum/utils.py
---- GaussSum-2.1.6/gausssum/utils.py.orig	2009-04-14 12:08:55.000000000 +0300
-+++ GaussSum-2.1.6/gausssum/utils.py	2009-05-03 09:16:30.000000000 +0300
+diff -up GaussSum-2.2.0/gausssum/utils.py.cclib GaussSum-2.2.0/gausssum/utils.py
+--- GaussSum-2.2.0/gausssum/utils.py.cclib	2009-11-03 16:32:25.000000000 +0200
++++ GaussSum-2.2.0/gausssum/utils.py	2009-12-27 12:11:08.846757866 +0200
 @@ -21,7 +21,7 @@ import traceback
  import copy             # For deepcopy...until I find a better way of doing this
  import ConfigParser     # For writing the settings to an .ini file



From jussilehtola at fedoraproject.org  Sun Dec 27 15:39:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:39:59 +0000 (UTC)
Subject: File healpix-f90test.sh uploaded to lookaside cache by jussilehtola
Message-ID: <20091227153959.1A49A10F88B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for healpix:

2ad20a707f52c064646cfb0e46afa76f  healpix-f90test.sh



From jussilehtola at fedoraproject.org  Sun Dec 27 15:41:35 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:41:35 +0000 (UTC)
Subject: rpms/healpix/EL-5 sources,1.3,1.4
Message-ID: <20091227154135.3CC8311C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29265/EL-5

Modified Files:
	sources 
Log Message:
Update to 2.13a.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Dec 2009 15:27:42 -0000	1.3
+++ sources	27 Dec 2009 15:41:34 -0000	1.4
@@ -1 +1,2 @@
 391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz
+2ad20a707f52c064646cfb0e46afa76f  healpix-f90test.sh



From jussilehtola at fedoraproject.org  Sun Dec 27 15:41:35 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:41:35 +0000 (UTC)
Subject: rpms/healpix/F-12 sources,1.4,1.5
Message-ID: <20091227154135.CBBCA11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29265/F-12

Modified Files:
	sources 
Log Message:
Update to 2.13a.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Dec 2009 15:25:32 -0000	1.4
+++ sources	27 Dec 2009 15:41:35 -0000	1.5
@@ -1 +1,2 @@
 391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz
+2ad20a707f52c064646cfb0e46afa76f  healpix-f90test.sh



From jussilehtola at fedoraproject.org  Sun Dec 27 15:41:36 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:41:36 +0000 (UTC)
Subject: rpms/healpix/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20091227154136.0AC3711C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29265/devel

Modified Files:
	.cvsignore sources 
Log Message:
Update to 2.13a.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Dec 2009 10:09:40 -0000	1.4
+++ .cvsignore	27 Dec 2009 15:41:35 -0000	1.5
@@ -1 +1,2 @@
 Healpix_2.13a_2009Nov27.tar.gz
+healpix-f90test.sh


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Dec 2009 10:09:41 -0000	1.4
+++ sources	27 Dec 2009 15:41:35 -0000	1.5
@@ -1 +1,2 @@
 391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz
+2ad20a707f52c064646cfb0e46afa76f  healpix-f90test.sh



From jussilehtola at fedoraproject.org  Sun Dec 27 15:41:35 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:41:35 +0000 (UTC)
Subject: rpms/healpix/F-11 healpix-2.12a-shlib.patch, NONE, 1.1 sources, 1.3, 
	1.4 healpix-2.11c-shlib.patch, 1.2, NONE
Message-ID: <20091227154135.A435411C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29265/F-11

Modified Files:
	sources 
Added Files:
	healpix-2.12a-shlib.patch 
Removed Files:
	healpix-2.11c-shlib.patch 
Log Message:
Update to 2.13a.

healpix-2.12a-shlib.patch:
 cxx/Healpix_cxx/planck.make  |  108 ++++++++++++++++++-------------------------
 cxx/alice/planck.make        |   26 +++++-----
 cxx/config/rules.common      |   18 ++-----
 cxx/cxxsupport/planck.make   |   10 ++-
 cxx/libfftpack/planck.make   |    9 ++-
 f90/alteralm/Makefile        |    4 -
 f90/anafast/Makefile         |    4 -
 f90/hotspot/Makefile         |    4 -
 f90/lib/Makefile             |   15 +++++
 f90/map2gif/Makefile         |    4 -
 f90/median_filter/Makefile   |    4 -
 f90/mod/Makefile             |   13 ++++-
 f90/ngsims_full_sky/Makefile |    8 +--
 f90/plmgen/Makefile          |    4 -
 f90/smoothing/Makefile       |    4 -
 f90/synfast/Makefile         |    4 -
 f90/ud_grade/Makefile        |    4 -
 17 files changed, 128 insertions(+), 115 deletions(-)

--- NEW FILE healpix-2.12a-shlib.patch ---
diff -up Healpix_2.12a/src/cxx/alice/planck.make.shlib Healpix_2.12a/src/cxx/alice/planck.make
--- Healpix_2.12a/src/cxx/alice/planck.make.shlib	2009-01-08 18:19:58.000000000 +0200
+++ Healpix_2.12a/src/cxx/alice/planck.make	2009-09-22 17:20:30.316676863 +0300
@@ -20,28 +20,28 @@ test.o: alice_utils.h
 alice2.o: alice_usage.h OrthogonalSkyMap.h
 testOrthogonalSkyMap.o: OrthogonalSkyMap.h
 
-generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+generateTexture.o: 
 generateTexture: generateTexture.o
 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXX_EXTRALIBS)
 
-$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+$(ALICE2_OBJ):
+alice2: $(ALICE2_OBJ)
 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXX_EXTRALIBS)
 
-alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+alice_test: $(TEST_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
+	$(CXX_EXTRALIBS)	
 
-testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testSoSSkyMap: $(TESTSOS_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
+	$(CXX_EXTRALIBS)		
 
-testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testMollweideSkyMap: $(TESTMOL_OBJ) 
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
+	$(CXX_EXTRALIBS)	
 	
-testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
+	$(CXX_EXTRALIBS)		
diff -up Healpix_2.12a/src/cxx/config/rules.common.shlib Healpix_2.12a/src/cxx/config/rules.common
--- Healpix_2.12a/src/cxx/config/rules.common.shlib	2008-02-19 12:58:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/config/rules.common	2009-09-22 17:20:30.316676863 +0300
@@ -1,10 +1,6 @@
 SRCROOT = $(LEVELS_SRC)
 BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
 PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
-BINDIR	= $(PREFIX)/bin
-INCDIR	= $(PREFIX)/include
-LIBDIR	= $(PREFIX)/lib
-DOCDIR	= $(SRCROOT)/doc
 
 # do not use any suffix rules
 .SUFFIXES:
@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
 prep:
 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
-	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
-	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
-	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
-	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
+	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
+	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
+	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
+	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
 
 $(SUBCLEAN):
 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
 subdir_clean: $(SUBCLEAN)
 
 install:
-	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
-	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
-	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
+	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
+	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
+	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
 
 install: $(BINARIES) $(LIBRARIES)
 $(BINARIES) $(LIBRARIES): $(OBJECTS)
diff -up Healpix_2.12a/src/cxx/cxxsupport/planck.make.shlib Healpix_2.12a/src/cxx/cxxsupport/planck.make
--- Healpix_2.12a/src/cxx/cxxsupport/planck.make.shlib	2008-02-19 12:58:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/cxxsupport/planck.make	2009-09-22 17:20:30.317676639 +0300
@@ -1,7 +1,6 @@
-TEMP1	= $(SRCROOT)/cxxsupport
 VPATH	= $(TEMP1) $(INCDIR)
 
-LIBRARIES= libcxxsupport.a
+LIBRARIES= libhealpix_cxxsupport.so
 
 HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
 SIMPARAMS_H := simparams.h $(CXXUTILS_H)
 PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
 ARR_H := arr.h $(CXXUTILS_H)
-FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
+FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
 VEC3_H := vec3.h
 ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
 POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
 
 libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
+
+.PHONY: libhealpix_cxxsupport.so
+libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
+	cp -p $@ $(DESTLIB)/
diff -up Healpix_2.12a/src/cxx/Healpix_cxx/planck.make.shlib Healpix_2.12a/src/cxx/Healpix_cxx/planck.make
--- Healpix_2.12a/src/cxx/Healpix_cxx/planck.make.shlib	2006-12-04 21:31:45.000000000 +0200
+++ Healpix_2.12a/src/cxx/Healpix_cxx/planck.make	2009-09-22 17:20:30.318676626 +0300
@@ -1,21 +1,16 @@
-TEMP1	= $(SRCROOT)/Healpix_cxx
 VPATH	= $(TEMP1) $(LIBDIR)
 
-LIBRARIES= libhealpix_cxx.a
+LIBRARIES= libhealpix_cxx.so
 
 BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
 	  rotalm_cxx mult_alm
 
-SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
-	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
-	$(TEMP1)/powspec_fitsio.h \
-	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
-
-HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
-	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
-	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
-	$(SPHERE_HEADERS)
+SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
+	powspec_fitsio.h ylmgen.h alm_map_tools.h
+
+HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
+	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
 
 include $(PARAMFILE)
 
@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
 HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
 
-healpix_base.o: healpix_base.h libcxxsupport.a
-healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
-healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
-healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
-	libcxxsupport.a
-alm_fitsio.o: alm_fitsio.h alm.h \
-	libcxxsupport.a
-healpix_data_io.o: healpix_data_io.h libcxxsupport.a
-powspec_fitsio.o: powspec.h libcxxsupport.a
-powspec.o: powspec.h libcxxsupport.a
+healpix_base.o: healpix_base.h 
+healpix_base2.o: healpix_base.h healpix_base2.h 
+healpix_map.o: healpix_base.h healpix_map.h 
+healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
+alm_fitsio.o: alm_fitsio.h alm.h 
+healpix_data_io.o: healpix_data_io.h
+powspec_fitsio.o: powspec.h 
+powspec.o: powspec.h
 alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
-	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
-	libfftpack.a libcxxsupport.a
-alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
-alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
+	ylmgen.h alm_healpix_tools.h alm_map_tools.h
+alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
+alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
 
 libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
 
-syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+.PHONY: libhealpix_cxx.so
+libhealpix_cxx.so: $(HEALPIX_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
+	cp -p $@ $(DESTLIB)/
+
+
+syn_alm_cxx.o: libhealpix_cxx.so
 syn_alm_cxx: syn_alm_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
-	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
 
-alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+alm2map_cxx.o: libhealpix_cxx.so
 alm2map_cxx: alm2map_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
 
-anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+anafast_cxx.o: libhealpix_cxx.so
 anafast_cxx: anafast_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
 
-map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+map2tga.o: libhealpix_cxx.so
 map2tga: map2tga.o
-	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
 
-udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+udgrade_cxx.o: libhealpix_cxx.so
 udgrade_cxx: udgrade_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
 
-hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+hotspots_cxx.o: libhealpix_cxx.so
 hotspots_cxx: hotspots_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
 
-calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+calc_powspec.o: libhealpix_cxx.so
 calc_powspec: calc_powspec.o
-	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
 
-median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+median_filter.o: libhealpix_cxx.so
 median_filter: median_filter.o
-	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
 
-hpxtest.o: libhealpix_cxx.a libcxxsupport.a
+hpxtest.o: libhealpix_cxx.so
 hpxtest: hpxtest.o
-	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
 
-smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
+smoothing_cxx.o: libhealpix_cxx.so
 smoothing_cxx: smoothing_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
 
-rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
+rotalm_cxx.o: libhealpix_cxxsupport.so
 rotalm_cxx: rotalm_cxx.o
-	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
 
-mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+mult_alm.o: libhealpix_cxx.so
 mult_alm: mult_alm.o
-	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
+	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
diff -up Healpix_2.12a/src/cxx/libfftpack/planck.make.shlib Healpix_2.12a/src/cxx/libfftpack/planck.make
--- Healpix_2.12a/src/cxx/libfftpack/planck.make.shlib	2006-01-26 11:25:58.000000000 +0200
+++ Healpix_2.12a/src/cxx/libfftpack/planck.make	2009-09-22 17:20:30.319676770 +0300
@@ -1,9 +1,7 @@
-TEMP1	= $(SRCROOT)/libfftpack
 VPATH	= $(TEMP1) $(INCDIR)
 
-LIBRARIES= libfftpack.a
+LIBRARIES= libhealpix_fft.so
 
-HEADERS= $(TEMP1)/ls_fft.h
 
 include $(PARAMFILE)
 
@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
 
 libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
+
+libhealpix_fft.so: $(FFTPACK_OBJ)
+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
+	cp -p $@ $(DESTLIB)/
+	cp -p *.h $(DESTINC)/
diff -up Healpix_2.12a/src/f90/alteralm/Makefile.shlib Healpix_2.12a/src/f90/alteralm/Makefile
--- Healpix_2.12a/src/f90/alteralm/Makefile.shlib	2005-02-24 12:22:59.000000000 +0200
+++ Healpix_2.12a/src/f90/alteralm/Makefile	2009-09-22 17:20:30.319676770 +0300
@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/anafast/Makefile.shlib Healpix_2.12a/src/f90/anafast/Makefile
--- Healpix_2.12a/src/f90/anafast/Makefile.shlib	2005-02-16 06:55:38.000000000 +0200
+++ Healpix_2.12a/src/f90/anafast/Makefile	2009-09-22 17:20:30.319676770 +0300
@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/hotspot/Makefile.shlib Healpix_2.12a/src/f90/hotspot/Makefile
--- Healpix_2.12a/src/f90/hotspot/Makefile.shlib	2009-06-26 21:06:41.000000000 +0300
+++ Healpix_2.12a/src/f90/hotspot/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -31,8 +31,8 @@ obj 	= maxima_tools.o HotSpots.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
 
 # spell out dependencies to allow parallel compilation (make -j)
 HotSpots.o: maxima_tools.o
diff -up Healpix_2.12a/src/f90/lib/Makefile.shlib Healpix_2.12a/src/f90/lib/Makefile
--- Healpix_2.12a/src/f90/lib/Makefile.shlib	2009-07-10 16:32:45.000000000 +0300
+++ Healpix_2.12a/src/f90/lib/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -20,7 +20,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
 %.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-default: libhpxgif.a
+default: libhpxgif.so
 
 libhpxgif.a: $(allobj)
 	$(AR) libhpxgif.a $(allobj)
@@ -29,3 +29,16 @@ libhpxgif.a: $(allobj)
 	@for p in *.$(MOD); do \
 	cp $$p $(INCDIR)/; \
 	done
+
+# He's sick, he's sick, he's really really sick
+# he's sick, he's sick, he's really really sick
+# he's really really sick, he's really really sick
+# he's sick, he's sick.
+# -- Alice Cooper
+.PHONY: libhpxgif.so
+libhpxgif.so: $(allobj)
+	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
diff -up Healpix_2.12a/src/f90/map2gif/Makefile.shlib Healpix_2.12a/src/f90/map2gif/Makefile
--- Healpix_2.12a/src/f90/map2gif/Makefile.shlib	2009-07-10 16:32:45.000000000 +0300
+++ Healpix_2.12a/src/f90/map2gif/Makefile	2009-09-22 17:20:30.320676625 +0300
@@ -31,5 +31,5 @@ obj 	= map2gif.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libhpxgif.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj) $(LIBDIR)/libhealpix.so $(LIBDIR)/libhpxgif.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhpxgif -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/median_filter/Makefile.shlib Healpix_2.12a/src/f90/median_filter/Makefile
--- Healpix_2.12a/src/f90/median_filter/Makefile.shlib	2005-04-26 04:50:34.000000000 +0300
+++ Healpix_2.12a/src/f90/median_filter/Makefile	2009-09-22 17:20:30.321676604 +0300
@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/mod/Makefile.shlib Healpix_2.12a/src/f90/mod/Makefile
--- Healpix_2.12a/src/f90/mod/Makefile.shlib	2009-06-29 21:00:18.000000000 +0300
+++ Healpix_2.12a/src/f90/mod/Makefile	2009-09-22 17:20:30.321676604 +0300
@@ -33,7 +33,7 @@ obj7  = healpix_modules.o
 
 obj   = $(obj0) $(obj1) $(obj2) $(obj3) $(obj4) $(obj5) $(obj6) $(obj7)
 
-default: libhealpix.a 
+default: libhealpix.so
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
@@ -62,6 +62,17 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
 	cp $$p $(INCDIR)/; \
 	done
 
+# Umm, well, the copying. Curse you, crazy-minded scientists!
+.PHONY: libhealpix.so
+libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
+	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
+	cp -p $@ $(LIBDIR)/
+	for p in *.$(MOD); do \
+	cp $$p $(INCDIR)/; \
+	done
+
+
+
 alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
 	@./gen_alm_code
 
diff -up Healpix_2.12a/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.12a/src/f90/ngsims_full_sky/Makefile
--- Healpix_2.12a/src/f90/ngsims_full_sky/Makefile.shlib	2009-06-26 21:06:41.000000000 +0300
+++ Healpix_2.12a/src/f90/ngsims_full_sky/Makefile	2009-09-22 17:27:00.892676992 +0300
@@ -29,11 +29,11 @@ obj2 	= $(subs)  sky_ng_sim_bin.o
 
 default: $(exec1) $(exec2)
 
-$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
+$(exec1): $(obj1) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
 
-$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
-	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
+$(exec2): $(obj2) $(LIBDIR)/libhealpix.so
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
 
 # spell out dependencies to allow parallel compilation (make -j)
 sub_ngpdf_powergauss.o: sky_sub.o
diff -up Healpix_2.12a/src/f90/plmgen/Makefile.shlib Healpix_2.12a/src/f90/plmgen/Makefile
--- Healpix_2.12a/src/f90/plmgen/Makefile.shlib	2004-08-25 04:27:24.000000000 +0300
+++ Healpix_2.12a/src/f90/plmgen/Makefile	2009-09-22 17:20:30.322676602 +0300
@@ -10,5 +10,5 @@ obj 	= plmgen.o
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/smoothing/Makefile.shlib Healpix_2.12a/src/f90/smoothing/Makefile
--- Healpix_2.12a/src/f90/smoothing/Makefile.shlib	2005-02-24 12:22:59.000000000 +0200
+++ Healpix_2.12a/src/f90/smoothing/Makefile	2009-09-22 17:20:30.322676602 +0300
@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/synfast/Makefile.shlib Healpix_2.12a/src/f90/synfast/Makefile
--- Healpix_2.12a/src/f90/synfast/Makefile.shlib	2005-02-16 06:55:38.000000000 +0200
+++ Healpix_2.12a/src/f90/synfast/Makefile	2009-09-22 17:20:30.323676731 +0300
@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff -up Healpix_2.12a/src/f90/ud_grade/Makefile.shlib Healpix_2.12a/src/f90/ud_grade/Makefile
--- Healpix_2.12a/src/f90/ud_grade/Makefile.shlib	2005-06-03 12:44:52.000000000 +0300
+++ Healpix_2.12a/src/f90/ud_grade/Makefile	2009-09-22 17:20:30.323676731 +0300
@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
 
 default: $(exec)
 
-$(exec): $(obj) $(LIBDIR)/libhealpix.a
-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
+$(exec): $(obj)
+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Dec 2009 15:25:32 -0000	1.3
+++ sources	27 Dec 2009 15:41:35 -0000	1.4
@@ -1 +1,2 @@
 391fa6874977ddaf26feb4909cf90c85  Healpix_2.13a_2009Nov27.tar.gz
+2ad20a707f52c064646cfb0e46afa76f  healpix-f90test.sh


--- healpix-2.11c-shlib.patch DELETED ---



From jussilehtola at fedoraproject.org  Sun Dec 27 15:48:02 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:48:02 +0000 (UTC)
Subject: File pondus-0.7.0.tar.gz uploaded to lookaside cache by jussilehtola
Message-ID: <20091227154802.EF69B10F8B2@bastion.fedoraproject.org>

A file has been added to the lookaside cache for pondus:

23d51b50f36303d2fa606bf0e1390be7  pondus-0.7.0.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:50:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:50:39 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/EL-5 perl-Net-UPnP.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091227155039.3028C11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/perl-Net-UPnP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31680a/EL-5

Modified Files:
	perl-Net-UPnP.spec sources 
Log Message:
Update to 1.4.2. Fix rpm versioning with Epoch 1.


Index: perl-Net-UPnP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/EL-5/perl-Net-UPnP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-UPnP.spec	18 Apr 2009 07:27:30 -0000	1.1
+++ perl-Net-UPnP.spec	27 Dec 2009 15:50:38 -0000	1.2
@@ -1,11 +1,12 @@
 Name:		perl-Net-UPnP
-Version:	1.41
-Release:	3%{?dist}
+Version:	1.4.2
+Epoch:		1
+Release:	1%{?dist}
 Summary:	Perl extension for UPnP
 License:	BSD
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Net-UPnP/
-Source0:	http://www.cpan.org/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker)
@@ -33,20 +34,20 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -55,12 +56,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Wed Apr 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1:1.4.2-1
+- Update to 1.4.2.
+- Fix spelling in rpm version: 1.4.1 instead of previous 1.41.
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4.1-5
+- rebuild against perl 5.10.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-3
 - Review fixes.
 
-* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-2
+* Sun Apr 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-2
 - Add missing BR: Test::More.
 
-* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-1
+* Sun Apr 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-1
 - Specfile autogenerated by cpanspec 1.77.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Apr 2009 07:27:30 -0000	1.2
+++ sources	27 Dec 2009 15:50:38 -0000	1.3
@@ -1 +1 @@
-7fec0b93c8f7bc62057e06852dd4b722  Net-UPnP-1.41.tar.gz
+bc009fd76b565df40a70aca49af82a7d  Net-UPnP-1.4.2.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:50:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:50:39 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/F-11 perl-Net-UPnP.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091227155039.533C311C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/perl-Net-UPnP/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31680a/F-11

Modified Files:
	perl-Net-UPnP.spec sources 
Log Message:
Update to 1.4.2. Fix rpm versioning with Epoch 1.


Index: perl-Net-UPnP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/F-11/perl-Net-UPnP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-UPnP.spec	18 Apr 2009 07:27:30 -0000	1.1
+++ perl-Net-UPnP.spec	27 Dec 2009 15:50:39 -0000	1.2
@@ -1,11 +1,12 @@
 Name:		perl-Net-UPnP
-Version:	1.41
-Release:	3%{?dist}
+Version:	1.4.2
+Epoch:		1
+Release:	1%{?dist}
 Summary:	Perl extension for UPnP
 License:	BSD
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Net-UPnP/
-Source0:	http://www.cpan.org/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker)
@@ -33,20 +34,20 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -55,12 +56,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Wed Apr 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1:1.4.2-1
+- Update to 1.4.2.
+- Fix spelling in rpm version: 1.4.1 instead of previous 1.41.
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4.1-5
+- rebuild against perl 5.10.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-3
 - Review fixes.
 
-* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-2
+* Sun Apr 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-2
 - Add missing BR: Test::More.
 
-* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-1
+* Sun Apr 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-1
 - Specfile autogenerated by cpanspec 1.77.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Apr 2009 07:27:30 -0000	1.2
+++ sources	27 Dec 2009 15:50:39 -0000	1.3
@@ -1 +1 @@
-7fec0b93c8f7bc62057e06852dd4b722  Net-UPnP-1.41.tar.gz
+bc009fd76b565df40a70aca49af82a7d  Net-UPnP-1.4.2.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:50:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:50:39 +0000 (UTC)
Subject: rpms/perl-Net-UPnP/F-12 perl-Net-UPnP.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091227155039.7C3E811C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/perl-Net-UPnP/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31680a/F-12

Modified Files:
	perl-Net-UPnP.spec sources 
Log Message:
Update to 1.4.2. Fix rpm versioning with Epoch 1.


Index: perl-Net-UPnP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/F-12/perl-Net-UPnP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Net-UPnP.spec	26 Jul 2009 13:48:05 -0000	1.2
+++ perl-Net-UPnP.spec	27 Dec 2009 15:50:39 -0000	1.3
@@ -1,11 +1,12 @@
 Name:		perl-Net-UPnP
-Version:	1.41
-Release:	4%{?dist}
+Version:	1.4.2
+Epoch:		1
+Release:	1%{?dist}
 Summary:	Perl extension for UPnP
 License:	BSD
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Net-UPnP/
-Source0:	http://www.cpan.org/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker)
@@ -33,20 +34,20 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -55,15 +56,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.41-4
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1:1.4.2-1
+- Update to 1.4.2.
+- Fix spelling in rpm version: 1.4.1 instead of previous 1.41.
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.4.1-5
+- rebuild against perl 5.10.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Apr 15 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-3
+* Wed Apr 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-3
 - Review fixes.
 
-* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-2
+* Sun Apr 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-2
 - Add missing BR: Test::More.
 
-* Sun Apr 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.41-1
+* Sun Apr 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1-1
 - Specfile autogenerated by cpanspec 1.77.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-UPnP/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Apr 2009 07:25:31 -0000	1.2
+++ sources	27 Dec 2009 15:50:39 -0000	1.3
@@ -1 +1 @@
-7fec0b93c8f7bc62057e06852dd4b722  Net-UPnP-1.41.tar.gz
+bc009fd76b565df40a70aca49af82a7d  Net-UPnP-1.4.2.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:51:05 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:51:05 +0000 (UTC)
Subject: rpms/pondus/devel .cvsignore, 1.3, 1.4 pondus.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <20091227155105.9D7A611C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pondus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31882

Modified Files:
	.cvsignore pondus.spec sources 
Log Message:
Update to 0.7.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Nov 2009 10:20:40 -0000	1.3
+++ .cvsignore	27 Dec 2009 15:51:05 -0000	1.4
@@ -1 +1 @@
-pondus-0.6.0.tar.gz
+pondus-0.7.0.tar.gz


Index: pondus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/devel/pondus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pondus.spec	7 Nov 2009 10:20:40 -0000	1.4
+++ pondus.spec	27 Dec 2009 15:51:05 -0000	1.5
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pondus
-Version:	0.6.0
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	A personal weight management program
 Group:		Applications/Productivity
-License:	GPLv3+
+License:	MIT
 URL:		http://www.ephys.de/software/pondus/
 Source0:	http://www.ephys.de/software/pondus/pondus-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/pondus-*.egg-info
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.7.0-1
+- Update to 0.7.0.
+- License has changed to MIT.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.6.0-1
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Nov 2009 10:20:40 -0000	1.3
+++ sources	27 Dec 2009 15:51:05 -0000	1.4
@@ -1 +1 @@
-e2c822129b734d2574e962850cac8206  pondus-0.6.0.tar.gz
+23d51b50f36303d2fa606bf0e1390be7  pondus-0.7.0.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 15:59:11 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 15:59:11 +0000 (UTC)
Subject: File sympy-0.6.6.tar.gz uploaded to lookaside cache by jussilehtola
Message-ID: <20091227155911.C5C2E10F892@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sympy:

aa7be690a1df7e7415fe968f5e076733  sympy-0.6.6.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 16:00:46 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:00:46 +0000 (UTC)
Subject: rpms/pondus/devel pondus.spec,1.5,1.6
Message-ID: <20091227160046.4B00311C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pondus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1752

Modified Files:
	pondus.spec 
Log Message:
Update license in %files.


Index: pondus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/devel/pondus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pondus.spec	27 Dec 2009 15:51:05 -0000	1.5
+++ pondus.spec	27 Dec 2009 16:00:46 -0000	1.6
@@ -48,7 +48,7 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS PKG-INFO README TODO
+%doc AUTHORS CONTRIBUTING LICENSE NEWS PKG-INFO README TODO
 %{_bindir}/pondus
 %{_mandir}/man1/pondus.1.*
 %{_datadir}/applications/pondus.desktop



From jussilehtola at fedoraproject.org  Sun Dec 27 16:01:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:01:16 +0000 (UTC)
Subject: rpms/sympy/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 sympy.spec,
	1.8, 1.9
Message-ID: <20091227160116.60DA111C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/sympy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1947

Modified Files:
	.cvsignore sources sympy.spec 
Log Message:
Update to 0.6.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sympy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Nov 2009 10:29:54 -0000	1.4
+++ .cvsignore	27 Dec 2009 16:01:16 -0000	1.5
@@ -1 +1 @@
-sympy-0.6.5.tar.gz
+sympy-0.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sympy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Nov 2009 10:29:54 -0000	1.4
+++ sources	27 Dec 2009 16:01:16 -0000	1.5
@@ -1 +1 @@
-468589180c259a5b394bc04cdffbfe98  sympy-0.6.5.tar.gz
+aa7be690a1df7e7415fe968f5e076733  sympy-0.6.6.tar.gz


Index: sympy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sympy/devel/sympy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sympy.spec	7 Nov 2009 10:29:54 -0000	1.8
+++ sympy.spec	27 Dec 2009 16:01:16 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           sympy
-Version:        0.6.5
+Version:        0.6.6
 Release:        1%{?dist}
 Summary:        A Python library for symbolic mathematics
 Group:          Development/Languages
@@ -41,12 +41,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/sympy/
+%{python_sitelib}/sympy-%{version}-*.egg-info
 %{_bindir}/isympy
 %{_mandir}/man1/isympy.1*
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.6.6-1
+- Update to 0.6.6.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.6.5-1
 - Update to 0.6.5.
 



From jussilehtola at fedoraproject.org  Sun Dec 27 16:10:07 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:10:07 +0000 (UTC)
Subject: rpms/pondus/F-11 pondus.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091227161007.2DD4911C0335@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pondus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3806/F-11

Modified Files:
	pondus.spec sources 
Log Message:
Update to 0.7.0.


Index: pondus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/F-11/pondus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pondus.spec	7 Nov 2009 10:28:26 -0000	1.2
+++ pondus.spec	27 Dec 2009 16:10:06 -0000	1.3
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pondus
-Version:	0.6.0
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	A personal weight management program
 Group:		Applications/Productivity
-License:	GPLv3+
+License:	MIT
 URL:		http://www.ephys.de/software/pondus/
 Source0:	http://www.ephys.de/software/pondus/pondus-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,7 +48,7 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS PKG-INFO README TODO
+%doc AUTHORS CONTRIBUTING LICENSE NEWS PKG-INFO README TODO
 %{_bindir}/pondus
 %{_mandir}/man1/pondus.1.*
 %{_datadir}/applications/pondus.desktop
@@ -59,6 +59,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/pondus-*.egg-info
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.7.0-1
+- Update to 0.7.0.
+- License has changed to MIT.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.6.0-1
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Nov 2009 10:28:26 -0000	1.3
+++ sources	27 Dec 2009 16:10:06 -0000	1.4
@@ -1 +1 @@
-e2c822129b734d2574e962850cac8206  pondus-0.6.0.tar.gz
+23d51b50f36303d2fa606bf0e1390be7  pondus-0.7.0.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 16:10:07 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:10:07 +0000 (UTC)
Subject: rpms/pondus/F-12 pondus.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20091227161007.2DCFD11C02C4@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pondus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3806/F-12

Modified Files:
	pondus.spec sources 
Log Message:
Update to 0.7.0.


Index: pondus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/F-12/pondus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pondus.spec	7 Nov 2009 10:28:26 -0000	1.4
+++ pondus.spec	27 Dec 2009 16:10:06 -0000	1.5
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pondus
-Version:	0.6.0
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	A personal weight management program
 Group:		Applications/Productivity
-License:	GPLv3+
+License:	MIT
 URL:		http://www.ephys.de/software/pondus/
 Source0:	http://www.ephys.de/software/pondus/pondus-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,7 +48,7 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS PKG-INFO README TODO
+%doc AUTHORS CONTRIBUTING LICENSE NEWS PKG-INFO README TODO
 %{_bindir}/pondus
 %{_mandir}/man1/pondus.1.*
 %{_datadir}/applications/pondus.desktop
@@ -59,6 +59,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/pondus-*.egg-info
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.7.0-1
+- Update to 0.7.0.
+- License has changed to MIT.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.6.0-1
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Nov 2009 10:28:26 -0000	1.3
+++ sources	27 Dec 2009 16:10:06 -0000	1.4
@@ -1 +1 @@
-e2c822129b734d2574e962850cac8206  pondus-0.6.0.tar.gz
+23d51b50f36303d2fa606bf0e1390be7  pondus-0.7.0.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 16:10:07 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:10:07 +0000 (UTC)
Subject: rpms/pondus/EL-5 pondus.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20091227161007.2665A11C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pondus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3806/EL-5

Modified Files:
	pondus.spec sources 
Log Message:
Update to 0.7.0.


Index: pondus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/EL-5/pondus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pondus.spec	7 Nov 2009 10:29:22 -0000	1.5
+++ pondus.spec	27 Dec 2009 16:10:05 -0000	1.6
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pondus
-Version:	0.6.0
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	A personal weight management program
 Group:		Applications/Productivity
-License:	GPLv3+
+License:	MIT
 URL:		http://www.ephys.de/software/pondus/
 Source0:	http://www.ephys.de/software/pondus/pondus-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,7 +48,7 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS PKG-INFO README TODO
+%doc AUTHORS CONTRIBUTING LICENSE NEWS PKG-INFO README TODO
 %{_bindir}/pondus
 %{_mandir}/man1/pondus.1.*
 %{_datadir}/applications/pondus.desktop
@@ -59,6 +59,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/pondus-*.egg-info
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.7.0-1
+- Update to 0.7.0.
+- License has changed to MIT.
+
 * Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.6.0-1
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pondus/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Nov 2009 10:29:22 -0000	1.3
+++ sources	27 Dec 2009 16:10:05 -0000	1.4
@@ -1 +1 @@
-e2c822129b734d2574e962850cac8206  pondus-0.6.0.tar.gz
+23d51b50f36303d2fa606bf0e1390be7  pondus-0.7.0.tar.gz



From jussilehtola at fedoraproject.org  Sun Dec 27 16:23:17 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:23:17 +0000 (UTC)
Subject: rpms/healpix/EL-5 healpix.spec,1.3,1.4
Message-ID: <20091227162317.82C8311C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6519

Modified Files:
	healpix.spec 
Log Message:
Hack in %_fmoddir definition, missing from EPEL


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/healpix.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- healpix.spec	27 Dec 2009 15:27:42 -0000	1.3
+++ healpix.spec	27 Dec 2009 16:23:15 -0000	1.4
@@ -1,3 +1,6 @@
+# EPEL hack
+%global %{_fmoddir} %{_libdir}/gfortran/modules
+
 Name:           healpix
 Version:        2.13a
 Release:        1%{?dist}



From jussilehtola at fedoraproject.org  Sun Dec 27 16:25:48 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:25:48 +0000 (UTC)
Subject: rpms/sympy/devel sympy.spec,1.9,1.10
Message-ID: <20091227162548.0C51011C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/sympy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7100

Modified Files:
	sympy.spec 
Log Message:
Update to 0.6.6.


Index: sympy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sympy/devel/sympy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sympy.spec	27 Dec 2009 16:01:16 -0000	1.9
+++ sympy.spec	27 Dec 2009 16:25:47 -0000	1.10
@@ -30,12 +30,13 @@ Python and does not require any external
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+# Remove extra files
+rm -f %{buildroot}%{_bindir}/{,doc}test
  
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files



From jussilehtola at fedoraproject.org  Sun Dec 27 16:30:46 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:30:46 +0000 (UTC)
Subject: rpms/healpix/EL-5 healpix.spec,1.4,1.5
Message-ID: <20091227163046.B3E1611C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8213

Modified Files:
	healpix.spec 
Log Message:
Fix %_fmoddir definition..


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/EL-5/healpix.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- healpix.spec	27 Dec 2009 16:23:15 -0000	1.4
+++ healpix.spec	27 Dec 2009 16:30:46 -0000	1.5
@@ -1,5 +1,5 @@
 # EPEL hack
-%global %{_fmoddir} %{_libdir}/gfortran/modules
+%global _fmoddir %{_libdir}/gfortran/modules
 
 Name:           healpix
 Version:        2.13a



From jussilehtola at fedoraproject.org  Sun Dec 27 16:34:25 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:34:25 +0000 (UTC)
Subject: rpms/sympy/EL-5 sources,1.2,1.3 sympy.spec,1.1,1.2
Message-ID: <20091227163425.C4B1311C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/sympy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8945/EL-5

Modified Files:
	sources sympy.spec 
Log Message:
Update to 0.6.6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sympy/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Oct 2008 20:06:53 -0000	1.2
+++ sources	27 Dec 2009 16:34:25 -0000	1.3
@@ -1 +1 @@
-60f5edddeb72cd0e700363901fe94ab5  sympy-0.6.2.tar.gz
+aa7be690a1df7e7415fe968f5e076733  sympy-0.6.6.tar.gz


Index: sympy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sympy/EL-5/sympy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sympy.spec	15 Oct 2008 20:06:53 -0000	1.1
+++ sympy.spec	27 Dec 2009 16:34:25 -0000	1.2
@@ -1,16 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           sympy
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.6.6
+Release:        1%{?dist}
 Summary:        A Python library for symbolic mathematics
 Group:          Development/Languages
 License:        BSD
 URL:            http://code.google.com/p/sympy/
 Source0:        http://sympy.googlecode.com/files/%{name}-%{version}.tar.gz
-# Patch0 submitted upstream:
-#   http://code.google.com/p/sympy/issues/detail?id=1156
-Patch0:         sympy-0.6.2-remove-extraneous-shebangs.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,7 +23,6 @@ Python and does not require any external
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -34,23 +30,43 @@ Python and does not require any external
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+# Remove extra files
+rm -f %{buildroot}%{_bindir}/{,doc}test
  
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/sympy/
+%{python_sitelib}/sympy-%{version}-*.egg-info
 %{_bindir}/isympy
 %{_mandir}/man1/isympy.1*
 
 
 %changelog
+* Sun Dec 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.6.6-1
+- Update to 0.6.6.
+
+* Sat Nov 07 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.6.5-1
+- Update to 0.6.5.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 4 2008 Conrad Meyer <konrad at tylerc.org> - 0.6.3-1
+- Bump to 0.6.3, supports python 2.6.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.2-3
+- Rebuild for Python 2.6
+
 * Mon Oct 13 2008 Conrad Meyer <konrad at tylerc.org> - 0.6.2-2
 - Patch to remove extraneous shebangs.
 



From jussilehtola at fedoraproject.org  Sun Dec 27 16:41:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 27 Dec 2009 16:41:23 +0000 (UTC)
Subject: rpms/sympy/EL-5 sympy.spec,1.2,1.3
Message-ID: <20091227164123.073C811C00CF@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/sympy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10154

Modified Files:
	sympy.spec 
Log Message:
EPEL fixes to spec file.


Index: sympy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sympy/EL-5/sympy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sympy.spec	27 Dec 2009 16:34:25 -0000	1.2
+++ sympy.spec	27 Dec 2009 16:41:22 -0000	1.3
@@ -12,7 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-
+BuildRequires:	python-setuptools
 
 %description
 SymPy aims to become a full-featured computer algebra system (CAS)
@@ -26,12 +26,11 @@ Python and does not require any external
 
 
 %build
-%{__python} setup.py build
-
+python -c 'import setuptools; execfile("setup.py")' build
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+python -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 # Remove extra files
 rm -f %{buildroot}%{_bindir}/{,doc}test
  



From pkgdb at fedoraproject.org  Sun Dec 27 17:11:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 17:11:30 +0000
Subject: [pkgdb] teeworlds (Fedora, 12) updated by toshio
Message-ID: <20091227171129.6A03210F8B4@bastion.fedoraproject.org>

toshio changed owner of teeworlds in Fedora 12 to linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 17:11:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 17:11:30 +0000
Subject: [pkgdb] teeworlds (Fedora, devel) updated by toshio
Message-ID: <20091227171129.7B5CA10F8C7@bastion.fedoraproject.org>

toshio changed owner of teeworlds in Fedora devel to linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pkgdb at fedoraproject.org  Sun Dec 27 17:11:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 17:11:30 +0000
Subject: [pkgdb] teeworlds (Fedora, 11) updated by toshio
Message-ID: <20091227171129.8ED0B10F8DA@bastion.fedoraproject.org>

toshio changed owner of teeworlds in Fedora 11 to linuxdonald

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/teeworlds



From pfj at fedoraproject.org  Sun Dec 27 17:11:40 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 27 Dec 2009 17:11:40 +0000 (UTC)
Subject: rpms/monodevelop-debugger-mdb/devel import.log, 1.4,
	1.5 monodevelop-debugger-mdb.spec, 1.5, 1.6
Message-ID: <20091227171140.D128A11C00CF@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15375/devel

Modified Files:
	import.log monodevelop-debugger-mdb.spec 
Log Message:

Spec file fix for 64 bit 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	27 Dec 2009 10:05:04 -0000	1.4
+++ import.log	27 Dec 2009 17:11:40 -0000	1.5
@@ -2,3 +2,4 @@ monodevelop-debugger-mdb-2_0-1_fc10:HEAD
 monodevelop-debugger-mdb-2_1_0-1_fc12:HEAD:monodevelop-debugger-mdb-2.1.0-1.fc12.src.rpm:1252874834
 monodevelop-debugger-mdb-2_2-2_fc13:HEAD:monodevelop-debugger-mdb-2.2-2.fc13.src.rpm:1261873414
 monodevelop-debugger-mdb-2_2-3_fc13:HEAD:monodevelop-debugger-mdb-2.2-3.fc13.src.rpm:1261908206
+monodevelop-debugger-mdb-2_2-4_fc13:HEAD:monodevelop-debugger-mdb-2.2-4.fc13.src.rpm:1261933848


Index: monodevelop-debugger-mdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop-debugger-mdb/devel/monodevelop-debugger-mdb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- monodevelop-debugger-mdb.spec	27 Dec 2009 10:05:04 -0000	1.5
+++ monodevelop-debugger-mdb.spec	27 Dec 2009 17:11:40 -0000	1.6
@@ -4,7 +4,7 @@
 Summary:        MonoDevelop Debugger Addin
 Name:           monodevelop-debugger-mdb
 Version:        2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        MIT
 Group:          Development/Tools
 Source:         http://www.monodevelop.com/Downloads/%{name}-%{version}.tar.bz2
@@ -49,14 +49,14 @@ make
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{assembly_path}
-if [ %{_libdir} != "/usr/lib" ];
-then
-       mv %{buildroot}%{_prefix}/lib/monodevelop/AddIns/MonoDevelop.Debugger/DebuggerClient.dll* \
-              %{buildroot}%{assembly_path}
-       mv %{buildroot}%{_prefix}/lib/monodevelop/AddIns/MonoDevelop.Debugger/DebuggerServer.exe* \
-              %{buildroot}%{assembly_path}
-       rm -r %{buildroot}/usr/lib ;
-fi ;
+#if [ %{_libdir} != "/usr/lib" ];
+#then
+#       mv %{buildroot}%{_prefix}/lib/monodevelop/AddIns/MonoDevelop.Debugger/DebuggerClient.dll* \
+#              %{buildroot}%{assembly_path}
+#       mv %{buildroot}%{_prefix}/lib/monodevelop/AddIns/MonoDevelop.Debugger/DebuggerServer.exe* \
+#              %{buildroot}%{assembly_path}
+#       rm -r %{buildroot}/usr/lib ;
+#fi ;
 
 %clean
 rm -rf %{buildroot}
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono.debugging.backend.mdb.pc
 
 %changelog
+* Sun Dec 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-4
+- Another attempt at getting 64 bit working by fixing the spec file!
+
 * Sun Dec 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-3
 - Fix for x86_64
 



From sharkcz at fedoraproject.org  Sun Dec 27 17:14:14 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun, 27 Dec 2009 17:14:14 +0000 (UTC)
Subject: File hercules-svn5570.tar.bz2 uploaded to lookaside cache by sharkcz
Message-ID: <20091227171414.8002010F88B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for hercules:

7e7c04d17117f8bc86871e1aa5c6f457  hercules-svn5570.tar.bz2



From sharkcz at fedoraproject.org  Sun Dec 27 17:24:32 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun, 27 Dec 2009 17:24:32 +0000 (UTC)
Subject: rpms/hercules/devel .cvsignore, 1.9, 1.10 hercules.spec, 1.29,
	1.30 sources, 1.9, 1.10 hercules-force-hfp-unnormalized.patch,
	1.1, NONE
Message-ID: <20091227172432.EF36911C00CF@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17873

Modified Files:
	.cvsignore hercules.spec sources 
Removed Files:
	hercules-force-hfp-unnormalized.patch 
Log Message:
* Sun Dec 27 2009 Dan Hor?k <dan[at]danny.cz> 3.06-8.20091227svn5570
- updated to svn revision 5570
- dropped the force-hfp-unnormalized patch, because the feature is now implemented



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Dec 2009 10:56:46 -0000	1.9
+++ .cvsignore	27 Dec 2009 17:24:32 -0000	1.10
@@ -1 +1 @@
-hercules-svn5544.tar.bz2
+hercules-svn5570.tar.bz2


Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- hercules.spec	15 Dec 2009 10:56:48 -0000	1.29
+++ hercules.spec	27 Dec 2009 17:24:32 -0000	1.30
@@ -1,13 +1,14 @@
-%global svnrev 5544
+%global svnrev 5570
 
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 7.20091214svn5544%{?dist}
+Release: 8.20091227svn%{svnrev}%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
 #Source0: http://www.hercules-390.org/%{name}-%{version}.tar.gz
+# fedora-getsvn hercules svn://svn.hercules-390.org/hercules/trunk %{svnrev}
 Source0: %{name}-svn%{svnrev}.tar.bz2
 Source1: hercules.cnf
 Source2: hercules-run
@@ -15,8 +16,7 @@ Source3: README-rpm
 Source4: generic.prm
 Patch0: %{name}-3.05-make.patch
 Patch1: %{name}-3.06-ltdl.patch
-Patch2: %{name}-force-hfp-unnormalized.patch
-Patch3: %{name}-intltoolize.patch
+Patch2: %{name}-intltoolize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
@@ -39,7 +39,6 @@ printer-keyboard, 3270 terminal, and 328
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # refresh for recent libtool
 rm -f autoconf/libtool.m4
@@ -112,6 +111,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 27 2009 Dan Hor?k <dan[at]danny.cz> 3.06-8.20091227svn5570
+- updated to svn revision 5570
+- dropped the force-hfp-unnormalized patch, because the feature is now implemented
+
 * Mon Dec 14 2009 Dan Hor?k <dan[at]danny.cz> 3.06-7.20091214svn5544
 - updated to svn revision 5544
 - added workaround for booting Fedora kernels requiring z9 or better


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Dec 2009 10:56:49 -0000	1.9
+++ sources	27 Dec 2009 17:24:32 -0000	1.10
@@ -1 +1 @@
-4a2ca4b822fadf26287681dadca7d8c8  hercules-svn5544.tar.bz2
+7e7c04d17117f8bc86871e1aa5c6f457  hercules-svn5570.tar.bz2


--- hercules-force-hfp-unnormalized.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Dec 27 19:24:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 19:24:37 +0000
Subject: [pkgdb] libhugetlbfs: aarapov has requested commit
Message-ID: <20091227192436.D66A410F88B@bastion.fedoraproject.org>

aarapov has requested the commit acl on libhugetlbfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs



From pkgdb at fedoraproject.org  Sun Dec 27 19:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 19:24:48 +0000
Subject: [pkgdb] libhugetlbfs: aarapov has given up watchbugzilla
Message-ID: <20091227192451.E42D010F88B@bastion.fedoraproject.org>

aarapov has given up the watchbugzilla acl on libhugetlbfs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs



From pkgdb at fedoraproject.org  Sun Dec 27 19:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 19:24:54 +0000
Subject: [pkgdb] libhugetlbfs: aarapov has given up watchcommits
Message-ID: <20091227192452.EF92410F878@bastion.fedoraproject.org>

aarapov has given up the watchcommits acl on libhugetlbfs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs



From pkgdb at fedoraproject.org  Sun Dec 27 19:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 19:24:56 +0000
Subject: [pkgdb] libhugetlbfs: aarapov has requested commit
Message-ID: <20091227192453.EA0A110F878@bastion.fedoraproject.org>

aarapov has requested the commit acl on libhugetlbfs (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs



From pkgdb at fedoraproject.org  Sun Dec 27 19:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 19:24:58 +0000
Subject: [pkgdb] libhugetlbfs: aarapov has given up watchcommits
Message-ID: <20091227192457.E488910F8B2@bastion.fedoraproject.org>

aarapov has given up the watchcommits acl on libhugetlbfs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs



From pkgdb at fedoraproject.org  Sun Dec 27 19:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 19:24:59 +0000
Subject: [pkgdb] libhugetlbfs: aarapov has requested commit
Message-ID: <20091227192458.A575810F8BA@bastion.fedoraproject.org>

aarapov has requested the commit acl on libhugetlbfs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs



From pkgdb at fedoraproject.org  Sun Dec 27 19:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 19:25:15 +0000
Subject: [pkgdb] libhugetlbfs: aarapov has given up watchbugzilla
Message-ID: <20091227192501.7BAD110F8B2@bastion.fedoraproject.org>

aarapov has given up the watchbugzilla acl on libhugetlbfs (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libhugetlbfs



From roma at fedoraproject.org  Sun Dec 27 20:32:32 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Sun, 27 Dec 2009 20:32:32 +0000 (UTC)
Subject: File fmcontrol.tar.gz uploaded to lookaside cache by roma
Message-ID: <20091227203232.36F6010F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fmtools:

8accad958c3f0cd0fb582aad922857aa  fmcontrol.tar.gz



From roma at fedoraproject.org  Sun Dec 27 20:33:26 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Sun, 27 Dec 2009 20:33:26 +0000 (UTC)
Subject: rpms/fmtools/F-12 .cvsignore, 1.3, 1.4 fmtools.desktop, 1.2,
	1.3 fmtools.spec, 1.9, 1.10 import.log, 1.4, 1.5 sources, 1.3,
	1.4 fmtools-videodev2.patch, 1.1, NONE
Message-ID: <20091227203326.BA08211C00CF@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/fmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12620/F-12

Modified Files:
	.cvsignore fmtools.desktop fmtools.spec import.log sources 
Removed Files:
	fmtools-videodev2.patch 
Log Message:
replaced fmcontrol for fmcontrol.py


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Dec 2009 11:22:43 -0000	1.3
+++ .cvsignore	27 Dec 2009 20:33:26 -0000	1.4
@@ -1,2 +1,2 @@
-fmcontrol.tar.gz
 fmtools-2.0.tar.gz
+fmcontrol.tar.gz


Index: fmtools.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fmtools.desktop	24 Dec 2009 10:26:36 -0000	1.2
+++ fmtools.desktop	27 Dec 2009 20:33:26 -0000	1.3
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=tkradio
-Comment=Tcl/Tk wrapper for fmtools
+Comment=Python/Tk wrapper for fmtools
 Exec=tkradio.py
 Icon=radio
 Terminal=0


Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fmtools.spec	25 Dec 2009 16:21:11 -0000	1.9
+++ fmtools.spec	27 Dec 2009 20:33:26 -0000	1.10
@@ -1,14 +1,12 @@
-%bcond_with rhel
 Summary: Simple Video for Linux radio card programs
 Name:    fmtools
 Version: 2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.stanford.edu/~blp/fmtools/
 Source0: http://benpfaff.org/fmtools/fmtools/%{name}-%{version}.tar.gz
 Patch0:  fmtools.patch
-Patch1:  fmtools-videodev2.patch
 Source1: fmcontrol.tar.gz
 Source2: http://www.stanford.edu/~blp/fmtools/tkradio
 Source3: http://www.stanford.edu/~blp/fmtools/tkradio-mute
@@ -26,44 +24,31 @@ and create wrappers or new programs base
 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.
-
 %package tkradio
 Summary:       Python/Tk wrapper for fmtools
 Group:         Applications/Multimedia
 BuildRequires: desktop-file-utils
 Requires:      %{name} = %{version}
 Requires:      python, tkinter, alsa-utils
-%{!?with_rhel:BuildArch: noarch}
+BuildArch:     noarch
 
 %description tkradio
 This package provides a GUI for %{name}.
-The stations are read from the same files used by fmcontrol:
-$HOME/.fmrc or $HOME/.radiostations.
+The stations are read from the same files used by fmcontrol.
+
+The script fmcontrol.py saves one from remembering frequencies
+and volumes when using the "fm" program from %{name}.
+All that it does is to tune into a station specified by name, at the
+frequency and volume specified in $HOME/.fmrc or $HOME/.radiostations,
+or the volume given on the command line.
 
 %prep
 %setup -q -a1
 %patch0 -p1 -b .fmtools
-%patch1 -p1 -b .videodev2
-
-# Add shebang to fmcontrol
-sed -i '1i#!/bin/sh' fmcontrol/fmcontrol
 
 %build
 %configure
-make %{_smp_mflags} \
-%if %{with rhel}
-     CFLAGS="$RPM_OPT_FLAGS -D__RHEL5_VIDEODEV2__"
-%endif
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -71,7 +56,7 @@ make DESTDIR=%{buildroot} install
 install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/tkradio.tcl
 install -pm 0755 %{SOURCE3} %{buildroot}%{_bindir}/tkradio-mute.tcl
 install -pm 0755 %{SOURCE6} %{buildroot}%{_bindir}/tkradio.py
-install -pm 0755 fmcontrol/fmcontrol %{buildroot}%{_bindir}
+install -pm 0755 fmcontrol/fmcontrol %{buildroot}%{_bindir}/fmcontrol.py
 install -pm 0644 fmcontrol/README README.fmcontrol
 
 # menu entry
@@ -87,22 +72,23 @@ rm -rf %{buildroot}
 
 %files 
 %defattr(-,root,root,-)
-%doc README COPYING README.fmcontrol fmcontrol/dot.*
-# Executables and man pages
+%doc README COPYING
 %{_bindir}/fm
 %{_bindir}/fmscan
-%{_bindir}/fmcontrol
 
 %files tkradio
 %defattr(-,root,root,-)
+%doc README.fmcontrol fmcontrol/dot.*
 %{_bindir}/tkradio*
+%{_bindir}/fmcontrol.py
 %{_datadir}/applications/fmtools.desktop
 %{_datadir}/pixmaps/radio.png
 
 %changelog
 
-* Sun Dec 25 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-6
-- Patched videodev2 for RHEL5.
+* Sun Dec 27 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-7
+- Replaced fmcontrol for fmcontrol.py
+- Moved fmcontrol to tkradio package.
 
 * Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-5
 - Replaced BR tk for tkinter.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	25 Dec 2009 16:21:11 -0000	1.4
+++ import.log	27 Dec 2009 20:33:26 -0000	1.5
@@ -2,3 +2,4 @@ fmtools-2_0-3_fc12:F-12:fmtools-2.0-3.fc
 fmtools-2_0-4_fc12:F-12:fmtools-2.0-4.fc12.src.rpm:1261650364
 fmtools-2_0-5_fc12:F-12:fmtools-2.0-5.fc12.src.rpm:1261655654
 fmtools-2_0-6_fc12:F-12:fmtools-2.0-6.fc12.src.rpm:1261758030
+fmtools-2_0-7_fc12:F-12:fmtools-2.0-7.fc12.src.rpm:1261945933


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Dec 2009 11:22:43 -0000	1.3
+++ sources	27 Dec 2009 20:33:26 -0000	1.4
@@ -1,2 +1,2 @@
-fe40296a7515f506c6b46a0ec7f056eb  fmcontrol.tar.gz
 807467a8bccae32317c6bdb6c5329ab3  fmtools-2.0.tar.gz
+8accad958c3f0cd0fb582aad922857aa  fmcontrol.tar.gz


--- fmtools-videodev2.patch DELETED ---



From cassmodiah at fedoraproject.org  Sun Dec 27 21:06:27 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Sun, 27 Dec 2009 21:06:27 +0000 (UTC)
Subject: rpms/i3/devel i3.spec,1.3,1.4
Message-ID: <20091227210627.0B1FE11C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17456

Modified Files:
	i3.spec 
Log Message:
* Sun Dec 27 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-2
- Add missing Requires for a functional minimal (not comfortable) i3-system. (The requirements provides functions which are used in the standard configfile)
- Build manpages and add them to main-pkg
- Build doxygen generated documentation and add them to the documentation subpackage



Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/devel/i3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- i3.spec	25 Dec 2009 23:10:37 -0000	1.3
+++ i3.spec	27 Dec 2009 21:06:26 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           i3
 Version:        3.d.bf1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Improved tiling window manager
 
 Group:          User Interface/Desktops
@@ -19,7 +19,10 @@ BuildRequires:  libxkbfile-devel
 BuildRequires:  libX11-devel
 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  asciidoc
 Requires:       rxvt-unicode
+Requires:       xorg-x11-apps
+Requires:       dmenu
 
 
 %description
@@ -36,12 +39,13 @@ Please be aware that i3 is primarily tar
 %package doc
 Summary:        Documentation for %{name}
 Group:          Documentation
-BuildRequires:  asciidoc
+BuildRequires:  doxygen
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
 
 %description doc
-Asciidoc generated documentations for %{name}.
+Asciidoc and doxygen generated documentations for %{name}.
 
 
 %prep
@@ -59,15 +63,26 @@ sed -e 's|CFLAGS += -Wunused|CFLAGS += -
 
 %build
 make %{?_smp_mflags}
-cd docs; make %{?_smp_mflags}
+
+cd man; make %{?_smp_mflags}
+cd ../docs; make %{?_smp_mflags}
+
+cd ..
+doxygen pseudo-doc.doxygen
+mv pseudo-doc/html pseudo-doc/doxygen 
 
 
 %install
 rm -rf %{buildroot}
+
 make install \
      DESTDIR=%{buildroot} \
      INSTALL="install -p"
 
+mkdir -p %{buildroot}/%{_mandir}/man1/
+install -Dpm0644 man/*.1 \
+        %{buildroot}/%{_mandir}/man1/
+
 
 %clean
 rm -rf %{buildroot}
@@ -76,23 +91,27 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc GOALS LICENSE RELEASE-NOTES-%{upstream_version}
-%{_bindir}/%{name}
-%{_bindir}/%{name}-input
-%{_bindir}/%{name}-msg
+%{_bindir}/%{name}*
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/config
 %config %{_sysconfdir}/%{name}/welcome
 %{_datadir}/xsessions/%{name}.desktop
+%{_mandir}/man1/%{name}*
 
 
 %files doc
 %defattr(-,root,root,-)
-%doc docs/*.{html,png}
+%doc docs/*.{html,png} pseudo-doc/doxygen/
 
 
 %changelog
+* Sun Dec 27 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-2
+- Add missing Requires for a functional minimal (not comfortable) i3-system. (The requirements provides functions which are used in the standard configfile)
+- Build manpages and add them to main-pkg
+- Build doxygen generated documentation and add them to the documentation subpackage
+
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-1
-- Correct version (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
+- Correct version-tag (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
 - Add more documentation (generated with asciidoc)
 
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-bf1_1



From cassmodiah at fedoraproject.org  Sun Dec 27 21:06:29 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Sun, 27 Dec 2009 21:06:29 +0000 (UTC)
Subject: rpms/i3/F-12 i3.spec,1.3,1.4
Message-ID: <20091227210629.152D911C00CF@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17474

Modified Files:
	i3.spec 
Log Message:
* Sun Dec 27 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-2
- Add missing Requires for a functional minimal (not comfortable) i3-system. (The requirements provides functions which are used in the standard configfile)
- Build manpages and add them to main-pkg
- Build doxygen generated documentation and add them to the documentation subpackage



Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/i3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- i3.spec	25 Dec 2009 23:10:55 -0000	1.3
+++ i3.spec	27 Dec 2009 21:06:28 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           i3
 Version:        3.d.bf1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Improved tiling window manager
 
 Group:          User Interface/Desktops
@@ -19,7 +19,10 @@ BuildRequires:  libxkbfile-devel
 BuildRequires:  libX11-devel
 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  asciidoc
 Requires:       rxvt-unicode
+Requires:       xorg-x11-apps
+Requires:       dmenu
 
 
 %description
@@ -36,12 +39,13 @@ Please be aware that i3 is primarily tar
 %package doc
 Summary:        Documentation for %{name}
 Group:          Documentation
-BuildRequires:  asciidoc
+BuildRequires:  doxygen
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
 
 %description doc
-Asciidoc generated documentations for %{name}.
+Asciidoc and doxygen generated documentations for %{name}.
 
 
 %prep
@@ -59,15 +63,26 @@ sed -e 's|CFLAGS += -Wunused|CFLAGS += -
 
 %build
 make %{?_smp_mflags}
-cd docs; make %{?_smp_mflags}
+
+cd man; make %{?_smp_mflags}
+cd ../docs; make %{?_smp_mflags}
+
+cd ..
+doxygen pseudo-doc.doxygen
+mv pseudo-doc/html pseudo-doc/doxygen 
 
 
 %install
 rm -rf %{buildroot}
+
 make install \
      DESTDIR=%{buildroot} \
      INSTALL="install -p"
 
+mkdir -p %{buildroot}/%{_mandir}/man1/
+install -Dpm0644 man/*.1 \
+        %{buildroot}/%{_mandir}/man1/
+
 
 %clean
 rm -rf %{buildroot}
@@ -76,23 +91,27 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc GOALS LICENSE RELEASE-NOTES-%{upstream_version}
-%{_bindir}/%{name}
-%{_bindir}/%{name}-input
-%{_bindir}/%{name}-msg
+%{_bindir}/%{name}*
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/config
 %config %{_sysconfdir}/%{name}/welcome
 %{_datadir}/xsessions/%{name}.desktop
+%{_mandir}/man1/%{name}*
 
 
 %files doc
 %defattr(-,root,root,-)
-%doc docs/*.{html,png}
+%doc docs/*.{html,png} pseudo-doc/doxygen/
 
 
 %changelog
+* Sun Dec 27 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-2
+- Add missing Requires for a functional minimal (not comfortable) i3-system. (The requirements provides functions which are used in the standard configfile)
+- Build manpages and add them to main-pkg
+- Build doxygen generated documentation and add them to the documentation subpackage
+
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-1
-- Correct version (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
+- Correct version-tag (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
 - Add more documentation (generated with asciidoc)
 
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-bf1_1



From epienbro at fedoraproject.org  Sun Dec 27 21:13:34 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sun, 27 Dec 2009 21:13:34 +0000 (UTC)
Subject: rpms/par2cmdline/devel par2-tbb-disable-concurrent-support.patch, 1.1,
	1.2 par2cmdline.spec, 1.14, 1.15
Message-ID: <20091227211334.BC87811C00CF@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/par2cmdline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18667

Modified Files:
	par2-tbb-disable-concurrent-support.patch par2cmdline.spec 
Log Message:
Fixed PPC build failure (BZ #550818)


par2-tbb-disable-concurrent-support.patch:
 par2cmdline.h |    3 +++
 1 file changed, 3 insertions(+)

Index: par2-tbb-disable-concurrent-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/par2cmdline/devel/par2-tbb-disable-concurrent-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- par2-tbb-disable-concurrent-support.patch	3 Aug 2009 16:16:24 -0000	1.1
+++ par2-tbb-disable-concurrent-support.patch	27 Dec 2009 21:13:34 -0000	1.2
@@ -1,13 +1,5 @@
 --- par2cmdline.h.orig	2009-07-31 18:33:00.825819583 +0200
 +++ par2cmdline.h	2009-07-31 18:33:24.414821405 +0200
-@@ -428,6 +428,7 @@
- #include <vector>
- #include <map>
- #include <algorithm>
-+#include <memory>
-
- #include <ctype.h>
- #include <iostream>
 @@ -449,9 +449,12 @@
  #endif
  #define offsetof(TYPE, MEMBER) ((size_t) ((char*)(&((TYPE *)1)->MEMBER) - (char*)1))


Index: par2cmdline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/par2cmdline/devel/par2cmdline.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- par2cmdline.spec	12 Dec 2009 11:48:50 -0000	1.14
+++ par2cmdline.spec	27 Dec 2009 21:13:34 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:        PAR 2.0 compatible file verification and repair tool
 Name:           par2cmdline
 Version:        0.4.tbb.%{revision}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
 Source:         http://www.chuchusoft.com/par2_tbb/par2cmdline-0.4-tbb-%{revision}.tar.gz
@@ -83,6 +83,9 @@ make check-TESTS
 
 
 %changelog
+* Sun Dec 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.4.tbb.20090203-4
+- Fixed PPC build failure (BZ #550818)
+
 * Sat Dec 12 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.4.tbb.20090203-3
 - Rebuild for new tbb
 



From pghmcfc at fedoraproject.org  Sun Dec 27 21:33:24 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Sun, 27 Dec 2009 21:33:24 +0000 (UTC)
Subject: rpms/gtkwave/devel .cvsignore, 1.59, 1.60 gtkwave.spec, 1.68,
	1.69 sources, 1.59, 1.60
Message-ID: <20091227213324.22A1111C00CF@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21650

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
- update to 3.3.0
- added tk support
- bundled old liblzma replaced by system xz (add BR: xz-devel)
- tcl/tk support require Fedora >= 2 or RHEL >= 4 (tcl 8.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	4 Sep 2009 11:25:37 -0000	1.59
+++ .cvsignore	27 Dec 2009 21:33:23 -0000	1.60
@@ -1 +1 @@
-gtkwave-3.2.3.tar.gz
+gtkwave-3.3.0.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- gtkwave.spec	4 Sep 2009 11:25:37 -0000	1.68
+++ gtkwave.spec	27 Dec 2009 21:33:23 -0000	1.69
@@ -2,17 +2,21 @@
 
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.2.3
+Version:	3.3.0
 Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
 Source0:	http://gtkwave.sourceforge.net/gtkwave-%{version}%{?prerel}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk2-devel, bzip2-devel, zlib-devel, gperf, flex
+BuildRequires:	gtk2-devel, bzip2-devel, xz-devel, zlib-devel, gperf, flex
+%if 0%{?fedora} > 1 || 0%{?rhel} > 3
 # BR: /usr/include/tcl.h rather than tcl-devel for compatibility with
 # old releases prior to tcl-devel split
-BuildRequires:	/usr/include/tcl.h
+BuildRequires:	/usr/include/tcl.h /usr/include/tk.h
+# We need tcl >= 8.4 (FC-2 onwards)
+BuildRequires:	tcl >= 8.4
+%endif
 
 %description
 GTKWave is a waveform viewer that can view VCD files produced by most Verilog
@@ -23,7 +27,7 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
-# Fix permissions in bundled liblzma for debuginfo
+# Fix permissions in lzma encapsulation for debuginfo
 %{__chmod} -x src/liblzma/*.[ch]
 
 # Note that GTKWave is a GUI application but no desktop entry is provided for it.
@@ -103,6 +107,12 @@ done
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Sat Dec 26 2009 Paul Howarth <paul at city-fan.org> 3.3.0-1
+- update to 3.3.0
+- added tk support
+- bundled old liblzma replaced by system xz (add BR: xz-devel)
+- tcl/tk support require Fedora >= 2 or RHEL >= 4 (tcl 8.4)
+
 * Fri Sep  4 2009 Paul Howarth <paul at city-fan.org> 3.2.3-1
 - update to 3.2.3
 - fix permissions in bundled liblzma for debuginfo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	4 Sep 2009 11:25:37 -0000	1.59
+++ sources	27 Dec 2009 21:33:23 -0000	1.60
@@ -1 +1 @@
-dcc427903a8f5e958c099f108958dce8  gtkwave-3.2.3.tar.gz
+cfaa180de37100f3f9daa53d60df426b  gtkwave-3.3.0.tar.gz



From pkgdb at fedoraproject.org  Sun Dec 27 21:39:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:39:36 +0000
Subject: [pkgdb] grass: devrim has given up watchbugzilla
Message-ID: <20091227213939.944DE10F8A9@bastion.fedoraproject.org>

devrim has given up the watchbugzilla acl on grass (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:39:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:39:41 +0000
Subject: [pkgdb] grass: devrim has requested commit
Message-ID: <20091227213940.7794510F8BA@bastion.fedoraproject.org>

devrim has requested the commit acl on grass (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:39:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:39:43 +0000
Subject: [pkgdb] grass: devrim has requested approveacls
Message-ID: <20091227213941.6716B10F8BA@bastion.fedoraproject.org>

devrim has requested the approveacls acl on grass (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:39:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:39:57 +0000
Subject: [pkgdb] grass: devrim has given up watchcommits
Message-ID: <20091227213943.1ADD910F88B@bastion.fedoraproject.org>

devrim has given up the watchcommits acl on grass (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:39:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:39:45 +0000
Subject: [pkgdb] grass: devrim has given up watchbugzilla
Message-ID: <20091227213944.A134C10F8B2@bastion.fedoraproject.org>

devrim has given up the watchbugzilla acl on grass (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:39:48 +0000
Subject: [pkgdb] grass: devrim has requested commit
Message-ID: <20091227213945.90F6C10F8C4@bastion.fedoraproject.org>

devrim has requested the commit acl on grass (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:39:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:39:47 +0000
Subject: [pkgdb] grass: devrim has requested approveacls
Message-ID: <20091227213946.B350710F8C3@bastion.fedoraproject.org>

devrim has requested the approveacls acl on grass (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:40:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:40:02 +0000
Subject: [pkgdb] grass: devrim has given up watchcommits
Message-ID: <20091227213948.9EE1E10F8A9@bastion.fedoraproject.org>

devrim has given up the watchcommits acl on grass (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:40:09 +0000
Subject: [pkgdb] grass: devrim has given up commit
Message-ID: <20091227213955.132CC10F88B@bastion.fedoraproject.org>

devrim has given up the commit acl on grass (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:39:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:39:57 +0000
Subject: [pkgdb] grass: devrim has requested commit
Message-ID: <20091227213956.AE8F110F8A9@bastion.fedoraproject.org>

devrim has requested the commit acl on grass (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:40:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:40:08 +0000
Subject: [pkgdb] grass: devrim has given up watchbugzilla
Message-ID: <20091227214012.07B5910F8A9@bastion.fedoraproject.org>

devrim has given up the watchbugzilla acl on grass (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:40:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:40:14 +0000
Subject: [pkgdb] grass: devrim has requested commit
Message-ID: <20091227214013.43FA010F8C3@bastion.fedoraproject.org>

devrim has requested the commit acl on grass (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:40:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:40:17 +0000
Subject: [pkgdb] grass: devrim has requested approveacls
Message-ID: <20091227214014.D152B10F8A9@bastion.fedoraproject.org>

devrim has requested the approveacls acl on grass (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From pkgdb at fedoraproject.org  Sun Dec 27 21:40:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 27 Dec 2009 21:40:30 +0000
Subject: [pkgdb] grass: devrim has given up watchcommits
Message-ID: <20091227214015.98AB910F88B@bastion.fedoraproject.org>

devrim has given up the watchcommits acl on grass (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grass



From devrim at fedoraproject.org  Sun Dec 27 21:59:03 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 27 Dec 2009 21:59:03 +0000 (UTC)
Subject: rpms/postgis/F-12 postgis.spec,1.29,1.30
Message-ID: <20091227215903.C16B711C00CF@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25592

Modified Files:
	postgis.spec 
Log Message:
Spec file updates for 1.4.1.



Index: postgis.spec
===================================================================
RCS file: /cvs/extras/rpms/postgis/F-12/postgis.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- postgis.spec	20 Dec 2009 00:08:05 -0000	1.29
+++ postgis.spec	27 Dec 2009 21:59:03 -0000	1.30
@@ -97,7 +97,9 @@ rm -f  %{buildroot}%{_datadir}/*.sql
 
 if [ "%{_libdir}" = "/usr/lib64" ] ; then
 	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis-64.sql
-	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade-64.sql
+	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_12_to_14.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_12_to_14-64.sql
+	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_13_to_14.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_13_to_14-64.sql
+	mv %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_14_minor.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis_upgrade_14_minor-64.sql	
 fi
 
 %if %javabuild
@@ -163,7 +165,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Sun Dec 20 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.4.1-1
-- Fix spec, per bz #536860
+- Update to 1.4.1
 
 * Sun Nov 22 2009 Devrim G?ND?Z <devrim at gunduz.org> - 1.4.0-3
 - Fix spec, per bz #536860



From vpv at fedoraproject.org  Sun Dec 27 22:38:37 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun, 27 Dec 2009 22:38:37 +0000 (UTC)
Subject: File moin-1.9.0.tar.gz uploaded to lookaside cache by vpv
Message-ID: <20091227223837.4E48910F8A9@bastion.fedoraproject.org>

A file has been added to the lookaside cache for moin:

2d1a8d5e78961f1e2ce86b6f3df86ba2  moin-1.9.0.tar.gz



From vpv at fedoraproject.org  Sun Dec 27 22:40:11 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun, 27 Dec 2009 22:40:11 +0000 (UTC)
Subject: rpms/moin/devel .cvsignore, 1.17, 1.18 README-rpm, 1.3, 1.4 moin.spec,
	1.31, 1.32 sources, 1.17, 1.18
Message-ID: <20091227224011.8176F11C00CF@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31296

Modified Files:
	.cvsignore README-rpm moin.spec sources 
Log Message:
* Mon Dec 26 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.9.0-1
- 1.9.0
- Don't remove any FCKeditor directories, all known security issues in it
  should be fixed by now
- Updated README-rpm, only give an example on mod_wsgi configuration, Moin is
  a pure WSGI application now
- Change the Python magic encoding comment in wiki/config/wikiconfig.py to
  UTF-8
- Change url_prefix_static in wiki/config/wikiconfig.py to better suit the
  configuration example in README-rpm, where the wiki is served from 
  example.tld/mywiki
- wiki/server/moin.wsgi adds the directory it is in to the Python search path,
  as the wikiconfig.py file will be in the same directory as moin.wsgi if Moin
  is set up according to the example in README-rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	15 Sep 2009 13:36:28 -0000	1.17
+++ .cvsignore	27 Dec 2009 22:40:10 -0000	1.18
@@ -1 +1 @@
-moin-1.8.5.tar.gz
+moin-1.9.0.tar.gz


Index: README-rpm
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/README-rpm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README-rpm	14 Apr 2009 20:37:44 -0000	1.3
+++ README-rpm	27 Dec 2009 22:40:10 -0000	1.4
@@ -10,6 +10,15 @@ It's very important to read the document
 especially when upgrading to a newer version of this package! 'rpm -qd moin'
 should give a list of the documentation files in this package.
 
+Moin is a pure WSGI application since 1.9.0, this README will guide you
+through a basic setup with Apache and mod_wsgi. Make sure you have the
+mod_wsgi package installed from the Fedora package repository. Refer to the
+Moin website for documentation about setting up Moin with FCGI/SCGI/CGI or
+with other web servers such as lighttpd.
+
+Since 1.9.0 Moin runs a server to serve the static files itself from the path
+defined in the url_prefix_static variable in wikiconfig.py.
+
 Set up a wiki instance
 ----------------------
 
@@ -18,107 +27,41 @@ First you need a wiki instance, which ca
 #!/bin/sh
 DESTDIR=/var/www/mywiki
 mkdir -p $DESTDIR
-cp -a /usr/share/moin/{data,underlay,htdocs} $DESTDIR
-chown -R apache:apache $DESTDIR/{data,underlay,htdocs}
-
-These instructions also copy the htdocs directory, which includes the static
-content, such as images, themes, favicon.ico and robots.txt. You can also use
-the /usr/share/moin/htdocs directory, but that prevents you from editing the
-favicon or robots.txt or adding new themes. Another option is to symlink
-the files and directories you can use from /usr/share/moin/htdocs and only
-copy the files you need to edit.
+cp -a /usr/share/moin/{data,underlay} $DESTDIR
+chown -R apache:apache $DESTDIR/{data,underlay}
 
-Set up Moin using mod_wsgi
---------------------------
-
-This is the recommended way of using Moin with Apache. First install the
-mod_wsgi package from Fedora's package repository.
-
-Remember to change the line Alias /moin_static182/ "$DESTDIR/htdocs/"
-according to the Moin version. For example 182 is for Moin version 1.8.2.
+Set up Moin
+-----------
 
 #!/bin/sh
 DESTDIR=/var/www/mywiki
-mkdir -p $DESTDIR/config
-cp -a /usr/share/moin/server/moin.wsgi $DESTDIR/config
-cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/config
+mkdir -p $DESTDIR
+cp -a /usr/share/moin/server/moin.wsgi $DESTDIR
+cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR
 cat > /etc/httpd/conf.d/mywiki.conf <<EOF
-# this is for icons, css, js (and must match url_prefix from wiki config):
-Alias /moin_static182/ "$DESTDIR/htdocs/"
-<Directory "$DESTDIR/htdocs/">
-    Options Indexes
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
 # this is the URL http://servername/mywiki/ you will use later to invoke moin:
-WSGIScriptAlias /mywiki "$DESTDIR/config/moin.wsgi"
-<Directory "$DESTDIR/config">
-    Options None
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
+WSGIScriptAlias /mywiki "$DESTDIR/moin.wsgi"
+
 # The WSGI socket needs to be somewhere Apache has access to
 WSGISocketPrefix /var/run/moin-wsgi
+
 # in case you want your wiki under the root url (http://servername/), use this instead:
 #Alias /robots.txt $DESTDIR/htdocs/robots.txt
 #Alias /favicon.ico $DESTDIR/htdocs/favicon.ico
-#WSGIScriptAlias / $DESTDIR/config/moin.wsgi
-# create some wsgi daemons - use someuser.somegroup same as your data_dir:
-WSGIDaemonProcess moin user=apache group=apache processes=5 threads=10 maximum-requests=1000 umask=0007 display-name=wsgi-moin
+#WSGIScriptAlias / $DESTDIR/moin.wsgi
+
+# create some wsgi daemons:
+WSGIDaemonProcess moin user=apache group=apache processes=5 threads=10 maximum-requests=1000 umask=0007 umask=0007 display-name=wsgi-moin
+
 # use the daemons we defined above to process requests!
 WSGIProcessGroup moin
+
 # This is required if you plan to use HTTP authorization. Without it the user name won't
 # be passed to MoinMoin. 
 #WSGIPassAuthorization On
 EOF
 
-Edit /var/www/mywiki/config/moin.wsgi and add
-sys.path.insert(0, '/var/www/mywiki/config') after the comment lines.
-
-Edit /var/www/mywiki/config/wikiconfig.py to have something like the
-following (it's Python, spaces and quotes matter):
-    data_dir = '/var/www/mywiki/data/'
-    data_underlay_dir = '/var/www/mywiki/underlay/'
-
-Finally do a "service httpd restart".
-
-Set up Moin using CGI
----------------------
-
-This is quite slow, using mod_wsgi is recommended.
-
-Remember to change the line Alias /moin_static182/ "$DESTDIR/htdocs/"
-according to the Moin version. For example 182 is for Moin version 1.8.2.
-
-#!/bin/sh
-DESTDIR=/var/www/mywiki
-mkdir -p $DESTDIR/cgi-bin
-cp -a /usr/share/moin/server/moin.cgi $DESTDIR/cgi-bin
-cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin
-cat > /etc/httpd/conf.d/mywiki.conf <<EOF
-ScriptAlias /mywiki "$DESTDIR/cgi-bin/moin.cgi"
-<Directory "$DESTDIR/cgi-bin/">
-    Options ExecCGI
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-Alias /moin_static182 "$DESTDIR/htdocs/"
-<Directory "$DESTDIR/htdocs/">
-    Options Indexes
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-EOF
-
-Edit /etc/httpd/conf/httpd.conf to include "AddHandler cgi-script .cgi".
-Edit /var/www/mywiki/cgi-bin/wikiconfig.py to have something like the
-following (it's Python, spaces and quotes matter):
-    data_dir = '/var/www/mywiki/data/'
-    data_underlay_dir = '/var/www/mywiki/underlay/'
-
-Finally do a "service httpd restart".
+The moin.wsgi file adds $DESTDIR to the Python search path, so Python should be
+able to find wikiconfig.py automatically.
+Finally, restart Apache by doing a "service httpd restart".
 


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/moin.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- moin.spec	15 Sep 2009 13:36:28 -0000	1.31
+++ moin.spec	27 Dec 2009 22:40:10 -0000	1.32
@@ -2,7 +2,7 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.8.5
+Version: 1.9.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -21,9 +21,16 @@ editable web pages.
 
 %prep
 %setup -q
-# The filemanager directory included vulnerable code in the past, it shouldn't
-# anymore, but let's remove it just to be sure.
-rm -r wiki/htdocs/applets/FCKeditor/editor/filemanager/
+# Change the encoding to UTF-8, users are likely to edit this file
+sed -i -e 's|coding: iso-8859-1|coding: utf-8|' wiki/config/wikiconfig.py
+# Remove the leading comment from url_prefix_static. The Moin default assumes
+# the wiki is served from the root of the site, change it to better suit the
+# example in README-rpm, in which the wiki is served from
+# example.tld/mywiki
+sed -i -e 's|\(#\)\(url_prefix_static.*\)|\2|' wiki/config/wikiconfig.py
+# Add the directory containing moin.wsgi to the Python search path, as
+# in the README-rpm example these files will be in the same directory.
+sed -i -e "s|#sys.path.insert(0, '/path/to/wikiconfigdir')|sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))|" wiki/server/moin.wsgi
 
 
 %build
@@ -54,6 +61,21 @@ rm -r wiki/htdocs/applets/FCKeditor/edit
 
 
 %changelog
+* Mon Dec 26 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.9.0-1
+- 1.9.0
+- Don't remove any FCKeditor directories, all known security issues in it
+  should be fixed by now
+- Updated README-rpm, only give an example on mod_wsgi configuration, Moin is
+  a pure WSGI application now
+- Change the Python magic encoding comment in wiki/config/wikiconfig.py to
+  UTF-8
+- Change url_prefix_static in wiki/config/wikiconfig.py to better suit the
+  configuration example in README-rpm, where the wiki is served from 
+  example.tld/mywiki
+- wiki/server/moin.wsgi adds the directory it is in to the Python search path,
+  as the wikiconfig.py file will be in the same directory as moin.wsgi if Moin
+  is set up according to the example in README-rpm
+
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.5-1
 - 1.8.5
 - Includes multiple bug fixes, a new FCKeditor version and some new features


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	15 Sep 2009 13:36:28 -0000	1.17
+++ sources	27 Dec 2009 22:40:10 -0000	1.18
@@ -1 +1 @@
-779543d32dacc904c306d5d8ace99207  moin-1.8.5.tar.gz
+2d1a8d5e78961f1e2ce86b6f3df86ba2  moin-1.9.0.tar.gz



From vpv at fedoraproject.org  Sun Dec 27 22:50:45 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun, 27 Dec 2009 22:50:45 +0000 (UTC)
Subject: rpms/moin/devel 001_CVE-2008-0781_attach_file_XSS.patch, 1.1,
	NONE 002_CVE-2008-0781_attach_file_XSS.patch, 1.1, NONE
Message-ID: <20091227225045.A400211C00CF@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv482

Removed Files:
	001_CVE-2008-0781_attach_file_XSS.patch 
	002_CVE-2008-0781_attach_file_XSS.patch 
Log Message:
Remove old, unneeded patches from CVS


--- 001_CVE-2008-0781_attach_file_XSS.patch DELETED ---


--- 002_CVE-2008-0781_attach_file_XSS.patch DELETED ---



From vpv at fedoraproject.org  Sun Dec 27 23:16:31 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun, 27 Dec 2009 23:16:31 +0000 (UTC)
Subject: File moin-1.8.6.tar.gz uploaded to lookaside cache by vpv
Message-ID: <20091227231631.3261E10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for moin:

72ded308ed8c5a4517b04e6fb3ee0529  moin-1.8.6.tar.gz



From vpv at fedoraproject.org  Sun Dec 27 23:18:07 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun, 27 Dec 2009 23:18:07 +0000 (UTC)
Subject: rpms/moin/F-12 .cvsignore, 1.17, 1.18 moin.spec, 1.31, 1.32 sources, 
	1.17, 1.18
Message-ID: <20091227231807.BA3BF11C00CF@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3980

Modified Files:
	.cvsignore moin.spec sources 
Log Message:
* Mon Dec 28 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.6-1
- 1.8.6, mostly bug fixes
- http://hg.moinmo.in/moin/1.8/raw-file/1.8.6/docs/CHANGES



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	15 Sep 2009 13:36:28 -0000	1.17
+++ .cvsignore	27 Dec 2009 23:18:06 -0000	1.18
@@ -1 +1 @@
-moin-1.8.5.tar.gz
+moin-1.8.6.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-12/moin.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- moin.spec	15 Sep 2009 13:36:28 -0000	1.31
+++ moin.spec	27 Dec 2009 23:18:06 -0000	1.32
@@ -2,7 +2,7 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.8.5
+Version: 1.8.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -54,6 +54,10 @@ rm -r wiki/htdocs/applets/FCKeditor/edit
 
 
 %changelog
+* Mon Dec 28 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.6-1
+- 1.8.6, mostly bug fixes
+- http://hg.moinmo.in/moin/1.8/raw-file/1.8.6/docs/CHANGES
+
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.5-1
 - 1.8.5
 - Includes multiple bug fixes, a new FCKeditor version and some new features


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	15 Sep 2009 13:36:28 -0000	1.17
+++ sources	27 Dec 2009 23:18:06 -0000	1.18
@@ -1 +1 @@
-779543d32dacc904c306d5d8ace99207  moin-1.8.5.tar.gz
+72ded308ed8c5a4517b04e6fb3ee0529  moin-1.8.6.tar.gz



From vpv at fedoraproject.org  Sun Dec 27 23:20:10 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun, 27 Dec 2009 23:20:10 +0000 (UTC)
Subject: rpms/moin/F-11 .cvsignore, 1.17, 1.18 moin.spec, 1.30, 1.31 sources, 
	1.17, 1.18
Message-ID: <20091227232011.0945711C0335@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4345

Modified Files:
	.cvsignore moin.spec sources 
Log Message:
* Mon Dec 28 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.6-1
- 1.8.6, mostly bug fixes
- http://hg.moinmo.in/moin/1.8/raw-file/1.8.6/docs/CHANGES



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	15 Sep 2009 13:46:50 -0000	1.17
+++ .cvsignore	27 Dec 2009 23:20:10 -0000	1.18
@@ -1 +1 @@
-moin-1.8.5.tar.gz
+moin-1.8.6.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-11/moin.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- moin.spec	15 Sep 2009 13:46:50 -0000	1.30
+++ moin.spec	27 Dec 2009 23:20:10 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: MoinMoin is a WikiEngine to collaborate on easily editable web pages
 Name: moin
-Version: 1.8.5
+Version: 1.8.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -54,11 +54,18 @@ rm -r wiki/htdocs/applets/FCKeditor/edit
 
 
 %changelog
+* Mon Dec 28 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.6-1
+- 1.8.6, mostly bug fixes
+- http://hg.moinmo.in/moin/1.8/raw-file/1.8.6/docs/CHANGES
+
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.8.5-1
 - 1.8.5
 - Includes multiple bug fixes, a new FCKeditor version and some new features
 - http://hg.moinmo.in/moin/1.8/raw-file/1.8.5/docs/CHANGES
 
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jul 12 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.8.4-2
 - Remove the filemanager directory from the embedded FCKeditor, it contains
   code with know security vulnerabilities, even though that code couldn't


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moin/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	15 Sep 2009 13:46:50 -0000	1.17
+++ sources	27 Dec 2009 23:20:10 -0000	1.18
@@ -1 +1 @@
-779543d32dacc904c306d5d8ace99207  moin-1.8.5.tar.gz
+72ded308ed8c5a4517b04e6fb3ee0529  moin-1.8.6.tar.gz



From vpv at fedoraproject.org  Mon Dec 28 00:10:17 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 28 Dec 2009 00:10:17 +0000 (UTC)
Subject: rpms/moin/F-12 001_CVE-2008-0781_attach_file_XSS.patch, 1.1,
	NONE 002_CVE-2008-0781_attach_file_XSS.patch, 1.1, NONE
Message-ID: <20091228001018.1188411C00CF@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11152

Removed Files:
	001_CVE-2008-0781_attach_file_XSS.patch 
	002_CVE-2008-0781_attach_file_XSS.patch 
Log Message:
Remove old, unneeded patches


--- 001_CVE-2008-0781_attach_file_XSS.patch DELETED ---


--- 002_CVE-2008-0781_attach_file_XSS.patch DELETED ---



From vpv at fedoraproject.org  Mon Dec 28 00:10:47 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 28 Dec 2009 00:10:47 +0000 (UTC)
Subject: rpms/moin/F-11 001_CVE-2008-0781_attach_file_XSS.patch, 1.1,
	NONE 002_CVE-2008-0781_attach_file_XSS.patch, 1.1, NONE
Message-ID: <20091228001047.A2A6711C00CF@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/moin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11260

Removed Files:
	001_CVE-2008-0781_attach_file_XSS.patch 
	002_CVE-2008-0781_attach_file_XSS.patch 
Log Message:
Remove old, unneeded patches


--- 001_CVE-2008-0781_attach_file_XSS.patch DELETED ---


--- 002_CVE-2008-0781_attach_file_XSS.patch DELETED ---



From mschwendt at fedoraproject.org  Mon Dec 28 00:26:07 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 28 Dec 2009 00:26:07 +0000 (UTC)
Subject: rpms/audacity/F-12 audacity-1.3.10-resample.patch, NONE,
	1.1 audacity.spec, 1.88, 1.89
Message-ID: <20091228002607.17CC911C00CF@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13618

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.10-resample.patch 
Log Message:
* Mon Dec 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.2.beta
- Patch resampling call to not set end_of_input flag for all sample buffers.


audacity-1.3.10-resample.patch:
 AudioIO.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.10-resample.patch ---
This changes the "end_of_input" parameter from True to False,
because if setting it to True for all buffers, resampling stops early
(reproducible with libsamplerate 0.1.7).

diff -Nur audacity-src-1.3.10-orig/src/AudioIO.cpp audacity-src-1.3.10/src/AudioIO.cpp
--- audacity-src-1.3.10-orig/src/AudioIO.cpp	2009-12-01 20:32:08.000000000 +0100
+++ audacity-src-1.3.10/src/AudioIO.cpp	2009-12-28 00:50:11.906619016 +0100
@@ -2253,7 +2253,7 @@
                samplePtr temp2 = NewSamples(size, floatSample);
                mCaptureBuffers[i]->Get(temp1, floatSample, avail);
 
-               size = mResample[i]->Process(mFactor, (float *)temp1, avail, true,
+               size = mResample[i]->Process(mFactor, (float *)temp1, avail, false,
                                             &size, (float *)temp2, size);
                mCaptureTracks[i]-> Append(temp2, floatSample, size, 1, 
                                           &appendLog);


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-12/audacity.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- audacity.spec	9 Dec 2009 18:08:57 -0000	1.88
+++ audacity.spec	28 Dec 2009 00:26:06 -0000	1.89
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.10
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -19,6 +19,7 @@ Patch1: audacity-1.3.7-libmp3lame-defaul
 Patch2: audacity-1.3.9-libdir.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 Patch7: audacity-1.3.9-getmaxpeak.patch
+Patch8: audacity-1.3.10-resample.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -71,6 +72,7 @@ grep -q -s __RPM_LIB * -R && exit 1
 %patch6 -p1 -b .vamp-1.3
 %endif
 %patch7 -p1 -b .getmaxpeak
+%patch8 -p1 -b .resample
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -146,6 +148,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Dec 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.2.beta
+- Patch resampling call to not set end_of_input flag for all sample buffers.
+
 * Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
 - Upgrade to 1.3.10-beta.
 



From mschwendt at fedoraproject.org  Mon Dec 28 00:27:57 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 28 Dec 2009 00:27:57 +0000 (UTC)
Subject: rpms/audacity/devel audacity-1.3.10-resample.patch, NONE,
	1.1 audacity.spec, 1.88, 1.89
Message-ID: <20091228002757.95DEA11C00CF@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14006

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.10-resample.patch 
Log Message:
* Mon Dec 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.2.beta
- Patch resampling call to not set end_of_input flag for all sample buffers.


audacity-1.3.10-resample.patch:
 AudioIO.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.10-resample.patch ---
This changes the "end_of_input" parameter from True to False,
because if setting it to True for all buffers, resampling stops early
(reproducible with libsamplerate 0.1.7).

diff -Nur audacity-src-1.3.10-orig/src/AudioIO.cpp audacity-src-1.3.10/src/AudioIO.cpp
--- audacity-src-1.3.10-orig/src/AudioIO.cpp	2009-12-01 20:32:08.000000000 +0100
+++ audacity-src-1.3.10/src/AudioIO.cpp	2009-12-28 00:50:11.906619016 +0100
@@ -2253,7 +2253,7 @@
                samplePtr temp2 = NewSamples(size, floatSample);
                mCaptureBuffers[i]->Get(temp1, floatSample, avail);
 
-               size = mResample[i]->Process(mFactor, (float *)temp1, avail, true,
+               size = mResample[i]->Process(mFactor, (float *)temp1, avail, false,
                                             &size, (float *)temp2, size);
                mCaptureTracks[i]-> Append(temp2, floatSample, size, 1, 
                                           &appendLog);


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- audacity.spec	4 Dec 2009 20:53:01 -0000	1.88
+++ audacity.spec	28 Dec 2009 00:27:57 -0000	1.89
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.10
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -19,6 +19,7 @@ Patch1: audacity-1.3.7-libmp3lame-defaul
 Patch2: audacity-1.3.9-libdir.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 Patch7: audacity-1.3.9-getmaxpeak.patch
+Patch8: audacity-1.3.10-resample.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -71,6 +72,7 @@ grep -q -s __RPM_LIB * -R && exit 1
 %patch6 -p1 -b .vamp-1.3
 %endif
 %patch7 -p1 -b .getmaxpeak
+%patch8 -p1 -b .resample
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -146,6 +148,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Dec 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.2.beta
+- Patch resampling call to not set end_of_input flag for all sample buffers.
+
 * Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
 - Upgrade to 1.3.10-beta.
 



From mschwendt at fedoraproject.org  Mon Dec 28 00:28:53 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 28 Dec 2009 00:28:53 +0000 (UTC)
Subject: rpms/audacity/F-11 audacity-1.3.10-resample.patch, NONE,
	1.1 audacity.spec, 1.80, 1.81
Message-ID: <20091228002853.21C7711C00CF@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14250

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.10-resample.patch 
Log Message:
* Mon Dec 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.2.beta
- Patch resampling call to not set end_of_input flag for all sample buffers.


audacity-1.3.10-resample.patch:
 AudioIO.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.10-resample.patch ---
This changes the "end_of_input" parameter from True to False,
because if setting it to True for all buffers, resampling stops early
(reproducible with libsamplerate 0.1.7).

diff -Nur audacity-src-1.3.10-orig/src/AudioIO.cpp audacity-src-1.3.10/src/AudioIO.cpp
--- audacity-src-1.3.10-orig/src/AudioIO.cpp	2009-12-01 20:32:08.000000000 +0100
+++ audacity-src-1.3.10/src/AudioIO.cpp	2009-12-28 00:50:11.906619016 +0100
@@ -2253,7 +2253,7 @@
                samplePtr temp2 = NewSamples(size, floatSample);
                mCaptureBuffers[i]->Get(temp1, floatSample, avail);
 
-               size = mResample[i]->Process(mFactor, (float *)temp1, avail, true,
+               size = mResample[i]->Process(mFactor, (float *)temp1, avail, false,
                                             &size, (float *)temp2, size);
                mCaptureTracks[i]-> Append(temp2, floatSample, size, 1, 
                                           &appendLog);


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/audacity.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- audacity.spec	9 Dec 2009 18:08:57 -0000	1.80
+++ audacity.spec	28 Dec 2009 00:28:53 -0000	1.81
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.10
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -19,6 +19,7 @@ Patch1: audacity-1.3.7-libmp3lame-defaul
 Patch2: audacity-1.3.9-libdir.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
 Patch7: audacity-1.3.9-getmaxpeak.patch
+Patch8: audacity-1.3.10-resample.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -71,6 +72,7 @@ grep -q -s __RPM_LIB * -R && exit 1
 %patch6 -p1 -b .vamp-1.3
 %endif
 %patch7 -p1 -b .getmaxpeak
+%patch8 -p1 -b .resample
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -146,6 +148,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Dec 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.2.beta
+- Patch resampling call to not set end_of_input flag for all sample buffers.
+
 * Fri Dec  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.1.beta
 - Upgrade to 1.3.10-beta.
 



From sergiopr at fedoraproject.org  Mon Dec 28 01:03:35 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Mon, 28 Dec 2009 01:03:35 +0000 (UTC)
Subject: rpms/chktex/devel chktex.spec,1.4,1.5
Message-ID: <20091228010335.314B511C00CF@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/chktex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19468

Modified Files:
	chktex.spec 
Log Message:
* Mon Dec 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.6.4-6
- Virtual requires on latex



Index: chktex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chktex/devel/chktex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- chktex.spec	24 Jul 2009 18:55:53 -0000	1.4
+++ chktex.spec	28 Dec 2009 01:03:35 -0000	1.5
@@ -1,15 +1,13 @@
 Summary: LaTex semantic checker
 Name: chktex
 Version: 1.6.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Engineering
 Source0: http://baruch.ev-en.org/proj/chktex/%{name}-%{version}.tar.gz
 URL: http://baruch.ev-en.org/proj/chktex/
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: tetex-latex
-BuildRequires: %{_bindir}/ps2pdf
-BuildRequires: latex2html perl lynx
+BuildRequires: tex(latex) ghostscript latex2html perl lynx
 BuildRequires: ncurses-devel
 
 %description
@@ -24,19 +22,19 @@ Filters are also provided for checking t
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
-%{__make} ChkTeX.pdf ChkTeX.readme
+make %{?_smp_mflags}
+make ChkTeX.pdf ChkTeX.readme
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install INSTALL='install -p'
-%{__cp} -p chktex.1 chkweb.1 %{buildroot}%{_mandir}/man1/
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install INSTALL='install -p'
+cp -p chktex.1 chkweb.1 %{buildroot}%{_mandir}/man1/
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %check
-%{__make} %{?_smp_mflags} check
+make %{?_smp_mflags} check
 
 
 %files
@@ -51,6 +49,9 @@ Filters are also provided for checking t
 %{_mandir}/man1/deweb.1*
 
 %changelog
+* Mon Dec 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.6.4-6
+- Virtual requires on latex
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sergiopr at fedoraproject.org  Mon Dec 28 01:12:23 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Mon, 28 Dec 2009 01:12:23 +0000 (UTC)
Subject: rpms/rubber/devel rubber.spec,1.5,1.6
Message-ID: <20091228011223.7F46411C00EF@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rubber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20810

Modified Files:
	rubber.spec 
Log Message:
* Mon Dec 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-7
- Adding virtual dependency on latex (bz #550792)



Index: rubber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/devel/rubber.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubber.spec	27 Jul 2009 03:19:22 -0000	1.5
+++ rubber.spec	28 Dec 2009 01:12:23 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name: rubber
 Version: 1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: An automated system for building LaTeX documents
 
 Group: Applications/Publishing
@@ -15,6 +15,7 @@ Patch0: rubber-python26.patch
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires: python-devel texinfo
+Requires: tex(latex)
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -66,10 +67,13 @@ fi
 %{_mandir}/fr/man1/*.gz
 
 %changelog
+* Mon Dec 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-7
+- Adding virtual dependency on latex (bz #550792)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Jun 15 2009 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-5
+* Mon Jun 15 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-5
 - Patch to remove a Deprecation Warning in Python 2.6 (bz #506053)
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
@@ -78,9 +82,9 @@ fi
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.1-3
 - Rebuild for Python 2.6
 
-* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-2
+* Wed Sep 17 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-2
 - ***
 
-* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-1
+* Wed Sep 17 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-1
 - Initial specfile
 



From sergiopr at fedoraproject.org  Mon Dec 28 01:19:11 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Mon, 28 Dec 2009 01:19:11 +0000 (UTC)
Subject: rpms/rubber/F-12 rubber.spec,1.5,1.6
Message-ID: <20091228011911.0945311C00EF@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rubber/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21894

Modified Files:
	rubber.spec 
Log Message:
* Mon Dec 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-7
- Adding virtual dependency on latex (bz #550792)



Index: rubber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/F-12/rubber.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubber.spec	27 Jul 2009 03:19:22 -0000	1.5
+++ rubber.spec	28 Dec 2009 01:19:10 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name: rubber
 Version: 1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: An automated system for building LaTeX documents
 
 Group: Applications/Publishing
@@ -15,6 +15,7 @@ Patch0: rubber-python26.patch
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires: python-devel texinfo
+Requires: tex(latex)
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -66,10 +67,13 @@ fi
 %{_mandir}/fr/man1/*.gz
 
 %changelog
+* Mon Dec 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-7
+- Adding virtual dependency on latex (bz #550792)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Jun 15 2009 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-5
+* Mon Jun 15 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-5
 - Patch to remove a Deprecation Warning in Python 2.6 (bz #506053)
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
@@ -78,9 +82,9 @@ fi
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.1-3
 - Rebuild for Python 2.6
 
-* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-2
+* Wed Sep 17 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-2
 - ***
 
-* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-1
+* Wed Sep 17 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-1
 - Initial specfile
 



From sergiopr at fedoraproject.org  Mon Dec 28 01:28:48 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Mon, 28 Dec 2009 01:28:48 +0000 (UTC)
Subject: rpms/rubber/F-11 rubber.spec,1.4,1.5
Message-ID: <20091228012848.BDD8611C00E8@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/rubber/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23572

Modified Files:
	rubber.spec 
Log Message:
* Mon Dec 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-6
- Adding virtual dependency on latex (bz #550792)



Index: rubber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubber/F-11/rubber.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rubber.spec	16 Jun 2009 08:40:05 -0000	1.4
+++ rubber.spec	28 Dec 2009 01:28:48 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name: rubber
 Version: 1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: An automated system for building LaTeX documents
 
 Group: Applications/Publishing
@@ -15,6 +15,7 @@ Patch0: rubber-python26.patch
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires: python-devel texinfo
+Requires: tex(latex)
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -66,7 +67,10 @@ fi
 %{_mandir}/fr/man1/*.gz
 
 %changelog
-* Tue Jun 16 2009 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-5
+* Mon Dec 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-6
+- Adding virtual dependency on latex (bz #550792)
+
+* Mon Jun 15 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-5
 - Patch to remove a Deprecation Warning in Python 2.6 (bz #506053)
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
@@ -75,9 +79,9 @@ fi
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.1-3
 - Rebuild for Python 2.6
 
-* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-2
+* Wed Sep 17 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-2
 - ***
 
-* Wed Sep 17 2008 Sergio Pascual <sergiops at fedoraproject.org> - 1.1-1
+* Wed Sep 17 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.1-1
 - Initial specfile
 



From wtogami at fedoraproject.org  Mon Dec 28 06:42:05 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 28 Dec 2009 06:42:05 +0000 (UTC)
Subject: rpms/spamassassin/devel sa-update.force-sysconfig, NONE,
	1.1 sa-update.cronscript, 1.5, 1.6 sa-update.crontab, 1.1,
	1.2 spamassassin.spec, 1.143, 1.144
Message-ID: <20091228064205.C863A11C008D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26014

Modified Files:
	sa-update.cronscript sa-update.crontab spamassassin.spec 
Added Files:
	sa-update.force-sysconfig 
Log Message:
- sa-update runs in cron automatically if spamd or amavisd is running
  If you use neither, you may force sa-update by editing /etc/sysconfig/sa-update.



--- NEW FILE sa-update.force-sysconfig ---
# Uncomment below to force nightly sa-update
# (you don't need to do this if you use spamd or amavisd)

#SAUPDATE=yes


Index: sa-update.cronscript
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sa-update.cronscript,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sa-update.cronscript	25 Sep 2009 04:15:56 -0000	1.5
+++ sa-update.cronscript	28 Dec 2009 06:42:03 -0000	1.6
@@ -1,11 +1,23 @@
 #!/bin/bash
 # *** DO NOT MODIFY THIS FILE ***
-# Edit /etc/cron.d/sa-update to enable nightly automatic updates
+#
 # /etc/mail/spamassassin/sa-update-channels.txt 
 #     Specify custom channels here
+#
 # /etc/mail/spamassassin/sa-update-keys.txt
 #     Specify trusted GPG keys for custom channels here
 
+# Proceed with sa-update if spam daemon is running or forced in /etc/sysconfig/sa-update
+unset SAUPDATE
+[ -f /etc/sysconfig/sa-update ] && . /etc/sysconfig/sa-update
+for daemon in spamd amavisd; do
+    /sbin/pidof $daemon >& /dev/null
+    [ $? -eq 0 ] && SAUPDATE=yes
+done
+
+# Skip sa-update if daemon not detected
+[ -z "$SAUPDATE" ] && exit 0
+
 # Sleep random amount of time before proceeding to avoid overwhelming the servers
 sleep $(expr $RANDOM % 7200)
 


Index: sa-update.crontab
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sa-update.crontab,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sa-update.crontab	14 Dec 2006 20:36:20 -0000	1.1
+++ sa-update.crontab	28 Dec 2009 06:42:03 -0000	1.2
@@ -1,9 +1,12 @@
-### OPTIONAL: Spamassassin Rules Updates ###
+# *** DO NOT MODIFY THIS FILE ***
+### Spamassassin Rules Updates ###
 #
 # http://wiki.apache.org/spamassassin/RuleUpdates
-# Highly recommended that you read the documentation before using this.
-# ENABLE UPDATES AT YOUR OWN RISK.
+# 
+# sa-update automatically updates your rules once per day if a spam daemon like
+# spamd or amavisd are running.  You can force sa-update to run in
+# /etc/sysconfig/sa-update
 #
 # /var/log/sa-update.log contains a history log of sa-update runs
 
-#10 4 * * * root /usr/share/spamassassin/sa-update.cron 2>&1 | tee -a /var/log/sa-update.log
+10 4 * * * root /usr/share/spamassassin/sa-update.cron 2>&1 | tee -a /var/log/sa-update.log


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- spamassassin.spec	22 Dec 2009 20:44:36 -0000	1.143
+++ spamassassin.spec	28 Dec 2009 06:42:03 -0000	1.144
@@ -1,7 +1,7 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
 #%%define rhel 4
 
-#%define _source_filedigest_algorithm md5
+%define _source_filedigest_algorithm md5
 
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
@@ -55,7 +55,7 @@ Name: spamassassin
 Version: 3.3.0
 %define prename rc1
 %define proposed .proposed2
-Release: 0.26.%{prename}%{?dist}
+Release: 0.27.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -68,6 +68,7 @@ Source5: spamassassin.sysconfig
 Source6: sa-update.logrotate
 Source7: sa-update.crontab
 Source8: sa-update.cronscript
+Source9: sa-update.force-sysconfig
 Source10: spamassassin-helper.sh
 Source11: sa-update-channels.txt
 Source12: sa-update-keys.txt
@@ -174,6 +175,7 @@ install -m 0644 %{SOURCE4} %buildroot/et
 install -m 0755 %{SOURCE10} %buildroot/etc/mail/spamassassin
 install -m 0644 %{SOURCE6} %buildroot/etc/logrotate.d/sa-update
 install -m 0644 %{SOURCE7} %buildroot/etc/cron.d/sa-update
+install -m 0644 %{SOURCE9} %buildroot%{_sysconfdir}/sysconfig/sa-update
 # installed mode 744 as non root users can't run it, but can read it.
 install -m 0744 %{SOURCE8} %buildroot%{_datadir}/spamassassin/sa-update.cron
 install -m 0644 %{SOURCE13} %buildroot%{_datadir}/spamassassin/
@@ -217,7 +219,8 @@ echo 783 > $RPM_BUILD_ROOT%{_sysconfdir}
 %{_initrddir}/spamassassin
 %config(noreplace) %{_sysconfdir}/mail/spamassassin
 %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin
-%config(noreplace) %{_sysconfdir}/cron.d/sa-update
+%config(noreplace) %{_sysconfdir}/sysconfig/sa-update
+%{_sysconfdir}/cron.d/sa-update
 %dir %{_datadir}/spamassassin
 %dir %{_localstatedir}/run/spamassassin
 %dir %{_localstatedir}/lib/spamassassin
@@ -261,6 +264,10 @@ fi
 exit 0
 
 %changelog
+* Mon Dec 28 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.27.rc1
+- sa-update runs in cron automatically if spamd or amavisd is running
+  If you use neither, you may force sa-update by editing /etc/sysconfig/sa-update.
+
 * Mon Dec 21 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.26.rc1
 - 3.3.0-rc1.proposed2 with fixed spamc
 



From green at fedoraproject.org  Mon Dec 28 06:52:58 2009
From: green at fedoraproject.org (green)
Date: Mon, 28 Dec 2009 06:52:58 +0000 (UTC)
Subject: File common-lisp-controller_6.20.tar.gz uploaded to lookaside cache
	by green
Message-ID: <20091228065258.BB05110F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for common-lisp-controller:

6fec77978ae23c7e62bda973b3e78590  common-lisp-controller_6.20.tar.gz



From green at fedoraproject.org  Mon Dec 28 06:55:29 2009
From: green at fedoraproject.org (green)
Date: Mon, 28 Dec 2009 06:55:29 +0000 (UTC)
Subject: rpms/common-lisp-controller/devel .cvsignore, 1.2,
	1.3 common-lisp-controller-fedora.patch, 1.1,
	1.2 common-lisp-controller.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <20091228065529.6F52511C008D@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/common-lisp-controller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28047

Modified Files:
	.cvsignore common-lisp-controller-fedora.patch 
	common-lisp-controller.spec sources 
Log Message:
Upgrade to version 6.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/common-lisp-controller/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Aug 2008 19:08:28 -0000	1.2
+++ .cvsignore	28 Dec 2009 06:55:28 -0000	1.3
@@ -1 +1 @@
-common-lisp-controller_6.15.tar.gz
+common-lisp-controller_6.20.tar.gz

common-lisp-controller-fedora.patch:
 common-lisp-controller.lisp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: common-lisp-controller-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/common-lisp-controller/devel/common-lisp-controller-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- common-lisp-controller-fedora.patch	31 Aug 2008 19:08:28 -0000	1.1
+++ common-lisp-controller-fedora.patch	28 Dec 2009 06:55:29 -0000	1.2
@@ -1,20 +1,11 @@
---- common-lisp-controller.lisp~	2008-01-03 09:46:44.000000000 -0800
-+++ common-lisp-controller.lisp	2008-01-03 09:47:07.000000000 -0800
+--- common-lisp-controller.lisp~	2009-12-28 01:30:11.803241497 -0500
++++ common-lisp-controller.lisp	2009-12-28 01:31:07.264978418 -0500
 @@ -60,7 +60,7 @@
    (setf *implementation-name* implementation-name)
    
    (pushnew :common-lisp-controller *features*)
--  (pushnew :clc-os-debian *features*)
-+  (pushnew :clc-os-fedora *features*)
+-  (pushnew :clc-os-debian *features*))
++  (pushnew :clc-os-fedora *features*))
  
-   ;; put the central registry at the *end*
-   ;; of the search list
-@@ -83,7 +83,7 @@
-   (setf *implementation-name* implementation-name)
- 
-   (pushnew :common-lisp-controller *features*)
--  (pushnew :clc-os-debian *features*)
-+  (pushnew :clc-os-fedora *features*)
- 
-   (let* ((fasl-root (merge-pathnames
- 		     (make-pathname
+ (defun compile-common-lisp-controller-v5 (implementation-name)
+   "Compiles the clc files. Returns a list of fasls


Index: common-lisp-controller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/common-lisp-controller/devel/common-lisp-controller.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- common-lisp-controller.spec	24 Jul 2009 19:16:13 -0000	1.7
+++ common-lisp-controller.spec	28 Dec 2009 06:55:29 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:      Common Lisp source and compiler manager
 Name:         common-lisp-controller
-Version:      6.15
-Release:      8%{?dist}
+Version:      6.20
+Release:      1%{?dist}
 URL:          https://alioth.debian.org/projects/clc
 Source0:      http://ftp.de.debian.org/debian/pool/main/c/common-lisp-controller/common-lisp-controller_%{version}.tar.gz
 Patch0:       common-lisp-controller-fedora.patch
@@ -18,8 +18,8 @@ It creates a user-specific cache of comp
 or an implementation is upgraded, all compiled objects in the cache
 are flushed. It also provides tools to recompile all libraries.
 
-%prep
-%setup -q
+%prep 
+%setup -q -n common-lisp-controller
 %patch0 -p0 
 %patch1 -p0 
 
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Sun Dec 27 2009 Anthony Green <green at redhat.com> 6.20-1
+- Upgrade.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.15-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/common-lisp-controller/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Aug 2008 19:08:28 -0000	1.2
+++ sources	28 Dec 2009 06:55:29 -0000	1.3
@@ -1 +1 @@
-1bf40df058333e43021db47ad2f8a332  common-lisp-controller_6.15.tar.gz
+6fec77978ae23c7e62bda973b3e78590  common-lisp-controller_6.20.tar.gz



From pravins at fedoraproject.org  Mon Dec 28 07:16:48 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Mon, 28 Dec 2009 07:16:48 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts/devel bug-549319.patch, 1.1,
	1.2 lohit-telugu-fonts.spec, 1.5, 1.6
Message-ID: <20091228071648.2DA7E11C008D@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-telugu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31188

Modified Files:
	bug-549319.patch lohit-telugu-fonts.spec 
Log Message:
* Mon Dec 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-3
- corrected patch 


bug-549319.patch:
 66-lohit-telugu.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: bug-549319.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/bug-549319.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bug-549319.patch	24 Dec 2009 10:57:44 -0000	1.1
+++ bug-549319.patch	28 Dec 2009 07:16:46 -0000	1.2
@@ -1,12 +1,6 @@
 diff -rup lohit-telugu-2.4.5/66-lohit-telugu.conf lohit-telugu-2.4.5_mod/66-lohit-telugu.conf
 --- lohit-telugu-2.4.5/66-lohit-telugu.conf	2009-11-25 12:47:59.000000000 +0530
-+++ lohit-telugu-2.4.5_mod/66-lohit-telugu.conf	2009-12-24 14:42:05.000000000 +0530
-@@ -1,4 +1,4 @@
--<?xml version="1.0" encoding="UTF-8"?>
-+<xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
- <fontconfig>
- <match>
++++ lohit-telugu-2.4.5_mod/66-lohit-telugu.conf	2009-12-28 12:43:39.000000000 +0530
 @@ -8,7 +8,7 @@
    <test name="family">
      <string>sans-serif</string>


Index: lohit-telugu-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/lohit-telugu-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lohit-telugu-fonts.spec	24 Dec 2009 10:57:44 -0000	1.5
+++ lohit-telugu-fonts.spec	28 Dec 2009 07:16:46 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Telugu font
 
 Group:          User Interface/X
@@ -54,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Dec 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-3
+- corrected patch 
+
 * Thu Dec 13 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-2
 - fixed bug 548686, license field
 



From akurtakov at fedoraproject.org  Mon Dec 28 08:21:57 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 28 Dec 2009 08:21:57 +0000 (UTC)
Subject: rpms/plexus-archiver/devel plexus-archiver.spec,1.9,1.10
Message-ID: <20091228082157.7B78911C008D@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7018/devel

Modified Files:
	plexus-archiver.spec 
Log Message:
Install depmap and pom to override common poms.


Index: plexus-archiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-archiver/devel/plexus-archiver.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- plexus-archiver.spec	23 Dec 2009 22:24:44 -0000	1.9
+++ plexus-archiver.spec	28 Dec 2009 08:21:56 -0000	1.10
@@ -32,12 +32,12 @@
 
 Name:           plexus-archiver
 Version:        1.0
-Release:        0.4.a12.3%{?dist}
+Release:        0.4.a12.4%{?dist}
 Epoch:          0
 Summary:        Plexus Archiver Component
 License:        MIT and ASL 2.0
 Group:          Development/Java
-URL:            http://plexus.codehaus.org/
+URL:            http://plexus.codehaus.org/plexus-components/plexus-archiver/
 Source0:        plexus-archiver-%{namedversion}-src.tar.bz2
 # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-archiver-1.0-alpha-12/
 # tar cjvf plexus-archiver-1.0-alpha-12-src.tar.bz2 plexus-archiver-1.0-alpha-12/
@@ -111,6 +111,13 @@ install -pm 644 target/%{name}-%{namedve
   $RPM_BUILD_ROOT%{_javadir}/plexus/archiver-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
                   do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+                  
+%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/plexus archiver
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -128,6 +135,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -135,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Dec 28 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a12.4
+- Install depmap and pom to override common poms.
+
 * Thu Dec 24 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a12.3
 - Really ignore test failures.
 



From jwrdegoede at fedoraproject.org  Mon Dec 28 09:02:45 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 28 Dec 2009 09:02:45 +0000 (UTC)
Subject: rpms/alienarena/F-12 alienarena-7.32-dga-compile-fix.patch,NONE,1.1
Message-ID: <20091228090245.386AE11C008D@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/alienarena/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12049

Added Files:
	alienarena-7.32-dga-compile-fix.patch 
Log Message:
* Sat Nov  7 2009 Hans de Goede <hdgoede at redhat.com> - 7.32-2
- dlopen openal.so.x, not openal.so.x.y. this fixes a crash on startup when
  the openal minor version has changed
- fix deprecation warning with latest libXxf86dga-devel


alienarena-7.32-dga-compile-fix.patch:
 gl_glx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE alienarena-7.32-dga-compile-fix.patch ---
diff -up alienarena-7.32/source/unix/gl_glx.c~ alienarena-7.32/source/unix/gl_glx.c
--- alienarena-7.32/source/unix/gl_glx.c~	2009-11-03 03:00:31.000000000 +0100
+++ alienarena-7.32/source/unix/gl_glx.c	2009-11-07 13:41:22.000000000 +0100
@@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include <X11/keysym.h>
 #include <X11/cursorfont.h>
 
-#include <X11/extensions/xf86dga.h>
+#include <X11/extensions/xf86dga1.h>
 #include <X11/extensions/xf86vmode.h>
 
 #include <GL/glx.h>



From dsd at fedoraproject.org  Mon Dec 28 11:37:46 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 28 Dec 2009 11:37:46 +0000 (UTC)
Subject: rpms/squeak-vm/devel squeak-vm.spec,1.4,1.5
Message-ID: <20091228113746.3B5B311C008D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/squeak-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30476

Modified Files:
	squeak-vm.spec 
Log Message:
add upstream patch to fix crackly sound output


Index: squeak-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squeak-vm/devel/squeak-vm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- squeak-vm.spec	27 Jul 2009 04:44:46 -0000	1.4
+++ squeak-vm.spec	28 Dec 2009 11:37:46 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           squeak-vm
 Version:        %{major}.%{minor}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Squeak virtual machine
 
 Group:          Development/Languages
@@ -18,6 +18,7 @@ Patch1:         squeak-vm-install-inisqu
 Patch2:         squeak-vm-imgdir.patch
 Patch3:         squeak-vm-tail-options.patch
 Patch4:         squeak-vm-dprintf.patch
+Patch5:         alsa-scratchy-sound.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): shared-mime-info
@@ -87,6 +88,7 @@ find platforms -name '*.[ch]' -exec chmo
 %patch2 -p1 -b .imgdir
 %patch3 -p1 -b .tail-options
 %patch4 -p1 -b .dprintf
+%patch5 -p1 -b .alsa-scratchy
 
 %build
 mkdir -p bld
@@ -218,6 +220,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Dec 28 2009 Daniel Drake <dsd at laptop.org> - 3.10.5-3
+- Add (already upstream) patch to fix crackly sound output
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dsd at fedoraproject.org  Mon Dec 28 11:40:25 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 28 Dec 2009 11:40:25 +0000 (UTC)
Subject: rpms/squeak-vm/devel alsa-scratchy-sound.patch, NONE,
	1.1 squeak-vm.spec, 1.5, 1.6
Message-ID: <20091228114025.CC3E411C008D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/squeak-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31037

Modified Files:
	squeak-vm.spec 
Added Files:
	alsa-scratchy-sound.patch 
Log Message:
add patch and retag

alsa-scratchy-sound.patch:
 sqUnixSoundALSA.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE alsa-scratchy-sound.patch ---
http://tracker.squeakland.org/browse/SQ-638
http://dev.laptop.org/ticket/9375

--- trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c	2008/04/28 19:04:11	1857
+++ trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c	2009/12/17 18:29:39	2147
@@ -2,7 +2,7 @@
  *
  * Author: Ian.Piumarta at squeakland.org
  * 
- * Last edited: 2008-04-21 14:48:26 by piumarta on emilia
+ * Last edited: 2009-12-17 10:26:20 by piumarta on ubuntu
  *
  *   Copyright (C) 2006 by Ian Piumarta
  *   All rights reserved.
@@ -168,7 +168,8 @@
   if (!output_handle) return 0;
 
   snd_pcm_delay(output_handle, &delay);
-  state= snd_pcm_state (output_handle);
+  snd_pcm_avail_update(output_handle);
+  state= snd_pcm_state(output_handle);
 
   /* if underrun causes, max delay is loosened */
   if (state == SND_PCM_STATE_XRUN)


Index: squeak-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squeak-vm/devel/squeak-vm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- squeak-vm.spec	28 Dec 2009 11:37:46 -0000	1.5
+++ squeak-vm.spec	28 Dec 2009 11:40:25 -0000	1.6
@@ -5,7 +5,7 @@
 
 Name:           squeak-vm
 Version:        %{major}.%{minor}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Squeak virtual machine
 
 Group:          Development/Languages
@@ -220,6 +220,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Dec 28 2009 Daniel Drake <dsd at laptop.org> - 3.10.5-4
+- forgot to add patch to cvs; retag
+
 * Mon Dec 28 2009 Daniel Drake <dsd at laptop.org> - 3.10.5-3
 - Add (already upstream) patch to fix crackly sound output
 



From dsd at fedoraproject.org  Mon Dec 28 11:45:24 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 28 Dec 2009 11:45:24 +0000 (UTC)
Subject: rpms/squeak-vm/F-12 alsa-scratchy-sound.patch, NONE,
	1.1 squeak-vm.spec, 1.4, 1.5
Message-ID: <20091228114524.0ABAA11C008D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/squeak-vm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31794

Modified Files:
	squeak-vm.spec 
Added Files:
	alsa-scratchy-sound.patch 
Log Message:
fix scratchy sound output

alsa-scratchy-sound.patch:
 sqUnixSoundALSA.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE alsa-scratchy-sound.patch ---
http://tracker.squeakland.org/browse/SQ-638
http://dev.laptop.org/ticket/9375

--- trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c	2008/04/28 19:04:11	1857
+++ trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c	2009/12/17 18:29:39	2147
@@ -2,7 +2,7 @@
  *
  * Author: Ian.Piumarta at squeakland.org
  * 
- * Last edited: 2008-04-21 14:48:26 by piumarta on emilia
+ * Last edited: 2009-12-17 10:26:20 by piumarta on ubuntu
  *
  *   Copyright (C) 2006 by Ian Piumarta
  *   All rights reserved.
@@ -168,7 +168,8 @@
   if (!output_handle) return 0;
 
   snd_pcm_delay(output_handle, &delay);
-  state= snd_pcm_state (output_handle);
+  snd_pcm_avail_update(output_handle);
+  state= snd_pcm_state(output_handle);
 
   /* if underrun causes, max delay is loosened */
   if (state == SND_PCM_STATE_XRUN)


Index: squeak-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squeak-vm/F-12/squeak-vm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- squeak-vm.spec	27 Jul 2009 04:44:46 -0000	1.4
+++ squeak-vm.spec	28 Dec 2009 11:45:23 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           squeak-vm
 Version:        %{major}.%{minor}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Squeak virtual machine
 
 Group:          Development/Languages
@@ -18,6 +18,7 @@ Patch1:         squeak-vm-install-inisqu
 Patch2:         squeak-vm-imgdir.patch
 Patch3:         squeak-vm-tail-options.patch
 Patch4:         squeak-vm-dprintf.patch
+Patch5:         alsa-scratchy-sound.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): shared-mime-info
@@ -87,6 +88,7 @@ find platforms -name '*.[ch]' -exec chmo
 %patch2 -p1 -b .imgdir
 %patch3 -p1 -b .tail-options
 %patch4 -p1 -b .dprintf
+%patch5 -p1 -b .alsa-scratchy
 
 %build
 mkdir -p bld
@@ -218,6 +220,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Dec 28 2009 Daniel Drake <dsd at laptop.org> - 3.10.5-3
+- Add (already upstream) patch to fix crackly sound output
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dsd at fedoraproject.org  Mon Dec 28 11:45:42 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 28 Dec 2009 11:45:42 +0000 (UTC)
Subject: rpms/squeak-vm/F-11 alsa-scratchy-sound.patch, NONE,
	1.1 squeak-vm.spec, 1.3, 1.4
Message-ID: <20091228114542.E06A011C008D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/squeak-vm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31958

Modified Files:
	squeak-vm.spec 
Added Files:
	alsa-scratchy-sound.patch 
Log Message:
fix crackly sound

alsa-scratchy-sound.patch:
 sqUnixSoundALSA.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE alsa-scratchy-sound.patch ---
http://tracker.squeakland.org/browse/SQ-638
http://dev.laptop.org/ticket/9375

--- trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c	2008/04/28 19:04:11	1857
+++ trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c	2009/12/17 18:29:39	2147
@@ -2,7 +2,7 @@
  *
  * Author: Ian.Piumarta at squeakland.org
  * 
- * Last edited: 2008-04-21 14:48:26 by piumarta on emilia
+ * Last edited: 2009-12-17 10:26:20 by piumarta on ubuntu
  *
  *   Copyright (C) 2006 by Ian Piumarta
  *   All rights reserved.
@@ -168,7 +168,8 @@
   if (!output_handle) return 0;
 
   snd_pcm_delay(output_handle, &delay);
-  state= snd_pcm_state (output_handle);
+  snd_pcm_avail_update(output_handle);
+  state= snd_pcm_state(output_handle);
 
   /* if underrun causes, max delay is loosened */
   if (state == SND_PCM_STATE_XRUN)


Index: squeak-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squeak-vm/F-11/squeak-vm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- squeak-vm.spec	21 Jul 2009 04:20:21 -0000	1.3
+++ squeak-vm.spec	28 Dec 2009 11:45:42 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           squeak-vm
 Version:        %{major}.%{minor}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Squeak virtual machine
 
 Group:          Development/Languages
@@ -18,6 +18,7 @@ Patch1:         squeak-vm-install-inisqu
 Patch2:         squeak-vm-imgdir.patch
 Patch3:         squeak-vm-tail-options.patch
 Patch4:         squeak-vm-dprintf.patch
+Patch5:         alsa-scratchy-sound.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): shared-mime-info
@@ -87,6 +88,7 @@ find platforms -name '*.[ch]' -exec chmo
 %patch2 -p1 -b .imgdir
 %patch3 -p1 -b .tail-options
 %patch4 -p1 -b .dprintf
+%patch5 -p1 -b .alsa-scratchy
 
 %build
 mkdir -p bld
@@ -218,6 +220,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Dec 28 2009 Daniel Drake <dsd at laptop.org> - 3.10.5-2
+- Add (already upstream) patch to fix crackly sound output
+
 * Mon Jul 20 2009 Gavin Romig-Koch <gavin at redhat.com> - 3.10.5-1
   - upgrade to new upstream
   - work around dprintf problem



From dsd at fedoraproject.org  Mon Dec 28 12:18:29 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 28 Dec 2009 12:18:29 +0000 (UTC)
Subject: File sugar-toolkit-0.84.8.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091228121829.BD0D710F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar-toolkit:

4da3f14ffaa179ebd867b862b9e7bf90  sugar-toolkit-0.84.8.tar.bz2



From dsd at fedoraproject.org  Mon Dec 28 12:25:35 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 28 Dec 2009 12:25:35 +0000 (UTC)
Subject: rpms/sugar-toolkit/F-11 .cvsignore, 1.36, 1.37 sources, 1.40,
	1.41 sugar-toolkit.spec, 1.50, 1.51
Message-ID: <20091228122536.257F811C008D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/sugar-toolkit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4360

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
v0.84.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	9 Dec 2009 11:58:12 -0000	1.36
+++ .cvsignore	28 Dec 2009 12:25:33 -0000	1.37
@@ -1 +1 @@
-sugar-toolkit-0.84.7.tar.bz2
+sugar-toolkit-0.84.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	9 Dec 2009 11:58:12 -0000	1.40
+++ sources	28 Dec 2009 12:25:34 -0000	1.41
@@ -1 +1 @@
-c0a4d413add78de90e99360f38a4534b  sugar-toolkit-0.84.7.tar.bz2
+4da3f14ffaa179ebd867b862b9e7bf90  sugar-toolkit-0.84.8.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-11/sugar-toolkit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sugar-toolkit.spec	9 Dec 2009 11:58:12 -0000	1.50
+++ sugar-toolkit.spec	28 Dec 2009 12:25:34 -0000	1.51
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.84.7
+Version: 0.84.8
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Mon Dec 28 2009 Daniel Drake <dsd at laptop.org> - 0.84.8-1
+- New release to fix font size setting
+
 * Wed Dec  9 2009 Daniel Drake <dsd at laptop.org> - 0.84.7-1
 - Fix bold font style
 



From mtasaka at fedoraproject.org  Mon Dec 28 14:50:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Dec 2009 14:50:00 +0000 (UTC)
Subject: File jd-2.5.5-091228.tgz uploaded to lookaside cache by mtasaka
Message-ID: <20091228145000.4A94A10F88B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for jd:

250ed919c3899c9ec1b0bebc976f1d72  jd-2.5.5-091228.tgz



From mtasaka at fedoraproject.org  Mon Dec 28 14:51:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Dec 2009 14:51:22 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.419, 1.420 jd.spec, 1.482, 1.483 sources, 
	1.420, 1.421
Message-ID: <20091228145123.00F9F11C02BC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21599/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Dec 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-1
- 2.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -p -r1.419 -r1.420
--- .cvsignore	25 Dec 2009 15:41:27 -0000	1.419
+++ .cvsignore	28 Dec 2009 14:51:21 -0000	1.420
@@ -1 +1 @@
-jd-2.5.5-rc091225.tgz
+jd-2.5.5-091228.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -p -r1.482 -r1.483
--- jd.spec	25 Dec 2009 15:41:27 -0000	1.482
+++ jd.spec	28 Dec 2009 14:51:21 -0000	1.483
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        rc091225
-%define         repoid        45087
+%define         strtag        091228
+%define         repoid        45148
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Dec 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-1
+- 2.5.5
+
 * Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
 - 2.5.5 rc 091225
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- sources	25 Dec 2009 15:41:27 -0000	1.420
+++ sources	28 Dec 2009 14:51:22 -0000	1.421
@@ -1 +1 @@
-bd8cea2f0e8c5957a8615e567ca1bb4c  jd-2.5.5-rc091225.tgz
+250ed919c3899c9ec1b0bebc976f1d72  jd-2.5.5-091228.tgz



From mtasaka at fedoraproject.org  Mon Dec 28 14:51:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Dec 2009 14:51:22 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.420, 1.421 jd.spec, 1.484, 1.485 sources, 
	1.421, 1.422
Message-ID: <20091228145122.F219D11C008D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21599/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Dec 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-1
- 2.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- .cvsignore	25 Dec 2009 15:41:28 -0000	1.420
+++ .cvsignore	28 Dec 2009 14:51:22 -0000	1.421
@@ -1 +1 @@
-jd-2.5.5-rc091225.tgz
+jd-2.5.5-091228.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -p -r1.484 -r1.485
--- jd.spec	25 Dec 2009 15:41:28 -0000	1.484
+++ jd.spec	28 Dec 2009 14:51:22 -0000	1.485
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        rc091225
-%define         repoid        45087
+%define         strtag        091228
+%define         repoid        45148
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Dec 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-1
+- 2.5.5
+
 * Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
 - 2.5.5 rc 091225
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -p -r1.421 -r1.422
--- sources	25 Dec 2009 15:41:28 -0000	1.421
+++ sources	28 Dec 2009 14:51:22 -0000	1.422
@@ -1 +1 @@
-bd8cea2f0e8c5957a8615e567ca1bb4c  jd-2.5.5-rc091225.tgz
+250ed919c3899c9ec1b0bebc976f1d72  jd-2.5.5-091228.tgz



From mtasaka at fedoraproject.org  Mon Dec 28 14:51:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 28 Dec 2009 14:51:22 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.410, 1.411 jd.spec, 1.472, 1.473 sources, 
	1.411, 1.412
Message-ID: <20091228145123.03C3C11C0335@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21599/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Dec 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-1
- 2.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- .cvsignore	25 Dec 2009 15:41:28 -0000	1.410
+++ .cvsignore	28 Dec 2009 14:51:22 -0000	1.411
@@ -1 +1 @@
-jd-2.5.5-rc091225.tgz
+jd-2.5.5-091228.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -p -r1.472 -r1.473
--- jd.spec	25 Dec 2009 15:41:28 -0000	1.472
+++ jd.spec	28 Dec 2009 14:51:22 -0000	1.473
@@ -10,16 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.5
-%define         strtag        rc091225
-%define         repoid        45087
+%define         strtag        091228
+%define         repoid        45148
 # Define this if this is pre-version
-%define         pre_release   1
+%define         pre_release   0
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Dec 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-1
+- 2.5.5
+
 * Sat Dec 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-0.4.beta091225
 - 2.5.5 rc 091225
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- sources	25 Dec 2009 15:41:28 -0000	1.411
+++ sources	28 Dec 2009 14:51:22 -0000	1.412
@@ -1 +1 @@
-bd8cea2f0e8c5957a8615e567ca1bb4c  jd-2.5.5-rc091225.tgz
+250ed919c3899c9ec1b0bebc976f1d72  jd-2.5.5-091228.tgz



From perex at fedoraproject.org  Mon Dec 28 15:08:39 2009
From: perex at fedoraproject.org (perex)
Date: Mon, 28 Dec 2009 15:08:39 +0000 (UTC)
Subject: File alsa-lib-1.0.22.tar.bz2 uploaded to lookaside cache by perex
Message-ID: <20091228150839.BDAC210F88B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for alsa-lib:

b28a12348905fb6915bc41f0edb2ecce  alsa-lib-1.0.22.tar.bz2



From perex at fedoraproject.org  Mon Dec 28 15:09:40 2009
From: perex at fedoraproject.org (perex)
Date: Mon, 28 Dec 2009 15:09:40 +0000 (UTC)
Subject: rpms/alsa-lib/F-12 alsa-lib-1.0.22-closetimer.patch, NONE,
	1.1 alsa-lib-1.0.22-softvol.patch, NONE, 1.1 .cvsignore, 1.38,
	1.39 alsa-lib.spec, 1.86, 1.87 sources, 1.42,
	1.43 alsa-lib-1.0.21-dmix-conf.patch, 1.1,
	NONE alsa-lib-1.0.21-revert-hook.patch, 1.1,
	NONE alsa-lib-1.0.21-speaker.patch, 1.1, NONE
Message-ID: <20091228150941.1496E11C008D@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24250

Modified Files:
	.cvsignore alsa-lib.spec sources 
Added Files:
	alsa-lib-1.0.22-closetimer.patch alsa-lib-1.0.22-softvol.patch 
Removed Files:
	alsa-lib-1.0.21-dmix-conf.patch 
	alsa-lib-1.0.21-revert-hook.patch 
	alsa-lib-1.0.21-speaker.patch 
Log Message:
updated to 1.0.22 release

alsa-lib-1.0.22-closetimer.patch:
 pcm_hw.c |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE alsa-lib-1.0.22-closetimer.patch ---
>From a256766c10c52cb6667de8a65f5cbb332fad4cc7 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Mon, 21 Dec 2009 09:09:42 +0100
Subject: [PATCH] pcm: Close event timer in pcm_hw plugin

Dan McCombs discovered that snd_pcm_close() invocations are not leading
to associated timers being closed, which results in successively more
timers being created but not freed.

Original patch from Daniel T Chen <crimsun at ubuntu.com>.

BugLink: https://bugs.launchpad.net/bugs/451893

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_hw.c |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index 2095b01..b557912 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -338,18 +338,6 @@ static int snd_pcm_hw_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
 	return 0;
 }
 
-static int snd_pcm_hw_hw_free(snd_pcm_t *pcm)
-{
-	snd_pcm_hw_t *hw = pcm->private_data;
-	int fd = hw->fd, err;
-	if (ioctl(fd, SNDRV_PCM_IOCTL_HW_FREE) < 0) {
-		err = -errno;
-		SYSMSG("SNDRV_PCM_IOCTL_HW_FREE failed");
-		return err;
-	}
-	return 0;
-}
-
 static void snd_pcm_hw_close_timer(snd_pcm_hw_t *hw)
 {
 	if (hw->period_timer) {
@@ -421,6 +409,20 @@ static int snd_pcm_hw_change_timer(snd_pcm_t *pcm, int enable)
 	} else {
 		snd_pcm_hw_close_timer(hw);
 		pcm->fast_ops = &snd_pcm_hw_fast_ops;
+		hw->period_event = 0;
+	}
+	return 0;
+}
+
+static int snd_pcm_hw_hw_free(snd_pcm_t *pcm)
+{
+	snd_pcm_hw_t *hw = pcm->private_data;
+	int fd = hw->fd, err;
+	snd_pcm_hw_change_timer(pcm, 0);
+	if (ioctl(fd, SNDRV_PCM_IOCTL_HW_FREE) < 0) {
+		err = -errno;
+		SYSMSG("SNDRV_PCM_IOCTL_HW_FREE failed");
+		return err;
 	}
 	return 0;
 }
-- 
1.5.5.1


alsa-lib-1.0.22-softvol.patch:
 pcm_softvol.c |   23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE alsa-lib-1.0.22-softvol.patch ---
>From bdf80e58af79d4e989cd8d701d97f888c9e2dadc Mon Sep 17 00:00:00 2001
From: Zerg Cannibal <cnb_zerg at yahoo.com>
Date: Mon, 21 Dec 2009 22:19:14 +0100
Subject: [PATCH] pcm: Fix the sound distortions for S24_3LE stream in pcm_softvol plugin

This patch fixes sound distortions in alsa-lib "softvol"
for S24_3LE sound stream, when softvol slider is not at 0.0dB
position.

Signed-off-by: CannibalZerg <cnb_zerg at yahoo.com>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_softvol.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index 637e5cb..2c7c006 100644
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -107,7 +107,8 @@ static inline int MULTI_DIV_32x16(int a, unsigned short b)
 	v.i = a;
 	y.i = 0;
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-	x.i = (unsigned int)v.s[0] * b;
+	x.i = (unsigned short)v.s[0];
+	x.i *= b;
 	y.s[0] = x.s[1];
 	y.i += (int)v.s[1] * b;
 #else
@@ -135,6 +136,23 @@ static inline int MULTI_DIV_int(int a, unsigned int b, int swap)
 	return swap ? (int)bswap_32(fraction) : fraction;
 }
 
+/* always little endian */
+static inline int MULTI_DIV_24(int a, unsigned int b)
+{
+	unsigned int gain = b >> VOL_SCALE_SHIFT;
+	int fraction;
+	fraction = MULTI_DIV_32x16(a, b & VOL_SCALE_MASK);
+	if (gain) {
+		long long amp = (long long)a * gain + fraction;
+		if (amp > (int)0x7fffff)
+			amp = (int)0x7fffff;
+		else if (amp < (int)0x800000)
+			amp = (int)0x800000;
+		return (int)amp;
+	}
+	return fraction;
+}
+
 static inline short MULTI_DIV_short(short a, unsigned int b, int swap)
 {
 	unsigned int gain = b >> VOL_SCALE_SHIFT;
@@ -223,7 +241,7 @@ static inline short MULTI_DIV_short(short a, unsigned int b, int swap)
 				tmp = src[0] |				\
 				      (src[1] << 8) |			\
 				      (((signed char *) src)[2] << 16);	\
-				tmp = MULTI_DIV_int(tmp, vol_scale, 0);	\
+				tmp = MULTI_DIV_24(tmp, vol_scale);	\
 				dst[0] = tmp;				\
 				dst[1] = tmp >> 8;			\
 				dst[2] = tmp >> 16;			\
-- 
1.5.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-12/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	2 Sep 2009 08:11:19 -0000	1.38
+++ .cvsignore	28 Dec 2009 15:09:39 -0000	1.39
@@ -25,3 +25,4 @@ alsa-lib-1.0.18.tar.bz2
 alsa-lib-1.0.19.tar.bz2
 alsa-lib-1.0.20.tar.bz2
 alsa-lib-1.0.21.tar.bz2
+alsa-lib-1.0.22.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-12/alsa-lib.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- alsa-lib.spec	9 Sep 2009 09:52:36 -0000	1.86
+++ alsa-lib.spec	28 Dec 2009 15:09:40 -0000	1.87
@@ -4,8 +4,8 @@
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.21
-Release: 3%{?prever_dot}%{?dist}
+Version: 1.0.22
+Release: 1%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -13,9 +13,8 @@ Source10: asound.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
-Patch10: alsa-lib-1.0.21-speaker.patch
-Patch11: alsa-lib-1.0.21-revert-hook.patch
-Patch12: alsa-lib-1.0.21-dmix-conf.patch
+Patch10: alsa-lib-1.0.22-closetimer.patch
+Patch11: alsa-lib-1.0.22-softvol.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -47,9 +46,8 @@ against the ALSA libraries and interface
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 %patch4 -p1 -b .no-dox-date
-%patch10 -p1 -b .speaker
-%patch11 -p1 -b .revert-hook
-%patch12 -p1 -b .dmix-conf
+%patch10 -p1 -b .closetimer
+%patch11 -p1 -b .softvol
 
 %build
 %configure --disable-aload
@@ -99,6 +97,11 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Mon Dec 28 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.22-1
+- Updated to 1.0.22 final
+- Fix file descriptor leak in pcm_hw plugin
+- Fix sound distortions for S24_LE - softvol plugin
+
 * Wed Sep  9 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-3
 - Add Speaker and Beep control names to mixer weight list
 - Fix redhat bug #521988


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-12/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	2 Sep 2009 08:11:20 -0000	1.42
+++ sources	28 Dec 2009 15:09:40 -0000	1.43
@@ -1 +1 @@
-d8a556041a4cbeeae0c32eadeffb3c74  alsa-lib-1.0.21.tar.bz2
+b28a12348905fb6915bc41f0edb2ecce  alsa-lib-1.0.22.tar.bz2


--- alsa-lib-1.0.21-dmix-conf.patch DELETED ---


--- alsa-lib-1.0.21-revert-hook.patch DELETED ---


--- alsa-lib-1.0.21-speaker.patch DELETED ---



From perex at fedoraproject.org  Mon Dec 28 15:28:10 2009
From: perex at fedoraproject.org (perex)
Date: Mon, 28 Dec 2009 15:28:10 +0000 (UTC)
Subject: rpms/alsa-lib/devel alsa-lib-1.0.22-closetimer.patch, NONE,
	1.1 alsa-lib-1.0.22-softvol.patch, NONE, 1.1 .cvsignore, 1.38,
	1.39 alsa-lib.spec, 1.86, 1.87 sources, 1.42,
	1.43 alsa-lib-1.0.21-dmix-conf.patch, 1.1,
	NONE alsa-lib-1.0.21-revert-hook.patch, 1.1,
	NONE alsa-lib-1.0.21-speaker.patch, 1.1, NONE
Message-ID: <20091228152810.865A411C008D@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26547

Modified Files:
	.cvsignore alsa-lib.spec sources 
Added Files:
	alsa-lib-1.0.22-closetimer.patch alsa-lib-1.0.22-softvol.patch 
Removed Files:
	alsa-lib-1.0.21-dmix-conf.patch 
	alsa-lib-1.0.21-revert-hook.patch 
	alsa-lib-1.0.21-speaker.patch 
Log Message:
updated to 1.0.22 release

alsa-lib-1.0.22-closetimer.patch:
 pcm_hw.c |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE alsa-lib-1.0.22-closetimer.patch ---
>From a256766c10c52cb6667de8a65f5cbb332fad4cc7 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Mon, 21 Dec 2009 09:09:42 +0100
Subject: [PATCH] pcm: Close event timer in pcm_hw plugin

Dan McCombs discovered that snd_pcm_close() invocations are not leading
to associated timers being closed, which results in successively more
timers being created but not freed.

Original patch from Daniel T Chen <crimsun at ubuntu.com>.

BugLink: https://bugs.launchpad.net/bugs/451893

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_hw.c |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index 2095b01..b557912 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -338,18 +338,6 @@ static int snd_pcm_hw_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
 	return 0;
 }
 
-static int snd_pcm_hw_hw_free(snd_pcm_t *pcm)
-{
-	snd_pcm_hw_t *hw = pcm->private_data;
-	int fd = hw->fd, err;
-	if (ioctl(fd, SNDRV_PCM_IOCTL_HW_FREE) < 0) {
-		err = -errno;
-		SYSMSG("SNDRV_PCM_IOCTL_HW_FREE failed");
-		return err;
-	}
-	return 0;
-}
-
 static void snd_pcm_hw_close_timer(snd_pcm_hw_t *hw)
 {
 	if (hw->period_timer) {
@@ -421,6 +409,20 @@ static int snd_pcm_hw_change_timer(snd_pcm_t *pcm, int enable)
 	} else {
 		snd_pcm_hw_close_timer(hw);
 		pcm->fast_ops = &snd_pcm_hw_fast_ops;
+		hw->period_event = 0;
+	}
+	return 0;
+}
+
+static int snd_pcm_hw_hw_free(snd_pcm_t *pcm)
+{
+	snd_pcm_hw_t *hw = pcm->private_data;
+	int fd = hw->fd, err;
+	snd_pcm_hw_change_timer(pcm, 0);
+	if (ioctl(fd, SNDRV_PCM_IOCTL_HW_FREE) < 0) {
+		err = -errno;
+		SYSMSG("SNDRV_PCM_IOCTL_HW_FREE failed");
+		return err;
 	}
 	return 0;
 }
-- 
1.5.5.1


alsa-lib-1.0.22-softvol.patch:
 pcm_softvol.c |   23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE alsa-lib-1.0.22-softvol.patch ---
>From bdf80e58af79d4e989cd8d701d97f888c9e2dadc Mon Sep 17 00:00:00 2001
From: Zerg Cannibal <cnb_zerg at yahoo.com>
Date: Mon, 21 Dec 2009 22:19:14 +0100
Subject: [PATCH] pcm: Fix the sound distortions for S24_3LE stream in pcm_softvol plugin

This patch fixes sound distortions in alsa-lib "softvol"
for S24_3LE sound stream, when softvol slider is not at 0.0dB
position.

Signed-off-by: CannibalZerg <cnb_zerg at yahoo.com>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_softvol.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index 637e5cb..2c7c006 100644
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -107,7 +107,8 @@ static inline int MULTI_DIV_32x16(int a, unsigned short b)
 	v.i = a;
 	y.i = 0;
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-	x.i = (unsigned int)v.s[0] * b;
+	x.i = (unsigned short)v.s[0];
+	x.i *= b;
 	y.s[0] = x.s[1];
 	y.i += (int)v.s[1] * b;
 #else
@@ -135,6 +136,23 @@ static inline int MULTI_DIV_int(int a, unsigned int b, int swap)
 	return swap ? (int)bswap_32(fraction) : fraction;
 }
 
+/* always little endian */
+static inline int MULTI_DIV_24(int a, unsigned int b)
+{
+	unsigned int gain = b >> VOL_SCALE_SHIFT;
+	int fraction;
+	fraction = MULTI_DIV_32x16(a, b & VOL_SCALE_MASK);
+	if (gain) {
+		long long amp = (long long)a * gain + fraction;
+		if (amp > (int)0x7fffff)
+			amp = (int)0x7fffff;
+		else if (amp < (int)0x800000)
+			amp = (int)0x800000;
+		return (int)amp;
+	}
+	return fraction;
+}
+
 static inline short MULTI_DIV_short(short a, unsigned int b, int swap)
 {
 	unsigned int gain = b >> VOL_SCALE_SHIFT;
@@ -223,7 +241,7 @@ static inline short MULTI_DIV_short(short a, unsigned int b, int swap)
 				tmp = src[0] |				\
 				      (src[1] << 8) |			\
 				      (((signed char *) src)[2] << 16);	\
-				tmp = MULTI_DIV_int(tmp, vol_scale, 0);	\
+				tmp = MULTI_DIV_24(tmp, vol_scale);	\
 				dst[0] = tmp;				\
 				dst[1] = tmp >> 8;			\
 				dst[2] = tmp >> 16;			\
-- 
1.5.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	2 Sep 2009 08:11:19 -0000	1.38
+++ .cvsignore	28 Dec 2009 15:28:09 -0000	1.39
@@ -25,3 +25,4 @@ alsa-lib-1.0.18.tar.bz2
 alsa-lib-1.0.19.tar.bz2
 alsa-lib-1.0.20.tar.bz2
 alsa-lib-1.0.21.tar.bz2
+alsa-lib-1.0.22.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- alsa-lib.spec	9 Sep 2009 09:52:36 -0000	1.86
+++ alsa-lib.spec	28 Dec 2009 15:28:09 -0000	1.87
@@ -4,8 +4,8 @@
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.21
-Release: 3%{?prever_dot}%{?dist}
+Version: 1.0.22
+Release: 1%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -13,9 +13,8 @@ Source10: asound.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
-Patch10: alsa-lib-1.0.21-speaker.patch
-Patch11: alsa-lib-1.0.21-revert-hook.patch
-Patch12: alsa-lib-1.0.21-dmix-conf.patch
+Patch10: alsa-lib-1.0.22-closetimer.patch
+Patch11: alsa-lib-1.0.22-softvol.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -47,9 +46,8 @@ against the ALSA libraries and interface
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 %patch4 -p1 -b .no-dox-date
-%patch10 -p1 -b .speaker
-%patch11 -p1 -b .revert-hook
-%patch12 -p1 -b .dmix-conf
+%patch10 -p1 -b .closetimer
+%patch11 -p1 -b .softvol
 
 %build
 %configure --disable-aload
@@ -99,6 +97,11 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Mon Dec 28 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.22-1
+- Updated to 1.0.22 final
+- Fix file descriptor leak in pcm_hw plugin
+- Fix sound distortions for S24_LE - softvol plugin
+
 * Wed Sep  9 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-3
 - Add Speaker and Beep control names to mixer weight list
 - Fix redhat bug #521988


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	2 Sep 2009 08:11:20 -0000	1.42
+++ sources	28 Dec 2009 15:28:09 -0000	1.43
@@ -1 +1 @@
-d8a556041a4cbeeae0c32eadeffb3c74  alsa-lib-1.0.21.tar.bz2
+b28a12348905fb6915bc41f0edb2ecce  alsa-lib-1.0.22.tar.bz2


--- alsa-lib-1.0.21-dmix-conf.patch DELETED ---


--- alsa-lib-1.0.21-revert-hook.patch DELETED ---


--- alsa-lib-1.0.21-speaker.patch DELETED ---



From orion at fedoraproject.org  Mon Dec 28 15:34:49 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 28 Dec 2009 15:34:49 +0000 (UTC)
Subject: File gv-3.6.8.tar.gz uploaded to lookaside cache by orion
Message-ID: <20091228153449.33CB010F88B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gv:

581ef7834c0e07ac1536b1ee8faa11d5  gv-3.6.8.tar.gz



From orion at fedoraproject.org  Mon Dec 28 15:35:09 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 28 Dec 2009 15:35:09 +0000 (UTC)
Subject: rpms/gv/devel .cvsignore,1.8,1.9 gv.spec,1.22,1.23 sources,1.8,1.9
Message-ID: <20091228153509.8915E11C008D@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27425

Modified Files:
	.cvsignore gv.spec sources 
Log Message:
* Mon Dec 28 2009 Orion Poplawski <orion at cora.nwra.com> 3.6.8-1
- Update to 3.6.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gv/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Mar 2009 22:09:36 -0000	1.8
+++ .cvsignore	28 Dec 2009 15:35:08 -0000	1.9
@@ -1 +1 @@
-gv-3.6.7.tar.gz
+gv-3.6.8.tar.gz


Index: gv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gv/devel/gv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gv.spec	25 Jul 2009 01:55:14 -0000	1.22
+++ gv.spec	28 Dec 2009 15:35:09 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
-Version: 3.6.7
-Release: 2%{?dist}
+Version: 3.6.8
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Requires: ghostscript
@@ -100,6 +100,9 @@ fi
 %{_mandir}/man1/gv-update-userconfig.*
 
 %changelog
+* Mon Dec 28 2009 Orion Poplawski <orion at cora.nwra.com> 3.6.8-1
+- Update to 3.6.8
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gv/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Mar 2009 22:09:36 -0000	1.8
+++ sources	28 Dec 2009 15:35:09 -0000	1.9
@@ -1 +1 @@
-fdad147dd0440446cf9daaffca83343f  gv-3.6.7.tar.gz
+581ef7834c0e07ac1536b1ee8faa11d5  gv-3.6.8.tar.gz



From perex at fedoraproject.org  Mon Dec 28 15:44:45 2009
From: perex at fedoraproject.org (perex)
Date: Mon, 28 Dec 2009 15:44:45 +0000 (UTC)
Subject: rpms/alsa-lib/F-11 .cvsignore, 1.38, 1.39 alsa-lib.spec, 1.87,
	1.88 sources, 1.42, 1.43 alsa-lib-1.0.21-dmix-conf.patch, 1.1,
	NONE alsa-lib-1.0.21-revert-hook.patch, 1.1, NONE
Message-ID: <20091228154445.4C56E11C008D@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28916

Modified Files:
	.cvsignore alsa-lib.spec sources 
Removed Files:
	alsa-lib-1.0.21-dmix-conf.patch 
	alsa-lib-1.0.21-revert-hook.patch 
Log Message:
updated to 1.0.22 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	2 Sep 2009 08:14:23 -0000	1.38
+++ .cvsignore	28 Dec 2009 15:44:43 -0000	1.39
@@ -25,3 +25,4 @@ alsa-lib-1.0.18.tar.bz2
 alsa-lib-1.0.19.tar.bz2
 alsa-lib-1.0.20.tar.bz2
 alsa-lib-1.0.21.tar.bz2
+alsa-lib-1.0.22.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/alsa-lib.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- alsa-lib.spec	9 Sep 2009 12:03:04 -0000	1.87
+++ alsa-lib.spec	28 Dec 2009 15:44:44 -0000	1.88
@@ -5,8 +5,8 @@
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.21
-Release: 3%{?prever_dot}%{?dist}
+Version: 1.0.22
+Release: 1%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -14,9 +14,8 @@ Source10: asound.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
-Patch5:  alsa-lib-1.0.21-weight.patch
-Patch6:  alsa-lib-1.0.21-revert-hook.patch
-Patch7:  alsa-lib-1.0.21-dmix-conf.patch
+Patch5:  alsa-lib-1.0.22-closetimer.patch
+Patch6:  alsa-lib-1.0.22-softvol.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -48,9 +47,8 @@ against the ALSA libraries and interface
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 %patch4 -p1 -b .no-dox-date
-%patch5 -p1 -b .weight
-%patch6 -p1 -b .revert
-%patch7 -p1 -b .dmix
+%patch5 -p1 -b .closetimer
+%patch6 -p1 -b .softvol
 
 %build
 %configure --disable-aload
@@ -100,6 +98,11 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Mon Dec 28 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.22-1
+- Updated to 1.0.22 final
+- Fix file descriptor leak in pcm_hw plugin
+- Fix sound distortions for S24_LE - softvol plugin
+
 * Wed Sep  9 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-3
 - Fix redhat bug #521988
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	2 Sep 2009 08:14:23 -0000	1.42
+++ sources	28 Dec 2009 15:44:44 -0000	1.43
@@ -1 +1 @@
-d8a556041a4cbeeae0c32eadeffb3c74  alsa-lib-1.0.21.tar.bz2
+b28a12348905fb6915bc41f0edb2ecce  alsa-lib-1.0.22.tar.bz2


--- alsa-lib-1.0.21-dmix-conf.patch DELETED ---


--- alsa-lib-1.0.21-revert-hook.patch DELETED ---



From kwizart at fedoraproject.org  Mon Dec 28 15:45:39 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 28 Dec 2009 15:45:39 +0000 (UTC)
Subject: rpms/libproxy/devel libproxy.spec,1.9,1.10
Message-ID: <20091228154539.02FDB11C008D@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29203

Modified Files:
	libproxy.spec 
Log Message:
Switch to bz2



Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libproxy.spec	27 Dec 2009 12:18:56 -0000	1.9
+++ libproxy.spec	28 Dec 2009 15:45:38 -0000	1.10
@@ -10,7 +10,7 @@ Summary:        A library handling all t
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://code.google.com/p/libproxy/
-Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
+Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel



From praveenp at fedoraproject.org  Mon Dec 28 15:46:57 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Mon, 28 Dec 2009 15:46:57 +0000 (UTC)
Subject: rpms/openwsman/EL-4 openwsman-pam-auth.patch, NONE,
	1.1 perl-bindings.patch, NONE, 1.1 openwsman-initscript.patch,
	1.1, 1.2 openwsman.spec, 1.4, 1.5
Message-ID: <20091228154657.39AB311C008D@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29395

Modified Files:
	openwsman-initscript.patch openwsman.spec 
Added Files:
	openwsman-pam-auth.patch perl-bindings.patch 
Log Message:
Updated the spec file and added a couple of patches


openwsman-pam-auth.patch:
 openwsman.conf |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openwsman-pam-auth.patch ---
Index: openwsman.conf
===================================================================
--- openwsman-2.0.0/etc/openwsman.conf	(revision 3221)
+++ openwsman-2.0.0/etc/openwsman.conf	(working copy)
@@ -4,7 +4,7 @@
 ssl_cert_file = /etc/openwsman/servercert.pem
 ssl_key_file = /etc/openwsman/serverkey.pem
 digest_password_file = /etc/openwsman/digest_auth.passwd
-basic_password_file = /etc/openwsman/simple_auth.passwd
+#basic_password_file = /etc/openwsman/simple_auth.passwd
 
 min_threads = 4
 max_threads = 10
@@ -15,8 +15,8 @@
 # Authentication backend for BASIC authentication. Default is to read a configuration file defined with 'basic_password_file'
 #
 
-#basic_authenticator = libwsman_pam_auth.so
-#basic_authenticator_arg = openwsman
+basic_authenticator = libwsman_pam_auth.so
+basic_authenticator_arg = openwsman
 
 #
 # WS-Management unauthenticated wsmid:Identify file

perl-bindings.patch:
 Makefile.am |    1 +
 Makefile.in |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE perl-bindings.patch ---
diff -up openwsman-2.2.0/bindings/perl/Makefile.am.org openwsman-2.2.0/bindings/perl/Makefile.am
--- openwsman-2.2.0/bindings/perl/Makefile.am.org	2009-12-10 13:34:55.000000000 -0600
+++ openwsman-2.2.0/bindings/perl/Makefile.am	2009-12-10 13:35:56.000000000 -0600
@@ -33,6 +33,7 @@ SWIG_INPUT = ../openwsman.i
 openwsman_la_SOURCES = openwsman_wrap.c \
 			 ../openwsman.c \
 			 $(SWIG_INPUT)
+all-local: openwsman.pm
 
 openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
 
diff -up openwsman-2.2.0/bindings/perl/Makefile.in.org openwsman-2.2.0/bindings/perl/Makefile.in
--- openwsman-2.2.0/bindings/perl/Makefile.in.org	2009-12-10 13:35:03.000000000 -0600
+++ openwsman-2.2.0/bindings/perl/Makefile.in	2009-12-10 13:36:18.000000000 -0600
@@ -289,6 +289,7 @@ SWIG_INPUT = ../openwsman.i
 openwsman_la_SOURCES = openwsman_wrap.c \
 			 ../openwsman.c \
 			 $(SWIG_INPUT)
+all-local: openwsman.pm
 
 openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
 openwsman_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)

openwsman-initscript.patch:
 openwsmand.sh.in |   71 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 18 deletions(-)

Index: openwsman-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/openwsman-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openwsman-initscript.patch	1 Nov 2008 10:59:33 -0000	1.1
+++ openwsman-initscript.patch	28 Dec 2009 15:46:56 -0000	1.2
@@ -1,11 +1,14 @@
---- openwsman-2.0.0/etc/init/openwsmand.sh.in.orig	2008-09-07 00:01:29.000000000 -0500
-+++ openwsman-2.0.0/etc/init/openwsmand.sh.in	2008-09-07 00:34:57.000000000 -0500
-@@ -4,15 +4,13 @@
+diff -up ./etc/init/openwsmand.sh.in.new ./etc/init/openwsmand.sh.in
+--- ./etc/init/openwsmand.sh.in.new	2009-12-16 18:16:06.000000000 -0600
++++ ./etc/init/openwsmand.sh.in	2009-12-16 18:16:18.000000000 -0600
+@@ -4,21 +4,21 @@
  # Provides: openwsmand
  # Required-Start: $remote_fs
  # Required-Stop: $network
 -# Default-Start: 2 3 4 5
 -# Default-Stop: 0 1 6 
++# Default-Start:
++# Default-Stop:
  # Short-Description: Openwsman Daemon
  # Description: openwsmand
  #       Start/Stop the Openwsman Daemon
@@ -17,12 +20,109 @@
  # description: Openwsman Daemon
  # processname: openwsmand
  
-@@ -57,7 +55,7 @@ case "$1" in
-             if [ "x${FQDN}" = "x" ]; then
-                 FQDN=localhost.localdomain
-             fi
--cat << EOF | sh @SYSCONFDIR@/owsmangencert.sh > /dev/null 2>&1
-+cat << EOF | sh @libexecdir@/openwsman/owsmangencert.sh > /dev/null 2>&1
- --
- SomeState
- SomeCity
+ NAME=openwsmand
+ DAEMON=/usr/sbin/$NAME
+-OPTIONS=
++OPTIONS=-S
+ PIDFILE=/var/run/$NAME.pid
+ 
+ if [ $EUID != 0 ]; then
+@@ -37,12 +37,14 @@ lockfile=${SVIlock:-/var/lock/subsys/$NA
+ if [ -f "/etc/sysconfig/openwsman" ]; then
+     . /etc/sysconfig/openwsman
+ fi
+-# See how we were called.
+-. /etc/rc.status
+ 
+-# Reset status of this service
+-rc_reset
++if [ -f "/etc/SuSe-release" ]; then
++     # See how we were called.
++     . /etc/rc.status
+ 
++     # Reset status of this service
++     rc_reset
++fi
+ 
+ case "$1" in
+     start)
+@@ -71,16 +73,28 @@ EOF
+ 
+     # Start daemons.
+     echo -n "Starting the $DESCRIPTIVE"
+-    startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++    	startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
++    	rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++    	$DAEMON -S && echo "          done." || echo "   failed."
++    fi
++    
+     touch $lockfile
+     ;;
+ 
+     stop)
+     # Stop daemons.
+     echo -n "Shutting down $DESCRIPTIVE"
+-    killproc -p $PIDFILE -TERM $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++       killproc -p $PIDFILE -TERM $DAEMON
++       rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++       kill -9 `pidof openwsmand` > /dev/null 2>&1
++          if [ $? -eq 0 ]; then
++             echo "         done"
++          fi
++    fi
+     rm -f $lockfile
+     ;;
+ 
+@@ -91,19 +105,40 @@ EOF
+     ;;
+ 
+     reload)
+-    echo -n "Reload service $DESCRIPTIVE"
+-    killproc -p $PIDFILE  -HUP $DAEMON
+-    rc_status -v
++    echo -n "Reloading service $DESCRIPTIVE"
++    if [ -f "/etc-SuSe-release" ]; then
++    	killproc -p $PIDFILE  -HUP $DAEMON
++    	rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++    	killall -HUP openwsmad && echo "            done."|| echo "    failed."
++    fi
+     ;;
+ 
+     status)
+     echo -n "Checking for service $DESCRIPTIVE"
+-    checkproc -p $PIDFILE $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++        checkproc -p $PIDFILE $DAEMON
++        rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++        pidof opewsmand > /dev/null 2>&1
++        if [ $? -eq 0 ]; then
++           echo "         running"
++        else
++           echo "         stopped"
++        fi 
++    fi
++        
++    ;;
++    condrestart)
++       [ -f $lockfile ] && restart || :
+     ;;
+ 
+     *)
+-    echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
++    echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
+ esac
+ 
++if [ -f "/etc/SuSe-release" ]; then
+ rc_exit
++elif [ -f "/etc/redhat-release" ]; then
++exit 0 
++fi


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/openwsman.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openwsman.spec	3 Nov 2009 22:17:12 -0000	1.4
+++ openwsman.spec	28 Dec 2009 15:46:56 -0000	1.5
@@ -1,20 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
-%define ruby_libdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
 Version:       2.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source2:        python-config
 Patch0:         %{name}-initscript.patch
+Patch1:         %{name}-pam-auth.patch
+Patch2:         perl-bindings.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 Group:          System Environment/Daemons
-Summary:        Web Services Management libraries
-BuildRequires:  sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel
+Summary:        Opensource Implementation of WS-Management
+BuildRequires:  sblim-sfcc-devel libcurl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(postun): initscripts
@@ -28,124 +30,214 @@ is based on a suite of web services spec
 requirements that exposes a set of operations focused on and covers
 all system management aspects.
 
-
-%package devel
-Summary:        Openwsman Development files
+%package -n libwsman1
+License:        BSD
+Group:          System Environment/Libraries
+Summary:        Opensource Implementation of WS-Management
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
+Requires:       %{name}-client
+
+%description -n libwsman1
+Openwsman library for packages dependent on openwsman
+%package -n libwsman-devel
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-%description devel
-Openwsman Development files
+Summary:        Opensource Implementation of WS-Management
+Provides:       %{name}-devel = %{version}
+Obsoletes:      %{name}-devel < %{version}
+Requires:       libwsman1 = %{version}
+Requires:       %{name}-server = %{version}
+Requires:       %{name}-client = %{version}
+Requires:       sblim-sfcc-devel libxml2-devel pam-devel
+Requires:       libcurl-devel
+
+%description -n libwsman-devel
+Development files for openwsman
+
+%package client
+License:        BSD
+Group:          System Environment/Libraries
+Summary:        Openwsman Client libraries
+
+%description client
+Openwsman Client libraries
+
+%package server
+License:        BSD
+Group:          System Environment/Daemons
+Requires:       net-tools
+Requires:       openwsman-client
+Requires(post):       chkconfig
+Requires(preun):      chkconfig
+Requires(postun):     initscripts
+Summary:        Openwsman Server and service libraries
+
+%description server
+Openwsman Server and service libraries
+
 
 %package python
-Summary:        Openwsman Python bindings
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:        Python bindings for openwsman client API
+Requires:       python
+
 %description python
-Openwsman python bindings
+This package provides Python bindings to access the openwsman client
+API.
 
-%package -n ruby-%{name}
-Summary:        Openwsman Ruby bindings
+%package ruby
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Provides:       ruby(%{name}) = %{version}
-%description -n ruby-%{name}
-Openwsman ruby bindings
+Summary:        Ruby bindings for openwsman client API
+
+%description ruby
+This package provides Ruby bindings to access the openwsman client API.
+
+%package perl
+License:        BSD
+Group:          Development/Libraries
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Summary:        Perl bindings for openwsman client API
+
+%description perl
+This package provides Perl bindings to access the openwsman client API.
+
+
+
 
 
 %prep
 %setup -q 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 cp -p %{SOURCE2} %{_builddir}/%{name}-%{version}
 sed -i -e 's|#!/usr/bin/python2.5|#!%{__python}|' %{_builddir}/%{name}-%{version}/python-config
 
 %build
+sh autoconfiscate.sh
 chmod a-x src/lib/*.[ch]
 chmod a-x src/cpp/*.[ch]
 chmod a-x include/*.[ch]
 
 # disable eventing, as Fedora libcurl isn't linked against openssl
 # disable tests in 2.1.0, http://www.openwsman.org/bug/263
-%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings PATH=$PATH:.
-make %{?_smp_flags}
+%configure  --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings --disable-static --enable-perl --enable-ipv6 PATH=$PATH:.
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA"
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-install -m 0644 etc/openwsman.conf %{buildroot}/etc/openwsman
-install -m 0644 etc/ssleay.cnf %{buildroot}/etc/openwsman
-install -D -m 0755 etc/init/%{name}d.sh %{buildroot}/%{_initrddir}/%{name}d
-# move this helper script out of /etc
-mkdir -p %{buildroot}/%{_libexecdir}/%{name}/
-chmod 0755 %{buildroot}/etc/%{name}/owsmangencert.sh
-mv %{buildroot}/etc/%{name}/owsmangencert.sh %{buildroot}/%{_libexecdir}/%{name}/
-find %{buildroot} -type f -name \*.la -exec rm \{\} \;
-find %{buildroot} -type f -name \*.a -exec rm \{\} \;
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/authenticators/*.la
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -m 644 etc/openwsman.conf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 644 etc/ssleay.cnf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 755 etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openwsmand
+ln -sf %{_sysconfdir}/init.d/openwsmand $RPM_BUILD_ROOT%{_sbindir}/rcopenwsmand
 
 %clean
 rm -rf %{buildroot}
+%post -n libwsman1 -p /sbin/ldconfig
+
+%postun -n libwsman1 -p /sbin/ldconfig
+
+%post server
+/sbin/ldconfig
+chkconfig --add  openwsmand
+
+%preun server
+chkconfig --del openwsmand
 
-%files
+%postun server
+rm -f /var/log/wsmand.log
+/sbin/ldconfig
+
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
+
+%files -n libwsman1
 %defattr(-,root,root)
-%{_sbindir}/%{name}d
-%{_initrddir}/%{name}d
-%{_libexecdir}/%{name}
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/authenticators
-%{_libdir}/libwsman*.so.*
-%{_libdir}/%{name}/plugins/*so.*
-%{_libdir}/%{name}/authenticators/*so.*
-%dir /etc/openwsman
-%config(noreplace) /etc/openwsman/openwsman.conf
-%config(noreplace) /etc/openwsman/ssleay.cnf
-%{ruby_libdir}/openwsman
-%config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%doc COPYING README
+%doc AUTHORS COPYING ChangeLog README TODO
+%{_libdir}/libwsman.so.*
+%{_libdir}/libwsman_client.so.*
+%{_libdir}/libwsman_curl_client_transport.so.*
 
-%files devel
+%files -n libwsman-devel
 %defattr(-,root,root)
 %{_includedir}/*
+%{_libdir}/pkgconfig/*
 %{_libdir}/*.so
-%{_libdir}/%{name}/plugins/*so
-%{_libdir}/%{name}/authenticators/*so
-%{_libdir}/pkgconfig/%{name}*.pc
-%doc COPYING examples/serialize.c doc/plugin* 
+%doc AUTHORS COPYING ChangeLog README
 
 %files python
 %defattr(-,root,root)
-%{python_sitelib}/pywsman.py
 %{python_sitearch}/*.so
-%doc COPYING
+%{python_sitelib}/*.py
+#%{python_sitelib}/*.pyc
+#%{python_sitelib}/*.pyo
+%doc AUTHORS COPYING ChangeLog README
 
-%files -n ruby-%{name}
+%files ruby
 %defattr(-,root,root)
-%{ruby_sitearch}/*.so
-%doc COPYING
+%{ruby_sitearch}/openwsman.so
+%dir %{ruby_sitelib}/openwsman
+%{ruby_sitelib}/openwsman/openwsman.rb
+%{ruby_sitelib}/openwsman/wsxmlnode.rb
+%doc AUTHORS COPYING ChangeLog README
 
-%post
-/sbin/ldconfig
-/sbin/chkconfig --add %{name}d
-
-%preun
-if [ $1 = 0 ] ; then
-    /sbin/service %{name}d stop >/dev/null 2>&1
-    /sbin/chkconfig --del %{name}d
-fi
+%files perl
+%defattr(-,root,root)
+%{perl_vendorarch}/openwsman.so
+%{perl_vendorlib}/openwsman.pm
+%doc AUTHORS COPYING ChangeLog README
+
+%files server
+# Don't remove *.so files from the server package.
+# the server fails to start without these files.
+%defattr(-,root,root)
+%dir %{_sysconfdir}/openwsman
+%config(noreplace) %{_sysconfdir}/openwsman/openwsman.conf
+%config(noreplace) %{_sysconfdir}/openwsman/ssleay.cnf
+%attr(0755,root,root) %{_sysconfdir}/openwsman/owsmangencert.sh
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
+%attr(0755,root,root) %{_sysconfdir}/init.d/openwsmand
+%dir %{_libdir}/openwsman
+%dir %{_libdir}/openwsman/authenticators
+%{_libdir}/openwsman/authenticators/*.so
+%{_libdir}/openwsman/authenticators/*.so.*
+%dir %{_libdir}/openwsman/plugins
+%{_libdir}/openwsman/plugins/*.so
+%{_libdir}/openwsman/plugins/*.so.*
+%{_sbindir}/openwsmand
+%{_sbindir}/rcopenwsmand
+%{_libdir}/libwsman_server.so.*
+%doc AUTHORS COPYING ChangeLog README
 
-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ] ; then
-    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-fi
+%files client
+%defattr(-,root,root)
+%{_libdir}/libwsman_clientpp.so.*
+%doc AUTHORS COPYING ChangeLog README
 
 
 %changelog
+* Thu Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-4
+- Following the upstream packaging, updated the spec file to break the
+- package into server, client, lib components.
+
 * Tue Nov  3 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-3
 - Changed the python-config script for it to be working on el4
+
 * Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
 - Increasing the release number to make another tag 
+
 * Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
 - Updated the sources to 2.2.0. Couple of major changes are as follows:
 - Major changes:
@@ -161,5 +253,5 @@ fi
 * Mon Sep 22 2008 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0-1
 - update to 2.1.0, resolves security issues
 
-* Tue Aug 19 2008  <srinivas_ramanatha at dell.com> - 2.0.0-1%{?dist}
+* Tue Aug 19 2008  <srinivas_ramanatha at dell.com> - 2.0.0-1
 - Modified the spec file to adhere to fedora packaging guidelines.



From perex at fedoraproject.org  Mon Dec 28 15:48:54 2009
From: perex at fedoraproject.org (perex)
Date: Mon, 28 Dec 2009 15:48:54 +0000 (UTC)
Subject: rpms/alsa-lib/F-11 alsa-lib-1.0.22-closetimer.patch, NONE,
	1.1 alsa-lib-1.0.22-softvol.patch, NONE, 1.1 alsa-lib.spec, 1.88,
	1.89 alsa-lib-1.0.21-weight.patch, 1.1, NONE
Message-ID: <20091228154854.F293C11C008D@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29787

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.22-closetimer.patch alsa-lib-1.0.22-softvol.patch 
Removed Files:
	alsa-lib-1.0.21-weight.patch 
Log Message:
updated to 1.0.22 release

alsa-lib-1.0.22-closetimer.patch:
 pcm_hw.c |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE alsa-lib-1.0.22-closetimer.patch ---
>From a256766c10c52cb6667de8a65f5cbb332fad4cc7 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Mon, 21 Dec 2009 09:09:42 +0100
Subject: [PATCH] pcm: Close event timer in pcm_hw plugin

Dan McCombs discovered that snd_pcm_close() invocations are not leading
to associated timers being closed, which results in successively more
timers being created but not freed.

Original patch from Daniel T Chen <crimsun at ubuntu.com>.

BugLink: https://bugs.launchpad.net/bugs/451893

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_hw.c |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index 2095b01..b557912 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -338,18 +338,6 @@ static int snd_pcm_hw_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
 	return 0;
 }
 
-static int snd_pcm_hw_hw_free(snd_pcm_t *pcm)
-{
-	snd_pcm_hw_t *hw = pcm->private_data;
-	int fd = hw->fd, err;
-	if (ioctl(fd, SNDRV_PCM_IOCTL_HW_FREE) < 0) {
-		err = -errno;
-		SYSMSG("SNDRV_PCM_IOCTL_HW_FREE failed");
-		return err;
-	}
-	return 0;
-}
-
 static void snd_pcm_hw_close_timer(snd_pcm_hw_t *hw)
 {
 	if (hw->period_timer) {
@@ -421,6 +409,20 @@ static int snd_pcm_hw_change_timer(snd_pcm_t *pcm, int enable)
 	} else {
 		snd_pcm_hw_close_timer(hw);
 		pcm->fast_ops = &snd_pcm_hw_fast_ops;
+		hw->period_event = 0;
+	}
+	return 0;
+}
+
+static int snd_pcm_hw_hw_free(snd_pcm_t *pcm)
+{
+	snd_pcm_hw_t *hw = pcm->private_data;
+	int fd = hw->fd, err;
+	snd_pcm_hw_change_timer(pcm, 0);
+	if (ioctl(fd, SNDRV_PCM_IOCTL_HW_FREE) < 0) {
+		err = -errno;
+		SYSMSG("SNDRV_PCM_IOCTL_HW_FREE failed");
+		return err;
 	}
 	return 0;
 }
-- 
1.5.5.1


alsa-lib-1.0.22-softvol.patch:
 pcm_softvol.c |   23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE alsa-lib-1.0.22-softvol.patch ---
>From bdf80e58af79d4e989cd8d701d97f888c9e2dadc Mon Sep 17 00:00:00 2001
From: Zerg Cannibal <cnb_zerg at yahoo.com>
Date: Mon, 21 Dec 2009 22:19:14 +0100
Subject: [PATCH] pcm: Fix the sound distortions for S24_3LE stream in pcm_softvol plugin

This patch fixes sound distortions in alsa-lib "softvol"
for S24_3LE sound stream, when softvol slider is not at 0.0dB
position.

Signed-off-by: CannibalZerg <cnb_zerg at yahoo.com>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_softvol.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index 637e5cb..2c7c006 100644
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -107,7 +107,8 @@ static inline int MULTI_DIV_32x16(int a, unsigned short b)
 	v.i = a;
 	y.i = 0;
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-	x.i = (unsigned int)v.s[0] * b;
+	x.i = (unsigned short)v.s[0];
+	x.i *= b;
 	y.s[0] = x.s[1];
 	y.i += (int)v.s[1] * b;
 #else
@@ -135,6 +136,23 @@ static inline int MULTI_DIV_int(int a, unsigned int b, int swap)
 	return swap ? (int)bswap_32(fraction) : fraction;
 }
 
+/* always little endian */
+static inline int MULTI_DIV_24(int a, unsigned int b)
+{
+	unsigned int gain = b >> VOL_SCALE_SHIFT;
+	int fraction;
+	fraction = MULTI_DIV_32x16(a, b & VOL_SCALE_MASK);
+	if (gain) {
+		long long amp = (long long)a * gain + fraction;
+		if (amp > (int)0x7fffff)
+			amp = (int)0x7fffff;
+		else if (amp < (int)0x800000)
+			amp = (int)0x800000;
+		return (int)amp;
+	}
+	return fraction;
+}
+
 static inline short MULTI_DIV_short(short a, unsigned int b, int swap)
 {
 	unsigned int gain = b >> VOL_SCALE_SHIFT;
@@ -223,7 +241,7 @@ static inline short MULTI_DIV_short(short a, unsigned int b, int swap)
 				tmp = src[0] |				\
 				      (src[1] << 8) |			\
 				      (((signed char *) src)[2] << 16);	\
-				tmp = MULTI_DIV_int(tmp, vol_scale, 0);	\
+				tmp = MULTI_DIV_24(tmp, vol_scale);	\
 				dst[0] = tmp;				\
 				dst[1] = tmp >> 8;			\
 				dst[2] = tmp >> 16;			\
-- 
1.5.5.1



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/alsa-lib.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- alsa-lib.spec	28 Dec 2009 15:44:44 -0000	1.88
+++ alsa-lib.spec	28 Dec 2009 15:48:54 -0000	1.89
@@ -6,7 +6,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.22
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -98,7 +98,7 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
-* Mon Dec 28 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.22-1
+* Mon Dec 28 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.22-2
 - Updated to 1.0.22 final
 - Fix file descriptor leak in pcm_hw plugin
 - Fix sound distortions for S24_LE - softvol plugin


--- alsa-lib-1.0.21-weight.patch DELETED ---



From praveenp at fedoraproject.org  Mon Dec 28 16:24:26 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Mon, 28 Dec 2009 16:24:26 +0000 (UTC)
Subject: rpms/openwsman/EL-4 openwsman.spec,1.5,1.6
Message-ID: <20091228162426.C315D11C008D@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2396

Modified Files:
	openwsman.spec 
Log Message:
Changed some build dependencies



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/openwsman.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openwsman.spec	28 Dec 2009 15:46:56 -0000	1.5
+++ openwsman.spec	28 Dec 2009 16:24:24 -0000	1.6
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?ruby_sitelib: %global ruby_sitelib %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%{!?ruby_sitearch: %global ruby_sitearch %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
 Version:       2.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -16,7 +16,8 @@ Patch2:         perl-bindings.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 Group:          System Environment/Daemons
 Summary:        Opensource Implementation of WS-Management
-BuildRequires:  sblim-sfcc-devel libcurl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel
+BuildRequires:  sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel libtool
+BuildRequires:  perl pkgconfig openssl-devel net-tools
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(postun): initscripts
@@ -228,6 +229,9 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
+* Thu Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5
+- Added a few Build dependencies
+
 * Thu Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-4
 - Following the upstream packaging, updated the spec file to break the
 - package into server, client, lib components.



From dsd at fedoraproject.org  Mon Dec 28 17:20:01 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 28 Dec 2009 17:20:01 +0000 (UTC)
Subject: File sugar-datastore-0.84.1.tar.bz2 uploaded to lookaside cache by dsd
Message-ID: <20091228172001.2DFD410F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar-datastore:

d1660c8dcf4a920559fbe63a1d4de0d3  sugar-datastore-0.84.1.tar.bz2



From dsd at fedoraproject.org  Mon Dec 28 17:27:19 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon, 28 Dec 2009 17:27:19 +0000 (UTC)
Subject: rpms/sugar-datastore/F-11 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 sugar-datastore.spec, 1.15, 1.16
Message-ID: <20091228172719.7142C11C008D@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/sugar-datastore/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11606

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
v0.84.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Mar 2009 21:11:17 -0000	1.12
+++ .cvsignore	28 Dec 2009 17:27:19 -0000	1.13
@@ -1 +1 @@
-sugar-datastore-0.84.0.tar.bz2
+sugar-datastore-0.84.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Mar 2009 21:11:17 -0000	1.12
+++ sources	28 Dec 2009 17:27:19 -0000	1.13
@@ -1 +1 @@
-e57580e9fd44ecc2cb7a947dd8854817  sugar-datastore-0.84.0.tar.bz2
+d1660c8dcf4a920559fbe63a1d4de0d3  sugar-datastore-0.84.1.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/F-11/sugar-datastore.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sugar-datastore.spec	3 Mar 2009 21:11:17 -0000	1.15
+++ sugar-datastore.spec	28 Dec 2009 17:27:19 -0000	1.16
@@ -4,7 +4,7 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.84.0
+Version: 0.84.1
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
@@ -49,12 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.GPL README.txt
+%doc COPYING README
 %{python_sitelib}/*
 %{_bindir}/*
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Mon Dec 28 2009 Daniel Drake <dsd at laptop.org> - 0.84.1-1
+- New release
+
 * Tue Mar 03 2009 Simon Schampijer <simon at schampijer.de> - 0.84.0-1
 - Rebuild for 0.84
 



From pkgdb at fedoraproject.org  Mon Dec 28 17:38:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:38:50 +0000
Subject: [pkgdb] pyclutter: ankursinha has given up watchbugzilla
Message-ID: <20091228173854.B8F3D10F894@bastion.fedoraproject.org>

ankursinha has given up the watchbugzilla acl on pyclutter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:39:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:39:16 +0000
Subject: [pkgdb] pyclutter: ankursinha has given up watchbugzilla
Message-ID: <20091228173902.4907910F85E@bastion.fedoraproject.org>

ankursinha has given up the watchbugzilla acl on pyclutter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:39:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:39:01 +0000
Subject: [pkgdb] pyclutter: ankursinha has given up watchbugzilla
Message-ID: <20091228173905.787EE10F894@bastion.fedoraproject.org>

ankursinha has given up the watchbugzilla acl on pyclutter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:43:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:43:58 +0000
Subject: [pkgdb] pyclutter: ankursinha has given up watchcommits
Message-ID: <20091228174357.B3D8210F894@bastion.fedoraproject.org>

ankursinha has given up the watchcommits acl on pyclutter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:17 +0000
Subject: [pkgdb] pyclutter: ankursinha has requested commit
Message-ID: <20091228174402.D4F9510F85E@bastion.fedoraproject.org>

ankursinha has requested the commit acl on pyclutter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:10 +0000
Subject: [pkgdb] pyclutter: ankursinha has requested approveacls
Message-ID: <20091228174407.3863910F8C3@bastion.fedoraproject.org>

ankursinha has requested the approveacls acl on pyclutter (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:17 +0000
Subject: [pkgdb] pyclutter: ankursinha has given up watchbugzilla
Message-ID: <20091228174416.1598710F894@bastion.fedoraproject.org>

ankursinha has given up the watchbugzilla acl on pyclutter (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:19 +0000
Subject: [pkgdb] pyclutter: ankursinha has requested approveacls
Message-ID: <20091228174417.18A4710F88B@bastion.fedoraproject.org>

ankursinha has requested the approveacls acl on pyclutter (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:14 +0000
Subject: [pkgdb] pyclutter: ankursinha has requested commit
Message-ID: <20091228174418.5BA9E10F8CB@bastion.fedoraproject.org>

ankursinha has requested the commit acl on pyclutter (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:35 +0000
Subject: [pkgdb] pyclutter: ankursinha has given up watchcommits
Message-ID: <20091228174421.3FC4810F8BA@bastion.fedoraproject.org>

ankursinha has given up the watchcommits acl on pyclutter (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:24 +0000
Subject: [pkgdb] pyclutter: ankursinha has given up watchbugzilla
Message-ID: <20091228174423.26E3A10F894@bastion.fedoraproject.org>

ankursinha has given up the watchbugzilla acl on pyclutter (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:26 +0000
Subject: [pkgdb] pyclutter: ankursinha has requested commit
Message-ID: <20091228174423.C58A510F8BA@bastion.fedoraproject.org>

ankursinha has requested the commit acl on pyclutter (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:20 +0000
Subject: [pkgdb] pyclutter: ankursinha has requested approveacls
Message-ID: <20091228174424.9BDF010F8BC@bastion.fedoraproject.org>

ankursinha has requested the approveacls acl on pyclutter (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 17:44:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 17:44:40 +0000
Subject: [pkgdb] pyclutter: ankursinha has given up watchcommits
Message-ID: <20091228174425.880AB10F894@bastion.fedoraproject.org>

ankursinha has given up the watchcommits acl on pyclutter (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From tomspur at fedoraproject.org  Mon Dec 28 17:51:22 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 28 Dec 2009 17:51:22 +0000 (UTC)
Subject: rpms/python-daemon/F-12 python-daemon.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091228175122.4E82B11C008D@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15975

Modified Files:
	python-daemon.spec sources 
Log Message:
- Add missing BR: python-nose, minimock, lockfile (for testsuite)
- also add lockfile as R (bug #513546)
- update to 1.5.2



Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/F-12/python-daemon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-daemon.spec	26 Jul 2009 20:16:56 -0000	1.2
+++ python-daemon.spec	28 Dec 2009 17:51:21 -0000	1.3
@@ -1,19 +1,20 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-daemon
-Version:        1.4.6
-Release:        2%{?dist}
+Version:        1.5.2
+Release:        1%{?dist}
 Summary:        Library to implement a well-behaved Unix daemon process
 
 Group:          Development/Languages
 License:        Python
 URL:            http://pypi.python.org/pypi/python-daemon/
 Source0:        http://pypi.python.org/packages/source/p/python-daemon/%{name}-%{version}.tar.gz
-Patch0:         version_info_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
+BuildRequires:  python-nose python-lockfile python-minimock
+Requires:       python-lockfile
 
 %description
 This library implements the well-behaved daemon specification of PEP 3143,
@@ -22,8 +23,7 @@ This library implements the well-behaved
 %prep
 %setup -q
 
-%patch0 -p1
-
+sed -i -e '/^#!\//, 1d' daemon/version/version_info.py
 
 
 %build
@@ -34,17 +34,27 @@ This library implements the well-behaved
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+
+%check
+PYTHONPATH=$(pwd) nosetests
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc TODO LICENSE.PSF-2
+%doc LICENSE.PSF-2
 %{python_sitelib}/*
 
 
 %changelog
+* Mon Dec 28 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.2-1
+- Add missing BR: python-nose, minimock, lockfile (for testsuite)
+- also add lockfile as R (bug #513546)
+- update to 1.5.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jun 2009 05:36:49 -0000	1.2
+++ sources	28 Dec 2009 17:51:22 -0000	1.3
@@ -1 +1 @@
-f3a81fd573d3770f616515f39058e31f  python-daemon-1.4.6.tar.gz
+3c876e2bef46171d4cccf4f74823a638  python-daemon-1.5.2.tar.gz



From arbiter at fedoraproject.org  Mon Dec 28 17:56:32 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Mon, 28 Dec 2009 17:56:32 +0000 (UTC)
Subject: File cherokee-0.99.38.tar.gz uploaded to lookaside cache by arbiter
Message-ID: <20091228175632.BD37D10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cherokee:

67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz



From arbiter at fedoraproject.org  Mon Dec 28 17:59:28 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Mon, 28 Dec 2009 17:59:28 +0000 (UTC)
Subject: rpms/cherokee/EL-4 .cvsignore, 1.12, 1.13 cherokee.spec, 1.16,
	1.17 sources, 1.12, 1.13
Message-ID: <20091228175928.2E70411C008D@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17696

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
- 0.99.38



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	23 Dec 2009 21:56:23 -0000	1.12
+++ .cvsignore	28 Dec 2009 17:59:27 -0000	1.13
@@ -1 +1 @@
-cherokee-0.99.37.tar.gz
+cherokee-0.99.38.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/cherokee.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- cherokee.spec	23 Dec 2009 21:56:23 -0000	1.16
+++ cherokee.spec	28 Dec 2009 17:59:28 -0000	1.17
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.37
+Version:        0.99.38
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
+- 0.99.38
+
 * Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
 - 0.99.37
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	23 Dec 2009 21:56:24 -0000	1.12
+++ sources	28 Dec 2009 17:59:28 -0000	1.13
@@ -1 +1 @@
-05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz
+67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz



From arbiter at fedoraproject.org  Mon Dec 28 17:59:36 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Mon, 28 Dec 2009 17:59:36 +0000 (UTC)
Subject: rpms/cherokee/EL-5 .cvsignore, 1.14, 1.15 cherokee.spec, 1.17,
	1.18 sources, 1.14, 1.15
Message-ID: <20091228175936.1D03D11C008D@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17758

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
- 0.99.38



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	23 Dec 2009 21:56:08 -0000	1.14
+++ .cvsignore	28 Dec 2009 17:59:35 -0000	1.15
@@ -1 +1 @@
-cherokee-0.99.37.tar.gz
+cherokee-0.99.38.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/cherokee.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cherokee.spec	23 Dec 2009 21:56:08 -0000	1.17
+++ cherokee.spec	28 Dec 2009 17:59:35 -0000	1.18
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.37
+Version:        0.99.38
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
+- 0.99.38
+
 * Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
 - 0.99.37
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	23 Dec 2009 21:56:08 -0000	1.14
+++ sources	28 Dec 2009 17:59:36 -0000	1.15
@@ -1 +1 @@
-05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz
+67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz



From arbiter at fedoraproject.org  Mon Dec 28 17:59:44 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Mon, 28 Dec 2009 17:59:44 +0000 (UTC)
Subject: rpms/cherokee/F-11 .cvsignore, 1.14, 1.15 cherokee.spec, 1.20,
	1.21 sources, 1.14, 1.15
Message-ID: <20091228175944.3757D11C008D@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17869

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
- 0.99.38



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	23 Dec 2009 21:55:58 -0000	1.14
+++ .cvsignore	28 Dec 2009 17:59:44 -0000	1.15
@@ -1 +1 @@
-cherokee-0.99.37.tar.gz
+cherokee-0.99.38.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/cherokee.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- cherokee.spec	23 Dec 2009 21:55:58 -0000	1.20
+++ cherokee.spec	28 Dec 2009 17:59:44 -0000	1.21
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.37
+Version:        0.99.38
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
+- 0.99.38
+
 * Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
 - 0.99.37
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	23 Dec 2009 21:55:58 -0000	1.14
+++ sources	28 Dec 2009 17:59:44 -0000	1.15
@@ -1 +1 @@
-05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz
+67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz



From arbiter at fedoraproject.org  Mon Dec 28 18:00:08 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Mon, 28 Dec 2009 18:00:08 +0000 (UTC)
Subject: rpms/cherokee/F-12 .cvsignore, 1.15, 1.16 cherokee.spec, 1.26,
	1.27 sources, 1.16, 1.17
Message-ID: <20091228180008.99B5E11C03E3@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18192

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
- 0.99.38



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	23 Dec 2009 21:55:40 -0000	1.15
+++ .cvsignore	28 Dec 2009 18:00:08 -0000	1.16
@@ -1 +1 @@
-cherokee-0.99.37.tar.gz
+cherokee-0.99.38.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/cherokee.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- cherokee.spec	23 Dec 2009 21:55:40 -0000	1.26
+++ cherokee.spec	28 Dec 2009 18:00:08 -0000	1.27
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.37
+Version:        0.99.38
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
+- 0.99.38
+
 * Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
 - 0.99.37
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	23 Dec 2009 21:55:40 -0000	1.16
+++ sources	28 Dec 2009 18:00:08 -0000	1.17
@@ -1 +1 @@
-05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz
+67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz



From arbiter at fedoraproject.org  Mon Dec 28 18:00:48 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Mon, 28 Dec 2009 18:00:48 +0000 (UTC)
Subject: rpms/cherokee/devel .cvsignore, 1.16, 1.17 cherokee.spec, 1.26,
	1.27 sources, 1.16, 1.17
Message-ID: <20091228180048.48F6611C008D@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18431

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
- 0.99.38



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	23 Dec 2009 21:39:54 -0000	1.16
+++ .cvsignore	28 Dec 2009 18:00:48 -0000	1.17
@@ -1 +1 @@
-cherokee-0.99.37.tar.gz
+cherokee-0.99.38.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- cherokee.spec	23 Dec 2009 21:39:54 -0000	1.26
+++ cherokee.spec	28 Dec 2009 18:00:48 -0000	1.27
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.37
+Version:        0.99.38
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
+- 0.99.38
+
 * Wed Dec 23 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.37-1
 - 0.99.37
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	23 Dec 2009 21:39:54 -0000	1.16
+++ sources	28 Dec 2009 18:00:48 -0000	1.17
@@ -1 +1 @@
-05c4e3c2ffe7c7fd0a3ded29dac6062b  cherokee-0.99.37.tar.gz
+67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz



From tomspur at fedoraproject.org  Mon Dec 28 18:10:05 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 28 Dec 2009 18:10:05 +0000 (UTC)
Subject: rpms/python-daemon/F-11 python-daemon.spec, 1.1, 1.2 sources, 1.2,
	1.3 version_info_fix.patch, 1.1, NONE
Message-ID: <20091228181005.B17B311C03E3@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20561

Modified Files:
	python-daemon.spec sources 
Removed Files:
	version_info_fix.patch 
Log Message:
- Add missing BR: python-nose, minimock, lockfile (for testsuite)
- also add lockfile as R (bug #513546)
- update to 1.5.2



Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/F-11/python-daemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-daemon.spec	29 Jun 2009 05:55:31 -0000	1.1
+++ python-daemon.spec	28 Dec 2009 18:10:05 -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()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-daemon
-Version:        1.4.6
+Version:        1.5.2
 Release:        1%{?dist}
 Summary:        Library to implement a well-behaved Unix daemon process
 
@@ -9,11 +9,12 @@ Group:          Development/Languages
 License:        Python
 URL:            http://pypi.python.org/pypi/python-daemon/
 Source0:        http://pypi.python.org/packages/source/p/python-daemon/%{name}-%{version}.tar.gz
-Patch0:         version_info_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
+BuildRequires:  python-nose python-lockfile python-minimock
+Requires:       python-lockfile
 
 %description
 This library implements the well-behaved daemon specification of PEP 3143,
@@ -22,8 +23,7 @@ This library implements the well-behaved
 %prep
 %setup -q
 
-%patch0 -p1
-
+sed -i -e '/^#!\//, 1d' daemon/version/version_info.py
 
 
 %build
@@ -34,17 +34,27 @@ This library implements the well-behaved
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+
+%check
+PYTHONPATH=$(pwd) nosetests
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc TODO LICENSE.PSF-2
+%doc LICENSE.PSF-2
 %{python_sitelib}/*
 
 
 %changelog
+* Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.2-1
+- add missing BR: python-nose, minimock and lockfile
+- also add lockfile as R (bug #513546)
+- update to 1.5.2
+
 * Wed Jun 24 2009 Kushal Das <kushal at fedoraproject.org> 1.4.6-1
 - Initial release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jun 2009 05:55:31 -0000	1.2
+++ sources	28 Dec 2009 18:10:05 -0000	1.3
@@ -1 +1 @@
-f3a81fd573d3770f616515f39058e31f  python-daemon-1.4.6.tar.gz
+3c876e2bef46171d4cccf4f74823a638  python-daemon-1.5.2.tar.gz


--- version_info_fix.patch DELETED ---



From drago01 at fedoraproject.org  Mon Dec 28 18:10:47 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 28 Dec 2009 18:10:47 +0000 (UTC)
Subject: File fsarchiver-0.6.3.tar.gz uploaded to lookaside cache by drago01
Message-ID: <20091228181047.EE27E10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for fsarchiver:

5a6cf5cae9e7536a840841caa488c729  fsarchiver-0.6.3.tar.gz



From tomspur at fedoraproject.org  Mon Dec 28 18:11:13 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 28 Dec 2009 18:11:13 +0000 (UTC)
Subject: rpms/python-daemon/devel version_info_fix.patch,1.1,NONE
Message-ID: <20091228181113.8CAE711C008D@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21278

Removed Files:
	version_info_fix.patch 
Log Message:
remove unneeded patch


--- version_info_fix.patch DELETED ---



From tomspur at fedoraproject.org  Mon Dec 28 18:11:56 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 28 Dec 2009 18:11:56 +0000 (UTC)
Subject: rpms/python-daemon/F-12 version_info_fix.patch,1.1,NONE
Message-ID: <20091228181156.61E5F11C008D@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/python-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21478

Removed Files:
	version_info_fix.patch 
Log Message:
remove unneeded patch


--- version_info_fix.patch DELETED ---



From drago01 at fedoraproject.org  Mon Dec 28 18:12:41 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 28 Dec 2009 18:12:41 +0000 (UTC)
Subject: rpms/fsarchiver/devel .cvsignore, 1.14, 1.15 fsarchiver.spec, 1.21,
	1.22 sources, 1.14, 1.15
Message-ID: <20091228181241.757CC11C008D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21698

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
0.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	22 Dec 2009 19:33:10 -0000	1.14
+++ .cvsignore	28 Dec 2009 18:12:41 -0000	1.15
@@ -1 +1 @@
-fsarchiver-0.6.2.tar.gz
+fsarchiver-0.6.3.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- fsarchiver.spec	22 Dec 2009 19:33:10 -0000	1.21
+++ fsarchiver.spec	28 Dec 2009 18:12:41 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.2
+Version:	0.6.3
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -33,7 +33,6 @@ is corrupt, you just loose the current f
 
 %prep
 %setup -q
-%patch1 -p1 -b .split
 
 %build
 %configure
@@ -56,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Mon Dec 28 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.3-1
+- Update to 0.6.3
+
 * Tue Dec 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.2-1
 - Update to 0.6.2
 - Apply fix as requested by upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Dec 2009 19:33:10 -0000	1.14
+++ sources	28 Dec 2009 18:12:41 -0000	1.15
@@ -1 +1 @@
-148a13ff7ecc4c65b5517184564ac2fe  fsarchiver-0.6.2.tar.gz
+5a6cf5cae9e7536a840841caa488c729  fsarchiver-0.6.3.tar.gz



From drago01 at fedoraproject.org  Mon Dec 28 18:14:00 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 28 Dec 2009 18:14:00 +0000 (UTC)
Subject: rpms/fsarchiver/F-12 .cvsignore, 1.14, 1.15 fsarchiver.spec, 1.21,
	1.22 sources, 1.14, 1.15 fsarchiver-0.6.2-fix-splitting.patch,
	1.1, NONE
Message-ID: <20091228181400.99D3411C008D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22152

Modified Files:
	.cvsignore fsarchiver.spec sources 
Removed Files:
	fsarchiver-0.6.2-fix-splitting.patch 
Log Message:
0.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	22 Dec 2009 19:35:33 -0000	1.14
+++ .cvsignore	28 Dec 2009 18:14:00 -0000	1.15
@@ -1 +1 @@
-fsarchiver-0.6.2.tar.gz
+fsarchiver-0.6.3.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/fsarchiver.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- fsarchiver.spec	22 Dec 2009 19:35:33 -0000	1.21
+++ fsarchiver.spec	28 Dec 2009 18:14:00 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.2
+Version:	0.6.3
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -33,7 +33,6 @@ is corrupt, you just loose the current f
 
 %prep
 %setup -q
-%patch1 -p1 -b .split
 
 %build
 %configure
@@ -56,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Mon Dec 28 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.3-1
+- Update to 0.6.3
+
 * Tue Dec 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.2-1
 - Update to 0.6.2
 - Apply fix as requested by upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Dec 2009 19:35:33 -0000	1.14
+++ sources	28 Dec 2009 18:14:00 -0000	1.15
@@ -1 +1 @@
-148a13ff7ecc4c65b5517184564ac2fe  fsarchiver-0.6.2.tar.gz
+5a6cf5cae9e7536a840841caa488c729  fsarchiver-0.6.3.tar.gz


--- fsarchiver-0.6.2-fix-splitting.patch DELETED ---



From drago01 at fedoraproject.org  Mon Dec 28 18:16:21 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 28 Dec 2009 18:16:21 +0000 (UTC)
Subject: rpms/fsarchiver/devel fsarchiver.spec, 1.22,
	1.23 fsarchiver-0.6.2-fix-splitting.patch, 1.1, NONE
Message-ID: <20091228181621.65FA611C008D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22874

Modified Files:
	fsarchiver.spec 
Removed Files:
	fsarchiver-0.6.2-fix-splitting.patch 
Log Message:
remove patch


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- fsarchiver.spec	28 Dec 2009 18:12:41 -0000	1.22
+++ fsarchiver.spec	28 Dec 2009 18:16:21 -0000	1.23
@@ -9,8 +9,6 @@ URL:		http://www.fsarchiver.org
 Source0:  	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: fsarchiver-0.6.2-fix-splitting.patch
-
 BuildRequires:	e2fsprogs-devel => 1.41.4
 BuildRequires:	libuuid-devel
 BuildRequires:	libblkid-devel


--- fsarchiver-0.6.2-fix-splitting.patch DELETED ---



From drago01 at fedoraproject.org  Mon Dec 28 18:16:39 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 28 Dec 2009 18:16:39 +0000 (UTC)
Subject: rpms/fsarchiver/F-12 fsarchiver.spec,1.22,1.23
Message-ID: <20091228181639.8E7AF11C008D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22986

Modified Files:
	fsarchiver.spec 
Log Message:
remove patch


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/fsarchiver.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- fsarchiver.spec	28 Dec 2009 18:14:00 -0000	1.22
+++ fsarchiver.spec	28 Dec 2009 18:16:39 -0000	1.23
@@ -9,8 +9,6 @@ URL:		http://www.fsarchiver.org
 Source0:  	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: fsarchiver-0.6.2-fix-splitting.patch
-
 BuildRequires:	e2fsprogs-devel => 1.41.4
 BuildRequires:	libuuid-devel
 BuildRequires:	libblkid-devel



From drago01 at fedoraproject.org  Mon Dec 28 18:17:19 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 28 Dec 2009 18:17:19 +0000 (UTC)
Subject: rpms/fsarchiver/F-11 .cvsignore, 1.14, 1.15 fsarchiver.spec, 1.19,
	1.20 sources, 1.14, 1.15 fsarchiver-0.6.2-fix-splitting.patch,
	1.1, NONE
Message-ID: <20091228181719.40C6A11C008D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23215

Modified Files:
	.cvsignore fsarchiver.spec sources 
Removed Files:
	fsarchiver-0.6.2-fix-splitting.patch 
Log Message:
0.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	22 Dec 2009 19:40:14 -0000	1.14
+++ .cvsignore	28 Dec 2009 18:17:18 -0000	1.15
@@ -1 +1 @@
-fsarchiver-0.6.2.tar.gz
+fsarchiver-0.6.3.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/fsarchiver.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fsarchiver.spec	22 Dec 2009 19:48:36 -0000	1.19
+++ fsarchiver.spec	28 Dec 2009 18:17:19 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.2
+Version:	0.6.3
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -9,7 +9,6 @@ URL:		http://www.fsarchiver.org
 Source0:  	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: fsarchiver-0.6.2-fix-splitting.patch
 
 BuildRequires:	e2fsprogs-devel => 1.41.4
 BuildRequires:	e2fsprogs
@@ -31,7 +30,6 @@ is corrupt, you just loose the current f
 
 %prep
 %setup -q
-%patch1 -p1 -b .split
 
 %build
 %configure
@@ -54,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Mon Dec 28 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.3-1
+- Update to 0.6.3
+
 * Tue Dec 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.2-1
 - Update to 0.6.2
 - Apply fix as requested by upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Dec 2009 19:40:14 -0000	1.14
+++ sources	28 Dec 2009 18:17:19 -0000	1.15
@@ -1 +1 @@
-148a13ff7ecc4c65b5517184564ac2fe  fsarchiver-0.6.2.tar.gz
+5a6cf5cae9e7536a840841caa488c729  fsarchiver-0.6.3.tar.gz


--- fsarchiver-0.6.2-fix-splitting.patch DELETED ---



From sciurius at fedoraproject.org  Mon Dec 28 19:54:39 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 28 Dec 2009 19:54:39 +0000 (UTC)
Subject: File EekBoek-1.04.05.tar.gz uploaded to lookaside cache by sciurius
Message-ID: <20091228195439.5900B10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for EekBoek:

c534fe845b7b9258d70a1acdf85f158d  EekBoek-1.04.05.tar.gz



From sciurius at fedoraproject.org  Mon Dec 28 19:55:15 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 28 Dec 2009 19:55:15 +0000 (UTC)
Subject: rpms/EekBoek/F-11 .cvsignore, 1.3, 1.4 EekBoek.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091228195516.173CB11C008D@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/EekBoek/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10924/F-11

Modified Files:
	.cvsignore EekBoek.spec sources 
Log Message:
1.04.05-1.fc11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Jun 2009 20:36:23 -0000	1.3
+++ .cvsignore	28 Dec 2009 19:55:15 -0000	1.4
@@ -1 +1 @@
-EekBoek-1.04.04.tar.gz
+EekBoek-1.04.05.tar.gz


Index: EekBoek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-11/EekBoek.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- EekBoek.spec	19 Jun 2009 20:35:22 -0000	1.2
+++ EekBoek.spec	28 Dec 2009 19:55:15 -0000	1.3
@@ -10,7 +10,7 @@ Name: EekBoek
 Summary: Bookkeeping software for small and medium-size businesses
 License: GPL+ or Artistic
 Group: Applications/Productivity
-Version: 1.04.04
+Version: 1.04.05
 Release: 1%{?dist}
 Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
 Source1: README.postgres
@@ -162,6 +162,9 @@ pod2man blib/script/ebshell > %{buildroo
 %{ebshare}/lib/EB/DB/Postgres.pm
 
 %changelog
+* Mon Dec 28 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.05-1
+- Upgrade to upstream 1.04.05.
+
 * Fri Jun 19 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.04-1
 - Upgrade to upstream 1.04.04.
 - Obsolete script patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Jun 2009 20:35:22 -0000	1.3
+++ sources	28 Dec 2009 19:55:15 -0000	1.4
@@ -1 +1 @@
-d95896f1aa32e1f5c5c43a4426994ce0  EekBoek-1.04.04.tar.gz
+c534fe845b7b9258d70a1acdf85f158d  EekBoek-1.04.05.tar.gz



From sciurius at fedoraproject.org  Mon Dec 28 19:55:56 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 28 Dec 2009 19:55:56 +0000 (UTC)
Subject: rpms/EekBoek/F-12 .cvsignore, 1.3, 1.4 EekBoek.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20091228195556.DB3E911C008D@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/EekBoek/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11231/F-12

Modified Files:
	.cvsignore EekBoek.spec sources 
Log Message:
1.04.05-1.fc11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Jun 2009 20:29:46 -0000	1.3
+++ .cvsignore	28 Dec 2009 19:55:56 -0000	1.4
@@ -1 +1 @@
-EekBoek-1.04.04.tar.gz
+EekBoek-1.04.05.tar.gz


Index: EekBoek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-12/EekBoek.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- EekBoek.spec	24 Jul 2009 15:08:53 -0000	1.3
+++ EekBoek.spec	28 Dec 2009 19:55:56 -0000	1.4
@@ -10,8 +10,8 @@ Name: EekBoek
 Summary: Bookkeeping software for small and medium-size businesses
 License: GPL+ or Artistic
 Group: Applications/Productivity
-Version: 1.04.04
-Release: 2%{?dist}
+Version: 1.04.05
+Release: 1%{?dist}
 Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
 Source1: README.postgres
 URL: http://www.eekboek.nl
@@ -162,8 +162,8 @@ pod2man blib/script/ebshell > %{buildroo
 %{ebshare}/lib/EB/DB/Postgres.pm
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04.04-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Dec 28 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.05-1
+- Upgrade to upstream 1.04.05.
 
 * Fri Jun 19 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.04-1
 - Upgrade to upstream 1.04.04.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Jun 2009 20:29:46 -0000	1.3
+++ sources	28 Dec 2009 19:55:56 -0000	1.4
@@ -1 +1 @@
-d95896f1aa32e1f5c5c43a4426994ce0  EekBoek-1.04.04.tar.gz
+c534fe845b7b9258d70a1acdf85f158d  EekBoek-1.04.05.tar.gz



From sciurius at fedoraproject.org  Mon Dec 28 19:56:38 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 28 Dec 2009 19:56:38 +0000 (UTC)
Subject: rpms/EekBoek/devel .cvsignore, 1.3, 1.4 EekBoek.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20091228195638.DC05711C008D@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/EekBoek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11496/devel

Modified Files:
	.cvsignore EekBoek.spec sources 
Log Message:
1.04.05-1.fc11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Jun 2009 20:29:46 -0000	1.3
+++ .cvsignore	28 Dec 2009 19:56:38 -0000	1.4
@@ -1 +1 @@
-EekBoek-1.04.04.tar.gz
+EekBoek-1.04.05.tar.gz


Index: EekBoek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/devel/EekBoek.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- EekBoek.spec	24 Jul 2009 15:08:53 -0000	1.3
+++ EekBoek.spec	28 Dec 2009 19:56:38 -0000	1.4
@@ -10,8 +10,8 @@ Name: EekBoek
 Summary: Bookkeeping software for small and medium-size businesses
 License: GPL+ or Artistic
 Group: Applications/Productivity
-Version: 1.04.04
-Release: 2%{?dist}
+Version: 1.04.05
+Release: 1%{?dist}
 Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
 Source1: README.postgres
 URL: http://www.eekboek.nl
@@ -162,8 +162,8 @@ pod2man blib/script/ebshell > %{buildroo
 %{ebshare}/lib/EB/DB/Postgres.pm
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04.04-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Dec 28 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.05-1
+- Upgrade to upstream 1.04.05.
 
 * Fri Jun 19 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.04-1
 - Upgrade to upstream 1.04.04.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Jun 2009 20:29:46 -0000	1.3
+++ sources	28 Dec 2009 19:56:38 -0000	1.4
@@ -1 +1 @@
-d95896f1aa32e1f5c5c43a4426994ce0  EekBoek-1.04.04.tar.gz
+c534fe845b7b9258d70a1acdf85f158d  EekBoek-1.04.05.tar.gz



From tuju at fedoraproject.org  Mon Dec 28 20:18:59 2009
From: tuju at fedoraproject.org (Juha Tuomala)
Date: Mon, 28 Dec 2009 20:18:59 +0000 (UTC)
Subject: File python-utmp_0.7.tar.gz uploaded to lookaside cache by tuju
Message-ID: <20091228201859.81BA310F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-utmp:

9ff7241fb388169bf0f5a8c3009145f9  python-utmp_0.7.tar.gz



From tuju at fedoraproject.org  Mon Dec 28 20:19:30 2009
From: tuju at fedoraproject.org (Juha Tuomala)
Date: Mon, 28 Dec 2009 20:19:30 +0000 (UTC)
Subject: rpms/python-utmp/devel sources,1.1,1.2
Message-ID: <20091228201930.B038E11C008D@cvs1.fedora.phx.redhat.com>

Author: tuju

Update of /cvs/pkgs/rpms/python-utmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16347

Modified Files:
	sources 
Log Message:
added source.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-utmp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	2 Aug 2009 12:45:13 -0000	1.1
+++ sources	28 Dec 2009 20:19:30 -0000	1.2
@@ -0,0 +1 @@
+9ff7241fb388169bf0f5a8c3009145f9  python-utmp_0.7.tar.gz



From tuju at fedoraproject.org  Mon Dec 28 20:21:52 2009
From: tuju at fedoraproject.org (Juha Tuomala)
Date: Mon, 28 Dec 2009 20:21:52 +0000 (UTC)
Subject: rpms/python-utmp/devel python-utmp.spec,NONE,1.1
Message-ID: <20091228202152.9B94811C008D@cvs1.fedora.phx.redhat.com>

Author: tuju

Update of /cvs/pkgs/rpms/python-utmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16867

Added Files:
	python-utmp.spec 
Log Message:
added spec.



--- NEW FILE python-utmp.spec ---
%global		python_version	%(python -c 'import sys; print sys.version[:3]')
%global		python_sitelib	%(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()')

Name:		python-utmp
Version:	0.7
Release:	5%{?dist}
Summary:	Python modules for umtp records

Group:		System Environment/Libraries
License:	Copyright only
URL:		http://kassiopeia.juls.savba.sk/~garabik/software/python-utmp/
Source0:	http://kassiopeia.juls.savba.sk/~garabik/software/python-utmp/%{name}_%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	python-devel


%description
python-utmp consists of three modules, providing access to utmp records.
It is quite difficult to access utmp record portably, because every UNIX
has different structure of utmp files. Currently, python-utmp works on
platforms which provide getutent, getutid, getutline, pututline,
setutent, endutent and utmpname functions (such as GNU systems
(Linux and hurd) and System V unices) and on BSD systems using
simple utmp structure.


%prep
%setup -q


%build
make -f Makefile.glibc \
	DEFINES=" \
		-D_HAVE_UT_SESSION -D_HAVE_UT_ADDR_V6 -D_HAVE_UT_EXIT \
		-D_HAVE_UT_HOST -D_HAVE_UT_ID -D_HAVE_UT_TV -D_HAVE_UT_USER \
		-D_HAVE_UTMPNAME -D_HAVE_SETUTENT -D_HAVE_GETUTENT -D_HAVE_ENDUTENT \
		-D_HAVE_GETUTID -D_HAVE_GETUTLINE -D_HAVE_PUTUTLINE \
		%{optflags}" \
	PYTHONVER=%{python_version}


%install
rm -rf %{buildroot}
make \
	PYTHONDIR=%{buildroot}/%{python_sitelib}/ \
	PYTHONVER=%{python_version} \
	install
rm -f COPYING
install -D -p -m644 debian/copyright COPYING



%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README TODO
%{python_sitelib}/*


%changelog
* Tue Jul 28 2009 Juha Tuomala <tuju at iki.fi> - 0.7-5
- Minor spec imrovements.

* Tue Jul 21 2009 Juha Tuomala <tuju at iki.fi> - 0.7-4
- Minor spec imrovements.

* Sun Jul 05 2009 Juha Tuomala <tuju at iki.fi> - 0.7-3
- License string fix.

* Sun Jul 05 2009 Juha Tuomala <tuju at iki.fi> - 0.7-2
- Spec modifications, bug #505259.

* Thu Jun 11 2009 Juha Tuomala <tuju at iki.fi> - 0.7-1
- Initial package.



From tuju at fedoraproject.org  Mon Dec 28 20:22:50 2009
From: tuju at fedoraproject.org (Juha Tuomala)
Date: Mon, 28 Dec 2009 20:22:50 +0000 (UTC)
Subject: rpms/python-utmp/devel .cvsignore,1.1,1.2
Message-ID: <20091228202250.1B0D811C008D@cvs1.fedora.phx.redhat.com>

Author: tuju

Update of /cvs/pkgs/rpms/python-utmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17148

Modified Files:
	.cvsignore 
Log Message:
.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-utmp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	2 Aug 2009 12:45:13 -0000	1.1
+++ .cvsignore	28 Dec 2009 20:22:50 -0000	1.2
@@ -0,0 +1 @@
+python-utmp_0.7.tar.gz



From sciurius at fedoraproject.org  Mon Dec 28 20:33:59 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Mon, 28 Dec 2009 20:33:59 +0000 (UTC)
Subject: rpms/EekBoek/devel EekBoek-1.04.05.sqlite.patch, NONE,
	1.1 EekBoek.spec, 1.4, 1.5 import.log, 1.1, 1.2
Message-ID: <20091228203359.E27F211C008D@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/EekBoek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19675/devel

Modified Files:
	EekBoek.spec import.log 
Added Files:
	EekBoek-1.04.05.sqlite.patch 
Log Message:
1.04.05-2.fc13

EekBoek-1.04.05.sqlite.patch:
 Sqlite.pm |    2 !!
 1 file changed, 2 modifications(!)

--- NEW FILE EekBoek-1.04.05.sqlite.patch ---
*** lib/EB/DB/Sqlite.pm~	2008-02-07 13:18:24.000000000 +0100
--- lib/EB/DB/Sqlite.pm	2009-12-28 21:09:09.000000000 +0100
***************
*** 171,177 ****
      foreach ( $dbh->tables ) {
  	# SQLite returns table names with quotes.
  	# Our tables all start with an uppercase letter.
! 	next unless /^"([[:upper:]].+)"$/i;
  	push(@t, lc($1));
      }
      \@t;
--- 171,177 ----
      foreach ( $dbh->tables ) {
  	# SQLite returns table names with quotes.
  	# Our tables all start with an uppercase letter.
! 	next unless /^"(?:main"\.")?([[:upper:]].+)"$/i;
  	push(@t, lc($1));
      }
      \@t;


Index: EekBoek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/devel/EekBoek.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- EekBoek.spec	28 Dec 2009 19:56:38 -0000	1.4
+++ EekBoek.spec	28 Dec 2009 20:33:59 -0000	1.5
@@ -11,9 +11,10 @@ Summary: Bookkeeping software for small 
 License: GPL+ or Artistic
 Group: Applications/Productivity
 Version: 1.04.05
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
 Source1: README.postgres
+Patch1: EekBoek-1.04.05.sqlite.patch
 URL: http://www.eekboek.nl
 BuildRoot: %{_tmppath}/rpm-buildroot-%{name}-%{version}-%{release}
 
@@ -88,6 +89,9 @@ This package contains the PostgreSQL dat
 # Create docs for the subpackage.
 cp -p %SOURCE1 .
 
+# Patch for newer versions of SQLite.
+%patch1 -b .sqlite
+
 # Remove some build helper sources since we BuildRequire them.
 %{__rm} -fr inc/IPC inc/Module
 %{__perl} -ni~ -e 'print unless m;^inc/(Module|IPC)/;;' MANIFEST
@@ -162,6 +166,9 @@ pod2man blib/script/ebshell > %{buildroo
 %{ebshare}/lib/EB/DB/Postgres.pm
 
 %changelog
+* Mon Dec 28 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.05-2
+- Fix for table detection with newer SQLite.
+
 * Mon Dec 28 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.05-1
 - Upgrade to upstream 1.04.05.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/EekBoek/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	26 Apr 2009 21:35:13 -0000	1.1
+++ import.log	28 Dec 2009 20:33:59 -0000	1.2
@@ -1 +1,2 @@
 EekBoek-1_04_03-3_fc11:HEAD:EekBoek-1.04.03-3.fc11.src.rpm:1240781588
+EekBoek-1_04_05-2_fc13:HEAD:EekBoek-1.04.05-2.fc13.src.rpm:1262032390



From abompard at fedoraproject.org  Mon Dec 28 21:37:16 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 28 Dec 2009 21:37:16 +0000 (UTC)
Subject: rpms/spring/F-11 spring-0.80.5.2-staticlib.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 sources, 1.7, 1.8 spring-README.Fedora, 1.1,
	1.2 spring.spec, 1.8, 1.9
Message-ID: <20091228213716.CFBCB11C008D@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32255/F-11

Modified Files:
	.cvsignore sources spring-README.Fedora spring.spec 
Added Files:
	spring-0.80.5.2-staticlib.patch 
Log Message:
* Sat Nov 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.5.2-1
- New release: 0.80.5.2


spring-0.80.5.2-staticlib.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE spring-0.80.5.2-staticlib.patch ---
diff -up ./rts/lib/liblobby/CMakeLists.txt.staticlib ./rts/lib/liblobby/CMakeLists.txt
--- ./rts/lib/liblobby/CMakeLists.txt.staticlib	2009-12-24 08:31:38.501099163 +0100
+++ ./rts/lib/liblobby/CMakeLists.txt	2009-12-24 08:31:52.239960507 +0100
@@ -1,4 +1,4 @@
-add_library(lobby Connection)
+add_library(lobby STATIC Connection)
 target_link_libraries(lobby ${WIN32_LIBRARIES} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
 
 add_executable(testapp EXCLUDE_FROM_ALL Test/testapp)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	20 Sep 2009 11:35:37 -0000	1.7
+++ .cvsignore	28 Dec 2009 21:37:16 -0000	1.8
@@ -1 +1 @@
-spring_0.80.4.2_src.tar.lzma
+spring_0.80.5.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	20 Sep 2009 11:35:37 -0000	1.7
+++ sources	28 Dec 2009 21:37:16 -0000	1.8
@@ -1 +1 @@
-4c67e82316b282e313b84a1f48b6e90d  spring_0.80.4.2_src.tar.lzma
+61775b3fda894fd2dd39eb03178943c3  spring_0.80.5.2_src.tar.lzma


Index: spring-README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/spring-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- spring-README.Fedora	18 Mar 2009 06:26:27 -0000	1.1
+++ spring-README.Fedora	28 Dec 2009 21:37:16 -0000	1.2
@@ -7,7 +7,7 @@ download some mods and click on the file
 The same goes for maps, just download and click on them.
 
 The places to download maps and mods are referenced on the Spring wiki:
-http://spring.clan-sy.com/wiki/Main_Page
+http://springrts.com/wiki/Main_Page
 
 An installer for the "Complete Anihilation" mod is provided in the ca-installer
 package. Some defaults maps should already be installed (they come from the


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/spring.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- spring.spec	20 Sep 2009 11:35:37 -0000	1.8
+++ spring.spec	28 Dec 2009 21:37:16 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.4.2
+Version:        0.80.5.2
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -18,6 +18,8 @@ Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
 Patch0:         spring-0.80.2-allegro.patch
+# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
+Patch1:         spring-0.80.5.2-staticlib.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,10 +57,14 @@ great resource, read it here: http://spr
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
 %patch0 -p0 -b .allegro
+%patch1 -p0 -b .staticlib
 find rts/lib/7z -type f | xargs chmod -x 
 
 
 %build
+# BUILD_SHARED_LIBS = ON causes a build failure:
+# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
+#       -DBUILD_SHARED_LIBS:BOOL=OFF \
 %cmake -DDATADIR:PATH=share/%{name} \
        -DLIBDIR:PATH=%{_lib} \
        .
@@ -127,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/libunitsync.so
 %{_libdir}/libspringserver.so
-%{_libdir}/%{name}
+#%{_libdir}/%{name}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/48x48/*/*.png
 %{_datadir}/applications/*.desktop
@@ -135,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.5.2-1
+- New release: 0.80.5.2
+
 * Sun Sep 20 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.2-1
 - New release: 0.80.4.2 (bugfix)
 



From abompard at fedoraproject.org  Mon Dec 28 21:37:17 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 28 Dec 2009 21:37:17 +0000 (UTC)
Subject: rpms/spring/F-12 spring-0.80.5.2-staticlib.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 sources, 1.8, 1.9 spring-README.Fedora, 1.1,
	1.2 spring.spec, 1.10, 1.11
Message-ID: <20091228213717.051A311C008D@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32255/F-12

Modified Files:
	.cvsignore sources spring-README.Fedora spring.spec 
Added Files:
	spring-0.80.5.2-staticlib.patch 
Log Message:
* Sat Nov 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.5.2-1
- New release: 0.80.5.2


spring-0.80.5.2-staticlib.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE spring-0.80.5.2-staticlib.patch ---
diff -up ./rts/lib/liblobby/CMakeLists.txt.staticlib ./rts/lib/liblobby/CMakeLists.txt
--- ./rts/lib/liblobby/CMakeLists.txt.staticlib	2009-12-24 08:31:38.501099163 +0100
+++ ./rts/lib/liblobby/CMakeLists.txt	2009-12-24 08:31:52.239960507 +0100
@@ -1,4 +1,4 @@
-add_library(lobby Connection)
+add_library(lobby STATIC Connection)
 target_link_libraries(lobby ${WIN32_LIBRARIES} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
 
 add_executable(testapp EXCLUDE_FROM_ALL Test/testapp)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 11:35:37 -0000	1.8
+++ .cvsignore	28 Dec 2009 21:37:16 -0000	1.9
@@ -1 +1 @@
-spring_0.80.4.2_src.tar.lzma
+spring_0.80.5.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 11:35:37 -0000	1.8
+++ sources	28 Dec 2009 21:37:16 -0000	1.9
@@ -1 +1 @@
-4c67e82316b282e313b84a1f48b6e90d  spring_0.80.4.2_src.tar.lzma
+61775b3fda894fd2dd39eb03178943c3  spring_0.80.5.2_src.tar.lzma


Index: spring-README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/spring-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- spring-README.Fedora	18 Mar 2009 06:26:27 -0000	1.1
+++ spring-README.Fedora	28 Dec 2009 21:37:16 -0000	1.2
@@ -7,7 +7,7 @@ download some mods and click on the file
 The same goes for maps, just download and click on them.
 
 The places to download maps and mods are referenced on the Spring wiki:
-http://spring.clan-sy.com/wiki/Main_Page
+http://springrts.com/wiki/Main_Page
 
 An installer for the "Complete Anihilation" mod is provided in the ca-installer
 package. Some defaults maps should already be installed (they come from the


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/spring.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- spring.spec	20 Sep 2009 11:35:37 -0000	1.10
+++ spring.spec	28 Dec 2009 21:37:16 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.4.2
+Version:        0.80.5.2
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -18,6 +18,8 @@ Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
 Patch0:         spring-0.80.2-allegro.patch
+# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
+Patch1:         spring-0.80.5.2-staticlib.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,10 +57,14 @@ great resource, read it here: http://spr
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
 %patch0 -p0 -b .allegro
+%patch1 -p0 -b .staticlib
 find rts/lib/7z -type f | xargs chmod -x 
 
 
 %build
+# BUILD_SHARED_LIBS = ON causes a build failure:
+# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
+#       -DBUILD_SHARED_LIBS:BOOL=OFF \
 %cmake -DDATADIR:PATH=share/%{name} \
        -DLIBDIR:PATH=%{_lib} \
        .
@@ -127,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/libunitsync.so
 %{_libdir}/libspringserver.so
-%{_libdir}/%{name}
+#%{_libdir}/%{name}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/48x48/*/*.png
 %{_datadir}/applications/*.desktop
@@ -135,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.5.2-1
+- New release: 0.80.5.2
+
 * Sun Sep 20 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.2-1
 - New release: 0.80.4.2 (bugfix)
 



From abompard at fedoraproject.org  Mon Dec 28 21:37:17 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 28 Dec 2009 21:37:17 +0000 (UTC)
Subject: rpms/spring/devel spring-0.80.5.2-staticlib.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 spring-README.Fedora,
	1.1, 1.2 spring.spec, 1.10, 1.11
Message-ID: <20091228213717.3B71211C008D@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32255/devel

Modified Files:
	.cvsignore sources spring-README.Fedora spring.spec 
Added Files:
	spring-0.80.5.2-staticlib.patch 
Log Message:
* Sat Nov 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.5.2-1
- New release: 0.80.5.2


spring-0.80.5.2-staticlib.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE spring-0.80.5.2-staticlib.patch ---
diff -up ./rts/lib/liblobby/CMakeLists.txt.staticlib ./rts/lib/liblobby/CMakeLists.txt
--- ./rts/lib/liblobby/CMakeLists.txt.staticlib	2009-12-24 08:31:38.501099163 +0100
+++ ./rts/lib/liblobby/CMakeLists.txt	2009-12-24 08:31:52.239960507 +0100
@@ -1,4 +1,4 @@
-add_library(lobby Connection)
+add_library(lobby STATIC Connection)
 target_link_libraries(lobby ${WIN32_LIBRARIES} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
 
 add_executable(testapp EXCLUDE_FROM_ALL Test/testapp)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 11:35:37 -0000	1.8
+++ .cvsignore	28 Dec 2009 21:37:17 -0000	1.9
@@ -1 +1 @@
-spring_0.80.4.2_src.tar.lzma
+spring_0.80.5.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 11:35:37 -0000	1.8
+++ sources	28 Dec 2009 21:37:17 -0000	1.9
@@ -1 +1 @@
-4c67e82316b282e313b84a1f48b6e90d  spring_0.80.4.2_src.tar.lzma
+61775b3fda894fd2dd39eb03178943c3  spring_0.80.5.2_src.tar.lzma


Index: spring-README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- spring-README.Fedora	18 Mar 2009 06:26:27 -0000	1.1
+++ spring-README.Fedora	28 Dec 2009 21:37:17 -0000	1.2
@@ -7,7 +7,7 @@ download some mods and click on the file
 The same goes for maps, just download and click on them.
 
 The places to download maps and mods are referenced on the Spring wiki:
-http://spring.clan-sy.com/wiki/Main_Page
+http://springrts.com/wiki/Main_Page
 
 An installer for the "Complete Anihilation" mod is provided in the ca-installer
 package. Some defaults maps should already be installed (they come from the


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- spring.spec	20 Sep 2009 11:35:37 -0000	1.10
+++ spring.spec	28 Dec 2009 21:37:17 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.4.2
+Version:        0.80.5.2
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -18,6 +18,8 @@ Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
 Patch0:         spring-0.80.2-allegro.patch
+# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
+Patch1:         spring-0.80.5.2-staticlib.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,10 +57,14 @@ great resource, read it here: http://spr
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
 %patch0 -p0 -b .allegro
+%patch1 -p0 -b .staticlib
 find rts/lib/7z -type f | xargs chmod -x 
 
 
 %build
+# BUILD_SHARED_LIBS = ON causes a build failure:
+# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
+#       -DBUILD_SHARED_LIBS:BOOL=OFF \
 %cmake -DDATADIR:PATH=share/%{name} \
        -DLIBDIR:PATH=%{_lib} \
        .
@@ -127,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/libunitsync.so
 %{_libdir}/libspringserver.so
-%{_libdir}/%{name}
+#%{_libdir}/%{name}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/48x48/*/*.png
 %{_datadir}/applications/*.desktop
@@ -135,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.5.2-1
+- New release: 0.80.5.2
+
 * Sun Sep 20 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.2-1
 - New release: 0.80.4.2 (bugfix)
 



From pkgdb at fedoraproject.org  Mon Dec 28 21:55:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 21:55:59 +0000
Subject: [pkgdb] pyclutter had acl change status
Message-ID: <20091228215603.B1BF610F8A5@bastion.fedoraproject.org>

sundaram has set the commit acl on pyclutter (Fedora devel) to Approved for ankursinha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 21:56:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 21:56:06 +0000
Subject: [pkgdb] pyclutter had acl change status
Message-ID: <20091228215605.1821510F8BA@bastion.fedoraproject.org>

sundaram has set the approveacls acl on pyclutter (Fedora devel) to Approved for ankursinha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 21:56:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 21:56:17 +0000
Subject: [pkgdb] pyclutter had acl change status
Message-ID: <20091228215614.7419210F8A5@bastion.fedoraproject.org>

sundaram has set the commit acl on pyclutter (Fedora 12) to Approved for ankursinha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 21:56:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 21:56:15 +0000
Subject: [pkgdb] pyclutter had acl change status
Message-ID: <20091228215619.46E5D10F8A5@bastion.fedoraproject.org>

sundaram has set the approveacls acl on pyclutter (Fedora 12) to Approved for ankursinha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From pkgdb at fedoraproject.org  Mon Dec 28 21:56:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 28 Dec 2009 21:56:29 +0000
Subject: [pkgdb] pyclutter had acl change status
Message-ID: <20091228215628.6DEB810F8A5@bastion.fedoraproject.org>

sundaram has set the approveacls acl on pyclutter (Fedora 12) to Approved for ankursinha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyclutter



From abompard at fedoraproject.org  Mon Dec 28 21:57:19 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 28 Dec 2009 21:57:19 +0000 (UTC)
Subject: rpms/spring/F-12 spring.spec,1.11,1.12
Message-ID: <20091228215719.A28F711C008D@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4010

Modified Files:
	spring.spec 
Log Message:
forgot BR: 7zip-plugins


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/spring.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- spring.spec	28 Dec 2009 21:37:16 -0000	1.11
+++ spring.spec	28 Dec 2009 21:57:19 -0000	1.12
@@ -26,7 +26,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  cmake SDL-devel openal-soft-devel boost-devel DevIL-devel
 BuildRequires:  glew-devel libvorbis-devel DevIL-ILUT-devel
 BuildRequires:  freetype-devel python-devel allegro-devel zip
-BuildRequires:  java-devel-openjdk
+BuildRequires:  java-devel-openjdk p7zip-plugins
 BuildRequires:  desktop-file-utils
 
 Requires:       spring-lobby spring-installer spring-maps-default



From abompard at fedoraproject.org  Mon Dec 28 22:14:05 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 28 Dec 2009 22:14:05 +0000 (UTC)
Subject: rpms/spring/devel spring.spec,1.11,1.12
Message-ID: <20091228221405.60D8411C008D@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7177

Modified Files:
	spring.spec 
Log Message:
forgot BR: 7zip-plugins


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- spring.spec	28 Dec 2009 21:37:17 -0000	1.11
+++ spring.spec	28 Dec 2009 22:14:04 -0000	1.12
@@ -26,7 +26,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  cmake SDL-devel openal-soft-devel boost-devel DevIL-devel
 BuildRequires:  glew-devel libvorbis-devel DevIL-ILUT-devel
 BuildRequires:  freetype-devel python-devel allegro-devel zip
-BuildRequires:  java-devel-openjdk
+BuildRequires:  java-devel-openjdk p7zip-plugins
 BuildRequires:  desktop-file-utils
 
 Requires:       spring-lobby spring-installer spring-maps-default



From abompard at fedoraproject.org  Mon Dec 28 22:14:46 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Mon, 28 Dec 2009 22:14:46 +0000 (UTC)
Subject: rpms/spring/F-11 spring.spec,1.9,1.10
Message-ID: <20091228221446.42AEA11C008D@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7531

Modified Files:
	spring.spec 
Log Message:
forgot BR: 7zip-plugins


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/spring.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- spring.spec	28 Dec 2009 21:37:16 -0000	1.9
+++ spring.spec	28 Dec 2009 22:14:46 -0000	1.10
@@ -26,7 +26,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  cmake SDL-devel openal-soft-devel boost-devel DevIL-devel
 BuildRequires:  glew-devel libvorbis-devel DevIL-ILUT-devel
 BuildRequires:  freetype-devel python-devel allegro-devel zip
-BuildRequires:  java-devel-openjdk
+BuildRequires:  java-devel-openjdk p7zip-plugins
 BuildRequires:  desktop-file-utils
 
 Requires:       spring-lobby spring-installer spring-maps-default



From linuxdonald at fedoraproject.org  Mon Dec 28 22:23:26 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:23:26 +0000 (UTC)
Subject: rpms/openal-soft/F-12 openal-soft.spec,1.13,1.14
Message-ID: <20091228222326.3934F11C008D@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9231/F-12

Modified Files:
	openal-soft.spec 
Log Message:
fixed broken upgrade paths


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-12/openal-soft.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openal-soft.spec	26 Dec 2009 14:45:48 -0000	1.13
+++ openal-soft.spec	28 Dec 2009 22:23:26 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:		openal-soft
 Version:	1.10.622
-Release:	3.%{revision}git%{?dist}
+Release:	4.%{revision}git%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-4.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Fixed broken upgrade paths.
+
 * Sat Dec 26 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-3.3793919892e6d61e5fec3abeaaeebc3f2332be13
 - Updatet to an newer git version because of some pulseaudio fixes.
 



From linuxdonald at fedoraproject.org  Mon Dec 28 22:23:26 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:23:26 +0000 (UTC)
Subject: rpms/openal-soft/F-11 openal-soft.spec,1.8,1.9
Message-ID: <20091228222326.265DB11C008D@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9231/F-11

Modified Files:
	openal-soft.spec 
Log Message:
fixed broken upgrade paths


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/openal-soft.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- openal-soft.spec	11 Nov 2009 20:49:56 -0000	1.8
+++ openal-soft.spec	28 Dec 2009 22:23:25 -0000	1.9
@@ -1,12 +1,15 @@
+%global revision 3793919892e6d61e5fec3abeaaeebc3f2332be13
+
 Name:		openal-soft
 Version:	1.10.622
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
-Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
+#http://repo.or.cz/w/openal-soft.git?a=snapshot;h=%{revision};sf=tgz 
+Source0:	openal-soft-%{revision}.tar.gz
 Patch1:		openal-soft.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-4.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Fixed broken upgrade paths.
+
 * Wed Nov 11 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-3
 - fixed an spec error only F-11 Update
 



From linuxdonald at fedoraproject.org  Mon Dec 28 22:23:26 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:23:26 +0000 (UTC)
Subject: rpms/openal-soft/devel openal-soft.spec,1.12,1.13
Message-ID: <20091228222326.5960711C008D@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9231/devel

Modified Files:
	openal-soft.spec 
Log Message:
fixed broken upgrade paths


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openal-soft.spec	10 Nov 2009 23:33:17 -0000	1.12
+++ openal-soft.spec	28 Dec 2009 22:23:26 -0000	1.13
@@ -1,12 +1,15 @@
+%global revision 3793919892e6d61e5fec3abeaaeebc3f2332be13
+
 Name:		openal-soft
 Version:	1.10.622
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
-Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
+#http://repo.or.cz/w/openal-soft.git?a=snapshot;h=%{revision};sf=tgz 
+Source0:	openal-soft-%{revision}.tar.gz
 Patch1:		openal-soft.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-4.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Fixed broken upgrade paths.
+
+* Wed Nov 11 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-3
+- F12 and devel only release.
+
 * Tue Nov 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.10.622-2
 - add default config
 



From linuxdonald at fedoraproject.org  Mon Dec 28 22:33:13 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:33:13 +0000 (UTC)
Subject: rpms/openal-soft/F-11 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20091228223313.314B111C008D@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11353/F-11

Modified Files:
	.cvsignore sources 
Log Message:
new source files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Nov 2009 22:57:59 -0000	1.3
+++ .cvsignore	28 Dec 2009 22:33:12 -0000	1.4
@@ -1 +1 @@
-openal-soft-1.10.622.tar.bz2
+openal-soft-3793919892e6d61e5fec3abeaaeebc3f2332be13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Nov 2009 22:57:59 -0000	1.3
+++ sources	28 Dec 2009 22:33:13 -0000	1.4
@@ -1 +1 @@
-d6324d0e7a4fd799e48e720c023fe1c0  openal-soft-1.10.622.tar.bz2
+c325850fcfee07d10dcba95467ef94ea  openal-soft-3793919892e6d61e5fec3abeaaeebc3f2332be13.tar.gz



From linuxdonald at fedoraproject.org  Mon Dec 28 22:33:13 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:33:13 +0000 (UTC)
Subject: rpms/openal-soft/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20091228223313.5442411C008D@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11353/devel

Modified Files:
	.cvsignore sources 
Log Message:
new source files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Nov 2009 22:24:45 -0000	1.6
+++ .cvsignore	28 Dec 2009 22:33:13 -0000	1.7
@@ -1 +1 @@
-openal-soft-1.10.622.tar.bz2
+openal-soft-3793919892e6d61e5fec3abeaaeebc3f2332be13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Nov 2009 22:24:45 -0000	1.6
+++ sources	28 Dec 2009 22:33:13 -0000	1.7
@@ -1 +1 @@
-d6324d0e7a4fd799e48e720c023fe1c0  openal-soft-1.10.622.tar.bz2
+c325850fcfee07d10dcba95467ef94ea  openal-soft-3793919892e6d61e5fec3abeaaeebc3f2332be13.tar.gz



From linuxdonald at fedoraproject.org  Mon Dec 28 22:44:10 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:44:10 +0000 (UTC)
Subject: rpms/openal-soft/devel openal-soft.spec,1.13,1.14
Message-ID: <20091228224410.625E711C008D@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13771/devel

Modified Files:
	openal-soft.spec 
Log Message:
fixed an spec problem


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openal-soft.spec	28 Dec 2009 22:23:26 -0000	1.13
+++ openal-soft.spec	28 Dec 2009 22:44:09 -0000	1.14
@@ -43,7 +43,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n openal-soft
 %patch1 -p0 -b .orig
 
 %build



From linuxdonald at fedoraproject.org  Mon Dec 28 22:44:10 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:44:10 +0000 (UTC)
Subject: rpms/openal-soft/F-11 openal-soft.spec,1.9,1.10
Message-ID: <20091228224410.6265B11C018B@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13771/F-11

Modified Files:
	openal-soft.spec 
Log Message:
fixed an spec problem


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/openal-soft.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openal-soft.spec	28 Dec 2009 22:23:25 -0000	1.9
+++ openal-soft.spec	28 Dec 2009 22:44:09 -0000	1.10
@@ -40,7 +40,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n openal-soft
 %patch1 -p0 -b .orig
 
 %build



From linuxdonald at fedoraproject.org  Mon Dec 28 22:56:53 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:56:53 +0000 (UTC)
Subject: rpms/openal-soft/F-12 openal-soft.spec,1.14,1.15
Message-ID: <20091228225653.41E8811C008D@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16485/F-12

Modified Files:
	openal-soft.spec 
Log Message:
fixed an spec version info problem


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-12/openal-soft.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openal-soft.spec	28 Dec 2009 22:23:26 -0000	1.14
+++ openal-soft.spec	28 Dec 2009 22:56:52 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:		openal-soft
 Version:	1.10.622
-Release:	4.%{revision}git%{?dist}
+Release:	5.%{revision}git%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-5.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Fixed small spec verion info.
+
 * Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-4.3793919892e6d61e5fec3abeaaeebc3f2332be13
 - Fixed broken upgrade paths.
 



From linuxdonald at fedoraproject.org  Mon Dec 28 22:56:53 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:56:53 +0000 (UTC)
Subject: rpms/openal-soft/F-11 openal-soft.spec,1.10,1.11
Message-ID: <20091228225653.44B9611C00CF@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16485/F-11

Modified Files:
	openal-soft.spec 
Log Message:
fixed an spec version info problem


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/openal-soft.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openal-soft.spec	28 Dec 2009 22:44:09 -0000	1.10
+++ openal-soft.spec	28 Dec 2009 22:56:52 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		openal-soft
 Version:	1.10.622
-Release:	4%{?dist}
+Release:	5.%{revision}git%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-5.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Fixed small spec verion info.
+
 * Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-4.3793919892e6d61e5fec3abeaaeebc3f2332be13
 - Fixed broken upgrade paths.
 



From linuxdonald at fedoraproject.org  Mon Dec 28 22:56:53 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 28 Dec 2009 22:56:53 +0000 (UTC)
Subject: rpms/openal-soft/devel openal-soft.spec,1.14,1.15
Message-ID: <20091228225653.476E711C02C8@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16485/devel

Modified Files:
	openal-soft.spec 
Log Message:
fixed an spec version info problem


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openal-soft.spec	28 Dec 2009 22:44:09 -0000	1.14
+++ openal-soft.spec	28 Dec 2009 22:56:53 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:		openal-soft
 Version:	1.10.622
-Release:	4%{?dist}
+Release:	5.%{revision}git%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-5.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Fixed small spec verion info.
+
 * Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.10.622-4.3793919892e6d61e5fec3abeaaeebc3f2332be13
 - Fixed broken upgrade paths.
 



From wtogami at fedoraproject.org  Mon Dec 28 23:18:34 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 28 Dec 2009 23:18:34 +0000 (UTC)
Subject: File sabayon-2.29.5-rc1.tar.bz2 uploaded to lookaside cache by wtogami
Message-ID: <20091228231834.DF28210F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sabayon:

d48647904650eedb0cb011214bb2e3a8  sabayon-2.29.5-rc1.tar.bz2



From rdieter at fedoraproject.org  Mon Dec 28 23:52:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 28 Dec 2009 23:52:32 +0000 (UTC)
Subject: rpms/GraphicsMagick/devel GraphicsMagick-CVE-2009-1882.patch, NONE,
	1.1 GraphicsMagick.spec, 1.32, 1.33
Message-ID: <20091228235232.F2CCD11C008D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27387

Modified Files:
	GraphicsMagick.spec 
Added Files:
	GraphicsMagick-CVE-2009-1882.patch 
Log Message:
* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
- CVE-2009-1882 (#503017)


GraphicsMagick-CVE-2009-1882.patch:
 memory.c  |   42 ++++++++++++-
 memory.h  |    7 +-
 xwindow.c |  190 ++++++++++++++++++++++++++++++++++++++++----------------------
 3 files changed, 170 insertions(+), 69 deletions(-)

--- NEW FILE GraphicsMagick-CVE-2009-1882.patch ---
--- GraphicsMagick/magick/xwindow.c	2009/09/16 02:13:01	1.230
+++ GraphicsMagick/magick/xwindow.c	2009/10/10 17:55:17	1.232
@@ -43,10 +43,12 @@
 #include "magick/describe.h"
 #include "magick/log.h"
 #include "magick/magick.h"
+#include "magick/monitor.h"
 #include "magick/pixel_cache.h"
 #include "magick/resize.h"
 #include "magick/shear.h"
 #include "magick/tempfile.h"
+#include "magick/texture.h"
 #include "magick/transform.h"
 #include "magick/utility.h"
 #include "magick/version.h"
@@ -2937,7 +2939,7 @@ MagickExport void MagickXGetImportInfo(M
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   M a g i c k X G e t P i x e l I n f o                                     %
+%   M a g i c k X G e t P i x e l P a c k e t                                 %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -5350,8 +5352,8 @@ MagickExport Cursor MagickXMakeCursor(Di
 %  The format of the MagickXMakeImage method is:
 %
 %      unsigned int MagickXMakeImage(Display *display,
-%        const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,Image *image,
-%        unsigned int width,unsigned int height)
+%        const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,
+%        Image *image,unsigned int width,unsigned int height)
 %
 %  A description of each parameter follows:
 %
@@ -5376,9 +5378,49 @@ MagickExport Cursor MagickXMakeCursor(Di
 %
 %
 */
-MagickExport unsigned int MagickXMakeImage(Display *display,
-  const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,Image *image,
-  unsigned int width,unsigned int height)
+static const char *
+MagickXImageFormatToString(int xformat)
+{
+  static const char
+    *formats[] = 
+    {
+      "XYBitmap",
+      "XYPixmap",
+      "ZPixmap"
+    };
+  
+  const char
+    *format = "Unknown";
+
+  if ((size_t) xformat < sizeof(formats)/sizeof(formats[0]))
+    format=formats[xformat];
+
+  return format;
+}
+static const char *
+MagickXByteOrderToString(int xbyte_order)
+{
+  static const char
+    *byte_orders[] =
+    {
+      "LSBFirst",
+      "MSBFirst"
+    };
+  
+  const char
+    *byte_order = "Unknown";
+
+  if ((size_t) xbyte_order < sizeof(byte_orders)/sizeof(byte_orders[0]))
+    byte_order=byte_orders[xbyte_order];
+
+  return byte_order;
+}
+MagickExport unsigned int
+MagickXMakeImage(Display *display,
+		 const MagickXResourceInfo *resource_info,
+		 MagickXWindowInfo *window,
+		 Image *image,
+		 unsigned int width,unsigned int height)
 {
   int
     depth,
@@ -5410,6 +5452,10 @@ MagickExport unsigned int MagickXMakeIma
   window->destroy=False;
   if (window->image != (Image *) NULL)
     {
+      MonitorHandler
+	handler=(MonitorHandler) NULL;
+
+      handler=SetMonitorHandler((MonitorHandler) NULL);
       if (window->crop_geometry)
         {
           Image
@@ -5459,44 +5505,49 @@ MagickExport unsigned int MagickXMakeIma
               window->destroy=MagickTrue;
             }
         }
-#if 0
-      if ((window->immutable == MagickFalse) &&
-          (window->image->matte != MagickFalse) &&
-          (window->pixel_info->colors == 0))
+      if ((window->image->matte != MagickFalse) &&
+	  (window->pixel_info->colors == 0)
+	  /* && (window->immutable == MagickFalse) */)
         {
           Image
             *texture;
 
           /*
-            Tile background with texture.
+            Tile background with texture according to opacity
           */
-          strlcpy(resource_info->image_info->filename,"image:checkerboard",MaxTextExtent);
+          strlcpy(resource_info->image_info->filename,"image:checkerboard",
+		  sizeof(resource_info->image_info->filename));
           texture=ReadImage(resource_info->image_info,&window->image->exception);
           if (texture != (Image *) NULL)
             {
               Image
                 *textured_image;
 
-              textured_image=CloneImage(window->image,window->image->columns,
-                window->image->rows,MagickTrue,&window->image->exception);
+              textured_image=CloneImage(window->image,0,0,MagickTrue,
+					&window->image->exception);
               if (textured_image != (Image *) NULL)
                 {
-/*                   strlcpy(window->image->filename,"textured_image.miff", MaxTextExtent); */
-/*                   WriteImage(resource_info->image_info,window->image); */
-                  TextureImage(textured_image,texture);
-                  textured_image->matte=MagickFalse;
-                  if (window->image != image)
-                    DestroyImage(window->image);
-                  window->image=textured_image;
-                  window->destroy=MagickTrue;
+                  if (TextureImage(textured_image,texture) != MagickFail)
+		    {
+		      if (window->image != image)
+			DestroyImage(window->image);
+		      window->image=textured_image;
+		      window->destroy=MagickTrue;
+		    }
+		  else
+		    {
+		      DestroyImage(textured_image);
+		    }
                 }
               DestroyImage(texture);
               texture=(Image *) NULL;
             }
           }
-#endif
       width=(unsigned int) window->image->columns;
+      assert(width == window->image->columns);
       height=(unsigned int) window->image->rows;
+      assert(height == window->image->rows);
+      (void) SetMonitorHandler(handler);
     }
   /*
     Create X image.
@@ -5504,27 +5555,32 @@ MagickExport unsigned int MagickXMakeIma
   ximage=(XImage *) NULL;
   format=(depth == 1) ? XYBitmap : ZPixmap;
 #if defined(HasSharedMemory)
-  window->shared_memory&=XShmQueryExtension(display);
+  window->shared_memory &= XShmQueryExtension(display);
   if (window->shared_memory)
     {
       XShmSegmentInfo
         *segment_info;
 
+      size_t
+	shm_extent;
+
       segment_info=(XShmSegmentInfo *) window->segment_info;
       segment_info[1].shmid=(-1);
       segment_info[1].shmaddr=NULL;
       ximage=XShmCreateImage(display,window->visual,depth,format,(char *) NULL,
-        &segment_info[1],width,height);
-      window->shared_memory&=(ximage != (XImage *) NULL);
+			     &segment_info[1],width,height);
+      window->shared_memory &= (ximage != (XImage *) NULL);
+
+      shm_extent=MagickArraySize(ximage->height,ximage->bytes_per_line);
+      window->shared_memory &= (shm_extent != 0);
 
       if (window->shared_memory)
-        segment_info[1].shmid=shmget(IPC_PRIVATE,(size_t)
-          (ximage->bytes_per_line*ximage->height),IPC_CREAT | 0777);
-      window->shared_memory&=(segment_info[1].shmid >= 0);
+        segment_info[1].shmid=shmget(IPC_PRIVATE,shm_extent,IPC_CREAT | 0777);
+      window->shared_memory &= (segment_info[1].shmid >= 0);
 
       if (window->shared_memory)
         segment_info[1].shmaddr=(char *) MagickShmAt(segment_info[1].shmid,0,0);
-      window->shared_memory&=(segment_info[1].shmaddr != NULL);
+      window->shared_memory &= (segment_info[1].shmaddr != NULL);
 
       if (!window->shared_memory)
         {
@@ -5607,12 +5663,12 @@ MagickExport unsigned int MagickXMakeIma
   if (IsEventLogging())
     {
       (void) LogMagickEvent(X11Event,GetMagickModule(),"XImage:");
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  width, height: %dx%d",
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  width x height: %dx%d",
         ximage->width,ximage->height);
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  format: %d",
-        ximage->format);
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  byte order: %d",
-        ximage->byte_order);
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  format: %s",
+			    MagickXImageFormatToString(ximage->format));
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  byte order: %s",
+			    MagickXByteOrderToString(ximage->byte_order));
       (void) LogMagickEvent(X11Event,GetMagickModule(),
         "  bitmap unit, bit order, pad: %d %d %d",ximage->bitmap_unit,
         ximage->bitmap_bit_order,ximage->bitmap_pad);
@@ -5629,11 +5685,13 @@ MagickExport unsigned int MagickXMakeIma
   if (!window->shared_memory)
     {
       if (ximage->format == XYBitmap)
-        ximage->data=MagickAllocateArray(char *,
-          ximage->height*ximage->depth,ximage->bytes_per_line);
+        ximage->data=
+	  MagickAllocateArray(char *,
+			      MagickArraySize(ximage->height,ximage->bytes_per_line),
+			      ximage->depth);
       else
-        ximage->data=MagickAllocateArray(char *,
-          ximage->height,ximage->bytes_per_line);
+        ximage->data=
+	  MagickAllocateArray(char *,ximage->height,ximage->bytes_per_line);
     }
   if (ximage->data == (char *) NULL)
     {
@@ -5709,8 +5767,9 @@ MagickExport unsigned int MagickXMakeIma
             /*
               Allocate matte image pixel data.
             */
-            length=matte_image->bytes_per_line*
-              matte_image->height*matte_image->depth;
+            length=MagickArraySize(MagickArraySize(matte_image->bytes_per_line,
+						   matte_image->height),
+				   matte_image->depth);
             matte_image->data=MagickAllocateMemory(char *,length);
             if (matte_image->data == (char *) NULL)
               {
@@ -7371,9 +7430,9 @@ MagickExport void MagickXMakeMagnifyImag
 %
 %  The format of the MagickXMakePixmap method is:
 %
-%      void MagickXMakeStandardColormap(Display *display,XVisualInfo *visual_info,
-%        MagickXResourceInfo *resource_info,Image *image,XStandardColormap *map_info,
-%        MagickXPixelInfo *pixel)
+%      unsigned int MagickXMakePixmap(Display *display,
+%                                     const MagickXResourceInfo *resource_info,
+%                                     MagickXWindowInfo *window)
 %
 %  A description of each parameter follows:
 %
--- GraphicsMagick/magick/xwindow.c	2009/10/10 17:55:17	1.232
+++ GraphicsMagick/magick/xwindow.c	2009/10/11 00:46:55	1.233
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003, 2004 GraphicsMagick Group
+% Copyright (C) 2003 - 2009 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 %
 % This program is covered by multiple licenses, which are described in
@@ -808,7 +808,7 @@ static char **MagickFontToList(char *fon
   for (p=font; *p != '\0'; p++)
     if ((*p == ':') || (*p == ';') || (*p == ','))
       fonts++;
-  fontlist=MagickAllocateMemory(char **,(fonts+1)*sizeof(char *));
+  fontlist=MagickAllocateArray(char **,(fonts+1),sizeof(char *));
   if (fontlist == (char **) NULL)
     {
       MagickError3(ResourceLimitError,MemoryAllocationFailed,
@@ -1103,7 +1103,7 @@ MagickExport void MagickXBestPixel(Displ
       /*
         Read X server colormap.
       */
-      colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
       if (colors == (XColor *) NULL)
         {
           MagickError3(ResourceLimitError,MemoryAllocationFailed,
@@ -2133,10 +2133,10 @@ static void MagickXDitherImage(Image *im
   for (i=0; i < 2; i++)
     for (j=0; j < 16; j++)
     {
-      red_map[i][j]=MagickAllocateMemory(unsigned char *,256*sizeof(unsigned char));
-      green_map[i][j]=MagickAllocateMemory(unsigned char *,
-        256*sizeof(unsigned char));
-      blue_map[i][j]=MagickAllocateMemory(unsigned char *,256*sizeof(unsigned char));
+      red_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
+      green_map[i][j]=MagickAllocateArray(unsigned char *,
+					  256,sizeof(unsigned char));
+      blue_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
       if ((red_map[i][j] == (unsigned char *) NULL) ||
           (green_map[i][j] == (unsigned char *) NULL) ||
           (blue_map[i][j] == (unsigned char *) NULL))
@@ -3022,7 +3022,7 @@ MagickExport void MagickXGetPixelPacket(
   if (pixel->pixels != (unsigned long *) NULL)
     MagickFreeMemory(pixel->pixels);
   pixel->pixels=
-    MagickAllocateMemory(unsigned long *,packets*sizeof(unsigned long));
+    MagickAllocateArray(unsigned long *,packets,sizeof(unsigned long));
   if (pixel->pixels == (unsigned long *) NULL)
     MagickFatalError(ResourceLimitFatalError,MemoryAllocationFailed,
       MagickMsg(XServerFatalError,UnableToGetPixelInfo));
@@ -4073,8 +4073,8 @@ static Image *MagickXGetWindowImage(Disp
       */
       max_windows+=1024;
       if (window_info == (WindowInfo *) NULL)
-        window_info=MagickAllocateMemory(WindowInfo *,
-          max_windows*sizeof(WindowInfo));
+        window_info=MagickAllocateArray(WindowInfo *,
+					max_windows,sizeof(WindowInfo));
       else
         MagickReallocMemory(WindowInfo *,window_info,max_windows*sizeof(WindowInfo));
     }
@@ -4227,7 +4227,7 @@ static Image *MagickXGetWindowImage(Disp
                 /*
                   Get the window colormap.
                 */
-                colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+                colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
                 if (colors == (XColor *) NULL)
                   {
                     XDestroyImage(ximage);
@@ -4577,7 +4577,7 @@ MagickExport void MagickXGetWindowInfo(D
           *segment_info;
 
         if (window->segment_info == (void *) NULL)
-          window->segment_info=MagickAllocateMemory(void *,2*sizeof(XShmSegmentInfo));
+          window->segment_info=MagickAllocateArray(void *,2,sizeof(XShmSegmentInfo));
         segment_info=(XShmSegmentInfo *) window->segment_info;
         segment_info[0].shmid=(-1);
         segment_info[0].shmaddr=NULL;
@@ -7734,8 +7734,8 @@ MagickExport void MagickXMakeStandardCol
         Define Standard Colormap for StaticGray or StaticColor visual.
       */
       number_colors=image->colors;
-      colors=MagickAllocateMemory(XColor *,
-        visual_info->colormap_size*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,
+				 visual_info->colormap_size,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitError,MemoryAllocationFailed,
           UnableToCreateColormap);
@@ -7774,8 +7774,8 @@ MagickExport void MagickXMakeStandardCol
         Define Standard Colormap for GrayScale or PseudoColor visual.
       */
       number_colors=image->colors;
-      colors=MagickAllocateMemory(XColor *,
-        visual_info->colormap_size*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,
+				 visual_info->colormap_size,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
           UnableToCreateColormap);
@@ -7820,8 +7820,8 @@ MagickExport void MagickXMakeStandardCol
           /*
             Define Standard colormap for shared GrayScale or PseudoColor visual.
           */
-          diversity=MagickAllocateMemory(DiversityPacket *,
-            image->colors*sizeof(DiversityPacket));
+          diversity=MagickAllocateArray(DiversityPacket *,
+					image->colors,sizeof(DiversityPacket));
           if (diversity == (DiversityPacket *) NULL)
             MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
               UnableToCreateColormap);
@@ -7882,8 +7882,9 @@ MagickExport void MagickXMakeStandardCol
           /*
             Read X server colormap.
           */
-          server_colors=MagickAllocateMemory(XColor *,
-            visual_info->colormap_size*sizeof(XColor));
+          server_colors=MagickAllocateArray(XColor *,
+					    visual_info->colormap_size,
+					    sizeof(XColor));
           if (server_colors == (XColor *) NULL)
             MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
               UnableToCreateColormap);
@@ -8023,7 +8024,7 @@ MagickExport void MagickXMakeStandardCol
       /*
         Allocate color array.
       */
-      colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
           UnableToCreateColormap);
--- GraphicsMagick/magick/memory.c	2009/10/05 23:57:54	1.54
+++ GraphicsMagick/magick/memory.c	2009/10/09 18:20:22	1.55
@@ -90,6 +90,43 @@ MagickExport void MagickAllocFunctions(M
 %                                                                             %
 %                                                                             %
 %                                                                             %
++   M a g i c k A r r a y Si z e                                              %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  MagickArraySize() returnes the size of an array given two size_t arguments.
+%  Zero is returned if the computed result overflows the size_t type.
+%
+%  The format of the MagickArraySize method is:
+%
+%      size_t MagickArraySize(const size_t count, const size_t size);
+%
+%  A description of each parameter follows:
+%
+%    o count: The number of elements in the array.
+%
+%    o size: The size of one array element.
+%
+*/
+MagickExport size_t MagickArraySize(const size_t count, const size_t size)
+{
+  size_t
+    allocation_size;
+
+  allocation_size = size * count;
+  if ((count != 0) && (size != allocation_size/count))
+    allocation_size = 0;
+
+  return allocation_size;
+}
+

+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   M a g i c k M a l l o c                                                   %
 %                                                                             %
 %                                                                             %
@@ -155,9 +192,8 @@ MagickExport void *MagickMallocArray(con
     *allocation;
 
   allocation = (void *) NULL;
-  allocation_size = size * count;
-  if ((count != 0) && (size != allocation_size/count))
-    allocation_size = 0;
+  allocation_size=MagickArraySize(count,size);
+
   if (allocation_size)
     allocation = (MallocFunc)(allocation_size);
   return allocation;
--- GraphicsMagick/magick/memory.h	2009/06/10 00:38:07	1.16
+++ GraphicsMagick/magick/memory.h	2009/10/09 18:20:22	1.17
@@ -22,7 +22,6 @@ extern MagickExport void
    MagickAllocFunctions(MagickFreeFunc free_func,MagickMallocFunc malloc_func,
                         MagickReallocFunc realloc_func),
   *MagickMalloc(const size_t size),
-  *MagickMallocArray(const size_t count,const size_t size),
   *MagickMallocCleared(const size_t size),
   *MagickCloneMemory(void *destination,const void *source,const size_t size),
   *MagickRealloc(void *memory,const size_t size),
@@ -30,6 +29,12 @@ extern MagickExport void
 
 #if defined(MAGICK_IMPLEMENTATION)
 
+extern MagickExport void
+  *MagickMallocArray(const size_t count,const size_t size);
+
+extern MagickExport size_t
+  MagickArraySize(const size_t count,const size_t size);
+
 /*
   Allocate memory
 */


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- GraphicsMagick.spec	6 Dec 2009 23:10:19 -0000	1.32
+++ GraphicsMagick.spec	28 Dec 2009 23:52:32 -0000	1.33
@@ -2,14 +2,13 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 
 BuildRequires: bzip2-devel
 BuildRequires: freetype-devel
 BuildRequires: jasper-devel
@@ -28,6 +27,12 @@ BuildRequires: perl-devel
 %endif
 BuildRequires: zlib-devel
 
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.230;r2=1.232'
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.232;r2=1.233'
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.c.diff?r1=1.54;r2=1.55
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.h.diff?r1=1.16;r2=1.17'
+Patch100: GraphicsMagick-CVE-2009-1882.patch
+
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
 based on ImageMagick 5.5.2, but which has undergone significant re-work by
@@ -96,6 +101,8 @@ however.
 %prep
 %setup -q
 
+%patch100 -p1 -b .CVE-2009-1882
+
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
 mv -f ChangeLog.utf8 ChangeLog
 
@@ -185,9 +192,16 @@ cat >%{buildroot}%{_includedir}/Graphics
 EOF
 
 
+#check
+## FIXME: seems to need -fno-var-tracking-assignments in a couple of places
+## else, takes a *very* long time
+#make check
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 
 %post c++ -p /sbin/ldconfig
@@ -196,6 +210,7 @@ rm -rf %{buildroot}
 
 %postun c++ -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc Copyright.txt
@@ -242,6 +257,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
+- CVE-2009-1882 (#503017)
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.3.7-3
 - rebuild against perl 5.10.1
 



From rdieter at fedoraproject.org  Tue Dec 29 00:03:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Dec 2009 00:03:59 +0000 (UTC)
Subject: rpms/GraphicsMagick/EL-5 GraphicsMagick-CVE-2009-1882.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 GraphicsMagick.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <20091229000400.0362D11C008D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29760

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Added Files:
	GraphicsMagick-CVE-2009-1882.patch 
Log Message:
* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
- CVE-2009-1882 (#503017)


GraphicsMagick-CVE-2009-1882.patch:
 memory.c  |   42 ++++++++++++-
 memory.h  |    7 +-
 xwindow.c |  190 ++++++++++++++++++++++++++++++++++++++++----------------------
 3 files changed, 170 insertions(+), 69 deletions(-)

--- NEW FILE GraphicsMagick-CVE-2009-1882.patch ---
--- GraphicsMagick/magick/xwindow.c	2009/09/16 02:13:01	1.230
+++ GraphicsMagick/magick/xwindow.c	2009/10/10 17:55:17	1.232
@@ -43,10 +43,12 @@
 #include "magick/describe.h"
 #include "magick/log.h"
 #include "magick/magick.h"
+#include "magick/monitor.h"
 #include "magick/pixel_cache.h"
 #include "magick/resize.h"
 #include "magick/shear.h"
 #include "magick/tempfile.h"
+#include "magick/texture.h"
 #include "magick/transform.h"
 #include "magick/utility.h"
 #include "magick/version.h"
@@ -2937,7 +2939,7 @@ MagickExport void MagickXGetImportInfo(M
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   M a g i c k X G e t P i x e l I n f o                                     %
+%   M a g i c k X G e t P i x e l P a c k e t                                 %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -5350,8 +5352,8 @@ MagickExport Cursor MagickXMakeCursor(Di
 %  The format of the MagickXMakeImage method is:
 %
 %      unsigned int MagickXMakeImage(Display *display,
-%        const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,Image *image,
-%        unsigned int width,unsigned int height)
+%        const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,
+%        Image *image,unsigned int width,unsigned int height)
 %
 %  A description of each parameter follows:
 %
@@ -5376,9 +5378,49 @@ MagickExport Cursor MagickXMakeCursor(Di
 %
 %
 */
-MagickExport unsigned int MagickXMakeImage(Display *display,
-  const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,Image *image,
-  unsigned int width,unsigned int height)
+static const char *
+MagickXImageFormatToString(int xformat)
+{
+  static const char
+    *formats[] = 
+    {
+      "XYBitmap",
+      "XYPixmap",
+      "ZPixmap"
+    };
+  
+  const char
+    *format = "Unknown";
+
+  if ((size_t) xformat < sizeof(formats)/sizeof(formats[0]))
+    format=formats[xformat];
+
+  return format;
+}
+static const char *
+MagickXByteOrderToString(int xbyte_order)
+{
+  static const char
+    *byte_orders[] =
+    {
+      "LSBFirst",
+      "MSBFirst"
+    };
+  
+  const char
+    *byte_order = "Unknown";
+
+  if ((size_t) xbyte_order < sizeof(byte_orders)/sizeof(byte_orders[0]))
+    byte_order=byte_orders[xbyte_order];
+
+  return byte_order;
+}
+MagickExport unsigned int
+MagickXMakeImage(Display *display,
+		 const MagickXResourceInfo *resource_info,
+		 MagickXWindowInfo *window,
+		 Image *image,
+		 unsigned int width,unsigned int height)
 {
   int
     depth,
@@ -5410,6 +5452,10 @@ MagickExport unsigned int MagickXMakeIma
   window->destroy=False;
   if (window->image != (Image *) NULL)
     {
+      MonitorHandler
+	handler=(MonitorHandler) NULL;
+
+      handler=SetMonitorHandler((MonitorHandler) NULL);
       if (window->crop_geometry)
         {
           Image
@@ -5459,44 +5505,49 @@ MagickExport unsigned int MagickXMakeIma
               window->destroy=MagickTrue;
             }
         }
-#if 0
-      if ((window->immutable == MagickFalse) &&
-          (window->image->matte != MagickFalse) &&
-          (window->pixel_info->colors == 0))
+      if ((window->image->matte != MagickFalse) &&
+	  (window->pixel_info->colors == 0)
+	  /* && (window->immutable == MagickFalse) */)
         {
           Image
             *texture;
 
           /*
-            Tile background with texture.
+            Tile background with texture according to opacity
           */
-          strlcpy(resource_info->image_info->filename,"image:checkerboard",MaxTextExtent);
+          strlcpy(resource_info->image_info->filename,"image:checkerboard",
+		  sizeof(resource_info->image_info->filename));
           texture=ReadImage(resource_info->image_info,&window->image->exception);
           if (texture != (Image *) NULL)
             {
               Image
                 *textured_image;
 
-              textured_image=CloneImage(window->image,window->image->columns,
-                window->image->rows,MagickTrue,&window->image->exception);
+              textured_image=CloneImage(window->image,0,0,MagickTrue,
+					&window->image->exception);
               if (textured_image != (Image *) NULL)
                 {
-/*                   strlcpy(window->image->filename,"textured_image.miff", MaxTextExtent); */
-/*                   WriteImage(resource_info->image_info,window->image); */
-                  TextureImage(textured_image,texture);
-                  textured_image->matte=MagickFalse;
-                  if (window->image != image)
-                    DestroyImage(window->image);
-                  window->image=textured_image;
-                  window->destroy=MagickTrue;
+                  if (TextureImage(textured_image,texture) != MagickFail)
+		    {
+		      if (window->image != image)
+			DestroyImage(window->image);
+		      window->image=textured_image;
+		      window->destroy=MagickTrue;
+		    }
+		  else
+		    {
+		      DestroyImage(textured_image);
+		    }
                 }
               DestroyImage(texture);
               texture=(Image *) NULL;
             }
           }
-#endif
       width=(unsigned int) window->image->columns;
+      assert(width == window->image->columns);
       height=(unsigned int) window->image->rows;
+      assert(height == window->image->rows);
+      (void) SetMonitorHandler(handler);
     }
   /*
     Create X image.
@@ -5504,27 +5555,32 @@ MagickExport unsigned int MagickXMakeIma
   ximage=(XImage *) NULL;
   format=(depth == 1) ? XYBitmap : ZPixmap;
 #if defined(HasSharedMemory)
-  window->shared_memory&=XShmQueryExtension(display);
+  window->shared_memory &= XShmQueryExtension(display);
   if (window->shared_memory)
     {
       XShmSegmentInfo
         *segment_info;
 
+      size_t
+	shm_extent;
+
       segment_info=(XShmSegmentInfo *) window->segment_info;
       segment_info[1].shmid=(-1);
       segment_info[1].shmaddr=NULL;
       ximage=XShmCreateImage(display,window->visual,depth,format,(char *) NULL,
-        &segment_info[1],width,height);
-      window->shared_memory&=(ximage != (XImage *) NULL);
+			     &segment_info[1],width,height);
+      window->shared_memory &= (ximage != (XImage *) NULL);
+
+      shm_extent=MagickArraySize(ximage->height,ximage->bytes_per_line);
+      window->shared_memory &= (shm_extent != 0);
 
       if (window->shared_memory)
-        segment_info[1].shmid=shmget(IPC_PRIVATE,(size_t)
-          (ximage->bytes_per_line*ximage->height),IPC_CREAT | 0777);
-      window->shared_memory&=(segment_info[1].shmid >= 0);
+        segment_info[1].shmid=shmget(IPC_PRIVATE,shm_extent,IPC_CREAT | 0777);
+      window->shared_memory &= (segment_info[1].shmid >= 0);
 
       if (window->shared_memory)
         segment_info[1].shmaddr=(char *) MagickShmAt(segment_info[1].shmid,0,0);
-      window->shared_memory&=(segment_info[1].shmaddr != NULL);
+      window->shared_memory &= (segment_info[1].shmaddr != NULL);
 
       if (!window->shared_memory)
         {
@@ -5607,12 +5663,12 @@ MagickExport unsigned int MagickXMakeIma
   if (IsEventLogging())
     {
       (void) LogMagickEvent(X11Event,GetMagickModule(),"XImage:");
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  width, height: %dx%d",
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  width x height: %dx%d",
         ximage->width,ximage->height);
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  format: %d",
-        ximage->format);
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  byte order: %d",
-        ximage->byte_order);
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  format: %s",
+			    MagickXImageFormatToString(ximage->format));
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  byte order: %s",
+			    MagickXByteOrderToString(ximage->byte_order));
       (void) LogMagickEvent(X11Event,GetMagickModule(),
         "  bitmap unit, bit order, pad: %d %d %d",ximage->bitmap_unit,
         ximage->bitmap_bit_order,ximage->bitmap_pad);
@@ -5629,11 +5685,13 @@ MagickExport unsigned int MagickXMakeIma
   if (!window->shared_memory)
     {
       if (ximage->format == XYBitmap)
-        ximage->data=MagickAllocateArray(char *,
-          ximage->height*ximage->depth,ximage->bytes_per_line);
+        ximage->data=
+	  MagickAllocateArray(char *,
+			      MagickArraySize(ximage->height,ximage->bytes_per_line),
+			      ximage->depth);
       else
-        ximage->data=MagickAllocateArray(char *,
-          ximage->height,ximage->bytes_per_line);
+        ximage->data=
+	  MagickAllocateArray(char *,ximage->height,ximage->bytes_per_line);
     }
   if (ximage->data == (char *) NULL)
     {
@@ -5709,8 +5767,9 @@ MagickExport unsigned int MagickXMakeIma
             /*
               Allocate matte image pixel data.
             */
-            length=matte_image->bytes_per_line*
-              matte_image->height*matte_image->depth;
+            length=MagickArraySize(MagickArraySize(matte_image->bytes_per_line,
+						   matte_image->height),
+				   matte_image->depth);
             matte_image->data=MagickAllocateMemory(char *,length);
             if (matte_image->data == (char *) NULL)
               {
@@ -7371,9 +7430,9 @@ MagickExport void MagickXMakeMagnifyImag
 %
 %  The format of the MagickXMakePixmap method is:
 %
-%      void MagickXMakeStandardColormap(Display *display,XVisualInfo *visual_info,
-%        MagickXResourceInfo *resource_info,Image *image,XStandardColormap *map_info,
-%        MagickXPixelInfo *pixel)
+%      unsigned int MagickXMakePixmap(Display *display,
+%                                     const MagickXResourceInfo *resource_info,
+%                                     MagickXWindowInfo *window)
 %
 %  A description of each parameter follows:
 %
--- GraphicsMagick/magick/xwindow.c	2009/10/10 17:55:17	1.232
+++ GraphicsMagick/magick/xwindow.c	2009/10/11 00:46:55	1.233
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003, 2004 GraphicsMagick Group
+% Copyright (C) 2003 - 2009 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 %
 % This program is covered by multiple licenses, which are described in
@@ -808,7 +808,7 @@ static char **MagickFontToList(char *fon
   for (p=font; *p != '\0'; p++)
     if ((*p == ':') || (*p == ';') || (*p == ','))
       fonts++;
-  fontlist=MagickAllocateMemory(char **,(fonts+1)*sizeof(char *));
+  fontlist=MagickAllocateArray(char **,(fonts+1),sizeof(char *));
   if (fontlist == (char **) NULL)
     {
       MagickError3(ResourceLimitError,MemoryAllocationFailed,
@@ -1103,7 +1103,7 @@ MagickExport void MagickXBestPixel(Displ
       /*
         Read X server colormap.
       */
-      colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
       if (colors == (XColor *) NULL)
         {
           MagickError3(ResourceLimitError,MemoryAllocationFailed,
@@ -2133,10 +2133,10 @@ static void MagickXDitherImage(Image *im
   for (i=0; i < 2; i++)
     for (j=0; j < 16; j++)
     {
-      red_map[i][j]=MagickAllocateMemory(unsigned char *,256*sizeof(unsigned char));
-      green_map[i][j]=MagickAllocateMemory(unsigned char *,
-        256*sizeof(unsigned char));
-      blue_map[i][j]=MagickAllocateMemory(unsigned char *,256*sizeof(unsigned char));
+      red_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
+      green_map[i][j]=MagickAllocateArray(unsigned char *,
+					  256,sizeof(unsigned char));
+      blue_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
       if ((red_map[i][j] == (unsigned char *) NULL) ||
           (green_map[i][j] == (unsigned char *) NULL) ||
           (blue_map[i][j] == (unsigned char *) NULL))
@@ -3022,7 +3022,7 @@ MagickExport void MagickXGetPixelPacket(
   if (pixel->pixels != (unsigned long *) NULL)
     MagickFreeMemory(pixel->pixels);
   pixel->pixels=
-    MagickAllocateMemory(unsigned long *,packets*sizeof(unsigned long));
+    MagickAllocateArray(unsigned long *,packets,sizeof(unsigned long));
   if (pixel->pixels == (unsigned long *) NULL)
     MagickFatalError(ResourceLimitFatalError,MemoryAllocationFailed,
       MagickMsg(XServerFatalError,UnableToGetPixelInfo));
@@ -4073,8 +4073,8 @@ static Image *MagickXGetWindowImage(Disp
       */
       max_windows+=1024;
       if (window_info == (WindowInfo *) NULL)
-        window_info=MagickAllocateMemory(WindowInfo *,
-          max_windows*sizeof(WindowInfo));
+        window_info=MagickAllocateArray(WindowInfo *,
+					max_windows,sizeof(WindowInfo));
       else
         MagickReallocMemory(WindowInfo *,window_info,max_windows*sizeof(WindowInfo));
     }
@@ -4227,7 +4227,7 @@ static Image *MagickXGetWindowImage(Disp
                 /*
                   Get the window colormap.
                 */
-                colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+                colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
                 if (colors == (XColor *) NULL)
                   {
                     XDestroyImage(ximage);
@@ -4577,7 +4577,7 @@ MagickExport void MagickXGetWindowInfo(D
           *segment_info;
 
         if (window->segment_info == (void *) NULL)
-          window->segment_info=MagickAllocateMemory(void *,2*sizeof(XShmSegmentInfo));
+          window->segment_info=MagickAllocateArray(void *,2,sizeof(XShmSegmentInfo));
         segment_info=(XShmSegmentInfo *) window->segment_info;
         segment_info[0].shmid=(-1);
         segment_info[0].shmaddr=NULL;
@@ -7734,8 +7734,8 @@ MagickExport void MagickXMakeStandardCol
         Define Standard Colormap for StaticGray or StaticColor visual.
       */
       number_colors=image->colors;
-      colors=MagickAllocateMemory(XColor *,
-        visual_info->colormap_size*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,
+				 visual_info->colormap_size,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitError,MemoryAllocationFailed,
           UnableToCreateColormap);
@@ -7774,8 +7774,8 @@ MagickExport void MagickXMakeStandardCol
         Define Standard Colormap for GrayScale or PseudoColor visual.
       */
       number_colors=image->colors;
-      colors=MagickAllocateMemory(XColor *,
-        visual_info->colormap_size*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,
+				 visual_info->colormap_size,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
           UnableToCreateColormap);
@@ -7820,8 +7820,8 @@ MagickExport void MagickXMakeStandardCol
           /*
             Define Standard colormap for shared GrayScale or PseudoColor visual.
           */
-          diversity=MagickAllocateMemory(DiversityPacket *,
-            image->colors*sizeof(DiversityPacket));
+          diversity=MagickAllocateArray(DiversityPacket *,
+					image->colors,sizeof(DiversityPacket));
           if (diversity == (DiversityPacket *) NULL)
             MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
               UnableToCreateColormap);
@@ -7882,8 +7882,9 @@ MagickExport void MagickXMakeStandardCol
           /*
             Read X server colormap.
           */
-          server_colors=MagickAllocateMemory(XColor *,
-            visual_info->colormap_size*sizeof(XColor));
+          server_colors=MagickAllocateArray(XColor *,
+					    visual_info->colormap_size,
+					    sizeof(XColor));
           if (server_colors == (XColor *) NULL)
             MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
               UnableToCreateColormap);
@@ -8023,7 +8024,7 @@ MagickExport void MagickXMakeStandardCol
       /*
         Allocate color array.
       */
-      colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
           UnableToCreateColormap);
--- GraphicsMagick/magick/memory.c	2009/10/05 23:57:54	1.54
+++ GraphicsMagick/magick/memory.c	2009/10/09 18:20:22	1.55
@@ -90,6 +90,43 @@ MagickExport void MagickAllocFunctions(M
 %                                                                             %
 %                                                                             %
 %                                                                             %
++   M a g i c k A r r a y Si z e                                              %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  MagickArraySize() returnes the size of an array given two size_t arguments.
+%  Zero is returned if the computed result overflows the size_t type.
+%
+%  The format of the MagickArraySize method is:
+%
+%      size_t MagickArraySize(const size_t count, const size_t size);
+%
+%  A description of each parameter follows:
+%
+%    o count: The number of elements in the array.
+%
+%    o size: The size of one array element.
+%
+*/
+MagickExport size_t MagickArraySize(const size_t count, const size_t size)
+{
+  size_t
+    allocation_size;
+
+  allocation_size = size * count;
+  if ((count != 0) && (size != allocation_size/count))
+    allocation_size = 0;
+
+  return allocation_size;
+}
+

+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   M a g i c k M a l l o c                                                   %
 %                                                                             %
 %                                                                             %
@@ -155,9 +192,8 @@ MagickExport void *MagickMallocArray(con
     *allocation;
 
   allocation = (void *) NULL;
-  allocation_size = size * count;
-  if ((count != 0) && (size != allocation_size/count))
-    allocation_size = 0;
+  allocation_size=MagickArraySize(count,size);
+
   if (allocation_size)
     allocation = (MallocFunc)(allocation_size);
   return allocation;
--- GraphicsMagick/magick/memory.h	2009/06/10 00:38:07	1.16
+++ GraphicsMagick/magick/memory.h	2009/10/09 18:20:22	1.17
@@ -22,7 +22,6 @@ extern MagickExport void
    MagickAllocFunctions(MagickFreeFunc free_func,MagickMallocFunc malloc_func,
                         MagickReallocFunc realloc_func),
   *MagickMalloc(const size_t size),
-  *MagickMallocArray(const size_t count,const size_t size),
   *MagickMallocCleared(const size_t size),
   *MagickCloneMemory(void *destination,const void *source,const size_t size),
   *MagickRealloc(void *memory,const size_t size),
@@ -30,6 +29,12 @@ extern MagickExport void
 
 #if defined(MAGICK_IMPLEMENTATION)
 
+extern MagickExport void
+  *MagickMallocArray(const size_t count,const size_t size);
+
+extern MagickExport size_t
+  MagickArraySize(const size_t count,const size_t size);
+
 /*
   Allocate memory
 */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	18 Sep 2009 02:11:01 -0000	1.4
+++ .cvsignore	29 Dec 2009 00:03:59 -0000	1.5
@@ -1 +1 @@
-GraphicsMagick-1.3.7.tar.bz2
+GraphicsMagick-1.3.7.tar.lzma


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/GraphicsMagick.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- GraphicsMagick.spec	18 Sep 2009 02:11:01 -0000	1.12
+++ GraphicsMagick.spec	29 Dec 2009 00:03:59 -0000	1.13
@@ -1,14 +1,14 @@
+
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.7
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Multimedia
-Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 
 BuildRequires: bzip2-devel
 BuildRequires: freetype-devel
 BuildRequires: jasper-devel
@@ -27,6 +27,12 @@ BuildRequires: perl-devel
 %endif
 BuildRequires: zlib-devel
 
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.230;r2=1.232'
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.232;r2=1.233'
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.c.diff?r1=1.54;r2=1.55
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.h.diff?r1=1.16;r2=1.17'
+Patch100: GraphicsMagick-CVE-2009-1882.patch
+
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
 based on ImageMagick 5.5.2, but which has undergone significant re-work by
@@ -95,32 +101,31 @@ however.
 %prep
 %setup -q
 
+%patch100 -p1 -b .CVE-2009-1882
+
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
 mv -f ChangeLog.utf8 ChangeLog
 
 # Avoid lib64 rpaths (FIXME: recheck this on newer releases)
 %if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 
 
 %build
-%configure --enable-shared \
+%configure --enable-shared --disable-static \
+           --with-lcms \
+           --with-magick_plus_plus \
            --with-modules \
            --with-perl \
-           --with-x \
+           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix}" \
            --with-threads \
-           --with-magick_plus_plus \
-           --without-gslib \
+           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
            --with-wmf \
-           --with-lcms \
+           --with-x \
            --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-dps
-
-# Avoid bogus RPATHs on x86_64
-sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+           --without-dps \
+           --without-gslib
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} perl-build
@@ -135,9 +140,9 @@ make install DESTDIR=%{buildroot} -C Per
 # perlmagick: fix perl path of demo files
 %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
 
-find %{buildroot} -name "*.bs" |xargs rm -f
-find %{buildroot} -name ".packlist" |xargs rm -f
-find %{buildroot} -name "perllocal.pod" |xargs rm -f
+find %{buildroot} -name "*.bs" |xargs rm -fv
+find %{buildroot} -name ".packlist" |xargs rm -fv
+find %{buildroot} -name "perllocal.pod" |xargs rm -fv
 
 chmod 755 %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so
 
@@ -157,9 +162,7 @@ fi
 rm -rf %{buildroot}%{_datadir}/GraphicsMagick
 # Keep config
 rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
-rm -rf %{buildroot}%{_libdir}/libltdl.*
-rm -f  %{buildroot}%{_libdir}/GraphicsMagick-*/modules*/*/*.a
-rm -f  %{buildroot}%{_libdir}/*.{a,la}
+rm -vf  %{buildroot}%{_libdir}/lib*.la
 
 # fix multilib issues
 %ifarch x86_64 s390x ia64 ppc64 sparc64
@@ -189,9 +192,16 @@ cat >%{buildroot}%{_includedir}/Graphics
 EOF
 
 
+#check
+## FIXME: seems to need -fno-var-tracking-assignments in a couple of places
+## else, takes a *very* long time
+#make check
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 
 %post c++ -p /sbin/ldconfig
@@ -200,6 +210,7 @@ rm -rf %{buildroot}
 
 %postun c++ -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc Copyright.txt
@@ -246,6 +257,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
+- CVE-2009-1882 (#503017)
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.3.7-3
+- rebuild against perl 5.10.1
+
+* Fri Nov 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-2
+- cleanup/uncruftify .spec
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
 - GraphicsMagick-1.3.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Sep 2009 02:11:02 -0000	1.5
+++ sources	29 Dec 2009 00:03:59 -0000	1.6
@@ -1 +1 @@
-42bfd382ddcda399880721170bcbf61b  GraphicsMagick-1.3.7.tar.bz2
+8a1ccf10d15816206426a9e716def9ac  GraphicsMagick-1.3.7.tar.lzma



From rdieter at fedoraproject.org  Tue Dec 29 00:04:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Dec 2009 00:04:42 +0000 (UTC)
Subject: rpms/GraphicsMagick/F-12 GraphicsMagick-CVE-2009-1882.patch, NONE,
	1.1 GraphicsMagick.spec, 1.30, 1.31
Message-ID: <20091229000442.1EDD011C008D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30017

Modified Files:
	GraphicsMagick.spec 
Added Files:
	GraphicsMagick-CVE-2009-1882.patch 
Log Message:
* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
- CVE-2009-1882 (#503017)


GraphicsMagick-CVE-2009-1882.patch:
 memory.c  |   42 ++++++++++++-
 memory.h  |    7 +-
 xwindow.c |  190 ++++++++++++++++++++++++++++++++++++++++----------------------
 3 files changed, 170 insertions(+), 69 deletions(-)

--- NEW FILE GraphicsMagick-CVE-2009-1882.patch ---
--- GraphicsMagick/magick/xwindow.c	2009/09/16 02:13:01	1.230
+++ GraphicsMagick/magick/xwindow.c	2009/10/10 17:55:17	1.232
@@ -43,10 +43,12 @@
 #include "magick/describe.h"
 #include "magick/log.h"
 #include "magick/magick.h"
+#include "magick/monitor.h"
 #include "magick/pixel_cache.h"
 #include "magick/resize.h"
 #include "magick/shear.h"
 #include "magick/tempfile.h"
+#include "magick/texture.h"
 #include "magick/transform.h"
 #include "magick/utility.h"
 #include "magick/version.h"
@@ -2937,7 +2939,7 @@ MagickExport void MagickXGetImportInfo(M
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   M a g i c k X G e t P i x e l I n f o                                     %
+%   M a g i c k X G e t P i x e l P a c k e t                                 %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -5350,8 +5352,8 @@ MagickExport Cursor MagickXMakeCursor(Di
 %  The format of the MagickXMakeImage method is:
 %
 %      unsigned int MagickXMakeImage(Display *display,
-%        const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,Image *image,
-%        unsigned int width,unsigned int height)
+%        const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,
+%        Image *image,unsigned int width,unsigned int height)
 %
 %  A description of each parameter follows:
 %
@@ -5376,9 +5378,49 @@ MagickExport Cursor MagickXMakeCursor(Di
 %
 %
 */
-MagickExport unsigned int MagickXMakeImage(Display *display,
-  const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,Image *image,
-  unsigned int width,unsigned int height)
+static const char *
+MagickXImageFormatToString(int xformat)
+{
+  static const char
+    *formats[] = 
+    {
+      "XYBitmap",
+      "XYPixmap",
+      "ZPixmap"
+    };
+  
+  const char
+    *format = "Unknown";
+
+  if ((size_t) xformat < sizeof(formats)/sizeof(formats[0]))
+    format=formats[xformat];
+
+  return format;
+}
+static const char *
+MagickXByteOrderToString(int xbyte_order)
+{
+  static const char
+    *byte_orders[] =
+    {
+      "LSBFirst",
+      "MSBFirst"
+    };
+  
+  const char
+    *byte_order = "Unknown";
+
+  if ((size_t) xbyte_order < sizeof(byte_orders)/sizeof(byte_orders[0]))
+    byte_order=byte_orders[xbyte_order];
+
+  return byte_order;
+}
+MagickExport unsigned int
+MagickXMakeImage(Display *display,
+		 const MagickXResourceInfo *resource_info,
+		 MagickXWindowInfo *window,
+		 Image *image,
+		 unsigned int width,unsigned int height)
 {
   int
     depth,
@@ -5410,6 +5452,10 @@ MagickExport unsigned int MagickXMakeIma
   window->destroy=False;
   if (window->image != (Image *) NULL)
     {
+      MonitorHandler
+	handler=(MonitorHandler) NULL;
+
+      handler=SetMonitorHandler((MonitorHandler) NULL);
       if (window->crop_geometry)
         {
           Image
@@ -5459,44 +5505,49 @@ MagickExport unsigned int MagickXMakeIma
               window->destroy=MagickTrue;
             }
         }
-#if 0
-      if ((window->immutable == MagickFalse) &&
-          (window->image->matte != MagickFalse) &&
-          (window->pixel_info->colors == 0))
+      if ((window->image->matte != MagickFalse) &&
+	  (window->pixel_info->colors == 0)
+	  /* && (window->immutable == MagickFalse) */)
         {
           Image
             *texture;
 
           /*
-            Tile background with texture.
+            Tile background with texture according to opacity
           */
-          strlcpy(resource_info->image_info->filename,"image:checkerboard",MaxTextExtent);
+          strlcpy(resource_info->image_info->filename,"image:checkerboard",
+		  sizeof(resource_info->image_info->filename));
           texture=ReadImage(resource_info->image_info,&window->image->exception);
           if (texture != (Image *) NULL)
             {
               Image
                 *textured_image;
 
-              textured_image=CloneImage(window->image,window->image->columns,
-                window->image->rows,MagickTrue,&window->image->exception);
+              textured_image=CloneImage(window->image,0,0,MagickTrue,
+					&window->image->exception);
               if (textured_image != (Image *) NULL)
                 {
-/*                   strlcpy(window->image->filename,"textured_image.miff", MaxTextExtent); */
-/*                   WriteImage(resource_info->image_info,window->image); */
-                  TextureImage(textured_image,texture);
-                  textured_image->matte=MagickFalse;
-                  if (window->image != image)
-                    DestroyImage(window->image);
-                  window->image=textured_image;
-                  window->destroy=MagickTrue;
+                  if (TextureImage(textured_image,texture) != MagickFail)
+		    {
+		      if (window->image != image)
+			DestroyImage(window->image);
+		      window->image=textured_image;
+		      window->destroy=MagickTrue;
+		    }
+		  else
+		    {
+		      DestroyImage(textured_image);
+		    }
                 }
               DestroyImage(texture);
               texture=(Image *) NULL;
             }
           }
-#endif
       width=(unsigned int) window->image->columns;
+      assert(width == window->image->columns);
       height=(unsigned int) window->image->rows;
+      assert(height == window->image->rows);
+      (void) SetMonitorHandler(handler);
     }
   /*
     Create X image.
@@ -5504,27 +5555,32 @@ MagickExport unsigned int MagickXMakeIma
   ximage=(XImage *) NULL;
   format=(depth == 1) ? XYBitmap : ZPixmap;
 #if defined(HasSharedMemory)
-  window->shared_memory&=XShmQueryExtension(display);
+  window->shared_memory &= XShmQueryExtension(display);
   if (window->shared_memory)
     {
       XShmSegmentInfo
         *segment_info;
 
+      size_t
+	shm_extent;
+
       segment_info=(XShmSegmentInfo *) window->segment_info;
       segment_info[1].shmid=(-1);
       segment_info[1].shmaddr=NULL;
       ximage=XShmCreateImage(display,window->visual,depth,format,(char *) NULL,
-        &segment_info[1],width,height);
-      window->shared_memory&=(ximage != (XImage *) NULL);
+			     &segment_info[1],width,height);
+      window->shared_memory &= (ximage != (XImage *) NULL);
+
+      shm_extent=MagickArraySize(ximage->height,ximage->bytes_per_line);
+      window->shared_memory &= (shm_extent != 0);
 
       if (window->shared_memory)
-        segment_info[1].shmid=shmget(IPC_PRIVATE,(size_t)
-          (ximage->bytes_per_line*ximage->height),IPC_CREAT | 0777);
-      window->shared_memory&=(segment_info[1].shmid >= 0);
+        segment_info[1].shmid=shmget(IPC_PRIVATE,shm_extent,IPC_CREAT | 0777);
+      window->shared_memory &= (segment_info[1].shmid >= 0);
 
       if (window->shared_memory)
         segment_info[1].shmaddr=(char *) MagickShmAt(segment_info[1].shmid,0,0);
-      window->shared_memory&=(segment_info[1].shmaddr != NULL);
+      window->shared_memory &= (segment_info[1].shmaddr != NULL);
 
       if (!window->shared_memory)
         {
@@ -5607,12 +5663,12 @@ MagickExport unsigned int MagickXMakeIma
   if (IsEventLogging())
     {
       (void) LogMagickEvent(X11Event,GetMagickModule(),"XImage:");
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  width, height: %dx%d",
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  width x height: %dx%d",
         ximage->width,ximage->height);
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  format: %d",
-        ximage->format);
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  byte order: %d",
-        ximage->byte_order);
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  format: %s",
+			    MagickXImageFormatToString(ximage->format));
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  byte order: %s",
+			    MagickXByteOrderToString(ximage->byte_order));
       (void) LogMagickEvent(X11Event,GetMagickModule(),
         "  bitmap unit, bit order, pad: %d %d %d",ximage->bitmap_unit,
         ximage->bitmap_bit_order,ximage->bitmap_pad);
@@ -5629,11 +5685,13 @@ MagickExport unsigned int MagickXMakeIma
   if (!window->shared_memory)
     {
       if (ximage->format == XYBitmap)
-        ximage->data=MagickAllocateArray(char *,
-          ximage->height*ximage->depth,ximage->bytes_per_line);
+        ximage->data=
+	  MagickAllocateArray(char *,
+			      MagickArraySize(ximage->height,ximage->bytes_per_line),
+			      ximage->depth);
       else
-        ximage->data=MagickAllocateArray(char *,
-          ximage->height,ximage->bytes_per_line);
+        ximage->data=
+	  MagickAllocateArray(char *,ximage->height,ximage->bytes_per_line);
     }
   if (ximage->data == (char *) NULL)
     {
@@ -5709,8 +5767,9 @@ MagickExport unsigned int MagickXMakeIma
             /*
               Allocate matte image pixel data.
             */
-            length=matte_image->bytes_per_line*
-              matte_image->height*matte_image->depth;
+            length=MagickArraySize(MagickArraySize(matte_image->bytes_per_line,
+						   matte_image->height),
+				   matte_image->depth);
             matte_image->data=MagickAllocateMemory(char *,length);
             if (matte_image->data == (char *) NULL)
               {
@@ -7371,9 +7430,9 @@ MagickExport void MagickXMakeMagnifyImag
 %
 %  The format of the MagickXMakePixmap method is:
 %
-%      void MagickXMakeStandardColormap(Display *display,XVisualInfo *visual_info,
-%        MagickXResourceInfo *resource_info,Image *image,XStandardColormap *map_info,
-%        MagickXPixelInfo *pixel)
+%      unsigned int MagickXMakePixmap(Display *display,
+%                                     const MagickXResourceInfo *resource_info,
+%                                     MagickXWindowInfo *window)
 %
 %  A description of each parameter follows:
 %
--- GraphicsMagick/magick/xwindow.c	2009/10/10 17:55:17	1.232
+++ GraphicsMagick/magick/xwindow.c	2009/10/11 00:46:55	1.233
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003, 2004 GraphicsMagick Group
+% Copyright (C) 2003 - 2009 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 %
 % This program is covered by multiple licenses, which are described in
@@ -808,7 +808,7 @@ static char **MagickFontToList(char *fon
   for (p=font; *p != '\0'; p++)
     if ((*p == ':') || (*p == ';') || (*p == ','))
       fonts++;
-  fontlist=MagickAllocateMemory(char **,(fonts+1)*sizeof(char *));
+  fontlist=MagickAllocateArray(char **,(fonts+1),sizeof(char *));
   if (fontlist == (char **) NULL)
     {
       MagickError3(ResourceLimitError,MemoryAllocationFailed,
@@ -1103,7 +1103,7 @@ MagickExport void MagickXBestPixel(Displ
       /*
         Read X server colormap.
       */
-      colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
       if (colors == (XColor *) NULL)
         {
           MagickError3(ResourceLimitError,MemoryAllocationFailed,
@@ -2133,10 +2133,10 @@ static void MagickXDitherImage(Image *im
   for (i=0; i < 2; i++)
     for (j=0; j < 16; j++)
     {
-      red_map[i][j]=MagickAllocateMemory(unsigned char *,256*sizeof(unsigned char));
-      green_map[i][j]=MagickAllocateMemory(unsigned char *,
-        256*sizeof(unsigned char));
-      blue_map[i][j]=MagickAllocateMemory(unsigned char *,256*sizeof(unsigned char));
+      red_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
+      green_map[i][j]=MagickAllocateArray(unsigned char *,
+					  256,sizeof(unsigned char));
+      blue_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
       if ((red_map[i][j] == (unsigned char *) NULL) ||
           (green_map[i][j] == (unsigned char *) NULL) ||
           (blue_map[i][j] == (unsigned char *) NULL))
@@ -3022,7 +3022,7 @@ MagickExport void MagickXGetPixelPacket(
   if (pixel->pixels != (unsigned long *) NULL)
     MagickFreeMemory(pixel->pixels);
   pixel->pixels=
-    MagickAllocateMemory(unsigned long *,packets*sizeof(unsigned long));
+    MagickAllocateArray(unsigned long *,packets,sizeof(unsigned long));
   if (pixel->pixels == (unsigned long *) NULL)
     MagickFatalError(ResourceLimitFatalError,MemoryAllocationFailed,
       MagickMsg(XServerFatalError,UnableToGetPixelInfo));
@@ -4073,8 +4073,8 @@ static Image *MagickXGetWindowImage(Disp
       */
       max_windows+=1024;
       if (window_info == (WindowInfo *) NULL)
-        window_info=MagickAllocateMemory(WindowInfo *,
-          max_windows*sizeof(WindowInfo));
+        window_info=MagickAllocateArray(WindowInfo *,
+					max_windows,sizeof(WindowInfo));
       else
         MagickReallocMemory(WindowInfo *,window_info,max_windows*sizeof(WindowInfo));
     }
@@ -4227,7 +4227,7 @@ static Image *MagickXGetWindowImage(Disp
                 /*
                   Get the window colormap.
                 */
-                colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+                colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
                 if (colors == (XColor *) NULL)
                   {
                     XDestroyImage(ximage);
@@ -4577,7 +4577,7 @@ MagickExport void MagickXGetWindowInfo(D
           *segment_info;
 
         if (window->segment_info == (void *) NULL)
-          window->segment_info=MagickAllocateMemory(void *,2*sizeof(XShmSegmentInfo));
+          window->segment_info=MagickAllocateArray(void *,2,sizeof(XShmSegmentInfo));
         segment_info=(XShmSegmentInfo *) window->segment_info;
         segment_info[0].shmid=(-1);
         segment_info[0].shmaddr=NULL;
@@ -7734,8 +7734,8 @@ MagickExport void MagickXMakeStandardCol
         Define Standard Colormap for StaticGray or StaticColor visual.
       */
       number_colors=image->colors;
-      colors=MagickAllocateMemory(XColor *,
-        visual_info->colormap_size*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,
+				 visual_info->colormap_size,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitError,MemoryAllocationFailed,
           UnableToCreateColormap);
@@ -7774,8 +7774,8 @@ MagickExport void MagickXMakeStandardCol
         Define Standard Colormap for GrayScale or PseudoColor visual.
       */
       number_colors=image->colors;
-      colors=MagickAllocateMemory(XColor *,
-        visual_info->colormap_size*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,
+				 visual_info->colormap_size,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
           UnableToCreateColormap);
@@ -7820,8 +7820,8 @@ MagickExport void MagickXMakeStandardCol
           /*
             Define Standard colormap for shared GrayScale or PseudoColor visual.
           */
-          diversity=MagickAllocateMemory(DiversityPacket *,
-            image->colors*sizeof(DiversityPacket));
+          diversity=MagickAllocateArray(DiversityPacket *,
+					image->colors,sizeof(DiversityPacket));
           if (diversity == (DiversityPacket *) NULL)
             MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
               UnableToCreateColormap);
@@ -7882,8 +7882,9 @@ MagickExport void MagickXMakeStandardCol
           /*
             Read X server colormap.
           */
-          server_colors=MagickAllocateMemory(XColor *,
-            visual_info->colormap_size*sizeof(XColor));
+          server_colors=MagickAllocateArray(XColor *,
+					    visual_info->colormap_size,
+					    sizeof(XColor));
           if (server_colors == (XColor *) NULL)
             MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
               UnableToCreateColormap);
@@ -8023,7 +8024,7 @@ MagickExport void MagickXMakeStandardCol
       /*
         Allocate color array.
       */
-      colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
           UnableToCreateColormap);
--- GraphicsMagick/magick/memory.c	2009/10/05 23:57:54	1.54
+++ GraphicsMagick/magick/memory.c	2009/10/09 18:20:22	1.55
@@ -90,6 +90,43 @@ MagickExport void MagickAllocFunctions(M
 %                                                                             %
 %                                                                             %
 %                                                                             %
++   M a g i c k A r r a y Si z e                                              %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  MagickArraySize() returnes the size of an array given two size_t arguments.
+%  Zero is returned if the computed result overflows the size_t type.
+%
+%  The format of the MagickArraySize method is:
+%
+%      size_t MagickArraySize(const size_t count, const size_t size);
+%
+%  A description of each parameter follows:
+%
+%    o count: The number of elements in the array.
+%
+%    o size: The size of one array element.
+%
+*/
+MagickExport size_t MagickArraySize(const size_t count, const size_t size)
+{
+  size_t
+    allocation_size;
+
+  allocation_size = size * count;
+  if ((count != 0) && (size != allocation_size/count))
+    allocation_size = 0;
+
+  return allocation_size;
+}
+

+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   M a g i c k M a l l o c                                                   %
 %                                                                             %
 %                                                                             %
@@ -155,9 +192,8 @@ MagickExport void *MagickMallocArray(con
     *allocation;
 
   allocation = (void *) NULL;
-  allocation_size = size * count;
-  if ((count != 0) && (size != allocation_size/count))
-    allocation_size = 0;
+  allocation_size=MagickArraySize(count,size);
+
   if (allocation_size)
     allocation = (MallocFunc)(allocation_size);
   return allocation;
--- GraphicsMagick/magick/memory.h	2009/06/10 00:38:07	1.16
+++ GraphicsMagick/magick/memory.h	2009/10/09 18:20:22	1.17
@@ -22,7 +22,6 @@ extern MagickExport void
    MagickAllocFunctions(MagickFreeFunc free_func,MagickMallocFunc malloc_func,
                         MagickReallocFunc realloc_func),
   *MagickMalloc(const size_t size),
-  *MagickMallocArray(const size_t count,const size_t size),
   *MagickMallocCleared(const size_t size),
   *MagickCloneMemory(void *destination,const void *source,const size_t size),
   *MagickRealloc(void *memory,const size_t size),
@@ -30,6 +29,12 @@ extern MagickExport void
 
 #if defined(MAGICK_IMPLEMENTATION)
 
+extern MagickExport void
+  *MagickMallocArray(const size_t count,const size_t size);
+
+extern MagickExport size_t
+  MagickArraySize(const size_t count,const size_t size);
+
 /*
   Allocate memory
 */


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-12/GraphicsMagick.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- GraphicsMagick.spec	18 Sep 2009 01:25:00 -0000	1.30
+++ GraphicsMagick.spec	29 Dec 2009 00:04:41 -0000	1.31
@@ -2,14 +2,13 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.7
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 
 BuildRequires: bzip2-devel
 BuildRequires: freetype-devel
 BuildRequires: jasper-devel
@@ -28,6 +27,12 @@ BuildRequires: perl-devel
 %endif
 BuildRequires: zlib-devel
 
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.230;r2=1.232'
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.232;r2=1.233'
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.c.diff?r1=1.54;r2=1.55
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.h.diff?r1=1.16;r2=1.17'
+Patch100: GraphicsMagick-CVE-2009-1882.patch
+
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
 based on ImageMagick 5.5.2, but which has undergone significant re-work by
@@ -96,32 +101,31 @@ however.
 %prep
 %setup -q
 
+%patch100 -p1 -b .CVE-2009-1882
+
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
 mv -f ChangeLog.utf8 ChangeLog
 
 # Avoid lib64 rpaths (FIXME: recheck this on newer releases)
 %if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 
 
 %build
-%configure --enable-shared \
+%configure --enable-shared --disable-static \
+           --with-lcms \
+           --with-magick_plus_plus \
            --with-modules \
            --with-perl \
-           --with-x \
+           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix}" \
            --with-threads \
-           --with-magick_plus_plus \
-           --without-gslib \
+           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
            --with-wmf \
-           --with-lcms \
+           --with-x \
            --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-dps
-
-# Avoid bogus RPATHs on x86_64
-sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+           --without-dps \
+           --without-gslib
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} perl-build
@@ -136,9 +140,9 @@ make install DESTDIR=%{buildroot} -C Per
 # perlmagick: fix perl path of demo files
 %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
 
-find %{buildroot} -name "*.bs" |xargs rm -f
-find %{buildroot} -name ".packlist" |xargs rm -f
-find %{buildroot} -name "perllocal.pod" |xargs rm -f
+find %{buildroot} -name "*.bs" |xargs rm -fv
+find %{buildroot} -name ".packlist" |xargs rm -fv
+find %{buildroot} -name "perllocal.pod" |xargs rm -fv
 
 chmod 755 %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so
 
@@ -158,9 +162,7 @@ fi
 rm -rf %{buildroot}%{_datadir}/GraphicsMagick
 # Keep config
 rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
-rm -rf %{buildroot}%{_libdir}/libltdl.*
-rm -f  %{buildroot}%{_libdir}/GraphicsMagick-*/modules*/*/*.a
-rm -f  %{buildroot}%{_libdir}/*.{a,la}
+rm -vf  %{buildroot}%{_libdir}/lib*.la
 
 # fix multilib issues
 %ifarch x86_64 s390x ia64 ppc64 sparc64
@@ -190,9 +192,16 @@ cat >%{buildroot}%{_includedir}/Graphics
 EOF
 
 
+#check
+## FIXME: seems to need -fno-var-tracking-assignments in a couple of places
+## else, takes a *very* long time
+#make check
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 
 %post c++ -p /sbin/ldconfig
@@ -201,6 +210,7 @@ rm -rf %{buildroot}
 
 %postun c++ -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc Copyright.txt
@@ -247,6 +257,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
+- CVE-2009-1882 (#503017)
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.3.7-3
+- rebuild against perl 5.10.1
+
+* Fri Nov 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-2
+- cleanup/uncruftify .spec
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
 - GraphicsMagick-1.3.7
 



From rdieter at fedoraproject.org  Tue Dec 29 00:05:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Dec 2009 00:05:20 +0000 (UTC)
Subject: rpms/GraphicsMagick/F-11 GraphicsMagick-CVE-2009-1882.patch, NONE,
	1.1 GraphicsMagick.spec, 1.25, 1.26
Message-ID: <20091229000520.5A5C211C008D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30259

Modified Files:
	GraphicsMagick.spec 
Added Files:
	GraphicsMagick-CVE-2009-1882.patch 
Log Message:
* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
- CVE-2009-1882 (#503017)


GraphicsMagick-CVE-2009-1882.patch:
 memory.c  |   42 ++++++++++++-
 memory.h  |    7 +-
 xwindow.c |  190 ++++++++++++++++++++++++++++++++++++++++----------------------
 3 files changed, 170 insertions(+), 69 deletions(-)

--- NEW FILE GraphicsMagick-CVE-2009-1882.patch ---
--- GraphicsMagick/magick/xwindow.c	2009/09/16 02:13:01	1.230
+++ GraphicsMagick/magick/xwindow.c	2009/10/10 17:55:17	1.232
@@ -43,10 +43,12 @@
 #include "magick/describe.h"
 #include "magick/log.h"
 #include "magick/magick.h"
+#include "magick/monitor.h"
 #include "magick/pixel_cache.h"
 #include "magick/resize.h"
 #include "magick/shear.h"
 #include "magick/tempfile.h"
+#include "magick/texture.h"
 #include "magick/transform.h"
 #include "magick/utility.h"
 #include "magick/version.h"
@@ -2937,7 +2939,7 @@ MagickExport void MagickXGetImportInfo(M
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   M a g i c k X G e t P i x e l I n f o                                     %
+%   M a g i c k X G e t P i x e l P a c k e t                                 %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -5350,8 +5352,8 @@ MagickExport Cursor MagickXMakeCursor(Di
 %  The format of the MagickXMakeImage method is:
 %
 %      unsigned int MagickXMakeImage(Display *display,
-%        const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,Image *image,
-%        unsigned int width,unsigned int height)
+%        const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,
+%        Image *image,unsigned int width,unsigned int height)
 %
 %  A description of each parameter follows:
 %
@@ -5376,9 +5378,49 @@ MagickExport Cursor MagickXMakeCursor(Di
 %
 %
 */
-MagickExport unsigned int MagickXMakeImage(Display *display,
-  const MagickXResourceInfo *resource_info,MagickXWindowInfo *window,Image *image,
-  unsigned int width,unsigned int height)
+static const char *
+MagickXImageFormatToString(int xformat)
+{
+  static const char
+    *formats[] = 
+    {
+      "XYBitmap",
+      "XYPixmap",
+      "ZPixmap"
+    };
+  
+  const char
+    *format = "Unknown";
+
+  if ((size_t) xformat < sizeof(formats)/sizeof(formats[0]))
+    format=formats[xformat];
+
+  return format;
+}
+static const char *
+MagickXByteOrderToString(int xbyte_order)
+{
+  static const char
+    *byte_orders[] =
+    {
+      "LSBFirst",
+      "MSBFirst"
+    };
+  
+  const char
+    *byte_order = "Unknown";
+
+  if ((size_t) xbyte_order < sizeof(byte_orders)/sizeof(byte_orders[0]))
+    byte_order=byte_orders[xbyte_order];
+
+  return byte_order;
+}
+MagickExport unsigned int
+MagickXMakeImage(Display *display,
+		 const MagickXResourceInfo *resource_info,
+		 MagickXWindowInfo *window,
+		 Image *image,
+		 unsigned int width,unsigned int height)
 {
   int
     depth,
@@ -5410,6 +5452,10 @@ MagickExport unsigned int MagickXMakeIma
   window->destroy=False;
   if (window->image != (Image *) NULL)
     {
+      MonitorHandler
+	handler=(MonitorHandler) NULL;
+
+      handler=SetMonitorHandler((MonitorHandler) NULL);
       if (window->crop_geometry)
         {
           Image
@@ -5459,44 +5505,49 @@ MagickExport unsigned int MagickXMakeIma
               window->destroy=MagickTrue;
             }
         }
-#if 0
-      if ((window->immutable == MagickFalse) &&
-          (window->image->matte != MagickFalse) &&
-          (window->pixel_info->colors == 0))
+      if ((window->image->matte != MagickFalse) &&
+	  (window->pixel_info->colors == 0)
+	  /* && (window->immutable == MagickFalse) */)
         {
           Image
             *texture;
 
           /*
-            Tile background with texture.
+            Tile background with texture according to opacity
           */
-          strlcpy(resource_info->image_info->filename,"image:checkerboard",MaxTextExtent);
+          strlcpy(resource_info->image_info->filename,"image:checkerboard",
+		  sizeof(resource_info->image_info->filename));
           texture=ReadImage(resource_info->image_info,&window->image->exception);
           if (texture != (Image *) NULL)
             {
               Image
                 *textured_image;
 
-              textured_image=CloneImage(window->image,window->image->columns,
-                window->image->rows,MagickTrue,&window->image->exception);
+              textured_image=CloneImage(window->image,0,0,MagickTrue,
+					&window->image->exception);
               if (textured_image != (Image *) NULL)
                 {
-/*                   strlcpy(window->image->filename,"textured_image.miff", MaxTextExtent); */
-/*                   WriteImage(resource_info->image_info,window->image); */
-                  TextureImage(textured_image,texture);
-                  textured_image->matte=MagickFalse;
-                  if (window->image != image)
-                    DestroyImage(window->image);
-                  window->image=textured_image;
-                  window->destroy=MagickTrue;
+                  if (TextureImage(textured_image,texture) != MagickFail)
+		    {
+		      if (window->image != image)
+			DestroyImage(window->image);
+		      window->image=textured_image;
+		      window->destroy=MagickTrue;
+		    }
+		  else
+		    {
+		      DestroyImage(textured_image);
+		    }
                 }
               DestroyImage(texture);
               texture=(Image *) NULL;
             }
           }
-#endif
       width=(unsigned int) window->image->columns;
+      assert(width == window->image->columns);
       height=(unsigned int) window->image->rows;
+      assert(height == window->image->rows);
+      (void) SetMonitorHandler(handler);
     }
   /*
     Create X image.
@@ -5504,27 +5555,32 @@ MagickExport unsigned int MagickXMakeIma
   ximage=(XImage *) NULL;
   format=(depth == 1) ? XYBitmap : ZPixmap;
 #if defined(HasSharedMemory)
-  window->shared_memory&=XShmQueryExtension(display);
+  window->shared_memory &= XShmQueryExtension(display);
   if (window->shared_memory)
     {
       XShmSegmentInfo
         *segment_info;
 
+      size_t
+	shm_extent;
+
       segment_info=(XShmSegmentInfo *) window->segment_info;
       segment_info[1].shmid=(-1);
       segment_info[1].shmaddr=NULL;
       ximage=XShmCreateImage(display,window->visual,depth,format,(char *) NULL,
-        &segment_info[1],width,height);
-      window->shared_memory&=(ximage != (XImage *) NULL);
+			     &segment_info[1],width,height);
+      window->shared_memory &= (ximage != (XImage *) NULL);
+
+      shm_extent=MagickArraySize(ximage->height,ximage->bytes_per_line);
+      window->shared_memory &= (shm_extent != 0);
 
       if (window->shared_memory)
-        segment_info[1].shmid=shmget(IPC_PRIVATE,(size_t)
-          (ximage->bytes_per_line*ximage->height),IPC_CREAT | 0777);
-      window->shared_memory&=(segment_info[1].shmid >= 0);
+        segment_info[1].shmid=shmget(IPC_PRIVATE,shm_extent,IPC_CREAT | 0777);
+      window->shared_memory &= (segment_info[1].shmid >= 0);
 
       if (window->shared_memory)
         segment_info[1].shmaddr=(char *) MagickShmAt(segment_info[1].shmid,0,0);
-      window->shared_memory&=(segment_info[1].shmaddr != NULL);
+      window->shared_memory &= (segment_info[1].shmaddr != NULL);
 
       if (!window->shared_memory)
         {
@@ -5607,12 +5663,12 @@ MagickExport unsigned int MagickXMakeIma
   if (IsEventLogging())
     {
       (void) LogMagickEvent(X11Event,GetMagickModule(),"XImage:");
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  width, height: %dx%d",
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  width x height: %dx%d",
         ximage->width,ximage->height);
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  format: %d",
-        ximage->format);
-      (void) LogMagickEvent(X11Event,GetMagickModule(),"  byte order: %d",
-        ximage->byte_order);
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  format: %s",
+			    MagickXImageFormatToString(ximage->format));
+      (void) LogMagickEvent(X11Event,GetMagickModule(),"  byte order: %s",
+			    MagickXByteOrderToString(ximage->byte_order));
       (void) LogMagickEvent(X11Event,GetMagickModule(),
         "  bitmap unit, bit order, pad: %d %d %d",ximage->bitmap_unit,
         ximage->bitmap_bit_order,ximage->bitmap_pad);
@@ -5629,11 +5685,13 @@ MagickExport unsigned int MagickXMakeIma
   if (!window->shared_memory)
     {
       if (ximage->format == XYBitmap)
-        ximage->data=MagickAllocateArray(char *,
-          ximage->height*ximage->depth,ximage->bytes_per_line);
+        ximage->data=
+	  MagickAllocateArray(char *,
+			      MagickArraySize(ximage->height,ximage->bytes_per_line),
+			      ximage->depth);
       else
-        ximage->data=MagickAllocateArray(char *,
-          ximage->height,ximage->bytes_per_line);
+        ximage->data=
+	  MagickAllocateArray(char *,ximage->height,ximage->bytes_per_line);
     }
   if (ximage->data == (char *) NULL)
     {
@@ -5709,8 +5767,9 @@ MagickExport unsigned int MagickXMakeIma
             /*
               Allocate matte image pixel data.
             */
-            length=matte_image->bytes_per_line*
-              matte_image->height*matte_image->depth;
+            length=MagickArraySize(MagickArraySize(matte_image->bytes_per_line,
+						   matte_image->height),
+				   matte_image->depth);
             matte_image->data=MagickAllocateMemory(char *,length);
             if (matte_image->data == (char *) NULL)
               {
@@ -7371,9 +7430,9 @@ MagickExport void MagickXMakeMagnifyImag
 %
 %  The format of the MagickXMakePixmap method is:
 %
-%      void MagickXMakeStandardColormap(Display *display,XVisualInfo *visual_info,
-%        MagickXResourceInfo *resource_info,Image *image,XStandardColormap *map_info,
-%        MagickXPixelInfo *pixel)
+%      unsigned int MagickXMakePixmap(Display *display,
+%                                     const MagickXResourceInfo *resource_info,
+%                                     MagickXWindowInfo *window)
 %
 %  A description of each parameter follows:
 %
--- GraphicsMagick/magick/xwindow.c	2009/10/10 17:55:17	1.232
+++ GraphicsMagick/magick/xwindow.c	2009/10/11 00:46:55	1.233
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003, 2004 GraphicsMagick Group
+% Copyright (C) 2003 - 2009 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 %
 % This program is covered by multiple licenses, which are described in
@@ -808,7 +808,7 @@ static char **MagickFontToList(char *fon
   for (p=font; *p != '\0'; p++)
     if ((*p == ':') || (*p == ';') || (*p == ','))
       fonts++;
-  fontlist=MagickAllocateMemory(char **,(fonts+1)*sizeof(char *));
+  fontlist=MagickAllocateArray(char **,(fonts+1),sizeof(char *));
   if (fontlist == (char **) NULL)
     {
       MagickError3(ResourceLimitError,MemoryAllocationFailed,
@@ -1103,7 +1103,7 @@ MagickExport void MagickXBestPixel(Displ
       /*
         Read X server colormap.
       */
-      colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
       if (colors == (XColor *) NULL)
         {
           MagickError3(ResourceLimitError,MemoryAllocationFailed,
@@ -2133,10 +2133,10 @@ static void MagickXDitherImage(Image *im
   for (i=0; i < 2; i++)
     for (j=0; j < 16; j++)
     {
-      red_map[i][j]=MagickAllocateMemory(unsigned char *,256*sizeof(unsigned char));
-      green_map[i][j]=MagickAllocateMemory(unsigned char *,
-        256*sizeof(unsigned char));
-      blue_map[i][j]=MagickAllocateMemory(unsigned char *,256*sizeof(unsigned char));
+      red_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
+      green_map[i][j]=MagickAllocateArray(unsigned char *,
+					  256,sizeof(unsigned char));
+      blue_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
       if ((red_map[i][j] == (unsigned char *) NULL) ||
           (green_map[i][j] == (unsigned char *) NULL) ||
           (blue_map[i][j] == (unsigned char *) NULL))
@@ -3022,7 +3022,7 @@ MagickExport void MagickXGetPixelPacket(
   if (pixel->pixels != (unsigned long *) NULL)
     MagickFreeMemory(pixel->pixels);
   pixel->pixels=
-    MagickAllocateMemory(unsigned long *,packets*sizeof(unsigned long));
+    MagickAllocateArray(unsigned long *,packets,sizeof(unsigned long));
   if (pixel->pixels == (unsigned long *) NULL)
     MagickFatalError(ResourceLimitFatalError,MemoryAllocationFailed,
       MagickMsg(XServerFatalError,UnableToGetPixelInfo));
@@ -4073,8 +4073,8 @@ static Image *MagickXGetWindowImage(Disp
       */
       max_windows+=1024;
       if (window_info == (WindowInfo *) NULL)
-        window_info=MagickAllocateMemory(WindowInfo *,
-          max_windows*sizeof(WindowInfo));
+        window_info=MagickAllocateArray(WindowInfo *,
+					max_windows,sizeof(WindowInfo));
       else
         MagickReallocMemory(WindowInfo *,window_info,max_windows*sizeof(WindowInfo));
     }
@@ -4227,7 +4227,7 @@ static Image *MagickXGetWindowImage(Disp
                 /*
                   Get the window colormap.
                 */
-                colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+                colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
                 if (colors == (XColor *) NULL)
                   {
                     XDestroyImage(ximage);
@@ -4577,7 +4577,7 @@ MagickExport void MagickXGetWindowInfo(D
           *segment_info;
 
         if (window->segment_info == (void *) NULL)
-          window->segment_info=MagickAllocateMemory(void *,2*sizeof(XShmSegmentInfo));
+          window->segment_info=MagickAllocateArray(void *,2,sizeof(XShmSegmentInfo));
         segment_info=(XShmSegmentInfo *) window->segment_info;
         segment_info[0].shmid=(-1);
         segment_info[0].shmaddr=NULL;
@@ -7734,8 +7734,8 @@ MagickExport void MagickXMakeStandardCol
         Define Standard Colormap for StaticGray or StaticColor visual.
       */
       number_colors=image->colors;
-      colors=MagickAllocateMemory(XColor *,
-        visual_info->colormap_size*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,
+				 visual_info->colormap_size,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitError,MemoryAllocationFailed,
           UnableToCreateColormap);
@@ -7774,8 +7774,8 @@ MagickExport void MagickXMakeStandardCol
         Define Standard Colormap for GrayScale or PseudoColor visual.
       */
       number_colors=image->colors;
-      colors=MagickAllocateMemory(XColor *,
-        visual_info->colormap_size*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,
+				 visual_info->colormap_size,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
           UnableToCreateColormap);
@@ -7820,8 +7820,8 @@ MagickExport void MagickXMakeStandardCol
           /*
             Define Standard colormap for shared GrayScale or PseudoColor visual.
           */
-          diversity=MagickAllocateMemory(DiversityPacket *,
-            image->colors*sizeof(DiversityPacket));
+          diversity=MagickAllocateArray(DiversityPacket *,
+					image->colors,sizeof(DiversityPacket));
           if (diversity == (DiversityPacket *) NULL)
             MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
               UnableToCreateColormap);
@@ -7882,8 +7882,9 @@ MagickExport void MagickXMakeStandardCol
           /*
             Read X server colormap.
           */
-          server_colors=MagickAllocateMemory(XColor *,
-            visual_info->colormap_size*sizeof(XColor));
+          server_colors=MagickAllocateArray(XColor *,
+					    visual_info->colormap_size,
+					    sizeof(XColor));
           if (server_colors == (XColor *) NULL)
             MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
               UnableToCreateColormap);
@@ -8023,7 +8024,7 @@ MagickExport void MagickXMakeStandardCol
       /*
         Allocate color array.
       */
-      colors=MagickAllocateMemory(XColor *,number_colors*sizeof(XColor));
+      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
       if (colors == (XColor *) NULL)
         MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
           UnableToCreateColormap);
--- GraphicsMagick/magick/memory.c	2009/10/05 23:57:54	1.54
+++ GraphicsMagick/magick/memory.c	2009/10/09 18:20:22	1.55
@@ -90,6 +90,43 @@ MagickExport void MagickAllocFunctions(M
 %                                                                             %
 %                                                                             %
 %                                                                             %
++   M a g i c k A r r a y Si z e                                              %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  MagickArraySize() returnes the size of an array given two size_t arguments.
+%  Zero is returned if the computed result overflows the size_t type.
+%
+%  The format of the MagickArraySize method is:
+%
+%      size_t MagickArraySize(const size_t count, const size_t size);
+%
+%  A description of each parameter follows:
+%
+%    o count: The number of elements in the array.
+%
+%    o size: The size of one array element.
+%
+*/
+MagickExport size_t MagickArraySize(const size_t count, const size_t size)
+{
+  size_t
+    allocation_size;
+
+  allocation_size = size * count;
+  if ((count != 0) && (size != allocation_size/count))
+    allocation_size = 0;
+
+  return allocation_size;
+}
+

+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   M a g i c k M a l l o c                                                   %
 %                                                                             %
 %                                                                             %
@@ -155,9 +192,8 @@ MagickExport void *MagickMallocArray(con
     *allocation;
 
   allocation = (void *) NULL;
-  allocation_size = size * count;
-  if ((count != 0) && (size != allocation_size/count))
-    allocation_size = 0;
+  allocation_size=MagickArraySize(count,size);
+
   if (allocation_size)
     allocation = (MallocFunc)(allocation_size);
   return allocation;
--- GraphicsMagick/magick/memory.h	2009/06/10 00:38:07	1.16
+++ GraphicsMagick/magick/memory.h	2009/10/09 18:20:22	1.17
@@ -22,7 +22,6 @@ extern MagickExport void
    MagickAllocFunctions(MagickFreeFunc free_func,MagickMallocFunc malloc_func,
                         MagickReallocFunc realloc_func),
   *MagickMalloc(const size_t size),
-  *MagickMallocArray(const size_t count,const size_t size),
   *MagickMallocCleared(const size_t size),
   *MagickCloneMemory(void *destination,const void *source,const size_t size),
   *MagickRealloc(void *memory,const size_t size),
@@ -30,6 +29,12 @@ extern MagickExport void
 
 #if defined(MAGICK_IMPLEMENTATION)
 
+extern MagickExport void
+  *MagickMallocArray(const size_t count,const size_t size);
+
+extern MagickExport size_t
+  MagickArraySize(const size_t count,const size_t size);
+
 /*
   Allocate memory
 */


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-11/GraphicsMagick.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- GraphicsMagick.spec	18 Sep 2009 16:09:47 -0000	1.25
+++ GraphicsMagick.spec	29 Dec 2009 00:05:20 -0000	1.26
@@ -2,14 +2,13 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.7
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 
 BuildRequires: bzip2-devel
 BuildRequires: freetype-devel
 BuildRequires: jasper-devel
@@ -28,6 +27,12 @@ BuildRequires: perl-devel
 %endif
 BuildRequires: zlib-devel
 
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.230;r2=1.232'
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.232;r2=1.233'
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.c.diff?r1=1.54;r2=1.55
+# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.h.diff?r1=1.16;r2=1.17'
+Patch100: GraphicsMagick-CVE-2009-1882.patch
+
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
 based on ImageMagick 5.5.2, but which has undergone significant re-work by
@@ -96,32 +101,31 @@ however.
 %prep
 %setup -q
 
+%patch100 -p1 -b .CVE-2009-1882
+
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
 mv -f ChangeLog.utf8 ChangeLog
 
 # Avoid lib64 rpaths (FIXME: recheck this on newer releases)
 %if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 
 
 %build
-%configure --enable-shared \
+%configure --enable-shared --disable-static \
+           --with-lcms \
+           --with-magick_plus_plus \
            --with-modules \
            --with-perl \
-           --with-x \
+           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix}" \
            --with-threads \
-           --with-magick_plus_plus \
-           --without-gslib \
+           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
            --with-wmf \
-           --with-lcms \
+           --with-x \
            --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-dps
-
-# Avoid bogus RPATHs on x86_64
-sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+           --without-dps \
+           --without-gslib
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} perl-build
@@ -136,9 +140,9 @@ make install DESTDIR=%{buildroot} -C Per
 # perlmagick: fix perl path of demo files
 %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
 
-find %{buildroot} -name "*.bs" |xargs rm -f
-find %{buildroot} -name ".packlist" |xargs rm -f
-find %{buildroot} -name "perllocal.pod" |xargs rm -f
+find %{buildroot} -name "*.bs" |xargs rm -fv
+find %{buildroot} -name ".packlist" |xargs rm -fv
+find %{buildroot} -name "perllocal.pod" |xargs rm -fv
 
 chmod 755 %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so
 
@@ -158,9 +162,7 @@ fi
 rm -rf %{buildroot}%{_datadir}/GraphicsMagick
 # Keep config
 rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
-rm -rf %{buildroot}%{_libdir}/libltdl.*
-rm -f  %{buildroot}%{_libdir}/GraphicsMagick-*/modules*/*/*.a
-rm -f  %{buildroot}%{_libdir}/*.{a,la}
+rm -vf  %{buildroot}%{_libdir}/lib*.la
 
 # fix multilib issues
 %ifarch x86_64 s390x ia64 ppc64 sparc64
@@ -190,9 +192,16 @@ cat >%{buildroot}%{_includedir}/Graphics
 EOF
 
 
+#check
+## FIXME: seems to need -fno-var-tracking-assignments in a couple of places
+## else, takes a *very* long time
+#make check
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 
 %post c++ -p /sbin/ldconfig
@@ -201,6 +210,7 @@ rm -rf %{buildroot}
 
 %postun c++ -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc Copyright.txt
@@ -247,6 +257,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
+- CVE-2009-1882 (#503017)
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.3.7-3
+- rebuild against perl 5.10.1
+
+* Fri Nov 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-2
+- cleanup/uncruftify .spec
+
 * Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
 - GraphicsMagick-1.3.7
 



From rdieter at fedoraproject.org  Tue Dec 29 00:20:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Dec 2009 00:20:04 +0000 (UTC)
Subject: rpms/GraphicsMagick/EL-5 .cvsignore, 1.5, 1.6 GraphicsMagick.spec,
	1.13, 1.14 sources, 1.6, 1.7
Message-ID: <20091229002004.EEA5011C0381@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv817

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Log Message:
use bz2 sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Dec 2009 00:03:59 -0000	1.5
+++ .cvsignore	29 Dec 2009 00:20:04 -0000	1.6
@@ -1 +1 @@
-GraphicsMagick-1.3.7.tar.lzma
+GraphicsMagick-1.3.7.tar.bz2


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/GraphicsMagick.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- GraphicsMagick.spec	29 Dec 2009 00:03:59 -0000	1.13
+++ GraphicsMagick.spec	29 Dec 2009 00:20:04 -0000	1.14
@@ -5,7 +5,7 @@ Version: 1.3.7
 Release: 4%{?dist}
 License: MIT
 Group: Applications/Multimedia
-Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Url: http://www.graphicsmagick.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Dec 2009 00:03:59 -0000	1.6
+++ sources	29 Dec 2009 00:20:04 -0000	1.7
@@ -1 +1 @@
-8a1ccf10d15816206426a9e716def9ac  GraphicsMagick-1.3.7.tar.lzma
+42bfd382ddcda399880721170bcbf61b  GraphicsMagick-1.3.7.tar.bz2



From rdieter at fedoraproject.org  Tue Dec 29 00:59:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Dec 2009 00:59:55 +0000 (UTC)
Subject: rpms/kdepim/F-12 kdepim-4.3.4-monthview.patch, NONE, 1.1 kdepim.spec, 
	1.244, 1.245
Message-ID: <20091229005955.74A6F11C008D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9308

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.4-monthview.patch 
Log Message:
* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-2
- upstream korganizer monthview patch


kdepim-4.3.4-monthview.patch:
 monthscene.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdepim-4.3.4-monthview.patch ---
--- branches/KDE/4.3/kdepim/korganizer/views/monthview/monthscene.cpp	2009/09/21 18:26:14	1026400
+++ branches/KDE/4.3/kdepim/korganizer/views/monthview/monthscene.cpp	2009/12/07 01:45:22	1059605
@@ -61,6 +61,8 @@
   mReadonlyPixmap  = KOGlobals::self()->smallIcon( "object-locked" );
   mReplyPixmap     = KOGlobals::self()->smallIcon( "mail-reply-sender" );
   mHolidayPixmap   = KOGlobals::self()->smallIcon( "favorites" );
+
+  setSceneRect( 0, 0, parent->width(), parent->height() );
 }
 
 MonthScene::~MonthScene()


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-12/kdepim.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- kdepim.spec	1 Dec 2009 16:07:46 -0000	1.244
+++ kdepim.spec	29 Dec 2009 00:59:55 -0000	1.245
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -19,6 +19,7 @@ Patch0:  kdepim-4.1.80-libqgpgme-link-fi
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 
 # upstream patches (4.3 branch):
+Patch100: kdepim-4.3.4-monthview.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -97,6 +98,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p4 -b .monthview
 
 
 %build
@@ -217,6 +219,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-2
+- upstream korganizer monthview patch
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 



From rdieter at fedoraproject.org  Tue Dec 29 01:23:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Dec 2009 01:23:38 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.4-monthview.patch, NONE, 1.1 .cvsignore, 
	1.67, 1.68 kdepim.spec, 1.230, 1.231
Message-ID: <20091229012338.F227111C008D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14691

Modified Files:
	.cvsignore kdepim.spec 
Added Files:
	kdepim-4.3.4-monthview.patch 
Log Message:
* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-2
- upstream korganizer monthview patch


kdepim-4.3.4-monthview.patch:
 monthscene.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdepim-4.3.4-monthview.patch ---
--- branches/KDE/4.3/kdepim/korganizer/views/monthview/monthscene.cpp	2009/09/21 18:26:14	1026400
+++ branches/KDE/4.3/kdepim/korganizer/views/monthview/monthscene.cpp	2009/12/07 01:45:22	1059605
@@ -61,6 +61,8 @@
   mReadonlyPixmap  = KOGlobals::self()->smallIcon( "object-locked" );
   mReplyPixmap     = KOGlobals::self()->smallIcon( "mail-reply-sender" );
   mHolidayPixmap   = KOGlobals::self()->smallIcon( "favorites" );
+
+  setSceneRect( 0, 0, parent->width(), parent->height() );
 }
 
 MonthScene::~MonthScene()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	9 Nov 2009 16:30:01 -0000	1.67
+++ .cvsignore	29 Dec 2009 01:23:38 -0000	1.68
@@ -1 +1,2 @@
 kdepim-4.3.3.tar.bz2
+kdepim-4.3.4.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- kdepim.spec	5 Dec 2009 16:02:52 -0000	1.230
+++ kdepim.spec	29 Dec 2009 01:23:38 -0000	1.231
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -19,6 +19,7 @@ Patch0:  kdepim-4.1.80-libqgpgme-link-fi
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 
 # upstream patches (4.3 branch):
+Patch100: kdepim-4.3.4-monthview.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -97,6 +98,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p4 -b .monthview
 
 
 %build
@@ -217,6 +219,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-2
+- upstream korganizer monthview patch
+
 * Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
 - 4.3.4
 



From donv at fedoraproject.org  Tue Dec 29 01:28:26 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Tue, 29 Dec 2009 01:28:26 +0000 (UTC)
Subject: rpms/zfs-fuse/devel zfs-fuse.scrub, NONE, 1.1 zfs-fuse.init, 1.4,
	1.5 zfs-fuse.spec, 1.24, 1.25 zfs-fuse.sysconfig, 1.1, 1.2
Message-ID: <20091229012826.28C1F11C008D@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15850

Modified Files:
	zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig 
Added Files:
	zfs-fuse.scrub 
Log Message:
* Added ZFS_WEEKLY_SCRUB option


--- NEW FILE zfs-fuse.scrub ---
#!/bin/bash
#
# This script reads it's configuration from /etc/sysconfig/zfs-fuse
# Please use that file to enable/disable this script or to set the
# type of check you wish performed.

[ -f /etc/sysconfig/zfs-fuse ] || exit 0
. /etc/sysconfig/zfs-fuse

[ "$ZFS_WEEKLY_SCRUB" != "yes" ] && exit 0

zpool=/usr/bin/zpool

pools=$zpool list -H | cut -f1

echo Found these pools: $pools

for pool in $pools; do
  echo "Starting scrub of pool $pool"
  $zpool scrub $pool
done

echo "ZFS Fuse automatic scrub start done.  Use '$zpool status' to see progress.


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zfs-fuse.init	23 Jan 2009 23:48:24 -0000	1.4
+++ zfs-fuse.init	29 Dec 2009 01:28:25 -0000	1.5
@@ -84,7 +84,12 @@ start() {
     echo_success
     echo
 
-	if [ $ZFS_AUTOMOUNT -eq 1 ] ; then
+	if [ "$ZFS_AUTOMOUNT" == "1" ] ; then
+		echo "Deprecated use of ZFS_AUTOMOUNT option.  Use ZFS_AUTOMOUNT=yes instead."
+		ZFS_AUTOMOUNT=yes
+	fi
+
+	if [ "$ZFS_AUTOMOUNT" == "yes" ] ; then
 		echo -n $"Mounting zfs partitions: "
     	sleep 1
         rm -f /var/lib/random-seed


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- zfs-fuse.spec	26 Dec 2009 19:27:54 -0000	1.24
+++ zfs-fuse.spec	29 Dec 2009 01:28:25 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          5%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
@@ -10,7 +10,8 @@ URL:              http://zfs-fuse.net/
 #   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
-Source02:         zfs-fuse.sysconfig
+Source02:         zfs-fuse.scrub
+Source03:         zfs-fuse.sysconfig
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel
 Requires:         fuse >= 2.8.0-1
 Requires(post):   chkconfig
@@ -32,6 +33,8 @@ Microsystems, originally designed for So
 This project is a port of ZFS to the FUSE framework for the Linux
 operating system.
 
+Project home page is at http://zfs-fuse.net/
+
 %prep
 %setup -q
 
@@ -50,7 +53,8 @@ scons
 pushd src
 scons install install_dir=%{buildroot}%{_bindir}
 %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
-%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub
+%{__install} -Dp -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,9 +87,16 @@ fi
 %{_bindir}/zpool
 %{_bindir}/ztest
 %{_initrddir}/%{name}
+%{_sysconfdir}/cron.weekly/98-%{name}-scrub
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Jan 04 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-6
+- Added option for automatic weekly scrubbing.
+  Set ZFS_WEEKLY_SCRUB=yes in /etc/sysconfig/zfs-fuse to enable
+  Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability.
+  ZFS_AUTOMOUNT=1 deprecated and will be removed in version 0.7.0.
+
 * Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we


Index: zfs-fuse.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zfs-fuse.sysconfig	22 Dec 2008 21:45:14 -0000	1.1
+++ zfs-fuse.sysconfig	29 Dec 2009 01:28:25 -0000	1.2
@@ -1,2 +1,5 @@
-# Set this option to 1 if you want all ZFS filesystems to be mounted on boot.
-ZFS_AUTOMOUNT=1
+# Set this option to yes if you want all ZFS filesystems to be mounted on boot.
+ZFS_AUTOMOUNT=yes
+
+# Set this option to yes to enable weekly scrubbing of your ZFS pools.
+ZFS_WEEKLY_SCRUB=yes



From mtasaka at fedoraproject.org  Tue Dec 29 01:50:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Dec 2009 01:50:11 +0000 (UTC)
Subject: File RMagick-2.13.0.tar.bz2 uploaded to lookaside cache by mtasaka
Message-ID: <20091229015011.CAB9510F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ruby-RMagick:

f79ff3c6587d3cc3b90c7550e563a59d  RMagick-2.13.0.tar.bz2



From mtasaka at fedoraproject.org  Tue Dec 29 01:53:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Dec 2009 01:53:28 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-11 .cvsignore, 1.24, 1.25 ruby-RMagick.spec, 1.32,
	1.33 sources, 1.24, 1.25
Message-ID: <20091229015328.9048D11C008D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21199/F-11

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Tue Dec 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.0
- 2.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	31 Oct 2009 15:50:58 -0000	1.24
+++ .cvsignore	29 Dec 2009 01:53:28 -0000	1.25
@@ -1 +1 @@
-RMagick-2.12.2.tar.bz2
+RMagick-2.13.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/ruby-RMagick.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ruby-RMagick.spec	31 Oct 2009 15:50:58 -0000	1.32
+++ ruby-RMagick.spec	29 Dec 2009 01:53:28 -0000	1.33
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		65318
+%define		repoid		68156
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.12.2
+%define		mainver		2.13.0
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -39,9 +39,9 @@ BuildRequires:	%{_bindir}/wmf2eps
 BuildRequires:	ImageMagick-devel
 Requires:	ImageMagick
 
+%setIMver 13 6.5.4.7
 %setIMver 12 6.5.4.7
 %setIMver 11 6.5.1.2
-%setIMver 10 6.4.0.10
 
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
@@ -106,6 +106,12 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Tue Dec 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.0
+- 2.13.0
+
+* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-2
+- Set ImageMagick dependency correctly again
+
 * Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
 - 2.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	31 Oct 2009 15:50:58 -0000	1.24
+++ sources	29 Dec 2009 01:53:28 -0000	1.25
@@ -1 +1 @@
-063db8fa74179467dc603943f55523c5  RMagick-2.12.2.tar.bz2
+f79ff3c6587d3cc3b90c7550e563a59d  RMagick-2.13.0.tar.bz2



From mtasaka at fedoraproject.org  Tue Dec 29 01:53:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Dec 2009 01:53:28 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-12 .cvsignore, 1.24, 1.25 ruby-RMagick.spec, 1.36,
	1.37 sources, 1.24, 1.25
Message-ID: <20091229015328.C5A0B11C008D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21199/F-12

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Tue Dec 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.0
- 2.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	31 Oct 2009 15:50:58 -0000	1.24
+++ .cvsignore	29 Dec 2009 01:53:28 -0000	1.25
@@ -1 +1 @@
-RMagick-2.12.2.tar.bz2
+RMagick-2.13.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-12/ruby-RMagick.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ruby-RMagick.spec	31 Oct 2009 15:50:58 -0000	1.36
+++ ruby-RMagick.spec	29 Dec 2009 01:53:28 -0000	1.37
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		65318
+%define		repoid		68156
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.12.2
+%define		mainver		2.13.0
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -39,9 +39,9 @@ BuildRequires:	%{_bindir}/wmf2eps
 BuildRequires:	ImageMagick-devel
 Requires:	ImageMagick
 
+%setIMver 13 6.5.4.7
 %setIMver 12 6.5.4.7
 %setIMver 11 6.5.1.2
-%setIMver 10 6.4.0.10
 
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
@@ -106,6 +106,12 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Tue Dec 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.0
+- 2.13.0
+
+* Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-2
+- Set ImageMagick dependency correctly again
+
 * Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
 - 2.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	31 Oct 2009 15:50:58 -0000	1.24
+++ sources	29 Dec 2009 01:53:28 -0000	1.25
@@ -1 +1 @@
-063db8fa74179467dc603943f55523c5  RMagick-2.12.2.tar.bz2
+f79ff3c6587d3cc3b90c7550e563a59d  RMagick-2.13.0.tar.bz2



From mtasaka at fedoraproject.org  Tue Dec 29 01:53:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 29 Dec 2009 01:53:28 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel .cvsignore, 1.24, 1.25 ruby-RMagick.spec, 1.37,
	1.38 sources, 1.24, 1.25
Message-ID: <20091229015328.EF95711C008D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21199/devel

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Tue Dec 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.0
- 2.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	30 Oct 2009 19:44:49 -0000	1.24
+++ .cvsignore	29 Dec 2009 01:53:28 -0000	1.25
@@ -1 +1 @@
-RMagick-2.12.2.tar.bz2
+RMagick-2.13.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ruby-RMagick.spec	1 Dec 2009 16:07:53 -0000	1.37
+++ ruby-RMagick.spec	29 Dec 2009 01:53:28 -0000	1.38
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		65318
+%define		repoid		68156
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,9 +13,9 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.12.2
+%define		mainver		2.13.0
 %undefine		betaver		
-%define		fedorarel	2
+%define		fedorarel	1
 
 
 Name:		ruby-%{modname}
@@ -42,7 +42,6 @@ Requires:	ImageMagick
 %setIMver 13 6.5.4.7
 %setIMver 12 6.5.4.7
 %setIMver 11 6.5.1.2
-%setIMver 10 6.4.0.10
 
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
@@ -107,6 +106,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Tue Dec 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.13.0
+- 2.13.0
+
 * Wed Dec  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-2
 - Set ImageMagick dependency correctly again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	30 Oct 2009 19:44:49 -0000	1.24
+++ sources	29 Dec 2009 01:53:28 -0000	1.25
@@ -1 +1 @@
-063db8fa74179467dc603943f55523c5  RMagick-2.12.2.tar.bz2
+f79ff3c6587d3cc3b90c7550e563a59d  RMagick-2.13.0.tar.bz2



From rdieter at fedoraproject.org  Tue Dec 29 02:34:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 29 Dec 2009 02:34:55 +0000 (UTC)
Subject: rpms/kdepim/F-12
	kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch, NONE,
	1.1 kdepim.spec, 1.245, 1.246
Message-ID: <20091229023455.1AAF711C008D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29380

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch 
Log Message:
no-var-tracking patch (f12+)


kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch:
 CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch ---
diff -up kdepim-4.3.3/kmail/CMakeLists.txt.gcc kdepim-4.3.3/kmail/CMakeLists.txt
--- kdepim-4.3.3/kmail/CMakeLists.txt.gcc	2009-11-23 12:38:19.292881093 -0600
+++ kdepim-4.3.3/kmail/CMakeLists.txt	2009-11-23 12:48:32.105882659 -0600
@@ -65,6 +65,9 @@ endif(Nepomuk_FOUND)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
+set_source_files_properties(globalsettings_base.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments )
+
+
 ########### kmailprivate ###############
 
 set(kmailprivate_LIB_SRCS


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-12/kdepim.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- kdepim.spec	29 Dec 2009 00:59:55 -0000	1.245
+++ kdepim.spec	29 Dec 2009 02:34:54 -0000	1.246
@@ -17,6 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
+# add -fno-var-tracking-assignments for kmail/globalsettings_base.cpp (#538233)
+Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch
 
 # upstream patches (4.3 branch):
 Patch100: kdepim-4.3.4-monthview.patch
@@ -98,6 +100,9 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+%patch2 -p1 -b .kmail_globalsettings_no_var_tracking
+%endif
 %patch100 -p4 -b .monthview
 
 



From pkgdb at fedoraproject.org  Tue Dec 29 02:52:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:52:19 +0000
Subject: [pkgdb] report was added for gavin
Message-ID: <20091229025204.A5D2E10F85E@bastion.fedoraproject.org>

kevin has added Package report with summary Incident reporting library
kevin has approved Package report
kevin has added a Fedora devel branch for report with an owner of gavin
kevin has approved report in Fedora devel
kevin has approved Package report
kevin has set commit to Approved for 107427 on report (Fedora devel)
kevin has set checkout to Approved for 107427 on report (Fedora devel)
kevin has set build to Approved for 107427 on report (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/report



From pkgdb at fedoraproject.org  Tue Dec 29 02:52:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:52:01 +0000
Subject: [pkgdb] report summary updated by kevin
Message-ID: <20091229025205.C7AD510F88B@bastion.fedoraproject.org>

kevin set package report summary to Incident reporting library

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/report



From pkgdb at fedoraproject.org  Tue Dec 29 02:52:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:52:01 +0000
Subject: [pkgdb] report (Fedora, 11) updated by kevin
Message-ID: <20091229025205.E850310F8CB@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for report
kevin has set commit to Approved for 107427 on report (Fedora 11)
kevin has set checkout to Approved for 107427 on report (Fedora 11)
kevin has set build to Approved for 107427 on report (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/report



From pkgdb at fedoraproject.org  Tue Dec 29 02:52:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:52:01 +0000
Subject: [pkgdb] report (Fedora, 12) updated by kevin
Message-ID: <20091229025205.F22E010F8D0@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for report
kevin has set commit to Approved for 107427 on report (Fedora 12)
kevin has set checkout to Approved for 107427 on report (Fedora 12)
kevin has set build to Approved for 107427 on report (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/report



From pkgdb at fedoraproject.org  Tue Dec 29 02:52:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:52:01 +0000
Subject: [pkgdb] report (Fedora EPEL, 5) updated by kevin
Message-ID: <20091229025205.D30ED10F8C3@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for report
kevin has set commit to Approved for 107427 on report (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on report (Fedora EPEL 5)
kevin has set build to Approved for 107427 on report (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/report



From kevin at fedoraproject.org  Tue Dec 29 02:52:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:52:30 +0000 (UTC)
Subject: rpms/report - New directory
Message-ID: <20091229025230.27BE711C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/report
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsycA355/rpms/report

Log Message:
Directory /cvs/pkgs/rpms/report added to the repository




From kevin at fedoraproject.org  Tue Dec 29 02:52:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:52:30 +0000 (UTC)
Subject: rpms/report/devel - New directory
Message-ID: <20091229025230.3A69011C02C4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/report/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsycA355/rpms/report/devel

Log Message:
Directory /cvs/pkgs/rpms/report/devel added to the repository




From kevin at fedoraproject.org  Tue Dec 29 02:52:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:52:37 +0000 (UTC)
Subject: rpms/report Makefile,NONE,1.1
Message-ID: <20091229025237.BB4E211C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/report
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsycA355/rpms/report

Added Files:
	Makefile 
Log Message:
Setup of module report


--- NEW FILE Makefile ---
# Top level Makefile for module report
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Dec 29 02:52:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:52:38 +0000 (UTC)
Subject: rpms/report/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091229025238.1533C11C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/report/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsycA355/rpms/report/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module report


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: report
# $Id: Makefile,v 1.1 2009/12/29 02:52:37 kevin Exp $
NAME := report
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Dec 29 02:52:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:52:59 +0000
Subject: [pkgdb] sugar-visualmatch was added for sdz
Message-ID: <20091229025256.5D65210F88B@bastion.fedoraproject.org>

kevin has added Package sugar-visualmatch with summary A visual matching game
kevin has approved Package sugar-visualmatch
kevin has added a Fedora devel branch for sugar-visualmatch with an owner of sdz
kevin has approved sugar-visualmatch in Fedora devel
kevin has approved Package sugar-visualmatch
kevin has set commit to Approved for 107427 on sugar-visualmatch (Fedora devel)
kevin has set checkout to Approved for 107427 on sugar-visualmatch (Fedora devel)
kevin has set build to Approved for 107427 on sugar-visualmatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-visualmatch



From pkgdb at fedoraproject.org  Tue Dec 29 02:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:53:20 +0000
Subject: [pkgdb] sugar-visualmatch summary updated by kevin
Message-ID: <20091229025305.A87DB10F88B@bastion.fedoraproject.org>

kevin set package sugar-visualmatch summary to A visual matching game

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-visualmatch



From pkgdb at fedoraproject.org  Tue Dec 29 02:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:53:20 +0000
Subject: [pkgdb] sugar-visualmatch (Fedora, 11) updated by kevin
Message-ID: <20091229025306.B147910F85E@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for sugar-visualmatch
kevin has set commit to Approved for 107427 on sugar-visualmatch (Fedora 11)
kevin has set checkout to Approved for 107427 on sugar-visualmatch (Fedora 11)
kevin has set build to Approved for 107427 on sugar-visualmatch (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-visualmatch



From pkgdb at fedoraproject.org  Tue Dec 29 02:53:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:53:21 +0000
Subject: [pkgdb] sugar-visualmatch (Fedora, 12) updated by kevin
Message-ID: <20091229025307.BB62510F85E@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for sugar-visualmatch
kevin has set commit to Approved for 107427 on sugar-visualmatch (Fedora 12)
kevin has set checkout to Approved for 107427 on sugar-visualmatch (Fedora 12)
kevin has set build to Approved for 107427 on sugar-visualmatch (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-visualmatch



From kevin at fedoraproject.org  Tue Dec 29 02:53:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:53:19 +0000 (UTC)
Subject: rpms/sugar-visualmatch - New directory
Message-ID: <20091229025319.141F911C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-visualmatch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscSL703/rpms/sugar-visualmatch

Log Message:
Directory /cvs/pkgs/rpms/sugar-visualmatch added to the repository




From kevin at fedoraproject.org  Tue Dec 29 02:53:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:53:19 +0000 (UTC)
Subject: rpms/sugar-visualmatch/devel - New directory
Message-ID: <20091229025319.293C011C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-visualmatch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscSL703/rpms/sugar-visualmatch/devel

Log Message:
Directory /cvs/pkgs/rpms/sugar-visualmatch/devel added to the repository




From kevin at fedoraproject.org  Tue Dec 29 02:53:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:53:26 +0000 (UTC)
Subject: rpms/sugar-visualmatch Makefile,NONE,1.1
Message-ID: <20091229025326.97B0111C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-visualmatch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscSL703/rpms/sugar-visualmatch

Added Files:
	Makefile 
Log Message:
Setup of module sugar-visualmatch


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-visualmatch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Dec 29 02:53:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:53:26 +0000 (UTC)
Subject: rpms/sugar-visualmatch/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091229025326.C92D611C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-visualmatch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscSL703/rpms/sugar-visualmatch/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-visualmatch


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-visualmatch
# $Id: Makefile,v 1.1 2009/12/29 02:53:26 kevin Exp $
NAME := sugar-visualmatch
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Dec 29 02:57:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:57:14 +0000
Subject: [pkgdb] clutter-gesture was added for pbrobinson
Message-ID: <20091229025659.C326910F85E@bastion.fedoraproject.org>

kevin has added Package clutter-gesture with summary Gesture Library for Clutter
kevin has approved Package clutter-gesture
kevin has added a Fedora devel branch for clutter-gesture with an owner of pbrobinson
kevin has approved clutter-gesture in Fedora devel
kevin has approved Package clutter-gesture
kevin has set commit to Approved for 107427 on clutter-gesture (Fedora devel)
kevin has set checkout to Approved for 107427 on clutter-gesture (Fedora devel)
kevin has set build to Approved for 107427 on clutter-gesture (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clutter-gesture



From pkgdb at fedoraproject.org  Tue Dec 29 02:57:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:57:01 +0000
Subject: [pkgdb] clutter-gesture (Fedora, 12) updated by kevin
Message-ID: <20091229025700.3E63210F8C7@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for clutter-gesture
kevin has set commit to Approved for 107427 on clutter-gesture (Fedora 12)
kevin has set checkout to Approved for 107427 on clutter-gesture (Fedora 12)
kevin has set build to Approved for 107427 on clutter-gesture (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clutter-gesture



From pkgdb at fedoraproject.org  Tue Dec 29 02:57:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:57:01 +0000
Subject: [pkgdb] clutter-gesture summary updated by kevin
Message-ID: <20091229025700.3472B10F8BF@bastion.fedoraproject.org>

kevin set package clutter-gesture summary to Gesture Library for Clutter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clutter-gesture



From kevin at fedoraproject.org  Tue Dec 29 02:57:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:57:14 +0000 (UTC)
Subject: rpms/clutter-gesture - New directory
Message-ID: <20091229025714.162BB11C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clutter-gesture
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFZ1584/rpms/clutter-gesture

Log Message:
Directory /cvs/pkgs/rpms/clutter-gesture added to the repository




From kevin at fedoraproject.org  Tue Dec 29 02:57:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:57:14 +0000 (UTC)
Subject: rpms/clutter-gesture/devel - New directory
Message-ID: <20091229025714.2FCC611C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clutter-gesture/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFZ1584/rpms/clutter-gesture/devel

Log Message:
Directory /cvs/pkgs/rpms/clutter-gesture/devel added to the repository




From kevin at fedoraproject.org  Tue Dec 29 02:57:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:57:22 +0000 (UTC)
Subject: rpms/clutter-gesture/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091229025722.1892111C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clutter-gesture/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFZ1584/rpms/clutter-gesture/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clutter-gesture


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: clutter-gesture
# $Id: Makefile,v 1.1 2009/12/29 02:57:21 kevin Exp $
NAME := clutter-gesture
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Tue Dec 29 02:57:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:57:21 +0000 (UTC)
Subject: rpms/clutter-gesture Makefile,NONE,1.1
Message-ID: <20091229025721.9059A11C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clutter-gesture
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFZ1584/rpms/clutter-gesture

Added Files:
	Makefile 
Log Message:
Setup of module clutter-gesture


--- NEW FILE Makefile ---
# Top level Makefile for module clutter-gesture
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Tue Dec 29 02:57:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:57:47 +0000
Subject: [pkgdb] earcandy was added for lkundrak
Message-ID: <20091229025744.6CD8E10F894@bastion.fedoraproject.org>

kevin has added Package earcandy with summary Sound level manager
kevin has approved Package earcandy
kevin has added a Fedora devel branch for earcandy with an owner of lkundrak
kevin has approved earcandy in Fedora devel
kevin has approved Package earcandy
kevin has set commit to Approved for 107427 on earcandy (Fedora devel)
kevin has set checkout to Approved for 107427 on earcandy (Fedora devel)
kevin has set build to Approved for 107427 on earcandy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/earcandy



From pkgdb at fedoraproject.org  Tue Dec 29 02:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:57:50 +0000
Subject: [pkgdb] earcandy summary updated by kevin
Message-ID: <20091229025747.C84DF10F894@bastion.fedoraproject.org>

kevin set package earcandy summary to Sound level manager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/earcandy



From pkgdb at fedoraproject.org  Tue Dec 29 02:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:57:50 +0000
Subject: [pkgdb] earcandy (Fedora, 11) updated by kevin
Message-ID: <20091229025747.D26AF10F8BF@bastion.fedoraproject.org>

kevin added a Fedora 11 branch for earcandy
kevin has set commit to Approved for 107427 on earcandy (Fedora 11)
kevin has set checkout to Approved for 107427 on earcandy (Fedora 11)
kevin has set build to Approved for 107427 on earcandy (Fedora 11)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/earcandy



From pkgdb at fedoraproject.org  Tue Dec 29 02:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:57:50 +0000
Subject: [pkgdb] earcandy (Fedora EPEL, 5) updated by kevin
Message-ID: <20091229025747.E6B0D10F8C7@bastion.fedoraproject.org>

kevin added a Fedora EPEL 5 branch for earcandy
kevin has set commit to Approved for 107427 on earcandy (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on earcandy (Fedora EPEL 5)
kevin has set build to Approved for 107427 on earcandy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/earcandy



From pkgdb at fedoraproject.org  Tue Dec 29 02:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 02:57:50 +0000
Subject: [pkgdb] earcandy (Fedora, 12) updated by kevin
Message-ID: <20091229025747.EF72710F8CF@bastion.fedoraproject.org>

kevin added a Fedora 12 branch for earcandy
kevin has set commit to Approved for 107427 on earcandy (Fedora 12)
kevin has set checkout to Approved for 107427 on earcandy (Fedora 12)
kevin has set build to Approved for 107427 on earcandy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/earcandy



From kevin at fedoraproject.org  Tue Dec 29 02:58:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:58:01 +0000 (UTC)
Subject: rpms/earcandy - New directory
Message-ID: <20091229025801.10DDA11C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/earcandy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgl1826/rpms/earcandy

Log Message:
Directory /cvs/pkgs/rpms/earcandy added to the repository




From kevin at fedoraproject.org  Tue Dec 29 02:58:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:58:01 +0000 (UTC)
Subject: rpms/earcandy/devel - New directory
Message-ID: <20091229025801.296FD11C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/earcandy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgl1826/rpms/earcandy/devel

Log Message:
Directory /cvs/pkgs/rpms/earcandy/devel added to the repository




From kevin at fedoraproject.org  Tue Dec 29 02:58:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:58:08 +0000 (UTC)
Subject: rpms/earcandy Makefile,NONE,1.1
Message-ID: <20091229025808.9091D11C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/earcandy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgl1826/rpms/earcandy

Added Files:
	Makefile 
Log Message:
Setup of module earcandy


--- NEW FILE Makefile ---
# Top level Makefile for module earcandy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Dec 29 02:58:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 29 Dec 2009 02:58:08 +0000 (UTC)
Subject: rpms/earcandy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091229025808.B8F8311C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/earcandy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgl1826/rpms/earcandy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module earcandy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: earcandy
# $Id: Makefile,v 1.1 2009/12/29 02:58:08 kevin Exp $
NAME := earcandy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pbrobinson at fedoraproject.org  Tue Dec 29 03:06:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Dec 2009 03:06:45 +0000 (UTC)
Subject: File clutter-gesture-0.0.2.tar.bz2 uploaded to lookaside cache by
	pbrobinson
Message-ID: <20091229030645.91D7F10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for clutter-gesture:

de0e3e5c01f0a328cc04a46198776ebe  clutter-gesture-0.0.2.tar.bz2



From pbrobinson at fedoraproject.org  Tue Dec 29 03:07:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Dec 2009 03:07:26 +0000 (UTC)
Subject: rpms/clutter-gesture/devel clutter-gesture.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091229030726.42C7311C008D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/clutter-gesture/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3811/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clutter-gesture.spec import.log 
Log Message:
- Initial import



--- NEW FILE clutter-gesture.spec ---
Name:           clutter-gesture
Version:        0.0.2
Release:        2%{?dist}
Summary:        Gesture Library for Clutter

Group:          System Environment/Libraries
License:        LGPLv2+ and MIT
URL:            http://moblin.org/projects/clutter-gesture
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: clutter-devel
BuildRequires: glib2-devel

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool

%description
This library allows clutter applications to be aware of gestures 
and to easily attach some handlers to the gesture events. The library 
supports both single and multi touch.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
Files for development with %{name}.

%prep
%setup -q

# The NEWS file contains the license so use it as a COPYING file. Upstream has been contacted to resolve the issue
cp NEWS COPYING

# run autogen.sh until we have a proper release, but don't run configure twice.
sed -i '/configure/d' autogen.sh
./autogen.sh

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

#Remove libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libcluttergesture-%{version}.so.*
%{_libdir}/libengine.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libcluttergesture-%{version}.so
%{_libdir}/libengine.so
%{_includedir}/%{name}
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Sat Dec 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-2
- Review updates

* Tue Sep 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-1
- Initial packaging


--- NEW FILE import.log ---
clutter-gesture-0_0_2-2_fc12:HEAD:clutter-gesture-0.0.2-2.fc12.src.rpm:1262055998


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gesture/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:57:21 -0000	1.1
+++ .cvsignore	29 Dec 2009 03:07:26 -0000	1.2
@@ -0,0 +1 @@
+clutter-gesture-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gesture/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:57:21 -0000	1.1
+++ sources	29 Dec 2009 03:07:26 -0000	1.2
@@ -0,0 +1 @@
+de0e3e5c01f0a328cc04a46198776ebe  clutter-gesture-0.0.2.tar.bz2



From praveenp at fedoraproject.org  Tue Dec 29 03:07:38 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 29 Dec 2009 03:07:38 +0000 (UTC)
Subject: rpms/openwsman/EL-4 openwsman-randfile.patch, NONE, 1.1 openwsman.spec,
	1.6, 1.7
Message-ID: <20091229030738.8931211C008D@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3872

Modified Files:
	openwsman.spec 
Added Files:
	openwsman-randfile.patch 
Log Message:
Changed the RAND file for openssl cert


openwsman-randfile.patch:
 ssleay.cnf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openwsman-randfile.patch ---
diff -up ./etc/ssleay.cnf.new ./etc/ssleay.cnf
--- ./etc/ssleay.cnf.new	2009-12-16 17:04:15.000000000 -0600
+++ ./etc/ssleay.cnf	2009-12-16 17:04:55.000000000 -0600
@@ -2,7 +2,7 @@
 # SSLeay example configuration file.
 #
 
-RANDFILE                = $ENV::HOME/.rnd
+RANDFILE                = /dev/random
 
 [ req ]
 default_bits            = 1024


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/openwsman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openwsman.spec	28 Dec 2009 16:24:24 -0000	1.6
+++ openwsman.spec	29 Dec 2009 03:07:38 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -13,6 +13,7 @@ Source2:        python-config
 Patch0:         %{name}-initscript.patch
 Patch1:         %{name}-pam-auth.patch
 Patch2:         perl-bindings.patch
+Patch3:         openwsman-randfile.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 Group:          System Environment/Daemons
 Summary:        Opensource Implementation of WS-Management
@@ -116,6 +117,7 @@ This package provides Perl bindings to a
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 cp -p %{SOURCE2} %{_builddir}/%{name}-%{version}
 sed -i -e 's|#!/usr/bin/python2.5|#!%{__python}|' %{_builddir}/%{name}-%{version}/python-config
 
@@ -229,6 +231,9 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
+* Thu Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-6
+- Changed the random file used for creating an openssl cert
+
 * Thu Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5
 - Added a few Build dependencies
 



From wtogami at fedoraproject.org  Tue Dec 29 03:18:05 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 29 Dec 2009 03:18:05 +0000 (UTC)
Subject: rpms/spamassassin/devel sought.conf, NONE,
	1.1 spamassassin-official.conf, NONE, 1.1 sa-update.cronscript,
	1.6, 1.7 spamassassin.spec, 1.144, 1.145 sa-update-channels.txt,
	1.1, NONE sa-update-keys.txt, 1.1, NONE sought-pubkey.txt, 1.1, NONE
Message-ID: <20091229031805.2F77711C008D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5976

Modified Files:
	sa-update.cronscript spamassassin.spec 
Added Files:
	sought.conf spamassassin-official.conf 
Removed Files:
	sa-update-channels.txt sa-update-keys.txt sought-pubkey.txt 
Log Message:
sa-update channels defined in /etc/mail/spamassassin/channels/*.conf



--- NEW FILE sought.conf ---
# http://wiki.apache.org/spamassassin/SoughtRules
CHANNELURL=sought.rules.yerp.org
KEYID=6C6191E3
# Ignore everything below.
return 0

-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.1 (GNU/Linux)

mQGiBEa/l+YRBACC+uJfIThEoEWrNxdDD/1tAwb5L8v7H3gGt+LtuOwwn5ZU7XsT
s1DOok1oZVRnTQJYdlth7QlU9wqijwLEVzW1LDWnxXXKwPmlTlkcdGoBcb+cBbYI
miJ/TlAetvbprcZdROS4Ey31GjPRmWPPnVE2Xcwy+e4+RmnhqfZBmOaE7wCgo1GG
pkik2OPD1le4LGGOGHL5HiED/0TyvTiSS3NnUtoDFQAPrnezOCjxv8zMjYEnJs/I
h7uyIgHRsbB75cD2O1LWyO8Vz8r/snVuG35zcZagPf/7Tc9AJoaxVmCIk9DEmWZp
iuvqpMhwHAbNvY3jY2oKsDl1rNx0IIctoJwjXia99kvNTHK/Yz/HqhIyLModhiMB
aYYZA/wIdPOHGHaP5vjlbWBwGlRR9m0Rf4ob5sul8MjCyehOYcRVLwfOEfzX308v
0enOGnbbBKXU2QvA0Z068aBmJkJaaPhlIjZApQJDsb7pt6k8jMPj/Xpr779wAFQ8
IZC7Tw21OtqkjrUb3dZlEljrTwWNc6FVxuIidBBg7HCdP24WKLRESnVzdGluIE1h
c29uIFNpZ25pbmcgS2V5IChDb2RlIFNpZ25pbmcgT25seSkgPHNpZ25pbmdrZXlA
am1hc29uLm9yZz6IZAQTEQIAJAUCRr+X5gIbAwUJEswDAAYLCQgHAwIDFQIDAxYC
AQIeAQIXgAAKCRDchTQfbGGR4/GJAKCC6X6AF8nM+H00b/XeZl9vYihXBgCcDYuU
AtXjWWxndkneakmbnD0O4Z25BA0ERr+YdxAQAIYYUQHMzVsRAzpIRLfni0aeczrr
armwXMJ8y5p74lVLbJyQOjkQyIJWP80twrN8SjNyUFBr/52SlOPOuAbGZY1ZKpux
vkbsug2wWvkoj8xGjnexrSDahRgpNhf/otLRNTyUFZTM6mjZt0ItnYDl6xszY4kd
O5rVzjQuivNB4BsHcd8qQ7zVo9+VZ5R77iM4dtk6t5ycpXlAom5pD8qLb7ZzTVe0
SuhzOeynF51rwjS+wa3hzZisvJqZA5uJcAyYslgP1UTW+2e5wutSktSZmL/XnlEF
p86GPjAgDPL2Q0TgzVL6sPt0blNCyzOJrcBqBHrgZfraYgqtmGepLpk72q4VD23c
aV2wTqjnfJAsNR3y8jgVNwF8LpXtlbxrBByFRwEqsc/gzdMEnJ728XBDqT2IhZLY
maL/WxiDKNWD/Mae69HTyInIYgrfT7nJKDeKQA81+e5+UmqBVoi5/AICMlDm1DgR
gG6bbOXGhLVPh+gHjGG4Jdd/ZLedncUsjW9KyK261sqM3tSDSfgnF99w2/32ToFu
ChN8JOfQ6VZ7QbL1BWRtQWZ3tyauUUXmsrYDv1w1nx51MqxQdlitnmTRWaRW0GmD
b5XapJfSK+FiGXaynl3HHxHHpcUauX9zBa/LRp8oXiGPLfJEWmjWcGCyGZawASj3
pTTJUnbkYs0fUyUXAAQND/42mh8f3mTA+24I3lY4K8mxH9GSFgOkLoYwok8xL5Md
OUJAyvs34ixqvM2u560YJkegEO/xzg2abddfoqL8eNnjfvG3bI7KOCT+m+mM/5Cg
ul8XFSnHIEivuOXNtc/x/dwYSidKM8atkdpKtv++psd6hVbJQMfLlzf0S2QyiaGk
yXur/pM3A97lvkjAgvIKQt8NbJ/sITFlrN2TFxcbE8OED7LC4nBo54TJ1AxVsHlT
LB5XPKU8pBv0fABZrNKxf6a2iXx9jT9sSYdnb0y+hBjnoWZUNbhxo6jpAqt1quUy
buGWugvG8J75JvT6X+lwEEkg1lplmm+HuaFtegOqTUTKmffKduY+E00le+3Kh8gW
bLR8P1qp/xnxQxZJYcQ+mT4QsYpj6Pkcj0ON3NQO5wP6dr2UGhGcSzS2Cxv8TERN
7HSdFbFXQWPCekx+i7OjeRSY/XTUf2zYquPNP2oU0MjgnXhnkHq+6EaQPpM59fMd
MyLeOiUMOxpPOkeaAC8Ku0Oj2aZU/eyizuBDnhq1PAxBprSW5SSkxP4kz9BnA42x
tkMKMzzPohdfMIRI6zSu0chr76w2UeoViSsMtmWnR6qAXbQvzR+HHxhhB/Rzp6Gc
u9gybrv58IBkybn5ztST6NqgIgcQ/E7XIsB0Eooohfw+QiPlCdoghSxspbzwqcEZ
B4hPBBgRAgAPBQJGv5h3AhsMBQkSzAMAAAoJENyFNB9sYZHjUh0AnA3u5TNYHGLQ
DXLPP0qWHkTeOz8dAJ4wkrLBTaXz3CPCjoTdoBiQsNt3fw==
=nK43
-----END PGP PUBLIC KEY BLOCK-----


--- NEW FILE spamassassin-official.conf ---
# http://wiki.apache.org/spamassassin/RuleUpdates
CHANNELURL=updates.spamassassin.org
KEYID=5244EC45
# Ignore everything below.
return 0

This is the GPG key that updates are signed with (currently,
as of Wed Dec 21 19:31:38 PST 2005.  Please contact <dev /at/
spamassassin.apache.org> with any questions.


-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.2 (SunOS)

mQILBEOnbDQBEADBfda+hU8cGXD/2WYrIHsZ5CmvC2eCYKgQ87W706tzwmxoZWQS
JfnRpkZnBqS5WDhXhNBOhk9CgF5/e9yHnDQCusNYfRstKd+t0XTFvq30/tacrJNe
67zgq+DtWqIK9C7akfElc+2M5NkX6mF4cjaMXZoW17ltPy0XSSeirf584nvK3pXf
oEFLYQ/0AUV9EBpo9+i2DkMUd8d5tz7A6O5foB3ijYPzIcVtVJ1eyCg6gO1I4cIA
YbIZCH0WIVx5MQjydfKyCR4D7VFPpZgwcZ1PmyZSsy3lrigGVvYEoUS2fWTt2jUO
pB3wg5pgzuu9hN5CpChZGvq65t4PGtAeShnBkddIH4l+iDC6sAc6W06KidSaUCW1
BKvNMa39lyEkO4bfLblZRjoZbj7Tjq3wQV/PLpPyKDa8ZZ88GfWaeRDUNRgZG6Qq
e6UKlFGfrw2RXOImUje7Sjy/eG4Ud/BOeGkV913yWBm9CHsPNtaVDK+iQI6vkAWS
3QkiPjBkXGTZFHsUx9/i3k5Iga6d4Gq2cBIVBur3sDxjKuuSazLwA9OAybpzQe2s
PvTzbGc/f1P7plT++HBFlBHwFtl/v68Q8pkbMWlEc5M9nYJ6yXHATHZzFfThxBwt
OYfF25XGaclUMkOMX++RiRkmjaEaT7Whv5aPbeb3+H3v6Omjvnebge24lQAGKbQ/
dXBkYXRlcy5zcGFtYXNzYXNzaW4ub3JnIFNpZ25pbmcgS2V5IDxyZWxlYXNlQHNw
YW1hc3Nhc3Npbi5vcmc+iQI2BBMBAgAgBQJDp2w0AhsDBgsJCAcDAgQVAggDBBYC
AwECHgECF4AACgkQQFamGlJE7EVkfg//ZjBQ6UXDizX9UPsEmogWXIqbBsyP5DJH
uToaFa6OzCbOJqcYnXNfOjovYdDOTje+x3ZEkwbx+y6MSfhmDuHPDPqBU7hXenxx
oRktC68mJasKo0wXym2YfyWFnhSZMlXXFQ9We48zNGcVRckzaxLzM67BFJuRUfOM
EV6Lf3HxMvoUK3/Xzq9YPEq2sqFO1Eu+qPC3nq726Tj/aYBBFHgHmbjDrZTaQNyV
fHvEjDzPcDRjlJI+vZw1UEuXG+BKATPpiT7U7I1OGLDa2ExDIxh0+eJnsmA3YyHG
VweE7nDN2GmkXMVfa5vXHH49Ae9Ee8jIIRipfgMgZWnkZ0XYDvLj2ueH0Ixu4o9R
D2zJIwqzRh1sytG+1YOfHrOMUCplImJaY/ARgOM324ZdBvhkgIi1XvT7Sy/ZmGWd
DKFo+GjX0r2cujR8Pd4i7VlKsF9wRypk+n/aupXiaz5GY44EIVbnweyS5IlCNrwn
4UtqcB9/9uk1tmUNIcC5xjbq5ud/Y+iMIqCKCH0C9WUwSNSdsg+K+9xoZuvlaXY0
JeXWNcDdq+tMir+x+/o0U4ENVYBkSFesnotmHwN6jZj4lSMRmvcFHPBljXqLqzM+
y5wZxnCo1N7T+erZaI7BUrpJYm8JxcJ2VCWV0JFoO1Ec//B6XYB0pckbRuSTX/Zw
pKEkNqOdmjm5AgsEQ6dsigEQAKvdggbwqJgfDbRE2Lcy2gsn4j7haqu3IVBbyUDn
kGuuDuEtSeoRjCZXEb5DaKibIpEy5vzvRGvCFFkrBs4KXk/uamkgCpGnQZFnoz/S
rNZ8U7+e1pecEePpIkhQyafUKox9+p43UVoq4UybdPRDvE9SmQ1qaNUhyQY2FP9S
WT1a63u5GA73aH4puGO0BuZ9R3MNaDYZe/MOlRRjmlAsbY4oqWOudlNVaZ71EV3O
FFmOH4pnpxdO0X0l6sF6nvqvO5/gdZ3dI5iqrJjUneVgVOmPkREq7tQ5qHS/2pny
rDrH8NZCDNT5TXciBxBrt53bxxL/V/HWaolmtJi8gK82uXt8YlmT6zuEsofufDmu
P/HMDZ+BhGI+ggNzY2AVwERTRD6ecHDOI3iIuCP4Ck26YNHRCLyocL3CSlIpjQPu
tb3qfdAcqKLJ/fVyLtGkXr24crel6IeJY7/AGjYBrfh47DWnK7Xds8bAqJ8VCjOc
/q1usFTHgGkYocvtv0gmcjbu8YypzuG8HxOg9Yk9qRLQgg1fNhzXE2lqEPyMlBfj
eLmMNRvKP70fH8CK8adinPIegaRrS6gZ/iIdv8+YV+1rlEt28qzzGJxnmzUEmW6X
Xj44u91umg9WOsLxTOCQWdjGHonytHqj/xIsf45N2JIGLhU0lF04hYfEo5p65AyM
PpYhAAYpiQIfBBgBAgAJBQJDp2yKAhsCAAoJEEBWphpSROxFungP/iWKe7o8szOz
VmXkj89xDVFZ69nthVKkbgSYIZYQC+QLF8P1MWRnNWO/8TY+XsaCT3SrqxDFQ/R/
9mlAPGUM1ySVihOPmP/DPiOlWLCsc0mb6OzYF2olcOR33s05MqvJlqXSmIrdB+hI
KkC7G5byZ+XZwPXVj4XlxIEOzs18+0YJqy0IPZPXTiMet4k2KyWyWkJpJYUCb19G
R6QC8hZQD97EYTbkbr5Ss26jjY/9AqLofW5F1/98pLDo+ron7pI2k8Ymn5DngEsa
XoGsQuyvPfTAjS4p9q/XwExJcX3gvQesdw18mpoSaGAOgDISolBPRqpHpy7v7vuw
3UMnsefKOX3F0Rossevw+c2/JCulnGmJDlgz6nHSR6FhHsbrDKF8oBeYPfGW/Kjw
NvzB1i9yubAMrsTQVu1Q8e5LsnL/MNYKb6oEJbBywdeHxBkehGWFXVdSoFvVSih/
VNqX9f7jlybpLZW/n8cQ2r1ax19v7FleO/xSGvkYm7B1+4BW0mjy6A5dta5+e5WG
D5R06Uya3/xRAPGdmV6t4Mw8fFsuyCvs+vC73PR3+eS1UvCYsDpcQD8KpVBnsHaA
duWRKKhjuFL0vdOWAr25tFOTKAj5Ywas47PBukO0isov2WBCA1rVqOr6FUvdP76y
mqHv/0E6/vnTLxFoNsu4Ce42nAQ/A/jRiQQ+BBgBAgAJAhsCBQJHhbheAinBXSAE
GQECAAYFAkOnbIoACgkQbFU5eCT0NM68MQ/8DvYqxRm3vP0Gwnr+63kzET8S+6vf
gxOghnU+eMlqUeUu/ajqnVDMzoAIRDw9QgQc9ZZoklOSJQwOuloAbdpL4TwQ2XfJ
MLU60JkZWnEOXJwClb0qG1GqtcBPbMEUPfZcQfphdRL3jpWZlaexFiJRSD+A0riw
7q3NZKPDt4FrF7F3GY9krFy+P0nRt5f462DeDhCYZgguBQH+oGtjc5Hx+kOVWDsS
txo5xkt4/0DG50ZklPkTlCohmJwRLACy+NswdQ9q83eWAhzKOPgkal7xF6a+LyE+
ytVYy2EgEU74r2gVw5iizy92FDj//Z2QAUyf/c4BMuAhvfwVIHd8n2DPHvpMP15L
6fwoymh0OjzmhwK94Z2u1YqNC1CK27/hfB6okQ/Tct7/Ik61dBjtiYdUC9tTA5Ze
W8X5ouSmttS1QFixx+Z4hiXV7Qj12lgVKuJohjrVshfcbVzTHljjAo3YkOZIHIoA
IJTUMRNzTIx9k4hrPVbxbVQhKjKTwFNtBuxvmptGTcLEIv9THpqlq8jkcStJ2Zrd
hhofPCWRT/Kzo+WE+Kgefv88T5Li7Ku12U/UpiK85+6nRspXj3rnkfDOUbLZjGM+
1NET0xQTPuyxN6CXF7MMxfGCpszCudYxMANDQqNXu9brcPN/+EIxGRjqin4E7q+h
kYUaY7Ki8mXtJ8cJEEBWphpSROxFktcQALWQv996bFq1iFcGuQ0ITxNDlOWCsses
bgEM5zR10DH+6s2bXEO8xyDHQJtrvdCPetRDosnuOToBMnGMXTYVytnWzwwAzwq1
YM+bGAeTHaIX+2UmxwFyX4GMOdqsNB+xDZ8pmRKjamJSgUQt6e18YpZlg1Y4QkxS
Vptq7OZBjiKeLUhLhGJ6GWgEIedLcoCtFzKCfz3zwn0Oxl+1EnVu8yqN+quWTf8P
7EZn+0ztqZY059BrcK2jmOyXvtOZBcAHXCUknh/uPHwAJV2WFWSNid2kNiLOrV+J
3eLTs5sF9wNhxWRhl6/10cwTzjy0Onv5cJh2tjdwksigMRMwz4c839zXORni/tnY
+IY22kNTKu84gB8rBuqUq8MQXNdS3bbROwwNUzpC0D1C1z1fBvyXDL1EwJdz70Wc
2m/Sw6tIid5g98+XMW+Ibt43Jk2XbK71JLhbVbePbAcHVh/UXEtnjhRfX7oyWlwS
a+lkKMiJd/6CQ6bvYsgklE7uEzTpRskpkkOcCk1O+8jfl+DsDwKrvVaNu8tpx45k
TtV4JDA6iEHKakD/zZdVTR79W2CFqBvRfRikc5INOl1OfMQ4ODmjkMl3yI9wrHwS
SQQxdq2XsS7xbU9HDFBEguQDu0rfzILZ9DuKIVHyr/CsRoJ5joj+JvKaUQC81ywQ
aB8EKy5bg4U6
=IbYW
-----END PGP PUBLIC KEY BLOCK-----


Index: sa-update.cronscript
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sa-update.cronscript,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sa-update.cronscript	28 Dec 2009 06:42:03 -0000	1.6
+++ sa-update.cronscript	29 Dec 2009 03:18:04 -0000	1.7
@@ -1,11 +1,31 @@
 #!/bin/bash
 # *** DO NOT MODIFY THIS FILE ***
 #
-# /etc/mail/spamassassin/sa-update-channels.txt 
-#     Specify custom channels here
+# /etc/mail/spamassassin/channels/*.conf
+#     Place files here to add custom channels.
 #
-# /etc/mail/spamassassin/sa-update-keys.txt
-#     Specify trusted GPG keys for custom channels here
+
+# list files in a directory consisting only of alphanumerics, hyphens and
+# underscores
+# $1 - directory to list
+# $2 - optional suffix to limit which files are selected
+run_parts_list() {
+    if [ $# -lt 1 ]; then
+        echo "ERROR: Usage: run_parts_list <dir>" > /dev/stderr
+        exit 1
+    fi
+    if [ ! -d "$1" ]; then
+        echo "ERROR: Not a directory: $1" > /dev/stderr
+        exit 1
+    fi
+
+    if [ -d "$1" ]; then
+        if [ -n "$2" ]; then
+            find_opts='-name *'$2
+        fi
+        find -L $1 -mindepth 1 -maxdepth 1 -type f $find_opts | sort -n
+    fi
+}
 
 # Proceed with sa-update if spam daemon is running or forced in /etc/sysconfig/sa-update
 unset SAUPDATE
@@ -18,17 +38,45 @@ done
 # Skip sa-update if daemon not detected
 [ -z "$SAUPDATE" ] && exit 0
 
-# Sleep random amount of time before proceeding to avoid overwhelming the servers
-sleep $(expr $RANDOM % 7200)
-
 # sa-update must create keyring
 if [ ! -d /etc/mail/spamassassin/sa-update-keys ]; then
     sa-update
 fi
-# Import SOUGHT key
-sa-update --import /usr/share/spamassassin/sought-pubkey.txt
 
-# Update rules with sa-update, restart spamd if rules were updated
-/usr/bin/sa-update --channelfile /etc/mail/spamassassin/sa-update-channels.txt \
-                   --gpgkeyfile  /etc/mail/spamassassin/sa-update-keys.txt     && \
-                   /etc/init.d/spamassassin condrestart > /dev/null
+# Initialize Channels and Keys
+CHANNELLIST=""
+KEYLIST=""
+# Process each channel defined in /etc/mail/spamassassin/channels/
+for file in $(run_parts_list /etc/mail/spamassassin/channels/ .conf); do 
+    # Validate config file
+    PREFIXES="CHANNELURL KEYID BEGIN"
+    for prefix in $PREFIXES; do
+        if ! grep -q "$prefix" $file; then
+            echo "ERROR: $file missing $prefix"
+            exit 255
+        fi
+    done
+    . $file
+    echo "CHANNELURL=$CHANNELURL"
+    echo "KEYID=$KEYID"
+    CHANNELLIST="$CHANNELLIST $CHANNELURL"
+    KEYLIST="$KEYLIST $KEYID"
+    sa-update --import $file
+done
+
+# Sleep random amount of time before proceeding to avoid overwhelming the servers
+sleep $(expr $RANDOM % 7200)
+
+unset arglist
+# Run sa-update on each channel, restart spam daemon if success
+for channel in $CHANNELLIST; do
+    arglist="$arglist --channel $channel"
+done
+for keyid in $KEYLIST; do
+    arglist="$arglist --gpgkey $keyid"
+done
+/usr/bin/sa-update $arglist
+if [ $? -eq 0 ]; then
+    /etc/init.d/spamassassin condrestart > /dev/null
+    [ -f /etc/init.d/amavisd ] && /etc/init.d/amavisd condrestart > /dev/null
+fi


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- spamassassin.spec	28 Dec 2009 06:42:03 -0000	1.144
+++ spamassassin.spec	29 Dec 2009 03:18:05 -0000	1.145
@@ -55,7 +55,7 @@ Name: spamassassin
 Version: 3.3.0
 %define prename rc1
 %define proposed .proposed2
-Release: 0.27.%{prename}%{?dist}
+Release: 0.28.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -70,9 +70,8 @@ Source7: sa-update.crontab
 Source8: sa-update.cronscript
 Source9: sa-update.force-sysconfig
 Source10: spamassassin-helper.sh
-Source11: sa-update-channels.txt
-Source12: sa-update-keys.txt
-Source13: sought-pubkey.txt
+Source11: spamassassin-official.conf
+Source12: sought.conf
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
@@ -178,7 +177,6 @@ install -m 0644 %{SOURCE7} %buildroot/et
 install -m 0644 %{SOURCE9} %buildroot%{_sysconfdir}/sysconfig/sa-update
 # installed mode 744 as non root users can't run it, but can read it.
 install -m 0744 %{SOURCE8} %buildroot%{_datadir}/spamassassin/sa-update.cron
-install -m 0644 %{SOURCE13} %buildroot%{_datadir}/spamassassin/
 
 [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
 
@@ -204,9 +202,11 @@ find $RPM_BUILD_ROOT%{perl_vendorlib}/* 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/spamassassin
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
 
-# sa-update channels and keys
-install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
-install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
+# sa-update channels and keyring directory
+mkdir   -m 0755             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/
+mkdir   -m 0755             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
+install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
 
 # Tell portreserve which port we want it to protect.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
@@ -264,6 +264,9 @@ fi
 exit 0
 
 %changelog
+* Mon Dec 28 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.28.rc1
+- sa-update channels defined in /etc/mail/spamassassin/channels/*.conf
+
 * Mon Dec 28 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.27.rc1
 - sa-update runs in cron automatically if spamd or amavisd is running
   If you use neither, you may force sa-update by editing /etc/sysconfig/sa-update.


--- sa-update-channels.txt DELETED ---


--- sa-update-keys.txt DELETED ---


--- sought-pubkey.txt DELETED ---



From pbrobinson at fedoraproject.org  Tue Dec 29 03:20:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Dec 2009 03:20:29 +0000 (UTC)
Subject: rpms/clutter-gesture/devel import.log,1.1,NONE
Message-ID: <20091229032029.9703211C008D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/clutter-gesture/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6805

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Tue Dec 29 03:22:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 29 Dec 2009 03:22:14 +0000 (UTC)
Subject: rpms/clutter-gesture/F-12 clutter-gesture.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091229032214.30EE711C008D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/clutter-gesture/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7202

Modified Files:
	.cvsignore sources 
Added Files:
	clutter-gesture.spec 
Log Message:
- initial F-12 import


--- NEW FILE clutter-gesture.spec ---
Name:           clutter-gesture
Version:        0.0.2
Release:        2%{?dist}
Summary:        Gesture Library for Clutter

Group:          System Environment/Libraries
License:        LGPLv2+ and MIT
URL:            http://moblin.org/projects/clutter-gesture
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: clutter-devel
BuildRequires: glib2-devel

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool

%description
This library allows clutter applications to be aware of gestures 
and to easily attach some handlers to the gesture events. The library 
supports both single and multi touch.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
Files for development with %{name}.

%prep
%setup -q

# The NEWS file contains the license so use it as a COPYING file. Upstream has been contacted to resolve the issue
cp NEWS COPYING

# run autogen.sh until we have a proper release, but don't run configure twice.
sed -i '/configure/d' autogen.sh
./autogen.sh

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

#Remove libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libcluttergesture-%{version}.so.*
%{_libdir}/libengine.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libcluttergesture-%{version}.so
%{_libdir}/libengine.so
%{_includedir}/%{name}
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Sat Dec 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-2
- Review updates

* Tue Sep 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gesture/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:57:21 -0000	1.1
+++ .cvsignore	29 Dec 2009 03:22:13 -0000	1.2
@@ -0,0 +1 @@
+clutter-gesture-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gesture/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:57:21 -0000	1.1
+++ sources	29 Dec 2009 03:22:14 -0000	1.2
@@ -0,0 +1 @@
+de0e3e5c01f0a328cc04a46198776ebe  clutter-gesture-0.0.2.tar.bz2



From wtogami at fedoraproject.org  Tue Dec 29 03:47:39 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 29 Dec 2009 03:47:39 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.145,1.146
Message-ID: <20091229034739.220FE11C008D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11718

Modified Files:
	spamassassin.spec 
Log Message:
Set correct permission on keyring directory.  Thanks nirik.



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- spamassassin.spec	29 Dec 2009 03:18:05 -0000	1.145
+++ spamassassin.spec	29 Dec 2009 03:47:38 -0000	1.146
@@ -55,7 +55,7 @@ Name: spamassassin
 Version: 3.3.0
 %define prename rc1
 %define proposed .proposed2
-Release: 0.28.%{prename}%{?dist}
+Release: 0.29.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -203,7 +203,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
 
 # sa-update channels and keyring directory
-mkdir   -m 0755             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/
+mkdir   -m 0700             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/
 mkdir   -m 0755             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
 install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
 install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
@@ -264,7 +264,7 @@ fi
 exit 0
 
 %changelog
-* Mon Dec 28 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.28.rc1
+* Mon Dec 28 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.29.rc1
 - sa-update channels defined in /etc/mail/spamassassin/channels/*.conf
 
 * Mon Dec 28 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.27.rc1



From lkundrak at fedoraproject.org  Tue Dec 29 07:47:55 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 29 Dec 2009 07:47:55 +0000 (UTC)
Subject: File earcandy-0.5.1.tar.gz uploaded to lookaside cache by lkundrak
Message-ID: <20091229074755.617E710F8BA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for earcandy:

11bd9b944f14cc1800cd78d03ba9876b  earcandy-0.5.1.tar.gz



From lkundrak at fedoraproject.org  Tue Dec 29 07:49:03 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 29 Dec 2009 07:49:03 +0000 (UTC)
Subject: rpms/earcandy/devel earcandy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091229074903.ADCD911C0375@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/earcandy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18156/devel

Modified Files:
	.cvsignore sources 
Added Files:
	earcandy.spec 
Log Message:
Impoert earcandy


--- NEW FILE earcandy.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           earcandy
Version:        0.5.1
Release:        4%{?dist}
Summary:        Sound level manager

Group:          Applications/Multimedia
# pulseaudio/lib.py is BSD-licensed, the rest is GPLv2+
License:        BSD and GPLv2+
URL:            https://launchpad.net/earcandy
Source0:        http://launchpad.net/%{name}/0.5/0.5.release/+download/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
Requires:       pygobject2
Requires:       pygtk2
Requires:       dbus-python
Requires:       notify-python
Requires:       gnome-python2-libwnck
Requires:       pulseaudio-libs < 1
BuildArch:      noarch


%description
A sound level manager that nicely fades applications in and out based on
their profile and window focus. It is useful if you need to fade out music
or video players during VoIP calls, switch to music player with focus when
more using than one, push sound to USB headsets on plugin, etc. Settings
can be configured via nice and simple UI.


%prep
%setup -q


%build
# Fix the shebangs
find . -name '*.py' -o -type f -name 'ear_candy' |
while read F
do
        S='/^#!/d'
        echo $F |grep -q '\.py$' || S='s,^#!/usr/bin/env python,#!/usr/bin/python,'
        sed "$S" $F >$F.new
        touch -r $F $F.new
        mv $F.new $F
done
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/earcandy.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/ear_candy
%{_datadir}/applications/earcandy.desktop
%{_datadir}/earcandy
%exclude %{_datadir}/earcandy/earcandy.desktop
%{_datadir}/pixmaps/earsLabel.png
%{python_sitelib}/ear_candy
%{python_sitelib}/*.egg-info
%doc README COPYING


%changelog
* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-4
- Don't require on 32bit libpulse

* Sun Oct 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-3
- Drop unnecessary python dependency
- Ignore duplicate desktop file

* Mon Oct 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-2
- Correct the license (Martin Gieseking, #527059#c2)
- Fix up the shebangs (Martin Gieseking, #527059#c2)
- Depend on specific version of PulseAudio ABI

* Sat Oct 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:58:08 -0000	1.1
+++ .cvsignore	29 Dec 2009 07:49:03 -0000	1.2
@@ -0,0 +1 @@
+earcandy-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:58:08 -0000	1.1
+++ sources	29 Dec 2009 07:49:03 -0000	1.2
@@ -0,0 +1 @@
+11bd9b944f14cc1800cd78d03ba9876b  earcandy-0.5.1.tar.gz



From lkundrak at fedoraproject.org  Tue Dec 29 07:49:03 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 29 Dec 2009 07:49:03 +0000 (UTC)
Subject: rpms/earcandy/F-12 earcandy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091229074903.96D7811C029D@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/earcandy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18156/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	earcandy.spec 
Log Message:
Impoert earcandy


--- NEW FILE earcandy.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           earcandy
Version:        0.5.1
Release:        4%{?dist}
Summary:        Sound level manager

Group:          Applications/Multimedia
# pulseaudio/lib.py is BSD-licensed, the rest is GPLv2+
License:        BSD and GPLv2+
URL:            https://launchpad.net/earcandy
Source0:        http://launchpad.net/%{name}/0.5/0.5.release/+download/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
Requires:       pygobject2
Requires:       pygtk2
Requires:       dbus-python
Requires:       notify-python
Requires:       gnome-python2-libwnck
Requires:       pulseaudio-libs < 1
BuildArch:      noarch


%description
A sound level manager that nicely fades applications in and out based on
their profile and window focus. It is useful if you need to fade out music
or video players during VoIP calls, switch to music player with focus when
more using than one, push sound to USB headsets on plugin, etc. Settings
can be configured via nice and simple UI.


%prep
%setup -q


%build
# Fix the shebangs
find . -name '*.py' -o -type f -name 'ear_candy' |
while read F
do
        S='/^#!/d'
        echo $F |grep -q '\.py$' || S='s,^#!/usr/bin/env python,#!/usr/bin/python,'
        sed "$S" $F >$F.new
        touch -r $F $F.new
        mv $F.new $F
done
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/earcandy.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/ear_candy
%{_datadir}/applications/earcandy.desktop
%{_datadir}/earcandy
%exclude %{_datadir}/earcandy/earcandy.desktop
%{_datadir}/pixmaps/earsLabel.png
%{python_sitelib}/ear_candy
%{python_sitelib}/*.egg-info
%doc README COPYING


%changelog
* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-4
- Don't require on 32bit libpulse

* Sun Oct 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-3
- Drop unnecessary python dependency
- Ignore duplicate desktop file

* Mon Oct 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-2
- Correct the license (Martin Gieseking, #527059#c2)
- Fix up the shebangs (Martin Gieseking, #527059#c2)
- Depend on specific version of PulseAudio ABI

* Sat Oct 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:58:08 -0000	1.1
+++ .cvsignore	29 Dec 2009 07:49:03 -0000	1.2
@@ -0,0 +1 @@
+earcandy-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:58:08 -0000	1.1
+++ sources	29 Dec 2009 07:49:03 -0000	1.2
@@ -0,0 +1 @@
+11bd9b944f14cc1800cd78d03ba9876b  earcandy-0.5.1.tar.gz



From lkundrak at fedoraproject.org  Tue Dec 29 07:49:03 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 29 Dec 2009 07:49:03 +0000 (UTC)
Subject: rpms/earcandy/EL-5 earcandy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091229074903.9427911C00EF@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/earcandy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18156/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	earcandy.spec 
Log Message:
Impoert earcandy


--- NEW FILE earcandy.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           earcandy
Version:        0.5.1
Release:        4%{?dist}
Summary:        Sound level manager

Group:          Applications/Multimedia
# pulseaudio/lib.py is BSD-licensed, the rest is GPLv2+
License:        BSD and GPLv2+
URL:            https://launchpad.net/earcandy
Source0:        http://launchpad.net/%{name}/0.5/0.5.release/+download/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
Requires:       pygobject2
Requires:       pygtk2
Requires:       dbus-python
Requires:       notify-python
Requires:       gnome-python2-libwnck
Requires:       pulseaudio-libs < 1
BuildArch:      noarch


%description
A sound level manager that nicely fades applications in and out based on
their profile and window focus. It is useful if you need to fade out music
or video players during VoIP calls, switch to music player with focus when
more using than one, push sound to USB headsets on plugin, etc. Settings
can be configured via nice and simple UI.


%prep
%setup -q


%build
# Fix the shebangs
find . -name '*.py' -o -type f -name 'ear_candy' |
while read F
do
        S='/^#!/d'
        echo $F |grep -q '\.py$' || S='s,^#!/usr/bin/env python,#!/usr/bin/python,'
        sed "$S" $F >$F.new
        touch -r $F $F.new
        mv $F.new $F
done
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/earcandy.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/ear_candy
%{_datadir}/applications/earcandy.desktop
%{_datadir}/earcandy
%exclude %{_datadir}/earcandy/earcandy.desktop
%{_datadir}/pixmaps/earsLabel.png
%{python_sitelib}/ear_candy
%{python_sitelib}/*.egg-info
%doc README COPYING


%changelog
* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-4
- Don't require on 32bit libpulse

* Sun Oct 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-3
- Drop unnecessary python dependency
- Ignore duplicate desktop file

* Mon Oct 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-2
- Correct the license (Martin Gieseking, #527059#c2)
- Fix up the shebangs (Martin Gieseking, #527059#c2)
- Depend on specific version of PulseAudio ABI

* Sat Oct 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:58:08 -0000	1.1
+++ .cvsignore	29 Dec 2009 07:49:02 -0000	1.2
@@ -0,0 +1 @@
+earcandy-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:58:08 -0000	1.1
+++ sources	29 Dec 2009 07:49:02 -0000	1.2
@@ -0,0 +1 @@
+11bd9b944f14cc1800cd78d03ba9876b  earcandy-0.5.1.tar.gz



From lkundrak at fedoraproject.org  Tue Dec 29 07:49:03 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 29 Dec 2009 07:49:03 +0000 (UTC)
Subject: rpms/earcandy/F-11 earcandy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091229074903.99A2B11C0335@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/earcandy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18156/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	earcandy.spec 
Log Message:
Impoert earcandy


--- NEW FILE earcandy.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           earcandy
Version:        0.5.1
Release:        4%{?dist}
Summary:        Sound level manager

Group:          Applications/Multimedia
# pulseaudio/lib.py is BSD-licensed, the rest is GPLv2+
License:        BSD and GPLv2+
URL:            https://launchpad.net/earcandy
Source0:        http://launchpad.net/%{name}/0.5/0.5.release/+download/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
Requires:       pygobject2
Requires:       pygtk2
Requires:       dbus-python
Requires:       notify-python
Requires:       gnome-python2-libwnck
Requires:       pulseaudio-libs < 1
BuildArch:      noarch


%description
A sound level manager that nicely fades applications in and out based on
their profile and window focus. It is useful if you need to fade out music
or video players during VoIP calls, switch to music player with focus when
more using than one, push sound to USB headsets on plugin, etc. Settings
can be configured via nice and simple UI.


%prep
%setup -q


%build
# Fix the shebangs
find . -name '*.py' -o -type f -name 'ear_candy' |
while read F
do
        S='/^#!/d'
        echo $F |grep -q '\.py$' || S='s,^#!/usr/bin/env python,#!/usr/bin/python,'
        sed "$S" $F >$F.new
        touch -r $F $F.new
        mv $F.new $F
done
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/earcandy.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/ear_candy
%{_datadir}/applications/earcandy.desktop
%{_datadir}/earcandy
%exclude %{_datadir}/earcandy/earcandy.desktop
%{_datadir}/pixmaps/earsLabel.png
%{python_sitelib}/ear_candy
%{python_sitelib}/*.egg-info
%doc README COPYING


%changelog
* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-4
- Don't require on 32bit libpulse

* Sun Oct 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-3
- Drop unnecessary python dependency
- Ignore duplicate desktop file

* Mon Oct 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-2
- Correct the license (Martin Gieseking, #527059#c2)
- Fix up the shebangs (Martin Gieseking, #527059#c2)
- Depend on specific version of PulseAudio ABI

* Sat Oct 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:58:08 -0000	1.1
+++ .cvsignore	29 Dec 2009 07:49:02 -0000	1.2
@@ -0,0 +1 @@
+earcandy-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:58:08 -0000	1.1
+++ sources	29 Dec 2009 07:49:02 -0000	1.2
@@ -0,0 +1 @@
+11bd9b944f14cc1800cd78d03ba9876b  earcandy-0.5.1.tar.gz



From lkundrak at fedoraproject.org  Tue Dec 29 09:01:25 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 29 Dec 2009 09:01:25 +0000 (UTC)
Subject: rpms/earcandy/devel earcandy.spec,1.1,1.2
Message-ID: <20091229090125.AA64311C00EF@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/earcandy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2069

Modified Files:
	earcandy.spec 
Log Message:
* Tue Dec 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-5
- Don't depend on specific version of libpulse



Index: earcandy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/earcandy/devel/earcandy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- earcandy.spec	29 Dec 2009 07:49:03 -0000	1.1
+++ earcandy.spec	29 Dec 2009 09:01:24 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           earcandy
 Version:        0.5.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sound level manager
 
 Group:          Applications/Multimedia
@@ -19,7 +19,7 @@ Requires:       pygtk2
 Requires:       dbus-python
 Requires:       notify-python
 Requires:       gnome-python2-libwnck
-Requires:       pulseaudio-libs < 1
+Requires:       pulseaudio-libs
 BuildArch:      noarch
 
 
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-5
+- Don't depend on specific version of libpulse
+
 * Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5.1-4
 - Don't require on 32bit libpulse
 



From donv at fedoraproject.org  Tue Dec 29 09:18:24 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Tue, 29 Dec 2009 09:18:24 +0000 (UTC)
Subject: rpms/zfs-fuse/devel zfs-fuse.init, 1.5, 1.6 zfs-fuse.spec, 1.25,
	1.26 zfs-fuse.sysconfig, 1.2, 1.3
Message-ID: <20091229091824.B0B3011C00EF@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5988

Modified Files:
	zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig 
Log Message:
* Added option for killing processes with unknown working directory at zfs-fuse startup.


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- zfs-fuse.init	29 Dec 2009 01:28:25 -0000	1.5
+++ zfs-fuse.init	29 Dec 2009 09:18:23 -0000	1.6
@@ -55,6 +55,32 @@ start() {
     	exit 99
     esac
 
+    if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then
+      echo -n Killing processes with unknown working directory:
+      for a in 1 2 3 4 5 ; do
+        orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+        echo -n $orphans
+        [ "$orphans" == "" ] && break
+        echo -n .
+        kill $orphans
+        sleep 1
+      done
+      orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+      if [ "$orphans" != "" ] ; then
+        echo_failure ; echo
+        echo -n Some orphans still live: $orphans  Killing with signal 9
+        kill -9 $orphans
+      fi
+      orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+      if [ "$orphans" != "" ] ; then
+        echo_failure ; echo
+        echo -n Some orphans still live: $orphans
+        echo_failure ; echo
+        exit 8
+      fi
+      echo_success ; echo
+    fi
+
     echo -n $"Starting $prog: "
     daemon $exec -p "$PIDFILE"
     exec_retval=$?


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- zfs-fuse.spec	29 Dec 2009 01:28:25 -0000	1.25
+++ zfs-fuse.spec	29 Dec 2009 09:18:24 -0000	1.26
@@ -94,9 +94,11 @@ fi
 * Mon Jan 04 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-6
 - Added option for automatic weekly scrubbing.
   Set ZFS_WEEKLY_SCRUB=yes in /etc/sysconfig/zfs-fuse to enable
-  Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability.
+- Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability.
   ZFS_AUTOMOUNT=1 deprecated and will be removed in version 0.7.0.
-
+- Added option for killing processes with unknown working directory at zfs-fuse startup.
+  This would be the case if zfs-fuse crashed.  Use with care.  It may kill unrelated processes.
+  Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable.
 * Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we


Index: zfs-fuse.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zfs-fuse.sysconfig	29 Dec 2009 01:28:25 -0000	1.2
+++ zfs-fuse.sysconfig	29 Dec 2009 09:18:24 -0000	1.3
@@ -3,3 +3,7 @@ ZFS_AUTOMOUNT=yes
 
 # Set this option to yes to enable weekly scrubbing of your ZFS pools.
 ZFS_WEEKLY_SCRUB=yes
+
+# Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup
+# This might kill processes totally unrelated to zfs-fuse.
+# ZFS_KILL_ORPHANS=no|yes_really



From tomeu at fedoraproject.org  Tue Dec 29 10:13:53 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 29 Dec 2009 10:13:53 +0000 (UTC)
Subject: File gnash-0.8.6.tar.bz2 uploaded to lookaside cache by tomeu
Message-ID: <20091229101353.721DA10F8A8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnash:

913bcbffd37c9603b84486227c65dce7  gnash-0.8.6.tar.bz2



From tomeu at fedoraproject.org  Tue Dec 29 10:18:14 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 29 Dec 2009 10:18:14 +0000 (UTC)
Subject: rpms/gnash/devel .cvsignore, 1.16, 1.17 gnash.spec, 1.63, 1.64 sources,
	1.16, 1.17
Message-ID: <20091229101814.99BDA11C00EF@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19362

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	10 Sep 2009 13:36:28 -0000	1.16
+++ .cvsignore	29 Dec 2009 10:18:14 -0000	1.17
@@ -1,2 +1,2 @@
-gnash-0.9.0.20090910bzr11506.tar.gz
+gnash-0.8.6.tar.bz2
 gnash-splash.swf


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gnash.spec	10 Sep 2009 13:36:28 -0000	1.63
+++ gnash.spec	29 Dec 2009 10:18:14 -0000	1.64
@@ -4,15 +4,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnash
-Version:        0.9.0
-Release:        0.8.%{alphatag}%{?dist}
+Version:        0.8.6
+Release:	1%{?dist}
+#Release:        0.8.%{alphatag}%{?dist}
+Epoch:		1
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-#Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
-Source0:        %{name}-%{version}.%{alphatag}.tar.gz
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
+#Source0:        %{name}-%{version}.%{alphatag}.tar.gz
 Source1:        http://www.getgnash.org/gnash-splash.swf
 Source2:        gnash.desktop
 
@@ -313,6 +315,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-1
+- Update to 0.8.6, increase epoch.
+
 * Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.8.20090910bzr11506
 - update to HEAD
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	10 Sep 2009 13:36:28 -0000	1.16
+++ sources	29 Dec 2009 10:18:14 -0000	1.17
@@ -1,2 +1,2 @@
-0ea3593402c65fe303f73bade585b241  gnash-0.9.0.20090910bzr11506.tar.gz
+913bcbffd37c9603b84486227c65dce7  gnash-0.8.6.tar.bz2
 3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf



From rjones at fedoraproject.org  Tue Dec 29 10:49:50 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Dec 2009 10:49:50 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs-find-requires.sh, 1.1,
	1.2 libguestfs.spec, 1.118, 1.119
Message-ID: <20091229104950.B14FB11C00EF@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26007

Modified Files:
	libguestfs-find-requires.sh libguestfs.spec 
Log Message:
- Remove some debugging statements which were left in the requires script by accident.


Index: libguestfs-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libguestfs-find-requires.sh	21 Dec 2009 13:06:12 -0000	1.1
+++ libguestfs-find-requires.sh	29 Dec 2009 10:49:50 -0000	1.2
@@ -1,12 +1,6 @@
 #!/bin/sh -
 # Additional custom requires for libguestfs package.
 
-exec 5>>/tmp/requires.log
-
-echo >&5
-time >&5
-echo args "$@" >&5
-
 original_find_requires="$1"
 shift
 
@@ -18,7 +12,6 @@ echo $files | tr [:blank:] '\n' | $origi
 
 # Is initramfs.*.supermin.hostfiles included in the list of files?
 hostfiles=`echo $files | tr [:blank:] '\n' | grep 'initramfs\..*\.supermin\.hostfiles$'`
-echo hostfiles $hostfiles >&5
 
 if [ -z "$hostfiles" ]; then
     exit 0


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- libguestfs.spec	21 Dec 2009 13:06:12 -0000	1.118
+++ libguestfs.spec	29 Dec 2009 10:49:50 -0000	1.119
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.80
-Release:     9%{?dist}
+Release:     10%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -612,6 +612,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-10
+- Remove some debugging statements which were left in the requires
+  script by accident.
+
 * Mon Dec 21 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.80-9
 - Generate additional requires for supermin (RHBZ#547496).
 



From pkgdb at fedoraproject.org  Tue Dec 29 11:43:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 29 Dec 2009 11:43:30 +0000
Subject: [pkgdb] dosfstools: mattspsp has given up watchcommits
Message-ID: <20091229114328.E187110F8BA@bastion.fedoraproject.org>

mattspsp has given up the watchcommits acl on dosfstools (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dosfstools



From nphilipp at fedoraproject.org  Tue Dec 29 12:31:16 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Dec 2009 12:31:16 +0000 (UTC)
Subject: File sane-backends-1.0.20-11-autoreconf.patch.bz2 uploaded to
	lookaside cache by nphilipp
Message-ID: <20091229123116.6310810F8BA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sane-backends:

b33b94acbfae50d9b31abb688573c17c  sane-backends-1.0.20-11-autoreconf.patch.bz2



From nphilipp at fedoraproject.org  Tue Dec 29 12:34:56 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Dec 2009 12:34:56 +0000 (UTC)
Subject: rpms/sane-backends/devel
	sane-backends-1.0.20-genesys-gl841-registers.patch, NONE,
	1.1 sane-backends-1.0.20-lockdir.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 sane-backends.spec, 1.135, 1.136 sources, 1.20, 1.21
Message-ID: <20091229123456.BD24011C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17120

Modified Files:
	.cvsignore sane-backends.spec sources 
Added Files:
	sane-backends-1.0.20-genesys-gl841-registers.patch 
	sane-backends-1.0.20-lockdir.patch 
Log Message:
genesys_gl841: always send registers before trying to acquire a line (#527935)
build v4l backend (#550119)
don't use lockdir, fix make install


sane-backends-1.0.20-genesys-gl841-registers.patch:
 genesys_gl841.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sane-backends-1.0.20-genesys-gl841-registers.patch ---
commit 4d9d166a3ae830c62bb7341efe886c99e614199a
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Dec 29 11:43:24 2009 +0100

    patch: genesys-gl841-registers
    
    Squashed commit of the following:
    
    commit 8bb82ba231bec01377e28a4f7f635dca61c34fbb
    Author: Pierre Willenbrock <pierre at pirsoft.dnsalias.org>
    Date:   Wed Jun 3 00:16:16 2009 +0200
    
        Always send registers before trying to acquire a line
        (cherry picked from commit a0ea955e91837156d2112c0ffd12c8afebe86efa)
    
        Signed-off-by: Nils Philippsen <nils at redhat.com>
        Resolves: rhbz#527935

diff --git a/backend/genesys_gl841.c b/backend/genesys_gl841.c
index 2810865..c9facc4 100644
--- a/backend/genesys_gl841.c
+++ b/backend/genesys_gl841.c
@@ -4948,9 +4948,6 @@ gl841_offset_calibration (Genesys_Device * dev)
       return status;
     }
 
-  RIE (gl841_bulk_write_register
-       (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
-
   used_res = dev->current_setup.xres;
   num_pixels = dev->current_setup.pixels;
 
@@ -4999,6 +4996,9 @@ gl841_offset_calibration (Genesys_Device * dev)
 
   do {
 
+      RIE (gl841_bulk_write_register
+	   (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
+
       for (j=0; j < channels; j++) {
 	  off[j] = (offh[j]+offl[j])/2;
 	  dev->frontend.offset[j] = off[j];

sane-backends-1.0.20-lockdir.patch:
 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sane-backends-1.0.20-lockdir.patch ---
commit 1e12605eac293b12809ca2933622acc54515c237
Author: Nils Philippsen <nils at redhat.com>
Date:   Mon Dec 28 17:00:25 2009 +0100

    patch: lockdir
    
    Squashed commit of the following:
    
    commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb
    Author: Nils Philippsen <nils at redhat.com>
    Date:   Mon Dec 28 16:58:36 2009 +0100
    
        improve install-lockpath target
    
        make robust against problems with setting group on sane lock dir

diff --git a/backend/Makefile.am b/backend/Makefile.am
index 5165423..3c22cd4 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -137,7 +137,8 @@ install-firmware-path:
 	  done
 
 install-lockpath:
-	$(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
+	$(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \
+		$(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
 
 uninstall-hook:
 	rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	16 Jun 2009 15:28:11 -0000	1.18
+++ .cvsignore	29 Dec 2009 12:34:55 -0000	1.19
@@ -1,2 +1,3 @@
 sane-backends-1.0.20.tar.gz
 sane-backends-1.0.20-autoreconf.patch.bz2
+sane-backends-1.0.20-11-autoreconf.patch.bz2


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- sane-backends.spec	22 Oct 2009 15:08:41 -0000	1.135
+++ sane-backends.spec	29 Dec 2009 12:34:55 -0000	1.136
@@ -15,7 +15,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 10%{?dist}
+Release: 11%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -31,7 +31,9 @@ Patch3: sane-backends-1.0.20-hal.patch
 Patch4: sane-backends-1.0.20-udev.patch
 Patch5: sane-backends-1.0.20-man-utf8.patch
 Patch6: sane-backends-1.0.20-epson-expression800.patch
-Patch10: sane-backends-1.0.20-autoreconf.patch.bz2
+Patch7: sane-backends-1.0.20-lockdir.patch
+Patch8: sane-backends-1.0.20-genesys-gl841-registers.patch
+Patch10: sane-backends-1.0.20-11-autoreconf.patch.bz2
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildRequires: tetex-latex
@@ -39,6 +41,7 @@ BuildRequires: libusb-devel
 BuildRequires: libieee1284-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
+BuildRequires: libv4l-devel
 BuildRequires: gettext
 BuildRequires: gphoto2-devel
 %if %{with udev}
@@ -102,13 +105,15 @@ want to access digital cameras.
 %patch4 -p1 -b .udev
 %patch5 -p1 -b .man-utf8
 %patch6 -p1 -b .epson-expression800
+%patch7 -p1 -b .lockdir
+%patch8 -p1 -b .genesys-gl841-registers
 %patch10 -p1 -b .autoreconf
 
 %build
 %configure \
     --with-gphoto2=%{_prefix} \
     --with-docdir=%{_docdir}/%{name}-%{version} \
-    --disable-rpath
+    --disable-locking --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -189,6 +194,14 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Tue Dec 29 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-11
+- genesys_gl841: always send registers before trying to acquire a line
+  (#527935)
+
+* Mon Dec 28 2009 Nils Philippsen <nils at redhat.com>
+- build v4l backend (#550119)
+- don't use lockdir, fix make install
+
 * Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-10
 - don't set owner, group or mode as this may interfere with setting ACLs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	31 Aug 2009 16:04:19 -0000	1.20
+++ sources	29 Dec 2009 12:34:55 -0000	1.21
@@ -1,2 +1,2 @@
 a0cfdfdebca2feb4f2ba5d3418b15a42  sane-backends-1.0.20.tar.gz
-55134659213e74bc1d9d5326102072b4  sane-backends-1.0.20-autoreconf.patch.bz2
+b33b94acbfae50d9b31abb688573c17c  sane-backends-1.0.20-11-autoreconf.patch.bz2



From sdz at fedoraproject.org  Tue Dec 29 12:51:02 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue, 29 Dec 2009 12:51:02 +0000 (UTC)
Subject: File VisualMatch-13.tar.bz2 uploaded to lookaside cache by sdz
Message-ID: <20091229125102.2786010F8BA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for sugar-visualmatch:

90ac5a90ad82c7cadf45689015e24de4  VisualMatch-13.tar.bz2



From sdz at fedoraproject.org  Tue Dec 29 12:52:32 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue, 29 Dec 2009 12:52:32 +0000 (UTC)
Subject: rpms/sugar-visualmatch/devel import.log, NONE,
	1.1 sugar-visualmatch.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091229125233.08BC511C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-visualmatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21349/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sugar-visualmatch.spec 
Log Message:
initial import



--- NEW FILE import.log ---
sugar-visualmatch-13-1_fc12:HEAD:sugar-visualmatch-13-1.fc12.src.rpm:1262091040


--- NEW FILE sugar-visualmatch.spec ---
Name:           sugar-visualmatch
Version:        13
Release:        1%{?dist}
Summary:        A visual matching game

Group:          Sugar/Activities
License:        MIT
URL:            http://wiki.sugarlabs.org/go/Activities/VisualMatch
Source0:        http://download.sugarlabs.org/sources/honey/Visualmatch/VisualMatch-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python sugar-toolkit
BuildArch:      noarch
Requires:       sugar 

%description
The object is to find sets of three cards where each attribute?color,
shape, number of elements, and shading?either match on all three cards
or are different on all three cards. The current version doesn't yet
support sharing with multiple players or saving to the Journal, but it
can be played by a single player.


%prep
%setup -q -n VisualMatch-%{version}


%build
python ./setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
chmod 0644 $RPM_BUILD_ROOT/%{sugaractivitydir}/VisualMatch.activity/gencards.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS
%{sugaractivitydir}/VisualMatch.activity/


%changelog
* Tue Dec 29 2009 Sebastian Dziallas <sebastian at when.com> - 13-1
- new upstream release
- fix license tag

* Sun Dec 06 2009 Sebastian Dziallas <sebastian at when.com> - 8-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-visualmatch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:53:26 -0000	1.1
+++ .cvsignore	29 Dec 2009 12:52:31 -0000	1.2
@@ -0,0 +1 @@
+VisualMatch-13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-visualmatch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:53:26 -0000	1.1
+++ sources	29 Dec 2009 12:52:31 -0000	1.2
@@ -0,0 +1 @@
+90ac5a90ad82c7cadf45689015e24de4  VisualMatch-13.tar.bz2



From sdz at fedoraproject.org  Tue Dec 29 12:53:39 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue, 29 Dec 2009 12:53:39 +0000 (UTC)
Subject: rpms/sugar-visualmatch/F-12 import.log, NONE,
	1.1 sugar-visualmatch.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091229125339.1541D11C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-visualmatch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21739/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sugar-visualmatch.spec 
Log Message:
initial import



--- NEW FILE import.log ---
sugar-visualmatch-13-1_fc12:F-12:sugar-visualmatch-13-1.fc12.src.rpm:1262091158


--- NEW FILE sugar-visualmatch.spec ---
Name:           sugar-visualmatch
Version:        13
Release:        1%{?dist}
Summary:        A visual matching game

Group:          Sugar/Activities
License:        MIT
URL:            http://wiki.sugarlabs.org/go/Activities/VisualMatch
Source0:        http://download.sugarlabs.org/sources/honey/Visualmatch/VisualMatch-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python sugar-toolkit
BuildArch:      noarch
Requires:       sugar 

%description
The object is to find sets of three cards where each attribute?color,
shape, number of elements, and shading?either match on all three cards
or are different on all three cards. The current version doesn't yet
support sharing with multiple players or saving to the Journal, but it
can be played by a single player.


%prep
%setup -q -n VisualMatch-%{version}


%build
python ./setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
chmod 0644 $RPM_BUILD_ROOT/%{sugaractivitydir}/VisualMatch.activity/gencards.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS
%{sugaractivitydir}/VisualMatch.activity/


%changelog
* Tue Dec 29 2009 Sebastian Dziallas <sebastian at when.com> - 13-1
- new upstream release
- fix license tag

* Sun Dec 06 2009 Sebastian Dziallas <sebastian at when.com> - 8-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-visualmatch/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:53:26 -0000	1.1
+++ .cvsignore	29 Dec 2009 12:53:38 -0000	1.2
@@ -0,0 +1 @@
+VisualMatch-13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-visualmatch/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:53:26 -0000	1.1
+++ sources	29 Dec 2009 12:53:38 -0000	1.2
@@ -0,0 +1 @@
+90ac5a90ad82c7cadf45689015e24de4  VisualMatch-13.tar.bz2



From sdz at fedoraproject.org  Tue Dec 29 12:55:09 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue, 29 Dec 2009 12:55:09 +0000 (UTC)
Subject: rpms/sugar-visualmatch/F-11 import.log, NONE,
	1.1 sugar-visualmatch.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091229125509.F1D8711C00EF@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-visualmatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22174/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sugar-visualmatch.spec 
Log Message:
initial import



--- NEW FILE import.log ---
sugar-visualmatch-13-1_fc12:F-11:sugar-visualmatch-13-1.fc12.src.rpm:1262091216


--- NEW FILE sugar-visualmatch.spec ---
Name:           sugar-visualmatch
Version:        13
Release:        1%{?dist}
Summary:        A visual matching game

Group:          Sugar/Activities
License:        MIT
URL:            http://wiki.sugarlabs.org/go/Activities/VisualMatch
Source0:        http://download.sugarlabs.org/sources/honey/Visualmatch/VisualMatch-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python sugar-toolkit
BuildArch:      noarch
Requires:       sugar 

%description
The object is to find sets of three cards where each attribute?color,
shape, number of elements, and shading?either match on all three cards
or are different on all three cards. The current version doesn't yet
support sharing with multiple players or saving to the Journal, but it
can be played by a single player.


%prep
%setup -q -n VisualMatch-%{version}


%build
python ./setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
chmod 0644 $RPM_BUILD_ROOT/%{sugaractivitydir}/VisualMatch.activity/gencards.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS
%{sugaractivitydir}/VisualMatch.activity/


%changelog
* Tue Dec 29 2009 Sebastian Dziallas <sebastian at when.com> - 13-1
- new upstream release
- fix license tag

* Sun Dec 06 2009 Sebastian Dziallas <sebastian at when.com> - 8-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-visualmatch/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:53:26 -0000	1.1
+++ .cvsignore	29 Dec 2009 12:55:08 -0000	1.2
@@ -0,0 +1 @@
+VisualMatch-13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-visualmatch/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:53:26 -0000	1.1
+++ sources	29 Dec 2009 12:55:09 -0000	1.2
@@ -0,0 +1 @@
+90ac5a90ad82c7cadf45689015e24de4  VisualMatch-13.tar.bz2



From tomeu at fedoraproject.org  Tue Dec 29 13:06:10 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 29 Dec 2009 13:06:10 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec,1.64,1.65
Message-ID: <20091229130610.7F3C511C00EF@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24783

Modified Files:
	gnash.spec 
Log Message:
clog


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnash.spec	29 Dec 2009 10:18:14 -0000	1.64
+++ gnash.spec	29 Dec 2009 13:06:09 -0000	1.65
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.8.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 #Release:        0.8.%{alphatag}%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
@@ -304,6 +304,8 @@ fi
 %{_bindir}/cygnal
 %{_mandir}/man1/cygnal.1*
 %{_mandir}/man1/rtmpget.1*
+%dir %{_libdir}/cygnal
+%{_libdir}/cygnal/plugins/*.so*
 
 %files devel
 %defattr(-,root,root,-)
@@ -315,6 +317,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-2
+- Add cygnal plugins
+
 * Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-1
 - Update to 0.8.6, increase epoch.
 



From eseyman at fedoraproject.org  Tue Dec 29 13:12:32 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Tue, 29 Dec 2009 13:12:32 +0000 (UTC)
Subject: File CGI-Application-Plugin-SuperForm-0.5.tar.gz uploaded to
	lookaside cache by eseyman
Message-ID: <20091229131232.2B53310F8BA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for perl-CGI-Application-Plugin-SuperForm:

5d079ab4127d533bfa3643708972ff7a  CGI-Application-Plugin-SuperForm-0.5.tar.gz



From nphilipp at fedoraproject.org  Tue Dec 29 13:19:24 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Dec 2009 13:19:24 +0000 (UTC)
Subject: rpms/sane-backends/devel .cvsignore,1.19,1.20
Message-ID: <20091229131924.5574511C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27466

Modified Files:
	.cvsignore 
Log Message:
remove old autoreconf patch from .cvsignore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	29 Dec 2009 12:34:55 -0000	1.19
+++ .cvsignore	29 Dec 2009 13:19:23 -0000	1.20
@@ -1,3 +1,2 @@
 sane-backends-1.0.20.tar.gz
-sane-backends-1.0.20-autoreconf.patch.bz2
 sane-backends-1.0.20-11-autoreconf.patch.bz2



From deji at fedoraproject.org  Tue Dec 29 13:22:28 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Dec 2009 13:22:28 +0000 (UTC)
Subject: File bibletime-2.5.tar.gz uploaded to lookaside cache by deji
Message-ID: <20091229132228.A130610F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for bibletime:

7ddf119ac501d6199cb003d0c9fa382d  bibletime-2.5.tar.gz



From deji at fedoraproject.org  Tue Dec 29 13:23:11 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Dec 2009 13:23:11 +0000 (UTC)
Subject: rpms/bibletime/devel .cvsignore, 1.13, 1.14 bibletime.spec, 1.18,
	1.19 sources, 1.13, 1.14
Message-ID: <20091229132311.0970111C00EF@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/bibletime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28294

Modified Files:
	.cvsignore bibletime.spec sources 
Log Message:
* Tue Dec 29 2009 Deji Akingunola <dakingun at gmail.com> - 2.5-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Dec 2009 17:08:44 -0000	1.13
+++ .cvsignore	29 Dec 2009 13:23:10 -0000	1.14
@@ -1 +1 @@
-bibletime-2.4.tar.gz
+bibletime-2.5.tar.gz


Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/bibletime.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- bibletime.spec	2 Dec 2009 17:08:44 -0000	1.18
+++ bibletime.spec	29 Dec 2009 13:23:10 -0000	1.19
@@ -1,6 +1,6 @@
 Summary:	An easy to use Bible study tool
 Name:		bibletime
-Version:	2.4
+Version:	2.5
 Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
@@ -82,6 +82,9 @@ done
 %doc ChangeLog README LICENSE
 
 %changelog
+* Tue Dec 29 2009 Deji Akingunola <dakingun at gmail.com> - 2.5-1
+- New upstream version
+
 * Wed Dec 02 2009 Deji Akingunola <dakingun at gmail.com> - 2.4-1
 - Update to 2.4
 - Update the description and summary.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Dec 2009 17:08:44 -0000	1.13
+++ sources	29 Dec 2009 13:23:10 -0000	1.14
@@ -1 +1 @@
-b0c94ddcff2cace3ebbdbb9aeda5cc59  bibletime-2.4.tar.gz
+7ddf119ac501d6199cb003d0c9fa382d  bibletime-2.5.tar.gz



From eseyman at fedoraproject.org  Tue Dec 29 13:24:57 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Tue, 29 Dec 2009 13:24:57 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-SuperForm/devel .cvsignore, 1.2,
	1.3 perl-CGI-Application-Plugin-SuperForm.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091229132457.8ACBF11C00EF@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-SuperForm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28719

Modified Files:
	.cvsignore perl-CGI-Application-Plugin-SuperForm.spec sources 
Log Message:
Update to 0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-SuperForm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Nov 2009 00:29:51 -0000	1.2
+++ .cvsignore	29 Dec 2009 13:24:57 -0000	1.3
@@ -1 +1 @@
-CGI-Application-Plugin-SuperForm-0.4.tar.gz
+CGI-Application-Plugin-SuperForm-0.5.tar.gz


Index: perl-CGI-Application-Plugin-SuperForm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-SuperForm/devel/perl-CGI-Application-Plugin-SuperForm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-SuperForm.spec	7 Dec 2009 03:45:04 -0000	1.2
+++ perl-CGI-Application-Plugin-SuperForm.spec	29 Dec 2009 13:24:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-SuperForm
-Version:        0.4
-Release:        3%{?dist}
+Version:        0.5
+Release:        1%{?dist}
 Summary:        Create sticky forms with HTML::SuperForm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Dec 29 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 0.5-1
+- Update to 0.5
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.4-3
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-SuperForm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Nov 2009 00:29:51 -0000	1.2
+++ sources	29 Dec 2009 13:24:57 -0000	1.3
@@ -1 +1 @@
-604e2c3a04c5311003561bc8fd4a03ba  CGI-Application-Plugin-SuperForm-0.4.tar.gz
+5d079ab4127d533bfa3643708972ff7a  CGI-Application-Plugin-SuperForm-0.5.tar.gz



From nphilipp at fedoraproject.org  Tue Dec 29 13:29:14 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Dec 2009 13:29:14 +0000 (UTC)
Subject: rpms/sane-backends/F-12
	sane-backends-1.0.20-genesys-gl841-registers.patch, NONE,
	1.1 sane-backends-1.0.20-lockdir.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 sane-backends.spec, 1.135, 1.136 sources, 1.20, 1.21
Message-ID: <20091229132914.D8A7811C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29548

Modified Files:
	.cvsignore sane-backends.spec sources 
Added Files:
	sane-backends-1.0.20-genesys-gl841-registers.patch 
	sane-backends-1.0.20-lockdir.patch 
Log Message:
genesys_gl841: always send registers before trying to acquire a line (#527935)
build v4l backend (#550119)
don't use lockdir, fix make install


sane-backends-1.0.20-genesys-gl841-registers.patch:
 genesys_gl841.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sane-backends-1.0.20-genesys-gl841-registers.patch ---
commit 4d9d166a3ae830c62bb7341efe886c99e614199a
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Dec 29 11:43:24 2009 +0100

    patch: genesys-gl841-registers
    
    Squashed commit of the following:
    
    commit 8bb82ba231bec01377e28a4f7f635dca61c34fbb
    Author: Pierre Willenbrock <pierre at pirsoft.dnsalias.org>
    Date:   Wed Jun 3 00:16:16 2009 +0200
    
        Always send registers before trying to acquire a line
        (cherry picked from commit a0ea955e91837156d2112c0ffd12c8afebe86efa)
    
        Signed-off-by: Nils Philippsen <nils at redhat.com>
        Resolves: rhbz#527935

diff --git a/backend/genesys_gl841.c b/backend/genesys_gl841.c
index 2810865..c9facc4 100644
--- a/backend/genesys_gl841.c
+++ b/backend/genesys_gl841.c
@@ -4948,9 +4948,6 @@ gl841_offset_calibration (Genesys_Device * dev)
       return status;
     }
 
-  RIE (gl841_bulk_write_register
-       (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
-
   used_res = dev->current_setup.xres;
   num_pixels = dev->current_setup.pixels;
 
@@ -4999,6 +4996,9 @@ gl841_offset_calibration (Genesys_Device * dev)
 
   do {
 
+      RIE (gl841_bulk_write_register
+	   (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
+
       for (j=0; j < channels; j++) {
 	  off[j] = (offh[j]+offl[j])/2;
 	  dev->frontend.offset[j] = off[j];

sane-backends-1.0.20-lockdir.patch:
 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sane-backends-1.0.20-lockdir.patch ---
commit 1e12605eac293b12809ca2933622acc54515c237
Author: Nils Philippsen <nils at redhat.com>
Date:   Mon Dec 28 17:00:25 2009 +0100

    patch: lockdir
    
    Squashed commit of the following:
    
    commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb
    Author: Nils Philippsen <nils at redhat.com>
    Date:   Mon Dec 28 16:58:36 2009 +0100
    
        improve install-lockpath target
    
        make robust against problems with setting group on sane lock dir

diff --git a/backend/Makefile.am b/backend/Makefile.am
index 5165423..3c22cd4 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -137,7 +137,8 @@ install-firmware-path:
 	  done
 
 install-lockpath:
-	$(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
+	$(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \
+		$(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
 
 uninstall-hook:
 	rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	16 Jun 2009 15:28:11 -0000	1.18
+++ .cvsignore	29 Dec 2009 13:29:14 -0000	1.19
@@ -1,2 +1,2 @@
 sane-backends-1.0.20.tar.gz
-sane-backends-1.0.20-autoreconf.patch.bz2
+sane-backends-1.0.20-11-autoreconf.patch.bz2


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sane-backends.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- sane-backends.spec	22 Oct 2009 15:10:00 -0000	1.135
+++ sane-backends.spec	29 Dec 2009 13:29:14 -0000	1.136
@@ -15,7 +15,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 10%{?dist}
+Release: 11%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -31,7 +31,9 @@ Patch3: sane-backends-1.0.20-hal.patch
 Patch4: sane-backends-1.0.20-udev.patch
 Patch5: sane-backends-1.0.20-man-utf8.patch
 Patch6: sane-backends-1.0.20-epson-expression800.patch
-Patch10: sane-backends-1.0.20-autoreconf.patch.bz2
+Patch7: sane-backends-1.0.20-lockdir.patch
+Patch8: sane-backends-1.0.20-genesys-gl841-registers.patch
+Patch10: sane-backends-1.0.20-11-autoreconf.patch.bz2
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildRequires: tetex-latex
@@ -39,6 +41,7 @@ BuildRequires: libusb-devel
 BuildRequires: libieee1284-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
+BuildRequires: libv4l-devel
 BuildRequires: gettext
 BuildRequires: gphoto2-devel
 %if %{with udev}
@@ -102,13 +105,15 @@ want to access digital cameras.
 %patch4 -p1 -b .udev
 %patch5 -p1 -b .man-utf8
 %patch6 -p1 -b .epson-expression800
+%patch7 -p1 -b .lockdir
+%patch8 -p1 -b .genesys-gl841-registers
 %patch10 -p1 -b .autoreconf
 
 %build
 %configure \
     --with-gphoto2=%{_prefix} \
     --with-docdir=%{_docdir}/%{name}-%{version} \
-    --disable-rpath
+    --disable-locking --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -189,6 +194,14 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Tue Dec 29 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-11
+- genesys_gl841: always send registers before trying to acquire a line
+  (#527935)
+
+* Mon Dec 28 2009 Nils Philippsen <nils at redhat.com>
+- build v4l backend (#550119)
+- don't use lockdir, fix make install
+
 * Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-10
 - don't set owner, group or mode as this may interfere with setting ACLs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	31 Aug 2009 16:04:19 -0000	1.20
+++ sources	29 Dec 2009 13:29:14 -0000	1.21
@@ -1,2 +1,2 @@
 a0cfdfdebca2feb4f2ba5d3418b15a42  sane-backends-1.0.20.tar.gz
-55134659213e74bc1d9d5326102072b4  sane-backends-1.0.20-autoreconf.patch.bz2
+b33b94acbfae50d9b31abb688573c17c  sane-backends-1.0.20-11-autoreconf.patch.bz2



From deji at fedoraproject.org  Tue Dec 29 13:33:02 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Dec 2009 13:33:02 +0000 (UTC)
Subject: File xiphos-3.1.2.tar.gz uploaded to lookaside cache by deji
Message-ID: <20091229133302.2058F10F88B@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xiphos:

0de807c49db6e6f696ffd1cee8ec4b22  xiphos-3.1.2.tar.gz



From deji at fedoraproject.org  Tue Dec 29 13:33:28 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Dec 2009 13:33:28 +0000 (UTC)
Subject: rpms/xiphos/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xiphos.spec, 
	1.3, 1.4
Message-ID: <20091229133328.B2B5411C00EF@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30590

Modified Files:
	.cvsignore sources xiphos.spec 
Log Message:
* Tue Dec 29 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.2-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 04:46:25 -0000	1.3
+++ .cvsignore	29 Dec 2009 13:33:27 -0000	1.4
@@ -1 +1 @@
-xiphos-3.1.1.tar.gz
+xiphos-3.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 04:46:25 -0000	1.3
+++ sources	29 Dec 2009 13:33:28 -0000	1.4
@@ -1 +1 @@
-a968d57375f46ef1cae4a153600616a9  xiphos-3.1.1.tar.gz
+0de807c49db6e6f696ffd1cee8ec4b22  xiphos-3.1.2.tar.gz


Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/xiphos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xiphos.spec	11 Aug 2009 04:46:25 -0000	1.3
+++ xiphos.spec	29 Dec 2009 13:33:28 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		xiphos 
-Version:	3.1.1
+Version:	3.1.2
 Release:	1%{?dist}
 Summary:	Bible study and research tool
 
@@ -77,6 +77,9 @@ scrollkeeper-update -q || :
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Tue Dec 29 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.2-1
+- New upstream version
+
 * Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
 - New upstream version
 



From deji at fedoraproject.org  Tue Dec 29 13:51:11 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Dec 2009 13:51:11 +0000 (UTC)
Subject: rpms/xiphos/devel xiphos.spec,1.4,1.5
Message-ID: <20091229135111.5C6FF11C00EF@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv764

Modified Files:
	xiphos.spec 
Log Message:
Fix xulrunner BR



Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/xiphos.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xiphos.spec	29 Dec 2009 13:33:28 -0000	1.4
+++ xiphos.spec	29 Dec 2009 13:51:10 -0000	1.5
@@ -14,7 +14,7 @@ BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 BuildRequires:	gnome-doc-utils
 BuildRequires:	gtkhtml3-devel
-BuildRequires:	xulrunner-devel-unstable
+BuildRequires:	xulrunner-devel
 BuildRequires:	libgnomeui-devel libgnomeprintui22-devel
 BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	scrollkeeper



From nphilipp at fedoraproject.org  Tue Dec 29 13:56:39 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 29 Dec 2009 13:56:39 +0000 (UTC)
Subject: rpms/sane-backends/F-11
	sane-backends-1.0.20-genesys-gl841-registers.patch, NONE,
	1.1 sane-backends-1.0.20-lockdir.patch, NONE,
	1.1 sane-backends-1.0.20-udev.patch, NONE, 1.1 .cvsignore, 1.18,
	1.19 sane-backends-1.0.20-rpath.patch, 1.1,
	1.2 sane-backends.spec, 1.127, 1.128 sources, 1.19, 1.20
Message-ID: <20091229135639.D414A11C00EF@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1991

Modified Files:
	.cvsignore sane-backends-1.0.20-rpath.patch sane-backends.spec 
	sources 
Added Files:
	sane-backends-1.0.20-genesys-gl841-registers.patch 
	sane-backends-1.0.20-lockdir.patch 
	sane-backends-1.0.20-udev.patch 
Log Message:
update to current F-12/Rawhide


sane-backends-1.0.20-genesys-gl841-registers.patch:
 genesys_gl841.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sane-backends-1.0.20-genesys-gl841-registers.patch ---
commit 4d9d166a3ae830c62bb7341efe886c99e614199a
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Dec 29 11:43:24 2009 +0100

    patch: genesys-gl841-registers
    
    Squashed commit of the following:
    
    commit 8bb82ba231bec01377e28a4f7f635dca61c34fbb
    Author: Pierre Willenbrock <pierre at pirsoft.dnsalias.org>
    Date:   Wed Jun 3 00:16:16 2009 +0200
    
        Always send registers before trying to acquire a line
        (cherry picked from commit a0ea955e91837156d2112c0ffd12c8afebe86efa)
    
        Signed-off-by: Nils Philippsen <nils at redhat.com>
        Resolves: rhbz#527935

diff --git a/backend/genesys_gl841.c b/backend/genesys_gl841.c
index 2810865..c9facc4 100644
--- a/backend/genesys_gl841.c
+++ b/backend/genesys_gl841.c
@@ -4948,9 +4948,6 @@ gl841_offset_calibration (Genesys_Device * dev)
       return status;
     }
 
-  RIE (gl841_bulk_write_register
-       (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
-
   used_res = dev->current_setup.xres;
   num_pixels = dev->current_setup.pixels;
 
@@ -4999,6 +4996,9 @@ gl841_offset_calibration (Genesys_Device * dev)
 
   do {
 
+      RIE (gl841_bulk_write_register
+	   (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
+
       for (j=0; j < channels; j++) {
 	  off[j] = (offh[j]+offl[j])/2;
 	  dev->frontend.offset[j] = off[j];

sane-backends-1.0.20-lockdir.patch:
 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sane-backends-1.0.20-lockdir.patch ---
commit 1e12605eac293b12809ca2933622acc54515c237
Author: Nils Philippsen <nils at redhat.com>
Date:   Mon Dec 28 17:00:25 2009 +0100

    patch: lockdir
    
    Squashed commit of the following:
    
    commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb
    Author: Nils Philippsen <nils at redhat.com>
    Date:   Mon Dec 28 16:58:36 2009 +0100
    
        improve install-lockpath target
    
        make robust against problems with setting group on sane lock dir

diff --git a/backend/Makefile.am b/backend/Makefile.am
index 5165423..3c22cd4 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -137,7 +137,8 @@ install-firmware-path:
 	  done
 
 install-lockpath:
-	$(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
+	$(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \
+		$(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
 
 uninstall-hook:
 	rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)

sane-backends-1.0.20-udev.patch:
 sane-desc.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE sane-backends-1.0.20-udev.patch ---
commit 9ba88134bd6d296ccbcf253c6ade3e646dc286b9
Author: Nils Philippsen <nils at redhat.com>
Date:   Thu Oct 22 17:05:30 2009 +0200

    patch: udev
    
    Squashed commit of the following:
    
    commit a7541ac649bea3f352a249dfc569f3bc18b5a968
    Author: Nils Philippsen <nils at redhat.com>
    Date:   Thu Oct 22 17:02:52 2009 +0200
    
        don't set owner, group or mode
    
        setting owner, group or mode may interfere with setting ACLs
    
    commit e385558cf214d263af93147995f1f8b729d2dabe
    Author: Nils Philippsen <nils at redhat.com>
    Date:   Thu Oct 22 14:19:53 2009 +0200
    
        fix device file ownership and mode
    
    commit fe874d6f9873598e8bcd9201508bc2c89365e821
    Author: Nils Philippsen <nils at redhat.com>
    Date:   Thu Oct 22 11:16:16 2009 +0200
    
        adapt generated udev rules for Fedora

diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index c317700..2a410b2 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -56,9 +56,9 @@
 #define COLOR_NEW          "\"#F00000\""
 #define COLOR_UNKNOWN      "\"#000000\""
 
-#define DEVMODE  "0664"
+#define DEVMODE  "0644"
 #define DEVOWNER "root"
-#define DEVGROUP "scanner"
+#define DEVGROUP "root"
 
 #ifndef PATH_MAX
 # define PATH_MAX 1024
@@ -3475,8 +3475,8 @@ print_udev (void)
 	    }
 	}
       printf ("\n");
-      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
+      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
+	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2);
       usbid = usbid->next;
     }
 
@@ -3488,7 +3488,7 @@ print_udev (void)
   printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
   printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
   printf ("# Generic: SCSI device type 6 indicates a scanner\n");
-  printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
+  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n");
   printf ("# Some scanners advertise themselves as SCSI device type 3\n");
 
   while (scsiid)
@@ -3521,8 +3521,8 @@ print_udev (void)
 	    }
         }
       printf ("\n");
-      printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
-	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
+      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
+	      scsiid->scsi_vendor_id, scsiid->scsi_product_id);
       scsiid = scsiid->next;
     }
   printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	16 Jun 2009 15:54:59 -0000	1.18
+++ .cvsignore	29 Dec 2009 13:56:39 -0000	1.19
@@ -1,2 +1,2 @@
 sane-backends-1.0.20.tar.gz
-sane-backends-1.0.20-autoreconf.patch.bz2
+sane-backends-1.0.20-11-autoreconf.patch.bz2

sane-backends-1.0.20-rpath.patch:
 acinclude.m4 |   36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

Index: sane-backends-1.0.20-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/sane-backends-1.0.20-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sane-backends-1.0.20-rpath.patch	16 Jun 2009 15:54:59 -0000	1.1
+++ sane-backends-1.0.20-rpath.patch	29 Dec 2009 13:56:39 -0000	1.2
@@ -1,11 +1,17 @@
-commit e0de6eaee11254667eb6abb6e2ccb7768bd2de4f
+commit fe1456e2431a3b8bd27aadc5bbc6998ebc8cd00c
 Author: Nils Philippsen <nils at redhat.com>
-Date:   Tue Jun 16 16:59:43 2009 +0200
+Date:   Mon Aug 31 16:38:23 2009 +0200
 
     patch: rpath
     
     Squashed commit of the following:
     
+    commit c37206c9fa724e19f6929d8a77e5399ca6b87f1f
+    Author: Nils Philippsen <nils at redhat.com>
+    Date:   Mon Aug 31 16:34:42 2009 +0200
+    
+        fix --enable-rpath
+    
     commit be2982b2d1ae4d889b4cecec289336b4b03579aa
     Author: Nils Philippsen <nils at redhat.com>
     Date:   Tue Jun 2 16:12:23 2009 +0200
@@ -15,10 +21,10 @@ Date:   Tue Jun 16 16:59:43 2009 +0200
         make using runtime library search path configurable
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index 6413b60..c6f5800 100644
+index 6413b60..b2bb065 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -383,19 +383,31 @@ dnl
+@@ -383,19 +383,29 @@ dnl
  
  AC_DEFUN([SANE_LINKER_RPATH],
  [dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !!
@@ -38,9 +44,7 @@ index 6413b60..c6f5800 100644
 +  AC_MSG_CHECKING([whether runtime link path should be used])
 +  AC_ARG_ENABLE([rpath],
 +    [AS_HELP_STRING([--enable-rpath],
-+      [use runtime library search path @<:@default=yes@:>@])]
-+      [],
-+      [enable_readline=yes])
++      [use runtime library search path @<:@default=yes@:>@])])
 +
 +  LINKER_RPATH=
 +  AS_IF([test "x$enable_rpath" != xno],


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/sane-backends.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- sane-backends.spec	4 Aug 2009 11:45:36 -0000	1.127
+++ sane-backends.spec	29 Dec 2009 13:56:39 -0000	1.128
@@ -1,7 +1,21 @@
+# Use the following --with/--without <option> switches to control how the
+# package will be built:
+#
+# udev: ship rules for udev (default for Fedora >= 12, RHEL >= 6)
+# hal:  ship rules for hal (default for Fedora < 12, RHEL < 6)
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%bcond_without udev
+%bcond_with hal
+%else
+%bcond_with udev
+%bcond_without hal
+%endif
+
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 6%{?dist}
+Release: 11%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -14,9 +28,12 @@ Patch0: sane-backends-1.0.20-rpath.patch
 Patch1: sane-backends-1.0.20-pkgconfig.patch
 Patch2: sane-backends-1.0.20-open-macro.patch
 Patch3: sane-backends-1.0.20-hal.patch
-Patch4: sane-backends-1.0.20-man-utf8.patch
-Patch5: sane-backends-1.0.20-epson-expression800.patch
-Patch10: sane-backends-1.0.20-autoreconf.patch.bz2
+Patch4: sane-backends-1.0.20-udev.patch
+Patch5: sane-backends-1.0.20-man-utf8.patch
+Patch6: sane-backends-1.0.20-epson-expression800.patch
+Patch7: sane-backends-1.0.20-lockdir.patch
+Patch8: sane-backends-1.0.20-genesys-gl841-registers.patch
+Patch10: sane-backends-1.0.20-11-autoreconf.patch.bz2
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildRequires: tetex-latex
@@ -24,10 +41,15 @@ BuildRequires: libusb-devel
 BuildRequires: libieee1284-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
+BuildRequires: libv4l-devel
 BuildRequires: gettext
 BuildRequires: gphoto2-devel
-Requires: pam >= 0.78-2
+%if %{with udev}
+Requires: udev >= 143
+%endif
+%if %{with hal}
 Requires: hal >= 0.4.0
+%endif
 
 %description
 Scanner Access Now Easy (SANE) is a universal scanner interface.  The
@@ -80,15 +102,18 @@ want to access digital cameras.
 %patch1 -p1 -b .pkgconfig
 %patch2 -p1 -b .open-macro
 %patch3 -p1 -b .hal
-%patch4 -p1 -b .man-utf8
-%patch5 -p1 -b .epson-expression800
+%patch4 -p1 -b .udev
+%patch5 -p1 -b .man-utf8
+%patch6 -p1 -b .epson-expression800
+%patch7 -p1 -b .lockdir
+%patch8 -p1 -b .genesys-gl841-registers
 %patch10 -p1 -b .autoreconf
 
 %build
 %configure \
     --with-gphoto2=%{_prefix} \
     --with-docdir=%{_docdir}/%{name}-%{version} \
-    --disable-rpath
+    --disable-locking --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -103,12 +128,19 @@ rm -f %{buildroot}%{_mandir}/man1/gamma4
 rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
 
+%if %{with udev}
+mkdir -p %{buildroot}/lib/udev/rules.d
+install -m 0644 tools/udev/libsane.rules %{buildroot}/lib/udev/rules.d/65-libsane.rules
+%endif
+
+%if %{with hal}
 mkdir -p %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty
 mkdir -p %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty
 install -m 0644 tools/hal/libsane.fdi %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty/19-libsane.fdi
 install -m 0644 tools/hal/libsane-policy.fdi %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty/19-libsane.fdi
 mkdir -p %{buildroot}/%{_libexecdir}
 install -m 0755 %{SOURCE2} %{buildroot}/%{_libexecdir}/hal-usb-scanner-add
+%endif
 
 %find_lang %name
 
@@ -124,9 +156,14 @@ rm -rf %{buildroot}
 %dir /etc/sane.d
 %dir /etc/sane.d/dll.d
 %config(noreplace) /etc/sane.d/*.conf
+%if %{with udev}
+/lib/udev/rules.d/65-libsane.rules
+%endif
+%if %{with hal}
 %{_datadir}/hal/fdi/information/20thirdparty/*.fdi
 %{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
 %{_libexecdir}/hal-usb-scanner-add
+%endif
 %{_mandir}/*/*
 %{_datadir}/pixmaps/sane.png
 
@@ -157,6 +194,27 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Tue Dec 29 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-11
+- genesys_gl841: always send registers before trying to acquire a line
+  (#527935)
+
+* Mon Dec 28 2009 Nils Philippsen <nils at redhat.com>
+- build v4l backend (#550119)
+- don't use lockdir, fix make install
+
+* Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-10
+- don't set owner, group or mode as this may interfere with setting ACLs
+
+* Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-9
+- fix device file ownership and mode
+
+* Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-8
+- ship adapted udev rules from F-12 on (#512516)
+- don't require pam anymore
+
+* Fri Aug 31 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-7
+- fix --enable-rpath
+
 * Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-6
 - remove ExcludeArch: s390 s390x
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Jun 2009 15:54:59 -0000	1.19
+++ sources	29 Dec 2009 13:56:39 -0000	1.20
@@ -1,2 +1,2 @@
 a0cfdfdebca2feb4f2ba5d3418b15a42  sane-backends-1.0.20.tar.gz
-cd71d7e8a2ea0c1a8d51901317f50d39  sane-backends-1.0.20-autoreconf.patch.bz2
+b33b94acbfae50d9b31abb688573c17c  sane-backends-1.0.20-11-autoreconf.patch.bz2



From deji at fedoraproject.org  Tue Dec 29 14:12:10 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Dec 2009 14:12:10 +0000 (UTC)
Subject: rpms/xiphos/devel xiphos.spec,1.5,1.6
Message-ID: <20091229141211.16B0711C00EF@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4922

Modified Files:
	xiphos.spec 
Log Message:
Add intltool BR



Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/xiphos.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xiphos.spec	29 Dec 2009 13:51:10 -0000	1.5
+++ xiphos.spec	29 Dec 2009 14:12:09 -0000	1.6
@@ -18,7 +18,7 @@ BuildRequires:	xulrunner-devel
 BuildRequires:	libgnomeui-devel libgnomeprintui22-devel
 BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	scrollkeeper
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	perl(XML::Parser) intltool
 Requires:	yelp
 Requires(post):	scrollkeeper
 Requires(postun):	scrollkeeper



From deji at fedoraproject.org  Tue Dec 29 14:45:10 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Dec 2009 14:45:10 +0000 (UTC)
Subject: File cln-1.3.1.tar.bz2 uploaded to lookaside cache by deji
Message-ID: <20091229144510.35A2410F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cln:

ede584cb1cafa66d56f42a3cf420469d  cln-1.3.1.tar.bz2



From deji at fedoraproject.org  Tue Dec 29 14:46:57 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 29 Dec 2009 14:46:57 +0000 (UTC)
Subject: rpms/cln/devel cln-1.3.1-s390x.patch, NONE,
	1.1 cln-arm-preprocessor-fix.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 cln.spec, 1.34, 1.35 sources, 1.8, 1.9 cln-1.2.2-s390x.patch,
	1.1, NONE
Message-ID: <20091229144657.592D011C00EF@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/cln/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11194

Modified Files:
	.cvsignore cln.spec sources 
Added Files:
	cln-1.3.1-s390x.patch cln-arm-preprocessor-fix.patch 
Removed Files:
	cln-1.2.2-s390x.patch 
Log Message:
* Tue Dec 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.3.1-1
- New upstream version
- Apply patch by Jitesh Shah to fix build on arm


cln-1.3.1-s390x.patch:
 types.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cln-1.3.1-s390x.patch ---
--- include/cln/types.h	2009-06-14 15:49:32.000000000 -0400
+++ include/cln/types.h.new	2009-12-29 09:01:31.751401399 -0500
@@ -48,7 +48,7 @@
     #undef HAVE_LONGLONG
    #endif
   #endif
-  #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__x86_64__))
+  #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__) || defined(__x86_64__))
     // 64 bit registers in hardware
     #define HAVE_FAST_LONGLONG
   #endif
@@ -127,7 +127,7 @@
     typedef int sintD;
     typedef unsigned int uintD;
   #else  // we are not using GMP, so just guess something reasonable
-    #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__)))
+    #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__)))
       #define intDsize 64
       typedef sint64  sintD;
       typedef uint64  uintD;

cln-arm-preprocessor-fix.patch:
 cl_asm_arm_.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cln-arm-preprocessor-fix.patch ---
--- src/base/digitseq/cl_asm_arm_.cc	2009-05-10 16:32:30.000000000 -0400
+++ src/base/digitseq/cl_asm_arm_.cc.new	2009-12-29 09:03:02.161401990 -0500
@@ -77,8 +77,8 @@
 #else
 #define DECLARE_FUNCTION(x)
 #endif
-#define GLABEL(x) _##x##:
-#define LABEL(x) x##:
+#define GLABEL(x) _##x:
+#define LABEL(x) x:
 #define RRX rrx
 #define END
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cln/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Jul 2009 23:22:29 -0000	1.8
+++ .cvsignore	29 Dec 2009 14:46:56 -0000	1.9
@@ -1 +1 @@
-cln-1.3.0.tar.bz2
+cln-1.3.1.tar.bz2


Index: cln.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cln/devel/cln.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- cln.spec	24 Jul 2009 19:06:29 -0000	1.34
+++ cln.spec	29 Dec 2009 14:46:56 -0000	1.35
@@ -1,13 +1,14 @@
 Name:           cln
-Version:        1.3.0
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.ginac.de/CLN/
 Source0:        http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2
-Patch0:         cln-1.2.2-s390x.patch
+Patch1:         cln-1.3.1-s390x.patch
+Patch2:         cln-arm-preprocessor-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -35,7 +36,8 @@ the CLN library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .s390x
+%patch1 -p0 -b .s390x
+%patch2 -p0 -b .fix
 
 %build
 %configure --disable-static
@@ -74,7 +76,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog NEWS README TODO*
+%doc COPYING NEWS README TODO
 %{_libdir}/*.so.*
 
 %files devel
@@ -86,6 +88,10 @@ fi
 %{_docdir}/%{name}-devel-%{version}
 
 %changelog
+* Tue Dec 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.3.1-1
+- New upstream version
+- Apply patch by Jitesh Shah to fix build on arm
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cln/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Jul 2009 23:22:29 -0000	1.8
+++ sources	29 Dec 2009 14:46:56 -0000	1.9
@@ -1 +1 @@
-8cf879f2f6046a40e7ec3c1d5eb35b10  cln-1.3.0.tar.bz2
+ede584cb1cafa66d56f42a3cf420469d  cln-1.3.1.tar.bz2


--- cln-1.2.2-s390x.patch DELETED ---



From thm at fedoraproject.org  Tue Dec 29 15:30:17 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 15:30:17 +0000 (UTC)
Subject: File ikiwiki_3.20091218.tar.gz uploaded to lookaside cache by thm
Message-ID: <20091229153017.B3F3C10F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ikiwiki:

33bbce7eff91c574ef563a9fb18ff7d9  ikiwiki_3.20091218.tar.gz



From thm at fedoraproject.org  Tue Dec 29 15:31:09 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 15:31:09 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.29, 1.30 ikiwiki.spec, 1.33,
	1.34 import.log, 1.29, 1.30 sources, 1.29, 1.30
Message-ID: <20091229153109.F2A3A11C00EF@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19867/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.20091218.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	17 Nov 2009 08:38:11 -0000	1.29
+++ .cvsignore	29 Dec 2009 15:31:08 -0000	1.30
@@ -1 +1 @@
-ikiwiki_3.20091113.tar.gz
+ikiwiki_3.20091218.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ikiwiki.spec	6 Dec 2009 23:11:01 -0000	1.33
+++ ikiwiki.spec	29 Dec 2009 15:31:08 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           ikiwiki
-Version:        3.20091113
-Release:        2%{?dist}
+Version:        3.20091218
+Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
@@ -144,6 +144,9 @@ meta-wrapper in this package.
 
 
 %changelog
+* Tue Dec 22 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.20091218-1
+- Update to 3.20091218.
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.20091113-2
 - rebuild against perl 5.10.1
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- import.log	17 Nov 2009 08:38:11 -0000	1.29
+++ import.log	29 Dec 2009 15:31:08 -0000	1.30
@@ -27,3 +27,4 @@ ikiwiki-3_141592-1_fc11:HEAD:ikiwiki-3.1
 ikiwiki-3_1415926-1_fc11:HEAD:ikiwiki-3.1415926-1.fc11.src.rpm:1251830777
 ikiwiki-3_14159265-1_fc11:HEAD:ikiwiki-3.14159265-1.fc11.src.rpm:1254985481
 ikiwiki-3_20091113-1_fc12:HEAD:ikiwiki-3.20091113-1.fc12.src.rpm:1258446979
+ikiwiki-3_20091218-1_fc12:HEAD:ikiwiki-3.20091218-1.fc12.src.rpm:1262100591


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	17 Nov 2009 08:38:11 -0000	1.29
+++ sources	29 Dec 2009 15:31:09 -0000	1.30
@@ -1 +1 @@
-dde64b3371fec73ac389cf908df151e0  ikiwiki_3.20091113.tar.gz
+33bbce7eff91c574ef563a9fb18ff7d9  ikiwiki_3.20091218.tar.gz



From tuju at fedoraproject.org  Tue Dec 29 15:42:19 2009
From: tuju at fedoraproject.org (Juha Tuomala)
Date: Tue, 29 Dec 2009 15:42:19 +0000 (UTC)
Subject: rpms/python-utmp/devel import.log,NONE,1.1
Message-ID: <20091229154219.E370311C03E3@cvs1.fedora.phx.redhat.com>

Author: tuju

Update of /cvs/pkgs/rpms/python-utmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22377/devel

Added Files:
	import.log 
Log Message:



--- NEW FILE import.log ---
python-utmp-0_7-5_fc13:HEAD:python-utmp-0.7-5.fc13.src.rpm:1262101257



From thm at fedoraproject.org  Tue Dec 29 15:49:00 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 15:49:00 +0000 (UTC)
Subject: rpms/ikiwiki/F-12 .cvsignore, 1.29, 1.30 ikiwiki.spec, 1.32,
	1.33 import.log, 1.29, 1.30 sources, 1.29, 1.30
Message-ID: <20091229154900.EFEBA11C00EF@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23945/F-12

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.20091218.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	17 Nov 2009 08:44:42 -0000	1.29
+++ .cvsignore	29 Dec 2009 15:49:00 -0000	1.30
@@ -1 +1 @@
-ikiwiki_3.20091113.tar.gz
+ikiwiki_3.20091218.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-12/ikiwiki.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ikiwiki.spec	17 Nov 2009 08:44:42 -0000	1.32
+++ ikiwiki.spec	29 Dec 2009 15:49:00 -0000	1.33
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.20091113
+Version:        3.20091218
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -144,6 +144,12 @@ meta-wrapper in this package.
 
 
 %changelog
+* Tue Dec 22 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.20091218-1
+- Update to 3.20091218.
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.20091113-2
+- rebuild against perl 5.10.1
+
 * Tue Nov 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.20091113-1
 - Update to 3.20091113.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-12/import.log,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- import.log	17 Nov 2009 08:44:42 -0000	1.29
+++ import.log	29 Dec 2009 15:49:00 -0000	1.30
@@ -27,3 +27,4 @@ ikiwiki-3_141592-1_fc11:HEAD:ikiwiki-3.1
 ikiwiki-3_1415926-1_fc11:HEAD:ikiwiki-3.1415926-1.fc11.src.rpm:1251830777
 ikiwiki-3_14159265-1_fc11:F-12:ikiwiki-3.14159265-1.fc11.src.rpm:1254987607
 ikiwiki-3_20091113-1_fc12:F-12:ikiwiki-3.20091113-1.fc12.src.rpm:1258447440
+ikiwiki-3_20091218-1_fc12:F-12:ikiwiki-3.20091218-1.fc12.src.rpm:1262101674


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	17 Nov 2009 08:44:42 -0000	1.29
+++ sources	29 Dec 2009 15:49:00 -0000	1.30
@@ -1 +1 @@
-dde64b3371fec73ac389cf908df151e0  ikiwiki_3.20091113.tar.gz
+33bbce7eff91c574ef563a9fb18ff7d9  ikiwiki_3.20091218.tar.gz



From bpepple at fedoraproject.org  Tue Dec 29 15:55:42 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 29 Dec 2009 15:55:42 +0000 (UTC)
Subject: File json-glib-0.10.0.tar.bz2 uploaded to lookaside cache by bpepple
Message-ID: <20091229155542.19A3110F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for json-glib:

f000d8d41e4dc172ef5f40e2adb97bfd  json-glib-0.10.0.tar.bz2



From thm at fedoraproject.org  Tue Dec 29 15:58:52 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 15:58:52 +0000 (UTC)
Subject: rpms/ikiwiki/F-11 .cvsignore, 1.28, 1.29 ikiwiki.spec, 1.30,
	1.31 import.log, 1.28, 1.29 sources, 1.28, 1.29
Message-ID: <20091229155852.E359F11C00EF@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25995/F-11

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.20091218.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	17 Nov 2009 08:51:47 -0000	1.28
+++ .cvsignore	29 Dec 2009 15:58:52 -0000	1.29
@@ -1 +1 @@
-ikiwiki_3.20091113.tar.gz
+ikiwiki_3.20091218.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/ikiwiki.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ikiwiki.spec	17 Nov 2009 08:51:47 -0000	1.30
+++ ikiwiki.spec	29 Dec 2009 15:58:52 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.20091113
+Version:        3.20091218
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -144,6 +144,12 @@ meta-wrapper in this package.
 
 
 %changelog
+* Tue Dec 22 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.20091218-1
+- Update to 3.20091218.
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 3.20091113-2
+- rebuild against perl 5.10.1
+
 * Tue Nov 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.20091113-1
 - Update to 3.20091113.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/import.log,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- import.log	17 Nov 2009 08:51:47 -0000	1.28
+++ import.log	29 Dec 2009 15:58:52 -0000	1.29
@@ -26,3 +26,4 @@ ikiwiki-3_141592-1_fc11:F-11:ikiwiki-3.1
 ikiwiki-3_1415926-1_fc11:F-11:ikiwiki-3.1415926-1.fc11.src.rpm:1251831564
 ikiwiki-3_14159265-1_fc11:F-11:ikiwiki-3.14159265-1.fc11.src.rpm:1254987771
 ikiwiki-3_20091113-1_fc12:F-11:ikiwiki-3.20091113-1.fc12.src.rpm:1258447875
+ikiwiki-3_20091218-1_fc12:F-11:ikiwiki-3.20091218-1.fc12.src.rpm:1262102262


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	17 Nov 2009 08:51:47 -0000	1.28
+++ sources	29 Dec 2009 15:58:52 -0000	1.29
@@ -1 +1 @@
-dde64b3371fec73ac389cf908df151e0  ikiwiki_3.20091113.tar.gz
+33bbce7eff91c574ef563a9fb18ff7d9  ikiwiki_3.20091218.tar.gz



From rjones at fedoraproject.org  Tue Dec 29 16:23:19 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Dec 2009 16:23:19 +0000 (UTC)
Subject: File ocaml-3.11.2+rc1.tar.bz2 uploaded to lookaside cache by rjones
Message-ID: <20091229162319.D4E1E10F8BF@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ocaml:

121dd62a03bbb1dfb3fb56e3a4bda874  ocaml-3.11.2+rc1.tar.bz2



From bpepple at fedoraproject.org  Tue Dec 29 16:30:03 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 29 Dec 2009 16:30:03 +0000 (UTC)
Subject: rpms/json-glib/devel .cvsignore, 1.5, 1.6 json-glib.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091229163003.456BB11C03D6@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/json-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31515

Modified Files:
	.cvsignore json-glib.spec sources 
Log Message:
* Tue Dec 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.10.0-1
- Update to 0.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Nov 2009 03:18:06 -0000	1.5
+++ .cvsignore	29 Dec 2009 16:30:01 -0000	1.6
@@ -1 +1 @@
-json-glib-0.8.2.tar.bz2
+json-glib-0.10.0.tar.bz2


Index: json-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/devel/json-glib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- json-glib.spec	17 Nov 2009 03:18:06 -0000	1.7
+++ json-glib.spec	29 Dec 2009 16:30:01 -0000	1.8
@@ -1,7 +1,7 @@
-%define glib_ver 2.15
+%define glib_ver 2.16
 
 Name:		json-glib
-Version:	0.8.2
+Version:	0.10.0
 Release:	1%{?dist}
 Summary:	Library for JavaScript Object Notation format
 
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.10.0-1
+- Update to 0.10.0.
+
 * Mon Nov 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.2-1
 - Update to 0.8.2.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Nov 2009 03:18:06 -0000	1.5
+++ sources	29 Dec 2009 16:30:01 -0000	1.6
@@ -1 +1 @@
-5fcd08da526a60d28d0ced4524799231  json-glib-0.8.2.tar.bz2
+f000d8d41e4dc172ef5f40e2adb97bfd  json-glib-0.10.0.tar.bz2



From rjones at fedoraproject.org  Tue Dec 29 16:30:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Dec 2009 16:30:58 +0000 (UTC)
Subject: rpms/ocaml/devel .cvsignore, 1.16, 1.17 ocaml.spec, 1.65, 1.66 sources,
	1.19, 1.20
Message-ID: <20091229163058.4285711C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
Update to (release candidate) 3.11.2+rc1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	30 Sep 2009 12:25:22 -0000	1.16
+++ .cvsignore	29 Dec 2009 16:30:57 -0000	1.17
@@ -4,3 +4,4 @@ ocaml-3.11-refman.pdf
 ocaml-3.11.1+rc0.tar.gz
 ocaml-3.11.1+rc1.tar.gz
 ocaml-3.11.1.tar.bz2
+ocaml-3.11.2+rc1.tar.bz2


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- ocaml.spec	16 Dec 2009 17:05:33 -0000	1.65
+++ ocaml.spec	29 Dec 2009 16:30:57 -0000	1.66
@@ -1,8 +1,8 @@
 %global _default_patch_fuzz 2
 
 Name:           ocaml
-Version:        3.11.1
-Release:        8%{?dist}
+Version:        3.11.2
+Release:        0.rc1.1%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -11,7 +11,8 @@ License:        QPL and (LGPLv2+ with ex
 
 URL:            http://www.ocaml.org
 
-Source0:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-%{version}.tar.bz2
+#Source0:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-%{version}.tar.bz2
+Source0:        ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-3.11/ocaml-3.11.2+rc1.tar.bz2
 Source1:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.html.tar.gz
 Source2:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.pdf
 Source3:        http://caml.inria.fr/distrib/ocaml-3.11/ocaml-3.11-refman.info.tar.gz
@@ -192,9 +193,9 @@ man pages and info files.
 
 
 %prep
-%setup -q -T -b 0 -n %{name}-%{version}
-%setup -q -T -D -a 1 -n %{name}-%{version}
-%setup -q -T -D -a 3 -n %{name}-%{version}
+%setup -q -T -b 0 -n %{name}-%{version}+rc1
+%setup -q -T -D -a 1 -n %{name}-%{version}+rc1
+%setup -q -T -D -a 3 -n %{name}-%{version}+rc1
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .cflags
 %patch3 -p1 -b .ppc64
@@ -443,6 +444,9 @@ fi
 
 
 %changelog
+* Tue Dec 29 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.2-0.rc1.1
+- Update to (release candidate) 3.11.2+rc1.
+
 * Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-8
 - Use __ocaml_requires_opts / __ocaml_provides_opts.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	30 Sep 2009 12:25:22 -0000	1.19
+++ sources	29 Dec 2009 16:30:58 -0000	1.20
@@ -1,4 +1,4 @@
 7e20778259f87ab5e7cb60d2a17c657c  ocaml-3.11-refman.html.tar.gz
 3fcfedf63a852f502a10eac547c9042d  ocaml-3.11-refman.info.tar.gz
 076a163e511e575fc384ad96394760a2  ocaml-3.11-refman.pdf
-fe011781f37f6b41fe08e0706969a89e  ocaml-3.11.1.tar.bz2
+121dd62a03bbb1dfb3fb56e3a4bda874  ocaml-3.11.2+rc1.tar.bz2



From nucleo at fedoraproject.org  Tue Dec 29 16:48:05 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Tue, 29 Dec 2009 16:48:05 +0000 (UTC)
Subject: rpms/kvirc/devel kvirc-log-fix-svn3762.patch, NONE, 1.1 kvirc.spec,
	1.16, 1.17
Message-ID: <20091229164805.B14AF11C00E8@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2500

Modified Files:
	kvirc.spec 
Added Files:
	kvirc-log-fix-svn3762.patch 
Log Message:
fix log files date format

kvirc-log-fix-svn3762.patch:
 kvi_window.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kvirc-log-fix-svn3762.patch ---
Index: /trunk/kvirc/src/kvirc/ui/kvi_window.cpp
===================================================================
--- /trunk/kvirc/src/kvirc/ui/kvi_window.cpp (revision 3726)
+++ /trunk/kvirc/src/kvirc/ui/kvi_window.cpp (revision 3762)
@@ -535,5 +535,5 @@
 	{
 		case 0:
-			szDate = date.toString("yyyy-MM-dd");
+			szDate = date.toString("yyyy.MM.dd");
 			break;
 		case 1:


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kvirc.spec	19 Dec 2009 18:50:06 -0000	1.16
+++ kvirc.spec	29 Dec 2009 16:48:05 -0000	1.17
@@ -3,12 +3,13 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.20.%{pre}%{?dist}
+Release:          0.21.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
+Patch0:           kvirc-log-fix-svn3762.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -27,6 +28,7 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}-4.0%{pre}
+%patch0 -p3
 
 %build
 %{cmake}  \
@@ -131,6 +133,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/%{name}/4.0/doc/README
 
 %changelog
+* Tue Dec 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.21.rc2
+- fix log files date format from svn 3762
+
 * Sat Dec 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.20.rc2
 - KVIrc 4.0 release candidate 2
 - added BR cryptopp-devel and -DWANT_NO_EMBEDDED_CODE=ON



From orion at fedoraproject.org  Tue Dec 29 16:59:27 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 29 Dec 2009 16:59:27 +0000 (UTC)
Subject: File ge-V62u5_TAG-src.tar.bz2 uploaded to lookaside cache by orion
Message-ID: <20091229165927.32FD510F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gridengine:

1e81b2f28616ad44da5b628b1089b00c  ge-V62u5_TAG-src.tar.bz2



From nucleo at fedoraproject.org  Tue Dec 29 17:02:46 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Tue, 29 Dec 2009 17:02:46 +0000 (UTC)
Subject: rpms/kvirc/F-12 kvirc-log-fix-svn3762.patch, NONE, 1.1 kvirc.spec,
	1.14, 1.15
Message-ID: <20091229170246.DA72511C00E8@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5012

Modified Files:
	kvirc.spec 
Added Files:
	kvirc-log-fix-svn3762.patch 
Log Message:
fix log files date format

kvirc-log-fix-svn3762.patch:
 kvi_window.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kvirc-log-fix-svn3762.patch ---
Index: /trunk/kvirc/src/kvirc/ui/kvi_window.cpp
===================================================================
--- /trunk/kvirc/src/kvirc/ui/kvi_window.cpp (revision 3726)
+++ /trunk/kvirc/src/kvirc/ui/kvi_window.cpp (revision 3762)
@@ -535,5 +535,5 @@
 	{
 		case 0:
-			szDate = date.toString("yyyy-MM-dd");
+			szDate = date.toString("yyyy.MM.dd");
 			break;
 		case 1:


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-12/kvirc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kvirc.spec	19 Dec 2009 19:23:21 -0000	1.14
+++ kvirc.spec	29 Dec 2009 17:02:46 -0000	1.15
@@ -3,12 +3,13 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.20.%{pre}%{?dist}
+Release:          0.21.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
+Patch0:           kvirc-log-fix-svn3762.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -27,6 +28,7 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}-4.0%{pre}
+%patch0 -p3
 
 %build
 %{cmake}  \
@@ -131,6 +133,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/%{name}/4.0/doc/README
 
 %changelog
+* Tue Dec 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.21.rc2
+- fix log files date format from svn 3762
+
 * Sat Dec 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.20.rc2
 - KVIrc 4.0 release candidate 2
 - added BR cryptopp-devel and -DWANT_NO_EMBEDDED_CODE=ON



From orion at fedoraproject.org  Tue Dec 29 17:03:07 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 29 Dec 2009 17:03:07 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine-6.2u5-rctemplates.patch, NONE,
	1.1 maketarball, NONE, 1.1 .cvsignore, 1.9, 1.10 gridengine.spec,
	1.22, 1.23 sources, 1.11,
	1.12 gridengine-6.2u4-rctemplates.patch, 1.1, NONE
Message-ID: <20091229170307.4886311C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5087

Modified Files:
	.cvsignore gridengine.spec sources 
Added Files:
	gridengine-6.2u5-rctemplates.patch maketarball 
Removed Files:
	gridengine-6.2u4-rctemplates.patch 
Log Message:
* Mon Dec 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-1
- Update to 6.2u5


gridengine-6.2u5-rctemplates.patch:
 dist/inst_sge                             |   26 +--------------
 dist/util/create_settings.sh              |   51 +-----------------------------
 dist/util/install_modules/inst_common.sh  |   24 +++++++++-----
 dist/util/install_modules/inst_execd.sh   |    2 -
 dist/util/install_modules/inst_qmaster.sh |   12 ++++---
 scripts/distinst                          |    8 ----
 6 files changed, 30 insertions(+), 93 deletions(-)

--- NEW FILE gridengine-6.2u5-rctemplates.patch ---
--- gridengine/source/dist/inst_sge.rctemplates	2009-12-07 10:11:51.000000000 -0700
+++ gridengine/source/dist/inst_sge	2009-12-28 15:11:42.372471748 -0700
@@ -695,8 +695,7 @@
       AddJMXFiles
    fi
    RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum
-   CreateSGEStartUpScripts $euid true master
-   CreateSGEStartUpScripts $euid true execd
+   SetupDefaultUsers $euid
    CreateSettingsFile
    InitCA
    SetupRcScriptNames master #New qmaster RC script/SMF
@@ -860,7 +859,6 @@
       Makedir $COMMONDIR
       ProcessSGEClusterName "bdb"
       SetSpoolingOptions
-      AddSGEStartUpScript $euid "bdb"
       PrepareRPCServerStart
       GiveBerkelyHints
    else
@@ -912,11 +910,9 @@
  AddDefaultUsersets
  AddCommonFiles
  AddJMXFiles
- CreateSGEStartUpScripts $euid true master
- CreateSGEStartUpScripts $euid true execd
+ SetupDefaultUsers $euid
  CreateSettingsFile
  InitCA
- AddSGEStartUpScript $euid master
  StartQmaster
  AddWindowsAdmin
  AddHosts
@@ -1084,7 +1080,6 @@
       GetLocalExecdSpoolDir
       AddLocalConfiguration_With_Qconf
       AddSubmitHostsExecd
-      AddSGEStartUpScript $euid execd
       SetupWinSvc execinst     #service install during execd installation -> param: execinst
       CopyIBMLoadSensor
       StartExecd
@@ -1120,7 +1115,6 @@
       CheckHostNameResolving install
       GetLocalExecdSpoolDir
       AddLocalConfiguration_With_Qconf
-      AddSGEStartUpScript $euid execd
       SetupWinSvc execinst  #service install during execd installation -> param: execinst
       CopyIBMLoadSensor
       StartExecd
@@ -1437,7 +1431,6 @@
       if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then
          . $SGE_ROOT/$SGE_CELL/common/settings.sh
          SGE_ARCH=`$SGE_ROOT/util/arch`
-         AddSGEStartUpScript $euid shadow
          $INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST
 	      $INFOTEXT -log "Starting sge_shadowd on host %s\n" $SHADOW_HOST
 	      if [ "$SGE_ENABLE_SMF" = "true" ]; then
@@ -1683,20 +1676,7 @@
 
    COMMONDIR=$SGE_CELL/common
 
-   CreateSGEStartUpScripts 0 true master
-   CreateSGEStartUpScripts 0 true execd
-   
-   $INFOTEXT "\nYour new startup scripts are created. You will find them in the\n" \
-             "directory:\n\n" \
-             "   %s\n\n" \
-             "Your old startup scripts are saved in this directory as\n\n" \
-             "   %s\n" \
-             "   %s\n\n" \
-             \$SGE_ROOT/$COMMONDIR sgemaster_$DATE sgeexecd_$DATE
-   
-   $INFOTEXT "Please now copy the new startup scripts to the system wide rc\n" \
-             "file location on all qmaster, shadowd and execution hosts."
-   
+   SetupDefaultUser 0
 fi
 
 exit 0
--- gridengine/source/dist/util/create_settings.sh.rctemplates	2008-02-08 04:57:29.000000000 -0700
+++ gridengine/source/dist/util/create_settings.sh	2009-12-28 15:11:42.373471069 -0700
@@ -67,8 +67,6 @@
 echo "setenv SGE_ROOT $SGE_ROOT"                         >  $SP_CSH
 echo ""                                                  >> $SP_CSH
 echo "set ARCH = \`\$SGE_ROOT/util/arch\`"               >> $SP_CSH
-echo "set DEFAULTMANPATH = \`\$SGE_ROOT/util/arch -m\`"  >> $SP_CSH
-echo "set MANTYPE = \`\$SGE_ROOT/util/arch -mt\`"        >> $SP_CSH
 echo ""                                                  >> $SP_CSH
 
 #if [ "$SGE_CELL" != "" -a "$SGE_CELL" != "default" ]; then
@@ -93,31 +91,9 @@
 
 
 echo ""                                                          >> $SP_CSH
-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_CSH
-echo 'if ( $?MANPATH == 1 ) then'                                >> $SP_CSH
-echo "   setenv MANPATH \$SGE_ROOT/"'${MANTYPE}':'$MANPATH'      >> $SP_CSH
-echo "else"                                                      >> $SP_CSH
-echo "   setenv MANPATH \$SGE_ROOT/"'${MANTYPE}:$DEFAULTMANPATH' >> $SP_CSH
-echo "endif"                                                     >> $SP_CSH
-echo ""                                                          >> $SP_CSH
 echo "set path = ( \$SGE_ROOT/bin/"'$ARCH $path )'               >> $SP_CSH
 
-echo 'switch ($ARCH)'                                            >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "sol*":'                           >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "lx*":'                            >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "hp11-64":'                        >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo '   breaksw'                             >> $SP_CSH
-echo 'case "*":'                                                 >> $SP_CSH
-echo "   set shlib_path_name = \`\$SGE_ROOT/util/arch -lib\`"       >> $SP_CSH
-echo "   if ( \`eval echo '\$?'\$shlib_path_name\` ) then"          >> $SP_CSH
-echo "      set old_value = \`eval echo '\$'\$shlib_path_name\`"    >> $SP_CSH
-echo "      setenv \$shlib_path_name \"\$SGE_ROOT/lib/\$ARCH\":\"\$old_value\""   >> $SP_CSH
-echo "   else"                                                      >> $SP_CSH
-echo "      setenv \$shlib_path_name \$SGE_ROOT/lib/\$ARCH"         >> $SP_CSH
-echo "   endif"                                                     >> $SP_CSH
-echo "   unset shlib_path_name  old_value"                          >> $SP_CSH
-echo "endsw"                                                        >> $SP_CSH
-echo "unset ARCH DEFAULTMANPATH MANTYPE"                            >> $SP_CSH
+echo "unset ARCH"                                                   >> $SP_CSH
 
 #
 # bourne shell settings file
@@ -126,8 +102,6 @@
 echo "SGE_ROOT=$SGE_ROOT; export SGE_ROOT"                        > $SP_SH
 echo ""                                                          >> $SP_SH
 echo "ARCH=\`\$SGE_ROOT/util/arch\`"                             >> $SP_SH
-echo "DEFAULTMANPATH=\`\$SGE_ROOT/util/arch -m\`"                >> $SP_SH
-echo "MANTYPE=\`\$SGE_ROOT/util/arch -mt\`"                      >> $SP_SH
 echo ""                                                          >> $SP_SH
 
 if [ "$SGE_CELL" != "" ]; then
@@ -151,28 +125,7 @@
 
 
 echo ""                                                          >> $SP_SH
-echo "if [ \"\$MANPATH\" = \"\" ]; then"                         >> $SP_SH
-echo "   MANPATH=\$DEFAULTMANPATH"                               >> $SP_SH
-echo "fi"                                                        >> $SP_SH
-echo "MANPATH=\$SGE_ROOT/\$MANTYPE:\$MANPATH; export MANPATH"    >> $SP_SH
-echo ""                                                          >> $SP_SH
 echo "PATH=\$SGE_ROOT/bin/\$ARCH:\$PATH; export PATH"            >> $SP_SH
 
-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
-echo 'case $ARCH in'                                                >> $SP_SH
-#ENFORCE_SHLIBPATH#echo 'sol*|lx*|hp11-64)'                         >> $SP_SH
-#ENFORCE_SHLIBPATH#echo '   ;;'                                     >> $SP_SH
-echo '*)'                                                           >> $SP_SH
-echo "   shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`"             >> $SP_SH
-echo "   old_value=\`eval echo '\$'\$shlib_path_name\`"             >> $SP_SH
-echo "   if [ x\$old_value = "x" ]; then"                           >> $SP_SH
-echo "      eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH"           >> $SP_SH
-echo "   else"                                                      >> $SP_SH
-echo "      eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH:\$old_value" >> $SP_SH
-echo "   fi"                                                        >> $SP_SH
-echo "   export \$shlib_path_name"                                  >> $SP_SH
-echo '   unset shlib_path_name old_value'                           >> $SP_SH
-echo '   ;;'                                                        >> $SP_SH
-echo 'esac'                                                         >> $SP_SH
-echo "unset ARCH DEFAULTMANPATH MANTYPE"                            >> $SP_SH
+echo "unset ARCH"                                                   >> $SP_SH
 
--- gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates	2009-12-28 15:11:42.365471215 -0700
+++ gridengine/source/dist/util/install_modules/inst_common.sh	2009-12-28 15:11:42.376471408 -0700
@@ -2367,14 +2367,6 @@
 
       rm -f $TMP_SGE_STARTUP_FILE ${TMP_SGE_STARTUP_FILE}.0 ${TMP_SGE_STARTUP_FILE}.1
 
-      if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" -a $hosttype = "master" ]; then
-         AddDefaultManager root $ADMINUSER
-         AddDefaultOperator $ADMINUSER
-      elif [ $euid != 0 -a $hosttype = "master" ]; then
-         AddDefaultManager $USER
-         AddDefaultOperator $USER
-      fi
-
       $INFOTEXT "Creating >%s< script" $STARTUP_FILE_NAME 
    fi
 
@@ -2382,6 +2374,22 @@
 
 
 #-------------------------------------------------------------------------
+# SetupDefaultUsers: Add the default manager and operator
+#
+SetupDefaultUsers() {
+   euid=$1
+
+   if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" ]; then
+      AddDefaultManager root $ADMINUSER
+      AddDefaultOperator $ADMINUSER
+   elif [ $euid != 0 ]; then
+      AddDefaultManager $USER
+      AddDefaultOperator $USER
+   fi
+}
+
+
+#-------------------------------------------------------------------------
 # AddSGEStartUpScript: Add startup script to rc files if root installs
 #
 AddSGEStartUpScript()
--- gridengine/source/dist/util/install_modules/inst_execd.sh.rctemplates	2009-12-28 15:11:42.311470580 -0700
+++ gridengine/source/dist/util/install_modules/inst_execd.sh	2009-12-28 15:11:42.378471904 -0700
@@ -457,7 +457,7 @@
          exit 1
       fi
    else
-      $SGE_STARTUP_FILE
+      /sbin/service sge_execd start
    fi
    $INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
    $CLEAR
--- gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates	2009-12-28 15:11:42.345470618 -0700
+++ gridengine/source/dist/util/install_modules/inst_qmaster.sh	2009-12-28 15:12:26.129409063 -0700
@@ -208,8 +208,8 @@
                    "the qmaster daemon on other hosts (see the corresponding section in the\n" \
                    "Grid Engine Installation and Administration Manual for details) the account\n" \
                    "on the shadow master hosts also needs read/write access to this directory.\n\n" \
-                   "Enter a qmaster spool directory [%s] >> " "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"
-      QMDIR=`Enter "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"`
+                   "Enter a qmaster spool directory [%s] >> " "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"
+      QMDIR=`Enter "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"`
       done=true
       #If directory is not empty need now require a new one
       if [ -d "$QMDIR" ]; then
@@ -733,6 +733,9 @@
    ExecuteAsAdmin chmod 666 $COMMONDIR/bootstrap
    PrintBootstrap >> $COMMONDIR/bootstrap
    ExecuteAsAdmin chmod 444 $COMMONDIR/bootstrap
+   rm -f /etc/sysconfig/gridengine
+   echo "SGE_ROOT=/usr/share/gridengine" >> /etc/sysconfig/gridengine
+   echo "SGE_CELL=$SGE_CELL" >> /etc/sysconfig/gridengine
 }
 
 #-------------------------------------------------------------------------
@@ -949,7 +952,7 @@
       fi
       
       if [ -z "$1" ]; then
-         default_value=$SGE_ROOT_VAL/$SGE_CELL_VAL/spool
+         default_value=/var/spool/gridengine/$SGE_CELL_VAL
       else
          default_value="$1"
       fi
@@ -1192,6 +1195,7 @@
          touch /tmp/pwfile.$$
          chmod 600 /tmp/pwfile.$$
          echo "$SGE_JMX_SSL_KEYSTORE_PW" > /tmp/pwfile.$$
+         ExecuteAsAdmin mkdir -p `dirname $SGE_JMX_SSL_KEYSTORE`
          OUTPUT=`$SGE_CA_CMD -sysks -ksout $SGE_JMX_SSL_KEYSTORE -kspwf /tmp/pwfile.$$ 2>&1`
          if [ $? != 0 ]; then
             $INFOTEXT "Error: Cannot create keystore $SGE_JMX_SSL_KEYSTORE\n$OUTPUT"
@@ -1263,7 +1267,7 @@
          exit 1
       fi
    else
-      $SGE_STARTUP_FILE -qmaster
+      /sbin/service sgemaster start
       if [ $? -ne 0 ]; then
          $INFOTEXT "sge_qmaster start problem"
          $INFOTEXT -log "sge_qmaster start problem"
--- gridengine/source/scripts/distinst.rctemplates	2009-11-12 15:51:14.000000000 -0700
+++ gridengine/source/scripts/distinst	2009-12-28 15:13:42.640411877 -0700
@@ -832,15 +832,9 @@
       Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util
       if [ $enforce_shlibpath = true ]; then
          Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
          Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
       else
          Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
          Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
       fi
 
@@ -869,7 +863,6 @@
 
       Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \
 			$DEST_SGE_ROOT/util/upgrade_modules \
-                        $DEST_SGE_ROOT/util/rctemplates \
                         $DEST_SGE_ROOT/util/resources \
                         $DEST_SGE_ROOT/util/sgeCA \
                         $DEST_SGE_ROOT/util/resources/calendars \
@@ -894,7 +887,6 @@
                         $DEST_SGE_ROOT/util/resources/starter_methods/*
 
       Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \
-                        $DEST_SGE_ROOT/util/rctemplates/* \
                         $DEST_SGE_ROOT/util/sgeCA/*.cnf \
                         $DEST_SGE_ROOT/util/sgeSMF/*.xml \
                         $DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \


--- NEW FILE maketarball ---
#!/bin/bash
if [ -z "$1" ]
then
   echo "Usage: $0 TAG"
   exit 1
else
   tag=$1
fi

rm -rf gridengine
cvs -d :pserver:guest at cvs.sunsource.net:/cvs -z3 export -r $tag gridengine
rm -rf gridengine/{gep,review,www}
tar cjf ge-${tag}-src.tar.bz2 gridengine


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Oct 2009 15:00:31 -0000	1.9
+++ .cvsignore	29 Dec 2009 17:03:06 -0000	1.10
@@ -1,2 +1,2 @@
-ge-V62u4_TAG-src.tar.gz
+ge-V62u5_TAG-src.tar.bz2
 gridengine-ppc.tar.gz


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gridengine.spec	29 Oct 2009 21:45:48 -0000	1.22
+++ gridengine.spec	29 Dec 2009 17:03:07 -0000	1.23
@@ -5,7 +5,7 @@
 %define gecos Grid Engine
 
 Name:    gridengine
-Version: 6.2u4
+Version: 6.2u5
 Release: 1%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
@@ -18,7 +18,8 @@ Group:   Applications/System
 # which is not used or linked by other parts of gridengine.
 License: (BSD and LGPLv2+ and MIT and SISSL) and GPLv2+ and BSD with advertising
 URL:     http://gridengine.sunsource.net/
-Source0: http://gridengine.sunsource.net/files/documents/7/212/ge-V62u4_TAG-src.tar.gz
+#This is make with maketarball <TAG>
+Source0: ge-V62u5_TAG-src.tar.bz2
 Source1: gridengine-ppc.tar.gz
 Source2: my_configuration.conf
 Source3: sge.csh
@@ -30,6 +31,7 @@ Source8: Licenses
 Source9: gridengine.sysconfig
 Source10: http://gridengine.sunsource.net/nonav/issues/showattachment.cgi/165/libcore.c
 Source11: README
+Source12: maketarball
 # Link ssl libraries dynamically so dependencies are pulled in
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2845
 Patch1: gridengine-6.2beta-ssl.patch
@@ -37,7 +39,7 @@ Patch1: gridengine-6.2beta-ssl.patch
 Patch2: gridengine-6.2beta-inst.patch
 # Don't need to make rc files in inst_common.sh
 # Partially http://gridengine.sunsource.net/issues/show_bug.cgi?id=2780
-Patch3: gridengine-6.2u4-rctemplates.patch
+Patch3: gridengine-6.2u5-rctemplates.patch
 # Fixup sge_ca to use system openssl and java paths
 Patch4: gridengine-6.2u2_1-sge_ca.patch
 # Fixup jni paths
@@ -225,6 +227,9 @@ cat > build_private.properties <<EOF
 javacc.home=%{_javadir}
 libs.junit.classpath=%{_javadir}/junit.jar
 izpack.lib=/usr/share/java/izpack
+hadoop.javac.source=1.6
+hadoop.javac.target=1.6
+hadoop.home=/usr/share/java
 EOF
 
 #Build libcore.so
@@ -238,6 +243,8 @@ scripts/zerodepend
 #TODO - Need IzPack for GUI Installer
 ./aimk -no-gui-inst
 ./aimk -man 
+#Not build by default - going to need hadoop
+#ant herd
 
 
 %install 
@@ -306,6 +313,7 @@ do
 done
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 mv $RPM_BUILD_ROOT%{_libdir}/drmaa.jar $RPM_BUILD_ROOT%{_javadir}/drmaa.jar
+mv $RPM_BUILD_ROOT%{_libdir}/JSV.jar $RPM_BUILD_ROOT%{_javadir}/JSV.jar
 
 # include
 mv $RPM_BUILD_ROOT%{_datadir}/gridengine/include $RPM_BUILD_ROOT%{_includedir}
@@ -468,6 +476,7 @@ fi
 %{_libdir}/libspoolb.so
 %{_libdir}/libspoolc.so
 %{_javadir}/drmaa.jar
+%{_javadir}/JSV.jar
 %{_libexecdir}/gridengine/
 %attr(-,%username,%username) %dir %{_datadir}/gridengine
 %{_datadir}/gridengine/bin
@@ -478,6 +487,7 @@ fi
 %{_datadir}/gridengine/ckpt
 %attr(-,%username,%username) %ghost %{_datadir}/gridengine/default
 %{_datadir}/gridengine/doc
+%{_datadir}/gridengine/hadoop
 %{_datadir}/gridengine/inst_sge
 %{_datadir}/gridengine/lib
 %{_datadir}/gridengine/mpi
@@ -540,6 +550,9 @@ fi
 
 
 %changelog
+* Mon Dec 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-1
+- Update to 6.2u5
+
 * Thu Oct 29 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u4-1
 - Update to 6.2u4
 - Drop import patch fixed upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Oct 2009 15:00:31 -0000	1.11
+++ sources	29 Dec 2009 17:03:07 -0000	1.12
@@ -1,2 +1,2 @@
-a943d1dd5c8788b63995a2304a5f860e  ge-V62u4_TAG-src.tar.gz
+1e81b2f28616ad44da5b628b1089b00c  ge-V62u5_TAG-src.tar.bz2
 5ba34d534cdeda9afe74cd367cb51ce0  gridengine-ppc.tar.gz


--- gridengine-6.2u4-rctemplates.patch DELETED ---



From nucleo at fedoraproject.org  Tue Dec 29 17:04:35 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Tue, 29 Dec 2009 17:04:35 +0000 (UTC)
Subject: rpms/kvirc/F-11 kvirc-log-fix-svn3762.patch, NONE, 1.1 kvirc.spec, 1.8,
	1.9
Message-ID: <20091229170435.5EEE611C00E8@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5505

Modified Files:
	kvirc.spec 
Added Files:
	kvirc-log-fix-svn3762.patch 
Log Message:
fix log files date format

kvirc-log-fix-svn3762.patch:
 kvi_window.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kvirc-log-fix-svn3762.patch ---
Index: /trunk/kvirc/src/kvirc/ui/kvi_window.cpp
===================================================================
--- /trunk/kvirc/src/kvirc/ui/kvi_window.cpp (revision 3726)
+++ /trunk/kvirc/src/kvirc/ui/kvi_window.cpp (revision 3762)
@@ -535,5 +535,5 @@
 	{
 		case 0:
-			szDate = date.toString("yyyy-MM-dd");
+			szDate = date.toString("yyyy.MM.dd");
 			break;
 		case 1:


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/kvirc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kvirc.spec	19 Dec 2009 19:26:54 -0000	1.8
+++ kvirc.spec	29 Dec 2009 17:04:35 -0000	1.9
@@ -3,12 +3,13 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.20.%{pre}%{?dist}
+Release:          0.21.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
+Patch0:           kvirc-log-fix-svn3762.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -27,6 +28,7 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}-4.0%{pre}
+%patch0 -p3
 
 %build
 %{cmake}  \
@@ -131,6 +133,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/%{name}/4.0/doc/README
 
 %changelog
+* Tue Dec 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.21.rc2
+- fix log files date format from svn 3762
+
 * Sat Dec 19 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.20.rc2
 - KVIrc 4.0 release candidate 2
 - added BR cryptopp-devel and -DWANT_NO_EMBEDDED_CODE=ON



From rjones at fedoraproject.org  Tue Dec 29 17:11:28 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 29 Dec 2009 17:11:28 +0000 (UTC)
Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.26,1.27
Message-ID: <20091229171128.4055F11C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6971

Modified Files:
	ocaml-findlib.spec 
Log Message:
Rebuild for OCaml 3.11.2.


Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ocaml-findlib.spec	16 Dec 2009 17:05:57 -0000	1.26
+++ ocaml-findlib.spec	29 Dec 2009 17:11:27 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           ocaml-findlib
 Version:        1.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.5-4
+- Rebuild for OCaml 3.11.2.
+
 * Wed Dec 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.5-3
 - Use __ocaml_requires_opts / __ocaml_provides_opts.
 



From tomeu at fedoraproject.org  Tue Dec 29 18:39:04 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 29 Dec 2009 18:39:04 +0000 (UTC)
Subject: File gnash-0.8.6-python-install-dir.patch uploaded to lookaside cache
	by tomeu
Message-ID: <20091229183904.C7CAB10F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnash:

90760c95062bd2eb18ac068398a668dd  gnash-0.8.6-python-install-dir.patch



From tomeu at fedoraproject.org  Tue Dec 29 18:40:48 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 29 Dec 2009 18:40:48 +0000 (UTC)
Subject: rpms/gnash/devel gnash-0.8.6-python-install-dir.patch, NONE,
	1.1 .cvsignore, 1.17, 1.18 gnash.spec, 1.65, 1.66
Message-ID: <20091229184048.D94FE11C00E8@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22646

Modified Files:
	.cvsignore gnash.spec 
Added Files:
	gnash-0.8.6-python-install-dir.patch 
Log Message:
clog

gnash-0.8.6-python-install-dir.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnash-0.8.6-python-install-dir.patch ---
=== modified file 'gui/pythonmod/Makefile.am'
--- gui/pythonmod/Makefile.am	2009-12-19 21:24:21 +0000
+++ gui/pythonmod/Makefile.am	2009-12-29 18:32:28 +0000
@@ -15,8 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-pkgpythondir = $(pythondir)/gtk-2.0
-pkgpyexecdir = $(pythondir)/gtk-2.0
+pkgpythondir = $(pkgpythondir)/gtk-2.0
+pkgpyexecdir = $(pkgpyexecdir)/gtk-2.0
 
 GNASH_INCLUDES = \
 	-I$(top_srcdir)/gui \



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	29 Dec 2009 10:18:14 -0000	1.17
+++ .cvsignore	29 Dec 2009 18:40:48 -0000	1.18
@@ -1,2 +1,3 @@
 gnash-0.8.6.tar.bz2
 gnash-splash.swf
+gnash-0.8.6-python-install-dir.patch


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- gnash.spec	29 Dec 2009 13:06:09 -0000	1.65
+++ gnash.spec	29 Dec 2009 18:40:48 -0000	1.66
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.8.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 #Release:        0.8.%{alphatag}%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
@@ -19,6 +19,7 @@ Source1:        http://www.getgnash.org/
 Source2:        gnash.desktop
 
 Patch0:         gnash-0.8.3-manual.patch
+Patch1:         gnash-0.8.6-python-install-dir.patch
 # register KComponentData properly in KDE 4 KPart
 Patch3:         gnash-0.8.3-fix-kde4-port.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,6 +113,7 @@ application.
 %prep
 %setup -q
 %patch0 -p1 -b .manual
+%patch1 -p0 -b .python
 %patch3 -p1 -b .fix-kde4
 # Hack as autoreconf breaks build 
 sed -i -e 's!kapp.h!kapplication.h!g' configure
@@ -317,6 +319,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-3
+- Install python modules in the right dir
+
 * Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-2
 - Add cygnal plugins
 



From thm at fedoraproject.org  Tue Dec 29 18:58:41 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 18:58:41 +0000 (UTC)
Subject: File surfraw-2.2.6.tar.gz uploaded to lookaside cache by thm
Message-ID: <20091229185841.BE2FD10F8BF@bastion.fedoraproject.org>

A file has been added to the lookaside cache for surfraw:

5d5504de0ba63cef78fd3ceced7fec38  surfraw-2.2.6.tar.gz



From thm at fedoraproject.org  Tue Dec 29 19:00:15 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 19:00:15 +0000 (UTC)
Subject: rpms/surfraw/devel .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 sources, 
	1.3, 1.4 surfraw.spec, 1.4, 1.5
Message-ID: <20091229190016.0715411C03F6@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/surfraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25960/devel

Modified Files:
	.cvsignore import.log sources surfraw.spec 
Log Message:
Update to 2.2.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Sep 2009 16:22:35 -0000	1.3
+++ .cvsignore	29 Dec 2009 19:00:15 -0000	1.4
@@ -1 +1 @@
-surfraw-2.2.5.tar.gz
+surfraw-2.2.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Sep 2009 16:22:35 -0000	1.1
+++ import.log	29 Dec 2009 19:00:15 -0000	1.2
@@ -1 +1,2 @@
 surfraw-2_2_5-1_fc11:HEAD:surfraw-2.2.5-1.fc11.src.rpm:1254241290
+surfraw-2_2_6-1_fc12:HEAD:surfraw-2.2.6-1.fc12.src.rpm:1262113095


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Sep 2009 16:22:36 -0000	1.3
+++ sources	29 Dec 2009 19:00:15 -0000	1.4
@@ -1 +1 @@
-e33fb6fe23b1ff60095a103272500672  surfraw-2.2.5.tar.gz
+5d5504de0ba63cef78fd3ceced7fec38  surfraw-2.2.6.tar.gz


Index: surfraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/surfraw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- surfraw.spec	29 Sep 2009 16:22:36 -0000	1.4
+++ surfraw.spec	29 Dec 2009 19:00:15 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           surfraw
-Version:        2.2.5
+Version:        2.2.6
 Release:        1%{?dist}
 Summary:        Shell Users Revolutionary Front Rage Against the Web
 Group:          Applications/Internet
@@ -65,8 +65,8 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%config(noreplace) %{_sysconfdir}/surfraw.conf
-%config(noreplace) %{_sysconfdir}/surfraw.bookmarks
+%dir %{_sysconfdir}/xdg/surfraw
+%config(noreplace) %{_sysconfdir}/xdg/surfraw/*
 %{_bindir}/sr
 %{_bindir}/surfraw
 %{_bindir}/surfraw-update-path
@@ -75,6 +75,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 29 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.6-1
+- Update to 2.2.6.
+- Configuration is now in /etc/xdg/surfraw.
+
 * Sun Sep 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.5-1
 - Update to 2.2.5.
 - New upstream, and new upstream URL.



From thm at fedoraproject.org  Tue Dec 29 19:07:10 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 19:07:10 +0000 (UTC)
Subject: rpms/surfraw/F-12 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 sources, 
	1.3, 1.4 surfraw.spec, 1.4, 1.5
Message-ID: <20091229190710.975B711C00E8@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/surfraw/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27499/F-12

Modified Files:
	.cvsignore import.log sources surfraw.spec 
Log Message:
Update to 2.2.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Sep 2009 16:28:38 -0000	1.3
+++ .cvsignore	29 Dec 2009 19:07:10 -0000	1.4
@@ -1 +1 @@
-surfraw-2.2.5.tar.gz
+surfraw-2.2.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Sep 2009 16:28:38 -0000	1.1
+++ import.log	29 Dec 2009 19:07:10 -0000	1.2
@@ -1 +1,2 @@
 surfraw-2_2_5-1_fc11:F-12:surfraw-2.2.5-1.fc11.src.rpm:1254241653
+surfraw-2_2_6-1_fc12:F-12:surfraw-2.2.6-1.fc12.src.rpm:1262113554


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Sep 2009 16:28:38 -0000	1.3
+++ sources	29 Dec 2009 19:07:10 -0000	1.4
@@ -1 +1 @@
-e33fb6fe23b1ff60095a103272500672  surfraw-2.2.5.tar.gz
+5d5504de0ba63cef78fd3ceced7fec38  surfraw-2.2.6.tar.gz


Index: surfraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/F-12/surfraw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- surfraw.spec	29 Sep 2009 16:28:38 -0000	1.4
+++ surfraw.spec	29 Dec 2009 19:07:10 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           surfraw
-Version:        2.2.5
+Version:        2.2.6
 Release:        1%{?dist}
 Summary:        Shell Users Revolutionary Front Rage Against the Web
 Group:          Applications/Internet
@@ -65,8 +65,8 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%config(noreplace) %{_sysconfdir}/surfraw.conf
-%config(noreplace) %{_sysconfdir}/surfraw.bookmarks
+%dir %{_sysconfdir}/xdg/surfraw
+%config(noreplace) %{_sysconfdir}/xdg/surfraw/*
 %{_bindir}/sr
 %{_bindir}/surfraw
 %{_bindir}/surfraw-update-path
@@ -75,6 +75,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 29 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.6-1
+- Update to 2.2.6.
+- Configuration is now in /etc/xdg/surfraw.
+
 * Sun Sep 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.5-1
 - Update to 2.2.5.
 - New upstream, and new upstream URL.



From tomeu at fedoraproject.org  Tue Dec 29 19:21:22 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 29 Dec 2009 19:21:22 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec,1.66,1.67
Message-ID: <20091229192122.A120F11C00E8@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30850

Modified Files:
	gnash.spec 
Log Message:
clog


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- gnash.spec	29 Dec 2009 18:40:48 -0000	1.66
+++ gnash.spec	29 Dec 2009 19:21:22 -0000	1.67
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.8.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 #Release:        0.8.%{alphatag}%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
@@ -316,9 +316,12 @@ fi
 
 %files -n python-gnash
 %defattr(-,root,root,-)
-%{python_sitearch}/*
+%{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-4
+- Pick up python modules from the right dir
+
 * Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-3
 - Install python modules in the right dir
 



From ertzing at fedoraproject.org  Tue Dec 29 19:23:18 2009
From: ertzing at fedoraproject.org (Ralf Ertzinger)
Date: Tue, 29 Dec 2009 19:23:18 +0000 (UTC)
Subject: rpms/libfwbuilder/F-12 .cvsignore, 1.17, 1.18 libfwbuilder.spec, 1.33,
	1.34 sources, 1.17, 1.18
Message-ID: <20091229192318.20A3E11C00E8@cvs1.fedora.phx.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31245

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Log Message:
* Tue Dec 29 2009 Ralf Ertzinger <ralf at skytale.net> 3.0.7-1
- Update to 3.0.7
  *  Fixed security issue with temporary file handling in the generated
     iptables script. The problem only affects Linux systems where Firewall
     Builder is used to generate static routing configuration. The problem
     exists in Firewall Builder versions 3.0.4, 3.0.5, 3.0.6
  * Improved performance of the batch compile operation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	28 Jun 2009 18:57:24 -0000	1.17
+++ .cvsignore	29 Dec 2009 19:23:17 -0000	1.18
@@ -1 +1 @@
-libfwbuilder-3.0.5.tar.gz
+libfwbuilder-3.0.7.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/F-12/libfwbuilder.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- libfwbuilder.spec	25 Jul 2009 05:38:55 -0000	1.33
+++ libfwbuilder.spec	29 Dec 2009 19:23:17 -0000	1.34
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        3.0.5
-Release:        2%{?dist}
+Version:        3.0.7
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -77,6 +77,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Ralf Ertzinger <ralf at skytale.net> 3.0.7-1
+- Update to 3.0.7
+  *  Fixed security issue with temporary file handling in the generated
+     iptables script. The problem only affects Linux systems where Firewall
+     Builder is used to generate static routing configuration. The problem
+     exists in Firewall Builder versions 3.0.4, 3.0.5, 3.0.6
+  * Improved performance of the batch compile operation
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	28 Jun 2009 18:57:24 -0000	1.17
+++ sources	29 Dec 2009 19:23:17 -0000	1.18
@@ -1 +1 @@
-628697fb834b30c3ae5cfc37dbea3a3c  libfwbuilder-3.0.5.tar.gz
+70632afb9f276ac248b13b08f06db85a  libfwbuilder-3.0.7.tar.gz



From scop at fedoraproject.org  Tue Dec 29 19:36:49 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 29 Dec 2009 19:36:49 +0000 (UTC)
Subject: rpms/anacron/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.3, NONE sources, 1.8, NONE
Message-ID: <20091229193649.CE7FB11C00E8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1187

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources 
Log Message:
Obsoleted by cronie-anacron as of F-12.



--- NEW FILE dead.package ---
Obsoleted by cronie-anacron as of F-12.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---



From thm at fedoraproject.org  Tue Dec 29 19:42:17 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 19:42:17 +0000 (UTC)
Subject: File markdown2-1.0.1.16.zip uploaded to lookaside cache by thm
Message-ID: <20091229194217.BE94310F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for python-markdown2:

d04a8e3743134a2800816e88213a1728  markdown2-1.0.1.16.zip



From thm at fedoraproject.org  Tue Dec 29 19:42:59 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 19:42:59 +0000 (UTC)
Subject: rpms/python-markdown2/devel .cvsignore, 1.7, 1.8 import.log, 1.7,
	1.8 python-markdown2.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091229194259.5055A11C00E8@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2595/devel

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Log Message:
Update to 1.0.1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Oct 2009 08:07:38 -0000	1.7
+++ .cvsignore	29 Dec 2009 19:42:58 -0000	1.8
@@ -1 +1 @@
-markdown2-1.0.1.15.zip
+markdown2-1.0.1.16.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	8 Oct 2009 08:07:38 -0000	1.7
+++ import.log	29 Dec 2009 19:42:58 -0000	1.8
@@ -5,3 +5,4 @@ python-markdown2-1_0_1_11-1_fc9:HEAD:pyt
 python-markdown2-1_0_1_13-1_fc11:HEAD:python-markdown2-1.0.1.13-1.fc11.src.rpm:1247327308
 python-markdown2-1_0_1_13-3_fc11:HEAD:python-markdown2-1.0.1.13-3.fc11.src.rpm:1251993409
 python-markdown2-1_0_1_15-1_fc11:HEAD:python-markdown2-1.0.1.15-1.fc11.src.rpm:1254989197
+python-markdown2-1_0_1_16-1_fc12:HEAD:python-markdown2-1.0.1.16-1.fc12.src.rpm:1262115710


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/python-markdown2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-markdown2.spec	8 Oct 2009 08:07:38 -0000	1.10
+++ python-markdown2.spec	29 Dec 2009 19:42:58 -0000	1.11
@@ -3,7 +3,7 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.15
+Version:        1.0.1.16
 Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
@@ -68,6 +68,9 @@ cd test
 
 
 %changelog
+* Fri Dec 18 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.16-1
+- Update to 1.0.1.16.
+
 * Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.15-1
 - Update to 1.0.1.15. Fixes three issues, two of them being
   security-related.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Oct 2009 08:07:38 -0000	1.7
+++ sources	29 Dec 2009 19:42:58 -0000	1.8
@@ -1 +1 @@
-b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip
+d04a8e3743134a2800816e88213a1728  markdown2-1.0.1.16.zip



From thm at fedoraproject.org  Tue Dec 29 19:49:22 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 19:49:22 +0000 (UTC)
Subject: rpms/python-markdown2/F-12 .cvsignore, 1.7, 1.8 import.log, 1.7,
	1.8 python-markdown2.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091229194922.2049F11C00E8@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3896/F-12

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Log Message:
Update to 1.0.1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Oct 2009 08:13:12 -0000	1.7
+++ .cvsignore	29 Dec 2009 19:49:20 -0000	1.8
@@ -1 +1 @@
-markdown2-1.0.1.15.zip
+markdown2-1.0.1.16.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-12/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	8 Oct 2009 08:13:12 -0000	1.7
+++ import.log	29 Dec 2009 19:49:21 -0000	1.8
@@ -5,3 +5,4 @@ python-markdown2-1_0_1_11-1_fc9:HEAD:pyt
 python-markdown2-1_0_1_13-1_fc11:HEAD:python-markdown2-1.0.1.13-1.fc11.src.rpm:1247327308
 python-markdown2-1_0_1_13-3_fc11:HEAD:python-markdown2-1.0.1.13-3.fc11.src.rpm:1251993409
 python-markdown2-1_0_1_15-1_fc11:F-12:python-markdown2-1.0.1.15-1.fc11.src.rpm:1254989549
+python-markdown2-1_0_1_16-1_fc12:F-12:python-markdown2-1.0.1.16-1.fc12.src.rpm:1262116093


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-12/python-markdown2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-markdown2.spec	8 Oct 2009 08:13:12 -0000	1.10
+++ python-markdown2.spec	29 Dec 2009 19:49:21 -0000	1.11
@@ -3,7 +3,7 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.15
+Version:        1.0.1.16
 Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
@@ -68,6 +68,9 @@ cd test
 
 
 %changelog
+* Fri Dec 18 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.16-1
+- Update to 1.0.1.16.
+
 * Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.15-1
 - Update to 1.0.1.15. Fixes three issues, two of them being
   security-related.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Oct 2009 08:13:12 -0000	1.7
+++ sources	29 Dec 2009 19:49:21 -0000	1.8
@@ -1 +1 @@
-b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip
+d04a8e3743134a2800816e88213a1728  markdown2-1.0.1.16.zip



From thm at fedoraproject.org  Tue Dec 29 19:50:33 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 19:50:33 +0000 (UTC)
Subject: rpms/python-markdown2/F-11 .cvsignore, 1.6, 1.7 import.log, 1.5,
	1.6 python-markdown2.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20091229195033.56DD311C00E8@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4249/F-11

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Log Message:
Update to 1.0.1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 Oct 2009 08:17:21 -0000	1.6
+++ .cvsignore	29 Dec 2009 19:50:32 -0000	1.7
@@ -1 +1 @@
-markdown2-1.0.1.15.zip
+markdown2-1.0.1.16.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Oct 2009 08:17:21 -0000	1.5
+++ import.log	29 Dec 2009 19:50:33 -0000	1.6
@@ -3,3 +3,4 @@ python-markdown2-1_0_1_8-1_fc9:HEAD:pyth
 python-markdown2-1_0_1_9-1_fc9:HEAD:python-markdown2-1.0.1.9-1.fc9.src.rpm:1221203243
 python-markdown2-1_0_1_11-1_fc9:HEAD:python-markdown2-1.0.1.11-1.fc9.src.rpm:1222984575
 python-markdown2-1_0_1_15-1_fc11:F-11:python-markdown2-1.0.1.15-1.fc11.src.rpm:1254989653
+python-markdown2-1_0_1_16-1_fc12:F-11:python-markdown2-1.0.1.16-1.fc12.src.rpm:1262116160


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/python-markdown2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-markdown2.spec	8 Oct 2009 08:17:21 -0000	1.7
+++ python-markdown2.spec	29 Dec 2009 19:50:33 -0000	1.8
@@ -3,7 +3,7 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.15
+Version:        1.0.1.16
 Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
@@ -68,6 +68,9 @@ cd test
 
 
 %changelog
+* Fri Dec 18 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.16-1
+- Update to 1.0.1.16.
+
 * Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.15-1
 - Update to 1.0.1.15. Fixes three issues, two of them being
   security-related.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Oct 2009 08:17:21 -0000	1.6
+++ sources	29 Dec 2009 19:50:33 -0000	1.7
@@ -1 +1 @@
-b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip
+d04a8e3743134a2800816e88213a1728  markdown2-1.0.1.16.zip



From thm at fedoraproject.org  Tue Dec 29 20:02:15 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Tue, 29 Dec 2009 20:02:15 +0000 (UTC)
Subject: rpms/python-markdown2/EL-5 .cvsignore, 1.7, 1.8 import.log, 1.7,
	1.8 python-markdown2.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091229200215.3AC7611C00E8@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6405/EL-5

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Log Message:
Update to 1.0.1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Oct 2009 08:28:35 -0000	1.7
+++ .cvsignore	29 Dec 2009 20:02:14 -0000	1.8
@@ -1 +1 @@
-markdown2-1.0.1.15.zip
+markdown2-1.0.1.16.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	8 Oct 2009 08:28:35 -0000	1.7
+++ import.log	29 Dec 2009 20:02:14 -0000	1.8
@@ -5,3 +5,4 @@ python-markdown2-1_0_1_11-1_fc9:HEAD:pyt
 python-markdown2-1_0_1_13-1_fc11:HEAD:python-markdown2-1.0.1.13-1.fc11.src.rpm:1247327308
 python-markdown2-1_0_1_13-3_fc11:EL-5:python-markdown2-1.0.1.13-3.fc11.src.rpm:1251993836
 python-markdown2-1_0_1_15-1_fc11:EL-5:python-markdown2-1.0.1.15-1.fc11.src.rpm:1254990490
+python-markdown2-1_0_1_16-1_fc12:EL-5:python-markdown2-1.0.1.16-1.fc12.src.rpm:1262116868


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/python-markdown2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-markdown2.spec	8 Oct 2009 08:28:35 -0000	1.10
+++ python-markdown2.spec	29 Dec 2009 20:02:14 -0000	1.11
@@ -3,7 +3,7 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.15
+Version:        1.0.1.16
 Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
@@ -68,6 +68,9 @@ cd test
 
 
 %changelog
+* Fri Dec 18 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.16-1
+- Update to 1.0.1.16.
+
 * Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.15-1
 - Update to 1.0.1.15. Fixes three issues, two of them being
   security-related.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Oct 2009 08:28:35 -0000	1.7
+++ sources	29 Dec 2009 20:02:14 -0000	1.8
@@ -1 +1 @@
-b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip
+d04a8e3743134a2800816e88213a1728  markdown2-1.0.1.16.zip



From mschwendt at fedoraproject.org  Tue Dec 29 20:12:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue, 29 Dec 2009 20:12:24 +0000 (UTC)
Subject: rpms/mcs/devel libmcs-0.7.1-keyfile-change-string.patch, NONE,
	1.1 mcs.spec, 1.16, 1.17
Message-ID: <20091229201224.86AC311C00E8@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/mcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8575

Modified Files:
	mcs.spec 
Added Files:
	libmcs-0.7.1-keyfile-change-string.patch 
Log Message:
* Tue Dec 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-9
- Apply safety fix to keyfile set_string function.


libmcs-0.7.1-keyfile-change-string.patch:
 keyfile.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libmcs-0.7.1-keyfile-change-string.patch ---
diff -Nur libmcs-0.7.1-orig/src/backends/default/keyfile.c libmcs-0.7.1/src/backends/default/keyfile.c
--- libmcs-0.7.1-orig/src/backends/default/keyfile.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/backends/default/keyfile.c	2009-12-29 20:54:48.213678077 +0100
@@ -316,6 +316,8 @@
 
 		if (value != NULL)
 			line->value = strdup(value);
+		else
+			line->value = NULL;
 	}
 	else
 		keyfile_create_line(sec, key, value);


Index: mcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcs/devel/mcs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mcs.spec	24 Dec 2009 21:22:26 -0000	1.16
+++ mcs.spec	29 Dec 2009 20:12:24 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           mcs
 Version:        0.7.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Configuration file abstraction system
 
 Group:          Applications/System
@@ -16,6 +16,8 @@ Patch0: libmcs-0.7.1-sysconfdir.patch
 Patch1: libmcs-0.7.1-walk.patch
 # submitted upstream, safety fixes in string utility functions
 Patch2: libmcs-0.7.1-util.patch
+# submitted upstream, safety fix for keyfile set_string function
+Patch3: libmcs-0.7.1-keyfile-change-string.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,6 +91,7 @@ This package contains the files necessar
 %patch0 -p1 -b .sysconfdir
 %patch1 -p1 -b .walk
 %patch2 -p1 -b .util
+%patch3 -p1 -b .keyfile-change-string
 
 # Make the build system more verbose
 #perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
@@ -142,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libmcs.pc
 
 %changelog
+* Tue Dec 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-9
+- Apply safety fix to keyfile set_string function.
+
 * Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-8
 - Apply safety fixes to string utility functions.
 



From bpepple at fedoraproject.org  Tue Dec 29 20:14:06 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 29 Dec 2009 20:14:06 +0000 (UTC)
Subject: rpms/papyon/F-12 typeerror_b64decode.patch, NONE, 1.1 papyon.spec, 1.3,
	1.4
Message-ID: <20091229201406.99F9011C00E8@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/papyon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9073

Modified Files:
	papyon.spec 
Added Files:
	typeerror_b64decode.patch 
Log Message:
* Tue Dec 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-2
- Add patch to fix a crasher with TypeError in b64decode.


typeerror_b64decode.patch:
 p2p.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE typeerror_b64decode.patch ---
Index: papyon-0.4.3/papyon/p2p.py
===================================================================
--- papyon-0.4.3.orig/papyon/p2p.py	2009-11-08 01:39:38.981813305 -0800
+++ papyon-0.4.3/papyon/p2p.py	2009-11-08 01:40:38.131141864 -0800
@@ -159,7 +159,10 @@
             shad = base64.b64decode(shad)
         shac = element.get("SHA1C", None)
         if shac is not None:
-            shac = base64.b64decode(shac)
+            try:
+                shac = base64.b64decode(shac)
+            except TypeError:
+                logger.warning("Invalid SHA1C in MSNObject")
 
         result = MSNObject(creator, size, type, location, friendly, shad, shac)
         result._repr = xml_data


Index: papyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/F-12/papyon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- papyon.spec	25 Nov 2009 00:30:31 -0000	1.3
+++ papyon.spec	29 Dec 2009 20:14:06 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:           papyon
 Version:        0.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for MSN Messenger network
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/Papyon
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:		typeerror_b64decode.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,6 +33,7 @@ asynchronous manner
 
 %prep
 %setup -q
+%patch0 -p1 -b .b64decode
 %{__sed} -i 's|\#!/usr/bin/env python||' papyon/msnp2p/test.py
 
 
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-2
+- Add patch to fix a crasher with TypeError in b64decode.
+
 * Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-1
 - Update to 0.4.3.
 



From mschwendt at fedoraproject.org  Tue Dec 29 20:14:31 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue, 29 Dec 2009 20:14:31 +0000 (UTC)
Subject: rpms/mcs/F-12 libmcs-0.7.1-keyfile-change-string.patch, NONE,
	1.1 libmcs-0.7.1-sysconfdir.patch, NONE,
	1.1 libmcs-0.7.1-util.patch, NONE, 1.1 libmcs-0.7.1-walk.patch,
	NONE, 1.1 mcs.spec, 1.13, 1.14
Message-ID: <20091229201431.2F88511C00E8@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/mcs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9267

Modified Files:
	mcs.spec 
Added Files:
	libmcs-0.7.1-keyfile-change-string.patch 
	libmcs-0.7.1-sysconfdir.patch libmcs-0.7.1-util.patch 
	libmcs-0.7.1-walk.patch 
Log Message:
sync with Rawhide

libmcs-0.7.1-keyfile-change-string.patch:
 keyfile.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libmcs-0.7.1-keyfile-change-string.patch ---
diff -Nur libmcs-0.7.1-orig/src/backends/default/keyfile.c libmcs-0.7.1/src/backends/default/keyfile.c
--- libmcs-0.7.1-orig/src/backends/default/keyfile.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/backends/default/keyfile.c	2009-12-29 20:54:48.213678077 +0100
@@ -316,6 +316,8 @@
 
 		if (value != NULL)
 			line->value = strdup(value);
+		else
+			line->value = NULL;
 	}
 	else
 		keyfile_create_line(sec, key, value);

libmcs-0.7.1-sysconfdir.patch:
 buildsys.mk.in |    1 +
 extra.mk.in    |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE libmcs-0.7.1-sysconfdir.patch ---
diff -Nur libmcs-0.7.1-orig/buildsys.mk.in libmcs-0.7.1/buildsys.mk.in
--- libmcs-0.7.1-orig/buildsys.mk.in	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/buildsys.mk.in	2009-12-23 23:40:12.000000000 +0100
@@ -65,6 +65,7 @@
 includesubdir ?= ${PACKAGE}
 mandir = @mandir@
 mansubdir ?= man1
+sysconfdir = @sysconfdir@
 
 OBJS1 = ${SRCS:.c=.o}
 OBJS2 = ${OBJS1:.cc=.o}
diff -Nur libmcs-0.7.1-orig/extra.mk.in libmcs-0.7.1/extra.mk.in
--- libmcs-0.7.1-orig/extra.mk.in	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/extra.mk.in	2009-12-23 23:40:26.000000000 +0100
@@ -7,3 +7,4 @@
 KCONFIG_FLAGS = @KCONFIG_FLAGS@
 KCONFIG_LIBS = @KCONFIG_LIBS@
 plugindir = ${libdir}/mcs
+MCS_SYSCONFDIR = ${sysconfdir}

libmcs-0.7.1-util.patch:
 mcs_util.c |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

--- NEW FILE libmcs-0.7.1-util.patch ---
diff -Nur libmcs-0.7.1-orig/src/libmcs/mcs_util.c libmcs-0.7.1/src/libmcs/mcs_util.c
--- libmcs-0.7.1-orig/src/libmcs/mcs_util.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/libmcs/mcs_util.c	2009-12-24 18:26:15.000000000 +0100
@@ -56,7 +56,7 @@
  *
  * \param str The string to duplicate.
  * \param len The maximum allowed length of the string.
- * \return The length of the string or len, whichever is smaller.
+ * \return The pointer to a copy of the string. Free this with free().
  */
 char *
 mcs_strndup(const char *str, size_t len)
@@ -68,7 +68,7 @@
 		return NULL;
 
 	memcpy(out, str, nlen);
-	out[len] = '\0';
+	out[nlen] = '\0';
 
 	return out;
 }
@@ -146,16 +146,22 @@
 {
 	size_t dsize = strlen(dest);
 	size_t len = strlen(src);
-	size_t res = dsize + len;
+	size_t res;
 
 	dest += dsize;
 	count -= dsize;
 
-	if (len >= count)
-		len = count - 1;
-
+	if (len >= count) {
+        if (count>0) {
+            len = count - 1;
+        }
+        else {
+            len = 0;
+        }
+    }
 	memcpy(dest, src, len);
 	dest[len] = 0;
+    res = dsize + len;
 
 	return res;
 }
@@ -172,15 +178,16 @@
  */
 size_t mcs_strlcpy(char *dest, const char *src, size_t size)
 {
-	size_t ret = strlen(src);
+	size_t srclen = strlen(src);
+    size_t retlen = 0;
 
 	if (size != 0)
 	{
-		size_t len = (ret >= size) ? size - 1 : ret;
-		memcpy(dest, src, len);
-		dest[len] = '\0';
+		retlen = (srclen >= size) ? size - 1 : srclen;
+		memcpy(dest, src, retlen);
+		dest[retlen] = '\0';
 	}
 
-	return ret;
+	return retlen;
 }
 

libmcs-0.7.1-walk.patch:
 mcs_walk_config.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libmcs-0.7.1-walk.patch ---
diff -Nur libmcs-0.7.1-orig/src/tools/mcs-walk-config/mcs_walk_config.c libmcs-0.7.1/src/tools/mcs-walk-config/mcs_walk_config.c
--- libmcs-0.7.1-orig/src/tools/mcs-walk-config/mcs_walk_config.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/tools/mcs-walk-config/mcs_walk_config.c	2009-12-24 00:10:01.000000000 +0100
@@ -37,7 +37,7 @@
 {
 	mcs_handle_t *h;
 	mowgli_queue_t *groups, *i;
-	int entries = 0, sections = 0;
+	int entries = 0, sections = 0, avgentries = 0;
 
 	if (argc < 2)
 	{
@@ -75,8 +75,9 @@
 	mowgli_queue_destroy(groups);
 	mcs_fini();
 
+    avgentries = sections ? (entries/sections) : 0;
 	printf("\n%d entries across %d groups, average %d entries per group\n",
-		entries, sections, entries / sections);
+		entries, sections, avgentries);
 
 	return 0;
 }


Index: mcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcs/F-12/mcs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mcs.spec	25 Jul 2009 11:55:19 -0000	1.13
+++ mcs.spec	29 Dec 2009 20:14:31 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mcs
 Version:        0.7.1
-Release:        5%{?dist}
+Release:        9%{?dist}
 Summary:        Configuration file abstraction system
 
 Group:          Applications/System
@@ -10,10 +10,21 @@ License:        BSD
 URL:            http://atheme.org
 
 Source0:        http://distfiles.atheme.org/libmcs-%{version}.tgz
+# submitted upstream, build config fix
+Patch0: libmcs-0.7.1-sysconfdir.patch
+# submitted upstream, floating point exception fix
+Patch1: libmcs-0.7.1-walk.patch
+# submitted upstream, safety fixes in string utility functions
+Patch2: libmcs-0.7.1-util.patch
+# submitted upstream, safety fix for keyfile set_string function
+Patch3: libmcs-0.7.1-keyfile-change-string.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  GConf2-devel
 BuildRequires:  libmowgli-devel >= 0.4.0
+BuildRequires:  GConf2-devel
+# would be needed for kconfig support
+#BuildRequires:  kdelibs-devel
 
 %description
 mcs is a library and set of userland tools which abstract the storage of
@@ -77,10 +88,14 @@ This package contains the files necessar
 
 %prep
 %setup -q -n libmcs-%{version}
+%patch0 -p1 -b .sysconfdir
+%patch1 -p1 -b .walk
+%patch2 -p1 -b .util
+%patch3 -p1 -b .keyfile-change-string
 
 # Make the build system more verbose
-perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
-#sed -i '\,^.SILENT:,d' buildsys.mk.in
+#perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
+sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 # The build generates a wrong SONAME, fix it.
 perl -pi -e "s/-soname=.*'/-soname=\\\$\{LIB\}.\\\$\{LIB_MAJOR\}'/" configure
@@ -88,6 +103,7 @@ perl -pi -e "s/-soname=.*'/-soname=\\\$\
 %build
 %configure \
     --enable-gconf \
+    --disable-kconfig \
     --disable-dependency-tracking
 
 make %{?_smp_mflags}
@@ -97,10 +113,10 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-echo "gconf" > $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
-chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
-
+# Example for a default site-wide storage backend setting:
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+#echo "gconf" > $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
+#chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
 
 
 %clean
@@ -118,17 +134,33 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
-%config(noreplace) %{_sysconfdir}/mcs-backend
+#%config(noreplace) %{_sysconfdir}/mcs-backend
 %{_libdir}/*.so.*
 %{_libdir}/mcs
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
-%{_includedir}/libmcs
+%{_includedir}/libmcs/
 %{_libdir}/pkgconfig/libmcs.pc
 
 %changelog
+* Tue Dec 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-9
+- Apply safety fix to keyfile set_string function.
+
+* Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-8
+- Apply safety fixes to string utility functions.
+
+* Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-7
+- Fix floating point exception in mcs-walk-config tool.
+
+* Wed Dec 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-6
+- Add --disable-kconfig to fix build requirements usage (#529696).
+  The kconfig backend has never been built or included before.
+- Fix MCS_SYSCONFDIR build config value, so /etc/mcs-backend file is found.
+  Don't provide a default site-wide config file anymore. Making it default
+  to "gconf" would switch backends for everyone from "default".
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Tue Dec 29 20:14:31 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 29 Dec 2009 20:14:31 +0000 (UTC)
Subject: File em8300-nofirmware-0.18.0.tar.gz uploaded to lookaside cache by
	scop
Message-ID: <20091229201431.D4FA010F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for em8300:

8204b7697efd39d22a51e768c2ab4a69  em8300-nofirmware-0.18.0.tar.gz



From scop at fedoraproject.org  Tue Dec 29 20:15:24 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 29 Dec 2009 20:15:24 +0000 (UTC)
Subject: rpms/em8300/devel .cvsignore, 1.21, 1.22 em8300.spec, 1.29,
	1.30 sources, 1.21, 1.22 em8300-README-modprobe.conf, 1.2, NONE
Message-ID: <20091229201524.BA65211C00E8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9609

Modified Files:
	.cvsignore em8300.spec sources 
Removed Files:
	em8300-README-modprobe.conf 
Log Message:
* Tue Dec 29 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.18.0-1
- Update to 0.18.0.
- Don't create the video group, require udev >= 136-1 for it.
- Drop mostly obsolete README-modprobe.conf.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	25 Dec 2009 08:20:15 -0000	1.21
+++ .cvsignore	29 Dec 2009 20:15:24 -0000	1.22
@@ -1 +1 @@
-em8300-nofirmware-0.17.4.tar.gz
+em8300-nofirmware-0.18.0.tar.gz


Index: em8300.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/em8300.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- em8300.spec	25 Dec 2009 08:20:15 -0000	1.29
+++ em8300.spec	29 Dec 2009 20:15:24 -0000	1.30
@@ -2,7 +2,7 @@
 #global prever  rc1
 
 Name:           em8300
-Version:        0.17.4
+Version:        0.18.0
 Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
@@ -13,17 +13,16 @@ URL:            http://dxr3.sourceforge.
 #Source0:        %{name}-nofirmware-%{version}%{?prever:-%{prever}}.tar.lzma
 Source0:        http://downloads.sourceforge.net/dxr3/%{name}-nofirmware-%{version}%{?prever:-%{prever}}.tar.gz
 Source1:        %{name}.console.perms
-Source2:        http://cachalot.mine.nu/src/dxr3/em8300-README-modprobe.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  alsa-lib
 #Requires:       em8300-kmod >= %{version}
-Requires:       udev
+# udev >= 136-1 for the video group
+Requires:       udev >= 136-1
 Requires:       alsa-lib
 Requires:       %{_sysconfdir}/security/console.perms.d
-Requires(pre):  shadow-utils
 Provides:       em8300-kmod-common = %{version}-%{release}
 
 %description
@@ -52,7 +51,6 @@ Requires:       kernel-headers
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever:-%{prever}}
-install -pm 644 %{SOURCE2} README-modprobe.conf
 echo "Icon=redhat-sound_video" >> overlay/dxr3view.desktop
 sed -i -e 's/microcode_extract.pl/em8300-mc_ex/' scripts/microcode_extract.pl
 
@@ -90,6 +88,9 @@ for alsadir in %{_datadir}/alsa %{_sysco
         break
     fi
 done
+
+
+%check
 if [ ! -s %{name}.files ] ; then
     echo "ERROR: EM8300.conf not installed in expected location"
     exit 1
@@ -100,9 +101,6 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-getent group video >/dev/null || groupadd -r video || :
-
 %post utils
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -118,7 +116,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README* modules/README-modoptions
+%doc AUTHORS ChangeLog COPYING README modules/README-modoptions
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
 %{_bindir}/em8300setup
@@ -141,6 +139,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Dec 29 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.18.0-1
+- Update to 0.18.0.
+- Don't create the video group, require udev >= 136-1 for it.
+- Drop mostly obsolete README-modprobe.conf.
+
 * Fri Dec 25 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.4-1
 - Update to 0.17.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Dec 2009 08:20:15 -0000	1.21
+++ sources	29 Dec 2009 20:15:24 -0000	1.22
@@ -1 +1 @@
-dbad0f9e15621d1e4b60c966852c760f  em8300-nofirmware-0.17.4.tar.gz
+8204b7697efd39d22a51e768c2ab4a69  em8300-nofirmware-0.18.0.tar.gz


--- em8300-README-modprobe.conf DELETED ---



From tomeu at fedoraproject.org  Tue Dec 29 20:28:59 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 29 Dec 2009 20:28:59 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec, 1.67,
	1.68 gnash-0.8.6-python-install-dir.patch, 1.1, 1.2
Message-ID: <20091229202859.BE7E111C00E8@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11982

Modified Files:
	gnash.spec gnash-0.8.6-python-install-dir.patch 
Log Message:
clog


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- gnash.spec	29 Dec 2009 19:21:22 -0000	1.67
+++ gnash.spec	29 Dec 2009 20:28:58 -0000	1.68
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.8.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 #Release:        0.8.%{alphatag}%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
@@ -113,7 +113,7 @@ application.
 %prep
 %setup -q
 %patch0 -p1 -b .manual
-%patch1 -p0 -b .python
+%patch1 -p1 -b .python
 %patch3 -p1 -b .fix-kde4
 # Hack as autoreconf breaks build 
 sed -i -e 's!kapp.h!kapplication.h!g' configure
@@ -319,6 +319,9 @@ fi
 %{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-5
+- Patch Makefile.in, not Makefile.am
+
 * Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-4
 - Pick up python modules from the right dir
 

gnash-0.8.6-python-install-dir.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: gnash-0.8.6-python-install-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash-0.8.6-python-install-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnash-0.8.6-python-install-dir.patch	29 Dec 2009 18:40:48 -0000	1.1
+++ gnash-0.8.6-python-install-dir.patch	29 Dec 2009 20:28:58 -0000	1.2
@@ -1,15 +1,15 @@
-=== modified file 'gui/pythonmod/Makefile.am'
---- gui/pythonmod/Makefile.am	2009-12-19 21:24:21 +0000
-+++ gui/pythonmod/Makefile.am	2009-12-29 18:32:28 +0000
-@@ -15,8 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- 
--pkgpythondir = $(pythondir)/gtk-2.0
--pkgpyexecdir = $(pythondir)/gtk-2.0
-+pkgpythondir = $(pkgpythondir)/gtk-2.0
-+pkgpyexecdir = $(pkgpyexecdir)/gtk-2.0
- 
- GNASH_INCLUDES = \
- 	-I$(top_srcdir)/gui \
+diff -rup gnash-0.8.6/gui/pythonmod/Makefile.in gnash-0.8.6.orig/gui/pythonmod/Makefile.in
+--- gnash-0.8.6/gui/pythonmod/Makefile.in	2009-12-29 21:24:41.569276016 +0100
++++ gnash-0.8.6.orig/gui/pythonmod/Makefile.in	2009-12-29 21:23:44.632275091 +0100
+@@ -527,8 +527,8 @@ mconfig = @mconfig@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+-pkgpyexecdir = $(pkgpyexecdir)/gtk-2.0
+-pkgpythondir = $(pkgpythondir)/gtk-2.0
++pkgpyexecdir = $(pythondir)/gtk-2.0
++pkgpythondir = $(pythondir)/gtk-2.0
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
 



From sheltren at fedoraproject.org  Tue Dec 29 20:38:36 2009
From: sheltren at fedoraproject.org (Jeff Sheltren)
Date: Tue, 29 Dec 2009 20:38:36 +0000 (UTC)
Subject: rpms/cfengine/devel cfengine-shellcommands-allclasses-svn_r629.patch, 
	NONE, 1.1 cfengine.spec, 1.42, 1.43
Message-ID: <20091229203836.8F19C11C00E8@cvs1.fedora.phx.redhat.com>

Author: sheltren

Update of /cvs/pkgs/rpms/cfengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13501

Modified Files:
	cfengine.spec 
Added Files:
	cfengine-shellcommands-allclasses-svn_r629.patch 
Log Message:
New -doc subpackage and patch for shellcommands defines


cfengine-shellcommands-allclasses-svn_r629.patch:
 cf.extern.h |    1 +
 globals.c   |    1 +
 install.c   |   26 +++++++++++++-------------
 parse.c     |    1 +
 4 files changed, 16 insertions(+), 13 deletions(-)

--- NEW FILE cfengine-shellcommands-allclasses-svn_r629.patch ---
Index: src/cf.extern.h
===================================================================
--- src/cf.extern.h	(revision 628)
+++ src/cf.extern.h	(revision 629)
@@ -198,6 +198,7 @@
 extern char *CLASSBUFF;
 extern char ALLCLASSBUFFER[4*CF_BUFSIZE];
 extern char CHROOT[CF_BUFSIZE];
+extern char DEFINECLASSBUFFER[CF_BUFSIZE];
 extern char ELSECLASSBUFFER[CF_BUFSIZE];
 extern char FAILOVERBUFFER[CF_BUFSIZE];
 extern char *LINKFROM;
Index: src/install.c
===================================================================
--- src/install.c	(revision 628)
+++ src/install.c	(revision 629)
@@ -1977,7 +1977,7 @@
    DeleteSlash(buffer);
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer2,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer2,""); 
  
 if ((ptr = (struct Link *)malloc(sizeof(struct Link))) == NULL)
    {
@@ -2099,7 +2099,7 @@
    }
 
 ExpandVarstring(from,ebuff,"");
-ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
 
 Build2DListFromVarstring(&tp,to,LISTSEPARATOR,false);
 Set2DList(tp);
@@ -2241,7 +2241,7 @@
       FatalError("Memory Allocation failed for InstallRequired() #2");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+   ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
    
    if ((ptr->define = strdup(buffer)) == NULL)
       {
@@ -3601,7 +3601,7 @@
    ptr->done = 'n';
    ptr->scope = strdup(CONTEXTID);
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
    
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -3776,7 +3776,7 @@
    ptr->done = 'n';
    ptr->scope = strdup(CONTEXTID);
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
    
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -3837,7 +3837,7 @@
       FatalError("Memory Allocation failed for AppendDisable() #2");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
 
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -4313,7 +4313,7 @@
       FatalError("Memory Allocation failed for InstallMakepath() #3");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+   ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
    
    if ((ptr->defines = strdup(buffer)) == NULL)
       {
@@ -4801,7 +4801,7 @@
       FatalError("Memory Allocation failed for InstallFileListItem() #3");
       }
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,""); 
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,""); 
 
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -4930,7 +4930,7 @@
    FatalError("Memory Allocation failed for InstallProcItem() #3");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,ebuff,""); 
+ExpandVarstring(DEFINECLASSBUFFER,ebuff,""); 
  
 if ((ptr->defines = strdup(ebuff)) == NULL)
    {
@@ -5114,7 +5114,7 @@
    FatalError("Memory Allocation failed for InstallPackageItem() #4");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
 
 if ((ptr->defines = strdup(buffer)) == NULL)
    {
@@ -5321,7 +5321,7 @@
          FatalError("Memory Allocation failed for InstallImageItem() #6");
          }
       
-      ExpandVarstring(ALLCLASSBUFFER,buf4,"");
+      ExpandVarstring(DEFINECLASSBUFFER,buf4,"");
       
       if ((ptr->defines = strdup(buf4)) == NULL)
          {
@@ -6050,7 +6050,7 @@
    yyerror(OUTPUT);
    }
 */
-strcpy(ALLCLASSBUFFER,value);
+strcpy(DEFINECLASSBUFFER,value);
 
 for (sp = value; *sp != '\0'; sp++)
    {
@@ -6772,7 +6772,7 @@
    FatalError("Memory Allocation failed for PrependTidy() #2");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
 
 if ((tp->defines = strdup(buffer)) == NULL)
    {
Index: src/parse.c
===================================================================
--- src/parse.c	(revision 628)
+++ src/parse.c	(revision 629)
@@ -1279,6 +1279,7 @@
  STRATEGYNAME[0] = '\0';
  FILTERNAME[0] = '\0';
  memset(ALLCLASSBUFFER,0,CF_BUFSIZE);
+ memset(DEFINECLASSBUFFER,0,CF_BUFSIZE);
  memset(ELSECLASSBUFFER,0,CF_BUFSIZE);
  
  strcpy(CFSERVER,"localhost");
Index: src/globals.c
===================================================================
--- src/globals.c	(revision 628)
+++ src/globals.c	(revision 629)
@@ -127,6 +127,7 @@
   PUBLIC char VCURRENTFILE[CF_BUFSIZE];
   PUBLIC char VLOGFILE[CF_BUFSIZE];
   PUBLIC char ALLCLASSBUFFER[CF_ALLCLASSSIZE];
+  PUBLIC char DEFINECLASSBUFFER[CF_BUFSIZE];
   PUBLIC char ELSECLASSBUFFER[CF_BUFSIZE];
   PUBLIC char FAILOVERBUFFER[CF_BUFSIZE];
   PUBLIC char CHROOT[CF_BUFSIZE];


Index: cfengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- cfengine.spec	21 Aug 2009 12:43:23 -0000	1.42
+++ cfengine.spec	29 Dec 2009 20:38:36 -0000	1.43
@@ -1,13 +1,14 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.2.10
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.10.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
+Patch0: cfengine-shellcommands-allclasses-svn_r629.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,bison,flex,m4,libacl-devel
 BuildRequires: libselinux-devel,tetex-dvips,texinfo-tex
@@ -25,9 +26,19 @@ the configuration and maintenance of sys
 configurations. Cfengine is designed to be a part of a computer immune
 system.
 
+%package doc
+Summary: Documentation for cfengine
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+This package contains the documentation for cfengine.
+
 
 %prep
 %setup -q
+%patch0 -p0 -b .shellcommands
 
 
 %build
@@ -112,22 +123,32 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%doc contrib
-%doc inputs
-%doc doc/*html
-%doc doc/*pdf
-%doc doc/*ps
 %{_sbindir}/*
 %{_libdir}/libcfengine*
 %{_mandir}/man8/*
-%{_infodir}/cfengine*
 %{_initrddir}/cfenvd
 %{_initrddir}/cfexecd
 %{_initrddir}/cfservd
 %{_var}/%{name}
 
 
+%files doc
+%defattr(-,root,root,-)
+%{_infodir}/cfengine*
+%doc contrib
+%doc inputs
+%doc doc/*html
+%doc doc/*pdf
+%doc doc/*ps
+
+
 %changelog
+* Tue Dec 29 2009 Jeff Sheltren <jeff at osuosl.org> - 2.2.10-5
+- Move docs into a -doc subpackage (#523538)
+
+* Sat Dec 12 2009 Jeff Sheltren <jeff at osuosl.org> - 2.2.10-4
+- Patch for class definitions using shellcommands (#530458)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.10-3
 - rebuilt with new openssl
 



From tomeu at fedoraproject.org  Tue Dec 29 20:41:25 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 29 Dec 2009 20:41:25 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec, 1.68,
	1.69 gnash-0.8.6-python-install-dir.patch, 1.2, 1.3
Message-ID: <20091229204126.0B9F311C00E8@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14386

Modified Files:
	gnash.spec gnash-0.8.6-python-install-dir.patch 
Log Message:
clog


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- gnash.spec	29 Dec 2009 20:28:58 -0000	1.68
+++ gnash.spec	29 Dec 2009 20:41:25 -0000	1.69
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.8.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 #Release:        0.8.%{alphatag}%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
@@ -319,6 +319,9 @@ fi
 %{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-6
+- Patch was reversed
+
 * Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-5
 - Patch Makefile.in, not Makefile.am
 

gnash-0.8.6-python-install-dir.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: gnash-0.8.6-python-install-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash-0.8.6-python-install-dir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnash-0.8.6-python-install-dir.patch	29 Dec 2009 20:28:58 -0000	1.2
+++ gnash-0.8.6-python-install-dir.patch	29 Dec 2009 20:41:25 -0000	1.3
@@ -1,15 +1,14 @@
-diff -rup gnash-0.8.6/gui/pythonmod/Makefile.in gnash-0.8.6.orig/gui/pythonmod/Makefile.in
---- gnash-0.8.6/gui/pythonmod/Makefile.in	2009-12-29 21:24:41.569276016 +0100
-+++ gnash-0.8.6.orig/gui/pythonmod/Makefile.in	2009-12-29 21:23:44.632275091 +0100
+diff -rup gnash-0.8.6.orig/gui/pythonmod/Makefile.in gnash-0.8.6/gui/pythonmod/Makefile.in
+--- gnash-0.8.6.orig/gui/pythonmod/Makefile.in	2009-12-29 21:23:44.632275091 +0100
++++ gnash-0.8.6/gui/pythonmod/Makefile.in	2009-12-29 21:24:41.569276016 +0100
 @@ -527,8 +527,8 @@ mconfig = @mconfig@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
  pdfdir = @pdfdir@
--pkgpyexecdir = $(pkgpyexecdir)/gtk-2.0
--pkgpythondir = $(pkgpythondir)/gtk-2.0
-+pkgpyexecdir = $(pythondir)/gtk-2.0
-+pkgpythondir = $(pythondir)/gtk-2.0
+-pkgpyexecdir = $(pythondir)/gtk-2.0
+-pkgpythondir = $(pythondir)/gtk-2.0
++pkgpyexecdir = $(pkgpyexecdir)/gtk-2.0
++pkgpythondir = $(pkgpythondir)/gtk-2.0
  prefix = @prefix@
  program_transform_name = @program_transform_name@
  psdir = @psdir@
-



From ertzing at fedoraproject.org  Tue Dec 29 20:46:47 2009
From: ertzing at fedoraproject.org (Ralf Ertzinger)
Date: Tue, 29 Dec 2009 20:46:47 +0000 (UTC)
Subject: rpms/fwbuilder/F-12 .cvsignore, 1.18, 1.19 fwbuilder.spec, 1.33,
	1.34 sources, 1.18, 1.19
Message-ID: <20091229204647.AC50611C00E8@cvs1.fedora.phx.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15396

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
* Sat Nov 07 2009 Ralf Ertzinger <ralf at skytale.net> 3.0.7-1
- Update to 3.0.7
  *  Fixed security issue with temporary file handling in the generated
     iptables script. The problem only affects Linux systems where Firewall
     Builder is used to generate static routing configuration. The problem
     exists in Firewall Builder versions 3.0.4, 3.0.5, 3.0.6
  * Improved performance of the batch compile operation
- Add -fno-var-tracking-assignments to CXXFLAGS due to
  https://bugzilla.redhat.com/show_bug.cgi?id=532763



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	28 Jun 2009 19:19:06 -0000	1.18
+++ .cvsignore	29 Dec 2009 20:46:47 -0000	1.19
@@ -1 +1 @@
-fwbuilder-3.0.5.tar.gz
+fwbuilder-3.0.7.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/F-12/fwbuilder.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- fwbuilder.spec	24 Jul 2009 23:22:20 -0000	1.33
+++ fwbuilder.spec	29 Dec 2009 20:46:47 -0000	1.34
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        3.0.5
-Release:        2%{?dist}
+Version:        3.0.7
+Release:        1%{?dist}
 
 License:        GPLv2+
 Group:          Applications/System
@@ -38,6 +38,7 @@ and the same GUI for different firewall 
 
 
 %build
+export CXXFLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
 %configure \
     --with-templatedir=%{_datadir}/fwbuilder \
     --disable-dependency-tracking
@@ -165,6 +166,16 @@ Policy compiler for Cisco routers/firewa
 %{_mandir}/man1/fwb_pix.1*
 
 %changelog
+* Sat Nov 07 2009 Ralf Ertzinger <ralf at skytale.net> 3.0.7-1
+- Update to 3.0.7
+  *  Fixed security issue with temporary file handling in the generated
+     iptables script. The problem only affects Linux systems where Firewall
+     Builder is used to generate static routing configuration. The problem
+     exists in Firewall Builder versions 3.0.4, 3.0.5, 3.0.6
+  * Improved performance of the batch compile operation
+- Add -fno-var-tracking-assignments to CXXFLAGS due to
+  https://bugzilla.redhat.com/show_bug.cgi?id=532763
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	28 Jun 2009 19:19:06 -0000	1.18
+++ sources	29 Dec 2009 20:46:47 -0000	1.19
@@ -1 +1 @@
-826cd7eb84dbd3faa9e4f99f3595999c  fwbuilder-3.0.5.tar.gz
+03ae055da1aea1c8a09b8ce51fbf8d7d  fwbuilder-3.0.7.tar.gz



From sheltren at fedoraproject.org  Tue Dec 29 20:56:34 2009
From: sheltren at fedoraproject.org (Jeff Sheltren)
Date: Tue, 29 Dec 2009 20:56:34 +0000 (UTC)
Subject: rpms/cfengine/F-12 cfengine-shellcommands-allclasses-svn_r629.patch, 
	NONE, 1.1 cfengine.spec, 1.42, 1.43
Message-ID: <20091229205634.8783611C00E8@cvs1.fedora.phx.redhat.com>

Author: sheltren

Update of /cvs/pkgs/rpms/cfengine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17126

Modified Files:
	cfengine.spec 
Added Files:
	cfengine-shellcommands-allclasses-svn_r629.patch 
Log Message:
Add doc subpackage and patch for shellcommands defines


cfengine-shellcommands-allclasses-svn_r629.patch:
 cf.extern.h |    1 +
 globals.c   |    1 +
 install.c   |   26 +++++++++++++-------------
 parse.c     |    1 +
 4 files changed, 16 insertions(+), 13 deletions(-)

--- NEW FILE cfengine-shellcommands-allclasses-svn_r629.patch ---
Index: src/cf.extern.h
===================================================================
--- src/cf.extern.h	(revision 628)
+++ src/cf.extern.h	(revision 629)
@@ -198,6 +198,7 @@
 extern char *CLASSBUFF;
 extern char ALLCLASSBUFFER[4*CF_BUFSIZE];
 extern char CHROOT[CF_BUFSIZE];
+extern char DEFINECLASSBUFFER[CF_BUFSIZE];
 extern char ELSECLASSBUFFER[CF_BUFSIZE];
 extern char FAILOVERBUFFER[CF_BUFSIZE];
 extern char *LINKFROM;
Index: src/install.c
===================================================================
--- src/install.c	(revision 628)
+++ src/install.c	(revision 629)
@@ -1977,7 +1977,7 @@
    DeleteSlash(buffer);
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer2,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer2,""); 
  
 if ((ptr = (struct Link *)malloc(sizeof(struct Link))) == NULL)
    {
@@ -2099,7 +2099,7 @@
    }
 
 ExpandVarstring(from,ebuff,"");
-ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
 
 Build2DListFromVarstring(&tp,to,LISTSEPARATOR,false);
 Set2DList(tp);
@@ -2241,7 +2241,7 @@
       FatalError("Memory Allocation failed for InstallRequired() #2");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+   ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
    
    if ((ptr->define = strdup(buffer)) == NULL)
       {
@@ -3601,7 +3601,7 @@
    ptr->done = 'n';
    ptr->scope = strdup(CONTEXTID);
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
    
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -3776,7 +3776,7 @@
    ptr->done = 'n';
    ptr->scope = strdup(CONTEXTID);
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
    
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -3837,7 +3837,7 @@
       FatalError("Memory Allocation failed for AppendDisable() #2");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,"");
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,"");
 
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -4313,7 +4313,7 @@
       FatalError("Memory Allocation failed for InstallMakepath() #3");
       }
    
-   ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+   ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
    
    if ((ptr->defines = strdup(buffer)) == NULL)
       {
@@ -4801,7 +4801,7 @@
       FatalError("Memory Allocation failed for InstallFileListItem() #3");
       }
 
-   ExpandVarstring(ALLCLASSBUFFER,ebuff,""); 
+   ExpandVarstring(DEFINECLASSBUFFER,ebuff,""); 
 
    if ((ptr->defines = strdup(ebuff)) == NULL)
       {
@@ -4930,7 +4930,7 @@
    FatalError("Memory Allocation failed for InstallProcItem() #3");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,ebuff,""); 
+ExpandVarstring(DEFINECLASSBUFFER,ebuff,""); 
  
 if ((ptr->defines = strdup(ebuff)) == NULL)
    {
@@ -5114,7 +5114,7 @@
    FatalError("Memory Allocation failed for InstallPackageItem() #4");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer,"");
+ExpandVarstring(DEFINECLASSBUFFER,buffer,"");
 
 if ((ptr->defines = strdup(buffer)) == NULL)
    {
@@ -5321,7 +5321,7 @@
          FatalError("Memory Allocation failed for InstallImageItem() #6");
          }
       
-      ExpandVarstring(ALLCLASSBUFFER,buf4,"");
+      ExpandVarstring(DEFINECLASSBUFFER,buf4,"");
       
       if ((ptr->defines = strdup(buf4)) == NULL)
          {
@@ -6050,7 +6050,7 @@
    yyerror(OUTPUT);
    }
 */
-strcpy(ALLCLASSBUFFER,value);
+strcpy(DEFINECLASSBUFFER,value);
 
 for (sp = value; *sp != '\0'; sp++)
    {
@@ -6772,7 +6772,7 @@
    FatalError("Memory Allocation failed for PrependTidy() #2");
    }
 
-ExpandVarstring(ALLCLASSBUFFER,buffer,""); 
+ExpandVarstring(DEFINECLASSBUFFER,buffer,""); 
 
 if ((tp->defines = strdup(buffer)) == NULL)
    {
Index: src/parse.c
===================================================================
--- src/parse.c	(revision 628)
+++ src/parse.c	(revision 629)
@@ -1279,6 +1279,7 @@
  STRATEGYNAME[0] = '\0';
  FILTERNAME[0] = '\0';
  memset(ALLCLASSBUFFER,0,CF_BUFSIZE);
+ memset(DEFINECLASSBUFFER,0,CF_BUFSIZE);
  memset(ELSECLASSBUFFER,0,CF_BUFSIZE);
  
  strcpy(CFSERVER,"localhost");
Index: src/globals.c
===================================================================
--- src/globals.c	(revision 628)
+++ src/globals.c	(revision 629)
@@ -127,6 +127,7 @@
   PUBLIC char VCURRENTFILE[CF_BUFSIZE];
   PUBLIC char VLOGFILE[CF_BUFSIZE];
   PUBLIC char ALLCLASSBUFFER[CF_ALLCLASSSIZE];
+  PUBLIC char DEFINECLASSBUFFER[CF_BUFSIZE];
   PUBLIC char ELSECLASSBUFFER[CF_BUFSIZE];
   PUBLIC char FAILOVERBUFFER[CF_BUFSIZE];
   PUBLIC char CHROOT[CF_BUFSIZE];


Index: cfengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfengine/F-12/cfengine.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- cfengine.spec	21 Aug 2009 12:43:23 -0000	1.42
+++ cfengine.spec	29 Dec 2009 20:56:34 -0000	1.43
@@ -1,13 +1,14 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.2.10
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.10.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
+Patch0: cfengine-shellcommands-allclasses-svn_r629.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,bison,flex,m4,libacl-devel
 BuildRequires: libselinux-devel,tetex-dvips,texinfo-tex
@@ -25,9 +26,19 @@ the configuration and maintenance of sys
 configurations. Cfengine is designed to be a part of a computer immune
 system.
 
+%package doc
+Summary: Documentation for cfengine
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+This package contains the documentation for cfengine.
+
 
 %prep
 %setup -q
+%patch0 -p0 -b .shellcommands
 
 
 %build
@@ -112,22 +123,32 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%doc contrib
-%doc inputs
-%doc doc/*html
-%doc doc/*pdf
-%doc doc/*ps
 %{_sbindir}/*
 %{_libdir}/libcfengine*
 %{_mandir}/man8/*
-%{_infodir}/cfengine*
 %{_initrddir}/cfenvd
 %{_initrddir}/cfexecd
 %{_initrddir}/cfservd
 %{_var}/%{name}
 
 
+%files doc
+%defattr(-,root,root,-)
+%{_infodir}/cfengine*
+%doc contrib
+%doc inputs
+%doc doc/*html
+%doc doc/*pdf
+%doc doc/*ps
+
+
 %changelog
+* Tue Dec 29 2009 Jeff Sheltren <jeff at osuosl.org> - 2.2.10-5
+- Move docs into a -doc subpackage (#523538)
+
+* Sat Dec 12 2009 Jeff Sheltren <jeff at osuosl.org> - 2.2.10-4
+- Patch for class definitions using shellcommands (#530458)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.10-3
 - rebuilt with new openssl
 



From arbiter at fedoraproject.org  Tue Dec 29 22:19:49 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 29 Dec 2009 22:19:49 +0000 (UTC)
Subject: File cherokee-0.99.39.tar.gz uploaded to lookaside cache by arbiter
Message-ID: <20091229221949.1026210F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cherokee:

2e9694268eda387489b10b2e237e291a  cherokee-0.99.39.tar.gz



From cwickert at fedoraproject.org  Tue Dec 29 22:34:45 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Dec 2009 22:34:45 +0000 (UTC)
Subject: File lxmusic-0.4.2.tar.gz uploaded to lookaside cache by cwickert
Message-ID: <20091229223445.CE8F410F878@bastion.fedoraproject.org>

A file has been added to the lookaside cache for lxmusic:

b99b2997231091afe3a0098fcb5edcd7  lxmusic-0.4.2.tar.gz



From alexlan at fedoraproject.org  Tue Dec 29 22:48:46 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 29 Dec 2009 22:48:46 +0000 (UTC)
Subject: rpms/rpy/devel rpy.spec,1.47,1.48
Message-ID: <20091229224847.4EDE511C00E8@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/rpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5362

Modified Files:
	rpy.spec 
Log Message:
* Tue Dec 29 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.6-7
- Rebuild for new R (2.10.1)



Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- rpy.spec	5 Nov 2009 13:20:04 -0000	1.47
+++ rpy.spec	29 Dec 2009 22:48:45 -0000	1.48
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.10.0
+%define rver   2.10.1
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.6
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Tue Dec 29 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.6-7
+- Rebuild for new R (2.10.1)
+
 * Thu Nov  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-7
 - rebuild for R 2.10.0
 



From alexlan at fedoraproject.org  Tue Dec 29 22:49:30 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 29 Dec 2009 22:49:30 +0000 (UTC)
Subject: rpms/rpy/devel rpy.spec,1.48,1.49
Message-ID: <20091229224930.7DFF011C00E8@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/rpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5577

Modified Files:
	rpy.spec 
Log Message:
Forgot to bump release.



Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- rpy.spec	29 Dec 2009 22:48:45 -0000	1.48
+++ rpy.spec	29 Dec 2009 22:49:30 -0000	1.49
@@ -4,7 +4,7 @@
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.6
-Release:       7%{?dist}
+Release:       8%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz
 License:       MPLv1.1 or GPLv2+ or LGPLv2+



From arbiter at fedoraproject.org  Tue Dec 29 22:53:33 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 29 Dec 2009 22:53:33 +0000 (UTC)
Subject: rpms/cherokee/EL-5 .cvsignore, 1.15, 1.16 cherokee.spec, 1.18,
	1.19 sources, 1.15, 1.16
Message-ID: <20091229225333.3111211C00E8@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6492

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
- 0.99.39



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	28 Dec 2009 17:59:35 -0000	1.15
+++ .cvsignore	29 Dec 2009 22:53:32 -0000	1.16
@@ -1 +1 @@
-cherokee-0.99.38.tar.gz
+cherokee-0.99.39.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/cherokee.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- cherokee.spec	28 Dec 2009 17:59:35 -0000	1.18
+++ cherokee.spec	29 Dec 2009 22:53:32 -0000	1.19
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.38
+Version:        0.99.39
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
+- 0.99.39
+
 * Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
 - 0.99.38
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	28 Dec 2009 17:59:36 -0000	1.15
+++ sources	29 Dec 2009 22:53:32 -0000	1.16
@@ -1 +1 @@
-67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz
+2e9694268eda387489b10b2e237e291a  cherokee-0.99.39.tar.gz



From arbiter at fedoraproject.org  Tue Dec 29 22:53:33 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 29 Dec 2009 22:53:33 +0000 (UTC)
Subject: rpms/cherokee/EL-4 .cvsignore, 1.13, 1.14 cherokee.spec, 1.17,
	1.18 sources, 1.13, 1.14
Message-ID: <20091229225333.834AD11C00E8@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6484

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
- 0.99.39



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Dec 2009 17:59:27 -0000	1.13
+++ .cvsignore	29 Dec 2009 22:53:33 -0000	1.14
@@ -1 +1 @@
-cherokee-0.99.38.tar.gz
+cherokee-0.99.39.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/cherokee.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cherokee.spec	28 Dec 2009 17:59:28 -0000	1.17
+++ cherokee.spec	29 Dec 2009 22:53:33 -0000	1.18
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.38
+Version:        0.99.39
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
+- 0.99.39
+
 * Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
 - 0.99.38
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Dec 2009 17:59:28 -0000	1.13
+++ sources	29 Dec 2009 22:53:33 -0000	1.14
@@ -1 +1 @@
-67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz
+2e9694268eda387489b10b2e237e291a  cherokee-0.99.39.tar.gz



From arbiter at fedoraproject.org  Tue Dec 29 22:53:34 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 29 Dec 2009 22:53:34 +0000 (UTC)
Subject: rpms/cherokee/F-11 .cvsignore, 1.15, 1.16 cherokee.spec, 1.21,
	1.22 sources, 1.15, 1.16
Message-ID: <20091229225334.2E48D11C00E8@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6488

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
- 0.99.39



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	28 Dec 2009 17:59:44 -0000	1.15
+++ .cvsignore	29 Dec 2009 22:53:33 -0000	1.16
@@ -1 +1 @@
-cherokee-0.99.38.tar.gz
+cherokee-0.99.39.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/cherokee.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- cherokee.spec	28 Dec 2009 17:59:44 -0000	1.21
+++ cherokee.spec	29 Dec 2009 22:53:34 -0000	1.22
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.38
+Version:        0.99.39
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
+- 0.99.39
+
 * Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
 - 0.99.38
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	28 Dec 2009 17:59:44 -0000	1.15
+++ sources	29 Dec 2009 22:53:34 -0000	1.16
@@ -1 +1 @@
-67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz
+2e9694268eda387489b10b2e237e291a  cherokee-0.99.39.tar.gz



From arbiter at fedoraproject.org  Tue Dec 29 22:53:34 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 29 Dec 2009 22:53:34 +0000 (UTC)
Subject: rpms/cherokee/devel .cvsignore, 1.17, 1.18 cherokee.spec, 1.27,
	1.28 sources, 1.17, 1.18
Message-ID: <20091229225334.8ED3A11C00E8@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6510

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
- 0.99.39



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	28 Dec 2009 18:00:48 -0000	1.17
+++ .cvsignore	29 Dec 2009 22:53:34 -0000	1.18
@@ -1 +1 @@
-cherokee-0.99.38.tar.gz
+cherokee-0.99.39.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- cherokee.spec	28 Dec 2009 18:00:48 -0000	1.27
+++ cherokee.spec	29 Dec 2009 22:53:34 -0000	1.28
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.38
+Version:        0.99.39
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
+- 0.99.39
+
 * Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
 - 0.99.38
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	28 Dec 2009 18:00:48 -0000	1.17
+++ sources	29 Dec 2009 22:53:34 -0000	1.18
@@ -1 +1 @@
-67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz
+2e9694268eda387489b10b2e237e291a  cherokee-0.99.39.tar.gz



From arbiter at fedoraproject.org  Tue Dec 29 22:53:35 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Tue, 29 Dec 2009 22:53:35 +0000 (UTC)
Subject: rpms/cherokee/F-12 .cvsignore, 1.16, 1.17 cherokee.spec, 1.27,
	1.28 sources, 1.17, 1.18
Message-ID: <20091229225335.1FD0B11C00E8@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/cherokee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6505

Modified Files:
	.cvsignore cherokee.spec sources 
Log Message:
* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
- 0.99.39



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	28 Dec 2009 18:00:08 -0000	1.16
+++ .cvsignore	29 Dec 2009 22:53:34 -0000	1.17
@@ -1 +1 @@
-cherokee-0.99.38.tar.gz
+cherokee-0.99.39.tar.gz


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/cherokee.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- cherokee.spec	28 Dec 2009 18:00:08 -0000	1.27
+++ cherokee.spec	29 Dec 2009 22:53:34 -0000	1.28
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 %endif
 
 Name:           cherokee
-Version:        0.99.38
+Version:        0.99.39
 Release:        1%{?dist}
 Summary:        Flexible and Fast Webserver
 
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Tue Dec 29 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.39-1
+- 0.99.39
+
 * Mon Dec 28 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.99.38-1
 - 0.99.38
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	28 Dec 2009 18:00:08 -0000	1.17
+++ sources	29 Dec 2009 22:53:34 -0000	1.18
@@ -1 +1 @@
-67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz
+2e9694268eda387489b10b2e237e291a  cherokee-0.99.39.tar.gz



From bpepple at fedoraproject.org  Tue Dec 29 23:38:32 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 29 Dec 2009 23:38:32 +0000 (UTC)
Subject: rpms/papyon/devel typeerror_b64decode.patch, NONE, 1.1 papyon.spec,
	1.3, 1.4
Message-ID: <20091229233832.D9BEC11C00E8@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/papyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14945

Modified Files:
	papyon.spec 
Added Files:
	typeerror_b64decode.patch 
Log Message:
* Tue Dec 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-2
- Add patch to fix a crasher with TypeError in b64decode.


typeerror_b64decode.patch:
 p2p.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE typeerror_b64decode.patch ---
Index: papyon-0.4.3/papyon/p2p.py
===================================================================
--- papyon-0.4.3.orig/papyon/p2p.py	2009-11-08 01:39:38.981813305 -0800
+++ papyon-0.4.3/papyon/p2p.py	2009-11-08 01:40:38.131141864 -0800
@@ -159,7 +159,10 @@
             shad = base64.b64decode(shad)
         shac = element.get("SHA1C", None)
         if shac is not None:
-            shac = base64.b64decode(shac)
+            try:
+                shac = base64.b64decode(shac)
+            except TypeError:
+                logger.warning("Invalid SHA1C in MSNObject")
 
         result = MSNObject(creator, size, type, location, friendly, shad, shac)
         result._repr = xml_data


Index: papyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/papyon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- papyon.spec	9 Oct 2009 19:30:12 -0000	1.3
+++ papyon.spec	29 Dec 2009 23:38:31 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:           papyon
 Version:        0.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for MSN Messenger network
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/Papyon
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:		typeerror_b64decode.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,6 +33,7 @@ asynchronous manner
 
 %prep
 %setup -q
+%patch0 -p1 -b .b64decode
 %{__sed} -i 's|\#!/usr/bin/env python||' papyon/msnp2p/test.py
 
 
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-2
+- Add patch to fix a crasher with TypeError in b64decode.
+
 * Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-1
 - Update to 0.4.3.
 



From cwickert at fedoraproject.org  Tue Dec 29 23:51:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 29 Dec 2009 23:51:00 +0000 (UTC)
Subject: rpms/lxmusic/devel .cvsignore, 1.5, 1.6 lxmusic.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <20091229235100.4073011C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17315

Modified Files:
	.cvsignore lxmusic.spec sources 
Log Message:
* Tue Dec 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Dec 2009 23:46:50 -0000	1.5
+++ .cvsignore	29 Dec 2009 23:50:58 -0000	1.6
@@ -1 +1 @@
-lxmusic-0.4.1.tar.gz
+lxmusic-0.4.2.tar.gz


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/lxmusic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- lxmusic.spec	19 Dec 2009 23:46:51 -0000	1.8
+++ lxmusic.spec	29 Dec 2009 23:50:58 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           lxmusic
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2
+
 * Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
 - New upstream release to fix #539729, so we drop the patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Dec 2009 23:46:51 -0000	1.5
+++ sources	29 Dec 2009 23:50:58 -0000	1.6
@@ -1 +1 @@
-b5bfde825f642981d7aa2dfa2166bf1a  lxmusic-0.4.1.tar.gz
+b99b2997231091afe3a0098fcb5edcd7  lxmusic-0.4.2.tar.gz



From sailer at fedoraproject.org  Tue Dec 29 23:52:49 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue, 29 Dec 2009 23:52:49 +0000 (UTC)
Subject: rpms/ghdl/devel grt-stats.patch,NONE,1.1 ghdl.spec,1.60,1.61
Message-ID: <20091229235249.1912D11C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17610

Modified Files:
	ghdl.spec 
Added Files:
	grt-stats.patch 
Log Message:
tentative patch to fix crashes with ./tb --stats


grt-stats.patch:
 grt-cbinding.c |    6 ++++++
 grt-stats.adb  |    8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE grt-stats.patch ---
--- gcc/vhdl/grt/grt-cbinding.c.orig	2009-12-30 00:24:06.000000000 +0100
+++ gcc/vhdl/grt/grt-cbinding.c	2009-12-30 00:27:36.000000000 +0100
@@ -43,6 +43,12 @@
   fprintf (stream, "%g", val);
 }
 
+void
+__ghdl_fprintf_clock (FILE *stream, int a, int b)
+{
+  fprintf (stream, "%3d.%03d", a, b);
+}
+
 #if 1
 void
 __gnat_last_chance_handler (void)
--- gcc/vhdl/grt/grt-stats.adb.orig	2009-12-30 00:24:17.000000000 +0100
+++ gcc/vhdl/grt/grt-stats.adb	2009-12-30 00:29:20.000000000 +0100
@@ -71,10 +71,8 @@
 
    procedure Put (Stream : FILEs; Val : Clock_T)
    is
-      Fmt : constant String := "%3d.%03d" & Character'Val (0);
-
-      procedure fprintf (Stream : FILEs; Fmt : Address; A, B : Clock_T);
-      pragma Import (C, fprintf);
+      procedure Fprintf_Clock (Stream : FILEs; A, B : Integer);
+      pragma Import (C, Fprintf_Clock, "__ghdl_fprintf_clock");
 
       Sec : Clock_T;
       Ms : Clock_T;
@@ -84,7 +82,7 @@
       --  Avoid overflow.
       Ms := ((Val mod One_Second) * 1000) / One_Second;
 
-      fprintf (Stream, Fmt'Address, Sec, Ms);
+      Fprintf_Clock (Stream, Sec, Ms);
    end Put;
 
    procedure Put (Stream : FILEs; T : Time_Stats) is


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- ghdl.spec	16 Dec 2009 22:26:47 -0000	1.60
+++ ghdl.spec	29 Dec 2009 23:52:48 -0000	1.61
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.0%{?dist}
+Release: 0.%{ghdlsvnver}svn.1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,6 +27,7 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
+Patch108: grt-stats.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -132,6 +133,7 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
+%patch108 -p0 -b .grtstats
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -329,6 +331,9 @@ P64=%{buildroot}/%{_libdir}/gcc/%{gcc_ta
 
 
 %changelog
+* Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.1
+- fix crash when running ./tb --stats
+
 * Wed Dec 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.0
 - update to svn133, drop upstreamed patches
 



From sailer at fedoraproject.org  Tue Dec 29 23:59:49 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue, 29 Dec 2009 23:59:49 +0000 (UTC)
Subject: rpms/ghdl/F-12 ghdl-svn133.patch, NONE, 1.1 ghdl.spec, 1.57,
	1.58 ghdl-svn131.patch, 1.1, NONE grt-dispmemleak.patch, 1.1,
	NONE grt-processtimeoutchain.patch, 1.1, NONE
Message-ID: <20091229235949.890EB11C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18864

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn133.patch 
Removed Files:
	ghdl-svn131.patch grt-dispmemleak.patch 
	grt-processtimeoutchain.patch 
Log Message:
update to svn133, tentative fix for ./tb --stats crash


ghdl-svn133.patch:
 errorout.adb           |    6 
 ghdldrv/ghdllocal.adb  |    2 
 grt/grt-processes.adb  |  448 ++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads  |   31 +--
 grt/grt-rtis_utils.adb |    1 
 grt/grt-signals.adb    |   31 +--
 grt/grt-signals.ads    |   33 ++-
 grt/grt-types.ads      |    4 
 grt/grt-unithread.adb  |    9 
 grt/grt-unithread.ads  |    6 
 ortho-lang.c           |    2 
 version.ads            |    4 
 12 files changed, 346 insertions(+), 231 deletions(-)

--- NEW FILE ghdl-svn133.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-12-16 14:31:15.000000000 +0100
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-12-16 14:31:12.000000000 +0100
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-12-16 14:31:13.000000000 +0100
@@ -36,27 +36,30 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
-   type Process_Id_Array_Acc is access Process_Id_Array;
+   type Process_Acc_Array is array (Natural range <>) of Process_Acc;
+   type Process_Acc_Array_Acc is access Process_Acc_Array;
 
-   Resume_Process_Table : Process_Id_Array_Acc;
+   Resume_Process_Table : Process_Acc_Array_Acc;
    Last_Resume_Process : Natural := 0;
-   Postponed_Resume_Process_Table : Process_Id_Array_Acc;
+   Postponed_Resume_Process_Table : Process_Acc_Array_Acc;
    Last_Postponed_Resume_Process : Natural := 0;
 
    --  Number of postponed processes.
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within non-sensitized processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,66 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+         --  Be sure a second call won't corrupt the chain.
+         Proc.Timeout_Chain_Prev := null;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+         Proc.Timeout_Chain_Next := null;
+      end if;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +342,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +440,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +456,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +465,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +480,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +498,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +507,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +515,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +525,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +548,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -502,12 +625,12 @@
    Run_Failure : constant Integer := -1;
 
    Mt_Last : Natural;
-   Mt_Table : Process_Id_Array_Acc;
+   Mt_Table : Process_Acc_Array_Acc;
    Mt_Index : aliased Natural;
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,41 +639,36 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
    function Run_Processes (Postponed : Boolean) return Integer
    is
-      Table : Process_Id_Array_Acc;
+      Table : Process_Acc_Array_Acc;
       Last : Natural;
    begin
       if Options.Flag_Stats then
@@ -571,15 +689,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +704,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +758,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +813,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
@@ -810,9 +922,9 @@
 
       --  Allocate processes arrays.
       Resume_Process_Table :=
-        new Process_Id_Array (1 .. Nbr_Non_Postponed_Processes);
+        new Process_Acc_Array (1 .. Nbr_Non_Postponed_Processes);
       Postponed_Resume_Process_Table :=
-        new Process_Id_Array (1 .. Nbr_Postponed_Processes);
+        new Process_Acc_Array (1 .. Nbr_Postponed_Processes);
 
       Status := Run_Through_Longjump (Initialization_Phase'Access);
       if Status /= Run_Resumed then
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-12-16 14:31:13.000000000 +0100
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -146,6 +142,8 @@
 
       --  Non-sensitized process being awaked by a wait timeout.  This state
       --  is transcient.
+      --  This is necessary so that the process will exit immediately from the
+      --  wait statements without checking if the wait condition is true.
       State_Timeout,
 
       --  Non-sensitized process waiting until end.
@@ -178,8 +176,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-rtis_utils.adb ghdl-0.29dev/vhdl/grt/grt-rtis_utils.adb
--- ghdl-0.28/vhdl/grt/grt-rtis_utils.adb	2008-12-31 05:41:58.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-rtis_utils.adb	2009-12-16 14:31:13.000000000 +0100
@@ -502,6 +502,7 @@
    begin
       Rtis_Utils.Get_Value (Name, Value, Type_Rti);
       Put (Stream, Name);
+      Free (Name);
    end Disp_Value;
 
    procedure Get_Enum_Value
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-12-16 14:31:13.000000000 +0100
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-12-16 14:31:13.000000000 +0100
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-12-16 14:31:13.000000000 +0100
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-12-16 14:31:13.000000000 +0100
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-12-16 14:31:13.000000000 +0100
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/ortho-lang.c ghdl-0.29dev/vhdl/ortho-lang.c
--- ghdl-0.28/vhdl/ortho-lang.c	2008-08-28 05:29:25.000000000 +0200
+++ ghdl-0.29dev/vhdl/ortho-lang.c	2009-12-16 14:31:14.000000000 +0100
@@ -385,7 +385,7 @@
     filename = in_fnames[0];
 
   linemap_add (line_table, LC_ENTER, 0, filename ? filename :"*no-file*", 1);
-  input_location = linemap_line_start (line_table, 0, 252);
+  input_location = linemap_line_start (line_table, 1, 252);
 
   if (!lang_parse_file (filename))
     errorcount++;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-12-16 14:31:15.000000000 +0100
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-12/ghdl.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- ghdl.spec	14 Dec 2009 09:35:52 -0000	1.57
+++ ghdl.spec	29 Dec 2009 23:59:49 -0000	1.58
@@ -1,11 +1,11 @@
 %global gccver 4.3.4
 %global ghdlver 0.28
-%global ghdlsvnver 131
+%global ghdlsvnver 133
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.1%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,10 +27,7 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
-# https://gna.org/bugs/index.php?14930
-Patch108: grt-processtimeoutchain.patch
-# https://gna.org/bugs/index.php?14931
-Patch109: grt-dispmemleak.patch
+Patch108: grt-stats.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -136,8 +133,7 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
-%patch108 -p0 -b .processtimeoutchain
-%patch109 -p0 -b .dispmemleak
+%patch108 -p0 -b .grtstats
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -319,6 +315,10 @@ popd
 %{_libdir}/gcc/
 
 %changelog
+* Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.0
+- update to svn133, drop upstreamed patches
+- fix crash when running ./tb --stats
+
 * Sun Dec 13 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.1
 - Process Timeout Chain bugfix
 


--- ghdl-svn131.patch DELETED ---


--- grt-dispmemleak.patch DELETED ---


--- grt-processtimeoutchain.patch DELETED ---



From sailer at fedoraproject.org  Wed Dec 30 00:00:26 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 00:00:26 +0000 (UTC)
Subject: rpms/ghdl/F-12 grt-stats.patch,NONE,1.1
Message-ID: <20091230000026.851CE11C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19049

Added Files:
	grt-stats.patch 
Log Message:
actually commit the patch


grt-stats.patch:
 grt-cbinding.c |    6 ++++++
 grt-stats.adb  |    8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE grt-stats.patch ---
--- gcc/vhdl/grt/grt-cbinding.c.orig	2009-12-30 00:24:06.000000000 +0100
+++ gcc/vhdl/grt/grt-cbinding.c	2009-12-30 00:27:36.000000000 +0100
@@ -43,6 +43,12 @@
   fprintf (stream, "%g", val);
 }
 
+void
+__ghdl_fprintf_clock (FILE *stream, int a, int b)
+{
+  fprintf (stream, "%3d.%03d", a, b);
+}
+
 #if 1
 void
 __gnat_last_chance_handler (void)
--- gcc/vhdl/grt/grt-stats.adb.orig	2009-12-30 00:24:17.000000000 +0100
+++ gcc/vhdl/grt/grt-stats.adb	2009-12-30 00:29:20.000000000 +0100
@@ -71,10 +71,8 @@
 
    procedure Put (Stream : FILEs; Val : Clock_T)
    is
-      Fmt : constant String := "%3d.%03d" & Character'Val (0);
-
-      procedure fprintf (Stream : FILEs; Fmt : Address; A, B : Clock_T);
-      pragma Import (C, fprintf);
+      procedure Fprintf_Clock (Stream : FILEs; A, B : Integer);
+      pragma Import (C, Fprintf_Clock, "__ghdl_fprintf_clock");
 
       Sec : Clock_T;
       Ms : Clock_T;
@@ -84,7 +82,7 @@
       --  Avoid overflow.
       Ms := ((Val mod One_Second) * 1000) / One_Second;
 
-      fprintf (Stream, Fmt'Address, Sec, Ms);
+      Fprintf_Clock (Stream, Sec, Ms);
    end Put;
 
    procedure Put (Stream : FILEs; T : Time_Stats) is



From sailer at fedoraproject.org  Wed Dec 30 00:07:39 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 00:07:39 +0000 (UTC)
Subject: rpms/ghdl/F-11 ghdl-svn133.patch, NONE, 1.1 grt-stats.patch, NONE,
	1.1 ghdl.spec, 1.52, 1.53
Message-ID: <20091230000739.483DA11C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20283

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn133.patch grt-stats.patch 
Log Message:
update to svn133, tentative fix for ./tb --stats crash


ghdl-svn133.patch:
 errorout.adb           |    6 
 ghdldrv/ghdllocal.adb  |    2 
 grt/grt-processes.adb  |  448 ++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads  |   31 +--
 grt/grt-rtis_utils.adb |    1 
 grt/grt-signals.adb    |   31 +--
 grt/grt-signals.ads    |   33 ++-
 grt/grt-types.ads      |    4 
 grt/grt-unithread.adb  |    9 
 grt/grt-unithread.ads  |    6 
 ortho-lang.c           |    2 
 version.ads            |    4 
 12 files changed, 346 insertions(+), 231 deletions(-)

--- NEW FILE ghdl-svn133.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-12-16 14:31:15.000000000 +0100
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-12-16 14:31:12.000000000 +0100
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-12-16 14:31:13.000000000 +0100
@@ -36,27 +36,30 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
-   type Process_Id_Array_Acc is access Process_Id_Array;
+   type Process_Acc_Array is array (Natural range <>) of Process_Acc;
+   type Process_Acc_Array_Acc is access Process_Acc_Array;
 
-   Resume_Process_Table : Process_Id_Array_Acc;
+   Resume_Process_Table : Process_Acc_Array_Acc;
    Last_Resume_Process : Natural := 0;
-   Postponed_Resume_Process_Table : Process_Id_Array_Acc;
+   Postponed_Resume_Process_Table : Process_Acc_Array_Acc;
    Last_Postponed_Resume_Process : Natural := 0;
 
    --  Number of postponed processes.
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within non-sensitized processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,66 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+         --  Be sure a second call won't corrupt the chain.
+         Proc.Timeout_Chain_Prev := null;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+         Proc.Timeout_Chain_Next := null;
+      end if;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +342,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +440,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +456,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +465,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +480,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +498,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +507,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +515,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +525,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +548,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -502,12 +625,12 @@
    Run_Failure : constant Integer := -1;
 
    Mt_Last : Natural;
-   Mt_Table : Process_Id_Array_Acc;
+   Mt_Table : Process_Acc_Array_Acc;
    Mt_Index : aliased Natural;
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,41 +639,36 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
    function Run_Processes (Postponed : Boolean) return Integer
    is
-      Table : Process_Id_Array_Acc;
+      Table : Process_Acc_Array_Acc;
       Last : Natural;
    begin
       if Options.Flag_Stats then
@@ -571,15 +689,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +704,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +758,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +813,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
@@ -810,9 +922,9 @@
 
       --  Allocate processes arrays.
       Resume_Process_Table :=
-        new Process_Id_Array (1 .. Nbr_Non_Postponed_Processes);
+        new Process_Acc_Array (1 .. Nbr_Non_Postponed_Processes);
       Postponed_Resume_Process_Table :=
-        new Process_Id_Array (1 .. Nbr_Postponed_Processes);
+        new Process_Acc_Array (1 .. Nbr_Postponed_Processes);
 
       Status := Run_Through_Longjump (Initialization_Phase'Access);
       if Status /= Run_Resumed then
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-12-16 14:31:13.000000000 +0100
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -146,6 +142,8 @@
 
       --  Non-sensitized process being awaked by a wait timeout.  This state
       --  is transcient.
+      --  This is necessary so that the process will exit immediately from the
+      --  wait statements without checking if the wait condition is true.
       State_Timeout,
 
       --  Non-sensitized process waiting until end.
@@ -178,8 +176,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-rtis_utils.adb ghdl-0.29dev/vhdl/grt/grt-rtis_utils.adb
--- ghdl-0.28/vhdl/grt/grt-rtis_utils.adb	2008-12-31 05:41:58.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-rtis_utils.adb	2009-12-16 14:31:13.000000000 +0100
@@ -502,6 +502,7 @@
    begin
       Rtis_Utils.Get_Value (Name, Value, Type_Rti);
       Put (Stream, Name);
+      Free (Name);
    end Disp_Value;
 
    procedure Get_Enum_Value
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-12-16 14:31:13.000000000 +0100
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-12-16 14:31:13.000000000 +0100
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-12-16 14:31:13.000000000 +0100
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-12-16 14:31:13.000000000 +0100
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-12-16 14:31:13.000000000 +0100
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/ortho-lang.c ghdl-0.29dev/vhdl/ortho-lang.c
--- ghdl-0.28/vhdl/ortho-lang.c	2008-08-28 05:29:25.000000000 +0200
+++ ghdl-0.29dev/vhdl/ortho-lang.c	2009-12-16 14:31:14.000000000 +0100
@@ -385,7 +385,7 @@
     filename = in_fnames[0];
 
   linemap_add (line_table, LC_ENTER, 0, filename ? filename :"*no-file*", 1);
-  input_location = linemap_line_start (line_table, 0, 252);
+  input_location = linemap_line_start (line_table, 1, 252);
 
   if (!lang_parse_file (filename))
     errorcount++;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-12-16 14:31:15.000000000 +0100
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;

grt-stats.patch:
 grt-cbinding.c |    6 ++++++
 grt-stats.adb  |    8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE grt-stats.patch ---
--- gcc/vhdl/grt/grt-cbinding.c.orig	2009-12-30 00:24:06.000000000 +0100
+++ gcc/vhdl/grt/grt-cbinding.c	2009-12-30 00:27:36.000000000 +0100
@@ -43,6 +43,12 @@
   fprintf (stream, "%g", val);
 }
 
+void
+__ghdl_fprintf_clock (FILE *stream, int a, int b)
+{
+  fprintf (stream, "%3d.%03d", a, b);
+}
+
 #if 1
 void
 __gnat_last_chance_handler (void)
--- gcc/vhdl/grt/grt-stats.adb.orig	2009-12-30 00:24:17.000000000 +0100
+++ gcc/vhdl/grt/grt-stats.adb	2009-12-30 00:29:20.000000000 +0100
@@ -71,10 +71,8 @@
 
    procedure Put (Stream : FILEs; Val : Clock_T)
    is
-      Fmt : constant String := "%3d.%03d" & Character'Val (0);
-
-      procedure fprintf (Stream : FILEs; Fmt : Address; A, B : Clock_T);
-      pragma Import (C, fprintf);
+      procedure Fprintf_Clock (Stream : FILEs; A, B : Clock_T);
+      pragma Import (C, Fprintf_Clock, "__ghdl_fprintf_clock");
 
       Sec : Clock_T;
       Ms : Clock_T;
@@ -84,7 +82,7 @@
       --  Avoid overflow.
       Ms := ((Val mod One_Second) * 1000) / One_Second;
 
-      fprintf (Stream, Fmt'Address, Sec, Ms);
+      Fprintf_Clock (Stream, Sec, Ms);
    end Put;
 
    procedure Put (Stream : FILEs; T : Time_Stats) is


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/ghdl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ghdl.spec	14 Dec 2009 09:40:35 -0000	1.52
+++ ghdl.spec	30 Dec 2009 00:07:38 -0000	1.53
@@ -1,11 +1,11 @@
 %global gccver 4.3.4
 %global ghdlver 0.28
-%global ghdlsvnver 131
+%global ghdlsvnver 133
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.1%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -27,10 +27,7 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
-# https://gna.org/bugs/index.php?14930
-Patch108: grt-processtimeoutchain.patch
-# https://gna.org/bugs/index.php?14931
-Patch109: grt-dispmemleak.patch
+Patch108: grt-stats.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -136,8 +133,7 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
-%patch108 -p0 -b .processtimeoutchain
-%patch109 -p0 -b .dispmemleak
+%patch108 -p0 -b .grtstats
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -320,6 +316,10 @@ popd
 
 
 %changelog
+* Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.0
+- update to svn133, drop upstreamed patches
+- fix crash when running ./tb --stats
+
 * Mon Dec 14 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.131svn.1
 - Process Timeout Chain bugfix
 



From sailer at fedoraproject.org  Wed Dec 30 00:12:53 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 00:12:53 +0000 (UTC)
Subject: rpms/ghdl/F-12 grt-stats.patch,1.1,1.2
Message-ID: <20091230001253.1B27E11C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21230

Modified Files:
	grt-stats.patch 
Log Message:
fix patch


grt-stats.patch:
 grt-cbinding.c |    6 ++++++
 grt-stats.adb  |    8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

Index: grt-stats.patch
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-12/grt-stats.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- grt-stats.patch	30 Dec 2009 00:00:26 -0000	1.1
+++ grt-stats.patch	30 Dec 2009 00:12:52 -0000	1.2
@@ -23,7 +23,7 @@
 -
 -      procedure fprintf (Stream : FILEs; Fmt : Address; A, B : Clock_T);
 -      pragma Import (C, fprintf);
-+      procedure Fprintf_Clock (Stream : FILEs; A, B : Integer);
++      procedure Fprintf_Clock (Stream : FILEs; A, B : Clock_T);
 +      pragma Import (C, Fprintf_Clock, "__ghdl_fprintf_clock");
  
        Sec : Clock_T;



From sailer at fedoraproject.org  Wed Dec 30 00:13:14 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 00:13:14 +0000 (UTC)
Subject: rpms/ghdl/devel grt-stats.patch,1.1,1.2
Message-ID: <20091230001314.CB33511C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21316

Modified Files:
	grt-stats.patch 
Log Message:
fix patch


grt-stats.patch:
 grt-cbinding.c |    6 ++++++
 grt-stats.adb  |    8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

Index: grt-stats.patch
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/grt-stats.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- grt-stats.patch	29 Dec 2009 23:52:48 -0000	1.1
+++ grt-stats.patch	30 Dec 2009 00:13:14 -0000	1.2
@@ -23,7 +23,7 @@
 -
 -      procedure fprintf (Stream : FILEs; Fmt : Address; A, B : Clock_T);
 -      pragma Import (C, fprintf);
-+      procedure Fprintf_Clock (Stream : FILEs; A, B : Integer);
++      procedure Fprintf_Clock (Stream : FILEs; A, B : Clock_T);
 +      pragma Import (C, Fprintf_Clock, "__ghdl_fprintf_clock");
  
        Sec : Clock_T;



From sailer at fedoraproject.org  Wed Dec 30 00:29:53 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 00:29:53 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl.spec,1.61,1.62
Message-ID: <20091230002953.34BB511C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24307

Modified Files:
	ghdl.spec 
Log Message:
add upstream bug number



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- ghdl.spec	29 Dec 2009 23:52:48 -0000	1.61
+++ ghdl.spec	30 Dec 2009 00:29:51 -0000	1.62
@@ -27,6 +27,7 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
+# https://gna.org/bugs/index.php?15015
 Patch108: grt-stats.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info



From sailer at fedoraproject.org  Wed Dec 30 00:30:48 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 00:30:48 +0000 (UTC)
Subject: rpms/ghdl/F-12 ghdl.spec,1.58,1.59
Message-ID: <20091230003048.DEA8411C02BB@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24511/F-12

Modified Files:
	ghdl.spec 
Log Message:
add upstream bug number



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-12/ghdl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ghdl.spec	29 Dec 2009 23:59:49 -0000	1.58
+++ ghdl.spec	30 Dec 2009 00:30:48 -0000	1.59
@@ -27,6 +27,7 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
+# https://gna.org/bugs/index.php?15015
 Patch108: grt-stats.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info



From sailer at fedoraproject.org  Wed Dec 30 00:30:48 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 00:30:48 +0000 (UTC)
Subject: rpms/ghdl/F-11 ghdl.spec,1.53,1.54
Message-ID: <20091230003048.983A111C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24511/F-11

Modified Files:
	ghdl.spec 
Log Message:
add upstream bug number



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/ghdl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ghdl.spec	30 Dec 2009 00:07:38 -0000	1.53
+++ ghdl.spec	30 Dec 2009 00:30:48 -0000	1.54
@@ -27,6 +27,7 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
+# https://gna.org/bugs/index.php?15015
 Patch108: grt-stats.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info



From cwickert at fedoraproject.org  Wed Dec 30 00:41:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Dec 2009 00:41:24 +0000 (UTC)
Subject: rpms/lxmusic/F-12 .cvsignore, 1.5, 1.6 lxmusic.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <20091230004124.4065711C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxmusic/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26637

Modified Files:
	.cvsignore lxmusic.spec sources 
Log Message:
* Tue Dec 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Dec 2009 23:46:49 -0000	1.5
+++ .cvsignore	30 Dec 2009 00:41:22 -0000	1.6
@@ -1 +1 @@
-lxmusic-0.4.1.tar.gz
+lxmusic-0.4.2.tar.gz


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-12/lxmusic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- lxmusic.spec	19 Dec 2009 23:46:49 -0000	1.7
+++ lxmusic.spec	30 Dec 2009 00:41:22 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           lxmusic
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2
+
 * Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
 - New upstream release to fix #539729, so we drop the patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Dec 2009 23:46:49 -0000	1.5
+++ sources	30 Dec 2009 00:41:22 -0000	1.6
@@ -1 +1 @@
-b5bfde825f642981d7aa2dfa2166bf1a  lxmusic-0.4.1.tar.gz
+b99b2997231091afe3a0098fcb5edcd7  lxmusic-0.4.2.tar.gz



From sailer at fedoraproject.org  Wed Dec 30 01:57:27 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 01:57:27 +0000 (UTC)
Subject: rpms/ghdl/devel grt-processtimeoutchain.patch, 1.2, 1.3 ghdl.spec,
	1.62, 1.63
Message-ID: <20091230015727.35EF911C00E8@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8759

Modified Files:
	ghdl.spec 
Added Files:
	grt-processtimeoutchain.patch 
Log Message:
fix the process timeout chain bugfix


grt-processtimeoutchain.patch:
 grt-processes.adb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: grt-processtimeoutchain.patch
===================================================================
RCS file: grt-processtimeoutchain.patch
diff -N grt-processtimeoutchain.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ grt-processtimeoutchain.patch	30 Dec 2009 01:57:26 -0000	1.3
@@ -0,0 +1,20 @@
+--- gcc/vhdl/grt/grt-processes.adb.orig	2009-12-30 02:51:24.000000000 +0100
++++ gcc/vhdl/grt/grt-processes.adb	2009-12-30 02:52:27.000000000 +0100
+@@ -304,8 +304,6 @@
+       if Proc.Timeout_Chain_Prev /= null then
+          Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+            Proc.Timeout_Chain_Next;
+-         --  Be sure a second call won't corrupt the chain.
+-         Proc.Timeout_Chain_Prev := null;
+       elsif Process_Timeout_Chain = Proc then
+          --  Only if Proc is in the chain.
+          Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+@@ -315,6 +313,8 @@
+            Proc.Timeout_Chain_Prev;
+          Proc.Timeout_Chain_Next := null;
+       end if;
++      --  Be sure a second call won't corrupt the chain.
++      Proc.Timeout_Chain_Prev := null;
+    end Remove_Process_From_Timeout_Chain;
+ 
+    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- ghdl.spec	30 Dec 2009 00:29:51 -0000	1.62
+++ ghdl.spec	30 Dec 2009 01:57:25 -0000	1.63
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.1%{?dist}
+Release: 0.%{ghdlsvnver}svn.2%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -29,6 +29,8 @@ Patch106: ghdl-ppc64abort.patch
 Patch107: ieee-mathreal.patch
 # https://gna.org/bugs/index.php?15015
 Patch108: grt-stats.patch
+# https://gna.org/bugs/index.php?14930                                     
+Patch109: grt-processtimeoutchain.patch                                    
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -135,6 +137,7 @@ popd
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
 %patch108 -p0 -b .grtstats
+%patch109 -p0 -b .processtimeoutchain
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -332,6 +335,9 @@ P64=%{buildroot}/%{_libdir}/gcc/%{gcc_ta
 
 
 %changelog
+* Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.2
+- fix the Process Timeout Chain bugfix
+
 * Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.1
 - fix crash when running ./tb --stats
 



From stahnma at fedoraproject.org  Wed Dec 30 03:43:39 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed, 30 Dec 2009 03:43:39 +0000 (UTC)
Subject: File mediawiki-LdapAccount-0.1.tar.gz uploaded to lookaside cache by
	stahnma
Message-ID: <20091230034339.4E8F710F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for mediawiki-LdapAccount:

2a9f23873084420f9179d3e2dfb30075  mediawiki-LdapAccount-0.1.tar.gz



From stahnma at fedoraproject.org  Wed Dec 30 03:44:06 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed, 30 Dec 2009 03:44:06 +0000 (UTC)
Subject: rpms/mediawiki-LdapAccount/devel import.log, NONE,
	1.1 mediawiki-LdapAccount.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091230034406.667A611C00E8@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/pkgs/rpms/mediawiki-LdapAccount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27244/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mediawiki-LdapAccount.spec 
Log Message:
Initial import of mediawiki-LdapAccount


--- NEW FILE import.log ---
mediawiki-LdapAccount-0_1-1_fc11:HEAD:mediawiki-LdapAccount-0.1-1.fc11.src.rpm:1262144593


--- NEW FILE mediawiki-LdapAccount.spec ---
%define extname LdapAccount
Name:           mediawiki-%{extname}
Version:        0.1
Release:        1%{?dist}
Summary:        Use LDAP as account source for medaiwiki

Group:          Development/Tools
License:        WTFPL
URL:            http://github.com/stahnma/mediawiki-LdapAccount
Source0:        http://downloads.sourceforge.net/mw-ldapaccount/mediawiki-%{extname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       mediawiki >= 1.13, php-ldap

%description
Restrict mediawiki to using LDAP accounts only, creates account based on 
LDAP information and authenticates using LDAP.


%prep
ls

%setup -q 


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/%{extname}
install -p  -m644 SOURCES/LdapAccount.php $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/%{extname}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_datadir}/mediawiki/extensions/%{extname}

%changelog
* Tue Dec 12 2009 <stahnma at fedoraproject.org>  - 0.1-1
- Initial Fedora Spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-LdapAccount/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Dec 2009 19:44:18 -0000	1.1
+++ .cvsignore	30 Dec 2009 03:44:05 -0000	1.2
@@ -0,0 +1 @@
+mediawiki-LdapAccount-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-LdapAccount/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:44:18 -0000	1.1
+++ sources	30 Dec 2009 03:44:05 -0000	1.2
@@ -0,0 +1 @@
+2a9f23873084420f9179d3e2dfb30075  mediawiki-LdapAccount-0.1.tar.gz



From jjames at fedoraproject.org  Wed Dec 30 03:45:51 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 30 Dec 2009 03:45:51 +0000 (UTC)
Subject: File latexmk-412.zip uploaded to lookaside cache by jjames
Message-ID: <20091230034551.4CA7110F8BE@bastion.fedoraproject.org>

A file has been added to the lookaside cache for latexmk:

03cdd242563e48fa6a094effa9c0966e  latexmk-412.zip



From jjames at fedoraproject.org  Wed Dec 30 03:47:37 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 30 Dec 2009 03:47:37 +0000 (UTC)
Subject: rpms/latexmk/F-11 .cvsignore, 1.11, 1.12 latexmk.conf, 1.5,
	1.6 latexmk.spec, 1.13, 1.14 sources, 1.11, 1.12
Message-ID: <20091230034737.A33A211C00E8@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28135/F-11

Modified Files:
	.cvsignore latexmk.conf latexmk.spec sources 
Log Message:
* Tue Dec 29 2009 Jerry James <loganjerry at gmail.com> - 4.12-1
- Update to 4.12 to get new option to not run bibtex.
- Add a missing semicolon to the conf file (bz 551082).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Dec 2009 16:32:27 -0000	1.11
+++ .cvsignore	30 Dec 2009 03:47:37 -0000	1.12
@@ -1 +1 @@
-latexmk-411.zip
+latexmk-412.zip


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/latexmk.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- latexmk.conf	1 Dec 2009 16:32:27 -0000	1.5
+++ latexmk.conf	30 Dec 2009 03:47:37 -0000	1.6
@@ -179,7 +179,7 @@ $dvi_update_method = 1;
 
 # Set to 1 to give special treatment to Ctrl-c and Ctrl-Break in -pvc mode on
 # Windows.  This is unnecessary on Unix platforms.
-$MSWin_fudge_break = 0
+$MSWin_fudge_break = 0;
 
 # This variable is used only when running in continuous-preview mode.  If zero,
 # check for a previously running previewer on the same file and update it.  If


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/latexmk.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- latexmk.spec	1 Dec 2009 16:32:27 -0000	1.13
+++ latexmk.spec	30 Dec 2009 03:47:37 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.11
+Version:        4.12
 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-411.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-412.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Tue Dec 29 2009 Jerry James <loganjerry at gmail.com> - 4.12-1
+- Update to 4.12 to get new option to not run bibtex.
+- Add a missing semicolon to the conf file (bz 551082).
+
 * Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
 - Update to 4.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Dec 2009 16:32:27 -0000	1.11
+++ sources	30 Dec 2009 03:47:37 -0000	1.12
@@ -1 +1 @@
-6f2dedf6192a8bbc9be7a86f4cde2a3b  latexmk-411.zip
+03cdd242563e48fa6a094effa9c0966e  latexmk-412.zip



From jjames at fedoraproject.org  Wed Dec 30 03:47:37 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 30 Dec 2009 03:47:37 +0000 (UTC)
Subject: rpms/latexmk/F-12 .cvsignore, 1.11, 1.12 latexmk.conf, 1.5,
	1.6 latexmk.spec, 1.14, 1.15 sources, 1.11, 1.12
Message-ID: <20091230034737.E111F11C00E8@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28135/F-12

Modified Files:
	.cvsignore latexmk.conf latexmk.spec sources 
Log Message:
* Tue Dec 29 2009 Jerry James <loganjerry at gmail.com> - 4.12-1
- Update to 4.12 to get new option to not run bibtex.
- Add a missing semicolon to the conf file (bz 551082).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Dec 2009 16:32:27 -0000	1.11
+++ .cvsignore	30 Dec 2009 03:47:37 -0000	1.12
@@ -1 +1 @@
-latexmk-411.zip
+latexmk-412.zip


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/latexmk.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- latexmk.conf	1 Dec 2009 16:32:27 -0000	1.5
+++ latexmk.conf	30 Dec 2009 03:47:37 -0000	1.6
@@ -179,7 +179,7 @@ $dvi_update_method = 1;
 
 # Set to 1 to give special treatment to Ctrl-c and Ctrl-Break in -pvc mode on
 # Windows.  This is unnecessary on Unix platforms.
-$MSWin_fudge_break = 0
+$MSWin_fudge_break = 0;
 
 # This variable is used only when running in continuous-preview mode.  If zero,
 # check for a previously running previewer on the same file and update it.  If


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/latexmk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- latexmk.spec	1 Dec 2009 16:32:27 -0000	1.14
+++ latexmk.spec	30 Dec 2009 03:47:37 -0000	1.15
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.11
+Version:        4.12
 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-411.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-412.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Tue Dec 29 2009 Jerry James <loganjerry at gmail.com> - 4.12-1
+- Update to 4.12 to get new option to not run bibtex.
+- Add a missing semicolon to the conf file (bz 551082).
+
 * Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
 - Update to 4.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Dec 2009 16:32:27 -0000	1.11
+++ sources	30 Dec 2009 03:47:37 -0000	1.12
@@ -1 +1 @@
-6f2dedf6192a8bbc9be7a86f4cde2a3b  latexmk-411.zip
+03cdd242563e48fa6a094effa9c0966e  latexmk-412.zip



From jjames at fedoraproject.org  Wed Dec 30 03:47:38 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 30 Dec 2009 03:47:38 +0000 (UTC)
Subject: rpms/latexmk/devel .cvsignore, 1.11, 1.12 latexmk.conf, 1.5,
	1.6 latexmk.spec, 1.14, 1.15 sources, 1.11, 1.12
Message-ID: <20091230034738.35F6611C00E8@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28135/devel

Modified Files:
	.cvsignore latexmk.conf latexmk.spec sources 
Log Message:
* Tue Dec 29 2009 Jerry James <loganjerry at gmail.com> - 4.12-1
- Update to 4.12 to get new option to not run bibtex.
- Add a missing semicolon to the conf file (bz 551082).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Dec 2009 16:32:27 -0000	1.11
+++ .cvsignore	30 Dec 2009 03:47:37 -0000	1.12
@@ -1 +1 @@
-latexmk-411.zip
+latexmk-412.zip


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- latexmk.conf	1 Dec 2009 16:32:27 -0000	1.5
+++ latexmk.conf	30 Dec 2009 03:47:37 -0000	1.6
@@ -179,7 +179,7 @@ $dvi_update_method = 1;
 
 # Set to 1 to give special treatment to Ctrl-c and Ctrl-Break in -pvc mode on
 # Windows.  This is unnecessary on Unix platforms.
-$MSWin_fudge_break = 0
+$MSWin_fudge_break = 0;
 
 # This variable is used only when running in continuous-preview mode.  If zero,
 # check for a previously running previewer on the same file and update it.  If


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- latexmk.spec	1 Dec 2009 16:32:27 -0000	1.14
+++ latexmk.spec	30 Dec 2009 03:47:37 -0000	1.15
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.11
+Version:        4.12
 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-411.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-412.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Tue Dec 29 2009 Jerry James <loganjerry at gmail.com> - 4.12-1
+- Update to 4.12 to get new option to not run bibtex.
+- Add a missing semicolon to the conf file (bz 551082).
+
 * Tue Dec  1 2009 Jerry James <loganjerry at gmail.com> - 4.11-1
 - Update to 4.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Dec 2009 16:32:27 -0000	1.11
+++ sources	30 Dec 2009 03:47:38 -0000	1.12
@@ -1 +1 @@
-6f2dedf6192a8bbc9be7a86f4cde2a3b  latexmk-411.zip
+03cdd242563e48fa6a094effa9c0966e  latexmk-412.zip



From stahnma at fedoraproject.org  Wed Dec 30 03:51:31 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed, 30 Dec 2009 03:51:31 +0000 (UTC)
Subject: rpms/mediawiki-LdapAccount/EL-5 mediawiki-LdapAccount.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091230035131.D31B211C00E8@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/pkgs/rpms/mediawiki-LdapAccount/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29097/EL-5

Modified Files:
	sources 
Added Files:
	mediawiki-LdapAccount.spec 
Log Message:
Adding brnaches for EL-5 F12


--- NEW FILE mediawiki-LdapAccount.spec ---
%define extname LdapAccount
Name:           mediawiki-%{extname}
Version:        0.1
Release:        1%{?dist}
Summary:        Use LDAP as account source for medaiwiki

Group:          Development/Tools
License:        WTFPL
URL:            http://github.com/stahnma/mediawiki-LdapAccount
Source0:        http://downloads.sourceforge.net/mw-ldapaccount/mediawiki-%{extname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       mediawiki >= 1.13, php-ldap

%description
Restrict mediawiki to using LDAP accounts only, creates account based on 
LDAP information and authenticates using LDAP.


%prep
ls

%setup -q 


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/%{extname}
install -p  -m644 SOURCES/LdapAccount.php $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/%{extname}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_datadir}/mediawiki/extensions/%{extname}

%changelog
* Tue Dec 12 2009 <stahnma at fedoraproject.org>  - 0.1-1
- Initial Fedora Spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-LdapAccount/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:44:18 -0000	1.1
+++ sources	30 Dec 2009 03:51:31 -0000	1.2
@@ -0,0 +1 @@
+2a9f23873084420f9179d3e2dfb30075  mediawiki-LdapAccount-0.1.tar.gz



From stahnma at fedoraproject.org  Wed Dec 30 03:51:32 2009
From: stahnma at fedoraproject.org (Michael Stahnke)
Date: Wed, 30 Dec 2009 03:51:32 +0000 (UTC)
Subject: rpms/mediawiki-LdapAccount/F-12 mediawiki-LdapAccount.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091230035132.0D98011C00E8@cvs1.fedora.phx.redhat.com>

Author: stahnma

Update of /cvs/pkgs/rpms/mediawiki-LdapAccount/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29097/F-12

Modified Files:
	sources 
Added Files:
	mediawiki-LdapAccount.spec 
Log Message:
Adding brnaches for EL-5 F12


--- NEW FILE mediawiki-LdapAccount.spec ---
%define extname LdapAccount
Name:           mediawiki-%{extname}
Version:        0.1
Release:        1%{?dist}
Summary:        Use LDAP as account source for medaiwiki

Group:          Development/Tools
License:        WTFPL
URL:            http://github.com/stahnma/mediawiki-LdapAccount
Source0:        http://downloads.sourceforge.net/mw-ldapaccount/mediawiki-%{extname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       mediawiki >= 1.13, php-ldap

%description
Restrict mediawiki to using LDAP accounts only, creates account based on 
LDAP information and authenticates using LDAP.


%prep
ls

%setup -q 


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/%{extname}
install -p  -m644 SOURCES/LdapAccount.php $RPM_BUILD_ROOT%{_datadir}/mediawiki/extensions/%{extname}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_datadir}/mediawiki/extensions/%{extname}

%changelog
* Tue Dec 12 2009 <stahnma at fedoraproject.org>  - 0.1-1
- Initial Fedora Spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki-LdapAccount/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Dec 2009 19:44:18 -0000	1.1
+++ sources	30 Dec 2009 03:51:31 -0000	1.2
@@ -0,0 +1 @@
+2a9f23873084420f9179d3e2dfb30075  mediawiki-LdapAccount-0.1.tar.gz



From huzaifas at fedoraproject.org  Wed Dec 30 04:06:46 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 30 Dec 2009 04:06:46 +0000 (UTC)
Subject: File gnumeric-1.9.17.tar.bz2 uploaded to lookaside cache by huzaifas
Message-ID: <20091230040646.B9C5110F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnumeric:

675f3a59c278e2d329c33d985da53cde  gnumeric-1.9.17.tar.bz2



From huzaifas at fedoraproject.org  Wed Dec 30 04:09:01 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 30 Dec 2009 04:09:01 +0000 (UTC)
Subject: rpms/gnumeric/devel .cvsignore, 1.9, 1.10 gnumeric.spec, 1.50,
	1.51 sources, 1.9, 1.10
Message-ID: <20091230040901.9088411C00E9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24307

Modified Files:
	.cvsignore gnumeric.spec sources 
Log Message:
Update to 1.9.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Dec 2009 05:01:42 -0000	1.9
+++ .cvsignore	30 Dec 2009 04:09:01 -0000	1.10
@@ -1 +1 @@
-gnumeric-1.9.16.tar.bz2
+gnumeric-1.9.17.tar.bz2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gnumeric.spec	6 Dec 2009 23:10:07 -0000	1.50
+++ gnumeric.spec	30 Dec 2009 04:09:01 -0000	1.51
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
-Version:          1.9.16
-Release:          2%{?dist}
+Version:          1.9.17
+Release:          1%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -189,6 +189,9 @@ fi
 
 
 %changelog
+* Wed Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.9.17-1
+- Upstream bump to 1.9.17
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.9.16-2
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Dec 2009 05:01:42 -0000	1.9
+++ sources	30 Dec 2009 04:09:01 -0000	1.10
@@ -1 +1 @@
-9a55644196b0edbc638da97173983c1d  gnumeric-1.9.16.tar.bz2
+675f3a59c278e2d329c33d985da53cde  gnumeric-1.9.17.tar.bz2



From huzaifas at fedoraproject.org  Wed Dec 30 04:19:49 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 30 Dec 2009 04:19:49 +0000 (UTC)
Subject: File goffice-0.7.17.tar.bz2 uploaded to lookaside cache by huzaifas
Message-ID: <20091230041949.16B6810F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for goffice:

969f3e1fb5c9e1740346b00ae428f4c9  goffice-0.7.17.tar.bz2



From huzaifas at fedoraproject.org  Wed Dec 30 04:21:19 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 30 Dec 2009 04:21:19 +0000 (UTC)
Subject: rpms/goffice/devel .cvsignore, 1.10, 1.11 goffice.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20091230042119.74BDB11C00E9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/goffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26921

Modified Files:
	.cvsignore goffice.spec sources 
Log Message:
Update to 0.7.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	31 Jan 2009 13:09:48 -0000	1.10
+++ .cvsignore	30 Dec 2009 04:21:18 -0000	1.11
@@ -1 +1 @@
-goffice-0.6.6.tar.bz2
+goffice-0.7.17.tar.bz2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- goffice.spec	1 Dec 2009 05:11:20 -0000	1.27
+++ goffice.spec	30 Dec 2009 04:21:18 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           goffice         
-Version:        0.7.16
-Release:        2%{?dist}
+Version:        0.7.17
+Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -77,9 +77,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 0.7.17-1
+- New upstream version
+
 * Tue Dec 01 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 0.7.16-2
 - New build
 - Version bump
+
 * Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> - 0.6.6-4
 - Applied 3 patches from the 0.6 branch (#503068, #505001)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Dec 2009 05:03:53 -0000	1.11
+++ sources	30 Dec 2009 04:21:18 -0000	1.12
@@ -1 +1 @@
-cbd33205a734c7eb857d892f91a4fe33  goffice-0.7.16.tar.bz2
+969f3e1fb5c9e1740346b00ae428f4c9  goffice-0.7.17.tar.bz2



From huzaifas at fedoraproject.org  Wed Dec 30 05:46:21 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 30 Dec 2009 05:46:21 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric-gbz-605043.patch, NONE, 1.1 gnumeric.spec,
	1.51, 1.52
Message-ID: <20091230054621.EF99E11C00E9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12902

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-gbz-605043.patch 
Log Message:
Add new patch

gnumeric-gbz-605043.patch:
 ChangeLog  |    5 +++++
 ms-chart.c |   45 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 47 insertions(+), 3 deletions(-)

--- NEW FILE gnumeric-gbz-605043.patch ---
>From 798e12600274cd5d3d21ba4f15d183582e998432 Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Mon, 21 Dec 2009 21:21:29 +0000
Subject: Fix import export of line type in scatter plots. [#605043]

---
 
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 282f593..dfed1ee 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-21  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* ms-chart.c (lineformat), (chart_write_LINEFORMAT): fix import export
+	of line type in scatter plots. [#605043]
+
 2009-12-15  Morten Welinder <terra at gnome.org>
 
 	* Release 1.9.17
diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c
index 1a4cd2d..a63fb39 100644
--- a/plugins/excel/ms-chart.c
+++ b/plugins/excel/ms-chart.c
@@ -1357,7 +1357,45 @@ BC_R(lineformat)(XLChartHandler const *handle,
 	d (0, g_printerr ("Lines have a %s pattern.\n",
 		       ms_line_pattern [pattern]););
 
-	s->style->line.dash_type = ms_escher_xl_to_line_type (pattern);
+	switch (pattern) {
+	default: 
+	case 0:
+		s->style->line.dash_type = GO_LINE_SOLID;
+		break;	
+	case 1:
+		s->style->line.dash_type = GO_LINE_DASH;
+		break;	
+	case 2:
+		s->style->line.dash_type = GO_LINE_DOT;
+		break;	
+	case 3:
+		s->style->line.dash_type = GO_LINE_DASH_DOT;
+		break;	
+	case 4:
+		s->style->line.dash_type = GO_LINE_DASH_DOT_DOT;
+		break;	
+	case 5:
+		s->style->line.dash_type = GO_LINE_NONE;
+		break;
+/* we don't really support the other styles, although GOStyle would allow that now */
+#if 0
+	case 6:
+		s->style->line.dash_type = GO_LINE_SOLID;
+		s->style->line.pattern = GO_PATTERN_GREY25; /* or 75? */
+		s->style->line.fore = GO_COLOR_WHITE;
+		break;	
+	case 7:
+		s->style->line.dash_type = GO_LINE_SOLID;
+		s->style->line.pattern = GO_PATTERN_GREY50;
+		s->style->line.fore = GO_COLOR_WHITE;
+		break;	
+	case 8:
+		s->style->line.dash_type = GO_LINE_SOLID;
+		s->style->line.pattern = GO_PATTERN_GREY75; /* or 25? */
+		s->style->line.fore = GO_COLOR_WHITE;
+		break;
+#endif
+	}
 
 	if (BC_R(ver)(s) >= MS_BIFF_V8 && s->currentSeries != NULL) {
 		guint16 const fore = GSF_LE_GET_GUINT16 (q->data + 10);
@@ -3976,8 +4014,9 @@ chart_write_LINEFORMAT (XLChartWriteState *s, GOStyleLine const *lstyle,
 			w = 1;	/* medium */
 		else
 			w = 2;	/* wide */
-		if (lstyle->auto_color)
-			flags |= 9;	/* docs only mention 1, but there is an 8 in there too */
+		/* seems that excel understand auto as solid, so if pattern is not solid
+		   do not set the auto flag, see #605043 */
+		flags |= (lstyle->auto_color && pat > 0)? 9: 8;	/* docs only mention 1, but there is an 8 in there too */
 	} else {
 		color_index = chart_write_color (s, data, 0);
 		if (clear_lines_for_null) {



Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- gnumeric.spec	30 Dec 2009 04:09:01 -0000	1.51
+++ gnumeric.spec	30 Dec 2009 05:46:20 -0000	1.52
@@ -9,13 +9,14 @@ Group:            Applications/Productiv
 License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
+Patch0:           gnumeric-gbz-605043.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
 BuildRequires:    libgsf-gnome-devel >= 1.13.2
 #BuildRequires:    libgnomedb-devel >= 3.0.0
 BuildRequires:    pygtk2-devel >= 2.6.0
-BuildRequires:    goffice-devel >= 0.7
+BuildRequires:    goffice-devel >= 0.7.17
 BuildRequires:    python-devel guile-devel perl(XML::Parser) scrollkeeper
 BuildRequires:    gettext desktop-file-utils perl(ExtUtils::Embed) intltool
 Requires:         scrollkeeper hicolor-icon-theme
@@ -57,6 +58,7 @@ This package contains the following addi
 
 %prep
 %setup -q
+%patch0 -p1
 
 chmod -x plugins/excel/rc4.?
 
@@ -191,6 +193,8 @@ fi
 %changelog
 * Wed Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.9.17-1
 - Upstream bump to 1.9.17
+- Apply gnome bz patch #605043
+- BR goffice-devel >= 1.7.17
 
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.9.16-2
 - rebuild against perl 5.10.1



From huzaifas at fedoraproject.org  Wed Dec 30 05:47:04 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 30 Dec 2009 05:47:04 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric.spec,1.52,1.53
Message-ID: <20091230054704.ACE5311C00E9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13076

Modified Files:
	gnumeric.spec 
Log Message:
Add new patch


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gnumeric.spec	30 Dec 2009 05:46:20 -0000	1.52
+++ gnumeric.spec	30 Dec 2009 05:47:04 -0000	1.53
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.9.17
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -191,7 +191,7 @@ fi
 
 
 %changelog
-* Wed Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.9.17-1
+* Wed Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.9.17-2
 - Upstream bump to 1.9.17
 - Apply gnome bz patch #605043
 - BR goffice-devel >= 1.7.17



From huzaifas at fedoraproject.org  Wed Dec 30 05:59:12 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed, 30 Dec 2009 05:59:12 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric.spec,1.53,1.54
Message-ID: <20091230055912.2190411C00E9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15876

Modified Files:
	gnumeric.spec 
Log Message:
Change goffice plugins loc


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gnumeric.spec	30 Dec 2009 05:47:04 -0000	1.53
+++ gnumeric.spec	30 Dec 2009 05:59:11 -0000	1.54
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.9.17
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -184,17 +184,18 @@ fi
 %files plugins-extras
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/plugins/perl-*
-%{_libdir}/goffice/0.7.16/plugins/gnumeric/gnumeric.so
-%{_libdir}/goffice/0.7.16/plugins/gnumeric/plugin.xml
+%{_libdir}/goffice/0.7.17/plugins/gnumeric/gnumeric.so
+%{_libdir}/goffice/0.7.17/plugins/gnumeric/plugin.xml
 #%{_libdir}/%{name}/%{version}/plugins/gdaif
 #%{_libdir}/%{name}/%{version}/plugins/gnome-db
 
 
 %changelog
-* Wed Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.9.17-2
+* Wed Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.9.17-3
 - Upstream bump to 1.9.17
 - Apply gnome bz patch #605043
 - BR goffice-devel >= 1.7.17
+- Change goffice plugins to 0.7.17
 
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1:1.9.16-2
 - rebuild against perl 5.10.1



From pravins at fedoraproject.org  Wed Dec 30 06:32:06 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 30 Dec 2009 06:32:06 +0000 (UTC)
Subject: rpms/lohit-telugu-fonts/devel bug-551317.patch, NONE,
	1.1 lohit-telugu-fonts.spec, 1.6, 1.7
Message-ID: <20091230063206.40F6811C00E9@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-telugu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22739

Modified Files:
	lohit-telugu-fonts.spec 
Added Files:
	bug-551317.patch 
Log Message:
* Mon Dec 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-4
- fixes bug 551317


bug-551317.patch:
 Lohit-Telugu.sfd | 1009 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 1002 insertions(+), 7 deletions(-)

--- NEW FILE bug-551317.patch ---
diff -rup lohit-telugu-2.4.5/Lohit-Telugu.sfd lohit-telugu-2.4.5_mod/Lohit-Telugu.sfd
--- lohit-telugu-2.4.5/Lohit-Telugu.sfd	2009-11-25 12:47:59.000000000 +0530
+++ lohit-telugu-2.4.5_mod/Lohit-Telugu.sfd	2009-12-30 11:54:46.000000000 +0530
@@ -4,7 +4,7 @@ FullName: Lohit Telugu
 FamilyName: Lohit Telugu
 Weight: Book
 Copyright: Copyright (c) 2003, Automatic Control Equipments, Pune, INDIA.\n  Copyright 2006 Modular Infotech Pvt Ltd.\n  Copyright 2009 Red Hat, Inc.\n\n  Licensed under the GNU General Public License, version 2 (see file COPYING) along with the following exception:\n\n  As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
-Version: 2.4.5
+Version: 2.4.6
 ItalicAngle: 0
 UnderlinePosition: -300
 UnderlineWidth: 20
@@ -19,7 +19,7 @@ OS2Version: 1
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1153280036
-ModificationTime: 1259131491
+ModificationTime: 1262152364
 PfmFamily: 17
 TTFWeight: 400
 TTFWidth: 5
@@ -2879,7 +2879,7 @@ ShortTable: maxp 16
   0
   0
 EndShort
-LangName: 1033 "" "" "Regular" "FontForge 1.0 : Lohit Telugu : 19-7-2006" "" "Version 2.4.5" 
+LangName: 1033 "" "" "Regular" "FontForge 1.0 : Lohit Telugu : 19-7-2006" "" "Version 2.4.6" 
 GaspTable: 1 65535 2
 Encoding: UnicodeBmp
 Compacted: 1
@@ -2890,7 +2890,7 @@ AntiAlias: 1
 FitToEm: 1
 WinInfo: 0 28 11
 AnchorClass2: "Anchor-0"  "'blwm' Below Base Mark in Telugu lookup 0" 
-BeginChars: 65989 556
+BeginChars: 65989 587
 
 StartChar: .notdef
 Encoding: 65536 -1 0
@@ -2946,11 +2946,19 @@ EndChar
 
 StartChar: hyphen
 Encoding: 45 45 4
-Width: 870
-VWidth: 819
+Width: 692
 GlyphClass: 2
-Flags: W
+Flags: HW
 LayerCount: 2
+Fore
+SplineSet
+100 293 m 0,0,-1
+ 100 366 l 0,1,-1
+ 593 366 l 0,2,-1
+ 593 293 l 0,3,-1
+ 100 293 l 0,4,-1
+ 100 293 l 0,0,-1
+EndSplineSet
 EndChar
 
 StartChar: uni0214
@@ -45842,5 +45850,992 @@ SplineSet
  411.018 238.665 411.018 238.665 425 289 c 0,0,1
 EndSplineSet
 EndChar
+
+StartChar: exclam
+Encoding: 33 33 556
+Width: 339
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+107 0 m 0,0,-1
+ 107 120 l 0,1,-1
+ 233 120 l 0,2,-1
+ 233 0 l 0,3,-1
+ 107 0 l 0,4,-1
+ 107 0 l 0,0,-1
+146 233 m 0,5,-1
+ 100 739 l 0,6,-1
+ 240 739 l 0,7,-1
+ 193 233 l 0,8,-1
+ 146 233 l 0,9,-1
+ 146 233 l 0,5,-1
+EndSplineSet
+EndChar
+
+StartChar: quotedbl
+Encoding: 34 34 557
+Width: 460
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+188 664 m 0,0,-1
+ 138 664 l 0,1,-1
+ 100 875 l 0,2,-1
+ 180 875 l 0,3,-1
+ 188 664 l 0,4,-1
+ 188 664 l 0,0,-1
+361 664 m 0,5,-1
+ 312 664 l 0,6,-1
+ 273 875 l 0,7,-1
+ 353 875 l 0,8,-1
+ 361 664 l 0,9,-1
+ 361 664 l 0,5,-1
+EndSplineSet
+EndChar
+
+StartChar: numbersign
+Encoding: 35 35 558
+Width: 934
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+166 450 m 0,0,-1
+ 166 511 l 0,1,-1
+ 360 511 l 0,2,-1
+ 409 668 l 0,3,-1
+ 470 668 l 0,4,-1
+ 421 511 l 0,5,-1
+ 626 511 l 0,6,-1
+ 675 668 l 0,7,-1
+ 738 668 l 0,8,-1
+ 688 511 l 0,9,-1
+ 835 511 l 0,10,-1
+ 835 450 l 0,11,-1
+ 667 450 l 0,12,-1
+ 601 245 l 0,13,-1
+ 768 245 l 0,14,-1
+ 768 181 l 0,15,-1
+ 581 181 l 0,16,-1
+ 523 -1 l 0,17,-1
+ 461 -1 l 0,18,-1
+ 519 181 l 0,19,-1
+ 314 181 l 0,20,-1
+ 256 -1 l 0,21,-1
+ 194 -1 l 0,22,-1
+ 253 181 l 0,23,-1
+ 100 181 l 0,24,-1
+ 100 245 l 0,25,-1
+ 272 245 l 0,26,-1
+ 338 450 l 0,27,-1
+ 166 450 l 0,28,-1
+ 166 450 l 0,0,-1
+606 450 m 0,29,-1
+ 401 450 l 0,30,-1
+ 333 245 l 0,31,-1
+ 539 245 l 0,32,-1
+ 606 450 l 0,33,-1
+ 606 450 l 0,29,-1
+EndSplineSet
+EndChar
+
+StartChar: dollar
+Encoding: 36 36 559
+Width: 712
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 225 m 0,0,-1
+ 161 225 l 0,1,2
+ 161 165 161 165 205.5 116 c 128,-1,3
+ 250 67 250 67 320 49 c 0,4,-1
+ 320 341 l 0,5,6
+ 233 350 233 350 174.5 406 c 128,-1,7
+ 116 462 116 462 116 535 c 0,8,9
+ 116 606 116 606 174 660 c 128,-1,10
+ 232 714 232 714 320 724 c 0,11,-1
+ 320 839 l 0,12,-1
+ 385 839 l 0,13,-1
+ 385 724 l 0,14,15
+ 474 714 474 714 533.5 655.5 c 128,-1,16
+ 593 597 593 597 593 519 c 0,17,-1
+ 529 519 l 0,18,19
+ 529 574 529 574 487.5 615 c 128,-1,20
+ 446 656 446 656 385 666 c 0,21,-1
+ 385 389 l 0,22,23
+ 483 376 483 376 548 320 c 128,-1,24
+ 613 264 613 264 613 194 c 0,25,26
+ 613 117 613 117 547.5 59 c 128,-1,27
+ 482 1 482 1 385 -9 c 0,28,-1
+ 385 -101 l 0,29,-1
+ 320 -101 l 0,30,-1
+ 320 -9 l 0,31,32
+ 225 4 225 4 162.5 70.5 c 128,-1,33
+ 100 137 100 137 100 225 c 0,34,-1
+ 100 225 l 0,0,-1
+385 49 m 0,35,36
+ 457 57 457 57 505.5 98.5 c 128,-1,37
+ 554 140 554 140 554 194 c 128,-1,38
+ 554 248 554 248 505.5 287 c 128,-1,39
+ 457 326 457 326 385 332 c 0,40,-1
+ 385 49 l 0,41,-1
+ 385 49 l 0,35,36
+320 666 m 0,42,43
+ 258 654 258 654 218 617.5 c 128,-1,44
+ 178 581 178 581 178 535 c 0,45,46
+ 178 486 178 486 218 446.5 c 128,-1,47
+ 258 407 258 407 320 398 c 0,48,-1
+ 320 666 l 0,49,-1
+ 320 666 l 0,42,43
+EndSplineSet
+EndChar
+
+StartChar: percent
+Encoding: 37 37 560
+Width: 885
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+146 0 m 0,0,-1
+ 666 726 l 0,1,-1
+ 739 726 l 0,2,-1
+ 220 0 l 0,3,-1
+ 146 0 l 0,4,-1
+ 146 0 l 0,0,-1
+262 393 m 0,5,6
+ 194 393 194 393 147 440 c 128,-1,7
+ 100 487 100 487 100 555 c 128,-1,8
+ 100 623 100 623 147 671 c 128,-1,9
+ 194 719 194 719 262 719 c 128,-1,10
+ 330 719 330 719 378 671 c 128,-1,11
+ 426 623 426 623 426 555 c 128,-1,12
+ 426 487 426 487 378 440 c 128,-1,13
+ 330 393 330 393 262 393 c 0,14,-1
+ 262 393 l 0,5,6
+262 459 m 0,15,16
+ 302 459 302 459 331 487 c 128,-1,17
+ 360 515 360 515 360 555 c 128,-1,18
+ 360 595 360 595 331 623.5 c 128,-1,19
+ 302 652 302 652 262 652 c 128,-1,20
+ 222 652 222 652 194 623.5 c 128,-1,21
+ 166 595 166 595 166 555 c 128,-1,22
+ 166 515 166 515 194 487 c 128,-1,23
+ 222 459 222 459 262 459 c 0,24,-1
+ 262 459 l 0,15,16
+622 7 m 0,25,26
+ 554 7 554 7 506.5 54 c 128,-1,27
+ 459 101 459 101 459 169 c 128,-1,28
+ 459 237 459 237 506.5 285 c 128,-1,29
+ 554 333 554 333 622 333 c 128,-1,30
+ 690 333 690 333 738 285 c 128,-1,31
+ 786 237 786 237 786 169 c 128,-1,32
+ 786 101 786 101 738 54 c 128,-1,33
+ 690 7 690 7 622 7 c 0,34,-1
+ 622 7 l 0,25,26
+622 67 m 0,35,36
+ 662 67 662 67 690.5 96 c 128,-1,37
+ 719 125 719 125 719 166 c 0,38,39
+ 719 208 719 208 690.5 237 c 128,-1,40
+ 662 266 662 266 622 266 c 128,-1,41
+ 582 266 582 266 554 237 c 128,-1,42
+ 526 208 526 208 526 166 c 0,43,44
+ 526 125 526 125 554 96 c 128,-1,45
+ 582 67 582 67 622 67 c 0,46,-1
+ 622 67 l 0,35,36
+EndSplineSet
+EndChar
+
+StartChar: ampersand
+Encoding: 38 38 561
+Width: 761
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 174 m 0,0,1
+ 100 232 100 232 146 292 c 128,-1,2
+ 192 352 192 352 272 398 c 0,3,4
+ 225 457 225 457 201 508 c 128,-1,5
+ 177 559 177 559 177 598 c 0,6,7
+ 177 655 177 655 224.5 696.5 c 128,-1,8
+ 272 738 272 738 338 738 c 0,9,10
+ 402 738 402 738 448 691 c 128,-1,11
+ 494 644 494 644 494 578 c 0,12,13
+ 494 526 494 526 458 475.5 c 128,-1,14
+ 422 425 422 425 360 389 c 0,15,-1
+ 505 200 l 0,16,17
+ 513 232 513 232 517.5 260.5 c 128,-1,18
+ 522 289 522 289 522 314 c 0,19,-1
+ 579 314 l 0,20,21
+ 579 262 579 262 570.5 220 c 128,-1,22
+ 562 178 562 178 545 149 c 0,23,-1
+ 662 -5 l 0,24,-1
+ 582 -5 l 0,25,-1
+ 502 89 l 0,26,27
+ 469 41 469 41 416.5 14 c 128,-1,28
+ 364 -13 364 -13 305 -13 c 0,29,30
+ 220 -13 220 -13 160 42 c 128,-1,31
+ 100 97 100 97 100 174 c 0,32,-1
+ 100 174 l 0,0,1
+166 184 m 0,33,34
+ 166 127 166 127 210 86 c 128,-1,35
+ 254 45 254 45 316 45 c 0,36,37
+ 360 45 360 45 401.5 70.5 c 128,-1,38
+ 443 96 443 96 474 140 c 0,39,-1
+ 304 352 l 0,40,41
+ 240 314 240 314 203 269.5 c 128,-1,42
+ 166 225 166 225 166 184 c 0,43,-1
+ 166 184 l 0,33,34
+244 587 m 0,44,45
+ 244 562 244 562 264 522.5 c 128,-1,46
+ 284 483 284 483 322 434 c 0,47,48
+ 370 462 370 462 398 500.5 c 128,-1,49
+ 426 539 426 539 426 578 c 0,50,51
+ 426 621 426 621 402 651.5 c 128,-1,52
+ 378 682 378 682 345 682 c 0,53,54
+ 304 682 304 682 274 654 c 128,-1,55
+ 244 626 244 626 244 587 c 0,56,-1
+ 244 587 l 0,44,45
+EndSplineSet
+EndChar
+
+StartChar: quotesingle
+Encoding: 39 39 562
+Width: 287
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+188 664 m 0,0,-1
+ 138 664 l 0,1,-1
+ 100 875 l 0,2,-1
+ 180 875 l 0,3,-1
+ 188 664 l 0,4,-1
+ 188 664 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: parenleft
+Encoding: 40 40 563
+Width: 486
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+306 -220 m 0,0,1
+ 206 -101 206 -101 153 50 c 128,-1,2
+ 100 201 100 201 100 366 c 0,3,4
+ 100 505 100 505 153 642.5 c 128,-1,5
+ 206 780 206 780 306 899 c 0,6,-1
+ 386 899 l 0,7,8
+ 280 772 280 772 223 635 c 128,-1,9
+ 166 498 166 498 166 366 c 0,10,11
+ 166 209 166 209 223 58 c 128,-1,12
+ 280 -93 280 -93 386 -220 c 0,13,-1
+ 306 -220 l 0,14,-1
+ 306 -220 l 0,0,1
+EndSplineSet
+EndChar
+
+StartChar: parenright
+Encoding: 41 41 564
+Width: 466
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 -220 m 0,0,1
+ 197 -104 197 -104 248.5 40 c 128,-1,2
+ 300 184 300 184 300 340 c 0,3,4
+ 300 495 300 495 248.5 639 c 128,-1,5
+ 197 783 197 783 100 899 c 0,6,-1
+ 166 899 l 0,7,8
+ 264 783 264 783 315 639 c 128,-1,9
+ 366 495 366 495 366 340 c 0,10,11
+ 366 184 366 184 315 40 c 128,-1,12
+ 264 -104 264 -104 166 -220 c 0,13,-1
+ 100 -220 l 0,14,-1
+ 100 -220 l 0,0,1
+EndSplineSet
+EndChar
+
+StartChar: asterisk
+Encoding: 42 42 565
+Width: 680
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+278 939 m 0,0,1
+ 278 963 278 963 297 979.5 c 128,-1,2
+ 316 996 316 996 341 996 c 0,3,4
+ 364 996 364 996 382.5 978 c 128,-1,5
+ 401 960 401 960 401 939 c 0,6,7
+ 401 916 401 916 385.5 872 c 128,-1,8
+ 370 828 370 828 341 764 c 0,9,10
+ 309 834 309 834 293.5 875 c 128,-1,11
+ 278 916 278 916 278 939 c 0,12,-1
+ 278 939 l 0,0,1
+129 782 m 0,13,14
+ 108 794 108 794 102 817 c 128,-1,15
+ 96 840 96 840 108 860 c 128,-1,16
+ 120 880 120 880 144.5 888.5 c 128,-1,17
+ 169 897 169 897 186 887 c 0,18,19
+ 208 875 208 875 239 839.5 c 128,-1,20
+ 270 804 270 804 310 747 c 0,21,22
+ 238 754 238 754 193.5 762 c 128,-1,23
+ 149 770 149 770 129 782 c 0,24,-1
+ 129 782 l 0,13,14
+186 573 m 0,25,26
+ 166 561 166 561 143.5 569 c 128,-1,27
+ 121 577 121 577 108 598 c 0,28,29
+ 97 617 97 617 104 641.5 c 128,-1,30
+ 111 666 111 666 129 676 c 0,31,32
+ 149 688 149 688 195 697 c 128,-1,33
+ 241 706 241 706 310 712 c 0,34,35
+ 270 655 270 655 239 620 c 128,-1,36
+ 208 585 208 585 186 573 c 0,37,-1
+ 186 573 l 0,25,26
+401 521 m 0,38,39
+ 401 497 401 497 383.5 479.5 c 128,-1,40
+ 366 462 366 462 341 462 c 0,41,42
+ 318 462 318 462 298 480.5 c 128,-1,43
+ 278 499 278 499 278 521 c 128,-1,44
+ 278 543 278 543 293.5 584.5 c 128,-1,45
+ 309 626 309 626 341 695 c 0,46,47
+ 370 631 370 631 385.5 587 c 128,-1,48
+ 401 543 401 543 401 521 c 0,49,-1
+ 401 521 l 0,38,39
+555 676 m 0,50,51
+ 574 666 574 666 578.5 642.5 c 128,-1,52
+ 583 619 583 619 571 598 c 0,53,54
+ 561 578 561 578 536 570 c 128,-1,55
+ 511 562 511 562 494 573 c 0,56,57
+ 473 585 473 585 441.5 620 c 128,-1,58
+ 410 655 410 655 370 712 c 0,59,60
+ 442 706 442 706 488.5 697 c 128,-1,61
+ 535 688 535 688 555 676 c 0,62,-1
+ 555 676 l 0,50,51
+494 887 m 0,63,64
+ 513 897 513 897 535.5 890 c 128,-1,65
+ 558 883 558 883 571 860 c 0,66,67
+ 582 842 582 842 577.5 816.5 c 128,-1,68
+ 573 791 573 791 555 782 c 0,69,70
+ 535 770 535 770 490 762 c 128,-1,71
+ 445 754 445 754 370 747 c 0,72,73
+ 410 804 410 804 441.5 839.5 c 128,-1,74
+ 473 875 473 875 494 887 c 0,75,-1
+ 494 887 l 0,63,64
+EndSplineSet
+EndChar
+
+StartChar: plus
+Encoding: 43 43 566
+Width: 872
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+393 20 m 0,0,-1
+ 393 300 l 0,1,-1
+ 100 300 l 0,2,-1
+ 100 386 l 0,3,-1
+ 393 386 l 0,4,-1
+ 393 659 l 0,5,-1
+ 479 659 l 0,6,-1
+ 479 386 l 0,7,-1
+ 772 386 l 0,8,-1
+ 772 300 l 0,9,-1
+ 479 300 l 0,10,-1
+ 479 20 l 0,11,-1
+ 393 20 l 0,12,-1
+ 393 20 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: comma
+Encoding: 44 44 567
+Width: 359
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 -133 m 0,0,-1
+ 153 100 l 0,1,-1
+ 260 100 l 0,2,-1
+ 160 -133 l 0,3,-1
+ 100 -133 l 0,4,-1
+ 100 -133 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: period
+Encoding: 46 46 568
+Width: 279
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 0 m 0,0,-1
+ 100 100 l 0,1,-1
+ 180 100 l 0,2,-1
+ 180 0 l 0,3,-1
+ 100 0 l 0,4,-1
+ 100 0 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: slash
+Encoding: 47 47 569
+Width: 672
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 -180 m 0,0,-1
+ 493 886 l 0,1,-1
+ 573 886 l 0,2,-1
+ 180 -180 l 0,3,-1
+ 100 -180 l 0,4,-1
+ 100 -180 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: zero
+Encoding: 48 48 570
+Width: 633
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+65 350 m 0,0,1
+ 65 487 65 487 133 589.5 c 128,-1,2
+ 201 692 201 692 317 692 c 128,-1,3
+ 433 692 433 692 501 589.5 c 128,-1,4
+ 569 487 569 487 569 350 c 0,5,6
+ 569 209 569 209 501.5 104.5 c 128,-1,7
+ 434 0 434 0 317 0 c 128,-1,8
+ 200 0 200 0 132.5 104.5 c 128,-1,9
+ 65 209 65 209 65 350 c 0,10,-1
+ 65 350 l 0,0,1
+136 350 m 0,11,12
+ 136 237 136 237 182 154 c 128,-1,13
+ 228 71 228 71 317 71 c 128,-1,14
+ 406 71 406 71 452.5 154 c 128,-1,15
+ 499 237 499 237 499 350 c 0,16,17
+ 499 459 499 459 452 540.5 c 128,-1,18
+ 405 622 405 622 317 622 c 128,-1,19
+ 229 622 229 622 182.5 540.5 c 128,-1,20
+ 136 459 136 459 136 350 c 0,21,-1
+ 136 350 l 0,11,12
+EndSplineSet
+EndChar
+
+StartChar: one
+Encoding: 49 49 571
+Width: 635
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+193 507 m 0,0,-1
+ 193 574 l 0,1,2
+ 269 574 269 574 327.5 611 c 128,-1,3
+ 386 648 386 648 391 714 c 0,4,-1
+ 442 714 l 0,5,-1
+ 442 0 l 0,6,-1
+ 362 0 l 0,7,-1
+ 362 507 l 0,8,-1
+ 193 507 l 0,9,-1
+ 193 507 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: two
+Encoding: 50 50 572
+Width: 633
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+79 7 m 0,0,1
+ 79 108 79 108 146 192 c 128,-1,2
+ 213 276 213 276 321 338 c 0,3,4
+ 390 378 390 378 432 424 c 128,-1,5
+ 474 470 474 470 474 529 c 0,6,7
+ 474 583 474 583 428 617.5 c 128,-1,8
+ 382 652 382 652 321 652 c 0,9,10
+ 257 652 257 652 211.5 607.5 c 128,-1,11
+ 166 563 166 563 166 499 c 0,12,-1
+ 166 455 l 0,13,-1
+ 85 455 l 0,14,-1
+ 85 499 l 0,15,16
+ 85 594 85 594 154.5 660.5 c 128,-1,17
+ 224 727 224 727 321 727 c 0,18,19
+ 415 727 415 727 485 671 c 128,-1,20
+ 555 615 555 615 555 529 c 0,21,22
+ 555 453 555 453 504.5 389.5 c 128,-1,23
+ 454 326 454 326 373 280 c 0,24,-1
+ 277 225 l 0,25,-1
+ 173 88 l 0,26,-1
+ 555 88 l 0,27,-1
+ 555 7 l 0,28,-1
+ 79 7 l 0,29,-1
+ 79 7 l 0,0,1
+EndSplineSet
+EndChar
+
+StartChar: three
+Encoding: 51 51 573
+Width: 635
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+68 221 m 0,0,-1
+ 140 221 l 0,1,2
+ 140 154 140 154 192.5 110.5 c 128,-1,3
+ 245 67 245 67 317 67 c 0,4,5
+ 385 67 385 67 435.5 108.5 c 128,-1,6
+ 486 150 486 150 486 214 c 0,7,8
+ 486 270 486 270 435.5 301 c 128,-1,9
+ 385 332 385 332 317 332 c 0,10,-1
+ 250 332 l 0,11,-1
+ 250 413 l 0,12,-1
+ 317 413 l 0,13,14
+ 370 413 370 413 409.5 446 c 128,-1,15
+ 449 479 449 479 449 530 c 0,16,17
+ 449 578 449 578 409.5 608.5 c 128,-1,18
+ 370 639 370 639 317 639 c 0,19,20
+ 252 639 252 639 204 600 c 128,-1,21
+ 156 561 156 561 156 501 c 0,22,-1
+ 75 501 l 0,23,24
+ 75 591 75 591 144 652.5 c 128,-1,25
+ 213 714 213 714 309 714 c 0,26,27
+ 397 714 397 714 463 662 c 128,-1,28
+ 529 610 529 610 529 530 c 0,29,30
+ 529 481 529 481 508 439 c 128,-1,31
+ 487 397 487 397 449 374 c 0,32,33
+ 502 360 502 360 534.5 315 c 128,-1,34
+ 567 270 567 270 567 214 c 0,35,36
+ 567 117 567 117 493 51 c 128,-1,37
+ 419 -15 419 -15 317 -15 c 0,38,39
+ 214 -15 214 -15 141 54 c 128,-1,40
+ 68 123 68 123 68 221 c 0,41,-1
+ 68 221 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: four
+Encoding: 52 52 574
+Width: 635
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+76 185 m 0,0,-1
+ 76 257 l 0,1,-1
+ 384 714 l 0,2,-1
+ 465 714 l 0,3,-1
+ 465 257 l 0,4,-1
+ 559 257 l 0,5,-1
+ 559 185 l 0,6,-1
+ 465 185 l 0,7,-1
+ 465 0 l 0,8,-1
+ 384 0 l 0,9,-1
+ 384 185 l 0,10,-1
+ 76 185 l 0,11,-1
+ 76 185 l 0,0,-1
+164 257 m 0,12,-1
+ 384 257 l 0,13,-1
+ 384 574 l 0,14,-1
+ 164 257 l 0,15,-1
+ 164 257 l 0,12,-1
+EndSplineSet
+EndChar
+
+StartChar: five
+Encoding: 53 53 575
+Width: 635
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+68 221 m 0,0,-1
+ 140 221 l 0,1,2
+ 140 160 140 160 190.5 120.5 c 128,-1,3
+ 241 81 241 81 309 81 c 0,4,5
+ 381 81 381 81 433.5 128 c 128,-1,6
+ 486 175 486 175 486 244 c 0,7,8
+ 486 314 486 314 433.5 363 c 128,-1,9
+ 381 412 381 412 309 412 c 0,10,11
+ 262 412 262 412 219.5 392.5 c 128,-1,12
+ 177 373 177 373 148 338 c 0,13,-1
+ 68 338 l 0,14,-1
+ 140 704 l 0,15,-1
+ 515 704 l 0,16,-1
+ 515 633 l 0,17,-1
+ 206 633 l 0,18,-1
+ 177 449 l 0,19,20
+ 198 474 198 474 231.5 483.5 c 128,-1,21
+ 265 493 265 493 309 493 c 0,22,23
+ 415 493 415 493 491 420.5 c 128,-1,24
+ 567 348 567 348 567 244 c 0,25,26
+ 567 141 567 141 490.5 70.5 c 128,-1,27
+ 414 0 414 0 309 0 c 0,28,29
+ 210 0 210 0 139 64 c 128,-1,30
+ 68 128 68 128 68 221 c 0,31,-1
+ 68 221 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: six
+Encoding: 54 54 576
+Width: 635
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+68 266 m 0,0,-1
+ 68 354 l 0,1,2
+ 68 498 68 498 141 606 c 128,-1,3
+ 214 714 214 714 338 714 c 0,4,5
+ 425 714 425 714 488 656 c 128,-1,6
+ 551 598 551 598 551 514 c 0,7,-1
+ 478 514 l 0,8,9
+ 478 567 478 567 436.5 603 c 128,-1,10
+ 395 639 395 639 338 639 c 0,11,12
+ 248 639 248 639 198 556 c 128,-1,13
+ 148 473 148 473 148 361 c 0,14,15
+ 169 406 169 406 215 430.5 c 128,-1,16
+ 261 455 261 455 317 455 c 0,17,18
+ 418 455 418 455 492.5 390 c 128,-1,19
+ 567 325 567 325 567 228 c 0,20,21
+ 567 127 567 127 493 56 c 128,-1,22
+ 419 -15 419 -15 317 -15 c 0,23,24
+ 210 -15 210 -15 139 69 c 128,-1,25
+ 68 153 68 153 68 266 c 0,26,-1
+ 68 266 l 0,0,-1
+162 221 m 0,27,28
+ 162 157 162 157 207.5 112 c 128,-1,29
+ 253 67 253 67 317 67 c 0,30,31
+ 386 67 386 67 436 113.5 c 128,-1,32
+ 486 160 486 160 486 228 c 0,33,34
+ 486 294 486 294 436 339 c 128,-1,35
+ 386 384 386 384 317 384 c 0,36,37
+ 252 384 252 384 207 336 c 128,-1,38
+ 162 288 162 288 162 221 c 0,39,-1
+ 162 221 l 0,27,28
+EndSplineSet
+EndChar
+
+StartChar: seven
+Encoding: 55 55 577
+Width: 635
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+53 633 m 0,0,-1
+ 53 704 l 0,1,-1
+ 582 704 l 0,2,-1
+ 582 633 l 0,3,4
+ 442 534 442 534 376 366 c 128,-1,5
+ 310 198 310 198 310 0 c 0,6,-1
+ 216 0 l 0,7,8
+ 216 190 216 190 278.5 356.5 c 128,-1,9
+ 341 523 341 523 471 633 c 0,10,-1
+ 53 633 l 0,11,-1
+ 53 633 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: eight
+Encoding: 56 56 578
+Width: 635
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+53 214 m 0,0,1
+ 53 272 53 272 91.5 317 c 128,-1,2
+ 130 362 130 362 190 384 c 0,3,4
+ 142 411 142 411 112.5 448 c 128,-1,5
+ 83 485 83 485 83 530 c 0,6,7
+ 83 611 83 611 150.5 662.5 c 128,-1,8
+ 218 714 218 714 310 714 c 0,9,10
+ 405 714 405 714 475.5 663.5 c 128,-1,11
+ 546 613 546 613 546 530 c 0,12,13
+ 546 485 546 485 518 447.5 c 128,-1,14
+ 490 410 490 410 445 384 c 0,15,16
+ 505 362 505 362 543.5 317 c 128,-1,17
+ 582 272 582 272 582 214 c 0,18,19
+ 582 115 582 115 500.5 50 c 128,-1,20
+ 419 -15 419 -15 310 -15 c 0,21,22
+ 206 -15 206 -15 129.5 50.5 c 128,-1,23
+ 53 116 53 116 53 214 c 0,24,-1
+ 53 214 l 0,0,1
+128 214 m 0,25,26
+ 128 149 128 149 182.5 108 c 128,-1,27
+ 237 67 237 67 310 67 c 0,28,29
+ 386 67 386 67 443.5 107.5 c 128,-1,30
+ 501 148 501 148 501 214 c 0,31,32
+ 501 277 501 277 444 311 c 128,-1,33
+ 387 345 387 345 310 345 c 0,34,35
+ 237 345 237 345 182.5 310.5 c 128,-1,36
+ 128 276 128 276 128 214 c 0,37,-1
+ 128 214 l 0,25,26
+164 530 m 0,38,39
+ 164 479 164 479 208 449 c 128,-1,40
+ 252 419 252 419 310 419 c 0,41,42
+ 373 419 373 419 419 448.5 c 128,-1,43
+ 465 478 465 478 465 530 c 128,-1,44
+ 465 582 465 582 419 610.5 c 128,-1,45
+ 373 639 373 639 310 639 c 0,46,47
+ 252 639 252 639 208 610 c 128,-1,48
+ 164 581 164 581 164 530 c 0,49,-1
+ 164 530 l 0,38,39
+EndSplineSet
+EndChar
+
+StartChar: nine
+Encoding: 57 57 579
+Width: 635
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+76 485 m 0,0,1
+ 76 581 76 581 144.5 647.5 c 128,-1,2
+ 213 714 213 714 310 714 c 0,3,4
+ 415 714 415 714 487 633.5 c 128,-1,5
+ 559 553 559 553 559 442 c 0,6,-1
+ 559 354 l 0,7,8
+ 559 186 559 186 489 85.5 c 128,-1,9
+ 419 -15 419 -15 304 -15 c 0,10,11
+ 218 -15 218 -15 158.5 46 c 128,-1,12
+ 99 107 99 107 99 192 c 0,13,-1
+ 178 192 l 0,14,15
+ 178 140 178 140 215 103.5 c 128,-1,16
+ 252 67 252 67 304 67 c 0,17,18
+ 380 67 380 67 425.5 139.5 c 128,-1,19
+ 471 212 471 212 471 332 c 0,20,21
+ 439 300 439 300 397.5 283 c 128,-1,22
+ 356 266 356 266 310 266 c 0,23,24
+ 214 266 214 266 145 329.5 c 128,-1,25
+ 76 393 76 393 76 485 c 0,26,-1
+ 76 485 l 0,0,1
+157 485 m 0,27,28
+ 157 421 157 421 201.5 376.5 c 128,-1,29
+ 246 332 246 332 310 332 c 0,30,31
+ 377 332 377 332 424 376.5 c 128,-1,32
+ 471 421 471 421 471 485 c 0,33,34
+ 471 550 471 550 424 594.5 c 128,-1,35
+ 377 639 377 639 310 639 c 0,36,37
+ 246 639 246 639 201.5 594 c 128,-1,38
+ 157 549 157 549 157 485 c 0,39,-1
+ 157 485 l 0,27,28
+EndSplineSet
+EndChar
+
+StartChar: colon
+Encoding: 58 58 580
+Width: 279
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 0 m 0,0,-1
+ 100 100 l 0,1,-1
+ 180 100 l 0,2,-1
+ 180 0 l 0,3,-1
+ 100 0 l 0,4,-1
+ 100 0 l 0,0,-1
+100 386 m 0,5,-1
+ 100 486 l 0,6,-1
+ 180 486 l 0,7,-1
+ 180 386 l 0,8,-1
+ 100 386 l 0,9,-1
+ 100 386 l 0,5,-1
+EndSplineSet
+EndChar
+
+StartChar: semicolon
+Encoding: 59 59 581
+Width: 366
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 -133 m 0,0,-1
+ 160 100 l 0,1,-1
+ 266 100 l 0,2,-1
+ 160 -133 l 0,3,-1
+ 100 -133 l 0,4,-1
+ 100 -133 l 0,0,-1
+160 353 m 0,5,-1
+ 160 426 l 0,6,-1
+ 253 426 l 0,7,-1
+ 253 353 l 0,8,-1
+ 160 353 l 0,9,-1
+ 160 353 l 0,5,-1
+EndSplineSet
+EndChar
+
+StartChar: less
+Encoding: 60 60 582
+Width: 661
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 290 m 0,0,-1
+ 100 369 l 0,1,-1
+ 562 644 l 0,2,-1
+ 562 573 l 0,3,-1
+ 165 333 l 0,4,-1
+ 562 93 l 0,5,-1
+ 562 19 l 0,6,-1
+ 100 290 l 0,7,-1
+ 100 290 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: equal
+Encoding: 61 61 583
+Width: 798
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+100 153 m 0,0,-1
+ 100 220 l 0,1,-1
+ 699 220 l 0,2,-1
+ 699 153 l 0,3,-1
+ 100 153 l 0,4,-1
+ 100 153 l 0,0,-1
+100 366 m 0,5,-1
+ 100 433 l 0,6,-1
+ 699 433 l 0,7,-1
+ 699 366 l 0,8,-1
+ 100 366 l 0,9,-1
+ 100 366 l 0,5,-1
+EndSplineSet
+EndChar
+
+StartChar: greater
+Encoding: 62 62 584
+Width: 661
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+562 290 m 0,0,-1
+ 100 19 l 0,1,-1
+ 100 93 l 0,2,-1
+ 497 333 l 0,3,-1
+ 100 573 l 0,4,-1
+ 100 644 l 0,5,-1
+ 562 369 l 0,6,-1
+ 562 290 l 0,7,-1
+ 562 290 l 0,0,-1
+EndSplineSet
+EndChar
+
+StartChar: question
+Encoding: 63 63 585
+Width: 665
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+233 0 m 0,0,-1
+ 233 87 l 0,1,-1
+ 326 87 l 0,2,-1
+ 326 0 l 0,3,-1
+ 233 0 l 0,4,-1
+ 233 0 l 0,0,-1
+246 166 m 0,5,-1
+ 246 373 l 0,6,7
+ 358 403 358 403 428.5 462.5 c 128,-1,8
+ 499 522 499 522 499 586 c 0,9,10
+ 499 643 499 643 446.5 684.5 c 128,-1,11
+ 394 726 394 726 320 726 c 0,12,13
+ 274 726 274 726 227.5 703 c 128,-1,14
+ 181 680 181 680 140 639 c 0,15,-1
+ 100 692 l 0,16,17
+ 148 740 148 740 205 766 c 128,-1,18
+ 262 792 262 792 320 792 c 0,19,20
+ 422 792 422 792 494 731.5 c 128,-1,21
+ 566 671 566 671 566 586 c 0,22,23
+ 566 510 566 510 496.5 439 c 128,-1,24
+ 427 368 427 368 313 326 c 0,25,-1
+ 313 166 l 0,26,-1
+ 246 166 l 0,27,-1
+ 246 166 l 0,5,-1
+EndSplineSet
+EndChar
+
+StartChar: at
+Encoding: 64 64 586
+Width: 1043
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+317 320 m 0,0,1
+ 317 398 317 398 371 454.5 c 128,-1,2
+ 425 511 425 511 502 511 c 0,3,4
+ 537 511 537 511 568 497 c 128,-1,5
+ 599 483 599 483 622 457 c 0,6,-1
+ 622 505 l 0,7,-1
+ 688 505 l 0,8,-1
+ 688 208 l 0,9,10
+ 688 188 688 188 705.5 173 c 128,-1,11
+ 723 158 723 158 748 158 c 0,12,13
+ 803 158 803 158 841.5 212 c 128,-1,14
+ 880 266 880 266 880 344 c 0,15,16
+ 880 475 880 475 779 568.5 c 128,-1,17
+ 678 662 678 662 535 662 c 0,18,19
+ 381 662 381 662 271.5 560 c 128,-1,20
+ 162 458 162 458 162 314 c 0,21,22
+ 162 184 162 184 271.5 92 c 128,-1,23
+ 381 0 381 0 535 0 c 0,24,25
+ 595 0 595 0 647.5 16 c 128,-1,26
+ 700 32 700 32 740 63 c 0,27,-1
+ 772 8 l 0,28,29
+ 722 -27 722 -27 661.5 -45.5 c 128,-1,30
+ 601 -64 601 -64 535 -64 c 0,31,32
+ 356 -64 356 -64 228 46.5 c 128,-1,33
+ 100 157 100 157 100 314 c 0,34,35
+ 100 483 100 483 228 603 c 128,-1,36
+ 356 723 356 723 535 723 c 0,37,38
+ 704 723 704 723 824 612 c 128,-1,39
+ 944 501 944 501 944 344 c 0,40,41
+ 944 241 944 241 887 168 c 128,-1,42
+ 830 95 830 95 748 95 c 0,43,44
+ 702 95 702 95 666.5 119.5 c 128,-1,45
+ 631 144 631 144 625 182 c 0,46,47
+ 607 152 607 152 574 135.5 c 128,-1,48
+ 541 119 541 119 502 119 c 0,49,50
+ 423 119 423 119 370 178 c 128,-1,51
+ 317 237 317 237 317 320 c 0,52,-1
+ 317 320 l 0,0,1
+382 320 m 0,53,54
+ 382 265 382 265 416.5 225 c 128,-1,55
+ 451 185 451 185 502 185 c 128,-1,56
+ 553 185 553 185 587.5 225 c 128,-1,57
+ 622 265 622 265 622 320 c 0,58,59
+ 622 374 622 374 587.5 413.5 c 128,-1,60
+ 553 453 553 453 502 453 c 128,-1,61
+ 451 453 451 453 416.5 413.5 c 128,-1,62
+ 382 374 382 374 382 320 c 0,63,-1
+ 382 320 l 0,53,54
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont


Index: lohit-telugu-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-telugu-fonts/devel/lohit-telugu-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lohit-telugu-fonts.spec	28 Dec 2009 07:16:46 -0000	1.6
+++ lohit-telugu-fonts.spec	30 Dec 2009 06:32:05 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.4.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free Telugu font
 
 Group:          User Interface/X
@@ -16,6 +16,7 @@ BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
 Patch1: bug-549319.patch
+Patch2: bug-551317.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -25,6 +26,7 @@ This package provides a free Telugu true
 %prep
 %setup -q -n %{fontname}-%{version} 
 %patch1 -p1 -b .1-fix-font-conf
+%patch2 -p1 -b .1-added-hyphen
 
 %build
 make
@@ -54,6 +56,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Wed Dec 30 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-4
+- fixes bug 551317
+
 * Mon Dec 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.5-3
 - corrected patch 
 



From tomeu at fedoraproject.org  Wed Dec 30 09:13:22 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 30 Dec 2009 09:13:22 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec, 1.69,
	1.70 gnash-0.8.6-python-install-dir.patch, 1.3, 1.4
Message-ID: <20091230091322.3DF9F11C00E9@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22347

Modified Files:
	gnash.spec gnash-0.8.6-python-install-dir.patch 
Log Message:
clog


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- gnash.spec	29 Dec 2009 20:41:25 -0000	1.69
+++ gnash.spec	30 Dec 2009 09:13:21 -0000	1.70
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.8.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 #Release:        0.8.%{alphatag}%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
@@ -319,6 +319,9 @@ fi
 %{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Wed Dec 30 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-7
+- One more try at using the correct dir
+
 * Tue Dec 29 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-6
 - Patch was reversed
 

gnash-0.8.6-python-install-dir.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: gnash-0.8.6-python-install-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash-0.8.6-python-install-dir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnash-0.8.6-python-install-dir.patch	29 Dec 2009 20:41:25 -0000	1.3
+++ gnash-0.8.6-python-install-dir.patch	30 Dec 2009 09:13:21 -0000	1.4
@@ -7,8 +7,8 @@ diff -rup gnash-0.8.6.orig/gui/pythonmod
  pdfdir = @pdfdir@
 -pkgpyexecdir = $(pythondir)/gtk-2.0
 -pkgpythondir = $(pythondir)/gtk-2.0
-+pkgpyexecdir = $(pkgpyexecdir)/gtk-2.0
-+pkgpythondir = $(pkgpythondir)/gtk-2.0
++pkgpyexecdir = $(pyexecdir)/gtk-2.0
++pkgpythondir = $(pyexecdir)/gtk-2.0
  prefix = @prefix@
  program_transform_name = @program_transform_name@
  psdir = @psdir@



From sailer at fedoraproject.org  Wed Dec 30 09:53:18 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 09:53:18 +0000 (UTC)
Subject: rpms/ghdl/F-11 ghdl.spec, 1.54, 1.55 grt-processtimeoutchain.patch,
	1.1, 1.2 ghdl-svn131.patch, 1.1, NONE grt-dispmemleak.patch, 1.1, NONE
Message-ID: <20091230095318.3BEAD11C00E9@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30386

Modified Files:
	ghdl.spec grt-processtimeoutchain.patch 
Removed Files:
	ghdl-svn131.patch grt-dispmemleak.patch 
Log Message:
fix the process timeout chain bugfix



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/ghdl.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- ghdl.spec	30 Dec 2009 00:30:48 -0000	1.54
+++ ghdl.spec	30 Dec 2009 09:53:17 -0000	1.55
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.0%{?dist}
+Release: 0.%{ghdlsvnver}svn.1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -29,6 +29,8 @@ Patch106: ghdl-ppc64abort.patch
 Patch107: ieee-mathreal.patch
 # https://gna.org/bugs/index.php?15015
 Patch108: grt-stats.patch
+# https://gna.org/bugs/index.php?14930                                     
+Patch109: grt-processtimeoutchain.patch                                    
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -135,6 +137,7 @@ popd
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
 %patch108 -p0 -b .grtstats
+%patch109 -p0 -b .processtimeoutchain
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -317,6 +320,9 @@ popd
 
 
 %changelog
+* Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.1
+- fix the Process Timeout Chain bugfix
+
 * Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.0
 - update to svn133, drop upstreamed patches
 - fix crash when running ./tb --stats

grt-processtimeoutchain.patch:
 grt-processes.adb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: grt-processtimeoutchain.patch
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-11/grt-processtimeoutchain.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- grt-processtimeoutchain.patch	14 Dec 2009 09:40:35 -0000	1.1
+++ grt-processtimeoutchain.patch	30 Dec 2009 09:53:17 -0000	1.2
@@ -1,10 +1,19 @@
---- gcc/vhdl/grt/grt-processes.adb.orig	2009-12-13 00:36:47.000000000 +0100
-+++ gcc/vhdl/grt/grt-processes.adb	2009-12-13 00:37:24.000000000 +0100
-@@ -312,6 +312,8 @@
-          Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+--- gcc/vhdl/grt/grt-processes.adb.orig	2009-12-30 02:51:24.000000000 +0100
++++ gcc/vhdl/grt/grt-processes.adb	2009-12-30 02:52:27.000000000 +0100
+@@ -304,8 +304,6 @@
+       if Proc.Timeout_Chain_Prev /= null then
+          Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+            Proc.Timeout_Chain_Next;
+-         --  Be sure a second call won't corrupt the chain.
+-         Proc.Timeout_Chain_Prev := null;
+       elsif Process_Timeout_Chain = Proc then
+          --  Only if Proc is in the chain.
+          Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+@@ -315,6 +313,8 @@
             Proc.Timeout_Chain_Prev;
+          Proc.Timeout_Chain_Next := null;
        end if;
-+      Proc.Timeout_Chain_Next := null;
++      --  Be sure a second call won't corrupt the chain.
 +      Proc.Timeout_Chain_Prev := null;
     end Remove_Process_From_Timeout_Chain;
  


--- ghdl-svn131.patch DELETED ---


--- grt-dispmemleak.patch DELETED ---



From sailer at fedoraproject.org  Wed Dec 30 09:53:49 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 09:53:49 +0000 (UTC)
Subject: rpms/ghdl/F-12 grt-processtimeoutchain.patch, 1.2, 1.3 ghdl.spec, 1.59,
	1.60
Message-ID: <20091230095349.B534211C00E9@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30512

Modified Files:
	ghdl.spec 
Added Files:
	grt-processtimeoutchain.patch 
Log Message:
fix the process timeout chain bugfix


grt-processtimeoutchain.patch:
 grt-processes.adb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: grt-processtimeoutchain.patch
===================================================================
RCS file: grt-processtimeoutchain.patch
diff -N grt-processtimeoutchain.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ grt-processtimeoutchain.patch	30 Dec 2009 09:53:49 -0000	1.3
@@ -0,0 +1,20 @@
+--- gcc/vhdl/grt/grt-processes.adb.orig	2009-12-30 02:51:24.000000000 +0100
++++ gcc/vhdl/grt/grt-processes.adb	2009-12-30 02:52:27.000000000 +0100
+@@ -304,8 +304,6 @@
+       if Proc.Timeout_Chain_Prev /= null then
+          Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+            Proc.Timeout_Chain_Next;
+-         --  Be sure a second call won't corrupt the chain.
+-         Proc.Timeout_Chain_Prev := null;
+       elsif Process_Timeout_Chain = Proc then
+          --  Only if Proc is in the chain.
+          Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+@@ -315,6 +313,8 @@
+            Proc.Timeout_Chain_Prev;
+          Proc.Timeout_Chain_Next := null;
+       end if;
++      --  Be sure a second call won't corrupt the chain.
++      Proc.Timeout_Chain_Prev := null;
+    end Remove_Process_From_Timeout_Chain;
+ 
+    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/F-12/ghdl.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- ghdl.spec	30 Dec 2009 00:30:48 -0000	1.59
+++ ghdl.spec	30 Dec 2009 09:53:49 -0000	1.60
@@ -5,7 +5,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.0%{?dist}
+Release: 0.%{ghdlsvnver}svn.1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -29,6 +29,8 @@ Patch106: ghdl-ppc64abort.patch
 Patch107: ieee-mathreal.patch
 # https://gna.org/bugs/index.php?15015
 Patch108: grt-stats.patch
+# https://gna.org/bugs/index.php?14930                                     
+Patch109: grt-processtimeoutchain.patch                                    
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -135,6 +137,7 @@ popd
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
 %patch108 -p0 -b .grtstats
+%patch109 -p0 -b .processtimeoutchain
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -316,6 +319,9 @@ popd
 %{_libdir}/gcc/
 
 %changelog
+* Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.1
+- fix the Process Timeout Chain bugfix
+
 * Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.0
 - update to svn133, drop upstreamed patches
 - fix crash when running ./tb --stats



From tomeu at fedoraproject.org  Wed Dec 30 09:55:09 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 30 Dec 2009 09:55:09 +0000 (UTC)
Subject: rpms/gnash/F-12 gnash-0.8.6-python-install-dir.patch, NONE,
	1.1 gnash.spec, 1.63, 1.64
Message-ID: <20091230095509.AE76811C00E9@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30876

Modified Files:
	gnash.spec 
Added Files:
	gnash-0.8.6-python-install-dir.patch 
Log Message:
clog

gnash-0.8.6-python-install-dir.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnash-0.8.6-python-install-dir.patch ---
diff -rup gnash-0.8.6.orig/gui/pythonmod/Makefile.in gnash-0.8.6/gui/pythonmod/Makefile.in
--- gnash-0.8.6.orig/gui/pythonmod/Makefile.in	2009-12-29 21:23:44.632275091 +0100
+++ gnash-0.8.6/gui/pythonmod/Makefile.in	2009-12-29 21:24:41.569276016 +0100
@@ -527,8 +527,8 @@ mconfig = @mconfig@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pkgpyexecdir = $(pythondir)/gtk-2.0
-pkgpythondir = $(pythondir)/gtk-2.0
+pkgpyexecdir = $(pyexecdir)/gtk-2.0
+pkgpythondir = $(pyexecdir)/gtk-2.0
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-12/gnash.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gnash.spec	10 Sep 2009 13:36:28 -0000	1.63
+++ gnash.spec	30 Dec 2009 09:55:09 -0000	1.64
@@ -4,19 +4,22 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnash
-Version:        0.9.0
-Release:        0.8.%{alphatag}%{?dist}
+Version:        0.8.6
+Release:	1%{?dist}
+#Release:        0.8.%{alphatag}%{?dist}
+Epoch:		1
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-#Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
-Source0:        %{name}-%{version}.%{alphatag}.tar.gz
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
+#Source0:        %{name}-%{version}.%{alphatag}.tar.gz
 Source1:        http://www.getgnash.org/gnash-splash.swf
 Source2:        gnash.desktop
 
 Patch0:         gnash-0.8.3-manual.patch
+Patch1:         gnash-0.8.6-python-install-dir.patch
 # register KComponentData properly in KDE 4 KPart
 Patch3:         gnash-0.8.3-fix-kde4-port.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -110,6 +113,7 @@ application.
 %prep
 %setup -q
 %patch0 -p1 -b .manual
+%patch1 -p1 -b .python
 %patch3 -p1 -b .fix-kde4
 # Hack as autoreconf breaks build 
 sed -i -e 's!kapp.h!kapplication.h!g' configure
@@ -302,6 +306,8 @@ fi
 %{_bindir}/cygnal
 %{_mandir}/man1/cygnal.1*
 %{_mandir}/man1/rtmpget.1*
+%dir %{_libdir}/cygnal
+%{_libdir}/cygnal/plugins/*.so*
 
 %files devel
 %defattr(-,root,root,-)
@@ -310,9 +316,12 @@ fi
 
 %files -n python-gnash
 %defattr(-,root,root,-)
-%{python_sitearch}/*
+%{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Wed Dec 30 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-1
+- Update to 0.8.6, increase epoch.
+
 * Thu Sep 10 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.8.20090910bzr11506
 - update to HEAD
 



From tomeu at fedoraproject.org  Wed Dec 30 09:57:19 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 30 Dec 2009 09:57:19 +0000 (UTC)
Subject: rpms/gnash/F-12 .cvsignore,1.16,1.17 sources,1.16,1.17
Message-ID: <20091230095719.A656711C00E9@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31392

Modified Files:
	.cvsignore sources 
Log Message:
Commit .cvsignore and sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	10 Sep 2009 13:36:28 -0000	1.16
+++ .cvsignore	30 Dec 2009 09:57:18 -0000	1.17
@@ -1,2 +1,2 @@
-gnash-0.9.0.20090910bzr11506.tar.gz
+gnash-0.8.6.tar.bz2
 gnash-splash.swf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	10 Sep 2009 13:36:28 -0000	1.16
+++ sources	30 Dec 2009 09:57:19 -0000	1.17
@@ -1,2 +1,2 @@
-0ea3593402c65fe303f73bade585b241  gnash-0.9.0.20090910bzr11506.tar.gz
+913bcbffd37c9603b84486227c65dce7  gnash-0.8.6.tar.bz2
 3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf



From tomeu at fedoraproject.org  Wed Dec 30 10:02:13 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 30 Dec 2009 10:02:13 +0000 (UTC)
Subject: rpms/gnash/F-12 gnash.spec,1.64,1.65
Message-ID: <20091230100213.7D6D211C00E9@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv358

Modified Files:
	gnash.spec 
Log Message:
clog


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-12/gnash.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnash.spec	30 Dec 2009 09:55:09 -0000	1.64
+++ gnash.spec	30 Dec 2009 10:02:13 -0000	1.65
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.8.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 #Release:        0.8.%{alphatag}%{?dist}
 Epoch:		1
 Summary:        GNU flash movie player
@@ -319,6 +319,9 @@ fi
 %{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Wed Dec 30 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-2
+- Bump release number
+
 * Wed Dec 30 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.8.6-1
 - Update to 0.8.6, increase epoch.
 



From belegdol at fedoraproject.org  Wed Dec 30 10:03:34 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Wed, 30 Dec 2009 10:03:34 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel gnome-chemistry-utils.spec, 1.44,
	1.45
Message-ID: <20091230100334.866DB11C00E9@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv889

Modified Files:
	gnome-chemistry-utils.spec 
Log Message:
* Wed Dec 30 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.9-3
- Rebuilt for goffice 0.7.17



Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gnome-chemistry-utils.spec	1 Dec 2009 16:38:03 -0000	1.44
+++ gnome-chemistry-utils.spec	30 Dec 2009 10:03:34 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
 Version:        0.10.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -103,7 +103,7 @@ chrpath --delete  $RPM_BUILD_ROOT%{_bind
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gcrystal-0.10
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gspectrum-0.10
 chrpath --delete  $RPM_BUILD_ROOT%{_bindir}/gchemtable-0.10
-chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.7.16/plugins/gchemutils/gchemutils.so
+chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.7.17/plugins/gchemutils/gchemutils.so
 chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/libgchempaint-0.10.so.%{version}
 chrpath --delete  $RPM_BUILD_ROOT%{_libexecdir}/chem-viewer
 chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/gchemutils/0.10/plugins/cdx/cdx.so
@@ -195,7 +195,7 @@ scrollkeeper-update -q || :
 %{_bindir}/gspectrum
 %{_bindir}/gspectrum-0.10
 %{_libdir}/gchemutils
-%{_libdir}/goffice/0.7.16/plugins/gchemutils
+%{_libdir}/goffice/0.7.17/plugins/gchemutils
 %{_libdir}/libgchempaint-0.10.so.*
 %{_libdir}/libgcpcanvas-0.10.so.*
 %{_libdir}/libgcu-0.10.so.*
@@ -236,6 +236,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Wed Dec 30 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.9-3
+- Rebuilt for goffice 0.7.17
+
 * Tue Dec 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.9-2
 - Rebuilt for new goffice
 - Added patch from to allow such build



From pawsa at fedoraproject.org  Wed Dec 30 10:30:53 2009
From: pawsa at fedoraproject.org (Pawel Salek)
Date: Wed, 30 Dec 2009 10:30:53 +0000 (UTC)
Subject: File balsa-2.4.2.tar.bz2 uploaded to lookaside cache by pawsa
Message-ID: <20091230103053.1C83F10F8A8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for balsa:

1eb90a92c089e194a595072a57c57394  balsa-2.4.2.tar.bz2



From pawsa at fedoraproject.org  Wed Dec 30 10:34:36 2009
From: pawsa at fedoraproject.org (Pawel Salek)
Date: Wed, 30 Dec 2009 10:34:36 +0000 (UTC)
Subject: rpms/balsa/devel .cvsignore, 1.31, 1.32 balsa.spec, 1.55, 1.56 sources,
	1.31, 1.32
Message-ID: <20091230103436.EF30811C00E9@cvs1.fedora.phx.redhat.com>

Author: pawsa

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7246

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to upstream 2.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	9 Aug 2009 12:12:23 -0000	1.31
+++ .cvsignore	30 Dec 2009 10:34:36 -0000	1.32
@@ -1 +1 @@
-balsa-2.4.1.tar.bz2
+balsa-2.4.2.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- balsa.spec	21 Aug 2009 12:34:38 -0000	1.55
+++ balsa.spec	30 Dec 2009 10:34:36 -0000	1.56
@@ -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 --with-gpgme
 
 Name:           balsa
-Version:        2.4.1
-Release:        2%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -13,8 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Requires: libesmtp >= 1.0.4
 Requires: scrollkeeper
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: NetworkManager-glib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gmime-devel >= 2.4.0
@@ -107,6 +106,9 @@ fi
 
 
 %changelog
+* Wed Dec 30 2009 Pawel Salek <salek at kth.se> - 2.4.2-1
+- update to upstream 2.4.2
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.1-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	9 Aug 2009 12:12:23 -0000	1.31
+++ sources	30 Dec 2009 10:34:36 -0000	1.32
@@ -1 +1 @@
-2ad6ebb3f058e5fbe9ec5e0f0017db28  balsa-2.4.1.tar.bz2
+1eb90a92c089e194a595072a57c57394  balsa-2.4.2.tar.bz2



From th0br0 at fedoraproject.org  Wed Dec 30 12:06:31 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Wed, 30 Dec 2009 12:06:31 +0000 (UTC)
Subject: File Guimup-0.2.1-src.tar.gz uploaded to lookaside cache by th0br0
Message-ID: <20091230120631.D590610F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for guimup:

13d06b8e0b8600eb9f89cc888be0d676  Guimup-0.2.1-src.tar.gz



From th0br0 at fedoraproject.org  Wed Dec 30 12:12:53 2009
From: th0br0 at fedoraproject.org (Andreas Osowski)
Date: Wed, 30 Dec 2009 12:12:53 +0000 (UTC)
Subject: rpms/guimup/devel Guimup-0.2.1-libmpdclient.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 guimup.spec, 1.7, 1.8 import.log, 1.1,
	1.2 sources, 1.2, 1.3 Guimup-0.1.4b-libmpdclient.patch, 1.1, NONE
Message-ID: <20091230121253.C786311C00E9@cvs1.fedora.phx.redhat.com>

Author: th0br0

Update of /cvs/pkgs/rpms/guimup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28354/devel

Modified Files:
	.cvsignore guimup.spec import.log sources 
Added Files:
	Guimup-0.2.1-libmpdclient.patch 
Removed Files:
	Guimup-0.1.4b-libmpdclient.patch 
Log Message:
Update to 0.2.1

Guimup-0.2.1-libmpdclient.patch:
 configure.ac            |    2 +-
 src/Makefile.am         |    2 --
 src/gm_library_mpdcom.h |    2 +-
 src/gm_mpdcom.h         |    2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE Guimup-0.2.1-libmpdclient.patch ---
diff -Naur Guimup-0.2.1.orig/configure.ac Guimup-0.2.1/configure.ac
--- Guimup-0.2.1.orig/configure.ac	2009-12-01 10:21:16.000000000 +0100
+++ Guimup-0.2.1/configure.ac	2009-12-08 14:37:22.000000000 +0100
@@ -27,7 +27,7 @@
 
 LT_INIT
 
-PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.16 libsoup-2.4 >= 2.26 gthread-2.0 >= 2.20])
+PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.16 libsoup-2.4 >= 2.26 gthread-2.0 >= 2.20 libmpd])
 AC_SUBST(GUIMUP_CFLAGS)
 AC_SUBST(GUIMUP_LIBS)
 
diff -Naur Guimup-0.2.1.orig/src/gm_library_mpdcom.h Guimup-0.2.1/src/gm_library_mpdcom.h
--- Guimup-0.2.1.orig/src/gm_library_mpdcom.h	2009-05-22 14:26:48.000000000 +0200
+++ Guimup-0.2.1/src/gm_library_mpdcom.h	2009-12-08 15:01:25.000000000 +0100
@@ -32,7 +32,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include "gm_commandlist.h"
 #include "gm_itemlist.h"
diff -Naur Guimup-0.2.1.orig/src/gm_mpdcom.h Guimup-0.2.1/src/gm_mpdcom.h
--- Guimup-0.2.1.orig/src/gm_mpdcom.h	2009-05-21 13:51:56.000000000 +0200
+++ Guimup-0.2.1/src/gm_mpdcom.h	2009-12-08 15:01:27.000000000 +0100
@@ -33,7 +33,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include <sys/types.h>
 
diff -Naur Guimup-0.2.1.orig/src/Makefile.am Guimup-0.2.1/src/Makefile.am
--- Guimup-0.2.1.orig/src/Makefile.am	2009-05-20 18:46:31.000000000 +0200
+++ Guimup-0.2.1/src/Makefile.am	2009-12-08 14:38:02.000000000 +0100
@@ -19,8 +19,6 @@
 	gm_player.h \
 	gm_player.cc \
 	gm_player_pix.h \
-	libmpdclient.c \
-	libmpdclient.h \
 	gm_scroller.cc \
 	gm_scroller.h \
 	gm_config.h \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Apr 2009 20:10:03 -0000	1.2
+++ .cvsignore	30 Dec 2009 12:12:53 -0000	1.3
@@ -1 +1 @@
-Guimup-0.1.4bsrc.tar.gz
+Guimup-0.2.1-src.tar.gz


Index: guimup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/guimup.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- guimup.spec	25 Jul 2009 01:52:53 -0000	1.7
+++ guimup.spec	30 Dec 2009 12:12:53 -0000	1.8
@@ -1,18 +1,20 @@
 Name:		guimup
-Version:	0.1.4
-Release:	8.b%{?dist}
+Version:	0.2.1
+Release:	2%{?dist}
 Summary:	A GTKmm based drag-&-drop oriented client for MPD
 
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		http://www.coonsden.com/
-Source0:	http://downloads.sourceforge.net/musicpd/Guimup-%{version}bsrc.tar.gz
+Source0:	http://downloads.sourceforge.net/musicpd/Guimup-%{version}-src.tar.gz
 Source1:	guimup.desktop
-Patch0:		Guimup-%{version}b-libmpdclient.patch
+Patch0:		Guimup-%{version}-libmpdclient.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	gettext-devel
 BuildRequires:	intltool
-BuildRequires:	gtkmm24-devel
+BuildRequires:	gtkmm24-devel >= 2.16
+BuildRequires:	libsoup-devel >= 2.26
 BuildRequires:	libmpd-devel
 BuildRequires:	libtool
 BuildRequires:	desktop-file-utils
@@ -29,9 +31,11 @@ playback functions are directly accessib
 Guimup turns MPD into a perfect desktop music player.
 
 %prep
-%setup -q -n Guimup-%{version}bsrc
+%setup -q -n Guimup-%{version}
 rm src/libmpdclient*
 %patch0 -p1
+rm ltmain.sh
+libtoolize
 autoreconf -f
 
 %build
@@ -67,6 +71,12 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Dec 30 2009 Andreas Osowski <th0br0 at mkdir.name> 0.2.1-2
+- Libtool fixes
+ 
+* Tue Dec  8 2009 Andreas Osowski <th0br0 at mkdir.name> 0.2.1-1
+- Updated to version 0.2.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-8.b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 Apr 2009 20:10:03 -0000	1.1
+++ import.log	30 Dec 2009 12:12:53 -0000	1.2
@@ -1 +1,2 @@
 guimup-0_1_4-6_b_fc10:HEAD:guimup-0.1.4-6.b.fc10.src.rpm:1240949243
+guimup-0_2_1-2_fc12:HEAD:guimup-0.2.1-2.fc12.src.rpm:1262175084


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Apr 2009 20:10:03 -0000	1.2
+++ sources	30 Dec 2009 12:12:53 -0000	1.3
@@ -1 +1 @@
-76bf768bfc8e6a55b176e35529d93e47  Guimup-0.1.4bsrc.tar.gz
+13d06b8e0b8600eb9f89cc888be0d676  Guimup-0.2.1-src.tar.gz


--- Guimup-0.1.4b-libmpdclient.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Dec 30 12:12:59 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 12:12:59 +0000 (UTC)
Subject: rpms/mcs/F-11 libmcs-0.7.1-keyfile-change-string.patch, NONE,
	1.1 libmcs-0.7.1-sysconfdir.patch, NONE,
	1.1 libmcs-0.7.1-util.patch, NONE, 1.1 libmcs-0.7.1-walk.patch,
	NONE, 1.1 mcs.spec, 1.10, 1.11
Message-ID: <20091230121259.26E5011C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/mcs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28408

Modified Files:
	mcs.spec 
Added Files:
	libmcs-0.7.1-keyfile-change-string.patch 
	libmcs-0.7.1-sysconfdir.patch libmcs-0.7.1-util.patch 
	libmcs-0.7.1-walk.patch 
Log Message:
sync with Rawhide

libmcs-0.7.1-keyfile-change-string.patch:
 keyfile.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libmcs-0.7.1-keyfile-change-string.patch ---
diff -Nur libmcs-0.7.1-orig/src/backends/default/keyfile.c libmcs-0.7.1/src/backends/default/keyfile.c
--- libmcs-0.7.1-orig/src/backends/default/keyfile.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/backends/default/keyfile.c	2009-12-29 20:54:48.213678077 +0100
@@ -316,6 +316,8 @@
 
 		if (value != NULL)
 			line->value = strdup(value);
+		else
+			line->value = NULL;
 	}
 	else
 		keyfile_create_line(sec, key, value);

libmcs-0.7.1-sysconfdir.patch:
 buildsys.mk.in |    1 +
 extra.mk.in    |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE libmcs-0.7.1-sysconfdir.patch ---
diff -Nur libmcs-0.7.1-orig/buildsys.mk.in libmcs-0.7.1/buildsys.mk.in
--- libmcs-0.7.1-orig/buildsys.mk.in	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/buildsys.mk.in	2009-12-23 23:40:12.000000000 +0100
@@ -65,6 +65,7 @@
 includesubdir ?= ${PACKAGE}
 mandir = @mandir@
 mansubdir ?= man1
+sysconfdir = @sysconfdir@
 
 OBJS1 = ${SRCS:.c=.o}
 OBJS2 = ${OBJS1:.cc=.o}
diff -Nur libmcs-0.7.1-orig/extra.mk.in libmcs-0.7.1/extra.mk.in
--- libmcs-0.7.1-orig/extra.mk.in	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/extra.mk.in	2009-12-23 23:40:26.000000000 +0100
@@ -7,3 +7,4 @@
 KCONFIG_FLAGS = @KCONFIG_FLAGS@
 KCONFIG_LIBS = @KCONFIG_LIBS@
 plugindir = ${libdir}/mcs
+MCS_SYSCONFDIR = ${sysconfdir}

libmcs-0.7.1-util.patch:
 mcs_util.c |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

--- NEW FILE libmcs-0.7.1-util.patch ---
diff -Nur libmcs-0.7.1-orig/src/libmcs/mcs_util.c libmcs-0.7.1/src/libmcs/mcs_util.c
--- libmcs-0.7.1-orig/src/libmcs/mcs_util.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/libmcs/mcs_util.c	2009-12-24 18:26:15.000000000 +0100
@@ -56,7 +56,7 @@
  *
  * \param str The string to duplicate.
  * \param len The maximum allowed length of the string.
- * \return The length of the string or len, whichever is smaller.
+ * \return The pointer to a copy of the string. Free this with free().
  */
 char *
 mcs_strndup(const char *str, size_t len)
@@ -68,7 +68,7 @@
 		return NULL;
 
 	memcpy(out, str, nlen);
-	out[len] = '\0';
+	out[nlen] = '\0';
 
 	return out;
 }
@@ -146,16 +146,22 @@
 {
 	size_t dsize = strlen(dest);
 	size_t len = strlen(src);
-	size_t res = dsize + len;
+	size_t res;
 
 	dest += dsize;
 	count -= dsize;
 
-	if (len >= count)
-		len = count - 1;
-
+	if (len >= count) {
+        if (count>0) {
+            len = count - 1;
+        }
+        else {
+            len = 0;
+        }
+    }
 	memcpy(dest, src, len);
 	dest[len] = 0;
+    res = dsize + len;
 
 	return res;
 }
@@ -172,15 +178,16 @@
  */
 size_t mcs_strlcpy(char *dest, const char *src, size_t size)
 {
-	size_t ret = strlen(src);
+	size_t srclen = strlen(src);
+    size_t retlen = 0;
 
 	if (size != 0)
 	{
-		size_t len = (ret >= size) ? size - 1 : ret;
-		memcpy(dest, src, len);
-		dest[len] = '\0';
+		retlen = (srclen >= size) ? size - 1 : srclen;
+		memcpy(dest, src, retlen);
+		dest[retlen] = '\0';
 	}
 
-	return ret;
+	return retlen;
 }
 

libmcs-0.7.1-walk.patch:
 mcs_walk_config.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libmcs-0.7.1-walk.patch ---
diff -Nur libmcs-0.7.1-orig/src/tools/mcs-walk-config/mcs_walk_config.c libmcs-0.7.1/src/tools/mcs-walk-config/mcs_walk_config.c
--- libmcs-0.7.1-orig/src/tools/mcs-walk-config/mcs_walk_config.c	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/src/tools/mcs-walk-config/mcs_walk_config.c	2009-12-24 00:10:01.000000000 +0100
@@ -37,7 +37,7 @@
 {
 	mcs_handle_t *h;
 	mowgli_queue_t *groups, *i;
-	int entries = 0, sections = 0;
+	int entries = 0, sections = 0, avgentries = 0;
 
 	if (argc < 2)
 	{
@@ -75,8 +75,9 @@
 	mowgli_queue_destroy(groups);
 	mcs_fini();
 
+    avgentries = sections ? (entries/sections) : 0;
 	printf("\n%d entries across %d groups, average %d entries per group\n",
-		entries, sections, entries / sections);
+		entries, sections, avgentries);
 
 	return 0;
 }


Index: mcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcs/F-11/mcs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mcs.spec	26 Feb 2009 00:02:04 -0000	1.10
+++ mcs.spec	30 Dec 2009 12:12:59 -0000	1.11
@@ -1,16 +1,30 @@
 Name:           mcs
 Version:        0.7.1
-Release:        2%{?dist}
-Summary:        A configuration file abstraction library
+Release:        9%{?dist}
+Summary:        Configuration file abstraction system
 
 Group:          Applications/System
 License:        BSD
-URL:            http://atheme.org/projects/mcs.shtml
+
+# 404 not found - http://atheme.org/projects/mcs.shtml
+URL:            http://atheme.org
+
 Source0:        http://distfiles.atheme.org/libmcs-%{version}.tgz
+# submitted upstream, build config fix
+Patch0: libmcs-0.7.1-sysconfdir.patch
+# submitted upstream, floating point exception fix
+Patch1: libmcs-0.7.1-walk.patch
+# submitted upstream, safety fixes in string utility functions
+Patch2: libmcs-0.7.1-util.patch
+# submitted upstream, safety fix for keyfile set_string function
+Patch3: libmcs-0.7.1-keyfile-change-string.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  GConf2-devel
 BuildRequires:  libmowgli-devel >= 0.4.0
+BuildRequires:  GConf2-devel
+# would be needed for kconfig support
+#BuildRequires:  kdelibs-devel
 
 %description
 mcs is a library and set of userland tools which abstract the storage of
@@ -25,8 +39,12 @@ specific data storage requirement, nor i
 software suite.
 
 %package libs
-Summary:        Library files for the mcs configuration system
+Summary:        Configuration file abstraction library
 Group:          System Environment/Libraries
+Provides:       libmcs = %{version}-%{release}
+%{?_isa:
+Provides:       libmcs%{?_isa} = %{version}-%{release}
+}
 
 %description libs
 mcs is a library and set of userland tools which abstract the storage of
@@ -45,6 +63,10 @@ This package contains the libraries nece
 %package devel
 Summary:        Development files for the mcs configuration system
 Group:          Development/Libraries
+Provides:       libmcs-devel = %{version}-%{release}
+%{?_isa:
+Provides:       libmcs-devel%{?_isa} = %{version}-%{release}
+}
 
 Requires:       mcs-libs = %{version}-%{release}
 Requires:       pkgconfig
@@ -66,9 +88,14 @@ This package contains the files necessar
 
 %prep
 %setup -q -n libmcs-%{version}
+%patch0 -p1 -b .sysconfdir
+%patch1 -p1 -b .walk
+%patch2 -p1 -b .util
+%patch3 -p1 -b .keyfile-change-string
 
 # Make the build system more verbose
-perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
+#perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
+sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 # The build generates a wrong SONAME, fix it.
 perl -pi -e "s/-soname=.*'/-soname=\\\$\{LIB\}.\\\$\{LIB_MAJOR\}'/" configure
@@ -76,6 +103,7 @@ perl -pi -e "s/-soname=.*'/-soname=\\\$\
 %build
 %configure \
     --enable-gconf \
+    --disable-kconfig \
     --disable-dependency-tracking
 
 make %{?_smp_mflags}
@@ -83,12 +111,12 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-echo "gconf" > $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
-chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
+# Example for a default site-wide storage backend setting:
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+#echo "gconf" > $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
+#chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
 
 
 %clean
@@ -106,17 +134,42 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
-%config(noreplace) %{_sysconfdir}/mcs-backend
+#%config(noreplace) %{_sysconfdir}/mcs-backend
 %{_libdir}/*.so.*
 %{_libdir}/mcs
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
-%{_includedir}/libmcs
+%{_includedir}/libmcs/
 %{_libdir}/pkgconfig/libmcs.pc
 
 %changelog
+* Tue Dec 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-9
+- Apply safety fix to keyfile set_string function.
+
+* Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-8
+- Apply safety fixes to string utility functions.
+
+* Thu Dec 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-7
+- Fix floating point exception in mcs-walk-config tool.
+
+* Wed Dec 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-6
+- Add --disable-kconfig to fix build requirements usage (#529696).
+  The kconfig backend has never been built or included before.
+- Fix MCS_SYSCONFDIR build config value, so /etc/mcs-backend file is found.
+  Don't provide a default site-wide config file anymore. Making it default
+  to "gconf" would switch backends for everyone from "default".
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun  5 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-4
+- Rebuild for new libmowgli SONAME.
+
+* Thu Jun  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-3
+- Add virtual Provides for libmcs/libmcs-devel.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From cwickert at fedoraproject.org  Wed Dec 30 13:29:33 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Dec 2009 13:29:33 +0000 (UTC)
Subject: File xfce4-panel-4.6.3.tar.bz2 uploaded to lookaside cache by cwickert
Message-ID: <20091230132933.4ED4910F8A8@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xfce4-panel:

0b715abb929220f136483ccd7303ff62  xfce4-panel-4.6.3.tar.bz2



From rjones at fedoraproject.org  Wed Dec 30 13:47:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:47:21 +0000 (UTC)
Subject: rpms/cduce/devel cduce.spec,1.15,1.16
Message-ID: <20091230134721.73FA011C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16363

Modified Files:
	cduce.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cduce.spec	30 Sep 2009 12:23:14 -0000	1.15
+++ cduce.spec	30 Dec 2009 13:47:20 -0000	1.16
@@ -12,7 +12,7 @@
 
 Name:           cduce
 Version:        0.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Modern XML-oriented functional language
 
 Group:          Development/Libraries
@@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.3-4
+- Rebuild for OCaml 3.11.2.
+
 * Wed Sep 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.3-3
 - Rebuild for OCaml 3.11.1.
 - Reenable ocamlduce 3.11.1.0.



From rjones at fedoraproject.org  Wed Dec 30 13:47:28 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:47:28 +0000 (UTC)
Subject: rpms/ocaml-ancient/devel ocaml-ancient.spec,1.3,1.4
Message-ID: <20091230134728.CE20B11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ancient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16429

Modified Files:
	ocaml-ancient.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-ancient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ancient/devel/ocaml-ancient.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ocaml-ancient.spec	22 Sep 2009 19:55:31 -0000	1.3
+++ ocaml-ancient.spec	30 Dec 2009 13:47:28 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           ocaml-ancient
 Version:        0.9.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml library for large memory structures and sharing
 
 Group:          Development/Libraries
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.0-4
+- Rebuild for OCaml 3.11.2.
+
 * Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.0-3
 - ExcludeArch sparc64 s390 s390x  no ocaml
 



From rjones at fedoraproject.org  Wed Dec 30 13:47:35 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:47:35 +0000 (UTC)
Subject: rpms/ocaml-augeas/devel ocaml-augeas.spec,1.7,1.8
Message-ID: <20091230134735.A3CED11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16482

Modified Files:
	ocaml-augeas.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-augeas/devel/ocaml-augeas.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ocaml-augeas.spec	25 Jul 2009 19:50:26 -0000	1.7
+++ ocaml-augeas.spec	30 Dec 2009 13:47:35 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           ocaml-augeas
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OCaml bindings for Augeas configuration API
 
 Group:          Development/Libraries
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-7
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:47:42 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:47:42 +0000 (UTC)
Subject: rpms/ocaml-autoconf/devel ocaml-autoconf.spec,1.8,1.9
Message-ID: <20091230134742.A2EA411C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16515

Modified Files:
	ocaml-autoconf.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-autoconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-autoconf/devel/ocaml-autoconf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-autoconf.spec	12 Oct 2009 18:49:15 -0000	1.8
+++ ocaml-autoconf.spec	30 Dec 2009 13:47:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           ocaml-autoconf
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Autoconf macros for OCaml
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-3
+- Rebuild for OCaml 3.11.2.
+
 * Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-2
 - New upstream version 1.1.
 - Fix source URL.



From rjones at fedoraproject.org  Wed Dec 30 13:47:49 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:47:49 +0000 (UTC)
Subject: rpms/ocaml-cairo/devel ocaml-cairo.spec,1.16,1.17
Message-ID: <20091230134749.9430111C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16570

Modified Files:
	ocaml-cairo.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-cairo.spec	7 Dec 2009 15:00:58 -0000	1.16
+++ ocaml-cairo.spec	30 Dec 2009 13:47:49 -0000	1.17
@@ -13,7 +13,7 @@
 Name:           ocaml-cairo
 Epoch:          1
 Version:        1.2.0
-Release:        0.1.git%{commit}%{?dist}
+Release:        0.2.git%{commit}%{?dist}
 Summary:        OCaml library for accessing cairo graphics
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1:1.2.0-0.2.gita5c5ee9f
+- Rebuild for OCaml 3.11.2.
+
 * Mon Dec  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1:1.2.0-0.1.gita5c5ee9f
 - So we are wrong, version numbers did NOT roll backwards.
 - Revert to current git head (a5c5ee9f) which is a pre-release of 1.2.0



From rjones at fedoraproject.org  Wed Dec 30 13:47:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:47:56 +0000 (UTC)
Subject: rpms/ocaml-calendar/devel ocaml-calendar.spec,1.17,1.18
Message-ID: <20091230134756.94C4A11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16634

Modified Files:
	ocaml-calendar.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ocaml-calendar.spec	8 Oct 2009 13:31:16 -0000	1.17
+++ ocaml-calendar.spec	30 Dec 2009 13:47:56 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           ocaml-calendar
 Version:        2.01.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.01.1-3
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 2.01.1-2
 - New upstream release 2.01.1.
 - Patch META file so it doesn't include the library twice.



From rjones at fedoraproject.org  Wed Dec 30 13:48:03 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:48:03 +0000 (UTC)
Subject: rpms/ocaml-camlidl/devel ocaml-camlidl.spec,1.9,1.10
Message-ID: <20091230134803.976C711C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlidl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16663

Modified Files:
	ocaml-camlidl.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-camlidl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlidl/devel/ocaml-camlidl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-camlidl.spec	25 Jul 2009 19:52:19 -0000	1.9
+++ ocaml-camlidl.spec	30 Dec 2009 13:48:03 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           ocaml-camlidl
 Version:        1.05
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Stub code generator and COM binding for Objective Caml
 
 Group:          Development/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.05-11
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:48:11 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:48:11 +0000 (UTC)
Subject: rpms/ocaml-camlimages/devel ocaml-camlimages.spec,1.22,1.23
Message-ID: <20091230134811.17D0811C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16712

Modified Files:
	ocaml-camlimages.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ocaml-camlimages.spec	16 Oct 2009 09:31:31 -0000	1.22
+++ ocaml-camlimages.spec	30 Dec 2009 13:48:10 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name:           ocaml-camlimages
 Version:        3.0.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-15
+- Rebuild for OCaml 3.11.2.
+
 * Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-14
 - ocaml-camlimages: TIFF reader multiple integer overflows
   (CVE 2009-3296 / RHBZ#528732).



From rjones at fedoraproject.org  Wed Dec 30 13:48:19 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:48:19 +0000 (UTC)
Subject: rpms/ocaml-camlp5/devel ocaml-camlp5.spec,1.11,1.12
Message-ID: <20091230134819.2D56311C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlp5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16773

Modified Files:
	ocaml-camlp5.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-camlp5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlp5/devel/ocaml-camlp5.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-camlp5.spec	25 Jul 2009 19:52:51 -0000	1.11
+++ ocaml-camlp5.spec	30 Dec 2009 13:48:18 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           ocaml-camlp5
 Version:        5.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Classical version of camlp4 OCaml preprocessor
 
 Group:          Development/Libraries
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 5.12-3
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:48:26 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:48:26 +0000 (UTC)
Subject: rpms/ocaml-camomile/devel ocaml-camomile.spec,1.10,1.11
Message-ID: <20091230134826.9CEBC11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camomile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16832

Modified Files:
	ocaml-camomile.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-camomile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camomile/devel/ocaml-camomile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-camomile.spec	8 Oct 2009 12:04:15 -0000	1.10
+++ ocaml-camomile.spec	30 Dec 2009 13:48:26 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           ocaml-camomile
 Version:        0.7.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unicode library for OCaml
 
 Group:          Development/Libraries
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.7.2-2
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.7.2-1
 - New upstream version 0.7.2.
 



From rjones at fedoraproject.org  Wed Dec 30 13:48:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:48:33 +0000 (UTC)
Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.13,1.14
Message-ID: <20091230134833.ADBA711C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16864

Modified Files:
	ocaml-cil.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-cil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-cil.spec	7 Dec 2009 16:42:28 -0000	1.13
+++ ocaml-cil.spec	30 Dec 2009 13:48:33 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:           ocaml-cil
 Version:        1.3.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -196,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3.7-5
+- Rebuild for OCaml 3.11.2.
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.3.7-4
 - rebuild against perl 5.10.1
 



From rjones at fedoraproject.org  Wed Dec 30 13:48:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:48:40 +0000 (UTC)
Subject: rpms/ocaml-cmigrep/devel ocaml-cmigrep.spec,1.13,1.14
Message-ID: <20091230134840.B2A9211C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cmigrep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16919

Modified Files:
	ocaml-cmigrep.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-cmigrep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/ocaml-cmigrep.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-cmigrep.spec	25 Jul 2009 19:53:53 -0000	1.13
+++ ocaml-cmigrep.spec	30 Dec 2009 13:48:40 -0000	1.14
@@ -8,7 +8,7 @@
 
 Name:           ocaml-cmigrep
 Version:        1.5
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Search OCaml compiled interface (cmi) files
 
 Group:          Development/Libraries
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.5-14
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:48:48 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:48:48 +0000 (UTC)
Subject: rpms/ocaml-cryptokit/devel ocaml-cryptokit.spec,1.10,1.11
Message-ID: <20091230134848.A3FD711C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cryptokit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16973

Modified Files:
	ocaml-cryptokit.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-cryptokit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cryptokit/devel/ocaml-cryptokit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-cryptokit.spec	25 Jul 2009 19:54:10 -0000	1.10
+++ ocaml-cryptokit.spec	30 Dec 2009 13:48:48 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           ocaml-cryptokit
 Version:        1.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OCaml library of cryptographic and hash functions
 
 Group:          Development/Libraries
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3-11
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:48:55 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:48:55 +0000 (UTC)
Subject: rpms/ocaml-csv/devel ocaml-csv.spec,1.13,1.14
Message-ID: <20091230134855.7F1B211C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-csv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17025

Modified Files:
	ocaml-csv.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-csv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-csv/devel/ocaml-csv.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-csv.spec	25 Jul 2009 19:54:28 -0000	1.13
+++ ocaml-csv.spec	30 Dec 2009 13:48:55 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ocaml-csv
 Version:        1.1.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OCaml library for reading and writing CSV files
 
 Group:          Development/Libraries
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1.7-7
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:49:02 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:02 +0000 (UTC)
Subject: rpms/ocaml-curl/devel ocaml-curl.spec,1.14,1.15
Message-ID: <20091230134902.75B7A11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17062

Modified Files:
	ocaml-curl.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-curl/devel/ocaml-curl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-curl.spec	25 Jul 2009 19:54:46 -0000	1.14
+++ ocaml-curl.spec	30 Dec 2009 13:49:02 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           ocaml-curl
 Version:        0.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml Curl library (ocurl)
 
 Group:          Development/Libraries
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.1-3
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:49:09 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:09 +0000 (UTC)
Subject: rpms/ocaml-curses/devel ocaml-curses.spec,1.14,1.15
Message-ID: <20091230134909.756AE11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-curses/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17115

Modified Files:
	ocaml-curses.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-curses/devel/ocaml-curses.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-curses.spec	5 Oct 2009 14:37:02 -0000	1.14
+++ ocaml-curses.spec	30 Dec 2009 13:49:09 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           ocaml-curses
 Version:        1.0.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        OCaml bindings for ncurses
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.3-8
+- Rebuild for OCaml 3.11.2.
+
 * Mon Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.3-7
 - Use ncursesw for wide character support.
 



From rjones at fedoraproject.org  Wed Dec 30 13:49:16 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:16 +0000 (UTC)
Subject: rpms/ocaml-dbus/devel ocaml-dbus.spec,1.14,1.15
Message-ID: <20091230134916.9D70511C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17165

Modified Files:
	ocaml-dbus.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/ocaml-dbus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-dbus.spec	8 Oct 2009 12:06:57 -0000	1.14
+++ ocaml-dbus.spec	30 Dec 2009 13:49:16 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           ocaml-dbus
 Version:        0.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for using D-Bus
 
 Group:          Development/Libraries
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.24-2
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.24-1
 - New upstream version 0.24.
 



From rjones at fedoraproject.org  Wed Dec 30 13:49:23 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:23 +0000 (UTC)
Subject: rpms/ocaml-deriving/devel ocaml-deriving.spec,1.8,1.9
Message-ID: <20091230134923.8F25811C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-deriving/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17201

Modified Files:
	ocaml-deriving.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-deriving.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-deriving/devel/ocaml-deriving.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-deriving.spec	25 Jul 2009 19:55:41 -0000	1.8
+++ ocaml-deriving.spec	30 Dec 2009 13:49:23 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           ocaml-deriving
 Version:        0.1.1a
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Extension to OCaml for deriving functions from types
 
 Group:          Development/Libraries
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1.1a-10
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1a-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:49:30 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:30 +0000 (UTC)
Subject: rpms/ocaml-expat/devel ocaml-expat.spec,1.15,1.16
Message-ID: <20091230134930.B85F711C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-expat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17248

Modified Files:
	ocaml-expat.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-expat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-expat/devel/ocaml-expat.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocaml-expat.spec	25 Jul 2009 19:55:59 -0000	1.15
+++ ocaml-expat.spec	30 Dec 2009 13:49:30 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           ocaml-expat
 Version:        0.9.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        OCaml wrapper for the Expat XML parsing library
 
 Group:          Development/Libraries
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.1-18
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:49:37 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:37 +0000 (UTC)
Subject: rpms/ocaml-extlib/devel ocaml-extlib.spec,1.12,1.13
Message-ID: <20091230134937.A4CFA11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-extlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17307

Modified Files:
	ocaml-extlib.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-extlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-extlib/devel/ocaml-extlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-extlib.spec	25 Jul 2009 19:56:14 -0000	1.12
+++ ocaml-extlib.spec	30 Dec 2009 13:49:37 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           ocaml-extlib
 Version:        1.5.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        OCaml ExtLib additions to the standard library
 
 Group:          Development/Libraries
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/extlib/*.ml
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.5.1-9
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:49:45 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:45 +0000 (UTC)
Subject: rpms/ocaml-gettext/devel ocaml-gettext.spec,1.13,1.14
Message-ID: <20091230134945.3804611C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17349

Modified Files:
	ocaml-gettext.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-gettext/devel/ocaml-gettext.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-gettext.spec	2 Nov 2009 10:53:39 -0000	1.13
+++ ocaml-gettext.spec	30 Dec 2009 13:49:45 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ocaml-gettext
 Version:        0.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for i18n
 
 Group:          Development/Libraries
@@ -219,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3.3-2
+- Rebuild for OCaml 3.11.2.
+
 * Mon Nov  2 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3.3-1
 - New upstream release 0.3.3 (mainly small bugfixes).
 - This requires ocaml-fileutils 0.4.0 and is incompatible with



From rjones at fedoraproject.org  Wed Dec 30 13:49:52 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:52 +0000 (UTC)
Subject: rpms/ocaml-gsl/devel ocaml-gsl.spec,1.8,1.9
Message-ID: <20091230134952.C7BA511C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-gsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17392

Modified Files:
	ocaml-gsl.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-gsl/devel/ocaml-gsl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-gsl.spec	25 Jul 2009 19:57:30 -0000	1.8
+++ ocaml-gsl.spec	30 Dec 2009 13:49:52 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           ocaml-gsl
 Version:        0.6.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Interface to GSL (GNU scientific library) for OCaml
 
 Group:          Development/Libraries
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.6.0-10
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:49:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:49:59 +0000 (UTC)
Subject: rpms/ocaml-json-static/devel ocaml-json-static.spec,1.9,1.10
Message-ID: <20091230134959.A341211C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-json-static/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17438

Modified Files:
	ocaml-json-static.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-json-static.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-json-static/devel/ocaml-json-static.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-json-static.spec	8 Oct 2009 12:19:49 -0000	1.9
+++ ocaml-json-static.spec	30 Dec 2009 13:49:59 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           ocaml-json-static
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml JSON validator and converter (syntax extension)
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.8-2
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.8-1
 - New upstream version 0.9.8.
 



From rjones at fedoraproject.org  Wed Dec 30 13:50:06 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:50:06 +0000 (UTC)
Subject: rpms/ocaml-json-wheel/devel ocaml-json-wheel.spec,1.8,1.9
Message-ID: <20091230135006.79F6311C0375@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-json-wheel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17494

Modified Files:
	ocaml-json-wheel.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-json-wheel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-json-wheel/devel/ocaml-json-wheel.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-json-wheel.spec	25 Jul 2009 19:57:58 -0000	1.8
+++ ocaml-json-wheel.spec	30 Dec 2009 13:50:06 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           ocaml-json-wheel
 Version:        1.0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml library for parsing JSON
 
 Group:          Development/Libraries
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.6-3
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:50:13 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:50:13 +0000 (UTC)
Subject: rpms/ocaml-lablgl/devel ocaml-lablgl.spec,1.16,1.17
Message-ID: <20091230135013.C27A311C0375@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lablgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17527

Modified Files:
	ocaml-lablgl.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-lablgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/ocaml-lablgl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-lablgl.spec	25 Jul 2009 19:58:13 -0000	1.16
+++ ocaml-lablgl.spec	30 Dec 2009 13:50:13 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgl
 Version:        1.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
@@ -144,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.04-3
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:50:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:50:21 +0000 (UTC)
Subject: rpms/ocaml-lablgtk/devel ocaml-lablgtk.spec,1.20,1.21
Message-ID: <20091230135021.024EC11C0375@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lablgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17572

Modified Files:
	ocaml-lablgtk.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-lablgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ocaml-lablgtk.spec	28 Sep 2009 15:44:19 -0000	1.20
+++ ocaml-lablgtk.spec	30 Dec 2009 13:50:20 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgtk
 Version:        2.14.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -153,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-3
+- Rebuild for OCaml 3.11.2.
+
 * Mon Sep 28 2009 Richard W.M. Jones <rjones at redhat.com> - 2.14.0-2
 - Ignore GtkSourceView2_types dependency (pure type-only *.cmi file).
 



From rjones at fedoraproject.org  Wed Dec 30 13:50:27 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:50:27 +0000 (UTC)
Subject: rpms/ocaml-lacaml/devel ocaml-lacaml.spec,1.13,1.14
Message-ID: <20091230135027.DE31511C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lacaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17618

Modified Files:
	ocaml-lacaml.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-lacaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/ocaml-lacaml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-lacaml.spec	4 Oct 2009 20:47:49 -0000	1.13
+++ ocaml-lacaml.spec	30 Dec 2009 13:50:27 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ocaml-lacaml
 Version:        5.4.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BLAS/LAPACK-interface for OCaml
 
 Group:          Development/Libraries
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 5.4.7-2
+- Rebuild for OCaml 3.11.2.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 5.4.7-1
 - New upstream release 5.4.7.
 



From rjones at fedoraproject.org  Wed Dec 30 13:50:34 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:50:34 +0000 (UTC)
Subject: rpms/ocaml-libvirt/devel ocaml-libvirt.spec,1.33,1.34
Message-ID: <20091230135034.C635011C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17662

Modified Files:
	ocaml-libvirt.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ocaml-libvirt.spec	25 Jul 2009 19:59:05 -0000	1.33
+++ ocaml-libvirt.spec	30 Dec 2009 13:50:34 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           ocaml-libvirt
 Version:        0.6.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OCaml binding for libvirt
 
 Group:          Development/Libraries
@@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.6.1.0-7
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:50:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:50:41 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel ocaml-lwt.spec,1.10,1.11
Message-ID: <20091230135041.A614511C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17694

Modified Files:
	ocaml-lwt.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-lwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-lwt.spec	12 Oct 2009 08:50:06 -0000	1.10
+++ ocaml-lwt.spec	30 Dec 2009 13:50:41 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           ocaml-lwt
 Version:        2.0.0
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc1%{?dist}
 Summary:        OCaml lightweight thread library
 
 Group:          Development/Libraries
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-0.3.rc1
+- Rebuild for OCaml 3.11.2.
+
 * Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-0.2.rc1.fc13
 - ocaml-react is now in Fedora, so build this package.
 - Missing BR on camlp4.



From rjones at fedoraproject.org  Wed Dec 30 13:50:48 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:50:48 +0000 (UTC)
Subject: rpms/ocaml-mikmatch/devel ocaml-mikmatch.spec,1.9,1.10
Message-ID: <20091230135048.9110611C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mikmatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17749

Modified Files:
	ocaml-mikmatch.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-mikmatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mikmatch/devel/ocaml-mikmatch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-mikmatch.spec	8 Oct 2009 12:52:18 -0000	1.9
+++ ocaml-mikmatch.spec	30 Dec 2009 13:50:48 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mikmatch
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml extension for pattern matching with regexps
 
 Group:          Development/Libraries
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.2-2
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.2-1
 - New upstream version 1.0.2.
 - Removed dynlink patch (now upstream).



From rjones at fedoraproject.org  Wed Dec 30 13:50:55 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:50:55 +0000 (UTC)
Subject: rpms/ocaml-mlgmpidl/devel ocaml-mlgmpidl.spec,1.5,1.6
Message-ID: <20091230135055.ED26011C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mlgmpidl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17796

Modified Files:
	ocaml-mlgmpidl.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-mlgmpidl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mlgmpidl/devel/ocaml-mlgmpidl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ocaml-mlgmpidl.spec	25 Jul 2009 19:59:52 -0000	1.5
+++ ocaml-mlgmpidl.spec	30 Dec 2009 13:50:55 -0000	1.6
@@ -11,7 +11,7 @@
 
 Name:           ocaml-mlgmpidl
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml interface to GMP and MPFR libraries
 Group:          Development/Libraries
 License:        LGPLv2
@@ -142,6 +142,9 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-4
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:51:02 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:02 +0000 (UTC)
Subject: rpms/ocaml-mysql/devel ocaml-mysql.spec,1.11,1.12
Message-ID: <20091230135102.B85F811C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17823

Modified Files:
	ocaml-mysql.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mysql/devel/ocaml-mysql.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-mysql.spec	16 Oct 2009 10:43:31 -0000	1.11
+++ ocaml-mysql.spec	30 Dec 2009 13:51:02 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mysql
 Version:        1.0.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        OCaml library for accessing MySQL databases
 
 Group:          Development/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-12
+- Rebuild for OCaml 3.11.2.
+
 * Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-11
 - Patch for CVE 2009-2942 Missing escape function (RHBZ#529321).
 



From rjones at fedoraproject.org  Wed Dec 30 13:51:09 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:09 +0000 (UTC)
Subject: rpms/ocaml-newt/devel ocaml-newt.spec,1.8,1.9
Message-ID: <20091230135109.AA83211C0375@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-newt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17878

Modified Files:
	ocaml-newt.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-newt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-newt/devel/ocaml-newt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-newt.spec	25 Jul 2009 20:00:32 -0000	1.8
+++ ocaml-newt.spec	30 Dec 2009 13:51:09 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           ocaml-newt
 Version:        0.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        OCaml library for using newt text mode window system
 
 Group:          Development/Libraries
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9-8
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:51:16 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:16 +0000 (UTC)
Subject: rpms/ocaml-ocamlgraph/devel ocaml-ocamlgraph.spec,1.10,1.11
Message-ID: <20091230135116.CA6E311C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17926

Modified Files:
	ocaml-ocamlgraph.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-ocamlgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/devel/ocaml-ocamlgraph.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-ocamlgraph.spec	8 Oct 2009 13:07:40 -0000	1.10
+++ ocaml-ocamlgraph.spec	30 Dec 2009 13:51:16 -0000	1.11
@@ -19,7 +19,7 @@
 
 Name:           ocaml-ocamlgraph
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for arc and node graphs
 
 Group:          Development/Libraries
@@ -134,6 +134,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3-2
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3-1
 - New upstream release 1.3.
 - A slightly different viewGraph-related patch is required for this release.



From rjones at fedoraproject.org  Wed Dec 30 13:51:23 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:23 +0000 (UTC)
Subject: rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.16,1.17
Message-ID: <20091230135123.E8F7111C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17960

Modified Files:
	ocaml-ocamlnet.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-ocamlnet.spec	29 Sep 2009 15:15:02 -0000	1.16
+++ ocaml-ocamlnet.spec	30 Dec 2009 13:51:23 -0000	1.17
@@ -6,7 +6,7 @@
 
 Name:           ocaml-ocamlnet
 Version:        2.2.9
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
@@ -243,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-16
+- Rebuild for OCaml 3.11.2.
+
 * Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-15
 - Force rebuild against newer lablgtk.
 



From rjones at fedoraproject.org  Wed Dec 30 13:51:30 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:30 +0000 (UTC)
Subject: rpms/ocaml-omake/devel ocaml-omake.spec,1.10,1.11
Message-ID: <20091230135130.C9A0611C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-omake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18008

Modified Files:
	ocaml-omake.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-omake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-omake/devel/ocaml-omake.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-omake.spec	17 Dec 2009 18:50:31 -0000	1.10
+++ ocaml-omake.spec	30 Dec 2009 13:51:30 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           ocaml-omake
 Version:        0.9.8.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Build system with automated dependency analysis
 
 Group:          Development/Tools
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.8.5-11
+- Rebuild for OCaml 3.11.2.
+
 * Thu Dec 17 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.8.5-10
 - Add 'Provides: omake' (RHBZ#548536).
 - Remove OCaml from the summary, since omake is not an OCaml-specific tool.



From rjones at fedoraproject.org  Wed Dec 30 13:51:37 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:37 +0000 (UTC)
Subject: rpms/ocaml-openin/devel ocaml-openin.spec,1.9,1.10
Message-ID: <20091230135137.B3BAA11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-openin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18055

Modified Files:
	ocaml-openin.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-openin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-openin/devel/ocaml-openin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-openin.spec	25 Jul 2009 20:01:39 -0000	1.9
+++ ocaml-openin.spec	30 Dec 2009 13:51:37 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           ocaml-openin
 Version:        20070524
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        OCaml syntax to locally open modules
 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 20070524-10
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070524-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:51:44 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:44 +0000 (UTC)
Subject: rpms/ocaml-ounit/devel ocaml-ounit.spec,1.8,1.9
Message-ID: <20091230135144.8AA0A11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ounit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18099

Modified Files:
	ocaml-ounit.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-ounit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ounit/devel/ocaml-ounit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-ounit.spec	25 Jul 2009 20:01:56 -0000	1.8
+++ ocaml-ounit.spec	30 Dec 2009 13:51:44 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ounit
 Version:        1.0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Unit test framework for OCaml
 
 Group:          Development/Libraries
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.3-7
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:51:51 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:51 +0000 (UTC)
Subject: rpms/ocaml-p3l/devel ocaml-p3l.spec,1.4,1.5
Message-ID: <20091230135151.CE78B11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-p3l/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18138

Modified Files:
	ocaml-p3l.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-p3l.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-p3l/devel/ocaml-p3l.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocaml-p3l.spec	25 Jul 2009 20:02:10 -0000	1.4
+++ ocaml-p3l.spec	30 Dec 2009 13:51:51 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ocaml-p3l
 Version:        2.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml compiler for parallel programs
 
 Group:          Development/Libraries
@@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.03-5
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:51:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:51:58 +0000 (UTC)
Subject: rpms/ocaml-pa-do/devel ocaml-pa-do.spec,1.14,1.15
Message-ID: <20091230135158.9AA4311C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pa-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18188

Modified Files:
	ocaml-pa-do.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-pa-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pa-do/devel/ocaml-pa-do.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-pa-do.spec	5 Nov 2009 15:17:20 -0000	1.14
+++ ocaml-pa-do.spec	30 Dec 2009 13:51:58 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           ocaml-pa-do
 Version:        0.8.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml syntax extension for delimited overloading
 
 Group:          Development/Libraries
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.8.10-3
+- Rebuild for OCaml 3.11.2.
+
 * Thu Nov  5 2009 Richard W.M. Jones <rjones at redhat.com> - 0.8.10-2
 - Correct Source0 URL.
 



From rjones at fedoraproject.org  Wed Dec 30 13:52:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:52:05 +0000 (UTC)
Subject: rpms/ocaml-pa-monad/devel ocaml-pa-monad.spec,1.9,1.10
Message-ID: <20091230135205.7B3A211C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pa-monad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18245

Modified Files:
	ocaml-pa-monad.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-pa-monad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pa-monad/devel/ocaml-pa-monad.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-pa-monad.spec	25 Jul 2009 20:02:38 -0000	1.9
+++ ocaml-pa-monad.spec	30 Dec 2009 13:52:05 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           ocaml-pa-monad
 Version:        6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml syntax extension for monads
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 6.0-4
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:52:12 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:52:12 +0000 (UTC)
Subject: rpms/ocaml-pcre/devel ocaml-pcre.spec,1.17,1.18
Message-ID: <20091230135212.B3CF211C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pcre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18270

Modified Files:
	ocaml-pcre.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-pcre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ocaml-pcre.spec	4 Oct 2009 21:13:14 -0000	1.17
+++ ocaml-pcre.spec	30 Dec 2009 13:52:12 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           ocaml-pcre
 Version:        6.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl compatibility regular expressions (PCRE) for OCaml
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 6.0.1-2
+- Rebuild for OCaml 3.11.2.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 6.0.1-1
 - New upstream version 6.0.1.
 



From rjones at fedoraproject.org  Wed Dec 30 13:52:19 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:52:19 +0000 (UTC)
Subject: rpms/ocaml-perl4caml/devel ocaml-perl4caml.spec,1.12,1.13
Message-ID: <20091230135219.B987E11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-perl4caml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18324

Modified Files:
	ocaml-perl4caml.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-perl4caml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/devel/ocaml-perl4caml.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-perl4caml.spec	7 Dec 2009 16:38:18 -0000	1.12
+++ ocaml-perl4caml.spec	30 Dec 2009 13:52:19 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           ocaml-perl4caml
 Version:        0.9.5
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        OCaml library for calling Perl libraries and code
 
 Group:          Development/Libraries
@@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.5-12
+- Rebuild for OCaml 3.11.2.
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.9.5-11
 - rebuild against perl 5.10.1
 



From rjones at fedoraproject.org  Wed Dec 30 13:52:26 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:52:26 +0000 (UTC)
Subject: rpms/ocaml-pgocaml/devel ocaml-pgocaml.spec,1.11,1.12
Message-ID: <20091230135226.AA3B711C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pgocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18404

Modified Files:
	ocaml-pgocaml.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-pgocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/ocaml-pgocaml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-pgocaml.spec	8 Oct 2009 13:33:39 -0000	1.11
+++ ocaml-pgocaml.spec	30 Dec 2009 13:52:26 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           ocaml-pgocaml
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for type-safe access to PostgreSQL databases
 
 Group:          Development/Libraries
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3-2
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3-1
 - New upstream version 1.3.
 - Simplify build system.



From rjones at fedoraproject.org  Wed Dec 30 13:52:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:52:33 +0000 (UTC)
Subject: rpms/ocaml-postgresql/devel ocaml-postgresql.spec,1.18,1.19
Message-ID: <20091230135233.ABA0811C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18432

Modified Files:
	ocaml-postgresql.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ocaml-postgresql.spec	16 Oct 2009 10:14:19 -0000	1.18
+++ ocaml-postgresql.spec	30 Dec 2009 13:52:33 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           ocaml-postgresql
 Version:        1.12.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for accessing PostgreSQL databases
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.12.3-2
+- Rebuild for OCaml 3.11.2.
+
 * Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.12.3-1
 - New upstream version 1.12.3.
 - This contains a SECURITY fix for:



From rjones at fedoraproject.org  Wed Dec 30 13:52:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:52:40 +0000 (UTC)
Subject: rpms/ocaml-preludeml/devel ocaml-preludeml.spec,1.5,1.6
Message-ID: <20091230135240.AE9B211C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-preludeml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18482

Modified Files:
	ocaml-preludeml.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-preludeml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-preludeml/devel/ocaml-preludeml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ocaml-preludeml.spec	25 Jul 2009 20:03:51 -0000	1.5
+++ ocaml-preludeml.spec	30 Dec 2009 13:52:40 -0000	1.6
@@ -8,7 +8,7 @@
 
 Name:           ocaml-preludeml
 Version:        0.1
-Release:        0.13.%{gitdate}%{?dist}
+Release:        0.14.%{gitdate}%{?dist}
 Summary:        OCaml utility functions
 
 Group:          Development/Libraries
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.14.20090113
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.13.20090113
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:52:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:52:47 +0000 (UTC)
Subject: rpms/ocaml-pxp/devel ocaml-pxp.spec,1.11,1.12
Message-ID: <20091230135247.C6D2011C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pxp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18533

Modified Files:
	ocaml-pxp.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-pxp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pxp/devel/ocaml-pxp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-pxp.spec	25 Jul 2009 20:04:06 -0000	1.11
+++ ocaml-pxp.spec	30 Dec 2009 13:52:47 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           ocaml-pxp
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Validating XML parser
 
 Group:          Development/Libraries
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.1-3
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:52:54 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:52:54 +0000 (UTC)
Subject: rpms/ocaml-react/devel ocaml-react.spec,1.1,1.2
Message-ID: <20091230135254.A55B811C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-react/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18584

Modified Files:
	ocaml-react.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-react.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-react/devel/ocaml-react.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ocaml-react.spec	12 Oct 2009 08:22:35 -0000	1.1
+++ ocaml-react.spec	30 Dec 2009 13:52:54 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           ocaml-react
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml framework for Functional Reactive Programming (FRP)
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.0-3
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.0-2
 - Initial RPM release.
 - Use global instead of define (Till Maas).



From rjones at fedoraproject.org  Wed Dec 30 13:53:02 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:02 +0000 (UTC)
Subject: rpms/ocaml-reins/devel ocaml-reins.spec,1.6,1.7
Message-ID: <20091230135302.042E311C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-reins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18627

Modified Files:
	ocaml-reins.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-reins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-reins/devel/ocaml-reins.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ocaml-reins.spec	25 Jul 2009 20:04:20 -0000	1.6
+++ ocaml-reins.spec	30 Dec 2009 13:53:01 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           ocaml-reins
 Version:        0.1a
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Library of OCaml persistent data structures
 
 Group:          Development/Libraries
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1a-7
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1a-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:53:08 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:08 +0000 (UTC)
Subject: rpms/ocaml-res/devel ocaml-res.spec,1.13,1.14
Message-ID: <20091230135308.DC4DC11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-res/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18679

Modified Files:
	ocaml-res.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-res.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-res/devel/ocaml-res.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-res.spec	4 Oct 2009 22:31:21 -0000	1.13
+++ ocaml-res.spec	30 Dec 2009 13:53:08 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ocaml-res
 Version:        3.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml library for resizing arrays and strings
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 3.2.0-4
+- Rebuild for OCaml 3.11.2.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 3.2.0-3
 - New upstream release 3.2.0.
 - Changes file -> Changelog



From rjones at fedoraproject.org  Wed Dec 30 13:53:15 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:15 +0000 (UTC)
Subject: rpms/ocaml-SDL/devel ocaml-SDL.spec,1.18,1.19
Message-ID: <20091230135315.B31B511C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18729

Modified Files:
	ocaml-SDL.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-SDL/devel/ocaml-SDL.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ocaml-SDL.spec	25 Jul 2009 19:49:45 -0000	1.18
+++ ocaml-SDL.spec	30 Dec 2009 13:53:15 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           ocaml-SDL
 Version:        0.7.2
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        OCaml bindings for SDL
 
 Group:          Development/Libraries
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.7.2-21
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:53:22 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:22 +0000 (UTC)
Subject: rpms/ocaml-sexplib/devel ocaml-sexplib.spec,1.12,1.13
Message-ID: <20091230135322.B8C9411C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-sexplib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18762

Modified Files:
	ocaml-sexplib.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-sexplib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/ocaml-sexplib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-sexplib.spec	4 Oct 2009 20:56:22 -0000	1.12
+++ ocaml-sexplib.spec	30 Dec 2009 13:53:22 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           ocaml-sexplib
 Version:        4.2.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for converting OCaml values to S-expressions
 
 Group:          Development/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 4.2.15-2
+- Rebuild for OCaml 3.11.2.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 4.2.15-1
 - New upstream version 4.2.15.
 



From rjones at fedoraproject.org  Wed Dec 30 13:53:29 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:29 +0000 (UTC)
Subject: rpms/ocaml-sqlite/devel ocaml-sqlite.spec,1.16,1.17
Message-ID: <20091230135329.8EA2711C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18814

Modified Files:
	ocaml-sqlite.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/ocaml-sqlite.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-sqlite.spec	4 Oct 2009 21:17:49 -0000	1.16
+++ ocaml-sqlite.spec	30 Dec 2009 13:53:29 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           ocaml-sqlite
 Version:        1.5.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml library for accessing SQLite3 databases
 
 Group:          Development/Libraries
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.5.6-3
+- Rebuild for OCaml 3.11.2.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.5.6-2
 - New upstream version 1.5.6.
 - Upstream tests should be fixed now, so reenable all of them.



From rjones at fedoraproject.org  Wed Dec 30 13:53:37 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:37 +0000 (UTC)
Subject: rpms/ocaml-ssl/devel ocaml-ssl.spec,1.17,1.18
Message-ID: <20091230135337.AF4FC11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18861

Modified Files:
	ocaml-ssl.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ssl/devel/ocaml-ssl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ocaml-ssl.spec	21 Aug 2009 14:48:13 -0000	1.17
+++ ocaml-ssl.spec	30 Dec 2009 13:53:37 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ssl
 Version:        0.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        SSL bindings for OCaml
 
 Group:          Development/Libraries
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.3-6
+- Rebuild for OCaml 3.11.2.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4.3-5
 - rebuilt with new openssl
 



From rjones at fedoraproject.org  Wed Dec 30 13:53:44 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:44 +0000 (UTC)
Subject: rpms/ocaml-type-conv/devel ocaml-type-conv.spec,1.16,1.17
Message-ID: <20091230135344.BA3FE11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-type-conv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18903

Modified Files:
	ocaml-type-conv.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-type-conv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/ocaml-type-conv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-type-conv.spec	4 Oct 2009 21:01:54 -0000	1.16
+++ ocaml-type-conv.spec	30 Dec 2009 13:53:44 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           ocaml-type-conv
 Version:        1.6.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml base library for type conversion
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.10-3
+- Rebuild for OCaml 3.11.2.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.10-2
 - New upstream version 1.6.10.
 - "CHANGES" -> "Changelog"



From rjones at fedoraproject.org  Wed Dec 30 13:53:51 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:51 +0000 (UTC)
Subject: rpms/ocaml-ulex/devel ocaml-ulex.spec,1.17,1.18
Message-ID: <20091230135351.AA1C011C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ulex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18943

Modified Files:
	ocaml-ulex.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-ulex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ulex/devel/ocaml-ulex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ocaml-ulex.spec	25 Jul 2009 20:05:53 -0000	1.17
+++ ocaml-ulex.spec	30 Dec 2009 13:53:51 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ulex
 Version:        1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        OCaml lexer generator for Unicode
 
 Group:          Development/Libraries
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-9
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:53:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:53:58 +0000 (UTC)
Subject: rpms/ocaml-xml-light/devel ocaml-xml-light.spec,1.13,1.14
Message-ID: <20091230135358.B3DA111C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-xml-light/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18998

Modified Files:
	ocaml-xml-light.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-xml-light.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-xml-light/devel/ocaml-xml-light.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-xml-light.spec	25 Jul 2009 20:06:13 -0000	1.13
+++ ocaml-xml-light.spec	30 Dec 2009 13:53:58 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ocaml-xml-light
 Version:        2.2.cvs20070817
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Minimal XML parser and printer for OCaml
 
 Group:          Development/Libraries
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-14
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.cvs20070817-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:54:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:54:05 +0000 (UTC)
Subject: rpms/ocaml-xmlrpc-light/devel ocaml-xmlrpc-light.spec,1.9,1.10
Message-ID: <20091230135405.9E2B711C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19055

Modified Files:
	ocaml-xmlrpc-light.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-xmlrpc-light.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel/ocaml-xmlrpc-light.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-xmlrpc-light.spec	25 Jul 2009 20:06:30 -0000	1.9
+++ ocaml-xmlrpc-light.spec	30 Dec 2009 13:54:05 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           ocaml-xmlrpc-light
 Version:        0.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml library for writing XML-RPC clients and servers
 
 Group:          Development/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.6.1-4
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:54:13 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:54:13 +0000 (UTC)
Subject: rpms/ocaml-zip/devel ocaml-zip.spec,1.11,1.12
Message-ID: <20091230135413.B23B311C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19096

Modified Files:
	ocaml-zip.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-zip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-zip/devel/ocaml-zip.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-zip.spec	25 Jul 2009 20:06:45 -0000	1.11
+++ ocaml-zip.spec	30 Dec 2009 13:54:13 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           ocaml-zip
 Version:        1.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml library for reading and writing zip, jar and gzip files
 
 Group:          Development/Libraries
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.04-4
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:54:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:54:21 +0000 (UTC)
Subject: rpms/ocaml-bisect/devel ocaml-bisect.spec,1.7,1.8
Message-ID: <20091230135421.0251911C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-bisect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19154

Modified Files:
	ocaml-bisect.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-bisect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bisect/devel/ocaml-bisect.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ocaml-bisect.spec	25 Jul 2009 19:51:06 -0000	1.7
+++ ocaml-bisect.spec	30 Dec 2009 13:54:20 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:           ocaml-bisect
 Version:        %{mainversion}
-Release:        0.6.%{subversion}%{?dist}
+Release:        0.7.%{subversion}%{?dist}
 Summary:        OCaml code coverage tool
 
 Group:          Development/Libraries
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0-0.7.alpha
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.6.alpha
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:54:28 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:54:28 +0000 (UTC)
Subject: rpms/ocaml-bitstring/devel ocaml-bitstring.spec,1.13,1.14
Message-ID: <20091230135428.4E1CA11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-bitstring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19208

Modified Files:
	ocaml-bitstring.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-bitstring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitstring/devel/ocaml-bitstring.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-bitstring.spec	25 Jul 2009 19:51:27 -0000	1.13
+++ ocaml-bitstring.spec	30 Dec 2009 13:54:28 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:           ocaml-bitstring
 Version:        2.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OCaml library for matching and constructing bitstrings
 
 Group:          Development/Libraries
@@ -185,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-11
+- Rebuild for OCaml 3.11.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 13:54:35 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:54:35 +0000 (UTC)
Subject: rpms/ocaml-facile/devel ocaml-facile.spec,1.12,1.13
Message-ID: <20091230135435.9EFCF11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-facile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19267

Modified Files:
	ocaml-facile.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-facile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-facile/devel/ocaml-facile.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-facile.spec	17 Dec 2009 01:23:31 -0000	1.12
+++ ocaml-facile.spec	30 Dec 2009 13:54:35 -0000	1.13
@@ -9,7 +9,7 @@ ExcludeArch: ppc64
 
 Name:          ocaml-facile
 Version:       1.1
-Release:       11%{?dist}
+Release:       12%{?dist}
 Summary:       OCaml library for constraint programming
 Summary(fr):   Librairie OCaml de programmation par contraintes
 
@@ -115,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/facile/*.mli
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-12
+- Rebuild for OCaml 3.11.2.
+
 * Thu Dec 17 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1-11
 - Use RPM's builtin OCaml dependency generator on F13+
 



From rjones at fedoraproject.org  Wed Dec 30 13:54:42 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 13:54:42 +0000 (UTC)
Subject: rpms/ocaml-fileutils/devel ocaml-fileutils.spec,1.11,1.12
Message-ID: <20091230135442.C188911C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-fileutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19301

Modified Files:
	ocaml-fileutils.spec 
Log Message:
Rebuild for OCaml 3.11.2


Index: ocaml-fileutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/ocaml-fileutils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-fileutils.spec	8 Oct 2009 12:47:33 -0000	1.11
+++ ocaml-fileutils.spec	30 Dec 2009 13:54:42 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           ocaml-fileutils
 Version:        0.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml library for common file and filename operations
 
 Group:          Development/Libraries
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.0-3
+- Rebuild for OCaml 3.11.2.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.0-2
 - New upstream version 0.4.0.
 - Upstream build system has been rationalized, so remove all the



From dwalsh at fedoraproject.org  Wed Dec 30 13:59:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Dec 2009 13:59:46 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils.spec,1.661,1.662
Message-ID: <20091230135946.EC58F11C00E9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22531

Modified Files:
	policycoreutils.spec 
Log Message:
* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-7
- Fixes to sandbox man page



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -p -r1.661 -r1.662
--- policycoreutils.spec	17 Dec 2009 19:38:47 -0000	1.661
+++ policycoreutils.spec	30 Dec 2009 13:59:46 -0000	1.662
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -109,6 +109,7 @@ Requires: audit-libs-python >=  %{libaud
 Requires: /usr/bin/make
 Requires(pre): python >= 2.6
 Obsoletes: policycoreutils < 2.0.61-2
+Requires: setools-libs-python
 
 %description python
 The policycoreutils-python package contains the management tools use to manage an SELinux environment.
@@ -190,7 +191,7 @@ Group: System Environment/Base
 Requires: policycoreutils-python = %{version}-%{release} 
 Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: usermode-gtk 
-Requires: setools-console setools-libs-python
+Requires: setools-console
 Requires: selinux-policy
 Requires: python >= 2.6
 BuildRequires: desktop-file-utils
@@ -297,6 +298,9 @@ fi
 exit 0
 
 %changelog
+* Fri Dec 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-7
+- Fixes to sandbox man page
+
 * Thu Dec 17 2009 Dan Walsh <dwalsh at redhat.com> 2.0.78-6
 - Add setools-libs-python to requires for gui
 



From rjones at fedoraproject.org  Wed Dec 30 14:24:17 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 14:24:17 +0000 (UTC)
Subject: File ocaml-3.11.2+rc1.tar.bz2 uploaded to lookaside cache by rjones
Message-ID: <20091230142417.76B8410F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for ocaml-cmigrep:

121dd62a03bbb1dfb3fb56e3a4bda874  ocaml-3.11.2+rc1.tar.bz2



From rjones at fedoraproject.org  Wed Dec 30 14:27:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 14:27:40 +0000 (UTC)
Subject: rpms/ocaml-cmigrep/devel .cvsignore, 1.5, 1.6 ocaml-cmigrep.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <20091230142740.63F7111C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cmigrep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30176

Modified Files:
	.cvsignore ocaml-cmigrep.spec sources 
Log Message:
Rebuild for OCaml 3.11.2+rc1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 May 2009 11:16:11 -0000	1.5
+++ .cvsignore	30 Dec 2009 14:27:38 -0000	1.6
@@ -2,3 +2,4 @@ cmigrep-1.5.tar.bz2
 ocaml-3.11.0+beta1.tar.bz2
 ocaml-3.11.0.tar.bz2
 ocaml-3.11.1+rc0.tar.gz
+ocaml-3.11.2+rc1.tar.bz2


Index: ocaml-cmigrep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/ocaml-cmigrep.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-cmigrep.spec	30 Dec 2009 13:48:40 -0000	1.14
+++ ocaml-cmigrep.spec	30 Dec 2009 14:27:38 -0000	1.15
@@ -2,20 +2,21 @@
 %define debug_package %{nil}
 
 %define ocaml_major 3.11
-%define ocaml_minor 1
+%define ocaml_minor 2
 
 %define _default_patch_fuzz 2
 
 Name:           ocaml-cmigrep
 Version:        1.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Search OCaml compiled interface (cmi) files
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://homepage.mac.com/letaris/
 Source0:        http://homepage.mac.com/letaris/cmigrep-%{version}.tar.bz2
-Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}+rc0.tar.gz
+#Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.gz
+Source1:        ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-3.11/ocaml-3.11.2+rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -51,13 +52,13 @@ elisp that allows emacs to use cmigrep f
 # +compiler-libs directory.  It would be good to copy this,
 # however in Debian the only packages which actually use
 # compiler-libs are camlp5 & cmigrep.
-zcat %{SOURCE1} | tar xf -
-pushd ocaml-%{ocaml_major}.%{ocaml_minor}rc0
+bzcat %{SOURCE1} | tar xf -
+pushd ocaml-%{ocaml_major}.%{ocaml_minor}rc1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 popd
-mv ocaml-%{ocaml_major}.%{ocaml_minor}rc0 compiler
+mv ocaml-%{ocaml_major}.%{ocaml_minor}rc1 compiler
 
 %patch10 -p1
 
@@ -103,8 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.5-14
-- Rebuild for OCaml 3.11.2.
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.5-15
+- Rebuild for OCaml 3.11.2+rc1.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 May 2009 11:16:12 -0000	1.5
+++ sources	30 Dec 2009 14:27:39 -0000	1.6
@@ -1,2 +1,2 @@
 869ba6758a773c4218461f14f6ebcb4e  cmigrep-1.5.tar.bz2
-45f626b33bec543a40abbf6afa1a6d96  ocaml-3.11.1+rc0.tar.gz
+121dd62a03bbb1dfb3fb56e3a4bda874  ocaml-3.11.2+rc1.tar.bz2



From dwalsh at fedoraproject.org  Wed Dec 30 14:40:39 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Dec 2009 14:40:39 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.161,
	1.162 selinux-policy.spec, 1.988, 1.989
Message-ID: <20091230144039.615D511C00E9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv690

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Dec 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-65
- Allow traceroute to use all terms
- Fix mgetty use for faxes
- Dontaudit xdm listing fusefs
- Allow xguest to resolve host names
- Allow abrt to read noxattr filesystems (cdrom)
- Allow abrt_helper to send itself signals
- Allow amavis to read certs
- Allow apache to bind to port 3000 (Ruby on rails)
- Asterist uses mysql and snmp
- Allow consolekit to write wtmp file for shutdown
- Allow cups ipc_lock
- Allow hal to transition to ppp
- Fix mailman labels for 64 bit systems
- dontaudit system_mail access to leaked terminals
- Allow mysqld_safe_t to unlink mysqld pid files
- nrpe_t uses getpw calls
- Allow NetworkManager to delete ppp pid files
- Allow pptp_t to sens userdomain signals
- Allow prelude to connect to mysql
- Allow swat to start winbind server
- Fixes for snort
- Allow telnetd to setattr user terminals
- Allow qemu to read fusefs
- Allow domains that have telinit to connectto upstart unix_stream_socket
- Dontaudit ipsec_mgmt sys_tty_config
- Fix labels for postgrestgres test suite
- Other textrel_shlib_t fixes


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   82 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  188 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  189 +++
 policy/modules/apps/sandbox.te            |  338 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   50 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   50 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  475 ++++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  442 +++++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  442 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   71 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  122 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    3 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  458 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   41 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   20 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   55 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   35 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   54 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   18 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.fc        |    7 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   38 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   25 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  120 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   32 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   68 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   17 
 policy/modules/services/prelude.te        |    4 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   93 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   88 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    8 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/telnet.te         |    1 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   60 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  296 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  665 ++++++++++-
 policy/modules/services/xserver.te        |  385 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/getty.te            |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  185 +++
 policy/modules/system/init.te             |  292 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   79 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   23 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  207 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   93 +
 policy/modules/system/miscfiles.te        |    5 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   83 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  116 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1702 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  146 ++
 policy/support/obj_perm_sets.spt          |   34 
 policy/users                              |   13 
 416 files changed, 22067 insertions(+), 2854 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- policy-F12.patch	23 Dec 2009 18:42:31 -0000	1.161
+++ policy-F12.patch	30 Dec 2009 14:40:37 -0000	1.162
@@ -420,7 +420,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te	2009-12-29 20:01:48.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -437,6 +437,15 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(netutils_t)
  userdom_use_all_users_fds(netutils_t)
  
+@@ -217,6 +219,8 @@
+ dev_read_urand(traceroute_t)
+ files_read_usr_files(traceroute_t)
+ 
++term_use_all_terms(traceroute_t)
++
+ tunable_policy(`user_ping',`
+ 	term_use_all_user_ttys(traceroute_t)
+ 	term_use_all_user_ptys(traceroute_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.32/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-12-17 11:20:45.000000000 -0500
@@ -5964,7 +5973,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-12-18 15:32:53.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-12-30 08:13:06.000000000 -0500
 @@ -1,4 +1,4 @@
 -
 +c
@@ -5995,7 +6004,15 @@ diff -b -B --ignore-all-space --exclude-
  /etc/hotplug/.*agent		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/hotplug/.*rc		-- 	gen_context(system_u:object_r:bin_t,s0)
  /etc/hotplug/hotplug\.functions --	gen_context(system_u:object_r:bin_t,s0)
-@@ -125,6 +128,7 @@
+@@ -62,6 +65,7 @@
+ /etc/init\.d/functions		--	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /etc/mail/make			--	gen_context(system_u:object_r:bin_t,s0)
++/etc/mgetty\+sendfax/new_fax	--	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /etc/netplug\.d(/.*)? 	 		gen_context(system_u:object_r:bin_t,s0)
+ 
+@@ -125,6 +129,7 @@
  /sbin/.*				gen_context(system_u:object_r:bin_t,s0)
  /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:bin_t,s0)
  /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:bin_t,s0)
@@ -6003,7 +6020,7 @@ diff -b -B --ignore-all-space --exclude-
  
  #
  # /opt
-@@ -135,13 +139,15 @@
+@@ -135,13 +140,15 @@
  
  /opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
@@ -6020,7 +6037,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -211,6 +217,12 @@
+@@ -211,6 +218,12 @@
  /usr/share/apr-0/build/[^/]+\.sh --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/apr-0/build/libtool --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/debconf/.+		--	gen_context(system_u:object_r:bin_t,s0)
@@ -6033,7 +6050,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/gnucash/finance-quote-check -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/gnucash/finance-quote-helper -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hal/device-manager/hal-device-manager -- gen_context(system_u:object_r:bin_t,s0)
-@@ -221,12 +233,16 @@
+@@ -221,12 +234,16 @@
  /usr/share/PackageKit/pk-upgrade-distro\.sh -- 	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/PackageKit/helpers(/.*)?	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
@@ -6051,7 +6068,7 @@ diff -b -B --ignore-all-space --exclude-
  
  /usr/X11R6/lib(64)?/X11/xkb/xkbcomp --	gen_context(system_u:object_r:bin_t,s0)
  
-@@ -263,6 +279,7 @@
+@@ -263,6 +280,7 @@
  /usr/share/ssl/misc(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/share/switchdesk/switchdesk-gui\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-date/system-config-date\.py -- gen_context(system_u:object_r:bin_t,s0)
@@ -6059,7 +6076,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/system-config-selinux/system-config-selinux\.py -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-display/system-config-display -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/system-config-httpd/system-config-httpd -- gen_context(system_u:object_r:bin_t,s0)
-@@ -315,3 +332,21 @@
+@@ -315,3 +333,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -7198,7 +7215,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-21 17:41:42.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-12-29 18:03:58.000000000 -0500
 @@ -110,7 +110,11 @@
  ## </param>
  #
@@ -7877,7 +7894,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.32/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-12-23 12:11:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-12-30 08:06:40.000000000 -0500
 @@ -310,6 +310,26 @@
  
  ########################################
@@ -7959,7 +7976,33 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Mount a DOS filesystem, such as
-@@ -1537,6 +1595,24 @@
+@@ -1401,6 +1459,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Do not audit attempts to list the contents
++##	of directories on a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`fs_dontaudit_list_fusefs',`
++	gen_require(`
++		type fusefs_t;
++	')
++
++	dontaudit $1 fusefs_t:dir list_dir_perms;
++')
++
++########################################
++## <summary>
+ ##	Create, read, write, and delete directories
+ ##	on a FUSEFS filesystem.
+ ## </summary>
+@@ -1537,6 +1614,24 @@
  
  ########################################
  ## <summary>
@@ -7984,7 +8027,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Search inotifyfs filesystem. 
  ## </summary>
  ## <param name="domain">
-@@ -1971,7 +2047,7 @@
+@@ -1971,7 +2066,7 @@
  		type nfs_t;
  	')
  
@@ -7993,7 +8036,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1993,6 +2069,25 @@
+@@ -1993,6 +2088,25 @@
  	read_lnk_files_pattern($1, nfs_t, nfs_t)
  ')
  
@@ -8019,7 +8062,7 @@ diff -b -B --ignore-all-space --exclude-
  #########################################
  ## <summary>
  ##	Read named sockets on a NFS filesystem.
-@@ -2542,6 +2637,42 @@
+@@ -2542,6 +2656,42 @@
  
  ########################################
  ## <summary>
@@ -8062,7 +8105,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write NFS server files.
  ## </summary>
  ## <param name="domain">
-@@ -3572,6 +3703,122 @@
+@@ -3572,6 +3722,122 @@
  
  ########################################
  ## <summary>
@@ -8185,7 +8228,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Mount all filesystems.
  ## </summary>
  ## <param name="domain">
-@@ -3971,3 +4218,175 @@
+@@ -3971,3 +4237,175 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
@@ -8791,7 +8834,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/tty		-c	gen_context(system_u:object_r:devtty_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.6.32/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-12-29 20:01:46.000000000 -0500
 @@ -196,7 +196,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -10745,8 +10788,14 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.6.32/policy/modules/roles/xguest.te
 --- nsaserefpolicy/policy/modules/roles/xguest.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-12-17 11:20:45.000000000 -0500
-@@ -35,6 +35,23 @@
++++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-12-29 18:11:53.000000000 -0500
+@@ -31,10 +31,29 @@
+ 
+ userdom_restricted_xwindows_user_template(xguest)
+ 
++sysnet_dns_name_resolve(xguest_t)
++
+ ########################################
  #
  # Local policy
  #
@@ -10770,7 +10819,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow mounting of file systems
  optional_policy(`
-@@ -49,10 +66,9 @@
+@@ -49,10 +68,9 @@
  		fs_manage_noxattr_fs_dirs(xguest_t)
  		fs_getattr_noxattr_fs(xguest_t)
  		fs_read_noxattr_fs_symlinks(xguest_t)
@@ -10782,7 +10831,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -67,17 +83,60 @@
+@@ -67,17 +85,60 @@
  ')
  
  optional_policy(`
@@ -10832,10 +10881,9 @@ diff -b -B --ignore-all-space --exclude-
 +		corenet_tcp_connect_speech_port(xguest_usertype)
 +		corenet_tcp_sendrecv_transproxy_port(xguest_usertype)
 +		corenet_tcp_connect_transproxy_port(xguest_usertype)
++	')
  	')
- ')
- 
--#gen_user(xguest_u,, xguest_r, s0, s0)
++
 +optional_policy(`
 +	gen_require(`
 +		type mozilla_t;
@@ -10843,8 +10891,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	allow xguest_t mozilla_t:process transition;
 +	role xguest_r types mozilla_t;
-+')
-+
+ ')
+ 
+-#gen_user(xguest_u,, xguest_r, s0, s0)
 +gen_user(xguest_u, user, xguest_r, s0, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.fc serefpolicy-3.6.32/policy/modules/services/abrt.fc
 --- nsaserefpolicy/policy/modules/services/abrt.fc	2009-09-16 10:01:19.000000000 -0400
@@ -11033,7 +11082,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-23 07:13:32.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-12-29 19:58:48.000000000 -0500
 @@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -11081,7 +11130,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(abrt_t, abrt_var_run_t, { file dir })
  
  kernel_read_ring_buffer(abrt_t)
-@@ -75,18 +90,35 @@
+@@ -75,18 +90,36 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -11112,12 +11161,13 @@ diff -b -B --ignore-all-space --exclude-
  fs_getattr_all_fs(abrt_t)
  fs_getattr_all_dirs(abrt_t)
 +fs_read_fusefs_files(abrt_t)
++fs_read_noxattr_fs_files(abrt_t)
 +fs_read_nfs_files(abrt_t)
 +fs_search_all(abrt_t)
  
  sysnet_read_config(abrt_t)
  
-@@ -96,22 +128,90 @@
+@@ -96,22 +129,91 @@
  miscfiles_read_certs(abrt_t)
  miscfiles_read_localization(abrt_t)
  
@@ -11183,6 +11233,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +
 +allow abrt_helper_t self:capability { chown setgid };
++allow abrt_helper_t self:process signal;
 +read_files_pattern(abrt_helper_t, abrt_etc_t, abrt_etc_t)
 +
 +manage_dirs_pattern(abrt_helper_t, abrt_var_cache_t, abrt_var_cache_t)
@@ -11490,7 +11541,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.6.32/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/amavis.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/amavis.te	2009-12-30 08:22:28.000000000 -0500
 @@ -103,6 +103,8 @@
  kernel_dontaudit_read_proc_symlinks(amavis_t)
  kernel_dontaudit_read_system_state(amavis_t)
@@ -11500,6 +11551,14 @@ diff -b -B --ignore-all-space --exclude-
  # find perl
  corecmd_exec_bin(amavis_t)
  
+@@ -141,6 +143,7 @@
+ logging_send_syslog_msg(amavis_t)
+ 
+ miscfiles_read_localization(amavis_t)
++miscfiles_read_certs(amavis_t)
+ 
+ sysnet_dns_name_resolve(amavis_t)
+ sysnet_use_ldap(amavis_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.32/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/apache.fc	2009-12-17 11:20:45.000000000 -0500
@@ -12298,7 +12357,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.32/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-12-18 15:32:53.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-12-29 18:35:40.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -12509,7 +12568,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  manage_sock_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file })
-@@ -312,16 +375,18 @@
+@@ -312,19 +375,22 @@
  kernel_read_kernel_sysctls(httpd_t)
  # for modules that want to access /proc/meminfo
  kernel_read_system_state(httpd_t)
@@ -12533,7 +12592,11 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_http_port(httpd_t)
  corenet_tcp_bind_http_cache_port(httpd_t)
  corenet_sendrecv_http_server_packets(httpd_t)
-@@ -335,12 +400,11 @@
++corenet_tcp_bind_ntop_port(httpd_t)
+ # Signal self for shutdown
+ corenet_tcp_connect_http_port(httpd_t)
+ 
+@@ -335,12 +401,11 @@
  
  fs_getattr_all_fs(httpd_t)
  fs_search_auto_mountpoints(httpd_t)
@@ -12548,7 +12611,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(httpd_t)
  
-@@ -356,8 +420,13 @@
+@@ -356,8 +421,13 @@
  files_read_etc_files(httpd_t)
  # for tomcat
  files_read_var_lib_symlinks(httpd_t)
@@ -12562,7 +12625,7 @@ diff -b -B --ignore-all-space --exclude-
  
  libs_read_lib_files(httpd_t)
  
-@@ -372,18 +441,33 @@
+@@ -372,18 +442,33 @@
  
  userdom_use_unpriv_users_fds(httpd_t)
  
@@ -12600,7 +12663,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  ')
  
-@@ -391,32 +475,71 @@
+@@ -391,32 +476,71 @@
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
  
@@ -12677,7 +12740,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -424,11 +547,23 @@
+@@ -424,11 +548,23 @@
  	fs_read_nfs_symlinks(httpd_t)
  ')
  
@@ -12701,7 +12764,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t, httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -451,6 +586,18 @@
+@@ -451,6 +587,18 @@
  ')
  
  optional_policy(`
@@ -12720,7 +12783,7 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(httpd_t, httpd_exec_t)
  ')
  
-@@ -459,8 +606,13 @@
+@@ -459,8 +607,13 @@
  ')
  
  optional_policy(`
@@ -12736,7 +12799,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -468,22 +620,19 @@
+@@ -468,22 +621,19 @@
  	mailman_domtrans_cgi(httpd_t)
  	# should have separate types for public and private archives
  	mailman_search_data(httpd_t)
@@ -12762,7 +12825,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -494,12 +643,23 @@
+@@ -494,12 +644,23 @@
  ')
  
  optional_policy(`
@@ -12786,7 +12849,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -508,6 +668,7 @@
+@@ -508,6 +669,7 @@
  ')
  
  optional_policy(`
@@ -12794,7 +12857,7 @@ diff -b -B --ignore-all-space --exclude-
  	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
  	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
  ')
-@@ -535,6 +696,23 @@
+@@ -535,6 +697,23 @@
  
  userdom_use_user_terminals(httpd_helper_t)
  
@@ -12818,7 +12881,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Apache PHP script local policy
-@@ -564,20 +742,25 @@
+@@ -564,20 +743,25 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -12850,7 +12913,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -595,23 +778,24 @@
+@@ -595,23 +779,24 @@
  append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
  read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
  
@@ -12879,7 +12942,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -624,6 +808,7 @@
+@@ -624,6 +809,7 @@
  logging_send_syslog_msg(httpd_suexec_t)
  
  miscfiles_read_localization(httpd_suexec_t)
@@ -12887,7 +12950,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`httpd_can_network_connect',`
  	allow httpd_suexec_t self:tcp_socket create_stream_socket_perms;
-@@ -631,22 +816,31 @@
+@@ -631,22 +817,31 @@
  
  	corenet_all_recvfrom_unlabeled(httpd_suexec_t)
  	corenet_all_recvfrom_netlabel(httpd_suexec_t)
@@ -12926,7 +12989,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -672,15 +866,14 @@
+@@ -672,15 +867,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -12945,7 +13008,7 @@ diff -b -B --ignore-all-space --exclude-
  allow httpd_sys_script_t httpd_t:tcp_socket { read write };
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
-@@ -699,12 +892,24 @@
+@@ -699,12 +893,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -12972,7 +13035,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +917,35 @@
+@@ -712,6 +918,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -13008,7 +13071,7 @@ diff -b -B --ignore-all-space --exclude-
  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)
-@@ -724,6 +958,10 @@
+@@ -724,6 +959,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -13019,7 +13082,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -735,6 +973,8 @@
+@@ -735,6 +974,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -13028,7 +13091,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t)
  
  kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-@@ -754,11 +994,88 @@
+@@ -754,11 +995,88 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -13211,7 +13274,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.6.32/policy/modules/services/asterisk.te
 --- nsaserefpolicy/policy/modules/services/asterisk.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/asterisk.te	2009-12-22 08:26:17.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/asterisk.te	2009-12-30 08:24:32.000000000 -0500
 @@ -34,18 +34,21 @@
  type asterisk_var_run_t;
  files_pid_file(asterisk_var_run_t)
@@ -13272,7 +13335,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(asterisk_t)
  
-@@ -119,17 +129,25 @@
+@@ -119,17 +129,29 @@
  fs_getattr_all_fs(asterisk_t)
  fs_search_auto_mountpoints(asterisk_t)
  
@@ -13289,6 +13352,10 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 -	nis_use_ypbind(asterisk_t)
++	mysql_stream_connect(asterisk_t)
++')
++
++optional_policy(`
 +	mta_send_mail(asterisk_t)
 +')
 +
@@ -13301,11 +13368,12 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -137,10 +155,10 @@
+@@ -137,10 +159,11 @@
  ')
  
  optional_policy(`
 -	udev_read_db(asterisk_t)
++	snmp_read_snmp_var_lib_files(asterisk_t)
 +	snmp_stream_connect(asterisk_t)
  ')
  
@@ -14169,7 +14237,7 @@ diff -b -B --ignore-all-space --exclude-
 +permissive chronyd_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.6.32/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/clamav.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/clamav.te	2009-12-29 18:41:29.000000000 -0500
 @@ -117,9 +117,9 @@
  
  logging_send_syslog_msg(clamd_t)
@@ -14182,16 +14250,16 @@ diff -b -B --ignore-all-space --exclude-
  
  cron_use_fds(clamd_t)
  cron_use_system_job_fds(clamd_t)
-@@ -187,15 +187,15 @@
+@@ -187,15 +187,17 @@
  files_read_etc_files(freshclam_t)
  files_read_etc_runtime_files(freshclam_t)
  
 -miscfiles_read_localization(freshclam_t)
 +auth_use_nsswitch(freshclam_t)
-+
-+logging_send_syslog_msg(freshclam_t)
  
 -sysnet_dns_name_resolve(freshclam_t)
++logging_send_syslog_msg(freshclam_t)
++
 +miscfiles_read_localization(freshclam_t)
  
  clamav_stream_connect(freshclam_t)
@@ -14200,10 +14268,12 @@ diff -b -B --ignore-all-space --exclude-
 -cron_use_system_job_fds(freshclam_t)
 -cron_rw_pipes(freshclam_t)
 +cron_system_entry(freshclam_t, freshclam_exec_t)
++
++userdom_stream_connect(freshclam_t)
  
  ########################################
  #
-@@ -247,5 +247,9 @@
+@@ -247,5 +249,9 @@
  mta_send_mail(clamscan_t)
  
  optional_policy(`
@@ -14510,7 +14580,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.32/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-12-29 20:22:45.000000000 -0500
 @@ -21,7 +21,7 @@
  # consolekit local policy
  #
@@ -14525,7 +14595,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(consolekit_t)
 +auth_manage_pam_console_data(consolekit_t)
-+auth_dontaudit_write_login_records(consolekit_t)
++auth_write_login_records(consolekit_t)
  
  init_telinit(consolekit_t)
  init_rw_utmp(consolekit_t)
@@ -15352,7 +15422,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/local/linuxprinter/ppd(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.32/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-12-23 12:11:24.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-12-29 20:26:54.000000000 -0500
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -15380,6 +15450,15 @@ diff -b -B --ignore-all-space --exclude-
  
  type hplip_var_run_t;
  files_pid_file(hplip_var_run_t)
+@@ -97,7 +103,7 @@
+ #
+ 
+ # /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_rawio sys_resource sys_tty_config };
++allow cupsd_t self:capability { ipc_lock sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_rawio sys_resource sys_tty_config };
+ dontaudit cupsd_t self:capability { sys_tty_config net_admin };
+ allow cupsd_t self:process { getpgid setpgid setsched signal_perms };
+ allow cupsd_t self:fifo_file rw_fifo_file_perms;
 @@ -105,6 +111,7 @@
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
  allow cupsd_t self:netlink_selinux_socket create_socket_perms;
@@ -17101,7 +17180,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.32/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/hal.te	2009-12-21 10:21:57.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/hal.te	2009-12-29 20:09:00.000000000 -0500
 @@ -55,13 +55,16 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -17162,7 +17241,12 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_user_home_dirs(hald_t)
-@@ -290,6 +305,7 @@
+@@ -286,10 +301,12 @@
+ ')
+ 
+ optional_policy(`
++	ppp_domtrans(hald_t)
+ 	ppp_read_rw_config(hald_t)
  ')
  
  optional_policy(`
@@ -17170,7 +17254,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_t)
  	policykit_domtrans_resolve(hald_t)
  	policykit_read_lib(hald_t)
-@@ -321,6 +337,10 @@
+@@ -321,6 +338,10 @@
  	virt_manage_images(hald_t)
  ')
  
@@ -17181,7 +17265,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Hal acl local policy
-@@ -341,6 +361,7 @@
+@@ -341,6 +362,7 @@
  manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
@@ -17189,7 +17273,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(hald_acl_t)
  
-@@ -357,6 +378,8 @@
+@@ -357,6 +379,8 @@
  files_read_usr_files(hald_acl_t)
  files_read_etc_files(hald_acl_t)
  
@@ -17198,7 +17282,7 @@ diff -b -B --ignore-all-space --exclude-
  storage_getattr_removable_dev(hald_acl_t)
  storage_setattr_removable_dev(hald_acl_t)
  storage_getattr_fixed_disk_dev(hald_acl_t)
-@@ -369,6 +392,7 @@
+@@ -369,6 +393,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -17206,7 +17290,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_acl_t)
  	policykit_read_lib(hald_acl_t)
  	policykit_read_reload(hald_acl_t)
-@@ -450,12 +474,16 @@
+@@ -450,12 +475,16 @@
  
  miscfiles_read_localization(hald_keymap_t)
  
@@ -17225,7 +17309,7 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
  allow hald_dccm_t self:udp_socket create_socket_perms;
-@@ -469,10 +497,22 @@
+@@ -469,10 +498,22 @@
  manage_files_pattern(hald_dccm_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_dccm_t)
  
@@ -17248,7 +17332,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -484,6 +524,7 @@
+@@ -484,6 +525,7 @@
  corenet_tcp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_dhcpc_port(hald_dccm_t)
@@ -17256,7 +17340,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_dccm_port(hald_dccm_t)
  
  logging_send_syslog_msg(hald_dccm_t)
-@@ -491,3 +532,7 @@
+@@ -491,3 +533,7 @@
  files_read_usr_files(hald_dccm_t)
  
  miscfiles_read_localization(hald_dccm_t)
@@ -17711,6 +17795,22 @@ diff -b -B --ignore-all-space --exclude-
 +
  miscfiles_read_localization(lircd_t)
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.6.32/policy/modules/services/mailman.fc
+--- nsaserefpolicy/policy/modules/services/mailman.fc	2009-09-16 10:01:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/mailman.fc	2009-12-30 08:17:22.000000000 -0500
+@@ -26,9 +26,8 @@
+ /etc/mailman(/.*)?			gen_context(system_u:object_r:mailman_data_t,s0)
+ 
+ /usr/lib/mailman/bin/qrunner	--	gen_context(system_u:object_r:mailman_queue_exec_t,s0)
+-/usr/lib/mailman/cgi-bin/.*	--	gen_context(system_u:object_r:mailman_cgi_exec_t,s0)
+-/usr/lib/mailman/mail/mailman	--	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
+-/usr/lib/mailman/scripts/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
+-
++/usr/lib(64)?/mailman/cgi-bin/.*	--	gen_context(system_u:object_r:mailman_cgi_exec_t,s0)
++/usr/lib(64)?/mailman/mail/mailman	--	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
++/usr/lib(64)?/mailman/scripts/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
+ /var/spool/mailman(/.*)?		gen_context(system_u:object_r:mailman_data_t,s0)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.6.32/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/mailman.te	2009-12-17 11:20:45.000000000 -0500
@@ -17875,7 +17975,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.6.32/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/mta.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/mta.te	2009-12-29 16:33:40.000000000 -0500
 @@ -27,6 +27,9 @@
  type mail_spool_t;
  files_mountpoint(mail_spool_t)
@@ -17898,7 +17998,13 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_read_sysfs(system_mail_t)
  dev_read_rand(system_mail_t)
-@@ -72,16 +77,21 @@
+@@ -68,20 +73,27 @@
+ 
+ selinux_getattr_fs(system_mail_t)
+ 
++term_dontaudit_use_unallocated_ttys(system_mail_t)
++
+ init_use_script_ptys(system_mail_t)
  
  userdom_use_user_terminals(system_mail_t)
  userdom_dontaudit_search_user_home_dirs(system_mail_t)
@@ -17920,7 +18026,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -100,6 +110,7 @@
+@@ -100,6 +112,7 @@
  optional_policy(`
  	cron_read_system_job_tmp_files(system_mail_t)
  	cron_dontaudit_write_pipes(system_mail_t)
@@ -17928,7 +18034,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -178,6 +189,10 @@
+@@ -178,6 +191,10 @@
  ')
  
  optional_policy(`
@@ -17939,7 +18045,7 @@ diff -b -B --ignore-all-space --exclude-
  	smartmon_read_tmp_files(system_mail_t)
  ')
  
-@@ -197,6 +212,25 @@
+@@ -197,6 +214,25 @@
  	')
  ')
  
@@ -18018,7 +18124,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.6.32/policy/modules/services/mysql.if
 --- nsaserefpolicy/policy/modules/services/mysql.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/mysql.if	2009-12-18 15:32:53.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/mysql.if	2009-12-29 20:13:37.000000000 -0500
 @@ -1,5 +1,43 @@
  ## <summary>Policy for MySQL</summary>
  
@@ -18065,7 +18171,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send a generic signal to MySQL.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.6.32/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/mysql.te	2009-12-23 12:06:27.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/mysql.te	2009-12-29 09:05:26.000000000 -0500
 @@ -1,6 +1,13 @@
  
  policy_module(mysql, 1.11.0)
@@ -18102,7 +18208,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domtrans_pattern(mysqld_safe_t, mysqld_exec_t, mysqld_t)
  
-+read_files_pattern(mysqld_safe_t, mysqld_var_run_t, mysqld_var_run_t)
++manage_files_pattern(mysqld_safe_t, mysqld_var_run_t, mysqld_var_run_t)
 +delete_sock_files_pattern(mysqld_safe_t, mysqld_var_run_t, mysqld_var_run_t)
 +
  allow mysqld_safe_t mysqld_log_t:file manage_file_perms;
@@ -18348,7 +18454,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.6.32/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/nagios.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/nagios.te	2009-12-30 08:28:57.000000000 -0500
 @@ -6,17 +6,23 @@
  # Declarations
  #
@@ -18534,7 +18640,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(nrpe_t)
  kernel_read_kernel_sysctls(nrpe_t)
  
-@@ -183,15 +233,19 @@
+@@ -183,11 +233,15 @@
  dev_read_urand(nrpe_t)
  
  domain_use_interactive_fds(nrpe_t)
@@ -18545,15 +18651,11 @@ diff -b -B --ignore-all-space --exclude-
 +fs_getattr_all_fs(nrpe_t)
  fs_search_auto_mountpoints(nrpe_t)
  
++auth_use_nsswitch(nrpe_t)
++
  logging_send_syslog_msg(nrpe_t)
  
  miscfiles_read_localization(nrpe_t)
- 
-+sysnet_read_config(nrpe_t)
-+
- userdom_dontaudit_use_unpriv_user_fds(nrpe_t)
- 
- optional_policy(`
 @@ -209,3 +263,84 @@
  optional_policy(`
  	udev_read_db(nrpe_t)
@@ -18751,7 +18853,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.32/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/networkmanager.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/networkmanager.te	2009-12-29 16:26:25.000000000 -0500
 @@ -19,6 +19,9 @@
  type NetworkManager_tmp_t;
  files_tmp_file(NetworkManager_tmp_t)
@@ -18963,7 +19065,8 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 +	ppp_initrc_domtrans(NetworkManager_t)
  	ppp_domtrans(NetworkManager_t)
- 	ppp_read_pid_files(NetworkManager_t)
+-	ppp_read_pid_files(NetworkManager_t)
++	ppp_manage_pid_files(NetworkManager_t)
 +	ppp_kill(NetworkManager_t)
  	ppp_signal(NetworkManager_t)
 +	ppp_signull(NetworkManager_t)
@@ -21665,7 +21768,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.6.32/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ppp.if	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/ppp.if	2009-12-29 16:26:08.000000000 -0500
 @@ -177,10 +177,16 @@
  interface(`ppp_run',`
  	gen_require(`
@@ -21685,7 +21788,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.6.32/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ppp.te	2009-12-17 11:20:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/ppp.te	2009-12-29 16:46:06.000000000 -0500
 @@ -38,7 +38,7 @@
  files_type(pppd_etc_rw_t)
  
@@ -21722,7 +21825,14 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit pptp_t self:capability sys_tty_config;
  allow pptp_t self:process signal;
  allow pptp_t self:fifo_file rw_fifo_file_perms;
-@@ -295,6 +297,14 @@
+@@ -289,12 +291,21 @@
+ 
+ userdom_dontaudit_use_unpriv_user_fds(pptp_t)
+ userdom_dontaudit_search_user_home_dirs(pptp_t)
++userdom_signal_unpriv_users(pptp_t)
+ 
+ optional_policy(`
+ 	consoletype_exec(pppd_t)
  ')
  
  optional_policy(`
@@ -21739,8 +21849,16 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.6.32/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/prelude.te	2009-12-17 11:20:45.000000000 -0500
-@@ -122,7 +122,8 @@
++++ serefpolicy-3.6.32/policy/modules/services/prelude.te	2009-12-30 08:34:13.000000000 -0500
+@@ -90,6 +90,7 @@
+ corenet_tcp_bind_prelude_port(prelude_t)
+ corenet_tcp_connect_prelude_port(prelude_t)
+ corenet_tcp_connect_postgresql_port(prelude_t)
++corenet_tcp_connect_mysql_port(prelude_t)
+ 
+ dev_read_rand(prelude_t)
+ dev_read_urand(prelude_t)
+@@ -122,7 +123,8 @@
  #
  # prelude_audisp local policy
  #
@@ -23854,7 +23972,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.32/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/samba.te	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/samba.te	2009-12-29 19:04:54.000000000 -0500
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -24028,6 +24146,15 @@ diff -b -B --ignore-all-space --exclude-
  rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  read_lnk_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  
+@@ -657,7 +696,7 @@
+ files_pid_filetrans(swat_t, swat_var_run_t, file)
+ 
+ allow swat_t winbind_exec_t:file mmap_file_perms;
+-can_exec(swat_t, winbind_exec_t)
++domtrans_pattern(swat_t, winbind_exec_t, winbind_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 };
 @@ -700,6 +739,8 @@
  
  miscfiles_read_localization(swat_t)
@@ -24337,7 +24464,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.6.32/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/sendmail.te	2009-12-22 14:56:01.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/sendmail.te	2009-12-27 07:57:52.000000000 -0500
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -24366,13 +24493,14 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(sendmail_t)
  corenet_all_recvfrom_netlabel(sendmail_t)
-@@ -64,24 +69,29 @@
+@@ -64,24 +69,30 @@
  
  fs_getattr_all_fs(sendmail_t)
  fs_search_auto_mountpoints(sendmail_t)
 +fs_rw_anon_inodefs_files(sendmail_t)
  
  term_dontaudit_use_console(sendmail_t)
++term_dontaudit_use_generic_ptys(sendmail_t)
  
  # for piping mail to a command
  corecmd_exec_shell(sendmail_t)
@@ -24396,7 +24524,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(sendmail_t)
  
-@@ -89,23 +99,46 @@
+@@ -89,23 +100,46 @@
  libs_read_lib_files(sendmail_t)
  
  logging_send_syslog_msg(sendmail_t)
@@ -24445,7 +24573,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -113,13 +146,20 @@
+@@ -113,13 +147,20 @@
  ')
  
  optional_policy(`
@@ -24467,7 +24595,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -127,24 +167,29 @@
+@@ -127,24 +168,29 @@
  ')
  
  optional_policy(`
@@ -24949,7 +25077,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_sysfs(snmpd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.6.32/policy/modules/services/snort.te
 --- nsaserefpolicy/policy/modules/services/snort.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/snort.te	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/snort.te	2009-12-27 08:04:33.000000000 -0500
 @@ -37,6 +37,7 @@
  allow snort_t self:tcp_socket create_stream_socket_perms;
  allow snort_t self:udp_socket create_socket_perms;
@@ -24958,6 +25086,22 @@ diff -b -B --ignore-all-space --exclude-
  # Snort IPS node. unverified.
  allow snort_t self:netlink_firewall_socket { bind create getattr };
  
+@@ -55,11 +56,12 @@
+ manage_files_pattern(snort_t, snort_var_run_t, snort_var_run_t)
+ files_pid_filetrans(snort_t, snort_var_run_t, file)
+ 
+-kernel_read_kernel_sysctls(snort_t)
+-kernel_read_sysctl(snort_t)
++kernel_dontaudit_read_system_state(snort_t)
+ kernel_list_proc(snort_t)
++kernel_read_kernel_sysctls(snort_t)
+ kernel_read_proc_symlinks(snort_t)
+-kernel_dontaudit_read_system_state(snort_t)
++kernel_read_sysctl(snort_t)
++kernel_request_load_module(snort_t)
+ 
+ corenet_all_recvfrom_unlabeled(snort_t)
+ corenet_all_recvfrom_netlabel(snort_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.6.32/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/spamassassin.fc	2009-12-17 11:20:47.000000000 -0500
@@ -26269,6 +26413,17 @@ diff -b -B --ignore-all-space --exclude-
  logging_log_filetrans(sysstat_t, sysstat_log_t, { file dir })
  
  # get info from /proc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.6.32/policy/modules/services/telnet.te
+--- nsaserefpolicy/policy/modules/services/telnet.te	2009-09-16 10:01:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/telnet.te	2009-12-29 17:46:17.000000000 -0500
+@@ -85,6 +85,7 @@
+ remotelogin_domtrans(telnetd_t)
+ 
+ userdom_search_user_home_dirs(telnetd_t)
++userdom_setattr_user_ptys(telnetd_t)
+ 
+ optional_policy(`
+ 	kerberos_keytab_template(telnetd, telnetd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-3.6.32/policy/modules/services/tftp.fc
 --- nsaserefpolicy/policy/modules/services/tftp.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/tftp.fc	2009-12-17 11:20:47.000000000 -0500
@@ -27293,8 +27448,22 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.32/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-12-18 15:27:23.000000000 -0500
-@@ -20,6 +20,28 @@
++++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-12-29 16:41:42.000000000 -0500
+@@ -8,6 +8,13 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow virt to read fuse files
++## </p>
++## </desc>
++gen_tunable(virt_use_fusefs, false)
++
++## <desc>
++## <p>
+ ## Allow virt to manage nfs files
+ ## </p>
+ ## </desc>
+@@ -20,6 +27,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
  
@@ -27323,7 +27492,7 @@ diff -b -B --ignore-all-space --exclude-
  attribute virt_image_type;
  
  type virt_etc_t;
-@@ -29,9 +51,14 @@
+@@ -29,9 +58,14 @@
  files_type(virt_etc_rw_t)
  
  # virt Image files
@@ -27339,7 +27508,7 @@ diff -b -B --ignore-all-space --exclude-
  type virt_log_t;
  logging_log_file(virt_log_t)
  
-@@ -48,27 +75,56 @@
+@@ -48,27 +82,56 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -27400,7 +27569,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
-@@ -76,6 +132,7 @@
+@@ -76,6 +139,7 @@
  
  manage_dirs_pattern(virtd_t, virt_var_lib_t, virt_var_lib_t)
  manage_files_pattern(virtd_t, virt_var_lib_t, virt_var_lib_t)
@@ -27408,7 +27577,7 @@ diff -b -B --ignore-all-space --exclude-
  files_var_lib_filetrans(virtd_t, virt_var_lib_t, { file dir })
  
  manage_dirs_pattern(virtd_t, virt_var_run_t, virt_var_run_t)
-@@ -86,7 +143,8 @@
+@@ -86,7 +150,8 @@
  kernel_read_system_state(virtd_t)
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
@@ -27418,7 +27587,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -97,40 +155,77 @@
+@@ -97,40 +162,77 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -27500,7 +27669,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +263,36 @@
+@@ -168,22 +270,36 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -27511,10 +27680,6 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	iptables_domtrans(virtd_t)
 +	iptables_initrc_domtrans(virtd_t)
-+')
-+
-+optional_policy(`
-+	kerberos_keytab_template(virtd, virtd_t)
  ')
  
 -#optional_policy(`
@@ -27522,6 +27687,11 @@ diff -b -B --ignore-all-space --exclude-
 -#	polkit_domtrans_resolve(virtd_t)
 -#')
 +optional_policy(`
++	kerberos_keytab_template(virtd, virtd_t)
++')
+ 
+ optional_policy(`
+-	qemu_domtrans(virtd_t)
 +	lvm_domtrans(virtd_t)
 +')
 +
@@ -27531,9 +27701,8 @@ diff -b -B --ignore-all-space --exclude-
 +	policykit_domtrans_resolve(virtd_t)
 +	policykit_read_lib(virtd_t)
 +')
- 
- optional_policy(`
--	qemu_domtrans(virtd_t)
++
++optional_policy(`
 +	qemu_spec_domtrans(virtd_t, svirt_t)
  	qemu_read_state(virtd_t)
  	qemu_signal(virtd_t)
@@ -27542,7 +27711,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +305,154 @@
+@@ -196,8 +312,158 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -27602,6 +27771,10 @@ diff -b -B --ignore-all-space --exclude-
 +	dev_rw_sysfs(svirt_t)
 +')
 +
++tunable_policy(`virt_use_fusefs',`
++	fs_read_fusefs_files(svirt_t)
++')
++
 +tunable_policy(`virt_use_nfs',`
 +	fs_manage_nfs_dirs(svirt_t)
 +	fs_manage_nfs_files(svirt_t)
@@ -28734,7 +28907,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.32/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-23 09:07:45.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-12-30 08:06:59.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -29006,7 +29179,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow gdm to run gdm-binary
  can_exec(xdm_t, xdm_exec_t)
-@@ -325,26 +394,43 @@
+@@ -325,26 +394,44 @@
  # this is ugly, daemons should not create files under /etc!
  manage_files_pattern(xdm_t, xdm_rw_etc_t, xdm_rw_etc_t)
  
@@ -29031,6 +29204,7 @@ diff -b -B --ignore-all-space --exclude-
 +fs_getattr_all_fs(xdm_t)
 +fs_list_inotifyfs(xdm_t)
 +fs_read_noxattr_fs_files(xdm_t)
++fs_dontaudit_list_fusefs(xdm_t)
 +
 +manage_files_pattern(xdm_t, user_fonts_t, user_fonts_t)
 +
@@ -29057,7 +29231,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xdm_t xserver_t:process signal;
  allow xdm_t xserver_t:unix_stream_socket connectto;
-@@ -358,6 +444,7 @@
+@@ -358,6 +445,7 @@
  allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
  
  allow xdm_t xserver_t:shm rw_shm_perms;
@@ -29065,7 +29239,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # connect to xdm xserver over stream socket
  stream_connect_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t, xserver_t)
-@@ -366,10 +453,14 @@
+@@ -366,10 +454,14 @@
  delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
@@ -29081,7 +29255,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
-@@ -389,11 +480,13 @@
+@@ -389,11 +481,13 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_generic_node(xdm_t)
  corenet_udp_bind_generic_node(xdm_t)
@@ -29095,7 +29269,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_rand(xdm_t)
  dev_read_sysfs(xdm_t)
  dev_getattr_framebuffer_dev(xdm_t)
-@@ -401,6 +494,7 @@
+@@ -401,6 +495,7 @@
  dev_getattr_mouse_dev(xdm_t)
  dev_setattr_mouse_dev(xdm_t)
  dev_rw_apm_bios(xdm_t)
@@ -29103,7 +29277,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_setattr_apm_bios_dev(xdm_t)
  dev_rw_dri(xdm_t)
  dev_rw_agp(xdm_t)
-@@ -413,14 +507,17 @@
+@@ -413,14 +508,17 @@
  dev_setattr_video_dev(xdm_t)
  dev_getattr_scanner_dev(xdm_t)
  dev_setattr_scanner_dev(xdm_t)
@@ -29123,7 +29297,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xdm_t)
  files_read_var_files(xdm_t)
-@@ -431,9 +528,15 @@
+@@ -431,9 +529,15 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
  files_create_boot_flag(xdm_t)
@@ -29139,7 +29313,7 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_dontaudit_read_fixed_disk(xdm_t)
  storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -442,6 +545,7 @@
+@@ -442,6 +546,7 @@
  storage_dontaudit_raw_write_removable_device(xdm_t)
  storage_dontaudit_setattr_removable_dev(xdm_t)
  storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -29147,7 +29321,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_setattr_console(xdm_t)
  term_use_unallocated_ttys(xdm_t)
-@@ -450,6 +554,7 @@
+@@ -450,6 +555,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -29155,7 +29329,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -460,10 +565,13 @@
+@@ -460,10 +566,13 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -29171,7 +29345,7 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_dontaudit_use_unpriv_user_fds(xdm_t)
  userdom_create_all_users_keys(xdm_t)
-@@ -472,6 +580,10 @@
+@@ -472,6 +581,10 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -29182,7 +29356,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -504,10 +616,12 @@
+@@ -504,10 +617,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -29195,7 +29369,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -515,12 +629,47 @@
+@@ -515,12 +630,47 @@
  ')
  
  optional_policy(`
@@ -29243,7 +29417,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -535,6 +684,7 @@
+@@ -535,6 +685,7 @@
  optional_policy(`
  	# Do not audit attempts to check whether user root has email
  	mta_dontaudit_getattr_spool_files(xdm_t)
@@ -29251,7 +29425,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -542,6 +692,39 @@
+@@ -542,6 +693,39 @@
  ')
  
  optional_policy(`
@@ -29291,7 +29465,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +733,9 @@
+@@ -550,8 +734,9 @@
  ')
  
  optional_policy(`
@@ -29303,7 +29477,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +744,6 @@
+@@ -560,7 +745,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -29311,7 +29485,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +754,10 @@
+@@ -571,6 +755,10 @@
  ')
  
  optional_policy(`
@@ -29322,7 +29496,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +774,9 @@
+@@ -587,10 +775,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -29334,7 +29508,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -602,9 +788,12 @@
+@@ -602,9 +789,12 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -29347,7 +29521,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +805,14 @@
+@@ -616,13 +806,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -29363,7 +29537,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,9 +825,19 @@
+@@ -635,9 +826,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -29383,7 +29557,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +871,6 @@
+@@ -671,7 +872,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -29391,7 +29565,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -681,9 +880,12 @@
+@@ -681,9 +881,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -29405,7 +29579,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +900,12 @@
+@@ -698,8 +901,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -29418,7 +29592,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +927,8 @@
+@@ -721,6 +928,8 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -29427,7 +29601,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +951,7 @@
+@@ -743,7 +952,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -29436,7 +29610,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +983,20 @@
+@@ -775,12 +984,20 @@
  ')
  
  optional_policy(`
@@ -29458,7 +29632,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,12 +1023,12 @@
+@@ -807,12 +1024,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -29475,7 +29649,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Run xkbcomp.
  allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -828,9 +1044,14 @@
+@@ -828,9 +1045,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -29490,7 +29664,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -845,11 +1066,14 @@
+@@ -845,11 +1067,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -29506,7 +29680,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1106,8 @@
+@@ -882,6 +1107,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -29515,7 +29689,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1132,8 @@
+@@ -906,6 +1133,8 @@
  # operations allowed on my windows
  allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
  
@@ -29524,7 +29698,7 @@ diff -b -B --ignore-all-space --exclude-
  # X Colormaps
  # can use the default colormap
  allow x_domain rootwindow_t:x_colormap { read use add_color };
-@@ -973,17 +1201,49 @@
+@@ -973,17 +1202,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -30108,6 +30282,24 @@ diff -b -B --ignore-all-space --exclude-
  	xen_append_log(fsadm_t)
 +	xen_rw_image_files(fsadm_t)
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-3.6.32/policy/modules/system/getty.te
+--- nsaserefpolicy/policy/modules/system/getty.te	2009-09-16 10:01:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/getty.te	2009-12-29 16:32:15.000000000 -0500
+@@ -56,11 +56,10 @@
+ manage_files_pattern(getty_t, getty_var_run_t, getty_var_run_t)
+ files_pid_filetrans(getty_t, getty_var_run_t, file)
+ 
+-kernel_list_proc(getty_t)
+-kernel_read_proc_symlinks(getty_t)
++kernel_read_system_state(getty_t)
+ 
+-corecmd_search_bin(getty_t)
+-corecmd_read_bin_symlinks(getty_t)
++corecmd_exec_bin(getty_t)
++corecmd_exec_shell(getty_t)
+ 
+ dev_read_sysfs(getty_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.6.32/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/init.fc	2009-12-17 11:20:47.000000000 -0500
@@ -30136,7 +30328,7 @@ diff -b -B --ignore-all-space --exclude-
  # /var
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.32/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/init.if	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/init.if	2009-12-29 20:23:06.000000000 -0500
 @@ -162,6 +162,7 @@
  	gen_require(`
  		attribute direct_run_init, direct_init, direct_init_entry;
@@ -30211,16 +30403,17 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -546,7 +585,7 @@
+@@ -546,7 +585,8 @@
  
  		# upstart uses a datagram socket instead of initctl pipe
  		allow $1 self:unix_dgram_socket create_socket_perms;
 -		allow $1 init_t:unix_dgram_socket sendto;
++		allow $1 init_t:unix_stream_socket connectto;
 +		init_chat($1)
  	')
  ')
  
-@@ -619,18 +658,19 @@
+@@ -619,18 +659,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -30244,7 +30437,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -646,19 +686,39 @@
+@@ -646,19 +687,39 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -30288,7 +30481,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -904,6 +964,24 @@
+@@ -904,6 +965,24 @@
  	allow $1 init_script_file_type:file read_file_perms;
  ')
  
@@ -30313,7 +30506,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Execute all init scripts in the caller domain.
-@@ -1123,7 +1201,7 @@
+@@ -1123,7 +1202,7 @@
  		type initrc_t;
  	')
  
@@ -30322,7 +30515,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1291,6 +1369,25 @@
+@@ -1291,6 +1370,25 @@
  
  ########################################
  ## <summary>
@@ -30348,7 +30541,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1521,3 +1618,70 @@
+@@ -1521,3 +1619,70 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')
@@ -31093,7 +31286,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.32/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-12-29 17:01:11.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -31204,13 +31397,14 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(ipsec_t)
  fs_search_auto_mountpoints(ipsec_t)
-@@ -153,17 +181,20 @@
+@@ -153,17 +181,21 @@
  # ipsec_mgmt Local policy
  #
  
 -allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
 -allow ipsec_mgmt_t self:process { signal setrlimit };
 +allow ipsec_mgmt_t self:capability { dac_override dac_read_search net_admin setpcap };
++dontaudit ipsec_mgmt_t self:capability sys_tty_config;
 +allow ipsec_mgmt_t self:process { signal setrlimit ptrace };
  allow ipsec_mgmt_t self:unix_stream_socket create_stream_socket_perms;
  allow ipsec_mgmt_t self:tcp_socket create_stream_socket_perms;
@@ -31228,7 +31422,7 @@ diff -b -B --ignore-all-space --exclude-
  allow ipsec_mgmt_t ipsec_mgmt_var_run_t:file manage_file_perms;
  files_pid_filetrans(ipsec_mgmt_t, ipsec_mgmt_var_run_t, file)
  
-@@ -241,6 +272,7 @@
+@@ -241,6 +273,7 @@
  init_use_script_ptys(ipsec_mgmt_t)
  init_exec_script_files(ipsec_mgmt_t)
  init_use_fds(ipsec_mgmt_t)
@@ -31236,7 +31430,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(ipsec_mgmt_t)
  
-@@ -280,6 +312,13 @@
+@@ -280,6 +313,13 @@
  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_socket_perms;
@@ -31250,7 +31444,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # manage pid file
  manage_files_pattern(racoon_t, ipsec_var_run_t, ipsec_var_run_t)
-@@ -296,6 +335,14 @@
+@@ -296,6 +336,14 @@
  
  kernel_read_system_state(racoon_t)
  kernel_read_network_state(racoon_t)
@@ -31265,7 +31459,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(racoon_t)
  corenet_tcp_sendrecv_all_if(racoon_t)
-@@ -314,6 +361,8 @@
+@@ -314,6 +362,8 @@
  
  files_read_etc_files(racoon_t)
  
@@ -31274,7 +31468,7 @@ diff -b -B --ignore-all-space --exclude-
  # allow racoon to use avc_has_perm to check context on proposed SA
  selinux_compute_access_vector(racoon_t)
  
-@@ -328,6 +377,14 @@
+@@ -328,6 +378,14 @@
  
  miscfiles_read_localization(racoon_t)
  
@@ -31289,7 +31483,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Setkey local policy
-@@ -341,12 +398,15 @@
+@@ -341,12 +399,15 @@
  read_files_pattern(setkey_t, ipsec_conf_file_t, ipsec_conf_file_t)
  read_lnk_files_pattern(setkey_t, ipsec_conf_file_t, ipsec_conf_file_t)
  
@@ -31305,7 +31499,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # allow setkey to set the context for ipsec SAs and policy.
  ipsec_setcontext_default_spd(setkey_t)
-@@ -358,3 +418,5 @@
+@@ -358,3 +419,5 @@
  seutil_read_config(setkey_t)
  
  userdom_use_user_terminals(setkey_t)
@@ -31625,7 +31819,7 @@ diff -b -B --ignore-all-space --exclude-
 +permissive kdump_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-23 12:43:17.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-29 20:06:16.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -31833,12 +32027,15 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +309,117 @@
+@@ -307,10 +309,129 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
 +/var/lib/spamassassin/compiled/.*\.so.*    --     gen_context(system_u:object_r:lib_t,s0)
 +
++/usr/lib(64)?/pgsql/.*\.so.*		--	gen_context(system_u:object_r:lib_t,s0)
++/usr/lib(64)?/pgsql/test/regress/.*\.so.*		--	gen_context(system_u:object_r:lib_t,s0)
++
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+\.so(\.[^/]*)*	-l	gen_context(system_u:object_r:lib_t,s0)
  ')
@@ -31862,7 +32059,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/usr/lib(64)?/sse2/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/i686/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/local/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/googleearth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/opt/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/opt/google/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -31951,6 +32150,13 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/chromium-browser/.*\.so 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/python.*/site-packages/pymedia/muxer\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/local/games/darwinia/lib/libSDL.*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/ocp-.*/mixclip\.so		     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/octagaplayer/libapplication\.so		     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/opt/AutoScan/usr/lib/libvte\.so.*			     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/bin/bsnes		     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.6.32/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-12-17 11:20:47.000000000 -0500
@@ -34151,7 +34357,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.32/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.if	2009-12-27 08:20:17.000000000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -34252,10 +34458,12 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 self:tcp_socket create_socket_perms;
  	allow $1 self:udp_socket create_socket_perms;
  
-@@ -557,6 +609,14 @@
+@@ -556,7 +608,15 @@
+ 	corenet_sendrecv_dns_client_packets($1)
  
  	files_search_etc($1)
- 	allow $1 net_conf_t:file read_file_perms;
+-	allow $1 net_conf_t:file read_file_perms;
++	read_files_pattern($1, net_conf_t, net_conf_t)
 +
 +	optional_policy(`
 +		avahi_stream_connect($1)
@@ -35501,7 +35709,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-23 07:52:17.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-29 18:41:02.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -38375,7 +38583,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.32/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-17 11:20:47.000000000 -0500
++++ serefpolicy-3.6.32/policy/support/obj_perm_sets.spt	2009-12-29 17:59:22.000000000 -0500
 @@ -181,7 +181,7 @@
  #
  define(`getattr_dir_perms',`{ getattr }')
@@ -38412,7 +38620,17 @@ diff -b -B --ignore-all-space --exclude-
  define(`relabelfrom_lnk_file_perms',`{ getattr relabelfrom }')
  define(`relabelto_lnk_file_perms',`{ getattr relabelto }')
  define(`relabel_lnk_file_perms',`{ getattr relabelfrom relabelto }')
-@@ -305,10 +307,27 @@
+@@ -238,7 +240,8 @@
+ define(`read_fifo_file_perms',`{ getattr open read lock ioctl }')
+ define(`append_fifo_file_perms',`{ getattr open append lock ioctl }')
+ define(`write_fifo_file_perms',`{ getattr open write append lock ioctl }')
+-define(`rw_fifo_file_perms',`{ getattr open read write append ioctl lock }')
++define(`rw_inherited_fifo_file_perms',`{ getattr read write append ioctl lock }')
++define(`rw_fifo_file_perms',`{ open rw_inherited_fifo_file_perms }')
+ define(`create_fifo_file_perms',`{ getattr create open }')
+ define(`rename_fifo_file_perms',`{ getattr rename }')
+ define(`delete_fifo_file_perms',`{ getattr unlink }')
+@@ -305,10 +308,27 @@
  #
  # Use (read and write) terminals
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -p -r1.988 -r1.989
--- selinux-policy.spec	23 Dec 2009 18:42:31 -0000	1.988
+++ selinux-policy.spec	30 Dec 2009 14:40:38 -0000	1.989
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 64%{?dist}
+Release: 65%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,35 @@ exit 0
 %endif
 
 %changelog
+* Wed Dec 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-65
+- Allow traceroute to use all terms
+- Fix mgetty use for faxes
+- Dontaudit xdm listing fusefs
+- Allow xguest to resolve host names
+- Allow abrt to read noxattr filesystems (cdrom)
+- Allow abrt_helper to send itself signals
+- Allow amavis to read certs
+- Allow apache to bind to port 3000 (Ruby on rails)
+- Asterist uses mysql and snmp
+- Allow consolekit to write wtmp file for shutdown
+- Allow cups ipc_lock
+- Allow hal to transition to ppp
+- Fix mailman labels for 64 bit systems
+- dontaudit system_mail access to leaked terminals
+- Allow mysqld_safe_t to unlink mysqld pid files
+- nrpe_t uses getpw calls
+- Allow NetworkManager to delete ppp pid files
+- Allow pptp_t to sens userdomain signals
+- Allow prelude to connect to mysql
+- Allow swat to start winbind server
+- Fixes for snort
+- Allow telnetd to setattr user terminals
+- Allow qemu to read fusefs
+- Allow domains that have telinit to connectto upstart unix_stream_socket
+- Dontaudit ipsec_mgmt sys_tty_config
+- Fix labels for postgrestgres test suite
+- Other textrel_shlib_t fixes
+
 * Wed Dec 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-64
 - Update to Rawhide filesystem.if file
 - Allow abrt to read nfs



From dwalsh at fedoraproject.org  Wed Dec 30 14:44:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 30 Dec 2009 14:44:55 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch, 1.24,
	1.25 selinux-policy.spec, 1.950, 1.951
Message-ID: <20091230144455.144EE11C00E9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1965

Modified Files:
	policy-F13.patch selinux-policy.spec 
Log Message:
* Wed Dec 30 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-5
- Lots of fixes found in F12, fixes from Tom London


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   61 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  342 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   33 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  388 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  232 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   70 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  125 ++
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    1 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  458 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   40 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   35 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   21 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   23 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   54 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   90 +
 policy/modules/services/denyhosts.te      |   72 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   27 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   48 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   51 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.fc        |    8 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   38 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   20 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  120 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   17 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   93 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   88 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    8 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/telnet.te         |    1 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  295 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  353 ++++++
 policy/modules/services/xserver.te        |  365 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/getty.te            |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  164 ++
 policy/modules/system/init.te             |  299 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   28 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  208 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  116 ++
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1677 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   12 
 policy/support/obj_perm_sets.spt          |   23 
 policy/users                              |   15 
 382 files changed, 20123 insertions(+), 2780 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- policy-F13.patch	23 Dec 2009 18:37:22 -0000	1.24
+++ policy-F13.patch	30 Dec 2009 14:44:53 -0000	1.25
@@ -345,7 +345,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.5/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/netutils.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/netutils.te	2009-12-29 20:02:16.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -362,6 +362,15 @@ diff --exclude-from=exclude -N -u -r nsa
  userdom_use_user_terminals(netutils_t)
  userdom_use_all_users_fds(netutils_t)
  
+@@ -217,6 +219,8 @@
+ dev_read_urand(traceroute_t)
+ files_read_usr_files(traceroute_t)
+ 
++term_use_all_terms(traceroute_t)
++
+ tunable_policy(`user_ping',`
+ 	term_use_all_user_ttys(traceroute_t)
+ 	term_use_all_user_ptys(traceroute_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.7.5/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-11-17 10:54:26.000000000 -0500
 +++ serefpolicy-3.7.5/policy/modules/admin/portage.te	2009-12-21 13:07:09.000000000 -0500
@@ -617,7 +626,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /usr/bin/online_update		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.7.5/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/admin/rpm.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/admin/rpm.if	2009-12-27 08:15:13.000000000 -0500
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -684,7 +693,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type rpm_tmpfs_t, rpm_script_tmp_t, rpm_var_lib_t;
 +	')
 +
-+	dontaudit $1 rpm_t:fifo_file { read write };
++	dontaudit $1 rpm_t:fifo_file rw_inherited_fifo_file_perms;
 + 	dontaudit $1 rpm_t:tcp_socket { read write };
 +	dontaudit $1 rpm_t:unix_dgram_socket { read write };
 +	dontaudit $1 rpm_t:shm rw_shm_perms;
@@ -5690,7 +5699,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.7.5/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/kernel/corecommands.fc	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/corecommands.fc	2009-12-30 08:13:44.000000000 -0500
 @@ -44,15 +44,17 @@
  /etc/apcupsd/offbattery		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/apcupsd/onbattery		--	gen_context(system_u:object_r:bin_t,s0)
@@ -5713,7 +5722,15 @@ diff --exclude-from=exclude -N -u -r nsa
  
  /etc/dhcp/dhclient\.d(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  
-@@ -144,6 +146,9 @@
+@@ -64,6 +66,7 @@
+ /etc/init\.d/functions		--	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /etc/mail/make			--	gen_context(system_u:object_r:bin_t,s0)
++/etc/mgetty\+sendfax/new_fax	--	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /etc/netplug\.d(/.*)? 	 		gen_context(system_u:object_r:bin_t,s0)
+ 
+@@ -144,6 +147,9 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
  
@@ -5723,7 +5740,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #
  # /usr
  #
-@@ -234,6 +239,7 @@
+@@ -234,6 +240,7 @@
  /usr/share/shorewall-lite(/.*)? 	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/shorewall6-lite(/.*)?	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/turboprint/lib(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
@@ -5731,7 +5748,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  /usr/X11R6/lib(64)?/X11/xkb/xkbcomp --	gen_context(system_u:object_r:bin_t,s0)
  
-@@ -323,3 +329,21 @@
+@@ -323,3 +330,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -6458,7 +6475,7 @@ diff --exclude-from=exclude -N -u -r nsa
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.7.5/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/kernel/files.if	2009-12-23 12:48:27.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/files.if	2009-12-29 18:04:05.000000000 -0500
 @@ -932,10 +932,8 @@
  	relabel_lnk_files_pattern($1, { file_type $2 }, { file_type $2 })
  	relabel_fifo_files_pattern($1, { file_type $2 }, { file_type $2 })
@@ -6472,7 +6489,32 @@ diff --exclude-from=exclude -N -u -r nsa
  
  	# satisfy the assertions:
  	seutil_relabelto_bin_policy($1)
-@@ -1431,6 +1429,24 @@
+@@ -1307,6 +1305,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Search all mount points.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_dontaudit_search_all_mountpoints',`
++	gen_require(`
++		attribute mountpoint;
++	')
++
++	dontaudit $1 mountpoint:dir search_dir_perms;
++')
++
++########################################
++## <summary>
+ ##	List the contents of the root directory.
+ ## </summary>
+ ## <param name="domain">
+@@ -1431,6 +1447,24 @@
  
  ########################################
  ## <summary>
@@ -6497,7 +6539,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Remove entries from the root directory.
  ## </summary>
  ## <param name="domain">
-@@ -2107,6 +2123,8 @@
+@@ -2107,6 +2141,8 @@
  	allow $1 etc_t:dir list_dir_perms;
  	read_files_pattern($1, etc_t, etc_t)
  	read_lnk_files_pattern($1, etc_t, etc_t)
@@ -6506,7 +6548,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -2189,6 +2207,24 @@
+@@ -2189,6 +2225,24 @@
  
  ########################################
  ## <summary>
@@ -6531,7 +6573,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Execute generic files in /etc.
  ## </summary>
  ## <param name="domain">
-@@ -2594,6 +2630,11 @@
+@@ -2594,6 +2648,11 @@
  	')
  
  	delete_files_pattern($1, file_t, file_t)
@@ -6543,7 +6585,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -3496,6 +3537,32 @@
+@@ -3496,6 +3555,32 @@
  
  ########################################
  ## <summary>
@@ -6576,7 +6618,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Manage temporary files and directories in /tmp.
  ## </summary>
  ## <param name="domain">
-@@ -3709,6 +3776,8 @@
+@@ -3709,6 +3794,8 @@
  	delete_lnk_files_pattern($1, tmpfile, tmpfile)
  	delete_fifo_files_pattern($1, tmpfile, tmpfile)
  	delete_sock_files_pattern($1, tmpfile, tmpfile)
@@ -6585,7 +6627,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -3817,7 +3886,12 @@
+@@ -3817,7 +3904,12 @@
  		type usr_t;
  	')
  
@@ -6599,7 +6641,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -3856,6 +3930,7 @@
+@@ -3856,6 +3948,7 @@
  	allow $1 usr_t:dir list_dir_perms;
  	read_files_pattern($1, usr_t, usr_t)
  	read_lnk_files_pattern($1, usr_t, usr_t)
@@ -6607,7 +6649,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -3880,6 +3955,24 @@
+@@ -3880,6 +3973,24 @@
  
  ########################################
  ## <summary>
@@ -6632,7 +6674,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	dontaudit write of /usr files
  ## </summary>
  ## <param name="domain">
-@@ -4500,6 +4593,24 @@
+@@ -4500,6 +4611,24 @@
  	read_lnk_files_pattern($1, { var_t var_lib_t }, var_lib_t)
  ')
  
@@ -6657,7 +6699,7 @@ diff --exclude-from=exclude -N -u -r nsa
  # cjp: the next two interfaces really need to be fixed
  # in some way.  They really neeed their own types.
  
-@@ -4772,6 +4883,25 @@
+@@ -4772,6 +4901,25 @@
  	search_dirs_pattern($1, var_t, var_run_t)
  ')
  
@@ -6683,7 +6725,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
  ## <summary>
  ##	Do not audit attempts to search
-@@ -4880,6 +5010,24 @@
+@@ -4880,6 +5028,24 @@
  
  ########################################
  ## <summary>
@@ -6708,7 +6750,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Do not audit attempts to write to daemon runtime data files.
  ## </summary>
  ## <param name="domain">
-@@ -5001,6 +5149,24 @@
+@@ -5001,6 +5167,24 @@
  
  ########################################
  ## <summary>
@@ -6733,7 +6775,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Search the contents of generic spool
  ##	directories (/var/spool).
  ## </summary>
-@@ -5189,12 +5355,15 @@
+@@ -5189,12 +5373,15 @@
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
  
@@ -6750,7 +6792,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	')
  ')
  
-@@ -5215,3 +5384,192 @@
+@@ -5215,3 +5402,192 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -6972,7 +7014,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.7.5/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.if	2009-12-23 08:58:51.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/kernel/filesystem.if	2009-12-30 08:06:06.000000000 -0500
 @@ -906,7 +906,7 @@
  		type cifs_t;
  	')
@@ -6982,7 +7024,33 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -2047,7 +2047,7 @@
+@@ -1459,6 +1459,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Do not audit attempts to list the contents
++##	of directories on a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`fs_dontaudit_list_fusefs',`
++	gen_require(`
++		type fusefs_t;
++	')
++
++	dontaudit $1 fusefs_t:dir list_dir_perms;
++')
++
++########################################
++## <summary>
+ ##	Create, read, write, and delete directories
+ ##	on a FUSEFS filesystem.
+ ## </summary>
+@@ -2047,7 +2066,7 @@
  		type nfs_t;
  	')
  
@@ -6991,7 +7059,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -2069,6 +2069,25 @@
+@@ -2069,6 +2088,25 @@
  	read_lnk_files_pattern($1, nfs_t, nfs_t)
  ')
  
@@ -7017,7 +7085,7 @@ diff --exclude-from=exclude -N -u -r nsa
  #########################################
  ## <summary>
  ##	Read named sockets on a NFS filesystem.
-@@ -3684,6 +3703,24 @@
+@@ -3684,6 +3722,24 @@
  
  ########################################
  ## <summary>
@@ -7042,7 +7110,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Mount a XENFS filesystem.
  ## </summary>
  ## <param name="domain">
-@@ -4181,3 +4218,175 @@
+@@ -4181,3 +4237,175 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
@@ -9415,8 +9483,14 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.7.5/policy/modules/roles/xguest.te
 --- nsaserefpolicy/policy/modules/roles/xguest.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/roles/xguest.te	2009-12-21 13:07:09.000000000 -0500
-@@ -35,6 +35,23 @@
++++ serefpolicy-3.7.5/policy/modules/roles/xguest.te	2009-12-29 18:12:04.000000000 -0500
+@@ -30,11 +30,29 @@
+ role xguest_r;
+ 
+ userdom_restricted_xwindows_user_template(xguest)
++sysnet_dns_name_resolve(xguest_t)
+ 
+ ########################################
  #
  # Local policy
  #
@@ -9440,7 +9514,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  # Allow mounting of file systems
  optional_policy(`
-@@ -49,10 +66,9 @@
+@@ -49,10 +67,9 @@
  		fs_manage_noxattr_fs_dirs(xguest_t)
  		fs_getattr_noxattr_fs(xguest_t)
  		fs_read_noxattr_fs_symlinks(xguest_t)
@@ -9452,7 +9526,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	')
  ')
  
-@@ -67,17 +83,60 @@
+@@ -67,17 +84,60 @@
  ')
  
  optional_policy(`
@@ -9703,7 +9777,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	All of the rules required to administrate 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.7.5/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/abrt.te	2009-12-23 07:13:38.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/abrt.te	2009-12-29 19:58:38.000000000 -0500
 @@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -9751,7 +9825,7 @@ diff --exclude-from=exclude -N -u -r nsa
  files_pid_filetrans(abrt_t, abrt_var_run_t, { file dir })
  
  kernel_read_ring_buffer(abrt_t)
-@@ -75,18 +90,35 @@
+@@ -75,18 +90,36 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -9782,12 +9856,13 @@ diff --exclude-from=exclude -N -u -r nsa
  fs_getattr_all_fs(abrt_t)
  fs_getattr_all_dirs(abrt_t)
 +fs_read_fusefs_files(abrt_t)
++fs_read_noxattr_fs_files(abrt_t)
 +fs_read_nfs_files(abrt_t)
 +fs_search_all(abrt_t)
  
  sysnet_read_config(abrt_t)
  
-@@ -96,22 +128,92 @@
+@@ -96,22 +129,94 @@
  miscfiles_read_certs(abrt_t)
  miscfiles_read_localization(abrt_t)
  
@@ -9853,6 +9928,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +#
 +
 +allow abrt_helper_t self:capability { chown setgid };
++allow abrt_helper_t self:process signal;
++
 +read_files_pattern(abrt_helper_t, abrt_etc_t, abrt_etc_t)
 +
 +domain_read_all_domains_state(abrt_helper_t)
@@ -10156,6 +10233,17 @@ diff --exclude-from=exclude -N -u -r nsa
 +groupd_rw_semaphores(aisexec_t)
 +groupd_rw_shm(aisexec_t)
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.7.5/policy/modules/services/amavis.te
+--- nsaserefpolicy/policy/modules/services/amavis.te	2009-12-18 11:38:25.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/amavis.te	2009-12-30 08:22:02.000000000 -0500
+@@ -143,6 +143,7 @@
+ logging_send_syslog_msg(amavis_t)
+ 
+ miscfiles_read_localization(amavis_t)
++miscfiles_read_certs(amavis_t)
+ 
+ sysnet_dns_name_resolve(amavis_t)
+ sysnet_use_ldap(amavis_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.7.5/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/apache.fc	2009-12-21 13:07:09.000000000 -0500
@@ -10949,7 +11037,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.7.5/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/apache.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/apache.te	2009-12-29 18:35:26.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -11160,7 +11248,7 @@ diff --exclude-from=exclude -N -u -r nsa
  manage_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  manage_sock_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file })
-@@ -312,16 +375,18 @@
+@@ -312,18 +375,21 @@
  kernel_read_kernel_sysctls(httpd_t)
  # for modules that want to access /proc/meminfo
  kernel_read_system_state(httpd_t)
@@ -11183,8 +11271,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +corenet_udp_bind_all_nodes(httpd_t)
  corenet_tcp_bind_http_port(httpd_t)
  corenet_tcp_bind_http_cache_port(httpd_t)
++corenet_tcp_bind_ntop_port(httpd_t)
  corenet_sendrecv_http_server_packets(httpd_t)
-@@ -335,15 +400,15 @@
+ # Signal self for shutdown
+ corenet_tcp_connect_http_port(httpd_t)
+@@ -335,15 +401,15 @@
  
  fs_getattr_all_fs(httpd_t)
  fs_search_auto_mountpoints(httpd_t)
@@ -11203,7 +11294,7 @@ diff --exclude-from=exclude -N -u -r nsa
  files_read_usr_files(httpd_t)
  files_list_mnt(httpd_t)
  files_search_spool(httpd_t)
-@@ -358,6 +423,10 @@
+@@ -358,6 +424,10 @@
  files_read_var_lib_symlinks(httpd_t)
  
  fs_search_auto_mountpoints(httpd_sys_script_t)
@@ -11214,7 +11305,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  libs_read_lib_files(httpd_t)
  
-@@ -372,18 +441,33 @@
+@@ -372,18 +442,33 @@
  
  userdom_use_unpriv_users_fds(httpd_t)
  
@@ -11252,7 +11343,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  ')
  
-@@ -391,32 +475,71 @@
+@@ -391,32 +476,71 @@
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
  
@@ -11329,7 +11420,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -424,11 +547,23 @@
+@@ -424,11 +548,23 @@
  	fs_read_nfs_symlinks(httpd_t)
  ')
  
@@ -11353,7 +11444,7 @@ diff --exclude-from=exclude -N -u -r nsa
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t, httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -451,6 +586,18 @@
+@@ -451,6 +587,18 @@
  ')
  
  optional_policy(`
@@ -11372,7 +11463,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	cron_system_entry(httpd_t, httpd_exec_t)
  ')
  
-@@ -459,8 +606,13 @@
+@@ -459,8 +607,13 @@
  ')
  
  optional_policy(`
@@ -11388,7 +11479,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -468,22 +620,19 @@
+@@ -468,22 +621,19 @@
  	mailman_domtrans_cgi(httpd_t)
  	# should have separate types for public and private archives
  	mailman_search_data(httpd_t)
@@ -11414,7 +11505,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -494,12 +643,23 @@
+@@ -494,12 +644,23 @@
  ')
  
  optional_policy(`
@@ -11438,7 +11529,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	')
  ')
  
-@@ -508,6 +668,7 @@
+@@ -508,6 +669,7 @@
  ')
  
  optional_policy(`
@@ -11446,7 +11537,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
  	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
  ')
-@@ -535,6 +696,23 @@
+@@ -535,6 +697,23 @@
  
  userdom_use_user_terminals(httpd_helper_t)
  
@@ -11470,7 +11561,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
  #
  # Apache PHP script local policy
-@@ -564,20 +742,25 @@
+@@ -564,20 +743,25 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -11502,7 +11593,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -595,23 +778,24 @@
+@@ -595,23 +779,24 @@
  append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
  read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
  
@@ -11531,7 +11622,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -624,6 +808,7 @@
+@@ -624,6 +809,7 @@
  logging_send_syslog_msg(httpd_suexec_t)
  
  miscfiles_read_localization(httpd_suexec_t)
@@ -11539,7 +11630,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  tunable_policy(`httpd_can_network_connect',`
  	allow httpd_suexec_t self:tcp_socket create_stream_socket_perms;
-@@ -631,22 +816,31 @@
+@@ -631,22 +817,31 @@
  
  	corenet_all_recvfrom_unlabeled(httpd_suexec_t)
  	corenet_all_recvfrom_netlabel(httpd_suexec_t)
@@ -11578,7 +11669,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -672,15 +866,14 @@
+@@ -672,15 +867,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -11597,7 +11688,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow httpd_sys_script_t httpd_t:tcp_socket { read write };
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
-@@ -699,12 +892,24 @@
+@@ -699,12 +893,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -11624,7 +11715,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +917,35 @@
+@@ -712,6 +918,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -11660,7 +11751,7 @@ diff --exclude-from=exclude -N -u -r nsa
  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)
-@@ -724,6 +958,10 @@
+@@ -724,6 +959,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -11671,7 +11762,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -735,6 +973,8 @@
+@@ -735,6 +974,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -11680,7 +11771,7 @@ diff --exclude-from=exclude -N -u -r nsa
  manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t)
  
  kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-@@ -754,11 +994,88 @@
+@@ -754,11 +995,88 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -11872,7 +11963,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.7.5/policy/modules/services/asterisk.te
 --- nsaserefpolicy/policy/modules/services/asterisk.te	2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/asterisk.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/asterisk.te	2009-12-30 08:24:30.000000000 -0500
 @@ -34,18 +34,21 @@
  type asterisk_var_run_t;
  files_pid_file(asterisk_var_run_t)
@@ -11926,7 +12017,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  domain_use_interactive_fds(asterisk_t)
  
-@@ -120,17 +129,25 @@
+@@ -120,17 +129,29 @@
  fs_getattr_all_fs(asterisk_t)
  fs_search_auto_mountpoints(asterisk_t)
  
@@ -11943,6 +12034,10 @@ diff --exclude-from=exclude -N -u -r nsa
  
  optional_policy(`
 -	nis_use_ypbind(asterisk_t)
++	mysql_stream_connect(asterisk_t)
++')
++
++optional_policy(`
 +	mta_send_mail(asterisk_t)
 +')
 +
@@ -11955,11 +12050,12 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -138,10 +155,10 @@
+@@ -138,10 +159,11 @@
  ')
  
  optional_policy(`
 -	udev_read_db(asterisk_t)
++	snmp_read_snmp_var_lib_files(asterisk_t)
 +	snmp_stream_connect(asterisk_t)
  ')
  
@@ -12941,7 +13037,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +permissive chronyd_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.7.5/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/clamav.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/clamav.te	2009-12-29 18:41:42.000000000 -0500
 @@ -57,6 +57,7 @@
  #
  
@@ -12962,16 +13058,16 @@ diff --exclude-from=exclude -N -u -r nsa
  
  cron_use_fds(clamd_t)
  cron_use_system_job_fds(clamd_t)
-@@ -187,15 +188,15 @@
+@@ -187,15 +188,17 @@
  files_read_etc_files(freshclam_t)
  files_read_etc_runtime_files(freshclam_t)
  
 -miscfiles_read_localization(freshclam_t)
 +auth_use_nsswitch(freshclam_t)
-+
-+logging_send_syslog_msg(freshclam_t)
  
 -sysnet_dns_name_resolve(freshclam_t)
++logging_send_syslog_msg(freshclam_t)
++
 +miscfiles_read_localization(freshclam_t)
  
  clamav_stream_connect(freshclam_t)
@@ -12980,10 +13076,12 @@ diff --exclude-from=exclude -N -u -r nsa
 -cron_use_system_job_fds(freshclam_t)
 -cron_rw_pipes(freshclam_t)
 +cron_system_entry(freshclam_t, freshclam_exec_t)
++
++userdom_stream_connect(freshclam_t)
  
  ########################################
  #
-@@ -247,5 +248,9 @@
+@@ -247,5 +250,9 @@
  mta_send_mail(clamscan_t)
  
  optional_policy(`
@@ -13290,7 +13388,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.7.5/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/consolekit.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/consolekit.te	2009-12-29 20:22:48.000000000 -0500
 @@ -21,7 +21,7 @@
  # consolekit local policy
  #
@@ -13300,11 +13398,12 @@ diff --exclude-from=exclude -N -u -r nsa
  allow consolekit_t self:process { getsched signal };
  allow consolekit_t self:fifo_file rw_fifo_file_perms;
  allow consolekit_t self:unix_stream_socket create_stream_socket_perms;
-@@ -59,16 +59,21 @@
+@@ -59,16 +59,22 @@
  term_use_all_terms(consolekit_t)
  
  auth_use_nsswitch(consolekit_t)
 +auth_manage_pam_console_data(consolekit_t)
++auth_write_login_records(consolekit_t)
  
  init_telinit(consolekit_t)
  init_rw_utmp(consolekit_t)
@@ -13322,7 +13421,7 @@ diff --exclude-from=exclude -N -u -r nsa
  userdom_read_user_tmp_files(consolekit_t)
  
  hal_ptrace(consolekit_t)
-@@ -84,9 +89,12 @@
+@@ -84,9 +90,12 @@
  ')
  
  optional_policy(`
@@ -13336,7 +13435,7 @@ diff --exclude-from=exclude -N -u -r nsa
  		hal_dbus_chat(consolekit_t)
  	')
  
-@@ -100,6 +108,7 @@
+@@ -100,6 +109,7 @@
  ')
  
  optional_policy(`
@@ -13344,7 +13443,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	policykit_domtrans_auth(consolekit_t)
  	policykit_read_lib(consolekit_t)
  	policykit_read_reload(consolekit_t)
-@@ -109,9 +118,18 @@
+@@ -109,9 +119,18 @@
  	xserver_read_xdm_pid(consolekit_t)
  	xserver_read_user_xauth(consolekit_t)
  	corenet_tcp_connect_xserver_port(consolekit_t)
@@ -14128,7 +14227,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/usr/local/linuxprinter/ppd(/.*)?      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.7.5/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/cups.te	2009-12-23 12:11:21.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/cups.te	2009-12-30 08:05:46.000000000 -0500
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -14156,6 +14255,15 @@ diff --exclude-from=exclude -N -u -r nsa
  
  type hplip_var_run_t;
  files_pid_file(hplip_var_run_t)
+@@ -97,7 +103,7 @@
+ #
+ 
+ # /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_rawio sys_resource sys_tty_config };
++allow cupsd_t self:capability { ipc_lock sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_rawio sys_resource sys_tty_config };
+ dontaudit cupsd_t self:capability { sys_tty_config net_admin };
+ allow cupsd_t self:process { getpgid setpgid setsched signal_perms };
+ allow cupsd_t self:fifo_file rw_fifo_file_perms;
 @@ -105,6 +111,7 @@
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
  allow cupsd_t self:netlink_selinux_socket create_socket_perms;
@@ -14845,7 +14953,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.7.5/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/devicekit.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/devicekit.te	2009-12-29 19:15:17.000000000 -0500
 @@ -42,6 +42,8 @@
  
  files_read_etc_files(devicekit_t)
@@ -14855,9 +14963,12 @@ diff --exclude-from=exclude -N -u -r nsa
  miscfiles_read_localization(devicekit_t)
  
  optional_policy(`
-@@ -62,6 +64,7 @@
+@@ -60,8 +62,9 @@
+ # DeviceKit disk local policy
+ #
  
- allow devicekit_disk_t self:capability { chown dac_override fowner fsetid sys_nice sys_ptrace sys_rawio };
+-allow devicekit_disk_t self:capability { chown dac_override fowner fsetid sys_nice sys_ptrace sys_rawio };
++allow devicekit_disk_t self:capability { chown dac_override fowner fsetid sys_nice sys_admin sys_ptrace sys_rawio };
  allow devicekit_disk_t self:fifo_file rw_fifo_file_perms;
 +allow devicekit_disk_t self:netlink_kobject_uevent_socket create_socket_perms;
  
@@ -15966,7 +16077,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.7.5/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/hal.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/hal.te	2009-12-29 20:09:15.000000000 -0500
 @@ -55,6 +55,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -16018,7 +16129,12 @@ diff --exclude-from=exclude -N -u -r nsa
  
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_user_home_dirs(hald_t)
-@@ -290,6 +304,7 @@
+@@ -286,10 +300,12 @@
+ ')
+ 
+ optional_policy(`
++	ppp_domtrans(hald_t)
+ 	ppp_read_rw_config(hald_t)
  ')
  
  optional_policy(`
@@ -16026,7 +16142,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	policykit_domtrans_auth(hald_t)
  	policykit_domtrans_resolve(hald_t)
  	policykit_read_lib(hald_t)
-@@ -321,6 +336,10 @@
+@@ -321,6 +337,10 @@
  	virt_manage_images(hald_t)
  ')
  
@@ -16037,7 +16153,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
  #
  # Hal acl local policy
-@@ -341,6 +360,7 @@
+@@ -341,6 +361,7 @@
  manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
@@ -16045,7 +16161,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  corecmd_exec_bin(hald_acl_t)
  
-@@ -357,6 +377,8 @@
+@@ -357,6 +378,8 @@
  files_read_usr_files(hald_acl_t)
  files_read_etc_files(hald_acl_t)
  
@@ -16054,7 +16170,7 @@ diff --exclude-from=exclude -N -u -r nsa
  storage_getattr_removable_dev(hald_acl_t)
  storage_setattr_removable_dev(hald_acl_t)
  storage_getattr_fixed_disk_dev(hald_acl_t)
-@@ -369,6 +391,7 @@
+@@ -369,6 +392,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -16062,7 +16178,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	policykit_domtrans_auth(hald_acl_t)
  	policykit_read_lib(hald_acl_t)
  	policykit_read_reload(hald_acl_t)
-@@ -450,12 +473,16 @@
+@@ -450,12 +474,16 @@
  
  miscfiles_read_localization(hald_keymap_t)
  
@@ -16081,7 +16197,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
  allow hald_dccm_t self:udp_socket create_socket_perms;
-@@ -469,10 +496,22 @@
+@@ -469,10 +497,22 @@
  manage_files_pattern(hald_dccm_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_dccm_t)
  
@@ -16104,7 +16220,7 @@ diff --exclude-from=exclude -N -u -r nsa
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -484,6 +523,7 @@
+@@ -484,6 +524,7 @@
  corenet_tcp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_dhcpc_port(hald_dccm_t)
@@ -16112,7 +16228,7 @@ diff --exclude-from=exclude -N -u -r nsa
  corenet_tcp_bind_dccm_port(hald_dccm_t)
  
  logging_send_syslog_msg(hald_dccm_t)
-@@ -491,3 +531,7 @@
+@@ -491,3 +532,7 @@
  files_read_usr_files(hald_dccm_t)
  
  miscfiles_read_localization(hald_dccm_t)
@@ -16505,6 +16621,24 @@ diff --exclude-from=exclude -N -u -r nsa
 +
  miscfiles_read_localization(lircd_t)
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.7.5/policy/modules/services/mailman.fc
+--- nsaserefpolicy/policy/modules/services/mailman.fc	2009-07-23 14:11:04.000000000 -0400
++++ serefpolicy-3.7.5/policy/modules/services/mailman.fc	2009-12-30 08:22:07.000000000 -0500
+@@ -25,10 +25,10 @@
+ ifdef(`distro_redhat', `
+ /etc/mailman(/.*)?			gen_context(system_u:object_r:mailman_data_t,s0)
+ 
+-/usr/lib/mailman/bin/qrunner	--	gen_context(system_u:object_r:mailman_queue_exec_t,s0)
+-/usr/lib/mailman/cgi-bin/.*	--	gen_context(system_u:object_r:mailman_cgi_exec_t,s0)
+-/usr/lib/mailman/mail/mailman	--	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
+-/usr/lib/mailman/scripts/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
++/usr/lib(64)?/mailman/bin/qrunner	--	gen_context(system_u:object_r:mailman_queue_exec_t,s0)
++/usr/lib(64)?/mailman/cgi-bin/.*	--	gen_context(system_u:object_r:mailman_cgi_exec_t,s0)
++/usr/lib(64)?/mailman/mail/mailman	--	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
++/usr/lib(64)?/mailman/scripts/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
+ 
+ /var/spool/mailman(/.*)?		gen_context(system_u:object_r:mailman_data_t,s0)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.7.5/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/mailman.te	2009-12-21 13:07:09.000000000 -0500
@@ -16647,7 +16781,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.7.5/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/mta.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/mta.te	2009-12-29 16:33:41.000000000 -0500
 @@ -27,6 +27,9 @@
  type mail_spool_t;
  files_mountpoint(mail_spool_t)
@@ -16670,7 +16804,13 @@ diff --exclude-from=exclude -N -u -r nsa
  
  dev_read_sysfs(system_mail_t)
  dev_read_rand(system_mail_t)
-@@ -72,16 +77,21 @@
+@@ -68,20 +73,27 @@
+ 
+ selinux_getattr_fs(system_mail_t)
+ 
++term_dontaudit_use_unallocated_ttys(system_mail_t)
++
+ init_use_script_ptys(system_mail_t)
  
  userdom_use_user_terminals(system_mail_t)
  userdom_dontaudit_search_user_home_dirs(system_mail_t)
@@ -16692,7 +16832,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -100,6 +110,7 @@
+@@ -100,6 +112,7 @@
  optional_policy(`
  	cron_read_system_job_tmp_files(system_mail_t)
  	cron_dontaudit_write_pipes(system_mail_t)
@@ -16700,7 +16840,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -178,6 +189,10 @@
+@@ -178,6 +191,10 @@
  ')
  
  optional_policy(`
@@ -16711,7 +16851,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	smartmon_read_tmp_files(system_mail_t)
  ')
  
-@@ -197,6 +212,25 @@
+@@ -197,6 +214,25 @@
  	')
  ')
  
@@ -16826,7 +16966,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Send a generic signal to MySQL.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.7.5/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/mysql.te	2009-12-23 12:06:39.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/mysql.te	2009-12-29 09:05:51.000000000 -0500
 @@ -1,6 +1,13 @@
  
  policy_module(mysql, 1.11.1)
@@ -16866,7 +17006,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow mysqld_safe_t mysqld_log_t:file manage_file_perms;
  
 -allow mysqld_safe_t mysqld_var_run_t:sock_file unlink;
-+read_files_pattern(mysqld_safe_t, mysqld_var_run_t, mysqld_var_run_t)
++manage_files_pattern(mysqld_safe_t, mysqld_var_run_t, mysqld_var_run_t)
 +delete_sock_files_pattern(mysqld_safe_t, mysqld_var_run_t, mysqld_var_run_t)
  
  domain_read_all_domains_state(mysqld_safe_t)
@@ -17101,7 +17241,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.7.5/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/nagios.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/nagios.te	2009-12-30 08:29:01.000000000 -0500
 @@ -6,17 +6,23 @@
  # Declarations
  #
@@ -17286,7 +17426,7 @@ diff --exclude-from=exclude -N -u -r nsa
  kernel_read_system_state(nrpe_t)
  kernel_read_kernel_sysctls(nrpe_t)
  
-@@ -183,15 +232,19 @@
+@@ -183,11 +232,15 @@
  dev_read_urand(nrpe_t)
  
  domain_use_interactive_fds(nrpe_t)
@@ -17297,15 +17437,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +fs_getattr_all_fs(nrpe_t)
  fs_search_auto_mountpoints(nrpe_t)
  
++auth_use_nsswitch(nrpe_t)
++
  logging_send_syslog_msg(nrpe_t)
  
  miscfiles_read_localization(nrpe_t)
- 
-+sysnet_read_config(nrpe_t)
-+
- userdom_dontaudit_use_unpriv_user_fds(nrpe_t)
- 
- optional_policy(`
 @@ -209,3 +262,84 @@
  optional_policy(`
  	udev_read_db(nrpe_t)
@@ -17504,7 +17640,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.7.5/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/networkmanager.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/networkmanager.te	2009-12-29 16:26:40.000000000 -0500
 @@ -19,6 +19,9 @@
  type NetworkManager_tmp_t;
  files_tmp_file(NetworkManager_tmp_t)
@@ -17716,7 +17852,8 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
 +	ppp_initrc_domtrans(NetworkManager_t)
  	ppp_domtrans(NetworkManager_t)
- 	ppp_read_pid_files(NetworkManager_t)
+-	ppp_read_pid_files(NetworkManager_t)
++	ppp_manage_pid_files(NetworkManager_t)
 +	ppp_kill(NetworkManager_t)
  	ppp_signal(NetworkManager_t)
 +	ppp_signull(NetworkManager_t)
@@ -20420,7 +20557,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.7.5/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/ppp.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/ppp.te	2009-12-29 16:46:33.000000000 -0500
 @@ -38,7 +38,7 @@
  files_type(pppd_etc_rw_t)
  
@@ -20457,7 +20594,14 @@ diff --exclude-from=exclude -N -u -r nsa
  dontaudit pptp_t self:capability sys_tty_config;
  allow pptp_t self:process signal;
  allow pptp_t self:fifo_file rw_fifo_file_perms;
-@@ -295,6 +297,14 @@
+@@ -289,12 +291,21 @@
+ 
+ userdom_dontaudit_use_unpriv_user_fds(pptp_t)
+ userdom_dontaudit_search_user_home_dirs(pptp_t)
++userdom_signal_unpriv_users(pptp_t)
+ 
+ optional_policy(`
+ 	consoletype_exec(pppd_t)
  ')
  
  optional_policy(`
@@ -20472,6 +20616,17 @@ diff --exclude-from=exclude -N -u -r nsa
  	hostname_exec(pptp_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.7.5/policy/modules/services/prelude.te
+--- nsaserefpolicy/policy/modules/services/prelude.te	2009-12-18 11:38:25.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/prelude.te	2009-12-30 08:34:35.000000000 -0500
+@@ -90,6 +90,7 @@
+ corenet_tcp_bind_prelude_port(prelude_t)
+ corenet_tcp_connect_prelude_port(prelude_t)
+ corenet_tcp_connect_postgresql_port(prelude_t)
++corenet_tcp_connect_mysql_port(prelude_t)
+ 
+ dev_read_rand(prelude_t)
+ dev_read_urand(prelude_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.7.5/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/procmail.te	2009-12-21 13:07:09.000000000 -0500
@@ -22506,7 +22661,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.7.5/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/samba.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/samba.te	2009-12-29 19:05:08.000000000 -0500
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -22680,6 +22835,15 @@ diff --exclude-from=exclude -N -u -r nsa
  rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  read_lnk_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  
+@@ -657,7 +696,7 @@
+ files_pid_filetrans(swat_t, swat_var_run_t, file)
+ 
+ allow swat_t winbind_exec_t:file mmap_file_perms;
+-can_exec(swat_t, winbind_exec_t)
++domtrans_pattern(swat_t, winbind_exec_t, winbind_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 };
 @@ -700,6 +739,8 @@
  
  miscfiles_read_localization(swat_t)
@@ -22989,7 +23153,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.7.5/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/sendmail.te	2009-12-22 14:55:43.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/sendmail.te	2009-12-27 07:58:08.000000000 -0500
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -23018,13 +23182,14 @@ diff --exclude-from=exclude -N -u -r nsa
  
  corenet_all_recvfrom_unlabeled(sendmail_t)
  corenet_all_recvfrom_netlabel(sendmail_t)
-@@ -64,24 +69,29 @@
+@@ -64,24 +69,30 @@
  
  fs_getattr_all_fs(sendmail_t)
  fs_search_auto_mountpoints(sendmail_t)
 +fs_rw_anon_inodefs_files(sendmail_t)
  
  term_dontaudit_use_console(sendmail_t)
++term_dontaudit_use_generic_ptys(sendmail_t)
  
  # for piping mail to a command
  corecmd_exec_shell(sendmail_t)
@@ -23048,7 +23213,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  auth_use_nsswitch(sendmail_t)
  
-@@ -89,23 +99,46 @@
+@@ -89,23 +100,46 @@
  libs_read_lib_files(sendmail_t)
  
  logging_send_syslog_msg(sendmail_t)
@@ -23097,7 +23262,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -113,13 +146,20 @@
+@@ -113,13 +147,20 @@
  ')
  
  optional_policy(`
@@ -23119,7 +23284,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -127,24 +167,29 @@
+@@ -127,24 +168,29 @@
  ')
  
  optional_policy(`
@@ -23460,7 +23625,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.7.5/policy/modules/services/snmp.if
 --- nsaserefpolicy/policy/modules/services/snmp.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/snmp.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/snmp.if	2009-12-30 08:24:07.000000000 -0500
 @@ -50,6 +50,24 @@
  
  ########################################
@@ -23536,7 +23701,7 @@ diff --exclude-from=exclude -N -u -r nsa
  dev_read_sysfs(snmpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.7.5/policy/modules/services/snort.te
 --- nsaserefpolicy/policy/modules/services/snort.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/services/snort.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/snort.te	2009-12-27 08:04:35.000000000 -0500
 @@ -37,6 +37,7 @@
  allow snort_t self:tcp_socket create_stream_socket_perms;
  allow snort_t self:udp_socket create_socket_perms;
@@ -23545,6 +23710,22 @@ diff --exclude-from=exclude -N -u -r nsa
  # Snort IPS node. unverified.
  allow snort_t self:netlink_firewall_socket { bind create getattr };
  
+@@ -55,11 +56,12 @@
+ manage_files_pattern(snort_t, snort_var_run_t, snort_var_run_t)
+ files_pid_filetrans(snort_t, snort_var_run_t, file)
+ 
+-kernel_read_kernel_sysctls(snort_t)
+-kernel_read_sysctl(snort_t)
++kernel_dontaudit_read_system_state(snort_t)
+ kernel_list_proc(snort_t)
++kernel_read_kernel_sysctls(snort_t)
+ kernel_read_proc_symlinks(snort_t)
+-kernel_dontaudit_read_system_state(snort_t)
++kernel_read_sysctl(snort_t)
++kernel_request_load_module(snort_t)
+ 
+ corenet_all_recvfrom_unlabeled(snort_t)
+ corenet_all_recvfrom_netlabel(snort_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.7.5/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/spamassassin.fc	2009-12-21 13:07:09.000000000 -0500
@@ -24878,6 +25059,17 @@ diff --exclude-from=exclude -N -u -r nsa
  logging_log_filetrans(sysstat_t, sysstat_log_t, { file dir })
  
  # get info from /proc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.7.5/policy/modules/services/telnet.te
+--- nsaserefpolicy/policy/modules/services/telnet.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.7.5/policy/modules/services/telnet.te	2009-12-29 17:46:04.000000000 -0500
+@@ -85,6 +85,7 @@
+ remotelogin_domtrans(telnetd_t)
+ 
+ userdom_search_user_home_dirs(telnetd_t)
++userdom_setattr_user_ptys(telnetd_t)
+ 
+ optional_policy(`
+ 	kerberos_keytab_template(telnetd, telnetd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-3.7.5/policy/modules/services/tftp.fc
 --- nsaserefpolicy/policy/modules/services/tftp.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/services/tftp.fc	2009-12-21 13:07:09.000000000 -0500
@@ -25606,8 +25798,22 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.7.5/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/virt.te	2009-12-21 13:07:09.000000000 -0500
-@@ -20,6 +20,28 @@
++++ serefpolicy-3.7.5/policy/modules/services/virt.te	2009-12-29 16:41:45.000000000 -0500
+@@ -8,6 +8,13 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow virt to read fuse files
++## </p>
++## </desc>
++gen_tunable(virt_use_fusefs, false)
++
++## <desc>
++## <p>
+ ## Allow virt to manage nfs files
+ ## </p>
+ ## </desc>
+@@ -20,6 +27,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
  
@@ -25636,7 +25842,7 @@ diff --exclude-from=exclude -N -u -r nsa
  attribute virt_image_type;
  
  type virt_etc_t;
-@@ -29,9 +51,14 @@
+@@ -29,9 +58,14 @@
  files_type(virt_etc_rw_t)
  
  # virt Image files
@@ -25652,7 +25858,7 @@ diff --exclude-from=exclude -N -u -r nsa
  type virt_log_t;
  logging_log_file(virt_log_t)
  
-@@ -48,27 +75,56 @@
+@@ -48,27 +82,56 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -25713,7 +25919,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
-@@ -76,6 +132,7 @@
+@@ -76,6 +139,7 @@
  
  manage_dirs_pattern(virtd_t, virt_var_lib_t, virt_var_lib_t)
  manage_files_pattern(virtd_t, virt_var_lib_t, virt_var_lib_t)
@@ -25721,7 +25927,7 @@ diff --exclude-from=exclude -N -u -r nsa
  files_var_lib_filetrans(virtd_t, virt_var_lib_t, { file dir })
  
  manage_dirs_pattern(virtd_t, virt_var_run_t, virt_var_run_t)
-@@ -86,7 +143,8 @@
+@@ -86,7 +150,8 @@
  kernel_read_system_state(virtd_t)
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
@@ -25731,7 +25937,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -97,40 +155,77 @@
+@@ -97,40 +162,77 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -25813,7 +26019,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +263,36 @@
+@@ -168,22 +270,36 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -25824,10 +26030,6 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
  	iptables_domtrans(virtd_t)
 +	iptables_initrc_domtrans(virtd_t)
-+')
-+
-+optional_policy(`
-+	kerberos_keytab_template(virtd, virtd_t)
  ')
  
 -#optional_policy(`
@@ -25835,6 +26037,11 @@ diff --exclude-from=exclude -N -u -r nsa
 -#	polkit_domtrans_resolve(virtd_t)
 -#')
 +optional_policy(`
++	kerberos_keytab_template(virtd, virtd_t)
++')
+ 
+ optional_policy(`
+-	qemu_domtrans(virtd_t)
 +	lvm_domtrans(virtd_t)
 +')
 +
@@ -25844,9 +26051,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +	policykit_domtrans_resolve(virtd_t)
 +	policykit_read_lib(virtd_t)
 +')
- 
- optional_policy(`
--	qemu_domtrans(virtd_t)
++
++optional_policy(`
 +	qemu_spec_domtrans(virtd_t, svirt_t)
  	qemu_read_state(virtd_t)
  	qemu_signal(virtd_t)
@@ -25855,7 +26061,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -196,8 +305,153 @@
+@@ -196,8 +312,157 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -25914,6 +26120,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +	dev_rw_sysfs(svirt_t)
 +')
 +
++tunable_policy(`virt_use_fusefs',`
++	fs_read_fusefs_files(svirt_t)
++')
++
 +tunable_policy(`virt_use_nfs',`
 +	fs_manage_nfs_dirs(svirt_t)
 +	fs_manage_nfs_files(svirt_t)
@@ -26545,7 +26755,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.7.5/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/xserver.te	2009-12-23 09:07:52.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/xserver.te	2009-12-30 08:13:33.000000000 -0500
 @@ -36,6 +36,13 @@
  
  ## <desc>
@@ -26826,7 +27036,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  # Allow gdm to run gdm-binary
  can_exec(xdm_t, xdm_exec_t)
-@@ -334,22 +403,39 @@
+@@ -334,22 +403,40 @@
  manage_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
  manage_sock_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
  files_tmp_filetrans(xdm_t, xdm_tmp_t, { file dir sock_file })
@@ -26843,6 +27053,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +fs_getattr_all_fs(xdm_t)
 +fs_list_inotifyfs(xdm_t)
 +fs_read_noxattr_fs_files(xdm_t)
++fs_dontaudit_list_fusefs(xdm_t)
 +
 +manage_files_pattern(xdm_t, user_fonts_t, user_fonts_t)
 +
@@ -26869,7 +27080,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  allow xdm_t xserver_t:process signal;
  allow xdm_t xserver_t:unix_stream_socket connectto;
-@@ -363,6 +449,7 @@
+@@ -363,6 +450,7 @@
  allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
  
  allow xdm_t xserver_t:shm rw_shm_perms;
@@ -26877,7 +27088,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  # connect to xdm xserver over stream socket
  stream_connect_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t, xserver_t)
-@@ -371,10 +458,14 @@
+@@ -371,10 +459,14 @@
  delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
@@ -26893,7 +27104,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
-@@ -394,11 +485,13 @@
+@@ -394,11 +486,13 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_generic_node(xdm_t)
  corenet_udp_bind_generic_node(xdm_t)
@@ -26907,7 +27118,7 @@ diff --exclude-from=exclude -N -u -r nsa
  dev_read_rand(xdm_t)
  dev_read_sysfs(xdm_t)
  dev_getattr_framebuffer_dev(xdm_t)
-@@ -406,6 +499,7 @@
+@@ -406,6 +500,7 @@
  dev_getattr_mouse_dev(xdm_t)
  dev_setattr_mouse_dev(xdm_t)
  dev_rw_apm_bios(xdm_t)
@@ -26915,7 +27126,7 @@ diff --exclude-from=exclude -N -u -r nsa
  dev_setattr_apm_bios_dev(xdm_t)
  dev_rw_dri(xdm_t)
  dev_rw_agp(xdm_t)
-@@ -418,14 +512,17 @@
+@@ -418,14 +513,17 @@
  dev_setattr_video_dev(xdm_t)
  dev_getattr_scanner_dev(xdm_t)
  dev_setattr_scanner_dev(xdm_t)
@@ -26935,7 +27146,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  files_read_etc_files(xdm_t)
  files_read_var_files(xdm_t)
-@@ -436,9 +533,15 @@
+@@ -436,9 +534,15 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
  files_create_boot_flag(xdm_t)
@@ -26951,7 +27162,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  storage_dontaudit_read_fixed_disk(xdm_t)
  storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -447,6 +550,7 @@
+@@ -447,6 +551,7 @@
  storage_dontaudit_raw_write_removable_device(xdm_t)
  storage_dontaudit_setattr_removable_dev(xdm_t)
  storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -26959,7 +27170,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  term_setattr_console(xdm_t)
  term_use_unallocated_ttys(xdm_t)
-@@ -455,6 +559,7 @@
+@@ -455,6 +560,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -26967,7 +27178,7 @@ diff --exclude-from=exclude -N -u -r nsa
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -465,10 +570,12 @@
+@@ -465,10 +571,12 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -26982,7 +27193,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  userdom_dontaudit_use_unpriv_user_fds(xdm_t)
  userdom_create_all_users_keys(xdm_t)
-@@ -477,6 +584,10 @@
+@@ -477,6 +585,10 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -26993,7 +27204,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -509,10 +620,12 @@
+@@ -509,10 +621,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -27006,7 +27217,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -520,12 +633,48 @@
+@@ -520,12 +634,48 @@
  ')
  
  optional_policy(`
@@ -27055,7 +27266,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	hostname_exec(xdm_t)
  ')
  
-@@ -543,9 +692,42 @@
+@@ -543,9 +693,42 @@
  ')
  
  optional_policy(`
@@ -27098,7 +27309,7 @@ diff --exclude-from=exclude -N -u -r nsa
  optional_policy(`
  	seutil_sigchld_newrole(xdm_t)
  ')
-@@ -555,8 +737,9 @@
+@@ -555,8 +738,9 @@
  ')
  
  optional_policy(`
@@ -27110,7 +27321,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -565,7 +748,6 @@
+@@ -565,7 +749,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -27118,7 +27329,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -576,6 +758,10 @@
+@@ -576,6 +759,10 @@
  ')
  
  optional_policy(`
@@ -27129,7 +27340,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -600,10 +786,9 @@
+@@ -600,10 +787,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -27141,7 +27352,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow xserver_t self:fd use;
  allow xserver_t self:fifo_file rw_fifo_file_perms;
  allow xserver_t self:sock_file read_sock_file_perms;
-@@ -615,6 +800,18 @@
+@@ -615,6 +801,18 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -27160,7 +27371,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  manage_dirs_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  manage_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
-@@ -634,12 +831,19 @@
+@@ -634,12 +832,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -27182,7 +27393,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -673,7 +877,6 @@
+@@ -673,7 +878,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -27190,7 +27401,7 @@ diff --exclude-from=exclude -N -u -r nsa
  dev_create_generic_dirs(xserver_t)
  dev_setattr_generic_dirs(xserver_t)
  # raw memory access is needed if not using the frame buffer
-@@ -683,9 +886,12 @@
+@@ -683,9 +887,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -27204,7 +27415,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -700,8 +906,12 @@
+@@ -700,8 +907,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -27217,7 +27428,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -723,6 +933,7 @@
+@@ -723,6 +934,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -27225,7 +27436,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -779,12 +990,20 @@
+@@ -779,12 +991,20 @@
  ')
  
  optional_policy(`
@@ -27247,7 +27458,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -811,7 +1030,7 @@
+@@ -811,7 +1031,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -27256,7 +27467,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -832,9 +1051,14 @@
+@@ -832,9 +1052,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -27271,7 +27482,7 @@ diff --exclude-from=exclude -N -u -r nsa
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -849,11 +1073,14 @@
+@@ -849,11 +1074,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -27288,7 +27499,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  optional_policy(`
-@@ -1000,17 +1227,32 @@
+@@ -1000,17 +1228,32 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -27410,7 +27621,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.7.5/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/authlogin.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/authlogin.if	2009-12-29 20:20:50.000000000 -0500
 @@ -40,17 +40,76 @@
  ##	</summary>
  ## </param>
@@ -27797,6 +28008,24 @@ diff --exclude-from=exclude -N -u -r nsa
  
  ifdef(`distro_redhat',`
  	optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-3.7.5/policy/modules/system/getty.te
+--- nsaserefpolicy/policy/modules/system/getty.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.7.5/policy/modules/system/getty.te	2009-12-29 16:32:05.000000000 -0500
+@@ -56,11 +56,10 @@
+ manage_files_pattern(getty_t, getty_var_run_t, getty_var_run_t)
+ files_pid_filetrans(getty_t, getty_var_run_t, file)
+ 
+-kernel_list_proc(getty_t)
+-kernel_read_proc_symlinks(getty_t)
++kernel_read_system_state(getty_t)
+ 
+-corecmd_search_bin(getty_t)
+-corecmd_read_bin_symlinks(getty_t)
++corecmd_exec_bin(getty_t)
++corecmd_exec_shell(getty_t)
+ 
+ dev_read_sysfs(getty_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.7.5/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/system/init.fc	2009-12-21 13:07:09.000000000 -0500
@@ -27825,7 +28054,7 @@ diff --exclude-from=exclude -N -u -r nsa
  # /var
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.7.5/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-11-12 12:51:51.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/init.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/init.if	2009-12-29 20:19:57.000000000 -0500
 @@ -162,6 +162,7 @@
  	gen_require(`
  		attribute direct_run_init, direct_init, direct_init_entry;
@@ -27891,16 +28120,17 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -546,7 +583,7 @@
+@@ -546,7 +583,8 @@
  
  		# upstart uses a datagram socket instead of initctl pipe
  		allow $1 self:unix_dgram_socket create_socket_perms;
 -		allow $1 init_t:unix_dgram_socket sendto;
++		allow $1 init_t:unix_stream_socket connectto;
 +		init_chat($1)
  	')
  ')
  
-@@ -619,18 +656,19 @@
+@@ -619,18 +657,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -27924,7 +28154,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	')
  ')
  
-@@ -646,19 +684,39 @@
+@@ -646,19 +685,39 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -27968,7 +28198,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -923,6 +981,24 @@
+@@ -923,6 +982,24 @@
  	allow $1 init_script_file_type:file read_file_perms;
  ')
  
@@ -27993,7 +28223,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ########################################
  ## <summary>
  ##	Execute all init scripts in the caller domain.
-@@ -1142,7 +1218,7 @@
+@@ -1142,7 +1219,7 @@
  		type initrc_t;
  	')
  
@@ -28002,7 +28232,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -1310,6 +1386,25 @@
+@@ -1310,6 +1387,25 @@
  
  ########################################
  ## <summary>
@@ -28028,7 +28258,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1540,3 +1635,51 @@
+@@ -1540,3 +1636,51 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')
@@ -28815,7 +29045,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.7.5/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/system/ipsec.te	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/ipsec.te	2009-12-29 17:01:28.000000000 -0500
 @@ -29,9 +29,15 @@
  type ipsec_key_file_t;
  files_type(ipsec_key_file_t)
@@ -28852,18 +29082,19 @@ diff --exclude-from=exclude -N -u -r nsa
  manage_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t)
  manage_sock_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t)
  files_pid_filetrans(ipsec_t, ipsec_var_run_t, { file sock_file })
-@@ -171,8 +181,8 @@
+@@ -171,8 +181,9 @@
  # ipsec_mgmt Local policy
  #
  
 -allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
 -allow ipsec_mgmt_t self:process { signal setrlimit };
 +allow ipsec_mgmt_t self:capability { dac_override dac_read_search net_admin setpcap };
++dontaudit ipsec_mgmt_t self:capability sys_tty_config;
 +allow ipsec_mgmt_t self:process { signal setrlimit ptrace };
  allow ipsec_mgmt_t self:unix_stream_socket create_stream_socket_perms;
  allow ipsec_mgmt_t self:tcp_socket create_stream_socket_perms;
  allow ipsec_mgmt_t self:udp_socket create_socket_perms;
-@@ -182,6 +192,9 @@
+@@ -182,6 +193,9 @@
  allow ipsec_mgmt_t ipsec_mgmt_lock_t:file manage_file_perms;
  files_lock_filetrans(ipsec_mgmt_t, ipsec_mgmt_lock_t, file)
  
@@ -28873,7 +29104,7 @@ diff --exclude-from=exclude -N -u -r nsa
  allow ipsec_mgmt_t ipsec_mgmt_var_run_t:file manage_file_perms;
  files_pid_filetrans(ipsec_mgmt_t, ipsec_mgmt_var_run_t, file)
  
-@@ -259,6 +272,7 @@
+@@ -259,6 +273,7 @@
  init_use_script_ptys(ipsec_mgmt_t)
  init_exec_script_files(ipsec_mgmt_t)
  init_use_fds(ipsec_mgmt_t)
@@ -28881,7 +29112,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  logging_send_syslog_msg(ipsec_mgmt_t)
  
-@@ -323,6 +337,7 @@
+@@ -323,6 +338,7 @@
  
  kernel_read_system_state(racoon_t)
  kernel_read_network_state(racoon_t)
@@ -28889,7 +29120,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  corecmd_exec_shell(racoon_t)
  corecmd_exec_bin(racoon_t)
-@@ -362,6 +377,8 @@
+@@ -362,6 +378,8 @@
  
  sysnet_exec_ifconfig(racoon_t)
  
@@ -28898,7 +29129,7 @@ diff --exclude-from=exclude -N -u -r nsa
  auth_can_read_shadow_passwords(racoon_t)
  tunable_policy(`racoon_read_shadow',`
  	auth_tunable_read_shadow(racoon_t)
-@@ -380,12 +397,15 @@
+@@ -380,12 +398,15 @@
  read_files_pattern(setkey_t, ipsec_conf_file_t, ipsec_conf_file_t)
  read_lnk_files_pattern(setkey_t, ipsec_conf_file_t, ipsec_conf_file_t)
  
@@ -28914,7 +29145,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  # allow setkey to set the context for ipsec SAs and policy.
  ipsec_setcontext_default_spd(setkey_t)
-@@ -397,3 +417,4 @@
+@@ -397,3 +418,4 @@
  seutil_read_config(setkey_t)
  
  userdom_use_user_terminals(setkey_t)
@@ -29013,7 +29244,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +permissive kdump_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.7.5/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-23 12:43:23.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-29 20:06:09.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -29229,10 +29460,12 @@ diff --exclude-from=exclude -N -u -r nsa
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +316,115 @@
+@@ -307,10 +316,125 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
++/usr/lib(64)?/pgsql/.*\.so.*		--	gen_context(system_u:object_r:lib_t,s0)
++/usr/lib(64)?/pgsql/test/regress/.*\.so.*		--	gen_context(system_u:object_r:lib_t,s0)
 +/var/lib/spamassassin/compiled/.*\.so.*    --     gen_context(system_u:object_r:lib_t,s0)
 +
  ifdef(`distro_suse',`
@@ -29259,6 +29492,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +/usr/lib(64)?/sse2/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/i686/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/local/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/googleearth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/opt/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -29345,6 +29580,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +/usr/lib(64)?/python.*/site-packages/pymedia/muxer\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/local/games/darwinia/lib/libSDL.*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/ocp-.*/mixclip\.so		     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/octagaplayer/libapplication\.so		     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/AutoScan/usr/lib/libvte\.so.*			     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/bin/bsnes		     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.7.5/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/system/libraries.if	2009-12-21 13:07:09.000000000 -0500
@@ -31082,7 +31323,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.7.5/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.if	2009-12-22 10:35:23.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/sysnetwork.if	2009-12-27 08:20:43.000000000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -31183,10 +31424,12 @@ diff --exclude-from=exclude -N -u -r nsa
  	allow $1 self:tcp_socket create_socket_perms;
  	allow $1 self:udp_socket create_socket_perms;
  
-@@ -557,6 +609,14 @@
+@@ -556,7 +608,15 @@
+ 	corenet_sendrecv_dns_client_packets($1)
  
  	files_search_etc($1)
- 	allow $1 net_conf_t:file read_file_perms;
+-	allow $1 net_conf_t:file read_file_perms;
++	read_files_pattern($1, net_conf_t, net_conf_t)
 +
 +	optional_policy(`
 +		avahi_stream_connect($1)
@@ -34854,7 +35097,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	files_search_mnt(xend_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.5/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.5/policy/support/obj_perm_sets.spt	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/support/obj_perm_sets.spt	2009-12-29 17:59:26.000000000 -0500
 @@ -199,12 +199,14 @@
  #
  define(`getattr_file_perms',`{ getattr }')
@@ -34872,7 +35115,17 @@ diff --exclude-from=exclude -N -u -r nsa
  define(`create_file_perms',`{ getattr create open }')
  define(`rename_file_perms',`{ getattr rename }')
  define(`delete_file_perms',`{ getattr unlink }')
-@@ -305,7 +307,8 @@
+@@ -238,7 +240,8 @@
+ define(`read_fifo_file_perms',`{ getattr open read lock ioctl }')
+ define(`append_fifo_file_perms',`{ getattr open append lock ioctl }')
+ define(`write_fifo_file_perms',`{ getattr open write append lock ioctl }')
+-define(`rw_fifo_file_perms',`{ getattr open read write append ioctl lock }')
++define(`rw_inherited_fifo_file_perms',`{ getattr read write append ioctl lock }')
++define(`rw_fifo_file_perms',`{ open rw_inherited_fifo_file_perms }')
+ define(`create_fifo_file_perms',`{ getattr create open }')
+ define(`rename_fifo_file_perms',`{ getattr rename }')
+ define(`delete_fifo_file_perms',`{ getattr unlink }')
+@@ -305,7 +308,8 @@
  #
  # Use (read and write) terminals
  #
@@ -34882,7 +35135,7 @@ diff --exclude-from=exclude -N -u -r nsa
  
  #
  # Sockets
-@@ -317,3 +320,14 @@
+@@ -317,3 +321,14 @@
  # Keys
  #
  define(`manage_key_perms', `{ create link read search setattr view write } ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.950
retrieving revision 1.951
diff -u -p -r1.950 -r1.951
--- selinux-policy.spec	23 Dec 2009 18:39:12 -0000	1.950
+++ selinux-policy.spec	30 Dec 2009 14:44:54 -0000	1.951
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Dec 30 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-5
+- Lots of fixes found in F12, fixes from Tom London
+
 * Wed Dec 23 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-4
 - Cleanups from dgrift
 



From mschwendt at fedoraproject.org  Wed Dec 30 15:10:08 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 15:10:08 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.70,1.71
Message-ID: <20091230151008.EE74811C03E3@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7691

Modified Files:
	audacious-plugins.spec 
Log Message:
temporarily require a specific version of alsa-lib as needed by the alsa-gapless output plugin


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- audacious-plugins.spec	25 Dec 2009 21:14:51 -0000	1.70
+++ audacious-plugins.spec	30 Dec 2009 15:10:07 -0000	1.71
@@ -65,6 +65,9 @@ BuildRequires: neon-devel
 
 Requires: audacious >= %{aud_ver}
 
+# temporarily till that upgrade is marked stable
+Requires: alsa-lib >= 1.0.22
+
 # last in 1.5.1
 Obsoletes: audacious-plugins-arts
 



From pkgdb at fedoraproject.org  Wed Dec 30 15:12:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:12:41 +0000
Subject: [pkgdb] apache-ivy: orion has given up watchcommits
Message-ID: <20091230151240.3C77A10F8CD@bastion.fedoraproject.org>

orion has given up the watchcommits acl on apache-ivy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From pkgdb at fedoraproject.org  Wed Dec 30 15:12:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:12:45 +0000
Subject: [pkgdb] apache-ivy: orion has requested commit
Message-ID: <20091230151241.4F08D10F8D2@bastion.fedoraproject.org>

orion has requested the commit acl on apache-ivy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From pkgdb at fedoraproject.org  Wed Dec 30 15:12:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:12:58 +0000
Subject: [pkgdb] apache-ivy: orion has given up watchbugzilla
Message-ID: <20091230151243.73A2610F8A8@bastion.fedoraproject.org>

orion has given up the watchbugzilla acl on apache-ivy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From pkgdb at fedoraproject.org  Wed Dec 30 15:12:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:12:55 +0000
Subject: [pkgdb] apache-ivy: orion has given up watchcommits
Message-ID: <20091230151251.E05B510F8C5@bastion.fedoraproject.org>

orion has given up the watchcommits acl on apache-ivy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From pkgdb at fedoraproject.org  Wed Dec 30 15:12:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:12:48 +0000
Subject: [pkgdb] apache-ivy: orion has requested commit
Message-ID: <20091230151253.5CF4F10F8C5@bastion.fedoraproject.org>

orion has requested the commit acl on apache-ivy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From pkgdb at fedoraproject.org  Wed Dec 30 15:13:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:13:10 +0000
Subject: [pkgdb] apache-ivy: orion has given up watchbugzilla
Message-ID: <20091230151255.2A93810F85E@bastion.fedoraproject.org>

orion has given up the watchbugzilla acl on apache-ivy (Fedora 12)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From pkgdb at fedoraproject.org  Wed Dec 30 15:13:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:13:00 +0000
Subject: [pkgdb] apache-ivy: orion has given up watchbugzilla
Message-ID: <20091230151259.1047D10F8C5@bastion.fedoraproject.org>

orion has given up the watchbugzilla acl on apache-ivy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From pkgdb at fedoraproject.org  Wed Dec 30 15:13:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:13:01 +0000
Subject: [pkgdb] apache-ivy: orion has requested commit
Message-ID: <20091230151300.3B12F10F8D1@bastion.fedoraproject.org>

orion has requested the commit acl on apache-ivy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From pkgdb at fedoraproject.org  Wed Dec 30 15:13:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 15:13:16 +0000
Subject: [pkgdb] apache-ivy: orion has given up watchcommits
Message-ID: <20091230151301.93F8010F8C5@bastion.fedoraproject.org>

orion has given up the watchcommits acl on apache-ivy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apache-ivy



From mschwendt at fedoraproject.org  Wed Dec 30 15:13:41 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 15:13:41 +0000 (UTC)
Subject: rpms/audacious/F-12 .cvsignore, 1.15, 1.16 audacious.spec, 1.56,
	1.57 sources, 1.15, 1.16 README, 1.1,
	NONE audacious-2.1-mowgli-crash.patch, 1.1,
	NONE audacious-2.1-output.patch, 1.1,
	NONE audacious-2.1-pluginprio.patch, 1.1, NONE
Message-ID: <20091230151341.62B7411C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8461

Modified Files:
	.cvsignore audacious.spec sources 
Removed Files:
	README audacious-2.1-mowgli-crash.patch 
	audacious-2.1-output.patch audacious-2.1-pluginprio.patch 
Log Message:
sync with Rawhide for Audacious 2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	14 Jul 2009 17:09:26 -0000	1.15
+++ .cvsignore	30 Dec 2009 15:13:40 -0000	1.16
@@ -1 +1 @@
-audacious-2.1.tgz
+audacious-2.2.tgz


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- audacious.spec	21 Nov 2009 19:57:21 -0000	1.56
+++ audacious.spec	30 Dec 2009 15:13:41 -0000	1.57
@@ -1,11 +1,11 @@
 # Minimum audacious/audacious-plugins version in inter-package
 # dependencies.
-# We enforce 2.1 as 2.0.1 or older is insufficient.
-%define aud_ver 2.1
+# We enforce 2.2 as 2.1 or older is insufficient.
+%define aud_ver 2.2
 
 Name: audacious
-Version: 2.1
-Release: 7%{?dist}
+Version: 2.2
+Release: 2%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -14,13 +14,6 @@ Group: Applications/Multimedia
 
 Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
 
-# will be obsolete in > 2.1
-Patch0: audacious-2.1-pluginprio.patch
-# debug helper and safety measure for #538379
-Patch1: audacious-2.1-mowgli-crash.patch
-# effect/flow crash fix from devel
-Patch2: audacious-2.1-output.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -47,7 +40,9 @@ Provides: xmms-gui
 
 %description
 Audacious is a media player that currently uses a skinned user interface
-based on Winamp 2.x skins.
+(based on Winamp 2.x skins) as well as a separate GTK2 based front end.
+Historically, it started as a fork of Beep Media Player (BMP), which
+itself forked from XMMS.
 
 
 %package libs
@@ -74,11 +69,30 @@ Files needed when building software for 
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .pluginprio
-%patch1 -p1 -b .mowgli-crash
-%patch2 -p1 -b .output
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
+# From .desktop files remove MIME types the base build of the
+# Fedora audacious-plugins package does not understand.
+for t in \
+    audio/mp3 \
+    audio/mpeg \
+    audio/mpegurl \
+    audio/x-mp3 \
+    audio/x-mpeg \
+    audio/x-mpegurl \
+    audio/x-ms-wma \
+    audio/x-musepack \
+    audio/prs.sid \
+; do
+    for f in audacious2.desktop audacious2-gtkui.desktop ; do
+        cp ${f} ${f}.old
+        sed -i "s!${t};!!g" $f
+        diff -u ${f}.old ${f} || :
+        rm -f ${f}.old
+    done
+done   
+
+
 %build
 %configure  \
     --enable-samplerate \
@@ -111,7 +125,7 @@ desktop-file-install  \
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/audacious2.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
-# 2.2-alpha1 will install these compatibility softlinks
+# fix for: tarball installs softlinks that point into buildroot
 cd $RPM_BUILD_ROOT%{_bindir}
 rm -f audacious audtool
 ln -s audacious2 audacious
@@ -162,18 +176,36 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %{_includedir}/audacious/
 %{_includedir}/libaudcore/
+%{_includedir}/libaudgui/
+%{_includedir}/libaudtag/
 %{_includedir}/libSAD/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
-* Sat Nov 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-7
-- Fix effects output (also fixes sndstretch realloc crash).
-
-* Thu Nov 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
-- Rebuild with a safety-measure/terminal-debug patch for the
-  mowgli_dictionary_retune crash on x86_64 (#538379).
+* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
+- Drop Musepack and SID MIME types from desktop files. As of Audacious 2.2,
+  Musepack is only supported by the separate "ffaudio" plugin. The SID
+  plugin in a separate subpackage provides its own desktop file.
+- Drop unsupported MIME types from desktop files.
+
+* Wed Nov 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-1
+- Upgrade to 2.2 (declared as the next "stable release" after 2.1).
+
+* Tue Nov 10 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta2
+- Upgrade to 2.2-beta2
+
+* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
+- Upgrade to 2.2-beta1
+
+* Sun Oct 18 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha2
+- Upgrade to 2.2-alpha2
+
+* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha1
+- Upgrade to 2.2-alpha1 (primarly for alsa-gapless output plugin).
+- /usr/bin/audacious and /usr/bin/audtool compatibility links are now
+  provided officially by upstream.
 
 * Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
 - /usr/bin/audacious and /usr/bin/audtool compatibility links are


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	14 Jul 2009 17:09:26 -0000	1.15
+++ sources	30 Dec 2009 15:13:41 -0000	1.16
@@ -1 +1 @@
-03ab6a062e5909214841f90f767f1147  audacious-2.1.tgz
+ad0f7484692c529acfa91ce784170478  audacious-2.2.tgz


--- README DELETED ---


--- audacious-2.1-mowgli-crash.patch DELETED ---


--- audacious-2.1-output.patch DELETED ---


--- audacious-2.1-pluginprio.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Dec 30 15:17:11 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 15:17:11 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-plugins-2.2-bluetooth.patch, 1.2,
	1.3 audacious-plugins-2.2-cfg_db_close.patch, NONE,
	1.1 audacious-plugins-2.2-jack.patch, NONE,
	1.1 audacious-plugins-2.2-neon-request.patch, 1.2,
	1.3 .cvsignore, 1.19, 1.20 audacious-plugins.spec, 1.75,
	1.76 sources, 1.20,
	1.21 audacious-plugins-1.5.1-timidity-cfg.patch, 1.1,
	NONE audacious-plugins-2.1-alsa-ng.patch, 1.1,
	NONE audacious-plugins-2.1-bluetooth.patch, 1.1,
	NONE audacious-plugins-2.1-cfg_db_close.patch, 1.1,
	NONE audacious-plugins-2.1-filewriter-dialogs.patch, 1.1,
	NONE audacious-plugins-2.1-icecast.patch, 1.2,
	NONE audacious-plugins-2.1-jack.patch, 1.2,
	NONE audacious-plugins-2.1-ladspa-backto201.patch, 1.1,
	NONE audacious-plugins-2.1-modplug.patch, 1.1,
	NONE audacious-plugins-2.1-musepack.patch, 1.6,
	NONE audacious-plugins-2.1-neon-request.patch, 1.1,
	NONE audacious-plugins-2.1-playlist-scrollbar.patch, 1.1,
	NONE audacious-plugins-2.1-pulseaudio-no-drain.patch, 1.1,
	NONE audacious-plugins-2.1-pulseaudio-volume.patch, 1.2,
	NONE audacious-plugins-2.1-sid-playfix.patch, 1.1,
	NONE audacious-plugins-2.1-sndfile-playfix.patch, 1.1,
	NONE audacious-plugins-2.1-sndstretch-dialog.patch, 1.1,
	NONE audacious-plugins-2.1-underruns.patch, 1.3,
	NONE audacious_20090702_console.diff, 1.1, NONE
Message-ID: <20091230151711.39FCC11C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9268

Modified Files:
	.cvsignore audacious-plugins.spec sources 
Added Files:
	audacious-plugins-2.2-bluetooth.patch 
	audacious-plugins-2.2-cfg_db_close.patch 
	audacious-plugins-2.2-jack.patch 
	audacious-plugins-2.2-neon-request.patch 
Removed Files:
	audacious-plugins-1.5.1-timidity-cfg.patch 
	audacious-plugins-2.1-alsa-ng.patch 
	audacious-plugins-2.1-bluetooth.patch 
	audacious-plugins-2.1-cfg_db_close.patch 
	audacious-plugins-2.1-filewriter-dialogs.patch 
	audacious-plugins-2.1-icecast.patch 
	audacious-plugins-2.1-jack.patch 
	audacious-plugins-2.1-ladspa-backto201.patch 
	audacious-plugins-2.1-modplug.patch 
	audacious-plugins-2.1-musepack.patch 
	audacious-plugins-2.1-neon-request.patch 
	audacious-plugins-2.1-playlist-scrollbar.patch 
	audacious-plugins-2.1-pulseaudio-no-drain.patch 
	audacious-plugins-2.1-pulseaudio-volume.patch 
	audacious-plugins-2.1-sid-playfix.patch 
	audacious-plugins-2.1-sndfile-playfix.patch 
	audacious-plugins-2.1-sndstretch-dialog.patch 
	audacious-plugins-2.1-underruns.patch 
	audacious_20090702_console.diff 
Log Message:
sync with Rawhide for Audacious 2.2

audacious-plugins-2.2-bluetooth.patch:
 bluetooth.c |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

Index: audacious-plugins-2.2-bluetooth.patch
===================================================================
RCS file: audacious-plugins-2.2-bluetooth.patch
diff -N audacious-plugins-2.2-bluetooth.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacious-plugins-2.2-bluetooth.patch	30 Dec 2009 15:17:10 -0000	1.3
@@ -0,0 +1,97 @@
+diff -Nur audacious-plugins-2.2-orig/src/bluetooth/bluetooth.c audacious-plugins-2.2-bluetooth/src/bluetooth/bluetooth.c
+--- audacious-plugins-2.2-orig/src/bluetooth/bluetooth.c	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2-bluetooth/src/bluetooth/bluetooth.c	2009-12-19 19:48:34.000000000 +0100
+@@ -29,6 +29,7 @@
+ GList * current_device = NULL;
+ gint config = 0;
+ gint devices_no = 0;
++gboolean pcmdev_modified = FALSE;
+ GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+ static gchar *current_address=NULL;
+ static GThread *connect_th;
+@@ -58,44 +59,53 @@
+ 
+ void bluetooth_init ( void )
+ {
++    bonded_dev = NULL;
++    discover_finish = 0;
++    pcmdev_modified = FALSE;
+     audio_devices = NULL;
+     bus = NULL;
+     obj = NULL;
+-    gchar* bonded_addr="zz";
++    gchar* bonded_addr = NULL;
+     discover_devices();
+     mcs_handle_t *cfgfile ;
+     cfgfile = aud_cfg_db_open();
+     if(!aud_cfg_db_get_string(cfgfile, "BLUETOOTH_PLUGIN", "bonded",
+-				  &bonded_addr))
++                              &bonded_addr)) {
++        aud_cfg_db_close(cfgfile);
+         return;
++    }
+     if(bonded_addr!=NULL && g_strcmp0(bonded_addr,"no")!=0)
+         {
+              remove_bonding(bonded_addr);
+         }
++    free(bonded_addr);
+     aud_cfg_db_close(cfgfile);
+ 
+ }
+ 
+ void bluetooth_cleanup ( void )
+ {
+-    printf("bluetooth: exit\n");
+     if (config ==1 )
+     {
+         close_window();
+         config =0;
+     }
+-    remove_bonding(bonded_dev);
++    if (bonded_dev) {
++        printf("bluetooth: exit\n");
++        remove_bonding(bonded_dev);
++    }
+     if(discover_finish == 2) {
+         dbus_g_connection_flush (bus);
+         dbus_g_connection_unref(bus);
+         disconnect_dbus_signals();
+ 
+     }
++    if (pcmdev_modified) {
+     /* switching back to default pcm device at cleanup */
+     mcs_handle_t *cfgfile = aud_cfg_db_open();
+-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "default");
++    aud_cfg_db_set_string(cfgfile,"alsa-gapless","pcm", "default");
+     aud_cfg_db_close(cfgfile);
+-
++    }
+ }
+ 
+ void bt_about( void )
+@@ -243,8 +253,9 @@
+     g_free(device_line);
+     g_free(file_name);
+     g_free(temp_file_name);
++    pcmdev_modified = TRUE;
+     mcs_handle_t *cfgfile = aud_cfg_db_open();
+-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "audacious_bt");
++    aud_cfg_db_set_string(cfgfile,"alsa-gapless","pcm", "audacious_bt");
+     aud_cfg_db_close(cfgfile);
+ 
+     printf("play callback\n");
+@@ -360,12 +371,13 @@
+ {
+     GError *error = NULL;
+     //  g_type_init();
+-    g_log_set_always_fatal (G_LOG_LEVEL_WARNING);
++    /*    g_log_set_always_fatal (G_LOG_LEVEL_WARNING); */ /* too invasive */
+     bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
+     if (error != NULL)
+     {
+         g_printerr("Connecting to system bus failed: %s\n", error->message);
+         g_error_free(error);
++        return;
+     }
+     obj = dbus_g_proxy_new_for_name(bus, "org.bluez", "/org/bluez/hci0", "org.bluez.Adapter");
+     printf("bluetooth plugin - start discovery \n");

audacious-plugins-2.2-cfg_db_close.patch:
 alarm/alarm.c   |    1 +
 lastfm/lastfm.c |    2 +-
 neon/neon.c     |    3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.2-cfg_db_close.patch ---
diff -Nur audacious-plugins-2.2-orig/src/alarm/alarm.c audacious-plugins-2.2-cfg_db_close/src/alarm/alarm.c
--- audacious-plugins-2.2-orig/src/alarm/alarm.c	2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/alarm/alarm.c	2009-12-19 19:43:39.000000000 +0100
@@ -354,6 +354,7 @@
        alarm_conf.day[daynum].min = DEFAULT_ALARM_MIN;
    }
 
+   aud_cfg_db_close(conf);
    DEBUG("END alarm_read_config\n");
 }
 
diff -Nur audacious-plugins-2.2-orig/src/lastfm/lastfm.c audacious-plugins-2.2-cfg_db_close/src/lastfm/lastfm.c
--- audacious-plugins-2.2-orig/src/lastfm/lastfm.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/lastfm/lastfm.c	2009-12-19 19:43:39.000000000 +0100
@@ -109,7 +109,7 @@
     {
         aud_cfg_db_get_string(cfg, "audioscrobbler", "username", &username);
         aud_cfg_db_get_string(cfg, "audioscrobbler", "password", &password);
-        g_free(cfg);
+        aud_cfg_db_close(cfg);
     }
     if (username != NULL && password != NULL)
     {
diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2-cfg_db_close/src/neon/neon.c
--- audacious-plugins-2.2-orig/src/neon/neon.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/neon/neon.c	2009-12-19 19:43:39.000000000 +0100
@@ -508,6 +508,7 @@
     aud_cfg_db_get_string(db, NULL, "proxy_user", &value);
     if (!value) {
         _DEBUG("<%p> proxy_auth requested but no proxy_user", userdata);
+        aud_cfg_db_close(db);
         _LEAVE -1;
     }
     g_strlcpy(username, value, NE_ABUFSIZ);
@@ -516,11 +517,13 @@
     aud_cfg_db_get_string(db, NULL, "proxy_pass", &value);
     if (!value) {
         _DEBUG("<%p> proxy_auth requested but no proxy_pass", userdata);
+        aud_cfg_db_close(db);
         _LEAVE -1;
     }
     g_strlcpy(password, value, NE_ABUFSIZ);
     value = NULL;
 
+    aud_cfg_db_close(db);
     _LEAVE attempt;
 }
 

audacious-plugins-2.2-jack.patch:
 jack.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.2-jack.patch ---
diff -Nur /tmp/tmp.XuE20VQcQk/audacious-plugins-old/src/jack/jack.c audacious-plugins/src/jack/jack.c
--- /tmp/tmp.XuE20VQcQk/audacious-plugins-old/src/jack/jack.c	2009-09-11 17:27:13.000000000 +0200
+++ audacious-plugins/src/jack/jack.c	2009-11-24 19:20:15.674971400 +0100
@@ -236,7 +236,7 @@
 
 
 /* Return the amount of data that can be written to the device */
-static gint jack_free(void)
+static gint audacious_jack_free(void)
 {
   unsigned long return_val = JACK_GetBytesFreeSpace(driver);
   unsigned long tmp;
@@ -448,7 +448,7 @@
     .close_audio = jack_close,
     .flush = jack_flush,
     .pause = jack_pause,
-    .buffer_free = jack_free,
+    .buffer_free = audacious_jack_free,
     .buffer_playing = jack_playing,
     .output_time = jack_get_output_time,
     .written_time = jack_get_written_time,


audacious-plugins-2.2-neon-request.patch:
 neon.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: audacious-plugins-2.2-neon-request.patch
===================================================================
RCS file: audacious-plugins-2.2-neon-request.patch
diff -N audacious-plugins-2.2-neon-request.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacious-plugins-2.2-neon-request.patch	30 Dec 2009 15:17:10 -0000	1.3
@@ -0,0 +1,14 @@
+diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2-neon/src/neon/neon.c
+--- audacious-plugins-2.2-orig/src/neon/neon.c	2009-11-22 23:49:53.000000000 +0100
++++ audacious-plugins-2.2-neon/src/neon/neon.c	2009-12-19 19:02:17.000000000 +0100
+@@ -1354,7 +1354,9 @@
+         kill_reader(h);
+     }
+ 
+-    ne_request_destroy(h->request);
++    if (NULL != h->request) {
++        ne_request_destroy(h->request);
++    }
+     ne_session_destroy(h->session);
+     reset_rb(&h->rb);
+ 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Jul 2009 17:24:08 -0000	1.19
+++ .cvsignore	30 Dec 2009 15:17:10 -0000	1.20
@@ -1 +1 @@
-audacious-plugins-fedora-2.1.tar.bz2
+audacious-plugins-fedora-2.2.tar.bz2


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- audacious-plugins.spec	19 Dec 2009 18:58:38 -0000	1.75
+++ audacious-plugins.spec	30 Dec 2009 15:17:10 -0000	1.76
@@ -1,11 +1,11 @@
 # Minimum audacious/audacious-plugins version in inter-package
 # dependencies.
-# We need 2.1 as 2.0.1 is insufficient.
-%define aud_ver 2.1
+# We need 2.2 as 2.1 is insufficient.
+%define aud_ver 2.2
 
 Name: audacious-plugins
-Version: 2.1
-Release: 27%{?dist}
+Version: 2.2
+Release: 5%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -16,41 +16,21 @@ URL: http://audacious-media-player.org/
 License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and BSD
 
 # Modified source tarball to remove problematic files.
-# Removed: aac alc demac tta wma
-# Not removed (no codec included): madplug mms
+# Removed: aac madplug
 # Disabled via options where possible, see %%build.
 Source0: audacious-plugins-fedora-%{version}.tar.bz2
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
+Source1: audacious-sid.desktop
 
-Patch1: audacious-plugins-1.5.1-timidity-cfg.patch
-Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
-Patch3: audacious-plugins-2.1-alsa-ng.patch
-Patch4: audacious-plugins-2.1-underruns.patch
-Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
-Patch7: audacious-plugins-2.1-modplug.patch
-Patch8: audacious-plugins-2.1-sndfile-playfix.patch
-Patch9: audacious-plugins-2.1-filewriter-dialogs.patch
-Patch10: audacious-plugins-2.1-playlist-scrollbar.patch
-Patch11: audacious_20090702_console.diff
-Patch12: audacious-plugins-2.1-ladspa-backto201.patch
-Patch13: audacious-plugins-2.1-musepack.patch
-# merged upstream
-Patch14: audacious-plugins-2.1-sndstretch-dialog.patch
-# merged upstream: dialog fix
-# not necessary in 2.2-beta2?: crash work-around
-Patch15: audacious-plugins-2.1-icecast.patch
-# merged upstream
-Patch16: audacious-plugins-2.1-jack.patch
-# as in 2.2
-Patch17: audacious-plugins-2.1-pulseaudio-no-drain.patch
+Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
+# obsolete with version upgrade: declaration conflict for jack_free
+Patch1: audacious-plugins-2.2-jack.patch
 #
-Patch18: audacious-plugins-2.1-sid-playfix.patch
-#
-Patch19: audacious-plugins-2.1-neon-request.patch
+Patch2: audacious-plugins-2.2-neon-request.patch
 # submitted upstream
-Patch20: audacious-plugins-2.1-cfg_db_close.patch
-#
-Patch21: audacious-plugins-2.1-bluetooth.patch
+Patch3: audacious-plugins-2.2-cfg_db_close.patch
+# submitted upstream
+Patch4: audacious-plugins-2.2-bluetooth.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -66,11 +46,10 @@ BuildRequires: flac-devel
 BuildRequires: libmodplug-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: libshout-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: libtimidity-devel
 BuildRequires: curl-devel
 BuildRequires: libbinio-devel
 BuildRequires: libcdio-devel
+BuildRequires: libcue-devel
 BuildRequires: SDL-devel
 BuildRequires: lirc-devel
 BuildRequires: bluez-libs-devel
@@ -79,12 +58,16 @@ BuildRequires: libcddb-devel
 BuildRequires: libmtp-devel
 BuildRequires: libxml2-devel
 BuildRequires: gettext
+BuildRequires: desktop-file-utils
 
 # experimental, disabled by default
 BuildRequires: neon-devel
 
 Requires: audacious >= %{aud_ver}
 
+# temporarily till that upgrade is marked stable
+Requires: alsa-lib >= 1.0.22
+
 # last in 1.5.1
 Obsoletes: audacious-plugins-arts
 
@@ -92,16 +75,23 @@ Obsoletes: audacious-plugins-arts
 Obsoletes: audacious-plugins-pulseaudio <= 1.3.5
 Provides: audacious-plugins-pulseaudio = %{version}
 
+# obsolete old subpackage -- no reason to split this off
+Obsoletes: audacious-plugins-metronome < 2.2-2
+Provides: audacious-plugins-metronome = %{version}-%{release}
+
+
 %description
 Audacious is a media player that currently uses a skinned user interface
-based on Winamp 2.x skins. It is based on ("forked off") BMP.
+(based on Winamp 2.x skins) as well as a separate GTK2 based front end.
+Historically, it started as a fork of Beep Media Player (BMP), which
+itself forked from XMMS.
 
 This package provides essential plugins for audio input, audio output and
 visualization.
 
 
 %package jack
-Summary: Audacious output plugin for JACK sound service
+Summary: Audacious output plugin for Jack Audio Connection Kit
 Group: Applications/Multimedia
 # ancient
 #Obsoletes: audacious-jack <= 1.1.2
@@ -109,11 +99,11 @@ Requires: audacious >= %{aud_ver}, audac
 
 %description jack
 This package provides an Audacious output plugin that uses the
-JACK sound service.
+Jack Audio Connection Kit (JACK) sound service.
 
 
 %package esd
-Summary: Audacious output plugin for esd sound service
+Summary: Audacious output plugin for EsounD service
 Group: Applications/Multimedia
 # ancient
 #Obsoletes: audacious-esd <= 1.1.2
@@ -121,76 +111,61 @@ Requires: audacious >= %{aud_ver}, audac
 
 %description esd
 This package provides an Audacious output plugin that uses the
-ESD sound server.
+EsounD service.
 
 
 %package amidi
-Summary: Audacious input plugin for amidi
+Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description amidi
-This package provides an Audacious input plugin that uses the
-amidi sound service.
+This package provides AMIDI-Plug, a modular MIDI music player, as an
+input plugin for Audacious.
 
 
-
-%package wavpack
-Summary: Audacious input plugin for wavpack
+%package sid
+Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
-%description wavpack
-This package provides an Audacious input plugin that reads WavPack
-compressed files.
+%description sid
+This package provides an Audacious input plugin for SID music files.
 
+This build of the plugin uses libsidplay 1. 3rd party package
+providers may build it with libsidplay 2.
 
 
-%package metronome
-Summary: Audacious input plugin simulating a metronome
+%package wavpack
+Summary: Audacious input plugin for WavPack compressed files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
-%description metronome
-This package provides an Audacious input plugin that simulates
-a metronome.
-
+%description wavpack
+This package provides an Audacious input plugin that reads WavPack
+compressed files.
 
 
 %package vortex
-Summary: Audacious input plugin for vortex audio files
+Summary: Audacious input plugin for Vortex format files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description vortex
-This package provides an Audacious input plugin that reads
-vortex compressed files.
+This package provides an Audacious input plugin that reads files
+in Vortex (.vtx) format.
 
 
 
 %prep
 %setup -q -n audacious-plugins-fedora-%{version}
-
-%patch1 -p1 -b .timidity-cfg
-%patch2 -p1 -b .xmms-skindir
-%patch3 -p1 -b .alsa-ng
-%patch4 -p1 -b .underruns
-%patch5 -p1 -b .pulseaudio-volume
-%patch7 -p1 -b .modplug
-%patch8 -p1 -b .sndfile-playfix
-%patch9 -p1 -b .filewriter-dialogs
-%patch10 -p1 -b .playlist-scrollbar
-%patch11 -p1 -b .console
-%patch12 -p1 -b .ladspa
-%patch13 -p1 -b .musepack
-%patch14 -p1 -b .sndstretch-dialog
-%patch15 -p1 -b .icecast
-%patch16 -p1 -b .jack
-%patch17 -p1 -b .no-drain
-%patch18 -p1 -b .sid-playfix
-%patch19 -p1 -b .neon-request
-%patch20 -p1 -b .cfg_db_close
-%patch21 -p1 -b .bluetooth
+%patch0 -p1 -b .xmms-skindir
+%patch1 -p1 -b .jack
+%patch2 -p1 -b .neon-request
+%patch3 -p1 -b .cfg_db_close
+%patch4 -p1 -b .bluetooth
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -203,11 +178,9 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --enable-neon  \
     \
     --disable-aac  \
-    --disable-ape  \
+    --disable-ffaudio  \
     --disable-mp3  \
     --disable-mms  \
-    --disable-tta  \
-    --disable-wma  \
     --disable-libmadtest  \
     \
     --disable-oss  \
@@ -222,12 +195,23 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %find_lang %{name}
+# audacious-sid.desktop
+desktop-file-install --vendor "" \
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+    %{SOURCE1}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post sid
+update-desktop-database &> /dev/null || :
+
+%postun sid
+update-desktop-database &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
@@ -241,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/audacious/Input/amidi-plug.so
 %exclude %{_libdir}/audacious/Input/amidi-plug/
 %exclude %{_libdir}/audacious/Input/wavpack.so
-%exclude %{_libdir}/audacious/Input/metronom.so
+%exclude %{_libdir}/audacious/Input/sid.so
 %exclude %{_libdir}/audacious/Input/vtx.so
 %exclude %{_libdir}/audacious/Output/jackout.so
 %exclude %{_libdir}/audacious/Output/ESD.so
@@ -260,13 +244,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/audacious/Input/amidi-plug.so
 %{_libdir}/audacious/Input/amidi-plug/
 
-%files wavpack
+%files sid
 %defattr(-,root,root,-)
-%{_libdir}/audacious/Input/wavpack.so
+%{_libdir}/audacious/Input/sid.so
+%{_datadir}/applications/audacious-sid.desktop
 
-%files metronome
+%files wavpack
 %defattr(-,root,root,-)
-%{_libdir}/audacious/Input/metronom.so
+%{_libdir}/audacious/Input/wavpack.so
 
 %files vortex
 %defattr(-,root,root,-)
@@ -274,59 +259,56 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-27
+* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
+- Remove BR libtimidity-devel as that plugin is no longer available.
+
+* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
+- Let bluetooth plugin access "alsa-gapless" config values not "alsa"
+  as it will be called in post-2.2.
+
+* Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
 - Beat bluetooth plugin a bit.
 - Fix missing aud_cfg_db_close calls.
-
-* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-26
 - Avoid that neon's ne_request_destroy() is called with a NULL ptr.
 
-* Wed Dec 16 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-25
-- Patch SID plugin to remove old cruft and fix playback.
-- Don't drain in pulse_audio output plugin (2.2 doesn't do this anymore
-  either, but does it cause loud clicks'n'pops instead? Test this also
-  with 2.2).
-
-* Mon Nov 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-24
-- Merge some of the default volume level changes that went into the
-  pulse_audio output plugin in 2.2.
-- Fix musepack playback end for alsa-ng plugin.
-- Merge jack_free redeclaration fix.
-
-* Sat Nov 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-21
-- Avoid crash in unconfigured icecast effects plugin.
-- Fix non-top-level icecast plugin dialog.
-- Fix non-top-level sndstretch plugin dialog.
-
-* Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-18
-- Corrupt musepack files were able to crash Audacious.
-
-* Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-17
-- More cleanup in musepack plugin.
-
-* Fri Nov 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-16
-- Make musepack output time work.
-- Patch musepack plugin to remove old cruft and fix playback.
+* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
+- Move SID music plugin into audacious-plugins-sid package. Its 
+  built with libsidplay 1 while 3rd party package providers may
+  build it with libsidplay 2.
+- Include metronome plugin in base plugins package. No reason to
+  split this off into an optional subpackage.
+
+* Wed Nov 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-1
+- Upgrade to 2.2 (declared as the next "stable release" after 2.1).
+- The ladspa plugin has been reworked since beta2.
+
+* Tue Nov 24 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- BR libcue-devel which is available now and is enabled by default
+  post 2.2-beta2
+- Drop --disable-tta switch as that plugin is gone.
+
+* Fri Nov 13 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- Remove BR libmpcdec-devel ("musepack" plugin is not available anymore
+  after 2.1 as it got removed in favour of "ffaudio"/ffmpeg plugin).
 
-* Sun Nov  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-13
+* Tue Nov 10 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.4.beta2
+- Upgrade to 2.2-beta2
 - Add patch to use old/working ladspa plugin from 2.0.1 (#533641).
-- Add patch to fix console game music emu crash (#533642).
-
-* Sun Nov  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-12
-- Fix playlist scrollbar page up/down click.
 
-* Fri Oct 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-11
+* Fri Oct 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.4.beta1
 - Fix non-top-level filewriter plugin dialogs.
 
-* Thu Oct 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-10
-- Remove decode_thread from sndfile plugin to fix playback.
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.3.beta1
+- Update pulse_audio patch with correct get_song_name().
 
-* Mon Oct 26 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-9
-- Let buffer_time_min in underruns patch depend on default buffer size.
-
-* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-8
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.2.beta1
 - Patch modplug plugin to remove old cruft and fix playback.
 
+* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
+- Upgrade to 2.2-beta1
+- Port old pulse_audio plugin from Audacious 2.1
+  and patch it to fix volume issues.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-7
 - Patch pulseaudio plugin to not suffer from precision loss when
   calculating the volume level to save.
@@ -338,6 +320,14 @@ rm -rf $RPM_BUILD_ROOT
 - Patch pulseaudio plugin to not get confused by volume values passed
   in via callback.
 
+* Sun Oct 18 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha2
+- Upgrade to 2.2-alpha2 (breaks ALSA output with alsa-plugins-pulseaudio!)
+
+* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha1
+- Upgrade to 2.2-alpha1 (primarly for alsa-gapless output plugin).
+- Removes pulse_audio output plugin!
+- Obsolete patches: timidity-cfg, keep-mixer-open
+
 * Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-4
 - Patch alsa-ng plugin with some buffer prefilling to fight underruns.
 - Merge minor changes from 2.2-alpha1 alsa-ng plugin.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	14 Jul 2009 17:24:08 -0000	1.20
+++ sources	30 Dec 2009 15:17:10 -0000	1.21
@@ -1 +1 @@
-199dfef2aa2020f0405d54b67e6540f7  audacious-plugins-fedora-2.1.tar.bz2
+6ac5463ae9b58055077c2c63583fb1fe  audacious-plugins-fedora-2.2.tar.bz2


--- audacious-plugins-1.5.1-timidity-cfg.patch DELETED ---


--- audacious-plugins-2.1-alsa-ng.patch DELETED ---


--- audacious-plugins-2.1-bluetooth.patch DELETED ---


--- audacious-plugins-2.1-cfg_db_close.patch DELETED ---


--- audacious-plugins-2.1-filewriter-dialogs.patch DELETED ---


--- audacious-plugins-2.1-icecast.patch DELETED ---


--- audacious-plugins-2.1-jack.patch DELETED ---


--- audacious-plugins-2.1-ladspa-backto201.patch DELETED ---


--- audacious-plugins-2.1-modplug.patch DELETED ---


--- audacious-plugins-2.1-musepack.patch DELETED ---


--- audacious-plugins-2.1-neon-request.patch DELETED ---


--- audacious-plugins-2.1-playlist-scrollbar.patch DELETED ---


--- audacious-plugins-2.1-pulseaudio-no-drain.patch DELETED ---


--- audacious-plugins-2.1-pulseaudio-volume.patch DELETED ---


--- audacious-plugins-2.1-sid-playfix.patch DELETED ---


--- audacious-plugins-2.1-sndfile-playfix.patch DELETED ---


--- audacious-plugins-2.1-sndstretch-dialog.patch DELETED ---


--- audacious-plugins-2.1-underruns.patch DELETED ---


--- audacious_20090702_console.diff DELETED ---



From mschwendt at fedoraproject.org  Wed Dec 30 15:17:27 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 15:17:27 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-sid.desktop,NONE,1.1
Message-ID: <20091230151727.ED71011C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9376

Added Files:
	audacious-sid.desktop 
Log Message:
sync with Rawhide for Audacious 2.2


--- NEW FILE audacious-sid.desktop ---
[Desktop Entry]
Name=Audacious
Comment=Play SID music
Exec=audacious
Icon=audacious2
MimeType=audio/prs.sid;
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true



From arbiter at fedoraproject.org  Wed Dec 30 15:25:21 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Wed, 30 Dec 2009 15:25:21 +0000 (UTC)
Subject: rpms/ncmpcpp/F-11 .cvsignore, 1.8, 1.9 ncmpcpp.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <20091230152521.1AB8411C00E9@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/ncmpcpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11066

Modified Files:
	.cvsignore ncmpcpp.spec sources 
Log Message:
* Wed Dec 30 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.4.1-1
- 0.4.1
- support for writing performer, composer and disc tags into ogg and flac files
- support for custom prefix/suffix of now playing song
- support for system charset encoding autodetection
- support for underlined text
- optimizations and bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	11 Sep 2009 13:58:17 -0000	1.8
+++ .cvsignore	30 Dec 2009 15:25:20 -0000	1.9
@@ -1 +1 @@
-ncmpcpp-0.3.5.tar.bz2
+ncmpcpp-0.4.1.tar.bz2


Index: ncmpcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-11/ncmpcpp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ncmpcpp.spec	11 Sep 2009 13:58:17 -0000	1.8
+++ ncmpcpp.spec	30 Dec 2009 15:25:20 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           ncmpcpp
-Version:        0.3.5
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Clone of ncmpc with new features and written in C++
 Group:          Applications/Multimedia
@@ -14,9 +14,9 @@ BuildRequires:  ncurses-devel
 
 
 %description
-Ncmpcpp is almost exact clone of ncmpc but it contains some new 
-features ncmpc doesn't have. It's been also rewritten from scratch 
-in C++. New features include: tag editor, playlists editor, easy to 
+Ncmpcpp is almost exact clone of ncmpc but it contains some new
+features ncmpc doesn't have. It's been also rewritten from scratch
+in C++. New features include: tag editor, playlists editor, easy to
 use search screen, media library screen, lyrics screen and more.
 
 
@@ -25,7 +25,7 @@ use search screen, media library screen,
 
 
 %build
-%configure --disable-static --enable-clock --with-taglib --with-curl 
+%configure --disable-static --enable-clock --with-taglib --with-curl
 
 make %{?_smp_mflags}
 
@@ -48,7 +48,21 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Jul  4 2009 Michal Nowak <mnowak at redhat.com> - 0.3.5-1
+* Wed Dec 30 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.4.1-1
+- 0.4.1
+- support for writing performer, composer and disc tags into ogg and flac files
+- support for custom prefix/suffix of now playing song
+- support for system charset encoding autodetection
+- support for underlined text
+- optimizations and bugfixes
+
+* Fri Sep 11 2009 Michal Nowak <mnowak at redhat.com> - 0.4-1
+- 0.4
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Michal Nowak <mnowak at redhat.com> - 0.3.5-1
 - 0.3.5
 - new feature: custom command execution on song change
 - new feature: allow for physical files and directories deletion
@@ -63,7 +77,7 @@ rm -rf %{buildroot}
 - 0.3.4
 
 * Mon Apr 06 2009 Michal Nowak <mnowak at redhat.com> - 0.3.3-1
-- dumped ncmpcpp-0.3.2-charset.patch -- upstream already 
+- dumped ncmpcpp-0.3.2-charset.patch -- upstream already
 - 0.3.3
 
 * Wed Mar 18 2009 Michal Nowak <mnowak at redhat.com> - 0.3.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Sep 2009 13:58:17 -0000	1.8
+++ sources	30 Dec 2009 15:25:20 -0000	1.9
@@ -1 +1 @@
-7e30bacf83be88b6931e3d70a16e33e4  ncmpcpp-0.3.5.tar.bz2
+120e15c8791f82c30671990bbf2022e1  ncmpcpp-0.4.1.tar.bz2



From arbiter at fedoraproject.org  Wed Dec 30 15:25:21 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Wed, 30 Dec 2009 15:25:21 +0000 (UTC)
Subject: rpms/ncmpcpp/F-12 .cvsignore, 1.9, 1.10 ncmpcpp.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20091230152521.249EF11C01EA@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/ncmpcpp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11075

Modified Files:
	.cvsignore ncmpcpp.spec sources 
Log Message:
* Wed Dec 30 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.4.1-1
- 0.4.1
- support for writing performer, composer and disc tags into ogg and flac files
- support for custom prefix/suffix of now playing song
- support for system charset encoding autodetection
- support for underlined text
- optimizations and bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 Sep 2009 13:35:48 -0000	1.9
+++ .cvsignore	30 Dec 2009 15:25:20 -0000	1.10
@@ -1 +1 @@
-ncmpcpp-0.4.tar.bz2
+ncmpcpp-0.4.1.tar.bz2


Index: ncmpcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-12/ncmpcpp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ncmpcpp.spec	11 Sep 2009 13:35:48 -0000	1.10
+++ ncmpcpp.spec	30 Dec 2009 15:25:20 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           ncmpcpp
-Version:        0.4
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Clone of ncmpc with new features and written in C++
 Group:          Applications/Multimedia
@@ -14,9 +14,9 @@ BuildRequires:  ncurses-devel
 
 
 %description
-Ncmpcpp is almost exact clone of ncmpc but it contains some new 
-features ncmpc doesn't have. It's been also rewritten from scratch 
-in C++. New features include: tag editor, playlists editor, easy to 
+Ncmpcpp is almost exact clone of ncmpc but it contains some new
+features ncmpc doesn't have. It's been also rewritten from scratch
+in C++. New features include: tag editor, playlists editor, easy to
 use search screen, media library screen, lyrics screen and more.
 
 
@@ -25,7 +25,7 @@ use search screen, media library screen,
 
 
 %build
-%configure --disable-static --enable-clock --with-taglib --with-curl 
+%configure --disable-static --enable-clock --with-taglib --with-curl
 
 make %{?_smp_mflags}
 
@@ -48,6 +48,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 30 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.4.1-1
+- 0.4.1
+- support for writing performer, composer and disc tags into ogg and flac files
+- support for custom prefix/suffix of now playing song
+- support for system charset encoding autodetection
+- support for underlined text
+- optimizations and bugfixes
+
 * Fri Sep 11 2009 Michal Nowak <mnowak at redhat.com> - 0.4-1
 - 0.4
 
@@ -69,7 +77,7 @@ rm -rf %{buildroot}
 - 0.3.4
 
 * Mon Apr 06 2009 Michal Nowak <mnowak at redhat.com> - 0.3.3-1
-- dumped ncmpcpp-0.3.2-charset.patch -- upstream already 
+- dumped ncmpcpp-0.3.2-charset.patch -- upstream already
 - 0.3.3
 
 * Wed Mar 18 2009 Michal Nowak <mnowak at redhat.com> - 0.3.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Sep 2009 13:35:48 -0000	1.9
+++ sources	30 Dec 2009 15:25:21 -0000	1.10
@@ -1 +1 @@
-7c06f7591fd3785e4a61c40e0e8e440f  ncmpcpp-0.4.tar.bz2
+120e15c8791f82c30671990bbf2022e1  ncmpcpp-0.4.1.tar.bz2



From pkgdb at fedoraproject.org  Wed Dec 30 16:03:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 16:03:05 +0000
Subject: [pkgdb] dvdauthor ownership updated
Message-ID: <20091230160302.213E110F8CC@bastion.fedoraproject.org>

Package dvdauthor in Fedora 7 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dvdauthor



From pkgdb at fedoraproject.org  Wed Dec 30 16:03:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 16:03:04 +0000
Subject: [pkgdb] dvdauthor ownership updated
Message-ID: <20091230160302.D1DD810F8CD@bastion.fedoraproject.org>

Package dvdauthor in Fedora 6 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dvdauthor



From pkgdb at fedoraproject.org  Wed Dec 30 16:03:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 16:03:06 +0000
Subject: [pkgdb] dvdauthor ownership updated
Message-ID: <20091230160305.1EEDD10F8CC@bastion.fedoraproject.org>

Package dvdauthor in Fedora 8 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dvdauthor



From pkgdb at fedoraproject.org  Wed Dec 30 16:03:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 16:03:23 +0000
Subject: [pkgdb] dvdauthor ownership updated
Message-ID: <20091230160308.78B6C10F8CC@bastion.fedoraproject.org>

Package dvdauthor in Fedora 9 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dvdauthor



From pkgdb at fedoraproject.org  Wed Dec 30 16:03:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 16:03:11 +0000
Subject: [pkgdb] dvdauthor ownership updated
Message-ID: <20091230160309.EBE3710F8CD@bastion.fedoraproject.org>

Package dvdauthor in Fedora 10 was orphaned by scop

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dvdauthor



From buc at fedoraproject.org  Wed Dec 30 16:07:53 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 30 Dec 2009 16:07:53 +0000 (UTC)
Subject: File phpwapmail-0.9.3.tar.gz uploaded to lookaside cache by buc
Message-ID: <20091230160753.4375010F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for phpwapmail:

fec46307daff5f560093bc42dd58fdd7  phpwapmail-0.9.3.tar.gz



From sailer at fedoraproject.org  Wed Dec 30 16:09:03 2009
From: sailer at fedoraproject.org (sailer)
Date: Wed, 30 Dec 2009 16:09:03 +0000 (UTC)
Subject: rpms/ghdl/devel ghdl-svn135.patch, NONE, 1.1 grt-sigdisplay.patch,
	NONE, 1.1 ghdl.spec, 1.63, 1.64 ghdl-svn133.patch, 1.1,
	NONE grt-processtimeoutchain.patch, 1.3, NONE grt-stats.patch,
	1.2, NONE
Message-ID: <20091230160903.1BDD711C00E9@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/pkgs/rpms/ghdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20951

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn135.patch grt-sigdisplay.patch 
Removed Files:
	ghdl-svn133.patch grt-processtimeoutchain.patch 
	grt-stats.patch 
Log Message:
update to svn135; drop upstreamed patches; fix potential portability problem with --trace-signals and friends


ghdl-svn135.patch:
 errorout.adb           |    6 
 ghdldrv/ghdllocal.adb  |    2 
 grt/grt-cbinding.c     |    6 
 grt/grt-processes.adb  |  448 ++++++++++++++++++++++++++++++-------------------
 grt/grt-processes.ads  |   31 +--
 grt/grt-rtis_utils.adb |    1 
 grt/grt-signals.adb    |   31 +--
 grt/grt-signals.ads    |   33 ++-
 grt/grt-stats.adb      |    8 
 grt/grt-types.ads      |    4 
 grt/grt-unithread.adb  |    9 
 grt/grt-unithread.ads  |    6 
 ortho-lang.c           |    2 
 version.ads            |    4 
 14 files changed, 355 insertions(+), 236 deletions(-)

--- NEW FILE ghdl-svn135.patch ---
diff -urN ghdl-0.28/vhdl/errorout.adb ghdl-0.29dev/vhdl/errorout.adb
--- ghdl-0.28/vhdl/errorout.adb	2008-09-27 03:27:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/errorout.adb	2009-12-30 16:56:08.000000000 +0100
@@ -893,8 +893,12 @@
       procedure Append_Type (Def : Iir)
       is
          use Name_Table;
+         Decl : Iir := Get_Type_Declarator (Def);
       begin
-         Image (Get_Identifier (Get_Type_Declarator (Def)));
+         if Decl = Null_Iir then
+            Decl := Get_Type_Declarator (Get_Base_Type (Def));
+         end if;
+         Image (Get_Identifier (Decl));
          Append (Res, Name_Buffer (1 .. Name_Length));
       end Append_Type;
 
diff -urN ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb
--- ghdl-0.28/vhdl/ghdldrv/ghdllocal.adb	2009-08-13 06:21:29.000000000 +0200
+++ ghdl-0.29dev/vhdl/ghdldrv/ghdllocal.adb	2009-12-30 16:56:06.000000000 +0100
@@ -223,7 +223,7 @@
       if Prefix_Path = null then
          Prefix_Path := new String'(Default_Pathes.Prefix);
       else
-         -- assume the user has set the correct path, so do not insert 32
+         -- Assume the user has set the correct path, so do not insert 32.
          Flag_32bit := False;
       end if;
 
diff -urN ghdl-0.28/vhdl/grt/grt-cbinding.c ghdl-0.29dev/vhdl/grt/grt-cbinding.c
--- ghdl-0.28/vhdl/grt/grt-cbinding.c	2006-03-09 03:25:44.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-cbinding.c	2009-12-30 16:56:06.000000000 +0100
@@ -43,6 +43,12 @@
   fprintf (stream, "%g", val);
 }
 
+void
+__ghdl_fprintf_clock (FILE *stream, int a, int b)
+{
+  fprintf (stream, "%3d.%03d", a, b);
+}
+
 #if 1
 void
 __gnat_last_chance_handler (void)
diff -urN ghdl-0.28/vhdl/grt/grt-processes.adb ghdl-0.29dev/vhdl/grt/grt-processes.adb
--- ghdl-0.28/vhdl/grt/grt-processes.adb	2008-08-29 01:40:50.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.adb	2009-12-30 16:56:06.000000000 +0100
@@ -36,27 +36,30 @@
 package body Grt.Processes is
    Last_Time : constant Std_Time := Std_Time'Last;
 
+   --  Identifier for a process.
+   type Process_Id is new Integer;
+
    --  Table of processes.
    package Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Type,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Process_Id,
       Table_Low_Bound => 1,
       Table_Initial => 16);
 
    --  List of non_sensitized processes.
    package Non_Sensitized_Process_Table is new Grt.Table
-     (Table_Component_Type => Process_Id,
+     (Table_Component_Type => Process_Acc,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
       Table_Initial => 2);
 
    --  List of processes to be resume at next cycle.
-   type Process_Id_Array is array (Natural range <>) of Process_Id;
-   type Process_Id_Array_Acc is access Process_Id_Array;
+   type Process_Acc_Array is array (Natural range <>) of Process_Acc;
+   type Process_Acc_Array_Acc is access Process_Acc_Array;
 
-   Resume_Process_Table : Process_Id_Array_Acc;
+   Resume_Process_Table : Process_Acc_Array_Acc;
    Last_Resume_Process : Natural := 0;
-   Postponed_Resume_Process_Table : Process_Id_Array_Acc;
+   Postponed_Resume_Process_Table : Process_Acc_Array_Acc;
    Last_Postponed_Resume_Process : Natural := 0;
 
    --  Number of postponed processes.
@@ -66,8 +69,9 @@
    --  Number of resumed processes.
    Nbr_Resumed_Processes : Natural := 0;
 
-   procedure Free is new Ada.Unchecked_Deallocation
-     (Name => Sensitivity_Acc, Object => Sensitivity_El);
+   --  Earliest time out within non-sensitized processes.
+   Process_First_Timeout : Std_Time := Last_Time;
+   Process_Timeout_Chain : Process_Acc := null;
 
    procedure Init is
    begin
@@ -105,6 +109,7 @@
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
       Stack : Stack_Type;
+      P : Process_Acc;
    begin
       if State /= State_Sensitized then
          Stack := Stack_Create (Proc, This);
@@ -114,22 +119,22 @@
       else
          Stack := Null_Stack;
       end if;
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => Postponed,
-         State => State,
-         Timeout => Bad_Time,
-         Stack => Stack);
+      P := new Process_Type'(Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => Postponed,
+                             State => State,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Stack => Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
-
+      Set_Current_Process (P);
       if State /= State_Sensitized then
-         Non_Sensitized_Process_Table.Append (Process_Table.Last);
+         Non_Sensitized_Process_Table.Append (P);
       end if;
       if Postponed then
          Nbr_Postponed_Processes := Nbr_Postponed_Processes + 1;
@@ -145,7 +150,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, False);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, False);
    end Ghdl_Process_Register;
 
    procedure Ghdl_Sensitized_Process_Register
@@ -165,7 +170,7 @@
       Addr : System.Address)
    is
    begin
-      Process_Register (Instance, Proc, (Addr, Ctxt), State_Timeout, True);
+      Process_Register (Instance, Proc, (Addr, Ctxt), State_Ready, True);
    end Ghdl_Postponed_Process_Register;
 
    procedure Ghdl_Postponed_Sensitized_Process_Register
@@ -184,20 +189,22 @@
    is
       function To_Proc_Acc is new Ada.Unchecked_Conversion
         (Source => System.Address, Target => Proc_Acc);
+      P : Process_Acc;
    begin
-      Process_Table.Increment_Last;
-      Process_Table.Table (Process_Table.Last) :=
-        (Rti => Ctxt,
-         Sensitivity => null,
-         Resumed => False,
-         Postponed => False,
-         State => State_Sensitized,
-         Timeout => Bad_Time,
-         Subprg => To_Proc_Acc (Proc),
-         This => This,
-         Stack => Null_Stack);
+      P := new Process_Type'(Rti => Ctxt,
+                             Sensitivity => null,
+                             Resumed => False,
+                             Postponed => False,
+                             State => State_Sensitized,
+                             Timeout => Bad_Time,
+                             Timeout_Chain_Next => null,
+                             Timeout_Chain_Prev => null,
+                             Subprg => To_Proc_Acc (Proc),
+                             This => This,
+                             Stack => Null_Stack);
+      Process_Table.Append (P);
       --  Used to create drivers.
-      Set_Current_Process (Process_Table.Last, null);
+      Set_Current_Process (P);
    end Verilog_Process_Register;
 
    procedure Ghdl_Initial_Register (Instance : System.Address;
@@ -217,16 +224,16 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
    begin
-      Resume_Process_If_Event (Sig, Process_Table.Last);
+      Resume_Process_If_Event
+        (Sig, Process_Table.Table (Process_Table.Last));
    end Ghdl_Process_Add_Sensitivity;
 
-   procedure Resume_Process (Proc : Process_Id)
+   procedure Resume_Process (Proc : Process_Acc)
    is
-      P : Process_Type renames Process_Table.Table (Proc);
    begin
-      if not P.Resumed then
-         P.Resumed := True;
-         if P.Postponed then
+      if not Proc.Resumed then
+         Proc.Resumed := True;
+         if Proc.Postponed then
             Last_Postponed_Resume_Process := Last_Postponed_Resume_Process + 1;
             Postponed_Resume_Process_Table (Last_Postponed_Resume_Process)
               := Proc;
@@ -260,26 +267,66 @@
       Grt.Stack2.Release (Get_Stack2, Mark);
    end Ghdl_Stack2_Release;
 
-   function To_Acc is new Ada.Unchecked_Conversion
-     (Source => System.Address, Target => Process_Acc);
-
    procedure Ghdl_Process_Wait_Add_Sensitivity (Sig : Ghdl_Signal_Ptr)
    is
-      El : Sensitivity_Acc;
+      Proc : constant Process_Acc := Get_Current_Process;
+      El : Action_List_Acc;
    begin
-      El := new Sensitivity_El'(Sig => Sig,
-                                Next => Get_Current_Process.Sensitivity);
-      Get_Current_Process.Sensitivity := El;
+      El := new Action_List'(Dynamic => True,
+                             Next => Sig.Event_List,
+                             Proc => Proc,
+                             Prev => null,
+                             Sig => Sig,
+                             Chain => Proc.Sensitivity);
+      if Sig.Event_List /= null and then Sig.Event_List.Dynamic then
+         Sig.Event_List.Prev := El;
+      end if;
+      Sig.Event_List := El;
+      Proc.Sensitivity := El;
    end Ghdl_Process_Wait_Add_Sensitivity;
 
+   procedure Update_Process_First_Timeout (Proc : Process_Acc) is
+   begin
+      if Proc.Timeout < Process_First_Timeout then
+         Process_First_Timeout := Proc.Timeout;
+      end if;
+      Proc.Timeout_Chain_Next := Process_Timeout_Chain;
+      Proc.Timeout_Chain_Prev := null;
+      if Process_Timeout_Chain /= null then
+         Process_Timeout_Chain.Timeout_Chain_Prev := Proc;
+      end if;
+      Process_Timeout_Chain := Proc;
+   end Update_Process_First_Timeout;
+
+   procedure Remove_Process_From_Timeout_Chain (Proc : Process_Acc) is
+   begin
+      --  Remove Proc from the timeout list.
+      if Proc.Timeout_Chain_Prev /= null then
+         Proc.Timeout_Chain_Prev.Timeout_Chain_Next :=
+           Proc.Timeout_Chain_Next;
+      elsif Process_Timeout_Chain = Proc then
+         --  Only if Proc is in the chain.
+         Process_Timeout_Chain := Proc.Timeout_Chain_Next;
+      end if;
+      if Proc.Timeout_Chain_Next /= null then
+         Proc.Timeout_Chain_Next.Timeout_Chain_Prev :=
+           Proc.Timeout_Chain_Prev;
+         Proc.Timeout_Chain_Next := null;
+      end if;
+      --  Be sure a second call won't corrupt the chain.
+      Proc.Timeout_Chain_Prev := null;
+   end Remove_Process_From_Timeout_Chain;
+
    procedure Ghdl_Process_Wait_Set_Timeout (Time : Std_Time)
    is
+      Proc : constant Process_Acc := Get_Current_Process;
    begin
       if Time < 0 then
          --  LRM93 8.1
          Error ("negative timeout clause");
       end if;
-      Get_Current_Process.Timeout := Current_Time + Time;
+      Proc.Timeout := Current_Time + Time;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Wait_Set_Timeout;
 
    function Ghdl_Process_Wait_Suspend return Boolean
@@ -295,27 +342,75 @@
 --          Cur_Proc.Timeout := Std_Time'Last;
 --       end if;
       Stack_Switch (Get_Main_Stack, Proc.Stack);
-      -- Note: in case of timeout, the timeout is removed when processis is
+      -- Note: in case of timeout, the timeout is removed when process is
       -- woken up.
       return Proc.State = State_Timeout;
    end Ghdl_Process_Wait_Suspend;
 
+   procedure Free is new Ada.Unchecked_Deallocation
+     (Action_List, Action_List_Acc);
+
    procedure Ghdl_Process_Wait_Close
    is
       Proc : constant Process_Acc := Get_Current_Process;
-      El : Sensitivity_Acc;
-      N_El : Sensitivity_Acc;
+      El : Action_List_Acc;
+      N_El : Action_List_Acc;
    begin
       --  Remove the sensitivity.
       El := Proc.Sensitivity;
       Proc.Sensitivity := null;
       while El /= null loop
-         N_El := El.Next;
+         pragma Assert (El.Proc = Get_Current_Process);
+         if El.Prev = null then
+            El.Sig.Event_List := El.Next;
+         else
+            pragma Assert (El.Prev.Dynamic);
+            El.Prev.Next := El.Next;
+         end if;
+         if El.Next /= null and then El.Next.Dynamic then
+            El.Next.Prev := El.Prev;
+         end if;
+         N_El := El.Chain;
          Free (El);
          El := N_El;
       end loop;
-      --  Remove the timeout.
-      Proc.Timeout := Bad_Time;
+
+      --  Remove Proc from the timeout list.
+      Remove_Process_From_Timeout_Chain (Proc);
+
+      --  This is necessary when the process has been woken-up by an event
+      --  before the timeout triggers.
+      if Process_First_Timeout = Proc.Timeout then
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+
+         declare
+            Next_Timeout : Std_Time;
+            P : Process_Acc;
+         begin
+            Next_Timeout := Last_Time;
+            P := Process_Timeout_Chain;
+            while P /= null loop
+               case P.State is
+                  when State_Delayed
+                    | State_Wait =>
+                     if P.Timeout > 0
+                       and then P.Timeout < Next_Timeout
+                     then
+                        Next_Timeout := P.Timeout;
+                     end if;
+                  when others =>
+                     null;
+               end case;
+               P := P.Timeout_Chain_Next;
+            end loop;
+            Process_First_Timeout := Next_Timeout;
+         end;
+      else
+         --  Remove the timeout.
+         Proc.Timeout := Bad_Time;
+      end if;
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Close;
 
    procedure Ghdl_Process_Wait_Exit
@@ -345,8 +440,13 @@
       end if;
       Proc.Timeout := Current_Time + Time;
       Proc.State := State_Wait;
+      Update_Process_First_Timeout (Proc);
       --  Suspend this process.
       Stack_Switch (Get_Main_Stack, Proc.Stack);
+      --  Clean-up.
+      Proc.Timeout := Bad_Time;
+      Remove_Process_From_Timeout_Chain (Proc);
+      Proc.State := State_Ready;
    end Ghdl_Process_Wait_Timeout;
 
    --  Verilog.
@@ -356,6 +456,7 @@
    begin
       Proc.Timeout := Current_Time + Std_Time (Del);
       Proc.State := State_Delayed;
+      Update_Process_First_Timeout (Proc);
    end Ghdl_Process_Delay;
 
    --  Protected object lock.
@@ -364,7 +465,7 @@
    type Object_Lock is record
       --  The owner of the lock.
       --  Nul_Process_Id means the lock is free.
-      Process : Process_Id;
+      Process : Process_Acc;
       --  Number of times the lock has been acquired.
       Count : Natural;
    end record;
@@ -379,14 +480,14 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process = Nul_Process_Id then
+      if Lock.Process = null then
          if Lock.Count /= 0 then
             Internal_Error ("protected_enter");
          end if;
-         Lock.Process := Get_Current_Process_Id;
+         Lock.Process := Get_Current_Process;
          Lock.Count := 1;
       else
-         if Lock.Process /= Get_Current_Process_Id then
+         if Lock.Process /= Get_Current_Process then
             Internal_Error ("protected_enter(2)");
          end if;
          Lock.Count := Lock.Count + 1;
@@ -397,7 +498,7 @@
    is
       Lock : constant Object_Lock_Acc := To_Lock_Acc_Acc (Obj).all;
    begin
-      if Lock.Process /= Get_Current_Process_Id then
+      if Lock.Process /= Get_Current_Process then
          Internal_Error ("protected_leave(1)");
       end if;
 
@@ -406,7 +507,7 @@
       end if;
       Lock.Count := Lock.Count - 1;
       if Lock.Count = 0 then
-         Lock.Process := Nul_Process_Id;
+         Lock.Process := null;
       end if;
    end Ghdl_Protected_Leave;
 
@@ -414,8 +515,7 @@
    is
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      Lock.all := new Object_Lock'(Process => Nul_Process_Id,
-                                   Count => 0);
+      Lock.all := new Object_Lock'(Process => null, Count => 0);
    end Ghdl_Protected_Init;
 
    procedure Ghdl_Protected_Fini (Obj : System.Address)
@@ -425,7 +525,7 @@
 
       Lock : constant Object_Lock_Acc_Acc := To_Lock_Acc_Acc (Obj);
    begin
-      if Lock.all.Count /= 0 or Lock.all.Process /= Nul_Process_Id then
+      if Lock.all.Count /= 0 or Lock.all.Process /= null then
          Internal_Error ("protected_fini");
       end if;
       Deallocate (Lock.all);
@@ -448,40 +548,63 @@
       end if;
 
       --     3) The next time at which a process resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
-         declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Proc.State = State_Wait
-              and then Proc.Timeout < Res
-              and then Proc.Timeout >= 0
-            then
-               --  No signals to be updated.
-               Grt.Signals.Flush_Active_List;
-
-               if Proc.Timeout = Current_Time then
-                  --  Can't be better.
-                  return Current_Time;
-               else
-                  Res := Proc.Timeout;
-               end if;
-            end if;
-         end;
-      end loop;
+      if Process_First_Timeout < Res then
+         --  No signals to be updated.
+         Grt.Signals.Flush_Active_List;
+
+         Res := Process_First_Timeout;
+      end if;
 
       return Res;
    end Compute_Next_Time;
 
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id)
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc)
    is
    begin
-      Grt.Rtis_Utils.Put (Stream, Process_Table.Table (Proc).Rti);
+      Grt.Rtis_Utils.Put (Stream, Proc.Rti);
    end Disp_Process_Name;
 
+   procedure Disp_All_Processes
+   is
+      use Grt.Stdio;
+      use Grt.Astdio;
+   begin
+      for I in Process_Table.First .. Process_Table.Last loop
+         declare
+            Proc : constant Process_Acc := Process_Table.Table (I);
+         begin
+            Disp_Process_Name (stdout, Proc);
+            New_Line (stdout);
+            Put (stdout, "  State: ");
+            case Proc.State is
+               when State_Sensitized =>
+                  Put (stdout, "sensitized");
+               when State_Wait =>
+                  Put (stdout, "wait");
+                  if Proc.Timeout /= Bad_Time then
+                     Put (stdout, " until ");
+                     Put_Time (stdout, Proc.Timeout);
+                  end if;
+               when State_Ready =>
+                  Put (stdout, "ready");
+               when State_Timeout =>
+                  Put (stdout, "timeout");
+               when State_Delayed =>
+                  Put (stdout, "delayed");
+               when State_Dead =>
+                  Put (stdout, "dead");
+            end case;
+--              Put (stdout, ": time: ");
+--              Put_U64 (stdout, Proc.Stats_Time);
+--              Put (stdout, ", runs: ");
+--              Put_U32 (stdout, Proc.Stats_Run);
+            New_Line (stdout);
+         end;
+      end loop;
+   end Disp_All_Processes;
+
+   pragma Unreferenced (Disp_All_Processes);
+
    type Run_Handler is access function return Integer;
    --  pragma Convention (C, Run_Handler);
 
@@ -502,12 +625,12 @@
    Run_Failure : constant Integer := -1;
 
    Mt_Last : Natural;
-   Mt_Table : Process_Id_Array_Acc;
+   Mt_Table : Process_Acc_Array_Acc;
    Mt_Index : aliased Natural;
 
    procedure Run_Processes_Threads
    is
-      Pid : Process_Id;
+      Proc : Process_Acc;
       Idx : Natural;
    begin
       loop
@@ -516,41 +639,36 @@
          if Idx > Mt_Last then
             return;
          end if;
-         Pid := Mt_Table (Idx);
+         Proc := Mt_Table (Idx);
 
-         declare
-            Proc : Process_Type renames Process_Table.Table (Pid);
-         begin
-            if Grt.Options.Trace_Processes then
-               Grt.Astdio.Put ("run process ");
-               Disp_Process_Name (Stdio.stdout, Pid);
-               Grt.Astdio.Put (" [");
-               Grt.Astdio.Put (Stdio.stdout, Proc.This);
-               Grt.Astdio.Put ("]");
-               Grt.Astdio.New_Line;
-            end if;
-            if not Proc.Resumed then
-               Internal_Error ("run non-resumed process");
-            end if;
-            Proc.Resumed := False;
-            Set_Current_Process
-              (Pid, To_Acc (Process_Table.Table (Pid)'Address));
-            if Proc.State = State_Sensitized then
-               Proc.Subprg.all (Proc.This);
-            else
-               Stack_Switch (Proc.Stack, Get_Main_Stack);
-            end if;
-            if Grt.Options.Checks then
-               Ghdl_Signal_Internal_Checks;
-               Grt.Stack2.Check_Empty (Get_Stack2);
-            end if;
-         end;
+         if Grt.Options.Trace_Processes then
+            Grt.Astdio.Put ("run process ");
+            Disp_Process_Name (Stdio.stdout, Proc);
+            Grt.Astdio.Put (" [");
+            Grt.Astdio.Put (Stdio.stdout, Proc.This);
+            Grt.Astdio.Put ("]");
+            Grt.Astdio.New_Line;
+         end if;
+         if not Proc.Resumed then
+            Internal_Error ("run non-resumed process");
+         end if;
+         Proc.Resumed := False;
+         Set_Current_Process (Proc);
+         if Proc.State = State_Sensitized then
+            Proc.Subprg.all (Proc.This);
+         else
+            Stack_Switch (Proc.Stack, Get_Main_Stack);
+         end if;
+         if Grt.Options.Checks then
+            Ghdl_Signal_Internal_Checks;
+            Grt.Stack2.Check_Empty (Get_Stack2);
+         end if;
       end loop;
    end Run_Processes_Threads;
 
    function Run_Processes (Postponed : Boolean) return Integer
    is
-      Table : Process_Id_Array_Acc;
+      Table : Process_Acc_Array_Acc;
       Last : Natural;
    begin
       if Options.Flag_Stats then
@@ -571,15 +689,14 @@
       if Options.Nbr_Threads = 1 then
          for I in 1 .. Last loop
             declare
-               Pid : constant Process_Id := Table (I);
-               Proc : Process_Type renames Process_Table.Table (Pid);
+               Proc : constant Process_Acc := Table (I);
             begin
                if not Proc.Resumed then
                   Internal_Error ("run non-resumed process");
                end if;
                if Grt.Options.Trace_Processes then
                   Grt.Astdio.Put ("run process ");
-                  Disp_Process_Name (Stdio.stdout, Pid);
+                  Disp_Process_Name (Stdio.stdout, Proc);
                   Grt.Astdio.Put (" [");
                   Grt.Astdio.Put (Stdio.stdout, Proc.This);
                   Grt.Astdio.Put ("]");
@@ -587,8 +704,7 @@
                end if;
 
                Proc.Resumed := False;
-               Set_Current_Process
-                 (Pid, To_Acc (Process_Table.Table (Pid)'Address));
+               Set_Current_Process (Proc);
                if Proc.State = State_Sensitized then
                   Proc.Subprg.all (Proc.This);
                else
@@ -642,7 +758,7 @@
       null;
 
       for I in Process_Table.First .. Process_Table.Last loop
-         Resume_Process (I);
+         Resume_Process (Process_Table.Table (I));
       end loop;
 
       --  - Each nonpostponed process in the model is executed until it
@@ -697,47 +813,43 @@
       --  d) For each process P, if P is currently sensitive to a signal S and
       --     if an event has occured on S in this simulation cycle, then P
       --     resumes.
-      for I in Non_Sensitized_Process_Table.First ..
-        Non_Sensitized_Process_Table.Last
-      loop
+      if Current_Time = Process_First_Timeout then
+         Tn := Last_Time;
          declare
-            Pid : constant Process_Id :=
-              Non_Sensitized_Process_Table.Table (I);
-            Proc : Process_Type renames Process_Table.Table (Pid);
-            El : Sensitivity_Acc;
+            Proc : Process_Acc;
          begin
-            case Proc.State is
-               when State_Sensitized =>
-                  null;
-               when State_Delayed =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Sensitized;
-                  end if;
-               when State_Wait =>
-                  if Proc.Timeout = Current_Time then
-                     Proc.Timeout := Bad_Time;
-                     Resume_Process (Pid);
-                     Proc.State := State_Timeout;
-                  else
-                     El := Proc.Sensitivity;
-                     while El /= null loop
-                        if El.Sig.Event then
-                           Resume_Process (Pid);
-                           exit;
-                        else
-                           El := El.Next;
-                        end if;
-                     end loop;
-                  end if;
-               when State_Timeout =>
-                  Internal_Error ("process in timeout");
-               when State_Dead =>
-                  null;
-            end case;
+            Proc := Process_Timeout_Chain;
+            while Proc /= null loop
+               case Proc.State is
+                  when State_Sensitized =>
+                     null;
+                  when State_Delayed =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Sensitized;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Wait =>
+                     if Proc.Timeout = Current_Time then
+                        Proc.Timeout := Bad_Time;
+                        Resume_Process (Proc);
+                        Proc.State := State_Timeout;
+                     elsif Proc.Timeout > 0 and then Proc.Timeout < Tn then
+                        Tn := Proc.Timeout;
+                     end if;
+                  when State_Timeout
+                    | State_Ready =>
+                     Internal_Error ("process in timeout");
+                  when State_Dead =>
+                     null;
+               end case;
+               Proc := Proc.Timeout_Chain_Next;
+            end loop;
          end;
-      end loop;
+         Process_First_Timeout := Tn;
+      end if;
 
       --  e) Each nonpostponed that has resumed in the current simulation cycle
       --     is executed until it suspends.
@@ -810,9 +922,9 @@
 
       --  Allocate processes arrays.
       Resume_Process_Table :=
-        new Process_Id_Array (1 .. Nbr_Non_Postponed_Processes);
+        new Process_Acc_Array (1 .. Nbr_Non_Postponed_Processes);
       Postponed_Resume_Process_Table :=
-        new Process_Id_Array (1 .. Nbr_Postponed_Processes);
+        new Process_Acc_Array (1 .. Nbr_Postponed_Processes);
 
       Status := Run_Through_Longjump (Initialization_Phase'Access);
       if Status /= Run_Resumed then
diff -urN ghdl-0.28/vhdl/grt/grt-processes.ads ghdl-0.29dev/vhdl/grt/grt-processes.ads
--- ghdl-0.28/vhdl/grt/grt-processes.ads	2008-08-28 06:38:08.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-processes.ads	2009-12-30 16:56:06.000000000 +0100
@@ -42,6 +42,9 @@
    --  If true, the simulation should be stopped.
    Break_Simulation : Boolean;
 
+   type Process_Type is private;
+   --  type Process_Acc is access all Process_Type;
+
    --  Return the identifier of the current process.
    --  During the elaboration, this is the identifier of the last process
    --  being elaborated.  So, this function can be used to create signal
@@ -56,7 +59,7 @@
    function Get_Nbr_Resumed_Processes return Natural;
 
    --  Disp the name of process PROC.
-   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Id);
+   procedure Disp_Process_Name (Stream : Grt.Stdio.FILEs; Proc : Process_Acc);
 
    --  Register a process during elaboration.
    --  This procedure is called by vhdl elaboration code.
@@ -88,7 +91,7 @@
    procedure Ghdl_Process_Add_Sensitivity (Sig : Ghdl_Signal_Ptr);
 
    --  Resume a process.
-   procedure Resume_Process (Proc : Process_Id);
+   procedure Resume_Process (Proc : Process_Acc);
 
    --  Wait without timeout or sensitivity.
    procedure Ghdl_Process_Wait_Exit;
@@ -118,26 +121,19 @@
    procedure Ghdl_Protected_Init (Obj : System.Address);
    procedure Ghdl_Protected_Fini (Obj : System.Address);
 
-   type Process_Type is private;
-   type Process_Acc is access all Process_Type;
 private
-      --  Access to a process subprogram.
+   --  Access to a process subprogram.
    type Proc_Acc is access procedure (Self : System.Address);
 
-   --  Simply linked list for sensitivity.
-   type Sensitivity_El;
-   type Sensitivity_Acc is access Sensitivity_El;
-   type Sensitivity_El is record
-      Sig : Ghdl_Signal_Ptr;
-      Next : Sensitivity_Acc;
-   end record;
-
    --  State of a process.
    type Process_State is
      (
       --  Sensitized process.  Its state cannot change.
       State_Sensitized,
 
+      --  Non-sensitized process, ready to run.
+      State_Ready,
+
       --  Verilog process, being suspended.
       State_Delayed,
 
@@ -146,6 +142,8 @@
 
       --  Non-sensitized process being awaked by a wait timeout.  This state
       --  is transcient.
+      --  This is necessary so that the process will exit immediately from the
+      --  wait statements without checking if the wait condition is true.
       State_Timeout,
 
       --  Non-sensitized process waiting until end.
@@ -178,8 +176,11 @@
       --  Timeout value for wait.
       Timeout : Std_Time;
 
-      --  Sensitivity list.
-      Sensitivity : Sensitivity_Acc;
+      --  Sensitivity list while the (non-sensitized) process is waiting.
+      Sensitivity : Action_List_Acc;
+
+      Timeout_Chain_Next : Process_Acc;
+      Timeout_Chain_Prev : Process_Acc;
    end record;
 
    pragma Export (C, Ghdl_Process_Register,
diff -urN ghdl-0.28/vhdl/grt/grt-rtis_utils.adb ghdl-0.29dev/vhdl/grt/grt-rtis_utils.adb
--- ghdl-0.28/vhdl/grt/grt-rtis_utils.adb	2008-12-31 05:41:58.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-rtis_utils.adb	2009-12-30 16:56:06.000000000 +0100
@@ -502,6 +502,7 @@
    begin
       Rtis_Utils.Get_Value (Name, Value, Type_Rti);
       Put (Stream, Name);
+      Free (Name);
    end Disp_Value;
 
    procedure Get_Enum_Value
diff -urN ghdl-0.28/vhdl/grt/grt-signals.adb ghdl-0.29dev/vhdl/grt/grt-signals.adb
--- ghdl-0.28/vhdl/grt/grt-signals.adb	2008-09-12 21:34:38.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.adb	2009-12-30 16:56:06.000000000 +0100
@@ -266,9 +266,9 @@
                         / System.Storage_Unit);
       end Size;
 
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       if Sign.S.Nbr_Drivers = 0 then
          Check_New_Source (Sign);
          Sign.S.Drivers := Malloc (Size (1));
@@ -276,7 +276,7 @@
       else
          -- Do not create a driver twice.
          for I in 0 .. Sign.S.Nbr_Drivers - 1 loop
-            if Sign.S.Drivers (I).Proc = Id then
+            if Sign.S.Drivers (I).Proc = Proc then
                return True;
             end if;
          end loop;
@@ -287,7 +287,7 @@
       Sign.S.Drivers (Sign.S.Nbr_Drivers - 1) :=
         (First_Trans => Trans,
          Last_Trans => Trans,
-         Proc => Id);
+         Proc => Proc);
       return False;
    end Ghdl_Signal_Add_Driver;
 
@@ -444,14 +444,14 @@
 
    function Find_Driver (Sig : Ghdl_Signal_Ptr) return Ghdl_Index_Type
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          Error ("assignment to a signal without any driver");
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return I;
          end if;
       end loop;
@@ -460,14 +460,14 @@
 
    function Get_Driver (Sig : Ghdl_Signal_Ptr) return Driver_Acc
    is
-      Id : Process_Id;
+      Proc : Process_Acc;
    begin
       if Sig.S.Drivers = null then
          return null;
       end if;
-      Id := Get_Current_Process_Id;
+      Proc := Get_Current_Process;
       for I in 0 .. Sig.S.Nbr_Drivers - 1 loop
-         if Sig.S.Drivers (I).Proc = Id then
+         if Sig.S.Drivers (I).Proc = Proc then
             return Sig.S.Drivers (I)'Access;
          end if;
       end loop;
@@ -1815,11 +1815,11 @@
    end Call_Conversion_Function;
 
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id)
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc)
    is
       El : Action_List_Acc;
    begin
-      El := new Action_List'(Kind => Action_Process,
+      El := new Action_List'(Dynamic => False,
                              Proc => Proc,
                              Next => Sig.Event_List);
       Sig.Event_List := El;
@@ -2745,12 +2745,7 @@
 
          El := Sig.Event_List;
          while El /= null loop
-            case El.Kind is
-               when Action_Process =>
-                  Resume_Process (El.Proc);
-               when Action_Signal =>
-                  Internal_Error ("set_effective_value");
-            end case;
+            Resume_Process (El.Proc);
             El := El.Next;
          end loop;
       end if;
diff -urN ghdl-0.28/vhdl/grt/grt-signals.ads ghdl-0.29dev/vhdl/grt/grt-signals.ads
--- ghdl-0.28/vhdl/grt/grt-signals.ads	2008-08-21 04:50:51.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-signals.ads	2009-12-30 16:56:06.000000000 +0100
@@ -20,6 +20,7 @@
 with Grt.Table;
 with Grt.Types; use Grt.Types;
 with Grt.Rtis; use Grt.Rtis;
+limited with Grt.Processes;
 pragma Elaborate_All (Grt.Table);
 
 package Grt.Signals is
@@ -59,12 +60,14 @@
       end case;
    end record;
 
+   type Process_Acc is access Grt.Processes.Process_Type;
+
    --  A driver is bound to a process (PROC) and contains a list of
    --  transactions.
    type Driver_Type is record
       First_Trans : Transaction_Acc;
       Last_Trans : Transaction_Acc;
-      Proc : Process_Id;
+      Proc : Process_Acc;
    end record;
 
    type Driver_Acc is access all Driver_Type;
@@ -89,19 +92,33 @@
    function To_Signal_Arr_Ptr is new Ada.Unchecked_Conversion
      (Source => System.Address, Target => Signal_Arr_Ptr);
 
+   --  List of processes to wake-up in case of event on the signal.
    type Action_List;
    type Action_List_Acc is access Action_List;
-   type Action_Kind is (Action_Signal, Action_Process);
-   type Action_List (Kind : Action_Kind) is record
+
+   type Action_List (Dynamic : Boolean) is record
+      --  Next action for the current signal.
       Next : Action_List_Acc;
-      case Kind is
-         when Action_Signal =>
+
+      --  Process to wake-up.
+      Proc : Process_Acc;
+
+      case Dynamic is
+         when True =>
+            --  For a non-sensitized process.
+            --  Previous action (to speed-up remove from the chain).
+            Prev : Action_List_Acc;
+
             Sig : Ghdl_Signal_Ptr;
-         when Action_Process =>
-            Proc : Process_Id;
+
+            --  Chain of signals for the process.
+            Chain : Action_List_Acc;
+         when False =>
+            null;
       end case;
    end record;
 
+
    --  How to compute resolved signal.
    type Resolved_Signal_Type is record
       Resolv_Proc : System.Address;
@@ -408,7 +425,7 @@
    --  Add PROC in the list of processes to be resumed in case of event on
    --  SIG.
    procedure Resume_Process_If_Event
-     (Sig : Ghdl_Signal_Ptr; Proc : Process_Id);
+     (Sig : Ghdl_Signal_Ptr; Proc : Process_Acc);
 
    procedure Ghdl_Signal_Name_Rti (Sig : Ghdl_Rti_Access;
                                    Ctxt : Ghdl_Rti_Access;
diff -urN ghdl-0.28/vhdl/grt/grt-stats.adb ghdl-0.29dev/vhdl/grt/grt-stats.adb
--- ghdl-0.28/vhdl/grt/grt-stats.adb	2008-08-21 04:21:05.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-stats.adb	2009-12-30 16:56:06.000000000 +0100
@@ -71,10 +71,8 @@
 
    procedure Put (Stream : FILEs; Val : Clock_T)
    is
-      Fmt : constant String := "%3d.%03d" & Character'Val (0);
-
-      procedure fprintf (Stream : FILEs; Fmt : Address; A, B : Clock_T);
-      pragma Import (C, fprintf);
+      procedure Fprintf_Clock (Stream : FILEs; A, B : Clock_T);
+      pragma Import (C, Fprintf_Clock, "__ghdl_fprintf_clock");
 
       Sec : Clock_T;
       Ms : Clock_T;
@@ -84,7 +82,7 @@
       --  Avoid overflow.
       Ms := ((Val mod One_Second) * 1000) / One_Second;
 
-      fprintf (Stream, Fmt'Address, Sec, Ms);
+      Fprintf_Clock (Stream, Sec, Ms);
    end Put;
 
    procedure Put (Stream : FILEs; T : Time_Stats) is
diff -urN ghdl-0.28/vhdl/grt/grt-types.ads ghdl-0.29dev/vhdl/grt/grt-types.ads
--- ghdl-0.28/vhdl/grt/grt-types.ads	2007-12-02 02:56:05.000000000 +0100
+++ ghdl-0.29dev/vhdl/grt/grt-types.ads	2009-12-30 16:56:06.000000000 +0100
@@ -139,10 +139,6 @@
    end record;
    type Ghdl_Location_Ptr is access Ghdl_Location;
 
-   --  Identifier for a process.
-   type Process_Id is new Integer;
-   Nul_Process_Id : constant Process_Id := 0;
-
    --  Signal index.
    type Sig_Table_Index is new Integer;
 
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.adb ghdl-0.29dev/vhdl/grt/grt-unithread.adb
--- ghdl-0.28/vhdl/grt/grt-unithread.adb	2008-08-29 02:01:16.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.adb	2009-12-30 16:56:06.000000000 +0100
@@ -52,7 +52,6 @@
    end Atomic_Inc;
 
    Current_Process : Process_Acc;
-   Current_Process_Id : Process_Id;
 
    --  Called by linux.c
    function Grt_Get_Current_Process return Process_Acc;
@@ -64,10 +63,9 @@
    end Grt_Get_Current_Process;
 
 
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc) is
+   procedure Set_Current_Process (Proc : Process_Acc) is
    begin
       Current_Process := Proc;
-      Current_Process_Id := Id;
    end Set_Current_Process;
 
    function Get_Current_Process return Process_Acc is
@@ -75,11 +73,6 @@
       return Current_Process;
    end Get_Current_Process;
 
-   function Get_Current_Process_Id return Process_Id is
-   begin
-      return Current_Process_Id;
-   end Get_Current_Process_Id;
-
    Stack2 : Stack2_Ptr;
 
    function Get_Stack2 return Stack2_Ptr is
diff -urN ghdl-0.28/vhdl/grt/grt-unithread.ads ghdl-0.29dev/vhdl/grt/grt-unithread.ads
--- ghdl-0.28/vhdl/grt/grt-unithread.ads	2008-08-21 04:57:53.000000000 +0200
+++ ghdl-0.29dev/vhdl/grt/grt-unithread.ads	2009-12-30 16:56:06.000000000 +0100
@@ -20,8 +20,6 @@
 with Grt.Signals; use Grt.Signals;
 with Grt.Stack2; use Grt.Stack2;
 with Grt.Stacks; use Grt.Stacks;
-with Grt.Types; use Grt.Types;
-with Grt.Processes; use Grt.Processes;
 
 package Grt.Unithread is
    procedure Init;
@@ -38,9 +36,8 @@
    function Atomic_Inc (Val : access Natural) return Natural;
 
    --  Set and get the current process being executed by the thread.
-   procedure Set_Current_Process (Id : Process_Id; Proc : Process_Acc);
+   procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
-   function Get_Current_Process_Id return Process_Id;
 
    --  The secondary stack for the thread.
    function Get_Stack2 return Stack2_Ptr;
@@ -62,6 +59,5 @@
 
    pragma Inline (Set_Current_Process);
    pragma Inline (Get_Current_Process);
-   pragma Inline (Get_Current_Process_Id);
 
 end Grt.Unithread;
diff -urN ghdl-0.28/vhdl/ortho-lang.c ghdl-0.29dev/vhdl/ortho-lang.c
--- ghdl-0.28/vhdl/ortho-lang.c	2008-08-28 05:29:25.000000000 +0200
+++ ghdl-0.29dev/vhdl/ortho-lang.c	2009-12-30 16:56:07.000000000 +0100
@@ -385,7 +385,7 @@
     filename = in_fnames[0];
 
   linemap_add (line_table, LC_ENTER, 0, filename ? filename :"*no-file*", 1);
-  input_location = linemap_line_start (line_table, 0, 252);
+  input_location = linemap_line_start (line_table, 1, 252);
 
   if (!lang_parse_file (filename))
     errorcount++;
diff -urN ghdl-0.28/vhdl/version.ads ghdl-0.29dev/vhdl/version.ads
--- ghdl-0.28/vhdl/version.ads	2009-09-17 03:31:54.000000000 +0200
+++ ghdl-0.29dev/vhdl/version.ads	2009-12-30 16:56:08.000000000 +0100
@@ -1,5 +1,5 @@
 package Version is
    Ghdl_Release : constant String :=
-      "GHDL 0.28 (20090917) [Sokcho edition]";
-   Ghdl_Ver : constant String := "0.28";
+      "GHDL 0.29dev (20090921) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.29dev";
 end Version;

grt-sigdisplay.patch:
 grt-cbinding.c     |   10 ++++++++++
 grt-rtis_utils.adb |   12 +++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE grt-sigdisplay.patch ---
--- gcc/vhdl/grt/grt-cbinding.c.orig	2009-12-30 17:00:41.000000000 +0100
+++ gcc/vhdl/grt/grt-cbinding.c	2009-12-30 17:05:07.000000000 +0100
@@ -37,6 +37,16 @@
   return stderr;
 }
 
+int
+__ghdl_snprintf_g (char *buf, unsigned int len, double val)
+{
+  /*
+   * Warning: this assumes a C99 snprintf (ie, it returns the
+   * number of characters).
+   */
+  return snprintf (buf, len, "%g", val);
+}
+
 void
 __ghdl_fprintf_g (FILE *stream, double val)
 {
--- gcc/vhdl/grt/grt-rtis_utils.adb.orig	2009-12-30 17:00:50.000000000 +0100
+++ gcc/vhdl/grt/grt-rtis_utils.adb	2009-12-30 17:04:26.000000000 +0100
@@ -450,16 +450,14 @@
                L : Integer;
                --  Warning: this assumes a C99 snprintf (ie, it returns the
                --  number of characters).
-               function snprintf (Cstr : Address;
-                                  Size : Natural;
-                                  Template : Address;
-                                  Arg : Ghdl_F64)
+               function Snprintf_G (Cstr : Address;
+                                    Size : Natural;
+                                    Arg : Ghdl_F64)
                  return Integer;
-               pragma Import (C, snprintf);
+               pragma Import (C, Snprintf_G, "__ghdl_snprintf_g");
 
-               Format : constant String := "%g" & Character'Val (0);
             begin
-               L := snprintf (S'Address, S'Length, Format'Address, Value.F64);
+               L := Snprintf_G (S'Address, S'Length, Value.F64);
                if L < 0 then
                   --  FIXME.
                   Append (Str, "?");


Index: ghdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- ghdl.spec	30 Dec 2009 01:57:25 -0000	1.63
+++ ghdl.spec	30 Dec 2009 16:09:02 -0000	1.64
@@ -1,16 +1,17 @@
 %global gccver 4.3.4
 %global ghdlver 0.28
-%global ghdlsvnver 133
+%global ghdlsvnver 135
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: %{ghdlver}
-Release: 0.%{ghdlsvnver}svn.2%{?dist}
+Release: 0.%{ghdlsvnver}svn.0%{?dist}
 License: GPLv2+
 Group: Development/Languages
 URL: http://ghdl.free.fr/
 # HOWTO create source files from ghdl SVN at https://gna.org/projects/ghdl/
 # check out the SVN repo
+# svn co svn://svn.gna.org/svn/ghdl/trunk ghdl
 # cd translate/gcc/
 # ./dist.sh sources
 Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
@@ -27,10 +28,8 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # https://gna.org/bugs/index.php?13389
 Patch107: ieee-mathreal.patch
-# https://gna.org/bugs/index.php?15015
-Patch108: grt-stats.patch
-# https://gna.org/bugs/index.php?14930                                     
-Patch109: grt-processtimeoutchain.patch                                    
+# https://gna.org/bugs/index.php?xxxxx
+Patch108: grt-sigdisplay.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -60,7 +59,7 @@ BuildRequires: zlib-devel, gettext, biso
 BuildRequires: glibc-devel >= 2.3.90-2
 %ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
 # Make sure glibc supports TFmode long double
-BuildRequires: glibc >= 2.3.90-35
+ BuildRequires: glibc >= 2.3.90-35
 %endif
 # Ada requires Ada to build
 BuildRequires: gcc-gnat >= 4.3, libgnat >= 4.3
@@ -136,8 +135,7 @@ popd
 %patch104 -p0 -b .libgnat44
 %patch105 -p1 -b .grtadac
 %patch106 -p0 -b .ppc64abort
-%patch108 -p0 -b .grtstats
-%patch109 -p0 -b .processtimeoutchain
+%patch108 -p0 -b .grtdispsig
 
 %build
 %{__rm} -fr obj-%{gcc_target_platform}
@@ -335,6 +333,9 @@ P64=%{buildroot}/%{_libdir}/gcc/%{gcc_ta
 
 
 %changelog
+* Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.135svn.0
+- update to svn135
+
 * Wed Dec 30 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.28-0.133svn.2
 - fix the Process Timeout Chain bugfix
 


--- ghdl-svn133.patch DELETED ---


--- grt-processtimeoutchain.patch DELETED ---


--- grt-stats.patch DELETED ---



From buc at fedoraproject.org  Wed Dec 30 16:09:51 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 30 Dec 2009 16:09:51 +0000 (UTC)
Subject: rpms/phpwapmail/devel .cvsignore, 1.2, 1.3 phpwapmail.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091230160951.5AB7111C00E9@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpwapmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21352

Modified Files:
	.cvsignore phpwapmail.spec sources 
Log Message:
update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phpwapmail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Dec 2007 17:40:49 -0000	1.2
+++ .cvsignore	30 Dec 2009 16:09:51 -0000	1.3
@@ -1 +1 @@
-phpwapmail-0.9.2.tar.gz
+phpwapmail-0.9.3.tar.gz


Index: phpwapmail.spec
===================================================================
RCS file: /cvs/extras/rpms/phpwapmail/devel/phpwapmail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- phpwapmail.spec	26 Jul 2009 18:40:16 -0000	1.3
+++ phpwapmail.spec	30 Dec 2009 16:09:51 -0000	1.4
@@ -1,7 +1,7 @@
 Name: phpwapmail
 Summary: WAP-based e-mail client
-Version: 0.9.2
-Release: 3%{?dist}
+Version: 0.9.3
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpwapmail.sourceforge.net
@@ -93,6 +93,9 @@ fi
 
 
 %changelog
+* Wed Dec 30 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.9.3-1
+- update to 0.9.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpwapmail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Dec 2007 17:40:49 -0000	1.2
+++ sources	30 Dec 2009 16:09:51 -0000	1.3
@@ -1 +1 @@
-0d69a1ff69c06c8246a08acdad63de41  phpwapmail-0.9.2.tar.gz
+fec46307daff5f560093bc42dd58fdd7  phpwapmail-0.9.3.tar.gz



From buc at fedoraproject.org  Wed Dec 30 16:11:05 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 30 Dec 2009 16:11:05 +0000 (UTC)
Subject: rpms/phpwapmail/devel phpwapmail.spec,1.4,1.5
Message-ID: <20091230161105.9B52B11C00E9@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpwapmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21680

Modified Files:
	phpwapmail.spec 
Log Message:



Index: phpwapmail.spec
===================================================================
RCS file: /cvs/extras/rpms/phpwapmail/devel/phpwapmail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- phpwapmail.spec	30 Dec 2009 16:09:51 -0000	1.4
+++ phpwapmail.spec	30 Dec 2009 16:11:05 -0000	1.5
@@ -64,6 +64,7 @@ Alias /%{name} %{_datadir}/%{name}
   Order Deny,Allow
   Deny from all
   Allow from 127.0.0.1
+  Allow from ::1
 </Directory>
 
 EOF



From buc at fedoraproject.org  Wed Dec 30 16:25:06 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 30 Dec 2009 16:25:06 +0000 (UTC)
Subject: rpms/phpwapmail/F-12 phpwapmail.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091230162506.35D8D11C00E9@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpwapmail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25079

Modified Files:
	phpwapmail.spec sources 
Log Message:
update to 0.9.3



Index: phpwapmail.spec
===================================================================
RCS file: /cvs/extras/rpms/phpwapmail/F-12/phpwapmail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- phpwapmail.spec	26 Jul 2009 18:40:16 -0000	1.3
+++ phpwapmail.spec	30 Dec 2009 16:25:04 -0000	1.4
@@ -1,7 +1,7 @@
 Name: phpwapmail
 Summary: WAP-based e-mail client
-Version: 0.9.2
-Release: 3%{?dist}
+Version: 0.9.3
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpwapmail.sourceforge.net
@@ -64,6 +64,7 @@ Alias /%{name} %{_datadir}/%{name}
   Order Deny,Allow
   Deny from all
   Allow from 127.0.0.1
+  Allow from ::1
 </Directory>
 
 EOF
@@ -93,6 +94,9 @@ fi
 
 
 %changelog
+* Wed Dec 30 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.9.3-1
+- update to 0.9.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpwapmail/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Dec 2007 17:40:49 -0000	1.2
+++ sources	30 Dec 2009 16:25:05 -0000	1.3
@@ -1 +1 @@
-0d69a1ff69c06c8246a08acdad63de41  phpwapmail-0.9.2.tar.gz
+fec46307daff5f560093bc42dd58fdd7  phpwapmail-0.9.3.tar.gz



From buc at fedoraproject.org  Wed Dec 30 16:26:40 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 30 Dec 2009 16:26:40 +0000 (UTC)
Subject: rpms/phpwapmail/F-11 phpwapmail.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091230162640.7E8EF11C00E9@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpwapmail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25481

Modified Files:
	phpwapmail.spec sources 
Log Message:
update to 0.9.3



Index: phpwapmail.spec
===================================================================
RCS file: /cvs/extras/rpms/phpwapmail/F-11/phpwapmail.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- phpwapmail.spec	26 Feb 2009 22:51:02 -0000	1.2
+++ phpwapmail.spec	30 Dec 2009 16:26:40 -0000	1.3
@@ -1,7 +1,7 @@
 Name: phpwapmail
 Summary: WAP-based e-mail client
-Version: 0.9.2
-Release: 2%{?dist}
+Version: 0.9.3
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpwapmail.sourceforge.net
@@ -64,6 +64,7 @@ Alias /%{name} %{_datadir}/%{name}
   Order Deny,Allow
   Deny from all
   Allow from 127.0.0.1
+  Allow from ::1
 </Directory>
 
 EOF
@@ -93,6 +94,9 @@ fi
 
 
 %changelog
+* Wed Dec 30 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.9.3-1
+- update to 0.9.3
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpwapmail/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Dec 2007 17:40:49 -0000	1.2
+++ sources	30 Dec 2009 16:26:40 -0000	1.3
@@ -1 +1 @@
-0d69a1ff69c06c8246a08acdad63de41  phpwapmail-0.9.2.tar.gz
+fec46307daff5f560093bc42dd58fdd7  phpwapmail-0.9.3.tar.gz



From remi at fedoraproject.org  Wed Dec 30 16:36:39 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 30 Dec 2009 16:36:39 +0000 (UTC)
Subject: File Mail_Mime-1.5.3.tgz uploaded to lookaside cache by remi
Message-ID: <20091230163639.70E3A10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for php-pear-Mail-Mime:

bc2ba060efca4f23e2651d682fa985ef  Mail_Mime-1.5.3.tgz



From remi at fedoraproject.org  Wed Dec 30 16:38:02 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 30 Dec 2009 16:38:02 +0000 (UTC)
Subject: rpms/php-pear-Mail-Mime/devel .cvsignore, 1.4,
	1.5 php-pear-Mail-Mime.spec, 1.8, 1.9 sources, 1.4,
	1.5 PHP-LICENSE-3.01, 1.1, NONE
Message-ID: <20091230163802.52FDB11C00E9@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Mail-Mime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28375

Modified Files:
	.cvsignore php-pear-Mail-Mime.spec sources 
Removed Files:
	PHP-LICENSE-3.01 
Log Message:
update to 1.5.3 + spec cleanup


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Sep 2007 05:48:24 -0000	1.4
+++ .cvsignore	30 Dec 2009 16:38:01 -0000	1.5
@@ -1 +1 @@
-Mail_Mime-1.5.2.tgz
+Mail_Mime-1.5.3.tgz


Index: php-pear-Mail-Mime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/devel/php-pear-Mail-Mime.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-pear-Mail-Mime.spec	26 Jul 2009 18:20:33 -0000	1.8
+++ php-pear-Mail-Mime.spec	30 Dec 2009 16:38:02 -0000	1.9
@@ -1,21 +1,20 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-Mime
-Version:	1.5.2
-Release:	6%{?dist}
+Version:	1.5.3
+Release:	1%{?dist}
 Summary:	Classes to create and decode mime messages
 
 Group:		Development/Libraries
-License:	PHP
+License:	BSD
 URL:		http://pear.php.net/package/Mail_Mime
 Source0:	http://pear.php.net/get/Mail_Mime-%{version}.tgz
-Source1:	PHP-LICENSE-3.01
+
 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.6.0
-Requires:	php-pear(Mail_mimeDecode)
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
 Provides:	php-pear(Mail_Mime) = %{version}
@@ -26,42 +25,57 @@ a simple API for creating such emails, t
 suffice. Else you can use Mail_mimePart, which gives you better control about
 MIME creation
 
+
 %prep
-%setup -q -c -n Mail_Mime-%{version}
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml Mail_Mime-%{version}/Mail_Mime.xml
+%setup -q -c 
+# package.xml is v2
+mv package.xml Mail_Mime-%{version}/%{name}.xml
+
 
-# Empty build section, nothing required
 %build
+# Empty build section, nothing required
+
 
 %install
 rm -rf %{buildroot} docdir
 
 cd Mail_Mime-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Mail_Mime.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
 mkdir -p docdir
 mv %{buildroot}%{pear_docdir}/* docdir
-%{__install} -m 644 -c %{SOURCE1} docdir/Mail_Mime/LICENSE
+
+sed -i -e 's:@prefix@:%{_prefix}:' docdir/Mail_Mime/scripts/phail.php
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 Mail_Mime.xml %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
 
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_xmldir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+# For documentation purpose only
+# After install, as root :
+# pear run-tests -p Mail_Mime
+# Should return (1.5.3)
+# 24 PASSED TESTS
+# 1 SKIPPED TESTS
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Mail_Mime.xml >/dev/null ||:
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null ||:
+
 
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
@@ -69,15 +83,24 @@ if [ "$1" -eq "0" ]; then
 	%{__pear} uninstall --nodeps --ignore-errors --register-only Mail_Mime >/dev/null ||:
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc Mail_Mime-%{version}/docdir/Mail_Mime/*
-%{pear_xmldir}/Mail_Mime.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/Mail_Mime
 %{pear_datadir}/Mail_Mime
 %{pear_phpdir}/Mail
 
+
 %changelog
+* Wed Dec 30 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.3-1
+- update to new upstream version
+- remove circular dependency on Mail_mimeDecode
+- rename Mail_Mime.xml to php-pear-Mail-Mime.xml
+- fix License (BSD, not PHP, since 1.4.0)
+- fix missing URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Sep 2007 05:48:24 -0000	1.4
+++ sources	30 Dec 2009 16:38:02 -0000	1.5
@@ -1 +1 @@
-30b931f620d880782ee8d5e454b51fdf  Mail_Mime-1.5.2.tgz
+bc2ba060efca4f23e2651d682fa985ef  Mail_Mime-1.5.3.tgz


--- PHP-LICENSE-3.01 DELETED ---



From remi at fedoraproject.org  Wed Dec 30 16:44:21 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 30 Dec 2009 16:44:21 +0000 (UTC)
Subject: rpms/php-pear-Mail-Mime/F-12 php-pear-Mail-Mime.spec, 1.8, 1.9 sources,
	1.4, 1.5 PHP-LICENSE-3.01, 1.1, NONE
Message-ID: <20091230164421.BCB4211C00E9@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Mail-Mime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29658

Modified Files:
	php-pear-Mail-Mime.spec sources 
Removed Files:
	PHP-LICENSE-3.01 
Log Message:
update to 1.5.3 + spec cleanup


Index: php-pear-Mail-Mime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/F-12/php-pear-Mail-Mime.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-pear-Mail-Mime.spec	26 Jul 2009 18:20:33 -0000	1.8
+++ php-pear-Mail-Mime.spec	30 Dec 2009 16:44:21 -0000	1.9
@@ -1,21 +1,20 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-Mime
-Version:	1.5.2
-Release:	6%{?dist}
+Version:	1.5.3
+Release:	1%{?dist}
 Summary:	Classes to create and decode mime messages
 
 Group:		Development/Libraries
-License:	PHP
+License:	BSD
 URL:		http://pear.php.net/package/Mail_Mime
 Source0:	http://pear.php.net/get/Mail_Mime-%{version}.tgz
-Source1:	PHP-LICENSE-3.01
+
 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.6.0
-Requires:	php-pear(Mail_mimeDecode)
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
 Provides:	php-pear(Mail_Mime) = %{version}
@@ -26,42 +25,57 @@ a simple API for creating such emails, t
 suffice. Else you can use Mail_mimePart, which gives you better control about
 MIME creation
 
+
 %prep
-%setup -q -c -n Mail_Mime-%{version}
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml Mail_Mime-%{version}/Mail_Mime.xml
+%setup -q -c 
+# package.xml is v2
+mv package.xml Mail_Mime-%{version}/%{name}.xml
+
 
-# Empty build section, nothing required
 %build
+# Empty build section, nothing required
+
 
 %install
 rm -rf %{buildroot} docdir
 
 cd Mail_Mime-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Mail_Mime.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
 mkdir -p docdir
 mv %{buildroot}%{pear_docdir}/* docdir
-%{__install} -m 644 -c %{SOURCE1} docdir/Mail_Mime/LICENSE
+
+sed -i -e 's:@prefix@:%{_prefix}:' docdir/Mail_Mime/scripts/phail.php
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 Mail_Mime.xml %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
 
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_xmldir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+# For documentation purpose only
+# After install, as root :
+# pear run-tests -p Mail_Mime
+# Should return (1.5.3)
+# 24 PASSED TESTS
+# 1 SKIPPED TESTS
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Mail_Mime.xml >/dev/null ||:
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null ||:
+
 
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
@@ -69,15 +83,24 @@ if [ "$1" -eq "0" ]; then
 	%{__pear} uninstall --nodeps --ignore-errors --register-only Mail_Mime >/dev/null ||:
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc Mail_Mime-%{version}/docdir/Mail_Mime/*
-%{pear_xmldir}/Mail_Mime.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/Mail_Mime
 %{pear_datadir}/Mail_Mime
 %{pear_phpdir}/Mail
 
+
 %changelog
+* Wed Dec 30 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.3-1
+- update to new upstream version
+- remove circular dependency on Mail_mimeDecode
+- rename Mail_Mime.xml to php-pear-Mail-Mime.xml
+- fix License (BSD, not PHP, since 1.4.0)
+- fix missing URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Sep 2007 05:48:24 -0000	1.4
+++ sources	30 Dec 2009 16:44:21 -0000	1.5
@@ -1 +1 @@
-30b931f620d880782ee8d5e454b51fdf  Mail_Mime-1.5.2.tgz
+bc2ba060efca4f23e2651d682fa985ef  Mail_Mime-1.5.3.tgz


--- PHP-LICENSE-3.01 DELETED ---



From remi at fedoraproject.org  Wed Dec 30 16:46:08 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 30 Dec 2009 16:46:08 +0000 (UTC)
Subject: rpms/php-pear-Mail-Mime/F-11 php-pear-Mail-Mime.spec, 1.7, 1.8 sources,
	1.4, 1.5 PHP-LICENSE-3.01, 1.1, NONE
Message-ID: <20091230164608.5FE0011C00E9@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Mail-Mime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30121

Modified Files:
	php-pear-Mail-Mime.spec sources 
Removed Files:
	PHP-LICENSE-3.01 
Log Message:
update to 1.5.3 + spec cleanup


Index: php-pear-Mail-Mime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/F-11/php-pear-Mail-Mime.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- php-pear-Mail-Mime.spec	26 Feb 2009 21:40:32 -0000	1.7
+++ php-pear-Mail-Mime.spec	30 Dec 2009 16:46:08 -0000	1.8
@@ -1,21 +1,20 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-Mime
-Version:	1.5.2
-Release:	5%{?dist}
+Version:	1.5.3
+Release:	1%{?dist}
 Summary:	Classes to create and decode mime messages
 
 Group:		Development/Libraries
-License:	PHP
+License:	BSD
 URL:		http://pear.php.net/package/Mail_Mime
 Source0:	http://pear.php.net/get/Mail_Mime-%{version}.tgz
-Source1:	PHP-LICENSE-3.01
+
 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.6.0
-Requires:	php-pear(Mail_mimeDecode)
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
 Provides:	php-pear(Mail_Mime) = %{version}
@@ -26,42 +25,57 @@ a simple API for creating such emails, t
 suffice. Else you can use Mail_mimePart, which gives you better control about
 MIME creation
 
+
 %prep
-%setup -q -c -n Mail_Mime-%{version}
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml Mail_Mime-%{version}/Mail_Mime.xml
+%setup -q -c 
+# package.xml is v2
+mv package.xml Mail_Mime-%{version}/%{name}.xml
+
 
-# Empty build section, nothing required
 %build
+# Empty build section, nothing required
+
 
 %install
 rm -rf %{buildroot} docdir
 
 cd Mail_Mime-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Mail_Mime.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
 mkdir -p docdir
 mv %{buildroot}%{pear_docdir}/* docdir
-%{__install} -m 644 -c %{SOURCE1} docdir/Mail_Mime/LICENSE
+
+sed -i -e 's:@prefix@:%{_prefix}:' docdir/Mail_Mime/scripts/phail.php
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 Mail_Mime.xml %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
 
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_xmldir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+# For documentation purpose only
+# After install, as root :
+# pear run-tests -p Mail_Mime
+# Should return (1.5.3)
+# 24 PASSED TESTS
+# 1 SKIPPED TESTS
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Mail_Mime.xml >/dev/null ||:
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null ||:
+
 
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
@@ -69,15 +83,24 @@ if [ "$1" -eq "0" ]; then
 	%{__pear} uninstall --nodeps --ignore-errors --register-only Mail_Mime >/dev/null ||:
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc Mail_Mime-%{version}/docdir/Mail_Mime/*
-%{pear_xmldir}/Mail_Mime.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/Mail_Mime
 %{pear_datadir}/Mail_Mime
 %{pear_phpdir}/Mail
 
+
 %changelog
+* Wed Dec 30 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.3-1
+- update to new upstream version
+- remove circular dependency on Mail_mimeDecode
+- rename Mail_Mime.xml to php-pear-Mail-Mime.xml
+- fix License (BSD, not PHP, since 1.4.0)
+- fix missing URL
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Sep 2007 05:48:24 -0000	1.4
+++ sources	30 Dec 2009 16:46:08 -0000	1.5
@@ -1 +1 @@
-30b931f620d880782ee8d5e454b51fdf  Mail_Mime-1.5.2.tgz
+bc2ba060efca4f23e2651d682fa985ef  Mail_Mime-1.5.3.tgz


--- PHP-LICENSE-3.01 DELETED ---



From pghmcfc at fedoraproject.org  Wed Dec 30 16:50:44 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 30 Dec 2009 16:50:44 +0000 (UTC)
Subject: File bluefish-2.0.0-rc1.tar.bz2 uploaded to lookaside cache by pghmcfc
Message-ID: <20091230165044.B005610F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for bluefish:

e1c1ee287b21daa336425caa1cca1b70  bluefish-2.0.0-rc1.tar.bz2



From rjones at fedoraproject.org  Wed Dec 30 17:27:09 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 17:27:09 +0000 (UTC)
Subject: rpms/virt-top/devel virt-top.spec,1.9,1.10
Message-ID: <20091230172709.28FE311C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/virt-top/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6612

Modified Files:
	virt-top.spec 
Log Message:
Force rebuild against latest ocaml-gettext 0.3.3 (RHBZ#508197#c10).


Index: virt-top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/devel/virt-top.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- virt-top.spec	5 Oct 2009 15:36:15 -0000	1.9
+++ virt-top.spec	30 Dec 2009 17:27:08 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           virt-top
 Version:        1.0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 
 Group:          Development/Libraries
@@ -28,7 +28,7 @@ BuildRequires:  ocaml-calendar-devel
 BuildRequires:  ocaml-libvirt-devel
 
 # Tortuous list of BRs for gettext.
-BuildRequires:  ocaml-gettext-devel >= 0.3.0
+BuildRequires:  ocaml-gettext-devel >= 0.3.3
 BuildRequires:  ocaml-fileutils-devel
 %ifnarch ppc64
 BuildRequires:  ocaml-camomile-data
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-3
+- Force rebuild against latest ocaml-gettext 0.3.3 (RHBZ#508197#c10).
+
 * Mon Oct  5 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-2
 - New upstream release 1.0.4.
 - Includes new translations (RHBZ#493799).



From jdennis at fedoraproject.org  Wed Dec 30 17:28:29 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Wed, 30 Dec 2009 17:28:29 +0000 (UTC)
Subject: rpms/freeradius/F-12 freeradius.spec,1.87,1.88
Message-ID: <20091230172829.9693511C00E9@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6957

Modified Files:
	freeradius.spec 
Log Message:
clean up numerous spec file issues



Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-12/freeradius.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- freeradius.spec	16 Sep 2009 12:21:41 -0000	1.87
+++ freeradius.spec	30 Dec 2009 17:28:29 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.7
-Release: 2%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -11,10 +11,11 @@ Source100: freeradius-radiusd-init
 Source102: freeradius-logrotate
 Source103: freeradius-pam-conf
 
-Obsoletes: freeradius-dialupadmin >= 2.0 freeradius-dialupadmin-ldap >= 2.0
-Obsoletes: freeradius-dialupadmin-mysql >= 2.0 freeradius-dialupadmin-postgresql >= 2.0
+Obsoletes: freeradius-devel
+Obsoletes: freeradius-libs
 
 %define docdir %{_docdir}/freeradius-%{version}
+%define initddir %{?_initddir:%{_initddir}}%{!?_initddir:%{_initrddir}}
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,8 +32,7 @@ BuildRequires: readline-devel
 BuildRequires: libpcap-devel
 
 Requires(pre): shadow-utils glibc-common
-Requires(post): /sbin/ldconfig /sbin/chkconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 
 %description
@@ -50,17 +50,10 @@ more.  Using RADIUS allows authenticatio
 be centralized, and minimizes the amount of re-configuration which has to be
 done when adding or deleting new users.
 
-%package libs
-Group: System Environment/Daemons
-Summary: FreeRADIUS shared libraries
-
-%description libs
-The FreeRADIUS shared library
-
 %package utils
 Group: System Environment/Daemons
 Summary: FreeRADIUS utilities
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: libpcap >= 0.9.4
 
 %description utils
@@ -72,19 +65,10 @@ of the server, and let you decide if the
 Support for RFC and VSA Attributes Additional server configuration
 attributes Selecting a particular configuration Authentication methods
 
-%package devel
-Group: Development/Libraries
-Summary: FreeRADIUS Development Files
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-These are the static libraries for the FreeRADIUS package.
-
-
 %package ldap
 Summary: LDAP support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: openldap-devel
 
 %description ldap
@@ -93,7 +77,7 @@ This plugin provides the LDAP support fo
 %package krb5
 Summary: Kerberos 5 support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: krb5-devel
 
 %description krb5
@@ -102,13 +86,15 @@ This plugin provides the Kerberos 5 supp
 %package perl
 Summary: Perl support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-%if 0%{?fedora}
-BuildRequires: perl-devel
-%else
+%{?fedora:BuildRequires: perl-devel}
+%if 0%{?rhel} <= 5
 BuildRequires: perl
 %endif
+%if 0%{?rhel} >= 6
+BuildRequires: perl-devel
+%endif
 BuildRequires: perl(ExtUtils::Embed)
 
 %description perl
@@ -117,7 +103,7 @@ This plugin provides the Perl support fo
 %package python
 Summary: Python support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: python-devel
 
 %description python
@@ -126,25 +112,25 @@ This plugin provides the Python support 
 %package mysql
 Summary: MySQL support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: mysql-devel
 
 %description mysql
 This plugin provides the MySQL support for the FreeRADIUS server project.
 
 %package postgresql
-Summary: postgresql support for freeradius
+Summary: Postgresql support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: postgresql-devel
 
 %description postgresql
 This plugin provides the postgresql support for the FreeRADIUS server project.
 
 %package unixODBC
-Summary: unixODBC support for freeradius
+Summary: Unix ODBC support for freeradius
 Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: unixODBC-devel
 
 %description unixODBC
@@ -153,6 +139,8 @@ This plugin provides the unixODBC suppor
 
 %prep
 %setup -q -n freeradius-server-%{version}
+# Some source files mistakenly have execute permissions set
+find $RPM_BUILD_DIR/freeradius-server-%{version} \( -name '*.c' -o -name '*.h' \) -a -perm /0111 -exec chmod a-x {} +
 
 %build
 %ifarch s390 s390x
@@ -192,7 +180,6 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/var/run/radiusd
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{logrotate.d,pam.d,rc.d/init.d}
 mkdir -p $RPM_BUILD_ROOT/var/lib/radiusd
 # fix for bad libtool bug - can not rebuild dependent libs and bins
 #FIXME export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}
@@ -201,14 +188,13 @@ make install R=$RPM_BUILD_ROOT
 RADDB=$RPM_BUILD_ROOT%{_sysconfdir}/raddb
 perl -i -pe 's/^#user =.*$/user = radiusd/'   $RADDB/radiusd.conf
 perl -i -pe 's/^#group =.*$/group = radiusd/' $RADDB/radiusd.conf
-#ldconfig -n $RPM_BUILD_ROOT/usr/lib/freeradius
 # logs
 mkdir -p $RPM_BUILD_ROOT/var/log/radius/radacct
 touch $RPM_BUILD_ROOT/var/log/radius/{radutmp,radius.log}
 
-install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{_initrddir}/radiusd
-install -m 644 %{SOURCE102} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/radiusd
-install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/radiusd
+install -D -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{initddir}/radiusd
+install -D -m 644 %{SOURCE102} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/radiusd
+install -D -m 644 %{SOURCE103} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/radiusd
 
 # remove unneeded stuff
 rm -rf doc/00-OLD
@@ -221,13 +207,19 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialu
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/oracle
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/drivers/oracle
 
+# remove header files, we don't ship a devel package and the 
+# headers have multilib conflicts
+rm -rf $RPM_BUILD_ROOT/%{_includedir}
+
 # remove unsupported config files
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/experimental.conf
 
 # install doc files omitted by standard install
-for f in COPYRIGHT CREDITS INSTALL LICENSE README; do
+for f in COPYRIGHT CREDITS INSTALL README; do
     cp $f $RPM_BUILD_ROOT/%{docdir}
 done
+cp LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.gpl
+cp src/lib/LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.lgpl
 
 # add Red Hat specific documentation
 cat >> $RPM_BUILD_ROOT/%{docdir}/REDHAT << EOF
@@ -252,61 +244,7 @@ getent group  radiusd >/dev/null || /usr
 getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
 exit 0
 
-%pre devel
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre krb5
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre ldap
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre libs
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre mysql
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre perl
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre postgresql
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre python
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre unixODBC
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-%pre utils
-getent group  radiusd >/dev/null || /usr/sbin/groupadd -r -g 95 radiusd
-getent passwd radiusd >/dev/null || /usr/sbin/useradd  -r -g radiusd -u 95 -c "radiusd user" -s /sbin/nologin radiusd > /dev/null 2>&1
-exit 0
-
-
-
-
 %post
-/sbin/ldconfig
 if [ $1 = 1 ]; then
   /sbin/chkconfig --add radiusd
 fi
@@ -322,7 +260,6 @@ fi
 if [ $1 -ge 1 ]; then
   /sbin/service radiusd condrestart >/dev/null 2>&1 || :
 fi
-/sbin/ldconfig
 
 
 %files
@@ -330,7 +267,7 @@ fi
 %doc %{docdir}/
 %config(noreplace) %{_sysconfdir}/pam.d/radiusd
 %config(noreplace) %{_sysconfdir}/logrotate.d/radiusd
-%config(noreplace) %{_initrddir}/radiusd
+%{initddir}/radiusd
 %dir %attr(755,radiusd,radiusd) /var/lib/radiusd
 # configs
 %dir %attr(755,root,radiusd) /etc/raddb
@@ -353,9 +290,9 @@ fi
 #%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/oracle/*
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/users
 %dir %attr(770,root,radiusd) /etc/raddb/certs
-/etc/raddb/certs/Makefile
-/etc/raddb/certs/README
-/etc/raddb/certs/xpextensions
+%config(noreplace) /etc/raddb/certs/Makefile
+%config(noreplace) /etc/raddb/certs/README
+%config(noreplace) /etc/raddb/certs/xpextensions
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/certs/*.cnf
 %attr(750,root,radiusd) /etc/raddb/certs/bootstrap
 %dir %attr(750,root,radiusd) /etc/raddb/sites-available
@@ -363,9 +300,9 @@ fi
 %dir %attr(750,root,radiusd) /etc/raddb/sites-enabled
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-enabled/*
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/eap.conf
-%attr(640,root,radiusd) /etc/raddb/example.pl
+%config(noreplace) %attr(640,root,radiusd) /etc/raddb/example.pl
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.conf
-/etc/raddb/policy.txt
+%config(noreplace) /etc/raddb/policy.txt
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/templates.conf
 %dir %attr(750,root,radiusd) /etc/raddb/modules
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/acct_unique
@@ -409,7 +346,7 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/sradutmp
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/unix
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/wimax
-%dir %attr(700,radiusd,radiusd) /var/run/radiusd/
+%dir %attr(755,radiusd,radiusd) /var/run/radiusd/
 # binaries
 %defattr(-,root,root)
 /usr/sbin/checkrad
@@ -454,8 +391,10 @@ fi
 # logs
 %dir %attr(700,radiusd,radiusd) /var/log/radius/
 %dir %attr(700,radiusd,radiusd) /var/log/radius/radacct/
-%attr(644,radiusd,radiusd) /var/log/radius/radutmp
-%config(noreplace) %attr(600,radiusd,radiusd) /var/log/radius/radius.log
+%ghost %attr(644,radiusd,radiusd) /var/log/radius/radutmp
+%ghost %attr(600,radiusd,radiusd) /var/log/radius/radius.log
+# RADIUS shared libs
+%attr(755,root,root) %{_libdir}/freeradius/lib*.so*
 # RADIUS Loadable Modules
 %dir %attr(755,root,root) %{_libdir}/freeradius
 #%attr(755,root,root) %{_libdir}/freeradius/rlm_*.so*
@@ -564,18 +503,6 @@ fi
 %doc %{_mandir}/man8/radsqlrelay.8.gz
 %doc %{_mandir}/man8/rlm_ippool_tool.8.gz
 
-%files libs
-# RADIU shared libs
-%defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/freeradius/lib*.so*
-
-%files devel
-%defattr(-,root,root)
-#%attr(644,root,root) %{_libdir}/freeradius/*.a
-#%attr(644,root,root) %{_libdir}/freeradius/*.la
-%dir %attr(755,radiusd,radiusd) /usr/include/freeradius
-%attr(644,root,root) /usr/include/freeradius/*.h
-
 %files krb5
 %defattr(-,root,root)
 %{_libdir}/freeradius/rlm_krb5.so
@@ -621,6 +548,33 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Wed Dec 30 2009 John Dennis <jdennis at redhat.com> - 2.1.7-7
+- Remove devel subpackage. It doesn't make much sense to have a devel package since
+  we don't ship libraries and it produces multilib conflicts.
+
+* Mon Dec 21 2009 John Dennis <jdennis at redhat.com> - 2.1.7-6
+- more spec file clean up from review comments
+- remove freeradius-libs subpackage, move libfreeradius-eap and
+  libfreeradius-radius into the main package
+- fix subpackage requires, change from freeradius-libs to main package
+- fix description of the devel subpackage, remove referene to non-shipped libs
+- remove execute permissions on src files included in debuginfo
+- remove unnecessary use of ldconfig
+- since all sub-packages now require main package remove user creation for sub-packages
+- also include the LGPL library license file in addition to the GPL license file
+- fix BuildRequires for perl so it's compatible with both Fedora, RHEL5 and RHEL6
+
+* Mon Dec 21 2009 John Dennis <jdennis at redhat.com> - 2.1.7-5
+- fix various rpmlint issues.
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.1.7-4
+- rebuild against perl 5.10.1
+
+* Thu Dec  3 2009 John Dennis <jdennis at redhat.com> - 2.1.7-3
+- resolves: bug #522111 non-conformant initscript
+  also change permission of /var/run/radiusd from 0700 to 0755
+  so that "service radiusd status" can be run as non-root
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.7-2
 - use password-auth common PAM configuration instead of system-auth
 



From cwickert at fedoraproject.org  Wed Dec 30 17:32:42 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 30 Dec 2009 17:32:42 +0000 (UTC)
Subject: rpms/xfce4-panel/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 xfce4-panel.spec, 1.42, 1.43
Message-ID: <20091230173242.9DC8F11C00E9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8003

Modified Files:
	.cvsignore sources xfce4-panel.spec 
Log Message:
* Wed Dec 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
- Update to 4.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	17 Oct 2009 00:36:02 -0000	1.16
+++ .cvsignore	30 Dec 2009 17:32:42 -0000	1.17
@@ -1 +1 @@
-xfce4-panel-4.6.2.tar.bz2
+xfce4-panel-4.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	17 Oct 2009 00:36:02 -0000	1.16
+++ sources	30 Dec 2009 17:32:42 -0000	1.17
@@ -1 +1 @@
-88352816c84cbea57121b0c478976976  xfce4-panel-4.6.2.tar.bz2
+0b715abb929220f136483ccd7303ff62  xfce4-panel-4.6.3.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xfce4-panel.spec	17 Oct 2009 00:36:02 -0000	1.42
+++ xfce4-panel.spec	30 Dec 2009 17:32:42 -0000	1.43
@@ -2,7 +2,7 @@
 
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.6.2
+Version: 4.6.3
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
@@ -127,6 +127,9 @@ fi
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Wed Dec 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+
 * Fri Oct 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.2-1
 - Update to 4.6.2
 - Drop explicit requires on Terminal and mousepad



From rjones at fedoraproject.org  Wed Dec 30 17:38:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 17:38:31 +0000 (UTC)
Subject: rpms/ocaml-fileutils/F-12 ocaml-fileutils.spec,1.9,1.10
Message-ID: <20091230173831.E988511C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-fileutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9773

Modified Files:
	ocaml-fileutils.spec 
Log Message:
Backport fileutils 0.4.0 from Rawhide to Fedora 12.


Index: ocaml-fileutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/F-12/ocaml-fileutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-fileutils.spec	25 Jul 2009 19:56:44 -0000	1.9
+++ ocaml-fileutils.spec	30 Dec 2009 17:38:31 -0000	1.10
@@ -2,14 +2,14 @@
 %define debug_package %{nil}
 
 Name:           ocaml-fileutils
-Version:        0.3.0
-Release:        11%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}.1
 Summary:        OCaml library for common file and filename operations
 
 Group:          Development/Libraries
 License:        LGPLv2 with exceptions
 URL:            http://www.gallu.homelinux.org/download/
-Source0:        http://www.gallu.homelinux.org/download/ocaml-fileutils-0.3.0.tar.gz
+Source0:        http://www.gallu.homelinux.org/download/ocaml-fileutils-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -17,6 +17,7 @@ BuildRequires:  ocaml
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
+BuildRequires:  ocaml-ounit-devel
 
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -46,29 +47,26 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-# The whole build system for this package is totally broken.
-# We build into a temporary directory then copy the files
-# to the right place.
-./configure --prefix=%{_prefix} --libdir=%{_libdir} \
-  --enable-ocamlfind \
-  --with-builddir=`pwd`/tmp
+%configure
 
 
 %build
-# Nothing: 'make' builds and installs.  Stupid!
+make
 
 
 %install
-# Go and do your broken stuff now ...
-rm -rf tmp
-make
-# make doc   (borked)
-
-# ... and copy the files to the right places.
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
-cp -r tmp/lib/fileutils $RPM_BUILD_ROOT%{_libdir}/ocaml
-rm -rf tmp
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+
+# Set htmldir to current directory, then copy the docs (in api/)
+# as a %doc rule.
+make htmldir=. install
+
+
+%check
+make test
 
 
 %clean
@@ -81,20 +79,29 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/fileutils
 %if %opt
 %exclude %{_libdir}/ocaml/fileutils/*.a
+%exclude %{_libdir}/ocaml/fileutils/*.cmx
 %exclude %{_libdir}/ocaml/fileutils/*.cmxa
 %endif
+%exclude %{_libdir}/ocaml/fileutils/*.ml
+%exclude %{_libdir}/ocaml/fileutils/*.mli
 
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING AUTHOR CHANGELOG README TODO
+%doc COPYING AUTHOR CHANGELOG README TODO api
 %if %opt
 %{_libdir}/ocaml/fileutils/*.a
+%{_libdir}/ocaml/fileutils/*.cmx
 %{_libdir}/ocaml/fileutils/*.cmxa
 %endif
+%{_libdir}/ocaml/fileutils/*.ml
+%{_libdir}/ocaml/fileutils/*.mli
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.0-1.fc12.1
+- Backport fileutils 0.4.0 from Rawhide to Fedora 12.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Dec 30 17:38:54 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 17:38:54 +0000 (UTC)
Subject: rpms/ocaml-gettext/F-12 ocaml-gettext.spec,1.12,1.13
Message-ID: <20091230173854.DFF6B11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-gettext/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9952

Modified Files:
	ocaml-gettext.spec 
Log Message:
Backport Rawhide package of 0.3.3 to Fedora 12.


Index: ocaml-gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-gettext/F-12/ocaml-gettext.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-gettext.spec	25 Jul 2009 19:57:17 -0000	1.12
+++ ocaml-gettext.spec	30 Dec 2009 17:38:54 -0000	1.13
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-gettext
-Version:        0.3.2
-Release:        9%{?dist}
+Version:        0.3.3
+Release:        1%{?dist}.1
 Summary:        OCaml library for i18n
 
 Group:          Development/Libraries
@@ -13,14 +13,11 @@ Source0:        http://sylvain.le-gall.n
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
-# Fix dynlink.cma now required with OCaml 3.11.0.
-Patch0:         ocaml-gettext-0.3.2-dynlink.patch
-
 BuildRequires:  ocaml >= 3.11.0-1
 BuildRequires:  ocaml-findlib-devel >= 1.2.1-3
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
-BuildRequires:  ocaml-fileutils-devel
+BuildRequires:  ocaml-fileutils-devel >= 0.4.0
 BuildRequires:  ocaml-camlidl-devel
 BuildRequires:  ocaml-ounit-devel
 BuildRequires:  docbook-style-xsl
@@ -66,7 +63,7 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 # BZ 446919.
-Requires:       ocaml-fileutils-devel
+Requires:       ocaml-fileutils-devel >= 0.4.0
 
 
 %description    devel
@@ -101,7 +98,6 @@ signature files for developing applicati
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -171,8 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/ocaml/gettext-stub/*.cmxa
 %exclude %{_libdir}/ocaml/gettext-stub/*.cmx
 %endif
+%exclude %{_libdir}/ocaml/gettext/*.ml
 %exclude %{_libdir}/ocaml/gettext/*.mli
-%exclude %{_libdir}/ocaml/gettext-stub/*.mli
+%exclude %{_libdir}/ocaml/gettext-stub/*.ml
 %{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/stublibs/*.so.owner
 
@@ -189,8 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/gettext-stub/*.cmxa
 %{_libdir}/ocaml/gettext-stub/*.cmx
 %endif
+%{_libdir}/ocaml/gettext/*.ml
 %{_libdir}/ocaml/gettext/*.mli
-%{_libdir}/ocaml/gettext-stub/*.mli
+%{_libdir}/ocaml/gettext-stub/*.ml
 %{_bindir}/ocaml-gettext
 %{_bindir}/ocaml-xgettext
 
@@ -221,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3.3-1.fc12.1
+- Backport Rawhide package of 0.3.3 to Fedora 12.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Dec 30 17:38:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 17:38:59 +0000
Subject: [pkgdb] fuse: donv has given up watchbugzilla
Message-ID: <20091230173855.89F0210F8D0@bastion.fedoraproject.org>

donv has given up the watchbugzilla acl on fuse (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From pkgdb at fedoraproject.org  Wed Dec 30 17:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 17:39:18 +0000
Subject: [pkgdb] fuse: donv has given up watchcommits
Message-ID: <20091230173903.7001010F8CD@bastion.fedoraproject.org>

donv has given up the watchcommits acl on fuse (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From pkgdb at fedoraproject.org  Wed Dec 30 17:39:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 17:39:06 +0000
Subject: [pkgdb] fuse: donv has requested commit
Message-ID: <20091230173905.2BDEB10F8D1@bastion.fedoraproject.org>

donv has requested the commit acl on fuse (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From pkgdb at fedoraproject.org  Wed Dec 30 17:39:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 17:39:10 +0000
Subject: [pkgdb] fuse: donv has given up commit
Message-ID: <20091230173909.3355F10F8D0@bastion.fedoraproject.org>

donv has given up the commit acl on fuse (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From pkgdb at fedoraproject.org  Wed Dec 30 17:39:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 17:39:35 +0000
Subject: [pkgdb] fuse: donv has requested commit
Message-ID: <20091230173920.95C4910F8CD@bastion.fedoraproject.org>

donv has requested the commit acl on fuse (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From pkgdb at fedoraproject.org  Wed Dec 30 17:39:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 30 Dec 2009 17:39:16 +0000
Subject: [pkgdb] fuse: donv has given up commit
Message-ID: <20091230173921.8B22F10F8CD@bastion.fedoraproject.org>

donv has given up the commit acl on fuse (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From rjones at fedoraproject.org  Wed Dec 30 17:42:07 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 17:42:07 +0000 (UTC)
Subject: rpms/ocaml-fileutils/F-12 .cvsignore, 1.2, 1.3 ocaml-fileutils.spec, 
	1.10, 1.11 sources, 1.2, 1.3
Message-ID: <20091230174207.E772A11C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-fileutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10726

Modified Files:
	.cvsignore ocaml-fileutils.spec sources 
Log Message:
Forgot to upload new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Feb 2008 18:40:38 -0000	1.2
+++ .cvsignore	30 Dec 2009 17:42:07 -0000	1.3
@@ -1 +1 @@
-ocaml-fileutils-0.3.0.tar.gz
+ocaml-fileutils-0.4.0.tar.gz


Index: ocaml-fileutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/F-12/ocaml-fileutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-fileutils.spec	30 Dec 2009 17:38:31 -0000	1.10
+++ ocaml-fileutils.spec	30 Dec 2009 17:42:07 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           ocaml-fileutils
 Version:        0.4.0
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        OCaml library for common file and filename operations
 
 Group:          Development/Libraries
@@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.0-1.fc12.1
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.0-1.fc12.2
 - Backport fileutils 0.4.0 from Rawhide to Fedora 12.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-11


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Feb 2008 18:40:38 -0000	1.2
+++ sources	30 Dec 2009 17:42:07 -0000	1.3
@@ -1 +1 @@
-a3c24bb6e928dc9deb8d8f7e30206057  ocaml-fileutils-0.3.0.tar.gz
+93437c0fe6fa0e02c30e87af6a0d4e14  ocaml-fileutils-0.4.0.tar.gz



From rjones at fedoraproject.org  Wed Dec 30 17:43:04 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 30 Dec 2009 17:43:04 +0000 (UTC)
Subject: rpms/ocaml-gettext/F-12 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 ocaml-gettext-0.3.2-dynlink.patch, 1.1, NONE
Message-ID: <20091230174304.0D6E311C00E9@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-gettext/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11122

Modified Files:
	.cvsignore sources 
Removed Files:
	ocaml-gettext-0.3.2-dynlink.patch 
Log Message:
Upload new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-gettext/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Jun 2008 15:48:46 -0000	1.5
+++ .cvsignore	30 Dec 2009 17:43:03 -0000	1.6
@@ -1 +1 @@
-ocaml-gettext-0.3.2.tar.gz
+ocaml-gettext-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-gettext/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Jun 2008 15:48:46 -0000	1.5
+++ sources	30 Dec 2009 17:43:03 -0000	1.6
@@ -1 +1 @@
-a68e0574f7a668d645503ffe466c3500  ocaml-gettext-0.3.2.tar.gz
+f1105a62770e6175490e79b803d59e0c  ocaml-gettext-0.3.3.tar.gz


--- ocaml-gettext-0.3.2-dynlink.patch DELETED ---



From jdennis at fedoraproject.org  Wed Dec 30 17:48:12 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Wed, 30 Dec 2009 17:48:12 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.93,1.94
Message-ID: <20091230174812.4CFB011C00E9@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12302

Modified Files:
	freeradius.spec 
Log Message:
Remove devel subpackage. It doesn't make much sense to have a devel package since
we don't ship libraries and it produces multilib conflicts.



Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- freeradius.spec	21 Dec 2009 21:45:37 -0000	1.93
+++ freeradius.spec	30 Dec 2009 17:48:12 -0000	1.94
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -11,6 +11,7 @@ Source100: freeradius-radiusd-init
 Source102: freeradius-logrotate
 Source103: freeradius-pam-conf
 
+Obsoletes: freeradius-devel
 Obsoletes: freeradius-libs
 
 %define docdir %{_docdir}/freeradius-%{version}
@@ -64,14 +65,6 @@ of the server, and let you decide if the
 Support for RFC and VSA Attributes Additional server configuration
 attributes Selecting a particular configuration Authentication methods
 
-%package devel
-Group: Development/Libraries
-Summary: FreeRADIUS Development Files
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Header files for the FreeRADIUS package.
-
 %package ldap
 Summary: LDAP support for freeradius
 Group: System Environment/Daemons
@@ -187,8 +180,6 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/var/run/radiusd
-mkdir -p $RPM_BUILD_ROOT/%{initddir}
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{logrotate.d,pam.d}
 mkdir -p $RPM_BUILD_ROOT/var/lib/radiusd
 # fix for bad libtool bug - can not rebuild dependent libs and bins
 #FIXME export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}
@@ -201,9 +192,9 @@ perl -i -pe 's/^#group =.*$/group = radi
 mkdir -p $RPM_BUILD_ROOT/var/log/radius/radacct
 touch $RPM_BUILD_ROOT/var/log/radius/{radutmp,radius.log}
 
-install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{initddir}/radiusd
-install -m 644 %{SOURCE102} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/radiusd
-install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/radiusd
+install -D -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{initddir}/radiusd
+install -D -m 644 %{SOURCE102} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/radiusd
+install -D -m 644 %{SOURCE103} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/radiusd
 
 # remove unneeded stuff
 rm -rf doc/00-OLD
@@ -216,6 +207,10 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialu
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/oracle
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/drivers/oracle
 
+# remove header files, we don't ship a devel package and the 
+# headers have multilib conflicts
+rm -rf $RPM_BUILD_ROOT/%{_includedir}
+
 # remove unsupported config files
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/experimental.conf
 
@@ -508,13 +503,6 @@ fi
 %doc %{_mandir}/man8/radsqlrelay.8.gz
 %doc %{_mandir}/man8/rlm_ippool_tool.8.gz
 
-%files devel
-%defattr(-,root,root)
-#%attr(644,root,root) %{_libdir}/freeradius/*.a
-#%attr(644,root,root) %{_libdir}/freeradius/*.la
-%dir %attr(755,root,root) /usr/include/freeradius
-%attr(644,root,root) /usr/include/freeradius/*.h
-
 %files krb5
 %defattr(-,root,root)
 %{_libdir}/freeradius/rlm_krb5.so
@@ -560,6 +548,10 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Wed Dec 30 2009 John Dennis <jdennis at redhat.com> - 2.1.7-7
+- Remove devel subpackage. It doesn't make much sense to have a devel package since
+  we don't ship libraries and it produces multilib conflicts.
+
 * Mon Dec 21 2009 John Dennis <jdennis at redhat.com> - 2.1.7-6
 - more spec file clean up from review comments
 - remove freeradius-libs subpackage, move libfreeradius-eap and



From jdennis at fedoraproject.org  Wed Dec 30 17:49:34 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Wed, 30 Dec 2009 17:49:34 +0000 (UTC)
Subject: File freeradius-server-2.1.8.tar.bz2 uploaded to lookaside cache by
	jdennis
Message-ID: <20091230174934.5D62410F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for freeradius:

d326525490bfba273471d77560471fcb  freeradius-server-2.1.8.tar.bz2



From jdennis at fedoraproject.org  Wed Dec 30 18:12:37 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Wed, 30 Dec 2009 18:12:37 +0000 (UTC)
Subject: rpms/freeradius/devel .cvsignore, 1.22, 1.23 freeradius.spec, 1.94,
	1.95 sources, 1.23, 1.24
Message-ID: <20091230181237.C631D11C00E9@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18518

Modified Files:
	.cvsignore freeradius.spec sources 
Log Message:
upgrade to latest upstream release (2.1.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	15 Sep 2009 14:47:18 -0000	1.22
+++ .cvsignore	30 Dec 2009 18:12:37 -0000	1.23
@@ -1 +1 @@
-freeradius-server-2.1.7.tar.bz2
+freeradius-server-2.1.8.tar.bz2


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- freeradius.spec	30 Dec 2009 17:48:12 -0000	1.94
+++ freeradius.spec	30 Dec 2009 18:12:37 -0000	1.95
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
-Version: 2.1.7
-Release: 7%{?dist}
+Version: 2.1.8
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -220,6 +220,7 @@ for f in COPYRIGHT CREDITS INSTALL READM
 done
 cp LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.gpl
 cp src/lib/LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.lgpl
+cp src/LICENSE.openssl $RPM_BUILD_ROOT/%{docdir}/LICENSE.openssl
 
 # add Red Hat specific documentation
 cat >> $RPM_BUILD_ROOT/%{docdir}/REDHAT << EOF
@@ -275,6 +276,7 @@ fi
 %attr(644,root,radiusd) %config(noreplace) /etc/raddb/dictionary
 %config(noreplace) /etc/raddb/acct_users
 %config(noreplace) /etc/raddb/attrs
+%config(noreplace) /etc/raddb/attrs.access_challenge
 %config(noreplace) /etc/raddb/attrs.access_reject
 %config(noreplace) /etc/raddb/attrs.accounting_response
 %config(noreplace) /etc/raddb/attrs.pre-proxy
@@ -330,6 +332,7 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mac2ip
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mac2vlan
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mschap
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/ntlm_auth
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/otp
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/pam
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/pap
@@ -548,6 +551,52 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Wed Dec 30 2009 John Dennis <jdennis at redhat.com> - 2.1.8-1
+- update to latest upstream
+  Feature improvements
+  * Print more descriptive error message for too many EAP sessions.
+    This gives hints on what to do when "failed to store handler"
+  * Commands received from radmin are now printed on stdout when
+    in debugging mode.
+  * Allow accounting packets to be written to a detail file, even
+    if they were read from a different detail file.
+  * Added OpenSSL license exception (src/LICENSE.openssl)
+
+  Bug fixes
+  * DHCP sockets can now set the broadcast flag before binding to a
+    socket.  You need to set "broadcast = yes" in the DHCP listener.
+  * Be more restrictive on string parsing in the config files
+  * Fix password length in scripts/create-users.pl
+  * Be more flexible about parsing the detail file.  This allows
+    it to read files where the attributes have been edited.
+  * Ensure that requests read from the detail file are cleaned up
+    (i.e. don't leak) if they are proxied without a response.
+  * Write the PID file after opening sockets, not before
+    (closes bug #29)
+  * Proxying large numbers of packets no longer gives error
+    "unable to open proxy socket".
+  * Avoid mutex locks in libc after fork
+  * Retry packet from detail file if there was no response.
+  * Allow old-style dictionary formats, where the vendor name is the
+    last field in an ATTRIBUTE definition.
+  * Removed all recursive use of mutexes.  Some systems just don't
+    support this.
+  * Allow !* to work as documented.
+  * make templates work (see templates.conf)
+  * Enabled "allow_core_dumps" to work again
+  * Print better errors when reading invalid dictionaries
+  * Sign client certificates with CA, rather than server certs.
+  * Fix potential crash in rlm_passwd when file was closed
+  * Fixed corner cases in conditional dynamic expansion.
+  * Use InnoDB for MySQL IP Pools, to gain transactional support
+  * Apply patch to libltdl for CVE-2009-3736.
+  * Fixed a few issues found by LLVM's static checker
+  * Keep track of "bad authenticators" for accounting packets
+  * Keep track of "dropped packets" for auth/acct packets
+  * Synced the "debian" directory with upstream
+  * Made "unlang" use unsigned 32-bit integers, to match the
+    dictionaries.
+
 * Wed Dec 30 2009 John Dennis <jdennis at redhat.com> - 2.1.7-7
 - Remove devel subpackage. It doesn't make much sense to have a devel package since
   we don't ship libraries and it produces multilib conflicts.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	15 Sep 2009 14:47:18 -0000	1.23
+++ sources	30 Dec 2009 18:12:37 -0000	1.24
@@ -1 +1 @@
-b8df6cf0c3df1dded205ad5f954feb78  freeradius-server-2.1.7.tar.bz2
+d326525490bfba273471d77560471fcb  freeradius-server-2.1.8.tar.bz2



From scop at fedoraproject.org  Wed Dec 30 18:16:56 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 30 Dec 2009 18:16:56 +0000 (UTC)
Subject: File vdradmin-am-3.6.5.tar.bz2 uploaded to lookaside cache by scop
Message-ID: <20091230181656.BA07D10F8D6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for vdradmin-am:

34ac04af6d1b0495f10cd06e85abb990  vdradmin-am-3.6.5.tar.bz2



From chitlesh at fedoraproject.org  Wed Dec 30 18:41:51 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 30 Dec 2009 18:41:51 +0000 (UTC)
Subject: File verilog-0.9.2.tar.gz uploaded to lookaside cache by chitlesh
Message-ID: <20091230184151.775C710F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for iverilog:

e3b3409f0a7aa382c0bfbb019655f647  verilog-0.9.2.tar.gz



From chitlesh at fedoraproject.org  Wed Dec 30 18:42:50 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 30 Dec 2009 18:42:50 +0000 (UTC)
Subject: rpms/iverilog/devel .cvsignore, 1.13, 1.14 import.log, 1.7,
	1.8 iverilog.spec, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <20091230184250.530C111C00E9@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26139/devel

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Dec 2009 06:47:14 -0000	1.13
+++ .cvsignore	30 Dec 2009 18:42:50 -0000	1.14
@@ -1 +1 @@
-verilog-20091212.tar.bz2
+verilog-0.9.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	14 Dec 2009 06:47:15 -0000	1.7
+++ import.log	30 Dec 2009 18:42:50 -0000	1.8
@@ -5,3 +5,4 @@ iverilog-0_9_20090423-5_fc11:HEAD:iveril
 iverilog-0_9_20091204-1_fc12:HEAD:iverilog-0.9.20091204-1.fc12.src.rpm:1259965837
 iverilog-0_9_20091205-1_fc12:HEAD:iverilog-0.9.20091205-1.fc12.src.rpm:1260018305
 iverilog-0_9_20091212-1_fc12:HEAD:iverilog-0.9.20091212-1.fc12.src.rpm:1260773067
+iverilog-0_9_20091230-1_fc12:HEAD:iverilog-0.9.20091230-1.fc12.src.rpm:1262198404


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/iverilog.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- iverilog.spec	14 Dec 2009 06:47:15 -0000	1.16
+++ iverilog.spec	30 Dec 2009 18:42:50 -0000	1.17
@@ -11,7 +11,7 @@
 # Please execute the testsuite as explained before pushed a new release to stable repos
 #
 
-%define      snapshot 20091212
+%define      snapshot 20091230
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
@@ -22,16 +22,19 @@ Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
 
-# Snapshot : git clone git://icarus.com/~steve-icarus/verilog
+# Development Snapshot Download :
+# git clone git://icarus.com/~steve-icarus/verilog
 # cd verilog
 # git checkout --track -b v0_9-branch origin/v0_9-branch
-Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+
+# This is the latest stable snapshot
+Source0:       ftp://ftp.icarus.com/pub/eda/verilog/v0.9/verilog-0.9.2.tar.gz
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
 BuildRequires: autoconf
- 
+
 
 %description
 Icarus Verilog is a Verilog compiler that generates a variety of
@@ -47,9 +50,9 @@ Requires:    %{name} = %{version}-%{rele
 Icarus Verilog devel files.
 
 %prep
-%setup -q -n verilog-%{snapshot}
+%setup -q -n verilog-0.9.2
 
-sh autoconf.sh
+#sh autoconf.sh
 
 # clean junks from tarball
 find . -type f -name ".git" -exec rm '{}' \;
@@ -103,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091230-1
+- New stable snapshot - 0.9.2
+
 * Sat Dec 12 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091212-1
 - New development snapshot - 0.9.2 final prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	14 Dec 2009 06:47:15 -0000	1.14
+++ sources	30 Dec 2009 18:42:50 -0000	1.15
@@ -1 +1 @@
-5626552cdba4f022613d4b978641f1f6  verilog-20091212.tar.bz2
+e3b3409f0a7aa382c0bfbb019655f647  verilog-0.9.2.tar.gz



From chitlesh at fedoraproject.org  Wed Dec 30 18:43:48 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 30 Dec 2009 18:43:48 +0000 (UTC)
Subject: rpms/iverilog/F-11 .cvsignore, 1.13, 1.14 import.log, 1.7,
	1.8 iverilog.spec, 1.15, 1.16 sources, 1.14, 1.15
Message-ID: <20091230184348.D30E311C00E9@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26533/F-11

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Dec 2009 06:42:50 -0000	1.13
+++ .cvsignore	30 Dec 2009 18:43:48 -0000	1.14
@@ -1 +1 @@
-verilog-20091212.tar.bz2
+verilog-0.9.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	14 Dec 2009 06:42:50 -0000	1.7
+++ import.log	30 Dec 2009 18:43:48 -0000	1.8
@@ -5,3 +5,4 @@ iverilog-0_9_20090423-5_fc11:F-11:iveril
 iverilog-0_9_20091204-1_fc12:F-11:iverilog-0.9.20091204-1.fc12.src.rpm:1259966454
 iverilog-0_9_20091205-1_fc12:F-11:iverilog-0.9.20091205-1.fc12.src.rpm:1260017424
 iverilog-0_9_20091212-1_fc12:F-11:iverilog-0.9.20091212-1.fc12.src.rpm:1260772739
+iverilog-0_9_20091230-1_fc12:F-11:iverilog-0.9.20091230-1.fc12.src.rpm:1262198483


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/iverilog.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- iverilog.spec	14 Dec 2009 06:42:50 -0000	1.15
+++ iverilog.spec	30 Dec 2009 18:43:48 -0000	1.16
@@ -11,7 +11,7 @@
 # Please execute the testsuite as explained before pushed a new release to stable repos
 #
 
-%define      snapshot 20091212
+%define      snapshot 20091230
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
@@ -22,16 +22,19 @@ Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
 
-# Snapshot : git clone git://icarus.com/~steve-icarus/verilog
+# Development Snapshot Download :
+# git clone git://icarus.com/~steve-icarus/verilog
 # cd verilog
 # git checkout --track -b v0_9-branch origin/v0_9-branch
-Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+
+# This is the latest stable snapshot
+Source0:       ftp://ftp.icarus.com/pub/eda/verilog/v0.9/verilog-0.9.2.tar.gz
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
 BuildRequires: autoconf
- 
+
 
 %description
 Icarus Verilog is a Verilog compiler that generates a variety of
@@ -47,9 +50,9 @@ Requires:    %{name} = %{version}-%{rele
 Icarus Verilog devel files.
 
 %prep
-%setup -q -n verilog-%{snapshot}
+%setup -q -n verilog-0.9.2
 
-sh autoconf.sh
+#sh autoconf.sh
 
 # clean junks from tarball
 find . -type f -name ".git" -exec rm '{}' \;
@@ -103,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091230-1
+- New stable snapshot - 0.9.2
+
 * Sat Dec 12 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091212-1
 - New development snapshot - 0.9.2 final prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	14 Dec 2009 06:42:50 -0000	1.14
+++ sources	30 Dec 2009 18:43:48 -0000	1.15
@@ -1 +1 @@
-5626552cdba4f022613d4b978641f1f6  verilog-20091212.tar.bz2
+e3b3409f0a7aa382c0bfbb019655f647  verilog-0.9.2.tar.gz



From chitlesh at fedoraproject.org  Wed Dec 30 18:44:41 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 30 Dec 2009 18:44:41 +0000 (UTC)
Subject: rpms/iverilog/F-12 .cvsignore, 1.13, 1.14 import.log, 1.7,
	1.8 iverilog.spec, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <20091230184441.F05B811C00E9@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/iverilog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26907/F-12

Modified Files:
	.cvsignore import.log iverilog.spec sources 
Log Message:
0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Dec 2009 06:44:35 -0000	1.13
+++ .cvsignore	30 Dec 2009 18:44:41 -0000	1.14
@@ -1 +1 @@
-verilog-20091212.tar.bz2
+verilog-0.9.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	14 Dec 2009 06:44:35 -0000	1.7
+++ import.log	30 Dec 2009 18:44:41 -0000	1.8
@@ -5,3 +5,4 @@ iverilog-0_9_20090423-5_fc11:HEAD:iveril
 iverilog-0_9_20091204-1_fc12:F-12:iverilog-0.9.20091204-1.fc12.src.rpm:1259966766
 iverilog-0_9_20091205-1_fc12:F-12:iverilog-0.9.20091205-1.fc12.src.rpm:1260018138
 iverilog-0_9_20091212-1_fc12:F-12:iverilog-0.9.20091212-1.fc12.src.rpm:1260772968
+iverilog-0_9_20091230-1_fc12:F-12:iverilog-0.9.20091230-1.fc12.src.rpm:1262198544


Index: iverilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/iverilog.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- iverilog.spec	14 Dec 2009 06:44:35 -0000	1.16
+++ iverilog.spec	30 Dec 2009 18:44:41 -0000	1.17
@@ -11,7 +11,7 @@
 # Please execute the testsuite as explained before pushed a new release to stable repos
 #
 
-%define      snapshot 20091212
+%define      snapshot 20091230
 
 Name:        iverilog
 Version:     0.9.%{snapshot}
@@ -22,16 +22,19 @@ Group:       Applications/Engineering
 License:     GPLv2
 URL:         http://www.icarus.com/eda/verilog/index.html
 
-# Snapshot : git clone git://icarus.com/~steve-icarus/verilog
+# Development Snapshot Download :
+# git clone git://icarus.com/~steve-icarus/verilog
 # cd verilog
 # git checkout --track -b v0_9-branch origin/v0_9-branch
-Source0:     ftp://icarus.com/pub/eda/verilog/snapshots/verilog-%{snapshot}.tar.bz2
+
+# This is the latest stable snapshot
+Source0:       ftp://ftp.icarus.com/pub/eda/verilog/v0.9/verilog-0.9.2.tar.gz
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel bzip2-devel bison flex gperf
 BuildRequires: autoconf
- 
+
 
 %description
 Icarus Verilog is a Verilog compiler that generates a variety of
@@ -47,9 +50,9 @@ Requires:    %{name} = %{version}-%{rele
 Icarus Verilog devel files.
 
 %prep
-%setup -q -n verilog-%{snapshot}
+%setup -q -n verilog-0.9.2
 
-sh autoconf.sh
+#sh autoconf.sh
 
 # clean junks from tarball
 find . -type f -name ".git" -exec rm '{}' \;
@@ -103,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091230-1
+- New stable snapshot - 0.9.2
+
 * Sat Dec 12 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.20091212-1
 - New development snapshot - 0.9.2 final prerelease snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iverilog/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	14 Dec 2009 06:44:35 -0000	1.14
+++ sources	30 Dec 2009 18:44:41 -0000	1.15
@@ -1 +1 @@
-5626552cdba4f022613d4b978641f1f6  verilog-20091212.tar.bz2
+e3b3409f0a7aa382c0bfbb019655f647  verilog-0.9.2.tar.gz



From kdudka at fedoraproject.org  Wed Dec 30 19:06:47 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 30 Dec 2009 19:06:47 +0000 (UTC)
Subject: rpms/curl/F-12 curl-7.19.7-ssl-timeout.patch, NONE, 1.1 curl.spec,
	1.130, 1.131
Message-ID: <20091230190647.F3FB111C00E9@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32185

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-ssl-timeout.patch 
Log Message:
- fix incorrect SSL recv/send timeout handling

curl-7.19.7-ssl-timeout.patch:
 nss.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE curl-7.19.7-ssl-timeout.patch ---
diff --git a/lib/nss.c b/lib/nss.c
index 51e62ee..c7c7e5f 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1353,8 +1353,8 @@ int Curl_nss_send(struct connectdata *conn,  /* connection data */
     err = PR_GetError();
 
     if(err == PR_IO_TIMEOUT_ERROR) {
-      failf(data, "SSL connection timeout");
-      return CURLE_OPERATION_TIMEDOUT;
+      failf(data, "SSL connection send timeout");
+      return -1;
     }
 
     failf(conn->data, "SSL write: error %d", err);
@@ -1394,8 +1394,8 @@ ssize_t Curl_nss_recv(struct connectdata * conn, /* connection data */
       return -1; /* basically EWOULDBLOCK */
     }
     if(err == PR_IO_TIMEOUT_ERROR) {
-      failf(data, "SSL connection timeout");
-      return CURLE_OPERATION_TIMEDOUT;
+      failf(data, "SSL connection receive timeout");
+      return -1;
     }
     failf(conn->data, "SSL read: errno %d", err);
     return -1;


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- curl.spec	9 Dec 2009 19:15:29 -0000	1.130
+++ curl.spec	30 Dec 2009 19:06:47 -0000	1.131
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -9,6 +9,7 @@ Source2: curlbuild.h
 Patch1: curl-7.19.7-modelfree.patch
 Patch2: curl-7.19.7-ssl-retry.patch
 Patch3: curl-7.19.7-nss-warning.patch
+Patch4: curl-7.19.7-ssl-timeout.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -82,6 +83,9 @@ use cURL's capabilities internally.
 %patch2 -p1
 %patch3 -p1
 
+# other patches
+%patch4 -p1
+
 # Fedora patches
 %patch101 -p1
 %patch102 -p1
@@ -183,6 +187,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 30 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-6
+- fix incorrect SSL recv/send timeout handling, patch contributed
+  by Kevin Baughman
+- http://permalink.gmane.org/gmane.comp.web.curl.library/26302
+
 * Wed Dec 09 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-5
 - use different port numbers for 32bit and 64bit builds
 - replace hard wired port numbers in the test suite



From kdudka at fedoraproject.org  Wed Dec 30 19:18:05 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 30 Dec 2009 19:18:05 +0000 (UTC)
Subject: rpms/curl/F-11 curl-7.19.7-ssl-timeout.patch, NONE, 1.1 curl.spec,
	1.101, 1.102
Message-ID: <20091230191805.70B1911C00E9@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2478

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-ssl-timeout.patch 
Log Message:
- fix incorrect SSL recv/send timeout handling

curl-7.19.7-ssl-timeout.patch:
 nss.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE curl-7.19.7-ssl-timeout.patch ---
diff --git a/lib/nss.c b/lib/nss.c
index 51e62ee..c7c7e5f 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1353,8 +1353,8 @@ int Curl_nss_send(struct connectdata *conn,  /* connection data */
     err = PR_GetError();
 
     if(err == PR_IO_TIMEOUT_ERROR) {
-      failf(data, "SSL connection timeout");
-      return CURLE_OPERATION_TIMEDOUT;
+      failf(data, "SSL connection send timeout");
+      return -1;
     }
 
     failf(conn->data, "SSL write: error %d", err);
@@ -1394,8 +1394,8 @@ ssize_t Curl_nss_recv(struct connectdata * conn, /* connection data */
       return -1; /* basically EWOULDBLOCK */
     }
     if(err == PR_IO_TIMEOUT_ERROR) {
-      failf(data, "SSL connection timeout");
-      return CURLE_OPERATION_TIMEDOUT;
+      failf(data, "SSL connection receive timeout");
+      return -1;
     }
     failf(conn->data, "SSL read: errno %d", err);
     return -1;


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-11/curl.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- curl.spec	26 Nov 2009 19:05:26 -0000	1.101
+++ curl.spec	30 Dec 2009 19:18:05 -0000	1.102
@@ -1,12 +1,13 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
 Patch1: curl-7.19.7-modelfree.patch
 Patch2: curl-7.19.7-ssl-retry.patch
+Patch3: curl-7.19.7-ssl-timeout.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -54,6 +55,9 @@ use cURL's capabilities internally.
 %patch1 -p1
 %patch2 -p1
 
+# other patches
+%patch3 -p1
+
 # Fedora patches
 %patch101 -p1
 %patch102 -p1
@@ -150,6 +154,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 30 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-4
+- fix incorrect SSL recv/send timeout handling, patch contributed
+  by Kevin Baughman
+- http://permalink.gmane.org/gmane.comp.web.curl.library/26302
+
 * Thu Nov 26 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-3
 - workaround for broken TLS servers (#525496, #527771)
 



From scop at fedoraproject.org  Wed Dec 30 19:32:40 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 30 Dec 2009 19:32:40 +0000 (UTC)
Subject: rpms/vdradmin-am/devel vdradmin-am-3.6.5-config.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 vdradmin-am.spec,
	1.17, 1.18 vdradmin-am-3.6.2-config.patch, 1.1, NONE
Message-ID: <20091230193240.7F61211C00E9@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdradmin-am/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5743

Modified Files:
	.cvsignore sources vdradmin-am.spec 
Added Files:
	vdradmin-am-3.6.5-config.patch 
Removed Files:
	vdradmin-am-3.6.2-config.patch 
Log Message:
* Wed Dec 30 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.6.5-1
- Update to 3.6.5.
- Log to syslog by default.


vdradmin-am-3.6.5-config.patch:
 vdradmind.pl |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE vdradmin-am-3.6.5-config.patch ---
--- vdradmind.pl~	2009-12-30 14:43:05.000000000 +0200
+++ vdradmind.pl	2009-12-30 20:07:06.000000000 +0200
@@ -94,7 +94,7 @@
 
 #use warnings;
 
-my $SEARCH_FILES_IN_SYSTEM    = 0;
+my $SEARCH_FILES_IN_SYSTEM    = 1;
 my $VDR_MAX_SVDRP_LENGTH      = 10000;                        # validate this value
 my $SUPPORTED_LOCALE_PREFIXES = "^(cs|de|en|es|fi|fr|it|nl|ru)_";
 
@@ -124,7 +124,7 @@
 my (%CONFIG, %CONFIG_TEMP);
 $CONFIG{LOGLEVEL}             = 4; #LOG_WARNING
 $CONFIG{LOGGING}              = 0;
-$CONFIG{LOGFILE}              = "vdradmind.log";
+$CONFIG{LOGFILE}              = "syslog";
 $CONFIG{MOD_GZIP}             = 0;
 $CONFIG{CACHE_BG_UPDATE}      = 1;
 $CONFIG{CACHE_TIMEOUT}        = 60;
@@ -142,7 +142,7 @@
 $CONFIG{LOCAL_NET}  = "0.0.0.0/32";
 $CONFIG{VIDEODIR}   = "/video";
 $CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}";
-$CONFIG{EPGIMAGES}  = "$CONFIG{VIDEODIR}/epgimages";
+$CONFIG{EPGIMAGES}  = "/usr/share/vdradmin/epgimages";
 
 #
 $CONFIG{TEMPLATE}   = "default";
@@ -203,9 +203,9 @@
 
 #
 $CONFIG{AT_SENDMAIL}    = 0;                       # set to 1 and set all the "MAIL_" things if you want email notification on new autotimers.
-$CONFIG{MAIL_FROM}      = "from\@address.tld";
+chomp($CONFIG{MAIL_FROM} = 'vdradmin@' . (`hostname -f 2>/dev/null` || "localhost.localdomain"));
 $CONFIG{MAIL_TO}        = "your\@email.address";
-$CONFIG{MAIL_SERVER}    = "your.email.server";
+$CONFIG{MAIL_SERVER}    = "localhost";
 $CONFIG{MAIL_AUTH_USER} = "";
 $CONFIG{MAIL_AUTH_PASS} = "";
 
@@ -269,10 +269,10 @@
     $USER_CSS      = "${BASENAME}user.css";
     bindtextdomain("vdradmin", "${BASENAME}locale");
 } else {
-    $ETCDIR        = "/etc/vdradmin";
+    $ETCDIR        = "/var/lib/vdradmin";
     $TEMPLATEDIR   = "/usr/share/vdradmin/template";
     $LOGDIR        = "/var/log";
-    $PIDFILE       = "/var/run/vdradmind.pid";
+    $PIDFILE       = "/var/run/vdradmin/vdradmind.pid";
     $CONFFILE      = "${ETCDIR}/vdradmind.conf";
     $AT_FILENAME   = "${ETCDIR}/vdradmind.at";
     $DONE_FILENAME = "${ETCDIR}/vdradmind.done";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Dec 2008 09:08:04 -0000	1.12
+++ .cvsignore	30 Dec 2009 19:32:40 -0000	1.13
@@ -1 +1 @@
-vdradmin-am-3.6.4.tar.bz2
+vdradmin-am-3.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	21 Dec 2008 09:08:05 -0000	1.12
+++ sources	30 Dec 2009 19:32:40 -0000	1.13
@@ -1 +1 @@
-ae3efed3f803d8524098f15a365c7838  vdradmin-am-3.6.4.tar.bz2
+34ac04af6d1b0495f10cd06e85abb990  vdradmin-am-3.6.5.tar.bz2


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- vdradmin-am.spec	27 Jul 2009 06:48:35 -0000	1.17
+++ vdradmin-am.spec	30 Dec 2009 19:32:40 -0000	1.18
@@ -3,8 +3,8 @@
 %define videodir  %(vdr-config --videodir  2>/dev/null || echo ERROR)
 
 Name:           vdradmin-am
-Version:        3.6.4
-Release:        4%{?dist}
+Version:        3.6.5
+Release:        1%{?dist}
 Summary:        Web interface for VDR
 
 Group:          Applications/Internet
@@ -15,14 +15,16 @@ Source0:        http://andreas.vdr-devel
 Source1:        %{name}.init
 Source2:        %{name}-httpd.conf
 Source3:        %{name}.rwtab
-Patch0:         %{name}-3.6.2-config.patch
+Patch0:         %{name}-3.6.5-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  vdr-devel >= 1.3.27-0.4
 BuildRequires:  gettext
+BuildRequires:  perl(HTTP::Date)
 BuildRequires:  perl(Locale::gettext)
 Requires:       perl(Locale::gettext)
+Requires:       perl(Sys::Syslog)
 Requires:       perl(Template::Plugin::JavaScript)
 Requires:       initscripts >= 8.22
 Requires(pre):  shadow-utils
@@ -71,7 +73,7 @@ cp -pR template $RPM_BUILD_ROOT/usr/shar
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
 cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 install -Dpm 640 vdradmind.conf $RPM_BUILD_ROOT/var/lib/vdradmin/vdradmind.conf
-install -dm 755 $RPM_BUILD_ROOT/var/{cache,log,run}/vdradmin
+install -dm 755 $RPM_BUILD_ROOT/var/{cache,run}/vdradmin
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/vdradmind
 chmod 755 $RPM_BUILD_ROOT%{_initrddir}/vdradmind
 install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
@@ -119,98 +121,101 @@ fi
 %dir /var/cache/vdradmin/
 %dir /var/lib/vdradmin/
 %config(noreplace) /var/lib/vdradmin/vdradmind.conf
-/var/log/vdradmin/
 %dir /var/run/vdradmin/
 %defattr(-,root,root,-)
 
 
 %changelog
+* Wed Dec 30 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.6.5-1
+- Update to 3.6.5.
+- Log to syslog by default.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Jul 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.6.4-3
+* Wed Jul 15 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.6.4-3
 - Add dependency on TT JavaScript plugin, some templates use it.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sun Dec 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 3.6.4-1
+* Sun Dec 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 3.6.4-1
 - 3.6.4, proctitle patch applied upstream.
 
-* Mon Jun 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 3.6.2-1
+* Mon Jun 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 3.6.2-1
 - 3.6.2.
 
-* Wed Dec 19 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.6.1-1
+* Wed Dec 19 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.6.1-1
 - 3.6.1.
 - Fix translation file permissions/ownership.
 
-* Fri Oct 12 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.6.0-2
+* Fri Oct 12 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.6.0-2
 - Clean up legacy cruft from init script.
 
-* Fri Sep 21 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.6.0-1
+* 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
+* Mon Aug 27 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.6.0-0.2.rc
 - 3.6.0rc.
 
-* Sat Aug 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.6.0-0.1.beta
+* Sat Aug 18 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.6.0-0.1.beta
 - 3.6.0beta.
 - Sync user/group creation scriptlet with current packaging guidelines.
 - Add LSB comment block to init script.
 - License: GPLv2+ and GPLv2
 
-* Mon Apr  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.5.3-2
+* Mon Apr  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.5.3-2
 - Use correct pid file in init script's daemon/killproc/status calls.
 - Add /sbin/chkconfig dependencies for scriptlets.
 
-* Thu Jan 25 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.5.3-1
+* Thu Jan 25 2007 Ville Skytt? <ville.skytta at iki.fi> - 3.5.3-1
 - 3.5.3.
 - Install UTF-8 locales too.
 - Fix default path to EPG images.
 
-* Fri Dec  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.5.2-1
+* Fri Dec  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.5.2-1
 - 3.5.2.
 
-* Sat Dec  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.5.1-1
+* Sat Dec  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.5.1-1
 - 3.5.1.
 - Add read only root/temporary state config.
 
-* Fri Nov 10 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.5.0-1
+* Fri Nov 10 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.5.0-1
 - 3.5.0, patch to retain autotimer functionality by default on upgrades.
 
-* Wed Oct 25 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.7-3
+* Wed Oct 25 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.7-3
 - Improve description (#211043).
 
-* Tue Oct 17 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.7-2
+* Tue Oct 17 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.7-2
 - Move compiled templates to /var/cache/vdradmin, clean them up on upgrades.
 - Drop no longer needed Obsoletes and Provides.
 - Prune pre-3.4.4 changelog entries.
 
-* Sat Sep 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.7-1
+* Sat Sep 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.7-1
 - 3.4.7.
 - Install optional Apache proxy snippet as doc, not in-place.
 
-* Tue Sep 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.6-3
+* Tue Sep 26 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.6-3
 - Redirect stdin and stdout to /dev/null in the init script.
 
-* Sun Jul 23 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.6-2
+* Sun Jul 23 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.6-2
 - Improve default config, enable VFAT compatiblity by default.
 
-* Fri Jul 14 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.6-1
+* Fri Jul 14 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.6-1
 - 3.4.6.
 - Clean up no longer relevant upgrade compat from %%post.
 
-* Thu May 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.5a-1
+* Thu May 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.5a-1
 - 3.4.5a.
 
-* Fri Apr  7 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.4-1
+* Fri Apr  7 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.4-1
 - 3.4.4.
 
-* Thu Mar 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.4-0.1.rc
+* Thu Mar 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.4-0.1.rc
 - 3.4.4rc.
 
-* Mon Mar 27 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.4-0.1.beta2
+* Mon Mar 27 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.4-0.1.beta2
 - 3.4.4beta2.
 
-* Wed Mar  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.4-0.1.beta
+* Wed Mar  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 3.4.4-0.1.beta
 - 3.4.4beta.


--- vdradmin-am-3.6.2-config.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Dec 30 19:35:08 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 19:35:08 +0000 (UTC)
Subject: rpms/audacious/devel audacious-2.2-disabled-iplugins.patch, NONE,
	1.1 audacious.spec, 1.58, 1.59
Message-ID: <20091230193508.BD67911C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6401

Modified Files:
	audacious.spec 
Added Files:
	audacious-2.2-disabled-iplugins.patch 
Log Message:
* Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
- Patch Audacious so that filename_find_decoder only considers
  enabled input plugins (disabled modplug plugin effectively disabled
  also the xmp plugin).


audacious-2.2-disabled-iplugins.patch:
 playlist-utils.c |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE audacious-2.2-disabled-iplugins.patch ---
diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2/src/audacious/playlist-utils.c
--- audacious-2.2-orig/src/audacious/playlist-utils.c	2009-11-22 23:43:47.000000000 +0100
+++ audacious-2.2/src/audacious/playlist-utils.c	2009-12-30 20:28:30.000000000 +0100
@@ -288,7 +288,7 @@
     InputPlugin * decoder = NULL;
     gchar * temp = g_strdup (filename);
     gchar * temp2;
-    GList * * index;
+    GList **list_hdr, *node;
 
     decoder = uri_get_plugin (temp);
 
@@ -308,11 +308,17 @@
     temp2 = g_ascii_strdown (temp2 + 1, -1);
     g_free (temp);
     temp = temp2;
+    list_hdr = g_hash_table_lookup (ext_hash, temp);
 
-    index = g_hash_table_lookup (ext_hash, temp);
-
-    if (index != NULL)
-        decoder = (* index)->data;
+    if (list_hdr != NULL) {
+        for (node = *list_hdr; node != NULL; node = g_list_next(node)) {
+            decoder = INPUT_PLUGIN(node->data);
+            if (decoder->enabled) {
+                break;
+            }
+            decoder = NULL;
+        }
+    }
 
 DONE:
      g_free (temp);


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- audacious.spec	2 Dec 2009 13:43:11 -0000	1.58
+++ audacious.spec	30 Dec 2009 19:35:08 -0000	1.59
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -13,6 +13,8 @@ URL: http://audacious-media-player.org/
 Group: Applications/Multimedia
 
 Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
+# not submitted upstream, code section is gone in post-2.2
+Patch0: audacious-2.2-disabled-iplugins.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,6 +72,7 @@ Files needed when building software for 
 %prep
 %setup -q -n %{name}-%{version}
 sed -i '\,^.SILENT:,d' buildsys.mk.in
+%patch0 -p1 -b .disabled-iplugins
 
 # From .desktop files remove MIME types the base build of the
 # Fedora audacious-plugins package does not understand.
@@ -184,6 +187,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
+- Patch Audacious so that filename_find_decoder only considers
+  enabled input plugins (disabled modplug plugin effectively disabled
+  also the xmp plugin).
+
 * Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
 - Drop Musepack and SID MIME types from desktop files. As of Audacious 2.2,
   Musepack is only supported by the separate "ffaudio" plugin. The SID



From mschwendt at fedoraproject.org  Wed Dec 30 19:40:53 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 19:40:53 +0000 (UTC)
Subject: rpms/audacious/F-12 audacious-2.2-disabled-iplugins.patch, NONE,
	1.1 audacious.spec, 1.57, 1.58
Message-ID: <20091230194053.1A6D511C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8094

Modified Files:
	audacious.spec 
Added Files:
	audacious-2.2-disabled-iplugins.patch 
Log Message:
sync with Rawhide

audacious-2.2-disabled-iplugins.patch:
 playlist-utils.c |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE audacious-2.2-disabled-iplugins.patch ---
diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2/src/audacious/playlist-utils.c
--- audacious-2.2-orig/src/audacious/playlist-utils.c	2009-11-22 23:43:47.000000000 +0100
+++ audacious-2.2/src/audacious/playlist-utils.c	2009-12-30 20:28:30.000000000 +0100
@@ -288,7 +288,7 @@
     InputPlugin * decoder = NULL;
     gchar * temp = g_strdup (filename);
     gchar * temp2;
-    GList * * index;
+    GList **list_hdr, *node;
 
     decoder = uri_get_plugin (temp);
 
@@ -308,11 +308,17 @@
     temp2 = g_ascii_strdown (temp2 + 1, -1);
     g_free (temp);
     temp = temp2;
+    list_hdr = g_hash_table_lookup (ext_hash, temp);
 
-    index = g_hash_table_lookup (ext_hash, temp);
-
-    if (index != NULL)
-        decoder = (* index)->data;
+    if (list_hdr != NULL) {
+        for (node = *list_hdr; node != NULL; node = g_list_next(node)) {
+            decoder = INPUT_PLUGIN(node->data);
+            if (decoder->enabled) {
+                break;
+            }
+            decoder = NULL;
+        }
+    }
 
 DONE:
      g_free (temp);


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- audacious.spec	30 Dec 2009 15:13:41 -0000	1.57
+++ audacious.spec	30 Dec 2009 19:40:52 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -13,6 +13,8 @@ URL: http://audacious-media-player.org/
 Group: Applications/Multimedia
 
 Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
+# not submitted upstream, code section is gone in post-2.2
+Patch0: audacious-2.2-disabled-iplugins.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,6 +72,7 @@ Files needed when building software for 
 %prep
 %setup -q -n %{name}-%{version}
 sed -i '\,^.SILENT:,d' buildsys.mk.in
+%patch0 -p1 -b .disabled-iplugins
 
 # From .desktop files remove MIME types the base build of the
 # Fedora audacious-plugins package does not understand.
@@ -184,6 +187,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
+- Patch Audacious so that filename_find_decoder only considers
+  enabled input plugins (disabled modplug plugin effectively disabled
+  also the xmp plugin).
+
 * Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
 - Drop Musepack and SID MIME types from desktop files. As of Audacious 2.2,
   Musepack is only supported by the separate "ffaudio" plugin. The SID



From jnovy at fedoraproject.org  Wed Dec 30 19:41:07 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 30 Dec 2009 19:41:07 +0000 (UTC)
Subject: File netpbm-10.47.07.tar.xz uploaded to lookaside cache by jnovy
Message-ID: <20091230194107.78B6B10F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for netpbm:

46d9573f83715692f9b0dfb84fcd0e7c  netpbm-10.47.07.tar.xz



From sayamind at fedoraproject.org  Wed Dec 30 19:45:43 2009
From: sayamind at fedoraproject.org (Sayamindu Dasgupta)
Date: Wed, 30 Dec 2009 19:45:43 +0000 (UTC)
Subject: File olpc-utils-1.0.16.tar.bz2 uploaded to lookaside cache by sayamind
Message-ID: <20091230194543.9F54310F8CC@bastion.fedoraproject.org>

A file has been added to the lookaside cache for olpc-utils:

89a9225bb50e6ee77b7b3c43388da720  olpc-utils-1.0.16.tar.bz2



From sayamind at fedoraproject.org  Wed Dec 30 19:50:58 2009
From: sayamind at fedoraproject.org (Sayamindu Dasgupta)
Date: Wed, 30 Dec 2009 19:50:58 +0000 (UTC)
Subject: rpms/olpc-utils/F-11 .cvsignore, 1.13, 1.14 olpc-utils.spec, 1.22,
	1.23 sources, 1.16, 1.17
Message-ID: <20091230195058.5199F11C00E9@cvs1.fedora.phx.redhat.com>

Author: sayamind

Update of /cvs/pkgs/rpms/olpc-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10450

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
Bump to v1.0.16 for disabling imsettings-daemon




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	27 Dec 2009 12:20:00 -0000	1.13
+++ .cvsignore	30 Dec 2009 19:50:58 -0000	1.14
@@ -1 +1 @@
-olpc-utils-1.0.15.tar.bz2
+olpc-utils-1.0.16.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- olpc-utils.spec	27 Dec 2009 12:20:00 -0000	1.22
+++ olpc-utils.spec	30 Dec 2009 19:50:58 -0000	1.23
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.15
+Version:    1.0.16
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -75,9 +75,13 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/X11/xorg-emu.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg-vmware.conf
 %config(noreplace) %{_sysconfdir}/skel/.xsession-example
+%config(noreplace) %{_sysconfdir}/skel/.config/autostart/imsettings-start.desktop
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Thu Dec 31 2009 Sayamindu Dasgupta <sayamindu at laptop.org> - 1.0.16-1
+- Bump to v1.0.16 for disabling imsettings-daemon
+
 * Sun Dec 27 2009 Daniel Drake <dsd at laptop.org> - 1.0.15-1
 - Bump to v1.0.15 to enable python optimizations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	27 Dec 2009 12:20:00 -0000	1.16
+++ sources	30 Dec 2009 19:50:58 -0000	1.17
@@ -1 +1 @@
-beabe4b0de36fda95399aa7bd4363182  olpc-utils-1.0.15.tar.bz2
+89a9225bb50e6ee77b7b3c43388da720  olpc-utils-1.0.16.tar.bz2



From sayamind at fedoraproject.org  Wed Dec 30 20:04:23 2009
From: sayamind at fedoraproject.org (Sayamindu Dasgupta)
Date: Wed, 30 Dec 2009 20:04:23 +0000 (UTC)
Subject: rpms/olpc-utils/devel .cvsignore, 1.15, 1.16 olpc-utils.spec, 1.25,
	1.26 sources, 1.17, 1.18
Message-ID: <20091230200423.CB94A11C00E9@cvs1.fedora.phx.redhat.com>

Author: sayamind

Update of /cvs/pkgs/rpms/olpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13716

Modified Files:
	.cvsignore olpc-utils.spec sources 
Log Message:
Bump to v1.0.16 for disabling imsettings-daemon




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Dec 2009 12:16:00 -0000	1.15
+++ .cvsignore	30 Dec 2009 20:04:23 -0000	1.16
@@ -1 +1 @@
-olpc-utils-1.0.15.tar.bz2
+olpc-utils-1.0.16.tar.bz2


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- olpc-utils.spec	27 Dec 2009 12:16:00 -0000	1.25
+++ olpc-utils.spec	30 Dec 2009 20:04:23 -0000	1.26
@@ -1,5 +1,5 @@
 Name:       olpc-utils
-Version:    1.0.15
+Version:    1.0.16
 Release:    1%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
@@ -82,9 +82,13 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/X11/xorg-emu.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg-vmware.conf
 %config(noreplace) %{_sysconfdir}/skel/.xsession-example
+%config(noreplace) %{_sysconfdir}/skel/.config/autostart/imsettings-start.desktop
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Thu Dec 31 2009 Sayamindu Dasgupta <sayamindu at laptop.org> - 1.0.16-1
+- Bump to v1.0.16 for disabling imsettings-daemon
+
 * Sun Dec 27 2009 Daniel Drake <dsd at laptop.org> - 1.0.15-1
 - Bump to v1.0.15 to enable python optimizations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	27 Dec 2009 12:16:00 -0000	1.17
+++ sources	30 Dec 2009 20:04:23 -0000	1.18
@@ -1 +1 @@
-beabe4b0de36fda95399aa7bd4363182  olpc-utils-1.0.15.tar.bz2
+89a9225bb50e6ee77b7b3c43388da720  olpc-utils-1.0.16.tar.bz2



From jnovy at fedoraproject.org  Wed Dec 30 20:07:49 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 30 Dec 2009 20:07:49 +0000 (UTC)
Subject: rpms/netpbm/devel .cvsignore, 1.62, 1.63 netpbm.spec, 1.151,
	1.152 sources, 1.66, 1.67 netpbm-pnmdepth.patch, 1.1,
	NONE netpbm-pnmsmooth-segfault.patch, 1.1, NONE
Message-ID: <20091230200749.2DEEE11C00E9@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14769

Modified Files:
	.cvsignore netpbm.spec sources 
Removed Files:
	netpbm-pnmdepth.patch netpbm-pnmsmooth-segfault.patch 
Log Message:
* Wed Dec 30 2009 Jindrich Novy <jnovy at redhat.com> 10.47.07-1
- update to 10.47.07



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	17 Dec 2009 07:40:49 -0000	1.62
+++ .cvsignore	30 Dec 2009 20:07:48 -0000	1.63
@@ -1 +1 @@
-netpbm-10.47.06.tar.xz
+netpbm-10.47.07.tar.xz


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- netpbm.spec	16 Dec 2009 18:35:47 -0000	1.151
+++ netpbm.spec	30 Dec 2009 20:07:48 -0000	1.152
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.47.06
+Version: 10.47.07
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -27,7 +27,6 @@ Patch13: netpbm-glibc.patch
 Patch14: netpbm-pnmtofiasco-stdin.patch
 Patch15: netpbm-svgtopam.patch
 Patch16: netpbm-ppmpat-segfault.patch
-Patch17: netpbm-pnmsmooth-segfault.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -85,7 +84,6 @@ netpbm-progs.  You'll also need to insta
 %patch14 -p1 -b .pnmtofiasco-stdin
 %patch15 -p1 -b .svgtopam
 %patch16 -p1 -b .ppmpat-segfault
-%patch17 -p1 -b .pnmsmooth-segfault
 
 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
@@ -214,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Dec 30 2009 Jindrich Novy <jnovy at redhat.com> 10.47.07-1
+- update to 10.47.07
+
 * Fri Dec 14 2009 Jindrich Novy <jnovy at redhat.com> 10.47.06-1
 - update to 10.47.06 - fixes the dumb pamtosvg mistake in 10.47.05
 - pnmmargin won't create leftovers in /tmp (#547888)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	17 Dec 2009 07:40:49 -0000	1.66
+++ sources	30 Dec 2009 20:07:49 -0000	1.67
@@ -1 +1 @@
-97501b0316de8257d904d16347ba7730  netpbm-10.47.06.tar.xz
+46d9573f83715692f9b0dfb84fcd0e7c  netpbm-10.47.07.tar.xz


--- netpbm-pnmdepth.patch DELETED ---


--- netpbm-pnmsmooth-segfault.patch DELETED ---



From nb at fedoraproject.org  Wed Dec 30 20:46:22 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed, 30 Dec 2009 20:46:22 +0000 (UTC)
Subject: File znc-0.078.tar.gz uploaded to lookaside cache by nb
Message-ID: <20091230204622.7197110F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for znc:

b1379bd6609353ebbc8df7ec19bd004f  znc-0.078.tar.gz



From mbroz at fedoraproject.org  Wed Dec 30 20:46:44 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Wed, 30 Dec 2009 20:46:44 +0000 (UTC)
Subject: File cryptsetup-1.1.0-rc4.tar.bz2 uploaded to lookaside cache by mbroz
Message-ID: <20091230204644.EE1BB10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for cryptsetup-luks:

c363949344edfb0343ae23e7f51a5f73  cryptsetup-1.1.0-rc4.tar.bz2



From mbroz at fedoraproject.org  Wed Dec 30 20:48:02 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Wed, 30 Dec 2009 20:48:02 +0000 (UTC)
Subject: rpms/cryptsetup-luks/devel .cvsignore, 1.17, 1.18 cryptsetup-luks.spec,
	1.74, 1.75 sources, 1.17, 1.18
Message-ID: <20091230204802.DB2F811C00E9@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24383

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
Update to cryptsetup 1.1.0-rc4




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	16 Nov 2009 23:18:17 -0000	1.17
+++ .cvsignore	30 Dec 2009 20:48:02 -0000	1.18
@@ -1 +1 @@
-cryptsetup-1.1.0-rc3.tar.bz2
+cryptsetup-1.1.0-rc4.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- cryptsetup-luks.spec	16 Nov 2009 23:18:17 -0000	1.74
+++ cryptsetup-luks.spec	30 Dec 2009 20:48:02 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.1.0
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
@@ -14,7 +14,7 @@ Obsoletes: cryptsetup <= 0.1
 Requires: cryptsetup-luks-libs = %{version}-%{release}
 
 %define _root_sbindir /sbin
-%define upstream_version %{version}-rc3
+%define upstream_version %{version}-rc4
 Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
@@ -89,6 +89,9 @@ popd 
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Dec 30 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.5
+- Update to cryptsetup 1.1.0-rc4
+
 * Mon Nov 16 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.4
 - Update to cryptsetup 1.1.0-rc3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	16 Nov 2009 23:18:17 -0000	1.17
+++ sources	30 Dec 2009 20:48:02 -0000	1.18
@@ -1 +1 @@
-ec18128afd25617a0fb2a45e4c55ae27  cryptsetup-1.1.0-rc3.tar.bz2
+c363949344edfb0343ae23e7f51a5f73  cryptsetup-1.1.0-rc4.tar.bz2



From rdieter at fedoraproject.org  Wed Dec 30 20:48:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Dec 2009 20:48:07 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.3.85-enum.patch, NONE,
	1.1 kdebindings.spec, 1.285, 1.286
Message-ID: <20091230204807.967D911C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24463

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.3.85-enum.patch 
Log Message:
* Wed Dec 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.95-4
- upstream enum patch


kdebindings-4.3.85-enum.patch:
 generatorvisitor.cpp |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE kdebindings-4.3.85-enum.patch ---
--- trunk/KDE/kdebindings/generator/generatorvisitor.cpp	2009/11/28 20:39:22	1055827
+++ trunk/KDE/kdebindings/generator/generatorvisitor.cpp	2009/12/23 20:51:15	1065619
@@ -257,7 +257,22 @@
         if (!nspace.isEmpty())
             nspace.pop_back();
     } while (!nspace.isEmpty());
-    
+
+    QStack<Class*> parentStack = klass;
+    while (!parentStack.isEmpty()) {
+        const Class* clazz = parentStack.pop();
+        foreach (const BasicTypeDeclaration* decl, clazz->children()) {
+            const Enum *e = 0;
+            if (!(e = dynamic_cast<const Enum*>(decl)))
+                continue;
+            foreach (const EnumMember& member, e->members()) {
+                if (member.name() == name) {
+                    return clazz->toString() + "::" + name;
+                }
+            }
+        }
+    }
+
     return QString();
 }
 


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- kdebindings.spec	23 Dec 2009 20:57:50 -0000	1.285
+++ kdebindings.spec	30 Dec 2009 20:48:07 -0000	1.286
@@ -31,7 +31,7 @@
 
 %define akonadi_version 1.2.80
 %define pykde4_akonadi 1
-%define pyqt4_version 4.6.1
+%define pyqt4_version 4.6.2
 
 %if 0%{?rhel}
 %define falcon 0
@@ -54,7 +54,7 @@
 
 Name: kdebindings
 Version: 4.3.85
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -71,6 +71,7 @@ Patch0:  kdebindings-4.3.85-qyoto_no_exa
 #          commit this upstream without further discussion.
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 ## upstream patches
+Patch100: kdebindings-4.3.85-enum.patch
 
 BuildRequires:  akonadi-devel >= %{akonadi_version} 
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -278,6 +279,7 @@ Falcon plugin for the Kross archtecture 
 %patch0 -p1 -b .qyoto_no_examples
 
 # upstream patches
+%patch100 -p3 -b .enum
 
 # do the no-rpath hack last, after the upstream backports (if any)
 %patch1 -p1 -b .no-rpath
@@ -545,6 +547,9 @@ fi
 
 
 %changelog
+* Wed Dec 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.95-4
+- upstream enum patch
+
 * Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
 - tarball respin, includes build-fix'es
 



From thm at fedoraproject.org  Wed Dec 30 20:52:23 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 30 Dec 2009 20:52:23 +0000 (UTC)
Subject: File lmms-0.4.6.stripped.tar.bz2 uploaded to lookaside cache by thm
Message-ID: <20091230205223.3617A10F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for lmms:

23e599158b60bc665b6715b68dd38185  lmms-0.4.6.stripped.tar.bz2



From nb at fedoraproject.org  Wed Dec 30 20:52:34 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed, 30 Dec 2009 20:52:34 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 znc.spec,
	1.24, 1.25
Message-ID: <20091230205234.D6AD711C00E9@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25797

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Upgrade to ZNC 0.078


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Dec 2009 05:48:27 -0000	1.13
+++ .cvsignore	30 Dec 2009 20:52:34 -0000	1.14
@@ -1 +1 @@
-znc-0.078-rc1.tar.gz
+znc-0.078.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	14 Dec 2009 05:48:28 -0000	1.14
+++ sources	30 Dec 2009 20:52:34 -0000	1.15
@@ -1 +1 @@
-57002305905f3e389492d46629bc7f40  znc-0.078-rc1.tar.gz
+b1379bd6609353ebbc8df7ec19bd004f  znc-0.078.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- znc.spec	14 Dec 2009 05:48:28 -0000	1.24
+++ znc.spec	30 Dec 2009 20:52:34 -0000	1.25
@@ -1,18 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.078
-Release:        0.2.rc1%{?dist}
+Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
-# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
-# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
-# Source0:        znc-0.077-1.svn1672.tar.bz2
-Source0:	http://people.znc.in/~psychon/znc/releases/znc-0.078-rc1.tar.gz
+Source0:        http://downloads.sourceforge.net/znc/znc-0.078.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  perl
+BuildRequires:  perl gcc-c++
 BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  c-ares-devel
@@ -130,8 +126,12 @@ chmod -x modules/q.cpp
 
 %changelog
 
+* Wed Dec 30 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-1
+- Update to znc 0.078
+
 * Sun Dec 13 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-0.1.rc1
 - Update to znc 0.078.rc1
+
 * Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
 - Users cloned via the admin module no longer automatically connect into IRC. (r1653)



From thm at fedoraproject.org  Wed Dec 30 20:55:24 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 30 Dec 2009 20:55:24 +0000 (UTC)
Subject: rpms/lmms/devel lmms-0.4.6-libdir.patch, NONE,
	1.1 lmms-0.4.6-libexecdir.patch, NONE,
	1.1 lmms-0.4.6-vst-nowine.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 README.fedora, 1.3, 1.4 import.log, 1.5, 1.6 lmms.spec, 1.8,
	1.9 sources, 1.6, 1.7 lmms-0.4.5-libdir.patch, 1.1,
	NONE lmms-0.4.5-libexecdir.patch, 1.1,
	NONE lmms-0.4.5-vst-nowine.patch, 1.1, NONE
Message-ID: <20091230205524.EBB5B11C00E9@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/lmms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26583/devel

Modified Files:
	.cvsignore README.fedora import.log lmms.spec sources 
Added Files:
	lmms-0.4.6-libdir.patch lmms-0.4.6-libexecdir.patch 
	lmms-0.4.6-vst-nowine.patch 
Removed Files:
	lmms-0.4.5-libdir.patch lmms-0.4.5-libexecdir.patch 
	lmms-0.4.5-vst-nowine.patch 
Log Message:
Update to 0.4.6.

lmms-0.4.6-libdir.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lmms-0.4.6-libdir.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig1 lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig1	2009-12-25 00:49:19.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:04:57.000000000 +0100
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})

lmms-0.4.6-libexecdir.patch:
 CMakeLists.txt                     |    2 +-
 plugins/vst_base/CMakeLists.txt    |    2 +-
 plugins/zynaddsubfx/CMakeLists.txt |    2 +-
 src/core/RemotePlugin.cpp          |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lmms-0.4.6-libexecdir.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig	2009-12-30 12:04:57.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:08:29.000000000 +0100
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
diff -up lmms-0.4.6/plugins/vst_base/CMakeLists.txt.orig lmms-0.4.6/plugins/vst_base/CMakeLists.txt
--- lmms-0.4.6/plugins/vst_base/CMakeLists.txt.orig	2009-12-25 00:49:23.000000000 +0100
+++ lmms-0.4.6/plugins/vst_base/CMakeLists.txt	2009-12-30 12:08:29.000000000 +0100
@@ -30,7 +30,7 @@ ADD_CUSTOM_COMMAND(
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES remote_vst_plugin.exe.so)
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${PLUGIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 
diff -up lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt.orig lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt
--- lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt.orig	2009-12-25 00:49:24.000000000 +0100
+++ lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt	2009-12-30 12:10:53.000000000 +0100
@@ -105,7 +105,7 @@ TARGET_LINK_LIBRARIES(zynaddsubfx ZynAdd
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI})
-INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR})
+INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
 TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a)
 ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
 
diff -up lmms-0.4.6/src/core/RemotePlugin.cpp.orig lmms-0.4.6/src/core/RemotePlugin.cpp
--- lmms-0.4.6/src/core/RemotePlugin.cpp.orig	2009-12-25 00:49:25.000000000 +0100
+++ lmms-0.4.6/src/core/RemotePlugin.cpp	2009-12-30 12:13:46.000000000 +0100
@@ -86,8 +86,8 @@ RemotePlugin::RemotePlugin( const QStrin
 	m_outputCount( DEFAULT_CHANNELS )
 {
 	lock();
-	QString exec = configManager::inst()->pluginDir() +
-					QDir::separator() + _plugin_executable;
+	QString exec = QString( LIBEXEC_DIR ) +
+		QDir::separator() + _plugin_executable;
 	QStringList args;
 	// swap in and out for bidirectional communication
 	args << QString::number( out()->shmKey() );

lmms-0.4.6-vst-nowine.patch:
 CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE lmms-0.4.6-vst-nowine.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig	2009-12-30 12:08:29.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:37:29.000000000 +0100
@@ -329,6 +329,9 @@ IF(LMMS_BUILD_WIN32)
 	SET(LMMS_SUPPORT_VST TRUE)
 	SET(STATUS_VST "OK")
 ENDIF(LMMS_BUILD_WIN32)
+IF(WANT_VST_NOWINE)
+	SET(LMMS_SUPPORT_VST TRUE)
+ENDIF(WANT_VST_NOWINE)
 
 
 # check for libsamplerate


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Sep 2009 21:21:19 -0000	1.5
+++ .cvsignore	30 Dec 2009 20:55:24 -0000	1.6
@@ -1 +1 @@
-lmms-0.4.5.stripped.tar.bz2
+lmms-0.4.6.stripped.tar.bz2


Index: README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/README.fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README.fedora	4 Sep 2009 21:21:19 -0000	1.3
+++ README.fedora	30 Dec 2009 20:55:24 -0000	1.4
@@ -1,254 +1,247 @@
 For legal reasons, the following files have been removed from the
 original tarfile:
 
-lmms-0.4.5/data/projects/tutorials/editing_note_volumes.mmp
-lmms-0.4.5/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
-lmms-0.4.5/data/projects/covers/MonkeyIsland1-Intro.mmpz
-lmms-0.4.5/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
-lmms-0.4.5/data/projects/oldstuff/MaxFellner-Ease.mmp
-lmms-0.4.5/data/projects/oldstuff/time_machine.mmp
-lmms-0.4.5/data/projects/oldstuff/Mart-Dirt_Track.mmp
-lmms-0.4.5/data/projects/oldstuff/1st.mmp
-lmms-0.4.5/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
-lmms-0.4.5/data/projects/demos/beat_collection.mmp
-lmms-0.4.5/data/projects/demos/demo5.mmp
-lmms-0.4.5/data/projects/demos/newFangled.mmpz
-lmms-0.4.5/data/projects/demos/TobyDox-Crystallo.mmp
-lmms-0.4.5/data/projects/demos/loop_collection.mmp
-lmms-0.4.5/data/projects/demos/demo1.mmp
-lmms-0.4.5/data/projects/demos/demo4.mmp
-lmms-0.4.5/data/projects/demos/demo3.mmp
-lmms-0.4.5/data/projects/demos/lb302quick.mmpz
-lmms-0.4.5/data/projects/demos/demo2.mmp
-lmms-0.4.5/data/projects/demos/demo6.mmp
-lmms-0.4.5/data/projects/demos/some_basslines.mmp
-lmms-0.4.5/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
-lmms-0.4.5/data/projects/cool_songs/MysthR-Living.mmpz
-lmms-0.4.5/data/projects/cool_songs/Siegel-DreamWave.mmp
-lmms-0.4.5/data/projects/cool_songs/Silva-ElvesCall.mmp
-lmms-0.4.5/data/projects/cool_songs/TobyDox-Psycho.mmp
-lmms-0.4.5/data/projects/cool_songs/Chris-RaveRiff.mmpz
-lmms-0.4.5/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
-lmms-0.4.5/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
-lmms-0.4.5/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
-lmms-0.4.5/data/projects/cool_songs/Chris-HorizonRemix.mmp
-lmms-0.4.5/data/projects/cool_songs/j1m-DingDong.mmp
-lmms-0.4.5/data/projects/cool_songs/Djeezus-BeatRolls.mmp
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
-lmms-0.4.5/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
-lmms-0.4.5/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
-lmms-0.4.5/data/projects/cool_songs/Malex-Horizon4.mmp
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-Underline.mmp
-lmms-0.4.5/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
-lmms-0.4.5/data/projects/cool_songs/SharkyX-Experiments.mmp
-lmms-0.4.5/data/projects/cool_songs/Skiessi-Onion.mmpz
-lmms-0.4.5/data/projects/cool_songs/TobyDox-Confused.mmp
-lmms-0.4.5/data/projects/cool_songs/Siegel-SpeedTrack.mmp
-lmms-0.4.5/data/projects/cool_songs/Djeezus-Oscilisous.mmp
-lmms-0.4.5/data/samples/latin/latin_brass01.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar03.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar01.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar02.ogg
-lmms-0.4.5/data/samples/shapes/technosynth3.wav
-lmms-0.4.5/data/samples/shapes/technosynth1.wav
-lmms-0.4.5/data/samples/shapes/technosynth2.wav
-lmms-0.4.5/data/samples/shapes/additive2.wav
-lmms-0.4.5/data/samples/shapes/harmonics.wav
-lmms-0.4.5/data/samples/shapes/micro.wav
-lmms-0.4.5/data/samples/shapes/bunglist2.wav
-lmms-0.4.5/data/samples/shapes/bunglist3.wav
-lmms-0.4.5/data/samples/shapes/saw+sine.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw2.ogg
-lmms-0.4.5/data/samples/shapes/bunglist.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw.ogg
-lmms-0.4.5/data/samples/shapes/roundbass.wav
-lmms-0.4.5/data/samples/shapes/bunglist9.wav
-lmms-0.4.5/data/samples/shapes/bunglist7.wav
-lmms-0.4.5/data/samples/shapes/low_sine.wav
-lmms-0.4.5/data/samples/shapes/bunglist4.wav
-lmms-0.4.5/data/samples/shapes/bunglist5.wav
-lmms-0.4.5/data/samples/shapes/sine_dist.ogg
-lmms-0.4.5/data/samples/shapes/technobass.wav
-lmms-0.4.5/data/samples/shapes/roundsaw.ogg
-lmms-0.4.5/data/samples/shapes/technosynth6.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw_dist.ogg
-lmms-0.4.5/data/samples/shapes/bunglist6.wav
-lmms-0.4.5/data/samples/shapes/moog.wav
-lmms-0.4.5/data/samples/shapes/bunglist8.wav
-lmms-0.4.5/data/samples/shapes/additive.wav
-lmms-0.4.5/data/samples/shapes/technosynth5.wav
-lmms-0.4.5/data/samples/shapes/technosynth4.wav
-lmms-0.4.5/data/samples/shapes/vowel_a.wav
-lmms-0.4.5/data/samples/shapes/vowel_u.wav
-lmms-0.4.5/data/samples/basses/bass_punch01.ogg
-lmms-0.4.5/data/samples/basses/bass_acid01.ogg
-lmms-0.4.5/data/samples/basses/rave_bass02.ogg
-lmms-0.4.5/data/samples/basses/bass_hard02.ogg
-lmms-0.4.5/data/samples/basses/rave_bass01.ogg
-lmms-0.4.5/data/samples/basses/bass_hard01.ogg
-lmms-0.4.5/data/samples/basses/synth_acid02.ogg
-lmms-0.4.5/data/samples/basses/horror_bass01.ogg
-lmms-0.4.5/data/samples/basses/matrix1000_pluck01.ogg
-lmms-0.4.5/data/samples/basses/bass01.ogg
-lmms-0.4.5/data/samples/basses/bass_acid02.ogg
-lmms-0.4.5/data/samples/basses/synth_acid01.ogg
-lmms-0.4.5/data/samples/basses/techno_synth01.ogg
-lmms-0.4.5/data/samples/basses/rave_bass04.ogg
-lmms-0.4.5/data/samples/basses/rave_bass03.ogg
-lmms-0.4.5/data/samples/effects/explode01.ogg
-lmms-0.4.5/data/samples/effects/warp01.ogg
-lmms-0.4.5/data/samples/effects/filter_sweep01.ogg
-lmms-0.4.5/data/samples/effects/start01.ogg
-lmms-0.4.5/data/samples/effects/wind_chimes01.ogg
-lmms-0.4.5/data/samples/effects/scratch01.ogg
-lmms-0.4.5/data/samples/effects/warp02.ogg
-lmms-0.4.5/data/samples/effects/chroma_sound_effect01.ogg
-lmms-0.4.5/data/samples/effects/stop01.ogg
-lmms-0.4.5/data/samples/effects/start02.ogg
-lmms-0.4.5/data/samples/beats/house_loop01.ogg
-lmms-0.4.5/data/samples/beats/break02.ogg
-lmms-0.4.5/data/samples/beats/909beat01.ogg
-lmms-0.4.5/data/samples/beats/break03.ogg
-lmms-0.4.5/data/samples/beats/electro_beat02.ogg
-lmms-0.4.5/data/samples/beats/electro_beat01.ogg
-lmms-0.4.5/data/samples/beats/jungle01.ogg
-lmms-0.4.5/data/samples/beats/rave_hihat01.ogg
-lmms-0.4.5/data/samples/beats/rave_kick01.ogg
-lmms-0.4.5/data/samples/beats/rave_kick02.ogg
-lmms-0.4.5/data/samples/beats/break01.ogg
-lmms-0.4.5/data/samples/beats/rave_snare01.ogg
-lmms-0.4.5/data/samples/beats/rave_hihat02.ogg
-lmms-0.4.5/data/samples/stringsnpads/bell_choir02.ogg
-lmms-0.4.5/data/samples/stringsnpads/strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/korg_poly6_drone01.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/chorus02.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings03.ogg
-lmms-0.4.5/data/samples/stringsnpads/chorus01.ogg
-lmms-0.4.5/data/samples/stringsnpads/juno_pad01.ogg
-lmms-0.4.5/data/samples/stringsnpads/orion_string01.ogg
-lmms-0.4.5/data/samples/stringsnpads/rave_choir01.ogg
-lmms-0.4.5/data/samples/stringsnpads/bell_choir01.ogg
-lmms-0.4.5/data/samples/stringsnpads/heaven_strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/nord_ambient01.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings02.ogg
-lmms-0.4.5/data/samples/bassloopes/briff01.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_bass01.ogg
-lmms-0.4.5/data/samples/bassloopes/rave_bass02.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth02.ogg
-lmms-0.4.5/data/samples/bassloopes/tb303_01.ogg
-lmms-0.4.5/data/samples/bassloopes/rave_bass01.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth03.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_bass02.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth04.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth01.ogg
-lmms-0.4.5/data/samples/instruments/violin_double_stop01.ogg
-lmms-0.4.5/data/samples/instruments/bassslap01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ01.ogg
-lmms-0.4.5/data/samples/instruments/e_piano_accord01.ogg
-lmms-0.4.5/data/samples/instruments/flute01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_medium_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ04.ogg
-lmms-0.4.5/data/samples/instruments/trumpet01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_slight_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/e_organ01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ03.ogg
-lmms-0.4.5/data/samples/instruments/piano02.ogg
-lmms-0.4.5/data/samples/instruments/cello01.ogg
-lmms-0.4.5/data/samples/instruments/piano01.ogg
-lmms-0.4.5/data/samples/instruments/violin_fingered01.ogg
-lmms-0.4.5/data/samples/instruments/violin_pizzicato01.ogg
-lmms-0.4.5/data/samples/instruments/e_piano_accord02.ogg
-lmms-0.4.5/data/samples/instruments/harpsichord01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar01.ogg
-lmms-0.4.5/data/samples/instruments/bassslap02.ogg
-lmms-0.4.5/data/samples/instruments/church_organ02.ogg
-lmms-0.4.5/data/samples/misc/applause01.ogg
-lmms-0.4.5/data/samples/misc/breath01.ogg
-lmms-0.4.5/data/samples/misc/raving_crowd01.ogg
-lmms-0.4.5/data/samples/misc/hit02.ogg
-lmms-0.4.5/data/samples/misc/dong01.ogg
-lmms-0.4.5/data/samples/misc/hit01.ogg
-lmms-0.4.5/data/samples/misc/bass!.ogg
-lmms-0.4.5/data/samples/misc/dong03.ogg
-lmms-0.4.5/data/samples/misc/undefined01.ogg
-lmms-0.4.5/data/samples/misc/metronome01.ogg
-lmms-0.4.5/data/samples/misc/buzz!.ogg
-lmms-0.4.5/data/samples/misc/dong02.ogg
-lmms-0.4.5/data/samples/misc/electric_ping01.ogg
-lmms-0.4.5/data/samples/misc/metalish_dong01.ogg
-lmms-0.4.5/data/samples/misc/snaph01.ogg
-lmms-0.4.5/data/samples/drums/kick_soft01.ogg
-lmms-0.4.5/data/samples/drums/snare_rim01.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened02.ogg
-lmms-0.4.5/data/samples/drums/snare05.ogg
-lmms-0.4.5/data/samples/drums/bassdrum_acoustic02.ogg
-lmms-0.4.5/data/samples/drums/kick_hard01.ogg
-lmms-0.4.5/data/samples/drums/sidestick01.ogg
-lmms-0.4.5/data/samples/drums/clap01.ogg
-lmms-0.4.5/data/samples/drums/snare02.ogg
-lmms-0.4.5/data/samples/drums/clap02.ogg
-lmms-0.4.5/data/samples/drums/snare04.ogg
-lmms-0.4.5/data/samples/drums/bassdrum03.ogg
-lmms-0.4.5/data/samples/drums/tom_low01.ogg
-lmms-0.4.5/data/samples/drums/bassdrum02.ogg
-lmms-0.4.5/data/samples/drums/tom02.ogg
-lmms-0.4.5/data/samples/drums/shaker03.ogg
-lmms-0.4.5/data/samples/drums/kick_hiphop01.ogg
-lmms-0.4.5/data/samples/drums/clap03.ogg
-lmms-0.4.5/data/samples/drums/snare_muffled02.ogg
-lmms-0.4.5/data/samples/drums/tom01.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed03.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed05.ogg
-lmms-0.4.5/data/samples/drums/tom_hi01.ogg
-lmms-0.4.5/data/samples/drums/kick01.ogg
-lmms-0.4.5/data/samples/drums/shaker01.ogg
-lmms-0.4.5/data/samples/drums/tom05.ogg
-lmms-0.4.5/data/samples/drums/ride01.ogg
-lmms-0.4.5/data/samples/drums/shaker02.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened01.ogg
-lmms-0.4.5/data/samples/drums/snare06.ogg
-lmms-0.4.5/data/samples/drums/kick_soft02.ogg
-lmms-0.4.5/data/samples/drums/kick_long01.ogg
-lmms-0.4.5/data/samples/drums/kick04.ogg
-lmms-0.4.5/data/samples/drums/snare07.ogg
-lmms-0.4.5/data/samples/drums/bassdrum04.ogg
-lmms-0.4.5/data/samples/drums/crash02.ogg
-lmms-0.4.5/data/samples/drums/tom04.ogg
-lmms-0.4.5/data/samples/drums/kick02.ogg
-lmms-0.4.5/data/samples/drums/nasty_rim01.ogg
-lmms-0.4.5/data/samples/drums/bassdrum_acoustic01.ogg
-lmms-0.4.5/data/samples/drums/ride02.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed02.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed01.ogg
-lmms-0.4.5/data/samples/drums/snare01.ogg
-lmms-0.4.5/data/samples/drums/wood01.ogg
-lmms-0.4.5/data/samples/drums/nasty_bass01.ogg
-lmms-0.4.5/data/samples/drums/snare_hiphop02.ogg
-lmms-0.4.5/data/samples/drums/kick_distorted01.ogg
-lmms-0.4.5/data/samples/drums/zap01.ogg
-lmms-0.4.5/data/samples/drums/clav01.ogg
-lmms-0.4.5/data/samples/drums/rim01.ogg
-lmms-0.4.5/data/samples/drums/nasty_snare01.ogg
-lmms-0.4.5/data/samples/drums/snare_harsh01.ogg
-lmms-0.4.5/data/samples/drums/clav02.ogg
-lmms-0.4.5/data/samples/drums/clap04.ogg
-lmms-0.4.5/data/samples/drums/snare_muffled01.ogg
-lmms-0.4.5/data/samples/drums/kick03.ogg
-lmms-0.4.5/data/samples/drums/snare_acoustic01.ogg
-lmms-0.4.5/data/samples/drums/kick_hardcore01.ogg
-lmms-0.4.5/data/samples/drums/hihat_foot_pedal01.ogg
-lmms-0.4.5/data/samples/drums/snare_short01.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed04.ogg
-lmms-0.4.5/data/samples/drums/bassdrum01.ogg
-lmms-0.4.5/data/samples/drums/snare03.ogg
-lmms-0.4.5/data/samples/drums/zap02.ogg
-lmms-0.4.5/data/samples/drums/snare_hiphop01.ogg
-lmms-0.4.5/data/samples/drums/snare_electro01.ogg
-lmms-0.4.5/data/samples/drums/tom_mid01.ogg
-lmms-0.4.5/data/samples/drums/tom03.ogg
-lmms-0.4.5/data/samples/drums/crash01.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened03.ogg
-lmms-0.4.5/data/samples/drums/zap03.ogg
+lmms-0.4.6/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
+lmms-0.4.6/data/projects/cool_songs/Skiessi-Onion.mmpz
+lmms-0.4.6/data/projects/cool_songs/MysthR-Living.mmpz
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
+lmms-0.4.6/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
+lmms-0.4.6/data/projects/cool_songs/Malex-Horizon4.mmp
+lmms-0.4.6/data/projects/cool_songs/Siegel-SpeedTrack.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-Psycho.mmp
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-Underline.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
+lmms-0.4.6/data/projects/cool_songs/Chris-RaveRiff.mmpz
+lmms-0.4.6/data/projects/cool_songs/j1m-DingDong.mmp
+lmms-0.4.6/data/projects/cool_songs/Chris-HorizonRemix.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-Confused.mmp
+lmms-0.4.6/data/projects/cool_songs/Silva-ElvesCall.mmp
+lmms-0.4.6/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
+lmms-0.4.6/data/projects/cool_songs/Siegel-DreamWave.mmp
+lmms-0.4.6/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
+lmms-0.4.6/data/projects/cool_songs/SharkyX-Experiments.mmp
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
+lmms-0.4.6/data/projects/cool_songs/Djeezus-Oscilisous.mmp
+lmms-0.4.6/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
+lmms-0.4.6/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
+lmms-0.4.6/data/projects/cool_songs/Djeezus-BeatRolls.mmp
+lmms-0.4.6/data/projects/demos/demo3.mmp
+lmms-0.4.6/data/projects/demos/demo1.mmp
+lmms-0.4.6/data/projects/demos/some_basslines.mmp
+lmms-0.4.6/data/projects/demos/beat_collection.mmp
+lmms-0.4.6/data/projects/demos/demo6.mmp
+lmms-0.4.6/data/projects/demos/TobyDox-Crystallo.mmp
+lmms-0.4.6/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
+lmms-0.4.6/data/projects/demos/loop_collection.mmp
+lmms-0.4.6/data/projects/demos/demo4.mmp
+lmms-0.4.6/data/projects/demos/lb302quick.mmpz
+lmms-0.4.6/data/projects/demos/demo2.mmp
+lmms-0.4.6/data/projects/demos/newFangled.mmpz
+lmms-0.4.6/data/projects/demos/demo5.mmp
+lmms-0.4.6/data/projects/tutorials/editing_note_volumes.mmp
+lmms-0.4.6/data/samples/beats/break03.ogg
+lmms-0.4.6/data/samples/beats/house_loop01.ogg
+lmms-0.4.6/data/samples/beats/electro_beat01.ogg
+lmms-0.4.6/data/samples/beats/electro_beat02.ogg
+lmms-0.4.6/data/samples/beats/rave_hihat01.ogg
+lmms-0.4.6/data/samples/beats/rave_hihat02.ogg
+lmms-0.4.6/data/samples/beats/jungle01.ogg
+lmms-0.4.6/data/samples/beats/909beat01.ogg
+lmms-0.4.6/data/samples/beats/break02.ogg
+lmms-0.4.6/data/samples/beats/rave_kick01.ogg
+lmms-0.4.6/data/samples/beats/rave_kick02.ogg
+lmms-0.4.6/data/samples/beats/break01.ogg
+lmms-0.4.6/data/samples/beats/rave_snare01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth04.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_bass01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth02.ogg
+lmms-0.4.6/data/samples/bassloopes/tb303_01.ogg
+lmms-0.4.6/data/samples/bassloopes/rave_bass02.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth03.ogg
+lmms-0.4.6/data/samples/bassloopes/rave_bass01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_bass02.ogg
+lmms-0.4.6/data/samples/bassloopes/briff01.ogg
+lmms-0.4.6/data/samples/drums/nasty_snare01.ogg
+lmms-0.4.6/data/samples/drums/kick_hard01.ogg
+lmms-0.4.6/data/samples/drums/shaker02.ogg
+lmms-0.4.6/data/samples/drums/zap02.ogg
+lmms-0.4.6/data/samples/drums/kick_soft02.ogg
+lmms-0.4.6/data/samples/drums/snare02.ogg
+lmms-0.4.6/data/samples/drums/tom_mid01.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened03.ogg
+lmms-0.4.6/data/samples/drums/tom01.ogg
+lmms-0.4.6/data/samples/drums/snare_rim01.ogg
+lmms-0.4.6/data/samples/drums/tom03.ogg
+lmms-0.4.6/data/samples/drums/zap01.ogg
+lmms-0.4.6/data/samples/drums/nasty_rim01.ogg
+lmms-0.4.6/data/samples/drums/kick_long01.ogg
+lmms-0.4.6/data/samples/drums/snare_hiphop02.ogg
+lmms-0.4.6/data/samples/drums/hihat_foot_pedal01.ogg
+lmms-0.4.6/data/samples/drums/clap02.ogg
+lmms-0.4.6/data/samples/drums/tom_hi01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum_acoustic01.ogg
+lmms-0.4.6/data/samples/drums/snare03.ogg
+lmms-0.4.6/data/samples/drums/kick04.ogg
+lmms-0.4.6/data/samples/drums/snare_electro01.ogg
+lmms-0.4.6/data/samples/drums/kick_distorted01.ogg
+lmms-0.4.6/data/samples/drums/ride02.ogg
+lmms-0.4.6/data/samples/drums/zap03.ogg
+lmms-0.4.6/data/samples/drums/wood01.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed04.ogg
+lmms-0.4.6/data/samples/drums/kick02.ogg
+lmms-0.4.6/data/samples/drums/clav01.ogg
+lmms-0.4.6/data/samples/drums/snare01.ogg
+lmms-0.4.6/data/samples/drums/kick01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum02.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed03.ogg
+lmms-0.4.6/data/samples/drums/tom04.ogg
+lmms-0.4.6/data/samples/drums/bassdrum03.ogg
+lmms-0.4.6/data/samples/drums/bassdrum04.ogg
+lmms-0.4.6/data/samples/drums/tom05.ogg
+lmms-0.4.6/data/samples/drums/snare_short01.ogg
+lmms-0.4.6/data/samples/drums/shaker01.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed05.ogg
+lmms-0.4.6/data/samples/drums/snare_harsh01.ogg
+lmms-0.4.6/data/samples/drums/tom02.ogg
+lmms-0.4.6/data/samples/drums/snare_hiphop01.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened02.ogg
+lmms-0.4.6/data/samples/drums/snare_muffled01.ogg
+lmms-0.4.6/data/samples/drums/clap03.ogg
+lmms-0.4.6/data/samples/drums/snare_muffled02.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum_acoustic02.ogg
+lmms-0.4.6/data/samples/drums/rim01.ogg
+lmms-0.4.6/data/samples/drums/kick_hiphop01.ogg
+lmms-0.4.6/data/samples/drums/crash01.ogg
+lmms-0.4.6/data/samples/drums/snare07.ogg
+lmms-0.4.6/data/samples/drums/clav02.ogg
+lmms-0.4.6/data/samples/drums/nasty_bass01.ogg
+lmms-0.4.6/data/samples/drums/snare_acoustic01.ogg
+lmms-0.4.6/data/samples/drums/kick03.ogg
+lmms-0.4.6/data/samples/drums/snare06.ogg
+lmms-0.4.6/data/samples/drums/kick_hardcore01.ogg
+lmms-0.4.6/data/samples/drums/ride01.ogg
+lmms-0.4.6/data/samples/drums/crash02.ogg
+lmms-0.4.6/data/samples/drums/kick_soft01.ogg
+lmms-0.4.6/data/samples/drums/snare05.ogg
+lmms-0.4.6/data/samples/drums/sidestick01.ogg
+lmms-0.4.6/data/samples/drums/clap01.ogg
+lmms-0.4.6/data/samples/drums/clap04.ogg
+lmms-0.4.6/data/samples/drums/shaker03.ogg
+lmms-0.4.6/data/samples/drums/bassdrum01.ogg
+lmms-0.4.6/data/samples/drums/snare04.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed02.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed01.ogg
+lmms-0.4.6/data/samples/drums/tom_low01.ogg
+lmms-0.4.6/data/samples/shapes/additive2.wav
+lmms-0.4.6/data/samples/shapes/technosynth3.wav
+lmms-0.4.6/data/samples/shapes/low_sine.wav
+lmms-0.4.6/data/samples/shapes/bunglist5.wav
+lmms-0.4.6/data/samples/shapes/bunglist8.wav
+lmms-0.4.6/data/samples/shapes/bunglist.wav
+lmms-0.4.6/data/samples/shapes/sine_dist.ogg
+lmms-0.4.6/data/samples/shapes/roundsaw.ogg
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw.ogg
+lmms-0.4.6/data/samples/shapes/harmonics.wav
+lmms-0.4.6/data/samples/shapes/micro.wav
+lmms-0.4.6/data/samples/shapes/vowel_u.wav
+lmms-0.4.6/data/samples/shapes/roundbass.wav
+lmms-0.4.6/data/samples/shapes/bunglist9.wav
+lmms-0.4.6/data/samples/shapes/technobass.wav
+lmms-0.4.6/data/samples/shapes/technosynth5.wav
+lmms-0.4.6/data/samples/shapes/technosynth6.wav
+lmms-0.4.6/data/samples/shapes/additive.wav
+lmms-0.4.6/data/samples/shapes/bunglist4.wav
+lmms-0.4.6/data/samples/shapes/bunglist7.wav
+lmms-0.4.6/data/samples/shapes/bunglist3.wav
+lmms-0.4.6/data/samples/shapes/technosynth4.wav
+lmms-0.4.6/data/samples/shapes/bunglist6.wav
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw2.ogg
+lmms-0.4.6/data/samples/shapes/moog.wav
+lmms-0.4.6/data/samples/shapes/saw+sine.wav
+lmms-0.4.6/data/samples/shapes/technosynth1.wav
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw_dist.ogg
+lmms-0.4.6/data/samples/shapes/vowel_a.wav
+lmms-0.4.6/data/samples/shapes/bunglist2.wav
+lmms-0.4.6/data/samples/shapes/technosynth2.wav
+lmms-0.4.6/data/samples/misc/metalish_dong01.ogg
+lmms-0.4.6/data/samples/misc/buzz!.ogg
+lmms-0.4.6/data/samples/misc/dong02.ogg
+lmms-0.4.6/data/samples/misc/dong03.ogg
+lmms-0.4.6/data/samples/misc/snaph01.ogg
+lmms-0.4.6/data/samples/misc/undefined01.ogg
+lmms-0.4.6/data/samples/misc/raving_crowd01.ogg
+lmms-0.4.6/data/samples/misc/hit02.ogg
+lmms-0.4.6/data/samples/misc/electric_ping01.ogg
+lmms-0.4.6/data/samples/misc/hit01.ogg
+lmms-0.4.6/data/samples/misc/breath01.ogg
+lmms-0.4.6/data/samples/misc/metronome01.ogg
+lmms-0.4.6/data/samples/misc/applause01.ogg
+lmms-0.4.6/data/samples/misc/dong01.ogg
+lmms-0.4.6/data/samples/misc/bass!.ogg
+lmms-0.4.6/data/samples/instruments/piano01.ogg
+lmms-0.4.6/data/samples/instruments/piano02.ogg
+lmms-0.4.6/data/samples/instruments/church_organ02.ogg
+lmms-0.4.6/data/samples/instruments/violin_fingered01.ogg
+lmms-0.4.6/data/samples/instruments/e_piano_accord01.ogg
+lmms-0.4.6/data/samples/instruments/cello01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ01.ogg
+lmms-0.4.6/data/samples/instruments/flute01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_medium_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ03.ogg
+lmms-0.4.6/data/samples/instruments/e_piano_accord02.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/bassslap02.ogg
+lmms-0.4.6/data/samples/instruments/e_organ01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ04.ogg
+lmms-0.4.6/data/samples/instruments/trumpet01.ogg
+lmms-0.4.6/data/samples/instruments/violin_pizzicato01.ogg
+lmms-0.4.6/data/samples/instruments/bassslap01.ogg
+lmms-0.4.6/data/samples/instruments/harpsichord01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_slight_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/violin_double_stop01.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar03.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar02.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar01.ogg
+lmms-0.4.6/data/samples/latin/latin_brass01.ogg
+lmms-0.4.6/data/samples/stringsnpads/chorus02.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings01.ogg
+lmms-0.4.6/data/samples/stringsnpads/juno_pad01.ogg
+lmms-0.4.6/data/samples/stringsnpads/bell_choir01.ogg
+lmms-0.4.6/data/samples/stringsnpads/korg_poly6_drone01.ogg
+lmms-0.4.6/data/samples/stringsnpads/strings01.ogg
+lmms-0.4.6/data/samples/stringsnpads/orion_string01.ogg
+lmms-0.4.6/data/samples/stringsnpads/bell_choir02.ogg
+lmms-0.4.6/data/samples/stringsnpads/rave_choir01.ogg
+lmms-0.4.6/data/samples/stringsnpads/chorus01.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings03.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings02.ogg
+lmms-0.4.6/data/samples/stringsnpads/nord_ambient01.ogg
+lmms-0.4.6/data/samples/stringsnpads/heaven_strings01.ogg
+lmms-0.4.6/data/samples/basses/bass_acid02.ogg
+lmms-0.4.6/data/samples/basses/techno_synth01.ogg
+lmms-0.4.6/data/samples/basses/rave_bass03.ogg
+lmms-0.4.6/data/samples/basses/rave_bass04.ogg
+lmms-0.4.6/data/samples/basses/matrix1000_pluck01.ogg
+lmms-0.4.6/data/samples/basses/bass_acid01.ogg
+lmms-0.4.6/data/samples/basses/rave_bass02.ogg
+lmms-0.4.6/data/samples/basses/bass_hard02.ogg
+lmms-0.4.6/data/samples/basses/rave_bass01.ogg
+lmms-0.4.6/data/samples/basses/synth_acid01.ogg
+lmms-0.4.6/data/samples/basses/synth_acid02.ogg
+lmms-0.4.6/data/samples/basses/horror_bass01.ogg
+lmms-0.4.6/data/samples/basses/bass_punch01.ogg
+lmms-0.4.6/data/samples/basses/bass_hard01.ogg
+lmms-0.4.6/data/samples/basses/bass01.ogg
+lmms-0.4.6/data/samples/effects/start01.ogg
+lmms-0.4.6/data/samples/effects/chroma_sound_effect01.ogg
+lmms-0.4.6/data/samples/effects/stop01.ogg
+lmms-0.4.6/data/samples/effects/scratch01.ogg
+lmms-0.4.6/data/samples/effects/wind_chimes01.ogg
+lmms-0.4.6/data/samples/effects/explode01.ogg
+lmms-0.4.6/data/samples/effects/warp02.ogg
+lmms-0.4.6/data/samples/effects/warp01.ogg
+lmms-0.4.6/data/samples/effects/filter_sweep01.ogg
+lmms-0.4.6/data/samples/effects/start02.ogg


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	4 Sep 2009 21:21:19 -0000	1.5
+++ import.log	30 Dec 2009 20:55:24 -0000	1.6
@@ -3,3 +3,4 @@ lmms-0_4_2-4_fc10:HEAD:lmms-0.4.2-4.fc10
 lmms-0_4_3-1_fc10:HEAD:lmms-0.4.3-1.fc10.src.rpm:1236642380
 lmms-0_4_4-1_fc11:HEAD:lmms-0.4.4-1.fc11.src.rpm:1242758267
 lmms-0_4_5-1_fc11:HEAD:lmms-0.4.5-1.fc11.src.rpm:1252099213
+lmms-0_4_6-1_fc12:HEAD:lmms-0.4.6-1.fc12.src.rpm:1262206312


Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/lmms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- lmms.spec	23 Sep 2009 05:05:28 -0000	1.8
+++ lmms.spec	30 Dec 2009 20:55:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           lmms
-Version:        0.4.5
-Release:        2%{?dist}
+Version:        0.4.6
+Release:        1%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
 Group:          Applications/Multimedia
@@ -36,14 +36,14 @@ Source0:        %{name}-%{version}.strip
 Source1:        README.fedora
 
 # our cmake seems to have a different value for LIB_DIR.
-Patch0:         lmms-0.4.5-libdir.patch
+Patch0:         lmms-0.4.6-libdir.patch
 
 # move the vst and zynaddsubfx plugins to libexecdir.
-Patch1:         lmms-0.4.5-libexecdir.patch
+Patch1:         lmms-0.4.6-libexecdir.patch
 
 # build with vst support but without having wine. that is a patch
 # upstream isn't really interested in.
-Patch2:         lmms-0.4.5-vst-nowine.patch
+Patch2:         lmms-0.4.6-vst-nowine.patch
 
 # FIXME: we surely want to patch zynaddsubfx to use system's fltk and
 # minixml. using system's zynaddsubfx however is, according to lmms'
@@ -189,10 +189,10 @@ update-desktop-database &> /dev/null || 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO README.fedora
+%doc AUTHORS COPYING README TODO README.fedora
 %{_bindir}/%{name}
 %{_libdir}/%{name}
-%{_libexecdir}/remote_zynaddsubfx
+%{_libexecdir}/RemoteZynAddSubFx
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
@@ -223,6 +223,11 @@ This package contains the necessary file
 
 
 %changelog
+* Wed Dec 30 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.6-1
+- Update to 0.4.6.
+- Rebase patches.
+- Minor specfile fixes.
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.4.5-2
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Sep 2009 21:21:19 -0000	1.6
+++ sources	30 Dec 2009 20:55:24 -0000	1.7
@@ -1 +1 @@
-efbd9ddef0a975cffe9abc2da8b04143  lmms-0.4.5.stripped.tar.bz2
+23e599158b60bc665b6715b68dd38185  lmms-0.4.6.stripped.tar.bz2


--- lmms-0.4.5-libdir.patch DELETED ---


--- lmms-0.4.5-libexecdir.patch DELETED ---


--- lmms-0.4.5-vst-nowine.patch DELETED ---



From nb at fedoraproject.org  Wed Dec 30 21:06:32 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed, 30 Dec 2009 21:06:32 +0000 (UTC)
Subject: rpms/znc/EL-5 .cvsignore,1.8,1.9 sources,1.8,1.9 znc.spec,1.10,1.11
Message-ID: <20091230210632.2A1E511C00E9@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28987/EL-5

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Upgrade to ZNC 0.078


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Dec 2009 17:11:01 -0000	1.8
+++ .cvsignore	30 Dec 2009 21:06:31 -0000	1.9
@@ -1 +1 @@
-znc-0.077-1.svn1672.tar.bz2
+znc-0.078.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Dec 2009 17:11:01 -0000	1.8
+++ sources	30 Dec 2009 21:06:31 -0000	1.9
@@ -1 +1 @@
-7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2
+b1379bd6609353ebbc8df7ec19bd004f  znc-0.078.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/znc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- znc.spec	7 Dec 2009 17:11:01 -0000	1.10
+++ znc.spec	30 Dec 2009 21:06:31 -0000	1.11
@@ -1,17 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.077
-Release:        1.svn1672%{?dist}
+Version:        0.078
+Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
-# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
-# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
-Source0:        znc-0.077-1.svn1672.tar.bz2
+Source0:        http://downloads.sourceforge.net/znc/znc-0.078.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  perl
+BuildRequires:  perl gcc-c++
 BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  c-ares-devel
@@ -44,7 +41,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q -n znc-0.077-1.svn1672
+%setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -129,6 +126,12 @@ chmod -x modules/q.cpp
 
 %changelog
 
+* Wed Dec 30 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-1
+- Update to znc 0.078
+
+* Sun Dec 13 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-0.1.rc1
+- Update to znc 0.078.rc1
+
 * Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
 - Users cloned via the admin module no longer automatically connect into IRC. (r1653)



From nb at fedoraproject.org  Wed Dec 30 21:06:32 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed, 30 Dec 2009 21:06:32 +0000 (UTC)
Subject: rpms/znc/F-12 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 znc.spec,
	1.19, 1.20
Message-ID: <20091230210632.970E511C00E9@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28987/F-12

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Upgrade to ZNC 0.078


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	7 Dec 2009 17:00:24 -0000	1.12
+++ .cvsignore	30 Dec 2009 21:06:32 -0000	1.13
@@ -1 +1 @@
-znc-0.077-1.svn1672.tar.bz2
+znc-0.078.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	7 Dec 2009 17:00:24 -0000	1.13
+++ sources	30 Dec 2009 21:06:32 -0000	1.14
@@ -1 +1 @@
-7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2
+b1379bd6609353ebbc8df7ec19bd004f  znc-0.078.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-12/znc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- znc.spec	7 Dec 2009 17:00:25 -0000	1.19
+++ znc.spec	30 Dec 2009 21:06:32 -0000	1.20
@@ -1,17 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.077
-Release:        1.svn1672%{?dist}
+Version:        0.078
+Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
-# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
-# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
-Source0:        znc-0.077-1.svn1672.tar.bz2
+Source0:        http://downloads.sourceforge.net/znc/znc-0.078.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  perl
+BuildRequires:  perl gcc-c++
 BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  c-ares-devel
@@ -44,7 +41,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q -n znc-0.077-1.svn1672
+%setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -129,6 +126,12 @@ chmod -x modules/q.cpp
 
 %changelog
 
+* Wed Dec 30 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-1
+- Update to znc 0.078
+
+* Sun Dec 13 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-0.1.rc1
+- Update to znc 0.078.rc1
+
 * Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
 - Users cloned via the admin module no longer automatically connect into IRC. (r1653)



From nb at fedoraproject.org  Wed Dec 30 21:06:32 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed, 30 Dec 2009 21:06:32 +0000 (UTC)
Subject: rpms/znc/F-11 .cvsignore,1.8,1.9 sources,1.8,1.9 znc.spec,1.10,1.11
Message-ID: <20091230210632.5B8E611C00E9@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28987/F-11

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Upgrade to ZNC 0.078


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Dec 2009 16:57:39 -0000	1.8
+++ .cvsignore	30 Dec 2009 21:06:32 -0000	1.9
@@ -1 +1 @@
-znc-0.077-1.svn1672.tar.bz2
+znc-0.078.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Dec 2009 16:57:40 -0000	1.8
+++ sources	30 Dec 2009 21:06:32 -0000	1.9
@@ -1 +1 @@
-7d264293123b4d3572dbbac757bddf7d  znc-0.077-1.svn1672.tar.bz2
+b1379bd6609353ebbc8df7ec19bd004f  znc-0.078.tar.gz


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/znc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- znc.spec	7 Dec 2009 16:57:40 -0000	1.10
+++ znc.spec	30 Dec 2009 21:06:32 -0000	1.11
@@ -1,17 +1,14 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.077
-Release:        1.svn1672%{?dist}
+Version:        0.078
+Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-#Source0:        http://downloads.sourceforge.net/znc/znc-0.076.tar.gz
-# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672
-# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672
-Source0:        znc-0.077-1.svn1672.tar.bz2
+Source0:        http://downloads.sourceforge.net/znc/znc-0.078.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  perl
+BuildRequires:  perl gcc-c++
 BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  c-ares-devel
@@ -44,7 +41,7 @@ Requires:      %{name} = %{version}-%{re
 Extra modules for ZNC
 
 %prep
-%setup -q -n znc-0.077-1.svn1672
+%setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -129,6 +126,12 @@ chmod -x modules/q.cpp
 
 %changelog
 
+* Wed Dec 30 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-1
+- Update to znc 0.078
+
+* Sun Dec 13 2009 Nick Bebout <nb at fedoraproject.org> - 0.078-0.1.rc1
+- Update to znc 0.078.rc1
+
 * Mon Dec 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.077-1.svn1672
 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647)
 - Users cloned via the admin module no longer automatically connect into IRC. (r1653)



From leigh123linux at fedoraproject.org  Wed Dec 30 21:21:03 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 30 Dec 2009 21:21:03 +0000 (UTC)
Subject: File qbittorrent-2.0.4.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091230212103.7A5AA10F8C5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qbittorrent:

e1541e2334698881f8fd8c21aa9854c0  qbittorrent-2.0.4.tar.gz



From thm at fedoraproject.org  Wed Dec 30 21:24:37 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 30 Dec 2009 21:24:37 +0000 (UTC)
Subject: rpms/lmms/F-12 lmms-0.4.6-libdir.patch, NONE,
	1.1 lmms-0.4.6-libexecdir.patch, NONE,
	1.1 lmms-0.4.6-vst-nowine.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 README.fedora, 1.3, 1.4 import.log, 1.5, 1.6 lmms.spec, 1.8,
	1.9 sources, 1.6, 1.7 lmms-0.4.5-libdir.patch, 1.1,
	NONE lmms-0.4.5-libexecdir.patch, 1.1,
	NONE lmms-0.4.5-vst-nowine.patch, 1.1, NONE
Message-ID: <20091230212437.4831111C00E9@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/lmms/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1103/F-12

Modified Files:
	.cvsignore README.fedora import.log lmms.spec sources 
Added Files:
	lmms-0.4.6-libdir.patch lmms-0.4.6-libexecdir.patch 
	lmms-0.4.6-vst-nowine.patch 
Removed Files:
	lmms-0.4.5-libdir.patch lmms-0.4.5-libexecdir.patch 
	lmms-0.4.5-vst-nowine.patch 
Log Message:
Update to 0.4.6.

lmms-0.4.6-libdir.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lmms-0.4.6-libdir.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig1 lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig1	2009-12-25 00:49:19.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:04:57.000000000 +0100
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})

lmms-0.4.6-libexecdir.patch:
 CMakeLists.txt                     |    2 +-
 plugins/vst_base/CMakeLists.txt    |    2 +-
 plugins/zynaddsubfx/CMakeLists.txt |    2 +-
 src/core/RemotePlugin.cpp          |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lmms-0.4.6-libexecdir.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig	2009-12-30 12:04:57.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:08:29.000000000 +0100
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
diff -up lmms-0.4.6/plugins/vst_base/CMakeLists.txt.orig lmms-0.4.6/plugins/vst_base/CMakeLists.txt
--- lmms-0.4.6/plugins/vst_base/CMakeLists.txt.orig	2009-12-25 00:49:23.000000000 +0100
+++ lmms-0.4.6/plugins/vst_base/CMakeLists.txt	2009-12-30 12:08:29.000000000 +0100
@@ -30,7 +30,7 @@ ADD_CUSTOM_COMMAND(
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES remote_vst_plugin.exe.so)
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${PLUGIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 
diff -up lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt.orig lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt
--- lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt.orig	2009-12-25 00:49:24.000000000 +0100
+++ lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt	2009-12-30 12:10:53.000000000 +0100
@@ -105,7 +105,7 @@ TARGET_LINK_LIBRARIES(zynaddsubfx ZynAdd
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI})
-INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR})
+INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
 TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a)
 ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
 
diff -up lmms-0.4.6/src/core/RemotePlugin.cpp.orig lmms-0.4.6/src/core/RemotePlugin.cpp
--- lmms-0.4.6/src/core/RemotePlugin.cpp.orig	2009-12-25 00:49:25.000000000 +0100
+++ lmms-0.4.6/src/core/RemotePlugin.cpp	2009-12-30 12:13:46.000000000 +0100
@@ -86,8 +86,8 @@ RemotePlugin::RemotePlugin( const QStrin
 	m_outputCount( DEFAULT_CHANNELS )
 {
 	lock();
-	QString exec = configManager::inst()->pluginDir() +
-					QDir::separator() + _plugin_executable;
+	QString exec = QString( LIBEXEC_DIR ) +
+		QDir::separator() + _plugin_executable;
 	QStringList args;
 	// swap in and out for bidirectional communication
 	args << QString::number( out()->shmKey() );

lmms-0.4.6-vst-nowine.patch:
 CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE lmms-0.4.6-vst-nowine.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig	2009-12-30 12:08:29.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:37:29.000000000 +0100
@@ -329,6 +329,9 @@ IF(LMMS_BUILD_WIN32)
 	SET(LMMS_SUPPORT_VST TRUE)
 	SET(STATUS_VST "OK")
 ENDIF(LMMS_BUILD_WIN32)
+IF(WANT_VST_NOWINE)
+	SET(LMMS_SUPPORT_VST TRUE)
+ENDIF(WANT_VST_NOWINE)
 
 
 # check for libsamplerate


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Sep 2009 21:21:19 -0000	1.5
+++ .cvsignore	30 Dec 2009 21:24:36 -0000	1.6
@@ -1 +1 @@
-lmms-0.4.5.stripped.tar.bz2
+lmms-0.4.6.stripped.tar.bz2


Index: README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-12/README.fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README.fedora	4 Sep 2009 21:21:19 -0000	1.3
+++ README.fedora	30 Dec 2009 21:24:37 -0000	1.4
@@ -1,254 +1,247 @@
 For legal reasons, the following files have been removed from the
 original tarfile:
 
-lmms-0.4.5/data/projects/tutorials/editing_note_volumes.mmp
-lmms-0.4.5/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
-lmms-0.4.5/data/projects/covers/MonkeyIsland1-Intro.mmpz
-lmms-0.4.5/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
-lmms-0.4.5/data/projects/oldstuff/MaxFellner-Ease.mmp
-lmms-0.4.5/data/projects/oldstuff/time_machine.mmp
-lmms-0.4.5/data/projects/oldstuff/Mart-Dirt_Track.mmp
-lmms-0.4.5/data/projects/oldstuff/1st.mmp
-lmms-0.4.5/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
-lmms-0.4.5/data/projects/demos/beat_collection.mmp
-lmms-0.4.5/data/projects/demos/demo5.mmp
-lmms-0.4.5/data/projects/demos/newFangled.mmpz
-lmms-0.4.5/data/projects/demos/TobyDox-Crystallo.mmp
-lmms-0.4.5/data/projects/demos/loop_collection.mmp
-lmms-0.4.5/data/projects/demos/demo1.mmp
-lmms-0.4.5/data/projects/demos/demo4.mmp
-lmms-0.4.5/data/projects/demos/demo3.mmp
-lmms-0.4.5/data/projects/demos/lb302quick.mmpz
-lmms-0.4.5/data/projects/demos/demo2.mmp
-lmms-0.4.5/data/projects/demos/demo6.mmp
-lmms-0.4.5/data/projects/demos/some_basslines.mmp
-lmms-0.4.5/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
-lmms-0.4.5/data/projects/cool_songs/MysthR-Living.mmpz
-lmms-0.4.5/data/projects/cool_songs/Siegel-DreamWave.mmp
-lmms-0.4.5/data/projects/cool_songs/Silva-ElvesCall.mmp
-lmms-0.4.5/data/projects/cool_songs/TobyDox-Psycho.mmp
-lmms-0.4.5/data/projects/cool_songs/Chris-RaveRiff.mmpz
-lmms-0.4.5/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
-lmms-0.4.5/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
-lmms-0.4.5/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
-lmms-0.4.5/data/projects/cool_songs/Chris-HorizonRemix.mmp
-lmms-0.4.5/data/projects/cool_songs/j1m-DingDong.mmp
-lmms-0.4.5/data/projects/cool_songs/Djeezus-BeatRolls.mmp
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
-lmms-0.4.5/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
-lmms-0.4.5/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
-lmms-0.4.5/data/projects/cool_songs/Malex-Horizon4.mmp
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-Underline.mmp
-lmms-0.4.5/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
-lmms-0.4.5/data/projects/cool_songs/SharkyX-Experiments.mmp
-lmms-0.4.5/data/projects/cool_songs/Skiessi-Onion.mmpz
-lmms-0.4.5/data/projects/cool_songs/TobyDox-Confused.mmp
-lmms-0.4.5/data/projects/cool_songs/Siegel-SpeedTrack.mmp
-lmms-0.4.5/data/projects/cool_songs/Djeezus-Oscilisous.mmp
-lmms-0.4.5/data/samples/latin/latin_brass01.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar03.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar01.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar02.ogg
-lmms-0.4.5/data/samples/shapes/technosynth3.wav
-lmms-0.4.5/data/samples/shapes/technosynth1.wav
-lmms-0.4.5/data/samples/shapes/technosynth2.wav
-lmms-0.4.5/data/samples/shapes/additive2.wav
-lmms-0.4.5/data/samples/shapes/harmonics.wav
-lmms-0.4.5/data/samples/shapes/micro.wav
-lmms-0.4.5/data/samples/shapes/bunglist2.wav
-lmms-0.4.5/data/samples/shapes/bunglist3.wav
-lmms-0.4.5/data/samples/shapes/saw+sine.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw2.ogg
-lmms-0.4.5/data/samples/shapes/bunglist.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw.ogg
-lmms-0.4.5/data/samples/shapes/roundbass.wav
-lmms-0.4.5/data/samples/shapes/bunglist9.wav
-lmms-0.4.5/data/samples/shapes/bunglist7.wav
-lmms-0.4.5/data/samples/shapes/low_sine.wav
-lmms-0.4.5/data/samples/shapes/bunglist4.wav
-lmms-0.4.5/data/samples/shapes/bunglist5.wav
-lmms-0.4.5/data/samples/shapes/sine_dist.ogg
-lmms-0.4.5/data/samples/shapes/technobass.wav
-lmms-0.4.5/data/samples/shapes/roundsaw.ogg
-lmms-0.4.5/data/samples/shapes/technosynth6.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw_dist.ogg
-lmms-0.4.5/data/samples/shapes/bunglist6.wav
-lmms-0.4.5/data/samples/shapes/moog.wav
-lmms-0.4.5/data/samples/shapes/bunglist8.wav
-lmms-0.4.5/data/samples/shapes/additive.wav
-lmms-0.4.5/data/samples/shapes/technosynth5.wav
-lmms-0.4.5/data/samples/shapes/technosynth4.wav
-lmms-0.4.5/data/samples/shapes/vowel_a.wav
-lmms-0.4.5/data/samples/shapes/vowel_u.wav
-lmms-0.4.5/data/samples/basses/bass_punch01.ogg
-lmms-0.4.5/data/samples/basses/bass_acid01.ogg
-lmms-0.4.5/data/samples/basses/rave_bass02.ogg
-lmms-0.4.5/data/samples/basses/bass_hard02.ogg
-lmms-0.4.5/data/samples/basses/rave_bass01.ogg
-lmms-0.4.5/data/samples/basses/bass_hard01.ogg
-lmms-0.4.5/data/samples/basses/synth_acid02.ogg
-lmms-0.4.5/data/samples/basses/horror_bass01.ogg
-lmms-0.4.5/data/samples/basses/matrix1000_pluck01.ogg
-lmms-0.4.5/data/samples/basses/bass01.ogg
-lmms-0.4.5/data/samples/basses/bass_acid02.ogg
-lmms-0.4.5/data/samples/basses/synth_acid01.ogg
-lmms-0.4.5/data/samples/basses/techno_synth01.ogg
-lmms-0.4.5/data/samples/basses/rave_bass04.ogg
-lmms-0.4.5/data/samples/basses/rave_bass03.ogg
-lmms-0.4.5/data/samples/effects/explode01.ogg
-lmms-0.4.5/data/samples/effects/warp01.ogg
-lmms-0.4.5/data/samples/effects/filter_sweep01.ogg
-lmms-0.4.5/data/samples/effects/start01.ogg
-lmms-0.4.5/data/samples/effects/wind_chimes01.ogg
-lmms-0.4.5/data/samples/effects/scratch01.ogg
-lmms-0.4.5/data/samples/effects/warp02.ogg
-lmms-0.4.5/data/samples/effects/chroma_sound_effect01.ogg
-lmms-0.4.5/data/samples/effects/stop01.ogg
-lmms-0.4.5/data/samples/effects/start02.ogg
-lmms-0.4.5/data/samples/beats/house_loop01.ogg
-lmms-0.4.5/data/samples/beats/break02.ogg
-lmms-0.4.5/data/samples/beats/909beat01.ogg
-lmms-0.4.5/data/samples/beats/break03.ogg
-lmms-0.4.5/data/samples/beats/electro_beat02.ogg
-lmms-0.4.5/data/samples/beats/electro_beat01.ogg
-lmms-0.4.5/data/samples/beats/jungle01.ogg
-lmms-0.4.5/data/samples/beats/rave_hihat01.ogg
-lmms-0.4.5/data/samples/beats/rave_kick01.ogg
-lmms-0.4.5/data/samples/beats/rave_kick02.ogg
-lmms-0.4.5/data/samples/beats/break01.ogg
-lmms-0.4.5/data/samples/beats/rave_snare01.ogg
-lmms-0.4.5/data/samples/beats/rave_hihat02.ogg
-lmms-0.4.5/data/samples/stringsnpads/bell_choir02.ogg
-lmms-0.4.5/data/samples/stringsnpads/strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/korg_poly6_drone01.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/chorus02.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings03.ogg
-lmms-0.4.5/data/samples/stringsnpads/chorus01.ogg
-lmms-0.4.5/data/samples/stringsnpads/juno_pad01.ogg
-lmms-0.4.5/data/samples/stringsnpads/orion_string01.ogg
-lmms-0.4.5/data/samples/stringsnpads/rave_choir01.ogg
-lmms-0.4.5/data/samples/stringsnpads/bell_choir01.ogg
-lmms-0.4.5/data/samples/stringsnpads/heaven_strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/nord_ambient01.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings02.ogg
-lmms-0.4.5/data/samples/bassloopes/briff01.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_bass01.ogg
-lmms-0.4.5/data/samples/bassloopes/rave_bass02.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth02.ogg
-lmms-0.4.5/data/samples/bassloopes/tb303_01.ogg
-lmms-0.4.5/data/samples/bassloopes/rave_bass01.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth03.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_bass02.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth04.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth01.ogg
-lmms-0.4.5/data/samples/instruments/violin_double_stop01.ogg
-lmms-0.4.5/data/samples/instruments/bassslap01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ01.ogg
-lmms-0.4.5/data/samples/instruments/e_piano_accord01.ogg
-lmms-0.4.5/data/samples/instruments/flute01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_medium_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ04.ogg
-lmms-0.4.5/data/samples/instruments/trumpet01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_slight_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/e_organ01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ03.ogg
-lmms-0.4.5/data/samples/instruments/piano02.ogg
-lmms-0.4.5/data/samples/instruments/cello01.ogg
-lmms-0.4.5/data/samples/instruments/piano01.ogg
-lmms-0.4.5/data/samples/instruments/violin_fingered01.ogg
-lmms-0.4.5/data/samples/instruments/violin_pizzicato01.ogg
-lmms-0.4.5/data/samples/instruments/e_piano_accord02.ogg
-lmms-0.4.5/data/samples/instruments/harpsichord01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar01.ogg
-lmms-0.4.5/data/samples/instruments/bassslap02.ogg
-lmms-0.4.5/data/samples/instruments/church_organ02.ogg
-lmms-0.4.5/data/samples/misc/applause01.ogg
-lmms-0.4.5/data/samples/misc/breath01.ogg
-lmms-0.4.5/data/samples/misc/raving_crowd01.ogg
-lmms-0.4.5/data/samples/misc/hit02.ogg
-lmms-0.4.5/data/samples/misc/dong01.ogg
-lmms-0.4.5/data/samples/misc/hit01.ogg
-lmms-0.4.5/data/samples/misc/bass!.ogg
-lmms-0.4.5/data/samples/misc/dong03.ogg
-lmms-0.4.5/data/samples/misc/undefined01.ogg
-lmms-0.4.5/data/samples/misc/metronome01.ogg
-lmms-0.4.5/data/samples/misc/buzz!.ogg
-lmms-0.4.5/data/samples/misc/dong02.ogg
-lmms-0.4.5/data/samples/misc/electric_ping01.ogg
-lmms-0.4.5/data/samples/misc/metalish_dong01.ogg
-lmms-0.4.5/data/samples/misc/snaph01.ogg
-lmms-0.4.5/data/samples/drums/kick_soft01.ogg
-lmms-0.4.5/data/samples/drums/snare_rim01.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened02.ogg
-lmms-0.4.5/data/samples/drums/snare05.ogg
-lmms-0.4.5/data/samples/drums/bassdrum_acoustic02.ogg
-lmms-0.4.5/data/samples/drums/kick_hard01.ogg
-lmms-0.4.5/data/samples/drums/sidestick01.ogg
-lmms-0.4.5/data/samples/drums/clap01.ogg
-lmms-0.4.5/data/samples/drums/snare02.ogg
-lmms-0.4.5/data/samples/drums/clap02.ogg
-lmms-0.4.5/data/samples/drums/snare04.ogg
-lmms-0.4.5/data/samples/drums/bassdrum03.ogg
-lmms-0.4.5/data/samples/drums/tom_low01.ogg
-lmms-0.4.5/data/samples/drums/bassdrum02.ogg
-lmms-0.4.5/data/samples/drums/tom02.ogg
-lmms-0.4.5/data/samples/drums/shaker03.ogg
-lmms-0.4.5/data/samples/drums/kick_hiphop01.ogg
-lmms-0.4.5/data/samples/drums/clap03.ogg
-lmms-0.4.5/data/samples/drums/snare_muffled02.ogg
-lmms-0.4.5/data/samples/drums/tom01.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed03.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed05.ogg
-lmms-0.4.5/data/samples/drums/tom_hi01.ogg
-lmms-0.4.5/data/samples/drums/kick01.ogg
-lmms-0.4.5/data/samples/drums/shaker01.ogg
-lmms-0.4.5/data/samples/drums/tom05.ogg
-lmms-0.4.5/data/samples/drums/ride01.ogg
-lmms-0.4.5/data/samples/drums/shaker02.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened01.ogg
-lmms-0.4.5/data/samples/drums/snare06.ogg
-lmms-0.4.5/data/samples/drums/kick_soft02.ogg
-lmms-0.4.5/data/samples/drums/kick_long01.ogg
-lmms-0.4.5/data/samples/drums/kick04.ogg
-lmms-0.4.5/data/samples/drums/snare07.ogg
-lmms-0.4.5/data/samples/drums/bassdrum04.ogg
-lmms-0.4.5/data/samples/drums/crash02.ogg
-lmms-0.4.5/data/samples/drums/tom04.ogg
-lmms-0.4.5/data/samples/drums/kick02.ogg
-lmms-0.4.5/data/samples/drums/nasty_rim01.ogg
-lmms-0.4.5/data/samples/drums/bassdrum_acoustic01.ogg
-lmms-0.4.5/data/samples/drums/ride02.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed02.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed01.ogg
-lmms-0.4.5/data/samples/drums/snare01.ogg
-lmms-0.4.5/data/samples/drums/wood01.ogg
-lmms-0.4.5/data/samples/drums/nasty_bass01.ogg
-lmms-0.4.5/data/samples/drums/snare_hiphop02.ogg
-lmms-0.4.5/data/samples/drums/kick_distorted01.ogg
-lmms-0.4.5/data/samples/drums/zap01.ogg
-lmms-0.4.5/data/samples/drums/clav01.ogg
-lmms-0.4.5/data/samples/drums/rim01.ogg
-lmms-0.4.5/data/samples/drums/nasty_snare01.ogg
-lmms-0.4.5/data/samples/drums/snare_harsh01.ogg
-lmms-0.4.5/data/samples/drums/clav02.ogg
-lmms-0.4.5/data/samples/drums/clap04.ogg
-lmms-0.4.5/data/samples/drums/snare_muffled01.ogg
-lmms-0.4.5/data/samples/drums/kick03.ogg
-lmms-0.4.5/data/samples/drums/snare_acoustic01.ogg
-lmms-0.4.5/data/samples/drums/kick_hardcore01.ogg
-lmms-0.4.5/data/samples/drums/hihat_foot_pedal01.ogg
-lmms-0.4.5/data/samples/drums/snare_short01.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed04.ogg
-lmms-0.4.5/data/samples/drums/bassdrum01.ogg
-lmms-0.4.5/data/samples/drums/snare03.ogg
-lmms-0.4.5/data/samples/drums/zap02.ogg
-lmms-0.4.5/data/samples/drums/snare_hiphop01.ogg
-lmms-0.4.5/data/samples/drums/snare_electro01.ogg
-lmms-0.4.5/data/samples/drums/tom_mid01.ogg
-lmms-0.4.5/data/samples/drums/tom03.ogg
-lmms-0.4.5/data/samples/drums/crash01.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened03.ogg
-lmms-0.4.5/data/samples/drums/zap03.ogg
+lmms-0.4.6/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
+lmms-0.4.6/data/projects/cool_songs/Skiessi-Onion.mmpz
+lmms-0.4.6/data/projects/cool_songs/MysthR-Living.mmpz
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
+lmms-0.4.6/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
+lmms-0.4.6/data/projects/cool_songs/Malex-Horizon4.mmp
+lmms-0.4.6/data/projects/cool_songs/Siegel-SpeedTrack.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-Psycho.mmp
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-Underline.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
+lmms-0.4.6/data/projects/cool_songs/Chris-RaveRiff.mmpz
+lmms-0.4.6/data/projects/cool_songs/j1m-DingDong.mmp
+lmms-0.4.6/data/projects/cool_songs/Chris-HorizonRemix.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-Confused.mmp
+lmms-0.4.6/data/projects/cool_songs/Silva-ElvesCall.mmp
+lmms-0.4.6/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
+lmms-0.4.6/data/projects/cool_songs/Siegel-DreamWave.mmp
+lmms-0.4.6/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
+lmms-0.4.6/data/projects/cool_songs/SharkyX-Experiments.mmp
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
+lmms-0.4.6/data/projects/cool_songs/Djeezus-Oscilisous.mmp
+lmms-0.4.6/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
+lmms-0.4.6/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
+lmms-0.4.6/data/projects/cool_songs/Djeezus-BeatRolls.mmp
+lmms-0.4.6/data/projects/demos/demo3.mmp
+lmms-0.4.6/data/projects/demos/demo1.mmp
+lmms-0.4.6/data/projects/demos/some_basslines.mmp
+lmms-0.4.6/data/projects/demos/beat_collection.mmp
+lmms-0.4.6/data/projects/demos/demo6.mmp
+lmms-0.4.6/data/projects/demos/TobyDox-Crystallo.mmp
+lmms-0.4.6/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
+lmms-0.4.6/data/projects/demos/loop_collection.mmp
+lmms-0.4.6/data/projects/demos/demo4.mmp
+lmms-0.4.6/data/projects/demos/lb302quick.mmpz
+lmms-0.4.6/data/projects/demos/demo2.mmp
+lmms-0.4.6/data/projects/demos/newFangled.mmpz
+lmms-0.4.6/data/projects/demos/demo5.mmp
+lmms-0.4.6/data/projects/tutorials/editing_note_volumes.mmp
+lmms-0.4.6/data/samples/beats/break03.ogg
+lmms-0.4.6/data/samples/beats/house_loop01.ogg
+lmms-0.4.6/data/samples/beats/electro_beat01.ogg
+lmms-0.4.6/data/samples/beats/electro_beat02.ogg
+lmms-0.4.6/data/samples/beats/rave_hihat01.ogg
+lmms-0.4.6/data/samples/beats/rave_hihat02.ogg
+lmms-0.4.6/data/samples/beats/jungle01.ogg
+lmms-0.4.6/data/samples/beats/909beat01.ogg
+lmms-0.4.6/data/samples/beats/break02.ogg
+lmms-0.4.6/data/samples/beats/rave_kick01.ogg
+lmms-0.4.6/data/samples/beats/rave_kick02.ogg
+lmms-0.4.6/data/samples/beats/break01.ogg
+lmms-0.4.6/data/samples/beats/rave_snare01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth04.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_bass01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth02.ogg
+lmms-0.4.6/data/samples/bassloopes/tb303_01.ogg
+lmms-0.4.6/data/samples/bassloopes/rave_bass02.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth03.ogg
+lmms-0.4.6/data/samples/bassloopes/rave_bass01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_bass02.ogg
+lmms-0.4.6/data/samples/bassloopes/briff01.ogg
+lmms-0.4.6/data/samples/drums/nasty_snare01.ogg
+lmms-0.4.6/data/samples/drums/kick_hard01.ogg
+lmms-0.4.6/data/samples/drums/shaker02.ogg
+lmms-0.4.6/data/samples/drums/zap02.ogg
+lmms-0.4.6/data/samples/drums/kick_soft02.ogg
+lmms-0.4.6/data/samples/drums/snare02.ogg
+lmms-0.4.6/data/samples/drums/tom_mid01.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened03.ogg
+lmms-0.4.6/data/samples/drums/tom01.ogg
+lmms-0.4.6/data/samples/drums/snare_rim01.ogg
+lmms-0.4.6/data/samples/drums/tom03.ogg
+lmms-0.4.6/data/samples/drums/zap01.ogg
+lmms-0.4.6/data/samples/drums/nasty_rim01.ogg
+lmms-0.4.6/data/samples/drums/kick_long01.ogg
+lmms-0.4.6/data/samples/drums/snare_hiphop02.ogg
+lmms-0.4.6/data/samples/drums/hihat_foot_pedal01.ogg
+lmms-0.4.6/data/samples/drums/clap02.ogg
+lmms-0.4.6/data/samples/drums/tom_hi01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum_acoustic01.ogg
+lmms-0.4.6/data/samples/drums/snare03.ogg
+lmms-0.4.6/data/samples/drums/kick04.ogg
+lmms-0.4.6/data/samples/drums/snare_electro01.ogg
+lmms-0.4.6/data/samples/drums/kick_distorted01.ogg
+lmms-0.4.6/data/samples/drums/ride02.ogg
+lmms-0.4.6/data/samples/drums/zap03.ogg
+lmms-0.4.6/data/samples/drums/wood01.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed04.ogg
+lmms-0.4.6/data/samples/drums/kick02.ogg
+lmms-0.4.6/data/samples/drums/clav01.ogg
+lmms-0.4.6/data/samples/drums/snare01.ogg
+lmms-0.4.6/data/samples/drums/kick01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum02.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed03.ogg
+lmms-0.4.6/data/samples/drums/tom04.ogg
+lmms-0.4.6/data/samples/drums/bassdrum03.ogg
+lmms-0.4.6/data/samples/drums/bassdrum04.ogg
+lmms-0.4.6/data/samples/drums/tom05.ogg
+lmms-0.4.6/data/samples/drums/snare_short01.ogg
+lmms-0.4.6/data/samples/drums/shaker01.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed05.ogg
+lmms-0.4.6/data/samples/drums/snare_harsh01.ogg
+lmms-0.4.6/data/samples/drums/tom02.ogg
+lmms-0.4.6/data/samples/drums/snare_hiphop01.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened02.ogg
+lmms-0.4.6/data/samples/drums/snare_muffled01.ogg
+lmms-0.4.6/data/samples/drums/clap03.ogg
+lmms-0.4.6/data/samples/drums/snare_muffled02.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum_acoustic02.ogg
+lmms-0.4.6/data/samples/drums/rim01.ogg
+lmms-0.4.6/data/samples/drums/kick_hiphop01.ogg
+lmms-0.4.6/data/samples/drums/crash01.ogg
+lmms-0.4.6/data/samples/drums/snare07.ogg
+lmms-0.4.6/data/samples/drums/clav02.ogg
+lmms-0.4.6/data/samples/drums/nasty_bass01.ogg
+lmms-0.4.6/data/samples/drums/snare_acoustic01.ogg
+lmms-0.4.6/data/samples/drums/kick03.ogg
+lmms-0.4.6/data/samples/drums/snare06.ogg
+lmms-0.4.6/data/samples/drums/kick_hardcore01.ogg
+lmms-0.4.6/data/samples/drums/ride01.ogg
+lmms-0.4.6/data/samples/drums/crash02.ogg
+lmms-0.4.6/data/samples/drums/kick_soft01.ogg
+lmms-0.4.6/data/samples/drums/snare05.ogg
+lmms-0.4.6/data/samples/drums/sidestick01.ogg
+lmms-0.4.6/data/samples/drums/clap01.ogg
+lmms-0.4.6/data/samples/drums/clap04.ogg
+lmms-0.4.6/data/samples/drums/shaker03.ogg
+lmms-0.4.6/data/samples/drums/bassdrum01.ogg
+lmms-0.4.6/data/samples/drums/snare04.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed02.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed01.ogg
+lmms-0.4.6/data/samples/drums/tom_low01.ogg
+lmms-0.4.6/data/samples/shapes/additive2.wav
+lmms-0.4.6/data/samples/shapes/technosynth3.wav
+lmms-0.4.6/data/samples/shapes/low_sine.wav
+lmms-0.4.6/data/samples/shapes/bunglist5.wav
+lmms-0.4.6/data/samples/shapes/bunglist8.wav
+lmms-0.4.6/data/samples/shapes/bunglist.wav
+lmms-0.4.6/data/samples/shapes/sine_dist.ogg
+lmms-0.4.6/data/samples/shapes/roundsaw.ogg
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw.ogg
+lmms-0.4.6/data/samples/shapes/harmonics.wav
+lmms-0.4.6/data/samples/shapes/micro.wav
+lmms-0.4.6/data/samples/shapes/vowel_u.wav
+lmms-0.4.6/data/samples/shapes/roundbass.wav
+lmms-0.4.6/data/samples/shapes/bunglist9.wav
+lmms-0.4.6/data/samples/shapes/technobass.wav
+lmms-0.4.6/data/samples/shapes/technosynth5.wav
+lmms-0.4.6/data/samples/shapes/technosynth6.wav
+lmms-0.4.6/data/samples/shapes/additive.wav
+lmms-0.4.6/data/samples/shapes/bunglist4.wav
+lmms-0.4.6/data/samples/shapes/bunglist7.wav
+lmms-0.4.6/data/samples/shapes/bunglist3.wav
+lmms-0.4.6/data/samples/shapes/technosynth4.wav
+lmms-0.4.6/data/samples/shapes/bunglist6.wav
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw2.ogg
+lmms-0.4.6/data/samples/shapes/moog.wav
+lmms-0.4.6/data/samples/shapes/saw+sine.wav
+lmms-0.4.6/data/samples/shapes/technosynth1.wav
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw_dist.ogg
+lmms-0.4.6/data/samples/shapes/vowel_a.wav
+lmms-0.4.6/data/samples/shapes/bunglist2.wav
+lmms-0.4.6/data/samples/shapes/technosynth2.wav
+lmms-0.4.6/data/samples/misc/metalish_dong01.ogg
+lmms-0.4.6/data/samples/misc/buzz!.ogg
+lmms-0.4.6/data/samples/misc/dong02.ogg
+lmms-0.4.6/data/samples/misc/dong03.ogg
+lmms-0.4.6/data/samples/misc/snaph01.ogg
+lmms-0.4.6/data/samples/misc/undefined01.ogg
+lmms-0.4.6/data/samples/misc/raving_crowd01.ogg
+lmms-0.4.6/data/samples/misc/hit02.ogg
+lmms-0.4.6/data/samples/misc/electric_ping01.ogg
+lmms-0.4.6/data/samples/misc/hit01.ogg
+lmms-0.4.6/data/samples/misc/breath01.ogg
+lmms-0.4.6/data/samples/misc/metronome01.ogg
+lmms-0.4.6/data/samples/misc/applause01.ogg
+lmms-0.4.6/data/samples/misc/dong01.ogg
+lmms-0.4.6/data/samples/misc/bass!.ogg
+lmms-0.4.6/data/samples/instruments/piano01.ogg
+lmms-0.4.6/data/samples/instruments/piano02.ogg
+lmms-0.4.6/data/samples/instruments/church_organ02.ogg
+lmms-0.4.6/data/samples/instruments/violin_fingered01.ogg
+lmms-0.4.6/data/samples/instruments/e_piano_accord01.ogg
+lmms-0.4.6/data/samples/instruments/cello01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ01.ogg
+lmms-0.4.6/data/samples/instruments/flute01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_medium_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ03.ogg
+lmms-0.4.6/data/samples/instruments/e_piano_accord02.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/bassslap02.ogg
+lmms-0.4.6/data/samples/instruments/e_organ01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ04.ogg
+lmms-0.4.6/data/samples/instruments/trumpet01.ogg
+lmms-0.4.6/data/samples/instruments/violin_pizzicato01.ogg
+lmms-0.4.6/data/samples/instruments/bassslap01.ogg
+lmms-0.4.6/data/samples/instruments/harpsichord01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_slight_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/violin_double_stop01.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar03.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar02.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar01.ogg
+lmms-0.4.6/data/samples/latin/latin_brass01.ogg
+lmms-0.4.6/data/samples/stringsnpads/chorus02.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings01.ogg
+lmms-0.4.6/data/samples/stringsnpads/juno_pad01.ogg
+lmms-0.4.6/data/samples/stringsnpads/bell_choir01.ogg
+lmms-0.4.6/data/samples/stringsnpads/korg_poly6_drone01.ogg
+lmms-0.4.6/data/samples/stringsnpads/strings01.ogg
+lmms-0.4.6/data/samples/stringsnpads/orion_string01.ogg
+lmms-0.4.6/data/samples/stringsnpads/bell_choir02.ogg
+lmms-0.4.6/data/samples/stringsnpads/rave_choir01.ogg
+lmms-0.4.6/data/samples/stringsnpads/chorus01.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings03.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings02.ogg
+lmms-0.4.6/data/samples/stringsnpads/nord_ambient01.ogg
+lmms-0.4.6/data/samples/stringsnpads/heaven_strings01.ogg
+lmms-0.4.6/data/samples/basses/bass_acid02.ogg
+lmms-0.4.6/data/samples/basses/techno_synth01.ogg
+lmms-0.4.6/data/samples/basses/rave_bass03.ogg
+lmms-0.4.6/data/samples/basses/rave_bass04.ogg
+lmms-0.4.6/data/samples/basses/matrix1000_pluck01.ogg
+lmms-0.4.6/data/samples/basses/bass_acid01.ogg
+lmms-0.4.6/data/samples/basses/rave_bass02.ogg
+lmms-0.4.6/data/samples/basses/bass_hard02.ogg
+lmms-0.4.6/data/samples/basses/rave_bass01.ogg
+lmms-0.4.6/data/samples/basses/synth_acid01.ogg
+lmms-0.4.6/data/samples/basses/synth_acid02.ogg
+lmms-0.4.6/data/samples/basses/horror_bass01.ogg
+lmms-0.4.6/data/samples/basses/bass_punch01.ogg
+lmms-0.4.6/data/samples/basses/bass_hard01.ogg
+lmms-0.4.6/data/samples/basses/bass01.ogg
+lmms-0.4.6/data/samples/effects/start01.ogg
+lmms-0.4.6/data/samples/effects/chroma_sound_effect01.ogg
+lmms-0.4.6/data/samples/effects/stop01.ogg
+lmms-0.4.6/data/samples/effects/scratch01.ogg
+lmms-0.4.6/data/samples/effects/wind_chimes01.ogg
+lmms-0.4.6/data/samples/effects/explode01.ogg
+lmms-0.4.6/data/samples/effects/warp02.ogg
+lmms-0.4.6/data/samples/effects/warp01.ogg
+lmms-0.4.6/data/samples/effects/filter_sweep01.ogg
+lmms-0.4.6/data/samples/effects/start02.ogg


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	4 Sep 2009 21:21:19 -0000	1.5
+++ import.log	30 Dec 2009 21:24:37 -0000	1.6
@@ -3,3 +3,4 @@ lmms-0_4_2-4_fc10:HEAD:lmms-0.4.2-4.fc10
 lmms-0_4_3-1_fc10:HEAD:lmms-0.4.3-1.fc10.src.rpm:1236642380
 lmms-0_4_4-1_fc11:HEAD:lmms-0.4.4-1.fc11.src.rpm:1242758267
 lmms-0_4_5-1_fc11:HEAD:lmms-0.4.5-1.fc11.src.rpm:1252099213
+lmms-0_4_6-1_fc12:F-12:lmms-0.4.6-1.fc12.src.rpm:1262208036


Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-12/lmms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- lmms.spec	23 Sep 2009 05:05:28 -0000	1.8
+++ lmms.spec	30 Dec 2009 21:24:37 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           lmms
-Version:        0.4.5
-Release:        2%{?dist}
+Version:        0.4.6
+Release:        1%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
 Group:          Applications/Multimedia
@@ -36,14 +36,14 @@ Source0:        %{name}-%{version}.strip
 Source1:        README.fedora
 
 # our cmake seems to have a different value for LIB_DIR.
-Patch0:         lmms-0.4.5-libdir.patch
+Patch0:         lmms-0.4.6-libdir.patch
 
 # move the vst and zynaddsubfx plugins to libexecdir.
-Patch1:         lmms-0.4.5-libexecdir.patch
+Patch1:         lmms-0.4.6-libexecdir.patch
 
 # build with vst support but without having wine. that is a patch
 # upstream isn't really interested in.
-Patch2:         lmms-0.4.5-vst-nowine.patch
+Patch2:         lmms-0.4.6-vst-nowine.patch
 
 # FIXME: we surely want to patch zynaddsubfx to use system's fltk and
 # minixml. using system's zynaddsubfx however is, according to lmms'
@@ -189,10 +189,10 @@ update-desktop-database &> /dev/null || 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO README.fedora
+%doc AUTHORS COPYING README TODO README.fedora
 %{_bindir}/%{name}
 %{_libdir}/%{name}
-%{_libexecdir}/remote_zynaddsubfx
+%{_libexecdir}/RemoteZynAddSubFx
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
@@ -223,6 +223,11 @@ This package contains the necessary file
 
 
 %changelog
+* Wed Dec 30 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.6-1
+- Update to 0.4.6.
+- Rebase patches.
+- Minor specfile fixes.
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.4.5-2
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Sep 2009 21:21:19 -0000	1.6
+++ sources	30 Dec 2009 21:24:37 -0000	1.7
@@ -1 +1 @@
-efbd9ddef0a975cffe9abc2da8b04143  lmms-0.4.5.stripped.tar.bz2
+23e599158b60bc665b6715b68dd38185  lmms-0.4.6.stripped.tar.bz2


--- lmms-0.4.5-libdir.patch DELETED ---


--- lmms-0.4.5-libexecdir.patch DELETED ---


--- lmms-0.4.5-vst-nowine.patch DELETED ---



From leigh123linux at fedoraproject.org  Wed Dec 30 21:24:46 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 30 Dec 2009 21:24:46 +0000 (UTC)
Subject: File qbittorrent-2.1.0beta3.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091230212446.EEC6110F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qbittorrent:

ce6b1df11478092374cbb7311148f904  qbittorrent-2.1.0beta3.tar.gz



From leigh123linux at fedoraproject.org  Wed Dec 30 21:25:15 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 30 Dec 2009 21:25:15 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 .cvsignore, 1.21, 1.22 qbittorrent.spec, 1.45, 
	1.46 sources, 1.23, 1.24
Message-ID: <20091230212515.A82F011C00E9@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1313

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Wed Dec 30 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.4-1
- update to 2.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	23 Dec 2009 09:12:34 -0000	1.21
+++ .cvsignore	30 Dec 2009 21:25:15 -0000	1.22
@@ -1 +1 @@
-qbittorrent-2.0.3.tar.gz
+qbittorrent-2.0.4.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- qbittorrent.spec	23 Dec 2009 09:12:35 -0000	1.45
+++ qbittorrent.spec	30 Dec 2009 21:25:15 -0000	1.46
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.0.3
+Version: 2.0.4
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Wed Dec 30 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.4-1
+- update to 2.0.4
+
 * Wed Dec 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.3-1
 - update to 2.0.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	23 Dec 2009 09:12:35 -0000	1.23
+++ sources	30 Dec 2009 21:25:15 -0000	1.24
@@ -1 +1 @@
-f8ec0485a859d2532d53c9f35826c8f6  qbittorrent-2.0.3.tar.gz
+e1541e2334698881f8fd8c21aa9854c0  qbittorrent-2.0.4.tar.gz



From leigh123linux at fedoraproject.org  Wed Dec 30 21:25:30 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 30 Dec 2009 21:25:30 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.35, 1.36 gcc.patch, 1.3,
	1.4 qbittorrent.spec, 1.61, 1.62 sources, 1.36, 1.37
Message-ID: <20091230212530.56DCD11C00E9@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1401

Modified Files:
	.cvsignore gcc.patch qbittorrent.spec sources 
Log Message:
* Wed Dec 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.2.beta1
- update to 2.1.0beta2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	23 Dec 2009 09:20:15 -0000	1.35
+++ .cvsignore	30 Dec 2009 21:25:30 -0000	1.36
@@ -1 +1 @@
-qbittorrent-2.1.0beta2.tar.gz
+qbittorrent-2.1.0beta3.tar.gz

gcc.patch:
 src.pro |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/gcc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gcc.patch	23 Dec 2009 09:20:15 -0000	1.3
+++ gcc.patch	30 Dec 2009 21:25:30 -0000	1.4
@@ -16,6 +16,6 @@ diff -up qbittorrent-2.0.2/src/src.pro.n
  
 +QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
  # Update this VERSION for each release
- DEFINES += VERSION=\\\"v2.1.0beta2\\\"
+ DEFINES += VERSION=\\\"v2.1.0beta3\\\"
  DEFINES += VERSION_MAJOR=2
 


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- qbittorrent.spec	23 Dec 2009 09:20:15 -0000	1.61
+++ qbittorrent.spec	30 Dec 2009 21:25:30 -0000	1.62
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.1.0
-Release: 0.2.beta2%{?dist}
+Release: 0.3.beta3%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -11,7 +11,7 @@ Release: 0.2.beta2%{?dist}
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 #Source0:  %{name}-%{svn_rev}svn.tar.gz
 #Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
-Source0: http://downloads.sf.net/qbittorrent/files/qbittorrent-unstable/%{name}-%{version}beta2.tar.gz
+Source0: http://downloads.sf.net/qbittorrent/files/qbittorrent-unstable/%{name}-%{version}beta3.tar.gz
 # https://bugzilla.redhat.com/show_bug.cgi?id=548491
 Patch1:  gcc.patch
 
@@ -34,7 +34,7 @@ A Bittorrent client using rb_libtorrent 
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q -n %{name}-%{version}beta2
+%setup -q -n %{name}-%{version}beta3
 %patch1 -p1 -b .gcc
 
 %build
@@ -77,6 +77,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Wed Dec 30 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.3.beta3
+- update to 2.1.0beta3
+
 * Wed Dec 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.2.beta1
 - update to 2.1.0beta2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	23 Dec 2009 09:20:15 -0000	1.36
+++ sources	30 Dec 2009 21:25:30 -0000	1.37
@@ -1 +1 @@
-591cc85bba43f95a3b1ccecbaa5051b5  qbittorrent-2.1.0beta2.tar.gz
+ce6b1df11478092374cbb7311148f904  qbittorrent-2.1.0beta3.tar.gz



From pghmcfc at fedoraproject.org  Wed Dec 30 21:34:38 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 30 Dec 2009 21:34:38 +0000 (UTC)
Subject: rpms/bluefish/devel .cvsignore, 1.9, 1.10 bluefish.spec, 1.30,
	1.31 sources, 1.9, 1.10 bluefish-1.0.7-enchant-configure.patch,
	1.1, NONE bluefish-1.0.7-enchant.patch, 1.1,
	NONE bluefish-1.0.7-syntax-highlight.patch, 1.1, NONE
Message-ID: <20091230213438.A7D4411C00E9@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/bluefish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3356

Modified Files:
	.cvsignore bluefish.spec sources 
Removed Files:
	bluefish-1.0.7-enchant-configure.patch 
	bluefish-1.0.7-enchant.patch 
	bluefish-1.0.7-syntax-highlight.patch 
Log Message:
- Update to major new version - 2.0.0-rc1 (#549552)
- Drop all patches
- No longer need buildreqs gail-devel, gnome-mime-data, gnome-vfs2-devel
- Buildreq gucharmap-devel >= 2.20 for charmap plugin
- Buildreq intltool for translations
- Buildreq man to check man pages
- Buildreq python-devel for python plugin
- Req findutils and grep for the Advanced Open function
- Use %{name} macro for spec file compatibility with bluefish-unstable
- Call %find_lang multiple times for plugin translations
- Filter provides for plugin shared objects
- Desktop file now installed as part of upstream install process, so use
  desktop-file-validate instead of desktop-file-install
- Explicitly enable python plugin (disabled by default despite docs to contrary)
- All supported releases now have noarch subpackages, so drop conditionals



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Nov 2006 11:05:40 -0000	1.9
+++ .cvsignore	30 Dec 2009 21:34:38 -0000	1.10
@@ -1 +1 @@
-bluefish-1.0.7.tar.bz2
+bluefish-2.0.0-rc1.tar.bz2


Index: bluefish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- bluefish.spec	19 Nov 2009 11:47:10 -0000	1.30
+++ bluefish.spec	30 Dec 2009 21:34:38 -0000	1.31
@@ -1,97 +1,99 @@
-# Fedora 10 onwards support noarch subpackages; by using one, we can
-# put the arch-independent data in a common subpackage and save lots
-# of space on the mirrors
-%if 0%{?fedora} > 9
-%global shared_data_package 1
-%else
-%global shared_data_package 0
-%endif
+%global pkgver 2.0.0
+%global prerel rc1
+%global rpmrel 1
 
 Name:		bluefish
-Version:	1.0.7
-Release:	9%{?dist}
+Version:	%{pkgver}
+Release:	%{?prerel:0.}%{rpmrel}%{?prerel:.%{prerel}}%{?dist}
 Summary:	GTK2 web development application for experienced users
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://bluefish.openoffice.nl/
-Source0:	http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2
-Patch0:		bluefish-1.0.7-syntax-highlight.patch
-Patch1:		bluefish-1.0.7-enchant.patch
-Patch2:		bluefish-1.0.7-enchant-configure.patch
+Source0:	http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
 BuildRequires:	enchant-devel >= 1.4.2
 BuildRequires:	gettext
-BuildRequires:	gnome-mime-data
-BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gtk2-devel >= 2.0.6
+BuildRequires:	glib2-devel >= 2.16
+BuildRequires:	gtk2-devel >= 2.12
+BuildRequires:	gucharmap-devel >= 2.20
+BuildRequires:	intltool
 BuildRequires:	libgnomeui-devel >= 2.6
+BuildRequires:	man
 BuildRequires:	pcre-devel >= 3.9
-# gail-devel needed because libgnomeui->libgnomecanvas chain doesn't pull it
-# in (at least on F-9), and libgnomeui detection fails because of
-# requires.private gail in libgnomecanvas-2.0.pc
-BuildRequires:	gail-devel
-%if %{shared_data_package}
-Requires:	bluefish-shared-data = %{version}-%{release}
-%else
-# Requires for directory ownership
-Requires:	gnome-mime-data, shared-mime-info
-%endif
+BuildRequires:	python-devel
+# For the Advanced Open function
+Requires:	findutils, grep
+Requires:	%{name}-shared-data = %{version}-%{release}
+
+# Automatically upgrade bluefish-unstable
+Obsoletes:	bluefish-unstable < %{version}-%{release}
+Provides:	bluefish-unstable = %{version}-%{release}
+
+# Don't "provide" plugin shared objects
+%{?filter_setup:
+%filter_provides_in %{_libdir}/%{name}/.*\.so$
+%filter_setup
+}
 
 %description
 Bluefish is a powerful editor for experienced web designers and programmers.
 Bluefish supports many programming and markup languages, but it focuses on
 editing dynamic and interactive websites.
 
-%if %{shared_data_package}
 %package shared-data
-Summary:	Architecture-independent data for bluefish
+Summary:	Architecture-independent data for %{name}
 Group:		Development/Tools
 BuildArch:	noarch
-# Requires for directory ownership
-Requires:	gnome-mime-data, shared-mime-info
+# For ownership of %{_datadir}/mime/packages
+Requires:	shared-mime-info
+# For ownership of %{_datadir}/icons/hicolor/*/{apps,mimetypes}
+Requires:	hicolor-icon-theme
+
+# Automatically upgrade bluefish-unstable-shared-data
+Obsoletes:	bluefish-unstable-shared-data < %{version}-%{release}
+Provides:	bluefish-unstable-shared-data = %{version}-%{release}
 
 %description shared-data
-Files common to every architecture version of bluefish.
-%endif
+Files common to every architecture version of %{name}.
 
 %prep
-%setup -q
-
-# Upstream patch to work around problem editing syntax highlighting patterns (#390871)
-%patch0 -p0
-
-# Use enchant rather than aspell (#509514, http://bugzilla.gnome.org/587666)
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
 
 %build
-%configure --disable-update-databases
+%configure	--disable-update-databases \
+		--disable-static \
+		--enable-python
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-%{__make} install \
-	DESTDIR=%{buildroot} \
-	INSTALL="%{__install} -p" \
-	INSTALL_PROGRAM="%{__install} -m 755"
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 %find_lang %{name}
-/usr/bin/desktop-file-install --vendor fedora --delete-original \
-	--dir %{buildroot}%{_datadir}/applications		\
-	%{buildroot}%{_datadir}/applications/bluefish.desktop
-/usr/bin/desktop-file-install --vendor fedora --delete-original \
-	--dir %{buildroot}%{_datadir}/applications		\
-	%{buildroot}%{_datadir}/applications/bluefish-project.desktop
+%find_lang %{name}_plugin_about
+%find_lang %{name}_plugin_charmap
+%find_lang %{name}_plugin_entities
+%find_lang %{name}_plugin_htmlbar
+%find_lang %{name}_plugin_infbrowser
+%find_lang %{name}_plugin_snippets
+%{__cat} %{name}_plugin_{about,charmap,entities,htmlbar,infbrowser,snippets}.lang >> \
+	%{name}.lang
+
+/usr/bin/desktop-file-validate \
+	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # Manually install docs so that they go into
-# %{_defaultdocdir}/bluefish-%{version} even if we put them in the
+# %{_defaultdocdir}/%{name}-%{version} even after we put them in the
 # shared-data subpackage
-%{__install} -d %{buildroot}%{_defaultdocdir}/bluefish-%{version}
-%{__install} -m 644 -p -t %{buildroot}%{_defaultdocdir}/bluefish-%{version}/ \
+%{__install} -d %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+%{__install} -m 644 -p -t %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ \
 	AUTHORS ChangeLog COPYING NEWS README TODO
 
+# Unpackaged files
+%{__rm} -f %{buildroot}%{_libdir}/%{name}/*.la
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -103,34 +105,45 @@ Files common to every architecture versi
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 /usr/bin/update-desktop-database &> /dev/null || :
 
-%if %{shared_data_package}
 %files
 %defattr(-,root,root,-)
-%else
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%endif
-%{_bindir}/bluefish
+%{_bindir}/%{name}
+%{_libdir}/%{name}/
 
-%if %{shared_data_package}
 %files shared-data -f %{name}.lang
 %defattr(-,root,root,-)
-%endif
-%{_datadir}/applications/fedora-bluefish.desktop
-%{_datadir}/applications/fedora-bluefish-project.desktop
-%{_datadir}/application-registry/bluefish.applications
-%{_datadir}/bluefish/
-%{_datadir}/mime/packages/bluefish.xml
-%{_datadir}/mime-info/bluefish.keys
-%{_datadir}/mime-info/bluefish.mime
-%{_datadir}/pixmaps/bluefish-icon.png
-%{_datadir}/pixmaps/gnome-mime-application-bluefish-project.png
-%{_defaultdocdir}/bluefish-%{version}/
-%{_mandir}/man1/bluefish.1*
+%{_datadir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-bluefish-project.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/mimetypes/bluefish-project.svg
+%{_datadir}/icons/hicolor/scalable/apps/bluefish-icon.svg
+%{_datadir}/pixmaps/application-x-bluefish-project.png
+%{_datadir}/pixmaps/%{name}.png
+%{_defaultdocdir}/%{name}-%{version}/
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Dec 30 2009 Paul Howarth <paul at city-fan.org> - 2.0.0-0.1.rc1
+- Update to major new version - 2.0.0-rc1 (#549552)
+- Drop all patches
+- No longer need buildreqs gail-devel, gnome-mime-data, gnome-vfs2-devel
+- Buildreq gucharmap-devel >= 2.20 for charmap plugin
+- Buildreq intltool for translations
+- Buildreq man to check man pages
+- Buildreq python-devel for python plugin
+- Req findutils and grep for the Advanced Open function
+- Use %%{name} macro for spec file compatibility with bluefish-unstable
+- Call %%find_lang multiple times for plugin translations
+- Filter provides for plugin shared objects
+- Desktop file now installed as part of upstream install process, so use
+  desktop-file-validate instead of desktop-file-install
+- Explicitly enable python plugin (disabled by default despite docs to contrary)
+- All supported releases now have noarch subpackages, so drop conditionals
+
 * Thu Nov 19 2009 Paul Howarth <paul at city-fan.org> - 1.0.7-9
-- Buildreq gnome-mime-data, not pulled in by gnome-vfs2 since 2.24.1-8
+- Buildreq gnome-mime-data, not pulled in by gnome-vfs2 since 2.24.1-8 (#539223)
 - Buildreq enchant-devel >= 1.4.2, needed for enchant_dict_add
 - Make %%files list more explicit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Nov 2006 11:05:40 -0000	1.9
+++ sources	30 Dec 2009 21:34:38 -0000	1.10
@@ -1 +1 @@
-2c3b3c9c8f8e32b9473dfd879f216dea  bluefish-1.0.7.tar.bz2
+e1c1ee287b21daa336425caa1cca1b70  bluefish-2.0.0-rc1.tar.bz2


--- bluefish-1.0.7-enchant-configure.patch DELETED ---


--- bluefish-1.0.7-enchant.patch DELETED ---


--- bluefish-1.0.7-syntax-highlight.patch DELETED ---



From thm at fedoraproject.org  Wed Dec 30 21:45:20 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 30 Dec 2009 21:45:20 +0000 (UTC)
Subject: rpms/lmms/F-11 lmms-0.4.6-libdir.patch, NONE,
	1.1 lmms-0.4.6-libexecdir.patch, NONE,
	1.1 lmms-0.4.6-vst-nowine.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 README.fedora, 1.3, 1.4 import.log, 1.5, 1.6 lmms.spec, 1.6,
	1.7 sources, 1.6, 1.7 lmms-0.4.5-libdir.patch, 1.1,
	NONE lmms-0.4.5-libexecdir.patch, 1.1,
	NONE lmms-0.4.5-vst-nowine.patch, 1.1, NONE
Message-ID: <20091230214520.7E07811C00E9@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/lmms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6518/F-11

Modified Files:
	.cvsignore README.fedora import.log lmms.spec sources 
Added Files:
	lmms-0.4.6-libdir.patch lmms-0.4.6-libexecdir.patch 
	lmms-0.4.6-vst-nowine.patch 
Removed Files:
	lmms-0.4.5-libdir.patch lmms-0.4.5-libexecdir.patch 
	lmms-0.4.5-vst-nowine.patch 
Log Message:
Update to 0.4.6.

lmms-0.4.6-libdir.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lmms-0.4.6-libdir.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig1 lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig1	2009-12-25 00:49:19.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:04:57.000000000 +0100
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})

lmms-0.4.6-libexecdir.patch:
 CMakeLists.txt                     |    2 +-
 plugins/vst_base/CMakeLists.txt    |    2 +-
 plugins/zynaddsubfx/CMakeLists.txt |    2 +-
 src/core/RemotePlugin.cpp          |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lmms-0.4.6-libexecdir.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig	2009-12-30 12:04:57.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:08:29.000000000 +0100
@@ -431,7 +431,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
 LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
diff -up lmms-0.4.6/plugins/vst_base/CMakeLists.txt.orig lmms-0.4.6/plugins/vst_base/CMakeLists.txt
--- lmms-0.4.6/plugins/vst_base/CMakeLists.txt.orig	2009-12-25 00:49:23.000000000 +0100
+++ lmms-0.4.6/plugins/vst_base/CMakeLists.txt	2009-12-30 12:08:29.000000000 +0100
@@ -30,7 +30,7 @@ ADD_CUSTOM_COMMAND(
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES remote_vst_plugin.exe.so)
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${PLUGIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 
diff -up lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt.orig lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt
--- lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt.orig	2009-12-25 00:49:24.000000000 +0100
+++ lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt	2009-12-30 12:10:53.000000000 +0100
@@ -105,7 +105,7 @@ TARGET_LINK_LIBRARIES(zynaddsubfx ZynAdd
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI})
-INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR})
+INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
 TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a)
 ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
 
diff -up lmms-0.4.6/src/core/RemotePlugin.cpp.orig lmms-0.4.6/src/core/RemotePlugin.cpp
--- lmms-0.4.6/src/core/RemotePlugin.cpp.orig	2009-12-25 00:49:25.000000000 +0100
+++ lmms-0.4.6/src/core/RemotePlugin.cpp	2009-12-30 12:13:46.000000000 +0100
@@ -86,8 +86,8 @@ RemotePlugin::RemotePlugin( const QStrin
 	m_outputCount( DEFAULT_CHANNELS )
 {
 	lock();
-	QString exec = configManager::inst()->pluginDir() +
-					QDir::separator() + _plugin_executable;
+	QString exec = QString( LIBEXEC_DIR ) +
+		QDir::separator() + _plugin_executable;
 	QStringList args;
 	// swap in and out for bidirectional communication
 	args << QString::number( out()->shmKey() );

lmms-0.4.6-vst-nowine.patch:
 CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE lmms-0.4.6-vst-nowine.patch ---
diff -up lmms-0.4.6/CMakeLists.txt.orig lmms-0.4.6/CMakeLists.txt
--- lmms-0.4.6/CMakeLists.txt.orig	2009-12-30 12:08:29.000000000 +0100
+++ lmms-0.4.6/CMakeLists.txt	2009-12-30 12:37:29.000000000 +0100
@@ -329,6 +329,9 @@ IF(LMMS_BUILD_WIN32)
 	SET(LMMS_SUPPORT_VST TRUE)
 	SET(STATUS_VST "OK")
 ENDIF(LMMS_BUILD_WIN32)
+IF(WANT_VST_NOWINE)
+	SET(LMMS_SUPPORT_VST TRUE)
+ENDIF(WANT_VST_NOWINE)
 
 
 # check for libsamplerate


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Sep 2009 21:29:31 -0000	1.5
+++ .cvsignore	30 Dec 2009 21:45:20 -0000	1.6
@@ -1 +1 @@
-lmms-0.4.5.stripped.tar.bz2
+lmms-0.4.6.stripped.tar.bz2


Index: README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/README.fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README.fedora	4 Sep 2009 21:29:31 -0000	1.3
+++ README.fedora	30 Dec 2009 21:45:20 -0000	1.4
@@ -1,254 +1,247 @@
 For legal reasons, the following files have been removed from the
 original tarfile:
 
-lmms-0.4.5/data/projects/tutorials/editing_note_volumes.mmp
-lmms-0.4.5/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
-lmms-0.4.5/data/projects/covers/MonkeyIsland1-Intro.mmpz
-lmms-0.4.5/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
-lmms-0.4.5/data/projects/oldstuff/MaxFellner-Ease.mmp
-lmms-0.4.5/data/projects/oldstuff/time_machine.mmp
-lmms-0.4.5/data/projects/oldstuff/Mart-Dirt_Track.mmp
-lmms-0.4.5/data/projects/oldstuff/1st.mmp
-lmms-0.4.5/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
-lmms-0.4.5/data/projects/demos/beat_collection.mmp
-lmms-0.4.5/data/projects/demos/demo5.mmp
-lmms-0.4.5/data/projects/demos/newFangled.mmpz
-lmms-0.4.5/data/projects/demos/TobyDox-Crystallo.mmp
-lmms-0.4.5/data/projects/demos/loop_collection.mmp
-lmms-0.4.5/data/projects/demos/demo1.mmp
-lmms-0.4.5/data/projects/demos/demo4.mmp
-lmms-0.4.5/data/projects/demos/demo3.mmp
-lmms-0.4.5/data/projects/demos/lb302quick.mmpz
-lmms-0.4.5/data/projects/demos/demo2.mmp
-lmms-0.4.5/data/projects/demos/demo6.mmp
-lmms-0.4.5/data/projects/demos/some_basslines.mmp
-lmms-0.4.5/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
-lmms-0.4.5/data/projects/cool_songs/MysthR-Living.mmpz
-lmms-0.4.5/data/projects/cool_songs/Siegel-DreamWave.mmp
-lmms-0.4.5/data/projects/cool_songs/Silva-ElvesCall.mmp
-lmms-0.4.5/data/projects/cool_songs/TobyDox-Psycho.mmp
-lmms-0.4.5/data/projects/cool_songs/Chris-RaveRiff.mmpz
-lmms-0.4.5/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
-lmms-0.4.5/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
-lmms-0.4.5/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
-lmms-0.4.5/data/projects/cool_songs/Chris-HorizonRemix.mmp
-lmms-0.4.5/data/projects/cool_songs/j1m-DingDong.mmp
-lmms-0.4.5/data/projects/cool_songs/Djeezus-BeatRolls.mmp
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
-lmms-0.4.5/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
-lmms-0.4.5/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
-lmms-0.4.5/data/projects/cool_songs/Malex-Horizon4.mmp
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-Underline.mmp
-lmms-0.4.5/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
-lmms-0.4.5/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
-lmms-0.4.5/data/projects/cool_songs/SharkyX-Experiments.mmp
-lmms-0.4.5/data/projects/cool_songs/Skiessi-Onion.mmpz
-lmms-0.4.5/data/projects/cool_songs/TobyDox-Confused.mmp
-lmms-0.4.5/data/projects/cool_songs/Siegel-SpeedTrack.mmp
-lmms-0.4.5/data/projects/cool_songs/Djeezus-Oscilisous.mmp
-lmms-0.4.5/data/samples/latin/latin_brass01.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar03.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar01.ogg
-lmms-0.4.5/data/samples/latin/latin_guitar02.ogg
-lmms-0.4.5/data/samples/shapes/technosynth3.wav
-lmms-0.4.5/data/samples/shapes/technosynth1.wav
-lmms-0.4.5/data/samples/shapes/technosynth2.wav
-lmms-0.4.5/data/samples/shapes/additive2.wav
-lmms-0.4.5/data/samples/shapes/harmonics.wav
-lmms-0.4.5/data/samples/shapes/micro.wav
-lmms-0.4.5/data/samples/shapes/bunglist2.wav
-lmms-0.4.5/data/samples/shapes/bunglist3.wav
-lmms-0.4.5/data/samples/shapes/saw+sine.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw2.ogg
-lmms-0.4.5/data/samples/shapes/bunglist.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw.ogg
-lmms-0.4.5/data/samples/shapes/roundbass.wav
-lmms-0.4.5/data/samples/shapes/bunglist9.wav
-lmms-0.4.5/data/samples/shapes/bunglist7.wav
-lmms-0.4.5/data/samples/shapes/low_sine.wav
-lmms-0.4.5/data/samples/shapes/bunglist4.wav
-lmms-0.4.5/data/samples/shapes/bunglist5.wav
-lmms-0.4.5/data/samples/shapes/sine_dist.ogg
-lmms-0.4.5/data/samples/shapes/technobass.wav
-lmms-0.4.5/data/samples/shapes/roundsaw.ogg
-lmms-0.4.5/data/samples/shapes/technosynth6.wav
-lmms-0.4.5/data/samples/shapes/smooth_inv_saw_dist.ogg
-lmms-0.4.5/data/samples/shapes/bunglist6.wav
-lmms-0.4.5/data/samples/shapes/moog.wav
-lmms-0.4.5/data/samples/shapes/bunglist8.wav
-lmms-0.4.5/data/samples/shapes/additive.wav
-lmms-0.4.5/data/samples/shapes/technosynth5.wav
-lmms-0.4.5/data/samples/shapes/technosynth4.wav
-lmms-0.4.5/data/samples/shapes/vowel_a.wav
-lmms-0.4.5/data/samples/shapes/vowel_u.wav
-lmms-0.4.5/data/samples/basses/bass_punch01.ogg
-lmms-0.4.5/data/samples/basses/bass_acid01.ogg
-lmms-0.4.5/data/samples/basses/rave_bass02.ogg
-lmms-0.4.5/data/samples/basses/bass_hard02.ogg
-lmms-0.4.5/data/samples/basses/rave_bass01.ogg
-lmms-0.4.5/data/samples/basses/bass_hard01.ogg
-lmms-0.4.5/data/samples/basses/synth_acid02.ogg
-lmms-0.4.5/data/samples/basses/horror_bass01.ogg
-lmms-0.4.5/data/samples/basses/matrix1000_pluck01.ogg
-lmms-0.4.5/data/samples/basses/bass01.ogg
-lmms-0.4.5/data/samples/basses/bass_acid02.ogg
-lmms-0.4.5/data/samples/basses/synth_acid01.ogg
-lmms-0.4.5/data/samples/basses/techno_synth01.ogg
-lmms-0.4.5/data/samples/basses/rave_bass04.ogg
-lmms-0.4.5/data/samples/basses/rave_bass03.ogg
-lmms-0.4.5/data/samples/effects/explode01.ogg
-lmms-0.4.5/data/samples/effects/warp01.ogg
-lmms-0.4.5/data/samples/effects/filter_sweep01.ogg
-lmms-0.4.5/data/samples/effects/start01.ogg
-lmms-0.4.5/data/samples/effects/wind_chimes01.ogg
-lmms-0.4.5/data/samples/effects/scratch01.ogg
-lmms-0.4.5/data/samples/effects/warp02.ogg
-lmms-0.4.5/data/samples/effects/chroma_sound_effect01.ogg
-lmms-0.4.5/data/samples/effects/stop01.ogg
-lmms-0.4.5/data/samples/effects/start02.ogg
-lmms-0.4.5/data/samples/beats/house_loop01.ogg
-lmms-0.4.5/data/samples/beats/break02.ogg
-lmms-0.4.5/data/samples/beats/909beat01.ogg
-lmms-0.4.5/data/samples/beats/break03.ogg
-lmms-0.4.5/data/samples/beats/electro_beat02.ogg
-lmms-0.4.5/data/samples/beats/electro_beat01.ogg
-lmms-0.4.5/data/samples/beats/jungle01.ogg
-lmms-0.4.5/data/samples/beats/rave_hihat01.ogg
-lmms-0.4.5/data/samples/beats/rave_kick01.ogg
-lmms-0.4.5/data/samples/beats/rave_kick02.ogg
-lmms-0.4.5/data/samples/beats/break01.ogg
-lmms-0.4.5/data/samples/beats/rave_snare01.ogg
-lmms-0.4.5/data/samples/beats/rave_hihat02.ogg
-lmms-0.4.5/data/samples/stringsnpads/bell_choir02.ogg
-lmms-0.4.5/data/samples/stringsnpads/strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/korg_poly6_drone01.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/chorus02.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings03.ogg
-lmms-0.4.5/data/samples/stringsnpads/chorus01.ogg
-lmms-0.4.5/data/samples/stringsnpads/juno_pad01.ogg
-lmms-0.4.5/data/samples/stringsnpads/orion_string01.ogg
-lmms-0.4.5/data/samples/stringsnpads/rave_choir01.ogg
-lmms-0.4.5/data/samples/stringsnpads/bell_choir01.ogg
-lmms-0.4.5/data/samples/stringsnpads/heaven_strings01.ogg
-lmms-0.4.5/data/samples/stringsnpads/nord_ambient01.ogg
-lmms-0.4.5/data/samples/stringsnpads/space_strings02.ogg
-lmms-0.4.5/data/samples/bassloopes/briff01.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_bass01.ogg
-lmms-0.4.5/data/samples/bassloopes/rave_bass02.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth02.ogg
-lmms-0.4.5/data/samples/bassloopes/tb303_01.ogg
-lmms-0.4.5/data/samples/bassloopes/rave_bass01.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth03.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_bass02.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth04.ogg
-lmms-0.4.5/data/samples/bassloopes/techno_synth01.ogg
-lmms-0.4.5/data/samples/instruments/violin_double_stop01.ogg
-lmms-0.4.5/data/samples/instruments/bassslap01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ01.ogg
-lmms-0.4.5/data/samples/instruments/e_piano_accord01.ogg
-lmms-0.4.5/data/samples/instruments/flute01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_medium_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ04.ogg
-lmms-0.4.5/data/samples/instruments/trumpet01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_slight_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
-lmms-0.4.5/data/samples/instruments/e_organ01.ogg
-lmms-0.4.5/data/samples/instruments/church_organ03.ogg
-lmms-0.4.5/data/samples/instruments/piano02.ogg
-lmms-0.4.5/data/samples/instruments/cello01.ogg
-lmms-0.4.5/data/samples/instruments/piano01.ogg
-lmms-0.4.5/data/samples/instruments/violin_fingered01.ogg
-lmms-0.4.5/data/samples/instruments/violin_pizzicato01.ogg
-lmms-0.4.5/data/samples/instruments/e_piano_accord02.ogg
-lmms-0.4.5/data/samples/instruments/harpsichord01.ogg
-lmms-0.4.5/data/samples/instruments/steel_guitar01.ogg
-lmms-0.4.5/data/samples/instruments/bassslap02.ogg
-lmms-0.4.5/data/samples/instruments/church_organ02.ogg
-lmms-0.4.5/data/samples/misc/applause01.ogg
-lmms-0.4.5/data/samples/misc/breath01.ogg
-lmms-0.4.5/data/samples/misc/raving_crowd01.ogg
-lmms-0.4.5/data/samples/misc/hit02.ogg
-lmms-0.4.5/data/samples/misc/dong01.ogg
-lmms-0.4.5/data/samples/misc/hit01.ogg
-lmms-0.4.5/data/samples/misc/bass!.ogg
-lmms-0.4.5/data/samples/misc/dong03.ogg
-lmms-0.4.5/data/samples/misc/undefined01.ogg
-lmms-0.4.5/data/samples/misc/metronome01.ogg
-lmms-0.4.5/data/samples/misc/buzz!.ogg
-lmms-0.4.5/data/samples/misc/dong02.ogg
-lmms-0.4.5/data/samples/misc/electric_ping01.ogg
-lmms-0.4.5/data/samples/misc/metalish_dong01.ogg
-lmms-0.4.5/data/samples/misc/snaph01.ogg
-lmms-0.4.5/data/samples/drums/kick_soft01.ogg
-lmms-0.4.5/data/samples/drums/snare_rim01.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened02.ogg
-lmms-0.4.5/data/samples/drums/snare05.ogg
-lmms-0.4.5/data/samples/drums/bassdrum_acoustic02.ogg
-lmms-0.4.5/data/samples/drums/kick_hard01.ogg
-lmms-0.4.5/data/samples/drums/sidestick01.ogg
-lmms-0.4.5/data/samples/drums/clap01.ogg
-lmms-0.4.5/data/samples/drums/snare02.ogg
-lmms-0.4.5/data/samples/drums/clap02.ogg
-lmms-0.4.5/data/samples/drums/snare04.ogg
-lmms-0.4.5/data/samples/drums/bassdrum03.ogg
-lmms-0.4.5/data/samples/drums/tom_low01.ogg
-lmms-0.4.5/data/samples/drums/bassdrum02.ogg
-lmms-0.4.5/data/samples/drums/tom02.ogg
-lmms-0.4.5/data/samples/drums/shaker03.ogg
-lmms-0.4.5/data/samples/drums/kick_hiphop01.ogg
-lmms-0.4.5/data/samples/drums/clap03.ogg
-lmms-0.4.5/data/samples/drums/snare_muffled02.ogg
-lmms-0.4.5/data/samples/drums/tom01.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed03.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed05.ogg
-lmms-0.4.5/data/samples/drums/tom_hi01.ogg
-lmms-0.4.5/data/samples/drums/kick01.ogg
-lmms-0.4.5/data/samples/drums/shaker01.ogg
-lmms-0.4.5/data/samples/drums/tom05.ogg
-lmms-0.4.5/data/samples/drums/ride01.ogg
-lmms-0.4.5/data/samples/drums/shaker02.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened01.ogg
-lmms-0.4.5/data/samples/drums/snare06.ogg
-lmms-0.4.5/data/samples/drums/kick_soft02.ogg
-lmms-0.4.5/data/samples/drums/kick_long01.ogg
-lmms-0.4.5/data/samples/drums/kick04.ogg
-lmms-0.4.5/data/samples/drums/snare07.ogg
-lmms-0.4.5/data/samples/drums/bassdrum04.ogg
-lmms-0.4.5/data/samples/drums/crash02.ogg
-lmms-0.4.5/data/samples/drums/tom04.ogg
-lmms-0.4.5/data/samples/drums/kick02.ogg
-lmms-0.4.5/data/samples/drums/nasty_rim01.ogg
-lmms-0.4.5/data/samples/drums/bassdrum_acoustic01.ogg
-lmms-0.4.5/data/samples/drums/ride02.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed02.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed01.ogg
-lmms-0.4.5/data/samples/drums/snare01.ogg
-lmms-0.4.5/data/samples/drums/wood01.ogg
-lmms-0.4.5/data/samples/drums/nasty_bass01.ogg
-lmms-0.4.5/data/samples/drums/snare_hiphop02.ogg
-lmms-0.4.5/data/samples/drums/kick_distorted01.ogg
-lmms-0.4.5/data/samples/drums/zap01.ogg
-lmms-0.4.5/data/samples/drums/clav01.ogg
-lmms-0.4.5/data/samples/drums/rim01.ogg
-lmms-0.4.5/data/samples/drums/nasty_snare01.ogg
-lmms-0.4.5/data/samples/drums/snare_harsh01.ogg
-lmms-0.4.5/data/samples/drums/clav02.ogg
-lmms-0.4.5/data/samples/drums/clap04.ogg
-lmms-0.4.5/data/samples/drums/snare_muffled01.ogg
-lmms-0.4.5/data/samples/drums/kick03.ogg
-lmms-0.4.5/data/samples/drums/snare_acoustic01.ogg
-lmms-0.4.5/data/samples/drums/kick_hardcore01.ogg
-lmms-0.4.5/data/samples/drums/hihat_foot_pedal01.ogg
-lmms-0.4.5/data/samples/drums/snare_short01.ogg
-lmms-0.4.5/data/samples/drums/hihat_closed04.ogg
-lmms-0.4.5/data/samples/drums/bassdrum01.ogg
-lmms-0.4.5/data/samples/drums/snare03.ogg
-lmms-0.4.5/data/samples/drums/zap02.ogg
-lmms-0.4.5/data/samples/drums/snare_hiphop01.ogg
-lmms-0.4.5/data/samples/drums/snare_electro01.ogg
-lmms-0.4.5/data/samples/drums/tom_mid01.ogg
-lmms-0.4.5/data/samples/drums/tom03.ogg
-lmms-0.4.5/data/samples/drums/crash01.ogg
-lmms-0.4.5/data/samples/drums/hihat_opened03.ogg
-lmms-0.4.5/data/samples/drums/zap03.ogg
+lmms-0.4.6/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
+lmms-0.4.6/data/projects/cool_songs/Skiessi-Onion.mmpz
+lmms-0.4.6/data/projects/cool_songs/MysthR-Living.mmpz
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
+lmms-0.4.6/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
+lmms-0.4.6/data/projects/cool_songs/Malex-Horizon4.mmp
+lmms-0.4.6/data/projects/cool_songs/Siegel-SpeedTrack.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-Psycho.mmp
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-Underline.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
+lmms-0.4.6/data/projects/cool_songs/Chris-RaveRiff.mmpz
+lmms-0.4.6/data/projects/cool_songs/j1m-DingDong.mmp
+lmms-0.4.6/data/projects/cool_songs/Chris-HorizonRemix.mmp
+lmms-0.4.6/data/projects/cool_songs/TobyDox-Confused.mmp
+lmms-0.4.6/data/projects/cool_songs/Silva-ElvesCall.mmp
+lmms-0.4.6/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
+lmms-0.4.6/data/projects/cool_songs/Siegel-DreamWave.mmp
+lmms-0.4.6/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
+lmms-0.4.6/data/projects/cool_songs/SharkyX-Experiments.mmp
+lmms-0.4.6/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
+lmms-0.4.6/data/projects/cool_songs/Djeezus-Oscilisous.mmp
+lmms-0.4.6/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
+lmms-0.4.6/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
+lmms-0.4.6/data/projects/cool_songs/Djeezus-BeatRolls.mmp
+lmms-0.4.6/data/projects/demos/demo3.mmp
+lmms-0.4.6/data/projects/demos/demo1.mmp
+lmms-0.4.6/data/projects/demos/some_basslines.mmp
+lmms-0.4.6/data/projects/demos/beat_collection.mmp
+lmms-0.4.6/data/projects/demos/demo6.mmp
+lmms-0.4.6/data/projects/demos/TobyDox-Crystallo.mmp
+lmms-0.4.6/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
+lmms-0.4.6/data/projects/demos/loop_collection.mmp
+lmms-0.4.6/data/projects/demos/demo4.mmp
+lmms-0.4.6/data/projects/demos/lb302quick.mmpz
+lmms-0.4.6/data/projects/demos/demo2.mmp
+lmms-0.4.6/data/projects/demos/newFangled.mmpz
+lmms-0.4.6/data/projects/demos/demo5.mmp
+lmms-0.4.6/data/projects/tutorials/editing_note_volumes.mmp
+lmms-0.4.6/data/samples/beats/break03.ogg
+lmms-0.4.6/data/samples/beats/house_loop01.ogg
+lmms-0.4.6/data/samples/beats/electro_beat01.ogg
+lmms-0.4.6/data/samples/beats/electro_beat02.ogg
+lmms-0.4.6/data/samples/beats/rave_hihat01.ogg
+lmms-0.4.6/data/samples/beats/rave_hihat02.ogg
+lmms-0.4.6/data/samples/beats/jungle01.ogg
+lmms-0.4.6/data/samples/beats/909beat01.ogg
+lmms-0.4.6/data/samples/beats/break02.ogg
+lmms-0.4.6/data/samples/beats/rave_kick01.ogg
+lmms-0.4.6/data/samples/beats/rave_kick02.ogg
+lmms-0.4.6/data/samples/beats/break01.ogg
+lmms-0.4.6/data/samples/beats/rave_snare01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth04.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_bass01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth02.ogg
+lmms-0.4.6/data/samples/bassloopes/tb303_01.ogg
+lmms-0.4.6/data/samples/bassloopes/rave_bass02.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_synth03.ogg
+lmms-0.4.6/data/samples/bassloopes/rave_bass01.ogg
+lmms-0.4.6/data/samples/bassloopes/techno_bass02.ogg
+lmms-0.4.6/data/samples/bassloopes/briff01.ogg
+lmms-0.4.6/data/samples/drums/nasty_snare01.ogg
+lmms-0.4.6/data/samples/drums/kick_hard01.ogg
+lmms-0.4.6/data/samples/drums/shaker02.ogg
+lmms-0.4.6/data/samples/drums/zap02.ogg
+lmms-0.4.6/data/samples/drums/kick_soft02.ogg
+lmms-0.4.6/data/samples/drums/snare02.ogg
+lmms-0.4.6/data/samples/drums/tom_mid01.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened03.ogg
+lmms-0.4.6/data/samples/drums/tom01.ogg
+lmms-0.4.6/data/samples/drums/snare_rim01.ogg
+lmms-0.4.6/data/samples/drums/tom03.ogg
+lmms-0.4.6/data/samples/drums/zap01.ogg
+lmms-0.4.6/data/samples/drums/nasty_rim01.ogg
+lmms-0.4.6/data/samples/drums/kick_long01.ogg
+lmms-0.4.6/data/samples/drums/snare_hiphop02.ogg
+lmms-0.4.6/data/samples/drums/hihat_foot_pedal01.ogg
+lmms-0.4.6/data/samples/drums/clap02.ogg
+lmms-0.4.6/data/samples/drums/tom_hi01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum_acoustic01.ogg
+lmms-0.4.6/data/samples/drums/snare03.ogg
+lmms-0.4.6/data/samples/drums/kick04.ogg
+lmms-0.4.6/data/samples/drums/snare_electro01.ogg
+lmms-0.4.6/data/samples/drums/kick_distorted01.ogg
+lmms-0.4.6/data/samples/drums/ride02.ogg
+lmms-0.4.6/data/samples/drums/zap03.ogg
+lmms-0.4.6/data/samples/drums/wood01.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed04.ogg
+lmms-0.4.6/data/samples/drums/kick02.ogg
+lmms-0.4.6/data/samples/drums/clav01.ogg
+lmms-0.4.6/data/samples/drums/snare01.ogg
+lmms-0.4.6/data/samples/drums/kick01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum02.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed03.ogg
+lmms-0.4.6/data/samples/drums/tom04.ogg
+lmms-0.4.6/data/samples/drums/bassdrum03.ogg
+lmms-0.4.6/data/samples/drums/bassdrum04.ogg
+lmms-0.4.6/data/samples/drums/tom05.ogg
+lmms-0.4.6/data/samples/drums/snare_short01.ogg
+lmms-0.4.6/data/samples/drums/shaker01.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed05.ogg
+lmms-0.4.6/data/samples/drums/snare_harsh01.ogg
+lmms-0.4.6/data/samples/drums/tom02.ogg
+lmms-0.4.6/data/samples/drums/snare_hiphop01.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened02.ogg
+lmms-0.4.6/data/samples/drums/snare_muffled01.ogg
+lmms-0.4.6/data/samples/drums/clap03.ogg
+lmms-0.4.6/data/samples/drums/snare_muffled02.ogg
+lmms-0.4.6/data/samples/drums/hihat_opened01.ogg
+lmms-0.4.6/data/samples/drums/bassdrum_acoustic02.ogg
+lmms-0.4.6/data/samples/drums/rim01.ogg
+lmms-0.4.6/data/samples/drums/kick_hiphop01.ogg
+lmms-0.4.6/data/samples/drums/crash01.ogg
+lmms-0.4.6/data/samples/drums/snare07.ogg
+lmms-0.4.6/data/samples/drums/clav02.ogg
+lmms-0.4.6/data/samples/drums/nasty_bass01.ogg
+lmms-0.4.6/data/samples/drums/snare_acoustic01.ogg
+lmms-0.4.6/data/samples/drums/kick03.ogg
+lmms-0.4.6/data/samples/drums/snare06.ogg
+lmms-0.4.6/data/samples/drums/kick_hardcore01.ogg
+lmms-0.4.6/data/samples/drums/ride01.ogg
+lmms-0.4.6/data/samples/drums/crash02.ogg
+lmms-0.4.6/data/samples/drums/kick_soft01.ogg
+lmms-0.4.6/data/samples/drums/snare05.ogg
+lmms-0.4.6/data/samples/drums/sidestick01.ogg
+lmms-0.4.6/data/samples/drums/clap01.ogg
+lmms-0.4.6/data/samples/drums/clap04.ogg
+lmms-0.4.6/data/samples/drums/shaker03.ogg
+lmms-0.4.6/data/samples/drums/bassdrum01.ogg
+lmms-0.4.6/data/samples/drums/snare04.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed02.ogg
+lmms-0.4.6/data/samples/drums/hihat_closed01.ogg
+lmms-0.4.6/data/samples/drums/tom_low01.ogg
+lmms-0.4.6/data/samples/shapes/additive2.wav
+lmms-0.4.6/data/samples/shapes/technosynth3.wav
+lmms-0.4.6/data/samples/shapes/low_sine.wav
+lmms-0.4.6/data/samples/shapes/bunglist5.wav
+lmms-0.4.6/data/samples/shapes/bunglist8.wav
+lmms-0.4.6/data/samples/shapes/bunglist.wav
+lmms-0.4.6/data/samples/shapes/sine_dist.ogg
+lmms-0.4.6/data/samples/shapes/roundsaw.ogg
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw.ogg
+lmms-0.4.6/data/samples/shapes/harmonics.wav
+lmms-0.4.6/data/samples/shapes/micro.wav
+lmms-0.4.6/data/samples/shapes/vowel_u.wav
+lmms-0.4.6/data/samples/shapes/roundbass.wav
+lmms-0.4.6/data/samples/shapes/bunglist9.wav
+lmms-0.4.6/data/samples/shapes/technobass.wav
+lmms-0.4.6/data/samples/shapes/technosynth5.wav
+lmms-0.4.6/data/samples/shapes/technosynth6.wav
+lmms-0.4.6/data/samples/shapes/additive.wav
+lmms-0.4.6/data/samples/shapes/bunglist4.wav
+lmms-0.4.6/data/samples/shapes/bunglist7.wav
+lmms-0.4.6/data/samples/shapes/bunglist3.wav
+lmms-0.4.6/data/samples/shapes/technosynth4.wav
+lmms-0.4.6/data/samples/shapes/bunglist6.wav
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw2.ogg
+lmms-0.4.6/data/samples/shapes/moog.wav
+lmms-0.4.6/data/samples/shapes/saw+sine.wav
+lmms-0.4.6/data/samples/shapes/technosynth1.wav
+lmms-0.4.6/data/samples/shapes/smooth_inv_saw_dist.ogg
+lmms-0.4.6/data/samples/shapes/vowel_a.wav
+lmms-0.4.6/data/samples/shapes/bunglist2.wav
+lmms-0.4.6/data/samples/shapes/technosynth2.wav
+lmms-0.4.6/data/samples/misc/metalish_dong01.ogg
+lmms-0.4.6/data/samples/misc/buzz!.ogg
+lmms-0.4.6/data/samples/misc/dong02.ogg
+lmms-0.4.6/data/samples/misc/dong03.ogg
+lmms-0.4.6/data/samples/misc/snaph01.ogg
+lmms-0.4.6/data/samples/misc/undefined01.ogg
+lmms-0.4.6/data/samples/misc/raving_crowd01.ogg
+lmms-0.4.6/data/samples/misc/hit02.ogg
+lmms-0.4.6/data/samples/misc/electric_ping01.ogg
+lmms-0.4.6/data/samples/misc/hit01.ogg
+lmms-0.4.6/data/samples/misc/breath01.ogg
+lmms-0.4.6/data/samples/misc/metronome01.ogg
+lmms-0.4.6/data/samples/misc/applause01.ogg
+lmms-0.4.6/data/samples/misc/dong01.ogg
+lmms-0.4.6/data/samples/misc/bass!.ogg
+lmms-0.4.6/data/samples/instruments/piano01.ogg
+lmms-0.4.6/data/samples/instruments/piano02.ogg
+lmms-0.4.6/data/samples/instruments/church_organ02.ogg
+lmms-0.4.6/data/samples/instruments/violin_fingered01.ogg
+lmms-0.4.6/data/samples/instruments/e_piano_accord01.ogg
+lmms-0.4.6/data/samples/instruments/cello01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ01.ogg
+lmms-0.4.6/data/samples/instruments/flute01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_medium_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ03.ogg
+lmms-0.4.6/data/samples/instruments/e_piano_accord02.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/bassslap02.ogg
+lmms-0.4.6/data/samples/instruments/e_organ01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar01.ogg
+lmms-0.4.6/data/samples/instruments/church_organ04.ogg
+lmms-0.4.6/data/samples/instruments/trumpet01.ogg
+lmms-0.4.6/data/samples/instruments/violin_pizzicato01.ogg
+lmms-0.4.6/data/samples/instruments/bassslap01.ogg
+lmms-0.4.6/data/samples/instruments/harpsichord01.ogg
+lmms-0.4.6/data/samples/instruments/steel_guitar_slight_distorted01.ogg
+lmms-0.4.6/data/samples/instruments/violin_double_stop01.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar03.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar02.ogg
+lmms-0.4.6/data/samples/latin/latin_guitar01.ogg
+lmms-0.4.6/data/samples/latin/latin_brass01.ogg
+lmms-0.4.6/data/samples/stringsnpads/chorus02.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings01.ogg
+lmms-0.4.6/data/samples/stringsnpads/juno_pad01.ogg
+lmms-0.4.6/data/samples/stringsnpads/bell_choir01.ogg
+lmms-0.4.6/data/samples/stringsnpads/korg_poly6_drone01.ogg
+lmms-0.4.6/data/samples/stringsnpads/strings01.ogg
+lmms-0.4.6/data/samples/stringsnpads/orion_string01.ogg
+lmms-0.4.6/data/samples/stringsnpads/bell_choir02.ogg
+lmms-0.4.6/data/samples/stringsnpads/rave_choir01.ogg
+lmms-0.4.6/data/samples/stringsnpads/chorus01.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings03.ogg
+lmms-0.4.6/data/samples/stringsnpads/space_strings02.ogg
+lmms-0.4.6/data/samples/stringsnpads/nord_ambient01.ogg
+lmms-0.4.6/data/samples/stringsnpads/heaven_strings01.ogg
+lmms-0.4.6/data/samples/basses/bass_acid02.ogg
+lmms-0.4.6/data/samples/basses/techno_synth01.ogg
+lmms-0.4.6/data/samples/basses/rave_bass03.ogg
+lmms-0.4.6/data/samples/basses/rave_bass04.ogg
+lmms-0.4.6/data/samples/basses/matrix1000_pluck01.ogg
+lmms-0.4.6/data/samples/basses/bass_acid01.ogg
+lmms-0.4.6/data/samples/basses/rave_bass02.ogg
+lmms-0.4.6/data/samples/basses/bass_hard02.ogg
+lmms-0.4.6/data/samples/basses/rave_bass01.ogg
+lmms-0.4.6/data/samples/basses/synth_acid01.ogg
+lmms-0.4.6/data/samples/basses/synth_acid02.ogg
+lmms-0.4.6/data/samples/basses/horror_bass01.ogg
+lmms-0.4.6/data/samples/basses/bass_punch01.ogg
+lmms-0.4.6/data/samples/basses/bass_hard01.ogg
+lmms-0.4.6/data/samples/basses/bass01.ogg
+lmms-0.4.6/data/samples/effects/start01.ogg
+lmms-0.4.6/data/samples/effects/chroma_sound_effect01.ogg
+lmms-0.4.6/data/samples/effects/stop01.ogg
+lmms-0.4.6/data/samples/effects/scratch01.ogg
+lmms-0.4.6/data/samples/effects/wind_chimes01.ogg
+lmms-0.4.6/data/samples/effects/explode01.ogg
+lmms-0.4.6/data/samples/effects/warp02.ogg
+lmms-0.4.6/data/samples/effects/warp01.ogg
+lmms-0.4.6/data/samples/effects/filter_sweep01.ogg
+lmms-0.4.6/data/samples/effects/start02.ogg


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	4 Sep 2009 21:29:31 -0000	1.5
+++ import.log	30 Dec 2009 21:45:20 -0000	1.6
@@ -3,3 +3,4 @@ lmms-0_4_2-4_fc10:HEAD:lmms-0.4.2-4.fc10
 lmms-0_4_3-1_fc10:HEAD:lmms-0.4.3-1.fc10.src.rpm:1236642380
 lmms-0_4_4-1_fc11:F-11:lmms-0.4.4-1.fc11.src.rpm:1242758782
 lmms-0_4_5-1_fc11:F-11:lmms-0.4.5-1.fc11.src.rpm:1252099682
+lmms-0_4_6-1_fc12:F-11:lmms-0.4.6-1.fc12.src.rpm:1262209321


Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/lmms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lmms.spec	4 Sep 2009 21:29:31 -0000	1.6
+++ lmms.spec	30 Dec 2009 21:45:20 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           lmms
-Version:        0.4.5
+Version:        0.4.6
 Release:        1%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
@@ -36,14 +36,14 @@ Source0:        %{name}-%{version}.strip
 Source1:        README.fedora
 
 # our cmake seems to have a different value for LIB_DIR.
-Patch0:         lmms-0.4.5-libdir.patch
+Patch0:         lmms-0.4.6-libdir.patch
 
 # move the vst and zynaddsubfx plugins to libexecdir.
-Patch1:         lmms-0.4.5-libexecdir.patch
+Patch1:         lmms-0.4.6-libexecdir.patch
 
 # build with vst support but without having wine. that is a patch
 # upstream isn't really interested in.
-Patch2:         lmms-0.4.5-vst-nowine.patch
+Patch2:         lmms-0.4.6-vst-nowine.patch
 
 # FIXME: we surely want to patch zynaddsubfx to use system's fltk and
 # minixml. using system's zynaddsubfx however is, according to lmms'
@@ -162,6 +162,9 @@ make VERBOSE=1 %{?_smp_mflags}
 make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor '' \
+        --add-category=Midi \
+        --add-category=Sequencer \
+        --add-category=X-Jack \
         --dir %{buildroot}%{_datadir}/applications \
         %{buildroot}%{_datadir}/applications/%{name}.desktop
 
@@ -186,10 +189,10 @@ update-desktop-database &> /dev/null || 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO README.fedora
+%doc AUTHORS COPYING README TODO README.fedora
 %{_bindir}/%{name}
 %{_libdir}/%{name}
-%{_libexecdir}/remote_zynaddsubfx
+%{_libexecdir}/RemoteZynAddSubFx
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
@@ -220,6 +223,14 @@ This package contains the necessary file
 
 
 %changelog
+* Wed Dec 30 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.6-1
+- Update to 0.4.6.
+- Rebase patches.
+- Minor specfile fixes.
+
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.4.5-2
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Fri Sep  4 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.5-1
 - Udate to 0.4.5.
 - Rebase patches, and drop fltk patches not needed anymore.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Sep 2009 21:29:31 -0000	1.6
+++ sources	30 Dec 2009 21:45:20 -0000	1.7
@@ -1 +1 @@
-efbd9ddef0a975cffe9abc2da8b04143  lmms-0.4.5.stripped.tar.bz2
+23e599158b60bc665b6715b68dd38185  lmms-0.4.6.stripped.tar.bz2


--- lmms-0.4.5-libdir.patch DELETED ---


--- lmms-0.4.5-libexecdir.patch DELETED ---


--- lmms-0.4.5-vst-nowine.patch DELETED ---



From leigh123linux at fedoraproject.org  Wed Dec 30 21:46:06 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Wed, 30 Dec 2009 21:46:06 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 gcc.patch,1.2,1.3
Message-ID: <20091230214606.5056B11C00E9@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6570

Modified Files:
	gcc.patch 
Log Message:
update patch


gcc.patch:
 src.pro |    1 +
 1 file changed, 1 insertion(+)

Index: gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/gcc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcc.patch	23 Dec 2009 09:12:35 -0000	1.2
+++ gcc.patch	30 Dec 2009 21:46:06 -0000	1.3
@@ -7,7 +7,7 @@ diff -up qbittorrent-2.0.2/src/src.pro.n
  
 +QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
  # Update this VERSION for each release
- DEFINES += VERSION=\\\"v2.0.3\\\"
+ DEFINES += VERSION=\\\"v2.0.4\\\"
  DEFINES += VERSION_MAJOR=2
 
 



From tgl at fedoraproject.org  Wed Dec 30 21:47:07 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 30 Dec 2009 21:47:07 +0000 (UTC)
Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec, 1.29,
	1.30 64bit-fixes.patch, 1.2, NONE
Message-ID: <20091230214707.C04EE11C00E9@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7152

Modified Files:
	postgresql-odbc.spec 
Removed Files:
	64bit-fixes.patch 
Log Message:
Update to version 08.04.0200


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- postgresql-odbc.spec	28 Aug 2009 15:18:58 -0000	1.29
+++ postgresql-odbc.spec	30 Dec 2009 21:47:07 -0000	1.30
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver
-Version: 08.04.0100
-Release: 2%{?dist}
+Version: 08.04.0200
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Databases
 URL: http://psqlodbc.projects.postgresql.org/
@@ -14,12 +14,10 @@ Source0: http://www.postgresql.org/ftp/o
 # available while building this RPM.)  To generate: in psqlodbc source tree,
 #   aclocal -I . -I $PGSRC/config
 # then strip aclocal.m4 down to just the PGAC macros.
-# BUT: as of 08.04.0100, configure.ac hasn't been updated to use PG8.4
+# BUT: as of 08.04.0200, configure.ac hasn't been updated to use PG8.4
 # macros, so keep using the previous version of acinclude.m4.
 Source1: acinclude.m4
 
-Patch1: 64bit-fixes.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: unixODBC-devel
 BuildRequires: libtool automake autoconf postgresql-devel
@@ -37,8 +35,6 @@ PostgreSQL system via ODBC (Open Databas
 %prep
 %setup -q -n psqlodbc-%{version}
 
-%patch1 -p1
-
 # Some missing macros.  Courtesy Owen Taylor <otaylor at redhat.com>.
 cp -p %{SOURCE1} .
 
@@ -53,8 +49,7 @@ autoheader
 
 %build
 
-%configure --with-unixodbc --with-odbcinst=%{_sysconfdir} \
-	--disable-dependency-tracking
+%configure --with-unixodbc --disable-dependency-tracking
 
 make
 
@@ -83,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc license.txt readme.txt docs/*
 
 %changelog
+* Wed Dec 30 2009 Tom Lane <tgl at redhat.com> 08.04.0200-1
+- Update to version 08.04.0200
+
 * Fri Aug 28 2009 Tom Lane <tgl at redhat.com> 08.04.0100-2
 - Rebuild with new openssl
 


--- 64bit-fixes.patch DELETED ---



From tgl at fedoraproject.org  Wed Dec 30 21:47:21 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 30 Dec 2009 21:47:21 +0000 (UTC)
Subject: File psqlodbc-08.04.0200.tar.gz uploaded to lookaside cache by tgl
Message-ID: <20091230214721.8C66710F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for postgresql-odbc:

8296be11d24e3111319826fbaf034066  psqlodbc-08.04.0200.tar.gz



From tgl at fedoraproject.org  Wed Dec 30 21:48:14 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 30 Dec 2009 21:48:14 +0000 (UTC)
Subject: rpms/postgresql-odbc/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20091230214814.0E79211C00E9@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7474

Modified Files:
	.cvsignore sources 
Log Message:
Update to version 08.04.0200


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	18 Aug 2009 04:30:14 -0000	1.13
+++ .cvsignore	30 Dec 2009 21:48:13 -0000	1.14
@@ -1 +1 @@
-psqlodbc-08.04.0100.tar.gz
+psqlodbc-08.04.0200.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	18 Aug 2009 04:30:14 -0000	1.13
+++ sources	30 Dec 2009 21:48:13 -0000	1.14
@@ -1 +1 @@
-2328c3e97e6a376620a5d317137515ff  psqlodbc-08.04.0100.tar.gz
+8296be11d24e3111319826fbaf034066  psqlodbc-08.04.0200.tar.gz



From mschwendt at fedoraproject.org  Wed Dec 30 21:50:15 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 21:50:15 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins-2.2-alarm.patch, NONE, 
	1.1 audacious-plugins.spec, 1.71, 1.72
Message-ID: <20091230215015.4731511C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8100

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-alarm.patch 
Log Message:
* Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-6
- Fix the alarm plugin.


audacious-plugins-2.2-alarm.patch:
 alarm.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE audacious-plugins-2.2-alarm.patch ---
diff -Nur audacious-plugins-2.2-orig/src/alarm/alarm.c audacious-plugins-2.2/src/alarm/alarm.c
--- audacious-plugins-2.2-orig/src/alarm/alarm.c	2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2/src/alarm/alarm.c	2009-12-30 22:38:17.985756827 +0100
@@ -321,14 +321,17 @@
    if(!aud_cfg_db_get_int(conf, "alarm", "fading", &fading))
      fading = DEFAULT_FADING;
 
+   g_free(cmdstr);
    if(!aud_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr))
      cmdstr = g_strdup("");
    if(!aud_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on))
      cmd_on = FALSE;
 
+   g_free(playlist);
    if(!aud_cfg_db_get_string(conf, "alarm", "playlist", &playlist))
      playlist = g_strdup("");
 
+   g_free(alarm_conf.reminder_msg);
    if(!aud_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg))
      alarm_conf.reminder_msg = g_strdup("");
    if(!aud_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on))
@@ -970,6 +973,7 @@
 {
    DEBUG("alarm_init\n");
 
+   alarm_conf.reminder_msg = NULL;
    alarm_read_config();
 
    /* start the main thread running */
@@ -989,6 +993,13 @@
    if(stop_tid)
      pthread_cancel(stop_tid);
    stop_tid = 0;
+
+   g_free(alarm_conf.reminder_msg);
+   alarm_conf.reminder_msg = NULL;
+   g_free(playlist);
+   playlist = NULL;
+   g_free(cmdstr);
+   cmdstr = NULL;
 }
 
 static GeneralPlugin alarm_plugin =


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- audacious-plugins.spec	30 Dec 2009 15:10:07 -0000	1.71
+++ audacious-plugins.spec	30 Dec 2009 21:50:15 -0000	1.72
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -27,10 +27,12 @@ Patch0: audacious-plugins-2.0.1-xmms-ski
 Patch1: audacious-plugins-2.2-jack.patch
 #
 Patch2: audacious-plugins-2.2-neon-request.patch
-# submitted upstream
+# merged upstream
 Patch3: audacious-plugins-2.2-cfg_db_close.patch
-# submitted upstream
+# merged upstream
 Patch4: audacious-plugins-2.2-bluetooth.patch
+# merged upstream
+Patch5: audacious-plugins-2.2-alarm.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -166,6 +168,7 @@ in Vortex (.vtx) format.
 %patch2 -p1 -b .neon-request
 %patch3 -p1 -b .cfg_db_close
 %patch4 -p1 -b .bluetooth
+%patch5 -p1 -b .alarm
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -259,6 +262,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-6
+- Fix the alarm plugin.
+
 * Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
 - Remove BR libtimidity-devel as that plugin is no longer available.
 



From kkofler at fedoraproject.org  Wed Dec 30 21:57:06 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 30 Dec 2009 21:57:06 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.221,1.222
Message-ID: <20091230215706.957FD11C00E9@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9549/devel

Modified Files:
	kdeedu.spec 
Log Message:
* Wed Dec 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
- rebuild for new OCaml (3.11.2 rc1)

(rebuilding to pick up the new static OCaml runtime and ocaml-facile; sadly, OCaml still doesn't support dynamic linking)


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- kdeedu.spec	18 Dec 2009 17:57:40 -0000	1.221
+++ kdeedu.spec	30 Dec 2009 21:57:06 -0000	1.222
@@ -8,7 +8,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -529,6 +529,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
+- rebuild for new OCaml (3.11.2 rc1)
+
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)
 



From tgl at fedoraproject.org  Wed Dec 30 21:59:09 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 30 Dec 2009 21:59:09 +0000 (UTC)
Subject: rpms/postgresql-odbc/F-12 .cvsignore, 1.13, 1.14 postgresql-odbc.spec,
	1.29, 1.30 sources, 1.13, 1.14 64bit-fixes.patch, 1.2, NONE
Message-ID: <20091230215909.C72CD11C00E9@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-odbc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10177

Modified Files:
	.cvsignore postgresql-odbc.spec sources 
Removed Files:
	64bit-fixes.patch 
Log Message:
Update to version 08.04.0200


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	18 Aug 2009 04:30:14 -0000	1.13
+++ .cvsignore	30 Dec 2009 21:59:09 -0000	1.14
@@ -1 +1 @@
-psqlodbc-08.04.0100.tar.gz
+psqlodbc-08.04.0200.tar.gz


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/F-12/postgresql-odbc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- postgresql-odbc.spec	28 Aug 2009 15:18:58 -0000	1.29
+++ postgresql-odbc.spec	30 Dec 2009 21:59:09 -0000	1.30
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver
-Version: 08.04.0100
-Release: 2%{?dist}
+Version: 08.04.0200
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Databases
 URL: http://psqlodbc.projects.postgresql.org/
@@ -14,12 +14,10 @@ Source0: http://www.postgresql.org/ftp/o
 # available while building this RPM.)  To generate: in psqlodbc source tree,
 #   aclocal -I . -I $PGSRC/config
 # then strip aclocal.m4 down to just the PGAC macros.
-# BUT: as of 08.04.0100, configure.ac hasn't been updated to use PG8.4
+# BUT: as of 08.04.0200, configure.ac hasn't been updated to use PG8.4
 # macros, so keep using the previous version of acinclude.m4.
 Source1: acinclude.m4
 
-Patch1: 64bit-fixes.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: unixODBC-devel
 BuildRequires: libtool automake autoconf postgresql-devel
@@ -37,8 +35,6 @@ PostgreSQL system via ODBC (Open Databas
 %prep
 %setup -q -n psqlodbc-%{version}
 
-%patch1 -p1
-
 # Some missing macros.  Courtesy Owen Taylor <otaylor at redhat.com>.
 cp -p %{SOURCE1} .
 
@@ -53,8 +49,7 @@ autoheader
 
 %build
 
-%configure --with-unixodbc --with-odbcinst=%{_sysconfdir} \
-	--disable-dependency-tracking
+%configure --with-unixodbc --disable-dependency-tracking
 
 make
 
@@ -83,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc license.txt readme.txt docs/*
 
 %changelog
+* Wed Dec 30 2009 Tom Lane <tgl at redhat.com> 08.04.0200-1
+- Update to version 08.04.0200
+
 * Fri Aug 28 2009 Tom Lane <tgl at redhat.com> 08.04.0100-2
 - Rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	18 Aug 2009 04:30:14 -0000	1.13
+++ sources	30 Dec 2009 21:59:09 -0000	1.14
@@ -1 +1 @@
-2328c3e97e6a376620a5d317137515ff  psqlodbc-08.04.0100.tar.gz
+8296be11d24e3111319826fbaf034066  psqlodbc-08.04.0200.tar.gz


--- 64bit-fixes.patch DELETED ---



From rdieter at fedoraproject.org  Wed Dec 30 22:04:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 30 Dec 2009 22:04:42 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.102,1.103
Message-ID: <20091230220442.DD75411C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11635

Modified Files:
	kde-settings.spec 
Log Message:
* Wed Dec 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-6.1
- -kdm: Requires: kdm



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- kde-settings.spec	25 Dec 2009 22:16:29 -0000	1.102
+++ kde-settings.spec	30 Dec 2009 22:04:42 -0000	1.103
@@ -5,7 +5,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.4
-Release: %{rel}
+Release: %{rel}.1
 
 Group:   System Environment/Base
 License: Public Domain
@@ -40,6 +40,7 @@ Conflicts: kdelibs3 < 3.5.10-17
 Summary: Configuration files for kdm
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < 4.0 
+Requires: kdm
 Requires: system-kdm-theme
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
@@ -161,6 +162,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Wed Dec 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-6.1
+- -kdm: Requires: kdm
+
 * Fri Dec 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4-6
 - use qtcurve-gtk2 by default (#547700)
 



From mschwendt at fedoraproject.org  Wed Dec 30 22:20:20 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 22:20:20 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-plugins-2.2-alarm.patch, NONE, 
	1.1 audacious-plugins.spec, 1.76, 1.77
Message-ID: <20091230222020.302AD11C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15592

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-alarm.patch 
Log Message:
sync with Rawhide

audacious-plugins-2.2-alarm.patch:
 alarm.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE audacious-plugins-2.2-alarm.patch ---
diff -Nur audacious-plugins-2.2-orig/src/alarm/alarm.c audacious-plugins-2.2/src/alarm/alarm.c
--- audacious-plugins-2.2-orig/src/alarm/alarm.c	2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2/src/alarm/alarm.c	2009-12-30 22:38:17.985756827 +0100
@@ -321,14 +321,17 @@
    if(!aud_cfg_db_get_int(conf, "alarm", "fading", &fading))
      fading = DEFAULT_FADING;
 
+   g_free(cmdstr);
    if(!aud_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr))
      cmdstr = g_strdup("");
    if(!aud_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on))
      cmd_on = FALSE;
 
+   g_free(playlist);
    if(!aud_cfg_db_get_string(conf, "alarm", "playlist", &playlist))
      playlist = g_strdup("");
 
+   g_free(alarm_conf.reminder_msg);
    if(!aud_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg))
      alarm_conf.reminder_msg = g_strdup("");
    if(!aud_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on))
@@ -970,6 +973,7 @@
 {
    DEBUG("alarm_init\n");
 
+   alarm_conf.reminder_msg = NULL;
    alarm_read_config();
 
    /* start the main thread running */
@@ -989,6 +993,13 @@
    if(stop_tid)
      pthread_cancel(stop_tid);
    stop_tid = 0;
+
+   g_free(alarm_conf.reminder_msg);
+   alarm_conf.reminder_msg = NULL;
+   g_free(playlist);
+   playlist = NULL;
+   g_free(cmdstr);
+   cmdstr = NULL;
 }
 
 static GeneralPlugin alarm_plugin =


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- audacious-plugins.spec	30 Dec 2009 15:17:10 -0000	1.76
+++ audacious-plugins.spec	30 Dec 2009 22:20:19 -0000	1.77
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -27,10 +27,12 @@ Patch0: audacious-plugins-2.0.1-xmms-ski
 Patch1: audacious-plugins-2.2-jack.patch
 #
 Patch2: audacious-plugins-2.2-neon-request.patch
-# submitted upstream
+# merged upstream
 Patch3: audacious-plugins-2.2-cfg_db_close.patch
-# submitted upstream
+# merged upstream
 Patch4: audacious-plugins-2.2-bluetooth.patch
+# merged upstream
+Patch5: audacious-plugins-2.2-alarm.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -166,6 +168,7 @@ in Vortex (.vtx) format.
 %patch2 -p1 -b .neon-request
 %patch3 -p1 -b .cfg_db_close
 %patch4 -p1 -b .bluetooth
+%patch5 -p1 -b .alarm
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -259,6 +262,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-6
+- Fix the alarm plugin.
+
 * Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
 - Remove BR libtimidity-devel as that plugin is no longer available.
 



From xavierb at fedoraproject.org  Wed Dec 30 22:30:16 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed, 30 Dec 2009 22:30:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/EL-5
	openchrome-0.2.904-revert_r712.patch, NONE,
	1.1 openchrome-0.2.904-sync_pciids.patch, NONE, 1.1 sources, 1.4,
	1.5 xorg-x11-drv-openchrome.spec, 1.12,
	1.13 openchrome-0.2.903-DDR400_FullHD.patch, 1.1,
	NONE openchrome-0.2.903-VT1625_640x480PAL.patch, 1.1,
	NONE openchrome-0.2.903-re_enable_AGPDMA.patch, 1.1, NONE
Message-ID: <20091230223016.498FB11C00E9@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17679

Modified Files:
	sources xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.904-revert_r712.patch 
	openchrome-0.2.904-sync_pciids.patch 
Removed Files:
	openchrome-0.2.903-DDR400_FullHD.patch 
	openchrome-0.2.903-VT1625_640x480PAL.patch 
	openchrome-0.2.903-re_enable_AGPDMA.patch 
Log Message:
0.2.904

openchrome-0.2.904-revert_r712.patch:
 via_crtc.c |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

--- NEW FILE openchrome-0.2.904-revert_r712.patch ---
Index: trunk/src/via_crtc.c
===================================================================
--- trunk/src/via_crtc.c (revision 709)
+++ trunk/src/via_crtc.c (revision 712)
@@ -36,4 +36,6 @@
 #include "via_mode.h"
 
+#include <xorg/xf86Crtc.h>
+
 static void
 ViaCRTCSetGraphicsRegisters(ScrnInfoPtr pScrn)
@@ -74,4 +76,24 @@
 }
 
+static Bool
+via_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
+{
+    scrn->virtualX = width;
+    scrn->virtualY = height;
+    return TRUE;
+}
+
+static const
+xf86CrtcConfigFuncsRec via_xf86crtc_config_funcs = {
+    via_xf86crtc_resize
+};
+
+void 
+ViaPreInitCRTCConfig(ScrnInfoPtr pScrn)
+{
+     xf86CrtcConfigInit (pScrn, &via_xf86crtc_config_funcs);
+}
+
+
 void
 ViaCRTCInit(ScrnInfoPtr pScrn)

openchrome-0.2.904-sync_pciids.patch:
 via_id.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE openchrome-0.2.904-sync_pciids.patch ---
Index: src/via_id.c
===================================================================
--- src/via_id.c	(.../tags/release_0_2_904/src/via_id.c)	(revision 826)
+++ src/via_id.c	(.../trunk/src/via_id.c)	(revision 826)
@@ -224,6 +224,7 @@
 
     /*** VX800 ***/
     {"VIA Epia M700",                         VIA_VX800,   0x1106, 0x1122, VIA_DEVICE_CRT},
+    {"Guillemot-Hercules ECafe EC900B",       VIA_VX800,   0x1106, 0x3349, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"VIA OpenBook",                          VIA_VX800,   0x1170, 0x0311, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, /* VIA OpenBook eNote VBE8910 */
     {"Samsung NC20",                          VIA_VX800,   0x144d, 0xc04e, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Quanta DreamBook Light IL1",            VIA_VX800,   0x152d, 0x0771, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
@@ -231,6 +232,7 @@
 
     /*** VX855 ***/
     {"VIA VT8562C",                           VIA_VX855,   0x1106, 0x5122, VIA_DEVICE_CRT},
+    {"OLPC XO 1.5",                           VIA_VX855,   0x152D, 0x0833, VIA_DEVICE_LCD},
 
     /* keep this */
     {NULL,                                    VIA_UNKNOWN, 0x0000, 0x0000, VIA_DEVICE_NONE}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2008 22:13:18 -0000	1.4
+++ sources	30 Dec 2009 22:30:15 -0000	1.5
@@ -1 +1 @@
-c0820787e89958c9114d359b6a3cd464  xf86-video-openchrome-0.2.903.tar.bz2
+f2481d98ef54febf5bffbb88a2a2426d  xf86-video-openchrome-0.2.904.tar.bz2


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/EL-5/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xorg-x11-drv-openchrome.spec	4 Dec 2008 23:06:10 -0000	1.12
+++ xorg-x11-drv-openchrome.spec	30 Dec 2009 22:30:15 -0000	1.13
@@ -8,7 +8,7 @@
 
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
-Version:	0.2.903
+Version:	0.2.904
 Release:	1%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
@@ -19,11 +19,9 @@ Source0:	http://www.openchrome.org/relea
 Source1:	openchrome.xinf
 
 # Patches from upstream trunk :
-Patch1:         openchrome-0.2.903-sync_pciids.patch
-Patch2:         openchrome-0.2.903-VT1625_640x480PAL.patch
-Patch3:         openchrome-0.2.903-DDR400_FullHD.patch
+Patch1:         openchrome-0.2.904-sync_pciids.patch
 # EPEL specific patches :
-Patch100:       openchrome-0.2.903-re_enable_AGPDMA.patch
+Patch100:       openchrome-0.2.904-revert_r712.patch
 
 ExclusiveArch:	%{ix86} x86_64
 
@@ -56,9 +54,7 @@ X.Org X11 openchrome video driver XvMC d
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch1 -p0 -b .pciids
-%patch2 -p0 -b .vt1625
-%patch3 -p0 -b .fullhd
-%patch100 -p0 -b .agpdma
+%patch100 -p1 -R
 
 %build
 %configure --disable-static --enable-dri
@@ -101,44 +97,49 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Dec 04 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.903-1
+* Wed Dec 30 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-1
+- Update to 0.2.904.
+- Revert a change that breaks with xserver 1.4.
+- Add patch to sync pci ids with trunk. 
+
+* Thu Dec 04 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-1
 - Update to 0.2.903.
 - Add patch for VT1625 640x480 PAL mode.
 - Add patch to allow full HD resolution output with DDR400.
 - Add patch to sync pci ids with trunk. 
 
-* Sun Jan 27 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-2
+* Sun Jan 27 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-2
 - Add patch to properly set fifo on P4M900.
 
-* Wed Jan 02 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-1
+* Wed Jan 02 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-1
 - Update to 0.2.901.
 - Remove obsoleted patches.
 
-* Fri Nov 02 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-7
+* Fri Nov 02 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-7
 - Replace broken VT1625 NTSC patch.
 - Add patch to announce as release not as development build.
 - First official Fedora build.
 
-* Thu Oct 18 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-6
+* Thu Oct 18 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-6
 - Update to official 0.2.900
 
-* Wed Oct 10 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-5
+* Wed Oct 10 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-5
 - Update to release_0_3_0 branch rev. 410
 - Add VT1625 patch for 720x576 PAL
 
-* Mon Sep 10 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-4
+* Mon Sep 10 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-4
 - Update to release_0_3_0 branch rev. 384 plus all changes from experimental
   merged back
 - Remove upstream patch #2
 
-* Wed Aug 01 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-3
+* Wed Aug 01 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-3
 - Update to release_0_3_0 branch rev. 380 (fix a bug with XvMC acceleration)
 - Add a patch to allow proper detection of DDR667 (patch #2)
 
-* Mon Jul 16 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-2
+* Mon Jul 16 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-2
 - Update to release_0_3_0 branch rev. 373
 - Add release notes to %%doc
 
-* Thu Jul 05 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-1
+* Thu Jul 05 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-1
 - Initial build (release_0_3_0 branch rev. 365)
 - Add some NTSC modes for the VT1625 (patch #1)


--- openchrome-0.2.903-DDR400_FullHD.patch DELETED ---


--- openchrome-0.2.903-VT1625_640x480PAL.patch DELETED ---


--- openchrome-0.2.903-re_enable_AGPDMA.patch DELETED ---



From xavierb at fedoraproject.org  Wed Dec 30 22:33:06 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed, 30 Dec 2009 22:33:06 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/EL-5
	openchrome-0.2.903-sync_pciids.patch, 1.2, NONE
Message-ID: <20091230223306.0C98C11C00E9@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18333

Removed Files:
	openchrome-0.2.903-sync_pciids.patch 
Log Message:
remove old patch


--- openchrome-0.2.903-sync_pciids.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Dec 30 23:20:08 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 23:20:08 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.72,1.73
Message-ID: <20091230232008.66C0B11C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28023

Modified Files:
	audacious-plugins.spec 
Log Message:
drop BR libmodplug-devel


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- audacious-plugins.spec	30 Dec 2009 21:50:15 -0000	1.72
+++ audacious-plugins.spec	30 Dec 2009 23:20:07 -0000	1.73
@@ -45,7 +45,6 @@ BuildRequires: wavpack-devel
 BuildRequires: libsidplay-devel
 BuildRequires: libogg-devel libvorbis-devel
 BuildRequires: flac-devel
-BuildRequires: libmodplug-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: libshout-devel
 BuildRequires: curl-devel
@@ -262,6 +261,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- Remove BR libmodplug-devel as the modplug plugin has never used
+  the external library.
+
 * Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-6
 - Fix the alarm plugin.
 



From mschwendt at fedoraproject.org  Wed Dec 30 23:40:28 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 23:40:28 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.73,1.74
Message-ID: <20091230234028.C0A3011C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32021

Modified Files:
	audacious-plugins.spec 
Log Message:
disable modplug plugin build


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- audacious-plugins.spec	30 Dec 2009 23:20:07 -0000	1.73
+++ audacious-plugins.spec	30 Dec 2009 23:40:27 -0000	1.74
@@ -185,6 +185,7 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --disable-mms  \
     --disable-libmadtest  \
     \
+    --disable-modplug  \
     --disable-oss  \
     --disable-projectm  \
     --disable-sse2  \
@@ -262,6 +263,8 @@ update-desktop-database &> /dev/null || 
 
 %changelog
 * Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- Disable modplug plugin (where is it compared with libmodplug and
+  its fixes and CVEs?). Give precedence to audacious-plugin-xmp
 - Remove BR libmodplug-devel as the modplug plugin has never used
   the external library.
 



From mschwendt at fedoraproject.org  Wed Dec 30 23:40:52 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 30 Dec 2009 23:40:52 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-plugins.spec,1.77,1.78
Message-ID: <20091230234053.0002E11C00E9@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32107

Modified Files:
	audacious-plugins.spec 
Log Message:
sync with Rawhide


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- audacious-plugins.spec	30 Dec 2009 22:20:19 -0000	1.77
+++ audacious-plugins.spec	30 Dec 2009 23:40:52 -0000	1.78
@@ -45,7 +45,6 @@ BuildRequires: wavpack-devel
 BuildRequires: libsidplay-devel
 BuildRequires: libogg-devel libvorbis-devel
 BuildRequires: flac-devel
-BuildRequires: libmodplug-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: libshout-devel
 BuildRequires: curl-devel
@@ -186,6 +185,7 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --disable-mms  \
     --disable-libmadtest  \
     \
+    --disable-modplug  \
     --disable-oss  \
     --disable-projectm  \
     --disable-sse2  \
@@ -262,6 +262,12 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- Disable modplug plugin (where is it compared with libmodplug and
+  its fixes and CVEs?). Give precedence to audacious-plugin-xmp
+- Remove BR libmodplug-devel as the modplug plugin has never used
+  the external library.
+
 * Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-6
 - Fix the alarm plugin.
 



From xavierb at fedoraproject.org  Thu Dec 31 00:05:06 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 31 Dec 2009 00:05:06 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/EL-5 openchrome.xinf,1.1,1.2
Message-ID: <20091231000506.9AAC911C00E9@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4133

Modified Files:
	openchrome.xinf 
Log Message:
add VX800 and VX855 to xinf file


Index: openchrome.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/EL-5/openchrome.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openchrome.xinf	2 Nov 2007 16:32:18 -0000	1.1
+++ openchrome.xinf	31 Dec 2009 00:05:06 -0000	1.2
@@ -28,3 +28,9 @@ alias pcivideo:v00001106d00003230sv*sd*b
 
 # 1106:3371 - P4M900 (PCI_CHIP_VT3364)
 alias pcivideo:v00001106d00003371sv*sd*bc*sc*i* openchrome
+
+# 1106:1122 - VX800 (PCI_CHIP_VT3353)
+alias pcivideo:v00001106d00001122sv*sd*bc*sc*i* openchrome
+
+# 1106:5122 - VX855 (PCI_CHIP_VT3409)
+alias pcivideo:v00001106d00005122sv*sd*bc*sc*i* openchrome



From emaldonado at fedoraproject.org  Thu Dec 31 00:07:37 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 31 Dec 2009 00:07:37 +0000 (UTC)
Subject: rpms/nss/devel 545779.patch, NONE, 1.1 nss.spec, 1.133,
	1.134 nsssysinit.patch, 1.1, NONE
Message-ID: <20091231000737.1DCE811C00E9@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4584

Modified Files:
	nss.spec 
Added Files:
	545779.patch 
Removed Files:
	nsssysinit.patch 
Log Message:
Renamed nsssysinit.patch to 545779.patch

545779.patch:
 nsssysinit.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE 545779.patch ---
Index: mozilla/security/nss/lib/sysinit/nsssysinit.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/sysinit/nsssysinit.c,v
retrieving revision 1.1
diff -u -p -r1.1 nsssysinit.c
--- mozilla/security/nss/lib/sysinit/nsssysinit.c	8 Oct 2009 17:08:36 -0000	1.1
+++ mozilla/security/nss/lib/sysinit/nsssysinit.c	12 Dec 2009 03:34:17 -0000
@@ -198,11 +198,20 @@ getFIPSMode(void)
  * the decision making process.
  *
  */
+static const char *nssDefaultFlags = "trustOrder=75 cipherOrder=100 \
+slotParams={0x00000001=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM \
+askpw=any timeout=30 ] }  ";
+static const char *nssDefaultFIPSFlags = "trustOrder=75 cipherOrder=100 \
+slotParams={0x00000003=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM \
+askpw=any timeout=30 ] }  ";
+
 static char **
 get_list(char *filename, char *stripped_parameters)
 {
     char **module_list = PORT_ZNewArray(char *, 4);
     char *userdb;
+    int isFIPS = getFIPSMode();
+    const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
     int next = 0;
 
     /* can't get any space */
@@ -217,8 +226,9 @@ get_list(char *filename, char *stripped_
 	    "library= "
 	    "module=\"NSS User database\" "
 	    "parameters=\"configdir='sql:%s' %s\" "
-	    "NSS=\"flags=internal%s\"", 
-		userdb, stripped_parameters, getFIPSMode() ? ",FIPS" : "");
+        "NSS=\"%sflags=internal%s\"",
+        userdb, stripped_parameters, nssflags,
+        isFIPS ? ",FIPS" : "");
 
 	/* now open the user's defined PKCS #11 modules */
 	/* skip the local user DB entry */
@@ -235,7 +245,7 @@ get_list(char *filename, char *stripped_
 	"library= "
 	"module=\"NSS system database\" "
 	"parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
-	"NSS=\"flags=internal,critical\"",filename);
+    "NSS=\"%sflags=internal,critical\"",filename, nssDefaultFlags);
 
     /* that was the last module */
     module_list[next] = 0;


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- nss.spec	26 Dec 2009 05:14:22 -0000	1.133
+++ nss.spec	31 Dec 2009 00:07:36 -0000	1.134
@@ -44,7 +44,7 @@ Patch6:           nss-enable-pem.patch
 Patch7:           533125-ammend.patch
 Patch8:           nss-sysinit.patch
 Patch9:           540387.patch
-Patch10:          nsssysinit.patch
+Patch10:          545779.patch
 Patch11:          546221.patch
 
 %description
@@ -479,8 +479,7 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 %changelog
 * Fri Dec 25 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.11
-- Fix an error introduced when adapting the patch for
-  rhbz #546211
+- Fix an error introduced when adapting the patch for rhbz #546211
 
 * Sat Dec 19 2009 Elio maldonado<emaldona at redhat.com> - 3.12.5-1.9
 - Remove left over trace statements from nsssysinit patching


--- nsssysinit.patch DELETED ---



From mkent at fedoraproject.org  Thu Dec 31 00:39:06 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 31 Dec 2009 00:39:06 +0000 (UTC)
Subject: File thor-0.12.0.gem uploaded to lookaside cache by mkent
Message-ID: <20091231003906.9C58110F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rubygem-thor:

5fa79d6ca562a39c72c89f5447a3fbd5  thor-0.12.0.gem



From mkent at fedoraproject.org  Thu Dec 31 00:40:15 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 31 Dec 2009 00:40:15 +0000 (UTC)
Subject: rpms/rubygem-thor/devel import.log, NONE, 1.1 rubygem-thor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091231004015.7632C11C00E9@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-thor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10937/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-thor.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-thor-0_12_0-2_fc13:HEAD:rubygem-thor-0.12.0-2.fc13.src.rpm:1262219914


--- NEW FILE rubygem-thor.spec ---
# Generated from thor-0.12.0.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname thor
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Scripting framework that replaces rake, sake and rubigen
Name: rubygem-%{gemname}
Version: 0.12.0
Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://github.com/wycats/thor
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
Requires: rubygem(ruby2ruby)
Requires: rubygem(ParseTree)
Requires: rubygem(rake)
Requires: rubygem(diff-lcs)
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Thor is a scripting framework that replaces rake, sake and rubigen.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

find %{buildroot}%{geminstdir}/bin -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"'

%clean
rm -rf %{buildroot}

# TODO: Specs are shipped in the gem but broken in 0.12.0, attempt to run in
#       next release. Requires older Rake::RDocTask.new in Thorfile and 
#       is missing some files. Requested resolution in 
#       http://github.com/wycats/thor/issues#issue/9

%files
%defattr(-,root,root,-)
%{_bindir}/thor
%{_bindir}/rake2thor
%doc %{geminstdir}/CHANGELOG.rdoc
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Thorfile
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Fri Dec 18 2009 Matthew Kent <mkent at magoazul.com> - 0.12.0-2
- Add Requires for rubygem(rake) (#542559).
- Upstream replaced Source after the gemcutter migration, update to latest
  (#542559).
- Add Requires for rubygem(diff-lcs) as Thor can take advantage of it for
  colourized diff output (#542559).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 0.12.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-thor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:46:35 -0000	1.1
+++ .cvsignore	31 Dec 2009 00:40:15 -0000	1.2
@@ -0,0 +1 @@
+thor-0.12.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-thor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:46:35 -0000	1.1
+++ sources	31 Dec 2009 00:40:15 -0000	1.2
@@ -0,0 +1 @@
+5fa79d6ca562a39c72c89f5447a3fbd5  thor-0.12.0.gem



From mkent at fedoraproject.org  Thu Dec 31 00:41:05 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 31 Dec 2009 00:41:05 +0000 (UTC)
Subject: rpms/rubygem-thor/F-11 import.log, NONE, 1.1 rubygem-thor.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091231004105.67CDA11C00E9@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-thor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11278/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-thor.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-thor-0_12_0-2_fc13:F-11:rubygem-thor-0.12.0-2.fc13.src.rpm:1262220000


--- NEW FILE rubygem-thor.spec ---
# Generated from thor-0.12.0.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname thor
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Scripting framework that replaces rake, sake and rubigen
Name: rubygem-%{gemname}
Version: 0.12.0
Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://github.com/wycats/thor
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
Requires: rubygem(ruby2ruby)
Requires: rubygem(ParseTree)
Requires: rubygem(rake)
Requires: rubygem(diff-lcs)
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Thor is a scripting framework that replaces rake, sake and rubigen.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

find %{buildroot}%{geminstdir}/bin -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"'

%clean
rm -rf %{buildroot}

# TODO: Specs are shipped in the gem but broken in 0.12.0, attempt to run in
#       next release. Requires older Rake::RDocTask.new in Thorfile and 
#       is missing some files. Requested resolution in 
#       http://github.com/wycats/thor/issues#issue/9

%files
%defattr(-,root,root,-)
%{_bindir}/thor
%{_bindir}/rake2thor
%doc %{geminstdir}/CHANGELOG.rdoc
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Thorfile
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Fri Dec 18 2009 Matthew Kent <mkent at magoazul.com> - 0.12.0-2
- Add Requires for rubygem(rake) (#542559).
- Upstream replaced Source after the gemcutter migration, update to latest
  (#542559).
- Add Requires for rubygem(diff-lcs) as Thor can take advantage of it for
  colourized diff output (#542559).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 0.12.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-thor/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:46:35 -0000	1.1
+++ .cvsignore	31 Dec 2009 00:41:05 -0000	1.2
@@ -0,0 +1 @@
+thor-0.12.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-thor/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:46:35 -0000	1.1
+++ sources	31 Dec 2009 00:41:05 -0000	1.2
@@ -0,0 +1 @@
+5fa79d6ca562a39c72c89f5447a3fbd5  thor-0.12.0.gem



From mkent at fedoraproject.org  Thu Dec 31 00:42:00 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 31 Dec 2009 00:42:00 +0000 (UTC)
Subject: rpms/rubygem-thor/F-12 import.log, NONE, 1.1 rubygem-thor.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091231004200.EF04111C00E9@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-thor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11652/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-thor.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-thor-0_12_0-2_fc13:F-12:rubygem-thor-0.12.0-2.fc13.src.rpm:1262220054


--- NEW FILE rubygem-thor.spec ---
# Generated from thor-0.12.0.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname thor
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Scripting framework that replaces rake, sake and rubigen
Name: rubygem-%{gemname}
Version: 0.12.0
Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://github.com/wycats/thor
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
Requires: rubygem(ruby2ruby)
Requires: rubygem(ParseTree)
Requires: rubygem(rake)
Requires: rubygem(diff-lcs)
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Thor is a scripting framework that replaces rake, sake and rubigen.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%prep
%setup -q -c -T

%build
mkdir -p .%{gemdir}
gem install -V \
  --local \
  --install-dir $(pwd)/%{gemdir} \
  --force --rdoc \
  %{SOURCE0}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x

find %{buildroot}%{geminstdir}/bin -type f | \
  xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"'

%clean
rm -rf %{buildroot}

# TODO: Specs are shipped in the gem but broken in 0.12.0, attempt to run in
#       next release. Requires older Rake::RDocTask.new in Thorfile and 
#       is missing some files. Requested resolution in 
#       http://github.com/wycats/thor/issues#issue/9

%files
%defattr(-,root,root,-)
%{_bindir}/thor
%{_bindir}/rake2thor
%doc %{geminstdir}/CHANGELOG.rdoc
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/Thorfile
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Fri Dec 18 2009 Matthew Kent <mkent at magoazul.com> - 0.12.0-2
- Add Requires for rubygem(rake) (#542559).
- Upstream replaced Source after the gemcutter migration, update to latest
  (#542559).
- Add Requires for rubygem(diff-lcs) as Thor can take advantage of it for
  colourized diff output (#542559).

* Mon Nov 16 2009 Matthew Kent <mkent at magoazul.com> - 0.12.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-thor/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Dec 2009 19:46:35 -0000	1.1
+++ .cvsignore	31 Dec 2009 00:42:00 -0000	1.2
@@ -0,0 +1 @@
+thor-0.12.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-thor/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Dec 2009 19:46:35 -0000	1.1
+++ sources	31 Dec 2009 00:42:00 -0000	1.2
@@ -0,0 +1 @@
+5fa79d6ca562a39c72c89f5447a3fbd5  thor-0.12.0.gem



From cwickert at fedoraproject.org  Thu Dec 31 00:47:25 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 31 Dec 2009 00:47:25 +0000 (UTC)
Subject: File xfce4-dict-0.6.0.tar.bz2 uploaded to lookaside cache by cwickert
Message-ID: <20091231004725.E4BC810F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for xfce4-dict:

c371c5c0bbe45a2bfac336cfe01dfe01  xfce4-dict-0.6.0.tar.bz2



From emaldonado at fedoraproject.org  Thu Dec 31 01:21:59 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 31 Dec 2009 01:21:59 +0000 (UTC)
Subject: rpms/nss/devel 547860.patch,NONE,1.1 nss.spec,1.134,1.135
Message-ID: <20091231012159.624F411C00E9@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20150

Modified Files:
	nss.spec 
Added Files:
	547860.patch 
Log Message:
Fix nsssysinit to allow root to modify the nss system database (#547860)

547860.patch:
 nsssysinit.c |   42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

--- NEW FILE 547860.patch ---
diff -up nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.547860 nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c
--- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.547860	2009-12-26 19:26:47.688694605 -0800
+++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-26 19:36:21.817699009 -0800
@@ -50,6 +50,7 @@
  */
 
 #ifdef XP_UNIX
+#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -108,12 +109,18 @@ getSystemDB(void) {
    return PORT_Strdup(NSS_DEFAULT_SYSTEM);
 }
 
+static PRBool
+userCanModifySystemDB()
+{
+   return (access(NSS_DEFAULT_SYSTEM, W_OK) == 0);
+}
+
 #else
 #ifdef XP_WIN
 static char *
 getUserDB(void)
 {
-   /* use the registry to find the user's NSS_DIR. if no entry exists, creaate
+   /* use the registry to find the user's NSS_DIR. if no entry exists, create
     * one in the users Appdir location */
    return NULL;
 }
@@ -121,13 +128,21 @@ getUserDB(void)
 static char *
 getSystemDB(void)
 {
-   /* use the registry to find the system's NSS_DIR. if no entry exists, creaate
+   /* use the registry to find the system's NSS_DIR. if no entry exists, create
     * one based on the windows system data area */
    return NULL;
 }
 
+static PRBool
+userCanModifySystemDB()
+{
+   /* use the registry to find if the user has administrative privilege 
+    * to modify the system's nss database. */
+   return PR_FALSE
+}
+
 #else
-#error "Need to write getUserDB and get SystemDB functions"
+#error "Need to write getUserDB, SystemDB and userCanModifySystemDB functions"
 #endif
 #endif
 
@@ -206,7 +221,7 @@ askpw=any timeout=30 ] }  ";
 static char **
 get_list(char *filename, char *stripped_parameters)
 {
-    char **module_list = PORT_ZNewArray(char *, 5);
+    char **module_list = PORT_ZNewArray(char *, 4);
     char *userdb, *sysdb;
     int isFIPS = getFIPSMode();
     const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
@@ -245,23 +260,14 @@ get_list(char *filename, char *stripped_
 		userdb, stripped_parameters);
 	}
 
-    if (filename && 0 /* This doesn't actually work. If we register
-			 both this and the sysdb (in either order)
-			 then only one of them actually shows up */) {
-	    module_list[next++] = PR_smprintf(
-	      "library= "
-	      "module=\"NSS database\" "
-	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
-	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
-    }
-
-    /* now the system database (always read only) */
+    /* now the system database (always read only unless it's root) */
     if (sysdb) {
-	    module_list[next++] = PR_smprintf(
+	const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly";
+	module_list[next++] = PR_smprintf(
 	      "library= "
 	      "module=\"NSS system database\" "
-	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
-	      "NSS=\"%sflags=internal,critical\"",sysdb, nssflags);
+	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" "
+	      "NSS=\"%sflags=internal,critical\"",sysdb, readonly, nssflags);
     }
 
     /* that was the last module */


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- nss.spec	31 Dec 2009 00:07:36 -0000	1.134
+++ nss.spec	31 Dec 2009 01:21:59 -0000	1.135
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.11
+Release:          1%{?dist}.13
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -46,6 +46,7 @@ Patch8:           nss-sysinit.patch
 Patch9:           540387.patch
 Patch10:          545779.patch
 Patch11:          546221.patch
+Patch12:          547860.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -117,6 +118,7 @@ low level services.
 %patch9 -p1 -b .540387
 %patch10 -p0 -b .545779
 %patch11 -p1 -b .546221
+%patch12 -p1 -b .547860
 
 %build
 
@@ -478,6 +480,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Dec 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.13
+- Fix nsssysinit to allow root to modify the nss system database (#547860)
+
 * Fri Dec 25 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.11
 - Fix an error introduced when adapting the patch for rhbz #546211
 



From cwickert at fedoraproject.org  Thu Dec 31 01:26:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 31 Dec 2009 01:26:11 +0000 (UTC)
Subject: rpms/xfce4-dict/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xfce4-dict.spec, 1.10, 1.11
Message-ID: <20091231012611.DE3BF11C00E9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21073

Modified Files:
	.cvsignore sources xfce4-dict.spec 
Log Message:
* Thu Dec 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.0-1
- Update to 0.6.0
- Drop OnlyShowIn



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 May 2009 18:38:04 -0000	1.6
+++ .cvsignore	31 Dec 2009 01:26:11 -0000	1.7
@@ -1 +1 @@
-xfce4-dict-0.5.3.tar.bz2
+xfce4-dict-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 May 2009 18:38:04 -0000	1.6
+++ sources	31 Dec 2009 01:26:11 -0000	1.7
@@ -1 +1 @@
-5d6e6da52ebe3663040a9936e3a63f8b  xfce4-dict-0.5.3.tar.bz2
+c371c5c0bbe45a2bfac336cfe01dfe01  xfce4-dict-0.6.0.tar.bz2


Index: xfce4-dict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/devel/xfce4-dict.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xfce4-dict.spec	27 Jul 2009 07:51:03 -0000	1.10
+++ xfce4-dict.spec	31 Dec 2009 01:26:11 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           xfce4-dict
-Version:        0.5.3
-Release:        3%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        A Dictionary Client for the Xfce desktop environment
 Summary(de):    Ein W?rterbuch-Client f?r die Xfce Desktop-Umgebung
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/apps/%{name}/0.6/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
@@ -48,9 +48,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
-desktop-file-install                                            \
+desktop-file-install --vendor=""                                \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-only-show-in=XFCE                                 \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
@@ -88,6 +87,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Dec 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.0-1
+- Update to 0.6.0
+- Drop OnlyShowIn
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Thu Dec 31 01:35:26 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 31 Dec 2009 01:35:26 +0000 (UTC)
Subject: File gigolo-0.4.0.tar.bz2 uploaded to lookaside cache by cwickert
Message-ID: <20091231013526.1410510F7EA@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gigolo:

9c8e12ca55f39c0fff7cf06732f0eb44  gigolo-0.4.0.tar.bz2



From cwickert at fedoraproject.org  Thu Dec 31 01:48:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 31 Dec 2009 01:48:05 +0000 (UTC)
Subject: rpms/gigolo/F-12 .cvsignore, 1.5, 1.6 gigolo.spec, 1.5, 1.6 sources, 
	1.5, 1.6
Message-ID: <20091231014805.0934A11C00E9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gigolo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25222/F-12

Modified Files:
	.cvsignore gigolo.spec sources 
Log Message:
* Thu Dec 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
- Update to 0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gigolo/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Apr 2009 03:46:25 -0000	1.5
+++ .cvsignore	31 Dec 2009 01:48:04 -0000	1.6
@@ -1 +1 @@
-gigolo-0.3.2.tar.bz2
+gigolo-0.4.0.tar.bz2


Index: gigolo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gigolo/F-12/gigolo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gigolo.spec	25 Jul 2009 00:09:40 -0000	1.5
+++ gigolo.spec	31 Dec 2009 01:48:04 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           gigolo
-Version:        0.3.2
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        GIO/GVFS management application
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://goodies.xfce.org/projects/applications/gigolo/
-Source0:        http://goodies.xfce.org/releases/gigolo/gigolo-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python
@@ -52,11 +52,7 @@ DESTDIR=$RPM_BUILD_ROOT ./waf install 
 # remove docs that waf installs in the wrong place
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/gigolo
 
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/gigolo.desktop
-
-desktop-file-install                                           \
-      --dir=%{buildroot}%{_datadir}/applications               \
-      _build_/default/%{name}.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
@@ -71,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gigolo.1.gz
 
 %changelog
+* Thu Dec 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
+- Update to 0.4.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gigolo/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Apr 2009 03:46:25 -0000	1.5
+++ sources	31 Dec 2009 01:48:04 -0000	1.6
@@ -1 +1 @@
-e810a525b495d08bce69317aa37d6134  gigolo-0.3.2.tar.bz2
+9c8e12ca55f39c0fff7cf06732f0eb44  gigolo-0.4.0.tar.bz2



From cwickert at fedoraproject.org  Thu Dec 31 01:48:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 31 Dec 2009 01:48:05 +0000 (UTC)
Subject: rpms/gigolo/devel .cvsignore, 1.5, 1.6 gigolo.spec, 1.5, 1.6 sources, 
	1.5, 1.6
Message-ID: <20091231014805.470EC11C00E9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gigolo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25222/devel

Modified Files:
	.cvsignore gigolo.spec sources 
Log Message:
* Thu Dec 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
- Update to 0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gigolo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Apr 2009 03:46:25 -0000	1.5
+++ .cvsignore	31 Dec 2009 01:48:05 -0000	1.6
@@ -1 +1 @@
-gigolo-0.3.2.tar.bz2
+gigolo-0.4.0.tar.bz2


Index: gigolo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gigolo/devel/gigolo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gigolo.spec	25 Jul 2009 00:09:40 -0000	1.5
+++ gigolo.spec	31 Dec 2009 01:48:05 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           gigolo
-Version:        0.3.2
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        GIO/GVFS management application
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://goodies.xfce.org/projects/applications/gigolo/
-Source0:        http://goodies.xfce.org/releases/gigolo/gigolo-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python
@@ -52,11 +52,7 @@ DESTDIR=$RPM_BUILD_ROOT ./waf install 
 # remove docs that waf installs in the wrong place
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/gigolo
 
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/gigolo.desktop
-
-desktop-file-install                                           \
-      --dir=%{buildroot}%{_datadir}/applications               \
-      _build_/default/%{name}.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
@@ -71,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gigolo.1.gz
 
 %changelog
+* Thu Dec 31 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
+- Update to 0.4.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gigolo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Apr 2009 03:46:25 -0000	1.5
+++ sources	31 Dec 2009 01:48:05 -0000	1.6
@@ -1 +1 @@
-e810a525b495d08bce69317aa37d6134  gigolo-0.3.2.tar.bz2
+9c8e12ca55f39c0fff7cf06732f0eb44  gigolo-0.4.0.tar.bz2



From huzaifas at fedoraproject.org  Thu Dec 31 03:50:37 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 31 Dec 2009 03:50:37 +0000 (UTC)
Subject: rpms/libtar/devel libtar-1.2.11-mem-deref.patch, NONE, 1.1 libtar.spec,
	1.18, 1.19 sources, 1.4, 1.5
Message-ID: <20091231035037.791B011C00E9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/libtar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12652

Modified Files:
	libtar.spec sources 
Added Files:
	libtar-1.2.11-mem-deref.patch 
Log Message:
Fix BZ #380965

libtar-1.2.11-mem-deref.patch:
 libtar.h |    1 +
 util.c   |    4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE libtar-1.2.11-mem-deref.patch ---
--- libtar-1.2.11/lib/libtar.h.deref	2009-12-30 16:37:03.790121122 +0100
+++ libtar-1.2.11/lib/libtar.h	2009-12-30 16:37:35.521246633 +0100
@@ -172,6 +172,7 @@ int th_write(TAR *t);
 #define TH_ISDIR(t)	((t)->th_buf.typeflag == DIRTYPE \
 			 || S_ISDIR((mode_t)oct_to_int((t)->th_buf.mode)) \
 			 || ((t)->th_buf.typeflag == AREGTYPE \
+			     && strlen((t)->th_buf.name) \
 			     && ((t)->th_buf.name[strlen((t)->th_buf.name) - 1] == '/')))
 #define TH_ISFIFO(t)	((t)->th_buf.typeflag == FIFOTYPE \
 			 || S_ISFIFO((mode_t)oct_to_int((t)->th_buf.mode)))
--- libtar-1.2.11/lib/util.c.deref	2003-01-07 02:41:00.000000000 +0100
+++ libtar-1.2.11/lib/util.c	2009-12-30 17:35:51.860121660 +0100
@@ -133,9 +133,7 @@ oct_to_int(char *oct)
 {
 	int i;
 
-	sscanf(oct, "%o", &i);
-
-	return i;
+	return sscanf(oct, "%o", &i) == 1 ? i : 0;
 }
 
 



Index: libtar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/devel/libtar.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libtar.spec	20 Nov 2009 09:52:56 -0000	1.18
+++ libtar.spec	31 Dec 2009 03:50:36 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        Tar file manipulation API
 Name:           libtar
 Version:        1.2.11
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.feep.net/libtar/
@@ -10,6 +10,7 @@ Patch0:         http://ftp.debian.org/de
 Patch1:         libtar-1.2.11-missing-protos.patch
 Patch2:         libtar-macro.patch
 Patch3:		libtar-1.2.11-tar_header.patch
+Patch4:		libtar-1.2.11-mem-deref.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  zlib-devel libtool
 
@@ -35,6 +36,8 @@ developing applications that use %{name}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1 -b .tar_header
+%patch4 -p1 -b .deref
+
 # set correct version for .so build
 %define ltversion %(echo %{version} | tr '.' ':')
 sed -i 's/-rpath $(libdir)/-rpath $(libdir) -version-number %{ltversion}/' \
@@ -87,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1.2.11-16
+- Fix invalid memory de-reference issue in BZ #380965
+
 * Fri Nov 20 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1.2.11-15
 - Fix buffer overflow in BZ #538770
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2009 10:07:01 -0000	1.4
+++ sources	31 Dec 2009 03:50:36 -0000	1.5
@@ -1 +1,2 @@
 604238e8734ce6e25347a58c4f1a1d7e  libtar-1.2.11.tar.gz
+8149a09f4baef9a879ef5f74dab1c32e  libtar_1.2.11-4.diff.gz



From huzaifas at fedoraproject.org  Thu Dec 31 03:56:55 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Thu, 31 Dec 2009 03:56:55 +0000 (UTC)
Subject: rpms/libtar/F-12 libtar-1.2.11-mem-deref.patch, NONE, 1.1 libtar.spec,
	1.18, 1.19
Message-ID: <20091231035655.D1A3611C00E9@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/libtar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13659

Modified Files:
	libtar.spec 
Added Files:
	libtar-1.2.11-mem-deref.patch 
Log Message:
Fix BZ #380965

libtar-1.2.11-mem-deref.patch:
 libtar.h |    1 +
 util.c   |    4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE libtar-1.2.11-mem-deref.patch ---
--- libtar-1.2.11/lib/libtar.h.deref	2009-12-30 16:37:03.790121122 +0100
+++ libtar-1.2.11/lib/libtar.h	2009-12-30 16:37:35.521246633 +0100
@@ -172,6 +172,7 @@ int th_write(TAR *t);
 #define TH_ISDIR(t)	((t)->th_buf.typeflag == DIRTYPE \
 			 || S_ISDIR((mode_t)oct_to_int((t)->th_buf.mode)) \
 			 || ((t)->th_buf.typeflag == AREGTYPE \
+			     && strlen((t)->th_buf.name) \
 			     && ((t)->th_buf.name[strlen((t)->th_buf.name) - 1] == '/')))
 #define TH_ISFIFO(t)	((t)->th_buf.typeflag == FIFOTYPE \
 			 || S_ISFIFO((mode_t)oct_to_int((t)->th_buf.mode)))
--- libtar-1.2.11/lib/util.c.deref	2003-01-07 02:41:00.000000000 +0100
+++ libtar-1.2.11/lib/util.c	2009-12-30 17:35:51.860121660 +0100
@@ -133,9 +133,7 @@ oct_to_int(char *oct)
 {
 	int i;
 
-	sscanf(oct, "%o", &i);
-
-	return i;
+	return sscanf(oct, "%o", &i) == 1 ? i : 0;
 }
 
 



Index: libtar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/F-12/libtar.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libtar.spec	20 Nov 2009 10:15:17 -0000	1.18
+++ libtar.spec	31 Dec 2009 03:56:55 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        Tar file manipulation API
 Name:           libtar
 Version:        1.2.11
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.feep.net/libtar/
@@ -10,6 +10,7 @@ Patch0:         http://ftp.debian.org/de
 Patch1:         libtar-1.2.11-missing-protos.patch
 Patch2:         libtar-macro.patch
 Patch3:		libtar-1.2.11-tar_header.patch
+Patch4:		libtar-1.2.11-mem-deref.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  zlib-devel libtool
 
@@ -35,6 +36,8 @@ developing applications that use %{name}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1 -b .tar_header
+%patch4 -p1 -b .deref
+
 # set correct version for .so build
 %define ltversion %(echo %{version} | tr '.' ':')
 sed -i 's/-rpath $(libdir)/-rpath $(libdir) -version-number %{ltversion}/' \
@@ -87,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1.2.11-16
+- Fix invalid memory de-reference issue in BZ #380965
+
 * Fri Nov 20 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1.2.11-15
 - Fix buffer overflow in BZ #538770
 



From taljurf at fedoraproject.org  Thu Dec 31 04:45:10 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 31 Dec 2009 04:45:10 +0000 (UTC)
Subject: rpms/invulgotracker/F-12 import.log, NONE,
	1.1 invulgotracker-0.60-icon-location.patch, NONE,
	1.1 invulgotracker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091231044510.8EA2B11C00E8@cvs1.fedora.phx.redhat.com>

Author: taljurf

Update of /cvs/pkgs/rpms/invulgotracker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11934/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log invulgotracker-0.60-icon-location.patch 
	invulgotracker.spec 
Log Message:
nitial import of invulgotracker. Review was done at
https://bugzilla.redhat.com/show_bug.cgi?id=528150




--- NEW FILE import.log ---
invulgotracker-0_61-1_fc12:F-12:invulgotracker-0.61-1.fc12.src.rpm:1262234448

invulgotracker-0.60-icon-location.patch:
 Makefile.in               |    2 +-
 Makefile.in~              |only
 src/invulgotrackerapp.cc  |    4 ++--
 src/invulgotrackerapp.cc~ |only
 4 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE invulgotracker-0.60-icon-location.patch ---
diff -dur invulgotracker-0.60.orig/Makefile.in invulgotracker-0.60/Makefile.in
--- invulgotracker-0.60.orig/Makefile.in	2009-12-02 21:48:25.000000000 +0300
+++ invulgotracker-0.60/Makefile.in	2009-12-03 11:20:38.707168978 +0300
@@ -306,7 +306,7 @@
 desktopdir = $(datadir)/applications
 desktop_in_files = InvulgoTracker.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-pixmapsdir = $(datadir)/icons
+pixmapsdir = $(datadir)/pixmaps
 pixmaps_DATA = InvulgoTracker.png
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
Only in invulgotracker-0.60: Makefile.in~
diff -dur invulgotracker-0.60.orig/src/invulgotrackerapp.cc invulgotracker-0.60/src/invulgotrackerapp.cc
--- invulgotracker-0.60.orig/src/invulgotrackerapp.cc	2009-12-02 21:53:49.000000000 +0300
+++ invulgotracker-0.60/src/invulgotrackerapp.cc	2009-12-03 11:21:20.888169118 +0300
@@ -303,7 +303,7 @@
     g_signal_connect(G_OBJECT(trayIcon), "query-tooltip", G_CALLBACK(tray_icon_tooltip), mainWindow);
 
     strcpy(filename, PACKAGE_DATA_DIR);
-    strcat(filename, "/icons/InvulgoTracker.png");
+    strcat(filename, "/pixmaps/InvulgoTracker.png");
     gtk_status_icon_set_from_file(trayIcon, filename);
     gtk_status_icon_set_tooltip_markup(trayIcon, "<b>InvulgoTracker</b>");
     gtk_status_icon_set_visible(trayIcon, TRUE);
@@ -366,7 +366,7 @@
     strcat(title, VERSION);
     gtk_window_set_title(GTK_WINDOW(mainWindow),title);
     strcpy(filename, PACKAGE_DATA_DIR);
-    strcat(filename, "/icons/InvulgoTracker.png");
+    strcat(filename, "/pixmaps/InvulgoTracker.png");
     GdkPixbuf *pix = gdk_pixbuf_new_from_file(filename,NULL);
     gtk_window_set_icon(GTK_WINDOW(mainWindow), pix);
     delete[] filename;
Only in invulgotracker-0.60/src: invulgotrackerapp.cc~


--- NEW FILE invulgotracker.spec ---
Name:           invulgotracker
Version:        0.61
Release:        1%{?dist}
Summary:        Tasks & projects tracking tool

Group:          Applications/Productivity
License:        GPLv3+
URL:            http://www.invulgo.dk/
Source0:        http://invulgotracker.googlecode.com/files/invulgotracker-%{version}.tar.gz
Patch0:         invulgotracker-0.60-icon-location.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext gtk2-devel intltool libglade2-devel libxml2-devel gnome-vfs2-devel desktop-file-utils
#Requires:       

%description
Simple application to track time usage on your tasks & projects.

%prep
%setup -q
#Remove extension from icon
sed -i 's|Icon=InvulgoTracker.png|Icon=InvulgoTracker|g' InvulgoTracker.desktop.in
#Place icon in pixmaps
%patch0 -p1 -b .orig


%build
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
%find_lang %{name}
# remove duplicate docs
rm -rf $RPM_BUILD_ROOT/%{_docdir}
desktop-file-install \
	--dir=%{buildroot}%{_datadir}/applications \
	--add-category="ProjectManagement" \
	%{buildroot}%{_datadir}/applications/InvulgoTracker.desktop

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang

%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_bindir}/invulgotracker
%{_datadir}/applications/InvulgoTracker.desktop
%{_datadir}/pixmaps/InvulgoTracker.png
%{_datadir}/invulgotracker/


%changelog
* Fri Dec 18 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.61-1
- Update to 0.61

* Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
- Update to 0.60

* Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
- Fixed desktop and icons

* Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
- Fixed some spec problems

* Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
- Update to 0.53.1

* Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Dec 2009 07:04:55 -0000	1.1
+++ .cvsignore	31 Dec 2009 04:45:09 -0000	1.2
@@ -0,0 +1 @@
+invulgotracker-0.61.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Dec 2009 07:04:56 -0000	1.1
+++ sources	31 Dec 2009 04:45:09 -0000	1.2
@@ -0,0 +1 @@
+cd1bb347722ce53ffa644d3c7d932fd5  invulgotracker-0.61.tar.gz



From taljurf at fedoraproject.org  Thu Dec 31 05:00:55 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 31 Dec 2009 05:00:55 +0000 (UTC)
Subject: File invulgotracker-0.60.tar.gz uploaded to lookaside cache by taljurf
Message-ID: <20091231050055.8E24D10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for invulgotracker:

24d1d0f5fd7ad824bcf65d1c111c4000  invulgotracker-0.60.tar.gz



From taljurf at fedoraproject.org  Thu Dec 31 05:15:57 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 31 Dec 2009 05:15:57 +0000 (UTC)
Subject: rpms/invulgotracker/F-11 import.log, NONE,
	1.1 invulgotracker-0.60-icon-location.patch, NONE,
	1.1 invulgotracker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091231051557.6622211C00E8@cvs1.fedora.phx.redhat.com>

Author: taljurf

Update of /cvs/pkgs/rpms/invulgotracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15347/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log invulgotracker-0.60-icon-location.patch 
	invulgotracker.spec 
Log Message:
Initial import of invulgotracker. Review was done at
https://bugzilla.redhat.com/show_bug.cgi?id=528150




--- NEW FILE import.log ---
invulgotracker-0_60-1_fc12:F-11:invulgotracker-0.60-1.fc12.src.rpm:1262235656

invulgotracker-0.60-icon-location.patch:
 Makefile.in               |    2 +-
 Makefile.in~              |only
 src/invulgotrackerapp.cc  |    4 ++--
 src/invulgotrackerapp.cc~ |only
 4 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE invulgotracker-0.60-icon-location.patch ---
diff -dur invulgotracker-0.60.orig/Makefile.in invulgotracker-0.60/Makefile.in
--- invulgotracker-0.60.orig/Makefile.in	2009-12-02 21:48:25.000000000 +0300
+++ invulgotracker-0.60/Makefile.in	2009-12-03 11:20:38.707168978 +0300
@@ -306,7 +306,7 @@
 desktopdir = $(datadir)/applications
 desktop_in_files = InvulgoTracker.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-pixmapsdir = $(datadir)/icons
+pixmapsdir = $(datadir)/pixmaps
 pixmaps_DATA = InvulgoTracker.png
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
Only in invulgotracker-0.60: Makefile.in~
diff -dur invulgotracker-0.60.orig/src/invulgotrackerapp.cc invulgotracker-0.60/src/invulgotrackerapp.cc
--- invulgotracker-0.60.orig/src/invulgotrackerapp.cc	2009-12-02 21:53:49.000000000 +0300
+++ invulgotracker-0.60/src/invulgotrackerapp.cc	2009-12-03 11:21:20.888169118 +0300
@@ -303,7 +303,7 @@
     g_signal_connect(G_OBJECT(trayIcon), "query-tooltip", G_CALLBACK(tray_icon_tooltip), mainWindow);
 
     strcpy(filename, PACKAGE_DATA_DIR);
-    strcat(filename, "/icons/InvulgoTracker.png");
+    strcat(filename, "/pixmaps/InvulgoTracker.png");
     gtk_status_icon_set_from_file(trayIcon, filename);
     gtk_status_icon_set_tooltip_markup(trayIcon, "<b>InvulgoTracker</b>");
     gtk_status_icon_set_visible(trayIcon, TRUE);
@@ -366,7 +366,7 @@
     strcat(title, VERSION);
     gtk_window_set_title(GTK_WINDOW(mainWindow),title);
     strcpy(filename, PACKAGE_DATA_DIR);
-    strcat(filename, "/icons/InvulgoTracker.png");
+    strcat(filename, "/pixmaps/InvulgoTracker.png");
     GdkPixbuf *pix = gdk_pixbuf_new_from_file(filename,NULL);
     gtk_window_set_icon(GTK_WINDOW(mainWindow), pix);
     delete[] filename;
Only in invulgotracker-0.60/src: invulgotrackerapp.cc~


--- NEW FILE invulgotracker.spec ---
Name:           invulgotracker
Version:        0.60
Release:        1%{?dist}
Summary:        Tasks & projects tracking tool

Group:          Applications/Productivity
License:        GPLv3+
URL:            http://www.invulgo.dk/
Source0:        http://invulgotracker.googlecode.com/files/invulgotracker-%{version}.tar.gz
Patch0:		invulgotracker-0.60-icon-location.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext gtk2-devel intltool libglade2-devel libxml2-devel gnome-vfs2-devel desktop-file-utils
#Requires:       

%description
Simple application to track time usage on your tasks & projects.

%prep
%setup -q
#Remove extension from icon
sed -i 's|Icon=InvulgoTracker.png|Icon=InvulgoTracker|g' InvulgoTracker.desktop.in
#Place icon in pixmaps
%patch0 -p1 -b .orig


%build
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
%find_lang %{name}
# remove duplicate docs
rm -rf $RPM_BUILD_ROOT/%{_docdir}
desktop-file-install \
	--dir=%{buildroot}%{_datadir}/applications \
	--add-category="ProjectManagement" \
	%{buildroot}%{_datadir}/applications/InvulgoTracker.desktop

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang

%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_bindir}/invulgotracker
%{_datadir}/applications/InvulgoTracker.desktop
%{_datadir}/pixmaps/InvulgoTracker.png
%{_datadir}/invulgotracker/


%changelog
*Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
- Update to 0.60

*Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
- Fixed desktop and icons

*Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
- Fixed some spec problems

*Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
- Update to 0.53.1

*Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Dec 2009 07:04:55 -0000	1.1
+++ .cvsignore	31 Dec 2009 05:15:57 -0000	1.2
@@ -0,0 +1 @@
+invulgotracker-0.60.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Dec 2009 07:04:56 -0000	1.1
+++ sources	31 Dec 2009 05:15:57 -0000	1.2
@@ -0,0 +1 @@
+24d1d0f5fd7ad824bcf65d1c111c4000  invulgotracker-0.60.tar.gz



From taljurf at fedoraproject.org  Thu Dec 31 05:21:15 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 31 Dec 2009 05:21:15 +0000 (UTC)
Subject: rpms/invulgotracker/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 invulgotracker.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091231052115.6D74B11C00E8@cvs1.fedora.phx.redhat.com>

Author: taljurf

Update of /cvs/pkgs/rpms/invulgotracker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18495/F-12

Modified Files:
	.cvsignore import.log invulgotracker.spec sources 
Log Message:
Initial import of invulgotracker. Review was done at
https://bugzilla.redhat.com/show_bug.cgi?id=528150




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Dec 2009 04:45:09 -0000	1.2
+++ .cvsignore	31 Dec 2009 05:21:15 -0000	1.3
@@ -1 +1 @@
-invulgotracker-0.61.tar.gz
+invulgotracker-0.60.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	31 Dec 2009 04:45:09 -0000	1.1
+++ import.log	31 Dec 2009 05:21:15 -0000	1.2
@@ -1 +1,2 @@
 invulgotracker-0_61-1_fc12:F-12:invulgotracker-0.61-1.fc12.src.rpm:1262234448
+invulgotracker-0_60-1_fc12:F-12:invulgotracker-0.60-1.fc12.src.rpm:1262236789


Index: invulgotracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-12/invulgotracker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- invulgotracker.spec	31 Dec 2009 04:45:09 -0000	1.1
+++ invulgotracker.spec	31 Dec 2009 05:21:15 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           invulgotracker
-Version:        0.61
+Version:        0.60
 Release:        1%{?dist}
 Summary:        Tasks & projects tracking tool
 
@@ -7,7 +7,7 @@ Group:          Applications/Productivit
 License:        GPLv3+
 URL:            http://www.invulgo.dk/
 Source0:        http://invulgotracker.googlecode.com/files/invulgotracker-%{version}.tar.gz
-Patch0:         invulgotracker-0.60-icon-location.patch
+Patch0:		invulgotracker-0.60-icon-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel intltool libglade2-devel libxml2-devel gnome-vfs2-devel desktop-file-utils
@@ -55,20 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Dec 18 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.61-1
-- Update to 0.61
-
-* Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
+*Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
 - Update to 0.60
 
-* Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
+*Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
 - Fixed desktop and icons
 
-* Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
+*Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
 - Fixed some spec problems
 
-* Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
+*Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
 - Update to 0.53.1
 
-* Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
+*Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Dec 2009 04:45:09 -0000	1.2
+++ sources	31 Dec 2009 05:21:15 -0000	1.3
@@ -1 +1 @@
-cd1bb347722ce53ffa644d3c7d932fd5  invulgotracker-0.61.tar.gz
+24d1d0f5fd7ad824bcf65d1c111c4000  invulgotracker-0.60.tar.gz



From taljurf at fedoraproject.org  Thu Dec 31 06:11:12 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 31 Dec 2009 06:11:12 +0000 (UTC)
Subject: rpms/invulgotracker/devel invulgotracker-0.60-icon-location.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 invulgotracker.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091231061112.46BEC11C00E8@cvs1.fedora.phx.redhat.com>

Author: taljurf

Update of /cvs/pkgs/rpms/invulgotracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26074/devel

Modified Files:
	.cvsignore import.log invulgotracker.spec sources 
Added Files:
	invulgotracker-0.60-icon-location.patch 
Log Message:
Initial import of invulgotracker. Review was done at
https://bugzilla.redhat.com/show_bug.cgi?id=528150



invulgotracker-0.60-icon-location.patch:
 Makefile.in               |    2 +-
 Makefile.in~              |only
 src/invulgotrackerapp.cc  |    4 ++--
 src/invulgotrackerapp.cc~ |only
 4 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE invulgotracker-0.60-icon-location.patch ---
diff -dur invulgotracker-0.60.orig/Makefile.in invulgotracker-0.60/Makefile.in
--- invulgotracker-0.60.orig/Makefile.in	2009-12-02 21:48:25.000000000 +0300
+++ invulgotracker-0.60/Makefile.in	2009-12-03 11:20:38.707168978 +0300
@@ -306,7 +306,7 @@
 desktopdir = $(datadir)/applications
 desktop_in_files = InvulgoTracker.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-pixmapsdir = $(datadir)/icons
+pixmapsdir = $(datadir)/pixmaps
 pixmaps_DATA = InvulgoTracker.png
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
Only in invulgotracker-0.60: Makefile.in~
diff -dur invulgotracker-0.60.orig/src/invulgotrackerapp.cc invulgotracker-0.60/src/invulgotrackerapp.cc
--- invulgotracker-0.60.orig/src/invulgotrackerapp.cc	2009-12-02 21:53:49.000000000 +0300
+++ invulgotracker-0.60/src/invulgotrackerapp.cc	2009-12-03 11:21:20.888169118 +0300
@@ -303,7 +303,7 @@
     g_signal_connect(G_OBJECT(trayIcon), "query-tooltip", G_CALLBACK(tray_icon_tooltip), mainWindow);
 
     strcpy(filename, PACKAGE_DATA_DIR);
-    strcat(filename, "/icons/InvulgoTracker.png");
+    strcat(filename, "/pixmaps/InvulgoTracker.png");
     gtk_status_icon_set_from_file(trayIcon, filename);
     gtk_status_icon_set_tooltip_markup(trayIcon, "<b>InvulgoTracker</b>");
     gtk_status_icon_set_visible(trayIcon, TRUE);
@@ -366,7 +366,7 @@
     strcat(title, VERSION);
     gtk_window_set_title(GTK_WINDOW(mainWindow),title);
     strcpy(filename, PACKAGE_DATA_DIR);
-    strcat(filename, "/icons/InvulgoTracker.png");
+    strcat(filename, "/pixmaps/InvulgoTracker.png");
     GdkPixbuf *pix = gdk_pixbuf_new_from_file(filename,NULL);
     gtk_window_set_icon(GTK_WINDOW(mainWindow), pix);
     delete[] filename;
Only in invulgotracker-0.60/src: invulgotrackerapp.cc~


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Dec 2009 21:17:09 -0000	1.2
+++ .cvsignore	31 Dec 2009 06:11:10 -0000	1.3
@@ -1 +1 @@
-invulgotracker-0.61.tar.gz
+invulgotracker-0.60.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Dec 2009 21:17:09 -0000	1.1
+++ import.log	31 Dec 2009 06:11:10 -0000	1.2
@@ -1 +1,2 @@
 invulgotracker-0_61-1_fc13:HEAD:invulgotracker-0.61-1.fc13.src.rpm:1261688786
+invulgotracker-0_60-1_fc12:HEAD:invulgotracker-0.60-1.fc12.src.rpm:1262239766


Index: invulgotracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/invulgotracker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- invulgotracker.spec	24 Dec 2009 21:17:09 -0000	1.1
+++ invulgotracker.spec	31 Dec 2009 06:11:11 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           invulgotracker
-Version:        0.61
+Version:        0.60
 Release:        1%{?dist}
 Summary:        Tasks & projects tracking tool
 
@@ -7,7 +7,7 @@ Group:          Applications/Productivit
 License:        GPLv3+
 URL:            http://www.invulgo.dk/
 Source0:        http://invulgotracker.googlecode.com/files/invulgotracker-%{version}.tar.gz
-Patch0:         invulgotracker-0.60-icon-location.patch
+Patch0:		invulgotracker-0.60-icon-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel intltool libglade2-devel libxml2-devel gnome-vfs2-devel desktop-file-utils
@@ -55,20 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Dec 18 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.61-1
-- Update to 0.61
-
-* Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
+*Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
 - Update to 0.60
 
-* Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
+*Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
 - Fixed desktop and icons
 
-* Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
+*Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
 - Fixed some spec problems
 
-* Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
+*Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
 - Update to 0.53.1
 
-* Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
+*Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Dec 2009 21:17:09 -0000	1.2
+++ sources	31 Dec 2009 06:11:11 -0000	1.3
@@ -1 +1 @@
-cd1bb347722ce53ffa644d3c7d932fd5  invulgotracker-0.61.tar.gz
+24d1d0f5fd7ad824bcf65d1c111c4000  invulgotracker-0.60.tar.gz



From taljurf at fedoraproject.org  Thu Dec 31 06:21:20 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 31 Dec 2009 06:21:20 +0000 (UTC)
Subject: rpms/invulgotracker/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 invulgotracker.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091231062120.8D6B411C00E8@cvs1.fedora.phx.redhat.com>

Author: taljurf

Update of /cvs/pkgs/rpms/invulgotracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27736/F-11

Modified Files:
	.cvsignore import.log invulgotracker.spec sources 
Log Message:
Initial import of invulgotracker. Review was done at
https://bugzilla.redhat.com/show_bug.cgi?id=528150




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Dec 2009 05:15:57 -0000	1.2
+++ .cvsignore	31 Dec 2009 06:21:19 -0000	1.3
@@ -1 +1 @@
-invulgotracker-0.60.tar.gz
+invulgotracker-0.61.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	31 Dec 2009 05:15:57 -0000	1.1
+++ import.log	31 Dec 2009 06:21:20 -0000	1.2
@@ -1 +1,2 @@
 invulgotracker-0_60-1_fc12:F-11:invulgotracker-0.60-1.fc12.src.rpm:1262235656
+invulgotracker-0_61-1_fc12:F-11:invulgotracker-0.61-1.fc12.src.rpm:1262240380


Index: invulgotracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-11/invulgotracker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- invulgotracker.spec	31 Dec 2009 05:15:57 -0000	1.1
+++ invulgotracker.spec	31 Dec 2009 06:21:20 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           invulgotracker
-Version:        0.60
+Version:        0.61
 Release:        1%{?dist}
 Summary:        Tasks & projects tracking tool
 
@@ -7,7 +7,7 @@ Group:          Applications/Productivit
 License:        GPLv3+
 URL:            http://www.invulgo.dk/
 Source0:        http://invulgotracker.googlecode.com/files/invulgotracker-%{version}.tar.gz
-Patch0:		invulgotracker-0.60-icon-location.patch
+Patch0:         invulgotracker-0.60-icon-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel intltool libglade2-devel libxml2-devel gnome-vfs2-devel desktop-file-utils
@@ -55,17 +55,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-*Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
+* Fri Dec 18 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.61-1
+- Update to 0.61
+
+* Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
 - Update to 0.60
 
-*Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
+* Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
 - Fixed desktop and icons
 
-*Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
+* Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
 - Fixed some spec problems
 
-*Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
+* Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
 - Update to 0.53.1
 
-*Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
+* Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Dec 2009 05:15:57 -0000	1.2
+++ sources	31 Dec 2009 06:21:20 -0000	1.3
@@ -1 +1 @@
-24d1d0f5fd7ad824bcf65d1c111c4000  invulgotracker-0.60.tar.gz
+cd1bb347722ce53ffa644d3c7d932fd5  invulgotracker-0.61.tar.gz



From taljurf at fedoraproject.org  Thu Dec 31 06:23:44 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 31 Dec 2009 06:23:44 +0000 (UTC)
Subject: rpms/invulgotracker/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 invulgotracker.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091231062344.4D48B11C00E8@cvs1.fedora.phx.redhat.com>

Author: taljurf

Update of /cvs/pkgs/rpms/invulgotracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28277/devel

Modified Files:
	.cvsignore import.log invulgotracker.spec sources 
Log Message:
Initial import of invulgotracker. Review was done at
https://bugzilla.redhat.com/show_bug.cgi?id=528150




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 Dec 2009 06:11:10 -0000	1.3
+++ .cvsignore	31 Dec 2009 06:23:43 -0000	1.4
@@ -1 +1 @@
-invulgotracker-0.60.tar.gz
+invulgotracker-0.61.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	31 Dec 2009 06:11:10 -0000	1.2
+++ import.log	31 Dec 2009 06:23:44 -0000	1.3
@@ -1,2 +1,3 @@
 invulgotracker-0_61-1_fc13:HEAD:invulgotracker-0.61-1.fc13.src.rpm:1261688786
 invulgotracker-0_60-1_fc12:HEAD:invulgotracker-0.60-1.fc12.src.rpm:1262239766
+invulgotracker-0_61-1_fc12:HEAD:invulgotracker-0.61-1.fc12.src.rpm:1262240562


Index: invulgotracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/invulgotracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- invulgotracker.spec	31 Dec 2009 06:11:11 -0000	1.2
+++ invulgotracker.spec	31 Dec 2009 06:23:44 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           invulgotracker
-Version:        0.60
+Version:        0.61
 Release:        1%{?dist}
 Summary:        Tasks & projects tracking tool
 
@@ -7,7 +7,7 @@ Group:          Applications/Productivit
 License:        GPLv3+
 URL:            http://www.invulgo.dk/
 Source0:        http://invulgotracker.googlecode.com/files/invulgotracker-%{version}.tar.gz
-Patch0:		invulgotracker-0.60-icon-location.patch
+Patch0:         invulgotracker-0.60-icon-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel intltool libglade2-devel libxml2-devel gnome-vfs2-devel desktop-file-utils
@@ -55,17 +55,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-*Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
+* Fri Dec 18 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.61-1
+- Update to 0.61
+
+* Thu Dec 03 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.60-1
 - Update to 0.60
 
-*Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
+* Sun Nov 29 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-3
 - Fixed desktop and icons
 
-*Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
+* Sun Nov 22 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-2
 - Fixed some spec problems
 
-*Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
+* Wed Nov 04 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53.1-1
 - Update to 0.53.1
 
-*Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
+* Wed Oct 07 2009 Tareq Al Jurf <taljurf at fedoraproject.org> - 0.53-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Dec 2009 06:11:11 -0000	1.3
+++ sources	31 Dec 2009 06:23:44 -0000	1.4
@@ -1 +1 @@
-24d1d0f5fd7ad824bcf65d1c111c4000  invulgotracker-0.60.tar.gz
+cd1bb347722ce53ffa644d3c7d932fd5  invulgotracker-0.61.tar.gz



From taljurf at fedoraproject.org  Thu Dec 31 06:51:48 2009
From: taljurf at fedoraproject.org (Tareq Al Jurf)
Date: Thu, 31 Dec 2009 06:51:48 +0000 (UTC)
Subject: rpms/invulgotracker/F-11 import.log,1.2,1.3
Message-ID: <20091231065148.3A81511C00E8@cvs1.fedora.phx.redhat.com>

Author: taljurf

Update of /cvs/pkgs/rpms/invulgotracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31205/F-11

Modified Files:
	import.log 
Log Message:
Initial import of invulgotracker. Review was done at
https://bugzilla.redhat.com/show_bug.cgi?id=528150




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/invulgotracker/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	31 Dec 2009 06:21:20 -0000	1.2
+++ import.log	31 Dec 2009 06:51:46 -0000	1.3
@@ -1,2 +1,3 @@
 invulgotracker-0_60-1_fc12:F-11:invulgotracker-0.60-1.fc12.src.rpm:1262235656
 invulgotracker-0_61-1_fc12:F-11:invulgotracker-0.61-1.fc12.src.rpm:1262240380
+invulgotracker-0_61-1_fc13:F-11:invulgotracker-0.61-1.fc13.src.rpm:1262241858



From danken at fedoraproject.org  Thu Dec 31 08:24:45 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 08:24:45 +0000 (UTC)
Subject: rpms/hspell/F-12 hspell.spec,1.16,1.17
Message-ID: <20091231082445.4411F11C00E8@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/extras/rpms/hspell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833

Modified Files:
	hspell.spec 
Log Message:
Summary: A Hebrew spell checker
Name: hspell
Version: 1.1
Release: 1%{?dist}
URL: http://hspell.ivrix.org.il
Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
License: GPLv2
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
Patch0: hspell-1.0.sharedlib.patch

%description
Hspell is a Hebrew SPELLer and morphological analizer. It provides a mostly
spell-like interface (gives the list of wrong words in the input text), but can
also suggest corrections (-c). It also provides a true (yet incomplete)
morphological analizer (-l), that prints all known meanings of a Hebrew string.

%description -l he
Hspell ??? ????? ????? ????? ????, ????? ???? ????-spell - ???? ????? ?? ??????
??????? ???????? ????. Hspell ????? ???? ???? ??????? ?????? ????? ??? ?????
)"???? ???"(.  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
????????? ???????? ?? ?????? ?????? ?????.

%package devel
Summary: Library and include files for Hspell, the hebrew spell checker
Group: Applications/Text
Requires: %{name} = %{version}-%{release}

%description devel
Library and include files for applications that want to use Hspell.

%description -l he devel
?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell.

%package -n hunspell-he
Summary: Hebrew hunspell dictionaries
Group: Applications/Text
Requires: hunspell

%description -n hunspell-he
Hebrew hunspell dictionaries.

%prep
%setup -q
%patch0 -p1 -b .sharedlib.patch
/usr/bin/iconv -f hebrew -t utf8 -o WHATSNEW WHATSNEW

%build
%configure --enable-fatverb --enable-linginfo
make CFLAGS="$RPM_OPT_FLAGS" STRIP=:
make hunspell
cat >> hunspell/new_he.aff << EOF
MAP 10
MAP ???
MAP ??
MAP ??
MAP ??
MAP ??
MAP ??
MAP ?? # for English
MAP ?? # for Russian
MAP ?? # for Arabic
MAP ??? # for French
EOF

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
rm -f $RPM_BUILD_ROOT/%{_libdir}/libhspell.a

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p hunspell/new_he.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.dic
cp -p hunspell/new_he.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.aff

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc LICENSE README WHATSNEW COPYING
%{_bindir}/hspell
%{_bindir}/hspell-i
%{_bindir}/multispell
%{_libdir}/libhspell.so.0
%{_mandir}/man1/hspell.1*
%{_datadir}/hspell/

%files devel
%defattr(-,root,root)
%{_includedir}/*.h
%{_libdir}/libhspell.so
%{_mandir}/man3/hspell.3*

%files -n hunspell-he
%defattr(-,root,root,-)
%doc LICENSE
%{_datadir}/myspell/*

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
- Rebase to upstream version 1.1

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sun Sep 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.0-11
- Fix Patch0:/%%patch mismatch.

* Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-10
- fix license tag

* Wed May 14 2008 Caolan McNamara <caolanm at redhat.com> - 1.0-9
- Resolves: rhbz#313231 build hspell.so instead of a .a

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-8
- Autorebuild for GCC 4.3

* Tue May 22 2007 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-7
- Move the hunspell-he dictionaries into hspell package (Bug #240696).
  Mostly applying Caolan McNamara's patch #155078.
* Sun Feb 11 2007 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-6
- Use gzip -n to exclude MTIME from compressed data and resolve bug #228171
* Tue Sep 11 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-5
- Rebuild for Fedora Extras 6
* Sun Jul  9 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-4
- bump version to mend upgrade path. Bug #197125
* Sat May 20 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-3
- do not strip the binary, create useful defuginfo package (Bug #192437).
* Sun May 15 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-2
- new upstream release.
- Hebrew description converted to utf8.
* Tue Feb 28 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-7
- Rebuild for Fedora Extras 5
* Mon Sep 26 2005 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-6
- Add the text of the GPL to the binary package. It seems that I'll do anything
  to make my sponsor Tom happy.
* Thu Sep 23 2005 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-5
- According to Tom's request, distribute the fat version.
- Add short Hebrew description to the devel package.
* Thu Sep 20 2005 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-4
- Distribute the "slim" flavor, as I suspect it is better suited for the casual
  user (even though I personally enjoy the chubby morphological analizer).
* Mon Sep 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.9-3
- minor spec file cleanups, eliminate "fat" variant
* Thu Sep 15 2005 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-2
- version 0.9, some magic to silence rpmlint
* Fri Jun  4 2004 Dan Kenigsberg <danken at cs.technion.ac.il> 0.8-1
- Some cleanups, and a devel package
* Fri Dec 20 2003 Dan Kenigsberg <danken at cs.technion.ac.il> 0.7-1
- Changes for version 0.7
* Tue Jul 29 2003 Dan Kenigsberg <danken at cs.technion.ac.il> 0.6-1
- Tiny changes for the C frontend
* Fri May  2 2003 Dan Kenigsberg <danken at cs.technion.ac.il> 0.5-1
- create the "fat" variant
* Mon Feb 17 2003 Dan Kenigsberg <danken at cs.technion.ac.il> 0.3-2
- The release includes only the compressed database.
- Added signature, and some other minor changes.
* Sun Jan  5 2003 Tzafrir Cohen <tzafrir at technion.ac.il> 0.2-1
- Initial build.



Index: hspell.spec
===================================================================
RCS file: /cvs/extras/rpms/hspell/F-12/hspell.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- hspell.spec	25 Jul 2009 02:13:23 -0000	1.16
+++ hspell.spec	31 Dec 2009 08:24:44 -0000	1.17
@@ -1,38 +1,25 @@
 Summary: A Hebrew spell checker
 Name: hspell
-Version: 1.0
-Release: 13%{?dist}
-URL: http://ivrix.org.il/projects/spell-checker/
-Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz
-# No version specified.
-License: GPL+
+Version: 1.1
+Release: 1%{?dist}
+URL: http://hspell.ivrix.org.il
+Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
+License: GPLv2
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel
-Obsoletes: hspell-fat
-Provides: hspell-fat = %{version}-%{release}
 Patch0: hspell-1.0.sharedlib.patch
 
 %description
-Hspell is a Hebrew SPELLer . It currently provides a mostly spell-like 
-interface (gives the list of wrong words in the input text), but can also 
-suggest corrections (-c). It also provides a true (yet incomplete) 
-morphological analizer (-l), that prints all known meanings of a Hebrew 
-string.
-
-On typical documents Hspell recognizes the majority of correct words. However,
-users must take into account that it still will not recognize *all* the correct
-words; The dictionary is still not complete, and this situation will continue
-to improve in the next releases. On the other hand, barring bugs Hspell should
-not recognize incorrect words - extreme attention has been given to the
-correctness and consistency of the dictionary.
+Hspell is a Hebrew SPELLer and morphological analizer. It provides a mostly
+spell-like interface (gives the list of wrong words in the input text), but can
+also suggest corrections (-c). It also provides a true (yet incomplete)
+morphological analizer (-l), that prints all known meanings of a Hebrew string.
 
 %description -l he
-Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ??????
-??????? ???????? ????. ????? ?????? ???? ?????, ???? ??? ????? ???? ????? - ??
-????? ?????? ????? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ????
-*??* ???? ?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(.
-??? ??, Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ??
+Hspell ??? ????? ????? ????? ????, ????? ???? ????-spell - ???? ????? ?? ??????
+??????? ???????? ????. Hspell ????? ???? ???? ??????? ?????? ????? ??? ?????
+)"???? ???"(.  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
 ????????? ???????? ?? ?????? ?????? ?????.
 
 %package devel
@@ -57,15 +44,25 @@ Hebrew hunspell dictionaries.
 %prep
 %setup -q
 %patch0 -p1 -b .sharedlib.patch
-sed -i -e '/^\s\+strip\s/d' Makefile.in
-sed -i -e 's/gzip/gzip -n/g' Makefile.in
+/usr/bin/iconv -f hebrew -t utf8 -o WHATSNEW WHATSNEW
 
 %build
 %configure --enable-fatverb --enable-linginfo
-make CFLAGS="$RPM_OPT_FLAGS"
-
-export PATH=$PATH:.
-make myspell
+make CFLAGS="$RPM_OPT_FLAGS" STRIP=:
+make hunspell
+cat >> hunspell/new_he.aff << EOF
+MAP 10
+MAP ???
+MAP ??
+MAP ??
+MAP ??
+MAP ??
+MAP ??
+MAP ?? # for English
+MAP ?? # for Russian
+MAP ?? # for Arabic
+MAP ??? # for French
+EOF
 
 %install
 rm -rf %{buildroot}
@@ -73,9 +70,8 @@ make DESTDIR=%{buildroot} install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libhspell.a
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p he.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.dic
-echo -e "WORDCHARS \0340\0341\0342\0343\0344\0345\0346\0347\0350\0351\0352\0353\0354\0355\0356\0357\0360\0361\0362\0363\0364\0365\0366\0367\0370\0371\0372\042\047" >> he.aff
-cp -p he.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.aff
+cp -p hunspell/new_he.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.dic
+cp -p hunspell/new_he.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.aff
 
 %clean
 rm -rf %{buildroot}
@@ -101,7 +97,14 @@ rm -rf %{buildroot}
 %doc LICENSE
 %{_datadir}/myspell/*
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %changelog
+* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
+- Rebase to upstream version 1.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From danken at fedoraproject.org  Thu Dec 31 09:46:54 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 09:46:54 +0000 (UTC)
Subject: File hspell-1.1.tar.gz uploaded to lookaside cache by danken
Message-ID: <20091231094654.D5B9F10F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for hspell:

fd2f78cb81d391cd4c0bf18489293ced  hspell-1.1.tar.gz



From danken at fedoraproject.org  Thu Dec 31 09:47:42 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 09:47:42 +0000 (UTC)
Subject: rpms/hspell/F-12 .cvsignore,1.3,1.4 sources,1.4,1.5
Message-ID: <20091231094742.DC71911C00E8@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/extras/rpms/hspell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24968

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
- Rebase to upstream version 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hspell/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 May 2006 07:00:49 -0000	1.3
+++ .cvsignore	31 Dec 2009 09:47:42 -0000	1.4
@@ -1,2 +1 @@
-hspell-0.9.tar.gz
-hspell-1.0.tar.gz
+hspell-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hspell/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 May 2006 17:58:22 -0000	1.4
+++ sources	31 Dec 2009 09:47:42 -0000	1.5
@@ -1 +1 @@
-3e12fa383c2cfd430918d115f33f9841  hspell-1.0.tar.gz
+fd2f78cb81d391cd4c0bf18489293ced  hspell-1.1.tar.gz



From awjb at fedoraproject.org  Thu Dec 31 10:21:09 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu, 31 Dec 2009 10:21:09 +0000 (UTC)
Subject: File rxvt-unicode-9.07.tar.bz2 uploaded to lookaside cache by awjb
Message-ID: <20091231102109.C676610F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for rxvt-unicode:

49bb52c99e002bf85eb41d8385d903b5  rxvt-unicode-9.07.tar.bz2



From awjb at fedoraproject.org  Thu Dec 31 10:53:32 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu, 31 Dec 2009 10:53:32 +0000 (UTC)
Subject: rpms/rxvt-unicode/F-11 .cvsignore, 1.31, 1.32 rxvt-unicode.spec, 1.45,
	1.46 sources, 1.31, 1.32 rxvt-unicode-gcc44.patch, 1.1, NONE
Message-ID: <20091231105332.4E91E11C018B@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/rxvt-unicode/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2365/F-11

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Removed Files:
	rxvt-unicode-gcc44.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	23 Nov 2008 09:51:36 -0000	1.31
+++ .cvsignore	31 Dec 2009 10:53:31 -0000	1.32
@@ -1 +1 @@
-rxvt-unicode-9.06.tar.bz2
+rxvt-unicode-9.07.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/F-11/rxvt-unicode.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- rxvt-unicode.spec	24 Apr 2009 23:51:46 -0000	1.45
+++ rxvt-unicode.spec	31 Dec 2009 10:53:32 -0000	1.46
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
-Version:        9.06
-Release:        3%{?dist}
+Version:        9.07
+Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -8,8 +8,6 @@ License:        GPLv2+
 URL:            http://software.schmorp.de/
 Source0:        http://dist.schmorp.de/%{name}/%{name}-%{version}.tar.bz2
 Source1:        rxvt-unicode.desktop
-# Sent to rxvt-unicode [AT] lists [DOT]?schmorp [DOT] de on 2009/04/25
-Patch0:			rxvt-unicode-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -35,7 +33,6 @@ Xft fonts.
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure --enable-xft --enable-font-styles --enable-afterimage \
@@ -73,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/urxvt
 
 %changelog
+* Thu Dec 31 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 9.07-1
+- version upgrade
+
 * Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 9.06-3
 - Fix FTBFS: added rxvt-unicode-gcc44.patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	23 Nov 2008 09:51:36 -0000	1.31
+++ sources	31 Dec 2009 10:53:32 -0000	1.32
@@ -1 +1 @@
-4cb9330e99fc0b0b05cebf3581557dd8  rxvt-unicode-9.06.tar.bz2
+49bb52c99e002bf85eb41d8385d903b5  rxvt-unicode-9.07.tar.bz2


--- rxvt-unicode-gcc44.patch DELETED ---



From awjb at fedoraproject.org  Thu Dec 31 10:53:32 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu, 31 Dec 2009 10:53:32 +0000 (UTC)
Subject: rpms/rxvt-unicode/F-12 .cvsignore, 1.31, 1.32 rxvt-unicode.spec, 1.46,
	1.47 sources, 1.31, 1.32 rxvt-unicode-gcc44.patch, 1.1, NONE
Message-ID: <20091231105332.9372411C018B@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/rxvt-unicode/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2365/F-12

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Removed Files:
	rxvt-unicode-gcc44.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	23 Nov 2008 09:51:36 -0000	1.31
+++ .cvsignore	31 Dec 2009 10:53:32 -0000	1.32
@@ -1 +1 @@
-rxvt-unicode-9.06.tar.bz2
+rxvt-unicode-9.07.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/F-12/rxvt-unicode.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rxvt-unicode.spec	27 Jul 2009 03:42:26 -0000	1.46
+++ rxvt-unicode.spec	31 Dec 2009 10:53:32 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
-Version:        9.06
-Release:        4%{?dist}
+Version:        9.07
+Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -8,8 +8,6 @@ License:        GPLv2+
 URL:            http://software.schmorp.de/
 Source0:        http://dist.schmorp.de/%{name}/%{name}-%{version}.tar.bz2
 Source1:        rxvt-unicode.desktop
-# Sent to rxvt-unicode [AT] lists [DOT]?schmorp [DOT] de on 2009/04/25
-Patch0:			rxvt-unicode-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -35,7 +33,6 @@ Xft fonts.
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure --enable-xft --enable-font-styles --enable-afterimage \
@@ -73,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/urxvt
 
 %changelog
+* Thu Dec 31 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 9.07-1
+- version upgrade
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.06-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/F-12/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	23 Nov 2008 09:51:36 -0000	1.31
+++ sources	31 Dec 2009 10:53:32 -0000	1.32
@@ -1 +1 @@
-4cb9330e99fc0b0b05cebf3581557dd8  rxvt-unicode-9.06.tar.bz2
+49bb52c99e002bf85eb41d8385d903b5  rxvt-unicode-9.07.tar.bz2


--- rxvt-unicode-gcc44.patch DELETED ---



From awjb at fedoraproject.org  Thu Dec 31 10:53:32 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu, 31 Dec 2009 10:53:32 +0000 (UTC)
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.31, 1.32 rxvt-unicode.spec, 1.47,
	1.48 sources, 1.31, 1.32 rxvt-unicode-gcc44.patch, 1.1, NONE
Message-ID: <20091231105332.C304611C018B@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/rxvt-unicode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2365/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Removed Files:
	rxvt-unicode-gcc44.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	23 Nov 2008 09:51:36 -0000	1.31
+++ .cvsignore	31 Dec 2009 10:53:32 -0000	1.32
@@ -1 +1 @@
-rxvt-unicode-9.06.tar.bz2
+rxvt-unicode-9.07.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- rxvt-unicode.spec	7 Dec 2009 02:01:37 -0000	1.47
+++ rxvt-unicode.spec	31 Dec 2009 10:53:32 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
-Version:        9.06
-Release:        5%{?dist}
+Version:        9.07
+Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -8,8 +8,6 @@ License:        GPLv2+
 URL:            http://software.schmorp.de/
 Source0:        http://dist.schmorp.de/%{name}/%{name}-%{version}.tar.bz2
 Source1:        rxvt-unicode.desktop
-# Sent to rxvt-unicode [AT] lists [DOT]?schmorp [DOT] de on 2009/04/25
-Patch0:			rxvt-unicode-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -35,7 +33,6 @@ Xft fonts.
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure --enable-xft --enable-font-styles --enable-afterimage \
@@ -73,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/urxvt
 
 %changelog
+* Thu Dec 31 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 9.07-1
+- version upgrade
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 9.06-5
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	23 Nov 2008 09:51:36 -0000	1.31
+++ sources	31 Dec 2009 10:53:32 -0000	1.32
@@ -1 +1 @@
-4cb9330e99fc0b0b05cebf3581557dd8  rxvt-unicode-9.06.tar.bz2
+49bb52c99e002bf85eb41d8385d903b5  rxvt-unicode-9.07.tar.bz2


--- rxvt-unicode-gcc44.patch DELETED ---



From jussilehtola at fedoraproject.org  Thu Dec 31 10:55:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 31 Dec 2009 10:55:00 +0000 (UTC)
Subject: rpms/gromacs/EL-5 gromacs.spec,1.11,1.12 sources,1.9,1.10
Message-ID: <20091231105500.816D011C018B@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2708

Modified Files:
	gromacs.spec sources 
Log Message:
Update to 4.0.7.


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/gromacs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gromacs.spec	22 May 2009 09:33:14 -0000	1.11
+++ gromacs.spec	31 Dec 2009 10:55:00 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		gromacs
-Version:	4.0.5
+Version:	4.0.7
 Release:	1%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
@@ -762,80 +762,83 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri May 22 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.5-1
+* Thu Dec 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.7-1
+- Update to 4.0.7.
+
+* Fri May 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-1
 - Update to 4.0.5.
 - Change spec %%defines to %%globals.
 - Add debug subpackages to make debugging of GROMACS possible.
 
-* Tue Feb 17 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.4-1
+* Tue Feb 17 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.4-1
 - Update to 4.0.4.
 
-* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
+* Mon Jan 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.3-4
 - Retry fixing gmxdemo.
 
-* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
+* Mon Jan 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.3-3
 - Fixed gmxdemo.
 
-* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
+* Mon Jan 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.3-2
 - Fix EPEL 4 build.
 
-* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
+* Mon Jan 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.3-1
 - Update to 4.0.3.
 
-* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
+* Wed Jan 14 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.2-7
 - Update manual to latest version.
 - Removed Requires: blas and lapack.
 
-* Mon Nov 10 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-6
+* Mon Nov 10 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.2-6
 - Update to 4.0.2.
 
-* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-5
+* Sun Nov 09 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.1-5
 - Add Requires: blas too.
 
-* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-4
+* Sun Nov 09 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.1-4
 - Update to 4.0.1.
 - Add Requires: lapack and openmpi to prevent yum from pulling atlas and lam
 instead.
 
-* Wed Oct 15 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-3
+* Wed Oct 15 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-3
 - Rename also man pages.
 
-* Mon Oct 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-2
+* Mon Oct 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-2
 - Added noreplace to bash completion file.
 - Changed double precision mpi binary suffix to _mpi_d.
 
-* Sun Oct 12 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-1
+* Sun Oct 12 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-1
 - Update to Gromacs 4.0.
 - Remove module system and patch file names to begin with g_.
 
-* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.15.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.15.rc3
 - Changed location of binaries.
 - Removed conflict of module file, as the program is binary compatible with older versions.
 
-* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.14.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.14.rc3
 - The gromacs module is loaded automatically and it conflicts with gromacs3.
 
-* Tue Oct 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.13.rc3
+* Tue Oct 07 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.13.rc3
 - Renamed module files from %%{name}-%%{version} to %%{name}.
 
-* Mon Oct 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.12.rc3
+* Mon Oct 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.12.rc3
 - Fix BR to get GROMACS to build in mock for epel-4.
 
-* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.11.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.11.rc3
 - Fix to get GROMACS to build in mock for epel-5.
 
-* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.10.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.10.rc3
 - Implement module system & remove binary renaming.
 - No need for autoreconf anymore.
 - Update to rc3.
 
-* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.9.rc2
+* Sat Oct 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.9.rc2
 - Fall back to autoreconf due to binary renaming.
 
-* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.8.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.8.rc2
 - Modified install commands to preserve timestamps.
 
-* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.7.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.7.rc2
 - Even more review fixes.
 - Binaries renamed:
 	highway	->	g_highway
@@ -843,31 +846,31 @@ instead.
 	sigeps	->	g_sigeps
 	wheel	->	g_wheel
 
-* Thu Oct 02 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.6.rc2
+* Thu Oct 02 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.6.rc2
 - Final review fixes.
 
-* Wed Oct 01 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.5.rc2
+* Wed Oct 01 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.5.rc2
 - Strip down requires by branching tutor to its own package.
 
-* Tue Sep 30 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.4.rc2
+* Tue Sep 30 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.4.rc2
 - Extensive package review fixes.
 - Unclear licenses on some files, filed upstream bug 217.
   http://bugzilla.gromacs.org/show_bug.cgi?id=217
 
-* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.3.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.3.rc2
 - Move .so files to -devel package.
 - Remove .la files.
 
-* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.2.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.2.rc2
 - Implement out-of-tree-builds.
 - Add --noexecstack to CFLAGS.
 - Remove execstack procedure and prelink from buildreqs.
 - Filed upstream bug 215 to add .note.GNU-stack .
 - Fix incorrect file permission on src/tools/gmx_xpm2ps.c .
 
-* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.1.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.1.rc2
 - Alphabetized buildrequires.
 - Changed gromacs-share to gromacs-common.
 
-* Fri Sep 26 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.0.rc2
+* Fri Sep 26 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.0.rc2
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 May 2009 09:33:14 -0000	1.9
+++ sources	31 Dec 2009 10:55:00 -0000	1.10
@@ -1,2 +1,2 @@
+51369bd553e6bba4085a58bcf23d337d  gromacs-4.0.7.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
-2db2261852a4d3a97547979f379dee94  gromacs-4.0.5.tar.gz



From jussilehtola at fedoraproject.org  Thu Dec 31 11:10:10 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 31 Dec 2009 11:10:10 +0000 (UTC)
Subject: rpms/gromacs/EL-4 gromacs.spec,1.11,1.12 sources,1.9,1.10
Message-ID: <20091231111010.38DC011C03F6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4769

Modified Files:
	gromacs.spec sources 
Log Message:
Update to 4.0.7.


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/gromacs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gromacs.spec	22 May 2009 09:33:13 -0000	1.11
+++ gromacs.spec	31 Dec 2009 11:10:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		gromacs
-Version:	4.0.5
+Version:	4.0.7
 Release:	1%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
@@ -762,80 +762,83 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri May 22 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.5-1
+* Thu Dec 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.7-1
+- Update to 4.0.7.
+
+* Fri May 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.5-1
 - Update to 4.0.5.
 - Change spec %%defines to %%globals.
 - Add debug subpackages to make debugging of GROMACS possible.
 
-* Tue Feb 17 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.4-1
+* Tue Feb 17 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.4-1
 - Update to 4.0.4.
 
-* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
+* Mon Jan 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.3-4
 - Retry fixing gmxdemo.
 
-* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
+* Mon Jan 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.3-3
 - Fixed gmxdemo.
 
-* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
+* Mon Jan 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.3-2
 - Fix EPEL 4 build.
 
-* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
+* Mon Jan 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.3-1
 - Update to 4.0.3.
 
-* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
+* Wed Jan 14 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.2-7
 - Update manual to latest version.
 - Removed Requires: blas and lapack.
 
-* Mon Nov 10 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-6
+* Mon Nov 10 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.2-6
 - Update to 4.0.2.
 
-* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-5
+* Sun Nov 09 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.1-5
 - Add Requires: blas too.
 
-* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-4
+* Sun Nov 09 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0.1-4
 - Update to 4.0.1.
 - Add Requires: lapack and openmpi to prevent yum from pulling atlas and lam
 instead.
 
-* Wed Oct 15 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-3
+* Wed Oct 15 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-3
 - Rename also man pages.
 
-* Mon Oct 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-2
+* Mon Oct 13 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-2
 - Added noreplace to bash completion file.
 - Changed double precision mpi binary suffix to _mpi_d.
 
-* Sun Oct 12 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-1
+* Sun Oct 12 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-1
 - Update to Gromacs 4.0.
 - Remove module system and patch file names to begin with g_.
 
-* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.15.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.15.rc3
 - Changed location of binaries.
 - Removed conflict of module file, as the program is binary compatible with older versions.
 
-* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.14.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.14.rc3
 - The gromacs module is loaded automatically and it conflicts with gromacs3.
 
-* Tue Oct 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.13.rc3
+* Tue Oct 07 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.13.rc3
 - Renamed module files from %%{name}-%%{version} to %%{name}.
 
-* Mon Oct 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.12.rc3
+* Mon Oct 06 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.12.rc3
 - Fix BR to get GROMACS to build in mock for epel-4.
 
-* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.11.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.11.rc3
 - Fix to get GROMACS to build in mock for epel-5.
 
-* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.10.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.10.rc3
 - Implement module system & remove binary renaming.
 - No need for autoreconf anymore.
 - Update to rc3.
 
-* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.9.rc2
+* Sat Oct 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.9.rc2
 - Fall back to autoreconf due to binary renaming.
 
-* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.8.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.8.rc2
 - Modified install commands to preserve timestamps.
 
-* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.7.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.7.rc2
 - Even more review fixes.
 - Binaries renamed:
 	highway	->	g_highway
@@ -843,31 +846,31 @@ instead.
 	sigeps	->	g_sigeps
 	wheel	->	g_wheel
 
-* Thu Oct 02 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.6.rc2
+* Thu Oct 02 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.6.rc2
 - Final review fixes.
 
-* Wed Oct 01 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.5.rc2
+* Wed Oct 01 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.5.rc2
 - Strip down requires by branching tutor to its own package.
 
-* Tue Sep 30 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.4.rc2
+* Tue Sep 30 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.4.rc2
 - Extensive package review fixes.
 - Unclear licenses on some files, filed upstream bug 217.
   http://bugzilla.gromacs.org/show_bug.cgi?id=217
 
-* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.3.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.3.rc2
 - Move .so files to -devel package.
 - Remove .la files.
 
-* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.2.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.2.rc2
 - Implement out-of-tree-builds.
 - Add --noexecstack to CFLAGS.
 - Remove execstack procedure and prelink from buildreqs.
 - Filed upstream bug 215 to add .note.GNU-stack .
 - Fix incorrect file permission on src/tools/gmx_xpm2ps.c .
 
-* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.1.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.1.rc2
 - Alphabetized buildrequires.
 - Changed gromacs-share to gromacs-common.
 
-* Fri Sep 26 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.0.rc2
+* Fri Sep 26 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.0-0.0.rc2
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 May 2009 09:33:13 -0000	1.9
+++ sources	31 Dec 2009 11:10:10 -0000	1.10
@@ -1,2 +1,2 @@
+51369bd553e6bba4085a58bcf23d337d  gromacs-4.0.7.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
-2db2261852a4d3a97547979f379dee94  gromacs-4.0.5.tar.gz



From ensc at fedoraproject.org  Thu Dec 31 11:28:51 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 31 Dec 2009 11:28:51 +0000 (UTC)
Subject: File tor-0.2.1.21.tar.gz uploaded to lookaside cache by ensc
Message-ID: <20091231112851.4929C10F8D1@bastion.fedoraproject.org>

A file has been added to the lookaside cache for tor:

54f7a801d824cd9c13ce672d483926d6  tor-0.2.1.21.tar.gz



From ensc at fedoraproject.org  Thu Dec 31 11:28:54 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 31 Dec 2009 11:28:54 +0000 (UTC)
Subject: File tor-0.2.1.21.tar.gz.asc uploaded to lookaside cache by ensc
Message-ID: <20091231112854.5ECE310F8D1@bastion.fedoraproject.org>

A file has been added to the lookaside cache for tor:

45500572a467b5d69e88cf88826ceaee  tor-0.2.1.21.tar.gz.asc



From jussilehtola at fedoraproject.org  Thu Dec 31 11:33:52 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 31 Dec 2009 11:33:52 +0000 (UTC)
Subject: File vim-latex-1.8.23-20091230-r1079.tar.gz uploaded to lookaside
	cache by jussilehtola
Message-ID: <20091231113352.3063110F8D4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for vim-latex:

66dfb8493c4bb3bf5412d6a99516ced0  vim-latex-1.8.23-20091230-r1079.tar.gz



From ensc at fedoraproject.org  Thu Dec 31 11:43:44 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 31 Dec 2009 11:43:44 +0000 (UTC)
Subject: rpms/tor/devel .cvsignore, 1.10, 1.11 lastver, 1.10, 1.11 sources,
	1.19, 1.20 tor.spec, 1.43, 1.44
Message-ID: <20091231114344.D9DC011C018B@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9385

Modified Files:
	.cvsignore lastver sources tor.spec 
Log Message:
updated to 0.2.1.21


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	25 Oct 2009 20:53:09 -0000	1.10
+++ .cvsignore	31 Dec 2009 11:43:44 -0000	1.11
@@ -1,2 +1,2 @@
-tor-0.2.1.20.tar.gz
-tor-0.2.1.20.tar.gz.asc
+tor-0.2.1.21.tar.gz
+tor-0.2.1.21.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/lastver,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- lastver	25 Oct 2009 20:53:09 -0000	1.10
+++ lastver	31 Dec 2009 11:43:44 -0000	1.11
@@ -1 +1 @@
-0.2.1.20
+0.2.1.21


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	25 Oct 2009 20:53:09 -0000	1.19
+++ sources	31 Dec 2009 11:43:44 -0000	1.20
@@ -1,2 +1,2 @@
-0d62ee2332fdd95de43debac7435df19  tor-0.2.1.20.tar.gz
-41b665b9a8f80252b45accd3ebd8da00  tor-0.2.1.20.tar.gz.asc
+54f7a801d824cd9c13ce672d483926d6  tor-0.2.1.21.tar.gz
+45500572a467b5d69e88cf88826ceaee  tor-0.2.1.21.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- tor.spec	6 Dec 2009 10:44:10 -0000	1.43
+++ tor.spec	31 Dec 2009 11:43:44 -0000	1.44
@@ -12,8 +12,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.1.20
-Release:	%release_func 1301
+Version:	0.2.1.21
+Release:	%release_func 1300
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -225,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 31 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.21-1300
+- updated to 0.2.1.21
+
 * Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1301
 - updated -upstart to upstart 0.6.3
 



From ensc at fedoraproject.org  Thu Dec 31 11:47:44 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 31 Dec 2009 11:47:44 +0000 (UTC)
Subject: rpms/tor/F-12 .cvsignore, 1.10, 1.11 lastver, 1.10, 1.11 sources, 1.19,
	1.20 tor.spec, 1.40, 1.41
Message-ID: <20091231114744.4F83111C018B@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10202

Modified Files:
	.cvsignore lastver sources tor.spec 
Log Message:
updated to 0.2.1.21


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	25 Oct 2009 20:57:10 -0000	1.10
+++ .cvsignore	31 Dec 2009 11:47:44 -0000	1.11
@@ -1,2 +1,2 @@
-tor-0.2.1.20.tar.gz
-tor-0.2.1.20.tar.gz.asc
+tor-0.2.1.21.tar.gz
+tor-0.2.1.21.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/lastver,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- lastver	25 Oct 2009 20:57:10 -0000	1.10
+++ lastver	31 Dec 2009 11:47:44 -0000	1.11
@@ -1 +1 @@
-0.2.1.20
+0.2.1.21


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	25 Oct 2009 20:57:10 -0000	1.19
+++ sources	31 Dec 2009 11:47:44 -0000	1.20
@@ -1,2 +1,2 @@
-0d62ee2332fdd95de43debac7435df19  tor-0.2.1.20.tar.gz
-41b665b9a8f80252b45accd3ebd8da00  tor-0.2.1.20.tar.gz.asc
+54f7a801d824cd9c13ce672d483926d6  tor-0.2.1.21.tar.gz
+45500572a467b5d69e88cf88826ceaee  tor-0.2.1.21.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/tor.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- tor.spec	15 Nov 2009 11:38:38 -0000	1.40
+++ tor.spec	31 Dec 2009 11:47:44 -0000	1.41
@@ -12,7 +12,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.1.20
+Version:	0.2.1.21
 Release:	%release_func 1200
 Group:		System Environment/Daemons
 License:	BSD
@@ -226,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 31 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.21-1200
+- updated to 0.2.1.21
+
 * Sat Nov 14 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1200
 - updated URLs (#532373)
 - removed (inactive) update mechanism for GeoIP data; this might



From jussilehtola at fedoraproject.org  Thu Dec 31 11:49:18 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 31 Dec 2009 11:49:18 +0000 (UTC)
Subject: rpms/vim-latex/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vim-latex.spec, 1.1, 1.2
Message-ID: <20091231114918.7C18711C018B@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vim-latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10414

Modified Files:
	.cvsignore sources vim-latex.spec 
Log Message:
Update to 1.8.23-20091230.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Oct 2009 22:48:19 -0000	1.2
+++ .cvsignore	31 Dec 2009 11:49:18 -0000	1.3
@@ -1 +1 @@
-vim-latex-1.5-20091002-r1074.tar.gz
+vim-latex-1.8.23-20091230-r1079.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Oct 2009 22:48:19 -0000	1.2
+++ sources	31 Dec 2009 11:49:18 -0000	1.3
@@ -1 +1 @@
-59420b4e4e13d8ea92806b4179b6311b  vim-latex-1.5-20091002-r1074.tar.gz
+66dfb8493c4bb3bf5412d6a99516ced0  vim-latex-1.8.23-20091230-r1079.tar.gz


Index: vim-latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/devel/vim-latex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vim-latex.spec	10 Oct 2009 22:48:19 -0000	1.1
+++ vim-latex.spec	31 Dec 2009 11:49:18 -0000	1.2
@@ -1,9 +1,9 @@
-%global date 20091002
-%global rel r1074
+%global date 20091230
+%global rel r1079
 
 Name:		vim-latex
-Version:	1.5
-Release:	3.%{date}.%{rel}%{?dist}
+Version:	1.8.23
+Release:	1.%{date}.%{rel}%{?dist}
 Summary:	Tools to view, edit and compile LaTeX documents in Vim
 Group:		Applications/Editors
 # According to doc/latex-suite license is Vim charityware license
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8.23-1.20091230.r1079
+- Update to 20091230-r1079.
+
 * Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-3.20091002.r1074
 - Use make install instead of manual install.
 



From jussilehtola at fedoraproject.org  Thu Dec 31 11:55:45 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 31 Dec 2009 11:55:45 +0000 (UTC)
Subject: rpms/vim-latex/F-12 sources,1.2,1.3 vim-latex.spec,1.1,1.2
Message-ID: <20091231115545.3F20811C018B@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vim-latex/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11704/F-12

Modified Files:
	sources vim-latex.spec 
Log Message:
Update to 1.8.23-20091230.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Oct 2009 22:51:30 -0000	1.2
+++ sources	31 Dec 2009 11:55:44 -0000	1.3
@@ -1 +1 @@
-59420b4e4e13d8ea92806b4179b6311b  vim-latex-1.5-20091002-r1074.tar.gz
+66dfb8493c4bb3bf5412d6a99516ced0  vim-latex-1.8.23-20091230-r1079.tar.gz


Index: vim-latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/F-12/vim-latex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vim-latex.spec	10 Oct 2009 22:51:30 -0000	1.1
+++ vim-latex.spec	31 Dec 2009 11:55:45 -0000	1.2
@@ -1,9 +1,9 @@
-%global date 20091002
-%global rel r1074
+%global date 20091230
+%global rel r1079
 
 Name:		vim-latex
-Version:	1.5
-Release:	3.%{date}.%{rel}%{?dist}
+Version:	1.8.23
+Release:	1.%{date}.%{rel}%{?dist}
 Summary:	Tools to view, edit and compile LaTeX documents in Vim
 Group:		Applications/Editors
 # According to doc/latex-suite license is Vim charityware license
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8.23-1.20091230.r1079
+- Update to 20091230-r1079.
+
 * Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-3.20091002.r1074
 - Use make install instead of manual install.
 



From jussilehtola at fedoraproject.org  Thu Dec 31 11:55:44 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 31 Dec 2009 11:55:44 +0000 (UTC)
Subject: rpms/vim-latex/F-11 sources,1.2,1.3 vim-latex.spec,1.1,1.2
Message-ID: <20091231115545.0AEE111C018B@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vim-latex/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11704/F-11

Modified Files:
	sources vim-latex.spec 
Log Message:
Update to 1.8.23-20091230.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Oct 2009 22:51:30 -0000	1.2
+++ sources	31 Dec 2009 11:55:44 -0000	1.3
@@ -1 +1 @@
-59420b4e4e13d8ea92806b4179b6311b  vim-latex-1.5-20091002-r1074.tar.gz
+66dfb8493c4bb3bf5412d6a99516ced0  vim-latex-1.8.23-20091230-r1079.tar.gz


Index: vim-latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/F-11/vim-latex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vim-latex.spec	10 Oct 2009 22:51:30 -0000	1.1
+++ vim-latex.spec	31 Dec 2009 11:55:44 -0000	1.2
@@ -1,9 +1,9 @@
-%global date 20091002
-%global rel r1074
+%global date 20091230
+%global rel r1079
 
 Name:		vim-latex
-Version:	1.5
-Release:	3.%{date}.%{rel}%{?dist}
+Version:	1.8.23
+Release:	1.%{date}.%{rel}%{?dist}
 Summary:	Tools to view, edit and compile LaTeX documents in Vim
 Group:		Applications/Editors
 # According to doc/latex-suite license is Vim charityware license
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8.23-1.20091230.r1079
+- Update to 20091230-r1079.
+
 * Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-3.20091002.r1074
 - Use make install instead of manual install.
 



From ensc at fedoraproject.org  Thu Dec 31 12:00:20 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 31 Dec 2009 12:00:20 +0000 (UTC)
Subject: rpms/tor/F-11 .cvsignore, 1.9, 1.10 lastver, 1.9, 1.10 sources, 1.18, 
	1.19 tor.spec, 1.32, 1.33
Message-ID: <20091231120020.2283611C0337@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12456

Modified Files:
	.cvsignore lastver sources tor.spec 
Log Message:
updated to 0.2.1.21


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Nov 2009 11:55:39 -0000	1.9
+++ .cvsignore	31 Dec 2009 12:00:19 -0000	1.10
@@ -1,2 +1,2 @@
-tor-0.2.1.20.tar.gz
-tor-0.2.1.20.tar.gz.asc
+tor-0.2.1.21.tar.gz
+tor-0.2.1.21.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/lastver,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lastver	15 Nov 2009 11:55:39 -0000	1.9
+++ lastver	31 Dec 2009 12:00:19 -0000	1.10
@@ -1 +1 @@
-0.2.1.20
+0.2.1.21


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	15 Nov 2009 11:55:39 -0000	1.18
+++ sources	31 Dec 2009 12:00:19 -0000	1.19
@@ -1,2 +1,2 @@
-0d62ee2332fdd95de43debac7435df19  tor-0.2.1.20.tar.gz
-41b665b9a8f80252b45accd3ebd8da00  tor-0.2.1.20.tar.gz.asc
+54f7a801d824cd9c13ce672d483926d6  tor-0.2.1.21.tar.gz
+45500572a467b5d69e88cf88826ceaee  tor-0.2.1.21.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/tor.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- tor.spec	15 Nov 2009 11:55:38 -0000	1.32
+++ tor.spec	31 Dec 2009 12:00:19 -0000	1.33
@@ -10,7 +10,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.1.20
+Version:	0.2.1.21
 Release:	%release_func 1100
 Group:		System Environment/Daemons
 License:	BSD
@@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 31 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.21-1100
+- updated to 0.2.1.21
+
 * Sat Nov 14 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1200
 - updated URLs (#532373)
 - removed (inactive) update mechanism for GeoIP data; this might



From mschwendt at fedoraproject.org  Thu Dec 31 12:28:17 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 31 Dec 2009 12:28:17 +0000 (UTC)
Subject: rpms/xmp/devel xmp-2.7.1-audacious-api.patch, NONE,
	1.1 xmp-2.7.1-audacious-dialogs.patch, NONE, 1.1 xmp.spec, 1.7, 1.8
Message-ID: <20091231122817.CDE6A11C018B@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/xmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17323

Modified Files:
	xmp.spec 
Added Files:
	xmp-2.7.1-audacious-api.patch 
	xmp-2.7.1-audacious-dialogs.patch 
Log Message:
* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.7.1-2
- fix FTBFS (#539061), Audacious 2.2 iplugin API change
- fix Audacious plugin dialogs


xmp-2.7.1-audacious-api.patch:
 audacious.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE xmp-2.7.1-audacious-api.patch ---
diff -Nur xmp-2.7.1-orig/src/plugin/audacious.c xmp-2.7.1/src/plugin/audacious.c
--- xmp-2.7.1-orig/src/plugin/audacious.c	2009-07-18 00:43:41.000000000 +0200
+++ xmp-2.7.1/src/plugin/audacious.c	2009-12-31 12:53:21.000000000 +0100
@@ -118,7 +118,9 @@
 	.pause		= mod_pause,
 	.seek		= seek,
 	.get_time	= get_time,
+#if __AUDACIOUS_PLUGIN_API__ < 12
 	.get_song_info	= get_song_info,
+#endif
 	.cleanup	= cleanup,
 #if __AUDACIOUS_PLUGIN_API__ >= 2
 	.get_song_tuple	= get_song_tuple,

xmp-2.7.1-audacious-dialogs.patch:
 audacious.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xmp-2.7.1-audacious-dialogs.patch ---
diff -Nur xmp-2.7.1-orig/src/plugin/audacious.c xmp-2.7.1/src/plugin/audacious.c
--- xmp-2.7.1-orig/src/plugin/audacious.c	2009-07-18 00:43:41.000000000 +0200
+++ xmp-2.7.1/src/plugin/audacious.c	2009-10-29 13:43:15.000000000 +0100
@@ -179,6 +179,7 @@
 	}
 
 	about_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_object_set_data(GTK_OBJECT(about_window),
 		"about_window", about_window);
 	gtk_window_set_title(GTK_WINDOW(about_window),"About the XMP Plugin");
@@ -630,7 +631,7 @@
 	}
 
 	xmp_conf_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
+    gtk_window_set_type_hint(GTK_WINDOW(xmp_conf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_object_set_data(GTK_OBJECT(xmp_conf_window),
 		"xmp_conf_window", xmp_conf_window);
 	gtk_window_set_title(GTK_WINDOW(xmp_conf_window), "XMP Configuration");


Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/xmp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xmp.spec	14 Sep 2009 19:05:18 -0000	1.7
+++ xmp.spec	31 Dec 2009 12:28:17 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name: xmp
 Version: 2.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://dl.sourceforge.net/sourceforge/xmp/%{name}-%{version}.tar.gz
@@ -12,6 +12,10 @@ Source: http://rathann.fedorapeople.org/
 # run this to get the above tarball
 Source1: mktarball.sh
 Patch0: %{name}-nostrip.patch
+# obsolete with XMP version upgrade
+Patch1: xmp-2.7.1-audacious-api.patch
+# merged upstream
+Patch2: xmp-2.7.1-audacious-dialogs.patch
 License: GPLv2+
 URL: http://xmp.sourceforge.net/
 Buildrequires: alsa-lib-devel
@@ -55,6 +59,8 @@ This package contains the xmp plugin for
 %prep
 %setup -q
 %patch0 -p1 -b .nostrip
+%patch1 -p1 -b .audacious-dialogs
+%patch2 -p1 -b .audacious-api
 pushd docs
 for file in ChangeLog CREDITS ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf $file && touch -r $file $file.utf && mv $file.utf $file
@@ -92,6 +98,10 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.7.1-2
+- fix FTBFS (#539061), Audacious 2.2 iplugin API change
+- fix Audacious plugin dialogs
+
 * Mon Sep 14 2009 Dominik Mierzejewski <rpm at greysector.net> 2.7.1-1
 - updated to 2.7.1
 - dropped obsolete patch



From till at fedoraproject.org  Thu Dec 31 12:56:06 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu, 31 Dec 2009 12:56:06 +0000 (UTC)
Subject: File lzip-1.8.tar.gz uploaded to lookaside cache by till
Message-ID: <20091231125606.0925810F8D2@bastion.fedoraproject.org>

A file has been added to the lookaside cache for lzip:

eb1f2795ab3f95ccc6c855eac60aefc3  lzip-1.8.tar.gz



From till at fedoraproject.org  Thu Dec 31 12:56:08 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu, 31 Dec 2009 12:56:08 +0000 (UTC)
Subject: File lzip-1.8.tar.gz.sig uploaded to lookaside cache by till
Message-ID: <20091231125608.611E310F8D2@bastion.fedoraproject.org>

A file has been added to the lookaside cache for lzip:

9207b8b59560398185cf80bd4f3f2d4c  lzip-1.8.tar.gz.sig



From danken at fedoraproject.org  Thu Dec 31 13:00:30 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 13:00:30 +0000 (UTC)
Subject: rpms/hspell/EL-5 hspell.spec,1.10,1.11 sources,1.4,1.5
Message-ID: <20091231130030.80F4411C0337@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/extras/rpms/hspell/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22666

Modified Files:
	hspell.spec sources 
Log Message:
* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
- Rebase to upstream version 1.1



Index: hspell.spec
===================================================================
RCS file: /cvs/extras/rpms/hspell/EL-5/hspell.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- hspell.spec	2 Oct 2008 17:04:08 -0000	1.10
+++ hspell.spec	31 Dec 2009 13:00:29 -0000	1.11
@@ -1,36 +1,25 @@
 Summary: A Hebrew spell checker
 Name: hspell
-Version: 1.0
-Release: 8%{?dist}
-URL: http://ivrix.org.il/projects/spell-checker/
-Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz
-License: GPL
+Version: 1.1
+Release: 1%{?dist}
+URL: http://hspell.ivrix.org.il
+Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
+License: GPLv2
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel
-Obsoletes: hspell-fat
-Provides: hspell-fat = %{version}-%{release}
+Patch0: hspell-1.0.sharedlib.patch
 
 %description
-Hspell is a Hebrew SPELLer . It currently provides a mostly spell-like 
-interface (gives the list of wrong words in the input text), but can also 
-suggest corrections (-c). It also provides a true (yet incomplete) 
-morphological analizer (-l), that prints all known meanings of a Hebrew 
-string.
-
-On typical documents Hspell recognizes the majority of correct words. However,
-users must take into account that it still will not recognize *all* the correct
-words; The dictionary is still not complete, and this situation will continue
-to improve in the next releases. On the other hand, barring bugs Hspell should
-not recognize incorrect words - extreme attention has been given to the
-correctness and consistency of the dictionary.
+Hspell is a Hebrew SPELLer and morphological analizer. It provides a mostly
+spell-like interface (gives the list of wrong words in the input text), but can
+also suggest corrections (-c). It also provides a true (yet incomplete)
+morphological analizer (-l), that prints all known meanings of a Hebrew string.
 
 %description -l he
-Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ??????
-??????? ???????? ????. ????? ?????? ???? ?????, ???? ??? ????? ???? ????? - ??
-????? ?????? ????? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ????
-*??* ???? ?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(.
-??? ??, Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ??
+Hspell ??? ????? ????? ????? ????, ????? ???? ????-spell - ???? ????? ?? ??????
+??????? ???????? ????. Hspell ????? ???? ???? ??????? ?????? ????? ??? ?????
+)"???? ???"(.  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
 ????????? ???????? ?? ?????? ?????? ?????.
 
 %package devel
@@ -44,8 +33,6 @@ Library and include files for applicatio
 %description -l he devel
 ?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell.
 
-%define hunspell_exists 0
-%if %hunspell_exists
 %package -n hunspell-he
 Summary: Hebrew hunspell dictionaries
 Group: Applications/Text
@@ -53,32 +40,38 @@ Requires: hunspell
 
 %description -n hunspell-he
 Hebrew hunspell dictionaries.
-%endif
 
 %prep
 %setup -q
-sed -i -e '/^\s\+strip\s/d' Makefile.in
-sed -i -e 's/gzip/gzip -n/g' Makefile.in
+%patch0 -p1 -b .sharedlib.patch
+/usr/bin/iconv -f hebrew -t utf8 -o WHATSNEW WHATSNEW
 
 %build
 %configure --enable-fatverb --enable-linginfo
-make CFLAGS="$RPM_OPT_FLAGS"
-
-%if %hunspell_exists
-export PATH=$PATH:.
-make myspell
-%endif
+make CFLAGS="$RPM_OPT_FLAGS" STRIP=:
+make hunspell
+cat >> hunspell/new_he.aff << EOF
+MAP 10
+MAP ???
+MAP ??
+MAP ??
+MAP ??
+MAP ??
+MAP ??
+MAP ?? # for English
+MAP ?? # for Russian
+MAP ?? # for Arabic
+MAP ??? # for French
+EOF
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libhspell.a
 
-%if %hunspell_exists
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p he.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.dic
-echo -e "WORDCHARS \0340\0341\0342\0343\0344\0345\0346\0347\0350\0351\0352\0353\0354\0355\0356\0357\0360\0361\0362\0363\0364\0365\0366\0367\0370\0371\0372\042\047" >> he.aff
-cp -p he.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.aff
-%endif
+cp -p hunspell/new_he.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.dic
+cp -p hunspell/new_he.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.aff
 
 %clean
 rm -rf %{buildroot}
@@ -89,25 +82,47 @@ rm -rf %{buildroot}
 %{_bindir}/hspell
 %{_bindir}/hspell-i
 %{_bindir}/multispell
+%{_libdir}/libhspell.so.0
 %{_mandir}/man1/hspell.1*
 %{_datadir}/hspell/
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*.h
-%{_libdir}/libhspell.a
+%{_libdir}/libhspell.so
 %{_mandir}/man3/hspell.3*
 
-%if %hunspell_exists
 %files -n hunspell-he
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_datadir}/myspell/*
-%endif
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %changelog
-* Tue Apr 21 2008 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-8
-- drop hunspell-he since RHEL ain't got hunspell.
+* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
+- Rebase to upstream version 1.1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Sep 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.0-11
+- Fix Patch0:/%%patch mismatch.
+
+* Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-10
+- fix license tag
+
+* Wed May 14 2008 Caolan McNamara <caolanm at redhat.com> - 1.0-9
+- Resolves: rhbz#313231 build hspell.so instead of a .a
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-8
+- Autorebuild for GCC 4.3
+
 * Tue May 22 2007 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-7
 - Move the hunspell-he dictionaries into hspell package (Bug #240696).
   Mostly applying Caolan McNamara's patch #155078.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hspell/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 May 2006 17:58:22 -0000	1.4
+++ sources	31 Dec 2009 13:00:29 -0000	1.5
@@ -1 +1 @@
-3e12fa383c2cfd430918d115f33f9841  hspell-1.0.tar.gz
+fd2f78cb81d391cd4c0bf18489293ced  hspell-1.1.tar.gz



From danken at fedoraproject.org  Thu Dec 31 13:00:36 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 13:00:36 +0000 (UTC)
Subject: rpms/hspell/devel hspell.spec,1.16,1.17 sources,1.4,1.5
Message-ID: <20091231130036.7230D11C0337@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/extras/rpms/hspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22710

Modified Files:
	hspell.spec sources 
Log Message:
* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
- Rebase to upstream version 1.1



Index: hspell.spec
===================================================================
RCS file: /cvs/extras/rpms/hspell/devel/hspell.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- hspell.spec	25 Jul 2009 02:13:23 -0000	1.16
+++ hspell.spec	31 Dec 2009 13:00:36 -0000	1.17
@@ -1,38 +1,25 @@
 Summary: A Hebrew spell checker
 Name: hspell
-Version: 1.0
-Release: 13%{?dist}
-URL: http://ivrix.org.il/projects/spell-checker/
-Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz
-# No version specified.
-License: GPL+
+Version: 1.1
+Release: 1%{?dist}
+URL: http://hspell.ivrix.org.il
+Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
+License: GPLv2
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel
-Obsoletes: hspell-fat
-Provides: hspell-fat = %{version}-%{release}
 Patch0: hspell-1.0.sharedlib.patch
 
 %description
-Hspell is a Hebrew SPELLer . It currently provides a mostly spell-like 
-interface (gives the list of wrong words in the input text), but can also 
-suggest corrections (-c). It also provides a true (yet incomplete) 
-morphological analizer (-l), that prints all known meanings of a Hebrew 
-string.
-
-On typical documents Hspell recognizes the majority of correct words. However,
-users must take into account that it still will not recognize *all* the correct
-words; The dictionary is still not complete, and this situation will continue
-to improve in the next releases. On the other hand, barring bugs Hspell should
-not recognize incorrect words - extreme attention has been given to the
-correctness and consistency of the dictionary.
+Hspell is a Hebrew SPELLer and morphological analizer. It provides a mostly
+spell-like interface (gives the list of wrong words in the input text), but can
+also suggest corrections (-c). It also provides a true (yet incomplete)
+morphological analizer (-l), that prints all known meanings of a Hebrew string.
 
 %description -l he
-Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ??????
-??????? ???????? ????. ????? ?????? ???? ?????, ???? ??? ????? ???? ????? - ??
-????? ?????? ????? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ????
-*??* ???? ?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(.
-??? ??, Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ??
+Hspell ??? ????? ????? ????? ????, ????? ???? ????-spell - ???? ????? ?? ??????
+??????? ???????? ????. Hspell ????? ???? ???? ??????? ?????? ????? ??? ?????
+)"???? ???"(.  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
 ????????? ???????? ?? ?????? ?????? ?????.
 
 %package devel
@@ -57,15 +44,25 @@ Hebrew hunspell dictionaries.
 %prep
 %setup -q
 %patch0 -p1 -b .sharedlib.patch
-sed -i -e '/^\s\+strip\s/d' Makefile.in
-sed -i -e 's/gzip/gzip -n/g' Makefile.in
+/usr/bin/iconv -f hebrew -t utf8 -o WHATSNEW WHATSNEW
 
 %build
 %configure --enable-fatverb --enable-linginfo
-make CFLAGS="$RPM_OPT_FLAGS"
-
-export PATH=$PATH:.
-make myspell
+make CFLAGS="$RPM_OPT_FLAGS" STRIP=:
+make hunspell
+cat >> hunspell/new_he.aff << EOF
+MAP 10
+MAP ???
+MAP ??
+MAP ??
+MAP ??
+MAP ??
+MAP ??
+MAP ?? # for English
+MAP ?? # for Russian
+MAP ?? # for Arabic
+MAP ??? # for French
+EOF
 
 %install
 rm -rf %{buildroot}
@@ -73,9 +70,8 @@ make DESTDIR=%{buildroot} install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libhspell.a
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p he.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.dic
-echo -e "WORDCHARS \0340\0341\0342\0343\0344\0345\0346\0347\0350\0351\0352\0353\0354\0355\0356\0357\0360\0361\0362\0363\0364\0365\0366\0367\0370\0371\0372\042\047" >> he.aff
-cp -p he.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.aff
+cp -p hunspell/new_he.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.dic
+cp -p hunspell/new_he.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/he_IL.aff
 
 %clean
 rm -rf %{buildroot}
@@ -101,7 +97,14 @@ rm -rf %{buildroot}
 %doc LICENSE
 %{_datadir}/myspell/*
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %changelog
+* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
+- Rebase to upstream version 1.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hspell/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 May 2006 17:58:22 -0000	1.4
+++ sources	31 Dec 2009 13:00:36 -0000	1.5
@@ -1 +1 @@
-3e12fa383c2cfd430918d115f33f9841  hspell-1.0.tar.gz
+fd2f78cb81d391cd4c0bf18489293ced  hspell-1.1.tar.gz



From till at fedoraproject.org  Thu Dec 31 13:02:43 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu, 31 Dec 2009 13:02:43 +0000 (UTC)
Subject: rpms/lzip/devel .cvsignore,1.4,1.5 lzip.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20091231130243.1BE9411C018B@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/lzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22985

Modified Files:
	.cvsignore lzip.spec sources 
Log Message:
* Thu Dec 31 2009 Till Maas <opensource at till.name> - 1.8-1
- Update to new release
- Fix end of line encoding of COPYING



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lzip/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Jul 2009 08:35:09 -0000	1.4
+++ .cvsignore	31 Dec 2009 13:02:42 -0000	1.5
@@ -1,2 +1,2 @@
-lzip-1.7.tar.gz
-lzip-1.7.tar.gz.sig
+lzip-1.8.tar.gz
+lzip-1.8.tar.gz.sig


Index: lzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lzip/devel/lzip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lzip.spec	7 Aug 2009 10:24:11 -0000	1.6
+++ lzip.spec	31 Dec 2009 13:02:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lzip
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        LZMA compressor with integrity checking
 
 Group:          Applications/File
@@ -22,6 +22,8 @@ format (.lz) is not compatible with the 
 
 %prep
 %setup -q
+# convert CRLF to LF
+sed -i 's/\r//' COPYING
 
 
 %build
@@ -59,18 +61,18 @@ fi
 %defattr(-,root,root,-)
 # TODO is currently empty
 %doc AUTHORS ChangeLog COPYING NEWS README
-%exclude %{_bindir}/lzdiff
-%exclude %{_bindir}/lzgrep
 %{_bindir}/lzip
 %{_bindir}/lziprecover
 %{_infodir}/lzip.info*
-%exclude %{_mandir}/man1/lzdiff.1*
-%exclude %{_mandir}/man1/lzgrep.1*
 %{_mandir}/man1/lzip.1*
 %{_mandir}/man1/lziprecover.1*
 
 
 %changelog
+* Thu Dec 31 2009 Till Maas <opensource at till.name> - 1.8-1
+- Update to new release
+- Fix end of line encoding of COPYING
+
 * Fri Aug 07 2009 Till Maas <opensource at till.name> - 1.7-2
 - Exclude lzdiff & lzgrep, they will become part of zutils:
   http://www.nongnu.org/lzip/zutils.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lzip/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Jul 2009 08:35:09 -0000	1.4
+++ sources	31 Dec 2009 13:02:42 -0000	1.5
@@ -1,2 +1,2 @@
-c63815497a25d21ed2431a0758d4191f  lzip-1.7.tar.gz
-24484c5843a347bfd4e44ffa4c609342  lzip-1.7.tar.gz.sig
+eb1f2795ab3f95ccc6c855eac60aefc3  lzip-1.8.tar.gz
+9207b8b59560398185cf80bd4f3f2d4c  lzip-1.8.tar.gz.sig



From danken at fedoraproject.org  Thu Dec 31 13:14:38 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 13:14:38 +0000 (UTC)
Subject: rpms/hspell/EL-5 hspell-1.0.sharedlib.patch, NONE, 1.1 hspell.spec,
	1.11, 1.12
Message-ID: <20091231131438.440D311C018B@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/extras/rpms/hspell/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24675

Modified Files:
	hspell.spec 
Added Files:
	hspell-1.0.sharedlib.patch 
Log Message:
* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1.1
- Rebuild with hspell-1.0.sharedlib.patch from Fedora


hspell-1.0.sharedlib.patch:
 Makefile.in |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE hspell-1.0.sharedlib.patch ---
Index: hspell-1.0/Makefile.in
===================================================================
--- hspell-1.0.orig/Makefile.in
+++ hspell-1.0/Makefile.in
@@ -51,7 +51,7 @@ LDFLAGS=@LDFLAGS@
 
 # Our TARGETS variable chooses what to compile. Some things are
 # optionally compiled depending on --enable-* paramters to configure.
-TARGETS = @TARGETS@
+TARGETS = @TARGETS@ libhspell.a
 all: $(TARGETS)
 
 # SEDCMD controls on whether objective-kinuyim - about 130,000 rare verb
@@ -76,7 +76,8 @@ clean:
 	      hebrew.wgz.lingsizes.tmp dmask.c install.js \
 	      spell-he.xpi he.dic he.aff README-he.txt \
 	      README_he_IL.txt he_IL.dic he_IL.aff he_IL.zip \
-	      specfilter.o specfilter
+	      specfilter.o specfilter \
+	      libhspell.so.0 libhspell.so *.lo
 	rm -f hebeng/install.js hebeng/heb-eng.aff hebeng/heb-eng.dic \
 	      hebeng/README-he.txt hebeng/README-en-US.txt \
 	      hebeng/spell-heb-eng.xpi
@@ -113,6 +114,9 @@ install: all
 	test -d $(DESTDIR)$(LIBDIR) || mkdir -m 755 -p $(DESTDIR)$(LIBDIR)
 	cp libhspell.a $(DESTDIR)$(LIBDIR)/
 	chmod 644 $(DESTDIR)$(LIBDIR)/libhspell.a
+	cp libhspell.so.0 $(DESTDIR)$(LIBDIR)/
+	chmod 755 $(DESTDIR)$(LIBDIR)/libhspell.so.0
+	ln -sf libhspell.so.0 $(DESTDIR)$(LIBDIR)/libhspell.so
 	test -d $(DESTDIR)$(INCLUDEDIR) || mkdir -m 755 -p $(DESTDIR)$(INCLUDEDIR)
 	cp hspell.h linginfo.h $(DESTDIR)$(INCLUDEDIR)/
 	chmod 644 $(DESTDIR)$(INCLUDEDIR)/hspell.h $(DESTDIR)$(INCLUDEDIR)/linginfo.h
@@ -166,19 +170,30 @@ libhspell.a: dict_radix.o gimatria.o cor
 	ar cr $@ $^
 	-ranlib $@
 
-$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.a $(LIBS)
+EXTRAOBJECTSPIC=$(EXTRAOBJECTS:.o=.lo)
+
+%.lo: %.c
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -o $@ $<
+
+libhspell.so.0: dict_radix.lo gimatria.lo corlist.lo libhspell.lo $(EXTRAOBJECTSPIC)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,libhspell.so.0 $^ -lz
+	ln -sf libhspell.so.0 libhspell.so
+
+$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.so.0
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.so.0 $(LIBS)
 
 # remember to update this dependency list once in a while...
 libhspell.o dict_radix.o find_sizes.o: dict_radix.h
 dict_radix.o linginfo.o: gzbuffered.h
 libhspell.o mk_he_affix.o: prefixes.c
+libhspell.lo mk_he_affix.lo: prefixes.c
 hspell.o: hash.h tclHash.h
 tclHash.o: tclHash.h
 corlist.o gimatria.o hspell.o libhspell.o: hspell.h
 hspell.o libhspell.o linginfo.o: linginfo.h hspell.h
 linginfo.o: dmask.c
 specfilter.o: prefixes.c
+specfilter.lo: prefixes.c
 
 prefixes.c: genprefixes.pl PrefixBits.pl
 	$(PERL) -w ./genprefixes.pl >prefixes.c


Index: hspell.spec
===================================================================
RCS file: /cvs/extras/rpms/hspell/EL-5/hspell.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- hspell.spec	31 Dec 2009 13:00:29 -0000	1.11
+++ hspell.spec	31 Dec 2009 13:14:38 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A Hebrew spell checker
 Name: hspell
 Version: 1.1
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 URL: http://hspell.ivrix.org.il
 Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
 License: GPLv2
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1.1
+- Rebuild with hspell-1.0.sharedlib.patch from Fedora
+
 * Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
 - Rebase to upstream version 1.1
 



From jdennis at fedoraproject.org  Thu Dec 31 13:30:14 2009
From: jdennis at fedoraproject.org (John Dennis)
Date: Thu, 31 Dec 2009 13:30:14 +0000 (UTC)
Subject: rpms/freeradius/F-12 .cvsignore, 1.22, 1.23 freeradius.spec, 1.88,
	1.89 sources, 1.23, 1.24
Message-ID: <20091231133014.1E9A111C0337@cvs1.fedora.phx.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/freeradius/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27113

Modified Files:
	.cvsignore freeradius.spec sources 
Log Message:
upgrade to latest upstream release (2.1.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	15 Sep 2009 14:47:18 -0000	1.22
+++ .cvsignore	31 Dec 2009 13:30:13 -0000	1.23
@@ -1 +1 @@
-freeradius-server-2.1.7.tar.bz2
+freeradius-server-2.1.8.tar.bz2


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-12/freeradius.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- freeradius.spec	30 Dec 2009 17:28:29 -0000	1.88
+++ freeradius.spec	31 Dec 2009 13:30:13 -0000	1.89
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
-Version: 2.1.7
-Release: 7%{?dist}
+Version: 2.1.8
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -220,6 +220,7 @@ for f in COPYRIGHT CREDITS INSTALL READM
 done
 cp LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.gpl
 cp src/lib/LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.lgpl
+cp src/LICENSE.openssl $RPM_BUILD_ROOT/%{docdir}/LICENSE.openssl
 
 # add Red Hat specific documentation
 cat >> $RPM_BUILD_ROOT/%{docdir}/REDHAT << EOF
@@ -275,6 +276,7 @@ fi
 %attr(644,root,radiusd) %config(noreplace) /etc/raddb/dictionary
 %config(noreplace) /etc/raddb/acct_users
 %config(noreplace) /etc/raddb/attrs
+%config(noreplace) /etc/raddb/attrs.access_challenge
 %config(noreplace) /etc/raddb/attrs.access_reject
 %config(noreplace) /etc/raddb/attrs.accounting_response
 %config(noreplace) /etc/raddb/attrs.pre-proxy
@@ -330,6 +332,7 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mac2ip
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mac2vlan
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/mschap
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/ntlm_auth
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/otp
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/pam
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/pap
@@ -548,6 +551,52 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Wed Dec 30 2009 John Dennis <jdennis at redhat.com> - 2.1.8-1
+- update to latest upstream
+  Feature improvements
+  * Print more descriptive error message for too many EAP sessions.
+    This gives hints on what to do when "failed to store handler"
+  * Commands received from radmin are now printed on stdout when
+    in debugging mode.
+  * Allow accounting packets to be written to a detail file, even
+    if they were read from a different detail file.
+  * Added OpenSSL license exception (src/LICENSE.openssl)
+
+  Bug fixes
+  * DHCP sockets can now set the broadcast flag before binding to a
+    socket.  You need to set "broadcast = yes" in the DHCP listener.
+  * Be more restrictive on string parsing in the config files
+  * Fix password length in scripts/create-users.pl
+  * Be more flexible about parsing the detail file.  This allows
+    it to read files where the attributes have been edited.
+  * Ensure that requests read from the detail file are cleaned up
+    (i.e. don't leak) if they are proxied without a response.
+  * Write the PID file after opening sockets, not before
+    (closes bug #29)
+  * Proxying large numbers of packets no longer gives error
+    "unable to open proxy socket".
+  * Avoid mutex locks in libc after fork
+  * Retry packet from detail file if there was no response.
+  * Allow old-style dictionary formats, where the vendor name is the
+    last field in an ATTRIBUTE definition.
+  * Removed all recursive use of mutexes.  Some systems just don't
+    support this.
+  * Allow !* to work as documented.
+  * make templates work (see templates.conf)
+  * Enabled "allow_core_dumps" to work again
+  * Print better errors when reading invalid dictionaries
+  * Sign client certificates with CA, rather than server certs.
+  * Fix potential crash in rlm_passwd when file was closed
+  * Fixed corner cases in conditional dynamic expansion.
+  * Use InnoDB for MySQL IP Pools, to gain transactional support
+  * Apply patch to libltdl for CVE-2009-3736.
+  * Fixed a few issues found by LLVM's static checker
+  * Keep track of "bad authenticators" for accounting packets
+  * Keep track of "dropped packets" for auth/acct packets
+  * Synced the "debian" directory with upstream
+  * Made "unlang" use unsigned 32-bit integers, to match the
+    dictionaries.
+
 * Wed Dec 30 2009 John Dennis <jdennis at redhat.com> - 2.1.7-7
 - Remove devel subpackage. It doesn't make much sense to have a devel package since
   we don't ship libraries and it produces multilib conflicts.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	15 Sep 2009 14:47:18 -0000	1.23
+++ sources	31 Dec 2009 13:30:13 -0000	1.24
@@ -1 +1 @@
-b8df6cf0c3df1dded205ad5f954feb78  freeradius-server-2.1.7.tar.bz2
+d326525490bfba273471d77560471fcb  freeradius-server-2.1.8.tar.bz2



From mschwendt at fedoraproject.org  Thu Dec 31 13:41:19 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 31 Dec 2009 13:41:19 +0000 (UTC)
Subject: rpms/audacious/devel audacious-2.2-disabled-iplugins.patch, 1.1,
	1.2 audacious.spec, 1.59, 1.60
Message-ID: <20091231134120.030C511C018B@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28813

Modified Files:
	audacious-2.2-disabled-iplugins.patch audacious.spec 
Log Message:
* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
- Added another fix to the disabled-iplugins patch.


audacious-2.2-disabled-iplugins.patch:
 playback.c       |    2 +-
 playlist-utils.c |   16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

Index: audacious-2.2-disabled-iplugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious-2.2-disabled-iplugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-2.2-disabled-iplugins.patch	30 Dec 2009 19:35:08 -0000	1.1
+++ audacious-2.2-disabled-iplugins.patch	31 Dec 2009 13:41:19 -0000	1.2
@@ -1,6 +1,18 @@
-diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2/src/audacious/playlist-utils.c
+diff -Nur audacious-2.2-orig/src/audacious/playback.c audacious-2.2-fedora/src/audacious/playback.c
+--- audacious-2.2-orig/src/audacious/playback.c	2009-11-22 23:43:47.000000000 +0100
++++ audacious-2.2-fedora/src/audacious/playback.c	2009-12-31 14:36:28.000000000 +0100
+@@ -448,7 +448,7 @@
+         return FALSE;
+     }
+ 
+-    if (decoder == NULL)
++    if (decoder == NULL || (decoder && !decoder->enabled))
+     {
+         ProbeResult * pr = input_check_file (filename);
+ 
+diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2-fedora/src/audacious/playlist-utils.c
 --- audacious-2.2-orig/src/audacious/playlist-utils.c	2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/playlist-utils.c	2009-12-30 20:28:30.000000000 +0100
++++ audacious-2.2-fedora/src/audacious/playlist-utils.c	2009-12-31 14:35:14.000000000 +0100
 @@ -288,7 +288,7 @@
      InputPlugin * decoder = NULL;
      gchar * temp = g_strdup (filename);


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- audacious.spec	30 Dec 2009 19:35:08 -0000	1.59
+++ audacious.spec	31 Dec 2009 13:41:19 -0000	1.60
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -187,6 +187,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
+- Added another fix to the disabled-iplugins patch.
+
 * Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
 - Patch Audacious so that filename_find_decoder only considers
   enabled input plugins (disabled modplug plugin effectively disabled



From mso at fedoraproject.org  Thu Dec 31 13:43:54 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 31 Dec 2009 13:43:54 +0000 (UTC)
Subject: File subtitleeditor-0.35.1.tar.gz uploaded to lookaside cache by mso
Message-ID: <20091231134354.4C97C10F8D6@bastion.fedoraproject.org>

A file has been added to the lookaside cache for subtitleeditor:

729651204c80ccf7c0ed7f341ec9d6ff  subtitleeditor-0.35.1.tar.gz



From mso at fedoraproject.org  Thu Dec 31 13:44:35 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 31 Dec 2009 13:44:35 +0000 (UTC)
Subject: rpms/subtitleeditor/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 subtitleeditor.spec, 1.11, 1.12
Message-ID: <20091231134435.AEA5F11C018B@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/pkgs/rpms/subtitleeditor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29395

Modified Files:
	.cvsignore sources subtitleeditor.spec 
Log Message:


new upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Oct 2009 21:03:44 -0000	1.7
+++ .cvsignore	31 Dec 2009 13:44:35 -0000	1.8
@@ -1 +1 @@
-subtitleeditor-0.34.0.tar.gz
+subtitleeditor-0.35.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Oct 2009 21:03:44 -0000	1.7
+++ sources	31 Dec 2009 13:44:35 -0000	1.8
@@ -1 +1 @@
-6ec20c5935721803e87437273b57a1b6  subtitleeditor-0.34.0.tar.gz
+729651204c80ccf7c0ed7f341ec9d6ff  subtitleeditor-0.35.1.tar.gz


Index: subtitleeditor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/devel/subtitleeditor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- subtitleeditor.spec	25 Oct 2009 21:03:44 -0000	1.11
+++ subtitleeditor.spec	31 Dec 2009 13:44:35 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           subtitleeditor
-Version:        0.34.0
+Version:        0.35.1
 Release:        1%{?dist}
 Summary:        GTK+2 tool to edit subtitles for GNU/Linux/*BSD
 
@@ -103,6 +103,12 @@ fi
 %{_libdir}/%{name}
 
 %changelog
+* Thu Dec 31 2009 Martin Sourada <mso at fedoraproject.org> - 0.35.1-1
+- New release
+- improvements to waveform editor
+- video player rewritten, should fix rhbz#538382
+- various bug fixes
+
 * Sun Oct 25 2009 Martin Sourada <mso at fedoraproject.org> - 0.34.0-1
 - New release
 - supports pulsesink now



From mschwendt at fedoraproject.org  Thu Dec 31 13:47:47 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 31 Dec 2009 13:47:47 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins-2.2-xspf-base.patch,
	NONE, 1.1 README, 1.4, 1.5 audacious-plugins.spec, 1.74, 1.75
Message-ID: <20091231134748.10FFC11C018B@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29994

Modified Files:
	README audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-xspf-base.patch 
Log Message:
* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-7
- Fix xspf Container plugin's handling of plain file names.
- Disable modplug plugin (where is it compared with libmodplug and
  its fixes and CVEs?). Give precedence to audacious-plugin-xmp
- Remove BR libmodplug-devel as the modplug plugin has never used
  the external library.


audacious-plugins-2.2-xspf-base.patch:
 xspf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.2-xspf-base.patch ---
diff -Nur audacious-plugins-2.2-orig/src/xspf/xspf.c audacious-plugins-2.2-xspf/src/xspf/xspf.c
--- audacious-plugins-2.2-orig/src/xspf/xspf.c	2009-11-22 23:49:54.000000000 +0100
+++ audacious-plugins-2.2-xspf/src/xspf/xspf.c	2009-12-31 14:33:33.000000000 +0100
@@ -106,8 +106,8 @@
             if (!xmlStrcmp(nptr->name, (xmlChar *)"location")) {
                 /* Location is a special case */
                 gchar *str = (gchar *)xmlNodeGetContent(nptr);
-                if (!strstr(str, "://") && base)
-                    location = g_strdup_printf("%s/%s", base, str);
+                if (!strstr(str, "://") && base && str[0]!='/')
+                    location = g_strdup_printf("file://%s/%s", base, str);
                 else
                     location = g_strdup(str);
                 xmlFree(str);


Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- README	25 Nov 2009 14:51:24 -0000	1.4
+++ README	31 Dec 2009 13:47:47 -0000	1.5
@@ -0,0 +1 @@
+TODO: .s3m handling conflict of adplug and audacious-plugin-xmp?


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- audacious-plugins.spec	30 Dec 2009 23:40:27 -0000	1.74
+++ audacious-plugins.spec	31 Dec 2009 13:47:47 -0000	1.75
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -33,6 +33,8 @@ Patch3: audacious-plugins-2.2-cfg_db_clo
 Patch4: audacious-plugins-2.2-bluetooth.patch
 # merged upstream
 Patch5: audacious-plugins-2.2-alarm.patch
+#
+Patch6: audacious-plugins-2.2-xspf-base.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -168,6 +170,7 @@ in Vortex (.vtx) format.
 %patch3 -p1 -b .cfg_db_close
 %patch4 -p1 -b .bluetooth
 %patch5 -p1 -b .alarm
+%patch6 -p1 -b .xspf
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -262,7 +265,8 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
-* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-7
+- Fix xspf Container plugin's handling of plain file names.
 - Disable modplug plugin (where is it compared with libmodplug and
   its fixes and CVEs?). Give precedence to audacious-plugin-xmp
 - Remove BR libmodplug-devel as the modplug plugin has never used



From mschwendt at fedoraproject.org  Thu Dec 31 13:49:26 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 31 Dec 2009 13:49:26 +0000 (UTC)
Subject: rpms/audacious/F-12 audacious-2.2-disabled-iplugins.patch, 1.1,
	1.2 audacious.spec, 1.58, 1.59
Message-ID: <20091231134926.8539211C018B@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30340

Modified Files:
	audacious-2.2-disabled-iplugins.patch audacious.spec 
Log Message:
sync with Rawhide

audacious-2.2-disabled-iplugins.patch:
 playback.c       |    2 +-
 playlist-utils.c |   16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

Index: audacious-2.2-disabled-iplugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious-2.2-disabled-iplugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-2.2-disabled-iplugins.patch	30 Dec 2009 19:40:52 -0000	1.1
+++ audacious-2.2-disabled-iplugins.patch	31 Dec 2009 13:49:26 -0000	1.2
@@ -1,6 +1,18 @@
-diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2/src/audacious/playlist-utils.c
+diff -Nur audacious-2.2-orig/src/audacious/playback.c audacious-2.2-fedora/src/audacious/playback.c
+--- audacious-2.2-orig/src/audacious/playback.c	2009-11-22 23:43:47.000000000 +0100
++++ audacious-2.2-fedora/src/audacious/playback.c	2009-12-31 14:36:28.000000000 +0100
+@@ -448,7 +448,7 @@
+         return FALSE;
+     }
+ 
+-    if (decoder == NULL)
++    if (decoder == NULL || (decoder && !decoder->enabled))
+     {
+         ProbeResult * pr = input_check_file (filename);
+ 
+diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2-fedora/src/audacious/playlist-utils.c
 --- audacious-2.2-orig/src/audacious/playlist-utils.c	2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/playlist-utils.c	2009-12-30 20:28:30.000000000 +0100
++++ audacious-2.2-fedora/src/audacious/playlist-utils.c	2009-12-31 14:35:14.000000000 +0100
 @@ -288,7 +288,7 @@
      InputPlugin * decoder = NULL;
      gchar * temp = g_strdup (filename);


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- audacious.spec	30 Dec 2009 19:40:52 -0000	1.58
+++ audacious.spec	31 Dec 2009 13:49:26 -0000	1.59
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -187,6 +187,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
+- Added another fix to the disabled-iplugins patch.
+
 * Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
 - Patch Audacious so that filename_find_decoder only considers
   enabled input plugins (disabled modplug plugin effectively disabled



From mschwendt at fedoraproject.org  Thu Dec 31 13:50:30 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 31 Dec 2009 13:50:30 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-plugins-2.2-xspf-base.patch,
	NONE, 1.1 audacious-plugins.spec, 1.78, 1.79
Message-ID: <20091231135030.6CF4211C018B@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30594

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-xspf-base.patch 
Log Message:
sync with Rawhide

audacious-plugins-2.2-xspf-base.patch:
 xspf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.2-xspf-base.patch ---
diff -Nur audacious-plugins-2.2-orig/src/xspf/xspf.c audacious-plugins-2.2-xspf/src/xspf/xspf.c
--- audacious-plugins-2.2-orig/src/xspf/xspf.c	2009-11-22 23:49:54.000000000 +0100
+++ audacious-plugins-2.2-xspf/src/xspf/xspf.c	2009-12-31 14:33:33.000000000 +0100
@@ -106,8 +106,8 @@
             if (!xmlStrcmp(nptr->name, (xmlChar *)"location")) {
                 /* Location is a special case */
                 gchar *str = (gchar *)xmlNodeGetContent(nptr);
-                if (!strstr(str, "://") && base)
-                    location = g_strdup_printf("%s/%s", base, str);
+                if (!strstr(str, "://") && base && str[0]!='/')
+                    location = g_strdup_printf("file://%s/%s", base, str);
                 else
                     location = g_strdup(str);
                 xmlFree(str);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- audacious-plugins.spec	30 Dec 2009 23:40:52 -0000	1.78
+++ audacious-plugins.spec	31 Dec 2009 13:50:30 -0000	1.79
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -33,6 +33,8 @@ Patch3: audacious-plugins-2.2-cfg_db_clo
 Patch4: audacious-plugins-2.2-bluetooth.patch
 # merged upstream
 Patch5: audacious-plugins-2.2-alarm.patch
+#
+Patch6: audacious-plugins-2.2-xspf-base.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -168,6 +170,7 @@ in Vortex (.vtx) format.
 %patch3 -p1 -b .cfg_db_close
 %patch4 -p1 -b .bluetooth
 %patch5 -p1 -b .alarm
+%patch6 -p1 -b .xspf
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -262,7 +265,8 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
-* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-7
+- Fix xspf Container plugin's handling of plain file names.
 - Disable modplug plugin (where is it compared with libmodplug and
   its fixes and CVEs?). Give precedence to audacious-plugin-xmp
 - Remove BR libmodplug-devel as the modplug plugin has never used



From mso at fedoraproject.org  Thu Dec 31 13:58:42 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 31 Dec 2009 13:58:42 +0000 (UTC)
Subject: rpms/subtitleeditor/F-11 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 subtitleeditor.spec, 1.9, 1.10
Message-ID: <20091231135842.DDA4911C018B@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/pkgs/rpms/subtitleeditor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31888/F-11

Modified Files:
	.cvsignore sources subtitleeditor.spec 
Log Message:


sync f-11 and f-12 with devel (update to 0.45.1)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Dec 2008 12:56:02 -0000	1.6
+++ .cvsignore	31 Dec 2009 13:58:42 -0000	1.7
@@ -1 +1 @@
-subtitleeditor-0.30.0.tar.gz
+subtitleeditor-0.35.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	6 Dec 2008 12:56:02 -0000	1.6
+++ sources	31 Dec 2009 13:58:42 -0000	1.7
@@ -1 +1 @@
-5e24cb090e2cfe9dc30cf8cc612e5468  subtitleeditor-0.30.0.tar.gz
+729651204c80ccf7c0ed7f341ec9d6ff  subtitleeditor-0.35.1.tar.gz


Index: subtitleeditor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-11/subtitleeditor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- subtitleeditor.spec	23 Feb 2009 19:23:40 -0000	1.9
+++ subtitleeditor.spec	31 Dec 2009 13:58:42 -0000	1.10
@@ -1,14 +1,14 @@
 Name:           subtitleeditor
-Version:        0.30.0
-Release:        4%{?dist}
+Version:        0.35.1
+Release:        1%{?dist}
 Summary:        GTK+2 tool to edit subtitles for GNU/Linux/*BSD
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://home.gna.org/subtitleeditor/
 Source0:        http://download.gna.org/subtitleeditor/0.30/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-bug12649.patch
-Patch1:         %{name}-%{version}-sscanf.patch
+#Patch0:         %{name}-%{version}-bug12649.patch
+Patch1:         %{name}-0.30.0-sscanf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -16,16 +16,16 @@ BuildRequires:  gettext
 BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-good
 BuildRequires:  gstreamer-plugins-base-devel
-BuildRequires:  gtkmm24-devel
+BuildRequires:  gtkmm24-devel >= 2.14.0
 BuildRequires:  glibmm24-devel >= 2.16.3
-BuildRequires:  libglademm24-devel
-BuildRequires:  libxml++-devel
+#BuildRequires:  libglademm24-devel
+BuildRequires:  libxml++-devel >= 2.20
 BuildRequires:  intltool
 BuildRequires:  ccache
-BuildRequires:  libtool autoconf automake
+BuildRequires:  gstreamermm-devel >= 0.10.4
 
 # For spell checking (Optional)
-BuildRequires:  enchant-devel
+BuildRequires:  enchant-devel >= 1.4.0
 # For OpenGL waveform renderer (Optional)
 BuildRequires:  gtkglextmm-devel
 # ISO-CODES 639 + 3166 (Optional)
@@ -42,16 +42,16 @@ to synchronise subtitles to voices.
 
 %prep
 %setup -q
-%patch0 -p0
+#%patch0 -p0
 %patch1 -p1 -b .sscanf
 
 %build
-./autogen.sh
 %configure \
        --disable-debug \
        --disable-static \
        --enable-gl \
-       --enable-ccache
+       --enable-ccache 
+
 make %{?_smp_mflags}
 
 %install
@@ -95,6 +95,7 @@ fi
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/man/man1/%{name}.1.*
@@ -102,6 +103,27 @@ fi
 %{_libdir}/%{name}
 
 %changelog
+* Thu Dec 31 2009 Martin Sourada <mso at fedoraproject.org> - 0.35.1-1
+- New release
+- improvements to waveform editor
+- video player rewritten, should fix rhbz#538382
+- various bug fixes
+
+* Sun Oct 25 2009 Martin Sourada <mso at fedoraproject.org> - 0.34.0-1
+- New release
+- supports pulsesink now
+- new plugin 'textcorrection'
+- new plugin 'keyframesmanagement'
+- spell checking plugin completely rewrite
+- find and replace plugin completely rewrite
+- libglademm -> Gtk::Builder
+- new translations
+- various bug fixes
+- fix for upstream bug #12649 has been included in tarbal
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Martin Sourada <mso at fedoraproject.org> - 0.30.0-4
 - Fix build on rawhide
 



From mso at fedoraproject.org  Thu Dec 31 13:58:43 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 31 Dec 2009 13:58:43 +0000 (UTC)
Subject: rpms/subtitleeditor/F-12 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 subtitleeditor.spec, 1.10, 1.11
Message-ID: <20091231135843.0D7B811C0260@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/pkgs/rpms/subtitleeditor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31888/F-12

Modified Files:
	.cvsignore sources subtitleeditor.spec 
Log Message:


sync f-11 and f-12 with devel (update to 0.45.1)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Dec 2008 12:56:02 -0000	1.6
+++ .cvsignore	31 Dec 2009 13:58:42 -0000	1.7
@@ -1 +1 @@
-subtitleeditor-0.30.0.tar.gz
+subtitleeditor-0.35.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	6 Dec 2008 12:56:02 -0000	1.6
+++ sources	31 Dec 2009 13:58:42 -0000	1.7
@@ -1 +1 @@
-5e24cb090e2cfe9dc30cf8cc612e5468  subtitleeditor-0.30.0.tar.gz
+729651204c80ccf7c0ed7f341ec9d6ff  subtitleeditor-0.35.1.tar.gz


Index: subtitleeditor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-12/subtitleeditor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- subtitleeditor.spec	27 Jul 2009 04:57:28 -0000	1.10
+++ subtitleeditor.spec	31 Dec 2009 13:58:42 -0000	1.11
@@ -1,14 +1,14 @@
 Name:           subtitleeditor
-Version:        0.30.0
-Release:        5%{?dist}
+Version:        0.35.1
+Release:        1%{?dist}
 Summary:        GTK+2 tool to edit subtitles for GNU/Linux/*BSD
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://home.gna.org/subtitleeditor/
 Source0:        http://download.gna.org/subtitleeditor/0.30/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-bug12649.patch
-Patch1:         %{name}-%{version}-sscanf.patch
+#Patch0:         %{name}-%{version}-bug12649.patch
+Patch1:         %{name}-0.30.0-sscanf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -16,16 +16,16 @@ BuildRequires:  gettext
 BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-good
 BuildRequires:  gstreamer-plugins-base-devel
-BuildRequires:  gtkmm24-devel
+BuildRequires:  gtkmm24-devel >= 2.14.0
 BuildRequires:  glibmm24-devel >= 2.16.3
-BuildRequires:  libglademm24-devel
-BuildRequires:  libxml++-devel
+#BuildRequires:  libglademm24-devel
+BuildRequires:  libxml++-devel >= 2.20
 BuildRequires:  intltool
 BuildRequires:  ccache
-BuildRequires:  libtool autoconf automake
+BuildRequires:  gstreamermm-devel >= 0.10.4
 
 # For spell checking (Optional)
-BuildRequires:  enchant-devel
+BuildRequires:  enchant-devel >= 1.4.0
 # For OpenGL waveform renderer (Optional)
 BuildRequires:  gtkglextmm-devel
 # ISO-CODES 639 + 3166 (Optional)
@@ -42,16 +42,16 @@ to synchronise subtitles to voices.
 
 %prep
 %setup -q
-%patch0 -p0
+#%patch0 -p0
 %patch1 -p1 -b .sscanf
 
 %build
-./autogen.sh
 %configure \
        --disable-debug \
        --disable-static \
        --enable-gl \
-       --enable-ccache
+       --enable-ccache 
+
 make %{?_smp_mflags}
 
 %install
@@ -95,6 +95,7 @@ fi
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/man/man1/%{name}.1.*
@@ -102,6 +103,24 @@ fi
 %{_libdir}/%{name}
 
 %changelog
+* Thu Dec 31 2009 Martin Sourada <mso at fedoraproject.org> - 0.35.1-1
+- New release
+- improvements to waveform editor
+- video player rewritten, should fix rhbz#538382
+- various bug fixes
+
+* Sun Oct 25 2009 Martin Sourada <mso at fedoraproject.org> - 0.34.0-1
+- New release
+- supports pulsesink now
+- new plugin 'textcorrection'
+- new plugin 'keyframesmanagement'
+- spell checking plugin completely rewrite
+- find and replace plugin completely rewrite
+- libglademm -> Gtk::Builder
+- new translations
+- various bug fixes
+- fix for upstream bug #12649 has been included in tarbal
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ellert at fedoraproject.org  Thu Dec 31 14:08:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 31 Dec 2009 14:08:59 +0000 (UTC)
Subject: File voms-1.9.14.3.tar.gz uploaded to lookaside cache by ellert
Message-ID: <20091231140859.89F5910F8D4@bastion.fedoraproject.org>

A file has been added to the lookaside cache for voms:

b80d8fc095632807513dab16ae1fe803  voms-1.9.14.3.tar.gz



From ellert at fedoraproject.org  Thu Dec 31 14:09:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 31 Dec 2009 14:09:59 +0000 (UTC)
Subject: rpms/voms/devel voms-deps.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 import.log, 1.3, 1.4 sources, 1.4,
	1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
Message-ID: <20091231140959.E9B3611C018B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1296/devel

Modified Files:
	.cvsignore import.log sources voms-distribution-globus.patch 
	voms.spec 
Added Files:
	voms-deps.patch 
Log Message:
* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)


voms-deps.patch:
 client/Makefile.am |    2 +-
 server/Makefile.am |    2 +-
 utils/Makefile.am  |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE voms-deps.patch ---
diff -ur voms-1.9.14.3.orig/src/client/Makefile.am voms-1.9.14.3/src/client/Makefile.am
--- voms-1.9.14.3.orig/src/client/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/client/Makefile.am	2009-12-29 00:18:17.405868413 +0100
@@ -12,7 +12,7 @@
 voms_proxy_init_LDADD = \
   $(top_builddir)/src/api/ccapi/libvomsapi_nog.la \
   $(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+  $(OPENSSL_LIBS) -lpthread
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/api/ccapi \
 	-I$(top_srcdir)/src/include \
diff -ur voms-1.9.14.3.orig/src/server/Makefile.am voms-1.9.14.3/src/server/Makefile.am
--- voms-1.9.14.3.orig/src/server/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/server/Makefile.am	2009-12-29 00:19:18.580869075 +0100
@@ -20,7 +20,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/api/ccapi/$(USE_CCAPI_LIB) \
-	$(EXPAT_LIBS)
+	$(EXPAT_LIBS) -lpthread
 
 voms_LDFLAGS =
 
diff -ur voms-1.9.14.3.orig/src/utils/Makefile.am voms-1.9.14.3/src/utils/Makefile.am
--- voms-1.9.14.3.orig/src/utils/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.14.3/src/utils/Makefile.am	2009-12-29 00:16:31.097869074 +0100
@@ -12,7 +12,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_destroy_SOURCES = \
 	voms_proxy_destroy.cc
@@ -22,7 +22,7 @@
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_fake_SOURCES = \
 	vomsfake.h \
@@ -41,7 +41,7 @@
 	$(top_builddir)/src/ac/libattributes_nog.la \
 	$(top_builddir)/src/common/libutilc_nog.la \
 	$(top_builddir)/src/replib/librep.la \
-	$(top_builddir)/src/sslutils/libssl_utils_nog.la
+	$(top_builddir)/src/sslutils/libssl_utils_nog.la -lpthread
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/api/ccapi \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Oct 2009 15:55:27 -0000	1.4
+++ .cvsignore	31 Dec 2009 14:09:59 -0000	1.5
@@ -1 +1 @@
-voms-1.9.14.2.tar.gz
+voms-1.9.14.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	21 Oct 2009 15:55:27 -0000	1.3
+++ import.log	31 Dec 2009 14:09:59 -0000	1.4
@@ -1,3 +1,4 @@
 voms-1_9_11-4_fc11:HEAD:voms-1.9.11-4.fc11.src.rpm:1252549706
 voms-1_9_12_1-1_fc11:HEAD:voms-1.9.12.1-1.fc11.src.rpm:1253508983
 voms-1_9_14_2-1_fc11:HEAD:voms-1.9.14.2-1.fc11.src.rpm:1256140426
+voms-1_9_14_3-1_fc12:HEAD:voms-1.9.14.3-1.fc12.src.rpm:1262268509


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2009 15:55:27 -0000	1.4
+++ sources	31 Dec 2009 14:09:59 -0000	1.5
@@ -1 +1 @@
-b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz
+b80d8fc095632807513dab16ae1fe803  voms-1.9.14.3.tar.gz

voms-distribution-globus.patch:
 acinclude.m4 |   46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

Index: voms-distribution-globus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/voms-distribution-globus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-distribution-globus.patch	10 Sep 2009 02:31:49 -0000	1.1
+++ voms-distribution-globus.patch	31 Dec 2009 14:09:59 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
---- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
-+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
+diff -ur voms-1.9.14.3.orig/project/acinclude.m4 voms-1.9.14.3/project/acinclude.m4
+--- voms-1.9.14.3.orig/project/acinclude.m4	2009-11-03 13:30:30.000000000 +0100
++++ voms-1.9.14.3/project/acinclude.m4	2009-12-28 19:29:15.238768642 +0100
 @@ -66,11 +66,6 @@
  # ---------------------------------------------
  AC_DEFUN([AC_OPENSSL],
@@ -13,27 +13,45 @@ diff -ur voms-1.9.8.1.orig/project/acinc
    AC_ARG_WITH(openssl_libs,
                [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
                [ with_openssl_libs="$withval"],
-@@ -80,16 +75,11 @@
+@@ -80,34 +75,9 @@
       AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
    fi  
  
 -  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
--  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
+-
 -
 -  AC_LANG_PUSH(C)
--  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
+-
+-  save_LIBS=$LIBS
+-  LIBS="-L$with_openssl_prefix/lib64 -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found64=yes], [found64=no])
+-
+-  LIBS="$with_openssl_prefix/lib -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found32=yes], [found32=no])
 -  AC_LANG_POP(C) 
+-
+-  LIBS=$save_LIBS
+-
+-  if test "x$found64" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib64 -lcrypto -lssl"
+-    found=yes
+-  elif test "x$found32" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
+-    found=yes
+-  fi   
 +  PKG_CHECK_MODULES(OPENSSL, [openssl], [
 +  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
 +  found=yes], [found=no])
  
    if test "x$found" = "xyes"; then
--    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
--    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
      AC_SUBST(NO_GLOBUS_FLAGS)
-     AC_SUBST(OPENSSL_LIBS)
-     AC_MSG_CHECKING([for system OpenSSL version])
-@@ -105,11 +95,10 @@
+@@ -125,11 +95,10 @@
  #include <openssl/opensslv.h>
  OPENSSL_VERSION_TEXT
  HERE
@@ -46,7 +64,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
  ])
  
  # AC_GLOBUS checks globus prefix, looks for globus 
-@@ -119,6 +108,11 @@
+@@ -139,6 +108,11 @@
  # -------------------------------------------------------
  AC_DEFUN([AC_GLOBUS],
  [
@@ -58,7 +76,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
      AC_ARG_WITH(globus_prefix,
  	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
  	[with_globus_prefix="$withval"],
-@@ -165,6 +159,8 @@
+@@ -185,6 +159,8 @@
  
      AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
  


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/voms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- voms.spec	21 Oct 2009 15:55:27 -0000	1.3
+++ voms.spec	31 Dec 2009 14:09:59 -0000	1.4
@@ -1,7 +1,7 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.14.2
+Version:	1.9.14.3
 Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
@@ -10,9 +10,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_14_2 \
-#		  -d voms-1.9.14.2 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.14.2.tar.gz voms-1.9.14.2
+#		  -r glite-security-voms_R_1_9_14_3 \
+#		  -d voms-1.9.14.3 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.14.3.tar.gz voms-1.9.14.3
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -64,6 +64,9 @@ Patch14:	%{name}-pipe-buf.patch
 #		Make sure -L/usr/lib and -L/usr/lib64 is not used
 #		https://savannah.cern.ch/bugs/?57261
 Patch15:	%{name}-expat.patch
+#		Add missing dependencies for stricter binutils
+#		https://savannah.cern.ch/bugs/?60979
+Patch16:	%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -221,6 +224,7 @@ Virtual Organization Membership Service 
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -460,6 +464,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
+- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)
+
 * Tue Oct 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.2-1
 - Upstream 1.9.14.2 (CVS tag glite-security-voms_R_1_9_14_2)
 



From ellert at fedoraproject.org  Thu Dec 31 14:11:52 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 31 Dec 2009 14:11:52 +0000 (UTC)
Subject: rpms/voms/F-12 voms-deps.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 import.log, 1.3, 1.4 sources, 1.4,
	1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
Message-ID: <20091231141152.4377711C018B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1775/F-12

Modified Files:
	.cvsignore import.log sources voms-distribution-globus.patch 
	voms.spec 
Added Files:
	voms-deps.patch 
Log Message:
* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)


voms-deps.patch:
 client/Makefile.am |    2 +-
 server/Makefile.am |    2 +-
 utils/Makefile.am  |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE voms-deps.patch ---
diff -ur voms-1.9.14.3.orig/src/client/Makefile.am voms-1.9.14.3/src/client/Makefile.am
--- voms-1.9.14.3.orig/src/client/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/client/Makefile.am	2009-12-29 00:18:17.405868413 +0100
@@ -12,7 +12,7 @@
 voms_proxy_init_LDADD = \
   $(top_builddir)/src/api/ccapi/libvomsapi_nog.la \
   $(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+  $(OPENSSL_LIBS) -lpthread
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/api/ccapi \
 	-I$(top_srcdir)/src/include \
diff -ur voms-1.9.14.3.orig/src/server/Makefile.am voms-1.9.14.3/src/server/Makefile.am
--- voms-1.9.14.3.orig/src/server/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/server/Makefile.am	2009-12-29 00:19:18.580869075 +0100
@@ -20,7 +20,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/api/ccapi/$(USE_CCAPI_LIB) \
-	$(EXPAT_LIBS)
+	$(EXPAT_LIBS) -lpthread
 
 voms_LDFLAGS =
 
diff -ur voms-1.9.14.3.orig/src/utils/Makefile.am voms-1.9.14.3/src/utils/Makefile.am
--- voms-1.9.14.3.orig/src/utils/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.14.3/src/utils/Makefile.am	2009-12-29 00:16:31.097869074 +0100
@@ -12,7 +12,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_destroy_SOURCES = \
 	voms_proxy_destroy.cc
@@ -22,7 +22,7 @@
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_fake_SOURCES = \
 	vomsfake.h \
@@ -41,7 +41,7 @@
 	$(top_builddir)/src/ac/libattributes_nog.la \
 	$(top_builddir)/src/common/libutilc_nog.la \
 	$(top_builddir)/src/replib/librep.la \
-	$(top_builddir)/src/sslutils/libssl_utils_nog.la
+	$(top_builddir)/src/sslutils/libssl_utils_nog.la -lpthread
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/api/ccapi \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Oct 2009 15:56:48 -0000	1.4
+++ .cvsignore	31 Dec 2009 14:11:51 -0000	1.5
@@ -1 +1 @@
-voms-1.9.14.2.tar.gz
+voms-1.9.14.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	21 Oct 2009 15:56:48 -0000	1.3
+++ import.log	31 Dec 2009 14:11:52 -0000	1.4
@@ -1,3 +1,4 @@
 voms-1_9_11-4_fc11:HEAD:voms-1.9.11-4.fc11.src.rpm:1252549706
 voms-1_9_12_1-1_fc11:HEAD:voms-1.9.12.1-1.fc11.src.rpm:1253508983
 voms-1_9_14_2-1_fc11:F-12:voms-1.9.14.2-1.fc11.src.rpm:1256140565
+voms-1_9_14_3-1_fc12:F-12:voms-1.9.14.3-1.fc12.src.rpm:1262268646


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2009 15:56:48 -0000	1.4
+++ sources	31 Dec 2009 14:11:52 -0000	1.5
@@ -1 +1 @@
-b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz
+b80d8fc095632807513dab16ae1fe803  voms-1.9.14.3.tar.gz

voms-distribution-globus.patch:
 acinclude.m4 |   46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

Index: voms-distribution-globus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms-distribution-globus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-distribution-globus.patch	10 Sep 2009 02:31:49 -0000	1.1
+++ voms-distribution-globus.patch	31 Dec 2009 14:11:52 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
---- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
-+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
+diff -ur voms-1.9.14.3.orig/project/acinclude.m4 voms-1.9.14.3/project/acinclude.m4
+--- voms-1.9.14.3.orig/project/acinclude.m4	2009-11-03 13:30:30.000000000 +0100
++++ voms-1.9.14.3/project/acinclude.m4	2009-12-28 19:29:15.238768642 +0100
 @@ -66,11 +66,6 @@
  # ---------------------------------------------
  AC_DEFUN([AC_OPENSSL],
@@ -13,27 +13,45 @@ diff -ur voms-1.9.8.1.orig/project/acinc
    AC_ARG_WITH(openssl_libs,
                [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
                [ with_openssl_libs="$withval"],
-@@ -80,16 +75,11 @@
+@@ -80,34 +75,9 @@
       AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
    fi  
  
 -  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
--  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
+-
 -
 -  AC_LANG_PUSH(C)
--  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
+-
+-  save_LIBS=$LIBS
+-  LIBS="-L$with_openssl_prefix/lib64 -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found64=yes], [found64=no])
+-
+-  LIBS="$with_openssl_prefix/lib -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found32=yes], [found32=no])
 -  AC_LANG_POP(C) 
+-
+-  LIBS=$save_LIBS
+-
+-  if test "x$found64" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib64 -lcrypto -lssl"
+-    found=yes
+-  elif test "x$found32" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
+-    found=yes
+-  fi   
 +  PKG_CHECK_MODULES(OPENSSL, [openssl], [
 +  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
 +  found=yes], [found=no])
  
    if test "x$found" = "xyes"; then
--    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
--    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
      AC_SUBST(NO_GLOBUS_FLAGS)
-     AC_SUBST(OPENSSL_LIBS)
-     AC_MSG_CHECKING([for system OpenSSL version])
-@@ -105,11 +95,10 @@
+@@ -125,11 +95,10 @@
  #include <openssl/opensslv.h>
  OPENSSL_VERSION_TEXT
  HERE
@@ -46,7 +64,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
  ])
  
  # AC_GLOBUS checks globus prefix, looks for globus 
-@@ -119,6 +108,11 @@
+@@ -139,6 +108,11 @@
  # -------------------------------------------------------
  AC_DEFUN([AC_GLOBUS],
  [
@@ -58,7 +76,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
      AC_ARG_WITH(globus_prefix,
  	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
  	[with_globus_prefix="$withval"],
-@@ -165,6 +159,8 @@
+@@ -185,6 +159,8 @@
  
      AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
  


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- voms.spec	21 Oct 2009 15:56:48 -0000	1.3
+++ voms.spec	31 Dec 2009 14:11:52 -0000	1.4
@@ -1,7 +1,7 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.14.2
+Version:	1.9.14.3
 Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
@@ -10,9 +10,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_14_2 \
-#		  -d voms-1.9.14.2 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.14.2.tar.gz voms-1.9.14.2
+#		  -r glite-security-voms_R_1_9_14_3 \
+#		  -d voms-1.9.14.3 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.14.3.tar.gz voms-1.9.14.3
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -64,6 +64,9 @@ Patch14:	%{name}-pipe-buf.patch
 #		Make sure -L/usr/lib and -L/usr/lib64 is not used
 #		https://savannah.cern.ch/bugs/?57261
 Patch15:	%{name}-expat.patch
+#		Add missing dependencies for stricter binutils
+#		https://savannah.cern.ch/bugs/?60979
+Patch16:	%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -221,6 +224,7 @@ Virtual Organization Membership Service 
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -460,6 +464,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
+- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)
+
 * Tue Oct 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.2-1
 - Upstream 1.9.14.2 (CVS tag glite-security-voms_R_1_9_14_2)
 



From ellert at fedoraproject.org  Thu Dec 31 14:12:54 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 31 Dec 2009 14:12:54 +0000 (UTC)
Subject: rpms/voms/F-11 voms-deps.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 import.log, 1.3, 1.4 sources, 1.4,
	1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
Message-ID: <20091231141254.302F111C018B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2068/F-11

Modified Files:
	.cvsignore import.log sources voms-distribution-globus.patch 
	voms.spec 
Added Files:
	voms-deps.patch 
Log Message:
* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)


voms-deps.patch:
 client/Makefile.am |    2 +-
 server/Makefile.am |    2 +-
 utils/Makefile.am  |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE voms-deps.patch ---
diff -ur voms-1.9.14.3.orig/src/client/Makefile.am voms-1.9.14.3/src/client/Makefile.am
--- voms-1.9.14.3.orig/src/client/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/client/Makefile.am	2009-12-29 00:18:17.405868413 +0100
@@ -12,7 +12,7 @@
 voms_proxy_init_LDADD = \
   $(top_builddir)/src/api/ccapi/libvomsapi_nog.la \
   $(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+  $(OPENSSL_LIBS) -lpthread
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/api/ccapi \
 	-I$(top_srcdir)/src/include \
diff -ur voms-1.9.14.3.orig/src/server/Makefile.am voms-1.9.14.3/src/server/Makefile.am
--- voms-1.9.14.3.orig/src/server/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/server/Makefile.am	2009-12-29 00:19:18.580869075 +0100
@@ -20,7 +20,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/api/ccapi/$(USE_CCAPI_LIB) \
-	$(EXPAT_LIBS)
+	$(EXPAT_LIBS) -lpthread
 
 voms_LDFLAGS =
 
diff -ur voms-1.9.14.3.orig/src/utils/Makefile.am voms-1.9.14.3/src/utils/Makefile.am
--- voms-1.9.14.3.orig/src/utils/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.14.3/src/utils/Makefile.am	2009-12-29 00:16:31.097869074 +0100
@@ -12,7 +12,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_destroy_SOURCES = \
 	voms_proxy_destroy.cc
@@ -22,7 +22,7 @@
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_fake_SOURCES = \
 	vomsfake.h \
@@ -41,7 +41,7 @@
 	$(top_builddir)/src/ac/libattributes_nog.la \
 	$(top_builddir)/src/common/libutilc_nog.la \
 	$(top_builddir)/src/replib/librep.la \
-	$(top_builddir)/src/sslutils/libssl_utils_nog.la
+	$(top_builddir)/src/sslutils/libssl_utils_nog.la -lpthread
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/api/ccapi \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Oct 2009 15:59:58 -0000	1.4
+++ .cvsignore	31 Dec 2009 14:12:53 -0000	1.5
@@ -1 +1 @@
-voms-1.9.14.2.tar.gz
+voms-1.9.14.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	21 Oct 2009 15:59:58 -0000	1.3
+++ import.log	31 Dec 2009 14:12:54 -0000	1.4
@@ -1,3 +1,4 @@
 voms-1_9_11-4_fc11:F-11:voms-1.9.11-4.fc11.src.rpm:1252550034
 voms-1_9_12_1-1_fc11:F-11:voms-1.9.12.1-1.fc11.src.rpm:1253509138
 voms-1_9_14_2-1_fc11:F-11:voms-1.9.14.2-1.fc11.src.rpm:1256140773
+voms-1_9_14_3-1_fc12:F-11:voms-1.9.14.3-1.fc12.src.rpm:1262268706


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2009 15:59:58 -0000	1.4
+++ sources	31 Dec 2009 14:12:54 -0000	1.5
@@ -1 +1 @@
-b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz
+b80d8fc095632807513dab16ae1fe803  voms-1.9.14.3.tar.gz

voms-distribution-globus.patch:
 acinclude.m4 |   46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

Index: voms-distribution-globus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/voms-distribution-globus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-distribution-globus.patch	10 Sep 2009 02:34:27 -0000	1.1
+++ voms-distribution-globus.patch	31 Dec 2009 14:12:54 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
---- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
-+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
+diff -ur voms-1.9.14.3.orig/project/acinclude.m4 voms-1.9.14.3/project/acinclude.m4
+--- voms-1.9.14.3.orig/project/acinclude.m4	2009-11-03 13:30:30.000000000 +0100
++++ voms-1.9.14.3/project/acinclude.m4	2009-12-28 19:29:15.238768642 +0100
 @@ -66,11 +66,6 @@
  # ---------------------------------------------
  AC_DEFUN([AC_OPENSSL],
@@ -13,27 +13,45 @@ diff -ur voms-1.9.8.1.orig/project/acinc
    AC_ARG_WITH(openssl_libs,
                [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
                [ with_openssl_libs="$withval"],
-@@ -80,16 +75,11 @@
+@@ -80,34 +75,9 @@
       AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
    fi  
  
 -  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
--  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
+-
 -
 -  AC_LANG_PUSH(C)
--  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
+-
+-  save_LIBS=$LIBS
+-  LIBS="-L$with_openssl_prefix/lib64 -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found64=yes], [found64=no])
+-
+-  LIBS="$with_openssl_prefix/lib -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found32=yes], [found32=no])
 -  AC_LANG_POP(C) 
+-
+-  LIBS=$save_LIBS
+-
+-  if test "x$found64" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib64 -lcrypto -lssl"
+-    found=yes
+-  elif test "x$found32" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
+-    found=yes
+-  fi   
 +  PKG_CHECK_MODULES(OPENSSL, [openssl], [
 +  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
 +  found=yes], [found=no])
  
    if test "x$found" = "xyes"; then
--    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
--    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
      AC_SUBST(NO_GLOBUS_FLAGS)
-     AC_SUBST(OPENSSL_LIBS)
-     AC_MSG_CHECKING([for system OpenSSL version])
-@@ -105,11 +95,10 @@
+@@ -125,11 +95,10 @@
  #include <openssl/opensslv.h>
  OPENSSL_VERSION_TEXT
  HERE
@@ -46,7 +64,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
  ])
  
  # AC_GLOBUS checks globus prefix, looks for globus 
-@@ -119,6 +108,11 @@
+@@ -139,6 +108,11 @@
  # -------------------------------------------------------
  AC_DEFUN([AC_GLOBUS],
  [
@@ -58,7 +76,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
      AC_ARG_WITH(globus_prefix,
  	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
  	[with_globus_prefix="$withval"],
-@@ -165,6 +159,8 @@
+@@ -185,6 +159,8 @@
  
      AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
  


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/voms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- voms.spec	21 Oct 2009 15:59:58 -0000	1.3
+++ voms.spec	31 Dec 2009 14:12:54 -0000	1.4
@@ -1,7 +1,7 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.14.2
+Version:	1.9.14.3
 Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
@@ -10,9 +10,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_14_2 \
-#		  -d voms-1.9.14.2 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.14.2.tar.gz voms-1.9.14.2
+#		  -r glite-security-voms_R_1_9_14_3 \
+#		  -d voms-1.9.14.3 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.14.3.tar.gz voms-1.9.14.3
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -64,6 +64,9 @@ Patch14:	%{name}-pipe-buf.patch
 #		Make sure -L/usr/lib and -L/usr/lib64 is not used
 #		https://savannah.cern.ch/bugs/?57261
 Patch15:	%{name}-expat.patch
+#		Add missing dependencies for stricter binutils
+#		https://savannah.cern.ch/bugs/?60979
+Patch16:	%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -221,6 +224,7 @@ Virtual Organization Membership Service 
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -460,6 +464,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
+- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)
+
 * Tue Oct 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.2-1
 - Upstream 1.9.14.2 (CVS tag glite-security-voms_R_1_9_14_2)
 



From ellert at fedoraproject.org  Thu Dec 31 14:14:23 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 31 Dec 2009 14:14:23 +0000 (UTC)
Subject: rpms/voms/EL-5 voms-deps.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 import.log, 1.3, 1.4 sources, 1.4,
	1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
Message-ID: <20091231141423.3529711C018B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2409/EL-5

Modified Files:
	.cvsignore import.log sources voms-distribution-globus.patch 
	voms.spec 
Added Files:
	voms-deps.patch 
Log Message:
* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)


voms-deps.patch:
 client/Makefile.am |    2 +-
 server/Makefile.am |    2 +-
 utils/Makefile.am  |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE voms-deps.patch ---
diff -ur voms-1.9.14.3.orig/src/client/Makefile.am voms-1.9.14.3/src/client/Makefile.am
--- voms-1.9.14.3.orig/src/client/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/client/Makefile.am	2009-12-29 00:18:17.405868413 +0100
@@ -12,7 +12,7 @@
 voms_proxy_init_LDADD = \
   $(top_builddir)/src/api/ccapi/libvomsapi_nog.la \
   $(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+  $(OPENSSL_LIBS) -lpthread
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/api/ccapi \
 	-I$(top_srcdir)/src/include \
diff -ur voms-1.9.14.3.orig/src/server/Makefile.am voms-1.9.14.3/src/server/Makefile.am
--- voms-1.9.14.3.orig/src/server/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/server/Makefile.am	2009-12-29 00:19:18.580869075 +0100
@@ -20,7 +20,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/api/ccapi/$(USE_CCAPI_LIB) \
-	$(EXPAT_LIBS)
+	$(EXPAT_LIBS) -lpthread
 
 voms_LDFLAGS =
 
diff -ur voms-1.9.14.3.orig/src/utils/Makefile.am voms-1.9.14.3/src/utils/Makefile.am
--- voms-1.9.14.3.orig/src/utils/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.14.3/src/utils/Makefile.am	2009-12-29 00:16:31.097869074 +0100
@@ -12,7 +12,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_destroy_SOURCES = \
 	voms_proxy_destroy.cc
@@ -22,7 +22,7 @@
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_fake_SOURCES = \
 	vomsfake.h \
@@ -41,7 +41,7 @@
 	$(top_builddir)/src/ac/libattributes_nog.la \
 	$(top_builddir)/src/common/libutilc_nog.la \
 	$(top_builddir)/src/replib/librep.la \
-	$(top_builddir)/src/sslutils/libssl_utils_nog.la
+	$(top_builddir)/src/sslutils/libssl_utils_nog.la -lpthread
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/api/ccapi \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Oct 2009 16:02:58 -0000	1.4
+++ .cvsignore	31 Dec 2009 14:14:22 -0000	1.5
@@ -1 +1 @@
-voms-1.9.14.2.tar.gz
+voms-1.9.14.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	21 Oct 2009 16:02:58 -0000	1.3
+++ import.log	31 Dec 2009 14:14:23 -0000	1.4
@@ -1,3 +1,4 @@
 voms-1_9_11-4_el5:EL-5:voms-1.9.11-4.el5.src.rpm:1252550329
 voms-1_9_12_1-1_el5:EL-5:voms-1.9.12.1-1.el5.src.rpm:1253509256
 voms-1_9_14_2-1_el5:EL-5:voms-1.9.14.2-1.el5.src.rpm:1256140945
+voms-1_9_14_3-1_el5:EL-5:voms-1.9.14.3-1.el5.src.rpm:1262268784


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2009 16:02:58 -0000	1.4
+++ sources	31 Dec 2009 14:14:23 -0000	1.5
@@ -1 +1 @@
-b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz
+b80d8fc095632807513dab16ae1fe803  voms-1.9.14.3.tar.gz

voms-distribution-globus.patch:
 acinclude.m4 |   46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

Index: voms-distribution-globus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/voms-distribution-globus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-distribution-globus.patch	10 Sep 2009 02:39:25 -0000	1.1
+++ voms-distribution-globus.patch	31 Dec 2009 14:14:23 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
---- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
-+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
+diff -ur voms-1.9.14.3.orig/project/acinclude.m4 voms-1.9.14.3/project/acinclude.m4
+--- voms-1.9.14.3.orig/project/acinclude.m4	2009-11-03 13:30:30.000000000 +0100
++++ voms-1.9.14.3/project/acinclude.m4	2009-12-28 19:29:15.238768642 +0100
 @@ -66,11 +66,6 @@
  # ---------------------------------------------
  AC_DEFUN([AC_OPENSSL],
@@ -13,27 +13,45 @@ diff -ur voms-1.9.8.1.orig/project/acinc
    AC_ARG_WITH(openssl_libs,
                [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
                [ with_openssl_libs="$withval"],
-@@ -80,16 +75,11 @@
+@@ -80,34 +75,9 @@
       AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
    fi  
  
 -  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
--  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
+-
 -
 -  AC_LANG_PUSH(C)
--  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
+-
+-  save_LIBS=$LIBS
+-  LIBS="-L$with_openssl_prefix/lib64 -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found64=yes], [found64=no])
+-
+-  LIBS="$with_openssl_prefix/lib -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found32=yes], [found32=no])
 -  AC_LANG_POP(C) 
+-
+-  LIBS=$save_LIBS
+-
+-  if test "x$found64" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib64 -lcrypto -lssl"
+-    found=yes
+-  elif test "x$found32" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
+-    found=yes
+-  fi   
 +  PKG_CHECK_MODULES(OPENSSL, [openssl], [
 +  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
 +  found=yes], [found=no])
  
    if test "x$found" = "xyes"; then
--    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
--    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
      AC_SUBST(NO_GLOBUS_FLAGS)
-     AC_SUBST(OPENSSL_LIBS)
-     AC_MSG_CHECKING([for system OpenSSL version])
-@@ -105,11 +95,10 @@
+@@ -125,11 +95,10 @@
  #include <openssl/opensslv.h>
  OPENSSL_VERSION_TEXT
  HERE
@@ -46,7 +64,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
  ])
  
  # AC_GLOBUS checks globus prefix, looks for globus 
-@@ -119,6 +108,11 @@
+@@ -139,6 +108,11 @@
  # -------------------------------------------------------
  AC_DEFUN([AC_GLOBUS],
  [
@@ -58,7 +76,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
      AC_ARG_WITH(globus_prefix,
  	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
  	[with_globus_prefix="$withval"],
-@@ -165,6 +159,8 @@
+@@ -185,6 +159,8 @@
  
      AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
  


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/voms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- voms.spec	21 Oct 2009 16:02:58 -0000	1.3
+++ voms.spec	31 Dec 2009 14:14:23 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		voms
-Version:	1.9.14.2
+Version:	1.9.14.3
 Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
@@ -8,9 +8,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_14_2 \
-#		  -d voms-1.9.14.2 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.14.2.tar.gz voms-1.9.14.2
+#		  -r glite-security-voms_R_1_9_14_3 \
+#		  -d voms-1.9.14.3 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.14.3.tar.gz voms-1.9.14.3
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -62,6 +62,9 @@ Patch14:	%{name}-pipe-buf.patch
 #		Make sure -L/usr/lib and -L/usr/lib64 is not used
 #		https://savannah.cern.ch/bugs/?57261
 Patch15:	%{name}-expat.patch
+#		Add missing dependencies for stricter binutils
+#		https://savannah.cern.ch/bugs/?60979
+Patch16:	%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -170,6 +173,7 @@ administrate it remotely using command l
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -361,6 +365,9 @@ fi
 %doc INSTALL.Fedora
 
 %changelog
+* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
+- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)
+
 * Tue Oct 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.2-1
 - Upstream 1.9.14.2 (CVS tag glite-security-voms_R_1_9_14_2)
 



From ellert at fedoraproject.org  Thu Dec 31 14:15:36 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Thu, 31 Dec 2009 14:15:36 +0000 (UTC)
Subject: rpms/voms/EL-4 voms-deps.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 import.log, 1.3, 1.4 sources, 1.4,
	1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
Message-ID: <20091231141536.31F8511C018B@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2776/EL-4

Modified Files:
	.cvsignore import.log sources voms-distribution-globus.patch 
	voms.spec 
Added Files:
	voms-deps.patch 
Log Message:
* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)


voms-deps.patch:
 client/Makefile.am |    2 +-
 server/Makefile.am |    2 +-
 utils/Makefile.am  |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE voms-deps.patch ---
diff -ur voms-1.9.14.3.orig/src/client/Makefile.am voms-1.9.14.3/src/client/Makefile.am
--- voms-1.9.14.3.orig/src/client/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/client/Makefile.am	2009-12-29 00:18:17.405868413 +0100
@@ -12,7 +12,7 @@
 voms_proxy_init_LDADD = \
   $(top_builddir)/src/api/ccapi/libvomsapi_nog.la \
   $(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+  $(OPENSSL_LIBS) -lpthread
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/api/ccapi \
 	-I$(top_srcdir)/src/include \
diff -ur voms-1.9.14.3.orig/src/server/Makefile.am voms-1.9.14.3/src/server/Makefile.am
--- voms-1.9.14.3.orig/src/server/Makefile.am	2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/server/Makefile.am	2009-12-29 00:19:18.580869075 +0100
@@ -20,7 +20,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/api/ccapi/$(USE_CCAPI_LIB) \
-	$(EXPAT_LIBS)
+	$(EXPAT_LIBS) -lpthread
 
 voms_LDFLAGS =
 
diff -ur voms-1.9.14.3.orig/src/utils/Makefile.am voms-1.9.14.3/src/utils/Makefile.am
--- voms-1.9.14.3.orig/src/utils/Makefile.am	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.14.3/src/utils/Makefile.am	2009-12-29 00:16:31.097869074 +0100
@@ -12,7 +12,7 @@
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_destroy_SOURCES = \
 	voms_proxy_destroy.cc
@@ -22,7 +22,7 @@
 	$(top_builddir)/src/sslutils/libssl_utils_nog.la \
 	$(top_builddir)/src/replib/librep.la \
 	$(top_builddir)/src/log/liblog.la \
-	$(EXPAT_LIBS)
+	$(OPENSSL_LIBS) -lpthread
 
 voms_proxy_fake_SOURCES = \
 	vomsfake.h \
@@ -41,7 +41,7 @@
 	$(top_builddir)/src/ac/libattributes_nog.la \
 	$(top_builddir)/src/common/libutilc_nog.la \
 	$(top_builddir)/src/replib/librep.la \
-	$(top_builddir)/src/sslutils/libssl_utils_nog.la
+	$(top_builddir)/src/sslutils/libssl_utils_nog.la -lpthread
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/api/ccapi \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Oct 2009 16:04:09 -0000	1.4
+++ .cvsignore	31 Dec 2009 14:15:36 -0000	1.5
@@ -1 +1 @@
-voms-1.9.14.2.tar.gz
+voms-1.9.14.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	21 Oct 2009 16:04:09 -0000	1.3
+++ import.log	31 Dec 2009 14:15:36 -0000	1.4
@@ -1,3 +1,4 @@
 voms-1_9_11-4_el5:EL-4:voms-1.9.11-4.el5.src.rpm:1252550473
 voms-1_9_12_1-1_el5:EL-4:voms-1.9.12.1-1.el5.src.rpm:1253509314
 voms-1_9_14_2-1_el5:EL-4:voms-1.9.14.2-1.el5.src.rpm:1256141012
+voms-1_9_14_3-1_el5:EL-4:voms-1.9.14.3-1.el5.src.rpm:1262268862


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2009 16:04:09 -0000	1.4
+++ sources	31 Dec 2009 14:15:36 -0000	1.5
@@ -1 +1 @@
-b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz
+b80d8fc095632807513dab16ae1fe803  voms-1.9.14.3.tar.gz

voms-distribution-globus.patch:
 acinclude.m4 |   46 +++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

Index: voms-distribution-globus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/voms-distribution-globus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-distribution-globus.patch	10 Sep 2009 02:41:42 -0000	1.1
+++ voms-distribution-globus.patch	31 Dec 2009 14:15:36 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
---- voms-1.9.8.1.orig/project/acinclude.m4	2009-04-07 11:05:28.000000000 +0200
-+++ voms-1.9.8.1/project/acinclude.m4	2009-06-30 09:04:36.933377506 +0200
+diff -ur voms-1.9.14.3.orig/project/acinclude.m4 voms-1.9.14.3/project/acinclude.m4
+--- voms-1.9.14.3.orig/project/acinclude.m4	2009-11-03 13:30:30.000000000 +0100
++++ voms-1.9.14.3/project/acinclude.m4	2009-12-28 19:29:15.238768642 +0100
 @@ -66,11 +66,6 @@
  # ---------------------------------------------
  AC_DEFUN([AC_OPENSSL],
@@ -13,27 +13,45 @@ diff -ur voms-1.9.8.1.orig/project/acinc
    AC_ARG_WITH(openssl_libs,
                [ --with-openssl-libs do you want OpenSSL only libs? (yes)],
                [ with_openssl_libs="$withval"],
-@@ -80,16 +75,11 @@
+@@ -80,34 +75,9 @@
       AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
    fi  
  
 -  SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
--  LD_LIBRARY_PATH="$with_openssl_prefix/lib"
+-
 -
 -  AC_LANG_PUSH(C)
--  AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
+-
+-  save_LIBS=$LIBS
+-  LIBS="-L$with_openssl_prefix/lib64 -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found64=yes], [found64=no])
+-
+-  LIBS="$with_openssl_prefix/lib -lcrypto"
+-  AC_TRY_LINK([#include <openssl/opensslv.h>],
+-  		[int version = OPENSSL_VERSION_NUMBER; ], 
+-		[found32=yes], [found32=no])
 -  AC_LANG_POP(C) 
+-
+-  LIBS=$save_LIBS
+-
+-  if test "x$found64" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib64 -lcrypto -lssl"
+-    found=yes
+-  elif test "x$found32" = "xyes" ; then
+-    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+-    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
+-    found=yes
+-  fi   
 +  PKG_CHECK_MODULES(OPENSSL, [openssl], [
 +  NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
 +  found=yes], [found=no])
  
    if test "x$found" = "xyes"; then
--    NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
--    OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
      AC_SUBST(NO_GLOBUS_FLAGS)
-     AC_SUBST(OPENSSL_LIBS)
-     AC_MSG_CHECKING([for system OpenSSL version])
-@@ -105,11 +95,10 @@
+@@ -125,11 +95,10 @@
  #include <openssl/opensslv.h>
  OPENSSL_VERSION_TEXT
  HERE
@@ -46,7 +64,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
  ])
  
  # AC_GLOBUS checks globus prefix, looks for globus 
-@@ -119,6 +108,11 @@
+@@ -139,6 +108,11 @@
  # -------------------------------------------------------
  AC_DEFUN([AC_GLOBUS],
  [
@@ -58,7 +76,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
      AC_ARG_WITH(globus_prefix,
  	[  --with-globus-prefix=PFX     prefix where GLOBUS is installed. (/opt/globus)],
  	[with_globus_prefix="$withval"],
-@@ -165,6 +159,8 @@
+@@ -185,6 +159,8 @@
  
      AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
  


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/voms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- voms.spec	21 Oct 2009 16:04:09 -0000	1.3
+++ voms.spec	31 Dec 2009 14:15:36 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		voms
-Version:	1.9.14.2
+Version:	1.9.14.3
 Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
@@ -8,9 +8,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_14_2 \
-#		  -d voms-1.9.14.2 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.14.2.tar.gz voms-1.9.14.2
+#		  -r glite-security-voms_R_1_9_14_3 \
+#		  -d voms-1.9.14.3 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.14.3.tar.gz voms-1.9.14.3
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -62,6 +62,9 @@ Patch14:	%{name}-pipe-buf.patch
 #		Make sure -L/usr/lib and -L/usr/lib64 is not used
 #		https://savannah.cern.ch/bugs/?57261
 Patch15:	%{name}-expat.patch
+#		Add missing dependencies for stricter binutils
+#		https://savannah.cern.ch/bugs/?60979
+Patch16:	%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -170,6 +173,7 @@ administrate it remotely using command l
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -361,6 +365,9 @@ fi
 %doc INSTALL.Fedora
 
 %changelog
+* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
+- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)
+
 * Tue Oct 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.2-1
 - Upstream 1.9.14.2 (CVS tag glite-security-voms_R_1_9_14_2)
 



From dwalsh at fedoraproject.org  Thu Dec 31 14:18:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 31 Dec 2009 14:18:30 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.25,1.26
Message-ID: <20091231141830.8561911C018B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3231

Modified Files:
	policy-F13.patch 
Log Message:
* Wed Dec 30 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-5
- Lots of fixes found in F12, fixes from Tom London


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   61 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  342 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   33 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  388 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  232 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   70 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  125 ++
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    1 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  458 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   40 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   35 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   21 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   23 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   54 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   90 +
 policy/modules/services/denyhosts.te      |   72 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   27 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   48 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   51 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.fc        |    8 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   38 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   20 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  120 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   17 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   93 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   88 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    8 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/telnet.te         |    1 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  295 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  353 ++++++
 policy/modules/services/xserver.te        |  365 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/getty.te            |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  164 ++
 policy/modules/system/init.te             |  299 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   28 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  210 +++
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  116 ++
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1678 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   12 
 policy/support/obj_perm_sets.spt          |   23 
 policy/users                              |   15 
 382 files changed, 20126 insertions(+), 2780 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- policy-F13.patch	30 Dec 2009 14:44:53 -0000	1.25
+++ policy-F13.patch	31 Dec 2009 14:18:29 -0000	1.26
@@ -20618,12 +20618,12 @@ diff --exclude-from=exclude -N -u -r nsa
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.7.5/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	2009-12-18 11:38:25.000000000 -0500
-+++ serefpolicy-3.7.5/policy/modules/services/prelude.te	2009-12-30 08:34:35.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/services/prelude.te	2009-12-31 08:17:44.000000000 -0500
 @@ -90,6 +90,7 @@
  corenet_tcp_bind_prelude_port(prelude_t)
  corenet_tcp_connect_prelude_port(prelude_t)
  corenet_tcp_connect_postgresql_port(prelude_t)
-+corenet_tcp_connect_mysql_port(prelude_t)
++corenet_tcp_connect_mysqld_port(prelude_t)
  
  dev_read_rand(prelude_t)
  dev_read_urand(prelude_t)
@@ -29244,7 +29244,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +permissive kdump_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.7.5/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-29 20:06:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/libraries.fc	2009-12-31 08:59:50.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -29460,7 +29460,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +316,125 @@
+@@ -307,10 +316,127 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -29586,6 +29586,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +/opt/AutoScan/usr/lib/libvte\.so.*			     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/usr/bin/bsnes		     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib/firefox/plugins/libractrl\.so	     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.7.5/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.7.5/policy/modules/system/libraries.if	2009-12-21 13:07:09.000000000 -0500
@@ -32559,7 +32561,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.7.5/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.7.5/policy/modules/system/userdomain.if	2009-12-21 13:07:09.000000000 -0500
++++ serefpolicy-3.7.5/policy/modules/system/userdomain.if	2009-12-31 08:43:59.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -33916,7 +33918,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1686,11 +1875,11 @@
+@@ -1686,11 +1875,12 @@
  #
  interface(`userdom_dontaudit_read_user_home_content_files',`
  	gen_require(`
@@ -33928,10 +33930,11 @@ diff --exclude-from=exclude -N -u -r nsa
 -	dontaudit $1 user_home_t:file read_file_perms;
 +	dontaudit $1 user_home_type:dir list_dir_perms;
 +	dontaudit $1 user_home_type:file read_file_perms;
++	dontaudit $1 user_home_t:lnk_file read_lnk_file_perms;
  ')
  
  ########################################
-@@ -1797,19 +1986,32 @@
+@@ -1797,19 +1987,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -33971,7 +33974,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -1844,6 +2046,7 @@
+@@ -1844,6 +2047,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -33979,7 +33982,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2196,6 +2399,25 @@
+@@ -2196,6 +2400,25 @@
  
  ########################################
  ## <summary>
@@ -34005,7 +34008,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ##	Do not audit attempts to manage users
  ##	temporary files.
  ## </summary>
-@@ -2276,7 +2498,7 @@
+@@ -2276,7 +2499,7 @@
  ########################################
  ## <summary>
  ##	Create, read, write, and delete user
@@ -34014,7 +34017,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2284,19 +2506,19 @@
+@@ -2284,19 +2507,19 @@
  ##	</summary>
  ## </param>
  #
@@ -34037,7 +34040,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2304,19 +2526,19 @@
+@@ -2304,19 +2527,19 @@
  ##	</summary>
  ## </param>
  #
@@ -34060,7 +34063,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2324,12 +2546,52 @@
+@@ -2324,12 +2547,52 @@
  ##	</summary>
  ## </param>
  #
@@ -34115,7 +34118,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	files_search_tmp($1)
  ')
  
-@@ -2391,7 +2653,7 @@
+@@ -2391,7 +2654,7 @@
  
  ########################################
  ## <summary>
@@ -34124,7 +34127,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2399,19 +2661,21 @@
+@@ -2399,19 +2662,21 @@
  ##	</summary>
  ## </param>
  #
@@ -34150,7 +34153,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2419,15 +2683,14 @@
+@@ -2419,15 +2684,14 @@
  ##	</summary>
  ## </param>
  #
@@ -34170,7 +34173,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -2749,7 +3012,7 @@
+@@ -2749,7 +3013,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -34179,7 +34182,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +3028,33 @@
+@@ -2765,11 +3029,33 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -34215,7 +34218,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -2897,7 +3182,43 @@
+@@ -2897,7 +3183,43 @@
  		type user_tmp_t;
  	')
  
@@ -34260,7 +34263,7 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -2934,6 +3255,7 @@
+@@ -2934,6 +3256,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -34268,7 +34271,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3386,656 @@
+@@ -3064,3 +3387,656 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')



From dwalsh at fedoraproject.org  Thu Dec 31 14:19:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 31 Dec 2009 14:19:55 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.162,1.163
Message-ID: <20091231141955.DC9DC11C018B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3563

Modified Files:
	policy-F12.patch 
Log Message:
* Wed Dec 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-65
- Allow traceroute to use all terms
- Fix mgetty use for faxes
- Dontaudit xdm listing fusefs
- Allow xguest to resolve host names
- Allow abrt to read noxattr filesystems (cdrom)
- Allow abrt_helper to send itself signals
- Allow amavis to read certs
- Allow apache to bind to port 3000 (Ruby on rails)
- Asterist uses mysql and snmp
- Allow consolekit to write wtmp file for shutdown
- Allow cups ipc_lock
- Allow hal to transition to ppp
- Fix mailman labels for 64 bit systems
- dontaudit system_mail access to leaked terminals
- Allow mysqld_safe_t to unlink mysqld pid files
- nrpe_t uses getpw calls
- Allow NetworkManager to delete ppp pid files
- Allow pptp_t to sens userdomain signals
- Allow prelude to connect to mysql
- Allow swat to start winbind server
- Fixes for snort
- Allow telnetd to setattr user terminals
- Allow qemu to read fusefs
- Allow domains that have telinit to connectto upstart unix_stream_socket
- Dontaudit ipsec_mgmt sys_tty_config
- Fix labels for postgrestgres test suite
- Other textrel_shlib_t fixes


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   82 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  188 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  189 +++
 policy/modules/apps/sandbox.te            |  338 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   50 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   50 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  475 ++++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  442 +++++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  442 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   71 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  122 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    3 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  458 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   41 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   20 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   55 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   35 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   54 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   18 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.fc        |    7 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   38 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   25 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  120 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   32 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   68 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   17 
 policy/modules/services/prelude.te        |    4 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   93 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   88 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    8 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/telnet.te         |    1 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   60 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  296 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  665 ++++++++++-
 policy/modules/services/xserver.te        |  385 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/getty.te            |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  185 +++
 policy/modules/system/init.te             |  292 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   79 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   23 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  209 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   93 +
 policy/modules/system/miscfiles.te        |    5 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   83 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  116 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1703 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  146 ++
 policy/support/obj_perm_sets.spt          |   34 
 policy/users                              |   13 
 416 files changed, 22070 insertions(+), 2854 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- policy-F12.patch	30 Dec 2009 14:40:37 -0000	1.162
+++ policy-F12.patch	31 Dec 2009 14:19:55 -0000	1.163
@@ -21849,12 +21849,12 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.6.32/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/prelude.te	2009-12-30 08:34:13.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/prelude.te	2009-12-31 08:18:05.000000000 -0500
 @@ -90,6 +90,7 @@
  corenet_tcp_bind_prelude_port(prelude_t)
  corenet_tcp_connect_prelude_port(prelude_t)
  corenet_tcp_connect_postgresql_port(prelude_t)
-+corenet_tcp_connect_mysql_port(prelude_t)
++corenet_tcp_connect_mysqld_port(prelude_t)
  
  dev_read_rand(prelude_t)
  dev_read_urand(prelude_t)
@@ -31819,7 +31819,7 @@ diff -b -B --ignore-all-space --exclude-
 +permissive kdump_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-29 20:06:16.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-12-31 08:59:58.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -32027,7 +32027,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +309,129 @@
+@@ -307,10 +309,131 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -32157,6 +32157,8 @@ diff -b -B --ignore-all-space --exclude-
 +/opt/AutoScan/usr/lib/libvte\.so.*			     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/usr/bin/bsnes		     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib/firefox/plugins/libractrl\.so	     --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.6.32/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-09-16 10:01:19.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-12-17 11:20:47.000000000 -0500
@@ -35709,7 +35711,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-09-16 10:01:19.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-29 18:41:02.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-12-31 08:43:42.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -37089,7 +37091,7 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1686,11 +1890,11 @@
+@@ -1686,11 +1890,12 @@
  #
  interface(`userdom_dontaudit_read_user_home_content_files',`
  	gen_require(`
@@ -37101,10 +37103,11 @@ diff -b -B --ignore-all-space --exclude-
 -	dontaudit $1 user_home_t:file read_file_perms;
 +	dontaudit $1 user_home_type:dir list_dir_perms;
 +	dontaudit $1 user_home_type:file read_file_perms;
++	dontaudit $1 user_home_t:lnk_file read_lnk_file_perms;
  ')
  
  ########################################
-@@ -1797,19 +2001,32 @@
+@@ -1797,19 +2002,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -37144,7 +37147,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2061,7 @@
+@@ -1844,6 +2062,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -37152,7 +37155,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2196,7 +2414,7 @@
+@@ -2196,7 +2415,7 @@
  
  ########################################
  ## <summary>
@@ -37161,7 +37164,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	temporary files.
  ## </summary>
  ## <param name="domain">
-@@ -2205,17 +2423,36 @@
+@@ -2205,17 +2424,36 @@
  ##	</summary>
  ## </param>
  #
@@ -37201,7 +37204,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2276,6 +2513,46 @@
+@@ -2276,6 +2514,46 @@
  ########################################
  ## <summary>
  ##	Create, read, write, and delete user
@@ -37248,7 +37251,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	temporary symbolic links.
  ## </summary>
  ## <param name="domain">
-@@ -2391,7 +2668,7 @@
+@@ -2391,7 +2669,7 @@
  
  ########################################
  ## <summary>
@@ -37257,7 +37260,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2399,19 +2676,20 @@
+@@ -2399,19 +2677,20 @@
  ##	</summary>
  ## </param>
  #
@@ -37281,7 +37284,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2419,7 +2697,7 @@
+@@ -2419,7 +2698,7 @@
  ##	</summary>
  ## </param>
  #
@@ -37290,7 +37293,7 @@ diff -b -B --ignore-all-space --exclude-
  	gen_require(`
  		type user_tmpfs_t;
  	')
-@@ -2430,6 +2708,26 @@
+@@ -2430,6 +2709,26 @@
  	fs_search_tmpfs($1)
  ')
  
@@ -37317,7 +37320,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Get the attributes of a user domain tty.
-@@ -2749,7 +3047,7 @@
+@@ -2749,7 +3048,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -37326,7 +37329,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +3063,33 @@
+@@ -2765,11 +3064,33 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -37362,7 +37365,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3217,43 @@
+@@ -2897,7 +3218,43 @@
  		type user_tmp_t;
  	')
  
@@ -37407,7 +37410,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3290,7 @@
+@@ -2934,6 +3291,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -37415,7 +37418,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3421,656 @@
+@@ -3064,3 +3422,656 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')



From dwalsh at fedoraproject.org  Thu Dec 31 14:29:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 31 Dec 2009 14:29:26 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F13.patch,1.26,1.27
Message-ID: <20091231142926.AE9C411C018B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5272

Modified Files:
	policy-F13.patch 
Log Message:
* Wed Dec 30 2009 Dan Walsh <dwalsh at redhat.com> 3.7.5-5
- Lots of fixes found in F12, fixes from Tom London


policy-F13.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.te            |    5 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   78 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    5 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   83 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  103 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   13 
 policy/modules/apps/gnome.if              |  197 +++
 policy/modules/apps/gnome.te              |  113 +-
 policy/modules/apps/java.fc               |   23 
 policy/modules/apps/java.if               |  113 +-
 policy/modules/apps/java.te               |   18 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   27 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  321 +++++
 policy/modules/apps/nsplugin.te           |  296 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   92 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    2 
 policy/modules/apps/ptchown.if            |   24 
 policy/modules/apps/pulseaudio.fc         |    3 
 policy/modules/apps/pulseaudio.if         |   42 
 policy/modules/apps/pulseaudio.te         |   19 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   83 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   61 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  222 +++
 policy/modules/apps/sandbox.te            |  342 ++++++
 policy/modules/apps/screen.if             |    1 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.if          |    2 
 policy/modules/apps/seunshare.te          |    3 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  114 ++
 policy/modules/apps/wine.te               |   32 
 policy/modules/kernel/corecommands.fc     |   33 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   44 
 policy/modules/kernel/devices.fc          |    3 
 policy/modules/kernel/devices.if          |   54 
 policy/modules/kernel/domain.if           |  174 ++-
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  388 ++++++
 policy/modules/kernel/files.te            |    3 
 policy/modules/kernel/filesystem.if       |  232 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   27 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    1 
 policy/modules/kernel/terminal.if         |   27 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  443 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   70 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  125 ++
 policy/modules/services/afs.fc            |    2 
 policy/modules/services/afs.te            |    2 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 ++
 policy/modules/services/amavis.te         |    1 
 policy/modules/services/apache.fc         |   55 
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  458 ++++++--
 policy/modules/services/apm.te            |    4 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   41 
 policy/modules/services/asterisk.te       |   40 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    1 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/cgroup.fc         |    7 
 policy/modules/services/cgroup.if         |   35 
 policy/modules/services/cgroup.te         |   88 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   21 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   23 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   54 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   53 
 policy/modules/services/dbus.te           |   31 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/denyhosts.fc      |    7 
 policy/modules/services/denyhosts.if      |   90 +
 policy/modules/services/denyhosts.te      |   72 +
 policy/modules/services/devicekit.fc      |    3 
 policy/modules/services/devicekit.if      |   20 
 policy/modules/services/devicekit.te      |   27 
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   48 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 +
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   51 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |    3 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.fc           |    2 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   24 
 policy/modules/services/mailman.fc        |    8 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   31 
 policy/modules/services/mta.te            |   38 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   20 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  192 ++-
 policy/modules/services/networkmanager.fc |   16 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  120 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   20 
 policy/modules/services/nscd.te           |   23 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   34 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    6 
 policy/modules/services/pcscd.if          |   38 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  322 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   67 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   17 
 policy/modules/services/prelude.te        |    1 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   31 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   93 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   88 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    8 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  154 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   80 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/telnet.te         |    1 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.if           |   17 
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.te          |    1 
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   86 +
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  295 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   40 
 policy/modules/services/xserver.if        |  353 ++++++
 policy/modules/services/xserver.te        |  365 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.te      |    7 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    5 
 policy/modules/system/getty.te            |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  164 ++
 policy/modules/system/init.te             |  299 ++++-
 policy/modules/system/ipsec.fc            |    4 
 policy/modules/system/ipsec.if            |   65 -
 policy/modules/system/ipsec.te            |   28 
 policy/modules/system/iptables.fc         |    8 
 policy/modules/system/iptables.te         |    8 
 policy/modules/system/iscsi.te            |    7 
 policy/modules/system/kdump.te            |    2 
 policy/modules/system/libraries.fc        |  210 +++
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   10 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   33 
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.te         |   20 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   57 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.te             |    2 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/sysnetwork.fc       |   12 
 policy/modules/system/sysnetwork.if       |  116 ++
 policy/modules/system/sysnetwork.te       |   79 +
 policy/modules/system/udev.if             |    1 
 policy/modules/system/udev.te             |   12 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1678 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.if              |   19 
 policy/modules/system/xen.te              |   12 
 policy/support/obj_perm_sets.spt          |   23 
 policy/users                              |   15 
 382 files changed, 20126 insertions(+), 2780 deletions(-)

Index: policy-F13.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F13.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- policy-F13.patch	31 Dec 2009 14:18:29 -0000	1.26
+++ policy-F13.patch	31 Dec 2009 14:29:25 -0000	1.27
@@ -33930,7 +33930,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -	dontaudit $1 user_home_t:file read_file_perms;
 +	dontaudit $1 user_home_type:dir list_dir_perms;
 +	dontaudit $1 user_home_type:file read_file_perms;
-+	dontaudit $1 user_home_t:lnk_file read_lnk_file_perms;
++	dontaudit $1 user_home_type:lnk_file read_lnk_file_perms;
  ')
  
  ########################################



From gavin at fedoraproject.org  Thu Dec 31 14:29:58 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Thu, 31 Dec 2009 14:29:58 +0000 (UTC)
Subject: File report-0.4.tar.gz uploaded to lookaside cache by gavin
Message-ID: <20091231142958.8B1E910F8D5@bastion.fedoraproject.org>

A file has been added to the lookaside cache for report:

6b87449282f7adfe9e78211192d7d32c  report-0.4.tar.gz



From dwalsh at fedoraproject.org  Thu Dec 31 14:31:00 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 31 Dec 2009 14:31:00 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.163,1.164
Message-ID: <20091231143100.79DAB11C018B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5755

Modified Files:
	policy-F12.patch 
Log Message:
* Wed Dec 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-65
- Allow traceroute to use all terms
- Fix mgetty use for faxes
- Dontaudit xdm listing fusefs
- Allow xguest to resolve host names
- Allow abrt to read noxattr filesystems (cdrom)
- Allow abrt_helper to send itself signals
- Allow amavis to read certs
- Allow apache to bind to port 3000 (Ruby on rails)
- Asterist uses mysql and snmp
- Allow consolekit to write wtmp file for shutdown
- Allow cups ipc_lock
- Allow hal to transition to ppp
- Fix mailman labels for 64 bit systems
- dontaudit system_mail access to leaked terminals
- Allow mysqld_safe_t to unlink mysqld pid files
- nrpe_t uses getpw calls
- Allow NetworkManager to delete ppp pid files
- Allow pptp_t to sens userdomain signals
- Allow prelude to connect to mysql
- Allow swat to start winbind server
- Fixes for snort
- Allow telnetd to setattr user terminals
- Allow qemu to read fusefs
- Allow domains that have telinit to connectto upstart unix_stream_socket
- Dontaudit ipsec_mgmt sys_tty_config
- Fix labels for postgrestgres test suite
- Other textrel_shlib_t fixes


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/alsa.te              |    2 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/consoletype.te       |    3 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.fc            |    2 
 policy/modules/admin/kismet.te            |   14 
 policy/modules/admin/logrotate.te         |   27 
 policy/modules/admin/logwatch.te          |    8 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.fc           |    1 
 policy/modules/admin/prelink.if           |   23 
 policy/modules/admin/prelink.te           |   77 +
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   21 
 policy/modules/admin/rpm.if               |  344 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    6 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    9 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   66 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |   12 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |   11 
 policy/modules/admin/usermanage.te        |   35 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   86 +
 policy/modules/apps/chrome.te             |   82 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   42 
 policy/modules/apps/execmem.if            |  104 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |   23 
 policy/modules/apps/firewallgui.te        |   64 +
 policy/modules/apps/gitosis.if            |   45 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  188 +++
 policy/modules/apps/gnome.te              |   99 +
 policy/modules/apps/gpg.te                |   20 
 policy/modules/apps/java.fc               |   24 
 policy/modules/apps/java.if               |  114 +-
 policy/modules/apps/java.te               |   19 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   67 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 
 policy/modules/apps/livecd.te             |   28 
 policy/modules/apps/loadkeys.te           |    6 
 policy/modules/apps/mono.fc               |    2 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   68 +
 policy/modules/apps/mozilla.te            |   28 
 policy/modules/apps/nsplugin.fc           |   11 
 policy/modules/apps/nsplugin.if           |  323 +++++
 policy/modules/apps/nsplugin.te           |  295 +++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/podsleuth.te          |    4 
 policy/modules/apps/ptchown.if            |   25 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   13 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   85 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   60 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  189 +++
 policy/modules/apps/sandbox.te            |  338 +++++
 policy/modules/apps/screen.if             |    8 
 policy/modules/apps/sectoolm.fc           |    6 
 policy/modules/apps/sectoolm.if           |    3 
 policy/modules/apps/sectoolm.te           |  120 ++
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   42 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |  115 ++
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   50 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   50 
 policy/modules/kernel/devices.fc          |   12 
 policy/modules/kernel/devices.if          |  309 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  170 ++
 policy/modules/kernel/domain.te           |   91 +
 policy/modules/kernel/files.fc            |    5 
 policy/modules/kernel/files.if            |  475 ++++++++
 policy/modules/kernel/files.te            |    7 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  442 +++++++
 policy/modules/kernel/filesystem.te       |   16 
 policy/modules/kernel/kernel.if           |   98 +
 policy/modules/kernel/kernel.te           |   32 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    2 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   65 +
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  124 --
 policy/modules/roles/sysadm.te            |  125 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  667 +++++++++++
 policy/modules/roles/unconfineduser.te    |  442 +++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   71 +
 policy/modules/services/abrt.fc           |    8 
 policy/modules/services/abrt.if           |  139 ++
 policy/modules/services/abrt.te           |  122 +-
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    3 
 policy/modules/services/aisexec.fc        |   12 
 policy/modules/services/aisexec.if        |  106 +
 policy/modules/services/aisexec.te        |  112 +
 policy/modules/services/amavis.te         |    3 
 policy/modules/services/apache.fc         |   57 -
 policy/modules/services/apache.if         |  466 +++++---
 policy/modules/services/apache.te         |  458 ++++++--
 policy/modules/services/apm.te            |    6 
 policy/modules/services/arpwatch.te       |    2 
 policy/modules/services/asterisk.if       |   38 
 policy/modules/services/asterisk.te       |   41 
 policy/modules/services/automount.te      |    2 
 policy/modules/services/avahi.te          |   13 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bitlbee.te        |    2 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |   12 
 policy/modules/services/ccs.fc            |    8 
 policy/modules/services/ccs.te            |   33 
 policy/modules/services/certmaster.fc     |    3 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/certmonger.fc     |    6 
 policy/modules/services/certmonger.if     |  217 +++
 policy/modules/services/certmonger.te     |   74 +
 policy/modules/services/chronyd.fc        |   11 
 policy/modules/services/chronyd.if        |  105 +
 policy/modules/services/chronyd.te        |   67 +
 policy/modules/services/clamav.te         |   20 
 policy/modules/services/clogd.fc          |    4 
 policy/modules/services/clogd.if          |   98 +
 policy/modules/services/clogd.te          |   62 +
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   44 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   25 
 policy/modules/services/corosync.fc       |   13 
 policy/modules/services/corosync.if       |  108 +
 policy/modules/services/corosync.te       |  110 +
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   74 +
 policy/modules/services/cron.te           |   84 +
 policy/modules/services/cups.fc           |   14 
 policy/modules/services/cups.te           |   55 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/cyrus.te          |    3 
 policy/modules/services/dbus.if           |   54 
 policy/modules/services/dbus.te           |   25 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 
 policy/modules/services/devicekit.fc      |    2 
 policy/modules/services/devicekit.if      |   22 
 policy/modules/services/devicekit.te      |   60 -
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.fc        |    1 
 policy/modules/services/dovecot.te        |   35 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.if       |   40 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    3 
 policy/modules/services/fprintd.te        |    5 
 policy/modules/services/ftp.te            |   64 -
 policy/modules/services/git.fc            |    8 
 policy/modules/services/git.if            |  286 +++++
 policy/modules/services/git.te            |  166 ++
 policy/modules/services/gpm.te            |    3 
 policy/modules/services/gpsd.fc           |    5 
 policy/modules/services/gpsd.if           |   27 
 policy/modules/services/gpsd.te           |   14 
 policy/modules/services/hal.fc            |    1 
 policy/modules/services/hal.if            |   18 
 policy/modules/services/hal.te            |   54 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    4 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.if       |    6 
 policy/modules/services/kerberos.te       |   18 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ksmtuned.fc       |    5 
 policy/modules/services/ksmtuned.if       |   76 +
 policy/modules/services/ksmtuned.te       |   46 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/ldap.if           |   38 
 policy/modules/services/lircd.fc          |    2 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   25 
 policy/modules/services/mailman.fc        |    7 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    4 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    5 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   32 
 policy/modules/services/mta.te            |   38 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    6 
 policy/modules/services/mysql.fc          |    1 
 policy/modules/services/mysql.if          |   38 
 policy/modules/services/mysql.te          |   25 
 policy/modules/services/nagios.fc         |   46 
 policy/modules/services/nagios.if         |  126 ++
 policy/modules/services/nagios.te         |  193 ++-
 policy/modules/services/networkmanager.fc |   15 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  120 +-
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.if           |   18 
 policy/modules/services/nscd.te           |   21 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntop.fc           |    1 
 policy/modules/services/ntop.te           |   32 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nut.fc            |   16 
 policy/modules/services/nut.if            |   58 +
 policy/modules/services/nut.te            |  188 +++
 policy/modules/services/nx.fc             |   10 
 policy/modules/services/nx.if             |   67 +
 policy/modules/services/nx.te             |   13 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/oddjob.te         |    5 
 policy/modules/services/openvpn.te        |    4 
 policy/modules/services/pcscd.if          |   41 
 policy/modules/services/pcscd.te          |    4 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  304 +++++
 policy/modules/services/plymouth.te       |  102 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   71 +
 policy/modules/services/policykit.te      |   68 -
 policy/modules/services/portreserve.te    |    3 
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++
 policy/modules/services/postfix.te        |  142 ++
 policy/modules/services/postgresql.fc     |   16 
 policy/modules/services/postgresql.if     |   60 +
 policy/modules/services/postgresql.te     |    9 
 policy/modules/services/ppp.if            |    6 
 policy/modules/services/ppp.te            |   17 
 policy/modules/services/prelude.te        |    4 
 policy/modules/services/privoxy.fc        |    3 
 policy/modules/services/privoxy.te        |    3 
 policy/modules/services/procmail.te       |   12 
 policy/modules/services/pyzor.fc          |    4 
 policy/modules/services/pyzor.if          |   47 
 policy/modules/services/pyzor.te          |   37 
 policy/modules/services/radvd.te          |    1 
 policy/modules/services/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/rdisc.if          |   19 
 policy/modules/services/rgmanager.fc      |    8 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |  187 +++
 policy/modules/services/rhcs.fc           |   22 
 policy/modules/services/rhcs.if           |  367 ++++++
 policy/modules/services/rhcs.te           |  410 +++++++
 policy/modules/services/ricci.te          |   30 
 policy/modules/services/rpc.fc            |    4 
 policy/modules/services/rpc.if            |   45 
 policy/modules/services/rpc.te            |   27 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rpcbind.te        |    1 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit.if          |   20 
 policy/modules/services/rtkit.te          |    4 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  138 ++
 policy/modules/services/samba.te          |   93 +
 policy/modules/services/sasl.te           |   15 
 policy/modules/services/sendmail.if       |  137 ++
 policy/modules/services/sendmail.te       |   88 +
 policy/modules/services/setroubleshoot.fc |    2 
 policy/modules/services/setroubleshoot.if |  124 ++
 policy/modules/services/setroubleshoot.te |   83 +
 policy/modules/services/smartmon.te       |   17 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/snort.te          |    8 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  139 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  207 +++
 policy/modules/services/ssh.te            |  155 ++
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   62 +
 policy/modules/services/sssd.te           |   17 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/telnet.te         |    1 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tgtd.fc           |    3 
 policy/modules/services/tgtd.if           |   28 
 policy/modules/services/tgtd.te           |   69 +
 policy/modules/services/tor.te            |   13 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   60 +
 policy/modules/services/uucp.te           |   10 
 policy/modules/services/vhostmd.fc        |    6 
 policy/modules/services/vhostmd.if        |  228 ++++
 policy/modules/services/vhostmd.te        |   87 +
 policy/modules/services/virt.fc           |   14 
 policy/modules/services/virt.if           |  210 +++
 policy/modules/services/virt.te           |  296 ++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   45 
 policy/modules/services/xserver.if        |  665 ++++++++++-
 policy/modules/services/xserver.te        |  385 +++++-
 policy/modules/services/zebra.if          |   20 
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   12 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  210 +++
 policy/modules/system/authlogin.te        |   11 
 policy/modules/system/fstools.fc          |    3 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/getty.te            |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  185 +++
 policy/modules/system/init.te             |  292 +++--
 policy/modules/system/ipsec.fc            |    7 
 policy/modules/system/ipsec.if            |   45 
 policy/modules/system/ipsec.te            |   79 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   23 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    8 
 policy/modules/system/kdump.te            |    5 
 policy/modules/system/libraries.fc        |  209 ++-
 policy/modules/system/libraries.if        |    5 
 policy/modules/system/libraries.te        |   18 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |   20 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.if              |   39 
 policy/modules/system/lvm.te              |   31 
 policy/modules/system/miscfiles.fc        |    3 
 policy/modules/system/miscfiles.if        |   93 +
 policy/modules/system/miscfiles.te        |    5 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   47 
 policy/modules/system/modutils.te         |   56 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |   83 +
 policy/modules/system/mount.te            |   87 +
 policy/modules/system/raid.fc             |    2 
 policy/modules/system/raid.te             |    8 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  309 +++++
 policy/modules/system/selinuxutil.te      |  229 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |   10 
 policy/modules/system/sysnetwork.if       |  116 +-
 policy/modules/system/sysnetwork.te       |   80 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   39 
 policy/modules/system/udev.te             |   39 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  443 -------
 policy/modules/system/unconfined.te       |  224 ---
 policy/modules/system/userdomain.fc       |    7 
 policy/modules/system/userdomain.if       | 1703 +++++++++++++++++++++++-------
 policy/modules/system/userdomain.te       |   51 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   47 
 policy/modules/system/xen.te              |  146 ++
 policy/support/obj_perm_sets.spt          |   34 
 policy/users                              |   13 
 416 files changed, 22070 insertions(+), 2854 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- policy-F12.patch	31 Dec 2009 14:19:55 -0000	1.163
+++ policy-F12.patch	31 Dec 2009 14:31:00 -0000	1.164
@@ -37103,7 +37103,7 @@ diff -b -B --ignore-all-space --exclude-
 -	dontaudit $1 user_home_t:file read_file_perms;
 +	dontaudit $1 user_home_type:dir list_dir_perms;
 +	dontaudit $1 user_home_type:file read_file_perms;
-+	dontaudit $1 user_home_t:lnk_file read_lnk_file_perms;
++	dontaudit $1 user_home_type:lnk_file read_lnk_file_perms;
  ')
  
  ########################################



From gavin at fedoraproject.org  Thu Dec 31 14:31:35 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Thu, 31 Dec 2009 14:31:35 +0000 (UTC)
Subject: rpms/report/devel import.log, NONE, 1.1 report.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091231143135.3DD8411C018B@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/report/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5693/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log report.spec 
Log Message:
Initial Import



--- NEW FILE import.log ---
report-0_4-3_fc11:HEAD:report-0.4-3.fc11.src.rpm:1262269505


--- NEW FILE report.spec ---

Name:           report
Version:        0.4
Release:        3%{?dist}
Summary:        Incident reporting library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://fedorahosted.org/report
Source0:        http://fedorahosted.org/released/report/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides: python-report = %{version}-%{release} 

BuildArch: noarch
BuildRequires: python-devel

%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

%description
A generic problem/bug/incident/error reporting library, that can be 
configured to deliver a report to a variety of different ticketing 
systems.

%package gtk
Summary:        GTK IO for reporting library
Group:          System Environment/Base

Requires: pygtk2
Requires: report = %{version}-%{release}

%description gtk
Provides GTK IO dialogs for the reporting library

%package plugin-bugzilla
Summary:        Plugin reporter to bugzilla.redhat.com
Group:          System Environment/Base

Requires: report = %{version}-%{release}
Requires: python-bugzilla
Requires: rpm-python

%description plugin-bugzilla
Plugin reporter to bugzilla.redhat.com




%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT




%files
%defattr(-,root,root,-)
%doc README LICENCE
%dir %{python_sitelib}/report
%{python_sitelib}/report/__init__.py*
%{python_sitelib}/report/accountmanager.py*
%dir %{python_sitelib}/report/io
%{python_sitelib}/report/io/__init__.py*
%{python_sitelib}/report/io/TextIO.py*
%dir %{python_sitelib}/report/alternatives
%{python_sitelib}/report/alternatives/__init__.py*
%{python_sitelib}/report/alternatives/scp.py*
%{python_sitelib}/report/alternatives/localsave.py*

%files gtk
%defattr(-,root,root,-)
%{python_sitelib}/report/io/GTKIO.py*

%files plugin-bugzilla
%defattr(-,root,root,-)
%{python_sitelib}/report/alternatives/redhat_bugzilla




%changelog
* Thu Dec 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-3
- More cleanups/corrections from Fedora review:
  - added provides for python-report
  - reorg'd sub-package specfile sections to be more std
  - correct sub-package use of Build* and Requires:
  - include LICENCE text in both dist tarball and rpms.
  - other minor cleanups

* Tue Dec 08 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-2
- Cleanups/Corrections from Fedora review:
  - Added GPL2 Licencing file and headers
  - removed unnecessary catcut plugin
  - correct Source0: and Group: headers
  - other misc. spec file problems

* Tue Dec 01 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-1
- Split out the GTK IO into its own rpm
- Split out the bugzilla and catcut plugins into their own rpms

* Mon Nov 23 2009 Gavin Romig-Koch <gavin at redhat.com> 0.3-1
- Convert to using Autotools

* Wed Nov 18 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-1
- significant changes

* Wed Oct 28 2009 Gavin Romig-Koch <gavin at redhat.com> 0.1-1
- initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:52:37 -0000	1.1
+++ .cvsignore	31 Dec 2009 14:31:34 -0000	1.2
@@ -0,0 +1 @@
+report-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:52:37 -0000	1.1
+++ sources	31 Dec 2009 14:31:35 -0000	1.2
@@ -0,0 +1 @@
+6b87449282f7adfe9e78211192d7d32c  report-0.4.tar.gz



From gavin at fedoraproject.org  Thu Dec 31 14:32:55 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Thu, 31 Dec 2009 14:32:55 +0000 (UTC)
Subject: rpms/report/F-11 import.log, NONE, 1.1 report.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091231143255.0F1CA11C018B@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/report/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6243/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log report.spec 
Log Message:
Initial Import



--- NEW FILE import.log ---
report-0_4-3_fc11:F-11:report-0.4-3.fc11.src.rpm:1262269643


--- NEW FILE report.spec ---

Name:           report
Version:        0.4
Release:        3%{?dist}
Summary:        Incident reporting library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://fedorahosted.org/report
Source0:        http://fedorahosted.org/released/report/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides: python-report = %{version}-%{release} 

BuildArch: noarch
BuildRequires: python-devel

%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

%description
A generic problem/bug/incident/error reporting library, that can be 
configured to deliver a report to a variety of different ticketing 
systems.

%package gtk
Summary:        GTK IO for reporting library
Group:          System Environment/Base

Requires: pygtk2
Requires: report = %{version}-%{release}

%description gtk
Provides GTK IO dialogs for the reporting library

%package plugin-bugzilla
Summary:        Plugin reporter to bugzilla.redhat.com
Group:          System Environment/Base

Requires: report = %{version}-%{release}
Requires: python-bugzilla
Requires: rpm-python

%description plugin-bugzilla
Plugin reporter to bugzilla.redhat.com




%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT




%files
%defattr(-,root,root,-)
%doc README LICENCE
%dir %{python_sitelib}/report
%{python_sitelib}/report/__init__.py*
%{python_sitelib}/report/accountmanager.py*
%dir %{python_sitelib}/report/io
%{python_sitelib}/report/io/__init__.py*
%{python_sitelib}/report/io/TextIO.py*
%dir %{python_sitelib}/report/alternatives
%{python_sitelib}/report/alternatives/__init__.py*
%{python_sitelib}/report/alternatives/scp.py*
%{python_sitelib}/report/alternatives/localsave.py*

%files gtk
%defattr(-,root,root,-)
%{python_sitelib}/report/io/GTKIO.py*

%files plugin-bugzilla
%defattr(-,root,root,-)
%{python_sitelib}/report/alternatives/redhat_bugzilla




%changelog
* Thu Dec 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-3
- More cleanups/corrections from Fedora review:
  - added provides for python-report
  - reorg'd sub-package specfile sections to be more std
  - correct sub-package use of Build* and Requires:
  - include LICENCE text in both dist tarball and rpms.
  - other minor cleanups

* Tue Dec 08 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-2
- Cleanups/Corrections from Fedora review:
  - Added GPL2 Licencing file and headers
  - removed unnecessary catcut plugin
  - correct Source0: and Group: headers
  - other misc. spec file problems

* Tue Dec 01 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-1
- Split out the GTK IO into its own rpm
- Split out the bugzilla and catcut plugins into their own rpms

* Mon Nov 23 2009 Gavin Romig-Koch <gavin at redhat.com> 0.3-1
- Convert to using Autotools

* Wed Nov 18 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-1
- significant changes

* Wed Oct 28 2009 Gavin Romig-Koch <gavin at redhat.com> 0.1-1
- initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:52:37 -0000	1.1
+++ .cvsignore	31 Dec 2009 14:32:54 -0000	1.2
@@ -0,0 +1 @@
+report-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:52:37 -0000	1.1
+++ sources	31 Dec 2009 14:32:54 -0000	1.2
@@ -0,0 +1 @@
+6b87449282f7adfe9e78211192d7d32c  report-0.4.tar.gz



From gavin at fedoraproject.org  Thu Dec 31 14:33:29 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Thu, 31 Dec 2009 14:33:29 +0000 (UTC)
Subject: rpms/report/F-12 import.log, NONE, 1.1 report.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091231143329.65B0411C018B@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/report/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6492/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log report.spec 
Log Message:
Initial Import



--- NEW FILE import.log ---
report-0_4-3_fc11:F-12:report-0.4-3.fc11.src.rpm:1262269688


--- NEW FILE report.spec ---

Name:           report
Version:        0.4
Release:        3%{?dist}
Summary:        Incident reporting library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://fedorahosted.org/report
Source0:        http://fedorahosted.org/released/report/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides: python-report = %{version}-%{release} 

BuildArch: noarch
BuildRequires: python-devel

%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

%description
A generic problem/bug/incident/error reporting library, that can be 
configured to deliver a report to a variety of different ticketing 
systems.

%package gtk
Summary:        GTK IO for reporting library
Group:          System Environment/Base

Requires: pygtk2
Requires: report = %{version}-%{release}

%description gtk
Provides GTK IO dialogs for the reporting library

%package plugin-bugzilla
Summary:        Plugin reporter to bugzilla.redhat.com
Group:          System Environment/Base

Requires: report = %{version}-%{release}
Requires: python-bugzilla
Requires: rpm-python

%description plugin-bugzilla
Plugin reporter to bugzilla.redhat.com




%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT




%files
%defattr(-,root,root,-)
%doc README LICENCE
%dir %{python_sitelib}/report
%{python_sitelib}/report/__init__.py*
%{python_sitelib}/report/accountmanager.py*
%dir %{python_sitelib}/report/io
%{python_sitelib}/report/io/__init__.py*
%{python_sitelib}/report/io/TextIO.py*
%dir %{python_sitelib}/report/alternatives
%{python_sitelib}/report/alternatives/__init__.py*
%{python_sitelib}/report/alternatives/scp.py*
%{python_sitelib}/report/alternatives/localsave.py*

%files gtk
%defattr(-,root,root,-)
%{python_sitelib}/report/io/GTKIO.py*

%files plugin-bugzilla
%defattr(-,root,root,-)
%{python_sitelib}/report/alternatives/redhat_bugzilla




%changelog
* Thu Dec 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-3
- More cleanups/corrections from Fedora review:
  - added provides for python-report
  - reorg'd sub-package specfile sections to be more std
  - correct sub-package use of Build* and Requires:
  - include LICENCE text in both dist tarball and rpms.
  - other minor cleanups

* Tue Dec 08 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-2
- Cleanups/Corrections from Fedora review:
  - Added GPL2 Licencing file and headers
  - removed unnecessary catcut plugin
  - correct Source0: and Group: headers
  - other misc. spec file problems

* Tue Dec 01 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-1
- Split out the GTK IO into its own rpm
- Split out the bugzilla and catcut plugins into their own rpms

* Mon Nov 23 2009 Gavin Romig-Koch <gavin at redhat.com> 0.3-1
- Convert to using Autotools

* Wed Nov 18 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-1
- significant changes

* Wed Oct 28 2009 Gavin Romig-Koch <gavin at redhat.com> 0.1-1
- initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:52:37 -0000	1.1
+++ .cvsignore	31 Dec 2009 14:33:29 -0000	1.2
@@ -0,0 +1 @@
+report-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:52:37 -0000	1.1
+++ sources	31 Dec 2009 14:33:29 -0000	1.2
@@ -0,0 +1 @@
+6b87449282f7adfe9e78211192d7d32c  report-0.4.tar.gz



From gavin at fedoraproject.org  Thu Dec 31 14:34:14 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Thu, 31 Dec 2009 14:34:14 +0000 (UTC)
Subject: rpms/report/EL-5 import.log, NONE, 1.1 report.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091231143414.D059511C018B@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/report/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6780/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log report.spec 
Log Message:
Initial Import



--- NEW FILE import.log ---
report-0_4-3_fc11:EL-5:report-0.4-3.fc11.src.rpm:1262269727


--- NEW FILE report.spec ---

Name:           report
Version:        0.4
Release:        3%{?dist}
Summary:        Incident reporting library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://fedorahosted.org/report
Source0:        http://fedorahosted.org/released/report/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides: python-report = %{version}-%{release} 

BuildArch: noarch
BuildRequires: python-devel

%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

%description
A generic problem/bug/incident/error reporting library, that can be 
configured to deliver a report to a variety of different ticketing 
systems.

%package gtk
Summary:        GTK IO for reporting library
Group:          System Environment/Base

Requires: pygtk2
Requires: report = %{version}-%{release}

%description gtk
Provides GTK IO dialogs for the reporting library

%package plugin-bugzilla
Summary:        Plugin reporter to bugzilla.redhat.com
Group:          System Environment/Base

Requires: report = %{version}-%{release}
Requires: python-bugzilla
Requires: rpm-python

%description plugin-bugzilla
Plugin reporter to bugzilla.redhat.com




%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT




%files
%defattr(-,root,root,-)
%doc README LICENCE
%dir %{python_sitelib}/report
%{python_sitelib}/report/__init__.py*
%{python_sitelib}/report/accountmanager.py*
%dir %{python_sitelib}/report/io
%{python_sitelib}/report/io/__init__.py*
%{python_sitelib}/report/io/TextIO.py*
%dir %{python_sitelib}/report/alternatives
%{python_sitelib}/report/alternatives/__init__.py*
%{python_sitelib}/report/alternatives/scp.py*
%{python_sitelib}/report/alternatives/localsave.py*

%files gtk
%defattr(-,root,root,-)
%{python_sitelib}/report/io/GTKIO.py*

%files plugin-bugzilla
%defattr(-,root,root,-)
%{python_sitelib}/report/alternatives/redhat_bugzilla




%changelog
* Thu Dec 17 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-3
- More cleanups/corrections from Fedora review:
  - added provides for python-report
  - reorg'd sub-package specfile sections to be more std
  - correct sub-package use of Build* and Requires:
  - include LICENCE text in both dist tarball and rpms.
  - other minor cleanups

* Tue Dec 08 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-2
- Cleanups/Corrections from Fedora review:
  - Added GPL2 Licencing file and headers
  - removed unnecessary catcut plugin
  - correct Source0: and Group: headers
  - other misc. spec file problems

* Tue Dec 01 2009 Gavin Romig-Koch <gavin at redhat.com> 0.4-1
- Split out the GTK IO into its own rpm
- Split out the bugzilla and catcut plugins into their own rpms

* Mon Nov 23 2009 Gavin Romig-Koch <gavin at redhat.com> 0.3-1
- Convert to using Autotools

* Wed Nov 18 2009 Gavin Romig-Koch <gavin at redhat.com> 0.2-1
- significant changes

* Wed Oct 28 2009 Gavin Romig-Koch <gavin at redhat.com> 0.1-1
- initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/report/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Dec 2009 02:52:37 -0000	1.1
+++ .cvsignore	31 Dec 2009 14:34:14 -0000	1.2
@@ -0,0 +1 @@
+report-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Dec 2009 02:52:37 -0000	1.1
+++ sources	31 Dec 2009 14:34:14 -0000	1.2
@@ -0,0 +1 @@
+6b87449282f7adfe9e78211192d7d32c  report-0.4.tar.gz



From roma at fedoraproject.org  Thu Dec 31 14:50:40 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Thu, 31 Dec 2009 14:50:40 +0000 (UTC)
Subject: rpms/fmtools/F-12 fmlircrc, NONE, 1.1 .cvsignore, 1.4,
	1.5 fmtools.spec, 1.10, 1.11 import.log, 1.5, 1.6 sources, 1.4,
	1.5 tkradio.py, 1.2, 1.3
Message-ID: <20091231145040.641F311C018B@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/fmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9100/F-12

Modified Files:
	.cvsignore fmtools.spec import.log sources tkradio.py 
Added Files:
	fmlircrc 
Log Message:
lirc and recording support


--- NEW FILE fmlircrc ---
# File: .fmlircrc
# Remote Control: Pixelview PlayTV MPEG2 PV-M4900 FM.RC
# Author: Paulo Roma on 28/12/2009
# Configuration file for fmtools-tkradio.
#
begin
    prog   = tkradio
    button = power
    config = quit
end

begin
    prog   = tkradio
    button = ch+
    config = next
end

begin
    prog   = tkradio
    button = ch-
    config = previous
end

begin
    prog   = tkradio
    button = mute
    config = off
end

begin
    prog   = tkradio
    button = rec
    config = rec
end

begin
    prog   = tkradio
    button = stop
    config = stop
end

begin
    prog   = tkradio
    button = play
    config = on
end

begin
    prog   = tkradio
    button = vol+
    config = volup
end

begin
    prog   = tkradio
    button = vol-
    config = voldown
end

begin
    prog   = tkradio
    button = 1
    config = 1
end

begin
    prog   = tkradio
    button = 2
    config = 2
end

begin
    prog   = tkradio
    button = 3
    config = 3
end

begin
    prog   = tkradio
    button = 4
    config = 4
end

begin
    prog   = tkradio
    button = 5
    config = 5
end

begin
    prog   = tkradio
    button = 6
    config = 6
end

begin
    prog   = tkradio
    button = 7
    config = 7
end

begin
    prog   = tkradio
    button = 8
    config = 8
end

begin
    prog   = tkradio
    button = 9
    config = 9
end

begin
    prog   = tkradio
    button = 0
    config = 0
end




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Dec 2009 20:33:26 -0000	1.4
+++ .cvsignore	31 Dec 2009 14:50:40 -0000	1.5
@@ -1,2 +1,2 @@
-fmtools-2.0.tar.gz
 fmcontrol.tar.gz
+fmtools-2.0.tar.gz


Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fmtools.spec	27 Dec 2009 20:33:26 -0000	1.10
+++ fmtools.spec	31 Dec 2009 14:50:40 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Simple Video for Linux radio card programs
 Name:    fmtools
 Version: 2.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.stanford.edu/~blp/fmtools/
@@ -13,6 +13,7 @@ Source3: http://www.stanford.edu/~blp/fm
 Source4: fmtools.desktop
 Source5: radio.png
 Source6: tkradio.py
+Source7: fmlircrc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -29,12 +30,13 @@ Summary:       Python/Tk wrapper for fmt
 Group:         Applications/Multimedia
 BuildRequires: desktop-file-utils
 Requires:      %{name} = %{version}
-Requires:      python, tkinter, alsa-utils
+Requires:      python, python-lirc, tkinter, alsa-utils
 BuildArch:     noarch
 
 %description tkradio
-This package provides a GUI for %{name}.
-The stations are read from the same files used by fmcontrol.
+This package provides a GUI for %{name}, with lirc support.
+The stations are read from the same files used by fmcontrol,
+and the lirc configuration file is in $HOME/.fmlircrc
 
 The script fmcontrol.py saves one from remembering frequencies
 and volumes when using the "fm" program from %{name}.
@@ -66,6 +68,7 @@ desktop-file-install                    
         %{SOURCE4}
 
 install -Dpm 0644 %{SOURCE5} %{buildroot}%{_datadir}/pixmaps/radio.png
+install -Dpm 0644 %{SOURCE7} %{buildroot}%{_datadir}/%{name}/fmlircrc
 
 %clean
 rm -rf %{buildroot}
@@ -83,12 +86,17 @@ rm -rf %{buildroot}
 %{_bindir}/fmcontrol.py
 %{_datadir}/applications/fmtools.desktop
 %{_datadir}/pixmaps/radio.png
+%{_datadir}/%{name}/fmlircrc
 
 %changelog
 
+* Sun Dec 30 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-8
+- Added recording support.
+
 * Sun Dec 27 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-7
 - Replaced fmcontrol for fmcontrol.py
 - Moved fmcontrol to tkradio package.
+- Added lirc support.
 
 * Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-5
 - Replaced BR tk for tkinter.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	27 Dec 2009 20:33:26 -0000	1.5
+++ import.log	31 Dec 2009 14:50:40 -0000	1.6
@@ -3,3 +3,4 @@ fmtools-2_0-4_fc12:F-12:fmtools-2.0-4.fc
 fmtools-2_0-5_fc12:F-12:fmtools-2.0-5.fc12.src.rpm:1261655654
 fmtools-2_0-6_fc12:F-12:fmtools-2.0-6.fc12.src.rpm:1261758030
 fmtools-2_0-7_fc12:F-12:fmtools-2.0-7.fc12.src.rpm:1261945933
+fmtools-2_0-8_fc12:F-12:fmtools-2.0-8.fc12.src.rpm:1262270955


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Dec 2009 20:33:26 -0000	1.4
+++ sources	31 Dec 2009 14:50:40 -0000	1.5
@@ -1,2 +1,2 @@
-807467a8bccae32317c6bdb6c5329ab3  fmtools-2.0.tar.gz
 8accad958c3f0cd0fb582aad922857aa  fmcontrol.tar.gz
+807467a8bccae32317c6bdb6c5329ab3  fmtools-2.0.tar.gz


Index: tkradio.py
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/tkradio.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tkradio.py	24 Dec 2009 11:55:00 -0000	1.2
+++ tkradio.py	31 Dec 2009 14:50:40 -0000	1.3
@@ -1,49 +1,198 @@
 #!/usr/bin/env python
-# Paulo Roma - simple tkinter interface for fmtools
+# Paulo Roma - simple tkinter interface for fmtools,
+#              with lirc and recording support.
 # Date: 23/12/2009
 # The radio is turned off on exit.
 
 from Tkinter import *
 import Tkinter
-import os, sys
+import os, sys, string
+import datetime, time
+from threading import Thread
+try:
+   import pylirc
+except:
+   exit ( "pylirc not found: http://pylirc.mccabe.nu/" )
 
 # These are stations in the Rio de Janeiro area. 
-# Customize for your own locale.
+# Customize for your own locale. They can be set
+# in file ~/.fmrc or ~/.radiostations:
+# station name, frequency and volume.
+
+stations = [["MPB",          "90.3 100"],
+            ["CBN",          "92.5 100"],
+            ["Band News",    "94.9 100"],
+            ["Paradiso",     "95.7 100"],
+            ["Tupy",         "96.5 100"],
+            ["Beat98 FM",    "98.0 100"],
+            ["MEC",          "98.9 100"],
+            ["JB FM",        "99.7 100"],
+            ["O Dia",        "100.5 100"],
+            ["Transamerica", "101.3 100"],
+            ["Mix",          "102.1 100"],
+            ["Oi",           "102.9 100"],
+            ["Nativa",       "103.7 100"]]
+
+radbut   = stations[3][1]  # default radio frequency
+volume   = 100             # initial volume [0,100]
+state    = False           # keep track of mutting/unmutting
+blocking = 0               # lirc blocking control
+tid      = 0               # recorder thread id
+fmrec    = None            # recorder thread variable
+irrec    = None            # lirc thread variable
+
+class IRRec(Thread):
+   """Class for interacting with lirc."""
+
+   def __init__ (self, lirc_handle):
+       """Constructor."""
+
+       Thread.__init__ (self)
+       self.lirc_handle = lirc_handle
+       self.__on = True
+  
+   def stop ( self ):
+       """Kills this thread."""
+
+       self.__on = False 
+
+   def run(self):
+      print "IRRrec awaits IR commands"
+
+      code = {"config" : ""}
+
+      while ( self.__on ):
+            # Delay...
+            time.sleep(1)
+
+            s = pylirc.nextcode(1)
+            while ( s ):
+               for code in s:
+                   if ( code["config"] == "next" ):
+                        next()
+                   elif ( code["config"] == "previous" ):
+                        previous()
+                   elif ( code["config"] == "off" ): 
+                        mute() 
+                   elif ( code["config"] == "on" ):
+                        radio ("on")
+                   elif ( code["config"] == "volup" ):
+                        volup ()
+                   elif ( code["config"] == "voldown" ):
+                        voldown()
+                   elif ( code["config"] in "0123456789" ):
+                        setStation ( int (code["config"]) )
+                   elif ( code["config"] == "rec" ):
+                        rec_on()
+                   elif ( code["config"] == "stop" ):
+                        rec_off()
+                   elif ( code["config"] == "quit" ):
+                        print "Not implemented yet, sorry..." 
+                        # self.stop()
+                   else:
+                        # Print all the configs...
+                        print "Command: %s, Repeat: %d" % (code["config"], code["repeat"])
+               if (not blocking):
+                   s = pylirc.nextcode(1)
+               else:
+                   s = []
+
+      # if we get here, the thread is over, so clean up lirc
+      pylirc.exit()
+
+class FMRec(Thread):
+   """Class for controlling the recording process."""
+
+   def __init__ (self):
+       """Constructor."""
+
+       Thread.__init__ (self)
+       self.__pid = 0       # arecord process id
+       self.__on  = True    # for implementing a thread stop, 
+                            # which python does not have
+   def __del__ (self):
+       """Destructor. Stops the recording, before quitting."""
+
+       self.stop()
+
+   def stop ( self ):
+
+       """Stops the recording, by killing the recorder process."""
+
+       global tid
+
+       tid = 0
+
+       if ( self.__pid ):
+            os.kill ( self.__pid, 9 )
+       self.__pid = 0
+       self.__on = False
+
+   def run(self):
+       """Start the thread."""
+
+       while (self.__on):
+           if ( not self.__pid ):
+                data = str(datetime.date.today())
+                hora = list(time.localtime(time.time()))
+                hora = str(hora[3])+":"+str(hora[4])+":"+str(hora[5])
+                rec_file = '/tmp/tkradio-'+fmstations[cur_station][0]+"-"+data+"-"+hora+'.wav' 
+                lparam = ['/usr/bin/arecord', '-D', 'default', '-d', '0', '-f', 'cd', rec_file]
+                self.__pid = os.spawnv (os.P_NOWAIT, "/usr/bin/arecord", lparam )
+
+           time.sleep(1.0) # Suspend execution for the given number of seconds
 
-stations = [["MPB",          "90.3"],
-            ["CBN",          "92.5"],
-            ["Band News",    "94.9"],
-            ["PARADISO",     "95.7"],
-            ["Nativa",       "96.5"],
-            ["98 FM",        "98.0"],
-            ["MEC",          "98.9"],
-            ["JB FM",        "99.7"],
-            ["O Dia",        "100.5"],
-            ["Transamerica", "101.3"],
-            ["Joven Pan",    "102.1"],
-            ["Oi",           "102.9"],
-            ["Antena1",      "103.7"]]
-
-radbut  = "95.7"      # default radio frequency
-volume  = 100         # initial volume [0,100]
-state   = False
+       # if we get here, the thread is finished
+       self.stop ()
 
 def radio ( cmd ):
     """Send the given command to the radio."""
 
     os.system("fm "+cmd)
 
+def setCurStation ( frequency ):
+    """Update the current station."""
+
+    global cur_station 
+
+    ind = 0
+    for st in fmstations:
+        if ( st[1] == frequency ):
+             cur_station = ind
+             break
+        ind += 1 
+
 def setstation():
-    "Set the station chosen via Radio Button."""
+    """Set the station chosen via Radio Button."""
+ 
+    freq = station.get() 
+    changeStation ( freq )
+    setCurStation ( freq )
+
+def setStation(ind):
+    """Set the station to ind."""
+ 
+    if ( ind >= 0 and ind < ns ):
+         freq = fmstations[ind][1]
+         changeStation ( freq )
+         setCurStation ( freq )
+
+def changeStation ( st ):
+    """Set the station to the given station."""
 
-    radio ( station.get() )
+    radio ( st )
     freq.delete(0, END)
-    freq.insert(0,station.get())
+    freq.insert(0,st.split()[0])
+    station.set ( st )
 
 def quit():
     """Quit the radio."""
 
     radio ("off")
+    # kill all threads
+    if ( fmrec ): fmrec.stop()
+    if ( irrec ): irrec.stop() 
+    
     sys.exit ( 0 )
 
 def mute():
@@ -68,13 +217,31 @@ def on_move(value=0):
     v = scale.get()
     os.system("amixer -q -c 0 set PCM "+str(v)+"%")
 
+def volup ():
+    """Increases the volume."""
+
+    v = scale.get() + 5
+    if ( v > 100 ): v = 100
+    scale.set ( v )
+    os.system("amixer -q -c 0 set PCM "+str(v)+"%")
+
+def voldown():
+    """Decreases the volume."""
+
+    v = scale.get() - 5
+    if ( v < 0 ): v = 0
+    scale.set ( v )
+    os.system("amixer -q -c 0 set PCM "+str(v)+"%")
+
 def enter ():
     "Enter a new frequency."""
 
-    radio (freq.get())
+    f = freq.get()+" "+ str(volume)
+    changeStation (f)
+    setCurStation (f)
 
 def readStations ( ):
-    """Read the station file."""
+    """Read the preset station file."""
 
     path = os.environ.get("HOME")
     fname = path+"/.radiostations"
@@ -87,19 +254,83 @@ def readStations ( ):
 
        for line in textf:
            l=line.split(None)
-           st = [l[0].replace("_"," "),l[1]]
+           st = [l[0].replace("_"," "),l[1]+" "+l[2]]
            lst.append ( st )
        textf.close()
     return lst
 
+def next ():
+    "Go to the next station."""
+ 
+    global cur_station
+    cur_station = (cur_station + 1) % ns
+    changeStation ( fmstations[cur_station][1] )
+
+def previous ():
+    "Go to the previous station."""
+
+    global cur_station
+    cur_station = (cur_station - 1) % ns
+    changeStation ( fmstations[cur_station][1] )
+
+def trigger ():
+    """Creates a thread for recording."""
+
+    global tid, fmrec
+
+    if ( not tid ):
+         fmrec = FMRec ()
+         fmrec.start()
+         tid = 1
+
+def rec():
+    """Record the current station."""
+
+    if ( recvar.get() == "ON" ):
+         rec_on()
+    else:
+         rec_off()
+
+def rec_on():
+    """Turn the recorder on."""
+
+    recvar.set ("ON")
+    trigger()
+
+def rec_off():
+    """Turn the recorder off."""
+
+    recvar.set ("OFF")
+    if ( fmrec ): fmrec.stop()
+
 def main (argv=None):
     """Main program."""
 
-    global scale, station, btmute, btm, freq
+    global scale         # volume scale
+    global station       # variable for the station radio buttons
+    global btmute        # variable for the text in the mute button
+    global btm           # mute button
+    global freq          # variable for manually entering a frequency
+    global fmstations    # preset fm stations
+    global cur_station   # current station
+    global ns            # number of preset fm stations
+    global recvar        # variable for setting record on/off
+    global irrec         # lirc thread variable
 
     if argv is None:
        argv = sys.argv
 
+    pyversion = string.split(sys.version)[0]
+    print "Python Version: ", pyversion
+
+    # check whether tkradio is already running
+    stat = os.popen ( "/bin/ps aux | /bin/grep \"python" + pyversion[0:3] + " " + argv[0] + "\"" ).readline()
+    cid = os.getpid()
+    if ( stat ): 
+         pid = stat.split()[1]
+         if ( cid != int(pid) ): 
+              exit ( argv[0] + " is already running: pid = " + pid )
+
     mw = Tk()
     # do not resize the radio
     mw.resizable(False,False)
@@ -111,15 +342,18 @@ def main (argv=None):
     btmute.set ( "Off" )
 
     top = Frame(); top.pack()
+    bbt = Frame(); bbt.pack()
     bot = Frame(); bot.pack()
     mw.title ("tkradio")
 
-    s = readStations ( )
-    if ( not s ):
-         s = stations
+    fmstations = readStations ( )
+    if ( not fmstations ):
+         fmstations = stations
+    ns = len ( fmstations )
+    cur_station = -1
 
     # make tuner buttons
-    for st in s:
+    for st in fmstations:
         Radiobutton(bot,text=st[0],value=st[1],variable=station,command=setstation).pack(anchor=W)
 
     scale = Scale(top, from_=0, to=100, orient=HORIZONTAL, command=on_move, bd=0,
@@ -128,13 +362,18 @@ def main (argv=None):
     scale.set(volume)
 
     # the current radio frequency
-    Button(top,text="Enter", command = enter).pack(side="bottom")
+    Button(bbt,text="<", command = previous).pack(side="left",anchor=E)
+    Button(bbt,text="Enter", command = enter).pack(side="left")
+    Button(bbt,text=">", command = next).pack(side="left",anchor=W)
     freq=Entry(top,font="Arial 24",width=5,justify=CENTER)
     freq.insert(0,station.get())
     freq.pack(side="bottom")
 
     # create quit and mute buttons
     Button(top,text="Exit", command = quit).pack(side="right")
+    recvar = StringVar()  # creates a checkbutton for the alarm state
+    recvar.set ( "OFF" )
+    Checkbutton (top, text="Rec", variable=recvar, onvalue="ON", offvalue="OFF", command=rec).pack(side="right")
     btm=Button(top,text="Off", command = mute, textvariable = btmute)
     btm.pack(side="left")
 
@@ -142,6 +381,19 @@ def main (argv=None):
     setstation()
     radio ("on")
 
+    lircid = os.popen ( '/sbin/pidof lircd' ).readline()
+    if ( lircid ): # is lirc running?
+         # handle lirc events
+         path = os.environ.get("HOME")
+         fname = path+"/.fmlircrc"
+         if ( not os.path.exists (fname) ):
+              fname = "/usr/share/fmtools/fmlircrc"
+         lirc_handle = pylirc.init("tkradio", fname, blocking)
+         if (lirc_handle):
+             print "Succesfully opened lirc, handle is " + str(lirc_handle)
+             irrec = IRRec(lirc_handle)
+             irrec.start()
+
     top.mainloop()
 
 try:



From mschwendt at fedoraproject.org  Thu Dec 31 15:52:07 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 31 Dec 2009 15:52:07 +0000 (UTC)
Subject: rpms/audacious/devel audacious-2.2-disabled-iplugins.patch,1.2,1.3
Message-ID: <20091231155207.33E1711C018B@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19801/d

Modified Files:
	audacious-2.2-disabled-iplugins.patch 
Log Message:
yadayada...redundancy

audacious-2.2-disabled-iplugins.patch:
 playback.c       |    2 +-
 playlist-utils.c |   16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

Index: audacious-2.2-disabled-iplugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious-2.2-disabled-iplugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-2.2-disabled-iplugins.patch	31 Dec 2009 13:41:19 -0000	1.2
+++ audacious-2.2-disabled-iplugins.patch	31 Dec 2009 15:52:06 -0000	1.3
@@ -6,7 +6,7 @@ diff -Nur audacious-2.2-orig/src/audacio
      }
  
 -    if (decoder == NULL)
-+    if (decoder == NULL || (decoder && !decoder->enabled))
++    if (decoder == NULL || !decoder->enabled)
      {
          ProbeResult * pr = input_check_file (filename);
  



From mschwendt at fedoraproject.org  Thu Dec 31 15:52:07 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 31 Dec 2009 15:52:07 +0000 (UTC)
Subject: rpms/audacious/F-12 audacious-2.2-disabled-iplugins.patch,1.2,1.3
Message-ID: <20091231155207.40FF011C02C4@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19801/F-12

Modified Files:
	audacious-2.2-disabled-iplugins.patch 
Log Message:
yadayada...redundancy

audacious-2.2-disabled-iplugins.patch:
 playback.c       |    2 +-
 playlist-utils.c |   16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

Index: audacious-2.2-disabled-iplugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious-2.2-disabled-iplugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-2.2-disabled-iplugins.patch	31 Dec 2009 13:49:26 -0000	1.2
+++ audacious-2.2-disabled-iplugins.patch	31 Dec 2009 15:52:06 -0000	1.3
@@ -6,7 +6,7 @@ diff -Nur audacious-2.2-orig/src/audacio
      }
  
 -    if (decoder == NULL)
-+    if (decoder == NULL || (decoder && !decoder->enabled))
++    if (decoder == NULL || !decoder->enabled)
      {
          ProbeResult * pr = input_check_file (filename);
  



From jgu at fedoraproject.org  Thu Dec 31 16:04:47 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 31 Dec 2009 16:04:47 +0000 (UTC)
Subject: rpms/emacs-vm/F-12 emacs-vm.spec, 1.39, 1.40 sources, 1.17,
	1.18 vm-8.0.12-fix-charsets.patch, 1.1,
	NONE vm-8.0.12-fix-missing-autoload.patch, 1.1, NONE
Message-ID: <20091231160447.1F08F11C018B@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/pkgs/rpms/emacs-vm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22699

Modified Files:
	emacs-vm.spec sources 
Removed Files:
	vm-8.0.12-fix-charsets.patch 
	vm-8.0.12-fix-missing-autoload.patch 
Log Message:
* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.1.0-0.1.beta
- Update to 8.1.0 beta version



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/F-12/emacs-vm.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- emacs-vm.spec	26 Dec 2009 14:26:29 -0000	1.39
+++ emacs-vm.spec	31 Dec 2009 16:04:46 -0000	1.40
@@ -16,12 +16,12 @@
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
-Version: 8.0.14
-Release: 2%{?dist}
+Version: 8.1.0
+Release: 0.1.beta%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: https://launchpad.net/vm
-Source0: http://launchpad.net/vm/8.0.x/%{version}/+download/vm-%{version}.tgz
+Source0: http://launchpad.net/vm/trunk/%{version}-beta/+download/vm-%{version}-beta.tgz
 
 Requires: emacs >= %{_emacs_version}
 Requires(pre): /sbin/install-info 
@@ -52,7 +52,7 @@ The %{name}-el package contains the elis
 package. It is not necessary to install this if you want to run vm.
 
 %prep
-%setup -q -n vm-%{version}
+%setup -q -n vm-%{version}-beta
 
 # Add missing entry for u-vm-color.el to lisp Makefile.in
 sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in
@@ -122,6 +122,9 @@ fi
 %{pkgdir}/*.el
 
 %changelog
+* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.1.0-0.1.beta
+- Update to 8.1.0 beta version
+
 * Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-2
 - Add -fno-var-tracking-assignments to CFLAGS to allow build to complete (gcc
   bug http://gcc.gnu.org/PR41371)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Dec 2009 23:13:39 -0000	1.17
+++ sources	31 Dec 2009 16:04:46 -0000	1.18
@@ -1 +1 @@
-35657d3d3dec1dcce5b31ac155e0cc4f  vm-8.0.14.tgz
+03eac8406630ea4cf85ee422a76f62b8  vm-8.1.0-beta.tgz


--- vm-8.0.12-fix-charsets.patch DELETED ---


--- vm-8.0.12-fix-missing-autoload.patch DELETED ---



From donv at fedoraproject.org  Thu Dec 31 16:45:15 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu, 31 Dec 2009 16:45:15 +0000 (UTC)
Subject: rpms/zfs-fuse/EL-5 zfs-fuse.init, 1.4, 1.5 zfs-fuse.spec, 1.23,
	1.24 zfs-fuse.sysconfig, 1.1, 1.2
Message-ID: <20091231164515.6755E11C018B@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/EL-5

Modified Files:
	zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig 
Log Message:
* - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zfs-fuse.init	23 Jan 2009 23:48:24 -0000	1.4
+++ zfs-fuse.init	31 Dec 2009 16:45:13 -0000	1.5
@@ -55,6 +55,32 @@ start() {
     	exit 99
     esac
 
+    if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then
+      echo -n Killing processes with unknown working directory:
+      for a in 1 2 3 4 5 ; do
+        orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+        echo -n $orphans
+        [ "$orphans" == "" ] && break
+        echo -n .
+        kill $orphans
+        sleep 1
+      done
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+      if [ "$orphans" != "" ] ; then
+        echo_failure ; echo
+        echo -n Some orphans still live: $orphans  Killing with signal 9
+        kill -9 $orphans
+      fi
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+      if [ "$orphans" != "" ] ; then
+        echo_failure ; echo
+        echo -n Some orphans still live: $orphans
+        echo_failure ; echo
+        exit 8
+      fi
+      echo_success ; echo
+    fi
+
     echo -n $"Starting $prog: "
     daemon $exec -p "$PIDFILE"
     exec_retval=$?
@@ -84,7 +110,12 @@ start() {
     echo_success
     echo
 
-	if [ $ZFS_AUTOMOUNT -eq 1 ] ; then
+	if [ "$ZFS_AUTOMOUNT" == "1" ] ; then
+		echo "Deprecated use of ZFS_AUTOMOUNT option.  Use ZFS_AUTOMOUNT=yes instead."
+		ZFS_AUTOMOUNT=yes
+	fi
+
+	if [ "$ZFS_AUTOMOUNT" == "yes" ] ; then
 		echo -n $"Mounting zfs partitions: "
     	sleep 1
         rm -f /var/lib/random-seed


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- zfs-fuse.spec	26 Dec 2009 19:30:37 -0000	1.23
+++ zfs-fuse.spec	31 Dec 2009 16:45:13 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          5%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
@@ -10,9 +10,10 @@ URL:              http://zfs-fuse.net/
 #   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
-Source02:         zfs-fuse.sysconfig
+Source02:         zfs-fuse.scrub
+Source03:         zfs-fuse.sysconfig
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel
-Requires:         fuse >= 2.8.0-1
+Requires:         fuse >= 2.7.4-1
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -32,6 +33,8 @@ Microsystems, originally designed for So
 This project is a port of ZFS to the FUSE framework for the Linux
 operating system.
 
+Project home page is at http://zfs-fuse.net/
+
 %prep
 %setup -q
 
@@ -50,7 +53,8 @@ scons
 pushd src
 scons install install_dir=%{buildroot}%{_bindir}
 %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
-%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub
+%{__install} -Dp -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,9 +87,20 @@ fi
 %{_bindir}/zpool
 %{_bindir}/ztest
 %{_initrddir}/%{name}
+%{_sysconfdir}/cron.weekly/98-%{name}-scrub
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Jan 04 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-6
+- Added option for automatic weekly scrubbing.
+  Set ZFS_WEEKLY_SCRUB=yes in /etc/sysconfig/zfs-fuse to enable
+- Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability.
+  ZFS_AUTOMOUNT=1 deprecated and will be removed in version 0.7.0.
+- Added option for killing processes with unknown working directory at zfs-fuse startup.
+  This would be the case if zfs-fuse crashed.  Use with care.  It may kill unrelated processes.
+  Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable.
+- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5
+
 * Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we


Index: zfs-fuse.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zfs-fuse.sysconfig	22 Dec 2008 21:45:14 -0000	1.1
+++ zfs-fuse.sysconfig	31 Dec 2009 16:45:13 -0000	1.2
@@ -1,2 +1,9 @@
-# Set this option to 1 if you want all ZFS filesystems to be mounted on boot.
-ZFS_AUTOMOUNT=1
+# Set this option to yes if you want all ZFS filesystems to be mounted on boot.
+ZFS_AUTOMOUNT=yes
+
+# Set this option to yes to enable weekly scrubbing of your ZFS pools.
+ZFS_WEEKLY_SCRUB=yes
+
+# Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup
+# Use with extreme care.  This will also kill processes totally unrelated to zfs-fuse.
+# ZFS_KILL_ORPHANS=no|yes_really



From donv at fedoraproject.org  Thu Dec 31 16:45:15 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu, 31 Dec 2009 16:45:15 +0000 (UTC)
Subject: rpms/zfs-fuse/devel zfs-fuse.init, 1.6, 1.7 zfs-fuse.spec, 1.26,
	1.27 zfs-fuse.sysconfig, 1.3, 1.4
Message-ID: <20091231164515.CC14F11C018B@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/devel

Modified Files:
	zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig 
Log Message:
* - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- zfs-fuse.init	29 Dec 2009 09:18:23 -0000	1.6
+++ zfs-fuse.init	31 Dec 2009 16:45:15 -0000	1.7
@@ -58,20 +58,20 @@ start() {
     if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then
       echo -n Killing processes with unknown working directory:
       for a in 1 2 3 4 5 ; do
-        orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+        orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
         echo -n $orphans
         [ "$orphans" == "" ] && break
         echo -n .
         kill $orphans
         sleep 1
       done
-      orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
       if [ "$orphans" != "" ] ; then
         echo_failure ; echo
         echo -n Some orphans still live: $orphans  Killing with signal 9
         kill -9 $orphans
       fi
-      orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
       if [ "$orphans" != "" ] ; then
         echo_failure ; echo
         echo -n Some orphans still live: $orphans


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- zfs-fuse.spec	29 Dec 2009 09:18:24 -0000	1.26
+++ zfs-fuse.spec	31 Dec 2009 16:45:15 -0000	1.27
@@ -13,7 +13,7 @@ Source01:         zfs-fuse.init
 Source02:         zfs-fuse.scrub
 Source03:         zfs-fuse.sysconfig
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel
-Requires:         fuse >= 2.8.0-1
+Requires:         fuse >= 2.7.4-1
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -99,6 +99,8 @@ fi
 - Added option for killing processes with unknown working directory at zfs-fuse startup.
   This would be the case if zfs-fuse crashed.  Use with care.  It may kill unrelated processes.
   Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable.
+- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5
+
 * Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we


Index: zfs-fuse.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zfs-fuse.sysconfig	29 Dec 2009 09:18:24 -0000	1.3
+++ zfs-fuse.sysconfig	31 Dec 2009 16:45:15 -0000	1.4
@@ -5,5 +5,5 @@ ZFS_AUTOMOUNT=yes
 ZFS_WEEKLY_SCRUB=yes
 
 # Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup
-# This might kill processes totally unrelated to zfs-fuse.
+# Use with extreme care.  This will also kill processes totally unrelated to zfs-fuse.
 # ZFS_KILL_ORPHANS=no|yes_really



From donv at fedoraproject.org  Thu Dec 31 16:45:15 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu, 31 Dec 2009 16:45:15 +0000 (UTC)
Subject: rpms/zfs-fuse/F-11 zfs-fuse.init, 1.4, 1.5 zfs-fuse.spec, 1.17,
	1.18 zfs-fuse.sysconfig, 1.1, 1.2
Message-ID: <20091231164515.69EC311C02BB@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/F-11

Modified Files:
	zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig 
Log Message:
* - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/zfs-fuse.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zfs-fuse.init	23 Jan 2009 23:48:24 -0000	1.4
+++ zfs-fuse.init	31 Dec 2009 16:45:14 -0000	1.5
@@ -55,6 +55,32 @@ start() {
     	exit 99
     esac
 
+    if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then
+      echo -n Killing processes with unknown working directory:
+      for a in 1 2 3 4 5 ; do
+        orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+        echo -n $orphans
+        [ "$orphans" == "" ] && break
+        echo -n .
+        kill $orphans
+        sleep 1
+      done
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+      if [ "$orphans" != "" ] ; then
+        echo_failure ; echo
+        echo -n Some orphans still live: $orphans  Killing with signal 9
+        kill -9 $orphans
+      fi
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+      if [ "$orphans" != "" ] ; then
+        echo_failure ; echo
+        echo -n Some orphans still live: $orphans
+        echo_failure ; echo
+        exit 8
+      fi
+      echo_success ; echo
+    fi
+
     echo -n $"Starting $prog: "
     daemon $exec -p "$PIDFILE"
     exec_retval=$?
@@ -84,7 +110,12 @@ start() {
     echo_success
     echo
 
-	if [ $ZFS_AUTOMOUNT -eq 1 ] ; then
+	if [ "$ZFS_AUTOMOUNT" == "1" ] ; then
+		echo "Deprecated use of ZFS_AUTOMOUNT option.  Use ZFS_AUTOMOUNT=yes instead."
+		ZFS_AUTOMOUNT=yes
+	fi
+
+	if [ "$ZFS_AUTOMOUNT" == "yes" ] ; then
 		echo -n $"Mounting zfs partitions: "
     	sleep 1
         rm -f /var/lib/random-seed


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/zfs-fuse.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- zfs-fuse.spec	26 Dec 2009 19:30:37 -0000	1.17
+++ zfs-fuse.spec	31 Dec 2009 16:45:14 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          5%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
@@ -10,9 +10,10 @@ URL:              http://zfs-fuse.net/
 #   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
-Source02:         zfs-fuse.sysconfig
+Source02:         zfs-fuse.scrub
+Source03:         zfs-fuse.sysconfig
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel
-Requires:         fuse >= 2.8.0-1
+Requires:         fuse >= 2.7.4-1
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -32,6 +33,8 @@ Microsystems, originally designed for So
 This project is a port of ZFS to the FUSE framework for the Linux
 operating system.
 
+Project home page is at http://zfs-fuse.net/
+
 %prep
 %setup -q
 
@@ -50,7 +53,8 @@ scons
 pushd src
 scons install install_dir=%{buildroot}%{_bindir}
 %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
-%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub
+%{__install} -Dp -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,9 +87,20 @@ fi
 %{_bindir}/zpool
 %{_bindir}/ztest
 %{_initrddir}/%{name}
+%{_sysconfdir}/cron.weekly/98-%{name}-scrub
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Jan 04 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-6
+- Added option for automatic weekly scrubbing.
+  Set ZFS_WEEKLY_SCRUB=yes in /etc/sysconfig/zfs-fuse to enable
+- Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability.
+  ZFS_AUTOMOUNT=1 deprecated and will be removed in version 0.7.0.
+- Added option for killing processes with unknown working directory at zfs-fuse startup.
+  This would be the case if zfs-fuse crashed.  Use with care.  It may kill unrelated processes.
+  Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable.
+- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5
+
 * Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we


Index: zfs-fuse.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-11/zfs-fuse.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zfs-fuse.sysconfig	22 Dec 2008 21:45:14 -0000	1.1
+++ zfs-fuse.sysconfig	31 Dec 2009 16:45:14 -0000	1.2
@@ -1,2 +1,9 @@
-# Set this option to 1 if you want all ZFS filesystems to be mounted on boot.
-ZFS_AUTOMOUNT=1
+# Set this option to yes if you want all ZFS filesystems to be mounted on boot.
+ZFS_AUTOMOUNT=yes
+
+# Set this option to yes to enable weekly scrubbing of your ZFS pools.
+ZFS_WEEKLY_SCRUB=yes
+
+# Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup
+# Use with extreme care.  This will also kill processes totally unrelated to zfs-fuse.
+# ZFS_KILL_ORPHANS=no|yes_really



From donv at fedoraproject.org  Thu Dec 31 16:45:15 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu, 31 Dec 2009 16:45:15 +0000 (UTC)
Subject: rpms/zfs-fuse/F-12 zfs-fuse.init, 1.4, 1.5 zfs-fuse.spec, 1.19,
	1.20 zfs-fuse.sysconfig, 1.1, 1.2
Message-ID: <20091231164515.8495F11C0375@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/F-12

Modified Files:
	zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig 
Log Message:
* - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zfs-fuse.init	23 Jan 2009 23:48:24 -0000	1.4
+++ zfs-fuse.init	31 Dec 2009 16:45:15 -0000	1.5
@@ -55,6 +55,32 @@ start() {
     	exit 99
     esac
 
+    if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then
+      echo -n Killing processes with unknown working directory:
+      for a in 1 2 3 4 5 ; do
+        orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+        echo -n $orphans
+        [ "$orphans" == "" ] && break
+        echo -n .
+        kill $orphans
+        sleep 1
+      done
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+      if [ "$orphans" != "" ] ; then
+        echo_failure ; echo
+        echo -n Some orphans still live: $orphans  Killing with signal 9
+        kill -9 $orphans
+      fi
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
+      if [ "$orphans" != "" ] ; then
+        echo_failure ; echo
+        echo -n Some orphans still live: $orphans
+        echo_failure ; echo
+        exit 8
+      fi
+      echo_success ; echo
+    fi
+
     echo -n $"Starting $prog: "
     daemon $exec -p "$PIDFILE"
     exec_retval=$?
@@ -84,7 +110,12 @@ start() {
     echo_success
     echo
 
-	if [ $ZFS_AUTOMOUNT -eq 1 ] ; then
+	if [ "$ZFS_AUTOMOUNT" == "1" ] ; then
+		echo "Deprecated use of ZFS_AUTOMOUNT option.  Use ZFS_AUTOMOUNT=yes instead."
+		ZFS_AUTOMOUNT=yes
+	fi
+
+	if [ "$ZFS_AUTOMOUNT" == "yes" ] ; then
 		echo -n $"Mounting zfs partitions: "
     	sleep 1
         rm -f /var/lib/random-seed


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- zfs-fuse.spec	26 Dec 2009 19:30:37 -0000	1.19
+++ zfs-fuse.spec	31 Dec 2009 16:45:15 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.6.0
-Release:          5%{?dist}
+Release:          6%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
@@ -10,9 +10,10 @@ URL:              http://zfs-fuse.net/
 #   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
-Source02:         zfs-fuse.sysconfig
+Source02:         zfs-fuse.scrub
+Source03:         zfs-fuse.sysconfig
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel
-Requires:         fuse >= 2.8.0-1
+Requires:         fuse >= 2.7.4-1
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -32,6 +33,8 @@ Microsystems, originally designed for So
 This project is a port of ZFS to the FUSE framework for the Linux
 operating system.
 
+Project home page is at http://zfs-fuse.net/
+
 %prep
 %setup -q
 
@@ -50,7 +53,8 @@ scons
 pushd src
 scons install install_dir=%{buildroot}%{_bindir}
 %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
-%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub
+%{__install} -Dp -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,9 +87,20 @@ fi
 %{_bindir}/zpool
 %{_bindir}/ztest
 %{_initrddir}/%{name}
+%{_sysconfdir}/cron.weekly/98-%{name}-scrub
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Jan 04 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-6
+- Added option for automatic weekly scrubbing.
+  Set ZFS_WEEKLY_SCRUB=yes in /etc/sysconfig/zfs-fuse to enable
+- Changed ZFS_AUTOMOUNT option value from "1" to "yes" for better readability.
+  ZFS_AUTOMOUNT=1 deprecated and will be removed in version 0.7.0.
+- Added option for killing processes with unknown working directory at zfs-fuse startup.
+  This would be the case if zfs-fuse crashed.  Use with care.  It may kill unrelated processes.
+  Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable.
+- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5
+
 * Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we


Index: zfs-fuse.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zfs-fuse.sysconfig	22 Dec 2008 21:45:14 -0000	1.1
+++ zfs-fuse.sysconfig	31 Dec 2009 16:45:15 -0000	1.2
@@ -1,2 +1,9 @@
-# Set this option to 1 if you want all ZFS filesystems to be mounted on boot.
-ZFS_AUTOMOUNT=1
+# Set this option to yes if you want all ZFS filesystems to be mounted on boot.
+ZFS_AUTOMOUNT=yes
+
+# Set this option to yes to enable weekly scrubbing of your ZFS pools.
+ZFS_WEEKLY_SCRUB=yes
+
+# Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup
+# Use with extreme care.  This will also kill processes totally unrelated to zfs-fuse.
+# ZFS_KILL_ORPHANS=no|yes_really



From donv at fedoraproject.org  Thu Dec 31 16:46:22 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu, 31 Dec 2009 16:46:22 +0000 (UTC)
Subject: rpms/zfs-fuse/EL-5 zfs-fuse.scrub,NONE,1.1
Message-ID: <20091231164622.AFC5811C018B@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31633/EL-5

Added Files:
	zfs-fuse.scrub 
Log Message:
* - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5


--- NEW FILE zfs-fuse.scrub ---
#!/bin/bash
#
# This script reads it's configuration from /etc/sysconfig/zfs-fuse
# Please use that file to enable/disable this script or to set the
# type of check you wish performed.

[ -f /etc/sysconfig/zfs-fuse ] || exit 0
. /etc/sysconfig/zfs-fuse

[ "$ZFS_WEEKLY_SCRUB" != "yes" ] && exit 0

zpool=/usr/bin/zpool

pools=$zpool list -H | cut -f1

echo Found these pools: $pools

for pool in $pools; do
  echo "Starting scrub of pool $pool"
  $zpool scrub $pool
done

echo "ZFS Fuse automatic scrub start done.  Use '$zpool status' to see progress.



From donv at fedoraproject.org  Thu Dec 31 16:46:22 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu, 31 Dec 2009 16:46:22 +0000 (UTC)
Subject: rpms/zfs-fuse/F-11 zfs-fuse.scrub,NONE,1.1
Message-ID: <20091231164622.CD5C511C018B@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31633/F-11

Added Files:
	zfs-fuse.scrub 
Log Message:
* - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5


--- NEW FILE zfs-fuse.scrub ---
#!/bin/bash
#
# This script reads it's configuration from /etc/sysconfig/zfs-fuse
# Please use that file to enable/disable this script or to set the
# type of check you wish performed.

[ -f /etc/sysconfig/zfs-fuse ] || exit 0
. /etc/sysconfig/zfs-fuse

[ "$ZFS_WEEKLY_SCRUB" != "yes" ] && exit 0

zpool=/usr/bin/zpool

pools=$zpool list -H | cut -f1

echo Found these pools: $pools

for pool in $pools; do
  echo "Starting scrub of pool $pool"
  $zpool scrub $pool
done

echo "ZFS Fuse automatic scrub start done.  Use '$zpool status' to see progress.



From donv at fedoraproject.org  Thu Dec 31 16:46:22 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu, 31 Dec 2009 16:46:22 +0000 (UTC)
Subject: rpms/zfs-fuse/F-12 zfs-fuse.scrub,NONE,1.1
Message-ID: <20091231164622.EC11611C018B@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31633/F-12

Added Files:
	zfs-fuse.scrub 
Log Message:
* - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5


--- NEW FILE zfs-fuse.scrub ---
#!/bin/bash
#
# This script reads it's configuration from /etc/sysconfig/zfs-fuse
# Please use that file to enable/disable this script or to set the
# type of check you wish performed.

[ -f /etc/sysconfig/zfs-fuse ] || exit 0
. /etc/sysconfig/zfs-fuse

[ "$ZFS_WEEKLY_SCRUB" != "yes" ] && exit 0

zpool=/usr/bin/zpool

pools=$zpool list -H | cut -f1

echo Found these pools: $pools

for pool in $pools; do
  echo "Starting scrub of pool $pool"
  $zpool scrub $pool
done

echo "ZFS Fuse automatic scrub start done.  Use '$zpool status' to see progress.



From till at fedoraproject.org  Thu Dec 31 16:49:58 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu, 31 Dec 2009 16:49:58 +0000 (UTC)
Subject: rpms/lzip/devel lzip.spec,1.7,1.8
Message-ID: <20091231164958.52E8A11C018B@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/lzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv342

Modified Files:
	lzip.spec 
Log Message:
* Thu Dec 31 2009 Till Maas <opensource at till.name> - 1.8-1
- Update to new release
- Fix end of line encoding of COPYING



Index: lzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lzip/devel/lzip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- lzip.spec	31 Dec 2009 13:02:42 -0000	1.7
+++ lzip.spec	31 Dec 2009 16:49:58 -0000	1.8
@@ -22,8 +22,10 @@ format (.lz) is not compatible with the 
 
 %prep
 %setup -q
+# file needs to be copied, because it is used in "make check"
+cp -a COPYING{,.txt}
 # convert CRLF to LF
-sed -i 's/\r//' COPYING
+sed -i 's/\r//' COPYING.txt 
 
 
 %build
@@ -60,7 +62,7 @@ fi
 %files
 %defattr(-,root,root,-)
 # TODO is currently empty
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING.txt NEWS README
 %{_bindir}/lzip
 %{_bindir}/lziprecover
 %{_infodir}/lzip.info*



From mtasaka at fedoraproject.org  Thu Dec 31 16:51:18 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 31 Dec 2009 16:51:18 +0000 (UTC)
Subject: File gnome-commander-1.2.9-git_D20100101T0000.tar.bz2 uploaded to
	lookaside cache by mtasaka
Message-ID: <20091231165118.026B410F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for gnome-commander:

92c06a25f20a47084d89067dcf0fc02e  gnome-commander-1.2.9-git_D20100101T0000.tar.bz2



From mtasaka at fedoraproject.org  Thu Dec 31 16:52:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 31 Dec 2009 16:52:12 +0000 (UTC)
Subject: rpms/gnome-commander/devel .cvsignore, 1.38, 1.39 gnome-commander.spec,
	1.63, 1.64 sources, 1.39, 1.40
Message-ID: <20091231165212.C423911C018B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv983

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Fri Jan  1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- A Happy New Year



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	3 Dec 2009 07:37:44 -0000	1.38
+++ .cvsignore	31 Dec 2009 16:52:12 -0000	1.39
@@ -1 +1 @@
-gnome-commander-1.2.9-git_D20091203T1630.tar.bz2
+gnome-commander-1.2.9-git_D20100101T0000.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gnome-commander.spec	3 Dec 2009 07:37:44 -0000	1.63
+++ gnome-commander.spec	31 Dec 2009 16:52:12 -0000	1.64
@@ -21,7 +21,7 @@
 %global        LIBGSF_REQ            1.12.0
 %global        POPPLER_REQ           0.6
 
-%global        git_pull_JST          D20091203T1630
+%global        git_pull_JST          D20100101T0000
 
 %global        use_autotool          0
 %global        update_po             1
@@ -214,6 +214,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Fri Jan  1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- A Happy New Year
+
 * Thu Dec  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to the latest git
   (to fix crash when cancelling symlink creation with ESC


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	3 Dec 2009 07:37:44 -0000	1.39
+++ sources	31 Dec 2009 16:52:12 -0000	1.40
@@ -1 +1 @@
-0bf901b01b4162fc5d68212cca0e493a  gnome-commander-1.2.9-git_D20091203T1630.tar.bz2
+92c06a25f20a47084d89067dcf0fc02e  gnome-commander-1.2.9-git_D20100101T0000.tar.bz2



From mtasaka at fedoraproject.org  Thu Dec 31 17:00:05 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 31 Dec 2009 17:00:05 +0000 (UTC)
Subject: File jd-2.6.0-svn3283_trunk.tgz uploaded to lookaside cache by mtasaka
Message-ID: <20091231170005.A8D5A10F894@bastion.fedoraproject.org>

A file has been added to the lookaside cache for jd:

046cfa6b37a869c5cc3ccd1bd5716029  jd-2.6.0-svn3283_trunk.tgz



From mtasaka at fedoraproject.org  Thu Dec 31 17:01:51 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 31 Dec 2009 17:01:51 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.411, 1.412 jd.spec, 1.473, 1.474 sources, 
	1.412, 1.413
Message-ID: <20091231170151.530FD11C018B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3659

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Jan  1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- A Happy New Year



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- .cvsignore	28 Dec 2009 14:51:22 -0000	1.411
+++ .cvsignore	31 Dec 2009 17:01:50 -0000	1.412
@@ -1 +1 @@
-jd-2.5.5-091228.tgz
+jd-2.6.0-svn3283_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -p -r1.473 -r1.474
--- jd.spec	28 Dec 2009 14:51:22 -0000	1.473
+++ jd.spec	31 Dec 2009 17:01:50 -0000	1.474
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.5.5
-%define         strtag        091228
+%define         main_ver      2.6.0
+%define         strtag        svn3283_trunk
 %define         repoid        45148
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Fri Jan  1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- A Happy New Year
+
 * Mon Dec 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.5-1
 - 2.5.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- sources	28 Dec 2009 14:51:22 -0000	1.412
+++ sources	31 Dec 2009 17:01:51 -0000	1.413
@@ -1 +1 @@
-250ed919c3899c9ec1b0bebc976f1d72  jd-2.5.5-091228.tgz
+046cfa6b37a869c5cc3ccd1bd5716029  jd-2.6.0-svn3283_trunk.tgz



From sharkcz at fedoraproject.org  Thu Dec 31 17:14:02 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 31 Dec 2009 17:14:02 +0000 (UTC)
Subject: File zabbix-1.6.8.tar.gz uploaded to lookaside cache by sharkcz
Message-ID: <20091231171402.BF77010F88E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for zabbix:

3255afd2d44454bae3ec5158920a824f  zabbix-1.6.8.tar.gz



From sharkcz at fedoraproject.org  Thu Dec 31 17:16:02 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 31 Dec 2009 17:16:02 +0000 (UTC)
Subject: rpms/zabbix/devel .cvsignore, 1.18, 1.19 sources, 1.19,
	1.20 zabbix.spec, 1.47, 1.48
Message-ID: <20091231171602.B569F11C018B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6708

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Thu Dec 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.8-1
- Update to 1.6.8
- Upstream changelog: http://www.zabbix.com/rn1.6.8.php
- fixes 2 issues from #551331



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Aug 2009 09:38:10 -0000	1.18
+++ .cvsignore	31 Dec 2009 17:16:02 -0000	1.19
@@ -1 +1 @@
-zabbix-1.6.6.tar.gz
+zabbix-1.6.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Aug 2009 09:38:10 -0000	1.19
+++ sources	31 Dec 2009 17:16:02 -0000	1.20
@@ -1 +1 @@
-52779160e71c12d47b97f7336e25c395  zabbix-1.6.6.tar.gz
+3255afd2d44454bae3ec5158920a824f  zabbix-1.6.8.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- zabbix.spec	25 Nov 2009 17:56:13 -0000	1.47
+++ zabbix.spec	31 Dec 2009 17:16:02 -0000	1.48
@@ -6,8 +6,8 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.6.6
-Release:        2%{?dist}
+Version:        1.6.8
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -549,6 +549,11 @@ fi
 
 
 %changelog
+* Thu Dec 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.8-1
+- Update to 1.6.8
+- Upstream changelog: http://www.zabbix.com/rn1.6.8.php
+- fixes 2 issues from #551331
+
 * Wed Nov 25 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-2
 - rebuilt with net-snmp 5.5
 



From sharkcz at fedoraproject.org  Thu Dec 31 17:17:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 31 Dec 2009 17:17:38 +0000 (UTC)
Subject: rpms/zabbix/F-12 .cvsignore, 1.18, 1.19 sources, 1.19,
	1.20 zabbix.spec, 1.46, 1.47
Message-ID: <20091231171738.F3F7C11C018B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7155

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Thu Dec 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.8-1
- Update to 1.6.8
- Upstream changelog: http://www.zabbix.com/rn1.6.8.php
- fixes 2 issues from #551331



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Aug 2009 09:38:10 -0000	1.18
+++ .cvsignore	31 Dec 2009 17:17:38 -0000	1.19
@@ -1 +1 @@
-zabbix-1.6.6.tar.gz
+zabbix-1.6.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Aug 2009 09:38:10 -0000	1.19
+++ sources	31 Dec 2009 17:17:38 -0000	1.20
@@ -1 +1 @@
-52779160e71c12d47b97f7336e25c395  zabbix-1.6.6.tar.gz
+3255afd2d44454bae3ec5158920a824f  zabbix-1.6.8.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-12/zabbix.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- zabbix.spec	29 Aug 2009 09:38:10 -0000	1.46
+++ zabbix.spec	31 Dec 2009 17:17:38 -0000	1.47
@@ -6,7 +6,7 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.6.6
+Version:        1.6.8
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -549,6 +549,11 @@ fi
 
 
 %changelog
+* Thu Dec 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.8-1
+- Update to 1.6.8
+- Upstream changelog: http://www.zabbix.com/rn1.6.8.php
+- fixes 2 issues from #551331
+
 * Sat Aug 29 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-1
 - Update to 1.6.6
 - Upstream changelog: http://www.zabbix.com/rn1.6.6.php



From sharkcz at fedoraproject.org  Thu Dec 31 17:19:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 31 Dec 2009 17:19:53 +0000 (UTC)
Subject: rpms/zabbix/F-11 .cvsignore, 1.18, 1.19 sources, 1.19,
	1.20 zabbix.spec, 1.40, 1.41
Message-ID: <20091231171953.6217E11C018B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7767

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Thu Dec 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.8-1
- Update to 1.6.8
- Upstream changelog: http://www.zabbix.com/rn1.6.8.php
- fixes 2 issues from #551331



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Aug 2009 09:57:33 -0000	1.18
+++ .cvsignore	31 Dec 2009 17:19:53 -0000	1.19
@@ -1 +1 @@
-zabbix-1.6.6.tar.gz
+zabbix-1.6.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Aug 2009 09:57:33 -0000	1.19
+++ sources	31 Dec 2009 17:19:53 -0000	1.20
@@ -1 +1 @@
-52779160e71c12d47b97f7336e25c395  zabbix-1.6.6.tar.gz
+3255afd2d44454bae3ec5158920a824f  zabbix-1.6.8.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-11/zabbix.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- zabbix.spec	29 Aug 2009 09:57:33 -0000	1.40
+++ zabbix.spec	31 Dec 2009 17:19:53 -0000	1.41
@@ -6,7 +6,7 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.6.6
+Version:        1.6.8
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -549,6 +549,11 @@ fi
 
 
 %changelog
+* Thu Dec 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.8-1
+- Update to 1.6.8
+- Upstream changelog: http://www.zabbix.com/rn1.6.8.php
+- fixes 2 issues from #551331
+
 * Sat Aug 29 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-1
 - Update to 1.6.6
 - Upstream changelog: http://www.zabbix.com/rn1.6.6.php



From rdieter at fedoraproject.org  Thu Dec 31 19:58:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 31 Dec 2009 19:58:46 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.85-dt_validate.patch, NONE,
	1.1 kdepim.spec, 1.260, 1.261 kdepim-4.3.75-desktop-fixes.patch,
	1.1, NONE
Message-ID: <20091231195846.BE88011C018B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7101

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.85-dt_validate.patch 
Removed Files:
	kdepim-4.3.75-desktop-fixes.patch 
Log Message:
* Thu Dec 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
- dt_validate patch


kdepim-4.3.85-dt_validate.patch:
 kontact-admin.desktop |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdepim-4.3.85-dt_validate.patch ---
diff -up kdepim-4.3.85/doc/kontact-admin/kontact-admin.desktop.dt_validate kdepim-4.3.85/doc/kontact-admin/kontact-admin.desktop
--- kdepim-4.3.85/doc/kontact-admin/kontact-admin.desktop.dt_validate	2009-12-14 04:54:47.000000000 -0600
+++ kdepim-4.3.85/doc/kontact-admin/kontact-admin.desktop	2009-12-31 13:53:38.888390711 -0600
@@ -24,3 +24,4 @@ Categories=Qt;KDE;Office;ProjectManageme
 X-DocPath=kontact-admin/index.html
 NoDisplay=true
 Terminal=false
+Type=Application


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- kdepim.spec	27 Dec 2009 14:38:08 -0000	1.260
+++ kdepim.spec	31 Dec 2009 19:58:46 -0000	1.261
@@ -3,7 +3,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.85
-Release: 3%{?dist}.1
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -16,11 +16,9 @@ Patch0:  kdepim-4.1.80-libqgpgme-link-fi
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 # add -fno-var-tracking-assignments for kmail/globalsettings_base.cpp (#538233)
 Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch
-Patch3:  kdepim-4.3.75-desktop-fixes.patch
 
-# upstream patches (4.4 branch):
-
-# upstream patches (trunk)
+# upstream patches
+Patch100: kdepim-4.3.85-dt_validate.patch
 
 Obsoletes: bilbo < 1:1.0
 %if 0%{?fedora} < 13
@@ -104,7 +102,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
 %patch2 -p1 -b .kmail_globalsettings_no_var_tracking
 %endif
-%patch3 -p1 -b .desktop-fixes
+%patch100 -p1 -b .dt_validate
 
 
 %build
@@ -199,13 +197,13 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/libkdepim/
 %{_kde4_appsdir}/libkleopatra/
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/*.desktop
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_docdir}/HTML/en/*
 %{_mandir}/man*/*.gz
 
@@ -221,6 +219,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
+- dt_validate patch
+
 * Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-3.1
 - Requires: kpilot for upgrade path (F12-)
 


--- kdepim-4.3.75-desktop-fixes.patch DELETED ---



From praveenp at fedoraproject.org  Thu Dec 31 20:05:14 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 31 Dec 2009 20:05:14 +0000 (UTC)
Subject: rpms/openwsman/EL-5 openwsman-pam-auth.patch, NONE,
	1.1 openwsman-randfile.patch, NONE, 1.1 perl-bindings.patch,
	NONE, 1.1 openwsman-initscript.patch, 1.1, 1.2 openwsman.spec,
	1.6, 1.7
Message-ID: <20091231200514.8752711C018B@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8231

Modified Files:
	openwsman-initscript.patch openwsman.spec 
Added Files:
	openwsman-pam-auth.patch openwsman-randfile.patch 
	perl-bindings.patch 
Log Message:
Updated the spec file to follow the upstream packaging format


openwsman-pam-auth.patch:
 openwsman.conf |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openwsman-pam-auth.patch ---
Index: openwsman.conf
===================================================================
--- openwsman-2.0.0/etc/openwsman.conf	(revision 3221)
+++ openwsman-2.0.0/etc/openwsman.conf	(working copy)
@@ -4,7 +4,7 @@
 ssl_cert_file = /etc/openwsman/servercert.pem
 ssl_key_file = /etc/openwsman/serverkey.pem
 digest_password_file = /etc/openwsman/digest_auth.passwd
-basic_password_file = /etc/openwsman/simple_auth.passwd
+#basic_password_file = /etc/openwsman/simple_auth.passwd
 
 min_threads = 4
 max_threads = 10
@@ -15,8 +15,8 @@
 # Authentication backend for BASIC authentication. Default is to read a configuration file defined with 'basic_password_file'
 #
 
-#basic_authenticator = libwsman_pam_auth.so
-#basic_authenticator_arg = openwsman
+basic_authenticator = libwsman_pam_auth.so
+basic_authenticator_arg = openwsman
 
 #
 # WS-Management unauthenticated wsmid:Identify file

openwsman-randfile.patch:
 ssleay.cnf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openwsman-randfile.patch ---
diff -up ./etc/ssleay.cnf.new ./etc/ssleay.cnf
--- ./etc/ssleay.cnf.new	2009-12-16 17:04:15.000000000 -0600
+++ ./etc/ssleay.cnf	2009-12-16 17:04:55.000000000 -0600
@@ -2,7 +2,7 @@
 # SSLeay example configuration file.
 #
 
-RANDFILE                = $ENV::HOME/.rnd
+RANDFILE                = /dev/random
 
 [ req ]
 default_bits            = 1024

perl-bindings.patch:
 Makefile.am |    1 +
 Makefile.in |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE perl-bindings.patch ---
diff -up openwsman-2.2.0/bindings/perl/Makefile.am.org openwsman-2.2.0/bindings/perl/Makefile.am
--- openwsman-2.2.0/bindings/perl/Makefile.am.org	2009-12-10 13:34:55.000000000 -0600
+++ openwsman-2.2.0/bindings/perl/Makefile.am	2009-12-10 13:35:56.000000000 -0600
@@ -33,6 +33,7 @@ SWIG_INPUT = ../openwsman.i
 openwsman_la_SOURCES = openwsman_wrap.c \
 			 ../openwsman.c \
 			 $(SWIG_INPUT)
+all-local: openwsman.pm
 
 openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
 
diff -up openwsman-2.2.0/bindings/perl/Makefile.in.org openwsman-2.2.0/bindings/perl/Makefile.in
--- openwsman-2.2.0/bindings/perl/Makefile.in.org	2009-12-10 13:35:03.000000000 -0600
+++ openwsman-2.2.0/bindings/perl/Makefile.in	2009-12-10 13:36:18.000000000 -0600
@@ -289,6 +289,7 @@ SWIG_INPUT = ../openwsman.i
 openwsman_la_SOURCES = openwsman_wrap.c \
 			 ../openwsman.c \
 			 $(SWIG_INPUT)
+all-local: openwsman.pm
 
 openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
 openwsman_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)

openwsman-initscript.patch:
 openwsmand.sh.in |   71 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 18 deletions(-)

Index: openwsman-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openwsman-initscript.patch	1 Nov 2008 10:34:43 -0000	1.1
+++ openwsman-initscript.patch	31 Dec 2009 20:05:13 -0000	1.2
@@ -1,11 +1,14 @@
---- openwsman-2.0.0/etc/init/openwsmand.sh.in.orig	2008-09-07 00:01:29.000000000 -0500
-+++ openwsman-2.0.0/etc/init/openwsmand.sh.in	2008-09-07 00:34:57.000000000 -0500
-@@ -4,15 +4,13 @@
+diff -up ./etc/init/openwsmand.sh.in.new ./etc/init/openwsmand.sh.in
+--- ./etc/init/openwsmand.sh.in.new	2009-12-16 18:16:06.000000000 -0600
++++ ./etc/init/openwsmand.sh.in	2009-12-16 18:16:18.000000000 -0600
+@@ -4,21 +4,21 @@
  # Provides: openwsmand
  # Required-Start: $remote_fs
  # Required-Stop: $network
 -# Default-Start: 2 3 4 5
 -# Default-Stop: 0 1 6 
++# Default-Start:
++# Default-Stop:
  # Short-Description: Openwsman Daemon
  # Description: openwsmand
  #       Start/Stop the Openwsman Daemon
@@ -17,12 +20,109 @@
  # description: Openwsman Daemon
  # processname: openwsmand
  
-@@ -57,7 +55,7 @@ case "$1" in
-             if [ "x${FQDN}" = "x" ]; then
-                 FQDN=localhost.localdomain
-             fi
--cat << EOF | sh @SYSCONFDIR@/owsmangencert.sh > /dev/null 2>&1
-+cat << EOF | sh @libexecdir@/openwsman/owsmangencert.sh > /dev/null 2>&1
- --
- SomeState
- SomeCity
+ NAME=openwsmand
+ DAEMON=/usr/sbin/$NAME
+-OPTIONS=
++OPTIONS=-S
+ PIDFILE=/var/run/$NAME.pid
+ 
+ if [ $EUID != 0 ]; then
+@@ -37,12 +37,14 @@ lockfile=${SVIlock:-/var/lock/subsys/$NA
+ if [ -f "/etc/sysconfig/openwsman" ]; then
+     . /etc/sysconfig/openwsman
+ fi
+-# See how we were called.
+-. /etc/rc.status
+ 
+-# Reset status of this service
+-rc_reset
++if [ -f "/etc/SuSe-release" ]; then
++     # See how we were called.
++     . /etc/rc.status
+ 
++     # Reset status of this service
++     rc_reset
++fi
+ 
+ case "$1" in
+     start)
+@@ -71,16 +73,28 @@ EOF
+ 
+     # Start daemons.
+     echo -n "Starting the $DESCRIPTIVE"
+-    startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++    	startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
++    	rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++    	$DAEMON -S && echo "          done." || echo "   failed."
++    fi
++    
+     touch $lockfile
+     ;;
+ 
+     stop)
+     # Stop daemons.
+     echo -n "Shutting down $DESCRIPTIVE"
+-    killproc -p $PIDFILE -TERM $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++       killproc -p $PIDFILE -TERM $DAEMON
++       rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++       kill -9 `pidof openwsmand` > /dev/null 2>&1
++          if [ $? -eq 0 ]; then
++             echo "         done"
++          fi
++    fi
+     rm -f $lockfile
+     ;;
+ 
+@@ -91,19 +105,40 @@ EOF
+     ;;
+ 
+     reload)
+-    echo -n "Reload service $DESCRIPTIVE"
+-    killproc -p $PIDFILE  -HUP $DAEMON
+-    rc_status -v
++    echo -n "Reloading service $DESCRIPTIVE"
++    if [ -f "/etc-SuSe-release" ]; then
++    	killproc -p $PIDFILE  -HUP $DAEMON
++    	rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++    	killall -HUP openwsmad && echo "            done."|| echo "    failed."
++    fi
+     ;;
+ 
+     status)
+     echo -n "Checking for service $DESCRIPTIVE"
+-    checkproc -p $PIDFILE $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++        checkproc -p $PIDFILE $DAEMON
++        rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++        pidof opewsmand > /dev/null 2>&1
++        if [ $? -eq 0 ]; then
++           echo "         running"
++        else
++           echo "         stopped"
++        fi 
++    fi
++        
++    ;;
++    condrestart)
++       [ -f $lockfile ] && restart || :
+     ;;
+ 
+     *)
+-    echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
++    echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
+ esac
+ 
++if [ -f "/etc/SuSe-release" ]; then
+ rc_exit
++elif [ -f "/etc/redhat-release" ]; then
++exit 0 
++fi


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openwsman.spec	1 Oct 2009 18:14:51 -0000	1.6
+++ openwsman.spec	31 Dec 2009 20:05:14 -0000	1.7
@@ -1,21 +1,24 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
 %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
-%define ruby_libdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
-
 
 Name:          openwsman
 Version:       2.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source2:        python-config
 Patch0:         %{name}-initscript.patch
+Patch1:         %{name}-pam-auth.patch
+Patch2:         perl-bindings.patch
+Patch3:         openwsman-randfile.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 Group:          System Environment/Daemons
-Summary:        Web Services Management libraries
-BuildRequires:  sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel
+Summary:        Opensource Implementation of WS-Management
+BuildRequires:  sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel libtool
+BuildRequires:  perl pkgconfig openssl-devel net-tools
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(postun): initscripts
@@ -29,132 +32,223 @@ is based on a suite of web services spec
 requirements that exposes a set of operations focused on and covers
 all system management aspects.
 
-
-%package devel
-Summary:        Openwsman Development files
+%package -n libwsman1
+License:        BSD
+Group:          System Environment/Libraries
+Summary:        Opensource Implementation of WS-Management
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
+Requires:       %{name}-client
+
+%description -n libwsman1
+Openwsman library for packages dependent on openwsman
+%package -n libwsman-devel
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-%description devel
-Openwsman Development files
+Summary:        Opensource Implementation of WS-Management
+Provides:       %{name}-devel = %{version}
+Obsoletes:      %{name}-devel < %{version}
+Requires:       libwsman1 = %{version}
+Requires:       %{name}-server = %{version}
+Requires:       %{name}-client = %{version}
+Requires:       sblim-sfcc-devel libxml2-devel pam-devel
+Requires:       curl-devel
+
+%description -n libwsman-devel
+Development files for openwsman
+
+%package client
+License:        BSD
+Group:          System Environment/Libraries
+Summary:        Openwsman Client libraries
+
+%description client
+Openwsman Client libraries
+
+%package server
+License:        BSD
+Group:          System Environment/Daemons
+Requires:       net-tools
+Requires:       openwsman-client
+Requires(post):       chkconfig
+Requires(preun):      chkconfig
+Requires(postun):     initscripts
+Summary:        Openwsman Server and service libraries
+
+%description server
+Openwsman Server and service libraries
+
 
 %package python
-Summary:        Openwsman Python bindings
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:        Python bindings for openwsman client API
+Requires:       python
+
 %description python
-Openwsman python bindings
+This package provides Python bindings to access the openwsman client
+API.
 
-%package -n ruby-%{name}
-Summary:        Openwsman Ruby bindings
+%package ruby
+License:        BSD
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Provides:       ruby(%{name}) = %{version}
-%description -n ruby-%{name}
-Openwsman ruby bindings
+Summary:        Ruby bindings for openwsman client API
+
+%description ruby
+This package provides Ruby bindings to access the openwsman client API.
+
+%package perl
+License:        BSD
+Group:          Development/Libraries
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Summary:        Perl bindings for openwsman client API
+
+%description perl
+This package provides Perl bindings to access the openwsman client API.
+
+
+
 
 
 %prep
-%setup -q
+%setup -q 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 cp -p %{SOURCE2} %{_builddir}/%{name}-%{version}
 sed -i -e 's|#!/usr/bin/python2.5|#!%{__python}|' %{_builddir}/%{name}-%{version}/python-config
 
 %build
+sh autoconfiscate.sh
 chmod a-x src/lib/*.[ch]
 chmod a-x src/cpp/*.[ch]
 chmod a-x include/*.[ch]
 
 # disable eventing, as Fedora libcurl isn't linked against openssl
 # disable tests in 2.1.0, http://www.openwsman.org/bug/263
-%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings PATH=$PATH:.
-make %{?_smp_flags}
+%configure  --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings --disable-static --enable-perl --enable-ipv6 PATH=$PATH:.
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA"
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-install -m 0644 etc/openwsman.conf %{buildroot}/etc/openwsman
-install -m 0644 etc/ssleay.cnf %{buildroot}/etc/openwsman
-install -D -m 0755 etc/init/%{name}d.sh %{buildroot}/%{_initrddir}/%{name}d
-# move this helper script out of /etc
-mkdir -p %{buildroot}/%{_libexecdir}/%{name}/
-chmod 0755 %{buildroot}/etc/%{name}/owsmangencert.sh
-mv %{buildroot}/etc/%{name}/owsmangencert.sh %{buildroot}/%{_libexecdir}/%{name}/
-find %{buildroot} -type f -name \*.la -exec rm \{\} \;
-find %{buildroot} -type f -name \*.a -exec rm \{\} \;
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/authenticators/*.la
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -m 644 etc/openwsman.conf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 644 etc/ssleay.cnf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 755 etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openwsmand
+ln -sf %{_sysconfdir}/init.d/openwsmand $RPM_BUILD_ROOT%{_sbindir}/rcopenwsmand
 
 %clean
 rm -rf %{buildroot}
+%post -n libwsman1 -p /sbin/ldconfig
+
+%postun -n libwsman1 -p /sbin/ldconfig
+
+%post server
+/sbin/ldconfig
+chkconfig --add  openwsmand
+
+%preun server
+chkconfig --del openwsmand
+
+%postun server
+rm -f /var/log/wsmand.log
+/sbin/ldconfig
+
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
 
-%files
+%files -n libwsman1
 %defattr(-,root,root)
-%{_sbindir}/%{name}d
-%{_initrddir}/%{name}d
-%{_libexecdir}/%{name}
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/authenticators
-%{_libdir}/libwsman*.so.*
-%{_libdir}/%{name}/plugins/*so.*
-%{_libdir}/%{name}/authenticators/*so.*
-%dir /etc/openwsman
-%config(noreplace) /etc/openwsman/openwsman.conf
-%config(noreplace) /etc/openwsman/ssleay.cnf
-%{ruby_libdir}/openwsman
-%config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%doc COPYING README
+%doc AUTHORS COPYING ChangeLog README TODO
+%{_libdir}/libwsman.so.*
+%{_libdir}/libwsman_client.so.*
+%{_libdir}/libwsman_curl_client_transport.so.*
 
-%files devel
+%files -n libwsman-devel
 %defattr(-,root,root)
 %{_includedir}/*
+%{_libdir}/pkgconfig/*
 %{_libdir}/*.so
-%{_libdir}/%{name}/plugins/*so
-%{_libdir}/%{name}/authenticators/*so
-%{_libdir}/pkgconfig/%{name}*.pc
-%doc COPYING examples/serialize.c doc/plugin* 
+%doc AUTHORS COPYING ChangeLog README
 
 %files python
 %defattr(-,root,root)
-%{python_sitelib}/pywsman.py
 %{python_sitearch}/*.so
-%doc COPYING
+%{python_sitelib}/*.py
+#%{python_sitelib}/*.pyc
+#%{python_sitelib}/*.pyo
+%doc AUTHORS COPYING ChangeLog README
 
-%files -n ruby-%{name}
+%files ruby
 %defattr(-,root,root)
-%{ruby_sitearch}/*.so
-%doc COPYING
-
-%post
-/sbin/ldconfig
-/sbin/chkconfig --add %{name}d
+%{ruby_sitearch}/openwsman.so
+%dir %{ruby_sitelib}/openwsman
+%{ruby_sitelib}/openwsman/openwsman.rb
+%{ruby_sitelib}/openwsman/wsxmlnode.rb
+%doc AUTHORS COPYING ChangeLog README
 
-%preun
-if [ $1 = 0 ] ; then
-    /sbin/service %{name}d stop >/dev/null 2>&1
-    /sbin/chkconfig --del %{name}d
-fi
-
-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ] ; then
-    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-fi
+%files perl
+%defattr(-,root,root)
+%{perl_vendorarch}/openwsman.so
+%{perl_vendorlib}/openwsman.pm
+%doc AUTHORS COPYING ChangeLog README
+
+%files server
+# Don't remove *.so files from the server package.
+# the server fails to start without these files.
+%defattr(-,root,root)
+%dir %{_sysconfdir}/openwsman
+%config(noreplace) %{_sysconfdir}/openwsman/openwsman.conf
+%config(noreplace) %{_sysconfdir}/openwsman/ssleay.cnf
+%attr(0755,root,root) %{_sysconfdir}/openwsman/owsmangencert.sh
+%config(noreplace) %{_sysconfdir}/pam.d/openwsman
+%attr(0755,root,root) %{_sysconfdir}/init.d/openwsmand
+%dir %{_libdir}/openwsman
+%dir %{_libdir}/openwsman/authenticators
+%{_libdir}/openwsman/authenticators/*.so
+%{_libdir}/openwsman/authenticators/*.so.*
+%dir %{_libdir}/openwsman/plugins
+%{_libdir}/openwsman/plugins/*.so
+%{_libdir}/openwsman/plugins/*.so.*
+%{_sbindir}/openwsmand
+%{_sbindir}/rcopenwsmand
+%{_libdir}/libwsman_server.so.*
+%doc AUTHORS COPYING ChangeLog README
 
+%files client
+%defattr(-,root,root)
+%{_libdir}/libwsman_clientpp.so.*
+%doc AUTHORS COPYING ChangeLog README
 
 %changelog
+* Tue Dec 29 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5
+- Updating the spec file to follow the upstream packaging format.
+
 * Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-4
 - removed the hard coding of ruby_libdir
+
 * Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-3
 - Changed back the hard coding of /usr/lib
+
 * Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
 - check for python-configure in configure.ac fails because python-config
 - is not part of python-2.4 which is currently available in RHEL
-- So added a script python-config to the sources, and allowed configure to 
+- So added a script python-config to the sources, and allowed configure to
 - search in BUILD/opewsman-2.2.0 for python-configure script.
+
 * Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-1
 - Added the new 2.2.0 sources.
 - Changed the release and version numbers.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.0-4
 - rebuilt with new openssl
 



From praveenp at fedoraproject.org  Thu Dec 31 20:06:09 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu, 31 Dec 2009 20:06:09 +0000 (UTC)
Subject: rpms/openwsman/EL-4 openwsman.spec,1.7,1.8
Message-ID: <20091231200609.C74D111C018B@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/openwsman/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8582

Modified Files:
	openwsman.spec 
Log Message:
Made the final changes



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/openwsman.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openwsman.spec	29 Dec 2009 03:07:38 -0000	1.7
+++ openwsman.spec	31 Dec 2009 20:06:09 -0000	1.8
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitelib: %global ruby_sitelib %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%{!?ruby_sitearch: %global ruby_sitearch %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:          openwsman
 Version:       2.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -52,7 +52,7 @@ Requires:       libwsman1 = %{version}
 Requires:       %{name}-server = %{version}
 Requires:       %{name}-client = %{version}
 Requires:       sblim-sfcc-devel libxml2-devel pam-devel
-Requires:       libcurl-devel
+Requires:       curl-devel
 
 %description -n libwsman-devel
 Development files for openwsman
@@ -231,13 +231,17 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
-* Thu Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-6
+* Thu Dec 31 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-7
+- Removed the dependency on libcurl-devel and added curl-devel.
+- remove the hard coding of ruby while determing the sitearch and sitelibs.
+
+* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-6
 - Changed the random file used for creating an openssl cert
 
-* Thu Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5
+* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5
 - Added a few Build dependencies
 
-* Thu Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-4
+* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-4
 - Following the upstream packaging, updated the spec file to break the
 - package into server, client, lib components.
 



From green at fedoraproject.org  Thu Dec 31 20:44:00 2009
From: green at fedoraproject.org (green)
Date: Thu, 31 Dec 2009 20:44:00 +0000 (UTC)
Subject: File libffi-3.0.9.tar.gz uploaded to lookaside cache by green
Message-ID: <20091231204400.A685210F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for libffi:

1f300a7a7f975d4046f51c3022fa5ff1  libffi-3.0.9.tar.gz



From green at fedoraproject.org  Thu Dec 31 20:45:31 2009
From: green at fedoraproject.org (green)
Date: Thu, 31 Dec 2009 20:45:31 +0000 (UTC)
Subject: rpms/libffi/devel .cvsignore, 1.4, 1.5 libffi.spec, 1.5, 1.6 sources, 
	1.4, 1.5
Message-ID: <20091231204531.5445411C018B@cvs1.fedora.phx.redhat.com>

Author: green

Update of /cvs/pkgs/rpms/libffi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17273

Modified Files:
	.cvsignore libffi.spec sources 
Log Message:
Upgrade to 3.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libffi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Jul 2008 13:34:17 -0000	1.4
+++ .cvsignore	31 Dec 2009 20:45:31 -0000	1.5
@@ -1 +1 @@
-libffi-3.0.5.tar.gz
+libffi-3.0.9.tar.gz


Index: libffi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libffi/devel/libffi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libffi.spec	25 Jul 2009 05:36:47 -0000	1.5
+++ libffi.spec	31 Dec 2009 20:45:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libffi
-Version:	3.0.5
-Release:	3%{?dist}
+Version:	3.0.9
+Release:	1%{?dist}
 Summary:	A portable foreign function interface library
 
 Group:		System Environment/Libraries
@@ -97,6 +97,9 @@ fi
 %{_infodir}/libffi.info.gz
 
 %changelog
+* Tue Dec 29 2009 Anthony Green <green at redhat.com> - 3.0.9-1
+- Upgrade
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libffi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Jul 2008 13:34:17 -0000	1.4
+++ sources	31 Dec 2009 20:45:31 -0000	1.5
@@ -1 +1 @@
-29544f542140da929221805e332407b9  libffi-3.0.5.tar.gz
+1f300a7a7f975d4046f51c3022fa5ff1  libffi-3.0.9.tar.gz



From emaldonado at fedoraproject.org  Thu Dec 31 22:14:54 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 31 Dec 2009 22:14:54 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.135,1.136
Message-ID: <20091231221454.5448511C018B@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3519

Modified Files:
	nss.spec 
Log Message:
Temporarily disabling the ssl tests


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- nss.spec	31 Dec 2009 01:21:59 -0000	1.135
+++ nss.spec	31 Dec 2009 22:14:53 -0000	1.136
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.13
+Release:          1%{?dist}.13.1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -240,6 +240,16 @@ rm -rf ./mozilla/tests_results
 cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
 
+#  don't run all the tests when testing packaging
+#  nss_cycles: standard pkix upgradedb sharedb
+#  nss_tests: cipher libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains
+#  nss_ssl_tests: crl bypass_normal normal_bypass normal_fips fips_normal iopr
+#  nss_ssl_run: cov auth stress
+
+# Temporarily disabling the ssl tests
+%global nss_ssl_tests " "
+%global nss_ssl_run " "
+
 HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
 
 cd ../../../../
@@ -480,6 +490,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Dec 31 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.13.1
+- Temporarily disabling the ssl tests
+
 * Sat Dec 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.13
 - Fix nsssysinit to allow root to modify the nss system database (#547860)
 



From leigh123linux at fedoraproject.org  Thu Dec 31 22:32:06 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 31 Dec 2009 22:32:06 +0000 (UTC)
Subject: File qbittorrent-2.0.5.tar.gz uploaded to lookaside cache by
	leigh123linux
Message-ID: <20091231223206.4774E10F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for qbittorrent:

b74726c9133470ab92218c7d897847ed  qbittorrent-2.0.5.tar.gz



From leigh123linux at fedoraproject.org  Thu Dec 31 22:33:36 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu, 31 Dec 2009 22:33:36 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 .cvsignore, 1.22, 1.23 gcc.patch, 1.3,
	1.4 qbittorrent.spec, 1.46, 1.47 sources, 1.24, 1.25
Message-ID: <20091231223336.5615C11C018B@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7472

Modified Files:
	.cvsignore gcc.patch qbittorrent.spec sources 
Log Message:
* Thu Dec 31 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.5-1
- update to 2.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	30 Dec 2009 21:25:15 -0000	1.22
+++ .cvsignore	31 Dec 2009 22:33:35 -0000	1.23
@@ -1 +1 @@
-qbittorrent-2.0.4.tar.gz
+qbittorrent-2.0.5.tar.gz

gcc.patch:
 src.pro |    1 +
 1 file changed, 1 insertion(+)

Index: gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/gcc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gcc.patch	30 Dec 2009 21:46:06 -0000	1.3
+++ gcc.patch	31 Dec 2009 22:33:35 -0000	1.4
@@ -7,7 +7,7 @@ diff -up qbittorrent-2.0.2/src/src.pro.n
  
 +QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
  # Update this VERSION for each release
- DEFINES += VERSION=\\\"v2.0.4\\\"
+ DEFINES += VERSION=\\\"v2.0.5\\\"
  DEFINES += VERSION_MAJOR=2
 
 


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- qbittorrent.spec	30 Dec 2009 21:25:15 -0000	1.46
+++ qbittorrent.spec	31 Dec 2009 22:33:35 -0000	1.47
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.0.4
+Version: 2.0.5
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Thu Dec 31 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.5-1
+- update to 2.0.5
+
 * Wed Dec 30 2009 Leigh Scott <leigh123linux at googlemail.com> - 2.0.4-1
 - update to 2.0.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	30 Dec 2009 21:25:15 -0000	1.24
+++ sources	31 Dec 2009 22:33:35 -0000	1.25
@@ -1 +1 @@
-e1541e2334698881f8fd8c21aa9854c0  qbittorrent-2.0.4.tar.gz
+b74726c9133470ab92218c7d897847ed  qbittorrent-2.0.5.tar.gz



From danken at fedoraproject.org  Thu Dec 31 22:37:32 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 22:37:32 +0000 (UTC)
Subject: File hspell-1.1.tar.gz uploaded to lookaside cache by danken
Message-ID: <20091231223732.8BCC210F85E@bastion.fedoraproject.org>

A file has been added to the lookaside cache for hspell:

e79e75180ce529c008ea085954a52f2c  hspell-1.1.tar.gz



From danken at fedoraproject.org  Thu Dec 31 22:44:08 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 22:44:08 +0000 (UTC)
Subject: rpms/hspell/F-12 hspell.spec,1.17,1.18 sources,1.5,1.6
Message-ID: <20091231224408.2C0BF11C018B@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/pkgs/rpms/hspell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9712

Modified Files:
	hspell.spec sources 
Log Message:
* Fri Jan  1 2010 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-2
- Rebase to upstream version 1.1 and fix spec typos.



Index: hspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hspell/F-12/hspell.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- hspell.spec	31 Dec 2009 08:24:44 -0000	1.17
+++ hspell.spec	31 Dec 2009 22:44:07 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A Hebrew spell checker
 Name: hspell
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://hspell.ivrix.org.il
 Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
 License: GPLv2
@@ -11,15 +11,15 @@ BuildRequires: zlib-devel
 Patch0: hspell-1.0.sharedlib.patch
 
 %description
-Hspell is a Hebrew SPELLer and morphological analizer. It provides a mostly
+Hspell is a Hebrew SPELLer and morphological analyzer. It provides a mostly
 spell-like interface (gives the list of wrong words in the input text), but can
-also suggest corrections (-c). It also provides a true (yet incomplete)
-morphological analizer (-l), that prints all known meanings of a Hebrew string.
+also suggest corrections (-c). It also provides a true morphological analyzer
+(-l), that prints all known meanings of a Hebrew string.
 
 %description -l he
 Hspell ??? ????? ????? ????? ????, ????? ???? ????-spell - ???? ????? ?? ??????
 ??????? ???????? ????. Hspell ????? ???? ???? ??????? ?????? ????? ??? ?????
-)"???? ???"(.  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
+("???? ???").  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
 ????????? ???????? ?? ?????? ?????? ?????.
 
 %package devel
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jan  1 2010 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-2
+- Rebase to upstream version 1.1 and fix spec typos.
+
 * Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
 - Rebase to upstream version 1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hspell/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Dec 2009 09:47:42 -0000	1.5
+++ sources	31 Dec 2009 22:44:07 -0000	1.6
@@ -1 +1 @@
-fd2f78cb81d391cd4c0bf18489293ced  hspell-1.1.tar.gz
+e79e75180ce529c008ea085954a52f2c  hspell-1.1.tar.gz



From danken at fedoraproject.org  Thu Dec 31 23:02:42 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 23:02:42 +0000 (UTC)
Subject: rpms/hspell/devel hspell.spec,1.17,1.18 sources,1.5,1.6
Message-ID: <20091231230243.0B10311C018B@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/pkgs/rpms/hspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13627

Modified Files:
	hspell.spec sources 
Log Message:
* Fri Jan  1 2010 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-2
- Rebase to upstream version 1.1 and fix spec typos.



Index: hspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hspell/devel/hspell.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- hspell.spec	31 Dec 2009 13:00:36 -0000	1.17
+++ hspell.spec	31 Dec 2009 23:02:41 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A Hebrew spell checker
 Name: hspell
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://hspell.ivrix.org.il
 Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
 License: GPLv2
@@ -11,15 +11,15 @@ BuildRequires: zlib-devel
 Patch0: hspell-1.0.sharedlib.patch
 
 %description
-Hspell is a Hebrew SPELLer and morphological analizer. It provides a mostly
+Hspell is a Hebrew SPELLer and morphological analyzer. It provides a mostly
 spell-like interface (gives the list of wrong words in the input text), but can
-also suggest corrections (-c). It also provides a true (yet incomplete)
-morphological analizer (-l), that prints all known meanings of a Hebrew string.
+also suggest corrections (-c). It also provides a true morphological analyzer
+(-l), that prints all known meanings of a Hebrew string.
 
 %description -l he
 Hspell ??? ????? ????? ????? ????, ????? ???? ????-spell - ???? ????? ?? ??????
 ??????? ???????? ????. Hspell ????? ???? ???? ??????? ?????? ????? ??? ?????
-)"???? ???"(.  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
+("???? ???").  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
 ????????? ???????? ?? ?????? ?????? ?????.
 
 %package devel
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jan  1 2010 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-2
+- Rebase to upstream version 1.1 and fix spec typos.
+
 * Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
 - Rebase to upstream version 1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hspell/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Dec 2009 13:00:36 -0000	1.5
+++ sources	31 Dec 2009 23:02:42 -0000	1.6
@@ -1 +1 @@
-fd2f78cb81d391cd4c0bf18489293ced  hspell-1.1.tar.gz
+e79e75180ce529c008ea085954a52f2c  hspell-1.1.tar.gz



From danken at fedoraproject.org  Thu Dec 31 23:02:49 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 31 Dec 2009 23:02:49 +0000 (UTC)
Subject: rpms/hspell/EL-5 hspell.spec,1.12,1.13 sources,1.5,1.6
Message-ID: <20091231230249.DCAFD11C018B@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/pkgs/rpms/hspell/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13682

Modified Files:
	hspell.spec sources 
Log Message:
* Fri Jan  1 2010 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-2
- Rebase to upstream version 1.1 and fix spec typos.



Index: hspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hspell/EL-5/hspell.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- hspell.spec	31 Dec 2009 13:14:38 -0000	1.12
+++ hspell.spec	31 Dec 2009 23:02:49 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A Hebrew spell checker
 Name: hspell
 Version: 1.1
-Release: 1.1%{?dist}
+Release: 2%{?dist}
 URL: http://hspell.ivrix.org.il
 Source: http://hspell.ivrix.org.il/hspell-%{version}.tar.gz
 License: GPLv2
@@ -11,15 +11,15 @@ BuildRequires: zlib-devel
 Patch0: hspell-1.0.sharedlib.patch
 
 %description
-Hspell is a Hebrew SPELLer and morphological analizer. It provides a mostly
+Hspell is a Hebrew SPELLer and morphological analyzer. It provides a mostly
 spell-like interface (gives the list of wrong words in the input text), but can
-also suggest corrections (-c). It also provides a true (yet incomplete)
-morphological analizer (-l), that prints all known meanings of a Hebrew string.
+also suggest corrections (-c). It also provides a true morphological analyzer
+(-l), that prints all known meanings of a Hebrew string.
 
 %description -l he
 Hspell ??? ????? ????? ????? ????, ????? ???? ????-spell - ???? ????? ?? ??????
 ??????? ???????? ????. Hspell ????? ???? ???? ??????? ?????? ????? ??? ?????
-)"???? ???"(.  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
+("???? ???").  ??? ??, Hspell ???? (-l) ???? ????????? ??? ????? ?? ??
 ????????? ???????? ?? ?????? ?????? ?????.
 
 %package devel
@@ -102,8 +102,8 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1.1
-- Rebuild with hspell-1.0.sharedlib.patch from Fedora
+* Fri Jan  1 2010 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-2
+- Rebase to upstream version 1.1 and fix spec typos.
 
 * Thu Dec 31 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 1.1-1
 - Rebase to upstream version 1.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hspell/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Dec 2009 13:00:29 -0000	1.5
+++ sources	31 Dec 2009 23:02:49 -0000	1.6
@@ -1 +1 @@
-fd2f78cb81d391cd4c0bf18489293ced  hspell-1.1.tar.gz
+e79e75180ce529c008ea085954a52f2c  hspell-1.1.tar.gz